diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml
index 24b26e7074..d7eafc7dde 100644
--- a/com.discord/AndroidManifest.xml
+++ b/com.discord/AndroidManifest.xml
@@ -154,7 +154,7 @@
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
             </intent-filter>
         </receiver>
-        <service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
+        <service android:foregroundServiceType="mediaProjection" android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
         <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
             <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
         </provider>
diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 1e96faa80d..ac2a7c171c 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1249.apk
+apkFileName: com.discord-1251.apk
 compressionType: false
 doNotCompress:
 - resources.arsc
@@ -3106,5 +3106,5 @@ usesFramework:
   tag: null
 version: 2.4.2-83a459-SNAPSHOT
 versionInfo:
-  versionCode: '1249'
-  versionName: '38.0'
+  versionCode: '1251'
+  versionName: '38.1'
diff --git a/com.discord/kotlin/kotlin.kotlin_builtins b/com.discord/kotlin/kotlin.kotlin_builtins
index b76cfd3aa1..7cc3954ceb 100644
Binary files a/com.discord/kotlin/kotlin.kotlin_builtins and b/com.discord/kotlin/kotlin.kotlin_builtins differ
diff --git a/com.discord/kotlin/reflect/reflect.kotlin_builtins b/com.discord/kotlin/reflect/reflect.kotlin_builtins
index c8ebdd103c..d08689e3d7 100644
Binary files a/com.discord/kotlin/reflect/reflect.kotlin_builtins and b/com.discord/kotlin/reflect/reflect.kotlin_builtins differ
diff --git a/com.discord/lib/arm64-v8a/libdiscord.so b/com.discord/lib/arm64-v8a/libdiscord.so
index b47a1b23a5..148cba0834 100644
Binary files a/com.discord/lib/arm64-v8a/libdiscord.so and b/com.discord/lib/arm64-v8a/libdiscord.so differ
diff --git a/com.discord/lib/armeabi-v7a/libdiscord.so b/com.discord/lib/armeabi-v7a/libdiscord.so
index 84f30d8816..8c11d5b410 100644
Binary files a/com.discord/lib/armeabi-v7a/libdiscord.so and b/com.discord/lib/armeabi-v7a/libdiscord.so differ
diff --git a/com.discord/lib/x86/libdiscord.so b/com.discord/lib/x86/libdiscord.so
index 3bf77dda62..e4cc11f3d3 100644
Binary files a/com.discord/lib/x86/libdiscord.so and b/com.discord/lib/x86/libdiscord.so differ
diff --git a/com.discord/lib/x86_64/libdiscord.so b/com.discord/lib/x86_64/libdiscord.so
index 26b159a149..ebccd2648b 100644
Binary files a/com.discord/lib/x86_64/libdiscord.so and b/com.discord/lib/x86_64/libdiscord.so differ
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index d65dd69944..07f295502f 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-anydpi-v24/ic_profile_badge_partner_32dp.xml b/com.discord/res/drawable-anydpi-v24/ic_profile_badge_partner_32dp.xml
deleted file mode 100644
index 0472e945b7..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_profile_badge_partner_32dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="32.0dip" android:width="42.0dip" android:viewportWidth="42.0" android:viewportHeight="32.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff4087ed" android:pathData="M32.02,6C26.87,6 23.83,8.8 22.82,9.87C22.64,10.07 22.65,10.38 22.85,10.57L27.46,14.78C27.64,14.95 27.91,14.95 28.09,14.78C28.63,14.26 29.93,13.28 32.02,13.28C34.89,13.28 34.87,16.59 34.87,16.59C34.87,16.62 34.83,19.5 32.02,19.5C30.7,19.5 29.15,19.06 26.87,17.08C25.54,15.92 25.3,15.65 23.69,14.1C22.08,12.55 16.14,6 9.96,6C3.72,6 0,11.18 0,16.19C0,17.61 0.26,20.34 1.97,22.81C3.76,25.37 6.59,26.78 9.96,26.78C15.1,26.78 18.14,24.18 19.16,23.15C19.34,22.96 19.34,22.64 19.14,22.46L14.73,18.23C14.56,18.07 14.31,18.05 14.12,18.19C13.53,18.63 12.1,19.49 10,19.5C9.97,19.5 9.95,19.5 9.92,19.49C9.59,19.45 7.13,19.03 7.11,16.21C7.11,16.2 7.11,16.19 7.12,16.17C7.13,15.91 7.3,13.28 9.96,13.28C13.08,13.28 16.15,16.67 18.43,19C21.74,22.38 25.68,26.99 32.02,26.78C38.25,26.58 41.98,21.6 41.98,16.59C41.98,15.17 41.72,12.44 40.01,9.97C38.23,7.41 35.39,6 32.02,6" android:fillType="evenOdd" />
-</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-hdpi/ic_profile_badge_partner_32dp.png b/com.discord/res/drawable-hdpi/ic_profile_badge_partner_32dp.png
deleted file mode 100644
index f8f4f11877..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_profile_badge_partner_32dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_profile_badge_partner_32dp.png b/com.discord/res/drawable-ldpi/ic_profile_badge_partner_32dp.png
deleted file mode 100644
index 2e445052fd..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_profile_badge_partner_32dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_profile_badge_partner_32dp.png b/com.discord/res/drawable-mdpi/ic_profile_badge_partner_32dp.png
deleted file mode 100644
index 22f4e1cfbc..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_profile_badge_partner_32dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_profile_badge_partner_32dp.png b/com.discord/res/drawable-xhdpi/ic_profile_badge_partner_32dp.png
deleted file mode 100644
index 8525e8abfc..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_profile_badge_partner_32dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_profile_badge_partner_32dp.png b/com.discord/res/drawable-xxhdpi/ic_profile_badge_partner_32dp.png
deleted file mode 100644
index 862db0bb47..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_profile_badge_partner_32dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_profile_badge_partner_32dp.png b/com.discord/res/drawable-xxxhdpi/ic_profile_badge_partner_32dp.png
deleted file mode 100644
index d55adaf7cf..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_profile_badge_partner_32dp.png and /dev/null differ
diff --git a/com.discord/res/drawable/bg_payment_method_spinner_closed.xml b/com.discord/res/drawable/bg_payment_method_spinner_closed.xml
index ca7daccba3..7baaa6ad34 100644
--- a/com.discord/res/drawable/bg_payment_method_spinner_closed.xml
+++ b/com.discord/res/drawable/bg_payment_method_spinner_closed.xml
@@ -7,7 +7,7 @@
             <corners android:radius="4.0dip" />
         </shape>
     </item>
-    <item android:right="@dimen/uikit_spacing_medium">
+    <item android:right="8.0dip">
         <bitmap android:gravity="end" android:src="@drawable/ic_dropdown_white_18dp" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml b/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml
index 4d76127d24..57843f7d86 100644
--- a/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml
+++ b/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml
@@ -7,5 +7,5 @@
             <solid android:color="@color/primary_light_200" />
         </shape>
     </item>
-    <item android:gravity="center|right" android:drawable="@drawable/ic_chevron_down_dark_grey_12dp" android:right="@dimen/uikit_spacing_medium" />
+    <item android:gravity="center|right" android:drawable="@drawable/ic_chevron_down_dark_grey_12dp" android:right="8.0dip" />
 </layer-list>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_rect_guild_selected.xml b/com.discord/res/drawable/drawable_rect_guild_selected.xml
index 7e8d567b17..895b1278b8 100644
--- a/com.discord/res/drawable/drawable_rect_guild_selected.xml
+++ b/com.discord/res/drawable/drawable_rect_guild_selected.xml
@@ -2,5 +2,5 @@
 <shape android:shape="rectangle"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white" />
-    <corners android:topRightRadius="@dimen/uikit_spacing_large" android:bottomRightRadius="@dimen/uikit_spacing_large" />
+    <corners android:topRightRadius="16.0dip" android:bottomRightRadius="16.0dip" />
 </shape>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_rect_guild_selected_horiz.xml b/com.discord/res/drawable/drawable_rect_guild_selected_horiz.xml
index 9a4debe5a2..a8bc5bf61b 100644
--- a/com.discord/res/drawable/drawable_rect_guild_selected_horiz.xml
+++ b/com.discord/res/drawable/drawable_rect_guild_selected_horiz.xml
@@ -2,5 +2,5 @@
 <shape android:shape="rectangle"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white" />
-    <corners android:topLeftRadius="@dimen/uikit_spacing_large" android:topRightRadius="@dimen/uikit_spacing_large" />
+    <corners android:topLeftRadius="16.0dip" android:topRightRadius="16.0dip" />
 </shape>
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_voice_sensitivity_progress.xml b/com.discord/res/drawable/drawable_voice_sensitivity_progress.xml
new file mode 100644
index 0000000000..da45a0399a
--- /dev/null
+++ b/com.discord/res/drawable/drawable_voice_sensitivity_progress.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="@color/status_green_400" />
+            <corners android:radius="1000.0dip" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="@color/status_yellow_400" />
+                <corners android:radius="1000.0dip" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <solid android:color="@color/black_alpha_20" />
+                <corners android:radius="1000.0dip" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_mobile_screenshare_24dp.xml b/com.discord/res/drawable/ic_mobile_screenshare_24dp.xml
new file mode 100644
index 0000000000..e8bee8b94e
--- /dev/null
+++ b/com.discord/res/drawable/ic_mobile_screenshare_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M5,3.814C5,2.2599 6.2768,1 7.8519,1H16.1481C17.7232,1 19,2.2599 19,3.814V7.5L17.4444,6.0362V4H6.5556V19.5H17.4444V17.4677L19,16V20.186C19,21.7401 17.7232,23 16.1481,23H7.8519C6.2768,23 5,21.7402 5,20.186V3.814Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M15.6,15.3188C15.6,15.5388 15.8637,15.6515 16.0228,15.4995L19.8108,11.8772C19.9139,11.7786 19.9137,11.614 19.8106,11.5156L16.0225,7.903C15.8634,7.7512 15.6,7.864 15.6,8.0839V9.6792C15.6,9.8037 15.5068,9.9091 15.3839,9.9293C11.7864,10.5197 10.0661,12.8369 9.2844,15.3807C9.2054,15.6377 9.5526,15.8068 9.739,15.613C11.1239,14.174 12.8913,13.4854 15.3497,13.4422C15.4877,13.4397 15.6,13.5519 15.6,13.69V15.3188Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_mobile_screenshare_end_24dp.xml b/com.discord/res/drawable/ic_mobile_screenshare_end_24dp.xml
new file mode 100644
index 0000000000..49646c0b95
--- /dev/null
+++ b/com.discord/res/drawable/ic_mobile_screenshare_end_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M5,3.814C5,2.2599 6.2768,1 7.8519,1H16.1481C17.7232,1 19,2.2599 19,3.814V16L17.4444,17.4677V4H6.5556V19.5H17.4444V17.4677L19,16V20.186C19,21.7401 17.7232,23 16.1481,23H7.8519C6.2768,23 5,21.7402 5,20.186V3.814Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M16,9.448L14.5527,8L11.9996,10.552L9.4473,8L8,9.448L10.5523,12L8,14.552L9.4473,16L11.9996,13.448L14.5527,16L16,14.552L13.4477,12L16,9.448Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_partnered_badge.xml b/com.discord/res/drawable/ic_partnered_badge.xml
index e4643e396e..8c4708b42e 100644
--- a/com.discord/res/drawable/ic_partnered_badge.xml
+++ b/com.discord/res/drawable/ic_partnered_badge.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff4f545c" android:pathData="M16,8c0,0.79 -1.28,1.38 -1.52,2.09s0.44,2 0,2.59 -1.84,0.35 -2.46,0.8 -0.79,1.84 -1.54,2.09 -1.67,-0.8 -2.47,-0.8 -1.75,1 -2.47,0.8S4.62,13.93 4,13.48s-2,-0.18 -2.46,-0.8 0.23,-1.84 0,-2.59S0,8.79 0,8 1.28,6.62 1.52,5.91s-0.44,-2 0,-2.59S3.37,3 4,2.52 4.78,0.68 5.53,0.43s1.67,0.8 2.47,0.8 1.75,-1 2.47,-0.8S11.38,2.07 12,2.52s2,0.18 2.46,0.8 -0.23,1.84 0,2.59S16,7.21 16,8Z" />
-    <path android:fillColor="#ffffffff" android:pathData="M10.7,5.68a2.9,2.9 0,0 0,-2.11 0.86,0.11 0.11,0 0,0 0,0.16l1.05,0.94a0.11,0.11 0,0 0,0.15 0,1.27 1.27,0 0,1 0.9,-0.33c0.65,0 0.65,0.73 0.65,0.73a0.64,0.64 0,0 1,-0.65 0.65,1.73 1.73,0 0,1 -1.18,-0.54c-0.31,-0.26 -0.36,-0.32 -0.73,-0.66S7.06,5.68 5.65,5.68A2.26,2.26 0,0 0,3.37 8a2.59,2.59 0,0 0,0.45 1.47,2.18 2.18,0 0,0 1.83,0.89 2.94,2.94 0,0 0,2.1 -0.81,0.11 0.11,0 0,0 0,-0.16l-1,-0.94a0.11,0.11 0,0 0,-0.14 0,1.58 1.58,0 0,1 -0.94,0.29h0A0.71,0.71 0,0 1,5 8H5a0.63,0.63 0,0 1,0.65 -0.64c0.71,0 1.42,0.75 1.94,1.27 0.75,0.76 1.66,1.79 3.11,1.74A2.28,2.28 0,0 0,13 8a2.59,2.59 0,0 0,-0.45 -1.47A2.14,2.14 0,0 0,10.7 5.68Z" />
+    <path android:fillColor="#ff4f545c" android:pathData="M16 8.0001C16 8.8001 14.7 9.4001 14.5 10.1001C14.2 10.8001 15 12.1001 14.5 12.7001C14 13.3001 12.6 13.0001 12 13.5001C11.4 14.0001 11.2 15.4001 10.5 15.6001C9.8 15.8001 8.8 14.7001 8 14.7001C7.2 14.7001 6.3 15.7001 5.5 15.5001C4.7 15.3001 4.6 13.9001 4 13.5001C3.4 13.1001 2 13.3001 1.5 12.7001C1 12.1001 1.7 10.8001 1.5 10.1001C1.3 9.4001 0 8.7001 0 8.0001C0 7.3001 1.3 6.6001 1.5 5.9001C1.8 5.2001 1 3.9001 1.5 3.3001C2 2.7001 3.4 3.0001 4 2.5001C4.6 2.0001 4.8 0.600096 5.5 0.400096C6.3 0.300096 7.2 1.3001 8 1.3001C8.8 1.3001 9.7 0.300096 10.5 0.500096C11.3 0.700096 11.4 2.2001 12 2.6001C12.6 3.0001 14 2.8001 14.5 3.4001C15 4.0001 14.3 5.3001 14.5 6.0001C14.7 6.7001 16 7.2001 16 8.0001Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M10.5906 6.40018L9.19223 7.30018C8.99246 7.40018 8.89258 7.40018 8.69281 7.30018C8.59293 7.20018 8.39317 7.10018 8.29328 7.00018C7.89375 6.90018 7.5941 7.00018 7.29445 7.20018L6.79504 7.50018L4.29797 9.20018C3.69867 9.50018 2.99949 9.40018 2.69984 8.80018C2.30031 8.30018 2.50008 7.60018 2.99949 7.20018L5.99598 5.20018C6.79504 4.70018 7.79387 4.50018 8.69281 4.70018C9.49188 4.90018 10.0912 5.30018 10.5906 5.90018C10.7904 6.10018 10.6905 6.30018 10.5906 6.40018Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M13.4871 7.8001C13.4871 8.2001 13.2874 8.6001 12.9877 8.8001L9.89135 10.8001C9.29206 11.2001 8.69276 11.4001 7.99358 11.4001C7.69393 11.4001 7.49417 11.4001 7.19452 11.3001C6.39545 11.1001 5.79616 10.7001 5.29674 10.1001C5.19686 9.9001 5.29674 9.7001 5.39663 9.6001L6.79499 8.7001C6.89487 8.6001 7.09463 8.6001 7.19452 8.7001C7.39428 8.8001 7.59405 8.9001 7.69393 9.0001C8.09346 9.0001 8.39311 9.0001 8.69276 8.8001L9.39194 8.4001L11.3896 7.0001L11.6892 6.8001C12.1887 6.5001 12.9877 6.6001 13.2874 7.1001C13.4871 7.4001 13.4871 7.6001 13.4871 7.8001Z" />
 </vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_partnered_badge_banner.xml b/com.discord/res/drawable/ic_partnered_badge_banner.xml
index 6e6cf67aa2..6d9362e4ae 100644
--- a/com.discord/res/drawable/ic_partnered_badge_banner.xml
+++ b/com.discord/res/drawable/ic_partnered_badge_banner.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff4087ed" android:pathData="M16,8c0,0.79 -1.28,1.38 -1.52,2.09s0.44,2 0,2.59 -1.84,0.35 -2.46,0.8 -0.79,1.84 -1.54,2.09 -1.67,-0.8 -2.47,-0.8 -1.75,1 -2.47,0.8S4.62,13.93 4,13.48s-2,-0.18 -2.46,-0.8 0.23,-1.84 0,-2.59S0,8.79 0,8 1.28,6.62 1.52,5.91s-0.44,-2 0,-2.59S3.37,3 4,2.52 4.78,0.68 5.53,0.43s1.67,0.8 2.47,0.8 1.75,-1 2.47,-0.8S11.38,2.07 12,2.52s2,0.18 2.46,0.8 -0.23,1.84 0,2.59S16,7.21 16,8Z" />
-    <path android:fillColor="#ffffffff" android:pathData="M10.7,5.68a2.9,2.9 0,0 0,-2.11 0.86,0.11 0.11,0 0,0 0,0.16l1.05,0.94a0.11,0.11 0,0 0,0.15 0,1.27 1.27,0 0,1 0.9,-0.33c0.65,0 0.65,0.73 0.65,0.73a0.64,0.64 0,0 1,-0.65 0.65,1.73 1.73,0 0,1 -1.18,-0.54c-0.31,-0.26 -0.36,-0.32 -0.73,-0.66S7.06,5.68 5.65,5.68A2.26,2.26 0,0 0,3.37 8a2.59,2.59 0,0 0,0.45 1.47,2.18 2.18,0 0,0 1.83,0.89 2.94,2.94 0,0 0,2.1 -0.81,0.11 0.11,0 0,0 0,-0.16l-1,-0.94a0.11,0.11 0,0 0,-0.14 0,1.58 1.58,0 0,1 -0.94,0.29h0A0.71,0.71 0,0 1,5 8H5a0.63,0.63 0,0 1,0.65 -0.64c0.71,0 1.42,0.75 1.94,1.27 0.75,0.76 1.66,1.79 3.11,1.74A2.28,2.28 0,0 0,13 8a2.59,2.59 0,0 0,-0.45 -1.47A2.14,2.14 0,0 0,10.7 5.68Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M16 8.0001C16 8.8001 14.7 9.4001 14.5 10.1001C14.2 10.8001 15 12.1001 14.5 12.7001C14 13.3001 12.6 13.0001 12 13.5001C11.4 14.0001 11.2 15.4001 10.5 15.6001C9.8 15.8001 8.8 14.7001 8 14.7001C7.2 14.7001 6.3 15.7001 5.5 15.5001C4.7 15.3001 4.6 13.9001 4 13.5001C3.4 13.1001 2 13.3001 1.5 12.7001C1 12.1001 1.7 10.8001 1.5 10.1001C1.3 9.4001 0 8.7001 0 8.0001C0 7.3001 1.3 6.6001 1.5 5.9001C1.8 5.2001 1 3.9001 1.5 3.3001C2 2.7001 3.4 3.0001 4 2.5001C4.6 2.0001 4.8 0.600096 5.5 0.400096C6.3 0.300096 7.2 1.3001 8 1.3001C8.8 1.3001 9.7 0.300096 10.5 0.500096C11.3 0.700096 11.4 2.2001 12 2.6001C12.6 3.0001 14 2.8001 14.5 3.4001C15 4.0001 14.3 5.3001 14.5 6.0001C14.7 6.7001 16 7.2001 16 8.0001Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M10.5906 6.40018L9.19223 7.30018C8.99246 7.40018 8.89258 7.40018 8.69281 7.30018C8.59293 7.20018 8.39317 7.10018 8.29328 7.00018C7.89375 6.90018 7.5941 7.00018 7.29445 7.20018L6.79504 7.50018L4.29797 9.20018C3.69867 9.50018 2.99949 9.40018 2.69984 8.80018C2.30031 8.30018 2.50008 7.60018 2.99949 7.20018L5.99598 5.20018C6.79504 4.70018 7.79387 4.50018 8.69281 4.70018C9.49188 4.90018 10.0912 5.30018 10.5906 5.90018C10.7904 6.10018 10.6905 6.30018 10.5906 6.40018Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M13.4871 7.8001C13.4871 8.2001 13.2874 8.6001 12.9877 8.8001L9.89135 10.8001C9.29206 11.2001 8.69276 11.4001 7.99358 11.4001C7.69393 11.4001 7.49417 11.4001 7.19452 11.3001C6.39545 11.1001 5.79616 10.7001 5.29674 10.1001C5.19686 9.9001 5.29674 9.7001 5.39663 9.6001L6.79499 8.7001C6.89487 8.6001 7.09463 8.6001 7.19452 8.7001C7.39428 8.8001 7.59405 8.9001 7.69393 9.0001C8.09346 9.0001 8.39311 9.0001 8.69276 8.8001L9.39194 8.4001L11.3896 7.0001L11.6892 6.8001C12.1887 6.5001 12.9877 6.6001 13.2874 7.1001C13.4871 7.4001 13.4871 7.6001 13.4871 7.8001Z" />
 </vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_profile_badge_partner_32dp.xml b/com.discord/res/drawable/ic_profile_badge_partner_32dp.xml
new file mode 100644
index 0000000000..53e3a55082
--- /dev/null
+++ b/com.discord/res/drawable/ic_profile_badge_partner_32dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="32.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff7289da" android:pathData="M23.6632 11.1399L19.5797 13.7436C18.9964 14.0329 18.7047 14.0329 18.1213 13.7436C17.8296 13.4543 17.2463 13.165 16.9546 12.8757C15.7879 12.5864 14.9129 12.8757 14.0378 13.4543L12.5794 14.3222L5.2875 19.2404C3.53744 20.1083 1.49569 19.819 0.620658 18.0831C-0.546053 16.6366 0.0373027 14.6115 1.49569 13.4543L10.246 7.66824C12.5794 6.22172 15.4962 5.64312 18.1213 6.22172C20.4547 6.80033 22.2048 7.95754 23.6632 9.69336C24.2466 10.272 23.9549 10.8506 23.6632 11.1399Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M32 16.2181C32 17.3684 31.4176 18.5188 30.5439 19.094L21.5164 24.8457C19.7691 25.996 18.0218 26.5712 15.9833 26.5712C15.1097 26.5712 14.5273 26.5712 13.6536 26.2836C11.324 25.7085 9.57668 24.5581 8.12062 22.8326C7.82941 22.2574 8.12062 21.6822 8.41184 21.3947L12.4888 18.8064C12.78 18.5188 13.3624 18.5188 13.6536 18.8064C14.2361 19.094 14.8185 19.3816 15.1097 19.6691C16.2746 19.6691 17.1482 19.6691 18.0218 19.094L20.0603 17.9436L25.8846 13.9174L26.7582 13.3422C28.2142 12.4795 30.5439 12.7671 31.4176 14.205C32 15.0678 32 15.6429 32 16.2181Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_verified_badge_banner.xml b/com.discord/res/drawable/ic_verified_badge_banner.xml
index ecb00e20c4..41092727ea 100644
--- a/com.discord/res/drawable/ic_verified_badge_banner.xml
+++ b/com.discord/res/drawable/ic_verified_badge_banner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff7289da" android:pathData="M16,8c0,0.79 -1.28,1.38 -1.52,2.09s0.44,2 0,2.59 -1.84,0.35 -2.46,0.8 -0.79,1.84 -1.54,2.09 -1.67,-0.8 -2.47,-0.8 -1.75,1 -2.47,0.8S4.62,13.93 4,13.48s-2,-0.18 -2.46,-0.8 0.23,-1.84 0,-2.59S0,8.79 0,8 1.28,6.62 1.52,5.91s-0.44,-2 0,-2.59S3.37,3 4,2.52 4.78,0.68 5.53,0.43s1.67,0.8 2.47,0.8 1.75,-1 2.47,-0.8S11.38,2.07 12,2.52s2,0.18 2.46,0.8 -0.23,1.84 0,2.59S16,7.21 16,8Z" />
+    <path android:fillColor="#ff43b581" android:pathData="M16,8c0,0.79 -1.28,1.38 -1.52,2.09s0.44,2 0,2.59 -1.84,0.35 -2.46,0.8 -0.79,1.84 -1.54,2.09 -1.67,-0.8 -2.47,-0.8 -1.75,1 -2.47,0.8S4.62,13.93 4,13.48s-2,-0.18 -2.46,-0.8 0.23,-1.84 0,-2.59S0,8.79 0,8 1.28,6.62 1.52,5.91s-0.44,-2 0,-2.59S3.37,3 4,2.52 4.78,0.68 5.53,0.43s1.67,0.8 2.47,0.8 1.75,-1 2.47,-0.8S11.38,2.07 12,2.52s2,0.18 2.46,0.8 -0.23,1.84 0,2.59S16,7.21 16,8Z" />
     <path android:fillColor="#ffffffff" android:pathData="M7.4,11.57 L4,9 5,7.66l2,1.53 3.58,-4.76 1.36,1Z" />
 </vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/img_gifting_pattern_bg_dark.xml b/com.discord/res/drawable/img_gifting_pattern_bg_dark.xml
index 54b996000b..9354556b24 100644
--- a/com.discord/res/drawable/img_gifting_pattern_bg_dark.xml
+++ b/com.discord/res/drawable/img_gifting_pattern_bg_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list android:paddingBottom="@dimen/uikit_spacing_xxxlarge"
+<layer-list android:paddingBottom="64.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="top" android:drawable="@drawable/img_gifting_pattern_dark" />
     <item android:drawable="@color/primary_630_alpha_60" />
diff --git a/com.discord/res/drawable/img_gifting_pattern_bg_light.xml b/com.discord/res/drawable/img_gifting_pattern_bg_light.xml
index 7cf63292b1..bfbfe7bb02 100644
--- a/com.discord/res/drawable/img_gifting_pattern_bg_light.xml
+++ b/com.discord/res/drawable/img_gifting_pattern_bg_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list android:paddingBottom="@dimen/uikit_spacing_xxxlarge"
+<layer-list android:paddingBottom="64.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="top" android:drawable="@drawable/img_gifting_pattern_light" />
     <item android:drawable="@color/primary_100_alpha_60" />
diff --git a/com.discord/res/drawable/screen_share_illustration.xml b/com.discord/res/drawable/screen_share_illustration.xml
new file mode 100644
index 0000000000..400084735e
--- /dev/null
+++ b/com.discord/res/drawable/screen_share_illustration.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="82.0dip" android:width="135.0dip" android:viewportWidth="135.0" android:viewportHeight="82.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffff78b9" android:pathData="M20.344,1.585L17.244,0.085C17.086,0.009 16.908,-0.017 16.735,0.011C16.561,0.039 16.401,0.119 16.274,0.241C16.148,0.363 16.062,0.521 16.028,0.693C15.994,0.865 16.014,1.044 16.084,1.205L17.594,4.325C17.648,4.44 17.677,4.567 17.677,4.695C17.677,4.823 17.648,4.949 17.594,5.065L16.084,8.205C16.007,8.366 15.982,8.548 16.013,8.724C16.044,8.901 16.129,9.063 16.257,9.188C16.385,9.314 16.549,9.396 16.726,9.425C16.902,9.453 17.084,9.425 17.244,9.345L20.354,7.845C20.471,7.79 20.599,7.762 20.729,7.762C20.858,7.762 20.986,7.79 21.104,7.845L24.224,9.345C24.383,9.421 24.562,9.445 24.736,9.415C24.91,9.385 25.07,9.301 25.194,9.176C25.318,9.051 25.4,8.89 25.429,8.716C25.457,8.542 25.431,8.363 25.354,8.205L23.854,5.085C23.795,4.97 23.764,4.843 23.764,4.715C23.764,4.586 23.795,4.459 23.854,4.345L25.354,1.225C25.427,1.068 25.451,0.893 25.423,0.723C25.394,0.552 25.314,0.394 25.193,0.27C25.073,0.147 24.917,0.062 24.748,0.029C24.578,-0.004 24.402,0.015 24.244,0.085L21.124,1.585C21.002,1.644 20.869,1.675 20.734,1.675C20.599,1.675 20.465,1.644 20.344,1.585Z" />
+    <path android:fillColor="#ffff78b9" android:pathData="M130.605,7.075L129.695,4.465C129.649,4.329 129.563,4.212 129.447,4.128C129.331,4.045 129.192,4 129.05,4C128.907,4 128.768,4.045 128.652,4.128C128.536,4.212 128.45,4.329 128.405,4.465L127.495,7.075C127.462,7.172 127.407,7.261 127.334,7.334C127.261,7.407 127.172,7.462 127.075,7.495L124.465,8.405C124.329,8.45 124.212,8.536 124.128,8.652C124.045,8.768 124,8.907 124,9.05C124,9.192 124.045,9.331 124.128,9.447C124.212,9.563 124.329,9.649 124.465,9.695L127.075,10.605C127.171,10.64 127.259,10.695 127.331,10.768C127.404,10.84 127.46,10.928 127.495,11.025L128.405,13.635C128.45,13.77 128.536,13.888 128.652,13.971C128.768,14.054 128.907,14.099 129.05,14.099C129.192,14.099 129.331,14.054 129.447,13.971C129.563,13.888 129.649,13.77 129.695,13.635L130.605,11.025C130.641,10.929 130.697,10.842 130.769,10.769C130.842,10.697 130.929,10.641 131.025,10.605L133.635,9.695C133.77,9.649 133.888,9.563 133.971,9.447C134.054,9.331 134.099,9.192 134.099,9.05C134.099,8.907 134.054,8.768 133.971,8.652C133.888,8.536 133.77,8.45 133.635,8.405L131.025,7.495C130.928,7.46 130.84,7.404 130.768,7.331C130.695,7.259 130.64,7.171 130.605,7.075Z" />
+    <path android:fillColor="#fff29cf5" android:pathData="M129.26,69.63V69.62C129.26,68.455 128.315,67.51 127.15,67.51H125.03C123.864,67.51 122.92,68.455 122.92,69.62V69.63C122.92,70.795 123.864,71.74 125.03,71.74H127.15C128.315,71.74 129.26,70.795 129.26,69.63Z" />
+    <path android:fillColor="#fff29cf5" android:pathData="M112.34,69.63V69.62C112.34,68.455 111.395,67.51 110.23,67.51H108.11C106.945,67.51 106,68.455 106,69.62V69.63C106,70.795 106.945,71.74 108.11,71.74H110.23C111.395,71.74 112.34,70.795 112.34,69.63Z" />
+    <path android:fillColor="#fff29cf5" android:pathData="M117.62,81.25H117.63C118.796,81.25 119.74,80.305 119.74,79.14V77.02C119.74,75.855 118.796,74.91 117.63,74.91H117.62C116.455,74.91 115.51,75.855 115.51,77.02V79.14C115.51,80.305 116.455,81.25 117.62,81.25Z" />
+    <path android:fillColor="#fff29cf5" android:pathData="M117.62,64.34H117.63C118.796,64.34 119.74,63.395 119.74,62.23V60.11C119.74,58.945 118.796,58 117.63,58H117.62C116.455,58 115.51,58.945 115.51,60.11V62.23C115.51,63.395 116.455,64.34 117.62,64.34Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M10.46,31.73L9.05,27.73C8.982,27.518 8.849,27.333 8.669,27.202C8.489,27.071 8.273,27 8.05,27C7.827,27 7.611,27.071 7.431,27.202C7.251,27.333 7.118,27.518 7.05,27.73L5.64,31.73C5.588,31.879 5.504,32.015 5.393,32.127C5.283,32.24 5.148,32.326 5,32.38L1,33.79C0.735,33.79 0.48,33.895 0.293,34.083C0.105,34.27 0,34.525 0,34.79C0,35.055 0.105,35.309 0.293,35.497C0.48,35.685 0.735,35.79 1,35.79L5,37.2C5.148,37.254 5.283,37.34 5.393,37.452C5.504,37.565 5.588,37.701 5.64,37.85L7.05,41.85C7.118,42.062 7.251,42.247 7.431,42.378C7.611,42.509 7.827,42.58 8.05,42.58C8.273,42.58 8.489,42.509 8.669,42.378C8.849,42.247 8.982,42.062 9.05,41.85L10.46,37.85C10.512,37.701 10.596,37.565 10.707,37.452C10.817,37.34 10.952,37.254 11.1,37.2L15.1,35.79C15.365,35.79 15.62,35.685 15.807,35.497C15.995,35.309 16.1,35.055 16.1,34.79C16.1,34.525 15.995,34.27 15.807,34.083C15.62,33.895 15.365,33.79 15.1,33.79L11.1,32.38C10.952,32.326 10.817,32.24 10.707,32.127C10.596,32.015 10.512,31.879 10.46,31.73Z" />
+    <path android:fillColor="#ff202225" android:pathData="M67,81C89.091,81 107,63.091 107,41C107,18.909 89.091,1 67,1C44.909,1 27,18.909 27,41C27,63.091 44.909,81 67,81Z" />
+    <path android:fillColor="#ff4c7ffe" android:pathData="M79.784,16.384H54.698C52.649,16.384 50.988,18.045 50.988,20.094V62.388C50.988,64.437 52.649,66.097 54.698,66.097H79.784C81.832,66.097 83.493,64.437 83.493,62.388V20.094C83.493,18.045 81.832,16.384 79.784,16.384Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M79.879,20.208H54.602V62.273H79.879V20.208Z" />
+    <path android:fillColor="#ff5c8af8" android:pathData="M70.128,45.868L71.065,46.977C71.877,46.995 72.681,46.814 73.407,46.451C74.134,46.088 74.761,45.553 75.233,44.893C75.207,42.131 74.553,39.411 73.321,36.939C72.225,36.077 70.889,35.576 69.497,35.505L69.306,35.715C70.543,36.054 71.695,36.647 72.69,37.455C71.423,36.746 70.024,36.304 68.579,36.155C67.665,36.039 66.74,36.039 65.826,36.155H65.52C64.45,36.28 63.405,36.57 62.423,37.015L61.62,37.417C62.674,36.565 63.9,35.951 65.214,35.619L65.061,35.505C63.669,35.576 62.333,36.077 61.237,36.939C60.005,39.411 59.351,42.131 59.325,44.893C59.788,45.545 60.402,46.075 61.115,46.438C61.827,46.801 62.617,46.986 63.417,46.977L64.335,45.849C63.37,45.608 62.523,45.032 61.945,44.223L62.327,44.472H62.461C62.805,44.663 63.149,44.816 63.455,44.95C64.107,45.198 64.779,45.39 65.463,45.524C66.632,45.744 67.831,45.744 69,45.524C69.704,45.45 70.396,45.296 71.065,45.065C71.615,44.855 72.141,44.585 72.633,44.262C72.016,45.078 71.128,45.647 70.128,45.868ZM64.679,43.631C64.371,43.658 64.063,43.591 63.794,43.439C63.525,43.288 63.308,43.058 63.172,42.781C63.036,42.504 62.987,42.192 63.032,41.886C63.076,41.581 63.212,41.296 63.422,41.069C63.631,40.842 63.905,40.684 64.206,40.616C64.507,40.547 64.822,40.571 65.109,40.685C65.396,40.799 65.642,40.997 65.814,41.253C65.987,41.509 66.077,41.812 66.075,42.12C66.082,42.311 66.052,42.502 65.986,42.681C65.92,42.86 65.82,43.025 65.69,43.165C65.56,43.305 65.404,43.419 65.231,43.499C65.057,43.578 64.87,43.623 64.679,43.631ZM69.669,43.631C69.362,43.658 69.053,43.591 68.784,43.439C68.515,43.288 68.298,43.058 68.162,42.781C68.026,42.504 67.977,42.192 68.022,41.886C68.066,41.581 68.202,41.296 68.412,41.069C68.622,40.842 68.895,40.684 69.196,40.616C69.497,40.547 69.812,40.571 70.099,40.685C70.386,40.799 70.632,40.997 70.804,41.253C70.977,41.509 71.068,41.812 71.065,42.12C71.076,42.504 70.936,42.877 70.675,43.16C70.414,43.442 70.053,43.611 69.669,43.631Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/layout-land/view_overlay_menu.xml b/com.discord/res/layout-land/view_overlay_menu.xml
index f255a517d8..677bceb45b 100644
--- a/com.discord/res/layout-land/view_overlay_menu.xml
+++ b/com.discord/res/layout-land/view_overlay_menu.xml
@@ -3,9 +3,9 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_marginRight="8.0dip" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip">
         <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="fill_parent">
-            <ImageView android:id="@id/src_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/use_speaker" style="@style/UiKit.ImageView.Clickable" />
-            <ImageView android:id="@id/mute_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1.0" android:contentDescription="@string/mute" style="@style/UiKit.ImageView.Clickable" />
-            <ImageView android:id="@id/disconnect_btn" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/UiKit.ImageView.Clickable" />
+            <ImageView android:id="@id/src_toggle" android:padding="16.0dip" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/use_speaker" style="@style/UiKit.ImageView.Clickable" />
+            <ImageView android:id="@id/mute_toggle" android:padding="16.0dip" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1.0" android:contentDescription="@string/mute" style="@style/UiKit.ImageView.Clickable" />
+            <ImageView android:id="@id/disconnect_btn" android:padding="16.0dip" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/UiKit.ImageView.Clickable" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
     <include layout="@layout/view_overlay_menu_content" />
diff --git a/com.discord/res/layout-v22/emoji_picker_header_item.xml b/com.discord/res/layout-v22/emoji_picker_header_item.xml
index 7a5b3ea919..c829fc1d76 100644
--- a/com.discord/res/layout-v22/emoji_picker_header_item.xml
+++ b/com.discord/res/layout-v22/emoji_picker_header_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/header_item_text" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:textAllCaps="true" android:paddingHorizontal="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Bold"
+<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/header_item_text" android:background="?colorBackgroundSecondary" android:paddingLeft="4.0dip" android:paddingTop="4.0dip" android:paddingRight="4.0dip" android:paddingBottom="4.0dip" android:layout_width="fill_parent" android:textAllCaps="true" android:paddingHorizontal="4.0dip" style="@style/UiKit.TextView.Bold"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/flex_input_widget.xml b/com.discord/res/layout-v22/flex_input_widget.xml
index 6f18ec4d4b..04353e96c8 100644
--- a/com.discord/res/layout-v22/flex_input_widget.xml
+++ b/com.discord/res/layout-v22/flex_input_widget.xml
@@ -6,19 +6,19 @@
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4.0dip" style="@style/FlexInput.Input.Button" />
     </LinearLayout>
     <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
-        <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
+        <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="8.0dip" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8.0dip" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
         </LinearLayout>
-        <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView" />
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
+        <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView" />
+            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
         </LinearLayout>
-        <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
+        <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
             <ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:importantForAccessibility="no" app:tint="?chat_send_btn" />
         </FrameLayout>
-        <TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
+        <TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="24.0dip" android:paddingRight="12.0dip" android:paddingBottom="24.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
     </RelativeLayout>
     <FrameLayout android:id="@id/flex_input_expression_tray_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
     <FrameLayout android:id="@id/flex_input_default_window_insets_handler" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
diff --git a/com.discord/res/layout-v22/gif_search_empty_state_text_box_view.xml b/com.discord/res/layout-v22/gif_search_empty_state_text_box_view.xml
index 81fbed61ab..8a25f41ce6 100644
--- a/com.discord/res/layout-v22/gif_search_empty_state_text_box_view.xml
+++ b/com.discord/res/layout-v22/gif_search_empty_state_text_box_view.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="@dimen/uikit_spacing_small" android:layout_marginVertical="@dimen/uikit_spacing_small" android:paddingHorizontal="@dimen/uikit_spacing_medium" android:paddingVertical="@dimen/uikit_spacing_small" style="@style/UiKit.TextView"
+<androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="4.0dip" android:layout_marginBottom="4.0dip" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="4.0dip" android:layout_marginVertical="4.0dip" android:paddingHorizontal="8.0dip" android:paddingVertical="4.0dip" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/overlay_bubble_menu.xml b/com.discord/res/layout-v22/overlay_bubble_menu.xml
index 83f587a921..d1fa9e2e33 100644
--- a/com.discord/res/layout-v22/overlay_bubble_menu.xml
+++ b/com.discord/res/layout-v22/overlay_bubble_menu.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
         <View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
-        <View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" />
+        <View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" />
         <androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-        <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="@dimen/uikit_spacing_small" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/UiKit.TextView.H1.Bold" />
+        <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4.0dip" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/UiKit.TextView.H1.Bold" />
     </LinearLayout>
-    <com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
+    <com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/view_chat_upload.xml b/com.discord/res/layout-v22/view_chat_upload.xml
index 9298e92a1d..a60b95d4e4 100644
--- a/com.discord/res/layout-v22/view_chat_upload.xml
+++ b/com.discord/res/layout-v22/view_chat_upload.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<androidx.constraintlayout.widget.ConstraintLayout android:padding="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/file_image" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/display_name" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/display_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/display_name" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:ellipsize="middle" android:id="@id/display_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/subtitle_text" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/file_image" app:layout_constraintRight_toLeftOf="@id/subtitle_text" app:layout_constraintStart_toEndOf="@id/file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginHorizontal="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/failed_alert_icon" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/display_name" app:layout_constraintRight_toLeftOf="@id/failed_alert_icon" app:layout_constraintStart_toEndOf="@id/display_name" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:ellipsize="middle" android:id="@id/display_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/subtitle_text" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/file_image" app:layout_constraintRight_toLeftOf="@id/subtitle_text" app:layout_constraintStart_toEndOf="@id/file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginHorizontal="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/failed_alert_icon" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/display_name" app:layout_constraintRight_toLeftOf="@id/failed_alert_icon" app:layout_constraintStart_toEndOf="@id/display_name" />
     <ImageView android:id="@id/failed_alert_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_alert_circle_16dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintBottom_toBottomOf="@id/display_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/display_name" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/view_upload_progress.xml b/com.discord/res/layout-v22/view_upload_progress.xml
index 1cb6385108..3e493036dc 100644
--- a/com.discord/res/layout-v22/view_upload_progress.xml
+++ b/com.discord/res/layout-v22/view_upload_progress.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/progress_file_image" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@id/progress_text" app:layout_constraintEnd_toStartOf="@id/progress_text" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/progress_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/progress_text" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="middle" android:id="@id/progress_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/progress_bar" app:layout_constraintEnd_toStartOf="@id/progress_subtext" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_file_image" app:layout_constraintRight_toLeftOf="@id/progress_subtext" app:layout_constraintStart_toEndOf="@id/progress_file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:id="@id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginHorizontal="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/progress_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_text" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/progress_text" />
-    <ProgressBar android:id="@id/progress_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxHeight="1.0dip" android:max="100" android:minHeight="1.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/progress_text" style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="middle" android:id="@id/progress_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/progress_bar" app:layout_constraintEnd_toStartOf="@id/progress_subtext" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_file_image" app:layout_constraintRight_toLeftOf="@id/progress_subtext" app:layout_constraintStart_toEndOf="@id/progress_file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:id="@id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginHorizontal="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/progress_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_text" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/progress_text" />
+    <ProgressBar android:id="@id/progress_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:maxHeight="1.0dip" android:max="100" android:minHeight="1.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/progress_text" style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/widget_call_fullscreen.xml b/com.discord/res/layout-v22/widget_call_fullscreen.xml
index 5b7f1400f0..e9740ba6c7 100644
--- a/com.discord/res/layout-v22/widget_call_fullscreen.xml
+++ b/com.discord/res/layout-v22/widget_call_fullscreen.xml
@@ -7,6 +7,12 @@
         <TextView android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" android:paddingHorizontal="64.0dip" style="@style/UiKit.TextAppearance.Semibold" />
         <com.google.android.material.button.MaterialButton android:id="@id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
     </LinearLayout>
+    <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/call_streaming_active" android:background="@color/black" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
+        <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:src="@drawable/screen_share_illustration" />
+        <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/mobile_stream_active_header" android:textAlignment="center" android:paddingHorizontal="64.0dip" style="@style/UiKit.TextAppearance.Bold" />
+        <TextView android:textColor="@color/primary_dark_300" android:id="@id/call_streaming_active_body" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_active_body" android:textAlignment="center" android:paddingHorizontal="64.0dip" style="@style/UiKit.TextAppearance" />
+        <com.google.android.material.button.MaterialButton android:id="@id/call_stop_streaming_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mobile_stream_stop_sharing" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
+    </LinearLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
         <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
             <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
@@ -14,12 +20,12 @@
         <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16.0dip" android:layout_marginTop="32.0dip" app:cardCornerRadius="8.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" app:layout_goneMarginTop="72.0dip">
             <com.discord.views.video.VideoCallParticipantView android:id="@id/call_pip" android:visibility="gone" android:layout_width="140.0dip" android:layout_height="79.0dip" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="true" />
         </androidx.cardview.widget.CardView>
-        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/private_call_container" android:background="?ptrn_shapes" android:paddingTop="@dimen/uikit_spacing_xxxlarge" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
+        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/private_call_container" android:background="?ptrn_shapes" android:paddingTop="64.0dip" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
             <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/private_call_users_recycler" android:layout_width="wrap_content" android:layout_height="wrap_content" android:overScrollMode="never" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:id="@id/private_call_status_primary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:id="@id/private_call_status_primary" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_400" android:id="@id/private_call_status_secondary" style="@style/UiKit.TextView" />
         </LinearLayout>
         <com.discord.widgets.voice.controls.FloatingVoiceControlsView android:theme="@style/AppTheme.Dark" android:id="@id/call_controls_floating" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/call_floating_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
-        <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_700" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
+        <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_700" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml b/com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml
index fcf89ab7bc..4b4a8329bd 100644
--- a/com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml
+++ b/com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml
@@ -2,8 +2,8 @@
 <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginTop="8.0dip" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingHorizontal="16.0dip" android:paddingVertical="8.0dip">
-        <ImageView android:id="@id/chat_list_adapter_item_call_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:id="@id/chat_list_adapter_item_call_title" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginHorizontal="16.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView" />
+        <ImageView android:id="@id/chat_list_adapter_item_call_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_call_title" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginHorizontal="16.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView" />
         <TextView android:textSize="12.0dip" android:id="@id/chat_list_adapter_item_call_subtitle" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/sample_time_pm" android:layout_marginHorizontal="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="packed" style="@style/CallMessage.Subtitle" />
         <LinearLayout android:id="@id/chat_list_adapter_item_call_unjoined_ongoing_subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginHorizontal="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <TextView android:textSize="12.0dip" android:id="@id/chat_list_adapter_item_unjoined_call_duration" android:layout_width="wrap_content" style="@style/CallMessage.Subtitle" />
diff --git a/com.discord/res/layout-v22/widget_emoji_picker.xml b/com.discord/res/layout-v22/widget_emoji_picker.xml
index 95e4cd4a6a..3cbe89c78d 100644
--- a/com.discord/res/layout-v22/widget_emoji_picker.xml
+++ b/com.discord/res/layout-v22/widget_emoji_picker.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/emoji_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
-            <RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
+            <RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
                 <TextView android:gravity="center_vertical" android:id="@id/emoji_inline_search_button" android:background="?bg_pressed_highlight" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
                 <com.google.android.material.textfield.TextInputEditText android:id="@id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
                 <ImageView android:id="@id/emoji_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_emoji" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
@@ -12,10 +12,10 @@
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_marginHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="16.0dip" style="@style/UiKit.TextView" />
     </com.discord.app.AppViewFlipper>
     <View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:elevation="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@id/emoji_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
         <androidx.constraintlayout.widget.Barrier android:id="@id/emoji_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="emoji_picker_unicode_emoji_shortcut_button,emoji_picker_backspace_icon" />
         <ImageView android:id="@id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@id/emoji_picker_category_barrier" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
diff --git a/com.discord/res/layout-v22/widget_expression_tray.xml b/com.discord/res/layout-v22/widget_expression_tray.xml
index a3a17fea75..03f536f65a 100644
--- a/com.discord/res/layout-v22/widget_expression_tray.xml
+++ b/com.discord/res/layout-v22/widget_expression_tray.xml
@@ -13,9 +13,9 @@
                             <TextView android:id="@id/expression_tray_gif_button" android:text="@string/gif" style="@style/ExpressionTrayTab" />
                         </androidx.cardview.widget.CardView>
                     </LinearLayout>
-                    <com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" android:layout_marginHorizontal="12.0dip" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
-                        <TextView android:gravity="center_vertical" android:id="@id/expression_tray_search_button" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
-                        <ImageView android:id="@id/expression_tray_search_icon" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" />
+                    <com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" android:layout_marginHorizontal="12.0dip" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
+                        <TextView android:gravity="center_vertical" android:id="@id/expression_tray_search_button" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
+                        <ImageView android:id="@id/expression_tray_search_icon" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" />
                     </com.discord.utilities.view.rounded.RoundedRelativeLayout>
                 </LinearLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/com.discord/res/layout-v22/widget_gif_picker_search.xml b/com.discord/res/layout-v22/widget_gif_picker_search.xml
index 9d9e974bf4..4abec668d6 100644
--- a/com.discord/res/layout-v22/widget_gif_picker_search.xml
+++ b/com.discord/res/layout-v22/widget_gif_picker_search.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar android:id="@id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
-            <RelativeLayout android:id="@id/gif_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="12.0dip" android:layout_marginVertical="@dimen/uikit_spacing_large">
+            <RelativeLayout android:id="@id/gif_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="16.0dip" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="12.0dip" android:layout_marginVertical="16.0dip">
                 <com.google.android.material.textfield.TextInputEditText android:id="@id/gif_search_input" android:background="@null" android:visibility="visible" android:layout_height="wrap_content" android:hint="@string/search_tenor" style="@style/ExpressionSearchInput" />
                 <ImageView android:id="@id/gif_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/reset" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
             </RelativeLayout>
diff --git a/com.discord/res/layout-v22/widget_guild_clone.xml b/com.discord/res/layout-v22/widget_guild_clone.xml
index eabee75233..5c26f4e25b 100644
--- a/com.discord/res/layout-v22/widget_guild_clone.xml
+++ b/com.discord/res/layout-v22/widget_guild_clone.xml
@@ -7,39 +7,39 @@
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <com.discord.app.AppViewFlipper android:id="@id/guild_create_flipper" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
             <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_resolving_title" style="@style/UiKit.TextView.H2" />
+                <TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_resolving_title" style="@style/UiKit.TextView.H2" />
                 <ProgressBar android:id="@id/loading_button_progress" android:layout_width="30.0dip" android:layout_height="30.0dip" />
             </LinearLayout>
             <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_invalid_title" style="@style/UiKit.TextView.H2" />
-                <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit.TextView.Subtext" />
+                <TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_invalid_title" style="@style/UiKit.TextView.H2" />
+                <TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit.TextView.Subtext" />
             </LinearLayout>
             <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_width="fill_parent" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_modal_title" style="@style/UiKit.TextView.Bold" />
-                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
-                <include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" layout="@layout/layout_icon_uploader" />
-                <LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
-                    <TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_width="fill_parent" android:layout_marginBottom="8.0dip" android:text="@string/guild_template_modal_title" style="@style/UiKit.TextView.Bold" />
+                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
+                <include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24.0dip" layout="@layout/layout_icon_uploader" />
+                <LinearLayout android:padding="16.0dip" style="@style/UiKit.Copy">
+                    <TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="8.0dip" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
                     <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_create_name" android:hint="@string/form_placeholder_server_name" style="@style/UiKit.TextInputLayout">
-                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="@dimen/uikit_spacing_medium" android:importantForAutofill="no" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
+                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="8.0dip" android:importantForAutofill="no" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
                     </com.google.android.material.textfield.TextInputLayout>
-                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
-                    <com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100" />
+                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView.Subtext" />
+                    <com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100" />
                     <TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
                 </LinearLayout>
-                <LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
+                <LinearLayout android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+                    <View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="16.0dip" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
                     <TextView android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
                     <TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit.TextView.Subtext" />
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
-                        <com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8.0dip" android:layout_marginTop="8.0dip" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
+                        <com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" />
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+                <LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="16.0dip" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                     <TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit.TextView.H1.Bold" />
                     <TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit.TextView.Subtext" />
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
-                        <com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8.0dip" android:layout_marginTop="8.0dip" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
+                        <com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
diff --git a/com.discord/res/layout-v22/widget_notice_popup.xml b/com.discord/res/layout-v22/widget_notice_popup.xml
index ad7e3f4454..5713760d5b 100644
--- a/com.discord/res/layout-v22/widget_notice_popup.xml
+++ b/com.discord/res/layout-v22/widget_notice_popup.xml
@@ -2,8 +2,8 @@
 <LinearLayout android:background="?notice_popup_bg" android:focusable="false" android:focusableInTouchMode="false" android:maxWidth="@dimen/popup_notif_max_width" android:focusedByDefault="false" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" app:roundAsCircle="true" style="@style/Avatar.Notification" />
-        <LinearLayout android:layout_gravity="center_vertical" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="8.0dip" app:roundAsCircle="true" style="@style/Avatar.Notification" />
+        <LinearLayout android:layout_gravity="center_vertical" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Subtext.SingleLine" />
             <com.discord.app.AppTextView android:textColor="?colorTextNormal" android:ellipsize="end" android:id="@id/popup_body" android:maxLines="3" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
         </LinearLayout>
diff --git a/com.discord/res/layout-v22/widget_notice_popup_channel.xml b/com.discord/res/layout-v22/widget_notice_popup_channel.xml
index d5e362ead0..b4832c3233 100644
--- a/com.discord/res/layout-v22/widget_notice_popup_channel.xml
+++ b/com.discord/res/layout-v22/widget_notice_popup_channel.xml
@@ -2,12 +2,12 @@
 <LinearLayout android:background="?notice_popup_bg" android:focusable="false" android:focusableInTouchMode="false" android:maxWidth="@dimen/popup_notif_max_width" android:focusedByDefault="false" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
-        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
-            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.SingleLine" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="8.0dip" style="@style/Avatar.Notification" />
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="32.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
             <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_subtitle" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.SingleLine" />
-            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
+            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="2.0dip" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="64.0dip" android:layout_height="64.0dip" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
         </androidx.constraintlayout.widget.ConstraintLayout>
         <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
     </LinearLayout>
diff --git a/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml b/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml
index 4d91c6abf3..e1e713dbb1 100644
--- a/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml
+++ b/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme.Toolbar">
-        <com.discord.views.LoadingButton android:layout_gravity="end|center" android:id="@id/dialog_save" android:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:lb_progress_color="?primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?primary_100" />
+    <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme.Toolbar">
+        <com.discord.views.LoadingButton android:layout_gravity="end|center" android:id="@id/dialog_save" android:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" app:lb_progress_color="?primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?primary_100" />
     </androidx.appcompat.widget.Toolbar>
     <androidx.core.widget.NestedScrollView android:layout_weight="1.0" style="@style/UiKit.ViewGroup.NestedScrollView">
-        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
-            <com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
-            <com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
-            <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
+        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
+            <com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="8.0dip" />
+            <com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="8.0dip" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:layout_marginTop="8.0dip" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_name" android:hint="@string/billing_address_name" android:autofillHints="name" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit.TextInputLayout.EditText" />
             </com.google.android.material.textfield.TextInputLayout>
@@ -31,8 +31,8 @@
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_country" android:focusable="false" android:hint="@string/billing_address_country" app:endIconDrawable="@drawable/ic_lock_white_a60_16dp" app:endIconMode="custom" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:textColor="?primary_400" android:inputType="none" style="@style/UiKit.TextInputLayout.EditText" />
             </com.google.android.material.textfield.TextInputLayout>
-            <CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="@dimen/uikit_spacing_medium" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
-            <com.google.android.material.button.MaterialButton android:id="@id/dialog_delete" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/payment_source_delete" style="@style/UiKit.Material.Button.Red.Outline" />
+            <CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="8.0dip" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
+            <com.google.android.material.button.MaterialButton android:id="@id/dialog_delete" android:layout_marginTop="24.0dip" android:layout_marginBottom="24.0dip" android:text="@string/payment_source_delete" style="@style/UiKit.Material.Button.Red.Outline" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/widget_settings_account_change_password.xml b/com.discord/res/layout-v22/widget_settings_account_change_password.xml
index 2549189dc3..59127a8456 100644
--- a/com.discord/res/layout-v22/widget_settings_account_change_password.xml
+++ b/com.discord/res/layout-v22/widget_settings_account_change_password.xml
@@ -5,7 +5,7 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.ScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <com.google.android.material.textfield.TextInputLayout android:id="@id/change_password_current_password_input" android:hint="@string/form_label_current_password" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password">
                     <requestFocus />
diff --git a/com.discord/res/layout-w600dp/widget_guild_invite_info.xml b/com.discord/res/layout-w600dp/widget_guild_invite_info.xml
index 716737b3ab..62e0565439 100644
--- a/com.discord/res/layout-w600dp/widget_guild_invite_info.xml
+++ b/com.discord/res/layout-w600dp/widget_guild_invite_info.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="96.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="96.0dip" android:layout_marginBottom="16.0dip" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
-        <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+        <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
             <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="64.0dip">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
             </androidx.cardview.widget.CardView>
             <RelativeLayout android:id="@id/invite_avatar_small_wrap" android:background="?colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="-3.0dip" android:layout_alignParentBottom="true" android:layout_marginEnd="-3.0dip" android:layout_alignParentEnd="true" />
         </RelativeLayout>
-        <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23.0dip">
+        <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginTop="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
+        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23.0dip">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar_small" style="@style/Avatar.Large" />
             </androidx.cardview.widget.CardView>
-            <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+            <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <androidx.cardview.widget.CardView android:id="@id/invite_members_online_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/uikit_spacing_small" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
-                <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_green_500" app:roundAsCircle="true" />
+        <LinearLayout android:gravity="center" android:id="@id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <androidx.cardview.widget.CardView android:id="@id/invite_members_online_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginEnd="4.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
+                <LinearLayout android:gravity="center" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8.0dip" android:layout_height="8.0dip" android:layout_marginEnd="8.0dip" app:placeholderImage="@color/status_green_500" app:roundAsCircle="true" />
                     <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
-            <androidx.cardview.widget.CardView android:id="@id/invite_members_total_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_small" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
-                <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
+            <androidx.cardview.widget.CardView android:id="@id/invite_members_total_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
+                <LinearLayout android:gravity="center" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8.0dip" android:layout_height="8.0dip" android:layout_marginEnd="8.0dip" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
                     <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/invite_members_total" android:singleLine="true" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
diff --git a/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml b/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml
index e27cdcd24e..9ec4fe48bf 100644
--- a/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml
+++ b/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:gravity="center_vertical" android:id="@id/active_subscription_payment_method_spinner_item_text" android:padding="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView"
+<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:gravity="center_vertical" android:id="@id/active_subscription_payment_method_spinner_item_text" android:padding="8.0dip" android:drawablePadding="8.0dip" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/allow_accessibility_detection_dialog.xml b/com.discord/res/layout/allow_accessibility_detection_dialog.xml
index f870d8ee04..834b54b88b 100644
--- a/com.discord/res/layout/allow_accessibility_detection_dialog.xml
+++ b/com.discord/res/layout/allow_accessibility_detection_dialog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/view_dialog_confirmation_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/accessibility_detection_modal_header" style="@style/UiKit.TextView" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/view_dialog_confirmation_header" android:padding="16.0dip" android:text="@string/accessibility_detection_modal_header" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Divider" />
-    <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/accessibility_detection_body_text" android:padding="@dimen/uikit_spacing_large" android:text="@string/accessibility_detection_modal_body" style="@style/UiKit.TextView" />
+    <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/accessibility_detection_body_text" android:padding="16.0dip" android:text="@string/accessibility_detection_modal_body" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
diff --git a/com.discord/res/layout/anchored_voice_controls_view.xml b/com.discord/res/layout/anchored_voice_controls_view.xml
index 3f1aaa2ef7..99a4c1e662 100644
--- a/com.discord/res/layout/anchored_voice_controls_view.xml
+++ b/com.discord/res/layout/anchored_voice_controls_view.xml
@@ -2,11 +2,12 @@
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:id="@id/voice_fullscreen_controls_controls_wrap" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <ImageView android:id="@id/voice_fullscreen_controls_camera" android:background="?selectableItemBackground" android:paddingTop="15.0dip" android:paddingBottom="15.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_videocam_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/camera" />
-        <ImageView android:id="@id/voice_fullscreen_controls_deafen_state" android:background="?selectableItemBackground" android:paddingTop="15.0dip" android:paddingBottom="15.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="?ic_deafen_state" android:layout_weight="1.0" android:contentDescription="@string/deafen" />
-        <ImageView android:id="@id/voice_fullscreen_controls_mute_state" android:background="?selectableItemBackground" android:paddingTop="15.0dip" android:paddingBottom="15.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="?ic_mic_state" android:layout_weight="1.0" android:contentDescription="@string/mute" />
-        <ImageView android:id="@id/voice_fullscreen_controls_speaker" android:background="?selectableItemBackground" android:paddingTop="15.0dip" android:paddingBottom="15.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_audio_output_white_24dp" android:tint="?colorInteractiveNormal" android:layout_weight="1.0" android:contentDescription="@string/switch_audio_output" />
-        <ImageView android:id="@id/voice_fullscreen_controls_disconnect" android:background="?selectableItemBackground" android:paddingTop="15.0dip" android:paddingBottom="15.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/ic_call_disconnect_24dp" android:tint="@color/status_red_500" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" />
+        <ImageView android:id="@id/voice_fullscreen_controls_camera" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_videocam_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/camera" />
+        <ImageView android:id="@id/voice_fullscreen_controls_screenshare" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_mobile_screenshare_24dp" android:tint="?colorInteractiveNormal" android:layout_weight="1.0" android:contentDescription="@string/deafen" />
+        <ImageView android:id="@id/voice_fullscreen_controls_deafen" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="?ic_deafen_state" android:layout_weight="1.0" android:contentDescription="@string/deafen" />
+        <ImageView android:id="@id/voice_fullscreen_controls_mute_state" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="?ic_mic_state" android:layout_weight="1.0" android:contentDescription="@string/mute" />
+        <ImageView android:id="@id/voice_fullscreen_controls_speaker" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_audio_output_white_24dp" android:tint="?colorInteractiveNormal" android:layout_weight="1.0" android:contentDescription="@string/switch_audio_output" />
+        <ImageView android:id="@id/voice_fullscreen_controls_disconnect" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/ic_call_disconnect_24dp" android:tint="@color/status_red_500" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" />
     </LinearLayout>
-    <com.google.android.material.button.MaterialButton android:id="@id/voice_fullscreen_controls_ptt" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/input_mode_ptt" style="@style/UiKit.Material.Button" />
+    <com.google.android.material.button.MaterialButton android:id="@id/voice_fullscreen_controls_ptt" android:visibility="gone" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/input_mode_ptt" style="@style/UiKit.Material.Button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/call_user_item.xml b/com.discord/res/layout/call_user_item.xml
index 988bd08ed0..220952698b 100644
--- a/com.discord/res/layout/call_user_item.xml
+++ b/com.discord/res/layout/call_user_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.VoiceUserView android:id="@id/call_user_item_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:vuv_avatar_size="@dimen/call_participant_avatar_size"
+<com.discord.views.VoiceUserView android:id="@id/call_user_item_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:vuv_avatar_size="@dimen/call_participant_avatar_size"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/com.discord/res/layout/camera_capacity_dialog.xml b/com.discord/res/layout/camera_capacity_dialog.xml
index a68cf4ea5e..e43688aeb2 100644
--- a/com.discord/res/layout/camera_capacity_dialog.xml
+++ b/com.discord/res/layout/camera_capacity_dialog.xml
@@ -2,10 +2,10 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:padding="@dimen/uikit_spacing_large" android:text="@string/video_capacity_modal_header" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:padding="16.0dip" android:text="@string/video_capacity_modal_header" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
-    <TextView android:textColor="@color/primary_200" android:id="@id/camera_capacity_body" android:paddingTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/video_capacity_modal_body" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+    <TextView android:textColor="@color/primary_200" android:id="@id/camera_capacity_body" android:paddingTop="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/video_capacity_modal_body" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@id/camera_capacity_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/okay" style="@style/UiKit.Material.Button" />
diff --git a/com.discord/res/layout/dialog_add_content_pager_with_fab.xml b/com.discord/res/layout/dialog_add_content_pager_with_fab.xml
index d850ebaa66..1084b5a0d8 100644
--- a/com.discord/res/layout/dialog_add_content_pager_with_fab.xml
+++ b/com.discord/res/layout/dialog_add_content_pager_with_fab.xml
@@ -2,7 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?flexInputDialogBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/FlexInput.DialogWhenLarge"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.viewpager.widget.ViewPager android:layout_gravity="bottom" android:id="@id/content_pager" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" style="@style/FlexInput.AddContent" />
-    <FrameLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/FlexInput.AddContent.Container.TabLayout">
+    <FrameLayout android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/FlexInput.AddContent.Container.TabLayout">
         <com.google.android.material.tabs.TabLayout android:id="@id/content_tabs" android:background="?primary_800_bg" style="@style/FlexInput.AddContent.TabLayout">
             <com.google.android.material.tabs.TabItem android:icon="@drawable/ic_keyboard_24dp" android:id="@id/add_content_keyboard_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/show_keyboard" />
         </com.google.android.material.tabs.TabLayout>
diff --git a/com.discord/res/layout/dialog_date_picker.xml b/com.discord/res/layout/dialog_date_picker.xml
index ad934bd37d..a0b6c1f684 100644
--- a/com.discord/res/layout/dialog_date_picker.xml
+++ b/com.discord/res/layout/dialog_date_picker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:gravity="center" android:id="@id/dialog_date_picker_title" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:gravity="center" android:id="@id/dialog_date_picker_title" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView.H1.Bold" />
     <DatePicker android:theme="@style/DialogDatePicker" android:id="@id/dialog_date_picker_input" android:layout_width="fill_parent" android:layout_height="fill_parent" android:calendarViewShown="false" android:datePickerMode="spinner" />
-    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@id/dialog_date_picker_done" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/done" style="@style/UiKit.Material.Button" />
+    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@id/dialog_date_picker_done" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/done" style="@style/UiKit.Material.Button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/dialog_simple_selector.xml b/com.discord/res/layout/dialog_simple_selector.xml
index 17a7a2a84e..a59678919a 100644
--- a/com.discord/res/layout/dialog_simple_selector.xml
+++ b/com.discord/res/layout/dialog_simple_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:id="@id/dialog_title" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.4" android:elevation="@dimen/app_elevation" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:id="@id/dialog_title" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:lineSpacingMultiplier="1.4" android:elevation="@dimen/app_elevation" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Settings.Divider" />
     <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:orientation="vertical" android:id="@id/dialog_selections" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layoutManager="LinearLayoutManager" app:max_height="420.0dip" />
     <View style="@style/UiKit.Divider" />
diff --git a/com.discord/res/layout/dialog_simple_selector_item.xml b/com.discord/res/layout/dialog_simple_selector_item.xml
index a53cfdc6ec..0536fc4302 100644
--- a/com.discord/res/layout/dialog_simple_selector_item.xml
+++ b/com.discord/res/layout/dialog_simple_selector_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textSize="@dimen/uikit_textsize_large" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:text="@string/sample_number_9" style="@style/UiKit.TextView.Semibold"
+<TextView android:textSize="@dimen/uikit_textsize_large" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:text="@string/sample_number_9" style="@style/UiKit.TextView.Semibold"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/emoji_picker_emoji_item.xml b/com.discord/res/layout/emoji_picker_emoji_item.xml
index df3d8ee461..d786a4e2fa 100644
--- a/com.discord/res/layout/emoji_picker_emoji_item.xml
+++ b/com.discord/res/layout/emoji_picker_emoji_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.facebook.drawee.view.SimpleDraweeView android:id="@id/emoji_item_draweeview" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/uikit_spacing_small" android:layout_width="@dimen/chat_input_emoji_size" android:layout_height="@dimen/chat_input_emoji_size" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" app:placeholderImageScaleType="fitCenter"
+<com.facebook.drawee.view.SimpleDraweeView android:id="@id/emoji_item_draweeview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="@dimen/chat_input_emoji_size" android:layout_height="@dimen/chat_input_emoji_size" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" app:placeholderImageScaleType="fitCenter"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/com.discord/res/layout/emoji_picker_header_item.xml b/com.discord/res/layout/emoji_picker_header_item.xml
index f672d5f978..3fa3729987 100644
--- a/com.discord/res/layout/emoji_picker_header_item.xml
+++ b/com.discord/res/layout/emoji_picker_header_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/header_item_text" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:textAllCaps="true" style="@style/UiKit.TextView.Bold"
+<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/header_item_text" android:background="?colorBackgroundSecondary" android:paddingLeft="4.0dip" android:paddingTop="4.0dip" android:paddingRight="4.0dip" android:paddingBottom="4.0dip" android:layout_width="fill_parent" android:textAllCaps="true" style="@style/UiKit.TextView.Bold"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/empty_friends_state_view.xml b/com.discord/res/layout/empty_friends_state_view.xml
index 0eff10e385..fec37c6831 100644
--- a/com.discord/res/layout/empty_friends_state_view.xml
+++ b/com.discord/res/layout/empty_friends_state_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/FriendsList.EmptyState"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:src="@drawable/img_wumpus_playing_with_friends" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="@dimen/uikit_spacing_xxlarge" android:layout_marginEnd="@dimen/uikit_spacing_xxlarge" style="@style/FriendsList.EmptyState.Image" />
+    <ImageView android:src="@drawable/img_wumpus_playing_with_friends" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" style="@style/FriendsList.EmptyState.Image" />
     <TextView android:id="@id/empty_friends_state_title" android:text="@string/friends_empty_state_all" style="@style/FriendsList.EmptyState.Title" />
     <TextView android:text="@string/friends_empty_state_subtitle" style="@style/FriendsList.EmptyState.Subtitle" />
     <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@id/empty_friends_state_add_friend" android:text="@string/add_friend" android:singleLine="true" style="@style/UiKit.Material.Button" />
diff --git a/com.discord/res/layout/exo_playback_control_view.xml b/com.discord/res/layout/exo_playback_control_view.xml
index cba252afde..375afad47b 100644
--- a/com.discord/res/layout/exo_playback_control_view.xml
+++ b/com.discord/res/layout/exo_playback_control_view.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:gravity="center_vertical" android:background="@color/primary_900_alpha_80" android:padding="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <ImageButton android:id="@id/exo_play" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/ExoMediaButton.Play" />
-        <ImageButton android:id="@id/exo_pause" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/ExoMediaButton.Pause" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="14.0dip" android:textColor="@color/white" android:id="@id/exo_position" android:minWidth="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+    <LinearLayout android:gravity="center_vertical" android:background="@color/primary_900_alpha_80" android:padding="16.0dip" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <ImageButton android:id="@id/exo_play" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginEnd="16.0dip" style="@style/ExoMediaButton.Play" />
+        <ImageButton android:id="@id/exo_pause" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginEnd="16.0dip" style="@style/ExoMediaButton.Pause" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="14.0dip" android:textColor="@color/white" android:id="@id/exo_position" android:minWidth="40.0dip" android:layout_marginEnd="8.0dip" style="@style/UiKit.TextView" />
         <com.google.android.exoplayer2.ui.DefaultTimeBar android:id="@id/exo_progress" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="14.0dip" android:textColor="@color/white" android:id="@id/exo_duration" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="14.0dip" android:textColor="@color/white" android:id="@id/exo_duration" android:layout_marginStart="8.0dip" style="@style/UiKit.TextView" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/feedback_view.xml b/com.discord/res/layout/feedback_view.xml
index 7c69d83112..d2ee6b7bc6 100644
--- a/com.discord/res/layout/feedback_view.xml
+++ b/com.discord/res/layout/feedback_view.xml
@@ -3,8 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:id="@id/feedback_rating_summary_prompt" style="@style/Feedback.Row.Prompt" />
     <LinearLayout style="@style/Feedback.Row.RatingContainer">
-        <ImageView android:id="@id/feedback_sad_rating" android:src="?ic_selectable_feedback_sad" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ImageView.Clickable" />
-        <ImageButton android:id="@id/feedback_neutral_rating" android:src="?ic_selectable_feedback_neutral" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ImageView.Clickable" />
+        <ImageView android:id="@id/feedback_sad_rating" android:src="?ic_selectable_feedback_sad" android:layout_marginEnd="24.0dip" style="@style/UiKit.ImageView.Clickable" />
+        <ImageButton android:id="@id/feedback_neutral_rating" android:src="?ic_selectable_feedback_neutral" android:layout_marginEnd="24.0dip" style="@style/UiKit.ImageView.Clickable" />
         <ImageButton android:id="@id/feedback_happy_rating" android:src="?ic_selectable_feedback_happy" style="@style/UiKit.ImageView.Clickable" />
     </LinearLayout>
     <TextView android:id="@id/feedback_issue_section_header" android:visibility="gone" style="@style/Feedback.Row.SectionHeader" />
diff --git a/com.discord/res/layout/flex_input_widget.xml b/com.discord/res/layout/flex_input_widget.xml
index e2e1991707..5c582357f2 100644
--- a/com.discord/res/layout/flex_input_widget.xml
+++ b/com.discord/res/layout/flex_input_widget.xml
@@ -6,19 +6,19 @@
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4.0dip" style="@style/FlexInput.Input.Button" />
     </LinearLayout>
     <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
-        <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
+        <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="8.0dip" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8.0dip" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
         </LinearLayout>
-        <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView" />
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
+        <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView" />
+            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
         </LinearLayout>
-        <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
+        <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
             <ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:importantForAccessibility="no" app:tint="?chat_send_btn" />
         </FrameLayout>
-        <TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
+        <TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="24.0dip" android:paddingRight="12.0dip" android:paddingBottom="24.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
     </RelativeLayout>
     <FrameLayout android:id="@id/flex_input_expression_tray_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
     <FrameLayout android:id="@id/flex_input_default_window_insets_handler" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
diff --git a/com.discord/res/layout/fragment_camera.xml b/com.discord/res/layout/fragment_camera.xml
index b16e8d6864..8afe533e96 100644
--- a/com.discord/res/layout/fragment_camera.xml
+++ b/com.discord/res/layout/fragment_camera.xml
@@ -8,5 +8,5 @@
         <ImageView android:id="@id/take_photo_btn" android:layout_width="56.0dip" android:layout_height="56.0dip" android:contentDescription="@string/take_a_photo" style="@style/FlexInput.Input.Button.Camera.Capture" />
         <ImageButton android:id="@id/launch_camera_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/camera" style="@style/FlexInput.Input.Button.Camera.Launcher" />
     </RelativeLayout>
-    <ViewStub android:id="@id/permissions_view_stub" android:layout="@layout/view_permissions_required" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup" />
+    <ViewStub android:id="@id/permissions_view_stub" android:layout="@layout/view_permissions_required" android:layout_marginTop="32.0dip" style="@style/UiKit.ViewGroup" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/gif_category_item_view.xml b/com.discord/res/layout/gif_category_item_view.xml
index 9b782195a5..1ddff6e166 100644
--- a/com.discord/res/layout/gif_category_item_view.xml
+++ b/com.discord/res/layout/gif_category_item_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="96.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
+<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="96.0dip" android:layout_marginBottom="8.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/gif_category_item_preview" android:layout_width="fill_parent" android:layout_height="fill_parent" android:scaleType="centerCrop" app:placeholderImage="?colorBackgroundPrimary" />
     <View android:background="@color/primary_800_alpha_50" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-    <LinearLayout android:layout_gravity="start|bottom|center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/gif_category_item_icon" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:tint="@color/white" />
+    <LinearLayout android:layout_gravity="start|bottom|center" android:layout_marginBottom="8.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <ImageView android:layout_gravity="center_vertical" android:id="@id/gif_category_item_icon" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginEnd="8.0dip" app:tint="@color/white" />
         <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textColor="@color/white" android:layout_gravity="start|bottom|center" android:id="@id/gif_category_item_title" style="@style/UiKit.TextView" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/gif_item_view.xml b/com.discord/res/layout/gif_item_view.xml
index b69320128b..0166ce20af 100644
--- a/com.discord/res/layout/gif_item_view.xml
+++ b/com.discord/res/layout/gif_item_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
+<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_marginBottom="8.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/gif_item_image" android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?colorBackgroundPrimary" />
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/gif_search_empty_state_text_box_view.xml b/com.discord/res/layout/gif_search_empty_state_text_box_view.xml
index dbe3cb6f49..795cc12df5 100644
--- a/com.discord/res/layout/gif_search_empty_state_text_box_view.xml
+++ b/com.discord/res/layout/gif_search_empty_state_text_box_view.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.TextView"
+<androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="4.0dip" android:layout_marginBottom="4.0dip" android:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/gif_suggested_term_view.xml b/com.discord/res/layout/gif_suggested_term_view.xml
index 89f334735d..8aad05494a 100644
--- a/com.discord/res/layout/gif_suggested_term_view.xml
+++ b/com.discord/res/layout/gif_suggested_term_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center" android:id="@id/gif_search_suggested_terms_container" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/gif_search_suggested_terms_icon_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_gif_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView" />
-    <com.google.android.flexbox.FlexboxLayout android:id="@id/gif_search_suggested_terms_flex_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" app:alignItems="center" app:flexWrap="wrap" app:justifyContent="center" app:layout_minHeight="24.0dip" app:layout_minWidth="48.0dip" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/gif_search_suggested_terms_icon_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_gif_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="16.0dip" android:textAlignment="center" style="@style/UiKit.TextView" />
+    <com.google.android.flexbox.FlexboxLayout android:id="@id/gif_search_suggested_terms_flex_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" app:alignItems="center" app:flexWrap="wrap" app:justifyContent="center" app:layout_minHeight="24.0dip" app:layout_minWidth="48.0dip" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/guild_channel_side_bar_actions_view.xml b/com.discord/res/layout/guild_channel_side_bar_actions_view.xml
index 99e05530d4..2b101ff1da 100644
--- a/com.discord/res/layout/guild_channel_side_bar_actions_view.xml
+++ b/com.discord/res/layout/guild_channel_side_bar_actions_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<merge android:padding="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.button.MaterialButton android:id="@id/channel_sidebar_actions_search" android:text="@string/search" android:drawableTop="@drawable/ic_sidebar_search_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/ChannelSideBarActions.Actions.Button" />
     <com.google.android.material.button.MaterialButton android:id="@id/channel_sidebar_actions_pins" android:text="@string/pins" android:drawableTop="@drawable/ic_sidebar_pins_on_dark_24dp" style="@style/ChannelSideBarActions.Actions.Button" />
diff --git a/com.discord/res/layout/guild_role_chip.xml b/com.discord/res/layout/guild_role_chip.xml
index 8c132a9783..feb762d0ea 100644
--- a/com.discord/res/layout/guild_role_chip.xml
+++ b/com.discord/res/layout/guild_role_chip.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.chip.Chip android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" app:chipBackgroundColor="?colorBackgroundTertiary" app:chipCornerRadius="4.0dip" app:chipIcon="@drawable/drawable_circle_white_12dp" app:chipIconSize="12.0sp" app:chipStartPadding="@dimen/uikit_spacing_medium" app:ensureMinTouchTargetSize="false"
+<com.google.android.material.chip.Chip android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" app:chipBackgroundColor="?colorBackgroundTertiary" app:chipCornerRadius="4.0dip" app:chipIcon="@drawable/drawable_circle_white_12dp" app:chipIconSize="12.0sp" app:chipStartPadding="8.0dip" app:ensureMinTouchTargetSize="false"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/com.discord/res/layout/guild_role_item.xml b/com.discord/res/layout/guild_role_item.xml
index c787d95668..cd05fd65fe 100644
--- a/com.discord/res/layout/guild_role_item.xml
+++ b/com.discord/res/layout/guild_role_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_small" app:cardBackgroundColor="?primary_700" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip"
+<androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:layout_marginEnd="4.0dip" app:cardBackgroundColor="?primary_700" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/guild_role_item_text" android:padding="@dimen/uikit_spacing_medium" android:maxLines="1" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
+    <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/guild_role_item_text" android:padding="8.0dip" android:maxLines="1" android:drawablePadding="8.0dip" style="@style/UiKit.TextView.Subtext" />
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/guild_template_channels_item_view.xml b/com.discord/res/layout/guild_template_channels_item_view.xml
index f5b8c93b75..34c74e0a80 100644
--- a/com.discord/res/layout/guild_template_channels_item_view.xml
+++ b/com.discord/res/layout/guild_template_channels_item_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_vertical" android:layout_height="40.0sp" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/guild_template_channels_item_image" android:layout_width="20.0dip" android:layout_height="20.0dip" android:src="@drawable/ic_chevron_down_grey_12dp" android:contentDescription="@string/sample_empty_string" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/guild_template_channels_item_image" android:layout_width="20.0dip" android:layout_height="20.0dip" android:src="@drawable/ic_chevron_down_grey_12dp" android:contentDescription="@string/sample_empty_string" android:layout_marginEnd="8.0dip" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView" />
     <TextView android:textColor="?colorChannelDefault" android:gravity="center" android:id="@id/guild_template_channels_item_name" style="@style/UiKit.TextView.SingleLine" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/guild_video_at_capacity.xml b/com.discord/res/layout/guild_video_at_capacity.xml
index 8f468de109..99ab65c09d 100644
--- a/com.discord/res/layout/guild_video_at_capacity.xml
+++ b/com.discord/res/layout/guild_video_at_capacity.xml
@@ -2,11 +2,11 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:padding="@dimen/uikit_spacing_large" android:text="@string/stream_full_modal_body" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:padding="16.0dip" android:text="@string/stream_full_modal_body" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
-    <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textColor="@color/primary_200" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/stream_full_modal_body" style="@style/UiKit.TextView" />
+    <LinearLayout android:paddingTop="8.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textColor="@color/primary_200" android:layout_marginBottom="16.0dip" android:text="@string/stream_full_modal_body" style="@style/UiKit.TextView" />
         <ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/drawable_stream_full" android:importantForAccessibility="no" />
     </LinearLayout>
     <View style="@style/UiKit.Settings.Divider" />
diff --git a/com.discord/res/layout/image_upload_dialog.xml b/com.discord/res/layout/image_upload_dialog.xml
index fe85901b57..159007b640 100644
--- a/com.discord/res/layout/image_upload_dialog.xml
+++ b/com.discord/res/layout/image_upload_dialog.xml
@@ -2,19 +2,19 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/upload_image" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/upload_image" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
         <LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:gravity="start" android:layout_gravity="start" android:padding="@dimen/uikit_spacing_large" android:text="@string/upload_image_body" style="@style/UiKit.TextView" />
+            <TextView android:gravity="start" android:layout_gravity="start" android:padding="16.0dip" android:text="@string/upload_image_body" style="@style/UiKit.TextView" />
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/notice_image" android:layout_width="200.0dip" android:layout_height="200.0dip" />
-            <TextView android:id="@id/notice_crop" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:text="@string/crop" style="@style/UiKit.TextView.Link" />
+            <TextView android:id="@id/notice_crop" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" android:text="@string/crop" style="@style/UiKit.TextView.Link" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <View style="@style/UiKit.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="?primary_200" android:id="@id/notice_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
-        <com.google.android.material.button.MaterialButton android:id="@id/notice_upload" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/upload" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button" />
+        <com.google.android.material.button.MaterialButton android:id="@id/notice_upload" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/upload" android:layout_marginStart="8.0dip" style="@style/UiKit.Material.Button" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/inline_media_view.xml b/com.discord/res/layout/inline_media_view.xml
index 6de1385bca..84ff5fe7c9 100644
--- a/com.discord/res/layout/inline_media_view.xml
+++ b/com.discord/res/layout/inline_media_view.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.exoplayer2.ui.PlayerView android:layout_gravity="center" android:id="@id/inline_media_player_view" android:layout_width="fill_parent" android:layout_height="fill_parent" app:resize_mode="fit" app:surface_type="texture_view" app:use_controller="false" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/inline_media_image_preview" android:layout_width="fill_parent" android:layout_height="fill_parent" android:contentDescription="@string/image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?colorBackgroundPrimary" style="@style/UiKit.ImageView" />
-    <ImageView android:layout_gravity="center" android:id="@id/inline_media_play_button" android:background="@drawable/drawable_circle_primary_900" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:src="@drawable/ic_play_arrow_24dp" android:scaleType="fitXY" android:contentDescription="@string/play_full_video" android:alpha="0.6" app:tint="@color/white" />
-    <ProgressBar android:layout_gravity="center" android:id="@id/inline_media_loading_indicator" android:background="@drawable/drawable_circle_primary_900" android:padding="@dimen/uikit_spacing_medium" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:indeterminate="true" android:layout_centerInParent="true" android:alpha="0.6" android:indeterminateTint="@color/white" />
-    <ImageView android:layout_gravity="start|bottom|center" android:id="@id/inline_media_volume_toggle" android:background="@drawable/drawable_circle_primary_900" android:padding="@dimen/uikit_spacing_medium" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/ic_volume_up_white_24dp" android:alpha="0.6" android:layout_marginStart="@dimen/uikit_spacing_medium" app:tint="@color/white" />
+    <ImageView android:layout_gravity="center" android:id="@id/inline_media_play_button" android:background="@drawable/drawable_circle_primary_900" android:padding="8.0dip" android:visibility="gone" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:src="@drawable/ic_play_arrow_24dp" android:scaleType="fitXY" android:contentDescription="@string/play_full_video" android:alpha="0.6" app:tint="@color/white" />
+    <ProgressBar android:layout_gravity="center" android:id="@id/inline_media_loading_indicator" android:background="@drawable/drawable_circle_primary_900" android:padding="8.0dip" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:indeterminate="true" android:layout_centerInParent="true" android:alpha="0.6" android:indeterminateTint="@color/white" />
+    <ImageView android:layout_gravity="start|bottom|center" android:id="@id/inline_media_volume_toggle" android:background="@drawable/drawable_circle_primary_900" android:padding="8.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginBottom="8.0dip" android:src="@drawable/ic_volume_up_white_24dp" android:alpha="0.6" android:layout_marginStart="8.0dip" app:tint="@color/white" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/integration_sync_settings.xml b/com.discord/res/layout/integration_sync_settings.xml
index e33be72414..a7562257f3 100644
--- a/com.discord/res/layout/integration_sync_settings.xml
+++ b/com.discord/res/layout/integration_sync_settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout android:id="@id/edit_integration_sync_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content">
+    <RelativeLayout android:id="@id/edit_integration_sync_container" android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content">
         <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/drawable_icon_sync_integration" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" />
         <TextView android:id="@id/edit_integration_subscriber_count" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/edit_integration_last_sync_time" android:layout_below="@id/edit_integration_subscriber_count" style="@style/UiKit.TextView" />
     </RelativeLayout>
-    <View android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
-    <RelativeLayout android:id="@id/edit_integration_synced_role_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
+    <View android:layout_marginStart="16.0dip" style="@style/UiKit.Divider" />
+    <RelativeLayout android:id="@id/edit_integration_synced_role_container" android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
         <TextView android:text="@string/form_label_synced_role" android:layout_centerVertical="true" android:layout_toStartOf="@id/edit_integration_synced_role" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
         <TextView android:id="@id/edit_integration_synced_role" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
     </RelativeLayout>
diff --git a/com.discord/res/layout/layout_age_verify.xml b/com.discord/res/layout/layout_age_verify.xml
index 2d82c185f3..7f53870fff 100644
--- a/com.discord/res/layout/layout_age_verify.xml
+++ b/com.discord/res/layout/layout_age_verify.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/age_verify_title" android:text="@string/age_gate_existing_header" android:drawableTop="@drawable/img_age_gate_safety" android:drawablePadding="@dimen/uikit_spacing_large" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_description" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_input_wrapper" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_title" style="@style/UiKit.TextView.Large" />
-    <com.google.android.material.textfield.TextInputLayout android:id="@id/age_verify_input_wrapper" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:hint="@string/age_gate_date_of_birth" app:layout_constraintBottom_toTopOf="@id/age_verify_next_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_description" style="@style/UiKit.TextInputLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/age_verify_title" android:text="@string/age_gate_existing_header" android:drawableTop="@drawable/img_age_gate_safety" android:drawablePadding="16.0dip" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_description" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="8.0dip" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_input_wrapper" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_title" style="@style/UiKit.TextView.Large" />
+    <com.google.android.material.textfield.TextInputLayout android:id="@id/age_verify_input_wrapper" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:hint="@string/age_gate_date_of_birth" app:layout_constraintBottom_toTopOf="@id/age_verify_next_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_description" style="@style/UiKit.TextInputLayout">
         <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.NoFocus" />
     </com.google.android.material.textfield.TextInputLayout>
-    <com.discord.views.LoadingButton android:id="@id/age_verify_next_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_input_wrapper" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next" />
+    <com.discord.views.LoadingButton android:id="@id/age_verify_next_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_input_wrapper" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/layout_age_verify_confirm.xml b/com.discord/res/layout/layout_age_verify_confirm.xml
index dc1bf93ba2..e3605c49ac 100644
--- a/com.discord/res/layout/layout_age_verify_confirm.xml
+++ b/com.discord/res/layout/layout_age_verify_confirm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/age_verify_confirm_title" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/age_gate_confirm_header" android:lineSpacingMultiplier="1.0" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_confirm_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_confirm_description" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_confirm_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_confirm_title" style="@style/UiKit.TextView.Large" />
-    <com.discord.views.LoadingButton android:id="@id/age_verify_confirm_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toTopOf="@id/age_verify_confirm_back_button" app:layout_constraintTop_toBottomOf="@id/age_verify_confirm_description" app:lb_progress_color="@color/white" app:lb_text="@string/age_gate_confirm_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
-    <com.google.android.material.button.MaterialButton android:id="@id/age_verify_confirm_back_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/back" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_confirm_button" style="@style/UiKit.Material.Button.Secondary" />
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/age_verify_confirm_title" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:text="@string/age_gate_confirm_header" android:lineSpacingMultiplier="1.0" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_confirm_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_confirm_description" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="8.0dip" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_confirm_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_confirm_title" style="@style/UiKit.TextView.Large" />
+    <com.discord.views.LoadingButton android:id="@id/age_verify_confirm_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" app:layout_constraintBottom_toTopOf="@id/age_verify_confirm_back_button" app:layout_constraintTop_toBottomOf="@id/age_verify_confirm_description" app:lb_progress_color="@color/white" app:lb_text="@string/age_gate_confirm_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
+    <com.google.android.material.button.MaterialButton android:id="@id/age_verify_confirm_back_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/back" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_confirm_button" style="@style/UiKit.Material.Button.Secondary" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/layout_age_verify_underage.xml b/com.discord/res/layout/layout_age_verify_underage.xml
index 22d5b23004..6f27be1c30 100644
--- a/com.discord/res/layout/layout_age_verify_underage.xml
+++ b/com.discord/res/layout/layout_age_verify_underage.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/age_verify_underage_title" android:text="@string/age_gate_underage_existing_header" android:drawableTop="@drawable/img_age_gate_failure" android:drawablePadding="@dimen/uikit_spacing_large" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_underage_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_underage_description" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/age_gate_underage_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_underage_warning" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_title" style="@style/UiKit.TextView.Large" />
-    <com.discord.app.AppTextView android:gravity="center_horizontal" android:id="@id/age_verify_underage_warning" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/age_gate_underage_existing_body_deletion_with_days" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_return_to_login_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_description" style="@style/UiKit.TextView.Large" />
-    <com.google.android.material.button.MaterialButton android:id="@id/age_verify_return_to_login_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/return_to_login" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_warning" style="@style/UiKit.Material.Button" />
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/age_verify_underage_title" android:text="@string/age_gate_underage_existing_header" android:drawableTop="@drawable/img_age_gate_failure" android:drawablePadding="16.0dip" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_underage_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_underage_description" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="8.0dip" android:text="@string/age_gate_underage_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_underage_warning" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_title" style="@style/UiKit.TextView.Large" />
+    <com.discord.app.AppTextView android:gravity="center_horizontal" android:id="@id/age_verify_underage_warning" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="16.0dip" android:text="@string/age_gate_underage_existing_body_deletion_with_days" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_return_to_login_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_description" style="@style/UiKit.TextView.Large" />
+    <com.google.android.material.button.MaterialButton android:id="@id/age_verify_return_to_login_button" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/return_to_login" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_warning" style="@style/UiKit.Material.Button" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/layout_icon_uploader.xml b/com.discord/res/layout/layout_icon_uploader.xml
index b3ed82b167..aa99c752ad 100644
--- a/com.discord/res/layout/layout_icon_uploader.xml
+++ b/com.discord/res/layout/layout_icon_uploader.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_medium" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout android:padding="8.0dip" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.ConstraintLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/icon_uploader_placeholder_border" android:layout_width="0.0dip" android:layout_height="0.0dip" android:src="@drawable/drawable_circle_dashed" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" app:tint="?colorInteractiveNormal" />
     <ImageView android:id="@id/icon_uploader_placeholder_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_camera_24dp" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@id/icon_uploader_placeholder_text" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" app:layout_constraintVertical_chainStyle="packed" app:tint="?colorInteractiveNormal" />
-    <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/icon_uploader_placeholder_text" android:layout_width="0.0dip" android:layout_height="24.0dip" android:text="@string/upload" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8.0sp" app:autoSizeStepGranularity="1.0sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@id/icon_uploader_placeholder_icon" style="@style/UiKit.TextView" />
+    <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/icon_uploader_placeholder_text" android:layout_width="0.0dip" android:layout_height="24.0dip" android:text="@string/upload" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8.0sp" app:autoSizeStepGranularity="1.0sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@id/icon_uploader_placeholder_icon" style="@style/UiKit.TextView" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/icon_uploader_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@null" style="@style/Avatar.Hero" />
     <ImageView android:id="@id/icon_uploader_plus" android:background="@drawable/drawable_circle_brand_500" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_upload_plus_32dp" android:contentDescription="@string/sample_empty_string" android:translationX="6.0dip" android:translationY="-6.0dip" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" style="@style/UiKit.ImageView" />
     <androidx.constraintlayout.widget.Group android:id="@id/icon_uploader_placeholder_group" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="icon_uploader_placeholder_border,icon_uploader_placeholder_icon,icon_uploader_placeholder_text,icon_uploader_plus" />
diff --git a/com.discord/res/layout/layout_premium_guild_status_features_user.xml b/com.discord/res/layout/layout_premium_guild_status_features_user.xml
index 39eeeac304..af55c5b6f8 100644
--- a/com.discord/res/layout/layout_premium_guild_status_features_user.xml
+++ b/com.discord/res/layout/layout_premium_guild_status_features_user.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_subscriber_perks_header" style="@style/UiKit.TextView.H1" />
+    <TextView android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginBottom="16.0dip" android:text="@string/premium_guild_perks_modal_subscriber_perks_header" style="@style/UiKit.TextView.H1" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_member_badge" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_profile_badge" android:drawableStart="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_role" android:drawableStart="@drawable/ic_role_pink_24dp" style="@style/UiKit.TextView.Perk" />
diff --git a/com.discord/res/layout/layout_premium_settings_payment.xml b/com.discord/res/layout/layout_premium_settings_payment.xml
index b7af86a2be..5f63de91ba 100644
--- a/com.discord/res/layout/layout_premium_settings_payment.xml
+++ b/com.discord/res/layout/layout_premium_settings_payment.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@id/premium_settings_payment_container" android:background="?colorBackgroundSecondary" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:id="@id/premium_settings_payment_container" android:background="?colorBackgroundSecondary" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:background="?colorBackgroundPrimary" android:text="@string/billing_step_payment" style="@style/UiKit.Settings.Item.Header" />
-    <TextView android:textColor="?colorHeaderPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/premium_settings_billing_info" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textColor="?colorTextNormal" android:id="@id/premium_settings_billing_information" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <View android:id="@id/premium_settings_billing_divider" android:background="?colorBackgroundPrimary" android:layout_height="1.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
-    <com.google.android.material.button.MaterialButton android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Secondary" />
+    <TextView android:textColor="?colorHeaderPrimary" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/premium_settings_billing_info" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="?colorTextNormal" android:id="@id/premium_settings_billing_information" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.TextView" />
+    <View android:id="@id/premium_settings_billing_divider" android:background="?colorBackgroundPrimary" android:layout_height="1.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.Divider" />
+    <com.google.android.material.button.MaterialButton android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.Material.Button.Secondary" />
     <LinearLayout android:id="@id/active_subscription_spinner_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/active_subscription_spinner_title" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_pay_for_it_with" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
-        <Spinner android:id="@id/active_subscription_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="?bg_payment_method_spinner_dropdown" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/active_subscription_error_text" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/billing_applies_to_all_subscriptions" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/active_subscription_spinner_title" android:layout_marginBottom="8.0dip" android:text="@string/billing_pay_for_it_with" android:layout_marginStart="16.0dip" style="@style/UiKit.TextView.Semibold" />
+        <Spinner android:id="@id/active_subscription_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:popupBackground="?bg_payment_method_spinner_dropdown" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/active_subscription_error_text" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/billing_applies_to_all_subscriptions" style="@style/UiKit.TextView" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/layout_switch_plan_interval.xml b/com.discord/res/layout/layout_switch_plan_interval.xml
index 6da0b4bb9b..f611e67944 100644
--- a/com.discord/res/layout/layout_switch_plan_interval.xml
+++ b/com.discord/res/layout/layout_switch_plan_interval.xml
@@ -2,10 +2,10 @@
 <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/premium_switch_interval_logo" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="24.0sp" android:textColor="?colorInteractiveActive" android:id="@id/premium_switch_interval_header" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Bold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:gravity="center" android:id="@id/premium_switch_interval_info" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/billing_switch_plan_choose_one" style="@style/UiKit.Settings.Item.Header" />
-    <RadioGroup android:id="@id/premium_switch_interval_radio_group" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="?colorBackgroundModifierAccent" android:showDividers="middle">
+    <TextView android:textSize="24.0sp" android:textColor="?colorInteractiveActive" android:id="@id/premium_switch_interval_header" android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView.Bold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:gravity="center" android:id="@id/premium_switch_interval_info" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
+    <TextView android:layout_marginTop="16.0dip" android:text="@string/billing_switch_plan_choose_one" style="@style/UiKit.Settings.Item.Header" />
+    <RadioGroup android:id="@id/premium_switch_interval_radio_group" android:background="?colorBackgroundSecondary" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="?colorBackgroundModifierAccent" android:showDividers="middle">
         <com.google.android.material.radiobutton.MaterialRadioButton android:textColor="?colorHeaderPrimary" android:gravity="start|center" android:id="@id/premium_switch_interval_radio_year" android:background="@color/transparent" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layoutDirection="rtl" style="@style/UiKit.RadioButton" />
         <com.google.android.material.radiobutton.MaterialRadioButton android:textColor="?colorHeaderPrimary" android:gravity="start|center" android:id="@id/premium_switch_interval_radio_month" android:background="@color/transparent" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layoutDirection="rtl" style="@style/UiKit.RadioButton" />
     </RadioGroup>
diff --git a/com.discord/res/layout/layout_switch_plan_tier_page.xml b/com.discord/res/layout/layout_switch_plan_tier_page.xml
index 6e9365a2d0..447491f12c 100644
--- a/com.discord/res/layout/layout_switch_plan_tier_page.xml
+++ b/com.discord/res/layout/layout_switch_plan_tier_page.xml
@@ -3,13 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardCornerRadius="8.0dip" xmlns:app="http://schemas.android.com/apk/res-auto">
         <LinearLayout android:id="@id/premium_switch_page_background" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_gravity="center_horizontal" android:layout_width="68.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_logo_discord" android:scaleType="centerCrop" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-            <ImageView android:layout_gravity="center_horizontal" android:id="@id/premium_switch_page_logo" android:layout_width="fill_parent" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:adjustViewBounds="true" style="@style/UiKit.ImageView" />
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center|top" android:layout_gravity="center_horizontal" android:id="@id/premium_switch_page_info" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lines="2" style="@style/UiKit.TextView" />
+            <ImageView android:layout_gravity="center_horizontal" android:layout_width="68.0dip" android:layout_height="wrap_content" android:layout_marginTop="32.0dip" android:src="@drawable/img_logo_discord" android:scaleType="centerCrop" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="center_horizontal" android:id="@id/premium_switch_page_logo" android:layout_width="fill_parent" android:layout_height="32.0dip" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:adjustViewBounds="true" style="@style/UiKit.ImageView" />
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center|top" android:layout_gravity="center_horizontal" android:id="@id/premium_switch_page_info" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:lines="2" style="@style/UiKit.TextView" />
             <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <ImageView android:layout_gravity="bottom|center|right" android:id="@id/premium_switch_page_wumpus" android:layout_width="fill_parent" android:layout_height="wrap_content" android:src="@drawable/img_nitro_card" android:scaleType="fitEnd" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:layout_gravity="bottom|center|left" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginBottom="52.0sp" android:text="@string/starting_at" style="@style/UiKit.TextView" />
-                <TextView android:textColor="@color/white" android:layout_gravity="bottom|center|left" android:id="@id/premium_switch_page_monthly_price" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:layout_gravity="bottom|center|left" android:layout_marginLeft="16.0dip" android:layout_marginBottom="52.0sp" android:text="@string/starting_at" style="@style/UiKit.TextView" />
+                <TextView android:textColor="@color/white" android:layout_gravity="bottom|center|left" android:id="@id/premium_switch_page_monthly_price" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.TextView" />
             </FrameLayout>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
diff --git a/com.discord/res/layout/layout_voice_bottom_sheet_empty.xml b/com.discord/res/layout/layout_voice_bottom_sheet_empty.xml
index e45e4920ed..997cded894 100644
--- a/com.discord/res/layout/layout_voice_bottom_sheet_empty.xml
+++ b/com.discord/res/layout/layout_voice_bottom_sheet_empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="vertical" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<LinearLayout android:orientation="vertical" android:paddingTop="24.0dip" android:paddingBottom="24.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/drawable_vc_empty" android:importantForAccessibility="no" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextMuted" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_voice_channel_empty_body_mobile" android:fontFamily="@font/whitney_medium" />
+    <ImageView android:layout_gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" android:src="@drawable/drawable_vc_empty" android:importantForAccessibility="no" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextMuted" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/guild_voice_channel_empty_body_mobile" android:fontFamily="@font/whitney_medium" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/leave_guild_dialog.xml b/com.discord/res/layout/leave_guild_dialog.xml
index c6321c30e2..1d23f69a6a 100644
--- a/com.discord/res/layout/leave_guild_dialog.xml
+++ b/com.discord/res/layout/leave_guild_dialog.xml
@@ -2,13 +2,13 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/leave_guild_dialog_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/leave_server_title" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:id="@id/leave_guild_dialog_header" android:padding="16.0dip" android:text="@string/leave_server_title" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
-    <com.discord.app.AppTextView android:textColor="@color/primary_200" android:id="@id/leave_guild_dialog_body" android:paddingTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/leave_server_body" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+    <com.discord.app.AppTextView android:textColor="@color/primary_200" android:id="@id/leave_guild_dialog_body" android:paddingTop="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/leave_server_body" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="?primary_200" android:id="@id/leave_guild_cancel_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
-        <com.discord.views.LoadingButton android:id="@id/leave_guild_confirm_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:lb_progress_color="@color/white" app:lb_text="@string/leave_server" app:lb_text_color="@drawable/button_text_color_primary_100" />
+        <com.discord.views.LoadingButton android:id="@id/leave_guild_confirm_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" app:lb_progress_color="@color/white" app:lb_text="@string/leave_server" app:lb_text_color="@drawable/button_text_color_primary_100" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/loading_gif_item_view.xml b/com.discord/res/layout/loading_gif_item_view.xml
index b9bbc0eef0..371a91982e 100644
--- a/com.discord/res/layout/loading_gif_item_view.xml
+++ b/com.discord/res/layout/loading_gif_item_view.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
+<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/com.discord/res/layout/oauth_token_permission_detailed_list_item.xml b/com.discord/res/layout/oauth_token_permission_detailed_list_item.xml
index 30ec90bed0..be081a00bc 100644
--- a/com.discord/res/layout/oauth_token_permission_detailed_list_item.xml
+++ b/com.discord/res/layout/oauth_token_permission_detailed_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout android:paddingTop="4.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/oauth_token_permission_detailed_icon" android:layout_margin="@dimen/uikit_spacing_small" android:src="@drawable/ic_check_circle_green_24dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/oauth_token_permission_detailed_name" android:layout_width="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toBottomOf="@id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toTopOf="@id/oauth_token_permission_detailed_icon" style="@style/UiKit.TextView.H2" />
+    <ImageView android:id="@id/oauth_token_permission_detailed_icon" android:layout_margin="4.0dip" android:src="@drawable/ic_check_circle_green_24dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/oauth_token_permission_detailed_name" android:layout_width="0.0dip" android:layout_marginStart="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toBottomOf="@id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toTopOf="@id/oauth_token_permission_detailed_icon" style="@style/UiKit.TextView.H2" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/oauth_token_permission_list_item.xml b/com.discord/res/layout/oauth_token_permission_list_item.xml
index 3043555147..72b686b21c 100644
--- a/com.discord/res/layout/oauth_token_permission_list_item.xml
+++ b/com.discord/res/layout/oauth_token_permission_list_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:gravity="center" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_check_circle_green_24dp" style="@style/UiKit.TextView"
+<TextView android:gravity="center" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_check_circle_green_24dp" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/overlay_bubble_menu.xml b/com.discord/res/layout/overlay_bubble_menu.xml
index e837bc5da6..e1a6cf2ab0 100644
--- a/com.discord/res/layout/overlay_bubble_menu.xml
+++ b/com.discord/res/layout/overlay_bubble_menu.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
         <View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
-        <View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" />
+        <View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" />
         <androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-        <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.H1.Bold" />
+        <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4.0dip" style="@style/UiKit.TextView.H1.Bold" />
     </LinearLayout>
-    <com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
+    <com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/overlay_menu_voice_members_item.xml b/com.discord/res/layout/overlay_menu_voice_members_item.xml
index d11ade9f9f..5c379a5644 100644
--- a/com.discord/res/layout/overlay_menu_voice_members_item.xml
+++ b/com.discord/res/layout/overlay_menu_voice_members_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.VoiceUserView android:clipChildren="false" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginLeft="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_xsmall" app:vuv_avatar_size="@dimen/overlay_bubble_size"
+<com.discord.views.VoiceUserView android:clipChildren="false" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginLeft="2.0dip" android:layout_marginRight="2.0dip" app:vuv_avatar_size="@dimen/overlay_bubble_size"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/com.discord/res/layout/overlay_voice_bubble.xml b/com.discord/res/layout/overlay_voice_bubble.xml
index 021d5217af..b1aaab9aeb 100644
--- a/com.discord/res/layout/overlay_voice_bubble.xml
+++ b/com.discord/res/layout/overlay_voice_bubble.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.facebook.drawee.view.SimpleDraweeView android:theme="@style/AppTheme.Dark" android:id="@id/overlay_bubble_iv" android:background="@drawable/drawable_circle_transparent" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_margin="@dimen/uikit_spacing_medium" android:elevation="4.0dip" style="@style/Avatar.Large"
+<com.facebook.drawee.view.SimpleDraweeView android:theme="@style/AppTheme.Dark" android:id="@id/overlay_bubble_iv" android:background="@drawable/drawable_circle_transparent" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_margin="8.0dip" android:elevation="4.0dip" style="@style/Avatar.Large"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/overlay_voice_channel_selector.xml b/com.discord/res/layout/overlay_voice_channel_selector.xml
index 7444a81846..e62f6c2b3c 100644
--- a/com.discord/res/layout/overlay_voice_channel_selector.xml
+++ b/com.discord/res/layout/overlay_voice_channel_selector.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_gravity="center" android:id="@id/dialog_card" android:layout_margin="@dimen/uikit_spacing_large" app:cardElevation="8.0dip" style="@style/Overlay.Dialog.Constrained"
+<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_gravity="center" android:id="@id/dialog_card" android:layout_margin="16.0dip" app:cardElevation="8.0dip" style="@style/Overlay.Dialog.Constrained"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
         <LinearLayout android:gravity="center_vertical" android:background="@color/primary_700" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <ImageView android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_volume_up_white_24dp" android:importantForAccessibility="no" app:tint="@color/white" style="@style/UiKit.ImageView" />
-            <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/test" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/channel_select" android:layout_weight="1.0" style="@style/UiKit.TextView.Semibold" />
-            <ImageView android:id="@id/close" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" app:tint="@color/white" style="@style/UiKit.ImageView" />
+            <ImageView android:padding="16.0dip" android:src="@drawable/ic_volume_up_white_24dp" android:importantForAccessibility="no" app:tint="@color/white" style="@style/UiKit.ImageView" />
+            <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/test" android:layout_width="0.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/channel_select" android:layout_weight="1.0" style="@style/UiKit.TextView.Semibold" />
+            <ImageView android:id="@id/close" android:background="?selectableItemBackground" android:padding="16.0dip" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" app:tint="@color/white" style="@style/UiKit.ImageView" />
         </LinearLayout>
         <com.google.android.material.textfield.TextInputLayout android:id="@id/overlay_channel_search" app:boxBackgroundColor="@color/primary_dark_700" style="@style/UiKit.TextInputLayout.Search">
             <com.google.android.material.textfield.TextInputEditText android:hint="@string/search_channels" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search" />
         </com.google.android.material.textfield.TextInputLayout>
-        <androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:gravity="center" android:id="@id/empty_results" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/overlay_no_results" android:drawableBottom="@drawable/img_quick_switcher_empty" android:drawablePadding="@dimen/uikit_spacing_medium" android:layout_weight="1.0" android:textAlignment="center" app:autoSizeMinTextSize="8.0sp" app:autoSizeTextType="uniform" style="@style/UiKit.TextView.Large" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/results_rv" android:padding="@dimen/uikit_spacing_medium" android:clipToPadding="false" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:gravity="center" android:id="@id/empty_results" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginLeft="32.0dip" android:layout_marginTop="64.0dip" android:layout_marginRight="32.0dip" android:text="@string/overlay_no_results" android:drawableBottom="@drawable/img_quick_switcher_empty" android:drawablePadding="8.0dip" android:layout_weight="1.0" android:textAlignment="center" app:autoSizeMinTextSize="8.0sp" app:autoSizeTextType="uniform" style="@style/UiKit.TextView.Large" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/results_rv" android:padding="8.0dip" android:clipToPadding="false" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/payment_method_list_add_item.xml b/com.discord/res/layout/payment_method_list_add_item.xml
index 8ad6bf164c..8dd1c326b5 100644
--- a/com.discord/res/layout/payment_method_list_add_item.xml
+++ b/com.discord/res/layout/payment_method_list_add_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.button.MaterialButton android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:minHeight="40.0dip" android:text="@string/billing_add_payment_method" style="@style/UiKit.Material.Button"
+<com.google.android.material.button.MaterialButton android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:minHeight="40.0dip" android:text="@string/billing_add_payment_method" style="@style/UiKit.Material.Button"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/payment_method_list_header.xml b/com.discord/res/layout/payment_method_list_header.xml
index 21a174553c..96f1e47364 100644
--- a/com.discord/res/layout/payment_method_list_header.xml
+++ b/com.discord/res/layout/payment_method_list_header.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/payment_method_header" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large"
+<TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/payment_method_header" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/payment_method_list_item.xml b/com.discord/res/layout/payment_method_list_item.xml
index c1463f263a..0d739ad8d1 100644
--- a/com.discord/res/layout/payment_method_list_item.xml
+++ b/com.discord/res/layout/payment_method_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup"
+<RelativeLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.google.android.material.button.MaterialButton android:id="@id/payment_method_edit" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:minWidth="0.0dip" android:text="@string/edit" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.Secondary.Fit" />
-    <com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_method_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toStartOf="@id/payment_method_edit" android:layout_alignParentStart="true" />
-    <View android:background="@color/primary_630" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.Divider.Thick" />
+    <com.google.android.material.button.MaterialButton android:id="@id/payment_method_edit" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:minWidth="0.0dip" android:text="@string/edit" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.Secondary.Fit" />
+    <com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_method_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toStartOf="@id/payment_method_edit" android:layout_alignParentStart="true" />
+    <View android:background="@color/primary_630" android:layout_marginTop="16.0dip" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.Divider.Thick" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/payment_source_view.xml b/com.discord/res/layout/payment_source_view.xml
index 1306b2eac1..8190091cd6 100644
--- a/com.discord/res/layout/payment_source_view.xml
+++ b/com.discord/res/layout/payment_source_view.xml
@@ -4,8 +4,8 @@
     <androidx.cardview.widget.CardView android:id="@id/payment_source_view_icon_wrapper" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardCornerRadius="4.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/payment_source_view_title" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" app:layout_constraintVertical_bias="0.0">
         <ImageView android:id="@id/payment_source_view_icon" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
     </androidx.cardview.widget.CardView>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_source_view_title" android:lineSpacingMultiplier="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_source_view_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toLeftOf="@id/payment_source_view_invalid" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
-    <TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_source_view_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_height="18.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:text="@string/payment_source_invalid" android:lineSpacingMultiplier="1.0" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_title" app:layout_constraintRight_toLeftOf="@id/payment_source_view_premium" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
-    <ImageView android:id="@id/payment_source_view_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="18.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/payment_source_view_subtext" android:lineSpacingMultiplier="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" app:layout_constraintVertical_bias="0.0" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_source_view_title" android:lineSpacingMultiplier="1.0" android:layout_marginStart="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_source_view_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toLeftOf="@id/payment_source_view_invalid" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
+    <TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_source_view_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_height="18.0dip" android:layout_marginTop="2.0dip" android:text="@string/payment_source_invalid" android:lineSpacingMultiplier="1.0" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" android:layout_marginStart="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_title" app:layout_constraintRight_toLeftOf="@id/payment_source_view_premium" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
+    <ImageView android:id="@id/payment_source_view_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="18.0dip" android:layout_marginTop="2.0dip" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" android:layout_marginStart="4.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" app:layout_goneMarginLeft="8.0dip" app:layout_goneMarginStart="8.0dip" style="@style/UiKit.ImageView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/payment_source_view_subtext" android:lineSpacingMultiplier="1.0" android:layout_marginStart="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" app:layout_constraintVertical_bias="0.0" style="@style/UiKit.TextView" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
index 2bbeb219a5..040fdfe260 100644
--- a/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
+++ b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.airbnb.lottie.LottieAnimationView android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_activated_lottie" android:layout_width="140.0dip" android:layout_height="88.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:lottie_fileName="animations/anim_boost_activated.json" style="@style/UiKit.LottieAnimationView" />
-    <ImageView android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/img_boost_activated" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_activated_body1" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_activated_body2" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView" />
+    <com.airbnb.lottie.LottieAnimationView android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_activated_lottie" android:layout_width="140.0dip" android:layout_height="88.0dip" android:layout_marginTop="24.0dip" app:lottie_fileName="animations/anim_boost_activated.json" style="@style/UiKit.LottieAnimationView" />
+    <ImageView android:layout_gravity="center_horizontal" android:layout_marginLeft="8.0dip" android:layout_marginTop="24.0dip" android:layout_marginRight="8.0dip" android:src="@drawable/img_boost_activated" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_activated_body1" android:layout_marginLeft="16.0dip" android:layout_marginTop="24.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
+    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_activated_body2" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
-        <com.google.android.material.button.MaterialButton android:id="@id/premium_guild_subscription_activated_ok" android:text="@string/guild_subscription_purchase_modal_activated_close_button" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Green.Fit" />
+        <com.google.android.material.button.MaterialButton android:id="@id/premium_guild_subscription_activated_ok" android:text="@string/guild_subscription_purchase_modal_activated_close_button" android:layout_marginStart="8.0dip" style="@style/UiKit.Material.Button.Green.Fit" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml b/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml
index 205ad6b7a0..233eb3b2b1 100644
--- a/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml
+++ b/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml
@@ -2,17 +2,17 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/premium_guild_subscription_cancel_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_cancel_title" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:id="@id/premium_guild_subscription_cancel_header" android:padding="16.0dip" android:text="@string/premium_guild_subscription_cancel_title" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <com.discord.app.AppViewFlipper android:id="@id/premium_guild_subscription_cancel_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                <ProgressBar android:layout_gravity="center" android:id="@id/active_subscription_progress" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
+                <ProgressBar android:layout_gravity="center" android:id="@id/active_subscription_progress" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginTop="8.0dip" android:layout_marginEnd="8.0dip" />
                 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_boost_cancel" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-                    <TextView android:id="@id/premium_guild_subscription_cancel_body" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-                    <TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_subscription_cancel_error" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
+                    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="24.0dip" android:layout_marginBottom="24.0dip" android:src="@drawable/img_boost_cancel" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+                    <TextView android:id="@id/premium_guild_subscription_cancel_body" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
+                    <TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_subscription_cancel_error" android:visibility="gone" android:layout_marginTop="8.0dip" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </com.discord.app.AppViewFlipper>
         </LinearLayout>
@@ -20,6 +20,6 @@
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="?colorInteractiveActive" android:id="@id/premium_guild_subscription_cancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150.0dip" android:text="@string/nevermind" style="@style/UiKit.Material.Button.Transparent" />
-        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/premium_guild_subscription_cancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_cancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/premium_guild_subscription_cancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_cancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml b/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml
index 769a9b36f7..d826463212 100644
--- a/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml
+++ b/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml
@@ -2,17 +2,17 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/premium_guild_subscription_uncancel_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_inventory_uncancel_title_mobile" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:id="@id/premium_guild_subscription_uncancel_header" android:padding="16.0dip" android:text="@string/premium_guild_subscription_inventory_uncancel_title_mobile" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
     <com.discord.app.AppViewFlipper android:id="@id/premium_guild_subscription_uncancel_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ProgressBar.White" />
         <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
-            <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                    <ImageView android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_uncancel_image" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/img_nitro_uncancel" style="@style/UiKit.ImageView" />
-                    <TextView android:id="@id/premium_guild_subscription_uncancel_body" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_inventory_uncancel_description" style="@style/UiKit.TextView" />
-                    <TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_subscription_uncancel_error" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_inventory_uncancel_error" style="@style/UiKit.TextView" />
+                    <ImageView android:layout_gravity="center_horizontal" android:id="@id/premium_guild_subscription_uncancel_image" android:visibility="gone" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:src="@drawable/img_nitro_uncancel" style="@style/UiKit.ImageView" />
+                    <TextView android:id="@id/premium_guild_subscription_uncancel_body" android:layout_marginBottom="8.0dip" android:text="@string/premium_guild_subscription_inventory_uncancel_description" style="@style/UiKit.TextView" />
+                    <TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_subscription_uncancel_error" android:visibility="gone" android:layout_marginTop="8.0dip" android:text="@string/premium_guild_subscription_inventory_uncancel_error" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
@@ -20,6 +20,6 @@
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="?colorInteractiveActive" android:id="@id/premium_guild_subscription_uncancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150.0dip" android:text="@string/nevermind" style="@style/UiKit.Material.Button.Transparent" />
-        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/premium_guild_subscription_uncancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_inventory_uncancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/premium_guild_subscription_uncancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_inventory_uncancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_upsell_dialog.xml b/com.discord/res/layout/premium_upsell_dialog.xml
index 1095a02473..d4df9dd6f8 100644
--- a/com.discord/res/layout/premium_upsell_dialog.xml
+++ b/com.discord/res/layout/premium_upsell_dialog.xml
@@ -6,6 +6,6 @@
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/premium_upsell_close" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit.Material.Button.Transparent" />
-        <com.google.android.material.button.MaterialButton android:id="@id/premium_upsell_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/learn_more" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Green.Fit" />
+        <com.google.android.material.button.MaterialButton android:id="@id/premium_upsell_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/learn_more" android:layout_marginStart="8.0dip" style="@style/UiKit.Material.Button.Green.Fit" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/private_channel_side_bar_actions_view.xml b/com.discord/res/layout/private_channel_side_bar_actions_view.xml
index cfbdcc1a93..ac50222ccf 100644
--- a/com.discord/res/layout/private_channel_side_bar_actions_view.xml
+++ b/com.discord/res/layout/private_channel_side_bar_actions_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<merge android:padding="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.button.MaterialButton android:id="@id/private_channel_sidebar_actions_call" android:text="@string/call" android:drawableTop="@drawable/ic_call_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/ChannelSideBarActions.Actions.Button" />
     <com.google.android.material.button.MaterialButton android:id="@id/private_channel_sidebar_actions_video" android:text="@string/video" android:drawableTop="@drawable/ic_videocam_white_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/ChannelSideBarActions.Actions.Button" />
diff --git a/com.discord/res/layout/simple_member_list_item.xml b/com.discord/res/layout/simple_member_list_item.xml
index 664704bff4..d29f0330cf 100644
--- a/com.discord/res/layout/simple_member_list_item.xml
+++ b/com.discord/res/layout/simple_member_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/member_list_item_avatar" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Avatar.Standard" />
-    <TextView android:layout_gravity="center_vertical" android:id="@id/member_list_item_name" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
+    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/member_list_item_avatar" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" style="@style/Avatar.Standard" />
+    <TextView android:layout_gravity="center_vertical" android:id="@id/member_list_item_name" android:layout_marginStart="16.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/simple_role_list_item.xml b/com.discord/res/layout/simple_role_list_item.xml
index 49234291b5..5166e7372d 100644
--- a/com.discord/res/layout/simple_role_list_item.xml
+++ b/com.discord/res/layout/simple_role_list_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:singleLine="true" style="@style/UiKit.TextView.Semibold"
+<TextView android:gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:background="?selectableItemBackground" android:padding="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:singleLine="true" style="@style/UiKit.TextView.Semibold"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/user_actions_dialog.xml b/com.discord/res/layout/user_actions_dialog.xml
index d3a125a038..592bc1ab34 100644
--- a/com.discord/res/layout/user_actions_dialog.xml
+++ b/com.discord/res/layout/user_actions_dialog.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:background="?primary_630" android:minWidth="328.0dip" style="@style/UiKit.Dialog.Container"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:background="?primary_700" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_actions_dialog_avatar" android:layout_marginEnd="@dimen/uikit_spacing_large" app:roundWithOverlayColor="?primary_700" style="@style/Avatar.Medium" />
+    <LinearLayout android:background="?primary_700" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_actions_dialog_avatar" android:layout_marginEnd="16.0dip" app:roundWithOverlayColor="?primary_700" style="@style/Avatar.Medium" />
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/user_actions_dialog_user_name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:fontFamily="@font/whitney_semibold" />
     </LinearLayout>
     <TextView android:id="@id/user_actions_dialog_block_item" android:text="@string/block" android:drawableStart="?ic_user_actions_block" style="@style/UiKit.ListItem.Icon" />
diff --git a/com.discord/res/layout/user_profile_header_view.xml b/com.discord/res/layout/user_profile_header_view.xml
index 51ba6ffd56..6d3b7cf79c 100644
--- a/com.discord/res/layout/user_profile_header_view.xml
+++ b/com.discord/res/layout/user_profile_header_view.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/user_sheet_header" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" android:clipChildren="false" android:importantForAccessibility="no" style="@style/UiKit.Sheet.Header"
+<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/user_sheet_header" android:padding="16.0dip" android:focusable="true" android:clickable="true" android:clipChildren="false" android:importantForAccessibility="no" style="@style/UiKit.Sheet.Header"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_sheet_header_guideline" style="@style/UiKit.Sheet.Guideline" />
-    <com.discord.views.user.UserAvatarPresenceView android:id="@id/user_profile_avatar_presence" android:clipChildren="false" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/user_profile_header_name_wrap" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="@id/uikit_sheet_header_guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:user_avatar_background_color="?primary_700" />
-    <LinearLayout android:id="@id/user_profile_header_name_wrap" android:layout_width="0.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/user_profile_header_badges_recycler" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/user_profile_avatar_presence" style="@style/UiKit.ViewGroup.LinearLayout">
+    <com.discord.views.user.UserAvatarPresenceView android:id="@id/user_profile_avatar_presence" android:clipChildren="false" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginBottom="16.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/user_profile_header_name_wrap" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="@id/uikit_sheet_header_guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:user_avatar_background_color="?primary_700" />
+    <LinearLayout android:id="@id/user_profile_header_name_wrap" android:layout_width="0.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/user_profile_header_badges_recycler" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/user_profile_avatar_presence" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.discord.views.UsernameView android:id="@id/user_profile_header_primary_name" android:layout_width="wrap_content" android:layout_height="wrap_content" app:username_singleline="false" app:username_text_appearance="@style/UiKit.TextAppearance.Bold" app:username_text_size="@dimen/uikit_textsize_xxlarge" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/user_profile_header_secondary_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/user_profile_header_custom_status" android:layout_marginTop="@dimen/uikit_spacing_large" android:singleLine="false" style="@style/UiKit.TextView" />
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/user_profile_header_custom_status" android:layout_marginTop="16.0dip" android:singleLine="false" style="@style/UiKit.TextView" />
     </LinearLayout>
     <androidx.recyclerview.widget.RecyclerView android:id="@id/user_profile_header_badges_recycler" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/user_profile_header_name_wrap" app:layout_constraintEnd_toEndOf="parent" app:reverseLayout="true" app:stackFromEnd="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/user_profile_voice_settings_view.xml b/com.discord/res/layout/user_profile_voice_settings_view.xml
index ef1d876294..7931ea1aa2 100644
--- a/com.discord/res/layout/user_profile_voice_settings_view.xml
+++ b/com.discord/res/layout/user_profile_voice_settings_view.xml
@@ -2,7 +2,7 @@
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:id="@id/user_sheet_volume_label" android:text="@string/user_profile_volume" style="@style/UiKit.ListItem" />
-    <LinearLayout android:id="@id/user_sheet_volume_wrap" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:id="@id/user_sheet_volume_wrap" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <ImageView android:src="?ic_volume_mute" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
         <SeekBar android:id="@id/user_sheet_volume" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxHeight="8.0dip" android:max="100" android:progressDrawable="@drawable/drawable_settings_progress" android:thumb="@drawable/drawable_thumb_white" android:layout_weight="1.0" android:splitTrack="false" />
         <ImageView android:src="?ic_volume_up" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
diff --git a/com.discord/res/layout/view_account_credit.xml b/com.discord/res/layout/view_account_credit.xml
index 4655b0a70f..5edc5c6967 100644
--- a/com.discord/res/layout/view_account_credit.xml
+++ b/com.discord/res/layout/view_account_credit.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/credit_icon" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:src="@drawable/drawable_ic_nitro" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-    <LinearLayout android:id="@id/credit_info_container" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/credit_icon" app:layout_constraintRight_toLeftOf="@id/credit_time" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
+    <ImageView android:id="@id/credit_icon" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_margin="16.0dip" android:src="@drawable/drawable_ic_nitro" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <LinearLayout android:id="@id/credit_info_container" android:layout_width="0.0dip" android:layout_margin="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/credit_icon" app:layout_constraintRight_toLeftOf="@id/credit_time" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/credit_header" style="@style/UiKit.TextView.Semibold" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:ellipsize="end" android:id="@id/credit_info" android:maxLines="2" style="@style/UiKit.TextView" />
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/credit_time" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/credit_info_container" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/credit_time" android:layout_marginEnd="16.0dip" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/credit_info_container" style="@style/UiKit.TextView" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_active_subscription.xml b/com.discord/res/layout/view_active_subscription.xml
index 7ab09055e4..11e1a4cbe6 100644
--- a/com.discord/res/layout/view_active_subscription.xml
+++ b/com.discord/res/layout/view_active_subscription.xml
@@ -2,16 +2,16 @@
 <FrameLayout style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/active_subscription_header_background" android:layout_width="fill_parent" android:layout_height="fill_parent" android:scaleType="fitXY" android:adjustViewBounds="true" android:importantForAccessibility="no" />
-    <ProgressBar android:theme="@style/UiKit.ProgressBar.White" android:layout_gravity="end|center|top" android:id="@id/active_subscription_progress" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
-    <LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <LinearLayout android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <ImageView android:id="@id/active_subscription_header_icon" android:layout_width="56.0dip" android:layout_height="40.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
+    <ProgressBar android:theme="@style/UiKit.ProgressBar.White" android:layout_gravity="end|center|top" android:id="@id/active_subscription_progress" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginEnd="8.0dip" />
+    <LinearLayout android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <ImageView android:id="@id/active_subscription_header_icon" android:layout_width="56.0dip" android:layout_height="40.0dip" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" />
             <ImageView android:layout_gravity="center_vertical" android:id="@id/active_subscription_header_logo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="fitStart" android:adjustViewBounds="true" android:maxHeight="40.0dip" android:importantForAccessibility="no" />
         </LinearLayout>
-        <TextView android:textColor="@color/white" android:id="@id/active_subscription_header_text" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+        <TextView android:textColor="@color/white" android:id="@id/active_subscription_header_text" android:layout_marginBottom="8.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
         <LinearLayout android:gravity="center_vertical" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_bg_color_selector_brand" android:id="@id/active_subscription_top_button" android:layout_width="wrap_content" android:minHeight="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.White" />
-            <TextView android:textColor="@color/white" android:id="@id/active_subscription_cancel_button" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
+            <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_bg_color_selector_brand" android:id="@id/active_subscription_top_button" android:layout_width="wrap_content" android:minHeight="40.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.Material.Button.White" />
+            <TextView android:textColor="@color/white" android:id="@id/active_subscription_cancel_button" android:background="?selectableItemBackground" android:padding="8.0dip" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_add_override_item.xml b/com.discord/res/layout/view_add_override_item.xml
index 5006370e5c..b9d8844500 100644
--- a/com.discord/res/layout/view_add_override_item.xml
+++ b/com.discord/res/layout/view_add_override_item.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit.Guideline" />
-    <ImageView android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_medium" android:src="?ic_plus_a60" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:padding="8.0dip" android:layout_margin="8.0dip" android:src="?ic_plus_a60" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <TextView android:id="@id/category_overview_name" android:text="@string/add_channel_or_category" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/navigation_indicator" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
-    <ImageView android:id="@id/navigation_indicator" android:layout_margin="@dimen/uikit_spacing_medium" android:src="?ic_navigate_next" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/navigation_indicator" android:layout_margin="8.0dip" android:src="?ic_navigate_next" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_application_stream.xml b/com.discord/res/layout/view_application_stream.xml
index 297216dd72..fb6fe42112 100644
--- a/com.discord/res/layout/view_application_stream.xml
+++ b/com.discord/res/layout/view_application_stream.xml
@@ -2,8 +2,8 @@
 <merge android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View android:id="@id/application_stream_black_background" android:background="@color/black" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-    <LinearLayout android:gravity="center_horizontal" android:id="@id/application_stream_ended" android:background="?colorBackgroundTertiary" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout">
-        <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?drawable_stream_ended" android:importantForAccessibility="no" />
+    <LinearLayout android:gravity="center_horizontal" android:id="@id/application_stream_ended" android:background="?colorBackgroundTertiary" android:paddingTop="32.0dip" android:paddingBottom="32.0dip" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout">
+        <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:src="?drawable_stream_ended" android:importantForAccessibility="no" />
         <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderPrimary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_ended" style="@style/UiKit.TextView.Semibold" />
     </LinearLayout>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/application_stream_preview_image" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" app:viewAspectRatio="1.77" />
diff --git a/com.discord/res/layout/view_auth_invite_info.xml b/com.discord/res/layout/view_auth_invite_info.xml
index f808569218..51a0f06ef7 100644
--- a/com.discord/res/layout/view_auth_invite_info.xml
+++ b/com.discord/res/layout/view_auth_invite_info.xml
@@ -2,11 +2,11 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignTop="@id/auth_invite_info_content" android:layout_alignBottom="@id/auth_invite_info_content" android:layout_alignStart="@id/auth_invite_info_content" android:layout_alignEnd="@id/auth_invite_info_content" app:roundedCornerRadius="8.0dip" />
-    <LinearLayout android:id="@id/auth_invite_info_content" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:id="@id/auth_invite_info_content" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/auth_invite_info_guild_avatar" app:roundWithOverlayColor="?colorBackgroundTertiary" style="@style/Avatar.Large" />
         <ImageView android:id="@id/auth_invite_info_template_icon" android:visibility="gone" android:src="@drawable/ic_template_32dp" android:importantForAccessibility="no" app:tint="?colorHeaderSecondary" style="@style/Avatar.Large" />
-        <LinearLayout android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:id="@id/auth_invite_info_invited_text" android:layout_marginBottom="@dimen/uikit_spacing_xsmall" style="@style/UiKit.TextView" />
+        <LinearLayout android:layout_gravity="center_vertical" android:layout_marginStart="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:id="@id/auth_invite_info_invited_text" android:layout_marginBottom="2.0dip" style="@style/UiKit.TextView" />
             <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:id="@id/auth_invite_info_guild_name" android:maxLines="1" style="@style/UiKit.TextView" />
         </LinearLayout>
     </LinearLayout>
diff --git a/com.discord/res/layout/view_boxed_button.xml b/com.discord/res/layout/view_boxed_button.xml
index 435d7781da..c287a1e163 100644
--- a/com.discord/res/layout/view_boxed_button.xml
+++ b/com.discord/res/layout/view_boxed_button.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.google.android.material.button.MaterialButton android:id="@id/button_boxed_button" android:focusable="false" android:clickable="false" android:layout_width="fill_parent" style="@style/UiKit.Material.Button" />
     <LinearLayout android:gravity="center" android:layout_gravity="center" android:translationZ="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <TextView android:textColor="@color/primary_100" android:id="@id/button_text" android:paddingLeft="@dimen/uikit_spacing_large" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/button_boxed_text" android:background="@drawable/bg_boxed_button_outline" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingTop="@dimen/uikit_spacing_xsmall" android:paddingRight="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_xsmall" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:textAllCaps="true" style="@style/UiKit.TextView" />
+        <TextView android:textColor="@color/primary_100" android:id="@id/button_text" android:paddingLeft="16.0dip" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/button_boxed_text" android:background="@drawable/bg_boxed_button_outline" android:paddingLeft="4.0dip" android:paddingTop="2.0dip" android:paddingRight="4.0dip" android:paddingBottom="2.0dip" android:layout_marginLeft="8.0dip" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:textAllCaps="true" style="@style/UiKit.TextView" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_category_override_item.xml b/com.discord/res/layout/view_category_override_item.xml
index 5526c8f0c8..f3e9504229 100644
--- a/com.discord/res/layout/view_category_override_item.xml
+++ b/com.discord/res/layout/view_category_override_item.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit.Guideline" />
-    <ImageView android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_medium" android:src="?ic_category" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:padding="8.0dip" android:layout_margin="8.0dip" android:src="?ic_category" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <TextView android:id="@id/category_override_name" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/category_override_status" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
-    <com.discord.app.AppTextView android:textColor="?primary_100" android:id="@id/category_override_status" android:padding="@dimen/uikit_spacing_small" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/navigation_indicator" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-    <ImageView android:id="@id/navigation_indicator" android:layout_margin="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <com.discord.app.AppTextView android:textColor="?primary_100" android:id="@id/category_override_status" android:padding="4.0dip" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/navigation_indicator" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
+    <ImageView android:id="@id/navigation_indicator" android:layout_margin="8.0dip" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_channel_override_item.xml b/com.discord/res/layout/view_channel_override_item.xml
index 68ebcb2424..582a61eaed 100644
--- a/com.discord/res/layout/view_channel_override_item.xml
+++ b/com.discord/res/layout/view_channel_override_item.xml
@@ -2,9 +2,9 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit.Guideline" />
-    <ImageView android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_medium" android:src="?ic_channel_text" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:padding="8.0dip" android:layout_margin="8.0dip" android:src="?ic_channel_text" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <TextView android:id="@id/channel_override_name" app:layout_constraintBottom_toTopOf="@id/channel_override_category_name" app:layout_constraintEnd_toStartOf="@id/channel_override_status" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
     <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/channel_override_category_name" android:visibility="gone" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_override_status" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toBottomOf="@id/channel_override_name" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <com.discord.app.AppTextView android:textColor="?primary_100" android:id="@id/channel_override_status" android:padding="@dimen/uikit_spacing_small" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/navigation_indicator" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-    <ImageView android:id="@id/navigation_indicator" android:layout_margin="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <com.discord.app.AppTextView android:textColor="?primary_100" android:id="@id/channel_override_status" android:padding="4.0dip" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/navigation_indicator" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
+    <ImageView android:id="@id/navigation_indicator" android:layout_margin="8.0dip" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_chat_action_item.xml b/com.discord/res/layout/view_chat_action_item.xml
index 627985f075..c907f6fd4c 100644
--- a/com.discord/res/layout/view_chat_action_item.xml
+++ b/com.discord/res/layout/view_chat_action_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="8.0dip" app:contentPadding="@dimen/uikit_spacing_large"
+<merge app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="8.0dip" app:contentPadding="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent">
-        <ImageView android:id="@id/chat_action_item_image" android:layout_width="40.0dip" android:layout_height="40.0dip" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_vertical" android:id="@id/chat_action_item_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
+        <ImageView android:id="@id/chat_action_item_image" android:layout_width="40.0dip" android:layout_height="40.0dip" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_vertical" android:id="@id/chat_action_item_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Semibold" />
         <ImageView android:layout_gravity="center_vertical" android:layout_width="24.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_right" app:tint="?colorInteractiveNormal" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_chat_embed_game_invite.xml b/com.discord/res/layout/view_chat_embed_game_invite.xml
index 3aaa04d918..c2cd0ccadf 100644
--- a/com.discord/res/layout/view_chat_embed_game_invite.xml
+++ b/com.discord/res/layout/view_chat_embed_game_invite.xml
@@ -3,13 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_game_invite_cover_iv" android:layout_width="fill_parent" android:layout_height="168.0dip" android:scaleType="fitCenter" style="@style/UiKit.ImageView" />
     <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
-    <androidx.constraintlayout.widget.ConstraintLayout android:paddingBottom="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:paddingBottom="16.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_game_invite_avatar_iv" android:layout_width="40.0dip" android:layout_height="40.0dip" app:actualImageScaleType="fitCenter" app:layout_constraintEnd_toStartOf="@id/item_game_invite_application_name_tv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" app:roundAsCircle="true" />
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_game_invite_avatar_status_iv" android:visibility="gone" android:layout_width="20.0dip" android:layout_height="20.0dip" app:backgroundImage="?colorBackgroundSecondary" app:layout_constraintBottom_toBottomOf="@id/item_game_invite_avatar_iv" app:layout_constraintEnd_toEndOf="@id/item_game_invite_avatar_iv" app:roundAsCircle="true" app:roundingBorderColor="?colorBackgroundSecondary" app:roundingBorderPadding="0.5dip" app:roundingBorderWidth="2.0dip" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_game_invite_application_name_tv" android:layout_width="0.0dip" android:maxLines="2" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toTopOf="@id/item_game_invite_subtext" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/item_game_invite_avatar_iv" app:layout_constraintTop_toTopOf="@id/item_game_invite_avatar_iv" style="@style/UiKit.TextView.H1" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_game_invite_application_name_tv" android:layout_width="0.0dip" android:maxLines="2" android:layout_marginStart="8.0dip" app:layout_constraintBottom_toTopOf="@id/item_game_invite_subtext" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/item_game_invite_avatar_iv" app:layout_constraintTop_toTopOf="@id/item_game_invite_avatar_iv" style="@style/UiKit.TextView.H1" />
         <TextView android:id="@id/item_game_invite_subtext" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/item_game_invite_barrier" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/item_game_invite_application_name_tv" app:layout_constraintTop_toBottomOf="@id/item_game_invite_application_name_tv" style="@style/UiKit.TextView.Subtext" />
         <androidx.constraintlayout.widget.Barrier android:id="@id/item_game_invite_barrier" android:layout_width="fill_parent" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="item_game_invite_avatar_iv,item_game_invite_application_name_tv,item_game_invite_subtext" />
-        <com.google.android.material.button.MaterialButton android:id="@id/item_game_invite_action_btn" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/game_action_button_play" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_game_invite_barrier" app:layout_constraintVertical_bias="1.0" style="@style/UiKit.Material.Button.Green" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_textsize_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/item_game_invite_action_btn" app:layout_constraintTop_toBottomOf="@id/item_game_invite_barrier" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
+        <com.google.android.material.button.MaterialButton android:id="@id/item_game_invite_action_btn" android:visibility="gone" android:layout_marginTop="16.0dip" android:text="@string/game_action_button_play" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_game_invite_barrier" app:layout_constraintVertical_bias="1.0" style="@style/UiKit.Material.Button.Green" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="16.0dip" android:layout_marginStart="@dimen/uikit_textsize_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/item_game_invite_action_btn" app:layout_constraintTop_toBottomOf="@id/item_game_invite_barrier" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_chat_upload.xml b/com.discord/res/layout/view_chat_upload.xml
index c7a3a43a3f..3e91e04611 100644
--- a/com.discord/res/layout/view_chat_upload.xml
+++ b/com.discord/res/layout/view_chat_upload.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<androidx.constraintlayout.widget.ConstraintLayout android:padding="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/file_image" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/display_name" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/display_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/display_name" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:ellipsize="middle" android:id="@id/display_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/subtitle_text" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/file_image" app:layout_constraintRight_toLeftOf="@id/subtitle_text" app:layout_constraintStart_toEndOf="@id/file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/failed_alert_icon" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/display_name" app:layout_constraintRight_toLeftOf="@id/failed_alert_icon" app:layout_constraintStart_toEndOf="@id/display_name" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:ellipsize="middle" android:id="@id/display_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/subtitle_text" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/file_image" app:layout_constraintRight_toLeftOf="@id/subtitle_text" app:layout_constraintStart_toEndOf="@id/file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/failed_alert_icon" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/display_name" app:layout_constraintRight_toLeftOf="@id/failed_alert_icon" app:layout_constraintStart_toEndOf="@id/display_name" />
     <ImageView android:id="@id/failed_alert_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_alert_circle_16dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintBottom_toBottomOf="@id/display_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/display_name" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_code_verification.xml b/com.discord/res/layout/view_code_verification.xml
index 4a5d663059..83ec8758d2 100644
--- a/com.discord/res/layout/view_code_verification.xml
+++ b/com.discord/res/layout/view_code_verification.xml
@@ -4,7 +4,7 @@
     <TextView android:id="@id/verify_char_1" style="@style/UiKit.User.Verify.Char" />
     <TextView android:id="@id/verify_char_2" style="@style/UiKit.User.Verify.Char" />
     <TextView android:id="@id/verify_char_3" style="@style/UiKit.User.Verify.Char" />
-    <Space android:layout_width="@dimen/uikit_spacing_large" android:layout_height="0.0dip" />
+    <Space android:layout_width="16.0dip" android:layout_height="0.0dip" />
     <TextView android:id="@id/verify_char_4" style="@style/UiKit.User.Verify.Char" />
     <TextView android:id="@id/verify_char_5" style="@style/UiKit.User.Verify.Char" />
     <TextView android:id="@id/verify_char_6" style="@style/UiKit.User.Verify.Char" />
diff --git a/com.discord/res/layout/view_dev_settings_experiment_item.xml b/com.discord/res/layout/view_dev_settings_experiment_item.xml
index 36d902fc3d..26ba339034 100644
--- a/com.discord/res/layout/view_dev_settings_experiment_item.xml
+++ b/com.discord/res/layout/view_dev_settings_experiment_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center_vertical" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:id="@id/dev_settings_experiment_item_name" android:layout_width="0.0dip" android:drawablePadding="@dimen/uikit_spacing_small" android:layout_weight="1.0" android:drawableStart="@drawable/ic_person_white_a60_24dp" style="@style/UiKit.TextView.H2" />
-    <com.google.android.material.card.MaterialCardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundFloating" app:cardCornerRadius="@dimen/uikit_spacing_small" style="@style/Widget.MaterialComponents.CardView">
-        <Spinner android:id="@id/dev_settings_experiment_item_bucket_spinner" android:layout_width="wrap_content" android:layout_height="wrap_content" android:dropDownSelector="@drawable/button_brand_500" android:popupBackground="?colorBackgroundFloating" android:dropDownWidth="100.0dip" android:spinnerMode="dropdown" android:layout_marginStart="@dimen/uikit_spacing_medium" />
+    <TextView android:id="@id/dev_settings_experiment_item_name" android:layout_width="0.0dip" android:drawablePadding="4.0dip" android:layout_weight="1.0" android:drawableStart="@drawable/ic_person_white_a60_24dp" style="@style/UiKit.TextView.H2" />
+    <com.google.android.material.card.MaterialCardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" app:cardBackgroundColor="?colorBackgroundFloating" app:cardCornerRadius="4.0dip" style="@style/Widget.MaterialComponents.CardView">
+        <Spinner android:id="@id/dev_settings_experiment_item_bucket_spinner" android:layout_width="wrap_content" android:layout_height="wrap_content" android:dropDownSelector="@drawable/button_brand_500" android:popupBackground="?colorBackgroundFloating" android:dropDownWidth="100.0dip" android:spinnerMode="dropdown" android:layout_marginStart="8.0dip" />
     </com.google.android.material.card.MaterialCardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_dialog_confirmation.xml b/com.discord/res/layout/view_dialog_confirmation.xml
index 75afbb5012..6fa7156b1d 100644
--- a/com.discord/res/layout/view_dialog_confirmation.xml
+++ b/com.discord/res/layout/view_dialog_confirmation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.discord.app.AppTextView android:id="@id/view_dialog_confirmation_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1.Bold" />
+    <com.discord.app.AppTextView android:id="@id/view_dialog_confirmation_header" android:padding="16.0dip" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <com.discord.app.AppTextView android:id="@id/view_dialog_confirmation_text" android:text="@string/sample_confirmation" style="@style/UiKit.Settings.Item.SubText" />
     <View style="@style/UiKit.Settings.Divider" />
diff --git a/com.discord/res/layout/view_file_item.xml b/com.discord/res/layout/view_file_item.xml
index e8b686128c..dcf7df169a 100644
--- a/com.discord/res/layout/view_file_item.xml
+++ b/com.discord/res/layout/view_file_item.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/thumb_iv" android:layout_margin="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginStart="8.0dip" app:layout_constraintEnd_toStartOf="@id/file_name_tv" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/file_name_tv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/FlexInput.Items.File.Image" />
     <ImageView android:layout_gravity="end|bottom|center" android:id="@id/type_iv" android:layout_width="@dimen/file_type_icon_dimen" android:layout_height="@dimen/file_type_icon_dimen" app:layout_constraintBottom_toBottomOf="@id/thumb_iv" app:layout_constraintEnd_toEndOf="@id/thumb_iv" app:layout_constraintRight_toRightOf="@id/thumb_iv" app:tint="?flexInputIconColor" />
-    <TextView android:textColor="?colorTextNormal" android:id="@id/file_name_tv" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_small" android:maxLines="1" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toStartOf="@id/selection_indicator" app:layout_constraintLeft_toRightOf="@id/thumb_iv" app:layout_constraintRight_toLeftOf="@id/selection_indicator" app:layout_constraintStart_toEndOf="@id/thumb_iv" app:layout_constraintTop_toTopOf="parent" style="@style/FlexInput.Items.File.Name" />
-    <TextView android:textColor="?colorTextMuted" android:id="@id/file_subtitle_tv" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/file_name_tv" app:layout_constraintLeft_toLeftOf="@id/file_name_tv" app:layout_constraintRight_toRightOf="@id/file_name_tv" app:layout_constraintStart_toStartOf="@id/file_name_tv" app:layout_constraintTop_toBottomOf="@id/file_name_tv" style="@style/FlexInput.Items.File.Subtitle" />
+    <TextView android:textColor="?colorTextNormal" android:id="@id/file_name_tv" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="4.0dip" android:maxLines="1" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toStartOf="@id/selection_indicator" app:layout_constraintLeft_toRightOf="@id/thumb_iv" app:layout_constraintRight_toLeftOf="@id/selection_indicator" app:layout_constraintStart_toEndOf="@id/thumb_iv" app:layout_constraintTop_toTopOf="parent" style="@style/FlexInput.Items.File.Name" />
+    <TextView android:textColor="?colorTextMuted" android:id="@id/file_subtitle_tv" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginBottom="4.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/file_name_tv" app:layout_constraintLeft_toLeftOf="@id/file_name_tv" app:layout_constraintRight_toRightOf="@id/file_name_tv" app:layout_constraintStart_toStartOf="@id/file_name_tv" app:layout_constraintTop_toBottomOf="@id/file_name_tv" style="@style/FlexInput.Items.File.Subtitle" />
     <ImageView android:id="@id/selection_indicator" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintLeft_toRightOf="@id/file_name_tv" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/file_name_tv" app:layout_constraintTop_toTopOf="parent" style="@style/FlexInput.Items.File.Selection" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_gift_entitlement_list_item.xml b/com.discord/res/layout/view_gift_entitlement_list_item.xml
index e21d7b36cc..1dea72ad61 100644
--- a/com.discord/res/layout/view_gift_entitlement_list_item.xml
+++ b/com.discord/res/layout/view_gift_entitlement_list_item.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:id="@id/gift_entitlement_container" android:background="?primary_630_bg" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <View android:layout_gravity="bottom" android:id="@id/gift_entitlement_divider" android:background="?primary_700" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="1.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" />
+    <View android:layout_gravity="bottom" android:id="@id/gift_entitlement_divider" android:background="?primary_700" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="1.0dip" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" />
     <com.discord.app.AppViewFlipper android:id="@id/gift_entitlement_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content" android:measureAllChildren="false">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <RelativeLayout android:id="@id/gift_entitlement_code_container" android:background="?primary_660_bg_outline" android:paddingStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
-                <TextView android:textColor="?primary_000" android:ellipsize="end" android:id="@id/gift_entitlement_code" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_toStartOf="@id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <RelativeLayout android:id="@id/gift_entitlement_code_container" android:background="?primary_660_bg_outline" android:paddingStart="8.0dip" style="@style/UiKit.ViewGroup">
+                <TextView android:textColor="?primary_000" android:ellipsize="end" android:id="@id/gift_entitlement_code" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginEnd="8.0dip" android:layout_toStartOf="@id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
                 <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@id/gift_entitlement_copy" android:background="@drawable/button_brand_500" android:layout_marginRight="6.0dip" android:minWidth="0.0dip" android:text="@string/copy" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.Fit" />
             </RelativeLayout>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/gift_entitlement_revoke" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="12.0dip" style="@style/UiKit.TextView" />
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/gift_entitlement_revoke" android:layout_marginTop="8.0dip" android:layout_marginBottom="12.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
-        <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
+        <RelativeLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup">
             <com.google.android.material.button.MaterialButton android:id="@id/gift_entitlement_generate" android:text="@string/gift_inventory_generate_link_ios" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.Fit" />
             <TextView android:text="@string/gift_inventory_generate_help" android:layout_centerInParent="true" android:layout_marginEnd="@dimen/avatar_size_medium" android:layout_toStartOf="@id/gift_entitlement_generate" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
         </RelativeLayout>
diff --git a/com.discord/res/layout/view_gift_sku_list_item.xml b/com.discord/res/layout/view_gift_sku_list_item.xml
index 0ccfd45d27..92e6e1a14e 100644
--- a/com.discord/res/layout/view_gift_sku_list_item.xml
+++ b/com.discord/res/layout/view_gift_sku_list_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_marginTop="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_660" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup"
+<androidx.cardview.widget.CardView android:layout_marginTop="16.0dip" app:cardBackgroundColor="?primary_660" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/gift_sku_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_alignParentStart="true" />
+    <RelativeLayout android:padding="8.0dip" style="@style/UiKit.ViewGroup">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/gift_sku_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" android:layout_alignParentStart="true" />
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:id="@id/gift_sku_name" android:layout_alignParentTop="true" android:layout_marginStart="48.0dip" android:layout_alignParentStart="true" style="@style/UiKit.TextView.Semibold" />
         <TextView android:id="@id/gift_sku_copies" android:layout_below="@id/gift_sku_name" android:layout_marginStart="48.0dip" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-        <ImageView android:id="@id/gift_sku_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon_carrot" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_alignParentEnd="true" />
+        <ImageView android:id="@id/gift_sku_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon_carrot" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" android:layout_alignParentEnd="true" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_global_search_item.xml b/com.discord/res/layout/view_global_search_item.xml
index 2225bba6a9..8f71c64d29 100644
--- a/com.discord/res/layout/view_global_search_item.xml
+++ b/com.discord/res/layout/view_global_search_item.xml
@@ -3,9 +3,9 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit.Guideline" />
     <ImageView android:id="@id/item_unread" android:src="@drawable/ic_unread_white_9dp" android:contentDescription="@string/new_unreads" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="@dimen/uikit_spacing_xsmall" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_small" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="2.0dip" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="4.0dip" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
     <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
-    <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <androidx.appcompat.widget.AppCompatTextView android:gravity="end" android:id="@id/item_group_tv" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <androidx.appcompat.widget.AppCompatTextView android:id="@id/item_mentions_tv" android:visibility="gone" android:text="@string/sample_number_99" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
+    <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="64.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
+    <androidx.appcompat.widget.AppCompatTextView android:gravity="end" android:id="@id/item_group_tv" android:textAlignment="viewEnd" android:layout_marginEnd="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="64.0dip" app:layout_goneMarginEnd="8.0dip" app:layout_goneMarginRight="8.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
+    <androidx.appcompat.widget.AppCompatTextView android:id="@id/item_mentions_tv" android:visibility="gone" android:text="@string/sample_number_99" android:layout_marginEnd="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_guild_invite_bottom_sheet.xml b/com.discord/res/layout/view_guild_invite_bottom_sheet.xml
index b006bdf50f..4eaa9074f3 100644
--- a/com.discord/res/layout/view_guild_invite_bottom_sheet.xml
+++ b/com.discord/res/layout/view_guild_invite_bottom_sheet.xml
@@ -4,7 +4,7 @@
     <LinearLayout android:background="?primary_630" android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit.ViewGroup.LinearLayout">
         <LinearLayout android:background="?colorBackgroundPrimary" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:padding="0.0dip" android:text="@string/form_label_instant_invite_channel" android:paddingStart="0.0dip" android:paddingEnd="0.0dip" style="@style/UiKit.Settings.Item.Header" />
-            <Spinner android:id="@id/guild_invite_channel_spinner" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:popupBackground="?colorPrimary" />
+            <Spinner android:id="@id/guild_invite_channel_spinner" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:popupBackground="?colorPrimary" />
             <View android:background="?primary_400" android:layout_width="fill_parent" android:layout_height="0.25dip" />
         </LinearLayout>
         <TextView android:text="@string/expire_after" style="@style/UiKit.Settings.Item.Header" />
@@ -16,6 +16,6 @@
             <RadioGroup android:orientation="horizontal" android:id="@id/guild_invite_max_uses_radiogroup" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         </HorizontalScrollView>
         <com.discord.views.CheckedSetting android:id="@id/guild_invite_temporary_membership" app:cs_subtext="@string/temporary_membership_explanation" app:cs_text="@string/grant_temporary_membership" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
-        <com.google.android.material.button.MaterialButton android:id="@id/guild_invite_generate_link" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/create_link" style="@style/UiKit.Material.Button" />
+        <com.google.android.material.button.MaterialButton android:id="@id/guild_invite_generate_link" android:layout_margin="16.0dip" android:text="@string/create_link" style="@style/UiKit.Material.Button" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_input_modal.xml b/com.discord/res/layout/view_input_modal.xml
index 6cabbf318c..8510900316 100644
--- a/com.discord/res/layout/view_input_modal.xml
+++ b/com.discord/res/layout/view_input_modal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout android:id="@id/view_input" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.TextInputLayout.Primary"
+<com.google.android.material.textfield.TextInputLayout android:id="@id/view_input" android:layout_margin="8.0dip" style="@style/UiKit.TextInputLayout.Primary"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password" />
 </com.google.android.material.textfield.TextInputLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_nitro_boost_perks.xml b/com.discord/res/layout/view_nitro_boost_perks.xml
index b386ab1b70..862c964b49 100644
--- a/com.discord/res/layout/view_nitro_boost_perks.xml
+++ b/com.discord/res/layout/view_nitro_boost_perks.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardCornerRadius="@dimen/uikit_spacing_small"
+<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:cardCornerRadius="4.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/container" android:background="?primary_630" android:minHeight="315.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <RelativeLayout android:id="@id/perks_level_header" android:background="?primary_700" android:layout_width="fill_parent" android:layout_height="wrap_content">
-            <TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@id/perks_level_header_text" android:layout_marginTop="12.0dip" android:layout_marginBottom="12.0dip" android:maxLines="1" android:drawablePadding="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/perks_level_header_boosts_container" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-            <FrameLayout android:id="@id/perks_level_header_boosts_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true">
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/perks_level_header_boosts" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableEnd="@drawable/ic_perk_lock" style="@style/UiKit.TextView" />
+            <TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@id/perks_level_header_text" android:layout_marginTop="12.0dip" android:layout_marginBottom="12.0dip" android:maxLines="1" android:drawablePadding="16.0dip" android:layout_centerVertical="true" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" android:layout_toStartOf="@id/perks_level_header_boosts_container" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
+            <FrameLayout android:id="@id/perks_level_header_boosts_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true">
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/perks_level_header_boosts" android:drawablePadding="16.0dip" android:drawableEnd="@drawable/ic_perk_lock" style="@style/UiKit.TextView" />
                 <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@id/perks_level_header_unlocked" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white" app:cardCornerRadius="10.0dip">
                     <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/brand_500" android:gravity="center_vertical" android:layout_marginLeft="6.0dip" android:layout_marginRight="6.0dip" android:text="@string/guild_settings_premium_guild_unlocked" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
                 </androidx.cardview.widget.CardView>
             </FrameLayout>
         </RelativeLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/perks_level_contents_header" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/perks_level_contents_recycler" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:nestedScrollingEnabled="false" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/perks_level_contents_header" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/perks_level_contents_recycler" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:nestedScrollingEnabled="false" style="@style/UiKit.ViewGroup.RecyclerView" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_nitro_boost_perks_list_item.xml b/com.discord/res/layout/view_nitro_boost_perks_list_item.xml
index 54dfb24113..78f803c7dc 100644
--- a/com.discord/res/layout/view_nitro_boost_perks_list_item.xml
+++ b/com.discord/res/layout/view_nitro_boost_perks_list_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:id="@id/perk_view_content_list_item" android:padding="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView"
+<TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:id="@id/perk_view_content_list_item" android:padding="8.0dip" android:drawablePadding="8.0dip" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/view_no_gifts_list_item.xml b/com.discord/res/layout/view_no_gifts_list_item.xml
index c61b7e4d87..d92faf5e5c 100644
--- a/com.discord/res/layout/view_no_gifts_list_item.xml
+++ b/com.discord/res/layout/view_no_gifts_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_gravity="center_vertical" android:layout_width="88.0dip" android:layout_height="40.0dip" android:src="@drawable/img_no_gifts" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
+    <ImageView android:layout_gravity="center_vertical" android:layout_width="88.0dip" android:layout_height="40.0dip" android:src="@drawable/img_no_gifts" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" />
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:text="@string/gift_inventory_no_gifts" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_no_gifts_subtext_mobile" style="@style/UiKit.TextView" />
+        <TextView android:layout_marginTop="8.0dip" android:text="@string/gift_inventory_no_gifts_subtext_mobile" style="@style/UiKit.TextView" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_overlay_menu.xml b/com.discord/res/layout/view_overlay_menu.xml
index 1f6ba83ad4..1f1997fafd 100644
--- a/com.discord/res/layout/view_overlay_menu.xml
+++ b/com.discord/res/layout/view_overlay_menu.xml
@@ -2,11 +2,11 @@
 <merge android:theme="@style/AppTheme.Dark" android:orientation="vertical" android:layout_width="240.0dip" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include layout="@layout/view_overlay_menu_content" />
-    <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip">
+    <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip">
         <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
-            <ImageView android:id="@id/src_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/use_speaker" style="@style/UiKit.ImageView.Clickable" />
-            <ImageView android:id="@id/mute_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1.0" android:contentDescription="@string/mute" style="@style/UiKit.ImageView.Clickable" />
-            <ImageView android:id="@id/disconnect_btn" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/UiKit.ImageView.Clickable" />
+            <ImageView android:id="@id/src_toggle" android:padding="16.0dip" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/use_speaker" style="@style/UiKit.ImageView.Clickable" />
+            <ImageView android:id="@id/mute_toggle" android:padding="16.0dip" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1.0" android:contentDescription="@string/mute" style="@style/UiKit.ImageView.Clickable" />
+            <ImageView android:id="@id/disconnect_btn" android:padding="16.0dip" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/UiKit.ImageView.Clickable" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_overlay_menu_content.xml b/com.discord/res/layout/view_overlay_menu_content.xml
index 6180a008e7..996a663e5d 100644
--- a/com.discord/res/layout/view_overlay_menu_content.xml
+++ b/com.discord/res/layout/view_overlay_menu_content.xml
@@ -2,13 +2,13 @@
 <androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layoutDirection="locale" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
-        <androidx.constraintlayout.widget.ConstraintLayout android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minWidth="240.0dip">
-            <ImageView android:id="@id/overlay_network_icon" android:padding="2.0dip" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_voice_quality_fine" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
-            <androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:id="@id/overlay_guild_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" app:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/overlay_channel_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/overlay_network_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/overlay_network_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
+        <androidx.constraintlayout.widget.ConstraintLayout android:background="@color/primary_700" android:padding="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minWidth="240.0dip">
+            <ImageView android:id="@id/overlay_network_icon" android:padding="2.0dip" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_voice_quality_fine" android:layout_marginStart="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+            <androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:id="@id/overlay_guild_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" app:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/overlay_channel_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/overlay_network_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/overlay_network_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
             <androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_channel_name" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/overlay_guild_name" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/overlay_guild_name" app:layout_constraintTop_toBottomOf="@id/overlay_guild_name" style="@style/UiKit.TextView.Subtext" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_invite_link" android:text="@string/overlay_menu_get_invite" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_diag_link_24dp" app:drawableTint="?colorInteractiveNormal" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
-        <androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_switch_channels" android:text="@string/overlay_menu_switch_channels" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_channel_text_white_a60_24dp" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
-        <androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_open_app" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/overlay_menu_open_discord" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/img_logo_square" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
+        <androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_invite_link" android:text="@string/overlay_menu_get_invite" android:drawablePadding="16.0dip" android:drawableStart="@drawable/ic_diag_link_24dp" app:drawableTint="?colorInteractiveNormal" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
+        <androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_switch_channels" android:text="@string/overlay_menu_switch_channels" android:drawablePadding="16.0dip" android:drawableStart="@drawable/ic_channel_text_white_a60_24dp" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
+        <androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_open_app" android:layout_marginBottom="8.0dip" android:text="@string/overlay_menu_open_discord" android:drawablePadding="16.0dip" android:drawableStart="@drawable/img_logo_square" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_permissions_required.xml b/com.discord/res/layout/view_permissions_required.xml
index cd9ccdeaa2..7e02af8e79 100644
--- a/com.discord/res/layout/view_permissions_required.xml
+++ b/com.discord/res/layout/view_permissions_required.xml
@@ -2,6 +2,6 @@
 <LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:src="@drawable/img_permission_prime" android:contentDescription="@string/system_permission_request_files" style="@style/UiKit.ImageView" />
-    <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/permissions_required_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+    <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/permissions_required_text" android:padding="16.0dip" style="@style/UiKit.TextView" />
     <com.google.android.material.button.MaterialButton android:id="@id/permissions_required_action_btn" android:text="@string/system_permission_grant" style="@style/UiKit.Material.Button.Fit" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_guild_confirmation.xml b/com.discord/res/layout/view_premium_guild_confirmation.xml
index 0c978afd59..09e2dca286 100644
--- a/com.discord/res/layout/view_premium_guild_confirmation.xml
+++ b/com.discord/res/layout/view_premium_guild_confirmation.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content">
+    <androidx.constraintlayout.widget.ConstraintLayout android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/premium_guild_confirmation_avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Large" />
-        <TextView android:textColor="?colorInteractiveActive" android:ellipsize="end" android:id="@id/premium_guild_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/premium_guild_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
-        <LinearLayout android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constraintLeft_toRightOf="@id/premium_guild_confirmation_avatar" app:layout_constraintTop_toBottomOf="@id/premium_guild_confirmation_guild_name" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <TextView android:textColor="?colorInteractiveActive" android:ellipsize="end" android:id="@id/premium_guild_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/premium_guild_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
+        <LinearLayout android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" app:layout_constraintLeft_toRightOf="@id/premium_guild_confirmation_avatar" app:layout_constraintTop_toBottomOf="@id/premium_guild_confirmation_guild_name" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <com.google.android.material.chip.Chip android:id="@id/premium_guild_confirmation_level_info_previous" app:chipIcon="@drawable/ic_guild_badge_premium_tier_1_banner" style="@style/UiKit.PremiumGuild.Confirmation.Chip" />
-            <ImageView android:layout_gravity="center_vertical" android:id="@id/premium_guild_confirmation_upgrade_arrow" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_double_carot_right_16dp" android:importantForAccessibility="no" app:tint="@color/status_red_500" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="center_vertical" android:id="@id/premium_guild_confirmation_upgrade_arrow" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:src="@drawable/ic_double_carot_right_16dp" android:importantForAccessibility="no" app:tint="@color/status_red_500" style="@style/UiKit.ImageView" />
             <com.google.android.material.chip.Chip android:id="@id/premium_guild_confirmation_level_info_upgrade" app:chipIcon="@drawable/ic_guild_badge_premium_tier_1_banner" style="@style/UiKit.PremiumGuild.Confirmation.Chip" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout/view_premium_guild_feature.xml b/com.discord/res/layout/view_premium_guild_feature.xml
index 5f00f09147..948ed53f79 100644
--- a/com.discord/res/layout/view_premium_guild_feature.xml
+++ b/com.discord/res/layout/view_premium_guild_feature.xml
@@ -3,6 +3,6 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:layout_width="@dimen/premium_guild_feature_width" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <ImageView android:id="@id/view_premium_guild_feature_image" android:layout_width="fill_parent" android:scaleType="centerInside" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:id="@id/view_premium_guild_feature_text" android:background="?colorBackgroundTertiary" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:id="@id/view_premium_guild_feature_text" android:background="?colorBackgroundTertiary" android:padding="16.0dip" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_guild_features_guild_old.xml b/com.discord/res/layout/view_premium_guild_features_guild_old.xml
index 02f2c3bade..9d4a7a5843 100644
--- a/com.discord/res/layout/view_premium_guild_features_guild_old.xml
+++ b/com.discord/res/layout/view_premium_guild_features_guild_old.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textColor="?colorHeaderPrimary" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_guild_features_header" style="@style/UiKit.TextView.H1" />
+    <TextView android:textColor="?colorHeaderPrimary" android:layout_marginTop="16.0dip" android:text="@string/premium_guild_guild_features_header" style="@style/UiKit.TextView.H1" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_guild_feature_emoji" android:drawableStart="@drawable/ic_emoji_blue_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_guild_feature_audio_quality" android:drawableStart="@drawable/ic_headset_blue_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_guild_feature_upload_size" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
diff --git a/com.discord/res/layout/view_premium_guild_features_user_old.xml b/com.discord/res/layout/view_premium_guild_features_user_old.xml
index 9df2384e44..f02ec2e9ba 100644
--- a/com.discord/res/layout/view_premium_guild_features_user_old.xml
+++ b/com.discord/res/layout/view_premium_guild_features_user_old.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textColor="?colorHeaderPrimary" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_user_features_header" style="@style/UiKit.TextView.H1" />
+    <TextView android:textColor="?colorHeaderPrimary" android:layout_marginTop="16.0dip" android:text="@string/premium_guild_user_features_header" style="@style/UiKit.TextView.H1" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_user_feature_member_badge" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_user_feature_profile_badge" android:drawableStart="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_user_feature_role" android:drawableStart="@drawable/ic_role_24dp" style="@style/UiKit.TextView.Perk" />
diff --git a/com.discord/res/layout/view_premium_guild_progress_bar.xml b/com.discord/res/layout/view_premium_guild_progress_bar.xml
index b19a66374b..9d0f0d7cb4 100644
--- a/com.discord/res/layout/view_premium_guild_progress_bar.xml
+++ b/com.discord/res/layout/view_premium_guild_progress_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ProgressBar android:id="@id/boost_bar_progress_bar" android:layout_width="fill_parent" android:layout_height="4.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="14.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:progressDrawable="?bg_boost_progress_bar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ProgressBar.Line.Horizontal.Determinate" />
+    <ProgressBar android:id="@id/boost_bar_progress_bar" android:layout_width="fill_parent" android:layout_height="4.0dip" android:layout_marginLeft="8.0dip" android:layout_marginTop="14.0dip" android:layout_marginRight="8.0dip" android:progressDrawable="?bg_boost_progress_bar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ProgressBar.Line.Horizontal.Determinate" />
     <FrameLayout android:id="@id/boost_bar_tier_0_container" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintEnd_toStartOf="@id/boost_bar_tier_1_container" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/boost_bar_tier_1_container" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent">
         <FrameLayout android:background="?colorPrimaryCircle" android:layout_width="32.0dip" android:layout_height="32.0dip">
             <ImageView android:layout_gravity="center" android:id="@id/boost_bar_tier_0_iv" android:layout_width="20.0dip" android:layout_height="20.0dip" android:src="?bg_gem_premium_guild" android:contentDescription="@string/premium_guild_header_badge_no_tier" />
diff --git a/com.discord/res/layout/view_premium_marketing.xml b/com.discord/res/layout/view_premium_marketing.xml
index 8490d5c28f..f9580ce600 100644
--- a/com.discord/res/layout/view_premium_marketing.xml
+++ b/com.discord/res/layout/view_premium_marketing.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@id/view_premium_marketing_marketing_container" android:background="@drawable/drawable_bg_premium_guild_gradient_corners" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:id="@id/view_premium_marketing_marketing_container" android:background="@drawable/drawable_bg_premium_guild_gradient_corners" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_marketing_marketing_title" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_heading_secondary" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Bold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_marketing_marketing_subtitle" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_heading_secondary" style="@style/UiKit.TextView.Semibold" />
-    <LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.PremiumGuild.Settings.Marketing.Container">
+    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_marketing_marketing_title" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/guild_settings_premium_upsell_heading_secondary" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Bold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_marketing_marketing_subtitle" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:text="@string/guild_settings_premium_upsell_heading_secondary" style="@style/UiKit.TextView.Semibold" />
+    <LinearLayout android:layout_marginTop="16.0dip" style="@style/UiKit.PremiumGuild.Settings.Marketing.Container">
         <ImageView android:src="@drawable/img_logo_discord" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
         <ImageView android:src="@drawable/img_logo_nitro" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
-        <TextView android:id="@id/view_premium_marketing_nitro_boost_discount" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.PremiumGuild.Settings.Marketing.Check" />
-        <TextView android:id="@id/view_premium_marketing_nitro_boost_count" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.PremiumGuild.Settings.Marketing.Check" />
+        <TextView android:id="@id/view_premium_marketing_nitro_boost_discount" android:layout_marginTop="16.0dip" style="@style/UiKit.PremiumGuild.Settings.Marketing.Check" />
+        <TextView android:id="@id/view_premium_marketing_nitro_boost_count" android:layout_marginTop="8.0dip" style="@style/UiKit.PremiumGuild.Settings.Marketing.Check" />
     </LinearLayout>
-    <LinearLayout android:id="@id/view_premium_marketing_container_tier1" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.PremiumGuild.Settings.Marketing.Container">
+    <LinearLayout android:id="@id/view_premium_marketing_container_tier1" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.PremiumGuild.Settings.Marketing.Container">
         <ImageView android:src="@drawable/img_logo_discord" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
         <ImageView android:src="@drawable/img_logo_nitro_classic_header" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
-        <TextView android:id="@id/view_premium_marketing_nitro_classic_boost_discount" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.PremiumGuild.Settings.Marketing.Check" />
-        <TextView android:id="@id/view_premium_marketing_nitro_classic_boost_count" android:layout_marginTop="@dimen/uikit_spacing_medium" android:alpha="0.5" style="@style/UiKit.PremiumGuild.Settings.Marketing.Clear" />
+        <TextView android:id="@id/view_premium_marketing_nitro_classic_boost_discount" android:layout_marginTop="16.0dip" style="@style/UiKit.PremiumGuild.Settings.Marketing.Check" />
+        <TextView android:id="@id/view_premium_marketing_nitro_classic_boost_count" android:layout_marginTop="8.0dip" android:alpha="0.5" style="@style/UiKit.PremiumGuild.Settings.Marketing.Clear" />
     </LinearLayout>
-    <com.google.android.material.button.MaterialButton android:textColor="@color/brand_500" android:id="@id/view_premium_marketing_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_learn_more" style="@style/UiKit.Material.Button.White" />
+    <com.google.android.material.button.MaterialButton android:textColor="@color/brand_500" android:id="@id/view_premium_marketing_learn_more" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/guild_settings_premium_upsell_learn_more" style="@style/UiKit.Material.Button.White" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_settings_perks.xml b/com.discord/res/layout/view_premium_settings_perks.xml
index 5046203013..4ead3d2432 100644
--- a/com.discord/res/layout/view_premium_settings_perks.xml
+++ b/com.discord/res/layout/view_premium_settings_perks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_000" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_included" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_000" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:text="@string/premium_included" style="@style/UiKit.TextView.Semibold" />
     <TextView android:text="@string/premium_chat_perks_discriminator_mobile" android:drawableStart="@drawable/ic_nitro_tag_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:text="@string/premium_chat_perks_animated_avatar_and_emoji_mobile" android:drawableStart="@drawable/ic_nitro_gifs_24dp" style="@style/UiKit.TextView.Perk" />
     <TextView android:text="@string/premium_chat_perks_streaming_mobile" android:drawableStart="@drawable/ic_nitro_perk_stream_24dp" style="@style/UiKit.TextView.Perk" />
diff --git a/com.discord/res/layout/view_premium_settings_tier_1.xml b/com.discord/res/layout/view_premium_settings_tier_1.xml
index 16002d6335..0494ebf44f 100644
--- a/com.discord/res/layout/view_premium_settings_tier_1.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_1.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_chat_perks_simple_title" style="@style/UiKit.TextView.Semibold" />
-    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_000" android:layout_marginTop="16.0dip" android:text="@string/premium_chat_perks_simple_title" style="@style/UiKit.TextView.Semibold" />
+    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <ImageView android:id="@id/premium_settings_nitro_classic_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="@drawable/img_wumpus_riding_wheel" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-        <ImageView android:id="@id/premium_settings_nitro_classic" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="?img_logo_discord_nitro_classic" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
+        <ImageView android:id="@id/premium_settings_nitro_classic" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="16.0dip" android:src="?img_logo_discord_nitro_classic" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
     </LinearLayout>
-    <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_features_chat_perks" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
-    <TextView android:textColor="?primary_000" android:id="@id/premium_settings_nitro_classic_boost_discount" android:layout_marginTop="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
-    <TextView android:textColor="?primary_000" android:id="@id/premium_settings_nitro_classic_boost_count" android:layout_marginTop="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_clear_primary_300_24dp" style="@style/UiKit.TextView" />
-    <com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" app:background_color="@color/status_green_500" />
+    <TextView android:textColor="?primary_000" android:layout_marginTop="16.0dip" android:text="@string/premium_features_chat_perks" android:drawablePadding="16.0dip" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
+    <TextView android:textColor="?primary_000" android:id="@id/premium_settings_nitro_classic_boost_discount" android:layout_marginTop="8.0dip" android:drawablePadding="16.0dip" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
+    <TextView android:textColor="?primary_000" android:id="@id/premium_settings_nitro_classic_boost_count" android:layout_marginTop="8.0dip" android:drawablePadding="16.0dip" android:drawableStart="@drawable/ic_clear_primary_300_24dp" style="@style/UiKit.TextView" />
+    <com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" app:background_color="@color/status_green_500" />
     <com.google.android.material.button.MaterialButton android:id="@id/premium_settings_premium_classic_monthly" style="@style/UiKit.Material.Button.Secondary" />
-    <TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_gift" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:focusable="true" android:clickable="true" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_gift" android:background="?selectableItemBackground" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:focusable="true" android:clickable="true" android:layout_marginTop="8.0dip" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_settings_tier_2.xml b/com.discord/res/layout/view_premium_settings_tier_2.xml
index f0016b115a..9f611c4111 100644
--- a/com.discord/res/layout/view_premium_settings_tier_2.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_2.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <ImageView android:id="@id/premium_settings_nitro" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="?img_logo_discord_nitro" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
-        <ImageView android:id="@id/premium_settings_nitro_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
+        <ImageView android:id="@id/premium_settings_nitro_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginStart="16.0dip" style="@style/UiKit.ImageView" />
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_tier_2_title" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_tier_2_subtitle" style="@style/UiKit.TextView" />
-    <com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" app:background_color="@color/status_green_500" app:boxed_text="-16%" />
+    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_000" android:layout_marginTop="16.0dip" android:text="@string/premium_tier_2_title" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:layout_marginTop="8.0dip" android:text="@string/premium_tier_2_subtitle" style="@style/UiKit.TextView" />
+    <com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" app:background_color="@color/status_green_500" app:boxed_text="-16%" />
     <com.google.android.material.button.MaterialButton android:id="@id/premium_settings_premium_monthly" style="@style/UiKit.Material.Button.Secondary" />
-    <TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_gift" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:focusable="true" android:clickable="true" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_gift" android:background="?selectableItemBackground" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:focusable="true" android:clickable="true" android:layout_marginTop="8.0dip" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_upsell_info.xml b/com.discord/res/layout/view_premium_upsell_info.xml
index cbb3533362..6937342a12 100644
--- a/com.discord/res/layout/view_premium_upsell_info.xml
+++ b/com.discord/res/layout/view_premium_upsell_info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_premium_upsell_heading_primary" style="@style/UiKit.TextView.H1" />
-    <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_price" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_blurb" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_blurb" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_horizontal" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/guild_settings_premium_upsell_heading_primary" style="@style/UiKit.TextView.H1" />
+    <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_price" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/view_premium_upsell_info_subheading_blurb" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_subscription_marketing_guilds_blurb" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_review_request_modal_image.xml b/com.discord/res/layout/view_review_request_modal_image.xml
index 01ee18ac2f..d906aa69c5 100644
--- a/com.discord/res/layout/view_review_request_modal_image.xml
+++ b/com.discord/res/layout/view_review_request_modal_image.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView android:layout_marginTop="@dimen/uikit_spacing_medium" android:src="?img_wumpus_ball" android:contentDescription="@string/rating_request_body_android" style="@style/UiKit.ImageView"
+<ImageView android:layout_marginTop="8.0dip" android:src="?img_wumpus_ball" android:contentDescription="@string/rating_request_body_android" style="@style/UiKit.ImageView"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/view_screen_title.xml b/com.discord/res/layout/view_screen_title.xml
index 67c816ed5c..5dc085e32a 100644
--- a/com.discord/res/layout/view_screen_title.xml
+++ b/com.discord/res/layout/view_screen_title.xml
@@ -2,5 +2,5 @@
 <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/screen_title_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Bold" />
-    <TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/screen_title_subtitle" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+    <TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/screen_title_subtitle" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_server_folder.xml b/com.discord/res/layout/view_server_folder.xml
index 05bcae86b1..d934fbc06b 100644
--- a/com.discord/res/layout/view_server_folder.xml
+++ b/com.discord/res/layout/view_server_folder.xml
@@ -3,9 +3,9 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/folder_view_folder_image" android:padding="12.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/ic_guild_folder" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
     <GridLayout android:id="@id/guild_views" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/folder_guild_outer_margin" android:layout_marginTop="@dimen/folder_guild_outer_margin" android:rowCount="2" android:columnCount="2">
-        <com.discord.views.GuildView android:id="@id/guild_view_1" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/folder_guild_size" android:layout_height="@dimen/folder_guild_size" android:layout_marginRight="@dimen/uikit_spacing_xsmall" android:layout_marginBottom="@dimen/uikit_spacing_xsmall" android:backgroundTint="?colorBackgroundSecondary" app:gv_image_request_size="@dimen/avatar_size_large" />
+        <com.discord.views.GuildView android:id="@id/guild_view_1" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/folder_guild_size" android:layout_height="@dimen/folder_guild_size" android:layout_marginRight="2.0dip" android:layout_marginBottom="2.0dip" android:backgroundTint="?colorBackgroundSecondary" app:gv_image_request_size="@dimen/avatar_size_large" />
         <com.discord.views.GuildView android:id="@id/guild_view_2" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/folder_guild_size" android:layout_height="@dimen/folder_guild_size" android:layout_marginLeft="2.0dip" android:layout_marginBottom="2.0dip" android:backgroundTint="?colorBackgroundSecondary" app:gv_image_request_size="@dimen/avatar_size_large" />
-        <com.discord.views.GuildView android:id="@id/guild_view_3" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/folder_guild_size" android:layout_height="@dimen/folder_guild_size" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_xsmall" android:backgroundTint="?colorBackgroundSecondary" app:gv_image_request_size="@dimen/avatar_size_large" />
-        <com.discord.views.GuildView android:id="@id/guild_view_4" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/folder_guild_size" android:layout_height="@dimen/folder_guild_size" android:layout_marginLeft="@dimen/uikit_spacing_xsmall" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:backgroundTint="?colorBackgroundSecondary" app:gv_image_request_size="@dimen/avatar_size_large" />
+        <com.discord.views.GuildView android:id="@id/guild_view_3" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/folder_guild_size" android:layout_height="@dimen/folder_guild_size" android:layout_marginTop="2.0dip" android:layout_marginRight="2.0dip" android:backgroundTint="?colorBackgroundSecondary" app:gv_image_request_size="@dimen/avatar_size_large" />
+        <com.discord.views.GuildView android:id="@id/guild_view_4" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/folder_guild_size" android:layout_height="@dimen/folder_guild_size" android:layout_marginLeft="2.0dip" android:layout_marginTop="2.0dip" android:backgroundTint="?colorBackgroundSecondary" app:gv_image_request_size="@dimen/avatar_size_large" />
     </GridLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_server_settings_community_setting_selector.xml b/com.discord/res/layout/view_server_settings_community_setting_selector.xml
index 572f87c741..efb56339c9 100644
--- a/com.discord/res/layout/view_server_settings_community_setting_selector.xml
+++ b/com.discord/res/layout/view_server_settings_community_setting_selector.xml
@@ -4,9 +4,9 @@
     <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
         <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:id="@id/server_settings_community_setting_selector_title" android:text="@string/enable_public_modal_rules_channel_title" style="@style/UiKit.Settings.Item.Label" />
-            <TextView android:id="@id/server_settings_community_setting_selector_subtitle" android:drawablePadding="@dimen/uikit_spacing_xsmall" android:drawableStart="@drawable/ic_channel_text_16dp" style="@style/UiKit.Settings.Item.Addition" />
+            <TextView android:id="@id/server_settings_community_setting_selector_subtitle" android:drawablePadding="2.0dip" android:drawableStart="@drawable/ic_channel_text_16dp" style="@style/UiKit.Settings.Item.Addition" />
         </LinearLayout>
-        <ImageView android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_chevron_down_grey_12dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" />
+        <ImageView android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_chevron_down_grey_12dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true" />
     </RelativeLayout>
     <TextView android:id="@id/server_settings_community_setting_selector_description" android:text="@string/enable_public_modal_rules_channel_help" style="@style/UiKit.Settings.Item.SubText" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_server_settings_icon_name.xml b/com.discord/res/layout/view_server_settings_icon_name.xml
index e26b0b5987..7ad0c492fe 100644
--- a/com.discord/res/layout/view_server_settings_icon_name.xml
+++ b/com.discord/res/layout/view_server_settings_icon_name.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout"
+<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_600" style="@style/Avatar.XXLarge" />
-    <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
+    <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
+    <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="8.0dip" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
     <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext" />
-    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon_label" style="@style/UiKit.TextView.Subtext" />
-    <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_overview_name" android:layout_width="0.0dip" android:hint="@string/form_label_server_name" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextInputLayout.Primary">
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_icon_remove" android:background="?selectableItemBackground" android:padding="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon_label" style="@style/UiKit.TextView.Subtext" />
+    <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_overview_name" android:layout_width="0.0dip" android:hint="@string/form_label_server_name" android:layout_marginStart="16.0dip" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextInputLayout.Primary">
         <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
     </com.google.android.material.textfield.TextInputLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_server_settings_region.xml b/com.discord/res/layout/view_server_settings_region.xml
index 210c56ad7b..e788d850f6 100644
--- a/com.discord/res/layout/view_server_settings_region.xml
+++ b/com.discord/res/layout/view_server_settings_region.xml
@@ -5,5 +5,5 @@
         <TextView android:text="@string/form_label_server_region" style="@style/UiKit.Settings.Item.Label" />
         <TextView android:id="@id/server_settings_overview_region" style="@style/UiKit.Settings.Item.Addition" />
     </LinearLayout>
-    <ImageView android:layout_gravity="center" android:id="@id/server_settings_overview_region_flag" android:padding="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/form_label_server_region" />
+    <ImageView android:layout_gravity="center" android:id="@id/server_settings_overview_region_flag" android:padding="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/form_label_server_region" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_server_settings_system_channel_wrap.xml b/com.discord/res/layout/view_server_settings_system_channel_wrap.xml
index 096be4ad74..ac8ac3f6c7 100644
--- a/com.discord/res/layout/view_server_settings_system_channel_wrap.xml
+++ b/com.discord/res/layout/view_server_settings_system_channel_wrap.xml
@@ -2,7 +2,7 @@
 <LinearLayout android:id="@id/server_settings_overview_system_channel_wrap" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:text="@string/form_label_system_channel" style="@style/UiKit.Settings.Item.Label" />
-    <TextView android:id="@id/server_settings_overview_system_channel" android:drawablePadding="@dimen/uikit_spacing_xsmall" style="@style/UiKit.Settings.Item.Addition" />
+    <TextView android:id="@id/server_settings_overview_system_channel" android:drawablePadding="2.0dip" style="@style/UiKit.Settings.Item.Addition" />
     <TextView android:text="@string/form_help_system_channel" style="@style/UiKit.Settings.Item.SubText" />
     <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_system_channel_join" app:cs_text="@string/form_help_system_channel_join_messages" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
     <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_system_channel_boost" app:cs_text="@string/form_help_system_channel_premium_subscription_messages" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
diff --git a/com.discord/res/layout/view_server_settings_upload_banner.xml b/com.discord/res/layout/view_server_settings_upload_banner.xml
index 4013eb5eda..e7fd38e452 100644
--- a/com.discord/res/layout/view_server_settings_upload_banner.xml
+++ b/com.discord/res/layout/view_server_settings_upload_banner.xml
@@ -3,13 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View style="@style/UiKit.Settings.Divider" />
     <TextView android:text="@string/guild_settings_server_banner" style="@style/UiKit.Settings.Item.Header" />
-    <FrameLayout android:id="@id/server_settings_overview_upload_banner_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+    <FrameLayout android:id="@id/server_settings_overview_upload_banner_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:foreground="?selectableItemBackground">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_banner" android:background="?primary_630" android:layout_width="fill_parent" android:layout_height="wrap_content" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
-        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_upload_banner_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" app:tint="@null" style="@style/Settings.FloatingActionButton" />
-        <TextView android:layout_gravity="center" android:id="@id/server_settings_overview_upload_banner_unlock" android:drawableTop="@drawable/ic_perk_lock" android:drawablePadding="@dimen/uikit_spacing_medium" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_upload_banner_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="32.0dip" app:maxImageSize="32.0dip" app:tint="@null" style="@style/Settings.FloatingActionButton" />
+        <TextView android:layout_gravity="center" android:id="@id/server_settings_overview_upload_banner_unlock" android:drawableTop="@drawable/ic_perk_lock" android:drawablePadding="8.0dip" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
     </FrameLayout>
-    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext" />
-    <TextView android:id="@id/server_settings_overview_upload_banner_nitro_tier" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit.TextView" />
-    <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext" />
+    <TextView android:id="@id/server_settings_overview_upload_banner_nitro_tier" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="4.0dip" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit.TextView" />
+    <TextView android:paddingBottom="4.0dip" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="4.0dip" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_server_settings_upload_splash.xml b/com.discord/res/layout/view_server_settings_upload_splash.xml
index e09acb61df..3b085eec71 100644
--- a/com.discord/res/layout/view_server_settings_upload_splash.xml
+++ b/com.discord/res/layout/view_server_settings_upload_splash.xml
@@ -3,13 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View style="@style/UiKit.Settings.Divider" />
     <TextView android:text="@string/guild_settings_server_invite_background" style="@style/UiKit.Settings.Item.Header" />
-    <FrameLayout android:id="@id/server_settings_overview_upload_splash_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+    <FrameLayout android:id="@id/server_settings_overview_upload_splash_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:foreground="?selectableItemBackground">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_splash" android:background="?primary_630" android:layout_width="fill_parent" android:layout_height="wrap_content" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
-        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_upload_splash_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" app:tint="@null" style="@style/Settings.FloatingActionButton" />
-        <TextView android:layout_gravity="center" android:id="@id/server_settings_overview_upload_splash_unlock" android:drawableTop="@drawable/ic_perk_lock" android:drawablePadding="@dimen/uikit_spacing_medium" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_upload_splash_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="32.0dip" app:maxImageSize="32.0dip" app:tint="@null" style="@style/Settings.FloatingActionButton" />
+        <TextView android:layout_gravity="center" android:id="@id/server_settings_overview_upload_splash_unlock" android:drawableTop="@drawable/ic_perk_lock" android:drawablePadding="8.0dip" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
     </FrameLayout>
-    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext" />
-    <TextView android:id="@id/server_settings_overview_upload_splash_nitro_tier" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit.TextView" />
-    <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext" />
+    <TextView android:id="@id/server_settings_overview_upload_splash_nitro_tier" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="4.0dip" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit.TextView" />
+    <TextView android:paddingBottom="4.0dip" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="4.0dip" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_setting_check.xml b/com.discord/res/layout/view_setting_check.xml
index 1e515e6bde..1c9f0829e9 100644
--- a/com.discord/res/layout/view_setting_check.xml
+++ b/com.discord/res/layout/view_setting_check.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout android:id="@id/setting_container" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
+    <RelativeLayout android:id="@id/setting_container" android:background="?selectableItemBackground" android:padding="16.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
         <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@id/setting_button" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:id="@id/setting_label" style="@style/UiKit.TextView" />
             <TextView android:id="@id/setting_subtext" android:layout_marginTop="5.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
-        <com.google.android.material.checkbox.MaterialCheckBox android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" android:buttonTint="?colorCompoundButton" />
+        <com.google.android.material.checkbox.MaterialCheckBox android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16.0dip" android:layout_alignParentEnd="true" android:buttonTint="?colorCompoundButton" />
     </RelativeLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_setting_radio.xml b/com.discord/res/layout/view_setting_radio.xml
index ed86a547c7..957cfd4cdf 100644
--- a/com.discord/res/layout/view_setting_radio.xml
+++ b/com.discord/res/layout/view_setting_radio.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout android:id="@id/setting_container" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
+    <RelativeLayout android:id="@id/setting_container" android:background="?selectableItemBackground" android:padding="16.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
         <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@id/setting_button" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:id="@id/setting_label" style="@style/UiKit.TextView" />
-            <TextView android:id="@id/setting_subtext" android:layout_marginTop="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/setting_subtext" android:layout_marginTop="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" android:buttonTint="?colorCompoundButton" />
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16.0dip" android:layout_alignParentEnd="true" android:buttonTint="?colorCompoundButton" />
     </RelativeLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_setting_switch.xml b/com.discord/res/layout/view_setting_switch.xml
index da3aa7bebd..555bddee06 100644
--- a/com.discord/res/layout/view_setting_switch.xml
+++ b/com.discord/res/layout/view_setting_switch.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:id="@id/setting_container" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
+    <RelativeLayout android:id="@id/setting_container" android:background="?selectableItemBackground" android:padding="16.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
         <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@id/setting_button" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:id="@id/setting_label" style="@style/UiKit.TextView" />
-            <TextView android:id="@id/setting_subtext" android:layout_marginTop="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/setting_subtext" android:layout_marginTop="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
-        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" app:thumbTint="@color/switch_thumb_color" app:useMaterialThemeColors="true" />
+        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16.0dip" android:layout_alignParentEnd="true" app:thumbTint="@color/switch_thumb_color" app:useMaterialThemeColors="true" />
     </RelativeLayout>
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_boosted_boost_listitem.xml b/com.discord/res/layout/view_settings_boosted_boost_listitem.xml
index f69498c79b..8f7d28daa5 100644
--- a/com.discord/res/layout/view_settings_boosted_boost_listitem.xml
+++ b/com.discord/res/layout/view_settings_boosted_boost_listitem.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:background="?primary_630" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" style="@style/UiKit.ViewGroup"
+<RelativeLayout android:background="?primary_630" android:paddingLeft="16.0dip" android:paddingTop="12.0dip" android:paddingRight="16.0dip" android:paddingBottom="12.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:id="@id/boosted_boost_cancelled" android:src="@drawable/ic_warning_circle_24dp" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_alignParentStart="true" style="@style/UiKit.ImageView" />
-    <LinearLayout android:gravity="start|center" android:layout_width="fill_parent" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_toStartOf="@id/boosted_boost_action" android:layout_toEndOf="@id/boosted_boost_cancelled" style="@style/UiKit.ViewGroup.LinearLayout">
+    <ImageView android:id="@id/boosted_boost_cancelled" android:src="@drawable/ic_warning_circle_24dp" android:layout_centerVertical="true" android:layout_marginEnd="8.0dip" android:layout_alignParentStart="true" style="@style/UiKit.ImageView" />
+    <LinearLayout android:gravity="start|center" android:layout_width="fill_parent" android:layout_centerVertical="true" android:layout_marginEnd="8.0dip" android:layout_toStartOf="@id/boosted_boost_action" android:layout_toEndOf="@id/boosted_boost_cancelled" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:id="@id/boosted_boost_date" style="@style/UiKit.TextView.Semibold" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/boosted_boost_cooldown" style="@style/UiKit.TextView" />
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@id/boosted_boost_action" android:text="@string/premium_guild_subscription_select_server_button" android:drawablePadding="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:drawableEnd="?ic_overflow" android:layout_alignParentEnd="true" style="@style/UiKit.TextView.Link" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@id/boosted_boost_action" android:text="@string/premium_guild_subscription_select_server_button" android:drawablePadding="16.0dip" android:layout_centerVertical="true" android:drawableEnd="?ic_overflow" android:layout_alignParentEnd="true" style="@style/UiKit.TextView.Link" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_boosted_guild_listitem.xml b/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
index a82db04324..35d9818049 100644
--- a/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
+++ b/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?primary_630" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:background="?primary_630" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/boosted_guild_banner" android:background="?bg_subscription_placeholder_pattern" android:layout_width="fill_parent" android:layout_height="0.0dip" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
         <View android:id="@id/boosted_guild_gradient" android:background="@color/primary_700" android:layout_width="fill_parent" android:layout_height="0.0dip" android:alpha="0.65" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
-        <com.discord.views.premiumguild.PremiumGuildProgressView android:id="@id/boosted_guild_progress_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
+        <com.discord.views.premiumguild.PremiumGuildProgressView android:id="@id/boosted_guild_progress_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24.0dip" android:layout_marginBottom="24.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <LinearLayout android:background="?primary_700" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/boosted_sample_guild_icon" android:layout_marginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.GuildsListIcon" />
+    <LinearLayout android:background="?primary_700" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/boosted_sample_guild_icon" android:layout_marginRight="8.0dip" style="@style/UiKit.GuildsListIcon" />
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:ellipsize="end" android:id="@id/boosted_sample_guild_name" android:maxLines="1" style="@style/UiKit.TextView.Bold" />
-            <TextView android:textColor="?primary_000" android:id="@id/boosted_sample_guild_count" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:drawableLeft="@drawable/ic_boosted_badge_12dp" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_000" android:id="@id/boosted_sample_guild_count" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:drawableLeft="@drawable/ic_boosted_badge_12dp" android:drawablePadding="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_boosted_sample_guild.xml b/com.discord/res/layout/view_settings_boosted_sample_guild.xml
index e6c158582a..a6290c9c05 100644
--- a/com.discord/res/layout/view_settings_boosted_sample_guild.xml
+++ b/com.discord/res/layout/view_settings_boosted_sample_guild.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_marginBottom="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?primary_700" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
+<androidx.cardview.widget.CardView android:layout_marginBottom="8.0dip" app:cardBackgroundColor="?primary_700" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/boosted_sample_guild_icon" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.GuildsListIcon" />
+    <RelativeLayout android:paddingLeft="16.0dip" android:paddingTop="12.0dip" android:paddingRight="16.0dip" android:paddingBottom="12.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/boosted_sample_guild_icon" android:layout_marginRight="16.0dip" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.GuildsListIcon" />
         <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@id/boosted_sample_guild_progress" android:layout_toEndOf="@id/boosted_sample_guild_icon" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:ellipsize="end" android:id="@id/boosted_sample_guild_name" android:maxLines="1" style="@style/UiKit.TextView.Bold" />
-            <TextView android:textColor="?primary_000" android:id="@id/boosted_sample_guild_count" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:drawableLeft="@drawable/ic_boosted_badge_12dp" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_000" android:id="@id/boosted_sample_guild_count" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:drawableLeft="@drawable/ic_boosted_badge_12dp" android:drawablePadding="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
-        <com.discord.views.premiumguild.PremiumGuildProgressView android:id="@id/boosted_sample_guild_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" />
+        <com.discord.views.premiumguild.PremiumGuildProgressView android:id="@id/boosted_sample_guild_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="16.0dip" android:layout_alignParentEnd="true" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_gifting_nitro.xml b/com.discord/res/layout/view_settings_gifting_nitro.xml
index dac9643c05..b9dcf2b8cb 100644
--- a/com.discord/res/layout/view_settings_gifting_nitro.xml
+++ b/com.discord/res/layout/view_settings_gifting_nitro.xml
@@ -3,11 +3,11 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:background="@drawable/drawable_bg_nitro_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_gifting_nitro_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-            <com.discord.views.BoxedButton android:gravity="center" android:id="@id/settings_gifting_nitro_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" app:background_color="@color/status_green_500" app:boxed_text="-16%" />
-            <com.google.android.material.button.MaterialButton android:id="@id/settings_gifting_nitro_monthly" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Secondary" />
+            <ImageView android:background="@drawable/drawable_bg_nitro_gradient_top_corners" android:padding="16.0dip" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_gifting_nitro_learn_more" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+            <com.discord.views.BoxedButton android:gravity="center" android:id="@id/settings_gifting_nitro_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" app:background_color="@color/status_green_500" app:boxed_text="-16%" />
+            <com.google.android.material.button.MaterialButton android:id="@id/settings_gifting_nitro_monthly" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
-    <ImageView android:layout_gravity="end" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" android:elevation="6.0dip" android:outlineProvider="none" style="@style/UiKit.ImageView" />
+    <ImageView android:layout_gravity="end" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginEnd="24.0dip" android:elevation="6.0dip" android:outlineProvider="none" style="@style/UiKit.ImageView" />
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_gifting_nitro_classic.xml b/com.discord/res/layout/view_settings_gifting_nitro_classic.xml
index 3bfd1b74ae..940d25261f 100644
--- a/com.discord/res/layout/view_settings_gifting_nitro_classic.xml
+++ b/com.discord/res/layout/view_settings_gifting_nitro_classic.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup"
+<FrameLayout android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:background="@drawable/drawable_bg_nitro_classic_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro_classic" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_gifting_nitro_classic_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-            <com.discord.views.BoxedButton android:gravity="center" android:id="@id/settings_gifting_nitro_classic_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" app:background_color="@color/status_green_500" app:boxed_text="-16%" />
-            <com.google.android.material.button.MaterialButton android:id="@id/settings_gifting_nitro_classic_monthly" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Secondary" />
+            <ImageView android:background="@drawable/drawable_bg_nitro_classic_gradient_top_corners" android:padding="16.0dip" android:src="@drawable/img_logo_discord_nitro_classic" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_gifting_nitro_classic_learn_more" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+            <com.discord.views.BoxedButton android:gravity="center" android:id="@id/settings_gifting_nitro_classic_yearly" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" app:background_color="@color/status_green_500" app:boxed_text="-16%" />
+            <com.google.android.material.button.MaterialButton android:id="@id/settings_gifting_nitro_classic_monthly" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
-    <ImageView android:layout_gravity="end" android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" android:elevation="6.0dip" android:outlineProvider="none" style="@style/UiKit.ImageView" />
+    <ImageView android:layout_gravity="end" android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" android:layout_marginEnd="24.0dip" android:elevation="6.0dip" android:outlineProvider="none" style="@style/UiKit.ImageView" />
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml b/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml
index 5091900965..991d99d87d 100644
--- a/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml
+++ b/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml
@@ -2,7 +2,7 @@
 <merge style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:layout_gravity="center_horizontal" android:src="@drawable/img_boost_hands" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_server_boost_long" android:importantForAccessibility="no" app:tint="?colorInteractiveActive" style="@style/UiKit.ImageView" />
-    <TextView android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_header" style="@style/UiKit.TextView.H1" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/UiKit.TextView" />
+    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="16.0dip" android:src="@drawable/img_server_boost_long" android:importantForAccessibility="no" app:tint="?colorInteractiveActive" style="@style/UiKit.ImageView" />
+    <TextView android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="16.0dip" android:layout_marginTop="24.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_subscription_marketing_header" style="@style/UiKit.TextView.H1" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/UiKit.TextView" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml b/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml
index a2f0ee435b..67170a4e78 100644
--- a/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml
+++ b/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml
@@ -2,6 +2,6 @@
 <merge style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_image" android:src="?img_gem_hands_faded" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_title" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_title" style="@style/UiKit.TextView.Bold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_subtitle" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_text" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_title" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_title" style="@style/UiKit.TextView.Bold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/settings_boost_no_guilds_subtitle" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_text" style="@style/UiKit.TextView" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_simple_spinner_dropdown_item.xml b/com.discord/res/layout/view_simple_spinner_dropdown_item.xml
index 1d967b3fb7..1c844d6301 100644
--- a/com.discord/res/layout/view_simple_spinner_dropdown_item.xml
+++ b/com.discord/res/layout/view_simple_spinner_dropdown_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:textAlignment="inherit" style="@style/UiKit.TextView.Large.SingleLine"
+<TextView android:padding="8.0dip" android:layout_width="fill_parent" android:textAlignment="inherit" style="@style/UiKit.TextView.Large.SingleLine"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/view_steps.xml b/com.discord/res/layout/view_steps.xml
index 83b1465f06..e0be03a149 100644
--- a/com.discord/res/layout/view_steps.xml
+++ b/com.discord/res/layout/view_steps.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.discord.utilities.simple_pager.SimplePager android:id="@id/steps_viewpager" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/steps_button_container" />
-    <ImageView android:id="@id/steps_close" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackgroundBorderless" android:src="?ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" style="@style/UiKit.ImageView" />
-    <LinearLayout android:id="@id/steps_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
+    <com.discord.utilities.simple_pager.SimplePager android:id="@id/steps_viewpager" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/steps_button_container" />
+    <ImageView android:id="@id/steps_close" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:foreground="?selectableItemBackgroundBorderless" android:src="?ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" style="@style/UiKit.ImageView" />
+    <LinearLayout android:id="@id/steps_button_container" android:layout_margin="16.0dip" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.google.android.material.button.MaterialButton android:id="@id/steps_done" android:visibility="gone" android:text="@string/done" style="@style/UiKit.Material.Button.Secondary" />
-        <com.google.android.material.button.MaterialButton android:id="@id/steps_next" android:layout_marginBottom="@dimen/uikit_spacing_small" android:text="@string/next" style="@style/UiKit.Material.Button" />
-        <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/steps_cancel" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:text="@string/cancel" style="@style/UiKit.TextView.Large.SingleLine" />
+        <com.google.android.material.button.MaterialButton android:id="@id/steps_next" android:layout_marginBottom="4.0dip" android:text="@string/next" style="@style/UiKit.Material.Button" />
+        <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/steps_cancel" android:background="?selectableItemBackground" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:text="@string/cancel" style="@style/UiKit.TextView.Large.SingleLine" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_stream_preview.xml b/com.discord/res/layout/view_stream_preview.xml
index 9f5441d58a..4c53b86e2f 100644
--- a/com.discord/res/layout/view_stream_preview.xml
+++ b/com.discord/res/layout/view_stream_preview.xml
@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="@drawable/bg_stream_preview" android:layout_width="fill_parent" android:layout_height="wrap_content" android:backgroundTint="?colorBackgroundTertiary"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/stream_preview_image" android:layout_width="fill_parent" android:layout_height="152.0dip" app:layout_constraintBottom_toTopOf="@id/stream_preview_placeholder_caption" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?drawable_stream_preview_not_available" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/stream_preview_overlay_text" android:background="@drawable/bg_stream_preview_overlay_caption" android:padding="@dimen/uikit_spacing_medium" android:text="@string/join_stream" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-    <TextView android:textColor="?colorTextNormal" android:id="@id/stream_preview_placeholder_caption" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/stream_preview_loading" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/stream_preview_image" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/stream_preview_overlay_text" android:background="@drawable/bg_stream_preview_overlay_caption" android:padding="8.0dip" android:text="@string/join_stream" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
+    <TextView android:textColor="?colorTextNormal" android:id="@id/stream_preview_placeholder_caption" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/stream_preview_loading" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/stream_preview_image" style="@style/UiKit.TextView" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_ternary_checkbox.xml b/com.discord/res/layout/view_ternary_checkbox.xml
index 2985edffce..031e59ceaf 100644
--- a/com.discord/res/layout/view_ternary_checkbox.xml
+++ b/com.discord/res/layout/view_ternary_checkbox.xml
@@ -3,11 +3,11 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
         <RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout">
-            <LinearLayout android:padding="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/checkboxes_container" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:id="@id/setting_label" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large" />
+            <LinearLayout android:padding="16.0dip" android:layout_toStartOf="@id/checkboxes_container" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
+                <TextView android:id="@id/setting_label" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Large" />
                 <TextView android:id="@id/setting_subtext" android:layout_marginTop="5.0dip" style="@style/UiKit.TextView" />
             </LinearLayout>
-            <LinearLayout android:id="@id/checkboxes_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <LinearLayout android:id="@id/checkboxes_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <FrameLayout android:id="@id/checkable_off_container" android:layout_width="44.0dip" android:layout_height="32.0dip">
                     <com.discord.views.CheckableImageView android:id="@id/ternary_check_off" android:background="@drawable/drawable_bg_ternary_off" android:src="@drawable/drawable_ic_ternary_off" style="@style/UiKit.CheckableImageView" />
                     <View android:id="@id/off_disabled_overlay" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent" />
diff --git a/com.discord/res/layout/view_toolbar_title.xml b/com.discord/res/layout/view_toolbar_title.xml
index f8a4131dbd..0947a7f16c 100644
--- a/com.discord/res/layout/view_toolbar_title.xml
+++ b/com.discord/res/layout/view_toolbar_title.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.appcompat.widget.AppCompatTextView android:id="@id/toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="@dimen/uikit_spacing_small" app:drawableTint="?colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextAppearance.Toolbar.Title" />
+    <androidx.appcompat.widget.AppCompatTextView android:id="@id/toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4.0dip" app:drawableTint="?colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextAppearance.Toolbar.Title" />
     <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.TextAppearance.Toolbar.Subtitle" />
-    <com.discord.views.StatusView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="12.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:layout_constraintTop_toTopOf="@id/toolbar_title" />
+    <com.discord.views.StatusView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="12.0dip" android:layout_height="wrap_content" android:layout_marginStart="4.0dip" app:layout_constraintBottom_toBottomOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:layout_constraintTop_toTopOf="@id/toolbar_title" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_upload_progress.xml b/com.discord/res/layout/view_upload_progress.xml
index d260cbdea1..609c3171d6 100644
--- a/com.discord/res/layout/view_upload_progress.xml
+++ b/com.discord/res/layout/view_upload_progress.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/progress_file_image" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@id/progress_text" app:layout_constraintEnd_toStartOf="@id/progress_text" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/progress_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/progress_text" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="middle" android:id="@id/progress_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/progress_bar" app:layout_constraintEnd_toStartOf="@id/progress_subtext" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_file_image" app:layout_constraintRight_toLeftOf="@id/progress_subtext" app:layout_constraintStart_toEndOf="@id/progress_file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:id="@id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/progress_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_text" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/progress_text" />
-    <ProgressBar android:id="@id/progress_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxHeight="1.0dip" android:max="100" android:minHeight="1.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/progress_text" style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="middle" android:id="@id/progress_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/progress_bar" app:layout_constraintEnd_toStartOf="@id/progress_subtext" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_file_image" app:layout_constraintRight_toLeftOf="@id/progress_subtext" app:layout_constraintStart_toEndOf="@id/progress_file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:id="@id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/progress_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_text" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/progress_text" />
+    <ProgressBar android:id="@id/progress_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:maxHeight="1.0dip" android:max="100" android:minHeight="1.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/progress_text" style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_user_status_presence.xml b/com.discord/res/layout/view_user_status_presence.xml
index 1a71611e56..c9c36abf15 100644
--- a/com.discord/res/layout/view_user_status_presence.xml
+++ b/com.discord/res/layout/view_user_status_presence.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@id/user_status_update_online" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:id="@id/user_status_update_online" android:background="?bg_pressed_highlight" android:padding="16.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_gravity="top" android:id="@id/user_status_presence_dot" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_margin="@dimen/uikit_spacing_small" />
-    <LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <ImageView android:layout_gravity="top" android:id="@id/user_status_presence_dot" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_margin="4.0dip" />
+    <LinearLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textColor="?primary_100" android:id="@id/user_status_presence_title" style="@style/UiKit.TextView.Large" />
-        <TextView android:id="@id/user_status_presence_subtitle" android:layout_marginTop="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+        <TextView android:id="@id/user_status_presence_subtitle" android:layout_marginTop="4.0dip" style="@style/UiKit.TextView" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_user_status_presence_custom.xml b/com.discord/res/layout/view_user_status_presence_custom.xml
index d9a62a1f8d..321bc81a85 100644
--- a/com.discord/res/layout/view_user_status_presence_custom.xml
+++ b/com.discord/res/layout/view_user_status_presence_custom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:focusable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center_vertical" android:background="?bg_pressed_highlight" android:padding="16.0dip" android:focusable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_status_presence_custom_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="@drawable/ic_smiley_desaturated" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_status_presence_custom_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" android:layout_marginEnd="16.0dip" app:placeholderImage="@drawable/ic_smiley_desaturated" />
     <TextView android:textColor="?primary_100" android:id="@id/user_status_presence_custom_text" android:layout_width="0.0dip" android:singleLine="true" android:layout_weight="1.0" style="@style/UiKit.TextView.Large" />
-    <androidx.appcompat.widget.AppCompatImageView android:id="@id/user_status_presence_custom_clear" android:src="?ic_close_24dp" android:contentDescription="@string/custom_status_clear_custom_status" android:layout_marginStart="@dimen/uikit_spacing_large" app:tint="?primary_300" style="@style/UiKit.ImageView.Clickable" />
+    <androidx.appcompat.widget.AppCompatImageView android:id="@id/user_status_presence_custom_clear" android:src="?ic_close_24dp" android:contentDescription="@string/custom_status_clear_custom_status" android:layout_marginStart="16.0dip" app:tint="?primary_300" style="@style/UiKit.ImageView.Clickable" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_username.xml b/com.discord/res/layout/view_username.xml
index 85d878a181..4ea5737b87 100644
--- a/com.discord/res/layout/view_username.xml
+++ b/com.discord/res/layout/view_username.xml
@@ -2,5 +2,5 @@
 <merge android:layout_width="wrap_content" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="start" android:id="@id/username_text" android:singleLine="true" android:shadowColor="@color/primary_light_100" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/username_tag" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-    <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/username_tag" android:background="@drawable/drawable_tag_brand" android:paddingTop="0.5dip" android:paddingBottom="0.5dip" android:visibility="gone" android:singleLine="true" android:paddingStart="3.0dip" android:paddingEnd="3.0dip" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="@id/username_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/username_text" app:layout_constraintTop_toTopOf="@id/username_text" style="@style/UiKit.TextView" />
+    <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/username_tag" android:background="@drawable/drawable_tag_brand" android:paddingTop="0.5dip" android:paddingBottom="0.5dip" android:visibility="gone" android:singleLine="true" android:paddingStart="3.0dip" android:paddingEnd="3.0dip" android:layout_marginStart="4.0dip" app:layout_constraintBottom_toBottomOf="@id/username_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/username_text" app:layout_constraintTop_toTopOf="@id/username_text" style="@style/UiKit.TextView" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_video_call_participant.xml b/com.discord/res/layout/view_video_call_participant.xml
index 3fdcb7544c..6338deb397 100644
--- a/com.discord/res/layout/view_video_call_participant.xml
+++ b/com.discord/res/layout/view_video_call_participant.xml
@@ -6,13 +6,13 @@
     <com.discord.views.VoiceUserView android:id="@id/participant_voice_user_view" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintHeight_max="80.0dip" app:layout_constraintHeight_percent="0.5" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="80.0dip" app:layout_constraintWidth_percent="0.5" />
     <com.discord.views.video.AppVideoStreamRenderer android:id="@id/participant_video_stream_renderer" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:vcpv_is_overlay="false" app:vcpv_match_video_orientation="false" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/participant_stream_preview_image" android:background="@color/primary_dark_700" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" android:alpha="0.3" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="16:9" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?drawable_stream_preview_not_available" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/participant_stream_preview_text" android:background="@drawable/bg_stream_preview_overlay_caption_opaque" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="12.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="12.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/watch_stream" android:fontFamily="@font/whitney_semibold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/participant_stream_preview_text" android:background="@drawable/bg_stream_preview_overlay_caption_opaque" android:paddingLeft="16.0dip" android:paddingTop="12.0dip" android:paddingRight="16.0dip" android:paddingBottom="12.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/watch_stream" android:fontFamily="@font/whitney_semibold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@id/participant_stream_paused" android:background="@color/black_alpha_70" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/stream_capture_paused" android:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView" />
     <ProgressBar android:id="@id/participant_video_loading_indicator" android:visibility="gone" android:layout_width="50.0dip" android:layout_height="50.0dip" android:indeterminate="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
     <TextView android:textSize="14.0dip" android:textColor="@color/white" android:id="@id/participant_video_label" android:background="@drawable/bg_stream_label" android:paddingLeft="8.0dip" android:paddingTop="5.0dip" android:paddingRight="8.0dip" android:paddingBottom="5.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginBottom="8.0dip" android:includeFontPadding="false" android:drawableLeft="@drawable/ic_screen_14dp" android:drawablePadding="6.0dip" android:fontFamily="@font/whitney_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/participant_voice_indicators" />
     <LinearLayout android:orientation="horizontal" android:id="@id/participant_voice_indicators" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent">
-        <ImageView android:id="@id/participant_mute_status_indicator" android:background="@drawable/drawable_bg_voice_status_indicator" android:padding="4.0dip" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_mute_v2_muted" />
-        <ImageView android:id="@id/participant_deafen_status_indicator" android:background="@drawable/drawable_bg_voice_status_indicator" android:padding="4.0dip" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_deafen_v2_deafened" app:tint="@color/white" />
+        <ImageView android:id="@id/participant_mute_status_indicator" android:background="@drawable/drawable_bg_voice_status_indicator" android:padding="4.0dip" android:focusable="true" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_mute_v2_muted" android:contentDescription="@string/voice_channel_muted" />
+        <ImageView android:id="@id/participant_deafen_status_indicator" android:background="@drawable/drawable_bg_voice_status_indicator" android:padding="4.0dip" android:focusable="true" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_deafen_v2_deafened" android:contentDescription="@string/voice_channel_deafened" app:tint="@color/white" />
     </LinearLayout>
     <TextView android:textSize="14.0sp" android:textColor="@color/white" android:id="@id/participant_live_indicator" android:background="@drawable/bg_stream_live_indicator" android:paddingLeft="6.0dip" android:paddingRight="6.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" android:text="@string/live" android:includeFontPadding="false" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/voice_user_list_item_invite.xml b/com.discord/res/layout/voice_user_list_item_invite.xml
index 1a45487630..c5cedb4560 100644
--- a/com.discord/res/layout/voice_user_list_item_invite.xml
+++ b/com.discord/res/layout/voice_user_list_item_invite.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:background="?selectableItemBackground" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:background="?colorPrimaryCircle" android:padding="12.0dip" android:layout_width="52.0dip" android:layout_height="52.0dip" android:layout_margin="@dimen/uikit_spacing_small" android:src="@drawable/ic_header_members_add_white_24dp" android:tint="?colorInteractiveActive" android:importantForAccessibility="no" android:backgroundTint="?colorBackgroundTertiary" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@id/voice_user_list_item_invite_tv" android:layout_width="fill_parent" android:text="@string/invite_friends" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
+    <ImageView android:background="?colorPrimaryCircle" android:padding="12.0dip" android:layout_width="52.0dip" android:layout_height="52.0dip" android:layout_margin="4.0dip" android:src="@drawable/ic_header_members_add_white_24dp" android:tint="?colorInteractiveActive" android:importantForAccessibility="no" android:backgroundTint="?colorBackgroundTertiary" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@id/voice_user_list_item_invite_tv" android:layout_width="fill_parent" android:text="@string/invite_friends" android:layout_marginStart="16.0dip" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/voice_user_list_item_user.xml b/com.discord/res/layout/voice_user_list_item_user.xml
index 4d280996b2..a32ecfe033 100644
--- a/com.discord/res/layout/voice_user_list_item_user.xml
+++ b/com.discord/res/layout/voice_user_list_item_user.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <com.discord.views.VoiceUserView android:id="@id/voice_user_list_item_user_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" app:vuv_avatar_size="32.0dip" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/voice_user_list_item_user_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:singleLine="true" android:layout_weight="1.0" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/voice_user_list_item_user_name" android:layout_width="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:singleLine="true" android:layout_weight="1.0" style="@style/UiKit.TextView" />
         <TextView android:textSize="14.0sp" android:textColor="@color/white" android:id="@id/voice_user_list_item_live_indicator" android:background="@drawable/bg_stream_live_indicator" android:paddingLeft="6.0dip" android:paddingRight="6.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="16.0dip" android:text="@string/live" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" />
         <ImageView android:id="@id/voice_user_list_item_spectating_indicator" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_spectate" android:contentDescription="@string/video" app:tint="?colorInteractiveNormal" />
         <ImageView android:id="@id/voice_user_list_item_mute_indicator" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginRight="16.0dip" android:src="?ic_mic_muted_red_strike_interactiveNormal" android:contentDescription="@string/form_label_muted" />
         <ImageView android:id="@id/voice_user_list_item_deafen_indicator" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginRight="16.0dip" android:src="?ic_headset_deafened_red_strike_interactiveNormal" android:contentDescription="@string/sound_deafen" />
         <ImageView android:id="@id/voice_user_list_item_video_indicator" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" app:tint="?colorInteractiveNormal" />
-        <com.google.android.material.button.MaterialButton android:id="@id/voice_user_list_item_stop_ringing" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/stop_ringing" android:contentDescription="@string/stop_ringing" style="@style/UiKit.Material.Button.Secondary" />
+        <com.google.android.material.button.MaterialButton android:id="@id/voice_user_list_item_stop_ringing" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="16.0dip" android:text="@string/stop_ringing" android:contentDescription="@string/stop_ringing" style="@style/UiKit.Material.Button.Secondary" />
     </LinearLayout>
-    <com.discord.views.StreamPreviewView android:id="@id/voice_user_list_item_user_stream_preview" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" />
+    <com.discord.views.StreamPreviewView android:id="@id/voice_user_list_item_user_stream_preview" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_accept_gift_dialog.xml b/com.discord/res/layout/widget_accept_gift_dialog.xml
index defc88c718..c75d556107 100644
--- a/com.discord/res/layout/widget_accept_gift_dialog.xml
+++ b/com.discord/res/layout/widget_accept_gift_dialog.xml
@@ -3,15 +3,15 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.discord.app.AppViewFlipper android:id="@id/accept_gift_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
                 <LinearLayout android:gravity="center" android:id="@id/accept_gift_body_container" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/accept_gift_body_image" android:layout_margin="@dimen/uikit_spacing_large" style="@style/Icon.Game" />
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/accept_gift_body_image" android:layout_margin="16.0dip" style="@style/Icon.Game" />
                     <com.discord.app.AppTextView android:gravity="center_horizontal" android:id="@id/accept_gift_header" style="@style/UiKit.TextView.H1.Bold" />
-                    <com.discord.app.AppTextView android:gravity="center_horizontal" android:id="@id/accept_gift_body_text" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+                    <com.discord.app.AppTextView android:gravity="center_horizontal" android:id="@id/accept_gift_body_text" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
-            <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large">
+            <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip">
                 <ProgressBar android:layout_gravity="center" android:id="@id/accept_gift_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" />
                 <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@id/accept_gift_confirm" android:layout_width="wrap_content" style="@style/UiKit.Material.Button" />
             </FrameLayout>
diff --git a/com.discord/res/layout/widget_add_friend_user_list_item.xml b/com.discord/res/layout/widget_add_friend_user_list_item.xml
index 01aac5232e..2c7decd2d8 100644
--- a/com.discord/res/layout/widget_add_friend_user_list_item.xml
+++ b/com.discord/res/layout/widget_add_friend_user_list_item.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
     <com.discord.views.StatusView android:id="@id/add_friend_user_item_status" android:layout_width="16.0dip" android:layout_height="wrap_content" android:translationX="2.0dip" android:translationY="2.0dip" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="3.0dip" app:sv_corner_radius="4.0dip" />
-    <LinearLayout android:gravity="start|center" android:id="@id/add_friend_user_item_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_buttons" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:gravity="start|center" android:id="@id/add_friend_user_item_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_buttons" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:id="@id/add_friend_user_item_name" android:maxLines="1" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:ellipsize="end" android:id="@id/add_friend_user_item_name_secondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.SingleLine" />
     </LinearLayout>
     <LinearLayout android:id="@id/add_friend_user_item_buttons" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_send_button" android:layout_width="wrap_content" android:layout_height="wrap_content" app:srcCompat="@drawable/ic_add_friend_send" />
-        <androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_check_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" app:srcCompat="@drawable/ic_add_friend_green_check" />
-        <androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_accept_button" android:background="?primary_700_circle" android:layout_marginStart="@dimen/uikit_spacing_large" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/FriendsList.FriendsItem.ActionButton" />
-        <androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_decline_button" android:background="?primary_700_circle" android:layout_marginStart="@dimen/uikit_spacing_large" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/FriendsList.FriendsItem.ActionButton" />
+        <androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_check_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" app:srcCompat="@drawable/ic_add_friend_green_check" />
+        <androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_accept_button" android:background="?primary_700_circle" android:layout_marginStart="16.0dip" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/FriendsList.FriendsItem.ActionButton" />
+        <androidx.appcompat.widget.AppCompatImageView android:id="@id/add_friend_user_decline_button" android:background="?primary_700_circle" android:layout_marginStart="16.0dip" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/FriendsList.FriendsItem.ActionButton" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_age_verify.xml b/com.discord/res/layout/widget_age_verify.xml
index 1b9bc5825d..5e6fc9b472 100644
--- a/com.discord/res/layout/widget_age_verify.xml
+++ b/com.discord/res/layout/widget_age_verify.xml
@@ -6,5 +6,5 @@
         <include android:layout_width="fill_parent" android:layout_height="fill_parent" layout="@layout/layout_age_verify_confirm" />
         <include android:layout_width="fill_parent" android:layout_height="fill_parent" layout="@layout/layout_age_verify_underage" />
     </com.discord.app.AppViewFlipper>
-    <ImageButton android:id="@id/age_verify_back_button" android:background="@color/transparent" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/ic_arrow_back_grey_24dp" android:scaleType="fitXY" android:adjustViewBounds="true" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <ImageButton android:id="@id/age_verify_back_button" android:background="@color/transparent" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginTop="16.0dip" android:src="@drawable/ic_arrow_back_grey_24dp" android:scaleType="fitXY" android:adjustViewBounds="true" android:layout_marginStart="8.0dip" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_announcement_guild_profile_sheet.xml b/com.discord/res/layout/widget_announcement_guild_profile_sheet.xml
index 63b39bfb7a..9c00f24222 100644
--- a/com.discord/res/layout/widget_announcement_guild_profile_sheet.xml
+++ b/com.discord/res/layout/widget_announcement_guild_profile_sheet.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:background="?colorBackgroundSecondary" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_height="wrap_content" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/announcement_guild_avatar" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" app:roundedCornerRadius="16.0dip" />
+    <LinearLayout android:background="?colorBackgroundSecondary" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:layout_height="wrap_content" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/announcement_guild_avatar" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginBottom="16.0dip" app:roundedCornerRadius="16.0dip" />
         <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <ImageView android:layout_gravity="center" android:id="@id/announcement_guild_staff_icon" android:visibility="visible" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:src="@drawable/ic_staff_badge_blurple_24dp" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
+            <ImageView android:layout_gravity="center" android:id="@id/announcement_guild_staff_icon" android:visibility="visible" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:src="@drawable/ic_staff_badge_blurple_24dp" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" />
             <TextView android:id="@id/announcement_guild_name" android:text="@string/announcement_guild_popout_name" style="@style/UiKit.TextView.H1" />
         </LinearLayout>
-        <TextView android:id="@id/announcement_guild_description" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/announcement_guild_description" style="@style/UiKit.TextView" />
+        <TextView android:id="@id/announcement_guild_description" android:layout_marginBottom="16.0dip" android:text="@string/announcement_guild_description" style="@style/UiKit.TextView" />
         <TextView android:id="@id/announcement_guild_here_to_help" android:text="@string/announcement_guild_here_to_help" style="@style/UiKit.TextView" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_age_gated.xml b/com.discord/res/layout/widget_auth_age_gated.xml
index 504dc3edc6..1a701000f8 100644
--- a/com.discord/res/layout/widget_auth_age_gated.xml
+++ b/com.discord/res/layout/widget_auth_age_gated.xml
@@ -2,10 +2,10 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include layout="@layout/widget_auth_header" />
-    <LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
-        <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:src="@drawable/img_age_gate_failure" android:contentDescription="@string/age_gate_underage_header" />
-        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:stv_title="@string/age_gate_underage_header" />
-        <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/auth_register_underage_description" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/age_gate_underage_body_post_register_message" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Large" />
-        <com.google.android.material.button.MaterialButton android:id="@id/auth_register_underage_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/return_to_login" style="@style/UiKit.Material.Button" />
+    <LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
+        <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="64.0dip" android:src="@drawable/img_age_gate_failure" android:contentDescription="@string/age_gate_underage_header" />
+        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="8.0dip" app:stv_title="@string/age_gate_underage_header" />
+        <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/auth_register_underage_description" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:text="@string/age_gate_underage_body_post_register_message" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Large" />
+        <com.google.android.material.button.MaterialButton android:id="@id/auth_register_underage_button" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/return_to_login" style="@style/UiKit.Material.Button" />
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_birthday.xml b/com.discord/res/layout/widget_auth_birthday.xml
index 09805ee1e6..f407238984 100644
--- a/com.discord/res/layout/widget_auth_birthday.xml
+++ b/com.discord/res/layout/widget_auth_birthday.xml
@@ -2,15 +2,15 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include layout="@layout/widget_auth_header" />
-    <LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
+    <LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
         <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_age_gate_birthday" android:contentDescription="@string/age_gate_header" />
-        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_title="@string/age_gate_header" />
-        <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_birthday_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/age_gate_date_of_birth" style="@style/UiKit.TextInputLayout">
+        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="24.0dip" app:stv_title="@string/age_gate_header" />
+        <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_birthday_wrap" android:layout_marginBottom="8.0dip" android:hint="@string/age_gate_date_of_birth" style="@style/UiKit.TextInputLayout">
             <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.NoFocus" />
         </com.google.android.material.textfield.TextInputLayout>
-        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup">
             <com.google.android.material.checkbox.MaterialCheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="8.0dip" app:layout_goneMarginStart="8.0dip" style="@style/UiKit.TextView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
         <com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register_title" style="@style/UiKit.AuthButton.Material" />
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_auth_captcha.xml b/com.discord/res/layout/widget_auth_captcha.xml
index 16d231e650..66186a0ec3 100644
--- a/com.discord/res/layout/widget_auth_captcha.xml
+++ b/com.discord/res/layout/widget_auth_captcha.xml
@@ -3,11 +3,11 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include layout="@layout/widget_auth_header" />
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
+        <LinearLayout android:gravity="center_horizontal" android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
             <com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone" />
-            <LinearLayout android:gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:gravity="center_horizontal" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" app:stv_subtitle="@string/verify_by_recaptcha_description" app:stv_title="@string/verify_by_recaptcha" />
-                <TextView android:textColor="?colorTextLink" android:id="@id/auth_captcha_help" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
+                <TextView android:textColor="?colorTextLink" android:id="@id/auth_captcha_help" android:layout_marginTop="8.0dip" android:layout_marginBottom="16.0dip" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
                 <com.google.android.material.button.MaterialButton android:id="@id/auth_captcha_verify" android:text="@string/verify" style="@style/UiKit.AuthButton.Material" />
             </LinearLayout>
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_auth_landing.xml b/com.discord/res/layout/widget_auth_landing.xml
index 411c663b9d..9eec2095f7 100644
--- a/com.discord/res/layout/widget_auth_landing.xml
+++ b/com.discord/res/layout/widget_auth_landing.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:background="?auth_landing_ptrn" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.discord.app.AppViewFlipper android:id="@id/auth_landing_switch_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_above="@id/auth_bottom_container" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
+    <com.discord.app.AppViewFlipper android:id="@id/auth_landing_switch_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="16.0dip" android:layout_above="@id/auth_bottom_container" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip">
         <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
             <ImageView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="?auth_logo" android:scaleType="center" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
-            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:layout_alignParentBottom="true" android:layout_centerInParent="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
+            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" android:layout_alignParentBottom="true" android:layout_centerInParent="true" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
         </RelativeLayout>
         <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
-            <ImageView android:layout_width="175.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="?auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_width="175.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:src="?auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
             <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerInParent="true">
-                <com.discord.views.ScreenTitleView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
+                <com.discord.views.ScreenTitleView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
                 <com.discord.widgets.auth.AuthInviteInfoView android:id="@id/auth_landing_invite_info" android:layout_width="fill_parent" android:layout_height="wrap_content" />
             </LinearLayout>
         </RelativeLayout>
     </com.discord.app.AppViewFlipper>
-    <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/auth_bottom_container" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large">
+    <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/auth_bottom_container" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:paddingStart="16.0dip" android:paddingEnd="16.0dip">
         <com.google.android.material.button.MaterialButton android:id="@id/auth_landing_register" android:text="@string/register" style="@style/UiKit.AuthButton.Material" />
         <com.google.android.material.button.MaterialButton android:id="@id/auth_landing_login" android:text="@string/login" android:backgroundTint="?colorButtonSecondary" style="@style/UiKit.AuthButton.Material" />
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_auth_login.xml b/com.discord/res/layout/widget_auth_login.xml
index 697b1d21ef..92c420918a 100644
--- a/com.discord/res/layout/widget_auth_login.xml
+++ b/com.discord/res/layout/widget_auth_login.xml
@@ -2,17 +2,17 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include layout="@layout/widget_auth_header" />
-    <androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:orientation="vertical" android:id="@id/auth_login_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
-            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/login_body" app:stv_title="@string/login_title" />
+    <androidx.core.widget.NestedScrollView android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
+        <LinearLayout android:orientation="vertical" android:id="@id/auth_login_container" android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent">
+            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" app:stv_subtitle="@string/login_body" app:stv_title="@string/login_title" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText android:nextFocusForward="@id/auth_login_password" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Email" />
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_small" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Password">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:layout_marginBottom="4.0dip" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Password">
                 <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password" />
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
-            <TextView android:textColor="?colorTextLink" android:id="@id/auth_login_password_manager_link" android:padding="@dimen/uikit_spacing_small" android:layout_marginBottom="12.0dip" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="4.0dip" android:layout_marginTop="4.0dip" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:textColor="?colorTextLink" android:id="@id/auth_login_password_manager_link" android:padding="4.0dip" android:layout_marginBottom="12.0dip" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
             <com.google.android.material.button.MaterialButton android:id="@id/auth_login" android:text="@string/login" style="@style/UiKit.AuthButton.Material" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_auth_mfa.xml b/com.discord/res/layout/widget_auth_mfa.xml
index edddfe9e75..5718342933 100644
--- a/com.discord/res/layout/widget_auth_mfa.xml
+++ b/com.discord/res/layout/widget_auth_mfa.xml
@@ -4,10 +4,10 @@
     <include layout="@layout/widget_auth_header" />
     <androidx.core.widget.NestedScrollView android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="80.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa" style="@style/UiKit.TextView" />
-            <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.TextView" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="8.0dip" android:text="@string/two_fa" style="@style/UiKit.TextView" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="16.0dip" android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.TextView" />
             <com.discord.views.CodeVerificationView android:id="@id/auth_mfa_verification" android:layout_width="fill_parent" android:layout_height="wrap_content" />
-            <TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/auth_login_forgot_password" android:layout_marginTop="@dimen/uikit_spacing_large" android:maxWidth="320.0dip" android:text="@string/two_fa_enter_token_body" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/auth_login_forgot_password" android:layout_marginTop="16.0dip" android:maxWidth="320.0dip" android:text="@string/two_fa_enter_token_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
diff --git a/com.discord/res/layout/widget_auth_register.xml b/com.discord/res/layout/widget_auth_register.xml
index 3c272053aa..4820fc768f 100644
--- a/com.discord/res/layout/widget_auth_register.xml
+++ b/com.discord/res/layout/widget_auth_register.xml
@@ -2,23 +2,23 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include layout="@layout/widget_auth_header" />
-    <androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
-            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_title="@string/register" />
-            <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_placeholder_username" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_username" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
+    <androidx.core.widget.NestedScrollView android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
+        <LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent">
+            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="24.0dip" app:stv_title="@string/register" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/form_placeholder_username" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:layout_marginBottom="8.0dip" android:hint="@string/form_label_username" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText android:nextFocusForward="@id/auth_register_email" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Username" />
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_account_information" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/form_label_account_information" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText android:nextFocusForward="@id/auth_register_password" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Email" />
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Password">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:layout_marginBottom="8.0dip" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Password">
                 <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password" />
             </com.google.android.material.textfield.TextInputLayout>
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
                 <com.google.android.material.checkbox.MaterialCheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
-                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="8.0dip" app:layout_goneMarginStart="8.0dip" style="@style/UiKit.TextView" />
             </androidx.constraintlayout.widget.ConstraintLayout>
             <com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register_title" style="@style/UiKit.AuthButton.Material" />
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_auth_undelete_account.xml b/com.discord/res/layout/widget_auth_undelete_account.xml
index 5211f83683..241de00cce 100644
--- a/com.discord/res/layout/widget_auth_undelete_account.xml
+++ b/com.discord/res/layout/widget_auth_undelete_account.xml
@@ -3,10 +3,10 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include layout="@layout/widget_auth_header" />
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <LinearLayout android:gravity="center" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
+        <LinearLayout android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:gravity="center" android:layout_height="wrap_content" android:layout_marginBottom="4.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
                 <ImageView android:src="@drawable/img_wump_trash_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-                <com.discord.views.ScreenTitleView android:id="@id/auth_undelete_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:stv_subtitle="@string/account_scheduled_for_deletion_description" app:stv_title="@string/account_scheduled_for_deletion_title" />
+                <com.discord.views.ScreenTitleView android:id="@id/auth_undelete_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" app:stv_subtitle="@string/account_scheduled_for_deletion_description" app:stv_title="@string/account_scheduled_for_deletion_title" />
             </LinearLayout>
             <com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_delete" android:text="@string/return_to_login" style="@style/UiKit.AuthButton.Material" />
             <com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_cancel" android:text="@string/account_scheduled_for_deletion_cancel_mobile" android:backgroundTint="?colorButtonSecondary" style="@style/UiKit.AuthButton.Material" />
diff --git a/com.discord/res/layout/widget_ban_user.xml b/com.discord/res/layout/widget_ban_user.xml
index 307ef032e2..8a415aaf67 100644
--- a/com.discord/res/layout/widget_ban_user.xml
+++ b/com.discord/res/layout/widget_ban_user.xml
@@ -11,7 +11,7 @@
             <com.discord.views.CheckedSetting android:id="@id/ban_user_delete_messages_1_day" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_24hr" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/ban_user_delete_messages_7_days" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_7d" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <TextView android:text="@string/form_label_reason_ban" style="@style/UiKit.Dialog.Subtitle" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/ban_user_reason" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.TextInputLayout.Primary">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/ban_user_reason" android:layout_margin="16.0dip" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:hint="@string/form_label_reason_ban" style="@style/UiKit.TextInputLayout.EditText.MultiLine" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_call_fullscreen.xml b/com.discord/res/layout/widget_call_fullscreen.xml
index 0d019faa08..864926efbd 100644
--- a/com.discord/res/layout/widget_call_fullscreen.xml
+++ b/com.discord/res/layout/widget_call_fullscreen.xml
@@ -7,6 +7,12 @@
         <TextView android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" style="@style/UiKit.TextAppearance.Semibold" />
         <com.google.android.material.button.MaterialButton android:id="@id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
     </LinearLayout>
+    <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/call_streaming_active" android:background="@color/black" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
+        <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:src="@drawable/screen_share_illustration" />
+        <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/mobile_stream_active_header" android:textAlignment="center" style="@style/UiKit.TextAppearance.Bold" />
+        <TextView android:textColor="@color/primary_dark_300" android:id="@id/call_streaming_active_body" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_active_body" android:textAlignment="center" style="@style/UiKit.TextAppearance" />
+        <com.google.android.material.button.MaterialButton android:id="@id/call_stop_streaming_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mobile_stream_stop_sharing" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
+    </LinearLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
         <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
             <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
@@ -14,12 +20,12 @@
         <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16.0dip" android:layout_marginTop="32.0dip" app:cardCornerRadius="8.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" app:layout_goneMarginTop="72.0dip">
             <com.discord.views.video.VideoCallParticipantView android:id="@id/call_pip" android:visibility="gone" android:layout_width="140.0dip" android:layout_height="79.0dip" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="true" />
         </androidx.cardview.widget.CardView>
-        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/private_call_container" android:background="?ptrn_shapes" android:paddingTop="@dimen/uikit_spacing_xxxlarge" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
+        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/private_call_container" android:background="?ptrn_shapes" android:paddingTop="64.0dip" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
             <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/private_call_users_recycler" android:layout_width="wrap_content" android:layout_height="wrap_content" android:overScrollMode="never" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:id="@id/private_call_status_primary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:id="@id/private_call_status_primary" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_400" android:id="@id/private_call_status_secondary" style="@style/UiKit.TextView" />
         </LinearLayout>
         <com.discord.widgets.voice.controls.FloatingVoiceControlsView android:theme="@style/AppTheme.Dark" android:id="@id/call_controls_floating" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/call_floating_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
-        <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_700" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
+        <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_700" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_call_indicator.xml b/com.discord/res/layout/widget_call_indicator.xml
index 56bba563b5..13e055d0af 100644
--- a/com.discord/res/layout/widget_call_indicator.xml
+++ b/com.discord/res/layout/widget_call_indicator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:id="@id/call_indicator" android:background="@color/status_green" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center" android:id="@id/call_indicator" android:background="@color/status_green" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:id="@id/call_indicator_icon" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/call_indicator_icon" android:layout_marginEnd="4.0dip" style="@style/UiKit.ImageView" />
     <TextView android:textColor="@color/white" android:id="@id/call_indicator_status" style="@style/UiKit.TextView.SingleLine" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_change_log.xml b/com.discord/res/layout/widget_change_log.xml
index d1fb878a70..2992794199 100644
--- a/com.discord/res/layout/widget_change_log.xml
+++ b/com.discord/res/layout/widget_change_log.xml
@@ -6,17 +6,17 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView android:id="@id/change_log_scrollview" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
         <LinearLayout android:id="@id/change_log_contents" android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit.ViewGroup.LinearLayout">
-            <FrameLayout android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:elevation="16.0dip">
+            <FrameLayout android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="8.0dip" android:elevation="16.0dip">
                 <VideoView android:id="@id/change_log_video" android:layout_width="fill_parent" android:layout_height="180.0dip" />
-                <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/change_log_thumbnail" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:clickable="false" android:layout_width="fill_parent" android:layout_height="wrap_content" app:backgroundImage="@color/primary_900_alpha_60" app:viewAspectRatio="1.7777778" />
-                <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/change_log_video_overlay" android:padding="@dimen/uikit_spacing_medium" android:clickable="false" android:layout_width="64.0dip" android:layout_height="64.0dip" app:backgroundImage="@color/primary_900_alpha_60" app:placeholderImage="@drawable/ic_play_arrow_grey_24dp" app:placeholderImageScaleType="fitCenter" app:roundAsCircle="true" />
+                <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/change_log_thumbnail" android:padding="8.0dip" android:visibility="gone" android:clickable="false" android:layout_width="fill_parent" android:layout_height="wrap_content" app:backgroundImage="@color/primary_900_alpha_60" app:viewAspectRatio="1.7777778" />
+                <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/change_log_video_overlay" android:padding="8.0dip" android:clickable="false" android:layout_width="64.0dip" android:layout_height="64.0dip" app:backgroundImage="@color/primary_900_alpha_60" app:placeholderImage="@drawable/ic_play_arrow_grey_24dp" app:placeholderImageScaleType="fitCenter" app:roundAsCircle="true" />
             </FrameLayout>
-            <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
+            <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <LinearLayout android:background="?colorBackgroundSecondary" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" app:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" app:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" app:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
+    <LinearLayout android:background="?colorBackgroundSecondary" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:paddingStart="16.0dip" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="8.0dip" android:layout_margin="2.0dip" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" app:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="8.0dip" android:layout_margin="2.0dip" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" app:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="8.0dip" android:layout_margin="2.0dip" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" app:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_follow_sheet.xml b/com.discord/res/layout/widget_channel_follow_sheet.xml
index bc1b9985b6..8994aa44e6 100644
--- a/com.discord/res/layout/widget_channel_follow_sheet.xml
+++ b/com.discord/res/layout/widget_channel_follow_sheet.xml
@@ -4,37 +4,37 @@
     <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout">
         <FrameLayout android:background="?bg_announcements_follow_sheet" android:layout_width="fill_parent" android:layout_height="96.0dip">
             <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="32.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_guild_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:roundedCornerRadius="4.0dip" />
-                <androidx.cardview.widget.CardView android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip">
-                    <androidx.appcompat.widget.AppCompatTextView android:gravity="center_vertical" android:id="@id/channel_follow_channel_name" android:layout_height="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:drawableStartCompat="@drawable/ic_channel_text" app:drawableTint="?colorTextMuted" style="@style/UiKit.TextView.Large.SingleLine" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_guild_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:roundedCornerRadius="4.0dip" />
+                <androidx.cardview.widget.CardView android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_weight="1.0" android:layout_marginEnd="8.0dip" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="4.0dip">
+                    <androidx.appcompat.widget.AppCompatTextView android:gravity="center_vertical" android:id="@id/channel_follow_channel_name" android:layout_height="fill_parent" android:drawablePadding="8.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:drawableStartCompat="@drawable/ic_channel_text" app:drawableTint="?colorTextMuted" style="@style/UiKit.TextView.Large.SingleLine" />
                 </androidx.cardview.widget.CardView>
             </LinearLayout>
         </FrameLayout>
         <com.discord.app.AppViewFlipper android:id="@id/follow_sheet_view_flipper" android:layout_width="wrap_content" android:layout_height="wrap_content" android:measureAllChildren="false">
-            <LinearLayout android:padding="@dimen/uikit_spacing_large" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit.TextView.H1.Bold" />
-                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/follow_modal_body" android:textAlignment="center" style="@style/UiKit.TextView.Subtext" />
+            <LinearLayout android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="16.0dip" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit.TextView.H1.Bold" />
+                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_gravity="center" android:layout_marginTop="8.0dip" android:layout_marginBottom="16.0dip" android:text="@string/follow_modal_body" android:textAlignment="center" style="@style/UiKit.TextView.Subtext" />
                 <TextView android:text="@string/form_label_send_to" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
-                <com.google.android.material.card.MaterialCardView android:id="@id/channel_follow_select_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" app:contentPadding="@dimen/uikit_spacing_medium">
+                <com.google.android.material.card.MaterialCardView android:id="@id/channel_follow_select_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" app:contentPadding="8.0dip">
                     <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
                         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveNormal" android:id="@id/channel_follow_selected_guild_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@id/channel_follow_guild_dropdown_icon" android:layout_alignParentStart="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
                         <ImageView android:id="@id/channel_follow_guild_dropdown_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_arrow_drop_down_white_18dp" android:importantForAccessibility="no" android:layout_alignParentEnd="true" />
                     </RelativeLayout>
                 </com.google.android.material.card.MaterialCardView>
                 <TextView android:text="@string/form_label_select_channel" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
-                <com.google.android.material.card.MaterialCardView android:id="@id/channel_follow_select_channel" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" app:contentPadding="@dimen/uikit_spacing_medium">
+                <com.google.android.material.card.MaterialCardView android:id="@id/channel_follow_select_channel" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" app:contentPadding="8.0dip">
                     <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
                         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveNormal" android:id="@id/channel_follow_selected_channel_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@id/channel_follow_channel_dropdown_icon" android:layout_alignParentStart="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
                         <ImageView android:id="@id/channel_follow_channel_dropdown_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_arrow_drop_down_white_18dp" android:importantForAccessibility="no" android:layout_alignParentEnd="true" />
                     </RelativeLayout>
                 </com.google.android.material.card.MaterialCardView>
-                <TextView android:textSize="12.0sp" android:id="@id/channel_follow_error_text" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:textAlignment="viewStart" style="@style/TextAppearance.Error" />
-                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/follow_modal_hint" style="@style/UiKit.TextView.Subtext" />
+                <TextView android:textSize="12.0sp" android:id="@id/channel_follow_error_text" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:textAlignment="viewStart" style="@style/TextAppearance.Error" />
+                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_marginBottom="16.0dip" android:text="@string/follow_modal_hint" style="@style/UiKit.TextView.Subtext" />
                 <com.google.android.material.button.MaterialButton android:id="@id/create_channel_follower_button" android:text="@string/follow" style="@style/UiKit.Material.Button" />
             </LinearLayout>
-            <LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit.TextView.H1.Bold" />
-                <TextView android:textSize="12.0sp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/follow_modal_hint_no_perms" android:textAlignment="center" style="@style/TextAppearance.Error" />
+            <LinearLayout android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit.TextView.H1.Bold" />
+                <TextView android:textSize="12.0sp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/follow_modal_hint_no_perms" android:textAlignment="center" style="@style/TextAppearance.Error" />
             </LinearLayout>
         </com.discord.app.AppViewFlipper>
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_channel_follow_success_dialog.xml b/com.discord/res/layout/widget_channel_follow_success_dialog.xml
index 2c9740b597..a9370031fe 100644
--- a/com.discord/res/layout/widget_channel_follow_success_dialog.xml
+++ b/com.discord/res/layout/widget_channel_follow_success_dialog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_success_image" android:layout_width="280.0dip" android:layout_height="120.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:importantForAccessibility="no" />
-        <TextView android:layout_gravity="center" android:id="@id/channel_follow_success_text" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView.H1" />
-        <TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/follow_success_modal_body" android:textAlignment="center" style="@style/UiKit.TextView" />
+    <LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_follow_success_image" android:layout_width="280.0dip" android:layout_height="120.0dip" android:layout_marginTop="24.0dip" android:layout_marginBottom="32.0dip" android:importantForAccessibility="no" />
+        <TextView android:layout_gravity="center" android:id="@id/channel_follow_success_text" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:textAlignment="center" style="@style/UiKit.TextView.H1" />
+        <TextView android:layout_gravity="center" android:layout_marginBottom="24.0dip" android:text="@string/follow_success_modal_body" android:textAlignment="center" style="@style/UiKit.TextView" />
         <com.google.android.material.button.MaterialButton android:id="@id/channel_follow_success_confirm" android:text="@string/tutorial_close" style="@style/UiKit.Material.Button" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_group_dm_settings.xml b/com.discord/res/layout/widget_channel_group_dm_settings.xml
index 456abb2406..ca78153710 100644
--- a/com.discord/res/layout/widget_channel_group_dm_settings.xml
+++ b/com.discord/res/layout/widget_channel_group_dm_settings.xml
@@ -6,12 +6,12 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView android:id="@id/group_dm_settings_scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit.ViewGroup.LinearLayout">
-            <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
+            <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.XXLarge" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
                 <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext" />
-                <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext" />
-                <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_name" android:layout_width="0.0dip" android:hint="@string/form_label_channel_name" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/settings_group_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextInputLayout.Primary">
+                <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext" />
+                <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_name" android:layout_width="0.0dip" android:hint="@string/form_label_channel_name" android:layout_marginStart="16.0dip" app:layout_constraintBottom_toBottomOf="@id/settings_group_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextInputLayout.Primary">
                     <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout/widget_channel_members_list_item_add.xml b/com.discord/res/layout/widget_channel_members_list_item_add.xml
index 4c0259b98d..e3958cfe8c 100644
--- a/com.discord/res/layout/widget_channel_members_list_item_add.xml
+++ b/com.discord/res/layout/widget_channel_members_list_item_add.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="8.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/channel_members_list_item_add" android:background="@drawable/drawable_circle_background_secondary" android:padding="@dimen/uikit_spacing_medium" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_add_person_16dp" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" app:tint="?colorInteractiveNormal" />
+    <ImageView android:id="@id/channel_members_list_item_add" android:background="@drawable/drawable_circle_background_secondary" android:padding="8.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_add_person_16dp" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" app:tint="?colorInteractiveNormal" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:id="@id/channel_members_list_item_add_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/invite_members" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_members_list_item_header.xml b/com.discord/res/layout/widget_channel_members_list_item_header.xml
index e421693ba6..fbf1e8e721 100644
--- a/com.discord/res/layout/widget_channel_members_list_item_header.xml
+++ b/com.discord/res/layout/widget_channel_members_list_item_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<FrameLayout android:background="?colorBackgroundPrimary" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:gravity="bottom" android:id="@id/channel_members_list_item_header_text" android:focusable="true" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_members_list_item_loading.xml b/com.discord/res/layout/widget_channel_members_list_item_loading.xml
index 3f3292ca0e..f5093807e7 100644
--- a/com.discord/res/layout/widget_channel_members_list_item_loading.xml
+++ b/com.discord/res/layout/widget_channel_members_list_item_loading.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="@dimen/channel_list_row_height"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <View android:id="@id/blank_item_avatar_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" />
+    <View android:id="@id/blank_item_avatar_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_marginStart="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" />
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@id/username_placeholder_end_guideline" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintGuide_percent="0.8" />
-    <View android:id="@id/blank_item_username_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="0.0dip" android:layout_height="@dimen/channel_list_placeholder_height" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/username_placeholder_end_guideline" app:layout_constraintLeft_toRightOf="@id/blank_item_avatar_placeholder" app:layout_constraintRight_toRightOf="@id/username_placeholder_end_guideline" app:layout_constraintStart_toEndOf="@id/blank_item_avatar_placeholder" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" />
+    <View android:id="@id/blank_item_username_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="0.0dip" android:layout_height="@dimen/channel_list_placeholder_height" android:layout_marginStart="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/username_placeholder_end_guideline" app:layout_constraintLeft_toRightOf="@id/blank_item_avatar_placeholder" app:layout_constraintRight_toRightOf="@id/username_placeholder_end_guideline" app:layout_constraintStart_toEndOf="@id/blank_item_avatar_placeholder" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_members_list_item_placeholder_header.xml b/com.discord/res/layout/widget_channel_members_list_item_placeholder_header.xml
index 49db28ac49..c2e05daa31 100644
--- a/com.discord/res/layout/widget_channel_members_list_item_placeholder_header.xml
+++ b/com.discord/res/layout/widget_channel_members_list_item_placeholder_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="@dimen/channel_list_row_height"
+<FrameLayout android:background="?colorBackgroundPrimary" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="@dimen/channel_list_row_height"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <View android:layout_gravity="bottom" android:id="@id/channel_members_list_item_header_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="150.0dip" android:layout_height="@dimen/channel_list_placeholder_height" />
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_members_list_item_user.xml b/com.discord/res/layout/widget_channel_members_list_item_user.xml
index f43d90a789..5c6c41dd8d 100644
--- a/com.discord/res/layout/widget_channel_members_list_item_user.xml
+++ b/com.discord/res/layout/widget_channel_members_list_item_user.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="@dimen/channel_list_row_height" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large"
+<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="@dimen/channel_list_row_height" android:paddingStart="16.0dip" android:paddingEnd="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_members_list_item_avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/asset_default_avatar_32dp" style="@style/Avatar.Standard" />
     <com.discord.views.StatusView android:id="@id/channel_members_list_item_presence" android:layout_width="10.0dip" android:layout_height="wrap_content" android:translationX="1.5dip" android:translationY="1.5dip" app:layout_constraintBottom_toBottomOf="@id/channel_members_list_item_avatar" app:layout_constraintRight_toRightOf="@id/channel_members_list_item_avatar" app:sv_background_color="?primary_600" app:sv_border_width="1.5dip" app:sv_corner_radius="2.0dip" />
-    <com.discord.views.UsernameView android:id="@id/channel_members_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/channel_members_list_item_game" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintRight_toRightOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
-    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_400" android:id="@id/channel_members_list_item_game" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toRightOf="@id/channel_members_list_item_avatar" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_avatar" app:layout_constraintTop_toBottomOf="@id/channel_members_list_item_name" style="@style/UiKit.TextView.Subtext" />
+    <com.discord.views.UsernameView android:id="@id/channel_members_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" android:layout_marginEnd="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/channel_members_list_item_game" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintRight_toRightOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
+    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_400" android:id="@id/channel_members_list_item_game" android:singleLine="true" android:layout_marginStart="16.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toRightOf="@id/channel_members_list_item_avatar" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_avatar" app:layout_constraintTop_toBottomOf="@id/channel_members_list_item_name" style="@style/UiKit.TextView.Subtext" />
     <ImageView android:id="@id/channel_members_list_item_rich_presence_iv" android:src="@drawable/ic_rich_presence_grey_16dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="@id/channel_members_list_item_game" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintLeft_toRightOf="@id/channel_members_list_item_game" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_game" app:layout_constraintTop_toTopOf="@id/channel_members_list_item_game" style="@style/UiKit.ImageView" />
     <ImageView android:id="@id/channel_members_list_item_group_owner_indicator" android:src="@drawable/ic_crown_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_boosted_indicator" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_boosted_indicator" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <ImageView android:id="@id/channel_members_list_item_boosted_indicator" android:src="@drawable/ic_member_list_boosted_badge_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
diff --git a/com.discord/res/layout/widget_channel_notification_settings.xml b/com.discord/res/layout/widget_channel_notification_settings.xml
index 5d7edc5d89..3108aea32d 100644
--- a/com.discord/res/layout/widget_channel_notification_settings.xml
+++ b/com.discord/res/layout/widget_channel_notification_settings.xml
@@ -24,7 +24,7 @@
                     <TextView android:text="@string/form_label_mobile_user_notifications_label" style="@style/UiKit.Settings.Item.Label" />
                     <TextView android:text="@string/form_label_mobile_user_notifications_hint" style="@style/UiKit.Settings.Item.Addition" />
                 </LinearLayout>
-                <ImageView android:padding="@dimen/uikit_spacing_large" android:src="@drawable/icon_carrot" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+                <ImageView android:padding="16.0dip" android:src="@drawable/icon_carrot" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_channel_onboarding.xml b/com.discord/res/layout/widget_channel_onboarding.xml
index 6626826d6d..7b5149d771 100644
--- a/com.discord/res/layout/widget_channel_onboarding.xml
+++ b/com.discord/res/layout/widget_channel_onboarding.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/nuf_channels_description" app:stv_title="@string/nuf_channels_title" />
-        <ImageView android:layout_width="280.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="?drawable_channels_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit.ImageView" />
+    <LinearLayout android:gravity="center_horizontal" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" app:stv_subtitle="@string/nuf_channels_description" app:stv_title="@string/nuf_channels_title" />
+        <ImageView android:layout_width="280.0dip" android:layout_marginBottom="24.0dip" android:src="?drawable_channels_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit.ImageView" />
         <com.google.android.material.button.MaterialButton android:id="@id/channel_actions_view" android:text="@string/nuf_channels_cta_label" style="@style/UiKit.AuthButton.Material" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_search_item.xml b/com.discord/res/layout/widget_channel_search_item.xml
index aaa26cfef7..01c0c08a69 100644
--- a/com.discord/res/layout/widget_channel_search_item.xml
+++ b/com.discord/res/layout/widget_channel_search_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.widgets.user.search.ViewGlobalSearchItem android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_xsmall" android:paddingBottom="@dimen/uikit_spacing_xsmall" android:focusable="true" android:clickable="true" android:clipChildren="false" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout"
+<com.discord.widgets.user.search.ViewGlobalSearchItem android:background="?selectableItemBackground" android:paddingTop="2.0dip" android:paddingBottom="2.0dip" android:focusable="true" android:clickable="true" android:clipChildren="false" android:paddingEnd="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_search_item_header.xml b/com.discord/res/layout/widget_channel_search_item_header.xml
index 4edd66fcbd..2fc9df3d31 100644
--- a/com.discord/res/layout/widget_channel_search_item_header.xml
+++ b/com.discord/res/layout/widget_channel_search_item_header.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:id="@id/item_header_tv" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/search_newest" android:singleLine="true" style="@style/UiKit.Search.Header"
+<TextView android:id="@id/item_header_tv" android:layout_marginTop="8.0dip" android:text="@string/search_newest" android:singleLine="true" style="@style/UiKit.Search.Header"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_selector.xml b/com.discord/res/layout/widget_channel_selector.xml
index 14cc3e0d70..03a1ed0931 100644
--- a/com.discord/res/layout/widget_channel_selector.xml
+++ b/com.discord/res/layout/widget_channel_selector.xml
@@ -2,7 +2,7 @@
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/channel_select" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.Sheet.Header.Title" />
+        <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/channel_select" android:layout_marginStart="16.0dip" style="@style/UiKit.Sheet.Header.Title" />
         <View style="@style/UiKit.Settings.Divider" />
         <androidx.recyclerview.widget.RecyclerView android:id="@id/channel_selector_list" style="@style/UiKit.ViewGroup.RecyclerView" />
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_channel_settings_cannot_delete.xml b/com.discord/res/layout/widget_channel_settings_cannot_delete.xml
index 66e43086e3..4736dd4bfc 100644
--- a/com.discord/res/layout/widget_channel_settings_cannot_delete.xml
+++ b/com.discord/res/layout/widget_channel_settings_cannot_delete.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:id="@id/channel_settings_cannot_delete_title" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/cannot_delete_channel" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:id="@id/channel_settings_cannot_delete_title" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/cannot_delete_channel" style="@style/UiKit.TextView.H1.Bold" />
     <View android:layout_marginTop="0.0dip" style="@style/UiKit.Divider" />
     <TextView android:id="@id/channel_settings_cannot_delete_body" style="@style/UiKit.Settings.Item.SubText" />
     <TextView android:paddingTop="0.0dip" android:text="@string/android_designate_other_channel" style="@style/UiKit.Settings.Item.SubText" />
     <View style="@style/UiKit.Settings.Divider" />
-    <LinearLayout android:gravity="end" android:background="?colorBackgroundSecondary" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:gravity="end" android:background="?colorBackgroundSecondary" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <com.google.android.material.button.MaterialButton android:id="@id/channel_settings_cannot_delete_confirm" android:text="@string/okay" style="@style/UiKit.Material.Button.Fit" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_settings_delete.xml b/com.discord/res/layout/widget_channel_settings_delete.xml
index 201fadbbe6..9188b1bb88 100644
--- a/com.discord/res/layout/widget_channel_settings_delete.xml
+++ b/com.discord/res/layout/widget_channel_settings_delete.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:id="@id/channel_settings_delete_title" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/delete_channel" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:id="@id/channel_settings_delete_title" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/delete_channel" style="@style/UiKit.TextView.H1.Bold" />
     <View android:layout_marginTop="0.0dip" style="@style/UiKit.Divider" />
     <TextView android:id="@id/channel_settings_delete_body" style="@style/UiKit.Settings.Item.SubText" />
     <View style="@style/UiKit.Settings.Divider" />
-    <LinearLayout android:gravity="end" android:background="?primary_630" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:gravity="end" android:background="?primary_630" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <com.google.android.material.button.MaterialButton android:id="@id/channel_settings_delete_cancel" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent.Fit" />
         <com.google.android.material.button.MaterialButton android:id="@id/channel_settings_delete_confirm" android:text="@string/delete" style="@style/UiKit.Material.Button.Red.Fit" />
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_channel_settings_edit_permissions.xml b/com.discord/res/layout/widget_channel_settings_edit_permissions.xml
index 627819c9e5..4aeec769f4 100644
--- a/com.discord/res/layout/widget_channel_settings_edit_permissions.xml
+++ b/com.discord/res/layout/widget_channel_settings_edit_permissions.xml
@@ -6,9 +6,9 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channel_permissions_avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_permissions_target_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
-                <TextView android:ellipsize="end" android:id="@id/channel_permissions_target_name" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:maxLines="4" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_permissions_channel_name" app:layout_constraintStart_toEndOf="@id/channel_permissions_avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_default="percent" app:layout_constraintWidth_percent="0.6" app:layout_goneMarginLeft="0.0dip" style="@style/UiKit.TextView" />
+                <TextView android:ellipsize="end" android:id="@id/channel_permissions_target_name" android:layout_width="0.0dip" android:layout_margin="16.0dip" android:maxLines="4" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_permissions_channel_name" app:layout_constraintStart_toEndOf="@id/channel_permissions_avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_default="percent" app:layout_constraintWidth_percent="0.6" app:layout_goneMarginLeft="0.0dip" style="@style/UiKit.TextView" />
                 <TextView android:ellipsize="end" android:gravity="end" android:id="@id/channel_permissions_channel_name" android:maxLines="4" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/channel_permissions_target_name" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
             </androidx.constraintlayout.widget.ConstraintLayout>
             <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
@@ -43,7 +43,7 @@
                 <com.discord.views.TernaryCheckBox android:id="@id/channel_permission_voice_move_members" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/move_members" app:tcs_subtext="@string/move_members_description" />
                 <com.discord.views.TernaryCheckBox android:id="@id/channel_permission_voice_use_vad" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/use_vad" app:tcs_subtext="@string/use_vad_description" />
             </LinearLayout>
-            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="64.0dip" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/channel_permissions_save" android:focusable="true" android:visibility="gone" android:src="@drawable/icon_save" style="@style/Settings.FloatingActionButton" />
diff --git a/com.discord/res/layout/widget_channel_settings_permissions_overview.xml b/com.discord/res/layout/widget_channel_settings_permissions_overview.xml
index e104c4484e..fc5882b041 100644
--- a/com.discord/res/layout/widget_channel_settings_permissions_overview.xml
+++ b/com.discord/res/layout/widget_channel_settings_permissions_overview.xml
@@ -5,7 +5,7 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingBottom="64.0dip" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_300" android:id="@id/channel_settings_permissions_overview_add_role" android:focusable="true" android:clickable="true" android:text="@string/add_a_role" android:drawableStart="?ic_plus_a60" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_300" android:id="@id/channel_settings_permissions_overview_add_member" android:focusable="true" android:clickable="true" android:text="@string/add_a_member" android:drawableStart="?ic_plus_a60" style="@style/UiKit.Settings.Item.Icon" />
             <LinearLayout android:id="@id/channel_settings_permissions_overview_roles_container" style="@style/UiKit.ViewGroup.LinearLayout">
diff --git a/com.discord/res/layout/widget_channel_topic.xml b/com.discord/res/layout/widget_channel_topic.xml
index f9661734ce..bb1e2deba4 100644
--- a/com.discord/res/layout/widget_channel_topic.xml
+++ b/com.discord/res/layout/widget_channel_topic.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@id/channel_topic" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:id="@id/channel_topic" android:background="?colorBackgroundSecondary" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="top" android:id="@id/channel_topic_channel_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:actualImageScaleType="fitCenter" app:placeholderImage="?ic_channel_text" app:roundAsCircle="true" />
+        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="top" android:id="@id/channel_topic_channel_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="2.0dip" android:layout_marginEnd="8.0dip" app:actualImageScaleType="fitCenter" app:placeholderImage="?ic_channel_text" app:roundAsCircle="true" />
         <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderPrimary" android:id="@id/channel_topic_name" android:layout_width="0.0dip" android:text="@string/form_label_channel_topic" android:layout_weight="1.0" app:drawableTint="?colorChannelsDefault" style="@style/UiKit.TextView" />
-        <ImageView android:layout_gravity="top" android:id="@id/channel_topic_more_icon" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:src="?ic_overflow" android:contentDescription="@string/settings" style="@style/UiKit.ImageView" />
+        <ImageView android:layout_gravity="top" android:id="@id/channel_topic_more_icon" android:visibility="gone" android:layout_marginTop="2.0dip" android:src="?ic_overflow" android:contentDescription="@string/settings" style="@style/UiKit.ImageView" />
     </LinearLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?colorHeaderSecondary" android:autoLink="all" android:id="@id/channel_topic_title" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-    <RelativeLayout android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.RelativeLayout">
+    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?colorHeaderSecondary" android:autoLink="all" android:id="@id/channel_topic_title" android:layout_width="fill_parent" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
+    <RelativeLayout android:layout_width="fill_parent" android:layout_height="16.0dip" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
         <ImageView android:id="@id/channel_topic_ellipsis" android:src="?ic_channel_topic_ellipsis" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list.xml b/com.discord/res/layout/widget_channels_list.xml
index fc542b0dbc..55238a5191 100644
--- a/com.discord/res/layout/widget_channels_list.xml
+++ b/com.discord/res/layout/widget_channels_list.xml
@@ -8,25 +8,25 @@
                 <FrameLayout android:id="@id/channels_list_banner_foreground" android:background="@drawable/drawable_top_down_black_40_alpha_gradient" android:layout_width="fill_parent" android:layout_height="48.0dip" />
             </FrameLayout>
             <androidx.appcompat.widget.Toolbar android:id="@id/channels_toolbar" android:background="@null" style="@style/AppTheme.Toolbar">
-                <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="18.0sp" android:textColor="?colorInteractiveActive" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:drawableRight="?ic_overflow" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="?ic_overflow" style="@style/UiKit.TextView" />
+                <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="18.0sp" android:textColor="?colorInteractiveActive" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:drawableRight="?ic_overflow" android:drawablePadding="4.0dip" android:drawableEnd="?ic_overflow" style="@style/UiKit.TextView" />
             </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
         <androidx.appcompat.widget.Toolbar android:id="@id/channels_list_private_channels_header" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:contentInsetStart="0.0dip">
-            <androidx.constraintlayout.widget.ConstraintLayout android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
-                <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:id="@id/channels_list_direct_messages_title" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="visible" android:text="@string/direct_messages" app:layout_constraintEnd_toStartOf="@id/channels_list_start_group" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-                <androidx.appcompat.widget.AppCompatImageView android:id="@id/channels_list_start_group" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_medium" android:src="@drawable/ic_group_add_white_24dp" android:contentDescription="@string/create_dm" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageView" />
-                <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textColor="?colorTextMuted" android:gravity="center_vertical" android:id="@id/channels_list_search" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:foreground="?bg_pressed_highlight" android:text="@string/dm_search_placeholder" android:drawableEnd="@drawable/ic_search_16dp" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundTertiary" app:drawableTint="?colorTextMuted" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_direct_messages_title" />
+            <androidx.constraintlayout.widget.ConstraintLayout android:background="@color/transparent" android:paddingTop="8.0dip" android:paddingBottom="16.0dip" android:paddingStart="16.0dip" android:paddingEnd="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
+                <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:id="@id/channels_list_direct_messages_title" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:visibility="visible" android:text="@string/direct_messages" app:layout_constraintEnd_toStartOf="@id/channels_list_start_group" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
+                <androidx.appcompat.widget.AppCompatImageView android:id="@id/channels_list_start_group" android:background="?bg_pressed_highlight" android:padding="8.0dip" android:src="@drawable/ic_group_add_white_24dp" android:contentDescription="@string/create_dm" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageView" />
+                <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textColor="?colorTextMuted" android:gravity="center_vertical" android:id="@id/channels_list_search" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:foreground="?bg_pressed_highlight" android:text="@string/dm_search_placeholder" android:drawableEnd="@drawable/ic_search_16dp" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:layout_marginEnd="8.0dip" android:backgroundTint="?colorBackgroundTertiary" app:drawableTint="?colorTextMuted" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_direct_messages_title" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.discord.views.CustomAppBarLayout>
-    <com.discord.widgets.friends.EmptyFriendsStateView android:id="@id/widget_channels_list_empty_friends_state_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_below="@id/channels_list_search" app:ef_title_text_size="@dimen/uikit_textsize_large" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_search" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
+    <com.discord.widgets.friends.EmptyFriendsStateView android:id="@id/widget_channels_list_empty_friends_state_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="32.0dip" android:layout_below="@id/channels_list_search" app:ef_title_text_size="@dimen/uikit_textsize_large" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="8.0dip" android:visibility="gone" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_search" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
     <ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_anchor="@id/channels_list" />
-    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center" android:layout_gravity="end" android:id="@id/channels_list_premium_guild_hint" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="48.0dip" android:layout_marginRight="28.0dip" android:translationZ="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center" android:layout_gravity="end" android:id="@id/channels_list_premium_guild_hint" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="48.0dip" android:layout_marginRight="28.0dip" android:translationZ="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <View android:id="@id/channels_list_tooltip_top_tail" android:background="@drawable/drawable_tooltip_top_tail" android:layout_width="24.0dip" android:layout_height="20.0dip" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
         <View android:id="@id/channels_list_tooltip_background" android:background="@drawable/drawable_bg_tooltip" android:layout_width="fill_parent" android:layout_height="0.0dip" android:translationY="-8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_tooltip_top_tail" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_header" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/channels_list_tooltip_background" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_text" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_title" style="@style/UiKit.TextView" />
-        <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme.Dark" android:textColor="@color/brand_500" android:id="@id/channels_list_premium_guild_hint_button" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_subtitle" style="@style/UiKit.Material.Button.White" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_header" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/channels_list_tooltip_background" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_text" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_title" style="@style/UiKit.TextView" />
+        <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme.Dark" android:textColor="@color/brand_500" android:id="@id/channels_list_premium_guild_hint_button" android:layout_width="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_subtitle" style="@style/UiKit.Material.Button.White" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.discord.utilities.view.rounded.RoundedCoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml b/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml
index 00ce4bdfe1..03e5a36056 100644
--- a/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml
+++ b/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/change_nickname" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/change_nickname" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
-    <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.google.android.material.textfield.TextInputLayout android:id="@id/channels_list_actions_change_nickname_edit_text" android:hint="@string/nickname" style="@style/UiKit.TextInputLayout.Primary">
             <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Username" />
         </com.google.android.material.textfield.TextInputLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/channels_list_actions_change_nickname_reset" android:paddingTop="@dimen/uikit_spacing_medium" android:text="@string/reset_nickname" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/channels_list_actions_change_nickname_reset" android:paddingTop="8.0dip" android:text="@string/reset_nickname" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
     </LinearLayout>
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
-        <com.google.android.material.button.MaterialButton android:id="@id/channels_list_actions_change_nickname_cancel" android:text="@string/cancel" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Transparent.Fit" />
+        <com.google.android.material.button.MaterialButton android:id="@id/channels_list_actions_change_nickname_cancel" android:text="@string/cancel" android:layout_marginEnd="8.0dip" style="@style/UiKit.Material.Button.Transparent.Fit" />
         <com.google.android.material.button.MaterialButton android:id="@id/channels_list_actions_change_nickname_save" android:layout_width="wrap_content" android:text="@string/save" style="@style/UiKit.Material.Button.Fit" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_item_category.xml b/com.discord/res/layout/widget_channels_list_item_category.xml
index 347edf01cb..18423a1f48 100644
--- a/com.discord/res/layout/widget_channels_list_item_category.xml
+++ b/com.discord/res/layout/widget_channels_list_item_category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:background="?drawable_overlay_category" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:focusable="false" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center_vertical" android:background="?drawable_overlay_category" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:focusable="false" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/channels_item_category_arrow" android:layout_width="12.0dip" android:layout_height="12.0dip" android:src="@drawable/ic_chevron_down_grey_12dp" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="@dimen/uikit_spacing_xsmall" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorChannelDefault" android:id="@id/channels_item_category_name" android:focusable="true" android:layout_width="0.0dip" android:singleLine="true" android:layout_weight="1.0" android:textAllCaps="true" android:layout_marginStart="@dimen/uikit_spacing_xsmall" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Bold" />
-    <ImageView android:id="@id/channels_item_category_add" android:src="@drawable/ic_add_24dp" android:scaleType="centerCrop" android:contentDescription="@string/guild_settings_action_filter_channel_create" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView.Clickable" />
+    <ImageView android:id="@id/channels_item_category_arrow" android:layout_width="12.0dip" android:layout_height="12.0dip" android:src="@drawable/ic_chevron_down_grey_12dp" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="2.0dip" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorChannelDefault" android:id="@id/channels_item_category_name" android:focusable="true" android:layout_width="0.0dip" android:singleLine="true" android:layout_weight="1.0" android:textAllCaps="true" android:layout_marginStart="2.0dip" android:layout_marginEnd="8.0dip" style="@style/UiKit.TextView.Bold" />
+    <ImageView android:id="@id/channels_item_category_add" android:src="@drawable/ic_add_24dp" android:scaleType="centerCrop" android:contentDescription="@string/guild_settings_action_filter_channel_create" android:layout_marginEnd="8.0dip" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView.Clickable" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_item_channel.xml b/com.discord/res/layout/widget_channels_list_item_channel.xml
index a7e13a3543..060d6ea65f 100644
--- a/com.discord/res/layout/widget_channels_list_item_channel.xml
+++ b/com.discord/res/layout/widget_channels_list_item_channel.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_marginBottom="4.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/channels_item_channel_unread" android:src="@drawable/ic_unread_white_9dp" android:layout_centerVertical="true" android:importantForAccessibility="no" app:tint="?colorInteractiveActive" style="@style/UiKit.ImageView" />
     <ImageView android:id="@id/channels_item_channel_hash" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_channel_text" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16.0dip" app:tint="?colorTextNormal" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:id="@id/channels_item_channel_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/channels_item_channel_mentions" android:layout_toEndOf="@id/channels_item_channel_hash" style="@style/UiKit.TextView" />
-    <TextView android:id="@id/channels_item_channel_mentions" android:background="?drawable_overlay_mentions" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" style="@style/Icon.Mentions.Large" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:id="@id/channels_item_channel_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="4.0dip" android:layout_marginEnd="16.0dip" android:layout_toStartOf="@id/channels_item_channel_mentions" android:layout_toEndOf="@id/channels_item_channel_hash" style="@style/UiKit.TextView" />
+    <TextView android:id="@id/channels_item_channel_mentions" android:background="?drawable_overlay_mentions" android:visibility="gone" android:minWidth="16.0dip" android:layout_centerVertical="true" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true" style="@style/Icon.Mentions.Large" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_item_channel_private.xml b/com.discord/res/layout/widget_channels_list_item_channel_private.xml
index 84338b5af7..fe4d74d0e7 100644
--- a/com.discord/res/layout/widget_channels_list_item_channel_private.xml
+++ b/com.discord/res/layout/widget_channels_list_item_channel_private.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:padding="@dimen/uikit_spacing_medium" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:padding="8.0dip" android:layout_height="wrap_content" android:layout_marginBottom="4.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_item_private_avatar" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_item_private_avatar" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
     <com.discord.views.StatusView android:id="@id/channel_list_item_private_status" android:layout_width="12.0dip" android:layout_height="wrap_content" android:layout_alignBottom="@id/channels_list_item_private_avatar" android:translationX="2.0dip" android:translationY="2.0dip" android:layout_alignEnd="@id/channels_list_item_private_avatar" app:sv_background_color="?colorBackgroundSecondary" app:sv_border_width="2.0dip" app:sv_corner_radius="2.0dip" />
-    <LinearLayout android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/channels_list_item_private_mentions" android:layout_toEndOf="@id/channels_list_item_private_avatar" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="16.0dip" android:layout_toStartOf="@id/channels_list_item_private_mentions" android:layout_toEndOf="@id/channels_list_item_private_avatar" style="@style/UiKit.ViewGroup.LinearLayout">
         <LinearLayout android:orientation="horizontal" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorChannelDefault" android:id="@id/channels_list_item_private_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
             <TextView android:textSize="9.5sp" android:textColor="@color/white" android:layout_gravity="center" android:id="@id/channels_list_item_private_tag" android:background="@drawable/drawable_tag_brand" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/system_dm_tag_system" android:singleLine="true" android:drawableStart="@drawable/ic_verified_10dp" android:paddingStart="3.0dip" android:paddingEnd="3.0dip" android:layout_marginStart="6.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
         <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@id/channels_list_item_private_desc" android:singleLine="true" style="@style/UiKit.TextView.Subtext" />
     </LinearLayout>
-    <TextView android:id="@id/channels_list_item_private_mentions" android:background="?drawable_overlay_mentions" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" style="@style/Icon.Mentions.Large" />
+    <TextView android:id="@id/channels_list_item_private_mentions" android:background="?drawable_overlay_mentions" android:visibility="gone" android:minWidth="16.0dip" android:layout_centerVertical="true" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true" style="@style/Icon.Mentions.Large" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_item_invite.xml b/com.discord/res/layout/widget_channels_list_item_invite.xml
index 3726658954..35e4f8159b 100644
--- a/com.discord/res/layout/widget_channels_list_item_invite.xml
+++ b/com.discord/res/layout/widget_channels_list_item_invite.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.button.MaterialButton android:layout_height="44.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/invite_members" android:textAllCaps="false" style="@style/UiKit.Material.Button.Secondary"
+<com.google.android.material.button.MaterialButton android:layout_height="44.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/invite_members" android:textAllCaps="false" style="@style/UiKit.Material.Button.Secondary"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_item_text_actions.xml b/com.discord/res/layout/widget_channels_list_item_text_actions.xml
index 9f25065caf..f010aa32f0 100644
--- a/com.discord/res/layout/widget_channels_list_item_text_actions.xml
+++ b/com.discord/res/layout/widget_channels_list_item_text_actions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:background="?primary_630" style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Sheet.Header">
             <androidx.constraintlayout.widget.Guideline style="@style/UiKit.Sheet.Guideline" />
             <FrameLayout style="@style/UiKit.Sheet.Header.Icon">
diff --git a/com.discord/res/layout/widget_channels_list_item_voice_user.xml b/com.discord/res/layout/widget_channels_list_item_voice_user.xml
index baefb501a1..9d67807a44 100644
--- a/com.discord/res/layout/widget_channels_list_item_voice_user.xml
+++ b/com.discord/res/layout/widget_channels_list_item_voice_user.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_item_voice_user_avatar" android:layout_centerVertical="true" android:layout_marginStart="36.0dip" android:layout_marginEnd="8.0dip" style="@style/Avatar.Small" />
     <TextView android:textColor="?colorChannelDefault" android:id="@id/channels_item_voice_user_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginEnd="4.0dip" android:layout_toStartOf="@id/indicators_container" android:layout_toEndOf="@id/channels_item_voice_user_avatar" style="@style/UiKit.TextView" />
-    <LinearLayout android:gravity="center_vertical" android:id="@id/indicators_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true">
+    <LinearLayout android:gravity="center_vertical" android:id="@id/indicators_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true">
         <ImageView android:id="@id/channels_item_voice_user_camera" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/sample_empty_string" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView" />
         <ImageView android:id="@id/channels_item_voice_user_headphones" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_deafen_v2_deafened" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="6.0dip" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView" />
         <ImageView android:id="@id/channels_item_voice_user_microphone" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_mute_v2_muted" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="6.0dip" app:tint="?colorChannelDefault" style="@style/UiKit.ImageView" />
diff --git a/com.discord/res/layout/widget_channels_list_unreads.xml b/com.discord/res/layout/widget_channels_list_unreads.xml
index a83e17d5da..d3f8746ecb 100644
--- a/com.discord/res/layout/widget_channels_list_unreads.xml
+++ b/com.discord/res/layout/widget_channels_list_unreads.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout android:id="@id/channels_list_unreads_background" android:background="@drawable/drawable_button_grey" android:paddingLeft="@dimen/uikit_spacing_xsmall" android:paddingTop="3.0dip" android:paddingRight="@dimen/uikit_spacing_xsmall" android:paddingBottom="3.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:elevation="@dimen/uikit_spacing_xsmall" style="@style/UiKit.ViewGroup.RelativeLayout">
-        <TextView android:textSize="12.0dip" android:textColor="@color/white" android:ellipsize="none" android:id="@id/channels_list_unreads" android:drawablePadding="@dimen/uikit_spacing_xsmall" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
+    <RelativeLayout android:id="@id/channels_list_unreads_background" android:background="@drawable/drawable_button_grey" android:paddingLeft="2.0dip" android:paddingTop="3.0dip" android:paddingRight="2.0dip" android:paddingBottom="3.0dip" android:layout_margin="8.0dip" android:elevation="2.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
+        <TextView android:textSize="12.0dip" android:textColor="@color/white" android:ellipsize="none" android:id="@id/channels_list_unreads" android:drawablePadding="2.0dip" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.SingleLine" />
     </RelativeLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_input_guard.xml b/com.discord/res/layout/widget_chat_input_guard.xml
index 7d5b39d76a..66be1284c4 100644
--- a/com.discord/res/layout/widget_chat_input_guard.xml
+++ b/com.discord/res/layout/widget_chat_input_guard.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:id="@id/chat_input_guard" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center" android:id="@id/chat_input_guard" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="8.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="8.0dip" android:visibility="gone" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:textColor="?colorTextNormal" android:gravity="center" android:id="@id/chat_input_guard_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
     <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:gravity="center" android:id="@id/chat_input_guard_subtext" android:paddingTop="2.0sp" android:paddingBottom="2.0sp" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.TextView.Subtext" />
     <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-        <com.google.android.material.button.MaterialButton android:id="@id/chat_input_guard_action_secondary" android:visibility="gone" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Secondary" />
+        <com.google.android.material.button.MaterialButton android:id="@id/chat_input_guard_action_secondary" android:visibility="gone" android:layout_weight="1.0" android:layout_marginEnd="16.0dip" style="@style/UiKit.Material.Button.Secondary" />
         <com.google.android.material.button.MaterialButton android:id="@id/chat_input_guard_action" android:text="@string/resend_verification_email" android:layout_weight="1.0" style="@style/UiKit.Material.Button" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_input_item.xml b/com.discord/res/layout/widget_chat_input_item.xml
index 160f1dc308..3fd0e7302b 100644
--- a/com.discord/res/layout/widget_chat_input_item.xml
+++ b/com.discord/res/layout/widget_chat_input_item.xml
@@ -2,11 +2,11 @@
 <RelativeLayout android:background="?selectableItemBackground" android:layout_height="36.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <RelativeLayout android:id="@id/chat_input_item_icon_container" android:layout_width="wrap_content" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.RelativeLayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_input_item_avatar" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/Avatar.Small" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_input_item_avatar" android:layout_marginStart="16.0dip" style="@style/Avatar.Small" />
         <com.discord.views.StatusView android:id="@id/chat_input_item_status" android:layout_width="8.0dip" android:layout_height="8.0dip" android:layout_alignBottom="@id/chat_input_item_avatar" android:translationX="1.5dip" android:translationY="1.5dip" android:layout_alignEnd="@id/chat_input_item_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="1.0dip" app:sv_show_mobile="false" />
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_input_item_emoji" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_input_item_emoji" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:layout_marginStart="16.0dip" style="@style/UiKit.TextView" />
     </RelativeLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextNormal" android:id="@id/chat_input_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_toStartOf="@id/chat_input_item_name_right" android:layout_toEndOf="@id/chat_input_item_icon_container" style="@style/UiKit.TextView" />
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:id="@id/chat_input_item_name_right" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxWidth="@dimen/chat_input_autocomplete_name_max_width" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextNormal" android:id="@id/chat_input_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginStart="8.0dip" android:layout_toStartOf="@id/chat_input_item_name_right" android:layout_toEndOf="@id/chat_input_item_icon_container" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:id="@id/chat_input_item_name_right" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:maxWidth="@dimen/chat_input_autocomplete_name_max_width" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
     <View android:layout_alignParentBottom="true" android:layout_alignStart="@id/chat_input_item_icon_container" style="@style/UiKit.Divider" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_input_perm_req_files.xml b/com.discord/res/layout/widget_chat_input_perm_req_files.xml
index 040e91e94c..a8d57e549f 100644
--- a/com.discord/res/layout/widget_chat_input_perm_req_files.xml
+++ b/com.discord/res/layout/widget_chat_input_perm_req_files.xml
@@ -2,6 +2,6 @@
 <LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:layout_marginTop="24.0dip" android:src="@drawable/img_permission_prime" android:contentDescription="@string/system_permission_request_files" style="@style/UiKit.ImageView" />
-    <com.discord.app.AppTextView android:gravity="center" android:id="@id/perm_req_text" android:padding="@dimen/uikit_spacing_large" android:text="@string/system_permission_request_files" style="@style/UiKit.TextView" />
+    <com.discord.app.AppTextView android:gravity="center" android:id="@id/perm_req_text" android:padding="16.0dip" android:text="@string/system_permission_request_files" style="@style/UiKit.TextView" />
     <com.google.android.material.button.MaterialButton android:id="@id/action_btn" android:text="@string/system_permission_grant" style="@style/UiKit.Material.Button.Fit" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_actions.xml b/com.discord/res/layout/widget_chat_list_actions.xml
index 544208a99d..4dbe589728 100644
--- a/com.discord/res/layout/widget_chat_list_actions.xml
+++ b/com.discord/res/layout/widget_chat_list_actions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:id="@id/dialog_chat_actions_container" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:contentDescription="@string/add_reaction" android:nestedScrollingEnabled="false" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
+    <LinearLayout android:id="@id/dialog_chat_actions_container" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:contentDescription="@string/add_reaction" android:nestedScrollingEnabled="false" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
         <TextView android:id="@id/dialog_chat_actions_copy" android:text="@string/copy_text" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_remove_all_reactions" android:text="@string/remove_all_reactions" android:drawableStart="?ic_delete_sweep" style="@style/UiKit.Settings.Item.Icon" />
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_attachment.xml b/com.discord/res/layout/widget_chat_list_adapter_item_attachment.xml
index dd2c8ad378..6ac07b283e 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_attachment.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_attachment.xml
@@ -4,17 +4,17 @@
     <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
     <com.discord.widgets.chat.list.InlineMediaView android:id="@id/chat_list_item_attachment_inline_media" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxHeight="500.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_min="@dimen/embed_play_button_width" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_min="@dimen/embed_play_button_width" />
     <com.google.android.material.card.MaterialCardView android:id="@id/chat_list_item_attachment_card" android:visibility="gone" android:layout_width="0.0dip" android:transitionGroup="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Chat.Embed.CardView">
-        <androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout android:padding="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
             <ImageView android:id="@id/chat_list_item_attachment_icon" android:src="@drawable/ic_file_unknown" android:contentDescription="@string/attachment_filename_unknown" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-            <TextView android:id="@id/chat_list_item_attachment_name" android:lineSpacingMultiplier="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/chat_list_item_attachment_description" app:layout_constraintEnd_toStartOf="@id/chat_list_item_attachment_download" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/chat_list_item_attachment_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Link" />
+            <TextView android:id="@id/chat_list_item_attachment_name" android:lineSpacingMultiplier="1.0" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/chat_list_item_attachment_description" app:layout_constraintEnd_toStartOf="@id/chat_list_item_attachment_download" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/chat_list_item_attachment_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Link" />
             <TextView android:id="@id/chat_list_item_attachment_description" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@id/chat_list_item_attachment_name" app:layout_constraintTop_toBottomOf="@id/chat_list_item_attachment_name" style="@style/UiKit.TextView.Subtext" />
             <ImageView android:id="@id/chat_list_item_attachment_download" android:src="?ic_file_download_opaque" android:contentDescription="@string/download" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
     <androidx.constraintlayout.widget.Barrier android:id="@id/chat_list_item_attachment_barrier" android:layout_width="0.0dip" android:layout_height="0.0dip" app:barrierDirection="end" app:constraint_referenced_ids="chat_list_item_attachment_card,                                        chat_list_item_attachment_inline_media" />
     <FrameLayout android:id="@id/chat_list_item_attachment_spoiler" android:background="?theme_chat_spoiler_bg" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" android:elevation="@dimen/app_elevation" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/chat_list_item_attachment_barrier" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="parent">
-        <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/black_alpha_60" app:cardCornerRadius="@dimen/uikit_spacing_large" app:cardElevation="@dimen/app_elevation">
-            <TextView android:textColor="@color/primary_200" android:layout_gravity="center" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:text="@string/spoiler" android:textAllCaps="true" style="@style/UiKit.TextView.H2" />
+        <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/black_alpha_60" app:cardCornerRadius="16.0dip" app:cardElevation="@dimen/app_elevation">
+            <TextView android:textColor="@color/primary_200" android:layout_gravity="center" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:text="@string/spoiler" android:textAllCaps="true" style="@style/UiKit.TextView.H2" />
         </androidx.cardview.widget.CardView>
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_call.xml b/com.discord/res/layout/widget_chat_list_adapter_item_call.xml
index b81a4e832b..d44310eb3f 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_call.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_call.xml
@@ -2,8 +2,8 @@
 <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginTop="8.0dip" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
-        <ImageView android:id="@id/chat_list_adapter_item_call_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:id="@id/chat_list_adapter_item_call_title" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView" />
+        <ImageView android:id="@id/chat_list_adapter_item_call_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_call_title" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView" />
         <TextView android:textSize="12.0dip" android:id="@id/chat_list_adapter_item_call_subtitle" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/sample_time_pm" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="packed" style="@style/CallMessage.Subtitle" />
         <LinearLayout android:id="@id/chat_list_adapter_item_call_unjoined_ongoing_subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <TextView android:textSize="12.0dip" android:id="@id/chat_list_adapter_item_unjoined_call_duration" android:layout_width="wrap_content" style="@style/CallMessage.Subtitle" />
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml
index 5edbc3ef65..bbcc6ef357 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
+<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ProgressBar android:layout_gravity="center" android:id="@id/chat_list_adapter_item_sticker_lottie_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
     <com.discord.rlottie.RLottieImageView android:id="@id/chat_list_adapter_item_sticker_lottie" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml
index a06bdf3d70..b71838423a 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
+<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_sticker_png" android:layout_width="fill_parent" android:layout_height="fill_parent" />
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml
index 8ca6b7c72d..98fd886187 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml
@@ -3,27 +3,27 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout">
         <View android:id="@id/chat_list_item_embed_divider" android:background="?colorBackgroundModifierAccent" android:layout_width="3.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_image_thumbnail" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_small" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?colorBackgroundPrimary" app:roundedCornerRadius="2.0dip" style="@style/UiKit.ImageView" />
-        <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_item_embed_content" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="parent">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_image_thumbnail" android:visibility="gone" android:layout_margin="4.0dip" android:layout_marginStart="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?colorBackgroundPrimary" app:roundedCornerRadius="2.0dip" style="@style/UiKit.ImageView" />
+        <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_item_embed_content" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="parent">
             <TextView android:textSize="9.5sp" android:textColor="@color/grey_1" android:id="@id/chat_list_item_embed_provider" android:background="?selectableItemBackground" android:visibility="gone" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_author_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" app:layout_constraintBottom_toBottomOf="@id/chat_list_item_embed_author_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_item_embed_author_text" app:placeholderImage="?colorBackgroundPrimary" app:roundedCornerRadius="2.0dip" />
             <TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_marginStart="@dimen/embed_item_margin" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" app:layout_goneMarginTop="0.0dip" style="@style/UiKit.TextView.Semibold" />
             <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?primary_100" android:id="@id/chat_list_item_embed_title" android:background="?selectableItemBackground" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_author_text" style="@style/UiKit.TextView.Semibold" />
             <androidx.constraintlayout.widget.Barrier android:id="@id/chat_list_item_embed_barrier_header" android:layout_width="0.0dip" android:layout_height="0.0dip" app:barrierDirection="bottom" app:constraint_referenced_ids="chat_list_item_embed_title,                                                chat_list_item_embed_author_text,                                                chat_list_item_embed_provider" />
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_item_embed_description" android:background="?selectableItemBackground" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_barrier_header" style="@style/UiKit.TextView" />
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_item_embed_description" android:background="?selectableItemBackground" android:layout_width="wrap_content" android:layout_marginTop="4.0dip" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_barrier_header" style="@style/UiKit.TextView" />
             <LinearLayout android:id="@id/chat_list_item_embed_fields" android:layout_width="fill_parent" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_description" style="@style/UiKit.ViewGroup.LinearLayout" />
             <androidx.constraintlayout.widget.Barrier android:id="@id/chat_list_item_embed_barrier_data" android:layout_width="0.0dip" android:layout_height="0.0dip" app:barrierDirection="bottom" app:constraint_referenced_ids="chat_list_item_embed_barrier_header,                                                chat_list_item_embed_description,                                                chat_list_item_embed_fields" />
-            <RelativeLayout android:id="@id/embed_image_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_margin="@dimen/uikit_spacing_small" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_barrier_data" style="@style/UiKit.ViewGroup">
+            <RelativeLayout android:id="@id/embed_image_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_margin="4.0dip" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_barrier_data" style="@style/UiKit.ViewGroup">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?colorBackgroundModifierAccent" app:roundedCornerRadius="2.0dip" style="@style/UiKit.ImageView" />
-                <ImageView android:id="@id/chat_list_item_embed_image_icons" android:background="@drawable/drawable_circle_primary_900" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:src="@drawable/ic_play_arrow_24dp" android:scaleType="fitXY" android:layout_centerInParent="true" android:contentDescription="@string/sample_empty_string" android:alpha="0.6" app:tint="@color/white" />
+                <ImageView android:id="@id/chat_list_item_embed_image_icons" android:background="@drawable/drawable_circle_primary_900" android:padding="8.0dip" android:visibility="gone" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:src="@drawable/ic_play_arrow_24dp" android:scaleType="fitXY" android:layout_centerInParent="true" android:contentDescription="@string/sample_empty_string" android:alpha="0.6" app:tint="@color/white" />
             </RelativeLayout>
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_footer_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" android:layout_marginEnd="@dimen/embed_item_margin" app:layout_constraintBottom_toBottomOf="@id/chat_list_item_embed_footer_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_item_embed_footer_text" app:placeholderImage="?colorBackgroundPrimary" app:roundedCornerRadius="2.0dip" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_list_item_embed_footer_text" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" android:lineSpacingMultiplier="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_toEndOf="@id/chat_list_item_embed_footer_icon" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/chat_list_item_embed_footer_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_footer_icon" app:layout_constraintTop_toBottomOf="@id/embed_image_container" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.TextView.Semibold" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_list_item_embed_footer_text" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="8.0dip" android:layout_toEndOf="@id/chat_list_item_embed_footer_icon" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/chat_list_item_embed_footer_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_footer_icon" app:layout_constraintTop_toBottomOf="@id/embed_image_container" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.TextView.Semibold" />
         </androidx.constraintlayout.widget.ConstraintLayout>
         <com.discord.widgets.chat.list.InlineMediaView android:id="@id/embed_inline_media" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_min="@dimen/embed_play_button_width" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_min="@dimen/embed_play_button_width" />
         <FrameLayout android:id="@id/chat_list_item_embed_spoiler" android:background="?theme_chat_spoiler_bg" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="parent">
-            <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="@color/black_alpha_60" app:cardCornerRadius="@dimen/uikit_spacing_large">
-                <TextView android:textColor="@color/primary_200" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:text="@string/spoiler" android:textAllCaps="true" style="@style/UiKit.TextView.H2" />
+            <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="@color/black_alpha_60" app:cardCornerRadius="16.0dip">
+                <TextView android:textColor="@color/primary_200" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:text="@string/spoiler" android:textAllCaps="true" style="@style/UiKit.TextView.H2" />
             </androidx.cardview.widget.CardView>
         </FrameLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_embed_field.xml b/com.discord/res/layout/widget_chat_list_adapter_item_embed_field.xml
index 17106f96f4..334007ab3a 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_embed_field.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_embed_field.xml
@@ -2,5 +2,5 @@
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?primary_100" android:id="@id/chat_list_item_embed_field_name" android:layout_width="fill_parent" android:layout_marginTop="@dimen/embed_item_margin" style="@style/UiKit.TextView.Semibold" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_item_embed_field_value" android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_small" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_item_embed_field_value" android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_marginTop="4.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml b/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml
index 853bd19249..8335691fa9 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml
@@ -3,9 +3,9 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/Avatar.Chat" />
     <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toEndOf="@id/chat_list_adapter_item_text_avatar">
-        <TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:layout_marginBottom="@dimen/uikit_spacing_small" android:maxWidth="150.0dip" android:text="@string/sample_user_name" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Large.SingleLine" />
-        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="13.75sp" android:textColor="@color/status_red_500" android:textColorLink="?colorTextLink" android:id="@id/chat_list_adapter_item_text" android:layout_width="fill_parent" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
-        <com.discord.views.FailedUploadList android:id="@id/chat_list_adapter_item_failed_upload_list" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" />
-        <TextView android:textSize="11.0sp" android:textColor="@color/status_red_500" android:id="@id/chat_list_adapter_item_alert_text" android:layout_width="fill_parent" android:layout_marginBottom="@dimen/uikit_spacing_small" android:text="@string/send_message_failure" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableStart="@drawable/ic_alert_circle_16dp" style="@style/UiKit.TextView" />
+        <TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:layout_marginBottom="4.0dip" android:maxWidth="150.0dip" android:text="@string/sample_user_name" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Large.SingleLine" />
+        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="13.75sp" android:textColor="@color/status_red_500" android:textColorLink="?colorTextLink" android:id="@id/chat_list_adapter_item_text" android:layout_width="fill_parent" android:layout_marginBottom="4.0dip" style="@style/UiKit.TextView" />
+        <com.discord.views.FailedUploadList android:id="@id/chat_list_adapter_item_failed_upload_list" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="4.0dip" />
+        <TextView android:textSize="11.0sp" android:textColor="@color/status_red_500" android:id="@id/chat_list_adapter_item_alert_text" android:layout_width="fill_parent" android:layout_marginBottom="4.0dip" android:text="@string/send_message_failure" android:drawablePadding="4.0dip" android:drawableStart="@drawable/ic_alert_circle_16dp" style="@style/UiKit.TextView" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml b/com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml
index e49484e0aa..4ad7a89943 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/uikit_spacing_large" app:cardCornerRadius="4.0dip" app:cardElevation="1.0dip" style="@style/UiKit.Chat.Embed.CardView"
+<androidx.cardview.widget.CardView android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="16.0dip" app:cardCornerRadius="4.0dip" app:cardElevation="1.0dip" style="@style/UiKit.Chat.Embed.CardView"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@id/item_game_invite" style="@style/UiKit.ViewGroup" />
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml b/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml
index d78f60c00b..2ddca6c009 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml
@@ -6,14 +6,14 @@
         <View android:background="?gift_embed_gradient_overlay" android:layout_width="fill_parent" android:layout_height="fill_parent" />
     </FrameLayout>
     <com.discord.app.AppTextView android:id="@id/item_gift_header" android:text="@string/invite_button_resolving" style="@style/UiKit.Chat.Embed.Header" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_gift_image" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_gift_header" app:placeholderImage="?ic_game_icon_placeholder" style="@style/Icon.Game" />
-    <LinearLayout android:id="@id/item_gift_details" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:minHeight="50.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_gift_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_gift_image" app:layout_constraintTop_toBottomOf="@id/item_gift_header" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_gift_name" android:minWidth="150.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Marquee" />
-        <TextView android:id="@id/item_gift_expires" android:layout_marginTop="@dimen/uikit_spacing_small" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.Chat.Embed.Subtext" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_gift_image" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_marginStart="16.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_gift_header" app:placeholderImage="?ic_game_icon_placeholder" style="@style/Icon.Game" />
+    <LinearLayout android:id="@id/item_gift_details" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:minHeight="50.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_gift_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_gift_image" app:layout_constraintTop_toBottomOf="@id/item_gift_header" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_gift_name" android:minWidth="150.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Marquee" />
+        <TextView android:id="@id/item_gift_expires" android:layout_marginTop="4.0dip" android:singleLine="true" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.Chat.Embed.Subtext" />
     </LinearLayout>
     <androidx.constraintlayout.widget.Barrier android:id="@id/barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="item_gift_image,item_gift_details" />
-    <TextView android:id="@id/item_gift_subtext" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_gift_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/item_gift_image" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UiKit.Chat.Embed.Subtext" />
-    <FrameLayout android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_gift_subtext">
+    <TextView android:id="@id/item_gift_subtext" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_gift_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/item_gift_image" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UiKit.Chat.Embed.Subtext" />
+    <FrameLayout android:paddingBottom="8.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_gift_subtext">
         <com.google.android.material.button.MaterialButton android:id="@id/item_gift_cannot_claim_button" android:visibility="gone" android:text="@string/gift_embed_button_claimed" style="@style/UiKit.GiftEmbedDisabledButton" />
         <com.google.android.material.button.MaterialButton android:id="@id/item_gift_accept_button" android:visibility="gone" android:text="@string/gift_embed_button_accept" style="@style/UiKit.Material.Button.Green" />
         <com.google.android.material.button.MaterialButton android:id="@id/item_gift_verify_button" android:visibility="gone" android:text="@string/verify_account" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_gift_subtext" style="@style/UiKit.Material.Button" />
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml b/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml
index 82c24fa291..f39cfb6dde 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/item_listen_together_container" android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.Chat.Embed.Container"
+<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/item_listen_together_container" android:padding="8.0dip" style="@style/UiKit.Chat.Embed.Container"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.discord.app.AppTextView android:id="@id/item_guild_template_header" android:layout_marginTop="0.0dip" android:text="@string/guild_template_resolved_embed_title" android:layout_marginStart="0.0dip" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Chat.Embed.Header" />
-    <ImageView android:id="@id/item_guild_template_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:src="@drawable/ic_template_32dp" android:contentDescription="@string/guild_template_resolved_embed_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_guild_template_header" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_guild_template_name" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_guild_template_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_guild_template_image" app:layout_constraintTop_toBottomOf="@id/item_guild_template_header" style="@style/UiKit.TextView.Marquee" />
+    <ImageView android:id="@id/item_guild_template_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="8.0dip" android:src="@drawable/ic_template_32dp" android:contentDescription="@string/guild_template_resolved_embed_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_guild_template_header" style="@style/UiKit.ImageView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_guild_template_name" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginStart="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_guild_template_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_guild_template_image" app:layout_constraintTop_toBottomOf="@id/item_guild_template_header" style="@style/UiKit.TextView.Marquee" />
     <com.discord.app.AppTextView android:ellipsize="end" android:gravity="center_vertical" android:id="@id/item_guild_template_subtext" android:visibility="visible" android:layout_width="0.0dip" android:maxLines="1" android:singleLine="true" app:layout_constraintEnd_toEndOf="@id/item_guild_template_name" app:layout_constraintStart_toStartOf="@id/item_guild_template_name" app:layout_constraintTop_toBottomOf="@id/item_guild_template_name" app:tv_markdown_enabled="true" style="@style/UiKit.Chat.Embed.Subtext" />
-    <com.google.android.material.button.MaterialButton android:id="@id/item_guild_template_join_button" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/guild_template_open" android:insetBottom="6.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_guild_template_image" style="@style/UiKit.Material.Button.Green" />
+    <com.google.android.material.button.MaterialButton android:id="@id/item_guild_template_join_button" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:text="@string/guild_template_open" android:insetBottom="6.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_guild_template_image" style="@style/UiKit.Material.Button.Green" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_guild_welcome.xml b/com.discord/res/layout/widget_chat_list_adapter_item_guild_welcome.xml
index cedc3695c5..ae6688d743 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_guild_welcome.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_guild_welcome.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/item_guild_welcome_header" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Bold" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/item_guild_welcome_subheader" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/welcome_cta_subtitle_owner" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/item_guild_welcome_header" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView.Bold" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/item_guild_welcome_subheader" android:layout_marginBottom="16.0dip" android:text="@string/welcome_cta_subtitle_owner" style="@style/UiKit.TextView" />
     <com.discord.views.ChatActionItem android:id="@id/welcome_card_invite_friends" android:layout_marginBottom="12.0dip" app:action_item_img_src="@drawable/ic_guild_welcome_add_friend" app:action_item_text="@string/welcome_cta_invite_title" style="@style/UiKit.WelcomeMessageCard" />
     <com.discord.views.ChatActionItem android:id="@id/welcome_card_upload_icon" android:layout_marginBottom="12.0dip" app:action_item_img_src="@drawable/ic_guild_welcome_personalize" app:action_item_text="@string/welcome_cta_personalize_title_mobile" style="@style/UiKit.WelcomeMessageCard" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml b/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml
index 86333d0042..a2e41160a0 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/item_listen_together_container" style="@style/UiKit.Chat.Embed.Container"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.discord.app.AppTextView android:id="@id/item_invite_header" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/invite_button_resolving" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Chat.Embed.Header" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_invite_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_630" />
-    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@id/item_invite_image_text" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:maxLines="1" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_invite_name" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_invite_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView.Marquee" />
-    <androidx.appcompat.widget.AppCompatTextView android:gravity="center_vertical" android:id="@id/item_invite_channel_name" android:visibility="gone" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:drawablePadding="@dimen/uikit_spacing_small" app:drawableStartCompat="@drawable/ic_channel_voice_16dp" app:drawableTint="?colorChannelDefault" app:layout_constraintEnd_toEndOf="@id/item_invite_name" app:layout_constraintStart_toStartOf="@id/item_invite_name" app:layout_constraintTop_toBottomOf="@id/item_invite_name" style="@style/UiKit.Chat.Embed.Subtext" />
-    <LinearLayout android:gravity="center_vertical" android:id="@id/item_invite_member_container" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:minWidth="100.0dip" android:minHeight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_channel_name" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <ImageView android:id="@id/item_invite_online_dot" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_small" android:layout_height="@dimen/uikit_spacing_small" android:src="@drawable/drawable_circle_green" android:contentDescription="@string/instant_invite_guild_members_online" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.ImageView" />
-        <com.discord.app.AppTextView android:id="@id/item_invite_online_text" android:singleLine="true" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Chat.Embed.Subtext" />
-        <ImageView android:id="@id/item_invite_total_member_dot" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_small" android:layout_height="@dimen/uikit_spacing_small" android:src="@drawable/drawable_grey_user_icon" android:contentDescription="@string/instant_invite_guild_members_total" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.ImageView" />
+    <com.discord.app.AppTextView android:id="@id/item_invite_header" android:layout_marginBottom="8.0dip" android:text="@string/invite_button_resolving" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Chat.Embed.Header" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_invite_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_marginStart="16.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_630" />
+    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@id/item_invite_image_text" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="8.0dip" android:maxLines="1" android:singleLine="true" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_invite_name" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_invite_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView.Marquee" />
+    <androidx.appcompat.widget.AppCompatTextView android:gravity="center_vertical" android:id="@id/item_invite_channel_name" android:visibility="gone" android:layout_width="0.0dip" android:layout_marginTop="4.0dip" android:drawablePadding="4.0dip" app:drawableStartCompat="@drawable/ic_channel_voice_16dp" app:drawableTint="?colorChannelDefault" app:layout_constraintEnd_toEndOf="@id/item_invite_name" app:layout_constraintStart_toStartOf="@id/item_invite_name" app:layout_constraintTop_toBottomOf="@id/item_invite_name" style="@style/UiKit.Chat.Embed.Subtext" />
+    <LinearLayout android:gravity="center_vertical" android:id="@id/item_invite_member_container" android:layout_width="0.0dip" android:layout_marginTop="4.0dip" android:minWidth="100.0dip" android:minHeight="16.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_channel_name" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <ImageView android:id="@id/item_invite_online_dot" android:visibility="gone" android:layout_width="4.0dip" android:layout_height="4.0dip" android:src="@drawable/drawable_circle_green" android:contentDescription="@string/instant_invite_guild_members_online" android:layout_marginEnd="4.0dip" style="@style/UiKit.ImageView" />
+        <com.discord.app.AppTextView android:id="@id/item_invite_online_text" android:singleLine="true" android:layout_marginEnd="8.0dip" style="@style/UiKit.Chat.Embed.Subtext" />
+        <ImageView android:id="@id/item_invite_total_member_dot" android:visibility="gone" android:layout_width="4.0dip" android:layout_height="4.0dip" android:src="@drawable/drawable_grey_user_icon" android:contentDescription="@string/instant_invite_guild_members_total" android:layout_marginEnd="4.0dip" style="@style/UiKit.ImageView" />
         <com.discord.app.AppTextView android:id="@id/item_invite_total_member_text" android:singleLine="true" style="@style/UiKit.Chat.Embed.Subtext" />
     </LinearLayout>
-    <FrameLayout android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/join_guild" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_image">
+    <FrameLayout android:paddingBottom="8.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/join_guild" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_image">
         <com.google.android.material.button.MaterialButton android:id="@id/item_invite_joined_button" android:visibility="gone" android:text="@string/joined_guild" style="@style/UiKit.Material.Button.Secondary.Outline" />
         <com.google.android.material.button.MaterialButton android:id="@id/item_invite_join_button" android:text="@string/join_guild" style="@style/UiKit.Material.Button.Green" />
         <com.google.android.material.button.MaterialButton android:id="@id/item_invite_mention_button" android:visibility="gone" android:text="@string/mention" style="@style/UiKit.Material.Button" />
-        <View android:id="@id/item_invite_loading_button" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/mention" style="@style/UiKit.ViewGroup" />
+        <View android:id="@id/item_invite_loading_button" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36.0dip" android:layout_marginTop="8.0dip" android:text="@string/mention" style="@style/UiKit.ViewGroup" />
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_listen_together.xml b/com.discord/res/layout/widget_chat_list_adapter_item_listen_together.xml
index a5192752cb..2d9ee26c0f 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_listen_together.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_listen_together.xml
@@ -2,11 +2,11 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/item_listen_together_container" android:layout_height="@dimen/chat_listen_embed_height" style="@style/UiKit.Chat.Embed.Container"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/item_listen_together_header" style="@style/UiKit.Chat.Embed.Header" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_listen_together_album_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_small" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_listen_together_header" app:roundedCornerRadius="4.0dip" />
-    <TextView android:id="@id/item_listen_together_session_ended" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/invite_embed_listen_has_ended" app:layout_constrainedWidth="true" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_listen_together_header" style="@style/UiKit.TextView.Large.SingleLine" />
-    <TextView android:ellipsize="marquee" android:id="@id/item_listen_together_track" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:marqueeRepeatLimit="marquee_forever" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_listen_together_album_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_listen_together_album_image" app:layout_constraintTop_toBottomOf="@id/item_listen_together_header" style="@style/UiKit.TextView.Large.SingleLine" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_listen_together_album_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="4.0dip" android:layout_marginStart="16.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_listen_together_header" app:roundedCornerRadius="4.0dip" />
+    <TextView android:id="@id/item_listen_together_session_ended" android:visibility="gone" android:layout_margin="16.0dip" android:text="@string/invite_embed_listen_has_ended" app:layout_constrainedWidth="true" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_listen_together_header" style="@style/UiKit.TextView.Large.SingleLine" />
+    <TextView android:ellipsize="marquee" android:id="@id/item_listen_together_track" android:layout_width="0.0dip" android:layout_marginTop="16.0dip" android:marqueeRepeatLimit="marquee_forever" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_listen_together_album_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_listen_together_album_image" app:layout_constraintTop_toBottomOf="@id/item_listen_together_header" style="@style/UiKit.TextView.Large.SingleLine" />
     <TextView android:id="@id/item_listen_together_artist" android:layout_width="0.0dip" app:layout_constraintEnd_toEndOf="@id/item_listen_together_track" app:layout_constraintLeft_toLeftOf="@id/item_listen_together_track" app:layout_constraintRight_toRightOf="@id/item_listen_together_track" app:layout_constraintStart_toStartOf="@id/item_listen_together_track" app:layout_constraintTop_toBottomOf="@id/item_listen_together_track" style="@style/UiKit.TextView.Marquee" />
     <androidx.constraintlayout.widget.Barrier android:id="@id/barrier" android:layout_width="fill_parent" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="item_listen_together_album_image,item_listen_together_artist" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/item_listen_together_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_listen_together_join" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/item_listen_together_join" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/item_listen_together_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="8.0dip" android:layout_marginBottom="16.0dip" android:layout_marginStart="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_listen_together_join" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/item_listen_together_join" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
     <TextView android:id="@id/item_listen_together_join" android:text="@string/invite_embed_join_via_desktop_app" style="@style/UiKit.Chat.Embed.Footer" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml b/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml
index 21edcca779..a7af386d81 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="bottom" android:orientation="vertical" android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <View android:id="@id/chat_list_item_mention_footer_divider" android:layout_width="fill_parent" android:layout_height="0.25dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.Divider" />
-    <TextView android:textSize="13.75sp" android:textColor="?colorTextMuted" android:gravity="center" android:id="@id/chat_list_item_message_header_channel" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/no_recent_mentions" style="@style/UiKit.TextView.Semibold" />
-    <LinearLayout android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="198.0dip" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge">
+    <View android:id="@id/chat_list_item_mention_footer_divider" android:layout_width="fill_parent" android:layout_height="0.25dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.Divider" />
+    <TextView android:textSize="13.75sp" android:textColor="?colorTextMuted" android:gravity="center" android:id="@id/chat_list_item_message_header_channel" android:paddingLeft="8.0dip" android:paddingTop="16.0dip" android:paddingRight="8.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:text="@string/no_recent_mentions" style="@style/UiKit.TextView.Semibold" />
+    <LinearLayout android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="198.0dip" android:layout_marginTop="32.0dip" android:layout_marginBottom="32.0dip">
         <View android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_weight="1.0" />
         <ImageView android:id="@id/chat_list_item_mention_footer_hand" android:layout_width="wrap_content" android:layout_height="198.0dip" android:src="?theme_chat_empty_mentions_hand" />
         <View android:id="@id/tile" android:background="?theme_chat_empty_mentions_arm" android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_weight="1.0" />
     </LinearLayout>
     <com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginBottom="@dimen/chat_cell_horizontal_spacing_padding" android:transitionGroup="true" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip">
-        <LinearLayout android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textColor="@color/status_green_500" android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:text="@string/pinned_messages_pro_tip" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
-            <TextView android:textSize="13.75sp" android:textColor="?colorTextNormal" android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/recent_mentions_pro_tip" style="@style/UiKit.TextView" />
+        <LinearLayout android:padding="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:textColor="@color/status_green_500" android:gravity="center" android:paddingLeft="8.0dip" android:paddingTop="16.0dip" android:paddingRight="8.0dip" android:layout_width="fill_parent" android:text="@string/pinned_messages_pro_tip" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
+            <TextView android:textSize="13.75sp" android:textColor="?colorTextNormal" android:gravity="center" android:paddingLeft="8.0dip" android:paddingTop="8.0dip" android:paddingRight="8.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:text="@string/recent_mentions_pro_tip" style="@style/UiKit.TextView" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml b/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml
index f582aba3d9..ad51533ea2 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml
@@ -2,6 +2,6 @@
 <LinearLayout android:orientation="vertical" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_private_channel_start_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="10.0dip" style="@style/Avatar.Standard" />
-    <com.discord.app.AppTextView android:textAppearance="@style/Markdown.Header1" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_private_channel_start_header" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/unknown_user" style="@style/UiKit.TextView.H1.Bold" />
-    <com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/chat_list_adapter_item_private_channel_start_text" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:text="@string/system_dm_empty_message" style="@style/UiKit.TextView" />
+    <com.discord.app.AppTextView android:textAppearance="@style/Markdown.Header1" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_private_channel_start_header" android:layout_width="fill_parent" android:layout_marginTop="16.0dip" android:text="@string/unknown_user" style="@style/UiKit.TextView.H1.Bold" />
+    <com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/chat_list_adapter_item_private_channel_start_text" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:text="@string/system_dm_empty_message" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_start.xml b/com.discord/res/layout/widget_chat_list_adapter_item_start.xml
index f893571bb4..a709ae075c 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_start.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_start.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_header" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Bold" />
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_header" android:layout_marginBottom="4.0dip" style="@style/UiKit.TextView.Bold" />
     <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/chat_list_adapter_item_subheader" android:text="@string/welcome_message_subtitle_channel" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextLink" android:id="@id/chat_list_adapter_item_edit_channel" android:focusable="true" android:clickable="true" android:layout_marginTop="12.0dip" android:text="@string/edit_channel" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml
index faeca571f7..5b54210c31 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml
@@ -8,5 +8,5 @@
         <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_tag" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1.0dip" android:text="TAG" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_tag" style="@style/UiKit.TextView" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginBottom="2.0dip" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="2.0dip" android:layout_marginBottom="2.0dip" android:layout_marginEnd="4.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_upload_progress.xml b/com.discord/res/layout/widget_chat_list_adapter_item_upload_progress.xml
index dfadbf4023..775844ce64 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_upload_progress.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_upload_progress.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="horizontal" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:baselineAligned="false" style="@style/UiKit.Chat.Embed.Container"
+<LinearLayout android:orientation="horizontal" android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:baselineAligned="false" style="@style/UiKit.Chat.Embed.Container"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0.05" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0.05" android:layout_marginEnd="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.discord.views.UploadProgressView android:id="@id/upload_progress_1" android:layout_width="fill_parent" android:layout_height="wrap_content" />
         <com.discord.views.UploadProgressView android:id="@id/upload_progress_2" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
         <com.discord.views.UploadProgressView android:id="@id/upload_progress_3" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>
     <FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="0.9">
-        <ImageView android:id="@id/progress_cancel_top" android:background="?selectableItemBackground" android:layout_width="18.0dip" android:layout_height="18.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:src="@drawable/ic_close_primary_200_24dp" android:contentDescription="@string/cancel" />
+        <ImageView android:id="@id/progress_cancel_top" android:background="?selectableItemBackground" android:layout_width="18.0dip" android:layout_height="18.0dip" android:layout_marginTop="4.0dip" android:src="@drawable/ic_close_primary_200_24dp" android:contentDescription="@string/cancel" />
         <ImageView android:layout_gravity="center_vertical" android:id="@id/progress_cancel_centered" android:background="?selectableItemBackground" android:layout_width="18.0dip" android:layout_height="18.0dip" android:src="@drawable/ic_close_primary_200_24dp" android:contentDescription="@string/cancel" />
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_overlay.xml b/com.discord/res/layout/widget_chat_overlay.xml
index a3f544bf01..f9eedc595c 100644
--- a/com.discord/res/layout/widget_chat_overlay.xml
+++ b/com.discord/res/layout/widget_chat_overlay.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:animateLayoutChanges="true"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/chat_overlay_old_messages_fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_large" android:src="@drawable/ic_arrow_down" android:backgroundTint="?colorBackgroundTertiary" app:borderWidth="0.0dip" app:fabSize="mini" app:layout_constraintBottom_toTopOf="@id/chat_overlay_typing" app:layout_constraintRight_toRightOf="parent" app:tint="?colorInteractiveNormal" />
-    <RelativeLayout android:gravity="center_vertical" android:id="@id/chat_overlay_typing" android:background="?primary_630" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_typing_indicator_height" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" style="@style/UiKit.ViewGroup">
-        <com.discord.views.typing.TypingDots android:id="@id/chat_overlay_typing_dots" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="fill_parent" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/chat_typing_users_typing" android:layout_width="wrap_content" android:layout_height="@dimen/uikit_typing_indicator_height" android:maxLines="1" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_toEndOf="@id/chat_overlay_typing_dots" style="@style/UiKit.TextView" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/chat_overlay_old_messages_fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16.0dip" android:src="@drawable/ic_arrow_down" android:contentDescription="@string/jump_to_present" android:backgroundTint="?colorBackgroundTertiary" app:borderWidth="0.0dip" app:fabSize="mini" app:layout_constraintBottom_toTopOf="@id/chat_overlay_typing" app:layout_constraintRight_toRightOf="parent" app:tint="?colorInteractiveNormal" />
+    <RelativeLayout android:gravity="center_vertical" android:id="@id/chat_overlay_typing" android:background="?primary_630" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_typing_indicator_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" app:layout_constraintBottom_toBottomOf="parent" style="@style/UiKit.ViewGroup">
+        <com.discord.views.typing.TypingDots android:id="@id/chat_overlay_typing_dots" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_width="wrap_content" android:layout_height="fill_parent" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/chat_typing_users_typing" android:layout_width="wrap_content" android:layout_height="@dimen/uikit_typing_indicator_height" android:maxLines="1" android:layout_marginStart="8.0dip" android:layout_toEndOf="@id/chat_overlay_typing_dots" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="end|center" android:id="@id/chat_typing_users_slowmode" android:layout_width="wrap_content" android:layout_height="@dimen/uikit_typing_indicator_height" android:maxLines="1" android:layout_toStartOf="@id/chat_typing_users_slowmode_icon" android:layout_toEndOf="@id/chat_typing_users_typing" style="@style/UiKit.TextView" />
-        <ImageView android:id="@id/chat_typing_users_slowmode_icon" android:src="?ic_slowmode_timer" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_small" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
+        <ImageView android:id="@id/chat_typing_users_slowmode_icon" android:src="?ic_slowmode_timer" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="4.0dip" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_connections_add_xbox.xml b/com.discord/res/layout/widget_connections_add_xbox.xml
index 923aa241f7..76b6fe1bcc 100644
--- a/com.discord/res/layout/widget_connections_add_xbox.xml
+++ b/com.discord/res/layout/widget_connections_add_xbox.xml
@@ -7,14 +7,14 @@
     <RelativeLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout">
         <LinearLayout android:gravity="center" android:layout_centerInParent="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <LinearLayout style="@style/UiKit.AuthCopyContainer">
-                <TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/xbox_authorization_title" style="@style/UiKit.TextView.H1" />
-                <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/connection_enter_code" style="@style/UiKit.TextView.Subtext" />
+                <TextView android:layout_marginTop="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/xbox_authorization_title" style="@style/UiKit.TextView.H1" />
+                <TextView android:layout_marginBottom="8.0dip" android:text="@string/connection_enter_code" style="@style/UiKit.TextView.Subtext" />
             </LinearLayout>
-            <com.discord.views.CodeVerificationView android:id="@id/connections_xbox_code" android:layout_marginTop="@dimen/uikit_spacing_large" app:cvv_character_input_type="alphanumeric" style="@style/UiKit.ViewGroup" />
+            <com.discord.views.CodeVerificationView android:id="@id/connections_xbox_code" android:layout_marginTop="16.0dip" app:cvv_character_input_type="alphanumeric" style="@style/UiKit.ViewGroup" />
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@id/connections_xbox_login" android:background="?primary_500" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_medium" android:foreground="?selectableItemBackground" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <TextView android:textColor="?primary_300" android:text="@string/connection_login_with" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-            <ImageView android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:src="@drawable/ic_account_microsoft" style="@style/UiKit.ImageView" />
+        <LinearLayout android:gravity="center" android:id="@id/connections_xbox_login" android:background="?primary_500" android:padding="8.0dip" android:layout_margin="8.0dip" android:foreground="?selectableItemBackground" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <TextView android:textColor="?primary_300" android:text="@string/connection_login_with" android:layout_marginEnd="8.0dip" style="@style/UiKit.TextView" />
+            <ImageView android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:src="@drawable/ic_account_microsoft" style="@style/UiKit.ImageView" />
         </LinearLayout>
     </RelativeLayout>
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
diff --git a/com.discord/res/layout/widget_create_channel.xml b/com.discord/res/layout/widget_create_channel.xml
index da96457019..9137d97c00 100644
--- a/com.discord/res/layout/widget_create_channel.xml
+++ b/com.discord/res/layout/widget_create_channel.xml
@@ -6,7 +6,7 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/AppTheme.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/create_channel_name_layout" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/form_label_channel_name" style="@style/UiKit.TextInputLayout.Primary">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/create_channel_name_layout" android:layout_margin="16.0dip" android:hint="@string/form_label_channel_name" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:maxLength="100" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
             </com.google.android.material.textfield.TextInputLayout>
             <View style="@style/UiKit.Settings.Divider" />
diff --git a/com.discord/res/layout/widget_debugging_adapter_item.xml b/com.discord/res/layout/widget_debugging_adapter_item.xml
index 39a18482f6..0dc6b67cc1 100644
--- a/com.discord/res/layout/widget_debugging_adapter_item.xml
+++ b/com.discord/res/layout/widget_debugging_adapter_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:ellipsize="end" android:id="@id/debugging_item_log_message" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:maxLines="2" style="@style/UiKit.TextView" />
+    <TextView android:ellipsize="end" android:id="@id/debugging_item_log_message" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:maxLines="2" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_disable_delete_account_dialog.xml b/com.discord/res/layout/widget_disable_delete_account_dialog.xml
index b6b510dca4..d13e79ea84 100644
--- a/com.discord/res/layout/widget_disable_delete_account_dialog.xml
+++ b/com.discord/res/layout/widget_disable_delete_account_dialog.xml
@@ -2,11 +2,11 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/disable_delete_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/disable_account" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:id="@id/disable_delete_header" android:padding="16.0dip" android:text="@string/disable_account" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textSize="14.0dip" android:id="@id/disable_delete_body" style="@style/UiKit.TextView" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/disable_delete_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Primary.Password">
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password" />
@@ -19,6 +19,6 @@
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="?primary_100" android:id="@id/disable_delete_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
-        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/disable_delete_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/disable" app:lb_text_color="@drawable/button_text_color_primary_100" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/disable_delete_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/disable" app:lb_text_color="@drawable/button_text_color_primary_100" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_edit_role.xml b/com.discord/res/layout/widget_edit_role.xml
index a2cdee3665..e00fe6e19e 100644
--- a/com.discord/res/layout/widget_edit_role.xml
+++ b/com.discord/res/layout/widget_edit_role.xml
@@ -15,9 +15,9 @@
             </FrameLayout>
             <View style="@style/UiKit.Settings.Divider" />
             <TextView android:text="@string/form_label_role_color" style="@style/UiKit.Settings.Item.Header" />
-            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge">
-                <TextView android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/form_label_role_color" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" android:elevation="2.0dip" />
+            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="64.0dip">
+                <TextView android:layout_margin="16.0dip" android:text="@string/form_label_role_color" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
+                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_margin="16.0dip" android:layout_alignParentEnd="true" android:elevation="2.0dip" />
                 <View android:id="@id/role_settings_color_disabled_overlay" android:background="@color/white_alpha_30" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
             </RelativeLayout>
             <View style="@style/UiKit.Settings.Divider" />
diff --git a/com.discord/res/layout/widget_emoji_picker.xml b/com.discord/res/layout/widget_emoji_picker.xml
index 35c7d5e8f0..ac36c9d248 100644
--- a/com.discord/res/layout/widget_emoji_picker.xml
+++ b/com.discord/res/layout/widget_emoji_picker.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/emoji_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
-            <RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
+            <RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
                 <TextView android:gravity="center_vertical" android:id="@id/emoji_inline_search_button" android:background="?bg_pressed_highlight" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
                 <com.google.android.material.textfield.TextInputEditText android:id="@id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
                 <ImageView android:id="@id/emoji_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_emoji" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
@@ -12,10 +12,10 @@
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="16.0dip" style="@style/UiKit.TextView" />
     </com.discord.app.AppViewFlipper>
     <View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:elevation="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@id/emoji_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
         <androidx.constraintlayout.widget.Barrier android:id="@id/emoji_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="emoji_picker_unicode_emoji_shortcut_button,emoji_picker_backspace_icon" />
         <ImageView android:id="@id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@id/emoji_picker_category_barrier" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
diff --git a/com.discord/res/layout/widget_enable_sms_backup_dialog.xml b/com.discord/res/layout/widget_enable_sms_backup_dialog.xml
index a124f900df..84186e198d 100644
--- a/com.discord/res/layout/widget_enable_sms_backup_dialog.xml
+++ b/com.discord/res/layout/widget_enable_sms_backup_dialog.xml
@@ -2,12 +2,12 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/enable_sms_backup_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/mfa_sms_auth" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:id="@id/enable_sms_backup_header" android:padding="16.0dip" android:text="@string/mfa_sms_auth" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:id="@id/enable_sms_backup_body" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:id="@id/enable_sms_backup_body" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/enable_sms_backup_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Primary.Password">
                 <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password" />
             </com.google.android.material.textfield.TextInputLayout>
@@ -16,6 +16,6 @@
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="?primary_100" android:id="@id/enable_sms_backup_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
-        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/enable_sms_backup_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_background_color="@color/status_green_500" app:lb_progress_color="@color/white" app:lb_text="@string/enable" app:lb_text_color="@drawable/button_text_color_primary_100" />
+        <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/enable_sms_backup_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" app:lb_background_color="@color/status_green_500" app:lb_progress_color="@color/white" app:lb_text="@string/enable" app:lb_text_color="@drawable/button_text_color_primary_100" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_enable_two_factor_password_dialog.xml b/com.discord/res/layout/widget_enable_two_factor_password_dialog.xml
index 72526aac43..d68e1bfff2 100644
--- a/com.discord/res/layout/widget_enable_two_factor_password_dialog.xml
+++ b/com.discord/res/layout/widget_enable_two_factor_password_dialog.xml
@@ -2,13 +2,13 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/enable_two_factor_password_header_container" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/enable_two_factor_password_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/two_fa_enable" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:id="@id/enable_two_factor_password_header" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/two_fa_enable" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
         <LinearLayout android:gravity="center" android:id="@id/enable_two_factor_password_body_container" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:layout_gravity="start" android:id="@id/enable_two_factor_password_body_text" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/user_settings_edit_account_password_label" android:textAlignment="textStart" style="@style/UiKit.TextView" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/enable_two_factor_password_view_input" android:layout_margin="@dimen/uikit_spacing_medium" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Primary">
+            <TextView android:layout_gravity="start" android:id="@id/enable_two_factor_password_body_text" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/user_settings_edit_account_password_label" android:textAlignment="textStart" style="@style/UiKit.TextView" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/enable_two_factor_password_view_input" android:layout_margin="8.0dip" android:hint="@string/form_label_password" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
@@ -16,6 +16,6 @@
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:id="@id/enable_two_factor_password_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="?buttonBarNegativeButtonStyle" />
-        <com.discord.views.LoadingButton android:id="@id/enable_two_factor_password_ok" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/confirm" />
+        <com.discord.views.LoadingButton android:id="@id/enable_two_factor_password_ok" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" app:lb_progress_color="@color/white" app:lb_text="@string/confirm" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_expression_tray.xml b/com.discord/res/layout/widget_expression_tray.xml
index f1af821b8d..4d3ae624c1 100644
--- a/com.discord/res/layout/widget_expression_tray.xml
+++ b/com.discord/res/layout/widget_expression_tray.xml
@@ -13,9 +13,9 @@
                             <TextView android:id="@id/expression_tray_gif_button" android:text="@string/gif" style="@style/ExpressionTrayTab" />
                         </androidx.cardview.widget.CardView>
                     </LinearLayout>
-                    <com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
-                        <TextView android:gravity="center_vertical" android:id="@id/expression_tray_search_button" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
-                        <ImageView android:id="@id/expression_tray_search_icon" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" />
+                    <com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
+                        <TextView android:gravity="center_vertical" android:id="@id/expression_tray_search_button" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
+                        <ImageView android:id="@id/expression_tray_search_icon" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" />
                     </com.discord.utilities.view.rounded.RoundedRelativeLayout>
                 </LinearLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/com.discord/res/layout/widget_feedback_sheet.xml b/com.discord/res/layout/widget_feedback_sheet.xml
index 515ef3739c..78df5a93b0 100644
--- a/com.discord/res/layout/widget_feedback_sheet.xml
+++ b/com.discord/res/layout/widget_feedback_sheet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:id="@id/feedback_sheet_container" android:background="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <FrameLayout android:background="?colorBackgroundTertiary" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:id="@id/feedback_sheet_title" android:text="@string/call_feedback_sheet_title" style="@style/UiKit.ListItem.Icon" />
-            <ImageView android:layout_gravity="end|center" android:id="@id/feedback_sheet_close_button" android:padding="@dimen/uikit_spacing_large" android:src="?ic_close_24dp" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="end|center" android:id="@id/feedback_sheet_close_button" android:padding="16.0dip" android:src="?ic_close_24dp" style="@style/UiKit.ImageView" />
         </FrameLayout>
         <com.discord.widgets.voice.feedback.FeedbackView android:id="@id/feedback_sheet_feedback_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_friends_add_by_id.xml b/com.discord/res/layout/widget_friends_add_by_id.xml
index d395226c3e..8a6b9c63b9 100644
--- a/com.discord/res/layout/widget_friends_add_by_id.xml
+++ b/com.discord/res/layout/widget_friends_add_by_id.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:scrollbars="none" style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:gravity="center" android:id="@id/friends_add_container" android:background="?colorBackgroundPrimary" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:gravity="center" android:id="@id/friends_add_container" android:background="?colorBackgroundPrimary" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_save_your_group" android:contentDescription="@string/sample_empty_string" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_by_id_title" style="@style/UiKit.TextView" />
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/add_by_id_body" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-        <LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/friends_add_text_edit_wrap" android:layout_marginBottom="@dimen/uikit_spacing_small" android:hint="@string/username_and_tag" style="@style/UiKit.TextInputLayout">
+        <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="32.0dip" android:text="@string/add_by_id_title" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="8.0dip" android:text="@string/add_by_id_body" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+        <LinearLayout android:layout_marginTop="32.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/friends_add_text_edit_wrap" android:layout_marginBottom="4.0dip" android:hint="@string/username_and_tag" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/friend_add_username_indicator" android:layout_marginTop="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-        <com.google.android.material.button.MaterialButton android:enabled="false" android:ellipsize="end" android:id="@id/friends_add_send" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/add_friend_add_manually" style="@style/FriendsAdd.Button" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/friend_add_username_indicator" android:layout_marginTop="8.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+        <com.google.android.material.button.MaterialButton android:enabled="false" android:ellipsize="end" android:id="@id/friends_add_send" android:layout_marginTop="16.0dip" android:text="@string/add_friend_add_manually" style="@style/FriendsAdd.Button" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml b/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml
index da707950db..0079173b61 100644
--- a/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml
+++ b/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml
@@ -8,7 +8,7 @@
         <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@id/friends_list_item_activity" android:text="@string/sample_user_presence" style="@style/FriendsList.FriendsItem.Activity" />
     </LinearLayout>
     <LinearLayout android:id="@id/friends_list_item_buttons_wrap" style="@style/FriendsList.FriendsItem.ButtonsWrap">
-        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_call_button" android:contentDescription="@string/call" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:srcCompat="@drawable/ic_user_profile_action_call_white_24dp" app:tint="?colorInteractiveNormal" style="@style/FriendsList.FriendsItem.ActionButton" />
-        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_chat_button" android:contentDescription="@string/dm" android:layout_marginStart="@dimen/uikit_spacing_medium" app:srcCompat="@drawable/ic_user_profile_action_message_white_24dp" app:tint="?colorInteractiveNormal" style="@style/FriendsList.FriendsItem.ActionButton" />
+        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_call_button" android:contentDescription="@string/call" android:layout_marginEnd="8.0dip" app:srcCompat="@drawable/ic_user_profile_action_call_white_24dp" app:tint="?colorInteractiveNormal" style="@style/FriendsList.FriendsItem.ActionButton" />
+        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_chat_button" android:contentDescription="@string/dm" android:layout_marginStart="8.0dip" app:srcCompat="@drawable/ic_user_profile_action_message_white_24dp" app:tint="?colorInteractiveNormal" style="@style/FriendsList.FriendsItem.ActionButton" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml b/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml
index f5de4d2da8..91167d25e7 100644
--- a/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml
+++ b/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml
@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="48.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View android:id="@id/blank_item_avatar_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/FriendsList.FriendsItem.Avatar" />
-    <View android:id="@id/blank_item_username_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="0.0dip" android:layout_height="16.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/blank_item_avatar_placeholder" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="0.7" />
+    <View android:id="@id/blank_item_username_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="0.0dip" android:layout_height="16.0dip" android:layout_marginStart="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/blank_item_avatar_placeholder" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="0.7" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_friends_list_adapter_item_pending.xml b/com.discord/res/layout/widget_friends_list_adapter_item_pending.xml
index 20f2cc27ca..b86be631eb 100644
--- a/com.discord/res/layout/widget_friends_list_adapter_item_pending.xml
+++ b/com.discord/res/layout/widget_friends_list_adapter_item_pending.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout style="@style/FriendsList.FriendsItem"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/friends_list_item_avatar" style="@style/FriendsList.FriendsItem.Avatar" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/friends_list_item_avatar" android:importantForAccessibility="no" style="@style/FriendsList.FriendsItem.Avatar" />
     <com.discord.views.StatusView android:id="@id/friends_list_item_status" android:layout_alignBottom="@id/friends_list_item_avatar" android:layout_alignEnd="@id/friends_list_item_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="4.0dip" style="@style/FriendsList.FriendsItem.Status" />
     <LinearLayout android:id="@id/friends_list_item_text" android:layout_toStartOf="@id/friends_list_item_buttons_wrap" android:layout_toEndOf="@id/friends_list_item_avatar" style="@style/FriendsList.FriendsItem.Text">
         <TextView android:id="@id/friends_list_item_name" android:text="@string/sample_user_name" style="@style/FriendsList.FriendsItem.Name" />
         <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@id/friends_list_item_activity" android:text="@string/sample_user_presence" style="@style/FriendsList.FriendsItem.Activity" />
     </LinearLayout>
     <LinearLayout android:id="@id/friends_list_item_buttons_wrap" style="@style/FriendsList.FriendsItem.ButtonsWrap">
-        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_accept_button" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/FriendsList.FriendsItem.ActionButton" />
-        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_decline_button" android:layout_marginStart="@dimen/uikit_spacing_medium" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/FriendsList.FriendsItem.ActionButton" />
+        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_accept_button" android:layout_marginEnd="8.0dip" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/FriendsList.FriendsItem.ActionButton" />
+        <androidx.appcompat.widget.AppCompatImageView android:id="@id/friends_list_item_decline_button" android:layout_marginStart="8.0dip" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/FriendsList.FriendsItem.ActionButton" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_friends_nearby.xml b/com.discord/res/layout/widget_friends_nearby.xml
index 29923f6217..c279437d54 100644
--- a/com.discord/res/layout/widget_friends_nearby.xml
+++ b/com.discord/res/layout/widget_friends_nearby.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.discord.rlottie.RLottieImageView android:id="@id/nearby_friends_searching_lottie" android:layout_width="wrap_content" android:layout_height="wrap_content" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/nearby_friends_searching_title" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_title" style="@style/UiKit.TextView" />
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/nearby_friends_searching_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/add_friend_nearby_body" style="@style/UiKit.TextView" />
-        <TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="center" android:id="@id/nearby_friends_learn_more" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/learn_more" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Link" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@id/nearby_friends_enable" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/FriendsAdd.Button" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/nearby_friends_searching_title" android:layout_marginTop="32.0dip" android:text="@string/add_friend_nearby_title" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/nearby_friends_searching_body" android:layout_marginTop="8.0dip" android:text="@string/add_friend_nearby_body" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="center" android:id="@id/nearby_friends_learn_more" android:padding="4.0dip" android:layout_marginTop="4.0dip" android:text="@string/learn_more" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Link" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginTop="32.0dip" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@id/nearby_friends_enable" android:layout_marginTop="32.0dip" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/FriendsAdd.Button" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_gif_picker.xml b/com.discord/res/layout/widget_gif_picker.xml
index b39e3f1491..32348ad85e 100644
--- a/com.discord/res/layout/widget_gif_picker.xml
+++ b/com.discord/res/layout/widget_gif_picker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:id="@id/gif_picker_container" android:background="?colorBackgroundSecondary" android:paddingStart="12.0dip" android:paddingEnd="12.0dip" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/gif_picker_category_recycler" android:paddingTop="@dimen/uikit_spacing_small" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/gif_picker_category_recycler" android:paddingTop="4.0dip" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
     <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@id/gif_picker_loading_view" android:paddingTop="12.0dip" android:layout_height="fill_parent" app:glv_is_staggered="false" style="@style/UiKit.ViewGroup.RecyclerView" />
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_gif_picker_search.xml b/com.discord/res/layout/widget_gif_picker_search.xml
index 2e9c996520..29b854ea7f 100644
--- a/com.discord/res/layout/widget_gif_picker_search.xml
+++ b/com.discord/res/layout/widget_gif_picker_search.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar android:id="@id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
-            <RelativeLayout android:id="@id/gif_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:backgroundTint="?colorBackgroundTertiary">
+            <RelativeLayout android:id="@id/gif_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="16.0dip" android:backgroundTint="?colorBackgroundTertiary">
                 <com.google.android.material.textfield.TextInputEditText android:id="@id/gif_search_input" android:background="@null" android:visibility="visible" android:layout_height="wrap_content" android:hint="@string/search_tenor" style="@style/ExpressionSearchInput" />
                 <ImageView android:id="@id/gif_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/reset" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
             </RelativeLayout>
diff --git a/com.discord/res/layout/widget_global_search.xml b/com.discord/res/layout/widget_global_search.xml
index fd28e9d48a..93f2d6ff5c 100644
--- a/com.discord/res/layout/widget_global_search.xml
+++ b/com.discord/res/layout/widget_global_search.xml
@@ -10,20 +10,20 @@
         <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_guild_list" style="@style/UiKit.GuildsList.Horiz" />
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/global_search_view_flipper" android:background="?colorBackgroundPrimary" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
-            <LinearLayout android:gravity="center_horizontal" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="8.0dip" android:paddingBottom="64.0dip" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.cardview.widget.CardView android:layout_margin="16.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
+            <LinearLayout android:gravity="center_horizontal" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <ImageView android:src="@drawable/img_quick_switcher_empty" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-                <TextView android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" style="@style/UiKit.TextView" />
+                <TextView android:layout_margin="16.0dip" android:text="@string/quickswitcher_tutorial_message_search" style="@style/UiKit.TextView" />
             </LinearLayout>
         </androidx.cardview.widget.CardView>
         <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
-            <androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
-                <LinearLayout android:gravity="center_horizontal" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <androidx.cardview.widget.CardView android:layout_margin="16.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
+                <LinearLayout android:gravity="center_horizontal" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                     <ImageView android:src="?img_empty_search" android:contentDescription="@string/search_no_results" style="@style/UiKit.ImageView.HideInLandscape" />
                     <TextView android:drawableTop="@null" style="@style/UiKit.TextView.NoResults" />
-                    <View android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.Divider" />
-                    <TextView android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/other_options" style="@style/UiKit.TextView.H2" />
+                    <View android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" style="@style/UiKit.Divider" />
+                    <TextView android:layout_margin="8.0dip" android:text="@string/other_options" style="@style/UiKit.TextView.H2" />
                     <com.google.android.material.button.MaterialButton android:id="@id/global_search_add_a_friend_btn" android:text="@string/add_friend" style="@style/UiKit.Material.Button" />
                     <com.google.android.material.button.MaterialButton android:id="@id/global_search_join_guild_btn" android:text="@string/join_server_button_cta" style="@style/UiKit.Material.Button" />
                 </LinearLayout>
diff --git a/com.discord/res/layout/widget_group_invite_friends.xml b/com.discord/res/layout/widget_group_invite_friends.xml
index ab2bccdd52..08e10805e0 100644
--- a/com.discord/res/layout/widget_group_invite_friends.xml
+++ b/com.discord/res/layout/widget_group_invite_friends.xml
@@ -4,7 +4,7 @@
     <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
         <RelativeLayout android:id="@id/group_invite_friends_recipients_container" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <TextView android:textColor="?primary_100" android:id="@id/group_invite_friends_text_to" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/group_dm_invite_to" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_100" android:id="@id/group_invite_friends_text_to" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/group_dm_invite_to" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView" />
             <com.discord.utilities.view.chips.ChipsView android:id="@id/group_invite_friends_chips" android:layout_width="fill_parent" android:layout_height="wrap_content" android:overScrollMode="never" android:layout_toEndOf="@id/group_invite_friends_text_to" app:cv_bg_color="?primary_630" app:cv_bg_color_clicked="?primary_700" app:cv_chip_layout="@layout/view_chip" app:cv_color="?primary_630" app:cv_color_clicked="?primary_700" app:cv_max_height="120.0dip" app:cv_search_text_color="?primary_300" app:cv_search_text_size="@dimen/uikit_textsize_medium" app:cv_text_color="?primary_300" app:cv_text_color_clicked="?primary_300" app:cv_vertical_spacing="6.0dip" />
             <View android:layout_alignParentBottom="true" style="@style/UiKit.Divider" />
         </RelativeLayout>
@@ -14,7 +14,7 @@
         <TextView android:text="@string/group_dm_invite_empty" android:drawableTop="@drawable/asset_no_results_light" style="@style/UiKit.TextView.NoResults" />
         <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/group_dm_invite_full_main" android:drawableTop="@drawable/asset_group_full" style="@style/UiKit.TextView.NoResults" />
-            <TextView android:gravity="center" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/group_dm_invite_full_sub" style="@style/UiKit.TextView.Semibold" />
+            <TextView android:gravity="center" android:layout_margin="8.0dip" android:text="@string/group_dm_invite_full_sub" style="@style/UiKit.TextView.Semibold" />
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/group_invite_friends_save_fab" android:src="@drawable/ic_send_white_24dp" style="@style/Settings.FloatingActionButton" />
diff --git a/com.discord/res/layout/widget_group_invite_friends_item.xml b/com.discord/res/layout/widget_group_invite_friends_item.xml
index 7dd93410a6..9856c7e3d8 100644
--- a/com.discord/res/layout/widget_group_invite_friends_item.xml
+++ b/com.discord/res/layout/widget_group_invite_friends_item.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:id="@id/friend_container" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
-        <RelativeLayout android:id="@id/friends_list_item_avatar_wrap" android:clipChildren="false" android:layout_width="34.0dip" android:layout_height="34.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_centerVertical="true">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/friends_list_item_avatar" style="@style/Avatar.Standard" />
+    <RelativeLayout android:id="@id/friend_container" android:background="?selectableItemBackground" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout">
+        <RelativeLayout android:id="@id/friends_list_item_avatar_wrap" android:clipChildren="false" android:layout_width="34.0dip" android:layout_height="34.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="2.0dip" android:layout_marginRight="16.0dip" android:layout_centerVertical="true">
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/friends_list_item_avatar" android:importantForAccessibility="no" style="@style/Avatar.Standard" />
             <com.discord.views.StatusView android:id="@id/friends_list_item_status" android:layout_width="14.0dip" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="2.0dip" />
         </RelativeLayout>
         <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@id/user_selected_checkbox" android:layout_toEndOf="@id/friends_list_item_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textColor="?primary_100" android:id="@id/friends_list_item_name" android:text="@string/sample_user_name" android:singleLine="true" style="@style/UiKit.TextView" />
-            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/friends_list_item_game" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:text="@string/sample_user_presence" android:singleLine="true" style="@style/UiKit.TextView" />
+            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/friends_list_item_game" android:layout_marginTop="2.0dip" android:text="@string/sample_user_presence" android:singleLine="true" style="@style/UiKit.TextView" />
         </LinearLayout>
         <CheckBox android:id="@id/user_selected_checkbox" android:clickable="false" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" app:buttonTint="@color/purple_brand" style="@style/UiKit.Checkbox" />
     </RelativeLayout>
diff --git a/com.discord/res/layout/widget_guild_actions_add.xml b/com.discord/res/layout/widget_guild_actions_add.xml
index e822ea3664..27fb911f9c 100644
--- a/com.discord/res/layout/widget_guild_actions_add.xml
+++ b/com.discord/res/layout/widget_guild_actions_add.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <FrameLayout android:id="@id/guild_actions_add_create" android:background="?colorPrimaryBg" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
+    <FrameLayout android:id="@id/guild_actions_add_create" android:background="?colorPrimaryBg" android:layout_margin="8.0dip" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup">
         <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:layout_width="0.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_weight="1.0" android:layout_marginStart="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/create_server_button_cta" style="@style/UiKit.TextView.H1" />
-                <TextView android:textColor="?primary_300" android:ellipsize="end" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
+                <TextView android:textColor="?primary_300" android:ellipsize="end" android:layout_marginTop="8.0dip" android:text="@string/create_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
             </LinearLayout>
-            <ImageView android:src="?ic_navigate_next" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
+            <ImageView android:src="?ic_navigate_next" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" style="@style/UiKit.ImageView" />
         </LinearLayout>
     </FrameLayout>
-    <FrameLayout android:id="@id/guild_actions_add_join" android:background="?colorPrimaryBg" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
+    <FrameLayout android:id="@id/guild_actions_add_join" android:background="?colorPrimaryBg" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
         <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:layout_width="0.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_weight="1.0" android:layout_marginStart="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/join_server_button_cta" style="@style/UiKit.TextView.H1" />
-                <TextView android:textColor="?primary_300" android:ellipsize="end" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
+                <TextView android:textColor="?primary_300" android:ellipsize="end" android:layout_marginTop="8.0dip" android:text="@string/join_server_button_cta_mobile_desc" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
             </LinearLayout>
-            <ImageView android:src="?ic_navigate_next" android:contentDescription="@string/coming_soon" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
+            <ImageView android:src="?ic_navigate_next" android:contentDescription="@string/coming_soon" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" style="@style/UiKit.ImageView" />
         </LinearLayout>
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_call_onboarding.xml b/com.discord/res/layout/widget_guild_call_onboarding.xml
index 8f53168fd9..a2901beb60 100644
--- a/com.discord/res/layout/widget_guild_call_onboarding.xml
+++ b/com.discord/res/layout/widget_guild_call_onboarding.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/nuf_voice_channels_description" app:stv_title="@string/nuf_voice_channels_title" />
-        <ImageView android:layout_width="280.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_voice_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit.ImageView" />
+    <LinearLayout android:gravity="center_horizontal" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" app:stv_subtitle="@string/nuf_voice_channels_description" app:stv_title="@string/nuf_voice_channels_title" />
+        <ImageView android:layout_width="280.0dip" android:layout_marginBottom="24.0dip" android:src="@drawable/img_voice_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit.ImageView" />
         <com.discord.views.JoinVoiceChannelButton android:id="@id/guild_call_onboarding_connect" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Material.Button" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_clone.xml b/com.discord/res/layout/widget_guild_clone.xml
index 10062c3478..a3ec7cb6b6 100644
--- a/com.discord/res/layout/widget_guild_clone.xml
+++ b/com.discord/res/layout/widget_guild_clone.xml
@@ -7,39 +7,39 @@
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <com.discord.app.AppViewFlipper android:id="@id/guild_create_flipper" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
             <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_resolving_title" style="@style/UiKit.TextView.H2" />
+                <TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_resolving_title" style="@style/UiKit.TextView.H2" />
                 <ProgressBar android:id="@id/loading_button_progress" android:layout_width="30.0dip" android:layout_height="30.0dip" />
             </LinearLayout>
             <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_invalid_title" style="@style/UiKit.TextView.H2" />
-                <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit.TextView.Subtext" />
+                <TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_invalid_title" style="@style/UiKit.TextView.H2" />
+                <TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit.TextView.Subtext" />
             </LinearLayout>
             <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_width="fill_parent" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_modal_title" style="@style/UiKit.TextView.Bold" />
-                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
-                <include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" layout="@layout/layout_icon_uploader" />
-                <LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
-                    <TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_width="fill_parent" android:layout_marginBottom="8.0dip" android:text="@string/guild_template_modal_title" style="@style/UiKit.TextView.Bold" />
+                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
+                <include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24.0dip" layout="@layout/layout_icon_uploader" />
+                <LinearLayout android:padding="16.0dip" style="@style/UiKit.Copy">
+                    <TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="8.0dip" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
                     <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_create_name" android:hint="@string/form_placeholder_server_name" style="@style/UiKit.TextInputLayout">
-                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
+                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="8.0dip" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
                     </com.google.android.material.textfield.TextInputLayout>
-                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
-                    <com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100" />
+                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView.Subtext" />
+                    <com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100" />
                     <TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
                 </LinearLayout>
-                <LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
+                <LinearLayout android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+                    <View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="16.0dip" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
                     <TextView android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
                     <TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit.TextView.Subtext" />
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
-                        <com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8.0dip" android:layout_marginTop="8.0dip" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
+                        <com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" />
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+                <LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="16.0dip" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                     <TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit.TextView.H1.Bold" />
                     <TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit.TextView.Subtext" />
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
-                        <com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8.0dip" android:layout_marginTop="8.0dip" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
+                        <com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
diff --git a/com.discord/res/layout/widget_guild_context_menu.xml b/com.discord/res/layout/widget_guild_context_menu.xml
index 90c313ec67..0447d5a3f6 100644
--- a/com.discord/res/layout/widget_guild_context_menu.xml
+++ b/com.discord/res/layout/widget_guild_context_menu.xml
@@ -2,7 +2,7 @@
 <androidx.cardview.widget.CardView android:id="@id/guild_context_menu_card" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundFloating" app:cardCornerRadius="4.0dip" app:cardElevation="4.0dip" app:cardUseCompatPadding="true"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="240.0dip">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/guild_context_menu_header" android:paddingTop="14.0dip" android:paddingBottom="14.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/whitney_bold" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/guild_context_menu_header" android:paddingTop="14.0dip" android:paddingBottom="14.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/whitney_bold" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" />
         <View android:id="@id/guild_context_menu_header_divider" android:background="?colorBackgroundModifierAccent" android:layout_width="fill_parent" android:layout_height="1.0dip" />
         <androidx.appcompat.widget.AppCompatTextView android:id="@id/guild_context_menu_mark_as_read" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/mark_as_read" android:drawableStart="@drawable/ic_mail_24dp" style="@style/ContextMenuTextOption" />
         <androidx.appcompat.widget.AppCompatTextView android:id="@id/guild_context_menu_notifications" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/notifications" android:drawableStart="@drawable/ic_guild_notifications_24dp" style="@style/ContextMenuTextOption" />
diff --git a/com.discord/res/layout/widget_guild_create.xml b/com.discord/res/layout/widget_guild_create.xml
index 74ee7af545..800aae14dd 100644
--- a/com.discord/res/layout/widget_guild_create.xml
+++ b/com.discord/res/layout/widget_guild_create.xml
@@ -4,15 +4,15 @@
     <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
+    <androidx.core.widget.NestedScrollView android:paddingBottom="8.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.discord.views.ScreenTitleView android:id="@id/guild_create_screen_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/create_server_description_mobile_refresh" app:stv_title="@string/create_server_title_mobile_refresh" />
-            <include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" layout="@layout/layout_icon_uploader" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_create_name" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_server_name" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
+            <com.discord.views.ScreenTitleView android:id="@id/guild_create_screen_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" app:stv_subtitle="@string/create_server_description_mobile_refresh" app:stv_title="@string/create_server_title_mobile_refresh" />
+            <include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" layout="@layout/layout_icon_uploader" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_create_name" android:layout_marginBottom="8.0dip" android:hint="@string/form_label_server_name" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText" />
             </com.google.android.material.textfield.TextInputLayout>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_guidelines" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-            <com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_padding_bottom="@dimen/uikit_spacing_large" app:lb_padding_top="@dimen/uikit_spacing_large" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" app:lb_text_size="@dimen/uikit_textsize_large" />
+            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_guidelines" android:layout_marginBottom="16.0dip" style="@style/UiKit.TextView" />
+            <com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_padding_bottom="16.0dip" app:lb_padding_top="16.0dip" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" app:lb_text_size="@dimen/uikit_textsize_large" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_invite_info.xml b/com.discord/res/layout/widget_guild_invite_info.xml
index e6f21473c3..486a23cf0c 100644
--- a/com.discord/res/layout/widget_guild_invite_info.xml
+++ b/com.discord/res/layout/widget_guild_invite_info.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+    <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
         <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="64.0dip">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
         </androidx.cardview.widget.CardView>
         <RelativeLayout android:id="@id/invite_avatar_small_wrap" android:background="?colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="-3.0dip" android:layout_alignParentBottom="true" android:layout_marginEnd="-3.0dip" android:layout_alignParentEnd="true" />
     </RelativeLayout>
-    <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="96.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="96.0dip" android:layout_marginBottom="16.0dip" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23.0dip">
+        <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
+        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23.0dip">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar_small" style="@style/Avatar.Large" />
             </androidx.cardview.widget.CardView>
-            <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+            <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
         <LinearLayout android:gravity="center" android:id="@id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
-            <androidx.cardview.widget.CardView android:id="@id/invite_members_online_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_small" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
-                <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_green_500" app:roundAsCircle="true" />
+            <androidx.cardview.widget.CardView android:id="@id/invite_members_online_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="4.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
+                <LinearLayout android:gravity="center" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8.0dip" android:layout_height="8.0dip" android:layout_marginEnd="8.0dip" app:placeholderImage="@color/status_green_500" app:roundAsCircle="true" />
                     <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
-            <androidx.cardview.widget.CardView android:id="@id/invite_members_total_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_small" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
-                <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
+            <androidx.cardview.widget.CardView android:id="@id/invite_members_total_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="4.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="30.0dip">
+                <LinearLayout android:gravity="center" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8.0dip" android:layout_height="8.0dip" android:layout_marginEnd="8.0dip" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
                     <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/invite_members_total" android:singleLine="true" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
diff --git a/com.discord/res/layout/widget_guild_invite_share.xml b/com.discord/res/layout/widget_guild_invite_share.xml
index 7c016ce9a5..34c5d853c4 100644
--- a/com.discord/res/layout/widget_guild_invite_share.xml
+++ b/com.discord/res/layout/widget_guild_invite_share.xml
@@ -6,26 +6,26 @@
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
         <com.discord.app.AppViewFlipper android:id="@id/guild_invite_suggestions_flipper" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xxlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="center" android:layout_margin="32.0dip" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                 <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_invite_share_search" style="@style/UiKit.TextInputLayout.Search">
                     <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
+                <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
                 <TextView android:id="@id/guild_invite_empty_results" android:visibility="gone" style="@style/UiKit.TextView.NoResults" />
             </LinearLayout>
         </com.discord.app.AppViewFlipper>
         <View android:background="?colorBackgroundSecondary" style="@style/UiKit.Divider" />
-        <LinearLayout android:background="?primary_630" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:layout_gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/invite_footer_link_header" style="@style/UiKit.TextView.Subtext" />
-            <LinearLayout android:background="@drawable/drawable_bg_outline_dark" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_link" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:layout_height="fill_parent" android:text="@string/invite_link_example_verified" android:singleLine="true" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Bold" />
-                <ImageView android:id="@id/guild_invite_settings_edit" android:background="?selectableItemBackgroundBorderless" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="10.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="10.0dip" android:layout_width="46.0dip" android:layout_height="46.0dip" android:src="?ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/link_settings" />
+        <LinearLayout android:background="?primary_630" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:layout_gravity="center" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/invite_footer_link_header" style="@style/UiKit.TextView.Subtext" />
+            <LinearLayout android:background="@drawable/drawable_bg_outline_dark" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_link" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:layout_height="fill_parent" android:text="@string/invite_link_example_verified" android:singleLine="true" android:layout_weight="1.0" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.TextView.Bold" />
+                <ImageView android:id="@id/guild_invite_settings_edit" android:background="?selectableItemBackgroundBorderless" android:paddingLeft="16.0dip" android:paddingTop="10.0dip" android:paddingRight="16.0dip" android:paddingBottom="10.0dip" android:layout_width="46.0dip" android:layout_height="46.0dip" android:src="?ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/link_settings" />
             </LinearLayout>
         </LinearLayout>
         <LinearLayout android:background="?primary_630" style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.discord.views.CheckedSetting android:id="@id/guild_invite_never_expire" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" app:cs_subtext="@string/invite_links_expire_after_1_day" app:cs_text="@string/set_invite_link_never_expire" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
-            <com.google.android.material.button.MaterialButton android:id="@id/guild_invite_share_btn" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/share_link" style="@style/UiKit.Material.Button" />
+            <com.discord.views.CheckedSetting android:id="@id/guild_invite_never_expire" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" app:cs_subtext="@string/invite_links_expire_after_1_day" app:cs_text="@string/set_invite_link_never_expire" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
+            <com.google.android.material.button.MaterialButton android:id="@id/guild_invite_share_btn" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/share_link" style="@style/UiKit.Material.Button" />
         </LinearLayout>
     </LinearLayout>
     <View android:id="@id/bottom_sheet_tint" android:background="@color/black_alpha_60" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
diff --git a/com.discord/res/layout/widget_guild_invite_share_compact.xml b/com.discord/res/layout/widget_guild_invite_share_compact.xml
index 2a38f2f50d..111a3e720e 100644
--- a/com.discord/res/layout/widget_guild_invite_share_compact.xml
+++ b/com.discord/res/layout/widget_guild_invite_share_compact.xml
@@ -6,21 +6,21 @@
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
         <com.discord.app.AppViewFlipper android:id="@id/guild_invite_suggestions_flipper" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xxlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="center" android:layout_margin="32.0dip" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                 <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_invite_share_compact_search" style="@style/UiKit.TextInputLayout.Search">
                     <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
+                <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
                 <TextView android:id="@id/guild_invite_empty_results" android:visibility="gone" style="@style/UiKit.TextView.NoResults" />
             </LinearLayout>
         </com.discord.app.AppViewFlipper>
         <View android:background="?colorBackgroundSecondary" style="@style/UiKit.Divider" />
-        <LinearLayout android:gravity="center_horizontal" android:background="?colorBackgroundMobileSecondary" android:padding="@dimen/uikit_spacing_large" android:clipChildren="false" android:clipToPadding="false" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:gravity="center_horizontal" android:background="?colorBackgroundMobileSecondary" android:padding="16.0dip" android:clipChildren="false" android:clipToPadding="false" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/invite_footer_link_header" style="@style/UiKit.TextView" />
             <LinearLayout android:clipChildren="false" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:id="@id/guild_invite_share_btn" android:layout_width="0.0dip" android:text="@string/invite_link_example_verified" android:layout_weight="1.0" android:contentDescription="@string/share_to" android:textAlignment="textStart" app:icon="@drawable/ic_share_white_24dp" app:iconGravity="end" app:iconTint="?colorInteractiveNormal" app:rippleColor="@color/status_green_500" style="@style/UiKit.Material.Button.Tertiary" />
-                <ImageView android:layout_gravity="center_vertical" android:id="@id/guild_invite_settings_edit" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/uikit_spacing_medium" android:src="?ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/share_invite_link_for_access" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView.Clickable" />
+                <ImageView android:layout_gravity="center_vertical" android:id="@id/guild_invite_settings_edit" android:background="?selectableItemBackgroundBorderless" android:padding="8.0dip" android:src="?ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/share_invite_link_for_access" android:layout_marginStart="8.0dip" style="@style/UiKit.ImageView.Clickable" />
             </LinearLayout>
             <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorInteractiveNormal" android:id="@id/guild_invite_never_expire" android:text="@string/invite_links_expire_after_1_day" style="@style/UiKit.TextView.Subtext" />
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml
index 0ba1d6da93..27cca71b34 100644
--- a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml
+++ b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml
@@ -5,14 +5,14 @@
         <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/drawable_invite_share_art_envelope" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" app:stv_subtitle="@string/invite_empty_body" app:stv_title="@string/invite_empty_title" />
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_empty_suggestions_invite_link" android:background="?bg_clickable_rounded_4dp" android:layout_width="0.0dip" android:layout_height="0.0dip" android:text="@string/invite_link_example_verified" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_invite_empty_suggestions_settings_edit" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.SingleLine" />
-                <ImageButton android:id="@id/guild_invite_empty_suggestions_settings_edit" android:background="?bg_clickable_rounded_4dp" android:padding="@dimen/uikit_spacing_large" android:layout_width="56.0dip" android:layout_height="56.0dip" android:src="?ic_settings" android:contentDescription="@string/share_invite_link_for_access" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
+        <LinearLayout android:paddingBottom="16.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="24.0dip" android:src="@drawable/drawable_invite_share_art_envelope" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" app:stv_subtitle="@string/invite_empty_body" app:stv_title="@string/invite_empty_title" />
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_empty_suggestions_invite_link" android:background="?bg_clickable_rounded_4dp" android:layout_width="0.0dip" android:layout_height="0.0dip" android:text="@string/invite_link_example_verified" android:layout_weight="1.0" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:layout_marginEnd="8.0dip" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_invite_empty_suggestions_settings_edit" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.SingleLine" />
+                <ImageButton android:id="@id/guild_invite_empty_suggestions_settings_edit" android:background="?bg_clickable_rounded_4dp" android:padding="16.0dip" android:layout_width="56.0dip" android:layout_height="56.0dip" android:src="?ic_settings" android:contentDescription="@string/share_invite_link_for_access" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-            <TextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_marginBottom="16.0dip" style="@style/UiKit.TextView.Subtext" />
             <com.google.android.material.button.MaterialButton android:id="@id/guild_invite_empty_suggestions_invite_share_btn" android:text="@string/share_link" style="@style/UiKit.AuthButton.Material" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_guild_invite_share_item.xml b/com.discord/res/layout/widget_guild_invite_share_item.xml
index fe3967f633..89e5cc7120 100644
--- a/com.discord/res/layout/widget_guild_invite_share_item.xml
+++ b/com.discord/res/layout/widget_guild_invite_share_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
     <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="wrap_content" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Material.Button.Green.Outline" />
-    <com.google.android.material.button.MaterialButton android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Material.Button.Transparent.Fit" />
+    <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="wrap_content" android:minWidth="64.0dip" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Material.Button.Green.Outline" />
+    <com.google.android.material.button.MaterialButton android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="64.0dip" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Material.Button.Transparent.Fit" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_join.xml b/com.discord/res/layout/widget_guild_join.xml
index 804b347a1a..7e2c3fabf1 100644
--- a/com.discord/res/layout/widget_guild_join.xml
+++ b/com.discord/res/layout/widget_guild_join.xml
@@ -5,17 +5,17 @@
         <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:layout_height="fill_parent" android:baselineAligned="false" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/join_server_description_mobile_refresh" app:stv_title="@string/join_server_title_mobile_refresh" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_join_invite" android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/form_label_invite_link" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
+        <LinearLayout android:layout_height="fill_parent" android:baselineAligned="false" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" app:stv_subtitle="@string/join_server_description_mobile_refresh" app:stv_title="@string/join_server_title_mobile_refresh" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_join_invite" android:layout_marginBottom="16.0dip" android:hint="@string/form_label_invite_link" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText">
                     <requestFocus />
                 </com.google.android.material.textfield.TextInputEditText>
             </com.google.android.material.textfield.TextInputLayout>
             <include layout="@layout/widget_guild_join_invite_examples" />
-            <com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/nuf_join_server_button" style="@style/UiKit.AuthButton.Material" />
+            <com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="16.0dip" android:text="@string/nuf_join_server_button" style="@style/UiKit.AuthButton.Material" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <ImageView android:layout_gravity="bottom|center" android:layout_marginBottom="@dimen/uikit_spacing_small" android:src="?img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/UiKit.ImageView.HideInLandscape" />
+    <ImageView android:layout_gravity="bottom|center" android:layout_marginBottom="4.0dip" android:src="?img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/UiKit.ImageView.HideInLandscape" />
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_join_invite_examples.xml b/com.discord/res/layout/widget_guild_join_invite_examples.xml
index 696c6798b2..e8021c715a 100644
--- a/com.discord/res/layout/widget_guild_join_invite_examples.xml
+++ b/com.discord/res/layout/widget_guild_join_invite_examples.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/join_server_invite_examples_header" style="@style/UiKit.TextView" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/join_server_invite_examples_header" style="@style/UiKit.TextView" />
     <TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_simple" style="@style/UiKit.TextView" />
     <TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_full" style="@style/UiKit.TextView" />
     <TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_verified" style="@style/UiKit.TextView" />
diff --git a/com.discord/res/layout/widget_guild_profile_sheet.xml b/com.discord/res/layout/widget_guild_profile_sheet.xml
index 3a77c122ba..b11bc00515 100644
--- a/com.discord/res/layout/widget_guild_profile_sheet.xml
+++ b/com.discord/res/layout/widget_guild_profile_sheet.xml
@@ -5,23 +5,23 @@
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_profile_sheet_constraint_layout" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_banner" android:layout_width="0.0dip" android:layout_height="wrap_content" app:actualImageScaleType="centerCrop" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:viewAspectRatio="1.78" />
-            <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_icon_card" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" app:contentPadding="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="@id/guild_profile_sheet_banner" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_banner">
+            <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_icon_card" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="16.0dip" android:layout_marginStart="16.0dip" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" app:contentPadding="4.0dip" app:layout_constraintBottom_toBottomOf="@id/guild_profile_sheet_banner" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_banner">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" app:roundWithOverlayColor="?colorBackgroundTertiary" app:roundedCornerRadius="16.0dip" />
-                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_profile_sheet_icon_name" android:padding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Large.SingleLine" />
+                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_profile_sheet_icon_name" android:padding="4.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
             </androidx.cardview.widget.CardView>
-            <LinearLayout android:id="@id/guild_profile_sheet_content_container" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_icon_card" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/guild_profile_sheet_content_container" android:paddingBottom="16.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_icon_card" style="@style/UiKit.ViewGroup.LinearLayout">
                 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <ImageView android:layout_gravity="center" android:id="@id/guild_profile_sheet_guild_verified_premium_icon" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
+                    <ImageView android:layout_gravity="center" android:id="@id/guild_profile_sheet_guild_verified_premium_icon" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="8.0dip" />
                     <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@id/guild_profile_sheet_name" style="@style/UiKit.TextView.H1.Bold" />
                 </LinearLayout>
-                <TextView android:id="@id/guild_profile_sheet_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-                <LinearLayout android:gravity="center" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <TextView android:id="@id/guild_profile_sheet_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
+                <LinearLayout android:gravity="center" android:layout_width="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                     <LinearLayout android:gravity="center" android:id="@id/guild_profile_sheet_online_count" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                        <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_green_500" app:roundAsCircle="true" />
-                        <com.discord.app.AppTextView android:id="@id/guild_profile_sheet_online_count_text" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/GuildProfileSheet.DiscoverableGuild.Text" />
+                        <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8.0dip" android:layout_height="8.0dip" android:layout_marginEnd="8.0dip" app:placeholderImage="@color/status_green_500" app:roundAsCircle="true" />
+                        <com.discord.app.AppTextView android:id="@id/guild_profile_sheet_online_count_text" android:layout_marginEnd="16.0dip" style="@style/GuildProfileSheet.DiscoverableGuild.Text" />
                     </LinearLayout>
                     <LinearLayout android:gravity="center" android:id="@id/guild_profile_sheet_member_count" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                        <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
+                        <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8.0dip" android:layout_height="8.0dip" android:layout_marginEnd="8.0dip" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
                         <com.discord.app.AppTextView android:id="@id/guild_profile_sheet_member_count_text" style="@style/GuildProfileSheet.DiscoverableGuild.Text" />
                     </LinearLayout>
                 </LinearLayout>
@@ -34,44 +34,44 @@
                 <com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_invite" android:text="@string/instant_invite" android:drawableTop="@drawable/ic_guild_invite_24dp" android:layout_weight="1.0" style="@style/GuildProfileSheet.TabItems.Button" />
             </LinearLayout>
             <androidx.constraintlayout.widget.Barrier android:id="@id/guild_profile_sheet_actions_top_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="guild_profile_sheet_tab_items, guild_profile_sheet_content_container" />
-            <LinearLayout android:id="@id/guild_profile_sheet_bottom_container" android:background="?colorBackgroundSecondary" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="0.0dip" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_actions_top_barrier" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/guild_profile_sheet_bottom_container" android:background="?colorBackgroundSecondary" android:paddingBottom="16.0dip" android:layout_width="0.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_actions_top_barrier" style="@style/UiKit.ViewGroup.LinearLayout">
                 <LinearLayout android:id="@id/guild_profile_sheet_actions" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_mark_as_read_action" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/GuildProfileSheet.Actions.Card">
-                        <TextView android:id="@id/guild_profile_sheet_mark_as_read" android:padding="@dimen/uikit_spacing_large" android:text="@string/mark_as_read" style="@style/GuildProfileSheet.Actions.Title" />
+                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_mark_as_read_action" android:layout_marginTop="16.0dip" style="@style/GuildProfileSheet.Actions.Card">
+                        <TextView android:id="@id/guild_profile_sheet_mark_as_read" android:padding="16.0dip" android:text="@string/mark_as_read" style="@style/GuildProfileSheet.Actions.Title" />
                     </androidx.cardview.widget.CardView>
-                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_primary_actions" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/GuildProfileSheet.Actions.Card">
+                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_primary_actions" android:layout_marginTop="16.0dip" style="@style/GuildProfileSheet.Actions.Card">
                         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                            <TextView android:id="@id/guild_profile_sheet_create_channel" android:padding="@dimen/uikit_spacing_large" android:text="@string/create_channel" style="@style/GuildProfileSheet.Actions.Title" />
-                            <TextView android:id="@id/guild_profile_sheet_create_category" android:padding="@dimen/uikit_spacing_large" android:text="@string/create_category" style="@style/GuildProfileSheet.Actions.Title" />
+                            <TextView android:id="@id/guild_profile_sheet_create_channel" android:padding="16.0dip" android:text="@string/create_channel" style="@style/GuildProfileSheet.Actions.Title" />
+                            <TextView android:id="@id/guild_profile_sheet_create_category" android:padding="16.0dip" android:text="@string/create_category" style="@style/GuildProfileSheet.Actions.Title" />
                         </LinearLayout>
                     </androidx.cardview.widget.CardView>
-                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_secondary_actions" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/GuildProfileSheet.Actions.Card">
+                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_secondary_actions" android:layout_marginTop="16.0dip" style="@style/GuildProfileSheet.Actions.Card">
                         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                            <LinearLayout android:id="@id/guild_profile_sheet_change_nickname" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+                            <LinearLayout android:id="@id/guild_profile_sheet_change_nickname" android:background="?bg_pressed_highlight" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                                 <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:layout_gravity="center" android:layout_width="fill_parent" android:text="@string/change_nickname" style="@style/UiKit.TextView" />
                                 <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:layout_gravity="center" android:id="@id/guild_profile_sheet_nickname" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
                             </LinearLayout>
                             <com.discord.views.CheckedSetting android:id="@id/guild_profile_sheet_allow_dm" app:cs_subtext="@string/allow_server_dms" app:cs_text="@string/direct_messages" style="@style/GuildProfileSheet.Actions.CheckedSetting" />
                             <com.discord.views.CheckedSetting android:id="@id/guild_profile_sheet_hide_muted_channels" app:cs_text="@string/hide_muted_channels" style="@style/GuildProfileSheet.Actions.CheckedSetting" />
-                            <TextView android:textColor="@color/status_red_500" android:id="@id/guild_profile_sheet_leave_server" android:padding="@dimen/uikit_spacing_large" android:text="@string/leave_server" style="@style/GuildProfileSheet.Actions.Title" />
+                            <TextView android:textColor="@color/status_red_500" android:id="@id/guild_profile_sheet_leave_server" android:padding="16.0dip" android:text="@string/leave_server" style="@style/GuildProfileSheet.Actions.Title" />
                         </LinearLayout>
                     </androidx.cardview.widget.CardView>
-                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_developer_actions" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/GuildProfileSheet.Actions.Card">
-                        <TextView android:id="@id/guild_profile_sheet_copy_id" android:padding="@dimen/uikit_spacing_large" android:text="@string/copy_id" style="@style/GuildProfileSheet.Actions.Title" />
+                    <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_developer_actions" android:layout_marginTop="16.0dip" style="@style/GuildProfileSheet.Actions.Card">
+                        <TextView android:id="@id/guild_profile_sheet_copy_id" android:padding="16.0dip" android:text="@string/copy_id" style="@style/GuildProfileSheet.Actions.Title" />
                     </androidx.cardview.widget.CardView>
                 </LinearLayout>
-                <LinearLayout android:gravity="center_vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <LinearLayout android:gravity="center_vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                     <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/guild_profile_sheet_emojis_count" android:textAllCaps="true" style="@style/UiKit.TextView" />
-                    <ImageView android:id="@id/guild_profile_sheet_premium_upsell_dot_separator" android:layout_width="4.0dip" android:layout_height="4.0dip" android:src="@drawable/drawable_circle_white" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="@dimen/uikit_spacing_medium" app:tint="?colorTextMuted" />
-                    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/premium_tier_2_purple" android:layout_gravity="center" android:id="@id/guild_profile_sheet_premium_upsell_text" android:text="@string/game_popout_nitro_upsell" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.SingleLine" />
+                    <ImageView android:id="@id/guild_profile_sheet_premium_upsell_dot_separator" android:layout_width="4.0dip" android:layout_height="4.0dip" android:src="@drawable/drawable_circle_white" android:contentDescription="@string/sample_empty_string" android:layout_marginStart="8.0dip" app:tint="?colorTextMuted" />
+                    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/premium_tier_2_purple" android:layout_gravity="center" android:id="@id/guild_profile_sheet_premium_upsell_text" android:text="@string/game_popout_nitro_upsell" android:drawablePadding="4.0dip" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" android:layout_marginStart="8.0dip" style="@style/UiKit.TextView.SingleLine" />
                 </LinearLayout>
-                <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_emojis_card" android:layout_marginTop="@dimen/uikit_spacing_medium" app:contentPadding="@dimen/uikit_spacing_medium" style="@style/GuildProfileSheet.Actions.Card">
+                <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_emojis_card" android:layout_marginTop="8.0dip" app:contentPadding="8.0dip" style="@style/GuildProfileSheet.Actions.Card">
                     <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_profile_sheet_emojis" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" />
                 </androidx.cardview.widget.CardView>
-                <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_profile_sheet_bottom_actions" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_profile_sheet_bottom_actions" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                     <com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_upload_emoji" android:layout_width="0.0dip" android:text="@string/upload_emoji" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_profile_sheet_join_server" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Material.Button" />
-                    <com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_join_server" android:layout_width="0.0dip" android:text="@string/guild_profile_join_server_button" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_profile_sheet_view_server" app:layout_constraintStart_toEndOf="@id/guild_profile_sheet_upload_emoji" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.Material.Button" />
-                    <com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_view_server" android:layout_width="0.0dip" android:text="@string/guild_popout_view_server_button" android:layout_marginStart="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundAccent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guild_profile_sheet_join_server" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.Material.Button" />
+                    <com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_join_server" android:layout_width="0.0dip" android:text="@string/guild_profile_join_server_button" android:layout_marginStart="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_profile_sheet_view_server" app:layout_constraintStart_toEndOf="@id/guild_profile_sheet_upload_emoji" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.Material.Button" />
+                    <com.google.android.material.button.MaterialButton android:id="@id/guild_profile_sheet_view_server" android:layout_width="0.0dip" android:text="@string/guild_popout_view_server_button" android:layout_marginStart="8.0dip" android:backgroundTint="?colorBackgroundAccent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guild_profile_sheet_join_server" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.Material.Button" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout/widget_guild_search.xml b/com.discord/res/layout/widget_guild_search.xml
index e3a32bdcf4..9ed844851c 100644
--- a/com.discord/res/layout/widget_guild_search.xml
+++ b/com.discord/res/layout/widget_guild_search.xml
@@ -6,5 +6,5 @@
             <com.google.android.material.textfield.TextInputEditText android:hint="@string/premium_guild_subscribe_search_guild_placeholder" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search" />
         </com.google.android.material.textfield.TextInputLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior" style="@style/UiKit.ViewGroup.RecyclerView" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_search_recycler" android:paddingTop="8.0dip" android:paddingBottom="64.0dip" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior" style="@style/UiKit.ViewGroup.RecyclerView" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_search_list_item.xml b/com.discord/res/layout/widget_guild_search_list_item.xml
index 919c22d8fc..afa7a11149 100644
--- a/com.discord/res/layout/widget_guild_search_list_item.xml
+++ b/com.discord/res/layout/widget_guild_search_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_search_item_avatar" app:fadeDuration="50" app:roundAsCircle="true" style="@style/UiKit.GuildsListIcon" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:layout_gravity="center_vertical" android:id="@id/guild_search_item_name" android:layout_marginStart="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:layout_gravity="center_vertical" android:id="@id/guild_search_item_name" android:layout_marginStart="32.0dip" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_selector.xml b/com.discord/res/layout/widget_guild_selector.xml
index 6362229b14..c533185437 100644
--- a/com.discord/res/layout/widget_guild_selector.xml
+++ b/com.discord/res/layout/widget_guild_selector.xml
@@ -2,8 +2,8 @@
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/guild_select" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.Sheet.Header.Title" />
+        <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/guild_select" android:layout_marginStart="16.0dip" style="@style/UiKit.Sheet.Header.Title" />
         <View style="@style/UiKit.Settings.Divider" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_selector_list" android:paddingTop="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_selector_list" android:paddingTop="4.0dip" style="@style/UiKit.ViewGroup.RecyclerView" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_selector_item.xml b/com.discord/res/layout/widget_guild_selector_item.xml
index 3eb0b4112f..9a808268a4 100644
--- a/com.discord/res/layout/widget_guild_selector_item.xml
+++ b/com.discord/res/layout/widget_guild_selector_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingStart="16.0dip" android:paddingEnd="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <FrameLayout android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_selector_icon" style="@style/Avatar.Standard" />
diff --git a/com.discord/res/layout/widget_guild_transfer_ownership.xml b/com.discord/res/layout/widget_guild_transfer_ownership.xml
index f290b518d6..e5fcf307d3 100644
--- a/com.discord/res/layout/widget_guild_transfer_ownership.xml
+++ b/com.discord/res/layout/widget_guild_transfer_ownership.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout android:id="@id/guild_transfer_ownership_mfa_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.Settings.Item.Label" />
-        <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_transfer_ownership_mfa_code" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/two_fa_auth_code" style="@style/UiKit.TextInputLayout.Primary">
+        <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_transfer_ownership_mfa_code" android:layout_margin="16.0dip" android:hint="@string/two_fa_auth_code" style="@style/UiKit.TextInputLayout.Primary">
             <com.google.android.material.textfield.TextInputEditText android:inputType="textVisiblePassword|numberPassword|phone" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
     <com.discord.views.CheckedSetting android:id="@id/guild_transfer_ownership_acknowledge_check" app:cs_text="@string/transfer_ownership_acknowledge" app:cs_text_size="@dimen/uikit_textsize_small" style="@style/UiKit.CheckedSetting.Themed" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:layout_gravity="center_vertical" android:id="@id/guild_transfer_ownership_cancel" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent.Fit" />
-        <com.google.android.material.button.MaterialButton android:enabled="true" android:id="@id/guild_transfer_ownership_confirm" android:text="@string/transfer" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Red.Fit" />
+        <com.google.android.material.button.MaterialButton android:enabled="true" android:id="@id/guild_transfer_ownership_confirm" android:text="@string/transfer" android:layout_marginStart="8.0dip" style="@style/UiKit.Material.Button.Red.Fit" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_welcome_channel.xml b/com.discord/res/layout/widget_guild_welcome_channel.xml
index 6c1b25d855..94a83ab566 100644
--- a/com.discord/res/layout/widget_guild_welcome_channel.xml
+++ b/com.discord/res/layout/widget_guild_welcome_channel.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:gravity="center_horizontal" android:id="@id/guild_welcome_channel" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="@dimen/uikit_spacing_medium" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup"
+<androidx.cardview.widget.CardView android:gravity="center_horizontal" android:id="@id/guild_welcome_channel" android:layout_marginTop="8.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_details" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_details" android:padding="16.0dip" style="@style/UiKit.ViewGroup">
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_icon" android:layout_width="wrap_content" android:layout_height="fill_parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_welcome_channel_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent">
-            <TextView android:id="@id/guild_welcome_channel_unicode_emoji" android:visibility="gone" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:layout_marginTop="@dimen/uikit_spacing_small" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_welcome_channel_emoji" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:baselineAlignBottom="false" app:actualImageScaleType="fitCenter" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text" app:roundedCornerRadius="@dimen/uikit_spacing_small" />
+            <TextView android:id="@id/guild_welcome_channel_unicode_emoji" android:visibility="gone" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:layout_marginTop="4.0dip" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_welcome_channel_emoji" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:baselineAlignBottom="false" app:actualImageScaleType="fitCenter" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text" app:roundedCornerRadius="4.0dip" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_text" android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guild_welcome_channel_icon" app:layout_constraintTop_toTopOf="parent">
-            <TextView android:id="@id/guild_welcome_channel_description" android:layout_marginTop="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/guild_welcome_channel_name" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Bold" />
+        <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_welcome_channel_text" android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_marginStart="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/guild_welcome_channel_icon" app:layout_constraintTop_toTopOf="parent">
+            <TextView android:id="@id/guild_welcome_channel_description" android:layout_marginTop="8.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/guild_welcome_channel_name" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Bold" />
             <ImageView android:id="@id/guild_welcome_channel_hash" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginTop="2.0dip" android:src="@drawable/ic_channel_text" android:contentDescription="@string/sample_empty_string" android:layout_marginEnd="2.0dip" app:layout_constraintEnd_toStartOf="@id/guild_welcome_channel_name" app:layout_constraintTop_toBottomOf="@id/guild_welcome_channel_description" style="@style/UiKit.ImageView" />
             <TextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_welcome_channel_name" android:layout_width="wrap_content" android:layout_marginStart="2.0dip" app:layout_constraintStart_toEndOf="@id/guild_welcome_channel_hash" app:layout_constraintTop_toBottomOf="@id/guild_welcome_channel_description" style="@style/UiKit.TextView.SingleLine" />
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout/widget_guild_welcome_sheet.xml b/com.discord/res/layout/widget_guild_welcome_sheet.xml
index 8753fe7190..650993d575 100644
--- a/com.discord/res/layout/widget_guild_welcome_sheet.xml
+++ b/com.discord/res/layout/widget_guild_welcome_sheet.xml
@@ -3,15 +3,15 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.discord.app.AppViewFlipper android:id="@id/guild_welcome_sheet_flipper" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
-        <LinearLayout android:background="?colorBackgroundPrimary" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <androidx.cardview.widget.CardView android:layout_gravity="center_horizontal" android:id="@id/guild_welcome_sheet_icon_card" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" style="@style/UiKit.ImageView">
+        <LinearLayout android:background="?colorBackgroundPrimary" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <androidx.cardview.widget.CardView android:layout_gravity="center_horizontal" android:id="@id/guild_welcome_sheet_icon_card" android:layout_marginTop="32.0dip" android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" style="@style/UiKit.ImageView">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_welcome_sheet_icon" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:roundedCornerRadius="16.0dip" />
-                <TextView android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_welcome_sheet_icon_name" android:padding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Large.SingleLine" />
+                <TextView android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_welcome_sheet_icon_name" android:padding="4.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
             </androidx.cardview.widget.CardView>
-            <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:gravity="center_horizontal" android:id="@id/guild_welcome_sheet_name" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1" />
-                <TextView android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/guild_welcome_sheet_description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/welcome_screen_choice_header" android:textAllCaps="true" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Bold" />
+                <TextView android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/guild_welcome_sheet_description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="32.0dip" android:text="@string/welcome_screen_choice_header" android:textAllCaps="true" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Bold" />
                 <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_welcome_sheet_channels" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
             </LinearLayout>
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_guilds_list_item_guild_nux.xml b/com.discord/res/layout/widget_guilds_list_item_guild_nux.xml
index 7456f5b039..6108705d45 100644
--- a/com.discord/res/layout/widget_guilds_list_item_guild_nux.xml
+++ b/com.discord/res/layout/widget_guilds_list_item_guild_nux.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView android:layout_gravity="center" android:id="@id/guilds_item_profile_avatar" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:src="@drawable/ic_help_24dp" android:contentDescription="@string/create_server_button_cta_mobile" app:tint="?colorInteractiveMuted"
+<ImageView android:layout_gravity="center" android:id="@id/guilds_item_profile_avatar" android:background="?selectableItemBackgroundBorderless" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:src="@drawable/ic_help_24dp" android:contentDescription="@string/create_server_button_cta_mobile" app:tint="?colorInteractiveMuted"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guilds_list_item_profile.xml b/com.discord/res/layout/widget_guilds_list_item_profile.xml
index 2c25d16259..8b3c9ba27e 100644
--- a/com.discord/res/layout/widget_guilds_list_item_profile.xml
+++ b/com.discord/res/layout/widget_guilds_list_item_profile.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:layout_marginTop="@dimen/guild_item_spacing" style="@style/UiKit.GuildsListItem"
+<RelativeLayout android:layout_marginTop="@dimen/guild_item_spacing" android:contentDescription="@string/direct_messages" style="@style/UiKit.GuildsListItem"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <FrameLayout android:layout_centerInParent="true" style="@style/UiKit.GuildsListIcon">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guilds_item_profile_avatar_background" android:background="?selectableItemBackgroundBorderless" android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?colorBackgroundSecondary" app:roundAsCircle="true" />
-        <ImageView android:layout_gravity="center" android:id="@id/guilds_item_profile_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_guild_list_dms_24dp" android:contentDescription="@string/home" />
+        <ImageView android:layout_gravity="center" android:id="@id/guilds_item_profile_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_guild_list_dms_24dp" android:importantForAccessibility="no" />
     </FrameLayout>
     <ImageView android:id="@id/guilds_item_profile_selected" android:importantForAccessibility="no" style="@style/UiKit.GuildsListSelected" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_home_panel_center_nsfw.xml b/com.discord/res/layout/widget_home_panel_center_nsfw.xml
index 8e2a60513a..1427cbb52f 100644
--- a/com.discord/res/layout/widget_home_panel_center_nsfw.xml
+++ b/com.discord/res/layout/widget_home_panel_center_nsfw.xml
@@ -3,10 +3,10 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ScrollView android:layout_height="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.ScrollView">
         <LinearLayout style="@style/UiKit.Copy.Container">
-            <ImageView android:id="@id/home_panel_center_nsfw_art" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="?img_chat_nsfw" android:scaleType="fitCenter" android:contentDescription="@string/nsfw_title" style="@style/UiKit.ImageView" />
+            <ImageView android:id="@id/home_panel_center_nsfw_art" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:src="?img_chat_nsfw" android:scaleType="fitCenter" android:contentDescription="@string/nsfw_title" style="@style/UiKit.ImageView" />
             <LinearLayout style="@style/UiKit.Copy">
                 <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_gravity="center" android:id="@id/home_panel_center_nsfw_title" android:text="@string/nsfw_title" android:fontFamily="@font/whitney_bold" style="@style/UiKit.TextView.H1" />
-                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@id/home_panel_center_nsfw_description" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/nsfw_description" style="@style/UiKit.TextView" />
+                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@id/home_panel_center_nsfw_description" android:layout_marginTop="8.0dip" android:text="@string/nsfw_description" style="@style/UiKit.TextView" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/com.discord/res/layout/widget_home_panel_left.xml b/com.discord/res/layout/widget_home_panel_left.xml
index bcd2b4da23..4f0c8501ce 100644
--- a/com.discord/res/layout/widget_home_panel_left.xml
+++ b/com.discord/res/layout/widget_home_panel_left.xml
@@ -5,5 +5,5 @@
     <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.channels.list.WidgetChannelsList" android:id="@id/widget_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/widget_profile_strip" android:layout_toEndOf="@id/widget_guilds" />
     <View android:background="@color/black_alpha_20" android:layout_width="fill_parent" android:layout_height="0.25dip" android:layout_above="@id/widget_profile_strip" />
     <FrameLayout android:id="@id/widget_profile_strip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" />
-    <TextView android:textColor="@color/primary_100" android:gravity="center" android:id="@id/guild_list_add_hint" android:background="@drawable/asset_tooltip_server_create" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="136.0dip" android:text="@string/add_a_server_mobile" android:lineSpacingMultiplier="1.0" android:layout_marginStart="14.0dip" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="@color/primary_100" android:gravity="center" android:id="@id/guild_list_add_hint" android:background="@drawable/asset_tooltip_server_create" android:padding="16.0dip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="136.0dip" android:text="@string/add_a_server_mobile" android:lineSpacingMultiplier="1.0" android:layout_marginStart="14.0dip" style="@style/UiKit.TextView.Semibold" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_incoming_share.xml b/com.discord/res/layout/widget_incoming_share.xml
index ae5cde6d0f..8a74a15749 100644
--- a/com.discord/res/layout/widget_incoming_share.xml
+++ b/com.discord/res/layout/widget_incoming_share.xml
@@ -6,30 +6,30 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView android:id="@id/scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:paddingTop="@dimen/uikit_spacing_medium" android:text="@string/message_preview" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
-            <androidx.cardview.widget.CardView android:id="@id/external_share_list_wrap" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
+            <TextView android:paddingTop="8.0dip" android:text="@string/message_preview" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
+            <androidx.cardview.widget.CardView android:id="@id/external_share_list_wrap" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" app:cardBackgroundColor="?colorBackgroundTertiary" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
                 <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/external_share_list" android:clipToPadding="false" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
             </androidx.cardview.widget.CardView>
-            <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@id/external_share_activity_action_preview" android:background="?chat_embed_bg" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:animateLayoutChanges="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/external_share_comment" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/add_a_comment_optional" app:startIconDrawable="?ic_edit" style="@style/UiKit.TextInputLayout">
+            <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@id/external_share_activity_action_preview" android:background="?chat_embed_bg" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:animateLayoutChanges="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/external_share_comment" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:hint="@string/add_a_comment_optional" app:startIconDrawable="?ic_edit" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.MultiLine" />
             </com.google.android.material.textfield.TextInputLayout>
             <TextView android:text="@string/share_to" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
-            <com.discord.app.AppViewFlipper android:id="@id/search_flipper" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
+            <com.discord.app.AppViewFlipper android:id="@id/search_flipper" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.google.android.material.textfield.TextInputLayout android:id="@id/external_share_search" android:layout_margin="0.0dip" style="@style/UiKit.TextInputLayout.Search">
                     <com.google.android.material.textfield.TextInputEditText android:hint="@string/select_channel_or_category" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search" />
                 </com.google.android.material.textfield.TextInputLayout>
                 <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:background="?container_bg_dark_a60" android:elevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <com.discord.widgets.user.search.ViewGlobalSearchItem android:id="@id/widget_channel_search_item" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:clipChildren="false" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" />
-                    <ImageView android:id="@id/widget_channel_search_item_remove" android:padding="@dimen/uikit_spacing_small" android:src="?ic_close_24dp" android:contentDescription="@string/remove" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.ImageView.Clickable" />
+                    <com.discord.widgets.user.search.ViewGlobalSearchItem android:id="@id/widget_channel_search_item" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:clipChildren="false" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" />
+                    <ImageView android:id="@id/widget_channel_search_item_remove" android:padding="4.0dip" android:src="?ic_close_24dp" android:contentDescription="@string/remove" android:layout_marginEnd="4.0dip" style="@style/UiKit.ImageView.Clickable" />
                 </LinearLayout>
             </com.discord.app.AppViewFlipper>
             <com.discord.app.AppViewFlipper android:id="@id/incoming_share_results_flipper" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
-                <androidx.recyclerview.widget.RecyclerView android:id="@id/external_share_search_results" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.RecyclerView" />
-                <androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
-                    <RelativeLayout android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <androidx.recyclerview.widget.RecyclerView android:id="@id/external_share_search_results" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" style="@style/UiKit.ViewGroup.RecyclerView" />
+                <androidx.cardview.widget.CardView android:layout_margin="16.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" style="@style/UiKit.ViewGroup">
+                    <RelativeLayout android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                         <TextView android:gravity="start" android:padding="0.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableTop="@null" android:layout_centerVertical="true" android:layout_toStartOf="@id/incoming_share_no_results_img" style="@style/UiKit.TextView.NoResults" />
-                        <ImageView android:id="@id/incoming_share_no_results_img" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" android:src="?img_empty_search" android:contentDescription="@string/search_no_results" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
+                        <ImageView android:id="@id/incoming_share_no_results_img" android:layout_width="64.0dip" android:layout_height="64.0dip" android:src="?img_empty_search" android:contentDescription="@string/search_no_results" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
                     </RelativeLayout>
                 </androidx.cardview.widget.CardView>
             </com.discord.app.AppViewFlipper>
diff --git a/com.discord/res/layout/widget_kick_user.xml b/com.discord/res/layout/widget_kick_user.xml
index 114c93f868..d54eb83b4c 100644
--- a/com.discord/res/layout/widget_kick_user.xml
+++ b/com.discord/res/layout/widget_kick_user.xml
@@ -7,7 +7,7 @@
         <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <com.discord.app.AppTextView android:id="@id/kick_user_body" android:text="@string/kick_user_body" style="@style/UiKit.Dialog.Body" />
             <TextView android:text="@string/form_label_reason_kick" style="@style/UiKit.Dialog.Subtitle" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/kick_user_reason" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/form_label_reason_kick" style="@style/UiKit.TextInputLayout.Primary">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/kick_user_reason" android:layout_margin="16.0dip" android:hint="@string/form_label_reason_kick" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:maxLength="512" style="@style/UiKit.TextInputLayout.EditText.MultiLine" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_masked_links_dialog.xml b/com.discord/res/layout/widget_masked_links_dialog.xml
index 2ff6af4b7a..97fa4382f0 100644
--- a/com.discord/res/layout/widget_masked_links_dialog.xml
+++ b/com.discord/res/layout/widget_masked_links_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:id="@id/view_dialog_confirmation_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/hold_up" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:id="@id/view_dialog_confirmation_header" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/hold_up" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <com.discord.app.AppTextView android:id="@id/masked_links_body_text" style="@style/UiKit.Settings.Item.SubText" />
     <TextView android:textColor="?colorTextLink" android:id="@id/masked_links_trust_domain" android:layout_width="fill_parent" android:text="@string/masked_link_trust_this_domain" style="@style/UiKit.Settings.Item.SubText" />
diff --git a/com.discord/res/layout/widget_media.xml b/com.discord/res/layout/widget_media.xml
index e09bc70e31..31c53e4ba3 100644
--- a/com.discord/res/layout/widget_media.xml
+++ b/com.discord/res/layout/widget_media.xml
@@ -4,7 +4,7 @@
     <com.google.android.exoplayer2.ui.PlayerView android:layout_gravity="center" android:id="@id/widget_media_player_view" android:layout_width="fill_parent" android:layout_height="fill_parent" app:resize_mode="fit" app:surface_type="texture_view" app:use_controller="false" />
     <com.google.android.exoplayer2.ui.PlayerControlView android:layout_gravity="bottom" android:id="@id/widget_media_player_control_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     <com.facebook.samples.zoomable.ZoomableDraweeView android:layout_gravity="center" android:id="@id/widget_media_image" android:background="@color/black" android:layout_width="fill_parent" android:layout_height="fill_parent" app:failureImage="@drawable/asset_sadbot" app:failureImageScaleType="center" />
-    <ProgressBar android:layout_gravity="center" android:id="@id/widget_media_loading_indicator" android:background="@drawable/drawable_circle_primary_900_alpha_80" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" android:indeterminateTint="@color/white" />
+    <ProgressBar android:layout_gravity="center" android:id="@id/widget_media_loading_indicator" android:background="@drawable/drawable_circle_primary_900_alpha_80" android:padding="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" android:indeterminateTint="@color/white" />
     <com.google.android.material.appbar.AppBarLayout android:layout_gravity="top" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
         <androidx.appcompat.widget.Toolbar android:background="@color/primary_900_alpha_80" style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/com.discord/res/layout/widget_music_rich_presence.xml b/com.discord/res/layout/widget_music_rich_presence.xml
index 39cf2920d9..09493f368a 100644
--- a/com.discord/res/layout/widget_music_rich_presence.xml
+++ b/com.discord/res/layout/widget_music_rich_presence.xml
@@ -4,23 +4,23 @@
     <TextView android:id="@id/rich_presence_header" style="@style/UserProfile.Section.Header" />
     <androidx.cardview.widget.CardView app:cardBackgroundColor="?colorBackgroundPrimary" style="@style/UserProfile.Section.Card">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UserProfile.PresenceSection.Body">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_large" android:layout_width="64.0dip" android:layout_height="64.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?colorBackgroundSecondary" app:roundedCornerRadius="@dimen/uikit_spacing_small" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_large" android:layout_width="64.0dip" android:layout_height="64.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?colorBackgroundSecondary" app:roundedCornerRadius="4.0dip" />
             <androidx.legacy.widget.Space android:id="@id/image_bottom_guideline" android:layout_width="@dimen/uikit_image_border_size" android:layout_height="@dimen/uikit_image_border_size" android:layout_marginTop="@dimen/uikit_image_border_size" android:layout_marginStart="@dimen/uikit_image_border_size" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@id/rich_presence_image_large" />
             <FrameLayout android:id="@id/rich_presence_image_small_wrap" android:background="?colorPrimaryCircle" android:padding="@dimen/uikit_image_border_size" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/image_bottom_guideline" app:layout_constraintEnd_toEndOf="@id/image_bottom_guideline" app:layout_constraintRight_toRightOf="@id/image_bottom_guideline">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_small" android:visibility="visible" app:placeholderImage="@drawable/ic_spotify_green_24dp" app:roundAsCircle="true" style="@style/Avatar.Medium" />
             </FrameLayout>
-            <LinearLayout android:id="@id/rich_presence_container_data" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@id/rich_presence_image_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/rich_presence_container_data" android:paddingBottom="8.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@id/rich_presence_image_large" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:ellipsize="marquee" android:id="@id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile.PresenceSection.Body.HeaderText" />
                 <TextView android:id="@id/rich_presence_details" style="@style/UserProfile.PresenceSection.Body.Subtext" />
                 <TextView android:id="@id/rich_presence_time" style="@style/UserProfile.PresenceSection.Body.Subtext" />
             </LinearLayout>
             <androidx.constraintlayout.widget.Barrier android:id="@id/barrier" android:layout_width="fill_parent" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="rich_presence_container_data,rich_presence_image_large" />
-            <com.miguelgaeta.super_bar.SuperBar android:id="@id/rich_presence_superbar" android:focusable="false" android:clickable="false" android:layout_height="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" app:sb_barBackgroundColor="?primary_500" app:sb_barColor="?primary_000" app:sb_barControlColor="@color/transparent" app:sb_barControlRadius="4.0dip" app:sb_barControlShadowRadius="0.0dip" app:sb_barHeight="4.0dip" app:sb_barTouchEnabled="false" app:sb_barValueMax="100.0" style="@style/UiKit.SuperBar" />
-            <FrameLayout android:id="@id/rich_presence_music_progress_container" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_superbar" style="@style/UiKit.ViewGroup">
+            <SeekBar android:enabled="false" android:id="@id/rich_presence_seekbar" android:focusable="false" android:clickable="false" android:layout_height="8.0dip" android:layout_marginTop="16.0dip" android:maxHeight="4.0dip" android:minHeight="4.0dip" android:paddingStart="0.0dip" android:paddingEnd="0.0dip" android:progressTint="?primary_000" android:progressBackgroundTint="?primary_500" android:thumbTint="@color/transparent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UiKit.SeekBar" />
+            <FrameLayout android:id="@id/rich_presence_music_progress_container" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_seekbar" style="@style/UiKit.ViewGroup">
                 <TextView android:layout_gravity="start" android:id="@id/rich_presence_music_elapsed" style="@style/UiKit.TextView" />
                 <TextView android:layout_gravity="end" android:id="@id/rich_presence_music_duration" style="@style/UiKit.TextView" />
             </FrameLayout>
-            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_primary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_music_progress_container" style="@style/UserProfile.PresenceSection.MaterialButton" />
+            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_primary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_music_progress_container" style="@style/UserProfile.PresenceSection.MaterialButton" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_mute_settings_sheet.xml b/com.discord/res/layout/widget_mute_settings_sheet.xml
index a3ca94bd3d..82f40ec4f5 100644
--- a/com.discord/res/layout/widget_mute_settings_sheet.xml
+++ b/com.discord/res/layout/widget_mute_settings_sheet.xml
@@ -6,9 +6,9 @@
             <TextView android:id="@id/mute_settings_sheet_title" style="@style/MuteSettings.Row.Title" />
             <TextView android:id="@id/mute_settings_sheet_subtitle" style="@style/MuteSettings.Row.Subtitle" />
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@id/mute_settings_sheet_unmute_button" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:visibility="gone" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <LinearLayout android:gravity="center" android:id="@id/mute_settings_sheet_unmute_button" android:background="?selectableItemBackground" android:paddingTop="24.0dip" android:paddingBottom="24.0dip" android:visibility="gone" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="?ic_sidebar_notifications_off_24dp" />
-            <LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:layout_marginStart="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:id="@id/mute_settings_sheet_unmute_button_label" android:text="@string/unmute_channel" style="@style/UiKit.TextView.SingleLine" />
                 <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/mute_settings_sheet_unmute_button_details_label" android:text="@string/form_label_mobile_channel_muted_until" android:textAllCaps="false" style="@style/UiKit.TextView" />
             </LinearLayout>
@@ -25,9 +25,9 @@
             <LinearLayout android:id="@id/mute_settings_sheet_notification_settings_button" android:background="@drawable/bg_pressed_highlight_darken" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <TextView android:id="@id/mute_settings_sheet_notification_settings_label" android:background="@color/transparent" android:layout_width="wrap_content" android:text="@string/notification_settings" style="@style/UiKit.ListItem" />
                 <View android:layout_width="0.0dip" android:layout_height="1.0dip" android:layout_weight="1.0" />
-                <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveMuted" android:id="@id/mute_settings_sheet_notification_settings_overrides_label" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableEnd="@drawable/ic_arrow_right_24dp" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:drawableTint="?colorInteractiveMuted" style="@style/UiKit.TextView.SingleLine" />
+                <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveMuted" android:id="@id/mute_settings_sheet_notification_settings_overrides_label" android:drawablePadding="8.0dip" android:drawableEnd="@drawable/ic_arrow_right_24dp" android:layout_marginEnd="8.0dip" app:drawableTint="?colorInteractiveMuted" style="@style/UiKit.TextView.SingleLine" />
             </LinearLayout>
         </FrameLayout>
-        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/mute_settings_sheet_channel_muted_details" android:paddingBottom="@dimen/uikit_spacing_large" android:text="@string/form_description_mobile_notification_muted" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/mute_settings_sheet_channel_muted_details" android:paddingBottom="16.0dip" android:text="@string/form_description_mobile_notification_muted" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.TextView" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_navigation_help.xml b/com.discord/res/layout/widget_navigation_help.xml
index 3439bdb91d..443b777e5d 100644
--- a/com.discord/res/layout/widget_navigation_help.xml
+++ b/com.discord/res/layout/widget_navigation_help.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_gravity="end|center|top" android:id="@id/navigation_help_close" android:padding="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" style="@style/UiKit.ImageView.Clickable" />
-    <androidx.viewpager2.widget.ViewPager2 android:id="@id/navigation_help_nux_pager" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_weight="1.0" />
-    <com.google.android.material.tabs.TabLayout android:id="@id/navigation_help_indicators" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TabLayout.PagerIndicator" />
+    <ImageView android:layout_gravity="end|center|top" android:id="@id/navigation_help_close" android:padding="24.0dip" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" style="@style/UiKit.ImageView.Clickable" />
+    <androidx.viewpager2.widget.ViewPager2 android:id="@id/navigation_help_nux_pager" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_marginBottom="16.0dip" android:layout_weight="1.0" />
+    <com.google.android.material.tabs.TabLayout android:id="@id/navigation_help_indicators" android:layout_marginBottom="32.0dip" style="@style/UiKit.TabLayout.PagerIndicator" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_navigation_help_nux_channels.xml b/com.discord/res/layout/widget_navigation_help_nux_channels.xml
index 1a97de4ef0..b690e693f7 100644
--- a/com.discord/res/layout/widget_navigation_help_nux_channels.xml
+++ b/com.discord/res/layout/widget_navigation_help_nux_channels.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="@dimen/uikit_spacing_xxlarge" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32.0dip" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/asset_nux_navigation_channels" android:layout_weight="2.0" android:importantForAccessibility="no" />
+    <ImageView android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_marginBottom="32.0dip" android:src="@drawable/asset_nux_navigation_channels" android:layout_weight="2.0" android:importantForAccessibility="no" />
     <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center" android:layout_marginBottom="16.0dip" android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
         <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_channels" style="@style/UiKit.TextView.Large" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_navigation_help_nux_dms.xml b/com.discord/res/layout/widget_navigation_help_nux_dms.xml
index b3565ef3fd..2f368e0065 100644
--- a/com.discord/res/layout/widget_navigation_help_nux_dms.xml
+++ b/com.discord/res/layout/widget_navigation_help_nux_dms.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="@dimen/uikit_spacing_xxlarge" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32.0dip" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/asset_nux_navigation_dms" android:layout_weight="2.0" android:importantForAccessibility="no" />
+    <ImageView android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_marginBottom="32.0dip" android:src="@drawable/asset_nux_navigation_dms" android:layout_weight="2.0" android:importantForAccessibility="no" />
     <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/direct_messages" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center" android:layout_marginBottom="16.0dip" android:text="@string/direct_messages" style="@style/UiKit.TextView.H1.Bold" />
         <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_dms" style="@style/UiKit.TextView.Large" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_navigation_help_nux_guilds.xml b/com.discord/res/layout/widget_navigation_help_nux_guilds.xml
index 87c4aeff9b..046c47fef7 100644
--- a/com.discord/res/layout/widget_navigation_help_nux_guilds.xml
+++ b/com.discord/res/layout/widget_navigation_help_nux_guilds.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="@dimen/uikit_spacing_xxlarge" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32.0dip" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/asset_nux_navigation_guilds" android:layout_weight="2.0" android:importantForAccessibility="no" />
+    <ImageView android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_marginBottom="32.0dip" android:src="@drawable/asset_nux_navigation_guilds" android:layout_weight="2.0" android:importantForAccessibility="no" />
     <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/servers" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center" android:layout_marginBottom="16.0dip" android:text="@string/servers" style="@style/UiKit.TextView.H1.Bold" />
         <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_guild" style="@style/UiKit.TextView.Large" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_notice_dialog.xml b/com.discord/res/layout/widget_notice_dialog.xml
index a45cd2aa44..6c6650d0b2 100644
--- a/com.discord/res/layout/widget_notice_dialog.xml
+++ b/com.discord/res/layout/widget_notice_dialog.xml
@@ -2,17 +2,17 @@
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:id="@id/notice_header_container" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/notice_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:id="@id/notice_header" android:padding="16.0dip" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
         <LinearLayout android:gravity="center" android:id="@id/notice_body_container" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:textAlignment="textStart" style="@style/UiKit.TextView" />
+            <TextView android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="16.0dip" android:layout_width="fill_parent" android:textAlignment="textStart" style="@style/UiKit.TextView" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:id="@id/notice_cancel" android:text="@string/cancel" style="?buttonBarNegativeButtonStyle" />
-        <com.google.android.material.button.MaterialButton android:id="@id/notice_ok" android:text="@string/okay" android:layout_marginStart="@dimen/uikit_spacing_medium" style="?buttonBarPositiveButtonStyle" />
+        <com.google.android.material.button.MaterialButton android:id="@id/notice_ok" android:text="@string/okay" android:layout_marginStart="8.0dip" style="?buttonBarPositiveButtonStyle" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_notice_nux_overlay.xml b/com.discord/res/layout/widget_notice_nux_overlay.xml
index efffb73d18..6f0feaf678 100644
--- a/com.discord/res/layout/widget_notice_nux_overlay.xml
+++ b/com.discord/res/layout/widget_notice_nux_overlay.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?primary_630_bg" android:layout_width="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable"
+<LinearLayout android:background="?primary_630_bg" android:layout_width="wrap_content" android:layout_margin="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:layout_width="fill_parent" android:src="@drawable/img_overlay_nux" android:scaleType="centerCrop" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:text="@string/nux_overlay_title" android:lineSpacingMultiplier="1.0" android:textAllCaps="false" style="@style/UiKit.Dialog.Title" />
-        <TextView android:paddingTop="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/nux_overlay_description" android:textAlignment="center" style="@style/UiKit.Dialog.Body" />
-        <LinearLayout android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0.0dip" android:layout_marginTop="24.0dip" android:text="@string/nux_overlay_title" android:lineSpacingMultiplier="1.0" android:textAllCaps="false" style="@style/UiKit.Dialog.Title" />
+        <TextView android:paddingTop="8.0dip" android:layout_margin="8.0dip" android:text="@string/nux_overlay_description" android:textAlignment="center" style="@style/UiKit.Dialog.Body" />
+        <LinearLayout android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <com.google.android.material.button.MaterialButton android:id="@id/enable_button" android:text="@string/nux_overlay_enable" style="@style/UiKit.Material.Button" />
             <com.google.android.material.button.MaterialButton android:id="@id/cancel_button" android:text="@string/no_thanks" style="@style/UiKit.Material.Button.Transparent" />
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_notice_nux_samsung_link.xml b/com.discord/res/layout/widget_notice_nux_samsung_link.xml
index 305d4ec0cc..37000b17fe 100644
--- a/com.discord/res/layout/widget_notice_nux_samsung_link.xml
+++ b/com.discord/res/layout/widget_notice_nux_samsung_link.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?primary_630_bg" android:layout_width="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable"
+<LinearLayout android:background="?primary_630_bg" android:layout_width="wrap_content" android:layout_margin="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:layout_width="fill_parent" android:src="@drawable/img_game_presence_nux" android:scaleType="centerCrop" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:text="@string/nux_samsung_game_presence_link_title" android:lineSpacingMultiplier="1.0" android:textAllCaps="false" style="@style/UiKit.Dialog.Title" />
-        <TextView android:paddingTop="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/nux_samsung_game_presence_link_description" android:textAlignment="center" style="@style/UiKit.Dialog.Body" />
-        <LinearLayout android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0.0dip" android:layout_marginTop="24.0dip" android:text="@string/nux_samsung_game_presence_link_title" android:lineSpacingMultiplier="1.0" android:textAllCaps="false" style="@style/UiKit.Dialog.Title" />
+        <TextView android:paddingTop="8.0dip" android:layout_margin="8.0dip" android:text="@string/nux_samsung_game_presence_link_description" android:textAlignment="center" style="@style/UiKit.Dialog.Body" />
+        <LinearLayout android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <com.google.android.material.button.MaterialButton android:id="@id/enable_button" android:text="@string/nux_samsung_game_presence_link_enable" style="@style/UiKit.Material.Button" />
             <com.google.android.material.button.MaterialButton android:id="@id/cancel_button" android:text="@string/no_thanks" style="@style/UiKit.Material.Button.Transparent" />
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_notice_popup.xml b/com.discord/res/layout/widget_notice_popup.xml
index 96e5bb8541..59e5b10a4c 100644
--- a/com.discord/res/layout/widget_notice_popup.xml
+++ b/com.discord/res/layout/widget_notice_popup.xml
@@ -2,8 +2,8 @@
 <LinearLayout android:background="?notice_popup_bg" android:focusable="false" android:focusableInTouchMode="false" android:maxWidth="@dimen/popup_notif_max_width" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" app:roundAsCircle="true" style="@style/Avatar.Notification" />
-        <LinearLayout android:layout_gravity="center_vertical" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="8.0dip" app:roundAsCircle="true" style="@style/Avatar.Notification" />
+        <LinearLayout android:layout_gravity="center_vertical" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Subtext.SingleLine" />
             <com.discord.app.AppTextView android:textColor="?colorTextNormal" android:ellipsize="end" android:id="@id/popup_body" android:maxLines="3" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_notice_popup_channel.xml b/com.discord/res/layout/widget_notice_popup_channel.xml
index 51657f80aa..e2b9a30ae4 100644
--- a/com.discord/res/layout/widget_notice_popup_channel.xml
+++ b/com.discord/res/layout/widget_notice_popup_channel.xml
@@ -2,12 +2,12 @@
 <LinearLayout android:background="?notice_popup_bg" android:focusable="false" android:focusableInTouchMode="false" android:maxWidth="@dimen/popup_notif_max_width" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
-        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
-            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.SingleLine" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="8.0dip" style="@style/Avatar.Notification" />
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="32.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
             <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_subtitle" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.SingleLine" />
-            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
+            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="2.0dip" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="64.0dip" android:layout_height="64.0dip" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
         </androidx.constraintlayout.widget.ConstraintLayout>
         <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_nux_channel_prompt.xml b/com.discord/res/layout/widget_nux_channel_prompt.xml
index 2885c62caf..ac8df88d3e 100644
--- a/com.discord/res/layout/widget_nux_channel_prompt.xml
+++ b/com.discord/res/layout/widget_nux_channel_prompt.xml
@@ -2,20 +2,20 @@
 <RelativeLayout android:background="?primary_600" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.appcompat.widget.Toolbar android:id="@id/toolbar" android:background="@color/transparent" android:layout_alignParentTop="true" style="@style/AppTheme.Toolbar">
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:layout_gravity="end" android:id="@id/nuf_channel_prompt_skip_button" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:text="@string/skip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:layout_gravity="end" android:id="@id/nuf_channel_prompt_skip_button" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:text="@string/skip" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Semibold" />
     </androidx.appcompat.widget.Toolbar>
-    <androidx.core.widget.NestedScrollView android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_below="@id/toolbar" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
+    <androidx.core.widget.NestedScrollView android:paddingBottom="8.0dip" android:layout_below="@id/toolbar" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <FrameLayout android:layout_gravity="center" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_marginBottom="@dimen/uikit_spacing_medium">
+            <FrameLayout android:layout_gravity="center" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_marginBottom="8.0dip">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/nuf_channel_prompt_guild_icon" app:placeholderImage="@drawable/asset_default_avatar_32dp" style="@style/Avatar.Large" />
-                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@id/nuf_channel_prompt_guild_icon_name" android:padding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Large.SingleLine" />
+                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@id/nuf_channel_prompt_guild_icon_name" android:padding="4.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
             </FrameLayout>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:layout_gravity="center" android:id="@id/nuf_channel_prompt_guild_name" android:layout_marginBottom="@dimen/uikit_spacing_large" android:maxLines="1" style="@style/UiKit.TextView.Semibold" />
-            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nuf_channel_prompt_subtitle" app:stv_title="@string/nuf_channel_prompt_title" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/nuf_channel_prompt_topic_wrap" android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/nuf_channel_prompt_topic" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:layout_gravity="center" android:id="@id/nuf_channel_prompt_guild_name" android:layout_marginBottom="16.0dip" android:maxLines="1" style="@style/UiKit.TextView.Semibold" />
+            <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" app:stv_subtitle="@string/nuf_channel_prompt_subtitle" app:stv_title="@string/nuf_channel_prompt_title" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/nuf_channel_prompt_topic_wrap" android:layout_marginBottom="16.0dip" android:hint="@string/nuf_channel_prompt_topic" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
             </com.google.android.material.textfield.TextInputLayout>
-            <com.discord.views.LoadingButton android:id="@id/nuf_channel_prompt_cta_button" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_padding_bottom="@dimen/uikit_spacing_large" app:lb_padding_top="@dimen/uikit_spacing_large" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_channel_prompt_cta" app:lb_text_color="@drawable/button_text_color_primary_100" app:lb_text_size="@dimen/uikit_textsize_large" />
+            <com.discord.views.LoadingButton android:id="@id/nuf_channel_prompt_cta_button" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_padding_bottom="16.0dip" app:lb_padding_top="16.0dip" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_channel_prompt_cta" app:lb_text_color="@drawable/button_text_color_primary_100" app:lb_text_size="@dimen/uikit_textsize_large" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_nux_guild_template.xml b/com.discord/res/layout/widget_nux_guild_template.xml
index fe5f1da1e3..9b52d0c410 100644
--- a/com.discord/res/layout/widget_nux_guild_template.xml
+++ b/com.discord/res/layout/widget_nux_guild_template.xml
@@ -2,39 +2,39 @@
 <LinearLayout android:orientation="vertical" android:background="?primary_600" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.appcompat.widget.Toolbar android:background="@color/transparent" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar" />
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_height="0.0dip" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_height="0.0dip" android:layout_weight="1.0" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
         <LinearLayout android:id="@id/nux_guild_template_section_top" app:layout_constraintBottom_toTopOf="@id/nux_guild_template_section_custom_label" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_selector_title" style="@style/UiKit.TextView.H1.Bold" />
+            <TextView android:layout_gravity="center" android:layout_marginBottom="8.0dip" android:text="@string/guild_template_selector_title" style="@style/UiKit.TextView.H1.Bold" />
         </LinearLayout>
-        <TextView android:gravity="center" android:layout_gravity="center" android:id="@id/nux_guild_template_section_custom_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/guild_template_selector_description" app:layout_constraintBottom_toTopOf="@id/nux_guild_template_section_custom" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_top" style="@style/UiKit.TextView" />
+        <TextView android:gravity="center" android:layout_gravity="center" android:id="@id/nux_guild_template_section_custom_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" android:text="@string/guild_template_selector_description" app:layout_constraintBottom_toTopOf="@id/nux_guild_template_section_custom" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_top" style="@style/UiKit.TextView" />
         <androidx.core.widget.NestedScrollView android:id="@id/nux_guild_template_section_custom" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/nux_guild_template_section_bottom" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_custom_label" style="@style/UiKit.ViewGroup.NestedScrollView">
             <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_create" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/Nux.GuildTemplates.Card">
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_create" android:layout_marginBottom="24.0dip" style="@style/Nux.GuildTemplates.Card">
                     <TextView android:text="@string/guild_template_header_create" android:drawableStart="@drawable/drawable_guild_template_create" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
                 </com.google.android.material.card.MaterialCardView>
-                <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_selector_option_header" />
-                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_gaming" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/guild_template_selector_option_header" />
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_gaming" android:layout_marginBottom="8.0dip" style="@style/Nux.GuildTemplates.Card">
                     <TextView android:text="@string/guild_template_header_gaming" android:drawableStart="@drawable/drawable_guild_template_gaming" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
                 </com.google.android.material.card.MaterialCardView>
-                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_friend" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_friend" android:layout_marginBottom="8.0dip" style="@style/Nux.GuildTemplates.Card">
                     <TextView android:text="@string/guild_template_header_friend" android:drawableStart="@drawable/drawable_guild_template_friend" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
                 </com.google.android.material.card.MaterialCardView>
-                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_study" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_study" android:layout_marginBottom="8.0dip" style="@style/Nux.GuildTemplates.Card">
                     <TextView android:text="@string/guild_template_header_study" android:drawableStart="@drawable/drawable_guild_template_study" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
                 </com.google.android.material.card.MaterialCardView>
-                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_creator" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_creator" android:layout_marginBottom="8.0dip" style="@style/Nux.GuildTemplates.Card">
                     <TextView android:text="@string/guild_template_header_creator" android:drawableStart="@drawable/drawable_guild_template_creator" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
                 </com.google.android.material.card.MaterialCardView>
-                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_club" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_club" android:layout_marginBottom="8.0dip" style="@style/Nux.GuildTemplates.Card">
                     <TextView android:text="@string/guild_template_header_clubs" android:drawableStart="@drawable/drawable_guild_template_club" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
                 </com.google.android.material.card.MaterialCardView>
-                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_community" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_community" android:layout_marginBottom="8.0dip" style="@style/Nux.GuildTemplates.Card">
                     <TextView android:text="@string/guild_template_header_community" android:drawableStart="@drawable/drawable_guild_template_community" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
                 </com.google.android.material.card.MaterialCardView>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
-        <LinearLayout android:id="@id/nux_guild_template_section_bottom" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_custom" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/nuf_have_an_invite_already" style="@style/UiKit.TextView.Semibold" />
+        <LinearLayout android:id="@id/nux_guild_template_section_bottom" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_custom" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:layout_gravity="center_horizontal" android:layout_marginBottom="16.0dip" android:text="@string/nuf_have_an_invite_already" style="@style/UiKit.TextView.Semibold" />
             <com.google.android.material.button.MaterialButton android:id="@id/nux_guild_template_action_join" android:text="@string/nuf_join_a_friend" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/com.discord/res/layout/widget_nux_post_registration.xml b/com.discord/res/layout/widget_nux_post_registration.xml
index cb79d3561f..68a7cb7d8d 100644
--- a/com.discord/res/layout/widget_nux_post_registration.xml
+++ b/com.discord/res/layout/widget_nux_post_registration.xml
@@ -4,13 +4,13 @@
     <include layout="@layout/widget_auth_header" />
     <androidx.core.widget.NestedScrollView android:id="@id/guild_join_content" android:layout_height="fill_parent" android:fillViewport="false" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
-            <com.discord.views.ScreenTitleView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nux_post_reg_join_server_description" app:stv_title="@string/nux_post_reg_join_server_title" />
-            <LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-                <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_join_invite" android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/form_label_invite_link" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
+            <com.discord.views.ScreenTitleView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:stv_subtitle="@string/nux_post_reg_join_server_description" app:stv_title="@string/nux_post_reg_join_server_title" />
+            <LinearLayout android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+                <com.google.android.material.textfield.TextInputLayout android:id="@id/guild_join_invite" android:layout_marginBottom="16.0dip" android:hint="@string/form_label_invite_link" app:endIconMode="clear_text" style="@style/UiKit.TextInputLayout">
                     <com.google.android.material.textfield.TextInputEditText android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText" />
                 </com.google.android.material.textfield.TextInputLayout>
                 <include layout="@layout/widget_guild_join_invite_examples" />
-                <com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/nux_post_reg_join_server_skip" style="@style/UiKit.AuthButton.Material" />
+                <com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="16.0dip" android:text="@string/nux_post_reg_join_server_skip" style="@style/UiKit.AuthButton.Material" />
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_oauth_authorize.xml b/com.discord/res/layout/widget_oauth_authorize.xml
index 61321a1115..b03d5f3d43 100644
--- a/com.discord/res/layout/widget_oauth_authorize.xml
+++ b/com.discord/res/layout/widget_oauth_authorize.xml
@@ -4,43 +4,43 @@
     <ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/drawable_auth_splash" android:scaleType="centerCrop" android:importantForAccessibility="no" />
     <androidx.core.widget.NestedScrollView android:layout_gravity="center" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.ScrollView">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_gravity="center_horizontal" android:id="@id/oauth_authorize_logo" android:layout_width="fill_parent" android:layout_height="32.0dip" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_auth_logo" android:scaleType="centerInside" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
-            <com.google.android.material.card.MaterialCardView android:id="@id/oauth_authorize_card" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundFloating" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip" style="@style/Widget.MaterialComponents.CardView">
+            <ImageView android:layout_gravity="center_horizontal" android:id="@id/oauth_authorize_logo" android:layout_width="fill_parent" android:layout_height="32.0dip" android:layout_marginTop="32.0dip" android:layout_marginBottom="32.0dip" android:src="@drawable/img_auth_logo" android:scaleType="centerInside" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
+            <com.google.android.material.card.MaterialCardView android:id="@id/oauth_authorize_card" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?colorBackgroundFloating" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip" style="@style/Widget.MaterialComponents.CardView">
                 <LinearLayout android:id="@id/oauth_authorize_not_supported" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/scope_unsupported_on_android" style="@style/UiKit.TextView.H1" />
-                    <TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:text="@string/scope_unsupported_on_android_description" android:drawableBottom="?img_baddies" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-                    <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_browser" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/open_in_browser" style="@style/UiKit.Material.Button" />
-                    <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_cancel" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
+                    <TextView android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/scope_unsupported_on_android" style="@style/UiKit.TextView.H1" />
+                    <TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="24.0dip" android:text="@string/scope_unsupported_on_android_description" android:drawableBottom="?img_baddies" android:drawablePadding="16.0dip" style="@style/UiKit.TextView" />
+                    <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_browser" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/open_in_browser" style="@style/UiKit.Material.Button" />
+                    <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_unsupported_cancel" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
                 </LinearLayout>
                 <LinearLayout android:id="@id/oauth_authorize_content" android:visibility="gone" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingRight="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout">
+                    <LinearLayout android:gravity="center" android:paddingLeft="32.0dip" android:paddingTop="32.0dip" android:paddingRight="32.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                         <LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_authorize_application_icon" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" style="@style/Avatar.XXLarge" />
+                            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_authorize_application_icon" android:importantForAccessibility="no" android:layout_marginEnd="24.0dip" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" style="@style/Avatar.XXLarge" />
                             <TextView android:textSize="40.0sp" android:textColor="?colorBackgroundAccent" android:layout_height="fill_parent" android:layout_marginLeft="2.0dip" android:layout_marginRight="2.0dip" android:text="..." style="@style/UiKit.TextView.SingleLine" />
-                            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_authorize_user_icon" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_xlarge" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" style="@style/Avatar.XXLarge" />
+                            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_authorize_user_icon" android:importantForAccessibility="no" android:layout_marginStart="24.0dip" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" style="@style/Avatar.XXLarge" />
                         </LinearLayout>
-                        <TextView android:textSize="20.0sp" android:id="@id/oauth_authorize_application_name" android:layout_marginTop="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView.H1.Bold" />
+                        <TextView android:textSize="20.0sp" android:id="@id/oauth_authorize_application_name" android:layout_marginTop="24.0dip" style="@style/UiKit.TextView.H1.Bold" />
                         <TextView android:id="@id/oauth_authorize_connect_label" android:text="@string/oauth2_requests_account_access" style="@style/UiKit.TextView.Large" />
                     </LinearLayout>
-                    <View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.Divider" />
+                    <View android:layout_marginLeft="16.0dip" android:layout_marginTop="24.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" style="@style/UiKit.Divider" />
                     <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/oauth_authorize_permissions_label_tv" android:padding="0.0dip" style="@style/UiKit.Settings.Item.Header" />
-                    <androidx.recyclerview.widget.RecyclerView android:id="@id/oauth_authorize_permissions_list" android:clipToPadding="false" android:layout_height="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
-                    <View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.Divider" />
-                    <RelativeLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
+                    <androidx.recyclerview.widget.RecyclerView android:id="@id/oauth_authorize_permissions_list" android:clipToPadding="false" android:layout_height="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
+                    <View android:layout_marginLeft="16.0dip" android:layout_marginTop="24.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" style="@style/UiKit.Divider" />
+                    <RelativeLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
                         <ImageView android:id="@id/oauth_authorize_age_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_emoji_recent_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?colorTextMuted" style="@style/UiKit.ImageView" />
-                        <com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_age_notice" android:padding="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_toEndOf="@id/oauth_authorize_age_notice_icon" android:layout_alignParentEnd="true" app:tv_markdown_enabled="true" style="@style/UiKit.Auth.Note.Rotatable" />
+                        <com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_age_notice" android:padding="0.0dip" android:layout_marginStart="8.0dip" android:layout_toEndOf="@id/oauth_authorize_age_notice_icon" android:layout_alignParentEnd="true" app:tv_markdown_enabled="true" style="@style/UiKit.Auth.Note.Rotatable" />
                     </RelativeLayout>
-                    <RelativeLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
+                    <RelativeLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
                         <ImageView android:id="@id/oauth_authorize_security_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_shieldstar_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?colorTextMuted" style="@style/UiKit.ImageView" />
-                        <com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_security_notice" android:padding="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_toEndOf="@id/oauth_authorize_security_notice_icon" android:layout_alignParentEnd="true" app:tv_markdown_enabled="true" style="@style/UiKit.Auth.Note.Rotatable" />
+                        <com.discord.app.AppTextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_security_notice" android:padding="0.0dip" android:layout_marginStart="8.0dip" android:layout_toEndOf="@id/oauth_authorize_security_notice_icon" android:layout_alignParentEnd="true" app:tv_markdown_enabled="true" style="@style/UiKit.Auth.Note.Rotatable" />
                     </RelativeLayout>
-                    <LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layoutDirection="rtl" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
-                        <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_grant" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/authorize" android:layout_weight="1.0" style="@style/UiKit.Material.Button" />
-                        <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_deny" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Transparent" />
+                    <LinearLayout android:layout_marginTop="24.0dip" android:layoutDirection="rtl" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
+                        <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_grant" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/authorize" android:layout_weight="1.0" style="@style/UiKit.Material.Button" />
+                        <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_deny" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/cancel" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Transparent" />
                     </LinearLayout>
                 </LinearLayout>
                 <LinearLayout android:id="@id/oauth_authorize_loading" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <ProgressBar android:layout_gravity="center" android:padding="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_large" />
+                    <ProgressBar android:layout_gravity="center" android:padding="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16.0dip" />
                     <com.google.android.material.button.MaterialButton android:id="@id/oauth_authorize_loading_cancel" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
diff --git a/com.discord/res/layout/widget_payment_source_edit_dialog.xml b/com.discord/res/layout/widget_payment_source_edit_dialog.xml
index feb1fc6f39..108f9b7d14 100644
--- a/com.discord/res/layout/widget_payment_source_edit_dialog.xml
+++ b/com.discord/res/layout/widget_payment_source_edit_dialog.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme.Toolbar">
-        <com.discord.views.LoadingButton android:layout_gravity="end|center" android:id="@id/dialog_save" android:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:lb_progress_color="?primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?primary_100" />
+    <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme.Toolbar">
+        <com.discord.views.LoadingButton android:layout_gravity="end|center" android:id="@id/dialog_save" android:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" app:lb_progress_color="?primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?primary_100" />
     </androidx.appcompat.widget.Toolbar>
     <androidx.core.widget.NestedScrollView android:layout_weight="1.0" style="@style/UiKit.ViewGroup.NestedScrollView">
-        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
-            <com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
-            <com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
-            <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
+        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
+            <com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="8.0dip" />
+            <com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="8.0dip" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:layout_marginTop="8.0dip" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_name" android:hint="@string/billing_address_name" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit.TextInputLayout.EditText" />
             </com.google.android.material.textfield.TextInputLayout>
@@ -31,8 +31,8 @@
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_country" android:focusable="false" android:hint="@string/billing_address_country" app:endIconDrawable="@drawable/ic_lock_white_a60_16dp" app:endIconMode="custom" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:textColor="?primary_400" android:inputType="none" style="@style/UiKit.TextInputLayout.EditText" />
             </com.google.android.material.textfield.TextInputLayout>
-            <CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="@dimen/uikit_spacing_medium" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
-            <com.google.android.material.button.MaterialButton android:id="@id/dialog_delete" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/payment_source_delete" style="@style/UiKit.Material.Button.Red.Outline" />
+            <CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="8.0dip" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
+            <com.google.android.material.button.MaterialButton android:id="@id/dialog_delete" android:layout_marginTop="24.0dip" android:layout_marginBottom="24.0dip" android:text="@string/payment_source_delete" style="@style/UiKit.Material.Button.Red.Outline" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_platform_rich_presence.xml b/com.discord/res/layout/widget_platform_rich_presence.xml
index 53177300fe..576ee66457 100644
--- a/com.discord/res/layout/widget_platform_rich_presence.xml
+++ b/com.discord/res/layout/widget_platform_rich_presence.xml
@@ -9,12 +9,12 @@
             <FrameLayout android:id="@id/rich_presence_image_small_wrap" android:background="?colorPrimaryCircle" android:padding="@dimen/uikit_image_border_size" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/image_bottom_guideline" app:layout_constraintEnd_toEndOf="@id/image_bottom_guideline" app:layout_constraintRight_toRightOf="@id/image_bottom_guideline">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_small" android:visibility="gone" app:roundAsCircle="true" style="@style/Avatar.Medium" />
             </FrameLayout>
-            <LinearLayout android:id="@id/rich_presence_container_data" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@id/rich_presence_image_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/rich_presence_container_data" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@id/rich_presence_image_large" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:ellipsize="marquee" android:id="@id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile.PresenceSection.Body.HeaderText" />
                 <TextView android:id="@id/rich_presence_time" style="@style/UserProfile.PresenceSection.Body.Subtext" />
             </LinearLayout>
             <androidx.constraintlayout.widget.Barrier android:id="@id/barrier" android:layout_width="fill_parent" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="rich_presence_container_data,rich_presence_image_large" />
-            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_primary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UserProfile.PresenceSection.MaterialButton" />
+            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_primary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UserProfile.PresenceSection.MaterialButton" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_premium_guild_transfer.xml b/com.discord/res/layout/widget_premium_guild_transfer.xml
index 5d1f4dbd01..8cecf95139 100644
--- a/com.discord/res/layout/widget_premium_guild_transfer.xml
+++ b/com.discord/res/layout/widget_premium_guild_transfer.xml
@@ -5,16 +5,16 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:fillViewport="true" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:gravity="center" android:layout_marginLeft="16.0dip" android:layout_marginTop="64.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <ImageView android:src="@drawable/drawable_boost_removal" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-            <TextView android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_header" style="@style/UiKit.TextView.H1.Bold" />
-            <TextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:id="@id/premium_guild_transfer_confirmation_blurb" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscribe_confirm_transfer_blurb" style="@style/UiKit.TextView" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/premium_guild_transfer_previous_guild_header" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
-            <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_previous_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/premium_guild_transfer_target_guild_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
-            <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_target_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
-            <TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_transfer_error" android:visibility="invisible" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
-            <com.google.android.material.button.MaterialButton android:id="@id/premium_guild_transfer_select" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/premium_guild_subscribe_transfer_confirm_confirmation" style="@style/UiKit.Material.Button" />
+            <TextView android:layout_marginTop="32.0dip" android:text="@string/premium_guild_subscribe_confirm_transfer_header" style="@style/UiKit.TextView.H1.Bold" />
+            <TextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:id="@id/premium_guild_transfer_confirmation_blurb" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:text="@string/premium_guild_subscribe_confirm_transfer_blurb" style="@style/UiKit.TextView" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/premium_guild_transfer_previous_guild_header" android:layout_height="wrap_content" android:layout_marginTop="32.0dip" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+            <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_previous_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/premium_guild_transfer_target_guild_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+            <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_target_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
+            <TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_transfer_error" android:visibility="invisible" android:layout_marginBottom="8.0dip" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
+            <com.google.android.material.button.MaterialButton android:id="@id/premium_guild_transfer_select" android:layout_marginBottom="24.0dip" android:text="@string/premium_guild_subscribe_transfer_confirm_confirmation" style="@style/UiKit.Material.Button" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
diff --git a/com.discord/res/layout/widget_premium_upsell.xml b/com.discord/res/layout/widget_premium_upsell.xml
index 9723616e02..267b36dda9 100644
--- a/com.discord/res/layout/widget_premium_upsell.xml
+++ b/com.discord/res/layout/widget_premium_upsell.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:layout_gravity="center" android:paddingLeft="@dimen/uikit_spacing_xlarge" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center" android:layout_gravity="center" android:paddingLeft="24.0dip" android:paddingTop="24.0dip" android:paddingRight="24.0dip" android:paddingBottom="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/premium_upsell_img" android:layout_height="80.0dip" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="18.0dip" android:textColor="@color/primary_100" android:gravity="center_horizontal" android:id="@id/premium_upsell_header" android:layout_marginTop="@dimen/uikit_spacing_large" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-    <TextView android:textSize="14.0dip" android:textColor="@color/primary_300" android:gravity="center_horizontal" android:id="@id/premium_upsell_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+    <TextView android:textSize="18.0dip" android:textColor="@color/primary_100" android:gravity="center_horizontal" android:id="@id/premium_upsell_header" android:layout_marginTop="16.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+    <TextView android:textSize="14.0dip" android:textColor="@color/primary_300" android:gravity="center_horizontal" android:id="@id/premium_upsell_body" android:layout_marginTop="8.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_prune_users.xml b/com.discord/res/layout/widget_prune_users.xml
index a971220c33..1bb3882b25 100644
--- a/com.discord/res/layout/widget_prune_users.xml
+++ b/com.discord/res/layout/widget_prune_users.xml
@@ -2,17 +2,17 @@
 <ScrollView style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:ellipsize="end" android:id="@id/prune_user_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/prune_members" android:maxLines="1" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:ellipsize="end" android:id="@id/prune_user_header" android:padding="16.0dip" android:text="@string/prune_members" android:maxLines="1" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
         <TextView android:text="@string/form_label_last_seen" style="@style/UiKit.Settings.Item.Header" />
         <com.discord.views.CheckedSetting android:id="@id/prune_users_history_1_radio" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
         <com.discord.views.CheckedSetting android:id="@id/prune_users_history_2_radio" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
-        <RelativeLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
+        <RelativeLayout android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
             <ProgressBar android:id="@id/prune_users_loading_progressbar" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="fill_parent" android:indeterminate="true" android:layout_alignTop="@id/prune_users_estimate_text" android:layout_alignBottom="@id/prune_users_estimate_text" android:layout_centerInParent="true" />
             <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/prune_users_estimate_text" android:layout_centerInParent="true" style="@style/UiKit.TextView" />
         </RelativeLayout>
         <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
-            <com.google.android.material.button.MaterialButton android:id="@id/prune_user_cancel" android:text="@string/cancel" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Transparent.Fit" />
+            <com.google.android.material.button.MaterialButton android:id="@id/prune_user_cancel" android:text="@string/cancel" android:layout_marginEnd="8.0dip" style="@style/UiKit.Material.Button.Transparent.Fit" />
             <com.google.android.material.button.MaterialButton android:id="@id/prune_user_prune" android:text="@string/prune" style="@style/UiKit.Material.Button.Red.Fit" />
         </LinearLayout>
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_qr_scanner.xml b/com.discord/res/layout/widget_qr_scanner.xml
index af7e4d38c2..cf55ec3b51 100644
--- a/com.discord/res/layout/widget_qr_scanner.xml
+++ b/com.discord/res/layout/widget_qr_scanner.xml
@@ -2,7 +2,7 @@
 <FrameLayout android:background="@color/black" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <me.dm7.barcodescanner.zxing.ZXingScannerView android:id="@id/qr_scanner" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-    <com.google.android.material.chip.Chip android:textAppearance="@style/UiKit.TextAppearance" android:textColor="@color/white" android:layout_gravity="bottom|center" android:id="@id/qr_scanner_chip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/qr_code_in_app_scanner_only" app:chipBackgroundColor="@color/brand" />
+    <com.google.android.material.chip.Chip android:textAppearance="@style/UiKit.TextAppearance" android:textColor="@color/white" android:layout_gravity="bottom|center" android:id="@id/qr_scanner_chip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" android:text="@string/qr_code_in_app_scanner_only" app:chipBackgroundColor="@color/brand" />
     <com.google.android.material.appbar.AppBarLayout android:layout_gravity="top" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
         <androidx.appcompat.widget.Toolbar android:background="@color/primary_900_alpha_80" style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/com.discord/res/layout/widget_remote_auth.xml b/com.discord/res/layout/widget_remote_auth.xml
index 9dafd89905..ea4719e223 100644
--- a/com.discord/res/layout/widget_remote_auth.xml
+++ b/com.discord/res/layout/widget_remote_auth.xml
@@ -2,9 +2,9 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/drawable_auth_splash" android:scaleType="centerCrop" android:importantForAccessibility="no" />
-    <ImageView android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_square" android:tint="@color/white" android:layout_centerHorizontal="true" android:importantForAccessibility="no" />
-    <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_centerInParent="true" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="8.0dip">
-        <com.discord.app.AppViewFlipper android:id="@id/remote_auth_view_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_large" android:measureAllChildren="false" android:animateLayoutChanges="true">
+    <ImageView android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginTop="16.0dip" android:src="@drawable/img_logo_square" android:tint="@color/white" android:layout_centerHorizontal="true" android:importantForAccessibility="no" />
+    <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_centerInParent="true" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="8.0dip">
+        <com.discord.app.AppViewFlipper android:id="@id/remote_auth_view_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="16.0dip" android:measureAllChildren="false" android:animateLayoutChanges="true">
             <include layout="@layout/widget_remote_auth_pending_login" />
             <include layout="@layout/widget_remote_auth_not_found" />
             <RelativeLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="300.0dip">
diff --git a/com.discord/res/layout/widget_remote_auth_not_found.xml b/com.discord/res/layout/widget_remote_auth_not_found.xml
index c6c8a10c2f..cb97017b0f 100644
--- a/com.discord/res/layout/widget_remote_auth_not_found.xml
+++ b/com.discord/res/layout/widget_remote_auth_not_found.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_remote_auth_not_found" android:importantForAccessibility="no" />
-    <TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/qr_code_not_found" style="@style/UiKit.TextView.H1" />
-    <TextView android:textColor="?colorHeaderSecondary" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/qr_code_not_found_description" android:textAlignment="center" style="@style/UiKit.TextView" />
+    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="24.0dip" android:src="@drawable/img_remote_auth_not_found" android:importantForAccessibility="no" />
+    <TextView android:layout_marginBottom="8.0dip" android:text="@string/qr_code_not_found" style="@style/UiKit.TextView.H1" />
+    <TextView android:textColor="?colorHeaderSecondary" android:layout_marginBottom="32.0dip" android:text="@string/qr_code_not_found_description" android:textAlignment="center" style="@style/UiKit.TextView" />
     <com.google.android.material.button.MaterialButton android:id="@id/remote_auth_not_found_cancel_button" android:text="@string/cancel" style="@style/UiKit.Material.Button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_remote_auth_pending_login.xml b/com.discord/res/layout/widget_remote_auth_pending_login.xml
index 2108b418b4..fe488bd751 100644
--- a/com.discord/res/layout/widget_remote_auth_pending_login.xml
+++ b/com.discord/res/layout/widget_remote_auth_pending_login.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_remote_auth_loaded" android:importantForAccessibility="no" />
+    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="24.0dip" android:src="@drawable/img_remote_auth_loaded" android:importantForAccessibility="no" />
     <TextView android:gravity="center" android:text="@string/qr_code_login_confirm" style="@style/UiKit.TextView.H1" />
-    <TextView android:textColor="@color/status_red_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_description" android:textAlignment="center" style="@style/UiKit.TextView" />
-    <androidx.cardview.widget.CardView android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip">
+    <TextView android:textColor="@color/status_red_500" android:layout_marginTop="8.0dip" android:text="@string/confirm_qr_description" android:textAlignment="center" style="@style/UiKit.TextView" />
+    <androidx.cardview.widget.CardView android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="24.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip">
         <com.google.android.material.switchmaterial.SwitchMaterial android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_temporary_switch" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit.ListItem.Switch" />
     </androidx.cardview.widget.CardView>
-    <com.google.android.material.button.MaterialButton android:id="@id/remote_auth_login_button" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_login_on_computer" style="@style/UiKit.Material.Button" />
+    <com.google.android.material.button.MaterialButton android:id="@id/remote_auth_login_button" android:layout_marginTop="24.0dip" android:layout_marginBottom="8.0dip" android:text="@string/confirm_qr_login_on_computer" style="@style/UiKit.Material.Button" />
     <com.google.android.material.button.MaterialButton android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_cancel_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_remote_auth_success.xml b/com.discord/res/layout/widget_remote_auth_success.xml
index 32dd440218..665a81d296 100644
--- a/com.discord/res/layout/widget_remote_auth_success.xml
+++ b/com.discord/res/layout/widget_remote_auth_success.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_remote_auth_finished" android:importantForAccessibility="no" />
+    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="24.0dip" android:src="@drawable/img_remote_auth_finished" android:importantForAccessibility="no" />
     <TextView android:text="@string/qr_code_login_success" style="@style/UiKit.TextView.H1" />
-    <TextView android:textColor="?colorHeaderSecondary" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/qr_code_login_success_flavor" android:textAlignment="center" style="@style/UiKit.TextView" />
-    <com.google.android.material.button.MaterialButton android:id="@id/remote_auth_finish_button" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:text="@string/_continue" style="@style/UiKit.Material.Button" />
+    <TextView android:textColor="?colorHeaderSecondary" android:layout_marginTop="8.0dip" android:text="@string/qr_code_login_success_flavor" android:textAlignment="center" style="@style/UiKit.TextView" />
+    <com.google.android.material.button.MaterialButton android:id="@id/remote_auth_finish_button" android:layout_marginTop="24.0dip" android:text="@string/_continue" style="@style/UiKit.Material.Button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search_results.xml b/com.discord/res/layout/widget_search_results.xml
index 5c47eb4247..18ce53508f 100644
--- a/com.discord/res/layout/widget_search_results.xml
+++ b/com.discord/res/layout/widget_search_results.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView android:id="@id/search_results_list" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior"
+<androidx.recyclerview.widget.RecyclerView android:id="@id/search_results_list" android:paddingBottom="64.0dip" android:scrollbars="vertical" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_boost_confirmation.xml b/com.discord/res/layout/widget_server_boost_confirmation.xml
index 06e3ebda3b..b26041d8cd 100644
--- a/com.discord/res/layout/widget_server_boost_confirmation.xml
+++ b/com.discord/res/layout/widget_server_boost_confirmation.xml
@@ -6,15 +6,15 @@
     </com.google.android.material.appbar.AppBarLayout>
     <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior">
         <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:fillViewport="true" android:layout_above="@id/boost_confirmation_button_container">
-            <LinearLayout android:gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:gravity="center" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <ImageView android:src="@drawable/drawable_nitro_server_boost" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-                <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscribe_confirm_blurb" style="@style/UiKit.TextView.H1.Bold" />
-                <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/boost_confirmation_confirmation_view" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
+                <TextView android:layout_marginTop="8.0dip" android:text="@string/premium_guild_subscribe_confirm_blurb" style="@style/UiKit.TextView.H1.Bold" />
+                <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/boost_confirmation_confirmation_view" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
                 <TextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:id="@id/boost_confirmation_cooldown_warning" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/premium_guild_subscribe_confirm_cooldown_warning" style="@style/UiKit.TextView" />
             </LinearLayout>
         </ScrollView>
-        <LinearLayout android:id="@id/boost_confirmation_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textColor="@color/status_red_500" android:id="@id/boost_confirmation_error" android:visibility="invisible" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
+        <LinearLayout android:id="@id/boost_confirmation_button_container" android:layout_margin="16.0dip" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:textColor="@color/status_red_500" android:id="@id/boost_confirmation_error" android:visibility="invisible" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
             <com.google.android.material.button.MaterialButton android:id="@id/boost_confirmation_select" android:text="@string/premium_guild_subscribe_confirm_confirmation" style="@style/UiKit.Material.Button" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/com.discord/res/layout/widget_server_boost_status.xml b/com.discord/res/layout/widget_server_boost_status.xml
index f9b3e51b79..89a9e8afc3 100644
--- a/com.discord/res/layout/widget_server_boost_status.xml
+++ b/com.discord/res/layout/widget_server_boost_status.xml
@@ -7,25 +7,25 @@
     <com.discord.app.AppViewFlipper android:id="@id/boost_status_flipper" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_marginBottom="8.0dip" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <com.google.android.material.button.MaterialButton android:id="@id/boost_status_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
         <androidx.core.widget.NestedScrollView android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.NestedScrollView">
-            <LinearLayout android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_horizontal" android:id="@id/boost_status_num_boosts" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_boosted_badge_18dp" style="@style/UiKit.TextView.H1" />
-                <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_blurb_mobile" style="@style/UiKit.TextView" />
-                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/boost_status_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_subscribe_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit.Material.Button" />
-                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_gift_button" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_gift_premium" app:icon="@drawable/ic_gift_white_16dp" app:iconGravity="textStart" app:iconPadding="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Secondary" />
-                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/boost_status_protip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-                <include android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" layout="@layout/view_premium_guild_progress_bar" />
+            <LinearLayout android:paddingTop="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:layout_gravity="center_horizontal" android:id="@id/boost_status_num_boosts" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_boosted_badge_18dp" style="@style/UiKit.TextView.H1" />
+                <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_perks_modal_blurb_mobile" style="@style/UiKit.TextView" />
+                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/boost_status_learn_more" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
+                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_subscribe_button" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit.Material.Button" />
+                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_gift_button" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_perks_modal_button_gift_premium" app:icon="@drawable/ic_gift_white_16dp" app:iconGravity="textStart" app:iconPadding="8.0dip" style="@style/UiKit.Material.Button.Secondary" />
+                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/boost_status_protip" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
+                <include android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" layout="@layout/view_premium_guild_progress_bar" />
                 <com.discord.utilities.simple_pager.SimplePager android:id="@id/boost_status_viewpager" android:paddingLeft="48.0dip" android:paddingRight="48.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" />
-                <View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.Divider" />
-                <include android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" layout="@layout/layout_premium_guild_status_features_user" />
-                <View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.Divider" />
+                <View android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="32.0dip" style="@style/UiKit.Divider" />
+                <include android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" layout="@layout/layout_premium_guild_status_features_user" />
+                <View android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="32.0dip" style="@style/UiKit.Divider" />
                 <com.discord.views.premiumguild.PremiumGuildSubscriptionUpsellView android:id="@id/boost_status_premium_upsell" android:layout_width="fill_parent" android:layout_height="wrap_content" />
-                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_subscribe_button2" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit.Material.Button" />
-                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_gift_button2" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_perks_modal_button_gift_premium" app:icon="@drawable/ic_gift_white_16dp" app:iconGravity="textStart" app:iconPadding="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Secondary" />
+                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_subscribe_button2" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit.Material.Button" />
+                <com.google.android.material.button.MaterialButton android:id="@id/boost_status_gift_button2" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/premium_guild_perks_modal_button_gift_premium" app:icon="@drawable/ic_gift_white_16dp" app:iconGravity="textStart" app:iconPadding="8.0dip" style="@style/UiKit.Material.Button.Secondary" />
                 <com.discord.views.premiumguild.PremiumSubscriptionMarketingView android:id="@id/boost_status_premium_marketing" android:layout_width="fill_parent" android:layout_height="wrap_content" />
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_server_delete_dialog.xml b/com.discord/res/layout/widget_server_delete_dialog.xml
index a683bbe78f..22d0ad32ff 100644
--- a/com.discord/res/layout/widget_server_delete_dialog.xml
+++ b/com.discord/res/layout/widget_server_delete_dialog.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.discord.app.AppTextView android:id="@id/server_settings_delete_server_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/delete_server_title" style="@style/UiKit.TextView.H1.Bold" />
+    <com.discord.app.AppTextView android:id="@id/server_settings_delete_server_header" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/delete_server_title" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout android:id="@id/server_settings_delete_server_mfa_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.Settings.Item.Label" />
-        <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_delete_server_mfa_code" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/two_fa_auth_code" style="@style/UiKit.TextInputLayout.Primary">
+        <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_delete_server_mfa_code" android:layout_margin="16.0dip" android:hint="@string/two_fa_auth_code" style="@style/UiKit.TextInputLayout.Primary">
             <com.google.android.material.textfield.TextInputEditText android:inputType="textVisiblePassword|numberPassword|phone" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_server_notification_override_selector.xml b/com.discord/res/layout/widget_server_notification_override_selector.xml
index 7f848a44b3..69995d325a 100644
--- a/com.discord/res/layout/widget_server_notification_override_selector.xml
+++ b/com.discord/res/layout/widget_server_notification_override_selector.xml
@@ -7,5 +7,5 @@
             <com.google.android.material.textfield.TextInputEditText android:hint="@string/search_channels" style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search" />
         </com.google.android.material.textfield.TextInputLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_notifications_channel_list" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/list_bottom_padding" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_notifications_channel_list" android:paddingTop="8.0dip" android:paddingBottom="@dimen/list_bottom_padding" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings.xml b/com.discord/res/layout/widget_server_settings.xml
index 1e34c4d005..10aa296af7 100644
--- a/com.discord/res/layout/widget_server_settings.xml
+++ b/com.discord/res/layout/widget_server_settings.xml
@@ -3,10 +3,10 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:background="?primary_630" style="@style/AppTheme.AppBarLayout">
         <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme.CollapsingToolbarLayout">
-            <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:layout_marginTop="?actionBarSize" style="@style/UiKit.ViewGroup.LinearLayout">
-                <RelativeLayout android:layout_gravity="center_horizontal" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <LinearLayout android:gravity="center" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="32.0dip" android:layout_marginTop="?actionBarSize" style="@style/UiKit.ViewGroup.LinearLayout">
+                <RelativeLayout android:layout_gravity="center_horizontal" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
                     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_server_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
-                    <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center_horizontal" android:id="@id/server_settings_server_icon_text" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.TextView.Large.SingleLine" />
+                    <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center_horizontal" android:id="@id/server_settings_server_icon_text" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.TextView.Large.SingleLine" />
                 </RelativeLayout>
                 <TextView android:id="@id/server_settings_server_name" android:singleLine="true" style="@style/UiKit.TextView.H1" />
             </LinearLayout>
@@ -14,7 +14,7 @@
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/AppTheme.AppBarScrollingViewBehavior">
-        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <LinearLayout android:id="@id/server_settings_section_general_settings" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/settings" style="@style/UiKit.Settings.Item.Header" />
                 <TextView android:id="@id/server_settings_option_overview" android:text="@string/overview" android:drawableStart="@drawable/ic_info_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
diff --git a/com.discord/res/layout/widget_server_settings_audit_log.xml b/com.discord/res/layout/widget_server_settings_audit_log.xml
index e869cf7036..2c80d7a24f 100644
--- a/com.discord/res/layout/widget_server_settings_audit_log.xml
+++ b/com.discord/res/layout/widget_server_settings_audit_log.xml
@@ -7,19 +7,19 @@
     <com.discord.app.AppViewFlipper android:id="@id/server_settings_audit_logs_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
         <LinearLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <LinearLayout android:id="@id/server_settings_audit_logs_user_filter_container" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90.0dip" android:text="@string/guild_settings_filtered_user" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+            <LinearLayout android:id="@id/server_settings_audit_logs_user_filter_container" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90.0dip" android:text="@string/guild_settings_filtered_user" android:layout_marginEnd="8.0dip" style="@style/UiKit.TextView" />
                 <TextView android:id="@id/server_settings_audit_logs_user_filter" style="@style/UiKit.Search.Chip" />
             </LinearLayout>
-            <LinearLayout android:id="@id/server_settings_audit_logs_action_filter_container" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90.0dip" android:text="@string/guild_settings_filtered_action" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+            <LinearLayout android:id="@id/server_settings_audit_logs_action_filter_container" android:layout_marginLeft="8.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90.0dip" android:text="@string/guild_settings_filtered_action" android:layout_marginEnd="8.0dip" style="@style/UiKit.TextView" />
                 <TextView android:id="@id/server_settings_audit_logs_action_filter" style="@style/UiKit.Search.Chip" />
             </LinearLayout>
             <com.discord.app.AppViewFlipper android:id="@id/server_settings_audit_logs_view_results_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/AppTheme.AppBarScrollingViewBehavior">
                 <androidx.recyclerview.widget.RecyclerView android:id="@id/server_settings_audit_logs_recycler" android:scrollbars="vertical" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
                 <LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                     <TextView android:id="@id/no_logs_title" android:text="@string/guild_settings_label_audit_log_empty_title" style="@style/UiKit.TextView.NoResults" />
-                    <TextView android:gravity="center" android:id="@id/no_logs_body" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/guild_settings_label_audit_log_empty_body" style="@style/UiKit.TextView" />
+                    <TextView android:gravity="center" android:id="@id/no_logs_body" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/guild_settings_label_audit_log_empty_body" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </com.discord.app.AppViewFlipper>
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml b/com.discord/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml
index 73f6f1455f..bb82c2905e 100644
--- a/com.discord/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml
+++ b/com.discord/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_vertical" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <FrameLayout android:id="@id/audit_log_filter_image_container" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium">
+    <FrameLayout android:id="@id/audit_log_filter_image_container" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip">
         <ImageView android:id="@id/audit_log_filter_image_target" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ImageView" />
         <ImageView android:id="@id/audit_log_filter_image_action" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ImageView" />
     </FrameLayout>
diff --git a/com.discord/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml b/com.discord/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml
index 65d8eac47e..04f44db797 100644
--- a/com.discord/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml
+++ b/com.discord/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center_vertical" android:padding="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <FrameLayout android:id="@id/audit_log_filter_image_container" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium">
+    <FrameLayout android:id="@id/audit_log_filter_image_container" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/audit_log_filter_avatar" style="@style/Avatar.Large" />
         <ImageView android:layout_gravity="center" android:id="@id/audit_log_filter_image" style="@style/UiKit.ImageView" />
     </FrameLayout>
diff --git a/com.discord/res/layout/widget_server_settings_audit_log_listitem.xml b/com.discord/res/layout/widget_server_settings_audit_log_listitem.xml
index bc6abd58cf..8dd32ecf61 100644
--- a/com.discord/res/layout/widget_server_settings_audit_log_listitem.xml
+++ b/com.discord/res/layout/widget_server_settings_audit_log_listitem.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_medium" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup"
+<androidx.cardview.widget.CardView android:layout_margin="8.0dip" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
         <RelativeLayout android:id="@id/audit_log_listitem_top_container" android:background="?selectableItemBackground" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <FrameLayout android:id="@id/audit_log_listitem_action_container" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="12.0dip" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large">
+            <FrameLayout android:id="@id/audit_log_listitem_action_container" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="12.0dip" android:layout_centerVertical="true" android:layout_marginStart="16.0dip">
                 <ImageView android:id="@id/audit_log_listitem_targettype_image" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ImageView" />
                 <ImageView android:id="@id/audit_log_listitem_actiontype_image" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ImageView" />
             </FrameLayout>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/audit_log_listitem_avatar" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_toRightOf="@id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/Avatar.Standard" />
-            <com.discord.app.AppTextView android:ellipsize="end" android:id="@id/audit_log_listitem_header_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:maxLines="3" android:layout_toLeftOf="@id/audit_log_listitem_arrow" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
-            <ImageView android:id="@id/audit_log_listitem_arrow" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_centerVertical="true" android:contentDescription="@string/more" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/audit_log_listitem_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" android:layout_toRightOf="@id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/Avatar.Standard" />
+            <com.discord.app.AppTextView android:ellipsize="end" android:id="@id/audit_log_listitem_header_text" android:layout_marginTop="8.0dip" android:maxLines="3" android:layout_toLeftOf="@id/audit_log_listitem_arrow" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="8.0dip" android:layout_marginRight="32.0dip" android:layout_marginBottom="8.0dip" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
+            <ImageView android:id="@id/audit_log_listitem_arrow" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_centerVertical="true" android:contentDescription="@string/more" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
         </RelativeLayout>
-        <TextView android:textColor="?primary_400" android:id="@id/audit_log_listitem_change_text" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
+        <TextView android:textColor="?primary_400" android:id="@id/audit_log_listitem_change_text" android:padding="16.0dip" android:visibility="gone" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_audit_log_loading_listitem.xml b/com.discord/res/layout/widget_server_settings_audit_log_loading_listitem.xml
index dca38eb069..f5acb375b7 100644
--- a/com.discord/res/layout/widget_server_settings_audit_log_loading_listitem.xml
+++ b/com.discord/res/layout/widget_server_settings_audit_log_loading_listitem.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ProgressBar android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="50.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:indeterminate="true" android:indeterminateTint="?primary_100" android:indeterminateTintMode="src_in"
+<ProgressBar android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="50.0dip" android:layout_margin="8.0dip" android:indeterminate="true" android:indeterminateTint="?primary_100" android:indeterminateTintMode="src_in"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_ban_list_item.xml b/com.discord/res/layout/widget_server_settings_ban_list_item.xml
index 6778d387b0..cea379394e 100644
--- a/com.discord/res/layout/widget_server_settings_ban_list_item.xml
+++ b/com.discord/res/layout/widget_server_settings_ban_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:id="@id/ban_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:id="@id/ban_container" android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/ban_list_item_avatar" android:layout_alignParentStart="true" style="@style/Avatar.Standard" />
-    <TextView android:id="@id/ban_list_item_name" android:layout_width="fill_parent" android:layout_centerVertical="true" android:drawableEnd="@drawable/ic_unban_grey" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_toEndOf="@id/ban_list_item_avatar" style="@style/UiKit.TextView.Large.SingleLine" />
-    <View android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_below="@id/ban_list_item_avatar" android:layout_alignParentBottom="true" android:layout_toEndOf="@id/ban_list_item_avatar" style="@style/UiKit.Settings.Divider" />
+    <TextView android:id="@id/ban_list_item_name" android:layout_width="fill_parent" android:layout_centerVertical="true" android:drawableEnd="@drawable/ic_unban_grey" android:layout_marginStart="16.0dip" android:layout_toEndOf="@id/ban_list_item_avatar" style="@style/UiKit.TextView.Large.SingleLine" />
+    <View android:layout_marginTop="16.0dip" android:layout_below="@id/ban_list_item_avatar" android:layout_alignParentBottom="true" android:layout_toEndOf="@id/ban_list_item_avatar" style="@style/UiKit.Settings.Divider" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_channels_sort_actions.xml b/com.discord/res/layout/widget_server_settings_channels_sort_actions.xml
index 461aca61aa..4d1352b770 100644
--- a/com.discord/res/layout/widget_server_settings_channels_sort_actions.xml
+++ b/com.discord/res/layout/widget_server_settings_channels_sort_actions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Sheet.Header">
             <androidx.constraintlayout.widget.Guideline style="@style/UiKit.Sheet.Guideline" />
             <TextView android:id="@id/guild_actions_overview_header_tv" android:text="@string/select_sort_mode" style="@style/UiKit.Sheet.Header.Title" />
diff --git a/com.discord/res/layout/widget_server_settings_edit_integration.xml b/com.discord/res/layout/widget_server_settings_edit_integration.xml
index 0cc0886f4c..03873353f3 100644
--- a/com.discord/res/layout/widget_server_settings_edit_integration.xml
+++ b/com.discord/res/layout/widget_server_settings_edit_integration.xml
@@ -7,8 +7,8 @@
     <androidx.core.widget.NestedScrollView android:id="@id/edit_integration_settings_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
             <View android:layout_width="fill_parent" android:layout_height="20.0dip" />
-            <RelativeLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
-                <ImageView android:id="@id/edit_integration_icon" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
+            <RelativeLayout android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:paddingStart="16.0dip" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
+                <ImageView android:id="@id/edit_integration_icon" android:layout_centerVertical="true" android:layout_marginEnd="16.0dip" style="@style/UiKit.ImageView" />
                 <LinearLayout android:id="@id/edit_integration_name_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_toEndOf="@id/edit_integration_icon" style="@style/UiKit.ViewGroup.LinearLayout">
                     <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:id="@id/edit_integration_owner_name" style="@style/UiKit.TextView" />
                     <TextView android:id="@id/edit_integration_name" style="@style/UiKit.TextView" />
@@ -40,7 +40,7 @@
                     <com.discord.views.CheckedSetting android:id="@id/edit_integration_custom_emotes_toggle" app:cs_text="@string/enable_twitch_emoji_sync" style="@style/UiKit.CheckedSetting.Themed" />
                 </LinearLayout>
             </LinearLayout>
-            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="64.0dip" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" style="@style/Settings.FloatingActionButton.Save" />
diff --git a/com.discord/res/layout/widget_server_settings_edit_member.xml b/com.discord/res/layout/widget_server_settings_edit_member.xml
index bdcafedbe4..a057c7211d 100644
--- a/com.discord/res/layout/widget_server_settings_edit_member.xml
+++ b/com.discord/res/layout/widget_server_settings_edit_member.xml
@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/nickname" style="@style/UiKit.Settings.Item.Header" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/edit_member_nickname" android:hint="@string/change_nickname" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:endIconDrawable="@drawable/ic_role_lock" app:endIconMode="custom" style="@style/UiKit.TextInputLayout.Primary">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/edit_member_nickname" android:hint="@string/change_nickname" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:endIconDrawable="@drawable/ic_role_lock" app:endIconMode="custom" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:maxLength="32" android:inputType="textNoSuggestions" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
             </com.google.android.material.textfield.TextInputLayout>
             <LinearLayout android:id="@id/edit_member_roles_container" style="@style/UiKit.ViewGroup.LinearLayout">
diff --git a/com.discord/res/layout/widget_server_settings_emojis_edit.xml b/com.discord/res/layout/widget_server_settings_emojis_edit.xml
index b4519be725..133b64b978 100644
--- a/com.discord/res/layout/widget_server_settings_emojis_edit.xml
+++ b/com.discord/res/layout/widget_server_settings_emojis_edit.xml
@@ -6,7 +6,7 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_emojis_edit_alias" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/guild_settings_emoji_alias" style="@style/UiKit.TextInputLayout.Primary">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_emojis_edit_alias" android:layout_margin="16.0dip" android:hint="@string/guild_settings_emoji_alias" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:maxLength="32" android:inputType="textNoSuggestions" style="@style/UiKit.TextInputLayout.EditText" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_server_settings_emojis_empty.xml b/com.discord/res/layout/widget_server_settings_emojis_empty.xml
index 293ef5890c..501d730ac1 100644
--- a/com.discord/res/layout/widget_server_settings_emojis_empty.xml
+++ b/com.discord/res/layout/widget_server_settings_emojis_empty.xml
@@ -2,5 +2,5 @@
 <LinearLayout android:gravity="center" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:text="@string/no_emoji_title" android:drawableTop="?theme_emoji_settings_empty" style="@style/UiKit.TextView.NoResults" />
-    <TextView android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/no_emoji" style="@style/UiKit.TextView" />
+    <TextView android:gravity="center" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:text="@string/no_emoji" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_emojis_header.xml b/com.discord/res/layout/widget_server_settings_emojis_header.xml
index b523f9ae98..f49f5ac031 100644
--- a/com.discord/res/layout/widget_server_settings_emojis_header.xml
+++ b/com.discord/res/layout/widget_server_settings_emojis_header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.google.android.material.button.MaterialButton android:id="@id/widget_server_settings_emojis_upload" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/upload_emoji" style="@style/UiKit.Material.Button" />
+    <com.google.android.material.button.MaterialButton android:id="@id/widget_server_settings_emojis_upload" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/upload_emoji" style="@style/UiKit.Material.Button" />
     <TextView android:id="@id/widget_server_settings_emojis_upload_description" android:text="@string/guild_settings_emoji_upload_to_server_message" style="@style/UiKit.Settings.Item.SubText" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_emojis_item.xml b/com.discord/res/layout/widget_server_settings_emojis_item.xml
index 3ca60f2c9a..62aae952fc 100644
--- a/com.discord/res/layout/widget_server_settings_emojis_item.xml
+++ b/com.discord/res/layout/widget_server_settings_emojis_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_emojis_container" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_emojis_container" android:background="?selectableItemBackground" android:padding="8.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_avatar" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/emoji_size" android:layout_height="@dimen/emoji_size" android:layout_margin="@dimen/uikit_spacing_medium" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" />
-    <TextView android:id="@id/server_settings_emojis_name" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Large.SingleLine" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_avatar" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/emoji_size" android:layout_height="@dimen/emoji_size" android:layout_margin="8.0dip" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" />
+    <TextView android:id="@id/server_settings_emojis_name" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Large.SingleLine" />
     <TextView android:textColor="?primary_100_alpha_60" android:gravity="end" android:id="@id/server_settings_emojis_username" android:layout_width="wrap_content" android:maxWidth="100.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_username_avatar" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Medium" />
-    <ImageView android:id="@id/server_settings_emojis_overflow" android:layout_margin="@dimen/uikit_spacing_medium" android:src="@drawable/ic_overflow_dark_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" style="@style/UiKit.ImageView" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_username_avatar" android:layout_margin="8.0dip" style="@style/Avatar.Medium" />
+    <ImageView android:id="@id/server_settings_emojis_overflow" android:layout_margin="8.0dip" android:src="@drawable/ic_overflow_dark_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" style="@style/UiKit.ImageView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_help_item.xml b/com.discord/res/layout/widget_server_settings_help_item.xml
index 3880e09a03..143985be6f 100644
--- a/com.discord/res/layout/widget_server_settings_help_item.xml
+++ b/com.discord/res/layout/widget_server_settings_help_item.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_vertical" android:id="@id/server_settings_help_item" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/help_roles_description" style="@style/UiKit.TextView.Semibold"
+<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_vertical" android:id="@id/server_settings_help_item" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/help_roles_description" style="@style/UiKit.TextView.Semibold"
   xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_instant_invite_actions.xml b/com.discord/res/layout/widget_server_settings_instant_invite_actions.xml
index cc848e8221..2eff81a31d 100644
--- a/com.discord/res/layout/widget_server_settings_instant_invite_actions.xml
+++ b/com.discord/res/layout/widget_server_settings_instant_invite_actions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Sheet.Header">
             <androidx.constraintlayout.widget.Guideline style="@style/UiKit.Sheet.Guideline" />
             <LinearLayout android:orientation="vertical" style="@style/UiKit.Sheet.Header.Contents">
diff --git a/com.discord/res/layout/widget_server_settings_instant_invite_list_item.xml b/com.discord/res/layout/widget_server_settings_instant_invite_list_item.xml
index d196c97773..6c0fcfe6d1 100644
--- a/com.discord/res/layout/widget_server_settings_instant_invite_list_item.xml
+++ b/com.discord/res/layout/widget_server_settings_instant_invite_list_item.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_small" app:cardBackgroundColor="?primary_630" app:cardElevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout"
+<androidx.cardview.widget.CardView android:layout_marginLeft="8.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="4.0dip" app:cardBackgroundColor="?primary_630" app:cardElevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:id="@id/invite_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout">
-        <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
+        <RelativeLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
             <LinearLayout android:id="@id/invite_name_container" android:layout_alignParentTop="true" android:layout_toStartOf="@id/invite_expiration_container" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/invite_code" style="@style/UiKit.TextView" />
                 <TextView android:id="@id/invite_channel" style="@style/UiKit.TextView" />
             </LinearLayout>
-            <LinearLayout android:id="@id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginEnd="@dimen/uikit_spacing_xxlarge" android:layout_toStartOf="@id/invite_settings_icon" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginEnd="32.0dip" android:layout_toStartOf="@id/invite_settings_icon" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/invite_expires_label" android:text="@string/expires_in" style="@style/UiKit.TextView" />
                 <TextView android:id="@id/invite_expiration_time" style="@style/UiKit.TextView" />
             </LinearLayout>
             <ImageView android:id="@id/invite_settings_icon" android:src="@drawable/ic_overflow_dark_24dp" android:layout_centerVertical="true" android:contentDescription="@string/settings" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
-            <View android:id="@id/invite_divider" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_below="@id/invite_name_container" android:layout_alignStart="@id/invite_name_container" android:layout_alignEnd="@id/invite_expiration_container" style="@style/UiKit.Settings.Divider" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_list_item_avatar" android:layout_below="@id/invite_divider" android:layout_marginEnd="@dimen/uikit_spacing_small" android:layout_alignParentStart="true" style="@style/Avatar.Small" />
+            <View android:id="@id/invite_divider" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_below="@id/invite_name_container" android:layout_alignStart="@id/invite_name_container" android:layout_alignEnd="@id/invite_expiration_container" style="@style/UiKit.Settings.Divider" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_list_item_avatar" android:layout_below="@id/invite_divider" android:layout_marginEnd="4.0dip" android:layout_alignParentStart="true" style="@style/Avatar.Small" />
             <TextView android:gravity="center_vertical" android:id="@id/invite_user_name" android:layout_below="@id/invite_divider" android:layout_alignWithParentIfMissing="true" android:layout_toEndOf="@id/invite_list_item_avatar" style="@style/UiKit.TextView" />
             <TextView android:id="@id/invite_uses_label" android:text="@string/instant_invite_uses" android:layout_alignBaseline="@id/invite_user_name" android:layout_alignStart="@id/invite_expiration_container" style="@style/UiKit.TextView.Semibold" />
-            <TextView android:id="@id/invite_uses" android:layout_below="@id/invite_expiration_container" android:layout_alignBaseline="@id/invite_uses_label" android:layout_marginStart="@dimen/uikit_spacing_small" android:layout_toEndOf="@id/invite_uses_label" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/invite_uses" android:layout_below="@id/invite_expiration_container" android:layout_alignBaseline="@id/invite_uses_label" android:layout_marginStart="4.0dip" android:layout_toEndOf="@id/invite_uses_label" style="@style/UiKit.TextView" />
         </RelativeLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_instant_invites.xml b/com.discord/res/layout/widget_server_settings_instant_invites.xml
index 62d3055b3b..ee9929c2eb 100644
--- a/com.discord/res/layout/widget_server_settings_instant_invites.xml
+++ b/com.discord/res/layout/widget_server_settings_instant_invites.xml
@@ -6,10 +6,10 @@
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/server_settings_instant_invites_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/server_settings_instant_invites_recycler" android:paddingTop="@dimen/uikit_spacing_small" android:scrollbars="vertical" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/server_settings_instant_invites_recycler" android:paddingTop="4.0dip" android:scrollbars="vertical" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:id="@id/no_invites_header" android:text="@string/no_invites_label" android:drawableTop="@drawable/asset_empty_no_invites" android:textAllCaps="true" style="@style/UiKit.TextView.NoResults" />
-            <TextView android:gravity="center" android:id="@id/no_invites_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/no_invites_body" style="@style/UiKit.TextView" />
+            <TextView android:gravity="center" android:id="@id/no_invites_body" android:layout_marginTop="8.0dip" android:text="@string/no_invites_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_integration_list_item.xml b/com.discord/res/layout/widget_server_settings_integration_list_item.xml
index bcd91f87c5..145bef02ed 100644
--- a/com.discord/res/layout/widget_server_settings_integration_list_item.xml
+++ b/com.discord/res/layout/widget_server_settings_integration_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:elevation="@dimen/uikit_spacing_xsmall" style="@style/UiKit.ViewGroup"
+<FrameLayout android:elevation="2.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <RelativeLayout android:id="@id/integration_header_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent">
-            <ImageView android:id="@id/integration_icon" android:layout_margin="@dimen/uikit_spacing_medium" android:layout_centerVertical="true" android:contentDescription="@string/integrations" style="@style/UiKit.ImageView" />
+        <RelativeLayout android:id="@id/integration_header_container" android:background="?selectableItemBackground" android:paddingLeft="16.0dip" android:paddingTop="4.0dip" android:paddingRight="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent">
+            <ImageView android:id="@id/integration_icon" android:layout_margin="8.0dip" android:layout_centerVertical="true" android:contentDescription="@string/integrations" style="@style/UiKit.ImageView" />
             <LinearLayout android:id="@id/integration_name_container" android:layout_centerVertical="true" android:layout_toStartOf="@id/integration_settings_icon" android:layout_toEndOf="@id/integration_icon" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:id="@id/integration_owner_name" style="@style/UiKit.TextView.H1" />
                 <TextView android:textColor="?primary_100" android:id="@id/integration_name" style="@style/UiKit.TextView" />
diff --git a/com.discord/res/layout/widget_server_settings_integrations.xml b/com.discord/res/layout/widget_server_settings_integrations.xml
index a386598886..292d0e86a6 100644
--- a/com.discord/res/layout/widget_server_settings_integrations.xml
+++ b/com.discord/res/layout/widget_server_settings_integrations.xml
@@ -5,10 +5,10 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/integrations_view_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/integrations_recycler" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/integrations_recycler" android:layout_height="fill_parent" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:id="@id/integrations_empty_header" android:text="@string/no_integrations_label" android:drawableTop="?ic_empty_integrations" style="@style/UiKit.TextView.NoResults" />
-            <TextView android:gravity="center" android:id="@id/integrations_empty_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/no_integrations_body" style="@style/UiKit.TextView" />
+            <TextView android:gravity="center" android:id="@id/integrations_empty_body" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:text="@string/no_integrations_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_member_list_item.xml b/com.discord/res/layout/widget_server_settings_member_list_item.xml
index 9e2173710e..b443a27397 100644
--- a/com.discord/res/layout/widget_server_settings_member_list_item.xml
+++ b/com.discord/res/layout/widget_server_settings_member_list_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/member_list_item_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.ConstraintLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/member_list_item_avatar" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/drawable_circle_purple_brand" style="@style/Avatar.Large" />
-    <com.discord.views.UsernameView android:gravity="center_vertical" android:id="@id/member_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/member_list_item_roles_list" app:layout_constraintEnd_toStartOf="@id/member_list_item_lock" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/member_list_item_avatar" app:layout_constraintTop_toTopOf="parent" app:username_singleline="true" app:username_text_size="@dimen/uikit_textsize_large" />
-    <com.discord.widgets.roles.RolesListView android:orientation="horizontal" android:id="@id/member_list_item_roles_list" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/member_list_item_lock" app:layout_constraintStart_toEndOf="@id/member_list_item_avatar" app:layout_constraintTop_toBottomOf="@id/member_list_item_name" />
-    <ImageView android:id="@id/member_list_item_lock" android:layout_margin="@dimen/uikit_spacing_small" android:src="@drawable/ic_role_lock" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/member_list_item_overflow" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-    <ImageView android:id="@id/member_list_item_overflow" android:layout_margin="@dimen/uikit_spacing_medium" android:src="@drawable/ic_overflow_dark_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/member_list_item_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/drawable_circle_purple_brand" style="@style/Avatar.Large" />
+    <com.discord.views.UsernameView android:gravity="center_vertical" android:id="@id/member_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/member_list_item_roles_list" app:layout_constraintEnd_toStartOf="@id/member_list_item_lock" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/member_list_item_avatar" app:layout_constraintTop_toTopOf="parent" app:username_singleline="true" app:username_text_size="@dimen/uikit_textsize_large" />
+    <com.discord.widgets.roles.RolesListView android:orientation="horizontal" android:id="@id/member_list_item_roles_list" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/member_list_item_lock" app:layout_constraintStart_toEndOf="@id/member_list_item_avatar" app:layout_constraintTop_toBottomOf="@id/member_list_item_name" />
+    <ImageView android:id="@id/member_list_item_lock" android:layout_margin="4.0dip" android:src="@drawable/ic_role_lock" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/member_list_item_overflow" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/member_list_item_overflow" android:layout_margin="8.0dip" android:src="@drawable/ic_overflow_dark_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <View android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/member_list_item_name" app:layout_constraintStart_toStartOf="@id/member_list_item_name" style="@style/UiKit.Settings.Divider" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_members.xml b/com.discord/res/layout/widget_server_settings_members.xml
index eee86c6b75..3e950bb556 100644
--- a/com.discord/res/layout/widget_server_settings_members.xml
+++ b/com.discord/res/layout/widget_server_settings_members.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
-        <androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundTertiary" style="@style/UiKit.ViewGroup">
+        <androidx.cardview.widget.CardView android:layout_margin="8.0dip" app:cardBackgroundColor="?colorBackgroundTertiary" style="@style/UiKit.ViewGroup">
             <LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_members_header_container" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_members_name_search" android:layout_width="0.0dip" android:layout_margin="0.0dip" android:hint="@string/members_search_placeholder" android:layout_weight="2.0" app:boxBackgroundColor="?colorBackgroundTertiary" style="@style/UiKit.TextInputLayout.Search">
                     <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Search" />
diff --git a/com.discord/res/layout/widget_server_settings_overview_region.xml b/com.discord/res/layout/widget_server_settings_overview_region.xml
index f73819f957..32e34dfc5c 100644
--- a/com.discord/res/layout/widget_server_settings_overview_region.xml
+++ b/com.discord/res/layout/widget_server_settings_overview_region.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_region" android:lineSpacingMultiplier="1.4" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/form_label_server_region" android:lineSpacingMultiplier="1.4" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Settings.Divider" />
     <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@id/server_settings_overview_region_list" android:scrollbars="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:overScrollMode="never" app:max_height="420.0dip" />
     <View style="@style/UiKit.Divider" />
diff --git a/com.discord/res/layout/widget_server_settings_overview_section_afk_channel.xml b/com.discord/res/layout/widget_server_settings_overview_section_afk_channel.xml
index 98d6fc6d2b..f3890650d5 100644
--- a/com.discord/res/layout/widget_server_settings_overview_section_afk_channel.xml
+++ b/com.discord/res/layout/widget_server_settings_overview_section_afk_channel.xml
@@ -5,7 +5,7 @@
     <TextView android:text="@string/form_help_afk_channel" style="@style/UiKit.Settings.Item.SubText" />
     <LinearLayout android:id="@id/server_settings_overview_afk_channel_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:text="@string/form_label_afk_channel" style="@style/UiKit.Settings.Item.Label" />
-        <TextView android:id="@id/server_settings_overview_afk_channel" android:drawablePadding="@dimen/uikit_spacing_xsmall" style="@style/UiKit.Settings.Item.Addition" />
+        <TextView android:id="@id/server_settings_overview_afk_channel" android:drawablePadding="2.0dip" style="@style/UiKit.Settings.Item.Addition" />
     </LinearLayout>
     <LinearLayout android:id="@id/server_settings_overview_afk_timeout_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:text="@string/form_label_afk_timeout" style="@style/UiKit.Settings.Item.Label" />
diff --git a/com.discord/res/layout/widget_server_settings_role_item.xml b/com.discord/res/layout/widget_server_settings_role_item.xml
index 2b0106c344..d32087e41d 100644
--- a/com.discord/res/layout/widget_server_settings_role_item.xml
+++ b/com.discord/res/layout/widget_server_settings_role_item.xml
@@ -3,9 +3,9 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <View android:id="@id/server_settings_role_item_drag_overlay" android:background="@color/black_alpha_05" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
     <View android:id="@id/server_settings_role_item_divider_targeted" android:background="@color/purple_brand" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="3.0dip" android:layout_alignParentTop="true" />
-    <FrameLayout android:gravity="center_vertical" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
-        <ImageView android:layout_gravity="start|center" android:id="@id/server_settings_role_item_lock_indicator" android:src="?ic_lock" android:contentDescription="@string/help_role_locked" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
-        <TextView android:layout_gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Semibold" />
+    <FrameLayout android:gravity="center_vertical" android:layout_centerVertical="true" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup">
+        <ImageView android:layout_gravity="start|center" android:id="@id/server_settings_role_item_lock_indicator" android:src="?ic_lock" android:contentDescription="@string/help_role_locked" android:layout_marginStart="8.0dip" style="@style/UiKit.ImageView" />
+        <TextView android:layout_gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:singleLine="true" android:layout_marginStart="64.0dip" style="@style/UiKit.TextView.Semibold" />
     </FrameLayout>
     <View android:id="@id/server_settings_role_item_bottom_divider" android:layout_alignParentBottom="true" style="@style/UiKit.Settings.Divider" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_security.xml b/com.discord/res/layout/widget_server_settings_security.xml
index d0c52a53dc..1dd7e9518e 100644
--- a/com.discord/res/layout/widget_server_settings_security.xml
+++ b/com.discord/res/layout/widget_server_settings_security.xml
@@ -5,12 +5,12 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
-        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:id="@id/server_settings_security_label" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit.TextView.H2" />
-            <com.google.android.material.button.MaterialButton android:id="@id/server_settings_security_toggle_mfa_button" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/guild_security_req_mfa_turn_on" style="@style/UiKit.Material.Button.Green.Fit" />
+        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:id="@id/server_settings_security_label" android:layout_marginTop="32.0dip" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit.TextView.H2" />
+            <com.google.android.material.button.MaterialButton android:id="@id/server_settings_security_toggle_mfa_button" android:layout_marginTop="16.0dip" android:text="@string/guild_security_req_mfa_turn_on" style="@style/UiKit.Material.Button.Green.Fit" />
         </LinearLayout>
-        <RelativeLayout android:gravity="center" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_margin="@dimen/uikit_spacing_xxlarge" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/asset_security" android:layout_above="@id/mfa_description_text" android:layout_centerHorizontal="true" android:contentDescription="@string/guild_security_req_mfa_turn_on" style="@style/UiKit.ImageView" />
+        <RelativeLayout android:gravity="center" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_margin="32.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <ImageView android:layout_marginBottom="32.0dip" android:src="@drawable/asset_security" android:layout_above="@id/mfa_description_text" android:layout_centerHorizontal="true" android:contentDescription="@string/guild_security_req_mfa_turn_on" style="@style/UiKit.ImageView" />
             <com.discord.app.AppTextView android:id="@id/mfa_description_text" android:text="@string/guild_security_req_mfa_body" android:layout_alignParentBottom="true" style="@style/UiKit.TextView" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_server_settings_security_dialog.xml b/com.discord/res/layout/widget_server_settings_security_dialog.xml
index 7f45128597..b48f5cfdce 100644
--- a/com.discord/res/layout/widget_server_settings_security_dialog.xml
+++ b/com.discord/res/layout/widget_server_settings_security_dialog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:id="@id/notice_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:id="@id/notice_header" android:padding="16.0dip" android:layout_width="fill_parent" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
-    <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_security_server_mfa_code" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/two_fa_auth_code" style="@style/UiKit.TextInputLayout.Primary">
+    <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_security_server_mfa_code" android:layout_margin="16.0dip" android:hint="@string/two_fa_auth_code" style="@style/UiKit.TextInputLayout.Primary">
         <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText" />
     </com.google.android.material.textfield.TextInputLayout>
     <View style="@style/UiKit.Settings.Divider" />
diff --git a/com.discord/res/layout/widget_server_settings_vanity_url.xml b/com.discord/res/layout/widget_server_settings_vanity_url.xml
index fb06b6ff98..4af5e35283 100644
--- a/com.discord/res/layout/widget_server_settings_vanity_url.xml
+++ b/com.discord/res/layout/widget_server_settings_vanity_url.xml
@@ -6,21 +6,21 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:paddingLeft="16.0dip" android:paddingTop="32.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
                 <TextView android:text="@string/vanity_url" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
                 <TextView android:textColor="@color/status_red_500" android:id="@id/server_settings_vanity_url_remove" android:visibility="gone" android:text="@string/remove" android:layout_alignParentEnd="true" style="@style/UiKit.TextView.Bold" />
             </RelativeLayout>
-            <RelativeLayout android:id="@id/server_settings_vanity_url_input_container" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:id="@id/server_settings_vanity_url_input_container" android:padding="16.0dip" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.RelativeLayout">
                 <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/server_settings_vanity_url_prefix" android:text="@string/discord_gg" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
                 <com.google.android.material.textfield.TextInputLayout android:id="@id/server_settings_vanity_input" android:hint="@string/vanity_url_hint_mobile" android:layout_toStartOf="@id/server_settings_vanity_url_loading_indicator" android:layout_toEndOf="@id/server_settings_vanity_url_prefix" style="@style/UiKit.TextInputLayout.Primary">
                     <com.google.android.material.textfield.TextInputEditText android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-" android:inputType="textNoSuggestions" android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <ProgressBar android:id="@id/server_settings_vanity_url_loading_indicator" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:indeterminate="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" />
+                <ProgressBar android:id="@id/server_settings_vanity_url_loading_indicator" android:layout_width="32.0dip" android:layout_height="32.0dip" android:indeterminate="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" />
             </RelativeLayout>
             <View style="@style/UiKit.Settings.Divider" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/server_settings_vanity_url_error_text" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/change_vanity_url_error" style="@style/UiKit.TextView" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/vanity_url_help" style="@style/UiKit.TextView" />
-            <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/server_settings_vanity_url_current_url" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/vanity_url_help_extended" style="@style/UiKit.TextView" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/server_settings_vanity_url_error_text" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/change_vanity_url_error" style="@style/UiKit.TextView" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/vanity_url_help" style="@style/UiKit.TextView" />
+            <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/server_settings_vanity_url_current_url" android:visibility="gone" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/vanity_url_help_extended" style="@style/UiKit.TextView" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_vanity_url_save" style="@style/Settings.FloatingActionButton.Save" />
diff --git a/com.discord/res/layout/widget_settings.xml b/com.discord/res/layout/widget_settings.xml
index 3577164298..849f7af3c4 100644
--- a/com.discord/res/layout/widget_settings.xml
+++ b/com.discord/res/layout/widget_settings.xml
@@ -12,8 +12,8 @@
             <TextView android:id="@id/settings_user_settings_header" android:text="@string/user_settings" style="@style/UiKit.Settings.Item.Header" />
             <LinearLayout android:gravity="center_vertical" android:id="@id/settings_set_status_container" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <androidx.appcompat.widget.AppCompatTextView android:background="@color/transparent" android:layout_width="0.0dip" android:text="@string/set_status" android:layout_weight="1.0" android:drawableStart="@drawable/ic_status_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
-                <com.discord.views.StatusView android:id="@id/settings_status_view" android:layout_width="16.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="4.0dip" />
-                <TextView android:id="@id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Settings.Item" />
+                <com.discord.views.StatusView android:id="@id/settings_status_view" android:layout_width="16.0dip" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="4.0dip" />
+                <TextView android:id="@id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="8.0dip" style="@style/UiKit.Settings.Item" />
             </LinearLayout>
             <TextView android:id="@id/settings_account" android:text="@string/user_settings_my_account" android:drawableStart="@drawable/ic_my_account_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_privacy" android:text="@string/privacy_and_safety" android:drawableStart="@drawable/ic_privacy_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
@@ -44,6 +44,7 @@
             <TextView android:id="@id/settings_app_info" style="@style/UiKit.Settings.Item.Header" />
             <TextView android:id="@id/settings_changelog" android:text="@string/change_log" android:drawableStart="@drawable/ic_info_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_support" android:text="@string/support" android:drawableStart="@drawable/ic_help_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
+            <TextView android:id="@id/settings_upload_debug_logs" android:text="@string/upload_debug_logs" android:drawableStart="@drawable/ic_info_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_acknowledgements" android:text="@string/acknowledgements" android:drawableStart="@drawable/ic_info_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_settings_account.xml b/com.discord/res/layout/widget_settings_account.xml
index 1e4ff6c508..53c026631a 100644
--- a/com.discord/res/layout/widget_settings_account.xml
+++ b/com.discord/res/layout/widget_settings_account.xml
@@ -8,42 +8,42 @@
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <RelativeLayout android:gravity="center" android:id="@id/settings_account_verification" android:background="@color/status_red_500" android:visibility="gone" style="@style/UiKit.ViewGroup.RelativeLayout">
                 <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:text="@string/unverified_account_title" android:layout_centerInParent="true" android:layout_toStartOf="@id/settings_account_verification_resend" style="@style/UiKit.TextView.Semibold" />
-                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@id/settings_account_verification_resend" android:layout_width="wrap_content" android:minHeight="0.0dip" android:text="@string/verify_account" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.White.Outline" />
+                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@id/settings_account_verification_resend" android:layout_width="wrap_content" android:minHeight="0.0dip" android:text="@string/verify_account" android:layout_centerVertical="true" android:layout_marginStart="8.0dip" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.White.Outline" />
             </RelativeLayout>
-            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
-                <LinearLayout android:gravity="center_vertical" android:id="@id/settings_account_avatar_wrap" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <RelativeLayout android:background="?primary_630" android:paddingTop="32.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
+                <LinearLayout android:gravity="center_vertical" android:id="@id/settings_account_avatar_wrap" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                     <FrameLayout android:id="@id/settings_account_avatar_container" android:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/change_avatar">
                         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_account_avatar" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Large.ExtraAccount" />
                         <ImageView android:layout_gravity="center|right|top" android:id="@id/settings_account_avatar_edit" android:background="@drawable/drawable_circle_white_1" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_upload_image_34dp" android:scaleType="center" />
                     </FrameLayout>
-                    <LinearLayout android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+                    <LinearLayout android:layout_marginStart="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                         <TextView android:id="@id/settings_account_tag" style="@style/UiKit.TextView.Large.SingleLine" />
                         <TextView android:textColor="?primary_400" android:id="@id/settings_account_email" style="@style/UiKit.TextView" />
-                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/settings_account_remove_avatar" android:background="?selectableItemBackground" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/remove_icon" style="@style/UiKit.TextView.Semibold" />
+                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/settings_account_remove_avatar" android:background="?selectableItemBackground" android:layout_marginTop="4.0dip" android:text="@string/remove_icon" style="@style/UiKit.TextView.Semibold" />
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:weightSum="2.0" android:layout_below="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <LinearLayout android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:weightSum="2.0" android:layout_below="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                     <com.google.android.material.button.MaterialButton android:ellipsize="end" android:id="@id/settings_account_edit" android:layout_width="0.0dip" android:text="@string/user_settings_edit_account" android:maxLines="1" android:layout_weight="1.0" style="@style/UiKit.Material.Button" />
-                    <com.google.android.material.button.MaterialButton android:ellipsize="end" android:id="@id/settings_account_change_password" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:text="@string/change_password" android:maxLines="1" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Secondary" />
+                    <com.google.android.material.button.MaterialButton android:ellipsize="end" android:id="@id/settings_account_change_password" android:layout_width="0.0dip" android:layout_marginLeft="8.0dip" android:text="@string/change_password" android:maxLines="1" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Secondary" />
                 </LinearLayout>
             </RelativeLayout>
             <View style="@style/UiKit.Divider" />
             <LinearLayout android:id="@id/settings_account_mfa_container" style="@style/UiKit.ViewGroup.LinearLayout">
                 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                     <TextView android:layout_width="0.0dip" android:text="@string/two_fa" android:layout_weight="1.0" style="@style/UiKit.Settings.Item.Header" />
-                    <TextView android:textColor="@color/status_green_500" android:id="@id/settings_account_mfa_enabled_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/user_settings_mfa_enabled" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
+                    <TextView android:textColor="@color/status_green_500" android:id="@id/settings_account_mfa_enabled_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/user_settings_mfa_enabled" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Semibold" />
                 </LinearLayout>
                 <com.discord.app.AppViewFlipper android:id="@id/settings_account_mfa_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <LinearLayout android:id="@id/settings_account_mfa_enabled_container" style="@style/UiKit.ViewGroup.LinearLayout">
                         <TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.Settings.Item" />
                         <TextView android:id="@id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/UiKit.Settings.Item" />
                         <com.discord.views.CheckedSetting android:id="@id/settings_account_sms_backup" app:cs_subtext="@string/mfa_sms_auth_sales_pitch" app:cs_text="@string/mfa_sms_auth" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
-                        <TextView android:id="@id/settings_account_sms_phone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+                        <TextView android:id="@id/settings_account_sms_phone" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView" />
                     </LinearLayout>
-                    <LinearLayout android:gravity="center" android:id="@id/settings_account_mfa_disabled_container" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+                    <LinearLayout android:gravity="center" android:id="@id/settings_account_mfa_disabled_container" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                         <com.airbnb.lottie.LottieAnimationView android:id="@id/settings_account_mfa_lottie" android:visibility="gone" android:layout_width="110.0dip" android:layout_height="118.0dip" app:lottie_autoPlay="true" app:lottie_fileName="animations/anim_verify_by_phone.json" app:lottie_loop="true" />
                         <TextView android:id="@id/settings_account_mfa_sales_pitch" android:visibility="gone" android:text="@string/two_fa_sales_pitch" style="@style/UiKit.Settings.Item.SubText" />
-                        <com.google.android.material.button.MaterialButton android:id="@id/settings_account_mfa_enable" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/two_fa_enable" style="@style/UiKit.Material.Button.Secondary" />
+                        <com.google.android.material.button.MaterialButton android:id="@id/settings_account_mfa_enable" android:visibility="gone" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:text="@string/two_fa_enable" style="@style/UiKit.Material.Button.Secondary" />
                     </LinearLayout>
                 </com.discord.app.AppViewFlipper>
             </LinearLayout>
diff --git a/com.discord/res/layout/widget_settings_account_backup_codes.xml b/com.discord/res/layout/widget_settings_account_backup_codes.xml
index 6efce0f42c..5c17d6d0bf 100644
--- a/com.discord/res/layout/widget_settings_account_backup_codes.xml
+++ b/com.discord/res/layout/widget_settings_account_backup_codes.xml
@@ -6,10 +6,10 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.discord.app.AppTextView android:id="@id/settings_backup_codes_info" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/two_fa_backup_codes_body" style="@style/UiKit.TextView" />
+            <com.discord.app.AppTextView android:id="@id/settings_backup_codes_info" android:layout_margin="16.0dip" android:text="@string/two_fa_backup_codes_body" style="@style/UiKit.TextView" />
             <View style="@style/UiKit.Divider" />
             <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_backup_codes_rv" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView" />
-            <com.google.android.material.button.MaterialButton android:id="@id/settings_backup_codes_generate" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/two_fa_generate_codes" style="@style/UiKit.Material.Button.Secondary" />
+            <com.google.android.material.button.MaterialButton android:id="@id/settings_backup_codes_generate" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" android:text="@string/two_fa_generate_codes" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
diff --git a/com.discord/res/layout/widget_settings_account_change_password.xml b/com.discord/res/layout/widget_settings_account_change_password.xml
index 0867669db7..d5a1b5daf8 100644
--- a/com.discord/res/layout/widget_settings_account_change_password.xml
+++ b/com.discord/res/layout/widget_settings_account_change_password.xml
@@ -5,7 +5,7 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.ScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <com.google.android.material.textfield.TextInputLayout android:id="@id/change_password_current_password_input" android:hint="@string/form_label_current_password" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password">
                     <requestFocus />
diff --git a/com.discord/res/layout/widget_settings_account_edit.xml b/com.discord/res/layout/widget_settings_account_edit.xml
index 5432c4f176..c084a9e8b0 100644
--- a/com.discord/res/layout/widget_settings_account_edit.xml
+++ b/com.discord/res/layout/widget_settings_account_edit.xml
@@ -5,7 +5,7 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.ScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <RelativeLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <com.google.android.material.textfield.TextInputLayout android:id="@id/edit_account_username_wrap" android:hint="@string/username" android:layout_toStartOf="@id/edit_account_tag_layout_container" style="@style/UiKit.TextInputLayout.Primary">
                     <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit.TextInputLayout.EditText">
diff --git a/com.discord/res/layout/widget_settings_appearance.xml b/com.discord/res/layout/widget_settings_appearance.xml
index a968cebae2..376d995326 100644
--- a/com.discord/res/layout/widget_settings_appearance.xml
+++ b/com.discord/res/layout/widget_settings_appearance.xml
@@ -5,7 +5,7 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <ScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/theme" style="@style/UiKit.Settings.Item.Header" />
             <com.discord.views.CheckedSetting android:id="@id/settings_appearance_theme_light_radio" app:cs_text="@string/theme_light" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/settings_appearance_theme_dark_radio" app:cs_text="@string/theme_dark" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
@@ -18,14 +18,14 @@
                 <TextView android:text="@string/accessibility_font_scaling_label" style="@style/UiKit.Settings.Item.Header" />
                 <TextView android:id="@id/settings_appearance_font_scale_platform" style="@style/UiKit.Settings.Item.SubText" />
                 <RelativeLayout style="@style/UiKit.Settings.Item">
-                    <TextView android:textSize="12.0dip" android:id="@id/settings_appearance_font_scaling_seekbar_text_left" android:text="Aa" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-                    <SeekBar android:id="@id/settings_appearance_font_scaling_seekbar" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:max="70" android:layout_toLeftOf="@id/settings_appearance_font_scaling_seekbar_text_right" android:layout_toRightOf="@id/settings_appearance_font_scaling_seekbar_text_left" android:layout_centerVertical="true" style="@style/UiKit.SeekBar" />
-                    <TextView android:textSize="21.0dip" android:id="@id/settings_appearance_font_scaling_seekbar_text_right" android:text="Aa" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
+                    <TextView android:textSize="12.0dip" android:id="@id/settings_appearance_font_scaling_seekbar_text_left" android:text="Aa" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
+                    <SeekBar android:id="@id/settings_appearance_font_scaling_seekbar" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:max="70" android:layout_toLeftOf="@id/settings_appearance_font_scaling_seekbar_text_right" android:layout_toRightOf="@id/settings_appearance_font_scaling_seekbar_text_left" android:layout_centerVertical="true" style="@style/UiKit.SeekBar" />
+                    <TextView android:textSize="21.0dip" android:id="@id/settings_appearance_font_scaling_seekbar_text_right" android:text="Aa" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
                 </RelativeLayout>
-                <FrameLayout android:background="?chat_embed_bg" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
+                <FrameLayout android:background="?chat_embed_bg" android:paddingLeft="8.0dip" android:paddingTop="8.0dip" android:paddingRight="8.0dip" android:paddingBottom="16.0dip" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup">
                     <include layout="@layout/widget_chat_list_adapter_item_text" />
                 </FrameLayout>
-                <TextView android:layout_gravity="left" android:id="@id/settings_appearance_font_scaling_reset" android:background="?selectableItemBackground" android:layout_marginLeft="@dimen/uikit_spacing_large" android:text="@string/reset" style="@style/UiKit.TextView.Link" />
+                <TextView android:layout_gravity="left" android:id="@id/settings_appearance_font_scaling_reset" android:background="?selectableItemBackground" android:layout_marginLeft="16.0dip" android:text="@string/reset" style="@style/UiKit.TextView.Link" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/com.discord/res/layout/widget_settings_authorized_apps.xml b/com.discord/res/layout/widget_settings_authorized_apps.xml
index a6880b7ed2..6401f62d47 100644
--- a/com.discord/res/layout/widget_settings_authorized_apps.xml
+++ b/com.discord/res/layout/widget_settings_authorized_apps.xml
@@ -8,7 +8,7 @@
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/applications_and_connections" style="@style/UiKit.Settings.Item.Header" />
             <TextView android:text="@string/applications_and_connections_body" style="@style/UiKit.Settings.Item.Addition" />
-            <androidx.recyclerview.widget.RecyclerView android:id="@id/authorized_apps_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
+            <androidx.recyclerview.widget.RecyclerView android:id="@id/authorized_apps_list" android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.RecyclerView" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_authorized_apps_list_item.xml b/com.discord/res/layout/widget_settings_authorized_apps_list_item.xml
index 00b6d95d57..20b2eb23f9 100644
--- a/com.discord/res/layout/widget_settings_authorized_apps_list_item.xml
+++ b/com.discord/res/layout/widget_settings_authorized_apps_list_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" app:strokeColor="?primary_900" app:strokeWidth="0.5dip" style="@style/UiKit.ViewGroup"
+<com.google.android.material.card.MaterialCardView android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" app:strokeColor="?primary_900" app:strokeWidth="0.5dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <LinearLayout android:gravity="start|center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <LinearLayout android:gravity="start|center" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/oauth_application_icon_iv" android:layout_width="40.0dip" android:layout_height="40.0dip" android:importantForAccessibility="no" app:placeholderImage="?ic_game_icon_placeholder" style="@style/Icon.Game" />
-            <TextView android:id="@id/oauth_application_name_tv" android:layout_width="0.0dip" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.H1" />
-            <androidx.appcompat.widget.AppCompatImageView android:layout_gravity="top" android:id="@id/oauth_application_deauthorize_btn" android:padding="@dimen/uikit_spacing_small" android:src="?ic_close_24dp" android:contentDescription="@string/deauthorize_app" app:tint="@color/status_red_500" style="@style/UiKit.ImageView.Clickable" />
+            <TextView android:id="@id/oauth_application_name_tv" android:layout_width="0.0dip" android:layout_weight="1.0" android:layout_marginStart="16.0dip" style="@style/UiKit.TextView.H1" />
+            <androidx.appcompat.widget.AppCompatImageView android:layout_gravity="top" android:id="@id/oauth_application_deauthorize_btn" android:padding="4.0dip" android:src="?ic_close_24dp" android:contentDescription="@string/deauthorize_app" app:tint="@color/status_red_500" style="@style/UiKit.ImageView.Clickable" />
         </LinearLayout>
         <TextView android:id="@id/oauth_application_description_label_tv" android:text="@string/about_this_app" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/oauth_application_description_tv" style="@style/UiKit.Settings.Item.Addition" />
         <TextView android:text="@string/permissions" style="@style/UiKit.Settings.Item.Header" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/oauth_application_permissions_rv" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/oauth_application_permissions_rv" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.RecyclerView" />
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_blocked_users.xml b/com.discord/res/layout/widget_settings_blocked_users.xml
index 87bcd4b707..c024da6594 100644
--- a/com.discord/res/layout/widget_settings_blocked_users.xml
+++ b/com.discord/res/layout/widget_settings_blocked_users.xml
@@ -6,9 +6,9 @@
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/blocked_users_flipper" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@id/blocked_users_list_recycler" android:background="?colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-        <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large">
+        <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip">
             <ImageView android:id="@id/friends_list_item_empty_no_blocked" android:layout_width="320.0dip" android:layout_height="wrap_content" android:src="?theme_friends_no_block" android:scaleType="fitCenter" android:adjustViewBounds="true" android:contentDescription="@string/sample_empty_string" />
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:gravity="center" android:layout_width="336.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/user_settings_blocked_users_empty" style="@style/UiKit.TextView.Semibold" />
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:gravity="center" android:layout_width="336.0dip" android:layout_marginTop="16.0dip" android:text="@string/user_settings_blocked_users_empty" style="@style/UiKit.TextView.Semibold" />
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_boost.xml b/com.discord/res/layout/widget_settings_boost.xml
index ca3c212c93..0060ebf7cb 100644
--- a/com.discord/res/layout/widget_settings_boost.xml
+++ b/com.discord/res/layout/widget_settings_boost.xml
@@ -7,26 +7,26 @@
     <com.discord.app.AppViewFlipper android:id="@id/settings_boost_flipper" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_marginBottom="8.0dip" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <com.google.android.material.button.MaterialButton android:id="@id/settings_boost_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
         <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
-            <LinearLayout android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:paddingTop="24.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <LinearLayout android:id="@id/settings_boost_subtext_container" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <TextView android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_subtitle_mobile_1" style="@style/UiKit.TextView" />
-                    <TextView android:id="@id/settings_boost_subtext" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-                    <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_boost_recycler" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
+                    <TextView android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/premium_guild_subscription_subtitle_mobile_1" style="@style/UiKit.TextView" />
+                    <TextView android:id="@id/settings_boost_subtext" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
+                    <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_boost_recycler" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup.RecyclerView" />
                 </LinearLayout>
-                <LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.LinearLayout">
+                <LinearLayout android:layout_marginTop="24.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                     <include layout="@layout/view_settings_premium_guild_marketing_header" />
                     <include layout="@layout/view_premium_guild_features_user_old" />
                     <include layout="@layout/view_premium_guild_features_guild_old" />
-                    <View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.Divider" />
+                    <View android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="32.0dip" style="@style/UiKit.Divider" />
                     <com.discord.views.premiumguild.PremiumGuildSubscriptionUpsellView android:id="@id/settings_boost_upsell_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
-                    <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_boost_sample_guilds" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
-                    <include android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" layout="@layout/view_settings_premium_guild_no_guilds" />
+                    <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_boost_sample_guilds" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.RecyclerView" />
+                    <include android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="32.0dip" layout="@layout/view_settings_premium_guild_no_guilds" />
                 </LinearLayout>
-                <View android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+                <View android:layout_marginLeft="16.0dip" android:layout_marginTop="32.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.Divider" />
                 <com.discord.views.premiumguild.PremiumSubscriptionMarketingView android:id="@id/settings_boost_marketing_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_settings_developer.xml b/com.discord/res/layout/widget_settings_developer.xml
index b0b08d48b1..0da8e2da23 100644
--- a/com.discord/res/layout/widget_settings_developer.xml
+++ b/com.discord/res/layout/widget_settings_developer.xml
@@ -7,13 +7,17 @@
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="Experiments" style="@style/UiKit.Settings.Item.Header" />
-            <com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="@dimen/app_elevation" style="@style/Widget.MaterialComponents.CardView">
+            <com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="@dimen/app_elevation" style="@style/Widget.MaterialComponents.CardView">
                 <androidx.recyclerview.widget.RecyclerView android:id="@id/developer_settings_experiments" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
             </com.google.android.material.card.MaterialCardView>
             <TextView android:text="Notice cache" style="@style/UiKit.Settings.Item.Header" />
-            <com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="@dimen/app_elevation" style="@style/Widget.MaterialComponents.CardView">
+            <com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="@dimen/app_elevation" style="@style/Widget.MaterialComponents.CardView">
                 <androidx.recyclerview.widget.RecyclerView android:id="@id/developer_settings_notices" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
             </com.google.android.material.card.MaterialCardView>
+            <TextView android:text="Crashes" style="@style/UiKit.Settings.Item.Header" />
+            <Button android:id="@id/developer_settings_crash_kotlin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="Unhandled UI Thread Exception" />
+            <Button android:id="@id/developer_settings_crash_discord_nonfatal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="Non-fatal Exception" />
+            <Button android:id="@id/developer_settings_crash_discord_jnibridge" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="libdiscord Crash" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_enable_mfa_download.xml b/com.discord/res/layout/widget_settings_enable_mfa_download.xml
index 55dd8819b1..ed21b28c90 100644
--- a/com.discord/res/layout/widget_settings_enable_mfa_download.xml
+++ b/com.discord/res/layout/widget_settings_enable_mfa_download.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="150.0dip" android:layout_height="150.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_google_auth_logo" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa_download_app_label" style="@style/UiKit.TextView" />
-    <com.discord.app.AppTextView android:id="@id/mfa_download_body" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/two_fa_download_app_body" style="@style/UiKit.TextView" />
+    <ImageView android:layout_width="150.0dip" android:layout_height="150.0dip" android:layout_marginBottom="32.0dip" android:src="@drawable/ic_google_auth_logo" style="@style/UiKit.ImageView" />
+    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="8.0dip" android:text="@string/two_fa_download_app_label" style="@style/UiKit.TextView" />
+    <com.discord.app.AppTextView android:id="@id/mfa_download_body" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:text="@string/two_fa_download_app_body" style="@style/UiKit.TextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_enable_mfa_input.xml b/com.discord/res/layout/widget_settings_enable_mfa_input.xml
index e4301f1a93..ec4872d967 100644
--- a/com.discord/res/layout/widget_settings_enable_mfa_input.xml
+++ b/com.discord/res/layout/widget_settings_enable_mfa_input.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.Page.LinearLayout"
+<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa_login_label" style="@style/UiKit.TextView" />
-    <TextView android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/two_fa_login_body" style="@style/UiKit.TextView" />
-    <com.discord.views.CodeVerificationView android:id="@id/user_settings_mfa_enable_input_code" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup" />
+    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="8.0dip" android:text="@string/two_fa_login_label" style="@style/UiKit.TextView" />
+    <TextView android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="24.0dip" android:text="@string/two_fa_login_body" style="@style/UiKit.TextView" />
+    <com.discord.views.CodeVerificationView android:id="@id/user_settings_mfa_enable_input_code" android:layout_marginTop="16.0dip" style="@style/UiKit.ViewGroup" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_enable_mfa_key.xml b/com.discord/res/layout/widget_settings_enable_mfa_key.xml
index 4160759d33..1dc5c6e20c 100644
--- a/com.discord/res/layout/widget_settings_enable_mfa_key.xml
+++ b/com.discord/res/layout/widget_settings_enable_mfa_key.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.Page.LinearLayout"
+<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/user_settings_mfa_enable_code_label" style="@style/UiKit.TextView" />
-    <TextView android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/user_settings_mfa_enable_code_body" style="@style/UiKit.TextView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@id/enable_mfa_key_code" android:background="?chat_embed_bg" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground" android:drawableRight="?ic_copy" android:drawablePadding="@dimen/uikit_spacing_medium" app:fontFamily="@font/sourcecodepro_semibold" style="@style/UiKit.TextView.Large" />
-    <TextView android:textColor="@color/brand_500" android:id="@id/enable_mfa_key_launch_authy" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:visibility="invisible" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textColor="@color/brand_500" android:id="@id/enable_mfa_key_launch_google_auth" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:visibility="invisible" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="8.0dip" android:text="@string/user_settings_mfa_enable_code_label" style="@style/UiKit.TextView" />
+    <TextView android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="24.0dip" android:text="@string/user_settings_mfa_enable_code_body" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@id/enable_mfa_key_code" android:background="?chat_embed_bg" android:padding="8.0dip" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:foreground="?selectableItemBackground" android:drawableRight="?ic_copy" android:drawablePadding="8.0dip" app:fontFamily="@font/sourcecodepro_semibold" style="@style/UiKit.TextView.Large" />
+    <TextView android:textColor="@color/brand_500" android:id="@id/enable_mfa_key_launch_authy" android:background="?selectableItemBackground" android:padding="16.0dip" android:visibility="invisible" android:layout_marginTop="16.0dip" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="@color/brand_500" android:id="@id/enable_mfa_key_launch_google_auth" android:background="?selectableItemBackground" android:padding="16.0dip" android:visibility="invisible" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_enable_mfa_success.xml b/com.discord/res/layout/widget_settings_enable_mfa_success.xml
index 30b82508f7..9dd6d79236 100644
--- a/com.discord/res/layout/widget_settings_enable_mfa_success.xml
+++ b/com.discord/res/layout/widget_settings_enable_mfa_success.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="?img_mfa" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa_success_header" style="@style/UiKit.TextView" />
-    <TextView android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/two_fa_success_body_mobile" style="@style/UiKit.TextView" />
-    <View android:layout_width="150.0dip" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.Divider" />
+    <ImageView android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="32.0dip" android:src="?img_mfa" style="@style/UiKit.ImageView" />
+    <TextView android:textSize="24.0sp" android:textColor="?primary_100" android:layout_marginBottom="8.0dip" android:text="@string/two_fa_success_header" style="@style/UiKit.TextView" />
+    <TextView android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:text="@string/two_fa_success_body_mobile" style="@style/UiKit.TextView" />
+    <View android:layout_width="150.0dip" android:layout_marginTop="32.0dip" android:layout_marginBottom="32.0dip" style="@style/UiKit.Divider" />
     <com.google.android.material.button.MaterialButton android:id="@id/mfa_success_enable_sms" android:text="@string/mfa_sms_enable" style="@style/UiKit.Material.Button" />
-    <TextView android:gravity="center" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/mfa_sms_auth_sales_pitch" style="@style/UiKit.TextView.Subtext" />
+    <TextView android:gravity="center" android:layout_marginTop="8.0dip" android:text="@string/mfa_sms_auth_sales_pitch" style="@style/UiKit.TextView.Subtext" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_games.xml b/com.discord/res/layout/widget_settings_games.xml
index 3678a2a0ab..f5216ee352 100644
--- a/com.discord/res/layout/widget_settings_games.xml
+++ b/com.discord/res/layout/widget_settings_games.xml
@@ -5,10 +5,10 @@
         <androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/game_activity" style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:padding="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <LinearLayout android:id="@id/settings_games_detection_section" style="@style/UiKit.ViewGroup.LinearLayout">
-                <LinearLayout android:id="@id/settings_games_playing_container" android:background="@drawable/drawable_button_green" android:padding="@dimen/uikit_spacing_large" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:elevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <ImageView android:id="@id/settings_games_playing_icon" android:layout_width="40.0dip" android:layout_height="40.0dip" android:contentDescription="@string/playing_game" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:elevation="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
+                <LinearLayout android:id="@id/settings_games_playing_container" android:background="@drawable/drawable_button_green" android:padding="16.0dip" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:elevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                    <ImageView android:id="@id/settings_games_playing_icon" android:layout_width="40.0dip" android:layout_height="40.0dip" android:contentDescription="@string/playing_game" android:layout_marginEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ImageView" />
                     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
                         <TextView android:textColor="@color/primary_100" android:id="@id/settings_games_playing_title" style="@style/UiKit.TextView.Bold" />
                         <TextView android:textColor="@color/primary_200" android:id="@id/settings_games_playing_subtitle" style="@style/UiKit.TextView" />
diff --git a/com.discord/res/layout/widget_settings_gifting.xml b/com.discord/res/layout/widget_settings_gifting.xml
index dc60afe01e..9ae50b78a3 100644
--- a/com.discord/res/layout/widget_settings_gifting.xml
+++ b/com.discord/res/layout/widget_settings_gifting.xml
@@ -7,23 +7,23 @@
     <com.discord.app.AppViewFlipper android:id="@id/settings_gifting_flipper" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_marginBottom="8.0dip" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <com.google.android.material.button.MaterialButton android:id="@id/settings_gifting_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
         <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
             <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_redeem_codes" style="@style/UiKit.Settings.Item.Header" />
+                <TextView android:paddingBottom="8.0dip" android:text="@string/gift_inventory_redeem_codes" style="@style/UiKit.Settings.Item.Header" />
                 <TextView android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:text="@string/application_entitlement_code_redemption_prompt" style="@style/UiKit.Settings.Item.SubText" />
-                <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large">
-                    <ProgressBar android:layout_gravity="end|center" android:id="@id/settings_gifting_gift_code_input_progress" android:visibility="gone" android:layout_width="20.0sp" android:layout_height="20.0sp" android:layout_marginEnd="@dimen/uikit_spacing_large" />
+                <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip">
+                    <ProgressBar android:layout_gravity="end|center" android:id="@id/settings_gifting_gift_code_input_progress" android:visibility="gone" android:layout_width="20.0sp" android:layout_height="20.0sp" android:layout_marginEnd="16.0dip" />
                     <com.google.android.material.textfield.TextInputLayout android:id="@id/settings_gifting_gift_code_input_wrap" android:hint="@string/gift_code_hint" style="@style/UiKit.TextInputLayout.Primary">
                         <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText" />
                     </com.google.android.material.textfield.TextInputLayout>
                 </FrameLayout>
-                <TextView android:paddingBottom="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/application_library_inventory" style="@style/UiKit.Settings.Item.Header" />
-                <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_giftting_inventory_recycler" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:animateLayoutChanges="false" style="@style/UiKit.ViewGroup.RecyclerView" />
-                <TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_select_nitro_gift" style="@style/UiKit.Settings.Item.Header" />
-                <LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.LinearLayout">
+                <TextView android:paddingBottom="0.0dip" android:layout_marginTop="8.0dip" android:text="@string/application_library_inventory" style="@style/UiKit.Settings.Item.Header" />
+                <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_giftting_inventory_recycler" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:animateLayoutChanges="false" style="@style/UiKit.ViewGroup.RecyclerView" />
+                <TextView android:paddingBottom="8.0dip" android:layout_marginTop="8.0dip" android:text="@string/gift_inventory_select_nitro_gift" style="@style/UiKit.Settings.Item.Header" />
+                <LinearLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                     <include layout="@layout/view_settings_gifting_nitro" />
                     <include layout="@layout/view_settings_gifting_nitro_classic" />
                 </LinearLayout>
diff --git a/com.discord/res/layout/widget_settings_item_add_connected_account.xml b/com.discord/res/layout/widget_settings_item_add_connected_account.xml
index 5bded5332e..797a7d38e8 100644
--- a/com.discord/res/layout/widget_settings_item_add_connected_account.xml
+++ b/com.discord/res/layout/widget_settings_item_add_connected_account.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+<LinearLayout android:background="?selectableItemBackground" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_gravity="center_vertical" android:id="@id/add_connected_account_image" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
+    <ImageView android:layout_gravity="center_vertical" android:id="@id/add_connected_account_image" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ImageView" />
     <TextView android:layout_gravity="center_vertical" android:id="@id/add_connected_account_text" style="@style/UiKit.TextView.Large.SingleLine" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_item_backup_code.xml b/com.discord/res/layout/widget_settings_item_backup_code.xml
index f6e07397c6..ea86f5103e 100644
--- a/com.discord/res/layout/widget_settings_item_backup_code.xml
+++ b/com.discord/res/layout/widget_settings_item_backup_code.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textColor="?primary_100" android:id="@id/item_backup_code_tv" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:foreground="?selectableItemBackground" app:font="@font/sourcecodepro_semibold" style="@style/UiKit.TextView.Large"
+<TextView android:textColor="?primary_100" android:id="@id/item_backup_code_tv" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:foreground="?selectableItemBackground" app:font="@font/sourcecodepro_semibold" style="@style/UiKit.TextView.Large"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_item_connected_account.xml b/com.discord/res/layout/widget_settings_item_connected_account.xml
index 0900132b94..76171150fb 100644
--- a/com.discord/res/layout/widget_settings_item_connected_account.xml
+++ b/com.discord/res/layout/widget_settings_item_connected_account.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_medium" app:cardCornerRadius="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup"
+<androidx.cardview.widget.CardView android:layout_margin="8.0dip" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.ConstraintLayout">
         <View android:background="@drawable/asset_generic_connected_bg_top" android:layout_width="fill_parent" android:layout_height="0.0dip" app:layout_constraintBottom_toTopOf="@id/connected_account_divider" app:layout_constraintTop_toTopOf="parent" />
-        <ImageView android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="@dimen/uikit_spacing_large" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-        <TextView android:textColor="@color/white" android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.TextView.Large.SingleLine" />
-        <ImageView android:id="@id/connected_account_disconnect" android:padding="@dimen/uikit_spacing_small" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.ImageView.Clickable" />
-        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
-        <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
+        <ImageView android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="16.0dip" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+        <TextView android:textColor="@color/white" android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.TextView.Large.SingleLine" />
+        <ImageView android:id="@id/connected_account_disconnect" android:padding="4.0dip" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.ImageView.Clickable" />
+        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="16.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
+        <LinearLayout android:paddingTop="8.0dip" android:paddingBottom="8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_display_switch" android:text="@string/display_on_profile" style="@style/Connections.Switch" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_display_activity_switch" android:text="@string/display_activity" style="@style/Connections.Switch" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections.Switch" />
-            <com.discord.app.AppTextView android:textColor="@color/primary_100" android:id="@id/connected_account_extra_info" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:drawableEnd="?ic_open_in_new_24dp" style="@style/UiKit.TextView" />
+            <com.discord.app.AppTextView android:textColor="@color/primary_100" android:id="@id/connected_account_extra_info" android:padding="16.0dip" android:visibility="gone" android:drawableEnd="?ic_open_in_new_24dp" style="@style/UiKit.TextView" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_language.xml b/com.discord/res/layout/widget_settings_language.xml
index be4bb2c8c9..597428f1bc 100644
--- a/com.discord/res/layout/widget_settings_language.xml
+++ b/com.discord/res/layout/widget_settings_language.xml
@@ -7,10 +7,10 @@
     <ScrollView style="@style/UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior">
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/language" style="@style/UiKit.Settings.Item.Header" />
-            <RelativeLayout android:id="@id/settings_language_current" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content">
+            <RelativeLayout android:id="@id/settings_language_current" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <TextView android:textColor="?primary_100" android:text="@string/language" android:layout_toStartOf="@id/settings_language_current_flag" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-                <ImageView android:id="@id/settings_language_current_flag" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:contentDescription="@string/language_select" android:layout_toStartOf="@id/settings_language_current_text" style="@style/UiKit.ImageView" />
-                <TextView android:textColor="?primary_100" android:id="@id/settings_language_current_text" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableEnd="@drawable/icon_carrot" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
+                <ImageView android:id="@id/settings_language_current_flag" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_centerVertical="true" android:contentDescription="@string/language_select" android:layout_toStartOf="@id/settings_language_current_text" style="@style/UiKit.ImageView" />
+                <TextView android:textColor="?primary_100" android:id="@id/settings_language_current_text" android:drawablePadding="16.0dip" android:drawableEnd="@drawable/icon_carrot" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
             </RelativeLayout>
             <View style="@style/UiKit.Settings.Divider" />
             <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/sync" style="@style/UiKit.Settings.Item.Header" />
diff --git a/com.discord/res/layout/widget_settings_language_select.xml b/com.discord/res/layout/widget_settings_language_select.xml
index e884956534..5c6d8a93a5 100644
--- a/com.discord/res/layout/widget_settings_language_select.xml
+++ b/com.discord/res/layout/widget_settings_language_select.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Sheet.Header">
             <androidx.constraintlayout.widget.Guideline style="@style/UiKit.Sheet.Guideline" />
             <TextView android:text="@string/language_select" style="@style/UiKit.Sheet.Header.Title" />
diff --git a/com.discord/res/layout/widget_settings_language_select_item.xml b/com.discord/res/layout/widget_settings_language_select_item.xml
index 1d8456b30a..91e32347a4 100644
--- a/com.discord/res/layout/widget_settings_language_select_item.xml
+++ b/com.discord/res/layout/widget_settings_language_select_item.xml
@@ -2,5 +2,5 @@
 <FrameLayout android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:id="@id/settings_language_select_item_name_localized" style="@style/UiKit.Settings.Item.Icon" />
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_gravity="end|center" android:id="@id/settings_language_select_item_name" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/locale" android:singleLine="true" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_gravity="end|center" android:id="@id/settings_language_select_item_name" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/locale" android:singleLine="true" style="@style/UiKit.TextView" />
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_payment_methods.xml b/com.discord/res/layout/widget_settings_payment_methods.xml
index b3e4906cc1..3b9cd7cabf 100644
--- a/com.discord/res/layout/widget_settings_payment_methods.xml
+++ b/com.discord/res/layout/widget_settings_payment_methods.xml
@@ -5,14 +5,14 @@
         <ProgressBar android:layout_gravity="center" android:id="@id/payment_methods_loading" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <androidx.recyclerview.widget.RecyclerView android:id="@id/payment_methods_recycler" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
         <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_marginBottom="8.0dip" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <com.google.android.material.button.MaterialButton android:id="@id/payment_methods_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
-        <androidx.constraintlayout.widget.ConstraintLayout android:paddingTop="@dimen/uikit_spacing_large" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout android:paddingTop="16.0dip" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
             <ImageView android:id="@id/payment_methods_empty_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_item_shop_dark" android:importantForAccessibility="no" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:id="@id/payment_methods_empty_title" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/billing_no_payment_method" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_subtext" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_image" style="@style/UiKit.TextView" />
-            <TextView android:textColor="@color/primary_400" android:id="@id/payment_methods_empty_subtext" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/billing_no_payment_method_description" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_add" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_title" style="@style/UiKit.TextView" />
-            <com.google.android.material.button.MaterialButton android:id="@id/payment_methods_empty_add" android:layout_width="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_add_payment_method" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_subtext" style="@style/UiKit.Material.Button" />
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:id="@id/payment_methods_empty_title" android:layout_marginTop="32.0dip" android:text="@string/billing_no_payment_method" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_subtext" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_image" style="@style/UiKit.TextView" />
+            <TextView android:textColor="@color/primary_400" android:id="@id/payment_methods_empty_subtext" android:layout_marginTop="4.0dip" android:text="@string/billing_no_payment_method_description" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_add" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_title" style="@style/UiKit.TextView" />
+            <com.google.android.material.button.MaterialButton android:id="@id/payment_methods_empty_add" android:layout_width="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" android:text="@string/billing_add_payment_method" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_subtext" style="@style/UiKit.Material.Button" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.discord.app.AppViewFlipper>
 </FrameLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_premium.xml b/com.discord/res/layout/widget_settings_premium.xml
index 644c24c5ba..bec920007e 100644
--- a/com.discord/res/layout/widget_settings_premium.xml
+++ b/com.discord/res/layout/widget_settings_premium.xml
@@ -9,36 +9,36 @@
             <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" app:layout_constraintTop_toTopOf="parent" />
                 <ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_classic_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" />
-                <LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="500.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+                <LinearLayout android:layout_width="0.0dip" android:layout_marginTop="24.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="500.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                     <LinearLayout android:id="@id/premium_settings_subscription_container" style="@style/UiKit.ViewGroup.LinearLayout">
                         <TextView android:text="@string/premium_settings_subscriptions_mobile_header" style="@style/UiKit.Settings.Item.Header" />
-                        <androidx.cardview.widget.CardView android:id="@id/premium_settings_renew_mutation_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip">
+                        <androidx.cardview.widget.CardView android:id="@id/premium_settings_renew_mutation_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="16.0dip" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip">
                             <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                                <TextView android:id="@id/premium_settings_renew_mutation_tv" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_info_24dp" style="@style/UiKit.TextView" />
-                                <com.google.android.material.button.MaterialButton android:id="@id/premium_settings_renew_mutation_btn" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_pending_plan_change_cancel_button" style="@style/UiKit.Material.Button" />
+                                <TextView android:id="@id/premium_settings_renew_mutation_tv" android:padding="8.0dip" android:layout_width="fill_parent" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_info_24dp" style="@style/UiKit.TextView" />
+                                <com.google.android.material.button.MaterialButton android:id="@id/premium_settings_renew_mutation_btn" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/premium_pending_plan_change_cancel_button" style="@style/UiKit.Material.Button" />
                             </LinearLayout>
                         </androidx.cardview.widget.CardView>
-                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/drawable_bg_nitro_gradient" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
-                        <com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
-                        <com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_guild_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
-                        <TextView android:textColor="?colorHeaderSecondary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_payment_premium_description" style="@style/UiKit.TextView" />
+                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/drawable_bg_nitro_gradient" android:padding="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
+                        <com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" />
+                        <com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_guild_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" />
+                        <TextView android:textColor="?colorHeaderSecondary" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:text="@string/billing_payment_premium_description" style="@style/UiKit.TextView" />
                     </LinearLayout>
                     <include layout="@layout/layout_premium_settings_payment" />
-                    <LinearLayout android:id="@id/premium_settings_credit_container" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
+                    <LinearLayout android:id="@id/premium_settings_credit_container" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                         <TextView android:text="@string/billing_subscription_credit" style="@style/UiKit.Settings.Item.Header" />
                         <include layout="@layout/layout_account_credits_list" />
-                        <TextView android:textColor="?colorHeaderSecondary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_account_credit_description" style="@style/UiKit.TextView" />
+                        <TextView android:textColor="?colorHeaderSecondary" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:text="@string/billing_account_credit_description" style="@style/UiKit.TextView" />
                     </LinearLayout>
                     <include android:id="@id/premium_settings_tier_2_container" layout="@layout/view_premium_settings_tier_2" />
                     <include layout="@layout/view_premium_settings_perks" />
                     <include android:id="@id/premium_settings_tier_1_container" layout="@layout/view_premium_settings_tier_1" />
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:id="@id/premium_settings_legalese" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:id="@id/premium_settings_legalese" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </ScrollView>
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_marginBottom="8.0dip" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <com.google.android.material.button.MaterialButton android:id="@id/premium_settings_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
diff --git a/com.discord/res/layout/widget_settings_premium_switch.xml b/com.discord/res/layout/widget_settings_premium_switch.xml
index 7b1a6253c8..18fa04bc57 100644
--- a/com.discord/res/layout/widget_settings_premium_switch.xml
+++ b/com.discord/res/layout/widget_settings_premium_switch.xml
@@ -7,16 +7,16 @@
     <com.discord.app.AppViewFlipper android:id="@id/premium_switch_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/premium_switch_select_btn">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_marginBottom="8.0dip" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <com.google.android.material.button.MaterialButton android:id="@id/premium_switch_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Material.Button.Secondary" />
         </LinearLayout>
         <RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout">
-            <TextView android:id="@id/premium_switch_pager_header" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:text="@string/billing_step_select_a_plan" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView.H1.Bold" />
-            <androidx.viewpager.widget.ViewPager android:id="@id/premium_switch_pager" android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingRight="@dimen/uikit_spacing_xxlarge" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_above="@id/premium_switch_pager_tabs" android:layout_below="@id/premium_switch_pager_header" />
-            <com.google.android.material.tabs.TabLayout android:id="@id/premium_switch_pager_tabs" android:layout_width="fill_parent" android:layout_height="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_alignParentBottom="true" app:tabBackground="@drawable/tab_dot_selector_wide" app:tabGravity="center" app:tabIndicator="@null" />
+            <TextView android:id="@id/premium_switch_pager_header" android:layout_marginTop="64.0dip" android:text="@string/billing_step_select_a_plan" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView.H1.Bold" />
+            <androidx.viewpager.widget.ViewPager android:id="@id/premium_switch_pager" android:paddingLeft="32.0dip" android:paddingRight="32.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="24.0dip" android:layout_above="@id/premium_switch_pager_tabs" android:layout_below="@id/premium_switch_pager_header" />
+            <com.google.android.material.tabs.TabLayout android:id="@id/premium_switch_pager_tabs" android:layout_width="fill_parent" android:layout_height="8.0dip" android:layout_marginTop="32.0dip" android:layout_alignParentBottom="true" app:tabBackground="@drawable/tab_dot_selector_wide" app:tabGravity="center" app:tabIndicator="@null" />
         </RelativeLayout>
         <include layout="@layout/layout_switch_plan_interval" />
     </com.discord.app.AppViewFlipper>
-    <com.google.android.material.button.MaterialButton android:id="@id/premium_switch_select_btn" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_small" android:layout_above="@id/premium_switch_cancel_btn" style="@style/UiKit.Material.Button.Green" />
-    <TextView android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/premium_switch_cancel_btn" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/nevermind" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView.Semibold" />
+    <com.google.android.material.button.MaterialButton android:id="@id/premium_switch_select_btn" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="4.0dip" android:layout_above="@id/premium_switch_cancel_btn" style="@style/UiKit.Material.Button.Green" />
+    <TextView android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/premium_switch_cancel_btn" android:background="?selectableItemBackground" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/nevermind" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView.Semibold" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_privacy.xml b/com.discord/res/layout/widget_settings_privacy.xml
index 78813fb688..64f3a10ac5 100644
--- a/com.discord/res/layout/widget_settings_privacy.xml
+++ b/com.discord/res/layout/widget_settings_privacy.xml
@@ -26,8 +26,8 @@
                 <com.discord.views.CheckedSetting android:id="@id/settings_privacy_personalization" app:cs_subtext="@string/data_privacy_controls_personalization_note_learn_more" app:cs_text="@string/data_privacy_controls_personalization_title" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
                 <com.discord.views.CheckedSetting android:id="@id/settings_privacy_screenreader_detection" app:cs_subtext="@string/data_privacy_controls_allow_accessibility_detection_note" app:cs_text="@string/data_privacy_controls_allow_accessibility_detection_title" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
                 <com.discord.views.CheckedSetting android:id="@id/settings_privacy_basic_service" app:cs_subtext="@string/data_privacy_controls_basic_service_note" app:cs_text="@string/data_privacy_controls_basic_service_title" style="@style/UiKit.CheckedSetting.Themed" />
-                <com.google.android.material.button.MaterialButton android:id="@id/settings_privacy_request_data" android:text="@string/data_privacy_controls_request_data_download" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.Material.Button.Outline" />
-                <TextView android:layout_gravity="center_horizontal" android:id="@id/settings_privacy_request_data_link" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+                <com.google.android.material.button.MaterialButton android:id="@id/settings_privacy_request_data" android:text="@string/data_privacy_controls_request_data_download" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.Material.Button.Outline" />
+                <TextView android:layout_gravity="center_horizontal" android:id="@id/settings_privacy_request_data_link" android:background="?selectableItemBackground" android:padding="8.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.TextView" />
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_settings_voice.xml b/com.discord/res/layout/widget_settings_voice.xml
index 0772ef56e1..011dfc04af 100644
--- a/com.discord/res/layout/widget_settings_voice.xml
+++ b/com.discord/res/layout/widget_settings_voice.xml
@@ -10,25 +10,25 @@
             <RelativeLayout android:id="@id/settings_voice_mode" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:id="@id/settings_voice_mode_header" android:text="@string/form_label_input_mode" style="@style/UiKit.Settings.Item.Label" />
                 <TextView android:id="@id/settings_voice_mode_value" android:layout_below="@id/settings_voice_mode_header" style="@style/UiKit.Settings.Item.Addition" />
-                <ImageView android:src="?ic_navigate_next" android:layout_centerVertical="true" android:contentDescription="@string/form_label_input_mode" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
+                <ImageView android:src="?ic_navigate_next" android:layout_centerVertical="true" android:contentDescription="@string/form_label_input_mode" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
             </RelativeLayout>
             <com.discord.views.CheckedSetting android:id="@id/settings_voice_auto_vad_toggle" app:cs_text="@string/form_label_automatic_vad_mobile" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
-            <RelativeLayout android:id="@id/settings_voice_sensitivity_wrap" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/settings_voice_sensitivity_header" android:text="@string/form_label_sensitivty" android:maxLines="1" android:layout_alignBaseline="@id/settings_voice_sensitivity_test_button" android:layout_toStartOf="@id/settings_voice_sensitivity_test_button" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
+            <RelativeLayout android:id="@id/settings_voice_sensitivity_wrap" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/settings_voice_sensitivity_header" android:text="@string/form_label_sensitivty" android:maxLines="1" android:layout_alignBaseline="@id/settings_voice_sensitivity_test_button" android:importantForAccessibility="no" android:layout_toStartOf="@id/settings_voice_sensitivity_test_button" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
                 <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/settings_voice_sensitivity_test_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/form_label_test_microphone" android:maxLines="1" android:layout_alignParentEnd="true" app:icon="?ic_mic" app:iconTint="?primary_100" style="@style/UiKit.Material.Button.White.Outline" />
                 <LinearLayout android:id="@id/settings_voice_sensitivity_testing_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/settings_voice_sensitivity_header" style="@style/UiKit.ViewGroup.LinearLayout">
                     <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-                        <com.miguelgaeta.super_bar.SuperBar android:id="@id/settings_voice_sensitivity_manual" android:layout_marginTop="@dimen/uikit_spacing_small" app:sb_barBackgroundColor="@color/status_green_500" app:sb_barColor="@color/status_yellow_500" app:sb_barOverlayColor="@color/white_alpha_40" style="@style/UiKit.SuperBar" />
-                        <View android:layout_gravity="center_vertical" android:id="@id/settings_voice_sensitivity_automatic" android:background="@drawable/drawable_voice_indicator_speaking" android:layout_width="fill_parent" android:layout_height="8.0dip" android:layout_marginLeft="2.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="2.0dip" android:layout_marginBottom="2.0dip" />
+                        <SeekBar android:id="@id/settings_voice_sensitivity_manual" android:layout_height="32.0dip" android:layout_marginTop="4.0dip" android:progressDrawable="@drawable/drawable_voice_sensitivity_progress" android:contentDescription="@string/form_label_sensitivty" style="@style/UiKit.SeekBar" />
+                        <View android:layout_gravity="center_vertical" android:id="@id/settings_voice_sensitivity_automatic" android:background="@drawable/drawable_voice_indicator_speaking" android:layout_width="fill_parent" android:layout_height="8.0dip" android:layout_marginLeft="2.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="2.0dip" android:layout_marginBottom="2.0dip" android:contentDescription="@string/form_label_sensitivty" />
                     </FrameLayout>
                     <TextView android:id="@id/settings_voice_sensitivity_label" android:text="@string/form_help_automatic_vad" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </RelativeLayout>
             <View android:layout_marginTop="0.0dip" style="@style/UiKit.Settings.Divider" />
             <TextView android:text="@string/form_label_output" style="@style/UiKit.Settings.Item.Header" />
-            <LinearLayout android:orientation="vertical" android:id="@id/settings_voice_output_volume_wrap" android:background="@drawable/drawable_bg_settings_item" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:text="@string/form_label_volume" style="@style/UiKit.TextView" />
-                <SeekBar android:id="@id/settings_voice_output_volume" android:layout_marginTop="@dimen/uikit_spacing_small" style="@style/UiKit.SeekBar" />
+            <LinearLayout android:orientation="vertical" android:id="@id/settings_voice_output_volume_wrap" android:background="@drawable/drawable_bg_settings_item" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:text="@string/form_label_volume" android:labelFor="@id/settings_voice_output_volume" style="@style/UiKit.TextView" />
+                <SeekBar android:id="@id/settings_voice_output_volume" android:layout_marginTop="4.0dip" style="@style/UiKit.SeekBar" />
             </LinearLayout>
             <View android:layout_marginTop="0.0dip" style="@style/UiKit.Settings.Divider" />
             <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/settings_voice_video_troubleshooting_guide" android:text="@string/form_help_voice_video_troubleshooting_guide" style="@style/UiKit.Settings.Item.SubText" />
@@ -48,12 +48,6 @@
                 <com.discord.views.CheckedSetting android:id="@id/settings_voice_enable_hardware_scaling_toggle" app:cs_subtext="@string/mobile_enable_hardware_scaling_desc" app:cs_text="@string/mobile_enable_hardware_scaling" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
             </LinearLayout>
             <View style="@style/UiKit.Settings.Divider" />
-            <LinearLayout android:id="@id/settings_voice_audio_mode_section" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:text="@string/form_label_audio_mode_android" style="@style/UiKit.Settings.Item.Header" />
-                <com.discord.views.CheckedSetting android:id="@id/settings_voice_audio_mode_communication" app:cs_subtext="@string/form_description_audio_mode_android_communication" app:cs_text="@string/form_label_audio_mode_android_communication" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
-                <com.discord.views.CheckedSetting android:id="@id/settings_voice_audio_mode_call" app:cs_subtext="@string/form_description_audio_mode_android_call" app:cs_text="@string/form_label_audio_mode_android_call" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
-                <View style="@style/UiKit.Settings.Divider" />
-            </LinearLayout>
             <TextView android:text="@string/form_label_android_opensl" style="@style/UiKit.Settings.Item.Header" />
             <com.discord.app.AppTextView android:text="@string/form_label_android_opensl_desc" app:tv_markdown_enabled="true" style="@style/UiKit.Settings.Item.SubText" />
             <com.discord.views.CheckedSetting android:id="@id/settings_voice_opensles_default" app:cs_subtext="@string/form_label_android_opensl_default_desc" app:cs_text="@string/form_label_android_opensl_default" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
diff --git a/com.discord/res/layout/widget_settings_voice_input_mode.xml b/com.discord/res/layout/widget_settings_voice_input_mode.xml
index e9aa8d597a..e2130518eb 100644
--- a/com.discord/res/layout/widget_settings_voice_input_mode.xml
+++ b/com.discord/res/layout/widget_settings_voice_input_mode.xml
@@ -2,7 +2,7 @@
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/form_label_input_mode" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.Sheet.Header.Title" />
+        <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/form_label_input_mode" android:layout_marginStart="16.0dip" style="@style/UiKit.Sheet.Header.Title" />
         <View style="@style/UiKit.Settings.Divider" />
         <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
             <LinearLayout android:id="@id/settings_voice_input_mode_vad" style="@style/UiKit.ViewGroup.LinearLayout">
diff --git a/com.discord/res/layout/widget_status.xml b/com.discord/res/layout/widget_status.xml
index d696f2527a..4da8607213 100644
--- a/com.discord/res/layout/widget_status.xml
+++ b/com.discord/res/layout/widget_status.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:id="@id/status_wrap" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout android:id="@id/status_connectivity" android:background="?theme_status_indicator_color" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large">
-        <FrameLayout android:id="@id/status_connectivity_icon" android:layout_width="18.0dip" android:layout_height="18.0dip" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large">
+    <RelativeLayout android:id="@id/status_connectivity" android:background="?theme_status_indicator_color" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip" android:paddingEnd="16.0dip">
+        <FrameLayout android:id="@id/status_connectivity_icon" android:layout_width="18.0dip" android:layout_height="18.0dip" android:layout_centerVertical="true" android:layout_marginEnd="16.0dip">
             <ProgressBar android:id="@id/status_connectivity_spinner" android:layout_width="fill_parent" android:layout_height="fill_parent" android:indeterminate="true" android:indeterminateTint="@color/white" android:indeterminateTintMode="src_in" style="@style/Base.Widget.AppCompat.ProgressBar" />
             <ImageView android:id="@id/status_connectivity_limited" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/ic_signal_cellular_connected_no_internet_4_bar_white_18dp" android:importantForAccessibility="no" />
         </FrameLayout>
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center_vertical" android:layout_gravity="center" android:id="@id/status_connectivity_text" android:layout_width="fill_parent" android:text="@string/connecting" android:lineSpacingMultiplier="1.0" android:layout_toEndOf="@id/status_connectivity_icon" style="@style/UiKit.TextView.Semibold" />
     </RelativeLayout>
-    <LinearLayout android:gravity="center_vertical" android:id="@id/status_unread_messages" android:background="@color/brand_500" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:gravity="center_vertical" android:id="@id/status_unread_messages" android:background="@color/brand_500" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/status_unread_messages_text" android:layout_width="0.0dip" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Semibold" />
-        <ImageView android:gravity="center_vertical" android:id="@id/status_unread_messages_mark" android:layout_height="wrap_content" android:src="@drawable/ic_close_white_18dp" android:scaleType="center" android:contentDescription="@string/mark_as_read" android:paddingStart="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
+        <ImageView android:gravity="center_vertical" android:id="@id/status_unread_messages_mark" android:layout_height="wrap_content" android:src="@drawable/ic_close_white_18dp" android:scaleType="center" android:contentDescription="@string/mark_as_read" android:paddingStart="16.0dip" style="@style/UiKit.ImageView" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_stream_rich_presence.xml b/com.discord/res/layout/widget_stream_rich_presence.xml
index c3c880cc78..8657d029ea 100644
--- a/com.discord/res/layout/widget_stream_rich_presence.xml
+++ b/com.discord/res/layout/widget_stream_rich_presence.xml
@@ -2,14 +2,14 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/rich_presence_header" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UserProfile.Section.Header" />
-    <androidx.cardview.widget.CardView android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundPrimary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_header" app:layout_constraintWidth_max="400.0dip" style="@style/UserProfile.Section.Card">
+    <androidx.cardview.widget.CardView android:layout_width="0.0dip" android:layout_marginTop="8.0dip" app:cardBackgroundColor="?colorBackgroundPrimary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_header" app:layout_constraintWidth_max="400.0dip" style="@style/UserProfile.Section.Card">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.ConstraintLayout">
             <com.discord.views.StreamPreviewView android:id="@id/stream_preview" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@id/rich_presence_container_data" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_large" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginBottom="@dimen/uikit_spacing_small" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/rich_presence_container_data" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/rich_presence_container_data" app:placeholderImage="?colorBackgroundSecondary" app:roundedCornerRadius="@dimen/uikit_spacing_small" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_large" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginBottom="4.0dip" android:layout_marginStart="4.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/rich_presence_container_data" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/rich_presence_container_data" app:placeholderImage="?colorBackgroundSecondary" app:roundedCornerRadius="4.0dip" />
             <FrameLayout android:id="@id/rich_presence_image_small_wrap" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_small" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" />
             </FrameLayout>
-            <LinearLayout android:id="@id/rich_presence_container_data" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@id/stream_preview" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/rich_presence_container_data" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:layout_marginStart="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@id/stream_preview" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:ellipsize="marquee" android:id="@id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile.PresenceSection.Body.HeaderText" />
                 <TextView android:id="@id/rich_presence_details" style="@style/UserProfile.PresenceSection.Body.Subtext" />
                 <TextView android:id="@id/rich_presence_state" style="@style/UserProfile.PresenceSection.Body.Subtext" />
diff --git a/com.discord/res/layout/widget_text_channel_settings.xml b/com.discord/res/layout/widget_text_channel_settings.xml
index 1c71677e8f..ec37e2eba3 100644
--- a/com.discord/res/layout/widget_text_channel_settings.xml
+++ b/com.discord/res/layout/widget_text_channel_settings.xml
@@ -7,10 +7,10 @@
     <androidx.core.widget.NestedScrollView android:id="@id/scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit.ViewGroup.LinearLayout">
             <LinearLayout android:id="@id/channel_settings_edit_wrap" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.LinearLayout">
-                <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_name" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/form_label_channel_name" style="@style/UiKit.TextInputLayout.Primary">
+                <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_name" android:layout_margin="16.0dip" android:hint="@string/form_label_channel_name" style="@style/UiKit.TextInputLayout.Primary">
                     <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_topic" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/form_label_channel_topic" style="@style/UiKit.TextInputLayout.Primary">
+                <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_topic" android:layout_margin="16.0dip" android:hint="@string/form_label_channel_topic" style="@style/UiKit.TextInputLayout.Primary">
                     <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.MultiLine" />
                 </com.google.android.material.textfield.TextInputLayout>
                 <View style="@style/UiKit.Settings.Divider" />
@@ -36,11 +36,11 @@
             <LinearLayout android:id="@id/channel_settings_section_slow_mode" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/form_label_slowmode" style="@style/UiKit.Settings.Item.Header" />
                 <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup">
-                    <TextView android:id="@id/channel_settings_slowmode_label" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/form_label_slowmode_cooldown" android:layout_alignParentStart="true" android:labelFor="@id/channel_settings_slow_mode_cooldown_slider" style="@style/UiKit.TextView" />
-                    <TextView android:layout_gravity="end" android:id="@id/channel_settings_slow_mode_cooldown_label" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_alignBaseline="@id/channel_settings_slowmode_label" android:layout_alignParentEnd="true" style="@style/UiKit.TextView.Subtext" />
+                    <TextView android:id="@id/channel_settings_slowmode_label" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/form_label_slowmode_cooldown" android:layout_alignParentStart="true" android:labelFor="@id/channel_settings_slow_mode_cooldown_slider" style="@style/UiKit.TextView" />
+                    <TextView android:layout_gravity="end" android:id="@id/channel_settings_slow_mode_cooldown_label" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_alignBaseline="@id/channel_settings_slowmode_label" android:layout_alignParentEnd="true" style="@style/UiKit.TextView.Subtext" />
                 </RelativeLayout>
                 <SeekBar android:id="@id/channel_settings_slow_mode_cooldown_slider" android:progress="0" style="@style/UiKit.SeekBar" />
-                <TextView android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/form_help_slowmode" style="@style/UiKit.TextView.Subtext" />
+                <TextView android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/form_help_slowmode" style="@style/UiKit.TextView.Subtext" />
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/com.discord/res/layout/widget_urgent_message_dialog.xml b/com.discord/res/layout/widget_urgent_message_dialog.xml
index 37818bc5a8..9fed19a2dc 100644
--- a/com.discord/res/layout/widget_urgent_message_dialog.xml
+++ b/com.discord/res/layout/widget_urgent_message_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.discord.app.AppTextView android:id="@id/view_dialog_confirmation_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1.Bold" />
+    <com.discord.app.AppTextView android:id="@id/view_dialog_confirmation_header" android:padding="16.0dip" android:layout_width="fill_parent" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <com.discord.app.AppTextView android:id="@id/view_dialog_confirmation_text" android:text="@string/sample_confirmation" style="@style/UiKit.Settings.Item.SubText" />
     <View style="@style/UiKit.Settings.Divider" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
-        <com.discord.views.LoadingButton android:id="@id/view_dialog_confirmation_confirm" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/okay" app:lb_text_color="@drawable/button_text_color_primary_100" />
+        <com.discord.views.LoadingButton android:id="@id/view_dialog_confirmation_confirm" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" app:lb_progress_color="@color/white" app:lb_text="@string/okay" app:lb_text_color="@drawable/button_text_color_primary_100" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_url_actions.xml b/com.discord/res/layout/widget_url_actions.xml
index bc88b785e4..a13ea7d44e 100644
--- a/com.discord/res/layout/widget_url_actions.xml
+++ b/com.discord/res/layout/widget_url_actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:background="?colorBackgroundSecondary" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:background="?colorBackgroundSecondary" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textColorLink="?colorTextLink" android:autoLink="web" android:id="@id/dialog_url_actions_url" style="@style/UiKit.Settings.Item" />
     <View style="@style/UiKit.Settings.Divider" />
diff --git a/com.discord/res/layout/widget_user_captcha_verify.xml b/com.discord/res/layout/widget_user_captcha_verify.xml
index 5c9496ea2a..be485a49b7 100644
--- a/com.discord/res/layout/widget_user_captcha_verify.xml
+++ b/com.discord/res/layout/widget_user_captcha_verify.xml
@@ -6,8 +6,8 @@
             <com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone" />
             <LinearLayout style="@style/UiKit.Copy">
                 <TextView android:text="@string/verify_by_recaptcha" style="@style/UiKit.TextView.H1" />
-                <TextView android:gravity="center" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/verify_by_recaptcha_description" style="@style/UiKit.TextView" />
-                <TextView android:textColor="?colorTextLink" android:id="@id/user_captcha_help" android:padding="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
+                <TextView android:gravity="center" android:layout_marginTop="16.0dip" android:text="@string/verify_by_recaptcha_description" style="@style/UiKit.TextView" />
+                <TextView android:textColor="?colorTextLink" android:id="@id/user_captcha_help" android:padding="8.0dip" android:layout_marginTop="8.0dip" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/com.discord/res/layout/widget_user_mentions_filter.xml b/com.discord/res/layout/widget_user_mentions_filter.xml
index 4be4482dcb..39ff4792ea 100644
--- a/com.discord/res/layout/widget_user_mentions_filter.xml
+++ b/com.discord/res/layout/widget_user_mentions_filter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Sheet.Header">
             <ImageView android:src="?ic_sort" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Sheet.Header.Icon" />
             <androidx.constraintlayout.widget.Guideline style="@style/UiKit.Sheet.Guideline" />
diff --git a/com.discord/res/layout/widget_user_phone_add.xml b/com.discord/res/layout/widget_user_phone_add.xml
index 3d628a8b53..b6578aa404 100644
--- a/com.discord/res/layout/widget_user_phone_add.xml
+++ b/com.discord/res/layout/widget_user_phone_add.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ScrollView android:layout_height="fill_parent" android:layout_above="@id/user_phone_add_anchor" style="@style/UiKit.ViewGroup.ScrollView">
         <LinearLayout style="@style/UiKit.Copy.Container">
-            <com.airbnb.lottie.LottieAnimationView android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.Anim.Verify.By.Phone.Frozen" />
+            <com.airbnb.lottie.LottieAnimationView android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.Anim.Verify.By.Phone.Frozen" />
             <LinearLayout style="@style/UiKit.Copy">
                 <TextView android:text="@string/enter_phone_title" style="@style/UiKit.TextView.H1" />
                 <TextView android:gravity="center" android:id="@id/user_phone_add_description" android:layout_marginTop="16.0dip" android:text="@string/enter_phone_description" style="@style/UiKit.TextView" />
@@ -16,7 +16,7 @@
             <com.google.android.material.textfield.TextInputLayout android:id="@id/user_phone_add_country_code" android:layout_width="wrap_content" android:hint="@string/country_codes" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText android:layout_width="100.0dip" android:text="+1" style="@style/UiKit.TextInputLayout.EditText.SingleLine.CountryCode" />
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/user_phone_add_number" android:layout_width="0.0dip" android:hint="@string/enter_phone_title" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextInputLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/user_phone_add_number" android:layout_width="0.0dip" android:hint="@string/enter_phone_title" android:layout_weight="1.0" android:layout_marginStart="8.0dip" style="@style/UiKit.TextInputLayout">
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Phone" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
diff --git a/com.discord/res/layout/widget_user_phone_verify.xml b/com.discord/res/layout/widget_user_phone_verify.xml
index 1e90165fa1..ac2ef9e277 100644
--- a/com.discord/res/layout/widget_user_phone_verify.xml
+++ b/com.discord/res/layout/widget_user_phone_verify.xml
@@ -14,6 +14,6 @@
     <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat.Transparent">
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
     </com.google.android.material.appbar.AppBarLayout>
-    <ImageView android:id="@id/close" android:padding="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackgroundBorderless" android:src="?ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/close" android:padding="16.0dip" android:foreground="?selectableItemBackgroundBorderless" android:src="?ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" style="@style/UiKit.ImageView" />
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_profile_adapter_item_empty.xml b/com.discord/res/layout/widget_user_profile_adapter_item_empty.xml
index 5158b114df..3961d23a11 100644
--- a/com.discord/res/layout/widget_user_profile_adapter_item_empty.xml
+++ b/com.discord/res/layout/widget_user_profile_adapter_item_empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:gravity="center" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:id="@id/user_profile_adapter_item_empty" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
-    <TextView android:id="@id/user_profile_adapter_item_empty_text" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.H2" />
+    <ImageView android:id="@id/user_profile_adapter_item_empty" android:layout_marginTop="32.0dip" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
+    <TextView android:id="@id/user_profile_adapter_item_empty_text" android:layout_margin="16.0dip" style="@style/UiKit.TextView.H2" />
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml b/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml
index de14e8b45c..db6a686ebe 100644
--- a/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml
+++ b/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:background="?selectableItemBackground" android:padding="16.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_profile_adapter_item_friend_avatar" style="@style/Avatar.Large" />
     <com.discord.views.StatusView android:id="@id/user_profile_adapter_item_friend_status" android:layout_width="16.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_status_idle_16dp" android:layout_alignBottom="@id/user_profile_adapter_item_friend_avatar" android:translationX="2.0dip" android:translationY="2.0dip" android:layout_alignEnd="@id/user_profile_adapter_item_friend_avatar" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="2.0dip" />
-    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_small" android:layout_toStartOf="@id/user_profile_adapter_item_friend_mutual" android:layout_toEndOf="@id/user_profile_adapter_item_friend_avatar" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="16.0dip" android:layout_marginEnd="4.0dip" android:layout_toStartOf="@id/user_profile_adapter_item_friend_mutual" android:layout_toEndOf="@id/user_profile_adapter_item_friend_avatar" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:id="@id/user_profile_adapter_item_friend_user_name" android:singleLine="true" style="@style/UiKit.TextView.Large" />
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@id/user_profile_adapter_item_friend_user_game" android:paddingTop="@dimen/uikit_spacing_small" android:singleLine="true" style="@style/UiKit.TextView" />
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@id/user_profile_adapter_item_friend_user_game" android:paddingTop="4.0dip" android:singleLine="true" style="@style/UiKit.TextView" />
     </LinearLayout>
     <LinearLayout android:id="@id/user_profile_adapter_item_friend_mutual" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <include layout="@layout/widget_user_profile_adapter_item_friend_mutual_server" />
diff --git a/com.discord/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml b/com.discord/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml
index da638f2177..73936b77f6 100644
--- a/com.discord/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml
+++ b/com.discord/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:background="?selectableItemBackground" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:layout_marginStart="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:background="?selectableItemBackground" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:layout_marginStart="4.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_profile_adapter_item_friend_mutual_image" android:layout_marginStart="@dimen/uikit_spacing_small" style="@style/Avatar.Medium" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_profile_adapter_item_friend_mutual_image" android:layout_marginStart="4.0dip" style="@style/Avatar.Medium" />
     <TextView android:textSize="9.0sp" android:textColor="@color/primary_100" android:gravity="center" android:id="@id/user_profile_adapter_item_friend_mutual_text" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" style="@style/UiKit.TextView" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_profile_adapter_item_server.xml b/com.discord/res/layout/widget_user_profile_adapter_item_server.xml
index 8cfa76fcf9..15a5c98284 100644
--- a/com.discord/res/layout/widget_user_profile_adapter_item_server.xml
+++ b/com.discord/res/layout/widget_user_profile_adapter_item_server.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:background="?selectableItemBackground" android:padding="16.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <RelativeLayout android:id="@id/user_profile_adapter_item_server_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" style="@style/UiKit.ViewGroup.RelativeLayout">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_profile_adapter_item_server_image" style="@style/Avatar.Large" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="none" android:gravity="center" android:id="@id/user_profile_adapter_item_server_text" android:background="@drawable/drawable_circle_purple_brand" android:padding="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" style="@style/UiKit.TextView.H2" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="none" android:gravity="center" android:id="@id/user_profile_adapter_item_server_text" android:background="@drawable/drawable_circle_purple_brand" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" style="@style/UiKit.TextView.H2" />
     </RelativeLayout>
-    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_toEndOf="@id/user_profile_adapter_item_server_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="16.0dip" android:layout_toEndOf="@id/user_profile_adapter_item_server_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:id="@id/user_profile_adapter_item_server_name" android:singleLine="true" style="@style/UiKit.TextView.Large" />
-        <TextView android:id="@id/user_profile_adapter_item_server_nick" android:paddingTop="@dimen/uikit_spacing_small" android:singleLine="true" style="@style/UiKit.TextView" />
+        <TextView android:id="@id/user_profile_adapter_item_server_nick" android:paddingTop="4.0dip" android:singleLine="true" style="@style/UiKit.TextView" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_rich_presence.xml b/com.discord/res/layout/widget_user_rich_presence.xml
index 1d2886e3f9..378247d213 100644
--- a/com.discord/res/layout/widget_user_rich_presence.xml
+++ b/com.discord/res/layout/widget_user_rich_presence.xml
@@ -4,20 +4,20 @@
     <TextView android:id="@id/rich_presence_header" style="@style/UserProfile.Section.Header" />
     <androidx.cardview.widget.CardView app:cardBackgroundColor="?colorBackgroundPrimary" style="@style/UserProfile.Section.Card">
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UserProfile.PresenceSection.Body">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_large" android:layout_width="64.0dip" android:layout_height="64.0dip" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" app:roundedCornerRadius="@dimen/uikit_spacing_small" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_large" android:layout_width="64.0dip" android:layout_height="64.0dip" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="?ic_game_icon_placeholder" app:placeholderImageScaleType="fitCenter" app:roundedCornerRadius="4.0dip" />
             <androidx.legacy.widget.Space android:id="@id/image_bottom_guideline" android:layout_width="@dimen/uikit_image_border_size" android:layout_height="@dimen/uikit_image_border_size" android:layout_marginTop="@dimen/uikit_image_border_size" android:layout_marginStart="@dimen/uikit_image_border_size" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@id/rich_presence_image_large" />
             <FrameLayout android:id="@id/rich_presence_image_small_wrap" android:background="?colorPrimaryCircle" android:padding="@dimen/uikit_image_border_size" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/image_bottom_guideline" app:layout_constraintEnd_toEndOf="@id/image_bottom_guideline" app:layout_constraintRight_toRightOf="@id/image_bottom_guideline">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/rich_presence_image_small" android:visibility="gone" app:roundAsCircle="true" style="@style/Avatar.Medium" />
             </FrameLayout>
-            <LinearLayout android:id="@id/rich_presence_container_data" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@id/rich_presence_image_large" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/rich_presence_container_data" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/rich_presence_image_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@id/rich_presence_image_large" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:ellipsize="marquee" android:id="@id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile.PresenceSection.Body.HeaderText" />
                 <TextView android:id="@id/rich_presence_details" style="@style/UserProfile.PresenceSection.Body.Subtext" />
                 <TextView android:id="@id/rich_presence_state" style="@style/UserProfile.PresenceSection.Body.Subtext" />
                 <TextView android:id="@id/rich_presence_time" style="@style/UserProfile.PresenceSection.Body.Subtext" />
             </LinearLayout>
             <androidx.constraintlayout.widget.Barrier android:id="@id/barrier" android:layout_width="fill_parent" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="rich_presence_container_data,rich_presence_image_large" />
-            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_primary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UserProfile.PresenceSection.MaterialButton" />
-            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_secondary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_primary_button" style="@style/UserProfile.PresenceSection.MaterialButton" />
+            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_primary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="@style/UserProfile.PresenceSection.MaterialButton" />
+            <com.google.android.material.button.MaterialButton android:id="@id/rich_presence_secondary_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rich_presence_primary_button" style="@style/UserProfile.PresenceSection.MaterialButton" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_set_custom_status.xml b/com.discord/res/layout/widget_user_set_custom_status.xml
index c66021c495..112128cca2 100644
--- a/com.discord/res/layout/widget_user_set_custom_status.xml
+++ b/com.discord/res/layout/widget_user_set_custom_status.xml
@@ -5,20 +5,20 @@
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
-            <androidx.cardview.widget.CardView android:layout_margin="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundTertiary" style="@style/UiKit.ViewGroup">
+        <LinearLayout android:paddingBottom="64.0dip" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
+            <androidx.cardview.widget.CardView android:layout_margin="16.0dip" app:cardBackgroundColor="?colorBackgroundTertiary" style="@style/UiKit.ViewGroup">
                 <RelativeLayout android:gravity="center_vertical" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <FrameLayout android:id="@id/set_custom_status_emoji_button" android:layout_alignTop="@id/set_custom_status_text" android:layout_alignBottom="@id/set_custom_status_text" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView">
-                        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/set_custom_status_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" app:actualImageScaleType="fitCenter" />
+                    <FrameLayout android:id="@id/set_custom_status_emoji_button" android:layout_alignTop="@id/set_custom_status_text" android:layout_alignBottom="@id/set_custom_status_text" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ImageView">
+                        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/set_custom_status_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" android:contentDescription="@string/select_emoji" app:actualImageScaleType="fitCenter" />
                     </FrameLayout>
-                    <com.google.android.material.textfield.TextInputLayout android:id="@id/set_custom_status_text" android:hint="@string/custom_status_set_custom_status" android:layout_toEndOf="@id/set_custom_status_emoji_button" app:endIconDrawable="@drawable/ic_clear_24dp" app:endIconMode="custom" app:endIconTint="?colorInteractiveNormal" style="@style/UiKit.TextInputLayout">
+                    <com.google.android.material.textfield.TextInputLayout android:id="@id/set_custom_status_text" android:hint="@string/custom_status_set_custom_status" android:layout_toEndOf="@id/set_custom_status_emoji_button" app:endIconContentDescription="@string/custom_status_clear_custom_status" app:endIconDrawable="@drawable/ic_clear_24dp" app:endIconMode="custom" app:endIconTint="?colorInteractiveNormal" style="@style/UiKit.TextInputLayout">
                         <com.google.android.material.textfield.TextInputEditText android:maxLength="128" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine">
                             <requestFocus />
                         </com.google.android.material.textfield.TextInputEditText>
                     </com.google.android.material.textfield.TextInputLayout>
                 </RelativeLayout>
             </androidx.cardview.widget.CardView>
-            <RadioGroup android:id="@id/set_custom_status_expiration" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
+            <RadioGroup android:id="@id/set_custom_status_expiration" android:layout_margin="8.0dip" style="@style/UiKit.ViewGroup">
                 <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_never" android:text="@string/custom_status_dont_clear" style="@style/UiKit.ListItem.Icon.Radio" />
                 <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_30_minutes" android:text="@string/custom_status_clear_in_minutes" style="@style/UiKit.ListItem.Icon.Radio" />
                 <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/set_custom_status_expiration_1_hour" android:text="@string/custom_status_clear_in_hours" style="@style/UiKit.ListItem.Icon.Radio" />
@@ -28,5 +28,5 @@
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <ImageView android:layout_gravity="bottom|center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_wumpus_custom_status" android:importantForAccessibility="no" style="@style/UiKit.ImageView.HideInLandscape" />
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/set_custom_status_save" android:visibility="visible" style="@style/Settings.FloatingActionButton.Save" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/set_custom_status_save" android:visibility="visible" android:contentDescription="@string/save_changes" style="@style/Settings.FloatingActionButton.Save" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_sheet.xml b/com.discord/res/layout/widget_user_sheet.xml
index 7bd3f25171..d9fa4e9414 100644
--- a/com.discord/res/layout/widget_user_sheet.xml
+++ b/com.discord/res/layout/widget_user_sheet.xml
@@ -2,10 +2,10 @@
 <androidx.core.widget.NestedScrollView android:background="?colorBackgroundSecondary" android:focusable="true" android:focusableInTouchMode="true" android:contentDescription="@string/profile" style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-        <LinearLayout android:id="@id/user_sheet_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:id="@id/user_sheet_content" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
             <FrameLayout android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:elevation="@dimen/uikit_elevation_low">
                 <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_sheet_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" app:user_profile_header_background_color="?colorBackgroundTertiary" />
-                <ImageView android:layout_gravity="end|center|top" android:id="@id/user_sheet_more_button" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_medium" android:src="?ic_more" android:contentDescription="@string/more" style="@style/UiKit.ImageView.Clickable" />
+                <ImageView android:layout_gravity="end|center|top" android:id="@id/user_sheet_more_button" android:background="?bg_pressed_highlight" android:padding="8.0dip" android:src="?ic_more" android:contentDescription="@string/more" style="@style/UiKit.ImageView.Clickable" />
             </FrameLayout>
             <View android:id="@id/user_sheet_profile_actions_divider" android:visibility="gone" style="@style/UiKit.Divider" />
             <LinearLayout android:id="@id/user_sheet_profile_actions_container" android:background="?colorBackgroundTertiary" android:elevation="@dimen/uikit_elevation_low" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
@@ -16,8 +16,8 @@
                 <Button android:textColor="@color/status_yellow_500" android:id="@id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:layout_width="0.0dip" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1.0" style="@style/UiKit.ImageButton" />
             </LinearLayout>
             <TextView android:id="@id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/UserProfile.Section.Header" />
-            <LinearLayout android:id="@id/user_sheet_friend_request_incoming_container" android:visibility="gone" android:layout_width="fill_parent" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_ignore_button" android:text="@string/friend_request_ignore" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Material.Button.Secondary.Fit" />
+            <LinearLayout android:id="@id/user_sheet_friend_request_incoming_container" android:visibility="gone" android:layout_width="fill_parent" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_ignore_button" android:text="@string/friend_request_ignore" android:layout_weight="1.0" android:layout_marginEnd="8.0dip" style="@style/UiKit.Material.Button.Secondary.Fit" />
                 <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1.0" style="@style/UiKit.Material.Button.Green.Fit" />
             </LinearLayout>
             <TextView android:id="@id/user_sheet_profile_voice_settings_header" android:text="@string/voice_settings" style="@style/UserProfile.Section.Header" />
@@ -28,7 +28,7 @@
             <LinearLayout android:id="@id/user_sheet_guild_container" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:id="@id/user_sheet_guild_header" style="@style/UserProfile.Section.Header" />
                 <com.discord.widgets.roles.RolesListView android:id="@id/user_sheet_roles_list" android:contentDescription="@string/roles" style="@style/UserProfile.Section" />
-                <androidx.cardview.widget.CardView android:id="@id/user_sheet_admin_card" android:layout_marginTop="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_600" style="@style/UserProfile.Section.Card">
+                <androidx.cardview.widget.CardView android:id="@id/user_sheet_admin_card" android:layout_marginTop="16.0dip" app:cardBackgroundColor="?primary_600" style="@style/UserProfile.Section.Card">
                     <com.discord.widgets.user.profile.UserProfileAdminView android:id="@id/user_sheet_admin_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
                 </androidx.cardview.widget.CardView>
             </LinearLayout>
@@ -38,7 +38,7 @@
             </androidx.cardview.widget.CardView>
             <TextView android:id="@id/user_sheet_note_header" android:text="@string/note" style="@style/UserProfile.Section.Header" />
             <androidx.cardview.widget.CardView app:cardBackgroundColor="?colorBackgroundPrimary" style="@style/UserProfile.Section.Card">
-                <com.google.android.material.textfield.TextInputLayout android:id="@id/user_sheet_note_text_field_wrap" android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/note_placeholder_mobile" app:boxStrokeWidth="0.0dip" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit.TextInputLayout.Primary">
+                <com.google.android.material.textfield.TextInputLayout android:id="@id/user_sheet_note_text_field_wrap" android:layout_marginBottom="16.0dip" android:hint="@string/note_placeholder_mobile" app:boxStrokeWidth="0.0dip" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit.TextInputLayout.Primary">
                     <com.google.android.material.textfield.TextInputEditText android:maxLength="256" android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText" />
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.cardview.widget.CardView>
@@ -46,7 +46,7 @@
             <TextView android:id="@id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" android:drawableStart="?ic_copy" style="@style/UiKit.ListItem.Icon" />
         </LinearLayout>
         <FrameLayout android:id="@id/user_sheet_loading_container" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="fill_parent">
-            <androidx.core.widget.ContentLoadingProgressBar android:layout_gravity="center|top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_xxlarge" android:contentDescription="@string/loading" style="?android:progressBarStyleLarge" />
+            <androidx.core.widget.ContentLoadingProgressBar android:layout_gravity="center|top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="32.0dip" android:contentDescription="@string/loading" style="?android:progressBarStyleLarge" />
         </FrameLayout>
     </FrameLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_status_update.xml b/com.discord/res/layout/widget_user_status_update.xml
index 8ef6e0b34c..42aa7130e3 100644
--- a/com.discord/res/layout/widget_user_status_update.xml
+++ b/com.discord/res/layout/widget_user_status_update.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:fitsSystemWindows="true" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/set_status" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.Sheet.Header.Title" />
+    <TextView android:id="@id/guild_actions_overview_header_tv" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/set_status" android:layout_marginStart="16.0dip" style="@style/UiKit.Sheet.Header.Title" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
         <include android:id="@id/user_status_update_online" layout="@layout/view_user_status_presence" />
diff --git a/com.discord/res/layout/widget_voice_bottom_sheet.xml b/com.discord/res/layout/widget_voice_bottom_sheet.xml
index 58ebd5e5c4..177187c673 100644
--- a/com.discord/res/layout/widget_voice_bottom_sheet.xml
+++ b/com.discord/res/layout/widget_voice_bottom_sheet.xml
@@ -7,7 +7,7 @@
         <include android:id="@id/voice_bottom_sheet_empty_container" android:visibility="invisible" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@id/voice_bottom_sheet_bottom_content_container" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/voice_bottom_sheet_header" layout="@layout/layout_voice_bottom_sheet_empty" />
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/voice_bottom_sheet_bottom_content_container" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/voice_bottom_sheet_header" app:layout_constraintVertical_bias="1.0">
             <com.discord.widgets.voice.controls.AnchoredVoiceControlsView android:id="@id/voice_bottom_sheet_controls" android:background="?colorBackgroundSecondary" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
-            <RelativeLayout android:orientation="horizontal" android:id="@id/voice_bottom_sheet_connect_container" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/voice_bottom_sheet_controls" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/voice_bottom_sheet_controls">
+            <RelativeLayout android:orientation="horizontal" android:id="@id/voice_bottom_sheet_connect_container" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/voice_bottom_sheet_controls" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/voice_bottom_sheet_controls">
                 <com.google.android.material.button.MaterialButton android:id="@id/voice_bottom_sheet_connect" android:layout_width="fill_parent" android:layout_height="48.0dip" android:text="@string/join_voice_channel_cta" android:layout_toStartOf="@id/voice_bottom_sheet_join_video" style="@style/UiKit.Material.Button" />
                 <com.google.android.material.button.MaterialButton android:id="@id/voice_bottom_sheet_join_video" android:layout_width="48.0dip" android:layout_height="48.0dip" android:contentDescription="@string/join_video_channel" android:layout_marginStart="12.0dip" android:layout_alignParentEnd="true" app:icon="@drawable/ic_videocam_white_24dp" app:iconGravity="textStart" app:iconPadding="0.0dip" style="@style/UiKit.Material.Button" />
             </RelativeLayout>
diff --git a/com.discord/res/layout/widget_voice_call_incoming.xml b/com.discord/res/layout/widget_voice_call_incoming.xml
index 3aeff80e08..2b189816f4 100644
--- a/com.discord/res/layout/widget_voice_call_incoming.xml
+++ b/com.discord/res/layout/widget_voice_call_incoming.xml
@@ -3,17 +3,17 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@id/incoming_call_top_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_percent="0.15" />
     <LinearLayout android:gravity="center_horizontal" android:id="@id/incoming_call_status_container" android:paddingTop="16.0dip" android:layout_width="wrap_content" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/incoming_call_users_recycler" app:layout_constraintVertical_bias="0.2" style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:gravity="center_horizontal" android:id="@id/incoming_call_status_primary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:gravity="center_horizontal" android:id="@id/incoming_call_status_primary" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_400" android:id="@id/incoming_call_status_secondary" style="@style/UiKit.TextView" />
     </LinearLayout>
     <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/incoming_call_users_recycler" android:layout_width="wrap_content" android:layout_height="wrap_content" android:overScrollMode="never" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/incoming_call_top_guideline" />
     <LinearLayout android:gravity="center_horizontal" android:id="@id/incoming_call_accept_container" android:layout_width="wrap_content" app:layout_constraintBottom_toTopOf="@id/incoming_call_connect_voice_only" app:layout_constraintLeft_toRightOf="@id/incoming_call_decline_container" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/incoming_call_status_container" app:layout_constraintVertical_bias="0.6" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/incoming_call_accept_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_call_24dp" android:contentDescription="@string/connect_to_voice" app:backgroundTint="@color/status_green_500" style="@style/Settings.FloatingActionButton" />
-        <TextView android:id="@id/incoming_call_accept_text" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/join_call" style="@style/UiKit.Calls.ButtonText" />
+        <TextView android:id="@id/incoming_call_accept_text" android:layout_marginTop="16.0dip" android:text="@string/join_call" style="@style/UiKit.Calls.ButtonText" />
     </LinearLayout>
     <LinearLayout android:gravity="center_horizontal" android:id="@id/incoming_call_decline_container" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="@id/incoming_call_accept_container" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/incoming_call_accept_container" app:layout_constraintTop_toTopOf="@id/incoming_call_accept_container" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/incoming_call_decline_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/decline" app:backgroundTint="@color/status_red_500" style="@style/Settings.FloatingActionButton" />
-        <TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/decline" android:contentDescription="@string/decline" style="@style/UiKit.Calls.ButtonText" />
+        <TextView android:layout_marginTop="16.0dip" android:text="@string/decline" android:contentDescription="@string/decline" style="@style/UiKit.Calls.ButtonText" />
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/incoming_call_connect_voice_only" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/connect_voice_only" android:contentDescription="@string/connect_voice_only" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Calls.ButtonText" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/incoming_call_connect_voice_only" android:layout_marginBottom="16.0dip" android:text="@string/connect_voice_only" android:contentDescription="@string/connect_voice_only" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Calls.ButtonText" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_voice_call_inline.xml b/com.discord/res/layout/widget_voice_call_inline.xml
index 0445a4edd5..4c975ef5ec 100644
--- a/com.discord/res/layout/widget_voice_call_inline.xml
+++ b/com.discord/res/layout/widget_voice_call_inline.xml
@@ -2,6 +2,6 @@
 <LinearLayout android:id="@id/voice_call_inline_container" android:background="?primary_630" android:visibility="gone" android:fitsSystemWindows="true" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:id="@id/voice_connected_container" style="@style/UiKit.ViewGroup.LinearLayout">
-        <com.google.android.material.button.MaterialButton android:id="@id/voice_connected_ptt" android:visibility="gone" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="10.0dip" android:layout_marginBottom="@dimen/uikit_spacing_small" android:text="@string/input_mode_ptt" style="@style/UiKit.Material.Button" />
+        <com.google.android.material.button.MaterialButton android:id="@id/voice_connected_ptt" android:visibility="gone" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="10.0dip" android:layout_marginBottom="4.0dip" android:text="@string/input_mode_ptt" style="@style/UiKit.Material.Button" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_voice_channel_settings.xml b/com.discord/res/layout/widget_voice_channel_settings.xml
index 4f6c9d6fbf..130455bab9 100644
--- a/com.discord/res/layout/widget_voice_channel_settings.xml
+++ b/com.discord/res/layout/widget_voice_channel_settings.xml
@@ -6,7 +6,7 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_name" android:layout_margin="@dimen/uikit_spacing_large" android:hint="@string/form_label_channel_name" style="@style/UiKit.TextInputLayout.Primary">
+            <com.google.android.material.textfield.TextInputLayout android:id="@id/channel_settings_edit_name" android:layout_margin="16.0dip" android:hint="@string/form_label_channel_name" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
             </com.google.android.material.textfield.TextInputLayout>
             <View style="@style/UiKit.Settings.Divider" />
@@ -15,14 +15,14 @@
                 <TextView android:id="@id/current_bitrate_display" style="@style/UiKit.TextView" />
                 <SeekBar android:id="@id/bitrate_seekbar" android:max="88" style="@style/UiKit.SeekBar" />
             </LinearLayout>
-            <TextView android:id="@id/settings_bitrate_help" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:id="@id/settings_bitrate_help" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView.Subtext" />
             <View style="@style/UiKit.Settings.Divider" />
             <TextView android:text="@string/form_label_user_limit" style="@style/UiKit.Settings.Item.Header" />
             <LinearLayout style="@style/UiKit.Settings.Item">
                 <TextView android:id="@id/current_user_limit_display" android:text="@string/no_user_limit" style="@style/UiKit.TextView" />
                 <SeekBar android:id="@id/user_limit_seekbar" android:max="99" style="@style/UiKit.SeekBar" />
             </LinearLayout>
-            <TextView android:id="@id/settings_user_limit_help" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:id="@id/settings_user_limit_help" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView.Subtext" />
             <View style="@style/UiKit.Settings.Divider" />
             <LinearLayout android:id="@id/channel_settings_section_user_management" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/user_management" style="@style/UiKit.Settings.Item.Header" />
diff --git a/com.discord/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml b/com.discord/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml
index 8099423f09..df75b1834a 100644
--- a/com.discord/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml
+++ b/com.discord/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:background="?colorBackgroundPrimary" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <ImageView android:layout_width="280.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_krisp_onboarding" android:contentDescription="@string/mobile_noise_cancellation_popout_title" style="@style/UiKit.ImageView" />
-        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/mobile_noise_cancellation_popout_description" app:stv_title="@string/mobile_noise_cancellation_popout_title" />
-        <TextView android:textColor="@color/link" android:gravity="center_vertical" android:id="@id/noise_cancellation_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/learn_more_link" android:drawablePadding="16.0dip" android:drawableStart="?ic_krisp_logo" />
+    <LinearLayout android:gravity="center_horizontal" android:padding="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <ImageView android:layout_width="280.0dip" android:layout_marginBottom="24.0dip" android:src="@drawable/img_krisp_onboarding" android:contentDescription="@string/mobile_noise_cancellation_popout_title" style="@style/UiKit.ImageView" />
+        <com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="24.0dip" app:stv_subtitle="@string/mobile_noise_cancellation_popout_description" app:stv_title="@string/mobile_noise_cancellation_popout_title" />
+        <TextView android:textColor="@color/link" android:gravity="center_vertical" android:id="@id/noise_cancellation_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/learn_more_link" android:drawablePadding="16.0dip" android:drawableStart="?ic_krisp_logo" />
         <com.google.android.material.button.MaterialButton android:id="@id/noise_cancellation_enable_button" android:layout_height="fill_parent" android:text="@string/enable_noise_cancellation" style="@style/UiKit.AuthButton.Material" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_voice_settings_bottom_sheet.xml b/com.discord/res/layout/widget_voice_settings_bottom_sheet.xml
index 2ec0ff5b46..ff8a7e1f78 100644
--- a/com.discord/res/layout/widget_voice_settings_bottom_sheet.xml
+++ b/com.discord/res/layout/widget_voice_settings_bottom_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:id="@id/voice_settings_sheet_container" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/voice_settings_toggle_video_participants" android:text="@string/stream_show_non_video" style="@style/UiKit.ListItem.Switch" />
         <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/voice_settings_noise_suppression" android:text="@string/mobile_noise_cancellation_popout_title" style="@style/UiKit.ListItem.Switch" />
         <TextView android:id="@id/voice_settings_invite" android:text="@string/instant_invite" android:drawablePadding="16.0dip" android:drawableStart="@drawable/ic_header_members_add_white_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem" />
diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml
index b3fa0f673d..8654306e15 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -2279,9 +2279,9 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_owner">Собственик на сървъра</string>
     <string name="guild_partner_application_category_description">Коя от следните категории описва най-добре твоя сървър?</string>
     <string name="guild_partner_application_category_label">Категории</string>
-    <string name="guild_partner_application_connect">Свържи акаунти, в които създаваш</string>
     <string name="guild_partner_application_content_platform">Къде главно създаваш съдържание?</string>
     <string name="guild_partner_application_country">Държава</string>
+    <string name="guild_partner_application_creator_connect">Свържи акаунти, в които създаваш</string>
     <string name="guild_partner_application_description_description">Разкажи ни за своя сървър. За какво е? За кого е?</string>
     <string name="guild_partner_application_description_title">Описание на сървъра</string>
     <string name="guild_partner_application_first_name">Собствено име</string>
@@ -2296,11 +2296,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_partner_application_server_step_title">За какво е твоята общност?</string>
     <string name="guild_partner_application_subcategory_description">Можеш също да избереш до 5 подкатегории.</string>
     <string name="guild_partner_application_submit_step">Подай кандидатура</string>
-    <string name="guild_partner_application_submit_step_description">Обикновено отговаряме в рамките на Х дни.</string>
-    <string name="guild_partner_application_submit_step_description_2">Всяка кандидатура за партньор се разглежда от Discord. Имай предвид, че кандидатстването не гарантира партньорство.</string>
-    <string name="guild_partner_application_submit_step_title">Просто изпрати и си готов!</string>
     <string name="guild_partner_application_title">Кандидатствай за Партньорската програма Discord</string>
-    <string name="guild_partner_application_type">Тип сървър</string>
     <string name="guild_partner_application_type_brand">Бизнес / Марка</string>
     <string name="guild_partner_application_type_content">Създател на съдържание / Личност</string>
     <string name="guild_partner_application_type_fan">Група по интереси и фен общност</string>
@@ -2535,8 +2531,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_settings_discovery_byline">Ако отговаряш на условията и активираш Откриване, твоят сървър ще се появи в [Откриване на сървър.](onClick) Приготви се да направиш добро впечатление!</string>
     <string name="guild_settings_discovery_checklist_2fa">Активирано 2FA изискване за модериране</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Членовете с права за модериране (напр. админи или модератори) трябва да имат активирано 2FA, за да извършват модераторски дейности.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Това задължава всички членове с права за модериране да имат активирано 2FA, преди да могат да извършват модераторски дейности. Това може да помогне за защита срещу нарушени администраторски или модераторски акаунти. [Активирай в Настройки за модериране](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Липсващо 2FA изискване за модериране</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Като включиш Откриване, приемаш да спазваш нашите [Насоки за откриваем сървър.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Отговаря на изискването за възраст</string>
     <string name="guild_settings_discovery_checklist_age_description">Сървърите в Откриване трябва да са на възраст от поне %1$s.</string>
@@ -2550,7 +2544,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Увеличи броя на комуникаторите всяка седмица</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Комуникатор е някой, който е говорил (с глас или текст) в сървъра. Организирането на събития в общността и засягането на дискусионни теми са чудесни начини да насърчиш повече хора да си говорят.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">сред. комуникатори на седмица в твоя сървър</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Сървърът ти се нуждае от повече членове, отколкото посещават и говорят всяка седмица.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Чудесна работа! Твоят сървър отговаря на всички изисквания да бъде част от Откриване на сървър.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">За да сме сигурни, че препоръчваме на потребителите на Discord само активни сървъри, сървърите в Откриване трябва да имат минимално ниво на активност.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Щракнете тук за още подробности</string>
@@ -2566,7 +2559,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_settings_discovery_checklist_nsfw_description">Името на сървъра ти, описанието и имената на каналите изглеждат чисти!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Открити лоши думи</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">изискуем минимум</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Трябва да подобриш изживяването за нови членове.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Подобри изживяването за новите членове</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Сървърите, които печелят повече от 10 нови членове на седмица, трябва да имат поне 10%% ниво на задържане на нови членове. Поне 1 от 10 нови души, които са се присъединили, трябва да остане за повече от седмица.
 
@@ -2576,7 +2568,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="guild_settings_discovery_checklist_safe_description">Благодарим, че спазваш нашия Правилник на общността и поддържаш сървъра си безопасен!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Твоят сървър е бил в $[нарушение на нашите Условия за ползване](doesNotHook) в рамките на последните 30 дни.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Твоят сървър е бил в нарушение на нашите [Условия за ползване](%1$s) или [Насоки за сървъри на общности](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Маркиран от Доверие и безопасност</string>
     <string name="guild_settings_discovery_checklist_score_explain">Изчислено като текуща средна стойност за последните 8 седмици, така че може да отнеме няколко седмици до показване на промените. Само потребители, които са били в Discord повече от 8 седмици, се броят за посетители или комуникатори.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ членове</string>
     <string name="guild_settings_discovery_checklist_size_description">Засега Откриване е достъпно само за сървъри с повече от %1$s членове.</string>
@@ -3857,7 +3848,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="no_thanks">Не, благодаря</string>
     <string name="no_user_limit">Без ограничение</string>
     <string name="no_video_devices">Няма видео устройства</string>
-    <string name="no_video_permission_dialog_body">За да включиш видео в този гласов канал, помоли администратора на твоя сървър да промени разрешенията ти за видео.</string>
     <string name="no_video_permission_dialog_title">Няма разрешение за видео</string>
     <string name="noise_cancellation_off">Подтискане на шума изкл.</string>
     <string name="noise_cancellation_on">Подтискане на шума вкл.</string>
@@ -4074,6 +4064,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="one_user_typing">**%1$s** пише…</string>
     <string name="ongoing_call">Текущ разговор</string>
     <string name="ongoing_call_connected_users">Текущ разговор — %1$s е свързан</string>
+    <string name="ongoing_call_tap_to_join">— Докосни, за да се присъединиш</string>
     <string name="ongoing_call_voice_quality_low">О, не, голяма червена лента. Връзката ти се разпада.</string>
     <string name="ongoing_call_you_are_all_alone">"Сам си в този разговор. 
  Другите в този разговор може да се включат по всяко време."</string>
@@ -4155,7 +4146,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="paginator_of_pages">Стр. %1$s от %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s В Twitter профила на Discord би трябвало да им повече информация.</string>
-    <string name="partner_badge_tooltip">Партньор на Discord</string>
     <string name="password_length_error">Паролите трябва да са между 6 и 128 знака</string>
     <string name="password_manager">Управление на пароли</string>
     <string name="password_manager_info_android">Ако използваш управление на пароли, трябва да го разрешиш от Настройки за достъп -> Изтеглени услуги. Не се тревожи, можем да те заведем там.</string>
@@ -4655,7 +4645,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="public_updates_channel_title">Канал само за модератори</string>
     <string name="publish_followed_news_body">Това съобщение ще бъде изпратено до всички сървъри, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.</string>
     <string name="publish_followed_news_body_reach">Това съобщение ще бъде изпратено до **%1$s сървъри**, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.</string>
-    <string name="publish_followed_news_body_settings">Виж повече статистики в настройките на сървъра.</string>
     <string name="publish_followed_news_fail_body">Достигнал си лимита от 10 публикувани съобщения на час. Но ентусиазмът ти ни харесва, за това опитай пак след %1$s.</string>
     <string name="publish_followed_news_fail_title">О не, изскачащ прозорец.</string>
     <string name="publish_followed_news_generic_body">Извинявай, нещо се обърка.</string>
@@ -5005,7 +4994,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
 могат да бъдат чути от всеки, който в този момент е в конкретния канал."</string>
     <string name="server_deafen">Заглуши сървъра</string>
     <string name="server_deafened">Сървърът е заглушен</string>
-    <string name="server_deafened_dialog_body">За да слушаш в този канал, помоли администратора на твоя сървър да включи звука ти.</string>
     <string name="server_deafened_dialog_title">Сървърът е заглушен</string>
     <string name="server_desciption_empty">Разкажи на света за този сървър.</string>
     <string name="server_emoji">Сървърни емотикони</string>
@@ -5015,7 +5003,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="server_insights">Показатели на сървър</string>
     <string name="server_mute">Изкл. микрофона в сървъра</string>
     <string name="server_muted">Заглушен сървър</string>
-    <string name="server_muted_dialog_body">За да говориш в този канал, помоли администратора на твоя сървър да включи микрофона ти.</string>
     <string name="server_muted_dialog_title">Заглушен сървър</string>
     <string name="server_name_required">Сървърът трябва да има име.</string>
     <string name="server_options">Опции на сървъра</string>
@@ -5827,7 +5814,6 @@ Push to Talk от Засичане на гласова активност."</str
     <string name="verification_verified">Имейлът е потвърден!</string>
     <string name="verification_verifying">Потвърждаване на твоя имейл</string>
     <string name="verified_bot_tooltip">Потвърден бот</string>
-    <string name="verified_developer_badge_tooltip">Разработчик на потвърден бот</string>
     <string name="verify">Потвърди</string>
     <string name="verify_account">Потвърждаване на акаунт</string>
     <string name="verify_by">Потвърди чрез</string>
@@ -5987,7 +5973,6 @@ Push to Talk от Засичане на гласова активност."</str
     <string name="xbox_game_pass_promotion_card_header">Безплатен пропуск за Xbox Game (3 месеца)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">За съжаление изглежда, че вече имаш Nitro абонамент. Въпреки това, можеш да дадеш своя URL за осребряване на приятел и да му изпратиш 3 безплатни месеца с Nitro.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">О, не!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Тъй като имаш пропуск за Xbox Game, получаваш 3 месеца Nitro безплатно!</string>
     <string name="xbox_link">Връзка</string>
     <string name="xbox_pin_step1">Отвори приложението Discord на твоя телефон</string>
     <string name="xbox_pin_step2">Отиди на Настройки > Връзки > Добавяне</string>
diff --git a/com.discord/res/values-cs/plurals.xml b/com.discord/res/values-cs/plurals.xml
index 93ebe69ec8..0ad9464e76 100644
--- a/com.discord/res/values-cs/plurals.xml
+++ b/com.discord/res/values-cs/plurals.xml
@@ -875,9 +875,8 @@
         <item quantity="one">1 uživatel</item>
     </plurals>
     <plurals name="only_you_can_see_and_delete_these_count">
-        <item quantity="other">zprávy</item>
+        <item quantity="other">zpráv</item>
         <item quantity="one">zprávu</item>
-        <item quantity="few">zprávy</item>
     </plurals>
     <plurals name="partial_outage_a11y_count">
         <item quantity="other">%s serverů je nedostupných z důvodu dočasného výpadku.</item>
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index d0fb8992b4..3cac20abfb 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -2263,9 +2263,9 @@ Bydlí tady taky statistiky o kanálech oznámení, vyhledávání serverů a 
     <string name="guild_owner">Majitel serveru</string>
     <string name="guild_partner_application_category_description">Které z následujících kategorií vystihují tvůj server nejlépe?</string>
     <string name="guild_partner_application_category_label">Kategorie</string>
-    <string name="guild_partner_application_connect">Propojit účty, kde tvoříš</string>
     <string name="guild_partner_application_content_platform">Kde především tvoříš obsah?</string>
     <string name="guild_partner_application_country">Země</string>
+    <string name="guild_partner_application_creator_connect">Propojit účty, kde tvoříš</string>
     <string name="guild_partner_application_description_description">Pověz nám o svém serveru. O co tam jde? Komu je určen?</string>
     <string name="guild_partner_application_description_title">Popis serveru</string>
     <string name="guild_partner_application_first_name">Jméno</string>
@@ -2280,11 +2280,7 @@ Bydlí tady taky statistiky o kanálech oznámení, vyhledávání serverů a 
     <string name="guild_partner_application_server_step_title">Čemu se věnuje tvá komunita?</string>
     <string name="guild_partner_application_subcategory_description">Můžeš také vybrat až 5 podkategorií.</string>
     <string name="guild_partner_application_submit_step">Odeslat přihlášku</string>
-    <string name="guild_partner_application_submit_step_description">Obvykle reagujeme během X dnů.</string>
-    <string name="guild_partner_application_submit_step_description_2">Každá partnerská přihláška prochází kontrolou Discordu. Měj na paměti, že přihlášení nezaručuje partnerství.</string>
-    <string name="guild_partner_application_submit_step_title">Stačí odeslat a je hotovo!</string>
     <string name="guild_partner_application_title">Zapsat se do partnerského programu Discord</string>
-    <string name="guild_partner_application_type">Typ serveru</string>
     <string name="guild_partner_application_type_brand">Byznys/Značka</string>
     <string name="guild_partner_application_type_content">Tvůrce obsahu / Osobnost</string>
     <string name="guild_partner_application_type_fan">Zájmová skupina nebo komunita fanoušků</string>
@@ -2518,8 +2514,6 @@ Bydlí tady taky statistiky o kanálech oznámení, vyhledávání serverů a 
     <string name="guild_settings_discovery_byline">Po splnění podmínek a povolení Vyhledávání se tvůj server bude objevovat ve [Vyhledávání serverů.](onClick) Buď připraven, ať uděláš dobrý dojem!</string>
     <string name="guild_settings_discovery_checklist_2fa">Moderátor musí mít dvoufázové ověření</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Členové s administrátorskými právy (např. administrátoři nebo moderátoři) musejí mít zapnuté dvoufázové ověření, aby mohli provádět administrativní akce.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Než budou moci provádět administrativní akce, musejí mít všichni členové s právy správce povolené dvoufázové ověření. Zlepšuje to ochranu před ukradenými účty správců nebo moderátorů. [Povolit v Možnostech správce](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Moderátor nemá dvoufázové ověření</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Zapnutím Vyhledávání souhlasíš s dodržováním našich [Pravidel pro servery ve vyhledávání](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Splňuje požadavek na stáří</string>
     <string name="guild_settings_discovery_checklist_age_description">Servery ve Vyhledávání musejí být staré alespoň %1$s.</string>
@@ -2533,7 +2527,6 @@ Bydlí tady taky statistiky o kanálech oznámení, vyhledávání serverů a 
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Zvyš počet komunikujících uživatelů za týden</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Komunikující uživatel je někdo, kdo na serveru komunikoval (přes hlasové nebo textové služby). Pořádej komunitní akce a otevírej zajímavá témata k diskuzi – motivuješ tak více lidí, aby si přišli popovídat právě na tvůj server.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">Průměrný počet komunikujících uživatelů na tvém serveru za týden</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Tvůj server potřebuje více členů, kteří jej budou každý týden navštěvovat a budou na něm komunikovat.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Skvělá práce! Tvůj server splňuje všechny požadavky na to, aby byl ve Vyhledávání serverů.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Abychom zajistili, že uživatelům Discordu doporučíme jen servery, na kterých to žije, musejí servery ve Vyhledávání splňovat minimální požadavky na aktivitu.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Pro více podrobností klikni sem</string>
@@ -2549,7 +2542,6 @@ Bydlí tady taky statistiky o kanálech oznámení, vyhledávání serverů a 
     <string name="guild_settings_discovery_checklist_nsfw_description">Název, popis i kanály na tvém serveru vypadají v pořádku!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Našli jsme neslušné výrazy</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">min. požadavek</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Doporučujeme ti vylepšit přijímání nových členů.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Vylepši zážitek novým členům</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Servery, které přilákají více než 10 nových členů týdně, musí mít poměr udržení členů alespoň 10 %%. To znamená, že nejméně 1 z 10 nově přidaných lidí by měl navštěvovat server týden nebo déle.
 
@@ -2559,7 +2551,6 @@ Podívej se na svůj server očima nového člena. Jsou na tvém serveru místa,
     <string name="guild_settings_discovery_checklist_safe_description">Děkujeme, že dodržuješ naše Zásady komunity a udržuješ svůj server zabezpečený!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Tvůj server měl $[porušení našich Podmínek využívání Služeb](doesNotHook) za posledních 30 dní.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Tvůj server porušil naše [podmínky využívání služeb](%1$s) nebo [zásady komunitního serveru](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Označeno Týmem důvěry a bezpečnosti</string>
     <string name="guild_settings_discovery_checklist_score_explain">Počítá se jako klouzavý průměr za posledních 8 týdnů, takže změny se mohou projevit až po pár týdnech. Jako návštěvníci nebo komunikující uživatelé se počítají pouze ti uživatelé, kteří jsou na Discordu alespoň 8 týdnů.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ členů</string>
     <string name="guild_settings_discovery_checklist_size_description">V tuto chvíli je Vyhledávání omezeno pouze na servery s více jak %1$s členy.</string>
@@ -3837,7 +3828,6 @@ připnuté zprávy… zatím."</string>
     <string name="no_thanks">Ne, díky</string>
     <string name="no_user_limit">Bez omezení</string>
     <string name="no_video_devices">Žádná zařízení pro video</string>
-    <string name="no_video_permission_dialog_body">Pokud chceš v tomto hlasovém kanále zapnout video, požádej správce serveru, aby změnili tvá oprávnění pro video.</string>
     <string name="no_video_permission_dialog_title">Žádné oprávnění pro video</string>
     <string name="noise_cancellation_off">Potlačení šumu vypnuto</string>
     <string name="noise_cancellation_on">Potlačení šumu zapnuto</string>
@@ -4054,10 +4044,11 @@ Dostal/a jsi od kamaráda odkaz s pozvánkou? V tom případě zadej svůj zvac
     <string name="one_user_typing">**%1$s** píše…</string>
     <string name="ongoing_call">Probíhající hovor</string>
     <string name="ongoing_call_connected_users">Probíhající hovor – %1$s připojeno</string>
+    <string name="ongoing_call_tap_to_join">— Připoj se klepnutím</string>
     <string name="ongoing_call_voice_quality_low">Ale ne, tlustá červená čára. Tvé připojení vázne.</string>
     <string name="ongoing_call_you_are_all_alone">"Jsi v hovoru sám. 
 Ostatní z tohoto chatu se mohou kdykoliv přidat."</string>
-    <string name="only_you_can_see_and_delete_these">Vidíš %1$s jenom ty – [smazat %1$s](handleDelete).</string>
+    <string name="only_you_can_see_and_delete_these">%1$s vidíš jenom ty – [smazat %1$s](handleDelete).</string>
     <string name="open">Otevřít</string>
     <string name="open_connection_replay">Otevřít záznam připojení</string>
     <string name="open_in_browser">Otevřít v prohlížeči</string>
@@ -4630,7 +4621,6 @@ stažení desktopové aplikace."</string>
     <string name="public_updates_channel_title">Kanál pouze pro moderátory</string>
     <string name="publish_followed_news_body">Tato zpráva bude odeslána na všechny servery sledující tento kanál. Později můžeš tuto zprávu upravit nebo odstranit – aktualizuje se také na všech sledujících serverech.</string>
     <string name="publish_followed_news_body_reach">Tato zpráva bude odeslána na **%1$s serverů** sledujících tento kanál. Později můžeš tuto zprávu upravit nebo odstranit – aktualizuje se také na všech sledujících serverech.</string>
-    <string name="publish_followed_news_body_settings">Další statistiky najdeš v části Nastavení serveru.</string>
     <string name="publish_followed_news_fail_body">Dosáhl jsi svého limitu 10 zveřejněných zpráv za hodinu. Líbí se nám ale tvůj zápal, tak to prosím zkus zase za %1$s.</string>
     <string name="publish_followed_news_fail_title">Ajaj, vyskakovací okno.</string>
     <string name="publish_followed_news_generic_body">Je nám líto, něco se pokazilo.</string>
@@ -4976,7 +4966,6 @@ nastav si jinou roli."</string>
 Tyto zprávy uslyší všichni uživatelé, kteří si prohlížejí daný kanál."</string>
     <string name="server_deafen">Ztlumit zvuk na serveru</string>
     <string name="server_deafened">Zvuk ztlumen serverem</string>
-    <string name="server_deafened_dialog_body">Pokud chceš v tomto kanále poslouchat, požádej správce serveru, aby ti povolili zvuk.</string>
     <string name="server_deafened_dialog_title">Zvuk ztlumen serverem</string>
     <string name="server_desciption_empty">Řekni světu něco málo o tomto serveru.</string>
     <string name="server_emoji">Smajlíci serveru</string>
@@ -4986,7 +4975,6 @@ Tyto zprávy uslyší všichni uživatelé, kteří si prohlížejí daný kaná
     <string name="server_insights">Přehledy serveru</string>
     <string name="server_mute">Ztlumit mikrofon na serveru</string>
     <string name="server_muted">Server je ztlumený</string>
-    <string name="server_muted_dialog_body">Pokud chceš v tomto kanále mluvit, požádej správce serveru, aby ti zrušili ztlumení.</string>
     <string name="server_muted_dialog_title">Server je ztlumený</string>
     <string name="server_name_required">Název serveru je povinný.</string>
     <string name="server_options">Možnosti serveru</string>
@@ -5791,7 +5779,6 @@ Abys mohl(a) dál používat Discord, **musíme tě požádat o ověření tvéh
     <string name="verification_verified">E-mail ověřen!</string>
     <string name="verification_verifying">Ověřujeme tvůj e-mail</string>
     <string name="verified_bot_tooltip">Ověřený bot</string>
-    <string name="verified_developer_badge_tooltip">Ověřený vývojář botů</string>
     <string name="verify">Ověřit</string>
     <string name="verify_account">Ověřit účet</string>
     <string name="verify_by">Ověřit přes</string>
@@ -5952,7 +5939,6 @@ Abys mohl(a) dál používat Discord, **musíme tě požádat o ověření tvéh
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 měsíce)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Je nám líto, ale vypadá to, že už předplatné Nitro máš. Můžeš ale svůj odkaz pro uplatnění dát kamarádovi a poslat mu tak 3 měsíce Nitra zdarma.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Ale ne!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Protože máš Xbox Game Pass, dostaneš Nitro na 3 měsíce zdarma!</string>
     <string name="xbox_link">Připojit</string>
     <string name="xbox_pin_step1">Spusť aplikaci Discord na svém telefonu</string>
     <string name="xbox_pin_step2">Jdi do Nastavení > Připojení > Přidat</string>
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index 7ddde7d145..3e415357e6 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -2243,9 +2243,9 @@ Analyser vedrørende bekendtgørelseskanaler, serveropdagelse og velkomstskærm
     <string name="guild_owner">Ejer af server</string>
     <string name="guild_partner_application_category_description">Hvilken af følgende kategorier beskriver bedst din server?</string>
     <string name="guild_partner_application_category_label">Kategorier</string>
-    <string name="guild_partner_application_connect">Tilslut konti til hvor du skaber</string>
     <string name="guild_partner_application_content_platform">Hvor skaber du primært indhold?</string>
     <string name="guild_partner_application_country">Land</string>
+    <string name="guild_partner_application_creator_connect">Tilslut konti til hvor du skaber</string>
     <string name="guild_partner_application_description_description">Fortæl os mere om din server. Hvad handler den om? Hvem henvender den sig til?</string>
     <string name="guild_partner_application_description_title">Serverbeskrivelse</string>
     <string name="guild_partner_application_first_name">Fornavn</string>
@@ -2260,11 +2260,7 @@ Analyser vedrørende bekendtgørelseskanaler, serveropdagelse og velkomstskærm
     <string name="guild_partner_application_server_step_title">Hvad handler dit community om?</string>
     <string name="guild_partner_application_subcategory_description">Du kan også vælge op til 5 underkategorier.</string>
     <string name="guild_partner_application_submit_step">Indsend ansøgning</string>
-    <string name="guild_partner_application_submit_step_description">Vi vender som regel tilbage indenfor X dage.</string>
-    <string name="guild_partner_application_submit_step_description_2">Hver eneste partneransøgning gennemses af Discord. Bemærk venligst at indsendelse alene ikke garanterer partnerskab.</string>
-    <string name="guild_partner_application_submit_step_title">Bare indsend det, og så er det overstået!</string>
     <string name="guild_partner_application_title">Ansøg i Discords partnerprogram</string>
-    <string name="guild_partner_application_type">Servertype</string>
     <string name="guild_partner_application_type_brand">Forretning /Mærke</string>
     <string name="guild_partner_application_type_content">Indholdsskaber / Personlighed</string>
     <string name="guild_partner_application_type_fan">Interessegruppe eller fan-community</string>
@@ -2498,8 +2494,6 @@ Analyser vedrørende bekendtgørelseskanaler, serveropdagelse og velkomstskærm
     <string name="guild_settings_discovery_byline">Ved at kvalificere og aktivere Discovery vises din server i [Serveropdagelse.](onClick) Sørg for, at du er klar til at gøre et godt indtryk!</string>
     <string name="guild_settings_discovery_checklist_2fa">2FA er et krav før moderering aktiveres</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Medlemmer med modererings-rettigheder (f.eks admins eller mods) skal have aktiveret 2FA for at kunne udføre modereringsopgaver.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Dette kræver, at alle medlemmer med modererings-rettigheder skal have 2FA aktiveret, før de kan udføre modererings-handlinger. Dette kan hjælpe med at beskytte mod kompromitterede admin- eller moderator-konti. [Aktiver i modererings-indstillingerne](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Manglende 2FA-krav til moderering</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Ved at aktivere Discovery erklærer du dig enig i at overholde vores [Synlige Server Retningslinjer.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Opfylder alderskrav</string>
     <string name="guild_settings_discovery_checklist_age_description">Din server skal være mindst %1$s gammel.</string>
@@ -2513,7 +2507,6 @@ Analyser vedrørende bekendtgørelseskanaler, serveropdagelse og velkomstskærm
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Forøg antallet af ugentligt kommunikerende mennesker</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">En kommunikator er én, der har talt på serveren (stemme eller tekst-chat). Afholdelse af community-begivenheder eller deling af debatemner er smarte måder at få folk til at komme og tale.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">gennemsnitligt antal ugentlige kommunikatorer på din server</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Din server har brug for flere medlemmer der besøger den eller taler hver uge.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Flot arbejde! Din server overholder alle krav til serveropdagelse.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">For at sikre at vi kun anbefaler aktive servere til Discord-brugere, er det påkrævet, at servere i Discord har et vist aktivitetsniveau.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Klik her for flere detaljer</string>
@@ -2529,7 +2522,6 @@ Analyser vedrørende bekendtgørelseskanaler, serveropdagelse og velkomstskærm
     <string name="guild_settings_discovery_checklist_nsfw_description">Dit servernavn, beskrivelse og kanalnavne ser rene ud!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Dårlige ord fundet</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">minimum påkrævet</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Du er nødt til at forbedre modtagelsesoplevelsen for dine nye medlemmer.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Forbedr oplevelsen for nye medlemmer</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Servere, der får mere end 10 nye medlemmer om ugen, skal have en bibeholdelse af medlemmer på mindst 10%%. Mindst 1 ud af 10 nye mennesker der tilmelder sig, bør komme forbi ofte i mere end en uge.
 
@@ -2539,7 +2531,6 @@ Se på din server med et nyt medlems øjne. Er der områder, hvor de kan blive f
     <string name="guild_settings_discovery_checklist_safe_description">Tak fordi du overholder vores retningslinjer for fællesskabet og holder din server sikker!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Din server har $[overtrådt vores servicevilkår](doesNotHook) inden for de seneste 30 dage.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Din server har overtrådt vores [Servicevilkår](%1$s) eller [Community-server retningslinjer](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Markeret af Tillid og sikkerhed</string>
     <string name="guild_settings_discovery_checklist_score_explain">Beregnes som et bevægeligt gennemsnit over de sidste 8 uger, så det kan tage et par uger før ændringer kan ses. Kun de brugere der har været på Discord i mere end 8 uger tælles med som besøgende eller kommunikatorer.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ Medlemmer</string>
     <string name="guild_settings_discovery_checklist_size_description">I øjeblikket er Discovery kun begrænset til servere med mere end %1$s medlemmer.</string>
@@ -3800,7 +3791,6 @@ ingen fastgjorte beskeder… endnu."</string>
     <string name="no_thanks">Nej tak</string>
     <string name="no_user_limit">Ingen grænse</string>
     <string name="no_video_devices">Ingen videoenheder</string>
-    <string name="no_video_permission_dialog_body">For at aktivere video i denne talekanal, skal du bede dine serveradministratorer om at ændre dine videotilladelser.</string>
     <string name="no_video_permission_dialog_title">Ingen videotilladelse</string>
     <string name="noise_cancellation_off">Støjdæmpning fra</string>
     <string name="noise_cancellation_on">Støjdæmpning til</string>
@@ -4015,6 +4005,7 @@ Modtog du et invitationslink fra en ven? Indtast dit invitationslink eller kode
     <string name="one_user_typing">**%1$s** skriver…</string>
     <string name="ongoing_call">Igangværende opkald</string>
     <string name="ongoing_call_connected_users">Igangværende opkald – %1$s forbundet</string>
+    <string name="ongoing_call_tap_to_join">— Tryk for at tilmelde dig</string>
     <string name="ongoing_call_voice_quality_low">Åh nej, en stor rød bjælke. Din forbindelse kæmper.</string>
     <string name="ongoing_call_you_are_all_alone">"Du er alene i dette opkald. 
  Andre i denne chat kan tilslutte sig når som helst."</string>
@@ -4094,7 +4085,6 @@ Overlayet virker måske heller ikke for alle. Hvis du har problemer eller spørg
     <string name="paginator_of_pages">Side %1$s af %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Discords Twitter burde have mere information om dette.</string>
-    <string name="partner_badge_tooltip">Discord-partner</string>
     <string name="password_length_error">Adgangskoder skal indeholde mellem 6 og 128 tegn</string>
     <string name="password_manager">Administrator af adgangskoder</string>
     <string name="password_manager_info_android">Hvis du bruger en administrator af adgangskoder, er du nødt til at tillade dette i Indstillinger af tilgængelighed ->Downloadede tjenester. Bare rolig, vi kan føre dig derhen.</string>
@@ -4591,7 +4581,6 @@ mens spillet er i fokus."</string>
     <string name="public_updates_channel_title">Kanal er kun for moderatorer</string>
     <string name="publish_followed_news_body">Denne besked vil blive sendt til alle servere, der følger denne kanal. Du kan redigere eller slette denne besked senere, og den vil blive opdateret på hver af følgende servere.</string>
     <string name="publish_followed_news_body_reach">Denne besked bliver sendt til **%1$s servere** følger denne kanal. Du kan redigere eller slette denne besked senere, og den vil blive opdateret på hver af følgende servere.</string>
-    <string name="publish_followed_news_body_settings">Se mere statistik i serverindstillinger.</string>
     <string name="publish_followed_news_fail_body">Du har nået din grænse på max. 10 beskeder i timen. Men vi er vilde med du er så dedikeret, så prøv venligst igen om %1$s.</string>
     <string name="publish_followed_news_fail_title">Åh, crap - Et popup vindue.</string>
     <string name="publish_followed_news_generic_body">Beklager, noget gik galt.</string>
@@ -4930,7 +4919,6 @@ før du prøver igen."</string>
 kan høres af alle, der er fokuseret på kanalen."</string>
     <string name="server_deafen">Gør server døv</string>
     <string name="server_deafened">Server døvet</string>
-    <string name="server_deafened_dialog_body">For at kunne lytte med i denne kanal, skal du bede dine serveradministratorer om at ophæve døvhed.</string>
     <string name="server_deafened_dialog_title">Server døvet</string>
     <string name="server_desciption_empty">Fortæl verden en smule om denne server.</string>
     <string name="server_emoji">Server-emoji</string>
@@ -4939,7 +4927,6 @@ kan høres af alle, der er fokuseret på kanalen."</string>
     <string name="server_folder_settings">Mappeindstillinger</string>
     <string name="server_mute">Gør server stum</string>
     <string name="server_muted">Server gjort stum</string>
-    <string name="server_muted_dialog_body">For at kunne tale i denne kanal, skal du bede dine serveradministratorer om at ophæve stumhed for din profil.</string>
     <string name="server_muted_dialog_title">Server gjort stum</string>
     <string name="server_name_required">Servernavn er påkrævet.</string>
     <string name="server_options">Servermuligheder</string>
@@ -5737,7 +5724,6 @@ Hvis du vil fortsætte med at bruge Discord, **skal du bekræfte din konto.**"</
     <string name="verification_verified">E-mailadresse verificeret.</string>
     <string name="verification_verifying">Verificerer din e-mailadresse</string>
     <string name="verified_bot_tooltip">Bekræftet bot</string>
-    <string name="verified_developer_badge_tooltip">Bekræftet bot-udvikler</string>
     <string name="verify">Bekræft</string>
     <string name="verify_account">Bekræft konto</string>
     <string name="verify_by">Bekræft via</string>
@@ -5896,7 +5882,6 @@ spørgsmål eller har brug for hjælp."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 måneder)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Beklager, det ser ud til, at du allerede har en Nitro-sub. Du kan dog give din indløsnings-URL til en ven og sende 3 gratis Nitro-måneder til dem.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Åh nej!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Siden du har Xbox Game Pass, giver vi dig 3 måneders Nitro helt gratis!</string>
     <string name="xbox_pin_step1">Åbn Discord-appen på din telefon</string>
     <string name="xbox_pin_step2">Gå til Indstillinger > Forbindelser > Tilføj</string>
     <string name="xbox_pin_step3">Klik på Xbox, og indtast PIN ovenfor</string>
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index dca53937a0..932b992a4d 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -2253,9 +2253,9 @@ Du bekommst außerdem alle Statistiken zu Ankündigungskanälen, der „Server e
     <string name="guild_owner">Servereigentümer</string>
     <string name="guild_partner_application_category_description">Welche der folgenden Kategorien beschreibt deinen Server am besten?</string>
     <string name="guild_partner_application_category_label">Kategorien</string>
-    <string name="guild_partner_application_connect">Verbinde die Accounts deiner Plattformen</string>
     <string name="guild_partner_application_content_platform">Auf welcher Plattform veröffentlichst du hauptsächlich?</string>
     <string name="guild_partner_application_country">Land</string>
+    <string name="guild_partner_application_creator_connect">Verbinde die Accounts deiner Plattformen</string>
     <string name="guild_partner_application_description_description">Erzähl uns ein bisschen von deinem Server. Worum geht es da? Für wen ist er gemacht?</string>
     <string name="guild_partner_application_description_title">Serverbeschreibung</string>
     <string name="guild_partner_application_first_name">Vorname</string>
@@ -2270,11 +2270,7 @@ Du bekommst außerdem alle Statistiken zu Ankündigungskanälen, der „Server e
     <string name="guild_partner_application_server_step_title">Worum geht es in deiner Community?</string>
     <string name="guild_partner_application_subcategory_description">Du kannst bis zu fünf Unterkategorien auswählen.</string>
     <string name="guild_partner_application_submit_step">Bewerbung absenden</string>
-    <string name="guild_partner_application_submit_step_description">Normalerweise melden wir uns innerhalb von X Tagen.</string>
-    <string name="guild_partner_application_submit_step_description_2">Jede Partner-Bewerbung wird von Discord überprüft. Bitte beachte, dass eine Bewerbung nicht zwingend zu einer Partnerschaft führt.</string>
-    <string name="guild_partner_application_submit_step_title">Jetzt musst du deine Bewerbung nur noch absenden!</string>
     <string name="guild_partner_application_title">Bewirb dich für das Discord-Partnerprogramm</string>
-    <string name="guild_partner_application_type">Servertyp</string>
     <string name="guild_partner_application_type_brand">Unternehmen/Marke</string>
     <string name="guild_partner_application_type_content">Content Creator/Bekannte Persönlichkeit</string>
     <string name="guild_partner_application_type_fan">Interessengruppe oder Fan-Community</string>
@@ -2509,8 +2505,6 @@ Du bekommst außerdem alle Statistiken zu Ankündigungskanälen, der „Server e
     <string name="guild_settings_discovery_byline">Wenn dein Server für Entdeckungen qualifiziert ist und diese aktiviert sind, wird er unter [Server entdecken](onClick) angezeigt. Vergiss nicht, dich darauf vorzubereiten, um einen guten Eindruck zu machen!</string>
     <string name="guild_settings_discovery_checklist_2fa">2FA-Bedingung für Moderation aktiviert</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Mitglieder mit Moderationsrechten (wie Administratoren oder Moderatoren) müssen die Zwei-Faktor-Authentifizierung aktiviert haben, um Moderationshandlungen durchzuführen.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Hierzu müssen alle Mitglieder mit Moderationsrechten die Zwei-Faktor-Authentifizierung aktiviert haben, bevor sie Aktionen ausführen können. Das dient dazu, Admin- oder Mod-Accounts vor Hacking zu schützen. [Aktivierung in den Moderationseinstellungen](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">2FA-Bedingung für Moderation fehlt</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Indem du Entdeckung aktivierst, stimmst du den [Richtlinien zu entdeckbaren Servern zu.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Mindestlaufzeit erfüllt</string>
     <string name="guild_settings_discovery_checklist_age_description">Server in Entdeckung müssen mindestens %1$s auf dem Buckel haben.</string>
@@ -2524,7 +2518,6 @@ Du bekommst außerdem alle Statistiken zu Ankündigungskanälen, der „Server e
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Die Anzahl wöchentlicher Beiträger steigern</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Ein Beiträger ist ein Benutzer, der etwas auf dem Server gepostet hat (Sprache oder Text). Veranstalte Community-Events oder biete Diskussionsthemen an, um mehr Benutzer dazu zu bringen, sich zu beteiligen.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">durchschnittliche Beiträger pro Woche</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Auf deinem Server müssen mehr Mitglieder wöchentlich vorbeischauen und reden.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Perfekt! Dein Server erfüllt alle Anforderungen, um Teil von „Server entdecken“ zu werden.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Um sicherzustellen, dass wir Discord-Benutzern nur aktive Server empfehlen, müssen Server in Entdeckung ein bestimmtes Minimum an Aktivität vorweisen.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Klicke hier für mehr Details</string>
@@ -2540,7 +2533,6 @@ Du bekommst außerdem alle Statistiken zu Ankündigungskanälen, der „Server e
     <string name="guild_settings_discovery_checklist_nsfw_description">Dein Servername, die Beschreibung und der Kanal sehen sauber aus!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Schimpfwörter gefunden</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">Mind. erforderlich</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Du musst die anfängliche Erfahrung neuer Mitglieder verbessern.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Die Erfahrung für neue Mitglieder verbessern</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Server, die pro Woche mehr als 10 neue Mitglieder gewinnen, müssen 10 %% dieser neuen Mitglieder behalten. Mindestens 1 von 10 neuen Benutzern sollte länger als 1 Woche bleiben.
 
@@ -2550,7 +2542,6 @@ Betrachte deinen Server aus der Perspektive eines neuen Mitglieds. Gibt es Berei
     <string name="guild_settings_discovery_checklist_safe_description">Danke, dass du unsere Community-Richtlinien einhältst und deinen Server zu einem sicheren Ort machst!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Dein Server hat innerhalb der letzten 30 Tage $[unsere Nutzungsbedingungen verletzt.](doesNotHook)</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Dein Server hat unsere [Nutzungsbedingungen](%1$s) oder [Richtlinien für Community-Server](%2$s) verletzt.</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Gemeldet vom Discord-Vertrauens- &amp; -Sicherheitsteam</string>
     <string name="guild_settings_discovery_checklist_score_explain">Der Durchschnitt wird über die letzten 8 Wochen berechnet, Änderungen könnten sich also erst nach ein paar Wochen zeigen. Nur Benutzer, die seit 8 oder mehr Wochen auf Discord sind, werden als Besucher oder Beiträger gezählt.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ Mitglieder</string>
     <string name="guild_settings_discovery_checklist_size_description">Momentan ist Entdeckung auf Server mit mehr als %1$s Mitglieder beschränkt.</string>
@@ -3817,7 +3808,6 @@ angepinnten Nachrichten."</string>
     <string name="no_thanks">Nein danke</string>
     <string name="no_user_limit">Kein Limit</string>
     <string name="no_video_devices">Keine Videogeräte</string>
-    <string name="no_video_permission_dialog_body">Damit du in diesem Sprachkanal Videos übertragen kannst, musst ein Serveradmin dir die Berechtigung für Videoübertragungen erteilen.</string>
     <string name="no_video_permission_dialog_title">Keine Berechtigung für Videoübertragungen</string>
     <string name="noise_cancellation_off">Hintergrundgeräusch-Unterdrückung: Aus</string>
     <string name="noise_cancellation_on">Hintergrundgeräusch-Unterdrückung: An</string>
@@ -4032,6 +4022,7 @@ Hast du einen Einladungslink von einem Freund bekommen? Gib deinen Einladungslin
     <string name="one_user_typing">**%1$s** schreibt …</string>
     <string name="ongoing_call">Laufender Anruf</string>
     <string name="ongoing_call_connected_users">Laufender Anruf – %1$s verbunden</string>
+    <string name="ongoing_call_tap_to_join">– Tippe, um beizutreten</string>
     <string name="ongoing_call_voice_quality_low">Oh nein, ein großer, roter Balken! Deine Verbindung schwächelt.</string>
     <string name="ongoing_call_you_are_all_alone">"Du bist in diesem Gespräch alleine. 
  Andere in diesem Chat können jederzeit beitreten."</string>
@@ -4111,7 +4102,6 @@ Falls du Probleme oder Fragen hast, lies einfach [diesen schicken Hilfeartikel!]
     <string name="paginator_of_pages">Seite %1$s von %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Auf der Twitterseite von Discord findest du sicher mehr Informationen.</string>
-    <string name="partner_badge_tooltip">Discord-Partner</string>
     <string name="password_length_error">Passwörter müssen 6–128 Zeichen lang sein.</string>
     <string name="password_manager">Passwortmanager</string>
     <string name="password_manager_info_android">Wenn du einen Passwortmanager benutzt, solltest du ihn in Discord hier zulassen: Zugriffseinstellungen -> Heruntergeladene Dienste. Keine Sorge – wir lotsen dich durch.</string>
@@ -4607,7 +4597,6 @@ Push-to-Talk-Erkennung zu ermöglichen, während du dich im Spiel befindest."</s
     <string name="public_updates_channel_title">Kanal nur für Moderatoren</string>
     <string name="publish_followed_news_body">Diese Nachricht wird an alle Server, die diesem Kanal folgen, geschickt. Du kannst sie später noch bearbeiten oder löschen. Sie wird dann auf den Servern entsprechend aktualisiert.</string>
     <string name="publish_followed_news_body_reach">Diese Nachricht wird an **%1$s Server**, die diesem Kanal folgen, geschickt. Du kannst sie später noch bearbeiten oder löschen. Sie wird dann auf den Servern entsprechend aktualisiert.</string>
-    <string name="publish_followed_news_body_settings">In den Servereinstellungen findest du noch mehr Statistiken.</string>
     <string name="publish_followed_news_fail_body">Du hast dein Limit von 10 veröffentlichten Nachrichten pro Stunde erreicht. Aber wir lieben deinen Enthusiasmus, also versuch es bitte in %1$s erneut.</string>
     <string name="publish_followed_news_fail_title">Oh-oh, ein Popup-Fenster.</string>
     <string name="publish_followed_news_generic_body">Sorry, da ist etwas schiefgelaufen.</string>
@@ -4956,7 +4945,6 @@ bevor du es erneut versuchst."</string>
 Diese Nachrichten können von jedem in dem Kanal gehört werden."</string>
     <string name="server_deafen">Serverweit Ein- und Ausgabe deaktivieren</string>
     <string name="server_deafened">Serverweit Ein- und Ausgabe deaktiviert</string>
-    <string name="server_deafened_dialog_body">Damit du in diesem Kanal etwas hören kannst, muss ein Serveradmin die Ein- und Ausgabe für dich aktivieren.</string>
     <string name="server_deafened_dialog_title">Serverweit Ein- und Ausgabe deaktiviert</string>
     <string name="server_desciption_empty">Dann erzähl doch mal, was auf dem Server so los ist.</string>
     <string name="server_emoji">Server-Emojis</string>
@@ -4966,7 +4954,6 @@ Diese Nachrichten können von jedem in dem Kanal gehört werden."</string>
     <string name="server_insights">Server-Einblicke</string>
     <string name="server_mute">Server stummschalten</string>
     <string name="server_muted">Server stummgeschaltet</string>
-    <string name="server_muted_dialog_body">Damit du in diesem Kanal sprechen kannst, muss ein Serveradmin deine Stummschaltung aufheben.</string>
     <string name="server_muted_dialog_title">Server stummgeschaltet</string>
     <string name="server_name_required">Servername ist erforderlich.</string>
     <string name="server_options">Serveroptionen</string>
@@ -5769,7 +5756,6 @@ Bitte verifiziere deinen Account, **um Discord weiterhin zu nutzen.**"</string>
     <string name="verification_verified">E-Mail-Adresse verifiziert!</string>
     <string name="verification_verifying">E-Mail-Adresse wird verifiziert</string>
     <string name="verified_bot_tooltip">Verifizierter Bot</string>
-    <string name="verified_developer_badge_tooltip">Verifizierter Bot-Entwickler</string>
     <string name="verify">Verifizieren</string>
     <string name="verify_account">Account verifizieren</string>
     <string name="verify_by">Verifizieren über</string>
@@ -5929,7 +5915,6 @@ falls du Fragen hast oder Hilfe benötigst."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 Monate)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Sorry, sieht aus, als hättest du schon ein Nitro-Abonnement. Aber du kannst deine Einlösungs-URL einem Freund schicken und ihm damit drei Monate Nitro kostenlos bescheren.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Oh nein!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Mit deinem Xbox Game Pass bekommst du 3 Monate lang Nitro gratis!</string>
     <string name="xbox_pin_step1">Öffne die Discord-App auf deinem Smartphone</string>
     <string name="xbox_pin_step2">Geh zu Einstellungen > Verknüpfungen > Hinzufügen</string>
     <string name="xbox_pin_step3">Wähle Xbox und gib die oben angezeigte PIN ein</string>
diff --git a/com.discord/res/values-el/plurals.xml b/com.discord/res/values-el/plurals.xml
index cca2170329..981893e0b4 100644
--- a/com.discord/res/values-el/plurals.xml
+++ b/com.discord/res/values-el/plurals.xml
@@ -793,14 +793,6 @@
         <item quantity="other">Ενισχύσεις διακομιστή</item>
         <item quantity="one">Ενίσχυση διακομιστή</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_subscription_count_subscriptions">
-        <item quantity="zero">Χωρίς ενισχύσεις</item>
-        <item quantity="one">%1$s Ενίσχυση%2$s Ενισχύσεις</item>
-    </plurals>
-    <plurals name="premium_guild_perks_modal_header_user_subscription_count_numSubscriptions">
-        <item quantity="other">%s φορές!</item>
-        <item quantity="one">%s φορά</item>
-    </plurals>
     <plurals name="premium_guild_perks_modal_protip_mobile_numFreeGuildSubscriptions">
         <item quantity="other">%s Ενισχύσεις</item>
         <item quantity="one">Ενίσχυση</item>
diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml
index 23b74e98a6..b3b82ece24 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -2273,9 +2273,9 @@ Avatar"</string>
     <string name="guild_owner">Ιδιοκτήτης διακομιστή</string>
     <string name="guild_partner_application_category_description">Ποια από τις παρακάτω κατηγορίες περιγράφει καλύτερα τον διακομιστή σου;</string>
     <string name="guild_partner_application_category_label">Κατηγορίες</string>
-    <string name="guild_partner_application_connect">Σύνδεσε τους λογαριασμούς σου όπου δημιουργείς</string>
     <string name="guild_partner_application_content_platform">Πού δημιουργείς κυρίως περιεχόμενο;</string>
     <string name="guild_partner_application_country">Χώρα</string>
+    <string name="guild_partner_application_creator_connect">Σύνδεσε τους λογαριασμούς σου όπου δημιουργείς</string>
     <string name="guild_partner_application_description_description">Πες μας για τον διακομιστή σου. Ποιο είναι το θέμα του; Ποιο είναι το κοινό του;</string>
     <string name="guild_partner_application_description_title">Περιγραφή διακομιστή</string>
     <string name="guild_partner_application_first_name">Όνομα</string>
@@ -2290,11 +2290,7 @@ Avatar"</string>
     <string name="guild_partner_application_server_step_title">Ποιο είναι το αντικείμενο της κοινότητάς σου;</string>
     <string name="guild_partner_application_subcategory_description">Μπορείς να επιλέξεις έως 5 υποκατηγορίες.</string>
     <string name="guild_partner_application_submit_step">Υποβολή αίτησης</string>
-    <string name="guild_partner_application_submit_step_description">Συνήθως απαντάμε μέσα σε Χ ημέρες.</string>
-    <string name="guild_partner_application_submit_step_description_2">Κάθε αίτηση συνεργάτη εξετάζεται από τη Discord. Έχε υπόψη σου ότι η υποβολή αίτησης δεν εγγυάται συνεργασία.</string>
-    <string name="guild_partner_application_submit_step_title">Κάνε υποβολή και έτοιμα!</string>
     <string name="guild_partner_application_title">Κάνε αίτηση στο πρόγραμμα συνεργατών Discord</string>
-    <string name="guild_partner_application_type">Τύπος διακομιστή</string>
     <string name="guild_partner_application_type_brand">Επιχείρηση / επωνυμία</string>
     <string name="guild_partner_application_type_content">Δημιουργός περιεχόμενου / προσωπικότητα</string>
     <string name="guild_partner_application_type_fan">Ομάδα ενδιαφέροντος ή κοινότητα φαν</string>
@@ -2528,8 +2524,6 @@ Avatar"</string>
     <string name="guild_settings_discovery_byline">Αν πληροίς τις προϋποθέσεις και ενεργοποιήσεις την Ανακάλυψη, ο διακομιστής σου θα εμφανίζεται στην [Ανακάλυψη Διακομιστή.](onClick) Βεβαιώσου ότι είσαι έτοιμος να κάνεις καλή εντύπωση!</string>
     <string name="guild_settings_discovery_checklist_2fa">Προϋπόθεση Ελέγχου Ταυτότητας Δύο Παραγόντων για διαχείριση Ενεργοποιημένη</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Μέλη με δυνατότητα διαχείρισης (όπως διαχειριστές ή συντονιστές) πρέπει να έχουν ενεργοποιημένο τον Έλεγχο Ταυτότητας Δύο Παραγόντων για να πραγματοποιήσουν ενέργειες διαχείρισης.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Όλα τα μέλη με δυνατότητα διαχείρισης πρέπει να έχουν ενεργοποιημένο τον Έλεγχο Ταυτότητας Δύο Παραγόντων πριν προχωρήσουν σε ενέργειες διαχείρισης. Έτσι, υποστηρίζεται η προστασία από διακινδυνευμένους λογαριασμούς διαχειριστή ή συντονιστή [Ενεργοποίηση στις ρυθμίσεις Διαχείρισης](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Προϋπόθεση Ελέγχου Ταυτότητας Δύο Παραγόντων για διαχείριση Λείπει</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Ενεργοποιώντας την Ανακάλυψη, συμφωνείς ότι συμμορφώνεσαι με τις [Κατευθυντήριες οδηγίες διακομιστή της εταιρείας μας.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Πληροί την προϋπόθεση ηλικίας</string>
     <string name="guild_settings_discovery_checklist_age_description">Οι διακομιστές στην ανακάλυψη πρέπει να έχουν ηλικία τουλάχιστον %1$s.</string>
@@ -2543,7 +2537,6 @@ Avatar"</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Αύξησε τον αριθμό των πομπών ανά εβδομάδα</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Ο πομπός είναι ένα άτομο που επικοινωνεί (με ομιλία ή γραπτώς) στον διακομιστή. Η διοργάνωση εκδηλώσεων κοινότητας και η τροφοδοσία συζητήσεων είναι τέλειοι τρόποι για να ενθαρρύνεις περισσότερα άτομα να συζητούν.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">μέσος όρος πομπών στον διακομιστή σου ανά εβδομάδα</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Ο διακομιστής σου χρειάζεται περισσότερα μέλη που επισκέπτονται και μιλούν κάθε εβδομάδα.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Μπράβο! Ο διακομιστής σου πληροί όλες τις προϋποθέσεις για να εμφανίζεται στην Ανακάλυψη Διακομιστή.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Για να διασφαλίσουμε ότι προτείνουμε ενεργούς διακομιστές στους χρήστες της Discord, οι διακομιστές στην Ανακάλυψη πρέπει να διαθέτουν ένα ελάχιστο επίπεδο δραστηριότητας.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Κάνε κλικ εδώ για περισσότερες λεπτομέρειες</string>
@@ -2559,7 +2552,6 @@ Avatar"</string>
     <string name="guild_settings_discovery_checklist_nsfw_description">Το όνομα διακομιστή σου, η περιγραφή, και τα ονόματα καναλιών είναι εξαιρετικά!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Βρέθηκαν άσχημες λέξεις</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">ελάχιστος αριθμός που απαιτείται</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Πρέπει να βελτιώσεις την εμπειρία καλωσορίσματος νέων μελών.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Βελτίωση εμπειρίας νέων μελών</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Οι διακομιστές που έχουν πάνω από 10 νέα μέλη κάθε εβδομάδα χρειάζεται να έχουν 10%% διατήρηση των νέων μελών. Τουλάχιστον 1 στα 10 νέα μέλη πρέπει να μένει κάθε εβδομάδα.
 
@@ -2569,7 +2561,6 @@ Avatar"</string>
     <string name="guild_settings_discovery_checklist_safe_description">Σε ευχαριστούμε που συμμορφώνεσαι με τις Κατευθυντήριες γραμμές της κοινότητάς μας και που διατηρείς τον διακομιστή σου ασφαλή!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Ο διακομιστής σου $[δεν πληροί του Όρους παροχής υπηρεσιών](doesNotHook) μας τις τελευταίες 30 ημέρες.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Ο διακομιστής σου δεν πληροί τους [Όρους παροχής υπηρεσιών](%1$s) μας ή τις [Οδηγίες κοινότητας διακομιστή](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Έγινε αναφορά από την ομάδα Εμπιστοσύνης &amp; Ασφάλειας</string>
     <string name="guild_settings_discovery_checklist_score_explain">Έχει μετρηθεί ως κυλιόμενος μέσος όρος τους τελευταίους 8 μήνες, οπότε μπορεί να χρειαστούν μερικές εβδομάδες για να εμφανιστούν οι αλλαγές. Μόνο οι χρήστες που είναι στη Discord τουλάχιστον 8 εβδομάδες μετρούνται ως επισκέπτες ή πομποί.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ Μέλη</string>
     <string name="guild_settings_discovery_checklist_size_description">Προς το παρόν, η Ανακάλυψη περιλαμβάνει μόνο διακομιστές με περισσότερα από %1$s μέλη.</string>
@@ -3590,7 +3581,7 @@ Avatar"</string>
     <string name="manage_messages_description">Μέλη με αυτήν την άδεια μπορούν να διαγράφουν μηνύματα άλλων μελών ή να καρφιτσώνουν οποιοδήποτε μήνυμα.</string>
     <string name="manage_messages_description_in_announcement_channel">Μέλη με αυτήν την άδεια μπορούν να διαγράφουν μηνύματα άλλων μελών ή να καρφιτσώνουν οποιοδήποτε μήνυμα. Επίσης, μπορούν να δημοσιεύουν μηνύματα άλλων μελών σε όλους τους διακομιστές, ακολουθώντας το [Κανάλι Ανακοινώσεων](%1$s).</string>
     <string name="manage_nicknames">Διαχείριση Ψευδωνύμων</string>
-    <string name="manage_nicknames_description">Μέλη με αυτήν την άδεια μπορούν να διαγράψουν μηνύματα άλλων μελών.</string>
+    <string name="manage_nicknames_description">Μέλη με αυτή την άδεια μπορούν να αλλάξουν τα ψευδώνυμα άλλων μελών.</string>
     <string name="manage_permissions">Διαχείριση αδειών</string>
     <string name="manage_permissions_description">Μέλη με αυτήν την άδεια μπορούν να αλλάξουν τίς άδειες αυτού του καναλιού.</string>
     <string name="manage_roles">Διαχείριση Ρόλων</string>
@@ -3843,7 +3834,6 @@ Avatar"</string>
     <string name="no_thanks">Όχι ευχαριστώ</string>
     <string name="no_user_limit">Κανένα όριο</string>
     <string name="no_video_devices">Καμία συσκευή βίντεο</string>
-    <string name="no_video_permission_dialog_body">Για να ενεργοποιήσεις το βίντεο σε αυτό το κανάλι ομιλίας, ζήτησε από τους διαχειριστές του διακομιστή να αλλάξουν τις άδειες βίντεο που έχεις.</string>
     <string name="no_video_permission_dialog_title">Δεν υπάρχει άδεια βίντεο</string>
     <string name="noise_cancellation_off">Καταστολή θορύβου ανενεργή</string>
     <string name="noise_cancellation_on">Καταστολή θορύβου ενεργή</string>
@@ -4060,6 +4050,7 @@ Avatar"</string>
     <string name="one_user_typing">Ο χρήστης **%1$s** πληκτρολογεί…</string>
     <string name="ongoing_call">Κλήση σε εξέλιξη</string>
     <string name="ongoing_call_connected_users">Κλήση σε εξέλιξη — %1$s σε σύνδεση</string>
+    <string name="ongoing_call_tap_to_join">— Κάνε κλικ για να γίνεις μέλος</string>
     <string name="ongoing_call_voice_quality_low">Ωχ, όχι, μια μεγάλη κόκκινη μπάρα. Η σύνδεσή σου δυσκολεύεται.</string>
     <string name="ongoing_call_you_are_all_alone">"Είσαι μόνος σε αυτή την κλήση. 
  Άλλοι χρήστες μπορούν να μπουν ανά πάσα στιγμή."</string>
@@ -4141,7 +4132,6 @@ Avatar"</string>
     <string name="paginator_of_pages">Σελίδα %1$s από %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Το Twitter του Discord θα πρέπει να έχει περισσότερες πληροφορίες.</string>
-    <string name="partner_badge_tooltip">Συνεργάτης Discord</string>
     <string name="password_length_error">Οι κωδικοί πρόσβασης πρέπει να είναι μεταξύ 6 και 128 χαρακτήρων</string>
     <string name="password_manager">Διαχειριστής κωδικών πρόσβασης</string>
     <string name="password_manager_info_android">Αν χρησιμοποιείς διαχειριστή κωδικών πρόσβασης, πρέπει να επιτρέψεις τη λειτουργία του, στο μενού Ρυθμίσεις προσβασιμότητας -> Ληφθείσες υπηρεσίες. Μην ανησυχείς, θα σε πάμε εμείς εκεί.</string>
@@ -4340,8 +4330,6 @@ Avatar"</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Προς το παρόν δεν υποστηρίζουμε αναβαθμίσεις σε Nitro για συνδρομές μέσω της Apple. Μπορείτε να ακυρώσετε τη συνδρομή σας μέσα από την [Διαχείριση Συνδρομών της Apple](%1$s), αλλά η συνδρομή θα παραμείνει ενεργή έως την ημερομηνία λήξης της.</string>
     <string name="premium_guild_perks_modal_gift_nitro">Δώρο Nitro</string>
     <string name="premium_guild_perks_modal_header">Κατάσταση ενίσχυσης διακομιστή</string>
-    <string name="premium_guild_perks_modal_header_subscription_count">%1$s</string>
-    <string name="premium_guild_perks_modal_header_user_subscription_count">(Έχεις ενισχύσει αυτόν τον διακομιστή %1$s)</string>
     <string name="premium_guild_perks_modal_level_subscriber_count_tooltip">**%1$s/%2$s** Ενισχύσεις</string>
     <string name="premium_guild_perks_modal_manage_your_subscriptions">Διαχείριση Ενισχύσεων</string>
     <string name="premium_guild_perks_modal_previous_perks">Οι ενισχυμένοι διακομιστές τα παίρνουν όλα πρώτοι, και —</string>
@@ -4640,7 +4628,6 @@ Avatar"</string>
     <string name="public_updates_channel_title">Κανάλι μόνο για συντονιστές</string>
     <string name="publish_followed_news_body">Αυτό το μήνυμα θα σταλεί σε όλους τους διακομιστές που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.</string>
     <string name="publish_followed_news_body_reach">Αυτό το μήνυμα θα σταλεί σε **%1$s διακομιστές** που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.</string>
-    <string name="publish_followed_news_body_settings">Δείτε περισσότερα στατιστικά στις Ρυθμίσεις διακομιστή.</string>
     <string name="publish_followed_news_fail_body">"Έχεις φτάσει το όριο των 10 δημοσιευμένων μηνυμάτων ανά ώρα. Μας αρέσει, όμως, ο ενθουσιασμός σου, γι' αυτό προσπαθήστε ξανά σε %1$s."</string>
     <string name="publish_followed_news_fail_title">Ωχ, ένα αναδυόμενο παράθυρο.</string>
     <string name="publish_followed_news_generic_body">Συγγνώμη, κάτι πήγε στραβά.</string>
@@ -4990,7 +4977,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
 μπορούν να ακουστούν από όλους τους χρήστες που έχουν εστιάσει στο κανάλι."</string>
     <string name="server_deafen">Κώφωση διακομιστή</string>
     <string name="server_deafened">Κώφωση από τον διακομιστή</string>
-    <string name="server_deafened_dialog_body">Για να ακούσεις σε αυτό το κανάλι, ζήτησε από τους διαχειριστές του διακομιστή να καταργήσουν την κώφωσή σου.</string>
     <string name="server_deafened_dialog_title">Κώφωση από τον διακομιστή</string>
     <string name="server_desciption_empty">Πείτε λίγα λόγια στον κόσμο για αυτόν διακομιστή.</string>
     <string name="server_emoji">Emoji διακομιστή</string>
@@ -4999,7 +4985,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="server_folder_settings">Ρυθμίσεις φακέλου</string>
     <string name="server_mute">Σίγαση διακομιστή</string>
     <string name="server_muted">Διακομιστής σε σίγαση</string>
-    <string name="server_muted_dialog_body">Για να μιλήσεις σε αυτό το κανάλι, ζήτησε από τους διαχειριστές του διακομιστή να καταργήσουν τη σίγασή σου.</string>
     <string name="server_muted_dialog_title">Διακομιστής σε σίγαση</string>
     <string name="server_name_required">Απαιτείται όνομα διακομιστή.</string>
     <string name="server_options">Επιλογές διακομιστή</string>
@@ -5811,7 +5796,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="verification_verified">Το email σου επαληθεύτηκε!</string>
     <string name="verification_verifying">Επαλήθευση του email σου</string>
     <string name="verified_bot_tooltip">Επαληθευμένο bot</string>
-    <string name="verified_developer_badge_tooltip">Προγραμματιστής επαληθευμένου bot</string>
     <string name="verify">Επαλήθευση</string>
     <string name="verify_account">Επαλήθευση λογαριασμού</string>
     <string name="verify_by">Επαλήθευση με</string>
@@ -5971,7 +5955,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 μήνες)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Σόρρυ, φαίνεται πως ήδη έχεις συνδρομή Nitro. Ωστόσο, μπορούμε να δώσουμε το URL εξαργύρωσης σε έναν φίλο σου και να του στείλουμε 3 μήνες Nitro δωρεάν.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Ωχ, όχι!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Επειδή έχεις Xbox Game Pass, σου προσφέρουμε δωρεάν 3 μήνες Nitro!</string>
     <string name="xbox_link">Σύνδεση</string>
     <string name="xbox_pin_step1">Άνοιξε την εφαρμογή Discord στο κινητό σου</string>
     <string name="xbox_pin_step2">Πήγαινε στις Ρυθμίσεις > Συνδέσεις > Προσθήκη</string>
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index 7a3f3359c4..ca934fd2ee 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -2195,9 +2195,9 @@ Aquí también puedes ver las estadísticas de tus canales de anuncios, tu Descu
     <string name="guild_owner">Propietario del servidor</string>
     <string name="guild_partner_application_category_description">¿Cuál de las siguientes categorías describe mejor tu servidor?</string>
     <string name="guild_partner_application_category_label">Categorías</string>
-    <string name="guild_partner_application_connect">Conectar cuentas donde creas contenido</string>
     <string name="guild_partner_application_content_platform">¿Dónde creas contenido principalmente?</string>
     <string name="guild_partner_application_country">País</string>
+    <string name="guild_partner_application_creator_connect">Conectar cuentas donde creas contenido</string>
     <string name="guild_partner_application_description_description">Háblanos de tu servidor. ¿En qué se centra? ¿A quién está dirigido?</string>
     <string name="guild_partner_application_description_title">Descripción del servidor</string>
     <string name="guild_partner_application_first_name">Nombre</string>
@@ -2212,11 +2212,7 @@ Aquí también puedes ver las estadísticas de tus canales de anuncios, tu Descu
     <string name="guild_partner_application_server_step_title">¿En qué se centra tu comunidad?</string>
     <string name="guild_partner_application_subcategory_description">También puedes seleccionar hasta 5 subcategorías.</string>
     <string name="guild_partner_application_submit_step">Enviar solicitud</string>
-    <string name="guild_partner_application_submit_step_description">Normalmente contestamos en X días.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord revisa todas las solicitudes del programa Discord Partner. Ten en cuenta que la presentación de la solicitud no te garantiza que te convertirás en socio.</string>
-    <string name="guild_partner_application_submit_step_title">¡Envíala y listo!</string>
     <string name="guild_partner_application_title">Haz una solicitud para el programa Discord Partner</string>
-    <string name="guild_partner_application_type">Tipo de servidor</string>
     <string name="guild_partner_application_type_brand">Negocio/Marca</string>
     <string name="guild_partner_application_type_content">Creación de contenido/Personalidad</string>
     <string name="guild_partner_application_type_fan">Grupo con un interés común o comunidad de fans</string>
@@ -2451,8 +2447,6 @@ Aquí también puedes ver las estadísticas de tus canales de anuncios, tu Descu
     <string name="guild_settings_discovery_byline">Si cumples los requisitos de Descubrimiento y lo habilitas, tu servidor se mostrará en [Descubrimiento de servidor.](onClick) ¡Asegúrate de estar listo para causar una buena impresión!</string>
     <string name="guild_settings_discovery_checklist_2fa">Requisito de A2F para la moderación habilitado</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Los miembros con poderes de moderación (p. ej., administradores o moderadores) deben tener habilitada la A2F para realizar acciones de moderación.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Todos los miembros con poderes de moderación deben tener habilitada la A2F antes de poder realizar acciones de moderación. Dicha autenticación puede ayudar a proteger de las cuentas de administrador o moderador comprometidas. [Habilitar en los ajustes de Moderación](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Falta el requisito de A2F para la moderación</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Al habilitar Descubrimiento, aceptas cumplir nuestra [Directiva de servidores de Descubrimiento.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Cumple el requisito de antigüedad</string>
     <string name="guild_settings_discovery_checklist_age_description">Los servidores de Descubrimiento deben tener al menos %1$s de antigüedad.</string>
@@ -2466,7 +2460,6 @@ Aquí también puedes ver las estadísticas de tus canales de anuncios, tu Descu
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Aumenta el número de comunicadores semanales</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Un comunicador es una persona que ha participado (con voz o por escrito) en el servidor. Organizar eventos de comunidad o proponer temas de debate son buenas formas de animar a más gente a que contribuya.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">media de comunicadores semanales de tu servidor</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Tu servidor necesita más miembros que entren y participen cada semana.</string>
     <string name="guild_settings_discovery_checklist_good_standing">¡Buen trabajo! Tu servidor reúne todos los requisitos para estar en Descubrimiento de servidor.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Para asegurarnos de que solo recomendamos servidores activos a los usuarios de Discord, para entrar en Descubrimiento hay que cumplir un nivel de actividad mínimo.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Haz clic aquí para más información</string>
@@ -2482,7 +2475,6 @@ Aquí también puedes ver las estadísticas de tus canales de anuncios, tu Descu
     <string name="guild_settings_discovery_checklist_nsfw_description">¡Parece que el nombre de tu servidor, su descripción y los nombres de los canales están limpios!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Se han encontrado palabrotas</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">mín. requerido</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Debes mejorar la experiencia para registrar miembros nuevos.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Mejora la experiencia de miembros nuevos</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Los servidores que sumen más de 10 miembros nuevos a la semana deben tener una retención de nuevos miembros del 10 %%. Al menos, 1 de cada 10 miembros nuevos que se unan deberían quedarse durante más de una semana.
 
@@ -2492,7 +2484,6 @@ Mira tu servidor como un miembro nuevo. ¿Hay zonas en las que puedan confundirs
     <string name="guild_settings_discovery_checklist_safe_description">¡Gracias por cumplir nuestras Directivas de la Comunidad y hacer de tu servidor un lugar seguro!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Tu servidor ha $[incumplido nuestras Condiciones del Servicio](doesNotHook) en los últimos 30 días.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Tu servidor ha incumplido nuestras [Condiciones del Servicio](%1$s) o nuestras [directivas de los servidores de la comunidad](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Marcado por el equipo de confianza y seguridad</string>
     <string name="guild_settings_discovery_checklist_score_explain">Se calcula como media móvil durante las últimas 8 semanas, así que puede que los cambios no se muestren hasta pasadas unas semanas. Solo se cuentan como visitantes o comunicadores los usuarios que se unieron a Discord hace más de 8 semanas.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s o más miembros</string>
     <string name="guild_settings_discovery_checklist_size_description">De momento, Descubrimiento solo está disponible para los servidores con más de %1$s miembros.</string>
@@ -3761,7 +3752,6 @@ ningún mensaje fijado… aún."</string>
     <string name="no_thanks">No, gracias</string>
     <string name="no_user_limit">Sin límite</string>
     <string name="no_video_devices">No hay dispositivos de vídeo</string>
-    <string name="no_video_permission_dialog_body">Para poder activar el vídeo en este canal de voz, pide a los administradores del servidor que cambien tus permisos de vídeo.</string>
     <string name="no_video_permission_dialog_title">No tienes permisos de vídeo</string>
     <string name="noise_cancellation_off">Supresión de ruido desactivada</string>
     <string name="noise_cancellation_on">Supresión de ruido activada</string>
@@ -3976,6 +3966,7 @@ Crea un servidor de Discord donde tus amigos y tú podáis hablar y pasar el rat
     <string name="one_user_typing">**%1$s** está escribiendo…</string>
     <string name="ongoing_call">Llamada en curso</string>
     <string name="ongoing_call_connected_users">Llamada en curso — %1$s conectado(s)</string>
+    <string name="ongoing_call_tap_to_join">— Toca para unirte</string>
     <string name="ongoing_call_voice_quality_low">Oh, no, una gran barra roja. Hay problemas con tu conexión.</string>
     <string name="ongoing_call_you_are_all_alone">"Estás solo en esta llamada.
 Pueden unirse otras personas del chat en cualquier momento."</string>
@@ -4055,7 +4046,6 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="paginator_of_pages">Página %1$s de %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s El Twitter de Discord debería tener más información.</string>
-    <string name="partner_badge_tooltip">Socio de Discord</string>
     <string name="password_length_error">Las contraseñas deben tener entre 6 y 128 caracteres</string>
     <string name="password_manager">Gestor de contraseñas</string>
     <string name="password_manager_info_android">Si usas un gestor de contraseñas, tendrás que darle permisos en Ajustes de accesibilidad -> Servicios descargados. No te preocupes, podemos llevarte hasta allí.</string>
@@ -4554,7 +4544,6 @@ la detección de Pulsar para hablar mientras el juego está activo."</string>
     <string name="public_updates_channel_title">Canal solo de moderadores</string>
     <string name="publish_followed_news_body">Se enviará este mensaje a todos los servidores que sigan a este canal. Puedes editar o eliminar este mensaje más tarde, y se actualizará en todos los servidores que sigan al canal.</string>
     <string name="publish_followed_news_body_reach">Se enviará este mensaje a los **%1$s servidores** que sigan a este canal. Puedes editar o eliminar este mensaje más tarde, y se actualizará en todos los servidores que sigan al canal.</string>
-    <string name="publish_followed_news_body_settings">Ve más estadísticas en los Ajustes del servidor.</string>
     <string name="publish_followed_news_fail_body">Has alcanzado el límite de 10 mensajes publicados por hora, pero nos encanta tu entusiasmo, así que vuelve a intentarlo en %1$s.</string>
     <string name="publish_followed_news_fail_title">Oh, no, una ventana emergente.</string>
     <string name="publish_followed_news_generic_body">Lo sentimos, algo ha fallado.</string>
@@ -4902,7 +4891,6 @@ antes de volver a intentarlo."</string>
 los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="server_deafen">Ensordecer servidor</string>
     <string name="server_deafened">Servidor ensordecido</string>
-    <string name="server_deafened_dialog_body">Para poder escuchar en este canal, pide a los administradores del servidor que te desactiven el ensordecimiento.</string>
     <string name="server_deafened_dialog_title">Servidor ensordecido</string>
     <string name="server_desciption_empty">Háblales un poco a todos acerca de este servidor.</string>
     <string name="server_emoji">Emojis del servidor</string>
@@ -4912,7 +4900,6 @@ los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="server_insights">Información del servidor</string>
     <string name="server_mute">Silenciar en servidor</string>
     <string name="server_muted">Servidor silenciado</string>
-    <string name="server_muted_dialog_body">Para poder hablar en este canal, pide a los administradores del servidor que te desactiven el silencio.</string>
     <string name="server_muted_dialog_title">Servidor silenciado</string>
     <string name="server_name_required">Nombre del servidor obligatorio.</string>
     <string name="server_options">Opciones del servidor</string>
@@ -5717,7 +5704,6 @@ Para seguir usando Discord, **tendremos que verificar tu cuenta.**"</string>
     <string name="verification_verified">¡Correo electrónico verificado!</string>
     <string name="verification_verifying">Verificando tu correo electrónico</string>
     <string name="verified_bot_tooltip">Bot verificado</string>
-    <string name="verified_developer_badge_tooltip">Desarrollador de bots verificado</string>
     <string name="verify">Verificar</string>
     <string name="verify_account">Verificar cuenta</string>
     <string name="verify_by">Verificar por</string>
@@ -5877,7 +5863,6 @@ pregunta o necesitas ayuda."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 meses)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Lo sentimos, parece que ya tienes una suscripción Nitro. Sin embargo, puedes enviarle tu enlace de canje a un amigo, con el que obtendrá 3 meses gratis de Nitro.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">¡Oh, no!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">¡Como tienes Xbox Game Pass, te damos 3 meses de Nitro gratis!</string>
     <string name="xbox_link">Vincular</string>
     <string name="xbox_pin_step1">Abre la aplicación de Discord en tu teléfono</string>
     <string name="xbox_pin_step2">Ve a Ajustes > Conexiones > Añadir</string>
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index b0d6ef9b87..5229be1d41 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -2281,9 +2281,9 @@ Löydät täältä myös analyysitiedot palvelimesi tiedotekanavista, palvelinha
     <string name="guild_owner">Palvelimen omistaja</string>
     <string name="guild_partner_application_category_description">Mikä seuraavista luokista vastaa palvelintasi parhaiten?</string>
     <string name="guild_partner_application_category_label">Luokat</string>
-    <string name="guild_partner_application_connect">Yhdistä tilit, joita käytät sisällön tuottamiseen</string>
     <string name="guild_partner_application_content_platform">Missä pääasiassa tuotat sisältöä?</string>
     <string name="guild_partner_application_country">Maa</string>
+    <string name="guild_partner_application_creator_connect">Yhdistä tilit, joita käytät sisällön tuottamiseen</string>
     <string name="guild_partner_application_description_description">Kerro meille palvelimestasi. Mitä siellä käsitellään ja kenelle se on tarkoitettu?</string>
     <string name="guild_partner_application_description_title">Palvelimen kuvaus</string>
     <string name="guild_partner_application_first_name">Etunimi</string>
@@ -2298,11 +2298,7 @@ Löydät täältä myös analyysitiedot palvelimesi tiedotekanavista, palvelinha
     <string name="guild_partner_application_server_step_title">Mistä yhteisössäsi on kyse?</string>
     <string name="guild_partner_application_subcategory_description">Voit valita lisäksi enintään 5 alaluokkaa.</string>
     <string name="guild_partner_application_submit_step">Lähetä hakemus</string>
-    <string name="guild_partner_application_submit_step_description">Vastaamme yleensä X päivän kuluessa.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord tarkistaa kaikki kumppanihakemukset. Huomaa, että kumppaniksi hakeminen ei takaa kumppaniohjelmaan pääsyä.</string>
-    <string name="guild_partner_application_submit_step_title">Lähetä vain hakemus matkaan, niin kaikki on valmista!</string>
     <string name="guild_partner_application_title">Hae Discordin kumppaniohjelmaan</string>
-    <string name="guild_partner_application_type">Palvelintyyppi</string>
     <string name="guild_partner_application_type_brand">Yritys/tuotemerkki</string>
     <string name="guild_partner_application_type_content">Sisällöntuottaja/persoonallisuus</string>
     <string name="guild_partner_application_type_fan">Harrasteryhmä tai faniyhteisö</string>
@@ -2537,8 +2533,6 @@ Löydät täältä myös analyysitiedot palvelimesi tiedotekanavista, palvelinha
     <string name="guild_settings_discovery_byline">Jos täytät palvelinhaun ehdot, voit ottaa sen käyttöön, jolloin palvelimesi näkyy [palvelinhauissa.](onClick) Varmista, että olet valmis tekemään hyvän vaikutuksen!</string>
     <string name="guild_settings_discovery_checklist_2fa">Valvojien kaksivaiheisen todennuksen vaatimus käytössä</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Valvontaoikeuden omaavat jäsenet (esim. ylläpitäjät ja moderaattorit) voivat tehdä valvontatoimia vain, jos heillä on kaksivaiheinen todennus käytössä.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Tämä asetus edellyttää kaikkia valvontaoikeudet omaavia jäseniä tekemään kaksivaiheisen todennuksen ennen kuin he voivat tehdä valvontatoimia. Tämä voi auttaa suojautumaan vääriin käsiin joutuneiden ylläpito- tai moderaattoritunnusten väärinkäytöltä. [Ota tämä käyttöön valvonta-asetuksista](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Valvojien kaksivaiheisen todennuksen vaatimus ei ole käytössä</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Kun otat palvelinhaun käyttöön, sitoudut noudattamaan [palvelinhakupalvelimien ohjeistustamme.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Täyttää ikävaatimuksen</string>
     <string name="guild_settings_discovery_checklist_age_description">Palvelinhaun palvelimen on oltava vähintään %1$s vanha.</string>
@@ -2552,7 +2546,6 @@ Löydät täältä myös analyysitiedot palvelimesi tiedotekanavista, palvelinha
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Nosta viikoittaisten keskustelijoiden määrää</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Keskustelijalla tarkoitetaan henkilöä, joka keskustelee palvelimellasi (puhe- tai tekstikeskustelussa). Yhteisötapahtumien järjestäminen ja uusien keskusteluaiheiden aloittaminen ovat hyviä tapoja rohkaista ihmisiä keskustelemaan.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">palvelimesi viikoittaisten keskustelijoiden keskiarvo</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Palvelimesi tarvitsee enemmän jäseniä, jotka vierailevat ja keskustelevat siellä viikoittain.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Mahtavaa työtä! Palvelimesi täyttää kaikki palvelinhakuun lisäämisen vaatimukset.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Haluamme varmistaa, että suosittelemme Discord-käyttäjille vain aktiivisia palvelimia, joten palvelinhakuun lisättävien palvelimien on täytettävä tietty aktiivisuuden vähimmäistaso.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Katso lisätiedot klikkaamalla tästä</string>
@@ -2568,7 +2561,6 @@ Löydät täältä myös analyysitiedot palvelimesi tiedotekanavista, palvelinha
     <string name="guild_settings_discovery_checklist_nsfw_description">Palvelimesi nimi, kuvaus ja kanavien nimet näyttävät ongelmattomilta!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Epäsopivaa tekstiä löytynyt</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">vaadittava vähimmäismäärä</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Sinun on parannettava uusien jäsenten käyttökokemusta.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Paranna uusien jäsenten käyttökokemusta</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Palvelimet, joihin liittyy yli 10 uutta jäsentä viikoittain, edellytetään säilyttävän vähintään 10 %% näistä uusista jäsenistä. Eli vähintään yhden kymmenestä uudesta jäsenestä pitää olla edelleen jäsenenä viikon kuluttua liittymisestään.
 
@@ -2578,7 +2570,6 @@ Tarkastele palvelintasi uuden jäsenen näkökulmasta. Onko palvelimellasi aluei
     <string name="guild_settings_discovery_checklist_safe_description">Kiitos, että noudatat yhteisösääntöjämme ja pidät palvelimesi turvallisena!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Palvelimesi on $[rikkonut palveluehtojamme](doesNotHook) viimeksi kuluneen 30 päivän aikana.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Palvelimesi on rikkonut [palveluehtojamme](%1$s) tai [yhteisöpalvelimien toimintasääntöjämme](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Luottamus- ja turvallisuustiimin merkitsemä</string>
     <string name="guild_settings_discovery_checklist_score_explain">Keskiarvot lasketaan edellisen 8 viikon ajalta, joten muutosten vaikutukset alkavat näkyä vasta muutaman viikon kuluttua. Vierailijoiksi ja keskustelijoiksi lasketaan vain sellaiset käyttäjät, jotka ovat olleet Discordissa vähintään 8 viikkoa.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ jäsentä</string>
     <string name="guild_settings_discovery_checklist_size_description">Palvelinhakuun otetaan tällä hetkellä mukaan vain vähintään %1$s jäsenen palvelimia.</string>
@@ -3561,7 +3552,7 @@ Yritä uudelleen."</string>
     <string name="loading_tip_22">Voit muuttaa osallistujien äänenvoimakkuutta puhelun aikana napsauttamalla heitä hiiren kakkospainikkeella.</string>
     <string name="loading_tip_23">Voit tallentaa viestejä kiinnittämällä ne kanavalle tai yksityiskeskusteluun.</string>
     <string name="loading_tip_24">Voit muuttaa emojin reaktioksi kirjoittamalla sen eteen plusmerkin.</string>
-    <string name="loading_tip_25">Voit vaihtaa nimimerkkisi palvelimella nopeasti kirjoittamalal /nick.</string>
+    <string name="loading_tip_25">Voit vaihtaa nimimerkkisi palvelimella nopeasti kirjoittamalla /nick.</string>
     <string name="loading_tip_3">Merkit kuten @, #, ! ja * kaventavat pikavaihtajan tuloksia.</string>
     <string name="loading_tip_4">Klikkaamalla palvelimen nimeä emojivalitsimessa voit piilottaa kyseisen palvelimen emojit.</string>
     <string name="loading_tip_5">Voit tallentaa GIF-kuvan suosikkeihisi pitämällä hiiren osoitinta kuvan päällä ja napsauttamalla tähteä.</string>
@@ -3862,7 +3853,6 @@ kiinnitettyjä viestejä… vielä."</string>
     <string name="no_thanks">Ei kiitos</string>
     <string name="no_user_limit">Ei rajoitusta</string>
     <string name="no_video_devices">Ei videolaitteita</string>
-    <string name="no_video_permission_dialog_body">Jos haluat ottaa videokuvan käyttöön tällä kanavalla, pyydä palvelimen ylläpitäjiä muuttamaan videokuvan käyttöoikeusasetustasi.</string>
     <string name="no_video_permission_dialog_title">Ei videon käyttöoikeutta</string>
     <string name="noise_cancellation_off">Kohinanvaimennus pois</string>
     <string name="noise_cancellation_on">Kohinanvaimennus päällä</string>
@@ -4079,6 +4069,7 @@ Saitko kutsulinkin kaveriltasi? Syötä kutsulinkki tai -koodi alle, niin pääs
     <string name="one_user_typing">**%1$s** kirjoittaa…</string>
     <string name="ongoing_call">Käynnissä oleva puhelu</string>
     <string name="ongoing_call_connected_users">Käynnissä oleva puhelu — %1$s mukana</string>
+    <string name="ongoing_call_tap_to_join">– Liity napauttamalla</string>
     <string name="ongoing_call_voice_quality_low">Oho, iso punainen palkki. Yhteytesi takeltelee.</string>
     <string name="ongoing_call_you_are_all_alone">"Olet tässä puhelussa itseksesi. 
  Muut keskusteluun kuuluvat voivat liittyä puheluun milloin tahansa halutessaan."</string>
@@ -4160,7 +4151,6 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
     <string name="paginator_of_pages">Sivu %1$s/%2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Discordin Twitterissä pitäisi olla lisätietoja.</string>
-    <string name="partner_badge_tooltip">Discord-kumppani</string>
     <string name="password_length_error">Salasanassa on oltava 6–128 merkkiä</string>
     <string name="password_manager">Salasananhallinta</string>
     <string name="password_manager_info_android">Mikäli käytät salasananhallintaa, sinun on otettava se käyttöön asetuksista: Helppokäyttöasetukset -> Ladatut palvelut. Voimme siirtää sinut sinne.</string>
@@ -4659,7 +4649,6 @@ jotta radiopuhelintila toimii, kun pelin ikkuna on aktiivisena."</string>
     <string name="public_updates_channel_title">Vain valvojille -kanava</string>
     <string name="publish_followed_news_body">Tämä viesti lähetetään kaikille tätä kanavaa seuraaville palvelimille. Voit muokata viestiä myöhemmin tai poistaa sen. Viesti päivittyy vastaavasti kaikille seuraaville palvelimille.</string>
     <string name="publish_followed_news_body_reach">Tämä viesti lähetetään **%1$s palvelimelle**, jotka seuraavat tätä kanavaa. Voit muokata viestiä myöhemmin tai poistaa sen. Viesti päivittyy vastaavasti kaikille seuraaville palvelimille.</string>
-    <string name="publish_followed_news_body_settings">Katso tarkemmat tilastot palvelinasetuksista.</string>
     <string name="publish_followed_news_fail_body">10 julkaistun viestin raja tunnissa on täyttynyt. Intosi on kuitenkin ihailtavaa, joten yritä uudelleen %1$s kuluttua.</string>
     <string name="publish_followed_news_fail_title">Oho, ponnahdusruutu.</string>
     <string name="publish_followed_news_generic_body">Jokin meni valitettavasti vikaan.</string>
@@ -5008,7 +4997,6 @@ sallituksi toiselle roolille tai itsellesi, ennen kuin yrität uudelleen."</stri
 Kaikki kanavaa lukevat käyttäjät voivat kuulla tekstistä puheeksi -viestit."</string>
     <string name="server_deafen">Hiljennä palvelimella</string>
     <string name="server_deafened">Hiljennetty palvelimella</string>
-    <string name="server_deafened_dialog_body">Jos haluat kuunnella tällä kanavalla, pyydä palvelimen ylläpitäjiä poistamaan hiljennyksesi.</string>
     <string name="server_deafened_dialog_title">Palvelimen hiljennetty</string>
     <string name="server_desciption_empty">Kerro muulle maailmalle jotain tästä palvelimesta.</string>
     <string name="server_emoji">Palvelimen emoji</string>
@@ -5018,7 +5006,6 @@ Kaikki kanavaa lukevat käyttäjät voivat kuulla tekstistä puheeksi -viestit."
     <string name="server_insights">Palvelinanalyysi</string>
     <string name="server_mute">Mykistä palvelin</string>
     <string name="server_muted">Mykistetty palvelimella</string>
-    <string name="server_muted_dialog_body">Jos haluat puhua tällä kanavalla, pyydä palvelimen ylläpitäjiä poistamaan mykistyksesi.</string>
     <string name="server_muted_dialog_title">Palvelin mykistetty</string>
     <string name="server_name_required">Palvelimen nimi on pakollinen.</string>
     <string name="server_options">Palvelinasetukset</string>
@@ -5827,7 +5814,6 @@ Jotta voisit jatkaa Discordin käyttöä, **sinun on varmennettava tilisi.**"</s
     <string name="verification_verified">Sähköposti vahvistettu!</string>
     <string name="verification_verifying">Vahvistetaan sähköpostisi</string>
     <string name="verified_bot_tooltip">Vahvistettu botti</string>
-    <string name="verified_developer_badge_tooltip">Vahvistetun botin kehittäjä</string>
     <string name="verify">Vahvista</string>
     <string name="verify_account">Vahvista tili</string>
     <string name="verify_by">Vahvistustapa</string>
@@ -5988,7 +5974,6 @@ sinulla on jotain kysyttävää tai tarvitset apua."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 kk)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Sinulla on valitettavasi jo Nitro-tilaus. Voit kuitenkin lähettää lunastuslinkin kaverillesi, niin hänkin saa Nitron käyttöönsä ilmaiseksi 3 kuukaudeksi.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Oi ei!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Koska sinulla on Xbox Game Pass, saat Nitron ilmaiseksi kolmeksi kuukaudeksi!</string>
     <string name="xbox_link">Linkki</string>
     <string name="xbox_pin_step1">Avaa Discord-sovellus puhelimessasi</string>
     <string name="xbox_pin_step2">Valitse Asetukset > Yhteydet > Lisää</string>
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index ada5c040bc..fc88ccd2a4 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -2284,9 +2284,9 @@ C’est aussi là que se nichent les outils d’analyse des salons des annonces,
     <string name="guild_owner">Propriétaire du serveur</string>
     <string name="guild_partner_application_category_description">Quelle est la catégorie décrivant le mieux ton serveur parmi les suivantes ?</string>
     <string name="guild_partner_application_category_label">Catégories</string>
-    <string name="guild_partner_application_connect">Connecter les comptes utilisés pour la création de contenu</string>
     <string name="guild_partner_application_content_platform">"Où crées-tu l'essentiel de ton contenu ?"</string>
     <string name="guild_partner_application_country">Pays</string>
+    <string name="guild_partner_application_creator_connect">Connecter les comptes utilisés pour la création de contenu</string>
     <string name="guild_partner_application_description_description">Dis-nous en plus sur ton serveur. De quoi parle-t-il ? Pour qui est-il fait ?</string>
     <string name="guild_partner_application_description_title">Description du serveur</string>
     <string name="guild_partner_application_first_name">Prénom</string>
@@ -2301,11 +2301,7 @@ C’est aussi là que se nichent les outils d’analyse des salons des annonces,
     <string name="guild_partner_application_server_step_title">De quoi parle ta communauté ?</string>
     <string name="guild_partner_application_subcategory_description">"Tu peux également sélectionner jusqu'à 5 sous-catégories."</string>
     <string name="guild_partner_application_submit_step">Envoyer la candidature</string>
-    <string name="guild_partner_application_submit_step_description">Nous recontactons généralement les candidats sous X jours.</string>
-    <string name="guild_partner_application_submit_step_description_2">Chaque candidature au programme Partner est vérifiée par Discord. Remarque : une candidature ne garantit pas un partenariat.</string>
-    <string name="guild_partner_application_submit_step_title">"Tu n'as plus qu'à envoyer ça et c'est bon !"</string>
     <string name="guild_partner_application_title">Postuler au Partner Program de Discord</string>
-    <string name="guild_partner_application_type">Type de serveur</string>
     <string name="guild_partner_application_type_brand">Entreprise / Marque</string>
     <string name="guild_partner_application_type_content">Créateur de contenu / Personnalité</string>
     <string name="guild_partner_application_type_fan">"Groupe d'intérêt ou communauté de fans"</string>
@@ -2539,8 +2535,6 @@ C’est aussi là que se nichent les outils d’analyse des salons des annonces,
     <string name="guild_settings_discovery_byline">Si tu actives Découverte et que ton serveur est approprié, il apparaîtra dans [Découverte de serveurs.](onClick) Assure-toi que vous êtes prêts à faire bonne impression !</string>
     <string name="guild_settings_discovery_checklist_2fa">A2F obligatoire pour la modération activée</string>
     <string name="guild_settings_discovery_checklist_2fa_description">"Les membres ayant un pouvoir de modération (admins et modérateurs, par ex.) doivent avoir l'A2F activée pour effectuer des actes de modération."</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Tous les membres disposant de pouvoirs de modération doivent être vérifiés par A2F avant de pouvoir agir en tant que modérateur. Cela permet de mieux protéger ton serveur des comptes administrateurs ou modérateurs compromis. [Activer dans les paramètres de modération](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">A2F obligatoire pour la modération manquante</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">En activant Découverte, tu acceptes de respecter notre [Charte pour les serveurs en mode Découverte.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">"Respecte les exigences d'ancienneté"</string>
     <string name="guild_settings_discovery_checklist_age_description">Les serveurs en Découverte doivent avoir au moins %1$s.</string>
@@ -2554,7 +2548,6 @@ C’est aussi là que se nichent les outils d’analyse des salons des annonces,
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Augmente le nombre de communicateurs hebdomadaires</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">"Un communicateur est une personne qui a discuté (par texte ou en vocal) dans le serveur. Organiser des événements pour ta communauté et lancer des sujets de discussion sont de bonnes façons d'encourager plus de gens à communiquer."</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">moyenne des communicateurs hebdomadaires dans ton serveur</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Ton serveur a besoin de plus de membres qui visitent et discutent chaque semaine.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Beau travail ! Ton serveur remplit tous les critères pour apparaître dans Découverte de serveurs.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">"Pour être sûr de ne recommander que des serveurs actifs aux utilisateurs de Discord, les serveurs dans Découverte doivent avoir un niveau d'activité minimum."</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Clique ici pour en savoir plus</string>
@@ -2570,7 +2563,6 @@ C’est aussi là que se nichent les outils d’analyse des salons des annonces,
     <string name="guild_settings_discovery_checklist_nsfw_description">"On dirait que le nom, la description et les noms de salon de ton serveur n'ont rien de répréhensible !"</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Gros mots repérés</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">min. requis</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">"Tu dois améliorer l'expérience d'arrivée de tes nouveaux membres."</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">"Améliorer l'expérience des nouveaux membres"</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Les serveurs qui obtiennent plus de 10 nouveaux membres par semaine doivent avoir une conservation de nouveaux membres de 10 %%. Au moins 1 nouvelle personne sur 10 doit rester pendant au moins une semaine.
 
@@ -2580,7 +2572,6 @@ Observe ton serveur du point de vue d'un nouveau membre. Y a-t-il des aspects qu
     <string name="guild_settings_discovery_checklist_safe_description">"Merci de respecter notre Charte d'Utilisation de la Communauté et de maintenir ton serveur sécurisé !"</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">"Ton serveur a été en $[violation de nos Conditions d'Utilisation](doesNotHook) au cours des 30 derniers jours."</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Ton serveur était en violation de nos [Conditions d’Utilisation](%1$s) ou de notre [Charte d’Utilisation des serveurs de communauté](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">"Signalé par l'équipe Confiance et Sécurité"</string>
     <string name="guild_settings_discovery_checklist_score_explain">"C'est une moyenne mobile calculée sur les 8 dernières semaines, alors les changements peuvent mettre du temps avant d'apparaître. Seuls les utilisateurs qui sont sur Discord depuis plus de 8 semaines sont comptabilisés comme visiteurs ou communicateurs."</string>
     <string name="guild_settings_discovery_checklist_size">Plus de %1$s membres</string>
     <string name="guild_settings_discovery_checklist_size_description">Pour le moment, seuls les serveurs qui ont plus de %1$s membres peuvent apparaître sur Découverte.</string>
@@ -3848,7 +3839,6 @@ de message épinglé… pour l'instant."</string>
     <string name="no_thanks">Non merci</string>
     <string name="no_user_limit">Aucune limite</string>
     <string name="no_video_devices">Aucun périphérique vidéo</string>
-    <string name="no_video_permission_dialog_body">Pour activer ta caméra dans ce salon vocal, demande aux administrateurs du serveur de changer tes permissions vidéo.</string>
     <string name="no_video_permission_dialog_title">Aucune permission vidéo</string>
     <string name="noise_cancellation_off">Suppression du bruit désactivée</string>
     <string name="noise_cancellation_on">Suppression du bruit activée</string>
@@ -4062,6 +4052,7 @@ Tu as reçu un lien d'invitation d'un de tes amis ? Entre ton lien d'invitation
     <string name="one_user_typing">"**%1$s** est en train d'écrire…"</string>
     <string name="ongoing_call">Appel en cours</string>
     <string name="ongoing_call_connected_users">Appel en cours — %1$s connecté(s)</string>
+    <string name="ongoing_call_tap_to_join">— Tapote pour rejoindre</string>
     <string name="ongoing_call_voice_quality_low">Oh non, une grosse barre rouge. Ta connexion a des problèmes.</string>
     <string name="ongoing_call_you_are_all_alone">"Tu es seul(e) dans cet appel. 
  D'autres membres de cette discussion peuvent le rejoindre à tout moment."</string>
@@ -4141,7 +4132,6 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
     <string name="paginator_of_pages">Page %1$s sur %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">"%1$s Il y a sûrement plus d'infos à ce sujet sur le compte Twitter de Discord."</string>
-    <string name="partner_badge_tooltip">Partenaire Discord</string>
     <string name="password_length_error">Les mots de passe doivent comprendre entre 6 et 128 caractères</string>
     <string name="password_manager">Gestionnaire de mot de passe</string>
     <string name="password_manager_info_android">"Si tu utilises un gestionnaire de mot de passe, tu dois l'autoriser dans Paramètres d'accessibilité -> Services téléchargés. Ne t'en fais pas, nous pouvons t'y mener."</string>
@@ -4637,7 +4627,6 @@ puisse être utilisée même quand le jeu est à l'avant-plan."</string>
     <string name="public_updates_channel_title">Salon réservé aux modérateurs</string>
     <string name="publish_followed_news_body">Ce message va être envoyé à tous les serveurs qui suivent ce salon. Tu pourras toujours modifier ou supprimer ce message plus tard, et il sera mis à jour sur tous les serveurs abonnés.</string>
     <string name="publish_followed_news_body_reach">Ce message va être envoyé aux **%1$s serveurs** qui suivent ce salon. Tu pourras toujours modifier ou supprimer ce message plus tard, et il sera mis à jour sur tous les serveurs abonnés.</string>
-    <string name="publish_followed_news_body_settings">Voir plus de statistiques dans les Paramètres du serveur.</string>
     <string name="publish_followed_news_fail_body">Tu as atteint ta limite de 10 messages par heure. Nous apprécions ton enthousiasme, merci de réessayer dans %1$s.</string>
     <string name="publish_followed_news_fail_title">Oh, oh. Une boîte de dialogue.</string>
     <string name="publish_followed_news_generic_body">"Désolé, une erreur s'est produite."</string>
@@ -4979,7 +4968,6 @@ Commence par octroyer cette permission à un autre rôle que tu possèdes ou à
 Ces messages peuvent être entendus par toutes les personnes pour qui le salon est en avant-plan."</string>
     <string name="server_deafen">Mettre en sourdine sur le serveur</string>
     <string name="server_deafened">Mis en sourdine sur le serveur</string>
-    <string name="server_deafened_dialog_body">Pour écouter dans ce salon, demande aux administrateurs de ton serveur de rétablir ton son.</string>
     <string name="server_deafened_dialog_title">Mis en sourdine sur le serveur</string>
     <string name="server_desciption_empty">Présente ce serveur au monde entier.</string>
     <string name="server_emoji">Émojis du serveur</string>
@@ -4989,7 +4977,6 @@ Ces messages peuvent être entendus par toutes les personnes pour qui le salon e
     <string name="server_insights">Analyses de serveur</string>
     <string name="server_mute">Rendre muet sur le serveur</string>
     <string name="server_muted">Serveur muet</string>
-    <string name="server_muted_dialog_body">Pour parler dans ce salon, demande aux administrateurs du serveur de rétablir ta voix.</string>
     <string name="server_muted_dialog_title">Serveur muet</string>
     <string name="server_name_required">Un nom de serveur est requis.</string>
     <string name="server_options">Options du serveur</string>
@@ -5796,7 +5783,6 @@ Afin de continuer à utiliser Discord, **nous devons vérifier ton compte.**"</s
     <string name="verification_verified">E-mail vérifié !</string>
     <string name="verification_verifying">Vérification de ton e-mail</string>
     <string name="verified_bot_tooltip">Bot certifié</string>
-    <string name="verified_developer_badge_tooltip">Développeur de bot certifié</string>
     <string name="verify">Vérifier</string>
     <string name="verify_account">Vérifier le compte</string>
     <string name="verify_by">Vérifier par</string>
@@ -5956,7 +5942,6 @@ ou besoin d'aide."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 mois)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">"Désolé, on dirait que tu as déjà un abonnement Nitro. Tu peux quand même donner ton URL de l'offre à un ami pour lui offrir 3 mois d'abonnement Nitro gratuit."</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Oh non !</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Avec cet Xbox Game Pass, tu obtiens 3 mois de Nitro gratuits !</string>
     <string name="xbox_link">Lien</string>
     <string name="xbox_pin_step1">"Ouvre l'application Discord sur ton téléphone"</string>
     <string name="xbox_pin_step2">Va dans Paramètres -> Connexions -> Ajouter</string>
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index 6eccb7b542..fb8ccc3346 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -2215,9 +2215,9 @@ Osim toga, ovdje imaš žive podatke koji se odnose na analitiku kanala za najav
     <string name="guild_owner">Vlasnik servera</string>
     <string name="guild_partner_application_category_description">Koja od sljedećih kategorija najbolje opisuje tvoj server?</string>
     <string name="guild_partner_application_category_label">Kategorije</string>
-    <string name="guild_partner_application_connect">Poveži račune tamo gdje ih stvaraš</string>
     <string name="guild_partner_application_content_platform">Gdje prvenstveno stvaraš sadržaj?</string>
     <string name="guild_partner_application_country">Zemlja</string>
+    <string name="guild_partner_application_creator_connect">Poveži račune tamo gdje ih stvaraš</string>
     <string name="guild_partner_application_description_description">Recite nam nešto o svom serveru. O čemu se radi? Za koga je to?</string>
     <string name="guild_partner_application_description_title">Opis servera</string>
     <string name="guild_partner_application_first_name">Ime</string>
@@ -2232,11 +2232,7 @@ Osim toga, ovdje imaš žive podatke koji se odnose na analitiku kanala za najav
     <string name="guild_partner_application_server_step_title">O čemu se radi u tvojoj zajednici?</string>
     <string name="guild_partner_application_subcategory_description">Možeš odabrati i do 5 potkategorija.</string>
     <string name="guild_partner_application_submit_step">Pošalji prijavu</string>
-    <string name="guild_partner_application_submit_step_description">Obično se javimo u roku od X dana.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord pregledava svaku prijavu za partnerstvo. Imaj na umu da prijava ne jamči da će se partnerstvo realizirati.</string>
-    <string name="guild_partner_application_submit_step_title">Samo se prijavi i gotov(a) si!</string>
     <string name="guild_partner_application_title">Prijavi se na Discord Partner Program</string>
-    <string name="guild_partner_application_type">Vrsta servera</string>
     <string name="guild_partner_application_type_brand">Posao / robna marka</string>
     <string name="guild_partner_application_type_content">Stvaratelj sadržaja / Osoba</string>
     <string name="guild_partner_application_type_fan">Interesna skupina ili zajednica ljubitelja</string>
@@ -2471,8 +2467,6 @@ Osim toga, ovdje imaš žive podatke koji se odnose na analitiku kanala za najav
     <string name="guild_settings_discovery_byline">Ako omogućiš otkrivanje i ispuniš potrebne uvjete, tvoj server bit će dodan u [Otkrivanje servera.](onClick) Pritom svakako povedi računa da ostaviš dobar dojam!</string>
     <string name="guild_settings_discovery_checklist_2fa">Omogućena je 2FA obaveza za moderiranje</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Svi članovi s ovlastima moderiranja (npr. administratori i modovi) moraju imati 2FA omogućenu kako bi moderirali.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Zbog toga svi članovi koji imaju ovlasti moderiranja moraju imati omogućenu 2FA prije nego mogu provesti radnje moderiranja. Time se može i pomoći boljoj sigurnosti administratorskih ili mod računa. [Omogući u postavkama za Moderiranje](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Obavezna 2FA za moderiranje nedostaje</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Omogućavanjem Otkrivanja, prihvaćaš da ćeš se pridržavati [Pravila za servere uvrštene u otkrivanje.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Udovoljava uvjetu obavezne starosti</string>
     <string name="guild_settings_discovery_checklist_age_description">Serveri u Otkrivanju moraju biti stari najmanje %1$s.</string>
@@ -2486,7 +2480,6 @@ Osim toga, ovdje imaš žive podatke koji se odnose na analitiku kanala za najav
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Povećaj broj tjednih komunikatora</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Komunikator je netko tko je na tvojem serveru nešto rekao ili napisao. Sjajni načini na koje možeš ljude navesti da se zapričaju su događanja u zajednici ili zadavanje tema za razgovor.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">prosječan broj tjednih komunikatora na tvojem serveru</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Tvojem serveru treba više korisnika koji pričaju ili pišu tijekom jednog tjedna.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Bravo! Tvoj je server udovoljio svim zahtjevima za uvrštavanje u program Otkrivanje servera.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Mi želimo biti sigurni da ćemo korisnicima Discorda u Otkrivanju predlagati samo servere na kojima ima neke živosti, svi ti serveri moraju zadovoljiti određene zahtjeve minimalne aktivnosti.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Klikni ovdje da doznaš podrobnije</string>
@@ -2502,7 +2495,6 @@ Osim toga, ovdje imaš žive podatke koji se odnose na analitiku kanala za najav
     <string name="guild_settings_discovery_checklist_nsfw_description">Naziv i opis servera i nazivi kanala čine se čistim k’o suza!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Našli smo neke nelijepe riječi</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">nužni minimum</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Trebaš novim korisnicima poboljšati proces njihovog uhodavanja u tvoj server.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Novim članovima poboljšaj doživljaj</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Serveri kojima pristupa preko 10 novih članova tjedno moraju imati stopu zadržavanja od najmanje 10%%. Najmanje 1 od 10 osoba mora se zadržati dulje od jednog tjedna.
 
@@ -2512,7 +2504,6 @@ Gledaj server očima novog člana. Ima li na serveru dijelova na kojima bi se mo
     <string name="guild_settings_discovery_checklist_safe_description">Uistinu cijenimo što se pridržavaš Pravila ponašanja u zajednici i održavaš svoj server sigurnim!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Tijekom proteklih 30 dana tvoj server je $[prekršio naše Uvjete pružanja usluge](doesNotHook).</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Tvoj server prekršio je [Uvjete pružanja usluge](%1$s) ili [Smjernice za servere zajednice](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Označio Discordov tim za povjerenje i sigurnost</string>
     <string name="guild_settings_discovery_checklist_score_explain">Izračunava se kao pomični prosjek tijekom posljednih 8 tjedana i stoga je potrebno nekoliko tjedana da bi se promjene uočile. U posjetitelje ili komunikatore ubrajaju se samo oni korisnici koji su na Discordu više od 8 tjedana.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ članova</string>
     <string name="guild_settings_discovery_checklist_size_description">Za sada se na Otkrivanje primaju samo serveri koji imaju više od %1$s članova.</string>
@@ -3782,7 +3773,6 @@ prikvačenu poruku… zasad."</string>
     <string name="no_thanks">Ne, hvala</string>
     <string name="no_user_limit">Neograničeno</string>
     <string name="no_video_devices">Nema video uređaja</string>
-    <string name="no_video_permission_dialog_body">Da bi mogao/mogla uključiti svoj video u ovom kanalu, moraš zamoliti nekog od admina s ovog servera da ti promijeni dozvole za video.</string>
     <string name="no_video_permission_dialog_title">Nema video dozvola</string>
     <string name="noise_cancellation_off">Potiskivanje šuma isklj.</string>
     <string name="noise_cancellation_on">Potiskivanje šuma uklj.</string>
@@ -3999,6 +3989,7 @@ Jesi li primio/la link pozivnice od prijatelja? Unesi svoj link pozivnice ili k
     <string name="one_user_typing">**%1$s** piše…</string>
     <string name="ongoing_call">Poziv u tijeku</string>
     <string name="ongoing_call_connected_users">Poziv u tijeku — %1$s povezanih korisnika</string>
+    <string name="ongoing_call_tap_to_join">– dodirni i pridruži se</string>
     <string name="ongoing_call_voice_quality_low">E, nije dobro. Velika crvena traka znači vezu u problemima.</string>
     <string name="ongoing_call_you_are_all_alone">"Ti si jedina osoba u ovom pozivu.
 Drugi se mogu pridružiti u bilo koje vrijeme."</string>
@@ -4079,7 +4070,6 @@ Također, overlay možda neće raditi svakome. Ako imaš problema ili pitanja, p
     <string name="paginator_of_pages">Stranica %1$s od %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Više informacija bi se moglo naći na Discordovom Twitteru.</string>
-    <string name="partner_badge_tooltip">Discord partner</string>
     <string name="password_length_error">Lozinke moraju biti između 6 i 128 znakova</string>
     <string name="password_manager">Upravitelj lozinkama</string>
     <string name="password_manager_info_android">Ako upotrebljavaš upravitelja lozinki, morat ćeš ga omogućiti u Postavkama pristupačnosti -> Preuzeti servisi e usluge. Ne brini, možemo te odvesti tamo.</string>
@@ -4575,7 +4565,6 @@ aktivira se tipkama **%1$s**."</string>
     <string name="public_updates_channel_title">Kanal samo za modove</string>
     <string name="publish_followed_news_body">Ova će poruka biti poslana svim serverima koji prate ovaj kanal. Kasnije možeš urediti ili izbrisati ovu poruku i ona će se ažurirati na svakom serveru koji prati.</string>
     <string name="publish_followed_news_body_reach">Ova će poruka biti poslana **%1$s serverima** koji prate ovaj kanal. Kasnije možete urediti ili izbrisati ovu poruku i ona će se ažurirati na svakom sljedećem serveru.</string>
-    <string name="publish_followed_news_body_settings">Pogledajte više statističkih podataka u Postavkama servera.</string>
     <string name="publish_followed_news_fail_body">Čini se da te ograničava pravilo da se objavljuje najviše deset poruka na sat. Ali sviđa nam se taj entuzijazam pa te molimo da pokušaj opet za %1$s.</string>
     <string name="publish_followed_news_fail_title">Opa, vidi pa to je pop-up box.</string>
     <string name="publish_followed_news_generic_body">Sorry, ali nešto je pošlo krivo.</string>
@@ -4919,7 +4908,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="send_tts_messages_description">Članovi s ovom dozvolom mogu slati tekst-u-govor (TTS) poruke tako da započnu poruku sa /tts. Te poruke mogu čuti svi koji imaju fokus na kanalu.</string>
     <string name="server_deafen">Ogluši širom servera</string>
     <string name="server_deafened">Onemogućeno slušanje na serveru</string>
-    <string name="server_deafened_dialog_body">Da bi mogao/mogla slušati kroz ovaj kanal, moraš zamoliti nekog od admina s ovog servera da ti ukloni onemogućavanje slušanja.</string>
     <string name="server_deafened_dialog_title">Onemogućeno slušanje na serveru</string>
     <string name="server_desciption_empty">Reci cijelom svijetu ponešto o ovom serveru.</string>
     <string name="server_emoji">Emoji servera</string>
@@ -4929,7 +4917,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="server_insights">Razrada servera</string>
     <string name="server_mute">Utišaj server</string>
     <string name="server_muted">Server utišan</string>
-    <string name="server_muted_dialog_body">Da bi mogao/mogla govoriti kroz ovaj kanal, moraš zamoliti nekog od admina s ovog servera da ti isključi utišavanje.</string>
     <string name="server_muted_dialog_title">Server utišan</string>
     <string name="server_name_required">Potrebno je ime servera.</string>
     <string name="server_options">Postavke servera</string>
@@ -5732,7 +5719,6 @@ Ako želiš nastaviti s korištenjem Discorda, **morat ćeš potvrditi svoj rač
     <string name="verification_verified">Email Potvrđen!</string>
     <string name="verification_verifying">Potvrđivanje tvog e-maila</string>
     <string name="verified_bot_tooltip">Verificirani bot</string>
-    <string name="verified_developer_badge_tooltip">Verificirani bot developer</string>
     <string name="verify">Potvrdi</string>
     <string name="verify_account">Potvrdi račun</string>
     <string name="verify_by">Potvrdi s</string>
@@ -5890,7 +5876,6 @@ Ako želiš nastaviti s korištenjem Discorda, **morat ćeš potvrditi svoj rač
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 mjeseca)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Čuj, čini se da već imaš Nitro pretplatu. Ali svoj URL za iskorištavanje možeš poslati nekom frendu i tako mu poslati 3 besplatna Nitro mjeseca.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Ajoj!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">S obzirom na to da imaš Xbox Game Pass, 3 mjeseca imaš Nitro besplatno!</string>
     <string name="xbox_link">Poveznica</string>
     <string name="xbox_pin_step1">Otvori Discord aplikaciju na svom mobilnom telefonu</string>
     <string name="xbox_pin_step2">Idi na Postavke > Veze> Dodaj</string>
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index 353d256ba3..97caf12895 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -2268,9 +2268,9 @@ A bejelentési csatornacsatornákkal, a szerverfelfedezéssel és a nyitóképer
     <string name="guild_owner">Szervertulajdonos</string>
     <string name="guild_partner_application_category_description">A következő kategóriák közül melyik írja le legjobban a szervered?</string>
     <string name="guild_partner_application_category_label">Kategóriák</string>
-    <string name="guild_partner_application_connect">A tartalomkészítés helyéül szolgáló fiókok összekapcsolása</string>
     <string name="guild_partner_application_content_platform">Hol hozol létre elsődlegesen tartalmat?</string>
     <string name="guild_partner_application_country">Ország</string>
+    <string name="guild_partner_application_creator_connect">A tartalomkészítés helyéül szolgáló fiókok összekapcsolása</string>
     <string name="guild_partner_application_description_description">Mondj valamit a szerveredről! Miről szól? Milyen céllal jön létre?</string>
     <string name="guild_partner_application_description_title">Szerver leírása</string>
     <string name="guild_partner_application_first_name">Keresztnév</string>
@@ -2285,11 +2285,7 @@ A bejelentési csatornacsatornákkal, a szerverfelfedezéssel és a nyitóképer
     <string name="guild_partner_application_server_step_title">Miről szól a közösséged?</string>
     <string name="guild_partner_application_subcategory_description">További 5 alkategóriát is megjelölhetsz.</string>
     <string name="guild_partner_application_submit_step">Jelentkezés elküldése</string>
-    <string name="guild_partner_application_submit_step_description">A jelentkezés adatait általában X napon belül ellenőrizzük.</string>
-    <string name="guild_partner_application_submit_step_description_2">A Discord ellenőrizi a partnerprogramot célzó összes jelentkezést. Kérjük, vedd figyelembe, hogy a jelentkezés önmagában nem garantálja a partnerprogramba való felvételt.</string>
-    <string name="guild_partner_application_submit_step_title">Csak küldd el, és kész is vagy!</string>
     <string name="guild_partner_application_title">Jelentkezés a Discord Partnerprogramba</string>
-    <string name="guild_partner_application_type">Szerver típusa</string>
     <string name="guild_partner_application_type_brand">Üzlet/márka</string>
     <string name="guild_partner_application_type_content">Tartalomkészítő/közismert személy</string>
     <string name="guild_partner_application_type_fan">Érdekcsoport vagy rajongói közösség</string>
@@ -2524,8 +2520,6 @@ A bejelentési csatornacsatornákkal, a szerverfelfedezéssel és a nyitóképer
     <string name="guild_settings_discovery_byline">A felfedezésre jogosulttá válással és az engedélyezésével a szervered meg fog jelenni a [szerverfelfedezésben.](onClick) Ügyelj rá, hogy jó benyomást kelts!</string>
     <string name="guild_settings_discovery_checklist_2fa">Kétlépcsős hitelesítési követelmények a moderáláshoz engedélyezve</string>
     <string name="guild_settings_discovery_checklist_2fa_description">A moderálási lehetőséggel rendelkező tagoknál (pl. rendszergazdák, moderátorok) a moderálási műveletek végrehajtásához a kétlépcsős hitelesítés engedélyezve kell legyen.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Ez megköveteli, hogy minden moderátori jogkörrel rendelkező tag engedélyezze a 2FA-t, mielőtt moderátori tevékenységet végezne. Ez segíthet a problémás admin- vagy moderátori fiókok elleni védelemben. [A Moderálási beállítások között engedélyezheted](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Hiányzó kétlépcsős hitelesítési követelmények a moderáláshoz</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">A Felfedezés engedélyezésével elfogadod a [Felfedezésre alkalmas szerverekre vonatkozó irányelvünket.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Megfelel a korkövetelményeknek</string>
     <string name="guild_settings_discovery_checklist_age_description">A Felfedezésben megjelenő szervereknek legalább %1$s léteznie kell.</string>
@@ -2539,7 +2533,6 @@ A bejelentési csatornacsatornákkal, a szerverfelfedezéssel és a nyitóképer
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Növeld heti hozzászólóid számát!</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Hozzászóló az, aki beszélget (hanggal vagy írásban) a szerveren. Közösségi események tartásával és beszélgetési témák kiemelésével remekül elősegítheted, hogy minél többen beszélgessenek.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">átlagos heti hozzászólók száma a szervereden</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">A szerverednek több tagra van szüksége, akik hetente benéznek és beszélgetnek.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Nagyszerű munka! A szervered a szerverfelfedezés minden követelményének megfelel.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Hogy megbizonyosodjunk róla, csak aktív szervereket ajánlunk a Discord felhasználóinak, a Felfedezésben részt vevő szervereknek teljesíteniük kell egy minimális aktivitási szintet.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">További részletekért kattints ide</string>
@@ -2555,7 +2548,6 @@ A bejelentési csatornacsatornákkal, a szerverfelfedezéssel és a nyitóképer
     <string name="guild_settings_discovery_checklist_nsfw_description">A szervered neve és leírása, valamint a csatornák neve tiszta.</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Nem találhatók helytelen szavak</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">minimálisan szükséges</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Fejlesztened kell az új tagok felvételi élményén.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Új tagok élményének fejlesztése</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"A hetente több mint 10 új tagot szerző szervereknek meg kell tartaniuk új tagjaik legalább 10%%-át. A csatlakozó 10 új ember közül legalább 1-nek maradnia is kell egy héten túl.
 
@@ -2565,7 +2557,6 @@ Tekints a szerveredre egy új tag szemével! Vannak olyan területek, ahol könn
     <string name="guild_settings_discovery_checklist_safe_description">Köszönjük, hogy betartod közösségi irányelveinket és biztosítod szervered biztonságát!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">A szervered az elmúlt 30 napban $[megsértette Szolgáltatási feltételeinket](doesNotHook).</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">A szervered megsértette a [Szolgáltatási feltételeinket](%1$s) vagy [közösségi szerverek irányelveit](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">A Bizalom és biztonság csapat által megjelölve</string>
     <string name="guild_settings_discovery_checklist_score_explain">Az elmúlt 8 hét gördülő átlagával számolunk, így elképzelhető, hogy a változások csak néhány hét múlva jelentkeznek. Csak a Discordon legalább 8 hete jelen lévő felhasználók számítanak bele a látogatók, illetve hozzászólók számába.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ tag</string>
     <string name="guild_settings_discovery_checklist_size_description">A felfedezés jelenleg olyan szerverekre van korlátozva, amelyeknek több mint %1$s tagja van.</string>
@@ -3844,7 +3835,6 @@ kitűzött üzenete… egyelőre."</string>
     <string name="no_thanks">Köszönöm, nem</string>
     <string name="no_user_limit">Korlátlan</string>
     <string name="no_video_devices">Nincs videó eszköz</string>
-    <string name="no_video_permission_dialog_body">A videód bekapcsolásához ezen a hangcsatornán kérd meg a szerver adminjait, hogy módosítsák a videojogosultságaidat.</string>
     <string name="no_video_permission_dialog_title">Nincs videojogosultságod</string>
     <string name="noise_cancellation_off">Zajcsökkentés ki</string>
     <string name="noise_cancellation_on">Zajcsökkentés be</string>
@@ -4060,6 +4050,7 @@ Meghívó linket kaptál egy barátodtól? Írd be a linket vagy kódot, hogy cs
     <string name="one_user_typing">**%1$s** éppen gépel…</string>
     <string name="ongoing_call">Folyamatban lévő hívás</string>
     <string name="ongoing_call_connected_users">Folyamatban lévő hívás – %1$s csatlakozott</string>
+    <string name="ongoing_call_tap_to_join">— Koppints a csatlakozáshoz</string>
     <string name="ongoing_call_voice_quality_low">Ó, ne, egy nagy piros vonal. A csatlakozásod akadozik.</string>
     <string name="ongoing_call_you_are_all_alone">"Egyedül vagy ebben a hívásban. 
  Mások bármikor csatlakozhatnak ebből a csevegésből."</string>
@@ -4141,7 +4132,6 @@ A játékbeli felület nem biztos, hogy mindenkinek működik. Ha problémád ak
     <string name="paginator_of_pages">%1$s / %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s A Discord Twitter fiókjában több információ található.</string>
-    <string name="partner_badge_tooltip">Discord partner</string>
     <string name="password_length_error">A jelszó hosszának 6 és 128 karakter között kell lennie</string>
     <string name="password_manager">Jelszókezelő</string>
     <string name="password_manager_info_android">Ha jelszókezelőt használsz, engedélyezned kell a Kisegítő Lehetőségek -> Letöltött szolgáltatások menüpontban. Ne aggódj, el tudunk juttatni oda.</string>
@@ -4642,7 +4632,6 @@ miközben a játékablak aktív."</string>
     <string name="public_updates_channel_title">Moderátoroknak fenntartott csatorna</string>
     <string name="publish_followed_news_body">Ez az üzenet elküldésre kerül minden a csatornát követő szerverre. Később szerkesztheted vagy törölheted ezt az üzenetet, és ez minden követő szerveren megfelelően frissítve lesz.</string>
     <string name="publish_followed_news_body_reach">Ez az üzenet elküldésre kerül a csatornát követő **%1$s szerverre**. Később szerkesztheted vagy törölheted ezt az üzenetet, és ez minden követő szerveren megfelelően frissítve lesz.</string>
-    <string name="publish_followed_news_body_settings">Több statisztika megtekintése a Szerver beállításokban.</string>
     <string name="publish_followed_news_fail_body">Elérted az óránkénti 10 nyilvános üzenetben meghúzott határt. De mivel imádjuk a lelkesedésedet, ezért próbálkozz újra %1$s.</string>
     <string name="publish_followed_news_fail_title">O-ó, egy felugró üzenet.</string>
     <string name="publish_followed_news_generic_body">Sajnáljuk, valami félrement.</string>
@@ -4991,7 +4980,6 @@ Válaszd ki a képernyőt, amit meg szeretnél osztani."</string>
 üzenetet mindenki hallja, akinek meg van nyitva az a csatorna."</string>
     <string name="server_deafen">Szerver süketítés</string>
     <string name="server_deafened">Szerver süketítve</string>
-    <string name="server_deafened_dialog_body">A csatorna meghallgatásához kérd meg a szerver adminjait, hogy kapcsolják ki a süketítésedet.</string>
     <string name="server_deafened_dialog_title">Szerver süketítve</string>
     <string name="server_desciption_empty">Mesélj a világnak egy kicsit erről a szerverről.</string>
     <string name="server_emoji">Szerver emotikon</string>
@@ -5000,7 +4988,6 @@ Válaszd ki a képernyőt, amit meg szeretnél osztani."</string>
     <string name="server_folder_settings">Mappa beállítások</string>
     <string name="server_mute">Szerver némítás</string>
     <string name="server_muted">Szerver elnémítva</string>
-    <string name="server_muted_dialog_body">A csatornán való beszélgetéshez kérd meg a szerver adminjait, hogy kapcsolják ki a némításodat.</string>
     <string name="server_muted_dialog_title">Szerver elnémítva</string>
     <string name="server_name_required">A szervernév megadása kötelező.</string>
     <string name="server_options">Szerver opciók</string>
@@ -5812,7 +5799,6 @@ A Discord használatának folytatásához **erősítsd meg a fiókod.**"</string
     <string name="verification_verified">E-mail cím megerősítve!</string>
     <string name="verification_verifying">E-mail hitelesítése</string>
     <string name="verified_bot_tooltip">Hitelesített bot</string>
-    <string name="verified_developer_badge_tooltip">Hitelesített botfejlesztő</string>
     <string name="verify">Hitelesítés</string>
     <string name="verify_account">Fiók hitelesítése</string>
     <string name="verify_by">Hitelesítés ezzel:</string>
@@ -5974,7 +5960,6 @@ kérdésed van vagy segítségre van szükséged."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass bérlet (3 hónap)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Sajnos már rendelkezel Nitro előfizetéssel. Azonban a beváltási URL-ed megadhatod egy barátodnak és küldhetsz neki 3 ingyenes Nitro hónapot.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Ó, ne!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Mivel neked már van Xbox Game Pass bérleted, 3 hónap ingyenes Nitrót kapsz!</string>
     <string name="xbox_pin_step1">Nyisd meg a Discord alkalmazást a telefonodon</string>
     <string name="xbox_pin_step2">Lépj a Beállítások > Kapcsolatok > Hozzáadás elemre</string>
     <string name="xbox_pin_step3">Kattints az Xbox-ra, és írd be a fenti PIN-kódot</string>
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index 5d01b8a288..02cca4a974 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -2263,9 +2263,9 @@ Qui troverai anche analisi dei dati di Canali delle notizie, Esplora server e Sc
     <string name="guild_owner">Proprietario del server</string>
     <string name="guild_partner_application_category_description">Quali delle seguenti categorie descrive meglio il tuo server?</string>
     <string name="guild_partner_application_category_label">Categorie</string>
-    <string name="guild_partner_application_connect">Collega gli account sui quali crei</string>
     <string name="guild_partner_application_content_platform">Dove crei principalmente i tuoi contenuti?</string>
     <string name="guild_partner_application_country">Paese</string>
+    <string name="guild_partner_application_creator_connect">Collega gli account sui quali crei</string>
     <string name="guild_partner_application_description_description">Descrivici il tuo server. Di cosa parla? A chi è indirizzato?</string>
     <string name="guild_partner_application_description_title">Descrizione del server</string>
     <string name="guild_partner_application_first_name">Nome</string>
@@ -2280,11 +2280,7 @@ Qui troverai anche analisi dei dati di Canali delle notizie, Esplora server e Sc
     <string name="guild_partner_application_server_step_title">Qual è il tema della tua community?</string>
     <string name="guild_partner_application_subcategory_description">Puoi anche selezionare fino a 5 sottocategorie.</string>
     <string name="guild_partner_application_submit_step">Invia candidatura</string>
-    <string name="guild_partner_application_submit_step_description">Di solito rispondiamo entro X giorni.</string>
-    <string name="guild_partner_application_submit_step_description_2">Ogni candidatura viene esaminata da Discord. Desideriamo fare presente che la candidatura non garantisce la partnership.</string>
-    <string name="guild_partner_application_submit_step_title">Ti basta inviare!</string>
     <string name="guild_partner_application_title">Candidati al programma di partnership Discord</string>
-    <string name="guild_partner_application_type">Tipo di server</string>
     <string name="guild_partner_application_type_brand">Affari / Marchio</string>
     <string name="guild_partner_application_type_content">Creatore di contenuti / Personalità</string>
     <string name="guild_partner_application_type_fan">"Gruppo d'interesse o Community di fan"</string>
@@ -2518,8 +2514,6 @@ Qui troverai anche analisi dei dati di Canali delle notizie, Esplora server e Sc
     <string name="guild_settings_discovery_byline">Se soddisfi i requisiti puoi attivare Esplora, così il tuo server comparirà in [Esplora server.](onClick) Accertati di essere pronto a fare una buona impressione!</string>
     <string name="guild_settings_discovery_checklist_2fa">Requisito 2FA per la moderazione abilitato</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Gli amministratori e i moderatori devono aver abilitato il 2FA per poter eseguire azioni amministrative.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Questo richiede che tutti gli amministratori abbiano il 2FA abilitato prima di poter portare a termine azioni amministrative. Questo può proteggerti da account moderatori o amministrativi compromessi. [Attivalo nelle impostazioni di moderazione](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Requisito 2FA per la moderazione mancante</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Attivando Esplora, ti impegni a rispettare le nostre [linee guida dei server in Esplora.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Soddisfa i requisiti di età</string>
     <string name="guild_settings_discovery_checklist_age_description">I server in Esplora devono avere almeno %1$s.</string>
@@ -2533,7 +2527,6 @@ Qui troverai anche analisi dei dati di Canali delle notizie, Esplora server e Sc
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Aumenta il numero di comunicatori settimanali</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Un comunicatore è una persona che ha parlato (via voce o testo) sul server. Tenere eventi di community o proporre argomenti di discussione sono ottimi modi per incoraggiare più persone a parlare.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">media comunicatori settimanali sul tuo server</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Al tuo server servono più membri che visitino e parlino ogni settimana.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Ottimo lavoro! Il tuo server soddisfa tutti i requisiti per essere in Esplora server.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Il nostro obiettivo è consigliare solo server attivi agli utenti di Discord, perciò i server in Esplora devono mantenere un livello minimo di attività.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Clicca qui per ulteriori dettagli</string>
@@ -2549,7 +2542,6 @@ Qui troverai anche analisi dei dati di Canali delle notizie, Esplora server e Sc
     <string name="guild_settings_discovery_checklist_nsfw_description">Il nome del tuo server, la descrizione e il nome del canale sembrano puliti!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Parolacce trovate</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">minimo necessario</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">"Devi migliorare l'esperienza di integrazione dei tuoi nuovi membri."</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">"Migliora l'esperienza per i nuovi membri"</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"I server che guadagnano più di 10 membri alla settimana devono mantenerne il 10%%, come minimo. Almeno 1 nuova persona su 10 deve frequentare il server per più di una settimana.
 
@@ -2559,7 +2551,6 @@ Mettiti nei panni di un nuovo membro che osserva il tuo server. Ci sono elementi
     <string name="guild_settings_discovery_checklist_safe_description">"Grazie per l'impegno nel rispettare le Linee guida della community e per mantenere il server sicuro!"</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Il tuo server ha $[violato i nostri Termini di Servizio](doesNotHook) negli ultimi 30 giorni.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Il tuo server ha violato i nostri [Termini di Servizio](%1$s) o le [Linee guida dei Server di Community](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Segnalato da Sicurezza &amp; Assistenza</string>
     <string name="guild_settings_discovery_checklist_score_explain">È calcolata come media mobile nel corso delle 8 settimane passate, perciò certi cambiamenti potrebbero richiedere qualche settimana per diventare visibili. Vengono contati come visitatori o comunicatori solo gli utenti che sono su Discord da più di 8 settimane.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ membri</string>
     <string name="guild_settings_discovery_checklist_size_description">Per ora, Esplora è riservato ai server con più di %1$s membri.</string>
@@ -3827,7 +3818,6 @@ attaccati… per ora."</string>
     <string name="no_thanks">No, grazie</string>
     <string name="no_user_limit">Nessun limite</string>
     <string name="no_video_devices">Nessuna videocamera</string>
-    <string name="no_video_permission_dialog_body">Per attivare il tuo video in questo canale vocale, chiedi agli amministratori del server di modificare i tuoi permessi video.</string>
     <string name="no_video_permission_dialog_title">Nessun permesso video</string>
     <string name="noise_cancellation_off">Riduzione del rumore Off</string>
     <string name="noise_cancellation_on">Riduzione del rumore On</string>
@@ -4044,6 +4034,7 @@ Hai ricevuto un link d'invito da un amico? Inserisci il tuo link o codice di inv
     <string name="one_user_typing">**%1$s** sta scrivendo…</string>
     <string name="ongoing_call">Chiamata in corso</string>
     <string name="ongoing_call_connected_users">Chiamata in corso — %1$s connessi</string>
+    <string name="ongoing_call_tap_to_join">— Tocca per unirti</string>
     <string name="ongoing_call_voice_quality_low">Oh no, una barra rossa gigante. La tua connessione sta avendo dei problemi.</string>
     <string name="ongoing_call_you_are_all_alone">"Sei da solo in questa chiamata. 
  Le altre persone nella chat possono unirsi in qualsiasi momento."</string>
@@ -4124,7 +4115,6 @@ Inoltre, l'overlay potrebbe non funzionare per tutti. Per problemi o domande, da
     <string name="paginator_of_pages">Pagina %1$s di %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Il Twitter di Discord dovrebbe contenere più informazioni.</string>
-    <string name="partner_badge_tooltip">Partner di Discord</string>
     <string name="password_length_error">Le password devono essere tra i 6 e i 128 caratteri</string>
     <string name="password_manager">Gestore di password</string>
     <string name="password_manager_info_android">"Se utilizzi un gestore di password, devi attivarlo nelle Impostazioni dell'accessibilità -> Servizi scaricati. Non preoccuparti, possiamo condurti lì."</string>
@@ -4624,7 +4614,6 @@ quando il gioco è in primo piano."</string>
     <string name="public_updates_channel_title">Canale esclusivo per i moderatori</string>
     <string name="publish_followed_news_body">Questo messaggio verrà inviato a tutti server che seguono questo canale. Puoi modificare o cancellare il messaggio più tardi, esso verrà poi aggiornato di conseguenza su tutti i server che seguono.</string>
     <string name="publish_followed_news_body_reach">Questo messaggio verrà inviato ai **%1$s server** che seguono questo canale. Puoi modificare o cancellare il messaggio più tardi, verrà poi aggiornato di conseguenza su ognuno dei server che seguono.</string>
-    <string name="publish_followed_news_body_settings">Visualizza più statistiche su Impostazioni del server.</string>
     <string name="publish_followed_news_fail_body">"Hai raggiunto il limite massimo di 10 messaggi pubblicati in un'ora. Tuttavia apprezziamo il tuo entusiasmo; pertanto potrai inviare di nuovo messaggi tra %1$s."</string>
     <string name="publish_followed_news_fail_title">Ops, è apparsa una finestra pop-up selvatica.</string>
     <string name="publish_followed_news_generic_body">Mi dispiace, qualcosa è andato storto.</string>
@@ -4973,7 +4962,6 @@ te stesso prima di riprovare."</string>
 Questi messaggi saranno udibili da chiunque abbia il canale in primo piano."</string>
     <string name="server_deafen">Silenzia server</string>
     <string name="server_deafened">Server silenziato</string>
-    <string name="server_deafened_dialog_body">Per ascoltare in questo canale, chiedi agli amministratori del server di riattivare il tuo audio.</string>
     <string name="server_deafened_dialog_title">Server silenziato</string>
     <string name="server_desciption_empty">Diffondi il verbo di Discord su questo server.</string>
     <string name="server_emoji">Emoji del server</string>
@@ -4983,7 +4971,6 @@ Questi messaggi saranno udibili da chiunque abbia il canale in primo piano."</st
     <string name="server_insights">Dati del server</string>
     <string name="server_mute">Silenziamento nel server</string>
     <string name="server_muted">Server silenziato</string>
-    <string name="server_muted_dialog_body">Per parlare in questo canale, chiedi agli amministratori del server di togliere il silenziamento al tuo microfono.</string>
     <string name="server_muted_dialog_title">Server silenziato</string>
     <string name="server_name_required">Devi aggiungere un nome al server.</string>
     <string name="server_options">Opzioni del server</string>
@@ -5783,7 +5770,6 @@ Per continuare a usare Discord, **dobbiamo verificare il tuo account.**"</string
     <string name="verification_verified">E-mail verificata!</string>
     <string name="verification_verifying">"Verifica dell'e-mail in corso"</string>
     <string name="verified_bot_tooltip">Bot verificato</string>
-    <string name="verified_developer_badge_tooltip">Sviluppatore bot verificato</string>
     <string name="verify">Verifica</string>
     <string name="verify_account">Verifica account</string>
     <string name="verify_by">Verifica tramite</string>
@@ -5943,7 +5929,6 @@ o ti serve aiuto."</string>
     <string name="xbox_game_pass_promotion_account_credit_title">Credito abbonamento</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 mesi)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Ci dispiace, pare tu abbia già un abbonamento Nitro. Tuttavia, puoi dare il tuo URL di riscatto a un amico e inviargli 3 mesi di Nitro gratuiti.</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Visto che hai un Xbox Game Pass, ti regaliamo 3 mesi di Discord Nitro!</string>
     <string name="xbox_link">Collega</string>
     <string name="xbox_pin_step1">"Apri l'app Discord sul tuo smartphone"</string>
     <string name="xbox_pin_step2">Vai in Impostazioni utente > Collegamenti > Aggiungi</string>
diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml
index a0359bdb47..b05b86eca8 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -2309,9 +2309,9 @@ Black Lives Matter（黒人の命を粗末にするな） {fixed}
     <string name="guild_owner">サーバー管理人</string>
     <string name="guild_partner_application_category_description">以下のカテゴリーのうち、あなたのサーバーに最も当てはまるものを選んでください。</string>
     <string name="guild_partner_application_category_label">カテゴリー</string>
-    <string name="guild_partner_application_connect">コンテンツを作成しているアカウントを接続してください</string>
     <string name="guild_partner_application_content_platform">コンテンツを作成しているのは主にどこですか？</string>
     <string name="guild_partner_application_country">国</string>
+    <string name="guild_partner_application_creator_connect">コンテンツを作成しているアカウントを接続してください</string>
     <string name="guild_partner_application_description_description">あなたのサーバーについて教えてください。何のため、誰のためのサーバーでしょうか？</string>
     <string name="guild_partner_application_description_title">サーバーの概要</string>
     <string name="guild_partner_application_first_name">名前</string>
@@ -2326,11 +2326,7 @@ Black Lives Matter（黒人の命を粗末にするな） {fixed}
     <string name="guild_partner_application_server_step_title">あなたのコミュニティのテーマは？</string>
     <string name="guild_partner_application_subcategory_description">サブカテゴリーも5つまで選択できます。</string>
     <string name="guild_partner_application_submit_step">申請を送信する</string>
-    <string name="guild_partner_application_submit_step_description">通常、X 日以内にご連絡をさしあげています。</string>
-    <string name="guild_partner_application_submit_step_description_2">パートナー申請はDiscordがひとつひとつ確認しています。申請しても受理されない場合がありますので、ご了承ください。</string>
-    <string name="guild_partner_application_submit_step_title">送信したら終了です！</string>
     <string name="guild_partner_application_title">Discordパートナープログラムに申請する</string>
-    <string name="guild_partner_application_type">サーバーの種類</string>
     <string name="guild_partner_application_type_brand">ビジネス / ブランド</string>
     <string name="guild_partner_application_type_content">コンテンツクリエイター / パーソナリティ</string>
     <string name="guild_partner_application_type_fan">利益団体またはファンコミュニティ</string>
@@ -2565,8 +2561,6 @@ Black Lives Matter（黒人の命を粗末にするな） {fixed}
     <string name="guild_settings_discovery_byline">発見の参加要件を満たして有効化すれば、あなたのサーバーが[サーバー発見](onClick)に表示されます。最高の第一印象を与えましょう！</string>
     <string name="guild_settings_discovery_checklist_2fa">管理の二要素認証が有効化されました</string>
     <string name="guild_settings_discovery_checklist_2fa_description">管理権限のあるメンバー（例：アドミン、MOD）が管理アクションを行うには、二要素認証を有効化している必要があります。</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">管理権限のある各メンバーが管理アクションを行うには、二要素認証を有効化している必要があります。こうすることで、管理者やMODアカウントの侵害を防止できます。[管理設定で有効化してください](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">管理の二要素認証がありません</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Discoveryを有効化すると、[発見サーバーガイドライン](%1$s)の適用対象となることに同意したことになります。</string>
     <string name="guild_settings_discovery_checklist_age">期間要件を満たしている</string>
     <string name="guild_settings_discovery_checklist_age_description">発見内のサーバーは、%1$s以上経過している必要があります。</string>
@@ -2580,7 +2574,6 @@ Black Lives Matter（黒人の命を粗末にするな） {fixed}
     <string name="guild_settings_discovery_checklist_communicator_failing_action">週あたりのコミュニケーター数を増やす</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">コミュニケーターとは、サーバーで（ボイスまたはテキストで）おしゃべりした人のことです。サーバーでおしゃべりしていく人の数を増やしたい場合は、コミュニティイベントの開催やディスカッション・トピックの提供などをおすすめします。</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">あなたのサーバーの週間平均コミュニケーター数</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">毎週サーバーを訪れておしゃべりしていくメンバーの数を増やす必要があります。</string>
     <string name="guild_settings_discovery_checklist_good_standing">おめでとうございます！あなたのサーバーは、サーバー発見の参加要件を満たしています。</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Discordユーザーにアクティブなサーバーのみをおすすめする目的上、「サーバー発見」のサーバーは最低限の活動レベルを満たしている必要があります。</string>
     <string name="guild_settings_discovery_checklist_health_view_details">詳しくはこちらをクリックしてください。</string>
@@ -2596,7 +2589,6 @@ Black Lives Matter（黒人の命を粗末にするな） {fixed}
     <string name="guild_settings_discovery_checklist_nsfw_description">あなたのサーバー名、概要、チャンネル名はクリーンです！</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">不適切な言葉がありました</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">必要条件</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">サーバー初参加時の体験を改善する必要があります。</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">新メンバーの体験をもっと快適にする</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"毎週10人を超える新メンバーが加入するサーバーは、新メンバー保持率が10%%以上でなければなりません。このためには、新規加入した10人のうち、少なくとも1人は1週間以上サーバーに残る必要があります。
 
@@ -2606,7 +2598,6 @@ Black Lives Matter（黒人の命を粗末にするな） {fixed}
     <string name="guild_settings_discovery_checklist_safe_description">コミュニティガイドラインを尊重し、サーバーの安全性を守っていただき、ありがとうございます。</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">あなたのサーバーは、過去30日以内に$[サービス利用規約への違反](doesNotHook)がありました。</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">あなたのサーバーは、[サービス利用規約](%1$s)または[コミュニティサーバーガイドライン](%2$s)への違反がありました。</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Discord安心サポートチームによる警告</string>
     <string name="guild_settings_discovery_checklist_score_explain">過去8週間の移動平均として計算されているため、変化が反映されるのに数週間かかる場合があります。8週間以上Discordを使用していなかったユーザーのみがビジターまたはコミュニケーターとして数えられます。</string>
     <string name="guild_settings_discovery_checklist_size">メンバー%1$s人以上</string>
     <string name="guild_settings_discovery_checklist_size_description">現在、発見は%1$s以上のメンバーを有するサーバー限定となっています。</string>
@@ -3887,7 +3878,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="no_thanks">やめておく</string>
     <string name="no_user_limit">制限なし</string>
     <string name="no_video_devices">ビデオデバイスがありません</string>
-    <string name="no_video_permission_dialog_body">このボイスチャンネルでビデオをつけるには、サーバー管理者にビデオ権限の変更を要請してください。</string>
     <string name="no_video_permission_dialog_title">ビデオ権限がありません</string>
     <string name="noise_cancellation_off">ノイズ抑制OFF</string>
     <string name="noise_cancellation_on">ノイズ抑制ON</string>
@@ -4104,6 +4094,7 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="one_user_typing">**%1$s**が入力中…</string>
     <string name="ongoing_call">通話中</string>
     <string name="ongoing_call_connected_users">通話中 ― %1$s人が接続中</string>
+    <string name="ongoing_call_tap_to_join">— タップして参加</string>
     <string name="ongoing_call_voice_quality_low">ああ、大きなレッドバーです。接続に苦労しています。</string>
     <string name="ongoing_call_you_are_all_alone">"この通話で1人です。 
  このチャットのメンバーならいつでも参加できます。"</string>
@@ -4185,7 +4176,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="paginator_of_pages">%1$s ページの %2$s ページ目</string>
     <string name="partial_outage">他%1$s</string>
     <string name="partial_outage_a11y">%1$sDiscordのTwitterで詳細が分かるはずです。</string>
-    <string name="partner_badge_tooltip">Discordパートナー</string>
     <string name="password_length_error">パスワードは6～128文字です</string>
     <string name="password_manager">パスワードマネージャー</string>
     <string name="password_manager_info_android">パスワードマネージャーを使用する場合は、[アクセス可能設定] > [ダウンロードサービス]で許可する必要があります。ご心配なく、ご案内いたします。</string>
@@ -4684,7 +4674,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="public_updates_channel_title">モデレーター専用チャンネル</string>
     <string name="publish_followed_news_body">このチャンネルをフォローしている全てのサーバーにこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。</string>
     <string name="publish_followed_news_body_reach">このチャンネルをフォローしている**%1$sサーバー**にこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。</string>
-    <string name="publish_followed_news_body_settings">サーバー設定でさらに統計を見ることができます。</string>
     <string name="publish_followed_news_fail_body">1時間にメッセージを10通公開したため、制限に達しました。 でもその熱意は最高です。%1$s後にお試しください。</string>
     <string name="publish_followed_news_fail_title">おや、ポップアップボックスです。</string>
     <string name="publish_followed_news_generic_body">すみません、問題が発生しました。</string>
@@ -5033,7 +5022,6 @@ Discordについて詳しい情報が必要ですか？"</string>
 可能です。"</string>
     <string name="server_deafen">サーバー側スピーカーミュート</string>
     <string name="server_deafened">サーバー側スピーカーミュート中</string>
-    <string name="server_deafened_dialog_body">このチャンネルで発言を聴くには、サーバー管理者にスピーカーミュート解除を要請してください。</string>
     <string name="server_deafened_dialog_title">サーバー側スピーカーミュート中</string>
     <string name="server_desciption_empty">このサーバーを世界にご紹介ください。</string>
     <string name="server_emoji">サーバー絵文字</string>
@@ -5043,7 +5031,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="server_insights">サーバーインサイト</string>
     <string name="server_mute">サーバーミュート</string>
     <string name="server_muted">サーバーがミュート状態</string>
-    <string name="server_muted_dialog_body">このチャンネルで発言するには、サーバー管理者にミュート解除を要請してください。</string>
     <string name="server_muted_dialog_title">サーバーがミュート状態</string>
     <string name="server_name_required">サーバー名が必要です。</string>
     <string name="server_options">サーバー設定</string>
@@ -5857,7 +5844,6 @@ Discordを続けて使用するには、**お客様のアカウントを確認
     <string name="verification_verified">メールが認証されました！</string>
     <string name="verification_verifying">メールを認証しています</string>
     <string name="verified_bot_tooltip">認証Bot</string>
-    <string name="verified_developer_badge_tooltip">認証Botデベロッパー</string>
     <string name="verify">認証</string>
     <string name="verify_account">アカウントの認証</string>
     <string name="verify_by">認証対象</string>
@@ -6019,7 +6005,6 @@ Discordを続けて使用するには、**お客様のアカウントを確認
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass（3ヶ月）</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">すでにNitro講読中のようです。代わりにあなたの利用URLをお友達に送って、Nitroの3ヶ月間無料購読をプレゼントされてはいかがでしょうか。</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">申し訳ありません。</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Xbox Game Passをお持ちですので、Nitroを3ヶ月無料でご利用いただけます！</string>
     <string name="xbox_link">リンク</string>
     <string name="xbox_pin_step1">自分の電話でDiscordアプリを開く</string>
     <string name="xbox_pin_step2">[設定] > [接続] > [追加]と進みます</string>
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index 8755d3179a..cd19834d39 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -2300,9 +2300,9 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_owner">서버 주인</string>
     <string name="guild_partner_application_category_description">다음 중 서버에 알맞은 카테고리는 어느 것인가요?</string>
     <string name="guild_partner_application_category_label">카테고리</string>
-    <string name="guild_partner_application_connect">콘텐츠 만드는 곳에 계정 연동</string>
     <string name="guild_partner_application_content_platform">주로 어디서 콘텐츠를 만드시나요?</string>
     <string name="guild_partner_application_country">국적</string>
+    <string name="guild_partner_application_creator_connect">콘텐츠 만드는 곳에 계정 연동</string>
     <string name="guild_partner_application_description_description">서버 소개 좀 해주세요. 서버 주제는 무엇인가요? 누구를 대상으로 하죠?</string>
     <string name="guild_partner_application_description_title">서버 설명</string>
     <string name="guild_partner_application_first_name">이름</string>
@@ -2317,11 +2317,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_partner_application_server_step_title">커뮤니티 주제가 무엇인가요?</string>
     <string name="guild_partner_application_subcategory_description">최대 5개의 하위 카테고리를 추가로 선택할 수 있습니다.</string>
     <string name="guild_partner_application_submit_step">지원서 내기</string>
-    <string name="guild_partner_application_submit_step_description">X일 후 연락드릴게요.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord는 모든 파트너 지원서를 검토해요. 지원한다고 꼭 파트너가 되는 건 아니라는 걸 잊지 마세요.</string>
-    <string name="guild_partner_application_submit_step_title">지원서를 내면 끝이에요!</string>
     <string name="guild_partner_application_title">Discord 파트너 프로그램 지원하기</string>
-    <string name="guild_partner_application_type">서버 유형</string>
     <string name="guild_partner_application_type_brand">사업 / 브랜드</string>
     <string name="guild_partner_application_type_content">콘텐츠 크리에이터 / 유명인</string>
     <string name="guild_partner_application_type_fan">관심 그룹 또는 팬 커뮤니티</string>
@@ -2556,8 +2552,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_discovery_byline">서버 찾기 등록 조건을 얻은 뒤 활성화하면, 서버가 [서버 찾기](onClick)에 나타나요. 첫인상이 중요해요!</string>
     <string name="guild_settings_discovery_checklist_2fa">관리용 2단계 인증 요구 조건 활성화됨</string>
     <string name="guild_settings_discovery_checklist_2fa_description">관리 권한이 있는 멤버들(예. 관리자, 모드)이 관리 행위를 하려면 2단계 인증을 활성화해야 해요.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">관리 권한이 있는 모든 멤버가 관리 행위를 수행하려면 2단계 인증을 활성화해야 해요. 이는 비정상적인 관리자 계정이나 모드 계정으로부터 서버를 보호하기 위해서랍니다. [관리 설정에서 활성화하기](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">관리용 2단계 인증 요구 조건 찾을 수 없음</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">찾기를 활성화하면 [찾을 수 있는 서버 가이드라인](%1$s)을 준수하는 데 동의하게 됩니다.</string>
     <string name="guild_settings_discovery_checklist_age">수명 요건 충족</string>
     <string name="guild_settings_discovery_checklist_age_description">서버 찾기에 표시되려면 서버가 생성된 지 최소 %1$s가 지나야 해요.</string>
@@ -2571,7 +2565,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_discovery_checklist_communicator_failing_action">주간 대화 참여자 수 늘리기</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">서버에서 대화(음성 또는 문자)하면 대화 참여자로 인정돼요. 커뮤니티 이벤트를 주최하고 얘기할 주제를 제공하면 더 많은 사람이 대화에 참여할 거예요.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">서버의 주 평균 대화 참여자 수</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">매주 서버를 방문하거나 대화에 참여하는 멤버 수가 부족해요.</string>
     <string name="guild_settings_discovery_checklist_good_standing">잘하셨어요! 서버 찾기에 노출되기 위한 모든 조건을 만족하네요.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">활성화된 서버만 Discord 사용자들에게 추천하고 있어요. 그러려면 찾기 결과로 나오는 서버들은 최소한의 활동 수준을 유지해야겠죠.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">여기를 클릭해 자세히 알아보기</string>
@@ -2587,7 +2580,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_discovery_checklist_nsfw_description">서버 이름, 설명, 채널 이름 모두 괜찮네요!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">부적합한 단어 발견됨</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">최소 요건</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">새로운 멤버들이 들어오도록 환경을 개선해야 해요.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">새 멤버를 위한 환경 개선</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"주당 신규 멤버가 10명 이상인 서버는 새 멤버 수 중 10%%를 유지해야 해요. 새로 참여한 멤버들 중 최소 10명에 1명은 일주일 이상 머물러야 하죠.
 
@@ -2597,7 +2589,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_discovery_checklist_safe_description">커뮤니티 지침을 준수하고, 안전한 서버를 만들어주셔서 감사합니다!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">해당 서버는 지난 30일 이내에 $[이용약관 위반](doesNotHook)이 적발되었습니다.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">해당 서버는 [이용 약관](%1$s) 또는 [커뮤니티 서버 지침](%2$s)을 위반했습니다.</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">보안팀에 의해 제재됨</string>
     <string name="guild_settings_discovery_checklist_score_explain">지난 8주간의 평균값으로 계산되므로, 변경 사항이 반영되는 데는 몇 주가 걸릴 수 있어요. Discord에 가입한 지 8주가 지난 사용자만 방문자나 대화 참여자로 집계돼요.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s명 이상</string>
     <string name="guild_settings_discovery_checklist_size_description">지금은 멤버가 최소 %1$s명이 넘는 서버만 서버 찾기에 등록할 수 있어요.</string>
@@ -3876,7 +3867,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="no_thanks">사양할게요</string>
     <string name="no_user_limit">제한 없음</string>
     <string name="no_video_devices">영상 장치 없음</string>
-    <string name="no_video_permission_dialog_body">이 음성 채널에서 영상을 켜려면 서버 관리자에게 영상 권한을 바꿔달라고 하세요.</string>
     <string name="no_video_permission_dialog_title">영상 권한 없음</string>
     <string name="noise_cancellation_off">잡음 제거 꺼짐</string>
     <string name="noise_cancellation_on">잡음 제거 켜짐</string>
@@ -4092,6 +4082,7 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="one_user_typing">**%1$s** 님이 입력하고 있어요…</string>
     <string name="ongoing_call">송신 전화</string>
     <string name="ongoing_call_connected_users">송신 전화 — %1$s명 연결 완료</string>
+    <string name="ongoing_call_tap_to_join">— 탭으로 입장</string>
     <string name="ongoing_call_voice_quality_low">이런, 빨간 막대네요. 연결 상태가 안 좋으세요.</string>
     <string name="ongoing_call_you_are_all_alone">"혼자 통화 중이세요. 
 이 채팅의 다른 사람들이 언제든 들어올 수 있어요."</string>
@@ -4173,7 +4164,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="paginator_of_pages">%1$s 페이지 중 %2$s 페이지</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">현재 %1$s Discord의 Twitter에서 관련 정보가 있는지 확인해 보세요.</string>
-    <string name="partner_badge_tooltip">Discord 파트너</string>
     <string name="password_length_error">비밀번호는 6에서 128자리 사이여야 해요</string>
     <string name="password_manager">비밀번호 관리자</string>
     <string name="password_manager_info_android">비밀번호 관리자를 사용하려면 접근성 설정 -> 다운로드한 서비스에서 허용해야 해요. 걱정하지 마세요, 안내해 드릴게요.</string>
@@ -4672,7 +4662,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="public_updates_channel_title">모드 전용 채널</string>
     <string name="publish_followed_news_body">이 채널을 팔로우하는 모든 서버에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.</string>
     <string name="publish_followed_news_body_reach">이 채널을 팔로우하는 서버 **%1$s개**에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.</string>
-    <string name="publish_followed_news_body_settings">서버 설정에서 다른 통계도 살펴보세요.</string>
     <string name="publish_followed_news_fail_body">메시지는 시간당 10개까지만 발행할 수 있어요. 하지만 저희는 열정을 높이 사죠. %1$s 후에 다시 해보세요.</string>
     <string name="publish_followed_news_fail_title">이런, 팝업이 떴어요.</string>
     <string name="publish_followed_news_generic_body">죄송해요, 무언가가 잘못됐어요.</string>
@@ -5022,7 +5011,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
 채널을 보고 있는 모든 사람에게 전달돼요."</string>
     <string name="server_deafen">서버 헤드셋 음소거</string>
     <string name="server_deafened">서버에서 헤드셋 음소거함</string>
-    <string name="server_deafened_dialog_body">이 채널에서 소리를 들으려면 서버 관리자에게 헤드셋 음소거를 해제해달라고 하세요.</string>
     <string name="server_deafened_dialog_title">서버에서 헤드셋 음소거함</string>
     <string name="server_desciption_empty">이 서버에 대해 간단하게 설명해 주세요.</string>
     <string name="server_emoji">서버 이모티콘</string>
@@ -5032,7 +5020,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="server_insights">서버 인사이트</string>
     <string name="server_mute">서버 소리 끄기</string>
     <string name="server_muted">서버 알림 꺼짐</string>
-    <string name="server_muted_dialog_body">이 채널에서 말하려면 서버 관리자에게 음소거를 해제해달라고 하세요.</string>
     <string name="server_muted_dialog_title">서버 알림 꺼짐</string>
     <string name="server_name_required">서버 이름을 입력해 주세요.</string>
     <string name="server_options">서버 옵션</string>
@@ -5845,7 +5832,6 @@ Discord를 계속 이용하려면 **계정을 인증해야 해요.**"</string>
     <string name="verification_verified">이메일 인증 완료!</string>
     <string name="verification_verifying">이메일 인증 중</string>
     <string name="verified_bot_tooltip">인증된 봇</string>
-    <string name="verified_developer_badge_tooltip">인증된 봇 개발자</string>
     <string name="verify">인증하기</string>
     <string name="verify_account">계정 인증</string>
     <string name="verify_by">인증 방법</string>
@@ -6007,7 +5993,6 @@ Discord를 계속 이용하려면 **계정을 인증해야 해요.**"</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3개월)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">죄송해요. 이미 Nitro 구독자이신 것 같네요. 하지만 갖고 계신 Nitro 3개월 등록 URL은 친구에게 선물할 수 있답니다.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">이런!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Xbox Game Pass가 이미 있으시네요. 대신 Nitro를 3개월간 무료로 이용하세요!</string>
     <string name="xbox_link">연결</string>
     <string name="xbox_pin_step1">휴대전화에서 Discord 앱 열기</string>
     <string name="xbox_pin_step2">설정 > 연결 > 추가로 이동하세요.</string>
diff --git a/com.discord/res/values-land/styles.xml b/com.discord/res/values-land/styles.xml
index ff28ea5da2..c4ec961d39 100644
--- a/com.discord/res/values-land/styles.xml
+++ b/com.discord/res/values-land/styles.xml
@@ -10,12 +10,12 @@
         <item name="android:layout_marginStart">20.0dip</item>
     </style>
     <style name="UiKit.Auth.Note.Rotatable" parent="@style/UiKit.TextView">
-        <item name="android:paddingTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingTop">8.0dip</item>
+        <item name="android:paddingBottom">8.0dip</item>
     </style>
     <style name="UiKit.Copy" parent="@style/UiKit.ViewGroup.LinearLayout">
         <item name="android:gravity">center</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
     <style name="UiKit.Copy.Anchor" parent="@style/UiKit.Copy.Anchor.Base">
@@ -30,7 +30,7 @@
     </style>
     <style name="UiKit.User.Phone.Add.Confirm" parent="@style/UiKit.Material.Button">
         <item name="android:layout_width">160.0dip</item>
-        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginStart">16.0dip</item>
     </style>
     <style name="UiKit.User.Phone.Add.Number" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <item name="android:layout_width">wrap_content</item>
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index 5a850cc551..906b812627 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -2272,9 +2272,9 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="guild_owner">Serverio Savininkas</string>
     <string name="guild_partner_application_category_description">Kurios iš šių kategorijų geriausiai apibūdina tavo serverį?</string>
     <string name="guild_partner_application_category_label">Kategorijos</string>
-    <string name="guild_partner_application_connect">Susiek paskyras, kuriose kuri turinį</string>
     <string name="guild_partner_application_content_platform">Kur dažniausiai kuri turinį?</string>
     <string name="guild_partner_application_country">Šalis</string>
+    <string name="guild_partner_application_creator_connect">Susiek paskyras, kuriose kuri turinį</string>
     <string name="guild_partner_application_description_description">Pateik informacijos apie savo serverį. Apie ką jis? Kam jis skirtas?</string>
     <string name="guild_partner_application_description_title">Serverio aprašas</string>
     <string name="guild_partner_application_first_name">Vardas</string>
@@ -2289,11 +2289,7 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="guild_partner_application_server_step_title">Ką tavo bendruomenė veikia?</string>
     <string name="guild_partner_application_subcategory_description">Taip pat gali pasirinkti iki 5 subkategorijų.</string>
     <string name="guild_partner_application_submit_step">Pateikti paraišką</string>
-    <string name="guild_partner_application_submit_step_description">Dažniausiai susisiekiame per X d.</string>
-    <string name="guild_partner_application_submit_step_description_2">Kiekvieną partnerio paraišką peržiūri Discord. Atminkite, kad teikiant paraišką negarantuojama partnerystė.</string>
-    <string name="guild_partner_application_submit_step_title">Tiesiog pateik ir viskas bus atlikta!</string>
     <string name="guild_partner_application_title">Taikyti Discord partnerių programai</string>
-    <string name="guild_partner_application_type">Serverio tipas</string>
     <string name="guild_partner_application_type_brand">Verslas / prekės ženklas</string>
     <string name="guild_partner_application_type_content">Turinio kūrėjas / asmenybė</string>
     <string name="guild_partner_application_type_fan">Interesų grupė arba sirgalių bendruomenė</string>
@@ -2528,8 +2524,6 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="guild_settings_discovery_byline">Kai įvykdysi reikalavimus ir įjungsi atradimo funkciją, tavo serveris bus rodomas [serverių atradimo sąraše](onClick). Pasiruošk sudaryti gerą įspūdį!</string>
     <string name="guild_settings_discovery_checklist_2fa">2FA reikalavimas moderavimui įjungtas</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Moderavimo galių turintiems nariams (pvz., administratoriams arba moderatoriams) privaloma įjungti 2FA prieš atliekant moderavimo veiksmus.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Reikalaujama, kad būtų įjungtas visų moderavimo galių turinčių narių 2FA, prieš jiems atliekant moderavimo veiksmus. Tai gali apsaugoti nuo administratorių arba moderatorių paskyrų, į kurias įsilaužta. [Įjunk moderavimo nustatymuose](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Nėra 2FA reikalavimo moderavimui</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Įjungdamas atradimo funkciją sutinki laikytis [atrandamojo serverio gairių.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Atitinka senumo reikalavimą</string>
     <string name="guild_settings_discovery_checklist_age_description">Atradimo sąraše esantys serveriai turi būti bent %1$s senumo.</string>
@@ -2543,7 +2537,6 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Padidink bendraujančių lankytojų per savaitę skaičių</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Bendraujantis lankytojas yra žmogus, kuris kalbėjosi (balsu ar tekstu) serveryje. Bendruomenės renginių rengimas ir diskusijos temų siūlymas yra puikūs būdai paskatinti daugiau žmonių kalbėtis.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">vidutinis bendraujančių lankytojų per savaitę skaičius tavo serveryje</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Tavo serveriui reikia daugiau narių, kurie apsilanko ir kalbasi kiekvieną savaitę.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Šaunumėlis! Tavo serveris atitinka visus įtraukimo į serverių atradimo sąrašą reikalavimus.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Norime rekomenduoti Discord naudotojams tik aktyvius serverius, todėl serveriai atradimo sąraše turi pasiekti minimalų aktyvumo lygį.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Jei reikia išsamesnės informacijos, spustelėk čia</string>
@@ -2559,7 +2552,6 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="guild_settings_discovery_checklist_nsfw_description">Tavo serverio pavadinimas, aprašas ir kanalų pavadinimai atrodo tinkami!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Aptikta keiksmažodžių</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">reikia mažiausiai</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Tau reikia pagerinti naujų narių įspūdžius.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Pagerink naujų narių įspūdžius</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Serveriai, kurie gauna daugiau nei 10 naujų narių per savaitę, privalo turėti 10 %% siekiantį naujų narių išlaikymo rodiklį. Bent 1 iš 10 naujų prisijungiančių žmonių turi likti savaitę arba daugiau.
 
@@ -2569,7 +2561,6 @@ Pažvelk į savo serverį naujo nario akimis. Ar yra vietų, kuriose jie gali su
     <string name="guild_settings_discovery_checklist_safe_description">Dėkojame, kad laikaisi mūsų bendruomenės gairių ir užtikrini savo serverio saugumą!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Per pastarąsias 30 dienų tavo serveris $[pažeidė mūsų Paslaugų teikimo sąlygas](doesNotHook).</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Tavo serveris pažeidė mūsų [Paslaugų teikimo sąlygas](%1$s) arba [bendruomenės serverio gaires](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Pažymėjo pasitikėjimo ir saugumo užtikrinimo komanda</string>
     <string name="guild_settings_discovery_checklist_score_explain">Tai yra slankusis pastarųjų 8 savaičių vidurkis, todėl gali užtrukti kelias savaites, kol pasirodys pokyčiai. Kaip lankytojai arba bendraujantys lankytojai skaičiuojami tik tie naudotojai, kurie naudojasi Discord ne mažiau kaip 8 savaites.</string>
     <string name="guild_settings_discovery_checklist_size">Narių: %1$s+</string>
     <string name="guild_settings_discovery_checklist_size_description">Kol kas atradimo funkciją gali naudoti tik tie serveriai, kuriuose narių yra daugiau nei %1$s.</string>
@@ -3848,7 +3839,6 @@ jokių prisegtų žinučių… Kol kas."</string>
     <string name="no_thanks">Ne, ačiū</string>
     <string name="no_user_limit">Neapribota</string>
     <string name="no_video_devices">Nėra Vaizdo Įrenginių</string>
-    <string name="no_video_permission_dialog_body">Jei nori įjungti savo vaizdą šiame balso kanale, paprašyk serverio administratorių, kad pakeistų tavo vaizdo leidimus.</string>
     <string name="no_video_permission_dialog_title">Nėra vaizdo leidimo</string>
     <string name="noise_cancellation_off">Išjungti triukšmo slopinimą</string>
     <string name="noise_cancellation_on">Įjungti triukšmo slopinimą</string>
@@ -4065,6 +4055,7 @@ Ar gavai pakvietimo nuorodą iš draugo? Įvesk savo pakvietimo nuorodą arba ko
     <string name="one_user_typing">**%1$s** rašo…</string>
     <string name="ongoing_call">Vykstantis Pokalbis</string>
     <string name="ongoing_call_connected_users">Vykstantis Pokalbis — %1$s Prisijungęs</string>
+    <string name="ongoing_call_tap_to_join">– Spustelėk, kad prisijungtum</string>
     <string name="ongoing_call_voice_quality_low">O ne! Didelė raudona juosta – tavo ryšys stringa.</string>
     <string name="ongoing_call_you_are_all_alone">"Esi vienas šiame skambutyje. 
  Kiti pokalbio dalyviai gali bet kada prisijungti."</string>
@@ -4146,7 +4137,6 @@ Be to, perdanga gali neveikti visiems. Jei turite problemų ar klausimų patikri
     <string name="paginator_of_pages">%1$s puslapis iš %2$s</string>
     <string name="partial_outage">Dėl laikinos perkrovos %1$s</string>
     <string name="partial_outage_a11y">Dėl laikinos perkrovos %1$s Discord Twitter turėtų būti pateikta daugiau informacijos.</string>
-    <string name="partner_badge_tooltip">Discord partneris</string>
     <string name="password_length_error">Slaptažodžius turi sudaryti nuo 6 iki 128 simbolių</string>
     <string name="password_manager">Slaptažodžių Tvarkymo Priemonė</string>
     <string name="password_manager_info_android">Jei naudoji slaptažodžių tvarkymo priemonę, turėsi ją leisti dalyje Pasiekiamumo Nustatymai -> Atsisiųstos Paslaugos. Nesijaudink, galime tave ten perkelti.</string>
@@ -4644,7 +4634,6 @@ galėtum Kalbėti visoje sistemoje."</string>
     <string name="public_updates_channel_title">Tik moderatoriams skirtas kanalas</string>
     <string name="publish_followed_news_body">Šis pranešimas bus išsiųstas į visus šį kanalą sekančius serverius. Šį pranešimą gali redaguoti arba pašalinti vėliau. Atitinkamai jis bus atnaujintas kiekviename sekančiame serveryje.</string>
     <string name="publish_followed_news_body_reach">Šis pranešimas bus išsiųstas **%1$s serverius (-ių)**, sekančius (-ių) šį kanalą. Šį pranešimą gali redaguoti arba pašalinti vėliau. Atitinkamai jis bus atnaujintas kiekviename sekančiame serveryje.</string>
-    <string name="publish_followed_news_body_settings">Daugiau statistikos žiūrėk Serverio nustatymuose.</string>
     <string name="publish_followed_news_fail_body">Pasiekei 10 paskelbtų pranešimų per valandą apribojimą. Tačiau džiaugiamės tavo entuziazmu, todėl pabandyk dar kartą po %1$s.</string>
     <string name="publish_followed_news_fail_title">Oi, iškilo langas.</string>
     <string name="publish_followed_news_generic_body">Apgailestaujame, kažkas įvyko ne taip.</string>
@@ -4993,7 +4982,6 @@ ir pabandyk dar kartą."</string>
 gali girdėti visi, kurie yra šiame kanale."</string>
     <string name="server_deafen">Išjungti serverio garsą</string>
     <string name="server_deafened">Serverio garsas išjungtas</string>
-    <string name="server_deafened_dialog_body">Jei nori klausytis šio kanalo, paprašyk serverio administratorių, kad įjungtų serverio garsą.</string>
     <string name="server_deafened_dialog_title">Serverio garsas išjungtas</string>
     <string name="server_desciption_empty">Papasakok pasauliui šiek tiek apie šį serverį.</string>
     <string name="server_emoji">Serverio Jaustukas</string>
@@ -5003,7 +4991,6 @@ gali girdėti visi, kurie yra šiame kanale."</string>
     <string name="server_insights">Serverio įžvalgos</string>
     <string name="server_mute">Nutildyti serverį</string>
     <string name="server_muted">Serveris nutildytas</string>
-    <string name="server_muted_dialog_body">Jei nori kalbėti šiame kanale, paprašyk serverio administratorių, kad įjungtų tavo balsą.</string>
     <string name="server_muted_dialog_title">Serveris nutildytas</string>
     <string name="server_name_required">Serverio pavadinimas būtinas.</string>
     <string name="server_options">Serverio Nustatymai</string>
@@ -5817,7 +5804,6 @@ Jei nori toliau naudotis Discord, **turėsime patikrinti tavo paskyrą.**"</stri
     <string name="verification_verified">El. Paštas Patvirtintas!</string>
     <string name="verification_verifying">Tikrinamas tavo el. paštas</string>
     <string name="verified_bot_tooltip">Patvirtintas botas</string>
-    <string name="verified_developer_badge_tooltip">Patvirtintas boto kūrėjas</string>
     <string name="verify">Patvirtinti</string>
     <string name="verify_account">Patvirtinti savo paskyrą</string>
     <string name="verify_by">Patvirtinti</string>
@@ -5978,7 +5964,6 @@ kokių nors klausimų."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 mėnesių)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Atsiprašome, atrodo, kad jau turi Nitro prenumeratą. Tačiau gali duoti panaudojimo URL draugui ir padovanoti jam 3 mėnesius nemokamos Nitro prenumeratos.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">O ne!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Kadangi turi Xbox Game Pass, nemokamai gausi 3 mėnesių Nitro prenumeratą!</string>
     <string name="xbox_link">Nuoroda</string>
     <string name="xbox_pin_step1">Atidaryk Discord programėlę savo telefone</string>
     <string name="xbox_pin_step2">Eik į Nustatymai > Sąsajos > Pridėti</string>
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index c735d57eb5..e87f328276 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -2246,9 +2246,9 @@ Hier vind je ook statistische gegevens over aankondigingskanalen, serverontdekki
     <string name="guild_owner">Eigenaar server</string>
     <string name="guild_partner_application_category_description">Welke van de volgende categorieën is het beste van toepassing op jouw server?</string>
     <string name="guild_partner_application_category_label">Categorieën</string>
-    <string name="guild_partner_application_connect">Accounts verbinden waarop je content maakt</string>
     <string name="guild_partner_application_content_platform">Waar maak je voornamelijk content?</string>
     <string name="guild_partner_application_country">Land</string>
+    <string name="guild_partner_application_creator_connect">Accounts verbinden waarop je content maakt</string>
     <string name="guild_partner_application_description_description">Vertel ons iets over je server. Waar gaat hij over? Voor wie is hij?</string>
     <string name="guild_partner_application_description_title">Serverbeschrijving</string>
     <string name="guild_partner_application_first_name">Voornaam</string>
@@ -2263,11 +2263,7 @@ Hier vind je ook statistische gegevens over aankondigingskanalen, serverontdekki
     <string name="guild_partner_application_server_step_title">Wat is het thema van jouw community?</string>
     <string name="guild_partner_application_subcategory_description">Je kunt ook nog maximaal 5 subcategorieën kiezen.</string>
     <string name="guild_partner_application_submit_step">Aanmelding verzenden</string>
-    <string name="guild_partner_application_submit_step_description">We reageren meestal binnen X dagen.</string>
-    <string name="guild_partner_application_submit_step_description_2">Elke partneraanmelding wordt door Discord beoordeeld. Denk eraan, een aanmelding garandeert niet dat je als partner wordt geaccepteerd.</string>
-    <string name="guild_partner_application_submit_step_title">Nu nog versturen en dan ben je klaar!</string>
     <string name="guild_partner_application_title">Meld je aan voor het Discord Partnerprogramma</string>
-    <string name="guild_partner_application_type">Servertype</string>
     <string name="guild_partner_application_type_brand">Zakelijk / Merk</string>
     <string name="guild_partner_application_type_content">Contentmaker / Persoonlijkheid</string>
     <string name="guild_partner_application_type_fan">Interessegroep of fancommunity</string>
@@ -2502,8 +2498,6 @@ Hier vind je ook statistische gegevens over aankondigingskanalen, serverontdekki
     <string name="guild_settings_discovery_byline">Door je voor Ontdekking te kwalificeren en het in te schakelen, verschijnt je server in [serverontdekking.](onClick) Maak een goede indruk!</string>
     <string name="guild_settings_discovery_checklist_2fa">2FA-vereiste voor moderatie ingeschakeld</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Leden met moderatiemacht (zoals beheerders en mods) moeten 2FA inschakelen om te modereren.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Het is hiervoor vereist dat alle leden met moderatiemacht 2FA ingeschakeld hebben voordat ze modererende handelingen uit kunnen voeren. Dit kan bescherming bieden tegen gehackte beheerder- of modaccounts. [Inschakelen in de moderatie-instellingen](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">2FA-vereiste voor moderatie ontbreekt</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Door Ontdekking te activeren ga je akkoord met onze [vindbare-serverrichtlijnen.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Voldoet aan leeftijdsgrens</string>
     <string name="guild_settings_discovery_checklist_age_description">Servers in Ontdekking moeten minstens %1$s oud zijn.</string>
@@ -2517,7 +2511,6 @@ Hier vind je ook statistische gegevens over aankondigingskanalen, serverontdekki
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Vergroot het aantal wekelijkse communicators</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Een communicator is iemand die op de server heeft gepraat (spraak of tekst). Door community-evenementen te hosten en discussieonderwerpen aan te dragen, moedig je mensen aan om te praten.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">gem. aantal wekelijkse communicators op je server</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Je server heeft meer leden nodig die wekelijks langskomen en met elkaar praten.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Goed gedaan! Je server voldoet aan alle vereisten voor serverontdekking.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Om ervoor te zorgen dat we Discord-gebruikers alleen actieve servers aanbevelen, moeten servers in Ontdekking aan een bepaald activiteitsniveau voldoen.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Klik hier voor meer info</string>
@@ -2533,7 +2526,6 @@ Hier vind je ook statistische gegevens over aankondigingskanalen, serverontdekki
     <string name="guild_settings_discovery_checklist_nsfw_description">Je servernaam, beschrijving en kanaalnamen zien er goed uit!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Scheldwoorden gevonden</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">vereist</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Je moet de bekendmakingsprocedure voor nieuwe leden verbeteren.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Verbeter de ervaring voor nieuwe leden</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Servers die meer dan 10 nieuwe leden per week binnenhalen, zijn verplicht 10%% van deze nieuwe leden vast te houden. Minstens 1 van de 10 nieuwe leden moet minimaal een week blijven.
 
@@ -2543,7 +2535,6 @@ Kijk naar je server door de ogen van een nieuw lid. Zouden ze ergens door in de
     <string name="guild_settings_discovery_checklist_safe_description">Bedankt dat je onze Communityrichtlijnen naleeft en ervoor zorgt dat je server veilig is!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Je server was in de afgelopen 30 dagen in $[strijd met onze Servicevoorwaarden](doesNotHook).</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Je server was in strijd met onze [Servicevoorwaarden](%1$s) of [Communityserver-richtlijnen](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Gemarkeerd door het vertrouwens- en veiligheidsteam</string>
     <string name="guild_settings_discovery_checklist_score_explain">Wordt berekend als voortschrijdend gemiddelde over de afgelopen 8 weken, waardoor het een paar weken kan duren voor veranderingen zichtbaar zijn. Alleen gebruikers die al meer dan 8 weken op Discord zitten, worden meegeteld als bezoekers of communicators.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ leden</string>
     <string name="guild_settings_discovery_checklist_size_description">Op dit moment is Ontdekking alleen beschikbaar voor servers met meer dan %1$s leden.</string>
@@ -3801,7 +3792,6 @@ vastgepinde berichten, althans nog niet."</string>
     <string name="no_thanks">Nee, bedankt</string>
     <string name="no_user_limit">Geen beperking</string>
     <string name="no_video_devices">Geen videoapparaten</string>
-    <string name="no_video_permission_dialog_body">Als je video wilt aanzetten in dit spraakkanaal, moet je de serverbeheerders vragen of ze je videomachtigingen willen wijzigen.</string>
     <string name="no_video_permission_dialog_title">Geen videomachtiging</string>
     <string name="noise_cancellation_off">Ruisonderdrukking uit</string>
     <string name="noise_cancellation_on">Ruisonderdrukking aan</string>
@@ -4015,6 +4005,7 @@ Ontving je een uitnodigingslink van een vriend? Voer je uitnodigingslink of -cod
     <string name="one_user_typing">**%1$s** is aan het typen…</string>
     <string name="ongoing_call">Lopend gesprek</string>
     <string name="ongoing_call_connected_users">Lopend gesprek — %1$s verbonden</string>
+    <string name="ongoing_call_tap_to_join">— Tik om lid te worden</string>
     <string name="ongoing_call_voice_quality_low">O nee, een grote, rode balk. Je verbinding heeft het moeilijk.</string>
     <string name="ongoing_call_you_are_all_alone">"Je bent alleen in dit gesprek. 
  Anderen in deze chat kunnen op elk moment meepraten."</string>
@@ -4093,7 +4084,6 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="paginator_of_pages">Pagina %1$s van %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Je vindt meer informatie op het Twitter-account van Discord.</string>
-    <string name="partner_badge_tooltip">Discord-partner</string>
     <string name="password_length_error">Wachtwoorden moeten tussen de zes en 128 tekens lang zijn</string>
     <string name="password_manager">Wachtwoordmanager</string>
     <string name="password_manager_info_android">Als je wachtwoordbeheer gebruikt, moet je dit toestaan in Toegankelijkheidsinstellingen -> Gedownloade services. Maak je geen zorgen, we brengen je erheen.</string>
@@ -4588,7 +4578,6 @@ detectie in te schakelen terwijl de game focus heeft."</string>
     <string name="public_updates_channel_title">Kanaal alleen voor moderators</string>
     <string name="publish_followed_news_body">Dit bericht wordt gestuurd naar alle servers die dit kanaal volgen. Je kunt dit bericht later bewerken of verwijderen, waarna het wordt bijgewerkt/verwijderd in elke volgende server.</string>
     <string name="publish_followed_news_body_reach">Dit bericht wordt gestuurd naar **%1$s servers** die dit kanaal volgen. Je kunt dit bericht later bewerken of verwijderen, waarna het wordt bijgewerkt/verwijderd in elke volgende server.</string>
-    <string name="publish_followed_news_body_settings">Bekijk meer statistieken in de serverinstellingen.</string>
     <string name="publish_followed_news_fail_body">Je hebt je limiet van 10 gepubliceerde berichten per uur bereikt. We waarderen je enthousiasme, maar probeer het over %1$s nog eens.</string>
     <string name="publish_followed_news_fail_title">O jee, een pop-up.</string>
     <string name="publish_followed_news_generic_body">Sorry, er ging iets fout.</string>
@@ -4928,7 +4917,6 @@ voordat je opnieuw probeert."</string>
 kunnen door iedereen worden beluisterd die op het kanaal zijn afgestemd."</string>
     <string name="server_deafen">Server hoorbaar</string>
     <string name="server_deafened">Server hoorbaar gemaakt</string>
-    <string name="server_deafened_dialog_body">"Als je wilt luisteren in dit kanaal, moet je de serverbeheerders vragen of ze 'Onhoorbaar maken' willen opheffen voor jou."</string>
     <string name="server_deafened_dialog_title">Server hoorbaar gemaakt</string>
     <string name="server_desciption_empty">Vertel de wereld een beetje over deze server.</string>
     <string name="server_emoji">Server-emoticons</string>
@@ -4938,7 +4926,6 @@ kunnen door iedereen worden beluisterd die op het kanaal zijn afgestemd."</strin
     <string name="server_insights">Serverinzichten</string>
     <string name="server_mute">Server gedempt</string>
     <string name="server_muted">Server gedempt</string>
-    <string name="server_muted_dialog_body">"Als je wilt praten in dit kanaal, moet je de serverbeheerders vragen of ze 'Dempen opheffen' ongedaan willen maken voor jou."</string>
     <string name="server_muted_dialog_title">Server gedempt</string>
     <string name="server_name_required">Servernaam is vereist.</string>
     <string name="server_options">Serveropties</string>
@@ -5740,7 +5727,6 @@ Om Discord te blijven gebruiken, **moeten we je account verifiëren.**"</string>
     <string name="verification_verified">E-mail geverifieerd!</string>
     <string name="verification_verifying">Bezig met verifiëren van je e-mail</string>
     <string name="verified_bot_tooltip">Geverifieerde bot</string>
-    <string name="verified_developer_badge_tooltip">Geverifieerde botontwikkelaar</string>
     <string name="verify">Verifiëren</string>
     <string name="verify_account">Account verifiëren</string>
     <string name="verify_by">Verifiëren per</string>
@@ -5898,7 +5884,6 @@ vragen hebt of hulp nodig hebt."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 maanden)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Sorry, het lijkt erop dat je al een Nitro-abonnement hebt. Maar je kunt je verzilver-URL wel aan een vriend geven en 3 maanden gratis Nitro die kant opsturen.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Balen!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Je hebt Game Pass, dus je krijgt gratis 3 maanden Nitro!</string>
     <string name="xbox_pin_step1">Open de Discord-app op je telefoon</string>
     <string name="xbox_pin_step2">Ga naar Instellingen> Verbindingen> Toevoegen</string>
     <string name="xbox_pin_step3">Klik op Xbox en voer de bovenstaande pincode in</string>
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index a0f4ee95c3..cdfdced780 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -2150,9 +2150,9 @@ Du vil også finne analyser om kunngjøringskanaler, Serveroppdagelse og velkoms
     <string name="guild_owner">Servereier</string>
     <string name="guild_partner_application_category_description">Hvilken av de følgende kategoriene beskriver serveren din best?</string>
     <string name="guild_partner_application_category_label">Kategorier</string>
-    <string name="guild_partner_application_connect">Knytt til kontoer der du skaper ting</string>
     <string name="guild_partner_application_content_platform">Hvor lager du hovedsakelig innhold?</string>
     <string name="guild_partner_application_country">Land</string>
+    <string name="guild_partner_application_creator_connect">Knytt til kontoer der du skaper ting</string>
     <string name="guild_partner_application_description_description">Fortell oss mer om serveren din. Hva handler den om? Hvem er den beregnet på?</string>
     <string name="guild_partner_application_description_title">Serverbeskrivelse</string>
     <string name="guild_partner_application_first_name">Fornavn</string>
@@ -2167,11 +2167,7 @@ Du vil også finne analyser om kunngjøringskanaler, Serveroppdagelse og velkoms
     <string name="guild_partner_application_server_step_title">Hva er temaet for fellesskapet ditt?</string>
     <string name="guild_partner_application_subcategory_description">Du kan også velge opptil fem underkategorier.</string>
     <string name="guild_partner_application_submit_step">Send søknad</string>
-    <string name="guild_partner_application_submit_step_description">Vi følger vanligvis opp i løpet av X dager.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord går gjennom hver eneste partnersøknad. Vi gjør oppmerksom på at det å søke ikke garanterer at du blir gjort til partner.</string>
-    <string name="guild_partner_application_submit_step_title">Send inn dette, så er du klar!</string>
     <string name="guild_partner_application_title">Søk på Discord-partnerprogrammet</string>
-    <string name="guild_partner_application_type">Servertype</string>
     <string name="guild_partner_application_type_brand">Næringsliv/merkevare</string>
     <string name="guild_partner_application_type_content">Innholdsskaper/personlighet</string>
     <string name="guild_partner_application_type_fan">Interessegruppe eller fanfellesskap</string>
@@ -2406,8 +2402,6 @@ Du vil også finne analyser om kunngjøringskanaler, Serveroppdagelse og velkoms
     <string name="guild_settings_discovery_byline">Ved å kvalifisere til og aktivere oppdagelse, vises serveren din i [serveroppdagelse.](onClick) Sørg for at du er klar til å gjøre et godt inntrykk!</string>
     <string name="guild_settings_discovery_checklist_2fa">2FA-kravet for moderasjon er aktivert</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Medlemmer med moderasjonsrettigheter (dvs. admin eller moderator) må ha aktivert 2FA for å utføre moderasjonsoppgaver.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Dette krever at alle medlemmer med moderasjonsrettigheter har aktivert 2FA før de kan utføre moderasjonsoppgaver. Dette kan bidra til å beskytte mot kompromitterte admin- og moderatorkontoer. [Aktiver i Moderasjon-innstillinger](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Manglende 2FA-krav for moderasjon</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Ved å aktivere serveroppdagelse, godtar du å følge [retningslinjene våre for oppdagbare servere.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Oppfyller alderskrav</string>
     <string name="guild_settings_discovery_checklist_age_description">Servere i oppdagelse må være minst %1$s gammel.</string>
@@ -2421,7 +2415,6 @@ Du vil også finne analyser om kunngjøringskanaler, Serveroppdagelse og velkoms
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Få flere kommuniserende i uken</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">En kommuniserende er en bruker som har snakket (tale eller tekst) på serveren. Prøv for eksempel å arrangere eventer for fellesskapet eller starte diskusjoner for å få flere til å snakke.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">gj.sn. ant. kommuniserende på serveren din per uke</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Det må være flere medlemmer som besøker og snakker ukentlig på serveren din.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Godt jobbet! Serveren din består alle kravene for å være med i severoppdagelse.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">For å sikre at vi bare anbefaler Discord-brukere aktive servere, må det være et visst aktivitetsnivå på servere i Oppdagelse.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Klikk her for å se flere detaljer</string>
@@ -2437,7 +2430,6 @@ Du vil også finne analyser om kunngjøringskanaler, Serveroppdagelse og velkoms
     <string name="guild_settings_discovery_checklist_nsfw_description">Servernavnet, beskrivelsen og kanalnavnene dine ser fine ut!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Stygge ord oppdaget</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">minstekrav</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Du må forbedre startopplevelsen for nye medlemmer.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Gi nye medlemmer en bedre opplevelse</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Servere som får mer enn 10 nye medlemmer per uke, må holde på minst 10 %% av medlemmene. Altså må 1 av 10 nye personer bli værende i en uke+.
 
@@ -2447,7 +2439,6 @@ Prøv å se serveren din gjennom øynene til et nytt medlem. Finnes det områder
     <string name="guild_settings_discovery_checklist_safe_description">Takk for at du følger Retningslinjene for fellesskapet og holder serveren din trygg!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Serveren din $[har brutt våre vilkår for bruk](doesNotHook) i løpet av de siste 30 dagene.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Serveren din har brutt våre [bruksvilkår](%1$s) eller [retningslinjer for fellesskapsservere](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Flagget av tillit og sikkerhet</string>
     <string name="guild_settings_discovery_checklist_score_explain">Kalkuleres som et glidende gjennomsnitt for de foregående 8 ukene, så det kan ta noen uker før endringer blir synlige. Kun brukere som har vært på Discord i 8 uker+, regnes som gjester eller kommuniserende.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ medlemmer</string>
     <string name="guild_settings_discovery_checklist_size_description">For øyeblikket er oppdagelse begrenset til servere med over %1$s medlemmer.</string>
@@ -3714,7 +3705,6 @@ ingen festede meldinger … enda."</string>
     <string name="no_thanks">Nei takk</string>
     <string name="no_user_limit">Ingen grense</string>
     <string name="no_video_devices">Ingen videoenheter</string>
-    <string name="no_video_permission_dialog_body">For å slå på video i denne kanalen må du først be serveradministratoren din om å endre videotillatelsen din.</string>
     <string name="no_video_permission_dialog_title">Ingen videotillatelse</string>
     <string name="noise_cancellation_off">Støydemping av</string>
     <string name="noise_cancellation_on">Støydemping på</string>
@@ -3930,6 +3920,7 @@ Har du mottatt en invitasjonslenke fra en venn? Skriv inn invitasjonslenken elle
     <string name="one_user_typing">**%1$s** skriver …</string>
     <string name="ongoing_call">Pågående samtale</string>
     <string name="ongoing_call_connected_users">Pågående samtale – %1$s tilkoblet</string>
+    <string name="ongoing_call_tap_to_join">– Trykk for å bli med</string>
     <string name="ongoing_call_voice_quality_low">Å nei, en stor rød stolpe. Tilkoblingen din sliter.</string>
     <string name="ongoing_call_you_are_all_alone">"Du er alene i dette anropet. 
  Andre i denne chatten kan bli med når som helst."</string>
@@ -4011,7 +4002,6 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
     <string name="paginator_of_pages">Side %1$s av %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Discords Twitter skal ha mer informasjon.</string>
-    <string name="partner_badge_tooltip">Discord-partner</string>
     <string name="password_length_error">Passord må være mellom 6 og 128 tegn</string>
     <string name="password_manager">Passordbehandling</string>
     <string name="password_manager_info_android">Hvis du bruker passordbehandling, må du tillate det i Tilgjengelighetsinnstillinger -> Nedlastede tjenester. Slapp av, vi kan ta deg dit.</string>
@@ -4504,7 +4494,6 @@ til datamaskinen din hvis du ønsker å bruke denne funksjonen uten å ha nettle
     <string name="public_updates_channel_title">Kanal med kun moderatorer</string>
     <string name="publish_followed_news_body">Denne meldingen blir sendt til alle serverne som følger denne kanalen. Du kan redigere eller slette denne meldingen senere, og den oppdateres tilsvarende på hver server som følger.</string>
     <string name="publish_followed_news_body_reach">Denne meldingen blir sendt til **%1$s servere** som følger denne kanalen. Du kan redigere eller slette denne meldingen senere, og den oppdateres tilsvarende på hver server som følger.</string>
-    <string name="publish_followed_news_body_settings">Se mer statistikk i Serverinnstillinger.</string>
     <string name="publish_followed_news_fail_body">Du har nådd grensen på 10 publiserte meldinger i timen. Men vi digger entusiasmen, så prøv igjen om %1$s.</string>
     <string name="publish_followed_news_fail_title">Hoppsann, en pop up-boks.</string>
     <string name="publish_followed_news_generic_body">Beklager, noe gikk galt.</string>
@@ -4847,7 +4836,6 @@ før du prøver igjen."</string>
 kan bli hørt av alle som er fokusert på kanalen."</string>
     <string name="server_deafen">Slå av Serverlyd</string>
     <string name="server_deafened">Serverlyden er dempet</string>
-    <string name="server_deafened_dialog_body">For å lytte i denne kanalen må du først be serveradministratoren din om å slå på lyden for deg.</string>
     <string name="server_deafened_dialog_title">Serverlyden er dempet</string>
     <string name="server_desciption_empty">Fortell verden litt om denne serveren.</string>
     <string name="server_emoji">Server-emoji</string>
@@ -4857,7 +4845,6 @@ kan bli hørt av alle som er fokusert på kanalen."</string>
     <string name="server_insights">Serverinnsikt</string>
     <string name="server_mute">Serverdemping</string>
     <string name="server_muted">Server dempet</string>
-    <string name="server_muted_dialog_body">For å snakke i denne kanalen må du først be serveradministratoren din om å oppheve dempingen av deg.</string>
     <string name="server_muted_dialog_title">Server dempet</string>
     <string name="server_name_required">Servernavn er påkrevd.</string>
     <string name="server_options">Serveralternativer</string>
@@ -5660,7 +5647,6 @@ For å fortsette å bruke Discord, **må du bekrefte kontoen.**"</string>
     <string name="verification_verified">E-postadressen er bekreftet!</string>
     <string name="verification_verifying">Bekrefter e-postadressen din</string>
     <string name="verified_bot_tooltip">Verifisert bot</string>
-    <string name="verified_developer_badge_tooltip">Verifisert botutvikler</string>
     <string name="verify">Bekrefte</string>
     <string name="verify_account">Bekreft kontoen</string>
     <string name="verify_by">Bekreft med</string>
@@ -5819,7 +5805,6 @@ spørsmål eller trenger hjelp."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (tre måneder)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Beklager, det ser ut til at du allerede har et Nitro-abonnement. Men du kan gi en innløsnings-URL til en venn og sende vedkommende tre gratis Nitro-måneder.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Å nei!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Siden du har et Xbox Game Pass, får du Nitro gratis i tre måneder!</string>
     <string name="xbox_link">Lenke</string>
     <string name="xbox_pin_step1">Åpne Discord-appen på telefonen din</string>
     <string name="xbox_pin_step2">Gå til innstillinger > Tilkoblinger > Legg til</string>
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index 3b792277d9..b3f174a8bb 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -2283,9 +2283,9 @@ Znajdziesz też tutaj statystyki dotyczące kanałów ogłoszeniowych, Wyszukiwa
     <string name="guild_owner">Właściciel serwera</string>
     <string name="guild_partner_application_category_description">Która z poniższych kategorii najlepiej opisuje Twój serwer?</string>
     <string name="guild_partner_application_category_label">Kategorie</string>
-    <string name="guild_partner_application_connect">Połącz konta, na których tworzysz</string>
     <string name="guild_partner_application_content_platform">Gdzie głównie tworzysz swoje treści?</string>
     <string name="guild_partner_application_country">Kraj</string>
+    <string name="guild_partner_application_creator_connect">Połącz konta, na których tworzysz</string>
     <string name="guild_partner_application_description_description">Opowiedz nam o swoim serwerze. Czego dotyczy? Do kogo jest skierowany?</string>
     <string name="guild_partner_application_description_title">Opis serwera</string>
     <string name="guild_partner_application_first_name">Imię</string>
@@ -2300,11 +2300,7 @@ Znajdziesz też tutaj statystyki dotyczące kanałów ogłoszeniowych, Wyszukiwa
     <string name="guild_partner_application_server_step_title">Czego dotyczy Twoja społeczność?</string>
     <string name="guild_partner_application_subcategory_description">Możesz też wybrać do 5 podkategorii.</string>
     <string name="guild_partner_application_submit_step">Wyślij wniosek</string>
-    <string name="guild_partner_application_submit_step_description">Zwykle odzywamy się po X dniach.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord analizuje każdy wniosek o dołączenie do Partnerów. Pamiętaj, że złożenie wniosku nie gwarantuje uzyskania Partnerstwa.</string>
-    <string name="guild_partner_application_submit_step_title">Teraz tylko prześlij i gotowe!</string>
     <string name="guild_partner_application_title">Zgłoś się do Programu Partnerskiego Discord</string>
-    <string name="guild_partner_application_type">Typ serwera</string>
     <string name="guild_partner_application_type_brand">Biznes lub marka</string>
     <string name="guild_partner_application_type_content">Twórca treści lub osobowość</string>
     <string name="guild_partner_application_type_fan">Grupa zainteresowań lub społeczność fanów</string>
@@ -2539,8 +2535,6 @@ Znajdziesz też tutaj statystyki dotyczące kanałów ogłoszeniowych, Wyszukiwa
     <string name="guild_settings_discovery_byline">Jeśli kwalifikujesz się do Wyszukiwania serwerów i włączysz je, Twój serwer pojawi się w [Wyszukiwaniu serwerów.](onClick) Upewnij się, że zrobisz dobre wrażenie!</string>
     <string name="guild_settings_discovery_checklist_2fa">Włączono wymaganie 2FA dla moderacji</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Wymagamy, by członkowie z uprawnieniami do moderacji (np. administratorzy i moderatorzy) mieli włączone 2FA do wykonywania czynności moderatorskich.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Wymagamy, by wszyscy członkowie z uprawnieniami do moderacji mieli włączone 2FA, zanim będą mogli wykonywać czynności moderatorskie. Może to pomóc w ochronie przed naruszeniami zabezpieczeń kont administratorów lub moderatorów. [Włącz w Ustawieniach moderacji](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Brakuje wymagania 2FA dla moderacji</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Włączając Wyszukiwanie serwerów, wyrażasz zgodę na nasze [Wytyczne dla wyszukiwalnych serwerów.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Spełnia wymagania długości istnienia</string>
     <string name="guild_settings_discovery_checklist_age_description">Serwery obecne w Wyszukiwaniu muszą istnieć co najmniej przez %1$s.</string>
@@ -2554,7 +2548,6 @@ Znajdziesz też tutaj statystyki dotyczące kanałów ogłoszeniowych, Wyszukiwa
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Zwiększ liczbę rozmawiających w tygodniu</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Rozmawiający to osoba, która rozmawiała (głosowo lub tekstowo) na serwerze. Organizacja wydarzeń dla społeczności i zagajanie dyskusji to świetne sposoby, by zachęcić ludzi do rozmów.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">średnia liczba rozmawiających na Twoim serwerze tygodniowo</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Twój serwer potrzebuje więcej członków, którzy w każdym tygodniu odwiedzają go i rozmawiają na nim.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Świetna robota! Twój serwer spełnia wszystkie wymagania, by znaleźć się w Wyszukiwaniu serwerów.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">By mieć pewność, że polecamy użytkownikom Discorda tylko aktywne serwery, serwery w Wyszukiwaniu muszą spełniać wymagania dotyczące poziomu aktywności.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Kliknij tutaj, by dowiedzieć się więcej</string>
@@ -2570,7 +2563,6 @@ Znajdziesz też tutaj statystyki dotyczące kanałów ogłoszeniowych, Wyszukiwa
     <string name="guild_settings_discovery_checklist_nsfw_description">Twoja nazwa serwera, opis i nazwy kanałów wyglądają elegancko!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Znaleziono brzydkie słowa</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">wymagane minimum</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Musisz popracować nad procesem wdrażania nowych członków po dołączeniu do serwera.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Popracuj nad procesem wdrażania nowych członków</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Od serwerów przyjmujących ponad 10 nowych członków tygodniowo wymaga się, by utrzymywały przynajmniej 10%% nowych członków. Przynajmniej 1 na 10 nowych osób, które dołączyły, powinny zostać przez ponad tydzień.
 
@@ -2580,7 +2572,6 @@ Spójrz na swój serwer oczami nowego członka. Czy coś może go dezorientować
     <string name="guild_settings_discovery_checklist_safe_description">Dziękujemy, że przestrzegasz Wytycznych dla Społeczności i dbasz, by Twój serwer był bezpieczny!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Twój serwer $[naruszył nasze Warunki Korzystania z Usługi](doesNotHook) w ciągu ostatnich 30 dni.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Twój serwer naruszył nasze [Warunki Korzystania z Usługi](%1$s) lub [Wytyczne Dotyczące Serwera Społeczności](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Oznaczony przez zespół zaufania i bezpieczeństwa</string>
     <string name="guild_settings_discovery_checklist_score_explain">Wartości obliczane są jako średnia krocząca z ostatnich 8 tygodni, więc zmiany mogą być widoczne dopiero po kilku tygodniach. Tylko użytkownicy, którzy są na Discordzie od ponad 8 tygodni liczą się jako goście i rozmawiający.</string>
     <string name="guild_settings_discovery_checklist_size">Członkowie: co najmniej %1$s</string>
     <string name="guild_settings_discovery_checklist_size_description">Na razie do Wyszukiwania mogą należeć tylko serwery liczbą członków powyżej %1$s.</string>
@@ -3857,7 +3848,6 @@ przypiętych wiadomości… jeszcze."</string>
     <string name="no_thanks">Nie, dzięki</string>
     <string name="no_user_limit">Bez limitu</string>
     <string name="no_video_devices">Brak urządzeń wideo</string>
-    <string name="no_video_permission_dialog_body">Jeżeli chcesz włączyć swoje wideo na tym kanale głosowym, poproś administratorów swojego serwera o zmianę Twoich uprawnień wideo.</string>
     <string name="no_video_permission_dialog_title">Brak uprawnienia do wideo</string>
     <string name="noise_cancellation_off">Wył. tłumienie zakłóceń</string>
     <string name="noise_cancellation_on">Wł. tłumienie zakłóceń</string>
@@ -4074,6 +4064,7 @@ Znajomy wysłał Ci zaproszenie? Podaj link z zaproszeniem lub kod poniżej, aby
     <string name="one_user_typing">**%1$s** pisze…</string>
     <string name="ongoing_call">Bieżące połączenie</string>
     <string name="ongoing_call_connected_users">Trwające połączenie – %1$s połączonych</string>
+    <string name="ongoing_call_tap_to_join">– Dotknij, aby dołączyć</string>
     <string name="ongoing_call_voice_quality_low">O nie, wielki czerwony pasek. Twoje połączenie ledwie sobie radzi.</string>
     <string name="ongoing_call_you_are_all_alone">"Tylko Ty jesteś w tym połączeniu. 
  Inni w tym czacie mogą dołączyć w każdej chwili."</string>
@@ -4155,7 +4146,6 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="paginator_of_pages">Strona %1$s z %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Więcej informacji powinno być dostępnych na Twitterze Discorda.</string>
-    <string name="partner_badge_tooltip">Partner Discorda</string>
     <string name="password_length_error">Hasła muszą mieć od 6 do 128 znaków</string>
     <string name="password_manager">Menedżer hasła</string>
     <string name="password_manager_info_android">Jeżeli chcesz korzystać z menedżera, musisz go włączyć w Ustawieniach dostępności -> Pobrane usługi. Nie martw się, zaprowadzimy Cię tam.</string>
@@ -4654,7 +4644,6 @@ podczas rozgrywki."</string>
     <string name="public_updates_channel_title">Kanał tylko dla moderatorów</string>
     <string name="publish_followed_news_body">Ta wiadomość zostanie wysłana na wszystkie serwery śledzące ten kanał. Możesz ją później edytować lub usunąć – zostanie odpowiednio zaktualizowana na każdym śledzącym serwerze.</string>
     <string name="publish_followed_news_body_reach">Ta wiadomość zostanie wysłana na **%1$s serwery(-ów)** śledzące(-ych) ten kanał. Możesz ją później edytować lub usunąć – zostanie odpowiednio zaktualizowana na każdym śledzącym serwerze.</string>
-    <string name="publish_followed_news_body_settings">Sprawdź więcej statystyk w ustawieniach serwera.</string>
     <string name="publish_followed_news_fail_body">Osiągnięto limit 10 opublikowanych wiadomości na godzinę. Ale podoba nam się twój entuzjazm, więc spróbuj ponownie za %1$s.</string>
     <string name="publish_followed_news_fail_title">O nie, wyskakujące okienko.</string>
     <string name="publish_followed_news_generic_body">Przykro nam, coś poszło nie tak.</string>
@@ -4797,7 +4786,7 @@ Na pewno chcesz to zrobić?"</string>
     <string name="reversed">Cofnięte</string>
     <string name="revoke">Unieważnij</string>
     <string name="revoke_ban">Cofnij bana</string>
-    <string name="ring">Zadzwoń</string>
+    <string name="ring">Dodaj do rozmowy</string>
     <string name="ro">Rumuński, Rumunia</string>
     <string name="role_color">Kolor roli</string>
     <string name="role_id_copied">Skopiowano ID dla roli: %1$s</string>
@@ -5003,7 +4992,6 @@ przed ponowną próbą."</string>
 zostanie odczytana wszystkim osobom na kanale z aktywnym pozwoleniem na TTS."</string>
     <string name="server_deafen">Wyłączenie dźwięku na serwerze</string>
     <string name="server_deafened">Dźwięk wyłączony na serwerze</string>
-    <string name="server_deafened_dialog_body">Jeżeli chcesz słyszeć dźwięk na tym kanale, poproś administratorów swojego serwera o włączenie dźwięku.</string>
     <string name="server_deafened_dialog_title">Dźwięk wyłączony na serwerze</string>
     <string name="server_desciption_empty">Opowiedz innym o tym serwerze.</string>
     <string name="server_emoji">Serwerowe emoji</string>
@@ -5013,7 +5001,6 @@ zostanie odczytana wszystkim osobom na kanale z aktywnym pozwoleniem na TTS."</s
     <string name="server_insights">Przegląd serwera</string>
     <string name="server_mute">Wyciszenie serwera</string>
     <string name="server_muted">Wyciszono serwer</string>
-    <string name="server_muted_dialog_body">Jeżeli chcesz rozmawiać na tym kanale, poproś administratorów swojego serwera o wyłączenie wyciszenia.</string>
     <string name="server_muted_dialog_title">Wyciszono serwer</string>
     <string name="server_name_required">Nazwa serwera jest wymagana.</string>
     <string name="server_options">Opcje serwera</string>
@@ -5822,7 +5809,6 @@ Aby używać dalej Discorda, **będziemy musieli zweryfikować Twoje konto.**"</
     <string name="verification_verified">Adres e-mail zweryfikowany!</string>
     <string name="verification_verifying">Weryfikowanie Twojego adresu e-mail</string>
     <string name="verified_bot_tooltip">Zweryfikowany bot</string>
-    <string name="verified_developer_badge_tooltip">Zweryfikowany deweloper bota</string>
     <string name="verify">Zweryfikuj</string>
     <string name="verify_account">Zweryfikuj konto</string>
     <string name="verify_by">Zweryfikuj poprzez</string>
@@ -5984,7 +5970,6 @@ pytania lub potrzebujesz pomocy."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 miesiące)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Przykro nam, wygląda na to, że masz już subskrypcję Nitro. Możesz jednak przekazać link do realizacji znajomemu i podarować mu w ten sposób 3 darmowe miesiące Nitro.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">O nie!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Ponieważ masz już Xbox Game Pass, dostaniesz 3 miesiące Nitro za darmo!</string>
     <string name="xbox_link">Połącz</string>
     <string name="xbox_pin_step1">Otwórz aplikację Discorda na telefonie</string>
     <string name="xbox_pin_step2">Przejdź do Ustawień > Połączone konta > Dodaj</string>
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index 0db4704a87..43f03f0c7e 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -2238,9 +2238,9 @@ Aqui também temos análises sobre canais de anúncios, o Descobrir Servidores e
     <string name="guild_owner">Dono(a) do servidor</string>
     <string name="guild_partner_application_category_description">Qual das seguintes categorias descreve melhor seu servidor?</string>
     <string name="guild_partner_application_category_label">Categorias</string>
-    <string name="guild_partner_application_connect">Conecte contas onde você cria</string>
     <string name="guild_partner_application_content_platform">Onde você mais cria seu conteúdo?</string>
     <string name="guild_partner_application_country">País</string>
+    <string name="guild_partner_application_creator_connect">Conecte contas onde você cria</string>
     <string name="guild_partner_application_description_description">Conte-nos sobre seu servidor. Sobre o que ele é? Para quem ele é?</string>
     <string name="guild_partner_application_description_title">Descrição do Servidor</string>
     <string name="guild_partner_application_first_name">Nome</string>
@@ -2255,11 +2255,7 @@ Aqui também temos análises sobre canais de anúncios, o Descobrir Servidores e
     <string name="guild_partner_application_server_step_title">Sobre o que é sua comunidade?</string>
     <string name="guild_partner_application_subcategory_description">Você também pode selecionar até 5 subcategorias.</string>
     <string name="guild_partner_application_submit_step">Enviar candidatura</string>
-    <string name="guild_partner_application_submit_step_description">Geralmente respondemos a cada X dias.</string>
-    <string name="guild_partner_application_submit_step_description_2">Cada candidatura de Parceiro é analisada pelo Discord. Tenha em mente que a candidatura não garante a parceria.</string>
-    <string name="guild_partner_application_submit_step_title">É só enviar e pronto!</string>
     <string name="guild_partner_application_title">Candidatar-se ao Programa de Parceria do Discord</string>
-    <string name="guild_partner_application_type">Tipo de servidor</string>
     <string name="guild_partner_application_type_brand">Negócio / Marca</string>
     <string name="guild_partner_application_type_content">Criador de conteúdo / Personalidade</string>
     <string name="guild_partner_application_type_fan">Grupo de Interesse ou Comunidade de Fãs</string>
@@ -2494,8 +2490,6 @@ Aqui também temos análises sobre canais de anúncios, o Descobrir Servidores e
     <string name="guild_settings_discovery_byline">Ao se qualificar e ativar o Descobrir, seu servidores aparecerá no [Descobrir Servidores.](onClick) Não esqueça de botar as roupas de domingo!</string>
     <string name="guild_settings_discovery_checklist_2fa">Apenas moderadores com V2E ativado</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Membros com poderes de moderação (p.ex. administradores e moderadores) precisam ter a V2E ativada para realizar ações de moderação.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Esta opção exige que todos os membros com poderes de moderação tenham a verificação em duas etapas ativada antes de poderem realizar ações de moderação. Isso é útil caso algum administrador ou moderador tenha sua conta invadida. [Ative a opção nas configurações de moderação](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Falta ativar o requisito de V2E para moderadores</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Ao ativar o Descobrir, você concorda em respeitar as [Diretrizes de Servidores do Descobrir.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Atende aos requisitos de idade</string>
     <string name="guild_settings_discovery_checklist_age_description">Os servidores no recurso Descobrir precisam ter pelo menos %1$s de idade.</string>
@@ -2509,7 +2503,6 @@ Aqui também temos análises sobre canais de anúncios, o Descobrir Servidores e
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Aumente o número de comunicadores semanais</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Consideramos como comunicador alguém que tenha conversado (por voz ou texto) no servidor. Realizar eventos da comunidade e promover tópicos de discussão são ótimas maneiras de fazer mais pessoas falarem.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">média de comunicadores semanais no seu servidor</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Seu servidor precisa de mais membros visitantes e comunicadores semanais.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Boa, garoto(a)! Seu servidor cumpre todos os requisitos para estar no Descobrir Servidores.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Como forma de garantir que apenas servidores ativos sejam recomendados aos usuários do Discord, os servidores em Descobrir devem atender a um nível mínimo de atividade.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Clique aqui para saber mais</string>
@@ -2525,7 +2518,6 @@ Aqui também temos análises sobre canais de anúncios, o Descobrir Servidores e
     <string name="guild_settings_discovery_checklist_nsfw_description">O nome, descrição e canal do seu servidor estão todos limpinhos!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Palavras Feias</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">mínimo necessário</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Você precisa melhorar sua experiência de acolhimento de membros.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Melhore a experiência de novos membros</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Os servidores que ganharem mais de 10 novos membros por semana devem garantir pelo menos 10%% de fidelidade dos novos membros. Pelo menos 1 pessoa a cada 10 que entrarem deve ficar por mais de uma semana.
 
@@ -2535,7 +2527,6 @@ Olhe para o seu servidor pela perspectiva de um membro novo. Em que pontos ele p
     <string name="guild_settings_discovery_checklist_safe_description">Agradecemos por respeitar nossas diretrizes da comunidade e por manter nosso servidor seguro!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Seu servidor $[violou nossos Termos de Serviço](doesNotHook) nos últimos 30 dias.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Seu servidor violou ou nossos [Termos de Serviço](%1$s), ou nossas [Diretrizes de Servidor da Comunidade](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Marcado pela equipe de Confiança e Segurança</string>
     <string name="guild_settings_discovery_checklist_score_explain">Calculada como média acumulada das últimas 8 semanas, então as alterações podem levar algumas semanas para aparecer. Apenas usuários que já estiverem no Discord há mais de 8 semanas contam como visitantes ou comunicadores.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ membros</string>
     <string name="guild_settings_discovery_checklist_size_description">Por enquanto, o Descobrir só recebe servidores com mais de %1$s membros.</string>
@@ -3803,7 +3794,6 @@ mensagens fixadas… ainda."</string>
     <string name="no_thanks">Não, valeu</string>
     <string name="no_user_limit">Sem limite</string>
     <string name="no_video_devices">Sem dispositivos de vídeo</string>
-    <string name="no_video_permission_dialog_body">Para ligar seu vídeo neste canal de voz, peça aos administradores do servidor que mudem suas permissões de vídeo.</string>
     <string name="no_video_permission_dialog_title">Sem permissão de vídeo</string>
     <string name="noise_cancellation_off">Supressão de ruído desativada</string>
     <string name="noise_cancellation_on">Supressão de ruído ativada</string>
@@ -4019,6 +4009,7 @@ Você recebeu um link de convite de um amigo? Insira seu link ou código de conv
     <string name="one_user_typing">**%1$s** está digitando…</string>
     <string name="ongoing_call">Chamada em andamento</string>
     <string name="ongoing_call_connected_users">Chamada em andamento — %1$s conectado(s)</string>
+    <string name="ongoing_call_tap_to_join">— Toque para entrar</string>
     <string name="ongoing_call_voice_quality_low">Uma grande barra vermelha, essa não. Sua conexão está capengando.</string>
     <string name="ongoing_call_you_are_all_alone">"Você está sozinho(a) nesta chamada.
 Outras pessoas podem entrar a qualquer momento."</string>
@@ -4100,7 +4091,6 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="paginator_of_pages">Página %1$s de %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s O Twitter do Discord deve ter mais informações.</string>
-    <string name="partner_badge_tooltip">Parceiro(a) do Discord</string>
     <string name="password_length_error">Senhas precisam ter entre 6 e 128 caracteres</string>
     <string name="password_manager">Gerenciador de senhas</string>
     <string name="password_manager_info_android">Se você utilizar um gerenciador de senhas, será necessário ativá-lo nas Configurações de acessibilidade -> Serviços baixados. Não se preocupe, podemos te levar até lá.</string>
@@ -4599,7 +4589,6 @@ Aperte para Falar possa ser usado enquanto o jogo estiver em primeiro plano."</s
     <string name="public_updates_channel_title">Canal apenas para moderadores</string>
     <string name="publish_followed_news_body">Essa mensagem será enviada a todos os servidores que seguem esse canal. Você poderá editar ou excluir essa mensagem posteriormente e ela será atualizada de acordo em cada servidor seguindo esse canal.</string>
     <string name="publish_followed_news_body_reach">Essa mensagem será enviada para **%1$s servidores** seguindo esse canal. Você poderá editar ou excluir essa mensagem posteriormente, e ela será atualizada de acordo em cada servidor seguindo esse canal.</string>
-    <string name="publish_followed_news_body_settings">Veja mais estatísticas nas configurações do servidor.</string>
     <string name="publish_followed_news_fail_body">Você atingiu seu limite de 10 mensagens publicadas por hora. Adoramos seu entusiasmo, então tente novamente em %1$s.</string>
     <string name="publish_followed_news_fail_title">Eita, um pop-up.</string>
     <string name="publish_followed_news_generic_body">Sentimos muito, mas tem algo de errado que não está certo.</string>
@@ -4948,7 +4937,6 @@ você mesmo(a) antes de tentar de novo."</string>
 ser ouvidas por todos que estiverem no canal."</string>
     <string name="server_deafen">Desativar áudio no servidor</string>
     <string name="server_deafened">Inaudível no servidor</string>
-    <string name="server_deafened_dialog_body">Para escutar este canal, peça aos administradores do servidor que ativem seu áudio.</string>
     <string name="server_deafened_dialog_title">Inaudível no servidor</string>
     <string name="server_desciption_empty">Conte ao mundo mais sobre esse servidor.</string>
     <string name="server_emoji">Emojis do servidor</string>
@@ -4958,7 +4946,6 @@ ser ouvidas por todos que estiverem no canal."</string>
     <string name="server_insights">Análises do Servidor</string>
     <string name="server_mute">Desativar sons no servidor</string>
     <string name="server_muted">Servidor silenciado</string>
-    <string name="server_muted_dialog_body">Para falar neste canal, peça para os administradores do servidor dessilenciem você.</string>
     <string name="server_muted_dialog_title">Servidor silenciado</string>
     <string name="server_name_required">O servidor precisa de um nome.</string>
     <string name="server_options">Opções do servidor</string>
@@ -5765,7 +5752,6 @@ Para continuar usando o Discord, **precisamos que você verifique sua conta.**"<
     <string name="verification_verified">E-mail verificado!</string>
     <string name="verification_verifying">Verificando seu e-mail</string>
     <string name="verified_bot_tooltip">Bot verificado</string>
-    <string name="verified_developer_badge_tooltip">Desenvolvedor Verificado de Bots</string>
     <string name="verify">Verificar</string>
     <string name="verify_account">Verificar conta</string>
     <string name="verify_by">Verificar por</string>
@@ -5925,7 +5911,6 @@ de dúvidas ou se precisar de ajuda."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 meses)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Foi mal, parece que você já é assinante do Nitro. Mas, porém, todavia, você pode dar seu URL de resgate a um(a) amigo(a) para ele(a) poder curtir 3 meses de Nitro grátis.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Ih, rapaz!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Como você tem o Xbox Game Pass, vamos te dar 3 meses de Nitro grátis!</string>
     <string name="xbox_link">Vincular</string>
     <string name="xbox_pin_step1">Abra o aplicativo do Discord no seu telefone</string>
     <string name="xbox_pin_step2">Vá para Configurações do usuário > Conexões > Adicionar</string>
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index 9c7cccb099..dc399ad967 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -2237,9 +2237,9 @@ Tot aici poți găsi și datele analitice despre canalele pentru anunțuri, func
     <string name="guild_owner">Proprietarul server-ului</string>
     <string name="guild_partner_application_category_description">Care dintre următoarele categorii îți descrie cel mai bine serverul?</string>
     <string name="guild_partner_application_category_label">Categorii</string>
-    <string name="guild_partner_application_connect">Conectează conturile în care creezi</string>
     <string name="guild_partner_application_content_platform">Unde creezi conținut în principal?</string>
     <string name="guild_partner_application_country">Țară</string>
+    <string name="guild_partner_application_creator_connect">Conectează conturile în care creezi</string>
     <string name="guild_partner_application_description_description">Povestește-ne despre serverul tău. Ce tematică are? Pentru cine a fost creat?</string>
     <string name="guild_partner_application_description_title">Descrierea serverului</string>
     <string name="guild_partner_application_first_name">Prenume</string>
@@ -2254,11 +2254,7 @@ Tot aici poți găsi și datele analitice despre canalele pentru anunțuri, func
     <string name="guild_partner_application_server_step_title">Ce tematică are comunitatea ta?</string>
     <string name="guild_partner_application_subcategory_description">Poți selecta și până la 5 subcategorii.</string>
     <string name="guild_partner_application_submit_step">Depune cererea</string>
-    <string name="guild_partner_application_submit_step_description">De obicei, trimitem răspuns în X zile.</string>
-    <string name="guild_partner_application_submit_step_description_2">Fiecare cerere de Parteneriat este analizată de Discord. Te rugăm să reții faptul că depunerea unei cereri nu garantează încheierea unui Parteneriat.</string>
-    <string name="guild_partner_application_submit_step_title">Nu mai rămâne decât să depui cererea!</string>
     <string name="guild_partner_application_title">Depune cerere pentru Discord Partner Program</string>
-    <string name="guild_partner_application_type">Tipul serverului</string>
     <string name="guild_partner_application_type_brand">Activitate comercială / marcă</string>
     <string name="guild_partner_application_type_content">Creator de conținut / personalitate</string>
     <string name="guild_partner_application_type_fan">Grup de interese sau comunitate de fani</string>
@@ -2493,8 +2489,6 @@ Tot aici poți găsi și datele analitice despre canalele pentru anunțuri, func
     <string name="guild_settings_discovery_byline">Dacă serverul tău îndeplinește cerințele funcției de Descoperire și o activezi, va apărea în [Descoperire server.](onClick) Asigură-te că ești gata să faci impresie!</string>
     <string name="guild_settings_discovery_checklist_2fa">S-a activat cerința A2F pentru moderare</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Membrii cu puteri de moderare (de exemplu, administratorii sau moderatorii) trebuie să aibă activă funcția de A2F pentru a face acțiuni de moderare.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Cere ca toți membrii cu puteri de moderare să aibă activă funcția de A2F pentru a putea face acțiuni de moderare. Acest lucru poate proteja server-ul în cazul spargerii conturilor administratorilor sau moderatorilor. [Activează în Setări de moderare](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Lipsește cerința A2F pentru moderare</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Prin faptul că activezi Descoperire, ești de acord să respecți [Regulamentul privind serverele care pot fi descoperite.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Îndeplinește cerința de vechime</string>
     <string name="guild_settings_discovery_checklist_age_description">Serverele din Descoperire trebuie să aibă cel puțin %1$s.</string>
@@ -2508,7 +2502,6 @@ Tot aici poți găsi și datele analitice despre canalele pentru anunțuri, func
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Crește numărul de persoane care comunică săptămânal</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">O persoană care comunică este un utilizator care discută pe server (prin voce sau text). Găzduirea de evenimente comunitare și promovarea subiectelor de discuție sunt modalități excelente de a încuraja mai multe persoane să discute.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">media persoanelor care comunică săptămânal pe server</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Server-ul tău are nevoie de mai mulți membri care să îl viziteze și să discute săptămânal.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Tare! Server-ul tău îndeplinește toate cerințele pentru a fi inclus în Descoperire server.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Pentru a ne asigura că le recomandăm numai servere active utilizatorilor Discord, serverele din Descoperire trebuie să aibă un nivel minim de activitate.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Dă clic aici pentru mai multe detalii</string>
@@ -2524,7 +2517,6 @@ Tot aici poți găsi și datele analitice despre canalele pentru anunțuri, func
     <string name="guild_settings_discovery_checklist_nsfw_description">Numele server-ului, descrierea și denumirile canalelor par în regulă!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">S-au găsit cuvinte urâte</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">număr minim necesar</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Trebuie să îmbunătățești experiența de înregistrare a noilor membri.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Îmbunătățește experiența noilor membri</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Serverele care înregistrează peste 10 membri noi săptămânal trebuie să păstreze cel puțin 10%% din noii membri. Cel puțin 1 din 10 persoane noi care se alătură trebuie să-și mențină interesul mai bine de o săptămână.
 
@@ -2534,7 +2526,6 @@ Analizează-ți serverul din perspectiva unui membru nou. Există aspecte care l
     <string name="guild_settings_discovery_checklist_safe_description">Îți mulțumim că respecți Regulamentul comunității și că te asiguri că server-ul tău este un mediu sigur!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Server-ul tău a $[a încălcat Condițiile de prestare a serviciilor](doesNotHook) în ultimele 30 de zile.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Serverul tău a încălcat [Condițiile de prestare a serviciilor](%1$s) sau [Regulamentul serverelor comunitare](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Semnalat de Echipa de încredere și siguranță</string>
     <string name="guild_settings_discovery_checklist_score_explain">Se calculează ca medie mobilă a datelor din ultimele 8 săptămâni, deci este posibil ca modificările să se afișeze de-abia după câteva săptămâni. Doar utilizatorii care au accesat Discord timp de peste 8 săptămâni se iau în considerare ca vizitatori sau persoane care comunică.</string>
     <string name="guild_settings_discovery_checklist_size">Peste %1$s membri</string>
     <string name="guild_settings_discovery_checklist_size_description">Deocamdată, funcția de Descoperire acceptă doar serverele care au peste %1$s membri.</string>
@@ -3807,7 +3798,6 @@ niciun mesaj fixat.. încă."</string>
     <string name="no_thanks">Nu, mulțumesc</string>
     <string name="no_user_limit">Nicio limită</string>
     <string name="no_video_devices">Niciun dispozitiv video</string>
-    <string name="no_video_permission_dialog_body">Pentru a activa funcția video pe acest canal de voce, roagă administratorii serverului să-ți schimbe permisiunile video.</string>
     <string name="no_video_permission_dialog_title">Nu ai permisiuni video</string>
     <string name="noise_cancellation_off">Suprimare zgomot oprită</string>
     <string name="noise_cancellation_on">Suprimare zgomot activă</string>
@@ -4023,6 +4013,7 @@ Ai primit link-ul de invitație de la un prieten? Introdu codul sau link-ul mai
     <string name="one_user_typing">**%1$s** scrie…</string>
     <string name="ongoing_call">Apel în desfășurare</string>
     <string name="ongoing_call_connected_users">Apel în desfășurare — %1$s conectați</string>
+    <string name="ongoing_call_tap_to_join">— Atinge pentru a te alătura</string>
     <string name="ongoing_call_voice_quality_low">Oh nu, o bară mare și roșie! Conexiunea ta se chinuie.</string>
     <string name="ongoing_call_you_are_all_alone">"Doar tu ești în acest apel. 
  Alți participanți la discuție se pot alătura în orice moment."</string>
@@ -4103,7 +4094,6 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="paginator_of_pages">Pagina %1$s din %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Contul Twitter al Discord ar trebui să conțină mai multe informaţii.</string>
-    <string name="partner_badge_tooltip">Partener Discord</string>
     <string name="password_length_error">Parolele trebuie să aibă între 6 și 128 de caractere</string>
     <string name="password_manager">Manager de parole</string>
     <string name="password_manager_info_android">Dacă utilizezi un manager de parole, va trebui să îl aprobi în Setări de accesibilitate -> Servicii descărcate. Nu-ți face griji, te putem duce acolo.</string>
@@ -4603,7 +4593,6 @@ detectarea modului Push-to-talk în timpul jocului."</string>
     <string name="public_updates_channel_title">Canal exclusiv pentru moderatori</string>
     <string name="publish_followed_news_body">Acest mesaj va fi trimis la toate serverele care urmăresc acest canal. Îl poți edita sau șterge mai târziu și mesajul va fi actualizat în mod corespunzător pe fiecare server urmăritor.</string>
     <string name="publish_followed_news_body_reach">Acest mesaj va fi trimis la **serverele%1$s** care urmăresc acest canal. Îl poți edita sau șterge mai târziu și mesajul va fi actualizat în mod corespunzător pe fiecare server urmăritor.</string>
-    <string name="publish_followed_news_body_settings">Vezi mai multe statistici în Setări server.</string>
     <string name="publish_followed_news_fail_body">Ai atins deja limita de 10 mesaje publicate pe oră. Însă ne place entuziasmul tău, așa că te rugăm să încerci din nou în %1$s.</string>
     <string name="publish_followed_news_fail_title">Vai, o casetă pop-up.</string>
     <string name="publish_followed_news_generic_body">Ne pare rău, ceva nu a mers bine.</string>
@@ -4952,7 +4941,6 @@ Alege ecranul pe care vrei să-l partajezi."</string>
 pot fi auzite de toată lumea care este activă pe canal."</string>
     <string name="server_deafen">Asurzește server-ul</string>
     <string name="server_deafened">Server asurzit</string>
-    <string name="server_deafened_dialog_body">Pentru a asculta pe acest canal, roagă administratorii serverului să-ți reactiveze sunetul.</string>
     <string name="server_deafened_dialog_title">Server asurzit</string>
     <string name="server_desciption_empty">Povestește oamenilor câte ceva despre acest server.</string>
     <string name="server_emoji">Emoji-urile server-ului</string>
@@ -4962,7 +4950,6 @@ pot fi auzite de toată lumea care este activă pe canal."</string>
     <string name="server_insights">Analiză server</string>
     <string name="server_mute">Amuțește pe server</string>
     <string name="server_muted">Server amuțit</string>
-    <string name="server_muted_dialog_body">Pentru a vorbi pe acest canal, roagă administratorii serverului să-ți pornească microfonul.</string>
     <string name="server_muted_dialog_title">Server amuțit</string>
     <string name="server_name_required">Numele server-ului este necesar.</string>
     <string name="server_options">Opțiuni server</string>
@@ -5767,7 +5754,6 @@ Pentru a continua să folosești Discord **trebuie să îți verifici contul.**"
     <string name="verification_verified">E-mail verificat!</string>
     <string name="verification_verifying">Îți verificăm e-mail-ul</string>
     <string name="verified_bot_tooltip">Bot verificat</string>
-    <string name="verified_developer_badge_tooltip">Dezvoltator de bot verificat</string>
     <string name="verify">Verifică</string>
     <string name="verify_account">Verifică contul</string>
     <string name="verify_by">Verifică prin</string>
@@ -5927,7 +5913,6 @@ Pentru a continua să folosești Discord **trebuie să îți verifici contul.**"
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 luni)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Ne pare rău, se pare că ai deja abonament Nitro. Dar poți să-i oferi unui prieten URL-ul de răscumpărare și să-i trimiți cele 3 luni de Nitro gratis.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Oh, nu!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Din moment ce ai Xbox Game Pass, primești gratuit 3 luni de Nitro!</string>
     <string name="xbox_link">Asociază</string>
     <string name="xbox_pin_step1">Deschide aplicația Discord pe telefonul tău</string>
     <string name="xbox_pin_step2">Mergi la Setări > Conexiuni > Adaugă</string>
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index ae474846c3..39c9eeab3a 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -2324,9 +2324,9 @@ Black Lives Matter {fixed}
     <string name="guild_owner">Владелец сервера</string>
     <string name="guild_partner_application_category_description">Какие из следующих категорий лучше всего описывают ваш сервер?</string>
     <string name="guild_partner_application_category_label">Категории</string>
-    <string name="guild_partner_application_connect">Подключить учётные записи, на которых вы творите</string>
     <string name="guild_partner_application_content_platform">Где вы создаёте большую часть своего контента?</string>
     <string name="guild_partner_application_country">Страна</string>
+    <string name="guild_partner_application_creator_connect">Подключить учётные записи, на которых вы творите</string>
     <string name="guild_partner_application_description_description">Расскажите нам о своём сервере. Чему он посвящён? Кто на нём общается?</string>
     <string name="guild_partner_application_description_title">Описание сервера</string>
     <string name="guild_partner_application_first_name">Имя</string>
@@ -2341,11 +2341,7 @@ Black Lives Matter {fixed}
     <string name="guild_partner_application_server_step_title">Чему посвящено ваше сообщество?</string>
     <string name="guild_partner_application_subcategory_description">Вы также можете выбрать до 5 подкатегорий.</string>
     <string name="guild_partner_application_submit_step">Подать заявку</string>
-    <string name="guild_partner_application_submit_step_description">Обычно мы отвечаем в течение X д.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord рассматривает все заявки от потенциальных партнёров. Обратите внимание, что заявка не гарантирует участия в партнёрской программе.</string>
-    <string name="guild_partner_application_submit_step_title">Теперь просто отправьте заявку, и всё!</string>
     <string name="guild_partner_application_title">Подать заявку в Discord Partner Program</string>
-    <string name="guild_partner_application_type">Тип сервера</string>
     <string name="guild_partner_application_type_brand">Бизнес / Бренд</string>
     <string name="guild_partner_application_type_content">Создатель контента / Знаменитость</string>
     <string name="guild_partner_application_type_fan">Группа по интересам или фанатское сообщество</string>
@@ -2580,8 +2576,6 @@ Black Lives Matter {fixed}
     <string name="guild_settings_discovery_byline">Включите «Путешествие», чтобы ваш сервер появлялся в [«Путешествии по серверам».](onClick) Убедитесь, что вы готовы произвести хорошее впечатление!</string>
     <string name="guild_settings_discovery_checklist_2fa">Требование 2FA для модерации включено</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Чтобы активировать 2FA для осуществления модерации требуются участники с правами модераторов (например, администраторы или модераторы).</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">В этом случае для выполнения модерации всем участникам с правами модераторов потребуется включить 2FA. Данная функция позволяет обезопасить сервер в случае взлома учётных записей администраторов или модераторов. [Включить в настройках модерации](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Отсутствует требование 2FA для модерации</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Включив «Путешествие», вы соглашаетесь следовать нашим [Правилам для серверов из «Путешествия».](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Удовлетворяет возрастным ограничениям</string>
     <string name="guild_settings_discovery_checklist_age_description">Серверам из «Путешествия» должно быть не менее %1$s.</string>
@@ -2595,7 +2589,6 @@ Black Lives Matter {fixed}
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Увеличьте количество еженедельных собеседников</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Собеседник — это пользователь, который принял участие в общении (в голосовом или текстовом чате) на вашем сервере. Проводите регулярные события сообщества или начинайте обсуждения, чтобы подтолкнуть участников к общению.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">среднее кол-во еженед. собеседников на сервере</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Недостаточно пользователей, которые еженедельно заглядывают на ваш сервер и общаются на нём.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Отличная работа! Ваш сервер удовлетворяет всем требования и может быть добавлен в «Путешествие по серверам».</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Чтобы пользователи Discord находили только активные сообщества, серверы из «Путешествия» должны поддерживать минимальный уровень активности.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Щёлкните здесь, чтобы узнать подробности.</string>
@@ -2611,7 +2604,6 @@ Black Lives Matter {fixed}
     <string name="guild_settings_discovery_checklist_nsfw_description">Название и описание сервера, а также названия каналов чисты!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Обнаружены плохие слова</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">мин. требование</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Вам нужно улучшить процесс адаптации новых участников.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Улучшите процесс адаптации новых участников</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Серверы, на которые приходит более 10 новых участников в неделю, должны сохранять не менее 10%% новых участников. Как минимум 1 из каждых 10 новичков должен пробыть на сервере более недели.
 
@@ -2621,7 +2613,6 @@ Black Lives Matter {fixed}
     <string name="guild_settings_discovery_checklist_safe_description">Спасибо, что следуете нашим Правилам сообщества и следите за тем, чтобы ваш сервер был безопасным!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Ваш сервер $[нарушил наши Условия Использования](doesNotHook) за последние 30 дней.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Ваш сервер нарушил наши [Условия Использования](%1$s) или [Рекомендации для серверов сообщества](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Отмечено Службой доверия и безопасности</string>
     <string name="guild_settings_discovery_checklist_score_explain">Здесь показывается усреднённый счёт за последние 8 недель, поэтому на отображение изменений может уйти несколько недель. При подсчёте посетителей или собеседников учитываются только пользователи, которые зарегистрировались в Discord более 2 месяцев назад.</string>
     <string name="guild_settings_discovery_checklist_size">Более %1$s участников</string>
     <string name="guild_settings_discovery_checklist_size_description">Пока что «Путешествие» доступно только серверам, на которых не менее %1$s участников.</string>
@@ -3902,7 +3893,6 @@ Black Lives Matter {fixed}
     <string name="no_thanks">Нет, спасибо</string>
     <string name="no_user_limit">Без ограничений</string>
     <string name="no_video_devices">Нет видеоустройств</string>
-    <string name="no_video_permission_dialog_body">Чтобы включить видео на этом канале, попросите администраторов сервера изменить ваши права доступа к видеочату.</string>
     <string name="no_video_permission_dialog_title">Нет доступа к видеочату</string>
     <string name="noise_cancellation_off">Шумоподавление откл.</string>
     <string name="noise_cancellation_on">Шумоподавление вкл.</string>
@@ -4119,6 +4109,7 @@ Black Lives Matter {fixed}
     <string name="one_user_typing">**%1$s** печатает…</string>
     <string name="ongoing_call">Текущий звонок</string>
     <string name="ongoing_call_connected_users">Текущий вызов — подключено: %1$s</string>
+    <string name="ongoing_call_tap_to_join">— Коснитесь, чтобы присоединиться</string>
     <string name="ongoing_call_voice_quality_low">О нет, красная полоска! С вашим подключением что-то не так.</string>
     <string name="ongoing_call_you_are_all_alone">"Кроме вас, в этом звонке пока никого нет. 
  Другие пользователи могут присоединиться к этому чату в любой момент."</string>
@@ -4200,7 +4191,6 @@ Black Lives Matter {fixed}
     <string name="paginator_of_pages">Страница %1$s из %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s. Подробности можно найти на странице Discord в Twitter.</string>
-    <string name="partner_badge_tooltip">Партнёр Discord</string>
     <string name="password_length_error">Пароль должен быть длиной от 6 до 128 символов</string>
     <string name="password_manager">Менеджер паролей</string>
     <string name="password_manager_info_android">Если вы пользуетесь менеджером паролей, вам нужно разрешить доступ к нему в меню «Специальные возможности» → «Загруженные сервисы». Не беспокойтесь, мы покажем вам, как туда попасть.</string>
@@ -4700,7 +4690,6 @@ Black Lives Matter {fixed}
     <string name="public_updates_channel_title">Канал для модераторов</string>
     <string name="publish_followed_news_body">Это сообщение будет отправлено на все сервера, подписанные на этот канал. Если вы удалите или отредактируете это сообщение, оно будет автоматически изменено на всех подписанных серверах.</string>
     <string name="publish_followed_news_body_reach">Это сообщение будет отправлено на все сервера (**%1$s**), подписанные на этот канал. Если вы удалите или отредактируете это сообщение, оно будет автоматически изменено на всех подписанных серверах.</string>
-    <string name="publish_followed_news_body_settings">Подробную статистику можно найти в настройках сервера.</string>
     <string name="publish_followed_news_fail_body">Вы достигли лимита в 10 опубликованных сообщений в час. Но нам по душе ваш энтузиазм, так что попробуйте ещё раз через %1$s.</string>
     <string name="publish_followed_news_fail_title">Ой-ой, всплывающее окно.</string>
     <string name="publish_followed_news_generic_body">Ой, что-то пошло не так.</string>
@@ -5050,7 +5039,6 @@ Black Lives Matter {fixed}
 услышат все, кто находится в данном канале."</string>
     <string name="server_deafen">Сервер: откл. звук</string>
     <string name="server_deafened">Звук отключён сервером</string>
-    <string name="server_deafened_dialog_body">Чтобы слушать на этом канале, попросите администраторов сервера включить вам звук.</string>
     <string name="server_deafened_dialog_title">Звук отключён сервером</string>
     <string name="server_desciption_empty">Расскажите миру об этом сервере.</string>
     <string name="server_emoji">Эмодзи сервера</string>
@@ -5060,7 +5048,6 @@ Black Lives Matter {fixed}
     <string name="server_insights">Аналитика сервера</string>
     <string name="server_mute">Заглушить сервер</string>
     <string name="server_muted">Вы заглушены сервером</string>
-    <string name="server_muted_dialog_body">Чтобы говорить на этом канале, попросите администраторов сервера вернуть вам это право.</string>
     <string name="server_muted_dialog_title">Вы заглушены сервером</string>
     <string name="server_name_required">Требуется название сервера.</string>
     <string name="server_options">Параметры сервера</string>
@@ -5872,7 +5859,6 @@ Black Lives Matter {fixed}
     <string name="verification_verified">E-mail подтверждён!</string>
     <string name="verification_verifying">Подтверждаем ваш e-mail</string>
     <string name="verified_bot_tooltip">Верифицированный бот</string>
-    <string name="verified_developer_badge_tooltip">Верифицированный разработчик бота</string>
     <string name="verify">Подтвердить</string>
     <string name="verify_account">Подтвердить учётную запись</string>
     <string name="verify_by">Подтвердить по</string>
@@ -6035,7 +6021,6 @@ Black Lives Matter {fixed}
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 месяца)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Похоже, что у вас уже есть подписка Nitro. Вы можете передать ссылку для активации другу и отправить ему 3 месяца бесплатного Nitro.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">О нет!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Поскольку у вас уже есть Xbox Game Pass, вы получаете 3 месяца Nitro бесплатно!</string>
     <string name="xbox_link">Привязать</string>
     <string name="xbox_pin_step1">Откройте приложение Discord на смартфоне</string>
     <string name="xbox_pin_step2">Перейдите в Настройки → Интеграции → Добавить</string>
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index 51558f89a2..48fe387413 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -2176,9 +2176,9 @@ Här hittar du även analyser av meddelandekanaler, Serveridentifiering och väl
     <string name="guild_owner">Serverägare</string>
     <string name="guild_partner_application_category_description">Vilken av följande kategorier beskriver bäst din server?</string>
     <string name="guild_partner_application_category_label">Kategorier</string>
-    <string name="guild_partner_application_connect">Anslut konton där du skapar</string>
     <string name="guild_partner_application_content_platform">Var skapar du i huvudsak innehåll?</string>
     <string name="guild_partner_application_country">Land</string>
+    <string name="guild_partner_application_creator_connect">Anslut konton där du skapar</string>
     <string name="guild_partner_application_description_description">Berätta om din server. Vad handlar den om? Vem riktar den sig till?</string>
     <string name="guild_partner_application_description_title">Serverbeskrivning</string>
     <string name="guild_partner_application_first_name">Förnamn</string>
@@ -2193,11 +2193,7 @@ Här hittar du även analyser av meddelandekanaler, Serveridentifiering och väl
     <string name="guild_partner_application_server_step_title">Vad handlar din community om?</string>
     <string name="guild_partner_application_subcategory_description">Du kan även välja upp till 5 underkategorier.</string>
     <string name="guild_partner_application_submit_step">Skicka in ansökan</string>
-    <string name="guild_partner_application_submit_step_description">Vi följer vanligtvis upp inom X dagar.</string>
-    <string name="guild_partner_application_submit_step_description_2">Varje Partner-ansökan granskas av Discord. Observera att en ansökan inte garanterar partnerskap.</string>
-    <string name="guild_partner_application_submit_step_title">Skicka bara in, så är det klart!</string>
     <string name="guild_partner_application_title">Ansök till Discord Partner-programmet</string>
-    <string name="guild_partner_application_type">Servertyp</string>
     <string name="guild_partner_application_type_brand">Affärer/varumärke</string>
     <string name="guild_partner_application_type_content">Skapare av innehåll/personlighet</string>
     <string name="guild_partner_application_type_fan">Intressegrupp eller community för fans</string>
@@ -2432,8 +2428,6 @@ Här hittar du även analyser av meddelandekanaler, Serveridentifiering och väl
     <string name="guild_settings_discovery_byline">Kvalificera dig för Identifiering och aktivera det. Din server kommer att visas i [Serveridentifiering.](onClick) Se till att det första intrycket blir bra!</string>
     <string name="guild_settings_discovery_checklist_2fa">2FA-krav för moderering aktiverad</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Medlemmar med modereringsbehörighet (d.v.s. administratörer eller moderatorer) måste ha 2FA aktiverat för att få utföra modereringshandlingar.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Detta fordrar att alla medlemmar med modereringsbehörighet har aktiverat 2FA innan de kan utföra modereringsåtgärder. Det här kan skydda mot otillåten användning av administratörs- eller modereringskonton. [Aktivera i inställningarna för moderering](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">2FA-krav för moderering saknas</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Genom att aktivera Identifiering godkänner du att följa våra [identifierbara serverriktlinjer.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Uppfyller ålderskrav</string>
     <string name="guild_settings_discovery_checklist_age_description">Servrar i Serveridentifiering måste vara minst %1$s gamla.</string>
@@ -2447,7 +2441,6 @@ Här hittar du även analyser av meddelandekanaler, Serveridentifiering och väl
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Öka antalet veckovisa kommunikatörer</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">En kommunikatör är någon som har pratat (röst eller text) på servern. Att anordna community-event eller hålla igång diskussionsämnen är bra sätt att uppmuntra fler till att prata.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">genomsnittliga kommunikatörer i veckan på din server</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Din server behöver fler besökande och pratande medlemmar varje vecka.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Bra jobbat! Din server uppfyller alla krav för få att vara med i Serveridentifiering.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Servrar i Identifiering måste ha en lägstanivå för aktivitet så att vi kan rekommendera aktiva servrar till Discords användare.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Klicka här för mer information</string>
@@ -2463,7 +2456,6 @@ Här hittar du även analyser av meddelandekanaler, Serveridentifiering och väl
     <string name="guild_settings_discovery_checklist_nsfw_description">Servernamnet, beskrivningen och kanalnamnen ser bra ut!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Fula ord hittade</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">minimumkrav</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Du måste förbättra möjligheten för nya användare att komma igång.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Förbättra upplevelsen för nya medlemmar</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"På servrar som får in fler än 10 nya medlemmar i veckan måste minst 10 %% stanna kvar. Minst 1 av 10 nykomlingar måste vara kvar i minst en vecka.
 
@@ -2473,7 +2465,6 @@ Fundera på hur nya medlemmar ser på din server. Kan de bli förvirrade eller v
     <string name="guild_settings_discovery_checklist_safe_description">Tack för att du följer våra Communityriktlinjer och håller din server trygg!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Din server har $[brutit mot våra Användarvillkor](doesNotHook) någon gång under de senaste 30 dagarna.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Din server har brutit mot våra [Användarvillkor](%1$s) eller [Riktlinjer för communityservrar](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Flaggad av trygghetsgruppen</string>
     <string name="guild_settings_discovery_checklist_score_explain">Detta beräknas som ett genomsnitt de senaste 8 veckorna, så det kan ta några veckor innan förändringar märks. Bara användare som har varit på Discord i 8 veckor eller längre räknas som besökare eller kommunikatörer.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ medlemmar</string>
     <string name="guild_settings_discovery_checklist_size_description">För närvarande är Identifiering endast begränsat till servrar med fler än %1$s medlemmar.</string>
@@ -3743,7 +3734,6 @@ fästa meddelanden … ännu."</string>
     <string name="no_thanks">Nej tack</string>
     <string name="no_user_limit">Ingen gräns</string>
     <string name="no_video_devices">Inga videoenheter</string>
-    <string name="no_video_permission_dialog_body">För att kunna använda video i den här röstkanalen måste du be dina serveradministratörer att ändra dina videobehörigheter.</string>
     <string name="no_video_permission_dialog_title">Ingen videobehörighet</string>
     <string name="noise_cancellation_off">Brusreducering av</string>
     <string name="noise_cancellation_on">Brusreducering på</string>
@@ -3958,6 +3948,7 @@ Fick du inbjudningslänken av en vän? Ange inbjudningslänken eller koden nedan
     <string name="one_user_typing">**%1$s** skriver …</string>
     <string name="ongoing_call">Pågående samtal</string>
     <string name="ongoing_call_connected_users">Pågående samtal – %1$s anslutna</string>
+    <string name="ongoing_call_tap_to_join">– Tryck för att gå med</string>
     <string name="ongoing_call_voice_quality_low">Å nej, en stor röd stapel. Din anslutning kämpar.</string>
     <string name="ongoing_call_you_are_all_alone">"Du är ensam i samtalet. 
  Det är möjligt för andra att gå med i den här chatten när som helst."</string>
@@ -4037,7 +4028,6 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
     <string name="paginator_of_pages">Sida %1$s av %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Discords Twitter borde ha mer information.</string>
-    <string name="partner_badge_tooltip">Discord-partner</string>
     <string name="password_length_error">Lösenord måste bestå av mellan 6 och 128 tecken</string>
     <string name="password_manager">Lösenordshanterare</string>
     <string name="password_manager_info_android">Om du använder en lösenordshanterare behöver du tillåta den i Tillgänglighetsinställningar -> Nedladdade tjänster. Oroa dig inte, vi kan ta dig dit.</string>
@@ -4535,7 +4525,6 @@ medan spelet är i fokus."</string>
     <string name="public_updates_channel_title">Moderatorkanal</string>
     <string name="publish_followed_news_body">Det här meddelandet skickas till alla servrar som följer den här kanalen. Du kan redigera eller radera det här meddelandet senare och det kommer att uppdateras på motsvarande sätt på de följande servrarna.</string>
     <string name="publish_followed_news_body_reach">Det här meddelandet skickas till **%1$s servrar** som följer den här kanalen. Du kan redigera eller radera det här meddelandet senare och det kommer att uppdateras på motsvarande sätt på de följande servrarna.</string>
-    <string name="publish_followed_news_body_settings">Se mer statistik i serverinställningarna.</string>
     <string name="publish_followed_news_fail_body">Du har nått gränsen på 10 publicerade meddelanden per timme. Men vi älskar din entusiasm, så försök igen om %1$s.</string>
     <string name="publish_followed_news_fail_title">Åh nej, en pop-up-ruta.</string>
     <string name="publish_followed_news_generic_body">Tyvärr, något gick snett.</string>
@@ -4880,7 +4869,6 @@ innan du försöker igen."</string>
 Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="server_deafen">Ljud av för servern</string>
     <string name="server_deafened">Ljud av på servern</string>
-    <string name="server_deafened_dialog_body">För att kunna lyssna i den här kanalen måste du be dina serveradministratörer att aktivera ditt ljud.</string>
     <string name="server_deafened_dialog_title">Ljud av på servern</string>
     <string name="server_desciption_empty">Berätta lite för världen om den här servern.</string>
     <string name="server_emoji">Server-emoji</string>
@@ -4889,7 +4877,6 @@ Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="server_folder_settings">Mappinställningar</string>
     <string name="server_mute">Tysta servern</string>
     <string name="server_muted">Tystad server</string>
-    <string name="server_muted_dialog_body">För att kunna prata på den här kanalen måste du be dina serveradministratörer att aktivera din mikrofon.</string>
     <string name="server_muted_dialog_title">Tystad server</string>
     <string name="server_name_required">Servernamn krävs.</string>
     <string name="server_options">Serveralternativ</string>
@@ -5687,7 +5674,6 @@ För att fortsätta använda Discord **behöver vi verifiera ditt konto.**"</str
     <string name="verification_verified">E-post verifierad!</string>
     <string name="verification_verifying">Verifierar din e-post</string>
     <string name="verified_bot_tooltip">Verifierad bot</string>
-    <string name="verified_developer_badge_tooltip">Verifierad bot-utvecklare</string>
     <string name="verify">Verifiera</string>
     <string name="verify_account">Bekräfta konto</string>
     <string name="verify_by">Bekräfta via</string>
@@ -5847,7 +5833,6 @@ frågor eller behöver hjälp."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 månader)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Det verkar tyvärr som att du redan har en Nitro-prenumeration. Du kan emellertid ge din inlösnings-URL till en vän och skicka 3 gratis Nitro-månader till honom eller henne.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Åh nej!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Eftersom du har Xbox Game Pass får du 3 månaders Nitro utan kostnad!</string>
     <string name="xbox_link">Länk</string>
     <string name="xbox_pin_step1">Öppna Discord-appen på din mobil</string>
     <string name="xbox_pin_step2">Gå till Inställningar > Anslutningar > Lägg till</string>
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index 2ac8e013ed..56b4cec1c4 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -2278,9 +2278,9 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="guild_owner">เจ้าของเซิร์ฟเวอร์</string>
     <string name="guild_partner_application_category_description">หมวดหมู่ในข้อใดต่อไปนี้อธิบายถึงเซิร์ฟเวอร์ของคุณได้ดีที่สุด</string>
     <string name="guild_partner_application_category_label">หมวดหมู่</string>
-    <string name="guild_partner_application_connect">เชื่อมต่อบัญชีที่คุณสร้าง</string>
     <string name="guild_partner_application_content_platform">โดยพื้นฐานแล้วคุณสร้างเนื้อหาที่ไหน</string>
     <string name="guild_partner_application_country">ประเทศ</string>
+    <string name="guild_partner_application_creator_connect">เชื่อมต่อบัญชีที่คุณสร้าง</string>
     <string name="guild_partner_application_description_description">บอกเราเกี่ยวกับเซิร์ฟเวอร์ของคุณ เกี่ยวกับอะไร และเพื่อใคร</string>
     <string name="guild_partner_application_description_title">คำบรรยายเซิร์ฟเวอร์</string>
     <string name="guild_partner_application_first_name">ชื่อจริง</string>
@@ -2295,11 +2295,7 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="guild_partner_application_server_step_title">ชุมชนของคุณเกี่ยวกับอะไร</string>
     <string name="guild_partner_application_subcategory_description">คุณสามารถเลือกได้สูงสุดถึง 5 หมวดหมู่ย่อย</string>
     <string name="guild_partner_application_submit_step">ส่งใบสมัคร</string>
-    <string name="guild_partner_application_submit_step_description">เรามักจะติดตามผลภายใน X วัน</string>
-    <string name="guild_partner_application_submit_step_description_2">การสมัครพาร์ทเนอร์แต่ละครั้งจะได้รับการตรวจสอบโดย Discord โปรดทราบว่าการสมัครไม่ได้การันตีความเป็นพาร์ทเนอร์</string>
-    <string name="guild_partner_application_submit_step_title">แค่ส่งแล้วคุณก็เสร็จแล้ว!</string>
     <string name="guild_partner_application_title">สมัครเข้าร่วมโครงการ Discord พาร์ทเนอร์</string>
-    <string name="guild_partner_application_type">ประเภทเซิร์ฟเวอร์</string>
     <string name="guild_partner_application_type_brand">ธุรกิจ / แบรนด์</string>
     <string name="guild_partner_application_type_content">ผู้สร้างเนื้อหา / บุคคล</string>
     <string name="guild_partner_application_type_fan">กลุ่มความสนใจหรือชุมชนแฟนคลับ</string>
@@ -2534,8 +2530,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="guild_settings_discovery_byline">ผ่านเกณฑ์แล้วเปิดใช้งานการค้นพบ เซิร์ฟเวอร์ของคุณจะแสดงขึ้นใน [การค้นพบเซิร์ฟเวอร์](onClick) อย่าลืมสร้างความประทับใจตั้งแต่ครั้งแรก</string>
     <string name="guild_settings_discovery_checklist_2fa">เปิดใช้ข้อกำหนด 2FA สำหรับการคัดกรอง</string>
     <string name="guild_settings_discovery_checklist_2fa_description">สมาชิกที่มีอำนาจทำการคัดกรอง (เช่น แอดมินหรือม็อด) ต้องได้รับอนุญาต 2FA เพื่อทำการคัดกรอง</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">การดำเนินการนี้กำหนดให้สมาชิกทั้งหมดที่มีอำนาจในการตรวจสอบดูแลต้องเปิดใช้การยืนยันสองชั้น (2FA) ก่อน จึงจะเริ่มตรวจสอบดูแลได้ ซึ่งจะช่วยป้องกันไม่ให้ข้อมูลบัญชีของแอดมินหรือผู้ดูแลรั่วไหล [เปิดใช้งานได้ในการตั้งค่าการตรวจสอบดูแล](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">ขาดข้อกำหนด 2FA สำหรับการคัดกรอง</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">การเปิดใช้งานการค้นพบ จะถือว่าคุณได้ยินยอมปฏิบัติตาม [คู่มือเซิร์ฟเวอร์ที่ค้นหาได้](%1$s) ของเรา</string>
     <string name="guild_settings_discovery_checklist_age">มีอายุตรงตามที่กำหนด</string>
     <string name="guild_settings_discovery_checklist_age_description">เซิร์ฟเวอร์ในการค้นพบต้องมีอายุอย่างน้อย %1$s</string>
@@ -2549,7 +2543,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="guild_settings_discovery_checklist_communicator_failing_action">เพิ่มจำนวนผู้สื่อสารรายสัปดาห์</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">ผู้สื่อสารคือผู้ที่ได้พูดคุย (ทางเสียงหรือข้อความ) ในเซิร์ฟเวอร์ การจัดกิจกรรมชุมชนและสร้างหัวข้อการพูดคุยเป็นวิธีการที่ยอดเยี่ยมในการสนับสนุนให้ผู้คนพูดคุยกันมากขึ้น</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">จำนวนผู้สื่อสารในเซิร์ฟเวอร์ของคุณเฉลี่ยรายสัปดาห์</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">เซิร์ฟเวอร์ของคุณต้องการสมาชิกที่เข้ามาเยี่ยมชมและพูดคุยกันต่อสัปดาห์เพิ่มมากขึ้น</string>
     <string name="guild_settings_discovery_checklist_good_standing">เยี่ยมไปเลย! เซิร์ฟเวอร์ของคุณผ่านเงื่อนไขทุกข้อในการเข้าสู่การค้นพบเซิร์ฟเวอร์</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">เพื่อให้แน่ใจว่าเราแนะนำเพียงเซิร์ฟเวอร์ที่มีการใช้งานให้แก่ผู้ใช้ Discord เซิร์ฟเวอร์ในการค้นพบจะต้องมีระดับกิจกรรมขั้นต่ำ</string>
     <string name="guild_settings_discovery_checklist_health_view_details">คลิกที่นี่เพื่อดูรายละเอียดเพิ่มเติม</string>
@@ -2565,7 +2558,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="guild_settings_discovery_checklist_nsfw_description">ชื่อเซิร์ฟเวอร์ของคุณ, คำบรรยาย, และชื่อของช่องดูสะอาดขึ้นมาทันที!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">พบคำหยาบคาย</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">ข้อกำหนดขั้นต่ำ</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">คุณจำเป็นต้องปรับปรุงประสบการณ์ระหว่างการใช้งานสำหรับสมาชิกใหม่</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">ปรับปรุงประสบการณ์สำหรับสมาชิกใหม่</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"เซิร์ฟเวอร์ที่มีสมาชิกใหม่มากกว่า 10 รายต่อสัปดาห์ต้องมีการเก็บรักษาสมาชิกที่ 10%% สมาชิกใหม่อย่างน้อย 1 จาก 10 รายที่เข้าร่วมควรอยู่ถึงประมาณหนึ่งสัปดาห์ขึ้นไป 
 
@@ -2575,7 +2567,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="guild_settings_discovery_checklist_safe_description">ขอบคุณที่ปฏิบัติตามแนวทางปฏิบัติในชุมชนของเราและรักษาเซิร์ฟเวอร์ให้ปลอดภัยอยู่เสมอ!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">เซิร์ฟเวอร์ของคุณ$[ละเมิดเงื่อนไขการให้บริการของเรา](doesNotHook)ภายใน 30 วันที่ผ่านมา</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">เซิร์ฟเวอร์ของคุณละเมิด[เงื่อนไขการให้บริการ](%1$s)หรือ[แนวทางปฏิบัติของเซิร์ฟเวอร์ชุมชน](%2$s)ของเรา</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">ปักธงไว้โดยทีมรักษาความปลอดภัยมั่นคง</string>
     <string name="guild_settings_discovery_checklist_score_explain">จะคำนวณค่าเฉลี่ยจาก 8 สัปดาห์ที่ผ่านมา ดังนั้นจึงอาจใช้เวลาถึงสองสามสัปดาห์จึงจะเห็นการเปลี่ยนแปลง สำหรับผู้ใช้ที่ใช้งาน Discord 8 สัปดาห์ขึ้นไปเท่านั้นจึงจะนับว่าเป็นผู้เยี่ยมชมหรือผู้สื่อสาร</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ สมาชิก</string>
     <string name="guild_settings_discovery_checklist_size_description">ตอนนี้ การค้นพบถูกจำกัดไว้ให้เฉพาะเซิร์ฟเวอร์ที่มีสมาชิกมากกว่า %1$s คน</string>
@@ -3854,7 +3845,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="no_thanks">ไม่ดีกว่า</string>
     <string name="no_user_limit">ไม่จำกัด</string>
     <string name="no_video_devices">ไม่มีอุปกรณ์วิดีโอ</string>
-    <string name="no_video_permission_dialog_body">ขอให้ผู้ดูแลเซิร์ฟเวอร์เปลี่ยนแปลงการอนุญาตวิดีโอของคุณ หากต้องการเปิดวิดีโอของคุณในช่องสำหรับพูดนี้</string>
     <string name="no_video_permission_dialog_title">ไม่มีการอนุญาตวิดีโอ</string>
     <string name="noise_cancellation_off">ปิดการลดเสียงรบกวน</string>
     <string name="noise_cancellation_on">เปิดการลดเสียงรบกวน</string>
@@ -4071,6 +4061,7 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="one_user_typing">**%1$s** กำลังพิมพ์…</string>
     <string name="ongoing_call">อยู่ระหว่างการโทร</string>
     <string name="ongoing_call_connected_users">อยู่ระหว่างการโทร — %1$s เชื่อมต่อสำเร็จ</string>
+    <string name="ongoing_call_tap_to_join">— แตะเพื่อเข้าร่วม</string>
     <string name="ongoing_call_voice_quality_low">โอ้ไม่เป็นแถบสีแดงขนาดใหญ่ การเชื่อมต่อของคุณกำลังดิ้นรน</string>
     <string name="ongoing_call_you_are_all_alone">"คุณอยู่คนเดียวในการโทรนี้ 
  คนอื่น ๆ ในการแชทนี้สามารถเข้าร่วมได้ตลอดเวลา"</string>
@@ -4152,7 +4143,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="paginator_of_pages">หน้า %1$s จาก %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s ทวิตเตอร์ของ Discord ต้องมีข้อมูลมากกว่านี้</string>
-    <string name="partner_badge_tooltip">Discord พาร์ทเนอร์</string>
     <string name="password_length_error">รหัสผ่านต้องมีความยาว 6 ถึง128 ตัวอักษร</string>
     <string name="password_manager">โปรแกรมจัดการรหัสผ่าน</string>
     <string name="password_manager_info_android">ถ้าคุณใช้โปรแกรมจัดการรหัสผ่าน คุณต้องอนุญาตให้ใช้กับ Discord ที่หน้าการตั้งค่าการเข้าใช้ -> โปรแกรมที่ดาวน์โหลด ไม่ต้องห่วง เราพาคุณไปได้</string>
@@ -4651,7 +4641,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="public_updates_channel_title">ช่องสำหรับผู้ดูแลเท่านั้น</string>
     <string name="publish_followed_news_body">ข้อความเหล่านี้จะถูกส่งถึงเซิร์ฟเวอร์ทั้งหมดที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป</string>
     <string name="publish_followed_news_body_reach">ข้อความเหล่านี้จะถูกส่งถึง **%1$s เซิร์ฟเวอร์** ที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป</string>
-    <string name="publish_followed_news_body_settings">ดูสถิติในตั้งค่าเซิร์ฟเวอร์</string>
     <string name="publish_followed_news_fail_body">คุณถึงขีดจำกัดการเผยแพร่ข้อความสาธารณะ 10 ข้อความต่อชั่วโมงแล้ว แต่เราชอบความกระตือรือร้น โปรดลองใหม่อีกครั้งใน %1$s</string>
     <string name="publish_followed_news_fail_title">อ๊ะ! กล่องป๊อปอัพ</string>
     <string name="publish_followed_news_generic_body">ขออภัย บางอย่างผิดพลาด…</string>
@@ -5001,7 +4990,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
 เหล่านี้ได้"</string>
     <string name="server_deafen">ปิดหูฟังเซิร์ฟเวอร์</string>
     <string name="server_deafened">ปิดหูฟังเซิร์ฟเวอร์แล้ว</string>
-    <string name="server_deafened_dialog_body">ขอให้ผู้ดูแลของเซิร์ฟเวอร์ให้เปิดการได้ยินของคุณ หากต้องการพูดในช่องนี้</string>
     <string name="server_deafened_dialog_title">ปิดหูฟังเซิร์ฟเวอร์แล้ว</string>
     <string name="server_desciption_empty">บอกให้โลกรู้จักเซิร์ฟเวอร์เพิ่มอีกสักนิด</string>
     <string name="server_emoji">อิโมจิของเซิร์ฟเวอร์</string>
@@ -5011,7 +4999,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="server_insights">ข้อมูลเชิงลึกของเซิร์ฟเวอร์</string>
     <string name="server_mute">ปิดเสียงเซิร์ฟเวอร์</string>
     <string name="server_muted">เซิร์ฟเวอร์ที่ปิดเสียง</string>
-    <string name="server_muted_dialog_body">ขอให้ผู้ดูแลของเซิร์ฟเวอร์ให้เปิดเสียงไมค์ของคุณ หากต้องการพูดในช่องนี้</string>
     <string name="server_muted_dialog_title">เซิร์ฟเวอร์ที่ปิดเสียง</string>
     <string name="server_name_required">จำเป็นต้องระบุชื่อเซิร์ฟเวอร์</string>
     <string name="server_options">การตั้งค่าเซิฟเวอร์</string>
@@ -5820,7 +5807,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="verification_verified">อีเมลตรวจสอบแล้ว</string>
     <string name="verification_verifying">กำลังตรวจสอบอีเมลของคุณ</string>
     <string name="verified_bot_tooltip">บอทที่ผ่านการยืนยัน</string>
-    <string name="verified_developer_badge_tooltip">ผู้พัฒนาบอทที่ผ่านการยืนยัน</string>
     <string name="verify">ยืนยัน</string>
     <string name="verify_account">ยืนยันบัญชีผู้ใช้</string>
     <string name="verify_by">ยืนยันโดย</string>
@@ -5981,7 +5967,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 เดือน)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">โทษที ดูเหมือนว่าคุณเป็นสมาชิก Nitro แล้ว แต่คุณให้ URL แลกสิทธิ์นี้ให้กับเพื่อนได้ และส่ง Nitro ฟรี 3 เดือนให้พวกเขา</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">โอ้ไม่นะ!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">เนื่องจากคุณมี Xbox Game Pass คุณจะได้รับ Nitro 3 เดือนฟรี!</string>
     <string name="xbox_link">ลิงก์</string>
     <string name="xbox_pin_step1">เปิดแอป Discord ในโทรศัพท์ของคุณ</string>
     <string name="xbox_pin_step2">ไปที่การตั้งค่า > การเชื่อมต่อ > เพิ่ม</string>
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index c5f2d061ea..07500c98ce 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -2269,9 +2269,9 @@ Duyuru Kanalları, Sunucu Keşfi ve Hoş Geldin Ekranı hakkındaki analizler de
     <string name="guild_owner">Sunucu Sahibi</string>
     <string name="guild_partner_application_category_description">Aşağıdaki kategorilerden hangisi sunucunu en iyi tanımlıyor?</string>
     <string name="guild_partner_application_category_label">Kategoriler</string>
-    <string name="guild_partner_application_connect">İçerik ürettiğin hesapları bağla</string>
     <string name="guild_partner_application_content_platform">İçeriklerini genel olarak hangi platformda üretiyorsun?</string>
     <string name="guild_partner_application_country">Ülke</string>
+    <string name="guild_partner_application_creator_connect">İçerik ürettiğin hesapları bağla</string>
     <string name="guild_partner_application_description_description">Bize sunucundan bahset. Neyle ilgili? Kimler için?</string>
     <string name="guild_partner_application_description_title">Sunucu Açıklaması</string>
     <string name="guild_partner_application_first_name">Adı</string>
@@ -2286,11 +2286,7 @@ Duyuru Kanalları, Sunucu Keşfi ve Hoş Geldin Ekranı hakkındaki analizler de
     <string name="guild_partner_application_server_step_title">Topluluğun neyle ilgili?</string>
     <string name="guild_partner_application_subcategory_description">En fazla 5 alt kategori seçebilirsin.</string>
     <string name="guild_partner_application_submit_step">Başvuru Gönder</string>
-    <string name="guild_partner_application_submit_step_description">Genelde X gün içinde dönüş yapıyoruz.</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord, her Ortak başvurusunu inceler. Lütfen başvuru işleminin Ortaklık garantili olmadığını unutma.</string>
-    <string name="guild_partner_application_submit_step_title">Başvurunu göndermekten başka bir şey yapmana gerek yok!</string>
     <string name="guild_partner_application_title">"Discord Ortağı Programı'na başvur"</string>
-    <string name="guild_partner_application_type">Sunucu Türü</string>
     <string name="guild_partner_application_type_brand">İş / Marka</string>
     <string name="guild_partner_application_type_content">İçerik Üreticisi / Kişilik</string>
     <string name="guild_partner_application_type_fan">İlgi Grubu ya da Hayran Topluluğu</string>
@@ -2525,8 +2521,6 @@ Duyuru Kanalları, Sunucu Keşfi ve Hoş Geldin Ekranı hakkındaki analizler de
     <string name="guild_settings_discovery_byline">"Keşif şartlarını sağlayarak ve onu etkinleştirerek sunucunun [Sunucu Keşfi'nde görünmesini sağlayabilirsin.](onClick) İyi bir izlenim bırakmaya hazır olduğundan emin ol!"</string>
     <string name="guild_settings_discovery_checklist_2fa">İki Aşamalı Moderasyon Doğrulaması Etkin</string>
     <string name="guild_settings_discovery_checklist_2fa_description">"Moderasyon yetkilerine sahip üyelerin (ör. yöneticiler veya mod'lar) moderasyon işlemleri yapabilmeleri için İki Aşamalı Doğrulama'yı etkinleştirmiş olmaları gerekir."</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">"Bunun için, moderasyon yetkileri olan tüm üyeler, moderasyon işlemleri gerçekleştirmeden önce 2AD'yi etkinleştirmiş olmalıdırlar. Bu, ele geçirilen yönetici veya mod hesaplarına karşı koruma sağlayabilir. [Moderasyon ayarlarında etkinleştir](onClick)"</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">İki Aşamalı Moderasyon Doğrulaması Eksik</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Keşif özelliğini etkinleştirerek [Keşfedilebilir Sunucu İlkelerimizi](%1$s) kabul etmiş olursun.</string>
     <string name="guild_settings_discovery_checklist_age">Yaş Şartını Karşılıyor</string>
     <string name="guild_settings_discovery_checklist_age_description">Keşif içindeki sunucuların en az %1$s olması gerekiyor.</string>
@@ -2540,7 +2534,6 @@ Duyuru Kanalları, Sunucu Keşfi ve Hoş Geldin Ekranı hakkındaki analizler de
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Haftalık iletişimci sayısını arttır</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Sunucuda sesli veya yazılı olarak konuşan kullanıcılara iletişimci denir. Topluluk etkinlikleri düzenlemek ve tartışma konuları açmak insanları konuşmaya teşvik etmek için güzel yöntemlerdir.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">Sunucundaki haftalık ortalama iletişimci sayısı</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Sunucunun haftalık olarak ziyaret eden ve konuşan daha fazla üyeye ihtiyacı var.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Tebrikler! Sunucun tüm Sunucu Keşfi şartlarını sağladı.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">"Discord kullanıcılarına yalnızca etkin sunucuları gösterdiğimizden emin olabilmemiz için Keşif'teki sunucuların sahip olması gereken minimum bir etkinlik seviyesi var."</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Daha fazla bilgi için buraya tıkla</string>
@@ -2556,7 +2549,6 @@ Duyuru Kanalları, Sunucu Keşfi ve Hoş Geldin Ekranı hakkındaki analizler de
     <string name="guild_settings_discovery_checklist_nsfw_description">Sunucu adın, açıklaman ve kanal adların temiz görünüyor!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Kötü Söz Bulundu</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">min. gereklilik</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Yeni katılan üyeleri karşılama sürecini iyileştirmen gerekiyor.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Yeni üye deneyimini iyileştir</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Haftada en az 10 yeni üye alan sunucuların %%10'luk bir üye tutma oranına sahip olması gerekir. Yeni katılan 10 kişiden en az 1 tanesinin bir hafta veya daha fazla sunucuda kalması gerekir.
 
@@ -2566,7 +2558,6 @@ Sunucuna yeni bir üyenin gözlerinden bakmaya çalış. Kafasını karıştıra
     <string name="guild_settings_discovery_checklist_safe_description">Topluluk İlkelerimize uyduğun ve sunucunu güvenli bir yer haline getirdiğin için teşekkür ederiz!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Sunucun son 30 gün içinde $[Hizmet Koşullarımızı ihlal ediyordu](doesNotHook).</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Sunucun [Hizmet Koşullarımızı](%1$s) veya [Topluluk Sunucusu İlkelerimizi](%2$s) ihlal ediyordu.</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Güven ve Güvenlik tarafından mimlendi</string>
     <string name="guild_settings_discovery_checklist_score_explain">"Son 8 haftanın hareketli ortalaması olarak hesaplandığı için değişikliklerin belirmesi birkaç hafta sürebilir. Yalnızca en az 8 haftadır Discord'da bulunan kullanıcılar ziyaretçi veya iletişimci olarak sayılır."</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ Üye</string>
     <string name="guild_settings_discovery_checklist_size_description">Şimdilik, Keşif sadece %1$s üzeri üyeye sahip sunucularla sınırlıdır.</string>
@@ -3847,7 +3838,6 @@ hiçbir sabitlenmiş mesajı yok… henüz."</string>
     <string name="no_thanks">Hayır, teşekkürler</string>
     <string name="no_user_limit">Limit yok</string>
     <string name="no_video_devices">Görüntü Cihazı Yok</string>
-    <string name="no_video_permission_dialog_body">Bu ses kanalında görüntü açmak için sunucu yöneticilerinden görüntü izinlerini değiştirmelerini iste.</string>
     <string name="no_video_permission_dialog_title">Görüntü İzni Yok</string>
     <string name="noise_cancellation_off">Gürültü Azaltma Kapalı</string>
     <string name="noise_cancellation_on">Gürültü Azaltma Açık</string>
@@ -4064,6 +4054,7 @@ Bir arkadaşından davet bağlantısı aldın mı? Davet bağlantısını veya k
     <string name="one_user_typing">**%1$s** yazıyor…</string>
     <string name="ongoing_call">Devam Eden Arama</string>
     <string name="ongoing_call_connected_users">Devam Eden Arama — %1$s Kullanıcı Bağlı</string>
+    <string name="ongoing_call_tap_to_join">- Katılmak için dokun</string>
     <string name="ongoing_call_voice_quality_low">Olamaz, büyük kırmızı bir çizgi görünüyor. Bağlantın güçlü değil.</string>
     <string name="ongoing_call_you_are_all_alone">"Bu aramada tek başınasın. 
  Bu sohbetteki diğer kişiler istedikleri zaman katılabilirler."</string>
@@ -4144,7 +4135,6 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="paginator_of_pages">Sayfa %1$s / %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Discord Twitter hesabında daha fazla bilgi bulabilirsin.</string>
-    <string name="partner_badge_tooltip">Discord Ortağı</string>
     <string name="password_length_error">Şifrelerin 6 ila 128 karakter olması gerekir</string>
     <string name="password_manager">Şifre Yöneticisi</string>
     <string name="password_manager_info_android">Bir şifre yöneticisi kullanırsan Erişilebilirlik Ayarları -> İndirilen Hizmetler bölümünden buna izin vermen gerekiyor. Merak etme, biz seni oraya götürürüz.</string>
@@ -4643,7 +4633,6 @@ algılamasını etkinleştirmek için lütfen oyun odakta iken Discord'u yöneti
     <string name="public_updates_channel_title">Moderatörlere Özel Kanal</string>
     <string name="publish_followed_news_body">Bu mesaj, bu kanalı takip eden tüm sunuculara gönderilecektir. Bu mesajı daha sonra düzenleyebilir veya silebilirsin ve ilgili mesaj her sunucuda gerekli şekilde güncellenir.</string>
     <string name="publish_followed_news_body_reach">Bu mesaj, bu kanalı takip eden **%1$s sunucuya gönderilecektir. Bu mesajı daha sonra düzenleyebilir veya silebilirsin ve ilgili mesaj her sunucuda gerekli şekilde güncellenir.</string>
-    <string name="publish_followed_news_body_settings">"Sunucu Ayarları'ndan daha fazla istatistiğe bak."</string>
     <string name="publish_followed_news_fail_body">Saatlik 10 mesaj gönderme sınırına ulaştın, ama coşkunu beğendik, lütfen %1$s sonra tekrar dene.</string>
     <string name="publish_followed_news_fail_title">Olamaz, bir açılır pencere.</string>
     <string name="publish_followed_news_generic_body">Üzgünüz, bir hata oluştu.</string>
@@ -4991,7 +4980,6 @@ Hangi ekranı paylaşmak istediğini seç."</string>
 kanala odaklanmış herkes tarafından dinlenebilir."</string>
     <string name="server_deafen">Sunucuda Sağırlaştır</string>
     <string name="server_deafened">Sunucuda Sağırlaştırıldı</string>
-    <string name="server_deafened_dialog_body">Bu kanalı dinlemek için sunucu yöneticilerinden sağırlığını kaldırmalarını iste.</string>
     <string name="server_deafened_dialog_title">Sunucuda Sağırlaştırıldı</string>
     <string name="server_desciption_empty">Dünyaya bu sunucu hakkında bir şeyler söyle.</string>
     <string name="server_emoji">Sunucu Emojisi</string>
@@ -5001,7 +4989,6 @@ kanala odaklanmış herkes tarafından dinlenebilir."</string>
     <string name="server_insights">Sunucu Bilgileri</string>
     <string name="server_mute">Sunucuyu Sustur</string>
     <string name="server_muted">Sunucuda Susturuldu</string>
-    <string name="server_muted_dialog_body">Bu kanalda konuşmak için sunucu yöneticilerinden susturmanı kaldırmalarını iste.</string>
     <string name="server_name_required">Sunucuya lütfen bir isim verin.</string>
     <string name="server_options">Sunucu Ayarları</string>
     <string name="server_overview">Sunucuya Genel Bakış</string>
@@ -5810,7 +5797,6 @@ Discord'u kullanmaya devam etmek için, **hesabını doğrulamamız gerek.**"</s
     <string name="verification_verified">E-posta Doğrulandı!</string>
     <string name="verification_verifying">E-postan doğrulanıyor</string>
     <string name="verified_bot_tooltip">Doğrulanmış Bot</string>
-    <string name="verified_developer_badge_tooltip">Doğrulanmış Bot Geliştiricisi</string>
     <string name="verify">Doğrula</string>
     <string name="verify_account">Hesabını Doğrula</string>
     <string name="verify_by">Şununla doğrula</string>
@@ -5970,7 +5956,6 @@ yardım gerekiyor ise bize [yardım masamızdan](%1$s) veya Twitter [@discord](%
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 ay)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">"Üzgünüz, görünüşe göre zaten bir Nitro aboneliğin var. Ama kullanım URL'ni bir arkadaşına verebilir ve ona 3 aylık ücretsiz Nitro kazandırabilirsin."</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Olamaz!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">"Xbox Game Pass'e sahip olduğun için 3 aylık ücretsiz Nitro kazandın!"</string>
     <string name="xbox_link">Bağlantı</string>
     <string name="xbox_pin_step1">Discord uygulamasını telefonunda aç</string>
     <string name="xbox_pin_step2">Ayarlar > Bağlantılar > Ekle bölümüne git</string>
diff --git a/com.discord/res/values-uk/plurals.xml b/com.discord/res/values-uk/plurals.xml
index 9251e07c42..420df3643c 100644
--- a/com.discord/res/values-uk/plurals.xml
+++ b/com.discord/res/values-uk/plurals.xml
@@ -30,6 +30,11 @@
         <item quantity="one">1 рік</item>
         <item quantity="few">%s роки</item>
     </plurals>
+    <plurals name="age_gate_underage_existing_body_deletion_with_days_days">
+        <item quantity="other">%s днів</item>
+        <item quantity="one">1 день</item>
+        <item quantity="few">%s дні</item>
+    </plurals>
     <plurals name="announcement_edit_rate_limit_retryAfterMinutes">
         <item quantity="other">%s хв</item>
         <item quantity="one">1 хвилину</item>
diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml
index dcfaefb532..8e8cdda708 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -212,6 +212,7 @@
     <string name="age_gate_underage_body_default_message">Для використання Discord ти маєш бути віком 13 років або старше.</string>
     <string name="age_gate_underage_body_post_register_message">Виходячи з наданої тобою інформації, ми наразі не можемо створити для тебе акаунт.</string>
     <string name="age_gate_underage_existing_body_deletion">У тебе є **14** днів, щоб підтвердити свій вік, перш ніж твій акаунт буде видалено. Перевір свою електронну пошту, на яку ми відправили інструкції з підтвердження твого віку.</string>
+    <string name="age_gate_underage_existing_body_deletion_with_days">У тебе є **%1$s**, щоб підтвердити свій вік, перш ніж твій акаунт буде видалений. Перевір свою електронну пошту, на яку ми відправили інструкції з підтвердження твого віку.</string>
     <string name="age_gate_underage_existing_header">На жаль, виникла проблема.</string>
     <string name="age_gate_underage_header">Неможливо зареєструватися</string>
     <string name="age_gate_view_help_article">Дивитися статтю довідки</string>
@@ -2290,9 +2291,9 @@
     <string name="guild_owner">Власник сервера</string>
     <string name="guild_partner_application_category_description">Яка з наведених далі категорій найточніше описує твій сервер?</string>
     <string name="guild_partner_application_category_label">Категорії</string>
-    <string name="guild_partner_application_connect">Підключити акаунти, на яких ти створюєш контент</string>
     <string name="guild_partner_application_content_platform">Де ти зазвичай створюєш контент?</string>
     <string name="guild_partner_application_country">Країна</string>
+    <string name="guild_partner_application_creator_connect">Підключити акаунти, на яких ти створюєш контент</string>
     <string name="guild_partner_application_description_description">Розкажи про свій сервер. Про що він? Для кого він?</string>
     <string name="guild_partner_application_description_title">Опис сервера</string>
     <string name="guild_partner_application_first_name">"Ім'я"</string>
@@ -2307,11 +2308,7 @@
     <string name="guild_partner_application_server_step_title">Про що твоя спільнота?</string>
     <string name="guild_partner_application_subcategory_description">Ти можеш вибрати до 5 підкатегорій.</string>
     <string name="guild_partner_application_submit_step">Відправити заявку</string>
-    <string name="guild_partner_application_submit_step_description">Ми зазвичай відповідаємо протягом Х дн.</string>
-    <string name="guild_partner_application_submit_step_description_2">Ми розглядаємо кожну заявка на вступ до партнерів Discord. Зверни увагу, що подання заявки не гарантує партнерство.</string>
-    <string name="guild_partner_application_submit_step_title">Відправ, і на цьому все!</string>
     <string name="guild_partner_application_title">Подати заявку на вступ до партнерської програми Discord</string>
-    <string name="guild_partner_application_type">Тип сервера</string>
     <string name="guild_partner_application_type_brand">Бізнес / бренд</string>
     <string name="guild_partner_application_type_content">Автор контенту / особа</string>
     <string name="guild_partner_application_type_fan">Група за інтересом або спільнота прихильників</string>
@@ -2545,8 +2542,6 @@
     <string name="guild_settings_discovery_byline">Якщо ти виконаєш вимоги та активуєш знайомство для свого сервера, він буде відображатися в категорії [Знайомство з серверами.](onClick) Переконайся, що ти вже готовий створити гарне враження!</string>
     <string name="guild_settings_discovery_checklist_2fa">Вимога двофакторної аутентифікації для модерації увімкнена</string>
     <string name="guild_settings_discovery_checklist_2fa_description">"Учасники з правами модератора (адміністратори або модератори) зобов'язані активувати двофакторну аутентифікацію, щоб проводити модерацію."</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Потрібно, щоб для всіх учасників із правами модерації була ввімкнена двофакторна аутентифікація, перш ніж вони зможуть виконувати дії з модерації. Це може допомогти захистити акаунти адміністраторів та модераторів від зламу. [Увімкнути в розділі налаштування модерації](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Відсутня вимога двофакторної аутентифікації для модерації</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Активуючи знайомство з серверами, ти погоджуєшся з нашими [Порадами щодо знайомства з серверами.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Відповідає вимогам щодо віку</string>
     <string name="guild_settings_discovery_checklist_age_description">Вік серверів у категорії «Знайомство з серверами» має становити щонайменше %1$s.</string>
@@ -2560,7 +2555,6 @@
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Збільш кількість співрозмовників на тиждень</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Співрозмовник — це той, хто використовує текстові або голосові чати на сервері для спілкування. Проведення подій спільноти та запровадження тем для обговорення чудово підходять для заохочення людей до розмови.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">середня кількість співрозмовників на твоєму сервері</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Твоєму серверу потрібно більше відвідувачів, які спілкуються на ньому щотижнево.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Чудова робота! Твій сервер відповідає всім вимогам для додання в категорію «Знайомство з серверами».</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Щоб переконатися, що ми рекомендуємо користувачам Discord виключно активні сервери, для категорії «Знайомство з серверами» було встановлено мінімальний рівень активності.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Щоб отримати додаткову інформацію, натисни тут</string>
@@ -2576,7 +2570,6 @@
     <string name="guild_settings_discovery_checklist_nsfw_description">Назва твого сервера, його опис та імена каналів виглядають чудово!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Знайдено лайливі слова</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">мін. потрібно</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Тобі треба покращити хід знайомства з сервером для нових учасників.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Покращ перебування на сервері для нових учасників</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Сервери, які отримують більше 10 нових учасників на тиждень, мають мати показник утримання нових учасників 10%%. Необхідно, щоб принаймні 1 з 10 нових учасників затримався на сервері більше тижня.
 
@@ -2586,7 +2579,6 @@
     <string name="guild_settings_discovery_checklist_safe_description">Дякуємо за дотримання наших порад для спільнот і забезпечення безпеки твого сервера!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Протягом останніх 30 днів твій сервер $[порушував наші умови надання послуг](doesNotHook).</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Твій сервер порушував наші [Умови надання послуг](%1$s) або [Поради для серверів спільнот](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Відмічено командою фахівців з довіри та безпеки</string>
     <string name="guild_settings_discovery_checklist_score_explain">Підраховується як змінне середнє за останні 8 тижнів, тому зміни можуть бути помітні лише через кілька тижнів. Відвідувачами або співрозмовниками вважаються лише ті користувачі, які знаходились в Discord понад 8 тижнів.</string>
     <string name="guild_settings_discovery_checklist_size">Понад %1$s учасників</string>
     <string name="guild_settings_discovery_checklist_size_description">Відтепер для участі в категорії «Знайомство з серверами» сервер має мати більше %1$s учасників.</string>
@@ -3869,7 +3861,6 @@
     <string name="no_thanks">Ні, дякую</string>
     <string name="no_user_limit">Ліміт не встановлено</string>
     <string name="no_video_devices">Немає відеопристроїв</string>
-    <string name="no_video_permission_dialog_body">Щоб увімкнути відео в цьому голосовому каналі, попроси адміністраторів сервера змінити твої дозволи для відео.</string>
     <string name="no_video_permission_dialog_title">Немає дозволу для відео</string>
     <string name="noise_cancellation_off">Поглинання шуму вимкн.</string>
     <string name="noise_cancellation_on">Поглинання шуму ввімкн.</string>
@@ -4086,6 +4077,7 @@
     <string name="one_user_typing">**%1$s** пише…</string>
     <string name="ongoing_call">Поточний виклик</string>
     <string name="ongoing_call_connected_users">Поточний виклик – %1$s підключені</string>
+    <string name="ongoing_call_tap_to_join">— Натисни, щоб приєднатися!</string>
     <string name="ongoing_call_voice_quality_low">О, ні, велика червона панель. У тебе проблеми з підключенням.</string>
     <string name="ongoing_call_you_are_all_alone">"Крім тебе в цьому виклику немає нікого. 
  Інші учасники цього чату можуть приєднатися в будь-який момент."</string>
@@ -4167,7 +4159,6 @@
     <string name="paginator_of_pages">Сторінка %1$s з %2$s</string>
     <string name="partial_outage">Ще %1$s</string>
     <string name="partial_outage_a11y">%1$sБільше інформації має бути в Twitter Discord.</string>
-    <string name="partner_badge_tooltip">Партнер Discord</string>
     <string name="password_length_error">Паролі мають містити від 6 до 128 символів</string>
     <string name="password_manager">Менеджер паролів</string>
     <string name="password_manager_info_android">Якщо ти використовуєш менеджер паролів, надай дозвіл на його використання в меню «Налаштування доступу» -> «Завантажені сервіси». Не хвилюйся, ми тебе туди відведемо.</string>
@@ -4669,7 +4660,6 @@
     <string name="public_updates_channel_title">Канал тільки для модераторів</string>
     <string name="publish_followed_news_body">Це повідомлення буде відправлено на всі сервери, які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.</string>
     <string name="publish_followed_news_body_reach">Це повідомлення буде відправлено на всі сервери (**%1$s), які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.</string>
-    <string name="publish_followed_news_body_settings">Докладнішу статистику дивись у налаштуваннях сервера.</string>
     <string name="publish_followed_news_fail_body">Досягнуто обмеження в 10 опублікованих повідомлень на годину. Але нам подобається твій ентузіазм, тому спробуй ще раз через %1$s.</string>
     <string name="publish_followed_news_fail_title">Отакої! Спливаюче вікно.</string>
     <string name="publish_followed_news_generic_body">На жаль, щось пішло не так.</string>
@@ -5019,7 +5009,6 @@
 будуть почуті усіма учасниками каналу."</string>
     <string name="server_deafen">Сервер: вимкнути звук</string>
     <string name="server_deafened">Звук вимкнено сервером</string>
-    <string name="server_deafened_dialog_body">Щоб слухати в цьому каналі, попроси адміністраторів сервера увімкнути твій звук.</string>
     <string name="server_deafened_dialog_title">Звук вимкнено сервером</string>
     <string name="server_desciption_empty">Розкажи світу трохи про цей сервер.</string>
     <string name="server_emoji">Емодзі сервера</string>
@@ -5029,7 +5018,6 @@
     <string name="server_insights">Аналітика сервера</string>
     <string name="server_mute">Сервер: вимкнути мікрофон</string>
     <string name="server_muted">Звук сервера вимкнений</string>
-    <string name="server_muted_dialog_body">Щоб говорити в цьому каналі, попроси адміністраторів сервера увімкнути твій мікрофон.</string>
     <string name="server_muted_dialog_title">Звук сервера вимкнений</string>
     <string name="server_name_required">Необхідно вказати назву сервера.</string>
     <string name="server_options">Параметри сервера</string>
@@ -5841,7 +5829,6 @@
     <string name="verification_verified">Електронну пошту перевірено!</string>
     <string name="verification_verifying">Перевірка адреси твоєї електронної пошти</string>
     <string name="verified_bot_tooltip">Перевірений бот</string>
-    <string name="verified_developer_badge_tooltip">Перевірений розробник ботів</string>
     <string name="verify">Перевірити</string>
     <string name="verify_account">Підтвердити акаунт</string>
     <string name="verify_by">Підтвердити за</string>
@@ -6004,7 +5991,6 @@
     <string name="xbox_game_pass_promotion_card_header">Абонемент Xbox Game Pass (на 3 місяці)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Вибач, здається, що в тебе вже є передплата Nitro. Однак ти можеш передати своє посилання на отримання передплати другові і дати йому 3 місяці Nitro безкоштовно.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">О ні!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Оскільки ти маєш оформлений абонемент Xbox Game Pass, ти отримуєш 3 місяці Nitro безкоштовно!</string>
     <string name="xbox_link">"Прив'яжи"</string>
     <string name="xbox_pin_step1">Відкрий програму Discord на своєму телефоні</string>
     <string name="xbox_pin_step2">Перейди до Налаштувань > Підключення > Додати</string>
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index cfd26aefc7..5ad68f37fa 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -2261,9 +2261,9 @@ Mục này cũng hiển thị các số liệu phân tích về Kênh Thông Bá
     <string name="guild_owner">Người Sở Hữu Máy Chủ</string>
     <string name="guild_partner_application_category_description">Danh mục nào sau đây miêu tả đúng nhất máy chủ của bạn?</string>
     <string name="guild_partner_application_category_label">Danh Mục</string>
-    <string name="guild_partner_application_connect">Kết nối các tài khoản bạn tạo nội dung</string>
     <string name="guild_partner_application_content_platform">Bạn chủ yếu tạo nội dung ở đâu?</string>
     <string name="guild_partner_application_country">Quốc gia</string>
+    <string name="guild_partner_application_creator_connect">Kết nối các tài khoản bạn tạo nội dung</string>
     <string name="guild_partner_application_description_description">Hãy kể cho chúng tôi về máy chủ của bạn đi. Nội dung của máy chủ là gì? Dành cho đối tượng nào?</string>
     <string name="guild_partner_application_description_title">Mô Tả Máy Chủ</string>
     <string name="guild_partner_application_first_name">Tên</string>
@@ -2278,11 +2278,7 @@ Mục này cũng hiển thị các số liệu phân tích về Kênh Thông Bá
     <string name="guild_partner_application_server_step_title">Cộng đồng của bạn là cộng đồng gì?</string>
     <string name="guild_partner_application_subcategory_description">Bạn có thể chọn tối đa 5 danh mục phụ.</string>
     <string name="guild_partner_application_submit_step">Gửi Đơn Đăng Ký</string>
-    <string name="guild_partner_application_submit_step_description">Thường thì chúng tôi sẽ phản hồi lại trong vòng X ngày.</string>
-    <string name="guild_partner_application_submit_step_description_2">Mỗi đơn đăng ký Đối Tác đều được Discord xem xét. Xin hãy lưu ý rằng việc đăng ký không đồng nghĩa với việc trở thành Đối Tác.</string>
-    <string name="guild_partner_application_submit_step_title">Sau đó gửi đi và thế là xong!</string>
     <string name="guild_partner_application_title">Đăng ký tham gia Chương Trình Đối Tác Discord</string>
-    <string name="guild_partner_application_type">Dạng Máy Chủ</string>
     <string name="guild_partner_application_type_brand">Kinh Doanh / Thương Hiệu</string>
     <string name="guild_partner_application_type_content">Người Sáng Tạo Nội Dung / Tính Cách</string>
     <string name="guild_partner_application_type_fan">Nhóm Chung Sở Thích hoặc Cộng Đồng Người Hâm Mộ</string>
@@ -2517,8 +2513,6 @@ Mục này cũng hiển thị các số liệu phân tích về Kênh Thông Bá
     <string name="guild_settings_discovery_byline">Với việc đủ điều kiện và kích hoạt Khám Phá, máy chủ của bạn sẽ xuất hiện trong [Khám Phá Máy Chủ.](onClick) Hãy chắc chắn rằng bạn đã sẵn sàng để tạo ấn tượng tốt!</string>
     <string name="guild_settings_discovery_checklist_2fa">Đã Bật Yêu Cầu 2FA Để Dùng Quyền Quản Trị</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Thành viên có quyền quản trị (ví dụ như quản trị viên hoặc điều phối viên) phải bật 2FA để có thể thực hiện các tác vụ quản lý.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">Tính năng này yêu cầu tất cả thanh viên có quyền quản trị bật 2FA trước khi thực hiện các tác vụ quản trị. Điều này cũng có thể giúp bảo vệ máy chủ khỏi các trường hợp tài khoản quản trị viên hay điều phối viên bị truy cập trái phép. [Bật trong cài đặt Quản Trị](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Yêu Cầu 2FA Để Dùng Quyền Quản Trị Chưa Được Bật</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">Khi kích hoạt Khám Phá, bạn đồng ý tuân thủ [Nguyên Tắc Máy Chủ Có Thể Khám Phá.](%1$s) của chúng tôi</string>
     <string name="guild_settings_discovery_checklist_age">Đáp Ứng Yêu Cầu Về Tuổi Thọ</string>
     <string name="guild_settings_discovery_checklist_age_description">Máy chủ trong Khám Phá phải có tuổi thọ ít nhất là %1$s.</string>
@@ -2532,7 +2526,6 @@ Mục này cũng hiển thị các số liệu phân tích về Kênh Thông Bá
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Tăng số lượng thành viên trò chuyện hàng tuần</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">Thành viên trò chuyện là người trò chuyện (thoại hoặc nhắn tin) trong máy chủ. Tổ chức sự kiện cộng đồng và đưa ra chủ đề thảo luận là các cách hữu hiệu để khuyến khích mọi người trao đổi.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">số lượng thành viên trò chuyện trung bình hàng tuần trong máy chủ của bạn</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Máy chủ của bạn cần thêm thành viên truy cập và giao tiếp hàng tuần.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Ngon lành! Máy chủ của bạn đã vượt quả tất cả yêu cầu để được hiện thân trong mục Khám Phá Máy Chủ.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">Để đảm bảo rằng chúng tôi chỉ đề cử các máy chủ đang hoạt động đến người dùng Discord, các máy chủ trong Khám Phá bắt buộc phải đạt cấp hoạt động tối thiểu.</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Nhấn vào đây để biết thêm chi tiết</string>
@@ -2548,7 +2541,6 @@ Mục này cũng hiển thị các số liệu phân tích về Kênh Thông Bá
     <string name="guild_settings_discovery_checklist_nsfw_description">Tên máy chủ, mô tả, và tên các kênh của bạn ổn rồi đấy!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Tìm Thấy Ngôn Từ Không Hay Ho</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">yêu cầu tối thiểu</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">Bạn nên cải thiện trải nghiệm khi tham gia máy chủ của các thành viên mới.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Nâng cao trải nghiệm thành viên mới</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Máy chủ có thêm nhiều hơn 10 thành viên mới mỗi tuần bắt buộc phải duy trì tỷ lệ giữ chân thành viên mới ở mức 10%%, có nghĩa là ít nhất 1 trong số 10 thành viên mới tham gia phải thường xuyên truy cập máy chủ trong hơn một tuần.
 
@@ -2558,7 +2550,6 @@ Hãy đặt mình vào vị trí của một thành viên mới. Liệu họ có
     <string name="guild_settings_discovery_checklist_safe_description">Xin cảm ơn vì đã tuân thủ Nguyên Tắc Cộng Đồng và đảm bảo sự an toàn trong máy chủ của bạn!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Máy chủ của bạn đã $[vi phạm Điều Khoản Dịch Vụ của chúng tôi](doesNotHook) trong vòng 30 ngày vừa qua.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Máy chủ của bạn đã vi phạm [Điều Khoản Dịch Vụ](%1$s) hoặc [Nguyên Tắc Máy Chủ Cộng Đồng](%2$s) của chúng tôi.</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Bị đánh dấu bởi đội ngũ An Ninh</string>
     <string name="guild_settings_discovery_checklist_score_explain">Số liệu được tính theo trung bình của 8 tuần gần nhất, vậy nên có thể sẽ mất vài tuần để cho ra kết quả. Chỉ những người dùng hoạt động trên Discord trong hơn 8 tuần mới được tính là có truy cập và giao tiếp.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ thành viên</string>
     <string name="guild_settings_discovery_checklist_size_description">Từ giờ, mục Khám Phá sẽ chỉ giới hạn dành cho những máy chủ có nhiều hơn %1$s thành viên.</string>
@@ -3832,7 +3823,6 @@ tin nhắn nào được ghim."</string>
     <string name="no_thanks">Không cảm ơn</string>
     <string name="no_user_limit">Không giới hạn</string>
     <string name="no_video_devices">Không Có Thiết Bị Video</string>
-    <string name="no_video_permission_dialog_body">Để mở video trên kênh thoại này, hãy yêu cầu quản trị viên máy chủ thay đổi quyền sử dụng video.</string>
     <string name="no_video_permission_dialog_title">Không Có Quyền Sử Dụng Video</string>
     <string name="noise_cancellation_off">Tắt Chặn Tiếng Ồn</string>
     <string name="noise_cancellation_on">Bật Chặn Tiếng Ồn</string>
@@ -4048,6 +4038,7 @@ Bạn đã nhận được liên kết mời từ bạn bè chưa? Hãy nhập l
     <string name="one_user_typing">**%1$s** đang nhập…</string>
     <string name="ongoing_call">Cuộc Gọi Đang Diễn Ra</string>
     <string name="ongoing_call_connected_users">Cuộc Gọi Đang Diễn Ra — %1$s Đã kết nối</string>
+    <string name="ongoing_call_tap_to_join">— Nhấn để tham gia</string>
     <string name="ongoing_call_voice_quality_low">Ôi không, chất lượng thoại tệ quá! Kết nối của bạn đang không ổn định.</string>
     <string name="ongoing_call_you_are_all_alone">"Cuộc gọi này có mỗi mình bạn thôi! 
  Những người khác trong cuộc trò chuyện có thể tham gia bất cứ lúc nào."</string>
@@ -4128,7 +4119,6 @@ Và overlay chưa chắc sẽ hiệu quả đối với tất cả mọi ngườ
     <string name="paginator_of_pages">Trang %1$s/%2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">%1$s Twitter của Discord chắc sẽ có nhiều thông tin hơn.</string>
-    <string name="partner_badge_tooltip">Đối tác Discord</string>
     <string name="password_length_error">Mật khẩu là một chuỗi gồm 6–128 ký tự</string>
     <string name="password_manager">Quản Lý Mật Khẩu</string>
     <string name="password_manager_info_android">Nếu bạn sử dụng phần mềm quản lý mật khẩu, bạn sẽ cần cho phép dịch vụ trong phần Cài Đặt Khả Năng Truy Cập -> Dịch Vụ Đã Tải Về. Đừng lo, chúng tôi sẽ giúp bạn.</string>
@@ -4625,7 +4615,6 @@ phát hiện Nhấn để Nói trong khi chơi game."</string>
     <string name="public_updates_channel_title">Kênh dành riêng cho Điều Phối Viên</string>
     <string name="publish_followed_news_body">Tin nhắn này sẽ được gửi đến tất cả các máy chủ đang theo dõi kênh này. Bạn có thể sửa hoặc xóa tin nhắn này sau, và nó cũng sẽ được cập nhật tương ứng trên từng máy chủ theo dõi kênh.</string>
     <string name="publish_followed_news_body_reach">Tin nhắn này sẽ được gửi đến **%1$s máy chủ** đang theo dõi kênh này. Bạn có thể sửa hoặc xóa những tin nhắn này sau, và nó cũng sẽ được cập nhật tương ứng trên từng máy chủ theo dõi kênh.</string>
-    <string name="publish_followed_news_body_settings">Xem thêm các thông số khác trong Cài đặt Máy chủ.</string>
     <string name="publish_followed_news_fail_body">Bạn đã đạt giới hạn đăng 10 tin nhắn mỗi giờ. Chúng tôi thích sự nhiệt huyết đó, hãy thử lại trong %1$s nữa.</string>
     <string name="publish_followed_news_fail_title">Ôi không, có cửa sổ bật lên.</string>
     <string name="publish_followed_news_generic_body">Xin lỗi, có gì đó không ổn rồi.</string>
@@ -4970,7 +4959,6 @@ trước khi thử lại."</string>
 có thể được nghe bởi tất cả mọi người tại kênh."</string>
     <string name="server_deafen">Tắt âm từ phòng này</string>
     <string name="server_deafened">Đã tắt âm của phòng</string>
-    <string name="server_deafened_dialog_body">Để nghe trong kênh này, hãy yêu cầu quản trị viên máy chủ bỏ tắt loa cho bạn.</string>
     <string name="server_deafened_dialog_title">Đã tắt âm của phòng</string>
     <string name="server_desciption_empty">Hãy giới thiệu một chút về máy chủ này với thế giới.</string>
     <string name="server_emoji">Emoji Máy Chủ</string>
@@ -4980,7 +4968,6 @@ có thể được nghe bởi tất cả mọi người tại kênh."</string>
     <string name="server_insights">Thống Kê Máy Chủ</string>
     <string name="server_mute">Tắt tiếng phòng này</string>
     <string name="server_muted">Máy Chủ Bị Tắt Âm</string>
-    <string name="server_muted_dialog_body">Để nói chuyện trong kênh này, hãy yêu cầu quản trị viên máy chủ bỏ tắt tiếng cho bạn.</string>
     <string name="server_muted_dialog_title">Máy Chủ Bị Tắt Âm</string>
     <string name="server_name_required">Yêu cầu có tên máy chủ.</string>
     <string name="server_options">Tùy Chọn Máy Chủ</string>
@@ -5785,7 +5772,6 @@ Lưu ý rằng điều này sẽ khiến máy chủ của bạn trở nên công
     <string name="verification_verified">Email Đã Được Xác Nhận!</string>
     <string name="verification_verifying">Đang xác nhận email của bạn</string>
     <string name="verified_bot_tooltip">Bot đã được chứng nhận</string>
-    <string name="verified_developer_badge_tooltip">Nhà Phát Triển Bot Được Chứng Nhận</string>
     <string name="verify">Xác nhận</string>
     <string name="verify_account">Xác Nhận Tài Khoản</string>
     <string name="verify_by">Xác minh bằng</string>
@@ -5945,7 +5931,6 @@ hoặc có bất kỳ thắc mắc nào."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 tháng)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Xin lỗi, có vẻ như bạn đã đăng ký Nitro rồi. Tuy nhiên, bạn có thể gửi URL quà tặng cho một người bạn và gửi 3 tháng sử dụng Nitro miễn phí cho họ.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Ôi không!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Vì bạn đã có Xbox Game Pass, bạn sẽ nhận được 3 tháng dùng Nitro miễn phí!</string>
     <string name="xbox_pin_step1">Mở ứng dụng Discord trên điện thoại</string>
     <string name="xbox_pin_step2">Đến Phần Cài Đặt > Kết Nối > Thêm</string>
     <string name="xbox_pin_step3">Nhấp vào Xbox và nhập mã PIN ở trên</string>
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index f1dde9d308..378b71ac5c 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -2286,9 +2286,9 @@
     <string name="guild_owner">服务器所有者</string>
     <string name="guild_partner_application_category_description">下列哪个类别最能描述您的服务器？</string>
     <string name="guild_partner_application_category_label">类别</string>
-    <string name="guild_partner_application_connect">连接您进行创作的帐户</string>
     <string name="guild_partner_application_content_platform">您主要在哪儿进行内容创作？</string>
     <string name="guild_partner_application_country">国家</string>
+    <string name="guild_partner_application_creator_connect">连接您进行创作的帐户</string>
     <string name="guild_partner_application_description_description">跟我们聊聊您的服务器吧。它的主题是什么？目标群体又是什么？</string>
     <string name="guild_partner_application_description_title">服务器描述</string>
     <string name="guild_partner_application_first_name">名</string>
@@ -2303,11 +2303,7 @@
     <string name="guild_partner_application_server_step_title">您的社区是主题是什么？</string>
     <string name="guild_partner_application_subcategory_description">您至多可以选择 5 个子类别。</string>
     <string name="guild_partner_application_submit_step">提交申请</string>
-    <string name="guild_partner_application_submit_step_description">我们通常会在 X 天内跟进信息。</string>
-    <string name="guild_partner_application_submit_step_description_2">每位合作伙伴申请都将由 Discord 亲自审核。请注意，申请并不一定会通过。</string>
-    <string name="guild_partner_application_submit_step_title">提交吧，然后就搞定了！</string>
     <string name="guild_partner_application_title">申请加入 Discord 合作伙伴项目</string>
-    <string name="guild_partner_application_type">服务器类型</string>
     <string name="guild_partner_application_type_brand">商务 / 品牌</string>
     <string name="guild_partner_application_type_content">内容创作者 / 个性</string>
     <string name="guild_partner_application_type_fan">兴趣小组或者粉丝社区</string>
@@ -2542,8 +2538,6 @@
     <string name="guild_settings_discovery_byline">获得资质并开启“发现服务器”后，您的服务器将会加入[发现服务器。](onClick)请确保做好准备，给大家留下一个好印象！</string>
     <string name="guild_settings_discovery_checklist_2fa">已开启执行管理权能的双重认证要求</string>
     <string name="guild_settings_discovery_checklist_2fa_description">具备管理权能的成员(例如管理员)在执行管理操作时都必须开启双重认证。</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">所有具备管理权能的成员在能够执行管理操作前，都必须开启双重认证。该设置有助于保护管理员账户，防止账户被盗。[在管控设置中开启](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">缺失执行管理权能的双重认证要求</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">开启“发现服务器”，即意味着您同意遵守我们的 [可发现服务器准则。](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">满足年龄要求</string>
     <string name="guild_settings_discovery_checklist_age_description">“发现服务器”中的服务器需要至少为%1$s。</string>
@@ -2557,7 +2551,6 @@
     <string name="guild_settings_discovery_checklist_communicator_failing_action">增加每周交流者数量</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">交流者是指在服务器上进行（语音或文字）聊天的用户。举办社区活动和发起讨论话题是鼓励更多人发言的好方法。</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">您的服务器的周均交流者数量</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">您的服务器需要更多每周访问或聊天的成员。</string>
     <string name="guild_settings_discovery_checklist_good_standing">干得漂亮！您的服务器符合所有要求，可以登录“发现服务器”了。</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">为了确保我们仅为 Discord 用户推荐活跃服务器，“发现服务器”中的服务器必须达到最低活跃等级。</string>
     <string name="guild_settings_discovery_checklist_health_view_details">点击这里获取更多详细信息</string>
@@ -2573,7 +2566,6 @@
     <string name="guild_settings_discovery_checklist_nsfw_description">您的服务器名称、简介以及频道名称看起来非常纯洁！</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">发现违禁词</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">最低需要</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">您需要提升新成员的用户引导体验。</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">提升新会员体验</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"每周增加超过 10 名新成员的服务器，新成员留存率必须达到10%%。每 10 名新加入者中至少需有 1 名逗留 1 周以上。
 
@@ -2583,7 +2575,6 @@
     <string name="guild_settings_discovery_checklist_safe_description">感谢您遵守我们的社区守则，持续提供安全的服务器环境！</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">在过去的30天内，您的服务器$[违反了我们的服务条款](doesNotHook)。</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">您的服务器违反了我们的[服务条款](%1$s)或[社区服务器准则](%2$s)。</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">已被信任与安全团队举报</string>
     <string name="guild_settings_discovery_checklist_score_explain">本计算以过去 8 周的滚动平均值为依据，因此变化情况可能需要几周时间才能显示出来。此外，只有那些加入 Discord 超过 8周的用户才会被算作访客或交流者。</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+位成员</string>
     <string name="guild_settings_discovery_checklist_size_description">目前，“发现服务器”仅限成员数超过%1$s的服务器加入。</string>
@@ -3867,7 +3858,6 @@
     <string name="no_thanks">不，谢谢</string>
     <string name="no_user_limit">没有限制</string>
     <string name="no_video_devices">没有视讯设备</string>
-    <string name="no_video_permission_dialog_body">如要在此语音频道打开视频，请让您的服务器管理员更改您的视频权限。</string>
     <string name="no_video_permission_dialog_title">无视频权限</string>
     <string name="noise_cancellation_off">禁用噪音抑制</string>
     <string name="noise_cancellation_on">启用噪音抑制</string>
@@ -4083,6 +4073,7 @@
     <string name="one_user_typing">**%1$s**正在输入…</string>
     <string name="ongoing_call">通话中</string>
     <string name="ongoing_call_connected_users">正在呼叫的 — %1$s 名用户已连接</string>
+    <string name="ongoing_call_tap_to_join">— 点击加入</string>
     <string name="ongoing_call_voice_quality_low">哎呀呀，碰到了大红灯。您的网络连接不佳呀。</string>
     <string name="ongoing_call_you_are_all_alone">"当前呼叫中只有您一个人。
 该聊天中的其他人可随时加入。"</string>
@@ -4164,7 +4155,6 @@
     <string name="paginator_of_pages">第 %1$s 页，共 %2$s 页</string>
     <string name="partial_outage">由于临时故障，其他 %1$s</string>
     <string name="partial_outage_a11y">%1$s Discord 的 Twitter 上应该有更多的信息。</string>
-    <string name="partner_badge_tooltip">Discord 合作伙伴</string>
     <string name="password_length_error">密码长度需在6至128个字符之间</string>
     <string name="password_manager">密码管理器</string>
     <string name="password_manager_info_android">使用密码管理器前，您需要在辅助功能设置 -> 已下载服务中选择允许。不用担心，我们将指导您进行操作。</string>
@@ -4663,7 +4653,6 @@
     <string name="public_updates_channel_title">仅限管理员频道</string>
     <string name="publish_followed_news_body">该消息会发送至所有关注此频道的服务器中。您可以在晚些时候编辑或删除此消息，随后每个关注的服务器中都会进行相应的更新。</string>
     <string name="publish_followed_news_body_reach">该消息会发送至所有关注此频道的 **%1$s 个服务器** 中。您可以在晚些时候编辑或删除此消息，随后每个关注的服务器中都会进行相应的更新。</string>
-    <string name="publish_followed_news_body_settings">在服务器设置中查看更多数据。</string>
     <string name="publish_followed_news_fail_body">您已达到每小时发布10条消息的上限。但我们喜欢您的热情，请在%1$s后再试一次。</string>
     <string name="publish_followed_news_fail_title">啊哦，弹出对话框啦。</string>
     <string name="publish_followed_news_generic_body">对不起，哪里出错了。</string>
@@ -5012,7 +5001,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
 会被正在频道上的所有其他成员听见。"</string>
     <string name="server_deafen">服务器静音</string>
     <string name="server_deafened">服务器已静音</string>
-    <string name="server_deafened_dialog_body">如要在此频道收听，请让您的服务器管理员取消对您的耳机静音。</string>
     <string name="server_deafened_dialog_title">服务器已静音</string>
     <string name="server_desciption_empty">让世界认识一下这个服务器。</string>
     <string name="server_emoji">服务器表情符号</string>
@@ -5022,7 +5010,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="server_insights">服务器分析</string>
     <string name="server_mute">服务器静音</string>
     <string name="server_muted">服务器已静音</string>
-    <string name="server_muted_dialog_body">如要在此频道发言，请让您的服务器管理员取消对您的麦克风静音。</string>
     <string name="server_muted_dialog_title">服务器已静音</string>
     <string name="server_name_required">需要服务器名称。</string>
     <string name="server_options">服务器选项</string>
@@ -5835,7 +5822,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="verification_verified">电子邮件已验证通过！</string>
     <string name="verification_verifying">电子邮件验证中</string>
     <string name="verified_bot_tooltip">已验证机器人</string>
-    <string name="verified_developer_badge_tooltip">已验证的机器人开发人员</string>
     <string name="verify">验证</string>
     <string name="verify_account">验证账号</string>
     <string name="verify_by">验证</string>
@@ -5998,7 +5984,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass（三个月）</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">抱歉，您似乎已经拥有了 Nitro 订阅。不过，您可以将兑换URL送给您的朋友，为其提供为期三个月的免费 Nitro 体验。</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">糟糕！</string>
-    <string name="xbox_game_pass_promotion_redeem_body">您已拥有Xbox Game Pass，因此可以免费获得三个月的Nitro服务！</string>
     <string name="xbox_link">链接</string>
     <string name="xbox_pin_step1">在手机上打开 Discord APP</string>
     <string name="xbox_pin_step2">前往设置 > 连接 > 添加</string>
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index de5cc821a4..b2291a676f 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -2290,9 +2290,9 @@
     <string name="guild_owner">伺服器擁有者</string>
     <string name="guild_partner_application_category_description">您的伺服器最符合下列哪些類別？</string>
     <string name="guild_partner_application_category_label">類別</string>
-    <string name="guild_partner_application_connect">連接您用來創作的帳號</string>
     <string name="guild_partner_application_content_platform">您主要在哪裡創作內容？</string>
     <string name="guild_partner_application_country">國家</string>
+    <string name="guild_partner_application_creator_connect">連接您用來創作的帳號</string>
     <string name="guild_partner_application_description_description">和我們談談您的伺服器。主要內容是什麼？主要客群是誰？</string>
     <string name="guild_partner_application_description_title">伺服器描述</string>
     <string name="guild_partner_application_first_name">名稱</string>
@@ -2307,11 +2307,7 @@
     <string name="guild_partner_application_server_step_title">您的社群有什麼主題呢？</string>
     <string name="guild_partner_application_subcategory_description">至多可以選 5 個子類別。</string>
     <string name="guild_partner_application_submit_step">提交申請</string>
-    <string name="guild_partner_application_submit_step_description">通常我們會在 X 天內聯絡您。</string>
-    <string name="guild_partner_application_submit_step_description_2">Discord 會審閱每一份合作夥伴申請書。謹記，提交申請不代表一定會成為合作夥伴。</string>
-    <string name="guild_partner_application_submit_step_title">提交後就大功告成啦！</string>
     <string name="guild_partner_application_title">申請 Discord 合作夥伴計畫</string>
-    <string name="guild_partner_application_type">伺服器類型</string>
     <string name="guild_partner_application_type_brand">商業/品牌</string>
     <string name="guild_partner_application_type_content">內容創作者/名人</string>
     <string name="guild_partner_application_type_fan">利益團體或粉絲社群</string>
@@ -2546,8 +2542,6 @@
     <string name="guild_settings_discovery_byline">符合「探索」資格並啟用此功能後，你的伺服器就會出現在[探索伺服器](onClick)中。準備好閃亮登場吧！</string>
     <string name="guild_settings_discovery_checklist_2fa">已啟用管理所需的 2FA 要求</string>
     <string name="guild_settings_discovery_checklist_2fa_description">擁有管理權限的成員（例如：管理員或管理人）必須啟用 2FA 才能執行管理操作。</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">所有具有版主權限的成員都必須設定 2FA，才能執行版主的操作功能。這樣有助於避免管理員或版主帳號遭到入勤。[請在「管理設定」中啟用](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">遺漏管理所需的 2FA 要求</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">啟用探索即代表您同意遵守我們的 [可供探索的伺服器守則。](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">符合存在時間限制</string>
     <string name="guild_settings_discovery_checklist_age_description">要加入探索的伺服器，其存在時間須達 %1$s 以上。</string>
@@ -2561,7 +2555,6 @@
     <string name="guild_settings_discovery_checklist_communicator_failing_action">提升每週聊天者的數量</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">聊天者為在伺服器中交談 (語音或文字) 的人。舉辦定期社群活動並建立討論主題是鼓勵更多人交談的好方法。</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">您伺服器的平均每週聊天者數</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">您的伺服器需要更多每週會造訪並交談的成員。</string>
     <string name="guild_settings_discovery_checklist_good_standing">做得好！你的伺服器通過了所有要求，可以列入探索伺服器中。</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">為確保我們只向 Discord 使用者推薦活躍的伺服器，「探索」中的伺服器必須擁有最低活動等級。</string>
     <string name="guild_settings_discovery_checklist_health_view_details">按一下此處獲得更多詳細資料</string>
@@ -2577,7 +2570,6 @@
     <string name="guild_settings_discovery_checklist_nsfw_description">你的伺服器名稱、簡介和頻道名稱皆沒問題！</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">發現不雅字詞</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">最低要求</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">您需要改善新成員在伺服器中的體驗。</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">改善新成員的體驗</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"每週新增成員人數超過 10 的伺服器必須有 10%% 的新成員保留率。10 名加入的成員當中，需至少 1 名留下來的時間超過一週。
 
@@ -2587,7 +2579,6 @@
     <string name="guild_settings_discovery_checklist_safe_description">感謝你遵循我們的社群守則，建立安全的伺服器！</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">您的伺服器在過去的 30 天內$[曾違反了我們的服務條款](doesNotHook) 。</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">您的伺服器違反了我們的[服務條款](%1$s)或[社群伺服器守則](%2$s)。</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">由信任與安全團隊標示</string>
     <string name="guild_settings_discovery_checklist_score_explain">以過去八週的滾動平均來計算，所以可能會在數週後才顯示變更。只有在 Discord 上超過八週的使用者算是訪客或聊天者。</string>
     <string name="guild_settings_discovery_checklist_size">%1$s 位以上成員</string>
     <string name="guild_settings_discovery_checklist_size_description">目前探索伺服器僅限擁有超過 %1$s 位成員的伺服器加入。</string>
@@ -3869,7 +3860,6 @@
     <string name="no_thanks">不用了，謝謝</string>
     <string name="no_user_limit">沒有限制</string>
     <string name="no_video_devices">沒有視訊裝置</string>
-    <string name="no_video_permission_dialog_body">要在此語音頻道開啟視訊通話，請向伺服器管理員請求變更視訊通話權限。</string>
     <string name="no_video_permission_dialog_title">沒有視訊通話權限</string>
     <string name="noise_cancellation_off">雜訊抑制關閉</string>
     <string name="noise_cancellation_on">雜訊抑制開啟</string>
@@ -4085,6 +4075,7 @@
     <string name="one_user_typing">**%1$s** 正在輸入…</string>
     <string name="ongoing_call">正在通話中</string>
     <string name="ongoing_call_connected_users">通話進行中 － %1$s 已連接</string>
+    <string name="ongoing_call_tap_to_join">—加入</string>
     <string name="ongoing_call_voice_quality_low">噢糟糕，是紅色警示，你的連線情形有點不妙。</string>
     <string name="ongoing_call_you_are_all_alone">"目前只有你一人在通話中。
 聊天室裡的其他人隨時都可以加入。"</string>
@@ -4166,7 +4157,6 @@
     <string name="paginator_of_pages">第 %1$s 頁，共 %2$s 頁</string>
     <string name="partial_outage">另外 %1$s</string>
     <string name="partial_outage_a11y">%1$sDiscord 的 Twitter 會提供更多資訊。</string>
-    <string name="partner_badge_tooltip">Discord 合作夥伴</string>
     <string name="password_length_error">密碼長度需介於 6 到 128 字元</string>
     <string name="password_manager">密碼管理員</string>
     <string name="password_manager_info_android">如果您要使用密碼管理員，需要先在存取性設定 -> 已下載的服務中啟用。別擔心，我們會帶您去。</string>
@@ -4664,7 +4654,6 @@
     <string name="public_updates_channel_title">版主限定頻道</string>
     <string name="publish_followed_news_body">系統將傳送此訊息至所有追蹤此頻道的伺服器。您之後可以編輯或刪除此訊息，在追蹤的所有伺服器中，訊息也將隨之更新。</string>
     <string name="publish_followed_news_body_reach">系統將傳送此訊息至追蹤此頻道的 **%1$s 個伺服器**。您之後可以編輯或刪除此訊息，在追蹤的所有伺服器中，訊息也將隨之更新。</string>
-    <string name="publish_followed_news_body_settings">至伺服器設定查看更多統計資料。</string>
     <string name="publish_followed_news_fail_body">您已經達到每小時發布 10 則訊息的上限。不過我們欣賞您的熱忱，請於 %1$s 後再次嘗試發送訊息。</string>
     <string name="publish_followed_news_fail_title">呃喔，彈出視窗。</string>
     <string name="publish_followed_news_generic_body">抱歉，出問題了。</string>
@@ -5013,7 +5002,6 @@
 能讓目前頻道所有人都聽到。"</string>
     <string name="server_deafen">伺服器端拒聽</string>
     <string name="server_deafened">伺服器端已拒聽</string>
-    <string name="server_deafened_dialog_body">若要收聽此頻道，請向伺服器管理員請求解除拒聽。</string>
     <string name="server_deafened_dialog_title">伺服器端已拒聽</string>
     <string name="server_desciption_empty">告訴世人關於這部伺服器的一些事。</string>
     <string name="server_emoji">伺服器表情符號</string>
@@ -5022,7 +5010,6 @@
     <string name="server_folder_settings">資料夾設定</string>
     <string name="server_mute">伺服器端靜音</string>
     <string name="server_muted">伺服器已靜音</string>
-    <string name="server_muted_dialog_body">若要在此頻道發言，請向伺服器管理員請求解除靜音。</string>
     <string name="server_muted_dialog_title">伺服器已靜音</string>
     <string name="server_name_required">伺服器名稱是必填項目。</string>
     <string name="server_options">伺服器設定</string>
@@ -5838,7 +5825,6 @@
     <string name="verification_verified">電子郵件信箱已認證</string>
     <string name="verification_verifying">認證您的電子郵件信箱</string>
     <string name="verified_bot_tooltip">認證機器人</string>
-    <string name="verified_developer_badge_tooltip">認證機器人開發者</string>
     <string name="verify">認證</string>
     <string name="verify_account">認證帳號</string>
     <string name="verify_by">認證方式</string>
@@ -6000,7 +5986,6 @@
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (效期 3 個月)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">很抱歉，你好像已經訂閱 Nitro 了。不過你可以把你的兌換 URL 送給好友，讓對方免費使用 Nitro 3 個月。</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">噢噢！</string>
-    <string name="xbox_game_pass_promotion_redeem_body">您擁有 Xbox Game Pass，因此可以免費暢玩 Nitro 3 個月！</string>
     <string name="xbox_link">連結</string>
     <string name="xbox_pin_step1">在您的手機上開啟 Discord 應用程式</string>
     <string name="xbox_pin_step2">前往「設定」>「連結」>「新增」</string>
diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml
index fc7f01a895..1f76e6709e 100644
--- a/com.discord/res/values/attrs.xml
+++ b/com.discord/res/values/attrs.xml
@@ -1626,20 +1626,6 @@
     <attr name="roundingBorderColor" format="color" />
     <attr name="roundingBorderPadding" format="dimension" />
     <attr name="roundingBorderWidth" format="dimension" />
-    <attr name="sb_barBackgroundColor" format="reference|color" />
-    <attr name="sb_barColor" format="reference|color" />
-    <attr name="sb_barControlColor" format="reference|color" />
-    <attr name="sb_barControlRadius" format="dimension" />
-    <attr name="sb_barControlShadowColor" format="reference|color" />
-    <attr name="sb_barControlShadowRadius" format="dimension" />
-    <attr name="sb_barHeight" format="dimension" />
-    <attr name="sb_barInterval" format="float" />
-    <attr name="sb_barOverlayColor" format="reference|color" />
-    <attr name="sb_barOverlayValue" format="float" />
-    <attr name="sb_barTouchEnabled" format="boolean" />
-    <attr name="sb_barValue" format="float" />
-    <attr name="sb_barValueMax" format="float" />
-    <attr name="sb_barValueMin" format="float" />
     <attr name="schemaOrgProperty" format="string" />
     <attr name="schemaOrgType" format="string" />
     <attr name="scopeUris" format="reference|string" />
diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml
index 0974d0dc5f..ee364d8e50 100644
--- a/com.discord/res/values/dimens.xml
+++ b/com.discord/res/values/dimens.xml
@@ -492,18 +492,11 @@
     <item type="dimen" name="uikit_settings_item_header_size">@dimen/uikit_textsize_medium</item>
     <item type="dimen" name="uikit_settings_item_text_size">@dimen/uikit_textsize_large</item>
     <dimen name="uikit_settings_voice_user_border_padding">4.0dip</dimen>
-    <dimen name="uikit_spacing_large">16.0dip</dimen>
-    <dimen name="uikit_spacing_medium">8.0dip</dimen>
-    <dimen name="uikit_spacing_small">4.0dip</dimen>
-    <dimen name="uikit_spacing_xlarge">24.0dip</dimen>
-    <dimen name="uikit_spacing_xsmall">2.0dip</dimen>
-    <dimen name="uikit_spacing_xxlarge">32.0dip</dimen>
-    <dimen name="uikit_spacing_xxxlarge">64.0dip</dimen>
     <dimen name="uikit_textsize_large">16.0sp</dimen>
     <dimen name="uikit_textsize_medium">14.0sp</dimen>
     <dimen name="uikit_textsize_small">12.0sp</dimen>
     <dimen name="uikit_textsize_xlarge">20.0sp</dimen>
     <dimen name="uikit_textsize_xxlarge">24.0sp</dimen>
-    <item type="dimen" name="uikit_typing_indicator_height">@dimen/uikit_spacing_xlarge</item>
+    <dimen name="uikit_typing_indicator_height">24.0dip</dimen>
     <dimen name="vertical_safe_margin">32.0dip</dimen>
 </resources>
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index a0279cb5d1..d0f63b452c 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -277,6 +277,9 @@
     <item type="id" name="call_participants_hidden" />
     <item type="id" name="call_participants_show_button" />
     <item type="id" name="call_pip" />
+    <item type="id" name="call_stop_streaming_button" />
+    <item type="id" name="call_streaming_active" />
+    <item type="id" name="call_streaming_active_body" />
     <item type="id" name="call_user_item_avatar" />
     <item type="id" name="call_video_recycler" />
     <item type="id" name="camera_capacity_body" />
@@ -659,6 +662,9 @@
     <item type="id" name="design_navigation_view" />
     <item type="id" name="dev_settings_experiment_item_bucket_spinner" />
     <item type="id" name="dev_settings_experiment_item_name" />
+    <item type="id" name="developer_settings_crash_discord_jnibridge" />
+    <item type="id" name="developer_settings_crash_discord_nonfatal" />
+    <item type="id" name="developer_settings_crash_kotlin" />
     <item type="id" name="developer_settings_experiments" />
     <item type="id" name="developer_settings_notices" />
     <item type="id" name="dialog_button" />
@@ -1721,8 +1727,8 @@
     <item type="id" name="rich_presence_music_progress_container" />
     <item type="id" name="rich_presence_primary_button" />
     <item type="id" name="rich_presence_secondary_button" />
+    <item type="id" name="rich_presence_seekbar" />
     <item type="id" name="rich_presence_state" />
-    <item type="id" name="rich_presence_superbar" />
     <item type="id" name="rich_presence_time" />
     <item type="id" name="rich_presence_title" />
     <item type="id" name="right_icon" />
@@ -2118,12 +2124,10 @@
     <item type="id" name="settings_text_images_embeds_toggle" />
     <item type="id" name="settings_text_images_links_toggle" />
     <item type="id" name="settings_text_images_sync_toggle" />
+    <item type="id" name="settings_upload_debug_logs" />
     <item type="id" name="settings_user_limit_help" />
     <item type="id" name="settings_user_settings_header" />
     <item type="id" name="settings_voice" />
-    <item type="id" name="settings_voice_audio_mode_call" />
-    <item type="id" name="settings_voice_audio_mode_communication" />
-    <item type="id" name="settings_voice_audio_mode_section" />
     <item type="id" name="settings_voice_auto_vad_toggle" />
     <item type="id" name="settings_voice_echo_cancellation_toggle" />
     <item type="id" name="settings_voice_enable_hardware_scaling_toggle" />
@@ -2448,10 +2452,11 @@
     <item type="id" name="voice_connected_ptt" />
     <item type="id" name="voice_fullscreen_controls_camera" />
     <item type="id" name="voice_fullscreen_controls_controls_wrap" />
-    <item type="id" name="voice_fullscreen_controls_deafen_state" />
+    <item type="id" name="voice_fullscreen_controls_deafen" />
     <item type="id" name="voice_fullscreen_controls_disconnect" />
     <item type="id" name="voice_fullscreen_controls_mute_state" />
     <item type="id" name="voice_fullscreen_controls_ptt" />
+    <item type="id" name="voice_fullscreen_controls_screenshare" />
     <item type="id" name="voice_fullscreen_controls_speaker" />
     <item type="id" name="voice_settings_invite" />
     <item type="id" name="voice_settings_noise_suppression" />
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 8e0a056cfc..e89f1905a9 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -552,6 +552,14 @@
         <item quantity="other">%s boosts</item>
         <item quantity="one">%s boost</item>
     </plurals>
+    <plurals name="guild_settings_partner_checklist_age_description_failing_minimumGuildAge">
+        <item quantity="other">%s weeks</item>
+        <item quantity="one">1 week</item>
+    </plurals>
+    <plurals name="guild_settings_partner_checklist_age_description_minimumGuildAge">
+        <item quantity="other">%s weeks</item>
+        <item quantity="one">1 week</item>
+    </plurals>
     <plurals name="guild_settings_premium_guild_close_hint_numLeft">
         <item quantity="other">%s more boosts</item>
         <item quantity="one">%s more boost</item>
@@ -1085,9 +1093,14 @@
         <item quantity="zero">0 uses</item>
         <item quantity="one">1 use</item>
     </plurals>
+    <plurals name="viewing_as_roles_numRoles">
+        <item quantity="other">%s roles</item>
+        <item quantity="zero">\@everyone</item>
+        <item quantity="one">1 role</item>
+    </plurals>
     <plurals name="voice_call_member_list_title_count">
         <item quantity="other">%s People</item>
         <item quantity="one">%s Person</item>
     </plurals>
-    <item type="plurals" name="APKTOOL_DUMMY_f8">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_fa">false</item>
 </resources>
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index f5aaa0a57a..e3ae8856ef 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -1221,349 +1221,335 @@
     <public type="attr" name="roundingBorderColor" id="0x7f040454" />
     <public type="attr" name="roundingBorderPadding" id="0x7f040455" />
     <public type="attr" name="roundingBorderWidth" id="0x7f040456" />
-    <public type="attr" name="sb_barBackgroundColor" id="0x7f040457" />
-    <public type="attr" name="sb_barColor" id="0x7f040458" />
-    <public type="attr" name="sb_barControlColor" id="0x7f040459" />
-    <public type="attr" name="sb_barControlRadius" id="0x7f04045a" />
-    <public type="attr" name="sb_barControlShadowColor" id="0x7f04045b" />
-    <public type="attr" name="sb_barControlShadowRadius" id="0x7f04045c" />
-    <public type="attr" name="sb_barHeight" id="0x7f04045d" />
-    <public type="attr" name="sb_barInterval" id="0x7f04045e" />
-    <public type="attr" name="sb_barOverlayColor" id="0x7f04045f" />
-    <public type="attr" name="sb_barOverlayValue" id="0x7f040460" />
-    <public type="attr" name="sb_barTouchEnabled" id="0x7f040461" />
-    <public type="attr" name="sb_barValue" id="0x7f040462" />
-    <public type="attr" name="sb_barValueMax" id="0x7f040463" />
-    <public type="attr" name="sb_barValueMin" id="0x7f040464" />
-    <public type="attr" name="schemaOrgProperty" id="0x7f040465" />
-    <public type="attr" name="schemaOrgType" id="0x7f040466" />
-    <public type="attr" name="scopeUris" id="0x7f040467" />
-    <public type="attr" name="scrimAnimationDuration" id="0x7f040468" />
-    <public type="attr" name="scrimBackground" id="0x7f040469" />
-    <public type="attr" name="scrimVisibleHeightTrigger" id="0x7f04046a" />
-    <public type="attr" name="scrubber_color" id="0x7f04046b" />
-    <public type="attr" name="scrubber_disabled_size" id="0x7f04046c" />
-    <public type="attr" name="scrubber_dragged_size" id="0x7f04046d" />
-    <public type="attr" name="scrubber_drawable" id="0x7f04046e" />
-    <public type="attr" name="scrubber_enabled_size" id="0x7f04046f" />
-    <public type="attr" name="searchEnabled" id="0x7f040470" />
-    <public type="attr" name="searchHintIcon" id="0x7f040471" />
-    <public type="attr" name="searchIcon" id="0x7f040472" />
-    <public type="attr" name="searchLabel" id="0x7f040473" />
-    <public type="attr" name="searchViewStyle" id="0x7f040474" />
-    <public type="attr" name="sectionContent" id="0x7f040475" />
-    <public type="attr" name="sectionFormat" id="0x7f040476" />
-    <public type="attr" name="sectionId" id="0x7f040477" />
-    <public type="attr" name="sectionType" id="0x7f040478" />
-    <public type="attr" name="sectionWeight" id="0x7f040479" />
-    <public type="attr" name="seekBarIncrement" id="0x7f04047a" />
-    <public type="attr" name="seekBarPreferenceStyle" id="0x7f04047b" />
-    <public type="attr" name="seekBarStyle" id="0x7f04047c" />
-    <public type="attr" name="selectable" id="0x7f04047d" />
-    <public type="attr" name="selectableItemBackground" id="0x7f04047e" />
-    <public type="attr" name="selectableItemBackgroundBorderless" id="0x7f04047f" />
-    <public type="attr" name="selectionRequired" id="0x7f040480" />
-    <public type="attr" name="semanticallySearchable" id="0x7f040481" />
-    <public type="attr" name="settingsDescription" id="0x7f040482" />
-    <public type="attr" name="settings_text_color" id="0x7f040483" />
-    <public type="attr" name="shapeAppearance" id="0x7f040484" />
-    <public type="attr" name="shapeAppearanceLargeComponent" id="0x7f040485" />
-    <public type="attr" name="shapeAppearanceMediumComponent" id="0x7f040486" />
-    <public type="attr" name="shapeAppearanceOverlay" id="0x7f040487" />
-    <public type="attr" name="shapeAppearanceSmallComponent" id="0x7f040488" />
-    <public type="attr" name="shouldDisableView" id="0x7f040489" />
-    <public type="attr" name="shouldScaleToFill" id="0x7f04048a" />
-    <public type="attr" name="showAsAction" id="0x7f04048b" />
-    <public type="attr" name="showDivider" id="0x7f04048c" />
-    <public type="attr" name="showDividerHorizontal" id="0x7f04048d" />
-    <public type="attr" name="showDividerVertical" id="0x7f04048e" />
-    <public type="attr" name="showDividers" id="0x7f04048f" />
-    <public type="attr" name="showMotionSpec" id="0x7f040490" />
-    <public type="attr" name="showSeekBarValue" id="0x7f040491" />
-    <public type="attr" name="showText" id="0x7f040492" />
-    <public type="attr" name="showTitle" id="0x7f040493" />
-    <public type="attr" name="show_buffering" id="0x7f040494" />
-    <public type="attr" name="show_shuffle_button" id="0x7f040495" />
-    <public type="attr" name="show_timeout" id="0x7f040496" />
-    <public type="attr" name="shrinkMotionSpec" id="0x7f040497" />
-    <public type="attr" name="shutter_background_color" id="0x7f040498" />
-    <public type="attr" name="singleChoiceItemLayout" id="0x7f040499" />
-    <public type="attr" name="singleLine" id="0x7f04049a" />
-    <public type="attr" name="singleLineTitle" id="0x7f04049b" />
-    <public type="attr" name="singleSelection" id="0x7f04049c" />
-    <public type="attr" name="sliderStyle" id="0x7f04049d" />
-    <public type="attr" name="snackbarButtonStyle" id="0x7f04049e" />
-    <public type="attr" name="snackbarStyle" id="0x7f04049f" />
-    <public type="attr" name="snackbarTextViewStyle" id="0x7f0404a0" />
-    <public type="attr" name="sourceClass" id="0x7f0404a1" />
-    <public type="attr" name="spanCount" id="0x7f0404a2" />
-    <public type="attr" name="spinBars" id="0x7f0404a3" />
-    <public type="attr" name="spinnerDropDownItemStyle" id="0x7f0404a4" />
-    <public type="attr" name="spinnerStyle" id="0x7f0404a5" />
-    <public type="attr" name="splitTrack" id="0x7f0404a6" />
-    <public type="attr" name="squaredFinder" id="0x7f0404a7" />
-    <public type="attr" name="srcCompat" id="0x7f0404a8" />
-    <public type="attr" name="stackFromEnd" id="0x7f0404a9" />
-    <public type="attr" name="startIconCheckable" id="0x7f0404aa" />
-    <public type="attr" name="startIconContentDescription" id="0x7f0404ab" />
-    <public type="attr" name="startIconDrawable" id="0x7f0404ac" />
-    <public type="attr" name="startIconTint" id="0x7f0404ad" />
-    <public type="attr" name="startIconTintMode" id="0x7f0404ae" />
-    <public type="attr" name="state_above_anchor" id="0x7f0404af" />
-    <public type="attr" name="state_collapsed" id="0x7f0404b0" />
-    <public type="attr" name="state_collapsible" id="0x7f0404b1" />
-    <public type="attr" name="state_dragged" id="0x7f0404b2" />
-    <public type="attr" name="state_liftable" id="0x7f0404b3" />
-    <public type="attr" name="state_lifted" id="0x7f0404b4" />
-    <public type="attr" name="statusBarBackground" id="0x7f0404b5" />
-    <public type="attr" name="statusBarForeground" id="0x7f0404b6" />
-    <public type="attr" name="statusBarScrim" id="0x7f0404b7" />
-    <public type="attr" name="stream_preview_bg" id="0x7f0404b8" />
-    <public type="attr" name="stream_preview_placeholder_color" id="0x7f0404b9" />
-    <public type="attr" name="strokeColor" id="0x7f0404ba" />
-    <public type="attr" name="strokeWidth" id="0x7f0404bb" />
-    <public type="attr" name="stv_subtitle" id="0x7f0404bc" />
-    <public type="attr" name="stv_title" id="0x7f0404bd" />
-    <public type="attr" name="subMenuArrow" id="0x7f0404be" />
-    <public type="attr" name="submitBackground" id="0x7f0404bf" />
-    <public type="attr" name="subsectionSeparator" id="0x7f0404c0" />
-    <public type="attr" name="subtitle" id="0x7f0404c1" />
-    <public type="attr" name="subtitleTextAppearance" id="0x7f0404c2" />
-    <public type="attr" name="subtitleTextColor" id="0x7f0404c3" />
-    <public type="attr" name="subtitleTextStyle" id="0x7f0404c4" />
-    <public type="attr" name="suffixText" id="0x7f0404c5" />
-    <public type="attr" name="suffixTextAppearance" id="0x7f0404c6" />
-    <public type="attr" name="suffixTextColor" id="0x7f0404c7" />
-    <public type="attr" name="suggestionRowLayout" id="0x7f0404c8" />
-    <public type="attr" name="summary" id="0x7f0404c9" />
-    <public type="attr" name="summaryOff" id="0x7f0404ca" />
-    <public type="attr" name="summaryOn" id="0x7f0404cb" />
-    <public type="attr" name="surface_type" id="0x7f0404cc" />
-    <public type="attr" name="sv_background_color" id="0x7f0404cd" />
-    <public type="attr" name="sv_border_width" id="0x7f0404ce" />
-    <public type="attr" name="sv_corner_radius" id="0x7f0404cf" />
-    <public type="attr" name="sv_show_mobile" id="0x7f0404d0" />
-    <public type="attr" name="swipeRefreshLayoutProgressSpinnerBackgroundColor" id="0x7f0404d1" />
-    <public type="attr" name="switchMinWidth" id="0x7f0404d2" />
-    <public type="attr" name="switchPadding" id="0x7f0404d3" />
-    <public type="attr" name="switchPreferenceCompatStyle" id="0x7f0404d4" />
-    <public type="attr" name="switchPreferenceStyle" id="0x7f0404d5" />
-    <public type="attr" name="switchStyle" id="0x7f0404d6" />
-    <public type="attr" name="switchTextAppearance" id="0x7f0404d7" />
-    <public type="attr" name="switchTextOff" id="0x7f0404d8" />
-    <public type="attr" name="switchTextOn" id="0x7f0404d9" />
-    <public type="attr" name="tabBackground" id="0x7f0404da" />
-    <public type="attr" name="tabContentStart" id="0x7f0404db" />
-    <public type="attr" name="tabGravity" id="0x7f0404dc" />
-    <public type="attr" name="tabIconTint" id="0x7f0404dd" />
-    <public type="attr" name="tabIconTintMode" id="0x7f0404de" />
-    <public type="attr" name="tabIndicator" id="0x7f0404df" />
-    <public type="attr" name="tabIndicatorAnimationDuration" id="0x7f0404e0" />
-    <public type="attr" name="tabIndicatorColor" id="0x7f0404e1" />
-    <public type="attr" name="tabIndicatorFullWidth" id="0x7f0404e2" />
-    <public type="attr" name="tabIndicatorGravity" id="0x7f0404e3" />
-    <public type="attr" name="tabIndicatorHeight" id="0x7f0404e4" />
-    <public type="attr" name="tabInlineLabel" id="0x7f0404e5" />
-    <public type="attr" name="tabMaxWidth" id="0x7f0404e6" />
-    <public type="attr" name="tabMinWidth" id="0x7f0404e7" />
-    <public type="attr" name="tabMode" id="0x7f0404e8" />
-    <public type="attr" name="tabPadding" id="0x7f0404e9" />
-    <public type="attr" name="tabPaddingBottom" id="0x7f0404ea" />
-    <public type="attr" name="tabPaddingEnd" id="0x7f0404eb" />
-    <public type="attr" name="tabPaddingStart" id="0x7f0404ec" />
-    <public type="attr" name="tabPaddingTop" id="0x7f0404ed" />
-    <public type="attr" name="tabRippleColor" id="0x7f0404ee" />
-    <public type="attr" name="tabSelectedTextColor" id="0x7f0404ef" />
-    <public type="attr" name="tabStyle" id="0x7f0404f0" />
-    <public type="attr" name="tabTextAppearance" id="0x7f0404f1" />
-    <public type="attr" name="tabTextColor" id="0x7f0404f2" />
-    <public type="attr" name="tabUnboundedRipple" id="0x7f0404f3" />
-    <public type="attr" name="tag" id="0x7f0404f4" />
-    <public type="attr" name="tcs_subtext" id="0x7f0404f5" />
-    <public type="attr" name="ternaryCheckboxDisabledColor" id="0x7f0404f6" />
-    <public type="attr" name="text" id="0x7f0404f7" />
-    <public type="attr" name="textAllCaps" id="0x7f0404f8" />
-    <public type="attr" name="textAppearanceBody1" id="0x7f0404f9" />
-    <public type="attr" name="textAppearanceBody2" id="0x7f0404fa" />
-    <public type="attr" name="textAppearanceButton" id="0x7f0404fb" />
-    <public type="attr" name="textAppearanceCaption" id="0x7f0404fc" />
-    <public type="attr" name="textAppearanceHeadline1" id="0x7f0404fd" />
-    <public type="attr" name="textAppearanceHeadline2" id="0x7f0404fe" />
-    <public type="attr" name="textAppearanceHeadline3" id="0x7f0404ff" />
-    <public type="attr" name="textAppearanceHeadline4" id="0x7f040500" />
-    <public type="attr" name="textAppearanceHeadline5" id="0x7f040501" />
-    <public type="attr" name="textAppearanceHeadline6" id="0x7f040502" />
-    <public type="attr" name="textAppearanceLargePopupMenu" id="0x7f040503" />
-    <public type="attr" name="textAppearanceLineHeightEnabled" id="0x7f040504" />
-    <public type="attr" name="textAppearanceListItem" id="0x7f040505" />
-    <public type="attr" name="textAppearanceListItemSecondary" id="0x7f040506" />
-    <public type="attr" name="textAppearanceListItemSmall" id="0x7f040507" />
-    <public type="attr" name="textAppearanceOverline" id="0x7f040508" />
-    <public type="attr" name="textAppearancePopupMenuHeader" id="0x7f040509" />
-    <public type="attr" name="textAppearanceSearchResultSubtitle" id="0x7f04050a" />
-    <public type="attr" name="textAppearanceSearchResultTitle" id="0x7f04050b" />
-    <public type="attr" name="textAppearanceSmallPopupMenu" id="0x7f04050c" />
-    <public type="attr" name="textAppearanceSubtitle1" id="0x7f04050d" />
-    <public type="attr" name="textAppearanceSubtitle2" id="0x7f04050e" />
-    <public type="attr" name="textColorAlertDialogListItem" id="0x7f04050f" />
-    <public type="attr" name="textColorSearchUrl" id="0x7f040510" />
-    <public type="attr" name="textEndPadding" id="0x7f040511" />
-    <public type="attr" name="textInputLayoutFocusedRectEnabled" id="0x7f040512" />
-    <public type="attr" name="textInputStyle" id="0x7f040513" />
-    <public type="attr" name="textLocale" id="0x7f040514" />
-    <public type="attr" name="textStartPadding" id="0x7f040515" />
-    <public type="attr" name="text_color" id="0x7f040516" />
-    <public type="attr" name="theme" id="0x7f040517" />
-    <public type="attr" name="themeLineHeight" id="0x7f040518" />
-    <public type="attr" name="theme_backspace_icon" id="0x7f040519" />
-    <public type="attr" name="theme_chat_block_quote_divider" id="0x7f04051a" />
-    <public type="attr" name="theme_chat_blocked_bg" id="0x7f04051b" />
-    <public type="attr" name="theme_chat_blocked_text" id="0x7f04051c" />
-    <public type="attr" name="theme_chat_code" id="0x7f04051d" />
-    <public type="attr" name="theme_chat_codeblock_border" id="0x7f04051e" />
-    <public type="attr" name="theme_chat_empty_mentions_arm" id="0x7f04051f" />
-    <public type="attr" name="theme_chat_empty_mentions_hand" id="0x7f040520" />
-    <public type="attr" name="theme_chat_empty_pins" id="0x7f040521" />
-    <public type="attr" name="theme_chat_input" id="0x7f040522" />
-    <public type="attr" name="theme_chat_input_button_tint_colors" id="0x7f040523" />
-    <public type="attr" name="theme_chat_input_content_tab_bg" id="0x7f040524" />
-    <public type="attr" name="theme_chat_input_divider" id="0x7f040525" />
-    <public type="attr" name="theme_chat_input_edit" id="0x7f040526" />
-    <public type="attr" name="theme_chat_input_photo_selection_icon" id="0x7f040527" />
-    <public type="attr" name="theme_chat_loading_spinner_color" id="0x7f040528" />
-    <public type="attr" name="theme_chat_mentioned_me" id="0x7f040529" />
-    <public type="attr" name="theme_chat_reaction_background" id="0x7f04052a" />
-    <public type="attr" name="theme_chat_reaction_text_color" id="0x7f04052b" />
-    <public type="attr" name="theme_chat_spoiler_bg" id="0x7f04052c" />
-    <public type="attr" name="theme_chat_spoiler_bg_visible" id="0x7f04052d" />
-    <public type="attr" name="theme_chat_spoiler_inapp_bg" id="0x7f04052e" />
-    <public type="attr" name="theme_emoji_placeholder" id="0x7f04052f" />
-    <public type="attr" name="theme_emoji_settings_empty" id="0x7f040530" />
-    <public type="attr" name="theme_expression_tray_search_icon_empty" id="0x7f040531" />
-    <public type="attr" name="theme_friends_divider" id="0x7f040532" />
-    <public type="attr" name="theme_friends_no_block" id="0x7f040533" />
-    <public type="attr" name="theme_friends_no_friends" id="0x7f040534" />
-    <public type="attr" name="theme_friends_no_online" id="0x7f040535" />
-    <public type="attr" name="theme_friends_no_request" id="0x7f040536" />
-    <public type="attr" name="theme_friends_no_suggestions" id="0x7f040537" />
-    <public type="attr" name="theme_friends_pending_tab_text_color" id="0x7f040538" />
-    <public type="attr" name="theme_friends_profile_icon" id="0x7f040539" />
-    <public type="attr" name="theme_friends_tab_mentions" id="0x7f04053a" />
-    <public type="attr" name="theme_group_start_video_icon" id="0x7f04053b" />
-    <public type="attr" name="theme_name" id="0x7f04053c" />
-    <public type="attr" name="theme_overlay_mentions_oval" id="0x7f04053d" />
-    <public type="attr" name="theme_search_broken_results" id="0x7f04053e" />
-    <public type="attr" name="theme_search_empty_asset" id="0x7f04053f" />
-    <public type="attr" name="theme_search_empty_asset_alternate" id="0x7f040540" />
-    <public type="attr" name="theme_search_indexing_animation" id="0x7f040541" />
-    <public type="attr" name="theme_status_indicator_color" id="0x7f040542" />
-    <public type="attr" name="thickness" id="0x7f040543" />
-    <public type="attr" name="thumbColor" id="0x7f040544" />
-    <public type="attr" name="thumbElevation" id="0x7f040545" />
-    <public type="attr" name="thumbRadius" id="0x7f040546" />
-    <public type="attr" name="thumbTextPadding" id="0x7f040547" />
-    <public type="attr" name="thumbTint" id="0x7f040548" />
-    <public type="attr" name="thumbTintMode" id="0x7f040549" />
-    <public type="attr" name="tickColor" id="0x7f04054a" />
-    <public type="attr" name="tickColorActive" id="0x7f04054b" />
-    <public type="attr" name="tickColorInactive" id="0x7f04054c" />
-    <public type="attr" name="tickMark" id="0x7f04054d" />
-    <public type="attr" name="tickMarkTint" id="0x7f04054e" />
-    <public type="attr" name="tickMarkTintMode" id="0x7f04054f" />
-    <public type="attr" name="time_bar_min_update_interval" id="0x7f040550" />
-    <public type="attr" name="tint" id="0x7f040551" />
-    <public type="attr" name="tintMode" id="0x7f040552" />
-    <public type="attr" name="title" id="0x7f040553" />
-    <public type="attr" name="titleEnabled" id="0x7f040554" />
-    <public type="attr" name="titleMargin" id="0x7f040555" />
-    <public type="attr" name="titleMarginBottom" id="0x7f040556" />
-    <public type="attr" name="titleMarginEnd" id="0x7f040557" />
-    <public type="attr" name="titleMarginStart" id="0x7f040558" />
-    <public type="attr" name="titleMarginTop" id="0x7f040559" />
-    <public type="attr" name="titleMargins" id="0x7f04055a" />
-    <public type="attr" name="titleTextAppearance" id="0x7f04055b" />
-    <public type="attr" name="titleTextColor" id="0x7f04055c" />
-    <public type="attr" name="titleTextStyle" id="0x7f04055d" />
-    <public type="attr" name="toAddressesSection" id="0x7f04055e" />
-    <public type="attr" name="toolbarColor" id="0x7f04055f" />
-    <public type="attr" name="toolbarId" id="0x7f040560" />
-    <public type="attr" name="toolbarNavigationButtonStyle" id="0x7f040561" />
-    <public type="attr" name="toolbarStyle" id="0x7f040562" />
-    <public type="attr" name="tooltipForegroundColor" id="0x7f040563" />
-    <public type="attr" name="tooltipFrameBackground" id="0x7f040564" />
-    <public type="attr" name="tooltipStyle" id="0x7f040565" />
-    <public type="attr" name="tooltipText" id="0x7f040566" />
-    <public type="attr" name="topLeftRadius" id="0x7f040567" />
-    <public type="attr" name="topRightRadius" id="0x7f040568" />
-    <public type="attr" name="touch_target_height" id="0x7f040569" />
-    <public type="attr" name="track" id="0x7f04056a" />
-    <public type="attr" name="trackColor" id="0x7f04056b" />
-    <public type="attr" name="trackColorActive" id="0x7f04056c" />
-    <public type="attr" name="trackColorInactive" id="0x7f04056d" />
-    <public type="attr" name="trackHeight" id="0x7f04056e" />
-    <public type="attr" name="trackTint" id="0x7f04056f" />
-    <public type="attr" name="trackTintMode" id="0x7f040570" />
-    <public type="attr" name="transitionShapeAppearance" id="0x7f040571" />
-    <public type="attr" name="trimmable" id="0x7f040572" />
-    <public type="attr" name="ttcIndex" id="0x7f040573" />
-    <public type="attr" name="tv_markdown_enabled" id="0x7f040574" />
-    <public type="attr" name="tv_plural" id="0x7f040575" />
-    <public type="attr" name="tv_plural_quantity" id="0x7f040576" />
-    <public type="attr" name="ucrop_artv_ratio_title" id="0x7f040577" />
-    <public type="attr" name="ucrop_artv_ratio_x" id="0x7f040578" />
-    <public type="attr" name="ucrop_artv_ratio_y" id="0x7f040579" />
-    <public type="attr" name="ucrop_aspect_ratio_x" id="0x7f04057a" />
-    <public type="attr" name="ucrop_aspect_ratio_y" id="0x7f04057b" />
-    <public type="attr" name="ucrop_circle_dimmed_layer" id="0x7f04057c" />
-    <public type="attr" name="ucrop_dimmed_color" id="0x7f04057d" />
-    <public type="attr" name="ucrop_frame_color" id="0x7f04057e" />
-    <public type="attr" name="ucrop_frame_stroke_size" id="0x7f04057f" />
-    <public type="attr" name="ucrop_grid_color" id="0x7f040580" />
-    <public type="attr" name="ucrop_grid_column_count" id="0x7f040581" />
-    <public type="attr" name="ucrop_grid_row_count" id="0x7f040582" />
-    <public type="attr" name="ucrop_grid_stroke_size" id="0x7f040583" />
-    <public type="attr" name="ucrop_show_frame" id="0x7f040584" />
-    <public type="attr" name="ucrop_show_grid" id="0x7f040585" />
-    <public type="attr" name="ucrop_show_oval_crop_frame" id="0x7f040586" />
-    <public type="attr" name="unplayed_color" id="0x7f040587" />
-    <public type="attr" name="updatesContinuously" id="0x7f040588" />
-    <public type="attr" name="useCompatPadding" id="0x7f040589" />
-    <public type="attr" name="useMaterialThemeColors" id="0x7f04058a" />
-    <public type="attr" name="useSimpleSummaryProvider" id="0x7f04058b" />
-    <public type="attr" name="use_artwork" id="0x7f04058c" />
-    <public type="attr" name="use_controller" id="0x7f04058d" />
-    <public type="attr" name="userInputSection" id="0x7f04058e" />
-    <public type="attr" name="userInputTag" id="0x7f04058f" />
-    <public type="attr" name="userInputValue" id="0x7f040590" />
-    <public type="attr" name="user_avatar_background_color" id="0x7f040591" />
-    <public type="attr" name="user_avatar_size" id="0x7f040592" />
-    <public type="attr" name="user_profile_header_background_color" id="0x7f040593" />
-    <public type="attr" name="username" id="0x7f040594" />
-    <public type="attr" name="username_singleline" id="0x7f040595" />
-    <public type="attr" name="username_text_appearance" id="0x7f040596" />
-    <public type="attr" name="username_text_size" id="0x7f040597" />
-    <public type="attr" name="values" id="0x7f040598" />
-    <public type="attr" name="vcpv_is_overlay" id="0x7f040599" />
-    <public type="attr" name="vcpv_match_video_orientation" id="0x7f04059a" />
-    <public type="attr" name="verticalOffset" id="0x7f04059b" />
-    <public type="attr" name="viewAspectRatio" id="0x7f04059c" />
-    <public type="attr" name="viewInflaterClass" id="0x7f04059d" />
-    <public type="attr" name="voiceIcon" id="0x7f04059e" />
-    <public type="attr" name="vuv_avatar_size" id="0x7f04059f" />
-    <public type="attr" name="widgetLayout" id="0x7f0405a0" />
-    <public type="attr" name="windowActionBar" id="0x7f0405a1" />
-    <public type="attr" name="windowActionBarOverlay" id="0x7f0405a2" />
-    <public type="attr" name="windowActionModeOverlay" id="0x7f0405a3" />
-    <public type="attr" name="windowFixedHeightMajor" id="0x7f0405a4" />
-    <public type="attr" name="windowFixedHeightMinor" id="0x7f0405a5" />
-    <public type="attr" name="windowFixedWidthMajor" id="0x7f0405a6" />
-    <public type="attr" name="windowFixedWidthMinor" id="0x7f0405a7" />
-    <public type="attr" name="windowMinWidthMajor" id="0x7f0405a8" />
-    <public type="attr" name="windowMinWidthMinor" id="0x7f0405a9" />
-    <public type="attr" name="windowNoTitle" id="0x7f0405aa" />
-    <public type="attr" name="yearSelectedStyle" id="0x7f0405ab" />
-    <public type="attr" name="yearStyle" id="0x7f0405ac" />
-    <public type="attr" name="yearTodayStyle" id="0x7f0405ad" />
+    <public type="attr" name="schemaOrgProperty" id="0x7f040457" />
+    <public type="attr" name="schemaOrgType" id="0x7f040458" />
+    <public type="attr" name="scopeUris" id="0x7f040459" />
+    <public type="attr" name="scrimAnimationDuration" id="0x7f04045a" />
+    <public type="attr" name="scrimBackground" id="0x7f04045b" />
+    <public type="attr" name="scrimVisibleHeightTrigger" id="0x7f04045c" />
+    <public type="attr" name="scrubber_color" id="0x7f04045d" />
+    <public type="attr" name="scrubber_disabled_size" id="0x7f04045e" />
+    <public type="attr" name="scrubber_dragged_size" id="0x7f04045f" />
+    <public type="attr" name="scrubber_drawable" id="0x7f040460" />
+    <public type="attr" name="scrubber_enabled_size" id="0x7f040461" />
+    <public type="attr" name="searchEnabled" id="0x7f040462" />
+    <public type="attr" name="searchHintIcon" id="0x7f040463" />
+    <public type="attr" name="searchIcon" id="0x7f040464" />
+    <public type="attr" name="searchLabel" id="0x7f040465" />
+    <public type="attr" name="searchViewStyle" id="0x7f040466" />
+    <public type="attr" name="sectionContent" id="0x7f040467" />
+    <public type="attr" name="sectionFormat" id="0x7f040468" />
+    <public type="attr" name="sectionId" id="0x7f040469" />
+    <public type="attr" name="sectionType" id="0x7f04046a" />
+    <public type="attr" name="sectionWeight" id="0x7f04046b" />
+    <public type="attr" name="seekBarIncrement" id="0x7f04046c" />
+    <public type="attr" name="seekBarPreferenceStyle" id="0x7f04046d" />
+    <public type="attr" name="seekBarStyle" id="0x7f04046e" />
+    <public type="attr" name="selectable" id="0x7f04046f" />
+    <public type="attr" name="selectableItemBackground" id="0x7f040470" />
+    <public type="attr" name="selectableItemBackgroundBorderless" id="0x7f040471" />
+    <public type="attr" name="selectionRequired" id="0x7f040472" />
+    <public type="attr" name="semanticallySearchable" id="0x7f040473" />
+    <public type="attr" name="settingsDescription" id="0x7f040474" />
+    <public type="attr" name="settings_text_color" id="0x7f040475" />
+    <public type="attr" name="shapeAppearance" id="0x7f040476" />
+    <public type="attr" name="shapeAppearanceLargeComponent" id="0x7f040477" />
+    <public type="attr" name="shapeAppearanceMediumComponent" id="0x7f040478" />
+    <public type="attr" name="shapeAppearanceOverlay" id="0x7f040479" />
+    <public type="attr" name="shapeAppearanceSmallComponent" id="0x7f04047a" />
+    <public type="attr" name="shouldDisableView" id="0x7f04047b" />
+    <public type="attr" name="shouldScaleToFill" id="0x7f04047c" />
+    <public type="attr" name="showAsAction" id="0x7f04047d" />
+    <public type="attr" name="showDivider" id="0x7f04047e" />
+    <public type="attr" name="showDividerHorizontal" id="0x7f04047f" />
+    <public type="attr" name="showDividerVertical" id="0x7f040480" />
+    <public type="attr" name="showDividers" id="0x7f040481" />
+    <public type="attr" name="showMotionSpec" id="0x7f040482" />
+    <public type="attr" name="showSeekBarValue" id="0x7f040483" />
+    <public type="attr" name="showText" id="0x7f040484" />
+    <public type="attr" name="showTitle" id="0x7f040485" />
+    <public type="attr" name="show_buffering" id="0x7f040486" />
+    <public type="attr" name="show_shuffle_button" id="0x7f040487" />
+    <public type="attr" name="show_timeout" id="0x7f040488" />
+    <public type="attr" name="shrinkMotionSpec" id="0x7f040489" />
+    <public type="attr" name="shutter_background_color" id="0x7f04048a" />
+    <public type="attr" name="singleChoiceItemLayout" id="0x7f04048b" />
+    <public type="attr" name="singleLine" id="0x7f04048c" />
+    <public type="attr" name="singleLineTitle" id="0x7f04048d" />
+    <public type="attr" name="singleSelection" id="0x7f04048e" />
+    <public type="attr" name="sliderStyle" id="0x7f04048f" />
+    <public type="attr" name="snackbarButtonStyle" id="0x7f040490" />
+    <public type="attr" name="snackbarStyle" id="0x7f040491" />
+    <public type="attr" name="snackbarTextViewStyle" id="0x7f040492" />
+    <public type="attr" name="sourceClass" id="0x7f040493" />
+    <public type="attr" name="spanCount" id="0x7f040494" />
+    <public type="attr" name="spinBars" id="0x7f040495" />
+    <public type="attr" name="spinnerDropDownItemStyle" id="0x7f040496" />
+    <public type="attr" name="spinnerStyle" id="0x7f040497" />
+    <public type="attr" name="splitTrack" id="0x7f040498" />
+    <public type="attr" name="squaredFinder" id="0x7f040499" />
+    <public type="attr" name="srcCompat" id="0x7f04049a" />
+    <public type="attr" name="stackFromEnd" id="0x7f04049b" />
+    <public type="attr" name="startIconCheckable" id="0x7f04049c" />
+    <public type="attr" name="startIconContentDescription" id="0x7f04049d" />
+    <public type="attr" name="startIconDrawable" id="0x7f04049e" />
+    <public type="attr" name="startIconTint" id="0x7f04049f" />
+    <public type="attr" name="startIconTintMode" id="0x7f0404a0" />
+    <public type="attr" name="state_above_anchor" id="0x7f0404a1" />
+    <public type="attr" name="state_collapsed" id="0x7f0404a2" />
+    <public type="attr" name="state_collapsible" id="0x7f0404a3" />
+    <public type="attr" name="state_dragged" id="0x7f0404a4" />
+    <public type="attr" name="state_liftable" id="0x7f0404a5" />
+    <public type="attr" name="state_lifted" id="0x7f0404a6" />
+    <public type="attr" name="statusBarBackground" id="0x7f0404a7" />
+    <public type="attr" name="statusBarForeground" id="0x7f0404a8" />
+    <public type="attr" name="statusBarScrim" id="0x7f0404a9" />
+    <public type="attr" name="stream_preview_bg" id="0x7f0404aa" />
+    <public type="attr" name="stream_preview_placeholder_color" id="0x7f0404ab" />
+    <public type="attr" name="strokeColor" id="0x7f0404ac" />
+    <public type="attr" name="strokeWidth" id="0x7f0404ad" />
+    <public type="attr" name="stv_subtitle" id="0x7f0404ae" />
+    <public type="attr" name="stv_title" id="0x7f0404af" />
+    <public type="attr" name="subMenuArrow" id="0x7f0404b0" />
+    <public type="attr" name="submitBackground" id="0x7f0404b1" />
+    <public type="attr" name="subsectionSeparator" id="0x7f0404b2" />
+    <public type="attr" name="subtitle" id="0x7f0404b3" />
+    <public type="attr" name="subtitleTextAppearance" id="0x7f0404b4" />
+    <public type="attr" name="subtitleTextColor" id="0x7f0404b5" />
+    <public type="attr" name="subtitleTextStyle" id="0x7f0404b6" />
+    <public type="attr" name="suffixText" id="0x7f0404b7" />
+    <public type="attr" name="suffixTextAppearance" id="0x7f0404b8" />
+    <public type="attr" name="suffixTextColor" id="0x7f0404b9" />
+    <public type="attr" name="suggestionRowLayout" id="0x7f0404ba" />
+    <public type="attr" name="summary" id="0x7f0404bb" />
+    <public type="attr" name="summaryOff" id="0x7f0404bc" />
+    <public type="attr" name="summaryOn" id="0x7f0404bd" />
+    <public type="attr" name="surface_type" id="0x7f0404be" />
+    <public type="attr" name="sv_background_color" id="0x7f0404bf" />
+    <public type="attr" name="sv_border_width" id="0x7f0404c0" />
+    <public type="attr" name="sv_corner_radius" id="0x7f0404c1" />
+    <public type="attr" name="sv_show_mobile" id="0x7f0404c2" />
+    <public type="attr" name="swipeRefreshLayoutProgressSpinnerBackgroundColor" id="0x7f0404c3" />
+    <public type="attr" name="switchMinWidth" id="0x7f0404c4" />
+    <public type="attr" name="switchPadding" id="0x7f0404c5" />
+    <public type="attr" name="switchPreferenceCompatStyle" id="0x7f0404c6" />
+    <public type="attr" name="switchPreferenceStyle" id="0x7f0404c7" />
+    <public type="attr" name="switchStyle" id="0x7f0404c8" />
+    <public type="attr" name="switchTextAppearance" id="0x7f0404c9" />
+    <public type="attr" name="switchTextOff" id="0x7f0404ca" />
+    <public type="attr" name="switchTextOn" id="0x7f0404cb" />
+    <public type="attr" name="tabBackground" id="0x7f0404cc" />
+    <public type="attr" name="tabContentStart" id="0x7f0404cd" />
+    <public type="attr" name="tabGravity" id="0x7f0404ce" />
+    <public type="attr" name="tabIconTint" id="0x7f0404cf" />
+    <public type="attr" name="tabIconTintMode" id="0x7f0404d0" />
+    <public type="attr" name="tabIndicator" id="0x7f0404d1" />
+    <public type="attr" name="tabIndicatorAnimationDuration" id="0x7f0404d2" />
+    <public type="attr" name="tabIndicatorColor" id="0x7f0404d3" />
+    <public type="attr" name="tabIndicatorFullWidth" id="0x7f0404d4" />
+    <public type="attr" name="tabIndicatorGravity" id="0x7f0404d5" />
+    <public type="attr" name="tabIndicatorHeight" id="0x7f0404d6" />
+    <public type="attr" name="tabInlineLabel" id="0x7f0404d7" />
+    <public type="attr" name="tabMaxWidth" id="0x7f0404d8" />
+    <public type="attr" name="tabMinWidth" id="0x7f0404d9" />
+    <public type="attr" name="tabMode" id="0x7f0404da" />
+    <public type="attr" name="tabPadding" id="0x7f0404db" />
+    <public type="attr" name="tabPaddingBottom" id="0x7f0404dc" />
+    <public type="attr" name="tabPaddingEnd" id="0x7f0404dd" />
+    <public type="attr" name="tabPaddingStart" id="0x7f0404de" />
+    <public type="attr" name="tabPaddingTop" id="0x7f0404df" />
+    <public type="attr" name="tabRippleColor" id="0x7f0404e0" />
+    <public type="attr" name="tabSelectedTextColor" id="0x7f0404e1" />
+    <public type="attr" name="tabStyle" id="0x7f0404e2" />
+    <public type="attr" name="tabTextAppearance" id="0x7f0404e3" />
+    <public type="attr" name="tabTextColor" id="0x7f0404e4" />
+    <public type="attr" name="tabUnboundedRipple" id="0x7f0404e5" />
+    <public type="attr" name="tag" id="0x7f0404e6" />
+    <public type="attr" name="tcs_subtext" id="0x7f0404e7" />
+    <public type="attr" name="ternaryCheckboxDisabledColor" id="0x7f0404e8" />
+    <public type="attr" name="text" id="0x7f0404e9" />
+    <public type="attr" name="textAllCaps" id="0x7f0404ea" />
+    <public type="attr" name="textAppearanceBody1" id="0x7f0404eb" />
+    <public type="attr" name="textAppearanceBody2" id="0x7f0404ec" />
+    <public type="attr" name="textAppearanceButton" id="0x7f0404ed" />
+    <public type="attr" name="textAppearanceCaption" id="0x7f0404ee" />
+    <public type="attr" name="textAppearanceHeadline1" id="0x7f0404ef" />
+    <public type="attr" name="textAppearanceHeadline2" id="0x7f0404f0" />
+    <public type="attr" name="textAppearanceHeadline3" id="0x7f0404f1" />
+    <public type="attr" name="textAppearanceHeadline4" id="0x7f0404f2" />
+    <public type="attr" name="textAppearanceHeadline5" id="0x7f0404f3" />
+    <public type="attr" name="textAppearanceHeadline6" id="0x7f0404f4" />
+    <public type="attr" name="textAppearanceLargePopupMenu" id="0x7f0404f5" />
+    <public type="attr" name="textAppearanceLineHeightEnabled" id="0x7f0404f6" />
+    <public type="attr" name="textAppearanceListItem" id="0x7f0404f7" />
+    <public type="attr" name="textAppearanceListItemSecondary" id="0x7f0404f8" />
+    <public type="attr" name="textAppearanceListItemSmall" id="0x7f0404f9" />
+    <public type="attr" name="textAppearanceOverline" id="0x7f0404fa" />
+    <public type="attr" name="textAppearancePopupMenuHeader" id="0x7f0404fb" />
+    <public type="attr" name="textAppearanceSearchResultSubtitle" id="0x7f0404fc" />
+    <public type="attr" name="textAppearanceSearchResultTitle" id="0x7f0404fd" />
+    <public type="attr" name="textAppearanceSmallPopupMenu" id="0x7f0404fe" />
+    <public type="attr" name="textAppearanceSubtitle1" id="0x7f0404ff" />
+    <public type="attr" name="textAppearanceSubtitle2" id="0x7f040500" />
+    <public type="attr" name="textColorAlertDialogListItem" id="0x7f040501" />
+    <public type="attr" name="textColorSearchUrl" id="0x7f040502" />
+    <public type="attr" name="textEndPadding" id="0x7f040503" />
+    <public type="attr" name="textInputLayoutFocusedRectEnabled" id="0x7f040504" />
+    <public type="attr" name="textInputStyle" id="0x7f040505" />
+    <public type="attr" name="textLocale" id="0x7f040506" />
+    <public type="attr" name="textStartPadding" id="0x7f040507" />
+    <public type="attr" name="text_color" id="0x7f040508" />
+    <public type="attr" name="theme" id="0x7f040509" />
+    <public type="attr" name="themeLineHeight" id="0x7f04050a" />
+    <public type="attr" name="theme_backspace_icon" id="0x7f04050b" />
+    <public type="attr" name="theme_chat_block_quote_divider" id="0x7f04050c" />
+    <public type="attr" name="theme_chat_blocked_bg" id="0x7f04050d" />
+    <public type="attr" name="theme_chat_blocked_text" id="0x7f04050e" />
+    <public type="attr" name="theme_chat_code" id="0x7f04050f" />
+    <public type="attr" name="theme_chat_codeblock_border" id="0x7f040510" />
+    <public type="attr" name="theme_chat_empty_mentions_arm" id="0x7f040511" />
+    <public type="attr" name="theme_chat_empty_mentions_hand" id="0x7f040512" />
+    <public type="attr" name="theme_chat_empty_pins" id="0x7f040513" />
+    <public type="attr" name="theme_chat_input" id="0x7f040514" />
+    <public type="attr" name="theme_chat_input_button_tint_colors" id="0x7f040515" />
+    <public type="attr" name="theme_chat_input_content_tab_bg" id="0x7f040516" />
+    <public type="attr" name="theme_chat_input_divider" id="0x7f040517" />
+    <public type="attr" name="theme_chat_input_edit" id="0x7f040518" />
+    <public type="attr" name="theme_chat_input_photo_selection_icon" id="0x7f040519" />
+    <public type="attr" name="theme_chat_loading_spinner_color" id="0x7f04051a" />
+    <public type="attr" name="theme_chat_mentioned_me" id="0x7f04051b" />
+    <public type="attr" name="theme_chat_reaction_background" id="0x7f04051c" />
+    <public type="attr" name="theme_chat_reaction_text_color" id="0x7f04051d" />
+    <public type="attr" name="theme_chat_spoiler_bg" id="0x7f04051e" />
+    <public type="attr" name="theme_chat_spoiler_bg_visible" id="0x7f04051f" />
+    <public type="attr" name="theme_chat_spoiler_inapp_bg" id="0x7f040520" />
+    <public type="attr" name="theme_emoji_placeholder" id="0x7f040521" />
+    <public type="attr" name="theme_emoji_settings_empty" id="0x7f040522" />
+    <public type="attr" name="theme_expression_tray_search_icon_empty" id="0x7f040523" />
+    <public type="attr" name="theme_friends_divider" id="0x7f040524" />
+    <public type="attr" name="theme_friends_no_block" id="0x7f040525" />
+    <public type="attr" name="theme_friends_no_friends" id="0x7f040526" />
+    <public type="attr" name="theme_friends_no_online" id="0x7f040527" />
+    <public type="attr" name="theme_friends_no_request" id="0x7f040528" />
+    <public type="attr" name="theme_friends_no_suggestions" id="0x7f040529" />
+    <public type="attr" name="theme_friends_pending_tab_text_color" id="0x7f04052a" />
+    <public type="attr" name="theme_friends_profile_icon" id="0x7f04052b" />
+    <public type="attr" name="theme_friends_tab_mentions" id="0x7f04052c" />
+    <public type="attr" name="theme_group_start_video_icon" id="0x7f04052d" />
+    <public type="attr" name="theme_name" id="0x7f04052e" />
+    <public type="attr" name="theme_overlay_mentions_oval" id="0x7f04052f" />
+    <public type="attr" name="theme_search_broken_results" id="0x7f040530" />
+    <public type="attr" name="theme_search_empty_asset" id="0x7f040531" />
+    <public type="attr" name="theme_search_empty_asset_alternate" id="0x7f040532" />
+    <public type="attr" name="theme_search_indexing_animation" id="0x7f040533" />
+    <public type="attr" name="theme_status_indicator_color" id="0x7f040534" />
+    <public type="attr" name="thickness" id="0x7f040535" />
+    <public type="attr" name="thumbColor" id="0x7f040536" />
+    <public type="attr" name="thumbElevation" id="0x7f040537" />
+    <public type="attr" name="thumbRadius" id="0x7f040538" />
+    <public type="attr" name="thumbTextPadding" id="0x7f040539" />
+    <public type="attr" name="thumbTint" id="0x7f04053a" />
+    <public type="attr" name="thumbTintMode" id="0x7f04053b" />
+    <public type="attr" name="tickColor" id="0x7f04053c" />
+    <public type="attr" name="tickColorActive" id="0x7f04053d" />
+    <public type="attr" name="tickColorInactive" id="0x7f04053e" />
+    <public type="attr" name="tickMark" id="0x7f04053f" />
+    <public type="attr" name="tickMarkTint" id="0x7f040540" />
+    <public type="attr" name="tickMarkTintMode" id="0x7f040541" />
+    <public type="attr" name="time_bar_min_update_interval" id="0x7f040542" />
+    <public type="attr" name="tint" id="0x7f040543" />
+    <public type="attr" name="tintMode" id="0x7f040544" />
+    <public type="attr" name="title" id="0x7f040545" />
+    <public type="attr" name="titleEnabled" id="0x7f040546" />
+    <public type="attr" name="titleMargin" id="0x7f040547" />
+    <public type="attr" name="titleMarginBottom" id="0x7f040548" />
+    <public type="attr" name="titleMarginEnd" id="0x7f040549" />
+    <public type="attr" name="titleMarginStart" id="0x7f04054a" />
+    <public type="attr" name="titleMarginTop" id="0x7f04054b" />
+    <public type="attr" name="titleMargins" id="0x7f04054c" />
+    <public type="attr" name="titleTextAppearance" id="0x7f04054d" />
+    <public type="attr" name="titleTextColor" id="0x7f04054e" />
+    <public type="attr" name="titleTextStyle" id="0x7f04054f" />
+    <public type="attr" name="toAddressesSection" id="0x7f040550" />
+    <public type="attr" name="toolbarColor" id="0x7f040551" />
+    <public type="attr" name="toolbarId" id="0x7f040552" />
+    <public type="attr" name="toolbarNavigationButtonStyle" id="0x7f040553" />
+    <public type="attr" name="toolbarStyle" id="0x7f040554" />
+    <public type="attr" name="tooltipForegroundColor" id="0x7f040555" />
+    <public type="attr" name="tooltipFrameBackground" id="0x7f040556" />
+    <public type="attr" name="tooltipStyle" id="0x7f040557" />
+    <public type="attr" name="tooltipText" id="0x7f040558" />
+    <public type="attr" name="topLeftRadius" id="0x7f040559" />
+    <public type="attr" name="topRightRadius" id="0x7f04055a" />
+    <public type="attr" name="touch_target_height" id="0x7f04055b" />
+    <public type="attr" name="track" id="0x7f04055c" />
+    <public type="attr" name="trackColor" id="0x7f04055d" />
+    <public type="attr" name="trackColorActive" id="0x7f04055e" />
+    <public type="attr" name="trackColorInactive" id="0x7f04055f" />
+    <public type="attr" name="trackHeight" id="0x7f040560" />
+    <public type="attr" name="trackTint" id="0x7f040561" />
+    <public type="attr" name="trackTintMode" id="0x7f040562" />
+    <public type="attr" name="transitionShapeAppearance" id="0x7f040563" />
+    <public type="attr" name="trimmable" id="0x7f040564" />
+    <public type="attr" name="ttcIndex" id="0x7f040565" />
+    <public type="attr" name="tv_markdown_enabled" id="0x7f040566" />
+    <public type="attr" name="tv_plural" id="0x7f040567" />
+    <public type="attr" name="tv_plural_quantity" id="0x7f040568" />
+    <public type="attr" name="ucrop_artv_ratio_title" id="0x7f040569" />
+    <public type="attr" name="ucrop_artv_ratio_x" id="0x7f04056a" />
+    <public type="attr" name="ucrop_artv_ratio_y" id="0x7f04056b" />
+    <public type="attr" name="ucrop_aspect_ratio_x" id="0x7f04056c" />
+    <public type="attr" name="ucrop_aspect_ratio_y" id="0x7f04056d" />
+    <public type="attr" name="ucrop_circle_dimmed_layer" id="0x7f04056e" />
+    <public type="attr" name="ucrop_dimmed_color" id="0x7f04056f" />
+    <public type="attr" name="ucrop_frame_color" id="0x7f040570" />
+    <public type="attr" name="ucrop_frame_stroke_size" id="0x7f040571" />
+    <public type="attr" name="ucrop_grid_color" id="0x7f040572" />
+    <public type="attr" name="ucrop_grid_column_count" id="0x7f040573" />
+    <public type="attr" name="ucrop_grid_row_count" id="0x7f040574" />
+    <public type="attr" name="ucrop_grid_stroke_size" id="0x7f040575" />
+    <public type="attr" name="ucrop_show_frame" id="0x7f040576" />
+    <public type="attr" name="ucrop_show_grid" id="0x7f040577" />
+    <public type="attr" name="ucrop_show_oval_crop_frame" id="0x7f040578" />
+    <public type="attr" name="unplayed_color" id="0x7f040579" />
+    <public type="attr" name="updatesContinuously" id="0x7f04057a" />
+    <public type="attr" name="useCompatPadding" id="0x7f04057b" />
+    <public type="attr" name="useMaterialThemeColors" id="0x7f04057c" />
+    <public type="attr" name="useSimpleSummaryProvider" id="0x7f04057d" />
+    <public type="attr" name="use_artwork" id="0x7f04057e" />
+    <public type="attr" name="use_controller" id="0x7f04057f" />
+    <public type="attr" name="userInputSection" id="0x7f040580" />
+    <public type="attr" name="userInputTag" id="0x7f040581" />
+    <public type="attr" name="userInputValue" id="0x7f040582" />
+    <public type="attr" name="user_avatar_background_color" id="0x7f040583" />
+    <public type="attr" name="user_avatar_size" id="0x7f040584" />
+    <public type="attr" name="user_profile_header_background_color" id="0x7f040585" />
+    <public type="attr" name="username" id="0x7f040586" />
+    <public type="attr" name="username_singleline" id="0x7f040587" />
+    <public type="attr" name="username_text_appearance" id="0x7f040588" />
+    <public type="attr" name="username_text_size" id="0x7f040589" />
+    <public type="attr" name="values" id="0x7f04058a" />
+    <public type="attr" name="vcpv_is_overlay" id="0x7f04058b" />
+    <public type="attr" name="vcpv_match_video_orientation" id="0x7f04058c" />
+    <public type="attr" name="verticalOffset" id="0x7f04058d" />
+    <public type="attr" name="viewAspectRatio" id="0x7f04058e" />
+    <public type="attr" name="viewInflaterClass" id="0x7f04058f" />
+    <public type="attr" name="voiceIcon" id="0x7f040590" />
+    <public type="attr" name="vuv_avatar_size" id="0x7f040591" />
+    <public type="attr" name="widgetLayout" id="0x7f040592" />
+    <public type="attr" name="windowActionBar" id="0x7f040593" />
+    <public type="attr" name="windowActionBarOverlay" id="0x7f040594" />
+    <public type="attr" name="windowActionModeOverlay" id="0x7f040595" />
+    <public type="attr" name="windowFixedHeightMajor" id="0x7f040596" />
+    <public type="attr" name="windowFixedHeightMinor" id="0x7f040597" />
+    <public type="attr" name="windowFixedWidthMajor" id="0x7f040598" />
+    <public type="attr" name="windowFixedWidthMinor" id="0x7f040599" />
+    <public type="attr" name="windowMinWidthMajor" id="0x7f04059a" />
+    <public type="attr" name="windowMinWidthMinor" id="0x7f04059b" />
+    <public type="attr" name="windowNoTitle" id="0x7f04059c" />
+    <public type="attr" name="yearSelectedStyle" id="0x7f04059d" />
+    <public type="attr" name="yearStyle" id="0x7f04059e" />
+    <public type="attr" name="yearTodayStyle" id="0x7f04059f" />
     <public type="bool" name="abc_action_bar_embed_tabs" id="0x7f050000" />
     <public type="bool" name="abc_allow_stacked_button_bar" id="0x7f050001" />
     <public type="bool" name="abc_config_actionMenuItemAllCaps" id="0x7f050002" />
@@ -2766,20 +2752,13 @@
     <public type="dimen" name="uikit_settings_item_header_size" id="0x7f0701e9" />
     <public type="dimen" name="uikit_settings_item_text_size" id="0x7f0701ea" />
     <public type="dimen" name="uikit_settings_voice_user_border_padding" id="0x7f0701eb" />
-    <public type="dimen" name="uikit_spacing_large" id="0x7f0701ec" />
-    <public type="dimen" name="uikit_spacing_medium" id="0x7f0701ed" />
-    <public type="dimen" name="uikit_spacing_small" id="0x7f0701ee" />
-    <public type="dimen" name="uikit_spacing_xlarge" id="0x7f0701ef" />
-    <public type="dimen" name="uikit_spacing_xsmall" id="0x7f0701f0" />
-    <public type="dimen" name="uikit_spacing_xxlarge" id="0x7f0701f1" />
-    <public type="dimen" name="uikit_spacing_xxxlarge" id="0x7f0701f2" />
-    <public type="dimen" name="uikit_textsize_large" id="0x7f0701f3" />
-    <public type="dimen" name="uikit_textsize_medium" id="0x7f0701f4" />
-    <public type="dimen" name="uikit_textsize_small" id="0x7f0701f5" />
-    <public type="dimen" name="uikit_textsize_xlarge" id="0x7f0701f6" />
-    <public type="dimen" name="uikit_textsize_xxlarge" id="0x7f0701f7" />
-    <public type="dimen" name="uikit_typing_indicator_height" id="0x7f0701f8" />
-    <public type="dimen" name="vertical_safe_margin" id="0x7f0701f9" />
+    <public type="dimen" name="uikit_textsize_large" id="0x7f0701ec" />
+    <public type="dimen" name="uikit_textsize_medium" id="0x7f0701ed" />
+    <public type="dimen" name="uikit_textsize_small" id="0x7f0701ee" />
+    <public type="dimen" name="uikit_textsize_xlarge" id="0x7f0701ef" />
+    <public type="dimen" name="uikit_textsize_xxlarge" id="0x7f0701f0" />
+    <public type="dimen" name="uikit_typing_indicator_height" id="0x7f0701f1" />
+    <public type="dimen" name="vertical_safe_margin" id="0x7f0701f2" />
     <public type="drawable" name="$avd_hide_password__0" id="0x7f080000" />
     <public type="drawable" name="$avd_hide_password__1" id="0x7f080001" />
     <public type="drawable" name="$avd_hide_password__2" id="0x7f080002" />
@@ -3094,542 +3073,547 @@
     <public type="drawable" name="drawable_vc_empty" id="0x7f0801c6" />
     <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7f0801c7" />
     <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7f0801c8" />
-    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7f0801c9" />
-    <public type="drawable" name="exo_controls_fastforward" id="0x7f0801cc" />
-    <public type="drawable" name="exo_controls_fullscreen_enter" id="0x7f0801cd" />
-    <public type="drawable" name="exo_controls_fullscreen_exit" id="0x7f0801ce" />
-    <public type="drawable" name="exo_controls_next" id="0x7f0801cf" />
-    <public type="drawable" name="exo_controls_pause" id="0x7f0801d0" />
-    <public type="drawable" name="exo_controls_play" id="0x7f0801d1" />
-    <public type="drawable" name="exo_controls_previous" id="0x7f0801d2" />
-    <public type="drawable" name="exo_controls_repeat_all" id="0x7f0801d3" />
-    <public type="drawable" name="exo_controls_repeat_off" id="0x7f0801d4" />
-    <public type="drawable" name="exo_controls_repeat_one" id="0x7f0801d5" />
-    <public type="drawable" name="exo_controls_rewind" id="0x7f0801d6" />
-    <public type="drawable" name="exo_controls_shuffle_off" id="0x7f0801d7" />
-    <public type="drawable" name="exo_controls_shuffle_on" id="0x7f0801d8" />
-    <public type="drawable" name="exo_controls_vr" id="0x7f0801d9" />
-    <public type="drawable" name="exo_notification_fastforward" id="0x7f0801eb" />
-    <public type="drawable" name="exo_notification_next" id="0x7f0801ec" />
-    <public type="drawable" name="exo_notification_pause" id="0x7f0801ed" />
-    <public type="drawable" name="exo_notification_play" id="0x7f0801ee" />
-    <public type="drawable" name="exo_notification_previous" id="0x7f0801ef" />
-    <public type="drawable" name="exo_notification_rewind" id="0x7f0801f0" />
-    <public type="drawable" name="exo_notification_small_icon" id="0x7f0801f1" />
-    <public type="drawable" name="exo_notification_stop" id="0x7f0801f2" />
-    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7f0801f3" />
-    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7f0801f7" />
-    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7f0801f8" />
-    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7f0801f9" />
-    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7f0801fa" />
-    <public type="drawable" name="ic_account_google" id="0x7f0801fd" />
-    <public type="drawable" name="ic_account_microsoft" id="0x7f0801ff" />
-    <public type="drawable" name="ic_account_youtube" id="0x7f08020a" />
-    <public type="drawable" name="ic_add_24dp" id="0x7f08020b" />
-    <public type="drawable" name="ic_add_a_photo_24dp" id="0x7f08020c" />
-    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7f08020d" />
-    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7f08020e" />
-    <public type="drawable" name="ic_add_friend_green_check" id="0x7f08020f" />
-    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7f080212" />
-    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7f080213" />
-    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7f080214" />
-    <public type="drawable" name="ic_alert_circle_16dp" id="0x7f080216" />
-    <public type="drawable" name="ic_analytics_16dp" id="0x7f080217" />
-    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7f080218" />
-    <public type="drawable" name="ic_arrow_back_grey_24dp" id="0x7f080219" />
-    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7f08021a" />
-    <public type="drawable" name="ic_arrow_down_24dp" id="0x7f08021d" />
-    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7f08021e" />
-    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7f08021f" />
-    <public type="drawable" name="ic_arrow_right_24dp" id="0x7f080221" />
-    <public type="drawable" name="ic_arrow_up_24dp" id="0x7f080222" />
-    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7f080223" />
-    <public type="drawable" name="ic_attachment_white_24dp" id="0x7f080224" />
-    <public type="drawable" name="ic_audio_24dp" id="0x7f080225" />
-    <public type="drawable" name="ic_audio_output_bluetooth_white_24dp" id="0x7f080226" />
-    <public type="drawable" name="ic_audit_logs_24dp" id="0x7f080239" />
-    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7f080241" />
-    <public type="drawable" name="ic_backspace_white_24dp" id="0x7f080242" />
-    <public type="drawable" name="ic_ban_red_24dp" id="0x7f080243" />
-    <public type="drawable" name="ic_behavior_24dp" id="0x7f080244" />
-    <public type="drawable" name="ic_billing_24dp" id="0x7f080245" />
-    <public type="drawable" name="ic_bluetooth_24dp" id="0x7f080246" />
-    <public type="drawable" name="ic_bnet_white_24dp" id="0x7f080247" />
-    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7f080248" />
-    <public type="drawable" name="ic_boosted_badge_18dp" id="0x7f080249" />
-    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7f08024a" />
-    <public type="drawable" name="ic_booster_profile_badge_24dp" id="0x7f08024e" />
-    <public type="drawable" name="ic_call_indicator_video_16dp" id="0x7f080252" />
-    <public type="drawable" name="ic_camera_24dp" id="0x7f080254" />
-    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7f080255" />
-    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7f080256" />
-    <public type="drawable" name="ic_category_16dp" id="0x7f080258" />
-    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7f080259" />
-    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7f08025a" />
-    <public type="drawable" name="ic_channel_announcements" id="0x7f08025b" />
-    <public type="drawable" name="ic_channel_lock_16dp" id="0x7f08025e" />
-    <public type="drawable" name="ic_channel_text_16dp" id="0x7f080261" />
-    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7f080262" />
-    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7f080263" />
-    <public type="drawable" name="ic_channel_text_locked" id="0x7f080264" />
-    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7f080266" />
-    <public type="drawable" name="ic_channel_thread" id="0x7f080267" />
-    <public type="drawable" name="ic_channel_topic_ellipsis_dark" id="0x7f080268" />
-    <public type="drawable" name="ic_channel_topic_ellipsis_light" id="0x7f080269" />
-    <public type="drawable" name="ic_channel_voice_16dp" id="0x7f08026b" />
-    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7f08026c" />
-    <public type="drawable" name="ic_channels_24dp" id="0x7f08026e" />
-    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7f08026f" />
-    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7f080270" />
-    <public type="drawable" name="ic_check_brand_24dp" id="0x7f080272" />
-    <public type="drawable" name="ic_check_circle_24dp" id="0x7f080273" />
-    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7f080274" />
-    <public type="drawable" name="ic_check_green_24dp" id="0x7f080275" />
-    <public type="drawable" name="ic_check_grey_24dp" id="0x7f080276" />
-    <public type="drawable" name="ic_check_white_24dp" id="0x7f080277" />
-    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7f080278" />
-    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7f080279" />
-    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7f08027a" />
-    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7f08027b" />
-    <public type="drawable" name="ic_chevron_left_24dp" id="0x7f08027c" />
-    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7f08027d" />
-    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7f08027e" />
-    <public type="drawable" name="ic_clear_24dp" id="0x7f08027f" />
-    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7f080280" />
-    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7f080281" />
-    <public type="drawable" name="ic_clear_white_24dp" id="0x7f080282" />
-    <public type="drawable" name="ic_close_24dp" id="0x7f080283" />
-    <public type="drawable" name="ic_close_circle_grey_24dp" id="0x7f080284" />
-    <public type="drawable" name="ic_close_grey_24dp" id="0x7f080285" />
-    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7f080286" />
-    <public type="drawable" name="ic_close_white_24dp" id="0x7f080288" />
-    <public type="drawable" name="ic_community_24dp" id="0x7f080289" />
-    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7f08028a" />
-    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7f08028b" />
-    <public type="drawable" name="ic_controller_24dp" id="0x7f08028c" />
-    <public type="drawable" name="ic_creditcard_paypal" id="0x7f080291" />
-    <public type="drawable" name="ic_deafen_state_dark" id="0x7f080294" />
-    <public type="drawable" name="ic_deafen_state_light" id="0x7f080295" />
-    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7f080299" />
-    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7f08029a" />
-    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7f08029b" />
-    <public type="drawable" name="ic_delete_white_24dp" id="0x7f08029c" />
-    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7f08029d" />
-    <public type="drawable" name="ic_diag_link_24dp" id="0x7f08029e" />
-    <public type="drawable" name="ic_direct_message_header" id="0x7f08029f" />
-    <public type="drawable" name="ic_done_activated_24dp" id="0x7f0802a0" />
-    <public type="drawable" name="ic_done_green_24dp" id="0x7f0802a1" />
-    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7f0802a3" />
-    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7f0802a4" />
-    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7f0802a6" />
-    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7f0802a7" />
-    <public type="drawable" name="ic_embed_white_24dp" id="0x7f0802a8" />
-    <public type="drawable" name="ic_emoji_24dp" id="0x7f0802a9" />
-    <public type="drawable" name="ic_emoji_blue_24dp" id="0x7f0802aa" />
-    <public type="drawable" name="ic_emoji_picker_category_activity" id="0x7f0802ab" />
-    <public type="drawable" name="ic_emoji_picker_category_flags" id="0x7f0802ad" />
-    <public type="drawable" name="ic_emoji_picker_category_food" id="0x7f0802ae" />
-    <public type="drawable" name="ic_emoji_picker_category_nature" id="0x7f0802af" />
-    <public type="drawable" name="ic_emoji_picker_category_objects" id="0x7f0802b0" />
-    <public type="drawable" name="ic_emoji_picker_category_people" id="0x7f0802b1" />
-    <public type="drawable" name="ic_emoji_picker_category_recent" id="0x7f0802b2" />
-    <public type="drawable" name="ic_emoji_picker_category_symbols" id="0x7f0802b3" />
-    <public type="drawable" name="ic_emoji_picker_category_travel" id="0x7f0802b4" />
-    <public type="drawable" name="ic_emoji_placeholder_primary_100" id="0x7f0802b5" />
-    <public type="drawable" name="ic_emoji_placeholder_primary_500" id="0x7f0802b6" />
-    <public type="drawable" name="ic_emoji_recent_24dp" id="0x7f0802b7" />
-    <public type="drawable" name="ic_exit_24dp" id="0x7f0802ba" />
-    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7f0802bb" />
-    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7f0802bc" />
-    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7f0802bd" />
-    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7f0802be" />
-    <public type="drawable" name="ic_expression_search_empty_dark" id="0x7f0802bf" />
-    <public type="drawable" name="ic_expression_search_empty_light" id="0x7f0802c0" />
-    <public type="drawable" name="ic_feedback_happy" id="0x7f0802c3" />
-    <public type="drawable" name="ic_feedback_happy_desaturated_dark" id="0x7f0802c4" />
-    <public type="drawable" name="ic_feedback_happy_desaturated_light" id="0x7f0802c5" />
-    <public type="drawable" name="ic_feedback_neutral" id="0x7f0802c6" />
-    <public type="drawable" name="ic_feedback_neutral_desaturated_dark" id="0x7f0802c7" />
-    <public type="drawable" name="ic_feedback_neutral_desaturated_light" id="0x7f0802c8" />
-    <public type="drawable" name="ic_feedback_sad" id="0x7f0802c9" />
-    <public type="drawable" name="ic_feedback_sad_desaturated_dark" id="0x7f0802ca" />
-    <public type="drawable" name="ic_feedback_sad_desaturated_light" id="0x7f0802cb" />
-    <public type="drawable" name="ic_file_24dp" id="0x7f0802cc" />
-    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7f0802d3" />
-    <public type="drawable" name="ic_file_download_white_24dp" id="0x7f0802d4" />
-    <public type="drawable" name="ic_file_large_code" id="0x7f0802d5" />
-    <public type="drawable" name="ic_file_large_document" id="0x7f0802d6" />
-    <public type="drawable" name="ic_file_large_video" id="0x7f0802d7" />
-    <public type="drawable" name="ic_file_upload_24dp" id="0x7f0802db" />
-    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7f0802de" />
-    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7f0802df" />
-    <public type="drawable" name="ic_flag_24dp" id="0x7f0802e0" />
-    <public type="drawable" name="ic_flash_auto_24dp" id="0x7f0802e1" />
-    <public type="drawable" name="ic_flash_off_24dp" id="0x7f0802e2" />
-    <public type="drawable" name="ic_flash_on_24dp" id="0x7f0802e3" />
-    <public type="drawable" name="ic_flash_torch_24dp" id="0x7f0802e4" />
-    <public type="drawable" name="ic_games_24dp" id="0x7f0802e6" />
-    <public type="drawable" name="ic_gem_tier_1" id="0x7f0802e7" />
-    <public type="drawable" name="ic_gem_tier_2" id="0x7f0802e8" />
-    <public type="drawable" name="ic_gem_tier_3" id="0x7f0802e9" />
-    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7f0802ea" />
-    <public type="drawable" name="ic_google_white_24dp" id="0x7f0802ef" />
-    <public type="drawable" name="ic_group_add_white_24dp" id="0x7f0802f0" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7f0802f5" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7f0802f6" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7f0802f7" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7f0802f8" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7f0802f9" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7f0802fa" />
-    <public type="drawable" name="ic_guild_folder" id="0x7f0802fb" />
-    <public type="drawable" name="ic_guild_list_dms_24dp" id="0x7f0802fd" />
-    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7f0802fe" />
-    <public type="drawable" name="ic_guild_nitro_progress" id="0x7f0802ff" />
-    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7f080300" />
-    <public type="drawable" name="ic_guild_settings_24dp" id="0x7f080302" />
-    <public type="drawable" name="ic_guild_welcome_add_friend" id="0x7f080303" />
-    <public type="drawable" name="ic_guild_welcome_personalize" id="0x7f080304" />
-    <public type="drawable" name="ic_hammer_24dp" id="0x7f080305" />
-    <public type="drawable" name="ic_headset_24dp" id="0x7f080307" />
-    <public type="drawable" name="ic_headset_blue_24dp" id="0x7f080308" />
-    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7f080309" />
-    <public type="drawable" name="ic_headset_deafened_grey_a60_24dp" id="0x7f08030a" />
-    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7f08030d" />
-    <public type="drawable" name="ic_headset_deafened_white_a60_24dp" id="0x7f08030e" />
-    <public type="drawable" name="ic_headset_grey_24dp" id="0x7f08030f" />
-    <public type="drawable" name="ic_headset_grey_a60_24dp" id="0x7f080310" />
-    <public type="drawable" name="ic_headset_interactivenormal_dark_24dp" id="0x7f080311" />
-    <public type="drawable" name="ic_headset_interactivenormal_light_24dp" id="0x7f080312" />
-    <public type="drawable" name="ic_headset_white_18dp" id="0x7f080313" />
-    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7f080314" />
-    <public type="drawable" name="ic_headset_white_24dp" id="0x7f080315" />
-    <public type="drawable" name="ic_headset_white_a60_24dp" id="0x7f080316" />
-    <public type="drawable" name="ic_help_24dp" id="0x7f080317" />
-    <public type="drawable" name="ic_help_outline_24dp" id="0x7f080318" />
-    <public type="drawable" name="ic_history_white_24dp" id="0x7f080319" />
-    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7f08031a" />
-    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7f08031c" />
-    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7f08031e" />
-    <public type="drawable" name="ic_image_24dp" id="0x7f080320" />
-    <public type="drawable" name="ic_info_24dp" id="0x7f080324" />
-    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7f080325" />
-    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7f080326" />
-    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7f080327" />
-    <public type="drawable" name="ic_keyboard_24dp" id="0x7f080329" />
-    <public type="drawable" name="ic_krisp_logo_dark" id="0x7f08032a" />
-    <public type="drawable" name="ic_krisp_logo_light" id="0x7f08032b" />
-    <public type="drawable" name="ic_launch_24dp" id="0x7f08032c" />
-    <public type="drawable" name="ic_link_white_24dp" id="0x7f08032d" />
-    <public type="drawable" name="ic_locale_24dp" id="0x7f08032e" />
-    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7f08032f" />
-    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7f080330" />
-    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7f080331" />
-    <public type="drawable" name="ic_lol_white_24dp" id="0x7f080332" />
-    <public type="drawable" name="ic_mail_24dp" id="0x7f080333" />
-    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7f080334" />
-    <public type="drawable" name="ic_mentions_white_24dp" id="0x7f080336" />
-    <public type="drawable" name="ic_menu_24dp" id="0x7f080337" />
-    <public type="drawable" name="ic_mic_grey_24dp" id="0x7f08033a" />
-    <public type="drawable" name="ic_mic_grey_a60_24dp" id="0x7f08033b" />
-    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7f08033e" />
-    <public type="drawable" name="ic_mic_muted_grey_a60_24dp" id="0x7f08033f" />
-    <public type="drawable" name="ic_mic_muted_interactiveactive_dark_24dp" id="0x7f080340" />
-    <public type="drawable" name="ic_mic_muted_interactiveactive_light_24dp" id="0x7f080341" />
-    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7f080342" />
-    <public type="drawable" name="ic_mic_muted_white_a60_24dp" id="0x7f080343" />
-    <public type="drawable" name="ic_mic_state_dark" id="0x7f080344" />
-    <public type="drawable" name="ic_mic_state_light" id="0x7f080345" />
-    <public type="drawable" name="ic_mic_white_18dp" id="0x7f080346" />
-    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7f080347" />
-    <public type="drawable" name="ic_mic_white_24dp" id="0x7f080348" />
-    <public type="drawable" name="ic_mic_white_a60_24dp" id="0x7f080349" />
-    <public type="drawable" name="ic_monitor_white_24dp" id="0x7f08034b" />
-    <public type="drawable" name="ic_more_primary100_24dp" id="0x7f08034c" />
-    <public type="drawable" name="ic_more_primary900_24dp" id="0x7f08034d" />
-    <public type="drawable" name="ic_movie_24dp" id="0x7f08034e" />
-    <public type="drawable" name="ic_mtrl_checked_circle" id="0x7f08034f" />
-    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7f080350" />
-    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7f080351" />
-    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7f080352" />
-    <public type="drawable" name="ic_mute_red_strike" id="0x7f080353" />
-    <public type="drawable" name="ic_mute_v2_muted" id="0x7f080354" />
-    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_dark_300" id="0x7f080355" />
-    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_light_600" id="0x7f080356" />
-    <public type="drawable" name="ic_my_account_24dp" id="0x7f080357" />
-    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7f080358" />
-    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7f080359" />
-    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7f08035f" />
-    <public type="drawable" name="ic_noise_cancellation_active_24dp" id="0x7f080363" />
-    <public type="drawable" name="ic_noise_cancellation_disabled_24dp" id="0x7f080364" />
-    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7f08036a" />
-    <public type="drawable" name="ic_notifications_off_grey_24dp" id="0x7f08036b" />
-    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7f08036c" />
-    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7f08036d" />
-    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7f080370" />
-    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7f080371" />
-    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7f080372" />
-    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7f080373" />
-    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7f080374" />
-    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7f080375" />
-    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7f080376" />
-    <public type="drawable" name="ic_overlay_white_24dp" id="0x7f080379" />
-    <public type="drawable" name="ic_partnered_badge" id="0x7f08037a" />
-    <public type="drawable" name="ic_partnered_badge_banner" id="0x7f08037b" />
-    <public type="drawable" name="ic_people_white_24dp" id="0x7f08037c" />
-    <public type="drawable" name="ic_perk_lock" id="0x7f08037d" />
-    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7f08037e" />
-    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7f08037f" />
-    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7f080380" />
-    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7f080381" />
-    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7f080382" />
-    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7f080383" />
-    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7f080384" />
-    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7f080385" />
-    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7f080386" />
-    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7f080387" />
-    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7f080388" />
-    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7f080389" />
-    <public type="drawable" name="ic_phonelink_24dp" id="0x7f08038b" />
-    <public type="drawable" name="ic_photo_grey_24dp" id="0x7f08038c" />
-    <public type="drawable" name="ic_pin_24dp" id="0x7f08038d" />
-    <public type="drawable" name="ic_play_arrow_24dp" id="0x7f08038e" />
-    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7f08038f" />
-    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7f080390" />
-    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7f080391" />
-    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7f080392" />
-    <public type="drawable" name="ic_privacy_24dp" id="0x7f080395" />
-    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7f080396" />
-    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7f080397" />
-    <public type="drawable" name="ic_profile_badge_bughunter_level_1_32dp" id="0x7f080398" />
-    <public type="drawable" name="ic_profile_badge_bughunter_level_2_32dp" id="0x7f080399" />
-    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7f08039a" />
-    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7f08039d" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7f08039e" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7f08039f" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7f0803a0" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7f0803a1" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7f0803a2" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7f0803a3" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7f0803a4" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7f0803a5" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7f0803a6" />
-    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7f0803a7" />
-    <public type="drawable" name="ic_profile_badge_verified_developer_32dp" id="0x7f0803a8" />
-    <public type="drawable" name="ic_qr_code_24dp" id="0x7f0803a9" />
-    <public type="drawable" name="ic_quote_grey_a60_24dp" id="0x7f0803aa" />
-    <public type="drawable" name="ic_quote_white_a60_24dp" id="0x7f0803ab" />
-    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7f0803ac" />
-    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7f0803ad" />
-    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7f0803af" />
-    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7f0803b0" />
-    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7f0803b1" />
-    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7f0803b2" />
-    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7f0803b3" />
-    <public type="drawable" name="ic_role_24dp" id="0x7f0803b4" />
-    <public type="drawable" name="ic_role_pink_24dp" id="0x7f0803b6" />
-    <public type="drawable" name="ic_search_16dp" id="0x7f0803b9" />
-    <public type="drawable" name="ic_search_grey_24dp" id="0x7f0803ba" />
-    <public type="drawable" name="ic_search_white_24dp" id="0x7f0803bb" />
-    <public type="drawable" name="ic_security_24dp" id="0x7f0803bc" />
-    <public type="drawable" name="ic_send_24dp" id="0x7f0803bd" />
-    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f0803be" />
-    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f0803c0" />
-    <public type="drawable" name="ic_settings_boost_24dp" id="0x7f0803c2" />
-    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f0803c3" />
-    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f0803c4" />
-    <public type="drawable" name="ic_share_grey_24dp" id="0x7f0803c5" />
-    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f0803c6" />
-    <public type="drawable" name="ic_share_white_24dp" id="0x7f0803c7" />
-    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f0803c8" />
-    <public type="drawable" name="ic_shieldstar_24dp" id="0x7f0803c9" />
-    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7f0803ca" />
-    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7f0803cb" />
-    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7f0803ce" />
-    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7f0803cf" />
-    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7f0803d2" />
-    <public type="drawable" name="ic_skype_white_24dp" id="0x7f0803d4" />
-    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f0803d5" />
-    <public type="drawable" name="ic_smile_24dp" id="0x7f0803d6" />
-    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f0803d8" />
-    <public type="drawable" name="ic_sort_white_24dp" id="0x7f0803d9" />
-    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7f0803db" />
-    <public type="drawable" name="ic_spectate" id="0x7f0803dc" />
-    <public type="drawable" name="ic_spotify_green_24dp" id="0x7f0803dd" />
-    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f0803de" />
-    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7f0803df" />
-    <public type="drawable" name="ic_star_24dp" id="0x7f0803e0" />
-    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f0803e4" />
-    <public type="drawable" name="ic_status_online_16dp" id="0x7f0803e5" />
-    <public type="drawable" name="ic_steam_white_24dp" id="0x7f0803e7" />
-    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f0803e9" />
-    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f0803ea" />
-    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f0803eb" />
-    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f0803ec" />
-    <public type="drawable" name="ic_tab_friends" id="0x7f0803ed" />
-    <public type="drawable" name="ic_tab_home" id="0x7f0803ee" />
-    <public type="drawable" name="ic_tab_mentions" id="0x7f0803ef" />
-    <public type="drawable" name="ic_tab_search" id="0x7f0803f0" />
-    <public type="drawable" name="ic_take_photo" id="0x7f0803f1" />
-    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f0803fa" />
-    <public type="drawable" name="ic_text_image_24dp" id="0x7f0803fb" />
-    <public type="drawable" name="ic_theme_24dp" id="0x7f0803fc" />
-    <public type="drawable" name="ic_timer_dark" id="0x7f0803fd" />
-    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f0803fe" />
-    <public type="drawable" name="ic_timer_light" id="0x7f0803ff" />
-    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080400" />
-    <public type="drawable" name="ic_tooltip_bottom_tail" id="0x7f080401" />
-    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080402" />
-    <public type="drawable" name="ic_trash_outline" id="0x7f080403" />
-    <public type="drawable" name="ic_unban_grey" id="0x7f080408" />
-    <public type="drawable" name="ic_unread_white_9dp" id="0x7f080409" />
-    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f08040a" />
-    <public type="drawable" name="ic_upload_image_34dp" id="0x7f08040c" />
-    <public type="drawable" name="ic_upload_image_40dp" id="0x7f08040d" />
-    <public type="drawable" name="ic_upload_plus_32dp" id="0x7f08040e" />
-    <public type="drawable" name="ic_uploads_file_dark" id="0x7f08040f" />
-    <public type="drawable" name="ic_uploads_file_light" id="0x7f080410" />
-    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f080411" />
-    <public type="drawable" name="ic_uploads_generic_light" id="0x7f080412" />
-    <public type="drawable" name="ic_uploads_image_dark" id="0x7f080413" />
-    <public type="drawable" name="ic_uploads_image_light" id="0x7f080414" />
-    <public type="drawable" name="ic_uploads_video_dark" id="0x7f080415" />
-    <public type="drawable" name="ic_uploads_video_light" id="0x7f080416" />
-    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7f080417" />
-    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7f080418" />
-    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f08041d" />
-    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7f080422" />
-    <public type="drawable" name="ic_user_profile_action_message_white_24dp" id="0x7f080423" />
-    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7f080424" />
-    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f080425" />
-    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7f080426" />
-    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7f080427" />
-    <public type="drawable" name="ic_verified_10dp" id="0x7f080428" />
-    <public type="drawable" name="ic_verified_badge" id="0x7f080429" />
-    <public type="drawable" name="ic_verified_badge_banner" id="0x7f08042a" />
-    <public type="drawable" name="ic_video_grid_view_grey" id="0x7f08042b" />
-    <public type="drawable" name="ic_video_grid_view_white" id="0x7f08042c" />
-    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7f08042d" />
-    <public type="drawable" name="ic_videocam_white_12dp" id="0x7f08042e" />
-    <public type="drawable" name="ic_videocam_white_24dp" id="0x7f08042f" />
-    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f080430" />
-    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f080431" />
-    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f080432" />
-    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f080433" />
-    <public type="drawable" name="ic_voice_settings_24dp" id="0x7f080438" />
-    <public type="drawable" name="ic_volume_mute_grey_a60_24dp" id="0x7f080439" />
-    <public type="drawable" name="ic_volume_mute_white_a60_24dp" id="0x7f08043a" />
-    <public type="drawable" name="ic_volume_off_24dp" id="0x7f08043b" />
-    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7f08043c" />
-    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f08043d" />
-    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7f08043e" />
-    <public type="drawable" name="ic_warning_circle_24dp" id="0x7f08043f" />
-    <public type="drawable" name="ic_x_red_24dp" id="0x7f080440" />
-    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f080441" />
-    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f080442" />
-    <public type="drawable" name="img_baddies_dark_theme" id="0x7f080476" />
-    <public type="drawable" name="img_baddies_light_theme" id="0x7f080477" />
-    <public type="drawable" name="img_boost_cancel" id="0x7f08047a" />
-    <public type="drawable" name="img_boost_hands" id="0x7f08047b" />
-    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7f08047c" />
-    <public type="drawable" name="img_channel_following_success_1_light" id="0x7f08047d" />
-    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7f08047e" />
-    <public type="drawable" name="img_channel_following_success_2_light" id="0x7f08047f" />
-    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7f080480" />
-    <public type="drawable" name="img_channel_following_success_3_light" id="0x7f080481" />
-    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f080484" />
-    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f080491" />
-    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f080492" />
-    <public type="drawable" name="img_forced_update_dark" id="0x7f080493" />
-    <public type="drawable" name="img_forced_update_light" id="0x7f080494" />
-    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7f080496" />
-    <public type="drawable" name="img_gem_hands_faded_light" id="0x7f080497" />
-    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f080498" />
-    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f080499" />
-    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7f08049d" />
-    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7f08049e" />
-    <public type="drawable" name="img_item_shop_dark" id="0x7f08049f" />
-    <public type="drawable" name="img_logo_discord" id="0x7f0804a4" />
-    <public type="drawable" name="img_logo_square" id="0x7f0804ac" />
-    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f0804af" />
-    <public type="drawable" name="img_new_tos_light_theme" id="0x7f0804b0" />
-    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f0804b3" />
-    <public type="drawable" name="img_nitro_uncancel" id="0x7f0804b7" />
-    <public type="drawable" name="img_no_gifts" id="0x7f0804b8" />
-    <public type="drawable" name="img_no_text_channels_dark" id="0x7f0804bd" />
-    <public type="drawable" name="img_no_text_channels_light" id="0x7f0804be" />
-    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f0804bf" />
-    <public type="drawable" name="img_nsfw_light_theme" id="0x7f0804c0" />
-    <public type="drawable" name="img_poop_dark" id="0x7f0804c3" />
-    <public type="drawable" name="img_poop_light" id="0x7f0804c4" />
-    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7f0804c9" />
-    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7f0804ca" />
-    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7f0804cb" />
-    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7f0804cc" />
-    <public type="drawable" name="img_quick_switcher_empty" id="0x7f0804d1" />
-    <public type="drawable" name="img_remote_auth_finished" id="0x7f0804d2" />
-    <public type="drawable" name="img_remote_auth_not_found" id="0x7f0804d4" />
-    <public type="drawable" name="img_save_your_group" id="0x7f0804d5" />
-    <public type="drawable" name="img_server_boost_long" id="0x7f0804d6" />
-    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f0804d9" />
-    <public type="drawable" name="img_verify_email_light_theme" id="0x7f0804da" />
-    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f0804db" />
-    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f0804dc" />
-    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f0804e1" />
-    <public type="drawable" name="img_wumpus_ball_light" id="0x7f0804e2" />
-    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f0804e7" />
-    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f0804e8" />
-    <public type="drawable" name="material_ic_calendar_black_24dp" id="0x7f0804e9" />
-    <public type="drawable" name="material_ic_clear_black_24dp" id="0x7f0804ea" />
-    <public type="drawable" name="material_ic_edit_black_24dp" id="0x7f0804eb" />
-    <public type="drawable" name="material_ic_keyboard_arrow_left_black_24dp" id="0x7f0804ec" />
-    <public type="drawable" name="material_ic_keyboard_arrow_right_black_24dp" id="0x7f0804ed" />
-    <public type="drawable" name="material_ic_menu_arrow_down_black_24dp" id="0x7f0804ee" />
-    <public type="drawable" name="material_ic_menu_arrow_up_black_24dp" id="0x7f0804ef" />
-    <public type="drawable" name="mtrl_dialog_background" id="0x7f0804f0" />
-    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7f0804f1" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7f0804f2" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7f0804f3" />
-    <public type="drawable" name="mtrl_ic_cancel" id="0x7f0804f4" />
-    <public type="drawable" name="mtrl_ic_error" id="0x7f0804f5" />
-    <public type="drawable" name="mtrl_popupmenu_background" id="0x7f0804f6" />
-    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7f0804f7" />
-    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f0804f8" />
-    <public type="drawable" name="navigation_empty_icon" id="0x7f0804f9" />
-    <public type="drawable" name="notification_action_background" id="0x7f0804fa" />
-    <public type="drawable" name="notification_bg" id="0x7f0804fb" />
-    <public type="drawable" name="notification_bg_low" id="0x7f0804fc" />
-    <public type="drawable" name="notification_icon_background" id="0x7f080501" />
-    <public type="drawable" name="notification_template_icon_bg" id="0x7f080502" />
-    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f080503" />
-    <public type="drawable" name="notification_tile_bg" id="0x7f080504" />
-    <public type="drawable" name="preference_list_divider_material" id="0x7f080506" />
-    <public type="drawable" name="reactions_divider" id="0x7f080507" />
-    <public type="drawable" name="ripple_brighten" id="0x7f080508" />
-    <public type="drawable" name="ripple_darken" id="0x7f080509" />
-    <public type="drawable" name="rounded_rectangle_4dp_radius" id="0x7f08050a" />
-    <public type="drawable" name="rounded_rectangle_8dp_radius" id="0x7f08050b" />
-    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7f08050c" />
-    <public type="drawable" name="selectable_feedback_happy_light" id="0x7f08050d" />
-    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7f08050e" />
-    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7f08050f" />
-    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7f080510" />
-    <public type="drawable" name="selectable_feedback_sad_light" id="0x7f080511" />
-    <public type="drawable" name="sparkle_animated_vector" id="0x7f080512" />
-    <public type="drawable" name="tab_dot_selector" id="0x7f080513" />
-    <public type="drawable" name="tab_dot_selector_wide" id="0x7f080514" />
-    <public type="drawable" name="tab_indicator_default" id="0x7f080515" />
-    <public type="drawable" name="tab_indicator_selected" id="0x7f080516" />
-    <public type="drawable" name="tab_indicator_selected_wide" id="0x7f080517" />
-    <public type="drawable" name="test_custom_background" id="0x7f080518" />
-    <public type="drawable" name="tooltip_frame_dark" id="0x7f080519" />
-    <public type="drawable" name="tooltip_frame_light" id="0x7f08051a" />
-    <public type="drawable" name="trash_bg" id="0x7f08051b" />
-    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080524" />
-    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080525" />
-    <public type="drawable" name="ucrop_vector_loader" id="0x7f080526" />
-    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f080527" />
-    <public type="drawable" name="voice_user_limit_view_left_bg" id="0x7f080529" />
-    <public type="drawable" name="voice_user_limit_view_right_bg" id="0x7f08052a" />
+    <public type="drawable" name="drawable_voice_sensitivity_progress" id="0x7f0801c9" />
+    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7f0801ca" />
+    <public type="drawable" name="exo_controls_fastforward" id="0x7f0801cd" />
+    <public type="drawable" name="exo_controls_fullscreen_enter" id="0x7f0801ce" />
+    <public type="drawable" name="exo_controls_fullscreen_exit" id="0x7f0801cf" />
+    <public type="drawable" name="exo_controls_next" id="0x7f0801d0" />
+    <public type="drawable" name="exo_controls_pause" id="0x7f0801d1" />
+    <public type="drawable" name="exo_controls_play" id="0x7f0801d2" />
+    <public type="drawable" name="exo_controls_previous" id="0x7f0801d3" />
+    <public type="drawable" name="exo_controls_repeat_all" id="0x7f0801d4" />
+    <public type="drawable" name="exo_controls_repeat_off" id="0x7f0801d5" />
+    <public type="drawable" name="exo_controls_repeat_one" id="0x7f0801d6" />
+    <public type="drawable" name="exo_controls_rewind" id="0x7f0801d7" />
+    <public type="drawable" name="exo_controls_shuffle_off" id="0x7f0801d8" />
+    <public type="drawable" name="exo_controls_shuffle_on" id="0x7f0801d9" />
+    <public type="drawable" name="exo_controls_vr" id="0x7f0801da" />
+    <public type="drawable" name="exo_notification_fastforward" id="0x7f0801ec" />
+    <public type="drawable" name="exo_notification_next" id="0x7f0801ed" />
+    <public type="drawable" name="exo_notification_pause" id="0x7f0801ee" />
+    <public type="drawable" name="exo_notification_play" id="0x7f0801ef" />
+    <public type="drawable" name="exo_notification_previous" id="0x7f0801f0" />
+    <public type="drawable" name="exo_notification_rewind" id="0x7f0801f1" />
+    <public type="drawable" name="exo_notification_small_icon" id="0x7f0801f2" />
+    <public type="drawable" name="exo_notification_stop" id="0x7f0801f3" />
+    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7f0801f4" />
+    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7f0801f8" />
+    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7f0801f9" />
+    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7f0801fa" />
+    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7f0801fb" />
+    <public type="drawable" name="ic_account_google" id="0x7f0801fe" />
+    <public type="drawable" name="ic_account_microsoft" id="0x7f080200" />
+    <public type="drawable" name="ic_account_youtube" id="0x7f08020b" />
+    <public type="drawable" name="ic_add_24dp" id="0x7f08020c" />
+    <public type="drawable" name="ic_add_a_photo_24dp" id="0x7f08020d" />
+    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7f08020e" />
+    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7f08020f" />
+    <public type="drawable" name="ic_add_friend_green_check" id="0x7f080210" />
+    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7f080213" />
+    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7f080214" />
+    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7f080215" />
+    <public type="drawable" name="ic_alert_circle_16dp" id="0x7f080217" />
+    <public type="drawable" name="ic_analytics_16dp" id="0x7f080218" />
+    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7f080219" />
+    <public type="drawable" name="ic_arrow_back_grey_24dp" id="0x7f08021a" />
+    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7f08021b" />
+    <public type="drawable" name="ic_arrow_down_24dp" id="0x7f08021e" />
+    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7f08021f" />
+    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7f080220" />
+    <public type="drawable" name="ic_arrow_right_24dp" id="0x7f080222" />
+    <public type="drawable" name="ic_arrow_up_24dp" id="0x7f080223" />
+    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7f080224" />
+    <public type="drawable" name="ic_attachment_white_24dp" id="0x7f080225" />
+    <public type="drawable" name="ic_audio_24dp" id="0x7f080226" />
+    <public type="drawable" name="ic_audio_output_bluetooth_white_24dp" id="0x7f080227" />
+    <public type="drawable" name="ic_audit_logs_24dp" id="0x7f08023a" />
+    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7f080242" />
+    <public type="drawable" name="ic_backspace_white_24dp" id="0x7f080243" />
+    <public type="drawable" name="ic_ban_red_24dp" id="0x7f080244" />
+    <public type="drawable" name="ic_behavior_24dp" id="0x7f080245" />
+    <public type="drawable" name="ic_billing_24dp" id="0x7f080246" />
+    <public type="drawable" name="ic_bluetooth_24dp" id="0x7f080247" />
+    <public type="drawable" name="ic_bnet_white_24dp" id="0x7f080248" />
+    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7f080249" />
+    <public type="drawable" name="ic_boosted_badge_18dp" id="0x7f08024a" />
+    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7f08024b" />
+    <public type="drawable" name="ic_booster_profile_badge_24dp" id="0x7f08024f" />
+    <public type="drawable" name="ic_call_indicator_video_16dp" id="0x7f080253" />
+    <public type="drawable" name="ic_camera_24dp" id="0x7f080255" />
+    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7f080256" />
+    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7f080257" />
+    <public type="drawable" name="ic_category_16dp" id="0x7f080259" />
+    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7f08025a" />
+    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7f08025b" />
+    <public type="drawable" name="ic_channel_announcements" id="0x7f08025c" />
+    <public type="drawable" name="ic_channel_lock_16dp" id="0x7f08025f" />
+    <public type="drawable" name="ic_channel_text_16dp" id="0x7f080262" />
+    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7f080263" />
+    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7f080264" />
+    <public type="drawable" name="ic_channel_text_locked" id="0x7f080265" />
+    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7f080267" />
+    <public type="drawable" name="ic_channel_thread" id="0x7f080268" />
+    <public type="drawable" name="ic_channel_topic_ellipsis_dark" id="0x7f080269" />
+    <public type="drawable" name="ic_channel_topic_ellipsis_light" id="0x7f08026a" />
+    <public type="drawable" name="ic_channel_voice_16dp" id="0x7f08026c" />
+    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7f08026d" />
+    <public type="drawable" name="ic_channels_24dp" id="0x7f08026f" />
+    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7f080270" />
+    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7f080271" />
+    <public type="drawable" name="ic_check_brand_24dp" id="0x7f080273" />
+    <public type="drawable" name="ic_check_circle_24dp" id="0x7f080274" />
+    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7f080275" />
+    <public type="drawable" name="ic_check_green_24dp" id="0x7f080276" />
+    <public type="drawable" name="ic_check_grey_24dp" id="0x7f080277" />
+    <public type="drawable" name="ic_check_white_24dp" id="0x7f080278" />
+    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7f080279" />
+    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7f08027a" />
+    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7f08027b" />
+    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7f08027c" />
+    <public type="drawable" name="ic_chevron_left_24dp" id="0x7f08027d" />
+    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7f08027e" />
+    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7f08027f" />
+    <public type="drawable" name="ic_clear_24dp" id="0x7f080280" />
+    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7f080281" />
+    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7f080282" />
+    <public type="drawable" name="ic_clear_white_24dp" id="0x7f080283" />
+    <public type="drawable" name="ic_close_24dp" id="0x7f080284" />
+    <public type="drawable" name="ic_close_circle_grey_24dp" id="0x7f080285" />
+    <public type="drawable" name="ic_close_grey_24dp" id="0x7f080286" />
+    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7f080287" />
+    <public type="drawable" name="ic_close_white_24dp" id="0x7f080289" />
+    <public type="drawable" name="ic_community_24dp" id="0x7f08028a" />
+    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7f08028b" />
+    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7f08028c" />
+    <public type="drawable" name="ic_controller_24dp" id="0x7f08028d" />
+    <public type="drawable" name="ic_creditcard_paypal" id="0x7f080292" />
+    <public type="drawable" name="ic_deafen_state_dark" id="0x7f080295" />
+    <public type="drawable" name="ic_deafen_state_light" id="0x7f080296" />
+    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7f08029a" />
+    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7f08029b" />
+    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7f08029c" />
+    <public type="drawable" name="ic_delete_white_24dp" id="0x7f08029d" />
+    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7f08029e" />
+    <public type="drawable" name="ic_diag_link_24dp" id="0x7f08029f" />
+    <public type="drawable" name="ic_direct_message_header" id="0x7f0802a0" />
+    <public type="drawable" name="ic_done_activated_24dp" id="0x7f0802a1" />
+    <public type="drawable" name="ic_done_green_24dp" id="0x7f0802a2" />
+    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7f0802a4" />
+    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7f0802a5" />
+    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7f0802a7" />
+    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7f0802a8" />
+    <public type="drawable" name="ic_embed_white_24dp" id="0x7f0802a9" />
+    <public type="drawable" name="ic_emoji_24dp" id="0x7f0802aa" />
+    <public type="drawable" name="ic_emoji_blue_24dp" id="0x7f0802ab" />
+    <public type="drawable" name="ic_emoji_picker_category_activity" id="0x7f0802ac" />
+    <public type="drawable" name="ic_emoji_picker_category_flags" id="0x7f0802ae" />
+    <public type="drawable" name="ic_emoji_picker_category_food" id="0x7f0802af" />
+    <public type="drawable" name="ic_emoji_picker_category_nature" id="0x7f0802b0" />
+    <public type="drawable" name="ic_emoji_picker_category_objects" id="0x7f0802b1" />
+    <public type="drawable" name="ic_emoji_picker_category_people" id="0x7f0802b2" />
+    <public type="drawable" name="ic_emoji_picker_category_recent" id="0x7f0802b3" />
+    <public type="drawable" name="ic_emoji_picker_category_symbols" id="0x7f0802b4" />
+    <public type="drawable" name="ic_emoji_picker_category_travel" id="0x7f0802b5" />
+    <public type="drawable" name="ic_emoji_placeholder_primary_100" id="0x7f0802b6" />
+    <public type="drawable" name="ic_emoji_placeholder_primary_500" id="0x7f0802b7" />
+    <public type="drawable" name="ic_emoji_recent_24dp" id="0x7f0802b8" />
+    <public type="drawable" name="ic_exit_24dp" id="0x7f0802bb" />
+    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7f0802bc" />
+    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7f0802bd" />
+    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7f0802be" />
+    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7f0802bf" />
+    <public type="drawable" name="ic_expression_search_empty_dark" id="0x7f0802c0" />
+    <public type="drawable" name="ic_expression_search_empty_light" id="0x7f0802c1" />
+    <public type="drawable" name="ic_feedback_happy" id="0x7f0802c4" />
+    <public type="drawable" name="ic_feedback_happy_desaturated_dark" id="0x7f0802c5" />
+    <public type="drawable" name="ic_feedback_happy_desaturated_light" id="0x7f0802c6" />
+    <public type="drawable" name="ic_feedback_neutral" id="0x7f0802c7" />
+    <public type="drawable" name="ic_feedback_neutral_desaturated_dark" id="0x7f0802c8" />
+    <public type="drawable" name="ic_feedback_neutral_desaturated_light" id="0x7f0802c9" />
+    <public type="drawable" name="ic_feedback_sad" id="0x7f0802ca" />
+    <public type="drawable" name="ic_feedback_sad_desaturated_dark" id="0x7f0802cb" />
+    <public type="drawable" name="ic_feedback_sad_desaturated_light" id="0x7f0802cc" />
+    <public type="drawable" name="ic_file_24dp" id="0x7f0802cd" />
+    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7f0802d4" />
+    <public type="drawable" name="ic_file_download_white_24dp" id="0x7f0802d5" />
+    <public type="drawable" name="ic_file_large_code" id="0x7f0802d6" />
+    <public type="drawable" name="ic_file_large_document" id="0x7f0802d7" />
+    <public type="drawable" name="ic_file_large_video" id="0x7f0802d8" />
+    <public type="drawable" name="ic_file_upload_24dp" id="0x7f0802dc" />
+    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7f0802df" />
+    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7f0802e0" />
+    <public type="drawable" name="ic_flag_24dp" id="0x7f0802e1" />
+    <public type="drawable" name="ic_flash_auto_24dp" id="0x7f0802e2" />
+    <public type="drawable" name="ic_flash_off_24dp" id="0x7f0802e3" />
+    <public type="drawable" name="ic_flash_on_24dp" id="0x7f0802e4" />
+    <public type="drawable" name="ic_flash_torch_24dp" id="0x7f0802e5" />
+    <public type="drawable" name="ic_games_24dp" id="0x7f0802e7" />
+    <public type="drawable" name="ic_gem_tier_1" id="0x7f0802e8" />
+    <public type="drawable" name="ic_gem_tier_2" id="0x7f0802e9" />
+    <public type="drawable" name="ic_gem_tier_3" id="0x7f0802ea" />
+    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7f0802eb" />
+    <public type="drawable" name="ic_google_white_24dp" id="0x7f0802f0" />
+    <public type="drawable" name="ic_group_add_white_24dp" id="0x7f0802f1" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7f0802f6" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7f0802f7" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7f0802f8" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7f0802f9" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7f0802fa" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7f0802fb" />
+    <public type="drawable" name="ic_guild_folder" id="0x7f0802fc" />
+    <public type="drawable" name="ic_guild_list_dms_24dp" id="0x7f0802fe" />
+    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7f0802ff" />
+    <public type="drawable" name="ic_guild_nitro_progress" id="0x7f080300" />
+    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7f080301" />
+    <public type="drawable" name="ic_guild_settings_24dp" id="0x7f080303" />
+    <public type="drawable" name="ic_guild_welcome_add_friend" id="0x7f080304" />
+    <public type="drawable" name="ic_guild_welcome_personalize" id="0x7f080305" />
+    <public type="drawable" name="ic_hammer_24dp" id="0x7f080306" />
+    <public type="drawable" name="ic_headset_24dp" id="0x7f080308" />
+    <public type="drawable" name="ic_headset_blue_24dp" id="0x7f080309" />
+    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7f08030a" />
+    <public type="drawable" name="ic_headset_deafened_grey_a60_24dp" id="0x7f08030b" />
+    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7f08030e" />
+    <public type="drawable" name="ic_headset_deafened_white_a60_24dp" id="0x7f08030f" />
+    <public type="drawable" name="ic_headset_grey_24dp" id="0x7f080310" />
+    <public type="drawable" name="ic_headset_grey_a60_24dp" id="0x7f080311" />
+    <public type="drawable" name="ic_headset_interactivenormal_dark_24dp" id="0x7f080312" />
+    <public type="drawable" name="ic_headset_interactivenormal_light_24dp" id="0x7f080313" />
+    <public type="drawable" name="ic_headset_white_18dp" id="0x7f080314" />
+    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7f080315" />
+    <public type="drawable" name="ic_headset_white_24dp" id="0x7f080316" />
+    <public type="drawable" name="ic_headset_white_a60_24dp" id="0x7f080317" />
+    <public type="drawable" name="ic_help_24dp" id="0x7f080318" />
+    <public type="drawable" name="ic_help_outline_24dp" id="0x7f080319" />
+    <public type="drawable" name="ic_history_white_24dp" id="0x7f08031a" />
+    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7f08031b" />
+    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7f08031d" />
+    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7f08031f" />
+    <public type="drawable" name="ic_image_24dp" id="0x7f080321" />
+    <public type="drawable" name="ic_info_24dp" id="0x7f080325" />
+    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7f080326" />
+    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7f080327" />
+    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7f080328" />
+    <public type="drawable" name="ic_keyboard_24dp" id="0x7f08032a" />
+    <public type="drawable" name="ic_krisp_logo_dark" id="0x7f08032b" />
+    <public type="drawable" name="ic_krisp_logo_light" id="0x7f08032c" />
+    <public type="drawable" name="ic_launch_24dp" id="0x7f08032d" />
+    <public type="drawable" name="ic_link_white_24dp" id="0x7f08032e" />
+    <public type="drawable" name="ic_locale_24dp" id="0x7f08032f" />
+    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7f080330" />
+    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7f080331" />
+    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7f080332" />
+    <public type="drawable" name="ic_lol_white_24dp" id="0x7f080333" />
+    <public type="drawable" name="ic_mail_24dp" id="0x7f080334" />
+    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7f080335" />
+    <public type="drawable" name="ic_mentions_white_24dp" id="0x7f080337" />
+    <public type="drawable" name="ic_menu_24dp" id="0x7f080338" />
+    <public type="drawable" name="ic_mic_grey_24dp" id="0x7f08033b" />
+    <public type="drawable" name="ic_mic_grey_a60_24dp" id="0x7f08033c" />
+    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7f08033f" />
+    <public type="drawable" name="ic_mic_muted_grey_a60_24dp" id="0x7f080340" />
+    <public type="drawable" name="ic_mic_muted_interactiveactive_dark_24dp" id="0x7f080341" />
+    <public type="drawable" name="ic_mic_muted_interactiveactive_light_24dp" id="0x7f080342" />
+    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7f080343" />
+    <public type="drawable" name="ic_mic_muted_white_a60_24dp" id="0x7f080344" />
+    <public type="drawable" name="ic_mic_state_dark" id="0x7f080345" />
+    <public type="drawable" name="ic_mic_state_light" id="0x7f080346" />
+    <public type="drawable" name="ic_mic_white_18dp" id="0x7f080347" />
+    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7f080348" />
+    <public type="drawable" name="ic_mic_white_24dp" id="0x7f080349" />
+    <public type="drawable" name="ic_mic_white_a60_24dp" id="0x7f08034a" />
+    <public type="drawable" name="ic_mobile_screenshare_24dp" id="0x7f08034c" />
+    <public type="drawable" name="ic_mobile_screenshare_end_24dp" id="0x7f08034d" />
+    <public type="drawable" name="ic_monitor_white_24dp" id="0x7f08034e" />
+    <public type="drawable" name="ic_more_primary100_24dp" id="0x7f08034f" />
+    <public type="drawable" name="ic_more_primary900_24dp" id="0x7f080350" />
+    <public type="drawable" name="ic_movie_24dp" id="0x7f080351" />
+    <public type="drawable" name="ic_mtrl_checked_circle" id="0x7f080352" />
+    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7f080353" />
+    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7f080354" />
+    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7f080355" />
+    <public type="drawable" name="ic_mute_red_strike" id="0x7f080356" />
+    <public type="drawable" name="ic_mute_v2_muted" id="0x7f080357" />
+    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_dark_300" id="0x7f080358" />
+    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_light_600" id="0x7f080359" />
+    <public type="drawable" name="ic_my_account_24dp" id="0x7f08035a" />
+    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7f08035b" />
+    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7f08035c" />
+    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7f080362" />
+    <public type="drawable" name="ic_noise_cancellation_active_24dp" id="0x7f080366" />
+    <public type="drawable" name="ic_noise_cancellation_disabled_24dp" id="0x7f080367" />
+    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7f08036d" />
+    <public type="drawable" name="ic_notifications_off_grey_24dp" id="0x7f08036e" />
+    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7f08036f" />
+    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7f080370" />
+    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7f080373" />
+    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7f080374" />
+    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7f080375" />
+    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7f080376" />
+    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7f080377" />
+    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7f080378" />
+    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7f080379" />
+    <public type="drawable" name="ic_overlay_white_24dp" id="0x7f08037c" />
+    <public type="drawable" name="ic_partnered_badge" id="0x7f08037d" />
+    <public type="drawable" name="ic_partnered_badge_banner" id="0x7f08037e" />
+    <public type="drawable" name="ic_people_white_24dp" id="0x7f08037f" />
+    <public type="drawable" name="ic_perk_lock" id="0x7f080380" />
+    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7f080381" />
+    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7f080382" />
+    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7f080383" />
+    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7f080384" />
+    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7f080385" />
+    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7f080386" />
+    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7f080387" />
+    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7f080388" />
+    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7f080389" />
+    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7f08038a" />
+    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7f08038b" />
+    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7f08038c" />
+    <public type="drawable" name="ic_phonelink_24dp" id="0x7f08038e" />
+    <public type="drawable" name="ic_photo_grey_24dp" id="0x7f08038f" />
+    <public type="drawable" name="ic_pin_24dp" id="0x7f080390" />
+    <public type="drawable" name="ic_play_arrow_24dp" id="0x7f080391" />
+    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7f080392" />
+    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7f080393" />
+    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7f080394" />
+    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7f080395" />
+    <public type="drawable" name="ic_privacy_24dp" id="0x7f080398" />
+    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7f080399" />
+    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7f08039a" />
+    <public type="drawable" name="ic_profile_badge_bughunter_level_1_32dp" id="0x7f08039b" />
+    <public type="drawable" name="ic_profile_badge_bughunter_level_2_32dp" id="0x7f08039c" />
+    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7f08039d" />
+    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7f08039f" />
+    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7f0803a0" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7f0803a1" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7f0803a2" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7f0803a3" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7f0803a4" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7f0803a5" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7f0803a6" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7f0803a7" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7f0803a8" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7f0803a9" />
+    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7f0803aa" />
+    <public type="drawable" name="ic_profile_badge_verified_developer_32dp" id="0x7f0803ab" />
+    <public type="drawable" name="ic_qr_code_24dp" id="0x7f0803ac" />
+    <public type="drawable" name="ic_quote_grey_a60_24dp" id="0x7f0803ad" />
+    <public type="drawable" name="ic_quote_white_a60_24dp" id="0x7f0803ae" />
+    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7f0803af" />
+    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7f0803b0" />
+    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7f0803b2" />
+    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7f0803b3" />
+    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7f0803b4" />
+    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7f0803b5" />
+    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7f0803b6" />
+    <public type="drawable" name="ic_role_24dp" id="0x7f0803b7" />
+    <public type="drawable" name="ic_role_pink_24dp" id="0x7f0803b9" />
+    <public type="drawable" name="ic_search_16dp" id="0x7f0803bc" />
+    <public type="drawable" name="ic_search_grey_24dp" id="0x7f0803bd" />
+    <public type="drawable" name="ic_search_white_24dp" id="0x7f0803be" />
+    <public type="drawable" name="ic_security_24dp" id="0x7f0803bf" />
+    <public type="drawable" name="ic_send_24dp" id="0x7f0803c0" />
+    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f0803c1" />
+    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f0803c3" />
+    <public type="drawable" name="ic_settings_boost_24dp" id="0x7f0803c5" />
+    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f0803c6" />
+    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f0803c7" />
+    <public type="drawable" name="ic_share_grey_24dp" id="0x7f0803c8" />
+    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f0803c9" />
+    <public type="drawable" name="ic_share_white_24dp" id="0x7f0803ca" />
+    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f0803cb" />
+    <public type="drawable" name="ic_shieldstar_24dp" id="0x7f0803cc" />
+    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7f0803cd" />
+    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7f0803ce" />
+    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7f0803d1" />
+    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7f0803d2" />
+    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7f0803d5" />
+    <public type="drawable" name="ic_skype_white_24dp" id="0x7f0803d7" />
+    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f0803d8" />
+    <public type="drawable" name="ic_smile_24dp" id="0x7f0803d9" />
+    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f0803db" />
+    <public type="drawable" name="ic_sort_white_24dp" id="0x7f0803dc" />
+    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7f0803de" />
+    <public type="drawable" name="ic_spectate" id="0x7f0803df" />
+    <public type="drawable" name="ic_spotify_green_24dp" id="0x7f0803e0" />
+    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f0803e1" />
+    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7f0803e2" />
+    <public type="drawable" name="ic_star_24dp" id="0x7f0803e3" />
+    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f0803e7" />
+    <public type="drawable" name="ic_status_online_16dp" id="0x7f0803e8" />
+    <public type="drawable" name="ic_steam_white_24dp" id="0x7f0803ea" />
+    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f0803ec" />
+    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f0803ed" />
+    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f0803ee" />
+    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f0803ef" />
+    <public type="drawable" name="ic_tab_friends" id="0x7f0803f0" />
+    <public type="drawable" name="ic_tab_home" id="0x7f0803f1" />
+    <public type="drawable" name="ic_tab_mentions" id="0x7f0803f2" />
+    <public type="drawable" name="ic_tab_search" id="0x7f0803f3" />
+    <public type="drawable" name="ic_take_photo" id="0x7f0803f4" />
+    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f0803fd" />
+    <public type="drawable" name="ic_text_image_24dp" id="0x7f0803fe" />
+    <public type="drawable" name="ic_theme_24dp" id="0x7f0803ff" />
+    <public type="drawable" name="ic_timer_dark" id="0x7f080400" />
+    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f080401" />
+    <public type="drawable" name="ic_timer_light" id="0x7f080402" />
+    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080403" />
+    <public type="drawable" name="ic_tooltip_bottom_tail" id="0x7f080404" />
+    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080405" />
+    <public type="drawable" name="ic_trash_outline" id="0x7f080406" />
+    <public type="drawable" name="ic_unban_grey" id="0x7f08040b" />
+    <public type="drawable" name="ic_unread_white_9dp" id="0x7f08040c" />
+    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f08040d" />
+    <public type="drawable" name="ic_upload_image_34dp" id="0x7f08040f" />
+    <public type="drawable" name="ic_upload_image_40dp" id="0x7f080410" />
+    <public type="drawable" name="ic_upload_plus_32dp" id="0x7f080411" />
+    <public type="drawable" name="ic_uploads_file_dark" id="0x7f080412" />
+    <public type="drawable" name="ic_uploads_file_light" id="0x7f080413" />
+    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f080414" />
+    <public type="drawable" name="ic_uploads_generic_light" id="0x7f080415" />
+    <public type="drawable" name="ic_uploads_image_dark" id="0x7f080416" />
+    <public type="drawable" name="ic_uploads_image_light" id="0x7f080417" />
+    <public type="drawable" name="ic_uploads_video_dark" id="0x7f080418" />
+    <public type="drawable" name="ic_uploads_video_light" id="0x7f080419" />
+    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7f08041a" />
+    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7f08041b" />
+    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f080420" />
+    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7f080425" />
+    <public type="drawable" name="ic_user_profile_action_message_white_24dp" id="0x7f080426" />
+    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7f080427" />
+    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f080428" />
+    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7f080429" />
+    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7f08042a" />
+    <public type="drawable" name="ic_verified_10dp" id="0x7f08042b" />
+    <public type="drawable" name="ic_verified_badge" id="0x7f08042c" />
+    <public type="drawable" name="ic_verified_badge_banner" id="0x7f08042d" />
+    <public type="drawable" name="ic_video_grid_view_grey" id="0x7f08042e" />
+    <public type="drawable" name="ic_video_grid_view_white" id="0x7f08042f" />
+    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7f080430" />
+    <public type="drawable" name="ic_videocam_white_12dp" id="0x7f080431" />
+    <public type="drawable" name="ic_videocam_white_24dp" id="0x7f080432" />
+    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f080433" />
+    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f080434" />
+    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f080435" />
+    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f080436" />
+    <public type="drawable" name="ic_voice_settings_24dp" id="0x7f08043b" />
+    <public type="drawable" name="ic_volume_mute_grey_a60_24dp" id="0x7f08043c" />
+    <public type="drawable" name="ic_volume_mute_white_a60_24dp" id="0x7f08043d" />
+    <public type="drawable" name="ic_volume_off_24dp" id="0x7f08043e" />
+    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7f08043f" />
+    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f080440" />
+    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7f080441" />
+    <public type="drawable" name="ic_warning_circle_24dp" id="0x7f080442" />
+    <public type="drawable" name="ic_x_red_24dp" id="0x7f080443" />
+    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f080444" />
+    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f080445" />
+    <public type="drawable" name="img_baddies_dark_theme" id="0x7f080479" />
+    <public type="drawable" name="img_baddies_light_theme" id="0x7f08047a" />
+    <public type="drawable" name="img_boost_cancel" id="0x7f08047d" />
+    <public type="drawable" name="img_boost_hands" id="0x7f08047e" />
+    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7f08047f" />
+    <public type="drawable" name="img_channel_following_success_1_light" id="0x7f080480" />
+    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7f080481" />
+    <public type="drawable" name="img_channel_following_success_2_light" id="0x7f080482" />
+    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7f080483" />
+    <public type="drawable" name="img_channel_following_success_3_light" id="0x7f080484" />
+    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f080487" />
+    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f080494" />
+    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f080495" />
+    <public type="drawable" name="img_forced_update_dark" id="0x7f080496" />
+    <public type="drawable" name="img_forced_update_light" id="0x7f080497" />
+    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7f080499" />
+    <public type="drawable" name="img_gem_hands_faded_light" id="0x7f08049a" />
+    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f08049b" />
+    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f08049c" />
+    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7f0804a0" />
+    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7f0804a1" />
+    <public type="drawable" name="img_item_shop_dark" id="0x7f0804a2" />
+    <public type="drawable" name="img_logo_discord" id="0x7f0804a7" />
+    <public type="drawable" name="img_logo_square" id="0x7f0804af" />
+    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f0804b2" />
+    <public type="drawable" name="img_new_tos_light_theme" id="0x7f0804b3" />
+    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f0804b6" />
+    <public type="drawable" name="img_nitro_uncancel" id="0x7f0804ba" />
+    <public type="drawable" name="img_no_gifts" id="0x7f0804bb" />
+    <public type="drawable" name="img_no_text_channels_dark" id="0x7f0804c0" />
+    <public type="drawable" name="img_no_text_channels_light" id="0x7f0804c1" />
+    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f0804c2" />
+    <public type="drawable" name="img_nsfw_light_theme" id="0x7f0804c3" />
+    <public type="drawable" name="img_poop_dark" id="0x7f0804c6" />
+    <public type="drawable" name="img_poop_light" id="0x7f0804c7" />
+    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7f0804cc" />
+    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7f0804cd" />
+    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7f0804ce" />
+    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7f0804cf" />
+    <public type="drawable" name="img_quick_switcher_empty" id="0x7f0804d4" />
+    <public type="drawable" name="img_remote_auth_finished" id="0x7f0804d5" />
+    <public type="drawable" name="img_remote_auth_not_found" id="0x7f0804d7" />
+    <public type="drawable" name="img_save_your_group" id="0x7f0804d8" />
+    <public type="drawable" name="img_server_boost_long" id="0x7f0804d9" />
+    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f0804dc" />
+    <public type="drawable" name="img_verify_email_light_theme" id="0x7f0804dd" />
+    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f0804de" />
+    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f0804df" />
+    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f0804e4" />
+    <public type="drawable" name="img_wumpus_ball_light" id="0x7f0804e5" />
+    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f0804ea" />
+    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f0804eb" />
+    <public type="drawable" name="material_ic_calendar_black_24dp" id="0x7f0804ec" />
+    <public type="drawable" name="material_ic_clear_black_24dp" id="0x7f0804ed" />
+    <public type="drawable" name="material_ic_edit_black_24dp" id="0x7f0804ee" />
+    <public type="drawable" name="material_ic_keyboard_arrow_left_black_24dp" id="0x7f0804ef" />
+    <public type="drawable" name="material_ic_keyboard_arrow_right_black_24dp" id="0x7f0804f0" />
+    <public type="drawable" name="material_ic_menu_arrow_down_black_24dp" id="0x7f0804f1" />
+    <public type="drawable" name="material_ic_menu_arrow_up_black_24dp" id="0x7f0804f2" />
+    <public type="drawable" name="mtrl_dialog_background" id="0x7f0804f3" />
+    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7f0804f4" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7f0804f5" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7f0804f6" />
+    <public type="drawable" name="mtrl_ic_cancel" id="0x7f0804f7" />
+    <public type="drawable" name="mtrl_ic_error" id="0x7f0804f8" />
+    <public type="drawable" name="mtrl_popupmenu_background" id="0x7f0804f9" />
+    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7f0804fa" />
+    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f0804fb" />
+    <public type="drawable" name="navigation_empty_icon" id="0x7f0804fc" />
+    <public type="drawable" name="notification_action_background" id="0x7f0804fd" />
+    <public type="drawable" name="notification_bg" id="0x7f0804fe" />
+    <public type="drawable" name="notification_bg_low" id="0x7f0804ff" />
+    <public type="drawable" name="notification_icon_background" id="0x7f080504" />
+    <public type="drawable" name="notification_template_icon_bg" id="0x7f080505" />
+    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f080506" />
+    <public type="drawable" name="notification_tile_bg" id="0x7f080507" />
+    <public type="drawable" name="preference_list_divider_material" id="0x7f080509" />
+    <public type="drawable" name="reactions_divider" id="0x7f08050a" />
+    <public type="drawable" name="ripple_brighten" id="0x7f08050b" />
+    <public type="drawable" name="ripple_darken" id="0x7f08050c" />
+    <public type="drawable" name="rounded_rectangle_4dp_radius" id="0x7f08050d" />
+    <public type="drawable" name="rounded_rectangle_8dp_radius" id="0x7f08050e" />
+    <public type="drawable" name="screen_share_illustration" id="0x7f08050f" />
+    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7f080510" />
+    <public type="drawable" name="selectable_feedback_happy_light" id="0x7f080511" />
+    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7f080512" />
+    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7f080513" />
+    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7f080514" />
+    <public type="drawable" name="selectable_feedback_sad_light" id="0x7f080515" />
+    <public type="drawable" name="sparkle_animated_vector" id="0x7f080516" />
+    <public type="drawable" name="tab_dot_selector" id="0x7f080517" />
+    <public type="drawable" name="tab_dot_selector_wide" id="0x7f080518" />
+    <public type="drawable" name="tab_indicator_default" id="0x7f080519" />
+    <public type="drawable" name="tab_indicator_selected" id="0x7f08051a" />
+    <public type="drawable" name="tab_indicator_selected_wide" id="0x7f08051b" />
+    <public type="drawable" name="test_custom_background" id="0x7f08051c" />
+    <public type="drawable" name="tooltip_frame_dark" id="0x7f08051d" />
+    <public type="drawable" name="tooltip_frame_light" id="0x7f08051e" />
+    <public type="drawable" name="trash_bg" id="0x7f08051f" />
+    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080528" />
+    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080529" />
+    <public type="drawable" name="ucrop_vector_loader" id="0x7f08052a" />
+    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f08052b" />
+    <public type="drawable" name="voice_user_limit_view_left_bg" id="0x7f08052d" />
+    <public type="drawable" name="voice_user_limit_view_right_bg" id="0x7f08052e" />
     <public type="drawable" name="abc_control_background_material" id="0x7f080044" />
     <public type="drawable" name="asset_nux_navigation_channels" id="0x7f08009d" />
     <public type="drawable" name="asset_nux_navigation_dms" id="0x7f08009e" />
@@ -3652,228 +3636,227 @@
     <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7f08015c" />
     <public type="drawable" name="drawable_ic_nitro" id="0x7f08015d" />
     <public type="drawable" name="drawable_ic_nitro_classic" id="0x7f08015e" />
-    <public type="drawable" name="exo_edit_mode_logo" id="0x7f0801da" />
-    <public type="drawable" name="exo_icon_circular_play" id="0x7f0801db" />
-    <public type="drawable" name="exo_icon_fastforward" id="0x7f0801dc" />
-    <public type="drawable" name="exo_icon_fullscreen_enter" id="0x7f0801dd" />
-    <public type="drawable" name="exo_icon_fullscreen_exit" id="0x7f0801de" />
-    <public type="drawable" name="exo_icon_next" id="0x7f0801df" />
-    <public type="drawable" name="exo_icon_pause" id="0x7f0801e0" />
-    <public type="drawable" name="exo_icon_play" id="0x7f0801e1" />
-    <public type="drawable" name="exo_icon_previous" id="0x7f0801e2" />
-    <public type="drawable" name="exo_icon_repeat_all" id="0x7f0801e3" />
-    <public type="drawable" name="exo_icon_repeat_off" id="0x7f0801e4" />
-    <public type="drawable" name="exo_icon_repeat_one" id="0x7f0801e5" />
-    <public type="drawable" name="exo_icon_rewind" id="0x7f0801e6" />
-    <public type="drawable" name="exo_icon_shuffle_off" id="0x7f0801e7" />
-    <public type="drawable" name="exo_icon_shuffle_on" id="0x7f0801e8" />
-    <public type="drawable" name="exo_icon_stop" id="0x7f0801e9" />
-    <public type="drawable" name="exo_icon_vr" id="0x7f0801ea" />
-    <public type="drawable" name="ic_account_bnet" id="0x7f0801f6" />
-    <public type="drawable" name="ic_account_facebook" id="0x7f0801fb" />
-    <public type="drawable" name="ic_account_github" id="0x7f0801fc" />
-    <public type="drawable" name="ic_account_lol" id="0x7f0801fe" />
-    <public type="drawable" name="ic_account_obs" id="0x7f080200" />
-    <public type="drawable" name="ic_account_patreon" id="0x7f080201" />
-    <public type="drawable" name="ic_account_reddit" id="0x7f080202" />
-    <public type="drawable" name="ic_account_skype" id="0x7f080203" />
-    <public type="drawable" name="ic_account_spotify" id="0x7f080204" />
-    <public type="drawable" name="ic_account_steam" id="0x7f080205" />
-    <public type="drawable" name="ic_account_twitch" id="0x7f080206" />
-    <public type="drawable" name="ic_account_twitter" id="0x7f080207" />
-    <public type="drawable" name="ic_account_xbox" id="0x7f080208" />
-    <public type="drawable" name="ic_account_xsplit" id="0x7f080209" />
-    <public type="drawable" name="ic_add_friend_send" id="0x7f080210" />
-    <public type="drawable" name="ic_add_person_16dp" id="0x7f080211" />
-    <public type="drawable" name="ic_arrow_down" id="0x7f08021b" />
-    <public type="drawable" name="ic_arrow_down_14dp" id="0x7f08021c" />
-    <public type="drawable" name="ic_arrow_right" id="0x7f080220" />
-    <public type="drawable" name="ic_audio_output_white_24dp" id="0x7f080227" />
-    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7f080228" />
-    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7f080229" />
-    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7f08022a" />
-    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7f08022b" />
-    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7f08022c" />
-    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7f08022d" />
-    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7f08022e" />
-    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7f08022f" />
-    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7f080230" />
-    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7f080231" />
-    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7f080232" />
-    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7f080233" />
-    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7f080234" />
-    <public type="drawable" name="ic_audit_integrations_grey_24dp" id="0x7f080235" />
-    <public type="drawable" name="ic_audit_integrations_white_24dp" id="0x7f080236" />
-    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7f080237" />
-    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7f080238" />
-    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7f08023a" />
-    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7f08023b" />
-    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7f08023c" />
-    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7f08023d" />
-    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7f08023e" />
-    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7f08023f" />
-    <public type="drawable" name="ic_authed_apps_24dp" id="0x7f080240" />
-    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7f08024b" />
-    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7f08024c" />
-    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7f08024d" />
-    <public type="drawable" name="ic_call_24dp" id="0x7f08024f" />
-    <public type="drawable" name="ic_call_disconnect_24dp" id="0x7f080250" />
-    <public type="drawable" name="ic_call_indicator_streaming_16dp" id="0x7f080251" />
-    <public type="drawable" name="ic_call_indicator_voice_16dp" id="0x7f080253" />
-    <public type="drawable" name="ic_carot_right_24dp" id="0x7f080257" />
-    <public type="drawable" name="ic_channel_announcements_locked" id="0x7f08025c" />
-    <public type="drawable" name="ic_channel_announcements_nsfw" id="0x7f08025d" />
-    <public type="drawable" name="ic_channel_text" id="0x7f080260" />
-    <public type="drawable" name="ic_channel_text_nsfw" id="0x7f080265" />
-    <public type="drawable" name="ic_channel_voice" id="0x7f08026a" />
-    <public type="drawable" name="ic_channel_voice_locked" id="0x7f08026d" />
-    <public type="drawable" name="ic_chat_list_actions_add_reaction" id="0x7f080271" />
-    <public type="drawable" name="ic_creditcard_amex" id="0x7f08028d" />
-    <public type="drawable" name="ic_creditcard_discover" id="0x7f08028e" />
-    <public type="drawable" name="ic_creditcard_generic" id="0x7f08028f" />
-    <public type="drawable" name="ic_creditcard_mastercard" id="0x7f080290" />
-    <public type="drawable" name="ic_creditcard_visa" id="0x7f080292" />
-    <public type="drawable" name="ic_crown_24dp" id="0x7f080293" />
-    <public type="drawable" name="ic_deafen_v2_deafened" id="0x7f080296" />
-    <public type="drawable" name="ic_deafen_v2_red_strike_primary_dark_300" id="0x7f080297" />
-    <public type="drawable" name="ic_deafen_v2_red_strike_primary_light_600" id="0x7f080298" />
-    <public type="drawable" name="ic_double_carot_right_16dp" id="0x7f0802a2" />
-    <public type="drawable" name="ic_emoji_picker_category_custom" id="0x7f0802ac" />
-    <public type="drawable" name="ic_empty_server_settings_integrations_dark" id="0x7f0802b8" />
-    <public type="drawable" name="ic_empty_server_settings_integrations_light" id="0x7f0802b9" />
-    <public type="drawable" name="ic_facebook_white_18dp" id="0x7f0802c1" />
-    <public type="drawable" name="ic_facebook_white_24dp" id="0x7f0802c2" />
-    <public type="drawable" name="ic_gallery_24dp" id="0x7f0802e5" />
-    <public type="drawable" name="ic_gift_24dp" id="0x7f0802eb" />
-    <public type="drawable" name="ic_gift_white_16dp" id="0x7f0802ec" />
-    <public type="drawable" name="ic_github_white" id="0x7f0802ed" />
-    <public type="drawable" name="ic_google_auth_logo" id="0x7f0802ee" />
-    <public type="drawable" name="ic_group_message_header" id="0x7f0802f4" />
-    <public type="drawable" name="ic_guild_invite_24dp" id="0x7f0802fc" />
-    <public type="drawable" name="ic_guild_notifications_24dp" id="0x7f080301" />
-    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7f080306" />
-    <public type="drawable" name="ic_headset_deafened_interactiveactive_dark_24dp" id="0x7f08030b" />
-    <public type="drawable" name="ic_headset_deafened_interactiveactive_light_24dp" id="0x7f08030c" />
-    <public type="drawable" name="ic_image_library_24dp" id="0x7f080321" />
-    <public type="drawable" name="ic_instagram_white_18dp" id="0x7f080328" />
-    <public type="drawable" name="ic_members_24dp" id="0x7f080335" />
-    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7f080338" />
-    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7f080339" />
-    <public type="drawable" name="ic_mic_interactivenormal_dark_24dp" id="0x7f08033c" />
-    <public type="drawable" name="ic_mic_interactivenormal_light_24dp" id="0x7f08033d" />
-    <public type="drawable" name="ic_mobile" id="0x7f08034a" />
-    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7f08035a" />
-    <public type="drawable" name="ic_nitro_badge_white" id="0x7f08035b" />
-    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7f08035c" />
-    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7f08035d" />
-    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7f08035e" />
-    <public type="drawable" name="ic_nitro_rep" id="0x7f080360" />
-    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7f080361" />
-    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7f080362" />
-    <public type="drawable" name="ic_notification_settings_24dp" id="0x7f080369" />
-    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7f08036e" />
-    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7f08036f" />
-    <public type="drawable" name="ic_overflow_dark_24dp" id="0x7f080377" />
-    <public type="drawable" name="ic_overflow_light_24dp" id="0x7f080378" />
-    <public type="drawable" name="ic_phone_24dp" id="0x7f08038a" />
-    <public type="drawable" name="ic_popup_settings_grey_a60_24dp" id="0x7f080393" />
-    <public type="drawable" name="ic_popup_settings_white_a60_24dp" id="0x7f080394" />
-    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7f08039b" />
-    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7f08039c" />
-    <public type="drawable" name="ic_reddit_white_24dp" id="0x7f0803ae" />
-    <public type="drawable" name="ic_screen_14dp" id="0x7f0803b7" />
-    <public type="drawable" name="ic_settings_24dp" id="0x7f0803c1" />
-    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7f0803cc" />
-    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7f0803cd" />
-    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7f0803d0" />
-    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7f0803d1" />
-    <public type="drawable" name="ic_sound_24dp" id="0x7f0803da" />
-    <public type="drawable" name="ic_status_24dp" id="0x7f0803e1" />
-    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f0803e2" />
-    <public type="drawable" name="ic_status_idle_16dp" id="0x7f0803e3" />
-    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f0803e6" />
-    <public type="drawable" name="ic_stop_stream" id="0x7f0803e8" />
-    <public type="drawable" name="ic_template_32dp" id="0x7f0803f2" />
-    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f080404" />
-    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f080405" />
-    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f080406" />
-    <public type="drawable" name="ic_upload_24dp" id="0x7f08040b" />
-    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7f080419" />
-    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7f08041a" />
-    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7f08041b" />
-    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7f08041c" />
-    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f08041e" />
-    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7f08041f" />
-    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7f080420" />
-    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7f080421" />
-    <public type="drawable" name="ic_voice_quality_average" id="0x7f080434" />
-    <public type="drawable" name="ic_voice_quality_bad" id="0x7f080435" />
-    <public type="drawable" name="ic_voice_quality_fine" id="0x7f080436" />
-    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f080437" />
-    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f080469" />
-    <public type="drawable" name="img_addfriends_empty_light" id="0x7f08046a" />
-    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f08046b" />
-    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f08046c" />
-    <public type="drawable" name="img_age_gate_birthday" id="0x7f08046d" />
-    <public type="drawable" name="img_age_gate_failure" id="0x7f08046e" />
-    <public type="drawable" name="img_age_gate_safety" id="0x7f08046f" />
-    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f080470" />
-    <public type="drawable" name="img_avatar_upsell" id="0x7f080475" />
-    <public type="drawable" name="img_badge_upsell" id="0x7f080478" />
-    <public type="drawable" name="img_boost_activated" id="0x7f080479" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f080485" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f080486" />
-    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f080487" />
-    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f080488" />
-    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f080489" />
-    <public type="drawable" name="img_empty_friends_none_light" id="0x7f08048a" />
-    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f08048b" />
-    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f08048c" />
-    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f08048d" />
-    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f08048e" />
-    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f08048f" />
-    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f080490" />
-    <public type="drawable" name="img_global_emoji_upsell" id="0x7f08049c" />
-    <public type="drawable" name="img_krisp_onboarding" id="0x7f0804a0" />
-    <public type="drawable" name="img_logo_discord_nitro" id="0x7f0804a5" />
-    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f0804a6" />
-    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f0804a7" />
-    <public type="drawable" name="img_logo_nitro" id="0x7f0804a8" />
-    <public type="drawable" name="img_logo_nitro_classic" id="0x7f0804a9" />
-    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f0804aa" />
-    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f0804ab" />
-    <public type="drawable" name="img_mfa_dark" id="0x7f0804ad" />
-    <public type="drawable" name="img_mfa_light" id="0x7f0804ae" />
-    <public type="drawable" name="img_nitro_card" id="0x7f0804b1" />
-    <public type="drawable" name="img_nitro_classic_card" id="0x7f0804b2" />
-    <public type="drawable" name="img_nitro_pattern" id="0x7f0804b4" />
-    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f0804b9" />
-    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f0804ba" />
-    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f0804bb" />
-    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f0804bc" />
-    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7f0804c5" />
-    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7f0804c6" />
-    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7f0804c7" />
-    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7f0804c8" />
-    <public type="drawable" name="img_premium_subscription_header" id="0x7f0804cd" />
-    <public type="drawable" name="img_premium_subscription_header_error" id="0x7f0804ce" />
-    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7f0804cf" />
-    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7f0804d0" />
-    <public type="drawable" name="img_remote_auth_loaded" id="0x7f0804d3" />
-    <public type="drawable" name="img_tag_upsell" id="0x7f0804d7" />
-    <public type="drawable" name="img_upload_upsell" id="0x7f0804d8" />
-    <public type="drawable" name="img_wumpus_jetpack" id="0x7f0804e4" />
-    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7f0804e5" />
-    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f0804e6" />
-    <public type="drawable" name="ucrop_ic_angle" id="0x7f08051c" />
-    <public type="drawable" name="ucrop_ic_crop" id="0x7f08051d" />
-    <public type="drawable" name="ucrop_ic_cross" id="0x7f08051e" />
-    <public type="drawable" name="ucrop_ic_done" id="0x7f08051f" />
-    <public type="drawable" name="ucrop_ic_next" id="0x7f080520" />
-    <public type="drawable" name="ucrop_ic_reset" id="0x7f080521" />
-    <public type="drawable" name="ucrop_ic_rotate" id="0x7f080522" />
-    <public type="drawable" name="ucrop_ic_scale" id="0x7f080523" />
-    <public type="drawable" name="video_call_illustration" id="0x7f080528" />
+    <public type="drawable" name="exo_edit_mode_logo" id="0x7f0801db" />
+    <public type="drawable" name="exo_icon_circular_play" id="0x7f0801dc" />
+    <public type="drawable" name="exo_icon_fastforward" id="0x7f0801dd" />
+    <public type="drawable" name="exo_icon_fullscreen_enter" id="0x7f0801de" />
+    <public type="drawable" name="exo_icon_fullscreen_exit" id="0x7f0801df" />
+    <public type="drawable" name="exo_icon_next" id="0x7f0801e0" />
+    <public type="drawable" name="exo_icon_pause" id="0x7f0801e1" />
+    <public type="drawable" name="exo_icon_play" id="0x7f0801e2" />
+    <public type="drawable" name="exo_icon_previous" id="0x7f0801e3" />
+    <public type="drawable" name="exo_icon_repeat_all" id="0x7f0801e4" />
+    <public type="drawable" name="exo_icon_repeat_off" id="0x7f0801e5" />
+    <public type="drawable" name="exo_icon_repeat_one" id="0x7f0801e6" />
+    <public type="drawable" name="exo_icon_rewind" id="0x7f0801e7" />
+    <public type="drawable" name="exo_icon_shuffle_off" id="0x7f0801e8" />
+    <public type="drawable" name="exo_icon_shuffle_on" id="0x7f0801e9" />
+    <public type="drawable" name="exo_icon_stop" id="0x7f0801ea" />
+    <public type="drawable" name="exo_icon_vr" id="0x7f0801eb" />
+    <public type="drawable" name="ic_account_bnet" id="0x7f0801f7" />
+    <public type="drawable" name="ic_account_facebook" id="0x7f0801fc" />
+    <public type="drawable" name="ic_account_github" id="0x7f0801fd" />
+    <public type="drawable" name="ic_account_lol" id="0x7f0801ff" />
+    <public type="drawable" name="ic_account_obs" id="0x7f080201" />
+    <public type="drawable" name="ic_account_patreon" id="0x7f080202" />
+    <public type="drawable" name="ic_account_reddit" id="0x7f080203" />
+    <public type="drawable" name="ic_account_skype" id="0x7f080204" />
+    <public type="drawable" name="ic_account_spotify" id="0x7f080205" />
+    <public type="drawable" name="ic_account_steam" id="0x7f080206" />
+    <public type="drawable" name="ic_account_twitch" id="0x7f080207" />
+    <public type="drawable" name="ic_account_twitter" id="0x7f080208" />
+    <public type="drawable" name="ic_account_xbox" id="0x7f080209" />
+    <public type="drawable" name="ic_account_xsplit" id="0x7f08020a" />
+    <public type="drawable" name="ic_add_friend_send" id="0x7f080211" />
+    <public type="drawable" name="ic_add_person_16dp" id="0x7f080212" />
+    <public type="drawable" name="ic_arrow_down" id="0x7f08021c" />
+    <public type="drawable" name="ic_arrow_down_14dp" id="0x7f08021d" />
+    <public type="drawable" name="ic_arrow_right" id="0x7f080221" />
+    <public type="drawable" name="ic_audio_output_white_24dp" id="0x7f080228" />
+    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7f080229" />
+    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7f08022a" />
+    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7f08022b" />
+    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7f08022c" />
+    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7f08022d" />
+    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7f08022e" />
+    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7f08022f" />
+    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7f080230" />
+    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7f080231" />
+    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7f080232" />
+    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7f080233" />
+    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7f080234" />
+    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7f080235" />
+    <public type="drawable" name="ic_audit_integrations_grey_24dp" id="0x7f080236" />
+    <public type="drawable" name="ic_audit_integrations_white_24dp" id="0x7f080237" />
+    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7f080238" />
+    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7f080239" />
+    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7f08023b" />
+    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7f08023c" />
+    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7f08023d" />
+    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7f08023e" />
+    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7f08023f" />
+    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7f080240" />
+    <public type="drawable" name="ic_authed_apps_24dp" id="0x7f080241" />
+    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7f08024c" />
+    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7f08024d" />
+    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7f08024e" />
+    <public type="drawable" name="ic_call_24dp" id="0x7f080250" />
+    <public type="drawable" name="ic_call_disconnect_24dp" id="0x7f080251" />
+    <public type="drawable" name="ic_call_indicator_streaming_16dp" id="0x7f080252" />
+    <public type="drawable" name="ic_call_indicator_voice_16dp" id="0x7f080254" />
+    <public type="drawable" name="ic_carot_right_24dp" id="0x7f080258" />
+    <public type="drawable" name="ic_channel_announcements_locked" id="0x7f08025d" />
+    <public type="drawable" name="ic_channel_announcements_nsfw" id="0x7f08025e" />
+    <public type="drawable" name="ic_channel_text" id="0x7f080261" />
+    <public type="drawable" name="ic_channel_text_nsfw" id="0x7f080266" />
+    <public type="drawable" name="ic_channel_voice" id="0x7f08026b" />
+    <public type="drawable" name="ic_channel_voice_locked" id="0x7f08026e" />
+    <public type="drawable" name="ic_chat_list_actions_add_reaction" id="0x7f080272" />
+    <public type="drawable" name="ic_creditcard_amex" id="0x7f08028e" />
+    <public type="drawable" name="ic_creditcard_discover" id="0x7f08028f" />
+    <public type="drawable" name="ic_creditcard_generic" id="0x7f080290" />
+    <public type="drawable" name="ic_creditcard_mastercard" id="0x7f080291" />
+    <public type="drawable" name="ic_creditcard_visa" id="0x7f080293" />
+    <public type="drawable" name="ic_crown_24dp" id="0x7f080294" />
+    <public type="drawable" name="ic_deafen_v2_deafened" id="0x7f080297" />
+    <public type="drawable" name="ic_deafen_v2_red_strike_primary_dark_300" id="0x7f080298" />
+    <public type="drawable" name="ic_deafen_v2_red_strike_primary_light_600" id="0x7f080299" />
+    <public type="drawable" name="ic_double_carot_right_16dp" id="0x7f0802a3" />
+    <public type="drawable" name="ic_emoji_picker_category_custom" id="0x7f0802ad" />
+    <public type="drawable" name="ic_empty_server_settings_integrations_dark" id="0x7f0802b9" />
+    <public type="drawable" name="ic_empty_server_settings_integrations_light" id="0x7f0802ba" />
+    <public type="drawable" name="ic_facebook_white_18dp" id="0x7f0802c2" />
+    <public type="drawable" name="ic_facebook_white_24dp" id="0x7f0802c3" />
+    <public type="drawable" name="ic_gallery_24dp" id="0x7f0802e6" />
+    <public type="drawable" name="ic_gift_24dp" id="0x7f0802ec" />
+    <public type="drawable" name="ic_gift_white_16dp" id="0x7f0802ed" />
+    <public type="drawable" name="ic_github_white" id="0x7f0802ee" />
+    <public type="drawable" name="ic_google_auth_logo" id="0x7f0802ef" />
+    <public type="drawable" name="ic_group_message_header" id="0x7f0802f5" />
+    <public type="drawable" name="ic_guild_invite_24dp" id="0x7f0802fd" />
+    <public type="drawable" name="ic_guild_notifications_24dp" id="0x7f080302" />
+    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7f080307" />
+    <public type="drawable" name="ic_headset_deafened_interactiveactive_dark_24dp" id="0x7f08030c" />
+    <public type="drawable" name="ic_headset_deafened_interactiveactive_light_24dp" id="0x7f08030d" />
+    <public type="drawable" name="ic_image_library_24dp" id="0x7f080322" />
+    <public type="drawable" name="ic_instagram_white_18dp" id="0x7f080329" />
+    <public type="drawable" name="ic_members_24dp" id="0x7f080336" />
+    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7f080339" />
+    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7f08033a" />
+    <public type="drawable" name="ic_mic_interactivenormal_dark_24dp" id="0x7f08033d" />
+    <public type="drawable" name="ic_mic_interactivenormal_light_24dp" id="0x7f08033e" />
+    <public type="drawable" name="ic_mobile" id="0x7f08034b" />
+    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7f08035d" />
+    <public type="drawable" name="ic_nitro_badge_white" id="0x7f08035e" />
+    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7f08035f" />
+    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7f080360" />
+    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7f080361" />
+    <public type="drawable" name="ic_nitro_rep" id="0x7f080363" />
+    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7f080364" />
+    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7f080365" />
+    <public type="drawable" name="ic_notification_settings_24dp" id="0x7f08036c" />
+    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7f080371" />
+    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7f080372" />
+    <public type="drawable" name="ic_overflow_dark_24dp" id="0x7f08037a" />
+    <public type="drawable" name="ic_overflow_light_24dp" id="0x7f08037b" />
+    <public type="drawable" name="ic_phone_24dp" id="0x7f08038d" />
+    <public type="drawable" name="ic_popup_settings_grey_a60_24dp" id="0x7f080396" />
+    <public type="drawable" name="ic_popup_settings_white_a60_24dp" id="0x7f080397" />
+    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7f08039e" />
+    <public type="drawable" name="ic_reddit_white_24dp" id="0x7f0803b1" />
+    <public type="drawable" name="ic_screen_14dp" id="0x7f0803ba" />
+    <public type="drawable" name="ic_settings_24dp" id="0x7f0803c4" />
+    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7f0803cf" />
+    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7f0803d0" />
+    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7f0803d3" />
+    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7f0803d4" />
+    <public type="drawable" name="ic_sound_24dp" id="0x7f0803dd" />
+    <public type="drawable" name="ic_status_24dp" id="0x7f0803e4" />
+    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f0803e5" />
+    <public type="drawable" name="ic_status_idle_16dp" id="0x7f0803e6" />
+    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f0803e9" />
+    <public type="drawable" name="ic_stop_stream" id="0x7f0803eb" />
+    <public type="drawable" name="ic_template_32dp" id="0x7f0803f5" />
+    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f080407" />
+    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f080408" />
+    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f080409" />
+    <public type="drawable" name="ic_upload_24dp" id="0x7f08040e" />
+    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7f08041c" />
+    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7f08041d" />
+    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7f08041e" />
+    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7f08041f" />
+    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f080421" />
+    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7f080422" />
+    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7f080423" />
+    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7f080424" />
+    <public type="drawable" name="ic_voice_quality_average" id="0x7f080437" />
+    <public type="drawable" name="ic_voice_quality_bad" id="0x7f080438" />
+    <public type="drawable" name="ic_voice_quality_fine" id="0x7f080439" />
+    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f08043a" />
+    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f08046c" />
+    <public type="drawable" name="img_addfriends_empty_light" id="0x7f08046d" />
+    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f08046e" />
+    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f08046f" />
+    <public type="drawable" name="img_age_gate_birthday" id="0x7f080470" />
+    <public type="drawable" name="img_age_gate_failure" id="0x7f080471" />
+    <public type="drawable" name="img_age_gate_safety" id="0x7f080472" />
+    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f080473" />
+    <public type="drawable" name="img_avatar_upsell" id="0x7f080478" />
+    <public type="drawable" name="img_badge_upsell" id="0x7f08047b" />
+    <public type="drawable" name="img_boost_activated" id="0x7f08047c" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f080488" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f080489" />
+    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f08048a" />
+    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f08048b" />
+    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f08048c" />
+    <public type="drawable" name="img_empty_friends_none_light" id="0x7f08048d" />
+    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f08048e" />
+    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f08048f" />
+    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f080490" />
+    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f080491" />
+    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f080492" />
+    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f080493" />
+    <public type="drawable" name="img_global_emoji_upsell" id="0x7f08049f" />
+    <public type="drawable" name="img_krisp_onboarding" id="0x7f0804a3" />
+    <public type="drawable" name="img_logo_discord_nitro" id="0x7f0804a8" />
+    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f0804a9" />
+    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f0804aa" />
+    <public type="drawable" name="img_logo_nitro" id="0x7f0804ab" />
+    <public type="drawable" name="img_logo_nitro_classic" id="0x7f0804ac" />
+    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f0804ad" />
+    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f0804ae" />
+    <public type="drawable" name="img_mfa_dark" id="0x7f0804b0" />
+    <public type="drawable" name="img_mfa_light" id="0x7f0804b1" />
+    <public type="drawable" name="img_nitro_card" id="0x7f0804b4" />
+    <public type="drawable" name="img_nitro_classic_card" id="0x7f0804b5" />
+    <public type="drawable" name="img_nitro_pattern" id="0x7f0804b7" />
+    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f0804bc" />
+    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f0804bd" />
+    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f0804be" />
+    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f0804bf" />
+    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7f0804c8" />
+    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7f0804c9" />
+    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7f0804ca" />
+    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7f0804cb" />
+    <public type="drawable" name="img_premium_subscription_header" id="0x7f0804d0" />
+    <public type="drawable" name="img_premium_subscription_header_error" id="0x7f0804d1" />
+    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7f0804d2" />
+    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7f0804d3" />
+    <public type="drawable" name="img_remote_auth_loaded" id="0x7f0804d6" />
+    <public type="drawable" name="img_tag_upsell" id="0x7f0804da" />
+    <public type="drawable" name="img_upload_upsell" id="0x7f0804db" />
+    <public type="drawable" name="img_wumpus_jetpack" id="0x7f0804e7" />
+    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7f0804e8" />
+    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f0804e9" />
+    <public type="drawable" name="ucrop_ic_angle" id="0x7f080520" />
+    <public type="drawable" name="ucrop_ic_crop" id="0x7f080521" />
+    <public type="drawable" name="ucrop_ic_cross" id="0x7f080522" />
+    <public type="drawable" name="ucrop_ic_done" id="0x7f080523" />
+    <public type="drawable" name="ucrop_ic_next" id="0x7f080524" />
+    <public type="drawable" name="ucrop_ic_reset" id="0x7f080525" />
+    <public type="drawable" name="ucrop_ic_rotate" id="0x7f080526" />
+    <public type="drawable" name="ucrop_ic_scale" id="0x7f080527" />
+    <public type="drawable" name="video_call_illustration" id="0x7f08052c" />
     <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7f080032" />
     <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7f080037" />
     <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7f080038" />
@@ -3925,13 +3908,13 @@
     <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7f0800d7" />
     <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7f0800db" />
     <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7f0800e0" />
-    <public type="drawable" name="googleg_disabled_color_18" id="0x7f0801f4" />
-    <public type="drawable" name="googleg_standard_color_18" id="0x7f0801f5" />
-    <public type="drawable" name="notification_bg_low_normal" id="0x7f0804fd" />
-    <public type="drawable" name="notification_bg_low_pressed" id="0x7f0804fe" />
-    <public type="drawable" name="notification_bg_normal" id="0x7f0804ff" />
-    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f080500" />
-    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f080505" />
+    <public type="drawable" name="googleg_disabled_color_18" id="0x7f0801f5" />
+    <public type="drawable" name="googleg_standard_color_18" id="0x7f0801f6" />
+    <public type="drawable" name="notification_bg_low_normal" id="0x7f080500" />
+    <public type="drawable" name="notification_bg_low_pressed" id="0x7f080501" />
+    <public type="drawable" name="notification_bg_normal" id="0x7f080502" />
+    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f080503" />
+    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f080508" />
     <public type="drawable" name="common_full_open_on_phone" id="0x7f0800ce" />
     <public type="drawable" name="cpv_alpha" id="0x7f0800e1" />
     <public type="drawable" name="asset_broken_results_dark" id="0x7f08008b" />
@@ -3945,42 +3928,42 @@
     <public type="drawable" name="asset_no_results_light" id="0x7f08009c" />
     <public type="drawable" name="asset_sadbot" id="0x7f0800a2" />
     <public type="drawable" name="asset_security" id="0x7f0800a3" />
-    <public type="drawable" name="empty_pins_dark" id="0x7f0801ca" />
-    <public type="drawable" name="empty_pins_light" id="0x7f0801cb" />
-    <public type="drawable" name="ic_add_white_24dp" id="0x7f080215" />
-    <public type="drawable" name="ic_channel_pinned_message" id="0x7f08025f" />
-    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7f0802a5" />
-    <public type="drawable" name="ic_file_acrobat" id="0x7f0802cd" />
-    <public type="drawable" name="ic_file_ae" id="0x7f0802ce" />
-    <public type="drawable" name="ic_file_ai" id="0x7f0802cf" />
-    <public type="drawable" name="ic_file_archive" id="0x7f0802d0" />
-    <public type="drawable" name="ic_file_code" id="0x7f0802d1" />
-    <public type="drawable" name="ic_file_document" id="0x7f0802d2" />
-    <public type="drawable" name="ic_file_sketch" id="0x7f0802d8" />
-    <public type="drawable" name="ic_file_spreadsheet" id="0x7f0802d9" />
-    <public type="drawable" name="ic_file_unknown" id="0x7f0802da" />
-    <public type="drawable" name="ic_file_video" id="0x7f0802dc" />
-    <public type="drawable" name="ic_file_webcode" id="0x7f0802dd" />
-    <public type="drawable" name="ic_group_edit" id="0x7f0802f1" />
-    <public type="drawable" name="ic_group_join" id="0x7f0802f2" />
-    <public type="drawable" name="ic_group_leave" id="0x7f0802f3" />
-    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7f080322" />
-    <public type="drawable" name="ic_img_selected_light_theme" id="0x7f080323" />
-    <public type="drawable" name="ic_role_lock" id="0x7f0803b5" />
-    <public type="drawable" name="ic_smiley_desaturated" id="0x7f0803d7" />
-    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f0803f3" />
-    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f0803f4" />
-    <public type="drawable" name="ic_ternary_off_checked" id="0x7f0803f5" />
-    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f0803f6" />
-    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f0803f7" />
-    <public type="drawable" name="ic_ternary_on_checked" id="0x7f0803f8" />
-    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f0803f9" />
-    <public type="drawable" name="img_nitro_splash_dark" id="0x7f0804b5" />
-    <public type="drawable" name="img_nitro_splash_light" id="0x7f0804b6" />
-    <public type="drawable" name="img_permission_prime" id="0x7f0804c2" />
-    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f0804dd" />
-    <public type="drawable" name="img_voice_no_connections_light" id="0x7f0804de" />
-    <public type="drawable" name="img_wump_trash_dark" id="0x7f0804e0" />
+    <public type="drawable" name="empty_pins_dark" id="0x7f0801cb" />
+    <public type="drawable" name="empty_pins_light" id="0x7f0801cc" />
+    <public type="drawable" name="ic_add_white_24dp" id="0x7f080216" />
+    <public type="drawable" name="ic_channel_pinned_message" id="0x7f080260" />
+    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7f0802a6" />
+    <public type="drawable" name="ic_file_acrobat" id="0x7f0802ce" />
+    <public type="drawable" name="ic_file_ae" id="0x7f0802cf" />
+    <public type="drawable" name="ic_file_ai" id="0x7f0802d0" />
+    <public type="drawable" name="ic_file_archive" id="0x7f0802d1" />
+    <public type="drawable" name="ic_file_code" id="0x7f0802d2" />
+    <public type="drawable" name="ic_file_document" id="0x7f0802d3" />
+    <public type="drawable" name="ic_file_sketch" id="0x7f0802d9" />
+    <public type="drawable" name="ic_file_spreadsheet" id="0x7f0802da" />
+    <public type="drawable" name="ic_file_unknown" id="0x7f0802db" />
+    <public type="drawable" name="ic_file_video" id="0x7f0802dd" />
+    <public type="drawable" name="ic_file_webcode" id="0x7f0802de" />
+    <public type="drawable" name="ic_group_edit" id="0x7f0802f2" />
+    <public type="drawable" name="ic_group_join" id="0x7f0802f3" />
+    <public type="drawable" name="ic_group_leave" id="0x7f0802f4" />
+    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7f080323" />
+    <public type="drawable" name="ic_img_selected_light_theme" id="0x7f080324" />
+    <public type="drawable" name="ic_role_lock" id="0x7f0803b8" />
+    <public type="drawable" name="ic_smiley_desaturated" id="0x7f0803da" />
+    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f0803f6" />
+    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f0803f7" />
+    <public type="drawable" name="ic_ternary_off_checked" id="0x7f0803f8" />
+    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f0803f9" />
+    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f0803fa" />
+    <public type="drawable" name="ic_ternary_on_checked" id="0x7f0803fb" />
+    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f0803fc" />
+    <public type="drawable" name="img_nitro_splash_dark" id="0x7f0804b8" />
+    <public type="drawable" name="img_nitro_splash_light" id="0x7f0804b9" />
+    <public type="drawable" name="img_permission_prime" id="0x7f0804c5" />
+    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f0804e0" />
+    <public type="drawable" name="img_voice_no_connections_light" id="0x7f0804e1" />
+    <public type="drawable" name="img_wump_trash_dark" id="0x7f0804e3" />
     <public type="drawable" name="asset_account_sync_twitch" id="0x7f080089" />
     <public type="drawable" name="asset_account_sync_youtube" id="0x7f08008a" />
     <public type="drawable" name="asset_default_avatar_32dp" id="0x7f08008d" />
@@ -3988,57 +3971,57 @@
     <public type="drawable" name="asset_group_full" id="0x7f080097" />
     <public type="drawable" name="asset_mfa_server" id="0x7f080098" />
     <public type="drawable" name="drawable_default_invite_splash" id="0x7f080141" />
-    <public type="drawable" name="ic_close_white_18dp" id="0x7f080287" />
-    <public type="drawable" name="ic_notification_24dp" id="0x7f080365" />
-    <public type="drawable" name="ic_notification_call_24dp" id="0x7f080366" />
-    <public type="drawable" name="ic_notification_friends_24dp" id="0x7f080367" />
-    <public type="drawable" name="ic_notification_message_24dp" id="0x7f080368" />
-    <public type="drawable" name="ic_search" id="0x7f0803b8" />
-    <public type="drawable" name="ic_send_white_24dp" id="0x7f0803bf" />
-    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f0803d3" />
-    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f080407" />
-    <public type="drawable" name="icon_flag_au" id="0x7f080444" />
-    <public type="drawable" name="icon_flag_bg" id="0x7f080445" />
-    <public type="drawable" name="icon_flag_cs" id="0x7f080446" />
-    <public type="drawable" name="icon_flag_da" id="0x7f080447" />
-    <public type="drawable" name="icon_flag_de" id="0x7f080448" />
-    <public type="drawable" name="icon_flag_el" id="0x7f080449" />
-    <public type="drawable" name="icon_flag_en_gb" id="0x7f08044a" />
-    <public type="drawable" name="icon_flag_en_us" id="0x7f08044b" />
-    <public type="drawable" name="icon_flag_es_es" id="0x7f08044c" />
-    <public type="drawable" name="icon_flag_eu" id="0x7f08044d" />
-    <public type="drawable" name="icon_flag_fi" id="0x7f08044e" />
-    <public type="drawable" name="icon_flag_fr" id="0x7f08044f" />
-    <public type="drawable" name="icon_flag_gb" id="0x7f080450" />
-    <public type="drawable" name="icon_flag_hk" id="0x7f080451" />
-    <public type="drawable" name="icon_flag_hr" id="0x7f080452" />
-    <public type="drawable" name="icon_flag_hu" id="0x7f080453" />
-    <public type="drawable" name="icon_flag_it" id="0x7f080454" />
-    <public type="drawable" name="icon_flag_ja" id="0x7f080455" />
-    <public type="drawable" name="icon_flag_ko" id="0x7f080456" />
-    <public type="drawable" name="icon_flag_lt" id="0x7f080457" />
-    <public type="drawable" name="icon_flag_nl" id="0x7f080458" />
-    <public type="drawable" name="icon_flag_no" id="0x7f080459" />
-    <public type="drawable" name="icon_flag_pl" id="0x7f08045a" />
-    <public type="drawable" name="icon_flag_pt_br" id="0x7f08045b" />
-    <public type="drawable" name="icon_flag_ro" id="0x7f08045c" />
-    <public type="drawable" name="icon_flag_ru" id="0x7f08045d" />
-    <public type="drawable" name="icon_flag_sg" id="0x7f08045e" />
-    <public type="drawable" name="icon_flag_sv_se" id="0x7f08045f" />
-    <public type="drawable" name="icon_flag_th" id="0x7f080460" />
-    <public type="drawable" name="icon_flag_tr" id="0x7f080461" />
-    <public type="drawable" name="icon_flag_uk" id="0x7f080462" />
-    <public type="drawable" name="icon_flag_unknown" id="0x7f080463" />
-    <public type="drawable" name="icon_flag_vi" id="0x7f080464" />
-    <public type="drawable" name="icon_flag_zh_cn" id="0x7f080465" />
-    <public type="drawable" name="icon_flag_zh_tw" id="0x7f080466" />
-    <public type="drawable" name="img_auth_bg_dark" id="0x7f080471" />
-    <public type="drawable" name="img_auth_bg_light" id="0x7f080472" />
-    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f08049a" />
-    <public type="drawable" name="img_gifting_pattern_light" id="0x7f08049b" />
-    <public type="drawable" name="img_landing_bg_dark" id="0x7f0804a1" />
-    <public type="drawable" name="img_landing_bg_light" id="0x7f0804a2" />
-    <public type="drawable" name="img_wumpus_custom_status" id="0x7f0804e3" />
+    <public type="drawable" name="ic_close_white_18dp" id="0x7f080288" />
+    <public type="drawable" name="ic_notification_24dp" id="0x7f080368" />
+    <public type="drawable" name="ic_notification_call_24dp" id="0x7f080369" />
+    <public type="drawable" name="ic_notification_friends_24dp" id="0x7f08036a" />
+    <public type="drawable" name="ic_notification_message_24dp" id="0x7f08036b" />
+    <public type="drawable" name="ic_search" id="0x7f0803bb" />
+    <public type="drawable" name="ic_send_white_24dp" id="0x7f0803c2" />
+    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f0803d6" />
+    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f08040a" />
+    <public type="drawable" name="icon_flag_au" id="0x7f080447" />
+    <public type="drawable" name="icon_flag_bg" id="0x7f080448" />
+    <public type="drawable" name="icon_flag_cs" id="0x7f080449" />
+    <public type="drawable" name="icon_flag_da" id="0x7f08044a" />
+    <public type="drawable" name="icon_flag_de" id="0x7f08044b" />
+    <public type="drawable" name="icon_flag_el" id="0x7f08044c" />
+    <public type="drawable" name="icon_flag_en_gb" id="0x7f08044d" />
+    <public type="drawable" name="icon_flag_en_us" id="0x7f08044e" />
+    <public type="drawable" name="icon_flag_es_es" id="0x7f08044f" />
+    <public type="drawable" name="icon_flag_eu" id="0x7f080450" />
+    <public type="drawable" name="icon_flag_fi" id="0x7f080451" />
+    <public type="drawable" name="icon_flag_fr" id="0x7f080452" />
+    <public type="drawable" name="icon_flag_gb" id="0x7f080453" />
+    <public type="drawable" name="icon_flag_hk" id="0x7f080454" />
+    <public type="drawable" name="icon_flag_hr" id="0x7f080455" />
+    <public type="drawable" name="icon_flag_hu" id="0x7f080456" />
+    <public type="drawable" name="icon_flag_it" id="0x7f080457" />
+    <public type="drawable" name="icon_flag_ja" id="0x7f080458" />
+    <public type="drawable" name="icon_flag_ko" id="0x7f080459" />
+    <public type="drawable" name="icon_flag_lt" id="0x7f08045a" />
+    <public type="drawable" name="icon_flag_nl" id="0x7f08045b" />
+    <public type="drawable" name="icon_flag_no" id="0x7f08045c" />
+    <public type="drawable" name="icon_flag_pl" id="0x7f08045d" />
+    <public type="drawable" name="icon_flag_pt_br" id="0x7f08045e" />
+    <public type="drawable" name="icon_flag_ro" id="0x7f08045f" />
+    <public type="drawable" name="icon_flag_ru" id="0x7f080460" />
+    <public type="drawable" name="icon_flag_sg" id="0x7f080461" />
+    <public type="drawable" name="icon_flag_sv_se" id="0x7f080462" />
+    <public type="drawable" name="icon_flag_th" id="0x7f080463" />
+    <public type="drawable" name="icon_flag_tr" id="0x7f080464" />
+    <public type="drawable" name="icon_flag_uk" id="0x7f080465" />
+    <public type="drawable" name="icon_flag_unknown" id="0x7f080466" />
+    <public type="drawable" name="icon_flag_vi" id="0x7f080467" />
+    <public type="drawable" name="icon_flag_zh_cn" id="0x7f080468" />
+    <public type="drawable" name="icon_flag_zh_tw" id="0x7f080469" />
+    <public type="drawable" name="img_auth_bg_dark" id="0x7f080474" />
+    <public type="drawable" name="img_auth_bg_light" id="0x7f080475" />
+    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f08049d" />
+    <public type="drawable" name="img_gifting_pattern_light" id="0x7f08049e" />
+    <public type="drawable" name="img_landing_bg_dark" id="0x7f0804a4" />
+    <public type="drawable" name="img_landing_bg_light" id="0x7f0804a5" />
+    <public type="drawable" name="img_wumpus_custom_status" id="0x7f0804e6" />
     <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7f080090" />
     <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7f080091" />
     <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7f080092" />
@@ -4048,20 +4031,20 @@
     <public type="drawable" name="asset_tooltip_server_create" id="0x7f0800a4" />
     <public type="drawable" name="bg_subscription_placeholder_pattern_dark" id="0x7f0800be" />
     <public type="drawable" name="bg_subscription_placeholder_pattern_light" id="0x7f0800bf" />
-    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7f08031b" />
-    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7f08031d" />
-    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7f08031f" />
-    <public type="drawable" name="icon_carrot" id="0x7f080443" />
-    <public type="drawable" name="icon_menu_copy" id="0x7f080467" />
-    <public type="drawable" name="icon_save" id="0x7f080468" />
-    <public type="drawable" name="img_auth_logo" id="0x7f080473" />
-    <public type="drawable" name="img_auth_logo_small" id="0x7f080474" />
-    <public type="drawable" name="img_channels_onboarding_dark" id="0x7f080482" />
-    <public type="drawable" name="img_channels_onboarding_light" id="0x7f080483" />
-    <public type="drawable" name="img_game_presence_nux" id="0x7f080495" />
-    <public type="drawable" name="img_loading_logo" id="0x7f0804a3" />
-    <public type="drawable" name="img_overlay_nux" id="0x7f0804c1" />
-    <public type="drawable" name="img_voice_onboarding" id="0x7f0804df" />
+    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7f08031c" />
+    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7f08031e" />
+    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7f080320" />
+    <public type="drawable" name="icon_carrot" id="0x7f080446" />
+    <public type="drawable" name="icon_menu_copy" id="0x7f08046a" />
+    <public type="drawable" name="icon_save" id="0x7f08046b" />
+    <public type="drawable" name="img_auth_logo" id="0x7f080476" />
+    <public type="drawable" name="img_auth_logo_small" id="0x7f080477" />
+    <public type="drawable" name="img_channels_onboarding_dark" id="0x7f080485" />
+    <public type="drawable" name="img_channels_onboarding_light" id="0x7f080486" />
+    <public type="drawable" name="img_game_presence_nux" id="0x7f080498" />
+    <public type="drawable" name="img_loading_logo" id="0x7f0804a6" />
+    <public type="drawable" name="img_overlay_nux" id="0x7f0804c4" />
+    <public type="drawable" name="img_voice_onboarding" id="0x7f0804e2" />
     <public type="drawable" name="$bg_premium_classic_subscription_header__0" id="0x7f080006" />
     <public type="drawable" name="$bg_premium_guild_subscription_header__0" id="0x7f080007" />
     <public type="drawable" name="$bg_premium_guild_subscription_header_error__0" id="0x7f080008" />
@@ -4413,2452 +4396,2457 @@
     <public type="id" name="call_participants_hidden" id="0x7f0a012f" />
     <public type="id" name="call_participants_show_button" id="0x7f0a0130" />
     <public type="id" name="call_pip" id="0x7f0a0131" />
-    <public type="id" name="call_user_item_avatar" id="0x7f0a0132" />
-    <public type="id" name="call_video_recycler" id="0x7f0a0133" />
-    <public type="id" name="camera1" id="0x7f0a0134" />
-    <public type="id" name="camera2" id="0x7f0a0135" />
-    <public type="id" name="camera_capacity_body" id="0x7f0a0136" />
-    <public type="id" name="camera_capacity_confirm" id="0x7f0a0137" />
-    <public type="id" name="camera_container" id="0x7f0a0138" />
-    <public type="id" name="camera_facing_btn" id="0x7f0a0139" />
-    <public type="id" name="camera_flash_btn" id="0x7f0a013a" />
-    <public type="id" name="camera_view" id="0x7f0a013b" />
-    <public type="id" name="cancel_action" id="0x7f0a013c" />
-    <public type="id" name="cancel_button" id="0x7f0a013d" />
-    <public type="id" name="category_override_name" id="0x7f0a013e" />
-    <public type="id" name="category_override_status" id="0x7f0a013f" />
-    <public type="id" name="category_overview_name" id="0x7f0a0140" />
-    <public type="id" name="center" id="0x7f0a0141" />
-    <public type="id" name="centerCrop" id="0x7f0a0142" />
-    <public type="id" name="centerInside" id="0x7f0a0143" />
-    <public type="id" name="center_horizontal" id="0x7f0a0144" />
-    <public type="id" name="center_vertical" id="0x7f0a0145" />
-    <public type="id" name="chains" id="0x7f0a0146" />
-    <public type="id" name="change_log_body" id="0x7f0a0147" />
-    <public type="id" name="change_log_contents" id="0x7f0a0148" />
-    <public type="id" name="change_log_facebook" id="0x7f0a0149" />
-    <public type="id" name="change_log_instagram" id="0x7f0a014a" />
-    <public type="id" name="change_log_scrollview" id="0x7f0a014b" />
-    <public type="id" name="change_log_thumbnail" id="0x7f0a014c" />
-    <public type="id" name="change_log_twitter" id="0x7f0a014d" />
-    <public type="id" name="change_log_video" id="0x7f0a014e" />
-    <public type="id" name="change_log_video_overlay" id="0x7f0a014f" />
-    <public type="id" name="change_password_current_password_input" id="0x7f0a0150" />
-    <public type="id" name="change_password_new_password_input" id="0x7f0a0151" />
-    <public type="id" name="change_password_save" id="0x7f0a0152" />
-    <public type="id" name="change_password_two_factor" id="0x7f0a0153" />
-    <public type="id" name="channel_actions_view" id="0x7f0a0154" />
-    <public type="id" name="channel_follow_channel_dropdown_icon" id="0x7f0a0155" />
-    <public type="id" name="channel_follow_channel_name" id="0x7f0a0156" />
-    <public type="id" name="channel_follow_error_text" id="0x7f0a0157" />
-    <public type="id" name="channel_follow_guild_dropdown_icon" id="0x7f0a0158" />
-    <public type="id" name="channel_follow_guild_icon" id="0x7f0a0159" />
-    <public type="id" name="channel_follow_select_channel" id="0x7f0a015a" />
-    <public type="id" name="channel_follow_select_guild" id="0x7f0a015b" />
-    <public type="id" name="channel_follow_selected_channel_name" id="0x7f0a015c" />
-    <public type="id" name="channel_follow_selected_guild_name" id="0x7f0a015d" />
-    <public type="id" name="channel_follow_success_confirm" id="0x7f0a015e" />
-    <public type="id" name="channel_follow_success_image" id="0x7f0a015f" />
-    <public type="id" name="channel_follow_success_text" id="0x7f0a0160" />
-    <public type="id" name="channel_list_item_private_status" id="0x7f0a0161" />
-    <public type="id" name="channel_members_list_item_add" id="0x7f0a0162" />
-    <public type="id" name="channel_members_list_item_add_title" id="0x7f0a0163" />
-    <public type="id" name="channel_members_list_item_avatar" id="0x7f0a0164" />
-    <public type="id" name="channel_members_list_item_boosted_indicator" id="0x7f0a0165" />
-    <public type="id" name="channel_members_list_item_game" id="0x7f0a0166" />
-    <public type="id" name="channel_members_list_item_group_owner_indicator" id="0x7f0a0167" />
-    <public type="id" name="channel_members_list_item_header_placeholder" id="0x7f0a0168" />
-    <public type="id" name="channel_members_list_item_header_text" id="0x7f0a0169" />
-    <public type="id" name="channel_members_list_item_name" id="0x7f0a016a" />
-    <public type="id" name="channel_members_list_item_presence" id="0x7f0a016b" />
-    <public type="id" name="channel_members_list_item_rich_presence_iv" id="0x7f0a016c" />
-    <public type="id" name="channel_notification_settings_system" id="0x7f0a016d" />
-    <public type="id" name="channel_notifications_mute_settings_view" id="0x7f0a016e" />
-    <public type="id" name="channel_override_category_name" id="0x7f0a016f" />
-    <public type="id" name="channel_override_name" id="0x7f0a0170" />
-    <public type="id" name="channel_override_status" id="0x7f0a0171" />
-    <public type="id" name="channel_permission_general_create_instant_invite" id="0x7f0a0172" />
-    <public type="id" name="channel_permission_general_manage_channel" id="0x7f0a0173" />
-    <public type="id" name="channel_permission_general_manage_permissions" id="0x7f0a0174" />
-    <public type="id" name="channel_permission_general_manage_webhooks" id="0x7f0a0175" />
-    <public type="id" name="channel_permission_text_add_reactions" id="0x7f0a0176" />
-    <public type="id" name="channel_permission_text_attach_files" id="0x7f0a0177" />
-    <public type="id" name="channel_permission_text_embed_links" id="0x7f0a0178" />
-    <public type="id" name="channel_permission_text_manage_messages" id="0x7f0a0179" />
-    <public type="id" name="channel_permission_text_mention_everyone" id="0x7f0a017a" />
-    <public type="id" name="channel_permission_text_read_message_history" id="0x7f0a017b" />
-    <public type="id" name="channel_permission_text_read_messages" id="0x7f0a017c" />
-    <public type="id" name="channel_permission_text_send_messages" id="0x7f0a017d" />
-    <public type="id" name="channel_permission_text_send_tts_messages" id="0x7f0a017e" />
-    <public type="id" name="channel_permission_text_use_external_emojis" id="0x7f0a017f" />
-    <public type="id" name="channel_permission_voice_connect" id="0x7f0a0180" />
-    <public type="id" name="channel_permission_voice_deafen_members" id="0x7f0a0181" />
-    <public type="id" name="channel_permission_voice_move_members" id="0x7f0a0182" />
-    <public type="id" name="channel_permission_voice_mute_members" id="0x7f0a0183" />
-    <public type="id" name="channel_permission_voice_speak" id="0x7f0a0184" />
-    <public type="id" name="channel_permission_voice_use_vad" id="0x7f0a0185" />
-    <public type="id" name="channel_permissions_avatar" id="0x7f0a0186" />
-    <public type="id" name="channel_permissions_channel_name" id="0x7f0a0187" />
-    <public type="id" name="channel_permissions_save" id="0x7f0a0188" />
-    <public type="id" name="channel_permissions_target_name" id="0x7f0a0189" />
-    <public type="id" name="channel_permissions_text_container" id="0x7f0a018a" />
-    <public type="id" name="channel_permissions_voice_container" id="0x7f0a018b" />
-    <public type="id" name="channel_pinned_messages_recycler" id="0x7f0a018c" />
-    <public type="id" name="channel_selector_item_name" id="0x7f0a018d" />
-    <public type="id" name="channel_selector_list" id="0x7f0a018e" />
-    <public type="id" name="channel_settings_cannot_delete_body" id="0x7f0a018f" />
-    <public type="id" name="channel_settings_cannot_delete_confirm" id="0x7f0a0190" />
-    <public type="id" name="channel_settings_cannot_delete_title" id="0x7f0a0191" />
-    <public type="id" name="channel_settings_delete_body" id="0x7f0a0192" />
-    <public type="id" name="channel_settings_delete_cancel" id="0x7f0a0193" />
-    <public type="id" name="channel_settings_delete_confirm" id="0x7f0a0194" />
-    <public type="id" name="channel_settings_delete_title" id="0x7f0a0195" />
-    <public type="id" name="channel_settings_edit_name" id="0x7f0a0196" />
-    <public type="id" name="channel_settings_edit_topic" id="0x7f0a0197" />
-    <public type="id" name="channel_settings_edit_wrap" id="0x7f0a0198" />
-    <public type="id" name="channel_settings_notifications_frequency_0" id="0x7f0a0199" />
-    <public type="id" name="channel_settings_notifications_frequency_1" id="0x7f0a019a" />
-    <public type="id" name="channel_settings_notifications_frequency_2" id="0x7f0a019b" />
-    <public type="id" name="channel_settings_notifications_frequency_wrap" id="0x7f0a019c" />
-    <public type="id" name="channel_settings_nsfw" id="0x7f0a019d" />
-    <public type="id" name="channel_settings_permissions" id="0x7f0a019e" />
-    <public type="id" name="channel_settings_permissions_add_member_name_search" id="0x7f0a019f" />
-    <public type="id" name="channel_settings_permissions_add_member_recycler" id="0x7f0a01a0" />
-    <public type="id" name="channel_settings_permissions_add_member_view_flipper" id="0x7f0a01a1" />
-    <public type="id" name="channel_settings_permissions_add_role_recycler" id="0x7f0a01a2" />
-    <public type="id" name="channel_settings_permissions_overview_add_member" id="0x7f0a01a3" />
-    <public type="id" name="channel_settings_permissions_overview_add_role" id="0x7f0a01a4" />
-    <public type="id" name="channel_settings_permissions_overview_members_container" id="0x7f0a01a5" />
-    <public type="id" name="channel_settings_permissions_overview_roles_container" id="0x7f0a01a6" />
-    <public type="id" name="channel_settings_pinned_messages" id="0x7f0a01a7" />
-    <public type="id" name="channel_settings_pinned_messages_container" id="0x7f0a01a8" />
-    <public type="id" name="channel_settings_pinned_messages_disabled_overlay" id="0x7f0a01a9" />
-    <public type="id" name="channel_settings_save" id="0x7f0a01aa" />
-    <public type="id" name="channel_settings_section_privacy_safety" id="0x7f0a01ab" />
-    <public type="id" name="channel_settings_section_slow_mode" id="0x7f0a01ac" />
-    <public type="id" name="channel_settings_section_user_management" id="0x7f0a01ad" />
-    <public type="id" name="channel_settings_slow_mode_cooldown_label" id="0x7f0a01ae" />
-    <public type="id" name="channel_settings_slow_mode_cooldown_slider" id="0x7f0a01af" />
-    <public type="id" name="channel_settings_slowmode_label" id="0x7f0a01b0" />
-    <public type="id" name="channel_sidebar_actions_notifications" id="0x7f0a01b1" />
-    <public type="id" name="channel_sidebar_actions_pins" id="0x7f0a01b2" />
-    <public type="id" name="channel_sidebar_actions_search" id="0x7f0a01b3" />
-    <public type="id" name="channel_sidebar_actions_settings" id="0x7f0a01b4" />
-    <public type="id" name="channel_spinner_dropdown_item_textview" id="0x7f0a01b5" />
-    <public type="id" name="channel_spinner_item_textview" id="0x7f0a01b6" />
-    <public type="id" name="channel_topic" id="0x7f0a01b7" />
-    <public type="id" name="channel_topic_channel_icon" id="0x7f0a01b8" />
-    <public type="id" name="channel_topic_ellipsis" id="0x7f0a01b9" />
-    <public type="id" name="channel_topic_more_icon" id="0x7f0a01ba" />
-    <public type="id" name="channel_topic_name" id="0x7f0a01bb" />
-    <public type="id" name="channel_topic_title" id="0x7f0a01bc" />
-    <public type="id" name="channels_item_category_add" id="0x7f0a01bd" />
-    <public type="id" name="channels_item_category_arrow" id="0x7f0a01be" />
-    <public type="id" name="channels_item_category_name" id="0x7f0a01bf" />
-    <public type="id" name="channels_item_channel_hash" id="0x7f0a01c0" />
-    <public type="id" name="channels_item_channel_mentions" id="0x7f0a01c1" />
-    <public type="id" name="channels_item_channel_name" id="0x7f0a01c2" />
-    <public type="id" name="channels_item_channel_unread" id="0x7f0a01c3" />
-    <public type="id" name="channels_item_voice_channel_name" id="0x7f0a01c4" />
-    <public type="id" name="channels_item_voice_channel_speaker" id="0x7f0a01c5" />
-    <public type="id" name="channels_item_voice_channel_user_limit" id="0x7f0a01c6" />
-    <public type="id" name="channels_item_voice_user_avatar" id="0x7f0a01c7" />
-    <public type="id" name="channels_item_voice_user_camera" id="0x7f0a01c8" />
-    <public type="id" name="channels_item_voice_user_headphones" id="0x7f0a01c9" />
-    <public type="id" name="channels_item_voice_user_live" id="0x7f0a01ca" />
-    <public type="id" name="channels_item_voice_user_microphone" id="0x7f0a01cb" />
-    <public type="id" name="channels_item_voice_user_name" id="0x7f0a01cc" />
-    <public type="id" name="channels_list" id="0x7f0a01cd" />
-    <public type="id" name="channels_list_actions_change_nickname_cancel" id="0x7f0a01ce" />
-    <public type="id" name="channels_list_actions_change_nickname_edit_text" id="0x7f0a01cf" />
-    <public type="id" name="channels_list_actions_change_nickname_reset" id="0x7f0a01d0" />
-    <public type="id" name="channels_list_actions_change_nickname_save" id="0x7f0a01d1" />
-    <public type="id" name="channels_list_banner" id="0x7f0a01d2" />
-    <public type="id" name="channels_list_banner_foreground" id="0x7f0a01d3" />
-    <public type="id" name="channels_list_direct_messages_title" id="0x7f0a01d4" />
-    <public type="id" name="channels_list_header" id="0x7f0a01d5" />
-    <public type="id" name="channels_list_item_header" id="0x7f0a01d6" />
-    <public type="id" name="channels_list_item_mfa_text" id="0x7f0a01d7" />
-    <public type="id" name="channels_list_item_private_avatar" id="0x7f0a01d8" />
-    <public type="id" name="channels_list_item_private_desc" id="0x7f0a01d9" />
-    <public type="id" name="channels_list_item_private_mentions" id="0x7f0a01da" />
-    <public type="id" name="channels_list_item_private_name" id="0x7f0a01db" />
-    <public type="id" name="channels_list_item_private_tag" id="0x7f0a01dc" />
-    <public type="id" name="channels_list_item_text_actions_channel_notifications" id="0x7f0a01dd" />
-    <public type="id" name="channels_list_item_text_actions_channel_settings" id="0x7f0a01de" />
-    <public type="id" name="channels_list_item_text_actions_copy_id" id="0x7f0a01df" />
-    <public type="id" name="channels_list_item_text_actions_developer_divider" id="0x7f0a01e0" />
-    <public type="id" name="channels_list_item_text_actions_icon" id="0x7f0a01e1" />
-    <public type="id" name="channels_list_item_text_actions_invite" id="0x7f0a01e2" />
-    <public type="id" name="channels_list_item_text_actions_mark_as_read" id="0x7f0a01e3" />
-    <public type="id" name="channels_list_item_text_actions_mute" id="0x7f0a01e4" />
-    <public type="id" name="channels_list_item_text_actions_profile" id="0x7f0a01e5" />
-    <public type="id" name="channels_list_item_text_actions_title" id="0x7f0a01e6" />
-    <public type="id" name="channels_list_new" id="0x7f0a01e7" />
-    <public type="id" name="channels_list_premium_guild_hint" id="0x7f0a01e8" />
-    <public type="id" name="channels_list_premium_guild_hint_button" id="0x7f0a01e9" />
-    <public type="id" name="channels_list_premium_guild_hint_subtitle" id="0x7f0a01ea" />
-    <public type="id" name="channels_list_premium_guild_hint_title" id="0x7f0a01eb" />
-    <public type="id" name="channels_list_private_channels_header" id="0x7f0a01ec" />
-    <public type="id" name="channels_list_search" id="0x7f0a01ed" />
-    <public type="id" name="channels_list_start_group" id="0x7f0a01ee" />
-    <public type="id" name="channels_list_tooltip_background" id="0x7f0a01ef" />
-    <public type="id" name="channels_list_tooltip_top_tail" id="0x7f0a01f0" />
-    <public type="id" name="channels_list_unreads" id="0x7f0a01f1" />
-    <public type="id" name="channels_list_unreads_background" id="0x7f0a01f2" />
-    <public type="id" name="channels_list_unreads_stub" id="0x7f0a01f3" />
-    <public type="id" name="channels_toolbar" id="0x7f0a01f4" />
-    <public type="id" name="chat_action_item_image" id="0x7f0a01f5" />
-    <public type="id" name="chat_action_item_text" id="0x7f0a01f6" />
-    <public type="id" name="chat_input_container" id="0x7f0a01f7" />
-    <public type="id" name="chat_input_edit" id="0x7f0a01f8" />
-    <public type="id" name="chat_input_edit_border" id="0x7f0a01f9" />
-    <public type="id" name="chat_input_edit_cancel" id="0x7f0a01fa" />
-    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7f0a01fb" />
-    <public type="id" name="chat_input_emoji_picker_view_flipper" id="0x7f0a01fc" />
-    <public type="id" name="chat_input_guard" id="0x7f0a01fd" />
-    <public type="id" name="chat_input_guard_action" id="0x7f0a01fe" />
-    <public type="id" name="chat_input_guard_action_secondary" id="0x7f0a01ff" />
-    <public type="id" name="chat_input_guard_subtext" id="0x7f0a0200" />
-    <public type="id" name="chat_input_guard_text" id="0x7f0a0201" />
-    <public type="id" name="chat_input_item_avatar" id="0x7f0a0202" />
-    <public type="id" name="chat_input_item_emoji" id="0x7f0a0203" />
-    <public type="id" name="chat_input_item_icon_container" id="0x7f0a0204" />
-    <public type="id" name="chat_input_item_name" id="0x7f0a0205" />
-    <public type="id" name="chat_input_item_name_right" id="0x7f0a0206" />
-    <public type="id" name="chat_input_item_status" id="0x7f0a0207" />
-    <public type="id" name="chat_input_mentions_recycler" id="0x7f0a0208" />
-    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7f0a0209" />
-    <public type="id" name="chat_input_upload_too_large_help" id="0x7f0a020a" />
-    <public type="id" name="chat_input_widget" id="0x7f0a020b" />
-    <public type="id" name="chat_input_wrap" id="0x7f0a020c" />
-    <public type="id" name="chat_list_adapter_item_alert_text" id="0x7f0a020d" />
-    <public type="id" name="chat_list_adapter_item_blocked" id="0x7f0a020e" />
-    <public type="id" name="chat_list_adapter_item_call_icon" id="0x7f0a020f" />
-    <public type="id" name="chat_list_adapter_item_call_participants" id="0x7f0a0210" />
-    <public type="id" name="chat_list_adapter_item_call_subtitle" id="0x7f0a0211" />
-    <public type="id" name="chat_list_adapter_item_call_title" id="0x7f0a0212" />
-    <public type="id" name="chat_list_adapter_item_call_unjoined_ongoing_subtitle" id="0x7f0a0213" />
-    <public type="id" name="chat_list_adapter_item_edit_channel" id="0x7f0a0214" />
-    <public type="id" name="chat_list_adapter_item_failed" id="0x7f0a0215" />
-    <public type="id" name="chat_list_adapter_item_failed_upload_list" id="0x7f0a0216" />
-    <public type="id" name="chat_list_adapter_item_header" id="0x7f0a0217" />
-    <public type="id" name="chat_list_adapter_item_private_channel_start_header" id="0x7f0a0218" />
-    <public type="id" name="chat_list_adapter_item_private_channel_start_image" id="0x7f0a0219" />
-    <public type="id" name="chat_list_adapter_item_private_channel_start_text" id="0x7f0a021a" />
-    <public type="id" name="chat_list_adapter_item_sticker_lottie" id="0x7f0a021b" />
-    <public type="id" name="chat_list_adapter_item_sticker_lottie_progress" id="0x7f0a021c" />
-    <public type="id" name="chat_list_adapter_item_sticker_png" id="0x7f0a021d" />
-    <public type="id" name="chat_list_adapter_item_subheader" id="0x7f0a021e" />
-    <public type="id" name="chat_list_adapter_item_system_icon" id="0x7f0a021f" />
-    <public type="id" name="chat_list_adapter_item_system_text" id="0x7f0a0220" />
-    <public type="id" name="chat_list_adapter_item_system_timestamp" id="0x7f0a0221" />
-    <public type="id" name="chat_list_adapter_item_text" id="0x7f0a0222" />
-    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7f0a0223" />
-    <public type="id" name="chat_list_adapter_item_text_header" id="0x7f0a0224" />
-    <public type="id" name="chat_list_adapter_item_text_name" id="0x7f0a0225" />
-    <public type="id" name="chat_list_adapter_item_text_tag" id="0x7f0a0226" />
-    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7f0a0227" />
-    <public type="id" name="chat_list_adapter_item_unjoined_call_duration" id="0x7f0a0228" />
-    <public type="id" name="chat_list_empty_image" id="0x7f0a0229" />
-    <public type="id" name="chat_list_empty_pins_text" id="0x7f0a022a" />
-    <public type="id" name="chat_list_item_attachment_barrier" id="0x7f0a022b" />
-    <public type="id" name="chat_list_item_attachment_card" id="0x7f0a022c" />
-    <public type="id" name="chat_list_item_attachment_description" id="0x7f0a022d" />
-    <public type="id" name="chat_list_item_attachment_download" id="0x7f0a022e" />
-    <public type="id" name="chat_list_item_attachment_icon" id="0x7f0a022f" />
-    <public type="id" name="chat_list_item_attachment_inline_media" id="0x7f0a0230" />
-    <public type="id" name="chat_list_item_attachment_name" id="0x7f0a0231" />
-    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7f0a0232" />
-    <public type="id" name="chat_list_item_divider_stroke_left" id="0x7f0a0233" />
-    <public type="id" name="chat_list_item_divider_stroke_right" id="0x7f0a0234" />
-    <public type="id" name="chat_list_item_divider_text" id="0x7f0a0235" />
-    <public type="id" name="chat_list_item_embed_author_icon" id="0x7f0a0236" />
-    <public type="id" name="chat_list_item_embed_author_text" id="0x7f0a0237" />
-    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7f0a0238" />
-    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7f0a0239" />
-    <public type="id" name="chat_list_item_embed_container_card" id="0x7f0a023a" />
-    <public type="id" name="chat_list_item_embed_content" id="0x7f0a023b" />
-    <public type="id" name="chat_list_item_embed_description" id="0x7f0a023c" />
-    <public type="id" name="chat_list_item_embed_divider" id="0x7f0a023d" />
-    <public type="id" name="chat_list_item_embed_field_name" id="0x7f0a023e" />
-    <public type="id" name="chat_list_item_embed_field_value" id="0x7f0a023f" />
-    <public type="id" name="chat_list_item_embed_fields" id="0x7f0a0240" />
-    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7f0a0241" />
-    <public type="id" name="chat_list_item_embed_footer_text" id="0x7f0a0242" />
-    <public type="id" name="chat_list_item_embed_image" id="0x7f0a0243" />
-    <public type="id" name="chat_list_item_embed_image_icons" id="0x7f0a0244" />
-    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7f0a0245" />
-    <public type="id" name="chat_list_item_embed_provider" id="0x7f0a0246" />
-    <public type="id" name="chat_list_item_embed_spoiler" id="0x7f0a0247" />
-    <public type="id" name="chat_list_item_embed_title" id="0x7f0a0248" />
-    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7f0a0249" />
-    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7f0a024a" />
-    <public type="id" name="chat_list_item_message_header_channel" id="0x7f0a024b" />
-    <public type="id" name="chat_list_item_message_header_divider" id="0x7f0a024c" />
-    <public type="id" name="chat_list_item_message_header_guild" id="0x7f0a024d" />
-    <public type="id" name="chat_list_item_message_header_spacer" id="0x7f0a024e" />
-    <public type="id" name="chat_list_item_reactions" id="0x7f0a024f" />
-    <public type="id" name="chat_list_recycler" id="0x7f0a0250" />
-    <public type="id" name="chat_list_search_empty_image" id="0x7f0a0251" />
-    <public type="id" name="chat_list_search_error_text" id="0x7f0a0252" />
-    <public type="id" name="chat_list_search_indexing_animation" id="0x7f0a0253" />
-    <public type="id" name="chat_list_search_indexing_text" id="0x7f0a0254" />
-    <public type="id" name="chat_overlay_old_messages_fab" id="0x7f0a0255" />
-    <public type="id" name="chat_overlay_typing" id="0x7f0a0256" />
-    <public type="id" name="chat_overlay_typing_dots" id="0x7f0a0257" />
-    <public type="id" name="chat_typing_users_slowmode" id="0x7f0a0258" />
-    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7f0a0259" />
-    <public type="id" name="chat_typing_users_typing" id="0x7f0a025a" />
-    <public type="id" name="chat_upload_1" id="0x7f0a025b" />
-    <public type="id" name="chat_upload_2" id="0x7f0a025c" />
-    <public type="id" name="chat_upload_3" id="0x7f0a025d" />
-    <public type="id" name="check" id="0x7f0a025e" />
-    <public type="id" name="checkable_off_container" id="0x7f0a025f" />
-    <public type="id" name="checkbox" id="0x7f0a0260" />
-    <public type="id" name="checkboxes_container" id="0x7f0a0261" />
-    <public type="id" name="checked" id="0x7f0a0262" />
-    <public type="id" name="chip" id="0x7f0a0263" />
-    <public type="id" name="chip1" id="0x7f0a0264" />
-    <public type="id" name="chip2" id="0x7f0a0265" />
-    <public type="id" name="chip3" id="0x7f0a0266" />
-    <public type="id" name="chip_group" id="0x7f0a0267" />
-    <public type="id" name="chip_image" id="0x7f0a0268" />
-    <public type="id" name="chip_text" id="0x7f0a0269" />
-    <public type="id" name="chronometer" id="0x7f0a026a" />
-    <public type="id" name="circle" id="0x7f0a026b" />
-    <public type="id" name="circular" id="0x7f0a026c" />
-    <public type="id" name="clear_text" id="0x7f0a026d" />
-    <public type="id" name="client_outdated_anchor_wrap" id="0x7f0a026e" />
-    <public type="id" name="client_outdated_update" id="0x7f0a026f" />
-    <public type="id" name="clip_horizontal" id="0x7f0a0270" />
-    <public type="id" name="clip_vertical" id="0x7f0a0271" />
-    <public type="id" name="close" id="0x7f0a0272" />
-    <public type="id" name="cloudy" id="0x7f0a0273" />
-    <public type="id" name="collapseActionView" id="0x7f0a0274" />
-    <public type="id" name="collapsing_toolbar" id="0x7f0a0275" />
-    <public type="id" name="column" id="0x7f0a0276" />
-    <public type="id" name="column_reverse" id="0x7f0a0277" />
-    <public type="id" name="confirm_button" id="0x7f0a0278" />
-    <public type="id" name="connected_account_actions_dialog_copy_username" id="0x7f0a0279" />
-    <public type="id" name="connected_account_actions_dialog_header" id="0x7f0a027a" />
-    <public type="id" name="connected_account_actions_dialog_open_in_browser" id="0x7f0a027b" />
-    <public type="id" name="connected_account_disconnect" id="0x7f0a027c" />
-    <public type="id" name="connected_account_display_activity_switch" id="0x7f0a027d" />
-    <public type="id" name="connected_account_display_switch" id="0x7f0a027e" />
-    <public type="id" name="connected_account_divider" id="0x7f0a027f" />
-    <public type="id" name="connected_account_extra_info" id="0x7f0a0280" />
-    <public type="id" name="connected_account_img" id="0x7f0a0281" />
-    <public type="id" name="connected_account_name" id="0x7f0a0282" />
-    <public type="id" name="connected_account_sync_friends_switch" id="0x7f0a0283" />
-    <public type="id" name="connections_empty" id="0x7f0a0284" />
-    <public type="id" name="connections_recycler" id="0x7f0a0285" />
-    <public type="id" name="connections_xbox_code" id="0x7f0a0286" />
-    <public type="id" name="connections_xbox_login" id="0x7f0a0287" />
-    <public type="id" name="contact" id="0x7f0a0288" />
-    <public type="id" name="container" id="0x7f0a0289" />
-    <public type="id" name="content" id="0x7f0a028a" />
-    <public type="id" name="contentPanel" id="0x7f0a028b" />
-    <public type="id" name="content_iv" id="0x7f0a028c" />
-    <public type="id" name="content_pager" id="0x7f0a028d" />
-    <public type="id" name="content_tabs" id="0x7f0a028e" />
-    <public type="id" name="coordinator" id="0x7f0a028f" />
-    <public type="id" name="cpv_color_image_view" id="0x7f0a0290" />
-    <public type="id" name="cpv_color_panel_new" id="0x7f0a0291" />
-    <public type="id" name="cpv_color_panel_old" id="0x7f0a0292" />
-    <public type="id" name="cpv_color_panel_view" id="0x7f0a0293" />
-    <public type="id" name="cpv_color_picker_content" id="0x7f0a0294" />
-    <public type="id" name="cpv_color_picker_custom_button" id="0x7f0a0295" />
-    <public type="id" name="cpv_color_picker_custom_reset" id="0x7f0a0296" />
-    <public type="id" name="cpv_color_picker_select_button" id="0x7f0a0297" />
-    <public type="id" name="cpv_color_picker_title" id="0x7f0a0298" />
-    <public type="id" name="cpv_color_picker_view" id="0x7f0a0299" />
-    <public type="id" name="cpv_hex" id="0x7f0a029a" />
-    <public type="id" name="cpv_hex_container" id="0x7f0a029b" />
-    <public type="id" name="cpv_hex_prefix" id="0x7f0a029c" />
-    <public type="id" name="cpv_preference_preview_color_panel" id="0x7f0a029d" />
-    <public type="id" name="create_channel_follower_button" id="0x7f0a029e" />
-    <public type="id" name="create_channel_name_layout" id="0x7f0a029f" />
-    <public type="id" name="create_channel_private_container" id="0x7f0a02a0" />
-    <public type="id" name="create_channel_private_info" id="0x7f0a02a1" />
-    <public type="id" name="create_channel_private_switch" id="0x7f0a02a2" />
-    <public type="id" name="create_channel_private_title" id="0x7f0a02a3" />
-    <public type="id" name="create_channel_role_access_recycler" id="0x7f0a02a4" />
-    <public type="id" name="create_channel_role_header" id="0x7f0a02a5" />
-    <public type="id" name="create_channel_text_container" id="0x7f0a02a6" />
-    <public type="id" name="create_channel_text_radio" id="0x7f0a02a7" />
-    <public type="id" name="create_channel_type_container" id="0x7f0a02a8" />
-    <public type="id" name="create_channel_voice_container" id="0x7f0a02a9" />
-    <public type="id" name="create_channel_voice_radio" id="0x7f0a02aa" />
-    <public type="id" name="credit_header" id="0x7f0a02ab" />
-    <public type="id" name="credit_icon" id="0x7f0a02ac" />
-    <public type="id" name="credit_info" id="0x7f0a02ad" />
-    <public type="id" name="credit_info_container" id="0x7f0a02ae" />
-    <public type="id" name="credit_nitro" id="0x7f0a02af" />
-    <public type="id" name="credit_nitro_classic" id="0x7f0a02b0" />
-    <public type="id" name="credit_nitro_divider" id="0x7f0a02b1" />
-    <public type="id" name="credit_time" id="0x7f0a02b2" />
-    <public type="id" name="current_bitrate_display" id="0x7f0a02b3" />
-    <public type="id" name="current_user_limit_display" id="0x7f0a02b4" />
-    <public type="id" name="custom" id="0x7f0a02b5" />
-    <public type="id" name="customPanel" id="0x7f0a02b6" />
-    <public type="id" name="cut" id="0x7f0a02b7" />
-    <public type="id" name="dark" id="0x7f0a02b8" />
-    <public type="id" name="date" id="0x7f0a02b9" />
-    <public type="id" name="date_picker_actions" id="0x7f0a02ba" />
-    <public type="id" name="daylight" id="0x7f0a02bb" />
-    <public type="id" name="debugging_item_log_message" id="0x7f0a02bc" />
-    <public type="id" name="debugging_logs" id="0x7f0a02bd" />
-    <public type="id" name="decor_content_parent" id="0x7f0a02be" />
-    <public type="id" name="default_activity_button" id="0x7f0a02bf" />
-    <public type="id" name="default_tooltip_text" id="0x7f0a02c0" />
-    <public type="id" name="demote_common_words" id="0x7f0a02c1" />
-    <public type="id" name="demote_rfc822_hostnames" id="0x7f0a02c2" />
-    <public type="id" name="design_bottom_sheet" id="0x7f0a02c3" />
-    <public type="id" name="design_menu_item_action_area" id="0x7f0a02c4" />
-    <public type="id" name="design_menu_item_action_area_stub" id="0x7f0a02c5" />
-    <public type="id" name="design_menu_item_text" id="0x7f0a02c6" />
-    <public type="id" name="design_navigation_view" id="0x7f0a02c7" />
-    <public type="id" name="dev_settings_experiment_item_bucket_spinner" id="0x7f0a02c8" />
-    <public type="id" name="dev_settings_experiment_item_name" id="0x7f0a02c9" />
-    <public type="id" name="developer_settings_experiments" id="0x7f0a02ca" />
-    <public type="id" name="developer_settings_notices" id="0x7f0a02cb" />
-    <public type="id" name="deviceDefault" id="0x7f0a02cc" />
-    <public type="id" name="dialog_button" id="0x7f0a02cd" />
-    <public type="id" name="dialog_cancel" id="0x7f0a02ce" />
-    <public type="id" name="dialog_card" id="0x7f0a02cf" />
-    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7f0a02d0" />
-    <public type="id" name="dialog_chat_actions_container" id="0x7f0a02d1" />
-    <public type="id" name="dialog_chat_actions_copy" id="0x7f0a02d2" />
-    <public type="id" name="dialog_chat_actions_copy_id" id="0x7f0a02d3" />
-    <public type="id" name="dialog_chat_actions_delete" id="0x7f0a02d4" />
-    <public type="id" name="dialog_chat_actions_edit" id="0x7f0a02d5" />
-    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7f0a02d6" />
-    <public type="id" name="dialog_chat_actions_mark_unread" id="0x7f0a02d7" />
-    <public type="id" name="dialog_chat_actions_pin" id="0x7f0a02d8" />
-    <public type="id" name="dialog_chat_actions_profile" id="0x7f0a02d9" />
-    <public type="id" name="dialog_chat_actions_quote" id="0x7f0a02da" />
-    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7f0a02db" />
-    <public type="id" name="dialog_chat_actions_resend" id="0x7f0a02dc" />
-    <public type="id" name="dialog_chat_actions_share" id="0x7f0a02dd" />
-    <public type="id" name="dialog_date_picker_done" id="0x7f0a02de" />
-    <public type="id" name="dialog_date_picker_input" id="0x7f0a02df" />
-    <public type="id" name="dialog_date_picker_title" id="0x7f0a02e0" />
-    <public type="id" name="dialog_delete" id="0x7f0a02e1" />
-    <public type="id" name="dialog_save" id="0x7f0a02e2" />
-    <public type="id" name="dialog_selections" id="0x7f0a02e3" />
-    <public type="id" name="dialog_title" id="0x7f0a02e4" />
-    <public type="id" name="dialog_url_actions_copy" id="0x7f0a02e5" />
-    <public type="id" name="dialog_url_actions_open" id="0x7f0a02e6" />
-    <public type="id" name="dialog_url_actions_share" id="0x7f0a02e7" />
-    <public type="id" name="dialog_url_actions_url" id="0x7f0a02e8" />
-    <public type="id" name="dimensions" id="0x7f0a02e9" />
-    <public type="id" name="dimmer_view" id="0x7f0a02ea" />
-    <public type="id" name="direct" id="0x7f0a02eb" />
-    <public type="id" name="disableHome" id="0x7f0a02ec" />
-    <public type="id" name="disable_delete_body" id="0x7f0a02ed" />
-    <public type="id" name="disable_delete_cancel" id="0x7f0a02ee" />
-    <public type="id" name="disable_delete_code_wrap" id="0x7f0a02ef" />
-    <public type="id" name="disable_delete_confirm" id="0x7f0a02f0" />
-    <public type="id" name="disable_delete_header" id="0x7f0a02f1" />
-    <public type="id" name="disable_delete_password_wrap" id="0x7f0a02f2" />
-    <public type="id" name="disconnect_btn" id="0x7f0a02f3" />
-    <public type="id" name="display_name" id="0x7f0a02f4" />
-    <public type="id" name="dng" id="0x7f0a02f5" />
-    <public type="id" name="draw3x3" id="0x7f0a02f6" />
-    <public type="id" name="draw4x4" id="0x7f0a02f7" />
-    <public type="id" name="drawPhi" id="0x7f0a02f8" />
-    <public type="id" name="dropdown_menu" id="0x7f0a02f9" />
-    <public type="id" name="dtddd" id="0x7f0a02fa" />
-    <public type="id" name="edit_account_discriminator_wrap" id="0x7f0a02fb" />
-    <public type="id" name="edit_account_email_wrap" id="0x7f0a02fc" />
-    <public type="id" name="edit_account_password_wrap" id="0x7f0a02fd" />
-    <public type="id" name="edit_account_tag_layout_container" id="0x7f0a02fe" />
-    <public type="id" name="edit_account_username_wrap" id="0x7f0a02ff" />
-    <public type="id" name="edit_integration_custom_emotes_container" id="0x7f0a0300" />
-    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7f0a0301" />
-    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7f0a0302" />
-    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7f0a0303" />
-    <public type="id" name="edit_integration_expired_sub_container" id="0x7f0a0304" />
-    <public type="id" name="edit_integration_grace_period_container" id="0x7f0a0305" />
-    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7f0a0306" />
-    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7f0a0307" />
-    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7f0a0308" />
-    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7f0a0309" />
-    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7f0a030a" />
-    <public type="id" name="edit_integration_icon" id="0x7f0a030b" />
-    <public type="id" name="edit_integration_last_sync_time" id="0x7f0a030c" />
-    <public type="id" name="edit_integration_name" id="0x7f0a030d" />
-    <public type="id" name="edit_integration_name_container" id="0x7f0a030e" />
-    <public type="id" name="edit_integration_owner_name" id="0x7f0a030f" />
-    <public type="id" name="edit_integration_save" id="0x7f0a0310" />
-    <public type="id" name="edit_integration_settings_scroll" id="0x7f0a0311" />
-    <public type="id" name="edit_integration_subscriber_count" id="0x7f0a0312" />
-    <public type="id" name="edit_integration_sync_container" id="0x7f0a0313" />
-    <public type="id" name="edit_integration_synced_role" id="0x7f0a0314" />
-    <public type="id" name="edit_integration_synced_role_container" id="0x7f0a0315" />
-    <public type="id" name="edit_member_administrative_container" id="0x7f0a0316" />
-    <public type="id" name="edit_member_ban_button" id="0x7f0a0317" />
-    <public type="id" name="edit_member_kick_button" id="0x7f0a0318" />
-    <public type="id" name="edit_member_nickname" id="0x7f0a0319" />
-    <public type="id" name="edit_member_roles_container" id="0x7f0a031a" />
-    <public type="id" name="edit_member_roles_recycler" id="0x7f0a031b" />
-    <public type="id" name="edit_member_save" id="0x7f0a031c" />
-    <public type="id" name="edit_member_transfer_ownership_button" id="0x7f0a031d" />
-    <public type="id" name="edit_query" id="0x7f0a031e" />
-    <public type="id" name="edit_role_name" id="0x7f0a031f" />
-    <public type="id" name="edit_role_save" id="0x7f0a0320" />
-    <public type="id" name="email" id="0x7f0a0321" />
-    <public type="id" name="embed_image_container" id="0x7f0a0322" />
-    <public type="id" name="embed_inline_media" id="0x7f0a0323" />
-    <public type="id" name="emoji_app_bar" id="0x7f0a0324" />
-    <public type="id" name="emoji_category_item_guild_avatar" id="0x7f0a0325" />
-    <public type="id" name="emoji_category_item_standard_icon" id="0x7f0a0326" />
-    <public type="id" name="emoji_category_selection_overline" id="0x7f0a0327" />
-    <public type="id" name="emoji_inline_search_button" id="0x7f0a0328" />
-    <public type="id" name="emoji_item_draweeview" id="0x7f0a0329" />
-    <public type="id" name="emoji_iv" id="0x7f0a032a" />
-    <public type="id" name="emoji_picker_backspace_icon" id="0x7f0a032b" />
-    <public type="id" name="emoji_picker_bottom_bar" id="0x7f0a032c" />
-    <public type="id" name="emoji_picker_bottom_bar_divider" id="0x7f0a032d" />
-    <public type="id" name="emoji_picker_category_barrier" id="0x7f0a032e" />
-    <public type="id" name="emoji_picker_category_recycler" id="0x7f0a032f" />
-    <public type="id" name="emoji_picker_container" id="0x7f0a0330" />
-    <public type="id" name="emoji_picker_unicode_emoji_shortcut_button" id="0x7f0a0331" />
-    <public type="id" name="emoji_search_bar" id="0x7f0a0332" />
-    <public type="id" name="emoji_search_clear" id="0x7f0a0333" />
-    <public type="id" name="emoji_search_input" id="0x7f0a0334" />
-    <public type="id" name="emoji_sheet_emoji_picker_content" id="0x7f0a0335" />
-    <public type="id" name="emoji_toolbar" id="0x7f0a0336" />
-    <public type="id" name="empty_friends_state_add_friend" id="0x7f0a0337" />
-    <public type="id" name="empty_friends_state_title" id="0x7f0a0338" />
-    <public type="id" name="empty_results" id="0x7f0a0339" />
-    <public type="id" name="enable_button" id="0x7f0a033a" />
-    <public type="id" name="enable_mfa_key_code" id="0x7f0a033b" />
-    <public type="id" name="enable_mfa_key_launch_authy" id="0x7f0a033c" />
-    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7f0a033d" />
-    <public type="id" name="enable_mfa_stepsview" id="0x7f0a033e" />
-    <public type="id" name="enable_sms_backup_body" id="0x7f0a033f" />
-    <public type="id" name="enable_sms_backup_cancel" id="0x7f0a0340" />
-    <public type="id" name="enable_sms_backup_confirm" id="0x7f0a0341" />
-    <public type="id" name="enable_sms_backup_header" id="0x7f0a0342" />
-    <public type="id" name="enable_sms_backup_password_wrap" id="0x7f0a0343" />
-    <public type="id" name="enable_two_factor_password_body_container" id="0x7f0a0344" />
-    <public type="id" name="enable_two_factor_password_body_text" id="0x7f0a0345" />
-    <public type="id" name="enable_two_factor_password_cancel" id="0x7f0a0346" />
-    <public type="id" name="enable_two_factor_password_header" id="0x7f0a0347" />
-    <public type="id" name="enable_two_factor_password_header_container" id="0x7f0a0348" />
-    <public type="id" name="enable_two_factor_password_ok" id="0x7f0a0349" />
-    <public type="id" name="enable_two_factor_password_view_input" id="0x7f0a034a" />
-    <public type="id" name="end" id="0x7f0a034b" />
-    <public type="id" name="end_padder" id="0x7f0a034c" />
-    <public type="id" name="enterAlways" id="0x7f0a034d" />
-    <public type="id" name="enterAlwaysCollapsed" id="0x7f0a034e" />
-    <public type="id" name="exitUntilCollapsed" id="0x7f0a034f" />
-    <public type="id" name="exo_ad_overlay" id="0x7f0a0350" />
-    <public type="id" name="exo_artwork" id="0x7f0a0351" />
-    <public type="id" name="exo_buffering" id="0x7f0a0352" />
-    <public type="id" name="exo_content_frame" id="0x7f0a0353" />
-    <public type="id" name="exo_controller" id="0x7f0a0354" />
-    <public type="id" name="exo_controller_placeholder" id="0x7f0a0355" />
-    <public type="id" name="exo_duration" id="0x7f0a0356" />
-    <public type="id" name="exo_error_message" id="0x7f0a0357" />
-    <public type="id" name="exo_ffwd" id="0x7f0a0358" />
-    <public type="id" name="exo_next" id="0x7f0a0359" />
-    <public type="id" name="exo_overlay" id="0x7f0a035a" />
-    <public type="id" name="exo_pause" id="0x7f0a035b" />
-    <public type="id" name="exo_play" id="0x7f0a035c" />
-    <public type="id" name="exo_position" id="0x7f0a035d" />
-    <public type="id" name="exo_prev" id="0x7f0a035e" />
-    <public type="id" name="exo_progress" id="0x7f0a035f" />
-    <public type="id" name="exo_progress_placeholder" id="0x7f0a0360" />
-    <public type="id" name="exo_repeat_toggle" id="0x7f0a0361" />
-    <public type="id" name="exo_rew" id="0x7f0a0362" />
-    <public type="id" name="exo_shuffle" id="0x7f0a0363" />
-    <public type="id" name="exo_shutter" id="0x7f0a0364" />
-    <public type="id" name="exo_subtitles" id="0x7f0a0365" />
-    <public type="id" name="exo_track_selection_view" id="0x7f0a0366" />
-    <public type="id" name="exo_vr" id="0x7f0a0367" />
-    <public type="id" name="expand_activities_button" id="0x7f0a0368" />
-    <public type="id" name="expanded_menu" id="0x7f0a0369" />
-    <public type="id" name="exposureCorrection" id="0x7f0a036a" />
-    <public type="id" name="expression_tray_container" id="0x7f0a036b" />
-    <public type="id" name="expression_tray_content_container" id="0x7f0a036c" />
-    <public type="id" name="expression_tray_detail_page" id="0x7f0a036d" />
-    <public type="id" name="expression_tray_emoji_button" id="0x7f0a036e" />
-    <public type="id" name="expression_tray_emoji_card" id="0x7f0a036f" />
-    <public type="id" name="expression_tray_emoji_picker_content" id="0x7f0a0370" />
-    <public type="id" name="expression_tray_gif_button" id="0x7f0a0371" />
-    <public type="id" name="expression_tray_gif_card" id="0x7f0a0372" />
-    <public type="id" name="expression_tray_gif_picker_content" id="0x7f0a0373" />
-    <public type="id" name="expression_tray_landing_page" id="0x7f0a0374" />
-    <public type="id" name="expression_tray_search_bar" id="0x7f0a0375" />
-    <public type="id" name="expression_tray_search_button" id="0x7f0a0376" />
-    <public type="id" name="expression_tray_search_icon" id="0x7f0a0377" />
-    <public type="id" name="expression_tray_segmented_control" id="0x7f0a0378" />
-    <public type="id" name="expression_tray_toolbar" id="0x7f0a0379" />
-    <public type="id" name="expression_tray_toolbar_layout" id="0x7f0a037a" />
-    <public type="id" name="external_share_activity_action_preview" id="0x7f0a037b" />
-    <public type="id" name="external_share_comment" id="0x7f0a037c" />
-    <public type="id" name="external_share_list" id="0x7f0a037d" />
-    <public type="id" name="external_share_list_wrap" id="0x7f0a037e" />
-    <public type="id" name="external_share_search" id="0x7f0a037f" />
-    <public type="id" name="external_share_search_results" id="0x7f0a0380" />
-    <public type="id" name="fab_menu_add_category" id="0x7f0a0381" />
-    <public type="id" name="fab_menu_add_text" id="0x7f0a0382" />
-    <public type="id" name="fab_menu_add_voice" id="0x7f0a0383" />
-    <public type="id" name="fab_menu_main" id="0x7f0a0384" />
-    <public type="id" name="fab_menu_main_fab" id="0x7f0a0385" />
-    <public type="id" name="fab_menu_table" id="0x7f0a0386" />
-    <public type="id" name="fade" id="0x7f0a0387" />
-    <public type="id" name="failed_alert_icon" id="0x7f0a0388" />
-    <public type="id" name="fatal_crash_app_version" id="0x7f0a0389" />
-    <public type="id" name="fatal_crash_details" id="0x7f0a038a" />
-    <public type="id" name="fatal_crash_device" id="0x7f0a038b" />
-    <public type="id" name="fatal_crash_os_version" id="0x7f0a038c" />
-    <public type="id" name="fatal_crash_source" id="0x7f0a038d" />
-    <public type="id" name="fatal_crash_testers_invite" id="0x7f0a038e" />
-    <public type="id" name="fatal_crash_time" id="0x7f0a038f" />
-    <public type="id" name="feedback_happy_rating" id="0x7f0a0390" />
-    <public type="id" name="feedback_issue_section_header" id="0x7f0a0391" />
-    <public type="id" name="feedback_issues_card" id="0x7f0a0392" />
-    <public type="id" name="feedback_issues_recycler" id="0x7f0a0393" />
-    <public type="id" name="feedback_neutral_rating" id="0x7f0a0394" />
-    <public type="id" name="feedback_rating_summary_prompt" id="0x7f0a0395" />
-    <public type="id" name="feedback_sad_rating" id="0x7f0a0396" />
-    <public type="id" name="feedback_sheet_close_button" id="0x7f0a0397" />
-    <public type="id" name="feedback_sheet_container" id="0x7f0a0398" />
-    <public type="id" name="feedback_sheet_feedback_view" id="0x7f0a0399" />
-    <public type="id" name="feedback_sheet_title" id="0x7f0a039a" />
-    <public type="id" name="file_image" id="0x7f0a039b" />
-    <public type="id" name="file_name_tv" id="0x7f0a039c" />
-    <public type="id" name="file_subtitle_tv" id="0x7f0a039d" />
-    <public type="id" name="fill" id="0x7f0a039e" />
-    <public type="id" name="fill_horizontal" id="0x7f0a039f" />
-    <public type="id" name="fill_vertical" id="0x7f0a03a0" />
-    <public type="id" name="filled" id="0x7f0a03a1" />
-    <public type="id" name="filterControl1" id="0x7f0a03a2" />
-    <public type="id" name="filterControl2" id="0x7f0a03a3" />
-    <public type="id" name="fit" id="0x7f0a03a4" />
-    <public type="id" name="fitBottomStart" id="0x7f0a03a5" />
-    <public type="id" name="fitCenter" id="0x7f0a03a6" />
-    <public type="id" name="fitEnd" id="0x7f0a03a7" />
-    <public type="id" name="fitStart" id="0x7f0a03a8" />
-    <public type="id" name="fitToContents" id="0x7f0a03a9" />
-    <public type="id" name="fitXY" id="0x7f0a03aa" />
-    <public type="id" name="fixed" id="0x7f0a03ab" />
-    <public type="id" name="fixed_height" id="0x7f0a03ac" />
-    <public type="id" name="fixed_width" id="0x7f0a03ad" />
-    <public type="id" name="flex_end" id="0x7f0a03ae" />
-    <public type="id" name="flex_input_attachment_clear_btn" id="0x7f0a03af" />
-    <public type="id" name="flex_input_attachment_preview_container" id="0x7f0a03b0" />
-    <public type="id" name="flex_input_attachment_preview_list" id="0x7f0a03b1" />
-    <public type="id" name="flex_input_camera_btn" id="0x7f0a03b2" />
-    <public type="id" name="flex_input_cannot_send_text" id="0x7f0a03b3" />
-    <public type="id" name="flex_input_container" id="0x7f0a03b4" />
-    <public type="id" name="flex_input_default_window_insets_handler" id="0x7f0a03b5" />
-    <public type="id" name="flex_input_emoji_btn" id="0x7f0a03b6" />
-    <public type="id" name="flex_input_expand_btn" id="0x7f0a03b7" />
-    <public type="id" name="flex_input_expression_tray_container" id="0x7f0a03b8" />
-    <public type="id" name="flex_input_gallery_btn" id="0x7f0a03b9" />
-    <public type="id" name="flex_input_left_btns_container" id="0x7f0a03ba" />
-    <public type="id" name="flex_input_main_input_container" id="0x7f0a03bb" />
-    <public type="id" name="flex_input_send_btn_container" id="0x7f0a03bc" />
-    <public type="id" name="flex_input_send_btn_image" id="0x7f0a03bd" />
-    <public type="id" name="flex_input_text_input" id="0x7f0a03be" />
-    <public type="id" name="flex_start" id="0x7f0a03bf" />
-    <public type="id" name="floating" id="0x7f0a03c0" />
-    <public type="id" name="fluorescent" id="0x7f0a03c1" />
-    <public type="id" name="focusCrop" id="0x7f0a03c2" />
-    <public type="id" name="focusMarkerContainer" id="0x7f0a03c3" />
-    <public type="id" name="focusMarkerFill" id="0x7f0a03c4" />
-    <public type="id" name="folder_view_folder_image" id="0x7f0a03c5" />
-    <public type="id" name="follow_sheet_view_flipper" id="0x7f0a03c6" />
-    <public type="id" name="forever" id="0x7f0a03c7" />
-    <public type="id" name="fragment_container_view_tag" id="0x7f0a03c8" />
-    <public type="id" name="friend_add_username_indicator" id="0x7f0a03c9" />
-    <public type="id" name="friend_container" id="0x7f0a03ca" />
-    <public type="id" name="friends_add_container" id="0x7f0a03cb" />
-    <public type="id" name="friends_add_send" id="0x7f0a03cc" />
-    <public type="id" name="friends_add_text_edit_wrap" id="0x7f0a03cd" />
-    <public type="id" name="friends_list_empty_friends_state_view" id="0x7f0a03ce" />
-    <public type="id" name="friends_list_flipper" id="0x7f0a03cf" />
-    <public type="id" name="friends_list_item_accept_button" id="0x7f0a03d0" />
-    <public type="id" name="friends_list_item_activity" id="0x7f0a03d1" />
-    <public type="id" name="friends_list_item_avatar" id="0x7f0a03d2" />
-    <public type="id" name="friends_list_item_avatar_wrap" id="0x7f0a03d3" />
-    <public type="id" name="friends_list_item_buttons_wrap" id="0x7f0a03d4" />
-    <public type="id" name="friends_list_item_call_button" id="0x7f0a03d5" />
-    <public type="id" name="friends_list_item_chat_button" id="0x7f0a03d6" />
-    <public type="id" name="friends_list_item_decline_button" id="0x7f0a03d7" />
-    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7f0a03d8" />
-    <public type="id" name="friends_list_item_game" id="0x7f0a03d9" />
-    <public type="id" name="friends_list_item_header_text" id="0x7f0a03da" />
-    <public type="id" name="friends_list_item_name" id="0x7f0a03db" />
-    <public type="id" name="friends_list_item_status" id="0x7f0a03dc" />
-    <public type="id" name="friends_list_item_text" id="0x7f0a03dd" />
-    <public type="id" name="friends_list_loading" id="0x7f0a03de" />
-    <public type="id" name="friends_list_pending_item_header_button" id="0x7f0a03df" />
-    <public type="id" name="friends_list_pending_item_header_text" id="0x7f0a03e0" />
-    <public type="id" name="friends_list_recycler" id="0x7f0a03e1" />
-    <public type="id" name="front" id="0x7f0a03e2" />
-    <public type="id" name="ghost_view" id="0x7f0a03e3" />
-    <public type="id" name="ghost_view_holder" id="0x7f0a03e4" />
-    <public type="id" name="gif_category_container" id="0x7f0a03e5" />
-    <public type="id" name="gif_category_gif_recycler" id="0x7f0a03e6" />
-    <public type="id" name="gif_category_item_icon" id="0x7f0a03e7" />
-    <public type="id" name="gif_category_item_preview" id="0x7f0a03e8" />
-    <public type="id" name="gif_category_item_title" id="0x7f0a03e9" />
-    <public type="id" name="gif_category_loading_view" id="0x7f0a03ea" />
-    <public type="id" name="gif_category_title" id="0x7f0a03eb" />
-    <public type="id" name="gif_item_image" id="0x7f0a03ec" />
-    <public type="id" name="gif_picker_category_recycler" id="0x7f0a03ed" />
-    <public type="id" name="gif_picker_container" id="0x7f0a03ee" />
-    <public type="id" name="gif_picker_loading_view" id="0x7f0a03ef" />
-    <public type="id" name="gif_search_app_bar" id="0x7f0a03f0" />
-    <public type="id" name="gif_search_bar" id="0x7f0a03f1" />
-    <public type="id" name="gif_search_clear" id="0x7f0a03f2" />
-    <public type="id" name="gif_search_gif_recycler" id="0x7f0a03f3" />
-    <public type="id" name="gif_search_input" id="0x7f0a03f4" />
-    <public type="id" name="gif_search_loading_view" id="0x7f0a03f5" />
-    <public type="id" name="gif_search_sheet_content" id="0x7f0a03f6" />
-    <public type="id" name="gif_search_suggested_terms_container" id="0x7f0a03f7" />
-    <public type="id" name="gif_search_suggested_terms_flex_box" id="0x7f0a03f8" />
-    <public type="id" name="gif_search_suggested_terms_icon_text" id="0x7f0a03f9" />
-    <public type="id" name="gif_search_toolbar" id="0x7f0a03fa" />
-    <public type="id" name="gif_search_view_flipper" id="0x7f0a03fb" />
-    <public type="id" name="gift_entitlement_code" id="0x7f0a03fc" />
-    <public type="id" name="gift_entitlement_code_container" id="0x7f0a03fd" />
-    <public type="id" name="gift_entitlement_container" id="0x7f0a03fe" />
-    <public type="id" name="gift_entitlement_copy" id="0x7f0a03ff" />
-    <public type="id" name="gift_entitlement_divider" id="0x7f0a0400" />
-    <public type="id" name="gift_entitlement_flipper" id="0x7f0a0401" />
-    <public type="id" name="gift_entitlement_generate" id="0x7f0a0402" />
-    <public type="id" name="gift_entitlement_revoke" id="0x7f0a0403" />
-    <public type="id" name="gift_sku_arrow" id="0x7f0a0404" />
-    <public type="id" name="gift_sku_copies" id="0x7f0a0405" />
-    <public type="id" name="gift_sku_icon" id="0x7f0a0406" />
-    <public type="id" name="gift_sku_name" id="0x7f0a0407" />
-    <public type="id" name="glSurface" id="0x7f0a0408" />
-    <public type="id" name="gl_surface_view" id="0x7f0a0409" />
-    <public type="id" name="global_search_add_a_friend_btn" id="0x7f0a040a" />
-    <public type="id" name="global_search_bar" id="0x7f0a040b" />
-    <public type="id" name="global_search_guild_list" id="0x7f0a040c" />
-    <public type="id" name="global_search_join_guild_btn" id="0x7f0a040d" />
-    <public type="id" name="global_search_recycler" id="0x7f0a040e" />
-    <public type="id" name="global_search_view_flipper" id="0x7f0a040f" />
-    <public type="id" name="gone" id="0x7f0a0410" />
-    <public type="id" name="gridView" id="0x7f0a0411" />
-    <public type="id" name="group_divider" id="0x7f0a0412" />
-    <public type="id" name="group_dm_notifications_mute_settings_view" id="0x7f0a0413" />
-    <public type="id" name="group_dm_settings_scroll_view" id="0x7f0a0414" />
-    <public type="id" name="group_invite_friends_chips" id="0x7f0a0415" />
-    <public type="id" name="group_invite_friends_recipients_container" id="0x7f0a0416" />
-    <public type="id" name="group_invite_friends_recycler" id="0x7f0a0417" />
-    <public type="id" name="group_invite_friends_save_fab" id="0x7f0a0418" />
-    <public type="id" name="group_invite_friends_text_to" id="0x7f0a0419" />
-    <public type="id" name="group_invite_friends_view_flipper" id="0x7f0a041a" />
-    <public type="id" name="groups" id="0x7f0a041b" />
-    <public type="id" name="guideline" id="0x7f0a041c" />
-    <public type="id" name="guild_actions_add_create" id="0x7f0a041d" />
-    <public type="id" name="guild_actions_add_join" id="0x7f0a041e" />
-    <public type="id" name="guild_actions_overview_header_tv" id="0x7f0a041f" />
-    <public type="id" name="guild_call_onboarding_connect" id="0x7f0a0420" />
-    <public type="id" name="guild_context_menu_card" id="0x7f0a0421" />
-    <public type="id" name="guild_context_menu_header" id="0x7f0a0422" />
-    <public type="id" name="guild_context_menu_header_divider" id="0x7f0a0423" />
-    <public type="id" name="guild_context_menu_leave_guild" id="0x7f0a0424" />
-    <public type="id" name="guild_context_menu_mark_as_read" id="0x7f0a0425" />
-    <public type="id" name="guild_context_menu_more_options" id="0x7f0a0426" />
-    <public type="id" name="guild_context_menu_notifications" id="0x7f0a0427" />
-    <public type="id" name="guild_create_button" id="0x7f0a0428" />
-    <public type="id" name="guild_create_flipper" id="0x7f0a0429" />
-    <public type="id" name="guild_create_guidelines" id="0x7f0a042a" />
-    <public type="id" name="guild_create_icon_uploader" id="0x7f0a042b" />
-    <public type="id" name="guild_create_name" id="0x7f0a042c" />
-    <public type="id" name="guild_create_protip" id="0x7f0a042d" />
-    <public type="id" name="guild_create_screen_title" id="0x7f0a042e" />
-    <public type="id" name="guild_invite_accept" id="0x7f0a042f" />
-    <public type="id" name="guild_invite_actions" id="0x7f0a0430" />
-    <public type="id" name="guild_invite_cancel" id="0x7f0a0431" />
-    <public type="id" name="guild_invite_channel_spinner" id="0x7f0a0432" />
-    <public type="id" name="guild_invite_empty_results" id="0x7f0a0433" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7f0a0434" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7f0a0435" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7f0a0436" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7f0a0437" />
-    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7f0a0438" />
-    <public type="id" name="guild_invite_generate_link" id="0x7f0a0439" />
-    <public type="id" name="guild_invite_info" id="0x7f0a043a" />
-    <public type="id" name="guild_invite_link" id="0x7f0a043b" />
-    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7f0a043c" />
-    <public type="id" name="guild_invite_never_expire" id="0x7f0a043d" />
-    <public type="id" name="guild_invite_settings_edit" id="0x7f0a043e" />
-    <public type="id" name="guild_invite_share_btn" id="0x7f0a043f" />
-    <public type="id" name="guild_invite_share_compact_search" id="0x7f0a0440" />
-    <public type="id" name="guild_invite_share_search" id="0x7f0a0441" />
-    <public type="id" name="guild_invite_splash" id="0x7f0a0442" />
-    <public type="id" name="guild_invite_suggestion_list" id="0x7f0a0443" />
-    <public type="id" name="guild_invite_suggestions_flipper" id="0x7f0a0444" />
-    <public type="id" name="guild_invite_temporary_membership" id="0x7f0a0445" />
-    <public type="id" name="guild_join_action_btn" id="0x7f0a0446" />
-    <public type="id" name="guild_join_content" id="0x7f0a0447" />
-    <public type="id" name="guild_join_invite" id="0x7f0a0448" />
-    <public type="id" name="guild_list" id="0x7f0a0449" />
-    <public type="id" name="guild_list_add_hint" id="0x7f0a044a" />
-    <public type="id" name="guild_list_unreads_stub" id="0x7f0a044b" />
-    <public type="id" name="guild_notifications_add_override" id="0x7f0a044c" />
-    <public type="id" name="guild_notifications_channel_list" id="0x7f0a044d" />
-    <public type="id" name="guild_notifications_channel_search" id="0x7f0a044e" />
-    <public type="id" name="guild_notifications_override_list" id="0x7f0a044f" />
-    <public type="id" name="guild_profile_sheet_actions" id="0x7f0a0450" />
-    <public type="id" name="guild_profile_sheet_actions_top_barrier" id="0x7f0a0451" />
-    <public type="id" name="guild_profile_sheet_allow_dm" id="0x7f0a0452" />
-    <public type="id" name="guild_profile_sheet_banner" id="0x7f0a0453" />
-    <public type="id" name="guild_profile_sheet_boosts" id="0x7f0a0454" />
-    <public type="id" name="guild_profile_sheet_bottom_actions" id="0x7f0a0455" />
-    <public type="id" name="guild_profile_sheet_bottom_container" id="0x7f0a0456" />
-    <public type="id" name="guild_profile_sheet_change_nickname" id="0x7f0a0457" />
-    <public type="id" name="guild_profile_sheet_constraint_layout" id="0x7f0a0458" />
-    <public type="id" name="guild_profile_sheet_content_container" id="0x7f0a0459" />
-    <public type="id" name="guild_profile_sheet_content_container_bottom_divider" id="0x7f0a045a" />
-    <public type="id" name="guild_profile_sheet_copy_id" id="0x7f0a045b" />
-    <public type="id" name="guild_profile_sheet_create_category" id="0x7f0a045c" />
-    <public type="id" name="guild_profile_sheet_create_channel" id="0x7f0a045d" />
-    <public type="id" name="guild_profile_sheet_description" id="0x7f0a045e" />
-    <public type="id" name="guild_profile_sheet_developer_actions" id="0x7f0a045f" />
-    <public type="id" name="guild_profile_sheet_emoji_imageview" id="0x7f0a0460" />
-    <public type="id" name="guild_profile_sheet_emojis" id="0x7f0a0461" />
-    <public type="id" name="guild_profile_sheet_emojis_card" id="0x7f0a0462" />
-    <public type="id" name="guild_profile_sheet_emojis_count" id="0x7f0a0463" />
-    <public type="id" name="guild_profile_sheet_flipper" id="0x7f0a0464" />
-    <public type="id" name="guild_profile_sheet_guild_verified_premium_icon" id="0x7f0a0465" />
-    <public type="id" name="guild_profile_sheet_hide_muted_channels" id="0x7f0a0466" />
-    <public type="id" name="guild_profile_sheet_icon" id="0x7f0a0467" />
-    <public type="id" name="guild_profile_sheet_icon_card" id="0x7f0a0468" />
-    <public type="id" name="guild_profile_sheet_icon_name" id="0x7f0a0469" />
-    <public type="id" name="guild_profile_sheet_invite" id="0x7f0a046a" />
-    <public type="id" name="guild_profile_sheet_join_server" id="0x7f0a046b" />
-    <public type="id" name="guild_profile_sheet_leave_server" id="0x7f0a046c" />
-    <public type="id" name="guild_profile_sheet_mark_as_read" id="0x7f0a046d" />
-    <public type="id" name="guild_profile_sheet_mark_as_read_action" id="0x7f0a046e" />
-    <public type="id" name="guild_profile_sheet_member_count" id="0x7f0a046f" />
-    <public type="id" name="guild_profile_sheet_member_count_text" id="0x7f0a0470" />
-    <public type="id" name="guild_profile_sheet_name" id="0x7f0a0471" />
-    <public type="id" name="guild_profile_sheet_nickname" id="0x7f0a0472" />
-    <public type="id" name="guild_profile_sheet_notifications" id="0x7f0a0473" />
-    <public type="id" name="guild_profile_sheet_online_count" id="0x7f0a0474" />
-    <public type="id" name="guild_profile_sheet_online_count_text" id="0x7f0a0475" />
-    <public type="id" name="guild_profile_sheet_premium_upsell_dot_separator" id="0x7f0a0476" />
-    <public type="id" name="guild_profile_sheet_premium_upsell_text" id="0x7f0a0477" />
-    <public type="id" name="guild_profile_sheet_primary_actions" id="0x7f0a0478" />
-    <public type="id" name="guild_profile_sheet_secondary_actions" id="0x7f0a0479" />
-    <public type="id" name="guild_profile_sheet_settings" id="0x7f0a047a" />
-    <public type="id" name="guild_profile_sheet_tab_items" id="0x7f0a047b" />
-    <public type="id" name="guild_profile_sheet_upload_emoji" id="0x7f0a047c" />
-    <public type="id" name="guild_profile_sheet_view_server" id="0x7f0a047d" />
-    <public type="id" name="guild_role_item_text" id="0x7f0a047e" />
-    <public type="id" name="guild_search_bar" id="0x7f0a047f" />
-    <public type="id" name="guild_search_item_avatar" id="0x7f0a0480" />
-    <public type="id" name="guild_search_item_name" id="0x7f0a0481" />
-    <public type="id" name="guild_search_recycler" id="0x7f0a0482" />
-    <public type="id" name="guild_selector_icon" id="0x7f0a0483" />
-    <public type="id" name="guild_selector_icon_text" id="0x7f0a0484" />
-    <public type="id" name="guild_selector_item_name" id="0x7f0a0485" />
-    <public type="id" name="guild_selector_list" id="0x7f0a0486" />
-    <public type="id" name="guild_template_channels_item_image" id="0x7f0a0487" />
-    <public type="id" name="guild_template_channels_item_name" id="0x7f0a0488" />
-    <public type="id" name="guild_template_channels_recycler_view" id="0x7f0a0489" />
-    <public type="id" name="guild_template_name" id="0x7f0a048a" />
-    <public type="id" name="guild_template_preview_channels" id="0x7f0a048b" />
-    <public type="id" name="guild_template_preview_roles" id="0x7f0a048c" />
-    <public type="id" name="guild_template_preview_roles_layout" id="0x7f0a048d" />
-    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7f0a048e" />
-    <public type="id" name="guild_transfer_ownership_cancel" id="0x7f0a048f" />
-    <public type="id" name="guild_transfer_ownership_confirm" id="0x7f0a0490" />
-    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7f0a0491" />
-    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7f0a0492" />
-    <public type="id" name="guild_video_at_capacity_confirm" id="0x7f0a0493" />
-    <public type="id" name="guild_view_1" id="0x7f0a0494" />
-    <public type="id" name="guild_view_2" id="0x7f0a0495" />
-    <public type="id" name="guild_view_3" id="0x7f0a0496" />
-    <public type="id" name="guild_view_4" id="0x7f0a0497" />
-    <public type="id" name="guild_view_image" id="0x7f0a0498" />
-    <public type="id" name="guild_view_text" id="0x7f0a0499" />
-    <public type="id" name="guild_views" id="0x7f0a049a" />
-    <public type="id" name="guild_welcome_channel" id="0x7f0a049b" />
-    <public type="id" name="guild_welcome_channel_description" id="0x7f0a049c" />
-    <public type="id" name="guild_welcome_channel_details" id="0x7f0a049d" />
-    <public type="id" name="guild_welcome_channel_emoji" id="0x7f0a049e" />
-    <public type="id" name="guild_welcome_channel_hash" id="0x7f0a049f" />
-    <public type="id" name="guild_welcome_channel_icon" id="0x7f0a04a0" />
-    <public type="id" name="guild_welcome_channel_name" id="0x7f0a04a1" />
-    <public type="id" name="guild_welcome_channel_text" id="0x7f0a04a2" />
-    <public type="id" name="guild_welcome_channel_unicode_emoji" id="0x7f0a04a3" />
-    <public type="id" name="guild_welcome_sheet_channels" id="0x7f0a04a4" />
-    <public type="id" name="guild_welcome_sheet_description" id="0x7f0a04a5" />
-    <public type="id" name="guild_welcome_sheet_flipper" id="0x7f0a04a6" />
-    <public type="id" name="guild_welcome_sheet_icon" id="0x7f0a04a7" />
-    <public type="id" name="guild_welcome_sheet_icon_card" id="0x7f0a04a8" />
-    <public type="id" name="guild_welcome_sheet_icon_name" id="0x7f0a04a9" />
-    <public type="id" name="guild_welcome_sheet_name" id="0x7f0a04aa" />
-    <public type="id" name="guilds_item_application_stream" id="0x7f0a04ab" />
-    <public type="id" name="guilds_item_avatar" id="0x7f0a04ac" />
-    <public type="id" name="guilds_item_avatar_text" id="0x7f0a04ad" />
-    <public type="id" name="guilds_item_avatar_wrap" id="0x7f0a04ae" />
-    <public type="id" name="guilds_item_dm_avatar" id="0x7f0a04af" />
-    <public type="id" name="guilds_item_dm_count" id="0x7f0a04b0" />
-    <public type="id" name="guilds_item_folder" id="0x7f0a04b1" />
-    <public type="id" name="guilds_item_folder_container" id="0x7f0a04b2" />
-    <public type="id" name="guilds_item_highlight" id="0x7f0a04b3" />
-    <public type="id" name="guilds_item_mentions" id="0x7f0a04b4" />
-    <public type="id" name="guilds_item_profile_avatar" id="0x7f0a04b5" />
-    <public type="id" name="guilds_item_profile_avatar_background" id="0x7f0a04b6" />
-    <public type="id" name="guilds_item_profile_selected" id="0x7f0a04b7" />
-    <public type="id" name="guilds_item_selected" id="0x7f0a04b8" />
-    <public type="id" name="guilds_item_unread" id="0x7f0a04b9" />
-    <public type="id" name="guilds_item_voice" id="0x7f0a04ba" />
-    <public type="id" name="h263" id="0x7f0a04bb" />
-    <public type="id" name="h264" id="0x7f0a04bc" />
-    <public type="id" name="hardware" id="0x7f0a04bd" />
-    <public type="id" name="heAac" id="0x7f0a04be" />
-    <public type="id" name="header_item_text" id="0x7f0a04bf" />
-    <public type="id" name="hideable" id="0x7f0a04c0" />
-    <public type="id" name="home" id="0x7f0a04c1" />
-    <public type="id" name="homeAsUp" id="0x7f0a04c2" />
-    <public type="id" name="home_panel_center" id="0x7f0a04c3" />
-    <public type="id" name="home_panel_center_channel_less" id="0x7f0a04c4" />
-    <public type="id" name="home_panel_center_channel_less_body" id="0x7f0a04c5" />
-    <public type="id" name="home_panel_center_channel_less_title" id="0x7f0a04c6" />
-    <public type="id" name="home_panel_center_nsfw" id="0x7f0a04c7" />
-    <public type="id" name="home_panel_center_nsfw_anchor_wrap" id="0x7f0a04c8" />
-    <public type="id" name="home_panel_center_nsfw_art" id="0x7f0a04c9" />
-    <public type="id" name="home_panel_center_nsfw_confirm" id="0x7f0a04ca" />
-    <public type="id" name="home_panel_center_nsfw_deny" id="0x7f0a04cb" />
-    <public type="id" name="home_panel_center_nsfw_description" id="0x7f0a04cc" />
-    <public type="id" name="home_panel_center_nsfw_title" id="0x7f0a04cd" />
-    <public type="id" name="home_panel_left" id="0x7f0a04ce" />
-    <public type="id" name="home_panel_loading" id="0x7f0a04cf" />
-    <public type="id" name="home_panel_loading_logo" id="0x7f0a04d0" />
-    <public type="id" name="home_panel_right" id="0x7f0a04d1" />
-    <public type="id" name="home_toolbar_unread_count" id="0x7f0a04d2" />
-    <public type="id" name="html" id="0x7f0a04d3" />
-    <public type="id" name="icon" id="0x7f0a04d4" />
-    <public type="id" name="icon_frame" id="0x7f0a04d5" />
-    <public type="id" name="icon_group" id="0x7f0a04d6" />
-    <public type="id" name="icon_only" id="0x7f0a04d7" />
-    <public type="id" name="icon_uploader_image" id="0x7f0a04d8" />
-    <public type="id" name="icon_uploader_placeholder_border" id="0x7f0a04d9" />
-    <public type="id" name="icon_uploader_placeholder_group" id="0x7f0a04da" />
-    <public type="id" name="icon_uploader_placeholder_icon" id="0x7f0a04db" />
-    <public type="id" name="icon_uploader_placeholder_text" id="0x7f0a04dc" />
-    <public type="id" name="icon_uploader_plus" id="0x7f0a04dd" />
-    <public type="id" name="icon_uri" id="0x7f0a04de" />
-    <public type="id" name="ifRoom" id="0x7f0a04df" />
-    <public type="id" name="image" id="0x7f0a04e0" />
-    <public type="id" name="image_bottom_guideline" id="0x7f0a04e1" />
-    <public type="id" name="image_view_crop" id="0x7f0a04e2" />
-    <public type="id" name="image_view_logo" id="0x7f0a04e3" />
-    <public type="id" name="image_view_state_aspect_ratio" id="0x7f0a04e4" />
-    <public type="id" name="image_view_state_rotate" id="0x7f0a04e5" />
-    <public type="id" name="image_view_state_scale" id="0x7f0a04e6" />
-    <public type="id" name="incandescent" id="0x7f0a04e7" />
-    <public type="id" name="incoming" id="0x7f0a04e8" />
-    <public type="id" name="incoming_call_accept_button" id="0x7f0a04e9" />
-    <public type="id" name="incoming_call_accept_container" id="0x7f0a04ea" />
-    <public type="id" name="incoming_call_accept_text" id="0x7f0a04eb" />
-    <public type="id" name="incoming_call_connect_voice_only" id="0x7f0a04ec" />
-    <public type="id" name="incoming_call_decline_button" id="0x7f0a04ed" />
-    <public type="id" name="incoming_call_decline_container" id="0x7f0a04ee" />
-    <public type="id" name="incoming_call_status_container" id="0x7f0a04ef" />
-    <public type="id" name="incoming_call_status_primary" id="0x7f0a04f0" />
-    <public type="id" name="incoming_call_status_secondary" id="0x7f0a04f1" />
-    <public type="id" name="incoming_call_top_guideline" id="0x7f0a04f2" />
-    <public type="id" name="incoming_call_users_recycler" id="0x7f0a04f3" />
-    <public type="id" name="incoming_share_no_results_img" id="0x7f0a04f4" />
-    <public type="id" name="incoming_share_results_flipper" id="0x7f0a04f5" />
-    <public type="id" name="index_entity_types" id="0x7f0a04f6" />
-    <public type="id" name="indicators_container" id="0x7f0a04f7" />
-    <public type="id" name="info" id="0x7f0a04f8" />
-    <public type="id" name="inline_media_image_preview" id="0x7f0a04f9" />
-    <public type="id" name="inline_media_loading_indicator" id="0x7f0a04fa" />
-    <public type="id" name="inline_media_play_button" id="0x7f0a04fb" />
-    <public type="id" name="inline_media_player_view" id="0x7f0a04fc" />
-    <public type="id" name="inline_media_volume_toggle" id="0x7f0a04fd" />
-    <public type="id" name="instant_message" id="0x7f0a04fe" />
-    <public type="id" name="integration_header_container" id="0x7f0a04ff" />
-    <public type="id" name="integration_header_disabled_overlay" id="0x7f0a0500" />
-    <public type="id" name="integration_icon" id="0x7f0a0501" />
-    <public type="id" name="integration_name" id="0x7f0a0502" />
-    <public type="id" name="integration_name_container" id="0x7f0a0503" />
-    <public type="id" name="integration_owner_name" id="0x7f0a0504" />
-    <public type="id" name="integration_settings_icon" id="0x7f0a0505" />
-    <public type="id" name="integration_sync_switch" id="0x7f0a0506" />
-    <public type="id" name="integration_syncing_progress_bar" id="0x7f0a0507" />
-    <public type="id" name="integrations_empty_body" id="0x7f0a0508" />
-    <public type="id" name="integrations_empty_header" id="0x7f0a0509" />
-    <public type="id" name="integrations_recycler" id="0x7f0a050a" />
-    <public type="id" name="integrations_view_flipper" id="0x7f0a050b" />
-    <public type="id" name="intent_action" id="0x7f0a050c" />
-    <public type="id" name="intent_activity" id="0x7f0a050d" />
-    <public type="id" name="intent_data" id="0x7f0a050e" />
-    <public type="id" name="intent_data_id" id="0x7f0a050f" />
-    <public type="id" name="intent_extra_data" id="0x7f0a0510" />
-    <public type="id" name="invisible" id="0x7f0a0511" />
-    <public type="id" name="invite_actions_copy" id="0x7f0a0512" />
-    <public type="id" name="invite_actions_revoke" id="0x7f0a0513" />
-    <public type="id" name="invite_actions_share" id="0x7f0a0514" />
-    <public type="id" name="invite_actions_title" id="0x7f0a0515" />
-    <public type="id" name="invite_avatar" id="0x7f0a0516" />
-    <public type="id" name="invite_avatar_small" id="0x7f0a0517" />
-    <public type="id" name="invite_avatar_small_card" id="0x7f0a0518" />
-    <public type="id" name="invite_avatar_small_wrap" id="0x7f0a0519" />
-    <public type="id" name="invite_avatar_wrap" id="0x7f0a051a" />
-    <public type="id" name="invite_channel" id="0x7f0a051b" />
-    <public type="id" name="invite_code" id="0x7f0a051c" />
-    <public type="id" name="invite_container" id="0x7f0a051d" />
-    <public type="id" name="invite_divider" id="0x7f0a051e" />
-    <public type="id" name="invite_expiration_container" id="0x7f0a051f" />
-    <public type="id" name="invite_expiration_time" id="0x7f0a0520" />
-    <public type="id" name="invite_expired_image" id="0x7f0a0521" />
-    <public type="id" name="invite_expires_label" id="0x7f0a0522" />
-    <public type="id" name="invite_list_item_avatar" id="0x7f0a0523" />
-    <public type="id" name="invite_members_online" id="0x7f0a0524" />
-    <public type="id" name="invite_members_online_wrap" id="0x7f0a0525" />
-    <public type="id" name="invite_members_total" id="0x7f0a0526" />
-    <public type="id" name="invite_members_total_wrap" id="0x7f0a0527" />
-    <public type="id" name="invite_members_wrap" id="0x7f0a0528" />
-    <public type="id" name="invite_message" id="0x7f0a0529" />
-    <public type="id" name="invite_name_container" id="0x7f0a052a" />
-    <public type="id" name="invite_settings_bottom_sheet" id="0x7f0a052b" />
-    <public type="id" name="invite_settings_icon" id="0x7f0a052c" />
-    <public type="id" name="invite_title" id="0x7f0a052d" />
-    <public type="id" name="invite_user_name" id="0x7f0a052e" />
-    <public type="id" name="invite_uses" id="0x7f0a052f" />
-    <public type="id" name="invite_uses_label" id="0x7f0a0530" />
-    <public type="id" name="italic" id="0x7f0a0531" />
-    <public type="id" name="item_backup_code_tv" id="0x7f0a0532" />
-    <public type="id" name="item_check_indicator" id="0x7f0a0533" />
-    <public type="id" name="item_description_tv" id="0x7f0a0534" />
-    <public type="id" name="item_game_invite" id="0x7f0a0535" />
-    <public type="id" name="item_game_invite_action_btn" id="0x7f0a0536" />
-    <public type="id" name="item_game_invite_application_name_tv" id="0x7f0a0537" />
-    <public type="id" name="item_game_invite_avatar_iv" id="0x7f0a0538" />
-    <public type="id" name="item_game_invite_avatar_status_iv" id="0x7f0a0539" />
-    <public type="id" name="item_game_invite_barrier" id="0x7f0a053a" />
-    <public type="id" name="item_game_invite_cover_iv" id="0x7f0a053b" />
-    <public type="id" name="item_game_invite_header" id="0x7f0a053c" />
-    <public type="id" name="item_game_invite_recycler" id="0x7f0a053d" />
-    <public type="id" name="item_game_invite_subtext" id="0x7f0a053e" />
-    <public type="id" name="item_gift_accept_button" id="0x7f0a053f" />
-    <public type="id" name="item_gift_cannot_claim_button" id="0x7f0a0540" />
-    <public type="id" name="item_gift_details" id="0x7f0a0541" />
-    <public type="id" name="item_gift_expires" id="0x7f0a0542" />
-    <public type="id" name="item_gift_header" id="0x7f0a0543" />
-    <public type="id" name="item_gift_image" id="0x7f0a0544" />
-    <public type="id" name="item_gift_image_background" id="0x7f0a0545" />
-    <public type="id" name="item_gift_loading_button_placeholder" id="0x7f0a0546" />
-    <public type="id" name="item_gift_name" id="0x7f0a0547" />
-    <public type="id" name="item_gift_subtext" id="0x7f0a0548" />
-    <public type="id" name="item_gift_verify_button" id="0x7f0a0549" />
-    <public type="id" name="item_group_tv" id="0x7f0a054a" />
-    <public type="id" name="item_guild_template_header" id="0x7f0a054b" />
-    <public type="id" name="item_guild_template_image" id="0x7f0a054c" />
-    <public type="id" name="item_guild_template_join_button" id="0x7f0a054d" />
-    <public type="id" name="item_guild_template_name" id="0x7f0a054e" />
-    <public type="id" name="item_guild_template_subtext" id="0x7f0a054f" />
-    <public type="id" name="item_guild_welcome_header" id="0x7f0a0550" />
-    <public type="id" name="item_guild_welcome_subheader" id="0x7f0a0551" />
-    <public type="id" name="item_header" id="0x7f0a0552" />
-    <public type="id" name="item_header_tv" id="0x7f0a0553" />
-    <public type="id" name="item_icon_iv" id="0x7f0a0554" />
-    <public type="id" name="item_invite_btn" id="0x7f0a0555" />
-    <public type="id" name="item_invite_channel_name" id="0x7f0a0556" />
-    <public type="id" name="item_invite_header" id="0x7f0a0557" />
-    <public type="id" name="item_invite_image" id="0x7f0a0558" />
-    <public type="id" name="item_invite_image_text" id="0x7f0a0559" />
-    <public type="id" name="item_invite_join_button" id="0x7f0a055a" />
-    <public type="id" name="item_invite_joined_button" id="0x7f0a055b" />
-    <public type="id" name="item_invite_loading_button" id="0x7f0a055c" />
-    <public type="id" name="item_invite_member_container" id="0x7f0a055d" />
-    <public type="id" name="item_invite_mention_button" id="0x7f0a055e" />
-    <public type="id" name="item_invite_name" id="0x7f0a055f" />
-    <public type="id" name="item_invite_online_dot" id="0x7f0a0560" />
-    <public type="id" name="item_invite_online_text" id="0x7f0a0561" />
-    <public type="id" name="item_invite_total_member_dot" id="0x7f0a0562" />
-    <public type="id" name="item_invite_total_member_text" id="0x7f0a0563" />
-    <public type="id" name="item_listen_together_album_image" id="0x7f0a0564" />
-    <public type="id" name="item_listen_together_artist" id="0x7f0a0565" />
-    <public type="id" name="item_listen_together_container" id="0x7f0a0566" />
-    <public type="id" name="item_listen_together_header" id="0x7f0a0567" />
-    <public type="id" name="item_listen_together_join" id="0x7f0a0568" />
-    <public type="id" name="item_listen_together_recycler" id="0x7f0a0569" />
-    <public type="id" name="item_listen_together_session_ended" id="0x7f0a056a" />
-    <public type="id" name="item_listen_together_track" id="0x7f0a056b" />
-    <public type="id" name="item_mentions_tv" id="0x7f0a056c" />
-    <public type="id" name="item_name_tv" id="0x7f0a056d" />
-    <public type="id" name="item_sent" id="0x7f0a056e" />
-    <public type="id" name="item_touch_helper_previous_elevation" id="0x7f0a056f" />
-    <public type="id" name="item_unread" id="0x7f0a0570" />
-    <public type="id" name="jpeg" id="0x7f0a0571" />
-    <public type="id" name="kick_user_body" id="0x7f0a0572" />
-    <public type="id" name="kick_user_cancel" id="0x7f0a0573" />
-    <public type="id" name="kick_user_confirm" id="0x7f0a0574" />
-    <public type="id" name="kick_user_reason" id="0x7f0a0575" />
-    <public type="id" name="kick_user_title" id="0x7f0a0576" />
-    <public type="id" name="labeled" id="0x7f0a0577" />
-    <public type="id" name="large" id="0x7f0a0578" />
-    <public type="id" name="largeLabel" id="0x7f0a0579" />
-    <public type="id" name="large_icon_uri" id="0x7f0a057a" />
-    <public type="id" name="launch_btn" id="0x7f0a057b" />
-    <public type="id" name="launch_camera_btn" id="0x7f0a057c" />
-    <public type="id" name="layout_aspect_ratio" id="0x7f0a057d" />
-    <public type="id" name="layout_rotate_wheel" id="0x7f0a057e" />
-    <public type="id" name="layout_scale_wheel" id="0x7f0a057f" />
-    <public type="id" name="leave_guild_cancel_btn" id="0x7f0a0580" />
-    <public type="id" name="leave_guild_confirm_btn" id="0x7f0a0581" />
-    <public type="id" name="leave_guild_dialog_body" id="0x7f0a0582" />
-    <public type="id" name="leave_guild_dialog_header" id="0x7f0a0583" />
-    <public type="id" name="left" id="0x7f0a0584" />
-    <public type="id" name="light" id="0x7f0a0585" />
-    <public type="id" name="line1" id="0x7f0a0586" />
-    <public type="id" name="line3" id="0x7f0a0587" />
-    <public type="id" name="linear" id="0x7f0a0588" />
-    <public type="id" name="list" id="0x7f0a0589" />
-    <public type="id" name="listMode" id="0x7f0a058a" />
-    <public type="id" name="list_item" id="0x7f0a058b" />
-    <public type="id" name="loading_button_button" id="0x7f0a058c" />
-    <public type="id" name="loading_button_progress" id="0x7f0a058d" />
-    <public type="id" name="lottie_layer_name" id="0x7f0a058e" />
-    <public type="id" name="main_panel_right_rounded_container" id="0x7f0a058f" />
-    <public type="id" name="manage_reactions_emoji_container" id="0x7f0a0590" />
-    <public type="id" name="manage_reactions_emoji_counter" id="0x7f0a0591" />
-    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7f0a0592" />
-    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7f0a0593" />
-    <public type="id" name="manage_reactions_emojis_recycler" id="0x7f0a0594" />
-    <public type="id" name="manage_reactions_result_error_img" id="0x7f0a0595" />
-    <public type="id" name="manage_reactions_result_error_text" id="0x7f0a0596" />
-    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7f0a0597" />
-    <public type="id" name="manage_reactions_result_user_avatar" id="0x7f0a0598" />
-    <public type="id" name="manage_reactions_result_user_name" id="0x7f0a0599" />
-    <public type="id" name="manage_reactions_results_recycler" id="0x7f0a059a" />
-    <public type="id" name="masked" id="0x7f0a059b" />
-    <public type="id" name="masked_links_body_text" id="0x7f0a059c" />
-    <public type="id" name="masked_links_cancel" id="0x7f0a059d" />
-    <public type="id" name="masked_links_confirm" id="0x7f0a059e" />
-    <public type="id" name="masked_links_trust_domain" id="0x7f0a059f" />
-    <public type="id" name="match_global_nicknames" id="0x7f0a05a0" />
-    <public type="id" name="media_actions" id="0x7f0a05a1" />
-    <public type="id" name="member_list_item_avatar" id="0x7f0a05a2" />
-    <public type="id" name="member_list_item_container" id="0x7f0a05a3" />
-    <public type="id" name="member_list_item_lock" id="0x7f0a05a4" />
-    <public type="id" name="member_list_item_name" id="0x7f0a05a5" />
-    <public type="id" name="member_list_item_overflow" id="0x7f0a05a6" />
-    <public type="id" name="member_list_item_roles_list" id="0x7f0a05a7" />
-    <public type="id" name="menu_add_connections" id="0x7f0a05a8" />
-    <public type="id" name="menu_audit_log_sort_actions" id="0x7f0a05a9" />
-    <public type="id" name="menu_audit_log_sort_users" id="0x7f0a05aa" />
-    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7f0a05ab" />
-    <public type="id" name="menu_auth_mfa_info" id="0x7f0a05ac" />
-    <public type="id" name="menu_call_overlay_launcher" id="0x7f0a05ad" />
-    <public type="id" name="menu_call_switch_camera" id="0x7f0a05ae" />
-    <public type="id" name="menu_call_video_list" id="0x7f0a05af" />
-    <public type="id" name="menu_call_voice_settings" id="0x7f0a05b0" />
-    <public type="id" name="menu_channel_settings_delete" id="0x7f0a05b1" />
-    <public type="id" name="menu_channel_settings_reset" id="0x7f0a05b2" />
-    <public type="id" name="menu_chat_add_friend" id="0x7f0a05b3" />
-    <public type="id" name="menu_chat_search" id="0x7f0a05b4" />
-    <public type="id" name="menu_chat_side_panel" id="0x7f0a05b5" />
-    <public type="id" name="menu_chat_start_call" id="0x7f0a05b6" />
-    <public type="id" name="menu_chat_start_group" id="0x7f0a05b7" />
-    <public type="id" name="menu_chat_start_video_call" id="0x7f0a05b8" />
-    <public type="id" name="menu_chat_stop_call" id="0x7f0a05b9" />
-    <public type="id" name="menu_code_verification_paste" id="0x7f0a05ba" />
-    <public type="id" name="menu_copy_id" id="0x7f0a05bb" />
-    <public type="id" name="menu_crop" id="0x7f0a05bc" />
-    <public type="id" name="menu_debugging_filter" id="0x7f0a05bd" />
-    <public type="id" name="menu_debugging_share" id="0x7f0a05be" />
-    <public type="id" name="menu_edit_overwrite_delete" id="0x7f0a05bf" />
-    <public type="id" name="menu_edit_role_delete" id="0x7f0a05c0" />
-    <public type="id" name="menu_filter" id="0x7f0a05c1" />
-    <public type="id" name="menu_friends_add_friend" id="0x7f0a05c2" />
-    <public type="id" name="menu_friends_start_group" id="0x7f0a05c3" />
-    <public type="id" name="menu_leave_group" id="0x7f0a05c4" />
-    <public type="id" name="menu_loader" id="0x7f0a05c5" />
-    <public type="id" name="menu_media_browser" id="0x7f0a05c6" />
-    <public type="id" name="menu_media_download" id="0x7f0a05c7" />
-    <public type="id" name="menu_media_share" id="0x7f0a05c8" />
-    <public type="id" name="menu_premium_guild" id="0x7f0a05c9" />
-    <public type="id" name="menu_private_channel_sidebar_close" id="0x7f0a05ca" />
-    <public type="id" name="menu_private_channel_sidebar_copy_id" id="0x7f0a05cb" />
-    <public type="id" name="menu_private_channel_sidebar_customize_gorup" id="0x7f0a05cc" />
-    <public type="id" name="menu_private_channel_sidebar_pinned_messages" id="0x7f0a05cd" />
-    <public type="id" name="menu_send" id="0x7f0a05ce" />
-    <public type="id" name="menu_server_settings_delete" id="0x7f0a05cf" />
-    <public type="id" name="menu_server_settings_emoji_delete" id="0x7f0a05d0" />
-    <public type="id" name="menu_server_settings_members_prune" id="0x7f0a05d1" />
-    <public type="id" name="menu_settings_debugging" id="0x7f0a05d2" />
-    <public type="id" name="menu_settings_log_out" id="0x7f0a05d3" />
-    <public type="id" name="menu_settings_premium_guild_sub_cancel" id="0x7f0a05d4" />
-    <public type="id" name="menu_settings_premium_guild_sub_transfer" id="0x7f0a05d5" />
-    <public type="id" name="menu_settings_premium_guild_sub_uncancel" id="0x7f0a05d6" />
-    <public type="id" name="menu_sort_channel" id="0x7f0a05d7" />
-    <public type="id" name="menu_sort_done" id="0x7f0a05d8" />
-    <public type="id" name="menu_user_mentions_filter" id="0x7f0a05d9" />
-    <public type="id" name="message" id="0x7f0a05da" />
-    <public type="id" name="mfa_description_text" id="0x7f0a05db" />
-    <public type="id" name="mfa_download_body" id="0x7f0a05dc" />
-    <public type="id" name="mfa_success_enable_sms" id="0x7f0a05dd" />
-    <public type="id" name="middle" id="0x7f0a05de" />
-    <public type="id" name="mini" id="0x7f0a05df" />
-    <public type="id" name="mono" id="0x7f0a05e0" />
-    <public type="id" name="month_grid" id="0x7f0a05e1" />
-    <public type="id" name="month_navigation_bar" id="0x7f0a05e2" />
-    <public type="id" name="month_navigation_fragment_toggle" id="0x7f0a05e3" />
-    <public type="id" name="month_navigation_next" id="0x7f0a05e4" />
-    <public type="id" name="month_navigation_previous" id="0x7f0a05e5" />
-    <public type="id" name="month_title" id="0x7f0a05e6" />
-    <public type="id" name="mtrl_calendar_day_selector_frame" id="0x7f0a05e7" />
-    <public type="id" name="mtrl_calendar_days_of_week" id="0x7f0a05e8" />
-    <public type="id" name="mtrl_calendar_frame" id="0x7f0a05e9" />
-    <public type="id" name="mtrl_calendar_main_pane" id="0x7f0a05ea" />
-    <public type="id" name="mtrl_calendar_months" id="0x7f0a05eb" />
-    <public type="id" name="mtrl_calendar_selection_frame" id="0x7f0a05ec" />
-    <public type="id" name="mtrl_calendar_text_input_frame" id="0x7f0a05ed" />
-    <public type="id" name="mtrl_calendar_year_selector_frame" id="0x7f0a05ee" />
-    <public type="id" name="mtrl_card_checked_layer_id" id="0x7f0a05ef" />
-    <public type="id" name="mtrl_child_content_container" id="0x7f0a05f0" />
-    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7f0a05f1" />
-    <public type="id" name="mtrl_motion_snapshot_view" id="0x7f0a05f2" />
-    <public type="id" name="mtrl_picker_fullscreen" id="0x7f0a05f3" />
-    <public type="id" name="mtrl_picker_header" id="0x7f0a05f4" />
-    <public type="id" name="mtrl_picker_header_selection_text" id="0x7f0a05f5" />
-    <public type="id" name="mtrl_picker_header_title_and_selection" id="0x7f0a05f6" />
-    <public type="id" name="mtrl_picker_header_toggle" id="0x7f0a05f7" />
-    <public type="id" name="mtrl_picker_text_input_date" id="0x7f0a05f8" />
-    <public type="id" name="mtrl_picker_text_input_range_end" id="0x7f0a05f9" />
-    <public type="id" name="mtrl_picker_text_input_range_start" id="0x7f0a05fa" />
-    <public type="id" name="mtrl_picker_title_text" id="0x7f0a05fb" />
-    <public type="id" name="multiply" id="0x7f0a05fc" />
-    <public type="id" name="mute_settings_sheet_channel_muted_details" id="0x7f0a05fd" />
-    <public type="id" name="mute_settings_sheet_mute_options" id="0x7f0a05fe" />
-    <public type="id" name="mute_settings_sheet_notification_settings_button" id="0x7f0a05ff" />
-    <public type="id" name="mute_settings_sheet_notification_settings_button_container" id="0x7f0a0600" />
-    <public type="id" name="mute_settings_sheet_notification_settings_label" id="0x7f0a0601" />
-    <public type="id" name="mute_settings_sheet_notification_settings_overrides_label" id="0x7f0a0602" />
-    <public type="id" name="mute_settings_sheet_option_always" id="0x7f0a0603" />
-    <public type="id" name="mute_settings_sheet_option_eight_hours" id="0x7f0a0604" />
-    <public type="id" name="mute_settings_sheet_option_fifteen_minutes" id="0x7f0a0605" />
-    <public type="id" name="mute_settings_sheet_option_one_hour" id="0x7f0a0606" />
-    <public type="id" name="mute_settings_sheet_option_twenty_four_hours" id="0x7f0a0607" />
-    <public type="id" name="mute_settings_sheet_subtitle" id="0x7f0a0608" />
-    <public type="id" name="mute_settings_sheet_title" id="0x7f0a0609" />
-    <public type="id" name="mute_settings_sheet_unmute_button" id="0x7f0a060a" />
-    <public type="id" name="mute_settings_sheet_unmute_button_details_label" id="0x7f0a060b" />
-    <public type="id" name="mute_settings_sheet_unmute_button_label" id="0x7f0a060c" />
-    <public type="id" name="mute_toggle" id="0x7f0a060d" />
-    <public type="id" name="navigation_header_container" id="0x7f0a060e" />
-    <public type="id" name="navigation_help_close" id="0x7f0a060f" />
-    <public type="id" name="navigation_help_indicators" id="0x7f0a0610" />
-    <public type="id" name="navigation_help_nux_pager" id="0x7f0a0611" />
-    <public type="id" name="navigation_indicator" id="0x7f0a0612" />
-    <public type="id" name="nearby_friends_enable" id="0x7f0a0613" />
-    <public type="id" name="nearby_friends_learn_more" id="0x7f0a0614" />
-    <public type="id" name="nearby_friends_recycler" id="0x7f0a0615" />
-    <public type="id" name="nearby_friends_searching_body" id="0x7f0a0616" />
-    <public type="id" name="nearby_friends_searching_lottie" id="0x7f0a0617" />
-    <public type="id" name="nearby_friends_searching_title" id="0x7f0a0618" />
-    <public type="id" name="never" id="0x7f0a0619" />
-    <public type="id" name="noScroll" id="0x7f0a061a" />
-    <public type="id" name="no_bans_body" id="0x7f0a061b" />
-    <public type="id" name="no_invites_body" id="0x7f0a061c" />
-    <public type="id" name="no_invites_header" id="0x7f0a061d" />
-    <public type="id" name="no_logs_body" id="0x7f0a061e" />
-    <public type="id" name="no_logs_title" id="0x7f0a061f" />
-    <public type="id" name="no_results_text" id="0x7f0a0620" />
-    <public type="id" name="noise_cancellation_enable_button" id="0x7f0a0621" />
-    <public type="id" name="noise_cancellation_learn_more" id="0x7f0a0622" />
-    <public type="id" name="none" id="0x7f0a0623" />
-    <public type="id" name="normal" id="0x7f0a0624" />
-    <public type="id" name="notice_body_container" id="0x7f0a0625" />
-    <public type="id" name="notice_body_text" id="0x7f0a0626" />
-    <public type="id" name="notice_cancel" id="0x7f0a0627" />
-    <public type="id" name="notice_crop" id="0x7f0a0628" />
-    <public type="id" name="notice_header" id="0x7f0a0629" />
-    <public type="id" name="notice_header_container" id="0x7f0a062a" />
-    <public type="id" name="notice_image" id="0x7f0a062b" />
-    <public type="id" name="notice_ok" id="0x7f0a062c" />
-    <public type="id" name="notice_upload" id="0x7f0a062d" />
-    <public type="id" name="notification_background" id="0x7f0a062e" />
-    <public type="id" name="notification_main_column" id="0x7f0a062f" />
-    <public type="id" name="notification_main_column_container" id="0x7f0a0630" />
-    <public type="id" name="notification_mute_settings_mute_item" id="0x7f0a0631" />
-    <public type="id" name="notification_mute_settings_mute_item_description" id="0x7f0a0632" />
-    <public type="id" name="notification_mute_settings_mute_item_status" id="0x7f0a0633" />
-    <public type="id" name="nowrap" id="0x7f0a0634" />
-    <public type="id" name="nuf_channel_prompt_cta_button" id="0x7f0a0635" />
-    <public type="id" name="nuf_channel_prompt_guild_icon" id="0x7f0a0636" />
-    <public type="id" name="nuf_channel_prompt_guild_icon_name" id="0x7f0a0637" />
-    <public type="id" name="nuf_channel_prompt_guild_name" id="0x7f0a0638" />
-    <public type="id" name="nuf_channel_prompt_skip_button" id="0x7f0a0639" />
-    <public type="id" name="nuf_channel_prompt_topic_wrap" id="0x7f0a063a" />
-    <public type="id" name="numeric" id="0x7f0a063b" />
-    <public type="id" name="nux_guild_template_action_club" id="0x7f0a063c" />
-    <public type="id" name="nux_guild_template_action_community" id="0x7f0a063d" />
-    <public type="id" name="nux_guild_template_action_create" id="0x7f0a063e" />
-    <public type="id" name="nux_guild_template_action_creator" id="0x7f0a063f" />
-    <public type="id" name="nux_guild_template_action_friend" id="0x7f0a0640" />
-    <public type="id" name="nux_guild_template_action_gaming" id="0x7f0a0641" />
-    <public type="id" name="nux_guild_template_action_join" id="0x7f0a0642" />
-    <public type="id" name="nux_guild_template_action_study" id="0x7f0a0643" />
-    <public type="id" name="nux_guild_template_section_bottom" id="0x7f0a0644" />
-    <public type="id" name="nux_guild_template_section_custom" id="0x7f0a0645" />
-    <public type="id" name="nux_guild_template_section_custom_label" id="0x7f0a0646" />
-    <public type="id" name="nux_guild_template_section_top" id="0x7f0a0647" />
-    <public type="id" name="oauth_application_deauthorize_btn" id="0x7f0a0648" />
-    <public type="id" name="oauth_application_description_label_tv" id="0x7f0a0649" />
-    <public type="id" name="oauth_application_description_tv" id="0x7f0a064a" />
-    <public type="id" name="oauth_application_icon_iv" id="0x7f0a064b" />
-    <public type="id" name="oauth_application_name_tv" id="0x7f0a064c" />
-    <public type="id" name="oauth_application_permissions_rv" id="0x7f0a064d" />
-    <public type="id" name="oauth_authorize_age_notice" id="0x7f0a064e" />
-    <public type="id" name="oauth_authorize_age_notice_icon" id="0x7f0a064f" />
-    <public type="id" name="oauth_authorize_application_icon" id="0x7f0a0650" />
-    <public type="id" name="oauth_authorize_application_name" id="0x7f0a0651" />
-    <public type="id" name="oauth_authorize_card" id="0x7f0a0652" />
-    <public type="id" name="oauth_authorize_connect_label" id="0x7f0a0653" />
-    <public type="id" name="oauth_authorize_content" id="0x7f0a0654" />
-    <public type="id" name="oauth_authorize_deny" id="0x7f0a0655" />
-    <public type="id" name="oauth_authorize_grant" id="0x7f0a0656" />
-    <public type="id" name="oauth_authorize_loading" id="0x7f0a0657" />
-    <public type="id" name="oauth_authorize_loading_cancel" id="0x7f0a0658" />
-    <public type="id" name="oauth_authorize_logo" id="0x7f0a0659" />
-    <public type="id" name="oauth_authorize_not_supported" id="0x7f0a065a" />
-    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7f0a065b" />
-    <public type="id" name="oauth_authorize_permissions_list" id="0x7f0a065c" />
-    <public type="id" name="oauth_authorize_security_notice" id="0x7f0a065d" />
-    <public type="id" name="oauth_authorize_security_notice_icon" id="0x7f0a065e" />
-    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7f0a065f" />
-    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7f0a0660" />
-    <public type="id" name="oauth_authorize_user_icon" id="0x7f0a0661" />
-    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7f0a0662" />
-    <public type="id" name="oauth_token_permission_detailed_name" id="0x7f0a0663" />
-    <public type="id" name="off" id="0x7f0a0664" />
-    <public type="id" name="off_disabled_overlay" id="0x7f0a0665" />
-    <public type="id" name="omnibox_title_section" id="0x7f0a0666" />
-    <public type="id" name="omnibox_url_section" id="0x7f0a0667" />
-    <public type="id" name="on" id="0x7f0a0668" />
-    <public type="id" name="one" id="0x7f0a0669" />
-    <public type="id" name="outgoing" id="0x7f0a066a" />
-    <public type="id" name="outline" id="0x7f0a066b" />
-    <public type="id" name="overlay_bubble_iv" id="0x7f0a066c" />
-    <public type="id" name="overlay_channel_name" id="0x7f0a066d" />
-    <public type="id" name="overlay_channel_search" id="0x7f0a066e" />
-    <public type="id" name="overlay_guild_name" id="0x7f0a066f" />
-    <public type="id" name="overlay_header" id="0x7f0a0670" />
-    <public type="id" name="overlay_invite_link" id="0x7f0a0671" />
-    <public type="id" name="overlay_linked_anchor_view" id="0x7f0a0672" />
-    <public type="id" name="overlay_members_overflow_tv" id="0x7f0a0673" />
-    <public type="id" name="overlay_members_rv" id="0x7f0a0674" />
-    <public type="id" name="overlay_menu" id="0x7f0a0675" />
-    <public type="id" name="overlay_network_icon" id="0x7f0a0676" />
-    <public type="id" name="overlay_open_app" id="0x7f0a0677" />
-    <public type="id" name="overlay_switch_channels" id="0x7f0a0678" />
-    <public type="id" name="packed" id="0x7f0a0679" />
-    <public type="id" name="page_tabs" id="0x7f0a067a" />
-    <public type="id" name="parallax" id="0x7f0a067b" />
-    <public type="id" name="parent" id="0x7f0a067c" />
-    <public type="id" name="parentPanel" id="0x7f0a067d" />
-    <public type="id" name="parent_matrix" id="0x7f0a067e" />
-    <public type="id" name="participant_bg_avatar" id="0x7f0a067f" />
-    <public type="id" name="participant_bg_letterbox" id="0x7f0a0680" />
-    <public type="id" name="participant_deafen_status_indicator" id="0x7f0a0681" />
-    <public type="id" name="participant_live_indicator" id="0x7f0a0682" />
-    <public type="id" name="participant_mute_status_indicator" id="0x7f0a0683" />
-    <public type="id" name="participant_stream_paused" id="0x7f0a0684" />
-    <public type="id" name="participant_stream_preview_image" id="0x7f0a0685" />
-    <public type="id" name="participant_stream_preview_text" id="0x7f0a0686" />
-    <public type="id" name="participant_video_label" id="0x7f0a0687" />
-    <public type="id" name="participant_video_loading_indicator" id="0x7f0a0688" />
-    <public type="id" name="participant_video_stream_renderer" id="0x7f0a0689" />
-    <public type="id" name="participant_voice_indicators" id="0x7f0a068a" />
-    <public type="id" name="participant_voice_user_view" id="0x7f0a068b" />
-    <public type="id" name="password_toggle" id="0x7f0a068c" />
-    <public type="id" name="payment_method_edit" id="0x7f0a068d" />
-    <public type="id" name="payment_method_header" id="0x7f0a068e" />
-    <public type="id" name="payment_method_summary" id="0x7f0a068f" />
-    <public type="id" name="payment_methods_empty_add" id="0x7f0a0690" />
-    <public type="id" name="payment_methods_empty_image" id="0x7f0a0691" />
-    <public type="id" name="payment_methods_empty_subtext" id="0x7f0a0692" />
-    <public type="id" name="payment_methods_empty_title" id="0x7f0a0693" />
-    <public type="id" name="payment_methods_loading" id="0x7f0a0694" />
-    <public type="id" name="payment_methods_recycler" id="0x7f0a0695" />
-    <public type="id" name="payment_methods_retry" id="0x7f0a0696" />
-    <public type="id" name="payment_methods_view_flipper" id="0x7f0a0697" />
-    <public type="id" name="payment_source_edit_address1" id="0x7f0a0698" />
-    <public type="id" name="payment_source_edit_address2" id="0x7f0a0699" />
-    <public type="id" name="payment_source_edit_city" id="0x7f0a069a" />
-    <public type="id" name="payment_source_edit_country" id="0x7f0a069b" />
-    <public type="id" name="payment_source_edit_default" id="0x7f0a069c" />
-    <public type="id" name="payment_source_edit_error" id="0x7f0a069d" />
-    <public type="id" name="payment_source_edit_help" id="0x7f0a069e" />
-    <public type="id" name="payment_source_edit_name" id="0x7f0a069f" />
-    <public type="id" name="payment_source_edit_postal_code" id="0x7f0a06a0" />
-    <public type="id" name="payment_source_edit_state" id="0x7f0a06a1" />
-    <public type="id" name="payment_source_summary" id="0x7f0a06a2" />
-    <public type="id" name="payment_source_view_icon" id="0x7f0a06a3" />
-    <public type="id" name="payment_source_view_icon_wrapper" id="0x7f0a06a4" />
-    <public type="id" name="payment_source_view_invalid" id="0x7f0a06a5" />
-    <public type="id" name="payment_source_view_premium" id="0x7f0a06a6" />
-    <public type="id" name="payment_source_view_subtext" id="0x7f0a06a7" />
-    <public type="id" name="payment_source_view_title" id="0x7f0a06a8" />
-    <public type="id" name="peekHeight" id="0x7f0a06a9" />
-    <public type="id" name="percent" id="0x7f0a06aa" />
-    <public type="id" name="perk_view_content_list_item" id="0x7f0a06ab" />
-    <public type="id" name="perks_level_contents_header" id="0x7f0a06ac" />
-    <public type="id" name="perks_level_contents_recycler" id="0x7f0a06ad" />
-    <public type="id" name="perks_level_header" id="0x7f0a06ae" />
-    <public type="id" name="perks_level_header_boosts" id="0x7f0a06af" />
-    <public type="id" name="perks_level_header_boosts_container" id="0x7f0a06b0" />
-    <public type="id" name="perks_level_header_text" id="0x7f0a06b1" />
-    <public type="id" name="perks_level_header_unlocked" id="0x7f0a06b2" />
-    <public type="id" name="perm_req_text" id="0x7f0a06b3" />
-    <public type="id" name="permissions_req_btn" id="0x7f0a06b4" />
-    <public type="id" name="permissions_required_action_btn" id="0x7f0a06b5" />
-    <public type="id" name="permissions_required_text" id="0x7f0a06b6" />
-    <public type="id" name="permissions_view_stub" id="0x7f0a06b7" />
-    <public type="id" name="picture" id="0x7f0a06b8" />
-    <public type="id" name="pin" id="0x7f0a06b9" />
-    <public type="id" name="plain" id="0x7f0a06ba" />
-    <public type="id" name="popup_attachment" id="0x7f0a06bb" />
-    <public type="id" name="popup_body" id="0x7f0a06bc" />
-    <public type="id" name="popup_close_btn" id="0x7f0a06bd" />
-    <public type="id" name="popup_countdown_progress" id="0x7f0a06be" />
-    <public type="id" name="popup_icon" id="0x7f0a06bf" />
-    <public type="id" name="popup_subtitle" id="0x7f0a06c0" />
-    <public type="id" name="popup_title" id="0x7f0a06c1" />
-    <public type="id" name="premium_guild_confirmation_avatar" id="0x7f0a06c2" />
-    <public type="id" name="premium_guild_confirmation_guild_name" id="0x7f0a06c3" />
-    <public type="id" name="premium_guild_confirmation_level_info_previous" id="0x7f0a06c4" />
-    <public type="id" name="premium_guild_confirmation_level_info_upgrade" id="0x7f0a06c5" />
-    <public type="id" name="premium_guild_confirmation_upgrade_arrow" id="0x7f0a06c6" />
-    <public type="id" name="premium_guild_subscription_activated_body1" id="0x7f0a06c7" />
-    <public type="id" name="premium_guild_subscription_activated_body2" id="0x7f0a06c8" />
-    <public type="id" name="premium_guild_subscription_activated_lottie" id="0x7f0a06c9" />
-    <public type="id" name="premium_guild_subscription_activated_ok" id="0x7f0a06ca" />
-    <public type="id" name="premium_guild_subscription_cancel_body" id="0x7f0a06cb" />
-    <public type="id" name="premium_guild_subscription_cancel_confirm" id="0x7f0a06cc" />
-    <public type="id" name="premium_guild_subscription_cancel_error" id="0x7f0a06cd" />
-    <public type="id" name="premium_guild_subscription_cancel_flipper" id="0x7f0a06ce" />
-    <public type="id" name="premium_guild_subscription_cancel_header" id="0x7f0a06cf" />
-    <public type="id" name="premium_guild_subscription_cancel_nevermind" id="0x7f0a06d0" />
-    <public type="id" name="premium_guild_subscription_uncancel_body" id="0x7f0a06d1" />
-    <public type="id" name="premium_guild_subscription_uncancel_confirm" id="0x7f0a06d2" />
-    <public type="id" name="premium_guild_subscription_uncancel_error" id="0x7f0a06d3" />
-    <public type="id" name="premium_guild_subscription_uncancel_flipper" id="0x7f0a06d4" />
-    <public type="id" name="premium_guild_subscription_uncancel_header" id="0x7f0a06d5" />
-    <public type="id" name="premium_guild_subscription_uncancel_image" id="0x7f0a06d6" />
-    <public type="id" name="premium_guild_subscription_uncancel_nevermind" id="0x7f0a06d7" />
-    <public type="id" name="premium_guild_transfer_confirmation_blurb" id="0x7f0a06d8" />
-    <public type="id" name="premium_guild_transfer_error" id="0x7f0a06d9" />
-    <public type="id" name="premium_guild_transfer_previous_guild" id="0x7f0a06da" />
-    <public type="id" name="premium_guild_transfer_previous_guild_header" id="0x7f0a06db" />
-    <public type="id" name="premium_guild_transfer_select" id="0x7f0a06dc" />
-    <public type="id" name="premium_guild_transfer_target_guild" id="0x7f0a06dd" />
-    <public type="id" name="premium_guild_transfer_target_guild_header" id="0x7f0a06de" />
-    <public type="id" name="premium_perks_upload_text" id="0x7f0a06df" />
-    <public type="id" name="premium_settings_active_guild_subscription" id="0x7f0a06e0" />
-    <public type="id" name="premium_settings_active_subscription" id="0x7f0a06e1" />
-    <public type="id" name="premium_settings_billing_divider" id="0x7f0a06e2" />
-    <public type="id" name="premium_settings_billing_information" id="0x7f0a06e3" />
-    <public type="id" name="premium_settings_credit_container" id="0x7f0a06e4" />
-    <public type="id" name="premium_settings_grandfathered" id="0x7f0a06e5" />
-    <public type="id" name="premium_settings_legalese" id="0x7f0a06e6" />
-    <public type="id" name="premium_settings_nitro" id="0x7f0a06e7" />
-    <public type="id" name="premium_settings_nitro_classic" id="0x7f0a06e8" />
-    <public type="id" name="premium_settings_nitro_classic_boost_count" id="0x7f0a06e9" />
-    <public type="id" name="premium_settings_nitro_classic_boost_discount" id="0x7f0a06ea" />
-    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7f0a06eb" />
-    <public type="id" name="premium_settings_nitro_wumpus" id="0x7f0a06ec" />
-    <public type="id" name="premium_settings_payment_container" id="0x7f0a06ed" />
-    <public type="id" name="premium_settings_premium_classic_gift" id="0x7f0a06ee" />
-    <public type="id" name="premium_settings_premium_classic_monthly" id="0x7f0a06ef" />
-    <public type="id" name="premium_settings_premium_classic_yearly" id="0x7f0a06f0" />
-    <public type="id" name="premium_settings_premium_gift" id="0x7f0a06f1" />
-    <public type="id" name="premium_settings_premium_monthly" id="0x7f0a06f2" />
-    <public type="id" name="premium_settings_premium_yearly" id="0x7f0a06f3" />
-    <public type="id" name="premium_settings_renew_mutation_btn" id="0x7f0a06f4" />
-    <public type="id" name="premium_settings_renew_mutation_container" id="0x7f0a06f5" />
-    <public type="id" name="premium_settings_renew_mutation_tv" id="0x7f0a06f6" />
-    <public type="id" name="premium_settings_retry" id="0x7f0a06f7" />
-    <public type="id" name="premium_settings_scrollview" id="0x7f0a06f8" />
-    <public type="id" name="premium_settings_subscription_container" id="0x7f0a06f9" />
-    <public type="id" name="premium_settings_tier_1_container" id="0x7f0a06fa" />
-    <public type="id" name="premium_settings_tier_2_container" id="0x7f0a06fb" />
-    <public type="id" name="premium_settings_view_flipper" id="0x7f0a06fc" />
-    <public type="id" name="premium_switch_cancel_btn" id="0x7f0a06fd" />
-    <public type="id" name="premium_switch_flipper" id="0x7f0a06fe" />
-    <public type="id" name="premium_switch_interval_header" id="0x7f0a06ff" />
-    <public type="id" name="premium_switch_interval_info" id="0x7f0a0700" />
-    <public type="id" name="premium_switch_interval_logo" id="0x7f0a0701" />
-    <public type="id" name="premium_switch_interval_radio_group" id="0x7f0a0702" />
-    <public type="id" name="premium_switch_interval_radio_month" id="0x7f0a0703" />
-    <public type="id" name="premium_switch_interval_radio_year" id="0x7f0a0704" />
-    <public type="id" name="premium_switch_page_background" id="0x7f0a0705" />
-    <public type="id" name="premium_switch_page_info" id="0x7f0a0706" />
-    <public type="id" name="premium_switch_page_logo" id="0x7f0a0707" />
-    <public type="id" name="premium_switch_page_monthly_price" id="0x7f0a0708" />
-    <public type="id" name="premium_switch_page_wumpus" id="0x7f0a0709" />
-    <public type="id" name="premium_switch_pager" id="0x7f0a070a" />
-    <public type="id" name="premium_switch_pager_header" id="0x7f0a070b" />
-    <public type="id" name="premium_switch_pager_tabs" id="0x7f0a070c" />
-    <public type="id" name="premium_switch_retry" id="0x7f0a070d" />
-    <public type="id" name="premium_switch_select_btn" id="0x7f0a070e" />
-    <public type="id" name="premium_upsell_body" id="0x7f0a070f" />
-    <public type="id" name="premium_upsell_close" id="0x7f0a0710" />
-    <public type="id" name="premium_upsell_dots" id="0x7f0a0711" />
-    <public type="id" name="premium_upsell_header" id="0x7f0a0712" />
-    <public type="id" name="premium_upsell_img" id="0x7f0a0713" />
-    <public type="id" name="premium_upsell_learn_more" id="0x7f0a0714" />
-    <public type="id" name="premium_upsell_viewpager" id="0x7f0a0715" />
-    <public type="id" name="preset" id="0x7f0a0716" />
-    <public type="id" name="private_call_container" id="0x7f0a0717" />
-    <public type="id" name="private_call_controls_audio_output" id="0x7f0a0718" />
-    <public type="id" name="private_call_controls_audio_output_more" id="0x7f0a0719" />
-    <public type="id" name="private_call_controls_disconnect" id="0x7f0a071a" />
-    <public type="id" name="private_call_controls_mute" id="0x7f0a071b" />
-    <public type="id" name="private_call_controls_stop_watching" id="0x7f0a071c" />
-    <public type="id" name="private_call_controls_video" id="0x7f0a071d" />
-    <public type="id" name="private_call_status_primary" id="0x7f0a071e" />
-    <public type="id" name="private_call_status_secondary" id="0x7f0a071f" />
-    <public type="id" name="private_call_users_recycler" id="0x7f0a0720" />
-    <public type="id" name="private_channel_sidebar_actions_call" id="0x7f0a0721" />
-    <public type="id" name="private_channel_sidebar_actions_notifications" id="0x7f0a0722" />
-    <public type="id" name="private_channel_sidebar_actions_search" id="0x7f0a0723" />
-    <public type="id" name="private_channel_sidebar_actions_video" id="0x7f0a0724" />
-    <public type="id" name="progress_bar" id="0x7f0a0725" />
-    <public type="id" name="progress_cancel_centered" id="0x7f0a0726" />
-    <public type="id" name="progress_cancel_top" id="0x7f0a0727" />
-    <public type="id" name="progress_circular" id="0x7f0a0728" />
-    <public type="id" name="progress_file_image" id="0x7f0a0729" />
-    <public type="id" name="progress_gem_icon" id="0x7f0a072a" />
-    <public type="id" name="progress_horizontal" id="0x7f0a072b" />
-    <public type="id" name="progress_level_text" id="0x7f0a072c" />
-    <public type="id" name="progress_progress" id="0x7f0a072d" />
-    <public type="id" name="progress_subtext" id="0x7f0a072e" />
-    <public type="id" name="progress_text" id="0x7f0a072f" />
-    <public type="id" name="prune_user_cancel" id="0x7f0a0730" />
-    <public type="id" name="prune_user_header" id="0x7f0a0731" />
-    <public type="id" name="prune_user_prune" id="0x7f0a0732" />
-    <public type="id" name="prune_users_estimate_text" id="0x7f0a0733" />
-    <public type="id" name="prune_users_history_1_radio" id="0x7f0a0734" />
-    <public type="id" name="prune_users_history_2_radio" id="0x7f0a0735" />
-    <public type="id" name="prune_users_loading_progressbar" id="0x7f0a0736" />
-    <public type="id" name="qr_scanner" id="0x7f0a0737" />
-    <public type="id" name="qr_scanner_chip" id="0x7f0a0738" />
-    <public type="id" name="radio" id="0x7f0a0739" />
-    <public type="id" name="reaction_counter_text_1" id="0x7f0a073a" />
-    <public type="id" name="reaction_counter_text_2" id="0x7f0a073b" />
-    <public type="id" name="reaction_counter_text_switcher" id="0x7f0a073c" />
-    <public type="id" name="reaction_emoji_text" id="0x7f0a073d" />
-    <public type="id" name="reaction_quick_add" id="0x7f0a073e" />
-    <public type="id" name="recycler_view" id="0x7f0a073f" />
-    <public type="id" name="regular" id="0x7f0a0740" />
-    <public type="id" name="remote_auth_cancel_button" id="0x7f0a0741" />
-    <public type="id" name="remote_auth_finish_button" id="0x7f0a0742" />
-    <public type="id" name="remote_auth_login_button" id="0x7f0a0743" />
-    <public type="id" name="remote_auth_not_found_cancel_button" id="0x7f0a0744" />
-    <public type="id" name="remote_auth_temporary_switch" id="0x7f0a0745" />
-    <public type="id" name="remote_auth_view_flipper" id="0x7f0a0746" />
-    <public type="id" name="restart" id="0x7f0a0747" />
-    <public type="id" name="result_count" id="0x7f0a0748" />
-    <public type="id" name="results_rv" id="0x7f0a0749" />
-    <public type="id" name="reverse" id="0x7f0a074a" />
-    <public type="id" name="rfc822" id="0x7f0a074b" />
-    <public type="id" name="rich_presence_container" id="0x7f0a074c" />
-    <public type="id" name="rich_presence_container_data" id="0x7f0a074d" />
-    <public type="id" name="rich_presence_details" id="0x7f0a074e" />
-    <public type="id" name="rich_presence_header" id="0x7f0a074f" />
-    <public type="id" name="rich_presence_image_large" id="0x7f0a0750" />
-    <public type="id" name="rich_presence_image_small" id="0x7f0a0751" />
-    <public type="id" name="rich_presence_image_small_wrap" id="0x7f0a0752" />
-    <public type="id" name="rich_presence_music_duration" id="0x7f0a0753" />
-    <public type="id" name="rich_presence_music_elapsed" id="0x7f0a0754" />
-    <public type="id" name="rich_presence_music_progress_container" id="0x7f0a0755" />
-    <public type="id" name="rich_presence_primary_button" id="0x7f0a0756" />
-    <public type="id" name="rich_presence_secondary_button" id="0x7f0a0757" />
-    <public type="id" name="rich_presence_state" id="0x7f0a0758" />
-    <public type="id" name="rich_presence_superbar" id="0x7f0a0759" />
-    <public type="id" name="rich_presence_time" id="0x7f0a075a" />
-    <public type="id" name="rich_presence_title" id="0x7f0a075b" />
-    <public type="id" name="right" id="0x7f0a075c" />
-    <public type="id" name="right_icon" id="0x7f0a075d" />
-    <public type="id" name="right_side" id="0x7f0a075e" />
-    <public type="id" name="role_item_checked_setting" id="0x7f0a075f" />
-    <public type="id" name="role_settings_add_reactions" id="0x7f0a0760" />
-    <public type="id" name="role_settings_administrator" id="0x7f0a0761" />
-    <public type="id" name="role_settings_attach_files" id="0x7f0a0762" />
-    <public type="id" name="role_settings_ban_members" id="0x7f0a0763" />
-    <public type="id" name="role_settings_change_nickname" id="0x7f0a0764" />
-    <public type="id" name="role_settings_color_disabled_overlay" id="0x7f0a0765" />
-    <public type="id" name="role_settings_color_selector_container" id="0x7f0a0766" />
-    <public type="id" name="role_settings_create_instant_invite" id="0x7f0a0767" />
-    <public type="id" name="role_settings_current_color_display" id="0x7f0a0768" />
-    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7f0a0769" />
-    <public type="id" name="role_settings_embed_links" id="0x7f0a076a" />
-    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7f0a076b" />
-    <public type="id" name="role_settings_kick_members" id="0x7f0a076c" />
-    <public type="id" name="role_settings_manage_channels" id="0x7f0a076d" />
-    <public type="id" name="role_settings_manage_emojis" id="0x7f0a076e" />
-    <public type="id" name="role_settings_manage_messages" id="0x7f0a076f" />
-    <public type="id" name="role_settings_manage_nicknames" id="0x7f0a0770" />
-    <public type="id" name="role_settings_manage_roles" id="0x7f0a0771" />
-    <public type="id" name="role_settings_manage_server" id="0x7f0a0772" />
-    <public type="id" name="role_settings_manage_webhooks" id="0x7f0a0773" />
-    <public type="id" name="role_settings_mention_everyone" id="0x7f0a0774" />
-    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7f0a0775" />
-    <public type="id" name="role_settings_overview_scroll" id="0x7f0a0776" />
-    <public type="id" name="role_settings_read_message_history" id="0x7f0a0777" />
-    <public type="id" name="role_settings_read_messages" id="0x7f0a0778" />
-    <public type="id" name="role_settings_send_messages" id="0x7f0a0779" />
-    <public type="id" name="role_settings_send_tts_messages" id="0x7f0a077a" />
-    <public type="id" name="role_settings_use_external_emojis" id="0x7f0a077b" />
-    <public type="id" name="role_settings_view_audit_log" id="0x7f0a077c" />
-    <public type="id" name="role_settings_voice_connect" id="0x7f0a077d" />
-    <public type="id" name="role_settings_voice_deafen_members" id="0x7f0a077e" />
-    <public type="id" name="role_settings_voice_move_members" id="0x7f0a077f" />
-    <public type="id" name="role_settings_voice_mute_members" id="0x7f0a0780" />
-    <public type="id" name="role_settings_voice_speak" id="0x7f0a0781" />
-    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7f0a0782" />
-    <public type="id" name="role_spinner_item_textview" id="0x7f0a0783" />
-    <public type="id" name="roles_list_add_role_fab" id="0x7f0a0784" />
-    <public type="id" name="rotate_scroll_wheel" id="0x7f0a0785" />
-    <public type="id" name="rounded" id="0x7f0a0786" />
-    <public type="id" name="row" id="0x7f0a0787" />
-    <public type="id" name="row_index_key" id="0x7f0a0788" />
-    <public type="id" name="row_reverse" id="0x7f0a0789" />
-    <public type="id" name="save_non_transition_alpha" id="0x7f0a078a" />
-    <public type="id" name="save_overlay_view" id="0x7f0a078b" />
-    <public type="id" name="scale" id="0x7f0a078c" />
-    <public type="id" name="scale_scroll_wheel" id="0x7f0a078d" />
-    <public type="id" name="screen" id="0x7f0a078e" />
-    <public type="id" name="screen_title_subtitle" id="0x7f0a078f" />
-    <public type="id" name="screen_title_title" id="0x7f0a0790" />
-    <public type="id" name="scroll" id="0x7f0a0791" />
-    <public type="id" name="scrollIndicatorDown" id="0x7f0a0792" />
-    <public type="id" name="scrollIndicatorUp" id="0x7f0a0793" />
-    <public type="id" name="scrollView" id="0x7f0a0794" />
-    <public type="id" name="scroll_view" id="0x7f0a0795" />
-    <public type="id" name="scrollable" id="0x7f0a0796" />
-    <public type="id" name="search_badge" id="0x7f0a0797" />
-    <public type="id" name="search_bar" id="0x7f0a0798" />
-    <public type="id" name="search_button" id="0x7f0a0799" />
-    <public type="id" name="search_close_btn" id="0x7f0a079a" />
-    <public type="id" name="search_edit_frame" id="0x7f0a079b" />
-    <public type="id" name="search_flipper" id="0x7f0a079c" />
-    <public type="id" name="search_go_btn" id="0x7f0a079d" />
-    <public type="id" name="search_mag_icon" id="0x7f0a079e" />
-    <public type="id" name="search_plate" id="0x7f0a079f" />
-    <public type="id" name="search_results_list" id="0x7f0a07a0" />
-    <public type="id" name="search_send_query_fab" id="0x7f0a07a1" />
-    <public type="id" name="search_src_text" id="0x7f0a07a2" />
-    <public type="id" name="search_suggestion_item_channel_container" id="0x7f0a07a3" />
-    <public type="id" name="search_suggestion_item_has_container" id="0x7f0a07a4" />
-    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7f0a07a5" />
-    <public type="id" name="search_suggestion_item_user_container" id="0x7f0a07a6" />
-    <public type="id" name="search_suggestions_item_channel_icon" id="0x7f0a07a7" />
-    <public type="id" name="search_suggestions_item_channel_text" id="0x7f0a07a8" />
-    <public type="id" name="search_suggestions_item_has_icon" id="0x7f0a07a9" />
-    <public type="id" name="search_suggestions_item_has_text" id="0x7f0a07aa" />
-    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7f0a07ab" />
-    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7f0a07ac" />
-    <public type="id" name="search_suggestions_recycler" id="0x7f0a07ad" />
-    <public type="id" name="search_voice_btn" id="0x7f0a07ae" />
-    <public type="id" name="seekbar" id="0x7f0a07af" />
-    <public type="id" name="seekbar_value" id="0x7f0a07b0" />
-    <public type="id" name="select_dialog_listview" id="0x7f0a07b1" />
-    <public type="id" name="selected" id="0x7f0a07b2" />
-    <public type="id" name="selection_indicator" id="0x7f0a07b3" />
-    <public type="id" name="server_notifications_everyone_switch" id="0x7f0a07b4" />
-    <public type="id" name="server_notifications_frequency_0_radio" id="0x7f0a07b5" />
-    <public type="id" name="server_notifications_frequency_1_radio" id="0x7f0a07b6" />
-    <public type="id" name="server_notifications_frequency_2_radio" id="0x7f0a07b7" />
-    <public type="id" name="server_notifications_frequency_divider" id="0x7f0a07b8" />
-    <public type="id" name="server_notifications_frequency_wrap" id="0x7f0a07b9" />
-    <public type="id" name="server_notifications_mute_settings_view" id="0x7f0a07ba" />
-    <public type="id" name="server_notifications_push_switch" id="0x7f0a07bb" />
-    <public type="id" name="server_notifications_roles_switch" id="0x7f0a07bc" />
-    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7f0a07bd" />
-    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7f0a07be" />
-    <public type="id" name="server_settings_audit_logs_recycler" id="0x7f0a07bf" />
-    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7f0a07c0" />
-    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7f0a07c1" />
-    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7f0a07c2" />
-    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7f0a07c3" />
-    <public type="id" name="server_settings_bans_option" id="0x7f0a07c4" />
-    <public type="id" name="server_settings_bans_recycler" id="0x7f0a07c5" />
-    <public type="id" name="server_settings_bans_search" id="0x7f0a07c6" />
-    <public type="id" name="server_settings_bans_view_flipper" id="0x7f0a07c7" />
-    <public type="id" name="server_settings_channels_create_channel" id="0x7f0a07c8" />
-    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7f0a07c9" />
-    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7f0a07ca" />
-    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7f0a07cb" />
-    <public type="id" name="server_settings_channels_text_recycler" id="0x7f0a07cc" />
-    <public type="id" name="server_settings_community_locale" id="0x7f0a07cd" />
-    <public type="id" name="server_settings_community_overview_option" id="0x7f0a07ce" />
-    <public type="id" name="server_settings_community_overview_scroll" id="0x7f0a07cf" />
-    <public type="id" name="server_settings_community_rules_channel" id="0x7f0a07d0" />
-    <public type="id" name="server_settings_community_setting_selector_description" id="0x7f0a07d1" />
-    <public type="id" name="server_settings_community_setting_selector_subtitle" id="0x7f0a07d2" />
-    <public type="id" name="server_settings_community_setting_selector_title" id="0x7f0a07d3" />
-    <public type="id" name="server_settings_community_updates_channel" id="0x7f0a07d4" />
-    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7f0a07d5" />
-    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7f0a07d6" />
-    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7f0a07d7" />
-    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7f0a07d8" />
-    <public type="id" name="server_settings_delete_server_cancel" id="0x7f0a07d9" />
-    <public type="id" name="server_settings_delete_server_confirm" id="0x7f0a07da" />
-    <public type="id" name="server_settings_delete_server_header" id="0x7f0a07db" />
-    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7f0a07dc" />
-    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7f0a07dd" />
-    <public type="id" name="server_settings_delete_server_text" id="0x7f0a07de" />
-    <public type="id" name="server_settings_emojis_avatar" id="0x7f0a07df" />
-    <public type="id" name="server_settings_emojis_container" id="0x7f0a07e0" />
-    <public type="id" name="server_settings_emojis_edit_alias" id="0x7f0a07e1" />
-    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7f0a07e2" />
-    <public type="id" name="server_settings_emojis_name" id="0x7f0a07e3" />
-    <public type="id" name="server_settings_emojis_option" id="0x7f0a07e4" />
-    <public type="id" name="server_settings_emojis_overflow" id="0x7f0a07e5" />
-    <public type="id" name="server_settings_emojis_username" id="0x7f0a07e6" />
-    <public type="id" name="server_settings_emojis_username_avatar" id="0x7f0a07e7" />
-    <public type="id" name="server_settings_help_item" id="0x7f0a07e8" />
-    <public type="id" name="server_settings_instant_invites_option" id="0x7f0a07e9" />
-    <public type="id" name="server_settings_instant_invites_recycler" id="0x7f0a07ea" />
-    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7f0a07eb" />
-    <public type="id" name="server_settings_members_header_container" id="0x7f0a07ec" />
-    <public type="id" name="server_settings_members_name_search" id="0x7f0a07ed" />
-    <public type="id" name="server_settings_members_option" id="0x7f0a07ee" />
-    <public type="id" name="server_settings_members_recycler" id="0x7f0a07ef" />
-    <public type="id" name="server_settings_members_roles_spinner" id="0x7f0a07f0" />
-    <public type="id" name="server_settings_members_view_flipper" id="0x7f0a07f1" />
-    <public type="id" name="server_settings_moderation_explicit_1" id="0x7f0a07f2" />
-    <public type="id" name="server_settings_moderation_explicit_2" id="0x7f0a07f3" />
-    <public type="id" name="server_settings_moderation_explicit_3" id="0x7f0a07f4" />
-    <public type="id" name="server_settings_moderation_verification_1" id="0x7f0a07f5" />
-    <public type="id" name="server_settings_moderation_verification_2" id="0x7f0a07f6" />
-    <public type="id" name="server_settings_moderation_verification_3" id="0x7f0a07f7" />
-    <public type="id" name="server_settings_moderation_verification_4" id="0x7f0a07f8" />
-    <public type="id" name="server_settings_moderation_verification_5" id="0x7f0a07f9" />
-    <public type="id" name="server_settings_option_audit_log" id="0x7f0a07fa" />
-    <public type="id" name="server_settings_option_channels" id="0x7f0a07fb" />
-    <public type="id" name="server_settings_option_integrations" id="0x7f0a07fc" />
-    <public type="id" name="server_settings_option_moderation" id="0x7f0a07fd" />
-    <public type="id" name="server_settings_option_overview" id="0x7f0a07fe" />
-    <public type="id" name="server_settings_option_security" id="0x7f0a07ff" />
-    <public type="id" name="server_settings_option_vanity_url" id="0x7f0a0800" />
-    <public type="id" name="server_settings_overview_afk_channel" id="0x7f0a0801" />
-    <public type="id" name="server_settings_overview_afk_channel_wrap" id="0x7f0a0802" />
-    <public type="id" name="server_settings_overview_afk_timeout" id="0x7f0a0803" />
-    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7f0a0804" />
-    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7f0a0805" />
-    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7f0a0806" />
-    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7f0a0807" />
-    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7f0a0808" />
-    <public type="id" name="server_settings_overview_afk_timeout_wrap" id="0x7f0a0809" />
-    <public type="id" name="server_settings_overview_icon" id="0x7f0a080a" />
-    <public type="id" name="server_settings_overview_icon_label" id="0x7f0a080b" />
-    <public type="id" name="server_settings_overview_icon_name_container" id="0x7f0a080c" />
-    <public type="id" name="server_settings_overview_icon_remove" id="0x7f0a080d" />
-    <public type="id" name="server_settings_overview_icon_text" id="0x7f0a080e" />
-    <public type="id" name="server_settings_overview_name" id="0x7f0a080f" />
-    <public type="id" name="server_settings_overview_notification_all" id="0x7f0a0810" />
-    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7f0a0811" />
-    <public type="id" name="server_settings_overview_region" id="0x7f0a0812" />
-    <public type="id" name="server_settings_overview_region_flag" id="0x7f0a0813" />
-    <public type="id" name="server_settings_overview_region_item_name" id="0x7f0a0814" />
-    <public type="id" name="server_settings_overview_region_list" id="0x7f0a0815" />
-    <public type="id" name="server_settings_overview_region_wrap" id="0x7f0a0816" />
-    <public type="id" name="server_settings_overview_save" id="0x7f0a0817" />
-    <public type="id" name="server_settings_overview_scroll" id="0x7f0a0818" />
-    <public type="id" name="server_settings_overview_system_channel" id="0x7f0a0819" />
-    <public type="id" name="server_settings_overview_system_channel_boost" id="0x7f0a081a" />
-    <public type="id" name="server_settings_overview_system_channel_join" id="0x7f0a081b" />
-    <public type="id" name="server_settings_overview_system_channel_wrap" id="0x7f0a081c" />
-    <public type="id" name="server_settings_overview_upload_banner" id="0x7f0a081d" />
-    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7f0a081e" />
-    <public type="id" name="server_settings_overview_upload_banner_fab" id="0x7f0a081f" />
-    <public type="id" name="server_settings_overview_upload_banner_learn_more" id="0x7f0a0820" />
-    <public type="id" name="server_settings_overview_upload_banner_nitro_tier" id="0x7f0a0821" />
-    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7f0a0822" />
-    <public type="id" name="server_settings_overview_upload_banner_unlock" id="0x7f0a0823" />
-    <public type="id" name="server_settings_overview_upload_splash" id="0x7f0a0824" />
-    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7f0a0825" />
-    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7f0a0826" />
-    <public type="id" name="server_settings_overview_upload_splash_learn_more" id="0x7f0a0827" />
-    <public type="id" name="server_settings_overview_upload_splash_nitro_tier" id="0x7f0a0828" />
-    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7f0a0829" />
-    <public type="id" name="server_settings_overview_upload_splash_unlock" id="0x7f0a082a" />
-    <public type="id" name="server_settings_public_setting_selector" id="0x7f0a082b" />
-    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7f0a082c" />
-    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7f0a082d" />
-    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7f0a082e" />
-    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7f0a082f" />
-    <public type="id" name="server_settings_role_item_name" id="0x7f0a0830" />
-    <public type="id" name="server_settings_roles_option" id="0x7f0a0831" />
-    <public type="id" name="server_settings_roles_recycler" id="0x7f0a0832" />
-    <public type="id" name="server_settings_section_community" id="0x7f0a0833" />
-    <public type="id" name="server_settings_section_community_divider" id="0x7f0a0834" />
-    <public type="id" name="server_settings_section_general_settings" id="0x7f0a0835" />
-    <public type="id" name="server_settings_section_user_management" id="0x7f0a0836" />
-    <public type="id" name="server_settings_section_user_management_divider" id="0x7f0a0837" />
-    <public type="id" name="server_settings_security_dialog_cancel" id="0x7f0a0838" />
-    <public type="id" name="server_settings_security_dialog_confirm" id="0x7f0a0839" />
-    <public type="id" name="server_settings_security_label" id="0x7f0a083a" />
-    <public type="id" name="server_settings_security_server_mfa_code" id="0x7f0a083b" />
-    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7f0a083c" />
-    <public type="id" name="server_settings_server_icon" id="0x7f0a083d" />
-    <public type="id" name="server_settings_server_icon_text" id="0x7f0a083e" />
-    <public type="id" name="server_settings_server_name" id="0x7f0a083f" />
-    <public type="id" name="server_settings_vanity_input" id="0x7f0a0840" />
-    <public type="id" name="server_settings_vanity_url_current_url" id="0x7f0a0841" />
-    <public type="id" name="server_settings_vanity_url_error_text" id="0x7f0a0842" />
-    <public type="id" name="server_settings_vanity_url_input_container" id="0x7f0a0843" />
-    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7f0a0844" />
-    <public type="id" name="server_settings_vanity_url_prefix" id="0x7f0a0845" />
-    <public type="id" name="server_settings_vanity_url_remove" id="0x7f0a0846" />
-    <public type="id" name="server_settings_vanity_url_save" id="0x7f0a0847" />
-    <public type="id" name="set_custom_status_emoji" id="0x7f0a0848" />
-    <public type="id" name="set_custom_status_emoji_button" id="0x7f0a0849" />
-    <public type="id" name="set_custom_status_expiration" id="0x7f0a084a" />
-    <public type="id" name="set_custom_status_expiration_1_hour" id="0x7f0a084b" />
-    <public type="id" name="set_custom_status_expiration_30_minutes" id="0x7f0a084c" />
-    <public type="id" name="set_custom_status_expiration_4_hours" id="0x7f0a084d" />
-    <public type="id" name="set_custom_status_expiration_never" id="0x7f0a084e" />
-    <public type="id" name="set_custom_status_expiration_tomorrow" id="0x7f0a084f" />
-    <public type="id" name="set_custom_status_save" id="0x7f0a0850" />
-    <public type="id" name="set_custom_status_text" id="0x7f0a0851" />
-    <public type="id" name="setting_button" id="0x7f0a0852" />
-    <public type="id" name="setting_container" id="0x7f0a0853" />
-    <public type="id" name="setting_disabled_overlay" id="0x7f0a0854" />
-    <public type="id" name="setting_label" id="0x7f0a0855" />
-    <public type="id" name="setting_subtext" id="0x7f0a0856" />
-    <public type="id" name="settings_account" id="0x7f0a0857" />
-    <public type="id" name="settings_account_avatar" id="0x7f0a0858" />
-    <public type="id" name="settings_account_avatar_container" id="0x7f0a0859" />
-    <public type="id" name="settings_account_avatar_edit" id="0x7f0a085a" />
-    <public type="id" name="settings_account_avatar_wrap" id="0x7f0a085b" />
-    <public type="id" name="settings_account_change_password" id="0x7f0a085c" />
-    <public type="id" name="settings_account_edit" id="0x7f0a085d" />
-    <public type="id" name="settings_account_email" id="0x7f0a085e" />
-    <public type="id" name="settings_account_mfa_container" id="0x7f0a085f" />
-    <public type="id" name="settings_account_mfa_disabled_container" id="0x7f0a0860" />
-    <public type="id" name="settings_account_mfa_enable" id="0x7f0a0861" />
-    <public type="id" name="settings_account_mfa_enabled_container" id="0x7f0a0862" />
-    <public type="id" name="settings_account_mfa_enabled_header" id="0x7f0a0863" />
-    <public type="id" name="settings_account_mfa_flipper" id="0x7f0a0864" />
-    <public type="id" name="settings_account_mfa_lottie" id="0x7f0a0865" />
-    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7f0a0866" />
-    <public type="id" name="settings_account_private_data_delete" id="0x7f0a0867" />
-    <public type="id" name="settings_account_private_data_disable" id="0x7f0a0868" />
-    <public type="id" name="settings_account_private_data_wrap" id="0x7f0a0869" />
-    <public type="id" name="settings_account_remove_avatar" id="0x7f0a086a" />
-    <public type="id" name="settings_account_remove_two_fa" id="0x7f0a086b" />
-    <public type="id" name="settings_account_save" id="0x7f0a086c" />
-    <public type="id" name="settings_account_scroll" id="0x7f0a086d" />
-    <public type="id" name="settings_account_sms_backup" id="0x7f0a086e" />
-    <public type="id" name="settings_account_sms_phone" id="0x7f0a086f" />
-    <public type="id" name="settings_account_tag" id="0x7f0a0870" />
-    <public type="id" name="settings_account_verification" id="0x7f0a0871" />
-    <public type="id" name="settings_account_verification_resend" id="0x7f0a0872" />
-    <public type="id" name="settings_account_view_backup_codes" id="0x7f0a0873" />
-    <public type="id" name="settings_acknowledgements" id="0x7f0a0874" />
-    <public type="id" name="settings_app_info" id="0x7f0a0875" />
-    <public type="id" name="settings_app_settings_header" id="0x7f0a0876" />
-    <public type="id" name="settings_appearance" id="0x7f0a0877" />
-    <public type="id" name="settings_appearance_font_scale_platform" id="0x7f0a0878" />
-    <public type="id" name="settings_appearance_font_scaling_container" id="0x7f0a0879" />
-    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7f0a087a" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7f0a087b" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7f0a087c" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7f0a087d" />
-    <public type="id" name="settings_appearance_holy_light" id="0x7f0a087e" />
-    <public type="id" name="settings_appearance_sync_switch" id="0x7f0a087f" />
-    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7f0a0880" />
-    <public type="id" name="settings_appearance_theme_light_radio" id="0x7f0a0881" />
-    <public type="id" name="settings_appearance_theme_pure_evil_switch" id="0x7f0a0882" />
-    <public type="id" name="settings_authorized_apps" id="0x7f0a0883" />
-    <public type="id" name="settings_backup_codes_generate" id="0x7f0a0884" />
-    <public type="id" name="settings_backup_codes_info" id="0x7f0a0885" />
-    <public type="id" name="settings_backup_codes_rv" id="0x7f0a0886" />
-    <public type="id" name="settings_behavior" id="0x7f0a0887" />
-    <public type="id" name="settings_behavior_browser_switch" id="0x7f0a0888" />
-    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7f0a0889" />
-    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7f0a088a" />
-    <public type="id" name="settings_billing" id="0x7f0a088b" />
-    <public type="id" name="settings_billing_view_pager" id="0x7f0a088c" />
-    <public type="id" name="settings_bitrate_help" id="0x7f0a088d" />
-    <public type="id" name="settings_blocked_users" id="0x7f0a088e" />
-    <public type="id" name="settings_boost_flipper" id="0x7f0a088f" />
-    <public type="id" name="settings_boost_marketing_view" id="0x7f0a0890" />
-    <public type="id" name="settings_boost_no_guilds_image" id="0x7f0a0891" />
-    <public type="id" name="settings_boost_no_guilds_subtitle" id="0x7f0a0892" />
-    <public type="id" name="settings_boost_no_guilds_title" id="0x7f0a0893" />
-    <public type="id" name="settings_boost_recycler" id="0x7f0a0894" />
-    <public type="id" name="settings_boost_retry" id="0x7f0a0895" />
-    <public type="id" name="settings_boost_sample_guilds" id="0x7f0a0896" />
-    <public type="id" name="settings_boost_subtext" id="0x7f0a0897" />
-    <public type="id" name="settings_boost_subtext_container" id="0x7f0a0898" />
-    <public type="id" name="settings_boost_upsell_view" id="0x7f0a0899" />
-    <public type="id" name="settings_changelog" id="0x7f0a089a" />
-    <public type="id" name="settings_channel_list_category_item_drag" id="0x7f0a089b" />
-    <public type="id" name="settings_channel_list_category_item_text" id="0x7f0a089c" />
-    <public type="id" name="settings_channel_list_item_drag" id="0x7f0a089d" />
-    <public type="id" name="settings_channel_list_item_hash" id="0x7f0a089e" />
-    <public type="id" name="settings_channel_list_item_name" id="0x7f0a089f" />
-    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7f0a08a0" />
-    <public type="id" name="settings_connections" id="0x7f0a08a1" />
-    <public type="id" name="settings_developer_options" id="0x7f0a08a2" />
-    <public type="id" name="settings_developer_options_divider" id="0x7f0a08a3" />
-    <public type="id" name="settings_developer_options_header" id="0x7f0a08a4" />
-    <public type="id" name="settings_game_activity" id="0x7f0a08a5" />
-    <public type="id" name="settings_games_detection_section" id="0x7f0a08a6" />
-    <public type="id" name="settings_games_playing_container" id="0x7f0a08a7" />
-    <public type="id" name="settings_games_playing_icon" id="0x7f0a08a8" />
-    <public type="id" name="settings_games_playing_subtitle" id="0x7f0a08a9" />
-    <public type="id" name="settings_games_playing_title" id="0x7f0a08aa" />
-    <public type="id" name="settings_games_status_cs" id="0x7f0a08ab" />
-    <public type="id" name="settings_games_track_cs" id="0x7f0a08ac" />
-    <public type="id" name="settings_gifting_flipper" id="0x7f0a08ad" />
-    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7f0a08ae" />
-    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7f0a08af" />
-    <public type="id" name="settings_gifting_nitro_classic_learn_more" id="0x7f0a08b0" />
-    <public type="id" name="settings_gifting_nitro_classic_monthly" id="0x7f0a08b1" />
-    <public type="id" name="settings_gifting_nitro_classic_yearly" id="0x7f0a08b2" />
-    <public type="id" name="settings_gifting_nitro_learn_more" id="0x7f0a08b3" />
-    <public type="id" name="settings_gifting_nitro_monthly" id="0x7f0a08b4" />
-    <public type="id" name="settings_gifting_nitro_yearly" id="0x7f0a08b5" />
-    <public type="id" name="settings_gifting_retry" id="0x7f0a08b6" />
-    <public type="id" name="settings_giftting_inventory_recycler" id="0x7f0a08b7" />
-    <public type="id" name="settings_group_icon" id="0x7f0a08b8" />
-    <public type="id" name="settings_group_icon_label" id="0x7f0a08b9" />
-    <public type="id" name="settings_group_icon_remove" id="0x7f0a08ba" />
-    <public type="id" name="settings_inapp_notifs_switch" id="0x7f0a08bb" />
-    <public type="id" name="settings_language" id="0x7f0a08bc" />
-    <public type="id" name="settings_language_current" id="0x7f0a08bd" />
-    <public type="id" name="settings_language_current_flag" id="0x7f0a08be" />
-    <public type="id" name="settings_language_current_text" id="0x7f0a08bf" />
-    <public type="id" name="settings_language_select_item_name" id="0x7f0a08c0" />
-    <public type="id" name="settings_language_select_item_name_localized" id="0x7f0a08c1" />
-    <public type="id" name="settings_language_select_list" id="0x7f0a08c2" />
-    <public type="id" name="settings_language_sync_check" id="0x7f0a08c3" />
-    <public type="id" name="settings_nitro" id="0x7f0a08c4" />
-    <public type="id" name="settings_nitro_boosting" id="0x7f0a08c5" />
-    <public type="id" name="settings_nitro_gifting" id="0x7f0a08c6" />
-    <public type="id" name="settings_nitro_header" id="0x7f0a08c7" />
-    <public type="id" name="settings_nitro_settings" id="0x7f0a08c8" />
-    <public type="id" name="settings_notification_os" id="0x7f0a08c9" />
-    <public type="id" name="settings_notification_os_label" id="0x7f0a08ca" />
-    <public type="id" name="settings_notification_switch" id="0x7f0a08cb" />
-    <public type="id" name="settings_notifications" id="0x7f0a08cc" />
-    <public type="id" name="settings_notifications_blink" id="0x7f0a08cd" />
-    <public type="id" name="settings_notifications_enabled" id="0x7f0a08ce" />
-    <public type="id" name="settings_notifications_mute_all" id="0x7f0a08cf" />
-    <public type="id" name="settings_notifications_vibrations" id="0x7f0a08d0" />
-    <public type="id" name="settings_notifications_wrap" id="0x7f0a08d1" />
-    <public type="id" name="settings_presence_text" id="0x7f0a08d2" />
-    <public type="id" name="settings_privacy" id="0x7f0a08d3" />
-    <public type="id" name="settings_privacy_basic_service" id="0x7f0a08d4" />
-    <public type="id" name="settings_privacy_controls" id="0x7f0a08d5" />
-    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7f0a08d6" />
-    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7f0a08d7" />
-    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7f0a08d8" />
-    <public type="id" name="settings_privacy_explicit_0" id="0x7f0a08d9" />
-    <public type="id" name="settings_privacy_explicit_1" id="0x7f0a08da" />
-    <public type="id" name="settings_privacy_explicit_2" id="0x7f0a08db" />
-    <public type="id" name="settings_privacy_friend_source_0" id="0x7f0a08dc" />
-    <public type="id" name="settings_privacy_friend_source_1" id="0x7f0a08dd" />
-    <public type="id" name="settings_privacy_friend_source_2" id="0x7f0a08de" />
-    <public type="id" name="settings_privacy_personalization" id="0x7f0a08df" />
-    <public type="id" name="settings_privacy_request_data" id="0x7f0a08e0" />
-    <public type="id" name="settings_privacy_request_data_link" id="0x7f0a08e1" />
-    <public type="id" name="settings_privacy_screenreader_detection" id="0x7f0a08e2" />
-    <public type="id" name="settings_privacy_statistics" id="0x7f0a08e3" />
-    <public type="id" name="settings_qr_scanner" id="0x7f0a08e4" />
-    <public type="id" name="settings_set_status_container" id="0x7f0a08e5" />
-    <public type="id" name="settings_status_view" id="0x7f0a08e6" />
-    <public type="id" name="settings_support" id="0x7f0a08e7" />
-    <public type="id" name="settings_text_images" id="0x7f0a08e8" />
-    <public type="id" name="settings_text_images_allow_animate_emoji_switch" id="0x7f0a08e9" />
-    <public type="id" name="settings_text_images_attachments_toggle" id="0x7f0a08ea" />
-    <public type="id" name="settings_text_images_embeds_toggle" id="0x7f0a08eb" />
-    <public type="id" name="settings_text_images_links_toggle" id="0x7f0a08ec" />
-    <public type="id" name="settings_text_images_sync_toggle" id="0x7f0a08ed" />
-    <public type="id" name="settings_user_limit_help" id="0x7f0a08ee" />
-    <public type="id" name="settings_user_settings_header" id="0x7f0a08ef" />
-    <public type="id" name="settings_voice" id="0x7f0a08f0" />
-    <public type="id" name="settings_voice_audio_mode_call" id="0x7f0a08f1" />
-    <public type="id" name="settings_voice_audio_mode_communication" id="0x7f0a08f2" />
-    <public type="id" name="settings_voice_audio_mode_section" id="0x7f0a08f3" />
-    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7f0a08f4" />
-    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7f0a08f5" />
-    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7f0a08f6" />
-    <public type="id" name="settings_voice_gain_control_toggle" id="0x7f0a08f7" />
-    <public type="id" name="settings_voice_input_mode_ptt" id="0x7f0a08f8" />
-    <public type="id" name="settings_voice_input_mode_vad" id="0x7f0a08f9" />
-    <public type="id" name="settings_voice_krisp_info" id="0x7f0a08fa" />
-    <public type="id" name="settings_voice_mode" id="0x7f0a08fb" />
-    <public type="id" name="settings_voice_mode_header" id="0x7f0a08fc" />
-    <public type="id" name="settings_voice_mode_value" id="0x7f0a08fd" />
-    <public type="id" name="settings_voice_noise_cancellation_toggle" id="0x7f0a08fe" />
-    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7f0a08ff" />
-    <public type="id" name="settings_voice_opensles_default" id="0x7f0a0900" />
-    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7f0a0901" />
-    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7f0a0902" />
-    <public type="id" name="settings_voice_output_volume" id="0x7f0a0903" />
-    <public type="id" name="settings_voice_output_volume_wrap" id="0x7f0a0904" />
-    <public type="id" name="settings_voice_overlay_toggle" id="0x7f0a0905" />
-    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7f0a0906" />
-    <public type="id" name="settings_voice_sensitivity_header" id="0x7f0a0907" />
-    <public type="id" name="settings_voice_sensitivity_label" id="0x7f0a0908" />
-    <public type="id" name="settings_voice_sensitivity_manual" id="0x7f0a0909" />
-    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7f0a090a" />
-    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7f0a090b" />
-    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7f0a090c" />
-    <public type="id" name="settings_voice_video_container" id="0x7f0a090d" />
-    <public type="id" name="settings_voice_video_troubleshooting_guide" id="0x7f0a090e" />
-    <public type="id" name="shades_divider" id="0x7f0a090f" />
-    <public type="id" name="shades_layout" id="0x7f0a0910" />
-    <public type="id" name="shortcut" id="0x7f0a0911" />
-    <public type="id" name="showCustom" id="0x7f0a0912" />
-    <public type="id" name="showHome" id="0x7f0a0913" />
-    <public type="id" name="showTitle" id="0x7f0a0914" />
-    <public type="id" name="skipCollapsed" id="0x7f0a0915" />
-    <public type="id" name="slide" id="0x7f0a0916" />
-    <public type="id" name="smallLabel" id="0x7f0a0917" />
-    <public type="id" name="snackbar_action" id="0x7f0a0918" />
-    <public type="id" name="snackbar_text" id="0x7f0a0919" />
-    <public type="id" name="snap" id="0x7f0a091a" />
-    <public type="id" name="snapMargins" id="0x7f0a091b" />
-    <public type="id" name="software" id="0x7f0a091c" />
-    <public type="id" name="space_around" id="0x7f0a091d" />
-    <public type="id" name="space_between" id="0x7f0a091e" />
-    <public type="id" name="space_evenly" id="0x7f0a091f" />
-    <public type="id" name="spacer" id="0x7f0a0920" />
-    <public type="id" name="sparkle_view_image" id="0x7f0a0921" />
-    <public type="id" name="spherical_gl_surface_view" id="0x7f0a0922" />
-    <public type="id" name="spinner" id="0x7f0a0923" />
-    <public type="id" name="split_action_bar" id="0x7f0a0924" />
-    <public type="id" name="spread" id="0x7f0a0925" />
-    <public type="id" name="spread_inside" id="0x7f0a0926" />
-    <public type="id" name="square" id="0x7f0a0927" />
-    <public type="id" name="src_atop" id="0x7f0a0928" />
-    <public type="id" name="src_in" id="0x7f0a0929" />
-    <public type="id" name="src_over" id="0x7f0a092a" />
-    <public type="id" name="src_toggle" id="0x7f0a092b" />
-    <public type="id" name="standard" id="0x7f0a092c" />
-    <public type="id" name="start" id="0x7f0a092d" />
-    <public type="id" name="start_call_sheet_video_item" id="0x7f0a092e" />
-    <public type="id" name="start_call_sheet_voice_item" id="0x7f0a092f" />
-    <public type="id" name="state_aspect_ratio" id="0x7f0a0930" />
-    <public type="id" name="state_rotate" id="0x7f0a0931" />
-    <public type="id" name="state_scale" id="0x7f0a0932" />
-    <public type="id" name="status_bar_latest_event_content" id="0x7f0a0933" />
-    <public type="id" name="status_connectivity" id="0x7f0a0934" />
-    <public type="id" name="status_connectivity_icon" id="0x7f0a0935" />
-    <public type="id" name="status_connectivity_limited" id="0x7f0a0936" />
-    <public type="id" name="status_connectivity_spinner" id="0x7f0a0937" />
-    <public type="id" name="status_connectivity_text" id="0x7f0a0938" />
-    <public type="id" name="status_unread_messages" id="0x7f0a0939" />
-    <public type="id" name="status_unread_messages_mark" id="0x7f0a093a" />
-    <public type="id" name="status_unread_messages_text" id="0x7f0a093b" />
-    <public type="id" name="status_wrap" id="0x7f0a093c" />
-    <public type="id" name="steps_button_container" id="0x7f0a093d" />
-    <public type="id" name="steps_cancel" id="0x7f0a093e" />
-    <public type="id" name="steps_close" id="0x7f0a093f" />
-    <public type="id" name="steps_done" id="0x7f0a0940" />
-    <public type="id" name="steps_next" id="0x7f0a0941" />
-    <public type="id" name="steps_viewpager" id="0x7f0a0942" />
-    <public type="id" name="stereo" id="0x7f0a0943" />
-    <public type="id" name="stream_preview" id="0x7f0a0944" />
-    <public type="id" name="stream_preview_image" id="0x7f0a0945" />
-    <public type="id" name="stream_preview_overlay_text" id="0x7f0a0946" />
-    <public type="id" name="stream_preview_placeholder_caption" id="0x7f0a0947" />
-    <public type="id" name="stretch" id="0x7f0a0948" />
-    <public type="id" name="submenuarrow" id="0x7f0a0949" />
-    <public type="id" name="submit_area" id="0x7f0a094a" />
-    <public type="id" name="subtitle_text" id="0x7f0a094b" />
-    <public type="id" name="suggestion_example_answer" id="0x7f0a094c" />
-    <public type="id" name="suggestion_example_container" id="0x7f0a094d" />
-    <public type="id" name="suggestion_example_filter" id="0x7f0a094e" />
-    <public type="id" name="suggestion_example_icon" id="0x7f0a094f" />
-    <public type="id" name="suggestion_item_header" id="0x7f0a0950" />
-    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7f0a0951" />
-    <public type="id" name="suggestion_item_header_history_divider" id="0x7f0a0952" />
-    <public type="id" name="suggestion_item_header_history_text" id="0x7f0a0953" />
-    <public type="id" name="surface" id="0x7f0a0954" />
-    <public type="id" name="surface_view" id="0x7f0a0955" />
-    <public type="id" name="surface_view_root" id="0x7f0a0956" />
-    <public type="id" name="swipeRefreshLayout" id="0x7f0a0957" />
-    <public type="id" name="switchWidget" id="0x7f0a0958" />
-    <public type="id" name="switchview" id="0x7f0a0959" />
-    <public type="id" name="tabMode" id="0x7f0a095a" />
-    <public type="id" name="tabs_host_bottom_nav_friends_icon" id="0x7f0a095b" />
-    <public type="id" name="tabs_host_bottom_nav_friends_item" id="0x7f0a095c" />
-    <public type="id" name="tabs_host_bottom_nav_friends_notifications_badge" id="0x7f0a095d" />
-    <public type="id" name="tabs_host_bottom_nav_home_icon" id="0x7f0a095e" />
-    <public type="id" name="tabs_host_bottom_nav_home_item" id="0x7f0a095f" />
-    <public type="id" name="tabs_host_bottom_nav_home_notifications_badge" id="0x7f0a0960" />
-    <public type="id" name="tabs_host_bottom_nav_mentions_icon" id="0x7f0a0961" />
-    <public type="id" name="tabs_host_bottom_nav_mentions_item" id="0x7f0a0962" />
-    <public type="id" name="tabs_host_bottom_nav_search_icon" id="0x7f0a0963" />
-    <public type="id" name="tabs_host_bottom_nav_search_item" id="0x7f0a0964" />
-    <public type="id" name="tabs_host_bottom_nav_tabs_container" id="0x7f0a0965" />
-    <public type="id" name="tabs_host_bottom_nav_user_avatar_presence_view" id="0x7f0a0966" />
-    <public type="id" name="tabs_host_bottom_nav_user_settings_item" id="0x7f0a0967" />
-    <public type="id" name="tag_accessibility_actions" id="0x7f0a0968" />
-    <public type="id" name="tag_accessibility_clickable_spans" id="0x7f0a0969" />
-    <public type="id" name="tag_accessibility_heading" id="0x7f0a096a" />
-    <public type="id" name="tag_accessibility_pane_title" id="0x7f0a096b" />
-    <public type="id" name="tag_screen_reader_focusable" id="0x7f0a096c" />
-    <public type="id" name="tag_transition_group" id="0x7f0a096d" />
-    <public type="id" name="tag_unhandled_key_event_manager" id="0x7f0a096e" />
-    <public type="id" name="tag_unhandled_key_listeners" id="0x7f0a096f" />
-    <public type="id" name="takePicture" id="0x7f0a0970" />
-    <public type="id" name="take_photo_btn" id="0x7f0a0971" />
-    <public type="id" name="ternary_check_neutral" id="0x7f0a0972" />
-    <public type="id" name="ternary_check_off" id="0x7f0a0973" />
-    <public type="id" name="ternary_check_on" id="0x7f0a0974" />
-    <public type="id" name="test" id="0x7f0a0975" />
-    <public type="id" name="test_checkbox_android_button_tint" id="0x7f0a0976" />
-    <public type="id" name="test_checkbox_app_button_tint" id="0x7f0a0977" />
-    <public type="id" name="test_radiobutton_android_button_tint" id="0x7f0a0978" />
-    <public type="id" name="test_radiobutton_app_button_tint" id="0x7f0a0979" />
-    <public type="id" name="text" id="0x7f0a097a" />
-    <public type="id" name="text1" id="0x7f0a097b" />
-    <public type="id" name="text2" id="0x7f0a097c" />
-    <public type="id" name="textEnd" id="0x7f0a097d" />
-    <public type="id" name="textSpacerNoButtons" id="0x7f0a097e" />
-    <public type="id" name="textSpacerNoTitle" id="0x7f0a097f" />
-    <public type="id" name="textStart" id="0x7f0a0980" />
-    <public type="id" name="text_input_end_icon" id="0x7f0a0981" />
-    <public type="id" name="text_input_start_icon" id="0x7f0a0982" />
-    <public type="id" name="text_view_rotate" id="0x7f0a0983" />
-    <public type="id" name="text_view_scale" id="0x7f0a0984" />
-    <public type="id" name="textinput_counter" id="0x7f0a0985" />
-    <public type="id" name="textinput_error" id="0x7f0a0986" />
-    <public type="id" name="textinput_helper_text" id="0x7f0a0987" />
-    <public type="id" name="textinput_placeholder" id="0x7f0a0988" />
-    <public type="id" name="textinput_prefix_text" id="0x7f0a0989" />
-    <public type="id" name="textinput_suffix_text" id="0x7f0a098a" />
-    <public type="id" name="texture" id="0x7f0a098b" />
-    <public type="id" name="texture_view" id="0x7f0a098c" />
-    <public type="id" name="thing_proto" id="0x7f0a098d" />
-    <public type="id" name="thumb_iv" id="0x7f0a098e" />
-    <public type="id" name="tile" id="0x7f0a098f" />
-    <public type="id" name="time" id="0x7f0a0990" />
-    <public type="id" name="title" id="0x7f0a0991" />
-    <public type="id" name="titleDividerNoCustom" id="0x7f0a0992" />
-    <public type="id" name="title_template" id="0x7f0a0993" />
-    <public type="id" name="title_text_barrier" id="0x7f0a0994" />
-    <public type="id" name="toolbar" id="0x7f0a0995" />
-    <public type="id" name="toolbar_presence" id="0x7f0a0996" />
-    <public type="id" name="toolbar_title" id="0x7f0a0997" />
-    <public type="id" name="toolbar_title_subtext" id="0x7f0a0998" />
-    <public type="id" name="top" id="0x7f0a0999" />
-    <public type="id" name="topPanel" id="0x7f0a099a" />
-    <public type="id" name="torch" id="0x7f0a099b" />
-    <public type="id" name="touch_outside" id="0x7f0a099c" />
-    <public type="id" name="transition_current_scene" id="0x7f0a099d" />
-    <public type="id" name="transition_layout_save" id="0x7f0a099e" />
-    <public type="id" name="transition_position" id="0x7f0a099f" />
-    <public type="id" name="transition_scene_layoutid_cache" id="0x7f0a09a0" />
-    <public type="id" name="transition_transform" id="0x7f0a09a1" />
-    <public type="id" name="transparency_layout" id="0x7f0a09a2" />
-    <public type="id" name="transparency_seekbar" id="0x7f0a09a3" />
-    <public type="id" name="transparency_text" id="0x7f0a09a4" />
-    <public type="id" name="transparency_title" id="0x7f0a09a5" />
-    <public type="id" name="trash_wrap_icon" id="0x7f0a09a6" />
-    <public type="id" name="trash_wrap_target_container" id="0x7f0a09a7" />
-    <public type="id" name="trash_wrap_target_zone" id="0x7f0a09a8" />
-    <public type="id" name="type_iv" id="0x7f0a09a9" />
-    <public type="id" name="ucrop" id="0x7f0a09aa" />
-    <public type="id" name="ucrop_frame" id="0x7f0a09ab" />
-    <public type="id" name="ucrop_photobox" id="0x7f0a09ac" />
-    <public type="id" name="uikit_chat_guideline" id="0x7f0a09ad" />
-    <public type="id" name="uikit_sheet_header_guideline" id="0x7f0a09ae" />
-    <public type="id" name="unblock_user_button" id="0x7f0a09af" />
-    <public type="id" name="unchecked" id="0x7f0a09b0" />
-    <public type="id" name="unhandled_uri_display" id="0x7f0a09b1" />
-    <public type="id" name="unhandled_uri_okay" id="0x7f0a09b2" />
-    <public type="id" name="uniform" id="0x7f0a09b3" />
-    <public type="id" name="unlabeled" id="0x7f0a09b4" />
-    <public type="id" name="up" id="0x7f0a09b5" />
-    <public type="id" name="upload_progress_1" id="0x7f0a09b6" />
-    <public type="id" name="upload_progress_2" id="0x7f0a09b7" />
-    <public type="id" name="upload_progress_3" id="0x7f0a09b8" />
-    <public type="id" name="url" id="0x7f0a09b9" />
-    <public type="id" name="useLogo" id="0x7f0a09ba" />
-    <public type="id" name="user_actions_dialog_avatar" id="0x7f0a09bb" />
-    <public type="id" name="user_actions_dialog_block_item" id="0x7f0a09bc" />
-    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7f0a09bd" />
-    <public type="id" name="user_actions_dialog_unblock_item" id="0x7f0a09be" />
-    <public type="id" name="user_actions_dialog_user_name" id="0x7f0a09bf" />
-    <public type="id" name="user_avatar_presence_avatar" id="0x7f0a09c0" />
-    <public type="id" name="user_avatar_presence_container" id="0x7f0a09c1" />
-    <public type="id" name="user_avatar_presence_status" id="0x7f0a09c2" />
-    <public type="id" name="user_captcha_help" id="0x7f0a09c3" />
-    <public type="id" name="user_captcha_verify_button" id="0x7f0a09c4" />
-    <public type="id" name="user_captcha_verify_button_anchor" id="0x7f0a09c5" />
-    <public type="id" name="user_captcha_verify_button_cancel" id="0x7f0a09c6" />
-    <public type="id" name="user_limit_seekbar" id="0x7f0a09c7" />
-    <public type="id" name="user_list_item_avatar" id="0x7f0a09c8" />
-    <public type="id" name="user_list_item_name" id="0x7f0a09c9" />
-    <public type="id" name="user_list_item_name_secondary" id="0x7f0a09ca" />
-    <public type="id" name="user_list_item_status" id="0x7f0a09cb" />
-    <public type="id" name="user_mentions_filter_include_everyone" id="0x7f0a09cc" />
-    <public type="id" name="user_mentions_filter_include_roles" id="0x7f0a09cd" />
-    <public type="id" name="user_mentions_filter_this_server" id="0x7f0a09ce" />
-    <public type="id" name="user_mentions_list" id="0x7f0a09cf" />
-    <public type="id" name="user_mutual_friends_recycler_view" id="0x7f0a09d0" />
-    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7f0a09d1" />
-    <public type="id" name="user_phone_add_anchor" id="0x7f0a09d2" />
-    <public type="id" name="user_phone_add_country_code" id="0x7f0a09d3" />
-    <public type="id" name="user_phone_add_description" id="0x7f0a09d4" />
-    <public type="id" name="user_phone_add_description_note" id="0x7f0a09d5" />
-    <public type="id" name="user_phone_add_next" id="0x7f0a09d6" />
-    <public type="id" name="user_phone_add_number" id="0x7f0a09d7" />
-    <public type="id" name="user_phone_digit_verification" id="0x7f0a09d8" />
-    <public type="id" name="user_profile_adapter_item_empty" id="0x7f0a09d9" />
-    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7f0a09da" />
-    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7f0a09db" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7f0a09dc" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7f0a09dd" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7f0a09de" />
-    <public type="id" name="user_profile_adapter_item_friend_status" id="0x7f0a09df" />
-    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7f0a09e0" />
-    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7f0a09e1" />
-    <public type="id" name="user_profile_adapter_item_server_image" id="0x7f0a09e2" />
-    <public type="id" name="user_profile_adapter_item_server_name" id="0x7f0a09e3" />
-    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7f0a09e4" />
-    <public type="id" name="user_profile_adapter_item_server_text" id="0x7f0a09e5" />
-    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7f0a09e6" />
-    <public type="id" name="user_profile_admin_ban" id="0x7f0a09e7" />
-    <public type="id" name="user_profile_admin_edit_member" id="0x7f0a09e8" />
-    <public type="id" name="user_profile_admin_kick" id="0x7f0a09e9" />
-    <public type="id" name="user_profile_admin_server_deafen" id="0x7f0a09ea" />
-    <public type="id" name="user_profile_admin_server_disconnect" id="0x7f0a09eb" />
-    <public type="id" name="user_profile_admin_server_move" id="0x7f0a09ec" />
-    <public type="id" name="user_profile_admin_server_mute" id="0x7f0a09ed" />
-    <public type="id" name="user_profile_avatar_presence" id="0x7f0a09ee" />
-    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7f0a09ef" />
-    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7f0a09f0" />
-    <public type="id" name="user_profile_connections_view_recycler" id="0x7f0a09f1" />
-    <public type="id" name="user_profile_header_badges_recycler" id="0x7f0a09f2" />
-    <public type="id" name="user_profile_header_custom_status" id="0x7f0a09f3" />
-    <public type="id" name="user_profile_header_name_wrap" id="0x7f0a09f4" />
-    <public type="id" name="user_profile_header_primary_name" id="0x7f0a09f5" />
-    <public type="id" name="user_profile_header_secondary_name" id="0x7f0a09f6" />
-    <public type="id" name="user_selected_checkbox" id="0x7f0a09f7" />
-    <public type="id" name="user_settings_mfa_enable_input_code" id="0x7f0a09f8" />
-    <public type="id" name="user_settings_profile_header_view" id="0x7f0a09f9" />
-    <public type="id" name="user_sheet_add_friend_action_button" id="0x7f0a09fa" />
-    <public type="id" name="user_sheet_admin_card" id="0x7f0a09fb" />
-    <public type="id" name="user_sheet_admin_view" id="0x7f0a09fc" />
-    <public type="id" name="user_sheet_badge_image" id="0x7f0a09fd" />
-    <public type="id" name="user_sheet_call_action_button" id="0x7f0a09fe" />
-    <public type="id" name="user_sheet_connections_header" id="0x7f0a09ff" />
-    <public type="id" name="user_sheet_connections_view" id="0x7f0a0a00" />
-    <public type="id" name="user_sheet_content" id="0x7f0a0a01" />
-    <public type="id" name="user_sheet_copy_id" id="0x7f0a0a02" />
-    <public type="id" name="user_sheet_deafen" id="0x7f0a0a03" />
-    <public type="id" name="user_sheet_developer_header" id="0x7f0a0a04" />
-    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7f0a0a05" />
-    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7f0a0a06" />
-    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7f0a0a07" />
-    <public type="id" name="user_sheet_guild_container" id="0x7f0a0a08" />
-    <public type="id" name="user_sheet_guild_header" id="0x7f0a0a09" />
-    <public type="id" name="user_sheet_header" id="0x7f0a0a0a" />
-    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7f0a0a0b" />
-    <public type="id" name="user_sheet_loading_container" id="0x7f0a0a0c" />
-    <public type="id" name="user_sheet_message_action_button" id="0x7f0a0a0d" />
-    <public type="id" name="user_sheet_more_button" id="0x7f0a0a0e" />
-    <public type="id" name="user_sheet_muted" id="0x7f0a0a0f" />
-    <public type="id" name="user_sheet_note_header" id="0x7f0a0a10" />
-    <public type="id" name="user_sheet_note_text_field_wrap" id="0x7f0a0a11" />
-    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7f0a0a12" />
-    <public type="id" name="user_sheet_profile_actions_container" id="0x7f0a0a13" />
-    <public type="id" name="user_sheet_profile_actions_divider" id="0x7f0a0a14" />
-    <public type="id" name="user_sheet_profile_header_view" id="0x7f0a0a15" />
-    <public type="id" name="user_sheet_profile_voice_settings_header" id="0x7f0a0a16" />
-    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7f0a0a17" />
-    <public type="id" name="user_sheet_roles_list" id="0x7f0a0a18" />
-    <public type="id" name="user_sheet_video_action_button" id="0x7f0a0a19" />
-    <public type="id" name="user_sheet_volume" id="0x7f0a0a1a" />
-    <public type="id" name="user_sheet_volume_label" id="0x7f0a0a1b" />
-    <public type="id" name="user_sheet_volume_wrap" id="0x7f0a0a1c" />
-    <public type="id" name="user_status_presence_custom_clear" id="0x7f0a0a1d" />
-    <public type="id" name="user_status_presence_custom_emoji" id="0x7f0a0a1e" />
-    <public type="id" name="user_status_presence_custom_text" id="0x7f0a0a1f" />
-    <public type="id" name="user_status_presence_dot" id="0x7f0a0a20" />
-    <public type="id" name="user_status_presence_subtitle" id="0x7f0a0a21" />
-    <public type="id" name="user_status_presence_title" id="0x7f0a0a22" />
-    <public type="id" name="user_status_update_custom" id="0x7f0a0a23" />
-    <public type="id" name="user_status_update_dnd" id="0x7f0a0a24" />
-    <public type="id" name="user_status_update_idle" id="0x7f0a0a25" />
-    <public type="id" name="user_status_update_invisible" id="0x7f0a0a26" />
-    <public type="id" name="user_status_update_online" id="0x7f0a0a27" />
-    <public type="id" name="username_placeholder_end_guideline" id="0x7f0a0a28" />
-    <public type="id" name="username_tag" id="0x7f0a0a29" />
-    <public type="id" name="username_text" id="0x7f0a0a2a" />
-    <public type="id" name="verify_char_1" id="0x7f0a0a2b" />
-    <public type="id" name="verify_char_2" id="0x7f0a0a2c" />
-    <public type="id" name="verify_char_3" id="0x7f0a0a2d" />
-    <public type="id" name="verify_char_4" id="0x7f0a0a2e" />
-    <public type="id" name="verify_char_5" id="0x7f0a0a2f" />
-    <public type="id" name="verify_char_6" id="0x7f0a0a30" />
-    <public type="id" name="video" id="0x7f0a0a31" />
-    <public type="id" name="video_decoder_gl_surface_view" id="0x7f0a0a32" />
-    <public type="id" name="view_dialog_confirmation_cancel" id="0x7f0a0a33" />
-    <public type="id" name="view_dialog_confirmation_confirm" id="0x7f0a0a34" />
-    <public type="id" name="view_dialog_confirmation_header" id="0x7f0a0a35" />
-    <public type="id" name="view_dialog_confirmation_text" id="0x7f0a0a36" />
-    <public type="id" name="view_input" id="0x7f0a0a37" />
-    <public type="id" name="view_offset_helper" id="0x7f0a0a38" />
-    <public type="id" name="view_overlay" id="0x7f0a0a39" />
-    <public type="id" name="view_pager" id="0x7f0a0a3a" />
-    <public type="id" name="view_premium_guild_feature_image" id="0x7f0a0a3b" />
-    <public type="id" name="view_premium_guild_feature_text" id="0x7f0a0a3c" />
-    <public type="id" name="view_premium_marketing_container_tier1" id="0x7f0a0a3d" />
-    <public type="id" name="view_premium_marketing_learn_more" id="0x7f0a0a3e" />
-    <public type="id" name="view_premium_marketing_marketing_container" id="0x7f0a0a3f" />
-    <public type="id" name="view_premium_marketing_marketing_subtitle" id="0x7f0a0a40" />
-    <public type="id" name="view_premium_marketing_marketing_title" id="0x7f0a0a41" />
-    <public type="id" name="view_premium_marketing_nitro_boost_count" id="0x7f0a0a42" />
-    <public type="id" name="view_premium_marketing_nitro_boost_discount" id="0x7f0a0a43" />
-    <public type="id" name="view_premium_marketing_nitro_classic_boost_count" id="0x7f0a0a44" />
-    <public type="id" name="view_premium_marketing_nitro_classic_boost_discount" id="0x7f0a0a45" />
-    <public type="id" name="view_premium_upsell_info_subheading" id="0x7f0a0a46" />
-    <public type="id" name="view_premium_upsell_info_subheading_blurb" id="0x7f0a0a47" />
-    <public type="id" name="view_premium_upsell_info_subheading_price" id="0x7f0a0a48" />
-    <public type="id" name="view_typing_dots_1" id="0x7f0a0a49" />
-    <public type="id" name="view_typing_dots_2" id="0x7f0a0a4a" />
-    <public type="id" name="view_typing_dots_3" id="0x7f0a0a4b" />
-    <public type="id" name="visible" id="0x7f0a0a4c" />
-    <public type="id" name="visible_removing_fragment_view_tag" id="0x7f0a0a4d" />
-    <public type="id" name="voice_bottom_sheet_bottom_content_container" id="0x7f0a0a4e" />
-    <public type="id" name="voice_bottom_sheet_connect" id="0x7f0a0a4f" />
-    <public type="id" name="voice_bottom_sheet_connect_container" id="0x7f0a0a50" />
-    <public type="id" name="voice_bottom_sheet_controls" id="0x7f0a0a51" />
-    <public type="id" name="voice_bottom_sheet_empty_container" id="0x7f0a0a52" />
-    <public type="id" name="voice_bottom_sheet_header" id="0x7f0a0a53" />
-    <public type="id" name="voice_bottom_sheet_header_icon" id="0x7f0a0a54" />
-    <public type="id" name="voice_bottom_sheet_header_invite" id="0x7f0a0a55" />
-    <public type="id" name="voice_bottom_sheet_header_noise_cancellation" id="0x7f0a0a56" />
-    <public type="id" name="voice_bottom_sheet_header_settings" id="0x7f0a0a57" />
-    <public type="id" name="voice_bottom_sheet_header_subtitle" id="0x7f0a0a58" />
-    <public type="id" name="voice_bottom_sheet_header_title" id="0x7f0a0a59" />
-    <public type="id" name="voice_bottom_sheet_join_video" id="0x7f0a0a5a" />
-    <public type="id" name="voice_bottom_sheet_recycler" id="0x7f0a0a5b" />
-    <public type="id" name="voice_bottom_sheet_root" id="0x7f0a0a5c" />
-    <public type="id" name="voice_call_inline_container" id="0x7f0a0a5d" />
-    <public type="id" name="voice_connected_container" id="0x7f0a0a5e" />
-    <public type="id" name="voice_connected_ptt" id="0x7f0a0a5f" />
-    <public type="id" name="voice_fullscreen_controls_camera" id="0x7f0a0a60" />
-    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7f0a0a61" />
-    <public type="id" name="voice_fullscreen_controls_deafen_state" id="0x7f0a0a62" />
-    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7f0a0a63" />
-    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7f0a0a64" />
-    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7f0a0a65" />
-    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7f0a0a66" />
-    <public type="id" name="voice_settings_invite" id="0x7f0a0a67" />
-    <public type="id" name="voice_settings_noise_suppression" id="0x7f0a0a68" />
-    <public type="id" name="voice_settings_sheet_container" id="0x7f0a0a69" />
-    <public type="id" name="voice_settings_toggle_video_participants" id="0x7f0a0a6a" />
-    <public type="id" name="voice_settings_voice_settings" id="0x7f0a0a6b" />
-    <public type="id" name="voice_user_avatar" id="0x7f0a0a6c" />
-    <public type="id" name="voice_user_limit_current" id="0x7f0a0a6d" />
-    <public type="id" name="voice_user_limit_max" id="0x7f0a0a6e" />
-    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7f0a0a6f" />
-    <public type="id" name="voice_user_list_item_header_label" id="0x7f0a0a70" />
-    <public type="id" name="voice_user_list_item_invite_tv" id="0x7f0a0a71" />
-    <public type="id" name="voice_user_list_item_live_indicator" id="0x7f0a0a72" />
-    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7f0a0a73" />
-    <public type="id" name="voice_user_list_item_spectating_indicator" id="0x7f0a0a74" />
-    <public type="id" name="voice_user_list_item_stop_ringing" id="0x7f0a0a75" />
-    <public type="id" name="voice_user_list_item_user_avatar" id="0x7f0a0a76" />
-    <public type="id" name="voice_user_list_item_user_name" id="0x7f0a0a77" />
-    <public type="id" name="voice_user_list_item_user_stream_preview" id="0x7f0a0a78" />
-    <public type="id" name="voice_user_list_item_video_indicator" id="0x7f0a0a79" />
-    <public type="id" name="voice_user_name_display" id="0x7f0a0a7a" />
-    <public type="id" name="web_view" id="0x7f0a0a7b" />
-    <public type="id" name="welcome_card_invite_friends" id="0x7f0a0a7c" />
-    <public type="id" name="welcome_card_upload_icon" id="0x7f0a0a7d" />
-    <public type="id" name="when_playing" id="0x7f0a0a7e" />
-    <public type="id" name="wide" id="0x7f0a0a7f" />
-    <public type="id" name="widget_add_friend_user_list_item" id="0x7f0a0a80" />
-    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7f0a0a81" />
-    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7f0a0a82" />
-    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7f0a0a83" />
-    <public type="id" name="widget_auth_mfa_info_okay" id="0x7f0a0a84" />
-    <public type="id" name="widget_auth_mfa_info_text" id="0x7f0a0a85" />
-    <public type="id" name="widget_channel_action_bar" id="0x7f0a0a86" />
-    <public type="id" name="widget_channel_search_item" id="0x7f0a0a87" />
-    <public type="id" name="widget_channel_search_item_remove" id="0x7f0a0a88" />
-    <public type="id" name="widget_channel_settings_permissions_overview_members_recycler" id="0x7f0a0a89" />
-    <public type="id" name="widget_channel_settings_permissions_overview_roles_recycler" id="0x7f0a0a8a" />
-    <public type="id" name="widget_channel_sidebar_actions_guild_view" id="0x7f0a0a8b" />
-    <public type="id" name="widget_channel_sidebar_actions_private_view" id="0x7f0a0a8c" />
-    <public type="id" name="widget_channel_topic" id="0x7f0a0a8d" />
-    <public type="id" name="widget_channels" id="0x7f0a0a8e" />
-    <public type="id" name="widget_channels_list_container" id="0x7f0a0a8f" />
-    <public type="id" name="widget_channels_list_empty_friends_state_view" id="0x7f0a0a90" />
-    <public type="id" name="widget_chat_bottom_space" id="0x7f0a0a91" />
-    <public type="id" name="widget_chat_input" id="0x7f0a0a92" />
-    <public type="id" name="widget_chat_list" id="0x7f0a0a93" />
-    <public type="id" name="widget_chat_overlay_actions" id="0x7f0a0a94" />
-    <public type="id" name="widget_chat_voice_inline" id="0x7f0a0a95" />
-    <public type="id" name="widget_collapsed_user_count" id="0x7f0a0a96" />
-    <public type="id" name="widget_collapsed_user_imageview" id="0x7f0a0a97" />
-    <public type="id" name="widget_connected_list" id="0x7f0a0a98" />
-    <public type="id" name="widget_guilds" id="0x7f0a0a99" />
-    <public type="id" name="widget_home_container" id="0x7f0a0a9a" />
-    <public type="id" name="widget_home_overlapping_panels_panels_layout" id="0x7f0a0a9b" />
-    <public type="id" name="widget_media_container" id="0x7f0a0a9c" />
-    <public type="id" name="widget_media_image" id="0x7f0a0a9d" />
-    <public type="id" name="widget_media_loading_indicator" id="0x7f0a0a9e" />
-    <public type="id" name="widget_media_player_control_view" id="0x7f0a0a9f" />
-    <public type="id" name="widget_media_player_view" id="0x7f0a0aa0" />
-    <public type="id" name="widget_profile_strip" id="0x7f0a0aa1" />
-    <public type="id" name="widget_search_input" id="0x7f0a0aa2" />
-    <public type="id" name="widget_search_results" id="0x7f0a0aa3" />
-    <public type="id" name="widget_search_suggestions" id="0x7f0a0aa4" />
-    <public type="id" name="widget_server_settings_channels_container" id="0x7f0a0aa5" />
-    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7f0a0aa6" />
-    <public type="id" name="widget_server_settings_emojis_section" id="0x7f0a0aa7" />
-    <public type="id" name="widget_server_settings_emojis_upload" id="0x7f0a0aa8" />
-    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7f0a0aa9" />
-    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7f0a0aaa" />
-    <public type="id" name="widget_status" id="0x7f0a0aab" />
-    <public type="id" name="widget_tabs_host_bottom_navigation_view" id="0x7f0a0aac" />
-    <public type="id" name="widget_tabs_host_call_indicator" id="0x7f0a0aad" />
-    <public type="id" name="widget_tabs_host_container" id="0x7f0a0aae" />
-    <public type="id" name="widget_tabs_host_friends" id="0x7f0a0aaf" />
-    <public type="id" name="widget_tabs_host_home" id="0x7f0a0ab0" />
-    <public type="id" name="widget_tabs_host_mentions" id="0x7f0a0ab1" />
-    <public type="id" name="widget_tabs_host_nav_host" id="0x7f0a0ab2" />
-    <public type="id" name="widget_tabs_host_non_fullscreen_nav_host" id="0x7f0a0ab3" />
-    <public type="id" name="widget_tabs_host_user_settings" id="0x7f0a0ab4" />
-    <public type="id" name="withText" id="0x7f0a0ab5" />
-    <public type="id" name="withinBounds" id="0x7f0a0ab6" />
-    <public type="id" name="wrap" id="0x7f0a0ab7" />
-    <public type="id" name="wrap_content" id="0x7f0a0ab8" />
-    <public type="id" name="wrap_reverse" id="0x7f0a0ab9" />
-    <public type="id" name="wrapper_controls" id="0x7f0a0aba" />
-    <public type="id" name="wrapper_reset_rotate" id="0x7f0a0abb" />
-    <public type="id" name="wrapper_rotate_by_angle" id="0x7f0a0abc" />
-    <public type="id" name="wrapper_states" id="0x7f0a0abd" />
-    <public type="id" name="zero_corner_chip" id="0x7f0a0abe" />
-    <public type="id" name="zoom" id="0x7f0a0abf" />
+    <public type="id" name="call_stop_streaming_button" id="0x7f0a0132" />
+    <public type="id" name="call_streaming_active" id="0x7f0a0133" />
+    <public type="id" name="call_streaming_active_body" id="0x7f0a0134" />
+    <public type="id" name="call_user_item_avatar" id="0x7f0a0135" />
+    <public type="id" name="call_video_recycler" id="0x7f0a0136" />
+    <public type="id" name="camera1" id="0x7f0a0137" />
+    <public type="id" name="camera2" id="0x7f0a0138" />
+    <public type="id" name="camera_capacity_body" id="0x7f0a0139" />
+    <public type="id" name="camera_capacity_confirm" id="0x7f0a013a" />
+    <public type="id" name="camera_container" id="0x7f0a013b" />
+    <public type="id" name="camera_facing_btn" id="0x7f0a013c" />
+    <public type="id" name="camera_flash_btn" id="0x7f0a013d" />
+    <public type="id" name="camera_view" id="0x7f0a013e" />
+    <public type="id" name="cancel_action" id="0x7f0a013f" />
+    <public type="id" name="cancel_button" id="0x7f0a0140" />
+    <public type="id" name="category_override_name" id="0x7f0a0141" />
+    <public type="id" name="category_override_status" id="0x7f0a0142" />
+    <public type="id" name="category_overview_name" id="0x7f0a0143" />
+    <public type="id" name="center" id="0x7f0a0144" />
+    <public type="id" name="centerCrop" id="0x7f0a0145" />
+    <public type="id" name="centerInside" id="0x7f0a0146" />
+    <public type="id" name="center_horizontal" id="0x7f0a0147" />
+    <public type="id" name="center_vertical" id="0x7f0a0148" />
+    <public type="id" name="chains" id="0x7f0a0149" />
+    <public type="id" name="change_log_body" id="0x7f0a014a" />
+    <public type="id" name="change_log_contents" id="0x7f0a014b" />
+    <public type="id" name="change_log_facebook" id="0x7f0a014c" />
+    <public type="id" name="change_log_instagram" id="0x7f0a014d" />
+    <public type="id" name="change_log_scrollview" id="0x7f0a014e" />
+    <public type="id" name="change_log_thumbnail" id="0x7f0a014f" />
+    <public type="id" name="change_log_twitter" id="0x7f0a0150" />
+    <public type="id" name="change_log_video" id="0x7f0a0151" />
+    <public type="id" name="change_log_video_overlay" id="0x7f0a0152" />
+    <public type="id" name="change_password_current_password_input" id="0x7f0a0153" />
+    <public type="id" name="change_password_new_password_input" id="0x7f0a0154" />
+    <public type="id" name="change_password_save" id="0x7f0a0155" />
+    <public type="id" name="change_password_two_factor" id="0x7f0a0156" />
+    <public type="id" name="channel_actions_view" id="0x7f0a0157" />
+    <public type="id" name="channel_follow_channel_dropdown_icon" id="0x7f0a0158" />
+    <public type="id" name="channel_follow_channel_name" id="0x7f0a0159" />
+    <public type="id" name="channel_follow_error_text" id="0x7f0a015a" />
+    <public type="id" name="channel_follow_guild_dropdown_icon" id="0x7f0a015b" />
+    <public type="id" name="channel_follow_guild_icon" id="0x7f0a015c" />
+    <public type="id" name="channel_follow_select_channel" id="0x7f0a015d" />
+    <public type="id" name="channel_follow_select_guild" id="0x7f0a015e" />
+    <public type="id" name="channel_follow_selected_channel_name" id="0x7f0a015f" />
+    <public type="id" name="channel_follow_selected_guild_name" id="0x7f0a0160" />
+    <public type="id" name="channel_follow_success_confirm" id="0x7f0a0161" />
+    <public type="id" name="channel_follow_success_image" id="0x7f0a0162" />
+    <public type="id" name="channel_follow_success_text" id="0x7f0a0163" />
+    <public type="id" name="channel_list_item_private_status" id="0x7f0a0164" />
+    <public type="id" name="channel_members_list_item_add" id="0x7f0a0165" />
+    <public type="id" name="channel_members_list_item_add_title" id="0x7f0a0166" />
+    <public type="id" name="channel_members_list_item_avatar" id="0x7f0a0167" />
+    <public type="id" name="channel_members_list_item_boosted_indicator" id="0x7f0a0168" />
+    <public type="id" name="channel_members_list_item_game" id="0x7f0a0169" />
+    <public type="id" name="channel_members_list_item_group_owner_indicator" id="0x7f0a016a" />
+    <public type="id" name="channel_members_list_item_header_placeholder" id="0x7f0a016b" />
+    <public type="id" name="channel_members_list_item_header_text" id="0x7f0a016c" />
+    <public type="id" name="channel_members_list_item_name" id="0x7f0a016d" />
+    <public type="id" name="channel_members_list_item_presence" id="0x7f0a016e" />
+    <public type="id" name="channel_members_list_item_rich_presence_iv" id="0x7f0a016f" />
+    <public type="id" name="channel_notification_settings_system" id="0x7f0a0170" />
+    <public type="id" name="channel_notifications_mute_settings_view" id="0x7f0a0171" />
+    <public type="id" name="channel_override_category_name" id="0x7f0a0172" />
+    <public type="id" name="channel_override_name" id="0x7f0a0173" />
+    <public type="id" name="channel_override_status" id="0x7f0a0174" />
+    <public type="id" name="channel_permission_general_create_instant_invite" id="0x7f0a0175" />
+    <public type="id" name="channel_permission_general_manage_channel" id="0x7f0a0176" />
+    <public type="id" name="channel_permission_general_manage_permissions" id="0x7f0a0177" />
+    <public type="id" name="channel_permission_general_manage_webhooks" id="0x7f0a0178" />
+    <public type="id" name="channel_permission_text_add_reactions" id="0x7f0a0179" />
+    <public type="id" name="channel_permission_text_attach_files" id="0x7f0a017a" />
+    <public type="id" name="channel_permission_text_embed_links" id="0x7f0a017b" />
+    <public type="id" name="channel_permission_text_manage_messages" id="0x7f0a017c" />
+    <public type="id" name="channel_permission_text_mention_everyone" id="0x7f0a017d" />
+    <public type="id" name="channel_permission_text_read_message_history" id="0x7f0a017e" />
+    <public type="id" name="channel_permission_text_read_messages" id="0x7f0a017f" />
+    <public type="id" name="channel_permission_text_send_messages" id="0x7f0a0180" />
+    <public type="id" name="channel_permission_text_send_tts_messages" id="0x7f0a0181" />
+    <public type="id" name="channel_permission_text_use_external_emojis" id="0x7f0a0182" />
+    <public type="id" name="channel_permission_voice_connect" id="0x7f0a0183" />
+    <public type="id" name="channel_permission_voice_deafen_members" id="0x7f0a0184" />
+    <public type="id" name="channel_permission_voice_move_members" id="0x7f0a0185" />
+    <public type="id" name="channel_permission_voice_mute_members" id="0x7f0a0186" />
+    <public type="id" name="channel_permission_voice_speak" id="0x7f0a0187" />
+    <public type="id" name="channel_permission_voice_use_vad" id="0x7f0a0188" />
+    <public type="id" name="channel_permissions_avatar" id="0x7f0a0189" />
+    <public type="id" name="channel_permissions_channel_name" id="0x7f0a018a" />
+    <public type="id" name="channel_permissions_save" id="0x7f0a018b" />
+    <public type="id" name="channel_permissions_target_name" id="0x7f0a018c" />
+    <public type="id" name="channel_permissions_text_container" id="0x7f0a018d" />
+    <public type="id" name="channel_permissions_voice_container" id="0x7f0a018e" />
+    <public type="id" name="channel_pinned_messages_recycler" id="0x7f0a018f" />
+    <public type="id" name="channel_selector_item_name" id="0x7f0a0190" />
+    <public type="id" name="channel_selector_list" id="0x7f0a0191" />
+    <public type="id" name="channel_settings_cannot_delete_body" id="0x7f0a0192" />
+    <public type="id" name="channel_settings_cannot_delete_confirm" id="0x7f0a0193" />
+    <public type="id" name="channel_settings_cannot_delete_title" id="0x7f0a0194" />
+    <public type="id" name="channel_settings_delete_body" id="0x7f0a0195" />
+    <public type="id" name="channel_settings_delete_cancel" id="0x7f0a0196" />
+    <public type="id" name="channel_settings_delete_confirm" id="0x7f0a0197" />
+    <public type="id" name="channel_settings_delete_title" id="0x7f0a0198" />
+    <public type="id" name="channel_settings_edit_name" id="0x7f0a0199" />
+    <public type="id" name="channel_settings_edit_topic" id="0x7f0a019a" />
+    <public type="id" name="channel_settings_edit_wrap" id="0x7f0a019b" />
+    <public type="id" name="channel_settings_notifications_frequency_0" id="0x7f0a019c" />
+    <public type="id" name="channel_settings_notifications_frequency_1" id="0x7f0a019d" />
+    <public type="id" name="channel_settings_notifications_frequency_2" id="0x7f0a019e" />
+    <public type="id" name="channel_settings_notifications_frequency_wrap" id="0x7f0a019f" />
+    <public type="id" name="channel_settings_nsfw" id="0x7f0a01a0" />
+    <public type="id" name="channel_settings_permissions" id="0x7f0a01a1" />
+    <public type="id" name="channel_settings_permissions_add_member_name_search" id="0x7f0a01a2" />
+    <public type="id" name="channel_settings_permissions_add_member_recycler" id="0x7f0a01a3" />
+    <public type="id" name="channel_settings_permissions_add_member_view_flipper" id="0x7f0a01a4" />
+    <public type="id" name="channel_settings_permissions_add_role_recycler" id="0x7f0a01a5" />
+    <public type="id" name="channel_settings_permissions_overview_add_member" id="0x7f0a01a6" />
+    <public type="id" name="channel_settings_permissions_overview_add_role" id="0x7f0a01a7" />
+    <public type="id" name="channel_settings_permissions_overview_members_container" id="0x7f0a01a8" />
+    <public type="id" name="channel_settings_permissions_overview_roles_container" id="0x7f0a01a9" />
+    <public type="id" name="channel_settings_pinned_messages" id="0x7f0a01aa" />
+    <public type="id" name="channel_settings_pinned_messages_container" id="0x7f0a01ab" />
+    <public type="id" name="channel_settings_pinned_messages_disabled_overlay" id="0x7f0a01ac" />
+    <public type="id" name="channel_settings_save" id="0x7f0a01ad" />
+    <public type="id" name="channel_settings_section_privacy_safety" id="0x7f0a01ae" />
+    <public type="id" name="channel_settings_section_slow_mode" id="0x7f0a01af" />
+    <public type="id" name="channel_settings_section_user_management" id="0x7f0a01b0" />
+    <public type="id" name="channel_settings_slow_mode_cooldown_label" id="0x7f0a01b1" />
+    <public type="id" name="channel_settings_slow_mode_cooldown_slider" id="0x7f0a01b2" />
+    <public type="id" name="channel_settings_slowmode_label" id="0x7f0a01b3" />
+    <public type="id" name="channel_sidebar_actions_notifications" id="0x7f0a01b4" />
+    <public type="id" name="channel_sidebar_actions_pins" id="0x7f0a01b5" />
+    <public type="id" name="channel_sidebar_actions_search" id="0x7f0a01b6" />
+    <public type="id" name="channel_sidebar_actions_settings" id="0x7f0a01b7" />
+    <public type="id" name="channel_spinner_dropdown_item_textview" id="0x7f0a01b8" />
+    <public type="id" name="channel_spinner_item_textview" id="0x7f0a01b9" />
+    <public type="id" name="channel_topic" id="0x7f0a01ba" />
+    <public type="id" name="channel_topic_channel_icon" id="0x7f0a01bb" />
+    <public type="id" name="channel_topic_ellipsis" id="0x7f0a01bc" />
+    <public type="id" name="channel_topic_more_icon" id="0x7f0a01bd" />
+    <public type="id" name="channel_topic_name" id="0x7f0a01be" />
+    <public type="id" name="channel_topic_title" id="0x7f0a01bf" />
+    <public type="id" name="channels_item_category_add" id="0x7f0a01c0" />
+    <public type="id" name="channels_item_category_arrow" id="0x7f0a01c1" />
+    <public type="id" name="channels_item_category_name" id="0x7f0a01c2" />
+    <public type="id" name="channels_item_channel_hash" id="0x7f0a01c3" />
+    <public type="id" name="channels_item_channel_mentions" id="0x7f0a01c4" />
+    <public type="id" name="channels_item_channel_name" id="0x7f0a01c5" />
+    <public type="id" name="channels_item_channel_unread" id="0x7f0a01c6" />
+    <public type="id" name="channels_item_voice_channel_name" id="0x7f0a01c7" />
+    <public type="id" name="channels_item_voice_channel_speaker" id="0x7f0a01c8" />
+    <public type="id" name="channels_item_voice_channel_user_limit" id="0x7f0a01c9" />
+    <public type="id" name="channels_item_voice_user_avatar" id="0x7f0a01ca" />
+    <public type="id" name="channels_item_voice_user_camera" id="0x7f0a01cb" />
+    <public type="id" name="channels_item_voice_user_headphones" id="0x7f0a01cc" />
+    <public type="id" name="channels_item_voice_user_live" id="0x7f0a01cd" />
+    <public type="id" name="channels_item_voice_user_microphone" id="0x7f0a01ce" />
+    <public type="id" name="channels_item_voice_user_name" id="0x7f0a01cf" />
+    <public type="id" name="channels_list" id="0x7f0a01d0" />
+    <public type="id" name="channels_list_actions_change_nickname_cancel" id="0x7f0a01d1" />
+    <public type="id" name="channels_list_actions_change_nickname_edit_text" id="0x7f0a01d2" />
+    <public type="id" name="channels_list_actions_change_nickname_reset" id="0x7f0a01d3" />
+    <public type="id" name="channels_list_actions_change_nickname_save" id="0x7f0a01d4" />
+    <public type="id" name="channels_list_banner" id="0x7f0a01d5" />
+    <public type="id" name="channels_list_banner_foreground" id="0x7f0a01d6" />
+    <public type="id" name="channels_list_direct_messages_title" id="0x7f0a01d7" />
+    <public type="id" name="channels_list_header" id="0x7f0a01d8" />
+    <public type="id" name="channels_list_item_header" id="0x7f0a01d9" />
+    <public type="id" name="channels_list_item_mfa_text" id="0x7f0a01da" />
+    <public type="id" name="channels_list_item_private_avatar" id="0x7f0a01db" />
+    <public type="id" name="channels_list_item_private_desc" id="0x7f0a01dc" />
+    <public type="id" name="channels_list_item_private_mentions" id="0x7f0a01dd" />
+    <public type="id" name="channels_list_item_private_name" id="0x7f0a01de" />
+    <public type="id" name="channels_list_item_private_tag" id="0x7f0a01df" />
+    <public type="id" name="channels_list_item_text_actions_channel_notifications" id="0x7f0a01e0" />
+    <public type="id" name="channels_list_item_text_actions_channel_settings" id="0x7f0a01e1" />
+    <public type="id" name="channels_list_item_text_actions_copy_id" id="0x7f0a01e2" />
+    <public type="id" name="channels_list_item_text_actions_developer_divider" id="0x7f0a01e3" />
+    <public type="id" name="channels_list_item_text_actions_icon" id="0x7f0a01e4" />
+    <public type="id" name="channels_list_item_text_actions_invite" id="0x7f0a01e5" />
+    <public type="id" name="channels_list_item_text_actions_mark_as_read" id="0x7f0a01e6" />
+    <public type="id" name="channels_list_item_text_actions_mute" id="0x7f0a01e7" />
+    <public type="id" name="channels_list_item_text_actions_profile" id="0x7f0a01e8" />
+    <public type="id" name="channels_list_item_text_actions_title" id="0x7f0a01e9" />
+    <public type="id" name="channels_list_new" id="0x7f0a01ea" />
+    <public type="id" name="channels_list_premium_guild_hint" id="0x7f0a01eb" />
+    <public type="id" name="channels_list_premium_guild_hint_button" id="0x7f0a01ec" />
+    <public type="id" name="channels_list_premium_guild_hint_subtitle" id="0x7f0a01ed" />
+    <public type="id" name="channels_list_premium_guild_hint_title" id="0x7f0a01ee" />
+    <public type="id" name="channels_list_private_channels_header" id="0x7f0a01ef" />
+    <public type="id" name="channels_list_search" id="0x7f0a01f0" />
+    <public type="id" name="channels_list_start_group" id="0x7f0a01f1" />
+    <public type="id" name="channels_list_tooltip_background" id="0x7f0a01f2" />
+    <public type="id" name="channels_list_tooltip_top_tail" id="0x7f0a01f3" />
+    <public type="id" name="channels_list_unreads" id="0x7f0a01f4" />
+    <public type="id" name="channels_list_unreads_background" id="0x7f0a01f5" />
+    <public type="id" name="channels_list_unreads_stub" id="0x7f0a01f6" />
+    <public type="id" name="channels_toolbar" id="0x7f0a01f7" />
+    <public type="id" name="chat_action_item_image" id="0x7f0a01f8" />
+    <public type="id" name="chat_action_item_text" id="0x7f0a01f9" />
+    <public type="id" name="chat_input_container" id="0x7f0a01fa" />
+    <public type="id" name="chat_input_edit" id="0x7f0a01fb" />
+    <public type="id" name="chat_input_edit_border" id="0x7f0a01fc" />
+    <public type="id" name="chat_input_edit_cancel" id="0x7f0a01fd" />
+    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7f0a01fe" />
+    <public type="id" name="chat_input_emoji_picker_view_flipper" id="0x7f0a01ff" />
+    <public type="id" name="chat_input_guard" id="0x7f0a0200" />
+    <public type="id" name="chat_input_guard_action" id="0x7f0a0201" />
+    <public type="id" name="chat_input_guard_action_secondary" id="0x7f0a0202" />
+    <public type="id" name="chat_input_guard_subtext" id="0x7f0a0203" />
+    <public type="id" name="chat_input_guard_text" id="0x7f0a0204" />
+    <public type="id" name="chat_input_item_avatar" id="0x7f0a0205" />
+    <public type="id" name="chat_input_item_emoji" id="0x7f0a0206" />
+    <public type="id" name="chat_input_item_icon_container" id="0x7f0a0207" />
+    <public type="id" name="chat_input_item_name" id="0x7f0a0208" />
+    <public type="id" name="chat_input_item_name_right" id="0x7f0a0209" />
+    <public type="id" name="chat_input_item_status" id="0x7f0a020a" />
+    <public type="id" name="chat_input_mentions_recycler" id="0x7f0a020b" />
+    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7f0a020c" />
+    <public type="id" name="chat_input_upload_too_large_help" id="0x7f0a020d" />
+    <public type="id" name="chat_input_widget" id="0x7f0a020e" />
+    <public type="id" name="chat_input_wrap" id="0x7f0a020f" />
+    <public type="id" name="chat_list_adapter_item_alert_text" id="0x7f0a0210" />
+    <public type="id" name="chat_list_adapter_item_blocked" id="0x7f0a0211" />
+    <public type="id" name="chat_list_adapter_item_call_icon" id="0x7f0a0212" />
+    <public type="id" name="chat_list_adapter_item_call_participants" id="0x7f0a0213" />
+    <public type="id" name="chat_list_adapter_item_call_subtitle" id="0x7f0a0214" />
+    <public type="id" name="chat_list_adapter_item_call_title" id="0x7f0a0215" />
+    <public type="id" name="chat_list_adapter_item_call_unjoined_ongoing_subtitle" id="0x7f0a0216" />
+    <public type="id" name="chat_list_adapter_item_edit_channel" id="0x7f0a0217" />
+    <public type="id" name="chat_list_adapter_item_failed" id="0x7f0a0218" />
+    <public type="id" name="chat_list_adapter_item_failed_upload_list" id="0x7f0a0219" />
+    <public type="id" name="chat_list_adapter_item_header" id="0x7f0a021a" />
+    <public type="id" name="chat_list_adapter_item_private_channel_start_header" id="0x7f0a021b" />
+    <public type="id" name="chat_list_adapter_item_private_channel_start_image" id="0x7f0a021c" />
+    <public type="id" name="chat_list_adapter_item_private_channel_start_text" id="0x7f0a021d" />
+    <public type="id" name="chat_list_adapter_item_sticker_lottie" id="0x7f0a021e" />
+    <public type="id" name="chat_list_adapter_item_sticker_lottie_progress" id="0x7f0a021f" />
+    <public type="id" name="chat_list_adapter_item_sticker_png" id="0x7f0a0220" />
+    <public type="id" name="chat_list_adapter_item_subheader" id="0x7f0a0221" />
+    <public type="id" name="chat_list_adapter_item_system_icon" id="0x7f0a0222" />
+    <public type="id" name="chat_list_adapter_item_system_text" id="0x7f0a0223" />
+    <public type="id" name="chat_list_adapter_item_system_timestamp" id="0x7f0a0224" />
+    <public type="id" name="chat_list_adapter_item_text" id="0x7f0a0225" />
+    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7f0a0226" />
+    <public type="id" name="chat_list_adapter_item_text_header" id="0x7f0a0227" />
+    <public type="id" name="chat_list_adapter_item_text_name" id="0x7f0a0228" />
+    <public type="id" name="chat_list_adapter_item_text_tag" id="0x7f0a0229" />
+    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7f0a022a" />
+    <public type="id" name="chat_list_adapter_item_unjoined_call_duration" id="0x7f0a022b" />
+    <public type="id" name="chat_list_empty_image" id="0x7f0a022c" />
+    <public type="id" name="chat_list_empty_pins_text" id="0x7f0a022d" />
+    <public type="id" name="chat_list_item_attachment_barrier" id="0x7f0a022e" />
+    <public type="id" name="chat_list_item_attachment_card" id="0x7f0a022f" />
+    <public type="id" name="chat_list_item_attachment_description" id="0x7f0a0230" />
+    <public type="id" name="chat_list_item_attachment_download" id="0x7f0a0231" />
+    <public type="id" name="chat_list_item_attachment_icon" id="0x7f0a0232" />
+    <public type="id" name="chat_list_item_attachment_inline_media" id="0x7f0a0233" />
+    <public type="id" name="chat_list_item_attachment_name" id="0x7f0a0234" />
+    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7f0a0235" />
+    <public type="id" name="chat_list_item_divider_stroke_left" id="0x7f0a0236" />
+    <public type="id" name="chat_list_item_divider_stroke_right" id="0x7f0a0237" />
+    <public type="id" name="chat_list_item_divider_text" id="0x7f0a0238" />
+    <public type="id" name="chat_list_item_embed_author_icon" id="0x7f0a0239" />
+    <public type="id" name="chat_list_item_embed_author_text" id="0x7f0a023a" />
+    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7f0a023b" />
+    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7f0a023c" />
+    <public type="id" name="chat_list_item_embed_container_card" id="0x7f0a023d" />
+    <public type="id" name="chat_list_item_embed_content" id="0x7f0a023e" />
+    <public type="id" name="chat_list_item_embed_description" id="0x7f0a023f" />
+    <public type="id" name="chat_list_item_embed_divider" id="0x7f0a0240" />
+    <public type="id" name="chat_list_item_embed_field_name" id="0x7f0a0241" />
+    <public type="id" name="chat_list_item_embed_field_value" id="0x7f0a0242" />
+    <public type="id" name="chat_list_item_embed_fields" id="0x7f0a0243" />
+    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7f0a0244" />
+    <public type="id" name="chat_list_item_embed_footer_text" id="0x7f0a0245" />
+    <public type="id" name="chat_list_item_embed_image" id="0x7f0a0246" />
+    <public type="id" name="chat_list_item_embed_image_icons" id="0x7f0a0247" />
+    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7f0a0248" />
+    <public type="id" name="chat_list_item_embed_provider" id="0x7f0a0249" />
+    <public type="id" name="chat_list_item_embed_spoiler" id="0x7f0a024a" />
+    <public type="id" name="chat_list_item_embed_title" id="0x7f0a024b" />
+    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7f0a024c" />
+    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7f0a024d" />
+    <public type="id" name="chat_list_item_message_header_channel" id="0x7f0a024e" />
+    <public type="id" name="chat_list_item_message_header_divider" id="0x7f0a024f" />
+    <public type="id" name="chat_list_item_message_header_guild" id="0x7f0a0250" />
+    <public type="id" name="chat_list_item_message_header_spacer" id="0x7f0a0251" />
+    <public type="id" name="chat_list_item_reactions" id="0x7f0a0252" />
+    <public type="id" name="chat_list_recycler" id="0x7f0a0253" />
+    <public type="id" name="chat_list_search_empty_image" id="0x7f0a0254" />
+    <public type="id" name="chat_list_search_error_text" id="0x7f0a0255" />
+    <public type="id" name="chat_list_search_indexing_animation" id="0x7f0a0256" />
+    <public type="id" name="chat_list_search_indexing_text" id="0x7f0a0257" />
+    <public type="id" name="chat_overlay_old_messages_fab" id="0x7f0a0258" />
+    <public type="id" name="chat_overlay_typing" id="0x7f0a0259" />
+    <public type="id" name="chat_overlay_typing_dots" id="0x7f0a025a" />
+    <public type="id" name="chat_typing_users_slowmode" id="0x7f0a025b" />
+    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7f0a025c" />
+    <public type="id" name="chat_typing_users_typing" id="0x7f0a025d" />
+    <public type="id" name="chat_upload_1" id="0x7f0a025e" />
+    <public type="id" name="chat_upload_2" id="0x7f0a025f" />
+    <public type="id" name="chat_upload_3" id="0x7f0a0260" />
+    <public type="id" name="check" id="0x7f0a0261" />
+    <public type="id" name="checkable_off_container" id="0x7f0a0262" />
+    <public type="id" name="checkbox" id="0x7f0a0263" />
+    <public type="id" name="checkboxes_container" id="0x7f0a0264" />
+    <public type="id" name="checked" id="0x7f0a0265" />
+    <public type="id" name="chip" id="0x7f0a0266" />
+    <public type="id" name="chip1" id="0x7f0a0267" />
+    <public type="id" name="chip2" id="0x7f0a0268" />
+    <public type="id" name="chip3" id="0x7f0a0269" />
+    <public type="id" name="chip_group" id="0x7f0a026a" />
+    <public type="id" name="chip_image" id="0x7f0a026b" />
+    <public type="id" name="chip_text" id="0x7f0a026c" />
+    <public type="id" name="chronometer" id="0x7f0a026d" />
+    <public type="id" name="circle" id="0x7f0a026e" />
+    <public type="id" name="circular" id="0x7f0a026f" />
+    <public type="id" name="clear_text" id="0x7f0a0270" />
+    <public type="id" name="client_outdated_anchor_wrap" id="0x7f0a0271" />
+    <public type="id" name="client_outdated_update" id="0x7f0a0272" />
+    <public type="id" name="clip_horizontal" id="0x7f0a0273" />
+    <public type="id" name="clip_vertical" id="0x7f0a0274" />
+    <public type="id" name="close" id="0x7f0a0275" />
+    <public type="id" name="cloudy" id="0x7f0a0276" />
+    <public type="id" name="collapseActionView" id="0x7f0a0277" />
+    <public type="id" name="collapsing_toolbar" id="0x7f0a0278" />
+    <public type="id" name="column" id="0x7f0a0279" />
+    <public type="id" name="column_reverse" id="0x7f0a027a" />
+    <public type="id" name="confirm_button" id="0x7f0a027b" />
+    <public type="id" name="connected_account_actions_dialog_copy_username" id="0x7f0a027c" />
+    <public type="id" name="connected_account_actions_dialog_header" id="0x7f0a027d" />
+    <public type="id" name="connected_account_actions_dialog_open_in_browser" id="0x7f0a027e" />
+    <public type="id" name="connected_account_disconnect" id="0x7f0a027f" />
+    <public type="id" name="connected_account_display_activity_switch" id="0x7f0a0280" />
+    <public type="id" name="connected_account_display_switch" id="0x7f0a0281" />
+    <public type="id" name="connected_account_divider" id="0x7f0a0282" />
+    <public type="id" name="connected_account_extra_info" id="0x7f0a0283" />
+    <public type="id" name="connected_account_img" id="0x7f0a0284" />
+    <public type="id" name="connected_account_name" id="0x7f0a0285" />
+    <public type="id" name="connected_account_sync_friends_switch" id="0x7f0a0286" />
+    <public type="id" name="connections_empty" id="0x7f0a0287" />
+    <public type="id" name="connections_recycler" id="0x7f0a0288" />
+    <public type="id" name="connections_xbox_code" id="0x7f0a0289" />
+    <public type="id" name="connections_xbox_login" id="0x7f0a028a" />
+    <public type="id" name="contact" id="0x7f0a028b" />
+    <public type="id" name="container" id="0x7f0a028c" />
+    <public type="id" name="content" id="0x7f0a028d" />
+    <public type="id" name="contentPanel" id="0x7f0a028e" />
+    <public type="id" name="content_iv" id="0x7f0a028f" />
+    <public type="id" name="content_pager" id="0x7f0a0290" />
+    <public type="id" name="content_tabs" id="0x7f0a0291" />
+    <public type="id" name="coordinator" id="0x7f0a0292" />
+    <public type="id" name="cpv_color_image_view" id="0x7f0a0293" />
+    <public type="id" name="cpv_color_panel_new" id="0x7f0a0294" />
+    <public type="id" name="cpv_color_panel_old" id="0x7f0a0295" />
+    <public type="id" name="cpv_color_panel_view" id="0x7f0a0296" />
+    <public type="id" name="cpv_color_picker_content" id="0x7f0a0297" />
+    <public type="id" name="cpv_color_picker_custom_button" id="0x7f0a0298" />
+    <public type="id" name="cpv_color_picker_custom_reset" id="0x7f0a0299" />
+    <public type="id" name="cpv_color_picker_select_button" id="0x7f0a029a" />
+    <public type="id" name="cpv_color_picker_title" id="0x7f0a029b" />
+    <public type="id" name="cpv_color_picker_view" id="0x7f0a029c" />
+    <public type="id" name="cpv_hex" id="0x7f0a029d" />
+    <public type="id" name="cpv_hex_container" id="0x7f0a029e" />
+    <public type="id" name="cpv_hex_prefix" id="0x7f0a029f" />
+    <public type="id" name="cpv_preference_preview_color_panel" id="0x7f0a02a0" />
+    <public type="id" name="create_channel_follower_button" id="0x7f0a02a1" />
+    <public type="id" name="create_channel_name_layout" id="0x7f0a02a2" />
+    <public type="id" name="create_channel_private_container" id="0x7f0a02a3" />
+    <public type="id" name="create_channel_private_info" id="0x7f0a02a4" />
+    <public type="id" name="create_channel_private_switch" id="0x7f0a02a5" />
+    <public type="id" name="create_channel_private_title" id="0x7f0a02a6" />
+    <public type="id" name="create_channel_role_access_recycler" id="0x7f0a02a7" />
+    <public type="id" name="create_channel_role_header" id="0x7f0a02a8" />
+    <public type="id" name="create_channel_text_container" id="0x7f0a02a9" />
+    <public type="id" name="create_channel_text_radio" id="0x7f0a02aa" />
+    <public type="id" name="create_channel_type_container" id="0x7f0a02ab" />
+    <public type="id" name="create_channel_voice_container" id="0x7f0a02ac" />
+    <public type="id" name="create_channel_voice_radio" id="0x7f0a02ad" />
+    <public type="id" name="credit_header" id="0x7f0a02ae" />
+    <public type="id" name="credit_icon" id="0x7f0a02af" />
+    <public type="id" name="credit_info" id="0x7f0a02b0" />
+    <public type="id" name="credit_info_container" id="0x7f0a02b1" />
+    <public type="id" name="credit_nitro" id="0x7f0a02b2" />
+    <public type="id" name="credit_nitro_classic" id="0x7f0a02b3" />
+    <public type="id" name="credit_nitro_divider" id="0x7f0a02b4" />
+    <public type="id" name="credit_time" id="0x7f0a02b5" />
+    <public type="id" name="current_bitrate_display" id="0x7f0a02b6" />
+    <public type="id" name="current_user_limit_display" id="0x7f0a02b7" />
+    <public type="id" name="custom" id="0x7f0a02b8" />
+    <public type="id" name="customPanel" id="0x7f0a02b9" />
+    <public type="id" name="cut" id="0x7f0a02ba" />
+    <public type="id" name="dark" id="0x7f0a02bb" />
+    <public type="id" name="date" id="0x7f0a02bc" />
+    <public type="id" name="date_picker_actions" id="0x7f0a02bd" />
+    <public type="id" name="daylight" id="0x7f0a02be" />
+    <public type="id" name="debugging_item_log_message" id="0x7f0a02bf" />
+    <public type="id" name="debugging_logs" id="0x7f0a02c0" />
+    <public type="id" name="decor_content_parent" id="0x7f0a02c1" />
+    <public type="id" name="default_activity_button" id="0x7f0a02c2" />
+    <public type="id" name="default_tooltip_text" id="0x7f0a02c3" />
+    <public type="id" name="demote_common_words" id="0x7f0a02c4" />
+    <public type="id" name="demote_rfc822_hostnames" id="0x7f0a02c5" />
+    <public type="id" name="design_bottom_sheet" id="0x7f0a02c6" />
+    <public type="id" name="design_menu_item_action_area" id="0x7f0a02c7" />
+    <public type="id" name="design_menu_item_action_area_stub" id="0x7f0a02c8" />
+    <public type="id" name="design_menu_item_text" id="0x7f0a02c9" />
+    <public type="id" name="design_navigation_view" id="0x7f0a02ca" />
+    <public type="id" name="dev_settings_experiment_item_bucket_spinner" id="0x7f0a02cb" />
+    <public type="id" name="dev_settings_experiment_item_name" id="0x7f0a02cc" />
+    <public type="id" name="developer_settings_crash_discord_jnibridge" id="0x7f0a02cd" />
+    <public type="id" name="developer_settings_crash_discord_nonfatal" id="0x7f0a02ce" />
+    <public type="id" name="developer_settings_crash_kotlin" id="0x7f0a02cf" />
+    <public type="id" name="developer_settings_experiments" id="0x7f0a02d0" />
+    <public type="id" name="developer_settings_notices" id="0x7f0a02d1" />
+    <public type="id" name="deviceDefault" id="0x7f0a02d2" />
+    <public type="id" name="dialog_button" id="0x7f0a02d3" />
+    <public type="id" name="dialog_cancel" id="0x7f0a02d4" />
+    <public type="id" name="dialog_card" id="0x7f0a02d5" />
+    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7f0a02d6" />
+    <public type="id" name="dialog_chat_actions_container" id="0x7f0a02d7" />
+    <public type="id" name="dialog_chat_actions_copy" id="0x7f0a02d8" />
+    <public type="id" name="dialog_chat_actions_copy_id" id="0x7f0a02d9" />
+    <public type="id" name="dialog_chat_actions_delete" id="0x7f0a02da" />
+    <public type="id" name="dialog_chat_actions_edit" id="0x7f0a02db" />
+    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7f0a02dc" />
+    <public type="id" name="dialog_chat_actions_mark_unread" id="0x7f0a02dd" />
+    <public type="id" name="dialog_chat_actions_pin" id="0x7f0a02de" />
+    <public type="id" name="dialog_chat_actions_profile" id="0x7f0a02df" />
+    <public type="id" name="dialog_chat_actions_quote" id="0x7f0a02e0" />
+    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7f0a02e1" />
+    <public type="id" name="dialog_chat_actions_resend" id="0x7f0a02e2" />
+    <public type="id" name="dialog_chat_actions_share" id="0x7f0a02e3" />
+    <public type="id" name="dialog_date_picker_done" id="0x7f0a02e4" />
+    <public type="id" name="dialog_date_picker_input" id="0x7f0a02e5" />
+    <public type="id" name="dialog_date_picker_title" id="0x7f0a02e6" />
+    <public type="id" name="dialog_delete" id="0x7f0a02e7" />
+    <public type="id" name="dialog_save" id="0x7f0a02e8" />
+    <public type="id" name="dialog_selections" id="0x7f0a02e9" />
+    <public type="id" name="dialog_title" id="0x7f0a02ea" />
+    <public type="id" name="dialog_url_actions_copy" id="0x7f0a02eb" />
+    <public type="id" name="dialog_url_actions_open" id="0x7f0a02ec" />
+    <public type="id" name="dialog_url_actions_share" id="0x7f0a02ed" />
+    <public type="id" name="dialog_url_actions_url" id="0x7f0a02ee" />
+    <public type="id" name="dimensions" id="0x7f0a02ef" />
+    <public type="id" name="dimmer_view" id="0x7f0a02f0" />
+    <public type="id" name="direct" id="0x7f0a02f1" />
+    <public type="id" name="disableHome" id="0x7f0a02f2" />
+    <public type="id" name="disable_delete_body" id="0x7f0a02f3" />
+    <public type="id" name="disable_delete_cancel" id="0x7f0a02f4" />
+    <public type="id" name="disable_delete_code_wrap" id="0x7f0a02f5" />
+    <public type="id" name="disable_delete_confirm" id="0x7f0a02f6" />
+    <public type="id" name="disable_delete_header" id="0x7f0a02f7" />
+    <public type="id" name="disable_delete_password_wrap" id="0x7f0a02f8" />
+    <public type="id" name="disconnect_btn" id="0x7f0a02f9" />
+    <public type="id" name="display_name" id="0x7f0a02fa" />
+    <public type="id" name="dng" id="0x7f0a02fb" />
+    <public type="id" name="draw3x3" id="0x7f0a02fc" />
+    <public type="id" name="draw4x4" id="0x7f0a02fd" />
+    <public type="id" name="drawPhi" id="0x7f0a02fe" />
+    <public type="id" name="dropdown_menu" id="0x7f0a02ff" />
+    <public type="id" name="dtddd" id="0x7f0a0300" />
+    <public type="id" name="edit_account_discriminator_wrap" id="0x7f0a0301" />
+    <public type="id" name="edit_account_email_wrap" id="0x7f0a0302" />
+    <public type="id" name="edit_account_password_wrap" id="0x7f0a0303" />
+    <public type="id" name="edit_account_tag_layout_container" id="0x7f0a0304" />
+    <public type="id" name="edit_account_username_wrap" id="0x7f0a0305" />
+    <public type="id" name="edit_integration_custom_emotes_container" id="0x7f0a0306" />
+    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7f0a0307" />
+    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7f0a0308" />
+    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7f0a0309" />
+    <public type="id" name="edit_integration_expired_sub_container" id="0x7f0a030a" />
+    <public type="id" name="edit_integration_grace_period_container" id="0x7f0a030b" />
+    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7f0a030c" />
+    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7f0a030d" />
+    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7f0a030e" />
+    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7f0a030f" />
+    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7f0a0310" />
+    <public type="id" name="edit_integration_icon" id="0x7f0a0311" />
+    <public type="id" name="edit_integration_last_sync_time" id="0x7f0a0312" />
+    <public type="id" name="edit_integration_name" id="0x7f0a0313" />
+    <public type="id" name="edit_integration_name_container" id="0x7f0a0314" />
+    <public type="id" name="edit_integration_owner_name" id="0x7f0a0315" />
+    <public type="id" name="edit_integration_save" id="0x7f0a0316" />
+    <public type="id" name="edit_integration_settings_scroll" id="0x7f0a0317" />
+    <public type="id" name="edit_integration_subscriber_count" id="0x7f0a0318" />
+    <public type="id" name="edit_integration_sync_container" id="0x7f0a0319" />
+    <public type="id" name="edit_integration_synced_role" id="0x7f0a031a" />
+    <public type="id" name="edit_integration_synced_role_container" id="0x7f0a031b" />
+    <public type="id" name="edit_member_administrative_container" id="0x7f0a031c" />
+    <public type="id" name="edit_member_ban_button" id="0x7f0a031d" />
+    <public type="id" name="edit_member_kick_button" id="0x7f0a031e" />
+    <public type="id" name="edit_member_nickname" id="0x7f0a031f" />
+    <public type="id" name="edit_member_roles_container" id="0x7f0a0320" />
+    <public type="id" name="edit_member_roles_recycler" id="0x7f0a0321" />
+    <public type="id" name="edit_member_save" id="0x7f0a0322" />
+    <public type="id" name="edit_member_transfer_ownership_button" id="0x7f0a0323" />
+    <public type="id" name="edit_query" id="0x7f0a0324" />
+    <public type="id" name="edit_role_name" id="0x7f0a0325" />
+    <public type="id" name="edit_role_save" id="0x7f0a0326" />
+    <public type="id" name="email" id="0x7f0a0327" />
+    <public type="id" name="embed_image_container" id="0x7f0a0328" />
+    <public type="id" name="embed_inline_media" id="0x7f0a0329" />
+    <public type="id" name="emoji_app_bar" id="0x7f0a032a" />
+    <public type="id" name="emoji_category_item_guild_avatar" id="0x7f0a032b" />
+    <public type="id" name="emoji_category_item_standard_icon" id="0x7f0a032c" />
+    <public type="id" name="emoji_category_selection_overline" id="0x7f0a032d" />
+    <public type="id" name="emoji_inline_search_button" id="0x7f0a032e" />
+    <public type="id" name="emoji_item_draweeview" id="0x7f0a032f" />
+    <public type="id" name="emoji_iv" id="0x7f0a0330" />
+    <public type="id" name="emoji_picker_backspace_icon" id="0x7f0a0331" />
+    <public type="id" name="emoji_picker_bottom_bar" id="0x7f0a0332" />
+    <public type="id" name="emoji_picker_bottom_bar_divider" id="0x7f0a0333" />
+    <public type="id" name="emoji_picker_category_barrier" id="0x7f0a0334" />
+    <public type="id" name="emoji_picker_category_recycler" id="0x7f0a0335" />
+    <public type="id" name="emoji_picker_container" id="0x7f0a0336" />
+    <public type="id" name="emoji_picker_unicode_emoji_shortcut_button" id="0x7f0a0337" />
+    <public type="id" name="emoji_search_bar" id="0x7f0a0338" />
+    <public type="id" name="emoji_search_clear" id="0x7f0a0339" />
+    <public type="id" name="emoji_search_input" id="0x7f0a033a" />
+    <public type="id" name="emoji_sheet_emoji_picker_content" id="0x7f0a033b" />
+    <public type="id" name="emoji_toolbar" id="0x7f0a033c" />
+    <public type="id" name="empty_friends_state_add_friend" id="0x7f0a033d" />
+    <public type="id" name="empty_friends_state_title" id="0x7f0a033e" />
+    <public type="id" name="empty_results" id="0x7f0a033f" />
+    <public type="id" name="enable_button" id="0x7f0a0340" />
+    <public type="id" name="enable_mfa_key_code" id="0x7f0a0341" />
+    <public type="id" name="enable_mfa_key_launch_authy" id="0x7f0a0342" />
+    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7f0a0343" />
+    <public type="id" name="enable_mfa_stepsview" id="0x7f0a0344" />
+    <public type="id" name="enable_sms_backup_body" id="0x7f0a0345" />
+    <public type="id" name="enable_sms_backup_cancel" id="0x7f0a0346" />
+    <public type="id" name="enable_sms_backup_confirm" id="0x7f0a0347" />
+    <public type="id" name="enable_sms_backup_header" id="0x7f0a0348" />
+    <public type="id" name="enable_sms_backup_password_wrap" id="0x7f0a0349" />
+    <public type="id" name="enable_two_factor_password_body_container" id="0x7f0a034a" />
+    <public type="id" name="enable_two_factor_password_body_text" id="0x7f0a034b" />
+    <public type="id" name="enable_two_factor_password_cancel" id="0x7f0a034c" />
+    <public type="id" name="enable_two_factor_password_header" id="0x7f0a034d" />
+    <public type="id" name="enable_two_factor_password_header_container" id="0x7f0a034e" />
+    <public type="id" name="enable_two_factor_password_ok" id="0x7f0a034f" />
+    <public type="id" name="enable_two_factor_password_view_input" id="0x7f0a0350" />
+    <public type="id" name="end" id="0x7f0a0351" />
+    <public type="id" name="end_padder" id="0x7f0a0352" />
+    <public type="id" name="enterAlways" id="0x7f0a0353" />
+    <public type="id" name="enterAlwaysCollapsed" id="0x7f0a0354" />
+    <public type="id" name="exitUntilCollapsed" id="0x7f0a0355" />
+    <public type="id" name="exo_ad_overlay" id="0x7f0a0356" />
+    <public type="id" name="exo_artwork" id="0x7f0a0357" />
+    <public type="id" name="exo_buffering" id="0x7f0a0358" />
+    <public type="id" name="exo_content_frame" id="0x7f0a0359" />
+    <public type="id" name="exo_controller" id="0x7f0a035a" />
+    <public type="id" name="exo_controller_placeholder" id="0x7f0a035b" />
+    <public type="id" name="exo_duration" id="0x7f0a035c" />
+    <public type="id" name="exo_error_message" id="0x7f0a035d" />
+    <public type="id" name="exo_ffwd" id="0x7f0a035e" />
+    <public type="id" name="exo_next" id="0x7f0a035f" />
+    <public type="id" name="exo_overlay" id="0x7f0a0360" />
+    <public type="id" name="exo_pause" id="0x7f0a0361" />
+    <public type="id" name="exo_play" id="0x7f0a0362" />
+    <public type="id" name="exo_position" id="0x7f0a0363" />
+    <public type="id" name="exo_prev" id="0x7f0a0364" />
+    <public type="id" name="exo_progress" id="0x7f0a0365" />
+    <public type="id" name="exo_progress_placeholder" id="0x7f0a0366" />
+    <public type="id" name="exo_repeat_toggle" id="0x7f0a0367" />
+    <public type="id" name="exo_rew" id="0x7f0a0368" />
+    <public type="id" name="exo_shuffle" id="0x7f0a0369" />
+    <public type="id" name="exo_shutter" id="0x7f0a036a" />
+    <public type="id" name="exo_subtitles" id="0x7f0a036b" />
+    <public type="id" name="exo_track_selection_view" id="0x7f0a036c" />
+    <public type="id" name="exo_vr" id="0x7f0a036d" />
+    <public type="id" name="expand_activities_button" id="0x7f0a036e" />
+    <public type="id" name="expanded_menu" id="0x7f0a036f" />
+    <public type="id" name="exposureCorrection" id="0x7f0a0370" />
+    <public type="id" name="expression_tray_container" id="0x7f0a0371" />
+    <public type="id" name="expression_tray_content_container" id="0x7f0a0372" />
+    <public type="id" name="expression_tray_detail_page" id="0x7f0a0373" />
+    <public type="id" name="expression_tray_emoji_button" id="0x7f0a0374" />
+    <public type="id" name="expression_tray_emoji_card" id="0x7f0a0375" />
+    <public type="id" name="expression_tray_emoji_picker_content" id="0x7f0a0376" />
+    <public type="id" name="expression_tray_gif_button" id="0x7f0a0377" />
+    <public type="id" name="expression_tray_gif_card" id="0x7f0a0378" />
+    <public type="id" name="expression_tray_gif_picker_content" id="0x7f0a0379" />
+    <public type="id" name="expression_tray_landing_page" id="0x7f0a037a" />
+    <public type="id" name="expression_tray_search_bar" id="0x7f0a037b" />
+    <public type="id" name="expression_tray_search_button" id="0x7f0a037c" />
+    <public type="id" name="expression_tray_search_icon" id="0x7f0a037d" />
+    <public type="id" name="expression_tray_segmented_control" id="0x7f0a037e" />
+    <public type="id" name="expression_tray_toolbar" id="0x7f0a037f" />
+    <public type="id" name="expression_tray_toolbar_layout" id="0x7f0a0380" />
+    <public type="id" name="external_share_activity_action_preview" id="0x7f0a0381" />
+    <public type="id" name="external_share_comment" id="0x7f0a0382" />
+    <public type="id" name="external_share_list" id="0x7f0a0383" />
+    <public type="id" name="external_share_list_wrap" id="0x7f0a0384" />
+    <public type="id" name="external_share_search" id="0x7f0a0385" />
+    <public type="id" name="external_share_search_results" id="0x7f0a0386" />
+    <public type="id" name="fab_menu_add_category" id="0x7f0a0387" />
+    <public type="id" name="fab_menu_add_text" id="0x7f0a0388" />
+    <public type="id" name="fab_menu_add_voice" id="0x7f0a0389" />
+    <public type="id" name="fab_menu_main" id="0x7f0a038a" />
+    <public type="id" name="fab_menu_main_fab" id="0x7f0a038b" />
+    <public type="id" name="fab_menu_table" id="0x7f0a038c" />
+    <public type="id" name="fade" id="0x7f0a038d" />
+    <public type="id" name="failed_alert_icon" id="0x7f0a038e" />
+    <public type="id" name="fatal_crash_app_version" id="0x7f0a038f" />
+    <public type="id" name="fatal_crash_details" id="0x7f0a0390" />
+    <public type="id" name="fatal_crash_device" id="0x7f0a0391" />
+    <public type="id" name="fatal_crash_os_version" id="0x7f0a0392" />
+    <public type="id" name="fatal_crash_source" id="0x7f0a0393" />
+    <public type="id" name="fatal_crash_testers_invite" id="0x7f0a0394" />
+    <public type="id" name="fatal_crash_time" id="0x7f0a0395" />
+    <public type="id" name="feedback_happy_rating" id="0x7f0a0396" />
+    <public type="id" name="feedback_issue_section_header" id="0x7f0a0397" />
+    <public type="id" name="feedback_issues_card" id="0x7f0a0398" />
+    <public type="id" name="feedback_issues_recycler" id="0x7f0a0399" />
+    <public type="id" name="feedback_neutral_rating" id="0x7f0a039a" />
+    <public type="id" name="feedback_rating_summary_prompt" id="0x7f0a039b" />
+    <public type="id" name="feedback_sad_rating" id="0x7f0a039c" />
+    <public type="id" name="feedback_sheet_close_button" id="0x7f0a039d" />
+    <public type="id" name="feedback_sheet_container" id="0x7f0a039e" />
+    <public type="id" name="feedback_sheet_feedback_view" id="0x7f0a039f" />
+    <public type="id" name="feedback_sheet_title" id="0x7f0a03a0" />
+    <public type="id" name="file_image" id="0x7f0a03a1" />
+    <public type="id" name="file_name_tv" id="0x7f0a03a2" />
+    <public type="id" name="file_subtitle_tv" id="0x7f0a03a3" />
+    <public type="id" name="fill" id="0x7f0a03a4" />
+    <public type="id" name="fill_horizontal" id="0x7f0a03a5" />
+    <public type="id" name="fill_vertical" id="0x7f0a03a6" />
+    <public type="id" name="filled" id="0x7f0a03a7" />
+    <public type="id" name="filterControl1" id="0x7f0a03a8" />
+    <public type="id" name="filterControl2" id="0x7f0a03a9" />
+    <public type="id" name="fit" id="0x7f0a03aa" />
+    <public type="id" name="fitBottomStart" id="0x7f0a03ab" />
+    <public type="id" name="fitCenter" id="0x7f0a03ac" />
+    <public type="id" name="fitEnd" id="0x7f0a03ad" />
+    <public type="id" name="fitStart" id="0x7f0a03ae" />
+    <public type="id" name="fitToContents" id="0x7f0a03af" />
+    <public type="id" name="fitXY" id="0x7f0a03b0" />
+    <public type="id" name="fixed" id="0x7f0a03b1" />
+    <public type="id" name="fixed_height" id="0x7f0a03b2" />
+    <public type="id" name="fixed_width" id="0x7f0a03b3" />
+    <public type="id" name="flex_end" id="0x7f0a03b4" />
+    <public type="id" name="flex_input_attachment_clear_btn" id="0x7f0a03b5" />
+    <public type="id" name="flex_input_attachment_preview_container" id="0x7f0a03b6" />
+    <public type="id" name="flex_input_attachment_preview_list" id="0x7f0a03b7" />
+    <public type="id" name="flex_input_camera_btn" id="0x7f0a03b8" />
+    <public type="id" name="flex_input_cannot_send_text" id="0x7f0a03b9" />
+    <public type="id" name="flex_input_container" id="0x7f0a03ba" />
+    <public type="id" name="flex_input_default_window_insets_handler" id="0x7f0a03bb" />
+    <public type="id" name="flex_input_emoji_btn" id="0x7f0a03bc" />
+    <public type="id" name="flex_input_expand_btn" id="0x7f0a03bd" />
+    <public type="id" name="flex_input_expression_tray_container" id="0x7f0a03be" />
+    <public type="id" name="flex_input_gallery_btn" id="0x7f0a03bf" />
+    <public type="id" name="flex_input_left_btns_container" id="0x7f0a03c0" />
+    <public type="id" name="flex_input_main_input_container" id="0x7f0a03c1" />
+    <public type="id" name="flex_input_send_btn_container" id="0x7f0a03c2" />
+    <public type="id" name="flex_input_send_btn_image" id="0x7f0a03c3" />
+    <public type="id" name="flex_input_text_input" id="0x7f0a03c4" />
+    <public type="id" name="flex_start" id="0x7f0a03c5" />
+    <public type="id" name="floating" id="0x7f0a03c6" />
+    <public type="id" name="fluorescent" id="0x7f0a03c7" />
+    <public type="id" name="focusCrop" id="0x7f0a03c8" />
+    <public type="id" name="focusMarkerContainer" id="0x7f0a03c9" />
+    <public type="id" name="focusMarkerFill" id="0x7f0a03ca" />
+    <public type="id" name="folder_view_folder_image" id="0x7f0a03cb" />
+    <public type="id" name="follow_sheet_view_flipper" id="0x7f0a03cc" />
+    <public type="id" name="forever" id="0x7f0a03cd" />
+    <public type="id" name="fragment_container_view_tag" id="0x7f0a03ce" />
+    <public type="id" name="friend_add_username_indicator" id="0x7f0a03cf" />
+    <public type="id" name="friend_container" id="0x7f0a03d0" />
+    <public type="id" name="friends_add_container" id="0x7f0a03d1" />
+    <public type="id" name="friends_add_send" id="0x7f0a03d2" />
+    <public type="id" name="friends_add_text_edit_wrap" id="0x7f0a03d3" />
+    <public type="id" name="friends_list_empty_friends_state_view" id="0x7f0a03d4" />
+    <public type="id" name="friends_list_flipper" id="0x7f0a03d5" />
+    <public type="id" name="friends_list_item_accept_button" id="0x7f0a03d6" />
+    <public type="id" name="friends_list_item_activity" id="0x7f0a03d7" />
+    <public type="id" name="friends_list_item_avatar" id="0x7f0a03d8" />
+    <public type="id" name="friends_list_item_avatar_wrap" id="0x7f0a03d9" />
+    <public type="id" name="friends_list_item_buttons_wrap" id="0x7f0a03da" />
+    <public type="id" name="friends_list_item_call_button" id="0x7f0a03db" />
+    <public type="id" name="friends_list_item_chat_button" id="0x7f0a03dc" />
+    <public type="id" name="friends_list_item_decline_button" id="0x7f0a03dd" />
+    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7f0a03de" />
+    <public type="id" name="friends_list_item_game" id="0x7f0a03df" />
+    <public type="id" name="friends_list_item_header_text" id="0x7f0a03e0" />
+    <public type="id" name="friends_list_item_name" id="0x7f0a03e1" />
+    <public type="id" name="friends_list_item_status" id="0x7f0a03e2" />
+    <public type="id" name="friends_list_item_text" id="0x7f0a03e3" />
+    <public type="id" name="friends_list_loading" id="0x7f0a03e4" />
+    <public type="id" name="friends_list_pending_item_header_button" id="0x7f0a03e5" />
+    <public type="id" name="friends_list_pending_item_header_text" id="0x7f0a03e6" />
+    <public type="id" name="friends_list_recycler" id="0x7f0a03e7" />
+    <public type="id" name="front" id="0x7f0a03e8" />
+    <public type="id" name="ghost_view" id="0x7f0a03e9" />
+    <public type="id" name="ghost_view_holder" id="0x7f0a03ea" />
+    <public type="id" name="gif_category_container" id="0x7f0a03eb" />
+    <public type="id" name="gif_category_gif_recycler" id="0x7f0a03ec" />
+    <public type="id" name="gif_category_item_icon" id="0x7f0a03ed" />
+    <public type="id" name="gif_category_item_preview" id="0x7f0a03ee" />
+    <public type="id" name="gif_category_item_title" id="0x7f0a03ef" />
+    <public type="id" name="gif_category_loading_view" id="0x7f0a03f0" />
+    <public type="id" name="gif_category_title" id="0x7f0a03f1" />
+    <public type="id" name="gif_item_image" id="0x7f0a03f2" />
+    <public type="id" name="gif_picker_category_recycler" id="0x7f0a03f3" />
+    <public type="id" name="gif_picker_container" id="0x7f0a03f4" />
+    <public type="id" name="gif_picker_loading_view" id="0x7f0a03f5" />
+    <public type="id" name="gif_search_app_bar" id="0x7f0a03f6" />
+    <public type="id" name="gif_search_bar" id="0x7f0a03f7" />
+    <public type="id" name="gif_search_clear" id="0x7f0a03f8" />
+    <public type="id" name="gif_search_gif_recycler" id="0x7f0a03f9" />
+    <public type="id" name="gif_search_input" id="0x7f0a03fa" />
+    <public type="id" name="gif_search_loading_view" id="0x7f0a03fb" />
+    <public type="id" name="gif_search_sheet_content" id="0x7f0a03fc" />
+    <public type="id" name="gif_search_suggested_terms_container" id="0x7f0a03fd" />
+    <public type="id" name="gif_search_suggested_terms_flex_box" id="0x7f0a03fe" />
+    <public type="id" name="gif_search_suggested_terms_icon_text" id="0x7f0a03ff" />
+    <public type="id" name="gif_search_toolbar" id="0x7f0a0400" />
+    <public type="id" name="gif_search_view_flipper" id="0x7f0a0401" />
+    <public type="id" name="gift_entitlement_code" id="0x7f0a0402" />
+    <public type="id" name="gift_entitlement_code_container" id="0x7f0a0403" />
+    <public type="id" name="gift_entitlement_container" id="0x7f0a0404" />
+    <public type="id" name="gift_entitlement_copy" id="0x7f0a0405" />
+    <public type="id" name="gift_entitlement_divider" id="0x7f0a0406" />
+    <public type="id" name="gift_entitlement_flipper" id="0x7f0a0407" />
+    <public type="id" name="gift_entitlement_generate" id="0x7f0a0408" />
+    <public type="id" name="gift_entitlement_revoke" id="0x7f0a0409" />
+    <public type="id" name="gift_sku_arrow" id="0x7f0a040a" />
+    <public type="id" name="gift_sku_copies" id="0x7f0a040b" />
+    <public type="id" name="gift_sku_icon" id="0x7f0a040c" />
+    <public type="id" name="gift_sku_name" id="0x7f0a040d" />
+    <public type="id" name="glSurface" id="0x7f0a040e" />
+    <public type="id" name="gl_surface_view" id="0x7f0a040f" />
+    <public type="id" name="global_search_add_a_friend_btn" id="0x7f0a0410" />
+    <public type="id" name="global_search_bar" id="0x7f0a0411" />
+    <public type="id" name="global_search_guild_list" id="0x7f0a0412" />
+    <public type="id" name="global_search_join_guild_btn" id="0x7f0a0413" />
+    <public type="id" name="global_search_recycler" id="0x7f0a0414" />
+    <public type="id" name="global_search_view_flipper" id="0x7f0a0415" />
+    <public type="id" name="gone" id="0x7f0a0416" />
+    <public type="id" name="gridView" id="0x7f0a0417" />
+    <public type="id" name="group_divider" id="0x7f0a0418" />
+    <public type="id" name="group_dm_notifications_mute_settings_view" id="0x7f0a0419" />
+    <public type="id" name="group_dm_settings_scroll_view" id="0x7f0a041a" />
+    <public type="id" name="group_invite_friends_chips" id="0x7f0a041b" />
+    <public type="id" name="group_invite_friends_recipients_container" id="0x7f0a041c" />
+    <public type="id" name="group_invite_friends_recycler" id="0x7f0a041d" />
+    <public type="id" name="group_invite_friends_save_fab" id="0x7f0a041e" />
+    <public type="id" name="group_invite_friends_text_to" id="0x7f0a041f" />
+    <public type="id" name="group_invite_friends_view_flipper" id="0x7f0a0420" />
+    <public type="id" name="groups" id="0x7f0a0421" />
+    <public type="id" name="guideline" id="0x7f0a0422" />
+    <public type="id" name="guild_actions_add_create" id="0x7f0a0423" />
+    <public type="id" name="guild_actions_add_join" id="0x7f0a0424" />
+    <public type="id" name="guild_actions_overview_header_tv" id="0x7f0a0425" />
+    <public type="id" name="guild_call_onboarding_connect" id="0x7f0a0426" />
+    <public type="id" name="guild_context_menu_card" id="0x7f0a0427" />
+    <public type="id" name="guild_context_menu_header" id="0x7f0a0428" />
+    <public type="id" name="guild_context_menu_header_divider" id="0x7f0a0429" />
+    <public type="id" name="guild_context_menu_leave_guild" id="0x7f0a042a" />
+    <public type="id" name="guild_context_menu_mark_as_read" id="0x7f0a042b" />
+    <public type="id" name="guild_context_menu_more_options" id="0x7f0a042c" />
+    <public type="id" name="guild_context_menu_notifications" id="0x7f0a042d" />
+    <public type="id" name="guild_create_button" id="0x7f0a042e" />
+    <public type="id" name="guild_create_flipper" id="0x7f0a042f" />
+    <public type="id" name="guild_create_guidelines" id="0x7f0a0430" />
+    <public type="id" name="guild_create_icon_uploader" id="0x7f0a0431" />
+    <public type="id" name="guild_create_name" id="0x7f0a0432" />
+    <public type="id" name="guild_create_protip" id="0x7f0a0433" />
+    <public type="id" name="guild_create_screen_title" id="0x7f0a0434" />
+    <public type="id" name="guild_invite_accept" id="0x7f0a0435" />
+    <public type="id" name="guild_invite_actions" id="0x7f0a0436" />
+    <public type="id" name="guild_invite_cancel" id="0x7f0a0437" />
+    <public type="id" name="guild_invite_channel_spinner" id="0x7f0a0438" />
+    <public type="id" name="guild_invite_empty_results" id="0x7f0a0439" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7f0a043a" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7f0a043b" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7f0a043c" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7f0a043d" />
+    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7f0a043e" />
+    <public type="id" name="guild_invite_generate_link" id="0x7f0a043f" />
+    <public type="id" name="guild_invite_info" id="0x7f0a0440" />
+    <public type="id" name="guild_invite_link" id="0x7f0a0441" />
+    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7f0a0442" />
+    <public type="id" name="guild_invite_never_expire" id="0x7f0a0443" />
+    <public type="id" name="guild_invite_settings_edit" id="0x7f0a0444" />
+    <public type="id" name="guild_invite_share_btn" id="0x7f0a0445" />
+    <public type="id" name="guild_invite_share_compact_search" id="0x7f0a0446" />
+    <public type="id" name="guild_invite_share_search" id="0x7f0a0447" />
+    <public type="id" name="guild_invite_splash" id="0x7f0a0448" />
+    <public type="id" name="guild_invite_suggestion_list" id="0x7f0a0449" />
+    <public type="id" name="guild_invite_suggestions_flipper" id="0x7f0a044a" />
+    <public type="id" name="guild_invite_temporary_membership" id="0x7f0a044b" />
+    <public type="id" name="guild_join_action_btn" id="0x7f0a044c" />
+    <public type="id" name="guild_join_content" id="0x7f0a044d" />
+    <public type="id" name="guild_join_invite" id="0x7f0a044e" />
+    <public type="id" name="guild_list" id="0x7f0a044f" />
+    <public type="id" name="guild_list_add_hint" id="0x7f0a0450" />
+    <public type="id" name="guild_list_unreads_stub" id="0x7f0a0451" />
+    <public type="id" name="guild_notifications_add_override" id="0x7f0a0452" />
+    <public type="id" name="guild_notifications_channel_list" id="0x7f0a0453" />
+    <public type="id" name="guild_notifications_channel_search" id="0x7f0a0454" />
+    <public type="id" name="guild_notifications_override_list" id="0x7f0a0455" />
+    <public type="id" name="guild_profile_sheet_actions" id="0x7f0a0456" />
+    <public type="id" name="guild_profile_sheet_actions_top_barrier" id="0x7f0a0457" />
+    <public type="id" name="guild_profile_sheet_allow_dm" id="0x7f0a0458" />
+    <public type="id" name="guild_profile_sheet_banner" id="0x7f0a0459" />
+    <public type="id" name="guild_profile_sheet_boosts" id="0x7f0a045a" />
+    <public type="id" name="guild_profile_sheet_bottom_actions" id="0x7f0a045b" />
+    <public type="id" name="guild_profile_sheet_bottom_container" id="0x7f0a045c" />
+    <public type="id" name="guild_profile_sheet_change_nickname" id="0x7f0a045d" />
+    <public type="id" name="guild_profile_sheet_constraint_layout" id="0x7f0a045e" />
+    <public type="id" name="guild_profile_sheet_content_container" id="0x7f0a045f" />
+    <public type="id" name="guild_profile_sheet_content_container_bottom_divider" id="0x7f0a0460" />
+    <public type="id" name="guild_profile_sheet_copy_id" id="0x7f0a0461" />
+    <public type="id" name="guild_profile_sheet_create_category" id="0x7f0a0462" />
+    <public type="id" name="guild_profile_sheet_create_channel" id="0x7f0a0463" />
+    <public type="id" name="guild_profile_sheet_description" id="0x7f0a0464" />
+    <public type="id" name="guild_profile_sheet_developer_actions" id="0x7f0a0465" />
+    <public type="id" name="guild_profile_sheet_emoji_imageview" id="0x7f0a0466" />
+    <public type="id" name="guild_profile_sheet_emojis" id="0x7f0a0467" />
+    <public type="id" name="guild_profile_sheet_emojis_card" id="0x7f0a0468" />
+    <public type="id" name="guild_profile_sheet_emojis_count" id="0x7f0a0469" />
+    <public type="id" name="guild_profile_sheet_flipper" id="0x7f0a046a" />
+    <public type="id" name="guild_profile_sheet_guild_verified_premium_icon" id="0x7f0a046b" />
+    <public type="id" name="guild_profile_sheet_hide_muted_channels" id="0x7f0a046c" />
+    <public type="id" name="guild_profile_sheet_icon" id="0x7f0a046d" />
+    <public type="id" name="guild_profile_sheet_icon_card" id="0x7f0a046e" />
+    <public type="id" name="guild_profile_sheet_icon_name" id="0x7f0a046f" />
+    <public type="id" name="guild_profile_sheet_invite" id="0x7f0a0470" />
+    <public type="id" name="guild_profile_sheet_join_server" id="0x7f0a0471" />
+    <public type="id" name="guild_profile_sheet_leave_server" id="0x7f0a0472" />
+    <public type="id" name="guild_profile_sheet_mark_as_read" id="0x7f0a0473" />
+    <public type="id" name="guild_profile_sheet_mark_as_read_action" id="0x7f0a0474" />
+    <public type="id" name="guild_profile_sheet_member_count" id="0x7f0a0475" />
+    <public type="id" name="guild_profile_sheet_member_count_text" id="0x7f0a0476" />
+    <public type="id" name="guild_profile_sheet_name" id="0x7f0a0477" />
+    <public type="id" name="guild_profile_sheet_nickname" id="0x7f0a0478" />
+    <public type="id" name="guild_profile_sheet_notifications" id="0x7f0a0479" />
+    <public type="id" name="guild_profile_sheet_online_count" id="0x7f0a047a" />
+    <public type="id" name="guild_profile_sheet_online_count_text" id="0x7f0a047b" />
+    <public type="id" name="guild_profile_sheet_premium_upsell_dot_separator" id="0x7f0a047c" />
+    <public type="id" name="guild_profile_sheet_premium_upsell_text" id="0x7f0a047d" />
+    <public type="id" name="guild_profile_sheet_primary_actions" id="0x7f0a047e" />
+    <public type="id" name="guild_profile_sheet_secondary_actions" id="0x7f0a047f" />
+    <public type="id" name="guild_profile_sheet_settings" id="0x7f0a0480" />
+    <public type="id" name="guild_profile_sheet_tab_items" id="0x7f0a0481" />
+    <public type="id" name="guild_profile_sheet_upload_emoji" id="0x7f0a0482" />
+    <public type="id" name="guild_profile_sheet_view_server" id="0x7f0a0483" />
+    <public type="id" name="guild_role_item_text" id="0x7f0a0484" />
+    <public type="id" name="guild_search_bar" id="0x7f0a0485" />
+    <public type="id" name="guild_search_item_avatar" id="0x7f0a0486" />
+    <public type="id" name="guild_search_item_name" id="0x7f0a0487" />
+    <public type="id" name="guild_search_recycler" id="0x7f0a0488" />
+    <public type="id" name="guild_selector_icon" id="0x7f0a0489" />
+    <public type="id" name="guild_selector_icon_text" id="0x7f0a048a" />
+    <public type="id" name="guild_selector_item_name" id="0x7f0a048b" />
+    <public type="id" name="guild_selector_list" id="0x7f0a048c" />
+    <public type="id" name="guild_template_channels_item_image" id="0x7f0a048d" />
+    <public type="id" name="guild_template_channels_item_name" id="0x7f0a048e" />
+    <public type="id" name="guild_template_channels_recycler_view" id="0x7f0a048f" />
+    <public type="id" name="guild_template_name" id="0x7f0a0490" />
+    <public type="id" name="guild_template_preview_channels" id="0x7f0a0491" />
+    <public type="id" name="guild_template_preview_roles" id="0x7f0a0492" />
+    <public type="id" name="guild_template_preview_roles_layout" id="0x7f0a0493" />
+    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7f0a0494" />
+    <public type="id" name="guild_transfer_ownership_cancel" id="0x7f0a0495" />
+    <public type="id" name="guild_transfer_ownership_confirm" id="0x7f0a0496" />
+    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7f0a0497" />
+    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7f0a0498" />
+    <public type="id" name="guild_video_at_capacity_confirm" id="0x7f0a0499" />
+    <public type="id" name="guild_view_1" id="0x7f0a049a" />
+    <public type="id" name="guild_view_2" id="0x7f0a049b" />
+    <public type="id" name="guild_view_3" id="0x7f0a049c" />
+    <public type="id" name="guild_view_4" id="0x7f0a049d" />
+    <public type="id" name="guild_view_image" id="0x7f0a049e" />
+    <public type="id" name="guild_view_text" id="0x7f0a049f" />
+    <public type="id" name="guild_views" id="0x7f0a04a0" />
+    <public type="id" name="guild_welcome_channel" id="0x7f0a04a1" />
+    <public type="id" name="guild_welcome_channel_description" id="0x7f0a04a2" />
+    <public type="id" name="guild_welcome_channel_details" id="0x7f0a04a3" />
+    <public type="id" name="guild_welcome_channel_emoji" id="0x7f0a04a4" />
+    <public type="id" name="guild_welcome_channel_hash" id="0x7f0a04a5" />
+    <public type="id" name="guild_welcome_channel_icon" id="0x7f0a04a6" />
+    <public type="id" name="guild_welcome_channel_name" id="0x7f0a04a7" />
+    <public type="id" name="guild_welcome_channel_text" id="0x7f0a04a8" />
+    <public type="id" name="guild_welcome_channel_unicode_emoji" id="0x7f0a04a9" />
+    <public type="id" name="guild_welcome_sheet_channels" id="0x7f0a04aa" />
+    <public type="id" name="guild_welcome_sheet_description" id="0x7f0a04ab" />
+    <public type="id" name="guild_welcome_sheet_flipper" id="0x7f0a04ac" />
+    <public type="id" name="guild_welcome_sheet_icon" id="0x7f0a04ad" />
+    <public type="id" name="guild_welcome_sheet_icon_card" id="0x7f0a04ae" />
+    <public type="id" name="guild_welcome_sheet_icon_name" id="0x7f0a04af" />
+    <public type="id" name="guild_welcome_sheet_name" id="0x7f0a04b0" />
+    <public type="id" name="guilds_item_application_stream" id="0x7f0a04b1" />
+    <public type="id" name="guilds_item_avatar" id="0x7f0a04b2" />
+    <public type="id" name="guilds_item_avatar_text" id="0x7f0a04b3" />
+    <public type="id" name="guilds_item_avatar_wrap" id="0x7f0a04b4" />
+    <public type="id" name="guilds_item_dm_avatar" id="0x7f0a04b5" />
+    <public type="id" name="guilds_item_dm_count" id="0x7f0a04b6" />
+    <public type="id" name="guilds_item_folder" id="0x7f0a04b7" />
+    <public type="id" name="guilds_item_folder_container" id="0x7f0a04b8" />
+    <public type="id" name="guilds_item_highlight" id="0x7f0a04b9" />
+    <public type="id" name="guilds_item_mentions" id="0x7f0a04ba" />
+    <public type="id" name="guilds_item_profile_avatar" id="0x7f0a04bb" />
+    <public type="id" name="guilds_item_profile_avatar_background" id="0x7f0a04bc" />
+    <public type="id" name="guilds_item_profile_selected" id="0x7f0a04bd" />
+    <public type="id" name="guilds_item_selected" id="0x7f0a04be" />
+    <public type="id" name="guilds_item_unread" id="0x7f0a04bf" />
+    <public type="id" name="guilds_item_voice" id="0x7f0a04c0" />
+    <public type="id" name="h263" id="0x7f0a04c1" />
+    <public type="id" name="h264" id="0x7f0a04c2" />
+    <public type="id" name="hardware" id="0x7f0a04c3" />
+    <public type="id" name="heAac" id="0x7f0a04c4" />
+    <public type="id" name="header_item_text" id="0x7f0a04c5" />
+    <public type="id" name="hideable" id="0x7f0a04c6" />
+    <public type="id" name="home" id="0x7f0a04c7" />
+    <public type="id" name="homeAsUp" id="0x7f0a04c8" />
+    <public type="id" name="home_panel_center" id="0x7f0a04c9" />
+    <public type="id" name="home_panel_center_channel_less" id="0x7f0a04ca" />
+    <public type="id" name="home_panel_center_channel_less_body" id="0x7f0a04cb" />
+    <public type="id" name="home_panel_center_channel_less_title" id="0x7f0a04cc" />
+    <public type="id" name="home_panel_center_nsfw" id="0x7f0a04cd" />
+    <public type="id" name="home_panel_center_nsfw_anchor_wrap" id="0x7f0a04ce" />
+    <public type="id" name="home_panel_center_nsfw_art" id="0x7f0a04cf" />
+    <public type="id" name="home_panel_center_nsfw_confirm" id="0x7f0a04d0" />
+    <public type="id" name="home_panel_center_nsfw_deny" id="0x7f0a04d1" />
+    <public type="id" name="home_panel_center_nsfw_description" id="0x7f0a04d2" />
+    <public type="id" name="home_panel_center_nsfw_title" id="0x7f0a04d3" />
+    <public type="id" name="home_panel_left" id="0x7f0a04d4" />
+    <public type="id" name="home_panel_loading" id="0x7f0a04d5" />
+    <public type="id" name="home_panel_loading_logo" id="0x7f0a04d6" />
+    <public type="id" name="home_panel_right" id="0x7f0a04d7" />
+    <public type="id" name="home_toolbar_unread_count" id="0x7f0a04d8" />
+    <public type="id" name="html" id="0x7f0a04d9" />
+    <public type="id" name="icon" id="0x7f0a04da" />
+    <public type="id" name="icon_frame" id="0x7f0a04db" />
+    <public type="id" name="icon_group" id="0x7f0a04dc" />
+    <public type="id" name="icon_only" id="0x7f0a04dd" />
+    <public type="id" name="icon_uploader_image" id="0x7f0a04de" />
+    <public type="id" name="icon_uploader_placeholder_border" id="0x7f0a04df" />
+    <public type="id" name="icon_uploader_placeholder_group" id="0x7f0a04e0" />
+    <public type="id" name="icon_uploader_placeholder_icon" id="0x7f0a04e1" />
+    <public type="id" name="icon_uploader_placeholder_text" id="0x7f0a04e2" />
+    <public type="id" name="icon_uploader_plus" id="0x7f0a04e3" />
+    <public type="id" name="icon_uri" id="0x7f0a04e4" />
+    <public type="id" name="ifRoom" id="0x7f0a04e5" />
+    <public type="id" name="image" id="0x7f0a04e6" />
+    <public type="id" name="image_bottom_guideline" id="0x7f0a04e7" />
+    <public type="id" name="image_view_crop" id="0x7f0a04e8" />
+    <public type="id" name="image_view_logo" id="0x7f0a04e9" />
+    <public type="id" name="image_view_state_aspect_ratio" id="0x7f0a04ea" />
+    <public type="id" name="image_view_state_rotate" id="0x7f0a04eb" />
+    <public type="id" name="image_view_state_scale" id="0x7f0a04ec" />
+    <public type="id" name="incandescent" id="0x7f0a04ed" />
+    <public type="id" name="incoming" id="0x7f0a04ee" />
+    <public type="id" name="incoming_call_accept_button" id="0x7f0a04ef" />
+    <public type="id" name="incoming_call_accept_container" id="0x7f0a04f0" />
+    <public type="id" name="incoming_call_accept_text" id="0x7f0a04f1" />
+    <public type="id" name="incoming_call_connect_voice_only" id="0x7f0a04f2" />
+    <public type="id" name="incoming_call_decline_button" id="0x7f0a04f3" />
+    <public type="id" name="incoming_call_decline_container" id="0x7f0a04f4" />
+    <public type="id" name="incoming_call_status_container" id="0x7f0a04f5" />
+    <public type="id" name="incoming_call_status_primary" id="0x7f0a04f6" />
+    <public type="id" name="incoming_call_status_secondary" id="0x7f0a04f7" />
+    <public type="id" name="incoming_call_top_guideline" id="0x7f0a04f8" />
+    <public type="id" name="incoming_call_users_recycler" id="0x7f0a04f9" />
+    <public type="id" name="incoming_share_no_results_img" id="0x7f0a04fa" />
+    <public type="id" name="incoming_share_results_flipper" id="0x7f0a04fb" />
+    <public type="id" name="index_entity_types" id="0x7f0a04fc" />
+    <public type="id" name="indicators_container" id="0x7f0a04fd" />
+    <public type="id" name="info" id="0x7f0a04fe" />
+    <public type="id" name="inline_media_image_preview" id="0x7f0a04ff" />
+    <public type="id" name="inline_media_loading_indicator" id="0x7f0a0500" />
+    <public type="id" name="inline_media_play_button" id="0x7f0a0501" />
+    <public type="id" name="inline_media_player_view" id="0x7f0a0502" />
+    <public type="id" name="inline_media_volume_toggle" id="0x7f0a0503" />
+    <public type="id" name="instant_message" id="0x7f0a0504" />
+    <public type="id" name="integration_header_container" id="0x7f0a0505" />
+    <public type="id" name="integration_header_disabled_overlay" id="0x7f0a0506" />
+    <public type="id" name="integration_icon" id="0x7f0a0507" />
+    <public type="id" name="integration_name" id="0x7f0a0508" />
+    <public type="id" name="integration_name_container" id="0x7f0a0509" />
+    <public type="id" name="integration_owner_name" id="0x7f0a050a" />
+    <public type="id" name="integration_settings_icon" id="0x7f0a050b" />
+    <public type="id" name="integration_sync_switch" id="0x7f0a050c" />
+    <public type="id" name="integration_syncing_progress_bar" id="0x7f0a050d" />
+    <public type="id" name="integrations_empty_body" id="0x7f0a050e" />
+    <public type="id" name="integrations_empty_header" id="0x7f0a050f" />
+    <public type="id" name="integrations_recycler" id="0x7f0a0510" />
+    <public type="id" name="integrations_view_flipper" id="0x7f0a0511" />
+    <public type="id" name="intent_action" id="0x7f0a0512" />
+    <public type="id" name="intent_activity" id="0x7f0a0513" />
+    <public type="id" name="intent_data" id="0x7f0a0514" />
+    <public type="id" name="intent_data_id" id="0x7f0a0515" />
+    <public type="id" name="intent_extra_data" id="0x7f0a0516" />
+    <public type="id" name="invisible" id="0x7f0a0517" />
+    <public type="id" name="invite_actions_copy" id="0x7f0a0518" />
+    <public type="id" name="invite_actions_revoke" id="0x7f0a0519" />
+    <public type="id" name="invite_actions_share" id="0x7f0a051a" />
+    <public type="id" name="invite_actions_title" id="0x7f0a051b" />
+    <public type="id" name="invite_avatar" id="0x7f0a051c" />
+    <public type="id" name="invite_avatar_small" id="0x7f0a051d" />
+    <public type="id" name="invite_avatar_small_card" id="0x7f0a051e" />
+    <public type="id" name="invite_avatar_small_wrap" id="0x7f0a051f" />
+    <public type="id" name="invite_avatar_wrap" id="0x7f0a0520" />
+    <public type="id" name="invite_channel" id="0x7f0a0521" />
+    <public type="id" name="invite_code" id="0x7f0a0522" />
+    <public type="id" name="invite_container" id="0x7f0a0523" />
+    <public type="id" name="invite_divider" id="0x7f0a0524" />
+    <public type="id" name="invite_expiration_container" id="0x7f0a0525" />
+    <public type="id" name="invite_expiration_time" id="0x7f0a0526" />
+    <public type="id" name="invite_expired_image" id="0x7f0a0527" />
+    <public type="id" name="invite_expires_label" id="0x7f0a0528" />
+    <public type="id" name="invite_list_item_avatar" id="0x7f0a0529" />
+    <public type="id" name="invite_members_online" id="0x7f0a052a" />
+    <public type="id" name="invite_members_online_wrap" id="0x7f0a052b" />
+    <public type="id" name="invite_members_total" id="0x7f0a052c" />
+    <public type="id" name="invite_members_total_wrap" id="0x7f0a052d" />
+    <public type="id" name="invite_members_wrap" id="0x7f0a052e" />
+    <public type="id" name="invite_message" id="0x7f0a052f" />
+    <public type="id" name="invite_name_container" id="0x7f0a0530" />
+    <public type="id" name="invite_settings_bottom_sheet" id="0x7f0a0531" />
+    <public type="id" name="invite_settings_icon" id="0x7f0a0532" />
+    <public type="id" name="invite_title" id="0x7f0a0533" />
+    <public type="id" name="invite_user_name" id="0x7f0a0534" />
+    <public type="id" name="invite_uses" id="0x7f0a0535" />
+    <public type="id" name="invite_uses_label" id="0x7f0a0536" />
+    <public type="id" name="italic" id="0x7f0a0537" />
+    <public type="id" name="item_backup_code_tv" id="0x7f0a0538" />
+    <public type="id" name="item_check_indicator" id="0x7f0a0539" />
+    <public type="id" name="item_description_tv" id="0x7f0a053a" />
+    <public type="id" name="item_game_invite" id="0x7f0a053b" />
+    <public type="id" name="item_game_invite_action_btn" id="0x7f0a053c" />
+    <public type="id" name="item_game_invite_application_name_tv" id="0x7f0a053d" />
+    <public type="id" name="item_game_invite_avatar_iv" id="0x7f0a053e" />
+    <public type="id" name="item_game_invite_avatar_status_iv" id="0x7f0a053f" />
+    <public type="id" name="item_game_invite_barrier" id="0x7f0a0540" />
+    <public type="id" name="item_game_invite_cover_iv" id="0x7f0a0541" />
+    <public type="id" name="item_game_invite_header" id="0x7f0a0542" />
+    <public type="id" name="item_game_invite_recycler" id="0x7f0a0543" />
+    <public type="id" name="item_game_invite_subtext" id="0x7f0a0544" />
+    <public type="id" name="item_gift_accept_button" id="0x7f0a0545" />
+    <public type="id" name="item_gift_cannot_claim_button" id="0x7f0a0546" />
+    <public type="id" name="item_gift_details" id="0x7f0a0547" />
+    <public type="id" name="item_gift_expires" id="0x7f0a0548" />
+    <public type="id" name="item_gift_header" id="0x7f0a0549" />
+    <public type="id" name="item_gift_image" id="0x7f0a054a" />
+    <public type="id" name="item_gift_image_background" id="0x7f0a054b" />
+    <public type="id" name="item_gift_loading_button_placeholder" id="0x7f0a054c" />
+    <public type="id" name="item_gift_name" id="0x7f0a054d" />
+    <public type="id" name="item_gift_subtext" id="0x7f0a054e" />
+    <public type="id" name="item_gift_verify_button" id="0x7f0a054f" />
+    <public type="id" name="item_group_tv" id="0x7f0a0550" />
+    <public type="id" name="item_guild_template_header" id="0x7f0a0551" />
+    <public type="id" name="item_guild_template_image" id="0x7f0a0552" />
+    <public type="id" name="item_guild_template_join_button" id="0x7f0a0553" />
+    <public type="id" name="item_guild_template_name" id="0x7f0a0554" />
+    <public type="id" name="item_guild_template_subtext" id="0x7f0a0555" />
+    <public type="id" name="item_guild_welcome_header" id="0x7f0a0556" />
+    <public type="id" name="item_guild_welcome_subheader" id="0x7f0a0557" />
+    <public type="id" name="item_header" id="0x7f0a0558" />
+    <public type="id" name="item_header_tv" id="0x7f0a0559" />
+    <public type="id" name="item_icon_iv" id="0x7f0a055a" />
+    <public type="id" name="item_invite_btn" id="0x7f0a055b" />
+    <public type="id" name="item_invite_channel_name" id="0x7f0a055c" />
+    <public type="id" name="item_invite_header" id="0x7f0a055d" />
+    <public type="id" name="item_invite_image" id="0x7f0a055e" />
+    <public type="id" name="item_invite_image_text" id="0x7f0a055f" />
+    <public type="id" name="item_invite_join_button" id="0x7f0a0560" />
+    <public type="id" name="item_invite_joined_button" id="0x7f0a0561" />
+    <public type="id" name="item_invite_loading_button" id="0x7f0a0562" />
+    <public type="id" name="item_invite_member_container" id="0x7f0a0563" />
+    <public type="id" name="item_invite_mention_button" id="0x7f0a0564" />
+    <public type="id" name="item_invite_name" id="0x7f0a0565" />
+    <public type="id" name="item_invite_online_dot" id="0x7f0a0566" />
+    <public type="id" name="item_invite_online_text" id="0x7f0a0567" />
+    <public type="id" name="item_invite_total_member_dot" id="0x7f0a0568" />
+    <public type="id" name="item_invite_total_member_text" id="0x7f0a0569" />
+    <public type="id" name="item_listen_together_album_image" id="0x7f0a056a" />
+    <public type="id" name="item_listen_together_artist" id="0x7f0a056b" />
+    <public type="id" name="item_listen_together_container" id="0x7f0a056c" />
+    <public type="id" name="item_listen_together_header" id="0x7f0a056d" />
+    <public type="id" name="item_listen_together_join" id="0x7f0a056e" />
+    <public type="id" name="item_listen_together_recycler" id="0x7f0a056f" />
+    <public type="id" name="item_listen_together_session_ended" id="0x7f0a0570" />
+    <public type="id" name="item_listen_together_track" id="0x7f0a0571" />
+    <public type="id" name="item_mentions_tv" id="0x7f0a0572" />
+    <public type="id" name="item_name_tv" id="0x7f0a0573" />
+    <public type="id" name="item_sent" id="0x7f0a0574" />
+    <public type="id" name="item_touch_helper_previous_elevation" id="0x7f0a0575" />
+    <public type="id" name="item_unread" id="0x7f0a0576" />
+    <public type="id" name="jpeg" id="0x7f0a0577" />
+    <public type="id" name="kick_user_body" id="0x7f0a0578" />
+    <public type="id" name="kick_user_cancel" id="0x7f0a0579" />
+    <public type="id" name="kick_user_confirm" id="0x7f0a057a" />
+    <public type="id" name="kick_user_reason" id="0x7f0a057b" />
+    <public type="id" name="kick_user_title" id="0x7f0a057c" />
+    <public type="id" name="labeled" id="0x7f0a057d" />
+    <public type="id" name="large" id="0x7f0a057e" />
+    <public type="id" name="largeLabel" id="0x7f0a057f" />
+    <public type="id" name="large_icon_uri" id="0x7f0a0580" />
+    <public type="id" name="launch_btn" id="0x7f0a0581" />
+    <public type="id" name="launch_camera_btn" id="0x7f0a0582" />
+    <public type="id" name="layout_aspect_ratio" id="0x7f0a0583" />
+    <public type="id" name="layout_rotate_wheel" id="0x7f0a0584" />
+    <public type="id" name="layout_scale_wheel" id="0x7f0a0585" />
+    <public type="id" name="leave_guild_cancel_btn" id="0x7f0a0586" />
+    <public type="id" name="leave_guild_confirm_btn" id="0x7f0a0587" />
+    <public type="id" name="leave_guild_dialog_body" id="0x7f0a0588" />
+    <public type="id" name="leave_guild_dialog_header" id="0x7f0a0589" />
+    <public type="id" name="left" id="0x7f0a058a" />
+    <public type="id" name="light" id="0x7f0a058b" />
+    <public type="id" name="line1" id="0x7f0a058c" />
+    <public type="id" name="line3" id="0x7f0a058d" />
+    <public type="id" name="linear" id="0x7f0a058e" />
+    <public type="id" name="list" id="0x7f0a058f" />
+    <public type="id" name="listMode" id="0x7f0a0590" />
+    <public type="id" name="list_item" id="0x7f0a0591" />
+    <public type="id" name="loading_button_button" id="0x7f0a0592" />
+    <public type="id" name="loading_button_progress" id="0x7f0a0593" />
+    <public type="id" name="lottie_layer_name" id="0x7f0a0594" />
+    <public type="id" name="main_panel_right_rounded_container" id="0x7f0a0595" />
+    <public type="id" name="manage_reactions_emoji_container" id="0x7f0a0596" />
+    <public type="id" name="manage_reactions_emoji_counter" id="0x7f0a0597" />
+    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7f0a0598" />
+    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7f0a0599" />
+    <public type="id" name="manage_reactions_emojis_recycler" id="0x7f0a059a" />
+    <public type="id" name="manage_reactions_result_error_img" id="0x7f0a059b" />
+    <public type="id" name="manage_reactions_result_error_text" id="0x7f0a059c" />
+    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7f0a059d" />
+    <public type="id" name="manage_reactions_result_user_avatar" id="0x7f0a059e" />
+    <public type="id" name="manage_reactions_result_user_name" id="0x7f0a059f" />
+    <public type="id" name="manage_reactions_results_recycler" id="0x7f0a05a0" />
+    <public type="id" name="masked" id="0x7f0a05a1" />
+    <public type="id" name="masked_links_body_text" id="0x7f0a05a2" />
+    <public type="id" name="masked_links_cancel" id="0x7f0a05a3" />
+    <public type="id" name="masked_links_confirm" id="0x7f0a05a4" />
+    <public type="id" name="masked_links_trust_domain" id="0x7f0a05a5" />
+    <public type="id" name="match_global_nicknames" id="0x7f0a05a6" />
+    <public type="id" name="media_actions" id="0x7f0a05a7" />
+    <public type="id" name="member_list_item_avatar" id="0x7f0a05a8" />
+    <public type="id" name="member_list_item_container" id="0x7f0a05a9" />
+    <public type="id" name="member_list_item_lock" id="0x7f0a05aa" />
+    <public type="id" name="member_list_item_name" id="0x7f0a05ab" />
+    <public type="id" name="member_list_item_overflow" id="0x7f0a05ac" />
+    <public type="id" name="member_list_item_roles_list" id="0x7f0a05ad" />
+    <public type="id" name="menu_add_connections" id="0x7f0a05ae" />
+    <public type="id" name="menu_audit_log_sort_actions" id="0x7f0a05af" />
+    <public type="id" name="menu_audit_log_sort_users" id="0x7f0a05b0" />
+    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7f0a05b1" />
+    <public type="id" name="menu_auth_mfa_info" id="0x7f0a05b2" />
+    <public type="id" name="menu_call_overlay_launcher" id="0x7f0a05b3" />
+    <public type="id" name="menu_call_switch_camera" id="0x7f0a05b4" />
+    <public type="id" name="menu_call_video_list" id="0x7f0a05b5" />
+    <public type="id" name="menu_call_voice_settings" id="0x7f0a05b6" />
+    <public type="id" name="menu_channel_settings_delete" id="0x7f0a05b7" />
+    <public type="id" name="menu_channel_settings_reset" id="0x7f0a05b8" />
+    <public type="id" name="menu_chat_add_friend" id="0x7f0a05b9" />
+    <public type="id" name="menu_chat_search" id="0x7f0a05ba" />
+    <public type="id" name="menu_chat_side_panel" id="0x7f0a05bb" />
+    <public type="id" name="menu_chat_start_call" id="0x7f0a05bc" />
+    <public type="id" name="menu_chat_start_group" id="0x7f0a05bd" />
+    <public type="id" name="menu_chat_start_video_call" id="0x7f0a05be" />
+    <public type="id" name="menu_chat_stop_call" id="0x7f0a05bf" />
+    <public type="id" name="menu_code_verification_paste" id="0x7f0a05c0" />
+    <public type="id" name="menu_copy_id" id="0x7f0a05c1" />
+    <public type="id" name="menu_crop" id="0x7f0a05c2" />
+    <public type="id" name="menu_debugging_filter" id="0x7f0a05c3" />
+    <public type="id" name="menu_debugging_share" id="0x7f0a05c4" />
+    <public type="id" name="menu_edit_overwrite_delete" id="0x7f0a05c5" />
+    <public type="id" name="menu_edit_role_delete" id="0x7f0a05c6" />
+    <public type="id" name="menu_filter" id="0x7f0a05c7" />
+    <public type="id" name="menu_friends_add_friend" id="0x7f0a05c8" />
+    <public type="id" name="menu_friends_start_group" id="0x7f0a05c9" />
+    <public type="id" name="menu_leave_group" id="0x7f0a05ca" />
+    <public type="id" name="menu_loader" id="0x7f0a05cb" />
+    <public type="id" name="menu_media_browser" id="0x7f0a05cc" />
+    <public type="id" name="menu_media_download" id="0x7f0a05cd" />
+    <public type="id" name="menu_media_share" id="0x7f0a05ce" />
+    <public type="id" name="menu_premium_guild" id="0x7f0a05cf" />
+    <public type="id" name="menu_private_channel_sidebar_close" id="0x7f0a05d0" />
+    <public type="id" name="menu_private_channel_sidebar_copy_id" id="0x7f0a05d1" />
+    <public type="id" name="menu_private_channel_sidebar_customize_gorup" id="0x7f0a05d2" />
+    <public type="id" name="menu_private_channel_sidebar_pinned_messages" id="0x7f0a05d3" />
+    <public type="id" name="menu_send" id="0x7f0a05d4" />
+    <public type="id" name="menu_server_settings_delete" id="0x7f0a05d5" />
+    <public type="id" name="menu_server_settings_emoji_delete" id="0x7f0a05d6" />
+    <public type="id" name="menu_server_settings_members_prune" id="0x7f0a05d7" />
+    <public type="id" name="menu_settings_debugging" id="0x7f0a05d8" />
+    <public type="id" name="menu_settings_log_out" id="0x7f0a05d9" />
+    <public type="id" name="menu_settings_premium_guild_sub_cancel" id="0x7f0a05da" />
+    <public type="id" name="menu_settings_premium_guild_sub_transfer" id="0x7f0a05db" />
+    <public type="id" name="menu_settings_premium_guild_sub_uncancel" id="0x7f0a05dc" />
+    <public type="id" name="menu_sort_channel" id="0x7f0a05dd" />
+    <public type="id" name="menu_sort_done" id="0x7f0a05de" />
+    <public type="id" name="menu_user_mentions_filter" id="0x7f0a05df" />
+    <public type="id" name="message" id="0x7f0a05e0" />
+    <public type="id" name="mfa_description_text" id="0x7f0a05e1" />
+    <public type="id" name="mfa_download_body" id="0x7f0a05e2" />
+    <public type="id" name="mfa_success_enable_sms" id="0x7f0a05e3" />
+    <public type="id" name="middle" id="0x7f0a05e4" />
+    <public type="id" name="mini" id="0x7f0a05e5" />
+    <public type="id" name="mono" id="0x7f0a05e6" />
+    <public type="id" name="month_grid" id="0x7f0a05e7" />
+    <public type="id" name="month_navigation_bar" id="0x7f0a05e8" />
+    <public type="id" name="month_navigation_fragment_toggle" id="0x7f0a05e9" />
+    <public type="id" name="month_navigation_next" id="0x7f0a05ea" />
+    <public type="id" name="month_navigation_previous" id="0x7f0a05eb" />
+    <public type="id" name="month_title" id="0x7f0a05ec" />
+    <public type="id" name="mtrl_calendar_day_selector_frame" id="0x7f0a05ed" />
+    <public type="id" name="mtrl_calendar_days_of_week" id="0x7f0a05ee" />
+    <public type="id" name="mtrl_calendar_frame" id="0x7f0a05ef" />
+    <public type="id" name="mtrl_calendar_main_pane" id="0x7f0a05f0" />
+    <public type="id" name="mtrl_calendar_months" id="0x7f0a05f1" />
+    <public type="id" name="mtrl_calendar_selection_frame" id="0x7f0a05f2" />
+    <public type="id" name="mtrl_calendar_text_input_frame" id="0x7f0a05f3" />
+    <public type="id" name="mtrl_calendar_year_selector_frame" id="0x7f0a05f4" />
+    <public type="id" name="mtrl_card_checked_layer_id" id="0x7f0a05f5" />
+    <public type="id" name="mtrl_child_content_container" id="0x7f0a05f6" />
+    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7f0a05f7" />
+    <public type="id" name="mtrl_motion_snapshot_view" id="0x7f0a05f8" />
+    <public type="id" name="mtrl_picker_fullscreen" id="0x7f0a05f9" />
+    <public type="id" name="mtrl_picker_header" id="0x7f0a05fa" />
+    <public type="id" name="mtrl_picker_header_selection_text" id="0x7f0a05fb" />
+    <public type="id" name="mtrl_picker_header_title_and_selection" id="0x7f0a05fc" />
+    <public type="id" name="mtrl_picker_header_toggle" id="0x7f0a05fd" />
+    <public type="id" name="mtrl_picker_text_input_date" id="0x7f0a05fe" />
+    <public type="id" name="mtrl_picker_text_input_range_end" id="0x7f0a05ff" />
+    <public type="id" name="mtrl_picker_text_input_range_start" id="0x7f0a0600" />
+    <public type="id" name="mtrl_picker_title_text" id="0x7f0a0601" />
+    <public type="id" name="multiply" id="0x7f0a0602" />
+    <public type="id" name="mute_settings_sheet_channel_muted_details" id="0x7f0a0603" />
+    <public type="id" name="mute_settings_sheet_mute_options" id="0x7f0a0604" />
+    <public type="id" name="mute_settings_sheet_notification_settings_button" id="0x7f0a0605" />
+    <public type="id" name="mute_settings_sheet_notification_settings_button_container" id="0x7f0a0606" />
+    <public type="id" name="mute_settings_sheet_notification_settings_label" id="0x7f0a0607" />
+    <public type="id" name="mute_settings_sheet_notification_settings_overrides_label" id="0x7f0a0608" />
+    <public type="id" name="mute_settings_sheet_option_always" id="0x7f0a0609" />
+    <public type="id" name="mute_settings_sheet_option_eight_hours" id="0x7f0a060a" />
+    <public type="id" name="mute_settings_sheet_option_fifteen_minutes" id="0x7f0a060b" />
+    <public type="id" name="mute_settings_sheet_option_one_hour" id="0x7f0a060c" />
+    <public type="id" name="mute_settings_sheet_option_twenty_four_hours" id="0x7f0a060d" />
+    <public type="id" name="mute_settings_sheet_subtitle" id="0x7f0a060e" />
+    <public type="id" name="mute_settings_sheet_title" id="0x7f0a060f" />
+    <public type="id" name="mute_settings_sheet_unmute_button" id="0x7f0a0610" />
+    <public type="id" name="mute_settings_sheet_unmute_button_details_label" id="0x7f0a0611" />
+    <public type="id" name="mute_settings_sheet_unmute_button_label" id="0x7f0a0612" />
+    <public type="id" name="mute_toggle" id="0x7f0a0613" />
+    <public type="id" name="navigation_header_container" id="0x7f0a0614" />
+    <public type="id" name="navigation_help_close" id="0x7f0a0615" />
+    <public type="id" name="navigation_help_indicators" id="0x7f0a0616" />
+    <public type="id" name="navigation_help_nux_pager" id="0x7f0a0617" />
+    <public type="id" name="navigation_indicator" id="0x7f0a0618" />
+    <public type="id" name="nearby_friends_enable" id="0x7f0a0619" />
+    <public type="id" name="nearby_friends_learn_more" id="0x7f0a061a" />
+    <public type="id" name="nearby_friends_recycler" id="0x7f0a061b" />
+    <public type="id" name="nearby_friends_searching_body" id="0x7f0a061c" />
+    <public type="id" name="nearby_friends_searching_lottie" id="0x7f0a061d" />
+    <public type="id" name="nearby_friends_searching_title" id="0x7f0a061e" />
+    <public type="id" name="never" id="0x7f0a061f" />
+    <public type="id" name="noScroll" id="0x7f0a0620" />
+    <public type="id" name="no_bans_body" id="0x7f0a0621" />
+    <public type="id" name="no_invites_body" id="0x7f0a0622" />
+    <public type="id" name="no_invites_header" id="0x7f0a0623" />
+    <public type="id" name="no_logs_body" id="0x7f0a0624" />
+    <public type="id" name="no_logs_title" id="0x7f0a0625" />
+    <public type="id" name="no_results_text" id="0x7f0a0626" />
+    <public type="id" name="noise_cancellation_enable_button" id="0x7f0a0627" />
+    <public type="id" name="noise_cancellation_learn_more" id="0x7f0a0628" />
+    <public type="id" name="none" id="0x7f0a0629" />
+    <public type="id" name="normal" id="0x7f0a062a" />
+    <public type="id" name="notice_body_container" id="0x7f0a062b" />
+    <public type="id" name="notice_body_text" id="0x7f0a062c" />
+    <public type="id" name="notice_cancel" id="0x7f0a062d" />
+    <public type="id" name="notice_crop" id="0x7f0a062e" />
+    <public type="id" name="notice_header" id="0x7f0a062f" />
+    <public type="id" name="notice_header_container" id="0x7f0a0630" />
+    <public type="id" name="notice_image" id="0x7f0a0631" />
+    <public type="id" name="notice_ok" id="0x7f0a0632" />
+    <public type="id" name="notice_upload" id="0x7f0a0633" />
+    <public type="id" name="notification_background" id="0x7f0a0634" />
+    <public type="id" name="notification_main_column" id="0x7f0a0635" />
+    <public type="id" name="notification_main_column_container" id="0x7f0a0636" />
+    <public type="id" name="notification_mute_settings_mute_item" id="0x7f0a0637" />
+    <public type="id" name="notification_mute_settings_mute_item_description" id="0x7f0a0638" />
+    <public type="id" name="notification_mute_settings_mute_item_status" id="0x7f0a0639" />
+    <public type="id" name="nowrap" id="0x7f0a063a" />
+    <public type="id" name="nuf_channel_prompt_cta_button" id="0x7f0a063b" />
+    <public type="id" name="nuf_channel_prompt_guild_icon" id="0x7f0a063c" />
+    <public type="id" name="nuf_channel_prompt_guild_icon_name" id="0x7f0a063d" />
+    <public type="id" name="nuf_channel_prompt_guild_name" id="0x7f0a063e" />
+    <public type="id" name="nuf_channel_prompt_skip_button" id="0x7f0a063f" />
+    <public type="id" name="nuf_channel_prompt_topic_wrap" id="0x7f0a0640" />
+    <public type="id" name="numeric" id="0x7f0a0641" />
+    <public type="id" name="nux_guild_template_action_club" id="0x7f0a0642" />
+    <public type="id" name="nux_guild_template_action_community" id="0x7f0a0643" />
+    <public type="id" name="nux_guild_template_action_create" id="0x7f0a0644" />
+    <public type="id" name="nux_guild_template_action_creator" id="0x7f0a0645" />
+    <public type="id" name="nux_guild_template_action_friend" id="0x7f0a0646" />
+    <public type="id" name="nux_guild_template_action_gaming" id="0x7f0a0647" />
+    <public type="id" name="nux_guild_template_action_join" id="0x7f0a0648" />
+    <public type="id" name="nux_guild_template_action_study" id="0x7f0a0649" />
+    <public type="id" name="nux_guild_template_section_bottom" id="0x7f0a064a" />
+    <public type="id" name="nux_guild_template_section_custom" id="0x7f0a064b" />
+    <public type="id" name="nux_guild_template_section_custom_label" id="0x7f0a064c" />
+    <public type="id" name="nux_guild_template_section_top" id="0x7f0a064d" />
+    <public type="id" name="oauth_application_deauthorize_btn" id="0x7f0a064e" />
+    <public type="id" name="oauth_application_description_label_tv" id="0x7f0a064f" />
+    <public type="id" name="oauth_application_description_tv" id="0x7f0a0650" />
+    <public type="id" name="oauth_application_icon_iv" id="0x7f0a0651" />
+    <public type="id" name="oauth_application_name_tv" id="0x7f0a0652" />
+    <public type="id" name="oauth_application_permissions_rv" id="0x7f0a0653" />
+    <public type="id" name="oauth_authorize_age_notice" id="0x7f0a0654" />
+    <public type="id" name="oauth_authorize_age_notice_icon" id="0x7f0a0655" />
+    <public type="id" name="oauth_authorize_application_icon" id="0x7f0a0656" />
+    <public type="id" name="oauth_authorize_application_name" id="0x7f0a0657" />
+    <public type="id" name="oauth_authorize_card" id="0x7f0a0658" />
+    <public type="id" name="oauth_authorize_connect_label" id="0x7f0a0659" />
+    <public type="id" name="oauth_authorize_content" id="0x7f0a065a" />
+    <public type="id" name="oauth_authorize_deny" id="0x7f0a065b" />
+    <public type="id" name="oauth_authorize_grant" id="0x7f0a065c" />
+    <public type="id" name="oauth_authorize_loading" id="0x7f0a065d" />
+    <public type="id" name="oauth_authorize_loading_cancel" id="0x7f0a065e" />
+    <public type="id" name="oauth_authorize_logo" id="0x7f0a065f" />
+    <public type="id" name="oauth_authorize_not_supported" id="0x7f0a0660" />
+    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7f0a0661" />
+    <public type="id" name="oauth_authorize_permissions_list" id="0x7f0a0662" />
+    <public type="id" name="oauth_authorize_security_notice" id="0x7f0a0663" />
+    <public type="id" name="oauth_authorize_security_notice_icon" id="0x7f0a0664" />
+    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7f0a0665" />
+    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7f0a0666" />
+    <public type="id" name="oauth_authorize_user_icon" id="0x7f0a0667" />
+    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7f0a0668" />
+    <public type="id" name="oauth_token_permission_detailed_name" id="0x7f0a0669" />
+    <public type="id" name="off" id="0x7f0a066a" />
+    <public type="id" name="off_disabled_overlay" id="0x7f0a066b" />
+    <public type="id" name="omnibox_title_section" id="0x7f0a066c" />
+    <public type="id" name="omnibox_url_section" id="0x7f0a066d" />
+    <public type="id" name="on" id="0x7f0a066e" />
+    <public type="id" name="one" id="0x7f0a066f" />
+    <public type="id" name="outgoing" id="0x7f0a0670" />
+    <public type="id" name="outline" id="0x7f0a0671" />
+    <public type="id" name="overlay_bubble_iv" id="0x7f0a0672" />
+    <public type="id" name="overlay_channel_name" id="0x7f0a0673" />
+    <public type="id" name="overlay_channel_search" id="0x7f0a0674" />
+    <public type="id" name="overlay_guild_name" id="0x7f0a0675" />
+    <public type="id" name="overlay_header" id="0x7f0a0676" />
+    <public type="id" name="overlay_invite_link" id="0x7f0a0677" />
+    <public type="id" name="overlay_linked_anchor_view" id="0x7f0a0678" />
+    <public type="id" name="overlay_members_overflow_tv" id="0x7f0a0679" />
+    <public type="id" name="overlay_members_rv" id="0x7f0a067a" />
+    <public type="id" name="overlay_menu" id="0x7f0a067b" />
+    <public type="id" name="overlay_network_icon" id="0x7f0a067c" />
+    <public type="id" name="overlay_open_app" id="0x7f0a067d" />
+    <public type="id" name="overlay_switch_channels" id="0x7f0a067e" />
+    <public type="id" name="packed" id="0x7f0a067f" />
+    <public type="id" name="page_tabs" id="0x7f0a0680" />
+    <public type="id" name="parallax" id="0x7f0a0681" />
+    <public type="id" name="parent" id="0x7f0a0682" />
+    <public type="id" name="parentPanel" id="0x7f0a0683" />
+    <public type="id" name="parent_matrix" id="0x7f0a0684" />
+    <public type="id" name="participant_bg_avatar" id="0x7f0a0685" />
+    <public type="id" name="participant_bg_letterbox" id="0x7f0a0686" />
+    <public type="id" name="participant_deafen_status_indicator" id="0x7f0a0687" />
+    <public type="id" name="participant_live_indicator" id="0x7f0a0688" />
+    <public type="id" name="participant_mute_status_indicator" id="0x7f0a0689" />
+    <public type="id" name="participant_stream_paused" id="0x7f0a068a" />
+    <public type="id" name="participant_stream_preview_image" id="0x7f0a068b" />
+    <public type="id" name="participant_stream_preview_text" id="0x7f0a068c" />
+    <public type="id" name="participant_video_label" id="0x7f0a068d" />
+    <public type="id" name="participant_video_loading_indicator" id="0x7f0a068e" />
+    <public type="id" name="participant_video_stream_renderer" id="0x7f0a068f" />
+    <public type="id" name="participant_voice_indicators" id="0x7f0a0690" />
+    <public type="id" name="participant_voice_user_view" id="0x7f0a0691" />
+    <public type="id" name="password_toggle" id="0x7f0a0692" />
+    <public type="id" name="payment_method_edit" id="0x7f0a0693" />
+    <public type="id" name="payment_method_header" id="0x7f0a0694" />
+    <public type="id" name="payment_method_summary" id="0x7f0a0695" />
+    <public type="id" name="payment_methods_empty_add" id="0x7f0a0696" />
+    <public type="id" name="payment_methods_empty_image" id="0x7f0a0697" />
+    <public type="id" name="payment_methods_empty_subtext" id="0x7f0a0698" />
+    <public type="id" name="payment_methods_empty_title" id="0x7f0a0699" />
+    <public type="id" name="payment_methods_loading" id="0x7f0a069a" />
+    <public type="id" name="payment_methods_recycler" id="0x7f0a069b" />
+    <public type="id" name="payment_methods_retry" id="0x7f0a069c" />
+    <public type="id" name="payment_methods_view_flipper" id="0x7f0a069d" />
+    <public type="id" name="payment_source_edit_address1" id="0x7f0a069e" />
+    <public type="id" name="payment_source_edit_address2" id="0x7f0a069f" />
+    <public type="id" name="payment_source_edit_city" id="0x7f0a06a0" />
+    <public type="id" name="payment_source_edit_country" id="0x7f0a06a1" />
+    <public type="id" name="payment_source_edit_default" id="0x7f0a06a2" />
+    <public type="id" name="payment_source_edit_error" id="0x7f0a06a3" />
+    <public type="id" name="payment_source_edit_help" id="0x7f0a06a4" />
+    <public type="id" name="payment_source_edit_name" id="0x7f0a06a5" />
+    <public type="id" name="payment_source_edit_postal_code" id="0x7f0a06a6" />
+    <public type="id" name="payment_source_edit_state" id="0x7f0a06a7" />
+    <public type="id" name="payment_source_summary" id="0x7f0a06a8" />
+    <public type="id" name="payment_source_view_icon" id="0x7f0a06a9" />
+    <public type="id" name="payment_source_view_icon_wrapper" id="0x7f0a06aa" />
+    <public type="id" name="payment_source_view_invalid" id="0x7f0a06ab" />
+    <public type="id" name="payment_source_view_premium" id="0x7f0a06ac" />
+    <public type="id" name="payment_source_view_subtext" id="0x7f0a06ad" />
+    <public type="id" name="payment_source_view_title" id="0x7f0a06ae" />
+    <public type="id" name="peekHeight" id="0x7f0a06af" />
+    <public type="id" name="percent" id="0x7f0a06b0" />
+    <public type="id" name="perk_view_content_list_item" id="0x7f0a06b1" />
+    <public type="id" name="perks_level_contents_header" id="0x7f0a06b2" />
+    <public type="id" name="perks_level_contents_recycler" id="0x7f0a06b3" />
+    <public type="id" name="perks_level_header" id="0x7f0a06b4" />
+    <public type="id" name="perks_level_header_boosts" id="0x7f0a06b5" />
+    <public type="id" name="perks_level_header_boosts_container" id="0x7f0a06b6" />
+    <public type="id" name="perks_level_header_text" id="0x7f0a06b7" />
+    <public type="id" name="perks_level_header_unlocked" id="0x7f0a06b8" />
+    <public type="id" name="perm_req_text" id="0x7f0a06b9" />
+    <public type="id" name="permissions_req_btn" id="0x7f0a06ba" />
+    <public type="id" name="permissions_required_action_btn" id="0x7f0a06bb" />
+    <public type="id" name="permissions_required_text" id="0x7f0a06bc" />
+    <public type="id" name="permissions_view_stub" id="0x7f0a06bd" />
+    <public type="id" name="picture" id="0x7f0a06be" />
+    <public type="id" name="pin" id="0x7f0a06bf" />
+    <public type="id" name="plain" id="0x7f0a06c0" />
+    <public type="id" name="popup_attachment" id="0x7f0a06c1" />
+    <public type="id" name="popup_body" id="0x7f0a06c2" />
+    <public type="id" name="popup_close_btn" id="0x7f0a06c3" />
+    <public type="id" name="popup_countdown_progress" id="0x7f0a06c4" />
+    <public type="id" name="popup_icon" id="0x7f0a06c5" />
+    <public type="id" name="popup_subtitle" id="0x7f0a06c6" />
+    <public type="id" name="popup_title" id="0x7f0a06c7" />
+    <public type="id" name="premium_guild_confirmation_avatar" id="0x7f0a06c8" />
+    <public type="id" name="premium_guild_confirmation_guild_name" id="0x7f0a06c9" />
+    <public type="id" name="premium_guild_confirmation_level_info_previous" id="0x7f0a06ca" />
+    <public type="id" name="premium_guild_confirmation_level_info_upgrade" id="0x7f0a06cb" />
+    <public type="id" name="premium_guild_confirmation_upgrade_arrow" id="0x7f0a06cc" />
+    <public type="id" name="premium_guild_subscription_activated_body1" id="0x7f0a06cd" />
+    <public type="id" name="premium_guild_subscription_activated_body2" id="0x7f0a06ce" />
+    <public type="id" name="premium_guild_subscription_activated_lottie" id="0x7f0a06cf" />
+    <public type="id" name="premium_guild_subscription_activated_ok" id="0x7f0a06d0" />
+    <public type="id" name="premium_guild_subscription_cancel_body" id="0x7f0a06d1" />
+    <public type="id" name="premium_guild_subscription_cancel_confirm" id="0x7f0a06d2" />
+    <public type="id" name="premium_guild_subscription_cancel_error" id="0x7f0a06d3" />
+    <public type="id" name="premium_guild_subscription_cancel_flipper" id="0x7f0a06d4" />
+    <public type="id" name="premium_guild_subscription_cancel_header" id="0x7f0a06d5" />
+    <public type="id" name="premium_guild_subscription_cancel_nevermind" id="0x7f0a06d6" />
+    <public type="id" name="premium_guild_subscription_uncancel_body" id="0x7f0a06d7" />
+    <public type="id" name="premium_guild_subscription_uncancel_confirm" id="0x7f0a06d8" />
+    <public type="id" name="premium_guild_subscription_uncancel_error" id="0x7f0a06d9" />
+    <public type="id" name="premium_guild_subscription_uncancel_flipper" id="0x7f0a06da" />
+    <public type="id" name="premium_guild_subscription_uncancel_header" id="0x7f0a06db" />
+    <public type="id" name="premium_guild_subscription_uncancel_image" id="0x7f0a06dc" />
+    <public type="id" name="premium_guild_subscription_uncancel_nevermind" id="0x7f0a06dd" />
+    <public type="id" name="premium_guild_transfer_confirmation_blurb" id="0x7f0a06de" />
+    <public type="id" name="premium_guild_transfer_error" id="0x7f0a06df" />
+    <public type="id" name="premium_guild_transfer_previous_guild" id="0x7f0a06e0" />
+    <public type="id" name="premium_guild_transfer_previous_guild_header" id="0x7f0a06e1" />
+    <public type="id" name="premium_guild_transfer_select" id="0x7f0a06e2" />
+    <public type="id" name="premium_guild_transfer_target_guild" id="0x7f0a06e3" />
+    <public type="id" name="premium_guild_transfer_target_guild_header" id="0x7f0a06e4" />
+    <public type="id" name="premium_perks_upload_text" id="0x7f0a06e5" />
+    <public type="id" name="premium_settings_active_guild_subscription" id="0x7f0a06e6" />
+    <public type="id" name="premium_settings_active_subscription" id="0x7f0a06e7" />
+    <public type="id" name="premium_settings_billing_divider" id="0x7f0a06e8" />
+    <public type="id" name="premium_settings_billing_information" id="0x7f0a06e9" />
+    <public type="id" name="premium_settings_credit_container" id="0x7f0a06ea" />
+    <public type="id" name="premium_settings_grandfathered" id="0x7f0a06eb" />
+    <public type="id" name="premium_settings_legalese" id="0x7f0a06ec" />
+    <public type="id" name="premium_settings_nitro" id="0x7f0a06ed" />
+    <public type="id" name="premium_settings_nitro_classic" id="0x7f0a06ee" />
+    <public type="id" name="premium_settings_nitro_classic_boost_count" id="0x7f0a06ef" />
+    <public type="id" name="premium_settings_nitro_classic_boost_discount" id="0x7f0a06f0" />
+    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7f0a06f1" />
+    <public type="id" name="premium_settings_nitro_wumpus" id="0x7f0a06f2" />
+    <public type="id" name="premium_settings_payment_container" id="0x7f0a06f3" />
+    <public type="id" name="premium_settings_premium_classic_gift" id="0x7f0a06f4" />
+    <public type="id" name="premium_settings_premium_classic_monthly" id="0x7f0a06f5" />
+    <public type="id" name="premium_settings_premium_classic_yearly" id="0x7f0a06f6" />
+    <public type="id" name="premium_settings_premium_gift" id="0x7f0a06f7" />
+    <public type="id" name="premium_settings_premium_monthly" id="0x7f0a06f8" />
+    <public type="id" name="premium_settings_premium_yearly" id="0x7f0a06f9" />
+    <public type="id" name="premium_settings_renew_mutation_btn" id="0x7f0a06fa" />
+    <public type="id" name="premium_settings_renew_mutation_container" id="0x7f0a06fb" />
+    <public type="id" name="premium_settings_renew_mutation_tv" id="0x7f0a06fc" />
+    <public type="id" name="premium_settings_retry" id="0x7f0a06fd" />
+    <public type="id" name="premium_settings_scrollview" id="0x7f0a06fe" />
+    <public type="id" name="premium_settings_subscription_container" id="0x7f0a06ff" />
+    <public type="id" name="premium_settings_tier_1_container" id="0x7f0a0700" />
+    <public type="id" name="premium_settings_tier_2_container" id="0x7f0a0701" />
+    <public type="id" name="premium_settings_view_flipper" id="0x7f0a0702" />
+    <public type="id" name="premium_switch_cancel_btn" id="0x7f0a0703" />
+    <public type="id" name="premium_switch_flipper" id="0x7f0a0704" />
+    <public type="id" name="premium_switch_interval_header" id="0x7f0a0705" />
+    <public type="id" name="premium_switch_interval_info" id="0x7f0a0706" />
+    <public type="id" name="premium_switch_interval_logo" id="0x7f0a0707" />
+    <public type="id" name="premium_switch_interval_radio_group" id="0x7f0a0708" />
+    <public type="id" name="premium_switch_interval_radio_month" id="0x7f0a0709" />
+    <public type="id" name="premium_switch_interval_radio_year" id="0x7f0a070a" />
+    <public type="id" name="premium_switch_page_background" id="0x7f0a070b" />
+    <public type="id" name="premium_switch_page_info" id="0x7f0a070c" />
+    <public type="id" name="premium_switch_page_logo" id="0x7f0a070d" />
+    <public type="id" name="premium_switch_page_monthly_price" id="0x7f0a070e" />
+    <public type="id" name="premium_switch_page_wumpus" id="0x7f0a070f" />
+    <public type="id" name="premium_switch_pager" id="0x7f0a0710" />
+    <public type="id" name="premium_switch_pager_header" id="0x7f0a0711" />
+    <public type="id" name="premium_switch_pager_tabs" id="0x7f0a0712" />
+    <public type="id" name="premium_switch_retry" id="0x7f0a0713" />
+    <public type="id" name="premium_switch_select_btn" id="0x7f0a0714" />
+    <public type="id" name="premium_upsell_body" id="0x7f0a0715" />
+    <public type="id" name="premium_upsell_close" id="0x7f0a0716" />
+    <public type="id" name="premium_upsell_dots" id="0x7f0a0717" />
+    <public type="id" name="premium_upsell_header" id="0x7f0a0718" />
+    <public type="id" name="premium_upsell_img" id="0x7f0a0719" />
+    <public type="id" name="premium_upsell_learn_more" id="0x7f0a071a" />
+    <public type="id" name="premium_upsell_viewpager" id="0x7f0a071b" />
+    <public type="id" name="preset" id="0x7f0a071c" />
+    <public type="id" name="private_call_container" id="0x7f0a071d" />
+    <public type="id" name="private_call_controls_audio_output" id="0x7f0a071e" />
+    <public type="id" name="private_call_controls_audio_output_more" id="0x7f0a071f" />
+    <public type="id" name="private_call_controls_disconnect" id="0x7f0a0720" />
+    <public type="id" name="private_call_controls_mute" id="0x7f0a0721" />
+    <public type="id" name="private_call_controls_stop_watching" id="0x7f0a0722" />
+    <public type="id" name="private_call_controls_video" id="0x7f0a0723" />
+    <public type="id" name="private_call_status_primary" id="0x7f0a0724" />
+    <public type="id" name="private_call_status_secondary" id="0x7f0a0725" />
+    <public type="id" name="private_call_users_recycler" id="0x7f0a0726" />
+    <public type="id" name="private_channel_sidebar_actions_call" id="0x7f0a0727" />
+    <public type="id" name="private_channel_sidebar_actions_notifications" id="0x7f0a0728" />
+    <public type="id" name="private_channel_sidebar_actions_search" id="0x7f0a0729" />
+    <public type="id" name="private_channel_sidebar_actions_video" id="0x7f0a072a" />
+    <public type="id" name="progress_bar" id="0x7f0a072b" />
+    <public type="id" name="progress_cancel_centered" id="0x7f0a072c" />
+    <public type="id" name="progress_cancel_top" id="0x7f0a072d" />
+    <public type="id" name="progress_circular" id="0x7f0a072e" />
+    <public type="id" name="progress_file_image" id="0x7f0a072f" />
+    <public type="id" name="progress_gem_icon" id="0x7f0a0730" />
+    <public type="id" name="progress_horizontal" id="0x7f0a0731" />
+    <public type="id" name="progress_level_text" id="0x7f0a0732" />
+    <public type="id" name="progress_progress" id="0x7f0a0733" />
+    <public type="id" name="progress_subtext" id="0x7f0a0734" />
+    <public type="id" name="progress_text" id="0x7f0a0735" />
+    <public type="id" name="prune_user_cancel" id="0x7f0a0736" />
+    <public type="id" name="prune_user_header" id="0x7f0a0737" />
+    <public type="id" name="prune_user_prune" id="0x7f0a0738" />
+    <public type="id" name="prune_users_estimate_text" id="0x7f0a0739" />
+    <public type="id" name="prune_users_history_1_radio" id="0x7f0a073a" />
+    <public type="id" name="prune_users_history_2_radio" id="0x7f0a073b" />
+    <public type="id" name="prune_users_loading_progressbar" id="0x7f0a073c" />
+    <public type="id" name="qr_scanner" id="0x7f0a073d" />
+    <public type="id" name="qr_scanner_chip" id="0x7f0a073e" />
+    <public type="id" name="radio" id="0x7f0a073f" />
+    <public type="id" name="reaction_counter_text_1" id="0x7f0a0740" />
+    <public type="id" name="reaction_counter_text_2" id="0x7f0a0741" />
+    <public type="id" name="reaction_counter_text_switcher" id="0x7f0a0742" />
+    <public type="id" name="reaction_emoji_text" id="0x7f0a0743" />
+    <public type="id" name="reaction_quick_add" id="0x7f0a0744" />
+    <public type="id" name="recycler_view" id="0x7f0a0745" />
+    <public type="id" name="regular" id="0x7f0a0746" />
+    <public type="id" name="remote_auth_cancel_button" id="0x7f0a0747" />
+    <public type="id" name="remote_auth_finish_button" id="0x7f0a0748" />
+    <public type="id" name="remote_auth_login_button" id="0x7f0a0749" />
+    <public type="id" name="remote_auth_not_found_cancel_button" id="0x7f0a074a" />
+    <public type="id" name="remote_auth_temporary_switch" id="0x7f0a074b" />
+    <public type="id" name="remote_auth_view_flipper" id="0x7f0a074c" />
+    <public type="id" name="restart" id="0x7f0a074d" />
+    <public type="id" name="result_count" id="0x7f0a074e" />
+    <public type="id" name="results_rv" id="0x7f0a074f" />
+    <public type="id" name="reverse" id="0x7f0a0750" />
+    <public type="id" name="rfc822" id="0x7f0a0751" />
+    <public type="id" name="rich_presence_container" id="0x7f0a0752" />
+    <public type="id" name="rich_presence_container_data" id="0x7f0a0753" />
+    <public type="id" name="rich_presence_details" id="0x7f0a0754" />
+    <public type="id" name="rich_presence_header" id="0x7f0a0755" />
+    <public type="id" name="rich_presence_image_large" id="0x7f0a0756" />
+    <public type="id" name="rich_presence_image_small" id="0x7f0a0757" />
+    <public type="id" name="rich_presence_image_small_wrap" id="0x7f0a0758" />
+    <public type="id" name="rich_presence_music_duration" id="0x7f0a0759" />
+    <public type="id" name="rich_presence_music_elapsed" id="0x7f0a075a" />
+    <public type="id" name="rich_presence_music_progress_container" id="0x7f0a075b" />
+    <public type="id" name="rich_presence_primary_button" id="0x7f0a075c" />
+    <public type="id" name="rich_presence_secondary_button" id="0x7f0a075d" />
+    <public type="id" name="rich_presence_seekbar" id="0x7f0a075e" />
+    <public type="id" name="rich_presence_state" id="0x7f0a075f" />
+    <public type="id" name="rich_presence_time" id="0x7f0a0760" />
+    <public type="id" name="rich_presence_title" id="0x7f0a0761" />
+    <public type="id" name="right" id="0x7f0a0762" />
+    <public type="id" name="right_icon" id="0x7f0a0763" />
+    <public type="id" name="right_side" id="0x7f0a0764" />
+    <public type="id" name="role_item_checked_setting" id="0x7f0a0765" />
+    <public type="id" name="role_settings_add_reactions" id="0x7f0a0766" />
+    <public type="id" name="role_settings_administrator" id="0x7f0a0767" />
+    <public type="id" name="role_settings_attach_files" id="0x7f0a0768" />
+    <public type="id" name="role_settings_ban_members" id="0x7f0a0769" />
+    <public type="id" name="role_settings_change_nickname" id="0x7f0a076a" />
+    <public type="id" name="role_settings_color_disabled_overlay" id="0x7f0a076b" />
+    <public type="id" name="role_settings_color_selector_container" id="0x7f0a076c" />
+    <public type="id" name="role_settings_create_instant_invite" id="0x7f0a076d" />
+    <public type="id" name="role_settings_current_color_display" id="0x7f0a076e" />
+    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7f0a076f" />
+    <public type="id" name="role_settings_embed_links" id="0x7f0a0770" />
+    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7f0a0771" />
+    <public type="id" name="role_settings_kick_members" id="0x7f0a0772" />
+    <public type="id" name="role_settings_manage_channels" id="0x7f0a0773" />
+    <public type="id" name="role_settings_manage_emojis" id="0x7f0a0774" />
+    <public type="id" name="role_settings_manage_messages" id="0x7f0a0775" />
+    <public type="id" name="role_settings_manage_nicknames" id="0x7f0a0776" />
+    <public type="id" name="role_settings_manage_roles" id="0x7f0a0777" />
+    <public type="id" name="role_settings_manage_server" id="0x7f0a0778" />
+    <public type="id" name="role_settings_manage_webhooks" id="0x7f0a0779" />
+    <public type="id" name="role_settings_mention_everyone" id="0x7f0a077a" />
+    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7f0a077b" />
+    <public type="id" name="role_settings_overview_scroll" id="0x7f0a077c" />
+    <public type="id" name="role_settings_read_message_history" id="0x7f0a077d" />
+    <public type="id" name="role_settings_read_messages" id="0x7f0a077e" />
+    <public type="id" name="role_settings_send_messages" id="0x7f0a077f" />
+    <public type="id" name="role_settings_send_tts_messages" id="0x7f0a0780" />
+    <public type="id" name="role_settings_use_external_emojis" id="0x7f0a0781" />
+    <public type="id" name="role_settings_view_audit_log" id="0x7f0a0782" />
+    <public type="id" name="role_settings_voice_connect" id="0x7f0a0783" />
+    <public type="id" name="role_settings_voice_deafen_members" id="0x7f0a0784" />
+    <public type="id" name="role_settings_voice_move_members" id="0x7f0a0785" />
+    <public type="id" name="role_settings_voice_mute_members" id="0x7f0a0786" />
+    <public type="id" name="role_settings_voice_speak" id="0x7f0a0787" />
+    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7f0a0788" />
+    <public type="id" name="role_spinner_item_textview" id="0x7f0a0789" />
+    <public type="id" name="roles_list_add_role_fab" id="0x7f0a078a" />
+    <public type="id" name="rotate_scroll_wheel" id="0x7f0a078b" />
+    <public type="id" name="rounded" id="0x7f0a078c" />
+    <public type="id" name="row" id="0x7f0a078d" />
+    <public type="id" name="row_index_key" id="0x7f0a078e" />
+    <public type="id" name="row_reverse" id="0x7f0a078f" />
+    <public type="id" name="save_non_transition_alpha" id="0x7f0a0790" />
+    <public type="id" name="save_overlay_view" id="0x7f0a0791" />
+    <public type="id" name="scale" id="0x7f0a0792" />
+    <public type="id" name="scale_scroll_wheel" id="0x7f0a0793" />
+    <public type="id" name="screen" id="0x7f0a0794" />
+    <public type="id" name="screen_title_subtitle" id="0x7f0a0795" />
+    <public type="id" name="screen_title_title" id="0x7f0a0796" />
+    <public type="id" name="scroll" id="0x7f0a0797" />
+    <public type="id" name="scrollIndicatorDown" id="0x7f0a0798" />
+    <public type="id" name="scrollIndicatorUp" id="0x7f0a0799" />
+    <public type="id" name="scrollView" id="0x7f0a079a" />
+    <public type="id" name="scroll_view" id="0x7f0a079b" />
+    <public type="id" name="scrollable" id="0x7f0a079c" />
+    <public type="id" name="search_badge" id="0x7f0a079d" />
+    <public type="id" name="search_bar" id="0x7f0a079e" />
+    <public type="id" name="search_button" id="0x7f0a079f" />
+    <public type="id" name="search_close_btn" id="0x7f0a07a0" />
+    <public type="id" name="search_edit_frame" id="0x7f0a07a1" />
+    <public type="id" name="search_flipper" id="0x7f0a07a2" />
+    <public type="id" name="search_go_btn" id="0x7f0a07a3" />
+    <public type="id" name="search_mag_icon" id="0x7f0a07a4" />
+    <public type="id" name="search_plate" id="0x7f0a07a5" />
+    <public type="id" name="search_results_list" id="0x7f0a07a6" />
+    <public type="id" name="search_send_query_fab" id="0x7f0a07a7" />
+    <public type="id" name="search_src_text" id="0x7f0a07a8" />
+    <public type="id" name="search_suggestion_item_channel_container" id="0x7f0a07a9" />
+    <public type="id" name="search_suggestion_item_has_container" id="0x7f0a07aa" />
+    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7f0a07ab" />
+    <public type="id" name="search_suggestion_item_user_container" id="0x7f0a07ac" />
+    <public type="id" name="search_suggestions_item_channel_icon" id="0x7f0a07ad" />
+    <public type="id" name="search_suggestions_item_channel_text" id="0x7f0a07ae" />
+    <public type="id" name="search_suggestions_item_has_icon" id="0x7f0a07af" />
+    <public type="id" name="search_suggestions_item_has_text" id="0x7f0a07b0" />
+    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7f0a07b1" />
+    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7f0a07b2" />
+    <public type="id" name="search_suggestions_recycler" id="0x7f0a07b3" />
+    <public type="id" name="search_voice_btn" id="0x7f0a07b4" />
+    <public type="id" name="seekbar" id="0x7f0a07b5" />
+    <public type="id" name="seekbar_value" id="0x7f0a07b6" />
+    <public type="id" name="select_dialog_listview" id="0x7f0a07b7" />
+    <public type="id" name="selected" id="0x7f0a07b8" />
+    <public type="id" name="selection_indicator" id="0x7f0a07b9" />
+    <public type="id" name="server_notifications_everyone_switch" id="0x7f0a07ba" />
+    <public type="id" name="server_notifications_frequency_0_radio" id="0x7f0a07bb" />
+    <public type="id" name="server_notifications_frequency_1_radio" id="0x7f0a07bc" />
+    <public type="id" name="server_notifications_frequency_2_radio" id="0x7f0a07bd" />
+    <public type="id" name="server_notifications_frequency_divider" id="0x7f0a07be" />
+    <public type="id" name="server_notifications_frequency_wrap" id="0x7f0a07bf" />
+    <public type="id" name="server_notifications_mute_settings_view" id="0x7f0a07c0" />
+    <public type="id" name="server_notifications_push_switch" id="0x7f0a07c1" />
+    <public type="id" name="server_notifications_roles_switch" id="0x7f0a07c2" />
+    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7f0a07c3" />
+    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7f0a07c4" />
+    <public type="id" name="server_settings_audit_logs_recycler" id="0x7f0a07c5" />
+    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7f0a07c6" />
+    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7f0a07c7" />
+    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7f0a07c8" />
+    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7f0a07c9" />
+    <public type="id" name="server_settings_bans_option" id="0x7f0a07ca" />
+    <public type="id" name="server_settings_bans_recycler" id="0x7f0a07cb" />
+    <public type="id" name="server_settings_bans_search" id="0x7f0a07cc" />
+    <public type="id" name="server_settings_bans_view_flipper" id="0x7f0a07cd" />
+    <public type="id" name="server_settings_channels_create_channel" id="0x7f0a07ce" />
+    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7f0a07cf" />
+    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7f0a07d0" />
+    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7f0a07d1" />
+    <public type="id" name="server_settings_channels_text_recycler" id="0x7f0a07d2" />
+    <public type="id" name="server_settings_community_locale" id="0x7f0a07d3" />
+    <public type="id" name="server_settings_community_overview_option" id="0x7f0a07d4" />
+    <public type="id" name="server_settings_community_overview_scroll" id="0x7f0a07d5" />
+    <public type="id" name="server_settings_community_rules_channel" id="0x7f0a07d6" />
+    <public type="id" name="server_settings_community_setting_selector_description" id="0x7f0a07d7" />
+    <public type="id" name="server_settings_community_setting_selector_subtitle" id="0x7f0a07d8" />
+    <public type="id" name="server_settings_community_setting_selector_title" id="0x7f0a07d9" />
+    <public type="id" name="server_settings_community_updates_channel" id="0x7f0a07da" />
+    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7f0a07db" />
+    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7f0a07dc" />
+    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7f0a07dd" />
+    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7f0a07de" />
+    <public type="id" name="server_settings_delete_server_cancel" id="0x7f0a07df" />
+    <public type="id" name="server_settings_delete_server_confirm" id="0x7f0a07e0" />
+    <public type="id" name="server_settings_delete_server_header" id="0x7f0a07e1" />
+    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7f0a07e2" />
+    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7f0a07e3" />
+    <public type="id" name="server_settings_delete_server_text" id="0x7f0a07e4" />
+    <public type="id" name="server_settings_emojis_avatar" id="0x7f0a07e5" />
+    <public type="id" name="server_settings_emojis_container" id="0x7f0a07e6" />
+    <public type="id" name="server_settings_emojis_edit_alias" id="0x7f0a07e7" />
+    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7f0a07e8" />
+    <public type="id" name="server_settings_emojis_name" id="0x7f0a07e9" />
+    <public type="id" name="server_settings_emojis_option" id="0x7f0a07ea" />
+    <public type="id" name="server_settings_emojis_overflow" id="0x7f0a07eb" />
+    <public type="id" name="server_settings_emojis_username" id="0x7f0a07ec" />
+    <public type="id" name="server_settings_emojis_username_avatar" id="0x7f0a07ed" />
+    <public type="id" name="server_settings_help_item" id="0x7f0a07ee" />
+    <public type="id" name="server_settings_instant_invites_option" id="0x7f0a07ef" />
+    <public type="id" name="server_settings_instant_invites_recycler" id="0x7f0a07f0" />
+    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7f0a07f1" />
+    <public type="id" name="server_settings_members_header_container" id="0x7f0a07f2" />
+    <public type="id" name="server_settings_members_name_search" id="0x7f0a07f3" />
+    <public type="id" name="server_settings_members_option" id="0x7f0a07f4" />
+    <public type="id" name="server_settings_members_recycler" id="0x7f0a07f5" />
+    <public type="id" name="server_settings_members_roles_spinner" id="0x7f0a07f6" />
+    <public type="id" name="server_settings_members_view_flipper" id="0x7f0a07f7" />
+    <public type="id" name="server_settings_moderation_explicit_1" id="0x7f0a07f8" />
+    <public type="id" name="server_settings_moderation_explicit_2" id="0x7f0a07f9" />
+    <public type="id" name="server_settings_moderation_explicit_3" id="0x7f0a07fa" />
+    <public type="id" name="server_settings_moderation_verification_1" id="0x7f0a07fb" />
+    <public type="id" name="server_settings_moderation_verification_2" id="0x7f0a07fc" />
+    <public type="id" name="server_settings_moderation_verification_3" id="0x7f0a07fd" />
+    <public type="id" name="server_settings_moderation_verification_4" id="0x7f0a07fe" />
+    <public type="id" name="server_settings_moderation_verification_5" id="0x7f0a07ff" />
+    <public type="id" name="server_settings_option_audit_log" id="0x7f0a0800" />
+    <public type="id" name="server_settings_option_channels" id="0x7f0a0801" />
+    <public type="id" name="server_settings_option_integrations" id="0x7f0a0802" />
+    <public type="id" name="server_settings_option_moderation" id="0x7f0a0803" />
+    <public type="id" name="server_settings_option_overview" id="0x7f0a0804" />
+    <public type="id" name="server_settings_option_security" id="0x7f0a0805" />
+    <public type="id" name="server_settings_option_vanity_url" id="0x7f0a0806" />
+    <public type="id" name="server_settings_overview_afk_channel" id="0x7f0a0807" />
+    <public type="id" name="server_settings_overview_afk_channel_wrap" id="0x7f0a0808" />
+    <public type="id" name="server_settings_overview_afk_timeout" id="0x7f0a0809" />
+    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7f0a080a" />
+    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7f0a080b" />
+    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7f0a080c" />
+    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7f0a080d" />
+    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7f0a080e" />
+    <public type="id" name="server_settings_overview_afk_timeout_wrap" id="0x7f0a080f" />
+    <public type="id" name="server_settings_overview_icon" id="0x7f0a0810" />
+    <public type="id" name="server_settings_overview_icon_label" id="0x7f0a0811" />
+    <public type="id" name="server_settings_overview_icon_name_container" id="0x7f0a0812" />
+    <public type="id" name="server_settings_overview_icon_remove" id="0x7f0a0813" />
+    <public type="id" name="server_settings_overview_icon_text" id="0x7f0a0814" />
+    <public type="id" name="server_settings_overview_name" id="0x7f0a0815" />
+    <public type="id" name="server_settings_overview_notification_all" id="0x7f0a0816" />
+    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7f0a0817" />
+    <public type="id" name="server_settings_overview_region" id="0x7f0a0818" />
+    <public type="id" name="server_settings_overview_region_flag" id="0x7f0a0819" />
+    <public type="id" name="server_settings_overview_region_item_name" id="0x7f0a081a" />
+    <public type="id" name="server_settings_overview_region_list" id="0x7f0a081b" />
+    <public type="id" name="server_settings_overview_region_wrap" id="0x7f0a081c" />
+    <public type="id" name="server_settings_overview_save" id="0x7f0a081d" />
+    <public type="id" name="server_settings_overview_scroll" id="0x7f0a081e" />
+    <public type="id" name="server_settings_overview_system_channel" id="0x7f0a081f" />
+    <public type="id" name="server_settings_overview_system_channel_boost" id="0x7f0a0820" />
+    <public type="id" name="server_settings_overview_system_channel_join" id="0x7f0a0821" />
+    <public type="id" name="server_settings_overview_system_channel_wrap" id="0x7f0a0822" />
+    <public type="id" name="server_settings_overview_upload_banner" id="0x7f0a0823" />
+    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7f0a0824" />
+    <public type="id" name="server_settings_overview_upload_banner_fab" id="0x7f0a0825" />
+    <public type="id" name="server_settings_overview_upload_banner_learn_more" id="0x7f0a0826" />
+    <public type="id" name="server_settings_overview_upload_banner_nitro_tier" id="0x7f0a0827" />
+    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7f0a0828" />
+    <public type="id" name="server_settings_overview_upload_banner_unlock" id="0x7f0a0829" />
+    <public type="id" name="server_settings_overview_upload_splash" id="0x7f0a082a" />
+    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7f0a082b" />
+    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7f0a082c" />
+    <public type="id" name="server_settings_overview_upload_splash_learn_more" id="0x7f0a082d" />
+    <public type="id" name="server_settings_overview_upload_splash_nitro_tier" id="0x7f0a082e" />
+    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7f0a082f" />
+    <public type="id" name="server_settings_overview_upload_splash_unlock" id="0x7f0a0830" />
+    <public type="id" name="server_settings_public_setting_selector" id="0x7f0a0831" />
+    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7f0a0832" />
+    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7f0a0833" />
+    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7f0a0834" />
+    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7f0a0835" />
+    <public type="id" name="server_settings_role_item_name" id="0x7f0a0836" />
+    <public type="id" name="server_settings_roles_option" id="0x7f0a0837" />
+    <public type="id" name="server_settings_roles_recycler" id="0x7f0a0838" />
+    <public type="id" name="server_settings_section_community" id="0x7f0a0839" />
+    <public type="id" name="server_settings_section_community_divider" id="0x7f0a083a" />
+    <public type="id" name="server_settings_section_general_settings" id="0x7f0a083b" />
+    <public type="id" name="server_settings_section_user_management" id="0x7f0a083c" />
+    <public type="id" name="server_settings_section_user_management_divider" id="0x7f0a083d" />
+    <public type="id" name="server_settings_security_dialog_cancel" id="0x7f0a083e" />
+    <public type="id" name="server_settings_security_dialog_confirm" id="0x7f0a083f" />
+    <public type="id" name="server_settings_security_label" id="0x7f0a0840" />
+    <public type="id" name="server_settings_security_server_mfa_code" id="0x7f0a0841" />
+    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7f0a0842" />
+    <public type="id" name="server_settings_server_icon" id="0x7f0a0843" />
+    <public type="id" name="server_settings_server_icon_text" id="0x7f0a0844" />
+    <public type="id" name="server_settings_server_name" id="0x7f0a0845" />
+    <public type="id" name="server_settings_vanity_input" id="0x7f0a0846" />
+    <public type="id" name="server_settings_vanity_url_current_url" id="0x7f0a0847" />
+    <public type="id" name="server_settings_vanity_url_error_text" id="0x7f0a0848" />
+    <public type="id" name="server_settings_vanity_url_input_container" id="0x7f0a0849" />
+    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7f0a084a" />
+    <public type="id" name="server_settings_vanity_url_prefix" id="0x7f0a084b" />
+    <public type="id" name="server_settings_vanity_url_remove" id="0x7f0a084c" />
+    <public type="id" name="server_settings_vanity_url_save" id="0x7f0a084d" />
+    <public type="id" name="set_custom_status_emoji" id="0x7f0a084e" />
+    <public type="id" name="set_custom_status_emoji_button" id="0x7f0a084f" />
+    <public type="id" name="set_custom_status_expiration" id="0x7f0a0850" />
+    <public type="id" name="set_custom_status_expiration_1_hour" id="0x7f0a0851" />
+    <public type="id" name="set_custom_status_expiration_30_minutes" id="0x7f0a0852" />
+    <public type="id" name="set_custom_status_expiration_4_hours" id="0x7f0a0853" />
+    <public type="id" name="set_custom_status_expiration_never" id="0x7f0a0854" />
+    <public type="id" name="set_custom_status_expiration_tomorrow" id="0x7f0a0855" />
+    <public type="id" name="set_custom_status_save" id="0x7f0a0856" />
+    <public type="id" name="set_custom_status_text" id="0x7f0a0857" />
+    <public type="id" name="setting_button" id="0x7f0a0858" />
+    <public type="id" name="setting_container" id="0x7f0a0859" />
+    <public type="id" name="setting_disabled_overlay" id="0x7f0a085a" />
+    <public type="id" name="setting_label" id="0x7f0a085b" />
+    <public type="id" name="setting_subtext" id="0x7f0a085c" />
+    <public type="id" name="settings_account" id="0x7f0a085d" />
+    <public type="id" name="settings_account_avatar" id="0x7f0a085e" />
+    <public type="id" name="settings_account_avatar_container" id="0x7f0a085f" />
+    <public type="id" name="settings_account_avatar_edit" id="0x7f0a0860" />
+    <public type="id" name="settings_account_avatar_wrap" id="0x7f0a0861" />
+    <public type="id" name="settings_account_change_password" id="0x7f0a0862" />
+    <public type="id" name="settings_account_edit" id="0x7f0a0863" />
+    <public type="id" name="settings_account_email" id="0x7f0a0864" />
+    <public type="id" name="settings_account_mfa_container" id="0x7f0a0865" />
+    <public type="id" name="settings_account_mfa_disabled_container" id="0x7f0a0866" />
+    <public type="id" name="settings_account_mfa_enable" id="0x7f0a0867" />
+    <public type="id" name="settings_account_mfa_enabled_container" id="0x7f0a0868" />
+    <public type="id" name="settings_account_mfa_enabled_header" id="0x7f0a0869" />
+    <public type="id" name="settings_account_mfa_flipper" id="0x7f0a086a" />
+    <public type="id" name="settings_account_mfa_lottie" id="0x7f0a086b" />
+    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7f0a086c" />
+    <public type="id" name="settings_account_private_data_delete" id="0x7f0a086d" />
+    <public type="id" name="settings_account_private_data_disable" id="0x7f0a086e" />
+    <public type="id" name="settings_account_private_data_wrap" id="0x7f0a086f" />
+    <public type="id" name="settings_account_remove_avatar" id="0x7f0a0870" />
+    <public type="id" name="settings_account_remove_two_fa" id="0x7f0a0871" />
+    <public type="id" name="settings_account_save" id="0x7f0a0872" />
+    <public type="id" name="settings_account_scroll" id="0x7f0a0873" />
+    <public type="id" name="settings_account_sms_backup" id="0x7f0a0874" />
+    <public type="id" name="settings_account_sms_phone" id="0x7f0a0875" />
+    <public type="id" name="settings_account_tag" id="0x7f0a0876" />
+    <public type="id" name="settings_account_verification" id="0x7f0a0877" />
+    <public type="id" name="settings_account_verification_resend" id="0x7f0a0878" />
+    <public type="id" name="settings_account_view_backup_codes" id="0x7f0a0879" />
+    <public type="id" name="settings_acknowledgements" id="0x7f0a087a" />
+    <public type="id" name="settings_app_info" id="0x7f0a087b" />
+    <public type="id" name="settings_app_settings_header" id="0x7f0a087c" />
+    <public type="id" name="settings_appearance" id="0x7f0a087d" />
+    <public type="id" name="settings_appearance_font_scale_platform" id="0x7f0a087e" />
+    <public type="id" name="settings_appearance_font_scaling_container" id="0x7f0a087f" />
+    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7f0a0880" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7f0a0881" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7f0a0882" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7f0a0883" />
+    <public type="id" name="settings_appearance_holy_light" id="0x7f0a0884" />
+    <public type="id" name="settings_appearance_sync_switch" id="0x7f0a0885" />
+    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7f0a0886" />
+    <public type="id" name="settings_appearance_theme_light_radio" id="0x7f0a0887" />
+    <public type="id" name="settings_appearance_theme_pure_evil_switch" id="0x7f0a0888" />
+    <public type="id" name="settings_authorized_apps" id="0x7f0a0889" />
+    <public type="id" name="settings_backup_codes_generate" id="0x7f0a088a" />
+    <public type="id" name="settings_backup_codes_info" id="0x7f0a088b" />
+    <public type="id" name="settings_backup_codes_rv" id="0x7f0a088c" />
+    <public type="id" name="settings_behavior" id="0x7f0a088d" />
+    <public type="id" name="settings_behavior_browser_switch" id="0x7f0a088e" />
+    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7f0a088f" />
+    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7f0a0890" />
+    <public type="id" name="settings_billing" id="0x7f0a0891" />
+    <public type="id" name="settings_billing_view_pager" id="0x7f0a0892" />
+    <public type="id" name="settings_bitrate_help" id="0x7f0a0893" />
+    <public type="id" name="settings_blocked_users" id="0x7f0a0894" />
+    <public type="id" name="settings_boost_flipper" id="0x7f0a0895" />
+    <public type="id" name="settings_boost_marketing_view" id="0x7f0a0896" />
+    <public type="id" name="settings_boost_no_guilds_image" id="0x7f0a0897" />
+    <public type="id" name="settings_boost_no_guilds_subtitle" id="0x7f0a0898" />
+    <public type="id" name="settings_boost_no_guilds_title" id="0x7f0a0899" />
+    <public type="id" name="settings_boost_recycler" id="0x7f0a089a" />
+    <public type="id" name="settings_boost_retry" id="0x7f0a089b" />
+    <public type="id" name="settings_boost_sample_guilds" id="0x7f0a089c" />
+    <public type="id" name="settings_boost_subtext" id="0x7f0a089d" />
+    <public type="id" name="settings_boost_subtext_container" id="0x7f0a089e" />
+    <public type="id" name="settings_boost_upsell_view" id="0x7f0a089f" />
+    <public type="id" name="settings_changelog" id="0x7f0a08a0" />
+    <public type="id" name="settings_channel_list_category_item_drag" id="0x7f0a08a1" />
+    <public type="id" name="settings_channel_list_category_item_text" id="0x7f0a08a2" />
+    <public type="id" name="settings_channel_list_item_drag" id="0x7f0a08a3" />
+    <public type="id" name="settings_channel_list_item_hash" id="0x7f0a08a4" />
+    <public type="id" name="settings_channel_list_item_name" id="0x7f0a08a5" />
+    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7f0a08a6" />
+    <public type="id" name="settings_connections" id="0x7f0a08a7" />
+    <public type="id" name="settings_developer_options" id="0x7f0a08a8" />
+    <public type="id" name="settings_developer_options_divider" id="0x7f0a08a9" />
+    <public type="id" name="settings_developer_options_header" id="0x7f0a08aa" />
+    <public type="id" name="settings_game_activity" id="0x7f0a08ab" />
+    <public type="id" name="settings_games_detection_section" id="0x7f0a08ac" />
+    <public type="id" name="settings_games_playing_container" id="0x7f0a08ad" />
+    <public type="id" name="settings_games_playing_icon" id="0x7f0a08ae" />
+    <public type="id" name="settings_games_playing_subtitle" id="0x7f0a08af" />
+    <public type="id" name="settings_games_playing_title" id="0x7f0a08b0" />
+    <public type="id" name="settings_games_status_cs" id="0x7f0a08b1" />
+    <public type="id" name="settings_games_track_cs" id="0x7f0a08b2" />
+    <public type="id" name="settings_gifting_flipper" id="0x7f0a08b3" />
+    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7f0a08b4" />
+    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7f0a08b5" />
+    <public type="id" name="settings_gifting_nitro_classic_learn_more" id="0x7f0a08b6" />
+    <public type="id" name="settings_gifting_nitro_classic_monthly" id="0x7f0a08b7" />
+    <public type="id" name="settings_gifting_nitro_classic_yearly" id="0x7f0a08b8" />
+    <public type="id" name="settings_gifting_nitro_learn_more" id="0x7f0a08b9" />
+    <public type="id" name="settings_gifting_nitro_monthly" id="0x7f0a08ba" />
+    <public type="id" name="settings_gifting_nitro_yearly" id="0x7f0a08bb" />
+    <public type="id" name="settings_gifting_retry" id="0x7f0a08bc" />
+    <public type="id" name="settings_giftting_inventory_recycler" id="0x7f0a08bd" />
+    <public type="id" name="settings_group_icon" id="0x7f0a08be" />
+    <public type="id" name="settings_group_icon_label" id="0x7f0a08bf" />
+    <public type="id" name="settings_group_icon_remove" id="0x7f0a08c0" />
+    <public type="id" name="settings_inapp_notifs_switch" id="0x7f0a08c1" />
+    <public type="id" name="settings_language" id="0x7f0a08c2" />
+    <public type="id" name="settings_language_current" id="0x7f0a08c3" />
+    <public type="id" name="settings_language_current_flag" id="0x7f0a08c4" />
+    <public type="id" name="settings_language_current_text" id="0x7f0a08c5" />
+    <public type="id" name="settings_language_select_item_name" id="0x7f0a08c6" />
+    <public type="id" name="settings_language_select_item_name_localized" id="0x7f0a08c7" />
+    <public type="id" name="settings_language_select_list" id="0x7f0a08c8" />
+    <public type="id" name="settings_language_sync_check" id="0x7f0a08c9" />
+    <public type="id" name="settings_nitro" id="0x7f0a08ca" />
+    <public type="id" name="settings_nitro_boosting" id="0x7f0a08cb" />
+    <public type="id" name="settings_nitro_gifting" id="0x7f0a08cc" />
+    <public type="id" name="settings_nitro_header" id="0x7f0a08cd" />
+    <public type="id" name="settings_nitro_settings" id="0x7f0a08ce" />
+    <public type="id" name="settings_notification_os" id="0x7f0a08cf" />
+    <public type="id" name="settings_notification_os_label" id="0x7f0a08d0" />
+    <public type="id" name="settings_notification_switch" id="0x7f0a08d1" />
+    <public type="id" name="settings_notifications" id="0x7f0a08d2" />
+    <public type="id" name="settings_notifications_blink" id="0x7f0a08d3" />
+    <public type="id" name="settings_notifications_enabled" id="0x7f0a08d4" />
+    <public type="id" name="settings_notifications_mute_all" id="0x7f0a08d5" />
+    <public type="id" name="settings_notifications_vibrations" id="0x7f0a08d6" />
+    <public type="id" name="settings_notifications_wrap" id="0x7f0a08d7" />
+    <public type="id" name="settings_presence_text" id="0x7f0a08d8" />
+    <public type="id" name="settings_privacy" id="0x7f0a08d9" />
+    <public type="id" name="settings_privacy_basic_service" id="0x7f0a08da" />
+    <public type="id" name="settings_privacy_controls" id="0x7f0a08db" />
+    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7f0a08dc" />
+    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7f0a08dd" />
+    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7f0a08de" />
+    <public type="id" name="settings_privacy_explicit_0" id="0x7f0a08df" />
+    <public type="id" name="settings_privacy_explicit_1" id="0x7f0a08e0" />
+    <public type="id" name="settings_privacy_explicit_2" id="0x7f0a08e1" />
+    <public type="id" name="settings_privacy_friend_source_0" id="0x7f0a08e2" />
+    <public type="id" name="settings_privacy_friend_source_1" id="0x7f0a08e3" />
+    <public type="id" name="settings_privacy_friend_source_2" id="0x7f0a08e4" />
+    <public type="id" name="settings_privacy_personalization" id="0x7f0a08e5" />
+    <public type="id" name="settings_privacy_request_data" id="0x7f0a08e6" />
+    <public type="id" name="settings_privacy_request_data_link" id="0x7f0a08e7" />
+    <public type="id" name="settings_privacy_screenreader_detection" id="0x7f0a08e8" />
+    <public type="id" name="settings_privacy_statistics" id="0x7f0a08e9" />
+    <public type="id" name="settings_qr_scanner" id="0x7f0a08ea" />
+    <public type="id" name="settings_set_status_container" id="0x7f0a08eb" />
+    <public type="id" name="settings_status_view" id="0x7f0a08ec" />
+    <public type="id" name="settings_support" id="0x7f0a08ed" />
+    <public type="id" name="settings_text_images" id="0x7f0a08ee" />
+    <public type="id" name="settings_text_images_allow_animate_emoji_switch" id="0x7f0a08ef" />
+    <public type="id" name="settings_text_images_attachments_toggle" id="0x7f0a08f0" />
+    <public type="id" name="settings_text_images_embeds_toggle" id="0x7f0a08f1" />
+    <public type="id" name="settings_text_images_links_toggle" id="0x7f0a08f2" />
+    <public type="id" name="settings_text_images_sync_toggle" id="0x7f0a08f3" />
+    <public type="id" name="settings_upload_debug_logs" id="0x7f0a08f4" />
+    <public type="id" name="settings_user_limit_help" id="0x7f0a08f5" />
+    <public type="id" name="settings_user_settings_header" id="0x7f0a08f6" />
+    <public type="id" name="settings_voice" id="0x7f0a08f7" />
+    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7f0a08f8" />
+    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7f0a08f9" />
+    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7f0a08fa" />
+    <public type="id" name="settings_voice_gain_control_toggle" id="0x7f0a08fb" />
+    <public type="id" name="settings_voice_input_mode_ptt" id="0x7f0a08fc" />
+    <public type="id" name="settings_voice_input_mode_vad" id="0x7f0a08fd" />
+    <public type="id" name="settings_voice_krisp_info" id="0x7f0a08fe" />
+    <public type="id" name="settings_voice_mode" id="0x7f0a08ff" />
+    <public type="id" name="settings_voice_mode_header" id="0x7f0a0900" />
+    <public type="id" name="settings_voice_mode_value" id="0x7f0a0901" />
+    <public type="id" name="settings_voice_noise_cancellation_toggle" id="0x7f0a0902" />
+    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7f0a0903" />
+    <public type="id" name="settings_voice_opensles_default" id="0x7f0a0904" />
+    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7f0a0905" />
+    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7f0a0906" />
+    <public type="id" name="settings_voice_output_volume" id="0x7f0a0907" />
+    <public type="id" name="settings_voice_output_volume_wrap" id="0x7f0a0908" />
+    <public type="id" name="settings_voice_overlay_toggle" id="0x7f0a0909" />
+    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7f0a090a" />
+    <public type="id" name="settings_voice_sensitivity_header" id="0x7f0a090b" />
+    <public type="id" name="settings_voice_sensitivity_label" id="0x7f0a090c" />
+    <public type="id" name="settings_voice_sensitivity_manual" id="0x7f0a090d" />
+    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7f0a090e" />
+    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7f0a090f" />
+    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7f0a0910" />
+    <public type="id" name="settings_voice_video_container" id="0x7f0a0911" />
+    <public type="id" name="settings_voice_video_troubleshooting_guide" id="0x7f0a0912" />
+    <public type="id" name="shades_divider" id="0x7f0a0913" />
+    <public type="id" name="shades_layout" id="0x7f0a0914" />
+    <public type="id" name="shortcut" id="0x7f0a0915" />
+    <public type="id" name="showCustom" id="0x7f0a0916" />
+    <public type="id" name="showHome" id="0x7f0a0917" />
+    <public type="id" name="showTitle" id="0x7f0a0918" />
+    <public type="id" name="skipCollapsed" id="0x7f0a0919" />
+    <public type="id" name="slide" id="0x7f0a091a" />
+    <public type="id" name="smallLabel" id="0x7f0a091b" />
+    <public type="id" name="snackbar_action" id="0x7f0a091c" />
+    <public type="id" name="snackbar_text" id="0x7f0a091d" />
+    <public type="id" name="snap" id="0x7f0a091e" />
+    <public type="id" name="snapMargins" id="0x7f0a091f" />
+    <public type="id" name="software" id="0x7f0a0920" />
+    <public type="id" name="space_around" id="0x7f0a0921" />
+    <public type="id" name="space_between" id="0x7f0a0922" />
+    <public type="id" name="space_evenly" id="0x7f0a0923" />
+    <public type="id" name="spacer" id="0x7f0a0924" />
+    <public type="id" name="sparkle_view_image" id="0x7f0a0925" />
+    <public type="id" name="spherical_gl_surface_view" id="0x7f0a0926" />
+    <public type="id" name="spinner" id="0x7f0a0927" />
+    <public type="id" name="split_action_bar" id="0x7f0a0928" />
+    <public type="id" name="spread" id="0x7f0a0929" />
+    <public type="id" name="spread_inside" id="0x7f0a092a" />
+    <public type="id" name="square" id="0x7f0a092b" />
+    <public type="id" name="src_atop" id="0x7f0a092c" />
+    <public type="id" name="src_in" id="0x7f0a092d" />
+    <public type="id" name="src_over" id="0x7f0a092e" />
+    <public type="id" name="src_toggle" id="0x7f0a092f" />
+    <public type="id" name="standard" id="0x7f0a0930" />
+    <public type="id" name="start" id="0x7f0a0931" />
+    <public type="id" name="start_call_sheet_video_item" id="0x7f0a0932" />
+    <public type="id" name="start_call_sheet_voice_item" id="0x7f0a0933" />
+    <public type="id" name="state_aspect_ratio" id="0x7f0a0934" />
+    <public type="id" name="state_rotate" id="0x7f0a0935" />
+    <public type="id" name="state_scale" id="0x7f0a0936" />
+    <public type="id" name="status_bar_latest_event_content" id="0x7f0a0937" />
+    <public type="id" name="status_connectivity" id="0x7f0a0938" />
+    <public type="id" name="status_connectivity_icon" id="0x7f0a0939" />
+    <public type="id" name="status_connectivity_limited" id="0x7f0a093a" />
+    <public type="id" name="status_connectivity_spinner" id="0x7f0a093b" />
+    <public type="id" name="status_connectivity_text" id="0x7f0a093c" />
+    <public type="id" name="status_unread_messages" id="0x7f0a093d" />
+    <public type="id" name="status_unread_messages_mark" id="0x7f0a093e" />
+    <public type="id" name="status_unread_messages_text" id="0x7f0a093f" />
+    <public type="id" name="status_wrap" id="0x7f0a0940" />
+    <public type="id" name="steps_button_container" id="0x7f0a0941" />
+    <public type="id" name="steps_cancel" id="0x7f0a0942" />
+    <public type="id" name="steps_close" id="0x7f0a0943" />
+    <public type="id" name="steps_done" id="0x7f0a0944" />
+    <public type="id" name="steps_next" id="0x7f0a0945" />
+    <public type="id" name="steps_viewpager" id="0x7f0a0946" />
+    <public type="id" name="stereo" id="0x7f0a0947" />
+    <public type="id" name="stream_preview" id="0x7f0a0948" />
+    <public type="id" name="stream_preview_image" id="0x7f0a0949" />
+    <public type="id" name="stream_preview_overlay_text" id="0x7f0a094a" />
+    <public type="id" name="stream_preview_placeholder_caption" id="0x7f0a094b" />
+    <public type="id" name="stretch" id="0x7f0a094c" />
+    <public type="id" name="submenuarrow" id="0x7f0a094d" />
+    <public type="id" name="submit_area" id="0x7f0a094e" />
+    <public type="id" name="subtitle_text" id="0x7f0a094f" />
+    <public type="id" name="suggestion_example_answer" id="0x7f0a0950" />
+    <public type="id" name="suggestion_example_container" id="0x7f0a0951" />
+    <public type="id" name="suggestion_example_filter" id="0x7f0a0952" />
+    <public type="id" name="suggestion_example_icon" id="0x7f0a0953" />
+    <public type="id" name="suggestion_item_header" id="0x7f0a0954" />
+    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7f0a0955" />
+    <public type="id" name="suggestion_item_header_history_divider" id="0x7f0a0956" />
+    <public type="id" name="suggestion_item_header_history_text" id="0x7f0a0957" />
+    <public type="id" name="surface" id="0x7f0a0958" />
+    <public type="id" name="surface_view" id="0x7f0a0959" />
+    <public type="id" name="surface_view_root" id="0x7f0a095a" />
+    <public type="id" name="swipeRefreshLayout" id="0x7f0a095b" />
+    <public type="id" name="switchWidget" id="0x7f0a095c" />
+    <public type="id" name="switchview" id="0x7f0a095d" />
+    <public type="id" name="tabMode" id="0x7f0a095e" />
+    <public type="id" name="tabs_host_bottom_nav_friends_icon" id="0x7f0a095f" />
+    <public type="id" name="tabs_host_bottom_nav_friends_item" id="0x7f0a0960" />
+    <public type="id" name="tabs_host_bottom_nav_friends_notifications_badge" id="0x7f0a0961" />
+    <public type="id" name="tabs_host_bottom_nav_home_icon" id="0x7f0a0962" />
+    <public type="id" name="tabs_host_bottom_nav_home_item" id="0x7f0a0963" />
+    <public type="id" name="tabs_host_bottom_nav_home_notifications_badge" id="0x7f0a0964" />
+    <public type="id" name="tabs_host_bottom_nav_mentions_icon" id="0x7f0a0965" />
+    <public type="id" name="tabs_host_bottom_nav_mentions_item" id="0x7f0a0966" />
+    <public type="id" name="tabs_host_bottom_nav_search_icon" id="0x7f0a0967" />
+    <public type="id" name="tabs_host_bottom_nav_search_item" id="0x7f0a0968" />
+    <public type="id" name="tabs_host_bottom_nav_tabs_container" id="0x7f0a0969" />
+    <public type="id" name="tabs_host_bottom_nav_user_avatar_presence_view" id="0x7f0a096a" />
+    <public type="id" name="tabs_host_bottom_nav_user_settings_item" id="0x7f0a096b" />
+    <public type="id" name="tag_accessibility_actions" id="0x7f0a096c" />
+    <public type="id" name="tag_accessibility_clickable_spans" id="0x7f0a096d" />
+    <public type="id" name="tag_accessibility_heading" id="0x7f0a096e" />
+    <public type="id" name="tag_accessibility_pane_title" id="0x7f0a096f" />
+    <public type="id" name="tag_screen_reader_focusable" id="0x7f0a0970" />
+    <public type="id" name="tag_transition_group" id="0x7f0a0971" />
+    <public type="id" name="tag_unhandled_key_event_manager" id="0x7f0a0972" />
+    <public type="id" name="tag_unhandled_key_listeners" id="0x7f0a0973" />
+    <public type="id" name="takePicture" id="0x7f0a0974" />
+    <public type="id" name="take_photo_btn" id="0x7f0a0975" />
+    <public type="id" name="ternary_check_neutral" id="0x7f0a0976" />
+    <public type="id" name="ternary_check_off" id="0x7f0a0977" />
+    <public type="id" name="ternary_check_on" id="0x7f0a0978" />
+    <public type="id" name="test" id="0x7f0a0979" />
+    <public type="id" name="test_checkbox_android_button_tint" id="0x7f0a097a" />
+    <public type="id" name="test_checkbox_app_button_tint" id="0x7f0a097b" />
+    <public type="id" name="test_radiobutton_android_button_tint" id="0x7f0a097c" />
+    <public type="id" name="test_radiobutton_app_button_tint" id="0x7f0a097d" />
+    <public type="id" name="text" id="0x7f0a097e" />
+    <public type="id" name="text1" id="0x7f0a097f" />
+    <public type="id" name="text2" id="0x7f0a0980" />
+    <public type="id" name="textEnd" id="0x7f0a0981" />
+    <public type="id" name="textSpacerNoButtons" id="0x7f0a0982" />
+    <public type="id" name="textSpacerNoTitle" id="0x7f0a0983" />
+    <public type="id" name="textStart" id="0x7f0a0984" />
+    <public type="id" name="text_input_end_icon" id="0x7f0a0985" />
+    <public type="id" name="text_input_start_icon" id="0x7f0a0986" />
+    <public type="id" name="text_view_rotate" id="0x7f0a0987" />
+    <public type="id" name="text_view_scale" id="0x7f0a0988" />
+    <public type="id" name="textinput_counter" id="0x7f0a0989" />
+    <public type="id" name="textinput_error" id="0x7f0a098a" />
+    <public type="id" name="textinput_helper_text" id="0x7f0a098b" />
+    <public type="id" name="textinput_placeholder" id="0x7f0a098c" />
+    <public type="id" name="textinput_prefix_text" id="0x7f0a098d" />
+    <public type="id" name="textinput_suffix_text" id="0x7f0a098e" />
+    <public type="id" name="texture" id="0x7f0a098f" />
+    <public type="id" name="texture_view" id="0x7f0a0990" />
+    <public type="id" name="thing_proto" id="0x7f0a0991" />
+    <public type="id" name="thumb_iv" id="0x7f0a0992" />
+    <public type="id" name="tile" id="0x7f0a0993" />
+    <public type="id" name="time" id="0x7f0a0994" />
+    <public type="id" name="title" id="0x7f0a0995" />
+    <public type="id" name="titleDividerNoCustom" id="0x7f0a0996" />
+    <public type="id" name="title_template" id="0x7f0a0997" />
+    <public type="id" name="title_text_barrier" id="0x7f0a0998" />
+    <public type="id" name="toolbar" id="0x7f0a0999" />
+    <public type="id" name="toolbar_presence" id="0x7f0a099a" />
+    <public type="id" name="toolbar_title" id="0x7f0a099b" />
+    <public type="id" name="toolbar_title_subtext" id="0x7f0a099c" />
+    <public type="id" name="top" id="0x7f0a099d" />
+    <public type="id" name="topPanel" id="0x7f0a099e" />
+    <public type="id" name="torch" id="0x7f0a099f" />
+    <public type="id" name="touch_outside" id="0x7f0a09a0" />
+    <public type="id" name="transition_current_scene" id="0x7f0a09a1" />
+    <public type="id" name="transition_layout_save" id="0x7f0a09a2" />
+    <public type="id" name="transition_position" id="0x7f0a09a3" />
+    <public type="id" name="transition_scene_layoutid_cache" id="0x7f0a09a4" />
+    <public type="id" name="transition_transform" id="0x7f0a09a5" />
+    <public type="id" name="transparency_layout" id="0x7f0a09a6" />
+    <public type="id" name="transparency_seekbar" id="0x7f0a09a7" />
+    <public type="id" name="transparency_text" id="0x7f0a09a8" />
+    <public type="id" name="transparency_title" id="0x7f0a09a9" />
+    <public type="id" name="trash_wrap_icon" id="0x7f0a09aa" />
+    <public type="id" name="trash_wrap_target_container" id="0x7f0a09ab" />
+    <public type="id" name="trash_wrap_target_zone" id="0x7f0a09ac" />
+    <public type="id" name="type_iv" id="0x7f0a09ad" />
+    <public type="id" name="ucrop" id="0x7f0a09ae" />
+    <public type="id" name="ucrop_frame" id="0x7f0a09af" />
+    <public type="id" name="ucrop_photobox" id="0x7f0a09b0" />
+    <public type="id" name="uikit_chat_guideline" id="0x7f0a09b1" />
+    <public type="id" name="uikit_sheet_header_guideline" id="0x7f0a09b2" />
+    <public type="id" name="unblock_user_button" id="0x7f0a09b3" />
+    <public type="id" name="unchecked" id="0x7f0a09b4" />
+    <public type="id" name="unhandled_uri_display" id="0x7f0a09b5" />
+    <public type="id" name="unhandled_uri_okay" id="0x7f0a09b6" />
+    <public type="id" name="uniform" id="0x7f0a09b7" />
+    <public type="id" name="unlabeled" id="0x7f0a09b8" />
+    <public type="id" name="up" id="0x7f0a09b9" />
+    <public type="id" name="upload_progress_1" id="0x7f0a09ba" />
+    <public type="id" name="upload_progress_2" id="0x7f0a09bb" />
+    <public type="id" name="upload_progress_3" id="0x7f0a09bc" />
+    <public type="id" name="url" id="0x7f0a09bd" />
+    <public type="id" name="useLogo" id="0x7f0a09be" />
+    <public type="id" name="user_actions_dialog_avatar" id="0x7f0a09bf" />
+    <public type="id" name="user_actions_dialog_block_item" id="0x7f0a09c0" />
+    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7f0a09c1" />
+    <public type="id" name="user_actions_dialog_unblock_item" id="0x7f0a09c2" />
+    <public type="id" name="user_actions_dialog_user_name" id="0x7f0a09c3" />
+    <public type="id" name="user_avatar_presence_avatar" id="0x7f0a09c4" />
+    <public type="id" name="user_avatar_presence_container" id="0x7f0a09c5" />
+    <public type="id" name="user_avatar_presence_status" id="0x7f0a09c6" />
+    <public type="id" name="user_captcha_help" id="0x7f0a09c7" />
+    <public type="id" name="user_captcha_verify_button" id="0x7f0a09c8" />
+    <public type="id" name="user_captcha_verify_button_anchor" id="0x7f0a09c9" />
+    <public type="id" name="user_captcha_verify_button_cancel" id="0x7f0a09ca" />
+    <public type="id" name="user_limit_seekbar" id="0x7f0a09cb" />
+    <public type="id" name="user_list_item_avatar" id="0x7f0a09cc" />
+    <public type="id" name="user_list_item_name" id="0x7f0a09cd" />
+    <public type="id" name="user_list_item_name_secondary" id="0x7f0a09ce" />
+    <public type="id" name="user_list_item_status" id="0x7f0a09cf" />
+    <public type="id" name="user_mentions_filter_include_everyone" id="0x7f0a09d0" />
+    <public type="id" name="user_mentions_filter_include_roles" id="0x7f0a09d1" />
+    <public type="id" name="user_mentions_filter_this_server" id="0x7f0a09d2" />
+    <public type="id" name="user_mentions_list" id="0x7f0a09d3" />
+    <public type="id" name="user_mutual_friends_recycler_view" id="0x7f0a09d4" />
+    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7f0a09d5" />
+    <public type="id" name="user_phone_add_anchor" id="0x7f0a09d6" />
+    <public type="id" name="user_phone_add_country_code" id="0x7f0a09d7" />
+    <public type="id" name="user_phone_add_description" id="0x7f0a09d8" />
+    <public type="id" name="user_phone_add_description_note" id="0x7f0a09d9" />
+    <public type="id" name="user_phone_add_next" id="0x7f0a09da" />
+    <public type="id" name="user_phone_add_number" id="0x7f0a09db" />
+    <public type="id" name="user_phone_digit_verification" id="0x7f0a09dc" />
+    <public type="id" name="user_profile_adapter_item_empty" id="0x7f0a09dd" />
+    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7f0a09de" />
+    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7f0a09df" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7f0a09e0" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7f0a09e1" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7f0a09e2" />
+    <public type="id" name="user_profile_adapter_item_friend_status" id="0x7f0a09e3" />
+    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7f0a09e4" />
+    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7f0a09e5" />
+    <public type="id" name="user_profile_adapter_item_server_image" id="0x7f0a09e6" />
+    <public type="id" name="user_profile_adapter_item_server_name" id="0x7f0a09e7" />
+    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7f0a09e8" />
+    <public type="id" name="user_profile_adapter_item_server_text" id="0x7f0a09e9" />
+    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7f0a09ea" />
+    <public type="id" name="user_profile_admin_ban" id="0x7f0a09eb" />
+    <public type="id" name="user_profile_admin_edit_member" id="0x7f0a09ec" />
+    <public type="id" name="user_profile_admin_kick" id="0x7f0a09ed" />
+    <public type="id" name="user_profile_admin_server_deafen" id="0x7f0a09ee" />
+    <public type="id" name="user_profile_admin_server_disconnect" id="0x7f0a09ef" />
+    <public type="id" name="user_profile_admin_server_move" id="0x7f0a09f0" />
+    <public type="id" name="user_profile_admin_server_mute" id="0x7f0a09f1" />
+    <public type="id" name="user_profile_avatar_presence" id="0x7f0a09f2" />
+    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7f0a09f3" />
+    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7f0a09f4" />
+    <public type="id" name="user_profile_connections_view_recycler" id="0x7f0a09f5" />
+    <public type="id" name="user_profile_header_badges_recycler" id="0x7f0a09f6" />
+    <public type="id" name="user_profile_header_custom_status" id="0x7f0a09f7" />
+    <public type="id" name="user_profile_header_name_wrap" id="0x7f0a09f8" />
+    <public type="id" name="user_profile_header_primary_name" id="0x7f0a09f9" />
+    <public type="id" name="user_profile_header_secondary_name" id="0x7f0a09fa" />
+    <public type="id" name="user_selected_checkbox" id="0x7f0a09fb" />
+    <public type="id" name="user_settings_mfa_enable_input_code" id="0x7f0a09fc" />
+    <public type="id" name="user_settings_profile_header_view" id="0x7f0a09fd" />
+    <public type="id" name="user_sheet_add_friend_action_button" id="0x7f0a09fe" />
+    <public type="id" name="user_sheet_admin_card" id="0x7f0a09ff" />
+    <public type="id" name="user_sheet_admin_view" id="0x7f0a0a00" />
+    <public type="id" name="user_sheet_badge_image" id="0x7f0a0a01" />
+    <public type="id" name="user_sheet_call_action_button" id="0x7f0a0a02" />
+    <public type="id" name="user_sheet_connections_header" id="0x7f0a0a03" />
+    <public type="id" name="user_sheet_connections_view" id="0x7f0a0a04" />
+    <public type="id" name="user_sheet_content" id="0x7f0a0a05" />
+    <public type="id" name="user_sheet_copy_id" id="0x7f0a0a06" />
+    <public type="id" name="user_sheet_deafen" id="0x7f0a0a07" />
+    <public type="id" name="user_sheet_developer_header" id="0x7f0a0a08" />
+    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7f0a0a09" />
+    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7f0a0a0a" />
+    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7f0a0a0b" />
+    <public type="id" name="user_sheet_guild_container" id="0x7f0a0a0c" />
+    <public type="id" name="user_sheet_guild_header" id="0x7f0a0a0d" />
+    <public type="id" name="user_sheet_header" id="0x7f0a0a0e" />
+    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7f0a0a0f" />
+    <public type="id" name="user_sheet_loading_container" id="0x7f0a0a10" />
+    <public type="id" name="user_sheet_message_action_button" id="0x7f0a0a11" />
+    <public type="id" name="user_sheet_more_button" id="0x7f0a0a12" />
+    <public type="id" name="user_sheet_muted" id="0x7f0a0a13" />
+    <public type="id" name="user_sheet_note_header" id="0x7f0a0a14" />
+    <public type="id" name="user_sheet_note_text_field_wrap" id="0x7f0a0a15" />
+    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7f0a0a16" />
+    <public type="id" name="user_sheet_profile_actions_container" id="0x7f0a0a17" />
+    <public type="id" name="user_sheet_profile_actions_divider" id="0x7f0a0a18" />
+    <public type="id" name="user_sheet_profile_header_view" id="0x7f0a0a19" />
+    <public type="id" name="user_sheet_profile_voice_settings_header" id="0x7f0a0a1a" />
+    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7f0a0a1b" />
+    <public type="id" name="user_sheet_roles_list" id="0x7f0a0a1c" />
+    <public type="id" name="user_sheet_video_action_button" id="0x7f0a0a1d" />
+    <public type="id" name="user_sheet_volume" id="0x7f0a0a1e" />
+    <public type="id" name="user_sheet_volume_label" id="0x7f0a0a1f" />
+    <public type="id" name="user_sheet_volume_wrap" id="0x7f0a0a20" />
+    <public type="id" name="user_status_presence_custom_clear" id="0x7f0a0a21" />
+    <public type="id" name="user_status_presence_custom_emoji" id="0x7f0a0a22" />
+    <public type="id" name="user_status_presence_custom_text" id="0x7f0a0a23" />
+    <public type="id" name="user_status_presence_dot" id="0x7f0a0a24" />
+    <public type="id" name="user_status_presence_subtitle" id="0x7f0a0a25" />
+    <public type="id" name="user_status_presence_title" id="0x7f0a0a26" />
+    <public type="id" name="user_status_update_custom" id="0x7f0a0a27" />
+    <public type="id" name="user_status_update_dnd" id="0x7f0a0a28" />
+    <public type="id" name="user_status_update_idle" id="0x7f0a0a29" />
+    <public type="id" name="user_status_update_invisible" id="0x7f0a0a2a" />
+    <public type="id" name="user_status_update_online" id="0x7f0a0a2b" />
+    <public type="id" name="username_placeholder_end_guideline" id="0x7f0a0a2c" />
+    <public type="id" name="username_tag" id="0x7f0a0a2d" />
+    <public type="id" name="username_text" id="0x7f0a0a2e" />
+    <public type="id" name="verify_char_1" id="0x7f0a0a2f" />
+    <public type="id" name="verify_char_2" id="0x7f0a0a30" />
+    <public type="id" name="verify_char_3" id="0x7f0a0a31" />
+    <public type="id" name="verify_char_4" id="0x7f0a0a32" />
+    <public type="id" name="verify_char_5" id="0x7f0a0a33" />
+    <public type="id" name="verify_char_6" id="0x7f0a0a34" />
+    <public type="id" name="video" id="0x7f0a0a35" />
+    <public type="id" name="video_decoder_gl_surface_view" id="0x7f0a0a36" />
+    <public type="id" name="view_dialog_confirmation_cancel" id="0x7f0a0a37" />
+    <public type="id" name="view_dialog_confirmation_confirm" id="0x7f0a0a38" />
+    <public type="id" name="view_dialog_confirmation_header" id="0x7f0a0a39" />
+    <public type="id" name="view_dialog_confirmation_text" id="0x7f0a0a3a" />
+    <public type="id" name="view_input" id="0x7f0a0a3b" />
+    <public type="id" name="view_offset_helper" id="0x7f0a0a3c" />
+    <public type="id" name="view_overlay" id="0x7f0a0a3d" />
+    <public type="id" name="view_pager" id="0x7f0a0a3e" />
+    <public type="id" name="view_premium_guild_feature_image" id="0x7f0a0a3f" />
+    <public type="id" name="view_premium_guild_feature_text" id="0x7f0a0a40" />
+    <public type="id" name="view_premium_marketing_container_tier1" id="0x7f0a0a41" />
+    <public type="id" name="view_premium_marketing_learn_more" id="0x7f0a0a42" />
+    <public type="id" name="view_premium_marketing_marketing_container" id="0x7f0a0a43" />
+    <public type="id" name="view_premium_marketing_marketing_subtitle" id="0x7f0a0a44" />
+    <public type="id" name="view_premium_marketing_marketing_title" id="0x7f0a0a45" />
+    <public type="id" name="view_premium_marketing_nitro_boost_count" id="0x7f0a0a46" />
+    <public type="id" name="view_premium_marketing_nitro_boost_discount" id="0x7f0a0a47" />
+    <public type="id" name="view_premium_marketing_nitro_classic_boost_count" id="0x7f0a0a48" />
+    <public type="id" name="view_premium_marketing_nitro_classic_boost_discount" id="0x7f0a0a49" />
+    <public type="id" name="view_premium_upsell_info_subheading" id="0x7f0a0a4a" />
+    <public type="id" name="view_premium_upsell_info_subheading_blurb" id="0x7f0a0a4b" />
+    <public type="id" name="view_premium_upsell_info_subheading_price" id="0x7f0a0a4c" />
+    <public type="id" name="view_typing_dots_1" id="0x7f0a0a4d" />
+    <public type="id" name="view_typing_dots_2" id="0x7f0a0a4e" />
+    <public type="id" name="view_typing_dots_3" id="0x7f0a0a4f" />
+    <public type="id" name="visible" id="0x7f0a0a50" />
+    <public type="id" name="visible_removing_fragment_view_tag" id="0x7f0a0a51" />
+    <public type="id" name="voice_bottom_sheet_bottom_content_container" id="0x7f0a0a52" />
+    <public type="id" name="voice_bottom_sheet_connect" id="0x7f0a0a53" />
+    <public type="id" name="voice_bottom_sheet_connect_container" id="0x7f0a0a54" />
+    <public type="id" name="voice_bottom_sheet_controls" id="0x7f0a0a55" />
+    <public type="id" name="voice_bottom_sheet_empty_container" id="0x7f0a0a56" />
+    <public type="id" name="voice_bottom_sheet_header" id="0x7f0a0a57" />
+    <public type="id" name="voice_bottom_sheet_header_icon" id="0x7f0a0a58" />
+    <public type="id" name="voice_bottom_sheet_header_invite" id="0x7f0a0a59" />
+    <public type="id" name="voice_bottom_sheet_header_noise_cancellation" id="0x7f0a0a5a" />
+    <public type="id" name="voice_bottom_sheet_header_settings" id="0x7f0a0a5b" />
+    <public type="id" name="voice_bottom_sheet_header_subtitle" id="0x7f0a0a5c" />
+    <public type="id" name="voice_bottom_sheet_header_title" id="0x7f0a0a5d" />
+    <public type="id" name="voice_bottom_sheet_join_video" id="0x7f0a0a5e" />
+    <public type="id" name="voice_bottom_sheet_recycler" id="0x7f0a0a5f" />
+    <public type="id" name="voice_bottom_sheet_root" id="0x7f0a0a60" />
+    <public type="id" name="voice_call_inline_container" id="0x7f0a0a61" />
+    <public type="id" name="voice_connected_container" id="0x7f0a0a62" />
+    <public type="id" name="voice_connected_ptt" id="0x7f0a0a63" />
+    <public type="id" name="voice_fullscreen_controls_camera" id="0x7f0a0a64" />
+    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7f0a0a65" />
+    <public type="id" name="voice_fullscreen_controls_deafen" id="0x7f0a0a66" />
+    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7f0a0a67" />
+    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7f0a0a68" />
+    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7f0a0a69" />
+    <public type="id" name="voice_fullscreen_controls_screenshare" id="0x7f0a0a6a" />
+    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7f0a0a6b" />
+    <public type="id" name="voice_settings_invite" id="0x7f0a0a6c" />
+    <public type="id" name="voice_settings_noise_suppression" id="0x7f0a0a6d" />
+    <public type="id" name="voice_settings_sheet_container" id="0x7f0a0a6e" />
+    <public type="id" name="voice_settings_toggle_video_participants" id="0x7f0a0a6f" />
+    <public type="id" name="voice_settings_voice_settings" id="0x7f0a0a70" />
+    <public type="id" name="voice_user_avatar" id="0x7f0a0a71" />
+    <public type="id" name="voice_user_limit_current" id="0x7f0a0a72" />
+    <public type="id" name="voice_user_limit_max" id="0x7f0a0a73" />
+    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7f0a0a74" />
+    <public type="id" name="voice_user_list_item_header_label" id="0x7f0a0a75" />
+    <public type="id" name="voice_user_list_item_invite_tv" id="0x7f0a0a76" />
+    <public type="id" name="voice_user_list_item_live_indicator" id="0x7f0a0a77" />
+    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7f0a0a78" />
+    <public type="id" name="voice_user_list_item_spectating_indicator" id="0x7f0a0a79" />
+    <public type="id" name="voice_user_list_item_stop_ringing" id="0x7f0a0a7a" />
+    <public type="id" name="voice_user_list_item_user_avatar" id="0x7f0a0a7b" />
+    <public type="id" name="voice_user_list_item_user_name" id="0x7f0a0a7c" />
+    <public type="id" name="voice_user_list_item_user_stream_preview" id="0x7f0a0a7d" />
+    <public type="id" name="voice_user_list_item_video_indicator" id="0x7f0a0a7e" />
+    <public type="id" name="voice_user_name_display" id="0x7f0a0a7f" />
+    <public type="id" name="web_view" id="0x7f0a0a80" />
+    <public type="id" name="welcome_card_invite_friends" id="0x7f0a0a81" />
+    <public type="id" name="welcome_card_upload_icon" id="0x7f0a0a82" />
+    <public type="id" name="when_playing" id="0x7f0a0a83" />
+    <public type="id" name="wide" id="0x7f0a0a84" />
+    <public type="id" name="widget_add_friend_user_list_item" id="0x7f0a0a85" />
+    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7f0a0a86" />
+    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7f0a0a87" />
+    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7f0a0a88" />
+    <public type="id" name="widget_auth_mfa_info_okay" id="0x7f0a0a89" />
+    <public type="id" name="widget_auth_mfa_info_text" id="0x7f0a0a8a" />
+    <public type="id" name="widget_channel_action_bar" id="0x7f0a0a8b" />
+    <public type="id" name="widget_channel_search_item" id="0x7f0a0a8c" />
+    <public type="id" name="widget_channel_search_item_remove" id="0x7f0a0a8d" />
+    <public type="id" name="widget_channel_settings_permissions_overview_members_recycler" id="0x7f0a0a8e" />
+    <public type="id" name="widget_channel_settings_permissions_overview_roles_recycler" id="0x7f0a0a8f" />
+    <public type="id" name="widget_channel_sidebar_actions_guild_view" id="0x7f0a0a90" />
+    <public type="id" name="widget_channel_sidebar_actions_private_view" id="0x7f0a0a91" />
+    <public type="id" name="widget_channel_topic" id="0x7f0a0a92" />
+    <public type="id" name="widget_channels" id="0x7f0a0a93" />
+    <public type="id" name="widget_channels_list_container" id="0x7f0a0a94" />
+    <public type="id" name="widget_channels_list_empty_friends_state_view" id="0x7f0a0a95" />
+    <public type="id" name="widget_chat_bottom_space" id="0x7f0a0a96" />
+    <public type="id" name="widget_chat_input" id="0x7f0a0a97" />
+    <public type="id" name="widget_chat_list" id="0x7f0a0a98" />
+    <public type="id" name="widget_chat_overlay_actions" id="0x7f0a0a99" />
+    <public type="id" name="widget_chat_voice_inline" id="0x7f0a0a9a" />
+    <public type="id" name="widget_collapsed_user_count" id="0x7f0a0a9b" />
+    <public type="id" name="widget_collapsed_user_imageview" id="0x7f0a0a9c" />
+    <public type="id" name="widget_connected_list" id="0x7f0a0a9d" />
+    <public type="id" name="widget_guilds" id="0x7f0a0a9e" />
+    <public type="id" name="widget_home_container" id="0x7f0a0a9f" />
+    <public type="id" name="widget_home_overlapping_panels_panels_layout" id="0x7f0a0aa0" />
+    <public type="id" name="widget_media_container" id="0x7f0a0aa1" />
+    <public type="id" name="widget_media_image" id="0x7f0a0aa2" />
+    <public type="id" name="widget_media_loading_indicator" id="0x7f0a0aa3" />
+    <public type="id" name="widget_media_player_control_view" id="0x7f0a0aa4" />
+    <public type="id" name="widget_media_player_view" id="0x7f0a0aa5" />
+    <public type="id" name="widget_profile_strip" id="0x7f0a0aa6" />
+    <public type="id" name="widget_search_input" id="0x7f0a0aa7" />
+    <public type="id" name="widget_search_results" id="0x7f0a0aa8" />
+    <public type="id" name="widget_search_suggestions" id="0x7f0a0aa9" />
+    <public type="id" name="widget_server_settings_channels_container" id="0x7f0a0aaa" />
+    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7f0a0aab" />
+    <public type="id" name="widget_server_settings_emojis_section" id="0x7f0a0aac" />
+    <public type="id" name="widget_server_settings_emojis_upload" id="0x7f0a0aad" />
+    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7f0a0aae" />
+    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7f0a0aaf" />
+    <public type="id" name="widget_status" id="0x7f0a0ab0" />
+    <public type="id" name="widget_tabs_host_bottom_navigation_view" id="0x7f0a0ab1" />
+    <public type="id" name="widget_tabs_host_call_indicator" id="0x7f0a0ab2" />
+    <public type="id" name="widget_tabs_host_container" id="0x7f0a0ab3" />
+    <public type="id" name="widget_tabs_host_friends" id="0x7f0a0ab4" />
+    <public type="id" name="widget_tabs_host_home" id="0x7f0a0ab5" />
+    <public type="id" name="widget_tabs_host_mentions" id="0x7f0a0ab6" />
+    <public type="id" name="widget_tabs_host_nav_host" id="0x7f0a0ab7" />
+    <public type="id" name="widget_tabs_host_non_fullscreen_nav_host" id="0x7f0a0ab8" />
+    <public type="id" name="widget_tabs_host_user_settings" id="0x7f0a0ab9" />
+    <public type="id" name="withText" id="0x7f0a0aba" />
+    <public type="id" name="withinBounds" id="0x7f0a0abb" />
+    <public type="id" name="wrap" id="0x7f0a0abc" />
+    <public type="id" name="wrap_content" id="0x7f0a0abd" />
+    <public type="id" name="wrap_reverse" id="0x7f0a0abe" />
+    <public type="id" name="wrapper_controls" id="0x7f0a0abf" />
+    <public type="id" name="wrapper_reset_rotate" id="0x7f0a0ac0" />
+    <public type="id" name="wrapper_rotate_by_angle" id="0x7f0a0ac1" />
+    <public type="id" name="wrapper_states" id="0x7f0a0ac2" />
+    <public type="id" name="zero_corner_chip" id="0x7f0a0ac3" />
+    <public type="id" name="zoom" id="0x7f0a0ac4" />
     <public type="integer" name="abc_config_activityDefaultDur" id="0x7f0b0000" />
     <public type="integer" name="abc_config_activityShortDur" id="0x7f0b0001" />
     <public type="integer" name="animation_time_standard" id="0x7f0b0002" />
@@ -7748,139 +7736,142 @@
     <public type="plurals" name="guild_settings_discovery_checklist_change_channel_categories_numCategories" id="0x7f100083" />
     <public type="plurals" name="guild_settings_discovery_checklist_change_channel_names_numChannels" id="0x7f100084" />
     <public type="plurals" name="guild_settings_overview_boost_unlock_boosts" id="0x7f100085" />
-    <public type="plurals" name="guild_settings_premium_guild_close_hint_numLeft" id="0x7f100086" />
-    <public type="plurals" name="guild_settings_premium_guild_count_subscribers_count" id="0x7f100087" />
-    <public type="plurals" name="guild_settings_premium_guild_tier_requirement_required" id="0x7f100088" />
-    <public type="plurals" name="guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions_numFreeGuildSubscriptions" id="0x7f100089" />
-    <public type="plurals" name="guild_settings_premium_upsell_body_perk_num_guild_subscriptions_numFreeGuildSubscriptions" id="0x7f10008a" />
-    <public type="plurals" name="guild_settings_premium_upsell_heading_tertiary_premium_user_numFreeGuildSubscriptions" id="0x7f10008b" />
-    <public type="plurals" name="guild_sidebar_announcement_channel_a11y_label_with_mentions_mentionCount" id="0x7f10008c" />
-    <public type="plurals" name="guild_sidebar_default_channel_a11y_label_with_mentions_mentionCount" id="0x7f10008d" />
-    <public type="plurals" name="guild_sidebar_voice_channel_a11y_label_with_users_userCount" id="0x7f10008e" />
-    <public type="plurals" name="guild_subscription_purchase_modal_activated_description_generic_guild_guildSubscriptionQuantity" id="0x7f10008f" />
-    <public type="plurals" name="guild_subscription_purchase_modal_activated_description_guildSubscriptionQuantity" id="0x7f100090" />
-    <public type="plurals" name="guild_subscription_purchase_modal_activated_description_mobile2_guildSubscriptionQuantity" id="0x7f100091" />
-    <public type="plurals" name="guild_subscription_purchase_modal_transferred_description_mobile2_guildSubscriptionQuantity" id="0x7f100092" />
-    <public type="plurals" name="guild_subscription_purchase_modal_unused_slot_notice_slotCount" id="0x7f100093" />
-    <public type="plurals" name="guild_template_usages_by_creator2_usageCount" id="0x7f100094" />
-    <public type="plurals" name="guild_template_usages_no_bold_usageCount" id="0x7f100095" />
-    <public type="plurals" name="guild_template_usages_usageCount" id="0x7f100096" />
-    <public type="plurals" name="guild_tooltip_a11y_label_mentions" id="0x7f100097" />
-    <public type="plurals" name="humanize_duration_days_time" id="0x7f100098" />
-    <public type="plurals" name="humanize_duration_hours_time" id="0x7f100099" />
-    <public type="plurals" name="humanize_duration_minutes_time" id="0x7f10009a" />
-    <public type="plurals" name="humanize_duration_seconds_time" id="0x7f10009b" />
-    <public type="plurals" name="instant_invite_guild_members_total_count" id="0x7f10009c" />
-    <public type="plurals" name="integrations_channel_following_summary_count" id="0x7f10009d" />
-    <public type="plurals" name="integrations_twitch_summary_count" id="0x7f10009e" />
-    <public type="plurals" name="integrations_webhooks_count_count" id="0x7f10009f" />
-    <public type="plurals" name="integrations_webhooks_summary_count" id="0x7f1000a0" />
-    <public type="plurals" name="integrations_youtube_summary_count" id="0x7f1000a1" />
-    <public type="plurals" name="invite_embed_num_open_slots_number" id="0x7f1000a2" />
-    <public type="plurals" name="invite_expires_days_or_uses_numUses" id="0x7f1000a3" />
-    <public type="plurals" name="invite_expires_hours_numHours" id="0x7f1000a4" />
-    <public type="plurals" name="invite_expires_hours_or_uses_numHours" id="0x7f1000a5" />
-    <public type="plurals" name="invite_expires_hours_or_uses_numUses" id="0x7f1000a6" />
-    <public type="plurals" name="invite_expires_minutes_or_uses_numUses" id="0x7f1000a7" />
-    <public type="plurals" name="invite_expires_uses_numUses" id="0x7f1000a8" />
-    <public type="plurals" name="last_seen_days" id="0x7f1000a9" />
-    <public type="plurals" name="live_viewers_viewers" id="0x7f1000aa" />
-    <public type="plurals" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading_numFreeGuildSubscriptions" id="0x7f1000ab" />
-    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label_numFreeGuildSubscriptions" id="0x7f1000ac" />
-    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_numFreeGuildSubscriptions" id="0x7f1000ad" />
-    <public type="plurals" name="max_uses_description_mobile_maxUses" id="0x7f1000ae" />
-    <public type="plurals" name="max_uses_maxUses" id="0x7f1000af" />
-    <public type="plurals" name="members_header_members" id="0x7f1000b0" />
-    <public type="plurals" name="message_count_count" id="0x7f1000b1" />
-    <public type="plurals" name="message_count_in_thread_count" id="0x7f1000b2" />
-    <public type="plurals" name="mtrl_badge_content_description" id="0x7f1000b3" />
-    <public type="plurals" name="n_days_days" id="0x7f1000b4" />
-    <public type="plurals" name="new_messages_count" id="0x7f1000b5" />
-    <public type="plurals" name="new_messages_with_date_count" id="0x7f1000b6" />
-    <public type="plurals" name="notice_premium_grandfathered_ending_numDays" id="0x7f1000b7" />
-    <public type="plurals" name="num_active_threads_count" id="0x7f1000b8" />
-    <public type="plurals" name="num_channels_num" id="0x7f1000b9" />
-    <public type="plurals" name="num_members_subscribers" id="0x7f1000ba" />
-    <public type="plurals" name="num_subscribers_subscribers" id="0x7f1000bb" />
-    <public type="plurals" name="num_users_num" id="0x7f1000bc" />
-    <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7f1000bd" />
-    <public type="plurals" name="partial_outage_a11y_count" id="0x7f1000be" />
-    <public type="plurals" name="partial_outage_count" id="0x7f1000bf" />
-    <public type="plurals" name="premium_chat_perks_description_premium_guild_included_numFreeGuildSubscriptions" id="0x7f1000c0" />
-    <public type="plurals" name="premium_guild_features_upsell_banner_subscribe_numFreeGuildSubscriptions" id="0x7f1000c1" />
-    <public type="plurals" name="premium_guild_grace_period_cooldown_numPremiumSubscriptions" id="0x7f1000c2" />
-    <public type="plurals" name="premium_guild_grace_period_cooldown_soon_numPremiumSubscriptions" id="0x7f1000c3" />
-    <public type="plurals" name="premium_guild_num_month_guild_subscriptions_num" id="0x7f1000c4" />
-    <public type="plurals" name="premium_guild_num_year_guild_subscriptions_num" id="0x7f1000c5" />
-    <public type="plurals" name="premium_guild_perks_modal_header_subscription_count_subscriptions" id="0x7f1000c6" />
-    <public type="plurals" name="premium_guild_perks_modal_header_user_subscription_count_numSubscriptions" id="0x7f1000c7" />
-    <public type="plurals" name="premium_guild_perks_modal_protip_mobile_numFreeGuildSubscriptions" id="0x7f1000c8" />
-    <public type="plurals" name="premium_guild_perks_modal_protip_numFreeGuildSubscriptions" id="0x7f1000c9" />
-    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7f1000ca" />
-    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7f1000cb" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cancel_warning_canceledCount" id="0x7f1000cc" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_label_slotCount" id="0x7f1000cd" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_slotCount" id="0x7f1000ce" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7f1000cf" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_slotCount" id="0x7f1000d0" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_guildCount" id="0x7f1000d1" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_slotCount" id="0x7f1000d2" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_from_guild_guildCount" id="0x7f1000d3" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_to_guild_slotCount" id="0x7f1000d4" />
-    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_label_slotCount" id="0x7f1000d5" />
-    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_slotCount" id="0x7f1000d6" />
-    <public type="plurals" name="premium_guild_subscription_available_numSubscriptions" id="0x7f1000d7" />
-    <public type="plurals" name="premium_guild_subscription_cancel_invoice_subscription_cancelled_subscriptionCount" id="0x7f1000d8" />
-    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7f1000d9" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7f1000da" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7f1000db" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7f1000dc" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7f1000dd" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7f1000de" />
-    <public type="plurals" name="premium_guild_subscription_guild_subsription_subtitle_numSubscriptions" id="0x7f1000df" />
-    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7f1000e0" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_android_quantity" id="0x7f1000e1" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android_quantity" id="0x7f1000e2" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_quantity" id="0x7f1000e3" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_quantity" id="0x7f1000e4" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7f1000e5" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7f1000e6" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7f1000e7" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7f1000e8" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7f1000e9" />
-    <public type="plurals" name="premium_plan_month_tier_2_trial_months" id="0x7f1000ea" />
-    <public type="plurals" name="premium_plan_year_tier_2_trial_months" id="0x7f1000eb" />
-    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7f1000ec" />
-    <public type="plurals" name="premium_subscription_renewal_footer_trial_days" id="0x7f1000ed" />
-    <public type="plurals" name="premium_upsell_feature_free_guild_subscription_numFreeGuildSubscriptions" id="0x7f1000ee" />
-    <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7f1000ef" />
-    <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7f1000f0" />
-    <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7f1000f1" />
-    <public type="plurals" name="reaction_tooltip_3_n_n" id="0x7f1000f2" />
-    <public type="plurals" name="reaction_tooltip_n_n" id="0x7f1000f3" />
-    <public type="plurals" name="roles_list_numRoles" id="0x7f1000f4" />
-    <public type="plurals" name="search_hide_blocked_messages_count" id="0x7f1000f5" />
-    <public type="plurals" name="search_num_results_blocked_not_shown_count" id="0x7f1000f6" />
-    <public type="plurals" name="search_still_indexing_hint_count" id="0x7f1000f7" />
-    <public type="plurals" name="spotify_listen_along_title_host_count" id="0x7f1000f9" />
-    <public type="plurals" name="thread_join_sub_text_count" id="0x7f1000fa" />
-    <public type="plurals" name="total_results_count" id="0x7f1000fb" />
-    <public type="plurals" name="uploading_files_count" id="0x7f1000fc" />
-    <public type="plurals" name="uploading_files_failed_count" id="0x7f1000fd" />
-    <public type="plurals" name="user_activity_timestamp_end_hours" id="0x7f1000fe" />
-    <public type="plurals" name="user_activity_timestamp_end_minutes" id="0x7f1000ff" />
-    <public type="plurals" name="user_activity_timestamp_end_seconds" id="0x7f100100" />
-    <public type="plurals" name="user_activity_timestamp_start_hours" id="0x7f100101" />
-    <public type="plurals" name="user_activity_timestamp_start_minutes" id="0x7f100102" />
-    <public type="plurals" name="user_activity_timestamp_start_seconds" id="0x7f100103" />
-    <public type="plurals" name="user_activity_user_playing_for_days_time" id="0x7f100104" />
-    <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7f100105" />
-    <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7f100106" />
-    <public type="plurals" name="user_profile_mutual_friends_count" id="0x7f100107" />
-    <public type="plurals" name="user_profile_mutual_guilds_count" id="0x7f100108" />
-    <public type="plurals" name="vanity_url_uses_uses" id="0x7f100109" />
-    <public type="plurals" name="voice_call_member_list_title_count" id="0x7f10010a" />
-    <public type="plurals" name="APKTOOL_DUMMY_f8" id="0x7f1000f8" />
+    <public type="plurals" name="guild_settings_partner_checklist_age_description_failing_minimumGuildAge" id="0x7f100086" />
+    <public type="plurals" name="guild_settings_partner_checklist_age_description_minimumGuildAge" id="0x7f100087" />
+    <public type="plurals" name="guild_settings_premium_guild_close_hint_numLeft" id="0x7f100088" />
+    <public type="plurals" name="guild_settings_premium_guild_count_subscribers_count" id="0x7f100089" />
+    <public type="plurals" name="guild_settings_premium_guild_tier_requirement_required" id="0x7f10008a" />
+    <public type="plurals" name="guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions_numFreeGuildSubscriptions" id="0x7f10008b" />
+    <public type="plurals" name="guild_settings_premium_upsell_body_perk_num_guild_subscriptions_numFreeGuildSubscriptions" id="0x7f10008c" />
+    <public type="plurals" name="guild_settings_premium_upsell_heading_tertiary_premium_user_numFreeGuildSubscriptions" id="0x7f10008d" />
+    <public type="plurals" name="guild_sidebar_announcement_channel_a11y_label_with_mentions_mentionCount" id="0x7f10008e" />
+    <public type="plurals" name="guild_sidebar_default_channel_a11y_label_with_mentions_mentionCount" id="0x7f10008f" />
+    <public type="plurals" name="guild_sidebar_voice_channel_a11y_label_with_users_userCount" id="0x7f100090" />
+    <public type="plurals" name="guild_subscription_purchase_modal_activated_description_generic_guild_guildSubscriptionQuantity" id="0x7f100091" />
+    <public type="plurals" name="guild_subscription_purchase_modal_activated_description_guildSubscriptionQuantity" id="0x7f100092" />
+    <public type="plurals" name="guild_subscription_purchase_modal_activated_description_mobile2_guildSubscriptionQuantity" id="0x7f100093" />
+    <public type="plurals" name="guild_subscription_purchase_modal_transferred_description_mobile2_guildSubscriptionQuantity" id="0x7f100094" />
+    <public type="plurals" name="guild_subscription_purchase_modal_unused_slot_notice_slotCount" id="0x7f100095" />
+    <public type="plurals" name="guild_template_usages_by_creator2_usageCount" id="0x7f100096" />
+    <public type="plurals" name="guild_template_usages_no_bold_usageCount" id="0x7f100097" />
+    <public type="plurals" name="guild_template_usages_usageCount" id="0x7f100098" />
+    <public type="plurals" name="guild_tooltip_a11y_label_mentions" id="0x7f100099" />
+    <public type="plurals" name="humanize_duration_days_time" id="0x7f10009a" />
+    <public type="plurals" name="humanize_duration_hours_time" id="0x7f10009b" />
+    <public type="plurals" name="humanize_duration_minutes_time" id="0x7f10009c" />
+    <public type="plurals" name="humanize_duration_seconds_time" id="0x7f10009d" />
+    <public type="plurals" name="instant_invite_guild_members_total_count" id="0x7f10009e" />
+    <public type="plurals" name="integrations_channel_following_summary_count" id="0x7f10009f" />
+    <public type="plurals" name="integrations_twitch_summary_count" id="0x7f1000a0" />
+    <public type="plurals" name="integrations_webhooks_count_count" id="0x7f1000a1" />
+    <public type="plurals" name="integrations_webhooks_summary_count" id="0x7f1000a2" />
+    <public type="plurals" name="integrations_youtube_summary_count" id="0x7f1000a3" />
+    <public type="plurals" name="invite_embed_num_open_slots_number" id="0x7f1000a4" />
+    <public type="plurals" name="invite_expires_days_or_uses_numUses" id="0x7f1000a5" />
+    <public type="plurals" name="invite_expires_hours_numHours" id="0x7f1000a6" />
+    <public type="plurals" name="invite_expires_hours_or_uses_numHours" id="0x7f1000a7" />
+    <public type="plurals" name="invite_expires_hours_or_uses_numUses" id="0x7f1000a8" />
+    <public type="plurals" name="invite_expires_minutes_or_uses_numUses" id="0x7f1000a9" />
+    <public type="plurals" name="invite_expires_uses_numUses" id="0x7f1000aa" />
+    <public type="plurals" name="last_seen_days" id="0x7f1000ab" />
+    <public type="plurals" name="live_viewers_viewers" id="0x7f1000ac" />
+    <public type="plurals" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading_numFreeGuildSubscriptions" id="0x7f1000ad" />
+    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label_numFreeGuildSubscriptions" id="0x7f1000ae" />
+    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_numFreeGuildSubscriptions" id="0x7f1000af" />
+    <public type="plurals" name="max_uses_description_mobile_maxUses" id="0x7f1000b0" />
+    <public type="plurals" name="max_uses_maxUses" id="0x7f1000b1" />
+    <public type="plurals" name="members_header_members" id="0x7f1000b2" />
+    <public type="plurals" name="message_count_count" id="0x7f1000b3" />
+    <public type="plurals" name="message_count_in_thread_count" id="0x7f1000b4" />
+    <public type="plurals" name="mtrl_badge_content_description" id="0x7f1000b5" />
+    <public type="plurals" name="n_days_days" id="0x7f1000b6" />
+    <public type="plurals" name="new_messages_count" id="0x7f1000b7" />
+    <public type="plurals" name="new_messages_with_date_count" id="0x7f1000b8" />
+    <public type="plurals" name="notice_premium_grandfathered_ending_numDays" id="0x7f1000b9" />
+    <public type="plurals" name="num_active_threads_count" id="0x7f1000ba" />
+    <public type="plurals" name="num_channels_num" id="0x7f1000bb" />
+    <public type="plurals" name="num_members_subscribers" id="0x7f1000bc" />
+    <public type="plurals" name="num_subscribers_subscribers" id="0x7f1000bd" />
+    <public type="plurals" name="num_users_num" id="0x7f1000be" />
+    <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7f1000bf" />
+    <public type="plurals" name="partial_outage_a11y_count" id="0x7f1000c0" />
+    <public type="plurals" name="partial_outage_count" id="0x7f1000c1" />
+    <public type="plurals" name="premium_chat_perks_description_premium_guild_included_numFreeGuildSubscriptions" id="0x7f1000c2" />
+    <public type="plurals" name="premium_guild_features_upsell_banner_subscribe_numFreeGuildSubscriptions" id="0x7f1000c3" />
+    <public type="plurals" name="premium_guild_grace_period_cooldown_numPremiumSubscriptions" id="0x7f1000c4" />
+    <public type="plurals" name="premium_guild_grace_period_cooldown_soon_numPremiumSubscriptions" id="0x7f1000c5" />
+    <public type="plurals" name="premium_guild_num_month_guild_subscriptions_num" id="0x7f1000c6" />
+    <public type="plurals" name="premium_guild_num_year_guild_subscriptions_num" id="0x7f1000c7" />
+    <public type="plurals" name="premium_guild_perks_modal_header_subscription_count_subscriptions" id="0x7f1000c8" />
+    <public type="plurals" name="premium_guild_perks_modal_header_user_subscription_count_numSubscriptions" id="0x7f1000c9" />
+    <public type="plurals" name="premium_guild_perks_modal_protip_mobile_numFreeGuildSubscriptions" id="0x7f1000ca" />
+    <public type="plurals" name="premium_guild_perks_modal_protip_numFreeGuildSubscriptions" id="0x7f1000cb" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7f1000cc" />
+    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7f1000cd" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cancel_warning_canceledCount" id="0x7f1000ce" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_label_slotCount" id="0x7f1000cf" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_slotCount" id="0x7f1000d0" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7f1000d1" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_slotCount" id="0x7f1000d2" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_guildCount" id="0x7f1000d3" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_slotCount" id="0x7f1000d4" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_from_guild_guildCount" id="0x7f1000d5" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_to_guild_slotCount" id="0x7f1000d6" />
+    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_label_slotCount" id="0x7f1000d7" />
+    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_slotCount" id="0x7f1000d8" />
+    <public type="plurals" name="premium_guild_subscription_available_numSubscriptions" id="0x7f1000d9" />
+    <public type="plurals" name="premium_guild_subscription_cancel_invoice_subscription_cancelled_subscriptionCount" id="0x7f1000da" />
+    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7f1000db" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7f1000dc" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7f1000dd" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7f1000de" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7f1000df" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7f1000e0" />
+    <public type="plurals" name="premium_guild_subscription_guild_subsription_subtitle_numSubscriptions" id="0x7f1000e1" />
+    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7f1000e2" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_android_quantity" id="0x7f1000e3" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android_quantity" id="0x7f1000e4" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_quantity" id="0x7f1000e5" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_quantity" id="0x7f1000e6" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7f1000e7" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7f1000e8" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7f1000e9" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7f1000ea" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7f1000eb" />
+    <public type="plurals" name="premium_plan_month_tier_2_trial_months" id="0x7f1000ec" />
+    <public type="plurals" name="premium_plan_year_tier_2_trial_months" id="0x7f1000ed" />
+    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7f1000ee" />
+    <public type="plurals" name="premium_subscription_renewal_footer_trial_days" id="0x7f1000ef" />
+    <public type="plurals" name="premium_upsell_feature_free_guild_subscription_numFreeGuildSubscriptions" id="0x7f1000f0" />
+    <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7f1000f1" />
+    <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7f1000f2" />
+    <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7f1000f3" />
+    <public type="plurals" name="reaction_tooltip_3_n_n" id="0x7f1000f4" />
+    <public type="plurals" name="reaction_tooltip_n_n" id="0x7f1000f5" />
+    <public type="plurals" name="roles_list_numRoles" id="0x7f1000f6" />
+    <public type="plurals" name="search_hide_blocked_messages_count" id="0x7f1000f7" />
+    <public type="plurals" name="search_num_results_blocked_not_shown_count" id="0x7f1000f8" />
+    <public type="plurals" name="search_still_indexing_hint_count" id="0x7f1000f9" />
+    <public type="plurals" name="spotify_listen_along_title_host_count" id="0x7f1000fb" />
+    <public type="plurals" name="thread_join_sub_text_count" id="0x7f1000fc" />
+    <public type="plurals" name="total_results_count" id="0x7f1000fd" />
+    <public type="plurals" name="uploading_files_count" id="0x7f1000fe" />
+    <public type="plurals" name="uploading_files_failed_count" id="0x7f1000ff" />
+    <public type="plurals" name="user_activity_timestamp_end_hours" id="0x7f100100" />
+    <public type="plurals" name="user_activity_timestamp_end_minutes" id="0x7f100101" />
+    <public type="plurals" name="user_activity_timestamp_end_seconds" id="0x7f100102" />
+    <public type="plurals" name="user_activity_timestamp_start_hours" id="0x7f100103" />
+    <public type="plurals" name="user_activity_timestamp_start_minutes" id="0x7f100104" />
+    <public type="plurals" name="user_activity_timestamp_start_seconds" id="0x7f100105" />
+    <public type="plurals" name="user_activity_user_playing_for_days_time" id="0x7f100106" />
+    <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7f100107" />
+    <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7f100108" />
+    <public type="plurals" name="user_profile_mutual_friends_count" id="0x7f100109" />
+    <public type="plurals" name="user_profile_mutual_guilds_count" id="0x7f10010a" />
+    <public type="plurals" name="vanity_url_uses_uses" id="0x7f10010b" />
+    <public type="plurals" name="viewing_as_roles_numRoles" id="0x7f10010c" />
+    <public type="plurals" name="voice_call_member_list_title_count" id="0x7f10010d" />
+    <public type="plurals" name="APKTOOL_DUMMY_fa" id="0x7f1000fa" />
     <public type="raw" name="anim_friends_add_nearby_looking" id="0x7f110000" />
     <public type="raw" name="call_calling" id="0x7f110001" />
     <public type="raw" name="call_ringing" id="0x7f110002" />
@@ -11835,5310 +11826,5354 @@
     <public type="string" name="call_feedback_prompt" id="0x7f12038c" />
     <public type="string" name="call_feedback_sheet_title" id="0x7f12038d" />
     <public type="string" name="call_invite_not_friends" id="0x7f12038e" />
-    <public type="string" name="call_unavailable" id="0x7f12038f" />
-    <public type="string" name="camera" id="0x7f120390" />
-    <public type="string" name="camera_disabled_limit_reached" id="0x7f120391" />
-    <public type="string" name="camera_intent_result_error" id="0x7f120392" />
-    <public type="string" name="camera_no_device" id="0x7f120393" />
-    <public type="string" name="camera_not_enabled" id="0x7f120394" />
-    <public type="string" name="camera_off" id="0x7f120395" />
-    <public type="string" name="camera_on" id="0x7f120396" />
-    <public type="string" name="camera_permission_denied" id="0x7f120397" />
-    <public type="string" name="camera_preview_menu_item" id="0x7f120398" />
-    <public type="string" name="camera_preview_modal_cta" id="0x7f120399" />
-    <public type="string" name="camera_preview_modal_header" id="0x7f12039a" />
-    <public type="string" name="camera_preview_modal_subtitle" id="0x7f12039b" />
-    <public type="string" name="camera_switch" id="0x7f12039c" />
-    <public type="string" name="camera_switched" id="0x7f12039d" />
-    <public type="string" name="camera_unavailable" id="0x7f12039e" />
-    <public type="string" name="camera_unknown_error" id="0x7f12039f" />
-    <public type="string" name="cameraview_default_autofocus_marker" id="0x7f1203a0" />
-    <public type="string" name="cameraview_filter_autofix" id="0x7f1203a1" />
-    <public type="string" name="cameraview_filter_black_and_white" id="0x7f1203a2" />
-    <public type="string" name="cameraview_filter_brightness" id="0x7f1203a3" />
-    <public type="string" name="cameraview_filter_contrast" id="0x7f1203a4" />
-    <public type="string" name="cameraview_filter_cross_process" id="0x7f1203a5" />
-    <public type="string" name="cameraview_filter_documentary" id="0x7f1203a6" />
-    <public type="string" name="cameraview_filter_duotone" id="0x7f1203a7" />
-    <public type="string" name="cameraview_filter_fill_light" id="0x7f1203a8" />
-    <public type="string" name="cameraview_filter_gamma" id="0x7f1203a9" />
-    <public type="string" name="cameraview_filter_grain" id="0x7f1203aa" />
-    <public type="string" name="cameraview_filter_grayscale" id="0x7f1203ab" />
-    <public type="string" name="cameraview_filter_hue" id="0x7f1203ac" />
-    <public type="string" name="cameraview_filter_invert_colors" id="0x7f1203ad" />
-    <public type="string" name="cameraview_filter_lomoish" id="0x7f1203ae" />
-    <public type="string" name="cameraview_filter_none" id="0x7f1203af" />
-    <public type="string" name="cameraview_filter_posterize" id="0x7f1203b0" />
-    <public type="string" name="cameraview_filter_saturation" id="0x7f1203b1" />
-    <public type="string" name="cameraview_filter_sepia" id="0x7f1203b2" />
-    <public type="string" name="cameraview_filter_sharpness" id="0x7f1203b3" />
-    <public type="string" name="cameraview_filter_temperature" id="0x7f1203b4" />
-    <public type="string" name="cameraview_filter_tint" id="0x7f1203b5" />
-    <public type="string" name="cameraview_filter_vignette" id="0x7f1203b6" />
-    <public type="string" name="cancel" id="0x7f1203b7" />
-    <public type="string" name="cannot_attach_files" id="0x7f1203b8" />
-    <public type="string" name="cannot_delete_channel" id="0x7f1203b9" />
-    <public type="string" name="cannot_deny_missing_permission" id="0x7f1203ba" />
-    <public type="string" name="cannot_deny_self_simple" id="0x7f1203bb" />
-    <public type="string" name="cannot_deny_singular_permission" id="0x7f1203bc" />
-    <public type="string" name="cannot_manage_higher_rank" id="0x7f1203bd" />
-    <public type="string" name="cannot_manage_is_owner" id="0x7f1203be" />
-    <public type="string" name="cannot_manage_same_rank" id="0x7f1203bf" />
-    <public type="string" name="captcha" id="0x7f1203c0" />
-    <public type="string" name="captcha_failed" id="0x7f1203c1" />
-    <public type="string" name="captcha_failed_play_services" id="0x7f1203c2" />
-    <public type="string" name="captcha_failed_unsupported" id="0x7f1203c3" />
-    <public type="string" name="captcha_issues" id="0x7f1203c4" />
-    <public type="string" name="captcha_open_browser" id="0x7f1203c5" />
-    <public type="string" name="captcha_problems" id="0x7f1203c6" />
-    <public type="string" name="captcha_problems_info" id="0x7f1203c7" />
-    <public type="string" name="categories" id="0x7f1203c8" />
-    <public type="string" name="category" id="0x7f1203c9" />
-    <public type="string" name="category_a11y_label" id="0x7f1203ca" />
-    <public type="string" name="category_a11y_label_with_expanded_state" id="0x7f1203cb" />
-    <public type="string" name="category_has_been_deleted" id="0x7f1203cc" />
-    <public type="string" name="category_name" id="0x7f1203cd" />
-    <public type="string" name="category_settings" id="0x7f1203ce" />
-    <public type="string" name="category_settings_have_been_updated" id="0x7f1203cf" />
-    <public type="string" name="certified" id="0x7f1203d0" />
-    <public type="string" name="certified_device_recommendation_audio_input_and_output_body" id="0x7f1203d1" />
-    <public type="string" name="certified_device_recommendation_audio_input_body" id="0x7f1203d2" />
-    <public type="string" name="certified_device_recommendation_audio_output_body" id="0x7f1203d3" />
-    <public type="string" name="certified_device_recommendation_title" id="0x7f1203d4" />
-    <public type="string" name="change" id="0x7f1203d5" />
-    <public type="string" name="change_avatar" id="0x7f1203d6" />
-    <public type="string" name="change_banner" id="0x7f1203d7" />
-    <public type="string" name="change_camera" id="0x7f1203d8" />
-    <public type="string" name="change_category" id="0x7f1203d9" />
-    <public type="string" name="change_email" id="0x7f1203da" />
-    <public type="string" name="change_email_short" id="0x7f1203db" />
-    <public type="string" name="change_icon" id="0x7f1203dc" />
-    <public type="string" name="change_log" id="0x7f1203dd" />
-    <public type="string" name="change_log_md_body" id="0x7f1203de" />
-    <public type="string" name="change_log_md_date" id="0x7f1203df" />
-    <public type="string" name="change_log_md_locale" id="0x7f1203e0" />
-    <public type="string" name="change_log_md_revision" id="0x7f1203e1" />
-    <public type="string" name="change_log_md_video" id="0x7f1203e2" />
-    <public type="string" name="change_nickname" id="0x7f1203e3" />
-    <public type="string" name="change_nickname_description" id="0x7f1203e4" />
-    <public type="string" name="change_nickname_warning" id="0x7f1203e5" />
-    <public type="string" name="change_password" id="0x7f1203e6" />
-    <public type="string" name="change_password_link" id="0x7f1203e7" />
-    <public type="string" name="change_phone_number" id="0x7f1203e8" />
-    <public type="string" name="change_splash" id="0x7f1203e9" />
-    <public type="string" name="change_vanity_url_error" id="0x7f1203ea" />
-    <public type="string" name="changelog_special_cta" id="0x7f1203eb" />
-    <public type="string" name="changelog_special_cta_body" id="0x7f1203ec" />
-    <public type="string" name="changelog_special_cta_desktop" id="0x7f1203ed" />
-    <public type="string" name="changelog_special_cta_desktop_fallback" id="0x7f1203ee" />
-    <public type="string" name="changelog_special_cta_title" id="0x7f1203ef" />
-    <public type="string" name="changelog_special_share_discord" id="0x7f1203f0" />
-    <public type="string" name="channel" id="0x7f1203f1" />
-    <public type="string" name="channel_a11y_label" id="0x7f1203f2" />
-    <public type="string" name="channel_actions_menu_label" id="0x7f1203f3" />
-    <public type="string" name="channel_call_current_speaker" id="0x7f1203f4" />
-    <public type="string" name="channel_call_members_popout_header" id="0x7f1203f5" />
-    <public type="string" name="channel_call_overflow_menu_label" id="0x7f1203f6" />
-    <public type="string" name="channel_call_participants" id="0x7f1203f7" />
-    <public type="string" name="channel_has_been_deleted" id="0x7f1203f8" />
-    <public type="string" name="channel_header_bar_a11y_label" id="0x7f1203f9" />
-    <public type="string" name="channel_list_show_all_threads" id="0x7f1203fa" />
-    <public type="string" name="channel_locked" id="0x7f1203fb" />
-    <public type="string" name="channel_locked_short" id="0x7f1203fc" />
-    <public type="string" name="channel_locked_to_category" id="0x7f1203fd" />
-    <public type="string" name="channel_members_a11y_label" id="0x7f1203fe" />
-    <public type="string" name="channel_mention_badge_a11y_label" id="0x7f1203ff" />
-    <public type="string" name="channel_message_a11y_label" id="0x7f120400" />
-    <public type="string" name="channel_message_a11y_role_description" id="0x7f120401" />
-    <public type="string" name="channel_messages_a11y_description" id="0x7f120402" />
-    <public type="string" name="channel_messages_a11y_label" id="0x7f120403" />
-    <public type="string" name="channel_messages_a11y_role_description" id="0x7f120404" />
-    <public type="string" name="channel_mute_label" id="0x7f120405" />
-    <public type="string" name="channel_mute_tooltip" id="0x7f120406" />
-    <public type="string" name="channel_or_category" id="0x7f120407" />
-    <public type="string" name="channel_order_updated" id="0x7f120408" />
-    <public type="string" name="channel_permissions" id="0x7f120409" />
-    <public type="string" name="channel_select" id="0x7f12040a" />
-    <public type="string" name="channel_settings" id="0x7f12040b" />
-    <public type="string" name="channel_settings_have_been_updated" id="0x7f12040c" />
-    <public type="string" name="channel_slowmode_cooldown" id="0x7f12040d" />
-    <public type="string" name="channel_slowmode_desc" id="0x7f12040e" />
-    <public type="string" name="channel_slowmode_desc_hours" id="0x7f12040f" />
-    <public type="string" name="channel_slowmode_desc_immune" id="0x7f120410" />
-    <public type="string" name="channel_slowmode_desc_minutes" id="0x7f120411" />
-    <public type="string" name="channel_slowmode_desc_short" id="0x7f120412" />
-    <public type="string" name="channel_step_subtitle" id="0x7f120413" />
-    <public type="string" name="channel_step_title" id="0x7f120414" />
-    <public type="string" name="channel_topic_empty" id="0x7f120415" />
-    <public type="string" name="channel_type" id="0x7f120416" />
-    <public type="string" name="channel_unmute_tooltip" id="0x7f120417" />
-    <public type="string" name="channels" id="0x7f120418" />
-    <public type="string" name="channels_unavailable_body" id="0x7f120419" />
-    <public type="string" name="channels_unavailable_title" id="0x7f12041a" />
-    <public type="string" name="character_count_at_limit" id="0x7f12041b" />
-    <public type="string" name="character_count_close_to_limit" id="0x7f12041c" />
-    <public type="string" name="character_count_over_limit" id="0x7f12041d" />
-    <public type="string" name="character_counter_content_description" id="0x7f12041e" />
-    <public type="string" name="character_counter_overflowed_content_description" id="0x7f12041f" />
-    <public type="string" name="character_counter_pattern" id="0x7f120420" />
-    <public type="string" name="chat" id="0x7f120421" />
-    <public type="string" name="chat_attach_invite_to_listen" id="0x7f120422" />
-    <public type="string" name="chat_attach_invite_to_play_game" id="0x7f120423" />
-    <public type="string" name="chat_attach_invite_to_watch" id="0x7f120424" />
-    <public type="string" name="chat_attach_upload_a_file" id="0x7f120425" />
-    <public type="string" name="chat_attach_upload_or_invite" id="0x7f120426" />
-    <public type="string" name="chat_behavior" id="0x7f120427" />
-    <public type="string" name="checking_for_updates" id="0x7f120428" />
-    <public type="string" name="chip_text" id="0x7f120429" />
-    <public type="string" name="choose_an_application" id="0x7f12042a" />
-    <public type="string" name="claim_account" id="0x7f12042b" />
-    <public type="string" name="claim_account_body" id="0x7f12042c" />
-    <public type="string" name="claim_account_body_short" id="0x7f12042d" />
-    <public type="string" name="claim_account_email_to" id="0x7f12042e" />
-    <public type="string" name="claim_account_get_app" id="0x7f12042f" />
-    <public type="string" name="claim_account_promote_app_2020_06" id="0x7f120430" />
-    <public type="string" name="claim_account_required_body" id="0x7f120431" />
-    <public type="string" name="claim_account_required_email_to" id="0x7f120432" />
-    <public type="string" name="claim_account_title" id="0x7f120433" />
-    <public type="string" name="clear_attachments" id="0x7f120434" />
-    <public type="string" name="clear_role_permissions" id="0x7f120435" />
-    <public type="string" name="clear_text_end_icon_content_description" id="0x7f120436" />
-    <public type="string" name="clone_channel" id="0x7f120437" />
-    <public type="string" name="clone_channel_help" id="0x7f120438" />
-    <public type="string" name="clone_server_button_cta" id="0x7f120439" />
-    <public type="string" name="close" id="0x7f12043a" />
-    <public type="string" name="close_action_sheet" id="0x7f12043b" />
-    <public type="string" name="close_dm" id="0x7f12043c" />
-    <public type="string" name="close_drawer" id="0x7f12043d" />
-    <public type="string" name="close_stream" id="0x7f12043e" />
-    <public type="string" name="close_window" id="0x7f12043f" />
-    <public type="string" name="cloud_sync_icon_tooltip_done" id="0x7f120440" />
-    <public type="string" name="cloud_sync_icon_tooltip_planning" id="0x7f120441" />
-    <public type="string" name="cloud_sync_icon_tooltip_preparing" id="0x7f120442" />
-    <public type="string" name="cloud_sync_icon_tooltip_pulling" id="0x7f120443" />
-    <public type="string" name="cloud_sync_icon_tooltip_pushing" id="0x7f120444" />
-    <public type="string" name="cloud_sync_icon_tooltip_supported" id="0x7f120445" />
-    <public type="string" name="cloud_sync_modal_conflict_choice_download" id="0x7f120446" />
-    <public type="string" name="cloud_sync_modal_conflict_choice_upload" id="0x7f120447" />
-    <public type="string" name="cloud_sync_modal_conflict_description" id="0x7f120448" />
-    <public type="string" name="cloud_sync_modal_conflict_header" id="0x7f120449" />
-    <public type="string" name="cloud_sync_modal_conflict_last_modified" id="0x7f12044a" />
-    <public type="string" name="cloud_sync_modal_error_description" id="0x7f12044b" />
-    <public type="string" name="cloud_sync_modal_error_header" id="0x7f12044c" />
-    <public type="string" name="cloud_sync_modal_or" id="0x7f12044d" />
-    <public type="string" name="collapse" id="0x7f12044e" />
-    <public type="string" name="collapse_category" id="0x7f12044f" />
-    <public type="string" name="collapsed" id="0x7f120450" />
-    <public type="string" name="color_picker_custom" id="0x7f120451" />
-    <public type="string" name="color_picker_presets" id="0x7f120452" />
-    <public type="string" name="color_picker_title" id="0x7f120453" />
-    <public type="string" name="color_picker_transparency" id="0x7f120454" />
-    <public type="string" name="com.crashlytics.android.build_id" id="0x7f120455" />
-    <public type="string" name="coming_soon" id="0x7f120456" />
-    <public type="string" name="command_giphy_description" id="0x7f120457" />
-    <public type="string" name="command_me_description" id="0x7f120458" />
-    <public type="string" name="command_nick_description" id="0x7f120459" />
-    <public type="string" name="command_nick_failure" id="0x7f12045a" />
-    <public type="string" name="command_nick_failure_permission" id="0x7f12045b" />
-    <public type="string" name="command_nick_reset" id="0x7f12045c" />
-    <public type="string" name="command_nick_success" id="0x7f12045d" />
-    <public type="string" name="command_shrug_description" id="0x7f12045e" />
-    <public type="string" name="command_spoiler_description" id="0x7f12045f" />
-    <public type="string" name="command_tableflip_description" id="0x7f120460" />
-    <public type="string" name="command_tableunflip_description" id="0x7f120461" />
-    <public type="string" name="command_tts_description" id="0x7f120462" />
-    <public type="string" name="commands" id="0x7f120463" />
-    <public type="string" name="commands_matching" id="0x7f120464" />
-    <public type="string" name="common_google_play_services_enable_button" id="0x7f120465" />
-    <public type="string" name="common_google_play_services_enable_text" id="0x7f120466" />
-    <public type="string" name="common_google_play_services_enable_title" id="0x7f120467" />
-    <public type="string" name="common_google_play_services_install_button" id="0x7f120468" />
-    <public type="string" name="common_google_play_services_install_text" id="0x7f120469" />
-    <public type="string" name="common_google_play_services_install_title" id="0x7f12046a" />
-    <public type="string" name="common_google_play_services_notification_channel_name" id="0x7f12046b" />
-    <public type="string" name="common_google_play_services_notification_ticker" id="0x7f12046c" />
-    <public type="string" name="common_google_play_services_unknown_issue" id="0x7f12046d" />
-    <public type="string" name="common_google_play_services_unsupported_text" id="0x7f12046e" />
-    <public type="string" name="common_google_play_services_update_button" id="0x7f12046f" />
-    <public type="string" name="common_google_play_services_update_text" id="0x7f120470" />
-    <public type="string" name="common_google_play_services_update_title" id="0x7f120471" />
-    <public type="string" name="common_google_play_services_updating_text" id="0x7f120472" />
-    <public type="string" name="common_google_play_services_wear_update_text" id="0x7f120473" />
-    <public type="string" name="common_open_on_phone" id="0x7f120474" />
-    <public type="string" name="common_signin_button_text" id="0x7f120475" />
-    <public type="string" name="common_signin_button_text_long" id="0x7f120476" />
-    <public type="string" name="communicators_info" id="0x7f120477" />
-    <public type="string" name="community" id="0x7f120478" />
-    <public type="string" name="community_policy_help" id="0x7f120479" />
-    <public type="string" name="community_policy_title" id="0x7f12047a" />
-    <public type="string" name="compact_mode" id="0x7f12047b" />
-    <public type="string" name="completed" id="0x7f12047c" />
-    <public type="string" name="configure" id="0x7f12047d" />
-    <public type="string" name="confirm" id="0x7f12047e" />
-    <public type="string" name="confirm_channel_drag_title" id="0x7f12047f" />
-    <public type="string" name="confirm_disable_silence_body" id="0x7f120480" />
-    <public type="string" name="confirm_disable_silence_dont_show" id="0x7f120481" />
-    <public type="string" name="confirm_disable_silence_title" id="0x7f120482" />
-    <public type="string" name="confirm_qr_check_your_phone" id="0x7f120483" />
-    <public type="string" name="confirm_qr_description" id="0x7f120484" />
-    <public type="string" name="confirm_qr_keep_me_signed_in" id="0x7f120485" />
-    <public type="string" name="confirm_qr_login_on_computer" id="0x7f120486" />
-    <public type="string" name="confirm_user_block_body" id="0x7f120487" />
-    <public type="string" name="confirm_user_block_title" id="0x7f120488" />
-    <public type="string" name="connect" id="0x7f120489" />
-    <public type="string" name="connect_account_description" id="0x7f12048a" />
-    <public type="string" name="connect_account_title" id="0x7f12048b" />
-    <public type="string" name="connect_to_video" id="0x7f12048c" />
-    <public type="string" name="connect_to_voice" id="0x7f12048d" />
-    <public type="string" name="connect_voice_only" id="0x7f12048e" />
-    <public type="string" name="connected_account_revoked" id="0x7f12048f" />
-    <public type="string" name="connected_account_verify_failure" id="0x7f120490" />
-    <public type="string" name="connected_account_verify_success" id="0x7f120491" />
-    <public type="string" name="connected_account_verifying" id="0x7f120492" />
-    <public type="string" name="connected_accounts" id="0x7f120493" />
-    <public type="string" name="connected_accounts_none" id="0x7f120494" />
-    <public type="string" name="connected_accounts_none_title" id="0x7f120495" />
-    <public type="string" name="connected_device_detected_cancel_button" id="0x7f120496" />
-    <public type="string" name="connected_device_detected_confirm_button" id="0x7f120497" />
-    <public type="string" name="connected_device_detected_input_and_output_body" id="0x7f120498" />
-    <public type="string" name="connected_device_detected_input_body" id="0x7f120499" />
-    <public type="string" name="connected_device_detected_option_input" id="0x7f12049a" />
-    <public type="string" name="connected_device_detected_option_input_and_output" id="0x7f12049b" />
-    <public type="string" name="connected_device_detected_option_output" id="0x7f12049c" />
-    <public type="string" name="connected_device_detected_output_body" id="0x7f12049d" />
-    <public type="string" name="connected_device_detected_title" id="0x7f12049e" />
-    <public type="string" name="connected_on_another_client" id="0x7f12049f" />
-    <public type="string" name="connecting" id="0x7f1204a0" />
-    <public type="string" name="connecting_problems_cta" id="0x7f1204a1" />
-    <public type="string" name="connection_enter_code" id="0x7f1204a2" />
-    <public type="string" name="connection_invalid_pin" id="0x7f1204a3" />
-    <public type="string" name="connection_login_with" id="0x7f1204a4" />
-    <public type="string" name="connection_problems_body" id="0x7f1204a5" />
-    <public type="string" name="connection_status_authenticating" id="0x7f1204a6" />
-    <public type="string" name="connection_status_awaiting_endpoint" id="0x7f1204a7" />
-    <public type="string" name="connection_status_connected" id="0x7f1204a8" />
-    <public type="string" name="connection_status_connecting" id="0x7f1204a9" />
-    <public type="string" name="connection_status_disconnected" id="0x7f1204aa" />
-    <public type="string" name="connection_status_ice_checking" id="0x7f1204ab" />
-    <public type="string" name="connection_status_no_route" id="0x7f1204ac" />
-    <public type="string" name="connection_status_rtc_connecting" id="0x7f1204ad" />
-    <public type="string" name="connection_status_rtc_disconnected" id="0x7f1204ae" />
-    <public type="string" name="connection_status_stream_connected" id="0x7f1204af" />
-    <public type="string" name="connection_status_video_connected" id="0x7f1204b0" />
-    <public type="string" name="connection_status_voice_connected" id="0x7f1204b1" />
-    <public type="string" name="connection_verified" id="0x7f1204b2" />
-    <public type="string" name="connections" id="0x7f1204b3" />
-    <public type="string" name="contact_sync_cta_button_subtitle" id="0x7f1204b4" />
-    <public type="string" name="contact_sync_cta_button_title" id="0x7f1204b5" />
-    <public type="string" name="contact_sync_enter_phone_number_description" id="0x7f1204b6" />
-    <public type="string" name="contact_sync_enter_phone_number_title" id="0x7f1204b7" />
-    <public type="string" name="contact_sync_failed_alert_message" id="0x7f1204b8" />
-    <public type="string" name="contact_sync_failed_alert_title" id="0x7f1204b9" />
-    <public type="string" name="contact_sync_failed_no_phone_alert_message" id="0x7f1204ba" />
-    <public type="string" name="contact_sync_failed_no_phone_alert_title" id="0x7f1204bb" />
-    <public type="string" name="contact_sync_landing_screen_button" id="0x7f1204bc" />
-    <public type="string" name="contact_sync_landing_screen_description" id="0x7f1204bd" />
-    <public type="string" name="contact_sync_landing_screen_title" id="0x7f1204be" />
-    <public type="string" name="contact_sync_no_results_description" id="0x7f1204bf" />
-    <public type="string" name="contact_sync_no_results_got_it" id="0x7f1204c0" />
-    <public type="string" name="contact_sync_no_results_title" id="0x7f1204c1" />
-    <public type="string" name="contact_sync_permission_denied_alert_message" id="0x7f1204c2" />
-    <public type="string" name="contact_sync_permission_denied_alert_title" id="0x7f1204c3" />
-    <public type="string" name="contact_sync_submit_phone_number" id="0x7f1204c4" />
-    <public type="string" name="contact_sync_syncing_description" id="0x7f1204c5" />
-    <public type="string" name="contact_sync_syncing_title" id="0x7f1204c6" />
-    <public type="string" name="contact_sync_toggle_label" id="0x7f1204c7" />
-    <public type="string" name="contact_sync_toggle_sub_label" id="0x7f1204c8" />
-    <public type="string" name="contact_sync_we_found_your_friends_body" id="0x7f1204c9" />
-    <public type="string" name="contact_sync_we_found_your_friends_title" id="0x7f1204ca" />
-    <public type="string" name="content_matching" id="0x7f1204cb" />
-    <public type="string" name="context_menu_hint" id="0x7f1204cc" />
-    <public type="string" name="continue_to_webapp" id="0x7f1204cd" />
-    <public type="string" name="control_volume" id="0x7f1204ce" />
-    <public type="string" name="convert_emoticons" id="0x7f1204cf" />
-    <public type="string" name="convert_emoticons_help" id="0x7f1204d0" />
-    <public type="string" name="copied" id="0x7f1204d1" />
-    <public type="string" name="copied_text" id="0x7f1204d2" />
-    <public type="string" name="copy" id="0x7f1204d3" />
-    <public type="string" name="copy_channel_topic" id="0x7f1204d4" />
-    <public type="string" name="copy_code" id="0x7f1204d5" />
-    <public type="string" name="copy_id" id="0x7f1204d6" />
-    <public type="string" name="copy_image_preview" id="0x7f1204d7" />
-    <public type="string" name="copy_link" id="0x7f1204d8" />
-    <public type="string" name="copy_media_link" id="0x7f1204d9" />
-    <public type="string" name="copy_message_link" id="0x7f1204da" />
-    <public type="string" name="copy_owner_id" id="0x7f1204db" />
-    <public type="string" name="copy_text" id="0x7f1204dc" />
-    <public type="string" name="copy_toast_msg" id="0x7f1204dd" />
-    <public type="string" name="copy_username" id="0x7f1204de" />
-    <public type="string" name="country_codes" id="0x7f1204df" />
-    <public type="string" name="country_no_results" id="0x7f1204e0" />
-    <public type="string" name="covid_new_user_survey_button" id="0x7f1204e1" />
-    <public type="string" name="covid_new_user_survey_prompt" id="0x7f1204e2" />
-    <public type="string" name="cozy_mode" id="0x7f1204e3" />
-    <public type="string" name="cpv_custom" id="0x7f1204e4" />
-    <public type="string" name="cpv_default_title" id="0x7f1204e5" />
-    <public type="string" name="cpv_presets" id="0x7f1204e6" />
-    <public type="string" name="cpv_select" id="0x7f1204e7" />
-    <public type="string" name="cpv_transparency" id="0x7f1204e8" />
-    <public type="string" name="crash_app_version" id="0x7f1204e9" />
-    <public type="string" name="crash_details" id="0x7f1204ea" />
-    <public type="string" name="crash_device" id="0x7f1204eb" />
-    <public type="string" name="crash_device_version" id="0x7f1204ec" />
-    <public type="string" name="crash_disclaimer" id="0x7f1204ed" />
-    <public type="string" name="crash_source" id="0x7f1204ee" />
-    <public type="string" name="crash_testers_invite" id="0x7f1204ef" />
-    <public type="string" name="crash_timestamp" id="0x7f1204f0" />
-    <public type="string" name="crash_unexpected" id="0x7f1204f1" />
-    <public type="string" name="create" id="0x7f1204f2" />
-    <public type="string" name="create_category" id="0x7f1204f3" />
-    <public type="string" name="create_channel" id="0x7f1204f4" />
-    <public type="string" name="create_channel_error" id="0x7f1204f5" />
-    <public type="string" name="create_channel_in_category" id="0x7f1204f6" />
-    <public type="string" name="create_dm" id="0x7f1204f7" />
-    <public type="string" name="create_group_dm" id="0x7f1204f8" />
-    <public type="string" name="create_guild_description" id="0x7f1204f9" />
-    <public type="string" name="create_guild_with_templates_title" id="0x7f1204fa" />
-    <public type="string" name="create_instant_invite" id="0x7f1204fb" />
-    <public type="string" name="create_link" id="0x7f1204fc" />
-    <public type="string" name="create_news_channel" id="0x7f1204fd" />
-    <public type="string" name="create_or_join_modal_header" id="0x7f1204fe" />
-    <public type="string" name="create_server_button_action" id="0x7f1204ff" />
-    <public type="string" name="create_server_button_body" id="0x7f120500" />
-    <public type="string" name="create_server_button_cta" id="0x7f120501" />
-    <public type="string" name="create_server_button_cta_mobile" id="0x7f120502" />
-    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7f120503" />
-    <public type="string" name="create_server_default_server_name_format" id="0x7f120504" />
-    <public type="string" name="create_server_description_mobile" id="0x7f120505" />
-    <public type="string" name="create_server_description_mobile_refresh" id="0x7f120506" />
-    <public type="string" name="create_server_description_refresh" id="0x7f120507" />
-    <public type="string" name="create_server_guidelines" id="0x7f120508" />
-    <public type="string" name="create_server_title" id="0x7f120509" />
-    <public type="string" name="create_server_title_mobile_refresh" id="0x7f12050a" />
-    <public type="string" name="create_store_channel" id="0x7f12050b" />
-    <public type="string" name="create_store_channel_application" id="0x7f12050c" />
-    <public type="string" name="create_store_channel_beta_note" id="0x7f12050d" />
-    <public type="string" name="create_store_channel_beta_title" id="0x7f12050e" />
-    <public type="string" name="create_store_channel_branch" id="0x7f12050f" />
-    <public type="string" name="create_store_channel_no_skus" id="0x7f120510" />
-    <public type="string" name="create_store_channel_no_skus_error" id="0x7f120511" />
-    <public type="string" name="create_store_channel_select_application" id="0x7f120512" />
-    <public type="string" name="create_store_channel_select_branch" id="0x7f120513" />
-    <public type="string" name="create_store_channel_select_sku" id="0x7f120514" />
-    <public type="string" name="create_store_channel_sku" id="0x7f120515" />
-    <public type="string" name="create_text_channel" id="0x7f120516" />
-    <public type="string" name="create_voice_channel" id="0x7f120517" />
-    <public type="string" name="credit_card_cvc" id="0x7f120518" />
-    <public type="string" name="credit_card_error_expiration" id="0x7f120519" />
-    <public type="string" name="credit_card_error_number" id="0x7f12051a" />
-    <public type="string" name="credit_card_error_required" id="0x7f12051b" />
-    <public type="string" name="credit_card_error_security_code" id="0x7f12051c" />
-    <public type="string" name="credit_card_expiration_date" id="0x7f12051d" />
-    <public type="string" name="credit_card_name" id="0x7f12051e" />
-    <public type="string" name="credit_card_name_on_card" id="0x7f12051f" />
-    <public type="string" name="credit_card_number" id="0x7f120520" />
-    <public type="string" name="credit_card_security_code" id="0x7f120521" />
-    <public type="string" name="crop" id="0x7f120522" />
-    <public type="string" name="cs" id="0x7f120523" />
-    <public type="string" name="custom_color" id="0x7f120524" />
-    <public type="string" name="custom_status" id="0x7f120525" />
-    <public type="string" name="custom_status_clear_after" id="0x7f120526" />
-    <public type="string" name="custom_status_clear_custom_status" id="0x7f120527" />
-    <public type="string" name="custom_status_clear_in_hours" id="0x7f120528" />
-    <public type="string" name="custom_status_clear_in_minutes" id="0x7f120529" />
-    <public type="string" name="custom_status_clear_tomorrow" id="0x7f12052a" />
-    <public type="string" name="custom_status_dont_clear" id="0x7f12052b" />
-    <public type="string" name="custom_status_edit_custom_status_placeholder" id="0x7f12052c" />
-    <public type="string" name="custom_status_hours" id="0x7f12052d" />
-    <public type="string" name="custom_status_minutes" id="0x7f12052e" />
-    <public type="string" name="custom_status_modal_body" id="0x7f12052f" />
-    <public type="string" name="custom_status_modal_placeholder" id="0x7f120530" />
-    <public type="string" name="custom_status_set_custom_status" id="0x7f120531" />
-    <public type="string" name="custom_status_today" id="0x7f120532" />
-    <public type="string" name="custom_status_update_success" id="0x7f120533" />
-    <public type="string" name="custom_tabs_mobile_body" id="0x7f120534" />
-    <public type="string" name="custom_tabs_mobile_header" id="0x7f120535" />
-    <public type="string" name="customize_group" id="0x7f120536" />
-    <public type="string" name="cut" id="0x7f120537" />
-    <public type="string" name="da" id="0x7f120538" />
-    <public type="string" name="dark_blue" id="0x7f120539" />
-    <public type="string" name="dark_grey" id="0x7f12053a" />
-    <public type="string" name="dark_purple" id="0x7f12053b" />
-    <public type="string" name="dark_teal" id="0x7f12053c" />
-    <public type="string" name="data_download_requested_status_note" id="0x7f12053d" />
-    <public type="string" name="data_privacy_controls" id="0x7f12053e" />
-    <public type="string" name="data_privacy_controls_allow_accessibility_detection_note" id="0x7f12053f" />
-    <public type="string" name="data_privacy_controls_allow_accessibility_detection_title" id="0x7f120540" />
-    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7f120541" />
-    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7f120542" />
-    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7f120543" />
-    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7f120544" />
-    <public type="string" name="data_privacy_controls_personalization_title" id="0x7f120545" />
-    <public type="string" name="data_privacy_controls_request_data_download" id="0x7f120546" />
-    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7f120547" />
-    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7f120548" />
-    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7f120549" />
-    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7f12054a" />
-    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7f12054b" />
-    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7f12054c" />
-    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7f12054d" />
-    <public type="string" name="data_privacy_controls_request_data_note" id="0x7f12054e" />
-    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7f12054f" />
-    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7f120550" />
-    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7f120551" />
-    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7f120552" />
-    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7f120553" />
-    <public type="string" name="data_privacy_rate_limit_title" id="0x7f120554" />
-    <public type="string" name="data_privacy_update_consents_failed" id="0x7f120555" />
-    <public type="string" name="date" id="0x7f120556" />
-    <public type="string" name="de" id="0x7f120557" />
-    <public type="string" name="deafen" id="0x7f120558" />
-    <public type="string" name="deafen_members" id="0x7f120559" />
-    <public type="string" name="deauthorize" id="0x7f12055a" />
-    <public type="string" name="deauthorize_app" id="0x7f12055b" />
-    <public type="string" name="deb" id="0x7f12055c" />
-    <public type="string" name="debug" id="0x7f12055d" />
-    <public type="string" name="decline" id="0x7f12055e" />
-    <public type="string" name="default_app_description" id="0x7f12055f" />
-    <public type="string" name="default_failure_to_perform_action_message" id="0x7f120560" />
-    <public type="string" name="default_input_placeholder" id="0x7f120561" />
-    <public type="string" name="default_web_client_id" id="0x7f120562" />
-    <public type="string" name="delete" id="0x7f120563" />
-    <public type="string" name="delete_account" id="0x7f120564" />
-    <public type="string" name="delete_account_body" id="0x7f120565" />
-    <public type="string" name="delete_account_error" id="0x7f120566" />
-    <public type="string" name="delete_account_transfer_ownership" id="0x7f120567" />
-    <public type="string" name="delete_account_transfer_ownership_body" id="0x7f120568" />
-    <public type="string" name="delete_app_confirm_msg" id="0x7f120569" />
-    <public type="string" name="delete_category" id="0x7f12056a" />
-    <public type="string" name="delete_channel" id="0x7f12056b" />
-    <public type="string" name="delete_channel_body" id="0x7f12056c" />
-    <public type="string" name="delete_followed_news_body" id="0x7f12056d" />
-    <public type="string" name="delete_message" id="0x7f12056e" />
-    <public type="string" name="delete_message_body" id="0x7f12056f" />
-    <public type="string" name="delete_message_context_menu_hint" id="0x7f120570" />
-    <public type="string" name="delete_message_history_option_24hr" id="0x7f120571" />
-    <public type="string" name="delete_message_history_option_7d" id="0x7f120572" />
-    <public type="string" name="delete_message_history_option_none" id="0x7f120573" />
-    <public type="string" name="delete_message_report" id="0x7f120574" />
-    <public type="string" name="delete_message_title" id="0x7f120575" />
-    <public type="string" name="delete_role" id="0x7f120576" />
-    <public type="string" name="delete_role_mobile" id="0x7f120577" />
-    <public type="string" name="delete_rules_channel_body" id="0x7f120578" />
-    <public type="string" name="delete_server" id="0x7f120579" />
-    <public type="string" name="delete_server_body" id="0x7f12057a" />
-    <public type="string" name="delete_server_enter_name" id="0x7f12057b" />
-    <public type="string" name="delete_server_incorrect_name" id="0x7f12057c" />
-    <public type="string" name="delete_server_title" id="0x7f12057d" />
-    <public type="string" name="delete_updates_channel_body" id="0x7f12057e" />
-    <public type="string" name="description" id="0x7f12057f" />
-    <public type="string" name="designate_other_channel" id="0x7f120580" />
-    <public type="string" name="desktop_app" id="0x7f120581" />
-    <public type="string" name="desktop_notifications_enable" id="0x7f120582" />
-    <public type="string" name="desktop_notifications_enable_body" id="0x7f120583" />
-    <public type="string" name="detect_platform_accounts" id="0x7f120584" />
-    <public type="string" name="developer_application_test_mode" id="0x7f120585" />
-    <public type="string" name="developer_application_test_mode_activate" id="0x7f120586" />
-    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7f120587" />
-    <public type="string" name="developer_application_test_mode_clear" id="0x7f120588" />
-    <public type="string" name="developer_application_test_mode_invalid" id="0x7f120589" />
-    <public type="string" name="developer_application_test_mode_modal_body" id="0x7f12058a" />
-    <public type="string" name="developer_application_test_mode_modal_header" id="0x7f12058b" />
-    <public type="string" name="developer_application_test_mode_note" id="0x7f12058c" />
-    <public type="string" name="developer_application_test_mode_placeholder" id="0x7f12058d" />
-    <public type="string" name="developer_mode" id="0x7f12058e" />
-    <public type="string" name="developer_mode_help_text" id="0x7f12058f" />
-    <public type="string" name="developer_options" id="0x7f120590" />
-    <public type="string" name="device_settings" id="0x7f120591" />
-    <public type="string" name="direct_message" id="0x7f120592" />
-    <public type="string" name="direct_message_a11y_label" id="0x7f120593" />
-    <public type="string" name="direct_message_a11y_label_with_unreads" id="0x7f120594" />
-    <public type="string" name="direct_messages" id="0x7f120595" />
-    <public type="string" name="disable" id="0x7f120596" />
-    <public type="string" name="disable_account" id="0x7f120597" />
-    <public type="string" name="disable_account_body" id="0x7f120598" />
-    <public type="string" name="disable_email_notifications" id="0x7f120599" />
-    <public type="string" name="disable_integration_title" id="0x7f12059a" />
-    <public type="string" name="disable_integration_twitch_body" id="0x7f12059b" />
-    <public type="string" name="disable_integration_youtube_body" id="0x7f12059c" />
-    <public type="string" name="disable_noise_cancellation" id="0x7f12059d" />
-    <public type="string" name="disable_notifications_description" id="0x7f12059e" />
-    <public type="string" name="disable_notifications_label" id="0x7f12059f" />
-    <public type="string" name="disable_sounds_description" id="0x7f1205a0" />
-    <public type="string" name="disable_sounds_label" id="0x7f1205a1" />
-    <public type="string" name="disable_video" id="0x7f1205a2" />
-    <public type="string" name="discard_changes" id="0x7f1205a3" />
-    <public type="string" name="discard_changes_description" id="0x7f1205a4" />
-    <public type="string" name="discodo_disabled" id="0x7f1205a5" />
-    <public type="string" name="discodo_enabled" id="0x7f1205a6" />
-    <public type="string" name="disconnect" id="0x7f1205a7" />
-    <public type="string" name="disconnect_account" id="0x7f1205a8" />
-    <public type="string" name="disconnect_account_body" id="0x7f1205a9" />
-    <public type="string" name="disconnect_account_title" id="0x7f1205aa" />
-    <public type="string" name="disconnect_from_voice" id="0x7f1205ab" />
-    <public type="string" name="disconnect_user_success" id="0x7f1205ac" />
-    <public type="string" name="discord" id="0x7f1205ad" />
-    <public type="string" name="discord_desc_long" id="0x7f1205ae" />
-    <public type="string" name="discord_desc_short" id="0x7f1205af" />
-    <public type="string" name="discord_gg" id="0x7f1205b0" />
-    <public type="string" name="discord_name" id="0x7f1205b1" />
-    <public type="string" name="discord_rich_presence" id="0x7f1205b2" />
-    <public type="string" name="discover" id="0x7f1205b3" />
-    <public type="string" name="discovery" id="0x7f1205b4" />
-    <public type="string" name="dismiss" id="0x7f1205b5" />
-    <public type="string" name="dispatch_error_modal_body" id="0x7f1205b6" />
-    <public type="string" name="dispatch_error_modal_description" id="0x7f1205b7" />
-    <public type="string" name="dispatch_error_modal_error_label" id="0x7f1205b8" />
-    <public type="string" name="dispatch_error_modal_header" id="0x7f1205b9" />
-    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7f1205ba" />
-    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7f1205bb" />
-    <public type="string" name="display_activity" id="0x7f1205bc" />
-    <public type="string" name="display_on_profile" id="0x7f1205bd" />
-    <public type="string" name="display_option_always" id="0x7f1205be" />
-    <public type="string" name="display_option_never" id="0x7f1205bf" />
-    <public type="string" name="display_option_only_while_speaking" id="0x7f1205c0" />
-    <public type="string" name="display_silence_warning" id="0x7f1205c1" />
-    <public type="string" name="dm" id="0x7f1205c2" />
-    <public type="string" name="dm_search_placeholder" id="0x7f1205c3" />
-    <public type="string" name="dm_tooltip_a11y_label" id="0x7f1205c4" />
-    <public type="string" name="dm_verification_text_blocked" id="0x7f1205c5" />
-    <public type="string" name="done" id="0x7f1205c6" />
-    <public type="string" name="dont_show_again" id="0x7f1205c7" />
-    <public type="string" name="download" id="0x7f1205c8" />
-    <public type="string" name="download_app" id="0x7f1205c9" />
-    <public type="string" name="download_apps" id="0x7f1205ca" />
-    <public type="string" name="download_desktop_ptb_footer" id="0x7f1205cb" />
-    <public type="string" name="download_desktop_stable_footer" id="0x7f1205cc" />
-    <public type="string" name="download_desktop_title" id="0x7f1205cd" />
-    <public type="string" name="download_failed" id="0x7f1205ce" />
-    <public type="string" name="download_file_complete" id="0x7f1205cf" />
-    <public type="string" name="download_mobile_title" id="0x7f1205d0" />
-    <public type="string" name="duration_days" id="0x7f1205d1" />
-    <public type="string" name="duration_hours" id="0x7f1205d2" />
-    <public type="string" name="duration_hours_short" id="0x7f1205d3" />
-    <public type="string" name="duration_mins" id="0x7f1205d4" />
-    <public type="string" name="duration_minutes" id="0x7f1205d5" />
-    <public type="string" name="duration_minutes_short" id="0x7f1205d6" />
-    <public type="string" name="duration_seconds" id="0x7f1205d7" />
-    <public type="string" name="duration_seconds_short" id="0x7f1205d8" />
-    <public type="string" name="early_supporter_tooltip" id="0x7f1205d9" />
-    <public type="string" name="echo_cancellation" id="0x7f1205da" />
-    <public type="string" name="edit" id="0x7f1205db" />
-    <public type="string" name="edit_category" id="0x7f1205dc" />
-    <public type="string" name="edit_channel" id="0x7f1205dd" />
-    <public type="string" name="edit_followed_news_body" id="0x7f1205de" />
-    <public type="string" name="edit_message" id="0x7f1205df" />
-    <public type="string" name="edit_note" id="0x7f1205e0" />
-    <public type="string" name="edit_overview" id="0x7f1205e1" />
-    <public type="string" name="edit_roles" id="0x7f1205e2" />
-    <public type="string" name="edit_textarea_help" id="0x7f1205e3" />
-    <public type="string" name="edit_user" id="0x7f1205e4" />
-    <public type="string" name="editing_message" id="0x7f1205e5" />
-    <public type="string" name="editing_with_attachment_error" id="0x7f1205e6" />
-    <public type="string" name="el" id="0x7f1205e7" />
-    <public type="string" name="elevated_permissions_sound_body" id="0x7f1205e8" />
-    <public type="string" name="elevated_permissions_sound_no_sound_button" id="0x7f1205e9" />
-    <public type="string" name="elevated_permissions_sound_request_access_button" id="0x7f1205ea" />
-    <public type="string" name="elevated_permissions_sound_title" id="0x7f1205eb" />
-    <public type="string" name="email" id="0x7f1205ec" />
-    <public type="string" name="email_invalid" id="0x7f1205ed" />
-    <public type="string" name="email_required" id="0x7f1205ee" />
-    <public type="string" name="email_verification_instructions_body" id="0x7f1205ef" />
-    <public type="string" name="email_verification_instructions_header" id="0x7f1205f0" />
-    <public type="string" name="embed_links" id="0x7f1205f1" />
-    <public type="string" name="emoji" id="0x7f1205f2" />
-    <public type="string" name="emoji_category_activity" id="0x7f1205f3" />
-    <public type="string" name="emoji_category_custom" id="0x7f1205f4" />
-    <public type="string" name="emoji_category_flags" id="0x7f1205f5" />
-    <public type="string" name="emoji_category_food" id="0x7f1205f6" />
-    <public type="string" name="emoji_category_nature" id="0x7f1205f7" />
-    <public type="string" name="emoji_category_objects" id="0x7f1205f8" />
-    <public type="string" name="emoji_category_people" id="0x7f1205f9" />
-    <public type="string" name="emoji_category_recent" id="0x7f1205fa" />
-    <public type="string" name="emoji_category_symbols" id="0x7f1205fb" />
-    <public type="string" name="emoji_category_travel" id="0x7f1205fc" />
-    <public type="string" name="emoji_disabled_premium_tier_lost" id="0x7f1205fd" />
-    <public type="string" name="emoji_from_guild" id="0x7f1205fe" />
-    <public type="string" name="emoji_keyboard_toggle" id="0x7f1205ff" />
-    <public type="string" name="emoji_matching" id="0x7f120600" />
-    <public type="string" name="emoji_modifier_dark_skin_tone" id="0x7f120601" />
-    <public type="string" name="emoji_modifier_light_skin_tone" id="0x7f120602" />
-    <public type="string" name="emoji_modifier_medium_dark_skin_tone" id="0x7f120603" />
-    <public type="string" name="emoji_modifier_medium_light_skin_tone" id="0x7f120604" />
-    <public type="string" name="emoji_modifier_medium_skin_tone" id="0x7f120605" />
-    <public type="string" name="emoji_modifier_none" id="0x7f120606" />
-    <public type="string" name="emoji_popout_current_guild_description" id="0x7f120607" />
-    <public type="string" name="emoji_popout_joined_guild_description" id="0x7f120608" />
-    <public type="string" name="emoji_popout_joined_guild_emoji_description" id="0x7f120609" />
-    <public type="string" name="emoji_popout_premium_cta" id="0x7f12060a" />
-    <public type="string" name="emoji_popout_premium_current_guild_description" id="0x7f12060b" />
-    <public type="string" name="emoji_popout_premium_joined_guild_description" id="0x7f12060c" />
-    <public type="string" name="emoji_popout_premium_unjoined_discoverable_guild_description" id="0x7f12060d" />
-    <public type="string" name="emoji_popout_premium_unjoined_private_guild_description" id="0x7f12060e" />
-    <public type="string" name="emoji_popout_private_server" id="0x7f12060f" />
-    <public type="string" name="emoji_popout_public_server" id="0x7f120610" />
-    <public type="string" name="emoji_popout_show_fewer" id="0x7f120611" />
-    <public type="string" name="emoji_popout_show_more_emojis" id="0x7f120612" />
-    <public type="string" name="emoji_popout_standard_emoji_description" id="0x7f120613" />
-    <public type="string" name="emoji_popout_unjoined_discoverable_guild_description" id="0x7f120614" />
-    <public type="string" name="emoji_popout_unjoined_guild_emoji_description" id="0x7f120615" />
-    <public type="string" name="emoji_popout_unjoined_private_guild_description" id="0x7f120616" />
-    <public type="string" name="emoji_section" id="0x7f120617" />
-    <public type="string" name="emoji_slots_available" id="0x7f120618" />
-    <public type="string" name="emoji_too_big" id="0x7f120619" />
-    <public type="string" name="emoji_tooltip_click_cta" id="0x7f12061a" />
-    <public type="string" name="emojis_title" id="0x7f12061b" />
-    <public type="string" name="en" id="0x7f12061c" />
-    <public type="string" name="en_gb" id="0x7f12061d" />
-    <public type="string" name="en_us" id="0x7f12061e" />
-    <public type="string" name="enable" id="0x7f12061f" />
-    <public type="string" name="enable_community_button_text" id="0x7f120620" />
-    <public type="string" name="enable_community_modal_content_filter_label" id="0x7f120621" />
-    <public type="string" name="enable_community_modal_content_filter_met" id="0x7f120622" />
-    <public type="string" name="enable_community_modal_default_notifications_label" id="0x7f120623" />
-    <public type="string" name="enable_community_modal_default_notifications_tooltip" id="0x7f120624" />
-    <public type="string" name="enable_community_modal_everyone_role_permission_label" id="0x7f120625" />
-    <public type="string" name="enable_community_modal_everyone_role_permission_tooltip" id="0x7f120626" />
-    <public type="string" name="enable_community_modal_requirement_satisfied_tooltip" id="0x7f120627" />
-    <public type="string" name="enable_community_modal_step_1_body" id="0x7f120628" />
-    <public type="string" name="enable_community_modal_step_1_header" id="0x7f120629" />
-    <public type="string" name="enable_community_modal_step_1_title" id="0x7f12062a" />
-    <public type="string" name="enable_community_modal_step_2_body" id="0x7f12062b" />
-    <public type="string" name="enable_community_modal_step_2_header" id="0x7f12062c" />
-    <public type="string" name="enable_community_modal_step_2_title" id="0x7f12062d" />
-    <public type="string" name="enable_community_modal_step_3_body" id="0x7f12062e" />
-    <public type="string" name="enable_community_modal_step_3_header" id="0x7f12062f" />
-    <public type="string" name="enable_community_modal_step_3_title" id="0x7f120630" />
-    <public type="string" name="enable_community_modal_step_header" id="0x7f120631" />
-    <public type="string" name="enable_community_modal_title" id="0x7f120632" />
-    <public type="string" name="enable_community_modal_verification_level_help" id="0x7f120633" />
-    <public type="string" name="enable_community_modal_verification_level_label" id="0x7f120634" />
-    <public type="string" name="enable_community_modal_verification_level_met" id="0x7f120635" />
-    <public type="string" name="enable_ingame_overlay" id="0x7f120636" />
-    <public type="string" name="enable_noise_cancellation" id="0x7f120637" />
-    <public type="string" name="enable_notifications" id="0x7f120638" />
-    <public type="string" name="enable_permission" id="0x7f120639" />
-    <public type="string" name="enable_privacy_access" id="0x7f12063a" />
-    <public type="string" name="enable_public_modal_content_filter_help" id="0x7f12063b" />
-    <public type="string" name="enable_public_modal_create_channel" id="0x7f12063c" />
-    <public type="string" name="enable_public_modal_rules_channel_help" id="0x7f12063d" />
-    <public type="string" name="enable_public_modal_rules_channel_title" id="0x7f12063e" />
-    <public type="string" name="enable_public_modal_verification_level_description" id="0x7f12063f" />
-    <public type="string" name="enable_streamer_mode_description" id="0x7f120640" />
-    <public type="string" name="enable_streamer_mode_label" id="0x7f120641" />
-    <public type="string" name="enable_twitch_emoji_sync" id="0x7f120642" />
-    <public type="string" name="enter_email_body" id="0x7f120643" />
-    <public type="string" name="enter_new_topic" id="0x7f120644" />
-    <public type="string" name="enter_phone_description" id="0x7f120645" />
-    <public type="string" name="enter_phone_description_note" id="0x7f120646" />
-    <public type="string" name="enter_phone_title" id="0x7f120647" />
-    <public type="string" name="error" id="0x7f120648" />
-    <public type="string" name="error_copying_image" id="0x7f120649" />
-    <public type="string" name="error_icon_content_description" id="0x7f12064a" />
-    <public type="string" name="error_saving_image" id="0x7f12064b" />
-    <public type="string" name="errors_action_to_take" id="0x7f12064c" />
-    <public type="string" name="errors_reload" id="0x7f12064d" />
-    <public type="string" name="errors_restart_app" id="0x7f12064e" />
-    <public type="string" name="errors_store_crash" id="0x7f12064f" />
-    <public type="string" name="errors_unexpected_crash" id="0x7f120650" />
-    <public type="string" name="es_es" id="0x7f120651" />
-    <public type="string" name="everyone_popout_body" id="0x7f120652" />
-    <public type="string" name="everyone_popout_enter" id="0x7f120653" />
-    <public type="string" name="everyone_popout_esc" id="0x7f120654" />
-    <public type="string" name="everyone_popout_footer" id="0x7f120655" />
-    <public type="string" name="everyone_popout_send_now" id="0x7f120656" />
-    <public type="string" name="examples" id="0x7f120657" />
-    <public type="string" name="exit_full_screen" id="0x7f120658" />
-    <public type="string" name="exo_controls_fastforward_description" id="0x7f120659" />
-    <public type="string" name="exo_controls_fullscreen_description" id="0x7f12065a" />
-    <public type="string" name="exo_controls_hide" id="0x7f12065b" />
-    <public type="string" name="exo_controls_next_description" id="0x7f12065c" />
-    <public type="string" name="exo_controls_pause_description" id="0x7f12065d" />
-    <public type="string" name="exo_controls_play_description" id="0x7f12065e" />
-    <public type="string" name="exo_controls_previous_description" id="0x7f12065f" />
-    <public type="string" name="exo_controls_repeat_all_description" id="0x7f120660" />
-    <public type="string" name="exo_controls_repeat_off_description" id="0x7f120661" />
-    <public type="string" name="exo_controls_repeat_one_description" id="0x7f120662" />
-    <public type="string" name="exo_controls_rewind_description" id="0x7f120663" />
-    <public type="string" name="exo_controls_show" id="0x7f120664" />
-    <public type="string" name="exo_controls_shuffle_off_description" id="0x7f120665" />
-    <public type="string" name="exo_controls_shuffle_on_description" id="0x7f120666" />
-    <public type="string" name="exo_controls_stop_description" id="0x7f120667" />
-    <public type="string" name="exo_controls_vr_description" id="0x7f120668" />
-    <public type="string" name="exo_download_completed" id="0x7f120669" />
-    <public type="string" name="exo_download_description" id="0x7f12066a" />
-    <public type="string" name="exo_download_downloading" id="0x7f12066b" />
-    <public type="string" name="exo_download_failed" id="0x7f12066c" />
-    <public type="string" name="exo_download_notification_channel_name" id="0x7f12066d" />
-    <public type="string" name="exo_download_removing" id="0x7f12066e" />
-    <public type="string" name="exo_item_list" id="0x7f12066f" />
-    <public type="string" name="exo_track_bitrate" id="0x7f120670" />
-    <public type="string" name="exo_track_mono" id="0x7f120671" />
-    <public type="string" name="exo_track_resolution" id="0x7f120672" />
-    <public type="string" name="exo_track_role_alternate" id="0x7f120673" />
-    <public type="string" name="exo_track_role_closed_captions" id="0x7f120674" />
-    <public type="string" name="exo_track_role_commentary" id="0x7f120675" />
-    <public type="string" name="exo_track_role_supplementary" id="0x7f120676" />
-    <public type="string" name="exo_track_selection_auto" id="0x7f120677" />
-    <public type="string" name="exo_track_selection_none" id="0x7f120678" />
-    <public type="string" name="exo_track_selection_title_audio" id="0x7f120679" />
-    <public type="string" name="exo_track_selection_title_text" id="0x7f12067a" />
-    <public type="string" name="exo_track_selection_title_video" id="0x7f12067b" />
-    <public type="string" name="exo_track_stereo" id="0x7f12067c" />
-    <public type="string" name="exo_track_surround" id="0x7f12067d" />
-    <public type="string" name="exo_track_surround_5_point_1" id="0x7f12067e" />
-    <public type="string" name="exo_track_surround_7_point_1" id="0x7f12067f" />
-    <public type="string" name="exo_track_unknown" id="0x7f120680" />
-    <public type="string" name="expand_button_title" id="0x7f120681" />
-    <public type="string" name="expand_buttons" id="0x7f120682" />
-    <public type="string" name="expanded" id="0x7f120683" />
-    <public type="string" name="experiment_mobile_only_user_header" id="0x7f120684" />
-    <public type="string" name="experiment_mobile_only_user_text1" id="0x7f120685" />
-    <public type="string" name="experimental_encoders" id="0x7f120686" />
-    <public type="string" name="expire_after" id="0x7f120687" />
-    <public type="string" name="expires_in" id="0x7f120688" />
-    <public type="string" name="explicit_content_filter_disabled" id="0x7f120689" />
-    <public type="string" name="explicit_content_filter_disabled_description" id="0x7f12068a" />
-    <public type="string" name="explicit_content_filter_high" id="0x7f12068b" />
-    <public type="string" name="explicit_content_filter_high_description" id="0x7f12068c" />
-    <public type="string" name="explicit_content_filter_medium" id="0x7f12068d" />
-    <public type="string" name="explicit_content_filter_medium_description" id="0x7f12068e" />
-    <public type="string" name="exposed_dropdown_menu_content_description" id="0x7f12068f" />
-    <public type="string" name="expression_picker_emoji" id="0x7f120690" />
-    <public type="string" name="expression_picker_gif" id="0x7f120691" />
-    <public type="string" name="expression_picker_intro_tooltip_action" id="0x7f120692" />
-    <public type="string" name="expression_picker_intro_tooltip_body" id="0x7f120693" />
-    <public type="string" name="expression_picker_intro_tooltip_header" id="0x7f120694" />
-    <public type="string" name="expression_picker_open_emoji_picker_a11y_label" id="0x7f120695" />
-    <public type="string" name="expression_picker_open_gif_picker_a11y_label" id="0x7f120696" />
-    <public type="string" name="extra_emoji_count" id="0x7f120697" />
-    <public type="string" name="fab_transformation_scrim_behavior" id="0x7f120698" />
-    <public type="string" name="fab_transformation_sheet_behavior" id="0x7f120699" />
-    <public type="string" name="facebook" id="0x7f12069a" />
-    <public type="string" name="failed" id="0x7f12069b" />
-    <public type="string" name="fallback_menu_item_copy_link" id="0x7f12069c" />
-    <public type="string" name="fallback_menu_item_open_in_browser" id="0x7f12069d" />
-    <public type="string" name="fallback_menu_item_share_link" id="0x7f12069e" />
-    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7f12069f" />
-    <public type="string" name="fi" id="0x7f1206a0" />
-    <public type="string" name="file_rate_kb" id="0x7f1206a1" />
-    <public type="string" name="file_rate_mb" id="0x7f1206a2" />
-    <public type="string" name="file_size_gb" id="0x7f1206a3" />
-    <public type="string" name="file_size_mb" id="0x7f1206a4" />
-    <public type="string" name="file_upload_limit_premium_tier_1" id="0x7f1206a5" />
-    <public type="string" name="file_upload_limit_premium_tier_2" id="0x7f1206a6" />
-    <public type="string" name="file_upload_limit_standard" id="0x7f1206a7" />
-    <public type="string" name="files_permission_reason" id="0x7f1206a8" />
-    <public type="string" name="filter" id="0x7f1206a9" />
-    <public type="string" name="filter_mentions" id="0x7f1206aa" />
-    <public type="string" name="filter_options" id="0x7f1206ab" />
-    <public type="string" name="firebase_database_url" id="0x7f1206ac" />
-    <public type="string" name="first_week_survey_button" id="0x7f1206ad" />
-    <public type="string" name="first_week_survey_prompt" id="0x7f1206ae" />
-    <public type="string" name="flash_auto" id="0x7f1206af" />
-    <public type="string" name="flash_off" id="0x7f1206b0" />
-    <public type="string" name="flash_on" id="0x7f1206b1" />
-    <public type="string" name="flash_torch" id="0x7f1206b2" />
-    <public type="string" name="focus_participant" id="0x7f1206b3" />
-    <public type="string" name="follow" id="0x7f1206b4" />
-    <public type="string" name="follow_modal_body" id="0x7f1206b5" />
-    <public type="string" name="follow_modal_fail" id="0x7f1206b6" />
-    <public type="string" name="follow_modal_hint" id="0x7f1206b7" />
-    <public type="string" name="follow_modal_hint_no_perms" id="0x7f1206b8" />
-    <public type="string" name="follow_modal_title" id="0x7f1206b9" />
-    <public type="string" name="follow_modal_too_many_webhooks" id="0x7f1206ba" />
-    <public type="string" name="follow_modal_warning" id="0x7f1206bb" />
-    <public type="string" name="follow_news_chat_input_message" id="0x7f1206bc" />
-    <public type="string" name="follow_news_chat_input_subtitle" id="0x7f1206bd" />
-    <public type="string" name="follow_success_modal_body" id="0x7f1206be" />
-    <public type="string" name="follow_success_modal_header_01" id="0x7f1206bf" />
-    <public type="string" name="follow_success_modal_header_02" id="0x7f1206c0" />
-    <public type="string" name="follow_success_modal_header_03" id="0x7f1206c1" />
-    <public type="string" name="follow_success_modal_header_04" id="0x7f1206c2" />
-    <public type="string" name="follow_success_modal_header_05" id="0x7f1206c3" />
-    <public type="string" name="follow_success_modal_header_06" id="0x7f1206c4" />
-    <public type="string" name="follow_success_modal_header_07" id="0x7f1206c5" />
-    <public type="string" name="follow_success_modal_header_08" id="0x7f1206c6" />
-    <public type="string" name="follow_success_modal_header_09" id="0x7f1206c7" />
-    <public type="string" name="follow_success_modal_header_10" id="0x7f1206c8" />
-    <public type="string" name="follow_us_for_more_updates" id="0x7f1206c9" />
-    <public type="string" name="follower_analytics" id="0x7f1206ca" />
-    <public type="string" name="follower_analytics_header" id="0x7f1206cb" />
-    <public type="string" name="force_sync" id="0x7f1206cc" />
-    <public type="string" name="forgot_password" id="0x7f1206cd" />
-    <public type="string" name="forgot_password_body" id="0x7f1206ce" />
-    <public type="string" name="form_checkbox_aec_dump" id="0x7f1206cf" />
-    <public type="string" name="form_checkbox_connection_log" id="0x7f1206d0" />
-    <public type="string" name="form_checkbox_debug_logging" id="0x7f1206d1" />
-    <public type="string" name="form_checkbox_qos" id="0x7f1206d2" />
-    <public type="string" name="form_description_audio_mode_android_call" id="0x7f1206d3" />
-    <public type="string" name="form_description_audio_mode_android_communication" id="0x7f1206d4" />
-    <public type="string" name="form_description_mobile_guild_notification_all_messages" id="0x7f1206d5" />
-    <public type="string" name="form_description_mobile_guild_notification_only_mentions" id="0x7f1206d6" />
-    <public type="string" name="form_description_mobile_notification_muted" id="0x7f1206d7" />
-    <public type="string" name="form_description_push_afk_timeout" id="0x7f1206d8" />
-    <public type="string" name="form_description_tts" id="0x7f1206d9" />
-    <public type="string" name="form_error_generic" id="0x7f1206da" />
-    <public type="string" name="form_help_aec_dump" id="0x7f1206db" />
-    <public type="string" name="form_help_afk_channel" id="0x7f1206dc" />
-    <public type="string" name="form_help_attenuation" id="0x7f1206dd" />
-    <public type="string" name="form_help_automatic_vad" id="0x7f1206de" />
-    <public type="string" name="form_help_bitrate" id="0x7f1206df" />
-    <public type="string" name="form_help_certified_voice_processing" id="0x7f1206e0" />
-    <public type="string" name="form_help_connection_log" id="0x7f1206e1" />
-    <public type="string" name="form_help_debug_logging" id="0x7f1206e2" />
-    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7f1206e3" />
-    <public type="string" name="form_help_discoverable_change_time" id="0x7f1206e4" />
-    <public type="string" name="form_help_discovery_cover_image" id="0x7f1206e5" />
-    <public type="string" name="form_help_enable_discoverable" id="0x7f1206e6" />
-    <public type="string" name="form_help_explicit_content_filter" id="0x7f1206e7" />
-    <public type="string" name="form_help_hardware_h264" id="0x7f1206e8" />
-    <public type="string" name="form_help_instant_invite_channel" id="0x7f1206e9" />
-    <public type="string" name="form_help_last_seen" id="0x7f1206ea" />
-    <public type="string" name="form_help_last_seen_with_roles" id="0x7f1206eb" />
-    <public type="string" name="form_help_news" id="0x7f1206ec" />
-    <public type="string" name="form_help_nsfw" id="0x7f1206ed" />
-    <public type="string" name="form_help_open_h264" id="0x7f1206ee" />
-    <public type="string" name="form_help_qos" id="0x7f1206ef" />
-    <public type="string" name="form_help_server_banner" id="0x7f1206f0" />
-    <public type="string" name="form_help_server_description" id="0x7f1206f1" />
-    <public type="string" name="form_help_server_language" id="0x7f1206f2" />
-    <public type="string" name="form_help_slowmode" id="0x7f1206f3" />
-    <public type="string" name="form_help_system_channel" id="0x7f1206f4" />
-    <public type="string" name="form_help_system_channel_join_messages" id="0x7f1206f5" />
-    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7f1206f6" />
-    <public type="string" name="form_help_temporary" id="0x7f1206f7" />
-    <public type="string" name="form_help_user_limit" id="0x7f1206f8" />
-    <public type="string" name="form_help_verification_level" id="0x7f1206f9" />
-    <public type="string" name="form_help_voice_video_troubleshooting_guide" id="0x7f1206fa" />
-    <public type="string" name="form_label_account_information" id="0x7f1206fb" />
-    <public type="string" name="form_label_afk_channel" id="0x7f1206fc" />
-    <public type="string" name="form_label_afk_timeout" id="0x7f1206fd" />
-    <public type="string" name="form_label_all" id="0x7f1206fe" />
-    <public type="string" name="form_label_all_messages" id="0x7f1206ff" />
-    <public type="string" name="form_label_all_messages_short" id="0x7f120700" />
-    <public type="string" name="form_label_android_opensl" id="0x7f120701" />
-    <public type="string" name="form_label_android_opensl_default" id="0x7f120702" />
-    <public type="string" name="form_label_android_opensl_default_desc" id="0x7f120703" />
-    <public type="string" name="form_label_android_opensl_desc" id="0x7f120704" />
-    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7f120705" />
-    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7f120706" />
-    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7f120707" />
-    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7f120708" />
-    <public type="string" name="form_label_attenuation" id="0x7f120709" />
-    <public type="string" name="form_label_audio_mode_android" id="0x7f12070a" />
-    <public type="string" name="form_label_audio_mode_android_call" id="0x7f12070b" />
-    <public type="string" name="form_label_audio_mode_android_communication" id="0x7f12070c" />
-    <public type="string" name="form_label_automatic_vad" id="0x7f12070d" />
-    <public type="string" name="form_label_automatic_vad_mobile" id="0x7f12070e" />
-    <public type="string" name="form_label_avatar_size" id="0x7f12070f" />
-    <public type="string" name="form_label_bitrate" id="0x7f120710" />
-    <public type="string" name="form_label_category_permissions" id="0x7f120711" />
-    <public type="string" name="form_label_channel_name" id="0x7f120712" />
-    <public type="string" name="form_label_channel_notifcation_settings" id="0x7f120713" />
-    <public type="string" name="form_label_channel_permissions" id="0x7f120714" />
-    <public type="string" name="form_label_channel_topic" id="0x7f120715" />
-    <public type="string" name="form_label_channel_voice_permissions" id="0x7f120716" />
-    <public type="string" name="form_label_current_password" id="0x7f120717" />
-    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7f120718" />
-    <public type="string" name="form_label_debug" id="0x7f120719" />
-    <public type="string" name="form_label_default" id="0x7f12071a" />
-    <public type="string" name="form_label_default_notification_settings" id="0x7f12071b" />
-    <public type="string" name="form_label_delete_message_history" id="0x7f12071c" />
-    <public type="string" name="form_label_desktop_only" id="0x7f12071d" />
-    <public type="string" name="form_label_disabled_for_everyone" id="0x7f12071e" />
-    <public type="string" name="form_label_discovery_cover_image" id="0x7f12071f" />
-    <public type="string" name="form_label_discovery_rules_channel" id="0x7f120720" />
-    <public type="string" name="form_label_display_names" id="0x7f120721" />
-    <public type="string" name="form_label_display_users" id="0x7f120722" />
-    <public type="string" name="form_label_email" id="0x7f120723" />
-    <public type="string" name="form_label_expire_grace_period" id="0x7f120724" />
-    <public type="string" name="form_label_explicit_content_filter" id="0x7f120725" />
-    <public type="string" name="form_label_hoist_description" id="0x7f120726" />
-    <public type="string" name="form_label_input" id="0x7f120727" />
-    <public type="string" name="form_label_input_device" id="0x7f120728" />
-    <public type="string" name="form_label_input_mode" id="0x7f120729" />
-    <public type="string" name="form_label_input_sensitivty" id="0x7f12072a" />
-    <public type="string" name="form_label_input_volume" id="0x7f12072b" />
-    <public type="string" name="form_label_instant_invite" id="0x7f12072c" />
-    <public type="string" name="form_label_instant_invite_channel" id="0x7f12072d" />
-    <public type="string" name="form_label_invite_link" id="0x7f12072e" />
-    <public type="string" name="form_label_json_api" id="0x7f12072f" />
-    <public type="string" name="form_label_last_seen" id="0x7f120730" />
-    <public type="string" name="form_label_max_age" id="0x7f120731" />
-    <public type="string" name="form_label_max_uses" id="0x7f120732" />
-    <public type="string" name="form_label_member_add" id="0x7f120733" />
-    <public type="string" name="form_label_membership_expire_behavior" id="0x7f120734" />
-    <public type="string" name="form_label_mentionable" id="0x7f120735" />
-    <public type="string" name="form_label_mentionable_description" id="0x7f120736" />
-    <public type="string" name="form_label_mentions" id="0x7f120737" />
-    <public type="string" name="form_label_mobile_category_muted" id="0x7f120738" />
-    <public type="string" name="form_label_mobile_category_muted_until" id="0x7f120739" />
-    <public type="string" name="form_label_mobile_channel_muted" id="0x7f12073a" />
-    <public type="string" name="form_label_mobile_channel_muted_until" id="0x7f12073b" />
-    <public type="string" name="form_label_mobile_channel_override_guild_message_notification" id="0x7f12073c" />
-    <public type="string" name="form_label_mobile_channel_override_guild_muted" id="0x7f12073d" />
-    <public type="string" name="form_label_mobile_channel_override_mute" id="0x7f12073e" />
-    <public type="string" name="form_label_mobile_dm_muted" id="0x7f12073f" />
-    <public type="string" name="form_label_mobile_dm_muted_until" id="0x7f120740" />
-    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7f120741" />
-    <public type="string" name="form_label_mobile_notifications_blink" id="0x7f120742" />
-    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7f120743" />
-    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7f120744" />
-    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7f120745" />
-    <public type="string" name="form_label_mobile_notifications_label" id="0x7f120746" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7f120747" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7f120748" />
-    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7f120749" />
-    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7f12074a" />
-    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7f12074b" />
-    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7f12074c" />
-    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7f12074d" />
-    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7f12074e" />
-    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7f12074f" />
-    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7f120750" />
-    <public type="string" name="form_label_mobile_push_notifications" id="0x7f120751" />
-    <public type="string" name="form_label_mobile_server_muted" id="0x7f120752" />
-    <public type="string" name="form_label_mobile_server_muted_until" id="0x7f120753" />
-    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7f120754" />
-    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7f120755" />
-    <public type="string" name="form_label_mute_server" id="0x7f120756" />
-    <public type="string" name="form_label_mute_server_description" id="0x7f120757" />
-    <public type="string" name="form_label_muted" id="0x7f120758" />
-    <public type="string" name="form_label_new_password" id="0x7f120759" />
-    <public type="string" name="form_label_news_channel" id="0x7f12075a" />
-    <public type="string" name="form_label_nothing" id="0x7f12075b" />
-    <public type="string" name="form_label_notification_frequency" id="0x7f12075c" />
-    <public type="string" name="form_label_notification_position" id="0x7f12075d" />
-    <public type="string" name="form_label_nsfw_channel" id="0x7f12075e" />
-    <public type="string" name="form_label_off" id="0x7f12075f" />
-    <public type="string" name="form_label_only_mentions" id="0x7f120760" />
-    <public type="string" name="form_label_only_mentions_short" id="0x7f120761" />
-    <public type="string" name="form_label_output" id="0x7f120762" />
-    <public type="string" name="form_label_output_device" id="0x7f120763" />
-    <public type="string" name="form_label_output_volume" id="0x7f120764" />
-    <public type="string" name="form_label_overlay_chat_opacity" id="0x7f120765" />
-    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7f120766" />
-    <public type="string" name="form_label_password" id="0x7f120767" />
-    <public type="string" name="form_label_premade_widget" id="0x7f120768" />
-    <public type="string" name="form_label_push_afk_timeout" id="0x7f120769" />
-    <public type="string" name="form_label_qos" id="0x7f12076a" />
-    <public type="string" name="form_label_reason_ban" id="0x7f12076b" />
-    <public type="string" name="form_label_reason_kick" id="0x7f12076c" />
-    <public type="string" name="form_label_report_reason" id="0x7f12076d" />
-    <public type="string" name="form_label_role_add" id="0x7f12076e" />
-    <public type="string" name="form_label_role_color" id="0x7f12076f" />
-    <public type="string" name="form_label_role_enter_name" id="0x7f120770" />
-    <public type="string" name="form_label_role_name" id="0x7f120771" />
-    <public type="string" name="form_label_role_settings" id="0x7f120772" />
-    <public type="string" name="form_label_roles_pro_tip" id="0x7f120773" />
-    <public type="string" name="form_label_roles_pro_tip_description" id="0x7f120774" />
-    <public type="string" name="form_label_select_channel" id="0x7f120775" />
-    <public type="string" name="form_label_send_to" id="0x7f120776" />
-    <public type="string" name="form_label_sensitivty" id="0x7f120777" />
-    <public type="string" name="form_label_server_banner" id="0x7f120778" />
-    <public type="string" name="form_label_server_description" id="0x7f120779" />
-    <public type="string" name="form_label_server_id" id="0x7f12077a" />
-    <public type="string" name="form_label_server_language" id="0x7f12077b" />
-    <public type="string" name="form_label_server_name" id="0x7f12077c" />
-    <public type="string" name="form_label_server_notification_settings" id="0x7f12077d" />
-    <public type="string" name="form_label_server_region" id="0x7f12077e" />
-    <public type="string" name="form_label_shortcut" id="0x7f12077f" />
-    <public type="string" name="form_label_slowmode" id="0x7f120780" />
-    <public type="string" name="form_label_slowmode_cooldown" id="0x7f120781" />
-    <public type="string" name="form_label_slowmode_off" id="0x7f120782" />
-    <public type="string" name="form_label_stream_volume" id="0x7f120783" />
-    <public type="string" name="form_label_sub_expire_behavior" id="0x7f120784" />
-    <public type="string" name="form_label_subsystem" id="0x7f120785" />
-    <public type="string" name="form_label_suppress_everyone" id="0x7f120786" />
-    <public type="string" name="form_label_suppress_roles" id="0x7f120787" />
-    <public type="string" name="form_label_synced_members" id="0x7f120788" />
-    <public type="string" name="form_label_synced_role" id="0x7f120789" />
-    <public type="string" name="form_label_synced_subs" id="0x7f12078a" />
-    <public type="string" name="form_label_system_channel" id="0x7f12078b" />
-    <public type="string" name="form_label_system_channel_settings" id="0x7f12078c" />
-    <public type="string" name="form_label_temporary" id="0x7f12078d" />
-    <public type="string" name="form_label_test_microphone" id="0x7f12078e" />
-    <public type="string" name="form_label_tts" id="0x7f12078f" />
-    <public type="string" name="form_label_tts_notifications" id="0x7f120790" />
-    <public type="string" name="form_label_unmute_server" id="0x7f120791" />
-    <public type="string" name="form_label_use_rich_chat_box" id="0x7f120792" />
-    <public type="string" name="form_label_user_limit" id="0x7f120793" />
-    <public type="string" name="form_label_username" id="0x7f120794" />
-    <public type="string" name="form_label_username_mobile" id="0x7f120795" />
-    <public type="string" name="form_label_verification_level" id="0x7f120796" />
-    <public type="string" name="form_label_video_device" id="0x7f120797" />
-    <public type="string" name="form_label_video_preview" id="0x7f120798" />
-    <public type="string" name="form_label_voice_diagnostics" id="0x7f120799" />
-    <public type="string" name="form_label_voice_processing" id="0x7f12079a" />
-    <public type="string" name="form_label_volume" id="0x7f12079b" />
-    <public type="string" name="form_placeholder_server_name" id="0x7f12079c" />
-    <public type="string" name="form_placeholder_username" id="0x7f12079d" />
-    <public type="string" name="form_report_help_text" id="0x7f12079e" />
-    <public type="string" name="form_warning_input_sensitivty" id="0x7f12079f" />
-    <public type="string" name="form_warning_video_preview" id="0x7f1207a0" />
-    <public type="string" name="fr" id="0x7f1207a1" />
-    <public type="string" name="friend_has_been_deleted" id="0x7f1207a2" />
-    <public type="string" name="friend_permitted_source" id="0x7f1207a3" />
-    <public type="string" name="friend_permitted_source_all" id="0x7f1207a4" />
-    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7f1207a5" />
-    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7f1207a6" />
-    <public type="string" name="friend_request_accept" id="0x7f1207a7" />
-    <public type="string" name="friend_request_cancel" id="0x7f1207a8" />
-    <public type="string" name="friend_request_cancelled" id="0x7f1207a9" />
-    <public type="string" name="friend_request_failed_header" id="0x7f1207aa" />
-    <public type="string" name="friend_request_ignore" id="0x7f1207ab" />
-    <public type="string" name="friend_request_ignored" id="0x7f1207ac" />
-    <public type="string" name="friend_request_rate_limited_body" id="0x7f1207ad" />
-    <public type="string" name="friend_request_rate_limited_button" id="0x7f1207ae" />
-    <public type="string" name="friend_request_rate_limited_header" id="0x7f1207af" />
-    <public type="string" name="friend_request_requires_email_validation_body" id="0x7f1207b0" />
-    <public type="string" name="friend_request_requires_email_validation_button" id="0x7f1207b1" />
-    <public type="string" name="friend_request_requires_email_validation_header" id="0x7f1207b2" />
-    <public type="string" name="friend_request_sent" id="0x7f1207b3" />
-    <public type="string" name="friends" id="0x7f1207b4" />
-    <public type="string" name="friends_all_header" id="0x7f1207b5" />
-    <public type="string" name="friends_blocked_header" id="0x7f1207b6" />
-    <public type="string" name="friends_column_name" id="0x7f1207b7" />
-    <public type="string" name="friends_column_status" id="0x7f1207b8" />
-    <public type="string" name="friends_empty_state_all" id="0x7f1207b9" />
-    <public type="string" name="friends_empty_state_all_body" id="0x7f1207ba" />
-    <public type="string" name="friends_empty_state_all_cta" id="0x7f1207bb" />
-    <public type="string" name="friends_empty_state_all_header" id="0x7f1207bc" />
-    <public type="string" name="friends_empty_state_blocked" id="0x7f1207bd" />
-    <public type="string" name="friends_empty_state_copy" id="0x7f1207be" />
-    <public type="string" name="friends_empty_state_online" id="0x7f1207bf" />
-    <public type="string" name="friends_empty_state_pending" id="0x7f1207c0" />
-    <public type="string" name="friends_empty_state_subtitle" id="0x7f1207c1" />
-    <public type="string" name="friends_offline_header" id="0x7f1207c2" />
-    <public type="string" name="friends_online_header" id="0x7f1207c3" />
-    <public type="string" name="friends_pending_header" id="0x7f1207c4" />
-    <public type="string" name="friends_pending_request_expand" id="0x7f1207c5" />
-    <public type="string" name="friends_pending_request_expand_collapse" id="0x7f1207c6" />
-    <public type="string" name="friends_pending_request_header" id="0x7f1207c7" />
-    <public type="string" name="friends_request_status_incoming" id="0x7f1207c8" />
-    <public type="string" name="friends_request_status_outgoing" id="0x7f1207c9" />
-    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7f1207ca" />
-    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7f1207cb" />
-    <public type="string" name="friends_row_action_button_accessibility_label_cancel" id="0x7f1207cc" />
-    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7f1207cd" />
-    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7f1207ce" />
-    <public type="string" name="friends_section_add_friend" id="0x7f1207cf" />
-    <public type="string" name="friends_section_all" id="0x7f1207d0" />
-    <public type="string" name="friends_section_online" id="0x7f1207d1" />
-    <public type="string" name="friends_section_pending" id="0x7f1207d2" />
-    <public type="string" name="friends_share" id="0x7f1207d3" />
-    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7f1207d4" />
-    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7f1207d5" />
-    <public type="string" name="friends_share_tabbar_title" id="0x7f1207d6" />
-    <public type="string" name="full" id="0x7f1207d7" />
-    <public type="string" name="full_screen" id="0x7f1207d8" />
-    <public type="string" name="funimation_promotion_card_body_redeemed" id="0x7f1207d9" />
-    <public type="string" name="funimation_promotion_card_body_unredeemed" id="0x7f1207da" />
-    <public type="string" name="funimation_promotion_card_header" id="0x7f1207db" />
-    <public type="string" name="game_action_button_add_to_library" id="0x7f1207dc" />
-    <public type="string" name="game_action_button_cannot_install" id="0x7f1207dd" />
-    <public type="string" name="game_action_button_downloading" id="0x7f1207de" />
-    <public type="string" name="game_action_button_game_not_detected" id="0x7f1207df" />
-    <public type="string" name="game_action_button_install" id="0x7f1207e0" />
-    <public type="string" name="game_action_button_locate" id="0x7f1207e1" />
-    <public type="string" name="game_action_button_login_to_buy" id="0x7f1207e2" />
-    <public type="string" name="game_action_button_now_playing" id="0x7f1207e3" />
-    <public type="string" name="game_action_button_paused" id="0x7f1207e4" />
-    <public type="string" name="game_action_button_play" id="0x7f1207e5" />
-    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7f1207e6" />
-    <public type="string" name="game_action_button_preorder_wait" id="0x7f1207e7" />
-    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7f1207e8" />
-    <public type="string" name="game_action_button_queued" id="0x7f1207e9" />
-    <public type="string" name="game_action_button_restricted_in_region" id="0x7f1207ea" />
-    <public type="string" name="game_action_button_unavailable" id="0x7f1207eb" />
-    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7f1207ec" />
-    <public type="string" name="game_action_button_uninstalling_1" id="0x7f1207ed" />
-    <public type="string" name="game_action_button_uninstalling_10" id="0x7f1207ee" />
-    <public type="string" name="game_action_button_uninstalling_2" id="0x7f1207ef" />
-    <public type="string" name="game_action_button_uninstalling_3" id="0x7f1207f0" />
-    <public type="string" name="game_action_button_uninstalling_4" id="0x7f1207f1" />
-    <public type="string" name="game_action_button_uninstalling_5" id="0x7f1207f2" />
-    <public type="string" name="game_action_button_uninstalling_6" id="0x7f1207f3" />
-    <public type="string" name="game_action_button_uninstalling_7" id="0x7f1207f4" />
-    <public type="string" name="game_action_button_uninstalling_8" id="0x7f1207f5" />
-    <public type="string" name="game_action_button_uninstalling_9" id="0x7f1207f6" />
-    <public type="string" name="game_action_button_update" id="0x7f1207f7" />
-    <public type="string" name="game_action_button_view_in_store" id="0x7f1207f8" />
-    <public type="string" name="game_activity" id="0x7f1207f9" />
-    <public type="string" name="game_detected" id="0x7f1207fa" />
-    <public type="string" name="game_detection_modal_info_android" id="0x7f1207fb" />
-    <public type="string" name="game_detection_open_settings" id="0x7f1207fc" />
-    <public type="string" name="game_detection_service" id="0x7f1207fd" />
-    <public type="string" name="game_feed_activity_action_play" id="0x7f1207fe" />
-    <public type="string" name="game_feed_activity_playing_xbox" id="0x7f1207ff" />
-    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7f120800" />
-    <public type="string" name="game_feed_current_header_title" id="0x7f120801" />
-    <public type="string" name="game_feed_unknown_player" id="0x7f120802" />
-    <public type="string" name="game_feed_user_played_days_ago" id="0x7f120803" />
-    <public type="string" name="game_feed_user_played_hours_ago" id="0x7f120804" />
-    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7f120805" />
-    <public type="string" name="game_feed_user_played_months_ago" id="0x7f120806" />
-    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7f120807" />
-    <public type="string" name="game_feed_user_played_years_ago" id="0x7f120808" />
-    <public type="string" name="game_feed_user_playing_for_days" id="0x7f120809" />
-    <public type="string" name="game_feed_user_playing_for_hours" id="0x7f12080a" />
-    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7f12080b" />
-    <public type="string" name="game_feed_user_playing_just_ended" id="0x7f12080c" />
-    <public type="string" name="game_feed_user_playing_just_started" id="0x7f12080d" />
-    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7f12080e" />
-    <public type="string" name="game_library_last_played_days" id="0x7f12080f" />
-    <public type="string" name="game_library_last_played_hours" id="0x7f120810" />
-    <public type="string" name="game_library_last_played_just_now" id="0x7f120811" />
-    <public type="string" name="game_library_last_played_minutes" id="0x7f120812" />
-    <public type="string" name="game_library_last_played_months" id="0x7f120813" />
-    <public type="string" name="game_library_last_played_none" id="0x7f120814" />
-    <public type="string" name="game_library_last_played_playing_now" id="0x7f120815" />
-    <public type="string" name="game_library_last_played_weeks" id="0x7f120816" />
-    <public type="string" name="game_library_last_played_years" id="0x7f120817" />
-    <public type="string" name="game_library_list_header_last_played" id="0x7f120818" />
-    <public type="string" name="game_library_list_header_name" id="0x7f120819" />
-    <public type="string" name="game_library_list_header_platform" id="0x7f12081a" />
-    <public type="string" name="game_library_new" id="0x7f12081b" />
-    <public type="string" name="game_library_not_applicable" id="0x7f12081c" />
-    <public type="string" name="game_library_notification_game_installed_body" id="0x7f12081d" />
-    <public type="string" name="game_library_notification_game_installed_title" id="0x7f12081e" />
-    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7f12081f" />
-    <public type="string" name="game_library_private_tooltip" id="0x7f120820" />
-    <public type="string" name="game_library_time_played_hours" id="0x7f120821" />
-    <public type="string" name="game_library_time_played_minutes" id="0x7f120822" />
-    <public type="string" name="game_library_time_played_none" id="0x7f120823" />
-    <public type="string" name="game_library_time_played_seconds" id="0x7f120824" />
-    <public type="string" name="game_library_updates_action_move_up" id="0x7f120825" />
-    <public type="string" name="game_library_updates_action_pause" id="0x7f120826" />
-    <public type="string" name="game_library_updates_action_remove" id="0x7f120827" />
-    <public type="string" name="game_library_updates_action_resume" id="0x7f120828" />
-    <public type="string" name="game_library_updates_header_disk" id="0x7f120829" />
-    <public type="string" name="game_library_updates_header_network" id="0x7f12082a" />
-    <public type="string" name="game_library_updates_installing" id="0x7f12082b" />
-    <public type="string" name="game_library_updates_installing_hours" id="0x7f12082c" />
-    <public type="string" name="game_library_updates_installing_minutes" id="0x7f12082d" />
-    <public type="string" name="game_library_updates_installing_seconds" id="0x7f12082e" />
-    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7f12082f" />
-    <public type="string" name="game_library_updates_progress_finalizing" id="0x7f120830" />
-    <public type="string" name="game_library_updates_progress_finished" id="0x7f120831" />
-    <public type="string" name="game_library_updates_progress_paused" id="0x7f120832" />
-    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7f120833" />
-    <public type="string" name="game_library_updates_progress_pausing" id="0x7f120834" />
-    <public type="string" name="game_library_updates_progress_planning" id="0x7f120835" />
-    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7f120836" />
-    <public type="string" name="game_library_updates_progress_queued" id="0x7f120837" />
-    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7f120838" />
-    <public type="string" name="game_library_updates_progress_repairing" id="0x7f120839" />
-    <public type="string" name="game_library_updates_progress_verifying" id="0x7f12083a" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7f12083b" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7f12083c" />
-    <public type="string" name="game_library_updates_updating" id="0x7f12083d" />
-    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7f12083e" />
-    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7f12083f" />
-    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7f120840" />
-    <public type="string" name="game_popout_follow" id="0x7f120841" />
-    <public type="string" name="game_popout_nitro_upsell" id="0x7f120842" />
-    <public type="string" name="game_popout_view_server" id="0x7f120843" />
-    <public type="string" name="gcm_defaultSenderId" id="0x7f120844" />
-    <public type="string" name="general_permissions" id="0x7f120845" />
-    <public type="string" name="generate_a_new_link" id="0x7f120846" />
-    <public type="string" name="generic_actions_menu_label" id="0x7f120847" />
-    <public type="string" name="get_started" id="0x7f120848" />
-    <public type="string" name="gif" id="0x7f120849" />
-    <public type="string" name="gif_auto_play_label" id="0x7f12084a" />
-    <public type="string" name="gif_auto_play_label_mobile" id="0x7f12084b" />
-    <public type="string" name="gif_button_label" id="0x7f12084c" />
-    <public type="string" name="gif_picker_enter_search" id="0x7f12084d" />
-    <public type="string" name="gif_picker_favorites" id="0x7f12084e" />
-    <public type="string" name="gif_picker_related_search" id="0x7f12084f" />
-    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7f120850" />
-    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7f120851" />
-    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7f120852" />
-    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7f120853" />
-    <public type="string" name="gift_code_auth_accept" id="0x7f120854" />
-    <public type="string" name="gift_code_auth_accepting" id="0x7f120855" />
-    <public type="string" name="gift_code_auth_check_verification_again" id="0x7f120856" />
-    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7f120857" />
-    <public type="string" name="gift_code_auth_fetching_user" id="0x7f120858" />
-    <public type="string" name="gift_code_auth_gifted" id="0x7f120859" />
-    <public type="string" name="gift_code_auth_gifted_by" id="0x7f12085a" />
-    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7f12085b" />
-    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7f12085c" />
-    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7f12085d" />
-    <public type="string" name="gift_code_auth_help_text_owned" id="0x7f12085e" />
-    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7f12085f" />
-    <public type="string" name="gift_code_auth_invalid_body" id="0x7f120860" />
-    <public type="string" name="gift_code_auth_invalid_tip" id="0x7f120861" />
-    <public type="string" name="gift_code_auth_invalid_title" id="0x7f120862" />
-    <public type="string" name="gift_code_auth_logged_in_as" id="0x7f120863" />
-    <public type="string" name="gift_code_auth_resolving" id="0x7f120864" />
-    <public type="string" name="gift_code_auth_verification_sent" id="0x7f120865" />
-    <public type="string" name="gift_code_auth_verification_title" id="0x7f120866" />
-    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7f120867" />
-    <public type="string" name="gift_code_hint" id="0x7f120868" />
-    <public type="string" name="gift_confirmation_body_claimed" id="0x7f120869" />
-    <public type="string" name="gift_confirmation_body_confirm" id="0x7f12086a" />
-    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7f12086b" />
-    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7f12086c" />
-    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7f12086d" />
-    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7f12086e" />
-    <public type="string" name="gift_confirmation_body_invalid" id="0x7f12086f" />
-    <public type="string" name="gift_confirmation_body_owned" id="0x7f120870" />
-    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7f120871" />
-    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7f120872" />
-    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7f120873" />
-    <public type="string" name="gift_confirmation_body_success" id="0x7f120874" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7f120875" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7f120876" />
-    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7f120877" />
-    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7f120878" />
-    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7f120879" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7f12087a" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7f12087b" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7f12087c" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7f12087d" />
-    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7f12087e" />
-    <public type="string" name="gift_confirmation_button_confirm" id="0x7f12087f" />
-    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7f120880" />
-    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7f120881" />
-    <public type="string" name="gift_confirmation_button_fail" id="0x7f120882" />
-    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7f120883" />
-    <public type="string" name="gift_confirmation_button_noice" id="0x7f120884" />
-    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7f120885" />
-    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7f120886" />
-    <public type="string" name="gift_confirmation_header_confirm" id="0x7f120887" />
-    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7f120888" />
-    <public type="string" name="gift_confirmation_header_fail" id="0x7f120889" />
-    <public type="string" name="gift_confirmation_header_success" id="0x7f12088a" />
-    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7f12088b" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7f12088c" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7f12088d" />
-    <public type="string" name="gift_embed_body_claimed_other" id="0x7f12088e" />
-    <public type="string" name="gift_embed_body_claimed_self" id="0x7f12088f" />
-    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7f120890" />
-    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7f120891" />
-    <public type="string" name="gift_embed_body_default" id="0x7f120892" />
-    <public type="string" name="gift_embed_body_giveaway" id="0x7f120893" />
-    <public type="string" name="gift_embed_body_no_user_default" id="0x7f120894" />
-    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7f120895" />
-    <public type="string" name="gift_embed_body_owned" id="0x7f120896" />
-    <public type="string" name="gift_embed_body_owned_mobile" id="0x7f120897" />
-    <public type="string" name="gift_embed_body_requires_verification" id="0x7f120898" />
-    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7f120899" />
-    <public type="string" name="gift_embed_body_self" id="0x7f12089a" />
-    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7f12089b" />
-    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7f12089c" />
-    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7f12089d" />
-    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7f12089e" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7f12089f" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7f1208a0" />
-    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7f1208a1" />
-    <public type="string" name="gift_embed_button_accept" id="0x7f1208a2" />
-    <public type="string" name="gift_embed_button_cant_accept" id="0x7f1208a3" />
-    <public type="string" name="gift_embed_button_claimed" id="0x7f1208a4" />
-    <public type="string" name="gift_embed_button_claiming" id="0x7f1208a5" />
-    <public type="string" name="gift_embed_button_owned" id="0x7f1208a6" />
-    <public type="string" name="gift_embed_copies_left" id="0x7f1208a7" />
-    <public type="string" name="gift_embed_expiration" id="0x7f1208a8" />
-    <public type="string" name="gift_embed_header_owner_invalid" id="0x7f1208a9" />
-    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7f1208aa" />
-    <public type="string" name="gift_embed_info_owner_invalid" id="0x7f1208ab" />
-    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7f1208ac" />
-    <public type="string" name="gift_embed_invalid" id="0x7f1208ad" />
-    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7f1208ae" />
-    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7f1208af" />
-    <public type="string" name="gift_embed_invalid_title_other" id="0x7f1208b0" />
-    <public type="string" name="gift_embed_invalid_title_self" id="0x7f1208b1" />
-    <public type="string" name="gift_embed_resolving" id="0x7f1208b2" />
-    <public type="string" name="gift_embed_subscriptions_left" id="0x7f1208b3" />
-    <public type="string" name="gift_embed_title" id="0x7f1208b4" />
-    <public type="string" name="gift_embed_title_self" id="0x7f1208b5" />
-    <public type="string" name="gift_embed_title_subscription" id="0x7f1208b6" />
-    <public type="string" name="gift_embed_title_subscription_self" id="0x7f1208b7" />
-    <public type="string" name="gift_inventory" id="0x7f1208b8" />
-    <public type="string" name="gift_inventory_copies" id="0x7f1208b9" />
-    <public type="string" name="gift_inventory_expires_in" id="0x7f1208ba" />
-    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7f1208bb" />
-    <public type="string" name="gift_inventory_generate_help" id="0x7f1208bc" />
-    <public type="string" name="gift_inventory_generate_link" id="0x7f1208bd" />
-    <public type="string" name="gift_inventory_generate_link_ios" id="0x7f1208be" />
-    <public type="string" name="gift_inventory_gifts_you_purchased" id="0x7f1208bf" />
-    <public type="string" name="gift_inventory_hidden" id="0x7f1208c0" />
-    <public type="string" name="gift_inventory_no_gifts" id="0x7f1208c1" />
-    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7f1208c2" />
-    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7f1208c3" />
-    <public type="string" name="gift_inventory_redeem_codes" id="0x7f1208c4" />
-    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7f1208c5" />
-    <public type="string" name="gift_inventory_subscription_months" id="0x7f1208c6" />
-    <public type="string" name="gift_inventory_subscription_years" id="0x7f1208c7" />
-    <public type="string" name="gift_inventory_your_gifts" id="0x7f1208c8" />
-    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7f1208c9" />
-    <public type="string" name="go_live_hey" id="0x7f1208ca" />
-    <public type="string" name="go_live_listen" id="0x7f1208cb" />
-    <public type="string" name="go_live_look" id="0x7f1208cc" />
-    <public type="string" name="go_live_modal_application_form_title" id="0x7f1208cd" />
-    <public type="string" name="go_live_modal_applications" id="0x7f1208ce" />
-    <public type="string" name="go_live_modal_cta" id="0x7f1208cf" />
-    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7f1208d0" />
-    <public type="string" name="go_live_modal_description" id="0x7f1208d1" />
-    <public type="string" name="go_live_modal_description_generic" id="0x7f1208d2" />
-    <public type="string" name="go_live_modal_description_select_source" id="0x7f1208d3" />
-    <public type="string" name="go_live_modal_guild_form_title" id="0x7f1208d4" />
-    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7f1208d5" />
-    <public type="string" name="go_live_modal_overflow_three_users" id="0x7f1208d6" />
-    <public type="string" name="go_live_modal_overflow_two_users" id="0x7f1208d7" />
-    <public type="string" name="go_live_modal_screens" id="0x7f1208d8" />
-    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7f1208d9" />
-    <public type="string" name="go_live_modal_select_guild_form_title" id="0x7f1208da" />
-    <public type="string" name="go_live_modal_title" id="0x7f1208db" />
-    <public type="string" name="go_live_private_channels_tooltip_body" id="0x7f1208dc" />
-    <public type="string" name="go_live_private_channels_tooltip_body_no_format" id="0x7f1208dd" />
-    <public type="string" name="go_live_private_channels_tooltip_cta" id="0x7f1208de" />
-    <public type="string" name="go_live_screenshare_no_sound" id="0x7f1208df" />
-    <public type="string" name="go_live_screenshare_update_for_soundshare" id="0x7f1208e0" />
-    <public type="string" name="go_live_share_screen" id="0x7f1208e1" />
-    <public type="string" name="go_live_tile_screen" id="0x7f1208e2" />
-    <public type="string" name="go_live_user_playing" id="0x7f1208e3" />
-    <public type="string" name="go_live_video_drivers_outdated" id="0x7f1208e4" />
-    <public type="string" name="go_live_viewers_action_sheet_not_spectating" id="0x7f1208e5" />
-    <public type="string" name="go_live_viewers_action_sheet_spectating" id="0x7f1208e6" />
-    <public type="string" name="go_live_viewers_action_sheet_streaming" id="0x7f1208e7" />
-    <public type="string" name="go_live_watching_user" id="0x7f1208e8" />
-    <public type="string" name="google_api_key" id="0x7f1208e9" />
-    <public type="string" name="google_app_id" id="0x7f1208ea" />
-    <public type="string" name="google_crash_reporting_api_key" id="0x7f1208eb" />
-    <public type="string" name="google_storage_bucket" id="0x7f1208ec" />
-    <public type="string" name="grant_temporary_membership" id="0x7f1208ed" />
-    <public type="string" name="green" id="0x7f1208ee" />
-    <public type="string" name="grey" id="0x7f1208ef" />
-    <public type="string" name="group_dm" id="0x7f1208f0" />
-    <public type="string" name="group_dm_add_friends" id="0x7f1208f1" />
-    <public type="string" name="group_dm_header" id="0x7f1208f2" />
-    <public type="string" name="group_dm_invite_confirm" id="0x7f1208f3" />
-    <public type="string" name="group_dm_invite_confirm_button" id="0x7f1208f4" />
-    <public type="string" name="group_dm_invite_confirm_description" id="0x7f1208f5" />
-    <public type="string" name="group_dm_invite_empty" id="0x7f1208f6" />
-    <public type="string" name="group_dm_invite_full_main" id="0x7f1208f7" />
-    <public type="string" name="group_dm_invite_full_sub" id="0x7f1208f8" />
-    <public type="string" name="group_dm_invite_full_sub2" id="0x7f1208f9" />
-    <public type="string" name="group_dm_invite_link_create" id="0x7f1208fa" />
-    <public type="string" name="group_dm_invite_link_example" id="0x7f1208fb" />
-    <public type="string" name="group_dm_invite_link_title" id="0x7f1208fc" />
-    <public type="string" name="group_dm_invite_no_friends" id="0x7f1208fd" />
-    <public type="string" name="group_dm_invite_not_friends" id="0x7f1208fe" />
-    <public type="string" name="group_dm_invite_remaining" id="0x7f1208ff" />
-    <public type="string" name="group_dm_invite_select_existing" id="0x7f120900" />
-    <public type="string" name="group_dm_invite_to" id="0x7f120901" />
-    <public type="string" name="group_dm_invite_unselect_users" id="0x7f120902" />
-    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7f120903" />
-    <public type="string" name="group_dm_invite_with_name" id="0x7f120904" />
-    <public type="string" name="group_dm_search_placeholder" id="0x7f120905" />
-    <public type="string" name="group_dm_settings" id="0x7f120906" />
-    <public type="string" name="group_message_a11y_label" id="0x7f120907" />
-    <public type="string" name="group_message_a11y_label_with_unreads" id="0x7f120908" />
-    <public type="string" name="group_name" id="0x7f120909" />
-    <public type="string" name="group_owner" id="0x7f12090a" />
-    <public type="string" name="groups" id="0x7f12090b" />
-    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7f12090c" />
-    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7f12090d" />
-    <public type="string" name="guild_actions_menu_label" id="0x7f12090e" />
-    <public type="string" name="guild_analyics_developers_button" id="0x7f12090f" />
-    <public type="string" name="guild_analytics_description" id="0x7f120910" />
-    <public type="string" name="guild_analytics_developers_cta" id="0x7f120911" />
-    <public type="string" name="guild_analytics_error_guild_size" id="0x7f120912" />
-    <public type="string" name="guild_analytics_error_message" id="0x7f120913" />
-    <public type="string" name="guild_analytics_metrics_last_week" id="0x7f120914" />
-    <public type="string" name="guild_create_description" id="0x7f120915" />
-    <public type="string" name="guild_create_title" id="0x7f120916" />
-    <public type="string" name="guild_create_upload_icon_button_text" id="0x7f120917" />
-    <public type="string" name="guild_create_upload_icon_label" id="0x7f120918" />
-    <public type="string" name="guild_create_upload_icon_recommended_size_label" id="0x7f120919" />
-    <public type="string" name="guild_discovery_all_category_filter" id="0x7f12091a" />
-    <public type="string" name="guild_discovery_category_footer_title" id="0x7f12091b" />
-    <public type="string" name="guild_discovery_category_search_placeholder" id="0x7f12091c" />
-    <public type="string" name="guild_discovery_category_title" id="0x7f12091d" />
-    <public type="string" name="guild_discovery_covid_body" id="0x7f12091e" />
-    <public type="string" name="guild_discovery_covid_button" id="0x7f12091f" />
-    <public type="string" name="guild_discovery_covid_title" id="0x7f120920" />
-    <public type="string" name="guild_discovery_emojis_tooltip" id="0x7f120921" />
-    <public type="string" name="guild_discovery_featured_header" id="0x7f120922" />
-    <public type="string" name="guild_discovery_footer_body" id="0x7f120923" />
-    <public type="string" name="guild_discovery_header_games_you_play" id="0x7f120924" />
-    <public type="string" name="guild_discovery_header_popular_guilds" id="0x7f120925" />
-    <public type="string" name="guild_discovery_header_search_results" id="0x7f120926" />
-    <public type="string" name="guild_discovery_home_subtitle" id="0x7f120927" />
-    <public type="string" name="guild_discovery_home_title" id="0x7f120928" />
-    <public type="string" name="guild_discovery_popular_header" id="0x7f120929" />
-    <public type="string" name="guild_discovery_search_empty_body" id="0x7f12092a" />
-    <public type="string" name="guild_discovery_search_empty_category_body" id="0x7f12092b" />
-    <public type="string" name="guild_discovery_search_empty_category_header" id="0x7f12092c" />
-    <public type="string" name="guild_discovery_search_empty_description" id="0x7f12092d" />
-    <public type="string" name="guild_discovery_search_empty_header" id="0x7f12092e" />
-    <public type="string" name="guild_discovery_search_empty_title" id="0x7f12092f" />
-    <public type="string" name="guild_discovery_search_enter_cta" id="0x7f120930" />
-    <public type="string" name="guild_discovery_search_error" id="0x7f120931" />
-    <public type="string" name="guild_discovery_search_header" id="0x7f120932" />
-    <public type="string" name="guild_discovery_search_label" id="0x7f120933" />
-    <public type="string" name="guild_discovery_search_placeholder" id="0x7f120934" />
-    <public type="string" name="guild_discovery_search_press_enter" id="0x7f120935" />
-    <public type="string" name="guild_discovery_search_results_category_header" id="0x7f120936" />
-    <public type="string" name="guild_discovery_search_results_header" id="0x7f120937" />
-    <public type="string" name="guild_discovery_tooltip" id="0x7f120938" />
-    <public type="string" name="guild_discovery_view_button" id="0x7f120939" />
-    <public type="string" name="guild_folder_color" id="0x7f12093a" />
-    <public type="string" name="guild_folder_name" id="0x7f12093b" />
-    <public type="string" name="guild_folder_tooltip_a11y_label" id="0x7f12093c" />
-    <public type="string" name="guild_members_header" id="0x7f12093d" />
-    <public type="string" name="guild_members_search_no_result" id="0x7f12093e" />
-    <public type="string" name="guild_owner" id="0x7f12093f" />
-    <public type="string" name="guild_partner_application_category_description" id="0x7f120940" />
-    <public type="string" name="guild_partner_application_category_label" id="0x7f120941" />
-    <public type="string" name="guild_partner_application_connect" id="0x7f120942" />
-    <public type="string" name="guild_partner_application_content_platform" id="0x7f120943" />
-    <public type="string" name="guild_partner_application_country" id="0x7f120944" />
-    <public type="string" name="guild_partner_application_creator_connect" id="0x7f120945" />
-    <public type="string" name="guild_partner_application_description_description" id="0x7f120946" />
-    <public type="string" name="guild_partner_application_description_title" id="0x7f120947" />
-    <public type="string" name="guild_partner_application_first_name" id="0x7f120948" />
-    <public type="string" name="guild_partner_application_has_errors" id="0x7f120949" />
-    <public type="string" name="guild_partner_application_language" id="0x7f12094a" />
-    <public type="string" name="guild_partner_application_last_name" id="0x7f12094b" />
-    <public type="string" name="guild_partner_application_other_platform" id="0x7f12094c" />
-    <public type="string" name="guild_partner_application_other_platform_description" id="0x7f12094d" />
-    <public type="string" name="guild_partner_application_other_platform_optional" id="0x7f12094e" />
-    <public type="string" name="guild_partner_application_server_step" id="0x7f12094f" />
-    <public type="string" name="guild_partner_application_server_step_description" id="0x7f120950" />
-    <public type="string" name="guild_partner_application_server_step_title" id="0x7f120951" />
-    <public type="string" name="guild_partner_application_subcategory_description" id="0x7f120952" />
-    <public type="string" name="guild_partner_application_submit_step" id="0x7f120953" />
-    <public type="string" name="guild_partner_application_submit_step_description" id="0x7f120954" />
-    <public type="string" name="guild_partner_application_submit_step_description_2" id="0x7f120955" />
-    <public type="string" name="guild_partner_application_submit_step_title" id="0x7f120956" />
-    <public type="string" name="guild_partner_application_survey_community_team_access" id="0x7f120957" />
-    <public type="string" name="guild_partner_application_survey_description" id="0x7f120958" />
-    <public type="string" name="guild_partner_application_survey_description_other" id="0x7f120959" />
-    <public type="string" name="guild_partner_application_survey_early_access_to_features" id="0x7f12095a" />
-    <public type="string" name="guild_partner_application_survey_new_ideas_suggestions" id="0x7f12095b" />
-    <public type="string" name="guild_partner_application_survey_other" id="0x7f12095c" />
-    <public type="string" name="guild_partner_application_survey_talk_with_other_partners" id="0x7f12095d" />
-    <public type="string" name="guild_partner_application_survey_title" id="0x7f12095e" />
-    <public type="string" name="guild_partner_application_title" id="0x7f12095f" />
-    <public type="string" name="guild_partner_application_type" id="0x7f120960" />
-    <public type="string" name="guild_partner_application_type_brand" id="0x7f120961" />
-    <public type="string" name="guild_partner_application_type_content" id="0x7f120962" />
-    <public type="string" name="guild_partner_application_type_fan" id="0x7f120963" />
-    <public type="string" name="guild_partner_application_type_other" id="0x7f120964" />
-    <public type="string" name="guild_partner_application_type_software" id="0x7f120965" />
-    <public type="string" name="guild_partner_application_user_step" id="0x7f120966" />
-    <public type="string" name="guild_partner_application_user_step_description" id="0x7f120967" />
-    <public type="string" name="guild_partner_application_user_step_description_content_creator" id="0x7f120968" />
-    <public type="string" name="guild_partner_application_user_step_title" id="0x7f120969" />
-    <public type="string" name="guild_partner_application_website" id="0x7f12096a" />
-    <public type="string" name="guild_partner_application_why_you_description" id="0x7f12096b" />
-    <public type="string" name="guild_partner_application_why_you_title" id="0x7f12096c" />
-    <public type="string" name="guild_partnered" id="0x7f12096d" />
-    <public type="string" name="guild_popout_unavailable_flavor" id="0x7f12096e" />
-    <public type="string" name="guild_popout_unavailable_header" id="0x7f12096f" />
-    <public type="string" name="guild_popout_view_server_button" id="0x7f120970" />
-    <public type="string" name="guild_premium" id="0x7f120971" />
-    <public type="string" name="guild_profile_join_server_button" id="0x7f120972" />
-    <public type="string" name="guild_security_req_mfa_body" id="0x7f120973" />
-    <public type="string" name="guild_security_req_mfa_enable" id="0x7f120974" />
-    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7f120975" />
-    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7f120976" />
-    <public type="string" name="guild_security_req_mfa_label" id="0x7f120977" />
-    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7f120978" />
-    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7f120979" />
-    <public type="string" name="guild_select" id="0x7f12097a" />
-    <public type="string" name="guild_settings_action_filter_bot_add" id="0x7f12097b" />
-    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7f12097c" />
-    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7f12097d" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7f12097e" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7f12097f" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7f120980" />
-    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7f120981" />
-    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7f120982" />
-    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7f120983" />
-    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7f120984" />
-    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7f120985" />
-    <public type="string" name="guild_settings_action_filter_integration_create" id="0x7f120986" />
-    <public type="string" name="guild_settings_action_filter_integration_delete" id="0x7f120987" />
-    <public type="string" name="guild_settings_action_filter_integration_update" id="0x7f120988" />
-    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7f120989" />
-    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7f12098a" />
-    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7f12098b" />
-    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7f12098c" />
-    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7f12098d" />
-    <public type="string" name="guild_settings_action_filter_member_disconnect" id="0x7f12098e" />
-    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7f12098f" />
-    <public type="string" name="guild_settings_action_filter_member_move" id="0x7f120990" />
-    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7f120991" />
-    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7f120992" />
-    <public type="string" name="guild_settings_action_filter_member_update" id="0x7f120993" />
-    <public type="string" name="guild_settings_action_filter_message_bulk_delete" id="0x7f120994" />
-    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7f120995" />
-    <public type="string" name="guild_settings_action_filter_message_pin" id="0x7f120996" />
-    <public type="string" name="guild_settings_action_filter_message_unpin" id="0x7f120997" />
-    <public type="string" name="guild_settings_action_filter_role_create" id="0x7f120998" />
-    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7f120999" />
-    <public type="string" name="guild_settings_action_filter_role_update" id="0x7f12099a" />
-    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7f12099b" />
-    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7f12099c" />
-    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7f12099d" />
-    <public type="string" name="guild_settings_audit_log_bot_add" id="0x7f12099e" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7f12099f" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7f1209a0" />
-    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7f1209a1" />
-    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7f1209a2" />
-    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7f1209a3" />
-    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7f1209a4" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7f1209a5" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7f1209a6" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7f1209a7" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7f1209a8" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7f1209a9" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7f1209aa" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7f1209ab" />
-    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7f1209ac" />
-    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7f1209ad" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7f1209ae" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7f1209af" />
-    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7f1209b0" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7f1209b1" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7f1209b2" />
-    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7f1209b3" />
-    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7f1209b4" />
-    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7f1209b5" />
-    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7f1209b6" />
-    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7f1209b7" />
-    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7f1209b8" />
-    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7f1209b9" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7f1209ba" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7f1209bb" />
-    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7f1209bc" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7f1209bd" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7f1209be" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7f1209bf" />
-    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7f1209c0" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7f1209c1" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7f1209c2" />
-    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7f1209c3" />
-    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7f1209c4" />
-    <public type="string" name="guild_settings_audit_log_guild_discovery_splash_hash_change" id="0x7f1209c5" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7f1209c6" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7f1209c7" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7f1209c8" />
-    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7f1209c9" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7f1209ca" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7f1209cb" />
-    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7f1209cc" />
-    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7f1209cd" />
-    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7f1209ce" />
-    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7f1209cf" />
-    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_change" id="0x7f1209d0" />
-    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_clear" id="0x7f1209d1" />
-    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7f1209d2" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7f1209d3" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7f1209d4" />
-    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7f1209d5" />
-    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_change" id="0x7f1209d6" />
-    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_clear" id="0x7f1209d7" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7f1209d8" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7f1209d9" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7f1209da" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7f1209db" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7f1209dc" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7f1209dd" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7f1209de" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7f1209df" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7f1209e0" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7f1209e1" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7f1209e2" />
-    <public type="string" name="guild_settings_audit_log_integration_create" id="0x7f1209e3" />
-    <public type="string" name="guild_settings_audit_log_integration_delete" id="0x7f1209e4" />
-    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_off" id="0x7f1209e5" />
-    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_on" id="0x7f1209e6" />
-    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_kick_from_server" id="0x7f1209e7" />
-    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_remove_synced_role" id="0x7f1209e8" />
-    <public type="string" name="guild_settings_audit_log_integration_expire_grace_period" id="0x7f1209e9" />
-    <public type="string" name="guild_settings_audit_log_integration_update" id="0x7f1209ea" />
-    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7f1209eb" />
-    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7f1209ec" />
-    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7f1209ed" />
-    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7f1209ee" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7f1209ef" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7f1209f0" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7f1209f1" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7f1209f2" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7f1209f3" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7f1209f4" />
-    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7f1209f5" />
-    <public type="string" name="guild_settings_audit_log_load_more" id="0x7f1209f6" />
-    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7f1209f7" />
-    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7f1209f8" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7f1209f9" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7f1209fa" />
-    <public type="string" name="guild_settings_audit_log_member_disconnect" id="0x7f1209fb" />
-    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7f1209fc" />
-    <public type="string" name="guild_settings_audit_log_member_move" id="0x7f1209fd" />
-    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7f1209fe" />
-    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7f1209ff" />
-    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7f120a00" />
-    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7f120a01" />
-    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7f120a02" />
-    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7f120a03" />
-    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7f120a04" />
-    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7f120a05" />
-    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7f120a06" />
-    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7f120a07" />
-    <public type="string" name="guild_settings_audit_log_member_update" id="0x7f120a08" />
-    <public type="string" name="guild_settings_audit_log_message_bulk_delete" id="0x7f120a09" />
-    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7f120a0a" />
-    <public type="string" name="guild_settings_audit_log_message_pin" id="0x7f120a0b" />
-    <public type="string" name="guild_settings_audit_log_message_unpin" id="0x7f120a0c" />
-    <public type="string" name="guild_settings_audit_log_role_color" id="0x7f120a0d" />
-    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7f120a0e" />
-    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7f120a0f" />
-    <public type="string" name="guild_settings_audit_log_role_create" id="0x7f120a10" />
-    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7f120a11" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7f120a12" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7f120a13" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7f120a14" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7f120a15" />
-    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7f120a16" />
-    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7f120a17" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7f120a18" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7f120a19" />
-    <public type="string" name="guild_settings_audit_log_role_update" id="0x7f120a1a" />
-    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7f120a1b" />
-    <public type="string" name="guild_settings_audit_log_unknown_action" id="0x7f120a1c" />
-    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7f120a1d" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7f120a1e" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7f120a1f" />
-    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7f120a20" />
-    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7f120a21" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7f120a22" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7f120a23" />
-    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7f120a24" />
-    <public type="string" name="guild_settings_banner_recommend" id="0x7f120a25" />
-    <public type="string" name="guild_settings_community" id="0x7f120a26" />
-    <public type="string" name="guild_settings_community_administrator_only" id="0x7f120a27" />
-    <public type="string" name="guild_settings_community_disable_community" id="0x7f120a28" />
-    <public type="string" name="guild_settings_community_disable_community_description" id="0x7f120a29" />
-    <public type="string" name="guild_settings_community_enable_community" id="0x7f120a2a" />
-    <public type="string" name="guild_settings_community_intro_body" id="0x7f120a2b" />
-    <public type="string" name="guild_settings_community_intro_details" id="0x7f120a2c" />
-    <public type="string" name="guild_settings_community_intro_details_mobile" id="0x7f120a2d" />
-    <public type="string" name="guild_settings_community_intro_header" id="0x7f120a2e" />
-    <public type="string" name="guild_settings_community_intro_learn_more" id="0x7f120a2f" />
-    <public type="string" name="guild_settings_community_intro_upsell_analytics_body" id="0x7f120a30" />
-    <public type="string" name="guild_settings_community_intro_upsell_analytics_header" id="0x7f120a31" />
-    <public type="string" name="guild_settings_community_intro_upsell_analytics_tooltip" id="0x7f120a32" />
-    <public type="string" name="guild_settings_community_intro_upsell_discovery_body" id="0x7f120a33" />
-    <public type="string" name="guild_settings_community_intro_upsell_discovery_header" id="0x7f120a34" />
-    <public type="string" name="guild_settings_community_intro_upsell_partner_body" id="0x7f120a35" />
-    <public type="string" name="guild_settings_community_intro_upsell_partner_header" id="0x7f120a36" />
-    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_body" id="0x7f120a37" />
-    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_header" id="0x7f120a38" />
-    <public type="string" name="guild_settings_community_locale_help" id="0x7f120a39" />
-    <public type="string" name="guild_settings_community_mod_channel_help" id="0x7f120a3a" />
-    <public type="string" name="guild_settings_community_mod_channel_help_mobile" id="0x7f120a3b" />
-    <public type="string" name="guild_settings_community_mod_channel_selector_title" id="0x7f120a3c" />
-    <public type="string" name="guild_settings_community_mod_channel_title" id="0x7f120a3d" />
-    <public type="string" name="guild_settings_community_rules_channel_help" id="0x7f120a3e" />
-    <public type="string" name="guild_settings_community_rules_channel_help_mobile" id="0x7f120a3f" />
-    <public type="string" name="guild_settings_community_upsell_body" id="0x7f120a40" />
-    <public type="string" name="guild_settings_community_upsell_button_analytics" id="0x7f120a41" />
-    <public type="string" name="guild_settings_community_upsell_button_discovery" id="0x7f120a42" />
-    <public type="string" name="guild_settings_community_upsell_button_welcome_screen" id="0x7f120a43" />
-    <public type="string" name="guild_settings_community_upsell_header" id="0x7f120a44" />
-    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7f120a45" />
-    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7f120a46" />
-    <public type="string" name="guild_settings_default_notifications_large_guild_notify_all" id="0x7f120a47" />
-    <public type="string" name="guild_settings_disable_discoverable" id="0x7f120a48" />
-    <public type="string" name="guild_settings_discovery_admin_only" id="0x7f120a49" />
-    <public type="string" name="guild_settings_discovery_byline" id="0x7f120a4a" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa" id="0x7f120a4b" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa_description" id="0x7f120a4c" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa_description_failing" id="0x7f120a4d" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa_failing" id="0x7f120a4e" />
-    <public type="string" name="guild_settings_discovery_checklist_abide_by_guidelines" id="0x7f120a4f" />
-    <public type="string" name="guild_settings_discovery_checklist_age" id="0x7f120a50" />
-    <public type="string" name="guild_settings_discovery_checklist_age_description" id="0x7f120a51" />
-    <public type="string" name="guild_settings_discovery_checklist_age_description_failing" id="0x7f120a52" />
-    <public type="string" name="guild_settings_discovery_checklist_age_failing" id="0x7f120a53" />
-    <public type="string" name="guild_settings_discovery_checklist_bad_standing" id="0x7f120a54" />
-    <public type="string" name="guild_settings_discovery_checklist_change_channel_categories" id="0x7f120a55" />
-    <public type="string" name="guild_settings_discovery_checklist_change_channel_names" id="0x7f120a56" />
-    <public type="string" name="guild_settings_discovery_checklist_change_description" id="0x7f120a57" />
-    <public type="string" name="guild_settings_discovery_checklist_change_name" id="0x7f120a58" />
-    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action" id="0x7f120a59" />
-    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action_details" id="0x7f120a5a" />
-    <public type="string" name="guild_settings_discovery_checklist_communicator_progress_label" id="0x7f120a5b" />
-    <public type="string" name="guild_settings_discovery_checklist_engagement_failing" id="0x7f120a5c" />
-    <public type="string" name="guild_settings_discovery_checklist_good_standing" id="0x7f120a5d" />
-    <public type="string" name="guild_settings_discovery_checklist_health_definitions_intro" id="0x7f120a5e" />
-    <public type="string" name="guild_settings_discovery_checklist_health_view_details" id="0x7f120a5f" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy" id="0x7f120a60" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description" id="0x7f120a61" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description_failing" id="0x7f120a62" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending" id="0x7f120a63" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending_size" id="0x7f120a64" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_failing" id="0x7f120a65" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_pending" id="0x7f120a66" />
-    <public type="string" name="guild_settings_discovery_checklist_loading" id="0x7f120a67" />
-    <public type="string" name="guild_settings_discovery_checklist_nsfw" id="0x7f120a68" />
-    <public type="string" name="guild_settings_discovery_checklist_nsfw_description" id="0x7f120a69" />
-    <public type="string" name="guild_settings_discovery_checklist_nsfw_failing" id="0x7f120a6a" />
-    <public type="string" name="guild_settings_discovery_checklist_progress_requirement_label" id="0x7f120a6b" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_failing" id="0x7f120a6c" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action" id="0x7f120a6d" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action_details_updated" id="0x7f120a6e" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_progress_label" id="0x7f120a6f" />
-    <public type="string" name="guild_settings_discovery_checklist_safe" id="0x7f120a70" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_description" id="0x7f120a71" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing" id="0x7f120a72" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing_guidelines" id="0x7f120a73" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_failing" id="0x7f120a74" />
-    <public type="string" name="guild_settings_discovery_checklist_score_explain" id="0x7f120a75" />
-    <public type="string" name="guild_settings_discovery_checklist_size" id="0x7f120a76" />
-    <public type="string" name="guild_settings_discovery_checklist_size_description" id="0x7f120a77" />
-    <public type="string" name="guild_settings_discovery_checklist_size_description_failing" id="0x7f120a78" />
-    <public type="string" name="guild_settings_discovery_checklist_size_description_failing_partners" id="0x7f120a79" />
-    <public type="string" name="guild_settings_discovery_checklist_size_failing" id="0x7f120a7a" />
-    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action" id="0x7f120a7b" />
-    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action_details" id="0x7f120a7c" />
-    <public type="string" name="guild_settings_discovery_checklist_visitor_progress_label" id="0x7f120a7d" />
-    <public type="string" name="guild_settings_discovery_disable_public_confirm_text" id="0x7f120a7e" />
-    <public type="string" name="guild_settings_discovery_disable_public_confirm_title" id="0x7f120a7f" />
-    <public type="string" name="guild_settings_discovery_disqualified" id="0x7f120a80" />
-    <public type="string" name="guild_settings_discovery_disqualified_description" id="0x7f120a81" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_description" id="0x7f120a82" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_disable" id="0x7f120a83" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_enable" id="0x7f120a84" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_title" id="0x7f120a85" />
-    <public type="string" name="guild_settings_discovery_enabled_modal_body" id="0x7f120a86" />
-    <public type="string" name="guild_settings_discovery_enabled_modal_dismiss" id="0x7f120a87" />
-    <public type="string" name="guild_settings_discovery_enabled_modal_header" id="0x7f120a88" />
-    <public type="string" name="guild_settings_discovery_header" id="0x7f120a89" />
-    <public type="string" name="guild_settings_discovery_locale_help" id="0x7f120a8a" />
-    <public type="string" name="guild_settings_discovery_pending_healthy" id="0x7f120a8b" />
-    <public type="string" name="guild_settings_discovery_perk_customize" id="0x7f120a8c" />
-    <public type="string" name="guild_settings_discovery_perk_featured" id="0x7f120a8d" />
-    <public type="string" name="guild_settings_discovery_perk_find" id="0x7f120a8e" />
-    <public type="string" name="guild_settings_discovery_preview_description" id="0x7f120a8f" />
-    <public type="string" name="guild_settings_discovery_primary_category_description" id="0x7f120a90" />
-    <public type="string" name="guild_settings_discovery_primary_category_title" id="0x7f120a91" />
-    <public type="string" name="guild_settings_discovery_put_guild_on_map" id="0x7f120a92" />
-    <public type="string" name="guild_settings_discovery_requirements_not_met" id="0x7f120a93" />
-    <public type="string" name="guild_settings_discovery_search_keywords_description" id="0x7f120a94" />
-    <public type="string" name="guild_settings_discovery_search_keywords_title" id="0x7f120a95" />
-    <public type="string" name="guild_settings_discovery_subcategory_title" id="0x7f120a96" />
-    <public type="string" name="guild_settings_emoji_alias" id="0x7f120a97" />
-    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7f120a98" />
-    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7f120a99" />
-    <public type="string" name="guild_settings_enable_discoverable" id="0x7f120a9a" />
-    <public type="string" name="guild_settings_filter_action" id="0x7f120a9b" />
-    <public type="string" name="guild_settings_filter_all" id="0x7f120a9c" />
-    <public type="string" name="guild_settings_filter_all_actions" id="0x7f120a9d" />
-    <public type="string" name="guild_settings_filter_all_users" id="0x7f120a9e" />
-    <public type="string" name="guild_settings_filter_user" id="0x7f120a9f" />
-    <public type="string" name="guild_settings_filtered_action" id="0x7f120aa0" />
-    <public type="string" name="guild_settings_filtered_user" id="0x7f120aa1" />
-    <public type="string" name="guild_settings_follower_analytics" id="0x7f120aa2" />
-    <public type="string" name="guild_settings_follower_analytics_description" id="0x7f120aa3" />
-    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7f120aa4" />
-    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7f120aa5" />
-    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7f120aa6" />
-    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7f120aa7" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7f120aa8" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7f120aa9" />
-    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7f120aaa" />
-    <public type="string" name="guild_settings_follower_analytics_post" id="0x7f120aab" />
-    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7f120aac" />
-    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7f120aad" />
-    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7f120aae" />
-    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7f120aaf" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7f120ab0" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7f120ab1" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7f120ab2" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7f120ab3" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7f120ab4" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7f120ab5" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7f120ab6" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7f120ab7" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7f120ab8" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7f120ab9" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7f120aba" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7f120abb" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7f120abc" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7f120abd" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7f120abe" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7f120abf" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7f120ac0" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7f120ac1" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7f120ac2" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7f120ac3" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7f120ac4" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7f120ac5" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7f120ac6" />
-    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7f120ac7" />
-    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7f120ac8" />
-    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7f120ac9" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7f120aca" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7f120acb" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7f120acc" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7f120acd" />
-    <public type="string" name="guild_settings_icon_recommend" id="0x7f120ace" />
-    <public type="string" name="guild_settings_label_audit_log" id="0x7f120acf" />
-    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7f120ad0" />
-    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7f120ad1" />
-    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7f120ad2" />
-    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7f120ad3" />
-    <public type="string" name="guild_settings_members_add_role" id="0x7f120ad4" />
-    <public type="string" name="guild_settings_members_display_role" id="0x7f120ad5" />
-    <public type="string" name="guild_settings_members_remove_role" id="0x7f120ad6" />
-    <public type="string" name="guild_settings_members_server_members" id="0x7f120ad7" />
-    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7f120ad8" />
-    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7f120ad9" />
-    <public type="string" name="guild_settings_overview_tier_info" id="0x7f120ada" />
-    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7f120adb" />
-    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7f120adc" />
-    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7f120add" />
-    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7f120ade" />
-    <public type="string" name="guild_settings_premium_guild_title" id="0x7f120adf" />
-    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7f120ae0" />
-    <public type="string" name="guild_settings_premium_upsell_body_perk_guild_subscription_discount" id="0x7f120ae1" />
-    <public type="string" name="guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions" id="0x7f120ae2" />
-    <public type="string" name="guild_settings_premium_upsell_body_perk_num_guild_subscriptions" id="0x7f120ae3" />
-    <public type="string" name="guild_settings_premium_upsell_heading_primary" id="0x7f120ae4" />
-    <public type="string" name="guild_settings_premium_upsell_heading_secondary" id="0x7f120ae5" />
-    <public type="string" name="guild_settings_premium_upsell_heading_secondary_premium_user" id="0x7f120ae6" />
-    <public type="string" name="guild_settings_premium_upsell_heading_tertiary_premium_user" id="0x7f120ae7" />
-    <public type="string" name="guild_settings_premium_upsell_learn_more" id="0x7f120ae8" />
-    <public type="string" name="guild_settings_premium_upsell_subheading" id="0x7f120ae9" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_extra_android" id="0x7f120aea" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_extra_ios" id="0x7f120aeb" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1" id="0x7f120aec" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1_mobile" id="0x7f120aed" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2" id="0x7f120aee" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2_mobile" id="0x7f120aef" />
-    <public type="string" name="guild_settings_public_mod_channel_title" id="0x7f120af0" />
-    <public type="string" name="guild_settings_public_no_option_selected" id="0x7f120af1" />
-    <public type="string" name="guild_settings_public_update_failed" id="0x7f120af2" />
-    <public type="string" name="guild_settings_public_welcome" id="0x7f120af3" />
-    <public type="string" name="guild_settings_public_welcome_add_recommended_channel" id="0x7f120af4" />
-    <public type="string" name="guild_settings_public_welcome_channel_delete" id="0x7f120af5" />
-    <public type="string" name="guild_settings_public_welcome_channel_description_placeholder" id="0x7f120af6" />
-    <public type="string" name="guild_settings_public_welcome_channel_edit" id="0x7f120af7" />
-    <public type="string" name="guild_settings_public_welcome_channel_move_down" id="0x7f120af8" />
-    <public type="string" name="guild_settings_public_welcome_channel_move_up" id="0x7f120af9" />
-    <public type="string" name="guild_settings_public_welcome_description_placeholder" id="0x7f120afa" />
-    <public type="string" name="guild_settings_public_welcome_enable_reminder" id="0x7f120afb" />
-    <public type="string" name="guild_settings_public_welcome_enabled" id="0x7f120afc" />
-    <public type="string" name="guild_settings_public_welcome_enabled_second_line" id="0x7f120afd" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_description_1" id="0x7f120afe" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_description_2" id="0x7f120aff" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_description_3" id="0x7f120b00" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_name_1" id="0x7f120b01" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_name_2" id="0x7f120b02" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_name_3" id="0x7f120b03" />
-    <public type="string" name="guild_settings_public_welcome_example_description" id="0x7f120b04" />
-    <public type="string" name="guild_settings_public_welcome_example_title" id="0x7f120b05" />
-    <public type="string" name="guild_settings_public_welcome_intro_button" id="0x7f120b06" />
-    <public type="string" name="guild_settings_public_welcome_intro_text" id="0x7f120b07" />
-    <public type="string" name="guild_settings_public_welcome_invalid_channel" id="0x7f120b08" />
-    <public type="string" name="guild_settings_public_welcome_only_viewable_channels" id="0x7f120b09" />
-    <public type="string" name="guild_settings_public_welcome_pick_channel" id="0x7f120b0a" />
-    <public type="string" name="guild_settings_public_welcome_preview" id="0x7f120b0b" />
-    <public type="string" name="guild_settings_public_welcome_progress_will_save" id="0x7f120b0c" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_add" id="0x7f120b0d" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_edit" id="0x7f120b0e" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channels_description" id="0x7f120b0f" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channels_title" id="0x7f120b10" />
-    <public type="string" name="guild_settings_public_welcome_select_a_channel" id="0x7f120b11" />
-    <public type="string" name="guild_settings_public_welcome_set_description" id="0x7f120b12" />
-    <public type="string" name="guild_settings_public_welcome_settings_text" id="0x7f120b13" />
-    <public type="string" name="guild_settings_public_welcome_title" id="0x7f120b14" />
-    <public type="string" name="guild_settings_public_welcome_update_failure" id="0x7f120b15" />
-    <public type="string" name="guild_settings_server_banner" id="0x7f120b16" />
-    <public type="string" name="guild_settings_server_invite_background" id="0x7f120b17" />
-    <public type="string" name="guild_settings_splash_info" id="0x7f120b18" />
-    <public type="string" name="guild_settings_splash_recommend" id="0x7f120b19" />
-    <public type="string" name="guild_settings_title_server_widget" id="0x7f120b1a" />
-    <public type="string" name="guild_settings_widget_embed_help" id="0x7f120b1b" />
-    <public type="string" name="guild_settings_widget_enable_widget" id="0x7f120b1c" />
-    <public type="string" name="guild_sidebar_a11y_label" id="0x7f120b1d" />
-    <public type="string" name="guild_sidebar_announcement_channel_a11y_label" id="0x7f120b1e" />
-    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_mentions" id="0x7f120b1f" />
-    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_unreads" id="0x7f120b20" />
-    <public type="string" name="guild_sidebar_default_channel_a11y_label" id="0x7f120b21" />
-    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_mentions" id="0x7f120b22" />
-    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_unreads" id="0x7f120b23" />
-    <public type="string" name="guild_sidebar_store_channel_a11y_label" id="0x7f120b24" />
-    <public type="string" name="guild_sidebar_voice_channel_a11y_label" id="0x7f120b25" />
-    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_limit" id="0x7f120b26" />
-    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_users" id="0x7f120b27" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_close_button" id="0x7f120b28" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description" id="0x7f120b29" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description_generic_guild" id="0x7f120b2a" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile1" id="0x7f120b2b" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile2" id="0x7f120b2c" />
-    <public type="string" name="guild_subscription_purchase_modal_apple" id="0x7f120b2d" />
-    <public type="string" name="guild_subscription_purchase_modal_counter" id="0x7f120b2e" />
-    <public type="string" name="guild_subscription_purchase_modal_footer_discount" id="0x7f120b2f" />
-    <public type="string" name="guild_subscription_purchase_modal_footer_upsell" id="0x7f120b30" />
-    <public type="string" name="guild_subscription_purchase_modal_footer_upsell_trial" id="0x7f120b31" />
-    <public type="string" name="guild_subscription_purchase_modal_invoice_row_content" id="0x7f120b32" />
-    <public type="string" name="guild_subscription_purchase_modal_payment_source_tooltip" id="0x7f120b33" />
-    <public type="string" name="guild_subscription_purchase_modal_purchase_details_header" id="0x7f120b34" />
-    <public type="string" name="guild_subscription_purchase_modal_step_select_description" id="0x7f120b35" />
-    <public type="string" name="guild_subscription_purchase_modal_submit" id="0x7f120b36" />
-    <public type="string" name="guild_subscription_purchase_modal_subtotal" id="0x7f120b37" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description" id="0x7f120b38" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description_generic_guild" id="0x7f120b39" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile1" id="0x7f120b3a" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile2" id="0x7f120b3b" />
-    <public type="string" name="guild_subscription_purchase_modal_unused_slot_notice" id="0x7f120b3c" />
-    <public type="string" name="guild_template_based_on" id="0x7f120b3d" />
-    <public type="string" name="guild_template_create_discord" id="0x7f120b3e" />
-    <public type="string" name="guild_template_default_server_name_classroom" id="0x7f120b3f" />
-    <public type="string" name="guild_template_default_server_name_create_from_scratch" id="0x7f120b40" />
-    <public type="string" name="guild_template_default_server_name_creators_hobbies" id="0x7f120b41" />
-    <public type="string" name="guild_template_default_server_name_friends_family" id="0x7f120b42" />
-    <public type="string" name="guild_template_default_server_name_global_communities" id="0x7f120b43" />
-    <public type="string" name="guild_template_default_server_name_local_communities" id="0x7f120b44" />
-    <public type="string" name="guild_template_default_server_name_study_groups" id="0x7f120b45" />
-    <public type="string" name="guild_template_embed_view_in_app" id="0x7f120b46" />
-    <public type="string" name="guild_template_header_clubs" id="0x7f120b47" />
-    <public type="string" name="guild_template_header_community" id="0x7f120b48" />
-    <public type="string" name="guild_template_header_create" id="0x7f120b49" />
-    <public type="string" name="guild_template_header_creator" id="0x7f120b4a" />
-    <public type="string" name="guild_template_header_friend" id="0x7f120b4b" />
-    <public type="string" name="guild_template_header_gaming" id="0x7f120b4c" />
-    <public type="string" name="guild_template_header_study" id="0x7f120b4d" />
-    <public type="string" name="guild_template_invalid_subtitle" id="0x7f120b4e" />
-    <public type="string" name="guild_template_invalid_title" id="0x7f120b4f" />
-    <public type="string" name="guild_template_mobile_invalid_cta" id="0x7f120b50" />
-    <public type="string" name="guild_template_mobile_invalid_error" id="0x7f120b51" />
-    <public type="string" name="guild_template_modal_channels_descriptions" id="0x7f120b52" />
-    <public type="string" name="guild_template_modal_channels_header" id="0x7f120b53" />
-    <public type="string" name="guild_template_modal_channels_tip" id="0x7f120b54" />
-    <public type="string" name="guild_template_modal_description_classroom" id="0x7f120b55" />
-    <public type="string" name="guild_template_modal_description_create_from_scratch" id="0x7f120b56" />
-    <public type="string" name="guild_template_modal_description_creators_hobbies" id="0x7f120b57" />
-    <public type="string" name="guild_template_modal_description_friends_family" id="0x7f120b58" />
-    <public type="string" name="guild_template_modal_description_global_communities" id="0x7f120b59" />
-    <public type="string" name="guild_template_modal_description_local_communities" id="0x7f120b5a" />
-    <public type="string" name="guild_template_modal_description_study_groups" id="0x7f120b5b" />
-    <public type="string" name="guild_template_modal_error_title" id="0x7f120b5c" />
-    <public type="string" name="guild_template_modal_roles_description" id="0x7f120b5d" />
-    <public type="string" name="guild_template_modal_roles_header" id="0x7f120b5e" />
-    <public type="string" name="guild_template_modal_roles_header2" id="0x7f120b5f" />
-    <public type="string" name="guild_template_modal_title" id="0x7f120b60" />
-    <public type="string" name="guild_template_modal_title_classroom" id="0x7f120b61" />
-    <public type="string" name="guild_template_modal_title_create_from_scratch" id="0x7f120b62" />
-    <public type="string" name="guild_template_modal_title_creators_hobbies" id="0x7f120b63" />
-    <public type="string" name="guild_template_modal_title_friends_family" id="0x7f120b64" />
-    <public type="string" name="guild_template_modal_title_global_communities" id="0x7f120b65" />
-    <public type="string" name="guild_template_modal_title_local_communities" id="0x7f120b66" />
-    <public type="string" name="guild_template_modal_title_study_groups" id="0x7f120b67" />
-    <public type="string" name="guild_template_name_announcements" id="0x7f120b68" />
-    <public type="string" name="guild_template_name_category_information" id="0x7f120b69" />
-    <public type="string" name="guild_template_name_category_text" id="0x7f120b6a" />
-    <public type="string" name="guild_template_name_category_voice" id="0x7f120b6b" />
-    <public type="string" name="guild_template_name_clips_and_highlights" id="0x7f120b6c" />
-    <public type="string" name="guild_template_name_events" id="0x7f120b6d" />
-    <public type="string" name="guild_template_name_game" id="0x7f120b6e" />
-    <public type="string" name="guild_template_name_game_new" id="0x7f120b6f" />
-    <public type="string" name="guild_template_name_game_room" id="0x7f120b70" />
-    <public type="string" name="guild_template_name_general" id="0x7f120b71" />
-    <public type="string" name="guild_template_name_giveaways" id="0x7f120b72" />
-    <public type="string" name="guild_template_name_homework" id="0x7f120b73" />
-    <public type="string" name="guild_template_name_homework_help" id="0x7f120b74" />
-    <public type="string" name="guild_template_name_ideas_and_feedback" id="0x7f120b75" />
-    <public type="string" name="guild_template_name_meeting_plans" id="0x7f120b76" />
-    <public type="string" name="guild_template_name_meetups" id="0x7f120b77" />
-    <public type="string" name="guild_template_name_memes" id="0x7f120b78" />
-    <public type="string" name="guild_template_name_music" id="0x7f120b79" />
-    <public type="string" name="guild_template_name_notes" id="0x7f120b7a" />
-    <public type="string" name="guild_template_name_notes_resources" id="0x7f120b7b" />
-    <public type="string" name="guild_template_name_off_topic" id="0x7f120b7c" />
-    <public type="string" name="guild_template_name_random" id="0x7f120b7d" />
-    <public type="string" name="guild_template_name_resources" id="0x7f120b7e" />
-    <public type="string" name="guild_template_name_session_planning" id="0x7f120b7f" />
-    <public type="string" name="guild_template_name_social" id="0x7f120b80" />
-    <public type="string" name="guild_template_name_strategy" id="0x7f120b81" />
-    <public type="string" name="guild_template_name_voice_community_hangout" id="0x7f120b82" />
-    <public type="string" name="guild_template_name_voice_gaming" id="0x7f120b83" />
-    <public type="string" name="guild_template_name_voice_general" id="0x7f120b84" />
-    <public type="string" name="guild_template_name_voice_lobby" id="0x7f120b85" />
-    <public type="string" name="guild_template_name_voice_lounge" id="0x7f120b86" />
-    <public type="string" name="guild_template_name_voice_meeting_room" id="0x7f120b87" />
-    <public type="string" name="guild_template_name_voice_stream_room" id="0x7f120b88" />
-    <public type="string" name="guild_template_name_voice_study_room" id="0x7f120b89" />
-    <public type="string" name="guild_template_name_welcome" id="0x7f120b8a" />
-    <public type="string" name="guild_template_name_welcome_and_rules" id="0x7f120b8b" />
-    <public type="string" name="guild_template_open" id="0x7f120b8c" />
-    <public type="string" name="guild_template_preview_description" id="0x7f120b8d" />
-    <public type="string" name="guild_template_preview_protip_body" id="0x7f120b8e" />
-    <public type="string" name="guild_template_preview_title" id="0x7f120b8f" />
-    <public type="string" name="guild_template_resolved_embed_title" id="0x7f120b90" />
-    <public type="string" name="guild_template_resolving_title" id="0x7f120b91" />
-    <public type="string" name="guild_template_selector_description" id="0x7f120b92" />
-    <public type="string" name="guild_template_selector_option_header" id="0x7f120b93" />
-    <public type="string" name="guild_template_selector_suggestion" id="0x7f120b94" />
-    <public type="string" name="guild_template_selector_title" id="0x7f120b95" />
-    <public type="string" name="guild_template_settings_description" id="0x7f120b96" />
-    <public type="string" name="guild_template_setup_discord" id="0x7f120b97" />
-    <public type="string" name="guild_template_usages" id="0x7f120b98" />
-    <public type="string" name="guild_template_usages_by_creator2" id="0x7f120b99" />
-    <public type="string" name="guild_template_usages_no_bold" id="0x7f120b9a" />
-    <public type="string" name="guild_templates" id="0x7f120b9b" />
-    <public type="string" name="guild_templates_create_link" id="0x7f120b9c" />
-    <public type="string" name="guild_templates_default_template_name" id="0x7f120b9d" />
-    <public type="string" name="guild_templates_delete_description" id="0x7f120b9e" />
-    <public type="string" name="guild_templates_delete_template" id="0x7f120b9f" />
-    <public type="string" name="guild_templates_delete_template_link" id="0x7f120ba0" />
-    <public type="string" name="guild_templates_form_description_channels" id="0x7f120ba1" />
-    <public type="string" name="guild_templates_form_description_members" id="0x7f120ba2" />
-    <public type="string" name="guild_templates_form_description_messages" id="0x7f120ba3" />
-    <public type="string" name="guild_templates_form_description_perks" id="0x7f120ba4" />
-    <public type="string" name="guild_templates_form_description_roles" id="0x7f120ba5" />
-    <public type="string" name="guild_templates_form_description_settings" id="0x7f120ba6" />
-    <public type="string" name="guild_templates_form_description_will_copy" id="0x7f120ba7" />
-    <public type="string" name="guild_templates_form_description_wont_copy" id="0x7f120ba8" />
-    <public type="string" name="guild_templates_form_error_name_required" id="0x7f120ba9" />
-    <public type="string" name="guild_templates_form_label_description" id="0x7f120baa" />
-    <public type="string" name="guild_templates_form_label_icon" id="0x7f120bab" />
-    <public type="string" name="guild_templates_form_label_link" id="0x7f120bac" />
-    <public type="string" name="guild_templates_form_label_name" id="0x7f120bad" />
-    <public type="string" name="guild_templates_form_label_server_name_classroom" id="0x7f120bae" />
-    <public type="string" name="guild_templates_form_label_server_name_create_from_scratch" id="0x7f120baf" />
-    <public type="string" name="guild_templates_form_label_server_name_creators_hobbies" id="0x7f120bb0" />
-    <public type="string" name="guild_templates_form_label_server_name_friends_family" id="0x7f120bb1" />
-    <public type="string" name="guild_templates_form_label_server_name_global_communities" id="0x7f120bb2" />
-    <public type="string" name="guild_templates_form_label_server_name_local_communities" id="0x7f120bb3" />
-    <public type="string" name="guild_templates_form_label_server_name_study_groups" id="0x7f120bb4" />
-    <public type="string" name="guild_templates_form_placeholder_description" id="0x7f120bb5" />
-    <public type="string" name="guild_templates_form_placeholder_name" id="0x7f120bb6" />
-    <public type="string" name="guild_templates_last_sync" id="0x7f120bb7" />
-    <public type="string" name="guild_templates_preview_template" id="0x7f120bb8" />
-    <public type="string" name="guild_templates_promotion_tooltip" id="0x7f120bb9" />
-    <public type="string" name="guild_templates_promotion_tooltip_aria_label" id="0x7f120bba" />
-    <public type="string" name="guild_templates_sync_description" id="0x7f120bbb" />
-    <public type="string" name="guild_templates_sync_template" id="0x7f120bbc" />
-    <public type="string" name="guild_templates_template_sync" id="0x7f120bbd" />
-    <public type="string" name="guild_templates_unsynced_tooltip" id="0x7f120bbe" />
-    <public type="string" name="guild_templates_unsynced_warning" id="0x7f120bbf" />
-    <public type="string" name="guild_tooltip_a11y_label" id="0x7f120bc0" />
-    <public type="string" name="guild_unavailable_body" id="0x7f120bc1" />
-    <public type="string" name="guild_unavailable_header" id="0x7f120bc2" />
-    <public type="string" name="guild_unavailable_title" id="0x7f120bc3" />
-    <public type="string" name="guild_verification_text_account_age" id="0x7f120bc4" />
-    <public type="string" name="guild_verification_text_member_age" id="0x7f120bc5" />
-    <public type="string" name="guild_verification_text_not_claimed" id="0x7f120bc6" />
-    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7f120bc7" />
-    <public type="string" name="guild_verification_text_not_verified" id="0x7f120bc8" />
-    <public type="string" name="guild_verified" id="0x7f120bc9" />
-    <public type="string" name="guild_video_call_marketing_popout_body" id="0x7f120bca" />
-    <public type="string" name="guild_video_call_marketing_popout_header" id="0x7f120bcb" />
-    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7f120bcc" />
-    <public type="string" name="guilds_bar_a11y_label" id="0x7f120bcd" />
-    <public type="string" name="hardware_acceleration" id="0x7f120bce" />
-    <public type="string" name="hardware_acceleration_help_text" id="0x7f120bcf" />
-    <public type="string" name="help" id="0x7f120bd0" />
-    <public type="string" name="help_clear_permissions" id="0x7f120bd1" />
-    <public type="string" name="help_desk" id="0x7f120bd2" />
-    <public type="string" name="help_missing_manage_roles_permission" id="0x7f120bd3" />
-    <public type="string" name="help_missing_permission" id="0x7f120bd4" />
-    <public type="string" name="help_role_locked" id="0x7f120bd5" />
-    <public type="string" name="help_role_locked_mine" id="0x7f120bd6" />
-    <public type="string" name="help_roles_description" id="0x7f120bd7" />
-    <public type="string" name="help_singular_permission" id="0x7f120bd8" />
-    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7f120bd9" />
-    <public type="string" name="hide_chat" id="0x7f120bda" />
-    <public type="string" name="hide_instant_invites_description" id="0x7f120bdb" />
-    <public type="string" name="hide_instant_invites_label" id="0x7f120bdc" />
-    <public type="string" name="hide_muted" id="0x7f120bdd" />
-    <public type="string" name="hide_muted_channels" id="0x7f120bde" />
-    <public type="string" name="hide_navigation" id="0x7f120bdf" />
-    <public type="string" name="hide_personal_information_description" id="0x7f120be0" />
-    <public type="string" name="hide_personal_information_label" id="0x7f120be1" />
-    <public type="string" name="hold_up" id="0x7f120be2" />
-    <public type="string" name="home" id="0x7f120be3" />
-    <public type="string" name="how_to_invite_others" id="0x7f120be4" />
-    <public type="string" name="hr" id="0x7f120be5" />
-    <public type="string" name="hu" id="0x7f120be6" />
-    <public type="string" name="humanize_duration_a_few_seconds" id="0x7f120be7" />
-    <public type="string" name="humanize_duration_days" id="0x7f120be8" />
-    <public type="string" name="humanize_duration_hours" id="0x7f120be9" />
-    <public type="string" name="humanize_duration_minutes" id="0x7f120bea" />
-    <public type="string" name="humanize_duration_seconds" id="0x7f120beb" />
-    <public type="string" name="hypesquad_attendee_cta" id="0x7f120bec" />
-    <public type="string" name="hypesquad_badge_tooltip" id="0x7f120bed" />
-    <public type="string" name="hypesquad_description_house_1" id="0x7f120bee" />
-    <public type="string" name="hypesquad_description_house_2" id="0x7f120bef" />
-    <public type="string" name="hypesquad_description_house_3" id="0x7f120bf0" />
-    <public type="string" name="hypesquad_error_body" id="0x7f120bf1" />
-    <public type="string" name="hypesquad_error_heading" id="0x7f120bf2" />
-    <public type="string" name="hypesquad_heading" id="0x7f120bf3" />
-    <public type="string" name="hypesquad_heading_existing_member" id="0x7f120bf4" />
-    <public type="string" name="hypesquad_house_1" id="0x7f120bf5" />
-    <public type="string" name="hypesquad_house_2" id="0x7f120bf6" />
-    <public type="string" name="hypesquad_house_3" id="0x7f120bf7" />
-    <public type="string" name="hypesquad_join" id="0x7f120bf8" />
-    <public type="string" name="hypesquad_leave_action" id="0x7f120bf9" />
-    <public type="string" name="hypesquad_leave_error" id="0x7f120bfa" />
-    <public type="string" name="hypesquad_leave_prompt" id="0x7f120bfb" />
-    <public type="string" name="hypesquad_membership_heading" id="0x7f120bfc" />
-    <public type="string" name="hypesquad_newsletter_warning" id="0x7f120bfd" />
-    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7f120bfe" />
-    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7f120bff" />
-    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7f120c00" />
-    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7f120c01" />
-    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7f120c02" />
-    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7f120c03" />
-    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7f120c04" />
-    <public type="string" name="hypesquad_perks_heading" id="0x7f120c05" />
-    <public type="string" name="hypesquad_question_0_prompt" id="0x7f120c06" />
-    <public type="string" name="hypesquad_question_0_response_a" id="0x7f120c07" />
-    <public type="string" name="hypesquad_question_0_response_b" id="0x7f120c08" />
-    <public type="string" name="hypesquad_question_0_response_c" id="0x7f120c09" />
-    <public type="string" name="hypesquad_question_0_response_d" id="0x7f120c0a" />
-    <public type="string" name="hypesquad_question_10_prompt" id="0x7f120c0b" />
-    <public type="string" name="hypesquad_question_10_response_a" id="0x7f120c0c" />
-    <public type="string" name="hypesquad_question_10_response_b" id="0x7f120c0d" />
-    <public type="string" name="hypesquad_question_10_response_c" id="0x7f120c0e" />
-    <public type="string" name="hypesquad_question_10_response_d" id="0x7f120c0f" />
-    <public type="string" name="hypesquad_question_11_prompt" id="0x7f120c10" />
-    <public type="string" name="hypesquad_question_11_response_a" id="0x7f120c11" />
-    <public type="string" name="hypesquad_question_11_response_b" id="0x7f120c12" />
-    <public type="string" name="hypesquad_question_11_response_c" id="0x7f120c13" />
-    <public type="string" name="hypesquad_question_11_response_d" id="0x7f120c14" />
-    <public type="string" name="hypesquad_question_12_prompt" id="0x7f120c15" />
-    <public type="string" name="hypesquad_question_12_response_a" id="0x7f120c16" />
-    <public type="string" name="hypesquad_question_12_response_b" id="0x7f120c17" />
-    <public type="string" name="hypesquad_question_12_response_c" id="0x7f120c18" />
-    <public type="string" name="hypesquad_question_12_response_d" id="0x7f120c19" />
-    <public type="string" name="hypesquad_question_13_prompt" id="0x7f120c1a" />
-    <public type="string" name="hypesquad_question_13_response_a" id="0x7f120c1b" />
-    <public type="string" name="hypesquad_question_13_response_b" id="0x7f120c1c" />
-    <public type="string" name="hypesquad_question_13_response_c" id="0x7f120c1d" />
-    <public type="string" name="hypesquad_question_13_response_d" id="0x7f120c1e" />
-    <public type="string" name="hypesquad_question_14_prompt" id="0x7f120c1f" />
-    <public type="string" name="hypesquad_question_14_response_a" id="0x7f120c20" />
-    <public type="string" name="hypesquad_question_14_response_b" id="0x7f120c21" />
-    <public type="string" name="hypesquad_question_14_response_c" id="0x7f120c22" />
-    <public type="string" name="hypesquad_question_14_response_d" id="0x7f120c23" />
-    <public type="string" name="hypesquad_question_1_prompt" id="0x7f120c24" />
-    <public type="string" name="hypesquad_question_1_response_a" id="0x7f120c25" />
-    <public type="string" name="hypesquad_question_1_response_b" id="0x7f120c26" />
-    <public type="string" name="hypesquad_question_1_response_c" id="0x7f120c27" />
-    <public type="string" name="hypesquad_question_1_response_d" id="0x7f120c28" />
-    <public type="string" name="hypesquad_question_2_prompt" id="0x7f120c29" />
-    <public type="string" name="hypesquad_question_2_response_a" id="0x7f120c2a" />
-    <public type="string" name="hypesquad_question_2_response_b" id="0x7f120c2b" />
-    <public type="string" name="hypesquad_question_2_response_c" id="0x7f120c2c" />
-    <public type="string" name="hypesquad_question_2_response_d" id="0x7f120c2d" />
-    <public type="string" name="hypesquad_question_3_prompt" id="0x7f120c2e" />
-    <public type="string" name="hypesquad_question_3_response_a" id="0x7f120c2f" />
-    <public type="string" name="hypesquad_question_3_response_b" id="0x7f120c30" />
-    <public type="string" name="hypesquad_question_3_response_c" id="0x7f120c31" />
-    <public type="string" name="hypesquad_question_3_response_d" id="0x7f120c32" />
-    <public type="string" name="hypesquad_question_4_prompt" id="0x7f120c33" />
-    <public type="string" name="hypesquad_question_4_response_a" id="0x7f120c34" />
-    <public type="string" name="hypesquad_question_4_response_b" id="0x7f120c35" />
-    <public type="string" name="hypesquad_question_4_response_c" id="0x7f120c36" />
-    <public type="string" name="hypesquad_question_4_response_d" id="0x7f120c37" />
-    <public type="string" name="hypesquad_question_5_prompt" id="0x7f120c38" />
-    <public type="string" name="hypesquad_question_5_response_a" id="0x7f120c39" />
-    <public type="string" name="hypesquad_question_5_response_b" id="0x7f120c3a" />
-    <public type="string" name="hypesquad_question_5_response_c" id="0x7f120c3b" />
-    <public type="string" name="hypesquad_question_5_response_d" id="0x7f120c3c" />
-    <public type="string" name="hypesquad_question_6_prompt" id="0x7f120c3d" />
-    <public type="string" name="hypesquad_question_6_response_a" id="0x7f120c3e" />
-    <public type="string" name="hypesquad_question_6_response_b" id="0x7f120c3f" />
-    <public type="string" name="hypesquad_question_6_response_c" id="0x7f120c40" />
-    <public type="string" name="hypesquad_question_6_response_d" id="0x7f120c41" />
-    <public type="string" name="hypesquad_question_7_prompt" id="0x7f120c42" />
-    <public type="string" name="hypesquad_question_7_response_a" id="0x7f120c43" />
-    <public type="string" name="hypesquad_question_7_response_b" id="0x7f120c44" />
-    <public type="string" name="hypesquad_question_7_response_c" id="0x7f120c45" />
-    <public type="string" name="hypesquad_question_7_response_d" id="0x7f120c46" />
-    <public type="string" name="hypesquad_question_8_prompt" id="0x7f120c47" />
-    <public type="string" name="hypesquad_question_8_response_a" id="0x7f120c48" />
-    <public type="string" name="hypesquad_question_8_response_b" id="0x7f120c49" />
-    <public type="string" name="hypesquad_question_8_response_c" id="0x7f120c4a" />
-    <public type="string" name="hypesquad_question_8_response_d" id="0x7f120c4b" />
-    <public type="string" name="hypesquad_question_9_prompt" id="0x7f120c4c" />
-    <public type="string" name="hypesquad_question_9_response_a" id="0x7f120c4d" />
-    <public type="string" name="hypesquad_question_9_response_b" id="0x7f120c4e" />
-    <public type="string" name="hypesquad_question_9_response_c" id="0x7f120c4f" />
-    <public type="string" name="hypesquad_question_9_response_d" id="0x7f120c50" />
-    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7f120c51" />
-    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7f120c52" />
-    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7f120c53" />
-    <public type="string" name="hypesquad_quiz_cancel" id="0x7f120c54" />
-    <public type="string" name="hypesquad_quiz_close" id="0x7f120c55" />
-    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7f120c56" />
-    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7f120c57" />
-    <public type="string" name="hypesquad_quiz_next_question" id="0x7f120c58" />
-    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7f120c59" />
-    <public type="string" name="hypesquad_quiz_retry" id="0x7f120c5a" />
-    <public type="string" name="hypesquad_quiz_select_answer" id="0x7f120c5b" />
-    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7f120c5c" />
-    <public type="string" name="hypesquad_quiz_title" id="0x7f120c5d" />
-    <public type="string" name="hypesquad_ready_to_rep" id="0x7f120c5e" />
-    <public type="string" name="hypesquad_subheading" id="0x7f120c5f" />
-    <public type="string" name="hypesquad_switch_houses_action" id="0x7f120c60" />
-    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7f120c61" />
-    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7f120c62" />
-    <public type="string" name="hypesquad_unverified_email_notice" id="0x7f120c63" />
-    <public type="string" name="hypesquad_your_house" id="0x7f120c64" />
-    <public type="string" name="i18n_locale_loading_error" id="0x7f120c65" />
-    <public type="string" name="icon_content_description" id="0x7f120c66" />
-    <public type="string" name="image" id="0x7f120c67" />
-    <public type="string" name="image_actions_menu_label" id="0x7f120c68" />
-    <public type="string" name="images" id="0x7f120c69" />
-    <public type="string" name="img_alt_attachment_file_type" id="0x7f120c6a" />
-    <public type="string" name="img_alt_emoji" id="0x7f120c6b" />
-    <public type="string" name="img_alt_icon" id="0x7f120c6c" />
-    <public type="string" name="img_alt_logo" id="0x7f120c6d" />
-    <public type="string" name="in_category" id="0x7f120c6e" />
-    <public type="string" name="in_game_voice_settings" id="0x7f120c6f" />
-    <public type="string" name="in_the_voice_channel" id="0x7f120c70" />
-    <public type="string" name="inbox" id="0x7f120c71" />
-    <public type="string" name="incoming_call" id="0x7f120c72" />
-    <public type="string" name="incoming_call_ellipsis" id="0x7f120c73" />
-    <public type="string" name="incoming_call_preview_camera" id="0x7f120c74" />
-    <public type="string" name="incoming_friend_request" id="0x7f120c75" />
-    <public type="string" name="incoming_friend_requests_count" id="0x7f120c76" />
-    <public type="string" name="incoming_video_call" id="0x7f120c77" />
-    <public type="string" name="incoming_video_call_ellipsis" id="0x7f120c78" />
-    <public type="string" name="incompatible_browser" id="0x7f120c79" />
-    <public type="string" name="inivte_modal_no_thanks" id="0x7f120c7a" />
-    <public type="string" name="inline_attachment_media" id="0x7f120c7b" />
-    <public type="string" name="inline_attachment_media_help" id="0x7f120c7c" />
-    <public type="string" name="inline_embed_media" id="0x7f120c7d" />
-    <public type="string" name="inline_media_label" id="0x7f120c7e" />
-    <public type="string" name="input_device" id="0x7f120c7f" />
-    <public type="string" name="input_mode_ptt" id="0x7f120c80" />
-    <public type="string" name="input_mode_ptt_limited" id="0x7f120c81" />
-    <public type="string" name="input_mode_ptt_release_delay" id="0x7f120c82" />
-    <public type="string" name="input_mode_vad" id="0x7f120c83" />
-    <public type="string" name="instagram" id="0x7f120c84" />
-    <public type="string" name="install_location_main" id="0x7f120c85" />
-    <public type="string" name="instant_invite" id="0x7f120c86" />
-    <public type="string" name="instant_invite_accept" id="0x7f120c87" />
-    <public type="string" name="instant_invite_accepting" id="0x7f120c88" />
-    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7f120c89" />
-    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7f120c8a" />
-    <public type="string" name="instant_invite_banned" id="0x7f120c8b" />
-    <public type="string" name="instant_invite_banned_info" id="0x7f120c8c" />
-    <public type="string" name="instant_invite_expired" id="0x7f120c8d" />
-    <public type="string" name="instant_invite_expires" id="0x7f120c8e" />
-    <public type="string" name="instant_invite_failed_to_generate" id="0x7f120c8f" />
-    <public type="string" name="instant_invite_friends" id="0x7f120c90" />
-    <public type="string" name="instant_invite_friends_description" id="0x7f120c91" />
-    <public type="string" name="instant_invite_generated_by_widget" id="0x7f120c92" />
-    <public type="string" name="instant_invite_guild_by_user" id="0x7f120c93" />
-    <public type="string" name="instant_invite_guild_members_online" id="0x7f120c94" />
-    <public type="string" name="instant_invite_guild_members_total" id="0x7f120c95" />
-    <public type="string" name="instant_invite_hidden" id="0x7f120c96" />
-    <public type="string" name="instant_invite_invalid_channel" id="0x7f120c97" />
-    <public type="string" name="instant_invite_invite_code" id="0x7f120c98" />
-    <public type="string" name="instant_invite_inviter" id="0x7f120c99" />
-    <public type="string" name="instant_invite_looks_like" id="0x7f120c9a" />
-    <public type="string" name="instant_invite_not_allowed" id="0x7f120c9b" />
-    <public type="string" name="instant_invite_resolved_title" id="0x7f120c9c" />
-    <public type="string" name="instant_invite_resolving" id="0x7f120c9d" />
-    <public type="string" name="instant_invite_uses" id="0x7f120c9e" />
-    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7f120c9f" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7f120ca0" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7f120ca1" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7f120ca2" />
-    <public type="string" name="instant_invite_you_have_joined" id="0x7f120ca3" />
-    <public type="string" name="instant_invites" id="0x7f120ca4" />
-    <public type="string" name="integration_added_date" id="0x7f120ca5" />
-    <public type="string" name="integration_added_user" id="0x7f120ca6" />
-    <public type="string" name="integration_added_user_date" id="0x7f120ca7" />
-    <public type="string" name="integration_created_date" id="0x7f120ca8" />
-    <public type="string" name="integration_created_user_date" id="0x7f120ca9" />
-    <public type="string" name="integration_settings" id="0x7f120caa" />
-    <public type="string" name="integrations" id="0x7f120cab" />
-    <public type="string" name="integrations_account_description" id="0x7f120cac" />
-    <public type="string" name="integrations_application_added_by" id="0x7f120cad" />
-    <public type="string" name="integrations_application_bot" id="0x7f120cae" />
-    <public type="string" name="integrations_application_bot_name" id="0x7f120caf" />
-    <public type="string" name="integrations_application_button" id="0x7f120cb0" />
-    <public type="string" name="integrations_application_denied_permissions" id="0x7f120cb1" />
-    <public type="string" name="integrations_application_granted_permissions" id="0x7f120cb2" />
-    <public type="string" name="integrations_application_no_bot" id="0x7f120cb3" />
-    <public type="string" name="integrations_application_no_webhooks" id="0x7f120cb4" />
-    <public type="string" name="integrations_application_remove" id="0x7f120cb5" />
-    <public type="string" name="integrations_application_remove_body" id="0x7f120cb6" />
-    <public type="string" name="integrations_application_remove_error" id="0x7f120cb7" />
-    <public type="string" name="integrations_application_remove_error_title" id="0x7f120cb8" />
-    <public type="string" name="integrations_application_remove_no_permissions" id="0x7f120cb9" />
-    <public type="string" name="integrations_application_remove_summary" id="0x7f120cba" />
-    <public type="string" name="integrations_application_remove_title" id="0x7f120cbb" />
-    <public type="string" name="integrations_application_section" id="0x7f120cbc" />
-    <public type="string" name="integrations_application_verified_bot" id="0x7f120cbd" />
-    <public type="string" name="integrations_application_webhooks" id="0x7f120cbe" />
-    <public type="string" name="integrations_channel_following" id="0x7f120cbf" />
-    <public type="string" name="integrations_channel_following_button" id="0x7f120cc0" />
-    <public type="string" name="integrations_channel_following_description" id="0x7f120cc1" />
-    <public type="string" name="integrations_channel_following_empty" id="0x7f120cc2" />
-    <public type="string" name="integrations_channel_following_empty_button" id="0x7f120cc3" />
-    <public type="string" name="integrations_channel_following_section" id="0x7f120cc4" />
-    <public type="string" name="integrations_channel_following_summary" id="0x7f120cc5" />
-    <public type="string" name="integrations_channel_following_title" id="0x7f120cc6" />
-    <public type="string" name="integrations_disable" id="0x7f120cc7" />
-    <public type="string" name="integrations_enable" id="0x7f120cc8" />
-    <public type="string" name="integrations_enabled" id="0x7f120cc9" />
-    <public type="string" name="integrations_followed_channel_delete" id="0x7f120cca" />
-    <public type="string" name="integrations_followed_channel_delete_body" id="0x7f120ccb" />
-    <public type="string" name="integrations_followed_channel_delete_title" id="0x7f120ccc" />
-    <public type="string" name="integrations_followed_channel_dest_channel" id="0x7f120ccd" />
-    <public type="string" name="integrations_followed_channel_error_deleting" id="0x7f120cce" />
-    <public type="string" name="integrations_followed_channel_guild_source" id="0x7f120ccf" />
-    <public type="string" name="integrations_followed_channel_name" id="0x7f120cd0" />
-    <public type="string" name="integrations_last_sync" id="0x7f120cd1" />
-    <public type="string" name="integrations_overview" id="0x7f120cd2" />
-    <public type="string" name="integrations_overview_description_channel" id="0x7f120cd3" />
-    <public type="string" name="integrations_overview_description_guild" id="0x7f120cd4" />
-    <public type="string" name="integrations_overview_no_applications" id="0x7f120cd5" />
-    <public type="string" name="integrations_twitch" id="0x7f120cd6" />
-    <public type="string" name="integrations_twitch_button" id="0x7f120cd7" />
-    <public type="string" name="integrations_twitch_description" id="0x7f120cd8" />
-    <public type="string" name="integrations_twitch_empty_button" id="0x7f120cd9" />
-    <public type="string" name="integrations_twitch_empty_summary" id="0x7f120cda" />
-    <public type="string" name="integrations_twitch_help" id="0x7f120cdb" />
-    <public type="string" name="integrations_twitch_summary" id="0x7f120cdc" />
-    <public type="string" name="integrations_webhook_copied_url" id="0x7f120cdd" />
-    <public type="string" name="integrations_webhook_copy_url" id="0x7f120cde" />
-    <public type="string" name="integrations_webhook_delete" id="0x7f120cdf" />
-    <public type="string" name="integrations_webhooks" id="0x7f120ce0" />
-    <public type="string" name="integrations_webhooks_button" id="0x7f120ce1" />
-    <public type="string" name="integrations_webhooks_count" id="0x7f120ce2" />
-    <public type="string" name="integrations_webhooks_create" id="0x7f120ce3" />
-    <public type="string" name="integrations_webhooks_description" id="0x7f120ce4" />
-    <public type="string" name="integrations_webhooks_empty" id="0x7f120ce5" />
-    <public type="string" name="integrations_webhooks_empty_button" id="0x7f120ce6" />
-    <public type="string" name="integrations_webhooks_summary" id="0x7f120ce7" />
-    <public type="string" name="integrations_youtube" id="0x7f120ce8" />
-    <public type="string" name="integrations_youtube_button" id="0x7f120ce9" />
-    <public type="string" name="integrations_youtube_description" id="0x7f120cea" />
-    <public type="string" name="integrations_youtube_empty_button" id="0x7f120ceb" />
-    <public type="string" name="integrations_youtube_empty_summary" id="0x7f120cec" />
-    <public type="string" name="integrations_youtube_help" id="0x7f120ced" />
-    <public type="string" name="integrations_youtube_summary" id="0x7f120cee" />
-    <public type="string" name="interaction_required_body" id="0x7f120cef" />
-    <public type="string" name="interaction_required_title" id="0x7f120cf0" />
-    <public type="string" name="internal_server_error" id="0x7f120cf1" />
-    <public type="string" name="invalid_animated_emoji_body" id="0x7f120cf2" />
-    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7f120cf3" />
-    <public type="string" name="invalid_attachments_failure" id="0x7f120cf4" />
-    <public type="string" name="invalid_external_emoji_body" id="0x7f120cf5" />
-    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7f120cf6" />
-    <public type="string" name="invalid_invite_link_error" id="0x7f120cf7" />
-    <public type="string" name="invalid_text_channel" id="0x7f120cf8" />
-    <public type="string" name="invalid_voice_channel" id="0x7f120cf9" />
-    <public type="string" name="invite_button_body_in_guild" id="0x7f120cfa" />
-    <public type="string" name="invite_button_expired" id="0x7f120cfb" />
-    <public type="string" name="invite_button_invalid" id="0x7f120cfc" />
-    <public type="string" name="invite_button_invalid_owner" id="0x7f120cfd" />
-    <public type="string" name="invite_button_resolving" id="0x7f120cfe" />
-    <public type="string" name="invite_button_stream_ended" id="0x7f120cff" />
-    <public type="string" name="invite_button_stream_ended_streamer" id="0x7f120d00" />
-    <public type="string" name="invite_button_stream_watching" id="0x7f120d01" />
-    <public type="string" name="invite_button_streamer" id="0x7f120d02" />
-    <public type="string" name="invite_button_streaming" id="0x7f120d03" />
-    <public type="string" name="invite_button_streaming_subtext" id="0x7f120d04" />
-    <public type="string" name="invite_button_title_invited" id="0x7f120d05" />
-    <public type="string" name="invite_button_title_invited_group_dm" id="0x7f120d06" />
-    <public type="string" name="invite_button_title_invited_invalid" id="0x7f120d07" />
-    <public type="string" name="invite_button_title_invited_stream" id="0x7f120d08" />
-    <public type="string" name="invite_button_title_invited_voice_channel" id="0x7f120d09" />
-    <public type="string" name="invite_button_title_inviter" id="0x7f120d0a" />
-    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7f120d0b" />
-    <public type="string" name="invite_button_title_inviter_invalid" id="0x7f120d0c" />
-    <public type="string" name="invite_button_title_inviter_stream" id="0x7f120d0d" />
-    <public type="string" name="invite_button_title_inviter_voice_channel" id="0x7f120d0e" />
-    <public type="string" name="invite_button_title_streaming" id="0x7f120d0f" />
-    <public type="string" name="invite_copied" id="0x7f120d10" />
-    <public type="string" name="invite_copy_invite_link_header_mobile" id="0x7f120d11" />
-    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7f120d12" />
-    <public type="string" name="invite_edit_link" id="0x7f120d13" />
-    <public type="string" name="invite_embed_ask_to_join" id="0x7f120d14" />
-    <public type="string" name="invite_embed_full_group" id="0x7f120d15" />
-    <public type="string" name="invite_embed_game_has_ended" id="0x7f120d16" />
-    <public type="string" name="invite_embed_game_invite" id="0x7f120d17" />
-    <public type="string" name="invite_embed_in_group" id="0x7f120d18" />
-    <public type="string" name="invite_embed_invite_to_join" id="0x7f120d19" />
-    <public type="string" name="invite_embed_invite_to_join_group" id="0x7f120d1a" />
-    <public type="string" name="invite_embed_invite_to_listen" id="0x7f120d1b" />
-    <public type="string" name="invite_embed_invite_to_watch" id="0x7f120d1c" />
-    <public type="string" name="invite_embed_join_via_android" id="0x7f120d1d" />
-    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7f120d1e" />
-    <public type="string" name="invite_embed_join_via_ios" id="0x7f120d1f" />
-    <public type="string" name="invite_embed_join_via_xbox" id="0x7f120d20" />
-    <public type="string" name="invite_embed_joined" id="0x7f120d21" />
-    <public type="string" name="invite_embed_listen_has_ended" id="0x7f120d22" />
-    <public type="string" name="invite_embed_listening_invite" id="0x7f120d23" />
-    <public type="string" name="invite_embed_num_open_slots" id="0x7f120d24" />
-    <public type="string" name="invite_embed_send_invite" id="0x7f120d25" />
-    <public type="string" name="invite_embed_watch_has_ended" id="0x7f120d26" />
-    <public type="string" name="invite_empty_body" id="0x7f120d27" />
-    <public type="string" name="invite_empty_title" id="0x7f120d28" />
-    <public type="string" name="invite_expired_subtext_mobile" id="0x7f120d29" />
-    <public type="string" name="invite_expires_days" id="0x7f120d2a" />
-    <public type="string" name="invite_expires_days_or_uses" id="0x7f120d2b" />
-    <public type="string" name="invite_expires_hours" id="0x7f120d2c" />
-    <public type="string" name="invite_expires_hours_or_uses" id="0x7f120d2d" />
-    <public type="string" name="invite_expires_minutes" id="0x7f120d2e" />
-    <public type="string" name="invite_expires_minutes_or_uses" id="0x7f120d2f" />
-    <public type="string" name="invite_expires_never" id="0x7f120d30" />
-    <public type="string" name="invite_expires_uses" id="0x7f120d31" />
-    <public type="string" name="invite_footer_link_header" id="0x7f120d32" />
-    <public type="string" name="invite_friend_modal_invite" id="0x7f120d33" />
-    <public type="string" name="invite_friend_modal_loading" id="0x7f120d34" />
-    <public type="string" name="invite_friend_modal_no_results" id="0x7f120d35" />
-    <public type="string" name="invite_friend_modal_retry" id="0x7f120d36" />
-    <public type="string" name="invite_friend_modal_sent" id="0x7f120d37" />
-    <public type="string" name="invite_friend_modal_title" id="0x7f120d38" />
-    <public type="string" name="invite_friends" id="0x7f120d39" />
-    <public type="string" name="invite_invalid_cta" id="0x7f120d3a" />
-    <public type="string" name="invite_invalid_error" id="0x7f120d3b" />
-    <public type="string" name="invite_link_copied" id="0x7f120d3c" />
-    <public type="string" name="invite_link_example_full" id="0x7f120d3d" />
-    <public type="string" name="invite_link_example_simple" id="0x7f120d3e" />
-    <public type="string" name="invite_link_example_verified" id="0x7f120d3f" />
-    <public type="string" name="invite_links_expire_after_1_day" id="0x7f120d40" />
-    <public type="string" name="invite_members" id="0x7f120d41" />
-    <public type="string" name="invite_modal_button" id="0x7f120d42" />
-    <public type="string" name="invite_modal_error_default" id="0x7f120d43" />
-    <public type="string" name="invite_modal_error_title" id="0x7f120d44" />
-    <public type="string" name="invite_modal_open_button" id="0x7f120d45" />
-    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7f120d46" />
-    <public type="string" name="invite_no_thanks" id="0x7f120d47" />
-    <public type="string" name="invite_notice_message" id="0x7f120d48" />
-    <public type="string" name="invite_notice_message_part_2" id="0x7f120d49" />
-    <public type="string" name="invite_people" id="0x7f120d4a" />
-    <public type="string" name="invite_pokemon_go_announcements_label_long" id="0x7f120d4b" />
-    <public type="string" name="invite_pokemon_go_announcements_label_short" id="0x7f120d4c" />
-    <public type="string" name="invite_pokemon_go_friendship_label_long" id="0x7f120d4d" />
-    <public type="string" name="invite_pokemon_go_friendship_label_short" id="0x7f120d4e" />
-    <public type="string" name="invite_pokemon_go_strategy_label_long" id="0x7f120d4f" />
-    <public type="string" name="invite_pokemon_go_strategy_label_short" id="0x7f120d50" />
-    <public type="string" name="invite_private_call_heads_up" id="0x7f120d51" />
-    <public type="string" name="invite_search_for_friends" id="0x7f120d52" />
-    <public type="string" name="invite_sent" id="0x7f120d53" />
-    <public type="string" name="invite_settings_description_no_expiration" id="0x7f120d54" />
-    <public type="string" name="invite_settings_expired_description" id="0x7f120d55" />
-    <public type="string" name="invite_settings_title" id="0x7f120d56" />
-    <public type="string" name="invite_share_link_header_mobile" id="0x7f120d57" />
-    <public type="string" name="invite_share_link_own_server" id="0x7f120d58" />
-    <public type="string" name="invite_share_link_to_stream" id="0x7f120d59" />
-    <public type="string" name="invite_step_subtitle" id="0x7f120d5a" />
-    <public type="string" name="invite_step_title" id="0x7f120d5b" />
-    <public type="string" name="invite_stream_footer_link_header" id="0x7f120d5c" />
-    <public type="string" name="invite_stream_header" id="0x7f120d5d" />
-    <public type="string" name="invite_to_server" id="0x7f120d5e" />
-    <public type="string" name="invite_url" id="0x7f120d5f" />
-    <public type="string" name="invite_voice_channel_join" id="0x7f120d60" />
-    <public type="string" name="invite_voice_empty_mobile" id="0x7f120d61" />
-    <public type="string" name="invite_welcome_heading" id="0x7f120d62" />
-    <public type="string" name="invite_welcome_subheading" id="0x7f120d63" />
-    <public type="string" name="invite_your_friends" id="0x7f120d64" />
-    <public type="string" name="invite_your_friends_channel_mobile" id="0x7f120d65" />
-    <public type="string" name="invite_your_friends_header_mobile" id="0x7f120d66" />
-    <public type="string" name="invites" id="0x7f120d67" />
-    <public type="string" name="ios_app_preview_description" id="0x7f120d68" />
-    <public type="string" name="ios_automatic_theme" id="0x7f120d69" />
-    <public type="string" name="ios_automatic_theme_short" id="0x7f120d6a" />
-    <public type="string" name="ios_call_disconnected" id="0x7f120d6b" />
-    <public type="string" name="ios_call_ended" id="0x7f120d6c" />
-    <public type="string" name="ios_iap_generic_billing_error" id="0x7f120d6d" />
-    <public type="string" name="ios_iap_itunes_error" id="0x7f120d6e" />
-    <public type="string" name="ios_iap_manage_premium_guild_button" id="0x7f120d6f" />
-    <public type="string" name="ios_iap_manage_subscription_button" id="0x7f120d70" />
-    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7f120d71" />
-    <public type="string" name="ios_iap_restore_subscription_error" id="0x7f120d72" />
-    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7f120d73" />
-    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7f120d74" />
-    <public type="string" name="ios_iap_restore_subscription_success" id="0x7f120d75" />
-    <public type="string" name="ios_iap_testflight_error" id="0x7f120d76" />
-    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7f120d77" />
-    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7f120d78" />
-    <public type="string" name="ios_media_keyboard_more_photos" id="0x7f120d79" />
-    <public type="string" name="ios_media_keyboard_no_permission" id="0x7f120d7a" />
-    <public type="string" name="ios_media_keyboard_no_photos" id="0x7f120d7b" />
-    <public type="string" name="ios_notification_see_full" id="0x7f120d7c" />
-    <public type="string" name="ios_profile_in_voice_call" id="0x7f120d7d" />
-    <public type="string" name="ios_profile_open_voice_channel" id="0x7f120d7e" />
-    <public type="string" name="ios_share_suggestions_hint" id="0x7f120d7f" />
-    <public type="string" name="ios_share_suggestions_toggle" id="0x7f120d80" />
-    <public type="string" name="ios_stream_participants_hidden" id="0x7f120d81" />
-    <public type="string" name="ios_stream_show_non_video" id="0x7f120d82" />
-    <public type="string" name="ios_view_all" id="0x7f120d83" />
-    <public type="string" name="ip_address_secured" id="0x7f120d84" />
-    <public type="string" name="ip_authorization_succeeded" id="0x7f120d85" />
-    <public type="string" name="it" id="0x7f120d86" />
-    <public type="string" name="item_view_role_description" id="0x7f120d87" />
-    <public type="string" name="ja" id="0x7f120d88" />
-    <public type="string" name="join" id="0x7f120d89" />
-    <public type="string" name="join_afk_channel_body" id="0x7f120d8a" />
-    <public type="string" name="join_call" id="0x7f120d8b" />
-    <public type="string" name="join_guild" id="0x7f120d8c" />
-    <public type="string" name="join_guild_connect_cta" id="0x7f120d8d" />
-    <public type="string" name="join_guild_connect_text" id="0x7f120d8e" />
-    <public type="string" name="join_guild_description" id="0x7f120d8f" />
-    <public type="string" name="join_server_button_body" id="0x7f120d90" />
-    <public type="string" name="join_server_button_cta" id="0x7f120d91" />
-    <public type="string" name="join_server_button_cta_mobile" id="0x7f120d92" />
-    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7f120d93" />
-    <public type="string" name="join_server_description" id="0x7f120d94" />
-    <public type="string" name="join_server_description_mobile" id="0x7f120d95" />
-    <public type="string" name="join_server_description_mobile_refresh" id="0x7f120d96" />
-    <public type="string" name="join_server_description_nuf" id="0x7f120d97" />
-    <public type="string" name="join_server_invite_examples_header" id="0x7f120d98" />
-    <public type="string" name="join_server_invite_examples_mobile_refresh" id="0x7f120d99" />
-    <public type="string" name="join_server_title" id="0x7f120d9a" />
-    <public type="string" name="join_server_title_mobile_refresh" id="0x7f120d9b" />
-    <public type="string" name="join_stream" id="0x7f120d9c" />
-    <public type="string" name="join_thread" id="0x7f120d9d" />
-    <public type="string" name="join_video_call" id="0x7f120d9e" />
-    <public type="string" name="join_video_channel" id="0x7f120d9f" />
-    <public type="string" name="join_voice_call" id="0x7f120da0" />
-    <public type="string" name="join_voice_channel" id="0x7f120da1" />
-    <public type="string" name="join_voice_channel_cta" id="0x7f120da2" />
-    <public type="string" name="joined_guild" id="0x7f120da3" />
-    <public type="string" name="joining_guild" id="0x7f120da4" />
-    <public type="string" name="joining_voice_call_will_end_current_call_body" id="0x7f120da5" />
-    <public type="string" name="joining_voice_channel_will_end_current_call_body" id="0x7f120da6" />
-    <public type="string" name="joining_will_end_current_call_title" id="0x7f120da7" />
-    <public type="string" name="jump" id="0x7f120da8" />
-    <public type="string" name="jump_to_channel" id="0x7f120da9" />
-    <public type="string" name="jump_to_last_unread_message" id="0x7f120daa" />
-    <public type="string" name="jump_to_message" id="0x7f120dab" />
-    <public type="string" name="jump_to_present" id="0x7f120dac" />
-    <public type="string" name="keep_permissions" id="0x7f120dad" />
-    <public type="string" name="keybind_activate_overlay_chat" id="0x7f120dae" />
-    <public type="string" name="keybind_conflict" id="0x7f120daf" />
-    <public type="string" name="keybind_description_modal_call_accept" id="0x7f120db0" />
-    <public type="string" name="keybind_description_modal_call_decline" id="0x7f120db1" />
-    <public type="string" name="keybind_description_modal_call_start" id="0x7f120db2" />
-    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7f120db3" />
-    <public type="string" name="keybind_description_modal_create_guild" id="0x7f120db4" />
-    <public type="string" name="keybind_description_modal_easter_egg" id="0x7f120db5" />
-    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7f120db6" />
-    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7f120db7" />
-    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7f120db8" />
-    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7f120db9" />
-    <public type="string" name="keybind_description_modal_mark_top_inbox_channel_read" id="0x7f120dba" />
-    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7f120dbb" />
-    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7f120dbc" />
-    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7f120dbd" />
-    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7f120dbe" />
-    <public type="string" name="keybind_description_modal_search" id="0x7f120dbf" />
-    <public type="string" name="keybind_description_modal_search_emojis" id="0x7f120dc0" />
-    <public type="string" name="keybind_description_modal_search_gifs" id="0x7f120dc1" />
-    <public type="string" name="keybind_description_modal_subtitle" id="0x7f120dc2" />
-    <public type="string" name="keybind_description_modal_title" id="0x7f120dc3" />
-    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7f120dc4" />
-    <public type="string" name="keybind_description_modal_toggle_help" id="0x7f120dc5" />
-    <public type="string" name="keybind_description_modal_toggle_inbox" id="0x7f120dc6" />
-    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7f120dc7" />
-    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7f120dc8" />
-    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7f120dc9" />
-    <public type="string" name="keybind_description_modal_toggle_users" id="0x7f120dca" />
-    <public type="string" name="keybind_description_modal_unread_channels" id="0x7f120dcb" />
-    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7f120dcc" />
-    <public type="string" name="keybind_description_modal_upload_file" id="0x7f120dcd" />
-    <public type="string" name="keybind_description_navigate_back" id="0x7f120dce" />
-    <public type="string" name="keybind_description_navigate_forward" id="0x7f120dcf" />
-    <public type="string" name="keybind_description_push_to_mute" id="0x7f120dd0" />
-    <public type="string" name="keybind_description_push_to_talk" id="0x7f120dd1" />
-    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7f120dd2" />
-    <public type="string" name="keybind_description_toggle_deafen" id="0x7f120dd3" />
-    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7f120dd4" />
-    <public type="string" name="keybind_description_toggle_mute" id="0x7f120dd5" />
-    <public type="string" name="keybind_description_toggle_overlay" id="0x7f120dd6" />
-    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7f120dd7" />
-    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7f120dd8" />
-    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7f120dd9" />
-    <public type="string" name="keybind_description_unassigned" id="0x7f120dda" />
-    <public type="string" name="keybind_navigate_back" id="0x7f120ddb" />
-    <public type="string" name="keybind_navigate_forward" id="0x7f120ddc" />
-    <public type="string" name="keybind_push_to_mute" id="0x7f120ddd" />
-    <public type="string" name="keybind_push_to_talk" id="0x7f120dde" />
-    <public type="string" name="keybind_push_to_talk_priority" id="0x7f120ddf" />
-    <public type="string" name="keybind_toggle_deafen" id="0x7f120de0" />
-    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7f120de1" />
-    <public type="string" name="keybind_toggle_mute" id="0x7f120de2" />
-    <public type="string" name="keybind_toggle_overlay" id="0x7f120de3" />
-    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7f120de4" />
-    <public type="string" name="keybind_toggle_stream_mode" id="0x7f120de5" />
-    <public type="string" name="keybind_toggle_voice_mode" id="0x7f120de6" />
-    <public type="string" name="keybind_unassigned" id="0x7f120de7" />
-    <public type="string" name="keybinds" id="0x7f120de8" />
-    <public type="string" name="keyboard_behavior_mobile_header" id="0x7f120de9" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7f120dea" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7f120deb" />
-    <public type="string" name="kick" id="0x7f120dec" />
-    <public type="string" name="kick_from_server" id="0x7f120ded" />
-    <public type="string" name="kick_members" id="0x7f120dee" />
-    <public type="string" name="kick_user" id="0x7f120def" />
-    <public type="string" name="kick_user_body" id="0x7f120df0" />
-    <public type="string" name="kick_user_confirmed" id="0x7f120df1" />
-    <public type="string" name="kick_user_error_generic" id="0x7f120df2" />
-    <public type="string" name="kick_user_title" id="0x7f120df3" />
-    <public type="string" name="ko" id="0x7f120df4" />
-    <public type="string" name="krisp_model_version" id="0x7f120df5" />
-    <public type="string" name="label_with_online_status" id="0x7f120df6" />
-    <public type="string" name="language" id="0x7f120df7" />
-    <public type="string" name="language_not_found" id="0x7f120df8" />
-    <public type="string" name="language_select" id="0x7f120df9" />
-    <public type="string" name="language_updated" id="0x7f120dfa" />
-    <public type="string" name="languages" id="0x7f120dfb" />
-    <public type="string" name="large_guild_notify_all_messages_description" id="0x7f120dfc" />
-    <public type="string" name="large_message_upload_subtitle" id="0x7f120dfd" />
-    <public type="string" name="large_message_upload_title" id="0x7f120dfe" />
-    <public type="string" name="last_seen" id="0x7f120dff" />
-    <public type="string" name="last_sync" id="0x7f120e00" />
-    <public type="string" name="last_thread_message" id="0x7f120e01" />
-    <public type="string" name="launch_app" id="0x7f120e02" />
-    <public type="string" name="learn_more" id="0x7f120e03" />
-    <public type="string" name="learn_more_link" id="0x7f120e04" />
-    <public type="string" name="leave_call" id="0x7f120e05" />
-    <public type="string" name="leave_group_dm" id="0x7f120e06" />
-    <public type="string" name="leave_group_dm_body" id="0x7f120e07" />
-    <public type="string" name="leave_group_dm_managed_body" id="0x7f120e08" />
-    <public type="string" name="leave_group_dm_managed_title" id="0x7f120e09" />
-    <public type="string" name="leave_group_dm_title" id="0x7f120e0a" />
-    <public type="string" name="leave_server" id="0x7f120e0b" />
-    <public type="string" name="leave_server_body" id="0x7f120e0c" />
-    <public type="string" name="leave_server_body_mobile" id="0x7f120e0d" />
-    <public type="string" name="leave_server_title" id="0x7f120e0e" />
-    <public type="string" name="leave_thread" id="0x7f120e0f" />
-    <public type="string" name="lets_go" id="0x7f120e10" />
-    <public type="string" name="library" id="0x7f120e11" />
-    <public type="string" name="light_blue" id="0x7f120e12" />
-    <public type="string" name="light_green" id="0x7f120e13" />
-    <public type="string" name="light_grey" id="0x7f120e14" />
-    <public type="string" name="link_copied" id="0x7f120e15" />
-    <public type="string" name="link_settings" id="0x7f120e16" />
-    <public type="string" name="link_your_discord_account" id="0x7f120e17" />
-    <public type="string" name="link_your_xbox_account_1" id="0x7f120e18" />
-    <public type="string" name="link_your_xbox_account_2" id="0x7f120e19" />
-    <public type="string" name="linux" id="0x7f120e1a" />
-    <public type="string" name="listen_on_spotify" id="0x7f120e1b" />
-    <public type="string" name="listening_to" id="0x7f120e1c" />
-    <public type="string" name="live" id="0x7f120e1d" />
-    <public type="string" name="live_viewers" id="0x7f120e1e" />
-    <public type="string" name="load_image_error" id="0x7f120e1f" />
-    <public type="string" name="load_more_messages" id="0x7f120e20" />
-    <public type="string" name="load_reactions_error" id="0x7f120e21" />
-    <public type="string" name="loading" id="0x7f120e22" />
-    <public type="string" name="loading_did_you_know" id="0x7f120e23" />
-    <public type="string" name="loading_keybind_tip_1" id="0x7f120e24" />
-    <public type="string" name="loading_keybind_tip_2" id="0x7f120e25" />
-    <public type="string" name="loading_keybind_tip_3" id="0x7f120e26" />
-    <public type="string" name="loading_keybind_tip_4" id="0x7f120e27" />
-    <public type="string" name="loading_keybind_tip_5" id="0x7f120e28" />
-    <public type="string" name="loading_keybind_tip_6" id="0x7f120e29" />
-    <public type="string" name="loading_keybind_tip_7" id="0x7f120e2a" />
-    <public type="string" name="loading_keybind_tip_8" id="0x7f120e2b" />
-    <public type="string" name="loading_line_1" id="0x7f120e2c" />
-    <public type="string" name="loading_line_10" id="0x7f120e2d" />
-    <public type="string" name="loading_line_11" id="0x7f120e2e" />
-    <public type="string" name="loading_line_12" id="0x7f120e2f" />
-    <public type="string" name="loading_line_13" id="0x7f120e30" />
-    <public type="string" name="loading_line_14" id="0x7f120e31" />
-    <public type="string" name="loading_line_15" id="0x7f120e32" />
-    <public type="string" name="loading_line_2" id="0x7f120e33" />
-    <public type="string" name="loading_line_3" id="0x7f120e34" />
-    <public type="string" name="loading_line_4" id="0x7f120e35" />
-    <public type="string" name="loading_line_5" id="0x7f120e36" />
-    <public type="string" name="loading_line_6" id="0x7f120e37" />
-    <public type="string" name="loading_line_7" id="0x7f120e38" />
-    <public type="string" name="loading_line_8" id="0x7f120e39" />
-    <public type="string" name="loading_line_9" id="0x7f120e3a" />
-    <public type="string" name="loading_messages_a11y_label" id="0x7f120e3b" />
-    <public type="string" name="loading_note" id="0x7f120e3c" />
-    <public type="string" name="loading_tip_1" id="0x7f120e3d" />
-    <public type="string" name="loading_tip_10" id="0x7f120e3e" />
-    <public type="string" name="loading_tip_11" id="0x7f120e3f" />
-    <public type="string" name="loading_tip_12" id="0x7f120e40" />
-    <public type="string" name="loading_tip_13" id="0x7f120e41" />
-    <public type="string" name="loading_tip_14" id="0x7f120e42" />
-    <public type="string" name="loading_tip_15" id="0x7f120e43" />
-    <public type="string" name="loading_tip_16" id="0x7f120e44" />
-    <public type="string" name="loading_tip_17" id="0x7f120e45" />
-    <public type="string" name="loading_tip_18" id="0x7f120e46" />
-    <public type="string" name="loading_tip_19" id="0x7f120e47" />
-    <public type="string" name="loading_tip_2" id="0x7f120e48" />
-    <public type="string" name="loading_tip_20" id="0x7f120e49" />
-    <public type="string" name="loading_tip_21" id="0x7f120e4a" />
-    <public type="string" name="loading_tip_22" id="0x7f120e4b" />
-    <public type="string" name="loading_tip_23" id="0x7f120e4c" />
-    <public type="string" name="loading_tip_24" id="0x7f120e4d" />
-    <public type="string" name="loading_tip_25" id="0x7f120e4e" />
-    <public type="string" name="loading_tip_3" id="0x7f120e4f" />
-    <public type="string" name="loading_tip_4" id="0x7f120e50" />
-    <public type="string" name="loading_tip_5" id="0x7f120e51" />
-    <public type="string" name="loading_tip_6" id="0x7f120e52" />
-    <public type="string" name="loading_tip_7" id="0x7f120e53" />
-    <public type="string" name="loading_tip_8" id="0x7f120e54" />
-    <public type="string" name="loading_tip_9" id="0x7f120e55" />
-    <public type="string" name="loading_your_pin" id="0x7f120e56" />
-    <public type="string" name="lobby" id="0x7f120e57" />
-    <public type="string" name="local_muted" id="0x7f120e58" />
-    <public type="string" name="local_push_notification_guild_verification_body" id="0x7f120e59" />
-    <public type="string" name="local_video_disabled" id="0x7f120e5a" />
-    <public type="string" name="locale" id="0x7f120e5b" />
-    <public type="string" name="login" id="0x7f120e5c" />
-    <public type="string" name="login_as" id="0x7f120e5d" />
-    <public type="string" name="login_body" id="0x7f120e5e" />
-    <public type="string" name="login_title" id="0x7f120e5f" />
-    <public type="string" name="login_with_qr" id="0x7f120e60" />
-    <public type="string" name="login_with_qr_description" id="0x7f120e61" />
-    <public type="string" name="logout" id="0x7f120e62" />
-    <public type="string" name="low_quality_image_mode" id="0x7f120e63" />
-    <public type="string" name="low_quality_image_mode_help" id="0x7f120e64" />
-    <public type="string" name="lt" id="0x7f120e65" />
-    <public type="string" name="lurker_mode_chat_input_button" id="0x7f120e66" />
-    <public type="string" name="lurker_mode_chat_input_message" id="0x7f120e67" />
-    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7f120e68" />
-    <public type="string" name="lurker_mode_nag_bar_button" id="0x7f120e69" />
-    <public type="string" name="lurker_mode_nag_bar_header" id="0x7f120e6a" />
-    <public type="string" name="lurker_mode_popout_cancel" id="0x7f120e6b" />
-    <public type="string" name="lurker_mode_popout_chat_header" id="0x7f120e6c" />
-    <public type="string" name="lurker_mode_popout_join" id="0x7f120e6d" />
-    <public type="string" name="lurker_mode_popout_reactions_header" id="0x7f120e6e" />
-    <public type="string" name="lurker_mode_popout_success_body" id="0x7f120e6f" />
-    <public type="string" name="lurker_mode_popout_success_button" id="0x7f120e70" />
-    <public type="string" name="lurker_mode_popout_success_header" id="0x7f120e71" />
-    <public type="string" name="lurker_mode_popout_upsell_body" id="0x7f120e72" />
-    <public type="string" name="lurker_mode_view_guild" id="0x7f120e73" />
-    <public type="string" name="macos" id="0x7f120e74" />
-    <public type="string" name="magenta" id="0x7f120e75" />
-    <public type="string" name="manage_channel" id="0x7f120e76" />
-    <public type="string" name="manage_channel_description" id="0x7f120e77" />
-    <public type="string" name="manage_channels" id="0x7f120e78" />
-    <public type="string" name="manage_channels_description" id="0x7f120e79" />
-    <public type="string" name="manage_emojis" id="0x7f120e7a" />
-    <public type="string" name="manage_messages" id="0x7f120e7b" />
-    <public type="string" name="manage_messages_description" id="0x7f120e7c" />
-    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7f120e7d" />
-    <public type="string" name="manage_nicknames" id="0x7f120e7e" />
-    <public type="string" name="manage_nicknames_description" id="0x7f120e7f" />
-    <public type="string" name="manage_permissions" id="0x7f120e80" />
-    <public type="string" name="manage_permissions_description" id="0x7f120e81" />
-    <public type="string" name="manage_roles" id="0x7f120e82" />
-    <public type="string" name="manage_roles_description" id="0x7f120e83" />
-    <public type="string" name="manage_server" id="0x7f120e84" />
-    <public type="string" name="manage_server_description" id="0x7f120e85" />
-    <public type="string" name="manage_user" id="0x7f120e86" />
-    <public type="string" name="manage_user_shorthand" id="0x7f120e87" />
-    <public type="string" name="manage_webhooks" id="0x7f120e88" />
-    <public type="string" name="manage_webhooks_description" id="0x7f120e89" />
-    <public type="string" name="managed_role_explaination" id="0x7f120e8a" />
-    <public type="string" name="managed_role_integration_explanation" id="0x7f120e8b" />
-    <public type="string" name="managed_role_premium_subscriber_explanation" id="0x7f120e8c" />
-    <public type="string" name="mark_as_read" id="0x7f120e8d" />
-    <public type="string" name="mark_unread" id="0x7f120e8e" />
-    <public type="string" name="marked_as_read" id="0x7f120e8f" />
-    <public type="string" name="marketing_refresh_premium_features_badge_heading" id="0x7f120e90" />
-    <public type="string" name="marketing_refresh_premium_features_badge_subheading" id="0x7f120e91" />
-    <public type="string" name="marketing_refresh_premium_features_emoji_heading" id="0x7f120e92" />
-    <public type="string" name="marketing_refresh_premium_features_emoji_subheading" id="0x7f120e93" />
-    <public type="string" name="marketing_refresh_premium_features_file_upload_heading" id="0x7f120e94" />
-    <public type="string" name="marketing_refresh_premium_features_file_upload_subheading" id="0x7f120e95" />
-    <public type="string" name="marketing_refresh_premium_features_go_live_heading" id="0x7f120e96" />
-    <public type="string" name="marketing_refresh_premium_features_go_live_info" id="0x7f120e97" />
-    <public type="string" name="marketing_refresh_premium_features_go_live_subheading" id="0x7f120e98" />
-    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_heading" id="0x7f120e99" />
-    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading" id="0x7f120e9a" />
-    <public type="string" name="marketing_refresh_premium_features_profile_heading" id="0x7f120e9b" />
-    <public type="string" name="marketing_refresh_premium_features_profile_subheading" id="0x7f120e9c" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description" id="0x7f120e9d" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info" id="0x7f120e9e" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label" id="0x7f120e9f" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_with_price" id="0x7f120ea0" />
-    <public type="string" name="marketing_refresh_premium_tier_2_cta_subtitle" id="0x7f120ea1" />
-    <public type="string" name="marketing_refresh_premium_tier_2_cta_title" id="0x7f120ea2" />
-    <public type="string" name="marketing_refresh_premium_tier_2_subtitle" id="0x7f120ea3" />
-    <public type="string" name="marketing_refresh_premium_tier_2_subtitle_with_price" id="0x7f120ea4" />
-    <public type="string" name="marketing_refresh_premium_tier_2_title" id="0x7f120ea5" />
-    <public type="string" name="masked_link_body" id="0x7f120ea6" />
-    <public type="string" name="masked_link_cancel" id="0x7f120ea7" />
-    <public type="string" name="masked_link_confirm" id="0x7f120ea8" />
-    <public type="string" name="masked_link_trust_this_domain" id="0x7f120ea9" />
-    <public type="string" name="masked_link_trust_this_protocol" id="0x7f120eaa" />
-    <public type="string" name="masked_protocol_link_body" id="0x7f120eab" />
-    <public type="string" name="mature_listing_accept" id="0x7f120eac" />
-    <public type="string" name="mature_listing_decline" id="0x7f120ead" />
-    <public type="string" name="mature_listing_description" id="0x7f120eae" />
-    <public type="string" name="mature_listing_title" id="0x7f120eaf" />
-    <public type="string" name="max_age_never" id="0x7f120eb0" />
-    <public type="string" name="max_age_never_description_mobile" id="0x7f120eb1" />
-    <public type="string" name="max_number_of_uses" id="0x7f120eb2" />
-    <public type="string" name="max_uses" id="0x7f120eb3" />
-    <public type="string" name="max_uses_description_mobile" id="0x7f120eb4" />
-    <public type="string" name="max_uses_description_unlimited_uses" id="0x7f120eb5" />
-    <public type="string" name="me" id="0x7f120eb6" />
-    <public type="string" name="media_keyboard_browse" id="0x7f120eb7" />
-    <public type="string" name="media_keyboard_gift" id="0x7f120eb8" />
-    <public type="string" name="member" id="0x7f120eb9" />
-    <public type="string" name="member_list" id="0x7f120eba" />
-    <public type="string" name="member_list_server_owner_help" id="0x7f120ebb" />
-    <public type="string" name="members" id="0x7f120ebc" />
-    <public type="string" name="members_header" id="0x7f120ebd" />
-    <public type="string" name="members_matching" id="0x7f120ebe" />
-    <public type="string" name="members_search_placeholder" id="0x7f120ebf" />
-    <public type="string" name="mention" id="0x7f120ec0" />
-    <public type="string" name="mention_everyone" id="0x7f120ec1" />
-    <public type="string" name="mention_everyone_android" id="0x7f120ec2" />
-    <public type="string" name="mention_everyone_autocomplete_description" id="0x7f120ec3" />
-    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7f120ec4" />
-    <public type="string" name="mention_everyone_channel_description" id="0x7f120ec5" />
-    <public type="string" name="mention_everyone_channel_description_android" id="0x7f120ec6" />
-    <public type="string" name="mention_everyone_description" id="0x7f120ec7" />
-    <public type="string" name="mention_everyone_description_android" id="0x7f120ec8" />
-    <public type="string" name="mention_here_autocomplete_description" id="0x7f120ec9" />
-    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7f120eca" />
-    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7f120ecb" />
-    <public type="string" name="mention_users_with_role" id="0x7f120ecc" />
-    <public type="string" name="mentions" id="0x7f120ecd" />
-    <public type="string" name="mentions_count" id="0x7f120ece" />
-    <public type="string" name="message_action_reply" id="0x7f120ecf" />
-    <public type="string" name="message_actions_menu_label" id="0x7f120ed0" />
-    <public type="string" name="message_count" id="0x7f120ed1" />
-    <public type="string" name="message_count_in_thread" id="0x7f120ed2" />
-    <public type="string" name="message_count_in_thread_overflow" id="0x7f120ed3" />
-    <public type="string" name="message_count_overflow" id="0x7f120ed4" />
-    <public type="string" name="message_display_mode_label" id="0x7f120ed5" />
-    <public type="string" name="message_edited" id="0x7f120ed6" />
-    <public type="string" name="message_header_reply" id="0x7f120ed7" />
-    <public type="string" name="message_options" id="0x7f120ed8" />
-    <public type="string" name="message_pinned" id="0x7f120ed9" />
-    <public type="string" name="message_preview" id="0x7f120eda" />
-    <public type="string" name="message_rate_limited_body" id="0x7f120edb" />
-    <public type="string" name="message_rate_limited_button" id="0x7f120edc" />
-    <public type="string" name="message_rate_limited_header" id="0x7f120edd" />
-    <public type="string" name="message_step_subtitle" id="0x7f120ede" />
-    <public type="string" name="message_step_title" id="0x7f120edf" />
-    <public type="string" name="message_too_long_body_text" id="0x7f120ee0" />
-    <public type="string" name="message_too_long_header" id="0x7f120ee1" />
-    <public type="string" name="message_tts" id="0x7f120ee2" />
-    <public type="string" name="message_tts_deleted_role" id="0x7f120ee3" />
-    <public type="string" name="message_unpinned" id="0x7f120ee4" />
-    <public type="string" name="message_utilities_a11y_label" id="0x7f120ee5" />
-    <public type="string" name="messages" id="0x7f120ee6" />
-    <public type="string" name="messages_failed_to_load" id="0x7f120ee7" />
-    <public type="string" name="messages_failed_to_load_try_again" id="0x7f120ee8" />
-    <public type="string" name="mfa_sms_add_phone" id="0x7f120ee9" />
-    <public type="string" name="mfa_sms_already_enabled" id="0x7f120eea" />
-    <public type="string" name="mfa_sms_auth" id="0x7f120eeb" />
-    <public type="string" name="mfa_sms_auth_current_phone" id="0x7f120eec" />
-    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7f120eed" />
-    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7f120eee" />
-    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7f120eef" />
-    <public type="string" name="mfa_sms_disabled_partner" id="0x7f120ef0" />
-    <public type="string" name="mfa_sms_enable" id="0x7f120ef1" />
-    <public type="string" name="mfa_sms_enable_should_do" id="0x7f120ef2" />
-    <public type="string" name="mfa_sms_enable_subheader" id="0x7f120ef3" />
-    <public type="string" name="mfa_sms_phone_number_hide" id="0x7f120ef4" />
-    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7f120ef5" />
-    <public type="string" name="mfa_sms_receive_code" id="0x7f120ef6" />
-    <public type="string" name="mfa_sms_remove" id="0x7f120ef7" />
-    <public type="string" name="mfa_sms_resend" id="0x7f120ef8" />
-    <public type="string" name="mic_test_voice_channel_warning" id="0x7f120ef9" />
-    <public type="string" name="minimum_size" id="0x7f120efa" />
-    <public type="string" name="missed_an_update" id="0x7f120efb" />
-    <public type="string" name="missed_call" id="0x7f120efc" />
-    <public type="string" name="missing_entitlement_modal_body" id="0x7f120efd" />
-    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7f120efe" />
-    <public type="string" name="missing_entitlement_modal_header" id="0x7f120eff" />
-    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7f120f00" />
-    <public type="string" name="mobile_designate_other_channel" id="0x7f120f01" />
-    <public type="string" name="mobile_enable_hardware_scaling" id="0x7f120f02" />
-    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7f120f03" />
-    <public type="string" name="mobile_noise_cancellation_popout_description" id="0x7f120f04" />
-    <public type="string" name="mobile_noise_cancellation_popout_title" id="0x7f120f05" />
-    <public type="string" name="mobile_stream_participants_hidden" id="0x7f120f06" />
-    <public type="string" name="moderation" id="0x7f120f07" />
-    <public type="string" name="modify_followed_news_header" id="0x7f120f08" />
-    <public type="string" name="monthly" id="0x7f120f09" />
-    <public type="string" name="more" id="0x7f120f0a" />
-    <public type="string" name="more_options" id="0x7f120f0b" />
-    <public type="string" name="move_from_category_to" id="0x7f120f0c" />
-    <public type="string" name="move_members" id="0x7f120f0d" />
-    <public type="string" name="move_members_description" id="0x7f120f0e" />
-    <public type="string" name="move_to" id="0x7f120f0f" />
-    <public type="string" name="move_to_success" id="0x7f120f10" />
-    <public type="string" name="mtrl_badge_numberless_content_description" id="0x7f120f11" />
-    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7f120f12" />
-    <public type="string" name="mtrl_exceed_max_badge_number_content_description" id="0x7f120f13" />
-    <public type="string" name="mtrl_exceed_max_badge_number_suffix" id="0x7f120f14" />
-    <public type="string" name="mtrl_picker_a11y_next_month" id="0x7f120f15" />
-    <public type="string" name="mtrl_picker_a11y_prev_month" id="0x7f120f16" />
-    <public type="string" name="mtrl_picker_announce_current_selection" id="0x7f120f17" />
-    <public type="string" name="mtrl_picker_cancel" id="0x7f120f18" />
-    <public type="string" name="mtrl_picker_confirm" id="0x7f120f19" />
-    <public type="string" name="mtrl_picker_date_header_selected" id="0x7f120f1a" />
-    <public type="string" name="mtrl_picker_date_header_title" id="0x7f120f1b" />
-    <public type="string" name="mtrl_picker_date_header_unselected" id="0x7f120f1c" />
-    <public type="string" name="mtrl_picker_day_of_week_column_header" id="0x7f120f1d" />
-    <public type="string" name="mtrl_picker_invalid_format" id="0x7f120f1e" />
-    <public type="string" name="mtrl_picker_invalid_format_example" id="0x7f120f1f" />
-    <public type="string" name="mtrl_picker_invalid_format_use" id="0x7f120f20" />
-    <public type="string" name="mtrl_picker_invalid_range" id="0x7f120f21" />
-    <public type="string" name="mtrl_picker_navigate_to_year_description" id="0x7f120f22" />
-    <public type="string" name="mtrl_picker_out_of_range" id="0x7f120f23" />
-    <public type="string" name="mtrl_picker_range_header_only_end_selected" id="0x7f120f24" />
-    <public type="string" name="mtrl_picker_range_header_only_start_selected" id="0x7f120f25" />
-    <public type="string" name="mtrl_picker_range_header_selected" id="0x7f120f26" />
-    <public type="string" name="mtrl_picker_range_header_title" id="0x7f120f27" />
-    <public type="string" name="mtrl_picker_range_header_unselected" id="0x7f120f28" />
-    <public type="string" name="mtrl_picker_save" id="0x7f120f29" />
-    <public type="string" name="mtrl_picker_text_input_date_hint" id="0x7f120f2a" />
-    <public type="string" name="mtrl_picker_text_input_date_range_end_hint" id="0x7f120f2b" />
-    <public type="string" name="mtrl_picker_text_input_date_range_start_hint" id="0x7f120f2c" />
-    <public type="string" name="mtrl_picker_text_input_day_abbr" id="0x7f120f2d" />
-    <public type="string" name="mtrl_picker_text_input_month_abbr" id="0x7f120f2e" />
-    <public type="string" name="mtrl_picker_text_input_year_abbr" id="0x7f120f2f" />
-    <public type="string" name="mtrl_picker_toggle_to_calendar_input_mode" id="0x7f120f30" />
-    <public type="string" name="mtrl_picker_toggle_to_day_selection" id="0x7f120f31" />
-    <public type="string" name="mtrl_picker_toggle_to_text_input_mode" id="0x7f120f32" />
-    <public type="string" name="mtrl_picker_toggle_to_year_selection" id="0x7f120f33" />
-    <public type="string" name="mtrl_slider_range_content_description" id="0x7f120f34" />
-    <public type="string" name="mute" id="0x7f120f35" />
-    <public type="string" name="mute_category" id="0x7f120f36" />
-    <public type="string" name="mute_channel" id="0x7f120f37" />
-    <public type="string" name="mute_channel_generic" id="0x7f120f38" />
-    <public type="string" name="mute_conversation" id="0x7f120f39" />
-    <public type="string" name="mute_duration_15_minutes" id="0x7f120f3a" />
-    <public type="string" name="mute_duration_1_hour" id="0x7f120f3b" />
-    <public type="string" name="mute_duration_24_hours" id="0x7f120f3c" />
-    <public type="string" name="mute_duration_8_hours" id="0x7f120f3d" />
-    <public type="string" name="mute_duration_always" id="0x7f120f3e" />
-    <public type="string" name="mute_group_dm" id="0x7f120f3f" />
-    <public type="string" name="mute_members" id="0x7f120f40" />
-    <public type="string" name="mute_server" id="0x7f120f41" />
-    <public type="string" name="mute_settings_mute_category" id="0x7f120f42" />
-    <public type="string" name="mute_settings_mute_channel" id="0x7f120f43" />
-    <public type="string" name="mute_settings_mute_server" id="0x7f120f44" />
-    <public type="string" name="mute_settings_mute_this_conversation" id="0x7f120f45" />
-    <public type="string" name="mute_until" id="0x7f120f46" />
-    <public type="string" name="muted_until_time" id="0x7f120f47" />
-    <public type="string" name="mutual_friends" id="0x7f120f48" />
-    <public type="string" name="mutual_guilds" id="0x7f120f49" />
-    <public type="string" name="n_days" id="0x7f120f4a" />
-    <public type="string" name="nearby_scan" id="0x7f120f4b" />
-    <public type="string" name="need_account" id="0x7f120f4c" />
-    <public type="string" name="network_error_bad_request" id="0x7f120f4d" />
-    <public type="string" name="network_error_cloudflare_intermittent" id="0x7f120f4e" />
-    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7f120f4f" />
-    <public type="string" name="network_error_connection" id="0x7f120f50" />
-    <public type="string" name="network_error_forbidden" id="0x7f120f51" />
-    <public type="string" name="network_error_request_too_large" id="0x7f120f52" />
-    <public type="string" name="network_error_rest_request" id="0x7f120f53" />
-    <public type="string" name="network_error_ssl" id="0x7f120f54" />
-    <public type="string" name="network_error_unauthorized" id="0x7f120f55" />
-    <public type="string" name="network_error_unknown" id="0x7f120f56" />
-    <public type="string" name="network_offline" id="0x7f120f57" />
-    <public type="string" name="never_ask_again" id="0x7f120f58" />
-    <public type="string" name="nevermind" id="0x7f120f59" />
-    <public type="string" name="new_dm" id="0x7f120f5a" />
-    <public type="string" name="new_group_dm" id="0x7f120f5b" />
-    <public type="string" name="new_guilds_dm_allowed" id="0x7f120f5c" />
-    <public type="string" name="new_member_retention_info" id="0x7f120f5d" />
-    <public type="string" name="new_mentions" id="0x7f120f5e" />
-    <public type="string" name="new_messages" id="0x7f120f5f" />
-    <public type="string" name="new_messages_divider" id="0x7f120f60" />
-    <public type="string" name="new_messages_estimated" id="0x7f120f61" />
-    <public type="string" name="new_messages_estimated_with_date" id="0x7f120f62" />
-    <public type="string" name="new_messages_with_date" id="0x7f120f63" />
-    <public type="string" name="new_override" id="0x7f120f64" />
-    <public type="string" name="new_permission" id="0x7f120f65" />
-    <public type="string" name="new_terms_ack" id="0x7f120f66" />
-    <public type="string" name="new_terms_continue" id="0x7f120f67" />
-    <public type="string" name="new_terms_description" id="0x7f120f68" />
-    <public type="string" name="new_terms_title" id="0x7f120f69" />
-    <public type="string" name="new_unreads" id="0x7f120f6a" />
-    <public type="string" name="news_channel" id="0x7f120f6b" />
-    <public type="string" name="news_channel_publish" id="0x7f120f6c" />
-    <public type="string" name="news_channel_publish_bump" id="0x7f120f6d" />
-    <public type="string" name="news_channel_publish_bump_hide_permanently" id="0x7f120f6e" />
-    <public type="string" name="news_channel_published" id="0x7f120f6f" />
-    <public type="string" name="next" id="0x7f120f70" />
-    <public type="string" name="nickname" id="0x7f120f71" />
-    <public type="string" name="nickname_changed" id="0x7f120f72" />
-    <public type="string" name="nickname_cleared" id="0x7f120f73" />
-    <public type="string" name="nl" id="0x7f120f74" />
-    <public type="string" name="no" id="0x7f120f75" />
-    <public type="string" name="no_afk_channel" id="0x7f120f76" />
-    <public type="string" name="no_authorized_apps" id="0x7f120f77" />
-    <public type="string" name="no_authorized_apps_note" id="0x7f120f78" />
-    <public type="string" name="no_ban_reason" id="0x7f120f79" />
-    <public type="string" name="no_bans" id="0x7f120f7a" />
-    <public type="string" name="no_camera_access" id="0x7f120f7b" />
-    <public type="string" name="no_camera_body" id="0x7f120f7c" />
-    <public type="string" name="no_camera_title" id="0x7f120f7d" />
-    <public type="string" name="no_category" id="0x7f120f7e" />
-    <public type="string" name="no_emoji" id="0x7f120f7f" />
-    <public type="string" name="no_emoji_body" id="0x7f120f80" />
-    <public type="string" name="no_emoji_search_results" id="0x7f120f81" />
-    <public type="string" name="no_emoji_title" id="0x7f120f82" />
-    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7f120f83" />
-    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7f120f84" />
-    <public type="string" name="no_gif_favorites_go_favorite" id="0x7f120f85" />
-    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7f120f86" />
-    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7f120f87" />
-    <public type="string" name="no_gif_search_results" id="0x7f120f88" />
-    <public type="string" name="no_gif_search_results_with_related_search" id="0x7f120f89" />
-    <public type="string" name="no_gif_search_results_without_related_search" id="0x7f120f8a" />
-    <public type="string" name="no_input_devices" id="0x7f120f8b" />
-    <public type="string" name="no_input_monitoring_access" id="0x7f120f8c" />
-    <public type="string" name="no_instant_invite" id="0x7f120f8d" />
-    <public type="string" name="no_integrations" id="0x7f120f8e" />
-    <public type="string" name="no_integrations_body" id="0x7f120f8f" />
-    <public type="string" name="no_integrations_label" id="0x7f120f90" />
-    <public type="string" name="no_invites_body" id="0x7f120f91" />
-    <public type="string" name="no_invites_caption" id="0x7f120f92" />
-    <public type="string" name="no_invites_label" id="0x7f120f93" />
-    <public type="string" name="no_mic_body" id="0x7f120f94" />
-    <public type="string" name="no_mic_title" id="0x7f120f95" />
-    <public type="string" name="no_micrphone_access" id="0x7f120f96" />
-    <public type="string" name="no_mutual_friends" id="0x7f120f97" />
-    <public type="string" name="no_mutual_guilds" id="0x7f120f98" />
-    <public type="string" name="no_output_devices" id="0x7f120f99" />
-    <public type="string" name="no_photos_access" id="0x7f120f9a" />
-    <public type="string" name="no_pins_in_channel" id="0x7f120f9b" />
-    <public type="string" name="no_pins_in_dm" id="0x7f120f9c" />
-    <public type="string" name="no_private_channels_description" id="0x7f120f9d" />
-    <public type="string" name="no_private_channels_title" id="0x7f120f9e" />
-    <public type="string" name="no_reactions_body" id="0x7f120f9f" />
-    <public type="string" name="no_reactions_header" id="0x7f120fa0" />
-    <public type="string" name="no_recent_mentions" id="0x7f120fa1" />
-    <public type="string" name="no_send_messages_permission_placeholder" id="0x7f120fa2" />
-    <public type="string" name="no_system_channel" id="0x7f120fa3" />
-    <public type="string" name="no_text" id="0x7f120fa4" />
-    <public type="string" name="no_thanks" id="0x7f120fa5" />
-    <public type="string" name="no_user_limit" id="0x7f120fa6" />
-    <public type="string" name="no_video_devices" id="0x7f120fa7" />
-    <public type="string" name="no_video_permission_dialog_body" id="0x7f120fa8" />
-    <public type="string" name="no_video_permission_dialog_title" id="0x7f120fa9" />
-    <public type="string" name="noise_cancellation_off" id="0x7f120faa" />
-    <public type="string" name="noise_cancellation_on" id="0x7f120fab" />
-    <public type="string" name="noise_cancellation_popout_description" id="0x7f120fac" />
-    <public type="string" name="noise_cancellation_popout_footer" id="0x7f120fad" />
-    <public type="string" name="noise_cancellation_popout_header" id="0x7f120fae" />
-    <public type="string" name="noise_cancellation_popout_mic_test_title" id="0x7f120faf" />
-    <public type="string" name="noise_cancellation_popout_stop" id="0x7f120fb0" />
-    <public type="string" name="noise_cancellation_popout_test" id="0x7f120fb1" />
-    <public type="string" name="noise_cancellation_tooltip" id="0x7f120fb2" />
-    <public type="string" name="noise_suppression" id="0x7f120fb3" />
-    <public type="string" name="none" id="0x7f120fb4" />
-    <public type="string" name="not_available" id="0x7f120fb5" />
-    <public type="string" name="not_in_the_voice_channel" id="0x7f120fb6" />
-    <public type="string" name="not_set" id="0x7f120fb7" />
-    <public type="string" name="note" id="0x7f120fb8" />
-    <public type="string" name="note_placeholder" id="0x7f120fb9" />
-    <public type="string" name="note_placeholder_mobile" id="0x7f120fba" />
-    <public type="string" name="notice_application_test_mode" id="0x7f120fbb" />
-    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7f120fbc" />
-    <public type="string" name="notice_connect_spotify" id="0x7f120fbd" />
-    <public type="string" name="notice_connection_conflict" id="0x7f120fbe" />
-    <public type="string" name="notice_corrupt_installation" id="0x7f120fbf" />
-    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7f120fc0" />
-    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7f120fc1" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7f120fc2" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7f120fc3" />
-    <public type="string" name="notice_dispatch_api_error" id="0x7f120fc4" />
-    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7f120fc5" />
-    <public type="string" name="notice_dispatch_error" id="0x7f120fc6" />
-    <public type="string" name="notice_dispatch_error_disk_full" id="0x7f120fc7" />
-    <public type="string" name="notice_dispatch_error_disk_low" id="0x7f120fc8" />
-    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7f120fc9" />
-    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7f120fca" />
-    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7f120fcb" />
-    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7f120fcc" />
-    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7f120fcd" />
-    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7f120fce" />
-    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7f120fcf" />
-    <public type="string" name="notice_dispatch_error_unwritable" id="0x7f120fd0" />
-    <public type="string" name="notice_dispatch_error_with_code" id="0x7f120fd1" />
-    <public type="string" name="notice_dispatch_install_script_progress" id="0x7f120fd2" />
-    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7f120fd3" />
-    <public type="string" name="notice_enable_public_guild_upsell_message" id="0x7f120fd4" />
-    <public type="string" name="notice_hardware_mute" id="0x7f120fd5" />
-    <public type="string" name="notice_mfa_sms_backup" id="0x7f120fd6" />
-    <public type="string" name="notice_mfa_sms_backup_button" id="0x7f120fd7" />
-    <public type="string" name="notice_native_apps_2020_06" id="0x7f120fd8" />
-    <public type="string" name="notice_no_input_detected" id="0x7f120fd9" />
-    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7f120fda" />
-    <public type="string" name="notice_no_input_detected_settings" id="0x7f120fdb" />
-    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7f120fdc" />
-    <public type="string" name="notice_notification_message" id="0x7f120fdd" />
-    <public type="string" name="notice_notification_message2" id="0x7f120fde" />
-    <public type="string" name="notice_premium_grandfathered_ended" id="0x7f120fdf" />
-    <public type="string" name="notice_premium_grandfathered_ending" id="0x7f120fe0" />
-    <public type="string" name="notice_premium_grandfathered_monthly_ending" id="0x7f120fe1" />
-    <public type="string" name="notice_premium_grandfathered_upgrade" id="0x7f120fe2" />
-    <public type="string" name="notice_premium_promo_action" id="0x7f120fe3" />
-    <public type="string" name="notice_premium_promo_message" id="0x7f120fe4" />
-    <public type="string" name="notice_premium_xbox_game_pass_promotion" id="0x7f120fe5" />
-    <public type="string" name="notice_premium_xbox_game_pass_promotion_redeem" id="0x7f120fe6" />
-    <public type="string" name="notice_scheduled_maintenance" id="0x7f120fe7" />
-    <public type="string" name="notice_spotify_auto_paused" id="0x7f120fe8" />
-    <public type="string" name="notice_streamer_mode_text" id="0x7f120fe9" />
-    <public type="string" name="notice_survey_body" id="0x7f120fea" />
-    <public type="string" name="notice_survey_button" id="0x7f120feb" />
-    <public type="string" name="notice_survey_prompt" id="0x7f120fec" />
-    <public type="string" name="notice_unclaimed_account" id="0x7f120fed" />
-    <public type="string" name="notice_unverified_account" id="0x7f120fee" />
-    <public type="string" name="notice_whats_this" id="0x7f120fef" />
-    <public type="string" name="notification_accepted_friend_request" id="0x7f120ff0" />
-    <public type="string" name="notification_body_attachment" id="0x7f120ff1" />
-    <public type="string" name="notification_body_start_game" id="0x7f120ff2" />
-    <public type="string" name="notification_dismiss" id="0x7f120ff3" />
-    <public type="string" name="notification_message_create_dm_activity_join" id="0x7f120ff4" />
-    <public type="string" name="notification_message_create_dm_activity_join_request" id="0x7f120ff5" />
-    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7f120ff6" />
-    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7f120ff7" />
-    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7f120ff8" />
-    <public type="string" name="notification_message_create_guild_activity_join" id="0x7f120ff9" />
-    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7f120ffa" />
-    <public type="string" name="notification_mute_1_hour" id="0x7f120ffb" />
-    <public type="string" name="notification_overrides" id="0x7f120ffc" />
-    <public type="string" name="notification_pending_friend_request" id="0x7f120ffd" />
-    <public type="string" name="notification_reply" id="0x7f120ffe" />
-    <public type="string" name="notification_reply_failed" id="0x7f120fff" />
-    <public type="string" name="notification_reply_success" id="0x7f121000" />
-    <public type="string" name="notification_settings" id="0x7f121001" />
-    <public type="string" name="notification_title_discord" id="0x7f121002" />
-    <public type="string" name="notification_title_start_game" id="0x7f121003" />
-    <public type="string" name="notifications" id="0x7f121004" />
-    <public type="string" name="notifications_muted" id="0x7f121005" />
-    <public type="string" name="notifications_nuf_body" id="0x7f121006" />
-    <public type="string" name="notifications_nuf_cta" id="0x7f121007" />
-    <public type="string" name="notifications_nuf_title" id="0x7f121008" />
-    <public type="string" name="now_playing_gdpr_body" id="0x7f121009" />
-    <public type="string" name="now_playing_gdpr_header" id="0x7f12100a" />
-    <public type="string" name="nsfw_accept" id="0x7f12100b" />
-    <public type="string" name="nsfw_decline" id="0x7f12100c" />
-    <public type="string" name="nsfw_description" id="0x7f12100d" />
-    <public type="string" name="nsfw_title" id="0x7f12100e" />
-    <public type="string" name="nuf_age_gate_body" id="0x7f12100f" />
-    <public type="string" name="nuf_body" id="0x7f121010" />
-    <public type="string" name="nuf_body_mobile" id="0x7f121011" />
-    <public type="string" name="nuf_body_refresh" id="0x7f121012" />
-    <public type="string" name="nuf_channel_prompt_channel_topic_template" id="0x7f121013" />
-    <public type="string" name="nuf_channel_prompt_cta" id="0x7f121014" />
-    <public type="string" name="nuf_channel_prompt_subtitle" id="0x7f121015" />
-    <public type="string" name="nuf_channel_prompt_title" id="0x7f121016" />
-    <public type="string" name="nuf_channel_prompt_topic" id="0x7f121017" />
-    <public type="string" name="nuf_channel_prompt_topic_placeholder" id="0x7f121018" />
-    <public type="string" name="nuf_channels_cta_label" id="0x7f121019" />
-    <public type="string" name="nuf_channels_description" id="0x7f12101a" />
-    <public type="string" name="nuf_channels_title" id="0x7f12101b" />
-    <public type="string" name="nuf_chat_with_friends" id="0x7f12101c" />
-    <public type="string" name="nuf_claim_account_body_1" id="0x7f12101d" />
-    <public type="string" name="nuf_claim_account_body_2" id="0x7f12101e" />
-    <public type="string" name="nuf_claim_account_button" id="0x7f12101f" />
-    <public type="string" name="nuf_claim_account_generic_error" id="0x7f121020" />
-    <public type="string" name="nuf_claim_account_title" id="0x7f121021" />
-    <public type="string" name="nuf_club_or_interest_group" id="0x7f121022" />
-    <public type="string" name="nuf_complete_cta" id="0x7f121023" />
-    <public type="string" name="nuf_complete_title" id="0x7f121024" />
-    <public type="string" name="nuf_create_server_body" id="0x7f121025" />
-    <public type="string" name="nuf_create_server_button" id="0x7f121026" />
-    <public type="string" name="nuf_create_server_customize_header" id="0x7f121027" />
-    <public type="string" name="nuf_create_server_customize_subheader" id="0x7f121028" />
-    <public type="string" name="nuf_create_server_error" id="0x7f121029" />
-    <public type="string" name="nuf_create_server_header" id="0x7f12102a" />
-    <public type="string" name="nuf_create_server_note_guidelines" id="0x7f12102b" />
-    <public type="string" name="nuf_create_server_protip" id="0x7f12102c" />
-    <public type="string" name="nuf_create_server_title" id="0x7f12102d" />
-    <public type="string" name="nuf_desktop_templates_subtitle" id="0x7f12102e" />
-    <public type="string" name="nuf_desktop_templates_title" id="0x7f12102f" />
-    <public type="string" name="nuf_download_app_body" id="0x7f121030" />
-    <public type="string" name="nuf_download_app_button_platform" id="0x7f121031" />
-    <public type="string" name="nuf_download_app_button_type" id="0x7f121032" />
-    <public type="string" name="nuf_download_app_intro" id="0x7f121033" />
-    <public type="string" name="nuf_download_app_title" id="0x7f121034" />
-    <public type="string" name="nuf_gaming_community" id="0x7f121035" />
-    <public type="string" name="nuf_get_started" id="0x7f121036" />
-    <public type="string" name="nuf_have_an_invite_already" id="0x7f121037" />
-    <public type="string" name="nuf_join_a_friend" id="0x7f121038" />
-    <public type="string" name="nuf_join_server_body_1" id="0x7f121039" />
-    <public type="string" name="nuf_join_server_body_2" id="0x7f12103a" />
-    <public type="string" name="nuf_join_server_button" id="0x7f12103b" />
-    <public type="string" name="nuf_join_server_input_label" id="0x7f12103c" />
-    <public type="string" name="nuf_join_server_input_note" id="0x7f12103d" />
-    <public type="string" name="nuf_join_server_title_1" id="0x7f12103e" />
-    <public type="string" name="nuf_join_server_title_2" id="0x7f12103f" />
-    <public type="string" name="nuf_just_look_around" id="0x7f121040" />
-    <public type="string" name="nuf_title_mobile" id="0x7f121041" />
-    <public type="string" name="nuf_voice_channels_description" id="0x7f121042" />
-    <public type="string" name="nuf_voice_channels_title" id="0x7f121043" />
-    <public type="string" name="nuf_voice_chat_while_gaming" id="0x7f121044" />
-    <public type="string" name="nuf_welcome_body" id="0x7f121045" />
-    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7f121046" />
-    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7f121047" />
-    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7f121048" />
-    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7f121049" />
-    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7f12104a" />
-    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7f12104b" />
-    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7f12104c" />
-    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7f12104d" />
-    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7f12104e" />
-    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7f12104f" />
-    <public type="string" name="nuf_what_do_you_want" id="0x7f121050" />
-    <public type="string" name="num_active_threads" id="0x7f121051" />
-    <public type="string" name="num_channels" id="0x7f121052" />
-    <public type="string" name="num_members" id="0x7f121053" />
-    <public type="string" name="num_subscribers" id="0x7f121054" />
-    <public type="string" name="num_users" id="0x7f121055" />
-    <public type="string" name="numbers_only" id="0x7f121056" />
-    <public type="string" name="nux_navigation_help_channels" id="0x7f121057" />
-    <public type="string" name="nux_navigation_help_dms" id="0x7f121058" />
-    <public type="string" name="nux_navigation_help_guild" id="0x7f121059" />
-    <public type="string" name="nux_overlay_description" id="0x7f12105a" />
-    <public type="string" name="nux_overlay_enable" id="0x7f12105b" />
-    <public type="string" name="nux_overlay_title" id="0x7f12105c" />
-    <public type="string" name="nux_post_reg_join_server_description" id="0x7f12105d" />
-    <public type="string" name="nux_post_reg_join_server_skip" id="0x7f12105e" />
-    <public type="string" name="nux_post_reg_join_server_title" id="0x7f12105f" />
-    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7f121060" />
-    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7f121061" />
-    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7f121062" />
-    <public type="string" name="oauth2_add_bot" id="0x7f121063" />
-    <public type="string" name="oauth2_add_webhook_incoming" id="0x7f121064" />
-    <public type="string" name="oauth2_can_read_notice" id="0x7f121065" />
-    <public type="string" name="oauth2_cannot_read_send_notice" id="0x7f121066" />
-    <public type="string" name="oauth2_confirm_bot_permissions" id="0x7f121067" />
-    <public type="string" name="oauth2_connect_to_discord" id="0x7f121068" />
-    <public type="string" name="oauth2_details_creation_date" id="0x7f121069" />
-    <public type="string" name="oauth2_details_guilds" id="0x7f12106a" />
-    <public type="string" name="oauth2_details_redirect" id="0x7f12106b" />
-    <public type="string" name="oauth2_disabled_permissions" id="0x7f12106c" />
-    <public type="string" name="oauth2_fake_scope_1" id="0x7f12106d" />
-    <public type="string" name="oauth2_fake_scope_2" id="0x7f12106e" />
-    <public type="string" name="oauth2_fake_scope_3" id="0x7f12106f" />
-    <public type="string" name="oauth2_fake_scope_4" id="0x7f121070" />
-    <public type="string" name="oauth2_fake_scope_5" id="0x7f121071" />
-    <public type="string" name="oauth2_fake_scope_6" id="0x7f121072" />
-    <public type="string" name="oauth2_fake_scope_7" id="0x7f121073" />
-    <public type="string" name="oauth2_fake_scope_8" id="0x7f121074" />
-    <public type="string" name="oauth2_logout" id="0x7f121075" />
-    <public type="string" name="oauth2_message_cta" id="0x7f121076" />
-    <public type="string" name="oauth2_request_invalid_scope" id="0x7f121077" />
-    <public type="string" name="oauth2_request_missing_param" id="0x7f121078" />
-    <public type="string" name="oauth2_requests_account_access" id="0x7f121079" />
-    <public type="string" name="oauth2_scopes_label" id="0x7f12107a" />
-    <public type="string" name="oauth2_signed_in_as" id="0x7f12107b" />
-    <public type="string" name="oauth2_title" id="0x7f12107c" />
-    <public type="string" name="oauth2_unknown_error" id="0x7f12107d" />
-    <public type="string" name="okay" id="0x7f12107e" />
-    <public type="string" name="one_user_typing" id="0x7f12107f" />
-    <public type="string" name="ongoing_call" id="0x7f121080" />
-    <public type="string" name="ongoing_call_connected_users" id="0x7f121081" />
-    <public type="string" name="ongoing_call_tap_to_join" id="0x7f121082" />
-    <public type="string" name="ongoing_call_voice_quality_low" id="0x7f121083" />
-    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7f121084" />
-    <public type="string" name="only_you_can_see_and_delete_these" id="0x7f121085" />
-    <public type="string" name="open" id="0x7f121086" />
-    <public type="string" name="open_connection_replay" id="0x7f121087" />
-    <public type="string" name="open_in_browser" id="0x7f121088" />
-    <public type="string" name="open_in_theater" id="0x7f121089" />
-    <public type="string" name="open_link" id="0x7f12108a" />
-    <public type="string" name="open_navigation" id="0x7f12108b" />
-    <public type="string" name="open_original_image" id="0x7f12108c" />
-    <public type="string" name="open_standard_keyboard_accessibility_label" id="0x7f12108d" />
-    <public type="string" name="options" id="0x7f12108e" />
-    <public type="string" name="orange" id="0x7f12108f" />
-    <public type="string" name="other_options" id="0x7f121090" />
-    <public type="string" name="other_reactions" id="0x7f121091" />
-    <public type="string" name="others_online" id="0x7f121092" />
-    <public type="string" name="out_of_date_action" id="0x7f121093" />
-    <public type="string" name="out_of_date_description" id="0x7f121094" />
-    <public type="string" name="out_of_date_title" id="0x7f121095" />
-    <public type="string" name="outgoing_friend_request" id="0x7f121096" />
-    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7f121097" />
-    <public type="string" name="output_device" id="0x7f121098" />
-    <public type="string" name="overlay" id="0x7f121099" />
-    <public type="string" name="overlay_actions_menu_label" id="0x7f12109a" />
-    <public type="string" name="overlay_channel_chat_hotkey" id="0x7f12109b" />
-    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7f12109c" />
-    <public type="string" name="overlay_click_to_unlock" id="0x7f12109d" />
-    <public type="string" name="overlay_crashed_title" id="0x7f12109e" />
-    <public type="string" name="overlay_explanation" id="0x7f12109f" />
-    <public type="string" name="overlay_friend_calling" id="0x7f1210a0" />
-    <public type="string" name="overlay_in_game_preview_header" id="0x7f1210a1" />
-    <public type="string" name="overlay_launch_open_tip" id="0x7f1210a2" />
-    <public type="string" name="overlay_launch_title" id="0x7f1210a3" />
-    <public type="string" name="overlay_link_alert_body" id="0x7f1210a4" />
-    <public type="string" name="overlay_link_alert_secondary" id="0x7f1210a5" />
-    <public type="string" name="overlay_link_alert_title" id="0x7f1210a6" />
-    <public type="string" name="overlay_menu_get_invite" id="0x7f1210a7" />
-    <public type="string" name="overlay_menu_open_discord" id="0x7f1210a8" />
-    <public type="string" name="overlay_menu_switch_channels" id="0x7f1210a9" />
-    <public type="string" name="overlay_mobile_required" id="0x7f1210aa" />
-    <public type="string" name="overlay_mobile_toggle_desc" id="0x7f1210ab" />
-    <public type="string" name="overlay_mobile_toggle_label" id="0x7f1210ac" />
-    <public type="string" name="overlay_mobile_unauthed" id="0x7f1210ad" />
-    <public type="string" name="overlay_news_go_live_body" id="0x7f1210ae" />
-    <public type="string" name="overlay_news_go_live_body_no_voice_channel" id="0x7f1210af" />
-    <public type="string" name="overlay_news_go_live_cta" id="0x7f1210b0" />
-    <public type="string" name="overlay_no_results" id="0x7f1210b1" />
-    <public type="string" name="overlay_notification_incoming_call" id="0x7f1210b2" />
-    <public type="string" name="overlay_notification_settings_disabled" id="0x7f1210b3" />
-    <public type="string" name="overlay_notification_settings_position" id="0x7f1210b4" />
-    <public type="string" name="overlay_notifications_bottom_left" id="0x7f1210b5" />
-    <public type="string" name="overlay_notifications_bottom_right" id="0x7f1210b6" />
-    <public type="string" name="overlay_notifications_disabled" id="0x7f1210b7" />
-    <public type="string" name="overlay_notifications_settings" id="0x7f1210b8" />
-    <public type="string" name="overlay_notifications_top_left" id="0x7f1210b9" />
-    <public type="string" name="overlay_notifications_top_right" id="0x7f1210ba" />
-    <public type="string" name="overlay_reload" id="0x7f1210bb" />
-    <public type="string" name="overlay_reset_default_layout" id="0x7f1210bc" />
-    <public type="string" name="overlay_settings_general_tab" id="0x7f1210bd" />
-    <public type="string" name="overlay_settings_title" id="0x7f1210be" />
-    <public type="string" name="overlay_settings_voice_tab" id="0x7f1210bf" />
-    <public type="string" name="overlay_too_small" id="0x7f1210c0" />
-    <public type="string" name="overlay_unlock_to_answer" id="0x7f1210c1" />
-    <public type="string" name="overlay_unlock_to_join" id="0x7f1210c2" />
-    <public type="string" name="overlay_user_chat_hotkey" id="0x7f1210c3" />
-    <public type="string" name="overlay_widget_hide_in_game" id="0x7f1210c4" />
-    <public type="string" name="overlay_widget_show_in_game" id="0x7f1210c5" />
-    <public type="string" name="overview" id="0x7f1210c6" />
-    <public type="string" name="overwrite_autocomplete_a11y_label" id="0x7f1210c7" />
-    <public type="string" name="overwrite_autocomplete_label" id="0x7f1210c8" />
-    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7f1210c9" />
-    <public type="string" name="overwrite_no_role_to_add" id="0x7f1210ca" />
-    <public type="string" name="pagination_next" id="0x7f1210cb" />
-    <public type="string" name="pagination_page_label" id="0x7f1210cc" />
-    <public type="string" name="pagination_page_of" id="0x7f1210cd" />
-    <public type="string" name="pagination_previous" id="0x7f1210ce" />
-    <public type="string" name="paginator_current_page" id="0x7f1210cf" />
-    <public type="string" name="paginator_of_pages" id="0x7f1210d0" />
-    <public type="string" name="partial_outage" id="0x7f1210d1" />
-    <public type="string" name="partial_outage_a11y" id="0x7f1210d2" />
-    <public type="string" name="partner_badge_tooltip" id="0x7f1210d3" />
-    <public type="string" name="password_length_error" id="0x7f1210d4" />
-    <public type="string" name="password_manager" id="0x7f1210d5" />
-    <public type="string" name="password_manager_info_android" id="0x7f1210d6" />
-    <public type="string" name="password_manager_open_settings" id="0x7f1210d7" />
-    <public type="string" name="password_manager_open_settings_error" id="0x7f1210d8" />
-    <public type="string" name="password_manager_use" id="0x7f1210d9" />
-    <public type="string" name="password_required" id="0x7f1210da" />
-    <public type="string" name="password_toggle_content_description" id="0x7f1210db" />
-    <public type="string" name="paste" id="0x7f1210dc" />
-    <public type="string" name="path_password_eye" id="0x7f1210dd" />
-    <public type="string" name="path_password_eye_mask_strike_through" id="0x7f1210de" />
-    <public type="string" name="path_password_eye_mask_visible" id="0x7f1210df" />
-    <public type="string" name="path_password_strike_through" id="0x7f1210e0" />
-    <public type="string" name="pause" id="0x7f1210e1" />
-    <public type="string" name="payment_authentication_modal_button" id="0x7f1210e2" />
-    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7f1210e3" />
-    <public type="string" name="payment_authentication_modal_canceled" id="0x7f1210e4" />
-    <public type="string" name="payment_authentication_modal_fail" id="0x7f1210e5" />
-    <public type="string" name="payment_authentication_modal_start" id="0x7f1210e6" />
-    <public type="string" name="payment_authentication_modal_success" id="0x7f1210e7" />
-    <public type="string" name="payment_authentication_modal_title" id="0x7f1210e8" />
-    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7f1210e9" />
-    <public type="string" name="payment_authentication_modal_title_fail" id="0x7f1210ea" />
-    <public type="string" name="payment_authentication_modal_title_success" id="0x7f1210eb" />
-    <public type="string" name="payment_modal_button_premium" id="0x7f1210ec" />
-    <public type="string" name="payment_modal_button_premium_gift" id="0x7f1210ed" />
-    <public type="string" name="payment_modal_one_month" id="0x7f1210ee" />
-    <public type="string" name="payment_modal_one_year" id="0x7f1210ef" />
-    <public type="string" name="payment_modal_subtitle_premium_gift" id="0x7f1210f0" />
-    <public type="string" name="payment_price_change_body" id="0x7f1210f1" />
-    <public type="string" name="payment_price_change_title" id="0x7f1210f2" />
-    <public type="string" name="payment_source_card_ending" id="0x7f1210f3" />
-    <public type="string" name="payment_source_card_ending_in" id="0x7f1210f4" />
-    <public type="string" name="payment_source_card_expires" id="0x7f1210f5" />
-    <public type="string" name="payment_source_card_number" id="0x7f1210f6" />
-    <public type="string" name="payment_source_confirm_paypal_details" id="0x7f1210f7" />
-    <public type="string" name="payment_source_credit_card" id="0x7f1210f8" />
-    <public type="string" name="payment_source_delete" id="0x7f1210f9" />
-    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7f1210fa" />
-    <public type="string" name="payment_source_deleted" id="0x7f1210fb" />
-    <public type="string" name="payment_source_edit_help_card" id="0x7f1210fc" />
-    <public type="string" name="payment_source_edit_help_paypal" id="0x7f1210fd" />
-    <public type="string" name="payment_source_edit_saved" id="0x7f1210fe" />
-    <public type="string" name="payment_source_edit_select_state" id="0x7f1210ff" />
-    <public type="string" name="payment_source_edit_title" id="0x7f121100" />
-    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7f121101" />
-    <public type="string" name="payment_source_information" id="0x7f121102" />
-    <public type="string" name="payment_source_invalid" id="0x7f121103" />
-    <public type="string" name="payment_source_invalid_help" id="0x7f121104" />
-    <public type="string" name="payment_source_make_default" id="0x7f121105" />
-    <public type="string" name="payment_source_name_error_required" id="0x7f121106" />
-    <public type="string" name="payment_source_payment_request_button_generic" id="0x7f121107" />
-    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7f121108" />
-    <public type="string" name="payment_source_payment_request_info_creating" id="0x7f121109" />
-    <public type="string" name="payment_source_payment_request_info_loading" id="0x7f12110a" />
-    <public type="string" name="payment_source_payment_request_info_title" id="0x7f12110b" />
-    <public type="string" name="payment_source_payment_request_label" id="0x7f12110c" />
-    <public type="string" name="payment_source_payment_request_unsupported" id="0x7f12110d" />
-    <public type="string" name="payment_source_paypal" id="0x7f12110e" />
-    <public type="string" name="payment_source_paypal_account" id="0x7f12110f" />
-    <public type="string" name="payment_source_paypal_details" id="0x7f121110" />
-    <public type="string" name="payment_source_paypal_loading" id="0x7f121111" />
-    <public type="string" name="payment_source_paypal_reopen" id="0x7f121112" />
-    <public type="string" name="payment_source_subscription" id="0x7f121113" />
-    <public type="string" name="payment_source_type" id="0x7f121114" />
-    <public type="string" name="payment_source_type_select" id="0x7f121115" />
-    <public type="string" name="payment_sources_add" id="0x7f121116" />
-    <public type="string" name="payment_waiting_for_authentication" id="0x7f121117" />
-    <public type="string" name="paypal_account_verifying" id="0x7f121118" />
-    <public type="string" name="paypal_callback_error" id="0x7f121119" />
-    <public type="string" name="paypal_callback_success" id="0x7f12111a" />
-    <public type="string" name="pending" id="0x7f12111b" />
-    <public type="string" name="people" id="0x7f12111c" />
-    <public type="string" name="percentage_since_last_week" id="0x7f12111d" />
-    <public type="string" name="permission_helpdesk" id="0x7f12111e" />
-    <public type="string" name="permission_media_denied" id="0x7f12111f" />
-    <public type="string" name="permission_media_download_denied" id="0x7f121120" />
-    <public type="string" name="permission_microphone_denied" id="0x7f121121" />
-    <public type="string" name="permission_override_allow" id="0x7f121122" />
-    <public type="string" name="permission_override_deny" id="0x7f121123" />
-    <public type="string" name="permission_override_passthrough" id="0x7f121124" />
-    <public type="string" name="permission_overrides" id="0x7f121125" />
-    <public type="string" name="permission_qr_scanner_denied" id="0x7f121126" />
-    <public type="string" name="permissions" id="0x7f121127" />
-    <public type="string" name="permissions_unsynced" id="0x7f121128" />
-    <public type="string" name="permit_usage_android" id="0x7f121129" />
-    <public type="string" name="personalization_disable_modal_body" id="0x7f12112a" />
-    <public type="string" name="personalization_disable_modal_cancel" id="0x7f12112b" />
-    <public type="string" name="personalization_disable_modal_confirm" id="0x7f12112c" />
-    <public type="string" name="personalization_disable_modal_title" id="0x7f12112d" />
-    <public type="string" name="phone" id="0x7f12112e" />
-    <public type="string" name="pick_a_color" id="0x7f12112f" />
-    <public type="string" name="pin" id="0x7f121130" />
-    <public type="string" name="pin_confirm" id="0x7f121131" />
-    <public type="string" name="pin_message" id="0x7f121132" />
-    <public type="string" name="pin_message_body" id="0x7f121133" />
-    <public type="string" name="pin_message_body_mobile" id="0x7f121134" />
-    <public type="string" name="pin_message_body_private_channel" id="0x7f121135" />
-    <public type="string" name="pin_message_title" id="0x7f121136" />
-    <public type="string" name="pin_message_too_many_body" id="0x7f121137" />
-    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7f121138" />
-    <public type="string" name="pin_message_too_many_title" id="0x7f121139" />
-    <public type="string" name="pinned_messages" id="0x7f12113a" />
-    <public type="string" name="pinned_messages_pro_tip" id="0x7f12113b" />
-    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7f12113c" />
-    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7f12113d" />
-    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7f12113e" />
-    <public type="string" name="pins" id="0x7f12113f" />
-    <public type="string" name="pins_disabled_nsfw" id="0x7f121140" />
-    <public type="string" name="pl" id="0x7f121141" />
-    <public type="string" name="platform_android" id="0x7f121142" />
-    <public type="string" name="platform_ios" id="0x7f121143" />
-    <public type="string" name="platform_linux" id="0x7f121144" />
-    <public type="string" name="platform_macos" id="0x7f121145" />
-    <public type="string" name="platform_windows" id="0x7f121146" />
-    <public type="string" name="play" id="0x7f121147" />
-    <public type="string" name="play_full_video" id="0x7f121148" />
-    <public type="string" name="play_stream" id="0x7f121149" />
-    <public type="string" name="playing_game" id="0x7f12114a" />
-    <public type="string" name="popout_player" id="0x7f12114b" />
-    <public type="string" name="popout_player_opened" id="0x7f12114c" />
-    <public type="string" name="popout_remove_from_top" id="0x7f12114d" />
-    <public type="string" name="popout_return" id="0x7f12114e" />
-    <public type="string" name="popout_stay_on_top" id="0x7f12114f" />
-    <public type="string" name="preference_copied" id="0x7f121150" />
-    <public type="string" name="premium" id="0x7f121151" />
-    <public type="string" name="premium_activated" id="0x7f121152" />
-    <public type="string" name="premium_alert_error_title" id="0x7f121153" />
-    <public type="string" name="premium_badge_tooltip" id="0x7f121154" />
-    <public type="string" name="premium_cancel_cancel_mobile" id="0x7f121155" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7f121156" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7f121157" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7f121158" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7f121159" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7f12115a" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7f12115b" />
-    <public type="string" name="premium_cancel_confirm_mobile" id="0x7f12115c" />
-    <public type="string" name="premium_cancel_confirm_new" id="0x7f12115d" />
-    <public type="string" name="premium_cancel_confirm_title" id="0x7f12115e" />
-    <public type="string" name="premium_cancel_failed_body" id="0x7f12115f" />
-    <public type="string" name="premium_change_discriminator_length_error" id="0x7f121160" />
-    <public type="string" name="premium_change_discriminator_modal_body" id="0x7f121161" />
-    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7f121162" />
-    <public type="string" name="premium_change_discriminator_modal_header" id="0x7f121163" />
-    <public type="string" name="premium_change_discriminator_tooltip" id="0x7f121164" />
-    <public type="string" name="premium_change_discriminator_zero_error" id="0x7f121165" />
-    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7f121166" />
-    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7f121167" />
-    <public type="string" name="premium_chat_perks_description_premium_guild_discount" id="0x7f121168" />
-    <public type="string" name="premium_chat_perks_description_premium_guild_included" id="0x7f121169" />
-    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7f12116a" />
-    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7f12116b" />
-    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7f12116c" />
-    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7f12116d" />
-    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7f12116e" />
-    <public type="string" name="premium_chat_perks_simple_title" id="0x7f12116f" />
-    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7f121170" />
-    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7f121171" />
-    <public type="string" name="premium_downgrade_done_button" id="0x7f121172" />
-    <public type="string" name="premium_features_chat_perks" id="0x7f121173" />
-    <public type="string" name="premium_features_chat_perks_header" id="0x7f121174" />
-    <public type="string" name="premium_game" id="0x7f121175" />
-    <public type="string" name="premium_gift_button_label" id="0x7f121176" />
-    <public type="string" name="premium_gift_button_tooltip" id="0x7f121177" />
-    <public type="string" name="premium_gift_send" id="0x7f121178" />
-    <public type="string" name="premium_gift_share_link_ios" id="0x7f121179" />
-    <public type="string" name="premium_gifting_button" id="0x7f12117a" />
-    <public type="string" name="premium_gifting_title" id="0x7f12117b" />
-    <public type="string" name="premium_gifting_title_mobile" id="0x7f12117c" />
-    <public type="string" name="premium_grandfathered_monthly" id="0x7f12117d" />
-    <public type="string" name="premium_grandfathered_warning" id="0x7f12117e" />
-    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7f12117f" />
-    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7f121180" />
-    <public type="string" name="premium_grandfathered_warning_title" id="0x7f121181" />
-    <public type="string" name="premium_grandfathered_yearly" id="0x7f121182" />
-    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7f121183" />
-    <public type="string" name="premium_guild_emoji_promo_description" id="0x7f121184" />
-    <public type="string" name="premium_guild_emoji_promo_title" id="0x7f121185" />
-    <public type="string" name="premium_guild_features_custom_emoji_mobile" id="0x7f121186" />
-    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7f121187" />
-    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7f121188" />
-    <public type="string" name="premium_guild_features_voice_quality" id="0x7f121189" />
-    <public type="string" name="premium_guild_full_feature_list" id="0x7f12118a" />
-    <public type="string" name="premium_guild_grace_period_cooldown" id="0x7f12118b" />
-    <public type="string" name="premium_guild_grace_period_cooldown_soon" id="0x7f12118c" />
-    <public type="string" name="premium_guild_grace_period_notice" id="0x7f12118d" />
-    <public type="string" name="premium_guild_grace_period_notice_button" id="0x7f12118e" />
-    <public type="string" name="premium_guild_grace_period_title" id="0x7f12118f" />
-    <public type="string" name="premium_guild_guild_feature_audio_quality" id="0x7f121190" />
-    <public type="string" name="premium_guild_guild_feature_emoji" id="0x7f121191" />
-    <public type="string" name="premium_guild_guild_feature_upload_size" id="0x7f121192" />
-    <public type="string" name="premium_guild_guild_features_header" id="0x7f121193" />
-    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7f121194" />
-    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7f121195" />
-    <public type="string" name="premium_guild_num_month_guild_subscriptions" id="0x7f121196" />
-    <public type="string" name="premium_guild_num_year_guild_subscriptions" id="0x7f121197" />
-    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7f121198" />
-    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7f121199" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile" id="0x7f12119a" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile_learn_more" id="0x7f12119b" />
-    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_body" id="0x7f12119c" />
-    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_title" id="0x7f12119d" />
-    <public type="string" name="premium_guild_perks_modal_button_gift_premium" id="0x7f12119e" />
-    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7f12119f" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7f1211a0" />
-    <public type="string" name="premium_guild_perks_modal_gift_nitro" id="0x7f1211a1" />
-    <public type="string" name="premium_guild_perks_modal_header" id="0x7f1211a2" />
-    <public type="string" name="premium_guild_perks_modal_header_subscription_count" id="0x7f1211a3" />
-    <public type="string" name="premium_guild_perks_modal_header_user_subscription_count" id="0x7f1211a4" />
-    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7f1211a5" />
-    <public type="string" name="premium_guild_perks_modal_manage_your_subscriptions" id="0x7f1211a6" />
-    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7f1211a7" />
-    <public type="string" name="premium_guild_perks_modal_protip" id="0x7f1211a8" />
-    <public type="string" name="premium_guild_perks_modal_protip_mobile" id="0x7f1211a9" />
-    <public type="string" name="premium_guild_perks_modal_subscribe_to_tier_tooltip" id="0x7f1211aa" />
-    <public type="string" name="premium_guild_perks_modal_subscriber_perks_header" id="0x7f1211ab" />
-    <public type="string" name="premium_guild_plan_month" id="0x7f1211ac" />
-    <public type="string" name="premium_guild_plan_year" id="0x7f1211ad" />
-    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7f1211ae" />
-    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7f1211af" />
-    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7f1211b0" />
-    <public type="string" name="premium_guild_subscribe_confirm_cancel_warning" id="0x7f1211b1" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7f1211b2" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7f1211b3" />
-    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7f1211b4" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_blurb" id="0x7f1211b5" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_from_guild" id="0x7f1211b6" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_header" id="0x7f1211b7" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_to_guild" id="0x7f1211b8" />
-    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7f1211b9" />
-    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7f1211ba" />
-    <public type="string" name="premium_guild_subscribe_select_guild_transfer_header" id="0x7f1211bb" />
-    <public type="string" name="premium_guild_subscribe_success_okay" id="0x7f1211bc" />
-    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7f1211bd" />
-    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation" id="0x7f1211be" />
-    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation_label" id="0x7f1211bf" />
-    <public type="string" name="premium_guild_subscribe_transfer_error_body" id="0x7f1211c0" />
-    <public type="string" name="premium_guild_subscribe_transfer_error_header" id="0x7f1211c1" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_cancel" id="0x7f1211c2" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_counter" id="0x7f1211c3" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_description" id="0x7f1211c4" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_header" id="0x7f1211c5" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_next" id="0x7f1211c6" />
-    <public type="string" name="premium_guild_subscriber_feature_member_badge" id="0x7f1211c7" />
-    <public type="string" name="premium_guild_subscriber_feature_profile_badge" id="0x7f1211c8" />
-    <public type="string" name="premium_guild_subscriber_feature_role" id="0x7f1211c9" />
-    <public type="string" name="premium_guild_subscription" id="0x7f1211ca" />
-    <public type="string" name="premium_guild_subscription_active_title" id="0x7f1211cb" />
-    <public type="string" name="premium_guild_subscription_available" id="0x7f1211cc" />
-    <public type="string" name="premium_guild_subscription_cancel_body_guild" id="0x7f1211cd" />
-    <public type="string" name="premium_guild_subscription_cancel_body_inventory" id="0x7f1211ce" />
-    <public type="string" name="premium_guild_subscription_cancel_button" id="0x7f1211cf" />
-    <public type="string" name="premium_guild_subscription_cancel_button_disabled_tooltip" id="0x7f1211d0" />
-    <public type="string" name="premium_guild_subscription_cancel_button_mobile" id="0x7f1211d1" />
-    <public type="string" name="premium_guild_subscription_cancel_error_mobile" id="0x7f1211d2" />
-    <public type="string" name="premium_guild_subscription_cancel_invoice_subscription_cancelled" id="0x7f1211d3" />
-    <public type="string" name="premium_guild_subscription_cancel_preview" id="0x7f1211d4" />
-    <public type="string" name="premium_guild_subscription_cancel_title" id="0x7f1211d5" />
-    <public type="string" name="premium_guild_subscription_cancel_title_guild" id="0x7f1211d6" />
-    <public type="string" name="premium_guild_subscription_cancel_title_inventory" id="0x7f1211d7" />
-    <public type="string" name="premium_guild_subscription_cancel_title_pending_cancellation" id="0x7f1211d8" />
-    <public type="string" name="premium_guild_subscription_confirm_body" id="0x7f1211d9" />
-    <public type="string" name="premium_guild_subscription_confirm_title" id="0x7f1211da" />
-    <public type="string" name="premium_guild_subscription_creation_date" id="0x7f1211db" />
-    <public type="string" name="premium_guild_subscription_duration" id="0x7f1211dc" />
-    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7f1211dd" />
-    <public type="string" name="premium_guild_subscription_error_pending_mutation" id="0x7f1211de" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7f1211df" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7f1211e0" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7f1211e1" />
-    <public type="string" name="premium_guild_subscription_guild_affinity_notice" id="0x7f1211e2" />
-    <public type="string" name="premium_guild_subscription_guild_affinity_notice_button" id="0x7f1211e3" />
-    <public type="string" name="premium_guild_subscription_guild_affinity_notice_small_guild" id="0x7f1211e4" />
-    <public type="string" name="premium_guild_subscription_guild_subsription_subtitle" id="0x7f1211e5" />
-    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_close" id="0x7f1211e6" />
-    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_header" id="0x7f1211e7" />
-    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_text" id="0x7f1211e8" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_button" id="0x7f1211e9" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_button_mobile" id="0x7f1211ea" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_description" id="0x7f1211eb" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_title" id="0x7f1211ec" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_description" id="0x7f1211ed" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_error" id="0x7f1211ee" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_title" id="0x7f1211ef" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_title_mobile" id="0x7f1211f0" />
-    <public type="string" name="premium_guild_subscription_marketing_blurb" id="0x7f1211f1" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb" id="0x7f1211f2" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_prompt" id="0x7f1211f3" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_without_prompt" id="0x7f1211f4" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_blurb_mobile" id="0x7f1211f5" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_text" id="0x7f1211f6" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_title" id="0x7f1211f7" />
-    <public type="string" name="premium_guild_subscription_marketing_header" id="0x7f1211f8" />
-    <public type="string" name="premium_guild_subscription_marketing_header_ios" id="0x7f1211f9" />
-    <public type="string" name="premium_guild_subscription_notice" id="0x7f1211fa" />
-    <public type="string" name="premium_guild_subscription_notice_button" id="0x7f1211fb" />
-    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7f1211fc" />
-    <public type="string" name="premium_guild_subscription_num_subscriptions" id="0x7f1211fd" />
-    <public type="string" name="premium_guild_subscription_pending_cancelation" id="0x7f1211fe" />
-    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_plan" id="0x7f1211ff" />
-    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription" id="0x7f121200" />
-    <public type="string" name="premium_guild_subscription_purchase_button_disabled_subscription_past_due" id="0x7f121201" />
-    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7f121202" />
-    <public type="string" name="premium_guild_subscription_slot_cancel_button" id="0x7f121203" />
-    <public type="string" name="premium_guild_subscription_slot_uncancel_button" id="0x7f121204" />
-    <public type="string" name="premium_guild_subscription_slot_uncancel_button_mobile" id="0x7f121205" />
-    <public type="string" name="premium_guild_subscription_subscribe" id="0x7f121206" />
-    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7f121207" />
-    <public type="string" name="premium_guild_subscription_subtitle" id="0x7f121208" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7f121209" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7f12120a" />
-    <public type="string" name="premium_guild_subscription_title" id="0x7f12120b" />
-    <public type="string" name="premium_guild_subscription_tooltip" id="0x7f12120c" />
-    <public type="string" name="premium_guild_subscription_transfer_button" id="0x7f12120d" />
-    <public type="string" name="premium_guild_subscription_transfer_button_disabled_tooltip" id="0x7f12120e" />
-    <public type="string" name="premium_guild_subscription_unused_slot_description" id="0x7f12120f" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info" id="0x7f121210" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_android" id="0x7f121211" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation" id="0x7f121212" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android" id="0x7f121213" />
-    <public type="string" name="premium_guild_tier_0" id="0x7f121214" />
-    <public type="string" name="premium_guild_tier_1" id="0x7f121215" />
-    <public type="string" name="premium_guild_tier_2" id="0x7f121216" />
-    <public type="string" name="premium_guild_tier_3" id="0x7f121217" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7f121218" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7f121219" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7f12121a" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7f12121b" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7f12121c" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7f12121d" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7f12121e" />
-    <public type="string" name="premium_guild_user_feature_member_badge" id="0x7f12121f" />
-    <public type="string" name="premium_guild_user_feature_profile_badge" id="0x7f121220" />
-    <public type="string" name="premium_guild_user_feature_role" id="0x7f121221" />
-    <public type="string" name="premium_guild_user_features_header" id="0x7f121222" />
-    <public type="string" name="premium_included" id="0x7f121223" />
-    <public type="string" name="premium_legacy" id="0x7f121224" />
-    <public type="string" name="premium_not_claimed" id="0x7f121225" />
-    <public type="string" name="premium_not_claimed_body" id="0x7f121226" />
-    <public type="string" name="premium_not_verified" id="0x7f121227" />
-    <public type="string" name="premium_not_verified_body" id="0x7f121228" />
-    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7f121229" />
-    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7f12122a" />
-    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7f12122b" />
-    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7f12122c" />
-    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7f12122d" />
-    <public type="string" name="premium_payment_gift_subtext_monthly" id="0x7f12122e" />
-    <public type="string" name="premium_payment_gift_subtext_yearly" id="0x7f12122f" />
-    <public type="string" name="premium_payment_is_gift" id="0x7f121230" />
-    <public type="string" name="premium_payment_select" id="0x7f121231" />
-    <public type="string" name="premium_pending_plan_change_cancel_body" id="0x7f121232" />
-    <public type="string" name="premium_pending_plan_change_cancel_button" id="0x7f121233" />
-    <public type="string" name="premium_pending_plan_change_cancel_header" id="0x7f121234" />
-    <public type="string" name="premium_pending_plan_change_notice" id="0x7f121235" />
-    <public type="string" name="premium_plan_month" id="0x7f121236" />
-    <public type="string" name="premium_plan_month_tier_1" id="0x7f121237" />
-    <public type="string" name="premium_plan_month_tier_2" id="0x7f121238" />
-    <public type="string" name="premium_plan_month_tier_2_trial" id="0x7f121239" />
-    <public type="string" name="premium_plan_year" id="0x7f12123a" />
-    <public type="string" name="premium_plan_year_tier_1" id="0x7f12123b" />
-    <public type="string" name="premium_plan_year_tier_2" id="0x7f12123c" />
-    <public type="string" name="premium_plan_year_tier_2_trial" id="0x7f12123d" />
-    <public type="string" name="premium_promo_description" id="0x7f12123e" />
-    <public type="string" name="premium_promo_description_trial" id="0x7f12123f" />
-    <public type="string" name="premium_promo_title" id="0x7f121240" />
-    <public type="string" name="premium_required" id="0x7f121241" />
-    <public type="string" name="premium_required_get_nitro" id="0x7f121242" />
-    <public type="string" name="premium_restore_subscription_ios" id="0x7f121243" />
-    <public type="string" name="premium_retention_emoji_picker_description" id="0x7f121244" />
-    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7f121245" />
-    <public type="string" name="premium_settings" id="0x7f121246" />
-    <public type="string" name="premium_settings_billing_info" id="0x7f121247" />
-    <public type="string" name="premium_settings_cancelled_info" id="0x7f121248" />
-    <public type="string" name="premium_settings_get" id="0x7f121249" />
-    <public type="string" name="premium_settings_manage" id="0x7f12124a" />
-    <public type="string" name="premium_settings_past_due_info" id="0x7f12124b" />
-    <public type="string" name="premium_settings_renewal_info" id="0x7f12124c" />
-    <public type="string" name="premium_settings_subscriptions_mobile_header" id="0x7f12124d" />
-    <public type="string" name="premium_subscription_adjustment_tooltip" id="0x7f12124e" />
-    <public type="string" name="premium_subscription_billing_info_mobile" id="0x7f12124f" />
-    <public type="string" name="premium_subscription_cancelled" id="0x7f121250" />
-    <public type="string" name="premium_subscription_credit" id="0x7f121251" />
-    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7f121252" />
-    <public type="string" name="premium_subscription_credit_applied_on" id="0x7f121253" />
-    <public type="string" name="premium_subscription_credit_count_months" id="0x7f121254" />
-    <public type="string" name="premium_subscription_current_label" id="0x7f121255" />
-    <public type="string" name="premium_subscription_description_tier_1" id="0x7f121256" />
-    <public type="string" name="premium_subscription_description_tier_1_pending_cancelation" id="0x7f121257" />
-    <public type="string" name="premium_subscription_description_tier_2" id="0x7f121258" />
-    <public type="string" name="premium_subscription_description_tier_2_pending_cancelation" id="0x7f121259" />
-    <public type="string" name="premium_subscription_grandfathered_upgrade_note" id="0x7f12125a" />
-    <public type="string" name="premium_subscription_guild_subscription_adjustment" id="0x7f12125b" />
-    <public type="string" name="premium_subscription_guild_subscription_adjustment_text" id="0x7f12125c" />
-    <public type="string" name="premium_subscription_guild_subscription_adjustment_tooltip" id="0x7f12125d" />
-    <public type="string" name="premium_subscription_hide_details" id="0x7f12125e" />
-    <public type="string" name="premium_subscription_new_label" id="0x7f12125f" />
-    <public type="string" name="premium_subscription_new_total" id="0x7f121260" />
-    <public type="string" name="premium_subscription_period_reset_notice" id="0x7f121261" />
-    <public type="string" name="premium_subscription_plan_adjustment" id="0x7f121262" />
-    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7f121263" />
-    <public type="string" name="premium_subscription_policy_ios" id="0x7f121264" />
-    <public type="string" name="premium_subscription_renewal_footer" id="0x7f121265" />
-    <public type="string" name="premium_subscription_renewal_footer_trial" id="0x7f121266" />
-    <public type="string" name="premium_subscription_required_body" id="0x7f121267" />
-    <public type="string" name="premium_subscription_show_details" id="0x7f121268" />
-    <public type="string" name="premium_subscription_updates" id="0x7f121269" />
-    <public type="string" name="premium_switch_plan_disabled_in_trial" id="0x7f12126a" />
-    <public type="string" name="premium_switch_plan_disabled_pending_mutation_plan" id="0x7f12126b" />
-    <public type="string" name="premium_switch_plan_disabled_pending_mutation_premium_guild_subscription" id="0x7f12126c" />
-    <public type="string" name="premium_switch_plans" id="0x7f12126d" />
-    <public type="string" name="premium_switch_review_header_premium_month_tier_1" id="0x7f12126e" />
-    <public type="string" name="premium_switch_review_header_premium_month_tier_2" id="0x7f12126f" />
-    <public type="string" name="premium_switch_review_header_premium_year_tier_1" id="0x7f121270" />
-    <public type="string" name="premium_switch_review_header_premium_year_tier_2" id="0x7f121271" />
-    <public type="string" name="premium_tier_1" id="0x7f121272" />
-    <public type="string" name="premium_tier_2" id="0x7f121273" />
-    <public type="string" name="premium_tier_2_subtitle" id="0x7f121274" />
-    <public type="string" name="premium_tier_2_title" id="0x7f121275" />
-    <public type="string" name="premium_tier_2_trial_cta_note" id="0x7f121276" />
-    <public type="string" name="premium_tier_2_trial_cta_subtitle" id="0x7f121277" />
-    <public type="string" name="premium_tier_2_trial_cta_title" id="0x7f121278" />
-    <public type="string" name="premium_title" id="0x7f121279" />
-    <public type="string" name="premium_trial_cta_button" id="0x7f12127a" />
-    <public type="string" name="premium_trial_cta_descirption" id="0x7f12127b" />
-    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7f12127c" />
-    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7f12127d" />
-    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7f12127e" />
-    <public type="string" name="premium_upgrade_done_button" id="0x7f12127f" />
-    <public type="string" name="premium_upgrade_required_body" id="0x7f121280" />
-    <public type="string" name="premium_upload_promo" id="0x7f121281" />
-    <public type="string" name="premium_upload_promo_trial" id="0x7f121282" />
-    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7f121283" />
-    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7f121284" />
-    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7f121285" />
-    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7f121286" />
-    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7f121287" />
-    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7f121288" />
-    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7f121289" />
-    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7f12128a" />
-    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7f12128b" />
-    <public type="string" name="premium_upsell_continue_to_boosts" id="0x7f12128c" />
-    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7f12128d" />
-    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7f12128e" />
-    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7f12128f" />
-    <public type="string" name="premium_upsell_feature_chat_perks" id="0x7f121290" />
-    <public type="string" name="premium_upsell_feature_free_guild_subscription" id="0x7f121291" />
-    <public type="string" name="premium_upsell_feature_guild_subscription_discount" id="0x7f121292" />
-    <public type="string" name="premium_upsell_feature_pretext" id="0x7f121293" />
-    <public type="string" name="premium_upsell_feature_pretext_trial" id="0x7f121294" />
-    <public type="string" name="premium_upsell_feature_stream" id="0x7f121295" />
-    <public type="string" name="premium_upsell_feature_upload" id="0x7f121296" />
-    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7f121297" />
-    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7f121298" />
-    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7f121299" />
-    <public type="string" name="premium_upsell_upgrade" id="0x7f12129a" />
-    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7f12129b" />
-    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7f12129c" />
-    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7f12129d" />
-    <public type="string" name="preorder_sku_name" id="0x7f12129e" />
-    <public type="string" name="priority_speaker" id="0x7f12129f" />
-    <public type="string" name="priority_speaker_description" id="0x7f1212a0" />
-    <public type="string" name="priority_speaker_description_app" id="0x7f1212a1" />
-    <public type="string" name="privacy_and_safety" id="0x7f1212a2" />
-    <public type="string" name="privacy_policy" id="0x7f1212a3" />
-    <public type="string" name="privacy_policy_url" id="0x7f1212a4" />
-    <public type="string" name="privacy_settings" id="0x7f1212a5" />
-    <public type="string" name="private_category" id="0x7f1212a6" />
-    <public type="string" name="private_category_note" id="0x7f1212a7" />
-    <public type="string" name="private_channel" id="0x7f1212a8" />
-    <public type="string" name="private_channel_modal_access_owner" id="0x7f1212a9" />
-    <public type="string" name="private_channel_modal_access_you" id="0x7f1212aa" />
-    <public type="string" name="private_channel_modal_admin_role_force_enabled" id="0x7f1212ab" />
-    <public type="string" name="private_channel_modal_no_roles" id="0x7f1212ac" />
-    <public type="string" name="private_channel_modal_no_roles_create" id="0x7f1212ad" />
-    <public type="string" name="private_channel_modal_no_roles_edit" id="0x7f1212ae" />
-    <public type="string" name="private_channel_note" id="0x7f1212af" />
-    <public type="string" name="private_channels_a11y_label" id="0x7f1212b0" />
-    <public type="string" name="profile" id="0x7f1212b1" />
-    <public type="string" name="progress_completed" id="0x7f1212b2" />
-    <public type="string" name="progress_completed_description" id="0x7f1212b3" />
-    <public type="string" name="progress_steps" id="0x7f1212b4" />
-    <public type="string" name="progress_steps_finished" id="0x7f1212b5" />
-    <public type="string" name="project_id" id="0x7f1212b6" />
-    <public type="string" name="promotion_card_body_redeemed_hidden" id="0x7f1212b7" />
-    <public type="string" name="prune" id="0x7f1212b8" />
-    <public type="string" name="prune_members" id="0x7f1212b9" />
-    <public type="string" name="prune_with_roles" id="0x7f1212ba" />
-    <public type="string" name="pt_br" id="0x7f1212bb" />
-    <public type="string" name="ptt_limited_body" id="0x7f1212bc" />
-    <public type="string" name="ptt_limited_title" id="0x7f1212bd" />
-    <public type="string" name="ptt_limited_warning" id="0x7f1212be" />
-    <public type="string" name="ptt_permission_body" id="0x7f1212bf" />
-    <public type="string" name="ptt_permission_title" id="0x7f1212c0" />
-    <public type="string" name="public_guild_policy_accept" id="0x7f1212c1" />
-    <public type="string" name="public_guild_policy_title" id="0x7f1212c2" />
-    <public type="string" name="public_locale_help" id="0x7f1212c3" />
-    <public type="string" name="public_locale_selector_title" id="0x7f1212c4" />
-    <public type="string" name="public_locale_title" id="0x7f1212c5" />
-    <public type="string" name="public_rules_channel_title" id="0x7f1212c6" />
-    <public type="string" name="public_rules_selector_title" id="0x7f1212c7" />
-    <public type="string" name="public_updates_channel_title" id="0x7f1212c8" />
-    <public type="string" name="publish_followed_news_body" id="0x7f1212c9" />
-    <public type="string" name="publish_followed_news_body_reach" id="0x7f1212ca" />
-    <public type="string" name="publish_followed_news_body_settings" id="0x7f1212cb" />
-    <public type="string" name="publish_followed_news_body_settings_body" id="0x7f1212cc" />
-    <public type="string" name="publish_followed_news_fail_body" id="0x7f1212cd" />
-    <public type="string" name="publish_followed_news_fail_title" id="0x7f1212ce" />
-    <public type="string" name="publish_followed_news_generic_body" id="0x7f1212cf" />
-    <public type="string" name="purple" id="0x7f1212d0" />
-    <public type="string" name="qr_code_fail" id="0x7f1212d1" />
-    <public type="string" name="qr_code_fail_description" id="0x7f1212d2" />
-    <public type="string" name="qr_code_in_app_scanner_only" id="0x7f1212d3" />
-    <public type="string" name="qr_code_invalid" id="0x7f1212d4" />
-    <public type="string" name="qr_code_login_confirm" id="0x7f1212d5" />
-    <public type="string" name="qr_code_login_finish_button" id="0x7f1212d6" />
-    <public type="string" name="qr_code_login_start_over" id="0x7f1212d7" />
-    <public type="string" name="qr_code_login_success" id="0x7f1212d8" />
-    <public type="string" name="qr_code_login_success_flavor" id="0x7f1212d9" />
-    <public type="string" name="qr_code_not_found" id="0x7f1212da" />
-    <public type="string" name="qr_code_not_found_description" id="0x7f1212db" />
-    <public type="string" name="quality_indicator" id="0x7f1212dc" />
-    <public type="string" name="quick_dm_blocked" id="0x7f1212dd" />
-    <public type="string" name="quick_dm_user" id="0x7f1212de" />
-    <public type="string" name="quick_switcher" id="0x7f1212df" />
-    <public type="string" name="quickswitcher_drafts" id="0x7f1212e0" />
-    <public type="string" name="quickswitcher_empty_cta" id="0x7f1212e1" />
-    <public type="string" name="quickswitcher_empty_text" id="0x7f1212e2" />
-    <public type="string" name="quickswitcher_last_channel" id="0x7f1212e3" />
-    <public type="string" name="quickswitcher_mentions" id="0x7f1212e4" />
-    <public type="string" name="quickswitcher_notice" id="0x7f1212e5" />
-    <public type="string" name="quickswitcher_placeholder" id="0x7f1212e6" />
-    <public type="string" name="quickswitcher_protip" id="0x7f1212e7" />
-    <public type="string" name="quickswitcher_protip_guilds" id="0x7f1212e8" />
-    <public type="string" name="quickswitcher_protip_text_channels" id="0x7f1212e9" />
-    <public type="string" name="quickswitcher_protip_usernames" id="0x7f1212ea" />
-    <public type="string" name="quickswitcher_protip_voice_channels" id="0x7f1212eb" />
-    <public type="string" name="quickswitcher_querymode_applications" id="0x7f1212ec" />
-    <public type="string" name="quickswitcher_querymode_guilds" id="0x7f1212ed" />
-    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7f1212ee" />
-    <public type="string" name="quickswitcher_querymode_users" id="0x7f1212ef" />
-    <public type="string" name="quickswitcher_querymode_users_in_guild" id="0x7f1212f0" />
-    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7f1212f1" />
-    <public type="string" name="quickswitcher_tip_nav" id="0x7f1212f2" />
-    <public type="string" name="quickswitcher_tip_select" id="0x7f1212f3" />
-    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7f1212f4" />
-    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7f1212f5" />
-    <public type="string" name="quickswitcher_unread_channels" id="0x7f1212f6" />
-    <public type="string" name="quote" id="0x7f1212f7" />
-    <public type="string" name="quote_attribution" id="0x7f1212f8" />
-    <public type="string" name="quote_attribution_facebook" id="0x7f1212f9" />
-    <public type="string" name="quote_attribution_instagram" id="0x7f1212fa" />
-    <public type="string" name="rate_limited" id="0x7f1212fb" />
-    <public type="string" name="rating_request_body_android" id="0x7f1212fc" />
-    <public type="string" name="rating_request_title" id="0x7f1212fd" />
-    <public type="string" name="react_with_label" id="0x7f1212fe" />
-    <public type="string" name="reaction_tooltip_1" id="0x7f1212ff" />
-    <public type="string" name="reaction_tooltip_1_n" id="0x7f121300" />
-    <public type="string" name="reaction_tooltip_2" id="0x7f121301" />
-    <public type="string" name="reaction_tooltip_2_n" id="0x7f121302" />
-    <public type="string" name="reaction_tooltip_3" id="0x7f121303" />
-    <public type="string" name="reaction_tooltip_3_n" id="0x7f121304" />
-    <public type="string" name="reaction_tooltip_n" id="0x7f121305" />
-    <public type="string" name="reactions" id="0x7f121306" />
-    <public type="string" name="reactions_matching" id="0x7f121307" />
-    <public type="string" name="read_message_history" id="0x7f121308" />
-    <public type="string" name="read_messages" id="0x7f121309" />
-    <public type="string" name="read_messages_view_channels" id="0x7f12130a" />
-    <public type="string" name="read_only_channel" id="0x7f12130b" />
-    <public type="string" name="ready" id="0x7f12130c" />
-    <public type="string" name="recent_mentions" id="0x7f12130d" />
-    <public type="string" name="recent_mentions_direct_only" id="0x7f12130e" />
-    <public type="string" name="recent_mentions_empty_state_header" id="0x7f12130f" />
-    <public type="string" name="recent_mentions_empty_state_tip" id="0x7f121310" />
-    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7f121311" />
-    <public type="string" name="recent_mentions_filter_all_servers" id="0x7f121312" />
-    <public type="string" name="recent_mentions_filter_everyone" id="0x7f121313" />
-    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7f121314" />
-    <public type="string" name="recent_mentions_filter_label" id="0x7f121315" />
-    <public type="string" name="recent_mentions_filter_roles" id="0x7f121316" />
-    <public type="string" name="recent_mentions_pro_tip" id="0x7f121317" />
-    <public type="string" name="recent_mentions_roles_and_direct" id="0x7f121318" />
-    <public type="string" name="recents_notifications_menu_label" id="0x7f121319" />
-    <public type="string" name="reconnect" id="0x7f12131a" />
-    <public type="string" name="reconnecting" id="0x7f12131b" />
-    <public type="string" name="refund" id="0x7f12131c" />
-    <public type="string" name="region" id="0x7f12131d" />
-    <public type="string" name="region_select_footer" id="0x7f12131e" />
-    <public type="string" name="region_select_header" id="0x7f12131f" />
-    <public type="string" name="register" id="0x7f121320" />
-    <public type="string" name="register_body" id="0x7f121321" />
-    <public type="string" name="register_title" id="0x7f121322" />
-    <public type="string" name="remaining_participants" id="0x7f121323" />
-    <public type="string" name="remind_me_later" id="0x7f121324" />
-    <public type="string" name="remove" id="0x7f121325" />
-    <public type="string" name="remove_all_reactions" id="0x7f121326" />
-    <public type="string" name="remove_all_reactions_confirm_body" id="0x7f121327" />
-    <public type="string" name="remove_all_reactions_confirm_title" id="0x7f121328" />
-    <public type="string" name="remove_friend" id="0x7f121329" />
-    <public type="string" name="remove_friend_body" id="0x7f12132a" />
-    <public type="string" name="remove_friend_title" id="0x7f12132b" />
-    <public type="string" name="remove_from_group" id="0x7f12132c" />
-    <public type="string" name="remove_from_thread" id="0x7f12132d" />
-    <public type="string" name="remove_icon" id="0x7f12132e" />
-    <public type="string" name="remove_keybind" id="0x7f12132f" />
-    <public type="string" name="remove_reaction" id="0x7f121330" />
-    <public type="string" name="remove_role_or_user" id="0x7f121331" />
-    <public type="string" name="remove_synced_role" id="0x7f121332" />
-    <public type="string" name="remove_vanity_url" id="0x7f121333" />
-    <public type="string" name="render_embeds" id="0x7f121334" />
-    <public type="string" name="render_embeds_label" id="0x7f121335" />
-    <public type="string" name="render_reactions" id="0x7f121336" />
-    <public type="string" name="reply_quote_click_to_view" id="0x7f121337" />
-    <public type="string" name="replying_to" id="0x7f121338" />
-    <public type="string" name="report" id="0x7f121339" />
-    <public type="string" name="report_message" id="0x7f12133a" />
-    <public type="string" name="report_message_menu_option" id="0x7f12133b" />
-    <public type="string" name="report_modal_block_user" id="0x7f12133c" />
-    <public type="string" name="report_modal_description" id="0x7f12133d" />
-    <public type="string" name="report_modal_description_max_exceeded" id="0x7f12133e" />
-    <public type="string" name="report_modal_description_min_max" id="0x7f12133f" />
-    <public type="string" name="report_modal_error" id="0x7f121340" />
-    <public type="string" name="report_modal_message_selected" id="0x7f121341" />
-    <public type="string" name="report_modal_report_message" id="0x7f121342" />
-    <public type="string" name="report_modal_select_one" id="0x7f121343" />
-    <public type="string" name="report_modal_should_block" id="0x7f121344" />
-    <public type="string" name="report_modal_should_delete" id="0x7f121345" />
-    <public type="string" name="report_modal_subject" id="0x7f121346" />
-    <public type="string" name="report_modal_submit" id="0x7f121347" />
-    <public type="string" name="report_modal_submitted" id="0x7f121348" />
-    <public type="string" name="report_modal_submitted_email_confirmation" id="0x7f121349" />
-    <public type="string" name="report_modal_type_title" id="0x7f12134a" />
-    <public type="string" name="report_server" id="0x7f12134b" />
-    <public type="string" name="report_user" id="0x7f12134c" />
-    <public type="string" name="resend" id="0x7f12134d" />
-    <public type="string" name="resend_code" id="0x7f12134e" />
-    <public type="string" name="resend_email" id="0x7f12134f" />
-    <public type="string" name="resend_message" id="0x7f121350" />
-    <public type="string" name="resend_verification_email" id="0x7f121351" />
-    <public type="string" name="reset" id="0x7f121352" />
-    <public type="string" name="reset_nickname" id="0x7f121353" />
-    <public type="string" name="reset_notification_override" id="0x7f121354" />
-    <public type="string" name="reset_notification_settings" id="0x7f121355" />
-    <public type="string" name="reset_password_title" id="0x7f121356" />
-    <public type="string" name="reset_to_default" id="0x7f121357" />
-    <public type="string" name="reset_voice_settings" id="0x7f121358" />
-    <public type="string" name="reset_voice_settings_body" id="0x7f121359" />
-    <public type="string" name="resubscribe" id="0x7f12135a" />
-    <public type="string" name="retry" id="0x7f12135b" />
-    <public type="string" name="return_to_login" id="0x7f12135c" />
-    <public type="string" name="reversed" id="0x7f12135d" />
-    <public type="string" name="revoke" id="0x7f12135e" />
-    <public type="string" name="revoke_ban" id="0x7f12135f" />
-    <public type="string" name="ring" id="0x7f121360" />
-    <public type="string" name="ro" id="0x7f121361" />
-    <public type="string" name="role_color" id="0x7f121362" />
-    <public type="string" name="role_id_copied" id="0x7f121363" />
-    <public type="string" name="role_order_updated" id="0x7f121364" />
-    <public type="string" name="role_required_edit_roles_modal_subtitle" id="0x7f121365" />
-    <public type="string" name="role_required_edit_roles_modal_title" id="0x7f121366" />
-    <public type="string" name="role_required_single_user_message" id="0x7f121367" />
-    <public type="string" name="roles" id="0x7f121368" />
-    <public type="string" name="roles_list" id="0x7f121369" />
-    <public type="string" name="rtc_connection" id="0x7f12136a" />
-    <public type="string" name="rtc_connection_state_authenticating" id="0x7f12136b" />
-    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7f12136c" />
-    <public type="string" name="rtc_connection_state_connecting" id="0x7f12136d" />
-    <public type="string" name="rtc_connection_state_disconnected" id="0x7f12136e" />
-    <public type="string" name="rtc_connection_state_ice_checking" id="0x7f12136f" />
-    <public type="string" name="rtc_connection_state_no_route" id="0x7f121370" />
-    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7f121371" />
-    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7f121372" />
-    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7f121373" />
-    <public type="string" name="rtc_debug_context" id="0x7f121374" />
-    <public type="string" name="rtc_debug_open" id="0x7f121375" />
-    <public type="string" name="rtc_debug_rtp_inbound" id="0x7f121376" />
-    <public type="string" name="rtc_debug_rtp_outbound" id="0x7f121377" />
-    <public type="string" name="rtc_debug_screenshare" id="0x7f121378" />
-    <public type="string" name="rtc_debug_transport" id="0x7f121379" />
-    <public type="string" name="ru" id="0x7f12137a" />
-    <public type="string" name="salmon" id="0x7f12137b" />
-    <public type="string" name="sample_channel_message" id="0x7f12137c" />
-    <public type="string" name="sample_channel_name" id="0x7f12137d" />
-    <public type="string" name="sample_channel_name_short" id="0x7f12137e" />
-    <public type="string" name="sample_channel_search_filter" id="0x7f12137f" />
-    <public type="string" name="sample_confirmation" id="0x7f121380" />
-    <public type="string" name="sample_connected_account" id="0x7f121381" />
-    <public type="string" name="sample_discrim" id="0x7f121382" />
-    <public type="string" name="sample_email" id="0x7f121383" />
-    <public type="string" name="sample_empty_string" id="0x7f121384" />
-    <public type="string" name="sample_language" id="0x7f121385" />
-    <public type="string" name="sample_notification_frequency" id="0x7f121386" />
-    <public type="string" name="sample_number_9" id="0x7f121387" />
-    <public type="string" name="sample_number_99" id="0x7f121388" />
-    <public type="string" name="sample_number_999" id="0x7f121389" />
-    <public type="string" name="sample_number_9999" id="0x7f12138a" />
-    <public type="string" name="sample_number_bandwidth" id="0x7f12138b" />
-    <public type="string" name="sample_number_ratio" id="0x7f12138c" />
-    <public type="string" name="sample_online_members" id="0x7f12138d" />
-    <public type="string" name="sample_server_name" id="0x7f12138e" />
-    <public type="string" name="sample_server_name_short" id="0x7f12138f" />
-    <public type="string" name="sample_server_role_name" id="0x7f121390" />
-    <public type="string" name="sample_time_duration_minutes" id="0x7f121391" />
-    <public type="string" name="sample_time_duration_seconds" id="0x7f121392" />
-    <public type="string" name="sample_time_pm" id="0x7f121393" />
-    <public type="string" name="sample_time_stamp" id="0x7f121394" />
-    <public type="string" name="sample_total_members" id="0x7f121395" />
-    <public type="string" name="sample_user_generated_link" id="0x7f121396" />
-    <public type="string" name="sample_user_name" id="0x7f121397" />
-    <public type="string" name="sample_user_name_discrim" id="0x7f121398" />
-    <public type="string" name="sample_user_nick" id="0x7f121399" />
-    <public type="string" name="sample_user_presence" id="0x7f12139a" />
-    <public type="string" name="sample_user_presence_details" id="0x7f12139b" />
-    <public type="string" name="save" id="0x7f12139c" />
-    <public type="string" name="save_changes" id="0x7f12139d" />
-    <public type="string" name="save_image" id="0x7f12139e" />
-    <public type="string" name="save_image_preview" id="0x7f12139f" />
-    <public type="string" name="save_media_failure_help_mobile" id="0x7f1213a0" />
-    <public type="string" name="save_media_failure_mobile" id="0x7f1213a1" />
-    <public type="string" name="save_media_success_mobile" id="0x7f1213a2" />
-    <public type="string" name="saved_settings" id="0x7f1213a3" />
-    <public type="string" name="scope_activities_read" id="0x7f1213a4" />
-    <public type="string" name="scope_activities_read_description" id="0x7f1213a5" />
-    <public type="string" name="scope_activities_write" id="0x7f1213a6" />
-    <public type="string" name="scope_activities_write_description" id="0x7f1213a7" />
-    <public type="string" name="scope_applications_builds_read" id="0x7f1213a8" />
-    <public type="string" name="scope_applications_builds_read_description" id="0x7f1213a9" />
-    <public type="string" name="scope_applications_builds_upload" id="0x7f1213aa" />
-    <public type="string" name="scope_applications_builds_upload_description" id="0x7f1213ab" />
-    <public type="string" name="scope_applications_entitlements" id="0x7f1213ac" />
-    <public type="string" name="scope_applications_entitlements_description" id="0x7f1213ad" />
-    <public type="string" name="scope_applications_store_update" id="0x7f1213ae" />
-    <public type="string" name="scope_applications_store_update_description" id="0x7f1213af" />
-    <public type="string" name="scope_bot" id="0x7f1213b0" />
-    <public type="string" name="scope_bot_description" id="0x7f1213b1" />
-    <public type="string" name="scope_bot_permissions" id="0x7f1213b2" />
-    <public type="string" name="scope_bot_permissions_description" id="0x7f1213b3" />
-    <public type="string" name="scope_bot_server_placeholder" id="0x7f1213b4" />
-    <public type="string" name="scope_connections" id="0x7f1213b5" />
-    <public type="string" name="scope_connections_empty" id="0x7f1213b6" />
-    <public type="string" name="scope_email" id="0x7f1213b7" />
-    <public type="string" name="scope_email_empty" id="0x7f1213b8" />
-    <public type="string" name="scope_gdm_join" id="0x7f1213b9" />
-    <public type="string" name="scope_gdm_join_description" id="0x7f1213ba" />
-    <public type="string" name="scope_guilds" id="0x7f1213bb" />
-    <public type="string" name="scope_guilds_empty" id="0x7f1213bc" />
-    <public type="string" name="scope_guilds_join" id="0x7f1213bd" />
-    <public type="string" name="scope_guilds_join_description" id="0x7f1213be" />
-    <public type="string" name="scope_identify" id="0x7f1213bf" />
-    <public type="string" name="scope_messages_read" id="0x7f1213c0" />
-    <public type="string" name="scope_messages_read_description" id="0x7f1213c1" />
-    <public type="string" name="scope_relationships_read" id="0x7f1213c2" />
-    <public type="string" name="scope_relationships_read_description" id="0x7f1213c3" />
-    <public type="string" name="scope_rpc" id="0x7f1213c4" />
-    <public type="string" name="scope_rpc_description" id="0x7f1213c5" />
-    <public type="string" name="scope_rpc_notifications_read" id="0x7f1213c6" />
-    <public type="string" name="scope_rpc_notifications_read_description" id="0x7f1213c7" />
-    <public type="string" name="scope_unsupported_on_android" id="0x7f1213c8" />
-    <public type="string" name="scope_unsupported_on_android_description" id="0x7f1213c9" />
-    <public type="string" name="scope_webhook_incoming" id="0x7f1213ca" />
-    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7f1213cb" />
-    <public type="string" name="scope_webhook_incoming_description" id="0x7f1213cc" />
-    <public type="string" name="screen_share_on" id="0x7f1213cd" />
-    <public type="string" name="screen_share_options" id="0x7f1213ce" />
-    <public type="string" name="screenshare_change_windows" id="0x7f1213cf" />
-    <public type="string" name="screenshare_description" id="0x7f1213d0" />
-    <public type="string" name="screenshare_frame_rate" id="0x7f1213d1" />
-    <public type="string" name="screenshare_relaunch" id="0x7f1213d2" />
-    <public type="string" name="screenshare_relaunch_body" id="0x7f1213d3" />
-    <public type="string" name="screenshare_screen" id="0x7f1213d4" />
-    <public type="string" name="screenshare_share_screen_or_window" id="0x7f1213d5" />
-    <public type="string" name="screenshare_sound_toggle_label" id="0x7f1213d6" />
-    <public type="string" name="screenshare_source" id="0x7f1213d7" />
-    <public type="string" name="screenshare_stop" id="0x7f1213d8" />
-    <public type="string" name="screenshare_stream_game" id="0x7f1213d9" />
-    <public type="string" name="screenshare_stream_quality" id="0x7f1213da" />
-    <public type="string" name="screenshare_unavailable" id="0x7f1213db" />
-    <public type="string" name="screenshare_unavailable_download_app" id="0x7f1213dc" />
-    <public type="string" name="screenshare_window" id="0x7f1213dd" />
-    <public type="string" name="search" id="0x7f1213de" />
-    <public type="string" name="search_actions" id="0x7f1213df" />
-    <public type="string" name="search_answer_date" id="0x7f1213e0" />
-    <public type="string" name="search_answer_file_name" id="0x7f1213e1" />
-    <public type="string" name="search_answer_file_type" id="0x7f1213e2" />
-    <public type="string" name="search_answer_from" id="0x7f1213e3" />
-    <public type="string" name="search_answer_has" id="0x7f1213e4" />
-    <public type="string" name="search_answer_has_attachment" id="0x7f1213e5" />
-    <public type="string" name="search_answer_has_embed" id="0x7f1213e6" />
-    <public type="string" name="search_answer_has_image" id="0x7f1213e7" />
-    <public type="string" name="search_answer_has_link" id="0x7f1213e8" />
-    <public type="string" name="search_answer_has_sound" id="0x7f1213e9" />
-    <public type="string" name="search_answer_has_video" id="0x7f1213ea" />
-    <public type="string" name="search_answer_in" id="0x7f1213eb" />
-    <public type="string" name="search_answer_link_from" id="0x7f1213ec" />
-    <public type="string" name="search_answer_mentions" id="0x7f1213ed" />
-    <public type="string" name="search_channels" id="0x7f1213ee" />
-    <public type="string" name="search_channels_no_result" id="0x7f1213ef" />
-    <public type="string" name="search_clear" id="0x7f1213f0" />
-    <public type="string" name="search_clear_history" id="0x7f1213f1" />
-    <public type="string" name="search_country" id="0x7f1213f2" />
-    <public type="string" name="search_date_picker_hint" id="0x7f1213f3" />
-    <public type="string" name="search_dm_still_indexing" id="0x7f1213f4" />
-    <public type="string" name="search_dm_with" id="0x7f1213f5" />
-    <public type="string" name="search_emojis" id="0x7f1213f6" />
-    <public type="string" name="search_error" id="0x7f1213f7" />
-    <public type="string" name="search_filter_after" id="0x7f1213f8" />
-    <public type="string" name="search_filter_before" id="0x7f1213f9" />
-    <public type="string" name="search_filter_during" id="0x7f1213fa" />
-    <public type="string" name="search_filter_file_name" id="0x7f1213fb" />
-    <public type="string" name="search_filter_file_type" id="0x7f1213fc" />
-    <public type="string" name="search_filter_from" id="0x7f1213fd" />
-    <public type="string" name="search_filter_has" id="0x7f1213fe" />
-    <public type="string" name="search_filter_in" id="0x7f1213ff" />
-    <public type="string" name="search_filter_link_from" id="0x7f121400" />
-    <public type="string" name="search_filter_mentions" id="0x7f121401" />
-    <public type="string" name="search_filter_on" id="0x7f121402" />
-    <public type="string" name="search_for_emoji" id="0x7f121403" />
-    <public type="string" name="search_for_value" id="0x7f121404" />
-    <public type="string" name="search_from_suggestions" id="0x7f121405" />
-    <public type="string" name="search_gifs" id="0x7f121406" />
-    <public type="string" name="search_group_header_channels" id="0x7f121407" />
-    <public type="string" name="search_group_header_dates" id="0x7f121408" />
-    <public type="string" name="search_group_header_file_type" id="0x7f121409" />
-    <public type="string" name="search_group_header_from" id="0x7f12140a" />
-    <public type="string" name="search_group_header_has" id="0x7f12140b" />
-    <public type="string" name="search_group_header_history" id="0x7f12140c" />
-    <public type="string" name="search_group_header_link_from" id="0x7f12140d" />
-    <public type="string" name="search_group_header_mentions" id="0x7f12140e" />
-    <public type="string" name="search_group_header_search_options" id="0x7f12140f" />
-    <public type="string" name="search_guild_still_indexing" id="0x7f121410" />
-    <public type="string" name="search_hide_blocked_messages" id="0x7f121411" />
-    <public type="string" name="search_in" id="0x7f121412" />
-    <public type="string" name="search_members" id="0x7f121413" />
-    <public type="string" name="search_members_no_result" id="0x7f121414" />
-    <public type="string" name="search_menu_title" id="0x7f121415" />
-    <public type="string" name="search_most_relevant" id="0x7f121416" />
-    <public type="string" name="search_newest" id="0x7f121417" />
-    <public type="string" name="search_no_results" id="0x7f121418" />
-    <public type="string" name="search_no_results_alt" id="0x7f121419" />
-    <public type="string" name="search_num_results_blocked_not_shown" id="0x7f12141a" />
-    <public type="string" name="search_oldest" id="0x7f12141b" />
-    <public type="string" name="search_pagination_a11y_label" id="0x7f12141c" />
-    <public type="string" name="search_pick_date" id="0x7f12141d" />
-    <public type="string" name="search_results_section_label" id="0x7f12141e" />
-    <public type="string" name="search_roles" id="0x7f12141f" />
-    <public type="string" name="search_roles_no_result" id="0x7f121420" />
-    <public type="string" name="search_shortcut_month" id="0x7f121421" />
-    <public type="string" name="search_shortcut_today" id="0x7f121422" />
-    <public type="string" name="search_shortcut_week" id="0x7f121423" />
-    <public type="string" name="search_shortcut_year" id="0x7f121424" />
-    <public type="string" name="search_shortcut_yesterday" id="0x7f121425" />
-    <public type="string" name="search_still_indexing_hint" id="0x7f121426" />
-    <public type="string" name="search_tenor" id="0x7f121427" />
-    <public type="string" name="search_with_google" id="0x7f121428" />
-    <public type="string" name="searching" id="0x7f121429" />
-    <public type="string" name="security" id="0x7f12142a" />
-    <public type="string" name="select" id="0x7f12142b" />
-    <public type="string" name="select_channel_or_category" id="0x7f12142c" />
-    <public type="string" name="select_emoji" id="0x7f12142d" />
-    <public type="string" name="select_picture" id="0x7f12142e" />
-    <public type="string" name="select_sort_mode" id="0x7f12142f" />
-    <public type="string" name="selection_shrink_scale" id="0x7f121430" />
-    <public type="string" name="self_deny_permission_body" id="0x7f121431" />
-    <public type="string" name="self_deny_permission_title" id="0x7f121432" />
-    <public type="string" name="self_username_indicator" id="0x7f121433" />
-    <public type="string" name="self_username_indicator_hook" id="0x7f121434" />
-    <public type="string" name="self_xss_header" id="0x7f121435" />
-    <public type="string" name="self_xss_line_1" id="0x7f121436" />
-    <public type="string" name="self_xss_line_2" id="0x7f121437" />
-    <public type="string" name="self_xss_line_3" id="0x7f121438" />
-    <public type="string" name="self_xss_line_4" id="0x7f121439" />
-    <public type="string" name="send" id="0x7f12143a" />
-    <public type="string" name="send_a_message" id="0x7f12143b" />
-    <public type="string" name="send_dm" id="0x7f12143c" />
-    <public type="string" name="send_images_label" id="0x7f12143d" />
-    <public type="string" name="send_message" id="0x7f12143e" />
-    <public type="string" name="send_message_failure" id="0x7f12143f" />
-    <public type="string" name="send_messages" id="0x7f121440" />
-    <public type="string" name="send_messages_description" id="0x7f121441" />
-    <public type="string" name="send_tts_messages" id="0x7f121442" />
-    <public type="string" name="send_tts_messages_description" id="0x7f121443" />
-    <public type="string" name="server_deafen" id="0x7f121444" />
-    <public type="string" name="server_deafened" id="0x7f121445" />
-    <public type="string" name="server_deafened_dialog_body" id="0x7f121446" />
-    <public type="string" name="server_deafened_dialog_title" id="0x7f121447" />
-    <public type="string" name="server_desciption_empty" id="0x7f121448" />
-    <public type="string" name="server_emoji" id="0x7f121449" />
-    <public type="string" name="server_folder_mark_as_read" id="0x7f12144a" />
-    <public type="string" name="server_folder_placeholder" id="0x7f12144b" />
-    <public type="string" name="server_folder_settings" id="0x7f12144c" />
-    <public type="string" name="server_insights" id="0x7f12144d" />
-    <public type="string" name="server_mute" id="0x7f12144e" />
-    <public type="string" name="server_muted" id="0x7f12144f" />
-    <public type="string" name="server_muted_dialog_body" id="0x7f121450" />
-    <public type="string" name="server_muted_dialog_title" id="0x7f121451" />
-    <public type="string" name="server_name_required" id="0x7f121452" />
-    <public type="string" name="server_options" id="0x7f121453" />
-    <public type="string" name="server_overview" id="0x7f121454" />
-    <public type="string" name="server_quest" id="0x7f121455" />
-    <public type="string" name="server_region_unavailable" id="0x7f121456" />
-    <public type="string" name="server_settings" id="0x7f121457" />
-    <public type="string" name="server_settings_updated" id="0x7f121458" />
-    <public type="string" name="server_status" id="0x7f121459" />
-    <public type="string" name="server_undeafen" id="0x7f12145a" />
-    <public type="string" name="server_unmute" id="0x7f12145b" />
-    <public type="string" name="server_voice_mute" id="0x7f12145c" />
-    <public type="string" name="server_voice_unmute" id="0x7f12145d" />
-    <public type="string" name="servers" id="0x7f12145e" />
-    <public type="string" name="service_connections_disconnect" id="0x7f12145f" />
-    <public type="string" name="set_debug_logging" id="0x7f121460" />
-    <public type="string" name="set_debug_logging_body" id="0x7f121461" />
-    <public type="string" name="set_invite_link_never_expire" id="0x7f121462" />
-    <public type="string" name="set_status" id="0x7f121463" />
-    <public type="string" name="set_up_description" id="0x7f121464" />
-    <public type="string" name="set_up_your_server" id="0x7f121465" />
-    <public type="string" name="settings" id="0x7f121466" />
-    <public type="string" name="settings_advanced" id="0x7f121467" />
-    <public type="string" name="settings_games_add_game" id="0x7f121468" />
-    <public type="string" name="settings_games_add_new_game" id="0x7f121469" />
-    <public type="string" name="settings_games_added_games_label" id="0x7f12146a" />
-    <public type="string" name="settings_games_enable_overlay_label" id="0x7f12146b" />
-    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7f12146c" />
-    <public type="string" name="settings_games_last_played" id="0x7f12146d" />
-    <public type="string" name="settings_games_no_game_detected" id="0x7f12146e" />
-    <public type="string" name="settings_games_no_games_header" id="0x7f12146f" />
-    <public type="string" name="settings_games_not_playing" id="0x7f121470" />
-    <public type="string" name="settings_games_not_seeing_game" id="0x7f121471" />
-    <public type="string" name="settings_games_now_playing_state" id="0x7f121472" />
-    <public type="string" name="settings_games_overlay" id="0x7f121473" />
-    <public type="string" name="settings_games_overlay_off" id="0x7f121474" />
-    <public type="string" name="settings_games_overlay_on" id="0x7f121475" />
-    <public type="string" name="settings_games_overlay_warning" id="0x7f121476" />
-    <public type="string" name="settings_games_toggle_overlay" id="0x7f121477" />
-    <public type="string" name="settings_games_verified_icon" id="0x7f121478" />
-    <public type="string" name="settings_invite_tip" id="0x7f121479" />
-    <public type="string" name="settings_invite_tip_without_create" id="0x7f12147a" />
-    <public type="string" name="settings_notice_message" id="0x7f12147b" />
-    <public type="string" name="settings_permissions_delete_body" id="0x7f12147c" />
-    <public type="string" name="settings_permissions_delete_title" id="0x7f12147d" />
-    <public type="string" name="settings_roles_delete_body" id="0x7f12147e" />
-    <public type="string" name="settings_roles_delete_title" id="0x7f12147f" />
-    <public type="string" name="settings_sync" id="0x7f121480" />
-    <public type="string" name="settings_webhooks_empty_body" id="0x7f121481" />
-    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7f121482" />
-    <public type="string" name="settings_webhooks_empty_title" id="0x7f121483" />
-    <public type="string" name="settings_webhooks_intro" id="0x7f121484" />
-    <public type="string" name="setup_vanity_url" id="0x7f121485" />
-    <public type="string" name="several_users_typing" id="0x7f121486" />
-    <public type="string" name="share" id="0x7f121487" />
-    <public type="string" name="share_invite_link_for_access" id="0x7f121488" />
-    <public type="string" name="share_invite_mobile" id="0x7f121489" />
-    <public type="string" name="share_link" id="0x7f12148a" />
-    <public type="string" name="share_settings_title" id="0x7f12148b" />
-    <public type="string" name="share_to" id="0x7f12148c" />
-    <public type="string" name="share_your_screen" id="0x7f12148d" />
-    <public type="string" name="sharing_screen" id="0x7f12148e" />
-    <public type="string" name="shortcut_recorder_button" id="0x7f12148f" />
-    <public type="string" name="shortcut_recorder_button_edit" id="0x7f121490" />
-    <public type="string" name="shortcut_recorder_button_recording" id="0x7f121491" />
-    <public type="string" name="shortcut_recorder_no_bind" id="0x7f121492" />
-    <public type="string" name="show_chat" id="0x7f121493" />
-    <public type="string" name="show_current_game" id="0x7f121494" />
-    <public type="string" name="show_current_game_desc" id="0x7f121495" />
-    <public type="string" name="show_folder" id="0x7f121496" />
-    <public type="string" name="show_keyboard" id="0x7f121497" />
-    <public type="string" name="show_muted" id="0x7f121498" />
-    <public type="string" name="show_muted_channels" id="0x7f121499" />
-    <public type="string" name="show_spoiler_always" id="0x7f12149a" />
-    <public type="string" name="show_spoiler_content" id="0x7f12149b" />
-    <public type="string" name="show_spoiler_content_help" id="0x7f12149c" />
-    <public type="string" name="show_spoiler_on_click" id="0x7f12149d" />
-    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7f12149e" />
-    <public type="string" name="skip" id="0x7f12149f" />
-    <public type="string" name="skip_all_tips" id="0x7f1214a0" />
-    <public type="string" name="skip_to_content" id="0x7f1214a1" />
-    <public type="string" name="sky_blue" id="0x7f1214a2" />
-    <public type="string" name="sort" id="0x7f1214a3" />
-    <public type="string" name="sorting" id="0x7f1214a4" />
-    <public type="string" name="sorting_channels" id="0x7f1214a5" />
-    <public type="string" name="sound_deafen" id="0x7f1214a6" />
-    <public type="string" name="sound_incoming_ring" id="0x7f1214a7" />
-    <public type="string" name="sound_message" id="0x7f1214a8" />
-    <public type="string" name="sound_mute" id="0x7f1214a9" />
-    <public type="string" name="sound_outgoing_ring" id="0x7f1214aa" />
-    <public type="string" name="sound_ptt_activate" id="0x7f1214ab" />
-    <public type="string" name="sound_ptt_deactivate" id="0x7f1214ac" />
-    <public type="string" name="sound_stream_started" id="0x7f1214ad" />
-    <public type="string" name="sound_stream_stopped" id="0x7f1214ae" />
-    <public type="string" name="sound_undeafen" id="0x7f1214af" />
-    <public type="string" name="sound_unmute" id="0x7f1214b0" />
-    <public type="string" name="sound_user_join" id="0x7f1214b1" />
-    <public type="string" name="sound_user_leave" id="0x7f1214b2" />
-    <public type="string" name="sound_user_moved" id="0x7f1214b3" />
-    <public type="string" name="sound_viewer_join" id="0x7f1214b4" />
-    <public type="string" name="sound_viewer_leave" id="0x7f1214b5" />
-    <public type="string" name="sound_voice_disconnected" id="0x7f1214b6" />
-    <public type="string" name="sounds" id="0x7f1214b7" />
-    <public type="string" name="source_message_deleted" id="0x7f1214b8" />
-    <public type="string" name="speak" id="0x7f1214b9" />
-    <public type="string" name="speak_message" id="0x7f1214ba" />
-    <public type="string" name="spectators" id="0x7f1214bb" />
-    <public type="string" name="spellcheck" id="0x7f1214bc" />
-    <public type="string" name="spoiler" id="0x7f1214bd" />
-    <public type="string" name="spoiler_mark_selected" id="0x7f1214be" />
-    <public type="string" name="spoiler_reveal" id="0x7f1214bf" />
-    <public type="string" name="spotify_connection_info_android" id="0x7f1214c0" />
-    <public type="string" name="spotify_listen_along_host" id="0x7f1214c1" />
-    <public type="string" name="spotify_listen_along_info" id="0x7f1214c2" />
-    <public type="string" name="spotify_listen_along_listener" id="0x7f1214c3" />
-    <public type="string" name="spotify_listen_along_listeners" id="0x7f1214c4" />
-    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7f1214c5" />
-    <public type="string" name="spotify_listen_along_stop" id="0x7f1214c6" />
-    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7f1214c7" />
-    <public type="string" name="spotify_listen_along_title_host" id="0x7f1214c8" />
-    <public type="string" name="spotify_listen_along_title_listener" id="0x7f1214c9" />
-    <public type="string" name="spotify_premium_upgrade_body" id="0x7f1214ca" />
-    <public type="string" name="spotify_premium_upgrade_button" id="0x7f1214cb" />
-    <public type="string" name="spotify_premium_upgrade_header" id="0x7f1214cc" />
-    <public type="string" name="staff_badge_tooltip" id="0x7f1214cd" />
-    <public type="string" name="start" id="0x7f1214ce" />
-    <public type="string" name="start_a_thread" id="0x7f1214cf" />
-    <public type="string" name="start_call" id="0x7f1214d0" />
-    <public type="string" name="start_thread" id="0x7f1214d1" />
-    <public type="string" name="start_thread_modal_reply" id="0x7f1214d2" />
-    <public type="string" name="start_thread_modal_subtext" id="0x7f1214d3" />
-    <public type="string" name="start_video_call" id="0x7f1214d4" />
-    <public type="string" name="start_voice_call" id="0x7f1214d5" />
-    <public type="string" name="starting_at" id="0x7f1214d6" />
-    <public type="string" name="status_bar_notification_info_overflow" id="0x7f1214d7" />
-    <public type="string" name="status_dnd" id="0x7f1214d8" />
-    <public type="string" name="status_dnd_help" id="0x7f1214d9" />
-    <public type="string" name="status_idle" id="0x7f1214da" />
-    <public type="string" name="status_invisible" id="0x7f1214db" />
-    <public type="string" name="status_invisible_helper" id="0x7f1214dc" />
-    <public type="string" name="status_offline" id="0x7f1214dd" />
-    <public type="string" name="status_online" id="0x7f1214de" />
-    <public type="string" name="status_online_mobile" id="0x7f1214df" />
-    <public type="string" name="status_streaming" id="0x7f1214e0" />
-    <public type="string" name="status_unknown" id="0x7f1214e1" />
-    <public type="string" name="step_number" id="0x7f1214e2" />
-    <public type="string" name="still_indexing" id="0x7f1214e3" />
-    <public type="string" name="stop" id="0x7f1214e4" />
-    <public type="string" name="stop_ringing" id="0x7f1214e5" />
-    <public type="string" name="stop_ringing_username" id="0x7f1214e6" />
-    <public type="string" name="stop_speaking_message" id="0x7f1214e7" />
-    <public type="string" name="stop_streaming" id="0x7f1214e8" />
-    <public type="string" name="stop_watching" id="0x7f1214e9" />
-    <public type="string" name="stop_watching_user" id="0x7f1214ea" />
-    <public type="string" name="storage_permission_denied" id="0x7f1214eb" />
-    <public type="string" name="store_channel" id="0x7f1214ec" />
-    <public type="string" name="stream_actions_menu_label" id="0x7f1214ed" />
-    <public type="string" name="stream_bad_spectator" id="0x7f1214ee" />
-    <public type="string" name="stream_bad_streamer" id="0x7f1214ef" />
-    <public type="string" name="stream_capture_paused" id="0x7f1214f0" />
-    <public type="string" name="stream_capture_paused_details" id="0x7f1214f1" />
-    <public type="string" name="stream_capture_paused_details_viewer" id="0x7f1214f2" />
-    <public type="string" name="stream_channel_description" id="0x7f1214f3" />
-    <public type="string" name="stream_description" id="0x7f1214f4" />
-    <public type="string" name="stream_ended" id="0x7f1214f5" />
-    <public type="string" name="stream_failed_description" id="0x7f1214f6" />
-    <public type="string" name="stream_failed_title" id="0x7f1214f7" />
-    <public type="string" name="stream_fps_option" id="0x7f1214f8" />
-    <public type="string" name="stream_full_modal_body" id="0x7f1214f9" />
-    <public type="string" name="stream_full_modal_header" id="0x7f1214fa" />
-    <public type="string" name="stream_issue_modal_header" id="0x7f1214fb" />
-    <public type="string" name="stream_network_quality_error" id="0x7f1214fc" />
-    <public type="string" name="stream_no_preview" id="0x7f1214fd" />
-    <public type="string" name="stream_participants_hidden" id="0x7f1214fe" />
-    <public type="string" name="stream_playing" id="0x7f1214ff" />
-    <public type="string" name="stream_premium_upsell_body" id="0x7f121500" />
-    <public type="string" name="stream_premium_upsell_body_no_cta" id="0x7f121501" />
-    <public type="string" name="stream_premium_upsell_cta" id="0x7f121502" />
-    <public type="string" name="stream_premium_upsell_header" id="0x7f121503" />
-    <public type="string" name="stream_preview_loading" id="0x7f121504" />
-    <public type="string" name="stream_preview_paused" id="0x7f121505" />
-    <public type="string" name="stream_preview_paused_subtext" id="0x7f121506" />
-    <public type="string" name="stream_quality_unlock" id="0x7f121507" />
-    <public type="string" name="stream_reconnecting_error" id="0x7f121508" />
-    <public type="string" name="stream_reconnecting_error_subtext" id="0x7f121509" />
-    <public type="string" name="stream_report_a_problem" id="0x7f12150a" />
-    <public type="string" name="stream_report_a_problem_post_stream" id="0x7f12150b" />
-    <public type="string" name="stream_report_audio_missing" id="0x7f12150c" />
-    <public type="string" name="stream_report_audio_poor" id="0x7f12150d" />
-    <public type="string" name="stream_report_black" id="0x7f12150e" />
-    <public type="string" name="stream_report_blurry" id="0x7f12150f" />
-    <public type="string" name="stream_report_ended_audio_missing" id="0x7f121510" />
-    <public type="string" name="stream_report_ended_audio_poor" id="0x7f121511" />
-    <public type="string" name="stream_report_ended_black" id="0x7f121512" />
-    <public type="string" name="stream_report_ended_blurry" id="0x7f121513" />
-    <public type="string" name="stream_report_ended_lagging" id="0x7f121514" />
-    <public type="string" name="stream_report_ended_out_of_sync" id="0x7f121515" />
-    <public type="string" name="stream_report_game_issue" id="0x7f121516" />
-    <public type="string" name="stream_report_label" id="0x7f121517" />
-    <public type="string" name="stream_report_lagging" id="0x7f121518" />
-    <public type="string" name="stream_report_no_issue" id="0x7f121519" />
-    <public type="string" name="stream_report_out_of_sync" id="0x7f12151a" />
-    <public type="string" name="stream_report_placeholder" id="0x7f12151b" />
-    <public type="string" name="stream_report_problem" id="0x7f12151c" />
-    <public type="string" name="stream_report_problem_body" id="0x7f12151d" />
-    <public type="string" name="stream_report_problem_header_mobile" id="0x7f12151e" />
-    <public type="string" name="stream_report_problem_menu_item" id="0x7f12151f" />
-    <public type="string" name="stream_report_problem_mobile" id="0x7f121520" />
-    <public type="string" name="stream_report_rating_body" id="0x7f121521" />
-    <public type="string" name="stream_report_rating_body_streamer" id="0x7f121522" />
-    <public type="string" name="stream_report_submit" id="0x7f121523" />
-    <public type="string" name="stream_reported" id="0x7f121524" />
-    <public type="string" name="stream_reported_body" id="0x7f121525" />
-    <public type="string" name="stream_resolution" id="0x7f121526" />
-    <public type="string" name="stream_show_all_participants" id="0x7f121527" />
-    <public type="string" name="stream_show_non_video" id="0x7f121528" />
-    <public type="string" name="stream_single_person_body" id="0x7f121529" />
-    <public type="string" name="stream_single_person_body_alt" id="0x7f12152a" />
-    <public type="string" name="stream_soundshare_failed" id="0x7f12152b" />
-    <public type="string" name="stream_volume" id="0x7f12152c" />
-    <public type="string" name="stream_watch_multiple_tooltip" id="0x7f12152d" />
-    <public type="string" name="streamer_mode" id="0x7f12152e" />
-    <public type="string" name="streamer_mode_enabled" id="0x7f12152f" />
-    <public type="string" name="streamer_playing" id="0x7f121530" />
-    <public type="string" name="streamer_settings_title" id="0x7f121531" />
-    <public type="string" name="streaming" id="0x7f121532" />
-    <public type="string" name="streaming_a_game" id="0x7f121533" />
-    <public type="string" name="sub_enabled_servers" id="0x7f121534" />
-    <public type="string" name="subscriber_information" id="0x7f121535" />
-    <public type="string" name="subscription_payment_legalese_monthly" id="0x7f121536" />
-    <public type="string" name="subscription_payment_legalese_yearly" id="0x7f121537" />
-    <public type="string" name="subscriptions_title" id="0x7f121538" />
-    <public type="string" name="suggestions" id="0x7f121539" />
-    <public type="string" name="summary_collapsed_preference_list" id="0x7f12153a" />
-    <public type="string" name="support" id="0x7f12153b" />
-    <public type="string" name="suppress_all_embeds" id="0x7f12153c" />
-    <public type="string" name="suppress_embed_body" id="0x7f12153d" />
-    <public type="string" name="suppress_embed_confirm" id="0x7f12153e" />
-    <public type="string" name="suppress_embed_tip" id="0x7f12153f" />
-    <public type="string" name="suppress_embed_title" id="0x7f121540" />
-    <public type="string" name="suppressed" id="0x7f121541" />
-    <public type="string" name="suppressed_afk_body" id="0x7f121542" />
-    <public type="string" name="suppressed_afk_title" id="0x7f121543" />
-    <public type="string" name="suppressed_permission_body" id="0x7f121544" />
-    <public type="string" name="sv_se" id="0x7f121545" />
-    <public type="string" name="switch_audio_output" id="0x7f121546" />
-    <public type="string" name="switch_hardware_acceleration" id="0x7f121547" />
-    <public type="string" name="switch_hardware_acceleration_body" id="0x7f121548" />
-    <public type="string" name="switch_subsystem" id="0x7f121549" />
-    <public type="string" name="switch_subsystem_body" id="0x7f12154a" />
-    <public type="string" name="switch_to_compact_mode" id="0x7f12154b" />
-    <public type="string" name="switch_to_cozy_mode" id="0x7f12154c" />
-    <public type="string" name="switch_to_dark_theme" id="0x7f12154d" />
-    <public type="string" name="switch_to_light_theme" id="0x7f12154e" />
-    <public type="string" name="switch_to_push_to_talk" id="0x7f12154f" />
-    <public type="string" name="switch_to_voice_activity" id="0x7f121550" />
-    <public type="string" name="sync" id="0x7f121551" />
-    <public type="string" name="sync_across_clients_appearance_help" id="0x7f121552" />
-    <public type="string" name="sync_across_clients_text" id="0x7f121553" />
-    <public type="string" name="sync_across_clients_text_help" id="0x7f121554" />
-    <public type="string" name="sync_friends" id="0x7f121555" />
-    <public type="string" name="sync_now" id="0x7f121556" />
-    <public type="string" name="sync_permissions" id="0x7f121557" />
-    <public type="string" name="sync_permissions_explanation" id="0x7f121558" />
-    <public type="string" name="sync_revoked" id="0x7f121559" />
-    <public type="string" name="sync_this_account" id="0x7f12155a" />
-    <public type="string" name="system_dm_activity_text" id="0x7f12155b" />
-    <public type="string" name="system_dm_channel_description" id="0x7f12155c" />
-    <public type="string" name="system_dm_channel_description_subtext" id="0x7f12155d" />
-    <public type="string" name="system_dm_empty_message" id="0x7f12155e" />
-    <public type="string" name="system_dm_tag_system" id="0x7f12155f" />
-    <public type="string" name="system_dm_urgent_message_modal_body" id="0x7f121560" />
-    <public type="string" name="system_dm_urgent_message_modal_header" id="0x7f121561" />
-    <public type="string" name="system_keyboard" id="0x7f121562" />
-    <public type="string" name="system_message_call_missed" id="0x7f121563" />
-    <public type="string" name="system_message_call_missed_with_duration" id="0x7f121564" />
-    <public type="string" name="system_message_call_started" id="0x7f121565" />
-    <public type="string" name="system_message_call_started_with_duration" id="0x7f121566" />
-    <public type="string" name="system_message_channel_follow_add" id="0x7f121567" />
-    <public type="string" name="system_message_channel_follow_add_ios" id="0x7f121568" />
-    <public type="string" name="system_message_channel_icon_change" id="0x7f121569" />
-    <public type="string" name="system_message_channel_name_change" id="0x7f12156a" />
-    <public type="string" name="system_message_guild_bot_join" id="0x7f12156b" />
-    <public type="string" name="system_message_guild_discovery_disqualified" id="0x7f12156c" />
-    <public type="string" name="system_message_guild_discovery_disqualified_mobile" id="0x7f12156d" />
-    <public type="string" name="system_message_guild_discovery_grace_period_final_warning" id="0x7f12156e" />
-    <public type="string" name="system_message_guild_discovery_grace_period_initial_warning" id="0x7f12156f" />
-    <public type="string" name="system_message_guild_discovery_requalified" id="0x7f121570" />
-    <public type="string" name="system_message_guild_member_join_001" id="0x7f121571" />
-    <public type="string" name="system_message_guild_member_join_002" id="0x7f121572" />
-    <public type="string" name="system_message_guild_member_join_003" id="0x7f121573" />
-    <public type="string" name="system_message_guild_member_join_004" id="0x7f121574" />
-    <public type="string" name="system_message_guild_member_join_005" id="0x7f121575" />
-    <public type="string" name="system_message_guild_member_join_006" id="0x7f121576" />
-    <public type="string" name="system_message_guild_member_join_007" id="0x7f121577" />
-    <public type="string" name="system_message_guild_member_join_008" id="0x7f121578" />
-    <public type="string" name="system_message_guild_member_join_009" id="0x7f121579" />
-    <public type="string" name="system_message_guild_member_join_010" id="0x7f12157a" />
-    <public type="string" name="system_message_guild_member_join_011" id="0x7f12157b" />
-    <public type="string" name="system_message_guild_member_join_012" id="0x7f12157c" />
-    <public type="string" name="system_message_guild_member_join_013" id="0x7f12157d" />
-    <public type="string" name="system_message_guild_member_subscribed" id="0x7f12157e" />
-    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7f12157f" />
-    <public type="string" name="system_message_guild_member_subscribed_many" id="0x7f121580" />
-    <public type="string" name="system_message_guild_member_subscribed_many_achieved_tier" id="0x7f121581" />
-    <public type="string" name="system_message_guild_stream_active" id="0x7f121582" />
-    <public type="string" name="system_message_guild_stream_active_android" id="0x7f121583" />
-    <public type="string" name="system_message_guild_stream_active_mobile" id="0x7f121584" />
-    <public type="string" name="system_message_guild_stream_active_no_activity" id="0x7f121585" />
-    <public type="string" name="system_message_guild_stream_ended" id="0x7f121586" />
-    <public type="string" name="system_message_guild_stream_ended_mobile" id="0x7f121587" />
-    <public type="string" name="system_message_join_call" id="0x7f121588" />
-    <public type="string" name="system_message_pinned_message" id="0x7f121589" />
-    <public type="string" name="system_message_pinned_message_mobile" id="0x7f12158a" />
-    <public type="string" name="system_message_pinned_message_no_cta" id="0x7f12158b" />
-    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7f12158c" />
-    <public type="string" name="system_message_pinned_message_no_cta_formatted_with_message" id="0x7f12158d" />
-    <public type="string" name="system_message_pinned_message_with_message" id="0x7f12158e" />
-    <public type="string" name="system_message_recipient_add" id="0x7f12158f" />
-    <public type="string" name="system_message_recipient_remove" id="0x7f121590" />
-    <public type="string" name="system_message_recipient_remove_self" id="0x7f121591" />
-    <public type="string" name="system_message_thread_created" id="0x7f121592" />
-    <public type="string" name="system_message_thread_reply_created" id="0x7f121593" />
-    <public type="string" name="system_permission_grant" id="0x7f121594" />
-    <public type="string" name="system_permission_request_camera" id="0x7f121595" />
-    <public type="string" name="system_permission_request_files" id="0x7f121596" />
-    <public type="string" name="tab_bar" id="0x7f121597" />
-    <public type="string" name="tabs_friends_accessibility_label" id="0x7f121598" />
-    <public type="string" name="tabs_home_accessibility_label" id="0x7f121599" />
-    <public type="string" name="tabs_mentions_accessibility_label" id="0x7f12159a" />
-    <public type="string" name="tabs_search_accessibility_label" id="0x7f12159b" />
-    <public type="string" name="tabs_settings_accessibility_label" id="0x7f12159c" />
-    <public type="string" name="take_a_photo" id="0x7f12159d" />
-    <public type="string" name="tan" id="0x7f12159e" />
-    <public type="string" name="tap_add_nickname" id="0x7f12159f" />
-    <public type="string" name="tar_gz" id="0x7f1215a0" />
-    <public type="string" name="teal" id="0x7f1215a1" />
-    <public type="string" name="temporary_membership_explanation" id="0x7f1215a2" />
-    <public type="string" name="terms_of_service" id="0x7f1215a3" />
-    <public type="string" name="terms_of_service_url" id="0x7f1215a4" />
-    <public type="string" name="terms_privacy" id="0x7f1215a5" />
-    <public type="string" name="terms_privacy_opt_in" id="0x7f1215a6" />
-    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7f1215a7" />
-    <public type="string" name="terracotta" id="0x7f1215a8" />
-    <public type="string" name="test_newlines_key" id="0x7f1215a9" />
-    <public type="string" name="test_video" id="0x7f1215aa" />
-    <public type="string" name="text" id="0x7f1215ab" />
-    <public type="string" name="text_actions_menu_label" id="0x7f1215ac" />
-    <public type="string" name="text_and_images" id="0x7f1215ad" />
-    <public type="string" name="text_channel" id="0x7f1215ae" />
-    <public type="string" name="text_channels" id="0x7f1215af" />
-    <public type="string" name="text_channels_matching" id="0x7f1215b0" />
-    <public type="string" name="text_permissions" id="0x7f1215b1" />
-    <public type="string" name="textarea_actions_menu_label" id="0x7f1215b2" />
-    <public type="string" name="textarea_placeholder" id="0x7f1215b3" />
-    <public type="string" name="th" id="0x7f1215b4" />
-    <public type="string" name="theme" id="0x7f1215b5" />
-    <public type="string" name="theme_dark" id="0x7f1215b6" />
-    <public type="string" name="theme_holy_light_reveal" id="0x7f1215b7" />
-    <public type="string" name="theme_light" id="0x7f1215b8" />
-    <public type="string" name="theme_pure_evil_easter_hint" id="0x7f1215b9" />
-    <public type="string" name="theme_pure_evil_easter_reveal" id="0x7f1215ba" />
-    <public type="string" name="theme_pure_evil_switch_label" id="0x7f1215bb" />
-    <public type="string" name="theme_pure_evil_updated" id="0x7f1215bc" />
-    <public type="string" name="theme_updated" id="0x7f1215bd" />
-    <public type="string" name="this_server" id="0x7f1215be" />
-    <public type="string" name="this_server_named" id="0x7f1215bf" />
-    <public type="string" name="thread" id="0x7f1215c0" />
-    <public type="string" name="thread_deleted" id="0x7f1215c1" />
-    <public type="string" name="thread_join_header" id="0x7f1215c2" />
-    <public type="string" name="thread_join_sub_text" id="0x7f1215c3" />
-    <public type="string" name="thread_modal_message" id="0x7f1215c4" />
-    <public type="string" name="thread_topic" id="0x7f1215c5" />
-    <public type="string" name="threads" id="0x7f1215c6" />
-    <public type="string" name="threads_active_section" id="0x7f1215c7" />
-    <public type="string" name="threads_inactive_section" id="0x7f1215c8" />
-    <public type="string" name="threads_joined_section" id="0x7f1215c9" />
-    <public type="string" name="three_users_typing" id="0x7f1215ca" />
-    <public type="string" name="timeout_error" id="0x7f1215cb" />
-    <public type="string" name="tip_create_first_server_body3" id="0x7f1215cc" />
-    <public type="string" name="tip_create_first_server_title3" id="0x7f1215cd" />
-    <public type="string" name="tip_create_more_servers_body3" id="0x7f1215ce" />
-    <public type="string" name="tip_create_more_servers_title3" id="0x7f1215cf" />
-    <public type="string" name="tip_direct_messages_body3" id="0x7f1215d0" />
-    <public type="string" name="tip_direct_messages_title3" id="0x7f1215d1" />
-    <public type="string" name="tip_friends_list_body3" id="0x7f1215d2" />
-    <public type="string" name="tip_friends_list_title3" id="0x7f1215d3" />
-    <public type="string" name="tip_instant_invite_body3" id="0x7f1215d4" />
-    <public type="string" name="tip_instant_invite_title3" id="0x7f1215d5" />
-    <public type="string" name="tip_organize_by_topic_body3" id="0x7f1215d6" />
-    <public type="string" name="tip_organize_by_topic_title3" id="0x7f1215d7" />
-    <public type="string" name="tip_server_settings_body3" id="0x7f1215d8" />
-    <public type="string" name="tip_server_settings_title3" id="0x7f1215d9" />
-    <public type="string" name="tip_voice_conversations_body3" id="0x7f1215da" />
-    <public type="string" name="tip_voice_conversations_title3" id="0x7f1215db" />
-    <public type="string" name="tip_whos_online_body3" id="0x7f1215dc" />
-    <public type="string" name="tip_whos_online_title3" id="0x7f1215dd" />
-    <public type="string" name="tip_writing_messages_body3" id="0x7f1215de" />
-    <public type="string" name="tip_writing_messages_title3" id="0x7f1215df" />
-    <public type="string" name="title" id="0x7f1215e0" />
-    <public type="string" name="title_bar_close_window" id="0x7f1215e1" />
-    <public type="string" name="title_bar_fullscreen_window" id="0x7f1215e2" />
-    <public type="string" name="title_bar_maximize_window" id="0x7f1215e3" />
-    <public type="string" name="title_bar_minimize_window" id="0x7f1215e4" />
-    <public type="string" name="toast_add_friend" id="0x7f1215e5" />
-    <public type="string" name="toast_feedback_sent" id="0x7f1215e6" />
-    <public type="string" name="toast_gif_saved" id="0x7f1215e7" />
-    <public type="string" name="toast_id_copied" id="0x7f1215e8" />
-    <public type="string" name="toast_image_saved" id="0x7f1215e9" />
-    <public type="string" name="toast_message_copied" id="0x7f1215ea" />
-    <public type="string" name="toast_message_id_copied" id="0x7f1215eb" />
-    <public type="string" name="toast_username_saved" id="0x7f1215ec" />
-    <public type="string" name="toast_video_saved" id="0x7f1215ed" />
-    <public type="string" name="toggle_camera" id="0x7f1215ee" />
-    <public type="string" name="toggle_deafen" id="0x7f1215ef" />
-    <public type="string" name="toggle_drawer" id="0x7f1215f0" />
-    <public type="string" name="toggle_emoji_keyboard" id="0x7f1215f1" />
-    <public type="string" name="toggle_media_keyboard" id="0x7f1215f2" />
-    <public type="string" name="toggle_microphone" id="0x7f1215f3" />
-    <public type="string" name="toggle_mute" id="0x7f1215f4" />
-    <public type="string" name="too_many_animated_emoji" id="0x7f1215f5" />
-    <public type="string" name="too_many_emoji" id="0x7f1215f6" />
-    <public type="string" name="too_many_reactions_alert_body" id="0x7f1215f7" />
-    <public type="string" name="too_many_reactions_alert_header" id="0x7f1215f8" />
-    <public type="string" name="too_many_user_guilds_alert_description" id="0x7f1215f9" />
-    <public type="string" name="too_many_user_guilds_alert_title" id="0x7f1215fa" />
-    <public type="string" name="too_many_user_guilds_description" id="0x7f1215fb" />
-    <public type="string" name="too_many_user_guilds_title" id="0x7f1215fc" />
-    <public type="string" name="tooltip_community_feature_disabled" id="0x7f1215fd" />
-    <public type="string" name="tooltip_discoverable_guild_feature_disabled" id="0x7f1215fe" />
-    <public type="string" name="total_members" id="0x7f1215ff" />
-    <public type="string" name="total_results" id="0x7f121600" />
-    <public type="string" name="tr" id="0x7f121601" />
-    <public type="string" name="transfer" id="0x7f121602" />
-    <public type="string" name="transfer_ownership" id="0x7f121603" />
-    <public type="string" name="transfer_ownership_acknowledge" id="0x7f121604" />
-    <public type="string" name="transfer_ownership_to_user" id="0x7f121605" />
-    <public type="string" name="trending_arrow_down" id="0x7f121606" />
-    <public type="string" name="trending_arrow_up" id="0x7f121607" />
-    <public type="string" name="try_again" id="0x7f121608" />
-    <public type="string" name="tts_alls" id="0x7f121609" />
-    <public type="string" name="tts_current" id="0x7f12160a" />
-    <public type="string" name="tts_never" id="0x7f12160b" />
-    <public type="string" name="tutorial_close" id="0x7f12160c" />
-    <public type="string" name="tweet_us" id="0x7f12160d" />
-    <public type="string" name="twitter" id="0x7f12160e" />
-    <public type="string" name="twitter_page_url" id="0x7f12160f" />
-    <public type="string" name="two_fa" id="0x7f121610" />
-    <public type="string" name="two_fa_activate" id="0x7f121611" />
-    <public type="string" name="two_fa_app_name_authy" id="0x7f121612" />
-    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7f121613" />
-    <public type="string" name="two_fa_auth_code" id="0x7f121614" />
-    <public type="string" name="two_fa_backup_code_enter" id="0x7f121615" />
-    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7f121616" />
-    <public type="string" name="two_fa_backup_code_hint" id="0x7f121617" />
-    <public type="string" name="two_fa_backup_code_used" id="0x7f121618" />
-    <public type="string" name="two_fa_backup_codes_body" id="0x7f121619" />
-    <public type="string" name="two_fa_backup_codes_label" id="0x7f12161a" />
-    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7f12161b" />
-    <public type="string" name="two_fa_backup_codes_warning" id="0x7f12161c" />
-    <public type="string" name="two_fa_change_account" id="0x7f12161d" />
-    <public type="string" name="two_fa_confirm_body" id="0x7f12161e" />
-    <public type="string" name="two_fa_confirm_confirm" id="0x7f12161f" />
-    <public type="string" name="two_fa_confirm_title" id="0x7f121620" />
-    <public type="string" name="two_fa_disable" id="0x7f121621" />
-    <public type="string" name="two_fa_discord_backup_codes" id="0x7f121622" />
-    <public type="string" name="two_fa_download_app_body" id="0x7f121623" />
-    <public type="string" name="two_fa_download_app_label" id="0x7f121624" />
-    <public type="string" name="two_fa_download_codes" id="0x7f121625" />
-    <public type="string" name="two_fa_enable" id="0x7f121626" />
-    <public type="string" name="two_fa_enable_subheader" id="0x7f121627" />
-    <public type="string" name="two_fa_enabled" id="0x7f121628" />
-    <public type="string" name="two_fa_enter_sms_token_label" id="0x7f121629" />
-    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7f12162a" />
-    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7f12162b" />
-    <public type="string" name="two_fa_enter_token_body" id="0x7f12162c" />
-    <public type="string" name="two_fa_enter_token_label" id="0x7f12162d" />
-    <public type="string" name="two_fa_generate_codes" id="0x7f12162e" />
-    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7f12162f" />
-    <public type="string" name="two_fa_guild_mfa_warning" id="0x7f121630" />
-    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7f121631" />
-    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7f121632" />
-    <public type="string" name="two_fa_guild_mfa_warning_message_with_spacing" id="0x7f121633" />
-    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7f121634" />
-    <public type="string" name="two_fa_key" id="0x7f121635" />
-    <public type="string" name="two_fa_login_body" id="0x7f121636" />
-    <public type="string" name="two_fa_login_footer" id="0x7f121637" />
-    <public type="string" name="two_fa_login_label" id="0x7f121638" />
-    <public type="string" name="two_fa_not_verified" id="0x7f121639" />
-    <public type="string" name="two_fa_qr_body" id="0x7f12163a" />
-    <public type="string" name="two_fa_qr_label" id="0x7f12163b" />
-    <public type="string" name="two_fa_remove" id="0x7f12163c" />
-    <public type="string" name="two_fa_sales_pitch" id="0x7f12163d" />
-    <public type="string" name="two_fa_success_body_mobile" id="0x7f12163e" />
-    <public type="string" name="two_fa_success_header" id="0x7f12163f" />
-    <public type="string" name="two_fa_token_required" id="0x7f121640" />
-    <public type="string" name="two_fa_use_desktop_app" id="0x7f121641" />
-    <public type="string" name="two_fa_view_backup_codes" id="0x7f121642" />
-    <public type="string" name="two_fa_view_codes" id="0x7f121643" />
-    <public type="string" name="two_users_typing" id="0x7f121644" />
-    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7f121645" />
-    <public type="string" name="ucrop_label_edit_photo" id="0x7f121646" />
-    <public type="string" name="ucrop_label_original" id="0x7f121647" />
-    <public type="string" name="ucrop_menu_crop" id="0x7f121648" />
-    <public type="string" name="ucrop_mutate_exception_hint" id="0x7f121649" />
-    <public type="string" name="uk" id="0x7f12164a" />
-    <public type="string" name="unable_to_join_channel_full" id="0x7f12164b" />
-    <public type="string" name="unable_to_join_channel_full_modal_body" id="0x7f12164c" />
-    <public type="string" name="unable_to_join_channel_full_modal_header" id="0x7f12164d" />
-    <public type="string" name="unable_to_open_media_chooser" id="0x7f12164e" />
-    <public type="string" name="unban" id="0x7f12164f" />
-    <public type="string" name="unban_user_body" id="0x7f121650" />
-    <public type="string" name="unban_user_title" id="0x7f121651" />
-    <public type="string" name="unblock" id="0x7f121652" />
-    <public type="string" name="unblock_to_jump_body" id="0x7f121653" />
-    <public type="string" name="unblock_to_jump_title" id="0x7f121654" />
-    <public type="string" name="uncategorized" id="0x7f121655" />
-    <public type="string" name="unclaimed_account_body" id="0x7f121656" />
-    <public type="string" name="unclaimed_account_title" id="0x7f121657" />
-    <public type="string" name="undeafen" id="0x7f121658" />
-    <public type="string" name="unfocus_participant" id="0x7f121659" />
-    <public type="string" name="unhandled_link_body" id="0x7f12165a" />
-    <public type="string" name="unhandled_link_title" id="0x7f12165b" />
-    <public type="string" name="unicode_emoji_category_shortcut_a11y_label" id="0x7f12165c" />
-    <public type="string" name="unknown_region" id="0x7f12165d" />
-    <public type="string" name="unknown_user" id="0x7f12165e" />
-    <public type="string" name="unmute" id="0x7f12165f" />
-    <public type="string" name="unmute_category" id="0x7f121660" />
-    <public type="string" name="unmute_channel" id="0x7f121661" />
-    <public type="string" name="unmute_channel_generic" id="0x7f121662" />
-    <public type="string" name="unmute_conversation" id="0x7f121663" />
-    <public type="string" name="unmute_server" id="0x7f121664" />
-    <public type="string" name="unnamed" id="0x7f121665" />
-    <public type="string" name="unpin" id="0x7f121666" />
-    <public type="string" name="unpin_confirm" id="0x7f121667" />
-    <public type="string" name="unpin_message" id="0x7f121668" />
-    <public type="string" name="unpin_message_body" id="0x7f121669" />
-    <public type="string" name="unpin_message_context_menu_hint" id="0x7f12166a" />
-    <public type="string" name="unpin_message_failed_body" id="0x7f12166b" />
-    <public type="string" name="unpin_message_failed_title" id="0x7f12166c" />
-    <public type="string" name="unpin_message_title" id="0x7f12166d" />
-    <public type="string" name="unreads_confirm_mark_all_read_description" id="0x7f12166e" />
-    <public type="string" name="unreads_confirm_mark_all_read_header" id="0x7f12166f" />
-    <public type="string" name="unreads_empty_state_header" id="0x7f121670" />
-    <public type="string" name="unreads_empty_state_tip" id="0x7f121671" />
-    <public type="string" name="unreads_empty_state_tip_mac" id="0x7f121672" />
-    <public type="string" name="unreads_mark_read" id="0x7f121673" />
-    <public type="string" name="unreads_no_notifications_divider" id="0x7f121674" />
-    <public type="string" name="unreads_old_channels_divider" id="0x7f121675" />
-    <public type="string" name="unreads_tab_label" id="0x7f121676" />
-    <public type="string" name="unreads_tutorial_body" id="0x7f121677" />
-    <public type="string" name="unreads_tutorial_header" id="0x7f121678" />
-    <public type="string" name="unreads_view_channel" id="0x7f121679" />
-    <public type="string" name="unsupported_browser" id="0x7f12167a" />
-    <public type="string" name="unsupported_browser_body" id="0x7f12167b" />
-    <public type="string" name="unsupported_browser_details" id="0x7f12167c" />
-    <public type="string" name="unsupported_browser_title" id="0x7f12167d" />
-    <public type="string" name="unverified_account_title" id="0x7f12167e" />
-    <public type="string" name="update_available" id="0x7f12167f" />
-    <public type="string" name="update_badge_header" id="0x7f121680" />
-    <public type="string" name="update_downloaded" id="0x7f121681" />
-    <public type="string" name="update_manually" id="0x7f121682" />
-    <public type="string" name="upload" id="0x7f121683" />
-    <public type="string" name="upload_a_media_file" id="0x7f121684" />
-    <public type="string" name="upload_area_cancel_all" id="0x7f121685" />
-    <public type="string" name="upload_area_help" id="0x7f121686" />
-    <public type="string" name="upload_area_invalid_file_type_help" id="0x7f121687" />
-    <public type="string" name="upload_area_invalid_file_type_title" id="0x7f121688" />
-    <public type="string" name="upload_area_leave_a_comment" id="0x7f121689" />
-    <public type="string" name="upload_area_optional" id="0x7f12168a" />
-    <public type="string" name="upload_area_title" id="0x7f12168b" />
-    <public type="string" name="upload_area_title_no_confirmation" id="0x7f12168c" />
-    <public type="string" name="upload_area_too_large_help" id="0x7f12168d" />
-    <public type="string" name="upload_area_too_large_title" id="0x7f12168e" />
-    <public type="string" name="upload_area_upload_failed_help" id="0x7f12168f" />
-    <public type="string" name="upload_area_upload_failed_title" id="0x7f121690" />
-    <public type="string" name="upload_background" id="0x7f121691" />
-    <public type="string" name="upload_debug_log_failure" id="0x7f121692" />
-    <public type="string" name="upload_debug_log_failure_header" id="0x7f121693" />
-    <public type="string" name="upload_debug_log_failure_no_file" id="0x7f121694" />
-    <public type="string" name="upload_debug_log_failure_progress" id="0x7f121695" />
-    <public type="string" name="upload_debug_log_failure_read" id="0x7f121696" />
-    <public type="string" name="upload_debug_log_failure_upload" id="0x7f121697" />
-    <public type="string" name="upload_debug_log_success" id="0x7f121698" />
-    <public type="string" name="upload_debug_log_success_header" id="0x7f121699" />
-    <public type="string" name="upload_debug_logs" id="0x7f12169a" />
-    <public type="string" name="upload_emoji" id="0x7f12169b" />
-    <public type="string" name="upload_emoji_subtitle" id="0x7f12169c" />
-    <public type="string" name="upload_emoji_title" id="0x7f12169d" />
-    <public type="string" name="upload_image" id="0x7f12169e" />
-    <public type="string" name="upload_image_body" id="0x7f12169f" />
-    <public type="string" name="upload_open_file_failed" id="0x7f1216a0" />
-    <public type="string" name="upload_queued" id="0x7f1216a1" />
-    <public type="string" name="upload_uploads_too_large_help" id="0x7f1216a2" />
-    <public type="string" name="upload_uploads_too_large_title" id="0x7f1216a3" />
-    <public type="string" name="uploaded_by" id="0x7f1216a4" />
-    <public type="string" name="uploading_files" id="0x7f1216a5" />
-    <public type="string" name="uploading_files_failed" id="0x7f1216a6" />
-    <public type="string" name="usage_access" id="0x7f1216a7" />
-    <public type="string" name="usage_statistics_disable_modal_body" id="0x7f1216a8" />
-    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7f1216a9" />
-    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7f1216aa" />
-    <public type="string" name="usage_statistics_disable_modal_title" id="0x7f1216ab" />
-    <public type="string" name="use_external_emojis" id="0x7f1216ac" />
-    <public type="string" name="use_external_emojis_description" id="0x7f1216ad" />
-    <public type="string" name="use_rich_chat_box_description" id="0x7f1216ae" />
-    <public type="string" name="use_speaker" id="0x7f1216af" />
-    <public type="string" name="use_vad" id="0x7f1216b0" />
-    <public type="string" name="use_vad_description" id="0x7f1216b1" />
-    <public type="string" name="user_actions_menu_label" id="0x7f1216b2" />
-    <public type="string" name="user_activity_accept_invite" id="0x7f1216b3" />
-    <public type="string" name="user_activity_action_ask_to_join" id="0x7f1216b4" />
-    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7f1216b5" />
-    <public type="string" name="user_activity_action_download_app" id="0x7f1216b6" />
-    <public type="string" name="user_activity_action_failed_to_launch" id="0x7f1216b7" />
-    <public type="string" name="user_activity_action_invite_to_join" id="0x7f1216b8" />
-    <public type="string" name="user_activity_action_invite_to_listen_along" id="0x7f1216b9" />
-    <public type="string" name="user_activity_action_notify_me" id="0x7f1216ba" />
-    <public type="string" name="user_activity_already_playing" id="0x7f1216bb" />
-    <public type="string" name="user_activity_already_syncing" id="0x7f1216bc" />
-    <public type="string" name="user_activity_cannot_join_self" id="0x7f1216bd" />
-    <public type="string" name="user_activity_cannot_play_self" id="0x7f1216be" />
-    <public type="string" name="user_activity_cannot_sync_self" id="0x7f1216bf" />
-    <public type="string" name="user_activity_chat_invite_education" id="0x7f1216c0" />
-    <public type="string" name="user_activity_connect_platform" id="0x7f1216c1" />
-    <public type="string" name="user_activity_header_listening" id="0x7f1216c2" />
-    <public type="string" name="user_activity_header_live_on_platform" id="0x7f1216c3" />
-    <public type="string" name="user_activity_header_playing" id="0x7f1216c4" />
-    <public type="string" name="user_activity_header_playing_on_platform" id="0x7f1216c5" />
-    <public type="string" name="user_activity_header_streaming_to_guild" id="0x7f1216c6" />
-    <public type="string" name="user_activity_header_watching" id="0x7f1216c7" />
-    <public type="string" name="user_activity_invite_request_expired" id="0x7f1216c8" />
-    <public type="string" name="user_activity_invite_request_received" id="0x7f1216c9" />
-    <public type="string" name="user_activity_invite_request_requested" id="0x7f1216ca" />
-    <public type="string" name="user_activity_invite_request_sent" id="0x7f1216cb" />
-    <public type="string" name="user_activity_invite_request_waiting" id="0x7f1216cc" />
-    <public type="string" name="user_activity_invite_to_join" id="0x7f1216cd" />
-    <public type="string" name="user_activity_joining" id="0x7f1216ce" />
-    <public type="string" name="user_activity_listen_along" id="0x7f1216cf" />
-    <public type="string" name="user_activity_listen_along_description" id="0x7f1216d0" />
-    <public type="string" name="user_activity_listening_album" id="0x7f1216d1" />
-    <public type="string" name="user_activity_listening_artists" id="0x7f1216d2" />
-    <public type="string" name="user_activity_never_mind" id="0x7f1216d3" />
-    <public type="string" name="user_activity_not_detected" id="0x7f1216d4" />
-    <public type="string" name="user_activity_play_on_platform" id="0x7f1216d5" />
-    <public type="string" name="user_activity_respond_nope" id="0x7f1216d6" />
-    <public type="string" name="user_activity_respond_yeah" id="0x7f1216d7" />
-    <public type="string" name="user_activity_state_size" id="0x7f1216d8" />
-    <public type="string" name="user_activity_timestamp_end" id="0x7f1216d9" />
-    <public type="string" name="user_activity_timestamp_end_simple" id="0x7f1216da" />
-    <public type="string" name="user_activity_timestamp_start" id="0x7f1216db" />
-    <public type="string" name="user_activity_timestamp_start_simple" id="0x7f1216dc" />
-    <public type="string" name="user_activity_user_playing_for_days" id="0x7f1216dd" />
-    <public type="string" name="user_activity_user_playing_for_hours" id="0x7f1216de" />
-    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7f1216df" />
-    <public type="string" name="user_activity_watch_along" id="0x7f1216e0" />
-    <public type="string" name="user_dm_settings" id="0x7f1216e1" />
-    <public type="string" name="user_dm_settings_help" id="0x7f1216e2" />
-    <public type="string" name="user_dm_settings_question" id="0x7f1216e3" />
-    <public type="string" name="user_explicit_content_filter" id="0x7f1216e4" />
-    <public type="string" name="user_explicit_content_filter_disabled" id="0x7f1216e5" />
-    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7f1216e6" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7f1216e7" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7f1216e8" />
-    <public type="string" name="user_explicit_content_filter_help" id="0x7f1216e9" />
-    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7f1216ea" />
-    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7f1216eb" />
-    <public type="string" name="user_has_been_blocked" id="0x7f1216ec" />
-    <public type="string" name="user_has_been_unblocked" id="0x7f1216ed" />
-    <public type="string" name="user_info" id="0x7f1216ee" />
-    <public type="string" name="user_management" id="0x7f1216ef" />
-    <public type="string" name="user_popout_message" id="0x7f1216f0" />
-    <public type="string" name="user_popout_wumpus_tooltip" id="0x7f1216f1" />
-    <public type="string" name="user_profile_add_friend" id="0x7f1216f2" />
-    <public type="string" name="user_profile_audio" id="0x7f1216f3" />
-    <public type="string" name="user_profile_failure_to_open_message" id="0x7f1216f4" />
-    <public type="string" name="user_profile_guild_name_content_description" id="0x7f1216f5" />
-    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7f1216f6" />
-    <public type="string" name="user_profile_message" id="0x7f1216f7" />
-    <public type="string" name="user_profile_mutual_friends" id="0x7f1216f8" />
-    <public type="string" name="user_profile_mutual_friends_placeholder" id="0x7f1216f9" />
-    <public type="string" name="user_profile_mutual_guilds" id="0x7f1216fa" />
-    <public type="string" name="user_profile_mutual_guilds_placeholder" id="0x7f1216fb" />
-    <public type="string" name="user_profile_pending" id="0x7f1216fc" />
-    <public type="string" name="user_profile_settings_setstatus" id="0x7f1216fd" />
-    <public type="string" name="user_profile_video" id="0x7f1216fe" />
-    <public type="string" name="user_profile_volume" id="0x7f1216ff" />
-    <public type="string" name="user_settings" id="0x7f121700" />
-    <public type="string" name="user_settings_actions_menu_label" id="0x7f121701" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7f121702" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7f121703" />
-    <public type="string" name="user_settings_appearance_colors" id="0x7f121704" />
-    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7f121705" />
-    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7f121706" />
-    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7f121707" />
-    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7f121708" />
-    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7f121709" />
-    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7f12170a" />
-    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7f12170b" />
-    <public type="string" name="user_settings_available_codes" id="0x7f12170c" />
-    <public type="string" name="user_settings_blocked_users" id="0x7f12170d" />
-    <public type="string" name="user_settings_blocked_users_empty" id="0x7f12170e" />
-    <public type="string" name="user_settings_blocked_users_header" id="0x7f12170f" />
-    <public type="string" name="user_settings_blocked_users_unblockbutton" id="0x7f121710" />
-    <public type="string" name="user_settings_close_button" id="0x7f121711" />
-    <public type="string" name="user_settings_confirm_logout" id="0x7f121712" />
-    <public type="string" name="user_settings_disable_advanced_voice_activity" id="0x7f121713" />
-    <public type="string" name="user_settings_disable_noise_suppression" id="0x7f121714" />
-    <public type="string" name="user_settings_edit_account" id="0x7f121715" />
-    <public type="string" name="user_settings_edit_account_password_label" id="0x7f121716" />
-    <public type="string" name="user_settings_edit_account_tag" id="0x7f121717" />
-    <public type="string" name="user_settings_enter_password_view_codes" id="0x7f121718" />
-    <public type="string" name="user_settings_game_activity" id="0x7f121719" />
-    <public type="string" name="user_settings_games_install_location" id="0x7f12171a" />
-    <public type="string" name="user_settings_games_install_location_add" id="0x7f12171b" />
-    <public type="string" name="user_settings_games_install_location_make_default" id="0x7f12171c" />
-    <public type="string" name="user_settings_games_install_location_name" id="0x7f12171d" />
-    <public type="string" name="user_settings_games_install_location_remove" id="0x7f12171e" />
-    <public type="string" name="user_settings_games_install_location_space" id="0x7f12171f" />
-    <public type="string" name="user_settings_games_install_locations" id="0x7f121720" />
-    <public type="string" name="user_settings_games_remove_location_body" id="0x7f121721" />
-    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7f121722" />
-    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7f121723" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7f121724" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7f121725" />
-    <public type="string" name="user_settings_hypesquad" id="0x7f121726" />
-    <public type="string" name="user_settings_keybinds_action" id="0x7f121727" />
-    <public type="string" name="user_settings_keybinds_keybind" id="0x7f121728" />
-    <public type="string" name="user_settings_label_current_password" id="0x7f121729" />
-    <public type="string" name="user_settings_label_discriminator" id="0x7f12172a" />
-    <public type="string" name="user_settings_label_email" id="0x7f12172b" />
-    <public type="string" name="user_settings_label_new_password" id="0x7f12172c" />
-    <public type="string" name="user_settings_label_username" id="0x7f12172d" />
-    <public type="string" name="user_settings_linux_settings" id="0x7f12172e" />
-    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7f12172f" />
-    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7f121730" />
-    <public type="string" name="user_settings_mfa_enabled" id="0x7f121731" />
-    <public type="string" name="user_settings_mfa_removed" id="0x7f121732" />
-    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7f121733" />
-    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7f121734" />
-    <public type="string" name="user_settings_my_account" id="0x7f121735" />
-    <public type="string" name="user_settings_noise_cancellation" id="0x7f121736" />
-    <public type="string" name="user_settings_noise_cancellation_description" id="0x7f121737" />
-    <public type="string" name="user_settings_noise_cancellation_model" id="0x7f121738" />
-    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f121739" />
-    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f12173a" />
-    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f12173b" />
-    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f12173c" />
-    <public type="string" name="user_settings_open_on_startup_body" id="0x7f12173d" />
-    <public type="string" name="user_settings_open_on_startup_label" id="0x7f12173e" />
-    <public type="string" name="user_settings_privacy_terms" id="0x7f12173f" />
-    <public type="string" name="user_settings_restart_app_mobile" id="0x7f121740" />
-    <public type="string" name="user_settings_save" id="0x7f121741" />
-    <public type="string" name="user_settings_scan_qr_code" id="0x7f121742" />
-    <public type="string" name="user_settings_show_library" id="0x7f121743" />
-    <public type="string" name="user_settings_show_library_note" id="0x7f121744" />
-    <public type="string" name="user_settings_start_minimized_body" id="0x7f121745" />
-    <public type="string" name="user_settings_start_minimized_label" id="0x7f121746" />
-    <public type="string" name="user_settings_startup_behavior" id="0x7f121747" />
-    <public type="string" name="user_settings_streamer_notice_body" id="0x7f121748" />
-    <public type="string" name="user_settings_streamer_notice_title" id="0x7f121749" />
-    <public type="string" name="user_settings_unverified_account_body" id="0x7f12174a" />
-    <public type="string" name="user_settings_used_backup_codes" id="0x7f12174b" />
-    <public type="string" name="user_settings_voice_add_multiple" id="0x7f12174c" />
-    <public type="string" name="user_settings_voice_codec_description" id="0x7f12174d" />
-    <public type="string" name="user_settings_voice_codec_title" id="0x7f12174e" />
-    <public type="string" name="user_settings_voice_experimental_soundshare_label" id="0x7f12174f" />
-    <public type="string" name="user_settings_voice_hardware_h264" id="0x7f121750" />
-    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f121751" />
-    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f121752" />
-    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f121753" />
-    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f121754" />
-    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f121755" />
-    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f121756" />
-    <public type="string" name="user_settings_voice_open_h264" id="0x7f121757" />
-    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f121758" />
-    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f121759" />
-    <public type="string" name="user_settings_windows_settings" id="0x7f12175a" />
-    <public type="string" name="user_settings_with_build_override" id="0x7f12175b" />
-    <public type="string" name="user_volume" id="0x7f12175c" />
-    <public type="string" name="username" id="0x7f12175d" />
-    <public type="string" name="username_and_tag" id="0x7f12175e" />
-    <public type="string" name="username_live" id="0x7f12175f" />
-    <public type="string" name="username_required" id="0x7f121760" />
-    <public type="string" name="users" id="0x7f121761" />
-    <public type="string" name="v7_preference_off" id="0x7f121762" />
-    <public type="string" name="v7_preference_on" id="0x7f121763" />
-    <public type="string" name="vad_permission_body" id="0x7f121764" />
-    <public type="string" name="vad_permission_small" id="0x7f121765" />
-    <public type="string" name="vad_permission_title" id="0x7f121766" />
-    <public type="string" name="vanity_url" id="0x7f121767" />
-    <public type="string" name="vanity_url_help" id="0x7f121768" />
-    <public type="string" name="vanity_url_help_conflict" id="0x7f121769" />
-    <public type="string" name="vanity_url_help_extended" id="0x7f12176a" />
-    <public type="string" name="vanity_url_help_extended_link" id="0x7f12176b" />
-    <public type="string" name="vanity_url_hint_mobile" id="0x7f12176c" />
-    <public type="string" name="vanity_url_uses" id="0x7f12176d" />
-    <public type="string" name="verfication_expired" id="0x7f12176e" />
-    <public type="string" name="verification_body" id="0x7f12176f" />
-    <public type="string" name="verification_body_alt" id="0x7f121770" />
-    <public type="string" name="verification_email_body" id="0x7f121771" />
-    <public type="string" name="verification_email_error_body" id="0x7f121772" />
-    <public type="string" name="verification_email_error_title" id="0x7f121773" />
-    <public type="string" name="verification_email_title" id="0x7f121774" />
-    <public type="string" name="verification_footer" id="0x7f121775" />
-    <public type="string" name="verification_footer_logout" id="0x7f121776" />
-    <public type="string" name="verification_footer_support" id="0x7f121777" />
-    <public type="string" name="verification_level_high" id="0x7f121778" />
-    <public type="string" name="verification_level_high_criteria" id="0x7f121779" />
-    <public type="string" name="verification_level_low" id="0x7f12177a" />
-    <public type="string" name="verification_level_low_criteria" id="0x7f12177b" />
-    <public type="string" name="verification_level_medium" id="0x7f12177c" />
-    <public type="string" name="verification_level_medium_criteria" id="0x7f12177d" />
-    <public type="string" name="verification_level_none" id="0x7f12177e" />
-    <public type="string" name="verification_level_none_criteria" id="0x7f12177f" />
-    <public type="string" name="verification_level_very_high" id="0x7f121780" />
-    <public type="string" name="verification_level_very_high_criteria" id="0x7f121781" />
-    <public type="string" name="verification_open_discord" id="0x7f121782" />
-    <public type="string" name="verification_phone_description" id="0x7f121783" />
-    <public type="string" name="verification_phone_title" id="0x7f121784" />
-    <public type="string" name="verification_title" id="0x7f121785" />
-    <public type="string" name="verification_verified" id="0x7f121786" />
-    <public type="string" name="verification_verifying" id="0x7f121787" />
-    <public type="string" name="verified_bot_tooltip" id="0x7f121788" />
-    <public type="string" name="verified_developer_badge_tooltip" id="0x7f121789" />
-    <public type="string" name="verify" id="0x7f12178a" />
-    <public type="string" name="verify_account" id="0x7f12178b" />
-    <public type="string" name="verify_by" id="0x7f12178c" />
-    <public type="string" name="verify_by_email" id="0x7f12178d" />
-    <public type="string" name="verify_by_email_formatted" id="0x7f12178e" />
-    <public type="string" name="verify_by_phone_formatted" id="0x7f12178f" />
-    <public type="string" name="verify_by_recaptcha" id="0x7f121790" />
-    <public type="string" name="verify_by_recaptcha_description" id="0x7f121791" />
-    <public type="string" name="verify_email_body" id="0x7f121792" />
-    <public type="string" name="verify_email_body_resent" id="0x7f121793" />
-    <public type="string" name="verify_phone" id="0x7f121794" />
-    <public type="string" name="verifying" id="0x7f121795" />
-    <public type="string" name="very_out_of_date_description" id="0x7f121796" />
-    <public type="string" name="vi" id="0x7f121797" />
-    <public type="string" name="video" id="0x7f121798" />
-    <public type="string" name="video_call_auto_select" id="0x7f121799" />
-    <public type="string" name="video_call_hide_members" id="0x7f12179a" />
-    <public type="string" name="video_call_return_to_grid" id="0x7f12179b" />
-    <public type="string" name="video_call_return_to_list" id="0x7f12179c" />
-    <public type="string" name="video_call_show_members" id="0x7f12179d" />
-    <public type="string" name="video_capacity_modal_body" id="0x7f12179e" />
-    <public type="string" name="video_capacity_modal_header" id="0x7f12179f" />
-    <public type="string" name="video_playback_mute_accessibility_label" id="0x7f1217a0" />
-    <public type="string" name="video_playback_unmute_accessibility_label" id="0x7f1217a1" />
-    <public type="string" name="video_poor_connection_body" id="0x7f1217a2" />
-    <public type="string" name="video_poor_connection_title" id="0x7f1217a3" />
-    <public type="string" name="video_settings" id="0x7f1217a4" />
-    <public type="string" name="video_unavailable" id="0x7f1217a5" />
-    <public type="string" name="video_unsupported_browser_body" id="0x7f1217a6" />
-    <public type="string" name="video_unsupported_browser_title" id="0x7f1217a7" />
-    <public type="string" name="view_as_roles_cta" id="0x7f1217a8" />
-    <public type="string" name="view_as_roles_voice_warning" id="0x7f1217a9" />
-    <public type="string" name="view_audit_log" id="0x7f1217aa" />
-    <public type="string" name="view_audit_log_description" id="0x7f1217ab" />
-    <public type="string" name="view_channel" id="0x7f1217ac" />
-    <public type="string" name="view_embed" id="0x7f1217ad" />
-    <public type="string" name="view_guild_analytics" id="0x7f1217ae" />
-    <public type="string" name="view_guild_analytics_description" id="0x7f1217af" />
-    <public type="string" name="view_profile" id="0x7f1217b0" />
-    <public type="string" name="view_spectators" id="0x7f1217b1" />
-    <public type="string" name="view_surrounding_messages" id="0x7f1217b2" />
-    <public type="string" name="viewing_as_roles_edit" id="0x7f1217b3" />
-    <public type="string" name="viewing_as_roles_select" id="0x7f1217b4" />
-    <public type="string" name="viewing_as_roles_warning" id="0x7f1217b5" />
-    <public type="string" name="visitors_info" id="0x7f1217b6" />
-    <public type="string" name="voice" id="0x7f1217b7" />
-    <public type="string" name="voice_and_video" id="0x7f1217b8" />
-    <public type="string" name="voice_call_member_list_title" id="0x7f1217b9" />
-    <public type="string" name="voice_channel" id="0x7f1217ba" />
-    <public type="string" name="voice_channel_deafened" id="0x7f1217bb" />
-    <public type="string" name="voice_channel_empty" id="0x7f1217bc" />
-    <public type="string" name="voice_channel_hide_names" id="0x7f1217bd" />
-    <public type="string" name="voice_channel_muted" id="0x7f1217be" />
-    <public type="string" name="voice_channel_show_names" id="0x7f1217bf" />
-    <public type="string" name="voice_channel_subtitle" id="0x7f1217c0" />
-    <public type="string" name="voice_channel_title" id="0x7f1217c1" />
-    <public type="string" name="voice_channel_undeafened" id="0x7f1217c2" />
-    <public type="string" name="voice_channel_unmuted" id="0x7f1217c3" />
-    <public type="string" name="voice_channels" id="0x7f1217c4" />
-    <public type="string" name="voice_panel_introduction_close" id="0x7f1217c5" />
-    <public type="string" name="voice_panel_introduction_header" id="0x7f1217c6" />
-    <public type="string" name="voice_panel_introduction_text" id="0x7f1217c7" />
-    <public type="string" name="voice_permissions" id="0x7f1217c8" />
-    <public type="string" name="voice_settings" id="0x7f1217c9" />
-    <public type="string" name="voice_status_connecting" id="0x7f1217ca" />
-    <public type="string" name="voice_status_not_connected" id="0x7f1217cb" />
-    <public type="string" name="voice_status_not_connected_mobile" id="0x7f1217cc" />
-    <public type="string" name="voice_status_ringing" id="0x7f1217cd" />
-    <public type="string" name="voice_unavailable" id="0x7f1217ce" />
-    <public type="string" name="watch" id="0x7f1217cf" />
-    <public type="string" name="watch_stream" id="0x7f1217d0" />
-    <public type="string" name="watch_stream_in_app" id="0x7f1217d1" />
-    <public type="string" name="watch_stream_streaming" id="0x7f1217d2" />
-    <public type="string" name="watch_stream_tip" id="0x7f1217d3" />
-    <public type="string" name="watch_stream_watching" id="0x7f1217d4" />
-    <public type="string" name="watch_user_stream" id="0x7f1217d5" />
-    <public type="string" name="watching" id="0x7f1217d6" />
-    <public type="string" name="web_browser" id="0x7f1217d7" />
-    <public type="string" name="web_browser_chrome" id="0x7f1217d8" />
-    <public type="string" name="web_browser_in_app" id="0x7f1217d9" />
-    <public type="string" name="web_browser_safari" id="0x7f1217da" />
-    <public type="string" name="webhook_cancel" id="0x7f1217db" />
-    <public type="string" name="webhook_create" id="0x7f1217dc" />
-    <public type="string" name="webhook_created_on" id="0x7f1217dd" />
-    <public type="string" name="webhook_delete" id="0x7f1217de" />
-    <public type="string" name="webhook_delete_body" id="0x7f1217df" />
-    <public type="string" name="webhook_delete_title" id="0x7f1217e0" />
-    <public type="string" name="webhook_error_creating_webhook" id="0x7f1217e1" />
-    <public type="string" name="webhook_error_deleting_webhook" id="0x7f1217e2" />
-    <public type="string" name="webhook_error_internal_server_error" id="0x7f1217e3" />
-    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f1217e4" />
-    <public type="string" name="webhook_form_name" id="0x7f1217e5" />
-    <public type="string" name="webhook_form_url" id="0x7f1217e6" />
-    <public type="string" name="webhook_form_webhook_url_help" id="0x7f1217e7" />
-    <public type="string" name="webhook_modal_icon_description" id="0x7f1217e8" />
-    <public type="string" name="webhook_modal_icon_title" id="0x7f1217e9" />
-    <public type="string" name="webhook_modal_title" id="0x7f1217ea" />
-    <public type="string" name="webhooks" id="0x7f1217eb" />
-    <public type="string" name="weekly_communicators" id="0x7f1217ec" />
-    <public type="string" name="weekly_new_member_retention" id="0x7f1217ed" />
-    <public type="string" name="weekly_new_members" id="0x7f1217ee" />
-    <public type="string" name="weekly_visitors" id="0x7f1217ef" />
-    <public type="string" name="welcome_channel_delete_confirm_body" id="0x7f1217f0" />
-    <public type="string" name="welcome_channel_delete_confirm_body_generic" id="0x7f1217f1" />
-    <public type="string" name="welcome_channel_delete_confirm_title" id="0x7f1217f2" />
-    <public type="string" name="welcome_channel_emoji_picker_tooltip" id="0x7f1217f3" />
-    <public type="string" name="welcome_cta_create_channel" id="0x7f1217f4" />
-    <public type="string" name="welcome_cta_download_title" id="0x7f1217f5" />
-    <public type="string" name="welcome_cta_invite_title" id="0x7f1217f6" />
-    <public type="string" name="welcome_cta_message_title" id="0x7f1217f7" />
-    <public type="string" name="welcome_cta_personalize_title" id="0x7f1217f8" />
-    <public type="string" name="welcome_cta_personalize_title_mobile" id="0x7f1217f9" />
-    <public type="string" name="welcome_cta_subtitle_action_with_guide" id="0x7f1217fa" />
-    <public type="string" name="welcome_cta_subtitle_existing_server" id="0x7f1217fb" />
-    <public type="string" name="welcome_cta_subtitle_member" id="0x7f1217fc" />
-    <public type="string" name="welcome_cta_subtitle_owner" id="0x7f1217fd" />
-    <public type="string" name="welcome_cta_title" id="0x7f1217fe" />
-    <public type="string" name="welcome_cta_title_mobile" id="0x7f1217ff" />
-    <public type="string" name="welcome_message_desktop_apps" id="0x7f121800" />
-    <public type="string" name="welcome_message_edit_channel" id="0x7f121801" />
-    <public type="string" name="welcome_message_instant_invite" id="0x7f121802" />
-    <public type="string" name="welcome_message_mobile_apps" id="0x7f121803" />
-    <public type="string" name="welcome_message_mobile_explore_server" id="0x7f121804" />
-    <public type="string" name="welcome_message_mobile_explore_server_desc" id="0x7f121805" />
-    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f121806" />
-    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f121807" />
-    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f121808" />
-    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f121809" />
-    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f12180a" />
-    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f12180b" />
-    <public type="string" name="welcome_message_owner_title" id="0x7f12180c" />
-    <public type="string" name="welcome_message_setup_server" id="0x7f12180d" />
-    <public type="string" name="welcome_message_subtitle_channel" id="0x7f12180e" />
-    <public type="string" name="welcome_message_support" id="0x7f12180f" />
-    <public type="string" name="welcome_message_title" id="0x7f121810" />
-    <public type="string" name="welcome_message_title_channel" id="0x7f121811" />
-    <public type="string" name="welcome_message_tutorial" id="0x7f121812" />
-    <public type="string" name="welcome_screen_choice_header" id="0x7f121813" />
-    <public type="string" name="welcome_screen_skip" id="0x7f121814" />
-    <public type="string" name="welcome_screen_title" id="0x7f121815" />
-    <public type="string" name="whats_new" id="0x7f121816" />
-    <public type="string" name="whats_new_date" id="0x7f121817" />
-    <public type="string" name="whitelist_failed" id="0x7f121818" />
-    <public type="string" name="whitelisted" id="0x7f121819" />
-    <public type="string" name="whitelisting" id="0x7f12181a" />
-    <public type="string" name="widget" id="0x7f12181b" />
-    <public type="string" name="windows" id="0x7f12181c" />
-    <public type="string" name="working" id="0x7f12181d" />
-    <public type="string" name="wumpus" id="0x7f12181e" />
-    <public type="string" name="xbox_authorization_title" id="0x7f12181f" />
-    <public type="string" name="xbox_game_pass_card_body_redeemed" id="0x7f121820" />
-    <public type="string" name="xbox_game_pass_card_body_unredeemed" id="0x7f121821" />
-    <public type="string" name="xbox_game_pass_modal_code_description" id="0x7f121822" />
-    <public type="string" name="xbox_game_pass_modal_code_header" id="0x7f121823" />
-    <public type="string" name="xbox_game_pass_modal_header_confirm_pc" id="0x7f121824" />
-    <public type="string" name="xbox_game_pass_modal_header_confirm_xbox" id="0x7f121825" />
-    <public type="string" name="xbox_game_pass_modal_header_description_confirm_pc" id="0x7f121826" />
-    <public type="string" name="xbox_game_pass_modal_header_description_confirm_xbox" id="0x7f121827" />
-    <public type="string" name="xbox_game_pass_modal_header_description_plan_select" id="0x7f121828" />
-    <public type="string" name="xbox_game_pass_modal_header_description_success" id="0x7f121829" />
-    <public type="string" name="xbox_game_pass_modal_header_plan_select" id="0x7f12182a" />
-    <public type="string" name="xbox_game_pass_modal_header_success" id="0x7f12182b" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_header" id="0x7f12182c" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_pc_plan" id="0x7f12182d" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_plan_duration" id="0x7f12182e" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_xbox_plan" id="0x7f12182f" />
-    <public type="string" name="xbox_game_pass_modal_redeem_button_pc" id="0x7f121830" />
-    <public type="string" name="xbox_game_pass_modal_redeem_button_xbox" id="0x7f121831" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_body" id="0x7f121832" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_button" id="0x7f121833" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_body" id="0x7f121834" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_title" id="0x7f121835" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_title" id="0x7f121836" />
-    <public type="string" name="xbox_game_pass_promotion_card_header" id="0x7f121837" />
-    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_body" id="0x7f121838" />
-    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_title" id="0x7f121839" />
-    <public type="string" name="xbox_game_pass_promotion_redeem_body" id="0x7f12183a" />
-    <public type="string" name="xbox_link" id="0x7f12183b" />
-    <public type="string" name="xbox_pin_step1" id="0x7f12183c" />
-    <public type="string" name="xbox_pin_step2" id="0x7f12183d" />
-    <public type="string" name="xbox_pin_step3" id="0x7f12183e" />
-    <public type="string" name="yearly" id="0x7f12183f" />
-    <public type="string" name="yellow" id="0x7f121840" />
-    <public type="string" name="yes_text" id="0x7f121841" />
-    <public type="string" name="your_pin_expires" id="0x7f121842" />
-    <public type="string" name="your_pin_is_expired" id="0x7f121843" />
-    <public type="string" name="youre_viewing_older_messages" id="0x7f121844" />
-    <public type="string" name="zh_cn" id="0x7f121845" />
-    <public type="string" name="zh_tw" id="0x7f121846" />
+    <public type="string" name="call_mobile_tap_to_return" id="0x7f12038f" />
+    <public type="string" name="call_unavailable" id="0x7f120390" />
+    <public type="string" name="camera" id="0x7f120391" />
+    <public type="string" name="camera_disabled_limit_reached" id="0x7f120392" />
+    <public type="string" name="camera_intent_result_error" id="0x7f120393" />
+    <public type="string" name="camera_no_device" id="0x7f120394" />
+    <public type="string" name="camera_not_enabled" id="0x7f120395" />
+    <public type="string" name="camera_off" id="0x7f120396" />
+    <public type="string" name="camera_on" id="0x7f120397" />
+    <public type="string" name="camera_permission_denied" id="0x7f120398" />
+    <public type="string" name="camera_preview_menu_item" id="0x7f120399" />
+    <public type="string" name="camera_preview_modal_cta" id="0x7f12039a" />
+    <public type="string" name="camera_preview_modal_header" id="0x7f12039b" />
+    <public type="string" name="camera_preview_modal_subtitle" id="0x7f12039c" />
+    <public type="string" name="camera_switch" id="0x7f12039d" />
+    <public type="string" name="camera_switched" id="0x7f12039e" />
+    <public type="string" name="camera_unavailable" id="0x7f12039f" />
+    <public type="string" name="camera_unknown_error" id="0x7f1203a0" />
+    <public type="string" name="cameraview_default_autofocus_marker" id="0x7f1203a1" />
+    <public type="string" name="cameraview_filter_autofix" id="0x7f1203a2" />
+    <public type="string" name="cameraview_filter_black_and_white" id="0x7f1203a3" />
+    <public type="string" name="cameraview_filter_brightness" id="0x7f1203a4" />
+    <public type="string" name="cameraview_filter_contrast" id="0x7f1203a5" />
+    <public type="string" name="cameraview_filter_cross_process" id="0x7f1203a6" />
+    <public type="string" name="cameraview_filter_documentary" id="0x7f1203a7" />
+    <public type="string" name="cameraview_filter_duotone" id="0x7f1203a8" />
+    <public type="string" name="cameraview_filter_fill_light" id="0x7f1203a9" />
+    <public type="string" name="cameraview_filter_gamma" id="0x7f1203aa" />
+    <public type="string" name="cameraview_filter_grain" id="0x7f1203ab" />
+    <public type="string" name="cameraview_filter_grayscale" id="0x7f1203ac" />
+    <public type="string" name="cameraview_filter_hue" id="0x7f1203ad" />
+    <public type="string" name="cameraview_filter_invert_colors" id="0x7f1203ae" />
+    <public type="string" name="cameraview_filter_lomoish" id="0x7f1203af" />
+    <public type="string" name="cameraview_filter_none" id="0x7f1203b0" />
+    <public type="string" name="cameraview_filter_posterize" id="0x7f1203b1" />
+    <public type="string" name="cameraview_filter_saturation" id="0x7f1203b2" />
+    <public type="string" name="cameraview_filter_sepia" id="0x7f1203b3" />
+    <public type="string" name="cameraview_filter_sharpness" id="0x7f1203b4" />
+    <public type="string" name="cameraview_filter_temperature" id="0x7f1203b5" />
+    <public type="string" name="cameraview_filter_tint" id="0x7f1203b6" />
+    <public type="string" name="cameraview_filter_vignette" id="0x7f1203b7" />
+    <public type="string" name="cancel" id="0x7f1203b8" />
+    <public type="string" name="cannot_attach_files" id="0x7f1203b9" />
+    <public type="string" name="cannot_delete_channel" id="0x7f1203ba" />
+    <public type="string" name="cannot_deny_missing_permission" id="0x7f1203bb" />
+    <public type="string" name="cannot_deny_self_simple" id="0x7f1203bc" />
+    <public type="string" name="cannot_deny_singular_permission" id="0x7f1203bd" />
+    <public type="string" name="cannot_manage_higher_rank" id="0x7f1203be" />
+    <public type="string" name="cannot_manage_is_owner" id="0x7f1203bf" />
+    <public type="string" name="cannot_manage_same_rank" id="0x7f1203c0" />
+    <public type="string" name="captcha" id="0x7f1203c1" />
+    <public type="string" name="captcha_failed" id="0x7f1203c2" />
+    <public type="string" name="captcha_failed_play_services" id="0x7f1203c3" />
+    <public type="string" name="captcha_failed_unsupported" id="0x7f1203c4" />
+    <public type="string" name="captcha_issues" id="0x7f1203c5" />
+    <public type="string" name="captcha_open_browser" id="0x7f1203c6" />
+    <public type="string" name="captcha_problems" id="0x7f1203c7" />
+    <public type="string" name="captcha_problems_info" id="0x7f1203c8" />
+    <public type="string" name="categories" id="0x7f1203c9" />
+    <public type="string" name="category" id="0x7f1203ca" />
+    <public type="string" name="category_a11y_label" id="0x7f1203cb" />
+    <public type="string" name="category_a11y_label_with_expanded_state" id="0x7f1203cc" />
+    <public type="string" name="category_has_been_deleted" id="0x7f1203cd" />
+    <public type="string" name="category_name" id="0x7f1203ce" />
+    <public type="string" name="category_settings" id="0x7f1203cf" />
+    <public type="string" name="category_settings_have_been_updated" id="0x7f1203d0" />
+    <public type="string" name="certified" id="0x7f1203d1" />
+    <public type="string" name="certified_device_recommendation_audio_input_and_output_body" id="0x7f1203d2" />
+    <public type="string" name="certified_device_recommendation_audio_input_body" id="0x7f1203d3" />
+    <public type="string" name="certified_device_recommendation_audio_output_body" id="0x7f1203d4" />
+    <public type="string" name="certified_device_recommendation_title" id="0x7f1203d5" />
+    <public type="string" name="change" id="0x7f1203d6" />
+    <public type="string" name="change_avatar" id="0x7f1203d7" />
+    <public type="string" name="change_banner" id="0x7f1203d8" />
+    <public type="string" name="change_camera" id="0x7f1203d9" />
+    <public type="string" name="change_category" id="0x7f1203da" />
+    <public type="string" name="change_email" id="0x7f1203db" />
+    <public type="string" name="change_email_short" id="0x7f1203dc" />
+    <public type="string" name="change_icon" id="0x7f1203dd" />
+    <public type="string" name="change_log" id="0x7f1203de" />
+    <public type="string" name="change_log_md_body" id="0x7f1203df" />
+    <public type="string" name="change_log_md_date" id="0x7f1203e0" />
+    <public type="string" name="change_log_md_locale" id="0x7f1203e1" />
+    <public type="string" name="change_log_md_revision" id="0x7f1203e2" />
+    <public type="string" name="change_log_md_video" id="0x7f1203e3" />
+    <public type="string" name="change_nickname" id="0x7f1203e4" />
+    <public type="string" name="change_nickname_description" id="0x7f1203e5" />
+    <public type="string" name="change_nickname_warning" id="0x7f1203e6" />
+    <public type="string" name="change_password" id="0x7f1203e7" />
+    <public type="string" name="change_password_link" id="0x7f1203e8" />
+    <public type="string" name="change_phone_number" id="0x7f1203e9" />
+    <public type="string" name="change_splash" id="0x7f1203ea" />
+    <public type="string" name="change_vanity_url_error" id="0x7f1203eb" />
+    <public type="string" name="changelog_special_cta" id="0x7f1203ec" />
+    <public type="string" name="changelog_special_cta_body" id="0x7f1203ed" />
+    <public type="string" name="changelog_special_cta_desktop" id="0x7f1203ee" />
+    <public type="string" name="changelog_special_cta_desktop_fallback" id="0x7f1203ef" />
+    <public type="string" name="changelog_special_cta_title" id="0x7f1203f0" />
+    <public type="string" name="changelog_special_share_discord" id="0x7f1203f1" />
+    <public type="string" name="channel" id="0x7f1203f2" />
+    <public type="string" name="channel_a11y_label" id="0x7f1203f3" />
+    <public type="string" name="channel_actions_menu_label" id="0x7f1203f4" />
+    <public type="string" name="channel_call_current_speaker" id="0x7f1203f5" />
+    <public type="string" name="channel_call_members_popout_header" id="0x7f1203f6" />
+    <public type="string" name="channel_call_overflow_menu_label" id="0x7f1203f7" />
+    <public type="string" name="channel_call_participants" id="0x7f1203f8" />
+    <public type="string" name="channel_has_been_deleted" id="0x7f1203f9" />
+    <public type="string" name="channel_header_bar_a11y_label" id="0x7f1203fa" />
+    <public type="string" name="channel_list_show_all_threads" id="0x7f1203fb" />
+    <public type="string" name="channel_locked" id="0x7f1203fc" />
+    <public type="string" name="channel_locked_short" id="0x7f1203fd" />
+    <public type="string" name="channel_locked_to_category" id="0x7f1203fe" />
+    <public type="string" name="channel_members_a11y_label" id="0x7f1203ff" />
+    <public type="string" name="channel_mention_badge_a11y_label" id="0x7f120400" />
+    <public type="string" name="channel_message_a11y_label" id="0x7f120401" />
+    <public type="string" name="channel_message_a11y_role_description" id="0x7f120402" />
+    <public type="string" name="channel_messages_a11y_description" id="0x7f120403" />
+    <public type="string" name="channel_messages_a11y_label" id="0x7f120404" />
+    <public type="string" name="channel_messages_a11y_role_description" id="0x7f120405" />
+    <public type="string" name="channel_mute_label" id="0x7f120406" />
+    <public type="string" name="channel_mute_tooltip" id="0x7f120407" />
+    <public type="string" name="channel_or_category" id="0x7f120408" />
+    <public type="string" name="channel_order_updated" id="0x7f120409" />
+    <public type="string" name="channel_permissions" id="0x7f12040a" />
+    <public type="string" name="channel_select" id="0x7f12040b" />
+    <public type="string" name="channel_settings" id="0x7f12040c" />
+    <public type="string" name="channel_settings_have_been_updated" id="0x7f12040d" />
+    <public type="string" name="channel_slowmode_cooldown" id="0x7f12040e" />
+    <public type="string" name="channel_slowmode_desc" id="0x7f12040f" />
+    <public type="string" name="channel_slowmode_desc_hours" id="0x7f120410" />
+    <public type="string" name="channel_slowmode_desc_immune" id="0x7f120411" />
+    <public type="string" name="channel_slowmode_desc_minutes" id="0x7f120412" />
+    <public type="string" name="channel_slowmode_desc_short" id="0x7f120413" />
+    <public type="string" name="channel_step_subtitle" id="0x7f120414" />
+    <public type="string" name="channel_step_title" id="0x7f120415" />
+    <public type="string" name="channel_topic_empty" id="0x7f120416" />
+    <public type="string" name="channel_type" id="0x7f120417" />
+    <public type="string" name="channel_unmute_tooltip" id="0x7f120418" />
+    <public type="string" name="channels" id="0x7f120419" />
+    <public type="string" name="channels_unavailable_body" id="0x7f12041a" />
+    <public type="string" name="channels_unavailable_title" id="0x7f12041b" />
+    <public type="string" name="character_count_at_limit" id="0x7f12041c" />
+    <public type="string" name="character_count_close_to_limit" id="0x7f12041d" />
+    <public type="string" name="character_count_over_limit" id="0x7f12041e" />
+    <public type="string" name="character_counter_content_description" id="0x7f12041f" />
+    <public type="string" name="character_counter_overflowed_content_description" id="0x7f120420" />
+    <public type="string" name="character_counter_pattern" id="0x7f120421" />
+    <public type="string" name="chat" id="0x7f120422" />
+    <public type="string" name="chat_attach_invite_to_listen" id="0x7f120423" />
+    <public type="string" name="chat_attach_invite_to_play_game" id="0x7f120424" />
+    <public type="string" name="chat_attach_invite_to_watch" id="0x7f120425" />
+    <public type="string" name="chat_attach_upload_a_file" id="0x7f120426" />
+    <public type="string" name="chat_attach_upload_or_invite" id="0x7f120427" />
+    <public type="string" name="chat_behavior" id="0x7f120428" />
+    <public type="string" name="checking_for_updates" id="0x7f120429" />
+    <public type="string" name="chip_text" id="0x7f12042a" />
+    <public type="string" name="choose_an_application" id="0x7f12042b" />
+    <public type="string" name="claim_account" id="0x7f12042c" />
+    <public type="string" name="claim_account_body" id="0x7f12042d" />
+    <public type="string" name="claim_account_body_short" id="0x7f12042e" />
+    <public type="string" name="claim_account_email_to" id="0x7f12042f" />
+    <public type="string" name="claim_account_get_app" id="0x7f120430" />
+    <public type="string" name="claim_account_promote_app_2020_06" id="0x7f120431" />
+    <public type="string" name="claim_account_required_body" id="0x7f120432" />
+    <public type="string" name="claim_account_required_email_to" id="0x7f120433" />
+    <public type="string" name="claim_account_title" id="0x7f120434" />
+    <public type="string" name="clear_attachments" id="0x7f120435" />
+    <public type="string" name="clear_role_permissions" id="0x7f120436" />
+    <public type="string" name="clear_text_end_icon_content_description" id="0x7f120437" />
+    <public type="string" name="clone_channel" id="0x7f120438" />
+    <public type="string" name="clone_channel_help" id="0x7f120439" />
+    <public type="string" name="clone_server_button_cta" id="0x7f12043a" />
+    <public type="string" name="close" id="0x7f12043b" />
+    <public type="string" name="close_action_sheet" id="0x7f12043c" />
+    <public type="string" name="close_dm" id="0x7f12043d" />
+    <public type="string" name="close_drawer" id="0x7f12043e" />
+    <public type="string" name="close_stream" id="0x7f12043f" />
+    <public type="string" name="close_window" id="0x7f120440" />
+    <public type="string" name="cloud_sync_icon_tooltip_done" id="0x7f120441" />
+    <public type="string" name="cloud_sync_icon_tooltip_planning" id="0x7f120442" />
+    <public type="string" name="cloud_sync_icon_tooltip_preparing" id="0x7f120443" />
+    <public type="string" name="cloud_sync_icon_tooltip_pulling" id="0x7f120444" />
+    <public type="string" name="cloud_sync_icon_tooltip_pushing" id="0x7f120445" />
+    <public type="string" name="cloud_sync_icon_tooltip_supported" id="0x7f120446" />
+    <public type="string" name="cloud_sync_modal_conflict_choice_download" id="0x7f120447" />
+    <public type="string" name="cloud_sync_modal_conflict_choice_upload" id="0x7f120448" />
+    <public type="string" name="cloud_sync_modal_conflict_description" id="0x7f120449" />
+    <public type="string" name="cloud_sync_modal_conflict_header" id="0x7f12044a" />
+    <public type="string" name="cloud_sync_modal_conflict_last_modified" id="0x7f12044b" />
+    <public type="string" name="cloud_sync_modal_error_description" id="0x7f12044c" />
+    <public type="string" name="cloud_sync_modal_error_header" id="0x7f12044d" />
+    <public type="string" name="cloud_sync_modal_or" id="0x7f12044e" />
+    <public type="string" name="collapse" id="0x7f12044f" />
+    <public type="string" name="collapse_category" id="0x7f120450" />
+    <public type="string" name="collapsed" id="0x7f120451" />
+    <public type="string" name="color_picker_custom" id="0x7f120452" />
+    <public type="string" name="color_picker_presets" id="0x7f120453" />
+    <public type="string" name="color_picker_title" id="0x7f120454" />
+    <public type="string" name="color_picker_transparency" id="0x7f120455" />
+    <public type="string" name="com.crashlytics.android.build_id" id="0x7f120456" />
+    <public type="string" name="coming_soon" id="0x7f120457" />
+    <public type="string" name="command_giphy_description" id="0x7f120458" />
+    <public type="string" name="command_me_description" id="0x7f120459" />
+    <public type="string" name="command_nick_description" id="0x7f12045a" />
+    <public type="string" name="command_nick_failure" id="0x7f12045b" />
+    <public type="string" name="command_nick_failure_permission" id="0x7f12045c" />
+    <public type="string" name="command_nick_reset" id="0x7f12045d" />
+    <public type="string" name="command_nick_success" id="0x7f12045e" />
+    <public type="string" name="command_shrug_description" id="0x7f12045f" />
+    <public type="string" name="command_spoiler_description" id="0x7f120460" />
+    <public type="string" name="command_tableflip_description" id="0x7f120461" />
+    <public type="string" name="command_tableunflip_description" id="0x7f120462" />
+    <public type="string" name="command_tts_description" id="0x7f120463" />
+    <public type="string" name="commands" id="0x7f120464" />
+    <public type="string" name="commands_matching" id="0x7f120465" />
+    <public type="string" name="common_google_play_services_enable_button" id="0x7f120466" />
+    <public type="string" name="common_google_play_services_enable_text" id="0x7f120467" />
+    <public type="string" name="common_google_play_services_enable_title" id="0x7f120468" />
+    <public type="string" name="common_google_play_services_install_button" id="0x7f120469" />
+    <public type="string" name="common_google_play_services_install_text" id="0x7f12046a" />
+    <public type="string" name="common_google_play_services_install_title" id="0x7f12046b" />
+    <public type="string" name="common_google_play_services_notification_channel_name" id="0x7f12046c" />
+    <public type="string" name="common_google_play_services_notification_ticker" id="0x7f12046d" />
+    <public type="string" name="common_google_play_services_unknown_issue" id="0x7f12046e" />
+    <public type="string" name="common_google_play_services_unsupported_text" id="0x7f12046f" />
+    <public type="string" name="common_google_play_services_update_button" id="0x7f120470" />
+    <public type="string" name="common_google_play_services_update_text" id="0x7f120471" />
+    <public type="string" name="common_google_play_services_update_title" id="0x7f120472" />
+    <public type="string" name="common_google_play_services_updating_text" id="0x7f120473" />
+    <public type="string" name="common_google_play_services_wear_update_text" id="0x7f120474" />
+    <public type="string" name="common_open_on_phone" id="0x7f120475" />
+    <public type="string" name="common_signin_button_text" id="0x7f120476" />
+    <public type="string" name="common_signin_button_text_long" id="0x7f120477" />
+    <public type="string" name="communicators_info" id="0x7f120478" />
+    <public type="string" name="community" id="0x7f120479" />
+    <public type="string" name="community_policy_help" id="0x7f12047a" />
+    <public type="string" name="community_policy_title" id="0x7f12047b" />
+    <public type="string" name="compact_mode" id="0x7f12047c" />
+    <public type="string" name="completed" id="0x7f12047d" />
+    <public type="string" name="configure" id="0x7f12047e" />
+    <public type="string" name="confirm" id="0x7f12047f" />
+    <public type="string" name="confirm_channel_drag_title" id="0x7f120480" />
+    <public type="string" name="confirm_disable_silence_body" id="0x7f120481" />
+    <public type="string" name="confirm_disable_silence_dont_show" id="0x7f120482" />
+    <public type="string" name="confirm_disable_silence_title" id="0x7f120483" />
+    <public type="string" name="confirm_qr_check_your_phone" id="0x7f120484" />
+    <public type="string" name="confirm_qr_description" id="0x7f120485" />
+    <public type="string" name="confirm_qr_keep_me_signed_in" id="0x7f120486" />
+    <public type="string" name="confirm_qr_login_on_computer" id="0x7f120487" />
+    <public type="string" name="confirm_user_block_body" id="0x7f120488" />
+    <public type="string" name="confirm_user_block_title" id="0x7f120489" />
+    <public type="string" name="connect" id="0x7f12048a" />
+    <public type="string" name="connect_account_description" id="0x7f12048b" />
+    <public type="string" name="connect_account_title" id="0x7f12048c" />
+    <public type="string" name="connect_to_video" id="0x7f12048d" />
+    <public type="string" name="connect_to_voice" id="0x7f12048e" />
+    <public type="string" name="connect_voice_only" id="0x7f12048f" />
+    <public type="string" name="connected_account_revoked" id="0x7f120490" />
+    <public type="string" name="connected_account_verify_failure" id="0x7f120491" />
+    <public type="string" name="connected_account_verify_success" id="0x7f120492" />
+    <public type="string" name="connected_account_verifying" id="0x7f120493" />
+    <public type="string" name="connected_accounts" id="0x7f120494" />
+    <public type="string" name="connected_accounts_none" id="0x7f120495" />
+    <public type="string" name="connected_accounts_none_title" id="0x7f120496" />
+    <public type="string" name="connected_device_detected_cancel_button" id="0x7f120497" />
+    <public type="string" name="connected_device_detected_confirm_button" id="0x7f120498" />
+    <public type="string" name="connected_device_detected_input_and_output_body" id="0x7f120499" />
+    <public type="string" name="connected_device_detected_input_body" id="0x7f12049a" />
+    <public type="string" name="connected_device_detected_option_input" id="0x7f12049b" />
+    <public type="string" name="connected_device_detected_option_input_and_output" id="0x7f12049c" />
+    <public type="string" name="connected_device_detected_option_output" id="0x7f12049d" />
+    <public type="string" name="connected_device_detected_output_body" id="0x7f12049e" />
+    <public type="string" name="connected_device_detected_title" id="0x7f12049f" />
+    <public type="string" name="connected_on_another_client" id="0x7f1204a0" />
+    <public type="string" name="connecting" id="0x7f1204a1" />
+    <public type="string" name="connecting_problems_cta" id="0x7f1204a2" />
+    <public type="string" name="connection_enter_code" id="0x7f1204a3" />
+    <public type="string" name="connection_invalid_pin" id="0x7f1204a4" />
+    <public type="string" name="connection_login_with" id="0x7f1204a5" />
+    <public type="string" name="connection_problems_body" id="0x7f1204a6" />
+    <public type="string" name="connection_status_authenticating" id="0x7f1204a7" />
+    <public type="string" name="connection_status_awaiting_endpoint" id="0x7f1204a8" />
+    <public type="string" name="connection_status_connected" id="0x7f1204a9" />
+    <public type="string" name="connection_status_connecting" id="0x7f1204aa" />
+    <public type="string" name="connection_status_disconnected" id="0x7f1204ab" />
+    <public type="string" name="connection_status_ice_checking" id="0x7f1204ac" />
+    <public type="string" name="connection_status_no_route" id="0x7f1204ad" />
+    <public type="string" name="connection_status_rtc_connecting" id="0x7f1204ae" />
+    <public type="string" name="connection_status_rtc_disconnected" id="0x7f1204af" />
+    <public type="string" name="connection_status_stream_connected" id="0x7f1204b0" />
+    <public type="string" name="connection_status_stream_self_connected" id="0x7f1204b1" />
+    <public type="string" name="connection_status_video_connected" id="0x7f1204b2" />
+    <public type="string" name="connection_status_voice_connected" id="0x7f1204b3" />
+    <public type="string" name="connection_verified" id="0x7f1204b4" />
+    <public type="string" name="connections" id="0x7f1204b5" />
+    <public type="string" name="contact_sync_cta_button_subtitle" id="0x7f1204b6" />
+    <public type="string" name="contact_sync_cta_button_title" id="0x7f1204b7" />
+    <public type="string" name="contact_sync_enter_phone_number_description" id="0x7f1204b8" />
+    <public type="string" name="contact_sync_enter_phone_number_title" id="0x7f1204b9" />
+    <public type="string" name="contact_sync_failed_alert_message" id="0x7f1204ba" />
+    <public type="string" name="contact_sync_failed_alert_title" id="0x7f1204bb" />
+    <public type="string" name="contact_sync_failed_no_phone_alert_message" id="0x7f1204bc" />
+    <public type="string" name="contact_sync_failed_no_phone_alert_title" id="0x7f1204bd" />
+    <public type="string" name="contact_sync_landing_screen_button" id="0x7f1204be" />
+    <public type="string" name="contact_sync_landing_screen_description" id="0x7f1204bf" />
+    <public type="string" name="contact_sync_landing_screen_title" id="0x7f1204c0" />
+    <public type="string" name="contact_sync_no_results_description" id="0x7f1204c1" />
+    <public type="string" name="contact_sync_no_results_got_it" id="0x7f1204c2" />
+    <public type="string" name="contact_sync_no_results_title" id="0x7f1204c3" />
+    <public type="string" name="contact_sync_permission_denied_alert_message" id="0x7f1204c4" />
+    <public type="string" name="contact_sync_permission_denied_alert_title" id="0x7f1204c5" />
+    <public type="string" name="contact_sync_submit_phone_number" id="0x7f1204c6" />
+    <public type="string" name="contact_sync_syncing_description" id="0x7f1204c7" />
+    <public type="string" name="contact_sync_syncing_title" id="0x7f1204c8" />
+    <public type="string" name="contact_sync_toggle_label" id="0x7f1204c9" />
+    <public type="string" name="contact_sync_toggle_sub_label" id="0x7f1204ca" />
+    <public type="string" name="contact_sync_we_found_your_friends_body" id="0x7f1204cb" />
+    <public type="string" name="contact_sync_we_found_your_friends_title" id="0x7f1204cc" />
+    <public type="string" name="content_matching" id="0x7f1204cd" />
+    <public type="string" name="context_menu_hint" id="0x7f1204ce" />
+    <public type="string" name="continue_to_webapp" id="0x7f1204cf" />
+    <public type="string" name="control_volume" id="0x7f1204d0" />
+    <public type="string" name="convert_emoticons" id="0x7f1204d1" />
+    <public type="string" name="convert_emoticons_help" id="0x7f1204d2" />
+    <public type="string" name="copied" id="0x7f1204d3" />
+    <public type="string" name="copied_text" id="0x7f1204d4" />
+    <public type="string" name="copy" id="0x7f1204d5" />
+    <public type="string" name="copy_channel_topic" id="0x7f1204d6" />
+    <public type="string" name="copy_code" id="0x7f1204d7" />
+    <public type="string" name="copy_id" id="0x7f1204d8" />
+    <public type="string" name="copy_image_preview" id="0x7f1204d9" />
+    <public type="string" name="copy_link" id="0x7f1204da" />
+    <public type="string" name="copy_media_link" id="0x7f1204db" />
+    <public type="string" name="copy_message_link" id="0x7f1204dc" />
+    <public type="string" name="copy_owner_id" id="0x7f1204dd" />
+    <public type="string" name="copy_text" id="0x7f1204de" />
+    <public type="string" name="copy_toast_msg" id="0x7f1204df" />
+    <public type="string" name="copy_username" id="0x7f1204e0" />
+    <public type="string" name="country_codes" id="0x7f1204e1" />
+    <public type="string" name="country_no_results" id="0x7f1204e2" />
+    <public type="string" name="covid_new_user_survey_button" id="0x7f1204e3" />
+    <public type="string" name="covid_new_user_survey_prompt" id="0x7f1204e4" />
+    <public type="string" name="cozy_mode" id="0x7f1204e5" />
+    <public type="string" name="cpv_custom" id="0x7f1204e6" />
+    <public type="string" name="cpv_default_title" id="0x7f1204e7" />
+    <public type="string" name="cpv_presets" id="0x7f1204e8" />
+    <public type="string" name="cpv_select" id="0x7f1204e9" />
+    <public type="string" name="cpv_transparency" id="0x7f1204ea" />
+    <public type="string" name="crash_app_version" id="0x7f1204eb" />
+    <public type="string" name="crash_details" id="0x7f1204ec" />
+    <public type="string" name="crash_device" id="0x7f1204ed" />
+    <public type="string" name="crash_device_version" id="0x7f1204ee" />
+    <public type="string" name="crash_disclaimer" id="0x7f1204ef" />
+    <public type="string" name="crash_source" id="0x7f1204f0" />
+    <public type="string" name="crash_testers_invite" id="0x7f1204f1" />
+    <public type="string" name="crash_timestamp" id="0x7f1204f2" />
+    <public type="string" name="crash_unexpected" id="0x7f1204f3" />
+    <public type="string" name="create" id="0x7f1204f4" />
+    <public type="string" name="create_category" id="0x7f1204f5" />
+    <public type="string" name="create_channel" id="0x7f1204f6" />
+    <public type="string" name="create_channel_error" id="0x7f1204f7" />
+    <public type="string" name="create_channel_in_category" id="0x7f1204f8" />
+    <public type="string" name="create_dm" id="0x7f1204f9" />
+    <public type="string" name="create_group_dm" id="0x7f1204fa" />
+    <public type="string" name="create_guild_description" id="0x7f1204fb" />
+    <public type="string" name="create_guild_with_templates_title" id="0x7f1204fc" />
+    <public type="string" name="create_instant_invite" id="0x7f1204fd" />
+    <public type="string" name="create_link" id="0x7f1204fe" />
+    <public type="string" name="create_news_channel" id="0x7f1204ff" />
+    <public type="string" name="create_or_join_modal_header" id="0x7f120500" />
+    <public type="string" name="create_server_button_action" id="0x7f120501" />
+    <public type="string" name="create_server_button_body" id="0x7f120502" />
+    <public type="string" name="create_server_button_cta" id="0x7f120503" />
+    <public type="string" name="create_server_button_cta_mobile" id="0x7f120504" />
+    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7f120505" />
+    <public type="string" name="create_server_default_server_name_format" id="0x7f120506" />
+    <public type="string" name="create_server_description_mobile" id="0x7f120507" />
+    <public type="string" name="create_server_description_mobile_refresh" id="0x7f120508" />
+    <public type="string" name="create_server_description_refresh" id="0x7f120509" />
+    <public type="string" name="create_server_guidelines" id="0x7f12050a" />
+    <public type="string" name="create_server_title" id="0x7f12050b" />
+    <public type="string" name="create_server_title_mobile_refresh" id="0x7f12050c" />
+    <public type="string" name="create_store_channel" id="0x7f12050d" />
+    <public type="string" name="create_store_channel_application" id="0x7f12050e" />
+    <public type="string" name="create_store_channel_beta_note" id="0x7f12050f" />
+    <public type="string" name="create_store_channel_beta_title" id="0x7f120510" />
+    <public type="string" name="create_store_channel_branch" id="0x7f120511" />
+    <public type="string" name="create_store_channel_no_skus" id="0x7f120512" />
+    <public type="string" name="create_store_channel_no_skus_error" id="0x7f120513" />
+    <public type="string" name="create_store_channel_select_application" id="0x7f120514" />
+    <public type="string" name="create_store_channel_select_branch" id="0x7f120515" />
+    <public type="string" name="create_store_channel_select_sku" id="0x7f120516" />
+    <public type="string" name="create_store_channel_sku" id="0x7f120517" />
+    <public type="string" name="create_text_channel" id="0x7f120518" />
+    <public type="string" name="create_voice_channel" id="0x7f120519" />
+    <public type="string" name="credit_card_cvc" id="0x7f12051a" />
+    <public type="string" name="credit_card_error_expiration" id="0x7f12051b" />
+    <public type="string" name="credit_card_error_number" id="0x7f12051c" />
+    <public type="string" name="credit_card_error_required" id="0x7f12051d" />
+    <public type="string" name="credit_card_error_security_code" id="0x7f12051e" />
+    <public type="string" name="credit_card_expiration_date" id="0x7f12051f" />
+    <public type="string" name="credit_card_name" id="0x7f120520" />
+    <public type="string" name="credit_card_name_on_card" id="0x7f120521" />
+    <public type="string" name="credit_card_number" id="0x7f120522" />
+    <public type="string" name="credit_card_security_code" id="0x7f120523" />
+    <public type="string" name="crop" id="0x7f120524" />
+    <public type="string" name="cs" id="0x7f120525" />
+    <public type="string" name="custom_color" id="0x7f120526" />
+    <public type="string" name="custom_status" id="0x7f120527" />
+    <public type="string" name="custom_status_clear_after" id="0x7f120528" />
+    <public type="string" name="custom_status_clear_custom_status" id="0x7f120529" />
+    <public type="string" name="custom_status_clear_in_hours" id="0x7f12052a" />
+    <public type="string" name="custom_status_clear_in_minutes" id="0x7f12052b" />
+    <public type="string" name="custom_status_clear_tomorrow" id="0x7f12052c" />
+    <public type="string" name="custom_status_dont_clear" id="0x7f12052d" />
+    <public type="string" name="custom_status_edit_custom_status_placeholder" id="0x7f12052e" />
+    <public type="string" name="custom_status_hours" id="0x7f12052f" />
+    <public type="string" name="custom_status_minutes" id="0x7f120530" />
+    <public type="string" name="custom_status_modal_body" id="0x7f120531" />
+    <public type="string" name="custom_status_modal_placeholder" id="0x7f120532" />
+    <public type="string" name="custom_status_set_custom_status" id="0x7f120533" />
+    <public type="string" name="custom_status_today" id="0x7f120534" />
+    <public type="string" name="custom_status_update_success" id="0x7f120535" />
+    <public type="string" name="custom_tabs_mobile_body" id="0x7f120536" />
+    <public type="string" name="custom_tabs_mobile_header" id="0x7f120537" />
+    <public type="string" name="customize_group" id="0x7f120538" />
+    <public type="string" name="cut" id="0x7f120539" />
+    <public type="string" name="da" id="0x7f12053a" />
+    <public type="string" name="dark_blue" id="0x7f12053b" />
+    <public type="string" name="dark_grey" id="0x7f12053c" />
+    <public type="string" name="dark_purple" id="0x7f12053d" />
+    <public type="string" name="dark_teal" id="0x7f12053e" />
+    <public type="string" name="data_download_requested_status_note" id="0x7f12053f" />
+    <public type="string" name="data_privacy_controls" id="0x7f120540" />
+    <public type="string" name="data_privacy_controls_allow_accessibility_detection_note" id="0x7f120541" />
+    <public type="string" name="data_privacy_controls_allow_accessibility_detection_title" id="0x7f120542" />
+    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7f120543" />
+    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7f120544" />
+    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7f120545" />
+    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7f120546" />
+    <public type="string" name="data_privacy_controls_personalization_title" id="0x7f120547" />
+    <public type="string" name="data_privacy_controls_request_data_download" id="0x7f120548" />
+    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7f120549" />
+    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7f12054a" />
+    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7f12054b" />
+    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7f12054c" />
+    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7f12054d" />
+    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7f12054e" />
+    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7f12054f" />
+    <public type="string" name="data_privacy_controls_request_data_note" id="0x7f120550" />
+    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7f120551" />
+    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7f120552" />
+    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7f120553" />
+    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7f120554" />
+    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7f120555" />
+    <public type="string" name="data_privacy_rate_limit_title" id="0x7f120556" />
+    <public type="string" name="data_privacy_update_consents_failed" id="0x7f120557" />
+    <public type="string" name="date" id="0x7f120558" />
+    <public type="string" name="de" id="0x7f120559" />
+    <public type="string" name="deafen" id="0x7f12055a" />
+    <public type="string" name="deafen_members" id="0x7f12055b" />
+    <public type="string" name="deauthorize" id="0x7f12055c" />
+    <public type="string" name="deauthorize_app" id="0x7f12055d" />
+    <public type="string" name="deb" id="0x7f12055e" />
+    <public type="string" name="debug" id="0x7f12055f" />
+    <public type="string" name="decline" id="0x7f120560" />
+    <public type="string" name="default_app_description" id="0x7f120561" />
+    <public type="string" name="default_failure_to_perform_action_message" id="0x7f120562" />
+    <public type="string" name="default_input_placeholder" id="0x7f120563" />
+    <public type="string" name="default_web_client_id" id="0x7f120564" />
+    <public type="string" name="delete" id="0x7f120565" />
+    <public type="string" name="delete_account" id="0x7f120566" />
+    <public type="string" name="delete_account_body" id="0x7f120567" />
+    <public type="string" name="delete_account_error" id="0x7f120568" />
+    <public type="string" name="delete_account_transfer_ownership" id="0x7f120569" />
+    <public type="string" name="delete_account_transfer_ownership_body" id="0x7f12056a" />
+    <public type="string" name="delete_app_confirm_msg" id="0x7f12056b" />
+    <public type="string" name="delete_category" id="0x7f12056c" />
+    <public type="string" name="delete_channel" id="0x7f12056d" />
+    <public type="string" name="delete_channel_body" id="0x7f12056e" />
+    <public type="string" name="delete_followed_news_body" id="0x7f12056f" />
+    <public type="string" name="delete_message" id="0x7f120570" />
+    <public type="string" name="delete_message_body" id="0x7f120571" />
+    <public type="string" name="delete_message_context_menu_hint" id="0x7f120572" />
+    <public type="string" name="delete_message_history_option_24hr" id="0x7f120573" />
+    <public type="string" name="delete_message_history_option_7d" id="0x7f120574" />
+    <public type="string" name="delete_message_history_option_none" id="0x7f120575" />
+    <public type="string" name="delete_message_report" id="0x7f120576" />
+    <public type="string" name="delete_message_title" id="0x7f120577" />
+    <public type="string" name="delete_role" id="0x7f120578" />
+    <public type="string" name="delete_role_mobile" id="0x7f120579" />
+    <public type="string" name="delete_rules_channel_body" id="0x7f12057a" />
+    <public type="string" name="delete_server" id="0x7f12057b" />
+    <public type="string" name="delete_server_body" id="0x7f12057c" />
+    <public type="string" name="delete_server_enter_name" id="0x7f12057d" />
+    <public type="string" name="delete_server_incorrect_name" id="0x7f12057e" />
+    <public type="string" name="delete_server_title" id="0x7f12057f" />
+    <public type="string" name="delete_updates_channel_body" id="0x7f120580" />
+    <public type="string" name="description" id="0x7f120581" />
+    <public type="string" name="designate_other_channel" id="0x7f120582" />
+    <public type="string" name="desktop_app" id="0x7f120583" />
+    <public type="string" name="desktop_notifications_enable" id="0x7f120584" />
+    <public type="string" name="desktop_notifications_enable_body" id="0x7f120585" />
+    <public type="string" name="detect_platform_accounts" id="0x7f120586" />
+    <public type="string" name="developer_application_test_mode" id="0x7f120587" />
+    <public type="string" name="developer_application_test_mode_activate" id="0x7f120588" />
+    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7f120589" />
+    <public type="string" name="developer_application_test_mode_clear" id="0x7f12058a" />
+    <public type="string" name="developer_application_test_mode_invalid" id="0x7f12058b" />
+    <public type="string" name="developer_application_test_mode_modal_body" id="0x7f12058c" />
+    <public type="string" name="developer_application_test_mode_modal_header" id="0x7f12058d" />
+    <public type="string" name="developer_application_test_mode_note" id="0x7f12058e" />
+    <public type="string" name="developer_application_test_mode_placeholder" id="0x7f12058f" />
+    <public type="string" name="developer_mode" id="0x7f120590" />
+    <public type="string" name="developer_mode_help_text" id="0x7f120591" />
+    <public type="string" name="developer_options" id="0x7f120592" />
+    <public type="string" name="device_settings" id="0x7f120593" />
+    <public type="string" name="direct_message" id="0x7f120594" />
+    <public type="string" name="direct_message_a11y_label" id="0x7f120595" />
+    <public type="string" name="direct_message_a11y_label_with_unreads" id="0x7f120596" />
+    <public type="string" name="direct_messages" id="0x7f120597" />
+    <public type="string" name="disable" id="0x7f120598" />
+    <public type="string" name="disable_account" id="0x7f120599" />
+    <public type="string" name="disable_account_body" id="0x7f12059a" />
+    <public type="string" name="disable_email_notifications" id="0x7f12059b" />
+    <public type="string" name="disable_integration_title" id="0x7f12059c" />
+    <public type="string" name="disable_integration_twitch_body" id="0x7f12059d" />
+    <public type="string" name="disable_integration_youtube_body" id="0x7f12059e" />
+    <public type="string" name="disable_noise_cancellation" id="0x7f12059f" />
+    <public type="string" name="disable_notifications_description" id="0x7f1205a0" />
+    <public type="string" name="disable_notifications_label" id="0x7f1205a1" />
+    <public type="string" name="disable_sounds_description" id="0x7f1205a2" />
+    <public type="string" name="disable_sounds_label" id="0x7f1205a3" />
+    <public type="string" name="disable_video" id="0x7f1205a4" />
+    <public type="string" name="discard_changes" id="0x7f1205a5" />
+    <public type="string" name="discard_changes_description" id="0x7f1205a6" />
+    <public type="string" name="discodo_disabled" id="0x7f1205a7" />
+    <public type="string" name="discodo_enabled" id="0x7f1205a8" />
+    <public type="string" name="disconnect" id="0x7f1205a9" />
+    <public type="string" name="disconnect_account" id="0x7f1205aa" />
+    <public type="string" name="disconnect_account_body" id="0x7f1205ab" />
+    <public type="string" name="disconnect_account_title" id="0x7f1205ac" />
+    <public type="string" name="disconnect_from_voice" id="0x7f1205ad" />
+    <public type="string" name="disconnect_user_success" id="0x7f1205ae" />
+    <public type="string" name="discord" id="0x7f1205af" />
+    <public type="string" name="discord_desc_long" id="0x7f1205b0" />
+    <public type="string" name="discord_desc_short" id="0x7f1205b1" />
+    <public type="string" name="discord_gg" id="0x7f1205b2" />
+    <public type="string" name="discord_name" id="0x7f1205b3" />
+    <public type="string" name="discord_rich_presence" id="0x7f1205b4" />
+    <public type="string" name="discover" id="0x7f1205b5" />
+    <public type="string" name="discovery" id="0x7f1205b6" />
+    <public type="string" name="dismiss" id="0x7f1205b7" />
+    <public type="string" name="dispatch_error_modal_body" id="0x7f1205b8" />
+    <public type="string" name="dispatch_error_modal_description" id="0x7f1205b9" />
+    <public type="string" name="dispatch_error_modal_error_label" id="0x7f1205ba" />
+    <public type="string" name="dispatch_error_modal_header" id="0x7f1205bb" />
+    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7f1205bc" />
+    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7f1205bd" />
+    <public type="string" name="display_activity" id="0x7f1205be" />
+    <public type="string" name="display_on_profile" id="0x7f1205bf" />
+    <public type="string" name="display_option_always" id="0x7f1205c0" />
+    <public type="string" name="display_option_never" id="0x7f1205c1" />
+    <public type="string" name="display_option_only_while_speaking" id="0x7f1205c2" />
+    <public type="string" name="display_silence_warning" id="0x7f1205c3" />
+    <public type="string" name="dm" id="0x7f1205c4" />
+    <public type="string" name="dm_search_placeholder" id="0x7f1205c5" />
+    <public type="string" name="dm_tooltip_a11y_label" id="0x7f1205c6" />
+    <public type="string" name="dm_verification_text_blocked" id="0x7f1205c7" />
+    <public type="string" name="done" id="0x7f1205c8" />
+    <public type="string" name="dont_show_again" id="0x7f1205c9" />
+    <public type="string" name="download" id="0x7f1205ca" />
+    <public type="string" name="download_app" id="0x7f1205cb" />
+    <public type="string" name="download_apps" id="0x7f1205cc" />
+    <public type="string" name="download_desktop_ptb_footer" id="0x7f1205cd" />
+    <public type="string" name="download_desktop_stable_footer" id="0x7f1205ce" />
+    <public type="string" name="download_desktop_title" id="0x7f1205cf" />
+    <public type="string" name="download_failed" id="0x7f1205d0" />
+    <public type="string" name="download_file_complete" id="0x7f1205d1" />
+    <public type="string" name="download_mobile_title" id="0x7f1205d2" />
+    <public type="string" name="duration_days" id="0x7f1205d3" />
+    <public type="string" name="duration_hours" id="0x7f1205d4" />
+    <public type="string" name="duration_hours_short" id="0x7f1205d5" />
+    <public type="string" name="duration_mins" id="0x7f1205d6" />
+    <public type="string" name="duration_minutes" id="0x7f1205d7" />
+    <public type="string" name="duration_minutes_short" id="0x7f1205d8" />
+    <public type="string" name="duration_seconds" id="0x7f1205d9" />
+    <public type="string" name="duration_seconds_short" id="0x7f1205da" />
+    <public type="string" name="early_supporter_tooltip" id="0x7f1205db" />
+    <public type="string" name="echo_cancellation" id="0x7f1205dc" />
+    <public type="string" name="edit" id="0x7f1205dd" />
+    <public type="string" name="edit_category" id="0x7f1205de" />
+    <public type="string" name="edit_channel" id="0x7f1205df" />
+    <public type="string" name="edit_followed_news_body" id="0x7f1205e0" />
+    <public type="string" name="edit_message" id="0x7f1205e1" />
+    <public type="string" name="edit_note" id="0x7f1205e2" />
+    <public type="string" name="edit_overview" id="0x7f1205e3" />
+    <public type="string" name="edit_roles" id="0x7f1205e4" />
+    <public type="string" name="edit_textarea_help" id="0x7f1205e5" />
+    <public type="string" name="edit_user" id="0x7f1205e6" />
+    <public type="string" name="editing_message" id="0x7f1205e7" />
+    <public type="string" name="editing_with_attachment_error" id="0x7f1205e8" />
+    <public type="string" name="el" id="0x7f1205e9" />
+    <public type="string" name="elevated_permissions_sound_body" id="0x7f1205ea" />
+    <public type="string" name="elevated_permissions_sound_no_sound_button" id="0x7f1205eb" />
+    <public type="string" name="elevated_permissions_sound_request_access_button" id="0x7f1205ec" />
+    <public type="string" name="elevated_permissions_sound_title" id="0x7f1205ed" />
+    <public type="string" name="email" id="0x7f1205ee" />
+    <public type="string" name="email_invalid" id="0x7f1205ef" />
+    <public type="string" name="email_required" id="0x7f1205f0" />
+    <public type="string" name="email_verification_instructions_body" id="0x7f1205f1" />
+    <public type="string" name="email_verification_instructions_header" id="0x7f1205f2" />
+    <public type="string" name="embed_links" id="0x7f1205f3" />
+    <public type="string" name="emoji" id="0x7f1205f4" />
+    <public type="string" name="emoji_category_activity" id="0x7f1205f5" />
+    <public type="string" name="emoji_category_custom" id="0x7f1205f6" />
+    <public type="string" name="emoji_category_flags" id="0x7f1205f7" />
+    <public type="string" name="emoji_category_food" id="0x7f1205f8" />
+    <public type="string" name="emoji_category_nature" id="0x7f1205f9" />
+    <public type="string" name="emoji_category_objects" id="0x7f1205fa" />
+    <public type="string" name="emoji_category_people" id="0x7f1205fb" />
+    <public type="string" name="emoji_category_recent" id="0x7f1205fc" />
+    <public type="string" name="emoji_category_symbols" id="0x7f1205fd" />
+    <public type="string" name="emoji_category_travel" id="0x7f1205fe" />
+    <public type="string" name="emoji_disabled_premium_tier_lost" id="0x7f1205ff" />
+    <public type="string" name="emoji_from_guild" id="0x7f120600" />
+    <public type="string" name="emoji_keyboard_toggle" id="0x7f120601" />
+    <public type="string" name="emoji_matching" id="0x7f120602" />
+    <public type="string" name="emoji_modifier_dark_skin_tone" id="0x7f120603" />
+    <public type="string" name="emoji_modifier_light_skin_tone" id="0x7f120604" />
+    <public type="string" name="emoji_modifier_medium_dark_skin_tone" id="0x7f120605" />
+    <public type="string" name="emoji_modifier_medium_light_skin_tone" id="0x7f120606" />
+    <public type="string" name="emoji_modifier_medium_skin_tone" id="0x7f120607" />
+    <public type="string" name="emoji_modifier_none" id="0x7f120608" />
+    <public type="string" name="emoji_popout_current_guild_description" id="0x7f120609" />
+    <public type="string" name="emoji_popout_joined_guild_description" id="0x7f12060a" />
+    <public type="string" name="emoji_popout_joined_guild_emoji_description" id="0x7f12060b" />
+    <public type="string" name="emoji_popout_premium_cta" id="0x7f12060c" />
+    <public type="string" name="emoji_popout_premium_current_guild_description" id="0x7f12060d" />
+    <public type="string" name="emoji_popout_premium_joined_guild_description" id="0x7f12060e" />
+    <public type="string" name="emoji_popout_premium_unjoined_discoverable_guild_description" id="0x7f12060f" />
+    <public type="string" name="emoji_popout_premium_unjoined_private_guild_description" id="0x7f120610" />
+    <public type="string" name="emoji_popout_private_server" id="0x7f120611" />
+    <public type="string" name="emoji_popout_public_server" id="0x7f120612" />
+    <public type="string" name="emoji_popout_show_fewer" id="0x7f120613" />
+    <public type="string" name="emoji_popout_show_more_emojis" id="0x7f120614" />
+    <public type="string" name="emoji_popout_standard_emoji_description" id="0x7f120615" />
+    <public type="string" name="emoji_popout_unjoined_discoverable_guild_description" id="0x7f120616" />
+    <public type="string" name="emoji_popout_unjoined_guild_emoji_description" id="0x7f120617" />
+    <public type="string" name="emoji_popout_unjoined_private_guild_description" id="0x7f120618" />
+    <public type="string" name="emoji_section" id="0x7f120619" />
+    <public type="string" name="emoji_slots_available" id="0x7f12061a" />
+    <public type="string" name="emoji_too_big" id="0x7f12061b" />
+    <public type="string" name="emoji_tooltip_click_cta" id="0x7f12061c" />
+    <public type="string" name="emojis_title" id="0x7f12061d" />
+    <public type="string" name="en" id="0x7f12061e" />
+    <public type="string" name="en_gb" id="0x7f12061f" />
+    <public type="string" name="en_us" id="0x7f120620" />
+    <public type="string" name="enable" id="0x7f120621" />
+    <public type="string" name="enable_community_button_text" id="0x7f120622" />
+    <public type="string" name="enable_community_modal_content_filter_label" id="0x7f120623" />
+    <public type="string" name="enable_community_modal_content_filter_met" id="0x7f120624" />
+    <public type="string" name="enable_community_modal_default_notifications_label" id="0x7f120625" />
+    <public type="string" name="enable_community_modal_default_notifications_tooltip" id="0x7f120626" />
+    <public type="string" name="enable_community_modal_everyone_role_permission_label" id="0x7f120627" />
+    <public type="string" name="enable_community_modal_everyone_role_permission_tooltip" id="0x7f120628" />
+    <public type="string" name="enable_community_modal_requirement_satisfied_tooltip" id="0x7f120629" />
+    <public type="string" name="enable_community_modal_step_1_body" id="0x7f12062a" />
+    <public type="string" name="enable_community_modal_step_1_header" id="0x7f12062b" />
+    <public type="string" name="enable_community_modal_step_1_title" id="0x7f12062c" />
+    <public type="string" name="enable_community_modal_step_2_body" id="0x7f12062d" />
+    <public type="string" name="enable_community_modal_step_2_header" id="0x7f12062e" />
+    <public type="string" name="enable_community_modal_step_2_title" id="0x7f12062f" />
+    <public type="string" name="enable_community_modal_step_3_body" id="0x7f120630" />
+    <public type="string" name="enable_community_modal_step_3_header" id="0x7f120631" />
+    <public type="string" name="enable_community_modal_step_3_title" id="0x7f120632" />
+    <public type="string" name="enable_community_modal_step_header" id="0x7f120633" />
+    <public type="string" name="enable_community_modal_title" id="0x7f120634" />
+    <public type="string" name="enable_community_modal_verification_level_help" id="0x7f120635" />
+    <public type="string" name="enable_community_modal_verification_level_label" id="0x7f120636" />
+    <public type="string" name="enable_community_modal_verification_level_met" id="0x7f120637" />
+    <public type="string" name="enable_ingame_overlay" id="0x7f120638" />
+    <public type="string" name="enable_noise_cancellation" id="0x7f120639" />
+    <public type="string" name="enable_notifications" id="0x7f12063a" />
+    <public type="string" name="enable_permission" id="0x7f12063b" />
+    <public type="string" name="enable_privacy_access" id="0x7f12063c" />
+    <public type="string" name="enable_public_modal_content_filter_help" id="0x7f12063d" />
+    <public type="string" name="enable_public_modal_create_channel" id="0x7f12063e" />
+    <public type="string" name="enable_public_modal_rules_channel_help" id="0x7f12063f" />
+    <public type="string" name="enable_public_modal_rules_channel_title" id="0x7f120640" />
+    <public type="string" name="enable_public_modal_verification_level_description" id="0x7f120641" />
+    <public type="string" name="enable_streamer_mode_description" id="0x7f120642" />
+    <public type="string" name="enable_streamer_mode_label" id="0x7f120643" />
+    <public type="string" name="enable_twitch_emoji_sync" id="0x7f120644" />
+    <public type="string" name="enter_email_body" id="0x7f120645" />
+    <public type="string" name="enter_new_topic" id="0x7f120646" />
+    <public type="string" name="enter_phone_description" id="0x7f120647" />
+    <public type="string" name="enter_phone_description_note" id="0x7f120648" />
+    <public type="string" name="enter_phone_title" id="0x7f120649" />
+    <public type="string" name="error" id="0x7f12064a" />
+    <public type="string" name="error_copying_image" id="0x7f12064b" />
+    <public type="string" name="error_icon_content_description" id="0x7f12064c" />
+    <public type="string" name="error_saving_image" id="0x7f12064d" />
+    <public type="string" name="errors_action_to_take" id="0x7f12064e" />
+    <public type="string" name="errors_reload" id="0x7f12064f" />
+    <public type="string" name="errors_restart_app" id="0x7f120650" />
+    <public type="string" name="errors_store_crash" id="0x7f120651" />
+    <public type="string" name="errors_unexpected_crash" id="0x7f120652" />
+    <public type="string" name="es_es" id="0x7f120653" />
+    <public type="string" name="everyone_popout_body" id="0x7f120654" />
+    <public type="string" name="everyone_popout_enter" id="0x7f120655" />
+    <public type="string" name="everyone_popout_esc" id="0x7f120656" />
+    <public type="string" name="everyone_popout_footer" id="0x7f120657" />
+    <public type="string" name="everyone_popout_send_now" id="0x7f120658" />
+    <public type="string" name="examples" id="0x7f120659" />
+    <public type="string" name="exit_full_screen" id="0x7f12065a" />
+    <public type="string" name="exo_controls_fastforward_description" id="0x7f12065b" />
+    <public type="string" name="exo_controls_fullscreen_description" id="0x7f12065c" />
+    <public type="string" name="exo_controls_hide" id="0x7f12065d" />
+    <public type="string" name="exo_controls_next_description" id="0x7f12065e" />
+    <public type="string" name="exo_controls_pause_description" id="0x7f12065f" />
+    <public type="string" name="exo_controls_play_description" id="0x7f120660" />
+    <public type="string" name="exo_controls_previous_description" id="0x7f120661" />
+    <public type="string" name="exo_controls_repeat_all_description" id="0x7f120662" />
+    <public type="string" name="exo_controls_repeat_off_description" id="0x7f120663" />
+    <public type="string" name="exo_controls_repeat_one_description" id="0x7f120664" />
+    <public type="string" name="exo_controls_rewind_description" id="0x7f120665" />
+    <public type="string" name="exo_controls_show" id="0x7f120666" />
+    <public type="string" name="exo_controls_shuffle_off_description" id="0x7f120667" />
+    <public type="string" name="exo_controls_shuffle_on_description" id="0x7f120668" />
+    <public type="string" name="exo_controls_stop_description" id="0x7f120669" />
+    <public type="string" name="exo_controls_vr_description" id="0x7f12066a" />
+    <public type="string" name="exo_download_completed" id="0x7f12066b" />
+    <public type="string" name="exo_download_description" id="0x7f12066c" />
+    <public type="string" name="exo_download_downloading" id="0x7f12066d" />
+    <public type="string" name="exo_download_failed" id="0x7f12066e" />
+    <public type="string" name="exo_download_notification_channel_name" id="0x7f12066f" />
+    <public type="string" name="exo_download_removing" id="0x7f120670" />
+    <public type="string" name="exo_item_list" id="0x7f120671" />
+    <public type="string" name="exo_track_bitrate" id="0x7f120672" />
+    <public type="string" name="exo_track_mono" id="0x7f120673" />
+    <public type="string" name="exo_track_resolution" id="0x7f120674" />
+    <public type="string" name="exo_track_role_alternate" id="0x7f120675" />
+    <public type="string" name="exo_track_role_closed_captions" id="0x7f120676" />
+    <public type="string" name="exo_track_role_commentary" id="0x7f120677" />
+    <public type="string" name="exo_track_role_supplementary" id="0x7f120678" />
+    <public type="string" name="exo_track_selection_auto" id="0x7f120679" />
+    <public type="string" name="exo_track_selection_none" id="0x7f12067a" />
+    <public type="string" name="exo_track_selection_title_audio" id="0x7f12067b" />
+    <public type="string" name="exo_track_selection_title_text" id="0x7f12067c" />
+    <public type="string" name="exo_track_selection_title_video" id="0x7f12067d" />
+    <public type="string" name="exo_track_stereo" id="0x7f12067e" />
+    <public type="string" name="exo_track_surround" id="0x7f12067f" />
+    <public type="string" name="exo_track_surround_5_point_1" id="0x7f120680" />
+    <public type="string" name="exo_track_surround_7_point_1" id="0x7f120681" />
+    <public type="string" name="exo_track_unknown" id="0x7f120682" />
+    <public type="string" name="expand_button_title" id="0x7f120683" />
+    <public type="string" name="expand_buttons" id="0x7f120684" />
+    <public type="string" name="expanded" id="0x7f120685" />
+    <public type="string" name="experiment_mobile_only_user_header" id="0x7f120686" />
+    <public type="string" name="experiment_mobile_only_user_text1" id="0x7f120687" />
+    <public type="string" name="experimental_encoders" id="0x7f120688" />
+    <public type="string" name="expire_after" id="0x7f120689" />
+    <public type="string" name="expires_in" id="0x7f12068a" />
+    <public type="string" name="explicit_content_filter_disabled" id="0x7f12068b" />
+    <public type="string" name="explicit_content_filter_disabled_description" id="0x7f12068c" />
+    <public type="string" name="explicit_content_filter_high" id="0x7f12068d" />
+    <public type="string" name="explicit_content_filter_high_description" id="0x7f12068e" />
+    <public type="string" name="explicit_content_filter_medium" id="0x7f12068f" />
+    <public type="string" name="explicit_content_filter_medium_description" id="0x7f120690" />
+    <public type="string" name="exposed_dropdown_menu_content_description" id="0x7f120691" />
+    <public type="string" name="expression_picker_emoji" id="0x7f120692" />
+    <public type="string" name="expression_picker_gif" id="0x7f120693" />
+    <public type="string" name="expression_picker_intro_tooltip_action" id="0x7f120694" />
+    <public type="string" name="expression_picker_intro_tooltip_body" id="0x7f120695" />
+    <public type="string" name="expression_picker_intro_tooltip_header" id="0x7f120696" />
+    <public type="string" name="expression_picker_open_emoji_picker_a11y_label" id="0x7f120697" />
+    <public type="string" name="expression_picker_open_gif_picker_a11y_label" id="0x7f120698" />
+    <public type="string" name="extra_emoji_count" id="0x7f120699" />
+    <public type="string" name="fab_transformation_scrim_behavior" id="0x7f12069a" />
+    <public type="string" name="fab_transformation_sheet_behavior" id="0x7f12069b" />
+    <public type="string" name="facebook" id="0x7f12069c" />
+    <public type="string" name="failed" id="0x7f12069d" />
+    <public type="string" name="fallback_menu_item_copy_link" id="0x7f12069e" />
+    <public type="string" name="fallback_menu_item_open_in_browser" id="0x7f12069f" />
+    <public type="string" name="fallback_menu_item_share_link" id="0x7f1206a0" />
+    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7f1206a1" />
+    <public type="string" name="fi" id="0x7f1206a2" />
+    <public type="string" name="file_rate_kb" id="0x7f1206a3" />
+    <public type="string" name="file_rate_mb" id="0x7f1206a4" />
+    <public type="string" name="file_size_gb" id="0x7f1206a5" />
+    <public type="string" name="file_size_mb" id="0x7f1206a6" />
+    <public type="string" name="file_upload_limit_premium_tier_1" id="0x7f1206a7" />
+    <public type="string" name="file_upload_limit_premium_tier_2" id="0x7f1206a8" />
+    <public type="string" name="file_upload_limit_standard" id="0x7f1206a9" />
+    <public type="string" name="files_permission_reason" id="0x7f1206aa" />
+    <public type="string" name="filter" id="0x7f1206ab" />
+    <public type="string" name="filter_mentions" id="0x7f1206ac" />
+    <public type="string" name="filter_options" id="0x7f1206ad" />
+    <public type="string" name="firebase_database_url" id="0x7f1206ae" />
+    <public type="string" name="first_week_survey_button" id="0x7f1206af" />
+    <public type="string" name="first_week_survey_prompt" id="0x7f1206b0" />
+    <public type="string" name="flash_auto" id="0x7f1206b1" />
+    <public type="string" name="flash_off" id="0x7f1206b2" />
+    <public type="string" name="flash_on" id="0x7f1206b3" />
+    <public type="string" name="flash_torch" id="0x7f1206b4" />
+    <public type="string" name="focus_participant" id="0x7f1206b5" />
+    <public type="string" name="follow" id="0x7f1206b6" />
+    <public type="string" name="follow_modal_body" id="0x7f1206b7" />
+    <public type="string" name="follow_modal_fail" id="0x7f1206b8" />
+    <public type="string" name="follow_modal_hint" id="0x7f1206b9" />
+    <public type="string" name="follow_modal_hint_no_perms" id="0x7f1206ba" />
+    <public type="string" name="follow_modal_title" id="0x7f1206bb" />
+    <public type="string" name="follow_modal_too_many_webhooks" id="0x7f1206bc" />
+    <public type="string" name="follow_modal_warning" id="0x7f1206bd" />
+    <public type="string" name="follow_news_chat_input_message" id="0x7f1206be" />
+    <public type="string" name="follow_news_chat_input_subtitle" id="0x7f1206bf" />
+    <public type="string" name="follow_success_modal_body" id="0x7f1206c0" />
+    <public type="string" name="follow_success_modal_header_01" id="0x7f1206c1" />
+    <public type="string" name="follow_success_modal_header_02" id="0x7f1206c2" />
+    <public type="string" name="follow_success_modal_header_03" id="0x7f1206c3" />
+    <public type="string" name="follow_success_modal_header_04" id="0x7f1206c4" />
+    <public type="string" name="follow_success_modal_header_05" id="0x7f1206c5" />
+    <public type="string" name="follow_success_modal_header_06" id="0x7f1206c6" />
+    <public type="string" name="follow_success_modal_header_07" id="0x7f1206c7" />
+    <public type="string" name="follow_success_modal_header_08" id="0x7f1206c8" />
+    <public type="string" name="follow_success_modal_header_09" id="0x7f1206c9" />
+    <public type="string" name="follow_success_modal_header_10" id="0x7f1206ca" />
+    <public type="string" name="follow_us_for_more_updates" id="0x7f1206cb" />
+    <public type="string" name="follower_analytics" id="0x7f1206cc" />
+    <public type="string" name="follower_analytics_header" id="0x7f1206cd" />
+    <public type="string" name="force_sync" id="0x7f1206ce" />
+    <public type="string" name="forgot_password" id="0x7f1206cf" />
+    <public type="string" name="forgot_password_body" id="0x7f1206d0" />
+    <public type="string" name="form_checkbox_aec_dump" id="0x7f1206d1" />
+    <public type="string" name="form_checkbox_connection_log" id="0x7f1206d2" />
+    <public type="string" name="form_checkbox_debug_logging" id="0x7f1206d3" />
+    <public type="string" name="form_checkbox_qos" id="0x7f1206d4" />
+    <public type="string" name="form_description_audio_mode_android_call" id="0x7f1206d5" />
+    <public type="string" name="form_description_audio_mode_android_communication" id="0x7f1206d6" />
+    <public type="string" name="form_description_mobile_guild_notification_all_messages" id="0x7f1206d7" />
+    <public type="string" name="form_description_mobile_guild_notification_only_mentions" id="0x7f1206d8" />
+    <public type="string" name="form_description_mobile_notification_muted" id="0x7f1206d9" />
+    <public type="string" name="form_description_push_afk_timeout" id="0x7f1206da" />
+    <public type="string" name="form_description_tts" id="0x7f1206db" />
+    <public type="string" name="form_error_generic" id="0x7f1206dc" />
+    <public type="string" name="form_help_aec_dump" id="0x7f1206dd" />
+    <public type="string" name="form_help_afk_channel" id="0x7f1206de" />
+    <public type="string" name="form_help_attenuation" id="0x7f1206df" />
+    <public type="string" name="form_help_automatic_vad" id="0x7f1206e0" />
+    <public type="string" name="form_help_bitrate" id="0x7f1206e1" />
+    <public type="string" name="form_help_certified_voice_processing" id="0x7f1206e2" />
+    <public type="string" name="form_help_connection_log" id="0x7f1206e3" />
+    <public type="string" name="form_help_debug_logging" id="0x7f1206e4" />
+    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7f1206e5" />
+    <public type="string" name="form_help_discoverable_change_time" id="0x7f1206e6" />
+    <public type="string" name="form_help_discovery_cover_image" id="0x7f1206e7" />
+    <public type="string" name="form_help_enable_discoverable" id="0x7f1206e8" />
+    <public type="string" name="form_help_explicit_content_filter" id="0x7f1206e9" />
+    <public type="string" name="form_help_hardware_h264" id="0x7f1206ea" />
+    <public type="string" name="form_help_instant_invite_channel" id="0x7f1206eb" />
+    <public type="string" name="form_help_last_seen" id="0x7f1206ec" />
+    <public type="string" name="form_help_last_seen_with_roles" id="0x7f1206ed" />
+    <public type="string" name="form_help_news" id="0x7f1206ee" />
+    <public type="string" name="form_help_nsfw" id="0x7f1206ef" />
+    <public type="string" name="form_help_open_h264" id="0x7f1206f0" />
+    <public type="string" name="form_help_qos" id="0x7f1206f1" />
+    <public type="string" name="form_help_server_banner" id="0x7f1206f2" />
+    <public type="string" name="form_help_server_description" id="0x7f1206f3" />
+    <public type="string" name="form_help_server_language" id="0x7f1206f4" />
+    <public type="string" name="form_help_slowmode" id="0x7f1206f5" />
+    <public type="string" name="form_help_system_channel" id="0x7f1206f6" />
+    <public type="string" name="form_help_system_channel_join_messages" id="0x7f1206f7" />
+    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7f1206f8" />
+    <public type="string" name="form_help_temporary" id="0x7f1206f9" />
+    <public type="string" name="form_help_user_limit" id="0x7f1206fa" />
+    <public type="string" name="form_help_verification_level" id="0x7f1206fb" />
+    <public type="string" name="form_help_voice_video_troubleshooting_guide" id="0x7f1206fc" />
+    <public type="string" name="form_label_account_information" id="0x7f1206fd" />
+    <public type="string" name="form_label_afk_channel" id="0x7f1206fe" />
+    <public type="string" name="form_label_afk_timeout" id="0x7f1206ff" />
+    <public type="string" name="form_label_all" id="0x7f120700" />
+    <public type="string" name="form_label_all_messages" id="0x7f120701" />
+    <public type="string" name="form_label_all_messages_short" id="0x7f120702" />
+    <public type="string" name="form_label_android_opensl" id="0x7f120703" />
+    <public type="string" name="form_label_android_opensl_default" id="0x7f120704" />
+    <public type="string" name="form_label_android_opensl_default_desc" id="0x7f120705" />
+    <public type="string" name="form_label_android_opensl_desc" id="0x7f120706" />
+    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7f120707" />
+    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7f120708" />
+    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7f120709" />
+    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7f12070a" />
+    <public type="string" name="form_label_attenuation" id="0x7f12070b" />
+    <public type="string" name="form_label_audio_mode_android" id="0x7f12070c" />
+    <public type="string" name="form_label_audio_mode_android_call" id="0x7f12070d" />
+    <public type="string" name="form_label_audio_mode_android_communication" id="0x7f12070e" />
+    <public type="string" name="form_label_automatic_vad" id="0x7f12070f" />
+    <public type="string" name="form_label_automatic_vad_mobile" id="0x7f120710" />
+    <public type="string" name="form_label_avatar_size" id="0x7f120711" />
+    <public type="string" name="form_label_bitrate" id="0x7f120712" />
+    <public type="string" name="form_label_category_permissions" id="0x7f120713" />
+    <public type="string" name="form_label_channel_name" id="0x7f120714" />
+    <public type="string" name="form_label_channel_notifcation_settings" id="0x7f120715" />
+    <public type="string" name="form_label_channel_permissions" id="0x7f120716" />
+    <public type="string" name="form_label_channel_topic" id="0x7f120717" />
+    <public type="string" name="form_label_channel_voice_permissions" id="0x7f120718" />
+    <public type="string" name="form_label_current_password" id="0x7f120719" />
+    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7f12071a" />
+    <public type="string" name="form_label_debug" id="0x7f12071b" />
+    <public type="string" name="form_label_default" id="0x7f12071c" />
+    <public type="string" name="form_label_default_notification_settings" id="0x7f12071d" />
+    <public type="string" name="form_label_delete_message_history" id="0x7f12071e" />
+    <public type="string" name="form_label_desktop_only" id="0x7f12071f" />
+    <public type="string" name="form_label_disabled_for_everyone" id="0x7f120720" />
+    <public type="string" name="form_label_discovery_cover_image" id="0x7f120721" />
+    <public type="string" name="form_label_discovery_rules_channel" id="0x7f120722" />
+    <public type="string" name="form_label_display_names" id="0x7f120723" />
+    <public type="string" name="form_label_display_users" id="0x7f120724" />
+    <public type="string" name="form_label_email" id="0x7f120725" />
+    <public type="string" name="form_label_expire_grace_period" id="0x7f120726" />
+    <public type="string" name="form_label_explicit_content_filter" id="0x7f120727" />
+    <public type="string" name="form_label_hoist_description" id="0x7f120728" />
+    <public type="string" name="form_label_input" id="0x7f120729" />
+    <public type="string" name="form_label_input_device" id="0x7f12072a" />
+    <public type="string" name="form_label_input_mode" id="0x7f12072b" />
+    <public type="string" name="form_label_input_sensitivty" id="0x7f12072c" />
+    <public type="string" name="form_label_input_volume" id="0x7f12072d" />
+    <public type="string" name="form_label_instant_invite" id="0x7f12072e" />
+    <public type="string" name="form_label_instant_invite_channel" id="0x7f12072f" />
+    <public type="string" name="form_label_invite_link" id="0x7f120730" />
+    <public type="string" name="form_label_json_api" id="0x7f120731" />
+    <public type="string" name="form_label_last_seen" id="0x7f120732" />
+    <public type="string" name="form_label_max_age" id="0x7f120733" />
+    <public type="string" name="form_label_max_uses" id="0x7f120734" />
+    <public type="string" name="form_label_member_add" id="0x7f120735" />
+    <public type="string" name="form_label_membership_expire_behavior" id="0x7f120736" />
+    <public type="string" name="form_label_mentionable" id="0x7f120737" />
+    <public type="string" name="form_label_mentionable_description" id="0x7f120738" />
+    <public type="string" name="form_label_mentions" id="0x7f120739" />
+    <public type="string" name="form_label_mobile_category_muted" id="0x7f12073a" />
+    <public type="string" name="form_label_mobile_category_muted_until" id="0x7f12073b" />
+    <public type="string" name="form_label_mobile_channel_muted" id="0x7f12073c" />
+    <public type="string" name="form_label_mobile_channel_muted_until" id="0x7f12073d" />
+    <public type="string" name="form_label_mobile_channel_override_guild_message_notification" id="0x7f12073e" />
+    <public type="string" name="form_label_mobile_channel_override_guild_muted" id="0x7f12073f" />
+    <public type="string" name="form_label_mobile_channel_override_mute" id="0x7f120740" />
+    <public type="string" name="form_label_mobile_dm_muted" id="0x7f120741" />
+    <public type="string" name="form_label_mobile_dm_muted_until" id="0x7f120742" />
+    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7f120743" />
+    <public type="string" name="form_label_mobile_notifications_blink" id="0x7f120744" />
+    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7f120745" />
+    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7f120746" />
+    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7f120747" />
+    <public type="string" name="form_label_mobile_notifications_label" id="0x7f120748" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7f120749" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7f12074a" />
+    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7f12074b" />
+    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7f12074c" />
+    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7f12074d" />
+    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7f12074e" />
+    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7f12074f" />
+    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7f120750" />
+    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7f120751" />
+    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7f120752" />
+    <public type="string" name="form_label_mobile_push_notifications" id="0x7f120753" />
+    <public type="string" name="form_label_mobile_server_muted" id="0x7f120754" />
+    <public type="string" name="form_label_mobile_server_muted_until" id="0x7f120755" />
+    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7f120756" />
+    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7f120757" />
+    <public type="string" name="form_label_mute_server" id="0x7f120758" />
+    <public type="string" name="form_label_mute_server_description" id="0x7f120759" />
+    <public type="string" name="form_label_muted" id="0x7f12075a" />
+    <public type="string" name="form_label_new_password" id="0x7f12075b" />
+    <public type="string" name="form_label_news_channel" id="0x7f12075c" />
+    <public type="string" name="form_label_nothing" id="0x7f12075d" />
+    <public type="string" name="form_label_notification_frequency" id="0x7f12075e" />
+    <public type="string" name="form_label_notification_position" id="0x7f12075f" />
+    <public type="string" name="form_label_nsfw_channel" id="0x7f120760" />
+    <public type="string" name="form_label_off" id="0x7f120761" />
+    <public type="string" name="form_label_only_mentions" id="0x7f120762" />
+    <public type="string" name="form_label_only_mentions_short" id="0x7f120763" />
+    <public type="string" name="form_label_output" id="0x7f120764" />
+    <public type="string" name="form_label_output_device" id="0x7f120765" />
+    <public type="string" name="form_label_output_volume" id="0x7f120766" />
+    <public type="string" name="form_label_overlay_chat_opacity" id="0x7f120767" />
+    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7f120768" />
+    <public type="string" name="form_label_password" id="0x7f120769" />
+    <public type="string" name="form_label_premade_widget" id="0x7f12076a" />
+    <public type="string" name="form_label_push_afk_timeout" id="0x7f12076b" />
+    <public type="string" name="form_label_qos" id="0x7f12076c" />
+    <public type="string" name="form_label_reason_ban" id="0x7f12076d" />
+    <public type="string" name="form_label_reason_kick" id="0x7f12076e" />
+    <public type="string" name="form_label_report_reason" id="0x7f12076f" />
+    <public type="string" name="form_label_role_add" id="0x7f120770" />
+    <public type="string" name="form_label_role_color" id="0x7f120771" />
+    <public type="string" name="form_label_role_enter_name" id="0x7f120772" />
+    <public type="string" name="form_label_role_name" id="0x7f120773" />
+    <public type="string" name="form_label_role_settings" id="0x7f120774" />
+    <public type="string" name="form_label_roles_pro_tip" id="0x7f120775" />
+    <public type="string" name="form_label_roles_pro_tip_description" id="0x7f120776" />
+    <public type="string" name="form_label_select_channel" id="0x7f120777" />
+    <public type="string" name="form_label_send_to" id="0x7f120778" />
+    <public type="string" name="form_label_sensitivty" id="0x7f120779" />
+    <public type="string" name="form_label_server_banner" id="0x7f12077a" />
+    <public type="string" name="form_label_server_description" id="0x7f12077b" />
+    <public type="string" name="form_label_server_id" id="0x7f12077c" />
+    <public type="string" name="form_label_server_language" id="0x7f12077d" />
+    <public type="string" name="form_label_server_name" id="0x7f12077e" />
+    <public type="string" name="form_label_server_notification_settings" id="0x7f12077f" />
+    <public type="string" name="form_label_server_region" id="0x7f120780" />
+    <public type="string" name="form_label_shortcut" id="0x7f120781" />
+    <public type="string" name="form_label_slowmode" id="0x7f120782" />
+    <public type="string" name="form_label_slowmode_cooldown" id="0x7f120783" />
+    <public type="string" name="form_label_slowmode_off" id="0x7f120784" />
+    <public type="string" name="form_label_stream_volume" id="0x7f120785" />
+    <public type="string" name="form_label_sub_expire_behavior" id="0x7f120786" />
+    <public type="string" name="form_label_subsystem" id="0x7f120787" />
+    <public type="string" name="form_label_suppress_everyone" id="0x7f120788" />
+    <public type="string" name="form_label_suppress_roles" id="0x7f120789" />
+    <public type="string" name="form_label_synced_members" id="0x7f12078a" />
+    <public type="string" name="form_label_synced_role" id="0x7f12078b" />
+    <public type="string" name="form_label_synced_subs" id="0x7f12078c" />
+    <public type="string" name="form_label_system_channel" id="0x7f12078d" />
+    <public type="string" name="form_label_system_channel_settings" id="0x7f12078e" />
+    <public type="string" name="form_label_temporary" id="0x7f12078f" />
+    <public type="string" name="form_label_test_microphone" id="0x7f120790" />
+    <public type="string" name="form_label_tts" id="0x7f120791" />
+    <public type="string" name="form_label_tts_notifications" id="0x7f120792" />
+    <public type="string" name="form_label_unmute_server" id="0x7f120793" />
+    <public type="string" name="form_label_use_rich_chat_box" id="0x7f120794" />
+    <public type="string" name="form_label_user_limit" id="0x7f120795" />
+    <public type="string" name="form_label_username" id="0x7f120796" />
+    <public type="string" name="form_label_username_mobile" id="0x7f120797" />
+    <public type="string" name="form_label_verification_level" id="0x7f120798" />
+    <public type="string" name="form_label_video_device" id="0x7f120799" />
+    <public type="string" name="form_label_video_preview" id="0x7f12079a" />
+    <public type="string" name="form_label_voice_diagnostics" id="0x7f12079b" />
+    <public type="string" name="form_label_voice_processing" id="0x7f12079c" />
+    <public type="string" name="form_label_volume" id="0x7f12079d" />
+    <public type="string" name="form_placeholder_server_name" id="0x7f12079e" />
+    <public type="string" name="form_placeholder_username" id="0x7f12079f" />
+    <public type="string" name="form_report_help_text" id="0x7f1207a0" />
+    <public type="string" name="form_warning_input_sensitivty" id="0x7f1207a1" />
+    <public type="string" name="form_warning_video_preview" id="0x7f1207a2" />
+    <public type="string" name="fr" id="0x7f1207a3" />
+    <public type="string" name="friend_has_been_deleted" id="0x7f1207a4" />
+    <public type="string" name="friend_permitted_source" id="0x7f1207a5" />
+    <public type="string" name="friend_permitted_source_all" id="0x7f1207a6" />
+    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7f1207a7" />
+    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7f1207a8" />
+    <public type="string" name="friend_request_accept" id="0x7f1207a9" />
+    <public type="string" name="friend_request_cancel" id="0x7f1207aa" />
+    <public type="string" name="friend_request_cancelled" id="0x7f1207ab" />
+    <public type="string" name="friend_request_failed_header" id="0x7f1207ac" />
+    <public type="string" name="friend_request_ignore" id="0x7f1207ad" />
+    <public type="string" name="friend_request_ignored" id="0x7f1207ae" />
+    <public type="string" name="friend_request_rate_limited_body" id="0x7f1207af" />
+    <public type="string" name="friend_request_rate_limited_button" id="0x7f1207b0" />
+    <public type="string" name="friend_request_rate_limited_header" id="0x7f1207b1" />
+    <public type="string" name="friend_request_requires_email_validation_body" id="0x7f1207b2" />
+    <public type="string" name="friend_request_requires_email_validation_button" id="0x7f1207b3" />
+    <public type="string" name="friend_request_requires_email_validation_header" id="0x7f1207b4" />
+    <public type="string" name="friend_request_sent" id="0x7f1207b5" />
+    <public type="string" name="friends" id="0x7f1207b6" />
+    <public type="string" name="friends_all_header" id="0x7f1207b7" />
+    <public type="string" name="friends_blocked_header" id="0x7f1207b8" />
+    <public type="string" name="friends_column_name" id="0x7f1207b9" />
+    <public type="string" name="friends_column_status" id="0x7f1207ba" />
+    <public type="string" name="friends_empty_state_all" id="0x7f1207bb" />
+    <public type="string" name="friends_empty_state_all_body" id="0x7f1207bc" />
+    <public type="string" name="friends_empty_state_all_cta" id="0x7f1207bd" />
+    <public type="string" name="friends_empty_state_all_header" id="0x7f1207be" />
+    <public type="string" name="friends_empty_state_blocked" id="0x7f1207bf" />
+    <public type="string" name="friends_empty_state_copy" id="0x7f1207c0" />
+    <public type="string" name="friends_empty_state_online" id="0x7f1207c1" />
+    <public type="string" name="friends_empty_state_pending" id="0x7f1207c2" />
+    <public type="string" name="friends_empty_state_subtitle" id="0x7f1207c3" />
+    <public type="string" name="friends_offline_header" id="0x7f1207c4" />
+    <public type="string" name="friends_online_header" id="0x7f1207c5" />
+    <public type="string" name="friends_pending_header" id="0x7f1207c6" />
+    <public type="string" name="friends_pending_request_expand" id="0x7f1207c7" />
+    <public type="string" name="friends_pending_request_expand_collapse" id="0x7f1207c8" />
+    <public type="string" name="friends_pending_request_header" id="0x7f1207c9" />
+    <public type="string" name="friends_request_status_incoming" id="0x7f1207ca" />
+    <public type="string" name="friends_request_status_outgoing" id="0x7f1207cb" />
+    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7f1207cc" />
+    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7f1207cd" />
+    <public type="string" name="friends_row_action_button_accessibility_label_cancel" id="0x7f1207ce" />
+    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7f1207cf" />
+    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7f1207d0" />
+    <public type="string" name="friends_section_add_friend" id="0x7f1207d1" />
+    <public type="string" name="friends_section_all" id="0x7f1207d2" />
+    <public type="string" name="friends_section_online" id="0x7f1207d3" />
+    <public type="string" name="friends_section_pending" id="0x7f1207d4" />
+    <public type="string" name="friends_share" id="0x7f1207d5" />
+    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7f1207d6" />
+    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7f1207d7" />
+    <public type="string" name="friends_share_tabbar_title" id="0x7f1207d8" />
+    <public type="string" name="full" id="0x7f1207d9" />
+    <public type="string" name="full_screen" id="0x7f1207da" />
+    <public type="string" name="funimation_promotion_card_body_redeemed" id="0x7f1207db" />
+    <public type="string" name="funimation_promotion_card_body_unredeemed" id="0x7f1207dc" />
+    <public type="string" name="funimation_promotion_card_header" id="0x7f1207dd" />
+    <public type="string" name="game_action_button_add_to_library" id="0x7f1207de" />
+    <public type="string" name="game_action_button_cannot_install" id="0x7f1207df" />
+    <public type="string" name="game_action_button_downloading" id="0x7f1207e0" />
+    <public type="string" name="game_action_button_game_not_detected" id="0x7f1207e1" />
+    <public type="string" name="game_action_button_install" id="0x7f1207e2" />
+    <public type="string" name="game_action_button_locate" id="0x7f1207e3" />
+    <public type="string" name="game_action_button_login_to_buy" id="0x7f1207e4" />
+    <public type="string" name="game_action_button_now_playing" id="0x7f1207e5" />
+    <public type="string" name="game_action_button_paused" id="0x7f1207e6" />
+    <public type="string" name="game_action_button_play" id="0x7f1207e7" />
+    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7f1207e8" />
+    <public type="string" name="game_action_button_preorder_wait" id="0x7f1207e9" />
+    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7f1207ea" />
+    <public type="string" name="game_action_button_queued" id="0x7f1207eb" />
+    <public type="string" name="game_action_button_restricted_in_region" id="0x7f1207ec" />
+    <public type="string" name="game_action_button_unavailable" id="0x7f1207ed" />
+    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7f1207ee" />
+    <public type="string" name="game_action_button_uninstalling_1" id="0x7f1207ef" />
+    <public type="string" name="game_action_button_uninstalling_10" id="0x7f1207f0" />
+    <public type="string" name="game_action_button_uninstalling_2" id="0x7f1207f1" />
+    <public type="string" name="game_action_button_uninstalling_3" id="0x7f1207f2" />
+    <public type="string" name="game_action_button_uninstalling_4" id="0x7f1207f3" />
+    <public type="string" name="game_action_button_uninstalling_5" id="0x7f1207f4" />
+    <public type="string" name="game_action_button_uninstalling_6" id="0x7f1207f5" />
+    <public type="string" name="game_action_button_uninstalling_7" id="0x7f1207f6" />
+    <public type="string" name="game_action_button_uninstalling_8" id="0x7f1207f7" />
+    <public type="string" name="game_action_button_uninstalling_9" id="0x7f1207f8" />
+    <public type="string" name="game_action_button_update" id="0x7f1207f9" />
+    <public type="string" name="game_action_button_view_in_store" id="0x7f1207fa" />
+    <public type="string" name="game_activity" id="0x7f1207fb" />
+    <public type="string" name="game_detected" id="0x7f1207fc" />
+    <public type="string" name="game_detection_modal_info_android" id="0x7f1207fd" />
+    <public type="string" name="game_detection_open_settings" id="0x7f1207fe" />
+    <public type="string" name="game_detection_service" id="0x7f1207ff" />
+    <public type="string" name="game_feed_activity_action_play" id="0x7f120800" />
+    <public type="string" name="game_feed_activity_playing_xbox" id="0x7f120801" />
+    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7f120802" />
+    <public type="string" name="game_feed_current_header_title" id="0x7f120803" />
+    <public type="string" name="game_feed_unknown_player" id="0x7f120804" />
+    <public type="string" name="game_feed_user_played_days_ago" id="0x7f120805" />
+    <public type="string" name="game_feed_user_played_hours_ago" id="0x7f120806" />
+    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7f120807" />
+    <public type="string" name="game_feed_user_played_months_ago" id="0x7f120808" />
+    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7f120809" />
+    <public type="string" name="game_feed_user_played_years_ago" id="0x7f12080a" />
+    <public type="string" name="game_feed_user_playing_for_days" id="0x7f12080b" />
+    <public type="string" name="game_feed_user_playing_for_hours" id="0x7f12080c" />
+    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7f12080d" />
+    <public type="string" name="game_feed_user_playing_just_ended" id="0x7f12080e" />
+    <public type="string" name="game_feed_user_playing_just_started" id="0x7f12080f" />
+    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7f120810" />
+    <public type="string" name="game_library_last_played_days" id="0x7f120811" />
+    <public type="string" name="game_library_last_played_hours" id="0x7f120812" />
+    <public type="string" name="game_library_last_played_just_now" id="0x7f120813" />
+    <public type="string" name="game_library_last_played_minutes" id="0x7f120814" />
+    <public type="string" name="game_library_last_played_months" id="0x7f120815" />
+    <public type="string" name="game_library_last_played_none" id="0x7f120816" />
+    <public type="string" name="game_library_last_played_playing_now" id="0x7f120817" />
+    <public type="string" name="game_library_last_played_weeks" id="0x7f120818" />
+    <public type="string" name="game_library_last_played_years" id="0x7f120819" />
+    <public type="string" name="game_library_list_header_last_played" id="0x7f12081a" />
+    <public type="string" name="game_library_list_header_name" id="0x7f12081b" />
+    <public type="string" name="game_library_list_header_platform" id="0x7f12081c" />
+    <public type="string" name="game_library_new" id="0x7f12081d" />
+    <public type="string" name="game_library_not_applicable" id="0x7f12081e" />
+    <public type="string" name="game_library_notification_game_installed_body" id="0x7f12081f" />
+    <public type="string" name="game_library_notification_game_installed_title" id="0x7f120820" />
+    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7f120821" />
+    <public type="string" name="game_library_private_tooltip" id="0x7f120822" />
+    <public type="string" name="game_library_time_played_hours" id="0x7f120823" />
+    <public type="string" name="game_library_time_played_minutes" id="0x7f120824" />
+    <public type="string" name="game_library_time_played_none" id="0x7f120825" />
+    <public type="string" name="game_library_time_played_seconds" id="0x7f120826" />
+    <public type="string" name="game_library_updates_action_move_up" id="0x7f120827" />
+    <public type="string" name="game_library_updates_action_pause" id="0x7f120828" />
+    <public type="string" name="game_library_updates_action_remove" id="0x7f120829" />
+    <public type="string" name="game_library_updates_action_resume" id="0x7f12082a" />
+    <public type="string" name="game_library_updates_header_disk" id="0x7f12082b" />
+    <public type="string" name="game_library_updates_header_network" id="0x7f12082c" />
+    <public type="string" name="game_library_updates_installing" id="0x7f12082d" />
+    <public type="string" name="game_library_updates_installing_hours" id="0x7f12082e" />
+    <public type="string" name="game_library_updates_installing_minutes" id="0x7f12082f" />
+    <public type="string" name="game_library_updates_installing_seconds" id="0x7f120830" />
+    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7f120831" />
+    <public type="string" name="game_library_updates_progress_finalizing" id="0x7f120832" />
+    <public type="string" name="game_library_updates_progress_finished" id="0x7f120833" />
+    <public type="string" name="game_library_updates_progress_paused" id="0x7f120834" />
+    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7f120835" />
+    <public type="string" name="game_library_updates_progress_pausing" id="0x7f120836" />
+    <public type="string" name="game_library_updates_progress_planning" id="0x7f120837" />
+    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7f120838" />
+    <public type="string" name="game_library_updates_progress_queued" id="0x7f120839" />
+    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7f12083a" />
+    <public type="string" name="game_library_updates_progress_repairing" id="0x7f12083b" />
+    <public type="string" name="game_library_updates_progress_verifying" id="0x7f12083c" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7f12083d" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7f12083e" />
+    <public type="string" name="game_library_updates_updating" id="0x7f12083f" />
+    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7f120840" />
+    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7f120841" />
+    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7f120842" />
+    <public type="string" name="game_popout_follow" id="0x7f120843" />
+    <public type="string" name="game_popout_nitro_upsell" id="0x7f120844" />
+    <public type="string" name="game_popout_view_server" id="0x7f120845" />
+    <public type="string" name="gcm_defaultSenderId" id="0x7f120846" />
+    <public type="string" name="general_permissions" id="0x7f120847" />
+    <public type="string" name="generate_a_new_link" id="0x7f120848" />
+    <public type="string" name="generic_actions_menu_label" id="0x7f120849" />
+    <public type="string" name="get_started" id="0x7f12084a" />
+    <public type="string" name="gif" id="0x7f12084b" />
+    <public type="string" name="gif_auto_play_label" id="0x7f12084c" />
+    <public type="string" name="gif_auto_play_label_mobile" id="0x7f12084d" />
+    <public type="string" name="gif_button_label" id="0x7f12084e" />
+    <public type="string" name="gif_picker_enter_search" id="0x7f12084f" />
+    <public type="string" name="gif_picker_favorites" id="0x7f120850" />
+    <public type="string" name="gif_picker_related_search" id="0x7f120851" />
+    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7f120852" />
+    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7f120853" />
+    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7f120854" />
+    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7f120855" />
+    <public type="string" name="gift_code_auth_accept" id="0x7f120856" />
+    <public type="string" name="gift_code_auth_accepting" id="0x7f120857" />
+    <public type="string" name="gift_code_auth_check_verification_again" id="0x7f120858" />
+    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7f120859" />
+    <public type="string" name="gift_code_auth_fetching_user" id="0x7f12085a" />
+    <public type="string" name="gift_code_auth_gifted" id="0x7f12085b" />
+    <public type="string" name="gift_code_auth_gifted_by" id="0x7f12085c" />
+    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7f12085d" />
+    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7f12085e" />
+    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7f12085f" />
+    <public type="string" name="gift_code_auth_help_text_owned" id="0x7f120860" />
+    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7f120861" />
+    <public type="string" name="gift_code_auth_invalid_body" id="0x7f120862" />
+    <public type="string" name="gift_code_auth_invalid_tip" id="0x7f120863" />
+    <public type="string" name="gift_code_auth_invalid_title" id="0x7f120864" />
+    <public type="string" name="gift_code_auth_logged_in_as" id="0x7f120865" />
+    <public type="string" name="gift_code_auth_resolving" id="0x7f120866" />
+    <public type="string" name="gift_code_auth_verification_sent" id="0x7f120867" />
+    <public type="string" name="gift_code_auth_verification_title" id="0x7f120868" />
+    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7f120869" />
+    <public type="string" name="gift_code_hint" id="0x7f12086a" />
+    <public type="string" name="gift_confirmation_body_claimed" id="0x7f12086b" />
+    <public type="string" name="gift_confirmation_body_confirm" id="0x7f12086c" />
+    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7f12086d" />
+    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7f12086e" />
+    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7f12086f" />
+    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7f120870" />
+    <public type="string" name="gift_confirmation_body_invalid" id="0x7f120871" />
+    <public type="string" name="gift_confirmation_body_owned" id="0x7f120872" />
+    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7f120873" />
+    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7f120874" />
+    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7f120875" />
+    <public type="string" name="gift_confirmation_body_success" id="0x7f120876" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7f120877" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7f120878" />
+    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7f120879" />
+    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7f12087a" />
+    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7f12087b" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7f12087c" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7f12087d" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7f12087e" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7f12087f" />
+    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7f120880" />
+    <public type="string" name="gift_confirmation_button_confirm" id="0x7f120881" />
+    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7f120882" />
+    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7f120883" />
+    <public type="string" name="gift_confirmation_button_fail" id="0x7f120884" />
+    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7f120885" />
+    <public type="string" name="gift_confirmation_button_noice" id="0x7f120886" />
+    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7f120887" />
+    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7f120888" />
+    <public type="string" name="gift_confirmation_header_confirm" id="0x7f120889" />
+    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7f12088a" />
+    <public type="string" name="gift_confirmation_header_fail" id="0x7f12088b" />
+    <public type="string" name="gift_confirmation_header_success" id="0x7f12088c" />
+    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7f12088d" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7f12088e" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7f12088f" />
+    <public type="string" name="gift_embed_body_claimed_other" id="0x7f120890" />
+    <public type="string" name="gift_embed_body_claimed_self" id="0x7f120891" />
+    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7f120892" />
+    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7f120893" />
+    <public type="string" name="gift_embed_body_default" id="0x7f120894" />
+    <public type="string" name="gift_embed_body_giveaway" id="0x7f120895" />
+    <public type="string" name="gift_embed_body_no_user_default" id="0x7f120896" />
+    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7f120897" />
+    <public type="string" name="gift_embed_body_owned" id="0x7f120898" />
+    <public type="string" name="gift_embed_body_owned_mobile" id="0x7f120899" />
+    <public type="string" name="gift_embed_body_requires_verification" id="0x7f12089a" />
+    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7f12089b" />
+    <public type="string" name="gift_embed_body_self" id="0x7f12089c" />
+    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7f12089d" />
+    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7f12089e" />
+    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7f12089f" />
+    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7f1208a0" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7f1208a1" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7f1208a2" />
+    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7f1208a3" />
+    <public type="string" name="gift_embed_button_accept" id="0x7f1208a4" />
+    <public type="string" name="gift_embed_button_cant_accept" id="0x7f1208a5" />
+    <public type="string" name="gift_embed_button_claimed" id="0x7f1208a6" />
+    <public type="string" name="gift_embed_button_claiming" id="0x7f1208a7" />
+    <public type="string" name="gift_embed_button_owned" id="0x7f1208a8" />
+    <public type="string" name="gift_embed_copies_left" id="0x7f1208a9" />
+    <public type="string" name="gift_embed_expiration" id="0x7f1208aa" />
+    <public type="string" name="gift_embed_header_owner_invalid" id="0x7f1208ab" />
+    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7f1208ac" />
+    <public type="string" name="gift_embed_info_owner_invalid" id="0x7f1208ad" />
+    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7f1208ae" />
+    <public type="string" name="gift_embed_invalid" id="0x7f1208af" />
+    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7f1208b0" />
+    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7f1208b1" />
+    <public type="string" name="gift_embed_invalid_title_other" id="0x7f1208b2" />
+    <public type="string" name="gift_embed_invalid_title_self" id="0x7f1208b3" />
+    <public type="string" name="gift_embed_resolving" id="0x7f1208b4" />
+    <public type="string" name="gift_embed_subscriptions_left" id="0x7f1208b5" />
+    <public type="string" name="gift_embed_title" id="0x7f1208b6" />
+    <public type="string" name="gift_embed_title_self" id="0x7f1208b7" />
+    <public type="string" name="gift_embed_title_subscription" id="0x7f1208b8" />
+    <public type="string" name="gift_embed_title_subscription_self" id="0x7f1208b9" />
+    <public type="string" name="gift_inventory" id="0x7f1208ba" />
+    <public type="string" name="gift_inventory_copies" id="0x7f1208bb" />
+    <public type="string" name="gift_inventory_expires_in" id="0x7f1208bc" />
+    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7f1208bd" />
+    <public type="string" name="gift_inventory_generate_help" id="0x7f1208be" />
+    <public type="string" name="gift_inventory_generate_link" id="0x7f1208bf" />
+    <public type="string" name="gift_inventory_generate_link_ios" id="0x7f1208c0" />
+    <public type="string" name="gift_inventory_gifts_you_purchased" id="0x7f1208c1" />
+    <public type="string" name="gift_inventory_hidden" id="0x7f1208c2" />
+    <public type="string" name="gift_inventory_no_gifts" id="0x7f1208c3" />
+    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7f1208c4" />
+    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7f1208c5" />
+    <public type="string" name="gift_inventory_redeem_codes" id="0x7f1208c6" />
+    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7f1208c7" />
+    <public type="string" name="gift_inventory_subscription_months" id="0x7f1208c8" />
+    <public type="string" name="gift_inventory_subscription_years" id="0x7f1208c9" />
+    <public type="string" name="gift_inventory_your_gifts" id="0x7f1208ca" />
+    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7f1208cb" />
+    <public type="string" name="go_live_hey" id="0x7f1208cc" />
+    <public type="string" name="go_live_listen" id="0x7f1208cd" />
+    <public type="string" name="go_live_look" id="0x7f1208ce" />
+    <public type="string" name="go_live_modal_application_form_title" id="0x7f1208cf" />
+    <public type="string" name="go_live_modal_applications" id="0x7f1208d0" />
+    <public type="string" name="go_live_modal_cta" id="0x7f1208d1" />
+    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7f1208d2" />
+    <public type="string" name="go_live_modal_description" id="0x7f1208d3" />
+    <public type="string" name="go_live_modal_description_generic" id="0x7f1208d4" />
+    <public type="string" name="go_live_modal_description_select_source" id="0x7f1208d5" />
+    <public type="string" name="go_live_modal_guild_form_title" id="0x7f1208d6" />
+    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7f1208d7" />
+    <public type="string" name="go_live_modal_overflow_three_users" id="0x7f1208d8" />
+    <public type="string" name="go_live_modal_overflow_two_users" id="0x7f1208d9" />
+    <public type="string" name="go_live_modal_screens" id="0x7f1208da" />
+    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7f1208db" />
+    <public type="string" name="go_live_modal_select_guild_form_title" id="0x7f1208dc" />
+    <public type="string" name="go_live_modal_title" id="0x7f1208dd" />
+    <public type="string" name="go_live_private_channels_tooltip_body" id="0x7f1208de" />
+    <public type="string" name="go_live_private_channels_tooltip_body_no_format" id="0x7f1208df" />
+    <public type="string" name="go_live_private_channels_tooltip_cta" id="0x7f1208e0" />
+    <public type="string" name="go_live_screenshare_no_sound" id="0x7f1208e1" />
+    <public type="string" name="go_live_screenshare_update_for_soundshare" id="0x7f1208e2" />
+    <public type="string" name="go_live_share_screen" id="0x7f1208e3" />
+    <public type="string" name="go_live_tile_screen" id="0x7f1208e4" />
+    <public type="string" name="go_live_user_playing" id="0x7f1208e5" />
+    <public type="string" name="go_live_video_drivers_outdated" id="0x7f1208e6" />
+    <public type="string" name="go_live_viewers_action_sheet_not_spectating" id="0x7f1208e7" />
+    <public type="string" name="go_live_viewers_action_sheet_spectating" id="0x7f1208e8" />
+    <public type="string" name="go_live_viewers_action_sheet_streaming" id="0x7f1208e9" />
+    <public type="string" name="go_live_watching_user" id="0x7f1208ea" />
+    <public type="string" name="google_api_key" id="0x7f1208eb" />
+    <public type="string" name="google_app_id" id="0x7f1208ec" />
+    <public type="string" name="google_crash_reporting_api_key" id="0x7f1208ed" />
+    <public type="string" name="google_storage_bucket" id="0x7f1208ee" />
+    <public type="string" name="grant_temporary_membership" id="0x7f1208ef" />
+    <public type="string" name="green" id="0x7f1208f0" />
+    <public type="string" name="grey" id="0x7f1208f1" />
+    <public type="string" name="group_dm" id="0x7f1208f2" />
+    <public type="string" name="group_dm_add_friends" id="0x7f1208f3" />
+    <public type="string" name="group_dm_header" id="0x7f1208f4" />
+    <public type="string" name="group_dm_invite_confirm" id="0x7f1208f5" />
+    <public type="string" name="group_dm_invite_confirm_button" id="0x7f1208f6" />
+    <public type="string" name="group_dm_invite_confirm_description" id="0x7f1208f7" />
+    <public type="string" name="group_dm_invite_empty" id="0x7f1208f8" />
+    <public type="string" name="group_dm_invite_full_main" id="0x7f1208f9" />
+    <public type="string" name="group_dm_invite_full_sub" id="0x7f1208fa" />
+    <public type="string" name="group_dm_invite_full_sub2" id="0x7f1208fb" />
+    <public type="string" name="group_dm_invite_link_create" id="0x7f1208fc" />
+    <public type="string" name="group_dm_invite_link_example" id="0x7f1208fd" />
+    <public type="string" name="group_dm_invite_link_title" id="0x7f1208fe" />
+    <public type="string" name="group_dm_invite_no_friends" id="0x7f1208ff" />
+    <public type="string" name="group_dm_invite_not_friends" id="0x7f120900" />
+    <public type="string" name="group_dm_invite_remaining" id="0x7f120901" />
+    <public type="string" name="group_dm_invite_select_existing" id="0x7f120902" />
+    <public type="string" name="group_dm_invite_to" id="0x7f120903" />
+    <public type="string" name="group_dm_invite_unselect_users" id="0x7f120904" />
+    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7f120905" />
+    <public type="string" name="group_dm_invite_with_name" id="0x7f120906" />
+    <public type="string" name="group_dm_search_placeholder" id="0x7f120907" />
+    <public type="string" name="group_dm_settings" id="0x7f120908" />
+    <public type="string" name="group_message_a11y_label" id="0x7f120909" />
+    <public type="string" name="group_message_a11y_label_with_unreads" id="0x7f12090a" />
+    <public type="string" name="group_name" id="0x7f12090b" />
+    <public type="string" name="group_owner" id="0x7f12090c" />
+    <public type="string" name="groups" id="0x7f12090d" />
+    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7f12090e" />
+    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7f12090f" />
+    <public type="string" name="guild_actions_menu_label" id="0x7f120910" />
+    <public type="string" name="guild_analyics_developers_button" id="0x7f120911" />
+    <public type="string" name="guild_analytics_description" id="0x7f120912" />
+    <public type="string" name="guild_analytics_developers_cta" id="0x7f120913" />
+    <public type="string" name="guild_analytics_error_guild_size" id="0x7f120914" />
+    <public type="string" name="guild_analytics_error_message" id="0x7f120915" />
+    <public type="string" name="guild_analytics_metrics_last_week" id="0x7f120916" />
+    <public type="string" name="guild_create_description" id="0x7f120917" />
+    <public type="string" name="guild_create_title" id="0x7f120918" />
+    <public type="string" name="guild_create_upload_icon_button_text" id="0x7f120919" />
+    <public type="string" name="guild_create_upload_icon_label" id="0x7f12091a" />
+    <public type="string" name="guild_create_upload_icon_recommended_size_label" id="0x7f12091b" />
+    <public type="string" name="guild_discovery_all_category_filter" id="0x7f12091c" />
+    <public type="string" name="guild_discovery_category_footer_title" id="0x7f12091d" />
+    <public type="string" name="guild_discovery_category_search_placeholder" id="0x7f12091e" />
+    <public type="string" name="guild_discovery_category_title" id="0x7f12091f" />
+    <public type="string" name="guild_discovery_covid_body" id="0x7f120920" />
+    <public type="string" name="guild_discovery_covid_button" id="0x7f120921" />
+    <public type="string" name="guild_discovery_covid_title" id="0x7f120922" />
+    <public type="string" name="guild_discovery_emojis_tooltip" id="0x7f120923" />
+    <public type="string" name="guild_discovery_featured_header" id="0x7f120924" />
+    <public type="string" name="guild_discovery_footer_body" id="0x7f120925" />
+    <public type="string" name="guild_discovery_header_games_you_play" id="0x7f120926" />
+    <public type="string" name="guild_discovery_header_popular_guilds" id="0x7f120927" />
+    <public type="string" name="guild_discovery_header_search_results" id="0x7f120928" />
+    <public type="string" name="guild_discovery_home_subtitle" id="0x7f120929" />
+    <public type="string" name="guild_discovery_home_title" id="0x7f12092a" />
+    <public type="string" name="guild_discovery_popular_header" id="0x7f12092b" />
+    <public type="string" name="guild_discovery_search_empty_body" id="0x7f12092c" />
+    <public type="string" name="guild_discovery_search_empty_category_body" id="0x7f12092d" />
+    <public type="string" name="guild_discovery_search_empty_category_header" id="0x7f12092e" />
+    <public type="string" name="guild_discovery_search_empty_description" id="0x7f12092f" />
+    <public type="string" name="guild_discovery_search_empty_header" id="0x7f120930" />
+    <public type="string" name="guild_discovery_search_empty_title" id="0x7f120931" />
+    <public type="string" name="guild_discovery_search_enter_cta" id="0x7f120932" />
+    <public type="string" name="guild_discovery_search_error" id="0x7f120933" />
+    <public type="string" name="guild_discovery_search_header" id="0x7f120934" />
+    <public type="string" name="guild_discovery_search_label" id="0x7f120935" />
+    <public type="string" name="guild_discovery_search_placeholder" id="0x7f120936" />
+    <public type="string" name="guild_discovery_search_press_enter" id="0x7f120937" />
+    <public type="string" name="guild_discovery_search_results_category_header" id="0x7f120938" />
+    <public type="string" name="guild_discovery_search_results_header" id="0x7f120939" />
+    <public type="string" name="guild_discovery_tooltip" id="0x7f12093a" />
+    <public type="string" name="guild_discovery_view_button" id="0x7f12093b" />
+    <public type="string" name="guild_folder_color" id="0x7f12093c" />
+    <public type="string" name="guild_folder_name" id="0x7f12093d" />
+    <public type="string" name="guild_folder_tooltip_a11y_label" id="0x7f12093e" />
+    <public type="string" name="guild_members_header" id="0x7f12093f" />
+    <public type="string" name="guild_members_search_no_result" id="0x7f120940" />
+    <public type="string" name="guild_owner" id="0x7f120941" />
+    <public type="string" name="guild_partner_application_category_description" id="0x7f120942" />
+    <public type="string" name="guild_partner_application_category_label" id="0x7f120943" />
+    <public type="string" name="guild_partner_application_connect" id="0x7f120944" />
+    <public type="string" name="guild_partner_application_content_platform" id="0x7f120945" />
+    <public type="string" name="guild_partner_application_country" id="0x7f120946" />
+    <public type="string" name="guild_partner_application_creator_connect" id="0x7f120947" />
+    <public type="string" name="guild_partner_application_creator_must_connect_primary" id="0x7f120948" />
+    <public type="string" name="guild_partner_application_description_description" id="0x7f120949" />
+    <public type="string" name="guild_partner_application_description_title" id="0x7f12094a" />
+    <public type="string" name="guild_partner_application_first_name" id="0x7f12094b" />
+    <public type="string" name="guild_partner_application_has_errors" id="0x7f12094c" />
+    <public type="string" name="guild_partner_application_language" id="0x7f12094d" />
+    <public type="string" name="guild_partner_application_last_name" id="0x7f12094e" />
+    <public type="string" name="guild_partner_application_other_platform" id="0x7f12094f" />
+    <public type="string" name="guild_partner_application_other_platform_description" id="0x7f120950" />
+    <public type="string" name="guild_partner_application_other_platform_optional" id="0x7f120951" />
+    <public type="string" name="guild_partner_application_server_step" id="0x7f120952" />
+    <public type="string" name="guild_partner_application_server_step_description" id="0x7f120953" />
+    <public type="string" name="guild_partner_application_server_step_title" id="0x7f120954" />
+    <public type="string" name="guild_partner_application_subcategory_description" id="0x7f120955" />
+    <public type="string" name="guild_partner_application_submit_step" id="0x7f120956" />
+    <public type="string" name="guild_partner_application_submit_step_description" id="0x7f120957" />
+    <public type="string" name="guild_partner_application_submit_step_description_2" id="0x7f120958" />
+    <public type="string" name="guild_partner_application_submit_step_title" id="0x7f120959" />
+    <public type="string" name="guild_partner_application_survey_community_team_access" id="0x7f12095a" />
+    <public type="string" name="guild_partner_application_survey_description" id="0x7f12095b" />
+    <public type="string" name="guild_partner_application_survey_description_other" id="0x7f12095c" />
+    <public type="string" name="guild_partner_application_survey_early_access_to_features" id="0x7f12095d" />
+    <public type="string" name="guild_partner_application_survey_new_ideas_suggestions" id="0x7f12095e" />
+    <public type="string" name="guild_partner_application_survey_other" id="0x7f12095f" />
+    <public type="string" name="guild_partner_application_survey_talk_with_other_partners" id="0x7f120960" />
+    <public type="string" name="guild_partner_application_survey_title" id="0x7f120961" />
+    <public type="string" name="guild_partner_application_title" id="0x7f120962" />
+    <public type="string" name="guild_partner_application_type" id="0x7f120963" />
+    <public type="string" name="guild_partner_application_type_brand" id="0x7f120964" />
+    <public type="string" name="guild_partner_application_type_content" id="0x7f120965" />
+    <public type="string" name="guild_partner_application_type_fan" id="0x7f120966" />
+    <public type="string" name="guild_partner_application_type_other" id="0x7f120967" />
+    <public type="string" name="guild_partner_application_type_software" id="0x7f120968" />
+    <public type="string" name="guild_partner_application_user_step" id="0x7f120969" />
+    <public type="string" name="guild_partner_application_user_step_description" id="0x7f12096a" />
+    <public type="string" name="guild_partner_application_user_step_description_content_creator" id="0x7f12096b" />
+    <public type="string" name="guild_partner_application_user_step_title" id="0x7f12096c" />
+    <public type="string" name="guild_partner_application_website" id="0x7f12096d" />
+    <public type="string" name="guild_partner_application_why_you_description" id="0x7f12096e" />
+    <public type="string" name="guild_partner_application_why_you_title" id="0x7f12096f" />
+    <public type="string" name="guild_partnered" id="0x7f120970" />
+    <public type="string" name="guild_popout_unavailable_flavor" id="0x7f120971" />
+    <public type="string" name="guild_popout_unavailable_header" id="0x7f120972" />
+    <public type="string" name="guild_popout_view_server_button" id="0x7f120973" />
+    <public type="string" name="guild_premium" id="0x7f120974" />
+    <public type="string" name="guild_profile_join_server_button" id="0x7f120975" />
+    <public type="string" name="guild_role_actions_menu_label" id="0x7f120976" />
+    <public type="string" name="guild_security_req_mfa_body" id="0x7f120977" />
+    <public type="string" name="guild_security_req_mfa_enable" id="0x7f120978" />
+    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7f120979" />
+    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7f12097a" />
+    <public type="string" name="guild_security_req_mfa_label" id="0x7f12097b" />
+    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7f12097c" />
+    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7f12097d" />
+    <public type="string" name="guild_security_req_owner_only" id="0x7f12097e" />
+    <public type="string" name="guild_select" id="0x7f12097f" />
+    <public type="string" name="guild_settings_action_filter_bot_add" id="0x7f120980" />
+    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7f120981" />
+    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7f120982" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7f120983" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7f120984" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7f120985" />
+    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7f120986" />
+    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7f120987" />
+    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7f120988" />
+    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7f120989" />
+    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7f12098a" />
+    <public type="string" name="guild_settings_action_filter_integration_create" id="0x7f12098b" />
+    <public type="string" name="guild_settings_action_filter_integration_delete" id="0x7f12098c" />
+    <public type="string" name="guild_settings_action_filter_integration_update" id="0x7f12098d" />
+    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7f12098e" />
+    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7f12098f" />
+    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7f120990" />
+    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7f120991" />
+    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7f120992" />
+    <public type="string" name="guild_settings_action_filter_member_disconnect" id="0x7f120993" />
+    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7f120994" />
+    <public type="string" name="guild_settings_action_filter_member_move" id="0x7f120995" />
+    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7f120996" />
+    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7f120997" />
+    <public type="string" name="guild_settings_action_filter_member_update" id="0x7f120998" />
+    <public type="string" name="guild_settings_action_filter_message_bulk_delete" id="0x7f120999" />
+    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7f12099a" />
+    <public type="string" name="guild_settings_action_filter_message_pin" id="0x7f12099b" />
+    <public type="string" name="guild_settings_action_filter_message_unpin" id="0x7f12099c" />
+    <public type="string" name="guild_settings_action_filter_role_create" id="0x7f12099d" />
+    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7f12099e" />
+    <public type="string" name="guild_settings_action_filter_role_update" id="0x7f12099f" />
+    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7f1209a0" />
+    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7f1209a1" />
+    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7f1209a2" />
+    <public type="string" name="guild_settings_audit_log_bot_add" id="0x7f1209a3" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7f1209a4" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7f1209a5" />
+    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7f1209a6" />
+    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7f1209a7" />
+    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7f1209a8" />
+    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7f1209a9" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7f1209aa" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7f1209ab" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7f1209ac" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7f1209ad" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7f1209ae" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7f1209af" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7f1209b0" />
+    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7f1209b1" />
+    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7f1209b2" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7f1209b3" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7f1209b4" />
+    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7f1209b5" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7f1209b6" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7f1209b7" />
+    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7f1209b8" />
+    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7f1209b9" />
+    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7f1209ba" />
+    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7f1209bb" />
+    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7f1209bc" />
+    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7f1209bd" />
+    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7f1209be" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7f1209bf" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7f1209c0" />
+    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7f1209c1" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7f1209c2" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7f1209c3" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7f1209c4" />
+    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7f1209c5" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7f1209c6" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7f1209c7" />
+    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7f1209c8" />
+    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7f1209c9" />
+    <public type="string" name="guild_settings_audit_log_guild_discovery_splash_hash_change" id="0x7f1209ca" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7f1209cb" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7f1209cc" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7f1209cd" />
+    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7f1209ce" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7f1209cf" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7f1209d0" />
+    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7f1209d1" />
+    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7f1209d2" />
+    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7f1209d3" />
+    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7f1209d4" />
+    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_change" id="0x7f1209d5" />
+    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_clear" id="0x7f1209d6" />
+    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7f1209d7" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7f1209d8" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7f1209d9" />
+    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7f1209da" />
+    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_change" id="0x7f1209db" />
+    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_clear" id="0x7f1209dc" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7f1209dd" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7f1209de" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7f1209df" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7f1209e0" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7f1209e1" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7f1209e2" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7f1209e3" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7f1209e4" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7f1209e5" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7f1209e6" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7f1209e7" />
+    <public type="string" name="guild_settings_audit_log_integration_create" id="0x7f1209e8" />
+    <public type="string" name="guild_settings_audit_log_integration_delete" id="0x7f1209e9" />
+    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_off" id="0x7f1209ea" />
+    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_on" id="0x7f1209eb" />
+    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_kick_from_server" id="0x7f1209ec" />
+    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_remove_synced_role" id="0x7f1209ed" />
+    <public type="string" name="guild_settings_audit_log_integration_expire_grace_period" id="0x7f1209ee" />
+    <public type="string" name="guild_settings_audit_log_integration_update" id="0x7f1209ef" />
+    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7f1209f0" />
+    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7f1209f1" />
+    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7f1209f2" />
+    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7f1209f3" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7f1209f4" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7f1209f5" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7f1209f6" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7f1209f7" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7f1209f8" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7f1209f9" />
+    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7f1209fa" />
+    <public type="string" name="guild_settings_audit_log_load_more" id="0x7f1209fb" />
+    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7f1209fc" />
+    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7f1209fd" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7f1209fe" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7f1209ff" />
+    <public type="string" name="guild_settings_audit_log_member_disconnect" id="0x7f120a00" />
+    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7f120a01" />
+    <public type="string" name="guild_settings_audit_log_member_move" id="0x7f120a02" />
+    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7f120a03" />
+    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7f120a04" />
+    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7f120a05" />
+    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7f120a06" />
+    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7f120a07" />
+    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7f120a08" />
+    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7f120a09" />
+    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7f120a0a" />
+    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7f120a0b" />
+    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7f120a0c" />
+    <public type="string" name="guild_settings_audit_log_member_update" id="0x7f120a0d" />
+    <public type="string" name="guild_settings_audit_log_message_bulk_delete" id="0x7f120a0e" />
+    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7f120a0f" />
+    <public type="string" name="guild_settings_audit_log_message_pin" id="0x7f120a10" />
+    <public type="string" name="guild_settings_audit_log_message_unpin" id="0x7f120a11" />
+    <public type="string" name="guild_settings_audit_log_role_color" id="0x7f120a12" />
+    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7f120a13" />
+    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7f120a14" />
+    <public type="string" name="guild_settings_audit_log_role_create" id="0x7f120a15" />
+    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7f120a16" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7f120a17" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7f120a18" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7f120a19" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7f120a1a" />
+    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7f120a1b" />
+    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7f120a1c" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7f120a1d" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7f120a1e" />
+    <public type="string" name="guild_settings_audit_log_role_update" id="0x7f120a1f" />
+    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7f120a20" />
+    <public type="string" name="guild_settings_audit_log_unknown_action" id="0x7f120a21" />
+    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7f120a22" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7f120a23" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7f120a24" />
+    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7f120a25" />
+    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7f120a26" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7f120a27" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7f120a28" />
+    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7f120a29" />
+    <public type="string" name="guild_settings_banner_recommend" id="0x7f120a2a" />
+    <public type="string" name="guild_settings_community" id="0x7f120a2b" />
+    <public type="string" name="guild_settings_community_administrator_only" id="0x7f120a2c" />
+    <public type="string" name="guild_settings_community_disable_community" id="0x7f120a2d" />
+    <public type="string" name="guild_settings_community_disable_community_description" id="0x7f120a2e" />
+    <public type="string" name="guild_settings_community_enable_community" id="0x7f120a2f" />
+    <public type="string" name="guild_settings_community_intro_body" id="0x7f120a30" />
+    <public type="string" name="guild_settings_community_intro_details" id="0x7f120a31" />
+    <public type="string" name="guild_settings_community_intro_details_mobile" id="0x7f120a32" />
+    <public type="string" name="guild_settings_community_intro_header" id="0x7f120a33" />
+    <public type="string" name="guild_settings_community_intro_learn_more" id="0x7f120a34" />
+    <public type="string" name="guild_settings_community_intro_upsell_analytics_body" id="0x7f120a35" />
+    <public type="string" name="guild_settings_community_intro_upsell_analytics_header" id="0x7f120a36" />
+    <public type="string" name="guild_settings_community_intro_upsell_analytics_tooltip" id="0x7f120a37" />
+    <public type="string" name="guild_settings_community_intro_upsell_discovery_body" id="0x7f120a38" />
+    <public type="string" name="guild_settings_community_intro_upsell_discovery_header" id="0x7f120a39" />
+    <public type="string" name="guild_settings_community_intro_upsell_partner_body" id="0x7f120a3a" />
+    <public type="string" name="guild_settings_community_intro_upsell_partner_header" id="0x7f120a3b" />
+    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_body" id="0x7f120a3c" />
+    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_header" id="0x7f120a3d" />
+    <public type="string" name="guild_settings_community_locale_help" id="0x7f120a3e" />
+    <public type="string" name="guild_settings_community_mod_channel_help" id="0x7f120a3f" />
+    <public type="string" name="guild_settings_community_mod_channel_help_mobile" id="0x7f120a40" />
+    <public type="string" name="guild_settings_community_mod_channel_selector_title" id="0x7f120a41" />
+    <public type="string" name="guild_settings_community_mod_channel_title" id="0x7f120a42" />
+    <public type="string" name="guild_settings_community_rules_channel_help" id="0x7f120a43" />
+    <public type="string" name="guild_settings_community_rules_channel_help_mobile" id="0x7f120a44" />
+    <public type="string" name="guild_settings_community_upsell_body" id="0x7f120a45" />
+    <public type="string" name="guild_settings_community_upsell_button_analytics" id="0x7f120a46" />
+    <public type="string" name="guild_settings_community_upsell_button_discovery" id="0x7f120a47" />
+    <public type="string" name="guild_settings_community_upsell_button_welcome_screen" id="0x7f120a48" />
+    <public type="string" name="guild_settings_community_upsell_header" id="0x7f120a49" />
+    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7f120a4a" />
+    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7f120a4b" />
+    <public type="string" name="guild_settings_default_notifications_large_guild_notify_all" id="0x7f120a4c" />
+    <public type="string" name="guild_settings_disable_discoverable" id="0x7f120a4d" />
+    <public type="string" name="guild_settings_discovery_admin_only" id="0x7f120a4e" />
+    <public type="string" name="guild_settings_discovery_byline" id="0x7f120a4f" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa" id="0x7f120a50" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa_description" id="0x7f120a51" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa_description_failing" id="0x7f120a52" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa_failing" id="0x7f120a53" />
+    <public type="string" name="guild_settings_discovery_checklist_abide_by_guidelines" id="0x7f120a54" />
+    <public type="string" name="guild_settings_discovery_checklist_age" id="0x7f120a55" />
+    <public type="string" name="guild_settings_discovery_checklist_age_description" id="0x7f120a56" />
+    <public type="string" name="guild_settings_discovery_checklist_age_description_failing" id="0x7f120a57" />
+    <public type="string" name="guild_settings_discovery_checklist_age_failing" id="0x7f120a58" />
+    <public type="string" name="guild_settings_discovery_checklist_bad_standing" id="0x7f120a59" />
+    <public type="string" name="guild_settings_discovery_checklist_change_channel_categories" id="0x7f120a5a" />
+    <public type="string" name="guild_settings_discovery_checklist_change_channel_names" id="0x7f120a5b" />
+    <public type="string" name="guild_settings_discovery_checklist_change_description" id="0x7f120a5c" />
+    <public type="string" name="guild_settings_discovery_checklist_change_name" id="0x7f120a5d" />
+    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action" id="0x7f120a5e" />
+    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action_details" id="0x7f120a5f" />
+    <public type="string" name="guild_settings_discovery_checklist_communicator_progress_label" id="0x7f120a60" />
+    <public type="string" name="guild_settings_discovery_checklist_engagement_failing" id="0x7f120a61" />
+    <public type="string" name="guild_settings_discovery_checklist_good_standing" id="0x7f120a62" />
+    <public type="string" name="guild_settings_discovery_checklist_health_definitions_intro" id="0x7f120a63" />
+    <public type="string" name="guild_settings_discovery_checklist_health_view_details" id="0x7f120a64" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy" id="0x7f120a65" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description" id="0x7f120a66" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description_failing" id="0x7f120a67" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending" id="0x7f120a68" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending_size" id="0x7f120a69" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_failing" id="0x7f120a6a" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_pending" id="0x7f120a6b" />
+    <public type="string" name="guild_settings_discovery_checklist_loading" id="0x7f120a6c" />
+    <public type="string" name="guild_settings_discovery_checklist_nsfw" id="0x7f120a6d" />
+    <public type="string" name="guild_settings_discovery_checklist_nsfw_description" id="0x7f120a6e" />
+    <public type="string" name="guild_settings_discovery_checklist_nsfw_failing" id="0x7f120a6f" />
+    <public type="string" name="guild_settings_discovery_checklist_progress_requirement_label" id="0x7f120a70" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_failing" id="0x7f120a71" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action" id="0x7f120a72" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action_details_updated" id="0x7f120a73" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_progress_label" id="0x7f120a74" />
+    <public type="string" name="guild_settings_discovery_checklist_safe" id="0x7f120a75" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_description" id="0x7f120a76" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing" id="0x7f120a77" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing_guidelines" id="0x7f120a78" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_failing" id="0x7f120a79" />
+    <public type="string" name="guild_settings_discovery_checklist_score_explain" id="0x7f120a7a" />
+    <public type="string" name="guild_settings_discovery_checklist_size" id="0x7f120a7b" />
+    <public type="string" name="guild_settings_discovery_checklist_size_description" id="0x7f120a7c" />
+    <public type="string" name="guild_settings_discovery_checklist_size_description_failing" id="0x7f120a7d" />
+    <public type="string" name="guild_settings_discovery_checklist_size_description_failing_partners" id="0x7f120a7e" />
+    <public type="string" name="guild_settings_discovery_checklist_size_failing" id="0x7f120a7f" />
+    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action" id="0x7f120a80" />
+    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action_details" id="0x7f120a81" />
+    <public type="string" name="guild_settings_discovery_checklist_visitor_progress_label" id="0x7f120a82" />
+    <public type="string" name="guild_settings_discovery_disable_public_confirm_text" id="0x7f120a83" />
+    <public type="string" name="guild_settings_discovery_disable_public_confirm_title" id="0x7f120a84" />
+    <public type="string" name="guild_settings_discovery_disqualified" id="0x7f120a85" />
+    <public type="string" name="guild_settings_discovery_disqualified_description" id="0x7f120a86" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_description" id="0x7f120a87" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_disable" id="0x7f120a88" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_enable" id="0x7f120a89" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_title" id="0x7f120a8a" />
+    <public type="string" name="guild_settings_discovery_enabled_modal_body" id="0x7f120a8b" />
+    <public type="string" name="guild_settings_discovery_enabled_modal_dismiss" id="0x7f120a8c" />
+    <public type="string" name="guild_settings_discovery_enabled_modal_header" id="0x7f120a8d" />
+    <public type="string" name="guild_settings_discovery_header" id="0x7f120a8e" />
+    <public type="string" name="guild_settings_discovery_locale_help" id="0x7f120a8f" />
+    <public type="string" name="guild_settings_discovery_pending_healthy" id="0x7f120a90" />
+    <public type="string" name="guild_settings_discovery_perk_customize" id="0x7f120a91" />
+    <public type="string" name="guild_settings_discovery_perk_featured" id="0x7f120a92" />
+    <public type="string" name="guild_settings_discovery_perk_find" id="0x7f120a93" />
+    <public type="string" name="guild_settings_discovery_preview_description" id="0x7f120a94" />
+    <public type="string" name="guild_settings_discovery_primary_category_description" id="0x7f120a95" />
+    <public type="string" name="guild_settings_discovery_primary_category_title" id="0x7f120a96" />
+    <public type="string" name="guild_settings_discovery_put_guild_on_map" id="0x7f120a97" />
+    <public type="string" name="guild_settings_discovery_requirements_not_met" id="0x7f120a98" />
+    <public type="string" name="guild_settings_discovery_search_keywords_description" id="0x7f120a99" />
+    <public type="string" name="guild_settings_discovery_search_keywords_title" id="0x7f120a9a" />
+    <public type="string" name="guild_settings_discovery_subcategory_title" id="0x7f120a9b" />
+    <public type="string" name="guild_settings_emoji_alias" id="0x7f120a9c" />
+    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7f120a9d" />
+    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7f120a9e" />
+    <public type="string" name="guild_settings_enable_discoverable" id="0x7f120a9f" />
+    <public type="string" name="guild_settings_filter_action" id="0x7f120aa0" />
+    <public type="string" name="guild_settings_filter_all" id="0x7f120aa1" />
+    <public type="string" name="guild_settings_filter_all_actions" id="0x7f120aa2" />
+    <public type="string" name="guild_settings_filter_all_users" id="0x7f120aa3" />
+    <public type="string" name="guild_settings_filter_user" id="0x7f120aa4" />
+    <public type="string" name="guild_settings_filtered_action" id="0x7f120aa5" />
+    <public type="string" name="guild_settings_filtered_user" id="0x7f120aa6" />
+    <public type="string" name="guild_settings_follower_analytics" id="0x7f120aa7" />
+    <public type="string" name="guild_settings_follower_analytics_description" id="0x7f120aa8" />
+    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7f120aa9" />
+    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7f120aaa" />
+    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7f120aab" />
+    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7f120aac" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7f120aad" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7f120aae" />
+    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7f120aaf" />
+    <public type="string" name="guild_settings_follower_analytics_post" id="0x7f120ab0" />
+    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7f120ab1" />
+    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7f120ab2" />
+    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7f120ab3" />
+    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7f120ab4" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7f120ab5" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7f120ab6" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7f120ab7" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7f120ab8" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7f120ab9" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7f120aba" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7f120abb" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7f120abc" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7f120abd" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7f120abe" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7f120abf" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7f120ac0" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7f120ac1" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7f120ac2" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7f120ac3" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7f120ac4" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7f120ac5" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7f120ac6" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7f120ac7" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7f120ac8" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7f120ac9" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7f120aca" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7f120acb" />
+    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7f120acc" />
+    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7f120acd" />
+    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7f120ace" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7f120acf" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7f120ad0" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7f120ad1" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7f120ad2" />
+    <public type="string" name="guild_settings_icon_recommend" id="0x7f120ad3" />
+    <public type="string" name="guild_settings_label_audit_log" id="0x7f120ad4" />
+    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7f120ad5" />
+    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7f120ad6" />
+    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7f120ad7" />
+    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7f120ad8" />
+    <public type="string" name="guild_settings_members_add_role" id="0x7f120ad9" />
+    <public type="string" name="guild_settings_members_display_role" id="0x7f120ada" />
+    <public type="string" name="guild_settings_members_remove_role" id="0x7f120adb" />
+    <public type="string" name="guild_settings_members_server_members" id="0x7f120adc" />
+    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7f120add" />
+    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7f120ade" />
+    <public type="string" name="guild_settings_overview_tier_info" id="0x7f120adf" />
+    <public type="string" name="guild_settings_partner_checklist_age_description" id="0x7f120ae0" />
+    <public type="string" name="guild_settings_partner_checklist_age_description_failing" id="0x7f120ae1" />
+    <public type="string" name="guild_settings_partner_checklist_failing_header" id="0x7f120ae2" />
+    <public type="string" name="guild_settings_partner_checklist_failing_subheader" id="0x7f120ae3" />
+    <public type="string" name="guild_settings_partner_checklist_health_view_details" id="0x7f120ae4" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description" id="0x7f120ae5" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description_failing" id="0x7f120ae6" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description_pending" id="0x7f120ae7" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description_pending_size" id="0x7f120ae8" />
+    <public type="string" name="guild_settings_partner_checklist_passing_header" id="0x7f120ae9" />
+    <public type="string" name="guild_settings_partner_checklist_passing_subheader" id="0x7f120aea" />
+    <public type="string" name="guild_settings_partner_checklist_size" id="0x7f120aeb" />
+    <public type="string" name="guild_settings_partner_checklist_size_description" id="0x7f120aec" />
+    <public type="string" name="guild_settings_partner_checklist_size_description_failing" id="0x7f120aed" />
+    <public type="string" name="guild_settings_partner_checklist_size_failing" id="0x7f120aee" />
+    <public type="string" name="guild_settings_partner_intro_apply_button" id="0x7f120aef" />
+    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_only_owner" id="0x7f120af0" />
+    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_pending" id="0x7f120af1" />
+    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_rejected" id="0x7f120af2" />
+    <public type="string" name="guild_settings_partner_intro_apply_details" id="0x7f120af3" />
+    <public type="string" name="guild_settings_partner_intro_body" id="0x7f120af4" />
+    <public type="string" name="guild_settings_partner_intro_cooldown" id="0x7f120af5" />
+    <public type="string" name="guild_settings_partner_intro_cooldown_counter" id="0x7f120af6" />
+    <public type="string" name="guild_settings_partner_intro_header" id="0x7f120af7" />
+    <public type="string" name="guild_settings_partner_intro_pending" id="0x7f120af8" />
+    <public type="string" name="guild_settings_partner_intro_rejected" id="0x7f120af9" />
+    <public type="string" name="guild_settings_partner_intro_upsell_branding_body" id="0x7f120afa" />
+    <public type="string" name="guild_settings_partner_intro_upsell_branding_header" id="0x7f120afb" />
+    <public type="string" name="guild_settings_partner_intro_upsell_perks_body" id="0x7f120afc" />
+    <public type="string" name="guild_settings_partner_intro_upsell_perks_header" id="0x7f120afd" />
+    <public type="string" name="guild_settings_partner_intro_upsell_recognition_body" id="0x7f120afe" />
+    <public type="string" name="guild_settings_partner_intro_upsell_recognition_header" id="0x7f120aff" />
+    <public type="string" name="guild_settings_partner_not_verified" id="0x7f120b00" />
+    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7f120b01" />
+    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7f120b02" />
+    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7f120b03" />
+    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7f120b04" />
+    <public type="string" name="guild_settings_premium_guild_title" id="0x7f120b05" />
+    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7f120b06" />
+    <public type="string" name="guild_settings_premium_upsell_body_perk_guild_subscription_discount" id="0x7f120b07" />
+    <public type="string" name="guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions" id="0x7f120b08" />
+    <public type="string" name="guild_settings_premium_upsell_body_perk_num_guild_subscriptions" id="0x7f120b09" />
+    <public type="string" name="guild_settings_premium_upsell_heading_primary" id="0x7f120b0a" />
+    <public type="string" name="guild_settings_premium_upsell_heading_secondary" id="0x7f120b0b" />
+    <public type="string" name="guild_settings_premium_upsell_heading_secondary_premium_user" id="0x7f120b0c" />
+    <public type="string" name="guild_settings_premium_upsell_heading_tertiary_premium_user" id="0x7f120b0d" />
+    <public type="string" name="guild_settings_premium_upsell_learn_more" id="0x7f120b0e" />
+    <public type="string" name="guild_settings_premium_upsell_subheading" id="0x7f120b0f" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_extra_android" id="0x7f120b10" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_extra_ios" id="0x7f120b11" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1" id="0x7f120b12" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1_mobile" id="0x7f120b13" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2" id="0x7f120b14" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2_mobile" id="0x7f120b15" />
+    <public type="string" name="guild_settings_public_mod_channel_title" id="0x7f120b16" />
+    <public type="string" name="guild_settings_public_no_option_selected" id="0x7f120b17" />
+    <public type="string" name="guild_settings_public_update_failed" id="0x7f120b18" />
+    <public type="string" name="guild_settings_public_welcome" id="0x7f120b19" />
+    <public type="string" name="guild_settings_public_welcome_add_recommended_channel" id="0x7f120b1a" />
+    <public type="string" name="guild_settings_public_welcome_channel_delete" id="0x7f120b1b" />
+    <public type="string" name="guild_settings_public_welcome_channel_description_placeholder" id="0x7f120b1c" />
+    <public type="string" name="guild_settings_public_welcome_channel_edit" id="0x7f120b1d" />
+    <public type="string" name="guild_settings_public_welcome_channel_move_down" id="0x7f120b1e" />
+    <public type="string" name="guild_settings_public_welcome_channel_move_up" id="0x7f120b1f" />
+    <public type="string" name="guild_settings_public_welcome_description_placeholder" id="0x7f120b20" />
+    <public type="string" name="guild_settings_public_welcome_enable_reminder" id="0x7f120b21" />
+    <public type="string" name="guild_settings_public_welcome_enabled" id="0x7f120b22" />
+    <public type="string" name="guild_settings_public_welcome_enabled_second_line" id="0x7f120b23" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_description_1" id="0x7f120b24" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_description_2" id="0x7f120b25" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_description_3" id="0x7f120b26" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_name_1" id="0x7f120b27" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_name_2" id="0x7f120b28" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_name_3" id="0x7f120b29" />
+    <public type="string" name="guild_settings_public_welcome_example_description" id="0x7f120b2a" />
+    <public type="string" name="guild_settings_public_welcome_example_title" id="0x7f120b2b" />
+    <public type="string" name="guild_settings_public_welcome_intro_button" id="0x7f120b2c" />
+    <public type="string" name="guild_settings_public_welcome_intro_text" id="0x7f120b2d" />
+    <public type="string" name="guild_settings_public_welcome_invalid_channel" id="0x7f120b2e" />
+    <public type="string" name="guild_settings_public_welcome_only_viewable_channels" id="0x7f120b2f" />
+    <public type="string" name="guild_settings_public_welcome_pick_channel" id="0x7f120b30" />
+    <public type="string" name="guild_settings_public_welcome_preview" id="0x7f120b31" />
+    <public type="string" name="guild_settings_public_welcome_progress_will_save" id="0x7f120b32" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_add" id="0x7f120b33" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_edit" id="0x7f120b34" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channels_description" id="0x7f120b35" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channels_title" id="0x7f120b36" />
+    <public type="string" name="guild_settings_public_welcome_select_a_channel" id="0x7f120b37" />
+    <public type="string" name="guild_settings_public_welcome_set_description" id="0x7f120b38" />
+    <public type="string" name="guild_settings_public_welcome_settings_text" id="0x7f120b39" />
+    <public type="string" name="guild_settings_public_welcome_title" id="0x7f120b3a" />
+    <public type="string" name="guild_settings_public_welcome_update_failure" id="0x7f120b3b" />
+    <public type="string" name="guild_settings_server_banner" id="0x7f120b3c" />
+    <public type="string" name="guild_settings_server_invite_background" id="0x7f120b3d" />
+    <public type="string" name="guild_settings_splash_info" id="0x7f120b3e" />
+    <public type="string" name="guild_settings_splash_recommend" id="0x7f120b3f" />
+    <public type="string" name="guild_settings_title_server_widget" id="0x7f120b40" />
+    <public type="string" name="guild_settings_widget_embed_help" id="0x7f120b41" />
+    <public type="string" name="guild_settings_widget_enable_widget" id="0x7f120b42" />
+    <public type="string" name="guild_sidebar_a11y_label" id="0x7f120b43" />
+    <public type="string" name="guild_sidebar_announcement_channel_a11y_label" id="0x7f120b44" />
+    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_mentions" id="0x7f120b45" />
+    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_unreads" id="0x7f120b46" />
+    <public type="string" name="guild_sidebar_default_channel_a11y_label" id="0x7f120b47" />
+    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_mentions" id="0x7f120b48" />
+    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_unreads" id="0x7f120b49" />
+    <public type="string" name="guild_sidebar_store_channel_a11y_label" id="0x7f120b4a" />
+    <public type="string" name="guild_sidebar_voice_channel_a11y_label" id="0x7f120b4b" />
+    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_limit" id="0x7f120b4c" />
+    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_users" id="0x7f120b4d" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_close_button" id="0x7f120b4e" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description" id="0x7f120b4f" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_generic_guild" id="0x7f120b50" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile1" id="0x7f120b51" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile2" id="0x7f120b52" />
+    <public type="string" name="guild_subscription_purchase_modal_apple" id="0x7f120b53" />
+    <public type="string" name="guild_subscription_purchase_modal_counter" id="0x7f120b54" />
+    <public type="string" name="guild_subscription_purchase_modal_footer_discount" id="0x7f120b55" />
+    <public type="string" name="guild_subscription_purchase_modal_footer_upsell" id="0x7f120b56" />
+    <public type="string" name="guild_subscription_purchase_modal_footer_upsell_trial" id="0x7f120b57" />
+    <public type="string" name="guild_subscription_purchase_modal_invoice_row_content" id="0x7f120b58" />
+    <public type="string" name="guild_subscription_purchase_modal_payment_source_tooltip" id="0x7f120b59" />
+    <public type="string" name="guild_subscription_purchase_modal_purchase_details_header" id="0x7f120b5a" />
+    <public type="string" name="guild_subscription_purchase_modal_step_select_description" id="0x7f120b5b" />
+    <public type="string" name="guild_subscription_purchase_modal_submit" id="0x7f120b5c" />
+    <public type="string" name="guild_subscription_purchase_modal_subtotal" id="0x7f120b5d" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description" id="0x7f120b5e" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description_generic_guild" id="0x7f120b5f" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile1" id="0x7f120b60" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile2" id="0x7f120b61" />
+    <public type="string" name="guild_subscription_purchase_modal_unused_slot_notice" id="0x7f120b62" />
+    <public type="string" name="guild_template_based_on" id="0x7f120b63" />
+    <public type="string" name="guild_template_create_discord" id="0x7f120b64" />
+    <public type="string" name="guild_template_default_server_name_classroom" id="0x7f120b65" />
+    <public type="string" name="guild_template_default_server_name_create_from_scratch" id="0x7f120b66" />
+    <public type="string" name="guild_template_default_server_name_creators_hobbies" id="0x7f120b67" />
+    <public type="string" name="guild_template_default_server_name_friends_family" id="0x7f120b68" />
+    <public type="string" name="guild_template_default_server_name_global_communities" id="0x7f120b69" />
+    <public type="string" name="guild_template_default_server_name_local_communities" id="0x7f120b6a" />
+    <public type="string" name="guild_template_default_server_name_study_groups" id="0x7f120b6b" />
+    <public type="string" name="guild_template_embed_view_in_app" id="0x7f120b6c" />
+    <public type="string" name="guild_template_header_clubs" id="0x7f120b6d" />
+    <public type="string" name="guild_template_header_community" id="0x7f120b6e" />
+    <public type="string" name="guild_template_header_create" id="0x7f120b6f" />
+    <public type="string" name="guild_template_header_creator" id="0x7f120b70" />
+    <public type="string" name="guild_template_header_friend" id="0x7f120b71" />
+    <public type="string" name="guild_template_header_gaming" id="0x7f120b72" />
+    <public type="string" name="guild_template_header_study" id="0x7f120b73" />
+    <public type="string" name="guild_template_invalid_subtitle" id="0x7f120b74" />
+    <public type="string" name="guild_template_invalid_title" id="0x7f120b75" />
+    <public type="string" name="guild_template_mobile_invalid_cta" id="0x7f120b76" />
+    <public type="string" name="guild_template_mobile_invalid_error" id="0x7f120b77" />
+    <public type="string" name="guild_template_modal_channels_descriptions" id="0x7f120b78" />
+    <public type="string" name="guild_template_modal_channels_header" id="0x7f120b79" />
+    <public type="string" name="guild_template_modal_channels_tip" id="0x7f120b7a" />
+    <public type="string" name="guild_template_modal_description_classroom" id="0x7f120b7b" />
+    <public type="string" name="guild_template_modal_description_create_from_scratch" id="0x7f120b7c" />
+    <public type="string" name="guild_template_modal_description_creators_hobbies" id="0x7f120b7d" />
+    <public type="string" name="guild_template_modal_description_friends_family" id="0x7f120b7e" />
+    <public type="string" name="guild_template_modal_description_global_communities" id="0x7f120b7f" />
+    <public type="string" name="guild_template_modal_description_local_communities" id="0x7f120b80" />
+    <public type="string" name="guild_template_modal_description_study_groups" id="0x7f120b81" />
+    <public type="string" name="guild_template_modal_error_title" id="0x7f120b82" />
+    <public type="string" name="guild_template_modal_roles_description" id="0x7f120b83" />
+    <public type="string" name="guild_template_modal_roles_header" id="0x7f120b84" />
+    <public type="string" name="guild_template_modal_roles_header2" id="0x7f120b85" />
+    <public type="string" name="guild_template_modal_title" id="0x7f120b86" />
+    <public type="string" name="guild_template_modal_title_classroom" id="0x7f120b87" />
+    <public type="string" name="guild_template_modal_title_create_from_scratch" id="0x7f120b88" />
+    <public type="string" name="guild_template_modal_title_creators_hobbies" id="0x7f120b89" />
+    <public type="string" name="guild_template_modal_title_friends_family" id="0x7f120b8a" />
+    <public type="string" name="guild_template_modal_title_global_communities" id="0x7f120b8b" />
+    <public type="string" name="guild_template_modal_title_local_communities" id="0x7f120b8c" />
+    <public type="string" name="guild_template_modal_title_study_groups" id="0x7f120b8d" />
+    <public type="string" name="guild_template_name_announcements" id="0x7f120b8e" />
+    <public type="string" name="guild_template_name_category_information" id="0x7f120b8f" />
+    <public type="string" name="guild_template_name_category_text" id="0x7f120b90" />
+    <public type="string" name="guild_template_name_category_voice" id="0x7f120b91" />
+    <public type="string" name="guild_template_name_clips_and_highlights" id="0x7f120b92" />
+    <public type="string" name="guild_template_name_events" id="0x7f120b93" />
+    <public type="string" name="guild_template_name_game" id="0x7f120b94" />
+    <public type="string" name="guild_template_name_game_new" id="0x7f120b95" />
+    <public type="string" name="guild_template_name_game_room" id="0x7f120b96" />
+    <public type="string" name="guild_template_name_general" id="0x7f120b97" />
+    <public type="string" name="guild_template_name_giveaways" id="0x7f120b98" />
+    <public type="string" name="guild_template_name_homework" id="0x7f120b99" />
+    <public type="string" name="guild_template_name_homework_help" id="0x7f120b9a" />
+    <public type="string" name="guild_template_name_ideas_and_feedback" id="0x7f120b9b" />
+    <public type="string" name="guild_template_name_meeting_plans" id="0x7f120b9c" />
+    <public type="string" name="guild_template_name_meetups" id="0x7f120b9d" />
+    <public type="string" name="guild_template_name_memes" id="0x7f120b9e" />
+    <public type="string" name="guild_template_name_music" id="0x7f120b9f" />
+    <public type="string" name="guild_template_name_notes" id="0x7f120ba0" />
+    <public type="string" name="guild_template_name_notes_resources" id="0x7f120ba1" />
+    <public type="string" name="guild_template_name_off_topic" id="0x7f120ba2" />
+    <public type="string" name="guild_template_name_random" id="0x7f120ba3" />
+    <public type="string" name="guild_template_name_resources" id="0x7f120ba4" />
+    <public type="string" name="guild_template_name_session_planning" id="0x7f120ba5" />
+    <public type="string" name="guild_template_name_social" id="0x7f120ba6" />
+    <public type="string" name="guild_template_name_strategy" id="0x7f120ba7" />
+    <public type="string" name="guild_template_name_voice_community_hangout" id="0x7f120ba8" />
+    <public type="string" name="guild_template_name_voice_gaming" id="0x7f120ba9" />
+    <public type="string" name="guild_template_name_voice_general" id="0x7f120baa" />
+    <public type="string" name="guild_template_name_voice_lobby" id="0x7f120bab" />
+    <public type="string" name="guild_template_name_voice_lounge" id="0x7f120bac" />
+    <public type="string" name="guild_template_name_voice_meeting_room" id="0x7f120bad" />
+    <public type="string" name="guild_template_name_voice_stream_room" id="0x7f120bae" />
+    <public type="string" name="guild_template_name_voice_study_room" id="0x7f120baf" />
+    <public type="string" name="guild_template_name_welcome" id="0x7f120bb0" />
+    <public type="string" name="guild_template_name_welcome_and_rules" id="0x7f120bb1" />
+    <public type="string" name="guild_template_open" id="0x7f120bb2" />
+    <public type="string" name="guild_template_preview_description" id="0x7f120bb3" />
+    <public type="string" name="guild_template_preview_protip_body" id="0x7f120bb4" />
+    <public type="string" name="guild_template_preview_title" id="0x7f120bb5" />
+    <public type="string" name="guild_template_resolved_embed_title" id="0x7f120bb6" />
+    <public type="string" name="guild_template_resolving_title" id="0x7f120bb7" />
+    <public type="string" name="guild_template_selector_description" id="0x7f120bb8" />
+    <public type="string" name="guild_template_selector_option_header" id="0x7f120bb9" />
+    <public type="string" name="guild_template_selector_suggestion" id="0x7f120bba" />
+    <public type="string" name="guild_template_selector_title" id="0x7f120bbb" />
+    <public type="string" name="guild_template_settings_description" id="0x7f120bbc" />
+    <public type="string" name="guild_template_setup_discord" id="0x7f120bbd" />
+    <public type="string" name="guild_template_usages" id="0x7f120bbe" />
+    <public type="string" name="guild_template_usages_by_creator2" id="0x7f120bbf" />
+    <public type="string" name="guild_template_usages_no_bold" id="0x7f120bc0" />
+    <public type="string" name="guild_templates" id="0x7f120bc1" />
+    <public type="string" name="guild_templates_create_link" id="0x7f120bc2" />
+    <public type="string" name="guild_templates_default_template_name" id="0x7f120bc3" />
+    <public type="string" name="guild_templates_delete_description" id="0x7f120bc4" />
+    <public type="string" name="guild_templates_delete_template" id="0x7f120bc5" />
+    <public type="string" name="guild_templates_delete_template_link" id="0x7f120bc6" />
+    <public type="string" name="guild_templates_form_description_channels" id="0x7f120bc7" />
+    <public type="string" name="guild_templates_form_description_members" id="0x7f120bc8" />
+    <public type="string" name="guild_templates_form_description_messages" id="0x7f120bc9" />
+    <public type="string" name="guild_templates_form_description_perks" id="0x7f120bca" />
+    <public type="string" name="guild_templates_form_description_roles" id="0x7f120bcb" />
+    <public type="string" name="guild_templates_form_description_settings" id="0x7f120bcc" />
+    <public type="string" name="guild_templates_form_description_will_copy" id="0x7f120bcd" />
+    <public type="string" name="guild_templates_form_description_wont_copy" id="0x7f120bce" />
+    <public type="string" name="guild_templates_form_error_name_required" id="0x7f120bcf" />
+    <public type="string" name="guild_templates_form_label_description" id="0x7f120bd0" />
+    <public type="string" name="guild_templates_form_label_icon" id="0x7f120bd1" />
+    <public type="string" name="guild_templates_form_label_link" id="0x7f120bd2" />
+    <public type="string" name="guild_templates_form_label_name" id="0x7f120bd3" />
+    <public type="string" name="guild_templates_form_label_server_name_classroom" id="0x7f120bd4" />
+    <public type="string" name="guild_templates_form_label_server_name_create_from_scratch" id="0x7f120bd5" />
+    <public type="string" name="guild_templates_form_label_server_name_creators_hobbies" id="0x7f120bd6" />
+    <public type="string" name="guild_templates_form_label_server_name_friends_family" id="0x7f120bd7" />
+    <public type="string" name="guild_templates_form_label_server_name_global_communities" id="0x7f120bd8" />
+    <public type="string" name="guild_templates_form_label_server_name_local_communities" id="0x7f120bd9" />
+    <public type="string" name="guild_templates_form_label_server_name_study_groups" id="0x7f120bda" />
+    <public type="string" name="guild_templates_form_placeholder_description" id="0x7f120bdb" />
+    <public type="string" name="guild_templates_form_placeholder_name" id="0x7f120bdc" />
+    <public type="string" name="guild_templates_last_sync" id="0x7f120bdd" />
+    <public type="string" name="guild_templates_preview_template" id="0x7f120bde" />
+    <public type="string" name="guild_templates_promotion_tooltip" id="0x7f120bdf" />
+    <public type="string" name="guild_templates_promotion_tooltip_aria_label" id="0x7f120be0" />
+    <public type="string" name="guild_templates_sync_description" id="0x7f120be1" />
+    <public type="string" name="guild_templates_sync_template" id="0x7f120be2" />
+    <public type="string" name="guild_templates_template_sync" id="0x7f120be3" />
+    <public type="string" name="guild_templates_unsynced_tooltip" id="0x7f120be4" />
+    <public type="string" name="guild_templates_unsynced_warning" id="0x7f120be5" />
+    <public type="string" name="guild_tooltip_a11y_label" id="0x7f120be6" />
+    <public type="string" name="guild_unavailable_body" id="0x7f120be7" />
+    <public type="string" name="guild_unavailable_header" id="0x7f120be8" />
+    <public type="string" name="guild_unavailable_title" id="0x7f120be9" />
+    <public type="string" name="guild_verification_text_account_age" id="0x7f120bea" />
+    <public type="string" name="guild_verification_text_member_age" id="0x7f120beb" />
+    <public type="string" name="guild_verification_text_not_claimed" id="0x7f120bec" />
+    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7f120bed" />
+    <public type="string" name="guild_verification_text_not_verified" id="0x7f120bee" />
+    <public type="string" name="guild_verified" id="0x7f120bef" />
+    <public type="string" name="guild_video_call_marketing_popout_body" id="0x7f120bf0" />
+    <public type="string" name="guild_video_call_marketing_popout_header" id="0x7f120bf1" />
+    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7f120bf2" />
+    <public type="string" name="guilds_bar_a11y_label" id="0x7f120bf3" />
+    <public type="string" name="hardware_acceleration" id="0x7f120bf4" />
+    <public type="string" name="hardware_acceleration_help_text" id="0x7f120bf5" />
+    <public type="string" name="help" id="0x7f120bf6" />
+    <public type="string" name="help_clear_permissions" id="0x7f120bf7" />
+    <public type="string" name="help_desk" id="0x7f120bf8" />
+    <public type="string" name="help_missing_manage_roles_permission" id="0x7f120bf9" />
+    <public type="string" name="help_missing_permission" id="0x7f120bfa" />
+    <public type="string" name="help_role_locked" id="0x7f120bfb" />
+    <public type="string" name="help_role_locked_mine" id="0x7f120bfc" />
+    <public type="string" name="help_roles_description" id="0x7f120bfd" />
+    <public type="string" name="help_singular_permission" id="0x7f120bfe" />
+    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7f120bff" />
+    <public type="string" name="hide_chat" id="0x7f120c00" />
+    <public type="string" name="hide_instant_invites_description" id="0x7f120c01" />
+    <public type="string" name="hide_instant_invites_label" id="0x7f120c02" />
+    <public type="string" name="hide_muted" id="0x7f120c03" />
+    <public type="string" name="hide_muted_channels" id="0x7f120c04" />
+    <public type="string" name="hide_navigation" id="0x7f120c05" />
+    <public type="string" name="hide_personal_information_description" id="0x7f120c06" />
+    <public type="string" name="hide_personal_information_label" id="0x7f120c07" />
+    <public type="string" name="hold_up" id="0x7f120c08" />
+    <public type="string" name="home" id="0x7f120c09" />
+    <public type="string" name="how_to_invite_others" id="0x7f120c0a" />
+    <public type="string" name="hr" id="0x7f120c0b" />
+    <public type="string" name="hu" id="0x7f120c0c" />
+    <public type="string" name="humanize_duration_a_few_seconds" id="0x7f120c0d" />
+    <public type="string" name="humanize_duration_days" id="0x7f120c0e" />
+    <public type="string" name="humanize_duration_hours" id="0x7f120c0f" />
+    <public type="string" name="humanize_duration_minutes" id="0x7f120c10" />
+    <public type="string" name="humanize_duration_seconds" id="0x7f120c11" />
+    <public type="string" name="hypesquad_attendee_cta" id="0x7f120c12" />
+    <public type="string" name="hypesquad_badge_tooltip" id="0x7f120c13" />
+    <public type="string" name="hypesquad_description_house_1" id="0x7f120c14" />
+    <public type="string" name="hypesquad_description_house_2" id="0x7f120c15" />
+    <public type="string" name="hypesquad_description_house_3" id="0x7f120c16" />
+    <public type="string" name="hypesquad_error_body" id="0x7f120c17" />
+    <public type="string" name="hypesquad_error_heading" id="0x7f120c18" />
+    <public type="string" name="hypesquad_heading" id="0x7f120c19" />
+    <public type="string" name="hypesquad_heading_existing_member" id="0x7f120c1a" />
+    <public type="string" name="hypesquad_house_1" id="0x7f120c1b" />
+    <public type="string" name="hypesquad_house_2" id="0x7f120c1c" />
+    <public type="string" name="hypesquad_house_3" id="0x7f120c1d" />
+    <public type="string" name="hypesquad_join" id="0x7f120c1e" />
+    <public type="string" name="hypesquad_leave_action" id="0x7f120c1f" />
+    <public type="string" name="hypesquad_leave_error" id="0x7f120c20" />
+    <public type="string" name="hypesquad_leave_prompt" id="0x7f120c21" />
+    <public type="string" name="hypesquad_membership_heading" id="0x7f120c22" />
+    <public type="string" name="hypesquad_newsletter_warning" id="0x7f120c23" />
+    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7f120c24" />
+    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7f120c25" />
+    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7f120c26" />
+    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7f120c27" />
+    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7f120c28" />
+    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7f120c29" />
+    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7f120c2a" />
+    <public type="string" name="hypesquad_perks_heading" id="0x7f120c2b" />
+    <public type="string" name="hypesquad_question_0_prompt" id="0x7f120c2c" />
+    <public type="string" name="hypesquad_question_0_response_a" id="0x7f120c2d" />
+    <public type="string" name="hypesquad_question_0_response_b" id="0x7f120c2e" />
+    <public type="string" name="hypesquad_question_0_response_c" id="0x7f120c2f" />
+    <public type="string" name="hypesquad_question_0_response_d" id="0x7f120c30" />
+    <public type="string" name="hypesquad_question_10_prompt" id="0x7f120c31" />
+    <public type="string" name="hypesquad_question_10_response_a" id="0x7f120c32" />
+    <public type="string" name="hypesquad_question_10_response_b" id="0x7f120c33" />
+    <public type="string" name="hypesquad_question_10_response_c" id="0x7f120c34" />
+    <public type="string" name="hypesquad_question_10_response_d" id="0x7f120c35" />
+    <public type="string" name="hypesquad_question_11_prompt" id="0x7f120c36" />
+    <public type="string" name="hypesquad_question_11_response_a" id="0x7f120c37" />
+    <public type="string" name="hypesquad_question_11_response_b" id="0x7f120c38" />
+    <public type="string" name="hypesquad_question_11_response_c" id="0x7f120c39" />
+    <public type="string" name="hypesquad_question_11_response_d" id="0x7f120c3a" />
+    <public type="string" name="hypesquad_question_12_prompt" id="0x7f120c3b" />
+    <public type="string" name="hypesquad_question_12_response_a" id="0x7f120c3c" />
+    <public type="string" name="hypesquad_question_12_response_b" id="0x7f120c3d" />
+    <public type="string" name="hypesquad_question_12_response_c" id="0x7f120c3e" />
+    <public type="string" name="hypesquad_question_12_response_d" id="0x7f120c3f" />
+    <public type="string" name="hypesquad_question_13_prompt" id="0x7f120c40" />
+    <public type="string" name="hypesquad_question_13_response_a" id="0x7f120c41" />
+    <public type="string" name="hypesquad_question_13_response_b" id="0x7f120c42" />
+    <public type="string" name="hypesquad_question_13_response_c" id="0x7f120c43" />
+    <public type="string" name="hypesquad_question_13_response_d" id="0x7f120c44" />
+    <public type="string" name="hypesquad_question_14_prompt" id="0x7f120c45" />
+    <public type="string" name="hypesquad_question_14_response_a" id="0x7f120c46" />
+    <public type="string" name="hypesquad_question_14_response_b" id="0x7f120c47" />
+    <public type="string" name="hypesquad_question_14_response_c" id="0x7f120c48" />
+    <public type="string" name="hypesquad_question_14_response_d" id="0x7f120c49" />
+    <public type="string" name="hypesquad_question_1_prompt" id="0x7f120c4a" />
+    <public type="string" name="hypesquad_question_1_response_a" id="0x7f120c4b" />
+    <public type="string" name="hypesquad_question_1_response_b" id="0x7f120c4c" />
+    <public type="string" name="hypesquad_question_1_response_c" id="0x7f120c4d" />
+    <public type="string" name="hypesquad_question_1_response_d" id="0x7f120c4e" />
+    <public type="string" name="hypesquad_question_2_prompt" id="0x7f120c4f" />
+    <public type="string" name="hypesquad_question_2_response_a" id="0x7f120c50" />
+    <public type="string" name="hypesquad_question_2_response_b" id="0x7f120c51" />
+    <public type="string" name="hypesquad_question_2_response_c" id="0x7f120c52" />
+    <public type="string" name="hypesquad_question_2_response_d" id="0x7f120c53" />
+    <public type="string" name="hypesquad_question_3_prompt" id="0x7f120c54" />
+    <public type="string" name="hypesquad_question_3_response_a" id="0x7f120c55" />
+    <public type="string" name="hypesquad_question_3_response_b" id="0x7f120c56" />
+    <public type="string" name="hypesquad_question_3_response_c" id="0x7f120c57" />
+    <public type="string" name="hypesquad_question_3_response_d" id="0x7f120c58" />
+    <public type="string" name="hypesquad_question_4_prompt" id="0x7f120c59" />
+    <public type="string" name="hypesquad_question_4_response_a" id="0x7f120c5a" />
+    <public type="string" name="hypesquad_question_4_response_b" id="0x7f120c5b" />
+    <public type="string" name="hypesquad_question_4_response_c" id="0x7f120c5c" />
+    <public type="string" name="hypesquad_question_4_response_d" id="0x7f120c5d" />
+    <public type="string" name="hypesquad_question_5_prompt" id="0x7f120c5e" />
+    <public type="string" name="hypesquad_question_5_response_a" id="0x7f120c5f" />
+    <public type="string" name="hypesquad_question_5_response_b" id="0x7f120c60" />
+    <public type="string" name="hypesquad_question_5_response_c" id="0x7f120c61" />
+    <public type="string" name="hypesquad_question_5_response_d" id="0x7f120c62" />
+    <public type="string" name="hypesquad_question_6_prompt" id="0x7f120c63" />
+    <public type="string" name="hypesquad_question_6_response_a" id="0x7f120c64" />
+    <public type="string" name="hypesquad_question_6_response_b" id="0x7f120c65" />
+    <public type="string" name="hypesquad_question_6_response_c" id="0x7f120c66" />
+    <public type="string" name="hypesquad_question_6_response_d" id="0x7f120c67" />
+    <public type="string" name="hypesquad_question_7_prompt" id="0x7f120c68" />
+    <public type="string" name="hypesquad_question_7_response_a" id="0x7f120c69" />
+    <public type="string" name="hypesquad_question_7_response_b" id="0x7f120c6a" />
+    <public type="string" name="hypesquad_question_7_response_c" id="0x7f120c6b" />
+    <public type="string" name="hypesquad_question_7_response_d" id="0x7f120c6c" />
+    <public type="string" name="hypesquad_question_8_prompt" id="0x7f120c6d" />
+    <public type="string" name="hypesquad_question_8_response_a" id="0x7f120c6e" />
+    <public type="string" name="hypesquad_question_8_response_b" id="0x7f120c6f" />
+    <public type="string" name="hypesquad_question_8_response_c" id="0x7f120c70" />
+    <public type="string" name="hypesquad_question_8_response_d" id="0x7f120c71" />
+    <public type="string" name="hypesquad_question_9_prompt" id="0x7f120c72" />
+    <public type="string" name="hypesquad_question_9_response_a" id="0x7f120c73" />
+    <public type="string" name="hypesquad_question_9_response_b" id="0x7f120c74" />
+    <public type="string" name="hypesquad_question_9_response_c" id="0x7f120c75" />
+    <public type="string" name="hypesquad_question_9_response_d" id="0x7f120c76" />
+    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7f120c77" />
+    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7f120c78" />
+    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7f120c79" />
+    <public type="string" name="hypesquad_quiz_cancel" id="0x7f120c7a" />
+    <public type="string" name="hypesquad_quiz_close" id="0x7f120c7b" />
+    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7f120c7c" />
+    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7f120c7d" />
+    <public type="string" name="hypesquad_quiz_next_question" id="0x7f120c7e" />
+    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7f120c7f" />
+    <public type="string" name="hypesquad_quiz_retry" id="0x7f120c80" />
+    <public type="string" name="hypesquad_quiz_select_answer" id="0x7f120c81" />
+    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7f120c82" />
+    <public type="string" name="hypesquad_quiz_title" id="0x7f120c83" />
+    <public type="string" name="hypesquad_ready_to_rep" id="0x7f120c84" />
+    <public type="string" name="hypesquad_subheading" id="0x7f120c85" />
+    <public type="string" name="hypesquad_switch_houses_action" id="0x7f120c86" />
+    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7f120c87" />
+    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7f120c88" />
+    <public type="string" name="hypesquad_unverified_email_notice" id="0x7f120c89" />
+    <public type="string" name="hypesquad_your_house" id="0x7f120c8a" />
+    <public type="string" name="i18n_locale_loading_error" id="0x7f120c8b" />
+    <public type="string" name="icon_content_description" id="0x7f120c8c" />
+    <public type="string" name="image" id="0x7f120c8d" />
+    <public type="string" name="image_actions_menu_label" id="0x7f120c8e" />
+    <public type="string" name="images" id="0x7f120c8f" />
+    <public type="string" name="img_alt_attachment_file_type" id="0x7f120c90" />
+    <public type="string" name="img_alt_emoji" id="0x7f120c91" />
+    <public type="string" name="img_alt_icon" id="0x7f120c92" />
+    <public type="string" name="img_alt_logo" id="0x7f120c93" />
+    <public type="string" name="in_category" id="0x7f120c94" />
+    <public type="string" name="in_game_voice_settings" id="0x7f120c95" />
+    <public type="string" name="in_the_voice_channel" id="0x7f120c96" />
+    <public type="string" name="inbox" id="0x7f120c97" />
+    <public type="string" name="incoming_call" id="0x7f120c98" />
+    <public type="string" name="incoming_call_ellipsis" id="0x7f120c99" />
+    <public type="string" name="incoming_call_preview_camera" id="0x7f120c9a" />
+    <public type="string" name="incoming_friend_request" id="0x7f120c9b" />
+    <public type="string" name="incoming_friend_requests_count" id="0x7f120c9c" />
+    <public type="string" name="incoming_video_call" id="0x7f120c9d" />
+    <public type="string" name="incoming_video_call_ellipsis" id="0x7f120c9e" />
+    <public type="string" name="incompatible_browser" id="0x7f120c9f" />
+    <public type="string" name="inivte_modal_no_thanks" id="0x7f120ca0" />
+    <public type="string" name="inline_attachment_media" id="0x7f120ca1" />
+    <public type="string" name="inline_attachment_media_help" id="0x7f120ca2" />
+    <public type="string" name="inline_embed_media" id="0x7f120ca3" />
+    <public type="string" name="inline_media_label" id="0x7f120ca4" />
+    <public type="string" name="input_device" id="0x7f120ca5" />
+    <public type="string" name="input_mode_ptt" id="0x7f120ca6" />
+    <public type="string" name="input_mode_ptt_limited" id="0x7f120ca7" />
+    <public type="string" name="input_mode_ptt_release_delay" id="0x7f120ca8" />
+    <public type="string" name="input_mode_vad" id="0x7f120ca9" />
+    <public type="string" name="instagram" id="0x7f120caa" />
+    <public type="string" name="install_location_main" id="0x7f120cab" />
+    <public type="string" name="instant_invite" id="0x7f120cac" />
+    <public type="string" name="instant_invite_accept" id="0x7f120cad" />
+    <public type="string" name="instant_invite_accepting" id="0x7f120cae" />
+    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7f120caf" />
+    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7f120cb0" />
+    <public type="string" name="instant_invite_banned" id="0x7f120cb1" />
+    <public type="string" name="instant_invite_banned_info" id="0x7f120cb2" />
+    <public type="string" name="instant_invite_expired" id="0x7f120cb3" />
+    <public type="string" name="instant_invite_expires" id="0x7f120cb4" />
+    <public type="string" name="instant_invite_failed_to_generate" id="0x7f120cb5" />
+    <public type="string" name="instant_invite_friends" id="0x7f120cb6" />
+    <public type="string" name="instant_invite_friends_description" id="0x7f120cb7" />
+    <public type="string" name="instant_invite_generated_by_widget" id="0x7f120cb8" />
+    <public type="string" name="instant_invite_guild_by_user" id="0x7f120cb9" />
+    <public type="string" name="instant_invite_guild_members_online" id="0x7f120cba" />
+    <public type="string" name="instant_invite_guild_members_total" id="0x7f120cbb" />
+    <public type="string" name="instant_invite_hidden" id="0x7f120cbc" />
+    <public type="string" name="instant_invite_invalid_channel" id="0x7f120cbd" />
+    <public type="string" name="instant_invite_invite_code" id="0x7f120cbe" />
+    <public type="string" name="instant_invite_inviter" id="0x7f120cbf" />
+    <public type="string" name="instant_invite_looks_like" id="0x7f120cc0" />
+    <public type="string" name="instant_invite_not_allowed" id="0x7f120cc1" />
+    <public type="string" name="instant_invite_resolved_title" id="0x7f120cc2" />
+    <public type="string" name="instant_invite_resolving" id="0x7f120cc3" />
+    <public type="string" name="instant_invite_uses" id="0x7f120cc4" />
+    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7f120cc5" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7f120cc6" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7f120cc7" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7f120cc8" />
+    <public type="string" name="instant_invite_you_have_joined" id="0x7f120cc9" />
+    <public type="string" name="instant_invites" id="0x7f120cca" />
+    <public type="string" name="integration_added_date" id="0x7f120ccb" />
+    <public type="string" name="integration_added_user" id="0x7f120ccc" />
+    <public type="string" name="integration_added_user_date" id="0x7f120ccd" />
+    <public type="string" name="integration_created_date" id="0x7f120cce" />
+    <public type="string" name="integration_created_user_date" id="0x7f120ccf" />
+    <public type="string" name="integration_settings" id="0x7f120cd0" />
+    <public type="string" name="integrations" id="0x7f120cd1" />
+    <public type="string" name="integrations_account_description" id="0x7f120cd2" />
+    <public type="string" name="integrations_application_added_by" id="0x7f120cd3" />
+    <public type="string" name="integrations_application_bot" id="0x7f120cd4" />
+    <public type="string" name="integrations_application_bot_name" id="0x7f120cd5" />
+    <public type="string" name="integrations_application_button" id="0x7f120cd6" />
+    <public type="string" name="integrations_application_denied_permissions" id="0x7f120cd7" />
+    <public type="string" name="integrations_application_granted_permissions" id="0x7f120cd8" />
+    <public type="string" name="integrations_application_no_bot" id="0x7f120cd9" />
+    <public type="string" name="integrations_application_no_webhooks" id="0x7f120cda" />
+    <public type="string" name="integrations_application_remove" id="0x7f120cdb" />
+    <public type="string" name="integrations_application_remove_body" id="0x7f120cdc" />
+    <public type="string" name="integrations_application_remove_error" id="0x7f120cdd" />
+    <public type="string" name="integrations_application_remove_error_title" id="0x7f120cde" />
+    <public type="string" name="integrations_application_remove_no_permissions" id="0x7f120cdf" />
+    <public type="string" name="integrations_application_remove_summary" id="0x7f120ce0" />
+    <public type="string" name="integrations_application_remove_title" id="0x7f120ce1" />
+    <public type="string" name="integrations_application_section" id="0x7f120ce2" />
+    <public type="string" name="integrations_application_verified_bot" id="0x7f120ce3" />
+    <public type="string" name="integrations_application_webhooks" id="0x7f120ce4" />
+    <public type="string" name="integrations_channel_following" id="0x7f120ce5" />
+    <public type="string" name="integrations_channel_following_button" id="0x7f120ce6" />
+    <public type="string" name="integrations_channel_following_description" id="0x7f120ce7" />
+    <public type="string" name="integrations_channel_following_empty" id="0x7f120ce8" />
+    <public type="string" name="integrations_channel_following_empty_button" id="0x7f120ce9" />
+    <public type="string" name="integrations_channel_following_section" id="0x7f120cea" />
+    <public type="string" name="integrations_channel_following_summary" id="0x7f120ceb" />
+    <public type="string" name="integrations_channel_following_title" id="0x7f120cec" />
+    <public type="string" name="integrations_disable" id="0x7f120ced" />
+    <public type="string" name="integrations_enable" id="0x7f120cee" />
+    <public type="string" name="integrations_enabled" id="0x7f120cef" />
+    <public type="string" name="integrations_followed_channel_delete" id="0x7f120cf0" />
+    <public type="string" name="integrations_followed_channel_delete_body" id="0x7f120cf1" />
+    <public type="string" name="integrations_followed_channel_delete_title" id="0x7f120cf2" />
+    <public type="string" name="integrations_followed_channel_dest_channel" id="0x7f120cf3" />
+    <public type="string" name="integrations_followed_channel_error_deleting" id="0x7f120cf4" />
+    <public type="string" name="integrations_followed_channel_guild_source" id="0x7f120cf5" />
+    <public type="string" name="integrations_followed_channel_name" id="0x7f120cf6" />
+    <public type="string" name="integrations_last_sync" id="0x7f120cf7" />
+    <public type="string" name="integrations_overview" id="0x7f120cf8" />
+    <public type="string" name="integrations_overview_description_channel" id="0x7f120cf9" />
+    <public type="string" name="integrations_overview_description_guild" id="0x7f120cfa" />
+    <public type="string" name="integrations_overview_no_applications" id="0x7f120cfb" />
+    <public type="string" name="integrations_twitch" id="0x7f120cfc" />
+    <public type="string" name="integrations_twitch_button" id="0x7f120cfd" />
+    <public type="string" name="integrations_twitch_description" id="0x7f120cfe" />
+    <public type="string" name="integrations_twitch_empty_button" id="0x7f120cff" />
+    <public type="string" name="integrations_twitch_empty_summary" id="0x7f120d00" />
+    <public type="string" name="integrations_twitch_help" id="0x7f120d01" />
+    <public type="string" name="integrations_twitch_summary" id="0x7f120d02" />
+    <public type="string" name="integrations_webhook_copied_url" id="0x7f120d03" />
+    <public type="string" name="integrations_webhook_copy_url" id="0x7f120d04" />
+    <public type="string" name="integrations_webhook_delete" id="0x7f120d05" />
+    <public type="string" name="integrations_webhooks" id="0x7f120d06" />
+    <public type="string" name="integrations_webhooks_button" id="0x7f120d07" />
+    <public type="string" name="integrations_webhooks_count" id="0x7f120d08" />
+    <public type="string" name="integrations_webhooks_create" id="0x7f120d09" />
+    <public type="string" name="integrations_webhooks_description" id="0x7f120d0a" />
+    <public type="string" name="integrations_webhooks_empty" id="0x7f120d0b" />
+    <public type="string" name="integrations_webhooks_empty_button" id="0x7f120d0c" />
+    <public type="string" name="integrations_webhooks_summary" id="0x7f120d0d" />
+    <public type="string" name="integrations_youtube" id="0x7f120d0e" />
+    <public type="string" name="integrations_youtube_button" id="0x7f120d0f" />
+    <public type="string" name="integrations_youtube_description" id="0x7f120d10" />
+    <public type="string" name="integrations_youtube_empty_button" id="0x7f120d11" />
+    <public type="string" name="integrations_youtube_empty_summary" id="0x7f120d12" />
+    <public type="string" name="integrations_youtube_help" id="0x7f120d13" />
+    <public type="string" name="integrations_youtube_summary" id="0x7f120d14" />
+    <public type="string" name="interaction_required_body" id="0x7f120d15" />
+    <public type="string" name="interaction_required_title" id="0x7f120d16" />
+    <public type="string" name="internal_server_error" id="0x7f120d17" />
+    <public type="string" name="invalid_animated_emoji_body" id="0x7f120d18" />
+    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7f120d19" />
+    <public type="string" name="invalid_attachments_failure" id="0x7f120d1a" />
+    <public type="string" name="invalid_external_emoji_body" id="0x7f120d1b" />
+    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7f120d1c" />
+    <public type="string" name="invalid_invite_link_error" id="0x7f120d1d" />
+    <public type="string" name="invalid_text_channel" id="0x7f120d1e" />
+    <public type="string" name="invalid_voice_channel" id="0x7f120d1f" />
+    <public type="string" name="invite_button_body_in_guild" id="0x7f120d20" />
+    <public type="string" name="invite_button_expired" id="0x7f120d21" />
+    <public type="string" name="invite_button_invalid" id="0x7f120d22" />
+    <public type="string" name="invite_button_invalid_owner" id="0x7f120d23" />
+    <public type="string" name="invite_button_resolving" id="0x7f120d24" />
+    <public type="string" name="invite_button_stream_ended" id="0x7f120d25" />
+    <public type="string" name="invite_button_stream_ended_streamer" id="0x7f120d26" />
+    <public type="string" name="invite_button_stream_watching" id="0x7f120d27" />
+    <public type="string" name="invite_button_streamer" id="0x7f120d28" />
+    <public type="string" name="invite_button_streaming" id="0x7f120d29" />
+    <public type="string" name="invite_button_streaming_subtext" id="0x7f120d2a" />
+    <public type="string" name="invite_button_title_invited" id="0x7f120d2b" />
+    <public type="string" name="invite_button_title_invited_group_dm" id="0x7f120d2c" />
+    <public type="string" name="invite_button_title_invited_invalid" id="0x7f120d2d" />
+    <public type="string" name="invite_button_title_invited_stream" id="0x7f120d2e" />
+    <public type="string" name="invite_button_title_invited_voice_channel" id="0x7f120d2f" />
+    <public type="string" name="invite_button_title_inviter" id="0x7f120d30" />
+    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7f120d31" />
+    <public type="string" name="invite_button_title_inviter_invalid" id="0x7f120d32" />
+    <public type="string" name="invite_button_title_inviter_stream" id="0x7f120d33" />
+    <public type="string" name="invite_button_title_inviter_voice_channel" id="0x7f120d34" />
+    <public type="string" name="invite_button_title_streaming" id="0x7f120d35" />
+    <public type="string" name="invite_copied" id="0x7f120d36" />
+    <public type="string" name="invite_copy_invite_link_header_mobile" id="0x7f120d37" />
+    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7f120d38" />
+    <public type="string" name="invite_edit_link" id="0x7f120d39" />
+    <public type="string" name="invite_embed_ask_to_join" id="0x7f120d3a" />
+    <public type="string" name="invite_embed_full_group" id="0x7f120d3b" />
+    <public type="string" name="invite_embed_game_has_ended" id="0x7f120d3c" />
+    <public type="string" name="invite_embed_game_invite" id="0x7f120d3d" />
+    <public type="string" name="invite_embed_in_group" id="0x7f120d3e" />
+    <public type="string" name="invite_embed_invite_to_join" id="0x7f120d3f" />
+    <public type="string" name="invite_embed_invite_to_join_group" id="0x7f120d40" />
+    <public type="string" name="invite_embed_invite_to_listen" id="0x7f120d41" />
+    <public type="string" name="invite_embed_invite_to_watch" id="0x7f120d42" />
+    <public type="string" name="invite_embed_join_via_android" id="0x7f120d43" />
+    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7f120d44" />
+    <public type="string" name="invite_embed_join_via_ios" id="0x7f120d45" />
+    <public type="string" name="invite_embed_join_via_xbox" id="0x7f120d46" />
+    <public type="string" name="invite_embed_joined" id="0x7f120d47" />
+    <public type="string" name="invite_embed_listen_has_ended" id="0x7f120d48" />
+    <public type="string" name="invite_embed_listening_invite" id="0x7f120d49" />
+    <public type="string" name="invite_embed_num_open_slots" id="0x7f120d4a" />
+    <public type="string" name="invite_embed_send_invite" id="0x7f120d4b" />
+    <public type="string" name="invite_embed_watch_has_ended" id="0x7f120d4c" />
+    <public type="string" name="invite_empty_body" id="0x7f120d4d" />
+    <public type="string" name="invite_empty_title" id="0x7f120d4e" />
+    <public type="string" name="invite_expired_subtext_mobile" id="0x7f120d4f" />
+    <public type="string" name="invite_expires_days" id="0x7f120d50" />
+    <public type="string" name="invite_expires_days_or_uses" id="0x7f120d51" />
+    <public type="string" name="invite_expires_hours" id="0x7f120d52" />
+    <public type="string" name="invite_expires_hours_or_uses" id="0x7f120d53" />
+    <public type="string" name="invite_expires_minutes" id="0x7f120d54" />
+    <public type="string" name="invite_expires_minutes_or_uses" id="0x7f120d55" />
+    <public type="string" name="invite_expires_never" id="0x7f120d56" />
+    <public type="string" name="invite_expires_uses" id="0x7f120d57" />
+    <public type="string" name="invite_footer_link_header" id="0x7f120d58" />
+    <public type="string" name="invite_friend_modal_invite" id="0x7f120d59" />
+    <public type="string" name="invite_friend_modal_loading" id="0x7f120d5a" />
+    <public type="string" name="invite_friend_modal_no_results" id="0x7f120d5b" />
+    <public type="string" name="invite_friend_modal_retry" id="0x7f120d5c" />
+    <public type="string" name="invite_friend_modal_sent" id="0x7f120d5d" />
+    <public type="string" name="invite_friend_modal_title" id="0x7f120d5e" />
+    <public type="string" name="invite_friends" id="0x7f120d5f" />
+    <public type="string" name="invite_invalid_cta" id="0x7f120d60" />
+    <public type="string" name="invite_invalid_error" id="0x7f120d61" />
+    <public type="string" name="invite_link_copied" id="0x7f120d62" />
+    <public type="string" name="invite_link_example_full" id="0x7f120d63" />
+    <public type="string" name="invite_link_example_simple" id="0x7f120d64" />
+    <public type="string" name="invite_link_example_verified" id="0x7f120d65" />
+    <public type="string" name="invite_links_expire_after_1_day" id="0x7f120d66" />
+    <public type="string" name="invite_members" id="0x7f120d67" />
+    <public type="string" name="invite_modal_button" id="0x7f120d68" />
+    <public type="string" name="invite_modal_error_default" id="0x7f120d69" />
+    <public type="string" name="invite_modal_error_title" id="0x7f120d6a" />
+    <public type="string" name="invite_modal_open_button" id="0x7f120d6b" />
+    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7f120d6c" />
+    <public type="string" name="invite_no_thanks" id="0x7f120d6d" />
+    <public type="string" name="invite_notice_message" id="0x7f120d6e" />
+    <public type="string" name="invite_notice_message_part_2" id="0x7f120d6f" />
+    <public type="string" name="invite_people" id="0x7f120d70" />
+    <public type="string" name="invite_pokemon_go_announcements_label_long" id="0x7f120d71" />
+    <public type="string" name="invite_pokemon_go_announcements_label_short" id="0x7f120d72" />
+    <public type="string" name="invite_pokemon_go_friendship_label_long" id="0x7f120d73" />
+    <public type="string" name="invite_pokemon_go_friendship_label_short" id="0x7f120d74" />
+    <public type="string" name="invite_pokemon_go_strategy_label_long" id="0x7f120d75" />
+    <public type="string" name="invite_pokemon_go_strategy_label_short" id="0x7f120d76" />
+    <public type="string" name="invite_private_call_heads_up" id="0x7f120d77" />
+    <public type="string" name="invite_search_for_friends" id="0x7f120d78" />
+    <public type="string" name="invite_sent" id="0x7f120d79" />
+    <public type="string" name="invite_settings_description_no_expiration" id="0x7f120d7a" />
+    <public type="string" name="invite_settings_expired_description" id="0x7f120d7b" />
+    <public type="string" name="invite_settings_title" id="0x7f120d7c" />
+    <public type="string" name="invite_share_link_header_mobile" id="0x7f120d7d" />
+    <public type="string" name="invite_share_link_own_server" id="0x7f120d7e" />
+    <public type="string" name="invite_share_link_to_stream" id="0x7f120d7f" />
+    <public type="string" name="invite_step_subtitle" id="0x7f120d80" />
+    <public type="string" name="invite_step_title" id="0x7f120d81" />
+    <public type="string" name="invite_stream_footer_link_header" id="0x7f120d82" />
+    <public type="string" name="invite_stream_header" id="0x7f120d83" />
+    <public type="string" name="invite_to_server" id="0x7f120d84" />
+    <public type="string" name="invite_url" id="0x7f120d85" />
+    <public type="string" name="invite_voice_channel_join" id="0x7f120d86" />
+    <public type="string" name="invite_voice_empty_mobile" id="0x7f120d87" />
+    <public type="string" name="invite_welcome_heading" id="0x7f120d88" />
+    <public type="string" name="invite_welcome_subheading" id="0x7f120d89" />
+    <public type="string" name="invite_your_friends" id="0x7f120d8a" />
+    <public type="string" name="invite_your_friends_channel_mobile" id="0x7f120d8b" />
+    <public type="string" name="invite_your_friends_header_mobile" id="0x7f120d8c" />
+    <public type="string" name="invites" id="0x7f120d8d" />
+    <public type="string" name="ios_app_preview_description" id="0x7f120d8e" />
+    <public type="string" name="ios_automatic_theme" id="0x7f120d8f" />
+    <public type="string" name="ios_automatic_theme_short" id="0x7f120d90" />
+    <public type="string" name="ios_call_disconnected" id="0x7f120d91" />
+    <public type="string" name="ios_call_ended" id="0x7f120d92" />
+    <public type="string" name="ios_iap_generic_billing_error" id="0x7f120d93" />
+    <public type="string" name="ios_iap_itunes_error" id="0x7f120d94" />
+    <public type="string" name="ios_iap_manage_premium_guild_button" id="0x7f120d95" />
+    <public type="string" name="ios_iap_manage_subscription_button" id="0x7f120d96" />
+    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7f120d97" />
+    <public type="string" name="ios_iap_restore_subscription_error" id="0x7f120d98" />
+    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7f120d99" />
+    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7f120d9a" />
+    <public type="string" name="ios_iap_restore_subscription_success" id="0x7f120d9b" />
+    <public type="string" name="ios_iap_testflight_error" id="0x7f120d9c" />
+    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7f120d9d" />
+    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7f120d9e" />
+    <public type="string" name="ios_media_keyboard_more_photos" id="0x7f120d9f" />
+    <public type="string" name="ios_media_keyboard_no_permission" id="0x7f120da0" />
+    <public type="string" name="ios_media_keyboard_no_photos" id="0x7f120da1" />
+    <public type="string" name="ios_notification_see_full" id="0x7f120da2" />
+    <public type="string" name="ios_profile_in_voice_call" id="0x7f120da3" />
+    <public type="string" name="ios_profile_open_voice_channel" id="0x7f120da4" />
+    <public type="string" name="ios_share_suggestions_hint" id="0x7f120da5" />
+    <public type="string" name="ios_share_suggestions_toggle" id="0x7f120da6" />
+    <public type="string" name="ios_stream_participants_hidden" id="0x7f120da7" />
+    <public type="string" name="ios_stream_show_non_video" id="0x7f120da8" />
+    <public type="string" name="ios_view_all" id="0x7f120da9" />
+    <public type="string" name="ip_address_secured" id="0x7f120daa" />
+    <public type="string" name="ip_authorization_succeeded" id="0x7f120dab" />
+    <public type="string" name="it" id="0x7f120dac" />
+    <public type="string" name="item_view_role_description" id="0x7f120dad" />
+    <public type="string" name="ja" id="0x7f120dae" />
+    <public type="string" name="join" id="0x7f120daf" />
+    <public type="string" name="join_afk_channel_body" id="0x7f120db0" />
+    <public type="string" name="join_call" id="0x7f120db1" />
+    <public type="string" name="join_guild" id="0x7f120db2" />
+    <public type="string" name="join_guild_connect_cta" id="0x7f120db3" />
+    <public type="string" name="join_guild_connect_text" id="0x7f120db4" />
+    <public type="string" name="join_guild_description" id="0x7f120db5" />
+    <public type="string" name="join_server_button_body" id="0x7f120db6" />
+    <public type="string" name="join_server_button_cta" id="0x7f120db7" />
+    <public type="string" name="join_server_button_cta_mobile" id="0x7f120db8" />
+    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7f120db9" />
+    <public type="string" name="join_server_description" id="0x7f120dba" />
+    <public type="string" name="join_server_description_mobile" id="0x7f120dbb" />
+    <public type="string" name="join_server_description_mobile_refresh" id="0x7f120dbc" />
+    <public type="string" name="join_server_description_nuf" id="0x7f120dbd" />
+    <public type="string" name="join_server_invite_examples_header" id="0x7f120dbe" />
+    <public type="string" name="join_server_invite_examples_mobile_refresh" id="0x7f120dbf" />
+    <public type="string" name="join_server_title" id="0x7f120dc0" />
+    <public type="string" name="join_server_title_mobile_refresh" id="0x7f120dc1" />
+    <public type="string" name="join_stream" id="0x7f120dc2" />
+    <public type="string" name="join_thread" id="0x7f120dc3" />
+    <public type="string" name="join_video_call" id="0x7f120dc4" />
+    <public type="string" name="join_video_channel" id="0x7f120dc5" />
+    <public type="string" name="join_voice_call" id="0x7f120dc6" />
+    <public type="string" name="join_voice_channel" id="0x7f120dc7" />
+    <public type="string" name="join_voice_channel_cta" id="0x7f120dc8" />
+    <public type="string" name="joined_guild" id="0x7f120dc9" />
+    <public type="string" name="joining_guild" id="0x7f120dca" />
+    <public type="string" name="joining_voice_call_will_end_current_call_body" id="0x7f120dcb" />
+    <public type="string" name="joining_voice_channel_will_end_current_call_body" id="0x7f120dcc" />
+    <public type="string" name="joining_will_end_current_call_title" id="0x7f120dcd" />
+    <public type="string" name="jump" id="0x7f120dce" />
+    <public type="string" name="jump_to_channel" id="0x7f120dcf" />
+    <public type="string" name="jump_to_last_unread_message" id="0x7f120dd0" />
+    <public type="string" name="jump_to_message" id="0x7f120dd1" />
+    <public type="string" name="jump_to_present" id="0x7f120dd2" />
+    <public type="string" name="keep_permissions" id="0x7f120dd3" />
+    <public type="string" name="keybind_activate_overlay_chat" id="0x7f120dd4" />
+    <public type="string" name="keybind_conflict" id="0x7f120dd5" />
+    <public type="string" name="keybind_description_modal_call_accept" id="0x7f120dd6" />
+    <public type="string" name="keybind_description_modal_call_decline" id="0x7f120dd7" />
+    <public type="string" name="keybind_description_modal_call_start" id="0x7f120dd8" />
+    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7f120dd9" />
+    <public type="string" name="keybind_description_modal_create_guild" id="0x7f120dda" />
+    <public type="string" name="keybind_description_modal_easter_egg" id="0x7f120ddb" />
+    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7f120ddc" />
+    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7f120ddd" />
+    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7f120dde" />
+    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7f120ddf" />
+    <public type="string" name="keybind_description_modal_mark_top_inbox_channel_read" id="0x7f120de0" />
+    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7f120de1" />
+    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7f120de2" />
+    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7f120de3" />
+    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7f120de4" />
+    <public type="string" name="keybind_description_modal_search" id="0x7f120de5" />
+    <public type="string" name="keybind_description_modal_search_emojis" id="0x7f120de6" />
+    <public type="string" name="keybind_description_modal_search_gifs" id="0x7f120de7" />
+    <public type="string" name="keybind_description_modal_subtitle" id="0x7f120de8" />
+    <public type="string" name="keybind_description_modal_title" id="0x7f120de9" />
+    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7f120dea" />
+    <public type="string" name="keybind_description_modal_toggle_help" id="0x7f120deb" />
+    <public type="string" name="keybind_description_modal_toggle_inbox" id="0x7f120dec" />
+    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7f120ded" />
+    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7f120dee" />
+    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7f120def" />
+    <public type="string" name="keybind_description_modal_toggle_users" id="0x7f120df0" />
+    <public type="string" name="keybind_description_modal_unread_channels" id="0x7f120df1" />
+    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7f120df2" />
+    <public type="string" name="keybind_description_modal_upload_file" id="0x7f120df3" />
+    <public type="string" name="keybind_description_navigate_back" id="0x7f120df4" />
+    <public type="string" name="keybind_description_navigate_forward" id="0x7f120df5" />
+    <public type="string" name="keybind_description_push_to_mute" id="0x7f120df6" />
+    <public type="string" name="keybind_description_push_to_talk" id="0x7f120df7" />
+    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7f120df8" />
+    <public type="string" name="keybind_description_toggle_deafen" id="0x7f120df9" />
+    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7f120dfa" />
+    <public type="string" name="keybind_description_toggle_mute" id="0x7f120dfb" />
+    <public type="string" name="keybind_description_toggle_overlay" id="0x7f120dfc" />
+    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7f120dfd" />
+    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7f120dfe" />
+    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7f120dff" />
+    <public type="string" name="keybind_description_unassigned" id="0x7f120e00" />
+    <public type="string" name="keybind_navigate_back" id="0x7f120e01" />
+    <public type="string" name="keybind_navigate_forward" id="0x7f120e02" />
+    <public type="string" name="keybind_push_to_mute" id="0x7f120e03" />
+    <public type="string" name="keybind_push_to_talk" id="0x7f120e04" />
+    <public type="string" name="keybind_push_to_talk_priority" id="0x7f120e05" />
+    <public type="string" name="keybind_toggle_deafen" id="0x7f120e06" />
+    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7f120e07" />
+    <public type="string" name="keybind_toggle_mute" id="0x7f120e08" />
+    <public type="string" name="keybind_toggle_overlay" id="0x7f120e09" />
+    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7f120e0a" />
+    <public type="string" name="keybind_toggle_stream_mode" id="0x7f120e0b" />
+    <public type="string" name="keybind_toggle_voice_mode" id="0x7f120e0c" />
+    <public type="string" name="keybind_unassigned" id="0x7f120e0d" />
+    <public type="string" name="keybinds" id="0x7f120e0e" />
+    <public type="string" name="keyboard_behavior_mobile_header" id="0x7f120e0f" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7f120e10" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7f120e11" />
+    <public type="string" name="kick" id="0x7f120e12" />
+    <public type="string" name="kick_from_server" id="0x7f120e13" />
+    <public type="string" name="kick_members" id="0x7f120e14" />
+    <public type="string" name="kick_user" id="0x7f120e15" />
+    <public type="string" name="kick_user_body" id="0x7f120e16" />
+    <public type="string" name="kick_user_confirmed" id="0x7f120e17" />
+    <public type="string" name="kick_user_error_generic" id="0x7f120e18" />
+    <public type="string" name="kick_user_title" id="0x7f120e19" />
+    <public type="string" name="ko" id="0x7f120e1a" />
+    <public type="string" name="krisp_model_version" id="0x7f120e1b" />
+    <public type="string" name="label_with_online_status" id="0x7f120e1c" />
+    <public type="string" name="language" id="0x7f120e1d" />
+    <public type="string" name="language_not_found" id="0x7f120e1e" />
+    <public type="string" name="language_select" id="0x7f120e1f" />
+    <public type="string" name="language_updated" id="0x7f120e20" />
+    <public type="string" name="languages" id="0x7f120e21" />
+    <public type="string" name="large_guild_notify_all_messages_description" id="0x7f120e22" />
+    <public type="string" name="large_message_upload_subtitle" id="0x7f120e23" />
+    <public type="string" name="large_message_upload_title" id="0x7f120e24" />
+    <public type="string" name="last_seen" id="0x7f120e25" />
+    <public type="string" name="last_sync" id="0x7f120e26" />
+    <public type="string" name="last_thread_message" id="0x7f120e27" />
+    <public type="string" name="launch_app" id="0x7f120e28" />
+    <public type="string" name="learn_more" id="0x7f120e29" />
+    <public type="string" name="learn_more_link" id="0x7f120e2a" />
+    <public type="string" name="leave_call" id="0x7f120e2b" />
+    <public type="string" name="leave_group_dm" id="0x7f120e2c" />
+    <public type="string" name="leave_group_dm_body" id="0x7f120e2d" />
+    <public type="string" name="leave_group_dm_managed_body" id="0x7f120e2e" />
+    <public type="string" name="leave_group_dm_managed_title" id="0x7f120e2f" />
+    <public type="string" name="leave_group_dm_title" id="0x7f120e30" />
+    <public type="string" name="leave_server" id="0x7f120e31" />
+    <public type="string" name="leave_server_body" id="0x7f120e32" />
+    <public type="string" name="leave_server_body_mobile" id="0x7f120e33" />
+    <public type="string" name="leave_server_title" id="0x7f120e34" />
+    <public type="string" name="leave_thread" id="0x7f120e35" />
+    <public type="string" name="lets_go" id="0x7f120e36" />
+    <public type="string" name="library" id="0x7f120e37" />
+    <public type="string" name="light_blue" id="0x7f120e38" />
+    <public type="string" name="light_green" id="0x7f120e39" />
+    <public type="string" name="light_grey" id="0x7f120e3a" />
+    <public type="string" name="link_copied" id="0x7f120e3b" />
+    <public type="string" name="link_settings" id="0x7f120e3c" />
+    <public type="string" name="link_your_discord_account" id="0x7f120e3d" />
+    <public type="string" name="link_your_xbox_account_1" id="0x7f120e3e" />
+    <public type="string" name="link_your_xbox_account_2" id="0x7f120e3f" />
+    <public type="string" name="linux" id="0x7f120e40" />
+    <public type="string" name="listen_on_spotify" id="0x7f120e41" />
+    <public type="string" name="listening_to" id="0x7f120e42" />
+    <public type="string" name="live" id="0x7f120e43" />
+    <public type="string" name="live_viewers" id="0x7f120e44" />
+    <public type="string" name="load_image_error" id="0x7f120e45" />
+    <public type="string" name="load_more_messages" id="0x7f120e46" />
+    <public type="string" name="load_reactions_error" id="0x7f120e47" />
+    <public type="string" name="loading" id="0x7f120e48" />
+    <public type="string" name="loading_did_you_know" id="0x7f120e49" />
+    <public type="string" name="loading_keybind_tip_1" id="0x7f120e4a" />
+    <public type="string" name="loading_keybind_tip_2" id="0x7f120e4b" />
+    <public type="string" name="loading_keybind_tip_3" id="0x7f120e4c" />
+    <public type="string" name="loading_keybind_tip_4" id="0x7f120e4d" />
+    <public type="string" name="loading_keybind_tip_5" id="0x7f120e4e" />
+    <public type="string" name="loading_keybind_tip_6" id="0x7f120e4f" />
+    <public type="string" name="loading_keybind_tip_7" id="0x7f120e50" />
+    <public type="string" name="loading_keybind_tip_8" id="0x7f120e51" />
+    <public type="string" name="loading_line_1" id="0x7f120e52" />
+    <public type="string" name="loading_line_10" id="0x7f120e53" />
+    <public type="string" name="loading_line_11" id="0x7f120e54" />
+    <public type="string" name="loading_line_12" id="0x7f120e55" />
+    <public type="string" name="loading_line_13" id="0x7f120e56" />
+    <public type="string" name="loading_line_14" id="0x7f120e57" />
+    <public type="string" name="loading_line_15" id="0x7f120e58" />
+    <public type="string" name="loading_line_2" id="0x7f120e59" />
+    <public type="string" name="loading_line_3" id="0x7f120e5a" />
+    <public type="string" name="loading_line_4" id="0x7f120e5b" />
+    <public type="string" name="loading_line_5" id="0x7f120e5c" />
+    <public type="string" name="loading_line_6" id="0x7f120e5d" />
+    <public type="string" name="loading_line_7" id="0x7f120e5e" />
+    <public type="string" name="loading_line_8" id="0x7f120e5f" />
+    <public type="string" name="loading_line_9" id="0x7f120e60" />
+    <public type="string" name="loading_messages_a11y_label" id="0x7f120e61" />
+    <public type="string" name="loading_note" id="0x7f120e62" />
+    <public type="string" name="loading_tip_1" id="0x7f120e63" />
+    <public type="string" name="loading_tip_10" id="0x7f120e64" />
+    <public type="string" name="loading_tip_11" id="0x7f120e65" />
+    <public type="string" name="loading_tip_12" id="0x7f120e66" />
+    <public type="string" name="loading_tip_13" id="0x7f120e67" />
+    <public type="string" name="loading_tip_14" id="0x7f120e68" />
+    <public type="string" name="loading_tip_15" id="0x7f120e69" />
+    <public type="string" name="loading_tip_16" id="0x7f120e6a" />
+    <public type="string" name="loading_tip_17" id="0x7f120e6b" />
+    <public type="string" name="loading_tip_18" id="0x7f120e6c" />
+    <public type="string" name="loading_tip_19" id="0x7f120e6d" />
+    <public type="string" name="loading_tip_2" id="0x7f120e6e" />
+    <public type="string" name="loading_tip_20" id="0x7f120e6f" />
+    <public type="string" name="loading_tip_21" id="0x7f120e70" />
+    <public type="string" name="loading_tip_22" id="0x7f120e71" />
+    <public type="string" name="loading_tip_23" id="0x7f120e72" />
+    <public type="string" name="loading_tip_24" id="0x7f120e73" />
+    <public type="string" name="loading_tip_25" id="0x7f120e74" />
+    <public type="string" name="loading_tip_3" id="0x7f120e75" />
+    <public type="string" name="loading_tip_4" id="0x7f120e76" />
+    <public type="string" name="loading_tip_5" id="0x7f120e77" />
+    <public type="string" name="loading_tip_6" id="0x7f120e78" />
+    <public type="string" name="loading_tip_7" id="0x7f120e79" />
+    <public type="string" name="loading_tip_8" id="0x7f120e7a" />
+    <public type="string" name="loading_tip_9" id="0x7f120e7b" />
+    <public type="string" name="loading_your_pin" id="0x7f120e7c" />
+    <public type="string" name="lobby" id="0x7f120e7d" />
+    <public type="string" name="local_muted" id="0x7f120e7e" />
+    <public type="string" name="local_push_notification_guild_verification_body" id="0x7f120e7f" />
+    <public type="string" name="local_video_disabled" id="0x7f120e80" />
+    <public type="string" name="locale" id="0x7f120e81" />
+    <public type="string" name="login" id="0x7f120e82" />
+    <public type="string" name="login_as" id="0x7f120e83" />
+    <public type="string" name="login_body" id="0x7f120e84" />
+    <public type="string" name="login_title" id="0x7f120e85" />
+    <public type="string" name="login_with_qr" id="0x7f120e86" />
+    <public type="string" name="login_with_qr_description" id="0x7f120e87" />
+    <public type="string" name="logout" id="0x7f120e88" />
+    <public type="string" name="low_quality_image_mode" id="0x7f120e89" />
+    <public type="string" name="low_quality_image_mode_help" id="0x7f120e8a" />
+    <public type="string" name="lt" id="0x7f120e8b" />
+    <public type="string" name="lurker_mode_chat_input_button" id="0x7f120e8c" />
+    <public type="string" name="lurker_mode_chat_input_message" id="0x7f120e8d" />
+    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7f120e8e" />
+    <public type="string" name="lurker_mode_nag_bar_button" id="0x7f120e8f" />
+    <public type="string" name="lurker_mode_nag_bar_header" id="0x7f120e90" />
+    <public type="string" name="lurker_mode_popout_cancel" id="0x7f120e91" />
+    <public type="string" name="lurker_mode_popout_chat_header" id="0x7f120e92" />
+    <public type="string" name="lurker_mode_popout_join" id="0x7f120e93" />
+    <public type="string" name="lurker_mode_popout_reactions_header" id="0x7f120e94" />
+    <public type="string" name="lurker_mode_popout_success_body" id="0x7f120e95" />
+    <public type="string" name="lurker_mode_popout_success_button" id="0x7f120e96" />
+    <public type="string" name="lurker_mode_popout_success_header" id="0x7f120e97" />
+    <public type="string" name="lurker_mode_popout_upsell_body" id="0x7f120e98" />
+    <public type="string" name="lurker_mode_view_guild" id="0x7f120e99" />
+    <public type="string" name="macos" id="0x7f120e9a" />
+    <public type="string" name="magenta" id="0x7f120e9b" />
+    <public type="string" name="manage_channel" id="0x7f120e9c" />
+    <public type="string" name="manage_channel_description" id="0x7f120e9d" />
+    <public type="string" name="manage_channels" id="0x7f120e9e" />
+    <public type="string" name="manage_channels_description" id="0x7f120e9f" />
+    <public type="string" name="manage_emojis" id="0x7f120ea0" />
+    <public type="string" name="manage_messages" id="0x7f120ea1" />
+    <public type="string" name="manage_messages_description" id="0x7f120ea2" />
+    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7f120ea3" />
+    <public type="string" name="manage_nicknames" id="0x7f120ea4" />
+    <public type="string" name="manage_nicknames_description" id="0x7f120ea5" />
+    <public type="string" name="manage_permissions" id="0x7f120ea6" />
+    <public type="string" name="manage_permissions_description" id="0x7f120ea7" />
+    <public type="string" name="manage_roles" id="0x7f120ea8" />
+    <public type="string" name="manage_roles_description" id="0x7f120ea9" />
+    <public type="string" name="manage_server" id="0x7f120eaa" />
+    <public type="string" name="manage_server_description" id="0x7f120eab" />
+    <public type="string" name="manage_user" id="0x7f120eac" />
+    <public type="string" name="manage_user_shorthand" id="0x7f120ead" />
+    <public type="string" name="manage_webhooks" id="0x7f120eae" />
+    <public type="string" name="manage_webhooks_description" id="0x7f120eaf" />
+    <public type="string" name="managed_role_explaination" id="0x7f120eb0" />
+    <public type="string" name="managed_role_integration_explanation" id="0x7f120eb1" />
+    <public type="string" name="managed_role_premium_subscriber_explanation" id="0x7f120eb2" />
+    <public type="string" name="mark_as_read" id="0x7f120eb3" />
+    <public type="string" name="mark_unread" id="0x7f120eb4" />
+    <public type="string" name="marked_as_read" id="0x7f120eb5" />
+    <public type="string" name="marketing_refresh_premium_features_badge_heading" id="0x7f120eb6" />
+    <public type="string" name="marketing_refresh_premium_features_badge_subheading" id="0x7f120eb7" />
+    <public type="string" name="marketing_refresh_premium_features_emoji_heading" id="0x7f120eb8" />
+    <public type="string" name="marketing_refresh_premium_features_emoji_subheading" id="0x7f120eb9" />
+    <public type="string" name="marketing_refresh_premium_features_file_upload_heading" id="0x7f120eba" />
+    <public type="string" name="marketing_refresh_premium_features_file_upload_subheading" id="0x7f120ebb" />
+    <public type="string" name="marketing_refresh_premium_features_go_live_heading" id="0x7f120ebc" />
+    <public type="string" name="marketing_refresh_premium_features_go_live_info" id="0x7f120ebd" />
+    <public type="string" name="marketing_refresh_premium_features_go_live_subheading" id="0x7f120ebe" />
+    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_heading" id="0x7f120ebf" />
+    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading" id="0x7f120ec0" />
+    <public type="string" name="marketing_refresh_premium_features_profile_heading" id="0x7f120ec1" />
+    <public type="string" name="marketing_refresh_premium_features_profile_subheading" id="0x7f120ec2" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description" id="0x7f120ec3" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info" id="0x7f120ec4" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label" id="0x7f120ec5" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_with_price" id="0x7f120ec6" />
+    <public type="string" name="marketing_refresh_premium_tier_2_cta_subtitle" id="0x7f120ec7" />
+    <public type="string" name="marketing_refresh_premium_tier_2_cta_title" id="0x7f120ec8" />
+    <public type="string" name="marketing_refresh_premium_tier_2_subtitle" id="0x7f120ec9" />
+    <public type="string" name="marketing_refresh_premium_tier_2_subtitle_with_price" id="0x7f120eca" />
+    <public type="string" name="marketing_refresh_premium_tier_2_title" id="0x7f120ecb" />
+    <public type="string" name="masked_link_body" id="0x7f120ecc" />
+    <public type="string" name="masked_link_cancel" id="0x7f120ecd" />
+    <public type="string" name="masked_link_confirm" id="0x7f120ece" />
+    <public type="string" name="masked_link_trust_this_domain" id="0x7f120ecf" />
+    <public type="string" name="masked_link_trust_this_protocol" id="0x7f120ed0" />
+    <public type="string" name="masked_protocol_link_body" id="0x7f120ed1" />
+    <public type="string" name="mature_listing_accept" id="0x7f120ed2" />
+    <public type="string" name="mature_listing_decline" id="0x7f120ed3" />
+    <public type="string" name="mature_listing_description" id="0x7f120ed4" />
+    <public type="string" name="mature_listing_title" id="0x7f120ed5" />
+    <public type="string" name="max_age_never" id="0x7f120ed6" />
+    <public type="string" name="max_age_never_description_mobile" id="0x7f120ed7" />
+    <public type="string" name="max_number_of_uses" id="0x7f120ed8" />
+    <public type="string" name="max_uses" id="0x7f120ed9" />
+    <public type="string" name="max_uses_description_mobile" id="0x7f120eda" />
+    <public type="string" name="max_uses_description_unlimited_uses" id="0x7f120edb" />
+    <public type="string" name="me" id="0x7f120edc" />
+    <public type="string" name="media_keyboard_browse" id="0x7f120edd" />
+    <public type="string" name="media_keyboard_gift" id="0x7f120ede" />
+    <public type="string" name="member" id="0x7f120edf" />
+    <public type="string" name="member_list" id="0x7f120ee0" />
+    <public type="string" name="member_list_server_owner_help" id="0x7f120ee1" />
+    <public type="string" name="members" id="0x7f120ee2" />
+    <public type="string" name="members_header" id="0x7f120ee3" />
+    <public type="string" name="members_matching" id="0x7f120ee4" />
+    <public type="string" name="members_search_placeholder" id="0x7f120ee5" />
+    <public type="string" name="mention" id="0x7f120ee6" />
+    <public type="string" name="mention_everyone" id="0x7f120ee7" />
+    <public type="string" name="mention_everyone_android" id="0x7f120ee8" />
+    <public type="string" name="mention_everyone_autocomplete_description" id="0x7f120ee9" />
+    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7f120eea" />
+    <public type="string" name="mention_everyone_channel_description" id="0x7f120eeb" />
+    <public type="string" name="mention_everyone_channel_description_android" id="0x7f120eec" />
+    <public type="string" name="mention_everyone_description" id="0x7f120eed" />
+    <public type="string" name="mention_everyone_description_android" id="0x7f120eee" />
+    <public type="string" name="mention_here_autocomplete_description" id="0x7f120eef" />
+    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7f120ef0" />
+    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7f120ef1" />
+    <public type="string" name="mention_users_with_role" id="0x7f120ef2" />
+    <public type="string" name="mentions" id="0x7f120ef3" />
+    <public type="string" name="mentions_count" id="0x7f120ef4" />
+    <public type="string" name="message_action_reply" id="0x7f120ef5" />
+    <public type="string" name="message_actions_menu_label" id="0x7f120ef6" />
+    <public type="string" name="message_count" id="0x7f120ef7" />
+    <public type="string" name="message_count_in_thread" id="0x7f120ef8" />
+    <public type="string" name="message_count_in_thread_overflow" id="0x7f120ef9" />
+    <public type="string" name="message_count_overflow" id="0x7f120efa" />
+    <public type="string" name="message_display_mode_label" id="0x7f120efb" />
+    <public type="string" name="message_edited" id="0x7f120efc" />
+    <public type="string" name="message_header_reply" id="0x7f120efd" />
+    <public type="string" name="message_options" id="0x7f120efe" />
+    <public type="string" name="message_pinned" id="0x7f120eff" />
+    <public type="string" name="message_preview" id="0x7f120f00" />
+    <public type="string" name="message_rate_limited_body" id="0x7f120f01" />
+    <public type="string" name="message_rate_limited_button" id="0x7f120f02" />
+    <public type="string" name="message_rate_limited_header" id="0x7f120f03" />
+    <public type="string" name="message_step_subtitle" id="0x7f120f04" />
+    <public type="string" name="message_step_title" id="0x7f120f05" />
+    <public type="string" name="message_too_long_body_text" id="0x7f120f06" />
+    <public type="string" name="message_too_long_header" id="0x7f120f07" />
+    <public type="string" name="message_tts" id="0x7f120f08" />
+    <public type="string" name="message_tts_deleted_role" id="0x7f120f09" />
+    <public type="string" name="message_unpinned" id="0x7f120f0a" />
+    <public type="string" name="message_utilities_a11y_label" id="0x7f120f0b" />
+    <public type="string" name="messages" id="0x7f120f0c" />
+    <public type="string" name="messages_failed_to_load" id="0x7f120f0d" />
+    <public type="string" name="messages_failed_to_load_try_again" id="0x7f120f0e" />
+    <public type="string" name="mfa_sms_add_phone" id="0x7f120f0f" />
+    <public type="string" name="mfa_sms_already_enabled" id="0x7f120f10" />
+    <public type="string" name="mfa_sms_auth" id="0x7f120f11" />
+    <public type="string" name="mfa_sms_auth_current_phone" id="0x7f120f12" />
+    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7f120f13" />
+    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7f120f14" />
+    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7f120f15" />
+    <public type="string" name="mfa_sms_disabled_partner" id="0x7f120f16" />
+    <public type="string" name="mfa_sms_enable" id="0x7f120f17" />
+    <public type="string" name="mfa_sms_enable_should_do" id="0x7f120f18" />
+    <public type="string" name="mfa_sms_enable_subheader" id="0x7f120f19" />
+    <public type="string" name="mfa_sms_phone_number_hide" id="0x7f120f1a" />
+    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7f120f1b" />
+    <public type="string" name="mfa_sms_receive_code" id="0x7f120f1c" />
+    <public type="string" name="mfa_sms_remove" id="0x7f120f1d" />
+    <public type="string" name="mfa_sms_resend" id="0x7f120f1e" />
+    <public type="string" name="mic_test_voice_channel_warning" id="0x7f120f1f" />
+    <public type="string" name="minimum_size" id="0x7f120f20" />
+    <public type="string" name="missed_an_update" id="0x7f120f21" />
+    <public type="string" name="missed_call" id="0x7f120f22" />
+    <public type="string" name="missing_entitlement_modal_body" id="0x7f120f23" />
+    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7f120f24" />
+    <public type="string" name="missing_entitlement_modal_header" id="0x7f120f25" />
+    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7f120f26" />
+    <public type="string" name="mobile_designate_other_channel" id="0x7f120f27" />
+    <public type="string" name="mobile_enable_hardware_scaling" id="0x7f120f28" />
+    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7f120f29" />
+    <public type="string" name="mobile_noise_cancellation_popout_description" id="0x7f120f2a" />
+    <public type="string" name="mobile_noise_cancellation_popout_title" id="0x7f120f2b" />
+    <public type="string" name="mobile_stream_active_body" id="0x7f120f2c" />
+    <public type="string" name="mobile_stream_active_body_soundshare_warning_android" id="0x7f120f2d" />
+    <public type="string" name="mobile_stream_active_header" id="0x7f120f2e" />
+    <public type="string" name="mobile_stream_participants_hidden" id="0x7f120f2f" />
+    <public type="string" name="mobile_stream_stop_sharing" id="0x7f120f30" />
+    <public type="string" name="moderation" id="0x7f120f31" />
+    <public type="string" name="modify_followed_news_header" id="0x7f120f32" />
+    <public type="string" name="monthly" id="0x7f120f33" />
+    <public type="string" name="more" id="0x7f120f34" />
+    <public type="string" name="more_options" id="0x7f120f35" />
+    <public type="string" name="move_from_category_to" id="0x7f120f36" />
+    <public type="string" name="move_members" id="0x7f120f37" />
+    <public type="string" name="move_members_description" id="0x7f120f38" />
+    <public type="string" name="move_to" id="0x7f120f39" />
+    <public type="string" name="move_to_success" id="0x7f120f3a" />
+    <public type="string" name="mtrl_badge_numberless_content_description" id="0x7f120f3b" />
+    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7f120f3c" />
+    <public type="string" name="mtrl_exceed_max_badge_number_content_description" id="0x7f120f3d" />
+    <public type="string" name="mtrl_exceed_max_badge_number_suffix" id="0x7f120f3e" />
+    <public type="string" name="mtrl_picker_a11y_next_month" id="0x7f120f3f" />
+    <public type="string" name="mtrl_picker_a11y_prev_month" id="0x7f120f40" />
+    <public type="string" name="mtrl_picker_announce_current_selection" id="0x7f120f41" />
+    <public type="string" name="mtrl_picker_cancel" id="0x7f120f42" />
+    <public type="string" name="mtrl_picker_confirm" id="0x7f120f43" />
+    <public type="string" name="mtrl_picker_date_header_selected" id="0x7f120f44" />
+    <public type="string" name="mtrl_picker_date_header_title" id="0x7f120f45" />
+    <public type="string" name="mtrl_picker_date_header_unselected" id="0x7f120f46" />
+    <public type="string" name="mtrl_picker_day_of_week_column_header" id="0x7f120f47" />
+    <public type="string" name="mtrl_picker_invalid_format" id="0x7f120f48" />
+    <public type="string" name="mtrl_picker_invalid_format_example" id="0x7f120f49" />
+    <public type="string" name="mtrl_picker_invalid_format_use" id="0x7f120f4a" />
+    <public type="string" name="mtrl_picker_invalid_range" id="0x7f120f4b" />
+    <public type="string" name="mtrl_picker_navigate_to_year_description" id="0x7f120f4c" />
+    <public type="string" name="mtrl_picker_out_of_range" id="0x7f120f4d" />
+    <public type="string" name="mtrl_picker_range_header_only_end_selected" id="0x7f120f4e" />
+    <public type="string" name="mtrl_picker_range_header_only_start_selected" id="0x7f120f4f" />
+    <public type="string" name="mtrl_picker_range_header_selected" id="0x7f120f50" />
+    <public type="string" name="mtrl_picker_range_header_title" id="0x7f120f51" />
+    <public type="string" name="mtrl_picker_range_header_unselected" id="0x7f120f52" />
+    <public type="string" name="mtrl_picker_save" id="0x7f120f53" />
+    <public type="string" name="mtrl_picker_text_input_date_hint" id="0x7f120f54" />
+    <public type="string" name="mtrl_picker_text_input_date_range_end_hint" id="0x7f120f55" />
+    <public type="string" name="mtrl_picker_text_input_date_range_start_hint" id="0x7f120f56" />
+    <public type="string" name="mtrl_picker_text_input_day_abbr" id="0x7f120f57" />
+    <public type="string" name="mtrl_picker_text_input_month_abbr" id="0x7f120f58" />
+    <public type="string" name="mtrl_picker_text_input_year_abbr" id="0x7f120f59" />
+    <public type="string" name="mtrl_picker_toggle_to_calendar_input_mode" id="0x7f120f5a" />
+    <public type="string" name="mtrl_picker_toggle_to_day_selection" id="0x7f120f5b" />
+    <public type="string" name="mtrl_picker_toggle_to_text_input_mode" id="0x7f120f5c" />
+    <public type="string" name="mtrl_picker_toggle_to_year_selection" id="0x7f120f5d" />
+    <public type="string" name="mtrl_slider_range_content_description" id="0x7f120f5e" />
+    <public type="string" name="mute" id="0x7f120f5f" />
+    <public type="string" name="mute_category" id="0x7f120f60" />
+    <public type="string" name="mute_channel" id="0x7f120f61" />
+    <public type="string" name="mute_channel_generic" id="0x7f120f62" />
+    <public type="string" name="mute_conversation" id="0x7f120f63" />
+    <public type="string" name="mute_duration_15_minutes" id="0x7f120f64" />
+    <public type="string" name="mute_duration_1_hour" id="0x7f120f65" />
+    <public type="string" name="mute_duration_24_hours" id="0x7f120f66" />
+    <public type="string" name="mute_duration_8_hours" id="0x7f120f67" />
+    <public type="string" name="mute_duration_always" id="0x7f120f68" />
+    <public type="string" name="mute_group_dm" id="0x7f120f69" />
+    <public type="string" name="mute_members" id="0x7f120f6a" />
+    <public type="string" name="mute_server" id="0x7f120f6b" />
+    <public type="string" name="mute_settings_mute_category" id="0x7f120f6c" />
+    <public type="string" name="mute_settings_mute_channel" id="0x7f120f6d" />
+    <public type="string" name="mute_settings_mute_server" id="0x7f120f6e" />
+    <public type="string" name="mute_settings_mute_this_conversation" id="0x7f120f6f" />
+    <public type="string" name="mute_until" id="0x7f120f70" />
+    <public type="string" name="muted_until_time" id="0x7f120f71" />
+    <public type="string" name="mutual_friends" id="0x7f120f72" />
+    <public type="string" name="mutual_guilds" id="0x7f120f73" />
+    <public type="string" name="n_days" id="0x7f120f74" />
+    <public type="string" name="nearby_scan" id="0x7f120f75" />
+    <public type="string" name="need_account" id="0x7f120f76" />
+    <public type="string" name="network_error_bad_request" id="0x7f120f77" />
+    <public type="string" name="network_error_cloudflare_intermittent" id="0x7f120f78" />
+    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7f120f79" />
+    <public type="string" name="network_error_connection" id="0x7f120f7a" />
+    <public type="string" name="network_error_forbidden" id="0x7f120f7b" />
+    <public type="string" name="network_error_request_too_large" id="0x7f120f7c" />
+    <public type="string" name="network_error_rest_request" id="0x7f120f7d" />
+    <public type="string" name="network_error_ssl" id="0x7f120f7e" />
+    <public type="string" name="network_error_unauthorized" id="0x7f120f7f" />
+    <public type="string" name="network_error_unknown" id="0x7f120f80" />
+    <public type="string" name="network_offline" id="0x7f120f81" />
+    <public type="string" name="never_ask_again" id="0x7f120f82" />
+    <public type="string" name="nevermind" id="0x7f120f83" />
+    <public type="string" name="new_dm" id="0x7f120f84" />
+    <public type="string" name="new_group_dm" id="0x7f120f85" />
+    <public type="string" name="new_guilds_dm_allowed" id="0x7f120f86" />
+    <public type="string" name="new_member_retention_info" id="0x7f120f87" />
+    <public type="string" name="new_mentions" id="0x7f120f88" />
+    <public type="string" name="new_messages" id="0x7f120f89" />
+    <public type="string" name="new_messages_divider" id="0x7f120f8a" />
+    <public type="string" name="new_messages_estimated" id="0x7f120f8b" />
+    <public type="string" name="new_messages_estimated_with_date" id="0x7f120f8c" />
+    <public type="string" name="new_messages_with_date" id="0x7f120f8d" />
+    <public type="string" name="new_override" id="0x7f120f8e" />
+    <public type="string" name="new_permission" id="0x7f120f8f" />
+    <public type="string" name="new_terms_ack" id="0x7f120f90" />
+    <public type="string" name="new_terms_continue" id="0x7f120f91" />
+    <public type="string" name="new_terms_description" id="0x7f120f92" />
+    <public type="string" name="new_terms_title" id="0x7f120f93" />
+    <public type="string" name="new_unreads" id="0x7f120f94" />
+    <public type="string" name="news_channel" id="0x7f120f95" />
+    <public type="string" name="news_channel_publish" id="0x7f120f96" />
+    <public type="string" name="news_channel_publish_bump" id="0x7f120f97" />
+    <public type="string" name="news_channel_publish_bump_hide_permanently" id="0x7f120f98" />
+    <public type="string" name="news_channel_published" id="0x7f120f99" />
+    <public type="string" name="next" id="0x7f120f9a" />
+    <public type="string" name="nickname" id="0x7f120f9b" />
+    <public type="string" name="nickname_changed" id="0x7f120f9c" />
+    <public type="string" name="nickname_cleared" id="0x7f120f9d" />
+    <public type="string" name="nl" id="0x7f120f9e" />
+    <public type="string" name="no" id="0x7f120f9f" />
+    <public type="string" name="no_afk_channel" id="0x7f120fa0" />
+    <public type="string" name="no_authorized_apps" id="0x7f120fa1" />
+    <public type="string" name="no_authorized_apps_note" id="0x7f120fa2" />
+    <public type="string" name="no_ban_reason" id="0x7f120fa3" />
+    <public type="string" name="no_bans" id="0x7f120fa4" />
+    <public type="string" name="no_camera_access" id="0x7f120fa5" />
+    <public type="string" name="no_camera_body" id="0x7f120fa6" />
+    <public type="string" name="no_camera_title" id="0x7f120fa7" />
+    <public type="string" name="no_category" id="0x7f120fa8" />
+    <public type="string" name="no_emoji" id="0x7f120fa9" />
+    <public type="string" name="no_emoji_body" id="0x7f120faa" />
+    <public type="string" name="no_emoji_search_results" id="0x7f120fab" />
+    <public type="string" name="no_emoji_title" id="0x7f120fac" />
+    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7f120fad" />
+    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7f120fae" />
+    <public type="string" name="no_gif_favorites_go_favorite" id="0x7f120faf" />
+    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7f120fb0" />
+    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7f120fb1" />
+    <public type="string" name="no_gif_search_results" id="0x7f120fb2" />
+    <public type="string" name="no_gif_search_results_with_related_search" id="0x7f120fb3" />
+    <public type="string" name="no_gif_search_results_without_related_search" id="0x7f120fb4" />
+    <public type="string" name="no_input_devices" id="0x7f120fb5" />
+    <public type="string" name="no_input_monitoring_access" id="0x7f120fb6" />
+    <public type="string" name="no_instant_invite" id="0x7f120fb7" />
+    <public type="string" name="no_integrations" id="0x7f120fb8" />
+    <public type="string" name="no_integrations_body" id="0x7f120fb9" />
+    <public type="string" name="no_integrations_label" id="0x7f120fba" />
+    <public type="string" name="no_invites_body" id="0x7f120fbb" />
+    <public type="string" name="no_invites_caption" id="0x7f120fbc" />
+    <public type="string" name="no_invites_label" id="0x7f120fbd" />
+    <public type="string" name="no_mic_body" id="0x7f120fbe" />
+    <public type="string" name="no_mic_title" id="0x7f120fbf" />
+    <public type="string" name="no_micrphone_access" id="0x7f120fc0" />
+    <public type="string" name="no_mutual_friends" id="0x7f120fc1" />
+    <public type="string" name="no_mutual_guilds" id="0x7f120fc2" />
+    <public type="string" name="no_output_devices" id="0x7f120fc3" />
+    <public type="string" name="no_photos_access" id="0x7f120fc4" />
+    <public type="string" name="no_pins_in_channel" id="0x7f120fc5" />
+    <public type="string" name="no_pins_in_dm" id="0x7f120fc6" />
+    <public type="string" name="no_private_channels_description" id="0x7f120fc7" />
+    <public type="string" name="no_private_channels_title" id="0x7f120fc8" />
+    <public type="string" name="no_reactions_body" id="0x7f120fc9" />
+    <public type="string" name="no_reactions_header" id="0x7f120fca" />
+    <public type="string" name="no_recent_mentions" id="0x7f120fcb" />
+    <public type="string" name="no_send_messages_permission_placeholder" id="0x7f120fcc" />
+    <public type="string" name="no_system_channel" id="0x7f120fcd" />
+    <public type="string" name="no_text" id="0x7f120fce" />
+    <public type="string" name="no_thanks" id="0x7f120fcf" />
+    <public type="string" name="no_user_limit" id="0x7f120fd0" />
+    <public type="string" name="no_video_devices" id="0x7f120fd1" />
+    <public type="string" name="no_video_permission_dialog_body" id="0x7f120fd2" />
+    <public type="string" name="no_video_permission_dialog_title" id="0x7f120fd3" />
+    <public type="string" name="noise_cancellation_off" id="0x7f120fd4" />
+    <public type="string" name="noise_cancellation_on" id="0x7f120fd5" />
+    <public type="string" name="noise_cancellation_popout_description" id="0x7f120fd6" />
+    <public type="string" name="noise_cancellation_popout_footer" id="0x7f120fd7" />
+    <public type="string" name="noise_cancellation_popout_header" id="0x7f120fd8" />
+    <public type="string" name="noise_cancellation_popout_mic_test_title" id="0x7f120fd9" />
+    <public type="string" name="noise_cancellation_popout_stop" id="0x7f120fda" />
+    <public type="string" name="noise_cancellation_popout_test" id="0x7f120fdb" />
+    <public type="string" name="noise_cancellation_tooltip" id="0x7f120fdc" />
+    <public type="string" name="noise_suppression" id="0x7f120fdd" />
+    <public type="string" name="none" id="0x7f120fde" />
+    <public type="string" name="not_available" id="0x7f120fdf" />
+    <public type="string" name="not_in_the_voice_channel" id="0x7f120fe0" />
+    <public type="string" name="not_set" id="0x7f120fe1" />
+    <public type="string" name="note" id="0x7f120fe2" />
+    <public type="string" name="note_placeholder" id="0x7f120fe3" />
+    <public type="string" name="note_placeholder_mobile" id="0x7f120fe4" />
+    <public type="string" name="notice_application_test_mode" id="0x7f120fe5" />
+    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7f120fe6" />
+    <public type="string" name="notice_connect_spotify" id="0x7f120fe7" />
+    <public type="string" name="notice_connection_conflict" id="0x7f120fe8" />
+    <public type="string" name="notice_corrupt_installation" id="0x7f120fe9" />
+    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7f120fea" />
+    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7f120feb" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7f120fec" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7f120fed" />
+    <public type="string" name="notice_dispatch_api_error" id="0x7f120fee" />
+    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7f120fef" />
+    <public type="string" name="notice_dispatch_error" id="0x7f120ff0" />
+    <public type="string" name="notice_dispatch_error_disk_full" id="0x7f120ff1" />
+    <public type="string" name="notice_dispatch_error_disk_low" id="0x7f120ff2" />
+    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7f120ff3" />
+    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7f120ff4" />
+    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7f120ff5" />
+    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7f120ff6" />
+    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7f120ff7" />
+    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7f120ff8" />
+    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7f120ff9" />
+    <public type="string" name="notice_dispatch_error_unwritable" id="0x7f120ffa" />
+    <public type="string" name="notice_dispatch_error_with_code" id="0x7f120ffb" />
+    <public type="string" name="notice_dispatch_install_script_progress" id="0x7f120ffc" />
+    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7f120ffd" />
+    <public type="string" name="notice_enable_public_guild_upsell_message" id="0x7f120ffe" />
+    <public type="string" name="notice_hardware_mute" id="0x7f120fff" />
+    <public type="string" name="notice_mfa_sms_backup" id="0x7f121000" />
+    <public type="string" name="notice_mfa_sms_backup_button" id="0x7f121001" />
+    <public type="string" name="notice_native_apps_2020_06" id="0x7f121002" />
+    <public type="string" name="notice_no_input_detected" id="0x7f121003" />
+    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7f121004" />
+    <public type="string" name="notice_no_input_detected_settings" id="0x7f121005" />
+    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7f121006" />
+    <public type="string" name="notice_notification_message" id="0x7f121007" />
+    <public type="string" name="notice_notification_message2" id="0x7f121008" />
+    <public type="string" name="notice_premium_grandfathered_ended" id="0x7f121009" />
+    <public type="string" name="notice_premium_grandfathered_ending" id="0x7f12100a" />
+    <public type="string" name="notice_premium_grandfathered_monthly_ending" id="0x7f12100b" />
+    <public type="string" name="notice_premium_grandfathered_upgrade" id="0x7f12100c" />
+    <public type="string" name="notice_premium_promo_action" id="0x7f12100d" />
+    <public type="string" name="notice_premium_promo_message" id="0x7f12100e" />
+    <public type="string" name="notice_premium_xbox_game_pass_promotion" id="0x7f12100f" />
+    <public type="string" name="notice_premium_xbox_game_pass_promotion_redeem" id="0x7f121010" />
+    <public type="string" name="notice_scheduled_maintenance" id="0x7f121011" />
+    <public type="string" name="notice_spotify_auto_paused" id="0x7f121012" />
+    <public type="string" name="notice_streamer_mode_text" id="0x7f121013" />
+    <public type="string" name="notice_survey_body" id="0x7f121014" />
+    <public type="string" name="notice_survey_button" id="0x7f121015" />
+    <public type="string" name="notice_survey_prompt" id="0x7f121016" />
+    <public type="string" name="notice_unclaimed_account" id="0x7f121017" />
+    <public type="string" name="notice_unverified_account" id="0x7f121018" />
+    <public type="string" name="notice_whats_this" id="0x7f121019" />
+    <public type="string" name="notification_accepted_friend_request" id="0x7f12101a" />
+    <public type="string" name="notification_body_attachment" id="0x7f12101b" />
+    <public type="string" name="notification_body_start_game" id="0x7f12101c" />
+    <public type="string" name="notification_dismiss" id="0x7f12101d" />
+    <public type="string" name="notification_message_create_dm_activity_join" id="0x7f12101e" />
+    <public type="string" name="notification_message_create_dm_activity_join_request" id="0x7f12101f" />
+    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7f121020" />
+    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7f121021" />
+    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7f121022" />
+    <public type="string" name="notification_message_create_guild_activity_join" id="0x7f121023" />
+    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7f121024" />
+    <public type="string" name="notification_mute_1_hour" id="0x7f121025" />
+    <public type="string" name="notification_overrides" id="0x7f121026" />
+    <public type="string" name="notification_pending_friend_request" id="0x7f121027" />
+    <public type="string" name="notification_reply" id="0x7f121028" />
+    <public type="string" name="notification_reply_failed" id="0x7f121029" />
+    <public type="string" name="notification_reply_success" id="0x7f12102a" />
+    <public type="string" name="notification_settings" id="0x7f12102b" />
+    <public type="string" name="notification_title_discord" id="0x7f12102c" />
+    <public type="string" name="notification_title_start_game" id="0x7f12102d" />
+    <public type="string" name="notifications" id="0x7f12102e" />
+    <public type="string" name="notifications_muted" id="0x7f12102f" />
+    <public type="string" name="notifications_nuf_body" id="0x7f121030" />
+    <public type="string" name="notifications_nuf_cta" id="0x7f121031" />
+    <public type="string" name="notifications_nuf_title" id="0x7f121032" />
+    <public type="string" name="now_playing_gdpr_body" id="0x7f121033" />
+    <public type="string" name="now_playing_gdpr_header" id="0x7f121034" />
+    <public type="string" name="nsfw_accept" id="0x7f121035" />
+    <public type="string" name="nsfw_decline" id="0x7f121036" />
+    <public type="string" name="nsfw_description" id="0x7f121037" />
+    <public type="string" name="nsfw_title" id="0x7f121038" />
+    <public type="string" name="nuf_age_gate_body" id="0x7f121039" />
+    <public type="string" name="nuf_body" id="0x7f12103a" />
+    <public type="string" name="nuf_body_mobile" id="0x7f12103b" />
+    <public type="string" name="nuf_body_refresh" id="0x7f12103c" />
+    <public type="string" name="nuf_channel_prompt_channel_topic_template" id="0x7f12103d" />
+    <public type="string" name="nuf_channel_prompt_cta" id="0x7f12103e" />
+    <public type="string" name="nuf_channel_prompt_subtitle" id="0x7f12103f" />
+    <public type="string" name="nuf_channel_prompt_title" id="0x7f121040" />
+    <public type="string" name="nuf_channel_prompt_topic" id="0x7f121041" />
+    <public type="string" name="nuf_channel_prompt_topic_placeholder" id="0x7f121042" />
+    <public type="string" name="nuf_channels_cta_label" id="0x7f121043" />
+    <public type="string" name="nuf_channels_description" id="0x7f121044" />
+    <public type="string" name="nuf_channels_title" id="0x7f121045" />
+    <public type="string" name="nuf_chat_with_friends" id="0x7f121046" />
+    <public type="string" name="nuf_claim_account_body_1" id="0x7f121047" />
+    <public type="string" name="nuf_claim_account_body_2" id="0x7f121048" />
+    <public type="string" name="nuf_claim_account_button" id="0x7f121049" />
+    <public type="string" name="nuf_claim_account_generic_error" id="0x7f12104a" />
+    <public type="string" name="nuf_claim_account_title" id="0x7f12104b" />
+    <public type="string" name="nuf_club_or_interest_group" id="0x7f12104c" />
+    <public type="string" name="nuf_complete_cta" id="0x7f12104d" />
+    <public type="string" name="nuf_complete_title" id="0x7f12104e" />
+    <public type="string" name="nuf_create_server_body" id="0x7f12104f" />
+    <public type="string" name="nuf_create_server_button" id="0x7f121050" />
+    <public type="string" name="nuf_create_server_customize_header" id="0x7f121051" />
+    <public type="string" name="nuf_create_server_customize_subheader" id="0x7f121052" />
+    <public type="string" name="nuf_create_server_error" id="0x7f121053" />
+    <public type="string" name="nuf_create_server_header" id="0x7f121054" />
+    <public type="string" name="nuf_create_server_note_guidelines" id="0x7f121055" />
+    <public type="string" name="nuf_create_server_protip" id="0x7f121056" />
+    <public type="string" name="nuf_create_server_title" id="0x7f121057" />
+    <public type="string" name="nuf_desktop_templates_subtitle" id="0x7f121058" />
+    <public type="string" name="nuf_desktop_templates_title" id="0x7f121059" />
+    <public type="string" name="nuf_download_app_body" id="0x7f12105a" />
+    <public type="string" name="nuf_download_app_button_platform" id="0x7f12105b" />
+    <public type="string" name="nuf_download_app_button_type" id="0x7f12105c" />
+    <public type="string" name="nuf_download_app_intro" id="0x7f12105d" />
+    <public type="string" name="nuf_download_app_title" id="0x7f12105e" />
+    <public type="string" name="nuf_gaming_community" id="0x7f12105f" />
+    <public type="string" name="nuf_get_started" id="0x7f121060" />
+    <public type="string" name="nuf_have_an_invite_already" id="0x7f121061" />
+    <public type="string" name="nuf_join_a_friend" id="0x7f121062" />
+    <public type="string" name="nuf_join_server_body_1" id="0x7f121063" />
+    <public type="string" name="nuf_join_server_body_2" id="0x7f121064" />
+    <public type="string" name="nuf_join_server_button" id="0x7f121065" />
+    <public type="string" name="nuf_join_server_input_label" id="0x7f121066" />
+    <public type="string" name="nuf_join_server_input_note" id="0x7f121067" />
+    <public type="string" name="nuf_join_server_title_1" id="0x7f121068" />
+    <public type="string" name="nuf_join_server_title_2" id="0x7f121069" />
+    <public type="string" name="nuf_just_look_around" id="0x7f12106a" />
+    <public type="string" name="nuf_title_mobile" id="0x7f12106b" />
+    <public type="string" name="nuf_voice_channels_description" id="0x7f12106c" />
+    <public type="string" name="nuf_voice_channels_title" id="0x7f12106d" />
+    <public type="string" name="nuf_voice_chat_while_gaming" id="0x7f12106e" />
+    <public type="string" name="nuf_welcome_body" id="0x7f12106f" />
+    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7f121070" />
+    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7f121071" />
+    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7f121072" />
+    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7f121073" />
+    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7f121074" />
+    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7f121075" />
+    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7f121076" />
+    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7f121077" />
+    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7f121078" />
+    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7f121079" />
+    <public type="string" name="nuf_what_do_you_want" id="0x7f12107a" />
+    <public type="string" name="num_active_threads" id="0x7f12107b" />
+    <public type="string" name="num_channels" id="0x7f12107c" />
+    <public type="string" name="num_members" id="0x7f12107d" />
+    <public type="string" name="num_subscribers" id="0x7f12107e" />
+    <public type="string" name="num_users" id="0x7f12107f" />
+    <public type="string" name="numbers_only" id="0x7f121080" />
+    <public type="string" name="nux_navigation_help_channels" id="0x7f121081" />
+    <public type="string" name="nux_navigation_help_dms" id="0x7f121082" />
+    <public type="string" name="nux_navigation_help_guild" id="0x7f121083" />
+    <public type="string" name="nux_overlay_description" id="0x7f121084" />
+    <public type="string" name="nux_overlay_enable" id="0x7f121085" />
+    <public type="string" name="nux_overlay_title" id="0x7f121086" />
+    <public type="string" name="nux_post_reg_join_server_description" id="0x7f121087" />
+    <public type="string" name="nux_post_reg_join_server_skip" id="0x7f121088" />
+    <public type="string" name="nux_post_reg_join_server_title" id="0x7f121089" />
+    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7f12108a" />
+    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7f12108b" />
+    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7f12108c" />
+    <public type="string" name="oauth2_add_bot" id="0x7f12108d" />
+    <public type="string" name="oauth2_add_webhook_incoming" id="0x7f12108e" />
+    <public type="string" name="oauth2_can_read_notice" id="0x7f12108f" />
+    <public type="string" name="oauth2_cannot_read_send_notice" id="0x7f121090" />
+    <public type="string" name="oauth2_confirm_bot_permissions" id="0x7f121091" />
+    <public type="string" name="oauth2_connect_to_discord" id="0x7f121092" />
+    <public type="string" name="oauth2_details_creation_date" id="0x7f121093" />
+    <public type="string" name="oauth2_details_guilds" id="0x7f121094" />
+    <public type="string" name="oauth2_details_redirect" id="0x7f121095" />
+    <public type="string" name="oauth2_disabled_permissions" id="0x7f121096" />
+    <public type="string" name="oauth2_fake_scope_1" id="0x7f121097" />
+    <public type="string" name="oauth2_fake_scope_2" id="0x7f121098" />
+    <public type="string" name="oauth2_fake_scope_3" id="0x7f121099" />
+    <public type="string" name="oauth2_fake_scope_4" id="0x7f12109a" />
+    <public type="string" name="oauth2_fake_scope_5" id="0x7f12109b" />
+    <public type="string" name="oauth2_fake_scope_6" id="0x7f12109c" />
+    <public type="string" name="oauth2_fake_scope_7" id="0x7f12109d" />
+    <public type="string" name="oauth2_fake_scope_8" id="0x7f12109e" />
+    <public type="string" name="oauth2_logout" id="0x7f12109f" />
+    <public type="string" name="oauth2_message_cta" id="0x7f1210a0" />
+    <public type="string" name="oauth2_request_invalid_scope" id="0x7f1210a1" />
+    <public type="string" name="oauth2_request_missing_param" id="0x7f1210a2" />
+    <public type="string" name="oauth2_requests_account_access" id="0x7f1210a3" />
+    <public type="string" name="oauth2_scopes_label" id="0x7f1210a4" />
+    <public type="string" name="oauth2_signed_in_as" id="0x7f1210a5" />
+    <public type="string" name="oauth2_title" id="0x7f1210a6" />
+    <public type="string" name="oauth2_unknown_error" id="0x7f1210a7" />
+    <public type="string" name="okay" id="0x7f1210a8" />
+    <public type="string" name="one_user_typing" id="0x7f1210a9" />
+    <public type="string" name="ongoing_call" id="0x7f1210aa" />
+    <public type="string" name="ongoing_call_connected_users" id="0x7f1210ab" />
+    <public type="string" name="ongoing_call_tap_to_join" id="0x7f1210ac" />
+    <public type="string" name="ongoing_call_voice_quality_low" id="0x7f1210ad" />
+    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7f1210ae" />
+    <public type="string" name="only_you_can_see_and_delete_these" id="0x7f1210af" />
+    <public type="string" name="open" id="0x7f1210b0" />
+    <public type="string" name="open_connection_replay" id="0x7f1210b1" />
+    <public type="string" name="open_in_browser" id="0x7f1210b2" />
+    <public type="string" name="open_in_theater" id="0x7f1210b3" />
+    <public type="string" name="open_link" id="0x7f1210b4" />
+    <public type="string" name="open_navigation" id="0x7f1210b5" />
+    <public type="string" name="open_original_image" id="0x7f1210b6" />
+    <public type="string" name="open_standard_keyboard_accessibility_label" id="0x7f1210b7" />
+    <public type="string" name="options" id="0x7f1210b8" />
+    <public type="string" name="orange" id="0x7f1210b9" />
+    <public type="string" name="other_options" id="0x7f1210ba" />
+    <public type="string" name="other_reactions" id="0x7f1210bb" />
+    <public type="string" name="others_online" id="0x7f1210bc" />
+    <public type="string" name="out_of_date_action" id="0x7f1210bd" />
+    <public type="string" name="out_of_date_description" id="0x7f1210be" />
+    <public type="string" name="out_of_date_title" id="0x7f1210bf" />
+    <public type="string" name="outgoing_friend_request" id="0x7f1210c0" />
+    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7f1210c1" />
+    <public type="string" name="output_device" id="0x7f1210c2" />
+    <public type="string" name="overlay" id="0x7f1210c3" />
+    <public type="string" name="overlay_actions_menu_label" id="0x7f1210c4" />
+    <public type="string" name="overlay_channel_chat_hotkey" id="0x7f1210c5" />
+    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7f1210c6" />
+    <public type="string" name="overlay_click_to_unlock" id="0x7f1210c7" />
+    <public type="string" name="overlay_crashed_title" id="0x7f1210c8" />
+    <public type="string" name="overlay_explanation" id="0x7f1210c9" />
+    <public type="string" name="overlay_friend_calling" id="0x7f1210ca" />
+    <public type="string" name="overlay_in_game_preview_header" id="0x7f1210cb" />
+    <public type="string" name="overlay_launch_open_tip" id="0x7f1210cc" />
+    <public type="string" name="overlay_launch_title" id="0x7f1210cd" />
+    <public type="string" name="overlay_link_alert_body" id="0x7f1210ce" />
+    <public type="string" name="overlay_link_alert_secondary" id="0x7f1210cf" />
+    <public type="string" name="overlay_link_alert_title" id="0x7f1210d0" />
+    <public type="string" name="overlay_menu_get_invite" id="0x7f1210d1" />
+    <public type="string" name="overlay_menu_open_discord" id="0x7f1210d2" />
+    <public type="string" name="overlay_menu_switch_channels" id="0x7f1210d3" />
+    <public type="string" name="overlay_mobile_required" id="0x7f1210d4" />
+    <public type="string" name="overlay_mobile_toggle_desc" id="0x7f1210d5" />
+    <public type="string" name="overlay_mobile_toggle_label" id="0x7f1210d6" />
+    <public type="string" name="overlay_mobile_unauthed" id="0x7f1210d7" />
+    <public type="string" name="overlay_news_go_live_body" id="0x7f1210d8" />
+    <public type="string" name="overlay_news_go_live_body_no_voice_channel" id="0x7f1210d9" />
+    <public type="string" name="overlay_news_go_live_cta" id="0x7f1210da" />
+    <public type="string" name="overlay_no_results" id="0x7f1210db" />
+    <public type="string" name="overlay_notification_incoming_call" id="0x7f1210dc" />
+    <public type="string" name="overlay_notification_settings_disabled" id="0x7f1210dd" />
+    <public type="string" name="overlay_notification_settings_position" id="0x7f1210de" />
+    <public type="string" name="overlay_notifications_bottom_left" id="0x7f1210df" />
+    <public type="string" name="overlay_notifications_bottom_right" id="0x7f1210e0" />
+    <public type="string" name="overlay_notifications_disabled" id="0x7f1210e1" />
+    <public type="string" name="overlay_notifications_settings" id="0x7f1210e2" />
+    <public type="string" name="overlay_notifications_top_left" id="0x7f1210e3" />
+    <public type="string" name="overlay_notifications_top_right" id="0x7f1210e4" />
+    <public type="string" name="overlay_reload" id="0x7f1210e5" />
+    <public type="string" name="overlay_reset_default_layout" id="0x7f1210e6" />
+    <public type="string" name="overlay_settings_general_tab" id="0x7f1210e7" />
+    <public type="string" name="overlay_settings_title" id="0x7f1210e8" />
+    <public type="string" name="overlay_settings_voice_tab" id="0x7f1210e9" />
+    <public type="string" name="overlay_too_small" id="0x7f1210ea" />
+    <public type="string" name="overlay_unlock_to_answer" id="0x7f1210eb" />
+    <public type="string" name="overlay_unlock_to_join" id="0x7f1210ec" />
+    <public type="string" name="overlay_user_chat_hotkey" id="0x7f1210ed" />
+    <public type="string" name="overlay_widget_hide_in_game" id="0x7f1210ee" />
+    <public type="string" name="overlay_widget_show_in_game" id="0x7f1210ef" />
+    <public type="string" name="overview" id="0x7f1210f0" />
+    <public type="string" name="overwrite_autocomplete_a11y_label" id="0x7f1210f1" />
+    <public type="string" name="overwrite_autocomplete_label" id="0x7f1210f2" />
+    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7f1210f3" />
+    <public type="string" name="overwrite_no_role_to_add" id="0x7f1210f4" />
+    <public type="string" name="pagination_next" id="0x7f1210f5" />
+    <public type="string" name="pagination_page_label" id="0x7f1210f6" />
+    <public type="string" name="pagination_page_of" id="0x7f1210f7" />
+    <public type="string" name="pagination_previous" id="0x7f1210f8" />
+    <public type="string" name="paginator_current_page" id="0x7f1210f9" />
+    <public type="string" name="paginator_of_pages" id="0x7f1210fa" />
+    <public type="string" name="partial_outage" id="0x7f1210fb" />
+    <public type="string" name="partial_outage_a11y" id="0x7f1210fc" />
+    <public type="string" name="partner_badge_tooltip" id="0x7f1210fd" />
+    <public type="string" name="partner_program" id="0x7f1210fe" />
+    <public type="string" name="password_length_error" id="0x7f1210ff" />
+    <public type="string" name="password_manager" id="0x7f121100" />
+    <public type="string" name="password_manager_info_android" id="0x7f121101" />
+    <public type="string" name="password_manager_open_settings" id="0x7f121102" />
+    <public type="string" name="password_manager_open_settings_error" id="0x7f121103" />
+    <public type="string" name="password_manager_use" id="0x7f121104" />
+    <public type="string" name="password_required" id="0x7f121105" />
+    <public type="string" name="password_toggle_content_description" id="0x7f121106" />
+    <public type="string" name="paste" id="0x7f121107" />
+    <public type="string" name="path_password_eye" id="0x7f121108" />
+    <public type="string" name="path_password_eye_mask_strike_through" id="0x7f121109" />
+    <public type="string" name="path_password_eye_mask_visible" id="0x7f12110a" />
+    <public type="string" name="path_password_strike_through" id="0x7f12110b" />
+    <public type="string" name="pause" id="0x7f12110c" />
+    <public type="string" name="payment_authentication_modal_button" id="0x7f12110d" />
+    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7f12110e" />
+    <public type="string" name="payment_authentication_modal_canceled" id="0x7f12110f" />
+    <public type="string" name="payment_authentication_modal_fail" id="0x7f121110" />
+    <public type="string" name="payment_authentication_modal_start" id="0x7f121111" />
+    <public type="string" name="payment_authentication_modal_success" id="0x7f121112" />
+    <public type="string" name="payment_authentication_modal_title" id="0x7f121113" />
+    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7f121114" />
+    <public type="string" name="payment_authentication_modal_title_fail" id="0x7f121115" />
+    <public type="string" name="payment_authentication_modal_title_success" id="0x7f121116" />
+    <public type="string" name="payment_modal_button_premium" id="0x7f121117" />
+    <public type="string" name="payment_modal_button_premium_gift" id="0x7f121118" />
+    <public type="string" name="payment_modal_one_month" id="0x7f121119" />
+    <public type="string" name="payment_modal_one_year" id="0x7f12111a" />
+    <public type="string" name="payment_modal_subtitle_premium_gift" id="0x7f12111b" />
+    <public type="string" name="payment_price_change_body" id="0x7f12111c" />
+    <public type="string" name="payment_price_change_title" id="0x7f12111d" />
+    <public type="string" name="payment_source_card_ending" id="0x7f12111e" />
+    <public type="string" name="payment_source_card_ending_in" id="0x7f12111f" />
+    <public type="string" name="payment_source_card_expires" id="0x7f121120" />
+    <public type="string" name="payment_source_card_number" id="0x7f121121" />
+    <public type="string" name="payment_source_confirm_paypal_details" id="0x7f121122" />
+    <public type="string" name="payment_source_credit_card" id="0x7f121123" />
+    <public type="string" name="payment_source_delete" id="0x7f121124" />
+    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7f121125" />
+    <public type="string" name="payment_source_deleted" id="0x7f121126" />
+    <public type="string" name="payment_source_edit_help_card" id="0x7f121127" />
+    <public type="string" name="payment_source_edit_help_paypal" id="0x7f121128" />
+    <public type="string" name="payment_source_edit_saved" id="0x7f121129" />
+    <public type="string" name="payment_source_edit_select_state" id="0x7f12112a" />
+    <public type="string" name="payment_source_edit_title" id="0x7f12112b" />
+    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7f12112c" />
+    <public type="string" name="payment_source_information" id="0x7f12112d" />
+    <public type="string" name="payment_source_invalid" id="0x7f12112e" />
+    <public type="string" name="payment_source_invalid_help" id="0x7f12112f" />
+    <public type="string" name="payment_source_make_default" id="0x7f121130" />
+    <public type="string" name="payment_source_name_error_required" id="0x7f121131" />
+    <public type="string" name="payment_source_payment_request_button_generic" id="0x7f121132" />
+    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7f121133" />
+    <public type="string" name="payment_source_payment_request_info_creating" id="0x7f121134" />
+    <public type="string" name="payment_source_payment_request_info_loading" id="0x7f121135" />
+    <public type="string" name="payment_source_payment_request_info_title" id="0x7f121136" />
+    <public type="string" name="payment_source_payment_request_label" id="0x7f121137" />
+    <public type="string" name="payment_source_payment_request_unsupported" id="0x7f121138" />
+    <public type="string" name="payment_source_paypal" id="0x7f121139" />
+    <public type="string" name="payment_source_paypal_account" id="0x7f12113a" />
+    <public type="string" name="payment_source_paypal_details" id="0x7f12113b" />
+    <public type="string" name="payment_source_paypal_loading" id="0x7f12113c" />
+    <public type="string" name="payment_source_paypal_reopen" id="0x7f12113d" />
+    <public type="string" name="payment_source_subscription" id="0x7f12113e" />
+    <public type="string" name="payment_source_type" id="0x7f12113f" />
+    <public type="string" name="payment_source_type_select" id="0x7f121140" />
+    <public type="string" name="payment_sources_add" id="0x7f121141" />
+    <public type="string" name="payment_waiting_for_authentication" id="0x7f121142" />
+    <public type="string" name="paypal_account_verifying" id="0x7f121143" />
+    <public type="string" name="paypal_callback_error" id="0x7f121144" />
+    <public type="string" name="paypal_callback_success" id="0x7f121145" />
+    <public type="string" name="pending" id="0x7f121146" />
+    <public type="string" name="people" id="0x7f121147" />
+    <public type="string" name="percentage_since_last_week" id="0x7f121148" />
+    <public type="string" name="permission_helpdesk" id="0x7f121149" />
+    <public type="string" name="permission_media_denied" id="0x7f12114a" />
+    <public type="string" name="permission_media_download_denied" id="0x7f12114b" />
+    <public type="string" name="permission_microphone_denied" id="0x7f12114c" />
+    <public type="string" name="permission_override_allow" id="0x7f12114d" />
+    <public type="string" name="permission_override_deny" id="0x7f12114e" />
+    <public type="string" name="permission_override_passthrough" id="0x7f12114f" />
+    <public type="string" name="permission_overrides" id="0x7f121150" />
+    <public type="string" name="permission_qr_scanner_denied" id="0x7f121151" />
+    <public type="string" name="permissions" id="0x7f121152" />
+    <public type="string" name="permissions_unsynced" id="0x7f121153" />
+    <public type="string" name="permit_usage_android" id="0x7f121154" />
+    <public type="string" name="personalization_disable_modal_body" id="0x7f121155" />
+    <public type="string" name="personalization_disable_modal_cancel" id="0x7f121156" />
+    <public type="string" name="personalization_disable_modal_confirm" id="0x7f121157" />
+    <public type="string" name="personalization_disable_modal_title" id="0x7f121158" />
+    <public type="string" name="phone" id="0x7f121159" />
+    <public type="string" name="pick_a_color" id="0x7f12115a" />
+    <public type="string" name="pin" id="0x7f12115b" />
+    <public type="string" name="pin_confirm" id="0x7f12115c" />
+    <public type="string" name="pin_message" id="0x7f12115d" />
+    <public type="string" name="pin_message_body" id="0x7f12115e" />
+    <public type="string" name="pin_message_body_mobile" id="0x7f12115f" />
+    <public type="string" name="pin_message_body_private_channel" id="0x7f121160" />
+    <public type="string" name="pin_message_title" id="0x7f121161" />
+    <public type="string" name="pin_message_too_many_body" id="0x7f121162" />
+    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7f121163" />
+    <public type="string" name="pin_message_too_many_title" id="0x7f121164" />
+    <public type="string" name="pinned_messages" id="0x7f121165" />
+    <public type="string" name="pinned_messages_pro_tip" id="0x7f121166" />
+    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7f121167" />
+    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7f121168" />
+    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7f121169" />
+    <public type="string" name="pins" id="0x7f12116a" />
+    <public type="string" name="pins_disabled_nsfw" id="0x7f12116b" />
+    <public type="string" name="pl" id="0x7f12116c" />
+    <public type="string" name="platform_android" id="0x7f12116d" />
+    <public type="string" name="platform_ios" id="0x7f12116e" />
+    <public type="string" name="platform_linux" id="0x7f12116f" />
+    <public type="string" name="platform_macos" id="0x7f121170" />
+    <public type="string" name="platform_windows" id="0x7f121171" />
+    <public type="string" name="play" id="0x7f121172" />
+    <public type="string" name="play_full_video" id="0x7f121173" />
+    <public type="string" name="play_stream" id="0x7f121174" />
+    <public type="string" name="playing_game" id="0x7f121175" />
+    <public type="string" name="popout_player" id="0x7f121176" />
+    <public type="string" name="popout_player_opened" id="0x7f121177" />
+    <public type="string" name="popout_remove_from_top" id="0x7f121178" />
+    <public type="string" name="popout_return" id="0x7f121179" />
+    <public type="string" name="popout_stay_on_top" id="0x7f12117a" />
+    <public type="string" name="preference_copied" id="0x7f12117b" />
+    <public type="string" name="premium" id="0x7f12117c" />
+    <public type="string" name="premium_activated" id="0x7f12117d" />
+    <public type="string" name="premium_alert_error_title" id="0x7f12117e" />
+    <public type="string" name="premium_badge_tooltip" id="0x7f12117f" />
+    <public type="string" name="premium_cancel_cancel_mobile" id="0x7f121180" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7f121181" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7f121182" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7f121183" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7f121184" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7f121185" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7f121186" />
+    <public type="string" name="premium_cancel_confirm_mobile" id="0x7f121187" />
+    <public type="string" name="premium_cancel_confirm_new" id="0x7f121188" />
+    <public type="string" name="premium_cancel_confirm_title" id="0x7f121189" />
+    <public type="string" name="premium_cancel_failed_body" id="0x7f12118a" />
+    <public type="string" name="premium_change_discriminator_length_error" id="0x7f12118b" />
+    <public type="string" name="premium_change_discriminator_modal_body" id="0x7f12118c" />
+    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7f12118d" />
+    <public type="string" name="premium_change_discriminator_modal_header" id="0x7f12118e" />
+    <public type="string" name="premium_change_discriminator_tooltip" id="0x7f12118f" />
+    <public type="string" name="premium_change_discriminator_zero_error" id="0x7f121190" />
+    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7f121191" />
+    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7f121192" />
+    <public type="string" name="premium_chat_perks_description_premium_guild_discount" id="0x7f121193" />
+    <public type="string" name="premium_chat_perks_description_premium_guild_included" id="0x7f121194" />
+    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7f121195" />
+    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7f121196" />
+    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7f121197" />
+    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7f121198" />
+    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7f121199" />
+    <public type="string" name="premium_chat_perks_simple_title" id="0x7f12119a" />
+    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7f12119b" />
+    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7f12119c" />
+    <public type="string" name="premium_downgrade_done_button" id="0x7f12119d" />
+    <public type="string" name="premium_features_chat_perks" id="0x7f12119e" />
+    <public type="string" name="premium_features_chat_perks_header" id="0x7f12119f" />
+    <public type="string" name="premium_game" id="0x7f1211a0" />
+    <public type="string" name="premium_gift_button_label" id="0x7f1211a1" />
+    <public type="string" name="premium_gift_button_tooltip" id="0x7f1211a2" />
+    <public type="string" name="premium_gift_send" id="0x7f1211a3" />
+    <public type="string" name="premium_gift_share_link_ios" id="0x7f1211a4" />
+    <public type="string" name="premium_gifting_button" id="0x7f1211a5" />
+    <public type="string" name="premium_gifting_title" id="0x7f1211a6" />
+    <public type="string" name="premium_gifting_title_mobile" id="0x7f1211a7" />
+    <public type="string" name="premium_grandfathered_monthly" id="0x7f1211a8" />
+    <public type="string" name="premium_grandfathered_warning" id="0x7f1211a9" />
+    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7f1211aa" />
+    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7f1211ab" />
+    <public type="string" name="premium_grandfathered_warning_title" id="0x7f1211ac" />
+    <public type="string" name="premium_grandfathered_yearly" id="0x7f1211ad" />
+    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7f1211ae" />
+    <public type="string" name="premium_guild_emoji_promo_description" id="0x7f1211af" />
+    <public type="string" name="premium_guild_emoji_promo_title" id="0x7f1211b0" />
+    <public type="string" name="premium_guild_features_custom_emoji_mobile" id="0x7f1211b1" />
+    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7f1211b2" />
+    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7f1211b3" />
+    <public type="string" name="premium_guild_features_voice_quality" id="0x7f1211b4" />
+    <public type="string" name="premium_guild_full_feature_list" id="0x7f1211b5" />
+    <public type="string" name="premium_guild_grace_period_cooldown" id="0x7f1211b6" />
+    <public type="string" name="premium_guild_grace_period_cooldown_soon" id="0x7f1211b7" />
+    <public type="string" name="premium_guild_grace_period_notice" id="0x7f1211b8" />
+    <public type="string" name="premium_guild_grace_period_notice_button" id="0x7f1211b9" />
+    <public type="string" name="premium_guild_grace_period_title" id="0x7f1211ba" />
+    <public type="string" name="premium_guild_guild_feature_audio_quality" id="0x7f1211bb" />
+    <public type="string" name="premium_guild_guild_feature_emoji" id="0x7f1211bc" />
+    <public type="string" name="premium_guild_guild_feature_upload_size" id="0x7f1211bd" />
+    <public type="string" name="premium_guild_guild_features_header" id="0x7f1211be" />
+    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7f1211bf" />
+    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7f1211c0" />
+    <public type="string" name="premium_guild_num_month_guild_subscriptions" id="0x7f1211c1" />
+    <public type="string" name="premium_guild_num_year_guild_subscriptions" id="0x7f1211c2" />
+    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7f1211c3" />
+    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7f1211c4" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile" id="0x7f1211c5" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile_learn_more" id="0x7f1211c6" />
+    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_body" id="0x7f1211c7" />
+    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_title" id="0x7f1211c8" />
+    <public type="string" name="premium_guild_perks_modal_button_gift_premium" id="0x7f1211c9" />
+    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7f1211ca" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7f1211cb" />
+    <public type="string" name="premium_guild_perks_modal_gift_nitro" id="0x7f1211cc" />
+    <public type="string" name="premium_guild_perks_modal_header" id="0x7f1211cd" />
+    <public type="string" name="premium_guild_perks_modal_header_subscription_count" id="0x7f1211ce" />
+    <public type="string" name="premium_guild_perks_modal_header_user_subscription_count" id="0x7f1211cf" />
+    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7f1211d0" />
+    <public type="string" name="premium_guild_perks_modal_manage_your_subscriptions" id="0x7f1211d1" />
+    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7f1211d2" />
+    <public type="string" name="premium_guild_perks_modal_protip" id="0x7f1211d3" />
+    <public type="string" name="premium_guild_perks_modal_protip_mobile" id="0x7f1211d4" />
+    <public type="string" name="premium_guild_perks_modal_subscribe_to_tier_tooltip" id="0x7f1211d5" />
+    <public type="string" name="premium_guild_perks_modal_subscriber_perks_header" id="0x7f1211d6" />
+    <public type="string" name="premium_guild_plan_month" id="0x7f1211d7" />
+    <public type="string" name="premium_guild_plan_year" id="0x7f1211d8" />
+    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7f1211d9" />
+    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7f1211da" />
+    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7f1211db" />
+    <public type="string" name="premium_guild_subscribe_confirm_cancel_warning" id="0x7f1211dc" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7f1211dd" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7f1211de" />
+    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7f1211df" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_blurb" id="0x7f1211e0" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_from_guild" id="0x7f1211e1" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_header" id="0x7f1211e2" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_to_guild" id="0x7f1211e3" />
+    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7f1211e4" />
+    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7f1211e5" />
+    <public type="string" name="premium_guild_subscribe_select_guild_transfer_header" id="0x7f1211e6" />
+    <public type="string" name="premium_guild_subscribe_success_okay" id="0x7f1211e7" />
+    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7f1211e8" />
+    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation" id="0x7f1211e9" />
+    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation_label" id="0x7f1211ea" />
+    <public type="string" name="premium_guild_subscribe_transfer_error_body" id="0x7f1211eb" />
+    <public type="string" name="premium_guild_subscribe_transfer_error_header" id="0x7f1211ec" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_cancel" id="0x7f1211ed" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_counter" id="0x7f1211ee" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_description" id="0x7f1211ef" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_header" id="0x7f1211f0" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_next" id="0x7f1211f1" />
+    <public type="string" name="premium_guild_subscriber_feature_member_badge" id="0x7f1211f2" />
+    <public type="string" name="premium_guild_subscriber_feature_profile_badge" id="0x7f1211f3" />
+    <public type="string" name="premium_guild_subscriber_feature_role" id="0x7f1211f4" />
+    <public type="string" name="premium_guild_subscription" id="0x7f1211f5" />
+    <public type="string" name="premium_guild_subscription_active_title" id="0x7f1211f6" />
+    <public type="string" name="premium_guild_subscription_available" id="0x7f1211f7" />
+    <public type="string" name="premium_guild_subscription_cancel_body_guild" id="0x7f1211f8" />
+    <public type="string" name="premium_guild_subscription_cancel_body_inventory" id="0x7f1211f9" />
+    <public type="string" name="premium_guild_subscription_cancel_button" id="0x7f1211fa" />
+    <public type="string" name="premium_guild_subscription_cancel_button_disabled_tooltip" id="0x7f1211fb" />
+    <public type="string" name="premium_guild_subscription_cancel_button_mobile" id="0x7f1211fc" />
+    <public type="string" name="premium_guild_subscription_cancel_error_mobile" id="0x7f1211fd" />
+    <public type="string" name="premium_guild_subscription_cancel_invoice_subscription_cancelled" id="0x7f1211fe" />
+    <public type="string" name="premium_guild_subscription_cancel_preview" id="0x7f1211ff" />
+    <public type="string" name="premium_guild_subscription_cancel_title" id="0x7f121200" />
+    <public type="string" name="premium_guild_subscription_cancel_title_guild" id="0x7f121201" />
+    <public type="string" name="premium_guild_subscription_cancel_title_inventory" id="0x7f121202" />
+    <public type="string" name="premium_guild_subscription_cancel_title_pending_cancellation" id="0x7f121203" />
+    <public type="string" name="premium_guild_subscription_confirm_body" id="0x7f121204" />
+    <public type="string" name="premium_guild_subscription_confirm_title" id="0x7f121205" />
+    <public type="string" name="premium_guild_subscription_creation_date" id="0x7f121206" />
+    <public type="string" name="premium_guild_subscription_duration" id="0x7f121207" />
+    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7f121208" />
+    <public type="string" name="premium_guild_subscription_error_pending_mutation" id="0x7f121209" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7f12120a" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7f12120b" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7f12120c" />
+    <public type="string" name="premium_guild_subscription_guild_affinity_notice" id="0x7f12120d" />
+    <public type="string" name="premium_guild_subscription_guild_affinity_notice_button" id="0x7f12120e" />
+    <public type="string" name="premium_guild_subscription_guild_affinity_notice_small_guild" id="0x7f12120f" />
+    <public type="string" name="premium_guild_subscription_guild_subsription_subtitle" id="0x7f121210" />
+    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_close" id="0x7f121211" />
+    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_header" id="0x7f121212" />
+    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_text" id="0x7f121213" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_button" id="0x7f121214" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_button_mobile" id="0x7f121215" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_description" id="0x7f121216" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_title" id="0x7f121217" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_description" id="0x7f121218" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_error" id="0x7f121219" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_title" id="0x7f12121a" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_title_mobile" id="0x7f12121b" />
+    <public type="string" name="premium_guild_subscription_marketing_blurb" id="0x7f12121c" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb" id="0x7f12121d" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_prompt" id="0x7f12121e" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_without_prompt" id="0x7f12121f" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_blurb_mobile" id="0x7f121220" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_text" id="0x7f121221" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_title" id="0x7f121222" />
+    <public type="string" name="premium_guild_subscription_marketing_header" id="0x7f121223" />
+    <public type="string" name="premium_guild_subscription_marketing_header_ios" id="0x7f121224" />
+    <public type="string" name="premium_guild_subscription_notice" id="0x7f121225" />
+    <public type="string" name="premium_guild_subscription_notice_button" id="0x7f121226" />
+    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7f121227" />
+    <public type="string" name="premium_guild_subscription_num_subscriptions" id="0x7f121228" />
+    <public type="string" name="premium_guild_subscription_pending_cancelation" id="0x7f121229" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_plan" id="0x7f12122a" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription" id="0x7f12122b" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_subscription_past_due" id="0x7f12122c" />
+    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7f12122d" />
+    <public type="string" name="premium_guild_subscription_slot_cancel_button" id="0x7f12122e" />
+    <public type="string" name="premium_guild_subscription_slot_uncancel_button" id="0x7f12122f" />
+    <public type="string" name="premium_guild_subscription_slot_uncancel_button_mobile" id="0x7f121230" />
+    <public type="string" name="premium_guild_subscription_subscribe" id="0x7f121231" />
+    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7f121232" />
+    <public type="string" name="premium_guild_subscription_subtitle" id="0x7f121233" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7f121234" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7f121235" />
+    <public type="string" name="premium_guild_subscription_title" id="0x7f121236" />
+    <public type="string" name="premium_guild_subscription_tooltip" id="0x7f121237" />
+    <public type="string" name="premium_guild_subscription_transfer_button" id="0x7f121238" />
+    <public type="string" name="premium_guild_subscription_transfer_button_disabled_tooltip" id="0x7f121239" />
+    <public type="string" name="premium_guild_subscription_unused_slot_description" id="0x7f12123a" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info" id="0x7f12123b" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_android" id="0x7f12123c" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation" id="0x7f12123d" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android" id="0x7f12123e" />
+    <public type="string" name="premium_guild_tier_0" id="0x7f12123f" />
+    <public type="string" name="premium_guild_tier_1" id="0x7f121240" />
+    <public type="string" name="premium_guild_tier_2" id="0x7f121241" />
+    <public type="string" name="premium_guild_tier_3" id="0x7f121242" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7f121243" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7f121244" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7f121245" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7f121246" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7f121247" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7f121248" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7f121249" />
+    <public type="string" name="premium_guild_user_feature_member_badge" id="0x7f12124a" />
+    <public type="string" name="premium_guild_user_feature_profile_badge" id="0x7f12124b" />
+    <public type="string" name="premium_guild_user_feature_role" id="0x7f12124c" />
+    <public type="string" name="premium_guild_user_features_header" id="0x7f12124d" />
+    <public type="string" name="premium_included" id="0x7f12124e" />
+    <public type="string" name="premium_legacy" id="0x7f12124f" />
+    <public type="string" name="premium_not_claimed" id="0x7f121250" />
+    <public type="string" name="premium_not_claimed_body" id="0x7f121251" />
+    <public type="string" name="premium_not_verified" id="0x7f121252" />
+    <public type="string" name="premium_not_verified_body" id="0x7f121253" />
+    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7f121254" />
+    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7f121255" />
+    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7f121256" />
+    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7f121257" />
+    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7f121258" />
+    <public type="string" name="premium_payment_gift_subtext_monthly" id="0x7f121259" />
+    <public type="string" name="premium_payment_gift_subtext_yearly" id="0x7f12125a" />
+    <public type="string" name="premium_payment_is_gift" id="0x7f12125b" />
+    <public type="string" name="premium_payment_select" id="0x7f12125c" />
+    <public type="string" name="premium_pending_plan_change_cancel_body" id="0x7f12125d" />
+    <public type="string" name="premium_pending_plan_change_cancel_button" id="0x7f12125e" />
+    <public type="string" name="premium_pending_plan_change_cancel_header" id="0x7f12125f" />
+    <public type="string" name="premium_pending_plan_change_notice" id="0x7f121260" />
+    <public type="string" name="premium_plan_month" id="0x7f121261" />
+    <public type="string" name="premium_plan_month_tier_1" id="0x7f121262" />
+    <public type="string" name="premium_plan_month_tier_2" id="0x7f121263" />
+    <public type="string" name="premium_plan_month_tier_2_trial" id="0x7f121264" />
+    <public type="string" name="premium_plan_year" id="0x7f121265" />
+    <public type="string" name="premium_plan_year_tier_1" id="0x7f121266" />
+    <public type="string" name="premium_plan_year_tier_2" id="0x7f121267" />
+    <public type="string" name="premium_plan_year_tier_2_trial" id="0x7f121268" />
+    <public type="string" name="premium_promo_description" id="0x7f121269" />
+    <public type="string" name="premium_promo_description_trial" id="0x7f12126a" />
+    <public type="string" name="premium_promo_title" id="0x7f12126b" />
+    <public type="string" name="premium_required" id="0x7f12126c" />
+    <public type="string" name="premium_required_get_nitro" id="0x7f12126d" />
+    <public type="string" name="premium_restore_subscription_ios" id="0x7f12126e" />
+    <public type="string" name="premium_retention_emoji_picker_description" id="0x7f12126f" />
+    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7f121270" />
+    <public type="string" name="premium_settings" id="0x7f121271" />
+    <public type="string" name="premium_settings_billing_info" id="0x7f121272" />
+    <public type="string" name="premium_settings_cancelled_info" id="0x7f121273" />
+    <public type="string" name="premium_settings_get" id="0x7f121274" />
+    <public type="string" name="premium_settings_manage" id="0x7f121275" />
+    <public type="string" name="premium_settings_past_due_info" id="0x7f121276" />
+    <public type="string" name="premium_settings_renewal_info" id="0x7f121277" />
+    <public type="string" name="premium_settings_subscriptions_mobile_header" id="0x7f121278" />
+    <public type="string" name="premium_subscription_adjustment_tooltip" id="0x7f121279" />
+    <public type="string" name="premium_subscription_billing_info_mobile" id="0x7f12127a" />
+    <public type="string" name="premium_subscription_cancelled" id="0x7f12127b" />
+    <public type="string" name="premium_subscription_credit" id="0x7f12127c" />
+    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7f12127d" />
+    <public type="string" name="premium_subscription_credit_applied_on" id="0x7f12127e" />
+    <public type="string" name="premium_subscription_credit_count_months" id="0x7f12127f" />
+    <public type="string" name="premium_subscription_current_label" id="0x7f121280" />
+    <public type="string" name="premium_subscription_description_tier_1" id="0x7f121281" />
+    <public type="string" name="premium_subscription_description_tier_1_pending_cancelation" id="0x7f121282" />
+    <public type="string" name="premium_subscription_description_tier_2" id="0x7f121283" />
+    <public type="string" name="premium_subscription_description_tier_2_pending_cancelation" id="0x7f121284" />
+    <public type="string" name="premium_subscription_grandfathered_upgrade_note" id="0x7f121285" />
+    <public type="string" name="premium_subscription_guild_subscription_adjustment" id="0x7f121286" />
+    <public type="string" name="premium_subscription_guild_subscription_adjustment_text" id="0x7f121287" />
+    <public type="string" name="premium_subscription_guild_subscription_adjustment_tooltip" id="0x7f121288" />
+    <public type="string" name="premium_subscription_hide_details" id="0x7f121289" />
+    <public type="string" name="premium_subscription_new_label" id="0x7f12128a" />
+    <public type="string" name="premium_subscription_new_total" id="0x7f12128b" />
+    <public type="string" name="premium_subscription_period_reset_notice" id="0x7f12128c" />
+    <public type="string" name="premium_subscription_plan_adjustment" id="0x7f12128d" />
+    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7f12128e" />
+    <public type="string" name="premium_subscription_policy_ios" id="0x7f12128f" />
+    <public type="string" name="premium_subscription_renewal_footer" id="0x7f121290" />
+    <public type="string" name="premium_subscription_renewal_footer_trial" id="0x7f121291" />
+    <public type="string" name="premium_subscription_required_body" id="0x7f121292" />
+    <public type="string" name="premium_subscription_show_details" id="0x7f121293" />
+    <public type="string" name="premium_subscription_updates" id="0x7f121294" />
+    <public type="string" name="premium_switch_plan_disabled_in_trial" id="0x7f121295" />
+    <public type="string" name="premium_switch_plan_disabled_pending_mutation_plan" id="0x7f121296" />
+    <public type="string" name="premium_switch_plan_disabled_pending_mutation_premium_guild_subscription" id="0x7f121297" />
+    <public type="string" name="premium_switch_plans" id="0x7f121298" />
+    <public type="string" name="premium_switch_review_header_premium_month_tier_1" id="0x7f121299" />
+    <public type="string" name="premium_switch_review_header_premium_month_tier_2" id="0x7f12129a" />
+    <public type="string" name="premium_switch_review_header_premium_year_tier_1" id="0x7f12129b" />
+    <public type="string" name="premium_switch_review_header_premium_year_tier_2" id="0x7f12129c" />
+    <public type="string" name="premium_tier_1" id="0x7f12129d" />
+    <public type="string" name="premium_tier_2" id="0x7f12129e" />
+    <public type="string" name="premium_tier_2_subtitle" id="0x7f12129f" />
+    <public type="string" name="premium_tier_2_title" id="0x7f1212a0" />
+    <public type="string" name="premium_tier_2_trial_cta_note" id="0x7f1212a1" />
+    <public type="string" name="premium_tier_2_trial_cta_subtitle" id="0x7f1212a2" />
+    <public type="string" name="premium_tier_2_trial_cta_title" id="0x7f1212a3" />
+    <public type="string" name="premium_title" id="0x7f1212a4" />
+    <public type="string" name="premium_trial_cta_button" id="0x7f1212a5" />
+    <public type="string" name="premium_trial_cta_descirption" id="0x7f1212a6" />
+    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7f1212a7" />
+    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7f1212a8" />
+    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7f1212a9" />
+    <public type="string" name="premium_upgrade_done_button" id="0x7f1212aa" />
+    <public type="string" name="premium_upgrade_required_body" id="0x7f1212ab" />
+    <public type="string" name="premium_upload_promo" id="0x7f1212ac" />
+    <public type="string" name="premium_upload_promo_trial" id="0x7f1212ad" />
+    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7f1212ae" />
+    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7f1212af" />
+    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7f1212b0" />
+    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7f1212b1" />
+    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7f1212b2" />
+    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7f1212b3" />
+    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7f1212b4" />
+    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7f1212b5" />
+    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7f1212b6" />
+    <public type="string" name="premium_upsell_continue_to_boosts" id="0x7f1212b7" />
+    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7f1212b8" />
+    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7f1212b9" />
+    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7f1212ba" />
+    <public type="string" name="premium_upsell_feature_chat_perks" id="0x7f1212bb" />
+    <public type="string" name="premium_upsell_feature_free_guild_subscription" id="0x7f1212bc" />
+    <public type="string" name="premium_upsell_feature_guild_subscription_discount" id="0x7f1212bd" />
+    <public type="string" name="premium_upsell_feature_pretext" id="0x7f1212be" />
+    <public type="string" name="premium_upsell_feature_pretext_trial" id="0x7f1212bf" />
+    <public type="string" name="premium_upsell_feature_stream" id="0x7f1212c0" />
+    <public type="string" name="premium_upsell_feature_upload" id="0x7f1212c1" />
+    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7f1212c2" />
+    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7f1212c3" />
+    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7f1212c4" />
+    <public type="string" name="premium_upsell_upgrade" id="0x7f1212c5" />
+    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7f1212c6" />
+    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7f1212c7" />
+    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7f1212c8" />
+    <public type="string" name="preorder_sku_name" id="0x7f1212c9" />
+    <public type="string" name="priority_speaker" id="0x7f1212ca" />
+    <public type="string" name="priority_speaker_description" id="0x7f1212cb" />
+    <public type="string" name="priority_speaker_description_app" id="0x7f1212cc" />
+    <public type="string" name="privacy_and_safety" id="0x7f1212cd" />
+    <public type="string" name="privacy_policy" id="0x7f1212ce" />
+    <public type="string" name="privacy_policy_url" id="0x7f1212cf" />
+    <public type="string" name="privacy_settings" id="0x7f1212d0" />
+    <public type="string" name="private_category" id="0x7f1212d1" />
+    <public type="string" name="private_category_note" id="0x7f1212d2" />
+    <public type="string" name="private_channel" id="0x7f1212d3" />
+    <public type="string" name="private_channel_modal_access_owner" id="0x7f1212d4" />
+    <public type="string" name="private_channel_modal_access_you" id="0x7f1212d5" />
+    <public type="string" name="private_channel_modal_admin_role_force_enabled" id="0x7f1212d6" />
+    <public type="string" name="private_channel_modal_no_roles" id="0x7f1212d7" />
+    <public type="string" name="private_channel_modal_no_roles_create" id="0x7f1212d8" />
+    <public type="string" name="private_channel_modal_no_roles_edit" id="0x7f1212d9" />
+    <public type="string" name="private_channel_note" id="0x7f1212da" />
+    <public type="string" name="private_channels_a11y_label" id="0x7f1212db" />
+    <public type="string" name="profile" id="0x7f1212dc" />
+    <public type="string" name="progress_completed" id="0x7f1212dd" />
+    <public type="string" name="progress_completed_description" id="0x7f1212de" />
+    <public type="string" name="progress_steps" id="0x7f1212df" />
+    <public type="string" name="progress_steps_finished" id="0x7f1212e0" />
+    <public type="string" name="project_id" id="0x7f1212e1" />
+    <public type="string" name="promotion_card_body_redeemed_hidden" id="0x7f1212e2" />
+    <public type="string" name="prune" id="0x7f1212e3" />
+    <public type="string" name="prune_members" id="0x7f1212e4" />
+    <public type="string" name="prune_with_roles" id="0x7f1212e5" />
+    <public type="string" name="pt_br" id="0x7f1212e6" />
+    <public type="string" name="ptt_limited_body" id="0x7f1212e7" />
+    <public type="string" name="ptt_limited_title" id="0x7f1212e8" />
+    <public type="string" name="ptt_limited_warning" id="0x7f1212e9" />
+    <public type="string" name="ptt_permission_body" id="0x7f1212ea" />
+    <public type="string" name="ptt_permission_title" id="0x7f1212eb" />
+    <public type="string" name="public_guild_policy_accept" id="0x7f1212ec" />
+    <public type="string" name="public_guild_policy_title" id="0x7f1212ed" />
+    <public type="string" name="public_locale_help" id="0x7f1212ee" />
+    <public type="string" name="public_locale_selector_title" id="0x7f1212ef" />
+    <public type="string" name="public_locale_title" id="0x7f1212f0" />
+    <public type="string" name="public_rules_channel_title" id="0x7f1212f1" />
+    <public type="string" name="public_rules_selector_title" id="0x7f1212f2" />
+    <public type="string" name="public_updates_channel_title" id="0x7f1212f3" />
+    <public type="string" name="publish_followed_news_body" id="0x7f1212f4" />
+    <public type="string" name="publish_followed_news_body_reach" id="0x7f1212f5" />
+    <public type="string" name="publish_followed_news_body_settings_insights" id="0x7f1212f6" />
+    <public type="string" name="publish_followed_news_fail_body" id="0x7f1212f7" />
+    <public type="string" name="publish_followed_news_fail_title" id="0x7f1212f8" />
+    <public type="string" name="publish_followed_news_generic_body" id="0x7f1212f9" />
+    <public type="string" name="purple" id="0x7f1212fa" />
+    <public type="string" name="qr_code_fail" id="0x7f1212fb" />
+    <public type="string" name="qr_code_fail_description" id="0x7f1212fc" />
+    <public type="string" name="qr_code_in_app_scanner_only" id="0x7f1212fd" />
+    <public type="string" name="qr_code_invalid" id="0x7f1212fe" />
+    <public type="string" name="qr_code_login_confirm" id="0x7f1212ff" />
+    <public type="string" name="qr_code_login_finish_button" id="0x7f121300" />
+    <public type="string" name="qr_code_login_start_over" id="0x7f121301" />
+    <public type="string" name="qr_code_login_success" id="0x7f121302" />
+    <public type="string" name="qr_code_login_success_flavor" id="0x7f121303" />
+    <public type="string" name="qr_code_not_found" id="0x7f121304" />
+    <public type="string" name="qr_code_not_found_description" id="0x7f121305" />
+    <public type="string" name="quality_indicator" id="0x7f121306" />
+    <public type="string" name="quick_dm_blocked" id="0x7f121307" />
+    <public type="string" name="quick_dm_user" id="0x7f121308" />
+    <public type="string" name="quick_switcher" id="0x7f121309" />
+    <public type="string" name="quickswitcher_drafts" id="0x7f12130a" />
+    <public type="string" name="quickswitcher_empty_cta" id="0x7f12130b" />
+    <public type="string" name="quickswitcher_empty_text" id="0x7f12130c" />
+    <public type="string" name="quickswitcher_last_channel" id="0x7f12130d" />
+    <public type="string" name="quickswitcher_mentions" id="0x7f12130e" />
+    <public type="string" name="quickswitcher_notice" id="0x7f12130f" />
+    <public type="string" name="quickswitcher_placeholder" id="0x7f121310" />
+    <public type="string" name="quickswitcher_protip" id="0x7f121311" />
+    <public type="string" name="quickswitcher_protip_guilds" id="0x7f121312" />
+    <public type="string" name="quickswitcher_protip_text_channels" id="0x7f121313" />
+    <public type="string" name="quickswitcher_protip_usernames" id="0x7f121314" />
+    <public type="string" name="quickswitcher_protip_voice_channels" id="0x7f121315" />
+    <public type="string" name="quickswitcher_querymode_applications" id="0x7f121316" />
+    <public type="string" name="quickswitcher_querymode_guilds" id="0x7f121317" />
+    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7f121318" />
+    <public type="string" name="quickswitcher_querymode_users" id="0x7f121319" />
+    <public type="string" name="quickswitcher_querymode_users_in_guild" id="0x7f12131a" />
+    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7f12131b" />
+    <public type="string" name="quickswitcher_tip_nav" id="0x7f12131c" />
+    <public type="string" name="quickswitcher_tip_select" id="0x7f12131d" />
+    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7f12131e" />
+    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7f12131f" />
+    <public type="string" name="quickswitcher_unread_channels" id="0x7f121320" />
+    <public type="string" name="quote" id="0x7f121321" />
+    <public type="string" name="quote_attribution" id="0x7f121322" />
+    <public type="string" name="quote_attribution_facebook" id="0x7f121323" />
+    <public type="string" name="quote_attribution_instagram" id="0x7f121324" />
+    <public type="string" name="rate_limited" id="0x7f121325" />
+    <public type="string" name="rating_request_body_android" id="0x7f121326" />
+    <public type="string" name="rating_request_title" id="0x7f121327" />
+    <public type="string" name="react_with_label" id="0x7f121328" />
+    <public type="string" name="reaction_tooltip_1" id="0x7f121329" />
+    <public type="string" name="reaction_tooltip_1_n" id="0x7f12132a" />
+    <public type="string" name="reaction_tooltip_2" id="0x7f12132b" />
+    <public type="string" name="reaction_tooltip_2_n" id="0x7f12132c" />
+    <public type="string" name="reaction_tooltip_3" id="0x7f12132d" />
+    <public type="string" name="reaction_tooltip_3_n" id="0x7f12132e" />
+    <public type="string" name="reaction_tooltip_n" id="0x7f12132f" />
+    <public type="string" name="reactions" id="0x7f121330" />
+    <public type="string" name="reactions_matching" id="0x7f121331" />
+    <public type="string" name="read_message_history" id="0x7f121332" />
+    <public type="string" name="read_messages" id="0x7f121333" />
+    <public type="string" name="read_messages_view_channels" id="0x7f121334" />
+    <public type="string" name="read_only_channel" id="0x7f121335" />
+    <public type="string" name="ready" id="0x7f121336" />
+    <public type="string" name="recent_mentions" id="0x7f121337" />
+    <public type="string" name="recent_mentions_direct_only" id="0x7f121338" />
+    <public type="string" name="recent_mentions_empty_state_header" id="0x7f121339" />
+    <public type="string" name="recent_mentions_empty_state_tip" id="0x7f12133a" />
+    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7f12133b" />
+    <public type="string" name="recent_mentions_filter_all_servers" id="0x7f12133c" />
+    <public type="string" name="recent_mentions_filter_everyone" id="0x7f12133d" />
+    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7f12133e" />
+    <public type="string" name="recent_mentions_filter_label" id="0x7f12133f" />
+    <public type="string" name="recent_mentions_filter_roles" id="0x7f121340" />
+    <public type="string" name="recent_mentions_pro_tip" id="0x7f121341" />
+    <public type="string" name="recent_mentions_roles_and_direct" id="0x7f121342" />
+    <public type="string" name="recents_notifications_menu_label" id="0x7f121343" />
+    <public type="string" name="reconnect" id="0x7f121344" />
+    <public type="string" name="reconnecting" id="0x7f121345" />
+    <public type="string" name="refund" id="0x7f121346" />
+    <public type="string" name="region" id="0x7f121347" />
+    <public type="string" name="region_select_footer" id="0x7f121348" />
+    <public type="string" name="region_select_header" id="0x7f121349" />
+    <public type="string" name="register" id="0x7f12134a" />
+    <public type="string" name="register_body" id="0x7f12134b" />
+    <public type="string" name="register_title" id="0x7f12134c" />
+    <public type="string" name="remaining_participants" id="0x7f12134d" />
+    <public type="string" name="remind_me_later" id="0x7f12134e" />
+    <public type="string" name="remove" id="0x7f12134f" />
+    <public type="string" name="remove_all_reactions" id="0x7f121350" />
+    <public type="string" name="remove_all_reactions_confirm_body" id="0x7f121351" />
+    <public type="string" name="remove_all_reactions_confirm_title" id="0x7f121352" />
+    <public type="string" name="remove_friend" id="0x7f121353" />
+    <public type="string" name="remove_friend_body" id="0x7f121354" />
+    <public type="string" name="remove_friend_title" id="0x7f121355" />
+    <public type="string" name="remove_from_group" id="0x7f121356" />
+    <public type="string" name="remove_from_thread" id="0x7f121357" />
+    <public type="string" name="remove_icon" id="0x7f121358" />
+    <public type="string" name="remove_keybind" id="0x7f121359" />
+    <public type="string" name="remove_reaction" id="0x7f12135a" />
+    <public type="string" name="remove_role_or_user" id="0x7f12135b" />
+    <public type="string" name="remove_synced_role" id="0x7f12135c" />
+    <public type="string" name="remove_vanity_url" id="0x7f12135d" />
+    <public type="string" name="render_embeds" id="0x7f12135e" />
+    <public type="string" name="render_embeds_label" id="0x7f12135f" />
+    <public type="string" name="render_reactions" id="0x7f121360" />
+    <public type="string" name="reply_quote_click_to_view" id="0x7f121361" />
+    <public type="string" name="replying_to" id="0x7f121362" />
+    <public type="string" name="report" id="0x7f121363" />
+    <public type="string" name="report_message" id="0x7f121364" />
+    <public type="string" name="report_message_menu_option" id="0x7f121365" />
+    <public type="string" name="report_modal_block_user" id="0x7f121366" />
+    <public type="string" name="report_modal_description" id="0x7f121367" />
+    <public type="string" name="report_modal_description_max_exceeded" id="0x7f121368" />
+    <public type="string" name="report_modal_description_min_max" id="0x7f121369" />
+    <public type="string" name="report_modal_error" id="0x7f12136a" />
+    <public type="string" name="report_modal_message_selected" id="0x7f12136b" />
+    <public type="string" name="report_modal_report_message" id="0x7f12136c" />
+    <public type="string" name="report_modal_select_one" id="0x7f12136d" />
+    <public type="string" name="report_modal_should_block" id="0x7f12136e" />
+    <public type="string" name="report_modal_should_delete" id="0x7f12136f" />
+    <public type="string" name="report_modal_subject" id="0x7f121370" />
+    <public type="string" name="report_modal_submit" id="0x7f121371" />
+    <public type="string" name="report_modal_submitted" id="0x7f121372" />
+    <public type="string" name="report_modal_submitted_email_confirmation" id="0x7f121373" />
+    <public type="string" name="report_modal_type_title" id="0x7f121374" />
+    <public type="string" name="report_server" id="0x7f121375" />
+    <public type="string" name="report_user" id="0x7f121376" />
+    <public type="string" name="resend" id="0x7f121377" />
+    <public type="string" name="resend_code" id="0x7f121378" />
+    <public type="string" name="resend_email" id="0x7f121379" />
+    <public type="string" name="resend_message" id="0x7f12137a" />
+    <public type="string" name="resend_verification_email" id="0x7f12137b" />
+    <public type="string" name="reset" id="0x7f12137c" />
+    <public type="string" name="reset_nickname" id="0x7f12137d" />
+    <public type="string" name="reset_notification_override" id="0x7f12137e" />
+    <public type="string" name="reset_notification_settings" id="0x7f12137f" />
+    <public type="string" name="reset_password_title" id="0x7f121380" />
+    <public type="string" name="reset_to_default" id="0x7f121381" />
+    <public type="string" name="reset_voice_settings" id="0x7f121382" />
+    <public type="string" name="reset_voice_settings_body" id="0x7f121383" />
+    <public type="string" name="resubscribe" id="0x7f121384" />
+    <public type="string" name="retry" id="0x7f121385" />
+    <public type="string" name="return_to_login" id="0x7f121386" />
+    <public type="string" name="reversed" id="0x7f121387" />
+    <public type="string" name="revoke" id="0x7f121388" />
+    <public type="string" name="revoke_ban" id="0x7f121389" />
+    <public type="string" name="ring" id="0x7f12138a" />
+    <public type="string" name="ro" id="0x7f12138b" />
+    <public type="string" name="role_color" id="0x7f12138c" />
+    <public type="string" name="role_id_copied" id="0x7f12138d" />
+    <public type="string" name="role_order_updated" id="0x7f12138e" />
+    <public type="string" name="role_required_edit_roles_modal_subtitle" id="0x7f12138f" />
+    <public type="string" name="role_required_edit_roles_modal_title" id="0x7f121390" />
+    <public type="string" name="role_required_single_user_message" id="0x7f121391" />
+    <public type="string" name="roles" id="0x7f121392" />
+    <public type="string" name="roles_list" id="0x7f121393" />
+    <public type="string" name="rtc_connection" id="0x7f121394" />
+    <public type="string" name="rtc_connection_state_authenticating" id="0x7f121395" />
+    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7f121396" />
+    <public type="string" name="rtc_connection_state_connecting" id="0x7f121397" />
+    <public type="string" name="rtc_connection_state_disconnected" id="0x7f121398" />
+    <public type="string" name="rtc_connection_state_ice_checking" id="0x7f121399" />
+    <public type="string" name="rtc_connection_state_no_route" id="0x7f12139a" />
+    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7f12139b" />
+    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7f12139c" />
+    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7f12139d" />
+    <public type="string" name="rtc_debug_context" id="0x7f12139e" />
+    <public type="string" name="rtc_debug_open" id="0x7f12139f" />
+    <public type="string" name="rtc_debug_rtp_inbound" id="0x7f1213a0" />
+    <public type="string" name="rtc_debug_rtp_outbound" id="0x7f1213a1" />
+    <public type="string" name="rtc_debug_screenshare" id="0x7f1213a2" />
+    <public type="string" name="rtc_debug_transport" id="0x7f1213a3" />
+    <public type="string" name="ru" id="0x7f1213a4" />
+    <public type="string" name="salmon" id="0x7f1213a5" />
+    <public type="string" name="sample_channel_message" id="0x7f1213a6" />
+    <public type="string" name="sample_channel_name" id="0x7f1213a7" />
+    <public type="string" name="sample_channel_name_short" id="0x7f1213a8" />
+    <public type="string" name="sample_channel_search_filter" id="0x7f1213a9" />
+    <public type="string" name="sample_confirmation" id="0x7f1213aa" />
+    <public type="string" name="sample_connected_account" id="0x7f1213ab" />
+    <public type="string" name="sample_discrim" id="0x7f1213ac" />
+    <public type="string" name="sample_email" id="0x7f1213ad" />
+    <public type="string" name="sample_empty_string" id="0x7f1213ae" />
+    <public type="string" name="sample_language" id="0x7f1213af" />
+    <public type="string" name="sample_notification_frequency" id="0x7f1213b0" />
+    <public type="string" name="sample_number_9" id="0x7f1213b1" />
+    <public type="string" name="sample_number_99" id="0x7f1213b2" />
+    <public type="string" name="sample_number_999" id="0x7f1213b3" />
+    <public type="string" name="sample_number_9999" id="0x7f1213b4" />
+    <public type="string" name="sample_number_bandwidth" id="0x7f1213b5" />
+    <public type="string" name="sample_number_ratio" id="0x7f1213b6" />
+    <public type="string" name="sample_online_members" id="0x7f1213b7" />
+    <public type="string" name="sample_server_name" id="0x7f1213b8" />
+    <public type="string" name="sample_server_name_short" id="0x7f1213b9" />
+    <public type="string" name="sample_server_role_name" id="0x7f1213ba" />
+    <public type="string" name="sample_time_duration_minutes" id="0x7f1213bb" />
+    <public type="string" name="sample_time_duration_seconds" id="0x7f1213bc" />
+    <public type="string" name="sample_time_pm" id="0x7f1213bd" />
+    <public type="string" name="sample_time_stamp" id="0x7f1213be" />
+    <public type="string" name="sample_total_members" id="0x7f1213bf" />
+    <public type="string" name="sample_user_generated_link" id="0x7f1213c0" />
+    <public type="string" name="sample_user_name" id="0x7f1213c1" />
+    <public type="string" name="sample_user_name_discrim" id="0x7f1213c2" />
+    <public type="string" name="sample_user_nick" id="0x7f1213c3" />
+    <public type="string" name="sample_user_presence" id="0x7f1213c4" />
+    <public type="string" name="sample_user_presence_details" id="0x7f1213c5" />
+    <public type="string" name="save" id="0x7f1213c6" />
+    <public type="string" name="save_changes" id="0x7f1213c7" />
+    <public type="string" name="save_image" id="0x7f1213c8" />
+    <public type="string" name="save_image_preview" id="0x7f1213c9" />
+    <public type="string" name="save_media_failure_help_mobile" id="0x7f1213ca" />
+    <public type="string" name="save_media_failure_mobile" id="0x7f1213cb" />
+    <public type="string" name="save_media_success_mobile" id="0x7f1213cc" />
+    <public type="string" name="saved_settings" id="0x7f1213cd" />
+    <public type="string" name="scope_activities_read" id="0x7f1213ce" />
+    <public type="string" name="scope_activities_read_description" id="0x7f1213cf" />
+    <public type="string" name="scope_activities_write" id="0x7f1213d0" />
+    <public type="string" name="scope_activities_write_description" id="0x7f1213d1" />
+    <public type="string" name="scope_applications_builds_read" id="0x7f1213d2" />
+    <public type="string" name="scope_applications_builds_read_description" id="0x7f1213d3" />
+    <public type="string" name="scope_applications_builds_upload" id="0x7f1213d4" />
+    <public type="string" name="scope_applications_builds_upload_description" id="0x7f1213d5" />
+    <public type="string" name="scope_applications_entitlements" id="0x7f1213d6" />
+    <public type="string" name="scope_applications_entitlements_description" id="0x7f1213d7" />
+    <public type="string" name="scope_applications_store_update" id="0x7f1213d8" />
+    <public type="string" name="scope_applications_store_update_description" id="0x7f1213d9" />
+    <public type="string" name="scope_bot" id="0x7f1213da" />
+    <public type="string" name="scope_bot_description" id="0x7f1213db" />
+    <public type="string" name="scope_bot_permissions" id="0x7f1213dc" />
+    <public type="string" name="scope_bot_permissions_description" id="0x7f1213dd" />
+    <public type="string" name="scope_bot_server_placeholder" id="0x7f1213de" />
+    <public type="string" name="scope_connections" id="0x7f1213df" />
+    <public type="string" name="scope_connections_empty" id="0x7f1213e0" />
+    <public type="string" name="scope_email" id="0x7f1213e1" />
+    <public type="string" name="scope_email_empty" id="0x7f1213e2" />
+    <public type="string" name="scope_gdm_join" id="0x7f1213e3" />
+    <public type="string" name="scope_gdm_join_description" id="0x7f1213e4" />
+    <public type="string" name="scope_guilds" id="0x7f1213e5" />
+    <public type="string" name="scope_guilds_empty" id="0x7f1213e6" />
+    <public type="string" name="scope_guilds_join" id="0x7f1213e7" />
+    <public type="string" name="scope_guilds_join_description" id="0x7f1213e8" />
+    <public type="string" name="scope_identify" id="0x7f1213e9" />
+    <public type="string" name="scope_messages_read" id="0x7f1213ea" />
+    <public type="string" name="scope_messages_read_description" id="0x7f1213eb" />
+    <public type="string" name="scope_relationships_read" id="0x7f1213ec" />
+    <public type="string" name="scope_relationships_read_description" id="0x7f1213ed" />
+    <public type="string" name="scope_rpc" id="0x7f1213ee" />
+    <public type="string" name="scope_rpc_description" id="0x7f1213ef" />
+    <public type="string" name="scope_rpc_notifications_read" id="0x7f1213f0" />
+    <public type="string" name="scope_rpc_notifications_read_description" id="0x7f1213f1" />
+    <public type="string" name="scope_unsupported_on_android" id="0x7f1213f2" />
+    <public type="string" name="scope_unsupported_on_android_description" id="0x7f1213f3" />
+    <public type="string" name="scope_webhook_incoming" id="0x7f1213f4" />
+    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7f1213f5" />
+    <public type="string" name="scope_webhook_incoming_description" id="0x7f1213f6" />
+    <public type="string" name="screen_share_on" id="0x7f1213f7" />
+    <public type="string" name="screen_share_options" id="0x7f1213f8" />
+    <public type="string" name="screenshare_change_windows" id="0x7f1213f9" />
+    <public type="string" name="screenshare_description" id="0x7f1213fa" />
+    <public type="string" name="screenshare_frame_rate" id="0x7f1213fb" />
+    <public type="string" name="screenshare_relaunch" id="0x7f1213fc" />
+    <public type="string" name="screenshare_relaunch_body" id="0x7f1213fd" />
+    <public type="string" name="screenshare_screen" id="0x7f1213fe" />
+    <public type="string" name="screenshare_share_screen_or_window" id="0x7f1213ff" />
+    <public type="string" name="screenshare_sound_toggle_label" id="0x7f121400" />
+    <public type="string" name="screenshare_source" id="0x7f121401" />
+    <public type="string" name="screenshare_stop" id="0x7f121402" />
+    <public type="string" name="screenshare_stream_game" id="0x7f121403" />
+    <public type="string" name="screenshare_stream_quality" id="0x7f121404" />
+    <public type="string" name="screenshare_unavailable" id="0x7f121405" />
+    <public type="string" name="screenshare_unavailable_download_app" id="0x7f121406" />
+    <public type="string" name="screenshare_window" id="0x7f121407" />
+    <public type="string" name="search" id="0x7f121408" />
+    <public type="string" name="search_actions" id="0x7f121409" />
+    <public type="string" name="search_answer_date" id="0x7f12140a" />
+    <public type="string" name="search_answer_file_name" id="0x7f12140b" />
+    <public type="string" name="search_answer_file_type" id="0x7f12140c" />
+    <public type="string" name="search_answer_from" id="0x7f12140d" />
+    <public type="string" name="search_answer_has" id="0x7f12140e" />
+    <public type="string" name="search_answer_has_attachment" id="0x7f12140f" />
+    <public type="string" name="search_answer_has_embed" id="0x7f121410" />
+    <public type="string" name="search_answer_has_image" id="0x7f121411" />
+    <public type="string" name="search_answer_has_link" id="0x7f121412" />
+    <public type="string" name="search_answer_has_sound" id="0x7f121413" />
+    <public type="string" name="search_answer_has_video" id="0x7f121414" />
+    <public type="string" name="search_answer_in" id="0x7f121415" />
+    <public type="string" name="search_answer_link_from" id="0x7f121416" />
+    <public type="string" name="search_answer_mentions" id="0x7f121417" />
+    <public type="string" name="search_channels" id="0x7f121418" />
+    <public type="string" name="search_channels_no_result" id="0x7f121419" />
+    <public type="string" name="search_clear" id="0x7f12141a" />
+    <public type="string" name="search_clear_history" id="0x7f12141b" />
+    <public type="string" name="search_country" id="0x7f12141c" />
+    <public type="string" name="search_date_picker_hint" id="0x7f12141d" />
+    <public type="string" name="search_dm_still_indexing" id="0x7f12141e" />
+    <public type="string" name="search_dm_with" id="0x7f12141f" />
+    <public type="string" name="search_emojis" id="0x7f121420" />
+    <public type="string" name="search_error" id="0x7f121421" />
+    <public type="string" name="search_filter_after" id="0x7f121422" />
+    <public type="string" name="search_filter_before" id="0x7f121423" />
+    <public type="string" name="search_filter_during" id="0x7f121424" />
+    <public type="string" name="search_filter_file_name" id="0x7f121425" />
+    <public type="string" name="search_filter_file_type" id="0x7f121426" />
+    <public type="string" name="search_filter_from" id="0x7f121427" />
+    <public type="string" name="search_filter_has" id="0x7f121428" />
+    <public type="string" name="search_filter_in" id="0x7f121429" />
+    <public type="string" name="search_filter_link_from" id="0x7f12142a" />
+    <public type="string" name="search_filter_mentions" id="0x7f12142b" />
+    <public type="string" name="search_filter_on" id="0x7f12142c" />
+    <public type="string" name="search_for_emoji" id="0x7f12142d" />
+    <public type="string" name="search_for_value" id="0x7f12142e" />
+    <public type="string" name="search_from_suggestions" id="0x7f12142f" />
+    <public type="string" name="search_gifs" id="0x7f121430" />
+    <public type="string" name="search_group_header_channels" id="0x7f121431" />
+    <public type="string" name="search_group_header_dates" id="0x7f121432" />
+    <public type="string" name="search_group_header_file_type" id="0x7f121433" />
+    <public type="string" name="search_group_header_from" id="0x7f121434" />
+    <public type="string" name="search_group_header_has" id="0x7f121435" />
+    <public type="string" name="search_group_header_history" id="0x7f121436" />
+    <public type="string" name="search_group_header_link_from" id="0x7f121437" />
+    <public type="string" name="search_group_header_mentions" id="0x7f121438" />
+    <public type="string" name="search_group_header_search_options" id="0x7f121439" />
+    <public type="string" name="search_guild_still_indexing" id="0x7f12143a" />
+    <public type="string" name="search_hide_blocked_messages" id="0x7f12143b" />
+    <public type="string" name="search_in" id="0x7f12143c" />
+    <public type="string" name="search_members" id="0x7f12143d" />
+    <public type="string" name="search_members_no_result" id="0x7f12143e" />
+    <public type="string" name="search_menu_title" id="0x7f12143f" />
+    <public type="string" name="search_most_relevant" id="0x7f121440" />
+    <public type="string" name="search_newest" id="0x7f121441" />
+    <public type="string" name="search_no_results" id="0x7f121442" />
+    <public type="string" name="search_no_results_alt" id="0x7f121443" />
+    <public type="string" name="search_num_results_blocked_not_shown" id="0x7f121444" />
+    <public type="string" name="search_oldest" id="0x7f121445" />
+    <public type="string" name="search_pagination_a11y_label" id="0x7f121446" />
+    <public type="string" name="search_pick_date" id="0x7f121447" />
+    <public type="string" name="search_results_section_label" id="0x7f121448" />
+    <public type="string" name="search_roles" id="0x7f121449" />
+    <public type="string" name="search_roles_no_result" id="0x7f12144a" />
+    <public type="string" name="search_shortcut_month" id="0x7f12144b" />
+    <public type="string" name="search_shortcut_today" id="0x7f12144c" />
+    <public type="string" name="search_shortcut_week" id="0x7f12144d" />
+    <public type="string" name="search_shortcut_year" id="0x7f12144e" />
+    <public type="string" name="search_shortcut_yesterday" id="0x7f12144f" />
+    <public type="string" name="search_still_indexing_hint" id="0x7f121450" />
+    <public type="string" name="search_tenor" id="0x7f121451" />
+    <public type="string" name="search_with_google" id="0x7f121452" />
+    <public type="string" name="searching" id="0x7f121453" />
+    <public type="string" name="security" id="0x7f121454" />
+    <public type="string" name="select" id="0x7f121455" />
+    <public type="string" name="select_channel_or_category" id="0x7f121456" />
+    <public type="string" name="select_emoji" id="0x7f121457" />
+    <public type="string" name="select_picture" id="0x7f121458" />
+    <public type="string" name="select_sort_mode" id="0x7f121459" />
+    <public type="string" name="selection_shrink_scale" id="0x7f12145a" />
+    <public type="string" name="self_deny_permission_body" id="0x7f12145b" />
+    <public type="string" name="self_deny_permission_title" id="0x7f12145c" />
+    <public type="string" name="self_username_indicator" id="0x7f12145d" />
+    <public type="string" name="self_username_indicator_hook" id="0x7f12145e" />
+    <public type="string" name="self_xss_header" id="0x7f12145f" />
+    <public type="string" name="self_xss_line_1" id="0x7f121460" />
+    <public type="string" name="self_xss_line_2" id="0x7f121461" />
+    <public type="string" name="self_xss_line_3" id="0x7f121462" />
+    <public type="string" name="self_xss_line_4" id="0x7f121463" />
+    <public type="string" name="send" id="0x7f121464" />
+    <public type="string" name="send_a_message" id="0x7f121465" />
+    <public type="string" name="send_dm" id="0x7f121466" />
+    <public type="string" name="send_images_label" id="0x7f121467" />
+    <public type="string" name="send_message" id="0x7f121468" />
+    <public type="string" name="send_message_failure" id="0x7f121469" />
+    <public type="string" name="send_messages" id="0x7f12146a" />
+    <public type="string" name="send_messages_description" id="0x7f12146b" />
+    <public type="string" name="send_tts_messages" id="0x7f12146c" />
+    <public type="string" name="send_tts_messages_description" id="0x7f12146d" />
+    <public type="string" name="server_deafen" id="0x7f12146e" />
+    <public type="string" name="server_deafened" id="0x7f12146f" />
+    <public type="string" name="server_deafened_dialog_body" id="0x7f121470" />
+    <public type="string" name="server_deafened_dialog_title" id="0x7f121471" />
+    <public type="string" name="server_desciption_empty" id="0x7f121472" />
+    <public type="string" name="server_emoji" id="0x7f121473" />
+    <public type="string" name="server_folder_mark_as_read" id="0x7f121474" />
+    <public type="string" name="server_folder_placeholder" id="0x7f121475" />
+    <public type="string" name="server_folder_settings" id="0x7f121476" />
+    <public type="string" name="server_insights" id="0x7f121477" />
+    <public type="string" name="server_mute" id="0x7f121478" />
+    <public type="string" name="server_muted" id="0x7f121479" />
+    <public type="string" name="server_muted_dialog_body" id="0x7f12147a" />
+    <public type="string" name="server_muted_dialog_title" id="0x7f12147b" />
+    <public type="string" name="server_name_required" id="0x7f12147c" />
+    <public type="string" name="server_options" id="0x7f12147d" />
+    <public type="string" name="server_overview" id="0x7f12147e" />
+    <public type="string" name="server_quest" id="0x7f12147f" />
+    <public type="string" name="server_region_unavailable" id="0x7f121480" />
+    <public type="string" name="server_settings" id="0x7f121481" />
+    <public type="string" name="server_settings_updated" id="0x7f121482" />
+    <public type="string" name="server_status" id="0x7f121483" />
+    <public type="string" name="server_undeafen" id="0x7f121484" />
+    <public type="string" name="server_unmute" id="0x7f121485" />
+    <public type="string" name="server_voice_mute" id="0x7f121486" />
+    <public type="string" name="server_voice_unmute" id="0x7f121487" />
+    <public type="string" name="servers" id="0x7f121488" />
+    <public type="string" name="service_connections_disconnect" id="0x7f121489" />
+    <public type="string" name="set_debug_logging" id="0x7f12148a" />
+    <public type="string" name="set_debug_logging_body" id="0x7f12148b" />
+    <public type="string" name="set_invite_link_never_expire" id="0x7f12148c" />
+    <public type="string" name="set_status" id="0x7f12148d" />
+    <public type="string" name="set_up_description" id="0x7f12148e" />
+    <public type="string" name="set_up_your_server" id="0x7f12148f" />
+    <public type="string" name="settings" id="0x7f121490" />
+    <public type="string" name="settings_advanced" id="0x7f121491" />
+    <public type="string" name="settings_games_add_game" id="0x7f121492" />
+    <public type="string" name="settings_games_add_new_game" id="0x7f121493" />
+    <public type="string" name="settings_games_added_games_label" id="0x7f121494" />
+    <public type="string" name="settings_games_enable_overlay_label" id="0x7f121495" />
+    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7f121496" />
+    <public type="string" name="settings_games_last_played" id="0x7f121497" />
+    <public type="string" name="settings_games_no_game_detected" id="0x7f121498" />
+    <public type="string" name="settings_games_no_games_header" id="0x7f121499" />
+    <public type="string" name="settings_games_not_playing" id="0x7f12149a" />
+    <public type="string" name="settings_games_not_seeing_game" id="0x7f12149b" />
+    <public type="string" name="settings_games_now_playing_state" id="0x7f12149c" />
+    <public type="string" name="settings_games_overlay" id="0x7f12149d" />
+    <public type="string" name="settings_games_overlay_off" id="0x7f12149e" />
+    <public type="string" name="settings_games_overlay_on" id="0x7f12149f" />
+    <public type="string" name="settings_games_overlay_warning" id="0x7f1214a0" />
+    <public type="string" name="settings_games_toggle_overlay" id="0x7f1214a1" />
+    <public type="string" name="settings_games_verified_icon" id="0x7f1214a2" />
+    <public type="string" name="settings_invite_tip" id="0x7f1214a3" />
+    <public type="string" name="settings_invite_tip_without_create" id="0x7f1214a4" />
+    <public type="string" name="settings_notice_message" id="0x7f1214a5" />
+    <public type="string" name="settings_permissions_delete_body" id="0x7f1214a6" />
+    <public type="string" name="settings_permissions_delete_title" id="0x7f1214a7" />
+    <public type="string" name="settings_roles_delete_body" id="0x7f1214a8" />
+    <public type="string" name="settings_roles_delete_title" id="0x7f1214a9" />
+    <public type="string" name="settings_sync" id="0x7f1214aa" />
+    <public type="string" name="settings_webhooks_empty_body" id="0x7f1214ab" />
+    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7f1214ac" />
+    <public type="string" name="settings_webhooks_empty_title" id="0x7f1214ad" />
+    <public type="string" name="settings_webhooks_intro" id="0x7f1214ae" />
+    <public type="string" name="setup_vanity_url" id="0x7f1214af" />
+    <public type="string" name="several_users_typing" id="0x7f1214b0" />
+    <public type="string" name="share" id="0x7f1214b1" />
+    <public type="string" name="share_invite_link_for_access" id="0x7f1214b2" />
+    <public type="string" name="share_invite_mobile" id="0x7f1214b3" />
+    <public type="string" name="share_link" id="0x7f1214b4" />
+    <public type="string" name="share_settings_title" id="0x7f1214b5" />
+    <public type="string" name="share_to" id="0x7f1214b6" />
+    <public type="string" name="share_your_screen" id="0x7f1214b7" />
+    <public type="string" name="sharing_screen" id="0x7f1214b8" />
+    <public type="string" name="shortcut_recorder_button" id="0x7f1214b9" />
+    <public type="string" name="shortcut_recorder_button_edit" id="0x7f1214ba" />
+    <public type="string" name="shortcut_recorder_button_recording" id="0x7f1214bb" />
+    <public type="string" name="shortcut_recorder_no_bind" id="0x7f1214bc" />
+    <public type="string" name="show_chat" id="0x7f1214bd" />
+    <public type="string" name="show_current_game" id="0x7f1214be" />
+    <public type="string" name="show_current_game_desc" id="0x7f1214bf" />
+    <public type="string" name="show_folder" id="0x7f1214c0" />
+    <public type="string" name="show_keyboard" id="0x7f1214c1" />
+    <public type="string" name="show_muted" id="0x7f1214c2" />
+    <public type="string" name="show_muted_channels" id="0x7f1214c3" />
+    <public type="string" name="show_spoiler_always" id="0x7f1214c4" />
+    <public type="string" name="show_spoiler_content" id="0x7f1214c5" />
+    <public type="string" name="show_spoiler_content_help" id="0x7f1214c6" />
+    <public type="string" name="show_spoiler_on_click" id="0x7f1214c7" />
+    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7f1214c8" />
+    <public type="string" name="skip" id="0x7f1214c9" />
+    <public type="string" name="skip_all_tips" id="0x7f1214ca" />
+    <public type="string" name="skip_to_content" id="0x7f1214cb" />
+    <public type="string" name="sky_blue" id="0x7f1214cc" />
+    <public type="string" name="sort" id="0x7f1214cd" />
+    <public type="string" name="sorting" id="0x7f1214ce" />
+    <public type="string" name="sorting_channels" id="0x7f1214cf" />
+    <public type="string" name="sound_deafen" id="0x7f1214d0" />
+    <public type="string" name="sound_incoming_ring" id="0x7f1214d1" />
+    <public type="string" name="sound_message" id="0x7f1214d2" />
+    <public type="string" name="sound_mute" id="0x7f1214d3" />
+    <public type="string" name="sound_outgoing_ring" id="0x7f1214d4" />
+    <public type="string" name="sound_ptt_activate" id="0x7f1214d5" />
+    <public type="string" name="sound_ptt_deactivate" id="0x7f1214d6" />
+    <public type="string" name="sound_stream_started" id="0x7f1214d7" />
+    <public type="string" name="sound_stream_stopped" id="0x7f1214d8" />
+    <public type="string" name="sound_undeafen" id="0x7f1214d9" />
+    <public type="string" name="sound_unmute" id="0x7f1214da" />
+    <public type="string" name="sound_user_join" id="0x7f1214db" />
+    <public type="string" name="sound_user_leave" id="0x7f1214dc" />
+    <public type="string" name="sound_user_moved" id="0x7f1214dd" />
+    <public type="string" name="sound_viewer_join" id="0x7f1214de" />
+    <public type="string" name="sound_viewer_leave" id="0x7f1214df" />
+    <public type="string" name="sound_voice_disconnected" id="0x7f1214e0" />
+    <public type="string" name="sounds" id="0x7f1214e1" />
+    <public type="string" name="source_message_deleted" id="0x7f1214e2" />
+    <public type="string" name="speak" id="0x7f1214e3" />
+    <public type="string" name="speak_message" id="0x7f1214e4" />
+    <public type="string" name="spectators" id="0x7f1214e5" />
+    <public type="string" name="spellcheck" id="0x7f1214e6" />
+    <public type="string" name="spoiler" id="0x7f1214e7" />
+    <public type="string" name="spoiler_mark_selected" id="0x7f1214e8" />
+    <public type="string" name="spoiler_reveal" id="0x7f1214e9" />
+    <public type="string" name="spotify_connection_info_android" id="0x7f1214ea" />
+    <public type="string" name="spotify_listen_along_host" id="0x7f1214eb" />
+    <public type="string" name="spotify_listen_along_info" id="0x7f1214ec" />
+    <public type="string" name="spotify_listen_along_listener" id="0x7f1214ed" />
+    <public type="string" name="spotify_listen_along_listeners" id="0x7f1214ee" />
+    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7f1214ef" />
+    <public type="string" name="spotify_listen_along_stop" id="0x7f1214f0" />
+    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7f1214f1" />
+    <public type="string" name="spotify_listen_along_title_host" id="0x7f1214f2" />
+    <public type="string" name="spotify_listen_along_title_listener" id="0x7f1214f3" />
+    <public type="string" name="spotify_premium_upgrade_body" id="0x7f1214f4" />
+    <public type="string" name="spotify_premium_upgrade_button" id="0x7f1214f5" />
+    <public type="string" name="spotify_premium_upgrade_header" id="0x7f1214f6" />
+    <public type="string" name="staff_badge_tooltip" id="0x7f1214f7" />
+    <public type="string" name="start" id="0x7f1214f8" />
+    <public type="string" name="start_a_thread" id="0x7f1214f9" />
+    <public type="string" name="start_call" id="0x7f1214fa" />
+    <public type="string" name="start_thread" id="0x7f1214fb" />
+    <public type="string" name="start_thread_modal_reply" id="0x7f1214fc" />
+    <public type="string" name="start_thread_modal_subtext" id="0x7f1214fd" />
+    <public type="string" name="start_video_call" id="0x7f1214fe" />
+    <public type="string" name="start_voice_call" id="0x7f1214ff" />
+    <public type="string" name="starting_at" id="0x7f121500" />
+    <public type="string" name="status_bar_notification_info_overflow" id="0x7f121501" />
+    <public type="string" name="status_dnd" id="0x7f121502" />
+    <public type="string" name="status_dnd_help" id="0x7f121503" />
+    <public type="string" name="status_idle" id="0x7f121504" />
+    <public type="string" name="status_invisible" id="0x7f121505" />
+    <public type="string" name="status_invisible_helper" id="0x7f121506" />
+    <public type="string" name="status_offline" id="0x7f121507" />
+    <public type="string" name="status_online" id="0x7f121508" />
+    <public type="string" name="status_online_mobile" id="0x7f121509" />
+    <public type="string" name="status_streaming" id="0x7f12150a" />
+    <public type="string" name="status_unknown" id="0x7f12150b" />
+    <public type="string" name="step_number" id="0x7f12150c" />
+    <public type="string" name="still_indexing" id="0x7f12150d" />
+    <public type="string" name="stop" id="0x7f12150e" />
+    <public type="string" name="stop_ringing" id="0x7f12150f" />
+    <public type="string" name="stop_ringing_username" id="0x7f121510" />
+    <public type="string" name="stop_speaking_message" id="0x7f121511" />
+    <public type="string" name="stop_streaming" id="0x7f121512" />
+    <public type="string" name="stop_watching" id="0x7f121513" />
+    <public type="string" name="stop_watching_user" id="0x7f121514" />
+    <public type="string" name="storage_permission_denied" id="0x7f121515" />
+    <public type="string" name="store_channel" id="0x7f121516" />
+    <public type="string" name="stream_actions_menu_label" id="0x7f121517" />
+    <public type="string" name="stream_bad_spectator" id="0x7f121518" />
+    <public type="string" name="stream_bad_streamer" id="0x7f121519" />
+    <public type="string" name="stream_capture_paused" id="0x7f12151a" />
+    <public type="string" name="stream_capture_paused_details" id="0x7f12151b" />
+    <public type="string" name="stream_capture_paused_details_viewer" id="0x7f12151c" />
+    <public type="string" name="stream_channel_description" id="0x7f12151d" />
+    <public type="string" name="stream_description" id="0x7f12151e" />
+    <public type="string" name="stream_ended" id="0x7f12151f" />
+    <public type="string" name="stream_failed_description" id="0x7f121520" />
+    <public type="string" name="stream_failed_title" id="0x7f121521" />
+    <public type="string" name="stream_fps_option" id="0x7f121522" />
+    <public type="string" name="stream_full_modal_body" id="0x7f121523" />
+    <public type="string" name="stream_full_modal_header" id="0x7f121524" />
+    <public type="string" name="stream_issue_modal_header" id="0x7f121525" />
+    <public type="string" name="stream_network_quality_error" id="0x7f121526" />
+    <public type="string" name="stream_no_preview" id="0x7f121527" />
+    <public type="string" name="stream_participants_hidden" id="0x7f121528" />
+    <public type="string" name="stream_playing" id="0x7f121529" />
+    <public type="string" name="stream_premium_upsell_body" id="0x7f12152a" />
+    <public type="string" name="stream_premium_upsell_body_no_cta" id="0x7f12152b" />
+    <public type="string" name="stream_premium_upsell_cta" id="0x7f12152c" />
+    <public type="string" name="stream_premium_upsell_header" id="0x7f12152d" />
+    <public type="string" name="stream_preview_loading" id="0x7f12152e" />
+    <public type="string" name="stream_preview_paused" id="0x7f12152f" />
+    <public type="string" name="stream_preview_paused_subtext" id="0x7f121530" />
+    <public type="string" name="stream_quality_unlock" id="0x7f121531" />
+    <public type="string" name="stream_reconnecting_error" id="0x7f121532" />
+    <public type="string" name="stream_reconnecting_error_subtext" id="0x7f121533" />
+    <public type="string" name="stream_report_a_problem" id="0x7f121534" />
+    <public type="string" name="stream_report_a_problem_post_stream" id="0x7f121535" />
+    <public type="string" name="stream_report_audio_missing" id="0x7f121536" />
+    <public type="string" name="stream_report_audio_poor" id="0x7f121537" />
+    <public type="string" name="stream_report_black" id="0x7f121538" />
+    <public type="string" name="stream_report_blurry" id="0x7f121539" />
+    <public type="string" name="stream_report_ended_audio_missing" id="0x7f12153a" />
+    <public type="string" name="stream_report_ended_audio_poor" id="0x7f12153b" />
+    <public type="string" name="stream_report_ended_black" id="0x7f12153c" />
+    <public type="string" name="stream_report_ended_blurry" id="0x7f12153d" />
+    <public type="string" name="stream_report_ended_lagging" id="0x7f12153e" />
+    <public type="string" name="stream_report_ended_out_of_sync" id="0x7f12153f" />
+    <public type="string" name="stream_report_game_issue" id="0x7f121540" />
+    <public type="string" name="stream_report_label" id="0x7f121541" />
+    <public type="string" name="stream_report_lagging" id="0x7f121542" />
+    <public type="string" name="stream_report_no_issue" id="0x7f121543" />
+    <public type="string" name="stream_report_out_of_sync" id="0x7f121544" />
+    <public type="string" name="stream_report_placeholder" id="0x7f121545" />
+    <public type="string" name="stream_report_problem" id="0x7f121546" />
+    <public type="string" name="stream_report_problem_body" id="0x7f121547" />
+    <public type="string" name="stream_report_problem_header_mobile" id="0x7f121548" />
+    <public type="string" name="stream_report_problem_menu_item" id="0x7f121549" />
+    <public type="string" name="stream_report_problem_mobile" id="0x7f12154a" />
+    <public type="string" name="stream_report_rating_body" id="0x7f12154b" />
+    <public type="string" name="stream_report_rating_body_streamer" id="0x7f12154c" />
+    <public type="string" name="stream_report_submit" id="0x7f12154d" />
+    <public type="string" name="stream_reported" id="0x7f12154e" />
+    <public type="string" name="stream_reported_body" id="0x7f12154f" />
+    <public type="string" name="stream_resolution" id="0x7f121550" />
+    <public type="string" name="stream_show_all_participants" id="0x7f121551" />
+    <public type="string" name="stream_show_non_video" id="0x7f121552" />
+    <public type="string" name="stream_single_person_body" id="0x7f121553" />
+    <public type="string" name="stream_single_person_body_alt" id="0x7f121554" />
+    <public type="string" name="stream_soundshare_failed" id="0x7f121555" />
+    <public type="string" name="stream_volume" id="0x7f121556" />
+    <public type="string" name="stream_watch_multiple_tooltip" id="0x7f121557" />
+    <public type="string" name="streamer_mode" id="0x7f121558" />
+    <public type="string" name="streamer_mode_enabled" id="0x7f121559" />
+    <public type="string" name="streamer_playing" id="0x7f12155a" />
+    <public type="string" name="streamer_settings_title" id="0x7f12155b" />
+    <public type="string" name="streaming" id="0x7f12155c" />
+    <public type="string" name="streaming_a_game" id="0x7f12155d" />
+    <public type="string" name="sub_enabled_servers" id="0x7f12155e" />
+    <public type="string" name="subscriber_information" id="0x7f12155f" />
+    <public type="string" name="subscription_payment_legalese_monthly" id="0x7f121560" />
+    <public type="string" name="subscription_payment_legalese_yearly" id="0x7f121561" />
+    <public type="string" name="subscriptions_title" id="0x7f121562" />
+    <public type="string" name="suggestions" id="0x7f121563" />
+    <public type="string" name="summary_collapsed_preference_list" id="0x7f121564" />
+    <public type="string" name="support" id="0x7f121565" />
+    <public type="string" name="suppress_all_embeds" id="0x7f121566" />
+    <public type="string" name="suppress_embed_body" id="0x7f121567" />
+    <public type="string" name="suppress_embed_confirm" id="0x7f121568" />
+    <public type="string" name="suppress_embed_tip" id="0x7f121569" />
+    <public type="string" name="suppress_embed_title" id="0x7f12156a" />
+    <public type="string" name="suppressed" id="0x7f12156b" />
+    <public type="string" name="suppressed_afk_body" id="0x7f12156c" />
+    <public type="string" name="suppressed_afk_title" id="0x7f12156d" />
+    <public type="string" name="suppressed_permission_body" id="0x7f12156e" />
+    <public type="string" name="sv_se" id="0x7f12156f" />
+    <public type="string" name="switch_audio_output" id="0x7f121570" />
+    <public type="string" name="switch_hardware_acceleration" id="0x7f121571" />
+    <public type="string" name="switch_hardware_acceleration_body" id="0x7f121572" />
+    <public type="string" name="switch_subsystem" id="0x7f121573" />
+    <public type="string" name="switch_subsystem_body" id="0x7f121574" />
+    <public type="string" name="switch_to_compact_mode" id="0x7f121575" />
+    <public type="string" name="switch_to_cozy_mode" id="0x7f121576" />
+    <public type="string" name="switch_to_dark_theme" id="0x7f121577" />
+    <public type="string" name="switch_to_light_theme" id="0x7f121578" />
+    <public type="string" name="switch_to_push_to_talk" id="0x7f121579" />
+    <public type="string" name="switch_to_voice_activity" id="0x7f12157a" />
+    <public type="string" name="sync" id="0x7f12157b" />
+    <public type="string" name="sync_across_clients_appearance_help" id="0x7f12157c" />
+    <public type="string" name="sync_across_clients_text" id="0x7f12157d" />
+    <public type="string" name="sync_across_clients_text_help" id="0x7f12157e" />
+    <public type="string" name="sync_friends" id="0x7f12157f" />
+    <public type="string" name="sync_now" id="0x7f121580" />
+    <public type="string" name="sync_permissions" id="0x7f121581" />
+    <public type="string" name="sync_permissions_explanation" id="0x7f121582" />
+    <public type="string" name="sync_revoked" id="0x7f121583" />
+    <public type="string" name="sync_this_account" id="0x7f121584" />
+    <public type="string" name="system_dm_activity_text" id="0x7f121585" />
+    <public type="string" name="system_dm_channel_description" id="0x7f121586" />
+    <public type="string" name="system_dm_channel_description_subtext" id="0x7f121587" />
+    <public type="string" name="system_dm_empty_message" id="0x7f121588" />
+    <public type="string" name="system_dm_tag_system" id="0x7f121589" />
+    <public type="string" name="system_dm_urgent_message_modal_body" id="0x7f12158a" />
+    <public type="string" name="system_dm_urgent_message_modal_header" id="0x7f12158b" />
+    <public type="string" name="system_keyboard" id="0x7f12158c" />
+    <public type="string" name="system_message_call_missed" id="0x7f12158d" />
+    <public type="string" name="system_message_call_missed_with_duration" id="0x7f12158e" />
+    <public type="string" name="system_message_call_started" id="0x7f12158f" />
+    <public type="string" name="system_message_call_started_with_duration" id="0x7f121590" />
+    <public type="string" name="system_message_channel_follow_add" id="0x7f121591" />
+    <public type="string" name="system_message_channel_follow_add_ios" id="0x7f121592" />
+    <public type="string" name="system_message_channel_icon_change" id="0x7f121593" />
+    <public type="string" name="system_message_channel_name_change" id="0x7f121594" />
+    <public type="string" name="system_message_guild_bot_join" id="0x7f121595" />
+    <public type="string" name="system_message_guild_discovery_disqualified" id="0x7f121596" />
+    <public type="string" name="system_message_guild_discovery_disqualified_mobile" id="0x7f121597" />
+    <public type="string" name="system_message_guild_discovery_grace_period_final_warning" id="0x7f121598" />
+    <public type="string" name="system_message_guild_discovery_grace_period_initial_warning" id="0x7f121599" />
+    <public type="string" name="system_message_guild_discovery_requalified" id="0x7f12159a" />
+    <public type="string" name="system_message_guild_member_join_001" id="0x7f12159b" />
+    <public type="string" name="system_message_guild_member_join_002" id="0x7f12159c" />
+    <public type="string" name="system_message_guild_member_join_003" id="0x7f12159d" />
+    <public type="string" name="system_message_guild_member_join_004" id="0x7f12159e" />
+    <public type="string" name="system_message_guild_member_join_005" id="0x7f12159f" />
+    <public type="string" name="system_message_guild_member_join_006" id="0x7f1215a0" />
+    <public type="string" name="system_message_guild_member_join_007" id="0x7f1215a1" />
+    <public type="string" name="system_message_guild_member_join_008" id="0x7f1215a2" />
+    <public type="string" name="system_message_guild_member_join_009" id="0x7f1215a3" />
+    <public type="string" name="system_message_guild_member_join_010" id="0x7f1215a4" />
+    <public type="string" name="system_message_guild_member_join_011" id="0x7f1215a5" />
+    <public type="string" name="system_message_guild_member_join_012" id="0x7f1215a6" />
+    <public type="string" name="system_message_guild_member_join_013" id="0x7f1215a7" />
+    <public type="string" name="system_message_guild_member_subscribed" id="0x7f1215a8" />
+    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7f1215a9" />
+    <public type="string" name="system_message_guild_member_subscribed_many" id="0x7f1215aa" />
+    <public type="string" name="system_message_guild_member_subscribed_many_achieved_tier" id="0x7f1215ab" />
+    <public type="string" name="system_message_guild_stream_active" id="0x7f1215ac" />
+    <public type="string" name="system_message_guild_stream_active_android" id="0x7f1215ad" />
+    <public type="string" name="system_message_guild_stream_active_mobile" id="0x7f1215ae" />
+    <public type="string" name="system_message_guild_stream_active_no_activity" id="0x7f1215af" />
+    <public type="string" name="system_message_guild_stream_ended" id="0x7f1215b0" />
+    <public type="string" name="system_message_guild_stream_ended_mobile" id="0x7f1215b1" />
+    <public type="string" name="system_message_join_call" id="0x7f1215b2" />
+    <public type="string" name="system_message_pinned_message" id="0x7f1215b3" />
+    <public type="string" name="system_message_pinned_message_mobile" id="0x7f1215b4" />
+    <public type="string" name="system_message_pinned_message_no_cta" id="0x7f1215b5" />
+    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7f1215b6" />
+    <public type="string" name="system_message_pinned_message_no_cta_formatted_with_message" id="0x7f1215b7" />
+    <public type="string" name="system_message_pinned_message_with_message" id="0x7f1215b8" />
+    <public type="string" name="system_message_recipient_add" id="0x7f1215b9" />
+    <public type="string" name="system_message_recipient_remove" id="0x7f1215ba" />
+    <public type="string" name="system_message_recipient_remove_self" id="0x7f1215bb" />
+    <public type="string" name="system_message_thread_created" id="0x7f1215bc" />
+    <public type="string" name="system_message_thread_reply_created" id="0x7f1215bd" />
+    <public type="string" name="system_permission_grant" id="0x7f1215be" />
+    <public type="string" name="system_permission_request_camera" id="0x7f1215bf" />
+    <public type="string" name="system_permission_request_files" id="0x7f1215c0" />
+    <public type="string" name="tab_bar" id="0x7f1215c1" />
+    <public type="string" name="tabs_friends_accessibility_label" id="0x7f1215c2" />
+    <public type="string" name="tabs_home_accessibility_label" id="0x7f1215c3" />
+    <public type="string" name="tabs_mentions_accessibility_label" id="0x7f1215c4" />
+    <public type="string" name="tabs_search_accessibility_label" id="0x7f1215c5" />
+    <public type="string" name="tabs_settings_accessibility_label" id="0x7f1215c6" />
+    <public type="string" name="take_a_photo" id="0x7f1215c7" />
+    <public type="string" name="tan" id="0x7f1215c8" />
+    <public type="string" name="tap_add_nickname" id="0x7f1215c9" />
+    <public type="string" name="tar_gz" id="0x7f1215ca" />
+    <public type="string" name="teal" id="0x7f1215cb" />
+    <public type="string" name="temporary_membership_explanation" id="0x7f1215cc" />
+    <public type="string" name="terms_of_service" id="0x7f1215cd" />
+    <public type="string" name="terms_of_service_url" id="0x7f1215ce" />
+    <public type="string" name="terms_privacy" id="0x7f1215cf" />
+    <public type="string" name="terms_privacy_opt_in" id="0x7f1215d0" />
+    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7f1215d1" />
+    <public type="string" name="terracotta" id="0x7f1215d2" />
+    <public type="string" name="test_newlines_key" id="0x7f1215d3" />
+    <public type="string" name="test_video" id="0x7f1215d4" />
+    <public type="string" name="text" id="0x7f1215d5" />
+    <public type="string" name="text_actions_menu_label" id="0x7f1215d6" />
+    <public type="string" name="text_and_images" id="0x7f1215d7" />
+    <public type="string" name="text_channel" id="0x7f1215d8" />
+    <public type="string" name="text_channels" id="0x7f1215d9" />
+    <public type="string" name="text_channels_matching" id="0x7f1215da" />
+    <public type="string" name="text_permissions" id="0x7f1215db" />
+    <public type="string" name="textarea_actions_menu_label" id="0x7f1215dc" />
+    <public type="string" name="textarea_placeholder" id="0x7f1215dd" />
+    <public type="string" name="th" id="0x7f1215de" />
+    <public type="string" name="theme" id="0x7f1215df" />
+    <public type="string" name="theme_dark" id="0x7f1215e0" />
+    <public type="string" name="theme_holy_light_reveal" id="0x7f1215e1" />
+    <public type="string" name="theme_light" id="0x7f1215e2" />
+    <public type="string" name="theme_pure_evil_easter_hint" id="0x7f1215e3" />
+    <public type="string" name="theme_pure_evil_easter_reveal" id="0x7f1215e4" />
+    <public type="string" name="theme_pure_evil_switch_label" id="0x7f1215e5" />
+    <public type="string" name="theme_pure_evil_updated" id="0x7f1215e6" />
+    <public type="string" name="theme_updated" id="0x7f1215e7" />
+    <public type="string" name="this_server" id="0x7f1215e8" />
+    <public type="string" name="this_server_named" id="0x7f1215e9" />
+    <public type="string" name="thread" id="0x7f1215ea" />
+    <public type="string" name="thread_deleted" id="0x7f1215eb" />
+    <public type="string" name="thread_join_header" id="0x7f1215ec" />
+    <public type="string" name="thread_join_sub_text" id="0x7f1215ed" />
+    <public type="string" name="thread_modal_message" id="0x7f1215ee" />
+    <public type="string" name="thread_topic" id="0x7f1215ef" />
+    <public type="string" name="threads" id="0x7f1215f0" />
+    <public type="string" name="threads_active_section" id="0x7f1215f1" />
+    <public type="string" name="threads_inactive_section" id="0x7f1215f2" />
+    <public type="string" name="threads_joined_section" id="0x7f1215f3" />
+    <public type="string" name="three_users_typing" id="0x7f1215f4" />
+    <public type="string" name="timeout_error" id="0x7f1215f5" />
+    <public type="string" name="tip_create_first_server_body3" id="0x7f1215f6" />
+    <public type="string" name="tip_create_first_server_title3" id="0x7f1215f7" />
+    <public type="string" name="tip_create_more_servers_body3" id="0x7f1215f8" />
+    <public type="string" name="tip_create_more_servers_title3" id="0x7f1215f9" />
+    <public type="string" name="tip_direct_messages_body3" id="0x7f1215fa" />
+    <public type="string" name="tip_direct_messages_title3" id="0x7f1215fb" />
+    <public type="string" name="tip_friends_list_body3" id="0x7f1215fc" />
+    <public type="string" name="tip_friends_list_title3" id="0x7f1215fd" />
+    <public type="string" name="tip_instant_invite_body3" id="0x7f1215fe" />
+    <public type="string" name="tip_instant_invite_title3" id="0x7f1215ff" />
+    <public type="string" name="tip_organize_by_topic_body3" id="0x7f121600" />
+    <public type="string" name="tip_organize_by_topic_title3" id="0x7f121601" />
+    <public type="string" name="tip_server_settings_body3" id="0x7f121602" />
+    <public type="string" name="tip_server_settings_title3" id="0x7f121603" />
+    <public type="string" name="tip_voice_conversations_body3" id="0x7f121604" />
+    <public type="string" name="tip_voice_conversations_title3" id="0x7f121605" />
+    <public type="string" name="tip_whos_online_body3" id="0x7f121606" />
+    <public type="string" name="tip_whos_online_title3" id="0x7f121607" />
+    <public type="string" name="tip_writing_messages_body3" id="0x7f121608" />
+    <public type="string" name="tip_writing_messages_title3" id="0x7f121609" />
+    <public type="string" name="title" id="0x7f12160a" />
+    <public type="string" name="title_bar_close_window" id="0x7f12160b" />
+    <public type="string" name="title_bar_fullscreen_window" id="0x7f12160c" />
+    <public type="string" name="title_bar_maximize_window" id="0x7f12160d" />
+    <public type="string" name="title_bar_minimize_window" id="0x7f12160e" />
+    <public type="string" name="toast_add_friend" id="0x7f12160f" />
+    <public type="string" name="toast_feedback_sent" id="0x7f121610" />
+    <public type="string" name="toast_gif_saved" id="0x7f121611" />
+    <public type="string" name="toast_id_copied" id="0x7f121612" />
+    <public type="string" name="toast_image_saved" id="0x7f121613" />
+    <public type="string" name="toast_message_copied" id="0x7f121614" />
+    <public type="string" name="toast_message_id_copied" id="0x7f121615" />
+    <public type="string" name="toast_username_saved" id="0x7f121616" />
+    <public type="string" name="toast_video_saved" id="0x7f121617" />
+    <public type="string" name="toggle_camera" id="0x7f121618" />
+    <public type="string" name="toggle_deafen" id="0x7f121619" />
+    <public type="string" name="toggle_drawer" id="0x7f12161a" />
+    <public type="string" name="toggle_emoji_keyboard" id="0x7f12161b" />
+    <public type="string" name="toggle_media_keyboard" id="0x7f12161c" />
+    <public type="string" name="toggle_microphone" id="0x7f12161d" />
+    <public type="string" name="toggle_mute" id="0x7f12161e" />
+    <public type="string" name="too_many_animated_emoji" id="0x7f12161f" />
+    <public type="string" name="too_many_emoji" id="0x7f121620" />
+    <public type="string" name="too_many_reactions_alert_body" id="0x7f121621" />
+    <public type="string" name="too_many_reactions_alert_header" id="0x7f121622" />
+    <public type="string" name="too_many_user_guilds_alert_description" id="0x7f121623" />
+    <public type="string" name="too_many_user_guilds_alert_title" id="0x7f121624" />
+    <public type="string" name="too_many_user_guilds_description" id="0x7f121625" />
+    <public type="string" name="too_many_user_guilds_title" id="0x7f121626" />
+    <public type="string" name="tooltip_community_feature_disabled" id="0x7f121627" />
+    <public type="string" name="tooltip_discoverable_guild_feature_disabled" id="0x7f121628" />
+    <public type="string" name="total_members" id="0x7f121629" />
+    <public type="string" name="total_results" id="0x7f12162a" />
+    <public type="string" name="tr" id="0x7f12162b" />
+    <public type="string" name="transfer" id="0x7f12162c" />
+    <public type="string" name="transfer_ownership" id="0x7f12162d" />
+    <public type="string" name="transfer_ownership_acknowledge" id="0x7f12162e" />
+    <public type="string" name="transfer_ownership_to_user" id="0x7f12162f" />
+    <public type="string" name="trending_arrow_down" id="0x7f121630" />
+    <public type="string" name="trending_arrow_up" id="0x7f121631" />
+    <public type="string" name="try_again" id="0x7f121632" />
+    <public type="string" name="tts_alls" id="0x7f121633" />
+    <public type="string" name="tts_current" id="0x7f121634" />
+    <public type="string" name="tts_never" id="0x7f121635" />
+    <public type="string" name="tutorial_close" id="0x7f121636" />
+    <public type="string" name="tweet_us" id="0x7f121637" />
+    <public type="string" name="twitter" id="0x7f121638" />
+    <public type="string" name="twitter_page_url" id="0x7f121639" />
+    <public type="string" name="two_fa" id="0x7f12163a" />
+    <public type="string" name="two_fa_activate" id="0x7f12163b" />
+    <public type="string" name="two_fa_app_name_authy" id="0x7f12163c" />
+    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7f12163d" />
+    <public type="string" name="two_fa_auth_code" id="0x7f12163e" />
+    <public type="string" name="two_fa_backup_code_enter" id="0x7f12163f" />
+    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7f121640" />
+    <public type="string" name="two_fa_backup_code_hint" id="0x7f121641" />
+    <public type="string" name="two_fa_backup_code_used" id="0x7f121642" />
+    <public type="string" name="two_fa_backup_codes_body" id="0x7f121643" />
+    <public type="string" name="two_fa_backup_codes_label" id="0x7f121644" />
+    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7f121645" />
+    <public type="string" name="two_fa_backup_codes_warning" id="0x7f121646" />
+    <public type="string" name="two_fa_change_account" id="0x7f121647" />
+    <public type="string" name="two_fa_confirm_body" id="0x7f121648" />
+    <public type="string" name="two_fa_confirm_confirm" id="0x7f121649" />
+    <public type="string" name="two_fa_confirm_title" id="0x7f12164a" />
+    <public type="string" name="two_fa_disable" id="0x7f12164b" />
+    <public type="string" name="two_fa_discord_backup_codes" id="0x7f12164c" />
+    <public type="string" name="two_fa_download_app_body" id="0x7f12164d" />
+    <public type="string" name="two_fa_download_app_label" id="0x7f12164e" />
+    <public type="string" name="two_fa_download_codes" id="0x7f12164f" />
+    <public type="string" name="two_fa_enable" id="0x7f121650" />
+    <public type="string" name="two_fa_enable_subheader" id="0x7f121651" />
+    <public type="string" name="two_fa_enabled" id="0x7f121652" />
+    <public type="string" name="two_fa_enter_sms_token_label" id="0x7f121653" />
+    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7f121654" />
+    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7f121655" />
+    <public type="string" name="two_fa_enter_token_body" id="0x7f121656" />
+    <public type="string" name="two_fa_enter_token_label" id="0x7f121657" />
+    <public type="string" name="two_fa_generate_codes" id="0x7f121658" />
+    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7f121659" />
+    <public type="string" name="two_fa_guild_mfa_warning" id="0x7f12165a" />
+    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7f12165b" />
+    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7f12165c" />
+    <public type="string" name="two_fa_guild_mfa_warning_message_with_spacing" id="0x7f12165d" />
+    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7f12165e" />
+    <public type="string" name="two_fa_key" id="0x7f12165f" />
+    <public type="string" name="two_fa_login_body" id="0x7f121660" />
+    <public type="string" name="two_fa_login_footer" id="0x7f121661" />
+    <public type="string" name="two_fa_login_label" id="0x7f121662" />
+    <public type="string" name="two_fa_not_verified" id="0x7f121663" />
+    <public type="string" name="two_fa_qr_body" id="0x7f121664" />
+    <public type="string" name="two_fa_qr_label" id="0x7f121665" />
+    <public type="string" name="two_fa_remove" id="0x7f121666" />
+    <public type="string" name="two_fa_sales_pitch" id="0x7f121667" />
+    <public type="string" name="two_fa_success_body_mobile" id="0x7f121668" />
+    <public type="string" name="two_fa_success_header" id="0x7f121669" />
+    <public type="string" name="two_fa_token_required" id="0x7f12166a" />
+    <public type="string" name="two_fa_use_desktop_app" id="0x7f12166b" />
+    <public type="string" name="two_fa_view_backup_codes" id="0x7f12166c" />
+    <public type="string" name="two_fa_view_codes" id="0x7f12166d" />
+    <public type="string" name="two_users_typing" id="0x7f12166e" />
+    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7f12166f" />
+    <public type="string" name="ucrop_label_edit_photo" id="0x7f121670" />
+    <public type="string" name="ucrop_label_original" id="0x7f121671" />
+    <public type="string" name="ucrop_menu_crop" id="0x7f121672" />
+    <public type="string" name="ucrop_mutate_exception_hint" id="0x7f121673" />
+    <public type="string" name="uk" id="0x7f121674" />
+    <public type="string" name="unable_to_join_channel_full" id="0x7f121675" />
+    <public type="string" name="unable_to_join_channel_full_modal_body" id="0x7f121676" />
+    <public type="string" name="unable_to_join_channel_full_modal_header" id="0x7f121677" />
+    <public type="string" name="unable_to_open_media_chooser" id="0x7f121678" />
+    <public type="string" name="unban" id="0x7f121679" />
+    <public type="string" name="unban_user_body" id="0x7f12167a" />
+    <public type="string" name="unban_user_title" id="0x7f12167b" />
+    <public type="string" name="unblock" id="0x7f12167c" />
+    <public type="string" name="unblock_to_jump_body" id="0x7f12167d" />
+    <public type="string" name="unblock_to_jump_title" id="0x7f12167e" />
+    <public type="string" name="uncategorized" id="0x7f12167f" />
+    <public type="string" name="unclaimed_account_body" id="0x7f121680" />
+    <public type="string" name="unclaimed_account_title" id="0x7f121681" />
+    <public type="string" name="undeafen" id="0x7f121682" />
+    <public type="string" name="unfocus_participant" id="0x7f121683" />
+    <public type="string" name="unhandled_link_body" id="0x7f121684" />
+    <public type="string" name="unhandled_link_title" id="0x7f121685" />
+    <public type="string" name="unicode_emoji_category_shortcut_a11y_label" id="0x7f121686" />
+    <public type="string" name="unknown_region" id="0x7f121687" />
+    <public type="string" name="unknown_user" id="0x7f121688" />
+    <public type="string" name="unmute" id="0x7f121689" />
+    <public type="string" name="unmute_category" id="0x7f12168a" />
+    <public type="string" name="unmute_channel" id="0x7f12168b" />
+    <public type="string" name="unmute_channel_generic" id="0x7f12168c" />
+    <public type="string" name="unmute_conversation" id="0x7f12168d" />
+    <public type="string" name="unmute_server" id="0x7f12168e" />
+    <public type="string" name="unnamed" id="0x7f12168f" />
+    <public type="string" name="unpin" id="0x7f121690" />
+    <public type="string" name="unpin_confirm" id="0x7f121691" />
+    <public type="string" name="unpin_message" id="0x7f121692" />
+    <public type="string" name="unpin_message_body" id="0x7f121693" />
+    <public type="string" name="unpin_message_context_menu_hint" id="0x7f121694" />
+    <public type="string" name="unpin_message_failed_body" id="0x7f121695" />
+    <public type="string" name="unpin_message_failed_title" id="0x7f121696" />
+    <public type="string" name="unpin_message_title" id="0x7f121697" />
+    <public type="string" name="unreads_confirm_mark_all_read_description" id="0x7f121698" />
+    <public type="string" name="unreads_confirm_mark_all_read_header" id="0x7f121699" />
+    <public type="string" name="unreads_empty_state_header" id="0x7f12169a" />
+    <public type="string" name="unreads_empty_state_tip" id="0x7f12169b" />
+    <public type="string" name="unreads_empty_state_tip_mac" id="0x7f12169c" />
+    <public type="string" name="unreads_mark_read" id="0x7f12169d" />
+    <public type="string" name="unreads_no_notifications_divider" id="0x7f12169e" />
+    <public type="string" name="unreads_old_channels_divider" id="0x7f12169f" />
+    <public type="string" name="unreads_tab_label" id="0x7f1216a0" />
+    <public type="string" name="unreads_tutorial_body" id="0x7f1216a1" />
+    <public type="string" name="unreads_tutorial_header" id="0x7f1216a2" />
+    <public type="string" name="unreads_view_channel" id="0x7f1216a3" />
+    <public type="string" name="unsupported_browser" id="0x7f1216a4" />
+    <public type="string" name="unsupported_browser_body" id="0x7f1216a5" />
+    <public type="string" name="unsupported_browser_details" id="0x7f1216a6" />
+    <public type="string" name="unsupported_browser_title" id="0x7f1216a7" />
+    <public type="string" name="unverified_account_title" id="0x7f1216a8" />
+    <public type="string" name="update_available" id="0x7f1216a9" />
+    <public type="string" name="update_badge_header" id="0x7f1216aa" />
+    <public type="string" name="update_downloaded" id="0x7f1216ab" />
+    <public type="string" name="update_manually" id="0x7f1216ac" />
+    <public type="string" name="upload" id="0x7f1216ad" />
+    <public type="string" name="upload_a_media_file" id="0x7f1216ae" />
+    <public type="string" name="upload_area_cancel_all" id="0x7f1216af" />
+    <public type="string" name="upload_area_help" id="0x7f1216b0" />
+    <public type="string" name="upload_area_invalid_file_type_help" id="0x7f1216b1" />
+    <public type="string" name="upload_area_invalid_file_type_title" id="0x7f1216b2" />
+    <public type="string" name="upload_area_leave_a_comment" id="0x7f1216b3" />
+    <public type="string" name="upload_area_optional" id="0x7f1216b4" />
+    <public type="string" name="upload_area_title" id="0x7f1216b5" />
+    <public type="string" name="upload_area_title_no_confirmation" id="0x7f1216b6" />
+    <public type="string" name="upload_area_too_large_help" id="0x7f1216b7" />
+    <public type="string" name="upload_area_too_large_title" id="0x7f1216b8" />
+    <public type="string" name="upload_area_upload_failed_help" id="0x7f1216b9" />
+    <public type="string" name="upload_area_upload_failed_title" id="0x7f1216ba" />
+    <public type="string" name="upload_background" id="0x7f1216bb" />
+    <public type="string" name="upload_debug_log_failure" id="0x7f1216bc" />
+    <public type="string" name="upload_debug_log_failure_header" id="0x7f1216bd" />
+    <public type="string" name="upload_debug_log_failure_no_file" id="0x7f1216be" />
+    <public type="string" name="upload_debug_log_failure_progress" id="0x7f1216bf" />
+    <public type="string" name="upload_debug_log_failure_read" id="0x7f1216c0" />
+    <public type="string" name="upload_debug_log_failure_upload" id="0x7f1216c1" />
+    <public type="string" name="upload_debug_log_success" id="0x7f1216c2" />
+    <public type="string" name="upload_debug_log_success_header" id="0x7f1216c3" />
+    <public type="string" name="upload_debug_logs" id="0x7f1216c4" />
+    <public type="string" name="upload_emoji" id="0x7f1216c5" />
+    <public type="string" name="upload_emoji_subtitle" id="0x7f1216c6" />
+    <public type="string" name="upload_emoji_title" id="0x7f1216c7" />
+    <public type="string" name="upload_image" id="0x7f1216c8" />
+    <public type="string" name="upload_image_body" id="0x7f1216c9" />
+    <public type="string" name="upload_open_file_failed" id="0x7f1216ca" />
+    <public type="string" name="upload_queued" id="0x7f1216cb" />
+    <public type="string" name="upload_uploads_too_large_help" id="0x7f1216cc" />
+    <public type="string" name="upload_uploads_too_large_title" id="0x7f1216cd" />
+    <public type="string" name="uploaded_by" id="0x7f1216ce" />
+    <public type="string" name="uploading_files" id="0x7f1216cf" />
+    <public type="string" name="uploading_files_failed" id="0x7f1216d0" />
+    <public type="string" name="usage_access" id="0x7f1216d1" />
+    <public type="string" name="usage_statistics_disable_modal_body" id="0x7f1216d2" />
+    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7f1216d3" />
+    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7f1216d4" />
+    <public type="string" name="usage_statistics_disable_modal_title" id="0x7f1216d5" />
+    <public type="string" name="use_external_emojis" id="0x7f1216d6" />
+    <public type="string" name="use_external_emojis_description" id="0x7f1216d7" />
+    <public type="string" name="use_rich_chat_box_description" id="0x7f1216d8" />
+    <public type="string" name="use_speaker" id="0x7f1216d9" />
+    <public type="string" name="use_vad" id="0x7f1216da" />
+    <public type="string" name="use_vad_description" id="0x7f1216db" />
+    <public type="string" name="user_actions_menu_label" id="0x7f1216dc" />
+    <public type="string" name="user_activity_accept_invite" id="0x7f1216dd" />
+    <public type="string" name="user_activity_action_ask_to_join" id="0x7f1216de" />
+    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7f1216df" />
+    <public type="string" name="user_activity_action_download_app" id="0x7f1216e0" />
+    <public type="string" name="user_activity_action_failed_to_launch" id="0x7f1216e1" />
+    <public type="string" name="user_activity_action_invite_to_join" id="0x7f1216e2" />
+    <public type="string" name="user_activity_action_invite_to_listen_along" id="0x7f1216e3" />
+    <public type="string" name="user_activity_action_notify_me" id="0x7f1216e4" />
+    <public type="string" name="user_activity_already_playing" id="0x7f1216e5" />
+    <public type="string" name="user_activity_already_syncing" id="0x7f1216e6" />
+    <public type="string" name="user_activity_cannot_join_self" id="0x7f1216e7" />
+    <public type="string" name="user_activity_cannot_play_self" id="0x7f1216e8" />
+    <public type="string" name="user_activity_cannot_sync_self" id="0x7f1216e9" />
+    <public type="string" name="user_activity_chat_invite_education" id="0x7f1216ea" />
+    <public type="string" name="user_activity_connect_platform" id="0x7f1216eb" />
+    <public type="string" name="user_activity_header_listening" id="0x7f1216ec" />
+    <public type="string" name="user_activity_header_live_on_platform" id="0x7f1216ed" />
+    <public type="string" name="user_activity_header_playing" id="0x7f1216ee" />
+    <public type="string" name="user_activity_header_playing_on_platform" id="0x7f1216ef" />
+    <public type="string" name="user_activity_header_streaming_to_guild" id="0x7f1216f0" />
+    <public type="string" name="user_activity_header_watching" id="0x7f1216f1" />
+    <public type="string" name="user_activity_invite_request_expired" id="0x7f1216f2" />
+    <public type="string" name="user_activity_invite_request_received" id="0x7f1216f3" />
+    <public type="string" name="user_activity_invite_request_requested" id="0x7f1216f4" />
+    <public type="string" name="user_activity_invite_request_sent" id="0x7f1216f5" />
+    <public type="string" name="user_activity_invite_request_waiting" id="0x7f1216f6" />
+    <public type="string" name="user_activity_invite_to_join" id="0x7f1216f7" />
+    <public type="string" name="user_activity_joining" id="0x7f1216f8" />
+    <public type="string" name="user_activity_listen_along" id="0x7f1216f9" />
+    <public type="string" name="user_activity_listen_along_description" id="0x7f1216fa" />
+    <public type="string" name="user_activity_listening_album" id="0x7f1216fb" />
+    <public type="string" name="user_activity_listening_artists" id="0x7f1216fc" />
+    <public type="string" name="user_activity_never_mind" id="0x7f1216fd" />
+    <public type="string" name="user_activity_not_detected" id="0x7f1216fe" />
+    <public type="string" name="user_activity_play_on_platform" id="0x7f1216ff" />
+    <public type="string" name="user_activity_respond_nope" id="0x7f121700" />
+    <public type="string" name="user_activity_respond_yeah" id="0x7f121701" />
+    <public type="string" name="user_activity_state_size" id="0x7f121702" />
+    <public type="string" name="user_activity_timestamp_end" id="0x7f121703" />
+    <public type="string" name="user_activity_timestamp_end_simple" id="0x7f121704" />
+    <public type="string" name="user_activity_timestamp_start" id="0x7f121705" />
+    <public type="string" name="user_activity_timestamp_start_simple" id="0x7f121706" />
+    <public type="string" name="user_activity_user_playing_for_days" id="0x7f121707" />
+    <public type="string" name="user_activity_user_playing_for_hours" id="0x7f121708" />
+    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7f121709" />
+    <public type="string" name="user_activity_watch_along" id="0x7f12170a" />
+    <public type="string" name="user_dm_settings" id="0x7f12170b" />
+    <public type="string" name="user_dm_settings_help" id="0x7f12170c" />
+    <public type="string" name="user_dm_settings_question" id="0x7f12170d" />
+    <public type="string" name="user_explicit_content_filter" id="0x7f12170e" />
+    <public type="string" name="user_explicit_content_filter_disabled" id="0x7f12170f" />
+    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7f121710" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7f121711" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7f121712" />
+    <public type="string" name="user_explicit_content_filter_help" id="0x7f121713" />
+    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7f121714" />
+    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7f121715" />
+    <public type="string" name="user_has_been_blocked" id="0x7f121716" />
+    <public type="string" name="user_has_been_unblocked" id="0x7f121717" />
+    <public type="string" name="user_info" id="0x7f121718" />
+    <public type="string" name="user_management" id="0x7f121719" />
+    <public type="string" name="user_popout_message" id="0x7f12171a" />
+    <public type="string" name="user_popout_wumpus_tooltip" id="0x7f12171b" />
+    <public type="string" name="user_profile_add_friend" id="0x7f12171c" />
+    <public type="string" name="user_profile_audio" id="0x7f12171d" />
+    <public type="string" name="user_profile_failure_to_open_message" id="0x7f12171e" />
+    <public type="string" name="user_profile_guild_name_content_description" id="0x7f12171f" />
+    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7f121720" />
+    <public type="string" name="user_profile_message" id="0x7f121721" />
+    <public type="string" name="user_profile_mutual_friends" id="0x7f121722" />
+    <public type="string" name="user_profile_mutual_friends_placeholder" id="0x7f121723" />
+    <public type="string" name="user_profile_mutual_guilds" id="0x7f121724" />
+    <public type="string" name="user_profile_mutual_guilds_placeholder" id="0x7f121725" />
+    <public type="string" name="user_profile_pending" id="0x7f121726" />
+    <public type="string" name="user_profile_settings_setstatus" id="0x7f121727" />
+    <public type="string" name="user_profile_video" id="0x7f121728" />
+    <public type="string" name="user_profile_volume" id="0x7f121729" />
+    <public type="string" name="user_settings" id="0x7f12172a" />
+    <public type="string" name="user_settings_actions_menu_label" id="0x7f12172b" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7f12172c" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7f12172d" />
+    <public type="string" name="user_settings_appearance_colors" id="0x7f12172e" />
+    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7f12172f" />
+    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7f121730" />
+    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7f121731" />
+    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7f121732" />
+    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7f121733" />
+    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7f121734" />
+    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7f121735" />
+    <public type="string" name="user_settings_available_codes" id="0x7f121736" />
+    <public type="string" name="user_settings_blocked_users" id="0x7f121737" />
+    <public type="string" name="user_settings_blocked_users_empty" id="0x7f121738" />
+    <public type="string" name="user_settings_blocked_users_header" id="0x7f121739" />
+    <public type="string" name="user_settings_blocked_users_unblockbutton" id="0x7f12173a" />
+    <public type="string" name="user_settings_close_button" id="0x7f12173b" />
+    <public type="string" name="user_settings_confirm_logout" id="0x7f12173c" />
+    <public type="string" name="user_settings_disable_advanced_voice_activity" id="0x7f12173d" />
+    <public type="string" name="user_settings_disable_noise_suppression" id="0x7f12173e" />
+    <public type="string" name="user_settings_edit_account" id="0x7f12173f" />
+    <public type="string" name="user_settings_edit_account_password_label" id="0x7f121740" />
+    <public type="string" name="user_settings_edit_account_tag" id="0x7f121741" />
+    <public type="string" name="user_settings_enter_password_view_codes" id="0x7f121742" />
+    <public type="string" name="user_settings_game_activity" id="0x7f121743" />
+    <public type="string" name="user_settings_games_install_location" id="0x7f121744" />
+    <public type="string" name="user_settings_games_install_location_add" id="0x7f121745" />
+    <public type="string" name="user_settings_games_install_location_make_default" id="0x7f121746" />
+    <public type="string" name="user_settings_games_install_location_name" id="0x7f121747" />
+    <public type="string" name="user_settings_games_install_location_remove" id="0x7f121748" />
+    <public type="string" name="user_settings_games_install_location_space" id="0x7f121749" />
+    <public type="string" name="user_settings_games_install_locations" id="0x7f12174a" />
+    <public type="string" name="user_settings_games_remove_location_body" id="0x7f12174b" />
+    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7f12174c" />
+    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7f12174d" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7f12174e" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7f12174f" />
+    <public type="string" name="user_settings_hypesquad" id="0x7f121750" />
+    <public type="string" name="user_settings_keybinds_action" id="0x7f121751" />
+    <public type="string" name="user_settings_keybinds_keybind" id="0x7f121752" />
+    <public type="string" name="user_settings_label_current_password" id="0x7f121753" />
+    <public type="string" name="user_settings_label_discriminator" id="0x7f121754" />
+    <public type="string" name="user_settings_label_email" id="0x7f121755" />
+    <public type="string" name="user_settings_label_new_password" id="0x7f121756" />
+    <public type="string" name="user_settings_label_username" id="0x7f121757" />
+    <public type="string" name="user_settings_linux_settings" id="0x7f121758" />
+    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7f121759" />
+    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7f12175a" />
+    <public type="string" name="user_settings_mfa_enabled" id="0x7f12175b" />
+    <public type="string" name="user_settings_mfa_removed" id="0x7f12175c" />
+    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7f12175d" />
+    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7f12175e" />
+    <public type="string" name="user_settings_my_account" id="0x7f12175f" />
+    <public type="string" name="user_settings_noise_cancellation" id="0x7f121760" />
+    <public type="string" name="user_settings_noise_cancellation_description" id="0x7f121761" />
+    <public type="string" name="user_settings_noise_cancellation_model" id="0x7f121762" />
+    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f121763" />
+    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f121764" />
+    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f121765" />
+    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f121766" />
+    <public type="string" name="user_settings_open_on_startup_body" id="0x7f121767" />
+    <public type="string" name="user_settings_open_on_startup_label" id="0x7f121768" />
+    <public type="string" name="user_settings_privacy_terms" id="0x7f121769" />
+    <public type="string" name="user_settings_restart_app_mobile" id="0x7f12176a" />
+    <public type="string" name="user_settings_save" id="0x7f12176b" />
+    <public type="string" name="user_settings_scan_qr_code" id="0x7f12176c" />
+    <public type="string" name="user_settings_show_library" id="0x7f12176d" />
+    <public type="string" name="user_settings_show_library_note" id="0x7f12176e" />
+    <public type="string" name="user_settings_start_minimized_body" id="0x7f12176f" />
+    <public type="string" name="user_settings_start_minimized_label" id="0x7f121770" />
+    <public type="string" name="user_settings_startup_behavior" id="0x7f121771" />
+    <public type="string" name="user_settings_streamer_notice_body" id="0x7f121772" />
+    <public type="string" name="user_settings_streamer_notice_title" id="0x7f121773" />
+    <public type="string" name="user_settings_unverified_account_body" id="0x7f121774" />
+    <public type="string" name="user_settings_used_backup_codes" id="0x7f121775" />
+    <public type="string" name="user_settings_voice_add_multiple" id="0x7f121776" />
+    <public type="string" name="user_settings_voice_codec_description" id="0x7f121777" />
+    <public type="string" name="user_settings_voice_codec_title" id="0x7f121778" />
+    <public type="string" name="user_settings_voice_experimental_soundshare_label" id="0x7f121779" />
+    <public type="string" name="user_settings_voice_hardware_h264" id="0x7f12177a" />
+    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f12177b" />
+    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f12177c" />
+    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f12177d" />
+    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f12177e" />
+    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f12177f" />
+    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f121780" />
+    <public type="string" name="user_settings_voice_open_h264" id="0x7f121781" />
+    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f121782" />
+    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f121783" />
+    <public type="string" name="user_settings_windows_settings" id="0x7f121784" />
+    <public type="string" name="user_settings_with_build_override" id="0x7f121785" />
+    <public type="string" name="user_volume" id="0x7f121786" />
+    <public type="string" name="username" id="0x7f121787" />
+    <public type="string" name="username_and_tag" id="0x7f121788" />
+    <public type="string" name="username_live" id="0x7f121789" />
+    <public type="string" name="username_required" id="0x7f12178a" />
+    <public type="string" name="users" id="0x7f12178b" />
+    <public type="string" name="v7_preference_off" id="0x7f12178c" />
+    <public type="string" name="v7_preference_on" id="0x7f12178d" />
+    <public type="string" name="vad_permission_body" id="0x7f12178e" />
+    <public type="string" name="vad_permission_small" id="0x7f12178f" />
+    <public type="string" name="vad_permission_title" id="0x7f121790" />
+    <public type="string" name="vanity_url" id="0x7f121791" />
+    <public type="string" name="vanity_url_help" id="0x7f121792" />
+    <public type="string" name="vanity_url_help_conflict" id="0x7f121793" />
+    <public type="string" name="vanity_url_help_extended" id="0x7f121794" />
+    <public type="string" name="vanity_url_help_extended_link" id="0x7f121795" />
+    <public type="string" name="vanity_url_hint_mobile" id="0x7f121796" />
+    <public type="string" name="vanity_url_uses" id="0x7f121797" />
+    <public type="string" name="verfication_expired" id="0x7f121798" />
+    <public type="string" name="verification_body" id="0x7f121799" />
+    <public type="string" name="verification_body_alt" id="0x7f12179a" />
+    <public type="string" name="verification_email_body" id="0x7f12179b" />
+    <public type="string" name="verification_email_error_body" id="0x7f12179c" />
+    <public type="string" name="verification_email_error_title" id="0x7f12179d" />
+    <public type="string" name="verification_email_title" id="0x7f12179e" />
+    <public type="string" name="verification_footer" id="0x7f12179f" />
+    <public type="string" name="verification_footer_logout" id="0x7f1217a0" />
+    <public type="string" name="verification_footer_support" id="0x7f1217a1" />
+    <public type="string" name="verification_level_high" id="0x7f1217a2" />
+    <public type="string" name="verification_level_high_criteria" id="0x7f1217a3" />
+    <public type="string" name="verification_level_low" id="0x7f1217a4" />
+    <public type="string" name="verification_level_low_criteria" id="0x7f1217a5" />
+    <public type="string" name="verification_level_medium" id="0x7f1217a6" />
+    <public type="string" name="verification_level_medium_criteria" id="0x7f1217a7" />
+    <public type="string" name="verification_level_none" id="0x7f1217a8" />
+    <public type="string" name="verification_level_none_criteria" id="0x7f1217a9" />
+    <public type="string" name="verification_level_very_high" id="0x7f1217aa" />
+    <public type="string" name="verification_level_very_high_criteria" id="0x7f1217ab" />
+    <public type="string" name="verification_open_discord" id="0x7f1217ac" />
+    <public type="string" name="verification_phone_description" id="0x7f1217ad" />
+    <public type="string" name="verification_phone_title" id="0x7f1217ae" />
+    <public type="string" name="verification_title" id="0x7f1217af" />
+    <public type="string" name="verification_verified" id="0x7f1217b0" />
+    <public type="string" name="verification_verifying" id="0x7f1217b1" />
+    <public type="string" name="verified_bot_tooltip" id="0x7f1217b2" />
+    <public type="string" name="verified_developer_badge_tooltip" id="0x7f1217b3" />
+    <public type="string" name="verify" id="0x7f1217b4" />
+    <public type="string" name="verify_account" id="0x7f1217b5" />
+    <public type="string" name="verify_by" id="0x7f1217b6" />
+    <public type="string" name="verify_by_email" id="0x7f1217b7" />
+    <public type="string" name="verify_by_email_formatted" id="0x7f1217b8" />
+    <public type="string" name="verify_by_phone_formatted" id="0x7f1217b9" />
+    <public type="string" name="verify_by_recaptcha" id="0x7f1217ba" />
+    <public type="string" name="verify_by_recaptcha_description" id="0x7f1217bb" />
+    <public type="string" name="verify_email_body" id="0x7f1217bc" />
+    <public type="string" name="verify_email_body_resent" id="0x7f1217bd" />
+    <public type="string" name="verify_phone" id="0x7f1217be" />
+    <public type="string" name="verifying" id="0x7f1217bf" />
+    <public type="string" name="very_out_of_date_description" id="0x7f1217c0" />
+    <public type="string" name="vi" id="0x7f1217c1" />
+    <public type="string" name="video" id="0x7f1217c2" />
+    <public type="string" name="video_call_auto_select" id="0x7f1217c3" />
+    <public type="string" name="video_call_hide_members" id="0x7f1217c4" />
+    <public type="string" name="video_call_return_to_grid" id="0x7f1217c5" />
+    <public type="string" name="video_call_return_to_list" id="0x7f1217c6" />
+    <public type="string" name="video_call_show_members" id="0x7f1217c7" />
+    <public type="string" name="video_capacity_modal_body" id="0x7f1217c8" />
+    <public type="string" name="video_capacity_modal_header" id="0x7f1217c9" />
+    <public type="string" name="video_playback_mute_accessibility_label" id="0x7f1217ca" />
+    <public type="string" name="video_playback_unmute_accessibility_label" id="0x7f1217cb" />
+    <public type="string" name="video_poor_connection_body" id="0x7f1217cc" />
+    <public type="string" name="video_poor_connection_title" id="0x7f1217cd" />
+    <public type="string" name="video_settings" id="0x7f1217ce" />
+    <public type="string" name="video_unavailable" id="0x7f1217cf" />
+    <public type="string" name="video_unsupported_browser_body" id="0x7f1217d0" />
+    <public type="string" name="video_unsupported_browser_title" id="0x7f1217d1" />
+    <public type="string" name="view_as_role" id="0x7f1217d2" />
+    <public type="string" name="view_as_roles_hidden_vc_warning" id="0x7f1217d3" />
+    <public type="string" name="view_as_roles_mentions_warning" id="0x7f1217d4" />
+    <public type="string" name="view_as_roles_voice_warning" id="0x7f1217d5" />
+    <public type="string" name="view_audit_log" id="0x7f1217d6" />
+    <public type="string" name="view_audit_log_description" id="0x7f1217d7" />
+    <public type="string" name="view_channel" id="0x7f1217d8" />
+    <public type="string" name="view_embed" id="0x7f1217d9" />
+    <public type="string" name="view_guild_analytics" id="0x7f1217da" />
+    <public type="string" name="view_guild_analytics_description" id="0x7f1217db" />
+    <public type="string" name="view_profile" id="0x7f1217dc" />
+    <public type="string" name="view_spectators" id="0x7f1217dd" />
+    <public type="string" name="view_surrounding_messages" id="0x7f1217de" />
+    <public type="string" name="viewing_as_roles" id="0x7f1217df" />
+    <public type="string" name="viewing_as_roles_back" id="0x7f1217e0" />
+    <public type="string" name="viewing_as_roles_select" id="0x7f1217e1" />
+    <public type="string" name="visitors_info" id="0x7f1217e2" />
+    <public type="string" name="voice" id="0x7f1217e3" />
+    <public type="string" name="voice_and_video" id="0x7f1217e4" />
+    <public type="string" name="voice_call_member_list_title" id="0x7f1217e5" />
+    <public type="string" name="voice_channel" id="0x7f1217e6" />
+    <public type="string" name="voice_channel_deafened" id="0x7f1217e7" />
+    <public type="string" name="voice_channel_empty" id="0x7f1217e8" />
+    <public type="string" name="voice_channel_hide_names" id="0x7f1217e9" />
+    <public type="string" name="voice_channel_muted" id="0x7f1217ea" />
+    <public type="string" name="voice_channel_show_names" id="0x7f1217eb" />
+    <public type="string" name="voice_channel_subtitle" id="0x7f1217ec" />
+    <public type="string" name="voice_channel_title" id="0x7f1217ed" />
+    <public type="string" name="voice_channel_undeafened" id="0x7f1217ee" />
+    <public type="string" name="voice_channel_unmuted" id="0x7f1217ef" />
+    <public type="string" name="voice_channels" id="0x7f1217f0" />
+    <public type="string" name="voice_panel_introduction_close" id="0x7f1217f1" />
+    <public type="string" name="voice_panel_introduction_header" id="0x7f1217f2" />
+    <public type="string" name="voice_panel_introduction_text" id="0x7f1217f3" />
+    <public type="string" name="voice_permissions" id="0x7f1217f4" />
+    <public type="string" name="voice_settings" id="0x7f1217f5" />
+    <public type="string" name="voice_status_connecting" id="0x7f1217f6" />
+    <public type="string" name="voice_status_not_connected" id="0x7f1217f7" />
+    <public type="string" name="voice_status_not_connected_mobile" id="0x7f1217f8" />
+    <public type="string" name="voice_status_ringing" id="0x7f1217f9" />
+    <public type="string" name="voice_unavailable" id="0x7f1217fa" />
+    <public type="string" name="watch" id="0x7f1217fb" />
+    <public type="string" name="watch_stream" id="0x7f1217fc" />
+    <public type="string" name="watch_stream_in_app" id="0x7f1217fd" />
+    <public type="string" name="watch_stream_streaming" id="0x7f1217fe" />
+    <public type="string" name="watch_stream_tip" id="0x7f1217ff" />
+    <public type="string" name="watch_stream_watching" id="0x7f121800" />
+    <public type="string" name="watch_user_stream" id="0x7f121801" />
+    <public type="string" name="watching" id="0x7f121802" />
+    <public type="string" name="web_browser" id="0x7f121803" />
+    <public type="string" name="web_browser_chrome" id="0x7f121804" />
+    <public type="string" name="web_browser_in_app" id="0x7f121805" />
+    <public type="string" name="web_browser_safari" id="0x7f121806" />
+    <public type="string" name="webhook_cancel" id="0x7f121807" />
+    <public type="string" name="webhook_create" id="0x7f121808" />
+    <public type="string" name="webhook_created_on" id="0x7f121809" />
+    <public type="string" name="webhook_delete" id="0x7f12180a" />
+    <public type="string" name="webhook_delete_body" id="0x7f12180b" />
+    <public type="string" name="webhook_delete_title" id="0x7f12180c" />
+    <public type="string" name="webhook_error_creating_webhook" id="0x7f12180d" />
+    <public type="string" name="webhook_error_deleting_webhook" id="0x7f12180e" />
+    <public type="string" name="webhook_error_internal_server_error" id="0x7f12180f" />
+    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f121810" />
+    <public type="string" name="webhook_form_name" id="0x7f121811" />
+    <public type="string" name="webhook_form_url" id="0x7f121812" />
+    <public type="string" name="webhook_form_webhook_url_help" id="0x7f121813" />
+    <public type="string" name="webhook_modal_icon_description" id="0x7f121814" />
+    <public type="string" name="webhook_modal_icon_title" id="0x7f121815" />
+    <public type="string" name="webhook_modal_title" id="0x7f121816" />
+    <public type="string" name="webhooks" id="0x7f121817" />
+    <public type="string" name="weekly_communicators" id="0x7f121818" />
+    <public type="string" name="weekly_new_member_retention" id="0x7f121819" />
+    <public type="string" name="weekly_new_members" id="0x7f12181a" />
+    <public type="string" name="weekly_visitors" id="0x7f12181b" />
+    <public type="string" name="welcome_channel_delete_confirm_body" id="0x7f12181c" />
+    <public type="string" name="welcome_channel_delete_confirm_body_generic" id="0x7f12181d" />
+    <public type="string" name="welcome_channel_delete_confirm_title" id="0x7f12181e" />
+    <public type="string" name="welcome_channel_emoji_picker_tooltip" id="0x7f12181f" />
+    <public type="string" name="welcome_cta_create_channel" id="0x7f121820" />
+    <public type="string" name="welcome_cta_download_title" id="0x7f121821" />
+    <public type="string" name="welcome_cta_invite_title" id="0x7f121822" />
+    <public type="string" name="welcome_cta_message_title" id="0x7f121823" />
+    <public type="string" name="welcome_cta_personalize_title" id="0x7f121824" />
+    <public type="string" name="welcome_cta_personalize_title_mobile" id="0x7f121825" />
+    <public type="string" name="welcome_cta_subtitle_action_with_guide" id="0x7f121826" />
+    <public type="string" name="welcome_cta_subtitle_existing_server" id="0x7f121827" />
+    <public type="string" name="welcome_cta_subtitle_member" id="0x7f121828" />
+    <public type="string" name="welcome_cta_subtitle_owner" id="0x7f121829" />
+    <public type="string" name="welcome_cta_title" id="0x7f12182a" />
+    <public type="string" name="welcome_cta_title_mobile" id="0x7f12182b" />
+    <public type="string" name="welcome_message_desktop_apps" id="0x7f12182c" />
+    <public type="string" name="welcome_message_edit_channel" id="0x7f12182d" />
+    <public type="string" name="welcome_message_instant_invite" id="0x7f12182e" />
+    <public type="string" name="welcome_message_mobile_apps" id="0x7f12182f" />
+    <public type="string" name="welcome_message_mobile_explore_server" id="0x7f121830" />
+    <public type="string" name="welcome_message_mobile_explore_server_desc" id="0x7f121831" />
+    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f121832" />
+    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f121833" />
+    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f121834" />
+    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f121835" />
+    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f121836" />
+    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f121837" />
+    <public type="string" name="welcome_message_owner_title" id="0x7f121838" />
+    <public type="string" name="welcome_message_setup_server" id="0x7f121839" />
+    <public type="string" name="welcome_message_subtitle_channel" id="0x7f12183a" />
+    <public type="string" name="welcome_message_support" id="0x7f12183b" />
+    <public type="string" name="welcome_message_title" id="0x7f12183c" />
+    <public type="string" name="welcome_message_title_channel" id="0x7f12183d" />
+    <public type="string" name="welcome_message_tutorial" id="0x7f12183e" />
+    <public type="string" name="welcome_screen_choice_header" id="0x7f12183f" />
+    <public type="string" name="welcome_screen_skip" id="0x7f121840" />
+    <public type="string" name="welcome_screen_title" id="0x7f121841" />
+    <public type="string" name="whats_new" id="0x7f121842" />
+    <public type="string" name="whats_new_date" id="0x7f121843" />
+    <public type="string" name="whitelist_failed" id="0x7f121844" />
+    <public type="string" name="whitelisted" id="0x7f121845" />
+    <public type="string" name="whitelisting" id="0x7f121846" />
+    <public type="string" name="widget" id="0x7f121847" />
+    <public type="string" name="windows" id="0x7f121848" />
+    <public type="string" name="working" id="0x7f121849" />
+    <public type="string" name="wumpus" id="0x7f12184a" />
+    <public type="string" name="xbox_authorization_title" id="0x7f12184b" />
+    <public type="string" name="xbox_game_pass_card_body_redeemed" id="0x7f12184c" />
+    <public type="string" name="xbox_game_pass_card_body_unredeemed" id="0x7f12184d" />
+    <public type="string" name="xbox_game_pass_modal_code_description" id="0x7f12184e" />
+    <public type="string" name="xbox_game_pass_modal_code_header" id="0x7f12184f" />
+    <public type="string" name="xbox_game_pass_modal_header_confirm_pc" id="0x7f121850" />
+    <public type="string" name="xbox_game_pass_modal_header_confirm_xbox" id="0x7f121851" />
+    <public type="string" name="xbox_game_pass_modal_header_description_confirm_pc" id="0x7f121852" />
+    <public type="string" name="xbox_game_pass_modal_header_description_confirm_xbox" id="0x7f121853" />
+    <public type="string" name="xbox_game_pass_modal_header_description_plan_select" id="0x7f121854" />
+    <public type="string" name="xbox_game_pass_modal_header_description_success" id="0x7f121855" />
+    <public type="string" name="xbox_game_pass_modal_header_plan_select" id="0x7f121856" />
+    <public type="string" name="xbox_game_pass_modal_header_success" id="0x7f121857" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_header" id="0x7f121858" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_pc_plan" id="0x7f121859" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_plan_duration" id="0x7f12185a" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_xbox_plan" id="0x7f12185b" />
+    <public type="string" name="xbox_game_pass_modal_redeem_button_pc" id="0x7f12185c" />
+    <public type="string" name="xbox_game_pass_modal_redeem_button_xbox" id="0x7f12185d" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_body" id="0x7f12185e" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_button" id="0x7f12185f" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_body" id="0x7f121860" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_title" id="0x7f121861" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_title" id="0x7f121862" />
+    <public type="string" name="xbox_game_pass_promotion_card_header" id="0x7f121863" />
+    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_body" id="0x7f121864" />
+    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_title" id="0x7f121865" />
+    <public type="string" name="xbox_game_pass_promotion_redeem_body" id="0x7f121866" />
+    <public type="string" name="xbox_link" id="0x7f121867" />
+    <public type="string" name="xbox_pin_step1" id="0x7f121868" />
+    <public type="string" name="xbox_pin_step2" id="0x7f121869" />
+    <public type="string" name="xbox_pin_step3" id="0x7f12186a" />
+    <public type="string" name="yearly" id="0x7f12186b" />
+    <public type="string" name="yellow" id="0x7f12186c" />
+    <public type="string" name="yes_text" id="0x7f12186d" />
+    <public type="string" name="your_pin_expires" id="0x7f12186e" />
+    <public type="string" name="your_pin_is_expired" id="0x7f12186f" />
+    <public type="string" name="youre_viewing_older_messages" id="0x7f121870" />
+    <public type="string" name="zh_cn" id="0x7f121871" />
+    <public type="string" name="zh_tw" id="0x7f121872" />
     <public type="style" name="AlertDialog.AppCompat" id="0x7f130000" />
     <public type="style" name="AlertDialog.AppCompat.Light" id="0x7f130001" />
     <public type="style" name="AndroidThemeColorAccentYellow" id="0x7f130002" />
@@ -17961,286 +17996,285 @@
     <public type="style" name="UiKit.Sheet.Header.Contents" id="0x7f13033e" />
     <public type="style" name="UiKit.Sheet.Header.Icon" id="0x7f13033f" />
     <public type="style" name="UiKit.Sheet.Header.Title" id="0x7f130340" />
-    <public type="style" name="UiKit.SuperBar" id="0x7f130341" />
-    <public type="style" name="UiKit.TabLayout.PagerIndicator" id="0x7f130342" />
-    <public type="style" name="UiKit.Tabs" id="0x7f130343" />
-    <public type="style" name="UiKit.Tabs.TextAppearance" id="0x7f130344" />
-    <public type="style" name="UiKit.TextAppearance" id="0x7f130345" />
-    <public type="style" name="UiKit.TextAppearance.Bold" id="0x7f130346" />
-    <public type="style" name="UiKit.TextAppearance.Button" id="0x7f130347" />
-    <public type="style" name="UiKit.TextAppearance.ListItem" id="0x7f130348" />
-    <public type="style" name="UiKit.TextAppearance.ListItem.Label" id="0x7f130349" />
-    <public type="style" name="UiKit.TextAppearance.MaterialEditText" id="0x7f13034a" />
-    <public type="style" name="UiKit.TextAppearance.MaterialEditText.Input" id="0x7f13034b" />
-    <public type="style" name="UiKit.TextAppearance.MaterialEditText.Label" id="0x7f13034c" />
-    <public type="style" name="UiKit.TextAppearance.Semibold" id="0x7f13034d" />
-    <public type="style" name="UiKit.TextAppearance.Toolbar" id="0x7f13034e" />
-    <public type="style" name="UiKit.TextAppearance.Toolbar.Subtitle" id="0x7f13034f" />
-    <public type="style" name="UiKit.TextAppearance.Toolbar.Title" id="0x7f130350" />
-    <public type="style" name="UiKit.TextInputLayout" id="0x7f130351" />
-    <public type="style" name="UiKit.TextInputLayout.EditText" id="0x7f130352" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.MultiLine" id="0x7f130353" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.NoFocus" id="0x7f130354" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine" id="0x7f130355" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.CountryCode" id="0x7f130356" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Email" id="0x7f130357" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Password" id="0x7f130358" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Phone" id="0x7f130359" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Search" id="0x7f13035a" />
-    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Username" id="0x7f13035b" />
-    <public type="style" name="UiKit.TextInputLayout.Password" id="0x7f13035c" />
-    <public type="style" name="UiKit.TextInputLayout.Primary" id="0x7f13035d" />
-    <public type="style" name="UiKit.TextInputLayout.Primary.Password" id="0x7f13035e" />
-    <public type="style" name="UiKit.TextInputLayout.Search" id="0x7f13035f" />
-    <public type="style" name="UiKit.TextInputLayout.Search.ActionBar" id="0x7f130360" />
-    <public type="style" name="UiKit.TextInputLayout.Search.ActionBar.Filter" id="0x7f130361" />
-    <public type="style" name="UiKit.TextView" id="0x7f130362" />
-    <public type="style" name="UiKit.TextView.Bold" id="0x7f130363" />
-    <public type="style" name="UiKit.TextView.H1" id="0x7f130364" />
-    <public type="style" name="UiKit.TextView.H1.Bold" id="0x7f130365" />
-    <public type="style" name="UiKit.TextView.H2" id="0x7f130366" />
-    <public type="style" name="UiKit.TextView.Large" id="0x7f130367" />
-    <public type="style" name="UiKit.TextView.Large.SingleLine" id="0x7f130368" />
-    <public type="style" name="UiKit.TextView.Link" id="0x7f130369" />
-    <public type="style" name="UiKit.TextView.Marquee" id="0x7f13036a" />
-    <public type="style" name="UiKit.TextView.Medium" id="0x7f13036b" />
-    <public type="style" name="UiKit.TextView.NoResults" id="0x7f13036c" />
-    <public type="style" name="UiKit.TextView.Perk" id="0x7f13036d" />
-    <public type="style" name="UiKit.TextView.Semibold" id="0x7f13036e" />
-    <public type="style" name="UiKit.TextView.SingleLine" id="0x7f13036f" />
-    <public type="style" name="UiKit.TextView.Subtext" id="0x7f130370" />
-    <public type="style" name="UiKit.TextView.Subtext.SingleLine" id="0x7f130371" />
-    <public type="style" name="UiKit.Toast" id="0x7f130372" />
-    <public type="style" name="UiKit.User.Phone.Add.Confirm" id="0x7f130373" />
-    <public type="style" name="UiKit.User.Phone.Add.Number" id="0x7f130374" />
-    <public type="style" name="UiKit.User.Phone.Verify.Digits" id="0x7f130375" />
-    <public type="style" name="UiKit.User.Verify.Char" id="0x7f130376" />
-    <public type="style" name="UiKit.ViewGroup" id="0x7f130377" />
-    <public type="style" name="UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout" id="0x7f130378" />
-    <public type="style" name="UiKit.ViewGroup.ConstraintLayout" id="0x7f130379" />
-    <public type="style" name="UiKit.ViewGroup.CoordinatorLayout" id="0x7f13037a" />
-    <public type="style" name="UiKit.ViewGroup.CoordinatorLayout.Page" id="0x7f13037b" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout" id="0x7f13037c" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.BottomSheet" id="0x7f13037d" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.Horizontal" id="0x7f13037e" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable" id="0x7f13037f" />
-    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable.Horizontal" id="0x7f130380" />
-    <public type="style" name="UiKit.ViewGroup.NestedScrollView" id="0x7f130381" />
-    <public type="style" name="UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior" id="0x7f130382" />
-    <public type="style" name="UiKit.ViewGroup.NestedScrollView.Page" id="0x7f130383" />
-    <public type="style" name="UiKit.ViewGroup.Page" id="0x7f130384" />
-    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout" id="0x7f130385" />
-    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout.Horizontal" id="0x7f130386" />
-    <public type="style" name="UiKit.ViewGroup.RecyclerView" id="0x7f130387" />
-    <public type="style" name="UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" id="0x7f130388" />
-    <public type="style" name="UiKit.ViewGroup.RecyclerView.Horizontal" id="0x7f130389" />
-    <public type="style" name="UiKit.ViewGroup.RelativeLayout" id="0x7f13038a" />
-    <public type="style" name="UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior" id="0x7f13038b" />
-    <public type="style" name="UiKit.ViewGroup.ScrollView" id="0x7f13038c" />
-    <public type="style" name="UiKit.ViewGroup.ScrollView.Horizontal" id="0x7f13038d" />
-    <public type="style" name="UiKit.ViewGroup.ScrollView.Page" id="0x7f13038e" />
-    <public type="style" name="UiKit.WelcomeMessageCard" id="0x7f13038f" />
-    <public type="style" name="UserProfile.PresenceSection.Body" id="0x7f130390" />
-    <public type="style" name="UserProfile.PresenceSection.Body.HeaderText" id="0x7f130391" />
-    <public type="style" name="UserProfile.PresenceSection.Body.Subtext" id="0x7f130392" />
-    <public type="style" name="UserProfile.PresenceSection.MaterialButton" id="0x7f130393" />
-    <public type="style" name="UserProfile.Section" id="0x7f130394" />
-    <public type="style" name="UserProfile.Section.Card" id="0x7f130395" />
-    <public type="style" name="UserProfile.Section.Header" id="0x7f130396" />
-    <public type="style" name="UserProfile.Section.HeaderTextAppearance" id="0x7f130397" />
-    <public type="style" name="Widget.AppCompat.ActionBar" id="0x7f130398" />
-    <public type="style" name="Widget.AppCompat.ActionBar.Solid" id="0x7f130399" />
-    <public type="style" name="Widget.AppCompat.ActionBar.TabBar" id="0x7f13039a" />
-    <public type="style" name="Widget.AppCompat.ActionBar.TabText" id="0x7f13039b" />
-    <public type="style" name="Widget.AppCompat.ActionBar.TabView" id="0x7f13039c" />
-    <public type="style" name="Widget.AppCompat.ActionButton" id="0x7f13039d" />
-    <public type="style" name="Widget.AppCompat.ActionButton.CloseMode" id="0x7f13039e" />
-    <public type="style" name="Widget.AppCompat.ActionButton.Overflow" id="0x7f13039f" />
-    <public type="style" name="Widget.AppCompat.ActionMode" id="0x7f1303a0" />
-    <public type="style" name="Widget.AppCompat.ActivityChooserView" id="0x7f1303a1" />
-    <public type="style" name="Widget.AppCompat.AutoCompleteTextView" id="0x7f1303a2" />
-    <public type="style" name="Widget.AppCompat.Button" id="0x7f1303a3" />
-    <public type="style" name="Widget.AppCompat.Button.Borderless" id="0x7f1303a4" />
-    <public type="style" name="Widget.AppCompat.Button.Borderless.Colored" id="0x7f1303a5" />
-    <public type="style" name="Widget.AppCompat.Button.ButtonBar.AlertDialog" id="0x7f1303a6" />
-    <public type="style" name="Widget.AppCompat.Button.Colored" id="0x7f1303a7" />
-    <public type="style" name="Widget.AppCompat.Button.Small" id="0x7f1303a8" />
-    <public type="style" name="Widget.AppCompat.ButtonBar" id="0x7f1303a9" />
-    <public type="style" name="Widget.AppCompat.ButtonBar.AlertDialog" id="0x7f1303aa" />
-    <public type="style" name="Widget.AppCompat.CompoundButton.CheckBox" id="0x7f1303ab" />
-    <public type="style" name="Widget.AppCompat.CompoundButton.RadioButton" id="0x7f1303ac" />
-    <public type="style" name="Widget.AppCompat.CompoundButton.Switch" id="0x7f1303ad" />
-    <public type="style" name="Widget.AppCompat.DrawerArrowToggle" id="0x7f1303ae" />
-    <public type="style" name="Widget.AppCompat.DropDownItem.Spinner" id="0x7f1303af" />
-    <public type="style" name="Widget.AppCompat.EditText" id="0x7f1303b0" />
-    <public type="style" name="Widget.AppCompat.ImageButton" id="0x7f1303b1" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar" id="0x7f1303b2" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid" id="0x7f1303b3" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid.Inverse" id="0x7f1303b4" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar" id="0x7f1303b5" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse" id="0x7f1303b6" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText" id="0x7f1303b7" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText.Inverse" id="0x7f1303b8" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView" id="0x7f1303b9" />
-    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView.Inverse" id="0x7f1303ba" />
-    <public type="style" name="Widget.AppCompat.Light.ActionButton" id="0x7f1303bb" />
-    <public type="style" name="Widget.AppCompat.Light.ActionButton.CloseMode" id="0x7f1303bc" />
-    <public type="style" name="Widget.AppCompat.Light.ActionButton.Overflow" id="0x7f1303bd" />
-    <public type="style" name="Widget.AppCompat.Light.ActionMode.Inverse" id="0x7f1303be" />
-    <public type="style" name="Widget.AppCompat.Light.ActivityChooserView" id="0x7f1303bf" />
-    <public type="style" name="Widget.AppCompat.Light.AutoCompleteTextView" id="0x7f1303c0" />
-    <public type="style" name="Widget.AppCompat.Light.DropDownItem.Spinner" id="0x7f1303c1" />
-    <public type="style" name="Widget.AppCompat.Light.ListPopupWindow" id="0x7f1303c2" />
-    <public type="style" name="Widget.AppCompat.Light.ListView.DropDown" id="0x7f1303c3" />
-    <public type="style" name="Widget.AppCompat.Light.PopupMenu" id="0x7f1303c4" />
-    <public type="style" name="Widget.AppCompat.Light.PopupMenu.Overflow" id="0x7f1303c5" />
-    <public type="style" name="Widget.AppCompat.Light.SearchView" id="0x7f1303c6" />
-    <public type="style" name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar" id="0x7f1303c7" />
-    <public type="style" name="Widget.AppCompat.ListMenuView" id="0x7f1303c8" />
-    <public type="style" name="Widget.AppCompat.ListPopupWindow" id="0x7f1303c9" />
-    <public type="style" name="Widget.AppCompat.ListView" id="0x7f1303ca" />
-    <public type="style" name="Widget.AppCompat.ListView.DropDown" id="0x7f1303cb" />
-    <public type="style" name="Widget.AppCompat.ListView.Menu" id="0x7f1303cc" />
-    <public type="style" name="Widget.AppCompat.PopupMenu" id="0x7f1303cd" />
-    <public type="style" name="Widget.AppCompat.PopupMenu.Overflow" id="0x7f1303ce" />
-    <public type="style" name="Widget.AppCompat.PopupWindow" id="0x7f1303cf" />
-    <public type="style" name="Widget.AppCompat.ProgressBar" id="0x7f1303d0" />
-    <public type="style" name="Widget.AppCompat.ProgressBar.Horizontal" id="0x7f1303d1" />
-    <public type="style" name="Widget.AppCompat.RatingBar" id="0x7f1303d2" />
-    <public type="style" name="Widget.AppCompat.RatingBar.Indicator" id="0x7f1303d3" />
-    <public type="style" name="Widget.AppCompat.RatingBar.Small" id="0x7f1303d4" />
-    <public type="style" name="Widget.AppCompat.SearchView" id="0x7f1303d5" />
-    <public type="style" name="Widget.AppCompat.SearchView.ActionBar" id="0x7f1303d6" />
-    <public type="style" name="Widget.AppCompat.SeekBar" id="0x7f1303d7" />
-    <public type="style" name="Widget.AppCompat.SeekBar.Discrete" id="0x7f1303d8" />
-    <public type="style" name="Widget.AppCompat.Spinner" id="0x7f1303d9" />
-    <public type="style" name="Widget.AppCompat.Spinner.DropDown" id="0x7f1303da" />
-    <public type="style" name="Widget.AppCompat.Spinner.DropDown.ActionBar" id="0x7f1303db" />
-    <public type="style" name="Widget.AppCompat.Spinner.Underlined" id="0x7f1303dc" />
-    <public type="style" name="Widget.AppCompat.TextView" id="0x7f1303dd" />
-    <public type="style" name="Widget.AppCompat.TextView.SpinnerItem" id="0x7f1303de" />
-    <public type="style" name="Widget.AppCompat.Toolbar" id="0x7f1303df" />
-    <public type="style" name="Widget.AppCompat.Toolbar.Button.Navigation" id="0x7f1303e0" />
-    <public type="style" name="Widget.Compat.NotificationActionContainer" id="0x7f1303e1" />
-    <public type="style" name="Widget.Compat.NotificationActionText" id="0x7f1303e2" />
-    <public type="style" name="Widget.Design.AppBarLayout" id="0x7f1303e3" />
-    <public type="style" name="Widget.Design.BottomNavigationView" id="0x7f1303e4" />
-    <public type="style" name="Widget.Design.BottomSheet.Modal" id="0x7f1303e5" />
-    <public type="style" name="Widget.Design.CollapsingToolbar" id="0x7f1303e6" />
-    <public type="style" name="Widget.Design.FloatingActionButton" id="0x7f1303e7" />
-    <public type="style" name="Widget.Design.NavigationView" id="0x7f1303e8" />
-    <public type="style" name="Widget.Design.ScrimInsetsFrameLayout" id="0x7f1303e9" />
-    <public type="style" name="Widget.Design.Snackbar" id="0x7f1303ea" />
-    <public type="style" name="Widget.Design.TabLayout" id="0x7f1303eb" />
-    <public type="style" name="Widget.Design.TextInputEditText" id="0x7f1303ec" />
-    <public type="style" name="Widget.Design.TextInputLayout" id="0x7f1303ed" />
-    <public type="style" name="Widget.MaterialComponents.ActionBar.Primary" id="0x7f1303ee" />
-    <public type="style" name="Widget.MaterialComponents.ActionBar.PrimarySurface" id="0x7f1303ef" />
-    <public type="style" name="Widget.MaterialComponents.ActionBar.Solid" id="0x7f1303f0" />
-    <public type="style" name="Widget.MaterialComponents.ActionBar.Surface" id="0x7f1303f1" />
-    <public type="style" name="Widget.MaterialComponents.AppBarLayout.Primary" id="0x7f1303f2" />
-    <public type="style" name="Widget.MaterialComponents.AppBarLayout.PrimarySurface" id="0x7f1303f3" />
-    <public type="style" name="Widget.MaterialComponents.AppBarLayout.Surface" id="0x7f1303f4" />
-    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.FilledBox" id="0x7f1303f5" />
-    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.FilledBox.Dense" id="0x7f1303f6" />
-    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox" id="0x7f1303f7" />
-    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox.Dense" id="0x7f1303f8" />
-    <public type="style" name="Widget.MaterialComponents.Badge" id="0x7f1303f9" />
-    <public type="style" name="Widget.MaterialComponents.BottomAppBar" id="0x7f1303fa" />
-    <public type="style" name="Widget.MaterialComponents.BottomAppBar.Colored" id="0x7f1303fb" />
-    <public type="style" name="Widget.MaterialComponents.BottomAppBar.PrimarySurface" id="0x7f1303fc" />
-    <public type="style" name="Widget.MaterialComponents.BottomNavigationView" id="0x7f1303fd" />
-    <public type="style" name="Widget.MaterialComponents.BottomNavigationView.Colored" id="0x7f1303fe" />
-    <public type="style" name="Widget.MaterialComponents.BottomNavigationView.PrimarySurface" id="0x7f1303ff" />
-    <public type="style" name="Widget.MaterialComponents.BottomSheet" id="0x7f130400" />
-    <public type="style" name="Widget.MaterialComponents.BottomSheet.Modal" id="0x7f130401" />
-    <public type="style" name="Widget.MaterialComponents.Button" id="0x7f130402" />
-    <public type="style" name="Widget.MaterialComponents.Button.Icon" id="0x7f130403" />
-    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton" id="0x7f130404" />
-    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton.Icon" id="0x7f130405" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton" id="0x7f130406" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog" id="0x7f130407" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog.Flush" id="0x7f130408" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog.Icon" id="0x7f130409" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Icon" id="0x7f13040a" />
-    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Snackbar" id="0x7f13040b" />
-    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton" id="0x7f13040c" />
-    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton.Icon" id="0x7f13040d" />
-    <public type="style" name="Widget.MaterialComponents.CardView" id="0x7f13040e" />
-    <public type="style" name="Widget.MaterialComponents.CheckedTextView" id="0x7f13040f" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Action" id="0x7f130410" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Choice" id="0x7f130411" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Entry" id="0x7f130412" />
-    <public type="style" name="Widget.MaterialComponents.Chip.Filter" id="0x7f130413" />
-    <public type="style" name="Widget.MaterialComponents.ChipGroup" id="0x7f130414" />
-    <public type="style" name="Widget.MaterialComponents.CompoundButton.CheckBox" id="0x7f130415" />
-    <public type="style" name="Widget.MaterialComponents.CompoundButton.RadioButton" id="0x7f130416" />
-    <public type="style" name="Widget.MaterialComponents.CompoundButton.Switch" id="0x7f130417" />
-    <public type="style" name="Widget.MaterialComponents.ExtendedFloatingActionButton" id="0x7f130418" />
-    <public type="style" name="Widget.MaterialComponents.ExtendedFloatingActionButton.Icon" id="0x7f130419" />
-    <public type="style" name="Widget.MaterialComponents.FloatingActionButton" id="0x7f13041a" />
-    <public type="style" name="Widget.MaterialComponents.Light.ActionBar.Solid" id="0x7f13041b" />
-    <public type="style" name="Widget.MaterialComponents.MaterialButtonToggleGroup" id="0x7f13041c" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar" id="0x7f13041d" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day" id="0x7f13041e" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day.Invalid" id="0x7f13041f" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day.Selected" id="0x7f130420" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day.Today" id="0x7f130421" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.DayTextView" id="0x7f130422" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Fullscreen" id="0x7f130423" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderConfirmButton" id="0x7f130424" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderDivider" id="0x7f130425" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderLayout" id="0x7f130426" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderSelection" id="0x7f130427" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderSelection.Fullscreen" id="0x7f130428" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderTitle" id="0x7f130429" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" id="0x7f13042a" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Item" id="0x7f13042b" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Year" id="0x7f13042c" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Year.Selected" id="0x7f13042d" />
-    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Year.Today" id="0x7f13042e" />
-    <public type="style" name="Widget.MaterialComponents.NavigationView" id="0x7f13042f" />
-    <public type="style" name="Widget.MaterialComponents.PopupMenu" id="0x7f130430" />
-    <public type="style" name="Widget.MaterialComponents.PopupMenu.ContextMenu" id="0x7f130431" />
-    <public type="style" name="Widget.MaterialComponents.PopupMenu.ListPopupWindow" id="0x7f130432" />
-    <public type="style" name="Widget.MaterialComponents.PopupMenu.Overflow" id="0x7f130433" />
-    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Circular.Determinate" id="0x7f130434" />
-    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Circular.Indeterminate" id="0x7f130435" />
-    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Linear.Determinate" id="0x7f130436" />
-    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Linear.Indeterminate" id="0x7f130437" />
-    <public type="style" name="Widget.MaterialComponents.ShapeableImageView" id="0x7f130438" />
-    <public type="style" name="Widget.MaterialComponents.Slider" id="0x7f130439" />
-    <public type="style" name="Widget.MaterialComponents.Snackbar" id="0x7f13043a" />
-    <public type="style" name="Widget.MaterialComponents.Snackbar.FullWidth" id="0x7f13043b" />
-    <public type="style" name="Widget.MaterialComponents.Snackbar.TextView" id="0x7f13043c" />
-    <public type="style" name="Widget.MaterialComponents.TabLayout" id="0x7f13043d" />
-    <public type="style" name="Widget.MaterialComponents.TabLayout.Colored" id="0x7f13043e" />
-    <public type="style" name="Widget.MaterialComponents.TabLayout.PrimarySurface" id="0x7f13043f" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox" id="0x7f130440" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox.Dense" id="0x7f130441" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox" id="0x7f130442" />
-    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox.Dense" id="0x7f130443" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox" id="0x7f130444" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dense" id="0x7f130445" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dense.ExposedDropdownMenu" id="0x7f130446" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu" id="0x7f130447" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox" id="0x7f130448" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" id="0x7f130449" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu" id="0x7f13044a" />
-    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu" id="0x7f13044b" />
-    <public type="style" name="Widget.MaterialComponents.TextView" id="0x7f13044c" />
-    <public type="style" name="Widget.MaterialComponents.Toolbar" id="0x7f13044d" />
-    <public type="style" name="Widget.MaterialComponents.Toolbar.Primary" id="0x7f13044e" />
-    <public type="style" name="Widget.MaterialComponents.Toolbar.PrimarySurface" id="0x7f13044f" />
-    <public type="style" name="Widget.MaterialComponents.Toolbar.Surface" id="0x7f130450" />
-    <public type="style" name="Widget.MaterialComponents.Tooltip" id="0x7f130451" />
-    <public type="style" name="Widget.Support.CoordinatorLayout" id="0x7f130452" />
-    <public type="style" name="cpv_ColorPickerViewStyle" id="0x7f130453" />
-    <public type="style" name="ucrop_ImageViewWidgetIcon" id="0x7f130454" />
-    <public type="style" name="ucrop_TextViewCropAspectRatio" id="0x7f130455" />
-    <public type="style" name="ucrop_TextViewWidgetText" id="0x7f130456" />
-    <public type="style" name="ucrop_WrapperIconState" id="0x7f130457" />
-    <public type="style" name="ucrop_WrapperRotateButton" id="0x7f130458" />
+    <public type="style" name="UiKit.TabLayout.PagerIndicator" id="0x7f130341" />
+    <public type="style" name="UiKit.Tabs" id="0x7f130342" />
+    <public type="style" name="UiKit.Tabs.TextAppearance" id="0x7f130343" />
+    <public type="style" name="UiKit.TextAppearance" id="0x7f130344" />
+    <public type="style" name="UiKit.TextAppearance.Bold" id="0x7f130345" />
+    <public type="style" name="UiKit.TextAppearance.Button" id="0x7f130346" />
+    <public type="style" name="UiKit.TextAppearance.ListItem" id="0x7f130347" />
+    <public type="style" name="UiKit.TextAppearance.ListItem.Label" id="0x7f130348" />
+    <public type="style" name="UiKit.TextAppearance.MaterialEditText" id="0x7f130349" />
+    <public type="style" name="UiKit.TextAppearance.MaterialEditText.Input" id="0x7f13034a" />
+    <public type="style" name="UiKit.TextAppearance.MaterialEditText.Label" id="0x7f13034b" />
+    <public type="style" name="UiKit.TextAppearance.Semibold" id="0x7f13034c" />
+    <public type="style" name="UiKit.TextAppearance.Toolbar" id="0x7f13034d" />
+    <public type="style" name="UiKit.TextAppearance.Toolbar.Subtitle" id="0x7f13034e" />
+    <public type="style" name="UiKit.TextAppearance.Toolbar.Title" id="0x7f13034f" />
+    <public type="style" name="UiKit.TextInputLayout" id="0x7f130350" />
+    <public type="style" name="UiKit.TextInputLayout.EditText" id="0x7f130351" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.MultiLine" id="0x7f130352" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.NoFocus" id="0x7f130353" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine" id="0x7f130354" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.CountryCode" id="0x7f130355" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Email" id="0x7f130356" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Password" id="0x7f130357" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Phone" id="0x7f130358" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Search" id="0x7f130359" />
+    <public type="style" name="UiKit.TextInputLayout.EditText.SingleLine.Username" id="0x7f13035a" />
+    <public type="style" name="UiKit.TextInputLayout.Password" id="0x7f13035b" />
+    <public type="style" name="UiKit.TextInputLayout.Primary" id="0x7f13035c" />
+    <public type="style" name="UiKit.TextInputLayout.Primary.Password" id="0x7f13035d" />
+    <public type="style" name="UiKit.TextInputLayout.Search" id="0x7f13035e" />
+    <public type="style" name="UiKit.TextInputLayout.Search.ActionBar" id="0x7f13035f" />
+    <public type="style" name="UiKit.TextInputLayout.Search.ActionBar.Filter" id="0x7f130360" />
+    <public type="style" name="UiKit.TextView" id="0x7f130361" />
+    <public type="style" name="UiKit.TextView.Bold" id="0x7f130362" />
+    <public type="style" name="UiKit.TextView.H1" id="0x7f130363" />
+    <public type="style" name="UiKit.TextView.H1.Bold" id="0x7f130364" />
+    <public type="style" name="UiKit.TextView.H2" id="0x7f130365" />
+    <public type="style" name="UiKit.TextView.Large" id="0x7f130366" />
+    <public type="style" name="UiKit.TextView.Large.SingleLine" id="0x7f130367" />
+    <public type="style" name="UiKit.TextView.Link" id="0x7f130368" />
+    <public type="style" name="UiKit.TextView.Marquee" id="0x7f130369" />
+    <public type="style" name="UiKit.TextView.Medium" id="0x7f13036a" />
+    <public type="style" name="UiKit.TextView.NoResults" id="0x7f13036b" />
+    <public type="style" name="UiKit.TextView.Perk" id="0x7f13036c" />
+    <public type="style" name="UiKit.TextView.Semibold" id="0x7f13036d" />
+    <public type="style" name="UiKit.TextView.SingleLine" id="0x7f13036e" />
+    <public type="style" name="UiKit.TextView.Subtext" id="0x7f13036f" />
+    <public type="style" name="UiKit.TextView.Subtext.SingleLine" id="0x7f130370" />
+    <public type="style" name="UiKit.Toast" id="0x7f130371" />
+    <public type="style" name="UiKit.User.Phone.Add.Confirm" id="0x7f130372" />
+    <public type="style" name="UiKit.User.Phone.Add.Number" id="0x7f130373" />
+    <public type="style" name="UiKit.User.Phone.Verify.Digits" id="0x7f130374" />
+    <public type="style" name="UiKit.User.Verify.Char" id="0x7f130375" />
+    <public type="style" name="UiKit.ViewGroup" id="0x7f130376" />
+    <public type="style" name="UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout" id="0x7f130377" />
+    <public type="style" name="UiKit.ViewGroup.ConstraintLayout" id="0x7f130378" />
+    <public type="style" name="UiKit.ViewGroup.CoordinatorLayout" id="0x7f130379" />
+    <public type="style" name="UiKit.ViewGroup.CoordinatorLayout.Page" id="0x7f13037a" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout" id="0x7f13037b" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.BottomSheet" id="0x7f13037c" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.Horizontal" id="0x7f13037d" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable" id="0x7f13037e" />
+    <public type="style" name="UiKit.ViewGroup.LinearLayout.Rotatable.Horizontal" id="0x7f13037f" />
+    <public type="style" name="UiKit.ViewGroup.NestedScrollView" id="0x7f130380" />
+    <public type="style" name="UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior" id="0x7f130381" />
+    <public type="style" name="UiKit.ViewGroup.NestedScrollView.Page" id="0x7f130382" />
+    <public type="style" name="UiKit.ViewGroup.Page" id="0x7f130383" />
+    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout" id="0x7f130384" />
+    <public type="style" name="UiKit.ViewGroup.Page.LinearLayout.Horizontal" id="0x7f130385" />
+    <public type="style" name="UiKit.ViewGroup.RecyclerView" id="0x7f130386" />
+    <public type="style" name="UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" id="0x7f130387" />
+    <public type="style" name="UiKit.ViewGroup.RecyclerView.Horizontal" id="0x7f130388" />
+    <public type="style" name="UiKit.ViewGroup.RelativeLayout" id="0x7f130389" />
+    <public type="style" name="UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior" id="0x7f13038a" />
+    <public type="style" name="UiKit.ViewGroup.ScrollView" id="0x7f13038b" />
+    <public type="style" name="UiKit.ViewGroup.ScrollView.Horizontal" id="0x7f13038c" />
+    <public type="style" name="UiKit.ViewGroup.ScrollView.Page" id="0x7f13038d" />
+    <public type="style" name="UiKit.WelcomeMessageCard" id="0x7f13038e" />
+    <public type="style" name="UserProfile.PresenceSection.Body" id="0x7f13038f" />
+    <public type="style" name="UserProfile.PresenceSection.Body.HeaderText" id="0x7f130390" />
+    <public type="style" name="UserProfile.PresenceSection.Body.Subtext" id="0x7f130391" />
+    <public type="style" name="UserProfile.PresenceSection.MaterialButton" id="0x7f130392" />
+    <public type="style" name="UserProfile.Section" id="0x7f130393" />
+    <public type="style" name="UserProfile.Section.Card" id="0x7f130394" />
+    <public type="style" name="UserProfile.Section.Header" id="0x7f130395" />
+    <public type="style" name="UserProfile.Section.HeaderTextAppearance" id="0x7f130396" />
+    <public type="style" name="Widget.AppCompat.ActionBar" id="0x7f130397" />
+    <public type="style" name="Widget.AppCompat.ActionBar.Solid" id="0x7f130398" />
+    <public type="style" name="Widget.AppCompat.ActionBar.TabBar" id="0x7f130399" />
+    <public type="style" name="Widget.AppCompat.ActionBar.TabText" id="0x7f13039a" />
+    <public type="style" name="Widget.AppCompat.ActionBar.TabView" id="0x7f13039b" />
+    <public type="style" name="Widget.AppCompat.ActionButton" id="0x7f13039c" />
+    <public type="style" name="Widget.AppCompat.ActionButton.CloseMode" id="0x7f13039d" />
+    <public type="style" name="Widget.AppCompat.ActionButton.Overflow" id="0x7f13039e" />
+    <public type="style" name="Widget.AppCompat.ActionMode" id="0x7f13039f" />
+    <public type="style" name="Widget.AppCompat.ActivityChooserView" id="0x7f1303a0" />
+    <public type="style" name="Widget.AppCompat.AutoCompleteTextView" id="0x7f1303a1" />
+    <public type="style" name="Widget.AppCompat.Button" id="0x7f1303a2" />
+    <public type="style" name="Widget.AppCompat.Button.Borderless" id="0x7f1303a3" />
+    <public type="style" name="Widget.AppCompat.Button.Borderless.Colored" id="0x7f1303a4" />
+    <public type="style" name="Widget.AppCompat.Button.ButtonBar.AlertDialog" id="0x7f1303a5" />
+    <public type="style" name="Widget.AppCompat.Button.Colored" id="0x7f1303a6" />
+    <public type="style" name="Widget.AppCompat.Button.Small" id="0x7f1303a7" />
+    <public type="style" name="Widget.AppCompat.ButtonBar" id="0x7f1303a8" />
+    <public type="style" name="Widget.AppCompat.ButtonBar.AlertDialog" id="0x7f1303a9" />
+    <public type="style" name="Widget.AppCompat.CompoundButton.CheckBox" id="0x7f1303aa" />
+    <public type="style" name="Widget.AppCompat.CompoundButton.RadioButton" id="0x7f1303ab" />
+    <public type="style" name="Widget.AppCompat.CompoundButton.Switch" id="0x7f1303ac" />
+    <public type="style" name="Widget.AppCompat.DrawerArrowToggle" id="0x7f1303ad" />
+    <public type="style" name="Widget.AppCompat.DropDownItem.Spinner" id="0x7f1303ae" />
+    <public type="style" name="Widget.AppCompat.EditText" id="0x7f1303af" />
+    <public type="style" name="Widget.AppCompat.ImageButton" id="0x7f1303b0" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar" id="0x7f1303b1" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid" id="0x7f1303b2" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.Solid.Inverse" id="0x7f1303b3" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar" id="0x7f1303b4" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse" id="0x7f1303b5" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText" id="0x7f1303b6" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabText.Inverse" id="0x7f1303b7" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView" id="0x7f1303b8" />
+    <public type="style" name="Widget.AppCompat.Light.ActionBar.TabView.Inverse" id="0x7f1303b9" />
+    <public type="style" name="Widget.AppCompat.Light.ActionButton" id="0x7f1303ba" />
+    <public type="style" name="Widget.AppCompat.Light.ActionButton.CloseMode" id="0x7f1303bb" />
+    <public type="style" name="Widget.AppCompat.Light.ActionButton.Overflow" id="0x7f1303bc" />
+    <public type="style" name="Widget.AppCompat.Light.ActionMode.Inverse" id="0x7f1303bd" />
+    <public type="style" name="Widget.AppCompat.Light.ActivityChooserView" id="0x7f1303be" />
+    <public type="style" name="Widget.AppCompat.Light.AutoCompleteTextView" id="0x7f1303bf" />
+    <public type="style" name="Widget.AppCompat.Light.DropDownItem.Spinner" id="0x7f1303c0" />
+    <public type="style" name="Widget.AppCompat.Light.ListPopupWindow" id="0x7f1303c1" />
+    <public type="style" name="Widget.AppCompat.Light.ListView.DropDown" id="0x7f1303c2" />
+    <public type="style" name="Widget.AppCompat.Light.PopupMenu" id="0x7f1303c3" />
+    <public type="style" name="Widget.AppCompat.Light.PopupMenu.Overflow" id="0x7f1303c4" />
+    <public type="style" name="Widget.AppCompat.Light.SearchView" id="0x7f1303c5" />
+    <public type="style" name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar" id="0x7f1303c6" />
+    <public type="style" name="Widget.AppCompat.ListMenuView" id="0x7f1303c7" />
+    <public type="style" name="Widget.AppCompat.ListPopupWindow" id="0x7f1303c8" />
+    <public type="style" name="Widget.AppCompat.ListView" id="0x7f1303c9" />
+    <public type="style" name="Widget.AppCompat.ListView.DropDown" id="0x7f1303ca" />
+    <public type="style" name="Widget.AppCompat.ListView.Menu" id="0x7f1303cb" />
+    <public type="style" name="Widget.AppCompat.PopupMenu" id="0x7f1303cc" />
+    <public type="style" name="Widget.AppCompat.PopupMenu.Overflow" id="0x7f1303cd" />
+    <public type="style" name="Widget.AppCompat.PopupWindow" id="0x7f1303ce" />
+    <public type="style" name="Widget.AppCompat.ProgressBar" id="0x7f1303cf" />
+    <public type="style" name="Widget.AppCompat.ProgressBar.Horizontal" id="0x7f1303d0" />
+    <public type="style" name="Widget.AppCompat.RatingBar" id="0x7f1303d1" />
+    <public type="style" name="Widget.AppCompat.RatingBar.Indicator" id="0x7f1303d2" />
+    <public type="style" name="Widget.AppCompat.RatingBar.Small" id="0x7f1303d3" />
+    <public type="style" name="Widget.AppCompat.SearchView" id="0x7f1303d4" />
+    <public type="style" name="Widget.AppCompat.SearchView.ActionBar" id="0x7f1303d5" />
+    <public type="style" name="Widget.AppCompat.SeekBar" id="0x7f1303d6" />
+    <public type="style" name="Widget.AppCompat.SeekBar.Discrete" id="0x7f1303d7" />
+    <public type="style" name="Widget.AppCompat.Spinner" id="0x7f1303d8" />
+    <public type="style" name="Widget.AppCompat.Spinner.DropDown" id="0x7f1303d9" />
+    <public type="style" name="Widget.AppCompat.Spinner.DropDown.ActionBar" id="0x7f1303da" />
+    <public type="style" name="Widget.AppCompat.Spinner.Underlined" id="0x7f1303db" />
+    <public type="style" name="Widget.AppCompat.TextView" id="0x7f1303dc" />
+    <public type="style" name="Widget.AppCompat.TextView.SpinnerItem" id="0x7f1303dd" />
+    <public type="style" name="Widget.AppCompat.Toolbar" id="0x7f1303de" />
+    <public type="style" name="Widget.AppCompat.Toolbar.Button.Navigation" id="0x7f1303df" />
+    <public type="style" name="Widget.Compat.NotificationActionContainer" id="0x7f1303e0" />
+    <public type="style" name="Widget.Compat.NotificationActionText" id="0x7f1303e1" />
+    <public type="style" name="Widget.Design.AppBarLayout" id="0x7f1303e2" />
+    <public type="style" name="Widget.Design.BottomNavigationView" id="0x7f1303e3" />
+    <public type="style" name="Widget.Design.BottomSheet.Modal" id="0x7f1303e4" />
+    <public type="style" name="Widget.Design.CollapsingToolbar" id="0x7f1303e5" />
+    <public type="style" name="Widget.Design.FloatingActionButton" id="0x7f1303e6" />
+    <public type="style" name="Widget.Design.NavigationView" id="0x7f1303e7" />
+    <public type="style" name="Widget.Design.ScrimInsetsFrameLayout" id="0x7f1303e8" />
+    <public type="style" name="Widget.Design.Snackbar" id="0x7f1303e9" />
+    <public type="style" name="Widget.Design.TabLayout" id="0x7f1303ea" />
+    <public type="style" name="Widget.Design.TextInputEditText" id="0x7f1303eb" />
+    <public type="style" name="Widget.Design.TextInputLayout" id="0x7f1303ec" />
+    <public type="style" name="Widget.MaterialComponents.ActionBar.Primary" id="0x7f1303ed" />
+    <public type="style" name="Widget.MaterialComponents.ActionBar.PrimarySurface" id="0x7f1303ee" />
+    <public type="style" name="Widget.MaterialComponents.ActionBar.Solid" id="0x7f1303ef" />
+    <public type="style" name="Widget.MaterialComponents.ActionBar.Surface" id="0x7f1303f0" />
+    <public type="style" name="Widget.MaterialComponents.AppBarLayout.Primary" id="0x7f1303f1" />
+    <public type="style" name="Widget.MaterialComponents.AppBarLayout.PrimarySurface" id="0x7f1303f2" />
+    <public type="style" name="Widget.MaterialComponents.AppBarLayout.Surface" id="0x7f1303f3" />
+    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.FilledBox" id="0x7f1303f4" />
+    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.FilledBox.Dense" id="0x7f1303f5" />
+    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox" id="0x7f1303f6" />
+    <public type="style" name="Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox.Dense" id="0x7f1303f7" />
+    <public type="style" name="Widget.MaterialComponents.Badge" id="0x7f1303f8" />
+    <public type="style" name="Widget.MaterialComponents.BottomAppBar" id="0x7f1303f9" />
+    <public type="style" name="Widget.MaterialComponents.BottomAppBar.Colored" id="0x7f1303fa" />
+    <public type="style" name="Widget.MaterialComponents.BottomAppBar.PrimarySurface" id="0x7f1303fb" />
+    <public type="style" name="Widget.MaterialComponents.BottomNavigationView" id="0x7f1303fc" />
+    <public type="style" name="Widget.MaterialComponents.BottomNavigationView.Colored" id="0x7f1303fd" />
+    <public type="style" name="Widget.MaterialComponents.BottomNavigationView.PrimarySurface" id="0x7f1303fe" />
+    <public type="style" name="Widget.MaterialComponents.BottomSheet" id="0x7f1303ff" />
+    <public type="style" name="Widget.MaterialComponents.BottomSheet.Modal" id="0x7f130400" />
+    <public type="style" name="Widget.MaterialComponents.Button" id="0x7f130401" />
+    <public type="style" name="Widget.MaterialComponents.Button.Icon" id="0x7f130402" />
+    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton" id="0x7f130403" />
+    <public type="style" name="Widget.MaterialComponents.Button.OutlinedButton.Icon" id="0x7f130404" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton" id="0x7f130405" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog" id="0x7f130406" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog.Flush" id="0x7f130407" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Dialog.Icon" id="0x7f130408" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Icon" id="0x7f130409" />
+    <public type="style" name="Widget.MaterialComponents.Button.TextButton.Snackbar" id="0x7f13040a" />
+    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton" id="0x7f13040b" />
+    <public type="style" name="Widget.MaterialComponents.Button.UnelevatedButton.Icon" id="0x7f13040c" />
+    <public type="style" name="Widget.MaterialComponents.CardView" id="0x7f13040d" />
+    <public type="style" name="Widget.MaterialComponents.CheckedTextView" id="0x7f13040e" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Action" id="0x7f13040f" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Choice" id="0x7f130410" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Entry" id="0x7f130411" />
+    <public type="style" name="Widget.MaterialComponents.Chip.Filter" id="0x7f130412" />
+    <public type="style" name="Widget.MaterialComponents.ChipGroup" id="0x7f130413" />
+    <public type="style" name="Widget.MaterialComponents.CompoundButton.CheckBox" id="0x7f130414" />
+    <public type="style" name="Widget.MaterialComponents.CompoundButton.RadioButton" id="0x7f130415" />
+    <public type="style" name="Widget.MaterialComponents.CompoundButton.Switch" id="0x7f130416" />
+    <public type="style" name="Widget.MaterialComponents.ExtendedFloatingActionButton" id="0x7f130417" />
+    <public type="style" name="Widget.MaterialComponents.ExtendedFloatingActionButton.Icon" id="0x7f130418" />
+    <public type="style" name="Widget.MaterialComponents.FloatingActionButton" id="0x7f130419" />
+    <public type="style" name="Widget.MaterialComponents.Light.ActionBar.Solid" id="0x7f13041a" />
+    <public type="style" name="Widget.MaterialComponents.MaterialButtonToggleGroup" id="0x7f13041b" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar" id="0x7f13041c" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day" id="0x7f13041d" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day.Invalid" id="0x7f13041e" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day.Selected" id="0x7f13041f" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Day.Today" id="0x7f130420" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.DayTextView" id="0x7f130421" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Fullscreen" id="0x7f130422" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderConfirmButton" id="0x7f130423" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderDivider" id="0x7f130424" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderLayout" id="0x7f130425" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderSelection" id="0x7f130426" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderSelection.Fullscreen" id="0x7f130427" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderTitle" id="0x7f130428" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" id="0x7f130429" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Item" id="0x7f13042a" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Year" id="0x7f13042b" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Year.Selected" id="0x7f13042c" />
+    <public type="style" name="Widget.MaterialComponents.MaterialCalendar.Year.Today" id="0x7f13042d" />
+    <public type="style" name="Widget.MaterialComponents.NavigationView" id="0x7f13042e" />
+    <public type="style" name="Widget.MaterialComponents.PopupMenu" id="0x7f13042f" />
+    <public type="style" name="Widget.MaterialComponents.PopupMenu.ContextMenu" id="0x7f130430" />
+    <public type="style" name="Widget.MaterialComponents.PopupMenu.ListPopupWindow" id="0x7f130431" />
+    <public type="style" name="Widget.MaterialComponents.PopupMenu.Overflow" id="0x7f130432" />
+    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Circular.Determinate" id="0x7f130433" />
+    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Circular.Indeterminate" id="0x7f130434" />
+    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Linear.Determinate" id="0x7f130435" />
+    <public type="style" name="Widget.MaterialComponents.ProgressIndicator.Linear.Indeterminate" id="0x7f130436" />
+    <public type="style" name="Widget.MaterialComponents.ShapeableImageView" id="0x7f130437" />
+    <public type="style" name="Widget.MaterialComponents.Slider" id="0x7f130438" />
+    <public type="style" name="Widget.MaterialComponents.Snackbar" id="0x7f130439" />
+    <public type="style" name="Widget.MaterialComponents.Snackbar.FullWidth" id="0x7f13043a" />
+    <public type="style" name="Widget.MaterialComponents.Snackbar.TextView" id="0x7f13043b" />
+    <public type="style" name="Widget.MaterialComponents.TabLayout" id="0x7f13043c" />
+    <public type="style" name="Widget.MaterialComponents.TabLayout.Colored" id="0x7f13043d" />
+    <public type="style" name="Widget.MaterialComponents.TabLayout.PrimarySurface" id="0x7f13043e" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox" id="0x7f13043f" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.FilledBox.Dense" id="0x7f130440" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox" id="0x7f130441" />
+    <public type="style" name="Widget.MaterialComponents.TextInputEditText.OutlinedBox.Dense" id="0x7f130442" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox" id="0x7f130443" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dense" id="0x7f130444" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dense.ExposedDropdownMenu" id="0x7f130445" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu" id="0x7f130446" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox" id="0x7f130447" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" id="0x7f130448" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu" id="0x7f130449" />
+    <public type="style" name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu" id="0x7f13044a" />
+    <public type="style" name="Widget.MaterialComponents.TextView" id="0x7f13044b" />
+    <public type="style" name="Widget.MaterialComponents.Toolbar" id="0x7f13044c" />
+    <public type="style" name="Widget.MaterialComponents.Toolbar.Primary" id="0x7f13044d" />
+    <public type="style" name="Widget.MaterialComponents.Toolbar.PrimarySurface" id="0x7f13044e" />
+    <public type="style" name="Widget.MaterialComponents.Toolbar.Surface" id="0x7f13044f" />
+    <public type="style" name="Widget.MaterialComponents.Tooltip" id="0x7f130450" />
+    <public type="style" name="Widget.Support.CoordinatorLayout" id="0x7f130451" />
+    <public type="style" name="cpv_ColorPickerViewStyle" id="0x7f130452" />
+    <public type="style" name="ucrop_ImageViewWidgetIcon" id="0x7f130453" />
+    <public type="style" name="ucrop_TextViewCropAspectRatio" id="0x7f130454" />
+    <public type="style" name="ucrop_TextViewWidgetText" id="0x7f130455" />
+    <public type="style" name="ucrop_WrapperIconState" id="0x7f130456" />
+    <public type="style" name="ucrop_WrapperRotateButton" id="0x7f130457" />
     <public type="style" name="Base.V22.Theme.AppCompat" id="0x7f1300bd" />
     <public type="style" name="Base.V22.Theme.AppCompat.Light" id="0x7f1300be" />
     <public type="style" name="Base.V23.Theme.AppCompat" id="0x7f1300bf" />
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index e9a0f7bdda..5cba93b7b3 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -911,6 +911,7 @@
     <string name="call_feedback_prompt">Tell us about your call experience.</string>
     <string name="call_feedback_sheet_title">"How'd the call go?"</string>
     <string name="call_invite_not_friends">You need to be friends with **%1$s** to start a call</string>
+    <string name="call_mobile_tap_to_return">%1$s — Tap to return to call</string>
     <string name="call_unavailable">Call Unavailable</string>
     <string name="camera">Camera</string>
     <string name="camera_disabled_limit_reached">"Video chat isn't available for more than %1$s"</string>
@@ -1131,7 +1132,7 @@ We’re here to make a good impression."</string>
     <string name="color_picker_presets">Presets</string>
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
-    <string name="com.crashlytics.android.build_id">6bcd2ae96ad640c9b6ed6cb861aa8772</string>
+    <string name="com.crashlytics.android.build_id">7fb11416f5e14e42b9bbf1192d68d822</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_me_description">Displays text with emphasis.</string>
@@ -1222,6 +1223,7 @@ We’re here to make a good impression."</string>
     <string name="connection_status_rtc_connecting">RTC Connecting</string>
     <string name="connection_status_rtc_disconnected">RTC Disconnected</string>
     <string name="connection_status_stream_connected">"Watching %1$s's Stream"</string>
+    <string name="connection_status_stream_self_connected">Screen Sharing</string>
     <string name="connection_status_video_connected">Video Connected</string>
     <string name="connection_status_voice_connected">Voice Connected</string>
     <string name="connection_verified">Verified</string>
@@ -2406,6 +2408,7 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_partner_application_content_platform">Where do you primarily create content?</string>
     <string name="guild_partner_application_country">Country</string>
     <string name="guild_partner_application_creator_connect">Connect accounts where you create</string>
+    <string name="guild_partner_application_creator_must_connect_primary">"If you've selected one of these options as where you primarily create content, you must connect your account to continue."</string>
     <string name="guild_partner_application_description_description">Tell us about your server. What is it about? Who is it for?</string>
     <string name="guild_partner_application_description_title">Server Description</string>
     <string name="guild_partner_application_first_name">First Name</string>
@@ -2432,7 +2435,7 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_partner_application_survey_talk_with_other_partners">Being able to talk with other Partnered community leaders</string>
     <string name="guild_partner_application_survey_title">Partnership Survey</string>
     <string name="guild_partner_application_title">Apply to the Discord Partner Program</string>
-    <string name="guild_partner_application_type">Server Type</string>
+    <string name="guild_partner_application_type">Partner Type</string>
     <string name="guild_partner_application_type_brand">Business / Brand</string>
     <string name="guild_partner_application_type_content">Content Creator / Personality</string>
     <string name="guild_partner_application_type_fan">Interest Group or Fan Community</string>
@@ -2451,6 +2454,7 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_popout_view_server_button">View Server</string>
     <string name="guild_premium">Server Boost Status</string>
     <string name="guild_profile_join_server_button">Join Server</string>
+    <string name="guild_role_actions_menu_label">Server Role Actions</string>
     <string name="guild_security_req_mfa_body">"When enabled, this requires members with moderation powers to have two-factor authentication enabled on their account in order to take moderation actions (e.g. kick, ban, and delete message). This can help prevent malicious people who compromise a mod or admin's account from taking destructive actions. **This setting can only be changed by the server owner if they have 2FA enabled on their account**."</string>
     <string name="guild_security_req_mfa_enable">[Enable on your account.](onClick)</string>
     <string name="guild_security_req_mfa_guild_disable">Disable 2FA Requirement</string>
@@ -2458,6 +2462,7 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_security_req_mfa_label">2FA Requirement For Moderation</string>
     <string name="guild_security_req_mfa_turn_off">Disable 2FA Requirement</string>
     <string name="guild_security_req_mfa_turn_on">Enable 2FA Requirement</string>
+    <string name="guild_security_req_owner_only">Only the server owner is allowed to do this</string>
     <string name="guild_select">Select a Server</string>
     <string name="guild_settings_action_filter_bot_add">Add Bot</string>
     <string name="guild_settings_action_filter_channel_create">Create Channel</string>
@@ -2669,8 +2674,8 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_settings_discovery_byline">By qualifying and enabling Discovery, your server will show up in [Server Discovery.](onClick) Make sure you’re ready to make a good impression!</string>
     <string name="guild_settings_discovery_checklist_2fa">2FA Requirement For Moderation Enabled</string>
     <string name="guild_settings_discovery_checklist_2fa_description">Members with moderation powers (e.g. admins or mods) are required to have 2FA enabled to perform moderation actions.</string>
-    <string name="guild_settings_discovery_checklist_2fa_description_failing">This requires all members with moderation powers to have 2FA enabled before they can perform moderation actions. This can help protect against compromised admin or mod accounts. [Enable in the Moderation settings](onClick)</string>
-    <string name="guild_settings_discovery_checklist_2fa_failing">Missing 2FA Requirement For Moderation</string>
+    <string name="guild_settings_discovery_checklist_2fa_description_failing">This setting will require all members with moderation powers to have 2FA enabled before they can perform moderation actions. This can help protect against compromised admin or mod accounts. [Enable at the bottom of the Moderation tab.](onClick)</string>
+    <string name="guild_settings_discovery_checklist_2fa_failing">Please Enable the [2FA Requirement For Moderation] Setting</string>
     <string name="guild_settings_discovery_checklist_abide_by_guidelines">By enabling Discovery, you agree to abide by our [Discoverable Server Guidelines.](%1$s)</string>
     <string name="guild_settings_discovery_checklist_age">Meets Age Requirement</string>
     <string name="guild_settings_discovery_checklist_age_description">Servers in Discovery have to be at least %1$s old.</string>
@@ -2684,7 +2689,7 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Increase number of weekly communicators</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action_details">A communicator is someone who has talked (voice or text) in the server. Hosting community events and seeding discussion topics are great ways to encourage more people to talk.</string>
     <string name="guild_settings_discovery_checklist_communicator_progress_label">avg weekly communicators in your server</string>
-    <string name="guild_settings_discovery_checklist_engagement_failing">Your server needs more members that visit and talk weekly.</string>
+    <string name="guild_settings_discovery_checklist_engagement_failing">Your server needs more members who visit and talk weekly.</string>
     <string name="guild_settings_discovery_checklist_good_standing">Great work! Your server passes all the requirements to be in Server Discovery.</string>
     <string name="guild_settings_discovery_checklist_health_definitions_intro">"To ensure we're only recommending active servers to Discord users, servers in Discovery are required to have a minimum activity level."</string>
     <string name="guild_settings_discovery_checklist_health_view_details">Click here for more details</string>
@@ -2700,7 +2705,7 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_settings_discovery_checklist_nsfw_description">Your server name, description, and channel names look clean!</string>
     <string name="guild_settings_discovery_checklist_nsfw_failing">Bad Words Found</string>
     <string name="guild_settings_discovery_checklist_progress_requirement_label">min required</string>
-    <string name="guild_settings_discovery_checklist_retention_failing">You need to improve your new member onboarding experience.</string>
+    <string name="guild_settings_discovery_checklist_retention_failing">Your retention is too low. Try improving your new member onboarding experience.</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action">Improve new member experience</string>
     <string name="guild_settings_discovery_checklist_retention_failing_action_details_updated">"Servers that gain more than 10 new members per week are required to have a new member retention of 10%%. At least 1 out of 10 new people that join should stick around for a week+.
 
@@ -2710,7 +2715,7 @@ Take a look at your server through the eyes of a new member. Are there areas whe
     <string name="guild_settings_discovery_checklist_safe_description">Thanks for abiding by our Community Guidelines and keeping your server safe!</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing">Your server was in $[violation of our Terms of Service](doesNotHook) within the last 30 days.</string>
     <string name="guild_settings_discovery_checklist_safe_description_failing_guidelines">Your server was in violation of our [Terms of Service](%1$s) or [Community Server Guidelines](%2$s).</string>
-    <string name="guild_settings_discovery_checklist_safe_failing">Flagged by Trust &amp; Safety</string>
+    <string name="guild_settings_discovery_checklist_safe_failing">Flagged By Trust &amp; Safety</string>
     <string name="guild_settings_discovery_checklist_score_explain">Calculated as a rolling avg over the past 8 weeks, so changes may take a few weeks to show. Only users who have been on Discord for 8 weeks+ are counted as visitors or communicators.</string>
     <string name="guild_settings_discovery_checklist_size">%1$s+ Members</string>
     <string name="guild_settings_discovery_checklist_size_description">For now, Discovery is limited to only servers with more than %1$s members.</string>
@@ -2818,6 +2823,41 @@ Lost: %2$s"</string>
     <string name="guild_settings_overview_boost_unlock">%1$s to unlock</string>
     <string name="guild_settings_overview_boost_unlocked">Tier %1$s perk unlocked</string>
     <string name="guild_settings_overview_tier_info">This is a Tier %1$s Nitro Feature. [Check your tier status](%2$s)</string>
+    <string name="guild_settings_partner_checklist_age_description">Your server must be at least %1$s old.</string>
+    <string name="guild_settings_partner_checklist_age_description_failing">Your server must be at least %1$s old. Please check back on %2$s.</string>
+    <string name="guild_settings_partner_checklist_failing_header">Not yet!</string>
+    <string name="guild_settings_partner_checklist_failing_subheader">Your server $[is not](warningHook) currently eligible to apply for the Partner Program.</string>
+    <string name="guild_settings_partner_checklist_health_view_details">For more details, go to the Partner Program tab in Server Insights.</string>
+    <string name="guild_settings_partner_checklist_healthy_description">Your activity and retention metrics pass the minimum requirements to apply.</string>
+    <string name="guild_settings_partner_checklist_healthy_description_failing">Your server does not currently pass the minimum activity requirements for Partnership.</string>
+    <string name="guild_settings_partner_checklist_healthy_description_pending">Partnered servers must meet basic activity requirements. This takes time to calculate for newer or smaller servers, $[so check back in about a week.](checkBackHook)</string>
+    <string name="guild_settings_partner_checklist_healthy_description_pending_size">"Partnered servers must meet basic activity requirements. We're unable to calculate this until your server has at least %1$s members."</string>
+    <string name="guild_settings_partner_checklist_passing_header">Great work!</string>
+    <string name="guild_settings_partner_checklist_passing_subheader">Your server is eligible to apply for the Partner Program.</string>
+    <string name="guild_settings_partner_checklist_size">%1$s+ Members</string>
+    <string name="guild_settings_partner_checklist_size_description">For now, new Partnered servers must have at least %1$s members.</string>
+    <string name="guild_settings_partner_checklist_size_description_failing">For now, new Partnered servers must have at least %1$s members.</string>
+    <string name="guild_settings_partner_checklist_size_failing">Not Enough Members</string>
+    <string name="guild_settings_partner_intro_apply_button">Apply for Partnership</string>
+    <string name="guild_settings_partner_intro_apply_button_tooltip_only_owner">Only the server owner can apply.</string>
+    <string name="guild_settings_partner_intro_apply_button_tooltip_pending">Your application is pending review.</string>
+    <string name="guild_settings_partner_intro_apply_button_tooltip_rejected">Your application has been denied at this time.</string>
+    <string name="guild_settings_partner_intro_apply_details">"To apply, refer to the requirements below. Note that these are just the minimum requirements to apply, and acceptance is not guaranteed.
+
+All Partnered servers must abide by the [Partner Code of Conduct](%1$s)."</string>
+    <string name="guild_settings_partner_intro_body">We want to support communities that invest time and effort on Discord. Get rewarded for creating an engaged community with our Partner Program. [Learn more.](%1$s)</string>
+    <string name="guild_settings_partner_intro_cooldown">You must wait two months before you can reapply.</string>
+    <string name="guild_settings_partner_intro_cooldown_counter">You will be able to reapply in %1$s days.</string>
+    <string name="guild_settings_partner_intro_header">Discord Partner Program</string>
+    <string name="guild_settings_partner_intro_pending">Your server’s Partner application is $[pending review.](pendingHook) We hope to get back to you soon! Make sure to check your email.</string>
+    <string name="guild_settings_partner_intro_rejected">Your server’s Partner application has been $[denied](warningHook) at this time. Check the server owner’s email for more detail.</string>
+    <string name="guild_settings_partner_intro_upsell_branding_body">Personalize your server with a Custom URL, Server Banner, and Invite Splash.</string>
+    <string name="guild_settings_partner_intro_upsell_branding_header">Unique Branding</string>
+    <string name="guild_settings_partner_intro_upsell_perks_body">Get Discord Nitro, rewards for your community, and access to the Partners-only server.</string>
+    <string name="guild_settings_partner_intro_upsell_perks_header">Partner-only Perks</string>
+    <string name="guild_settings_partner_intro_upsell_recognition_body">Receive a special badge on your server and stand out from the crowd on our Discovery page.</string>
+    <string name="guild_settings_partner_intro_upsell_recognition_header">Be Recognized</string>
+    <string name="guild_settings_partner_not_verified">You must verify your email before you can see the requirements.</string>
     <string name="guild_settings_premium_guild_blurb">Members of your server can help unlock levels by bestowing Boosts. For every level achieved, your server will help unlock perks for everyone. Members can revoke their boost at any time. **Your server will keep perks for three days if a level is lost**. [Learn more about Server Boosting](%1$s).</string>
     <string name="guild_settings_premium_guild_close_hint">Only %1$s until the next level!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** boosted this server</string>
@@ -3901,7 +3941,11 @@ Want to know more about Discord?"</string>
     <string name="mobile_enable_hardware_scaling_desc">Experimental feature that may improve performance in video calls. Beware, may cause jank.</string>
     <string name="mobile_noise_cancellation_popout_description">While speaking, filter out background noise and showcase your wonderful voice. Powered by Krisp.</string>
     <string name="mobile_noise_cancellation_popout_title">Noise suppression (beta)</string>
+    <string name="mobile_stream_active_body">You can switch to other apps for your friends to see.</string>
+    <string name="mobile_stream_active_body_soundshare_warning_android">You can switch to other apps for your friends to see. The latest version of Android is required for your audio to be shared.</string>
+    <string name="mobile_stream_active_header">You’re sharing your screen!</string>
     <string name="mobile_stream_participants_hidden">Participants without video are currently hidden. Would you like to show them?</string>
+    <string name="mobile_stream_stop_sharing">Stop sharing</string>
     <string name="moderation">Moderation</string>
     <string name="modify_followed_news_header">Are you sure?</string>
     <string name="monthly">Monthly</string>
@@ -4363,7 +4407,8 @@ Want to know more about Discord?"</string>
     <string name="paginator_of_pages">Page %1$s of %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">"%1$s Discord's Twitter should have more information."</string>
-    <string name="partner_badge_tooltip">Discord Partner</string>
+    <string name="partner_badge_tooltip">Partnered Server Owner</string>
+    <string name="partner_program">Partner Program</string>
     <string name="password_length_error">Passwords need to be between 6 and 128 characters</string>
     <string name="password_manager">Password Manager</string>
     <string name="password_manager_info_android">"If you use a password manager, you'll need to allow it in Accessibility Settings -> Downloaded Services. Don't worry, we can take you there."</string>
@@ -4869,8 +4914,7 @@ The changes to your subscription are reflected below:"</string>
     <string name="public_updates_channel_title">Mod-only Channel</string>
     <string name="publish_followed_news_body">This message will be sent to all servers following this channel. You can edit or delete this message later, and it will update correspondingly in each following server.</string>
     <string name="publish_followed_news_body_reach">This message will be sent to **%1$s servers** following this channel. You can edit or delete this message later, and it will update correspondingly in each following server.</string>
-    <string name="publish_followed_news_body_settings">Server Insights.</string>
-    <string name="publish_followed_news_body_settings_body">Announcement stats can be found in</string>
+    <string name="publish_followed_news_body_settings_insights">Announcement stats can be found in [Server Insights.](onClick)</string>
     <string name="publish_followed_news_fail_body">"You've reached your 10 published messages per-hour limit. But we love the enthusiasm, so please try again in %1$s."</string>
     <string name="publish_followed_news_fail_title">Uh-oh, a pop up box.</string>
     <string name="publish_followed_news_generic_body">Sorry, something went wrong.</string>
@@ -6122,8 +6166,10 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="video_unavailable">Video Unavailable</string>
     <string name="video_unsupported_browser_body">Video and Screen Share are not supported in this browser. Please download our desktop client to beam your face and screen across the net.</string>
     <string name="video_unsupported_browser_title">Browser not supported</string>
-    <string name="view_as_roles_cta">BETA: View this server as if you had a set of roles. This will disconnect you from any calls in this server.</string>
-    <string name="view_as_roles_voice_warning">Voice restrictions (priority speaking, suppression, etc) are tied to your user, so it may not reflect the roles you are viewing as.</string>
+    <string name="view_as_role">View Server As Role</string>
+    <string name="view_as_roles_hidden_vc_warning">This voice channel is not visible to the role(s) you are viewing as. You will no longer see this channel once you disconnect.</string>
+    <string name="view_as_roles_mentions_warning">"You are viewing as roles. Notifications may be in channels you can't see."</string>
+    <string name="view_as_roles_voice_warning">"View as Role does not reflect a role's voice restrictions, including priority speaker and suppression."</string>
     <string name="view_audit_log">View Audit Log</string>
     <string name="view_audit_log_description">"Members with this permission have access to view the server's audit logs"</string>
     <string name="view_channel">View Channel</string>
@@ -6133,9 +6179,9 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="view_profile">View Profile</string>
     <string name="view_spectators">View spectators</string>
     <string name="view_surrounding_messages">View surrounding messages.</string>
-    <string name="viewing_as_roles_edit">Edit Roles</string>
+    <string name="viewing_as_roles">You are viewing this server as %1$s.</string>
+    <string name="viewing_as_roles_back">Back to Roles Settings</string>
     <string name="viewing_as_roles_select">Select Roles</string>
-    <string name="viewing_as_roles_warning">You are viewing this guild with only selected roles.</string>
     <string name="visitors_info">A member who has clicked into the server and viewed a channel.</string>
     <string name="voice">Voice</string>
     <string name="voice_and_video">Voice &amp; Video</string>
@@ -6270,7 +6316,7 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass (3 months)</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_body">Sorry, looks like you already have a Nitro sub. However, you can give your redemption URL to a friend and send 3 free Nitro months their way.</string>
     <string name="xbox_game_pass_promotion_existing_subscriber_title">Oh no!</string>
-    <string name="xbox_game_pass_promotion_redeem_body">Since you have Xbox Game Pass, you get 3 months of Nitro for free!</string>
+    <string name="xbox_game_pass_promotion_redeem_body">Since you have Xbox Game Pass Ultimate, you get 3 months of Nitro for free!</string>
     <string name="xbox_link">Link</string>
     <string name="xbox_pin_step1">Open the Discord app on your phone</string>
     <string name="xbox_pin_step2">Go to Settings > Connections > Add</string>
diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml
index be4a7cf13f..13af20f715 100644
--- a/com.discord/res/values/styles.xml
+++ b/com.discord/res/values/styles.xml
@@ -2497,26 +2497,26 @@
     <style name="Base.Widget.MaterialComponents.TextView" parent="@style/Widget.AppCompat.TextView" />
     <style name="BlockedUsersList.Item" parent="@style/UiKit.ViewGroup.RelativeLayout">
         <item name="android:background">@drawable/bg_pressed_highlight_darken</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
     <style name="BlockedUsersList.Item.Avatar" parent="@style/Avatar.Standard">
         <item name="android:layout_width">40.0dip</item>
         <item name="android:layout_height">40.0dip</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginEnd">16.0dip</item>
     </style>
     <style name="BlockedUsersList.Item.Name" parent="@style/UiKit.TextView.Large.SingleLine">
         <item name="android:textColor">?colorTextNormal</item>
     </style>
     <style name="BlockedUsersList.Item.UnblockButton" parent="@style/UiKit.Material.Button">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginStart">16.0dip</item>
         <item name="android:backgroundTint">?colorBackgroundAccent</item>
     </style>
     <style name="CallMessage.Subtitle" parent="@style/UiKit.TextView">
         <item name="android:textAppearance">@style/UiKit.TextAppearance</item>
-        <item name="android:textColor">?colorHeaderPrimary</item>
+        <item name="android:textColor">?colorHeaderSecondary</item>
         <item name="android:singleLine">true</item>
     </style>
     <style name="CardView" parent="@style/Base.CardView" />
@@ -2542,7 +2542,7 @@
         <item name="android:theme">@style/AppTheme.Dark.Switch.White</item>
         <item name="android:textAppearance">@style/UiKit.TextAppearance.ListItem</item>
         <item name="android:textColor">@color/white</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
@@ -2550,12 +2550,12 @@
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?colorInteractiveActive</item>
         <item name="android:background">?selectableItemBackground</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingLeft">16.0dip</item>
         <item name="android:paddingTop">14.0dip</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingRight">16.0dip</item>
         <item name="android:paddingBottom">14.0dip</item>
         <item name="android:text">@string/mark_as_read</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+        <item name="android:drawablePadding">16.0dip</item>
         <item name="android:fontFamily">@font/whitney_semibold</item>
         <item name="drawableTint">?colorInteractiveNormal</item>
     </style>
@@ -2569,8 +2569,8 @@
     </style>
     <style name="EmojiPickerButtonIcon">
         <item name="android:background">?bg_pressed_highlight</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingLeft">16.0dip</item>
+        <item name="android:paddingRight">16.0dip</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_centerVertical">true</item>
@@ -2614,23 +2614,23 @@
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?colorInteractiveActive</item>
         <item name="android:textColorHint">?colorTextMuted</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingTop">8.0dip</item>
+        <item name="android:paddingBottom">8.0dip</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:paddingStart">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingStart">8.0dip</item>
     </style>
     <style name="ExpressionSearchInputClear">
-        <item name="android:padding">@dimen/uikit_spacing_medium</item>
+        <item name="android:padding">8.0dip</item>
         <item name="android:layout_width">32.0dip</item>
         <item name="android:layout_height">32.0dip</item>
     </style>
     <style name="ExpressionTrayTab" parent="@style/UiKit.TextView">
         <item name="android:textAppearance">@style/UiKit.TextAppearance.Semibold</item>
         <item name="android:gravity">center</item>
-        <item name="android:padding">@dimen/uikit_spacing_medium</item>
+        <item name="android:padding">8.0dip</item>
         <item name="android:layout_width">fill_parent</item>
     </style>
     <style name="ExpressionTrayTabCard">
@@ -2660,18 +2660,18 @@
     <style name="Feedback.Row" parent="">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginStart">16.0dip</item>
+        <item name="android:layout_marginEnd">16.0dip</item>
     </style>
     <style name="Feedback.Row.Prompt" parent="@style/Feedback.Row">
         <item name="android:textAppearance">@style/Feedback.PromptTextAppearance</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingTop">16.0dip</item>
+        <item name="android:paddingBottom">16.0dip</item>
     </style>
     <style name="Feedback.Row.RatingContainer" parent="@style/Feedback.Row">
         <item name="android:gravity">center_horizontal</item>
         <item name="android:orientation">horizontal</item>
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginBottom">8.0dip</item>
     </style>
     <style name="Feedback.Row.SectionCard" parent="@style/Feedback.Row">
         <item name="cardBackgroundColor">?colorBackgroundPrimary</item>
@@ -2680,9 +2680,9 @@
     </style>
     <style name="Feedback.Row.SectionHeader" parent="@style/Feedback.Row">
         <item name="android:textAppearance">@style/Feedback.SectionHeaderTextAppearance</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
-        <item name="android:layout_marginTop">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingTop">8.0dip</item>
+        <item name="android:paddingBottom">8.0dip</item>
+        <item name="android:layout_marginTop">8.0dip</item>
     </style>
     <style name="Feedback.SectionHeaderTextAppearance" parent="@style/UiKit.TextAppearance.Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
@@ -2699,7 +2699,7 @@
     <style name="FlexInput.AddContent.Base.Container.TabLayout" parent="@style/FlexInput.AddContent">
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">bottom</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
         <item name="android:clickable">true</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:layout_width">fill_parent</item>
@@ -2708,9 +2708,9 @@
     </style>
     <style name="FlexInput.AddContent.Base.Page" parent="@style/FlexInput.AddContent">
         <item name="android:orientation">vertical</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_xsmall</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_xsmall</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_xsmall</item>
+        <item name="android:paddingLeft">2.0dip</item>
+        <item name="android:paddingTop">2.0dip</item>
+        <item name="android:paddingRight">2.0dip</item>
         <item name="android:paddingBottom">@dimen/add_content_viewpager_bottom_margin</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:layout_width">fill_parent</item>
@@ -2778,26 +2778,26 @@
         <item name="android:layout_centerHorizontal">true</item>
     </style>
     <style name="FlexInput.Input.Button.Camera.Facing" parent="@style/FlexInput.Input.Button">
-        <item name="android:layout_margin">@dimen/uikit_spacing_small</item>
+        <item name="android:layout_margin">4.0dip</item>
         <item name="android:src">@drawable/ic_camera_front_white_24dp</item>
         <item name="android:layout_alignParentTop">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_alignParentEnd">true</item>
     </style>
     <style name="FlexInput.Input.Button.Camera.Flash" parent="@style/FlexInput.Input.Button">
-        <item name="android:layout_margin">@dimen/uikit_spacing_small</item>
+        <item name="android:layout_margin">4.0dip</item>
         <item name="android:src">@drawable/ic_flash_auto_24dp</item>
         <item name="android:layout_alignParentLeft">true</item>
         <item name="android:layout_alignParentTop">true</item>
         <item name="android:layout_alignParentStart">true</item>
     </style>
     <style name="FlexInput.Input.Button.Camera.Launcher" parent="@style/FlexInput.Input.Button">
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_small</item>
+        <item name="android:layout_marginRight">4.0dip</item>
         <item name="android:layout_marginBottom">@dimen/add_content_viewpager_bottom_margin</item>
         <item name="android:src">@drawable/ic_launch_24dp</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_small</item>
+        <item name="android:layout_marginEnd">4.0dip</item>
         <item name="android:layout_alignParentEnd">true</item>
     </style>
     <style name="FlexInput.Items" parent="@style/FlexInput">
@@ -2820,7 +2820,7 @@
         <item name="viewAspectRatio">1.0</item>
     </style>
     <style name="FlexInput.Items.Base.File.Selection" parent="@style/FlexInput.Items.Base.File">
-        <item name="android:padding">@dimen/uikit_spacing_small</item>
+        <item name="android:padding">4.0dip</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:src">@drawable/file_item_selection_indicator_btn</item>
@@ -2847,7 +2847,7 @@
         <item name="roundAsCircle">true</item>
         <item name="roundWithOverlayColor">@android:color/transparent</item>
         <item name="roundingBorderColor">?flexInputColorHighlight</item>
-        <item name="roundingBorderWidth">@dimen/uikit_spacing_small</item>
+        <item name="roundingBorderWidth">4.0dip</item>
     </style>
     <style name="FlexInput.Items.File" parent="@style/FlexInput.Items.Base.File" />
     <style name="FlexInput.Items.File.Image" parent="@style/FlexInput.Items.Base.File.Image" />
@@ -2880,8 +2880,8 @@
         <item name="android:orientation">vertical</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
-        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginStart">16.0dip</item>
+        <item name="android:layout_marginEnd">16.0dip</item>
     </style>
     <style name="FriendsList.EmptyState.Image" parent="">
         <item name="android:gravity">center</item>
@@ -2895,8 +2895,8 @@
         <item name="android:gravity">center</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_xxlarge</item>
+        <item name="android:layout_marginTop">8.0dip</item>
+        <item name="android:layout_marginBottom">32.0dip</item>
     </style>
     <style name="FriendsList.EmptyState.Title" parent="@style/UiKit.TextView.Bold">
         <item name="android:textSize">@dimen/uikit_textsize_xxlarge</item>
@@ -2904,7 +2904,7 @@
         <item name="android:gravity">center</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">@dimen/uikit_spacing_xxlarge</item>
+        <item name="android:layout_marginTop">32.0dip</item>
         <item name="android:lineSpacingMultiplier">1.0</item>
     </style>
     <style name="FriendsList.FriendsItem" parent="@style/UiKit.ViewGroup.RelativeLayout">
@@ -2912,27 +2912,27 @@
     </style>
     <style name="FriendsList.FriendsItem.ActionButton" parent="">
         <item name="android:background">?primary_630_circle</item>
-        <item name="android:padding">@dimen/uikit_spacing_medium</item>
+        <item name="android:padding">8.0dip</item>
         <item name="android:layout_width">32.0dip</item>
         <item name="android:layout_height">32.0dip</item>
         <item name="android:scaleType">fitCenter</item>
     </style>
     <style name="FriendsList.FriendsItem.Activity" parent="@style/UiKit.TextView">
         <item name="android:textColor">?colorTextMuted</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_xsmall</item>
+        <item name="android:paddingTop">2.0dip</item>
         <item name="android:singleLine">true</item>
     </style>
     <style name="FriendsList.FriendsItem.Avatar" parent="@style/Avatar.Standard">
         <item name="android:layout_width">40.0dip</item>
         <item name="android:layout_height">40.0dip</item>
-        <item name="android:layout_margin">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_margin">16.0dip</item>
         <item name="android:layout_centerVertical">true</item>
     </style>
     <style name="FriendsList.FriendsItem.ButtonsWrap" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginStart">16.0dip</item>
+        <item name="android:layout_marginEnd">16.0dip</item>
         <item name="android:layout_alignParentEnd">true</item>
     </style>
     <style name="FriendsList.FriendsItem.Name" parent="@style/UiKit.TextView.Large.SingleLine">
@@ -2941,16 +2941,16 @@
     <style name="FriendsList.FriendsItem.Status" parent="">
         <item name="android:layout_width">16.0dip</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:translationX">@dimen/uikit_spacing_xsmall</item>
-        <item name="android:translationY">@dimen/uikit_spacing_xsmall</item>
+        <item name="android:translationX">2.0dip</item>
+        <item name="android:translationY">2.0dip</item>
     </style>
     <style name="FriendsList.FriendsItem.Text" parent="@style/UiKit.ViewGroup.LinearLayout">
         <item name="android:layout_centerVertical">true</item>
     </style>
     <style name="FriendsList.ItemHeader" parent="">
         <item name="android:background">?colorBackgroundPrimary</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingLeft">16.0dip</item>
+        <item name="android:paddingRight">16.0dip</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">40.0dip</item>
@@ -2961,7 +2961,7 @@
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">end|bottom|center</item>
         <item name="android:background">?bg_pressed_highlight</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingLeft">8.0dip</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:singleLine">true</item>
@@ -2973,7 +2973,7 @@
         <item name="android:layout_gravity">start|bottom|center</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_small</item>
+        <item name="android:layout_marginBottom">4.0dip</item>
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -2986,7 +2986,7 @@
     </style>
     <style name="GuildProfileSheet.Actions.CheckedSetting" parent="@style/UiKit.CheckedSetting.Themed">
         <item name="cs_container_background">?bg_pressed_highlight</item>
-        <item name="cs_drawable_padding">@dimen/uikit_spacing_large</item>
+        <item name="cs_drawable_padding">16.0dip</item>
         <item name="cs_subtext_color">?colorTextMuted</item>
         <item name="cs_subtext_size">@dimen/uikit_textsize_small</item>
         <item name="cs_text_color">?colorHeaderPrimary</item>
@@ -3006,13 +3006,13 @@
         <item name="android:textColor">?colorTextMuted</item>
     </style>
     <style name="GuildProfileSheet.Emoji.Item" parent="">
-        <item name="android:padding">@dimen/uikit_spacing_small</item>
+        <item name="android:padding">4.0dip</item>
         <item name="android:layout_width">32.0dip</item>
         <item name="android:layout_height">32.0dip</item>
     </style>
     <style name="GuildProfileSheet.TabItems.Button" parent="@style/UiKit.Material.Button.Transparent">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
-        <item name="android:padding">@dimen/uikit_spacing_medium</item>
+        <item name="android:padding">8.0dip</item>
         <item name="android:layout_width">0.0px</item>
         <item name="android:singleLine">true</item>
     </style>
@@ -3118,20 +3118,20 @@
         <item name="android:textAlignment">center</item>
     </style>
     <style name="MuteSettings.Row" parent="">
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingLeft">16.0dip</item>
+        <item name="android:paddingRight">16.0dip</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingStart">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingStart">16.0dip</item>
+        <item name="android:paddingEnd">16.0dip</item>
     </style>
     <style name="MuteSettings.Row.Subtitle" parent="@style/MuteSettings.Row">
         <item name="android:textAppearance">@style/MuteSettings.SubtitleTextAppearance</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingBottom">16.0dip</item>
     </style>
     <style name="MuteSettings.Row.Title" parent="@style/MuteSettings.Row">
         <item name="android:textAppearance">@style/MuteSettings.TitleTextAppearance</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingTop">16.0dip</item>
     </style>
     <style name="MuteSettings.SubtitleTextAppearance" parent="@style/TextAppearance.AppCompat">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
@@ -3154,14 +3154,14 @@
         <item name="rippleColor">@color/status_green</item>
     </style>
     <style name="Nux.GuildTemplates.Card.Action" parent="@style/UiKit.TextView.Bold">
-        <item name="android:textSize">@dimen/uikit_spacing_large</item>
+        <item name="android:textSize">16.0sp</item>
         <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_xlarge</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingLeft">16.0dip</item>
+        <item name="android:paddingTop">8.0dip</item>
+        <item name="android:paddingRight">24.0dip</item>
+        <item name="android:paddingBottom">8.0dip</item>
         <item name="android:layout_width">fill_parent</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+        <item name="android:drawablePadding">16.0dip</item>
     </style>
     <style name="Overlay.Dialog" parent="@style/UiKit.ViewGroup">
         <item name="android:theme">@style/AppTheme.Dark</item>
@@ -3435,7 +3435,7 @@
         <item name="android:clickable">true</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_margin">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_margin">16.0dip</item>
         <item name="backgroundTint">@color/purple_brand</item>
         <item name="colorAccent">@color/purple_brand</item>
         <item name="colorControlHighlight">@color/purple_brand_hint</item>
@@ -3524,7 +3524,7 @@
     <style name="TabsHostBottomNavItem">
         <item name="android:gravity">center</item>
         <item name="android:background">?bg_pressed_highlight</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
         <item name="android:layout_width">0.0dip</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1.0</item>
@@ -4124,8 +4124,8 @@
         <item name="android:paddingTop">2.0dip</item>
         <item name="android:paddingBottom">2.0dip</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:paddingStart">@dimen/uikit_spacing_small</item>
-        <item name="android:paddingEnd">@dimen/uikit_spacing_small</item>
+        <item name="android:paddingStart">4.0dip</item>
+        <item name="android:paddingEnd">4.0dip</item>
         <item name="backgroundTint">@color/brand</item>
     </style>
     <style name="UiKit" />
@@ -4163,8 +4163,8 @@
         <item name="lottie_autoPlay">false</item>
     </style>
     <style name="UiKit.Auth.Note.Rotatable" parent="@style/UiKit.TextView">
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingTop">16.0dip</item>
+        <item name="android:paddingBottom">16.0dip</item>
     </style>
     <style name="UiKit.AuthButton.Material" parent="@style/UiKit.Material.Button">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
@@ -4213,9 +4213,9 @@
     </style>
     <style name="UiKit.Chat.Embed.Footer" parent="@style/UiKit.TextView.Bold">
         <item name="android:textColor">?primary_100</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginRight">16.0dip</item>
+        <item name="android:layout_marginBottom">16.0dip</item>
+        <item name="android:layout_marginEnd">16.0dip</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
         <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="layout_constraintRight_toRightOf">parent</item>
@@ -4223,11 +4223,11 @@
     <style name="UiKit.Chat.Embed.Header" parent="@style/UiKit.TextView.Bold">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?primary_300</item>
-        <item name="android:layout_marginLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginLeft">16.0dip</item>
+        <item name="android:layout_marginTop">8.0dip</item>
+        <item name="android:layout_marginBottom">8.0dip</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginStart">16.0dip</item>
         <item name="layout_constrainedWidth">true</item>
         <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="layout_constraintHorizontal_bias">0.0</item>
@@ -4303,18 +4303,18 @@
     </style>
     <style name="UiKit.Dialog.Body" parent="@style/UiKit.TextView">
         <item name="android:paddingLeft">@dimen/dialog_padding_horiz</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingTop">16.0dip</item>
         <item name="android:paddingRight">@dimen/dialog_padding_horiz</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_small</item>
+        <item name="android:paddingBottom">4.0dip</item>
         <item name="android:lineSpacingMultiplier">1.0</item>
     </style>
     <style name="UiKit.Dialog.ButtonContainer" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <item name="android:gravity">end</item>
         <item name="android:background">?primary_630</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingLeft">8.0dip</item>
+        <item name="android:paddingTop">8.0dip</item>
+        <item name="android:paddingRight">8.0dip</item>
+        <item name="android:paddingBottom">8.0dip</item>
     </style>
     <style name="UiKit.Dialog.Container" parent="@style/UiKit.ViewGroup.LinearLayout">
         <item name="android:background">?colorBackgroundPrimary</item>
@@ -4329,7 +4329,7 @@
         <item name="android:textColor">?primary_100</item>
         <item name="android:paddingLeft">@dimen/dialog_padding_horiz</item>
         <item name="android:paddingRight">@dimen/dialog_padding_horiz</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingBottom">8.0dip</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_marginTop">@dimen/dialog_title_padding_top</item>
         <item name="android:textAllCaps">true</item>
@@ -4354,8 +4354,8 @@
         <item name="android:background">?colorPrimaryDivider</item>
         <item name="android:layout_width">0.5dip</item>
         <item name="android:layout_height">fill_parent</item>
-        <item name="android:layout_marginLeft">@dimen/uikit_spacing_medium</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginLeft">8.0dip</item>
+        <item name="android:layout_marginRight">8.0dip</item>
     </style>
     <style name="UiKit.Form.Label" parent="@style/UiKit.TextView">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
@@ -4403,18 +4403,18 @@
     <style name="UiKit.GuildsListDividerIcon" parent="@style/UiKit">
         <item name="android:layout_gravity">center</item>
         <item name="android:background">?colorPrimaryDivider</item>
-        <item name="android:layout_width">@dimen/uikit_spacing_xxlarge</item>
+        <item name="android:layout_width">32.0dip</item>
         <item name="android:layout_height">1.0px</item>
-        <item name="android:layout_marginTop">@dimen/uikit_spacing_small</item>
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_small</item>
+        <item name="android:layout_marginTop">4.0dip</item>
+        <item name="android:layout_marginBottom">4.0dip</item>
     </style>
     <style name="UiKit.GuildsListDividerIconHoriz" parent="@style/UiKit">
         <item name="android:layout_gravity">center</item>
         <item name="android:background">@color/white_alpha_20</item>
-        <item name="android:layout_width">@dimen/uikit_spacing_xsmall</item>
-        <item name="android:layout_height">@dimen/uikit_spacing_xxlarge</item>
-        <item name="android:layout_marginLeft">@dimen/uikit_spacing_small</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_small</item>
+        <item name="android:layout_width">2.0dip</item>
+        <item name="android:layout_height">32.0dip</item>
+        <item name="android:layout_marginLeft">4.0dip</item>
+        <item name="android:layout_marginRight">4.0dip</item>
     </style>
     <style name="UiKit.GuildsListIcon" parent="@style/Avatar.Large">
         <item name="android:layout_centerInParent">true</item>
@@ -4485,10 +4485,10 @@
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?primary_300</item>
         <item name="android:background">?bg_pressed_highlight</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_small</item>
+        <item name="android:drawablePadding">4.0dip</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">@font/whitney_medium</item>
     </style>
@@ -4503,11 +4503,11 @@
     </style>
     <style name="UiKit.ImageView.Clickable.Corner.TopEnd" parent="@style/UiKit.ImageView.Clickable">
         <item name="android:paddingLeft">12.0dip</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_small</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_small</item>
+        <item name="android:paddingTop">4.0dip</item>
+        <item name="android:paddingRight">4.0dip</item>
         <item name="android:paddingBottom">12.0dip</item>
         <item name="android:paddingStart">12.0dip</item>
-        <item name="android:paddingEnd">@dimen/uikit_spacing_small</item>
+        <item name="android:paddingEnd">4.0dip</item>
     </style>
     <style name="UiKit.ImageView.HideInLandscape" parent="@style/UiKit.ImageView" />
     <style name="UiKit.ListItem" parent="@style/UiKit">
@@ -4515,15 +4515,15 @@
         <item name="android:textColor">?colorInteractiveActive</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:background">?bg_pressed_highlight</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingTop">16.0dip</item>
+        <item name="android:paddingBottom">16.0dip</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingStart">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingStart">16.0dip</item>
+        <item name="android:paddingEnd">16.0dip</item>
     </style>
     <style name="UiKit.ListItem.Icon" parent="@style/UiKit.ListItem">
-        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+        <item name="android:drawablePadding">16.0dip</item>
     </style>
     <style name="UiKit.ListItem.Icon.Radio" parent="@style/UiKit.ListItem.Icon">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
@@ -4634,18 +4634,18 @@
         <item name="android:textAlignment">textStart</item>
         <item name="chipBackgroundColor">?colorBackgroundPrimary</item>
         <item name="chipCornerRadius">16.0dip</item>
-        <item name="chipEndPadding">@dimen/uikit_spacing_xsmall</item>
+        <item name="chipEndPadding">2.0dip</item>
         <item name="chipIconEnabled">true</item>
         <item name="chipIconSize">16.0dip</item>
         <item name="chipIconVisible">true</item>
-        <item name="chipStartPadding">@dimen/uikit_spacing_small</item>
+        <item name="chipStartPadding">4.0dip</item>
         <item name="ensureMinTouchTargetSize">false</item>
     </style>
     <style name="UiKit.PremiumGuild.Settings.Marketing.Check" parent="@style/UiKit.TextView.Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:layout_gravity">start</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+        <item name="android:drawablePadding">16.0dip</item>
         <item name="android:drawableStart">@drawable/ic_check_white_24dp</item>
     </style>
     <style name="UiKit.PremiumGuild.Settings.Marketing.Clear" parent="@style/UiKit.PremiumGuild.Settings.Marketing.Check">
@@ -4654,9 +4654,9 @@
     <style name="UiKit.PremiumGuild.Settings.Marketing.Container" parent="@style/UiKit.ViewGroup.LinearLayout">
         <item name="android:gravity">center_horizontal</item>
         <item name="android:background">@drawable/drawable_bg_white_alpha_06_corners_gradient</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
+        <item name="android:layout_marginLeft">16.0dip</item>
+        <item name="android:layout_marginRight">16.0dip</item>
     </style>
     <style name="UiKit.ProgressBar.Line.Horizontal.Determinate" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:layout_width">fill_parent</item>
@@ -4688,17 +4688,17 @@
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">@color/primary_300</item>
         <item name="android:background">@drawable/drawable_bg_item_filter</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_small</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_xsmall</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_small</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_xsmall</item>
+        <item name="android:paddingLeft">4.0dip</item>
+        <item name="android:paddingTop">2.0dip</item>
+        <item name="android:paddingRight">4.0dip</item>
+        <item name="android:paddingBottom">2.0dip</item>
     </style>
     <style name="UiKit.Search.Header" parent="@style/UiKit.TextView.Semibold">
         <item name="android:textColor">?colorHeaderSecondary</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingLeft">16.0dip</item>
+        <item name="android:paddingTop">8.0dip</item>
+        <item name="android:paddingRight">16.0dip</item>
+        <item name="android:paddingBottom">8.0dip</item>
         <item name="android:textAllCaps">true</item>
     </style>
     <style name="UiKit.SeekBar" parent="">
@@ -4720,13 +4720,13 @@
         <item name="android:background">?selectableItemBackground</item>
     </style>
     <style name="UiKit.Settings.Divider" parent="@style/UiKit.Divider">
-        <item name="android:layout_marginTop">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginTop">8.0dip</item>
     </style>
     <style name="UiKit.Settings.Item" parent="@style/UiKit.Settings.Base.Item">
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingStart">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingTop">16.0dip</item>
+        <item name="android:paddingBottom">16.0dip</item>
+        <item name="android:paddingStart">16.0dip</item>
+        <item name="android:paddingEnd">16.0dip</item>
     </style>
     <style name="UiKit.Settings.Item.Addition" parent="@style/UiKit.Settings.Item">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
@@ -4742,7 +4742,7 @@
     </style>
     <style name="UiKit.Settings.Item.Icon" parent="@style/UiKit.Settings.Item">
         <item name="android:gravity">center_vertical</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_xxlarge</item>
+        <item name="android:drawablePadding">32.0dip</item>
     </style>
     <style name="UiKit.Settings.Item.Label" parent="@style/UiKit.Settings.Item">
         <item name="android:paddingBottom">0.0dip</item>
@@ -4762,13 +4762,13 @@
         <item name="layout_constraintGuide_begin">@dimen/uikit_guideline_sheet</item>
     </style>
     <style name="UiKit.Sheet.Header" parent="@style/UiKit.ViewGroup">
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingTop">16.0dip</item>
+        <item name="android:paddingBottom">8.0dip</item>
     </style>
     <style name="UiKit.Sheet.Header.Contents" parent="@style/UiKit.ViewGroup">
         <item name="android:layout_width">0.0dip</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_medium</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginRight">8.0dip</item>
+        <item name="android:layout_marginEnd">8.0dip</item>
         <item name="layout_constrainedWidth">true</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
         <item name="layout_constraintEnd_toEndOf">parent</item>
@@ -4779,8 +4779,8 @@
         <item name="layout_constraintTop_toTopOf">parent</item>
     </style>
     <style name="UiKit.Sheet.Header.Icon" parent="@style/Avatar.Large">
-        <item name="android:layout_marginLeft">@dimen/uikit_spacing_medium</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginLeft">8.0dip</item>
+        <item name="android:layout_marginRight">8.0dip</item>
         <item name="android:scaleType">center</item>
         <item name="layout_constrainedWidth">true</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
@@ -4793,9 +4793,9 @@
     </style>
     <style name="UiKit.Sheet.Header.Title" parent="@style/UiKit.TextView.H1.Bold">
         <item name="android:ellipsize">end</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginRight">8.0dip</item>
         <item name="android:singleLine">true</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginEnd">8.0dip</item>
         <item name="layout_constrainedWidth">true</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
         <item name="layout_constraintEnd_toEndOf">parent</item>
@@ -4805,16 +4805,6 @@
         <item name="layout_constraintStart_toEndOf">@id/uikit_sheet_header_guideline</item>
         <item name="layout_constraintTop_toTopOf">parent</item>
     </style>
-    <style name="UiKit.SuperBar" parent="">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">@dimen/uikit_spacing_xxlarge</item>
-        <item name="sb_barControlColor">@color/white</item>
-        <item name="sb_barControlRadius">11.0dip</item>
-        <item name="sb_barControlShadowColor">@color/black_alpha_20</item>
-        <item name="sb_barControlShadowRadius">@dimen/uikit_spacing_xsmall</item>
-        <item name="sb_barHeight">@dimen/uikit_spacing_medium</item>
-        <item name="sb_barOverlayColor">@color/transparent</item>
-    </style>
     <style name="UiKit.TabLayout.PagerIndicator" parent="">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">16.0dip</item>
@@ -4967,7 +4957,7 @@
     </style>
     <style name="UiKit.TextInputLayout.Search" parent="@style/UiKit.TextInputLayout">
         <item name="android:textColorHint">?colorHeaderSecondary</item>
-        <item name="android:layout_margin">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_margin">8.0dip</item>
         <item name="boxBackgroundColor">?colorInteractiveMuted</item>
         <item name="hintEnabled">false</item>
         <item name="startIconDrawable">@drawable/ic_search_grey_24dp</item>
@@ -5028,17 +5018,17 @@
     <style name="UiKit.TextView.NoResults" parent="@style/UiKit.TextView.Semibold">
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">center</item>
-        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:padding">16.0dip</item>
         <item name="android:text">@string/search_no_results</item>
         <item name="android:drawableTop">?img_empty_search</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+        <item name="android:drawablePadding">16.0dip</item>
     </style>
     <style name="UiKit.TextView.Perk" parent="@style/UiKit.TextView">
         <item name="android:textColor">?primary_100</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingTop">12.0dip</item>
         <item name="android:paddingBottom">12.0dip</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+        <item name="android:drawablePadding">16.0dip</item>
     </style>
     <style name="UiKit.TextView.Semibold" parent="@style/UiKit.TextView">
         <item name="android:textAppearance">@style/UiKit.TextAppearance.Semibold</item>
@@ -5077,10 +5067,10 @@
         <item name="android:gravity">center</item>
         <item name="android:background">?colorBackgroundTertiary</item>
         <item name="android:padding">0.0dip</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_medium</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingLeft">8.0dip</item>
+        <item name="android:paddingTop">16.0dip</item>
+        <item name="android:paddingRight">8.0dip</item>
+        <item name="android:paddingBottom">16.0dip</item>
         <item name="android:layout_width">48.0dip</item>
         <item name="android:layout_height">48.0dip</item>
         <item name="android:layout_marginRight">8.0dip</item>
@@ -5179,15 +5169,15 @@
         <item name="android:foreground">?bg_pressed_highlight</item>
         <item name="cardBackgroundColor">?colorBackgroundSecondary</item>
         <item name="cardCornerRadius">8.0dip</item>
-        <item name="contentPadding">@dimen/uikit_spacing_large</item>
+        <item name="contentPadding">16.0dip</item>
     </style>
     <style name="UserProfile.PresenceSection.Body" parent="@style/UiKit.ViewGroup.ConstraintLayout">
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingRight">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingStart">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingLeft">16.0dip</item>
+        <item name="android:paddingTop">16.0dip</item>
+        <item name="android:paddingRight">16.0dip</item>
+        <item name="android:paddingBottom">16.0dip</item>
+        <item name="android:paddingStart">16.0dip</item>
+        <item name="android:paddingEnd">16.0dip</item>
     </style>
     <style name="UserProfile.PresenceSection.Body.HeaderText" parent="@style/UiKit.TextView.Semibold">
         <item name="android:textColor">?colorHeaderPrimary</item>
@@ -5201,23 +5191,23 @@
         <item name="android:maxLines">1</item>
     </style>
     <style name="UserProfile.Section" parent="@style/UiKit.ViewGroup">
-        <item name="android:layout_marginLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginRight">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginEnd">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_marginLeft">16.0dip</item>
+        <item name="android:layout_marginRight">16.0dip</item>
+        <item name="android:layout_marginStart">16.0dip</item>
+        <item name="android:layout_marginEnd">16.0dip</item>
     </style>
     <style name="UserProfile.Section.Card" parent="@style/UserProfile.Section">
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginBottom">8.0dip</item>
         <item name="cardBackgroundColor">?primary_600</item>
         <item name="cardCornerRadius">8.0dip</item>
         <item name="cardElevation">0.0dip</item>
     </style>
     <style name="UserProfile.Section.Header" parent="@style/UserProfile.Section">
         <item name="android:textAppearance">@style/UserProfile.Section.HeaderTextAppearance</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_medium</item>
+        <item name="android:paddingTop">8.0dip</item>
         <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_marginTop">@dimen/uikit_spacing_medium</item>
-        <item name="android:layout_marginBottom">@dimen/uikit_spacing_medium</item>
+        <item name="android:layout_marginTop">8.0dip</item>
+        <item name="android:layout_marginBottom">8.0dip</item>
     </style>
     <style name="UserProfile.Section.HeaderTextAppearance" parent="@style/TextAppearance.AppCompat">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
diff --git a/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali b/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
index cd72b53c51..387a056655 100644
--- a/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
+++ b/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
@@ -27,7 +27,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/Set;Ljava/util/Set;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -40,6 +40,14 @@
         }
     .end annotation
 
+    const-string v0, "outgoingIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "incomingIds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, LWidgetFriendsAddUserRequestsModel;->a:Ljava/util/Set;
@@ -66,7 +74,7 @@
 
     iget-object v1, p1, LWidgetFriendsAddUserRequestsModel;->a:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -76,7 +84,7 @@
 
     iget-object p1, p1, LWidgetFriendsAddUserRequestsModel;->b:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$b.smali b/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$b.smali
index 5f72d9287c..71cb14468d 100644
--- a/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$b.smali
+++ b/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$b.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Ljava/lang/String;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "handshakeToken"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, LWidgetRemoteAuthViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-boolean p3, p0, LWidgetRemoteAuthViewModel$ViewState$b;->c:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "handshakeToken"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -65,7 +60,7 @@
 
     iget-object v1, p1, LWidgetRemoteAuthViewModel$ViewState$b;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/WidgetRemoteAuthViewModel$a.smali b/com.discord/smali/WidgetRemoteAuthViewModel$a.smali
index e85faa3d08..b2b6e983cc 100644
--- a/com.discord/smali/WidgetRemoteAuthViewModel$a.smali
+++ b/com.discord/smali/WidgetRemoteAuthViewModel$a.smali
@@ -1,5 +1,5 @@
 .class public final LWidgetRemoteAuthViewModel$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetRemoteAuthViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelRemoteAuthHandshake;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelRemoteAuthHandshake;
 
-    if-eqz p1, :cond_0
+    const-string v0, "handshakeData"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, LWidgetRemoteAuthViewModel$a;->this$0:LWidgetRemoteAuthViewModel;
 
@@ -67,7 +69,7 @@
 
     const-string v4, "temporaryBehaviorSubject"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
 
@@ -75,7 +77,7 @@
 
     const-string v4, "temporaryBehaviorSubject.value"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v3, Ljava/lang/Boolean;
 
@@ -87,15 +89,15 @@
 
     invoke-direct {v1, v2, v3, v4}, LWidgetRemoteAuthViewModel$ViewState$b;-><init>(Ljava/lang/String;ZZ)V
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     new-instance v0, Landroid/os/Handler;
 
     invoke-direct {v0}, Landroid/os/Handler;-><init>()V
 
-    new-instance v1, Lz;
+    new-instance v1, La0;
 
-    invoke-direct {v1, p0, p1}, Lz;-><init>(LWidgetRemoteAuthViewModel$a;Lcom/discord/models/domain/ModelRemoteAuthHandshake;)V
+    invoke-direct {v1, p0, p1}, La0;-><init>(LWidgetRemoteAuthViewModel$a;Lcom/discord/models/domain/ModelRemoteAuthHandshake;)V
 
     const-wide/16 v2, 0x3e8
 
@@ -104,13 +106,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "handshakeData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/WidgetRemoteAuthViewModel$b.smali b/com.discord/smali/WidgetRemoteAuthViewModel$b.smali
index cc92007dde..9f1736a434 100644
--- a/com.discord/smali/WidgetRemoteAuthViewModel$b.smali
+++ b/com.discord/smali/WidgetRemoteAuthViewModel$b.smali
@@ -1,5 +1,5 @@
 .class public final LWidgetRemoteAuthViewModel$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetRemoteAuthViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/utilities/error/Error;
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
@@ -59,7 +61,7 @@
 
     const-string v0, "it.response"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -76,19 +78,10 @@
 
     sget-object v0, LWidgetRemoteAuthViewModel$ViewState$a;->a:LWidgetRemoteAuthViewModel$ViewState$a;
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/WidgetRemoteAuthViewModel$c.smali b/com.discord/smali/WidgetRemoteAuthViewModel$c.smali
index 47e5e6bf78..f80ce220da 100644
--- a/com.discord/smali/WidgetRemoteAuthViewModel$c.smali
+++ b/com.discord/smali/WidgetRemoteAuthViewModel$c.smali
@@ -23,7 +23,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "fingerprint"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,6 +50,10 @@
         }
     .end annotation
 
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, LWidgetRemoteAuthViewModel;
 
     iget-object v0, p0, LWidgetRemoteAuthViewModel$c;->a:Ljava/lang/String;
diff --git a/com.discord/smali/WidgetRemoteAuthViewModel.smali b/com.discord/smali/WidgetRemoteAuthViewModel.smali
index f047ff2667..33dc80f594 100644
--- a/com.discord/smali/WidgetRemoteAuthViewModel.smali
+++ b/com.discord/smali/WidgetRemoteAuthViewModel.smali
@@ -1,5 +1,5 @@
 .class public final LWidgetRemoteAuthViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetRemoteAuthViewModel.kt"
 
 
@@ -13,7 +13,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "LWidgetRemoteAuthViewModel$ViewState;",
         ">;"
     }
@@ -38,15 +38,17 @@
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/utilities/rest/RestAPI;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "fingerprint"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "restAPI"
 
-    sget-object v1, LWidgetRemoteAuthViewModel$ViewState$c;->a:LWidgetRemoteAuthViewModel$ViewState$c;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    sget-object v0, LWidgetRemoteAuthViewModel$ViewState$c;->a:LWidgetRemoteAuthViewModel$ViewState$c;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p2, p0, LWidgetRemoteAuthViewModel;->e:Lcom/discord/utilities/rest/RestAPI;
 
@@ -58,7 +60,7 @@
 
     iput-object p2, p0, LWidgetRemoteAuthViewModel;->d:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p2
 
@@ -66,18 +68,18 @@
 
     sget-object p1, LWidgetRemoteAuthViewModel$ViewState$a;->a:LWidgetRemoteAuthViewModel$ViewState$a;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
     iget-object p2, p0, LWidgetRemoteAuthViewModel;->e:Lcom/discord/utilities/rest/RestAPI;
 
-    new-instance v1, Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;
 
-    invoke-direct {v1, p1}, Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, p1}, Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p2, v1}, Lcom/discord/utilities/rest/RestAPI;->postRemoteAuthInitialize(Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lcom/discord/utilities/rest/RestAPI;->postRemoteAuthInitialize(Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;)Lrx/Observable;
 
     move-result-object p1
 
@@ -89,6 +91,8 @@
 
     const/4 p2, 0x2
 
+    const/4 v0, 0x0
+
     invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
@@ -117,18 +121,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "fingerprint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/a0.smali b/com.discord/smali/a0.smali
index bfb4c6a0b9..3493a9605a 100644
--- a/com.discord/smali/a0.smali
+++ b/com.discord/smali/a0.smali
@@ -1,58 +1,76 @@
 .class public final La0;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "WidgetRemoteAuthViewModel.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Ljava/lang/Runnable;
 
 
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Void;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
+# instance fields
+.field public final synthetic d:LWidgetRemoteAuthViewModel$a;
 
-
-# static fields
-.field public static final d:La0;
+.field public final synthetic e:Lcom/discord/models/domain/ModelRemoteAuthHandshake;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>(LWidgetRemoteAuthViewModel$a;Lcom/discord/models/domain/ModelRemoteAuthHandshake;)V
+    .locals 0
 
-    new-instance v0, La0;
+    iput-object p1, p0, La0;->d:LWidgetRemoteAuthViewModel$a;
 
-    invoke-direct {v0}, La0;-><init>()V
+    iput-object p2, p0, La0;->e:Lcom/discord/models/domain/ModelRemoteAuthHandshake;
 
-    sput-object v0, La0;->d:La0;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final run()V
+    .locals 5
 
-    check-cast p1, Ljava/lang/Void;
+    iget-object v0, p0, La0;->d:LWidgetRemoteAuthViewModel$a;
 
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+    iget-object v0, v0, LWidgetRemoteAuthViewModel$a;->this$0:LWidgetRemoteAuthViewModel;
 
-    return-object p1
+    new-instance v1, LWidgetRemoteAuthViewModel$ViewState$b;
+
+    iget-object v2, p0, La0;->e:Lcom/discord/models/domain/ModelRemoteAuthHandshake;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelRemoteAuthHandshake;->getHandshakeToken()Ljava/lang/String;
+
+    move-result-object v2
+
+    iget-object v3, p0, La0;->d:LWidgetRemoteAuthViewModel$a;
+
+    iget-object v3, v3, LWidgetRemoteAuthViewModel$a;->this$0:LWidgetRemoteAuthViewModel;
+
+    iget-object v3, v3, LWidgetRemoteAuthViewModel;->d:Lrx/subjects/BehaviorSubject;
+
+    const-string v4, "temporaryBehaviorSubject"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
+
+    move-result-object v3
+
+    const-string v4, "temporaryBehaviorSubject.value"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v3, Ljava/lang/Boolean;
+
+    invoke-virtual {v3}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v3
+
+    const/4 v4, 0x1
+
+    invoke-direct {v1, v2, v3, v4}, LWidgetRemoteAuthViewModel$ViewState$b;-><init>(Ljava/lang/String;ZZ)V
+
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali
index 3c244816c3..d7d185ccef 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali
@@ -151,7 +151,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Ld0/a/b/b/b/b$a;->g(Landroid/os/IBinder;)Ld0/a/b/b/b/b;
+    invoke-static {v1}, Le0/a/b/b/b/b$a;->g(Landroid/os/IBinder;)Le0/a/b/b/b/b;
 
     move-result-object v1
 
@@ -163,7 +163,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Landroid/support/v4/media/session/MediaSessionCompat$Token;->a(Ljava/lang/Object;Ld0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
+    invoke-static {v2, v1}, Landroid/support/v4/media/session/MediaSessionCompat$Token;->a(Ljava/lang/Object;Le0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
     move-result-object v1
 
diff --git a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali
index 309be7cfbd..8f74391578 100644
--- a/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali
+++ b/com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali
@@ -174,7 +174,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v0, v1}, Landroid/support/v4/media/session/MediaSessionCompat$Token;->a(Ljava/lang/Object;Ld0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
+    invoke-static {v0, v1}, Landroid/support/v4/media/session/MediaSessionCompat$Token;->a(Ljava/lang/Object;Le0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
     move-result-object v0
 
diff --git a/com.discord/smali/android/support/v4/media/RatingCompat.smali b/com.discord/smali/android/support/v4/media/RatingCompat.smali
index 79b0e2c85a..32c9ce9521 100644
--- a/com.discord/smali/android/support/v4/media/RatingCompat.smali
+++ b/com.discord/smali/android/support/v4/media/RatingCompat.smali
@@ -84,7 +84,7 @@
 
     if-gez v2, :cond_0
 
-    const-string v1, "unrated"
+    const-string/jumbo v1, "unrated"
 
     goto :goto_0
 
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali
index eafa672fcf..d21297e219 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali
@@ -76,11 +76,11 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Ld0/a/b/b/b/b$a;->g(Landroid/os/IBinder;)Ld0/a/b/b/b/b;
+    invoke-static {v2}, Le0/a/b/b/b/b$a;->g(Landroid/os/IBinder;)Le0/a/b/b/b/b;
 
     move-result-object v2
 
-    iput-object v2, v1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iput-object v2, v1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
     iget-object v1, p1, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->e:Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali
index adc2326cd6..7f0383ed29 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali
@@ -1,5 +1,5 @@
 .class public Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a;
-.super Ld0/a/b/b/b/c$b;
+.super Le0/a/b/b/b/c$b;
 .source "MediaControllerCompat.java"
 
 
@@ -15,10 +15,10 @@
 
 
 # direct methods
-.method public constructor <init>(Ld0/a/b/b/b/c;)V
+.method public constructor <init>(Le0/a/b/b/b/c;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Ld0/a/b/b/b/c$b;-><init>(Ld0/a/b/b/b/c;)V
+    invoke-direct {p0, p1}, Le0/a/b/b/b/c$b;-><init>(Le0/a/b/b/b/c;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali
index ced913701e..5a08944390 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali
@@ -29,7 +29,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Ld0/a/b/b/b/c;",
+            "Le0/a/b/b/b/c;",
             ">;"
         }
     .end annotation
@@ -39,7 +39,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
-            "Ld0/a/b/b/b/c;",
+            "Le0/a/b/b/b/c;",
             "Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a;",
             ">;"
         }
@@ -94,7 +94,7 @@
 
     iget-object p1, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->e:Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
-    iget-object p1, p1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iget-object p1, p1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
     if-nez p1, :cond_0
 
@@ -133,7 +133,7 @@
 
     iget-object v0, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->e:Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
-    iget-object v0, v0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iget-object v0, v0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
     if-nez v0, :cond_0
 
@@ -157,24 +157,24 @@
 
     move-result-object v1
 
-    check-cast v1, Ld0/a/b/b/b/c;
+    check-cast v1, Le0/a/b/b/b/c;
 
     new-instance v2, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a;
 
-    invoke-direct {v2, v1}, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a;-><init>(Ld0/a/b/b/b/c;)V
+    invoke-direct {v2, v1}, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a;-><init>(Le0/a/b/b/b/c;)V
 
     iget-object v3, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->d:Ljava/util/HashMap;
 
     invoke-virtual {v3, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object v2, v1, Ld0/a/b/b/b/c;->a:Ld0/a/b/b/b/a;
+    iput-object v2, v1, Le0/a/b/b/b/c;->a:Le0/a/b/b/b/a;
 
     :try_start_0
     iget-object v1, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->e:Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
-    iget-object v1, v1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iget-object v1, v1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
-    invoke-interface {v1, v2}, Ld0/a/b/b/b/b;->k(Ld0/a/b/b/b/a;)V
+    invoke-interface {v1, v2}, Le0/a/b/b/b/b;->k(Le0/a/b/b/b/a;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali
index fa64971e22..1e85ed5b00 100644
--- a/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali
+++ b/com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali
@@ -32,7 +32,7 @@
 # instance fields
 .field public final d:Ljava/lang/Object;
 
-.field public e:Ld0/a/b/b/b/b;
+.field public e:Le0/a/b/b/b/b;
 
 .field public f:Landroid/os/Bundle;
 
@@ -59,24 +59,24 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iput-object p1, p0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
     return-void
 .end method
 
-.method public constructor <init>(Ljava/lang/Object;Ld0/a/b/b/b/b;)V
+.method public constructor <init>(Ljava/lang/Object;Le0/a/b/b/b/b;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->d:Ljava/lang/Object;
 
-    iput-object p2, p0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iput-object p2, p0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
     return-void
 .end method
 
-.method public static a(Ljava/lang/Object;Ld0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
+.method public static a(Ljava/lang/Object;Le0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
     .locals 2
     .annotation build Landroidx/annotation/RestrictTo;
         value = {
@@ -92,7 +92,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-direct {v0, p0, p1}, Landroid/support/v4/media/session/MediaSessionCompat$Token;-><init>(Ljava/lang/Object;Ld0/a/b/b/b/b;)V
+    invoke-direct {v0, p0, p1}, Landroid/support/v4/media/session/MediaSessionCompat$Token;-><init>(Ljava/lang/Object;Le0/a/b/b/b/b;)V
 
     return-object v0
 
diff --git a/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali b/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali
index 9c446921c0..b69729ad80 100644
--- a/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali
+++ b/com.discord/smali/android/support/v4/os/ResultReceiver$b.smali
@@ -1,5 +1,5 @@
 .class public Landroid/support/v4/os/ResultReceiver$b;
-.super Ld0/a/b/c/a$a;
+.super Le0/a/b/c/a$a;
 .source "ResultReceiver.java"
 
 
@@ -24,7 +24,7 @@
 
     iput-object p1, p0, Landroid/support/v4/os/ResultReceiver$b;->a:Landroid/support/v4/os/ResultReceiver;
 
-    invoke-direct {p0}, Ld0/a/b/c/a$a;-><init>()V
+    invoke-direct {p0}, Le0/a/b/c/a$a;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/android/support/v4/os/ResultReceiver.smali b/com.discord/smali/android/support/v4/os/ResultReceiver.smali
index cd7d3b719a..5f1da8bc09 100644
--- a/com.discord/smali/android/support/v4/os/ResultReceiver.smali
+++ b/com.discord/smali/android/support/v4/os/ResultReceiver.smali
@@ -44,7 +44,7 @@
 
 .field public final e:Landroid/os/Handler;
 
-.field public f:Ld0/a/b/c/a;
+.field public f:Le0/a/b/c/a;
 
 
 # direct methods
@@ -77,11 +77,11 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Ld0/a/b/c/a$a;->g(Landroid/os/IBinder;)Ld0/a/b/c/a;
+    invoke-static {p1}, Le0/a/b/c/a$a;->g(Landroid/os/IBinder;)Le0/a/b/c/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Landroid/support/v4/os/ResultReceiver;->f:Ld0/a/b/c/a;
+    iput-object p1, p0, Landroid/support/v4/os/ResultReceiver;->f:Le0/a/b/c/a;
 
     return-void
 .end method
@@ -120,12 +120,12 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver;->f:Ld0/a/b/c/a;
+    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver;->f:Le0/a/b/c/a;
 
     if-eqz v0, :cond_2
 
     :try_start_0
-    invoke-interface {v0, p1, p2}, Ld0/a/b/c/a;->t0(ILandroid/os/Bundle;)V
+    invoke-interface {v0, p1, p2}, Le0/a/b/c/a;->t0(ILandroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -148,7 +148,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Ld0/a/b/c/a;
+    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Le0/a/b/c/a;
 
     if-nez p2, :cond_0
 
@@ -156,10 +156,10 @@
 
     invoke-direct {p2, p0}, Landroid/support/v4/os/ResultReceiver$b;-><init>(Landroid/support/v4/os/ResultReceiver;)V
 
-    iput-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Ld0/a/b/c/a;
+    iput-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Le0/a/b/c/a;
 
     :cond_0
-    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Ld0/a/b/c/a;
+    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Le0/a/b/c/a;
 
     invoke-interface {p2}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
 
diff --git a/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$1.smali b/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$1.smali
index a0057bfc08..156cc35655 100644
--- a/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$1.smali
+++ b/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/activity/ActivityViewModelLazyKt$viewModels$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ActivityViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelStore;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,9 +54,9 @@
 
     move-result-object v0
 
-    const-string v1, "viewModelStore"
+    const-string/jumbo v1, "viewModelStore"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1.smali b/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1.smali
index dde1c73996..c488ec66d9 100644
--- a/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1.smali
+++ b/com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ActivityViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelProvider$Factory;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string v1, "defaultViewModelProviderFactory"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/activity/ActivityViewModelLazyKt.smali b/com.discord/smali/androidx/activity/ActivityViewModelLazyKt.smali
index c7e335af95..822cd53d9f 100644
--- a/com.discord/smali/androidx/activity/ActivityViewModelLazyKt.smali
+++ b/com.discord/smali/androidx/activity/ActivityViewModelLazyKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final viewModels(Landroidx/activity/ComponentActivity;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+.method public static final synthetic viewModels(Landroidx/activity/ComponentActivity;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
     .locals 1
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
@@ -24,9 +24,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$viewModels"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -38,19 +38,14 @@
     invoke-direct {p1, p0}, Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;-><init>(Landroidx/activity/ComponentActivity;)V
 
     :goto_0
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$viewModels"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
-.method public static viewModels$default(Landroidx/activity/ComponentActivity;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
+.method public static synthetic viewModels$default(Landroidx/activity/ComponentActivity;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
     .locals 0
 
     and-int/lit8 p2, p2, 0x1
@@ -62,7 +57,9 @@
     move-object p1, p3
 
     :cond_0
-    if-eqz p0, :cond_2
+    const-string p2, "$this$viewModels"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_1
 
@@ -74,14 +71,7 @@
     invoke-direct {p1, p0}, Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;-><init>(Landroidx/activity/ComponentActivity;)V
 
     :goto_0
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw p3
-
-    :cond_2
-    const-string p0, "$this$viewModels"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
     throw p3
 .end method
diff --git a/com.discord/smali/androidx/activity/OnBackPressedDispatcherKt.smali b/com.discord/smali/androidx/activity/OnBackPressedDispatcherKt.smali
index 1863bd30bb..5f1551ac2a 100644
--- a/com.discord/smali/androidx/activity/OnBackPressedDispatcherKt.smali
+++ b/com.discord/smali/androidx/activity/OnBackPressedDispatcherKt.smali
@@ -21,11 +21,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addCallback"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "onBackPressed"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/activity/OnBackPressedDispatcherKt$addCallback$callback$1;
 
@@ -42,20 +44,6 @@
 
     :goto_0
     return-object v0
-
-    :cond_1
-    const-string p0, "onBackPressed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$addCallback"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic addCallback$default(Landroidx/activity/OnBackPressedDispatcher;Landroidx/lifecycle/LifecycleOwner;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/activity/OnBackPressedCallback;
diff --git a/com.discord/smali/androidx/activity/R$attr.smali b/com.discord/smali/androidx/activity/R$attr.smali
index f4f00468ff..8c5b489d27 100644
--- a/com.discord/smali/androidx/activity/R$attr.smali
+++ b/com.discord/smali/androidx/activity/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali
index 37ebb8582d..1767034f50 100644
--- a/com.discord/smali/androidx/activity/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$id.smali b/com.discord/smali/androidx/activity/R$id.smali
index 2e08efcb8b..02bafc2661 100644
--- a/com.discord/smali/androidx/activity/R$id.smali
+++ b/com.discord/smali/androidx/activity/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index d5c0a4fc7d..78d278b83d 100644
--- a/com.discord/smali/androidx/activity/R$string.smali
+++ b/com.discord/smali/androidx/activity/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$style.smali b/com.discord/smali/androidx/activity/R$style.smali
index c61ec5dd95..b05657e5af 100644
--- a/com.discord/smali/androidx/activity/R$style.smali
+++ b/com.discord/smali/androidx/activity/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$styleable.smali b/com.discord/smali/androidx/activity/R$styleable.smali
index ef115c3b98..1f67464ec8 100644
--- a/com.discord/smali/androidx/activity/R$styleable.smali
+++ b/com.discord/smali/androidx/activity/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/activity/ktx/R$attr.smali b/com.discord/smali/androidx/activity/ktx/R$attr.smali
index b5a4b4b088..f0c28d841b 100644
--- a/com.discord/smali/androidx/activity/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$drawable.smali b/com.discord/smali/androidx/activity/ktx/R$drawable.smali
index 3336c3f13f..4fff965aae 100644
--- a/com.discord/smali/androidx/activity/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$id.smali b/com.discord/smali/androidx/activity/ktx/R$id.smali
index 1220b9c134..5db559bfa3 100644
--- a/com.discord/smali/androidx/activity/ktx/R$id.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$string.smali b/com.discord/smali/androidx/activity/ktx/R$string.smali
index de51411a60..b2ca16817e 100644
--- a/com.discord/smali/androidx/activity/ktx/R$string.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$style.smali b/com.discord/smali/androidx/activity/ktx/R$style.smali
index 83d0a4e7c7..891d2bc8c3 100644
--- a/com.discord/smali/androidx/activity/ktx/R$style.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$styleable.smali b/com.discord/smali/androidx/activity/ktx/R$styleable.smali
index 57de50a06b..15ff70b48e 100644
--- a/com.discord/smali/androidx/activity/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/appcompat/R$attr.smali b/com.discord/smali/androidx/appcompat/R$attr.smali
index 84378ec622..d2590d9728 100644
--- a/com.discord/smali/androidx/appcompat/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/R$attr.smali
@@ -408,167 +408,167 @@
 
 .field public static final ratingBarStyleSmall:I = 0x7f04043f
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final showText:I = 0x7f040492
+.field public static final showText:I = 0x7f040484
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final textLocale:I = 0x7f040514
+.field public static final textLocale:I = 0x7f040506
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme:I = 0x7f040509
 
-.field public static final thickness:I = 0x7f040543
+.field public static final thickness:I = 0x7f040535
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final tint:I = 0x7f040551
+.field public static final tint:I = 0x7f040543
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final title:I = 0x7f040553
+.field public static final title:I = 0x7f040545
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final track:I = 0x7f04056a
+.field public static final track:I = 0x7f04055c
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final windowActionBar:I = 0x7f0405a1
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final windowNoTitle:I = 0x7f0405aa
+.field public static final windowNoTitle:I = 0x7f04059c
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index c33360d0be..8bd1c93486 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -202,33 +202,33 @@
 
 .field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index 687c3d4cd6..17c94f7b68 100644
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@@ -128,175 +128,175 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index 469a63c985..2d58d86294 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -68,9 +68,9 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f120020
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$style.smali b/com.discord/smali/androidx/appcompat/R$style.smali
index a78bbb77ba..43be782ea2 100644
--- a/com.discord/smali/androidx/appcompat/R$style.smali
+++ b/com.discord/smali/androidx/appcompat/R$style.smali
@@ -562,155 +562,155 @@
 
 .field public static final Theme_AppCompat_NoActionBar:I = 0x7f130264
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_TextView:I = 0x7f1303dd
+.field public static final Widget_AppCompat_TextView:I = 0x7f1303dc
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$styleable.smali b/com.discord/smali/androidx/appcompat/R$styleable.smali
index b93e03e8cf..87a4681d09 100644
--- a/com.discord/smali/androidx/appcompat/R$styleable.smali
+++ b/com.discord/smali/androidx/appcompat/R$styleable.smali
@@ -1169,7 +1169,7 @@
 
     new-array v4, v0, [I
 
-    const v5, 0x7f0404af
+    const v5, 0x7f0404a1
 
     aput v5, v4, v3
 
@@ -1282,10 +1282,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1294,8 +1294,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1312,8 +1312,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -1343,17 +1343,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_9
@@ -1388,8 +1388,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_b
@@ -1487,38 +1487,38 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_c
@@ -1544,8 +1544,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_f
@@ -1569,7 +1569,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_11
@@ -1604,7 +1604,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_14
@@ -1654,8 +1654,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_18
@@ -1668,7 +1668,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_19
@@ -1698,11 +1698,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_1c
@@ -1729,17 +1729,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_1f
@@ -1758,8 +1758,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_20
@@ -1782,18 +1782,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_21
@@ -1802,7 +1802,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_22
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali
index fdfe50188b..37efeade01 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali
@@ -1876,7 +1876,7 @@
     :cond_3
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context;
 
-    const-string v3, "window"
+    const-string/jumbo v3, "window"
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -2795,7 +2795,7 @@
 
     const-string v4, "AppCompatDelegate"
 
-    const-string v6, "updateForNightMode. Calling applyOverrideConfiguration() failed with an exception. Will fall back to using Resources.updateConfiguration()"
+    const-string/jumbo v6, "updateForNightMode. Calling applyOverrideConfiguration() failed with an exception. Will fall back to using Resources.updateConfiguration()"
 
     invoke-static {v4, v6, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
@@ -3173,7 +3173,7 @@
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context;
 
-    const-string v1, "window"
+    const-string/jumbo v1, "window"
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali b/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali
index 6c7fecd442..d21621647f 100644
--- a/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali
+++ b/com.discord/smali/androidx/appcompat/app/AppCompatViewInflater.smali
@@ -251,7 +251,7 @@
 .method private createViewFromTag(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;)Landroid/view/View;
     .locals 4
 
-    const-string v0, "view"
+    const-string/jumbo v0, "view"
 
     invoke-virtual {p2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali
index 75f9de642f..8cb968661d 100644
--- a/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali
+++ b/com.discord/smali/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.smali
@@ -507,7 +507,7 @@
 
     move-result-object p1
 
-    const-string v3, "vector"
+    const-string/jumbo v3, "vector"
 
     invoke-virtual {p1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/androidx/appcompat/resources/R$attr.smali b/com.discord/smali/androidx/appcompat/resources/R$attr.smali
index e22abd306f..f8703b796f 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
index c55ab5d0a1..a5fe54bc04 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
@@ -16,29 +16,29 @@
 # static fields
 .field public static final abc_vector_test:I = 0x7f080087
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$id.smali b/com.discord/smali/androidx/appcompat/resources/R$id.smali
index 75dfb0e456..474d588972 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$string.smali b/com.discord/smali/androidx/appcompat/resources/R$string.smali
index 49a490a2de..1aaec3dfd9 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$style.smali b/com.discord/smali/androidx/appcompat/resources/R$style.smali
index 0d3c17f87d..8c60871bf5 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$style.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$styleable.smali b/com.discord/smali/androidx/appcompat/resources/R$styleable.smali
index 3380202ea8..9b2ea5d10e 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$styleable.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$styleable.smali
@@ -277,7 +277,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_6
diff --git a/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali b/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali
index fa26cf53e3..6e35fb115c 100644
--- a/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali
+++ b/com.discord/smali/androidx/appcompat/view/menu/MenuPopupHelper.smali
@@ -204,7 +204,7 @@
 
     iget-object v0, p0, Landroidx/appcompat/view/menu/MenuPopupHelper;->mContext:Landroid/content/Context;
 
-    const-string v1, "window"
+    const-string/jumbo v1, "window"
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali
index 7f6b6124e6..2cf37eadf9 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$PersistHistoryAsyncTask.smali
@@ -137,7 +137,7 @@
 
     invoke-interface {v7, v6, v11, v12}, Lorg/xmlpull/v1/XmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
 
-    const-string v11, "weight"
+    const-string/jumbo v11, "weight"
 
     iget v10, v10, Landroidx/appcompat/widget/ActivityChooserModel$HistoricalRecord;->weight:F
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali
index f63a5bb9f5..641719eea0 100644
--- a/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ActivityChooserModel.smali
@@ -636,7 +636,7 @@
 
     move-result-wide v7
 
-    const-string v9, "weight"
+    const-string/jumbo v9, "weight"
 
     invoke-interface {v2, v6, v9}, Lorg/xmlpull/v1/XmlPullParser;->getAttributeValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/ResourceManagerInternal.smali b/com.discord/smali/androidx/appcompat/widget/ResourceManagerInternal.smali
index 34fdc7bee8..b08a9fd425 100644
--- a/com.discord/smali/androidx/appcompat/widget/ResourceManagerInternal.smali
+++ b/com.discord/smali/androidx/appcompat/widget/ResourceManagerInternal.smali
@@ -680,7 +680,7 @@
 
     invoke-direct {v0}, Landroidx/appcompat/widget/ResourceManagerInternal$VdcInflateDelegate;-><init>()V
 
-    const-string v1, "vector"
+    const-string/jumbo v1, "vector"
 
     invoke-direct {p0, v1, v0}, Landroidx/appcompat/widget/ResourceManagerInternal;->addDelegate(Ljava/lang/String;Landroidx/appcompat/widget/ResourceManagerInternal$InflateDelegate;)V
 
diff --git a/com.discord/smali/androidx/appcompat/widget/SearchView.smali b/com.discord/smali/androidx/appcompat/widget/SearchView.smali
index ec8b0453c1..31f6b8086d 100644
--- a/com.discord/smali/androidx/appcompat/widget/SearchView.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SearchView.smali
@@ -628,7 +628,7 @@
 
     const-string p3, "android.speech.extra.LANGUAGE_MODEL"
 
-    const-string v0, "web_search"
+    const-string/jumbo v0, "web_search"
 
     invoke-virtual {p1, p3, v0}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
@@ -690,7 +690,7 @@
     :cond_0
     iget-object p1, p0, Landroidx/appcompat/widget/SearchView;->mUserQuery:Ljava/lang/CharSequence;
 
-    const-string p2, "user_query"
+    const-string/jumbo p2, "user_query"
 
     invoke-virtual {v0, p2, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/CharSequence;)Landroid/content/Intent;
 
diff --git a/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali b/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali
index 7ec2305928..4c3ed94e43 100644
--- a/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali
+++ b/com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali
@@ -714,7 +714,7 @@
 
     const-string v2, "SuggestionsAdapter"
 
-    invoke-static {v1, p1, v2}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, p1, v2}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
 
@@ -830,7 +830,7 @@
 
     const-string p1, "SuggestionsAdapter"
 
-    const-string v1, "unexpected error retrieving valid column from cursor, did the remote process die?"
+    const-string/jumbo v1, "unexpected error retrieving valid column from cursor, did the remote process die?"
 
     invoke-static {p1, v1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
diff --git a/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali b/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali
index 8dad834c98..c43496851e 100644
--- a/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali
+++ b/com.discord/smali/androidx/appcompat/widget/TooltipPopup.smali
@@ -486,7 +486,7 @@
     :cond_0
     iget-object v0, p0, Landroidx/appcompat/widget/TooltipPopup;->mContext:Landroid/content/Context;
 
-    const-string v1, "window"
+    const-string/jumbo v1, "window"
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -555,7 +555,7 @@
 
     iget-object p1, p0, Landroidx/appcompat/widget/TooltipPopup;->mContext:Landroid/content/Context;
 
-    const-string p2, "window"
+    const-string/jumbo p2, "window"
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
index 8949f387f4..64221ee74b 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 9e2f6f1888..af384df9a1 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index 09c1de2f26..ef836efddf 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index d8214fa356..43cdca4f6c 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
index ea05c4c347..699ff0c09b 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
index 58e408ecb8..beb64ed819 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .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 982e7ca54e..d67c743edd 100644
--- a/com.discord/smali/androidx/browser/R$attr.smali
+++ b/com.discord/smali/androidx/browser/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index 24bde72d39..c871e2f631 100644
--- a/com.discord/smali/androidx/browser/R$drawable.smali
+++ b/com.discord/smali/androidx/browser/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index fc443ff0b7..2e2b8321fc 100644
--- a/com.discord/smali/androidx/browser/R$id.smali
+++ b/com.discord/smali/androidx/browser/R$id.smali
@@ -104,59 +104,59 @@
 
 .field public static final browser_actions_menu_view:I = 0x7f0a0124
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 6fd88ca0c9..5c53754e38 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final copy_toast_msg:I = 0x7f1204dd
+.field public static final copy_toast_msg:I = 0x7f1204df
 
-.field public static final fallback_menu_item_copy_link:I = 0x7f12069c
+.field public static final fallback_menu_item_copy_link:I = 0x7f12069e
 
-.field public static final fallback_menu_item_open_in_browser:I = 0x7f12069d
+.field public static final fallback_menu_item_open_in_browser:I = 0x7f12069f
 
-.field public static final fallback_menu_item_share_link:I = 0x7f12069e
+.field public static final fallback_menu_item_share_link:I = 0x7f1206a0
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$style.smali b/com.discord/smali/androidx/browser/R$style.smali
index a365bb764c..f99164cd8a 100644
--- a/com.discord/smali/androidx/browser/R$style.smali
+++ b/com.discord/smali/androidx/browser/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$styleable.smali b/com.discord/smali/androidx/browser/R$styleable.smali
index 8725c47675..281140f661 100644
--- a/com.discord/smali/androidx/browser/R$styleable.smali
+++ b/com.discord/smali/androidx/browser/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali
index 8d309c7d33..e56c4c505a 100644
--- a/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali
+++ b/com.discord/smali/androidx/browser/browseractions/BrowserActionsFallbackMenuUi$1.smali
@@ -57,7 +57,7 @@
 
     move-result-object v1
 
-    const-string v2, "url"
+    const-string/jumbo v2, "url"
 
     invoke-static {v2, v1}, Landroid/content/ClipData;->newPlainText(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Landroid/content/ClipData;
 
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali
index 7050b9012e..10928e5ed7 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient$2.smali
@@ -1,11 +1,11 @@
 .class public Landroidx/browser/customtabs/CustomTabsClient$2;
-.super Ld0/a/a/a$a;
+.super Le0/a/a/a$a;
 .source "CustomTabsClient.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/browser/customtabs/CustomTabsClient;->createCallbackWrapper(Landroidx/browser/customtabs/CustomTabsCallback;)Ld0/a/a/a$a;
+    value = Landroidx/browser/customtabs/CustomTabsClient;->createCallbackWrapper(Landroidx/browser/customtabs/CustomTabsCallback;)Le0/a/a/a$a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -30,7 +30,7 @@
 
     iput-object p2, p0, Landroidx/browser/customtabs/CustomTabsClient$2;->val$callback:Landroidx/browser/customtabs/CustomTabsCallback;
 
-    invoke-direct {p0}, Ld0/a/a/a$a;-><init>()V
+    invoke-direct {p0}, Le0/a/a/a$a;-><init>()V
 
     new-instance p1, Landroid/os/Handler;
 
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali
index 1cd7f86819..cc02b8247e 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsClient.smali
@@ -6,18 +6,18 @@
 # instance fields
 .field public final mApplicationContext:Landroid/content/Context;
 
-.field public final mService:Ld0/a/a/b;
+.field public final mService:Le0/a/a/b;
 
 .field public final mServiceComponentName:Landroid/content/ComponentName;
 
 
 # direct methods
-.method public constructor <init>(Ld0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
+.method public constructor <init>(Le0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Ld0/a/a/b;
+    iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Le0/a/a/b;
 
     iput-object p2, p0, Landroidx/browser/customtabs/CustomTabsClient;->mServiceComponentName:Landroid/content/ComponentName;
 
@@ -110,7 +110,7 @@
     return v0
 .end method
 
-.method private createCallbackWrapper(Landroidx/browser/customtabs/CustomTabsCallback;)Ld0/a/a/a$a;
+.method private createCallbackWrapper(Landroidx/browser/customtabs/CustomTabsCallback;)Le0/a/a/a$a;
     .locals 1
     .param p1    # Landroidx/browser/customtabs/CustomTabsCallback;
         .annotation build Landroidx/annotation/Nullable;
@@ -341,7 +341,7 @@
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0, p1}, Landroidx/browser/customtabs/CustomTabsClient;->createCallbackWrapper(Landroidx/browser/customtabs/CustomTabsCallback;)Ld0/a/a/a$a;
+    invoke-direct {p0, p1}, Landroidx/browser/customtabs/CustomTabsClient;->createCallbackWrapper(Landroidx/browser/customtabs/CustomTabsCallback;)Le0/a/a/a$a;
 
     move-result-object p1
 
@@ -358,18 +358,18 @@
 
     invoke-virtual {v1, v2, p2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
-    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Ld0/a/a/b;
+    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Le0/a/a/b;
 
-    invoke-interface {v2, p1, v1}, Ld0/a/a/b;->newSessionWithExtras(Ld0/a/a/a;Landroid/os/Bundle;)Z
+    invoke-interface {v2, p1, v1}, Le0/a/a/b;->newSessionWithExtras(Le0/a/a/a;Landroid/os/Bundle;)Z
 
     move-result v1
 
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Ld0/a/a/b;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Le0/a/a/b;
 
-    invoke-interface {v1, p1}, Ld0/a/a/b;->newSession(Ld0/a/a/a;)Z
+    invoke-interface {v1, p1}, Le0/a/a/b;->newSession(Le0/a/a/a;)Z
 
     move-result v1
     :try_end_0
@@ -383,11 +383,11 @@
     :cond_1
     new-instance v0, Landroidx/browser/customtabs/CustomTabsSession;
 
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Ld0/a/a/b;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Le0/a/a/b;
 
     iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsClient;->mServiceComponentName:Landroid/content/ComponentName;
 
-    invoke-direct {v0, v1, p1, v2, p2}, Landroidx/browser/customtabs/CustomTabsSession;-><init>(Ld0/a/a/b;Ld0/a/a/a;Landroid/content/ComponentName;Landroid/app/PendingIntent;)V
+    invoke-direct {v0, v1, p1, v2, p2}, Landroidx/browser/customtabs/CustomTabsSession;-><init>(Le0/a/a/b;Le0/a/a/a;Landroid/content/ComponentName;Landroid/app/PendingIntent;)V
 
     :catch_0
     return-object v0
@@ -439,9 +439,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Ld0/a/a/b;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Le0/a/a/b;
 
-    invoke-interface {v0, p1, p2}, Ld0/a/a/b;->extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+    invoke-interface {v0, p1, p2}, Le0/a/a/b;->extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
 
     move-result-object p1
     :try_end_0
@@ -499,9 +499,9 @@
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Ld0/a/a/b;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsClient;->mService:Le0/a/a/b;
 
-    invoke-interface {v0, p1, p2}, Ld0/a/a/b;->warmup(J)Z
+    invoke-interface {v0, p1, p2}, Le0/a/a/b;->warmup(J)Z
 
     move-result p1
     :try_end_0
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali
index a4bedbec45..58fb8d601c 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsService$1.smali
@@ -1,5 +1,5 @@
 .class public Landroidx/browser/customtabs/CustomTabsService$1;
-.super Ld0/a/a/b$a;
+.super Le0/a/a/b$a;
 .source "CustomTabsService.java"
 
 
@@ -24,7 +24,7 @@
 
     iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsService$1;->this$0:Landroidx/browser/customtabs/CustomTabsService;
 
-    invoke-direct {p0}, Ld0/a/a/b$a;-><init>()V
+    invoke-direct {p0}, Le0/a/a/b$a;-><init>()V
 
     return-void
 .end method
@@ -58,9 +58,9 @@
     return-object v1
 .end method
 
-.method private newSessionInternal(Ld0/a/a/a;Landroid/app/PendingIntent;)Z
+.method private newSessionInternal(Le0/a/a/a;Landroid/app/PendingIntent;)Z
     .locals 4
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -71,14 +71,14 @@
 
     new-instance v0, Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    invoke-direct {v0, p1, p2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v0, p1, p2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     const/4 p2, 0x0
 
     :try_start_0
-    new-instance v1, Le0/a/a/a;
+    new-instance v1, Lf0/a/a/a;
 
-    invoke-direct {v1, p0, v0}, Le0/a/a/a;-><init>(Landroidx/browser/customtabs/CustomTabsService$1;Landroidx/browser/customtabs/CustomTabsSessionToken;)V
+    invoke-direct {v1, p0, v0}, Lf0/a/a/a;-><init>(Landroidx/browser/customtabs/CustomTabsService$1;Landroidx/browser/customtabs/CustomTabsSessionToken;)V
 
     iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsService$1;->this$0:Landroidx/browser/customtabs/CustomTabsService;
 
@@ -169,9 +169,9 @@
     return-void
 .end method
 
-.method public mayLaunchUrl(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
+.method public mayLaunchUrl(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
     .locals 3
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
     .end param
@@ -190,7 +190,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Ld0/a/a/a;",
+            "Le0/a/a/a;",
             "Landroid/net/Uri;",
             "Landroid/os/Bundle;",
             "Ljava/util/List<",
@@ -207,7 +207,7 @@
 
     move-result-object v2
 
-    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     invoke-virtual {v0, v1, p2, p3, p4}, Landroidx/browser/customtabs/CustomTabsService;->mayLaunchUrl(Landroidx/browser/customtabs/CustomTabsSessionToken;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
 
@@ -216,25 +216,25 @@
     return p1
 .end method
 
-.method public newSession(Ld0/a/a/a;)Z
+.method public newSession(Le0/a/a/a;)Z
     .locals 1
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, p1, v0}, Landroidx/browser/customtabs/CustomTabsService$1;->newSessionInternal(Ld0/a/a/a;Landroid/app/PendingIntent;)Z
+    invoke-direct {p0, p1, v0}, Landroidx/browser/customtabs/CustomTabsService$1;->newSessionInternal(Le0/a/a/a;Landroid/app/PendingIntent;)Z
 
     move-result p1
 
     return p1
 .end method
 
-.method public newSessionWithExtras(Ld0/a/a/a;Landroid/os/Bundle;)Z
+.method public newSessionWithExtras(Le0/a/a/a;Landroid/os/Bundle;)Z
     .locals 0
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -247,16 +247,16 @@
 
     move-result-object p2
 
-    invoke-direct {p0, p1, p2}, Landroidx/browser/customtabs/CustomTabsService$1;->newSessionInternal(Ld0/a/a/a;Landroid/app/PendingIntent;)Z
+    invoke-direct {p0, p1, p2}, Landroidx/browser/customtabs/CustomTabsService$1;->newSessionInternal(Le0/a/a/a;Landroid/app/PendingIntent;)Z
 
     move-result p1
 
     return p1
 .end method
 
-.method public postMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
+.method public postMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
     .locals 3
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -277,7 +277,7 @@
 
     move-result-object v2
 
-    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     invoke-virtual {v0, v1, p2, p3}, Landroidx/browser/customtabs/CustomTabsService;->postMessage(Landroidx/browser/customtabs/CustomTabsSessionToken;Ljava/lang/String;Landroid/os/Bundle;)I
 
@@ -286,9 +286,9 @@
     return p1
 .end method
 
-.method public receiveFile(Ld0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
+.method public receiveFile(Le0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
     .locals 3
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -309,7 +309,7 @@
 
     move-result-object v2
 
-    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     invoke-virtual {v0, v1, p2, p3, p4}, Landroidx/browser/customtabs/CustomTabsService;->receiveFile(Landroidx/browser/customtabs/CustomTabsSessionToken;Landroid/net/Uri;ILandroid/os/Bundle;)Z
 
@@ -318,9 +318,9 @@
     return p1
 .end method
 
-.method public requestPostMessageChannel(Ld0/a/a/a;Landroid/net/Uri;)Z
+.method public requestPostMessageChannel(Le0/a/a/a;Landroid/net/Uri;)Z
     .locals 3
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -335,7 +335,7 @@
 
     const/4 v2, 0x0
 
-    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     invoke-virtual {v0, v1, p2}, Landroidx/browser/customtabs/CustomTabsService;->requestPostMessageChannel(Landroidx/browser/customtabs/CustomTabsSessionToken;Landroid/net/Uri;)Z
 
@@ -344,9 +344,9 @@
     return p1
 .end method
 
-.method public requestPostMessageChannelWithExtras(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
+.method public requestPostMessageChannelWithExtras(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
     .locals 2
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -367,7 +367,7 @@
 
     move-result-object p3
 
-    invoke-direct {v1, p1, p3}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v1, p1, p3}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     invoke-virtual {v0, v1, p2}, Landroidx/browser/customtabs/CustomTabsService;->requestPostMessageChannel(Landroidx/browser/customtabs/CustomTabsSessionToken;Landroid/net/Uri;)Z
 
@@ -376,9 +376,9 @@
     return p1
 .end method
 
-.method public updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
+.method public updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
     .locals 3
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -395,7 +395,7 @@
 
     move-result-object v2
 
-    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     invoke-virtual {v0, v1, p2}, Landroidx/browser/customtabs/CustomTabsService;->updateVisuals(Landroidx/browser/customtabs/CustomTabsSessionToken;Landroid/os/Bundle;)Z
 
@@ -404,9 +404,9 @@
     return p1
 .end method
 
-.method public validateRelationship(Ld0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
+.method public validateRelationship(Le0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
     .locals 3
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -427,7 +427,7 @@
 
     move-result-object v2
 
-    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v1, p1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     invoke-virtual {v0, v1, p2, p3, p4}, Landroidx/browser/customtabs/CustomTabsService;->validateRelationship(Landroidx/browser/customtabs/CustomTabsSessionToken;ILandroid/net/Uri;Landroid/os/Bundle;)Z
 
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali
index c9d1494dd2..3b4bf7ae2b 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsService.smali
@@ -44,7 +44,7 @@
 
 
 # instance fields
-.field public mBinder:Ld0/a/a/b$a;
+.field public mBinder:Le0/a/a/b$a;
 
 .field public final mDeathRecipientMap:Landroidx/collection/SimpleArrayMap;
     .annotation system Ldalvik/annotation/Signature;
@@ -74,7 +74,7 @@
 
     invoke-direct {v0, p0}, Landroidx/browser/customtabs/CustomTabsService$1;-><init>(Landroidx/browser/customtabs/CustomTabsService;)V
 
-    iput-object v0, p0, Landroidx/browser/customtabs/CustomTabsService;->mBinder:Ld0/a/a/b$a;
+    iput-object v0, p0, Landroidx/browser/customtabs/CustomTabsService;->mBinder:Le0/a/a/b$a;
 
     return-void
 .end method
@@ -204,7 +204,7 @@
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    iget-object p1, p0, Landroidx/browser/customtabs/CustomTabsService;->mBinder:Ld0/a/a/b$a;
+    iget-object p1, p0, Landroidx/browser/customtabs/CustomTabsService;->mBinder:Le0/a/a/b$a;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali
index f54acc5375..ac59f0faa6 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection$1.smali
@@ -19,12 +19,12 @@
 
 
 # direct methods
-.method public constructor <init>(Landroidx/browser/customtabs/CustomTabsServiceConnection;Ld0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
+.method public constructor <init>(Landroidx/browser/customtabs/CustomTabsServiceConnection;Le0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
     .locals 0
 
     iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsServiceConnection$1;->this$0:Landroidx/browser/customtabs/CustomTabsServiceConnection;
 
-    invoke-direct {p0, p2, p3, p4}, Landroidx/browser/customtabs/CustomTabsClient;-><init>(Ld0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
+    invoke-direct {p0, p2, p3, p4}, Landroidx/browser/customtabs/CustomTabsClient;-><init>(Le0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali
index 97b7b90a35..76699c545a 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsServiceConnection.smali
@@ -68,13 +68,13 @@
 
     new-instance v0, Landroidx/browser/customtabs/CustomTabsServiceConnection$1;
 
-    invoke-static {p2}, Ld0/a/a/b$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/b;
+    invoke-static {p2}, Le0/a/a/b$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/b;
 
     move-result-object p2
 
     iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsServiceConnection;->mApplicationContext:Landroid/content/Context;
 
-    invoke-direct {v0, p0, p2, p1, v1}, Landroidx/browser/customtabs/CustomTabsServiceConnection$1;-><init>(Landroidx/browser/customtabs/CustomTabsServiceConnection;Ld0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
+    invoke-direct {v0, p0, p2, p1, v1}, Landroidx/browser/customtabs/CustomTabsServiceConnection$1;-><init>(Landroidx/browser/customtabs/CustomTabsServiceConnection;Le0/a/a/b;Landroid/content/ComponentName;Landroid/content/Context;)V
 
     invoke-virtual {p0, p1, v0}, Landroidx/browser/customtabs/CustomTabsServiceConnection;->onCustomTabsServiceConnected(Landroid/content/ComponentName;Landroidx/browser/customtabs/CustomTabsClient;)V
 
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSession$MockSession.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSession$MockSession.smali
index 4118c3ccc5..7c6ac2d3ad 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSession$MockSession.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSession$MockSession.smali
@@ -1,5 +1,5 @@
 .class public Landroidx/browser/customtabs/CustomTabsSession$MockSession;
-.super Ld0/a/a/b$a;
+.super Le0/a/a/b$a;
 .source "CustomTabsSession.java"
 
 
@@ -18,7 +18,7 @@
 .method public constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Ld0/a/a/b$a;-><init>()V
+    invoke-direct {p0}, Le0/a/a/b$a;-><init>()V
 
     return-void
 .end method
@@ -38,12 +38,12 @@
     return-object p1
 .end method
 
-.method public mayLaunchUrl(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
+.method public mayLaunchUrl(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Ld0/a/a/a;",
+            "Le0/a/a/a;",
             "Landroid/net/Uri;",
             "Landroid/os/Bundle;",
             "Ljava/util/List<",
@@ -63,7 +63,7 @@
     return p1
 .end method
 
-.method public newSession(Ld0/a/a/a;)Z
+.method public newSession(Le0/a/a/a;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -76,7 +76,7 @@
     return p1
 .end method
 
-.method public newSessionWithExtras(Ld0/a/a/a;Landroid/os/Bundle;)Z
+.method public newSessionWithExtras(Le0/a/a/a;Landroid/os/Bundle;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -89,7 +89,7 @@
     return p1
 .end method
 
-.method public postMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
+.method public postMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -102,7 +102,7 @@
     return p1
 .end method
 
-.method public receiveFile(Ld0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
+.method public receiveFile(Le0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -115,7 +115,7 @@
     return p1
 .end method
 
-.method public requestPostMessageChannel(Ld0/a/a/a;Landroid/net/Uri;)Z
+.method public requestPostMessageChannel(Le0/a/a/a;Landroid/net/Uri;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -128,7 +128,7 @@
     return p1
 .end method
 
-.method public requestPostMessageChannelWithExtras(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
+.method public requestPostMessageChannelWithExtras(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -141,7 +141,7 @@
     return p1
 .end method
 
-.method public updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
+.method public updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -154,7 +154,7 @@
     return p1
 .end method
 
-.method public validateRelationship(Ld0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
+.method public validateRelationship(Le0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali
index 5b4efd8c6f..46ab5f2c28 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSession.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field public final mCallback:Ld0/a/a/a;
+.field public final mCallback:Le0/a/a/a;
 
 .field public final mComponentName:Landroid/content/ComponentName;
 
@@ -28,11 +28,11 @@
 
 .field public final mLock:Ljava/lang/Object;
 
-.field public final mService:Ld0/a/a/b;
+.field public final mService:Le0/a/a/b;
 
 
 # direct methods
-.method public constructor <init>(Ld0/a/a/b;Ld0/a/a/a;Landroid/content/ComponentName;Landroid/app/PendingIntent;)V
+.method public constructor <init>(Le0/a/a/b;Le0/a/a/a;Landroid/content/ComponentName;Landroid/app/PendingIntent;)V
     .locals 1
     .param p4    # Landroid/app/PendingIntent;
         .annotation build Landroidx/annotation/Nullable;
@@ -47,9 +47,9 @@
 
     iput-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mLock:Ljava/lang/Object;
 
-    iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iput-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iput-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
     iput-object p3, p0, Landroidx/browser/customtabs/CustomTabsSession;->mComponentName:Landroid/content/ComponentName;
 
@@ -118,7 +118,7 @@
 
     const/4 v3, 0x0
 
-    invoke-direct {v0, v1, v2, p0, v3}, Landroidx/browser/customtabs/CustomTabsSession;-><init>(Ld0/a/a/b;Ld0/a/a/a;Landroid/content/ComponentName;Landroid/app/PendingIntent;)V
+    invoke-direct {v0, v1, v2, p0, v3}, Landroidx/browser/customtabs/CustomTabsSession;-><init>(Le0/a/a/b;Le0/a/a/a;Landroid/content/ComponentName;Landroid/app/PendingIntent;)V
 
     return-object v0
 .end method
@@ -128,7 +128,7 @@
 .method public getBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
     invoke-interface {v0}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
 
@@ -185,11 +185,11 @@
     move-result-object p2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {v0, v1, p1, p2, p3}, Ld0/a/a/b;->mayLaunchUrl(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
+    invoke-interface {v0, v1, p1, p2, p3}, Le0/a/a/b;->mayLaunchUrl(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
 
     move-result p1
     :try_end_0
@@ -223,11 +223,11 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {v1, v2, p1, p2}, Ld0/a/a/b;->postMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
+    invoke-interface {v1, v2, p1, p2}, Le0/a/a/b;->postMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
 
     move-result p1
     :try_end_0
@@ -275,11 +275,11 @@
     move-result-object p3
 
     :try_start_0
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {v0, v1, p1, p2, p3}, Ld0/a/a/b;->receiveFile(Ld0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
+    invoke-interface {v0, v1, p1, p2, p3}, Le0/a/a/b;->receiveFile(Le0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
 
     move-result p1
     :try_end_0
@@ -305,9 +305,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
     const/4 v2, 0x0
 
@@ -315,18 +315,18 @@
 
     move-result-object v2
 
-    invoke-interface {v0, v1, p1, v2}, Ld0/a/a/b;->requestPostMessageChannelWithExtras(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
+    invoke-interface {v0, v1, p1, v2}, Le0/a/a/b;->requestPostMessageChannelWithExtras(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
 
     move-result p1
 
     return p1
 
     :cond_0
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {v0, v1, p1}, Ld0/a/a/b;->requestPostMessageChannel(Ld0/a/a/a;Landroid/net/Uri;)Z
+    invoke-interface {v0, v1, p1}, Le0/a/a/b;->requestPostMessageChannel(Le0/a/a/a;Landroid/net/Uri;)Z
 
     move-result p1
     :try_end_0
@@ -374,11 +374,11 @@
     invoke-direct {p0, v0}, Landroidx/browser/customtabs/CustomTabsSession;->addIdToBundle(Landroid/os/Bundle;)V
 
     :try_start_0
-    iget-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {p2, v0, p1}, Ld0/a/a/b;->updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
+    invoke-interface {p2, v0, p1}, Le0/a/a/b;->updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
 
     move-result p1
     :try_end_0
@@ -426,11 +426,11 @@
     invoke-direct {p0, v0}, Landroidx/browser/customtabs/CustomTabsSession;->addIdToBundle(Landroid/os/Bundle;)V
 
     :try_start_0
-    iget-object p1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object p1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {p1, p2, v0}, Ld0/a/a/b;->updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
+    invoke-interface {p1, p2, v0}, Le0/a/a/b;->updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
 
     move-result p1
     :try_end_0
@@ -484,11 +484,11 @@
     invoke-direct {p0, p1}, Landroidx/browser/customtabs/CustomTabsSession;->addIdToBundle(Landroid/os/Bundle;)V
 
     :try_start_0
-    iget-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object p2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object p3, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object p3, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {p2, p3, p1}, Ld0/a/a/b;->updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
+    invoke-interface {p2, p3, p1}, Le0/a/a/b;->updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
 
     move-result p1
     :try_end_0
@@ -531,11 +531,11 @@
     move-result-object p3
 
     :try_start_0
-    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Ld0/a/a/b;
+    iget-object v1, p0, Landroidx/browser/customtabs/CustomTabsSession;->mService:Le0/a/a/b;
 
-    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Ld0/a/a/a;
+    iget-object v2, p0, Landroidx/browser/customtabs/CustomTabsSession;->mCallback:Le0/a/a/a;
 
-    invoke-interface {v1, v2, p1, p2, p3}, Ld0/a/a/b;->validateRelationship(Ld0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
+    invoke-interface {v1, v2, p1, p2, p3}, Le0/a/a/b;->validateRelationship(Le0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
 
     move-result p1
     :try_end_0
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali
index bfd5d5b68e..fd2a8c8cb6 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    value = Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -45,9 +45,9 @@
     :try_start_0
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken$1;->this$0:Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
-    invoke-interface {v0, p1, p2}, Ld0/a/a/a;->extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-interface {v0, p1, p2}, Le0/a/a/a;->extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -78,9 +78,9 @@
     :try_start_0
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken$1;->this$0:Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
-    invoke-interface {v0, p1, p2}, Ld0/a/a/a;->extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+    invoke-interface {v0, p1, p2}, Le0/a/a/a;->extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
 
     move-result-object p1
     :try_end_0
@@ -110,9 +110,9 @@
     :try_start_0
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken$1;->this$0:Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
-    invoke-interface {v0, p1}, Ld0/a/a/a;->onMessageChannelReady(Landroid/os/Bundle;)V
+    invoke-interface {v0, p1}, Le0/a/a/a;->onMessageChannelReady(Landroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -139,9 +139,9 @@
     :try_start_0
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken$1;->this$0:Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
-    invoke-interface {v0, p1, p2}, Ld0/a/a/a;->onNavigationEvent(ILandroid/os/Bundle;)V
+    invoke-interface {v0, p1, p2}, Le0/a/a/a;->onNavigationEvent(ILandroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -172,9 +172,9 @@
     :try_start_0
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken$1;->this$0:Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
-    invoke-interface {v0, p1, p2}, Ld0/a/a/a;->onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-interface {v0, p1, p2}, Le0/a/a/a;->onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -205,9 +205,9 @@
     :try_start_0
     iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken$1;->this$0:Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, v0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
-    invoke-interface {v0, p1, p2, p3, p4}, Ld0/a/a/a;->onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
+    invoke-interface {v0, p1, p2, p3, p4}, Le0/a/a/a;->onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali
index 2e6fcee4b3..81d0d9501b 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken$MockCallback.smali
@@ -1,5 +1,5 @@
 .class public Landroidx/browser/customtabs/CustomTabsSessionToken$MockCallback;
-.super Ld0/a/a/a$a;
+.super Le0/a/a/a$a;
 .source "CustomTabsSessionToken.java"
 
 
@@ -18,7 +18,7 @@
 .method public constructor <init>()V
     .locals 0
 
-    invoke-direct {p0}, Ld0/a/a/a$a;-><init>()V
+    invoke-direct {p0}, Le0/a/a/a$a;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali
index 49d6a6e3de..d902d86089 100644
--- a/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali
+++ b/com.discord/smali/androidx/browser/customtabs/CustomTabsSessionToken.smali
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field public final mCallbackBinder:Ld0/a/a/a;
+.field public final mCallbackBinder:Le0/a/a/a;
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 .end field
@@ -33,9 +33,9 @@
 
 
 # direct methods
-.method public constructor <init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+.method public constructor <init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
     .locals 0
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
     .end param
@@ -63,7 +63,7 @@
 
     :cond_1
     :goto_0
-    iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iput-object p1, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
     iput-object p2, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mSessionId:Landroid/app/PendingIntent;
 
@@ -97,7 +97,7 @@
 
     const/4 v2, 0x0
 
-    invoke-direct {v0, v1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v0, v1, v2}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     return-object v0
 .end method
@@ -105,7 +105,7 @@
 .method private getCallbackBinderAssertNotNull()Landroid/os/IBinder;
     .locals 2
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
     if-eqz v0, :cond_0
 
@@ -171,14 +171,14 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v0}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
+    invoke-static {v0}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
 
     move-result-object v1
 
     :goto_0
     new-instance v0, Landroidx/browser/customtabs/CustomTabsSessionToken;
 
-    invoke-direct {v0, v1, p0}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Ld0/a/a/a;Landroid/app/PendingIntent;)V
+    invoke-direct {v0, v1, p0}, Landroidx/browser/customtabs/CustomTabsSessionToken;-><init>(Le0/a/a/a;Landroid/app/PendingIntent;)V
 
     return-object v0
 .end method
@@ -271,7 +271,7 @@
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
     if-nez v0, :cond_0
 
@@ -305,7 +305,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
     if-eqz v0, :cond_0
 
@@ -379,7 +379,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Ld0/a/a/a;
+    iget-object v0, p0, Landroidx/browser/customtabs/CustomTabsSessionToken;->mCallbackBinder:Le0/a/a/a;
 
     invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali b/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali
index 0ca463c465..0d546b967a 100644
--- a/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali
+++ b/com.discord/smali/androidx/browser/customtabs/PostMessageService$1.smali
@@ -1,5 +1,5 @@
 .class public Landroidx/browser/customtabs/PostMessageService$1;
-.super Ld0/a/a/c$a;
+.super Le0/a/a/c$a;
 .source "PostMessageService.java"
 
 
@@ -24,16 +24,16 @@
 
     iput-object p1, p0, Landroidx/browser/customtabs/PostMessageService$1;->this$0:Landroidx/browser/customtabs/PostMessageService;
 
-    invoke-direct {p0}, Ld0/a/a/c$a;-><init>()V
+    invoke-direct {p0}, Le0/a/a/c$a;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public onMessageChannelReady(Ld0/a/a/a;Landroid/os/Bundle;)V
+.method public onMessageChannelReady(Le0/a/a/a;Landroid/os/Bundle;)V
     .locals 0
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -47,14 +47,14 @@
         }
     .end annotation
 
-    invoke-interface {p1, p2}, Ld0/a/a/a;->onMessageChannelReady(Landroid/os/Bundle;)V
+    invoke-interface {p1, p2}, Le0/a/a/a;->onMessageChannelReady(Landroid/os/Bundle;)V
 
     return-void
 .end method
 
-.method public onPostMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
+.method public onPostMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 0
-    .param p1    # Ld0/a/a/a;
+    .param p1    # Le0/a/a/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -72,7 +72,7 @@
         }
     .end annotation
 
-    invoke-interface {p1, p2, p3}, Ld0/a/a/a;->onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-interface {p1, p2, p3}, Le0/a/a/a;->onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali b/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali
index da57d8d683..14597b2b29 100644
--- a/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali
+++ b/com.discord/smali/androidx/browser/customtabs/PostMessageService.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public mBinder:Ld0/a/a/c$a;
+.field public mBinder:Le0/a/a/c$a;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0, p0}, Landroidx/browser/customtabs/PostMessageService$1;-><init>(Landroidx/browser/customtabs/PostMessageService;)V
 
-    iput-object v0, p0, Landroidx/browser/customtabs/PostMessageService;->mBinder:Ld0/a/a/c$a;
+    iput-object v0, p0, Landroidx/browser/customtabs/PostMessageService;->mBinder:Le0/a/a/c$a;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
     .annotation build Landroidx/annotation/NonNull;
     .end annotation
 
-    iget-object p1, p0, Landroidx/browser/customtabs/PostMessageService;->mBinder:Ld0/a/a/c$a;
+    iget-object p1, p0, Landroidx/browser/customtabs/PostMessageService;->mBinder:Le0/a/a/c$a;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali b/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali
index 25229b5a8b..e94c23a05e 100644
--- a/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali
+++ b/com.discord/smali/androidx/browser/customtabs/PostMessageServiceConnection.smali
@@ -21,12 +21,12 @@
     .end annotation
 .end field
 
-.field public mService:Ld0/a/a/c;
+.field public mService:Le0/a/a/c;
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final mSessionBinder:Ld0/a/a/a;
+.field public final mSessionBinder:Le0/a/a/a;
 
 
 # direct methods
@@ -51,11 +51,11 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mSessionBinder:Ld0/a/a/a;
+    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mSessionBinder:Le0/a/a/a;
 
     return-void
 
@@ -72,7 +72,7 @@
 .method private isBoundToService()Z
     .locals 1
 
-    iget-object v0, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iget-object v0, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
     if-eqz v0, :cond_0
 
@@ -94,7 +94,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iget-object v0, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
     const/4 v1, 0x0
 
@@ -108,11 +108,11 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v2, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iget-object v2, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
-    iget-object v3, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mSessionBinder:Ld0/a/a/a;
+    iget-object v3, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mSessionBinder:Le0/a/a/a;
 
-    invoke-interface {v2, v3, p1}, Ld0/a/a/c;->onMessageChannelReady(Ld0/a/a/a;Landroid/os/Bundle;)V
+    invoke-interface {v2, v3, p1}, Le0/a/a/c;->onMessageChannelReady(Le0/a/a/a;Landroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -350,11 +350,11 @@
         .end annotation
     .end param
 
-    invoke-static {p2}, Ld0/a/a/c$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/c;
+    invoke-static {p2}, Le0/a/a/c$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
     invoke-virtual {p0}, Landroidx/browser/customtabs/PostMessageServiceConnection;->onPostMessageServiceConnected()V
 
@@ -370,7 +370,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
     invoke-virtual {p0}, Landroidx/browser/customtabs/PostMessageServiceConnection;->onPostMessageServiceDisconnected()V
 
@@ -388,7 +388,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iget-object v0, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
     const/4 v1, 0x0
 
@@ -402,11 +402,11 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v2, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iget-object v2, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
-    iget-object v3, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mSessionBinder:Ld0/a/a/a;
+    iget-object v3, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mSessionBinder:Le0/a/a/a;
 
-    invoke-interface {v2, v3, p1, p2}, Ld0/a/a/c;->onPostMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-interface {v2, v3, p1, p2}, Le0/a/a/c;->onPostMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -470,7 +470,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Ld0/a/a/c;
+    iput-object p1, p0, Landroidx/browser/customtabs/PostMessageServiceConnection;->mService:Le0/a/a/c;
 
     :cond_0
     return-void
diff --git a/com.discord/smali/androidx/browser/trusted/ConnectionHolder$WrapperFactory.smali b/com.discord/smali/androidx/browser/trusted/ConnectionHolder$WrapperFactory.smali
index d39552f67a..6d81f6080a 100644
--- a/com.discord/smali/androidx/browser/trusted/ConnectionHolder$WrapperFactory.smali
+++ b/com.discord/smali/androidx/browser/trusted/ConnectionHolder$WrapperFactory.smali
@@ -32,11 +32,11 @@
 
     new-instance v0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;
 
-    invoke-static {p2}, Ld0/a/a/d/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/d/a;
+    invoke-static {p2}, Le0/a/a/d/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/d/a;
 
     move-result-object p2
 
-    invoke-direct {v0, p2, p1}, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;-><init>(Ld0/a/a/d/a;Landroid/content/ComponentName;)V
+    invoke-direct {v0, p2, p1}, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;-><init>(Le0/a/a/d/a;Landroid/content/ComponentName;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/browser/trusted/ConnectionHolder.smali b/com.discord/smali/androidx/browser/trusted/ConnectionHolder.smali
index b506853c51..f96f374579 100644
--- a/com.discord/smali/androidx/browser/trusted/ConnectionHolder.smali
+++ b/com.discord/smali/androidx/browser/trusted/ConnectionHolder.smali
@@ -269,9 +269,9 @@
         }
     .end annotation
 
-    new-instance v0, Le0/a/b/a;
+    new-instance v0, Lf0/a/b/a;
 
-    invoke-direct {v0, p0}, Le0/a/b/a;-><init>(Landroidx/browser/trusted/ConnectionHolder;)V
+    invoke-direct {v0, p0}, Lf0/a/b/a;-><init>(Landroidx/browser/trusted/ConnectionHolder;)V
 
     invoke-static {v0}, Landroidx/concurrent/futures/CallbackToFutureAdapter;->getFuture(Landroidx/concurrent/futures/CallbackToFutureAdapter$Resolver;)Lf/h/b/a/a/a;
 
diff --git a/com.discord/smali/androidx/browser/trusted/TokenContents.smali b/com.discord/smali/androidx/browser/trusted/TokenContents.smali
index 022e1f5b06..7a28cc979b 100644
--- a/com.discord/smali/androidx/browser/trusted/TokenContents.smali
+++ b/com.discord/smali/androidx/browser/trusted/TokenContents.smali
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    sget-object v0, Le0/a/b/b;->d:Le0/a/b/b;
+    sget-object v0, Lf0/a/b/b;->d:Lf0/a/b/b;
 
     invoke-static {p1, v0}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
 
diff --git a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService$1.smali b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService$1.smali
index 141ff96522..db12abb976 100644
--- a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService$1.smali
+++ b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService$1.smali
@@ -1,5 +1,5 @@
 .class public Landroidx/browser/trusted/TrustedWebActivityService$1;
-.super Ld0/a/a/d/a$a;
+.super Le0/a/a/d/a$a;
 .source "TrustedWebActivityService.java"
 
 
@@ -24,7 +24,7 @@
 
     iput-object p1, p0, Landroidx/browser/trusted/TrustedWebActivityService$1;->this$0:Landroidx/browser/trusted/TrustedWebActivityService;
 
-    invoke-direct {p0}, Ld0/a/a/d/a$a;-><init>()V
+    invoke-direct {p0}, Le0/a/a/d/a$a;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService.smali b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService.smali
index c04713c9ae..d4d42a79e1 100644
--- a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService.smali
+++ b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityService.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field public final mBinder:Ld0/a/a/d/a$a;
+.field public final mBinder:Le0/a/a/d/a$a;
 
 .field public mNotificationManager:Landroid/app/NotificationManager;
 
@@ -42,7 +42,7 @@
 
     invoke-direct {v0, p0}, Landroidx/browser/trusted/TrustedWebActivityService$1;-><init>(Landroidx/browser/trusted/TrustedWebActivityService;)V
 
-    iput-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityService;->mBinder:Ld0/a/a/d/a$a;
+    iput-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityService;->mBinder:Le0/a/a/d/a$a;
 
     return-void
 .end method
@@ -172,7 +172,7 @@
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    iget-object p1, p0, Landroidx/browser/trusted/TrustedWebActivityService;->mBinder:Ld0/a/a/d/a$a;
+    iget-object p1, p0, Landroidx/browser/trusted/TrustedWebActivityService;->mBinder:Le0/a/a/d/a$a;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnection.smali b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnection.smali
index 2d8243f605..19894bc83b 100644
--- a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnection.smali
+++ b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnection.smali
@@ -32,13 +32,13 @@
 # instance fields
 .field public final mComponentName:Landroid/content/ComponentName;
 
-.field public final mService:Ld0/a/a/d/a;
+.field public final mService:Le0/a/a/d/a;
 
 
 # direct methods
-.method public constructor <init>(Ld0/a/a/d/a;Landroid/content/ComponentName;)V
+.method public constructor <init>(Le0/a/a/d/a;Landroid/content/ComponentName;)V
     .locals 0
-    .param p1    # Ld0/a/a/d/a;
+    .param p1    # Le0/a/a/d/a;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Ld0/a/a/d/a;
+    iput-object p1, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Le0/a/a/d/a;
 
     iput-object p2, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mComponentName:Landroid/content/ComponentName;
 
@@ -103,9 +103,9 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Ld0/a/a/d/a;
+    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Le0/a/a/d/a;
 
-    invoke-interface {v0, p1}, Ld0/a/a/d/a;->areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
+    invoke-interface {v0, p1}, Le0/a/a/d/a;->areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -138,9 +138,9 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Ld0/a/a/d/a;
+    iget-object p2, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Le0/a/a/d/a;
 
-    invoke-interface {p2, p1}, Ld0/a/a/d/a;->cancelNotification(Landroid/os/Bundle;)V
+    invoke-interface {p2, p1}, Le0/a/a/d/a;->cancelNotification(Landroid/os/Bundle;)V
 
     return-void
 .end method
@@ -166,9 +166,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Ld0/a/a/d/a;
+    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Le0/a/a/d/a;
 
-    invoke-interface {v0}, Ld0/a/a/d/a;->getActiveNotifications()Landroid/os/Bundle;
+    invoke-interface {v0}, Le0/a/a/d/a;->getActiveNotifications()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -202,9 +202,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Ld0/a/a/d/a;
+    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Le0/a/a/d/a;
 
-    invoke-interface {v0}, Ld0/a/a/d/a;->getSmallIconBitmap()Landroid/os/Bundle;
+    invoke-interface {v0}, Le0/a/a/d/a;->getSmallIconBitmap()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -227,9 +227,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Ld0/a/a/d/a;
+    iget-object v0, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Le0/a/a/d/a;
 
-    invoke-interface {v0}, Ld0/a/a/d/a;->getSmallIconId()I
+    invoke-interface {v0}, Le0/a/a/d/a;->getSmallIconId()I
 
     move-result v0
 
@@ -264,9 +264,9 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Ld0/a/a/d/a;
+    iget-object p2, p0, Landroidx/browser/trusted/TrustedWebActivityServiceConnection;->mService:Le0/a/a/d/a;
 
-    invoke-interface {p2, p1}, Ld0/a/a/d/a;->notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
+    invoke-interface {p2, p1}, Le0/a/a/d/a;->notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
 
     move-result-object p1
 
diff --git a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.smali b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.smali
index cfbdf13383..adc29147c8 100644
--- a/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.smali
+++ b/com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.smali
@@ -233,7 +233,7 @@
 
     const-string p1, "Could not find TWAService for "
 
-    invoke-static {p1, v2, p3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, v2, p3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_6
     return-object v0
@@ -380,9 +380,9 @@
     :cond_1
     new-instance v0, Landroidx/browser/trusted/ConnectionHolder;
 
-    new-instance v1, Le0/a/b/c;
+    new-instance v1, Lf0/a/b/c;
 
-    invoke-direct {v1, p0, p1}, Le0/a/b/c;-><init>(Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;Landroid/net/Uri;)V
+    invoke-direct {v1, p0, p1}, Lf0/a/b/c;-><init>(Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;Landroid/net/Uri;)V
 
     invoke-direct {v0, v1}, Landroidx/browser/trusted/ConnectionHolder;-><init>(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali/androidx/collection/ArrayMapKt.smali b/com.discord/smali/androidx/collection/ArrayMapKt.smali
index e8df1d4c3a..345c569fb5 100644
--- a/com.discord/smali/androidx/collection/ArrayMapKt.smali
+++ b/com.discord/smali/androidx/collection/ArrayMapKt.smali
@@ -41,7 +41,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "pairs"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/ArrayMap;
 
@@ -70,13 +72,4 @@
 
     :cond_0
     return-object v0
-
-    :cond_1
-    const-string p0, "pairs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/collection/ArraySetKt.smali b/com.discord/smali/androidx/collection/ArraySetKt.smali
index 722cc26320..1ba9e77d0e 100644
--- a/com.discord/smali/androidx/collection/ArraySetKt.smali
+++ b/com.discord/smali/androidx/collection/ArraySetKt.smali
@@ -35,7 +35,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string/jumbo v0, "values"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/ArraySet;
 
@@ -60,13 +62,4 @@
 
     :cond_0
     return-object v0
-
-    :cond_1
-    const-string p0, "values"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/collection/LongSparseArrayKt$keyIterator$1.smali b/com.discord/smali/androidx/collection/LongSparseArrayKt$keyIterator$1.smali
index 191ddb3ddf..198072fa5c 100644
--- a/com.discord/smali/androidx/collection/LongSparseArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/collection/LongSparseArrayKt$keyIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/collection/LongSparseArrayKt$keyIterator$1;
-.super Lj0/i/r;
+.super Lk0/j/r;
 .source "LongSparseArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/collection/LongSparseArrayKt;->keyIterator(Landroidx/collection/LongSparseArray;)Lj0/i/r;
+    value = Landroidx/collection/LongSparseArrayKt;->keyIterator(Landroidx/collection/LongSparseArray;)Lk0/j/r;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,7 +33,7 @@
 
     iput-object p1, p0, Landroidx/collection/LongSparseArrayKt$keyIterator$1;->$this_keyIterator:Landroidx/collection/LongSparseArray;
 
-    invoke-direct {p0}, Lj0/i/r;-><init>()V
+    invoke-direct {p0}, Lk0/j/r;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/collection/LongSparseArrayKt$valueIterator$1.smali b/com.discord/smali/androidx/collection/LongSparseArrayKt$valueIterator$1.smali
index ebde46b433..bb9d141a97 100644
--- a/com.discord/smali/androidx/collection/LongSparseArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/collection/LongSparseArrayKt$valueIterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -22,7 +22,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Iterator<",
         "TT;>;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
diff --git a/com.discord/smali/androidx/collection/LongSparseArrayKt.smali b/com.discord/smali/androidx/collection/LongSparseArrayKt.smali
index 1b44908927..3431ad3797 100644
--- a/com.discord/smali/androidx/collection/LongSparseArrayKt.smali
+++ b/com.discord/smali/androidx/collection/LongSparseArrayKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final contains(Landroidx/collection/LongSparseArray;J)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -16,22 +16,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/LongSparseArray;->containsKey(J)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final forEach(Landroidx/collection/LongSparseArray;Lkotlin/jvm/functions/Function2;)V
@@ -52,22 +45,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "receiver$0"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/LongSparseArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroidx/collection/LongSparseArray;->keyAt(I)J
+    invoke-virtual {p0, v1}, Landroidx/collection/LongSparseArray;->keyAt(I)J
 
     move-result-wide v2
 
@@ -75,36 +70,22 @@
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroidx/collection/LongSparseArray;->valueAt(I)Ljava/lang/Object;
+    invoke-virtual {p0, v1}, Landroidx/collection/LongSparseArray;->valueAt(I)Ljava/lang/Object;
 
     move-result-object v3
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getOrDefault(Landroidx/collection/LongSparseArray;JLjava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -115,22 +96,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroidx/collection/LongSparseArray;->get(JLjava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getOrElse(Landroidx/collection/LongSparseArray;JLkotlin/jvm/functions/Function0;)Ljava/lang/Object;
@@ -147,11 +121,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "receiver$0"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
 
@@ -168,24 +144,10 @@
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "defaultValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSize(Landroidx/collection/LongSparseArray;)I
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -196,26 +158,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/LongSparseArray;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroidx/collection/LongSparseArray;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -226,7 +181,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/LongSparseArray;->isEmpty()Z
 
@@ -235,18 +192,9 @@
     xor-int/lit8 p0, p0, 0x1
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final keyIterator(Landroidx/collection/LongSparseArray;)Lj0/i/r;
+.method public static final keyIterator(Landroidx/collection/LongSparseArray;)Lk0/j/r;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -255,26 +203,19 @@
             ">(",
             "Landroidx/collection/LongSparseArray<",
             "TT;>;)",
-            "Lj0/i/r;"
+            "Lk0/j/r;"
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LongSparseArrayKt$keyIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/collection/LongSparseArrayKt$keyIterator$1;-><init>(Landroidx/collection/LongSparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroidx/collection/LongSparseArray;Landroidx/collection/LongSparseArray;)Landroidx/collection/LongSparseArray;
@@ -293,11 +234,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "receiver$0"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LongSparseArray;
 
@@ -318,24 +261,10 @@
     invoke-virtual {v0, p1}, Landroidx/collection/LongSparseArray;->putAll(Landroidx/collection/LongSparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final remove(Landroidx/collection/LongSparseArray;JLjava/lang/Object;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -346,26 +275,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroidx/collection/LongSparseArray;->remove(JLjava/lang/Object;)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroidx/collection/LongSparseArray;JLjava/lang/Object;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -376,20 +298,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final valueIterator(Landroidx/collection/LongSparseArray;)Ljava/util/Iterator;
@@ -406,20 +321,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LongSparseArrayKt$valueIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/collection/LongSparseArrayKt$valueIterator$1;-><init>(Landroidx/collection/LongSparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$1.smali b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$1.smali
index 68f8aa48a3..12cf09a154 100644
--- a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$1.smali
+++ b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/collection/LruCacheKt$lruCache$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "TK;TV;",
         "Ljava/lang/Integer;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,29 +64,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$2.smali b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$2.smali
index 37c7ae8d9a..654a920f70 100644
--- a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$2.smali
+++ b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/collection/LruCacheKt$lruCache$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TK;TV;>;"
     }
@@ -47,7 +47,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,16 +62,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
diff --git a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$3.smali b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$3.smali
index f0f85ad073..8bef60e9e5 100644
--- a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$3.smali
+++ b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$3.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/collection/LruCacheKt$lruCache$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/Boolean;",
         "TK;TV;TV;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x4
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,25 +81,13 @@
         }
     .end annotation
 
-    const/4 p1, 0x0
+    const-string p1, "<anonymous parameter 1>"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string p1, "<anonymous parameter 2>"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p2, "<anonymous parameter 2>"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p2, "<anonymous parameter 1>"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$4.smali b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$4.smali
index e2c9033f43..3fc532ab36 100644
--- a/com.discord/smali/androidx/collection/LruCacheKt$lruCache$4.smali
+++ b/com.discord/smali/androidx/collection/LruCacheKt$lruCache$4.smali
@@ -58,7 +58,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/collection/LruCacheKt$lruCache$4;->$create:Lkotlin/jvm/functions/Function1;
 
@@ -67,15 +69,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public entryRemoved(ZLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
@@ -86,11 +79,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "key"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "oldValue"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/collection/LruCacheKt$lruCache$4;->$onEntryRemoved:Lkotlin/jvm/functions/Function4;
 
@@ -101,20 +96,6 @@
     invoke-interface {v0, p1, p2, p3, p4}, Lkotlin/jvm/functions/Function4;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "oldValue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public sizeOf(Ljava/lang/Object;Ljava/lang/Object;)I
@@ -125,11 +106,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "key"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/collection/LruCacheKt$lruCache$4;->$sizeOf:Lkotlin/jvm/functions/Function2;
 
@@ -144,18 +127,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/collection/LruCacheKt.smali b/com.discord/smali/androidx/collection/LruCacheKt.smali
index 90c2d7f70c..eb8e629f7a 100644
--- a/com.discord/smali/androidx/collection/LruCacheKt.smali
+++ b/com.discord/smali/androidx/collection/LruCacheKt.smali
@@ -30,13 +30,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "sizeOf"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "create"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onEntryRemoved"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LruCacheKt$lruCache$4;
 
@@ -55,27 +59,6 @@
     invoke-direct/range {v1 .. v6}, Landroidx/collection/LruCacheKt$lruCache$4;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "onEntryRemoved"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "create"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "sizeOf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic lruCache$default(ILkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)Landroidx/collection/LruCache;
@@ -110,15 +93,15 @@
 
     const-string p1, "sizeOf"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "create"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "onEntryRemoved"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Landroidx/collection/LruCacheKt$lruCache$4;
 
diff --git a/com.discord/smali/androidx/collection/SparseArrayKt$keyIterator$1.smali b/com.discord/smali/androidx/collection/SparseArrayKt$keyIterator$1.smali
index 3e8b0a4fba..8e9af54c2f 100644
--- a/com.discord/smali/androidx/collection/SparseArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/collection/SparseArrayKt$keyIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/collection/SparseArrayKt$keyIterator$1;
-.super Lj0/i/q;
+.super Lk0/j/q;
 .source "SparseArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/collection/SparseArrayKt;->keyIterator(Landroidx/collection/SparseArrayCompat;)Lj0/i/q;
+    value = Landroidx/collection/SparseArrayKt;->keyIterator(Landroidx/collection/SparseArrayCompat;)Lk0/j/q;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,7 +33,7 @@
 
     iput-object p1, p0, Landroidx/collection/SparseArrayKt$keyIterator$1;->$this_keyIterator:Landroidx/collection/SparseArrayCompat;
 
-    invoke-direct {p0}, Lj0/i/q;-><init>()V
+    invoke-direct {p0}, Lk0/j/q;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/collection/SparseArrayKt$valueIterator$1.smali b/com.discord/smali/androidx/collection/SparseArrayKt$valueIterator$1.smali
index 05c17f218a..90f912e3ed 100644
--- a/com.discord/smali/androidx/collection/SparseArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/collection/SparseArrayKt$valueIterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -22,7 +22,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Iterator<",
         "TT;>;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
diff --git a/com.discord/smali/androidx/collection/SparseArrayKt.smali b/com.discord/smali/androidx/collection/SparseArrayKt.smali
index 67c9832161..149c010dd1 100644
--- a/com.discord/smali/androidx/collection/SparseArrayKt.smali
+++ b/com.discord/smali/androidx/collection/SparseArrayKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final contains(Landroidx/collection/SparseArrayCompat;I)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -16,22 +16,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/collection/SparseArrayCompat;->containsKey(I)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final forEach(Landroidx/collection/SparseArrayCompat;Lkotlin/jvm/functions/Function2;)V
@@ -52,22 +45,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "receiver$0"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/SparseArrayCompat;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroidx/collection/SparseArrayCompat;->keyAt(I)I
+    invoke-virtual {p0, v1}, Landroidx/collection/SparseArrayCompat;->keyAt(I)I
 
     move-result v2
 
@@ -75,36 +70,22 @@
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroidx/collection/SparseArrayCompat;->valueAt(I)Ljava/lang/Object;
+    invoke-virtual {p0, v1}, Landroidx/collection/SparseArrayCompat;->valueAt(I)Ljava/lang/Object;
 
     move-result-object v3
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getOrDefault(Landroidx/collection/SparseArrayCompat;ILjava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -115,22 +96,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/SparseArrayCompat;->get(ILjava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getOrElse(Landroidx/collection/SparseArrayCompat;ILkotlin/jvm/functions/Function0;)Ljava/lang/Object;
@@ -147,11 +121,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "receiver$0"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/collection/SparseArrayCompat;->get(I)Ljava/lang/Object;
 
@@ -168,24 +144,10 @@
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "defaultValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSize(Landroidx/collection/SparseArrayCompat;)I
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -196,26 +158,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/SparseArrayCompat;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroidx/collection/SparseArrayCompat;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -226,7 +181,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/SparseArrayCompat;->isEmpty()Z
 
@@ -235,18 +192,9 @@
     xor-int/lit8 p0, p0, 0x1
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final keyIterator(Landroidx/collection/SparseArrayCompat;)Lj0/i/q;
+.method public static final keyIterator(Landroidx/collection/SparseArrayCompat;)Lk0/j/q;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -255,26 +203,19 @@
             ">(",
             "Landroidx/collection/SparseArrayCompat<",
             "TT;>;)",
-            "Lj0/i/q;"
+            "Lk0/j/q;"
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/SparseArrayKt$keyIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/collection/SparseArrayKt$keyIterator$1;-><init>(Landroidx/collection/SparseArrayCompat;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroidx/collection/SparseArrayCompat;Landroidx/collection/SparseArrayCompat;)Landroidx/collection/SparseArrayCompat;
@@ -293,11 +234,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "receiver$0"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/SparseArrayCompat;
 
@@ -318,24 +261,10 @@
     invoke-virtual {v0, p1}, Landroidx/collection/SparseArrayCompat;->putAll(Landroidx/collection/SparseArrayCompat;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final remove(Landroidx/collection/SparseArrayCompat;ILjava/lang/Object;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -346,26 +275,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/SparseArrayCompat;->remove(ILjava/lang/Object;)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroidx/collection/SparseArrayCompat;ILjava/lang/Object;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -376,20 +298,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/SparseArrayCompat;->put(ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final valueIterator(Landroidx/collection/SparseArrayCompat;)Ljava/util/Iterator;
@@ -406,20 +321,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "receiver$0"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/SparseArrayKt$valueIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/collection/SparseArrayKt$valueIterator$1;-><init>(Landroidx/collection/SparseArrayCompat;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "receiver$0"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/concurrent/futures/AbstractResolvableFuture.smali b/com.discord/smali/androidx/concurrent/futures/AbstractResolvableFuture.smali
index 27d83d1c80..8e3870a74e 100644
--- a/com.discord/smali/androidx/concurrent/futures/AbstractResolvableFuture.smali
+++ b/com.discord/smali/androidx/concurrent/futures/AbstractResolvableFuture.smali
@@ -118,7 +118,7 @@
 
     const-class v2, Landroidx/concurrent/futures/AbstractResolvableFuture;
 
-    const-string v5, "waiters"
+    const-string/jumbo v5, "waiters"
 
     invoke-static {v2, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
@@ -138,7 +138,7 @@
 
     const-class v2, Ljava/lang/Object;
 
-    const-string v7, "value"
+    const-string/jumbo v7, "value"
 
     invoke-static {v0, v2, v7}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
diff --git a/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali b/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali
index 801b11aa35..0b37f75cdf 100644
--- a/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali
+++ b/com.discord/smali/androidx/constraintlayout/solver/LinearSystem.smali
@@ -580,7 +580,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    const-string v1, "x"
+    const-string/jumbo v1, "x"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali
index 0d5c30e71e..da15dd1c98 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/ConstraintSet.smali
@@ -1922,7 +1922,7 @@
     goto :goto_1
 
     :pswitch_39
-    const-string v3, "unused attribute 0x"
+    const-string/jumbo v3, "unused attribute 0x"
 
     invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -2014,8 +2014,6 @@
     :cond_0
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_34
@@ -2098,7 +2096,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    const-string p1, "undefined"
+    const-string/jumbo p1, "undefined"
 
     return-object p1
 
@@ -2137,8 +2135,6 @@
 
     return-object p1
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_6
@@ -3318,7 +3314,7 @@
 
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    const-string p2, "unknown constraint"
+    const-string/jumbo p2, "unknown constraint"
 
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
@@ -3397,8 +3393,6 @@
     :goto_0
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_6
@@ -5488,7 +5482,7 @@
 
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    const-string p2, "unknown constraint"
+    const-string/jumbo p2, "unknown constraint"
 
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
@@ -5534,8 +5528,6 @@
     :goto_0
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_6
@@ -5677,7 +5669,7 @@
 
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    const-string p2, "unknown constraint"
+    const-string/jumbo p2, "unknown constraint"
 
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
@@ -5723,8 +5715,6 @@
     :goto_0
     return-void
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_6
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
index 6dadb2d44b..0af88474ff 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@@ -16,31 +16,31 @@
 # static fields
 .field public static final bottom:I = 0x7f0a011e
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0416
 
-.field public static final invisible:I = 0x7f0a0511
+.field public static final invisible:I = 0x7f0a0517
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final packed:I = 0x7f0a0679
+.field public static final packed:I = 0x7f0a067f
 
-.field public static final parent:I = 0x7f0a067c
+.field public static final parent:I = 0x7f0a0682
 
-.field public static final percent:I = 0x7f0a06aa
+.field public static final percent:I = 0x7f0a06b0
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final spread:I = 0x7f0a0925
+.field public static final spread:I = 0x7f0a0929
 
-.field public static final spread_inside:I = 0x7f0a0926
+.field public static final spread_inside:I = 0x7f0a092a
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final wrap:I = 0x7f0a0ab7
+.field public static final wrap:I = 0x7f0a0abc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
index bb8cb28ce0..1a4bba160f 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
@@ -52,9 +52,9 @@
 
 .field public static final layout_keyline:I = 0x7f04036e
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 7c76375b9c..540c6167d8 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index 22409d1a74..ff2eabb843 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$id.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
@@ -96,71 +96,71 @@
 
 .field public static final bottom:I = 0x7f0a011e
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index 13115826a7..8f4205545a 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$style.smali b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
index a57198aa1d..7da2407b62 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$style.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
@@ -24,11 +24,11 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
index a408706c16..27f44239c7 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
@@ -183,7 +183,7 @@
     :array_1
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_2
@@ -218,7 +218,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .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 49a3922d40..e6aea9503d 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index 96463cfcf1..2f4c221853 100644
--- a/com.discord/smali/androidx/core/R$drawable.smali
+++ b/com.discord/smali/androidx/core/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index 48408057c7..d5ddae090c 100644
--- a/com.discord/smali/androidx/core/R$id.smali
+++ b/com.discord/smali/androidx/core/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index bd5f37283d..3a21101876 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$style.smali b/com.discord/smali/androidx/core/R$style.smali
index d6ff1ee424..2608c6d8a2 100644
--- a/com.discord/smali/androidx/core/R$style.smali
+++ b/com.discord/smali/androidx/core/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$styleable.smali b/com.discord/smali/androidx/core/R$styleable.smali
index c450579421..d8849c6093 100644
--- a/com.discord/smali/androidx/core/R$styleable.smali
+++ b/com.discord/smali/androidx/core/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$1.smali
index 7606696aad..fc630a9e66 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/animation/AnimatorKt$addListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Animator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/Animator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$2.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$2.smali
index 1c4c459d3f..ddbf5e2ebb 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$2.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/animation/AnimatorKt$addListener$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Animator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/Animator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$3.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$3.smali
index 20ddb181ca..3ea4833c51 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$3.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$3.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/animation/AnimatorKt$addListener$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Animator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/Animator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$4.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$4.smali
index 09f5c81693..24ab653171 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$4.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$4.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/animation/AnimatorKt$addListener$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Animator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/Animator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$listener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$listener$1.smali
index b7cde70427..eec5ab6c2e 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$listener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addListener$listener$1.smali
@@ -49,83 +49,55 @@
 .method public onAnimationCancel(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$addListener$listener$1;->$onCancel:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$addListener$listener$1;->$onEnd:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$addListener$listener$1;->$onRepeat:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$addListener$listener$1;->$onStart:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$1.smali
index 306122631e..36191bfa8a 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/animation/AnimatorKt$addPauseListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Animator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/Animator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$2.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$2.smali
index 96a07b4b42..489bac9e89 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$2.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/animation/AnimatorKt$addPauseListener$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Animator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/Animator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$listener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$listener$1.smali
index eeb64a5b45..3333530c3e 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$listener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$addPauseListener$listener$1.smali
@@ -41,41 +41,27 @@
 .method public onAnimationPause(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$addPauseListener$listener$1;->$onPause:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationResume(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$addPauseListener$listener$1;->$onResume:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnCancel$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnCancel$$inlined$addListener$1.smali
index 0d6e0c40a4..7eb7ee85f4 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnCancel$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnCancel$$inlined$addListener$1.smali
@@ -37,71 +37,43 @@
 .method public onAnimationCancel(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$doOnCancel$$inlined$addListener$1;->$onCancel:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnEnd$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnEnd$$inlined$addListener$1.smali
index 5fc4ce4a6c..342939ac6c 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnEnd$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnEnd$$inlined$addListener$1.smali
@@ -35,73 +35,45 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$doOnEnd$$inlined$addListener$1;->$onEnd:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnPause$$inlined$addPauseListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnPause$$inlined$addPauseListener$1.smali
index 8ccef2ba85..7595f406f7 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnPause$$inlined$addPauseListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnPause$$inlined$addPauseListener$1.smali
@@ -37,37 +37,23 @@
 .method public onAnimationPause(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$doOnPause$$inlined$addPauseListener$1;->$onPause:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationResume(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnRepeat$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnRepeat$$inlined$addListener$1.smali
index 81d5420fdd..9104be4c89 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnRepeat$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnRepeat$$inlined$addListener$1.smali
@@ -35,73 +35,45 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$doOnRepeat$$inlined$addListener$1;->$onRepeat:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnResume$$inlined$addPauseListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnResume$$inlined$addPauseListener$1.smali
index 1a319a5b5b..98f440735f 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnResume$$inlined$addPauseListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnResume$$inlined$addPauseListener$1.smali
@@ -35,39 +35,25 @@
 
 # virtual methods
 .method public onAnimationPause(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationResume(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$doOnResume$$inlined$addPauseListener$1;->$onResume:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnStart$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnStart$$inlined$addListener$1.smali
index 4d2c15359d..59bad28980 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt$doOnStart$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt$doOnStart$$inlined$addListener$1.smali
@@ -35,73 +35,45 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/animation/AnimatorKt$doOnStart$$inlined$addListener$1;->$onStart:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/animation/AnimatorKt.smali b/com.discord/smali/androidx/core/animation/AnimatorKt.smali
index ed8cbc9630..ef3a0977c9 100644
--- a/com.discord/smali/androidx/core/animation/AnimatorKt.smali
+++ b/com.discord/smali/androidx/core/animation/AnimatorKt.smali
@@ -34,17 +34,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addListener"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_3
+    const-string v0, "onEnd"
 
-    if-eqz p2, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "onStart"
 
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onCancel"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onRepeat"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$addListener$listener$1;
 
@@ -53,44 +61,9 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "onRepeat"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "onCancel"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "onStart"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "onEnd"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "$this$addListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static addListener$default(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/animation/Animator$AnimatorListener;
+.method public static synthetic addListener$default(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/animation/Animator$AnimatorListener;
     .locals 0
 
     and-int/lit8 p6, p5, 0x1
@@ -121,23 +94,25 @@
     sget-object p4, Landroidx/core/animation/AnimatorKt$addListener$4;->INSTANCE:Landroidx/core/animation/AnimatorKt$addListener$4;
 
     :cond_3
-    if-eqz p0, :cond_4
+    const-string p5, "$this$addListener"
+
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p5, "onEnd"
 
-    invoke-static {p1, p5}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p5, "onStart"
 
-    invoke-static {p2, p5}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p5, "onCancel"
 
-    invoke-static {p3, p5}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p5, "onRepeat"
 
-    invoke-static {p4, p5}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p5, Landroidx/core/animation/AnimatorKt$addListener$listener$1;
 
@@ -146,15 +121,6 @@
     invoke-virtual {p0, p5}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
     return-object p5
-
-    :cond_4
-    const-string p0, "$this$addListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final addPauseListener(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Landroid/animation/Animator$AnimatorPauseListener;
@@ -181,13 +147,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addPauseListener"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "onResume"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onPause"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$addPauseListener$listener$1;
 
@@ -196,30 +166,9 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addPauseListener(Landroid/animation/Animator$AnimatorPauseListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "onPause"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "onResume"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$addPauseListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static addPauseListener$default(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/animation/Animator$AnimatorPauseListener;
+.method public static synthetic addPauseListener$default(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/animation/Animator$AnimatorPauseListener;
     .locals 0
 
     and-int/lit8 p4, p3, 0x1
@@ -236,15 +185,17 @@
     sget-object p2, Landroidx/core/animation/AnimatorKt$addPauseListener$2;->INSTANCE:Landroidx/core/animation/AnimatorKt$addPauseListener$2;
 
     :cond_1
-    if-eqz p0, :cond_2
+    const-string p3, "$this$addPauseListener"
+
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p3, "onResume"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p3, "onPause"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Landroidx/core/animation/AnimatorKt$addPauseListener$listener$1;
 
@@ -253,15 +204,6 @@
     invoke-virtual {p0, p3}, Landroid/animation/Animator;->addPauseListener(Landroid/animation/Animator$AnimatorPauseListener;)V
 
     return-object p3
-
-    :cond_2
-    const-string p0, "$this$addPauseListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final doOnCancel(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;)Landroid/animation/Animator$AnimatorListener;
@@ -279,11 +221,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnCancel"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$doOnCancel$$inlined$addListener$1;
 
@@ -292,20 +236,6 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnCancel"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnEnd(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;)Landroid/animation/Animator$AnimatorListener;
@@ -323,11 +253,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnEnd"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$doOnEnd$$inlined$addListener$1;
 
@@ -336,20 +268,6 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnEnd"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnPause(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;)Landroid/animation/Animator$AnimatorPauseListener;
@@ -371,11 +289,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnPause"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$doOnPause$$inlined$addPauseListener$1;
 
@@ -384,20 +304,6 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addPauseListener(Landroid/animation/Animator$AnimatorPauseListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnPause"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnRepeat(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;)Landroid/animation/Animator$AnimatorListener;
@@ -415,11 +321,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnRepeat"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$doOnRepeat$$inlined$addListener$1;
 
@@ -428,20 +336,6 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnRepeat"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnResume(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;)Landroid/animation/Animator$AnimatorPauseListener;
@@ -463,11 +357,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnResume"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$doOnResume$$inlined$addPauseListener$1;
 
@@ -476,20 +372,6 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addPauseListener(Landroid/animation/Animator$AnimatorPauseListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnResume"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnStart(Landroid/animation/Animator;Lkotlin/jvm/functions/Function1;)Landroid/animation/Animator$AnimatorListener;
@@ -507,11 +389,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnStart"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/animation/AnimatorKt$doOnStart$$inlined$addListener$1;
 
@@ -520,18 +404,4 @@
     invoke-virtual {p0, v0}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnStart"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/app/JobIntentService.smali b/com.discord/smali/androidx/core/app/JobIntentService.smali
index 1f5eac5056..80c95fe4f6 100644
--- a/com.discord/smali/androidx/core/app/JobIntentService.smali
+++ b/com.discord/smali/androidx/core/app/JobIntentService.smali
@@ -164,7 +164,7 @@
     :cond_0
     new-instance p0, Ljava/lang/IllegalArgumentException;
 
-    const-string p1, "work must not be null"
+    const-string/jumbo p1, "work must not be null"
 
     invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali b/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali
index 098de0514d..1b2c34ce40 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompat$MessagingStyle$Message.smali
@@ -157,7 +157,7 @@
     .annotation build Landroidx/annotation/Nullable;
     .end annotation
 
-    const-string v0, "uri"
+    const-string/jumbo v0, "uri"
 
     const-string v1, "extras"
 
@@ -459,7 +459,7 @@
 
     if-eqz v1, :cond_4
 
-    const-string v2, "uri"
+    const-string/jumbo v2, "uri"
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
diff --git a/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali b/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali
index 2560f758fe..77b10850c6 100644
--- a/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali
+++ b/com.discord/smali/androidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub.smali
@@ -1,5 +1,5 @@
 .class public Landroidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub;
-.super Ld0/a/b/a/a$a;
+.super Le0/a/b/a/a$a;
 .source "NotificationCompatSideChannelService.java"
 
 
@@ -24,7 +24,7 @@
 
     iput-object p1, p0, Landroidx/core/app/NotificationCompatSideChannelService$NotificationSideChannelStub;->this$0:Landroidx/core/app/NotificationCompatSideChannelService;
 
-    invoke-direct {p0}, Ld0/a/b/a/a$a;-><init>()V
+    invoke-direct {p0}, Le0/a/b/a/a$a;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali
index f31f4a7542..baa2fc9493 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$CancelTask.smali
@@ -70,7 +70,7 @@
 
 
 # virtual methods
-.method public send(Ld0/a/b/a/a;)V
+.method public send(Le0/a/b/a/a;)V
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -84,7 +84,7 @@
 
     iget-object v0, p0, Landroidx/core/app/NotificationManagerCompat$CancelTask;->packageName:Ljava/lang/String;
 
-    invoke-interface {p1, v0}, Ld0/a/b/a/a;->cancelAll(Ljava/lang/String;)V
+    invoke-interface {p1, v0}, Le0/a/b/a/a;->cancelAll(Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -95,7 +95,7 @@
 
     iget-object v2, p0, Landroidx/core/app/NotificationManagerCompat$CancelTask;->tag:Ljava/lang/String;
 
-    invoke-interface {p1, v0, v1, v2}, Ld0/a/b/a/a;->cancel(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-interface {p1, v0, v1, v2}, Le0/a/b/a/a;->cancel(Ljava/lang/String;ILjava/lang/String;)V
 
     :goto_0
     return-void
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali
index abc3f1844a..26bc93f6b6 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$NotifyTask.smali
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method public send(Ld0/a/b/a/a;)V
+.method public send(Le0/a/b/a/a;)V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -62,7 +62,7 @@
 
     iget-object v3, p0, Landroidx/core/app/NotificationManagerCompat$NotifyTask;->notif:Landroid/app/Notification;
 
-    invoke-interface {p1, v0, v1, v2, v3}, Ld0/a/b/a/a;->notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
+    invoke-interface {p1, v0, v1, v2, v3}, Le0/a/b/a/a;->notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali
index 785098a5ac..54c9278beb 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord.smali
@@ -21,7 +21,7 @@
 
 .field public retryCount:I
 
-.field public service:Ld0/a/b/a/a;
+.field public service:Le0/a/b/a/a;
 
 .field public taskQueue:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali
index dd55398315..ee355dd136 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$SideChannelManager.smali
@@ -197,7 +197,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Ld0/a/b/a/a;
+    iput-object v0, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Le0/a/b/a/a;
 
     return-void
 .end method
@@ -274,11 +274,11 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p2}, Ld0/a/b/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/b/a/a;
+    invoke-static {p2}, Le0/a/b/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/b/a/a;
 
     move-result-object p2
 
-    iput-object p2, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Ld0/a/b/a/a;
+    iput-object p2, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Le0/a/b/a/a;
 
     const/4 p2, 0x0
 
@@ -372,7 +372,7 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v2, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Ld0/a/b/a/a;
+    iget-object v2, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Le0/a/b/a/a;
 
     if-nez v2, :cond_2
 
@@ -417,9 +417,9 @@
     invoke-static {v0, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_4
-    iget-object v3, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Ld0/a/b/a/a;
+    iget-object v3, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->service:Le0/a/b/a/a;
 
-    invoke-interface {v2, v3}, Landroidx/core/app/NotificationManagerCompat$Task;->send(Ld0/a/b/a/a;)V
+    invoke-interface {v2, v3}, Landroidx/core/app/NotificationManagerCompat$Task;->send(Le0/a/b/a/a;)V
 
     iget-object v2, p1, Landroidx/core/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->taskQueue:Ljava/util/ArrayDeque;
 
diff --git a/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali b/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali
index da19b8b70c..1eac415cb7 100644
--- a/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali
+++ b/com.discord/smali/androidx/core/app/NotificationManagerCompat$Task.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract send(Ld0/a/b/a/a;)V
+.method public abstract send(Le0/a/b/a/a;)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali/androidx/core/app/Person.smali b/com.discord/smali/androidx/core/app/Person.smali
index 828f436fdc..0adc3c36ce 100644
--- a/com.discord/smali/androidx/core/app/Person.smali
+++ b/com.discord/smali/androidx/core/app/Person.smali
@@ -223,7 +223,7 @@
 
     move-result-object v0
 
-    const-string v1, "uri"
+    const-string/jumbo v1, "uri"
 
     invoke-virtual {p0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
@@ -303,7 +303,7 @@
 
     move-result-object v0
 
-    const-string v1, "uri"
+    const-string/jumbo v1, "uri"
 
     invoke-virtual {p0, v1}, Landroid/os/PersistableBundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
@@ -545,7 +545,7 @@
 
     iget-object v1, p0, Landroidx/core/app/Person;->mUri:Ljava/lang/String;
 
-    const-string v2, "uri"
+    const-string/jumbo v2, "uri"
 
     invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -609,7 +609,7 @@
 
     iget-object v1, p0, Landroidx/core/app/Person;->mUri:Ljava/lang/String;
 
-    const-string v2, "uri"
+    const-string/jumbo v2, "uri"
 
     invoke-virtual {v0, v2, v1}, Landroid/os/PersistableBundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/content/ContentValuesKt.smali b/com.discord/smali/androidx/core/content/ContentValuesKt.smali
index 0beb681086..18d4fc3fa9 100644
--- a/com.discord/smali/androidx/core/content/ContentValuesKt.smali
+++ b/com.discord/smali/androidx/core/content/ContentValuesKt.smali
@@ -18,7 +18,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_b
+    const-string v0, "pairs"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/ContentValues;
 
@@ -190,13 +192,4 @@
 
     :cond_a
     return-object v0
-
-    :cond_b
-    const-string p0, "pairs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali b/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali
index 4ee34fb338..1db39ae2e5 100644
--- a/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali
+++ b/com.discord/smali/androidx/core/content/ContextCompat$LegacyServiceMapHolder.smali
@@ -56,7 +56,7 @@
 
     const-class v1, Landroid/app/usage/UsageStatsManager;
 
-    const-string v2, "usagestats"
+    const-string/jumbo v2, "usagestats"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -193,7 +193,7 @@
 
     const-class v1, Landroid/os/UserManager;
 
-    const-string v2, "user"
+    const-string/jumbo v2, "user"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -409,7 +409,7 @@
 
     const-class v1, Landroid/hardware/usb/UsbManager;
 
-    const-string v2, "usb"
+    const-string/jumbo v2, "usb"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -417,7 +417,7 @@
 
     const-class v1, Landroid/os/Vibrator;
 
-    const-string v2, "vibrator"
+    const-string/jumbo v2, "vibrator"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -425,7 +425,7 @@
 
     const-class v1, Landroid/app/WallpaperManager;
 
-    const-string v2, "wallpaper"
+    const-string/jumbo v2, "wallpaper"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -433,7 +433,7 @@
 
     const-class v1, Landroid/net/wifi/p2p/WifiP2pManager;
 
-    const-string v2, "wifip2p"
+    const-string/jumbo v2, "wifip2p"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -441,7 +441,7 @@
 
     const-class v1, Landroid/net/wifi/WifiManager;
 
-    const-string v2, "wifi"
+    const-string/jumbo v2, "wifi"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -449,7 +449,7 @@
 
     const-class v1, Landroid/view/WindowManager;
 
-    const-string v2, "window"
+    const-string/jumbo v2, "window"
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/core/content/ContextKt.smali b/com.discord/smali/androidx/core/content/ContextKt.smali
index e0a3dec0c7..856cf41ff6 100644
--- a/com.discord/smali/androidx/core/content/ContextKt.smali
+++ b/com.discord/smali/androidx/core/content/ContextKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final getSystemService(Landroid/content/Context;)Ljava/lang/Object;
+.method public static final synthetic getSystemService(Landroid/content/Context;)Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -16,20 +16,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getSystemService"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$getSystemService"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
 .method public static final withStyledAttributes(Landroid/content/Context;I[ILkotlin/jvm/functions/Function1;)V
@@ -51,13 +46,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withStyledAttributes"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "attrs"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/content/Context;->obtainStyledAttributes(I[I)Landroid/content/res/TypedArray;
 
@@ -68,27 +67,6 @@
     invoke-virtual {p0}, Landroid/content/res/TypedArray;->recycle()V
 
     return-void
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "attrs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$withStyledAttributes"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final withStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[IIILkotlin/jvm/functions/Function1;)V
@@ -115,13 +93,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withStyledAttributes"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "attrs"
 
-    if-eqz p5, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
@@ -132,44 +114,21 @@
     invoke-virtual {p0}, Landroid/content/res/TypedArray;->recycle()V
 
     return-void
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "attrs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$withStyledAttributes"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static withStyledAttributes$default(Landroid/content/Context;Landroid/util/AttributeSet;[IIILkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-    .locals 2
+.method public static synthetic withStyledAttributes$default(Landroid/content/Context;Landroid/util/AttributeSet;[IIILkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    .locals 1
 
     and-int/lit8 p7, p6, 0x1
 
-    const/4 v0, 0x0
-
     if-eqz p7, :cond_0
 
-    move-object p1, v0
+    const/4 p1, 0x0
 
     :cond_0
     and-int/lit8 p7, p6, 0x4
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     if-eqz p7, :cond_1
 
@@ -183,11 +142,17 @@
     const/4 p4, 0x0
 
     :cond_2
-    if-eqz p0, :cond_5
+    const-string p6, "$this$withStyledAttributes"
 
-    if-eqz p2, :cond_4
+    invoke-static {p0, p6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_3
+    const-string p6, "attrs"
+
+    invoke-static {p2, p6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "block"
+
+    invoke-static {p5, p6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
@@ -198,25 +163,4 @@
     invoke-virtual {p0}, Landroid/content/res/TypedArray;->recycle()V
 
     return-void
-
-    :cond_3
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "attrs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "$this$withStyledAttributes"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/content/FileProvider.smali b/com.discord/smali/androidx/core/content/FileProvider.smali
index c5d8df8823..b224fdd1d6 100644
--- a/com.discord/smali/androidx/core/content/FileProvider.smali
+++ b/com.discord/smali/androidx/core/content/FileProvider.smali
@@ -265,7 +265,7 @@
     goto :goto_1
 
     :cond_0
-    const-string v0, "w"
+    const-string/jumbo v0, "w"
 
     invoke-virtual {v0, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -273,7 +273,7 @@
 
     if-nez v0, :cond_5
 
-    const-string v0, "wt"
+    const-string/jumbo v0, "wt"
 
     invoke-virtual {v0, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -284,7 +284,7 @@
     goto :goto_0
 
     :cond_1
-    const-string v0, "wa"
+    const-string/jumbo v0, "wa"
 
     invoke-virtual {v0, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali b/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali
index 1468e2afc2..625dd458d3 100644
--- a/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali
+++ b/com.discord/smali/androidx/core/content/SharedPreferencesKt.smali
@@ -25,11 +25,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$edit"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "action"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -37,7 +39,7 @@
 
     const-string v0, "editor"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -52,23 +54,9 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$edit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static edit$default(Landroid/content/SharedPreferences;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+.method public static synthetic edit$default(Landroid/content/SharedPreferences;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p3, p3, 0x1
@@ -78,11 +66,13 @@
     const/4 p1, 0x0
 
     :cond_0
-    const/4 p3, 0x0
+    const-string p3, "$this$edit"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string p3, "action"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -90,7 +80,7 @@
 
     const-string p3, "editor"
 
-    invoke-static {p0, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -105,18 +95,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_3
-    const-string p0, "$this$edit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali/androidx/core/content/res/TypedArrayKt.smali b/com.discord/smali/androidx/core/content/res/TypedArrayKt.smali
index 66fd7934e7..41b2fa6685 100644
--- a/com.discord/smali/androidx/core/content/res/TypedArrayKt.smali
+++ b/com.discord/smali/androidx/core/content/res/TypedArrayKt.smali
@@ -36,7 +36,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getBooleanOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -47,15 +49,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getBooleanOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getColorOrThrow(Landroid/content/res/TypedArray;I)I
@@ -67,7 +60,9 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getColorOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -78,25 +73,18 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getColorOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getColorStateListOrThrow(Landroid/content/res/TypedArray;I)Landroid/content/res/ColorStateList;
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/StyleableRes;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$getColorStateListOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -120,15 +108,6 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_1
-    const-string p0, "$this$getColorStateListOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getDimensionOrThrow(Landroid/content/res/TypedArray;I)F
@@ -138,7 +117,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getDimensionOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -149,15 +130,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getDimensionOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getDimensionPixelOffsetOrThrow(Landroid/content/res/TypedArray;I)I
@@ -169,7 +141,9 @@
     .annotation build Landroidx/annotation/Dimension;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getDimensionPixelOffsetOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -180,15 +154,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getDimensionPixelOffsetOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getDimensionPixelSizeOrThrow(Landroid/content/res/TypedArray;I)I
@@ -200,7 +165,9 @@
     .annotation build Landroidx/annotation/Dimension;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getDimensionPixelSizeOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -211,15 +178,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getDimensionPixelSizeOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getDrawableOrThrow(Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
@@ -229,9 +187,9 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getDrawableOrThrow"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -244,16 +202,11 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$getDrawableOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
 .method public static final getFloatOrThrow(Landroid/content/res/TypedArray;I)F
@@ -263,7 +216,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getFloatOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -274,15 +229,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getFloatOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getFontOrThrow(Landroid/content/res/TypedArray;I)Landroid/graphics/Typeface;
@@ -295,9 +241,9 @@
         value = 0x1a
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getFontOrThrow"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -310,16 +256,11 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$getFontOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
 .method public static final getIntOrThrow(Landroid/content/res/TypedArray;I)I
@@ -329,7 +270,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getIntOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -340,15 +283,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getIntOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getIntegerOrThrow(Landroid/content/res/TypedArray;I)I
@@ -358,7 +292,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getIntegerOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -369,15 +305,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getIntegerOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getResourceIdOrThrow(Landroid/content/res/TypedArray;I)I
@@ -389,7 +316,9 @@
     .annotation build Landroidx/annotation/AnyRes;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getResourceIdOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -400,25 +329,18 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getResourceIdOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getStringOrThrow(Landroid/content/res/TypedArray;I)Ljava/lang/String;
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/StyleableRes;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$getStringOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -442,25 +364,18 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_1
-    const-string p0, "$this$getStringOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getTextArrayOrThrow(Landroid/content/res/TypedArray;I)[Ljava/lang/CharSequence;
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/StyleableRes;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getTextArrayOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -470,28 +385,21 @@
 
     const-string p1, "getTextArray(index)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$getTextArrayOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getTextOrThrow(Landroid/content/res/TypedArray;I)Ljava/lang/CharSequence;
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/StyleableRes;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$getTextOrThrow"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
 
@@ -515,15 +423,6 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_1
-    const-string p0, "$this$getTextOrThrow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final use(Landroid/content/res/TypedArray;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
@@ -541,11 +440,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$use"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -554,18 +455,4 @@
     invoke-virtual {p0}, Landroid/content/res/TypedArray;->recycle()V
 
     return-object p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$use"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/database/CursorKt.smali b/com.discord/smali/androidx/core/database/CursorKt.smali
index b470d10102..7716cf2031 100644
--- a/com.discord/smali/androidx/core/database/CursorKt.smali
+++ b/com.discord/smali/androidx/core/database/CursorKt.smali
@@ -5,48 +5,45 @@
 
 # direct methods
 .method public static final getBlobOrNull(Landroid/database/Cursor;I)[B
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getBlobOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
 
     goto :goto_0
 
     :cond_0
     invoke-interface {p0, p1}, Landroid/database/Cursor;->getBlob(I)[B
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getBlobOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static final getDoubleOrNull(Landroid/database/Cursor;I)Ljava/lang/Double;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getDoubleOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
 
     goto :goto_0
 
@@ -57,31 +54,26 @@
 
     invoke-static {p0, p1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getDoubleOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static final getFloatOrNull(Landroid/database/Cursor;I)Ljava/lang/Float;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getFloatOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
 
     goto :goto_0
 
@@ -92,31 +84,26 @@
 
     invoke-static {p0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getFloatOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static final getIntOrNull(Landroid/database/Cursor;I)Ljava/lang/Integer;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getIntOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
 
     goto :goto_0
 
@@ -127,31 +114,26 @@
 
     invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getIntOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static final getLongOrNull(Landroid/database/Cursor;I)Ljava/lang/Long;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getLongOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
 
     goto :goto_0
 
@@ -162,31 +144,26 @@
 
     invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getLongOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static final getShortOrNull(Landroid/database/Cursor;I)Ljava/lang/Short;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getShortOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
 
     goto :goto_0
 
@@ -197,46 +174,34 @@
 
     invoke-static {p0}, Ljava/lang/Short;->valueOf(S)Ljava/lang/Short;
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getShortOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static final getStringOrNull(Landroid/database/Cursor;I)Ljava/lang/String;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getStringOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/database/Cursor;->isNull(I)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
 
     goto :goto_0
 
     :cond_0
     invoke-interface {p0, p1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getStringOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
diff --git a/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali b/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali
index a6cba0d521..b92f67fd32 100644
--- a/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali
+++ b/com.discord/smali/androidx/core/database/sqlite/SQLiteDatabaseKt.smali
@@ -20,11 +20,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$transaction"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "body"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -55,20 +57,6 @@
     invoke-virtual {p0}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     throw p1
-
-    :cond_1
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$transaction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static transaction$default(Landroid/database/sqlite/SQLiteDatabase;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Object;
@@ -83,11 +71,13 @@
     const/4 p1, 0x1
 
     :cond_0
-    const/4 p3, 0x0
+    const-string p3, "$this$transaction"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string p3, "body"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_1
 
@@ -118,18 +108,4 @@
     invoke-virtual {p0}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     throw p1
-
-    :cond_2
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_3
-    const-string p0, "$this$transaction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/BitmapKt.smali b/com.discord/smali/androidx/core/graphics/BitmapKt.smali
index 175ed8b2a1..dc5f88f8af 100644
--- a/com.discord/smali/androidx/core/graphics/BitmapKt.smali
+++ b/com.discord/smali/androidx/core/graphics/BitmapKt.smali
@@ -19,11 +19,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$applyCanvas"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Canvas;
 
@@ -32,30 +34,18 @@
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-object p0
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$applyCanvas"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final contains(Landroid/graphics/Bitmap;Landroid/graphics/Point;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p1, Landroid/graphics/Point;->x:I
 
@@ -86,30 +76,18 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final contains(Landroid/graphics/Bitmap;Landroid/graphics/PointF;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p1, Landroid/graphics/PointF;->x:F
 
@@ -151,26 +129,14 @@
 
     :cond_0
     return v1
-
-    :cond_1
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "config"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
 
@@ -178,18 +144,9 @@
 
     const-string p1, "Bitmap.createBitmap(width, height, config)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "config"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final createBitmap(IILandroid/graphics/Bitmap$Config;ZLandroid/graphics/ColorSpace;)Landroid/graphics/Bitmap;
@@ -198,11 +155,13 @@
         value = 0x1a
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "config"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "colorSpace"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2, p3, p4}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;ZLandroid/graphics/ColorSpace;)Landroid/graphics/Bitmap;
 
@@ -210,23 +169,9 @@
 
     const-string p1, "Bitmap.createBitmap(widt\u2026ig, hasAlpha, colorSpace)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "colorSpace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "config"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic createBitmap$default(IILandroid/graphics/Bitmap$Config;ILjava/lang/Object;)Landroid/graphics/Bitmap;
@@ -241,7 +186,7 @@
     :cond_0
     const-string p3, "config"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
 
@@ -249,7 +194,7 @@
 
     const-string p1, "Bitmap.createBitmap(width, height, config)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -283,16 +228,16 @@
 
     const-string p5, "ColorSpace.get(ColorSpace.Named.SRGB)"
 
-    invoke-static {p4, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_2
     const-string p5, "config"
 
-    invoke-static {p2, p5}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p5, "colorSpace"
 
-    invoke-static {p4, p5}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2, p3, p4}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;ZLandroid/graphics/ColorSpace;)Landroid/graphics/Bitmap;
 
@@ -300,36 +245,31 @@
 
     const-string p1, "Bitmap.createBitmap(widt\u2026ig, hasAlpha, colorSpace)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
 
 .method public static final get(Landroid/graphics/Bitmap;II)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$get"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/graphics/Bitmap;->getPixel(II)I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$get"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final scale(Landroid/graphics/Bitmap;IIZ)Landroid/graphics/Bitmap;
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$scale"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2, p3}, Landroid/graphics/Bitmap;->createScaledBitmap(Landroid/graphics/Bitmap;IIZ)Landroid/graphics/Bitmap;
 
@@ -337,21 +277,12 @@
 
     const-string p1, "Bitmap.createScaledBitma\u2026s, width, height, filter)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$scale"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static scale$default(Landroid/graphics/Bitmap;IIZILjava/lang/Object;)Landroid/graphics/Bitmap;
+.method public static synthetic scale$default(Landroid/graphics/Bitmap;IIZILjava/lang/Object;)Landroid/graphics/Bitmap;
     .locals 0
 
     and-int/lit8 p4, p4, 0x4
@@ -361,7 +292,9 @@
     const/4 p3, 0x1
 
     :cond_0
-    if-eqz p0, :cond_1
+    const-string p4, "$this$scale"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2, p3}, Landroid/graphics/Bitmap;->createScaledBitmap(Landroid/graphics/Bitmap;IIZ)Landroid/graphics/Bitmap;
 
@@ -369,39 +302,23 @@
 
     const-string p1, "Bitmap.createScaledBitma\u2026s, width, height, filter)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_1
-    const-string p0, "$this$scale"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroid/graphics/Bitmap;III)V
-    .locals 0
+    .locals 1
     .param p3    # I
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$set"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroid/graphics/Bitmap;->setPixel(III)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/CanvasKt.smali b/com.discord/smali/androidx/core/graphics/CanvasKt.smali
index 7b9afb72e8..f66f452b97 100644
--- a/com.discord/smali/androidx/core/graphics/CanvasKt.smali
+++ b/com.discord/smali/androidx/core/graphics/CanvasKt.smali
@@ -19,11 +19,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withClip"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -46,20 +48,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$withClip"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final withClip(Landroid/graphics/Canvas;IIIILkotlin/jvm/functions/Function1;)V
@@ -77,11 +65,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withClip"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -104,20 +94,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$withClip"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final withClip(Landroid/graphics/Canvas;Landroid/graphics/Path;Lkotlin/jvm/functions/Function1;)V
@@ -135,13 +111,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withClip"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "clipPath"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -164,27 +144,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "clipPath"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$withClip"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final withClip(Landroid/graphics/Canvas;Landroid/graphics/Rect;Lkotlin/jvm/functions/Function1;)V
@@ -202,13 +161,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withClip"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "clipRect"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -231,27 +194,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "clipRect"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$withClip"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final withClip(Landroid/graphics/Canvas;Landroid/graphics/RectF;Lkotlin/jvm/functions/Function1;)V
@@ -269,13 +211,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withClip"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "clipRect"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -298,27 +244,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "clipRect"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$withClip"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final withMatrix(Landroid/graphics/Canvas;Landroid/graphics/Matrix;Lkotlin/jvm/functions/Function1;)V
@@ -336,13 +261,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withMatrix"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "matrix"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -365,27 +294,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "matrix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$withMatrix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static withMatrix$default(Landroid/graphics/Canvas;Landroid/graphics/Matrix;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -400,15 +308,17 @@
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
     :cond_0
-    const/4 p3, 0x0
+    const-string p3, "$this$withMatrix"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p4, "matrix"
+    const-string p3, "matrix"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p3, "block"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -431,20 +341,6 @@
     invoke-virtual {p0, p3}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_1
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_2
-    const-string p0, "$this$withMatrix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
 
 .method public static final withRotation(Landroid/graphics/Canvas;FFFLkotlin/jvm/functions/Function1;)V
@@ -462,11 +358,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withRotation"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -489,20 +387,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$withRotation"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static withRotation$default(Landroid/graphics/Canvas;FFFLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -531,11 +415,13 @@
     const/4 p3, 0x0
 
     :cond_2
-    const/4 p5, 0x0
+    const-string p5, "$this$withRotation"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string p5, "block"
+
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -558,20 +444,6 @@
     invoke-virtual {p0, p5}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_3
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_4
-    const-string p0, "$this$withRotation"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
 .end method
 
 .method public static final withSave(Landroid/graphics/Canvas;Lkotlin/jvm/functions/Function1;)V
@@ -588,11 +460,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withSave"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -613,20 +487,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$withSave"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final withScale(Landroid/graphics/Canvas;FFFFLkotlin/jvm/functions/Function1;)V
@@ -644,11 +504,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withScale"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -671,20 +533,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$withScale"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static withScale$default(Landroid/graphics/Canvas;FFFFLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -722,11 +570,13 @@
     const/4 p4, 0x0
 
     :cond_3
-    const/4 p6, 0x0
+    const-string p6, "$this$withScale"
 
-    if-eqz p0, :cond_5
+    invoke-static {p0, p6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_4
+    const-string p6, "block"
+
+    invoke-static {p5, p6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -749,20 +599,6 @@
     invoke-virtual {p0, p6}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_4
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_5
-    const-string p0, "$this$withScale"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
 .end method
 
 .method public static final withSkew(Landroid/graphics/Canvas;FFLkotlin/jvm/functions/Function1;)V
@@ -780,11 +616,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withSkew"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -807,20 +645,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$withSkew"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static withSkew$default(Landroid/graphics/Canvas;FFLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -842,11 +666,13 @@
     const/4 p2, 0x0
 
     :cond_1
-    const/4 p4, 0x0
+    const-string p4, "$this$withSkew"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p4, "block"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -869,20 +695,6 @@
     invoke-virtual {p0, p4}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_2
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_3
-    const-string p0, "$this$withSkew"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
 
 .method public static final withTranslation(Landroid/graphics/Canvas;FFLkotlin/jvm/functions/Function1;)V
@@ -900,11 +712,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$withTranslation"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -927,20 +741,6 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$withTranslation"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static withTranslation$default(Landroid/graphics/Canvas;FFLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -962,11 +762,13 @@
     const/4 p2, 0x0
 
     :cond_1
-    const/4 p4, 0x0
+    const-string p4, "$this$withTranslation"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p4, "block"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Canvas;->save()I
 
@@ -989,18 +791,4 @@
     invoke-virtual {p0, p4}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
     throw p1
-
-    :cond_2
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_3
-    const-string p0, "$this$withTranslation"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/ColorKt.smali b/com.discord/smali/androidx/core/graphics/ColorKt.smali
index c98965803a..cbb15086cb 100644
--- a/com.discord/smali/androidx/core/graphics/ColorKt.smali
+++ b/com.discord/smali/androidx/core/graphics/ColorKt.smali
@@ -23,7 +23,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -32,15 +34,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component1(I)I
@@ -76,7 +69,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -85,15 +80,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(I)I
@@ -129,7 +115,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component3"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -138,15 +126,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component3(I)I
@@ -182,7 +161,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component4"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x3
 
@@ -191,15 +172,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component4(I)I
@@ -215,7 +187,7 @@
 .end method
 
 .method public static final convertTo(ILandroid/graphics/ColorSpace$Named;)J
-    .locals 0
+    .locals 1
     .param p0    # I
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
@@ -224,7 +196,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroid/graphics/ColorSpace;->get(Landroid/graphics/ColorSpace$Named;)Landroid/graphics/ColorSpace;
 
@@ -235,19 +209,10 @@
     move-result-wide p0
 
     return-wide p0
-
-    :cond_0
-    const-string p0, "colorSpace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final convertTo(ILandroid/graphics/ColorSpace;)J
-    .locals 0
+    .locals 1
     .param p0    # I
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
@@ -256,31 +221,26 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroid/graphics/Color;->convert(ILandroid/graphics/ColorSpace;)J
 
     move-result-wide p0
 
     return-wide p0
-
-    :cond_0
-    const-string p0, "colorSpace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final convertTo(JLandroid/graphics/ColorSpace$Named;)J
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x1a
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "colorSpace"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Landroid/graphics/ColorSpace;->get(Landroid/graphics/ColorSpace$Named;)Landroid/graphics/ColorSpace;
 
@@ -291,39 +251,23 @@
     move-result-wide p0
 
     return-wide p0
-
-    :cond_0
-    const-string p0, "colorSpace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final convertTo(JLandroid/graphics/ColorSpace;)J
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x1a
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "colorSpace"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Landroid/graphics/Color;->convert(JLandroid/graphics/ColorSpace;)J
 
     move-result-wide p0
 
     return-wide p0
-
-    :cond_0
-    const-string p0, "colorSpace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final convertTo(Landroid/graphics/Color;Landroid/graphics/ColorSpace$Named;)Landroid/graphics/Color;
@@ -332,11 +276,13 @@
         value = 0x1a
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$convertTo"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroid/graphics/ColorSpace;->get(Landroid/graphics/ColorSpace$Named;)Landroid/graphics/ColorSpace;
 
@@ -348,23 +294,9 @@
 
     const-string p1, "convert(ColorSpace.get(colorSpace))"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "colorSpace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$convertTo"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final convertTo(Landroid/graphics/Color;Landroid/graphics/ColorSpace;)Landroid/graphics/Color;
@@ -373,11 +305,13 @@
         value = 0x1a
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$convertTo"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "colorSpace"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/graphics/Color;->convert(Landroid/graphics/ColorSpace;)Landroid/graphics/Color;
 
@@ -385,23 +319,9 @@
 
     const-string p1, "convert(colorSpace)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "colorSpace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$convertTo"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getAlpha(J)F
@@ -468,7 +388,7 @@
 
     const-string p1, "Color.colorSpace(this)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -589,11 +509,13 @@
         value = 0x1a
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "c"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p0}, Landroidx/core/graphics/ColorUtils;->compositeColors(Landroid/graphics/Color;Landroid/graphics/Color;)Landroid/graphics/Color;
 
@@ -601,23 +523,9 @@
 
     const-string p1, "ColorUtils.compositeColors(c, this)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "c"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final toColor(I)Landroid/graphics/Color;
@@ -636,7 +544,7 @@
 
     const-string v0, "Color.valueOf(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -653,7 +561,7 @@
 
     const-string p1, "Color.valueOf(this)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -675,26 +583,19 @@
 .end method
 
 .method public static final toColorInt(Ljava/lang/String;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toColorInt"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/graphics/Color;->parseColor(Ljava/lang/String;)I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$toColorInt"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toColorLong(I)J
diff --git a/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeBitmap$1.smali b/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeBitmap$1.smali
index 0c56560915..eedeb62e76 100644
--- a/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeBitmap$1.smali
+++ b/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeBitmap$1.smali
@@ -37,38 +37,21 @@
 .method public final onHeaderDecoded(Landroid/graphics/ImageDecoder;Landroid/graphics/ImageDecoder$ImageInfo;Landroid/graphics/ImageDecoder$Source;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "decoder"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "info"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "source"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/graphics/ImageDecoderKt$decodeBitmap$1;->$action:Lkotlin/jvm/functions/Function3;
 
     invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "decoder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeDrawable$1.smali b/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeDrawable$1.smali
index ad1392405c..cc74459f12 100644
--- a/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeDrawable$1.smali
+++ b/com.discord/smali/androidx/core/graphics/ImageDecoderKt$decodeDrawable$1.smali
@@ -37,38 +37,21 @@
 .method public final onHeaderDecoded(Landroid/graphics/ImageDecoder;Landroid/graphics/ImageDecoder$ImageInfo;Landroid/graphics/ImageDecoder$Source;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "decoder"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "info"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "source"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/graphics/ImageDecoderKt$decodeDrawable$1;->$action:Lkotlin/jvm/functions/Function3;
 
     invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "decoder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali b/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali
index d820b2c787..2a2c3d4b3c 100644
--- a/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali
+++ b/com.discord/smali/androidx/core/graphics/ImageDecoderKt.smali
@@ -27,11 +27,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$decodeBitmap"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/graphics/ImageDecoderKt$decodeBitmap$1;
 
@@ -43,23 +45,9 @@
 
     const-string p1, "ImageDecoder.decodeBitma\u2026ction(info, source)\n    }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$decodeBitmap"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final decodeDrawable(Landroid/graphics/ImageDecoder$Source;Lkotlin/jvm/functions/Function3;)Landroid/graphics/drawable/Drawable;
@@ -85,11 +73,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$decodeDrawable"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/graphics/ImageDecoderKt$decodeDrawable$1;
 
@@ -101,21 +91,7 @@
 
     const-string p1, "ImageDecoder.decodeDrawa\u2026ction(info, source)\n    }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$decodeDrawable"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/MatrixKt.smali b/com.discord/smali/androidx/core/graphics/MatrixKt.smali
index dafc683851..9d1222face 100644
--- a/com.discord/smali/androidx/core/graphics/MatrixKt.smali
+++ b/com.discord/smali/androidx/core/graphics/MatrixKt.smali
@@ -83,11 +83,13 @@
 .method public static final times(Landroid/graphics/Matrix;Landroid/graphics/Matrix;)Landroid/graphics/Matrix;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$times"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "m"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Matrix;
 
@@ -96,20 +98,6 @@
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "m"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$times"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final translationMatrix(FF)Landroid/graphics/Matrix;
@@ -153,7 +141,9 @@
 .method public static final values(Landroid/graphics/Matrix;)[F
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$values"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x9
 
@@ -162,13 +152,4 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Matrix;->getValues([F)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$values"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/PaintKt.smali b/com.discord/smali/androidx/core/graphics/PaintKt.smali
index b8bbaf0acf..e1db3a208d 100644
--- a/com.discord/smali/androidx/core/graphics/PaintKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PaintKt.smali
@@ -5,22 +5,15 @@
 
 # direct methods
 .method public static final setBlendMode(Landroid/graphics/Paint;Landroidx/core/graphics/BlendModeCompat;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setBlendMode"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/graphics/PaintCompat;->setBlendMode(Landroid/graphics/Paint;Landroidx/core/graphics/BlendModeCompat;)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$setBlendMode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/PathKt.smali b/com.discord/smali/androidx/core/graphics/PathKt.smali
index 75fa816375..056abba3cc 100644
--- a/com.discord/smali/androidx/core/graphics/PathKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PathKt.smali
@@ -10,11 +10,13 @@
         value = 0x13
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$and"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -25,24 +27,10 @@
     invoke-virtual {v0, p0, p1, v1}, Landroid/graphics/Path;->op(Landroid/graphics/Path;Landroid/graphics/Path;Landroid/graphics/Path$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$and"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final flatten(Landroid/graphics/Path;F)Ljava/lang/Iterable;
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x1a
     .end annotation
@@ -58,7 +46,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$flatten"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/graphics/PathUtils;->flatten(Landroid/graphics/Path;F)Ljava/util/Collection;
 
@@ -66,18 +56,9 @@
 
     const-string p1, "PathUtils.flatten(this, error)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$flatten"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic flatten$default(Landroid/graphics/Path;FILjava/lang/Object;)Ljava/lang/Iterable;
@@ -103,11 +84,13 @@
         value = 0x13
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -118,20 +101,6 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Path;->op(Landroid/graphics/Path;Landroid/graphics/Path$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final or(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
@@ -140,11 +109,13 @@
         value = 0x13
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$or"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -155,20 +126,6 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Path;->op(Landroid/graphics/Path;Landroid/graphics/Path$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$or"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
@@ -177,11 +134,13 @@
         value = 0x13
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -192,20 +151,6 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Path;->op(Landroid/graphics/Path;Landroid/graphics/Path$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final xor(Landroid/graphics/Path;Landroid/graphics/Path;)Landroid/graphics/Path;
@@ -214,11 +159,13 @@
         value = 0x13
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$xor"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Path;
 
@@ -229,18 +176,4 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Path;->op(Landroid/graphics/Path;Landroid/graphics/Path$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$xor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/PictureKt.smali b/com.discord/smali/androidx/core/graphics/PictureKt.smali
index 4103a61344..e8ea04d7f6 100644
--- a/com.discord/smali/androidx/core/graphics/PictureKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PictureKt.smali
@@ -20,11 +20,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$record"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/graphics/Picture;->beginRecording(II)Landroid/graphics/Canvas;
 
@@ -33,7 +35,7 @@
     :try_start_0
     const-string p2, "c"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -49,18 +51,4 @@
     invoke-virtual {p0}, Landroid/graphics/Picture;->endRecording()V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$record"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/PointKt.smali b/com.discord/smali/androidx/core/graphics/PointKt.smali
index 108aa9aeaa..409bd270ad 100644
--- a/com.discord/smali/androidx/core/graphics/PointKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PointKt.smali
@@ -5,85 +5,59 @@
 
 # direct methods
 .method public static final component1(Landroid/graphics/PointF;)F
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/PointF;->x:F
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component1(Landroid/graphics/Point;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/Point;->x:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/graphics/PointF;)F
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/PointF;->y:F
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/graphics/Point;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/Point;->y:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minus(Landroid/graphics/Point;I)Landroid/graphics/Point;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$minus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Point;
 
@@ -98,25 +72,18 @@
     invoke-virtual {v0, p0, p0}, Landroid/graphics/Point;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minus(Landroid/graphics/Point;Landroid/graphics/Point;)Landroid/graphics/Point;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Point;
 
@@ -137,26 +104,14 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/Point;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final minus(Landroid/graphics/PointF;F)Landroid/graphics/PointF;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$minus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -171,25 +126,18 @@
     invoke-virtual {v0, p0, p0}, Landroid/graphics/PointF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minus(Landroid/graphics/PointF;Landroid/graphics/PointF;)Landroid/graphics/PointF;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -210,26 +158,14 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/PointF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/Point;I)Landroid/graphics/Point;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Point;
 
@@ -242,25 +178,18 @@
     invoke-virtual {v0, p1, p1}, Landroid/graphics/Point;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/graphics/Point;Landroid/graphics/Point;)Landroid/graphics/Point;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Point;
 
@@ -277,26 +206,14 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/Point;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/PointF;F)Landroid/graphics/PointF;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -309,25 +226,18 @@
     invoke-virtual {v0, p1, p1}, Landroid/graphics/PointF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/graphics/PointF;Landroid/graphics/PointF;)Landroid/graphics/PointF;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -344,26 +254,14 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/PointF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final toPoint(Landroid/graphics/PointF;)Landroid/graphics/Point;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toPoint"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Point;
 
@@ -378,42 +276,28 @@
     invoke-direct {v0, v1, p0}, Landroid/graphics/Point;-><init>(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toPoint"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toPointF(Landroid/graphics/Point;)Landroid/graphics/PointF;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toPointF"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PointF;
 
     invoke-direct {v0, p0}, Landroid/graphics/PointF;-><init>(Landroid/graphics/Point;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toPointF"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final unaryMinus(Landroid/graphics/Point;)Landroid/graphics/Point;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$unaryMinus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Point;
 
@@ -428,21 +312,14 @@
     invoke-direct {v0, v1, p0}, Landroid/graphics/Point;-><init>(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$unaryMinus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final unaryMinus(Landroid/graphics/PointF;)Landroid/graphics/PointF;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$unaryMinus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -457,13 +334,4 @@
     invoke-direct {v0, v1, p0}, Landroid/graphics/PointF;-><init>(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$unaryMinus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali b/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali
index 310c6eca00..8e2bdd7244 100644
--- a/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali
+++ b/com.discord/smali/androidx/core/graphics/PorterDuffKt.smali
@@ -7,41 +7,27 @@
 .method public static final toColorFilter(Landroid/graphics/PorterDuff$Mode;I)Landroid/graphics/PorterDuffColorFilter;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toColorFilter"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PorterDuffColorFilter;
 
     invoke-direct {v0, p1, p0}, Landroid/graphics/PorterDuffColorFilter;-><init>(ILandroid/graphics/PorterDuff$Mode;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toColorFilter"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toXfermode(Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffXfermode;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toXfermode"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/PorterDuffXfermode;
 
     invoke-direct {v0, p0}, Landroid/graphics/PorterDuffXfermode;-><init>(Landroid/graphics/PorterDuff$Mode;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toXfermode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/RectKt.smali b/com.discord/smali/androidx/core/graphics/RectKt.smali
index 5dfad752e0..e1d724e595 100644
--- a/com.discord/smali/androidx/core/graphics/RectKt.smali
+++ b/com.discord/smali/androidx/core/graphics/RectKt.smali
@@ -12,11 +12,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$and"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -25,20 +27,6 @@
     invoke-virtual {v0, p1}, Landroid/graphics/Rect;->intersect(Landroid/graphics/Rect;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$and"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final and(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/RectF;
@@ -49,11 +37,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$and"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -62,182 +52,114 @@
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->intersect(Landroid/graphics/RectF;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$and"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final component1(Landroid/graphics/RectF;)F
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/RectF;->left:F
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component1(Landroid/graphics/Rect;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/Rect;->left:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/graphics/RectF;)F
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/RectF;->top:F
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/graphics/Rect;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/Rect;->top:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component3(Landroid/graphics/RectF;)F
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component3"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/RectF;->right:F
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component3(Landroid/graphics/Rect;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component3"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/Rect;->right:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component4(Landroid/graphics/RectF;)F
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component4"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/RectF;->bottom:F
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component4(Landroid/graphics/Rect;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component4"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p0, p0, Landroid/graphics/Rect;->bottom:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final contains(Landroid/graphics/Rect;Landroid/graphics/Point;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p1, Landroid/graphics/Point;->x:I
 
@@ -248,30 +170,18 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final contains(Landroid/graphics/RectF;Landroid/graphics/PointF;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p1, Landroid/graphics/PointF;->x:F
 
@@ -282,26 +192,14 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final minus(Landroid/graphics/Rect;I)Landroid/graphics/Rect;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$minus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -312,25 +210,18 @@
     invoke-virtual {v0, p0, p0}, Landroid/graphics/Rect;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minus(Landroid/graphics/Rect;Landroid/graphics/Point;)Landroid/graphics/Rect;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "xy"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -347,26 +238,14 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/Rect;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "xy"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final minus(Landroid/graphics/RectF;F)Landroid/graphics/RectF;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$minus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -377,25 +256,18 @@
     invoke-virtual {v0, p0, p0}, Landroid/graphics/RectF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minus(Landroid/graphics/RectF;Landroid/graphics/PointF;)Landroid/graphics/RectF;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "xy"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -412,30 +284,18 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/RectF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "xy"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final minus(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -446,30 +306,18 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final minus(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -492,30 +340,18 @@
     invoke-virtual {p0, v0, p1}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
     return-object p0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final or(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Rect;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$or"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -524,30 +360,18 @@
     invoke-virtual {v0, p1}, Landroid/graphics/Rect;->union(Landroid/graphics/Rect;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$or"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final or(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/RectF;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$or"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -556,26 +380,14 @@
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->union(Landroid/graphics/RectF;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$or"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/Rect;I)Landroid/graphics/Rect;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -584,25 +396,18 @@
     invoke-virtual {v0, p1, p1}, Landroid/graphics/Rect;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/graphics/Rect;Landroid/graphics/Point;)Landroid/graphics/Rect;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "xy"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -615,30 +420,18 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/Rect;->offset(II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "xy"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Rect;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -647,26 +440,14 @@
     invoke-virtual {v0, p1}, Landroid/graphics/Rect;->union(Landroid/graphics/Rect;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/RectF;F)Landroid/graphics/RectF;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -675,25 +456,18 @@
     invoke-virtual {v0, p1, p1}, Landroid/graphics/RectF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/graphics/RectF;Landroid/graphics/PointF;)Landroid/graphics/RectF;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "xy"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -706,30 +480,18 @@
     invoke-virtual {v0, p0, p1}, Landroid/graphics/RectF;->offset(FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "xy"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/RectF;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -738,26 +500,14 @@
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->union(Landroid/graphics/RectF;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final times(Landroid/graphics/Rect;I)Landroid/graphics/Rect;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$times"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -788,21 +538,14 @@
     iput p0, v0, Landroid/graphics/Rect;->bottom:I
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$times"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final times(Landroid/graphics/RectF;F)Landroid/graphics/RectF;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$times"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -833,21 +576,14 @@
     iput p0, v0, Landroid/graphics/RectF;->bottom:F
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$times"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final times(Landroid/graphics/RectF;I)Landroid/graphics/RectF;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$times"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     int-to-float p1, p1
 
@@ -880,21 +616,14 @@
     iput p0, v0, Landroid/graphics/RectF;->bottom:F
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$times"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toRect(Landroid/graphics/RectF;)Landroid/graphics/Rect;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toRect"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -903,63 +632,42 @@
     invoke-virtual {p0, v0}, Landroid/graphics/RectF;->roundOut(Landroid/graphics/Rect;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toRect"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toRectF(Landroid/graphics/Rect;)Landroid/graphics/RectF;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toRectF"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0, p0}, Landroid/graphics/RectF;-><init>(Landroid/graphics/Rect;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toRectF"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toRegion(Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toRegion"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
     invoke-direct {v0, p0}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toRegion"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toRegion(Landroid/graphics/RectF;)Landroid/graphics/Region;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toRegion"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -972,53 +680,34 @@
     invoke-direct {p0, v0}, Landroid/graphics/Region;-><init>(Landroid/graphics/Rect;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toRegion"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final transform(Landroid/graphics/RectF;Landroid/graphics/Matrix;)Landroid/graphics/RectF;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$transform"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "m"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
     return-object p0
-
-    :cond_0
-    const-string p0, "m"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$transform"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final xor(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$xor"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -1029,30 +718,18 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$xor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final xor(Landroid/graphics/RectF;Landroid/graphics/RectF;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$xor"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -1075,18 +752,4 @@
     invoke-virtual {p0, v0, p1}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
     return-object p0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$xor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/RegionKt$iterator$1.smali b/com.discord/smali/androidx/core/graphics/RegionKt$iterator$1.smali
index baf4eada9d..c126ec2744 100644
--- a/com.discord/smali/androidx/core/graphics/RegionKt$iterator$1.smali
+++ b/com.discord/smali/androidx/core/graphics/RegionKt$iterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -23,7 +23,7 @@
         "Ljava/util/Iterator<",
         "Landroid/graphics/Rect;",
         ">;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
diff --git a/com.discord/smali/androidx/core/graphics/RegionKt.smali b/com.discord/smali/androidx/core/graphics/RegionKt.smali
index ce2b403bc5..fa3aa384ee 100644
--- a/com.discord/smali/androidx/core/graphics/RegionKt.smali
+++ b/com.discord/smali/androidx/core/graphics/RegionKt.smali
@@ -7,11 +7,13 @@
 .method public static final and(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$and"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -22,30 +24,18 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$and"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final and(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$and"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -56,30 +46,18 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$and"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final contains(Landroid/graphics/Region;Landroid/graphics/Point;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "p"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p1, Landroid/graphics/Point;->x:I
 
@@ -90,20 +68,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "p"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final forEach(Landroid/graphics/Region;Lkotlin/jvm/functions/Function1;)V
@@ -120,26 +84,28 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    new-instance v1, Landroid/graphics/RegionIterator;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p0}, Landroid/graphics/RegionIterator;-><init>(Landroid/graphics/Region;)V
+    new-instance v0, Landroid/graphics/RegionIterator;
+
+    invoke-direct {v0, p0}, Landroid/graphics/RegionIterator;-><init>(Landroid/graphics/Region;)V
 
     :goto_0
     new-instance p0, Landroid/graphics/Rect;
 
     invoke-direct {p0}, Landroid/graphics/Rect;-><init>()V
 
-    invoke-virtual {v1, p0}, Landroid/graphics/RegionIterator;->next(Landroid/graphics/Rect;)Z
+    invoke-virtual {v0, p0}, Landroid/graphics/RegionIterator;->next(Landroid/graphics/Rect;)Z
 
-    move-result v0
+    move-result v1
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
     return-void
 
@@ -147,20 +113,6 @@
     invoke-interface {p1, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final iterator(Landroid/graphics/Region;)Ljava/util/Iterator;
@@ -176,32 +128,27 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$iterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/graphics/RegionKt$iterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/graphics/RegionKt$iterator$1;-><init>(Landroid/graphics/Region;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$iterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minus(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -212,30 +159,18 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final minus(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -246,26 +181,14 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final not(Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$not"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -280,25 +203,18 @@
     invoke-virtual {v0, p0, v1}, Landroid/graphics/Region;->op(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$not"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final or(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$or"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -307,30 +223,18 @@
     invoke-virtual {v0, p1}, Landroid/graphics/Region;->union(Landroid/graphics/Rect;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$or"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final or(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$or"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -341,30 +245,18 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$or"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -373,30 +265,18 @@
     invoke-virtual {v0, p1}, Landroid/graphics/Region;->union(Landroid/graphics/Rect;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -407,26 +287,14 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final unaryMinus(Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$unaryMinus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -441,25 +309,18 @@
     invoke-virtual {v0, p0, v1}, Landroid/graphics/Region;->op(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$unaryMinus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final xor(Landroid/graphics/Region;Landroid/graphics/Rect;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$xor"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -470,30 +331,18 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Rect;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$xor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final xor(Landroid/graphics/Region;Landroid/graphics/Region;)Landroid/graphics/Region;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$xor"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "r"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Region;
 
@@ -504,18 +353,4 @@
     invoke-virtual {v0, p1, p0}, Landroid/graphics/Region;->op(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "r"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$xor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/ShaderKt.smali b/com.discord/smali/androidx/core/graphics/ShaderKt.smali
index 722a883e76..b16f30bee7 100644
--- a/com.discord/smali/androidx/core/graphics/ShaderKt.smali
+++ b/com.discord/smali/androidx/core/graphics/ShaderKt.smali
@@ -18,11 +18,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$transform"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Matrix;
 
@@ -35,18 +37,4 @@
     invoke-virtual {p0, v0}, Landroid/graphics/Shader;->setLocalMatrix(Landroid/graphics/Matrix;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$transform"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/drawable/BitmapDrawableKt.smali b/com.discord/smali/androidx/core/graphics/drawable/BitmapDrawableKt.smali
index 0fef88bef1..b424470bc3 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/BitmapDrawableKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/BitmapDrawableKt.smali
@@ -7,29 +7,17 @@
 .method public static final toDrawable(Landroid/graphics/Bitmap;Landroid/content/res/Resources;)Landroid/graphics/drawable/BitmapDrawable;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toDrawable"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "resources"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/drawable/BitmapDrawable;
 
     invoke-direct {v0, p1, p0}, Landroid/graphics/drawable/BitmapDrawable;-><init>(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "resources"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$toDrawable"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali b/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali
index 12fdf668e9..af706f3b2a 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/ColorDrawableKt.smali
@@ -24,7 +24,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toDrawable"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/drawable/ColorDrawable;
 
@@ -35,13 +37,4 @@
     invoke-direct {v0, p0}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toDrawable"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali b/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali
index ba3cb1b7a6..16d3e62e44 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/DrawableKt.smali
@@ -15,7 +15,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_4
+    const-string v0, "$this$toBitmap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p0, Landroid/graphics/drawable/BitmapDrawable;
 
@@ -33,7 +35,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getConfig()Landroid/graphics/Bitmap$Config;
 
@@ -60,7 +62,7 @@
 
     move-result-object p0
 
-    invoke-static {p0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 
@@ -77,7 +79,7 @@
 
     const-string p1, "Bitmap.createScaledBitma\u2026map, width, height, true)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 
@@ -118,18 +120,9 @@
 
     invoke-virtual {p0, v2, v3, v4, v0}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p3
-
-    :cond_4
-    const-string p0, "$this$toBitmap"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic toBitmap$default(Landroid/graphics/drawable/Drawable;IILandroid/graphics/Bitmap$Config;ILjava/lang/Object;)Landroid/graphics/Bitmap;
@@ -168,7 +161,7 @@
 .end method
 
 .method public static final updateBounds(Landroid/graphics/drawable/Drawable;IIII)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/Px;
         .end annotation
@@ -186,20 +179,13 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$updateBounds"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$updateBounds"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic updateBounds$default(Landroid/graphics/drawable/Drawable;IIIIILjava/lang/Object;)V
diff --git a/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali b/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali
index 4f28fef314..39953756f6 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/IconCompat.smali
@@ -281,7 +281,7 @@
 
     const-string v1, "IconCompat"
 
-    invoke-static {p0, v0, v1}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, v0, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -3311,7 +3311,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    const-string v1, "x"
+    const-string/jumbo v1, "x"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -3365,8 +3365,6 @@
 
     return-object v0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_3
diff --git a/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali b/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali
index 196d309b80..1cb12817ad 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/IconKt.smali
@@ -10,7 +10,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toAdaptiveIcon"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/graphics/drawable/Icon;->createWithAdaptiveBitmap(Landroid/graphics/Bitmap;)Landroid/graphics/drawable/Icon;
 
@@ -18,18 +20,9 @@
 
     const-string v0, "Icon.createWithAdaptiveBitmap(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toAdaptiveIcon"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toIcon(Landroid/graphics/Bitmap;)Landroid/graphics/drawable/Icon;
@@ -38,7 +31,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toIcon"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/graphics/drawable/Icon;->createWithBitmap(Landroid/graphics/Bitmap;)Landroid/graphics/drawable/Icon;
 
@@ -46,18 +41,9 @@
 
     const-string v0, "Icon.createWithBitmap(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toIcon"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toIcon(Landroid/net/Uri;)Landroid/graphics/drawable/Icon;
@@ -66,7 +52,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toIcon"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/graphics/drawable/Icon;->createWithContentUri(Landroid/net/Uri;)Landroid/graphics/drawable/Icon;
 
@@ -74,18 +62,9 @@
 
     const-string v0, "Icon.createWithContentUri(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toIcon"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toIcon([B)Landroid/graphics/drawable/Icon;
@@ -94,28 +73,21 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toIcon"
 
-    const/4 v0, 0x0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    array-length v1, p0
+    array-length v0, p0
 
-    invoke-static {p0, v0, v1}, Landroid/graphics/drawable/Icon;->createWithData([BII)Landroid/graphics/drawable/Icon;
+    const/4 v1, 0x0
+
+    invoke-static {p0, v1, v0}, Landroid/graphics/drawable/Icon;->createWithData([BII)Landroid/graphics/drawable/Icon;
 
     move-result-object p0
 
     const-string v0, "Icon.createWithData(this, 0, size)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toIcon"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali
index c4ef66d812..8809f0185c 100644
--- a/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali
+++ b/com.discord/smali/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.smali
@@ -124,7 +124,7 @@
 
     const-string v1, "RoundedBitmapDrawableFa"
 
-    invoke-static {v0, p1, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p1, v1}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
     return-object p0
diff --git a/com.discord/smali/androidx/core/ktx/R$attr.smali b/com.discord/smali/androidx/core/ktx/R$attr.smali
index 1b8f019c87..9c1e7647d9 100644
--- a/com.discord/smali/androidx/core/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/core/ktx/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$drawable.smali b/com.discord/smali/androidx/core/ktx/R$drawable.smali
index da776015c8..225e55317b 100644
--- a/com.discord/smali/androidx/core/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$id.smali b/com.discord/smali/androidx/core/ktx/R$id.smali
index c4b8b4fea7..7e4d292639 100644
--- a/com.discord/smali/androidx/core/ktx/R$id.smali
+++ b/com.discord/smali/androidx/core/ktx/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$string.smali b/com.discord/smali/androidx/core/ktx/R$string.smali
index d21b5bd5d9..b60ad9d6da 100644
--- a/com.discord/smali/androidx/core/ktx/R$string.smali
+++ b/com.discord/smali/androidx/core/ktx/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$style.smali b/com.discord/smali/androidx/core/ktx/R$style.smali
index 71df9f10b3..ebf9f0afbc 100644
--- a/com.discord/smali/androidx/core/ktx/R$style.smali
+++ b/com.discord/smali/androidx/core/ktx/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$styleable.smali b/com.discord/smali/androidx/core/ktx/R$styleable.smali
index d1369dc3e5..1e601ff9fb 100644
--- a/com.discord/smali/androidx/core/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/core/location/LocationKt.smali b/com.discord/smali/androidx/core/location/LocationKt.smali
index a0bcffed95..16143df291 100644
--- a/com.discord/smali/androidx/core/location/LocationKt.smali
+++ b/com.discord/smali/androidx/core/location/LocationKt.smali
@@ -7,41 +7,27 @@
 .method public static final component1(Landroid/location/Location;)D
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/location/Location;->getLatitude()D
 
     move-result-wide v0
 
     return-wide v0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/location/Location;)D
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/location/Location;->getLongitude()D
 
     move-result-wide v0
 
     return-wide v0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/net/UriKt.smali b/com.discord/smali/androidx/core/net/UriKt.smali
index c3834c57db..260f0d7fad 100644
--- a/com.discord/smali/androidx/core/net/UriKt.smali
+++ b/com.discord/smali/androidx/core/net/UriKt.smali
@@ -7,7 +7,9 @@
 .method public static final toFile(Landroid/net/Uri;)Ljava/io/File;
     .locals 2
 
-    if-eqz p0, :cond_2
+    const-string v0, "$this$toFile"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
@@ -15,7 +17,7 @@
 
     const-string v1, "file"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -82,21 +84,14 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_2
-    const-string p0, "$this$toFile"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toUri(Ljava/io/File;)Landroid/net/Uri;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toUri"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/net/Uri;->fromFile(Ljava/io/File;)Landroid/net/Uri;
 
@@ -104,24 +99,17 @@
 
     const-string v0, "Uri.fromFile(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toUri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toUri(Ljava/lang/String;)Landroid/net/Uri;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toUri"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
@@ -129,16 +117,7 @@
 
     const-string v0, "Uri.parse(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toUri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/os/BundleKt.smali b/com.discord/smali/androidx/core/os/BundleKt.smali
index e9bec8b365..70495f95bb 100644
--- a/com.discord/smali/androidx/core/os/BundleKt.smali
+++ b/com.discord/smali/androidx/core/os/BundleKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final varargs bundleOf([Lkotlin/Pair;)Landroid/os/Bundle;
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "([",
@@ -18,280 +18,282 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "pairs"
 
-    if-eqz p0, :cond_1f
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Landroid/os/Bundle;
+    new-instance v0, Landroid/os/Bundle;
 
-    array-length v2, p0
+    array-length v1, p0
 
-    invoke-direct {v1, v2}, Landroid/os/Bundle;-><init>(I)V
+    invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(I)V
 
-    array-length v2, p0
+    array-length v1, p0
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-ge v3, v2, :cond_1e
+    if-ge v2, v1, :cond_1e
 
-    aget-object v4, p0, v3
+    aget-object v3, p0, v2
 
-    iget-object v5, v4, Lkotlin/Pair;->first:Ljava/lang/Object;
+    iget-object v4, v3, Lkotlin/Pair;->first:Ljava/lang/Object;
 
-    check-cast v5, Ljava/lang/String;
+    check-cast v4, Ljava/lang/String;
 
-    iget-object v4, v4, Lkotlin/Pair;->second:Ljava/lang/Object;
+    iget-object v3, v3, Lkotlin/Pair;->second:Ljava/lang/Object;
 
-    if-nez v4, :cond_0
+    const/4 v5, 0x0
 
-    invoke-virtual {v1, v5, v0}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    if-nez v3, :cond_0
+
+    invoke-virtual {v0, v4, v5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_1
 
     :cond_0
-    instance-of v6, v4, Ljava/lang/Boolean;
+    instance-of v6, v3, Ljava/lang/Boolean;
 
     if-eqz v6, :cond_1
 
-    check-cast v4, Ljava/lang/Boolean;
+    check-cast v3, Ljava/lang/Boolean;
 
-    invoke-virtual {v4}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v3}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
     goto/16 :goto_1
 
     :cond_1
-    instance-of v6, v4, Ljava/lang/Byte;
+    instance-of v6, v3, Ljava/lang/Byte;
 
     if-eqz v6, :cond_2
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->byteValue()B
+    invoke-virtual {v3}, Ljava/lang/Number;->byteValue()B
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putByte(Ljava/lang/String;B)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putByte(Ljava/lang/String;B)V
 
     goto/16 :goto_1
 
     :cond_2
-    instance-of v6, v4, Ljava/lang/Character;
+    instance-of v6, v3, Ljava/lang/Character;
 
     if-eqz v6, :cond_3
 
-    check-cast v4, Ljava/lang/Character;
+    check-cast v3, Ljava/lang/Character;
 
-    invoke-virtual {v4}, Ljava/lang/Character;->charValue()C
+    invoke-virtual {v3}, Ljava/lang/Character;->charValue()C
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putChar(Ljava/lang/String;C)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putChar(Ljava/lang/String;C)V
 
     goto/16 :goto_1
 
     :cond_3
-    instance-of v6, v4, Ljava/lang/Double;
+    instance-of v6, v3, Ljava/lang/Double;
 
     if-eqz v6, :cond_4
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->doubleValue()D
+    invoke-virtual {v3}, Ljava/lang/Number;->doubleValue()D
 
-    move-result-wide v6
+    move-result-wide v5
 
-    invoke-virtual {v1, v5, v6, v7}, Landroid/os/Bundle;->putDouble(Ljava/lang/String;D)V
+    invoke-virtual {v0, v4, v5, v6}, Landroid/os/Bundle;->putDouble(Ljava/lang/String;D)V
 
     goto/16 :goto_1
 
     :cond_4
-    instance-of v6, v4, Ljava/lang/Float;
+    instance-of v6, v3, Ljava/lang/Float;
 
     if-eqz v6, :cond_5
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->floatValue()F
+    invoke-virtual {v3}, Ljava/lang/Number;->floatValue()F
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putFloat(Ljava/lang/String;F)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putFloat(Ljava/lang/String;F)V
 
     goto/16 :goto_1
 
     :cond_5
-    instance-of v6, v4, Ljava/lang/Integer;
+    instance-of v6, v3, Ljava/lang/Integer;
 
     if-eqz v6, :cond_6
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->intValue()I
+    invoke-virtual {v3}, Ljava/lang/Number;->intValue()I
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     goto/16 :goto_1
 
     :cond_6
-    instance-of v6, v4, Ljava/lang/Long;
+    instance-of v6, v3, Ljava/lang/Long;
 
     if-eqz v6, :cond_7
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    invoke-virtual {v1, v5, v6, v7}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v0, v4, v5, v6}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     goto/16 :goto_1
 
     :cond_7
-    instance-of v6, v4, Ljava/lang/Short;
+    instance-of v6, v3, Ljava/lang/Short;
 
     if-eqz v6, :cond_8
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->shortValue()S
+    invoke-virtual {v3}, Ljava/lang/Number;->shortValue()S
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putShort(Ljava/lang/String;S)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putShort(Ljava/lang/String;S)V
 
     goto/16 :goto_1
 
     :cond_8
-    instance-of v6, v4, Landroid/os/Bundle;
+    instance-of v6, v3, Landroid/os/Bundle;
 
     if-eqz v6, :cond_9
 
-    check-cast v4, Landroid/os/Bundle;
+    check-cast v3, Landroid/os/Bundle;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
 
     goto/16 :goto_1
 
     :cond_9
-    instance-of v6, v4, Ljava/lang/CharSequence;
+    instance-of v6, v3, Ljava/lang/CharSequence;
 
     if-eqz v6, :cond_a
 
-    check-cast v4, Ljava/lang/CharSequence;
+    check-cast v3, Ljava/lang/CharSequence;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
     goto/16 :goto_1
 
     :cond_a
-    instance-of v6, v4, Landroid/os/Parcelable;
+    instance-of v6, v3, Landroid/os/Parcelable;
 
     if-eqz v6, :cond_b
 
-    check-cast v4, Landroid/os/Parcelable;
+    check-cast v3, Landroid/os/Parcelable;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     goto/16 :goto_1
 
     :cond_b
-    instance-of v6, v4, [Z
+    instance-of v6, v3, [Z
 
     if-eqz v6, :cond_c
 
-    check-cast v4, [Z
+    check-cast v3, [Z
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putBooleanArray(Ljava/lang/String;[Z)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putBooleanArray(Ljava/lang/String;[Z)V
 
     goto/16 :goto_1
 
     :cond_c
-    instance-of v6, v4, [B
+    instance-of v6, v3, [B
 
     if-eqz v6, :cond_d
 
-    check-cast v4, [B
+    check-cast v3, [B
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putByteArray(Ljava/lang/String;[B)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putByteArray(Ljava/lang/String;[B)V
 
     goto/16 :goto_1
 
     :cond_d
-    instance-of v6, v4, [C
+    instance-of v6, v3, [C
 
     if-eqz v6, :cond_e
 
-    check-cast v4, [C
+    check-cast v3, [C
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putCharArray(Ljava/lang/String;[C)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putCharArray(Ljava/lang/String;[C)V
 
     goto/16 :goto_1
 
     :cond_e
-    instance-of v6, v4, [D
+    instance-of v6, v3, [D
 
     if-eqz v6, :cond_f
 
-    check-cast v4, [D
+    check-cast v3, [D
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putDoubleArray(Ljava/lang/String;[D)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putDoubleArray(Ljava/lang/String;[D)V
 
     goto/16 :goto_1
 
     :cond_f
-    instance-of v6, v4, [F
+    instance-of v6, v3, [F
 
     if-eqz v6, :cond_10
 
-    check-cast v4, [F
+    check-cast v3, [F
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putFloatArray(Ljava/lang/String;[F)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putFloatArray(Ljava/lang/String;[F)V
 
     goto/16 :goto_1
 
     :cond_10
-    instance-of v6, v4, [I
+    instance-of v6, v3, [I
 
     if-eqz v6, :cond_11
 
-    check-cast v4, [I
+    check-cast v3, [I
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putIntArray(Ljava/lang/String;[I)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putIntArray(Ljava/lang/String;[I)V
 
     goto/16 :goto_1
 
     :cond_11
-    instance-of v6, v4, [J
+    instance-of v6, v3, [J
 
     if-eqz v6, :cond_12
 
-    check-cast v4, [J
+    check-cast v3, [J
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putLongArray(Ljava/lang/String;[J)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putLongArray(Ljava/lang/String;[J)V
 
     goto/16 :goto_1
 
     :cond_12
-    instance-of v6, v4, [S
+    instance-of v6, v3, [S
 
     if-eqz v6, :cond_13
 
-    check-cast v4, [S
+    check-cast v3, [S
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putShortArray(Ljava/lang/String;[S)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putShortArray(Ljava/lang/String;[S)V
 
     goto/16 :goto_1
 
     :cond_13
-    instance-of v6, v4, [Ljava/lang/Object;
+    instance-of v6, v3, [Ljava/lang/Object;
 
     const/16 v7, 0x22
 
@@ -299,7 +301,7 @@
 
     if-eqz v6, :cond_19
 
-    invoke-virtual {v4}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v6
 
@@ -309,66 +311,66 @@
 
     if-eqz v6, :cond_18
 
-    const-string v9, "value::class.java.componentType!!"
+    const-string/jumbo v5, "value::class.java.componentType!!"
 
-    invoke-static {v6, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v9, Landroid/os/Parcelable;
+    const-class v5, Landroid/os/Parcelable;
 
-    invoke-virtual {v9, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+    invoke-virtual {v5, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_14
+    if-eqz v5, :cond_14
 
-    check-cast v4, [Landroid/os/Parcelable;
+    check-cast v3, [Landroid/os/Parcelable;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putParcelableArray(Ljava/lang/String;[Landroid/os/Parcelable;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putParcelableArray(Ljava/lang/String;[Landroid/os/Parcelable;)V
 
     goto/16 :goto_1
 
     :cond_14
-    const-class v9, Ljava/lang/String;
+    const-class v5, Ljava/lang/String;
 
-    invoke-virtual {v9, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+    invoke-virtual {v5, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_15
+    if-eqz v5, :cond_15
 
-    check-cast v4, [Ljava/lang/String;
+    check-cast v3, [Ljava/lang/String;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putStringArray(Ljava/lang/String;[Ljava/lang/String;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putStringArray(Ljava/lang/String;[Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_15
-    const-class v9, Ljava/lang/CharSequence;
+    const-class v5, Ljava/lang/CharSequence;
 
-    invoke-virtual {v9, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+    invoke-virtual {v5, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_16
+    if-eqz v5, :cond_16
 
-    check-cast v4, [Ljava/lang/CharSequence;
+    check-cast v3, [Ljava/lang/CharSequence;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putCharSequenceArray(Ljava/lang/String;[Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putCharSequenceArray(Ljava/lang/String;[Ljava/lang/CharSequence;)V
 
     goto :goto_1
 
     :cond_16
-    const-class v9, Ljava/io/Serializable;
+    const-class v5, Ljava/io/Serializable;
 
-    invoke-virtual {v9, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+    invoke-virtual {v5, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_17
+    if-eqz v5, :cond_17
 
-    check-cast v4, Ljava/io/Serializable;
+    check-cast v3, Ljava/io/Serializable;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putSerializable(Ljava/lang/String;Ljava/io/Serializable;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putSerializable(Ljava/lang/String;Ljava/io/Serializable;)V
 
     goto :goto_1
 
@@ -391,7 +393,7 @@
 
     invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
@@ -404,59 +406,59 @@
     throw v0
 
     :cond_18
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
-    throw v0
+    throw v5
 
     :cond_19
-    instance-of v6, v4, Ljava/io/Serializable;
+    instance-of v5, v3, Ljava/io/Serializable;
 
-    if-eqz v6, :cond_1a
+    if-eqz v5, :cond_1a
 
-    check-cast v4, Ljava/io/Serializable;
+    check-cast v3, Ljava/io/Serializable;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putSerializable(Ljava/lang/String;Ljava/io/Serializable;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putSerializable(Ljava/lang/String;Ljava/io/Serializable;)V
 
     goto :goto_1
 
     :cond_1a
-    instance-of v6, v4, Landroid/os/IBinder;
+    instance-of v5, v3, Landroid/os/IBinder;
 
-    if-eqz v6, :cond_1b
+    if-eqz v5, :cond_1b
 
-    check-cast v4, Landroid/os/IBinder;
+    check-cast v3, Landroid/os/IBinder;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putBinder(Ljava/lang/String;Landroid/os/IBinder;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putBinder(Ljava/lang/String;Landroid/os/IBinder;)V
 
     goto :goto_1
 
     :cond_1b
-    instance-of v6, v4, Landroid/util/Size;
+    instance-of v5, v3, Landroid/util/Size;
 
-    if-eqz v6, :cond_1c
+    if-eqz v5, :cond_1c
 
-    check-cast v4, Landroid/util/Size;
+    check-cast v3, Landroid/util/Size;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putSize(Ljava/lang/String;Landroid/util/Size;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putSize(Ljava/lang/String;Landroid/util/Size;)V
 
     goto :goto_1
 
     :cond_1c
-    instance-of v6, v4, Landroid/util/SizeF;
+    instance-of v5, v3, Landroid/util/SizeF;
 
-    if-eqz v6, :cond_1d
+    if-eqz v5, :cond_1d
 
-    check-cast v4, Landroid/util/SizeF;
+    check-cast v3, Landroid/util/SizeF;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/Bundle;->putSizeF(Ljava/lang/String;Landroid/util/SizeF;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/Bundle;->putSizeF(Ljava/lang/String;Landroid/util/SizeF;)V
 
     :goto_1
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_0
 
     :cond_1d
-    invoke-virtual {v4}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object p0
 
@@ -478,7 +480,7 @@
 
     invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
@@ -491,12 +493,5 @@
     throw v0
 
     :cond_1e
-    return-object v1
-
-    :cond_1f
-    const-string p0, "pairs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
diff --git a/com.discord/smali/androidx/core/os/HandlerKt.smali b/com.discord/smali/androidx/core/os/HandlerKt.smali
index 5aa28c3611..bbbcb5eec6 100644
--- a/com.discord/smali/androidx/core/os/HandlerKt.smali
+++ b/com.discord/smali/androidx/core/os/HandlerKt.smali
@@ -19,11 +19,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$postAtTime"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/os/HandlerKt$postAtTime$runnable$1;
 
@@ -32,37 +34,25 @@
     invoke-virtual {p0, v0, p3, p1, p2}, Landroid/os/Handler;->postAtTime(Ljava/lang/Runnable;Ljava/lang/Object;J)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$postAtTime"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static postAtTime$default(Landroid/os/Handler;JLjava/lang/Object;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Ljava/lang/Runnable;
+.method public static synthetic postAtTime$default(Landroid/os/Handler;JLjava/lang/Object;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Ljava/lang/Runnable;
     .locals 0
 
     and-int/lit8 p5, p5, 0x2
 
-    const/4 p6, 0x0
-
     if-eqz p5, :cond_0
 
-    move-object p3, p6
+    const/4 p3, 0x0
 
     :cond_0
-    if-eqz p0, :cond_2
+    const-string p5, "$this$postAtTime"
 
-    if-eqz p4, :cond_1
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p5, "action"
+
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p5, Landroidx/core/os/HandlerKt$postAtTime$runnable$1;
 
@@ -71,20 +61,6 @@
     invoke-virtual {p0, p5, p3, p1, p2}, Landroid/os/Handler;->postAtTime(Ljava/lang/Runnable;Ljava/lang/Object;J)Z
 
     return-object p5
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_2
-    const-string p0, "$this$postAtTime"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
 .end method
 
 .method public static final postDelayed(Landroid/os/Handler;JLjava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;
@@ -102,11 +78,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$postDelayed"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "action"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/os/HandlerKt$postDelayed$runnable$1;
 
@@ -123,37 +101,25 @@
 
     :goto_0
     return-object v0
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$postDelayed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static postDelayed$default(Landroid/os/Handler;JLjava/lang/Object;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Ljava/lang/Runnable;
+.method public static synthetic postDelayed$default(Landroid/os/Handler;JLjava/lang/Object;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Ljava/lang/Runnable;
     .locals 0
 
     and-int/lit8 p5, p5, 0x2
 
-    const/4 p6, 0x0
-
     if-eqz p5, :cond_0
 
-    move-object p3, p6
+    const/4 p3, 0x0
 
     :cond_0
-    if-eqz p0, :cond_3
+    const-string p5, "$this$postDelayed"
 
-    if-eqz p4, :cond_2
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p5, "action"
+
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p5, Landroidx/core/os/HandlerKt$postDelayed$runnable$1;
 
@@ -170,18 +136,4 @@
 
     :goto_0
     return-object p5
-
-    :cond_2
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_3
-    const-string p0, "$this$postDelayed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
 .end method
diff --git a/com.discord/smali/androidx/core/os/PersistableBundleKt.smali b/com.discord/smali/androidx/core/os/PersistableBundleKt.smali
index 59781fc563..f97b3565f3 100644
--- a/com.discord/smali/androidx/core/os/PersistableBundleKt.smali
+++ b/com.discord/smali/androidx/core/os/PersistableBundleKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final varargs persistableBundleOf([Lkotlin/Pair;)Landroid/os/PersistableBundle;
-    .locals 10
+    .locals 9
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x15
     .end annotation
@@ -22,39 +22,41 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "pairs"
 
-    if-eqz p0, :cond_10
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Landroid/os/PersistableBundle;
+    new-instance v0, Landroid/os/PersistableBundle;
 
-    array-length v2, p0
+    array-length v1, p0
 
-    invoke-direct {v1, v2}, Landroid/os/PersistableBundle;-><init>(I)V
+    invoke-direct {v0, v1}, Landroid/os/PersistableBundle;-><init>(I)V
 
-    array-length v2, p0
+    array-length v1, p0
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-ge v3, v2, :cond_f
+    if-ge v2, v1, :cond_f
 
-    aget-object v4, p0, v3
+    aget-object v3, p0, v2
 
-    iget-object v5, v4, Lkotlin/Pair;->first:Ljava/lang/Object;
+    iget-object v4, v3, Lkotlin/Pair;->first:Ljava/lang/Object;
 
-    check-cast v5, Ljava/lang/String;
+    check-cast v4, Ljava/lang/String;
 
-    iget-object v4, v4, Lkotlin/Pair;->second:Ljava/lang/Object;
+    iget-object v3, v3, Lkotlin/Pair;->second:Ljava/lang/Object;
 
-    if-nez v4, :cond_0
+    const/4 v5, 0x0
 
-    invoke-virtual {v1, v5, v0}, Landroid/os/PersistableBundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    if-nez v3, :cond_0
+
+    invoke-virtual {v0, v4, v5}, Landroid/os/PersistableBundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_1
 
     :cond_0
-    instance-of v6, v4, Ljava/lang/Boolean;
+    instance-of v6, v3, Ljava/lang/Boolean;
 
     const/16 v7, 0x16
 
@@ -62,17 +64,17 @@
 
     if-eqz v6, :cond_2
 
-    sget v6, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v5, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-lt v6, v7, :cond_1
+    if-lt v5, v7, :cond_1
 
-    check-cast v4, Ljava/lang/Boolean;
+    check-cast v3, Ljava/lang/Boolean;
 
-    invoke-virtual {v4}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v3}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putBoolean(Ljava/lang/String;Z)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putBoolean(Ljava/lang/String;Z)V
 
     goto/16 :goto_1
 
@@ -87,7 +89,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
@@ -100,73 +102,73 @@
     throw p0
 
     :cond_2
-    instance-of v6, v4, Ljava/lang/Double;
+    instance-of v6, v3, Ljava/lang/Double;
 
     if-eqz v6, :cond_3
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->doubleValue()D
+    invoke-virtual {v3}, Ljava/lang/Number;->doubleValue()D
 
-    move-result-wide v6
+    move-result-wide v5
 
-    invoke-virtual {v1, v5, v6, v7}, Landroid/os/PersistableBundle;->putDouble(Ljava/lang/String;D)V
+    invoke-virtual {v0, v4, v5, v6}, Landroid/os/PersistableBundle;->putDouble(Ljava/lang/String;D)V
 
     goto/16 :goto_1
 
     :cond_3
-    instance-of v6, v4, Ljava/lang/Integer;
+    instance-of v6, v3, Ljava/lang/Integer;
 
     if-eqz v6, :cond_4
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->intValue()I
+    invoke-virtual {v3}, Ljava/lang/Number;->intValue()I
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putInt(Ljava/lang/String;I)V
 
     goto/16 :goto_1
 
     :cond_4
-    instance-of v6, v4, Ljava/lang/Long;
+    instance-of v6, v3, Ljava/lang/Long;
 
     if-eqz v6, :cond_5
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    invoke-virtual {v1, v5, v6, v7}, Landroid/os/PersistableBundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v0, v4, v5, v6}, Landroid/os/PersistableBundle;->putLong(Ljava/lang/String;J)V
 
     goto/16 :goto_1
 
     :cond_5
-    instance-of v6, v4, Ljava/lang/String;
+    instance-of v6, v3, Ljava/lang/String;
 
     if-eqz v6, :cond_6
 
-    check-cast v4, Ljava/lang/String;
+    check-cast v3, Ljava/lang/String;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_6
-    instance-of v6, v4, [Z
+    instance-of v6, v3, [Z
 
     if-eqz v6, :cond_8
 
-    sget v6, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v5, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-lt v6, v7, :cond_7
+    if-lt v5, v7, :cond_7
 
-    check-cast v4, [Z
+    check-cast v3, [Z
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putBooleanArray(Ljava/lang/String;[Z)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putBooleanArray(Ljava/lang/String;[Z)V
 
     goto :goto_1
 
@@ -181,7 +183,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
@@ -194,46 +196,46 @@
     throw p0
 
     :cond_8
-    instance-of v6, v4, [D
+    instance-of v6, v3, [D
 
     if-eqz v6, :cond_9
 
-    check-cast v4, [D
+    check-cast v3, [D
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putDoubleArray(Ljava/lang/String;[D)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putDoubleArray(Ljava/lang/String;[D)V
 
     goto :goto_1
 
     :cond_9
-    instance-of v6, v4, [I
+    instance-of v6, v3, [I
 
     if-eqz v6, :cond_a
 
-    check-cast v4, [I
+    check-cast v3, [I
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putIntArray(Ljava/lang/String;[I)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putIntArray(Ljava/lang/String;[I)V
 
     goto :goto_1
 
     :cond_a
-    instance-of v6, v4, [J
+    instance-of v6, v3, [J
 
     if-eqz v6, :cond_b
 
-    check-cast v4, [J
+    check-cast v3, [J
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putLongArray(Ljava/lang/String;[J)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putLongArray(Ljava/lang/String;[J)V
 
     goto :goto_1
 
     :cond_b
-    instance-of v6, v4, [Ljava/lang/Object;
+    instance-of v6, v3, [Ljava/lang/Object;
 
     const-string v7, " for key \""
 
     if-eqz v6, :cond_e
 
-    invoke-virtual {v4}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object v6
 
@@ -243,24 +245,24 @@
 
     if-eqz v6, :cond_d
 
-    const-string v9, "value::class.java.componentType!!"
+    const-string/jumbo v5, "value::class.java.componentType!!"
 
-    invoke-static {v6, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v9, Ljava/lang/String;
+    const-class v5, Ljava/lang/String;
 
-    invoke-virtual {v9, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+    invoke-virtual {v5, v6}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
 
-    move-result v9
+    move-result v5
 
-    if-eqz v9, :cond_c
+    if-eqz v5, :cond_c
 
-    check-cast v4, [Ljava/lang/String;
+    check-cast v3, [Ljava/lang/String;
 
-    invoke-virtual {v1, v5, v4}, Landroid/os/PersistableBundle;->putStringArray(Ljava/lang/String;[Ljava/lang/String;)V
+    invoke-virtual {v0, v4, v3}, Landroid/os/PersistableBundle;->putStringArray(Ljava/lang/String;[Ljava/lang/String;)V
 
     :goto_1
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto/16 :goto_0
 
@@ -283,7 +285,7 @@
 
     invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
@@ -296,12 +298,12 @@
     throw v0
 
     :cond_d
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
-    throw v0
+    throw v5
 
     :cond_e
-    invoke-virtual {v4}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
     move-result-object p0
 
@@ -323,7 +325,7 @@
 
     invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
@@ -336,12 +338,5 @@
     throw v0
 
     :cond_f
-    return-object v1
-
-    :cond_10
-    const-string p0, "pairs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
diff --git a/com.discord/smali/androidx/core/os/TraceKt.smali b/com.discord/smali/androidx/core/os/TraceKt.smali
index 6dc2bdc305..6a82ec2061 100644
--- a/com.discord/smali/androidx/core/os/TraceKt.smali
+++ b/com.discord/smali/androidx/core/os/TraceKt.smali
@@ -17,11 +17,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "sectionName"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/core/os/TraceCompat;->beginSection(Ljava/lang/String;)V
 
@@ -42,18 +44,4 @@
     invoke-static {}, Landroidx/core/os/TraceCompat;->endSection()V
 
     throw p0
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "sectionName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/text/CharSequenceKt.smali b/com.discord/smali/androidx/core/text/CharSequenceKt.smali
index 44878ee541..e531b9ec51 100644
--- a/com.discord/smali/androidx/core/text/CharSequenceKt.smali
+++ b/com.discord/smali/androidx/core/text/CharSequenceKt.smali
@@ -5,43 +5,29 @@
 
 # direct methods
 .method public static final isDigitsOnly(Ljava/lang/CharSequence;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$isDigitsOnly"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/text/TextUtils;->isDigitsOnly(Ljava/lang/CharSequence;)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$isDigitsOnly"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final trimmedLength(Ljava/lang/CharSequence;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$trimmedLength"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/text/TextUtils;->getTrimmedLength(Ljava/lang/CharSequence;)I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$trimmedLength"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/text/HtmlKt.smali b/com.discord/smali/androidx/core/text/HtmlKt.smali
index 774e15fb7f..f95865caa0 100644
--- a/com.discord/smali/androidx/core/text/HtmlKt.smali
+++ b/com.discord/smali/androidx/core/text/HtmlKt.smali
@@ -5,9 +5,11 @@
 
 # direct methods
 .method public static final parseAsHtml(Ljava/lang/String;ILandroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;)Landroid/text/Spanned;
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$parseAsHtml"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2, p3}, Landroidx/core/text/HtmlCompat;->fromHtml(Ljava/lang/String;ILandroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;)Landroid/text/Spanned;
 
@@ -15,21 +17,12 @@
 
     const-string p1, "HtmlCompat.fromHtml(this\u2026 imageGetter, tagHandler)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$parseAsHtml"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static parseAsHtml$default(Ljava/lang/String;ILandroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;ILjava/lang/Object;)Landroid/text/Spanned;
+.method public static synthetic parseAsHtml$default(Ljava/lang/String;ILandroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;ILjava/lang/Object;)Landroid/text/Spanned;
     .locals 1
 
     and-int/lit8 p5, p4, 0x1
@@ -55,7 +48,9 @@
     move-object p3, v0
 
     :cond_2
-    if-eqz p0, :cond_3
+    const-string p4, "$this$parseAsHtml"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2, p3}, Landroidx/core/text/HtmlCompat;->fromHtml(Ljava/lang/String;ILandroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;)Landroid/text/Spanned;
 
@@ -63,22 +58,17 @@
 
     const-string p1, "HtmlCompat.fromHtml(this\u2026 imageGetter, tagHandler)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_3
-    const-string p0, "$this$parseAsHtml"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final toHtml(Landroid/text/Spanned;I)Ljava/lang/String;
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toHtml"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/text/HtmlCompat;->toHtml(Landroid/text/Spanned;I)Ljava/lang/String;
 
@@ -86,21 +76,12 @@
 
     const-string p1, "HtmlCompat.toHtml(this, option)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toHtml"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static toHtml$default(Landroid/text/Spanned;IILjava/lang/Object;)Ljava/lang/String;
+.method public static synthetic toHtml$default(Landroid/text/Spanned;IILjava/lang/Object;)Ljava/lang/String;
     .locals 0
 
     and-int/lit8 p2, p2, 0x1
@@ -110,7 +91,9 @@
     const/4 p1, 0x0
 
     :cond_0
-    if-eqz p0, :cond_1
+    const-string p2, "$this$toHtml"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/text/HtmlCompat;->toHtml(Landroid/text/Spanned;I)Ljava/lang/String;
 
@@ -118,16 +101,7 @@
 
     const-string p1, "HtmlCompat.toHtml(this, option)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_1
-    const-string p0, "$this$toHtml"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/text/LocaleKt.smali b/com.discord/smali/androidx/core/text/LocaleKt.smali
index c8c599b6f5..23d899d852 100644
--- a/com.discord/smali/androidx/core/text/LocaleKt.smali
+++ b/com.discord/smali/androidx/core/text/LocaleKt.smali
@@ -5,25 +5,18 @@
 
 # direct methods
 .method public static final getLayoutDirection(Ljava/util/Locale;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x11
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$layoutDirection"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/text/TextUtils;->getLayoutDirectionFromLocale(Ljava/util/Locale;)I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$layoutDirection"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali b/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali
index 6b32c0ba5d..ae26d8c24b 100644
--- a/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali
+++ b/com.discord/smali/androidx/core/text/SpannableStringBuilderKt.smali
@@ -24,11 +24,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$backgroundColor"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/BackgroundColorSpan;
 
@@ -49,20 +51,6 @@
     invoke-virtual {p0, v0, p1, p2, v1}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$backgroundColor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final bold(Landroid/text/SpannableStringBuilder;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -80,11 +68,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$bold"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/StyleSpan;
 
@@ -107,20 +97,6 @@
     invoke-virtual {p0, v0, v1, p1, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$bold"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final buildSpannedString(Lkotlin/jvm/functions/Function1;)Landroid/text/SpannedString;
@@ -137,7 +113,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/SpannableStringBuilder;
 
@@ -150,15 +128,6 @@
     invoke-direct {p0, v0}, Landroid/text/SpannedString;-><init>(Ljava/lang/CharSequence;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final color(Landroid/text/SpannableStringBuilder;ILkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -181,11 +150,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$color"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/ForegroundColorSpan;
 
@@ -206,20 +177,6 @@
     invoke-virtual {p0, v0, p1, p2, v1}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$color"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final inSpans(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -238,13 +195,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$inSpans"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "span"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "builderAction"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/text/SpannableStringBuilder;->length()I
 
@@ -261,27 +222,6 @@
     invoke-virtual {p0, p1, v0, p2, v1}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "span"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$inSpans"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final inSpans(Landroid/text/SpannableStringBuilder;[Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -301,13 +241,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$inSpans"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "spans"
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "builderAction"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/text/SpannableStringBuilder;->length()I
 
@@ -338,27 +282,6 @@
 
     :cond_0
     return-object p0
-
-    :cond_1
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "spans"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$inSpans"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final italic(Landroid/text/SpannableStringBuilder;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -376,11 +299,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$italic"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/StyleSpan;
 
@@ -403,20 +328,6 @@
     invoke-virtual {p0, v0, v1, p1, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$italic"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final scale(Landroid/text/SpannableStringBuilder;FLkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -435,11 +346,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$scale"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/RelativeSizeSpan;
 
@@ -460,20 +373,6 @@
     invoke-virtual {p0, v0, p1, p2, v1}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$scale"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final strikeThrough(Landroid/text/SpannableStringBuilder;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -491,11 +390,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$strikeThrough"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/StrikethroughSpan;
 
@@ -516,20 +417,6 @@
     invoke-virtual {p0, v0, v1, p1, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$strikeThrough"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final subscript(Landroid/text/SpannableStringBuilder;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -547,11 +434,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$subscript"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/SubscriptSpan;
 
@@ -572,20 +461,6 @@
     invoke-virtual {p0, v0, v1, p1, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$subscript"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final superscript(Landroid/text/SpannableStringBuilder;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -603,11 +478,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$superscript"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/SuperscriptSpan;
 
@@ -628,20 +505,6 @@
     invoke-virtual {p0, v0, v1, p1, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$superscript"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final underline(Landroid/text/SpannableStringBuilder;Lkotlin/jvm/functions/Function1;)Landroid/text/SpannableStringBuilder;
@@ -659,11 +522,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$underline"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "builderAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/text/style/UnderlineSpan;
 
@@ -684,18 +549,4 @@
     invoke-virtual {p0, v0, v1, p1, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "builderAction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$underline"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/text/SpannableStringKt.smali b/com.discord/smali/androidx/core/text/SpannableStringKt.smali
index 0036676b06..1398d34820 100644
--- a/com.discord/smali/androidx/core/text/SpannableStringKt.smali
+++ b/com.discord/smali/androidx/core/text/SpannableStringKt.smali
@@ -12,7 +12,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$clearSpans"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/text/Spanned;->length()I
 
@@ -28,7 +30,7 @@
 
     const-string v1, "getSpans(start, end, T::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v1, v0
 
@@ -45,57 +47,40 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "$this$clearSpans"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroid/text/Spannable;IILjava/lang/Object;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$set"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "span"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x11
 
     invoke-interface {p0, p3, p1, p2, v0}, Landroid/text/Spannable;->setSpan(Ljava/lang/Object;III)V
 
     return-void
-
-    :cond_0
-    const-string p0, "span"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final set(Landroid/text/Spannable;Lkotlin/ranges/IntRange;Ljava/lang/Object;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$set"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "range"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "span"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getStart()Ljava/lang/Integer;
 
@@ -118,33 +103,14 @@
     invoke-interface {p0, p2, v0, p1, v1}, Landroid/text/Spannable;->setSpan(Ljava/lang/Object;III)V
 
     return-void
-
-    :cond_0
-    const-string p0, "span"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "range"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final toSpannable(Ljava/lang/CharSequence;)Landroid/text/Spannable;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toSpannable"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/text/SpannableString;->valueOf(Ljava/lang/CharSequence;)Landroid/text/SpannableString;
 
@@ -152,16 +118,7 @@
 
     const-string v0, "SpannableString.valueOf(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toSpannable"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/text/SpannedStringKt.smali b/com.discord/smali/androidx/core/text/SpannedStringKt.smali
index 2a5ca14ad0..3df6298240 100644
--- a/com.discord/smali/androidx/core/text/SpannedStringKt.smali
+++ b/com.discord/smali/androidx/core/text/SpannedStringKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final getSpans(Landroid/text/Spanned;II)[Ljava/lang/Object;
+.method public static final synthetic getSpans(Landroid/text/Spanned;II)[Ljava/lang/Object;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -16,23 +16,18 @@
         }
     .end annotation
 
-    const/4 p1, 0x0
+    const-string p1, "$this$getSpans"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$getSpans"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
 
-.method public static getSpans$default(Landroid/text/Spanned;IIILjava/lang/Object;)[Ljava/lang/Object;
+.method public static synthetic getSpans$default(Landroid/text/Spanned;IIILjava/lang/Object;)[Ljava/lang/Object;
     .locals 0
 
     and-int/lit8 p1, p3, 0x1
@@ -44,26 +39,23 @@
     invoke-interface {p0}, Landroid/text/Spanned;->length()I
 
     :cond_0
-    const/4 p1, 0x0
+    const-string p1, "$this$getSpans"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$getSpans"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
 
 .method public static final toSpanned(Ljava/lang/CharSequence;)Landroid/text/Spanned;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toSpanned"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/text/SpannedString;->valueOf(Ljava/lang/CharSequence;)Landroid/text/SpannedString;
 
@@ -71,16 +63,7 @@
 
     const-string v0, "SpannedString.valueOf(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toSpanned"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/text/StringKt.smali b/com.discord/smali/androidx/core/text/StringKt.smali
index ccd4eddc49..56864d460c 100644
--- a/com.discord/smali/androidx/core/text/StringKt.smali
+++ b/com.discord/smali/androidx/core/text/StringKt.smali
@@ -7,7 +7,9 @@
 .method public static final htmlEncode(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$htmlEncode"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/text/TextUtils;->htmlEncode(Ljava/lang/String;)Ljava/lang/String;
 
@@ -15,16 +17,7 @@
 
     const-string v0, "TextUtils.htmlEncode(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$htmlEncode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$1.smali b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$1.smali
index 1d0c6e75d9..a664a56787 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/transition/TransitionKt$addListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Transition.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/transition/Transition;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$2.smali b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$2.smali
index 91b8d8c480..01367960ed 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$2.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/transition/TransitionKt$addListener$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Transition.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/transition/Transition;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$3.smali b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$3.smali
index c315a8f57e..78c0b89a31 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$3.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$3.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/transition/TransitionKt$addListener$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Transition.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/transition/Transition;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$4.smali b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$4.smali
index c6a142dcab..d4edec7821 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$4.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$4.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/transition/TransitionKt$addListener$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Transition.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/transition/Transition;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$5.smali b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$5.smali
index afa0129592..ea09b4eebd 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$5.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$5.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/transition/TransitionKt$addListener$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Transition.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/transition/Transition;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$listener$1.smali b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$listener$1.smali
index b0373c5c1b..b727a533f2 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$addListener$listener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$addListener$listener$1.smali
@@ -53,104 +53,69 @@
 .method public onTransitionCancel(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$addListener$listener$1;->$onCancel:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionEnd(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$addListener$listener$1;->$onEnd:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionPause(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$addListener$listener$1;->$onPause:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionResume(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$addListener$listener$1;->$onResume:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionStart(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$addListener$listener$1;->$onStart:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$doOnCancel$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/transition/TransitionKt$doOnCancel$$inlined$addListener$1.smali
index 95c393ae3c..819159f1d3 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$doOnCancel$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$doOnCancel$$inlined$addListener$1.smali
@@ -37,88 +37,53 @@
 .method public onTransitionCancel(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$doOnCancel$$inlined$addListener$1;->$onCancel:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionEnd(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionPause(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionResume(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionStart(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$doOnEnd$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/transition/TransitionKt$doOnEnd$$inlined$addListener$1.smali
index 260d576b7e..f59c83dbc1 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$doOnEnd$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$doOnEnd$$inlined$addListener$1.smali
@@ -35,90 +35,55 @@
 
 # virtual methods
 .method public onTransitionCancel(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionEnd(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$doOnEnd$$inlined$addListener$1;->$onEnd:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionPause(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionResume(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionStart(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$doOnPause$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/transition/TransitionKt$doOnPause$$inlined$addListener$1.smali
index 97b991d6fa..47df254d1a 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$doOnPause$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$doOnPause$$inlined$addListener$1.smali
@@ -35,90 +35,55 @@
 
 # virtual methods
 .method public onTransitionCancel(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionEnd(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionPause(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$doOnPause$$inlined$addListener$1;->$onPause:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionResume(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionStart(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$doOnResume$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/transition/TransitionKt$doOnResume$$inlined$addListener$1.smali
index 6fc316696c..73f5b89124 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$doOnResume$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$doOnResume$$inlined$addListener$1.smali
@@ -35,90 +35,55 @@
 
 # virtual methods
 .method public onTransitionCancel(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionEnd(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionPause(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionResume(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$doOnResume$$inlined$addListener$1;->$onResume:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionStart(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt$doOnStart$$inlined$addListener$1.smali b/com.discord/smali/androidx/core/transition/TransitionKt$doOnStart$$inlined$addListener$1.smali
index 3f60c23787..666bad8086 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt$doOnStart$$inlined$addListener$1.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt$doOnStart$$inlined$addListener$1.smali
@@ -35,90 +35,55 @@
 
 # virtual methods
 .method public onTransitionCancel(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionEnd(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionPause(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionResume(Landroid/transition/Transition;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTransitionStart(Landroid/transition/Transition;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transition"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/transition/TransitionKt$doOnStart$$inlined$addListener$1;->$onStart:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "transition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/transition/TransitionKt.smali b/com.discord/smali/androidx/core/transition/TransitionKt.smali
index 1fd13dcf8d..635b92b9a1 100644
--- a/com.discord/smali/androidx/core/transition/TransitionKt.smali
+++ b/com.discord/smali/androidx/core/transition/TransitionKt.smali
@@ -43,19 +43,29 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addListener"
 
-    if-eqz p0, :cond_5
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_4
+    const-string v0, "onEnd"
 
-    if-eqz p2, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "onStart"
 
-    if-eqz p4, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "onCancel"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onResume"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onPause"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/transition/TransitionKt$addListener$listener$1;
 
@@ -76,51 +86,9 @@
     invoke-virtual {p0, v0}, Landroid/transition/Transition;->addListener(Landroid/transition/Transition$TransitionListener;)Landroid/transition/Transition;
 
     return-object v0
-
-    :cond_0
-    const-string p0, "onPause"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "onResume"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "onCancel"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "onStart"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "onEnd"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "$this$addListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static addListener$default(Landroid/transition/Transition;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/transition/Transition$TransitionListener;
+.method public static synthetic addListener$default(Landroid/transition/Transition;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/transition/Transition$TransitionListener;
     .locals 2
 
     and-int/lit8 p7, p6, 0x1
@@ -162,27 +130,29 @@
     sget-object p5, Landroidx/core/transition/TransitionKt$addListener$5;->INSTANCE:Landroidx/core/transition/TransitionKt$addListener$5;
 
     :cond_4
-    if-eqz p0, :cond_5
+    const-string p2, "$this$addListener"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p2, "onEnd"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p2, "onStart"
 
-    invoke-static {p7, p2}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p7, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p2, "onCancel"
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p2, "onResume"
 
-    invoke-static {p4, p2}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p2, "onPause"
 
-    invoke-static {p5, p2}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroidx/core/transition/TransitionKt$addListener$listener$1;
 
@@ -197,15 +167,6 @@
     invoke-virtual {p0, v1}, Landroid/transition/Transition;->addListener(Landroid/transition/Transition$TransitionListener;)Landroid/transition/Transition;
 
     return-object v1
-
-    :cond_5
-    const-string p0, "$this$addListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final doOnCancel(Landroid/transition/Transition;Lkotlin/jvm/functions/Function1;)Landroid/transition/Transition$TransitionListener;
@@ -227,11 +188,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnCancel"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/transition/TransitionKt$doOnCancel$$inlined$addListener$1;
 
@@ -240,20 +203,6 @@
     invoke-virtual {p0, v0}, Landroid/transition/Transition;->addListener(Landroid/transition/Transition$TransitionListener;)Landroid/transition/Transition;
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnCancel"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnEnd(Landroid/transition/Transition;Lkotlin/jvm/functions/Function1;)Landroid/transition/Transition$TransitionListener;
@@ -275,11 +224,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnEnd"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/transition/TransitionKt$doOnEnd$$inlined$addListener$1;
 
@@ -288,20 +239,6 @@
     invoke-virtual {p0, v0}, Landroid/transition/Transition;->addListener(Landroid/transition/Transition$TransitionListener;)Landroid/transition/Transition;
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnEnd"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnPause(Landroid/transition/Transition;Lkotlin/jvm/functions/Function1;)Landroid/transition/Transition$TransitionListener;
@@ -323,11 +260,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnPause"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/transition/TransitionKt$doOnPause$$inlined$addListener$1;
 
@@ -336,20 +275,6 @@
     invoke-virtual {p0, v0}, Landroid/transition/Transition;->addListener(Landroid/transition/Transition$TransitionListener;)Landroid/transition/Transition;
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnPause"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnResume(Landroid/transition/Transition;Lkotlin/jvm/functions/Function1;)Landroid/transition/Transition$TransitionListener;
@@ -371,11 +296,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnResume"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/transition/TransitionKt$doOnResume$$inlined$addListener$1;
 
@@ -384,20 +311,6 @@
     invoke-virtual {p0, v0}, Landroid/transition/Transition;->addListener(Landroid/transition/Transition$TransitionListener;)Landroid/transition/Transition;
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnResume"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnStart(Landroid/transition/Transition;Lkotlin/jvm/functions/Function1;)Landroid/transition/Transition$TransitionListener;
@@ -419,11 +332,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnStart"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/transition/TransitionKt$doOnStart$$inlined$addListener$1;
 
@@ -432,18 +347,4 @@
     invoke-virtual {p0, v0}, Landroid/transition/Transition;->addListener(Landroid/transition/Transition$TransitionListener;)Landroid/transition/Transition;
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnStart"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/util/AtomicFileKt.smali b/com.discord/smali/androidx/core/util/AtomicFileKt.smali
index a368cdb6f2..66b6d8721e 100644
--- a/com.discord/smali/androidx/core/util/AtomicFileKt.smali
+++ b/com.discord/smali/androidx/core/util/AtomicFileKt.smali
@@ -10,7 +10,9 @@
         value = 0x11
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$readBytes"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/AtomicFile;->readFully()[B
 
@@ -18,18 +20,9 @@
 
     const-string v0, "readFully()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$readBytes"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final readText(Landroid/util/AtomicFile;Ljava/nio/charset/Charset;)Ljava/lang/String;
@@ -38,11 +31,13 @@
         value = 0x11
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$readText"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "charset"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/AtomicFile;->readFully()[B
 
@@ -50,27 +45,13 @@
 
     const-string v0, "readFully()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/String;
 
     invoke-direct {v0, p0, p1}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "charset"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$readText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic readText$default(Landroid/util/AtomicFile;Ljava/nio/charset/Charset;ILjava/lang/Object;)Ljava/lang/String;
@@ -80,7 +61,7 @@
 
     if-eqz p2, :cond_0
 
-    sget-object p1, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object p1, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     :cond_0
     invoke-static {p0, p1}, Landroidx/core/util/AtomicFileKt;->readText(Landroid/util/AtomicFile;Ljava/nio/charset/Charset;)Ljava/lang/String;
@@ -108,11 +89,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$tryWrite"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/AtomicFile;->startWrite()Ljava/io/FileOutputStream;
 
@@ -121,7 +104,7 @@
     :try_start_0
     const-string v1, "stream"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -137,20 +120,6 @@
     invoke-virtual {p0, v0}, Landroid/util/AtomicFile;->failWrite(Ljava/io/FileOutputStream;)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$tryWrite"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final writeBytes(Landroid/util/AtomicFile;[B)V
@@ -159,11 +128,13 @@
         value = 0x11
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$writeBytes"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/AtomicFile;->startWrite()Ljava/io/FileOutputStream;
 
@@ -172,7 +143,7 @@
     :try_start_0
     const-string v1, "stream"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Ljava/io/FileOutputStream;->write([B)V
     :try_end_0
@@ -188,20 +159,6 @@
     invoke-virtual {p0, v0}, Landroid/util/AtomicFile;->failWrite(Ljava/io/FileOutputStream;)V
 
     throw p1
-
-    :cond_0
-    const-string p0, "array"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$writeBytes"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final writeText(Landroid/util/AtomicFile;Ljava/lang/String;Ljava/nio/charset/Charset;)V
@@ -210,13 +167,17 @@
         value = 0x11
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$writeText"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "text"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "charset"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
@@ -224,32 +185,11 @@
 
     const-string p2, "(this as java.lang.String).getBytes(charset)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Landroidx/core/util/AtomicFileKt;->writeBytes(Landroid/util/AtomicFile;[B)V
 
     return-void
-
-    :cond_0
-    const-string p0, "charset"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "text"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$writeText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic writeText$default(Landroid/util/AtomicFile;Ljava/lang/String;Ljava/nio/charset/Charset;ILjava/lang/Object;)V
@@ -259,7 +199,7 @@
 
     if-eqz p3, :cond_0
 
-    sget-object p2, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object p2, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     :cond_0
     invoke-static {p0, p1, p2}, Landroidx/core/util/AtomicFileKt;->writeText(Landroid/util/AtomicFile;Ljava/lang/String;Ljava/nio/charset/Charset;)V
diff --git a/com.discord/smali/androidx/core/util/HalfKt.smali b/com.discord/smali/androidx/core/util/HalfKt.smali
index 40f6a37e45..928bb14997 100644
--- a/com.discord/smali/androidx/core/util/HalfKt.smali
+++ b/com.discord/smali/androidx/core/util/HalfKt.smali
@@ -18,7 +18,7 @@
 
     const-string p1, "Half.valueOf(this)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -35,7 +35,7 @@
 
     const-string v0, "Half.valueOf(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -46,7 +46,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toHalf"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/util/Half;->valueOf(Ljava/lang/String;)Landroid/util/Half;
 
@@ -54,18 +56,9 @@
 
     const-string v0, "Half.valueOf(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toHalf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toHalf(S)Landroid/util/Half;
@@ -80,7 +73,7 @@
 
     const-string v0, "Half.valueOf(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/LongSparseArrayKt$keyIterator$1.smali b/com.discord/smali/androidx/core/util/LongSparseArrayKt$keyIterator$1.smali
index 18d2d75c7b..c0cce0aae8 100644
--- a/com.discord/smali/androidx/core/util/LongSparseArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/LongSparseArrayKt$keyIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/LongSparseArrayKt$keyIterator$1;
-.super Lj0/i/r;
+.super Lk0/j/r;
 .source "LongSparseArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/LongSparseArrayKt;->keyIterator(Landroid/util/LongSparseArray;)Lj0/i/r;
+    value = Landroidx/core/util/LongSparseArrayKt;->keyIterator(Landroid/util/LongSparseArray;)Lk0/j/r;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,7 +33,7 @@
 
     iput-object p1, p0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/LongSparseArray;
 
-    invoke-direct {p0}, Lj0/i/r;-><init>()V
+    invoke-direct {p0}, Lk0/j/r;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/LongSparseArrayKt$valueIterator$1.smali b/com.discord/smali/androidx/core/util/LongSparseArrayKt$valueIterator$1.smali
index 52d917e044..62d16945ce 100644
--- a/com.discord/smali/androidx/core/util/LongSparseArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/LongSparseArrayKt$valueIterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -22,7 +22,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Iterator<",
         "TT;>;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
diff --git a/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali b/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali
index 04a28c3e49..9116840b88 100644
--- a/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/LongSparseArrayKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final contains(Landroid/util/LongSparseArray;J)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -20,7 +20,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/LongSparseArray;->indexOfKey(J)I
 
@@ -37,19 +39,10 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsKey(Landroid/util/LongSparseArray;J)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -64,7 +57,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsKey"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/LongSparseArray;->indexOfKey(J)I
 
@@ -81,19 +76,10 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsKey"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsValue(Landroid/util/LongSparseArray;Ljava/lang/Object;)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -108,7 +94,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsValue"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/LongSparseArray;->indexOfValue(Ljava/lang/Object;)I
 
@@ -125,15 +113,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final forEach(Landroid/util/LongSparseArray;Lkotlin/jvm/functions/Function2;)V
@@ -158,22 +137,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/LongSparseArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroid/util/LongSparseArray;->keyAt(I)J
+    invoke-virtual {p0, v1}, Landroid/util/LongSparseArray;->keyAt(I)J
 
     move-result-wide v2
 
@@ -181,36 +162,22 @@
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroid/util/LongSparseArray;->valueAt(I)Ljava/lang/Object;
+    invoke-virtual {p0, v1}, Landroid/util/LongSparseArray;->valueAt(I)Ljava/lang/Object;
 
     move-result-object v3
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getOrDefault(Landroid/util/LongSparseArray;JLjava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -225,7 +192,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$getOrDefault"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/LongSparseArray;->get(J)Ljava/lang/Object;
 
@@ -237,15 +206,6 @@
 
     :cond_0
     return-object p3
-
-    :cond_1
-    const-string p0, "$this$getOrDefault"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getOrElse(Landroid/util/LongSparseArray;JLkotlin/jvm/functions/Function0;)Ljava/lang/Object;
@@ -266,11 +226,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getOrElse"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/LongSparseArray;->get(J)Ljava/lang/Object;
 
@@ -287,24 +249,10 @@
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "defaultValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$getOrElse"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSize(Landroid/util/LongSparseArray;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -319,26 +267,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/LongSparseArray;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroid/util/LongSparseArray;)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -353,7 +294,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/LongSparseArray;->size()I
 
@@ -370,19 +313,10 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroid/util/LongSparseArray;)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -397,7 +331,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/LongSparseArray;->size()I
 
@@ -414,18 +350,9 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final keyIterator(Landroid/util/LongSparseArray;)Lj0/i/r;
+.method public static final keyIterator(Landroid/util/LongSparseArray;)Lk0/j/r;
     .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
@@ -438,26 +365,19 @@
             ">(",
             "Landroid/util/LongSparseArray<",
             "TT;>;)",
-            "Lj0/i/r;"
+            "Lk0/j/r;"
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$keyIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/LongSparseArrayKt$keyIterator$1;-><init>(Landroid/util/LongSparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$keyIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/util/LongSparseArray;Landroid/util/LongSparseArray;)Landroid/util/LongSparseArray;
@@ -480,11 +400,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/LongSparseArray;
 
@@ -505,20 +427,6 @@
     invoke-static {v0, p1}, Landroidx/core/util/LongSparseArrayKt;->putAll(Landroid/util/LongSparseArray;Landroid/util/LongSparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final putAll(Landroid/util/LongSparseArray;Landroid/util/LongSparseArray;)V
@@ -539,55 +447,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$putAll"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "other"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/util/LongSparseArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/util/LongSparseArray;->keyAt(I)J
+    invoke-virtual {p1, v1}, Landroid/util/LongSparseArray;->keyAt(I)J
 
     move-result-wide v2
 
-    invoke-virtual {p1, v0}, Landroid/util/LongSparseArray;->valueAt(I)Ljava/lang/Object;
+    invoke-virtual {p1, v1}, Landroid/util/LongSparseArray;->valueAt(I)Ljava/lang/Object;
 
     move-result-object v4
 
     invoke-virtual {p0, v2, v3, v4}, Landroid/util/LongSparseArray;->put(JLjava/lang/Object;)V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$putAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final remove(Landroid/util/LongSparseArray;JLjava/lang/Object;)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -602,7 +498,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$remove"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/LongSparseArray;->indexOfKey(J)I
 
@@ -614,7 +512,7 @@
 
     move-result-object p2
 
-    invoke-static {p3, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -630,19 +528,10 @@
     const/4 p0, 0x0
 
     return p0
-
-    :cond_1
-    const-string p0, "$this$remove"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroid/util/LongSparseArray;JLjava/lang/Object;)V
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x10
     .end annotation
@@ -657,20 +546,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$set"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroid/util/LongSparseArray;->put(JLjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final valueIterator(Landroid/util/LongSparseArray;)Ljava/util/Iterator;
@@ -691,20 +573,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$valueIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/LongSparseArrayKt$valueIterator$1;-><init>(Landroid/util/LongSparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$valueIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$1.smali b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$1.smali
index daf0ef0e8e..1d58d01477 100644
--- a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$1.smali
+++ b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/util/LruCacheKt$lruCache$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "TK;TV;",
         "Ljava/lang/Integer;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,29 +64,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$2.smali b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$2.smali
index cdc834f8bb..eebe7fb5ce 100644
--- a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$2.smali
+++ b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/util/LruCacheKt$lruCache$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TK;TV;>;"
     }
@@ -47,7 +47,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,16 +62,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali
index da26044f49..911e24009d 100644
--- a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali
+++ b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/util/LruCacheKt$lruCache$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/Boolean;",
         "TK;TV;TV;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x4
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,25 +81,13 @@
         }
     .end annotation
 
-    const/4 p1, 0x0
+    const-string p1, "<anonymous parameter 1>"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string p1, "<anonymous parameter 2>"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p2, "<anonymous parameter 2>"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p2, "<anonymous parameter 1>"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$4.smali b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$4.smali
index cc1042ab5a..433dbf9312 100644
--- a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$4.smali
+++ b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$4.smali
@@ -58,7 +58,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/util/LruCacheKt$lruCache$4;->$create:Lkotlin/jvm/functions/Function1;
 
@@ -67,15 +69,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public entryRemoved(ZLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
@@ -86,11 +79,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "key"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "oldValue"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/util/LruCacheKt$lruCache$4;->$onEntryRemoved:Lkotlin/jvm/functions/Function4;
 
@@ -101,20 +96,6 @@
     invoke-interface {v0, p1, p2, p3, p4}, Lkotlin/jvm/functions/Function4;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "oldValue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public sizeOf(Ljava/lang/Object;Ljava/lang/Object;)I
@@ -125,11 +106,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "key"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/util/LruCacheKt$lruCache$4;->$sizeOf:Lkotlin/jvm/functions/Function2;
 
@@ -144,18 +127,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/util/LruCacheKt.smali b/com.discord/smali/androidx/core/util/LruCacheKt.smali
index b77a455558..5248d77d84 100644
--- a/com.discord/smali/androidx/core/util/LruCacheKt.smali
+++ b/com.discord/smali/androidx/core/util/LruCacheKt.smali
@@ -30,13 +30,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "sizeOf"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "create"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onEntryRemoved"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/LruCacheKt$lruCache$4;
 
@@ -55,27 +59,6 @@
     invoke-direct/range {v1 .. v6}, Landroidx/core/util/LruCacheKt$lruCache$4;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "onEntryRemoved"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "create"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "sizeOf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic lruCache$default(ILkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)Landroid/util/LruCache;
@@ -110,15 +93,15 @@
 
     const-string p1, "sizeOf"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "create"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "onEntryRemoved"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Landroidx/core/util/LruCacheKt$lruCache$4;
 
diff --git a/com.discord/smali/androidx/core/util/PairKt.smali b/com.discord/smali/androidx/core/util/PairKt.smali
index c4b010f98c..803411c1e7 100644
--- a/com.discord/smali/androidx/core/util/PairKt.smali
+++ b/com.discord/smali/androidx/core/util/PairKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final component1(Landroid/util/Pair;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "UnknownNullness"
@@ -24,24 +24,17 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p0, p0, Landroid/util/Pair;->first:Ljava/lang/Object;
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/util/Pair;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "UnknownNullness"
@@ -60,20 +53,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p0, p0, Landroid/util/Pair;->second:Ljava/lang/Object;
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toAndroidPair(Lkotlin/Pair;)Landroid/util/Pair;
@@ -92,7 +78,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toAndroidPair"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/Pair;
 
@@ -103,15 +91,6 @@
     invoke-direct {v0, v1, p0}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toAndroidPair"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toKotlinPair(Landroid/util/Pair;)Lkotlin/Pair;
@@ -130,7 +109,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toKotlinPair"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lkotlin/Pair;
 
@@ -141,13 +122,4 @@
     invoke-direct {v0, v1, p0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toKotlinPair"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/PatternsCompat.smali b/com.discord/smali/androidx/core/util/PatternsCompat.smali
index 063744a63a..7eb308cab8 100644
--- a/com.discord/smali/androidx/core/util/PatternsCompat.smali
+++ b/com.discord/smali/androidx/core/util/PatternsCompat.smali
@@ -237,7 +237,7 @@
 
     const-string v8, ")?(?:"
 
-    invoke-static {v0, v7, v8, v3, v2}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v7, v8, v3, v2}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/androidx/core/util/RangeKt$toClosedRange$1.smali b/com.discord/smali/androidx/core/util/RangeKt$toClosedRange$1.smali
index 5662889be8..de52a760aa 100644
--- a/com.discord/smali/androidx/core/util/RangeKt$toClosedRange$1.smali
+++ b/com.discord/smali/androidx/core/util/RangeKt$toClosedRange$1.smali
@@ -3,12 +3,12 @@
 .source "Range.kt"
 
 # interfaces
-.implements Lj0/q/a;
+.implements Lk0/r/a;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/RangeKt;->toClosedRange(Landroid/util/Range;)Lj0/q/a;
+    value = Landroidx/core/util/RangeKt;->toClosedRange(Landroid/util/Range;)Lk0/r/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -19,7 +19,7 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Ljava/lang/Object;",
-        "Lj0/q/a<",
+        "Lk0/r/a<",
         "TT;>;"
     }
 .end annotation
@@ -57,7 +57,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/core/util/RangeKt$toClosedRange$1;->getStart()Ljava/lang/Comparable;
 
@@ -88,15 +92,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getEndInclusive()Ljava/lang/Comparable;
diff --git a/com.discord/smali/androidx/core/util/RangeKt.smali b/com.discord/smali/androidx/core/util/RangeKt.smali
index a487e4fc5b..a00828b837 100644
--- a/com.discord/smali/androidx/core/util/RangeKt.smali
+++ b/com.discord/smali/androidx/core/util/RangeKt.smali
@@ -24,11 +24,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$and"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/Range;->intersect(Landroid/util/Range;)Landroid/util/Range;
 
@@ -36,23 +38,9 @@
 
     const-string p1, "intersect(other)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$and"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/util/Range;Landroid/util/Range;)Landroid/util/Range;
@@ -75,11 +63,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/Range;->extend(Landroid/util/Range;)Landroid/util/Range;
 
@@ -87,23 +77,9 @@
 
     const-string p1, "extend(other)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Landroid/util/Range;Ljava/lang/Comparable;)Landroid/util/Range;
@@ -124,11 +100,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/Range;->extend(Ljava/lang/Comparable;)Landroid/util/Range;
 
@@ -136,23 +114,9 @@
 
     const-string p1, "extend(value)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "value"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final rangeTo(Ljava/lang/Comparable;Ljava/lang/Comparable;)Landroid/util/Range;
@@ -171,34 +135,22 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$rangeTo"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "that"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/Range;
 
     invoke-direct {v0, p0, p1}, Landroid/util/Range;-><init>(Ljava/lang/Comparable;Ljava/lang/Comparable;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "that"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$rangeTo"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static final toClosedRange(Landroid/util/Range;)Lj0/q/a;
+.method public static final toClosedRange(Landroid/util/Range;)Lk0/r/a;
     .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x15
@@ -211,30 +163,23 @@
             "-TT;>;>(",
             "Landroid/util/Range<",
             "TT;>;)",
-            "Lj0/q/a<",
+            "Lk0/r/a<",
             "TT;>;"
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toClosedRange"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/RangeKt$toClosedRange$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/RangeKt$toClosedRange$1;-><init>(Landroid/util/Range;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toClosedRange"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final toRange(Lj0/q/a;)Landroid/util/Range;
+.method public static final toRange(Lk0/r/a;)Landroid/util/Range;
     .locals 2
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x15
@@ -245,35 +190,28 @@
             "<T::",
             "Ljava/lang/Comparable<",
             "-TT;>;>(",
-            "Lj0/q/a<",
+            "Lk0/r/a<",
             "TT;>;)",
             "Landroid/util/Range<",
             "TT;>;"
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toRange"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/Range;
 
-    invoke-interface {p0}, Lj0/q/a;->getStart()Ljava/lang/Comparable;
+    invoke-interface {p0}, Lk0/r/a;->getStart()Ljava/lang/Comparable;
 
     move-result-object v1
 
-    invoke-interface {p0}, Lj0/q/a;->getEndInclusive()Ljava/lang/Comparable;
+    invoke-interface {p0}, Lk0/r/a;->getEndInclusive()Ljava/lang/Comparable;
 
     move-result-object p0
 
     invoke-direct {v0, v1, p0}, Landroid/util/Range;-><init>(Ljava/lang/Comparable;Ljava/lang/Comparable;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toRange"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/SizeKt.smali b/com.discord/smali/androidx/core/util/SizeKt.smali
index 29fa4986c9..f438db07d3 100644
--- a/com.discord/smali/androidx/core/util/SizeKt.smali
+++ b/com.discord/smali/androidx/core/util/SizeKt.smali
@@ -5,97 +5,69 @@
 
 # direct methods
 .method public static final component1(Landroid/util/SizeF;)F
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x15
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SizeF;->getWidth()F
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component1(Landroid/util/Size;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x15
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component1"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/Size;->getWidth()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/util/SizeF;)F
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x15
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SizeF;->getHeight()F
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final component2(Landroid/util/Size;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x15
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$component2"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/Size;->getHeight()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$component2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseArrayKt$keyIterator$1.smali b/com.discord/smali/androidx/core/util/SparseArrayKt$keyIterator$1.smali
index c44a9fed82..c390ce8f2f 100644
--- a/com.discord/smali/androidx/core/util/SparseArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseArrayKt$keyIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/SparseArrayKt$keyIterator$1;
-.super Lj0/i/q;
+.super Lk0/j/q;
 .source "SparseArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/SparseArrayKt;->keyIterator(Landroid/util/SparseArray;)Lj0/i/q;
+    value = Landroidx/core/util/SparseArrayKt;->keyIterator(Landroid/util/SparseArray;)Lk0/j/q;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,7 +33,7 @@
 
     iput-object p1, p0, Landroidx/core/util/SparseArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseArray;
 
-    invoke-direct {p0}, Lj0/i/q;-><init>()V
+    invoke-direct {p0}, Lk0/j/q;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseArrayKt$valueIterator$1.smali b/com.discord/smali/androidx/core/util/SparseArrayKt$valueIterator$1.smali
index b2d7df64dd..8eac40bae4 100644
--- a/com.discord/smali/androidx/core/util/SparseArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseArrayKt$valueIterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -22,7 +22,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Iterator<",
         "TT;>;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
diff --git a/com.discord/smali/androidx/core/util/SparseArrayKt.smali b/com.discord/smali/androidx/core/util/SparseArrayKt.smali
index ac82353a6b..adf1400d5f 100644
--- a/com.discord/smali/androidx/core/util/SparseArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseArrayKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final contains(Landroid/util/SparseArray;I)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -16,7 +16,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseArray;->indexOfKey(I)I
 
@@ -33,19 +35,10 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsKey(Landroid/util/SparseArray;I)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -56,7 +49,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsKey"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseArray;->indexOfKey(I)I
 
@@ -73,19 +68,10 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsKey"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsValue(Landroid/util/SparseArray;Ljava/lang/Object;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -96,7 +82,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsValue"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseArray;->indexOfValue(Ljava/lang/Object;)I
 
@@ -113,15 +101,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final forEach(Landroid/util/SparseArray;Lkotlin/jvm/functions/Function2;)V
@@ -142,22 +121,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseArray;->keyAt(I)I
+    invoke-virtual {p0, v1}, Landroid/util/SparseArray;->keyAt(I)I
 
     move-result v2
 
@@ -165,36 +146,22 @@
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
+    invoke-virtual {p0, v1}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
 
     move-result-object v3
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getOrDefault(Landroid/util/SparseArray;ILjava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -205,7 +172,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$getOrDefault"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -217,15 +186,6 @@
 
     :cond_0
     return-object p2
-
-    :cond_1
-    const-string p0, "$this$getOrDefault"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getOrElse(Landroid/util/SparseArray;ILkotlin/jvm/functions/Function0;)Ljava/lang/Object;
@@ -242,11 +202,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getOrElse"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -263,24 +225,10 @@
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "defaultValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$getOrElse"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSize(Landroid/util/SparseArray;)I
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -291,26 +239,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseArray;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroid/util/SparseArray;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -321,7 +262,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseArray;->size()I
 
@@ -338,19 +281,10 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroid/util/SparseArray;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -361,7 +295,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseArray;->size()I
 
@@ -378,18 +314,9 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final keyIterator(Landroid/util/SparseArray;)Lj0/i/q;
+.method public static final keyIterator(Landroid/util/SparseArray;)Lk0/j/q;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -398,26 +325,19 @@
             ">(",
             "Landroid/util/SparseArray<",
             "TT;>;)",
-            "Lj0/i/q;"
+            "Lk0/j/q;"
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$keyIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseArrayKt$keyIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseArrayKt$keyIterator$1;-><init>(Landroid/util/SparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$keyIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/util/SparseArray;Landroid/util/SparseArray;)Landroid/util/SparseArray;
@@ -436,11 +356,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/SparseArray;
 
@@ -461,20 +383,6 @@
     invoke-static {v0, p1}, Landroidx/core/util/SparseArrayKt;->putAll(Landroid/util/SparseArray;Landroid/util/SparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final putAll(Landroid/util/SparseArray;Landroid/util/SparseArray;)V
@@ -491,51 +399,39 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$putAll"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "other"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/util/SparseArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseArray;->keyAt(I)I
+    invoke-virtual {p1, v1}, Landroid/util/SparseArray;->keyAt(I)I
 
     move-result v2
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
+    invoke-virtual {p1, v1}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
 
     move-result-object v3
 
     invoke-virtual {p0, v2, v3}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$putAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final remove(Landroid/util/SparseArray;ILjava/lang/Object;)Z
@@ -550,7 +446,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$remove"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseArray;->indexOfKey(I)I
 
@@ -562,7 +460,7 @@
 
     move-result-object v0
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -578,19 +476,10 @@
     const/4 p0, 0x0
 
     return p0
-
-    :cond_1
-    const-string p0, "$this$remove"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroid/util/SparseArray;ILjava/lang/Object;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -601,20 +490,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$set"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final valueIterator(Landroid/util/SparseArray;)Ljava/util/Iterator;
@@ -631,20 +513,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$valueIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseArrayKt$valueIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseArrayKt$valueIterator$1;-><init>(Landroid/util/SparseArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$valueIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$keyIterator$1.smali b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$keyIterator$1.smali
index be8d8ea9bc..d47fa4eb46 100644
--- a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$keyIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;
-.super Lj0/i/q;
+.super Lk0/j/q;
 .source "SparseBooleanArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/SparseBooleanArrayKt;->keyIterator(Landroid/util/SparseBooleanArray;)Lj0/i/q;
+    value = Landroidx/core/util/SparseBooleanArrayKt;->keyIterator(Landroid/util/SparseBooleanArray;)Lk0/j/q;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 
     iput-object p1, p0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseBooleanArray;
 
-    invoke-direct {p0}, Lj0/i/q;-><init>()V
+    invoke-direct {p0}, Lk0/j/q;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$valueIterator$1.smali b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$valueIterator$1.smali
index cdf1e5bdc9..ca212f3ff2 100644
--- a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt$valueIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;
-.super Lj0/i/f;
+.super Lk0/j/f;
 .source "SparseBooleanArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/SparseBooleanArrayKt;->valueIterator(Landroid/util/SparseBooleanArray;)Lj0/i/f;
+    value = Landroidx/core/util/SparseBooleanArrayKt;->valueIterator(Landroid/util/SparseBooleanArray;)Lk0/j/f;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 
     iput-object p1, p0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseBooleanArray;
 
-    invoke-direct {p0}, Lj0/i/f;-><init>()V
+    invoke-direct {p0}, Lk0/j/f;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali
index 04d60710e1..8c66f2927d 100644
--- a/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseBooleanArrayKt.smali
@@ -5,9 +5,11 @@
 
 # direct methods
 .method public static final contains(Landroid/util/SparseBooleanArray;I)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseBooleanArray;->indexOfKey(I)I
 
@@ -24,21 +26,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsKey(Landroid/util/SparseBooleanArray;I)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsKey"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseBooleanArray;->indexOfKey(I)I
 
@@ -55,21 +50,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsKey"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsValue(Landroid/util/SparseBooleanArray;Z)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsValue"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseBooleanArray;->indexOfValue(Z)I
 
@@ -86,15 +74,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final forEach(Landroid/util/SparseBooleanArray;Lkotlin/jvm/functions/Function2;)V
@@ -113,22 +92,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseBooleanArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseBooleanArray;->keyAt(I)I
+    invoke-virtual {p0, v1}, Landroid/util/SparseBooleanArray;->keyAt(I)I
 
     move-result v2
 
@@ -136,7 +117,7 @@
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseBooleanArray;->valueAt(I)Z
+    invoke-virtual {p0, v1}, Landroid/util/SparseBooleanArray;->valueAt(I)Z
 
     move-result v3
 
@@ -146,47 +127,26 @@
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getOrDefault(Landroid/util/SparseBooleanArray;IZ)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getOrDefault"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/SparseBooleanArray;->get(IZ)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getOrDefault"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getOrElse(Landroid/util/SparseBooleanArray;ILkotlin/jvm/functions/Function0;)Z
@@ -202,11 +162,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getOrElse"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseBooleanArray;->indexOfKey(I)I
 
@@ -233,47 +195,28 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "defaultValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$getOrElse"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSize(Landroid/util/SparseBooleanArray;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseBooleanArray;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroid/util/SparseBooleanArray;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseBooleanArray;->size()I
 
@@ -290,21 +233,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroid/util/SparseBooleanArray;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseBooleanArray;->size()I
 
@@ -321,46 +257,32 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final keyIterator(Landroid/util/SparseBooleanArray;)Lj0/i/q;
+.method public static final keyIterator(Landroid/util/SparseBooleanArray;)Lk0/j/q;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$keyIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseBooleanArrayKt$keyIterator$1;-><init>(Landroid/util/SparseBooleanArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$keyIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/util/SparseBooleanArray;Landroid/util/SparseBooleanArray;)Landroid/util/SparseBooleanArray;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/SparseBooleanArray;
 
@@ -381,76 +303,52 @@
     invoke-static {v0, p1}, Landroidx/core/util/SparseBooleanArrayKt;->putAll(Landroid/util/SparseBooleanArray;Landroid/util/SparseBooleanArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final putAll(Landroid/util/SparseBooleanArray;Landroid/util/SparseBooleanArray;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$putAll"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "other"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/util/SparseBooleanArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseBooleanArray;->keyAt(I)I
+    invoke-virtual {p1, v1}, Landroid/util/SparseBooleanArray;->keyAt(I)I
 
     move-result v2
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseBooleanArray;->valueAt(I)Z
+    invoke-virtual {p1, v1}, Landroid/util/SparseBooleanArray;->valueAt(I)Z
 
     move-result v3
 
     invoke-virtual {p0, v2, v3}, Landroid/util/SparseBooleanArray;->put(IZ)V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$putAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final remove(Landroid/util/SparseBooleanArray;IZ)Z
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$remove"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseBooleanArray;->indexOfKey(I)I
 
@@ -474,53 +372,30 @@
     const/4 p0, 0x0
 
     return p0
-
-    :cond_1
-    const-string p0, "$this$remove"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroid/util/SparseBooleanArray;IZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$set"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/SparseBooleanArray;->put(IZ)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final valueIterator(Landroid/util/SparseBooleanArray;)Lj0/i/f;
+.method public static final valueIterator(Landroid/util/SparseBooleanArray;)Lk0/j/f;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$valueIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseBooleanArrayKt$valueIterator$1;-><init>(Landroid/util/SparseBooleanArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$valueIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseIntArrayKt$keyIterator$1.smali b/com.discord/smali/androidx/core/util/SparseIntArrayKt$keyIterator$1.smali
index 6706b8453a..fd87355a67 100644
--- a/com.discord/smali/androidx/core/util/SparseIntArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseIntArrayKt$keyIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/SparseIntArrayKt$keyIterator$1;
-.super Lj0/i/q;
+.super Lk0/j/q;
 .source "SparseIntArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/SparseIntArrayKt;->keyIterator(Landroid/util/SparseIntArray;)Lj0/i/q;
+    value = Landroidx/core/util/SparseIntArrayKt;->keyIterator(Landroid/util/SparseIntArray;)Lk0/j/q;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 
     iput-object p1, p0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseIntArray;
 
-    invoke-direct {p0}, Lj0/i/q;-><init>()V
+    invoke-direct {p0}, Lk0/j/q;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseIntArrayKt$valueIterator$1.smali b/com.discord/smali/androidx/core/util/SparseIntArrayKt$valueIterator$1.smali
index e33a2ab3c8..d5e397a234 100644
--- a/com.discord/smali/androidx/core/util/SparseIntArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseIntArrayKt$valueIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/SparseIntArrayKt$valueIterator$1;
-.super Lj0/i/q;
+.super Lk0/j/q;
 .source "SparseIntArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/SparseIntArrayKt;->valueIterator(Landroid/util/SparseIntArray;)Lj0/i/q;
+    value = Landroidx/core/util/SparseIntArrayKt;->valueIterator(Landroid/util/SparseIntArray;)Lk0/j/q;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 
     iput-object p1, p0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseIntArray;
 
-    invoke-direct {p0}, Lj0/i/q;-><init>()V
+    invoke-direct {p0}, Lk0/j/q;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali b/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali
index a308df9d60..50a8aaec63 100644
--- a/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseIntArrayKt.smali
@@ -5,9 +5,11 @@
 
 # direct methods
 .method public static final contains(Landroid/util/SparseIntArray;I)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseIntArray;->indexOfKey(I)I
 
@@ -24,21 +26,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsKey(Landroid/util/SparseIntArray;I)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsKey"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseIntArray;->indexOfKey(I)I
 
@@ -55,21 +50,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsKey"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsValue(Landroid/util/SparseIntArray;I)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsValue"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseIntArray;->indexOfValue(I)I
 
@@ -86,15 +74,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final forEach(Landroid/util/SparseIntArray;Lkotlin/jvm/functions/Function2;)V
@@ -113,22 +92,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseIntArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseIntArray;->keyAt(I)I
+    invoke-virtual {p0, v1}, Landroid/util/SparseIntArray;->keyAt(I)I
 
     move-result v2
 
@@ -136,7 +117,7 @@
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseIntArray;->valueAt(I)I
+    invoke-virtual {p0, v1}, Landroid/util/SparseIntArray;->valueAt(I)I
 
     move-result v3
 
@@ -146,47 +127,26 @@
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getOrDefault(Landroid/util/SparseIntArray;II)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getOrDefault"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/SparseIntArray;->get(II)I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getOrDefault"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getOrElse(Landroid/util/SparseIntArray;ILkotlin/jvm/functions/Function0;)I
@@ -202,11 +162,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getOrElse"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseIntArray;->indexOfKey(I)I
 
@@ -233,47 +195,28 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "defaultValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$getOrElse"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSize(Landroid/util/SparseIntArray;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseIntArray;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroid/util/SparseIntArray;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseIntArray;->size()I
 
@@ -290,21 +233,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroid/util/SparseIntArray;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseIntArray;->size()I
 
@@ -321,46 +257,32 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final keyIterator(Landroid/util/SparseIntArray;)Lj0/i/q;
+.method public static final keyIterator(Landroid/util/SparseIntArray;)Lk0/j/q;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$keyIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseIntArrayKt$keyIterator$1;-><init>(Landroid/util/SparseIntArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$keyIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/util/SparseIntArray;Landroid/util/SparseIntArray;)Landroid/util/SparseIntArray;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/SparseIntArray;
 
@@ -381,76 +303,52 @@
     invoke-static {v0, p1}, Landroidx/core/util/SparseIntArrayKt;->putAll(Landroid/util/SparseIntArray;Landroid/util/SparseIntArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final putAll(Landroid/util/SparseIntArray;Landroid/util/SparseIntArray;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$putAll"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "other"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/util/SparseIntArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseIntArray;->keyAt(I)I
+    invoke-virtual {p1, v1}, Landroid/util/SparseIntArray;->keyAt(I)I
 
     move-result v2
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseIntArray;->valueAt(I)I
+    invoke-virtual {p1, v1}, Landroid/util/SparseIntArray;->valueAt(I)I
 
     move-result v3
 
     invoke-virtual {p0, v2, v3}, Landroid/util/SparseIntArray;->put(II)V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$putAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final remove(Landroid/util/SparseIntArray;II)Z
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$remove"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseIntArray;->indexOfKey(I)I
 
@@ -474,53 +372,30 @@
     const/4 p0, 0x0
 
     return p0
-
-    :cond_1
-    const-string p0, "$this$remove"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroid/util/SparseIntArray;II)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$set"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/SparseIntArray;->put(II)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final valueIterator(Landroid/util/SparseIntArray;)Lj0/i/q;
+.method public static final valueIterator(Landroid/util/SparseIntArray;)Lk0/j/q;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$valueIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseIntArrayKt$valueIterator$1;-><init>(Landroid/util/SparseIntArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$valueIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseLongArrayKt$keyIterator$1.smali b/com.discord/smali/androidx/core/util/SparseLongArrayKt$keyIterator$1.smali
index ba683a4b95..f957a08f57 100644
--- a/com.discord/smali/androidx/core/util/SparseLongArrayKt$keyIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseLongArrayKt$keyIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/SparseLongArrayKt$keyIterator$1;
-.super Lj0/i/q;
+.super Lk0/j/q;
 .source "SparseLongArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/SparseLongArrayKt;->keyIterator(Landroid/util/SparseLongArray;)Lj0/i/q;
+    value = Landroidx/core/util/SparseLongArrayKt;->keyIterator(Landroid/util/SparseLongArray;)Lk0/j/q;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 
     iput-object p1, p0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;->$this_keyIterator:Landroid/util/SparseLongArray;
 
-    invoke-direct {p0}, Lj0/i/q;-><init>()V
+    invoke-direct {p0}, Lk0/j/q;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseLongArrayKt$valueIterator$1.smali b/com.discord/smali/androidx/core/util/SparseLongArrayKt$valueIterator$1.smali
index 9de8ff7111..a4d69b8a2a 100644
--- a/com.discord/smali/androidx/core/util/SparseLongArrayKt$valueIterator$1.smali
+++ b/com.discord/smali/androidx/core/util/SparseLongArrayKt$valueIterator$1.smali
@@ -1,11 +1,11 @@
 .class public final Landroidx/core/util/SparseLongArrayKt$valueIterator$1;
-.super Lj0/i/r;
+.super Lk0/j/r;
 .source "SparseLongArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/core/util/SparseLongArrayKt;->valueIterator(Landroid/util/SparseLongArray;)Lj0/i/r;
+    value = Landroidx/core/util/SparseLongArrayKt;->valueIterator(Landroid/util/SparseLongArray;)Lk0/j/r;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
 
     iput-object p1, p0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;->$this_valueIterator:Landroid/util/SparseLongArray;
 
-    invoke-direct {p0}, Lj0/i/r;-><init>()V
+    invoke-direct {p0}, Lk0/j/r;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali b/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali
index 3740f6a813..9643c62f88 100644
--- a/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali
+++ b/com.discord/smali/androidx/core/util/SparseLongArrayKt.smali
@@ -5,12 +5,14 @@
 
 # direct methods
 .method public static final contains(Landroid/util/SparseLongArray;I)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseLongArray;->indexOfKey(I)I
 
@@ -27,24 +29,17 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsKey(Landroid/util/SparseLongArray;I)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsKey"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseLongArray;->indexOfKey(I)I
 
@@ -61,24 +56,17 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsKey"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final containsValue(Landroid/util/SparseLongArray;J)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$containsValue"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroid/util/SparseLongArray;->indexOfValue(J)I
 
@@ -95,15 +83,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$containsValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final forEach(Landroid/util/SparseLongArray;Lkotlin/jvm/functions/Function2;)V
@@ -126,22 +105,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseLongArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseLongArray;->keyAt(I)I
+    invoke-virtual {p0, v1}, Landroid/util/SparseLongArray;->keyAt(I)I
 
     move-result v2
 
@@ -149,7 +130,7 @@
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroid/util/SparseLongArray;->valueAt(I)J
+    invoke-virtual {p0, v1}, Landroid/util/SparseLongArray;->valueAt(I)J
 
     move-result-wide v3
 
@@ -159,50 +140,29 @@
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getOrDefault(Landroid/util/SparseLongArray;IJ)J
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getOrDefault"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroid/util/SparseLongArray;->get(IJ)J
 
     move-result-wide p0
 
     return-wide p0
-
-    :cond_0
-    const-string p0, "$this$getOrDefault"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getOrElse(Landroid/util/SparseLongArray;ILkotlin/jvm/functions/Function0;)J
@@ -222,11 +182,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getOrElse"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseLongArray;->indexOfKey(I)I
 
@@ -253,53 +215,34 @@
 
     :goto_0
     return-wide p0
-
-    :cond_1
-    const-string p0, "defaultValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$getOrElse"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSize(Landroid/util/SparseLongArray;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseLongArray;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroid/util/SparseLongArray;)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseLongArray;->size()I
 
@@ -316,24 +259,17 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroid/util/SparseLongArray;)Z
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/util/SparseLongArray;->size()I
 
@@ -350,39 +286,23 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final keyIterator(Landroid/util/SparseLongArray;)Lj0/i/q;
+.method public static final keyIterator(Landroid/util/SparseLongArray;)Lk0/j/q;
     .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$keyIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseLongArrayKt$keyIterator$1;-><init>(Landroid/util/SparseLongArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$keyIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Landroid/util/SparseLongArray;Landroid/util/SparseLongArray;)Landroid/util/SparseLongArray;
@@ -391,11 +311,13 @@
         value = 0x12
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/SparseLongArray;
 
@@ -416,20 +338,6 @@
     invoke-static {v0, p1}, Landroidx/core/util/SparseLongArrayKt;->putAll(Landroid/util/SparseLongArray;Landroid/util/SparseLongArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final putAll(Landroid/util/SparseLongArray;Landroid/util/SparseLongArray;)V
@@ -438,51 +346,39 @@
         value = 0x12
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$putAll"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "other"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/util/SparseLongArray;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseLongArray;->keyAt(I)I
+    invoke-virtual {p1, v1}, Landroid/util/SparseLongArray;->keyAt(I)I
 
     move-result v2
 
-    invoke-virtual {p1, v0}, Landroid/util/SparseLongArray;->valueAt(I)J
+    invoke-virtual {p1, v1}, Landroid/util/SparseLongArray;->valueAt(I)J
 
     move-result-wide v3
 
     invoke-virtual {p0, v2, v3, v4}, Landroid/util/SparseLongArray;->put(IJ)V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$putAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final remove(Landroid/util/SparseLongArray;IJ)Z
@@ -491,7 +387,9 @@
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$remove"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/util/SparseLongArray;->indexOfKey(I)I
 
@@ -517,59 +415,36 @@
     const/4 p0, 0x0
 
     return p0
-
-    :cond_1
-    const-string p0, "$this$remove"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final set(Landroid/util/SparseLongArray;IJ)V
-    .locals 0
-    .annotation build Landroidx/annotation/RequiresApi;
-        value = 0x12
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p0, p1, p2, p3}, Landroid/util/SparseLongArray;->put(IJ)V
-
-    return-void
-
-    :cond_0
-    const-string p0, "$this$set"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final valueIterator(Landroid/util/SparseLongArray;)Lj0/i/r;
     .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x12
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$set"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1, p2, p3}, Landroid/util/SparseLongArray;->put(IJ)V
+
+    return-void
+.end method
+
+.method public static final valueIterator(Landroid/util/SparseLongArray;)Lk0/j/r;
+    .locals 1
+    .annotation build Landroidx/annotation/RequiresApi;
+        value = 0x12
+    .end annotation
+
+    const-string v0, "$this$valueIterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/util/SparseLongArrayKt$valueIterator$1;-><init>(Landroid/util/SparseLongArray;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$valueIterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/view/DisplayCompat.smali b/com.discord/smali/androidx/core/view/DisplayCompat.smali
index 5644909f73..b681cf4ab9 100644
--- a/com.discord/smali/androidx/core/view/DisplayCompat.smali
+++ b/com.discord/smali/androidx/core/view/DisplayCompat.smali
@@ -52,7 +52,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v0, "vendor.display-size"
+    const-string/jumbo v0, "vendor.display-size"
 
     invoke-static {v0, p1}, Landroidx/core/view/DisplayCompat;->parsePhysicalDisplaySizeFromSystemProperties(Ljava/lang/String;Landroid/view/Display;)Landroid/graphics/Point;
 
@@ -390,7 +390,7 @@
 
     move-result-object p0
 
-    const-string v0, "x"
+    const-string/jumbo v0, "x"
 
     const/4 v1, -0x1
 
diff --git a/com.discord/smali/androidx/core/view/MenuKt$iterator$1.smali b/com.discord/smali/androidx/core/view/MenuKt$iterator$1.smali
index 8f9d0c5224..7ea26871ac 100644
--- a/com.discord/smali/androidx/core/view/MenuKt$iterator$1.smali
+++ b/com.discord/smali/androidx/core/view/MenuKt$iterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/MenuKt.smali b/com.discord/smali/androidx/core/view/MenuKt.smali
index 94dec8a882..d7e1d6e044 100644
--- a/com.discord/smali/androidx/core/view/MenuKt.smali
+++ b/com.discord/smali/androidx/core/view/MenuKt.smali
@@ -7,11 +7,13 @@
 .method public static final contains(Landroid/view/Menu;Landroid/view/MenuItem;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/view/Menu;->size()I
 
@@ -28,7 +30,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -45,20 +47,6 @@
 
     :cond_1
     return v1
-
-    :cond_2
-    const-string p0, "item"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final forEach(Landroid/view/Menu;Lkotlin/jvm/functions/Function1;)V
@@ -75,51 +63,39 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/view/Menu;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-interface {p0, v0}, Landroid/view/Menu;->getItem(I)Landroid/view/MenuItem;
+    invoke-interface {p0, v1}, Landroid/view/Menu;->getItem(I)Landroid/view/MenuItem;
 
     move-result-object v2
 
     const-string v3, "getItem(index)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final forEachIndexed(Landroid/view/Menu;Lkotlin/jvm/functions/Function2;)V
@@ -138,61 +114,51 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEachIndexed"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/view/Menu;->size()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    invoke-interface {p0, v0}, Landroid/view/Menu;->getItem(I)Landroid/view/MenuItem;
+    invoke-interface {p0, v1}, Landroid/view/Menu;->getItem(I)Landroid/view/MenuItem;
 
     move-result-object v3
 
     const-string v4, "getItem(index)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEachIndexed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final get(Landroid/view/Menu;I)Landroid/view/MenuItem;
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$get"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0, p1}, Landroid/view/Menu;->getItem(I)Landroid/view/MenuItem;
 
@@ -200,18 +166,9 @@
 
     const-string p1, "getItem(index)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$get"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getChildren(Landroid/view/Menu;)Lkotlin/sequences/Sequence;
@@ -227,49 +184,37 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$children"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/MenuKt$children$1;
 
     invoke-direct {v0, p0}, Landroidx/core/view/MenuKt$children$1;-><init>(Landroid/view/Menu;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$children"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getSize(Landroid/view/Menu;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/view/Menu;->size()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroid/view/Menu;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/view/Menu;->size()I
 
@@ -286,21 +231,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroid/view/Menu;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/view/Menu;->size()I
 
@@ -317,15 +255,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final iterator(Landroid/view/Menu;)Ljava/util/Iterator;
@@ -341,32 +270,27 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$iterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/MenuKt$iterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/view/MenuKt$iterator$1;-><init>(Landroid/view/Menu;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$iterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minusAssign(Landroid/view/Menu;Landroid/view/MenuItem;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minusAssign"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -375,18 +299,4 @@
     invoke-interface {p0, p1}, Landroid/view/Menu;->removeItem(I)V
 
     return-void
-
-    :cond_0
-    const-string p0, "item"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minusAssign"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/core/view/OneShotPreDrawListener.smali b/com.discord/smali/androidx/core/view/OneShotPreDrawListener.smali
index d6e75e65fd..5191a6451e 100644
--- a/com.discord/smali/androidx/core/view/OneShotPreDrawListener.smali
+++ b/com.discord/smali/androidx/core/view/OneShotPreDrawListener.smali
@@ -77,7 +77,7 @@
     :cond_1
     new-instance p0, Ljava/lang/NullPointerException;
 
-    const-string p1, "view == null"
+    const-string/jumbo p1, "view == null"
 
     invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/core/view/ViewGroupKt$iterator$1.smali b/com.discord/smali/androidx/core/view/ViewGroupKt$iterator$1.smali
index fbe9ad04dd..888e4e4587 100644
--- a/com.discord/smali/androidx/core/view/ViewGroupKt$iterator$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewGroupKt$iterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
diff --git a/com.discord/smali/androidx/core/view/ViewGroupKt.smali b/com.discord/smali/androidx/core/view/ViewGroupKt.smali
index bb91ce718c..82ba918575 100644
--- a/com.discord/smali/androidx/core/view/ViewGroupKt.smali
+++ b/com.discord/smali/androidx/core/view/ViewGroupKt.smali
@@ -7,11 +7,13 @@
 .method public static final contains(Landroid/view/ViewGroup;Landroid/view/View;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->indexOfChild(Landroid/view/View;)I
 
@@ -30,20 +32,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final forEach(Landroid/view/ViewGroup;Lkotlin/jvm/functions/Function1;)V
@@ -60,51 +48,39 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-virtual {p0, v0}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {p0, v1}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
 
     move-result-object v2
 
     const-string v3, "getChildAt(index)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final forEachIndexed(Landroid/view/ViewGroup;Lkotlin/jvm/functions/Function2;)V
@@ -123,61 +99,51 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEachIndexed"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    invoke-virtual {p0, v0}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {p0, v1}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
 
     move-result-object v3
 
     const-string v4, "getChildAt(index)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEachIndexed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final get(Landroid/view/ViewGroup;I)Landroid/view/View;
     .locals 3
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$get"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
 
@@ -211,15 +177,6 @@
     invoke-direct {v0, p0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_1
-    const-string p0, "$this$get"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getChildren(Landroid/view/ViewGroup;)Lkotlin/sequences/Sequence;
@@ -235,49 +192,37 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$children"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/ViewGroupKt$children$1;
 
     invoke-direct {v0, p0}, Landroidx/core/view/ViewGroupKt$children$1;-><init>(Landroid/view/ViewGroup;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$children"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getSize(Landroid/view/ViewGroup;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroid/view/ViewGroup;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -294,21 +239,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroid/view/ViewGroup;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -325,15 +263,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final iterator(Landroid/view/ViewGroup;)Ljava/util/Iterator;
@@ -349,105 +278,67 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$iterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/ViewGroupKt$iterator$1;
 
     invoke-direct {v0, p0}, Landroidx/core/view/ViewGroupKt$iterator$1;-><init>(Landroid/view/ViewGroup;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$iterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minusAssign(Landroid/view/ViewGroup;Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minusAssign"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minusAssign"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plusAssign(Landroid/view/ViewGroup;Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plusAssign"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plusAssign"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setMargins(Landroid/view/ViewGroup$MarginLayoutParams;I)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/Px;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setMargins"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p1, p1, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->setMargins(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setMargins"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final updateMargins(Landroid/view/ViewGroup$MarginLayoutParams;IIII)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/Px;
         .end annotation
@@ -465,23 +356,16 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$updateMargins"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/view/ViewGroup$MarginLayoutParams;->setMargins(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$updateMargins"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static updateMargins$default(Landroid/view/ViewGroup$MarginLayoutParams;IIIIILjava/lang/Object;)V
+.method public static synthetic updateMargins$default(Landroid/view/ViewGroup$MarginLayoutParams;IIIIILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p6, p5, 0x1
@@ -512,24 +396,17 @@
     iget p4, p0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
     :cond_3
-    if-eqz p0, :cond_4
+    const-string p5, "$this$updateMargins"
+
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/view/ViewGroup$MarginLayoutParams;->setMargins(IIII)V
 
     return-void
-
-    :cond_4
-    const-string p0, "$this$updateMargins"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final updateMarginsRelative(Landroid/view/ViewGroup$MarginLayoutParams;IIII)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/Px;
         .end annotation
@@ -550,7 +427,9 @@
         value = 0x11
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$updateMarginsRelative"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->setMarginStart(I)V
 
@@ -561,18 +440,9 @@
     iput p4, p0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$updateMarginsRelative"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static updateMarginsRelative$default(Landroid/view/ViewGroup$MarginLayoutParams;IIIIILjava/lang/Object;)V
+.method public static synthetic updateMarginsRelative$default(Landroid/view/ViewGroup$MarginLayoutParams;IIIIILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p6, p5, 0x1
@@ -607,7 +477,9 @@
     iget p4, p0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
     :cond_3
-    if-eqz p0, :cond_4
+    const-string p5, "$this$updateMarginsRelative"
+
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->setMarginStart(I)V
 
@@ -618,13 +490,4 @@
     iput p4, p0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
     return-void
-
-    :cond_4
-    const-string p0, "$this$updateMarginsRelative"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/view/ViewKt$doOnAttach$1.smali b/com.discord/smali/androidx/core/view/ViewKt$doOnAttach$1.smali
index 7be3e9a1eb..f36a6495c5 100644
--- a/com.discord/smali/androidx/core/view/ViewKt$doOnAttach$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewKt$doOnAttach$1.smali
@@ -41,7 +41,9 @@
 .method public onViewAttachedToWindow(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/view/ViewKt$doOnAttach$1;->$this_doOnAttach:Landroid/view/View;
 
@@ -52,30 +54,14 @@
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewDetachedFromWindow(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/view/ViewKt$doOnDetach$1.smali b/com.discord/smali/androidx/core/view/ViewKt$doOnDetach$1.smali
index bbbc02bfc6..298b1398fd 100644
--- a/com.discord/smali/androidx/core/view/ViewKt$doOnDetach$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewKt$doOnDetach$1.smali
@@ -39,26 +39,21 @@
 
 # virtual methods
 .method public onViewAttachedToWindow(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewDetachedFromWindow(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/core/view/ViewKt$doOnDetach$1;->$this_doOnDetach:Landroid/view/View;
 
@@ -69,13 +64,4 @@
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/view/ViewKt$doOnLayout$$inlined$doOnNextLayout$1.smali b/com.discord/smali/androidx/core/view/ViewKt$doOnLayout$$inlined$doOnNextLayout$1.smali
index 707eaadf40..e62a1bf20a 100644
--- a/com.discord/smali/androidx/core/view/ViewKt$doOnLayout$$inlined$doOnNextLayout$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewKt$doOnLayout$$inlined$doOnNextLayout$1.smali
@@ -37,7 +37,9 @@
 .method public onLayoutChange(Landroid/view/View;IIIIIIII)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p2, "view"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
@@ -46,13 +48,4 @@
     invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/view/ViewKt$doOnNextLayout$1.smali b/com.discord/smali/androidx/core/view/ViewKt$doOnNextLayout$1.smali
index 158a380d61..d061ee332a 100644
--- a/com.discord/smali/androidx/core/view/ViewKt$doOnNextLayout$1.smali
+++ b/com.discord/smali/androidx/core/view/ViewKt$doOnNextLayout$1.smali
@@ -37,7 +37,9 @@
 .method public onLayoutChange(Landroid/view/View;IIIIIIII)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p2, "view"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
@@ -46,13 +48,4 @@
     invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/core/view/ViewKt.smali b/com.discord/smali/androidx/core/view/ViewKt.smali
index ec5aca1aa4..4692740021 100644
--- a/com.discord/smali/androidx/core/view/ViewKt.smali
+++ b/com.discord/smali/androidx/core/view/ViewKt.smali
@@ -18,11 +18,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnAttach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->isAttachedToWindow(Landroid/view/View;)Z
 
@@ -43,20 +45,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$doOnAttach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnDetach(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
@@ -73,11 +61,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnDetach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->isAttachedToWindow(Landroid/view/View;)Z
 
@@ -98,20 +88,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$doOnDetach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnLayout(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
@@ -128,11 +104,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnLayout"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
@@ -159,20 +137,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$doOnLayout"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnNextLayout(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
@@ -189,11 +153,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnNextLayout"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/ViewKt$doOnNextLayout$1;
 
@@ -202,20 +168,6 @@
     invoke-virtual {p0, v0}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnNextLayout"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnPreDraw(Landroid/view/View;Lkotlin/jvm/functions/Function1;)Landroidx/core/view/OneShotPreDrawListener;
@@ -233,11 +185,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnPreDraw"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/ViewKt$doOnPreDraw$1;
 
@@ -249,33 +203,21 @@
 
     const-string p1, "OneShotPreDrawListener.add(this) { action(this) }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnPreDraw"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final drawToBitmap(Landroid/view/View;Landroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "$this$drawToBitmap"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "config"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
@@ -297,7 +239,7 @@
 
     const-string v0, "Bitmap.createBitmap(width, height, config)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/graphics/Canvas;
 
@@ -333,20 +275,6 @@
     invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_1
-    const-string p0, "config"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$drawToBitmap"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic drawToBitmap$default(Landroid/view/View;Landroid/graphics/Bitmap$Config;ILjava/lang/Object;)Landroid/graphics/Bitmap;
@@ -367,52 +295,44 @@
 .end method
 
 .method public static final getMarginBottom(Landroid/view/View;)I
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$marginBottom"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p0
 
-    instance-of v1, p0, Landroid/view/ViewGroup$MarginLayoutParams;
+    instance-of v0, p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p0, 0x0
 
     :cond_0
-    move-object v0, p0
+    check-cast p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    :goto_0
-    check-cast v0, Landroid/view/ViewGroup$MarginLayoutParams;
+    if-eqz p0, :cond_1
 
-    if-eqz v0, :cond_1
+    iget p0, p0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
-    iget p0, v0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 p0, 0x0
 
-    :goto_1
+    :goto_0
     return p0
-
-    :cond_2
-    const-string p0, "$this$marginBottom"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getMarginEnd(Landroid/view/View;)I
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$marginEnd"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -435,107 +355,80 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$marginEnd"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getMarginLeft(Landroid/view/View;)I
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$marginLeft"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p0
 
-    instance-of v1, p0, Landroid/view/ViewGroup$MarginLayoutParams;
+    instance-of v0, p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p0, 0x0
 
     :cond_0
-    move-object v0, p0
+    check-cast p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    :goto_0
-    check-cast v0, Landroid/view/ViewGroup$MarginLayoutParams;
+    if-eqz p0, :cond_1
 
-    if-eqz v0, :cond_1
+    iget p0, p0, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
 
-    iget p0, v0, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 p0, 0x0
 
-    :goto_1
+    :goto_0
     return p0
-
-    :cond_2
-    const-string p0, "$this$marginLeft"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getMarginRight(Landroid/view/View;)I
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$marginRight"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p0
 
-    instance-of v1, p0, Landroid/view/ViewGroup$MarginLayoutParams;
+    instance-of v0, p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p0, 0x0
 
     :cond_0
-    move-object v0, p0
+    check-cast p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    :goto_0
-    check-cast v0, Landroid/view/ViewGroup$MarginLayoutParams;
+    if-eqz p0, :cond_1
 
-    if-eqz v0, :cond_1
+    iget p0, p0, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
 
-    iget p0, v0, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 p0, 0x0
 
-    :goto_1
+    :goto_0
     return p0
-
-    :cond_2
-    const-string p0, "$this$marginRight"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getMarginStart(Landroid/view/View;)I
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$marginStart"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -558,64 +451,47 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$marginStart"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getMarginTop(Landroid/view/View;)I
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$marginTop"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p0
 
-    instance-of v1, p0, Landroid/view/ViewGroup$MarginLayoutParams;
+    instance-of v0, p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p0, 0x0
 
     :cond_0
-    move-object v0, p0
+    check-cast p0, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    :goto_0
-    check-cast v0, Landroid/view/ViewGroup$MarginLayoutParams;
+    if-eqz p0, :cond_1
 
-    if-eqz v0, :cond_1
+    iget p0, p0, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
 
-    iget p0, v0, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     const/4 p0, 0x0
 
-    :goto_1
+    :goto_0
     return p0
-
-    :cond_2
-    const-string p0, "$this$marginTop"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final isGone(Landroid/view/View;)Z
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isGone"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getVisibility()I
 
@@ -634,21 +510,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isGone"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isInvisible(Landroid/view/View;)Z
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isInvisible"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getVisibility()I
 
@@ -667,21 +536,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isInvisible"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isVisible(Landroid/view/View;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isVisible"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getVisibility()I
 
@@ -698,15 +560,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isVisible"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final postDelayed(Landroid/view/View;JLkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;
@@ -723,11 +576,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$postDelayed"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/ViewKt$postDelayed$runnable$1;
 
@@ -736,20 +591,6 @@
     invoke-virtual {p0, v0, p1, p2}, Landroid/view/View;->postDelayed(Ljava/lang/Runnable;J)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$postDelayed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final postOnAnimationDelayed(Landroid/view/View;JLkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;
@@ -770,11 +611,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$postOnAnimationDelayed"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/view/ViewKt$postOnAnimationDelayed$runnable$1;
 
@@ -783,26 +626,14 @@
     invoke-virtual {p0, v0, p1, p2}, Landroid/view/View;->postOnAnimationDelayed(Ljava/lang/Runnable;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$postOnAnimationDelayed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setGone(Landroid/view/View;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isGone"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -817,21 +648,14 @@
     invoke-virtual {p0, p1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_1
-    const-string p0, "$this$isGone"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setInvisible(Landroid/view/View;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isInvisible"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -846,44 +670,30 @@
     invoke-virtual {p0, p1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_1
-    const-string p0, "$this$isInvisible"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setPadding(Landroid/view/View;I)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/Px;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setPadding"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p1, p1, p1}, Landroid/view/View;->setPadding(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setPadding"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setVisible(Landroid/view/View;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isVisible"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -898,15 +708,6 @@
     invoke-virtual {p0, p1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_1
-    const-string p0, "$this$isVisible"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final updateLayoutParams(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
@@ -923,11 +724,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$updateLayoutParams"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -949,23 +752,9 @@
     invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_1
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$updateLayoutParams"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static final updateLayoutParamsTyped(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
+.method public static final synthetic updateLayoutParamsTyped(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -980,35 +769,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$updateLayoutParams"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$updateLayoutParams"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
 .method public static final updatePadding(Landroid/view/View;IIII)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/Px;
         .end annotation
@@ -1026,23 +805,16 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$updatePadding"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/view/View;->setPadding(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$updatePadding"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static updatePadding$default(Landroid/view/View;IIIIILjava/lang/Object;)V
+.method public static synthetic updatePadding$default(Landroid/view/View;IIIIILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p6, p5, 0x1
@@ -1081,24 +853,17 @@
     move-result p4
 
     :cond_3
-    if-eqz p0, :cond_4
+    const-string p5, "$this$updatePadding"
+
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/view/View;->setPadding(IIII)V
 
     return-void
-
-    :cond_4
-    const-string p0, "$this$updatePadding"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final updatePaddingRelative(Landroid/view/View;IIII)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/Px;
         .end annotation
@@ -1119,23 +884,16 @@
         value = 0x11
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$updatePaddingRelative"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/view/View;->setPaddingRelative(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$updatePaddingRelative"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static updatePaddingRelative$default(Landroid/view/View;IIIIILjava/lang/Object;)V
+.method public static synthetic updatePaddingRelative$default(Landroid/view/View;IIIIILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p6, p5, 0x1
@@ -1174,18 +932,11 @@
     move-result p4
 
     :cond_3
-    if-eqz p0, :cond_4
+    const-string p5, "$this$updatePaddingRelative"
+
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/view/View;->setPaddingRelative(IIII)V
 
     return-void
-
-    :cond_4
-    const-string p0, "$this$updatePaddingRelative"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
index 7fd5651053..b6a4495a6e 100644
--- a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/widget/TextViewKt$addTextChangedListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TextView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/CharSequence;",
         "Ljava/lang/Integer;",
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x4
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali
index e2e29d010a..61fbc2ea64 100644
--- a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/widget/TextViewKt$addTextChangedListener$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TextView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/CharSequence;",
         "Ljava/lang/Integer;",
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x4
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali
index 9a56fc3be2..d0bdee21e3 100644
--- a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/core/widget/TextViewKt$addTextChangedListener$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TextView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt.smali b/com.discord/smali/androidx/core/widget/TextViewKt.smali
index 6f2fd60e93..e5b0b0b704 100644
--- a/com.discord/smali/androidx/core/widget/TextViewKt.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewKt.smali
@@ -41,15 +41,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addTextChangedListener"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "beforeTextChanged"
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "onTextChanged"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "afterTextChanged"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;
 
@@ -58,37 +64,9 @@
     invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "afterTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "onTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "beforeTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$addTextChangedListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static addTextChangedListener$default(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/text/TextWatcher;
+.method public static synthetic addTextChangedListener$default(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroid/text/TextWatcher;
     .locals 0
 
     and-int/lit8 p5, p4, 0x1
@@ -112,19 +90,21 @@
     sget-object p3, Landroidx/core/widget/TextViewKt$addTextChangedListener$3;->INSTANCE:Landroidx/core/widget/TextViewKt$addTextChangedListener$3;
 
     :cond_2
-    if-eqz p0, :cond_3
+    const-string p4, "$this$addTextChangedListener"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p4, "beforeTextChanged"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p4, "onTextChanged"
 
-    invoke-static {p2, p4}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p4, "afterTextChanged"
 
-    invoke-static {p3, p4}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p4, Landroidx/core/widget/TextViewKt$addTextChangedListener$textWatcher$1;
 
@@ -133,15 +113,6 @@
     invoke-virtual {p0, p4}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
 
     return-object p4
-
-    :cond_3
-    const-string p0, "$this$addTextChangedListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final doAfterTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function1;)Landroid/text/TextWatcher;
@@ -159,11 +130,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doAfterTextChanged"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/widget/TextViewKt$doAfterTextChanged$$inlined$addTextChangedListener$1;
 
@@ -172,20 +145,6 @@
     invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doAfterTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doBeforeTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;)Landroid/text/TextWatcher;
@@ -209,11 +168,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doBeforeTextChanged"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/widget/TextViewKt$doBeforeTextChanged$$inlined$addTextChangedListener$1;
 
@@ -222,20 +183,6 @@
     invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doBeforeTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final doOnTextChanged(Landroid/widget/TextView;Lkotlin/jvm/functions/Function4;)Landroid/text/TextWatcher;
@@ -259,11 +206,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$doOnTextChanged"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/widget/TextViewKt$doOnTextChanged$$inlined$addTextChangedListener$1;
 
@@ -272,18 +221,4 @@
     invoke-virtual {p0, v0}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$doOnTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/customview/R$attr.smali b/com.discord/smali/androidx/customview/R$attr.smali
index f81f092e23..8117ae5b73 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index 950547fed2..ec8eb290fd 100644
--- a/com.discord/smali/androidx/customview/R$drawable.smali
+++ b/com.discord/smali/androidx/customview/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index a7dc6a9a25..fa7773070a 100644
--- a/com.discord/smali/androidx/customview/R$id.smali
+++ b/com.discord/smali/androidx/customview/R$id.smali
@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 5066fcf3fb..3faf450bc5 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$style.smali b/com.discord/smali/androidx/customview/R$style.smali
index 9b851e7d2b..180b0c834f 100644
--- a/com.discord/smali/androidx/customview/R$style.smali
+++ b/com.discord/smali/androidx/customview/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$styleable.smali b/com.discord/smali/androidx/customview/R$styleable.smali
index 2496e3f8fd..83fd8b5de6 100644
--- a/com.discord/smali/androidx/customview/R$styleable.smali
+++ b/com.discord/smali/androidx/customview/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali b/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali
index 652738b4df..d1d504620f 100644
--- a/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali
+++ b/com.discord/smali/androidx/documentfile/provider/DocumentsContractApi19.smali
@@ -100,7 +100,7 @@
     return v3
 
     :cond_2
-    const-string p1, "vnd.android.document/directory"
+    const-string/jumbo p1, "vnd.android.document/directory"
 
     invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -299,7 +299,7 @@
 
     move-result-object p0
 
-    const-string p1, "vnd.android.document/directory"
+    const-string/jumbo p1, "vnd.android.document/directory"
 
     invoke-virtual {p1, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -320,7 +320,7 @@
 
     move-result-object p0
 
-    const-string p1, "vnd.android.document/directory"
+    const-string/jumbo p1, "vnd.android.document/directory"
 
     invoke-virtual {p1, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -336,7 +336,7 @@
 
     move-result-object p0
 
-    const-string p1, "vnd.android.document/directory"
+    const-string/jumbo p1, "vnd.android.document/directory"
 
     invoke-virtual {p1, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali b/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali
index 4aaa351b6e..9f7e77188f 100644
--- a/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali
+++ b/com.discord/smali/androidx/documentfile/provider/TreeDocumentFile.smali
@@ -123,7 +123,7 @@
 
     iget-object v1, p0, Landroidx/documentfile/provider/TreeDocumentFile;->mUri:Landroid/net/Uri;
 
-    const-string v2, "vnd.android.document/directory"
+    const-string/jumbo v2, "vnd.android.document/directory"
 
     invoke-static {v0, v1, v2, p1}, Landroidx/documentfile/provider/TreeDocumentFile;->createFile(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri;
 
diff --git a/com.discord/smali/androidx/drawerlayout/R$attr.smali b/com.discord/smali/androidx/drawerlayout/R$attr.smali
index af37e4be45..5f84e4cdd2 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index 5ba502f96c..ac5431196d 100644
--- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index d5ff550dc0..308a4fd487 100644
--- a/com.discord/smali/androidx/drawerlayout/R$id.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$id.smali
@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index b0f8a9d7e9..2a0bc098f4 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$style.smali b/com.discord/smali/androidx/drawerlayout/R$style.smali
index e6b9c1e3dc..fbd95659d9 100644
--- a/com.discord/smali/androidx/drawerlayout/R$style.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$styleable.smali b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
index f7fc8c44c3..330c1b2540 100644
--- a/com.discord/smali/androidx/drawerlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/dynamicanimation/R$attr.smali b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
index d620e1be28..2b304f0c46 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$attr.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index 44e8e846cc..c03824d28a 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index 948ef074de..278d43e4ec 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$id.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index 813a93d0a0..f631ca021e 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$string.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$style.smali b/com.discord/smali/androidx/dynamicanimation/R$style.smali
index c71c8f884e..bf3e726bdb 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$style.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
index 30201ea2b2..159c7f04aa 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/dynamicanimation/animation/DynamicAnimation.smali b/com.discord/smali/androidx/dynamicanimation/animation/DynamicAnimation.smali
index d20e02a378..d7208f38c1 100644
--- a/com.discord/smali/androidx/dynamicanimation/animation/DynamicAnimation.smali
+++ b/com.discord/smali/androidx/dynamicanimation/animation/DynamicAnimation.smali
@@ -205,7 +205,7 @@
 
     new-instance v0, Landroidx/dynamicanimation/animation/DynamicAnimation$9;
 
-    const-string v1, "x"
+    const-string/jumbo v1, "x"
 
     invoke-direct {v0, v1}, Landroidx/dynamicanimation/animation/DynamicAnimation$9;-><init>(Ljava/lang/String;)V
 
@@ -213,7 +213,7 @@
 
     new-instance v0, Landroidx/dynamicanimation/animation/DynamicAnimation$10;
 
-    const-string v1, "y"
+    const-string/jumbo v1, "y"
 
     invoke-direct {v0, v1}, Landroidx/dynamicanimation/animation/DynamicAnimation$10;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/exifinterface/media/ExifInterface.smali b/com.discord/smali/androidx/exifinterface/media/ExifInterface.smali
index 220b158591..f57b35376d 100644
--- a/com.discord/smali/androidx/exifinterface/media/ExifInterface.smali
+++ b/com.discord/smali/androidx/exifinterface/media/ExifInterface.smali
@@ -4700,7 +4700,7 @@
         }
     .end annotation
 
-    const-string v0, "yes"
+    const-string/jumbo v0, "yes"
 
     new-instance v1, Landroid/media/MediaMetadataRetriever;
 
@@ -5026,7 +5026,7 @@
 
     invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v3, "x"
+    const-string/jumbo v3, "x"
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -6024,7 +6024,7 @@
 
     const-string v1, "numberOfDirectoryEntry: "
 
-    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_0
     const/4 v1, 0x0
@@ -8365,7 +8365,7 @@
 
     const-string v4, "numberOfDirectoryEntry: "
 
-    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_1
     iget v4, v1, Landroidx/exifinterface/media/ExifInterface$ByteOrderedDataInputStream;->mPosition:I
@@ -8499,7 +8499,7 @@
 
     const-string v4, "Skip the tag entry since tag number is not defined: "
 
-    invoke-static {v4, v8, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v4, v8, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_2
 
@@ -8602,7 +8602,7 @@
 
     const-string v7, "Skip the tag entry since the number of components is invalid: "
 
-    invoke-static {v7, v12, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v7, v12, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_c
     const/4 v7, 0x0
@@ -8619,7 +8619,7 @@
 
     const-string v3, "Skip the tag entry since data format is invalid: "
 
-    invoke-static {v3, v9, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v3, v9, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_e
     :goto_5
@@ -8655,7 +8655,7 @@
 
     const-string v14, "seek to data offset: "
 
-    invoke-static {v14, v13, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v14, v13, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_10
     iget v14, v0, Landroidx/exifinterface/media/ExifInterface;->mMimeType:I
@@ -8821,7 +8821,7 @@
 
     const-string v3, "Skip the tag entry since data offset is invalid: "
 
-    invoke-static {v3, v13, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v3, v13, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_16
     move-wide/from16 v10, v20
@@ -9308,7 +9308,7 @@
 
     const-string v1, "Stop reading file since re-reading an IFD may cause an infinite loop: "
 
-    invoke-static {v1, v2, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v2, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_e
 
@@ -9319,7 +9319,7 @@
 
     const-string v1, "Stop reading file since a wrong offset may cause an infinite loop: "
 
-    invoke-static {v1, v2, v5}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v2, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_2d
     :goto_e
@@ -10844,7 +10844,7 @@
 
     const-string v2, "ExifInterface"
 
-    invoke-static {p2, v5, v2}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p2, v5, v2}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     const/4 p2, 0x0
 
@@ -13938,7 +13938,7 @@
 
     const-string v2, "Data format isn\'t one of expected formats: "
 
-    invoke-static {v2, v0, v1}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v2, v0, v1}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     goto/16 :goto_d
 
diff --git a/com.discord/smali/androidx/fragment/R$attr.smali b/com.discord/smali/androidx/fragment/R$attr.smali
index df7231e977..ec233c1501 100644
--- a/com.discord/smali/androidx/fragment/R$attr.smali
+++ b/com.discord/smali/androidx/fragment/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 3d4ee8d9ea..b41745fd64 100644
--- a/com.discord/smali/androidx/fragment/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index 22a88e0dc3..8dedc29a14 100644
--- a/com.discord/smali/androidx/fragment/R$id.smali
+++ b/com.discord/smali/androidx/fragment/R$id.smali
@@ -94,63 +94,63 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index f304e8ad2e..627c001580 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$style.smali b/com.discord/smali/androidx/fragment/R$style.smali
index 9347b6d275..f3530b63e7 100644
--- a/com.discord/smali/androidx/fragment/R$style.smali
+++ b/com.discord/smali/androidx/fragment/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$styleable.smali b/com.discord/smali/androidx/fragment/R$styleable.smali
index 4f795d444c..6b1e510018 100644
--- a/com.discord/smali/androidx/fragment/R$styleable.smali
+++ b/com.discord/smali/androidx/fragment/R$styleable.smali
@@ -193,7 +193,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/fragment/app/FragmentActivity.smali b/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
index bf056e61b0..2a6c0bf8e6 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentActivity.smali
@@ -551,7 +551,7 @@
 
     const-string p1, "Activity result no fragment exists for who: "
 
-    invoke-static {p1, v1, v0}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, v1, v0}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -1150,7 +1150,7 @@
 
     const-string p1, "Activity result no fragment exists for who: "
 
-    invoke-static {p1, v2, v0}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, v2, v0}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/androidx/fragment/app/FragmentManagerKt.smali b/com.discord/smali/androidx/fragment/app/FragmentManagerKt.smali
index 5d286965a3..2f714471bb 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentManagerKt.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentManagerKt.smali
@@ -19,11 +19,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$commit"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "body"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
@@ -31,7 +33,7 @@
 
     const-string v0, "beginTransaction()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -46,23 +48,9 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$commit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static commit$default(Landroidx/fragment/app/FragmentManager;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+.method public static synthetic commit$default(Landroidx/fragment/app/FragmentManager;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p3, p3, 0x1
@@ -72,11 +60,13 @@
     const/4 p1, 0x0
 
     :cond_0
-    const/4 p3, 0x0
+    const-string p3, "$this$commit"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string p3, "body"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
@@ -84,7 +74,7 @@
 
     const-string p3, "beginTransaction()"
 
-    invoke-static {p0, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -99,20 +89,6 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_3
-    const-string p0, "$this$commit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
 
 .method public static final commitNow(Landroidx/fragment/app/FragmentManager;ZLkotlin/jvm/functions/Function1;)V
@@ -130,11 +106,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$commitNow"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "body"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
@@ -142,7 +120,7 @@
 
     const-string v0, "beginTransaction()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -157,23 +135,9 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$commitNow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static commitNow$default(Landroidx/fragment/app/FragmentManager;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+.method public static synthetic commitNow$default(Landroidx/fragment/app/FragmentManager;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
     .locals 0
 
     and-int/lit8 p3, p3, 0x1
@@ -183,11 +147,13 @@
     const/4 p1, 0x0
 
     :cond_0
-    const/4 p3, 0x0
+    const-string p3, "$this$commitNow"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string p3, "body"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
@@ -195,7 +161,7 @@
 
     const-string p3, "beginTransaction()"
 
-    invoke-static {p0, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -210,20 +176,6 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_3
-    const-string p0, "$this$commitNow"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
 
 .method public static final transaction(Landroidx/fragment/app/FragmentManager;ZZLkotlin/jvm/functions/Function1;)V
@@ -241,11 +193,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$transaction"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_3
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
@@ -253,7 +207,7 @@
 
     const-string v0, "beginTransaction()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -282,23 +236,9 @@
 
     :goto_0
     return-void
-
-    :cond_3
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "$this$transaction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static transaction$default(Landroidx/fragment/app/FragmentManager;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+.method public static synthetic transaction$default(Landroidx/fragment/app/FragmentManager;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
     .locals 1
 
     and-int/lit8 p5, p4, 0x1
@@ -317,11 +257,13 @@
     const/4 p2, 0x0
 
     :cond_1
-    const/4 p4, 0x0
+    const-string p4, "$this$transaction"
 
-    if-eqz p0, :cond_6
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_5
+    const-string p4, "body"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
@@ -329,7 +271,7 @@
 
     const-string p4, "beginTransaction()"
 
-    invoke-static {p0, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -358,18 +300,4 @@
 
     :goto_0
     return-void
-
-    :cond_5
-    const-string p0, "body"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_6
-    const-string p0, "$this$transaction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentStateManager.smali b/com.discord/smali/androidx/fragment/app/FragmentStateManager.smali
index 1d1dd62f2d..0010c6aa86 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentStateManager.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentStateManager.smali
@@ -797,7 +797,7 @@
     goto :goto_0
 
     :catch_0
-    const-string p1, "unknown"
+    const-string/jumbo p1, "unknown"
 
     :goto_0
     new-instance v0, Ljava/lang/IllegalArgumentException;
diff --git a/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali b/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali
index dbc1b85a0d..d96ac756ed 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentStatePagerAdapter.smali
@@ -530,7 +530,7 @@
 
     const-string v3, "FragmentStatePagerAdapt"
 
-    invoke-static {v2, v1, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v1, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_1
 
diff --git a/com.discord/smali/androidx/fragment/app/FragmentTransactionKt.smali b/com.discord/smali/androidx/fragment/app/FragmentTransactionKt.smali
index 4aaa55dd1c..0f0b16621f 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentTransactionKt.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentTransactionKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final add(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/FragmentTransaction;
+.method public static final synthetic add(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/FragmentTransaction;
     .locals 0
     .param p1    # I
         .annotation build Landroidx/annotation/IdRes;
@@ -24,23 +24,18 @@
         }
     .end annotation
 
-    const/4 p1, 0x0
+    const-string p1, "$this$add"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$add"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
 
-.method public static final add(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/FragmentTransaction;
+.method public static final synthetic add(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/FragmentTransaction;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,85 +50,60 @@
         }
     .end annotation
 
-    const/4 p2, 0x0
+    const-string p2, "$this$add"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw p2
-
-    :cond_0
     const-string p0, "tag"
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p2
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    :cond_1
-    const-string p0, "$this$add"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    throw p0
 .end method
 
-.method public static add$default(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;ILjava/lang/Object;)Landroidx/fragment/app/FragmentTransaction;
+.method public static synthetic add$default(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;ILjava/lang/Object;)Landroidx/fragment/app/FragmentTransaction;
     .locals 0
 
     and-int/lit8 p1, p4, 0x2
 
     and-int/lit8 p1, p4, 0x4
 
-    const/4 p1, 0x0
+    const-string p1, "$this$add"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$add"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
 
-.method public static add$default(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;Landroid/os/Bundle;ILjava/lang/Object;)Landroidx/fragment/app/FragmentTransaction;
+.method public static synthetic add$default(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;Landroid/os/Bundle;ILjava/lang/Object;)Landroidx/fragment/app/FragmentTransaction;
     .locals 0
 
     and-int/lit8 p2, p3, 0x2
 
-    const/4 p2, 0x0
+    const-string p2, "$this$add"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw p2
-
-    :cond_0
     const-string p0, "tag"
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p2
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    :cond_1
-    const-string p0, "$this$add"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    throw p0
 .end method
 
-.method public static final replace(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/FragmentTransaction;
+.method public static final synthetic replace(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/FragmentTransaction;
     .locals 0
     .param p1    # I
         .annotation build Landroidx/annotation/IdRes;
@@ -153,41 +123,31 @@
         }
     .end annotation
 
-    const/4 p1, 0x0
+    const-string p1, "$this$replace"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$replace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
 
-.method public static replace$default(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;ILjava/lang/Object;)Landroidx/fragment/app/FragmentTransaction;
+.method public static synthetic replace$default(Landroidx/fragment/app/FragmentTransaction;ILjava/lang/String;Landroid/os/Bundle;ILjava/lang/Object;)Landroidx/fragment/app/FragmentTransaction;
     .locals 0
 
     and-int/lit8 p1, p4, 0x2
 
     and-int/lit8 p1, p4, 0x4
 
-    const/4 p1, 0x0
+    const-string p1, "$this$replace"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$replace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$1.smali b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$1.smali
index 8169896c9c..a3bb4fcea5 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FragmentViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelStore;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string v1, "requireActivity()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroidx/activity/ComponentActivity;->getViewModelStore()Landroidx/lifecycle/ViewModelStore;
 
@@ -64,7 +64,7 @@
 
     const-string v1, "requireActivity().viewModelStore"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$2.smali b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$2.smali
index 2be91e58b1..30133578fe 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$2.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/fragment/app/FragmentViewModelLazyKt$activityViewModels$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FragmentViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelProvider$Factory;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string v1, "requireActivity()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroidx/activity/ComponentActivity;->getDefaultViewModelProviderFactory()Landroidx/lifecycle/ViewModelProvider$Factory;
 
@@ -64,7 +64,7 @@
 
     const-string v1, "requireActivity().defaultViewModelProviderFactory"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$createViewModelLazy$factoryPromise$1.smali b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$createViewModelLazy$factoryPromise$1.smali
index 8e2877c0ba..fbcef73b21 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$createViewModelLazy$factoryPromise$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$createViewModelLazy$factoryPromise$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/fragment/app/FragmentViewModelLazyKt$createViewModelLazy$factoryPromise$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FragmentViewModelLazy.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/fragment/app/FragmentViewModelLazyKt;->createViewModelLazy(Landroidx/fragment/app/Fragment;Lj0/r/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+    value = Landroidx/fragment/app/FragmentViewModelLazyKt;->createViewModelLazy(Landroidx/fragment/app/Fragment;Lk0/s/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelProvider$Factory;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string v1, "defaultViewModelProviderFactory"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$1.smali b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$1.smali
index 2194f9deca..8ad29d89cf 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$1.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/fragment/app/FragmentViewModelLazyKt$viewModels$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FragmentViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/fragment/app/Fragment;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$2.smali b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$2.smali
index fff293b6a7..518218ad40 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$2.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt$viewModels$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/fragment/app/FragmentViewModelLazyKt$viewModels$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FragmentViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelStore;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     const-string v1, "ownerProducer().viewModelStore"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt.smali b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt.smali
index 821591b5e9..e3e8cf072e 100644
--- a/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt.smali
+++ b/com.discord/smali/androidx/fragment/app/FragmentViewModelLazyKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final activityViewModels(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+.method public static final synthetic activityViewModels(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
     .locals 0
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
@@ -24,44 +24,34 @@
         }
     .end annotation
 
-    const/4 p1, 0x0
+    const-string p1, "$this$activityViewModels"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$activityViewModels"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
 
-.method public static activityViewModels$default(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
+.method public static synthetic activityViewModels$default(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
     .locals 0
 
     and-int/lit8 p1, p2, 0x1
 
-    const/4 p1, 0x0
+    const-string p1, "$this$activityViewModels"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p1
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$activityViewModels"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw p0
 .end method
 
-.method public static final createViewModelLazy(Landroidx/fragment/app/Fragment;Lj0/r/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+.method public static final createViewModelLazy(Landroidx/fragment/app/Fragment;Lk0/s/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
     .locals 1
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
@@ -72,7 +62,7 @@
             "Landroidx/lifecycle/ViewModel;",
             ">(",
             "Landroidx/fragment/app/Fragment;",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "TVM;>;",
             "Lkotlin/jvm/functions/Function0<",
             "+",
@@ -87,13 +77,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$createViewModelLazy"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "viewModelClass"
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeProducer"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -107,33 +101,12 @@
     :goto_0
     new-instance p0, Landroidx/lifecycle/ViewModelLazy;
 
-    invoke-direct {p0, p1, p2, p3}, Landroidx/lifecycle/ViewModelLazy;-><init>(Lj0/r/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {p0, p1, p2, p3}, Landroidx/lifecycle/ViewModelLazy;-><init>(Lk0/s/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 
     return-object p0
-
-    :cond_1
-    const-string p0, "storeProducer"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "viewModelClass"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$createViewModelLazy"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static synthetic createViewModelLazy$default(Landroidx/fragment/app/Fragment;Lj0/r/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
+.method public static synthetic createViewModelLazy$default(Landroidx/fragment/app/Fragment;Lk0/s/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
     .locals 0
 
     and-int/lit8 p4, p4, 0x4
@@ -143,14 +116,14 @@
     const/4 p3, 0x0
 
     :cond_0
-    invoke-static {p0, p1, p2, p3}, Landroidx/fragment/app/FragmentViewModelLazyKt;->createViewModelLazy(Landroidx/fragment/app/Fragment;Lj0/r/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+    invoke-static {p0, p1, p2, p3}, Landroidx/fragment/app/FragmentViewModelLazyKt;->createViewModelLazy(Landroidx/fragment/app/Fragment;Lk0/s/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final viewModels(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+.method public static final synthetic viewModels(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
     .locals 0
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
@@ -174,32 +147,22 @@
         }
     .end annotation
 
-    const/4 p2, 0x0
+    const-string p2, "$this$viewModels"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw p2
-
-    :cond_0
     const-string p0, "ownerProducer"
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p2
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    :cond_1
-    const-string p0, "$this$viewModels"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    throw p0
 .end method
 
-.method public static viewModels$default(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
+.method public static synthetic viewModels$default(Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/Lazy;
     .locals 0
 
     and-int/lit8 p2, p3, 0x1
@@ -213,22 +176,17 @@
     :cond_0
     and-int/lit8 p2, p3, 0x2
 
-    const/4 p2, 0x0
+    const-string p2, "$this$viewModels"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p0, "ownerProducer"
 
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw p2
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$viewModels"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    throw p0
 .end method
diff --git a/com.discord/smali/androidx/fragment/app/ViewKt.smali b/com.discord/smali/androidx/fragment/app/ViewKt.smali
index 96ed18eb31..5b87a3c3b5 100644
--- a/com.discord/smali/androidx/fragment/app/ViewKt.smali
+++ b/com.discord/smali/androidx/fragment/app/ViewKt.smali
@@ -16,7 +16,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$findFragment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/fragment/app/FragmentManager;->findFragment(Landroid/view/View;)Landroidx/fragment/app/Fragment;
 
@@ -24,16 +26,7 @@
 
     const-string v0, "FragmentManager.findFragment(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$findFragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/fragment/ktx/R$attr.smali b/com.discord/smali/androidx/fragment/ktx/R$attr.smali
index 98ce9278a1..0b694862f5 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$drawable.smali b/com.discord/smali/androidx/fragment/ktx/R$drawable.smali
index 96369b12ae..4a6d0b4d32 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$id.smali b/com.discord/smali/androidx/fragment/ktx/R$id.smali
index 031ae130e2..d42bb7c610 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$id.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$id.smali
@@ -94,63 +94,63 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$string.smali b/com.discord/smali/androidx/fragment/ktx/R$string.smali
index 409968a817..13a8274159 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$string.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$style.smali b/com.discord/smali/androidx/fragment/ktx/R$style.smali
index 7e19e22453..4de0054cd4 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$style.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$styleable.smali b/com.discord/smali/androidx/fragment/ktx/R$styleable.smali
index cc28fcdcd1..c9fcbe98f4 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$styleable.smali
@@ -193,7 +193,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/legacy/coreui/R$attr.smali b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
index 83502c0b8b..56edb306f5 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
@@ -52,9 +52,9 @@
 
 .field public static final layout_keyline:I = 0x7f04036e
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
index 67d3259888..b2ee5f67a8 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$id.smali b/com.discord/smali/androidx/legacy/coreui/R$id.smali
index 38b252276c..95c164c042 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$id.smali
@@ -30,59 +30,59 @@
 
 .field public static final bottom:I = 0x7f0a011e
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
 
 # 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 4951d45384..017790b73b 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$style.smali b/com.discord/smali/androidx/legacy/coreui/R$style.smali
index 9e966563fd..15d4aa4b45 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$style.smali
@@ -24,11 +24,11 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # 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 b65ecf6738..6ce141386e 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
@@ -183,7 +183,7 @@
     :array_1
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_2
@@ -218,7 +218,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .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 a2938cb232..17db2d77a0 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
index e9e41cf8d3..09576b4d64 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$id.smali b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
index a6d6e68839..d1ac44974a 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # 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 91cda37774..f7d6520553 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$style.smali b/com.discord/smali/androidx/legacy/coreutils/R$style.smali
index 18bf0c0049..f61884bc43 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # 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 fe047ace51..8f1bf6104a 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 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/legacy/v4/R$attr.smali b/com.discord/smali/androidx/legacy/v4/R$attr.smali
index a8c2dcef48..7b65978914 100644
--- a/com.discord/smali/androidx/legacy/v4/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$attr.smali
@@ -52,9 +52,9 @@
 
 .field public static final layout_keyline:I = 0x7f04036e
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
index 04bc26c669..c64aa3fad5 100644
--- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$id.smali b/com.discord/smali/androidx/legacy/v4/R$id.smali
index 91d2346dc8..df3885b7b5 100644
--- a/com.discord/smali/androidx/legacy/v4/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$id.smali
@@ -32,67 +32,67 @@
 
 .field public static final bottom:I = 0x7f0a011e
 
-.field public static final cancel_action:I = 0x7f0a013c
+.field public static final cancel_action:I = 0x7f0a013f
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a0352
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a7
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0933
+.field public static final status_bar_latest_event_content:I = 0x7f0a0937
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
 
 # 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 ca4f0ed669..06872f9377 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$style.smali b/com.discord/smali/androidx/legacy/v4/R$style.smali
index 7f11d816eb..37c159971b 100644
--- a/com.discord/smali/androidx/legacy/v4/R$style.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$style.smali
@@ -34,11 +34,11 @@
 
 .field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f130230
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # 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 f7b5d7f94a..ffcf69cb70 100644
--- a/com.discord/smali/androidx/legacy/v4/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$styleable.smali
@@ -183,7 +183,7 @@
     :array_1
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_2
@@ -218,7 +218,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_5
diff --git a/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali b/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali
index 59d8253f5a..dddbae7c67 100644
--- a/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali
+++ b/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali
@@ -13,24 +13,17 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/coroutines/CoroutineContext;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Landroidx/lifecycle/CloseableCoroutineScope;->coroutineContext:Lkotlin/coroutines/CoroutineContext;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -46,7 +39,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->n(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/DispatchQueue.smali b/com.discord/smali/androidx/lifecycle/DispatchQueue.smali
index 7a4e15f704..295ecefa40 100644
--- a/com.discord/smali/androidx/lifecycle/DispatchQueue.smali
+++ b/com.discord/smali/androidx/lifecycle/DispatchQueue.smali
@@ -256,31 +256,33 @@
     .annotation build Landroidx/annotation/AnyThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "runnable"
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lk0/a/f1;->v()Lk0/a/f1;
+    invoke-virtual {v0}, Ll0/a/f1;->v()Ll0/a/f1;
 
     move-result-object v0
 
-    sget-object v1, Lj0/k/f;->d:Lj0/k/f;
+    sget-object v1, Lk0/l/f;->d:Lk0/l/f;
 
-    invoke-virtual {v0, v1}, Lk0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+    invoke-virtual {v0, v1}, Ll0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lj0/k/f;->d:Lj0/k/f;
+    sget-object v1, Lk0/l/f;->d:Lk0/l/f;
 
     new-instance v2, Landroidx/lifecycle/DispatchQueue$runOrEnqueue$$inlined$with$lambda$1;
 
     invoke-direct {v2, p0, p1}, Landroidx/lifecycle/DispatchQueue$runOrEnqueue$$inlined$with$lambda$1;-><init>(Landroidx/lifecycle/DispatchQueue;Ljava/lang/Runnable;)V
 
-    invoke-virtual {v0, v1, v2}, Lk0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    invoke-virtual {v0, v1, v2}, Ll0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
 
     goto :goto_0
 
@@ -289,13 +291,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "runnable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali
index fb2b7a8559..8e76376003 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali
@@ -39,37 +39,41 @@
 
 # virtual methods
 .method public final onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "source"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "<anonymous parameter 1>"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroidx/lifecycle/LifecycleOwner;->getLifecycle()Landroidx/lifecycle/Lifecycle;
 
     move-result-object p2
 
-    const-string v1, "source.lifecycle"
+    const-string v0, "source.lifecycle"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/lifecycle/Lifecycle;->getCurrentState()Landroidx/lifecycle/Lifecycle$State;
 
     move-result-object p2
 
-    sget-object v2, Landroidx/lifecycle/Lifecycle$State;->DESTROYED:Landroidx/lifecycle/Lifecycle$State;
+    sget-object v1, Landroidx/lifecycle/Lifecycle$State;->DESTROYED:Landroidx/lifecycle/Lifecycle$State;
 
-    if-ne p2, v2, :cond_0
+    if-ne p2, v1, :cond_0
 
     iget-object p1, p0, Landroidx/lifecycle/LifecycleController$observer$1;->this$0:Landroidx/lifecycle/LifecycleController;
 
     iget-object p2, p0, Landroidx/lifecycle/LifecycleController$observer$1;->$parentJob:Lkotlinx/coroutines/Job;
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p2, v0, v1, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    invoke-static {p2, v1, v0, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     invoke-virtual {p1}, Landroidx/lifecycle/LifecycleController;->finish()V
 
@@ -80,7 +84,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroidx/lifecycle/Lifecycle;->getCurrentState()Landroidx/lifecycle/Lifecycle$State;
 
@@ -119,18 +123,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleController.smali b/com.discord/smali/androidx/lifecycle/LifecycleController.smali
index 69cb22be5d..a81215ec9a 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleController.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleController.smali
@@ -22,15 +22,21 @@
 .method public constructor <init>(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/DispatchQueue;Lkotlinx/coroutines/Job;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "lifecycle"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "minState"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "dispatchQueue"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "parentJob"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +64,9 @@
 
     const/4 p1, 0x1
 
-    invoke-static {p4, v0, p1, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    const/4 p2, 0x0
+
+    invoke-static {p4, p2, p1, p2}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     invoke-virtual {p0}, Landroidx/lifecycle/LifecycleController;->finish()V
 
@@ -73,34 +81,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "parentJob"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "dispatchQueue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "minState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "lifecycle"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatchQueue$p(Landroidx/lifecycle/LifecycleController;)Landroidx/lifecycle/DispatchQueue;
@@ -134,7 +114,7 @@
 
     const/4 v1, 0x1
 
-    invoke-static {p1, v0, v1, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, v0}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     invoke-virtual {p0}, Landroidx/lifecycle/LifecycleController;->finish()V
 
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1.smali
index 314d25948b..179a6190a8 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "Lifecycle.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "androidx.lifecycle.LifecycleCoroutineScope$launchWhenCreated$1"
     f = "Lifecycle.kt"
     l = {
@@ -62,7 +62,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p3}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p3}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -83,7 +83,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;
 
@@ -98,15 +100,6 @@
     iput-object p1, v0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -132,7 +125,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 4
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;->label:I
 
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1.smali
index d2d38b36ae..6544ce3ed1 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "Lifecycle.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "androidx.lifecycle.LifecycleCoroutineScope$launchWhenResumed$1"
     f = "Lifecycle.kt"
     l = {
@@ -62,7 +62,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p3}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p3}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -83,7 +83,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;
 
@@ -98,15 +100,6 @@
     iput-object p1, v0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -132,7 +125,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 4
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;->label:I
 
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1.smali
index c45768b94b..c9acc3c8a4 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "Lifecycle.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "androidx.lifecycle.LifecycleCoroutineScope$launchWhenStarted$1"
     f = "Lifecycle.kt"
     l = {
@@ -62,7 +62,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p3}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p3}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -83,7 +83,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;
 
@@ -98,15 +100,6 @@
     iput-object p1, v0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -132,7 +125,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 4
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;->label:I
 
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali
index 720c00a550..d31dfb4ffa 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali
@@ -42,36 +42,31 @@
         }
     .end annotation
 
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    invoke-direct {v4, p0, p1, v0}, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;-><init>(Landroidx/lifecycle/LifecycleCoroutineScope;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    new-instance v4, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;
-
-    invoke-direct {v4, p0, p1, v0}, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenCreated$1;-><init>(Landroidx/lifecycle/LifecycleCoroutineScope;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
-
     const/4 v5, 0x3
 
     const/4 v6, 0x0
 
     move-object v1, p0
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final launchWhenResumed(Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
@@ -93,36 +88,31 @@
         }
     .end annotation
 
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    invoke-direct {v4, p0, p1, v0}, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;-><init>(Landroidx/lifecycle/LifecycleCoroutineScope;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    new-instance v4, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;
-
-    invoke-direct {v4, p0, p1, v0}, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenResumed$1;-><init>(Landroidx/lifecycle/LifecycleCoroutineScope;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
-
     const/4 v5, 0x3
 
     const/4 v6, 0x0
 
     move-object v1, p0
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final launchWhenStarted(Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
@@ -144,34 +134,29 @@
         }
     .end annotation
 
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    invoke-direct {v4, p0, p1, v0}, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;-><init>(Landroidx/lifecycle/LifecycleCoroutineScope;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    new-instance v4, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;
-
-    invoke-direct {v4, p0, p1, v0}, Landroidx/lifecycle/LifecycleCoroutineScope$launchWhenStarted$1;-><init>(Landroidx/lifecycle/LifecycleCoroutineScope;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
-
     const/4 v5, 0x3
 
     const/4 v6, 0x0
 
     move-object v1, p0
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali
index b7258718c4..1caab5ab13 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/lifecycle/LifecycleCoroutineScopeImpl$register$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "Lifecycle.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "androidx.lifecycle.LifecycleCoroutineScopeImpl$register$1"
     f = "Lifecycle.kt"
     l = {}
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p2}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p2}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/LifecycleCoroutineScopeImpl$register$1;
 
@@ -88,15 +90,6 @@
     iput-object p1, v0, Landroidx/lifecycle/LifecycleCoroutineScopeImpl$register$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -169,7 +162,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {p1, v1, v0, v1}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {p1, v1, v0, v1}, Lf/n/a/k/a;->n(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :goto_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali
index 48b6fd529e..ded0955e7c 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali
@@ -16,11 +16,13 @@
 .method public constructor <init>(Landroidx/lifecycle/Lifecycle;Lkotlin/coroutines/CoroutineContext;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "lifecycle"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "coroutineContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/lifecycle/LifecycleCoroutineScope;-><init>()V
 
@@ -46,24 +48,12 @@
 
     const/4 p2, 0x1
 
-    invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    const/4 v0, 0x0
+
+    invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->n(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "coroutineContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "lifecycle"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -87,11 +77,13 @@
 .method public onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "source"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "event"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;->getLifecycle$lifecycle_runtime_ktx_release()Landroidx/lifecycle/Lifecycle;
 
@@ -121,34 +113,22 @@
 
     const/4 p2, 0x1
 
-    invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    const/4 v0, 0x0
+
+    invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->n(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final register()V
     .locals 7
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lk0/a/f1;->v()Lk0/a/f1;
+    invoke-virtual {v0}, Ll0/a/f1;->v()Ll0/a/f1;
 
     move-result-object v2
 
@@ -166,7 +146,7 @@
 
     move-object v1, p0
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     return-void
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleKt.smali b/com.discord/smali/androidx/lifecycle/LifecycleKt.smali
index aa557d3038..f62b5a9225 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleKt.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleKt.smali
@@ -7,60 +7,55 @@
 .method public static final getCoroutineScope(Landroidx/lifecycle/Lifecycle;)Landroidx/lifecycle/LifecycleCoroutineScope;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$coroutineScope"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
-    iget-object v1, p0, Landroidx/lifecycle/Lifecycle;->mInternalScopeRef:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Landroidx/lifecycle/Lifecycle;->mInternalScopeRef:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;
+
+    if-eqz v0, :cond_1
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;
+
+    new-instance v1, Ll0/a/l1;
+
+    const/4 v2, 0x0
+
+    invoke-direct {v1, v2}, Ll0/a/l1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ll0/a/f1;->v()Ll0/a/f1;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ll0/a/c1;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v1
 
-    check-cast v1, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;
+    invoke-direct {v0, p0, v1}, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;-><init>(Landroidx/lifecycle/Lifecycle;Lkotlin/coroutines/CoroutineContext;)V
 
-    if-eqz v1, :cond_1
+    iget-object v1, p0, Landroidx/lifecycle/Lifecycle;->mInternalScopeRef:Ljava/util/concurrent/atomic/AtomicReference;
 
-    return-object v1
+    invoke-virtual {v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    :cond_1
-    new-instance v1, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;
+    move-result v1
 
-    new-instance v2, Lk0/a/l1;
+    if-eqz v1, :cond_0
 
-    invoke-direct {v2, v0}, Lk0/a/l1;-><init>(Lkotlinx/coroutines/Job;)V
+    invoke-virtual {v0}, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;->register()V
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lk0/a/f1;->v()Lk0/a/f1;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Lk0/a/c1;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v2
-
-    invoke-direct {v1, p0, v2}, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;-><init>(Landroidx/lifecycle/Lifecycle;Lkotlin/coroutines/CoroutineContext;)V
-
-    iget-object v2, p0, Landroidx/lifecycle/Lifecycle;->mInternalScopeRef:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v1}, Landroidx/lifecycle/LifecycleCoroutineScopeImpl;->register()V
-
-    return-object v1
-
-    :cond_2
-    const-string p0, "$this$coroutineScope"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleOwnerKt.smali b/com.discord/smali/androidx/lifecycle/LifecycleOwnerKt.smali
index fc983ab1d0..3a134d518f 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleOwnerKt.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleOwnerKt.smali
@@ -7,7 +7,9 @@
 .method public static final getLifecycleScope(Landroidx/lifecycle/LifecycleOwner;)Landroidx/lifecycle/LifecycleCoroutineScope;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$lifecycleScope"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroidx/lifecycle/LifecycleOwner;->getLifecycle()Landroidx/lifecycle/Lifecycle;
 
@@ -15,20 +17,11 @@
 
     const-string v0, "lifecycle"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/lifecycle/LifecycleKt;->getCoroutineScope(Landroidx/lifecycle/Lifecycle;)Landroidx/lifecycle/LifecycleCoroutineScope;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$lifecycleScope"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/LiveDataKt.smali b/com.discord/smali/androidx/lifecycle/LiveDataKt.smali
index e6e82091d6..398dc68659 100644
--- a/com.discord/smali/androidx/lifecycle/LiveDataKt.smali
+++ b/com.discord/smali/androidx/lifecycle/LiveDataKt.smali
@@ -26,13 +26,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$observe"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "owner"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onChanged"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/LiveDataKt$observe$wrappedObserver$1;
 
@@ -41,25 +45,4 @@
     invoke-virtual {p0, p1, v0}, Landroidx/lifecycle/LiveData;->observe(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Observer;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "onChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "owner"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$observe"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/PausingDispatcher.smali b/com.discord/smali/androidx/lifecycle/PausingDispatcher.smali
index a8caaf5b10..8e800440cb 100644
--- a/com.discord/smali/androidx/lifecycle/PausingDispatcher.smali
+++ b/com.discord/smali/androidx/lifecycle/PausingDispatcher.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/lifecycle/PausingDispatcher;
-.super Lk0/a/v;
+.super Ll0/a/v;
 .source "PausingDispatcher.kt"
 
 
@@ -11,7 +11,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    invoke-direct {p0}, Lk0/a/v;-><init>()V
+    invoke-direct {p0}, Ll0/a/v;-><init>()V
 
     new-instance v0, Landroidx/lifecycle/DispatchQueue;
 
@@ -27,29 +27,17 @@
 .method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Landroidx/lifecycle/PausingDispatcher;->dispatchQueue:Landroidx/lifecycle/DispatchQueue;
 
     invoke-virtual {p1, p2}, Landroidx/lifecycle/DispatchQueue;->runOrEnqueue(Ljava/lang/Runnable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali
index ed9ca79c1d..ec47d75aa8 100644
--- a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali
+++ b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "PausingDispatcher.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -28,7 +28,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "androidx.lifecycle.PausingDispatcherKt$whenStateAtLeast$2"
     f = "PausingDispatcher.kt"
     l = {
@@ -70,7 +70,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p4}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p4}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -91,7 +91,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;
 
@@ -108,15 +110,6 @@
     iput-object p1, v0, Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -142,7 +135,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 8
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;->label:I
 
@@ -235,7 +228,7 @@
 
     iput v2, p0, Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;->label:I
 
-    invoke-static {v3, v5, p0}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    invoke-static {v3, v5, p0}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
     move-result-object p1
     :try_end_1
@@ -266,7 +259,7 @@
     :cond_3
     new-instance p1, Ljava/lang/IllegalStateException;
 
-    const-string v0, "when[State] methods should have a parent job"
+    const-string/jumbo v0, "when[State] methods should have a parent job"
 
     invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali
index c7a2d698a6..5d2c4c14e4 100644
--- a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali
+++ b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali
@@ -63,7 +63,7 @@
 
     const-string v0, "lifecycle"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Landroidx/lifecycle/PausingDispatcherKt;->whenCreated(Landroidx/lifecycle/Lifecycle;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
@@ -131,7 +131,7 @@
 
     const-string v0, "lifecycle"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Landroidx/lifecycle/PausingDispatcherKt;->whenResumed(Landroidx/lifecycle/Lifecycle;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
@@ -199,7 +199,7 @@
 
     const-string v0, "lifecycle"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Landroidx/lifecycle/PausingDispatcherKt;->whenStarted(Landroidx/lifecycle/Lifecycle;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
@@ -231,11 +231,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lk0/a/f1;->v()Lk0/a/f1;
+    invoke-virtual {v0}, Ll0/a/f1;->v()Ll0/a/f1;
 
     move-result-object v0
 
@@ -245,7 +245,7 @@
 
     invoke-direct {v1, p0, p1, p2, v2}, Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;-><init>(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 
-    invoke-static {v0, v1, p3}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    invoke-static {v0, v1, p3}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
     move-result-object p0
 
diff --git a/com.discord/smali/androidx/lifecycle/SavedStateHandle$1.smali b/com.discord/smali/androidx/lifecycle/SavedStateHandle$1.smali
index 6404a8af07..94d838476e 100644
--- a/com.discord/smali/androidx/lifecycle/SavedStateHandle$1.smali
+++ b/com.discord/smali/androidx/lifecycle/SavedStateHandle$1.smali
@@ -103,7 +103,7 @@
 
     invoke-virtual {v0, v3, v1}, Landroid/os/Bundle;->putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    const-string v1, "values"
+    const-string/jumbo v1, "values"
 
     invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
 
diff --git a/com.discord/smali/androidx/lifecycle/SavedStateHandle.smali b/com.discord/smali/androidx/lifecycle/SavedStateHandle.smali
index 39f267f2bf..337c1030c2 100644
--- a/com.discord/smali/androidx/lifecycle/SavedStateHandle.smali
+++ b/com.discord/smali/androidx/lifecycle/SavedStateHandle.smali
@@ -370,7 +370,7 @@
 
     move-result-object p1
 
-    const-string v1, "values"
+    const-string/jumbo v1, "values"
 
     invoke-virtual {p0, v1}, Landroid/os/Bundle;->getParcelableArrayList(Ljava/lang/String;)Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelKt.smali b/com.discord/smali/androidx/lifecycle/ViewModelKt.smali
index e7a8f836d0..67c100cfe1 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelKt.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelKt.smali
@@ -11,59 +11,54 @@
 .method public static final getViewModelScope(Landroidx/lifecycle/ViewModel;)Lkotlinx/coroutines/CoroutineScope;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$viewModelScope"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "androidx.lifecycle.ViewModelCoroutineScope.JOB_KEY"
+    const-string v0, "androidx.lifecycle.ViewModelCoroutineScope.JOB_KEY"
 
-    invoke-virtual {p0, v1}, Landroidx/lifecycle/ViewModel;->getTag(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {p0, v0}, Landroidx/lifecycle/ViewModel;->getTag(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlinx/coroutines/CoroutineScope;
+
+    if-eqz v1, :cond_0
+
+    return-object v1
+
+    :cond_0
+    new-instance v1, Landroidx/lifecycle/CloseableCoroutineScope;
+
+    const/4 v2, 0x0
+
+    new-instance v3, Ll0/a/l1;
+
+    invoke-direct {v3, v2}, Ll0/a/l1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
     move-result-object v2
 
-    check-cast v2, Lkotlinx/coroutines/CoroutineScope;
+    invoke-virtual {v2}, Ll0/a/f1;->v()Ll0/a/f1;
 
-    if-eqz v2, :cond_0
+    move-result-object v2
 
-    return-object v2
+    invoke-virtual {v3, v2}, Ll0/a/c1;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 
-    :cond_0
-    new-instance v2, Landroidx/lifecycle/CloseableCoroutineScope;
+    move-result-object v2
 
-    new-instance v3, Lk0/a/l1;
+    invoke-direct {v1, v2}, Landroidx/lifecycle/CloseableCoroutineScope;-><init>(Lkotlin/coroutines/CoroutineContext;)V
 
-    invoke-direct {v3, v0}, Lk0/a/l1;-><init>(Lkotlinx/coroutines/Job;)V
-
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lk0/a/f1;->v()Lk0/a/f1;
-
-    move-result-object v0
-
-    invoke-virtual {v3, v0}, Lk0/a/c1;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    invoke-direct {v2, v0}, Landroidx/lifecycle/CloseableCoroutineScope;-><init>(Lkotlin/coroutines/CoroutineContext;)V
-
-    invoke-virtual {p0, v1, v2}, Landroidx/lifecycle/ViewModel;->setTagIfAbsent(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {p0, v0, v1}, Landroidx/lifecycle/ViewModel;->setTagIfAbsent(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
 
     const-string v0, "setTagIfAbsent(JOB_KEY,\n\u2026patchers.Main.immediate))"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p0, Lkotlinx/coroutines/CoroutineScope;
 
     return-object p0
-
-    :cond_1
-    const-string p0, "$this$viewModelScope"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelLazy.smali b/com.discord/smali/androidx/lifecycle/ViewModelLazy.smali
index 7c45ef00e3..7083fee4ba 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelLazy.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelLazy.smali
@@ -48,10 +48,10 @@
     .end annotation
 .end field
 
-.field public final viewModelClass:Lj0/r/b;
+.field public final viewModelClass:Lk0/s/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "TVM;>;"
         }
     .end annotation
@@ -59,12 +59,12 @@
 
 
 # direct methods
-.method public constructor <init>(Lj0/r/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+.method public constructor <init>(Lk0/s/b;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "TVM;>;",
             "Lkotlin/jvm/functions/Function0<",
             "+",
@@ -77,44 +77,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "viewModelClass"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeProducer"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "factoryProducer"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Landroidx/lifecycle/ViewModelLazy;->viewModelClass:Lj0/r/b;
+    iput-object p1, p0, Landroidx/lifecycle/ViewModelLazy;->viewModelClass:Lk0/s/b;
 
     iput-object p2, p0, Landroidx/lifecycle/ViewModelLazy;->storeProducer:Lkotlin/jvm/functions/Function0;
 
     iput-object p3, p0, Landroidx/lifecycle/ViewModelLazy;->factoryProducer:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "factoryProducer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeProducer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "viewModelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -151,9 +134,9 @@
 
     invoke-direct {v2, v1, v0}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStore;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    iget-object v0, p0, Landroidx/lifecycle/ViewModelLazy;->viewModelClass:Lj0/r/b;
+    iget-object v0, p0, Landroidx/lifecycle/ViewModelLazy;->viewModelClass:Lk0/s/b;
 
-    invoke-static {v0}, Lf/n/a/k/a;->getJavaClass(Lj0/r/b;)Ljava/lang/Class;
+    invoke-static {v0}, Lf/n/a/k/a;->getJavaClass(Lk0/s/b;)Ljava/lang/Class;
 
     move-result-object v0
 
@@ -165,7 +148,7 @@
 
     const-string v1, "ViewModelProvider(store,\u2026ed = it\n                }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     return-object v0
diff --git a/com.discord/smali/androidx/lifecycle/ViewModelProviderKt.smali b/com.discord/smali/androidx/lifecycle/ViewModelProviderKt.smali
index fa05407bae..3c77be5446 100644
--- a/com.discord/smali/androidx/lifecycle/ViewModelProviderKt.smali
+++ b/com.discord/smali/androidx/lifecycle/ViewModelProviderKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final get(Landroidx/lifecycle/ViewModelProvider;)Landroidx/lifecycle/ViewModel;
+.method public static final synthetic get(Landroidx/lifecycle/ViewModelProvider;)Landroidx/lifecycle/ViewModel;
     .locals 1
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
@@ -19,18 +19,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$get"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$get"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
diff --git a/com.discord/smali/androidx/loader/R$attr.smali b/com.discord/smali/androidx/loader/R$attr.smali
index 6054f1324d..4bf7bf381c 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index c7a1c3fe9c..2e5b5ab16b 100644
--- a/com.discord/smali/androidx/loader/R$drawable.smali
+++ b/com.discord/smali/androidx/loader/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index 84af487774..0eade9d2b4 100644
--- a/com.discord/smali/androidx/loader/R$id.smali
+++ b/com.discord/smali/androidx/loader/R$id.smali
@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index e296e8df27..03ce054a2e 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$style.smali b/com.discord/smali/androidx/loader/R$style.smali
index 867b1c4f37..430b554541 100644
--- a/com.discord/smali/androidx/loader/R$style.smali
+++ b/com.discord/smali/androidx/loader/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$styleable.smali b/com.discord/smali/androidx/loader/R$styleable.smali
index c8634b7f9a..458b4135e6 100644
--- a/com.discord/smali/androidx/loader/R$styleable.smali
+++ b/com.discord/smali/androidx/loader/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali
index c14dc482e5..e50b3cd9c7 100644
--- a/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali
+++ b/com.discord/smali/androidx/localbroadcastmanager/content/LocalBroadcastManager.smali
@@ -651,7 +651,7 @@
 
     if-eq v3, v4, :cond_9
 
-    const-string v3, "unknown reason"
+    const-string/jumbo v3, "unknown reason"
 
     goto :goto_3
 
diff --git a/com.discord/smali/androidx/media/AudioAttributesCompat.smali b/com.discord/smali/androidx/media/AudioAttributesCompat.smali
index 288232cc60..23a9b64c31 100644
--- a/com.discord/smali/androidx/media/AudioAttributesCompat.smali
+++ b/com.discord/smali/androidx/media/AudioAttributesCompat.smali
@@ -482,7 +482,7 @@
     packed-switch p0, :pswitch_data_0
 
     :pswitch_0
-    const-string v0, "unknown usage "
+    const-string/jumbo v0, "unknown usage "
 
     invoke-static {v0, p0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
 
@@ -570,6 +570,8 @@
 
     return-object p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_10
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali
index 9dbaad224d..cc2689722a 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1.smali
@@ -53,7 +53,7 @@
 
     iget-object v0, p0, Landroidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21$1;->val$token:Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
-    iget-object v0, v0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iget-object v0, v0, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali
index 3156477c41..33753a1cd2 100644
--- a/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali
+++ b/com.discord/smali/androidx/media/MediaBrowserServiceCompat$MediaBrowserServiceImplApi21.smali
@@ -328,7 +328,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v2, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ld0/a/b/b/b/b;
+    iget-object v2, v2, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Le0/a/b/b/b/b;
 
     if-nez v2, :cond_0
 
diff --git a/com.discord/smali/androidx/media/MediaSessionManager.smali b/com.discord/smali/androidx/media/MediaSessionManager.smali
index f1f893bb38..aa006a7bb6 100644
--- a/com.discord/smali/androidx/media/MediaSessionManager.smali
+++ b/com.discord/smali/androidx/media/MediaSessionManager.smali
@@ -171,7 +171,7 @@
     :cond_0
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    const-string v0, "userInfo should not be null"
+    const-string/jumbo v0, "userInfo should not be null"
 
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/media/R$attr.smali b/com.discord/smali/androidx/media/R$attr.smali
index 7204f156cb..fb416604d5 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index 5b0d067c67..4fc422cf1d 100644
--- a/com.discord/smali/androidx/media/R$drawable.smali
+++ b/com.discord/smali/androidx/media/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$id.smali b/com.discord/smali/androidx/media/R$id.smali
index ca56989183..c5d1b2866a 100644
--- a/com.discord/smali/androidx/media/R$id.smali
+++ b/com.discord/smali/androidx/media/R$id.smali
@@ -30,55 +30,55 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final cancel_action:I = 0x7f0a013c
+.field public static final cancel_action:I = 0x7f0a013f
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a0352
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a7
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0933
+.field public static final status_bar_latest_event_content:I = 0x7f0a0937
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index ce2659c72f..36286d340f 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$style.smali b/com.discord/smali/androidx/media/R$style.smali
index dc811840f6..dc894ca0d6 100644
--- a/com.discord/smali/androidx/media/R$style.smali
+++ b/com.discord/smali/androidx/media/R$style.smali
@@ -34,9 +34,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f130230
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$styleable.smali b/com.discord/smali/androidx/media/R$styleable.smali
index 33d1b4b9cf..e578f61cab 100644
--- a/com.discord/smali/androidx/media/R$styleable.smali
+++ b/com.discord/smali/androidx/media/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali b/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali
index f0cb6c3080..92d8f8c60c 100644
--- a/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali
+++ b/com.discord/smali/androidx/media/app/NotificationCompat$MediaStyle.smali
@@ -137,7 +137,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {p0, v0}, Landroid/support/v4/media/session/MediaSessionCompat$Token;->a(Ljava/lang/Object;Ld0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
+    invoke-static {p0, v0}, Landroid/support/v4/media/session/MediaSessionCompat$Token;->a(Ljava/lang/Object;Le0/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
     move-result-object p0
 
diff --git a/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali b/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali
index e035b58b82..37ba6d48ee 100644
--- a/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali
+++ b/com.discord/smali/androidx/media/session/MediaButtonReceiver$MediaButtonConnectionCallback.smali
@@ -83,9 +83,9 @@
 
     if-lt v2, v3, :cond_0
 
-    new-instance v2, Ld0/a/b/b/b/e;
+    new-instance v2, Le0/a/b/b/b/e;
 
-    invoke-direct {v2, v0, v1}, Ld0/a/b/b/b/e;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
+    invoke-direct {v2, v0, v1}, Le0/a/b/b/b/e;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
 
     goto :goto_0
 
@@ -94,9 +94,9 @@
 
     if-lt v2, v3, :cond_1
 
-    new-instance v2, Ld0/a/b/b/b/d;
+    new-instance v2, Le0/a/b/b/b/d;
 
-    invoke-direct {v2, v0, v1}, Ld0/a/b/b/b/d;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
+    invoke-direct {v2, v0, v1}, Le0/a/b/b/b/d;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/androidx/preference/PreferenceGroupKt$iterator$1.smali b/com.discord/smali/androidx/preference/PreferenceGroupKt$iterator$1.smali
index 7a58184698..96c19be51f 100644
--- a/com.discord/smali/androidx/preference/PreferenceGroupKt$iterator$1.smali
+++ b/com.discord/smali/androidx/preference/PreferenceGroupKt$iterator$1.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
diff --git a/com.discord/smali/androidx/preference/PreferenceGroupKt.smali b/com.discord/smali/androidx/preference/PreferenceGroupKt.smali
index 22c4c60639..e26337eb48 100644
--- a/com.discord/smali/androidx/preference/PreferenceGroupKt.smali
+++ b/com.discord/smali/androidx/preference/PreferenceGroupKt.smali
@@ -7,11 +7,13 @@
 .method public static final contains(Landroidx/preference/PreferenceGroup;Landroidx/preference/Preference;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$contains"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "preference"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/preference/PreferenceGroup;->getPreferenceCount()I
 
@@ -28,7 +30,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -45,20 +47,6 @@
 
     :cond_1
     return v1
-
-    :cond_2
-    const-string p0, "preference"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final forEach(Landroidx/preference/PreferenceGroup;Lkotlin/jvm/functions/Function1;)V
@@ -75,47 +63,35 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEach"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/preference/PreferenceGroup;->getPreferenceCount()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-static {p0, v0}, Landroidx/preference/PreferenceGroupKt;->get(Landroidx/preference/PreferenceGroup;I)Landroidx/preference/Preference;
+    invoke-static {p0, v1}, Landroidx/preference/PreferenceGroupKt;->get(Landroidx/preference/PreferenceGroup;I)Landroidx/preference/Preference;
 
     move-result-object v2
 
     invoke-interface {p1, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEach"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final forEachIndexed(Landroidx/preference/PreferenceGroup;Lkotlin/jvm/functions/Function2;)V
@@ -134,57 +110,47 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$forEachIndexed"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/preference/PreferenceGroup;->getPreferenceCount()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_0
+    if-ge v1, v0, :cond_0
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    invoke-static {p0, v0}, Landroidx/preference/PreferenceGroupKt;->get(Landroidx/preference/PreferenceGroup;I)Landroidx/preference/Preference;
+    invoke-static {p0, v1}, Landroidx/preference/PreferenceGroupKt;->get(Landroidx/preference/PreferenceGroup;I)Landroidx/preference/Preference;
 
     move-result-object v3
 
     invoke-interface {p1, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "action"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$forEachIndexed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final get(Landroidx/preference/PreferenceGroup;I)Landroidx/preference/Preference;
     .locals 3
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$get"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/preference/PreferenceGroup;->getPreference(I)Landroidx/preference/Preference;
 
@@ -218,15 +184,6 @@
     invoke-direct {v0, p0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_1
-    const-string p0, "$this$get"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final get(Landroidx/preference/PreferenceGroup;Ljava/lang/CharSequence;)Landroidx/preference/Preference;
@@ -242,31 +199,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$get"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/preference/PreferenceGroup;->findPreference(Ljava/lang/CharSequence;)Landroidx/preference/Preference;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "key"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$get"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getChildren(Landroidx/preference/PreferenceGroup;)Lkotlin/sequences/Sequence;
@@ -282,49 +227,37 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$children"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/preference/PreferenceGroupKt$children$1;
 
     invoke-direct {v0, p0}, Landroidx/preference/PreferenceGroupKt$children$1;-><init>(Landroidx/preference/PreferenceGroup;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$children"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getSize(Landroidx/preference/PreferenceGroup;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$size"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/preference/PreferenceGroup;->getPreferenceCount()I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$size"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isEmpty(Landroidx/preference/PreferenceGroup;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/preference/PreferenceGroup;->getPreferenceCount()I
 
@@ -341,21 +274,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isNotEmpty(Landroidx/preference/PreferenceGroup;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$isNotEmpty"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/preference/PreferenceGroup;->getPreferenceCount()I
 
@@ -372,15 +298,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "$this$isNotEmpty"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final iterator(Landroidx/preference/PreferenceGroup;)Ljava/util/Iterator;
@@ -396,76 +313,45 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$iterator"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/preference/PreferenceGroupKt$iterator$1;
 
     invoke-direct {v0, p0}, Landroidx/preference/PreferenceGroupKt$iterator$1;-><init>(Landroidx/preference/PreferenceGroup;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$iterator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final minusAssign(Landroidx/preference/PreferenceGroup;Landroidx/preference/Preference;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minusAssign"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "preference"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/preference/PreferenceGroup;->removePreference(Landroidx/preference/Preference;)Z
 
     return-void
-
-    :cond_0
-    const-string p0, "preference"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$minusAssign"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plusAssign(Landroidx/preference/PreferenceGroup;Landroidx/preference/Preference;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plusAssign"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "preference"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/preference/PreferenceGroup;->addPreference(Landroidx/preference/Preference;)Z
 
     return-void
-
-    :cond_0
-    const-string p0, "preference"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plusAssign"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/preference/R$attr.smali b/com.discord/smali/androidx/preference/R$attr.smali
index 8de7e8b6ed..a56528c300 100644
--- a/com.discord/smali/androidx/preference/R$attr.smali
+++ b/com.discord/smali/androidx/preference/R$attr.smali
@@ -520,205 +520,205 @@
 
 .field public static final reverseLayout:I = 0x7f040445
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final seekBarIncrement:I = 0x7f04047a
+.field public static final seekBarIncrement:I = 0x7f04046c
 
-.field public static final seekBarPreferenceStyle:I = 0x7f04047b
+.field public static final seekBarPreferenceStyle:I = 0x7f04046d
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final selectable:I = 0x7f04047d
+.field public static final selectable:I = 0x7f04046f
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final shouldDisableView:I = 0x7f040489
+.field public static final shouldDisableView:I = 0x7f04047b
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final showSeekBarValue:I = 0x7f040491
+.field public static final showSeekBarValue:I = 0x7f040483
 
-.field public static final showText:I = 0x7f040492
+.field public static final showText:I = 0x7f040484
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final singleLineTitle:I = 0x7f04049b
+.field public static final singleLineTitle:I = 0x7f04048d
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final summary:I = 0x7f0404c9
+.field public static final summary:I = 0x7f0404bb
 
-.field public static final summaryOff:I = 0x7f0404ca
+.field public static final summaryOff:I = 0x7f0404bc
 
-.field public static final summaryOn:I = 0x7f0404cb
+.field public static final summaryOn:I = 0x7f0404bd
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final switchPreferenceCompatStyle:I = 0x7f0404d4
+.field public static final switchPreferenceCompatStyle:I = 0x7f0404c6
 
-.field public static final switchPreferenceStyle:I = 0x7f0404d5
+.field public static final switchPreferenceStyle:I = 0x7f0404c7
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final switchTextOff:I = 0x7f0404d8
+.field public static final switchTextOff:I = 0x7f0404ca
 
-.field public static final switchTextOn:I = 0x7f0404d9
+.field public static final switchTextOn:I = 0x7f0404cb
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final textLocale:I = 0x7f040514
+.field public static final textLocale:I = 0x7f040506
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme:I = 0x7f040509
 
-.field public static final thickness:I = 0x7f040543
+.field public static final thickness:I = 0x7f040535
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final tint:I = 0x7f040551
+.field public static final tint:I = 0x7f040543
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final title:I = 0x7f040553
+.field public static final title:I = 0x7f040545
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final track:I = 0x7f04056a
+.field public static final track:I = 0x7f04055c
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final updatesContinuously:I = 0x7f040588
+.field public static final updatesContinuously:I = 0x7f04057a
 
-.field public static final useSimpleSummaryProvider:I = 0x7f04058b
+.field public static final useSimpleSummaryProvider:I = 0x7f04057d
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final widgetLayout:I = 0x7f0405a0
+.field public static final widgetLayout:I = 0x7f040592
 
-.field public static final windowActionBar:I = 0x7f0405a1
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final windowNoTitle:I = 0x7f0405aa
+.field public static final windowNoTitle:I = 0x7f04059c
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/R$drawable.smali b/com.discord/smali/androidx/preference/R$drawable.smali
index 112834824f..20147145ca 100644
--- a/com.discord/smali/androidx/preference/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/R$drawable.smali
@@ -202,37 +202,37 @@
 
 .field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
 
-.field public static final ic_arrow_down_24dp:I = 0x7f08021d
+.field public static final ic_arrow_down_24dp:I = 0x7f08021e
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final preference_list_divider_material:I = 0x7f080506
+.field public static final preference_list_divider_material:I = 0x7f080509
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/R$id.smali b/com.discord/smali/androidx/preference/R$id.smali
index dec297cd98..edd4646de1 100644
--- a/com.discord/smali/androidx/preference/R$id.smali
+++ b/com.discord/smali/androidx/preference/R$id.smali
@@ -130,203 +130,203 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04db
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final recycler_view:I = 0x7f0a073f
+.field public static final recycler_view:I = 0x7f0a0745
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final seekbar:I = 0x7f0a07af
+.field public static final seekbar:I = 0x7f0a07b5
 
-.field public static final seekbar_value:I = 0x7f0a07b0
+.field public static final seekbar_value:I = 0x7f0a07b6
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final spinner:I = 0x7f0a0923
+.field public static final spinner:I = 0x7f0a0927
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final switchWidget:I = 0x7f0a0958
+.field public static final switchWidget:I = 0x7f0a095c
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index a0d1114770..65ece57cfc 100644
--- a/com.discord/smali/androidx/preference/R$string.smali
+++ b/com.discord/smali/androidx/preference/R$string.smali
@@ -68,23 +68,23 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f120020
 
-.field public static final copy:I = 0x7f1204d3
+.field public static final copy:I = 0x7f1204d5
 
-.field public static final expand_button_title:I = 0x7f120681
+.field public static final expand_button_title:I = 0x7f120683
 
-.field public static final not_set:I = 0x7f120fb7
+.field public static final not_set:I = 0x7f120fe1
 
-.field public static final preference_copied:I = 0x7f121150
+.field public static final preference_copied:I = 0x7f12117b
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final summary_collapsed_preference_list:I = 0x7f12153a
+.field public static final summary_collapsed_preference_list:I = 0x7f121564
 
-.field public static final v7_preference_off:I = 0x7f121762
+.field public static final v7_preference_off:I = 0x7f12178c
 
-.field public static final v7_preference_on:I = 0x7f121763
+.field public static final v7_preference_on:I = 0x7f12178d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/R$style.smali b/com.discord/smali/androidx/preference/R$style.smali
index 4d0ed48bf3..d3dc591225 100644
--- a/com.discord/smali/androidx/preference/R$style.smali
+++ b/com.discord/smali/androidx/preference/R$style.smali
@@ -624,157 +624,157 @@
 
 .field public static final Theme_AppCompat_NoActionBar:I = 0x7f130264
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_TextView:I = 0x7f1303dd
+.field public static final Widget_AppCompat_TextView:I = 0x7f1303dc
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/R$styleable.smali b/com.discord/smali/androidx/preference/R$styleable.smali
index a00b5494c2..8749c9a53f 100644
--- a/com.discord/smali/androidx/preference/R$styleable.smali
+++ b/com.discord/smali/androidx/preference/R$styleable.smali
@@ -1467,7 +1467,7 @@
 
     new-array v4, v0, [I
 
-    const v9, 0x7f04058b
+    const v9, 0x7f04057d
 
     aput v9, v4, v3
 
@@ -1573,7 +1573,7 @@
 
     new-array v9, v0, [I
 
-    const v11, 0x7f0404af
+    const v11, 0x7f0404a1
 
     aput v11, v9, v3
 
@@ -1746,10 +1746,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1758,8 +1758,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1776,8 +1776,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -1807,17 +1807,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_9
@@ -1852,8 +1852,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_b
@@ -1951,44 +1951,44 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_c
     .array-data 4
         0x101030e
-        0x7f04047e
+        0x7f040470
     .end array-data
 
     :array_d
@@ -1997,8 +1997,8 @@
         0x10101f0
         0x10101f1
         0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
+        0x7f0404bc
+        0x7f0404bd
     .end array-data
 
     :array_e
@@ -2019,7 +2019,7 @@
     :array_10
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_11
@@ -2057,8 +2057,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_14
@@ -2082,7 +2082,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_16
@@ -2130,7 +2130,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_1b
@@ -2153,7 +2153,7 @@
         0x10101f8
         0x7f040210
         0x7f040211
-        0x7f04058b
+        0x7f04057d
     .end array-data
 
     :array_1e
@@ -2189,8 +2189,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_20
@@ -2203,7 +2203,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_21
@@ -2253,12 +2253,12 @@
         0x7f04032d
         0x7f0403d3
         0x7f0403eb
-        0x7f04047d
-        0x7f040489
-        0x7f04049b
-        0x7f0404c9
-        0x7f040553
-        0x7f0405a0
+        0x7f04046f
+        0x7f04047b
+        0x7f04048d
+        0x7f0404bb
+        0x7f040545
+        0x7f040592
     .end array-data
 
     :array_24
@@ -2307,9 +2307,9 @@
         0x7f0403ff
         0x7f040400
         0x7f040401
-        0x7f04047b
-        0x7f0404d4
-        0x7f0404d5
+        0x7f04046d
+        0x7f0404c6
+        0x7f0404c7
     .end array-data
 
     :array_29
@@ -2330,8 +2330,8 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_2b
@@ -2348,11 +2348,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_2c
@@ -2361,9 +2361,9 @@
         0x1010136
         0x7f04002a
         0x7f0403c6
-        0x7f04047a
-        0x7f040491
-        0x7f040588
+        0x7f04046c
+        0x7f040483
+        0x7f04057a
     .end array-data
 
     :array_2d
@@ -2390,17 +2390,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_30
@@ -2411,10 +2411,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_31
@@ -2425,10 +2425,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_32
@@ -2447,8 +2447,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_33
@@ -2471,18 +2471,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_34
@@ -2491,7 +2491,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_35
diff --git a/com.discord/smali/androidx/preference/ktx/R$attr.smali b/com.discord/smali/androidx/preference/ktx/R$attr.smali
index b3b81e35d7..1c0edc7589 100644
--- a/com.discord/smali/androidx/preference/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$attr.smali
@@ -520,205 +520,205 @@
 
 .field public static final reverseLayout:I = 0x7f040445
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final seekBarIncrement:I = 0x7f04047a
+.field public static final seekBarIncrement:I = 0x7f04046c
 
-.field public static final seekBarPreferenceStyle:I = 0x7f04047b
+.field public static final seekBarPreferenceStyle:I = 0x7f04046d
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final selectable:I = 0x7f04047d
+.field public static final selectable:I = 0x7f04046f
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final shouldDisableView:I = 0x7f040489
+.field public static final shouldDisableView:I = 0x7f04047b
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final showSeekBarValue:I = 0x7f040491
+.field public static final showSeekBarValue:I = 0x7f040483
 
-.field public static final showText:I = 0x7f040492
+.field public static final showText:I = 0x7f040484
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final singleLineTitle:I = 0x7f04049b
+.field public static final singleLineTitle:I = 0x7f04048d
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final summary:I = 0x7f0404c9
+.field public static final summary:I = 0x7f0404bb
 
-.field public static final summaryOff:I = 0x7f0404ca
+.field public static final summaryOff:I = 0x7f0404bc
 
-.field public static final summaryOn:I = 0x7f0404cb
+.field public static final summaryOn:I = 0x7f0404bd
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final switchPreferenceCompatStyle:I = 0x7f0404d4
+.field public static final switchPreferenceCompatStyle:I = 0x7f0404c6
 
-.field public static final switchPreferenceStyle:I = 0x7f0404d5
+.field public static final switchPreferenceStyle:I = 0x7f0404c7
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final switchTextOff:I = 0x7f0404d8
+.field public static final switchTextOff:I = 0x7f0404ca
 
-.field public static final switchTextOn:I = 0x7f0404d9
+.field public static final switchTextOn:I = 0x7f0404cb
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final textLocale:I = 0x7f040514
+.field public static final textLocale:I = 0x7f040506
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme:I = 0x7f040509
 
-.field public static final thickness:I = 0x7f040543
+.field public static final thickness:I = 0x7f040535
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final tint:I = 0x7f040551
+.field public static final tint:I = 0x7f040543
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final title:I = 0x7f040553
+.field public static final title:I = 0x7f040545
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final track:I = 0x7f04056a
+.field public static final track:I = 0x7f04055c
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final updatesContinuously:I = 0x7f040588
+.field public static final updatesContinuously:I = 0x7f04057a
 
-.field public static final useSimpleSummaryProvider:I = 0x7f04058b
+.field public static final useSimpleSummaryProvider:I = 0x7f04057d
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final widgetLayout:I = 0x7f0405a0
+.field public static final widgetLayout:I = 0x7f040592
 
-.field public static final windowActionBar:I = 0x7f0405a1
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final windowNoTitle:I = 0x7f0405aa
+.field public static final windowNoTitle:I = 0x7f04059c
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$drawable.smali b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
index 1edd4c2561..6113cd6498 100644
--- a/com.discord/smali/androidx/preference/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
@@ -202,37 +202,37 @@
 
 .field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
 
-.field public static final ic_arrow_down_24dp:I = 0x7f08021d
+.field public static final ic_arrow_down_24dp:I = 0x7f08021e
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final preference_list_divider_material:I = 0x7f080506
+.field public static final preference_list_divider_material:I = 0x7f080509
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$id.smali b/com.discord/smali/androidx/preference/ktx/R$id.smali
index 3ed6847d92..d9c0c80886 100644
--- a/com.discord/smali/androidx/preference/ktx/R$id.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$id.smali
@@ -130,203 +130,203 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04db
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final recycler_view:I = 0x7f0a073f
+.field public static final recycler_view:I = 0x7f0a0745
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final seekbar:I = 0x7f0a07af
+.field public static final seekbar:I = 0x7f0a07b5
 
-.field public static final seekbar_value:I = 0x7f0a07b0
+.field public static final seekbar_value:I = 0x7f0a07b6
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final spinner:I = 0x7f0a0923
+.field public static final spinner:I = 0x7f0a0927
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final switchWidget:I = 0x7f0a0958
+.field public static final switchWidget:I = 0x7f0a095c
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$string.smali b/com.discord/smali/androidx/preference/ktx/R$string.smali
index 116f003e18..247be19a03 100644
--- a/com.discord/smali/androidx/preference/ktx/R$string.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$string.smali
@@ -68,23 +68,23 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f120020
 
-.field public static final copy:I = 0x7f1204d3
+.field public static final copy:I = 0x7f1204d5
 
-.field public static final expand_button_title:I = 0x7f120681
+.field public static final expand_button_title:I = 0x7f120683
 
-.field public static final not_set:I = 0x7f120fb7
+.field public static final not_set:I = 0x7f120fe1
 
-.field public static final preference_copied:I = 0x7f121150
+.field public static final preference_copied:I = 0x7f12117b
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final summary_collapsed_preference_list:I = 0x7f12153a
+.field public static final summary_collapsed_preference_list:I = 0x7f121564
 
-.field public static final v7_preference_off:I = 0x7f121762
+.field public static final v7_preference_off:I = 0x7f12178c
 
-.field public static final v7_preference_on:I = 0x7f121763
+.field public static final v7_preference_on:I = 0x7f12178d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$style.smali b/com.discord/smali/androidx/preference/ktx/R$style.smali
index f98b19d2a3..5f28625c8d 100644
--- a/com.discord/smali/androidx/preference/ktx/R$style.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$style.smali
@@ -624,157 +624,157 @@
 
 .field public static final Theme_AppCompat_NoActionBar:I = 0x7f130264
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_TextView:I = 0x7f1303dd
+.field public static final Widget_AppCompat_TextView:I = 0x7f1303dc
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$styleable.smali b/com.discord/smali/androidx/preference/ktx/R$styleable.smali
index 508d79d0ad..74f434562b 100644
--- a/com.discord/smali/androidx/preference/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$styleable.smali
@@ -1467,7 +1467,7 @@
 
     new-array v4, v0, [I
 
-    const v9, 0x7f04058b
+    const v9, 0x7f04057d
 
     aput v9, v4, v3
 
@@ -1573,7 +1573,7 @@
 
     new-array v9, v0, [I
 
-    const v11, 0x7f0404af
+    const v11, 0x7f0404a1
 
     aput v11, v9, v3
 
@@ -1746,10 +1746,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1758,8 +1758,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1776,8 +1776,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -1807,17 +1807,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_9
@@ -1852,8 +1852,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_b
@@ -1951,44 +1951,44 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_c
     .array-data 4
         0x101030e
-        0x7f04047e
+        0x7f040470
     .end array-data
 
     :array_d
@@ -1997,8 +1997,8 @@
         0x10101f0
         0x10101f1
         0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
+        0x7f0404bc
+        0x7f0404bd
     .end array-data
 
     :array_e
@@ -2019,7 +2019,7 @@
     :array_10
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_11
@@ -2057,8 +2057,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_14
@@ -2082,7 +2082,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_16
@@ -2130,7 +2130,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_1b
@@ -2153,7 +2153,7 @@
         0x10101f8
         0x7f040210
         0x7f040211
-        0x7f04058b
+        0x7f04057d
     .end array-data
 
     :array_1e
@@ -2189,8 +2189,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_20
@@ -2203,7 +2203,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_21
@@ -2253,12 +2253,12 @@
         0x7f04032d
         0x7f0403d3
         0x7f0403eb
-        0x7f04047d
-        0x7f040489
-        0x7f04049b
-        0x7f0404c9
-        0x7f040553
-        0x7f0405a0
+        0x7f04046f
+        0x7f04047b
+        0x7f04048d
+        0x7f0404bb
+        0x7f040545
+        0x7f040592
     .end array-data
 
     :array_24
@@ -2307,9 +2307,9 @@
         0x7f0403ff
         0x7f040400
         0x7f040401
-        0x7f04047b
-        0x7f0404d4
-        0x7f0404d5
+        0x7f04046d
+        0x7f0404c6
+        0x7f0404c7
     .end array-data
 
     :array_29
@@ -2330,8 +2330,8 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_2b
@@ -2348,11 +2348,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_2c
@@ -2361,9 +2361,9 @@
         0x1010136
         0x7f04002a
         0x7f0403c6
-        0x7f04047a
-        0x7f040491
-        0x7f040588
+        0x7f04046c
+        0x7f040483
+        0x7f04057a
     .end array-data
 
     :array_2d
@@ -2390,17 +2390,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_30
@@ -2411,10 +2411,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_31
@@ -2425,10 +2425,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_32
@@ -2447,8 +2447,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_33
@@ -2471,18 +2471,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_34
@@ -2491,7 +2491,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_35
diff --git a/com.discord/smali/androidx/recyclerview/R$attr.smali b/com.discord/smali/androidx/recyclerview/R$attr.smali
index b796fb6e9b..7eda3e086e 100644
--- a/com.discord/smali/androidx/recyclerview/R$attr.smali
+++ b/com.discord/smali/androidx/recyclerview/R$attr.smali
@@ -52,11 +52,11 @@
 
 .field public static final reverseLayout:I = 0x7f040445
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 7a8cf366c4..15a4b79b6a 100644
--- a/com.discord/smali/androidx/recyclerview/R$drawable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index 5cea7ab09c..20c328af70 100644
--- a/com.discord/smali/androidx/recyclerview/R$id.smali
+++ b/com.discord/smali/androidx/recyclerview/R$id.smali
@@ -94,61 +94,61 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 363414f911..611ba5721e 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$style.smali b/com.discord/smali/androidx/recyclerview/R$style.smali
index 02e7de10c1..12f390419e 100644
--- a/com.discord/smali/androidx/recyclerview/R$style.smali
+++ b/com.discord/smali/androidx/recyclerview/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$styleable.smali b/com.discord/smali/androidx/recyclerview/R$styleable.smali
index ed852f1006..6ea6fdea28 100644
--- a/com.discord/smali/androidx/recyclerview/R$styleable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$styleable.smali
@@ -197,7 +197,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
@@ -234,8 +234,8 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 .end method
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali
index cdcf41d761..8a35461c61 100644
--- a/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/AdapterHelper$UpdateOp.smali
@@ -86,7 +86,7 @@
     return-object v0
 
     :cond_1
-    const-string v0, "up"
+    const-string/jumbo v0, "up"
 
     return-object v0
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali b/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali
index 6a6a5d2003..62e6d799ae 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ChildHelper$Bucket.smali
@@ -469,7 +469,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v1, "xx"
+    const-string/jumbo v1, "xx"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali b/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali
index 05c5349568..361b4f12c4 100644
--- a/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/ChildHelper.smali
@@ -399,7 +399,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v2, "view is not a child, cannot hide "
+    const-string/jumbo v2, "view is not a child, cannot hide "
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -713,7 +713,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v2, "view is not a child, cannot hide "
+    const-string/jumbo v2, "view is not a child, cannot hide "
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali
index 3975a63979..1055308a5d 100644
--- a/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/DiffUtil$DiffResult.smali
@@ -232,7 +232,7 @@
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
 
-    const-string p2, "unknown flag for pos "
+    const-string/jumbo p2, "unknown flag for pos "
 
     const-string p3, " "
 
@@ -385,7 +385,7 @@
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
 
-    const-string p2, "unknown flag for pos "
+    const-string/jumbo p2, "unknown flag for pos "
 
     const-string p3, " "
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali
index b75e030c75..ce3ba2e056 100644
--- a/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/GridLayoutManager.smali
@@ -870,7 +870,7 @@
 
     const-string p2, "GridLayoutManager"
 
-    invoke-static {p1, p3, p2}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p1, p3, p2}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -931,7 +931,7 @@
 
     const-string p2, "GridLayoutManager"
 
-    invoke-static {p1, p3, p2}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p1, p3, p2}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -990,7 +990,7 @@
 
     const-string p2, "GridLayoutManager"
 
-    invoke-static {p1, p3, p2}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p1, p3, p2}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali
index 7d1d2ba5bc..ccd6505926 100644
--- a/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali
+++ b/com.discord/smali/androidx/recyclerview/widget/LinearLayoutManager.smali
@@ -4967,7 +4967,7 @@
 .method public validateChildOrder()V
     .locals 9
 
-    const-string v0, "validating child count "
+    const-string/jumbo v0, "validating child count "
 
     invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/androidx/room/InvalidationTracker.smali b/com.discord/smali/androidx/room/InvalidationTracker.smali
index 60ba34a673..659cce505e 100644
--- a/com.discord/smali/androidx/room/InvalidationTracker.smali
+++ b/com.discord/smali/androidx/room/InvalidationTracker.smali
@@ -362,7 +362,7 @@
 
     const-string v2, "_"
 
-    invoke-static {p0, v0, v1, p1, v2}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p0, v0, v1, p1, v2}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {p0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -505,7 +505,7 @@
 
     const-string v8, " SET "
 
-    invoke-static {v1, v0, v6, v7, v8}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, v0, v6, v7, v8}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v6, "invalidated"
 
@@ -515,7 +515,7 @@
 
     const-string v9, "table_id"
 
-    invoke-static {v1, v6, v7, v8, v9}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, v6, v7, v8, v9}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v7, " = "
 
diff --git a/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali b/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali
index 42e1ed1564..fe837ded93 100644
--- a/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali
+++ b/com.discord/smali/androidx/room/RoomOpenHelper$Delegate.smali
@@ -90,7 +90,7 @@
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
-    const-string v0, "validateMigration is deprecated"
+    const-string/jumbo v0, "validateMigration is deprecated"
 
     invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/androidx/room/util/FtsTableInfo.smali b/com.discord/smali/androidx/room/util/FtsTableInfo.smali
index 7d0b254e22..2955aab6ad 100644
--- a/com.discord/smali/androidx/room/util/FtsTableInfo.smali
+++ b/com.discord/smali/androidx/room/util/FtsTableInfo.smali
@@ -59,7 +59,7 @@
 
     const-string v7, "prefix="
 
-    const-string v8, "uncompress="
+    const-string/jumbo v8, "uncompress="
 
     filled-new-array/range {v0 .. v8}, [Ljava/lang/String;
 
diff --git a/com.discord/smali/androidx/room/util/TableInfo.smali b/com.discord/smali/androidx/room/util/TableInfo.smali
index 29292fef3a..0f20c329d9 100644
--- a/com.discord/smali/androidx/room/util/TableInfo.smali
+++ b/com.discord/smali/androidx/room/util/TableInfo.smali
@@ -774,7 +774,7 @@
 
     move-result v1
 
-    const-string v2, "unique"
+    const-string/jumbo v2, "unique"
 
     invoke-interface {p1, v2}, Landroid/database/Cursor;->getColumnIndex(Ljava/lang/String;)I
 
diff --git a/com.discord/smali/androidx/sharetarget/R$attr.smali b/com.discord/smali/androidx/sharetarget/R$attr.smali
index f3a54f50ed..186c69befb 100644
--- a/com.discord/smali/androidx/sharetarget/R$attr.smali
+++ b/com.discord/smali/androidx/sharetarget/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$drawable.smali b/com.discord/smali/androidx/sharetarget/R$drawable.smali
index 671774e4c5..fcf1aff6b3 100644
--- a/com.discord/smali/androidx/sharetarget/R$drawable.smali
+++ b/com.discord/smali/androidx/sharetarget/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$id.smali b/com.discord/smali/androidx/sharetarget/R$id.smali
index abd0f501eb..6d2126f80c 100644
--- a/com.discord/smali/androidx/sharetarget/R$id.smali
+++ b/com.discord/smali/androidx/sharetarget/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$string.smali b/com.discord/smali/androidx/sharetarget/R$string.smali
index ae7214535c..325f37b580 100644
--- a/com.discord/smali/androidx/sharetarget/R$string.smali
+++ b/com.discord/smali/androidx/sharetarget/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$style.smali b/com.discord/smali/androidx/sharetarget/R$style.smali
index 4b40fa4449..32dd613171 100644
--- a/com.discord/smali/androidx/sharetarget/R$style.smali
+++ b/com.discord/smali/androidx/sharetarget/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$styleable.smali b/com.discord/smali/androidx/sharetarget/R$styleable.smali
index 5a011f68ba..7d546076f0 100644
--- a/com.discord/smali/androidx/sharetarget/R$styleable.smali
+++ b/com.discord/smali/androidx/sharetarget/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .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 1ade6034d5..c1d0d214c9 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 3448afdf1a..14baccd909 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index 0ef4dd379f..a333b7c32e 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$id.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index c9bb7aeff6..81520b5f1d 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$style.smali b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
index 129ca20b46..42117e303e 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$style.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
index bb26ba0335..ed41e0df92 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali
index 0992032752..c3711a99e0 100644
--- a/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali
+++ b/com.discord/smali/androidx/sqlite/db/SupportSQLiteOpenHelper$Callback.smali
@@ -61,7 +61,7 @@
 
     const-string v1, "SupportSQLite"
 
-    invoke-static {v0, p1, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p1, v1}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :try_start_0
     new-instance v0, Ljava/io/File;
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
index 8f319ac3de..5a63af269f 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
@@ -36,9 +36,9 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final swipeRefreshLayoutProgressSpinnerBackgroundColor:I = 0x7f0404d1
+.field public static final swipeRefreshLayoutProgressSpinnerBackgroundColor:I = 0x7f0404c3
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index 2dab6d6188..bcd4c305f6 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index 7f953d8f65..bd6a09e661 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index c403c4cf13..0a74b0e014 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
index 790cc1607a..0a21062e49 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
index 1587393451..1c3919bbee 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
@@ -145,7 +145,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f0404d1
+    const v2, 0x7f0404c3
 
     aput v2, v0, v1
 
@@ -181,7 +181,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .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 92a3fd9178..1d82cf7be0 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index 2007058c8c..af33cf0dcf 100644
--- a/com.discord/smali/androidx/transition/R$drawable.smali
+++ b/com.discord/smali/androidx/transition/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index 7017f2eb73..1823b9930a 100644
--- a/com.discord/smali/androidx/transition/R$id.smali
+++ b/com.discord/smali/androidx/transition/R$id.smali
@@ -28,67 +28,67 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e9
 
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03ea
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final parent_matrix:I = 0x7f0a067e
+.field public static final parent_matrix:I = 0x7f0a0684
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final save_non_transition_alpha:I = 0x7f0a078a
+.field public static final save_non_transition_alpha:I = 0x7f0a0790
 
-.field public static final save_overlay_view:I = 0x7f0a078b
+.field public static final save_overlay_view:I = 0x7f0a0791
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final transition_current_scene:I = 0x7f0a099d
+.field public static final transition_current_scene:I = 0x7f0a09a1
 
-.field public static final transition_layout_save:I = 0x7f0a099e
+.field public static final transition_layout_save:I = 0x7f0a09a2
 
-.field public static final transition_position:I = 0x7f0a099f
+.field public static final transition_position:I = 0x7f0a09a3
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a0
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a4
 
-.field public static final transition_transform:I = 0x7f0a09a1
+.field public static final transition_transform:I = 0x7f0a09a5
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index f52aad56b2..313c5eba01 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$style.smali b/com.discord/smali/androidx/transition/R$style.smali
index f032fcab53..b2b219faec 100644
--- a/com.discord/smali/androidx/transition/R$style.smali
+++ b/com.discord/smali/androidx/transition/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$styleable.smali b/com.discord/smali/androidx/transition/R$styleable.smali
index f4df0a2932..5ac6c178f7 100644
--- a/com.discord/smali/androidx/transition/R$styleable.smali
+++ b/com.discord/smali/androidx/transition/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .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 d2b0c1b4a9..bedf48b07a 100644
--- a/com.discord/smali/androidx/vectordrawable/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index b364e082b5..8eb4d02686 100644
--- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index d7b3a25a7b..271f3e8402 100644
--- a/com.discord/smali/androidx/vectordrawable/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index 5713d985b1..21f10bfd9a 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$style.smali b/com.discord/smali/androidx/vectordrawable/R$style.smali
index 32e02f7645..3eb544455b 100644
--- a/com.discord/smali/androidx/vectordrawable/R$style.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
index 64c61da269..95fa34b8c8 100644
--- a/com.discord/smali/androidx/vectordrawable/R$styleable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali b/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali
index 04b27c46fd..b82b73cfcc 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
index 41bad9565f..c183ec2f12 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$id.smali b/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
index 03f60dd7b1..6ce0a68ccd 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
index 93761a7a15..e8c45a82e0 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$style.smali b/com.discord/smali/androidx/vectordrawable/animated/R$style.smali
index f800178df6..9864f0534c 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$style.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali
index d559570856..2149fa191a 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali
index d4342a426c..5a798ba792 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.smali
@@ -1086,7 +1086,7 @@
 
     move-result-object p0
 
-    const-string p1, "value"
+    const-string/jumbo p1, "value"
 
     const/4 p2, 0x0
 
@@ -1394,7 +1394,7 @@
 
     move-result p2
 
-    const-string v0, "value"
+    const-string/jumbo v0, "value"
 
     const/4 v1, 0x0
 
@@ -1891,7 +1891,7 @@
 
     const/4 v0, 0x4
 
-    const-string v1, "valueType"
+    const-string/jumbo v1, "valueType"
 
     invoke-static {v14, v6, v1, v2, v0}, Landroidx/core/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I
 
@@ -2007,7 +2007,7 @@
 
     int-to-long v6, v0
 
-    const-string v0, "valueType"
+    const-string/jumbo v0, "valueType"
 
     const/4 v4, 0x7
 
@@ -2017,7 +2017,7 @@
 
     move-result v0
 
-    const-string v4, "valueFrom"
+    const-string/jumbo v4, "valueFrom"
 
     invoke-static {p4, v4}, Landroidx/core/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z
 
@@ -2025,7 +2025,7 @@
 
     if-eqz v4, :cond_1
 
-    const-string v4, "valueTo"
+    const-string/jumbo v4, "valueTo"
 
     invoke-static {p4, v4}, Landroidx/core/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z
 
diff --git a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali
index f9ebdee9b3..7b8a70e099 100644
--- a/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali
+++ b/com.discord/smali/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.smali
@@ -820,7 +820,7 @@
 
     iget v0, v1, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportWidth:F
 
-    const-string v2, "viewportWidth"
+    const-string/jumbo v2, "viewportWidth"
 
     invoke-static {p1, p2, v2, p3, v0}, Landroidx/core/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F
 
@@ -832,7 +832,7 @@
 
     iget v0, v1, Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportHeight:F
 
-    const-string v2, "viewportHeight"
+    const-string/jumbo v2, "viewportHeight"
 
     invoke-static {p1, p2, v2, p3, v0}, Landroidx/core/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F
 
diff --git a/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali b/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali
index d0aba00342..208fca119e 100644
--- a/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali
+++ b/com.discord/smali/androidx/versionedparcelable/VersionedParcel.smali
@@ -533,7 +533,7 @@
 
     aput-object v3, v1, v2
 
-    const-string v2, "write"
+    const-string/jumbo v2, "write"
 
     invoke-virtual {v0, v2, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 
diff --git a/com.discord/smali/androidx/viewpager/R$attr.smali b/com.discord/smali/androidx/viewpager/R$attr.smali
index 3b818ffcc6..9331ce94f4 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 = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 46668aec3b..2aaafa8f29 100644
--- a/com.discord/smali/androidx/viewpager/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index 4ab00a29c4..2525984f6e 100644
--- a/com.discord/smali/androidx/viewpager/R$id.smali
+++ b/com.discord/smali/androidx/viewpager/R$id.smali
@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index b101683d1a..1fce5cb342 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$style.smali b/com.discord/smali/androidx/viewpager/R$style.smali
index 639d018269..329a57bb7a 100644
--- a/com.discord/smali/androidx/viewpager/R$style.smali
+++ b/com.discord/smali/androidx/viewpager/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$styleable.smali b/com.discord/smali/androidx/viewpager/R$styleable.smali
index 422089e465..1b903c7965 100644
--- a/com.discord/smali/androidx/viewpager/R$styleable.smali
+++ b/com.discord/smali/androidx/viewpager/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/viewpager2/R$attr.smali b/com.discord/smali/androidx/viewpager2/R$attr.smali
index 1ad484e2ec..7bb72600c5 100644
--- a/com.discord/smali/androidx/viewpager2/R$attr.smali
+++ b/com.discord/smali/androidx/viewpager2/R$attr.smali
@@ -52,11 +52,11 @@
 
 .field public static final reverseLayout:I = 0x7f040445
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$drawable.smali b/com.discord/smali/androidx/viewpager2/R$drawable.smali
index 11cb418c8d..a3149156ba 100644
--- a/com.discord/smali/androidx/viewpager2/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager2/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$id.smali b/com.discord/smali/androidx/viewpager2/R$id.smali
index 1af483d5a3..548e2923bc 100644
--- a/com.discord/smali/androidx/viewpager2/R$id.smali
+++ b/com.discord/smali/androidx/viewpager2/R$id.smali
@@ -94,61 +94,61 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$string.smali b/com.discord/smali/androidx/viewpager2/R$string.smali
index ecfbafda20..3c3c6ef2de 100644
--- a/com.discord/smali/androidx/viewpager2/R$string.smali
+++ b/com.discord/smali/androidx/viewpager2/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$style.smali b/com.discord/smali/androidx/viewpager2/R$style.smali
index 128e77a5f6..43982bfbcf 100644
--- a/com.discord/smali/androidx/viewpager2/R$style.smali
+++ b/com.discord/smali/androidx/viewpager2/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$styleable.smali b/com.discord/smali/androidx/viewpager2/R$styleable.smali
index d77b0c01a5..913a524c51 100644
--- a/com.discord/smali/androidx/viewpager2/R$styleable.smali
+++ b/com.discord/smali/androidx/viewpager2/R$styleable.smali
@@ -215,7 +215,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
@@ -252,8 +252,8 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 .end method
 
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$1.smali
index f7609b119e..ac8157507e 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$1.smali
@@ -51,7 +51,7 @@
 
     iget-object v0, p0, Landroidx/work/CoroutineWorker$1;->this$0:Landroidx/work/CoroutineWorker;
 
-    invoke-virtual {v0}, Landroidx/work/CoroutineWorker;->getJob$work_runtime_ktx_release()Lk0/a/o;
+    invoke-virtual {v0}, Landroidx/work/CoroutineWorker;->getJob$work_runtime_ktx_release()Ll0/a/o;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static {v0, v2, v1, v2}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {v0, v2, v1, v2}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
index 8f267c9f47..a2cbf02924 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field public final synthetic $cancellableContinuation:Lk0/a/f;
+.field public final synthetic $cancellableContinuation:Ll0/a/f;
 
 .field public final synthetic $this_await$inlined:Lf/h/b/a/a/a;
 
 
 # direct methods
-.method public constructor <init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+.method public constructor <init>(Ll0/a/f;Lf/h/b/a/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iput-object p1, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     iput-object p2, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -42,7 +42,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     iget-object v1, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -75,14 +75,14 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
-    invoke-interface {v0, v1}, Lk0/a/f;->g(Ljava/lang/Throwable;)Z
+    invoke-interface {v0, v1}, Ll0/a/f;->g(Ljava/lang/Throwable;)Z
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2.smali b/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
index 2fd338f57f..b00dbfa6c6 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field public final synthetic $cancellableContinuation:Lk0/a/f;
+.field public final synthetic $cancellableContinuation:Ll0/a/f;
 
 .field public final synthetic $this_await$inlined:Lf/h/b/a/a/a;
 
 
 # direct methods
-.method public constructor <init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+.method public constructor <init>(Ll0/a/f;Lf/h/b/a/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iput-object p1, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     iput-object p2, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -42,7 +42,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     iget-object v1, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -75,14 +75,14 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
-    invoke-interface {v0, v1}, Lk0/a/f;->g(Ljava/lang/Throwable;)Z
+    invoke-interface {v0, v1}, Ll0/a/f;->g(Ljava/lang/Throwable;)Z
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
index e5b9aeab5d..342624569e 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
@@ -1,5 +1,5 @@
 .class public final Landroidx/work/CoroutineWorker$startWork$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "CoroutineWorker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "androidx.work.CoroutineWorker$startWork$1"
     f = "CoroutineWorker.kt"
     l = {
@@ -58,7 +58,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p2}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p2}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -79,7 +79,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/work/CoroutineWorker$startWork$1;
 
@@ -92,15 +94,6 @@
     iput-object p1, v0, Landroidx/work/CoroutineWorker$startWork$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -126,7 +119,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Landroidx/work/CoroutineWorker$startWork$1;->label:I
 
diff --git a/com.discord/smali/androidx/work/CoroutineWorker.smali b/com.discord/smali/androidx/work/CoroutineWorker.smali
index af0f77ffe7..83fef29c92 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final coroutineContext:Lk0/a/v;
+.field public final coroutineContext:Ll0/a/v;
 
 .field public final future:Landroidx/work/impl/utils/futures/SettableFuture;
     .annotation system Ldalvik/annotation/Signature;
@@ -16,26 +16,30 @@
     .end annotation
 .end field
 
-.field public final job:Lk0/a/o;
+.field public final job:Ll0/a/o;
 
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "appContext"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/work/ListenableWorker;-><init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
 
-    new-instance p1, Lk0/a/a1;
+    new-instance p1, Ll0/a/a1;
 
-    invoke-direct {p1, v0}, Lk0/a/a1;-><init>(Lkotlinx/coroutines/Job;)V
+    const/4 p2, 0x0
 
-    iput-object p1, p0, Landroidx/work/CoroutineWorker;->job:Lk0/a/o;
+    invoke-direct {p1, p2}, Ll0/a/a1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    iput-object p1, p0, Landroidx/work/CoroutineWorker;->job:Ll0/a/o;
 
     invoke-static {}, Landroidx/work/impl/utils/futures/SettableFuture;->create()Landroidx/work/impl/utils/futures/SettableFuture;
 
@@ -43,7 +47,7 @@
 
     const-string p2, "SettableFuture.create()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Landroidx/work/CoroutineWorker;->future:Landroidx/work/impl/utils/futures/SettableFuture;
 
@@ -57,7 +61,7 @@
 
     const-string v1, "taskExecutor"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Landroidx/work/impl/utils/taskexecutor/TaskExecutor;->getBackgroundExecutor()Landroidx/work/impl/utils/SerialExecutor;
 
@@ -65,25 +69,11 @@
 
     invoke-virtual {p1, p2, v0}, Landroidx/work/impl/utils/futures/AbstractFuture;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    sget-object p1, Lk0/a/j0;->a:Lk0/a/v;
+    sget-object p1, Ll0/a/j0;->a:Ll0/a/v;
 
-    iput-object p1, p0, Landroidx/work/CoroutineWorker;->coroutineContext:Lk0/a/v;
+    iput-object p1, p0, Landroidx/work/CoroutineWorker;->coroutineContext:Ll0/a/v;
 
     return-void
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "appContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic coroutineContext$annotations()V
@@ -107,10 +97,10 @@
     .end annotation
 .end method
 
-.method public getCoroutineContext()Lk0/a/v;
+.method public getCoroutineContext()Ll0/a/v;
     .locals 1
 
-    iget-object v0, p0, Landroidx/work/CoroutineWorker;->coroutineContext:Lk0/a/v;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker;->coroutineContext:Ll0/a/v;
 
     return-object v0
 .end method
@@ -131,10 +121,10 @@
     return-object v0
 .end method
 
-.method public final getJob$work_runtime_ktx_release()Lk0/a/o;
+.method public final getJob$work_runtime_ktx_release()Ll0/a/o;
     .locals 1
 
-    iget-object v0, p0, Landroidx/work/CoroutineWorker;->job:Lk0/a/o;
+    iget-object v0, p0, Landroidx/work/CoroutineWorker;->job:Ll0/a/o;
 
     return-object v0
 .end method
@@ -154,7 +144,7 @@
 .end method
 
 .method public final setForeground(Landroidx/work/ForegroundInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -167,7 +157,7 @@
         }
     .end annotation
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     invoke-virtual {p0, p1}, Landroidx/work/ListenableWorker;->setForegroundAsync(Landroidx/work/ForegroundInfo;)Lf/h/b/a/a/a;
 
@@ -175,7 +165,7 @@
 
     const-string v1, "setForegroundAsync(foregroundInfo)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/concurrent/Future;->isDone()Z
 
@@ -207,41 +197,48 @@
     throw p1
 
     :cond_1
-    new-instance v1, Lk0/a/g;
+    new-instance v1, Ll0/a/g;
 
     invoke-static {p2}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
-    move-result-object p2
+    move-result-object v2
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    invoke-direct {v1, p2, v2}, Lk0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
+    invoke-direct {v1, v2, v3}, Ll0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
 
-    new-instance p2, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;
+    new-instance v2, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;
 
-    invoke-direct {p2, v1, p1}, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;-><init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+    invoke-direct {v2, v1, p1}, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2;-><init>(Ll0/a/f;Lf/h/b/a/a/a;)V
 
-    sget-object v2, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
+    sget-object v3, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
 
-    invoke-interface {p1, p2, v2}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+    invoke-interface {p1, v2, v3}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    invoke-virtual {v1}, Lk0/a/g;->k()Ljava/lang/Object;
+    invoke-virtual {v1}, Ll0/a/g;->k()Ljava/lang/Object;
 
     move-result-object p1
 
-    :goto_0
     if-ne p1, v0, :cond_2
 
+    const-string v1, "frame"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_2
+    :goto_0
+    if-ne p1, v0, :cond_3
+
     return-object p1
 
-    :cond_2
+    :cond_3
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final setProgress(Landroidx/work/Data;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -254,7 +251,7 @@
         }
     .end annotation
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     invoke-virtual {p0, p1}, Landroidx/work/ListenableWorker;->setProgressAsync(Landroidx/work/Data;)Lf/h/b/a/a/a;
 
@@ -262,7 +259,7 @@
 
     const-string v1, "setProgressAsync(data)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/concurrent/Future;->isDone()Z
 
@@ -294,34 +291,41 @@
     throw p1
 
     :cond_1
-    new-instance v1, Lk0/a/g;
+    new-instance v1, Ll0/a/g;
 
     invoke-static {p2}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
-    move-result-object p2
+    move-result-object v2
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
-    invoke-direct {v1, p2, v2}, Lk0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
+    invoke-direct {v1, v2, v3}, Ll0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
 
-    new-instance p2, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;
+    new-instance v2, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;
 
-    invoke-direct {p2, v1, p1}, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+    invoke-direct {v2, v1, p1}, Landroidx/work/CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Ll0/a/f;Lf/h/b/a/a/a;)V
 
-    sget-object v2, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
+    sget-object v3, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
 
-    invoke-interface {p1, p2, v2}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+    invoke-interface {p1, v2, v3}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    invoke-virtual {v1}, Lk0/a/g;->k()Ljava/lang/Object;
+    invoke-virtual {v1}, Ll0/a/g;->k()Ljava/lang/Object;
 
     move-result-object p1
 
-    :goto_0
     if-ne p1, v0, :cond_2
 
+    const-string v1, "frame"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_2
+    :goto_0
+    if-ne p1, v0, :cond_3
+
     return-object p1
 
-    :cond_2
+    :cond_3
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
@@ -338,13 +342,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Landroidx/work/CoroutineWorker;->getCoroutineContext()Lk0/a/v;
+    invoke-virtual {p0}, Landroidx/work/CoroutineWorker;->getCoroutineContext()Ll0/a/v;
 
     move-result-object v0
 
-    iget-object v1, p0, Landroidx/work/CoroutineWorker;->job:Lk0/a/o;
+    iget-object v1, p0, Landroidx/work/CoroutineWorker;->job:Ll0/a/o;
 
-    invoke-virtual {v0, v1}, Lj0/k/a;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    invoke-virtual {v0, v1}, Lk0/l/a;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v0
 
@@ -366,7 +370,7 @@
 
     const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     iget-object v0, p0, Landroidx/work/CoroutineWorker;->future:Landroidx/work/impl/utils/futures/SettableFuture;
 
diff --git a/com.discord/smali/androidx/work/DataKt.smali b/com.discord/smali/androidx/work/DataKt.smali
index ef780097bc..fb84a0b273 100644
--- a/com.discord/smali/androidx/work/DataKt.smali
+++ b/com.discord/smali/androidx/work/DataKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final hasKeyWithValueOfType(Landroidx/work/Data;Ljava/lang/String;)Z
+.method public static final synthetic hasKeyWithValueOfType(Landroidx/work/Data;Ljava/lang/String;)Z
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -17,29 +17,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$hasKeyWithValueOfType"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw v0
-
-    :cond_0
     const-string p0, "key"
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    :cond_1
-    const-string p0, "$this$hasKeyWithValueOfType"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
 .method public static final varargs workDataOf([Lkotlin/Pair;)Landroidx/work/Data;
@@ -56,7 +46,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "pairs"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/work/Data$Builder;
 
@@ -90,16 +82,7 @@
 
     const-string v0, "dataBuilder.build()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_1
-    const-string p0, "pairs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/androidx/work/DirectExecutor.smali b/com.discord/smali/androidx/work/DirectExecutor.smali
index c67bd37553..b27af5f9b4 100644
--- a/com.discord/smali/androidx/work/DirectExecutor.smali
+++ b/com.discord/smali/androidx/work/DirectExecutor.smali
@@ -98,22 +98,15 @@
 
 # virtual methods
 .method public execute(Ljava/lang/Runnable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "command"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Runnable;->run()V
 
     return-void
-
-    :cond_0
-    const-string p1, "command"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali b/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
index dc6fec84b6..39597bfd65 100644
--- a/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
+++ b/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field public final synthetic $cancellableContinuation:Lk0/a/f;
+.field public final synthetic $cancellableContinuation:Ll0/a/f;
 
 .field public final synthetic $this_await$inlined:Lf/h/b/a/a/a;
 
 
 # direct methods
-.method public constructor <init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+.method public constructor <init>(Ll0/a/f;Lf/h/b/a/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iput-object p1, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     iput-object p2, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -42,7 +42,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     iget-object v1, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -75,14 +75,14 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
-    invoke-interface {v0, v1}, Lk0/a/f;->g(Ljava/lang/Throwable;)Z
+    invoke-interface {v0, v1}, Ll0/a/f;->g(Ljava/lang/Throwable;)Z
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali b/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
index 03f790711c..2bbdefbfb8 100644
--- a/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
+++ b/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field public final synthetic $cancellableContinuation:Lk0/a/f;
+.field public final synthetic $cancellableContinuation:Ll0/a/f;
 
 .field public final synthetic $this_await$inlined:Lf/h/b/a/a/a;
 
 
 # direct methods
-.method public constructor <init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+.method public constructor <init>(Ll0/a/f;Lf/h/b/a/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iput-object p1, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     iput-object p2, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -42,7 +42,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     iget-object v1, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -75,14 +75,14 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
-    invoke-interface {v0, v1}, Lk0/a/f;->g(Ljava/lang/Throwable;)Z
+    invoke-interface {v0, v1}, Ll0/a/f;->g(Ljava/lang/Throwable;)Z
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/ListenableFutureKt.smali b/com.discord/smali/androidx/work/ListenableFutureKt.smali
index adaac44e41..1fce724dac 100644
--- a/com.discord/smali/androidx/work/ListenableFutureKt.smali
+++ b/com.discord/smali/androidx/work/ListenableFutureKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final await(Lf/h/b/a/a/a;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
     .annotation build Landroidx/annotation/RestrictTo;
         value = {
             .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
@@ -55,35 +55,42 @@
     throw p0
 
     :cond_1
-    new-instance v0, Lk0/a/g;
+    new-instance v0, Ll0/a/g;
 
     invoke-static {p1}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
-    move-result-object p1
+    move-result-object v1
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    invoke-direct {v0, p1, v1}, Lk0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
+    invoke-direct {v0, v1, v2}, Ll0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
 
-    new-instance p1, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
+    new-instance v1, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
 
-    invoke-direct {p1, v0, p0}, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+    invoke-direct {v1, v0, p0}, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Ll0/a/f;Lf/h/b/a/a/a;)V
 
-    sget-object v1, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
+    sget-object v2, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
 
-    invoke-interface {p0, p1, v1}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+    invoke-interface {p0, v1, v2}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    invoke-virtual {v0}, Lk0/a/g;->k()Ljava/lang/Object;
+    invoke-virtual {v0}, Ll0/a/g;->k()Ljava/lang/Object;
 
     move-result-object p0
 
-    sget-object p1, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
+    if-ne p0, v0, :cond_2
+
+    const-string v0, "frame"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_2
     return-object p0
 .end method
 
 .method public static final await$$forInline(Lf/h/b/a/a/a;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
     .annotation build Landroidx/annotation/RestrictTo;
         value = {
             .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
@@ -120,29 +127,36 @@
     throw p0
 
     :cond_1
-    new-instance v0, Lk0/a/g;
+    new-instance v0, Ll0/a/g;
 
     invoke-static {p1}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
-    move-result-object p1
+    move-result-object v1
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    invoke-direct {v0, p1, v1}, Lk0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
+    invoke-direct {v0, v1, v2}, Ll0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
 
-    new-instance p1, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
+    new-instance v1, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
 
-    invoke-direct {p1, v0, p0}, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+    invoke-direct {v1, v0, p0}, Landroidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Ll0/a/f;Lf/h/b/a/a/a;)V
 
-    sget-object v1, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
+    sget-object v2, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
 
-    invoke-interface {p0, p1, v1}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+    invoke-interface {p0, v1, v2}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    invoke-virtual {v0}, Lk0/a/g;->k()Ljava/lang/Object;
+    invoke-virtual {v0}, Ll0/a/g;->k()Ljava/lang/Object;
 
     move-result-object p0
 
-    sget-object p1, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
+    if-ne p0, v0, :cond_2
+
+    const-string v0, "frame"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_2
     return-object p0
 .end method
diff --git a/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali b/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
index dbfb93b665..010651b76b 100644
--- a/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
+++ b/com.discord/smali/androidx/work/OneTimeWorkRequestKt.smali
@@ -15,16 +15,16 @@
         }
     .end annotation
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
     const/4 v0, 0x0
 
     throw v0
 .end method
 
-.method public static final setInputMerger(Landroidx/work/OneTimeWorkRequest$Builder;Lj0/r/b;)Landroidx/work/OneTimeWorkRequest$Builder;
+.method public static final setInputMerger(Landroidx/work/OneTimeWorkRequest$Builder;Lk0/s/b;)Landroidx/work/OneTimeWorkRequest$Builder;
     .locals 1
-    .param p1    # Lj0/r/b;
+    .param p1    # Lk0/s/b;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
@@ -32,7 +32,7 @@
         value = {
             "(",
             "Landroidx/work/OneTimeWorkRequest$Builder;",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Landroidx/work/InputMerger;",
             ">;)",
@@ -40,13 +40,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setInputMerger"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "inputMerger"
 
-    invoke-static {p1}, Lf/n/a/k/a;->getJavaClass(Lj0/r/b;)Ljava/lang/Class;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lf/n/a/k/a;->getJavaClass(Lk0/s/b;)Ljava/lang/Class;
 
     move-result-object p1
 
@@ -56,21 +58,7 @@
 
     const-string p1, "setInputMerger(inputMerger.java)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "inputMerger"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$setInputMerger"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali b/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
index 1ee885920f..c6783c97a6 100644
--- a/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
+++ b/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field public final synthetic $cancellableContinuation:Lk0/a/f;
+.field public final synthetic $cancellableContinuation:Ll0/a/f;
 
 .field public final synthetic $this_await$inlined:Lf/h/b/a/a/a;
 
 
 # direct methods
-.method public constructor <init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+.method public constructor <init>(Ll0/a/f;Lf/h/b/a/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iput-object p1, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     iput-object p2, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -42,7 +42,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     iget-object v1, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -75,14 +75,14 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
-    invoke-interface {v0, v1}, Lk0/a/f;->g(Ljava/lang/Throwable;)Z
+    invoke-interface {v0, v1}, Ll0/a/f;->g(Ljava/lang/Throwable;)Z
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;->$cancellableContinuation:Ll0/a/f;
 
     invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali b/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
index e3ab71d2a7..ad1f4469f3 100644
--- a/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
+++ b/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
@@ -18,16 +18,16 @@
 
 
 # instance fields
-.field public final synthetic $cancellableContinuation:Lk0/a/f;
+.field public final synthetic $cancellableContinuation:Ll0/a/f;
 
 .field public final synthetic $this_await$inlined:Lf/h/b/a/a/a;
 
 
 # direct methods
-.method public constructor <init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+.method public constructor <init>(Ll0/a/f;Lf/h/b/a/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iput-object p1, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     iput-object p2, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -42,7 +42,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     iget-object v1, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$this_await$inlined:Lf/h/b/a/a/a;
 
@@ -75,14 +75,14 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
-    invoke-interface {v0, v1}, Lk0/a/f;->g(Ljava/lang/Throwable;)Z
+    invoke-interface {v0, v1}, Ll0/a/f;->g(Ljava/lang/Throwable;)Z
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Lk0/a/f;
+    iget-object v0, p0, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2;->$cancellableContinuation:Ll0/a/f;
 
     invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/OperationKt.smali b/com.discord/smali/androidx/work/OperationKt.smali
index 956d7d2823..6d249a729a 100644
--- a/com.discord/smali/androidx/work/OperationKt.smali
+++ b/com.discord/smali/androidx/work/OperationKt.smali
@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static final await(Landroidx/work/Operation;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -24,7 +24,7 @@
 
     const-string v0, "result"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Ljava/util/concurrent/Future;->isDone()Z
 
@@ -56,36 +56,43 @@
     throw p0
 
     :cond_1
-    new-instance v0, Lk0/a/g;
+    new-instance v0, Ll0/a/g;
 
     invoke-static {p1}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
-    move-result-object p1
+    move-result-object v1
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    invoke-direct {v0, p1, v1}, Lk0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
+    invoke-direct {v0, v1, v2}, Ll0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
 
-    new-instance p1, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
+    new-instance v1, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
 
-    invoke-direct {p1, v0, p0}, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+    invoke-direct {v1, v0, p0}, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Ll0/a/f;Lf/h/b/a/a/a;)V
 
-    sget-object v1, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
+    sget-object v2, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
 
-    invoke-interface {p0, p1, v1}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+    invoke-interface {p0, v1, v2}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    invoke-virtual {v0}, Lk0/a/g;->k()Ljava/lang/Object;
+    invoke-virtual {v0}, Ll0/a/g;->k()Ljava/lang/Object;
 
     move-result-object p0
 
-    sget-object p1, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
+    if-ne p0, v0, :cond_2
+
+    const-string v0, "frame"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_2
     :goto_0
     return-object p0
 .end method
 
 .method public static final await$$forInline(Landroidx/work/Operation;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
 
     invoke-interface {p0}, Landroidx/work/Operation;->getResult()Lf/h/b/a/a/a;
 
@@ -93,7 +100,7 @@
 
     const-string v0, "result"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Ljava/util/concurrent/Future;->isDone()Z
 
@@ -125,30 +132,37 @@
     throw p0
 
     :cond_1
-    new-instance v0, Lk0/a/g;
+    new-instance v0, Ll0/a/g;
 
     invoke-static {p1}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
-    move-result-object p1
+    move-result-object v1
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    invoke-direct {v0, p1, v1}, Lk0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
+    invoke-direct {v0, v1, v2}, Ll0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
 
-    new-instance p1, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
+    new-instance v1, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;
 
-    invoke-direct {p1, v0, p0}, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Lk0/a/f;Lf/h/b/a/a/a;)V
+    invoke-direct {v1, v0, p0}, Landroidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1;-><init>(Ll0/a/f;Lf/h/b/a/a/a;)V
 
-    sget-object v1, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
+    sget-object v2, Landroidx/work/DirectExecutor;->INSTANCE:Landroidx/work/DirectExecutor;
 
-    invoke-interface {p0, p1, v1}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+    invoke-interface {p0, v1, v2}, Lf/h/b/a/a/a;->addListener(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
 
-    invoke-virtual {v0}, Lk0/a/g;->k()Ljava/lang/Object;
+    invoke-virtual {v0}, Ll0/a/g;->k()Ljava/lang/Object;
 
     move-result-object p0
 
-    sget-object p1, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
+    if-ne p0, v0, :cond_2
+
+    const-string v0, "frame"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_2
     :goto_0
     return-object p0
 .end method
diff --git a/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali b/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
index ad8b30b208..ac19d32556 100644
--- a/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
+++ b/com.discord/smali/androidx/work/PeriodicWorkRequestKt.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final PeriodicWorkRequestBuilder(JLjava/util/concurrent/TimeUnit;)Landroidx/work/PeriodicWorkRequest$Builder;
+.method public static final synthetic PeriodicWorkRequestBuilder(JLjava/util/concurrent/TimeUnit;)Landroidx/work/PeriodicWorkRequest$Builder;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -17,23 +17,18 @@
         }
     .end annotation
 
+    const-string p0, "repeatIntervalTimeUnit"
+
+    invoke-static {p2, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
+
     const/4 p0, 0x0
 
-    if-eqz p2, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw p0
-
-    :cond_0
-    const-string p1, "repeatIntervalTimeUnit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     throw p0
 .end method
 
-.method public static final PeriodicWorkRequestBuilder(JLjava/util/concurrent/TimeUnit;JLjava/util/concurrent/TimeUnit;)Landroidx/work/PeriodicWorkRequest$Builder;
+.method public static final synthetic PeriodicWorkRequestBuilder(JLjava/util/concurrent/TimeUnit;JLjava/util/concurrent/TimeUnit;)Landroidx/work/PeriodicWorkRequest$Builder;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -48,32 +43,22 @@
         }
     .end annotation
 
+    const-string p0, "repeatIntervalTimeUnit"
+
+    invoke-static {p2, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "flexTimeIntervalUnit"
+
+    invoke-static {p5, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
+
     const/4 p0, 0x0
 
-    if-eqz p2, :cond_1
-
-    if-eqz p5, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw p0
-
-    :cond_0
-    const-string p1, "flexTimeIntervalUnit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    const-string p1, "repeatIntervalTimeUnit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     throw p0
 .end method
 
-.method public static final PeriodicWorkRequestBuilder(Ljava/time/Duration;)Landroidx/work/PeriodicWorkRequest$Builder;
+.method public static final synthetic PeriodicWorkRequestBuilder(Ljava/time/Duration;)Landroidx/work/PeriodicWorkRequest$Builder;
     .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x1a
@@ -90,23 +75,18 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "repeatInterval"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "repeatInterval"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
-.method public static final PeriodicWorkRequestBuilder(Ljava/time/Duration;Ljava/time/Duration;)Landroidx/work/PeriodicWorkRequest$Builder;
+.method public static final synthetic PeriodicWorkRequestBuilder(Ljava/time/Duration;Ljava/time/Duration;)Landroidx/work/PeriodicWorkRequest$Builder;
     .locals 1
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x1a
@@ -124,27 +104,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "repeatInterval"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
-
-    throw v0
-
-    :cond_0
     const-string p0, "flexTimeInterval"
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
-    :cond_1
-    const-string p0, "repeatInterval"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
diff --git a/com.discord/smali/androidx/work/R$attr.smali b/com.discord/smali/androidx/work/R$attr.smali
index 3e9eb994ab..5e853c2185 100644
--- a/com.discord/smali/androidx/work/R$attr.smali
+++ b/com.discord/smali/androidx/work/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index f1fe955fa1..bbba354bd1 100644
--- a/com.discord/smali/androidx/work/R$drawable.smali
+++ b/com.discord/smali/androidx/work/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$id.smali b/com.discord/smali/androidx/work/R$id.smali
index e54ba57894..525e5ed809 100644
--- a/com.discord/smali/androidx/work/R$id.smali
+++ b/com.discord/smali/androidx/work/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index 2eefef6ea2..bfb20de3a9 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$style.smali b/com.discord/smali/androidx/work/R$style.smali
index af54ca3710..d085d8c223 100644
--- a/com.discord/smali/androidx/work/R$style.smali
+++ b/com.discord/smali/androidx/work/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$styleable.smali b/com.discord/smali/androidx/work/R$styleable.smali
index 9921ce73a5..d28504de1e 100644
--- a/com.discord/smali/androidx/work/R$styleable.smali
+++ b/com.discord/smali/androidx/work/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali b/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali
index dc14019d7d..6632a5ec33 100644
--- a/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali
+++ b/com.discord/smali/androidx/work/impl/WorkDatabase_Impl$1.smali
@@ -308,7 +308,7 @@
 
     new-instance v10, Landroidx/room/util/TableInfo$Column;
 
-    const-string v4, "work_spec_id"
+    const-string/jumbo v4, "work_spec_id"
 
     const-string v5, "TEXT"
 
@@ -324,7 +324,7 @@
 
     invoke-direct/range {v3 .. v9}, Landroidx/room/util/TableInfo$Column;-><init>(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/String;I)V
 
-    const-string v3, "work_spec_id"
+    const-string/jumbo v3, "work_spec_id"
 
     invoke-virtual {v1, v3, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -549,7 +549,7 @@
 
     const/16 v18, 0x0
 
-    const-string v15, "worker_class_name"
+    const-string/jumbo v15, "worker_class_name"
 
     const-string v16, "TEXT"
 
@@ -557,7 +557,7 @@
 
     invoke-direct/range {v14 .. v20}, Landroidx/room/util/TableInfo$Column;-><init>(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/String;I)V
 
-    const-string v5, "worker_class_name"
+    const-string/jumbo v5, "worker_class_name"
 
     invoke-virtual {v1, v5, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -976,7 +976,7 @@
 
     const/16 v18, 0x2
 
-    const-string v15, "work_spec_id"
+    const-string/jumbo v15, "work_spec_id"
 
     const-string v16, "TEXT"
 
@@ -1097,7 +1097,7 @@
 
     const/16 v20, 0x1
 
-    const-string v15, "work_spec_id"
+    const-string/jumbo v15, "work_spec_id"
 
     const-string v16, "TEXT"
 
@@ -1238,7 +1238,7 @@
 
     const/16 v18, 0x2
 
-    const-string v15, "work_spec_id"
+    const-string/jumbo v15, "work_spec_id"
 
     const-string v16, "TEXT"
 
@@ -1357,7 +1357,7 @@
 
     const/16 v20, 0x1
 
-    const-string v15, "work_spec_id"
+    const-string/jumbo v15, "work_spec_id"
 
     const-string v16, "TEXT"
 
diff --git a/com.discord/smali/androidx/work/impl/foreground/SystemForegroundDispatcher.smali b/com.discord/smali/androidx/work/impl/foreground/SystemForegroundDispatcher.smali
index 91c8cbc850..de6a2f74dc 100644
--- a/com.discord/smali/androidx/work/impl/foreground/SystemForegroundDispatcher.smali
+++ b/com.discord/smali/androidx/work/impl/foreground/SystemForegroundDispatcher.smali
@@ -284,7 +284,7 @@
 
     aput-object p1, p0, v1
 
-    const-string v1, "workspec://%s"
+    const-string/jumbo v1, "workspec://%s"
 
     invoke-static {v1, p0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali
index 37597233b6..5221bd4daf 100644
--- a/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/model/SystemIdInfoDao_Impl.smali
@@ -83,7 +83,7 @@
     move-result-object p1
 
     :try_start_0
-    const-string v1, "work_spec_id"
+    const-string/jumbo v1, "work_spec_id"
 
     invoke-static {p1, v1}, Landroidx/room/util/CursorUtil;->getColumnIndexOrThrow(Landroid/database/Cursor;Ljava/lang/String;)I
 
diff --git a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali
index 1cc873d72e..f2b729c7ae 100644
--- a/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali
+++ b/com.discord/smali/androidx/work/impl/model/WorkSpecDao_Impl.smali
@@ -257,7 +257,7 @@
     move-result-object v0
 
     :try_start_0
-    const-string v1, "work_spec_id"
+    const-string/jumbo v1, "work_spec_id"
 
     invoke-static {v0, v1}, Landroidx/room/util/CursorUtil;->getColumnIndex(Landroid/database/Cursor;Ljava/lang/String;)I
 
@@ -483,7 +483,7 @@
     move-result-object v0
 
     :try_start_0
-    const-string v1, "work_spec_id"
+    const-string/jumbo v1, "work_spec_id"
 
     invoke-static {v0, v1}, Landroidx/room/util/CursorUtil;->getColumnIndex(Landroid/database/Cursor;Ljava/lang/String;)I
 
@@ -887,7 +887,7 @@
 
     move-result v14
 
-    const-string v15, "worker_class_name"
+    const-string/jumbo v15, "worker_class_name"
 
     invoke-static {v5, v15}, Landroidx/room/util/CursorUtil;->getColumnIndexOrThrow(Landroid/database/Cursor;Ljava/lang/String;)I
 
@@ -1544,7 +1544,7 @@
 
     move-result v13
 
-    const-string v14, "worker_class_name"
+    const-string/jumbo v14, "worker_class_name"
 
     invoke-static {v4, v14}, Landroidx/room/util/CursorUtil;->getColumnIndexOrThrow(Landroid/database/Cursor;Ljava/lang/String;)I
 
@@ -2111,7 +2111,7 @@
 
     move-result v13
 
-    const-string v14, "worker_class_name"
+    const-string/jumbo v14, "worker_class_name"
 
     invoke-static {v4, v14}, Landroidx/room/util/CursorUtil;->getColumnIndexOrThrow(Landroid/database/Cursor;Ljava/lang/String;)I
 
@@ -2929,7 +2929,7 @@
 
     move-result v15
 
-    const-string v3, "worker_class_name"
+    const-string/jumbo v3, "worker_class_name"
 
     invoke-static {v6, v3}, Landroidx/room/util/CursorUtil;->getColumnIndexOrThrow(Landroid/database/Cursor;Ljava/lang/String;)I
 
@@ -3597,7 +3597,7 @@
 
     move-result v14
 
-    const-string v15, "worker_class_name"
+    const-string/jumbo v15, "worker_class_name"
 
     invoke-static {v5, v15}, Landroidx/room/util/CursorUtil;->getColumnIndexOrThrow(Landroid/database/Cursor;Ljava/lang/String;)I
 
@@ -5414,7 +5414,7 @@
 
     const-string v3, "WorkProgress"
 
-    const-string v4, "workspec"
+    const-string/jumbo v4, "workspec"
 
     filled-new-array {v2, v3, v4}, [Ljava/lang/String;
 
@@ -5473,9 +5473,9 @@
 
     const-string v3, "WorkProgress"
 
-    const-string v4, "workspec"
+    const-string/jumbo v4, "workspec"
 
-    const-string v5, "workname"
+    const-string/jumbo v5, "workname"
 
     filled-new-array {v2, v3, v4, v5}, [Ljava/lang/String;
 
@@ -5534,9 +5534,9 @@
 
     const-string v3, "WorkProgress"
 
-    const-string v4, "workspec"
+    const-string/jumbo v4, "workspec"
 
-    const-string v5, "worktag"
+    const-string/jumbo v5, "worktag"
 
     filled-new-array {v2, v3, v4, v5}, [Ljava/lang/String;
 
diff --git a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali
index 006e6014d8..e7205ef8e1 100644
--- a/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali
+++ b/com.discord/smali/androidx/work/impl/utils/futures/AbstractFuture.smali
@@ -118,7 +118,7 @@
 
     const-class v2, Landroidx/work/impl/utils/futures/AbstractFuture;
 
-    const-string v5, "waiters"
+    const-string/jumbo v5, "waiters"
 
     invoke-static {v2, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
@@ -138,7 +138,7 @@
 
     const-class v2, Ljava/lang/Object;
 
-    const-string v7, "value"
+    const-string/jumbo v7, "value"
 
     invoke-static {v0, v2, v7}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
diff --git a/com.discord/smali/androidx/work/ktx/R$attr.smali b/com.discord/smali/androidx/work/ktx/R$attr.smali
index 749005c612..18eaab6f7f 100644
--- a/com.discord/smali/androidx/work/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/work/ktx/R$attr.smali
@@ -36,7 +36,7 @@
 
 .field public static final fontWeight:I = 0x7f04024d
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$drawable.smali b/com.discord/smali/androidx/work/ktx/R$drawable.smali
index 62622caee4..a996d4a77e 100644
--- a/com.discord/smali/androidx/work/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$id.smali b/com.discord/smali/androidx/work/ktx/R$id.smali
index cd86de95e1..dfed8a541d 100644
--- a/com.discord/smali/androidx/work/ktx/R$id.smali
+++ b/com.discord/smali/androidx/work/ktx/R$id.smali
@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali
index 70b52c5692..195bcae56c 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 = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$style.smali b/com.discord/smali/androidx/work/ktx/R$style.smali
index ae69fc31b2..4c59e17492 100644
--- a/com.discord/smali/androidx/work/ktx/R$style.smali
+++ b/com.discord/smali/androidx/work/ktx/R$style.smali
@@ -24,9 +24,9 @@
 
 .field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13022f
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
 
 # 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 2dc85f1ba7..52b6385ed7 100644
--- a/com.discord/smali/androidx/work/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$styleable.smali
@@ -167,7 +167,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/b0.smali b/com.discord/smali/b0.smali
index 1eb4d21705..3e55247d6b 100644
--- a/com.discord/smali/b0.smali
+++ b/com.discord/smali/b0.smali
@@ -1,5 +1,5 @@
 .class public final Lb0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetRemoteAuthViewModel.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -18,19 +18,29 @@
 .end annotation
 
 
-# instance fields
-.field public final synthetic this$0:LWidgetRemoteAuthViewModel;
+# static fields
+.field public static final d:Lb0;
 
 
 # direct methods
-.method public constructor <init>(LWidgetRemoteAuthViewModel;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lb0;->this$0:LWidgetRemoteAuthViewModel;
+    new-instance v0, Lb0;
 
-    const/4 p1, 0x1
+    invoke-direct {v0}, Lb0;-><init>()V
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    sput-object v0, Lb0;->d:Lb0;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -38,16 +48,10 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    .locals 0
 
     check-cast p1, Ljava/lang/Void;
 
-    iget-object p1, p0, Lb0;->this$0:LWidgetRemoteAuthViewModel;
-
-    sget-object v0, LWidgetRemoteAuthViewModel$ViewState$d;->a:LWidgetRemoteAuthViewModel$ViewState$d;
-
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
-
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
diff --git a/com.discord/smali/c0.smali b/com.discord/smali/c0.smali
index 9dafccf4f7..56b4fc2733 100644
--- a/com.discord/smali/c0.smali
+++ b/com.discord/smali/c0.smali
@@ -1,5 +1,5 @@
 .class public final Lc0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetRemoteAuthViewModel.kt"
 
 # interfaces
@@ -9,9 +9,9 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/utilities/error/Error;",
+        "Ljava/lang/Void;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -40,26 +40,15 @@
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    check-cast p1, Lcom/discord/utilities/error/Error;
-
-    if-eqz p1, :cond_0
+    check-cast p1, Ljava/lang/Void;
 
     iget-object p1, p0, Lc0;->this$0:LWidgetRemoteAuthViewModel;
 
-    sget-object v0, LWidgetRemoteAuthViewModel$ViewState$a;->a:LWidgetRemoteAuthViewModel$ViewState$a;
+    sget-object v0, LWidgetRemoteAuthViewModel$ViewState$d;->a:LWidgetRemoteAuthViewModel$ViewState$d;
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/co/discord/media_engine/AudioDecoder.smali b/com.discord/smali/co/discord/media_engine/AudioDecoder.smali
index 2facadf634..afa6637946 100644
--- a/com.discord/smali/co/discord/media_engine/AudioDecoder.smali
+++ b/com.discord/smali/co/discord/media_engine/AudioDecoder.smali
@@ -43,11 +43,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_2
+    const-string v0, "params"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -114,20 +116,6 @@
     invoke-direct {p1, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_2
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/AudioDecoder;ILjava/lang/String;IILjava/util/Map;ILjava/lang/Object;)Lco/discord/media_engine/AudioDecoder;
@@ -261,11 +249,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/AudioDecoder;
 
@@ -284,20 +274,6 @@
     invoke-direct/range {v1 .. v6}, Lco/discord/media_engine/AudioDecoder;-><init>(ILjava/lang/String;IILjava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -335,7 +311,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/AudioDecoder;->name:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -377,7 +353,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/AudioDecoder;->params:Ljava/util/Map;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/AudioEncoder.smali b/com.discord/smali/co/discord/media_engine/AudioEncoder.smali
index fb68c88b69..999713a392 100644
--- a/com.discord/smali/co/discord/media_engine/AudioEncoder.smali
+++ b/com.discord/smali/co/discord/media_engine/AudioEncoder.smali
@@ -19,9 +19,11 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;IIII)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,15 +40,6 @@
     iput p6, p0, Lco/discord/media_engine/AudioEncoder;->rate:I
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/AudioEncoder;ILjava/lang/String;IIIIILjava/lang/Object;)Lco/discord/media_engine/AudioEncoder;
@@ -178,36 +171,29 @@
 .method public final copy(ILjava/lang/String;IIII)Lco/discord/media_engine/AudioEncoder;
     .locals 8
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
 
-    new-instance v7, Lco/discord/media_engine/AudioEncoder;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lco/discord/media_engine/AudioEncoder;
 
-    move v1, p1
+    move-object v1, v0
 
-    move-object v2, p2
+    move v2, p1
 
-    move v3, p3
+    move-object v3, p2
 
-    move v4, p4
+    move v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    move v6, p6
+    move v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lco/discord/media_engine/AudioEncoder;-><init>(ILjava/lang/String;IIII)V
+    move v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lco/discord/media_engine/AudioEncoder;-><init>(ILjava/lang/String;IIII)V
 
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -245,7 +231,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/AudioEncoder;->name:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali b/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali
index 9f9c053242..b65fb060eb 100644
--- a/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali
+++ b/com.discord/smali/co/discord/media_engine/AudioInputDeviceDescription.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guid"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,20 +28,6 @@
     iput-object p2, p0, Lco/discord/media_engine/AudioInputDeviceDescription;->guid:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guid"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/AudioInputDeviceDescription;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lco/discord/media_engine/AudioInputDeviceDescription;
@@ -87,31 +75,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lco/discord/media_engine/AudioInputDeviceDescription;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guid"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/AudioInputDeviceDescription;
 
     invoke-direct {v0, p1, p2}, Lco/discord/media_engine/AudioInputDeviceDescription;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guid"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -129,7 +105,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/AudioInputDeviceDescription;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -139,7 +115,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/AudioInputDeviceDescription;->guid:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali b/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali
index 0135943120..cf9ca6ff96 100644
--- a/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali
+++ b/com.discord/smali/co/discord/media_engine/AudioOutputDeviceDescription.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guid"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,20 +28,6 @@
     iput-object p2, p0, Lco/discord/media_engine/AudioOutputDeviceDescription;->guid:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guid"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/AudioOutputDeviceDescription;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lco/discord/media_engine/AudioOutputDeviceDescription;
@@ -87,31 +75,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lco/discord/media_engine/AudioOutputDeviceDescription;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guid"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/AudioOutputDeviceDescription;
 
     invoke-direct {v0, p1, p2}, Lco/discord/media_engine/AudioOutputDeviceDescription;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guid"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -129,7 +105,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/AudioOutputDeviceDescription;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -139,7 +115,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/AudioOutputDeviceDescription;->guid:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/Connection$GetStatsCallbackNative.smali b/com.discord/smali/co/discord/media_engine/Connection$GetStatsCallbackNative.smali
index 61dcc606e1..4ae3c7f011 100644
--- a/com.discord/smali/co/discord/media_engine/Connection$GetStatsCallbackNative.smali
+++ b/com.discord/smali/co/discord/media_engine/Connection$GetStatsCallbackNative.smali
@@ -20,24 +20,17 @@
 
 # direct methods
 .method public constructor <init>(Lco/discord/media_engine/Connection$GetStatsCallback;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lco/discord/media_engine/Connection$GetStatsCallbackNative;->callback:Lco/discord/media_engine/Connection$GetStatsCallback;
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -53,7 +46,9 @@
 .method public final onStats(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "stats"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     iget-object v0, p0, Lco/discord/media_engine/Connection$GetStatsCallbackNative;->callback:Lco/discord/media_engine/Connection$GetStatsCallback;
@@ -77,13 +72,4 @@
 
     :goto_0
     return-void
-
-    :cond_0
-    const-string p1, "stats"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/co/discord/media_engine/Connection.smali b/com.discord/smali/co/discord/media_engine/Connection.smali
index dfb286ab50..a6e794d7cc 100644
--- a/com.discord/smali/co/discord/media_engine/Connection.smali
+++ b/com.discord/smali/co/discord/media_engine/Connection.smali
@@ -70,7 +70,9 @@
 .method public final getStats(Lco/discord/media_engine/Connection$GetStatsCallback;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/Connection$GetStatsCallbackNative;
 
@@ -81,21 +83,14 @@
     invoke-direct {p0, v0, p1}, Lco/discord/media_engine/Connection;->getStatsNative(Lco/discord/media_engine/Connection$GetStatsCallbackNative;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getStats(Lco/discord/media_engine/Connection$GetStatsCallback;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/Connection$GetStatsCallbackNative;
 
@@ -104,15 +99,6 @@
     invoke-direct {p0, v0, p2}, Lco/discord/media_engine/Connection;->getStatsNative(Lco/discord/media_engine/Connection$GetStatsCallbackNative;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final native muteLocalUser(Z)V
@@ -149,22 +135,15 @@
 .end method
 
 .method public final setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lco/discord/media_engine/Connection;->userSpeakingStatusChangedCallback:Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final native setVADAutoThreshold(I)V
diff --git a/com.discord/smali/co/discord/media_engine/EncryptionSettings.smali b/com.discord/smali/co/discord/media_engine/EncryptionSettings.smali
index 5301b19cbe..7def36a3ba 100644
--- a/com.discord/smali/co/discord/media_engine/EncryptionSettings.smali
+++ b/com.discord/smali/co/discord/media_engine/EncryptionSettings.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Ljava/lang/String;[I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "mode"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "secretKey"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,20 +28,6 @@
     iput-object p2, p0, Lco/discord/media_engine/EncryptionSettings;->secretKey:[I
 
     return-void
-
-    :cond_0
-    const-string p1, "secretKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/EncryptionSettings;Ljava/lang/String;[IILjava/lang/Object;)Lco/discord/media_engine/EncryptionSettings;
@@ -87,31 +75,19 @@
 .method public final copy(Ljava/lang/String;[I)Lco/discord/media_engine/EncryptionSettings;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "mode"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "secretKey"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/EncryptionSettings;
 
     invoke-direct {v0, p1, p2}, Lco/discord/media_engine/EncryptionSettings;-><init>(Ljava/lang/String;[I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "secretKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -129,7 +105,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/EncryptionSettings;->mode:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -139,7 +115,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/EncryptionSettings;->secretKey:[I
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/InboundAudio.smali b/com.discord/smali/co/discord/media_engine/InboundAudio.smali
index 530cebe9cb..9d4df132df 100644
--- a/com.discord/smali/co/discord/media_engine/InboundAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/InboundAudio.smali
@@ -25,13 +25,17 @@
 .method public constructor <init>(IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "mosBuckets"
 
-    if-eqz p8, :cond_2
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_1
+    const-string v0, "bufferStats"
 
-    if-eqz p10, :cond_0
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "frameOpStats"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,27 +56,6 @@
     iput-object p10, p0, Lco/discord/media_engine/InboundAudio;->frameOpStats:Lco/discord/media_engine/InboundFrameOpStats;
 
     return-void
-
-    :cond_0
-    const-string p1, "frameOpStats"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "bufferStats"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "mosBuckets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/InboundAudio;IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;ILjava/lang/Object;)Lco/discord/media_engine/InboundAudio;
@@ -270,13 +253,23 @@
 .method public final copy(IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;)Lco/discord/media_engine/InboundAudio;
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "mosBuckets"
 
-    if-eqz p8, :cond_2
+    move-object/from16 v9, p8
 
-    if-eqz p9, :cond_1
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_0
+    const-string v0, "bufferStats"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "frameOpStats"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/InboundAudio;
 
@@ -292,36 +285,9 @@
 
     move/from16 v8, p7
 
-    move-object/from16 v9, p8
-
-    move-object/from16 v10, p9
-
-    move-object/from16 v11, p10
-
     invoke-direct/range {v1 .. v11}, Lco/discord/media_engine/InboundAudio;-><init>(IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "frameOpStats"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "bufferStats"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "mosBuckets"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -411,7 +377,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundAudio;->mosBuckets:[Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -421,7 +387,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundAudio;->bufferStats:Lco/discord/media_engine/InboundBufferStats;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -431,7 +397,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/InboundAudio;->frameOpStats:Lco/discord/media_engine/InboundFrameOpStats;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/InboundBufferStats.smali b/com.discord/smali/co/discord/media_engine/InboundBufferStats.smali
index f6d03686a3..f5142d4d3b 100644
--- a/com.discord/smali/co/discord/media_engine/InboundBufferStats.smali
+++ b/com.discord/smali/co/discord/media_engine/InboundBufferStats.smali
@@ -178,7 +178,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundBufferStats;->audioJitterBuffer:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -188,7 +188,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundBufferStats;->audioJitterTarget:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -198,7 +198,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundBufferStats;->audioJitterDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -208,7 +208,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundBufferStats;->relativeReceptionDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -218,7 +218,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/InboundBufferStats;->relativePlayoutDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/InboundFrameOpStats.smali b/com.discord/smali/co/discord/media_engine/InboundFrameOpStats.smali
index f8a553d05c..d28ba39786 100644
--- a/com.discord/smali/co/discord/media_engine/InboundFrameOpStats.smali
+++ b/com.discord/smali/co/discord/media_engine/InboundFrameOpStats.smali
@@ -228,7 +228,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundFrameOpStats;->silent:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -238,7 +238,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundFrameOpStats;->normal:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -248,7 +248,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundFrameOpStats;->merged:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -258,7 +258,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundFrameOpStats;->expanded:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -268,7 +268,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundFrameOpStats;->accelerated:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -278,7 +278,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/InboundFrameOpStats;->preemptiveExpanded:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -288,7 +288,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/InboundFrameOpStats;->cng:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali b/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali
index 5c988febab..6c0cc65cda 100644
--- a/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/InboundRtpAudio.smali
@@ -77,11 +77,13 @@
 
     move-object v2, p3
 
-    const/4 v3, 0x0
+    const-string v3, "type"
 
-    if-eqz v1, :cond_1
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_0
+    const-string v3, "codec"
+
+    invoke-static {p3, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -206,20 +208,6 @@
     iput-object v1, v0, Lco/discord/media_engine/InboundRtpAudio;->relativePlayoutDelay:Lco/discord/media_engine/PlayoutMetric;
 
     return-void
-
-    :cond_0
-    const-string v1, "codec"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_1
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/InboundRtpAudio;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZIIIIIIIIILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;ILjava/lang/Object;)Lco/discord/media_engine/InboundRtpAudio;
@@ -953,97 +941,91 @@
 .end method
 
 .method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZIIIIIIIIILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)Lco/discord/media_engine/InboundRtpAudio;
-    .locals 34
+    .locals 35
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_1
+    move/from16 v2, p2
 
-    if-eqz p3, :cond_0
+    move-object/from16 v3, p3
 
-    new-instance v0, Lco/discord/media_engine/InboundRtpAudio;
+    move-wide/from16 v4, p4
 
-    move-object v1, v0
+    move/from16 v6, p6
 
-    move-object/from16 v2, p1
+    move/from16 v7, p7
 
-    move/from16 v3, p2
+    move/from16 v8, p8
 
-    move-object/from16 v4, p3
+    move/from16 v9, p9
 
-    move-wide/from16 v5, p4
+    move/from16 v10, p10
 
-    move/from16 v7, p6
+    move/from16 v11, p11
 
-    move/from16 v8, p7
+    move/from16 v12, p12
 
-    move/from16 v9, p8
+    move/from16 v13, p13
 
-    move/from16 v10, p9
+    move/from16 v14, p14
 
-    move/from16 v11, p10
+    move/from16 v15, p15
 
-    move/from16 v12, p11
+    move/from16 v16, p16
 
-    move/from16 v13, p12
+    move/from16 v17, p17
 
-    move/from16 v14, p13
+    move/from16 v18, p18
 
-    move/from16 v15, p14
+    move/from16 v19, p19
 
-    move/from16 v16, p15
+    move-object/from16 v20, p20
 
-    move/from16 v17, p16
+    move-object/from16 v21, p21
 
-    move/from16 v18, p17
+    move-object/from16 v22, p22
 
-    move/from16 v19, p18
+    move-object/from16 v23, p23
 
-    move/from16 v20, p19
+    move-object/from16 v24, p24
 
-    move-object/from16 v21, p20
+    move-object/from16 v25, p25
 
-    move-object/from16 v22, p21
+    move-object/from16 v26, p26
 
-    move-object/from16 v23, p22
+    move-object/from16 v27, p27
 
-    move-object/from16 v24, p23
+    move-object/from16 v28, p28
 
-    move-object/from16 v25, p24
+    move-object/from16 v29, p29
 
-    move-object/from16 v26, p25
+    move-object/from16 v30, p30
 
-    move-object/from16 v27, p26
+    move-object/from16 v31, p31
 
-    move-object/from16 v28, p27
+    move-object/from16 v32, p32
 
-    move-object/from16 v29, p28
+    const-string v0, "type"
 
-    move-object/from16 v30, p29
+    move-object/from16 v33, v1
 
-    move-object/from16 v31, p30
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v32, p31
+    const-string v0, "codec"
 
-    move-object/from16 v33, p32
+    move-object/from16 v1, p3
 
-    invoke-direct/range {v1 .. v33}, Lco/discord/media_engine/InboundRtpAudio;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZIIIIIIIIILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    new-instance v34, Lco/discord/media_engine/InboundRtpAudio;
 
-    :cond_0
-    const-string v1, "codec"
+    move-object/from16 v0, v34
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, v33
 
-    throw v0
+    invoke-direct/range {v0 .. v32}, Lco/discord/media_engine/InboundRtpAudio;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZIIIIIIIIILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)V
 
-    :cond_1
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v34
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -1065,7 +1047,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->type:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1091,7 +1073,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1331,7 +1313,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->opSilence:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1341,7 +1323,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->opNormal:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1351,7 +1333,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->opMerge:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1361,7 +1343,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->opExpand:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1371,7 +1353,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->opAccelerate:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1381,7 +1363,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->opPreemptiveExpand:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1391,7 +1373,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->opCNG:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1401,7 +1383,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->audioJitterBuffer:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1411,7 +1393,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->audioJitterDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1421,7 +1403,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->audioJitterTarget:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1431,7 +1413,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->audioPlayoutUnderruns:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1441,7 +1423,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpAudio;->relativeReceptionDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1451,7 +1433,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/InboundRtpAudio;->relativePlayoutDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali b/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali
index d2ad85f1f2..c56086d5c5 100644
--- a/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/InboundRtpVideo.smali
@@ -59,13 +59,17 @@
 
     move-object/from16 v3, p12
 
-    const/4 v4, 0x0
+    const-string v4, "type"
 
-    if-eqz v1, :cond_2
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_1
+    const-string v4, "resolution"
 
-    if-eqz v3, :cond_0
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "decoderImplementationName"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -148,27 +152,6 @@
     iput v1, v0, Lco/discord/media_engine/InboundRtpVideo;->qpSum:I
 
     return-void
-
-    :cond_0
-    const-string v1, "decoderImplementationName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1
-    const-string v1, "resolution"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_2
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/InboundRtpVideo;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIILco/discord/media_engine/Resolution;Ljava/lang/String;IIIIIIIIIIILjava/lang/Object;)Lco/discord/media_engine/InboundRtpVideo;
@@ -662,86 +645,77 @@
 .end method
 
 .method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIILco/discord/media_engine/Resolution;Ljava/lang/String;IIIIIIIIII)Lco/discord/media_engine/InboundRtpVideo;
-    .locals 24
+    .locals 25
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_2
+    move/from16 v2, p2
 
-    if-eqz p11, :cond_1
+    move-object/from16 v3, p3
 
-    if-eqz p12, :cond_0
+    move-wide/from16 v4, p4
 
-    new-instance v0, Lco/discord/media_engine/InboundRtpVideo;
+    move/from16 v6, p6
 
-    move-object v1, v0
+    move/from16 v7, p7
 
-    move-object/from16 v2, p1
+    move/from16 v8, p8
 
-    move/from16 v3, p2
+    move/from16 v9, p9
 
-    move-object/from16 v4, p3
+    move/from16 v10, p10
 
-    move-wide/from16 v5, p4
+    move-object/from16 v11, p11
 
-    move/from16 v7, p6
+    move-object/from16 v12, p12
 
-    move/from16 v8, p7
+    move/from16 v13, p13
 
-    move/from16 v9, p8
+    move/from16 v14, p14
 
-    move/from16 v10, p9
+    move/from16 v15, p15
 
-    move/from16 v11, p10
+    move/from16 v16, p16
 
-    move-object/from16 v12, p11
+    move/from16 v17, p17
 
-    move-object/from16 v13, p12
+    move/from16 v18, p18
 
-    move/from16 v14, p13
+    move/from16 v19, p19
 
-    move/from16 v15, p14
+    move/from16 v20, p20
 
-    move/from16 v16, p15
+    move/from16 v21, p21
 
-    move/from16 v17, p16
+    move/from16 v22, p22
 
-    move/from16 v18, p17
+    const-string v0, "type"
 
-    move/from16 v19, p18
+    move-object/from16 v23, v1
 
-    move/from16 v20, p19
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v21, p20
+    const-string v0, "resolution"
 
-    move/from16 v22, p21
+    move-object/from16 v1, p11
 
-    move/from16 v23, p22
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {v1 .. v23}, Lco/discord/media_engine/InboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIILco/discord/media_engine/Resolution;Ljava/lang/String;IIIIIIIIII)V
+    const-string v0, "decoderImplementationName"
 
-    return-object v0
+    move-object/from16 v1, p12
 
-    :cond_0
-    const-string v1, "decoderImplementationName"
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    new-instance v24, Lco/discord/media_engine/InboundRtpVideo;
 
-    throw v0
+    move-object/from16 v0, v24
 
-    :cond_1
-    const-string v1, "resolution"
+    move-object/from16 v1, v23
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct/range {v0 .. v22}, Lco/discord/media_engine/InboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIILco/discord/media_engine/Resolution;Ljava/lang/String;IIIIIIIIII)V
 
-    throw v0
-
-    :cond_2
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v24
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -763,7 +737,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpVideo;->type:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -789,7 +763,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpVideo;->codec:Lco/discord/media_engine/StatsCodec;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -891,7 +865,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpVideo;->resolution:Lco/discord/media_engine/Resolution;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -901,7 +875,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/InboundRtpVideo;->decoderImplementationName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali b/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
index 99b3142731..25eac0d5cd 100644
--- a/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
@@ -41,11 +41,13 @@
 
     move-object v2, p3
 
-    const/4 v3, 0x0
+    const-string v3, "type"
 
-    if-eqz v1, :cond_1
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_0
+    const-string v3, "codec"
+
+    invoke-static {p3, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -98,20 +100,6 @@
     iput-wide v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
 
     return-void
-
-    :cond_0
-    const-string v1, "codec"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_1
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/OutboundRtpAudio;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJILjava/lang/Object;)Lco/discord/media_engine/OutboundRtpAudio;
@@ -417,61 +405,55 @@
 .end method
 
 .method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)Lco/discord/media_engine/OutboundRtpAudio;
-    .locals 20
+    .locals 21
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_1
+    move/from16 v2, p2
 
-    if-eqz p3, :cond_0
+    move-object/from16 v3, p3
 
-    new-instance v0, Lco/discord/media_engine/OutboundRtpAudio;
+    move-wide/from16 v4, p4
 
-    move-object v1, v0
+    move/from16 v6, p6
 
-    move-object/from16 v2, p1
+    move/from16 v7, p7
 
-    move/from16 v3, p2
+    move/from16 v8, p8
 
-    move-object/from16 v4, p3
+    move/from16 v9, p9
 
-    move-wide/from16 v5, p4
+    move/from16 v10, p10
 
-    move/from16 v7, p6
+    move-wide/from16 v11, p11
 
-    move/from16 v8, p7
+    move-wide/from16 v13, p13
 
-    move/from16 v9, p8
+    move-wide/from16 v15, p15
 
-    move/from16 v10, p9
+    move-wide/from16 v17, p17
 
-    move/from16 v11, p10
+    const-string v0, "type"
 
-    move-wide/from16 v12, p11
+    move-object/from16 v19, v1
 
-    move-wide/from16 v14, p13
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide/from16 v16, p15
+    const-string v0, "codec"
 
-    move-wide/from16 v18, p17
+    move-object/from16 v1, p3
 
-    invoke-direct/range {v1 .. v19}, Lco/discord/media_engine/OutboundRtpAudio;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    new-instance v20, Lco/discord/media_engine/OutboundRtpAudio;
 
-    :cond_0
-    const-string v1, "codec"
+    move-object/from16 v0, v20
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, v19
 
-    throw v0
+    invoke-direct/range {v0 .. v18}, Lco/discord/media_engine/OutboundRtpAudio;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)V
 
-    :cond_1
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v20
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -493,7 +475,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/OutboundRtpAudio;->type:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -519,7 +501,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/OutboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali b/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali
index dea684bd23..2649ba7168 100644
--- a/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/OutboundRtpVideo.smali
@@ -65,15 +65,21 @@
 
     move-object/from16 v4, p14
 
-    const/4 v5, 0x0
+    const-string v5, "type"
 
-    if-eqz v1, :cond_3
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_2
+    const-string v5, "codec"
 
-    if-eqz v3, :cond_1
+    invoke-static {p3, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_0
+    const-string v5, "encoderImplementationName"
+
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "resolution"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -162,34 +168,6 @@
     iput-boolean v1, v0, Lco/discord/media_engine/OutboundRtpVideo;->cpuLimitedResolution:Z
 
     return-void
-
-    :cond_0
-    const-string v1, "resolution"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_1
-    const-string v1, "encoderImplementationName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_2
-    const-string v1, "codec"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_3
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/OutboundRtpVideo;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIIILjava/lang/String;ILco/discord/media_engine/Resolution;IIIIIIIIZZILjava/lang/Object;)Lco/discord/media_engine/OutboundRtpVideo;
@@ -731,99 +709,87 @@
 .end method
 
 .method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIIILjava/lang/String;ILco/discord/media_engine/Resolution;IIIIIIIIZZ)Lco/discord/media_engine/OutboundRtpVideo;
-    .locals 26
+    .locals 27
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_3
+    move/from16 v2, p2
 
-    if-eqz p3, :cond_2
+    move-object/from16 v3, p3
 
-    if-eqz p12, :cond_1
+    move-wide/from16 v4, p4
 
-    if-eqz p14, :cond_0
+    move/from16 v6, p6
 
-    new-instance v0, Lco/discord/media_engine/OutboundRtpVideo;
+    move/from16 v7, p7
 
-    move-object v1, v0
+    move/from16 v8, p8
 
-    move-object/from16 v2, p1
+    move/from16 v9, p9
 
-    move/from16 v3, p2
+    move/from16 v10, p10
 
-    move-object/from16 v4, p3
+    move/from16 v11, p11
 
-    move-wide/from16 v5, p4
+    move-object/from16 v12, p12
 
-    move/from16 v7, p6
+    move/from16 v13, p13
 
-    move/from16 v8, p7
+    move-object/from16 v14, p14
 
-    move/from16 v9, p8
+    move/from16 v15, p15
 
-    move/from16 v10, p9
+    move/from16 v16, p16
 
-    move/from16 v11, p10
+    move/from16 v17, p17
 
-    move/from16 v12, p11
+    move/from16 v18, p18
 
-    move-object/from16 v13, p12
+    move/from16 v19, p19
 
-    move/from16 v14, p13
+    move/from16 v20, p20
 
-    move-object/from16 v15, p14
+    move/from16 v21, p21
 
-    move/from16 v16, p15
+    move/from16 v22, p22
 
-    move/from16 v17, p16
+    move/from16 v23, p23
 
-    move/from16 v18, p17
+    move/from16 v24, p24
 
-    move/from16 v19, p18
+    const-string v0, "type"
 
-    move/from16 v20, p19
+    move-object/from16 v25, v1
 
-    move/from16 v21, p20
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v22, p21
+    const-string v0, "codec"
 
-    move/from16 v23, p22
+    move-object/from16 v1, p3
 
-    move/from16 v24, p23
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v25, p24
+    const-string v0, "encoderImplementationName"
 
-    invoke-direct/range {v1 .. v25}, Lco/discord/media_engine/OutboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIIILjava/lang/String;ILco/discord/media_engine/Resolution;IIIIIIIIZZ)V
+    move-object/from16 v1, p12
 
-    return-object v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_0
-    const-string v1, "resolution"
+    const-string v0, "resolution"
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, p14
 
-    throw v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_1
-    const-string v1, "encoderImplementationName"
+    new-instance v26, Lco/discord/media_engine/OutboundRtpVideo;
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v0, v26
 
-    throw v0
+    move-object/from16 v1, v25
 
-    :cond_2
-    const-string v1, "codec"
+    invoke-direct/range {v0 .. v24}, Lco/discord/media_engine/OutboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIIILjava/lang/String;ILco/discord/media_engine/Resolution;IIIIIIIIZZ)V
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v26
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -845,7 +811,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/OutboundRtpVideo;->type:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -871,7 +837,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/OutboundRtpVideo;->codec:Lco/discord/media_engine/StatsCodec;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -989,7 +955,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/OutboundRtpVideo;->encoderImplementationName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1015,7 +981,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/OutboundRtpVideo;->resolution:Lco/discord/media_engine/Resolution;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/RtcRegion.smali b/com.discord/smali/co/discord/media_engine/RtcRegion.smali
new file mode 100644
index 0000000000..921dd654eb
--- /dev/null
+++ b/com.discord/smali/co/discord/media_engine/RtcRegion.smali
@@ -0,0 +1,219 @@
+.class public final Lco/discord/media_engine/RtcRegion;
+.super Ljava/lang/Object;
+.source "RtcRegion.kt"
+
+
+# instance fields
+.field public final ips:[Ljava/lang/String;
+
+.field public final region:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;[Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "region"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ips"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    iput-object p2, p0, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lco/discord/media_engine/RtcRegion;Ljava/lang/String;[Ljava/lang/String;ILjava/lang/Object;)Lco/discord/media_engine/RtcRegion;
+    .locals 0
+
+    and-int/lit8 p4, p3, 0x1
+
+    if-eqz p4, :cond_0
+
+    iget-object p1, p0, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    iget-object p2, p0, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    :cond_1
+    invoke-virtual {p0, p1, p2}, Lco/discord/media_engine/RtcRegion;->copy(Ljava/lang/String;[Ljava/lang/String;)Lco/discord/media_engine/RtcRegion;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()[Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;[Ljava/lang/String;)Lco/discord/media_engine/RtcRegion;
+    .locals 1
+
+    const-string v0, "region"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ips"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lco/discord/media_engine/RtcRegion;
+
+    invoke-direct {v0, p1, p2}, Lco/discord/media_engine/RtcRegion;-><init>(Ljava/lang/String;[Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lco/discord/media_engine/RtcRegion;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lco/discord/media_engine/RtcRegion;
+
+    iget-object v0, p0, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    iget-object v1, p1, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    iget-object p1, p1, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getIps()[Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getRegion()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    if-eqz v2, :cond_1
+
+    invoke-static {v2}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
+
+    move-result v1
+
+    :cond_1
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "RtcRegion(region="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lco/discord/media_engine/RtcRegion;->region:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", ips="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lco/discord/media_engine/RtcRegion;->ips:[Ljava/lang/String;
+
+    invoke-static {v1}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, ")"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/co/discord/media_engine/Stats.smali b/com.discord/smali/co/discord/media_engine/Stats.smali
index 72d6619047..04181f2ef5 100644
--- a/com.discord/smali/co/discord/media_engine/Stats.smali
+++ b/com.discord/smali/co/discord/media_engine/Stats.smali
@@ -53,11 +53,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "inboundRtpAudio"
 
-    if-eqz p4, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "inboundRtpVideo"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -72,20 +74,6 @@
     iput-object p5, p0, Lco/discord/media_engine/Stats;->inboundRtpVideo:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "inboundRtpVideo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inboundRtpAudio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/Stats;Lco/discord/media_engine/Transport;Lco/discord/media_engine/OutboundRtpAudio;Lco/discord/media_engine/OutboundRtpVideo;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lco/discord/media_engine/Stats;
@@ -233,11 +221,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "inboundRtpAudio"
 
-    if-eqz p4, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "inboundRtpVideo"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/Stats;
 
@@ -256,20 +246,6 @@
     invoke-direct/range {v1 .. v6}, Lco/discord/media_engine/Stats;-><init>(Lco/discord/media_engine/Transport;Lco/discord/media_engine/OutboundRtpAudio;Lco/discord/media_engine/OutboundRtpVideo;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "inboundRtpVideo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inboundRtpAudio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -287,7 +263,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/Stats;->transport:Lco/discord/media_engine/Transport;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -297,7 +273,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/Stats;->outboundRtpAudio:Lco/discord/media_engine/OutboundRtpAudio;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -307,7 +283,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/Stats;->outboundRtpVideo:Lco/discord/media_engine/OutboundRtpVideo;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -317,7 +293,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/Stats;->inboundRtpAudio:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -327,7 +303,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/Stats;->inboundRtpVideo:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/StatsCodec.smali b/com.discord/smali/co/discord/media_engine/StatsCodec.smali
index 511d3cc032..2dd6a8b31f 100644
--- a/com.discord/smali/co/discord/media_engine/StatsCodec.smali
+++ b/com.discord/smali/co/discord/media_engine/StatsCodec.smali
@@ -11,9 +11,11 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,15 +24,6 @@
     iput-object p2, p0, Lco/discord/media_engine/StatsCodec;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/StatsCodec;ILjava/lang/String;ILjava/lang/Object;)Lco/discord/media_engine/StatsCodec;
@@ -78,22 +71,15 @@
 .method public final copy(ILjava/lang/String;)Lco/discord/media_engine/StatsCodec;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/StatsCodec;
 
     invoke-direct {v0, p1, p2}, Lco/discord/media_engine/StatsCodec;-><init>(ILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -131,7 +117,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/StatsCodec;->name:Ljava/lang/String;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/Transport.smali b/com.discord/smali/co/discord/media_engine/Transport.smali
index 42d9c0a05a..2c5f11a22e 100644
--- a/com.discord/smali/co/discord/media_engine/Transport.smali
+++ b/com.discord/smali/co/discord/media_engine/Transport.smali
@@ -295,7 +295,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/Transport;->decryptionFailures:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -305,7 +305,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/Transport;->localAddress:Ljava/lang/String;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/VideoDecoder.smali b/com.discord/smali/co/discord/media_engine/VideoDecoder.smali
index 27bf26c97f..d5c05503e0 100644
--- a/com.discord/smali/co/discord/media_engine/VideoDecoder.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoDecoder.smali
@@ -41,11 +41,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "params"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -110,20 +112,6 @@
     invoke-direct {p1, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_2
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/VideoDecoder;Ljava/lang/String;IILjava/util/Map;ILjava/lang/Object;)Lco/discord/media_engine/VideoDecoder;
@@ -222,31 +210,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/VideoDecoder;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lco/discord/media_engine/VideoDecoder;-><init>(Ljava/lang/String;IILjava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -268,7 +244,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/VideoDecoder;->name:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -310,7 +286,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/VideoDecoder;->params:Ljava/util/Map;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/VideoEncoder.smali b/com.discord/smali/co/discord/media_engine/VideoEncoder.smali
index 542a9a5ecc..c3d8672066 100644
--- a/com.discord/smali/co/discord/media_engine/VideoEncoder.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoEncoder.smali
@@ -41,11 +41,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "params"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -110,20 +112,6 @@
     invoke-direct {p1, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_2
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/VideoEncoder;Ljava/lang/String;IILjava/util/Map;ILjava/lang/Object;)Lco/discord/media_engine/VideoEncoder;
@@ -222,31 +210,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/VideoEncoder;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lco/discord/media_engine/VideoEncoder;-><init>(Ljava/lang/String;IILjava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -268,7 +244,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/VideoEncoder;->name:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -310,7 +286,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/VideoEncoder;->params:Ljava/util/Map;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali b/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali
index 829ee40084..9b62cb2672 100644
--- a/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoInputDeviceDescription.smali
@@ -15,13 +15,17 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Lco/discord/media_engine/VideoInputDeviceFacing;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "guid"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "facing"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -32,27 +36,6 @@
     iput-object p3, p0, Lco/discord/media_engine/VideoInputDeviceDescription;->facing:Lco/discord/media_engine/VideoInputDeviceFacing;
 
     return-void
-
-    :cond_0
-    const-string p1, "facing"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guid"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Ljava/lang/String;Lco/discord/media_engine/VideoInputDeviceFacing;ILjava/lang/Object;)Lco/discord/media_engine/VideoInputDeviceDescription;
@@ -115,40 +98,23 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;Lco/discord/media_engine/VideoInputDeviceFacing;)Lco/discord/media_engine/VideoInputDeviceDescription;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "guid"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "facing"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/VideoInputDeviceDescription;
 
     invoke-direct {v0, p1, p2, p3}, Lco/discord/media_engine/VideoInputDeviceDescription;-><init>(Ljava/lang/String;Ljava/lang/String;Lco/discord/media_engine/VideoInputDeviceFacing;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "facing"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guid"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -166,7 +132,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/VideoInputDeviceDescription;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -176,7 +142,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/VideoInputDeviceDescription;->guid:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -186,7 +152,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/VideoInputDeviceDescription;->facing:Lco/discord/media_engine/VideoInputDeviceFacing;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali
index 4909591e1b..f20ab0f218 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "frame"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lco/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2;->$sinks:Ljava/util/Set;
 
@@ -48,7 +48,7 @@
     :try_start_0
     iget-object v1, p0, Lco/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2;->$sinks:Ljava/util/Set;
 
-    invoke-static {v1}, Lj0/i/l;->firstOrNull(Ljava/lang/Iterable;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->firstOrNull(Ljava/lang/Iterable;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -75,11 +75,4 @@
     monitor-exit v0
 
     throw p1
-
-    :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
index 3a96edafc1..017a635198 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
@@ -34,21 +34,19 @@
 
 # virtual methods
 .method public final addSink(Lcom/hammerandchisel/libdiscord/Discord;Lco/discord/media_engine/VideoStreamRenderer;Ljava/lang/String;)V
-    .locals 3
+    .locals 4
 
     const-string v0, "discord"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "sink"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "streamId"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lco/discord/media_engine/VideoStreamRenderer;->access$getStreams$cp()Ljava/util/Map;
 
@@ -95,15 +93,25 @@
     :cond_0
     const/4 v1, 0x1
 
-    new-array v1, v1, [Lco/discord/media_engine/VideoStreamRenderer;
+    new-array v2, v1, [Lco/discord/media_engine/VideoStreamRenderer;
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    aput-object p2, v1, v2
+    aput-object p2, v2, v3
 
-    invoke-static {v1}, Lf/n/a/k/a;->mutableSetOf([Ljava/lang/Object;)Ljava/util/Set;
+    const-string p2, "elements"
 
-    move-result-object p2
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Ljava/util/LinkedHashSet;
+
+    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v1
+
+    invoke-direct {p2, v1}, Ljava/util/LinkedHashSet;-><init>(I)V
+
+    invoke-static {v2, p2}, Lf/n/a/k/a;->toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
 
     new-instance v1, Lco/discord/media_engine/VideoStreamRenderer$Muxer$addSink$1$2;
 
@@ -132,39 +140,22 @@
     monitor-exit v0
 
     throw p1
-
-    :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final removeSink(Lcom/hammerandchisel/libdiscord/Discord;Lco/discord/media_engine/VideoStreamRenderer;Ljava/lang/String;)V
-    .locals 3
+    .locals 2
 
     const-string v0, "discord"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "sink"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "streamId"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lco/discord/media_engine/VideoStreamRenderer;->access$getStreams$cp()Ljava/util/Map;
 
@@ -177,30 +168,32 @@
 
     invoke-static {}, Lco/discord/media_engine/VideoStreamRenderer;->access$getStreams$cp()Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-interface {v2, p3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, p3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Ljava/util/Set;
+    check-cast v1, Ljava/util/Set;
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    monitor-enter v2
+    monitor-enter v1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-interface {v2, p2}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
+    invoke-interface {v1, p2}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    invoke-interface {v2}, Ljava/util/Set;->isEmpty()Z
+    invoke-interface {v1}, Ljava/util/Set;->isEmpty()Z
 
     move-result p2
 
     if-eqz p2, :cond_0
 
-    invoke-virtual {p1, p3, v1}, Lcom/hammerandchisel/libdiscord/Discord;->setVideoOutputSink(Ljava/lang/String;Lcom/hammerandchisel/libdiscord/Discord$VideoFrameCallback;)V
+    const/4 p2, 0x0
+
+    invoke-virtual {p1, p3, p2}, Lcom/hammerandchisel/libdiscord/Discord;->setVideoOutputSink(Ljava/lang/String;Lcom/hammerandchisel/libdiscord/Discord$VideoFrameCallback;)V
 
     invoke-static {}, Lco/discord/media_engine/VideoStreamRenderer;->access$Muxer()Lco/discord/media_engine/VideoStreamRenderer$Muxer;
 
@@ -214,14 +207,14 @@
 
     :cond_0
     :try_start_2
-    monitor-exit v2
+    monitor-exit v1
 
     goto :goto_0
 
     :catchall_0
     move-exception p1
 
-    monitor-exit v2
+    monitor-exit v1
 
     throw p1
     :try_end_2
@@ -239,19 +232,4 @@
     monitor-exit v0
 
     throw p1
-
-    :cond_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
diff --git a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali
index fe47dae19f..90a84cc613 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer.smali
@@ -56,9 +56,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lorg/webrtc/SurfaceViewRenderer;-><init>(Landroid/content/Context;)V
 
@@ -67,25 +69,18 @@
     iput-object p1, p0, Lco/discord/media_engine/VideoStreamRenderer;->streamIdentifier:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lorg/webrtc/SurfaceViewRenderer;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -94,20 +89,6 @@
     iput-object p1, p0, Lco/discord/media_engine/VideoStreamRenderer;->streamIdentifier:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$Muxer()Lco/discord/media_engine/VideoStreamRenderer$Muxer;
diff --git a/com.discord/smali/co/discord/media_engine/VoiceQuality.smali b/com.discord/smali/co/discord/media_engine/VoiceQuality.smali
index eee582d116..0ebd5716ae 100644
--- a/com.discord/smali/co/discord/media_engine/VoiceQuality.smali
+++ b/com.discord/smali/co/discord/media_engine/VoiceQuality.smali
@@ -63,31 +63,33 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "result"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
+    iget-object v0, p0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
 
-    invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+    invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v2, v0
+    const/4 v1, 0x0
+
+    move-object v2, v1
 
     :cond_0
     :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v3
 
     if-eqz v3, :cond_2
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -147,85 +149,78 @@
 
     invoke-virtual {v2}, Lco/discord/media_engine/InboundBufferStats;->getAudioJitterBuffer()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_1
 
     :cond_3
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_1
     const-string v3, "audio_jitter_buffer"
 
-    invoke-static {v3, v1, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
+    invoke-static {v3, v0, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
 
     if-eqz v2, :cond_4
 
     invoke-virtual {v2}, Lco/discord/media_engine/InboundBufferStats;->getAudioJitterTarget()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_2
 
     :cond_4
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_2
     const-string v3, "audio_jitter_target"
 
-    invoke-static {v3, v1, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
+    invoke-static {v3, v0, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
 
     if-eqz v2, :cond_5
 
     invoke-virtual {v2}, Lco/discord/media_engine/InboundBufferStats;->getAudioJitterDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_3
 
     :cond_5
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_3
     const-string v3, "audio_jitter_delay"
 
-    invoke-static {v3, v1, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
+    invoke-static {v3, v0, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
 
     if-eqz v2, :cond_6
 
     invoke-virtual {v2}, Lco/discord/media_engine/InboundBufferStats;->getRelativeReceptionDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_4
 
     :cond_6
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_4
     const-string v3, "relative_reception_delay"
 
-    invoke-static {v3, v1, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
+    invoke-static {v3, v0, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
 
     if-eqz v2, :cond_7
 
     invoke-virtual {v2}, Lco/discord/media_engine/InboundBufferStats;->getRelativePlayoutDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_7
-    const-string v1, "relative_playout_delay"
+    const-string v0, "relative_playout_delay"
 
-    invoke-static {v1, v0, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
+    invoke-static {v0, v1, p1}, Lco/discord/media_engine/VoiceQualityKt;->access$explodePlayoutMetric(Ljava/lang/String;Lco/discord/media_engine/PlayoutMetric;Ljava/util/Map;)V
 
     return-void
-
-    :cond_8
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getDurationStats(Ljava/util/Map;)V
@@ -240,7 +235,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "result"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lco/discord/media_engine/VoiceQuality;->_duration:Lco/discord/media_engine/Duration;
 
@@ -299,15 +296,6 @@
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getFrameOpStats(Ljava/util/Map;)V
@@ -322,21 +310,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "result"
 
-    if-eqz p1, :cond_16
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
+    iget-object v0, p0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
 
-    invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+    invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v2, v0
+    const/4 v1, 0x0
+
+    move-object v2, v1
 
     move-object v3, v2
 
@@ -350,13 +340,13 @@
 
     :cond_0
     :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v8
 
     if-eqz v8, :cond_e
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v8
 
@@ -384,23 +374,23 @@
 
     move-result v9
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    move-result v0
+    move-result v1
 
     goto :goto_1
 
     :cond_1
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_1
-    add-int/2addr v0, v9
+    add-int/2addr v1, v9
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_2
     invoke-virtual {v8}, Lco/discord/media_engine/InboundAudio;->getFrameOpStats()Lco/discord/media_engine/InboundFrameOpStats;
@@ -598,9 +588,9 @@
     goto/16 :goto_0
 
     :cond_e
-    if-eqz v0, :cond_f
+    if-eqz v1, :cond_f
 
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+    invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
 
     move-result v0
 
@@ -704,17 +694,10 @@
 
     :cond_15
     return-void
-
-    :cond_16
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getMosStats(Ljava/util/Map;)V
-    .locals 14
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -725,187 +708,161 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    move-object/from16 v0, p1
 
-    const-wide/16 v0, 0x0
+    const-string v1, "result"
 
-    const/4 v2, 0x5
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v2, v2, [Ljava/lang/Integer;
+    const/4 v1, 0x5
 
-    const/4 v3, 0x0
+    new-array v1, v1, [Ljava/lang/Integer;
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const/4 v2, 0x0
 
-    move-result-object v4
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    aput-object v4, v2, v3
+    move-result-object v3
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    aput-object v3, v1, v2
 
-    move-result-object v4
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    aput-object v3, v1, v4
 
-    aput-object v4, v2, v5
+    const/4 v5, 0x2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    aput-object v3, v1, v5
 
-    move-result-object v4
+    const/4 v6, 0x3
 
-    const/4 v6, 0x2
+    aput-object v3, v1, v6
 
-    aput-object v4, v2, v6
+    const/4 v7, 0x4
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    aput-object v3, v1, v7
 
-    move-result-object v4
+    move-object/from16 v8, p0
 
-    const/4 v7, 0x3
+    iget-object v9, v8, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
 
-    aput-object v4, v2, v7
+    invoke-interface {v9}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v9
 
-    move-result-object v4
+    invoke-interface {v9}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    const/4 v8, 0x4
+    move-result-object v9
 
-    aput-object v4, v2, v8
+    const-wide/16 v10, 0x0
 
-    iget-object v4, p0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
-
-    invoke-interface {v4}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object v4
-
-    invoke-interface {v4}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v4
-
-    const/4 v9, 0x0
+    const/4 v12, 0x0
 
     :cond_0
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v10
-
-    if-eqz v10, :cond_1
-
-    invoke-interface {v4}, 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 v10
-
-    check-cast v10, Lco/discord/media_engine/InboundAudio;
-
-    invoke-virtual {v10}, Lco/discord/media_engine/InboundAudio;->getMosSum()D
-
-    move-result-wide v11
-
-    add-double/2addr v0, v11
-
-    invoke-virtual {v10}, Lco/discord/media_engine/InboundAudio;->getMosCount()I
-
-    move-result v11
-
-    add-int/2addr v9, v11
-
-    const/4 v11, 0x0
-
-    :goto_0
-    if-gt v11, v8, :cond_0
-
-    aget-object v12, v2, v11
-
-    invoke-virtual {v12}, Ljava/lang/Integer;->intValue()I
-
-    move-result v12
-
-    invoke-virtual {v10}, Lco/discord/media_engine/InboundAudio;->getMosBuckets()[Ljava/lang/Integer;
-
-    move-result-object v13
-
-    aget-object v13, v13, v11
-
-    invoke-virtual {v13}, Ljava/lang/Integer;->intValue()I
+    invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v13
 
-    add-int/2addr v13, v12
+    if-eqz v13, :cond_1
 
-    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-interface {v9}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v12
+    move-result-object v13
 
-    aput-object v12, v2, v11
+    check-cast v13, Ljava/util/Map$Entry;
 
-    add-int/lit8 v11, v11, 0x1
+    invoke-interface {v13}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v13
+
+    check-cast v13, Lco/discord/media_engine/InboundAudio;
+
+    invoke-virtual {v13}, Lco/discord/media_engine/InboundAudio;->getMosSum()D
+
+    move-result-wide v14
+
+    add-double/2addr v10, v14
+
+    invoke-virtual {v13}, Lco/discord/media_engine/InboundAudio;->getMosCount()I
+
+    move-result v14
+
+    add-int/2addr v12, v14
+
+    const/4 v14, 0x0
+
+    :goto_0
+    if-gt v14, v7, :cond_0
+
+    aget-object v15, v1, v14
+
+    invoke-virtual {v15}, Ljava/lang/Integer;->intValue()I
+
+    move-result v15
+
+    invoke-virtual {v13}, Lco/discord/media_engine/InboundAudio;->getMosBuckets()[Ljava/lang/Integer;
+
+    move-result-object v16
+
+    aget-object v16, v16, v14
+
+    invoke-virtual/range {v16 .. v16}, Ljava/lang/Integer;->intValue()I
+
+    move-result v16
+
+    add-int v16, v16, v15
+
+    invoke-static/range {v16 .. v16}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v15
+
+    aput-object v15, v1, v14
+
+    add-int/lit8 v14, v14, 0x1
 
     goto :goto_0
 
     :cond_1
-    if-lez v9, :cond_2
+    if-lez v12, :cond_2
 
-    int-to-double v3, v9
+    int-to-double v2, v12
 
-    div-double/2addr v0, v3
+    div-double/2addr v10, v2
 
-    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
+    invoke-static {v10, v11}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
-    move-result-object v0
-
-    goto :goto_1
+    move-result-object v3
 
     :cond_2
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const-string v2, "mos_mean"
 
-    move-result-object v0
+    invoke-interface {v0, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :goto_1
-    const-string v1, "mos_mean"
+    aget-object v2, v1, v4
 
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    const-string v3, "mos_1"
 
-    aget-object v0, v2, v5
+    invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const-string v1, "mos_1"
+    aget-object v2, v1, v5
 
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    const-string v3, "mos_2"
 
-    aget-object v0, v2, v6
+    invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const-string v1, "mos_2"
+    aget-object v2, v1, v6
 
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    const-string v3, "mos_3"
 
-    aget-object v0, v2, v7
+    invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const-string v1, "mos_3"
+    aget-object v1, v1, v7
 
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    const-string v2, "mos_4"
 
-    aget-object v0, v2, v8
-
-    const-string v1, "mos_4"
-
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_3
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getPacketStats(Ljava/util/Map;)V
@@ -920,7 +877,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "result"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
 
@@ -1015,35 +974,30 @@
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final update(Lco/discord/media_engine/Stats;)V
-    .locals 34
+    .locals 36
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_c
+    const-string v1, "stats"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lco/discord/media_engine/VoiceQuality;->_duration:Lco/discord/media_engine/Duration;
 
     invoke-virtual {v1}, Lco/discord/media_engine/Duration;->getConnected()I
 
-    move-result v2
+    move-result v3
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
-    add-int/2addr v2, v3
+    add-int/2addr v3, v4
 
-    invoke-virtual {v1, v2}, Lco/discord/media_engine/Duration;->setConnected(I)V
+    invoke-virtual {v1, v3}, Lco/discord/media_engine/Duration;->setConnected(I)V
 
     iget-object v1, v0, Lco/discord/media_engine/VoiceQuality;->_outboundStats:Lco/discord/media_engine/OutboundAudio;
 
@@ -1051,407 +1005,395 @@
 
     move-result v1
 
-    iget-object v2, v0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
+    iget-object v3, v0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
 
-    invoke-interface {v2}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+    invoke-interface {v3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    move-result-object v2
-
-    const/4 v4, 0x0
+    move-result-object v3
 
     const/4 v5, 0x0
 
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v6
+
+    const/4 v7, 0x0
+
     :goto_0
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v8
 
-    if-eqz v6, :cond_0
+    if-eqz v8, :cond_0
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v8
 
-    check-cast v6, Ljava/util/Map$Entry;
+    check-cast v8, Ljava/util/Map$Entry;
 
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v8}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v8
 
-    check-cast v6, Lco/discord/media_engine/InboundAudio;
+    check-cast v8, Lco/discord/media_engine/InboundAudio;
 
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundAudio;->getPacketsReceived()I
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundAudio;->getPacketsReceived()I
 
-    move-result v6
+    move-result v8
 
-    add-int/2addr v5, v6
+    add-int/2addr v7, v8
 
     goto :goto_0
 
     :cond_0
     invoke-virtual/range {p1 .. p1}, Lco/discord/media_engine/Stats;->getOutboundRtpAudio()Lco/discord/media_engine/OutboundRtpAudio;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_1
+    if-eqz v3, :cond_1
 
-    new-instance v6, Lco/discord/media_engine/OutboundAudio;
+    new-instance v8, Lco/discord/media_engine/OutboundAudio;
 
-    invoke-virtual {v2}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsSent()I
+    invoke-virtual {v3}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsSent()I
 
-    move-result v7
+    move-result v9
 
-    invoke-virtual {v2}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsLost()I
+    invoke-virtual {v3}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsLost()I
 
-    move-result v2
+    move-result v3
 
-    invoke-direct {v6, v7, v2}, Lco/discord/media_engine/OutboundAudio;-><init>(II)V
+    invoke-direct {v8, v9, v3}, Lco/discord/media_engine/OutboundAudio;-><init>(II)V
 
     goto :goto_1
 
     :cond_1
-    new-instance v6, Lco/discord/media_engine/OutboundAudio;
+    new-instance v8, Lco/discord/media_engine/OutboundAudio;
 
-    invoke-direct {v6, v4, v4}, Lco/discord/media_engine/OutboundAudio;-><init>(II)V
+    invoke-direct {v8, v5, v5}, Lco/discord/media_engine/OutboundAudio;-><init>(II)V
 
     :goto_1
-    iput-object v6, v0, Lco/discord/media_engine/VoiceQuality;->_outboundStats:Lco/discord/media_engine/OutboundAudio;
+    iput-object v8, v0, Lco/discord/media_engine/VoiceQuality;->_outboundStats:Lco/discord/media_engine/OutboundAudio;
 
     invoke-virtual/range {p1 .. p1}, Lco/discord/media_engine/Stats;->getInboundRtpAudio()Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-interface {v2}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+    invoke-interface {v3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    move-result-object v2
+    move-result-object v3
 
     :goto_2
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v8
 
-    if-eqz v6, :cond_6
+    if-eqz v8, :cond_6
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/util/Map$Entry;
-
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Ljava/lang/String;
-
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Lco/discord/media_engine/InboundRtpAudio;
-
-    invoke-virtual/range {p1 .. p1}, Lco/discord/media_engine/Stats;->getTransport()Lco/discord/media_engine/Transport;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v8
 
-    if-eqz v8, :cond_2
+    check-cast v8, Ljava/util/Map$Entry;
 
-    invoke-virtual {v8}, Lco/discord/media_engine/Transport;->getPing()I
+    invoke-interface {v8}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
-    move-result v8
+    move-result-object v9
+
+    check-cast v9, Ljava/lang/String;
+
+    invoke-interface {v8}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Lco/discord/media_engine/InboundRtpAudio;
+
+    invoke-virtual/range {p1 .. p1}, Lco/discord/media_engine/Stats;->getTransport()Lco/discord/media_engine/Transport;
+
+    move-result-object v10
+
+    if-eqz v10, :cond_2
+
+    invoke-virtual {v10}, Lco/discord/media_engine/Transport;->getPing()I
+
+    move-result v10
 
     goto :goto_3
 
     :cond_2
-    const/4 v8, 0x0
+    const/4 v10, 0x0
 
     :goto_3
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsReceived()I
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsReceived()I
 
-    move-result v10
+    move-result v12
 
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsLost()I
-
-    move-result v11
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getJitterBuffer()I
-
-    move-result v9
-
-    new-instance v18, Lco/discord/media_engine/InboundBufferStats;
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getAudioJitterBuffer()Lco/discord/media_engine/PlayoutMetric;
-
-    move-result-object v13
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getAudioJitterTarget()Lco/discord/media_engine/PlayoutMetric;
-
-    move-result-object v14
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getAudioJitterDelay()Lco/discord/media_engine/PlayoutMetric;
-
-    move-result-object v15
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getRelativeReceptionDelay()Lco/discord/media_engine/PlayoutMetric;
-
-    move-result-object v16
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getRelativePlayoutDelay()Lco/discord/media_engine/PlayoutMetric;
-
-    move-result-object v17
-
-    move-object/from16 v12, v18
-
-    invoke-direct/range {v12 .. v17}, Lco/discord/media_engine/InboundBufferStats;-><init>(Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)V
-
-    new-instance v27, Lco/discord/media_engine/InboundFrameOpStats;
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getOpSilence()Ljava/lang/Integer;
-
-    move-result-object v20
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getOpNormal()Ljava/lang/Integer;
-
-    move-result-object v21
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getOpMerge()Ljava/lang/Integer;
-
-    move-result-object v22
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getOpExpand()Ljava/lang/Integer;
-
-    move-result-object v23
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getOpAccelerate()Ljava/lang/Integer;
-
-    move-result-object v24
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getOpPreemptiveExpand()Ljava/lang/Integer;
-
-    move-result-object v25
-
-    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getOpCNG()Ljava/lang/Integer;
-
-    move-result-object v26
-
-    move-object/from16 v19, v27
-
-    invoke-direct/range {v19 .. v26}, Lco/discord/media_engine/InboundFrameOpStats;-><init>(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
-
-    iget-object v6, v0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
-
-    invoke-interface {v6, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v12
-
-    check-cast v12, Lco/discord/media_engine/InboundAudio;
-
-    if-eqz v12, :cond_5
-
-    invoke-virtual {v12}, Lco/discord/media_engine/InboundAudio;->getPacketsReceived()I
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsLost()I
 
     move-result v13
 
-    sub-int v13, v10, v13
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getJitterBuffer()I
 
-    invoke-virtual {v12}, Lco/discord/media_engine/InboundAudio;->getPacketsLost()I
+    move-result v11
 
-    move-result v14
+    new-instance v20, Lco/discord/media_engine/InboundBufferStats;
 
-    sub-int v14, v11, v14
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getAudioJitterBuffer()Lco/discord/media_engine/PlayoutMetric;
 
-    const-wide/16 v15, 0x0
+    move-result-object v15
 
-    invoke-virtual {v12}, Lco/discord/media_engine/InboundAudio;->getMosBuckets()[Ljava/lang/Integer;
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getAudioJitterTarget()Lco/discord/media_engine/PlayoutMetric;
+
+    move-result-object v16
+
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getAudioJitterDelay()Lco/discord/media_engine/PlayoutMetric;
 
     move-result-object v17
 
-    if-lez v13, :cond_3
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getRelativeReceptionDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    if-ltz v14, :cond_3
+    move-result-object v18
 
-    add-int/2addr v8, v9
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getRelativePlayoutDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    int-to-double v8, v8
+    move-result-object v19
 
-    move/from16 v21, v5
+    move-object/from16 v14, v20
 
-    int-to-double v4, v14
+    invoke-direct/range {v14 .. v19}, Lco/discord/media_engine/InboundBufferStats;-><init>(Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)V
 
-    add-int/2addr v13, v14
+    new-instance v29, Lco/discord/media_engine/InboundFrameOpStats;
 
-    int-to-double v13, v13
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getOpSilence()Ljava/lang/Integer;
 
-    div-double v28, v4, v13
+    move-result-object v22
 
-    const-wide/16 v30, 0x0
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getOpNormal()Ljava/lang/Integer;
 
-    const-wide/high16 v32, 0x3ff0000000000000L    # 1.0
+    move-result-object v23
 
-    invoke-static/range {v28 .. v33}, Lco/discord/media_engine/VoiceQualityKt;->access$clamp(DDD)D
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getOpMerge()Ljava/lang/Integer;
+
+    move-result-object v24
+
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getOpExpand()Ljava/lang/Integer;
+
+    move-result-object v25
+
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getOpAccelerate()Ljava/lang/Integer;
+
+    move-result-object v26
+
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getOpPreemptiveExpand()Ljava/lang/Integer;
+
+    move-result-object v27
+
+    invoke-virtual {v8}, Lco/discord/media_engine/InboundRtpAudio;->getOpCNG()Ljava/lang/Integer;
+
+    move-result-object v28
+
+    move-object/from16 v21, v29
+
+    invoke-direct/range {v21 .. v28}, Lco/discord/media_engine/InboundFrameOpStats;-><init>(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
+
+    iget-object v8, v0, Lco/discord/media_engine/VoiceQuality;->_inboundStats:Ljava/util/Map;
+
+    invoke-interface {v8, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v14
+
+    check-cast v14, Lco/discord/media_engine/InboundAudio;
+
+    if-eqz v14, :cond_5
+
+    invoke-virtual {v14}, Lco/discord/media_engine/InboundAudio;->getPacketsReceived()I
+
+    move-result v15
+
+    sub-int v15, v12, v15
+
+    invoke-virtual {v14}, Lco/discord/media_engine/InboundAudio;->getPacketsLost()I
+
+    move-result v16
+
+    sub-int v5, v13, v16
+
+    const-wide/16 v16, 0x0
+
+    invoke-virtual {v14}, Lco/discord/media_engine/InboundAudio;->getMosBuckets()[Ljava/lang/Integer;
+
+    move-result-object v19
+
+    if-lez v15, :cond_3
+
+    if-ltz v5, :cond_3
+
+    add-int/2addr v10, v11
+
+    int-to-double v10, v10
+
+    move-object/from16 v23, v3
+
+    int-to-double v2, v5
+
+    add-int/2addr v15, v5
+
+    int-to-double v4, v15
+
+    div-double v30, v2, v4
+
+    const-wide/16 v32, 0x0
+
+    const-wide/high16 v34, 0x3ff0000000000000L    # 1.0
+
+    invoke-static/range {v30 .. v35}, Lco/discord/media_engine/VoiceQualityKt;->access$clamp(DDD)D
+
+    move-result-wide v2
+
+    invoke-static {v10, v11, v2, v3}, Lco/discord/media_engine/VoiceQualityKt;->access$_calculateMos(DD)D
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Math;->floor(D)D
 
     move-result-wide v4
 
-    invoke-static {v8, v9, v4, v5}, Lco/discord/media_engine/VoiceQualityKt;->access$_calculateMos(DD)D
+    double-to-int v4, v4
 
-    move-result-wide v4
+    aget-object v5, v19, v4
 
-    invoke-static {v4, v5}, Ljava/lang/Math;->floor(D)D
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
 
-    move-result-wide v8
+    move-result v5
 
-    double-to-int v8, v8
+    const/4 v10, 0x1
 
-    aget-object v9, v17, v8
+    add-int/2addr v5, v10
 
-    invoke-virtual {v9}, Ljava/lang/Integer;->intValue()I
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result v9
+    move-result-object v5
 
-    add-int/2addr v9, v3
+    aput-object v5, v19, v4
 
-    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v9
-
-    aput-object v9, v17, v8
-
-    move-wide v15, v4
+    move-wide/from16 v16, v2
 
     goto :goto_4
 
     :cond_3
-    move/from16 v21, v5
+    move-object/from16 v23, v3
 
     :goto_4
-    new-instance v4, Lco/discord/media_engine/InboundAudio;
+    new-instance v2, Lco/discord/media_engine/InboundAudio;
 
-    invoke-virtual {v12}, Lco/discord/media_engine/InboundAudio;->getMosSum()D
+    invoke-virtual {v14}, Lco/discord/media_engine/InboundAudio;->getMosSum()D
 
-    move-result-wide v8
+    move-result-wide v3
 
-    add-double v22, v8, v15
+    add-double v3, v3, v16
 
-    invoke-virtual {v12}, Lco/discord/media_engine/InboundAudio;->getMosCount()I
+    invoke-virtual {v14}, Lco/discord/media_engine/InboundAudio;->getMosCount()I
 
     move-result v5
 
-    const/4 v8, 0x0
+    const/4 v10, 0x0
 
-    int-to-double v12, v8
+    int-to-double v14, v10
 
-    cmpl-double v8, v15, v12
+    cmpl-double v10, v16, v14
 
-    if-lez v8, :cond_4
+    if-lez v10, :cond_4
 
-    const/4 v8, 0x1
+    const/4 v10, 0x1
 
     goto :goto_5
 
     :cond_4
-    const/4 v8, 0x0
+    const/4 v10, 0x0
 
     :goto_5
-    add-int/2addr v5, v8
+    add-int v18, v5, v10
 
-    move-object v9, v4
+    move-object v11, v2
 
-    move-wide v12, v15
+    move-wide/from16 v14, v16
 
-    move-wide/from16 v14, v22
+    move-wide/from16 v16, v3
 
-    move/from16 v16, v5
+    move-object/from16 v21, v29
 
-    move-object/from16 v19, v27
+    invoke-direct/range {v11 .. v21}, Lco/discord/media_engine/InboundAudio;-><init>(IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;)V
 
-    invoke-direct/range {v9 .. v19}, Lco/discord/media_engine/InboundAudio;-><init>(IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;)V
-
-    const/4 v8, 0x0
+    const/4 v10, 0x0
 
     goto :goto_6
 
     :cond_5
-    move/from16 v21, v5
+    move-object/from16 v23, v3
 
-    new-instance v4, Lco/discord/media_engine/InboundAudio;
-
-    const-wide/16 v12, 0x0
+    new-instance v2, Lco/discord/media_engine/InboundAudio;
 
     const-wide/16 v14, 0x0
 
-    const/16 v16, 0x0
+    const-wide/16 v16, 0x0
 
-    const/4 v5, 0x5
+    const/16 v18, 0x0
 
-    new-array v5, v5, [Ljava/lang/Integer;
+    const/4 v3, 0x5
 
-    const/4 v8, 0x0
+    new-array v3, v3, [Ljava/lang/Integer;
 
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const/4 v10, 0x0
 
-    move-result-object v9
+    aput-object v6, v3, v10
 
-    aput-object v9, v5, v8
+    const/4 v4, 0x1
 
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    aput-object v6, v3, v4
 
-    move-result-object v9
+    const/4 v4, 0x2
 
-    aput-object v9, v5, v3
+    aput-object v6, v3, v4
 
-    const/4 v9, 0x2
+    const/4 v4, 0x3
 
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    aput-object v6, v3, v4
 
-    move-result-object v17
+    const/4 v4, 0x4
 
-    aput-object v17, v5, v9
+    aput-object v6, v3, v4
 
-    const/4 v9, 0x3
+    move-object v11, v2
 
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-object/from16 v19, v3
 
-    move-result-object v17
+    move-object/from16 v21, v29
 
-    aput-object v17, v5, v9
-
-    const/4 v9, 0x4
-
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v17
-
-    aput-object v17, v5, v9
-
-    move-object v9, v4
-
-    move-object/from16 v17, v5
-
-    move-object/from16 v19, v27
-
-    invoke-direct/range {v9 .. v19}, Lco/discord/media_engine/InboundAudio;-><init>(IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;)V
+    invoke-direct/range {v11 .. v21}, Lco/discord/media_engine/InboundAudio;-><init>(IIDDI[Ljava/lang/Integer;Lco/discord/media_engine/InboundBufferStats;Lco/discord/media_engine/InboundFrameOpStats;)V
 
     :goto_6
-    invoke-interface {v6, v7, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v8, v9, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move/from16 v5, v21
+    move-object/from16 v2, p1
 
-    const/4 v4, 0x0
+    move-object/from16 v3, v23
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
 
     goto/16 :goto_2
 
     :cond_6
-    move/from16 v21, v5
-
-    const/4 v8, 0x0
+    const/4 v10, 0x0
 
     iget-object v2, v0, Lco/discord/media_engine/VoiceQuality;->_outboundStats:Lco/discord/media_engine/OutboundAudio;
 
@@ -1467,6 +1409,8 @@
 
     move-result v2
 
+    const/4 v3, 0x1
+
     add-int/2addr v2, v3
 
     invoke-virtual {v1, v2}, Lco/discord/media_engine/Duration;->setSpeaking(I)V
@@ -1489,61 +1433,63 @@
 
     move-result-object v2
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :goto_8
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_8
+    if-eqz v4, :cond_8
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v4
 
-    check-cast v5, Ljava/util/Map$Entry;
+    check-cast v4, Ljava/util/Map$Entry;
 
-    invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v4}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v4
 
-    check-cast v5, Lco/discord/media_engine/InboundAudio;
+    check-cast v4, Lco/discord/media_engine/InboundAudio;
 
-    invoke-virtual {v5}, Lco/discord/media_engine/InboundAudio;->getPacketsReceived()I
+    invoke-virtual {v4}, Lco/discord/media_engine/InboundAudio;->getPacketsReceived()I
 
-    move-result v5
+    move-result v4
 
-    add-int/2addr v4, v5
+    add-int/2addr v3, v4
 
     goto :goto_8
 
     :cond_8
-    move/from16 v5, v21
-
-    if-le v4, v5, :cond_9
+    if-le v3, v7, :cond_9
 
     iget-object v2, v0, Lco/discord/media_engine/VoiceQuality;->_duration:Lco/discord/media_engine/Duration;
 
     invoke-virtual {v2}, Lco/discord/media_engine/Duration;->getListening()I
 
-    move-result v4
-
-    add-int/2addr v4, v3
-
-    invoke-virtual {v2, v4}, Lco/discord/media_engine/Duration;->setListening(I)V
+    move-result v3
 
     const/4 v4, 0x1
 
+    add-int/2addr v3, v4
+
+    invoke-virtual {v2, v3}, Lco/discord/media_engine/Duration;->setListening(I)V
+
+    const/4 v5, 0x1
+
     goto :goto_9
 
     :cond_9
-    const/4 v4, 0x0
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
 
     :goto_9
     if-nez v1, :cond_a
 
-    if-eqz v4, :cond_b
+    if-eqz v5, :cond_b
 
     :cond_a
     iget-object v1, v0, Lco/discord/media_engine/VoiceQuality;->_duration:Lco/discord/media_engine/Duration;
@@ -1552,19 +1498,10 @@
 
     move-result v2
 
-    add-int/2addr v2, v3
+    add-int/2addr v2, v4
 
     invoke-virtual {v1, v2}, Lco/discord/media_engine/Duration;->setParticipation(I)V
 
     :cond_b
     return-void
-
-    :cond_c
-    const-string v1, "stats"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
diff --git a/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali b/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
index 7bc537f7c0..110e0d8984 100644
--- a/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
@@ -9,28 +9,21 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lco/discord/media_engine/internal/AssetManagement;->ctx:Landroid/content/Context;
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final cleanup()V
-    .locals 4
+    .locals 3
 
     :try_start_0
     new-instance v0, Ljava/io/File;
@@ -49,58 +42,14 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_0
 
-    sget-object v1, Lj0/m/b;->e:Lj0/m/b;
-
-    new-instance v2, Lj0/m/a;
-
-    invoke-direct {v2, v0, v1}, Lj0/m/a;-><init>(Ljava/io/File;Lj0/m/b;)V
-
-    invoke-virtual {v2}, Lj0/m/a;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    const/4 v1, 0x1
-
-    :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/io/File;
-
-    invoke-virtual {v2}, Ljava/io/File;->delete()Z
-
-    move-result v3
-
-    if-nez v3, :cond_0
-
-    invoke-virtual {v2}, Ljava/io/File;->exists()Z
-
-    move-result v2
+    invoke-static {v0}, Lf/n/a/k/a;->deleteRecursively(Ljava/io/File;)Z
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    if-nez v2, :cond_1
-
-    :cond_0
-    if-eqz v1, :cond_1
-
     goto :goto_0
 
-    :cond_1
-    const/4 v1, 0x0
-
-    goto :goto_1
-
     :catch_0
     move-exception v0
 
@@ -134,7 +83,8 @@
 
     invoke-static {v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_2
+    :cond_0
+    :goto_0
     return-void
 .end method
 
@@ -167,7 +117,7 @@
 
     const-string v1, "ctx.assets.open(\"thz/\" + name)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/io/FileOutputStream;
 
@@ -177,6 +127,14 @@
 
     invoke-direct {v1, v2}, Ljava/io/FileOutputStream;-><init>(Ljava/io/File;)V
 
+    const-string p1, "$this$copyTo"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "out"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/16 p1, 0x400
 
     new-array p1, p1, [B
@@ -236,7 +194,7 @@
 
     const-string v2, "ctx.getString(R.string.krisp_model_version)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/io/File;
 
@@ -300,7 +258,7 @@
 
     const-string v4, "file"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v2, v3}, Lco/discord/media_engine/internal/AssetManagement;->copy(Ljava/io/File;Ljava/lang/String;)V
     :try_end_0
diff --git a/com.discord/smali/co/discord/media_engine/internal/Inbound.smali b/com.discord/smali/co/discord/media_engine/internal/Inbound.smali
index 102ab91ede..4da4ac8d82 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Inbound.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Inbound.smali
@@ -17,11 +17,13 @@
 .method public constructor <init>(Ljava/lang/String;Lco/discord/media_engine/internal/InboundAudio;Lco/discord/media_engine/internal/InboundVideo;Lco/discord/media_engine/internal/InboundPlayout;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "audio"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,20 +36,6 @@
     iput-object p4, p0, Lco/discord/media_engine/internal/Inbound;->playout:Lco/discord/media_engine/internal/InboundPlayout;
 
     return-void
-
-    :cond_0
-    const-string p1, "audio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/Inbound;Ljava/lang/String;Lco/discord/media_engine/internal/InboundAudio;Lco/discord/media_engine/internal/InboundVideo;Lco/discord/media_engine/internal/InboundPlayout;ILjava/lang/Object;)Lco/discord/media_engine/internal/Inbound;
@@ -125,31 +113,19 @@
 .method public final copy(Ljava/lang/String;Lco/discord/media_engine/internal/InboundAudio;Lco/discord/media_engine/internal/InboundVideo;Lco/discord/media_engine/internal/InboundPlayout;)Lco/discord/media_engine/internal/Inbound;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "audio"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/internal/Inbound;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lco/discord/media_engine/internal/Inbound;-><init>(Ljava/lang/String;Lco/discord/media_engine/internal/InboundAudio;Lco/discord/media_engine/internal/InboundVideo;Lco/discord/media_engine/internal/InboundPlayout;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "audio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -167,7 +143,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/Inbound;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -177,7 +153,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/Inbound;->audio:Lco/discord/media_engine/internal/InboundAudio;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -187,7 +163,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/Inbound;->video:Lco/discord/media_engine/internal/InboundVideo;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -197,7 +173,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/internal/Inbound;->playout:Lco/discord/media_engine/internal/InboundPlayout;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali b/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali
index e2466ade69..9a0bb4ab10 100644
--- a/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/InboundAudio.smali
@@ -63,7 +63,9 @@
 
     move-object v1, p3
 
-    if-eqz v1, :cond_0
+    const-string v2, "codecName"
+
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -166,15 +168,6 @@
     iput v1, v0, Lco/discord/media_engine/internal/InboundAudio;->ssrc:I
 
     return-void
-
-    :cond_0
-    const-string v1, "codecName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/InboundAudio;IILjava/lang/String;IIIIIIIFIIIIIIIIIIIIIIILjava/lang/Object;)Lco/discord/media_engine/internal/InboundAudio;
@@ -766,12 +759,6 @@
 .method public final copy(IILjava/lang/String;IIIIIIIFIIIIIIIIIIIIII)Lco/discord/media_engine/internal/InboundAudio;
     .locals 27
 
-    if-eqz p3, :cond_0
-
-    new-instance v26, Lco/discord/media_engine/internal/InboundAudio;
-
-    move-object/from16 v0, v26
-
     move/from16 v1, p1
 
     move/from16 v2, p2
@@ -822,18 +809,21 @@
 
     move/from16 v25, p25
 
+    const-string v0, "codecName"
+
+    move-object/from16 v1, p3
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v26, Lco/discord/media_engine/internal/InboundAudio;
+
+    move-object/from16 v0, v26
+
+    move/from16 v1, p1
+
     invoke-direct/range {v0 .. v25}, Lco/discord/media_engine/internal/InboundAudio;-><init>(IILjava/lang/String;IIIIIIIFIIIIIIIIIIIIII)V
 
     return-object v26
-
-    :cond_0
-    const-string v0, "codecName"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -887,7 +877,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/InboundAudio;->codecName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/InboundPlayout.smali b/com.discord/smali/co/discord/media_engine/internal/InboundPlayout.smali
index 2708be405a..798d72332f 100644
--- a/com.discord/smali/co/discord/media_engine/internal/InboundPlayout.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/InboundPlayout.smali
@@ -27,25 +27,41 @@
 .method public constructor <init>(Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "audioJitterBuffer"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "audioJitterDelay"
 
-    if-eqz p3, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_5
+    const-string v0, "audioJitterTarget"
 
-    if-eqz p5, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_3
+    const-string v0, "audioPlayoutUnderruns"
 
-    if-eqz p7, :cond_2
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_1
+    const-string/jumbo v0, "videoJitterBuffer"
 
-    if-eqz p9, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "videoJitterDelay"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "videoJitterTarget"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relativeReceptionDelay"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relativePlayoutDelay"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -68,69 +84,6 @@
     iput-object p9, p0, Lco/discord/media_engine/internal/InboundPlayout;->relativePlayoutDelay:Lco/discord/media_engine/PlayoutMetric;
 
     return-void
-
-    :cond_0
-    const-string p1, "relativePlayoutDelay"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "relativeReceptionDelay"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "videoJitterTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "videoJitterDelay"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "videoJitterBuffer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "audioPlayoutUnderruns"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "audioJitterTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "audioJitterDelay"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "audioJitterBuffer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/InboundPlayout;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;ILjava/lang/Object;)Lco/discord/media_engine/internal/InboundPlayout;
@@ -350,114 +303,67 @@
 .method public final copy(Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)Lco/discord/media_engine/internal/InboundPlayout;
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "audioJitterBuffer"
 
-    if-eqz p1, :cond_8
+    move-object v2, p1
 
-    if-eqz p2, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_6
+    const-string v0, "audioJitterDelay"
 
-    if-eqz p4, :cond_5
+    move-object v3, p2
 
-    if-eqz p5, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_3
+    const-string v0, "audioJitterTarget"
 
-    if-eqz p7, :cond_2
+    move-object v4, p3
 
-    if-eqz p8, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string v0, "audioPlayoutUnderruns"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "videoJitterBuffer"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "videoJitterDelay"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "videoJitterTarget"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relativeReceptionDelay"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relativePlayoutDelay"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/internal/InboundPlayout;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object/from16 v6, p5
-
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
-    move-object/from16 v9, p8
-
-    move-object/from16 v10, p9
-
     invoke-direct/range {v1 .. v10}, Lco/discord/media_engine/internal/InboundPlayout;-><init>(Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;Lco/discord/media_engine/PlayoutMetric;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "relativePlayoutDelay"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "relativeReceptionDelay"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "videoJitterTarget"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "videoJitterDelay"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "videoJitterBuffer"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "audioPlayoutUnderruns"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "audioJitterTarget"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string v1, "audioJitterDelay"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string v1, "audioJitterBuffer"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -475,7 +381,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->audioJitterBuffer:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -485,7 +391,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->audioJitterDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -495,7 +401,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->audioJitterTarget:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -505,7 +411,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->audioPlayoutUnderruns:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -515,7 +421,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->videoJitterBuffer:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -525,7 +431,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->videoJitterDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -535,7 +441,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->videoJitterTarget:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -545,7 +451,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/InboundPlayout;->relativeReceptionDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -555,7 +461,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/internal/InboundPlayout;->relativePlayoutDelay:Lco/discord/media_engine/PlayoutMetric;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali b/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali
index 8af61513c8..08c32caf05 100644
--- a/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/InboundVideo.smali
@@ -75,17 +75,25 @@
 
     move-object/from16 v5, p22
 
-    const/4 v6, 0x0
+    const-string v6, "codecName"
 
-    if-eqz v1, :cond_4
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_3
+    const-string v6, "decoderImplementationName"
 
-    if-eqz v3, :cond_2
+    invoke-static {p7, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_1
+    const-string v6, "frameCounts"
 
-    if-eqz v5, :cond_0
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "rtcpStats"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "rtpStats"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -188,41 +196,6 @@
     iput v1, v0, Lco/discord/media_engine/internal/InboundVideo;->width:I
 
     return-void
-
-    :cond_0
-    const-string v1, "rtpStats"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string v1, "rtcpStats"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string v1, "frameCounts"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string v1, "decoderImplementationName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_4
-    const-string v1, "codecName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/InboundVideo;Ljava/lang/String;IFIIILjava/lang/String;ILco/discord/media_engine/internal/FrameCounts;IIIIFFFIIFILco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;IFFIIILjava/lang/Object;)Lco/discord/media_engine/internal/InboundVideo;
@@ -860,116 +833,101 @@
 .end method
 
 .method public final copy(Ljava/lang/String;IFIIILjava/lang/String;ILco/discord/media_engine/internal/FrameCounts;IIIIFFFIIFILco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;IFFII)Lco/discord/media_engine/internal/InboundVideo;
-    .locals 29
+    .locals 30
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_4
+    move/from16 v2, p2
 
-    if-eqz p7, :cond_3
+    move/from16 v3, p3
 
-    if-eqz p9, :cond_2
+    move/from16 v4, p4
 
-    if-eqz p21, :cond_1
+    move/from16 v5, p5
 
-    if-eqz p22, :cond_0
+    move/from16 v6, p6
 
-    new-instance v0, Lco/discord/media_engine/internal/InboundVideo;
+    move-object/from16 v7, p7
 
-    move-object v1, v0
+    move/from16 v8, p8
 
-    move-object/from16 v2, p1
+    move-object/from16 v9, p9
 
-    move/from16 v3, p2
+    move/from16 v10, p10
 
-    move/from16 v4, p3
+    move/from16 v11, p11
 
-    move/from16 v5, p4
+    move/from16 v12, p12
 
-    move/from16 v6, p5
+    move/from16 v13, p13
 
-    move/from16 v7, p6
+    move/from16 v14, p14
 
-    move-object/from16 v8, p7
+    move/from16 v15, p15
 
-    move/from16 v9, p8
+    move/from16 v16, p16
 
-    move-object/from16 v10, p9
+    move/from16 v17, p17
 
-    move/from16 v11, p10
+    move/from16 v18, p18
 
-    move/from16 v12, p11
+    move/from16 v19, p19
 
-    move/from16 v13, p12
+    move/from16 v20, p20
 
-    move/from16 v14, p13
+    move-object/from16 v21, p21
 
-    move/from16 v15, p14
+    move-object/from16 v22, p22
 
-    move/from16 v16, p15
+    move/from16 v23, p23
 
-    move/from16 v17, p16
+    move/from16 v24, p24
 
-    move/from16 v18, p17
+    move/from16 v25, p25
 
-    move/from16 v19, p18
+    move/from16 v26, p26
 
-    move/from16 v20, p19
+    move/from16 v27, p27
 
-    move/from16 v21, p20
+    const-string v0, "codecName"
 
-    move-object/from16 v22, p21
+    move-object/from16 v28, v1
 
-    move-object/from16 v23, p22
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v24, p23
+    const-string v0, "decoderImplementationName"
 
-    move/from16 v25, p24
+    move-object/from16 v1, p7
 
-    move/from16 v26, p25
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v27, p26
+    const-string v0, "frameCounts"
 
-    move/from16 v28, p27
+    move-object/from16 v1, p9
 
-    invoke-direct/range {v1 .. v28}, Lco/discord/media_engine/internal/InboundVideo;-><init>(Ljava/lang/String;IFIIILjava/lang/String;ILco/discord/media_engine/internal/FrameCounts;IIIIFFFIIFILco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;IFFII)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    const-string v0, "rtcpStats"
 
-    :cond_0
-    const-string v1, "rtpStats"
+    move-object/from16 v1, p21
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "rtpStats"
 
-    :cond_1
-    const-string v1, "rtcpStats"
+    move-object/from16 v1, p22
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v29, Lco/discord/media_engine/internal/InboundVideo;
 
-    :cond_2
-    const-string v1, "frameCounts"
+    move-object/from16 v0, v29
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, v28
 
-    throw v0
+    invoke-direct/range {v0 .. v27}, Lco/discord/media_engine/internal/InboundVideo;-><init>(Ljava/lang/String;IFIIILjava/lang/String;ILco/discord/media_engine/internal/FrameCounts;IIIIFFFIIFILco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;IFFII)V
 
-    :cond_3
-    const-string v1, "decoderImplementationName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "codecName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v29
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -991,7 +949,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/InboundVideo;->codecName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1075,7 +1033,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/InboundVideo;->decoderImplementationName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1101,7 +1059,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/InboundVideo;->frameCounts:Lco/discord/media_engine/internal/FrameCounts;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1263,7 +1221,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/InboundVideo;->rtcpStats:Lco/discord/media_engine/internal/RtcpStats;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1273,7 +1231,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/InboundVideo;->rtpStats:Lco/discord/media_engine/internal/RtpStats;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali b/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali
index 8c27432e38..146d75db93 100644
--- a/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/NativeStats.smali
@@ -127,7 +127,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/NativeStats;->transport:Lco/discord/media_engine/internal/Transport;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -137,7 +137,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/NativeStats;->outbound:Lco/discord/media_engine/internal/Outbound;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -147,7 +147,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/NativeStats;->screenshare:Lco/discord/media_engine/internal/Screenshare;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -157,7 +157,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/internal/NativeStats;->inbound:[Lco/discord/media_engine/internal/Inbound;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/Outbound.smali b/com.discord/smali/co/discord/media_engine/internal/Outbound.smali
index 6f8d1a168d..2d1a9c8881 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Outbound.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Outbound.smali
@@ -15,11 +15,13 @@
 .method public constructor <init>(Ljava/lang/String;Lco/discord/media_engine/internal/OutboundAudio;Lco/discord/media_engine/internal/OutboundVideo;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "audio"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,20 +32,6 @@
     iput-object p3, p0, Lco/discord/media_engine/internal/Outbound;->video:Lco/discord/media_engine/internal/OutboundVideo;
 
     return-void
-
-    :cond_0
-    const-string p1, "audio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/Outbound;Ljava/lang/String;Lco/discord/media_engine/internal/OutboundAudio;Lco/discord/media_engine/internal/OutboundVideo;ILjava/lang/Object;)Lco/discord/media_engine/internal/Outbound;
@@ -106,31 +94,19 @@
 .method public final copy(Ljava/lang/String;Lco/discord/media_engine/internal/OutboundAudio;Lco/discord/media_engine/internal/OutboundVideo;)Lco/discord/media_engine/internal/Outbound;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "audio"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/internal/Outbound;
 
     invoke-direct {v0, p1, p2, p3}, Lco/discord/media_engine/internal/Outbound;-><init>(Ljava/lang/String;Lco/discord/media_engine/internal/OutboundAudio;Lco/discord/media_engine/internal/OutboundVideo;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "audio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -148,7 +124,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/Outbound;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -158,7 +134,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/Outbound;->audio:Lco/discord/media_engine/internal/OutboundAudio;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -168,7 +144,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/internal/Outbound;->video:Lco/discord/media_engine/internal/OutboundVideo;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali b/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
index 4d1b5fcb10..ddec229834 100644
--- a/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
@@ -59,7 +59,9 @@
 
     move-object v1, p3
 
-    if-eqz v1, :cond_0
+    const-string v2, "codecName"
+
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -154,15 +156,6 @@
     iput-wide v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
 
     return-void
-
-    :cond_0
-    const-string v1, "codecName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/OutboundAudio;IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJILjava/lang/Object;)Lco/discord/media_engine/internal/OutboundAudio;
@@ -706,12 +699,6 @@
 .method public final copy(IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)Lco/discord/media_engine/internal/OutboundAudio;
     .locals 29
 
-    if-eqz p3, :cond_0
-
-    new-instance v28, Lco/discord/media_engine/internal/OutboundAudio;
-
-    move-object/from16 v0, v28
-
     move/from16 v1, p1
 
     move/from16 v2, p2
@@ -758,18 +745,21 @@
 
     move-wide/from16 v26, p26
 
+    const-string v0, "codecName"
+
+    move-object/from16 v1, p3
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v28, Lco/discord/media_engine/internal/OutboundAudio;
+
+    move-object/from16 v0, v28
+
+    move/from16 v1, p1
+
     invoke-direct/range {v0 .. v27}, Lco/discord/media_engine/internal/OutboundAudio;-><init>(IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)V
 
     return-object v28
-
-    :cond_0
-    const-string v0, "codecName"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -823,7 +813,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/OutboundAudio;->codecName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali b/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali
index 1809e781fa..9d64059ab0 100644
--- a/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/OutboundVideo.smali
@@ -53,13 +53,17 @@
 
     move-object/from16 v3, p16
 
-    const/4 v4, 0x0
+    const-string v4, "codecName"
 
-    if-eqz v1, :cond_2
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_1
+    const-string v4, "encoderImplementationName"
 
-    if-eqz v3, :cond_0
+    invoke-static {p8, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "substreams"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -130,27 +134,6 @@
     iput v1, v0, Lco/discord/media_engine/internal/OutboundVideo;->targetMediaBitrate:I
 
     return-void
-
-    :cond_0
-    const-string v1, "substreams"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1
-    const-string v1, "encoderImplementationName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_2
-    const-string v1, "codecName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/OutboundVideo;Ljava/lang/String;IIZZIILjava/lang/String;IIIIIII[Lco/discord/media_engine/internal/Substream;ZIILjava/lang/Object;)Lco/discord/media_engine/internal/OutboundVideo;
@@ -572,80 +555,71 @@
 .end method
 
 .method public final copy(Ljava/lang/String;IIZZIILjava/lang/String;IIIIIII[Lco/discord/media_engine/internal/Substream;ZI)Lco/discord/media_engine/internal/OutboundVideo;
-    .locals 20
+    .locals 21
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_2
+    move/from16 v2, p2
 
-    if-eqz p8, :cond_1
+    move/from16 v3, p3
 
-    if-eqz p16, :cond_0
+    move/from16 v4, p4
 
-    new-instance v0, Lco/discord/media_engine/internal/OutboundVideo;
+    move/from16 v5, p5
 
-    move-object v1, v0
+    move/from16 v6, p6
 
-    move-object/from16 v2, p1
+    move/from16 v7, p7
 
-    move/from16 v3, p2
+    move-object/from16 v8, p8
 
-    move/from16 v4, p3
+    move/from16 v9, p9
 
-    move/from16 v5, p4
+    move/from16 v10, p10
 
-    move/from16 v6, p5
+    move/from16 v11, p11
 
-    move/from16 v7, p6
+    move/from16 v12, p12
 
-    move/from16 v8, p7
+    move/from16 v13, p13
 
-    move-object/from16 v9, p8
+    move/from16 v14, p14
 
-    move/from16 v10, p9
+    move/from16 v15, p15
 
-    move/from16 v11, p10
+    move-object/from16 v16, p16
 
-    move/from16 v12, p11
+    move/from16 v17, p17
 
-    move/from16 v13, p12
+    move/from16 v18, p18
 
-    move/from16 v14, p13
+    const-string v0, "codecName"
 
-    move/from16 v15, p14
+    move-object/from16 v19, v1
 
-    move/from16 v16, p15
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v17, p16
+    const-string v0, "encoderImplementationName"
 
-    move/from16 v18, p17
+    move-object/from16 v1, p8
 
-    move/from16 v19, p18
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {v1 .. v19}, Lco/discord/media_engine/internal/OutboundVideo;-><init>(Ljava/lang/String;IIZZIILjava/lang/String;IIIIIII[Lco/discord/media_engine/internal/Substream;ZI)V
+    const-string v0, "substreams"
 
-    return-object v0
+    move-object/from16 v1, p16
 
-    :cond_0
-    const-string v1, "substreams"
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    new-instance v20, Lco/discord/media_engine/internal/OutboundVideo;
 
-    throw v0
+    move-object/from16 v0, v20
 
-    :cond_1
-    const-string v1, "encoderImplementationName"
+    move-object/from16 v1, v19
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct/range {v0 .. v18}, Lco/discord/media_engine/internal/OutboundVideo;-><init>(Ljava/lang/String;IIZZIILjava/lang/String;IIIIIII[Lco/discord/media_engine/internal/Substream;ZI)V
 
-    throw v0
-
-    :cond_2
-    const-string v1, "codecName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v20
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -667,7 +641,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/OutboundVideo;->codecName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -773,7 +747,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/OutboundVideo;->encoderImplementationName:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -895,7 +869,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/OutboundVideo;->substreams:[Lco/discord/media_engine/internal/Substream;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/ReceiverReport.smali b/com.discord/smali/co/discord/media_engine/internal/ReceiverReport.smali
index a57a540261..c96497f682 100644
--- a/com.discord/smali/co/discord/media_engine/internal/ReceiverReport.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/ReceiverReport.smali
@@ -13,9 +13,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;FF)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "id"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,15 +28,6 @@
     iput p3, p0, Lco/discord/media_engine/internal/ReceiverReport;->fractionLost:F
 
     return-void
-
-    :cond_0
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/ReceiverReport;Ljava/lang/String;FFILjava/lang/Object;)Lco/discord/media_engine/internal/ReceiverReport;
@@ -97,22 +90,15 @@
 .method public final copy(Ljava/lang/String;FF)Lco/discord/media_engine/internal/ReceiverReport;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "id"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/internal/ReceiverReport;
 
     invoke-direct {v0, p1, p2, p3}, Lco/discord/media_engine/internal/ReceiverReport;-><init>(Ljava/lang/String;FF)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -130,7 +116,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/ReceiverReport;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali b/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali
index 2d65cbe493..cc7340ad4a 100644
--- a/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/RtpStats.smali
@@ -15,13 +15,17 @@
 .method public constructor <init>(Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "fec"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "retransmitted"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "transmitted"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -32,27 +36,6 @@
     iput-object p3, p0, Lco/discord/media_engine/internal/RtpStats;->transmitted:Lco/discord/media_engine/internal/PacketStats;
 
     return-void
-
-    :cond_0
-    const-string p1, "transmitted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "retransmitted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "fec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/RtpStats;Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;ILjava/lang/Object;)Lco/discord/media_engine/internal/RtpStats;
@@ -115,40 +98,23 @@
 .method public final copy(Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;)Lco/discord/media_engine/internal/RtpStats;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "fec"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "retransmitted"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "transmitted"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/internal/RtpStats;
 
     invoke-direct {v0, p1, p2, p3}, Lco/discord/media_engine/internal/RtpStats;-><init>(Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;Lco/discord/media_engine/internal/PacketStats;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "transmitted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "retransmitted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "fec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -166,7 +132,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/RtpStats;->fec:Lco/discord/media_engine/internal/PacketStats;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -176,7 +142,7 @@
 
     iget-object v1, p1, Lco/discord/media_engine/internal/RtpStats;->retransmitted:Lco/discord/media_engine/internal/PacketStats;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -186,7 +152,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/internal/RtpStats;->transmitted:Lco/discord/media_engine/internal/PacketStats;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/Substream.smali b/com.discord/smali/co/discord/media_engine/internal/Substream.smali
index b75286e344..ef1b2a86df 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Substream.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Substream.smali
@@ -33,13 +33,17 @@
 .method public constructor <init>(FLco/discord/media_engine/internal/FrameCounts;IZZFFLco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;III)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "frameCounts"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_1
+    const-string v0, "rtcpStats"
 
-    if-eqz p9, :cond_0
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtpStats"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -68,27 +72,6 @@
     iput p12, p0, Lco/discord/media_engine/internal/Substream;->width:I
 
     return-void
-
-    :cond_0
-    const-string p1, "rtpStats"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rtcpStats"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "frameCounts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/Substream;FLco/discord/media_engine/internal/FrameCounts;IZZFFLco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;IIIILjava/lang/Object;)Lco/discord/media_engine/internal/Substream;
@@ -374,13 +357,23 @@
 .method public final copy(FLco/discord/media_engine/internal/FrameCounts;IZZFFLco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;III)Lco/discord/media_engine/internal/Substream;
     .locals 14
 
-    const/4 v0, 0x0
+    const-string v0, "frameCounts"
 
-    if-eqz p2, :cond_2
+    move-object/from16 v3, p2
 
-    if-eqz p8, :cond_1
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string v0, "rtcpStats"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtpStats"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/internal/Substream;
 
@@ -388,8 +381,6 @@
 
     move v2, p1
 
-    move-object/from16 v3, p2
-
     move/from16 v4, p3
 
     move/from16 v5, p4
@@ -400,10 +391,6 @@
 
     move/from16 v8, p7
 
-    move-object/from16 v9, p8
-
-    move-object/from16 v10, p9
-
     move/from16 v11, p10
 
     move/from16 v12, p11
@@ -413,27 +400,6 @@
     invoke-direct/range {v1 .. v13}, Lco/discord/media_engine/internal/Substream;-><init>(FLco/discord/media_engine/internal/FrameCounts;IZZFFLco/discord/media_engine/internal/RtcpStats;Lco/discord/media_engine/internal/RtpStats;III)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "rtpStats"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "rtcpStats"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "frameCounts"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -465,7 +431,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/Substream;->frameCounts:Lco/discord/media_engine/internal/FrameCounts;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -543,7 +509,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/Substream;->rtcpStats:Lco/discord/media_engine/internal/RtcpStats;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -553,7 +519,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/Substream;->rtpStats:Lco/discord/media_engine/internal/RtpStats;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali b/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
index efdfd9311e..da2dfbbc51 100644
--- a/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
@@ -269,21 +269,23 @@
 
     move-object/from16 v0, p0
 
-    if-eqz v0, :cond_15
+    const-string v1, "stats"
 
-    sget-object v2, Lco/discord/media_engine/internal/TransformStats;->gson:Lcom/google/gson/Gson;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v3, Lco/discord/media_engine/internal/NativeStats;
+    sget-object v1, Lco/discord/media_engine/internal/TransformStats;->gson:Lcom/google/gson/Gson;
 
-    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->f(Ljava/lang/String;Ljava/lang/reflect/Type;)Ljava/lang/Object;
+    const-class v2, Lco/discord/media_engine/internal/NativeStats;
+
+    invoke-virtual {v1, v0, v2}, Lcom/google/gson/Gson;->f(Ljava/lang/String;Ljava/lang/reflect/Type;)Ljava/lang/Object;
 
     move-result-object v0
 
-    invoke-static {v3}, Lf/h/a/c/i1/e;->B1(Ljava/lang/Class;)Ljava/lang/Class;
+    invoke-static {v2}, Lf/h/a/c/i1/e;->B1(Ljava/lang/Class;)Ljava/lang/Class;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2, v0}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v0}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -291,17 +293,17 @@
 
     invoke-virtual {v0}, Lco/discord/media_engine/internal/NativeStats;->getOutbound()Lco/discord/media_engine/internal/Outbound;
 
-    move-result-object v2
+    move-result-object v1
 
-    const/high16 v3, 0x47000000    # 32768.0f
+    const/high16 v2, 0x47000000    # 32768.0f
 
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/Outbound;->getAudio()Lco/discord/media_engine/internal/OutboundAudio;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/Outbound;->getAudio()Lco/discord/media_engine/internal/OutboundAudio;
 
     move-result-object v8
 
@@ -311,39 +313,39 @@
 
     int-to-long v8, v8
 
-    add-long/2addr v8, v4
+    add-long/2addr v8, v3
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/Outbound;->getAudio()Lco/discord/media_engine/internal/OutboundAudio;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/Outbound;->getAudio()Lco/discord/media_engine/internal/OutboundAudio;
 
-    move-result-object v2
+    move-result-object v1
 
     new-instance v29, Lco/discord/media_engine/OutboundRtpAudio;
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getSsrc()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getSsrc()I
 
     move-result v12
 
     new-instance v13, Lco/discord/media_engine/StatsCodec;
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getCodecPayloadType()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getCodecPayloadType()I
 
     move-result v10
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getCodecName()Ljava/lang/String;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getCodecName()Ljava/lang/String;
 
     move-result-object v11
 
     invoke-direct {v13, v10, v11}, Lco/discord/media_engine/StatsCodec;-><init>(ILjava/lang/String;)V
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getPacketsSent()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getPacketsSent()I
 
     move-result v16
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getPacketsLost()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getPacketsLost()I
 
     move-result v10
 
-    invoke-static {v7, v10}, Ljava/lang/Math;->max(II)I
+    invoke-static {v6, v10}, Ljava/lang/Math;->max(II)I
 
     move-result v17
 
@@ -351,21 +353,21 @@
 
     int-to-float v10, v10
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getFractionLost()F
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getFractionLost()F
 
     move-result v11
 
     mul-float v18, v11, v10
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getAudioLevel()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getAudioLevel()I
 
     move-result v10
 
     int-to-float v10, v10
 
-    div-float v19, v10, v3
+    div-float v19, v10, v2
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getSpeaking()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getSpeaking()I
 
     move-result v10
 
@@ -379,19 +381,19 @@
     const/16 v20, 0x0
 
     :goto_0
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getFramesCaptured()J
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getFramesCaptured()J
 
     move-result-wide v21
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getFramesRendered()J
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getFramesRendered()J
 
     move-result-wide v23
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getNoiseCancellerProcessTime()J
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getNoiseCancellerProcessTime()J
 
     move-result-wide v25
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getVoiceActivityDetectorProcessTime()J
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundAudio;->getVoiceActivityDetectorProcessTime()J
 
     move-result-wide v27
 
@@ -408,37 +410,37 @@
     goto :goto_1
 
     :cond_1
-    move-wide v8, v4
+    move-wide v8, v3
 
     const/4 v12, 0x0
 
     :goto_1
     invoke-virtual {v0}, Lco/discord/media_engine/internal/NativeStats;->getOutbound()Lco/discord/media_engine/internal/Outbound;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_4
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/Outbound;->getVideo()Lco/discord/media_engine/internal/OutboundVideo;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/Outbound;->getVideo()Lco/discord/media_engine/internal/OutboundVideo;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_4
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getSubstreams()[Lco/discord/media_engine/internal/Substream;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getSubstreams()[Lco/discord/media_engine/internal/Substream;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_4
 
-    array-length v10, v2
+    array-length v10, v1
 
     const/4 v11, 0x0
 
     :goto_2
     if-ge v11, v10, :cond_4
 
-    aget-object v13, v2, v11
+    aget-object v13, v1, v11
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->isFlexFEC()Z
 
@@ -477,26 +479,26 @@
 
     invoke-virtual {v0}, Lco/discord/media_engine/internal/NativeStats;->getOutbound()Lco/discord/media_engine/internal/Outbound;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/Outbound;->getVideo()Lco/discord/media_engine/internal/OutboundVideo;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/Outbound;->getVideo()Lco/discord/media_engine/internal/OutboundVideo;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getSubstreams()[Lco/discord/media_engine/internal/Substream;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getSubstreams()[Lco/discord/media_engine/internal/Substream;
 
-    move-result-object v2
+    move-result-object v1
 
-    array-length v10, v2
+    array-length v10, v1
 
-    move-wide/from16 v18, v4
+    move-wide/from16 v18, v3
 
     const/4 v11, 0x0
 
     :goto_5
     if-ge v11, v10, :cond_5
 
-    aget-object v14, v2, v11
+    aget-object v14, v1, v11
 
     sget-object v15, Lco/discord/media_engine/internal/TransformStats;->INSTANCE:Lco/discord/media_engine/internal/TransformStats;
 
@@ -519,11 +521,11 @@
 
     invoke-virtual {v0}, Lco/discord/media_engine/internal/NativeStats;->getOutbound()Lco/discord/media_engine/internal/Outbound;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/Outbound;->getVideo()Lco/discord/media_engine/internal/OutboundVideo;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/Outbound;->getVideo()Lco/discord/media_engine/internal/OutboundVideo;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getSsrc()I
 
@@ -531,17 +533,17 @@
 
     new-instance v10, Lco/discord/media_engine/StatsCodec;
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getCodecPayloadType()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getCodecPayloadType()I
 
     move-result v11
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getCodecName()Ljava/lang/String;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getCodecName()Ljava/lang/String;
 
     move-result-object v14
 
     invoke-direct {v10, v11, v14}, Lco/discord/media_engine/StatsCodec;-><init>(ILjava/lang/String;)V
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getSubstreams()[Lco/discord/media_engine/internal/Substream;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getSubstreams()[Lco/discord/media_engine/internal/Substream;
 
     move-result-object v11
 
@@ -556,152 +558,152 @@
 
     aget-object v17, v11, v15
 
-    sget-object v4, Lco/discord/media_engine/internal/TransformStats;->INSTANCE:Lco/discord/media_engine/internal/TransformStats;
+    sget-object v3, Lco/discord/media_engine/internal/TransformStats;->INSTANCE:Lco/discord/media_engine/internal/TransformStats;
 
     invoke-virtual/range {v17 .. v17}, Lco/discord/media_engine/internal/Substream;->getRtpStats()Lco/discord/media_engine/internal/RtpStats;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-direct {v4, v5}, Lco/discord/media_engine/internal/TransformStats;->sumPackets(Lco/discord/media_engine/internal/RtpStats;)I
+    invoke-direct {v3, v4}, Lco/discord/media_engine/internal/TransformStats;->sumPackets(Lco/discord/media_engine/internal/RtpStats;)I
 
-    move-result v4
+    move-result v3
 
-    add-int v20, v20, v4
+    add-int v20, v20, v3
 
     add-int/lit8 v15, v15, 0x1
 
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
     goto :goto_6
 
     :cond_6
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Lco/discord/media_engine/internal/RtcpStats;->getPacketsLost()I
+    invoke-virtual {v3}, Lco/discord/media_engine/internal/RtcpStats;->getPacketsLost()I
 
     move-result v21
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Lco/discord/media_engine/internal/RtcpStats;->getFractionLost()F
+    invoke-virtual {v3}, Lco/discord/media_engine/internal/RtcpStats;->getFractionLost()F
 
     move-result v22
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getMediaBitrate()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getMediaBitrate()I
 
     move-result v23
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getTargetMediaBitrate()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getTargetMediaBitrate()I
 
     move-result v24
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getEncodeUsage()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getEncodeUsage()I
 
     move-result v25
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getEncoderImplementationName()Ljava/lang/String;
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getEncoderImplementationName()Ljava/lang/String;
 
     move-result-object v26
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getAvgEncodeTime()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getAvgEncodeTime()I
 
     move-result v27
 
-    new-instance v4, Lco/discord/media_engine/Resolution;
+    new-instance v3, Lco/discord/media_engine/Resolution;
 
-    move-object/from16 v28, v4
+    move-object/from16 v28, v3
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getWidth()I
 
-    move-result v5
+    move-result v4
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getHeight()I
 
     move-result v11
 
-    invoke-direct {v4, v5, v11}, Lco/discord/media_engine/Resolution;-><init>(II)V
+    invoke-direct {v3, v4, v11}, Lco/discord/media_engine/Resolution;-><init>(II)V
+
+    invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getFrameCounts()Lco/discord/media_engine/internal/FrameCounts;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lco/discord/media_engine/internal/FrameCounts;->getDeltaFrames()I
+
+    move-result v3
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getFrameCounts()Lco/discord/media_engine/internal/FrameCounts;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lco/discord/media_engine/internal/FrameCounts;->getDeltaFrames()I
+    invoke-virtual {v4}, Lco/discord/media_engine/internal/FrameCounts;->getKeyFrames()I
 
     move-result v4
 
-    invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getFrameCounts()Lco/discord/media_engine/internal/FrameCounts;
+    add-int v29, v4, v3
 
-    move-result-object v5
-
-    invoke-virtual {v5}, Lco/discord/media_engine/internal/FrameCounts;->getKeyFrames()I
-
-    move-result v5
-
-    add-int v29, v5, v4
-
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getFramesEncoded()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getFramesEncoded()I
 
     move-result v30
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getInputFrameRate()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getInputFrameRate()I
 
     move-result v31
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getEncodeFrameRate()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getEncodeFrameRate()I
 
     move-result v32
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Lco/discord/media_engine/internal/RtcpStats;->getFirPackets()I
+    invoke-virtual {v3}, Lco/discord/media_engine/internal/RtcpStats;->getFirPackets()I
 
     move-result v33
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Lco/discord/media_engine/internal/RtcpStats;->getNackPackets()I
+    invoke-virtual {v3}, Lco/discord/media_engine/internal/RtcpStats;->getNackPackets()I
 
     move-result v34
 
     invoke-virtual {v13}, Lco/discord/media_engine/internal/Substream;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Lco/discord/media_engine/internal/RtcpStats;->getPliPackets()I
+    invoke-virtual {v3}, Lco/discord/media_engine/internal/RtcpStats;->getPliPackets()I
 
     move-result v35
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getQpSum()I
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getQpSum()I
 
     move-result v36
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getBwLimitedResolution()Z
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getBwLimitedResolution()Z
 
     move-result v37
 
-    invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundVideo;->getCpuLimitedResolution()Z
+    invoke-virtual {v1}, Lco/discord/media_engine/internal/OutboundVideo;->getCpuLimitedResolution()Z
 
     move-result v38
 
-    new-instance v2, Lco/discord/media_engine/OutboundRtpVideo;
+    new-instance v1, Lco/discord/media_engine/OutboundRtpVideo;
 
-    move-object v14, v2
+    move-object v14, v1
 
-    const-string v15, "video"
+    const-string/jumbo v15, "video"
 
     move-object/from16 v17, v10
 
     invoke-direct/range {v14 .. v38}, Lco/discord/media_engine/OutboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIIILjava/lang/String;ILco/discord/media_engine/Resolution;IIIIIIIIZZ)V
 
-    move-object v13, v2
+    move-object v13, v1
 
     move-wide/from16 v45, v8
 
@@ -723,20 +725,20 @@
 
     invoke-virtual {v0}, Lco/discord/media_engine/internal/NativeStats;->getInbound()[Lco/discord/media_engine/internal/Inbound;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_13
+    if-eqz v1, :cond_13
 
-    array-length v4, v2
+    array-length v3, v1
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     const-wide/16 v39, 0x0
 
     :goto_8
-    if-ge v5, v4, :cond_12
+    if-ge v4, v3, :cond_12
 
-    aget-object v8, v2, v5
+    aget-object v8, v1, v4
 
     invoke-virtual {v8}, Lco/discord/media_engine/internal/Inbound;->getId()Ljava/lang/String;
 
@@ -768,16 +770,16 @@
 
     invoke-virtual {v8}, Lco/discord/media_engine/internal/Inbound;->getPlayout()Lco/discord/media_engine/internal/InboundPlayout;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-direct {v11, v6}, Lco/discord/media_engine/internal/TransformStats;->transformPlayoutStats(Lco/discord/media_engine/internal/InboundPlayout;)Lco/discord/media_engine/internal/InboundPlayout;
+    invoke-direct {v11, v5}, Lco/discord/media_engine/internal/TransformStats;->transformPlayoutStats(Lco/discord/media_engine/internal/InboundPlayout;)Lco/discord/media_engine/internal/InboundPlayout;
 
-    move-result-object v6
+    move-result-object v5
 
     goto :goto_9
 
     :cond_8
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     :goto_9
     new-instance v11, Lco/discord/media_engine/InboundRtpAudio;
@@ -786,17 +788,17 @@
 
     move-result v49
 
-    new-instance v1, Lco/discord/media_engine/StatsCodec;
+    new-instance v7, Lco/discord/media_engine/StatsCodec;
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getCodecPayloadType()I
 
-    move-result v7
+    move-result v6
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getCodecName()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-direct {v1, v7, v3}, Lco/discord/media_engine/StatsCodec;-><init>(ILjava/lang/String;)V
+    invoke-direct {v7, v6, v2}, Lco/discord/media_engine/StatsCodec;-><init>(ILjava/lang/String;)V
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getPacketsReceived()I
 
@@ -812,19 +814,19 @@
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getAudioLevel()I
 
-    move-result v3
+    move-result v2
 
-    int-to-float v3, v3
+    int-to-float v2, v2
 
-    const/high16 v7, 0x47000000    # 32768.0f
+    const/high16 v6, 0x47000000    # 32768.0f
 
-    div-float v56, v3, v7
+    div-float v56, v2, v6
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getSpeaking()I
 
-    move-result v3
+    move-result v2
 
-    if-lez v3, :cond_9
+    if-lez v2, :cond_9
 
     const/16 v57, 0x1
 
@@ -872,67 +874,67 @@
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getOpSilence()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v67
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getOpNormal()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v68
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getOpMerge()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v69
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getOpExpand()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v70
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getOpAccelerate()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v71
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getOpPreemptiveExpand()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v72
 
     invoke-virtual {v10}, Lco/discord/media_engine/internal/InboundAudio;->getOpCNG()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v73
 
-    if-eqz v6, :cond_a
+    if-eqz v5, :cond_a
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioJitterBuffer()Lco/discord/media_engine/PlayoutMetric;
+    invoke-virtual {v5}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioJitterBuffer()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object/from16 v74, v3
+    move-object/from16 v74, v2
 
     goto :goto_b
 
@@ -940,13 +942,13 @@
     const/16 v74, 0x0
 
     :goto_b
-    if-eqz v6, :cond_b
+    if-eqz v5, :cond_b
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioJitterDelay()Lco/discord/media_engine/PlayoutMetric;
+    invoke-virtual {v5}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioJitterDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object/from16 v75, v3
+    move-object/from16 v75, v2
 
     goto :goto_c
 
@@ -954,13 +956,13 @@
     const/16 v75, 0x0
 
     :goto_c
-    if-eqz v6, :cond_c
+    if-eqz v5, :cond_c
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioJitterTarget()Lco/discord/media_engine/PlayoutMetric;
+    invoke-virtual {v5}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioJitterTarget()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object/from16 v76, v3
+    move-object/from16 v76, v2
 
     goto :goto_d
 
@@ -968,13 +970,13 @@
     const/16 v76, 0x0
 
     :goto_d
-    if-eqz v6, :cond_d
+    if-eqz v5, :cond_d
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioPlayoutUnderruns()Lco/discord/media_engine/PlayoutMetric;
+    invoke-virtual {v5}, Lco/discord/media_engine/internal/InboundPlayout;->getAudioPlayoutUnderruns()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object/from16 v77, v3
+    move-object/from16 v77, v2
 
     goto :goto_e
 
@@ -982,13 +984,13 @@
     const/16 v77, 0x0
 
     :goto_e
-    if-eqz v6, :cond_e
+    if-eqz v5, :cond_e
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/InboundPlayout;->getRelativeReceptionDelay()Lco/discord/media_engine/PlayoutMetric;
+    invoke-virtual {v5}, Lco/discord/media_engine/internal/InboundPlayout;->getRelativeReceptionDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object/from16 v78, v3
+    move-object/from16 v78, v2
 
     goto :goto_f
 
@@ -996,13 +998,13 @@
     const/16 v78, 0x0
 
     :goto_f
-    if-eqz v6, :cond_f
+    if-eqz v5, :cond_f
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/InboundPlayout;->getRelativePlayoutDelay()Lco/discord/media_engine/PlayoutMetric;
+    invoke-virtual {v5}, Lco/discord/media_engine/internal/InboundPlayout;->getRelativePlayoutDelay()Lco/discord/media_engine/PlayoutMetric;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object/from16 v79, v3
+    move-object/from16 v79, v2
 
     goto :goto_10
 
@@ -1014,7 +1016,7 @@
 
     move-object/from16 v47, v11
 
-    move-object/from16 v50, v1
+    move-object/from16 v50, v7
 
     move-wide/from16 v51, v39
 
@@ -1022,53 +1024,53 @@
 
     invoke-interface {v14, v9, v11}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v2
 
-    check-cast v1, Lco/discord/media_engine/InboundRtpAudio;
+    check-cast v2, Lco/discord/media_engine/InboundRtpAudio;
 
     invoke-virtual {v8}, Lco/discord/media_engine/internal/Inbound;->getVideo()Lco/discord/media_engine/internal/InboundVideo;
 
-    move-result-object v1
+    move-result-object v2
 
-    if-eqz v1, :cond_11
+    if-eqz v2, :cond_11
 
     invoke-virtual {v8}, Lco/discord/media_engine/internal/Inbound;->getVideo()Lco/discord/media_engine/internal/InboundVideo;
 
-    move-result-object v1
+    move-result-object v2
 
-    sget-object v3, Lco/discord/media_engine/internal/TransformStats;->INSTANCE:Lco/discord/media_engine/internal/TransformStats;
+    sget-object v5, Lco/discord/media_engine/internal/TransformStats;->INSTANCE:Lco/discord/media_engine/internal/TransformStats;
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRtpStats()Lco/discord/media_engine/internal/RtpStats;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRtpStats()Lco/discord/media_engine/internal/RtpStats;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-direct {v3, v6}, Lco/discord/media_engine/internal/TransformStats;->sumBytes(Lco/discord/media_engine/internal/RtpStats;)J
+    invoke-direct {v5, v7}, Lco/discord/media_engine/internal/TransformStats;->sumBytes(Lco/discord/media_engine/internal/RtpStats;)J
 
     move-result-wide v51
 
     add-long v39, v39, v51
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getCodecPayloadType()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getCodecPayloadType()I
 
-    move-result v3
+    move-result v5
 
-    const/4 v6, -0x1
+    const/4 v7, -0x1
 
-    if-eq v3, v6, :cond_10
+    if-eq v5, v7, :cond_10
 
-    new-instance v3, Lco/discord/media_engine/StatsCodec;
+    new-instance v5, Lco/discord/media_engine/StatsCodec;
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getCodecPayloadType()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getCodecPayloadType()I
 
-    move-result v6
+    move-result v7
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getCodecName()Ljava/lang/String;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getCodecName()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-direct {v3, v6, v8}, Lco/discord/media_engine/StatsCodec;-><init>(ILjava/lang/String;)V
+    invoke-direct {v5, v7, v8}, Lco/discord/media_engine/StatsCodec;-><init>(ILjava/lang/String;)V
 
-    move-object/from16 v50, v3
+    move-object/from16 v50, v5
 
     goto :goto_11
 
@@ -1076,83 +1078,83 @@
     const/16 v50, 0x0
 
     :goto_11
-    new-instance v3, Lco/discord/media_engine/InboundRtpVideo;
+    new-instance v5, Lco/discord/media_engine/InboundRtpVideo;
 
-    move-object/from16 v47, v3
+    move-object/from16 v47, v5
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getSsrc()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getSsrc()I
 
     move-result v49
 
-    sget-object v6, Lco/discord/media_engine/internal/TransformStats;->INSTANCE:Lco/discord/media_engine/internal/TransformStats;
+    sget-object v7, Lco/discord/media_engine/internal/TransformStats;->INSTANCE:Lco/discord/media_engine/internal/TransformStats;
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRtpStats()Lco/discord/media_engine/internal/RtpStats;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRtpStats()Lco/discord/media_engine/internal/RtpStats;
 
     move-result-object v8
 
-    invoke-direct {v6, v8}, Lco/discord/media_engine/internal/TransformStats;->sumPackets(Lco/discord/media_engine/internal/RtpStats;)I
+    invoke-direct {v7, v8}, Lco/discord/media_engine/internal/TransformStats;->sumPackets(Lco/discord/media_engine/internal/RtpStats;)I
 
     move-result v53
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/RtcpStats;->getPacketsLost()I
+    invoke-virtual {v7}, Lco/discord/media_engine/internal/RtcpStats;->getPacketsLost()I
 
     move-result v54
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/RtcpStats;->getFractionLost()F
+    invoke-virtual {v7}, Lco/discord/media_engine/internal/RtcpStats;->getFractionLost()F
 
     move-result v55
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getTotalBitrate()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getTotalBitrate()I
 
     move-result v56
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getDecode()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getDecode()I
 
     move-result v57
 
-    new-instance v6, Lco/discord/media_engine/Resolution;
+    new-instance v7, Lco/discord/media_engine/Resolution;
 
-    move-object/from16 v58, v6
+    move-object/from16 v58, v7
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getWidth()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getWidth()I
 
     move-result v8
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getHeight()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getHeight()I
 
     move-result v10
 
-    invoke-direct {v6, v8, v10}, Lco/discord/media_engine/Resolution;-><init>(II)V
+    invoke-direct {v7, v8, v10}, Lco/discord/media_engine/Resolution;-><init>(II)V
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getDecoderImplementationName()Ljava/lang/String;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getDecoderImplementationName()Ljava/lang/String;
 
     move-result-object v59
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getFramesDecoded()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getFramesDecoded()I
 
     move-result v60
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getDiscardedPackets()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getDiscardedPackets()I
 
     move-result v61
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getFrameCounts()Lco/discord/media_engine/internal/FrameCounts;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getFrameCounts()Lco/discord/media_engine/internal/FrameCounts;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/FrameCounts;->getDeltaFrames()I
+    invoke-virtual {v7}, Lco/discord/media_engine/internal/FrameCounts;->getDeltaFrames()I
 
-    move-result v6
+    move-result v7
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getFrameCounts()Lco/discord/media_engine/internal/FrameCounts;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getFrameCounts()Lco/discord/media_engine/internal/FrameCounts;
 
     move-result-object v8
 
@@ -1160,64 +1162,64 @@
 
     move-result v8
 
-    add-int v62, v8, v6
+    add-int v62, v8, v7
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getDecodeFrameRate()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getDecodeFrameRate()I
 
     move-result v63
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getNetworkFrameRate()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getNetworkFrameRate()I
 
     move-result v64
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRenderFrameRate()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRenderFrameRate()I
 
     move-result v65
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/RtcpStats;->getFirPackets()I
+    invoke-virtual {v7}, Lco/discord/media_engine/internal/RtcpStats;->getFirPackets()I
 
     move-result v66
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/RtcpStats;->getNackPackets()I
+    invoke-virtual {v7}, Lco/discord/media_engine/internal/RtcpStats;->getNackPackets()I
 
     move-result v67
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getRtcpStats()Lco/discord/media_engine/internal/RtcpStats;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6}, Lco/discord/media_engine/internal/RtcpStats;->getPliPackets()I
+    invoke-virtual {v7}, Lco/discord/media_engine/internal/RtcpStats;->getPliPackets()I
 
     move-result v68
 
-    invoke-virtual {v1}, Lco/discord/media_engine/internal/InboundVideo;->getQpSum()I
+    invoke-virtual {v2}, Lco/discord/media_engine/internal/InboundVideo;->getQpSum()I
 
     move-result v69
 
-    const-string v48, "video"
+    const-string/jumbo v48, "video"
 
     invoke-direct/range {v47 .. v69}, Lco/discord/media_engine/InboundRtpVideo;-><init>(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFIILco/discord/media_engine/Resolution;Ljava/lang/String;IIIIIIIIII)V
 
-    invoke-interface {v15, v9, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v15, v9, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v2
 
-    check-cast v1, Lco/discord/media_engine/InboundRtpVideo;
+    check-cast v2, Lco/discord/media_engine/InboundRtpVideo;
 
     :cond_11
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v4, v4, 0x1
 
-    const/high16 v3, 0x47000000    # 32768.0f
+    const/high16 v2, 0x47000000    # 32768.0f
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     goto/16 :goto_8
 
@@ -1295,15 +1297,6 @@
     invoke-direct/range {v10 .. v15}, Lco/discord/media_engine/Stats;-><init>(Lco/discord/media_engine/Transport;Lco/discord/media_engine/OutboundRtpAudio;Lco/discord/media_engine/OutboundRtpVideo;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_15
-    const-string v0, "stats"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method private final transformPlayoutStats(Lco/discord/media_engine/internal/InboundPlayout;)Lco/discord/media_engine/internal/InboundPlayout;
diff --git a/com.discord/smali/co/discord/media_engine/internal/Transport.smali b/com.discord/smali/co/discord/media_engine/internal/Transport.smali
index 16b2fef876..352120631a 100644
--- a/com.discord/smali/co/discord/media_engine/internal/Transport.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/Transport.smali
@@ -21,9 +21,11 @@
 
 # direct methods
 .method public constructor <init>(IFFIILjava/lang/String;[Lco/discord/media_engine/internal/ReceiverReport;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p6, :cond_0
+    const-string v0, "localAddress"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,15 +44,6 @@
     iput-object p7, p0, Lco/discord/media_engine/internal/Transport;->receiverReports:[Lco/discord/media_engine/internal/ReceiverReport;
 
     return-void
-
-    :cond_0
-    const-string p1, "localAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lco/discord/media_engine/internal/Transport;IFFIILjava/lang/String;[Lco/discord/media_engine/internal/ReceiverReport;ILjava/lang/Object;)Lco/discord/media_engine/internal/Transport;
@@ -201,38 +194,31 @@
 .method public final copy(IFFIILjava/lang/String;[Lco/discord/media_engine/internal/ReceiverReport;)Lco/discord/media_engine/internal/Transport;
     .locals 9
 
-    if-eqz p6, :cond_0
-
-    new-instance v8, Lco/discord/media_engine/internal/Transport;
-
-    move-object v0, v8
-
-    move v1, p1
-
-    move v2, p2
-
-    move v3, p3
-
-    move v4, p4
-
-    move v5, p5
-
-    move-object v6, p6
-
-    move-object/from16 v7, p7
-
-    invoke-direct/range {v0 .. v7}, Lco/discord/media_engine/internal/Transport;-><init>(IFFIILjava/lang/String;[Lco/discord/media_engine/internal/ReceiverReport;)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "localAddress"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v7, p6
 
-    const/4 v0, 0x0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lco/discord/media_engine/internal/Transport;
+
+    move-object v1, v0
+
+    move v2, p1
+
+    move v3, p2
+
+    move v4, p3
+
+    move v5, p4
+
+    move v6, p5
+
+    move-object/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lco/discord/media_engine/internal/Transport;-><init>(IFFIILjava/lang/String;[Lco/discord/media_engine/internal/ReceiverReport;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -322,7 +308,7 @@
 
     iget-object v3, p1, Lco/discord/media_engine/internal/Transport;->localAddress:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -332,7 +318,7 @@
 
     iget-object p1, p1, Lco/discord/media_engine/internal/Transport;->receiverReports:[Lco/discord/media_engine/internal/ReceiverReport;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/adjust/sdk/AdjustAttribution.smali b/com.discord/smali/com/adjust/sdk/AdjustAttribution.smali
index a20190b088..561ed74bbb 100644
--- a/com.discord/smali/com/adjust/sdk/AdjustAttribution.smali
+++ b/com.discord/smali/com/adjust/sdk/AdjustAttribution.smali
@@ -147,7 +147,7 @@
 
     invoke-direct {v1}, Lcom/adjust/sdk/AdjustAttribution;-><init>()V
 
-    const-string v2, "unity"
+    const-string/jumbo v2, "unity"
 
     invoke-virtual {v2, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
index 95e31e0377..eb177e0e5a 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
@@ -1241,7 +1241,7 @@
 .end method
 
 .method public setAnimationFromJson(Ljava/lang/String;)V
-    .locals 2
+    .locals 3
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
@@ -1253,15 +1253,25 @@
 
     invoke-direct {v0, p1}, Ljava/io/ByteArrayInputStream;-><init>([B)V
 
-    invoke-static {v0}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
+    const-string p1, "$receiver"
 
-    move-result-object p1
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
+    new-instance v1, Lp0/m;
 
-    move-result-object p1
+    new-instance v2, Lp0/x;
 
-    invoke-static {p1}, Lf/d/a/x/h0/c;->p(Lo0/g;)Lf/d/a/x/h0/c;
+    invoke-direct {v2}, Lp0/x;-><init>()V
+
+    invoke-direct {v1, v0, v2}, Lp0/m;-><init>(Ljava/io/InputStream;Lp0/x;)V
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lp0/q;
+
+    invoke-direct {p1, v1}, Lp0/q;-><init>(Lp0/w;)V
+
+    invoke-static {p1}, Lf/d/a/x/h0/c;->p(Lp0/g;)Lf/d/a/x/h0/c;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/airbnb/lottie/R$a.smali b/com.discord/smali/com/airbnb/lottie/R$a.smali
index 8ec23ce67b..66dfa70edd 100644
--- a/com.discord/smali/com/airbnb/lottie/R$a.smali
+++ b/com.discord/smali/com/airbnb/lottie/R$a.smali
@@ -1241,7 +1241,7 @@
 
     new-array v4, v0, [I
 
-    const v6, 0x7f0404af
+    const v6, 0x7f0404a1
 
     aput v6, v4, v3
 
@@ -1354,10 +1354,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1366,8 +1366,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1384,8 +1384,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -1415,17 +1415,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_9
@@ -1460,8 +1460,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_b
@@ -1559,38 +1559,38 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_c
@@ -1611,7 +1611,7 @@
     :array_e
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_f
@@ -1633,8 +1633,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_11
@@ -1658,7 +1658,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_13
@@ -1693,7 +1693,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_16
@@ -1761,8 +1761,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_1b
@@ -1775,7 +1775,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_1c
@@ -1805,11 +1805,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_1f
@@ -1836,17 +1836,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_22
@@ -1865,8 +1865,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_23
@@ -1889,18 +1889,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_24
@@ -1909,7 +1909,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_25
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 3c9afaad0a..fe9fdafcf9 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -42,11 +42,11 @@
 
 .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
 
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1249"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1251"
 
-.field public static final VERSION_CODE:I = 0x4e1
+.field public static final VERSION_CODE:I = 0x4e3
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "38.0"
+.field public static final VERSION_NAME:Ljava/lang/String; = "38.1"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/R$a.smali b/com.discord/smali/com/discord/R$a.smali
index 5ddfde2adc..7737b9cd6e 100644
--- a/com.discord/smali/com/discord/R$a.smali
+++ b/com.discord/smali/com/discord/R$a.smali
@@ -2956,36 +2956,6 @@
 
 .field public static final StatusView_sv_show_mobile:I = 0x3
 
-.field public static final SuperBar:[I
-
-.field public static final SuperBar_sb_barBackgroundColor:I = 0x0
-
-.field public static final SuperBar_sb_barColor:I = 0x1
-
-.field public static final SuperBar_sb_barControlColor:I = 0x2
-
-.field public static final SuperBar_sb_barControlRadius:I = 0x3
-
-.field public static final SuperBar_sb_barControlShadowColor:I = 0x4
-
-.field public static final SuperBar_sb_barControlShadowRadius:I = 0x5
-
-.field public static final SuperBar_sb_barHeight:I = 0x6
-
-.field public static final SuperBar_sb_barInterval:I = 0x7
-
-.field public static final SuperBar_sb_barOverlayColor:I = 0x8
-
-.field public static final SuperBar_sb_barOverlayValue:I = 0x9
-
-.field public static final SuperBar_sb_barTouchEnabled:I = 0xa
-
-.field public static final SuperBar_sb_barValue:I = 0xb
-
-.field public static final SuperBar_sb_barValueMax:I = 0xc
-
-.field public static final SuperBar_sb_barValueMin:I = 0xd
-
 .field public static final SwipeRefreshLayout:[I
 
 .field public static final SwipeRefreshLayout_swipeRefreshLayoutProgressSpinnerBackgroundColor:I = 0x0
@@ -3903,7 +3873,7 @@
 
     new-array v15, v1, [I
 
-    const v16, 0x7f04058b
+    const v16, 0x7f04057d
 
     aput v16, v15, v4
 
@@ -4285,7 +4255,7 @@
 
     new-array v0, v1, [I
 
-    const v5, 0x7f0404af
+    const v5, 0x7f0404a1
 
     aput v5, v0, v4
 
@@ -4339,7 +4309,7 @@
 
     new-array v5, v1, [I
 
-    const v8, 0x7f040598
+    const v8, 0x7f04058a
 
     aput v8, v5, v4
 
@@ -4491,15 +4461,9 @@
 
     sput-object v2, Lcom/discord/R$a;->StatusView:[I
 
-    new-array v2, v11, [I
-
-    fill-array-data v2, :array_78
-
-    sput-object v2, Lcom/discord/R$a;->SuperBar:[I
-
     new-array v2, v1, [I
 
-    const v5, 0x7f0404d1
+    const v5, 0x7f0404c3
 
     aput v5, v2, v4
 
@@ -4507,13 +4471,13 @@
 
     new-array v2, v11, [I
 
-    fill-array-data v2, :array_79
+    fill-array-data v2, :array_78
 
     sput-object v2, Lcom/discord/R$a;->SwitchCompat:[I
 
     new-array v2, v1, [I
 
-    const v5, 0x7f04058a
+    const v5, 0x7f04057c
 
     aput v5, v2, v4
 
@@ -4521,19 +4485,19 @@
 
     new-array v2, v14, [I
 
-    fill-array-data v2, :array_7a
+    fill-array-data v2, :array_79
 
     sput-object v2, Lcom/discord/R$a;->SwitchPreference:[I
 
     new-array v2, v14, [I
 
-    fill-array-data v2, :array_7b
+    fill-array-data v2, :array_7a
 
     sput-object v2, Lcom/discord/R$a;->SwitchPreferenceCompat:[I
 
     new-array v2, v12, [I
 
-    fill-array-data v2, :array_7c
+    fill-array-data v2, :array_7b
 
     sput-object v2, Lcom/discord/R$a;->TabItem:[I
 
@@ -4541,25 +4505,25 @@
 
     new-array v2, v2, [I
 
-    fill-array-data v2, :array_7d
+    fill-array-data v2, :array_7c
 
     sput-object v2, Lcom/discord/R$a;->TabLayout:[I
 
     new-array v2, v3, [I
 
-    fill-array-data v2, :array_7e
+    fill-array-data v2, :array_7d
 
     sput-object v2, Lcom/discord/R$a;->TernaryCheckBox:[I
 
     new-array v0, v0, [I
 
-    fill-array-data v0, :array_7f
+    fill-array-data v0, :array_7e
 
     sput-object v0, Lcom/discord/R$a;->TextAppearance:[I
 
     new-array v0, v1, [I
 
-    const v2, 0x7f040512
+    const v2, 0x7f040504
 
     aput v2, v0, v4
 
@@ -4569,13 +4533,13 @@
 
     new-array v0, v0, [I
 
-    fill-array-data v0, :array_80
+    fill-array-data v0, :array_7f
 
     sput-object v0, Lcom/discord/R$a;->TextInputLayout:[I
 
     new-array v0, v12, [I
 
-    fill-array-data v0, :array_81
+    fill-array-data v0, :array_80
 
     sput-object v0, Lcom/discord/R$a;->ThemeEnforcement:[I
 
@@ -4583,19 +4547,19 @@
 
     new-array v0, v0, [I
 
-    fill-array-data v0, :array_82
+    fill-array-data v0, :array_81
 
     sput-object v0, Lcom/discord/R$a;->Toolbar:[I
 
     new-array v0, v7, [I
 
-    fill-array-data v0, :array_83
+    fill-array-data v0, :array_82
 
     sput-object v0, Lcom/discord/R$a;->Tooltip:[I
 
     new-array v0, v1, [I
 
-    const v2, 0x7f040591
+    const v2, 0x7f040583
 
     aput v2, v0, v4
 
@@ -4603,7 +4567,7 @@
 
     new-array v0, v1, [I
 
-    const v2, 0x7f040593
+    const v2, 0x7f040585
 
     aput v2, v0, v4
 
@@ -4611,25 +4575,25 @@
 
     new-array v0, v15, [I
 
-    fill-array-data v0, :array_84
+    fill-array-data v0, :array_83
 
     sput-object v0, Lcom/discord/R$a;->UsernameView:[I
 
     new-array v0, v3, [I
 
-    fill-array-data v0, :array_85
+    fill-array-data v0, :array_84
 
     sput-object v0, Lcom/discord/R$a;->VideoCallParticipantView:[I
 
     new-array v0, v15, [I
 
-    fill-array-data v0, :array_86
+    fill-array-data v0, :array_85
 
     sput-object v0, Lcom/discord/R$a;->View:[I
 
     new-array v0, v12, [I
 
-    fill-array-data v0, :array_87
+    fill-array-data v0, :array_86
 
     sput-object v0, Lcom/discord/R$a;->ViewBackgroundHelper:[I
 
@@ -4643,13 +4607,13 @@
 
     new-array v0, v12, [I
 
-    fill-array-data v0, :array_88
+    fill-array-data v0, :array_87
 
     sput-object v0, Lcom/discord/R$a;->ViewStubCompat:[I
 
     new-array v0, v1, [I
 
-    const v1, 0x7f04059f
+    const v1, 0x7f040591
 
     aput v1, v0, v4
 
@@ -4657,13 +4621,13 @@
 
     new-array v0, v3, [I
 
-    fill-array-data v0, :array_89
+    fill-array-data v0, :array_88
 
     sput-object v0, Lcom/discord/R$a;->WidgetInviteInfo:[I
 
     new-array v0, v12, [I
 
-    fill-array-data v0, :array_8a
+    fill-array-data v0, :array_89
 
     sput-object v0, Lcom/discord/R$a;->ucrop_AspectRatioTextView:[I
 
@@ -4671,14 +4635,12 @@
 
     new-array v0, v0, [I
 
-    fill-array-data v0, :array_8b
+    fill-array-data v0, :array_8a
 
     sput-object v0, Lcom/discord/R$a;->ucrop_UCropView:[I
 
     return-void
 
-    nop
-
     :array_0
     .array-data 4
         0x7f04004e
@@ -4706,10 +4668,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -4718,8 +4680,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -4736,8 +4698,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -4773,15 +4735,15 @@
         0x7f04021a
         0x7f040380
         0x7f040381
-        0x7f0404b6
+        0x7f0404a8
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f0404b0
-        0x7f0404b1
-        0x7f0404b3
-        0x7f0404b4
+        0x7f0404a2
+        0x7f0404a3
+        0x7f0404a5
+        0x7f0404a6
     .end array-data
 
     :array_9
@@ -4793,17 +4755,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_c
@@ -4838,8 +4800,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_e
@@ -4937,52 +4899,52 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_f
     .array-data 4
         0x101014f
-        0x7f040574
-        0x7f040575
-        0x7f040576
+        0x7f040566
+        0x7f040567
+        0x7f040568
     .end array-data
 
     :array_10
     .array-data 4
         0x101030e
-        0x7f04047e
+        0x7f040470
     .end array-data
 
     :array_11
@@ -4993,7 +4955,7 @@
         0x7f040271
         0x7f0403bc
         0x7f0403d1
-        0x7f04059b
+        0x7f04058d
     .end array-data
 
     :array_12
@@ -5008,8 +4970,8 @@
         0x7f04032b
         0x7f0403a5
         0x7f040452
-        0x7f04048a
-        0x7f0404a7
+        0x7f04047c
+        0x7f040499
     .end array-data
 
     :array_13
@@ -5056,16 +5018,16 @@
         0x7f04006b
         0x7f04006c
         0x7f040251
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_16
     .array-data 4
         0x7f04005a
         0x7f040093
-        0x7f0404f7
-        0x7f040516
+        0x7f0404e9
+        0x7f040508
     .end array-data
 
     :array_17
@@ -5166,8 +5128,8 @@
         0x10101f0
         0x10101f1
         0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
+        0x7f0404bc
+        0x7f0404bd
     .end array-data
 
     :array_1c
@@ -5227,11 +5189,11 @@
         0x7f0402d6
         0x7f0402db
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040511
-        0x7f040515
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f040503
+        0x7f040507
     .end array-data
 
     :array_1e
@@ -5240,9 +5202,9 @@
         0x7f040100
         0x7f040101
         0x7f040102
-        0x7f040480
-        0x7f04049a
-        0x7f04049c
+        0x7f040472
+        0x7f04048c
+        0x7f04048e
     .end array-data
 
     :array_1f
@@ -5283,12 +5245,12 @@
         0x7f040220
         0x7f040221
         0x7f0403c0
-        0x7f040468
-        0x7f04046a
-        0x7f0404b7
-        0x7f040553
-        0x7f040554
-        0x7f040560
+        0x7f04045a
+        0x7f04045c
+        0x7f0404a9
+        0x7f040545
+        0x7f040546
+        0x7f040552
     .end array-data
 
     :array_21
@@ -5504,7 +5466,7 @@
     :array_2b
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_2c
@@ -5525,9 +5487,9 @@
         0x7f04018c
         0x7f0401e4
         0x7f0403ea
-        0x7f040466
-        0x7f040481
-        0x7f040572
+        0x7f040458
+        0x7f040473
+        0x7f040564
     .end array-data
 
     :array_2e
@@ -5538,13 +5500,13 @@
         0x7f040094
         0x7f0403f1
         0x7f0403f2
-        0x7f04046b
-        0x7f04046c
-        0x7f04046d
-        0x7f04046e
-        0x7f04046f
-        0x7f040569
-        0x7f040587
+        0x7f04045d
+        0x7f04045e
+        0x7f04045f
+        0x7f040460
+        0x7f040461
+        0x7f04055b
+        0x7f040579
     .end array-data
 
     :array_2f
@@ -5571,8 +5533,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_31
@@ -5580,8 +5542,8 @@
         0x7f040201
         0x7f040222
         0x7f040266
-        0x7f040490
-        0x7f040497
+        0x7f040482
+        0x7f040489
     .end array-data
 
     :array_32
@@ -5607,9 +5569,9 @@
         0x7f040241
         0x7f040323
         0x7f0403bf
-        0x7f04048c
-        0x7f04048d
-        0x7f04048e
+        0x7f04047e
+        0x7f04047f
+        0x7f040480
     .end array-data
 
     :array_35
@@ -5641,10 +5603,10 @@
         0x7f0403be
         0x7f040407
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040589
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f04057b
     .end array-data
 
     :array_37
@@ -5676,7 +5638,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_3a
@@ -5729,7 +5691,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_3e
@@ -5737,15 +5699,15 @@
         0x7f0401cc
         0x7f0401cd
         0x7f0401ce
-        0x7f040470
-        0x7f040473
-        0x7f040482
+        0x7f040462
+        0x7f040465
+        0x7f040474
     .end array-data
 
     :array_3f
     .array-data 4
-        0x7f040475
-        0x7f040478
+        0x7f040467
+        0x7f04046a
     .end array-data
 
     :array_40
@@ -5773,11 +5735,11 @@
     :array_42
     .array-data 4
         0x7f040305
-        0x7f0404a1
-        0x7f04055e
-        0x7f04058e
-        0x7f04058f
-        0x7f040590
+        0x7f040493
+        0x7f040550
+        0x7f040580
+        0x7f040581
+        0x7f040582
     .end array-data
 
     :array_43
@@ -5797,7 +5759,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_45
@@ -5820,7 +5782,7 @@
         0x10101f8
         0x7f040210
         0x7f040211
-        0x7f04058b
+        0x7f04057d
     .end array-data
 
     :array_48
@@ -5896,17 +5858,17 @@
         0x7f0402dc
         0x7f0402dd
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_4e
     .array-data 4
         0x7f0400ee
-        0x7f040480
-        0x7f04049c
+        0x7f040472
+        0x7f04048e
     .end array-data
 
     :array_4f
@@ -5917,9 +5879,9 @@
         0x7f0401ca
         0x7f0401cb
         0x7f04043c
-        0x7f0405ab
-        0x7f0405ac
-        0x7f0405ad
+        0x7f04059d
+        0x7f04059e
+        0x7f04059f
     .end array-data
 
     :array_50
@@ -5943,29 +5905,29 @@
         0x7f0400f0
         0x7f0400f2
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404b2
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404a4
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_52
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_53
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_54
     .array-data 4
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_55
@@ -6014,8 +5976,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_59
@@ -6028,7 +5990,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_5a
@@ -6076,16 +6038,16 @@
         0x7f0403f2
         0x7f040441
         0x7f040446
-        0x7f04046b
-        0x7f04046c
-        0x7f04046d
-        0x7f04046e
-        0x7f04046f
-        0x7f040495
-        0x7f040496
-        0x7f040550
-        0x7f040569
-        0x7f040587
+        0x7f04045d
+        0x7f04045e
+        0x7f04045f
+        0x7f040460
+        0x7f040461
+        0x7f040487
+        0x7f040488
+        0x7f040542
+        0x7f04055b
+        0x7f040579
     .end array-data
 
     :array_5d
@@ -6107,21 +6069,21 @@
         0x7f040441
         0x7f040442
         0x7f040446
-        0x7f04046b
-        0x7f04046c
-        0x7f04046d
-        0x7f04046e
-        0x7f04046f
-        0x7f040494
-        0x7f040495
-        0x7f040496
-        0x7f040498
-        0x7f0404cc
-        0x7f040550
-        0x7f040569
-        0x7f040587
-        0x7f04058c
-        0x7f04058d
+        0x7f04045d
+        0x7f04045e
+        0x7f04045f
+        0x7f040460
+        0x7f040461
+        0x7f040486
+        0x7f040487
+        0x7f040488
+        0x7f04048a
+        0x7f0404be
+        0x7f040542
+        0x7f04055b
+        0x7f040579
+        0x7f04057e
+        0x7f04057f
     .end array-data
 
     :array_5e
@@ -6163,12 +6125,12 @@
         0x7f04032d
         0x7f0403d3
         0x7f0403eb
-        0x7f04047d
-        0x7f040489
-        0x7f04049b
-        0x7f0404c9
-        0x7f040553
-        0x7f0405a0
+        0x7f04046f
+        0x7f04047b
+        0x7f04048d
+        0x7f0404bb
+        0x7f040545
+        0x7f040592
     .end array-data
 
     :array_60
@@ -6217,9 +6179,9 @@
         0x7f0403ff
         0x7f040400
         0x7f040401
-        0x7f04047b
-        0x7f0404d4
-        0x7f0404d5
+        0x7f04046d
+        0x7f0404c6
+        0x7f0404c7
     .end array-data
 
     :array_65
@@ -6234,7 +6196,7 @@
         0x7f040302
         0x7f040307
         0x7f040384
-        0x7f04056b
+        0x7f04055d
     .end array-data
 
     :array_66
@@ -6255,30 +6217,30 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_68
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_69
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_6a
     .array-data 4
-        0x7f0404bc
-        0x7f0404bd
+        0x7f0404ae
+        0x7f0404af
     .end array-data
 
     :array_6b
@@ -6295,22 +6257,22 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_6c
     .array-data 4
         0x7f0402fe
         0x7f0403ce
-        0x7f040465
-        0x7f040476
-        0x7f040477
-        0x7f040479
-        0x7f0404c0
+        0x7f040457
+        0x7f040468
+        0x7f040469
+        0x7f04046b
+        0x7f0404b2
     .end array-data
 
     :array_6d
@@ -6319,9 +6281,9 @@
         0x1010136
         0x7f04002a
         0x7f0403c6
-        0x7f04047a
-        0x7f040491
-        0x7f040588
+        0x7f04046c
+        0x7f040483
+        0x7f04057a
     .end array-data
 
     :array_6e
@@ -6340,17 +6302,17 @@
 
     :array_6f
     .array-data 4
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_70
     .array-data 4
         0x7f04009e
         0x7f040157
-        0x7f040467
+        0x7f040459
     .end array-data
 
     :array_71
@@ -6385,7 +6347,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_72
@@ -6398,23 +6360,23 @@
         0x7f04025f
         0x7f040327
         0x7f040328
-        0x7f040544
-        0x7f040545
-        0x7f040546
-        0x7f04054a
-        0x7f04054b
-        0x7f04054c
-        0x7f04056b
-        0x7f04056c
-        0x7f04056d
-        0x7f04056e
+        0x7f040536
+        0x7f040537
+        0x7f040538
+        0x7f04053c
+        0x7f04053d
+        0x7f04053e
+        0x7f04055d
+        0x7f04055e
+        0x7f04055f
+        0x7f040560
     .end array-data
 
     :array_73
     .array-data 4
-        0x7f04049e
-        0x7f04049f
-        0x7f0404a0
+        0x7f040490
+        0x7f040491
+        0x7f040492
     .end array-data
 
     :array_74
@@ -6450,46 +6412,42 @@
 
     :array_77
     .array-data 4
-        0x7f0404cd
-        0x7f0404ce
-        0x7f0404cf
-        0x7f0404d0
+        0x7f0404bf
+        0x7f0404c0
+        0x7f0404c1
+        0x7f0404c2
     .end array-data
 
     :array_78
     .array-data 4
-        0x7f040457
-        0x7f040458
-        0x7f040459
-        0x7f04045a
-        0x7f04045b
-        0x7f04045c
-        0x7f04045d
-        0x7f04045e
-        0x7f04045f
-        0x7f040460
-        0x7f040461
-        0x7f040462
-        0x7f040463
-        0x7f040464
+        0x1010124
+        0x1010125
+        0x1010142
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_79
     .array-data 4
-        0x1010124
-        0x1010125
-        0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x10101ef
+        0x10101f0
+        0x10101f1
+        0x101036b
+        0x101036c
+        0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
+        0x7f0404ca
+        0x7f0404cb
     .end array-data
 
     :array_7a
@@ -6500,35 +6458,35 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_7b
-    .array-data 4
-        0x10101ef
-        0x10101f0
-        0x10101f1
-        0x101036b
-        0x101036c
-        0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
-    .end array-data
-
-    :array_7c
     .array-data 4
         0x1010002
         0x10100f2
         0x101014f
     .end array-data
 
-    :array_7d
+    :array_7c
     .array-data 4
+        0x7f0404cc
+        0x7f0404cd
+        0x7f0404ce
+        0x7f0404cf
+        0x7f0404d0
+        0x7f0404d1
+        0x7f0404d2
+        0x7f0404d3
+        0x7f0404d4
+        0x7f0404d5
+        0x7f0404d6
+        0x7f0404d7
+        0x7f0404d8
+        0x7f0404d9
         0x7f0404da
         0x7f0404db
         0x7f0404dc
@@ -6537,32 +6495,18 @@
         0x7f0404df
         0x7f0404e0
         0x7f0404e1
-        0x7f0404e2
         0x7f0404e3
         0x7f0404e4
         0x7f0404e5
-        0x7f0404e6
+    .end array-data
+
+    :array_7d
+    .array-data 4
+        0x101014f
         0x7f0404e7
-        0x7f0404e8
-        0x7f0404e9
-        0x7f0404ea
-        0x7f0404eb
-        0x7f0404ec
-        0x7f0404ed
-        0x7f0404ee
-        0x7f0404ef
-        0x7f0404f1
-        0x7f0404f2
-        0x7f0404f3
     .end array-data
 
     :array_7e
-    .array-data 4
-        0x101014f
-        0x7f0404f5
-    .end array-data
-
-    :array_7f
     .array-data 4
         0x1010095
         0x1010096
@@ -6578,11 +6522,11 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
-    :array_80
+    :array_7f
     .array-data 4
         0x101000e
         0x101009a
@@ -6636,26 +6580,26 @@
         0x7f040402
         0x7f040403
         0x7f040404
-        0x7f040484
-        0x7f040487
-        0x7f0404aa
-        0x7f0404ab
-        0x7f0404ac
-        0x7f0404ad
-        0x7f0404ae
-        0x7f0404c5
-        0x7f0404c6
-        0x7f0404c7
+        0x7f040476
+        0x7f040479
+        0x7f04049c
+        0x7f04049d
+        0x7f04049e
+        0x7f04049f
+        0x7f0404a0
+        0x7f0404b7
+        0x7f0404b8
+        0x7f0404b9
     .end array-data
 
-    :array_81
+    :array_80
     .array-data 4
         0x1010034
         0x7f04020d
         0x7f04020e
     .end array-data
 
-    :array_82
+    :array_81
     .array-data 4
         0x10100af
         0x1010140
@@ -6675,21 +6619,21 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
-    :array_83
+    :array_82
     .array-data 4
         0x1010034
         0x10100d5
@@ -6700,72 +6644,72 @@
         0x7f040058
     .end array-data
 
+    :array_83
+    .array-data 4
+        0x7f0404e6
+        0x7f040586
+        0x7f040587
+        0x7f040588
+        0x7f040589
+    .end array-data
+
     :array_84
     .array-data 4
-        0x7f0404f4
-        0x7f040594
-        0x7f040595
-        0x7f040596
-        0x7f040597
+        0x7f04058b
+        0x7f04058c
     .end array-data
 
     :array_85
-    .array-data 4
-        0x7f040599
-        0x7f04059a
-    .end array-data
-
-    :array_86
     .array-data 4
         0x1010000
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
-    :array_87
+    :array_86
     .array-data 4
         0x10100d4
         0x7f040058
         0x7f040059
     .end array-data
 
-    :array_88
+    :array_87
     .array-data 4
         0x10100d0
         0x10100f2
         0x10100f3
     .end array-data
 
-    :array_89
+    :array_88
     .array-data 4
         0x7f04004c
-        0x7f040592
+        0x7f040584
+    .end array-data
+
+    :array_89
+    .array-data 4
+        0x7f040569
+        0x7f04056a
+        0x7f04056b
     .end array-data
 
     :array_8a
     .array-data 4
+        0x7f04056c
+        0x7f04056d
+        0x7f04056e
+        0x7f04056f
+        0x7f040570
+        0x7f040571
+        0x7f040572
+        0x7f040573
+        0x7f040574
+        0x7f040575
+        0x7f040576
         0x7f040577
         0x7f040578
-        0x7f040579
-    .end array-data
-
-    :array_8b
-    .array-data 4
-        0x7f04057a
-        0x7f04057b
-        0x7f04057c
-        0x7f04057d
-        0x7f04057e
-        0x7f04057f
-        0x7f040580
-        0x7f040581
-        0x7f040582
-        0x7f040583
-        0x7f040584
-        0x7f040585
-        0x7f040586
     .end array-data
 .end method
 
diff --git a/com.discord/smali/com/discord/app/App$b.smali b/com.discord/smali/com/discord/app/App$b.smali
index 9e9b443461..c2ce5da42d 100644
--- a/com.discord/smali/com/discord/app/App$b.smali
+++ b/com.discord/smali/com/discord/app/App$b.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/app/App$b;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "App.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/String;",
         "Ljava/lang/Throwable;",
@@ -35,47 +35,31 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/app/AppLog;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/app/AppLog;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "e"
+
+    const-string v5, "e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "e"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/app/AppLog;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
     check-cast p1, Ljava/lang/String;
 
@@ -83,26 +67,17 @@
 
     check-cast p3, Ljava/util/Map;
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/app/AppLog;
 
-    const/4 v1, 0x6
-
-    invoke-virtual {v0, p1, v1, p2, p3}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, p1, p2, p3}, Lcom/discord/app/AppLog;->e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/App$c.smali b/com.discord/smali/com/discord/app/App$c.smali
index a7a985eb2f..2df47ec9a3 100644
--- a/com.discord/smali/com/discord/app/App$c.smali
+++ b/com.discord/smali/com/discord/app/App$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/App$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "App.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Ljava/lang/String;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,11 +66,13 @@
 
     check-cast v2, Ljava/lang/String;
 
-    const/4 p2, 0x0
+    const-string p2, "textView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_0
+    const-string/jumbo p2, "url"
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
@@ -80,7 +82,7 @@
 
     const-string p1, "textView.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -93,18 +95,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_1
-    const-string p1, "textView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index 4a2d0db006..229a6b8323 100644
--- a/com.discord/smali/com/discord/app/App.smali
+++ b/com.discord/smali/com/discord/app/App.smali
@@ -21,7 +21,7 @@
 
     const/4 v3, 0x2
 
-    invoke-static {v0, v1, v2, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v0, v1, v2, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v0
 
@@ -41,7 +41,7 @@
 
 # virtual methods
 .method public onCreate()V
-    .locals 12
+    .locals 11
 
     invoke-super {p0}, Landroid/app/Application;->onCreate()V
 
@@ -81,7 +81,7 @@
 
     const-string v1, "Backgrounded\n        .get()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -137,7 +137,11 @@
 
     invoke-static {v0}, Landroidx/appcompat/app/AppCompatDelegate;->setDefaultNightMode(I)V
 
-    sget-object v1, Lf/a/b/s0;->d:Lf/a/b/s0;
+    const-string v1, "context"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lf/a/b/u0;->d:Lf/a/b/u0;
 
     sget-object v9, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -146,11 +150,9 @@
     :try_start_0
     const-string v2, "logger"
 
-    const/4 v10, 0x0
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v9, :cond_5
-
-    sget-boolean v2, Lf/a/b/s0;->c:Z
+    sget-boolean v2, Lf/a/b/u0;->c:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -162,20 +164,20 @@
 
     :cond_0
     :try_start_1
-    sget-object v2, Lf/a/b/s0;->a:Ljava/util/List;
+    sget-object v2, Lf/a/b/u0;->a:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v11
+    move-result-object v10
 
     :goto_0
-    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
     if-eqz v2, :cond_1
 
-    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -188,7 +190,7 @@
     :try_start_2
     invoke-static {v8}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
 
-    sget-object v2, Lf/a/b/s0;->b:Ljava/util/List;
+    sget-object v2, Lf/a/b/u0;->b:Ljava/util/List;
 
     invoke-interface {v2, v8}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -258,13 +260,13 @@
     goto :goto_0
 
     :cond_1
-    sget-object v2, Lf/a/b/s0;->b:Ljava/util/List;
+    sget-object v2, Lf/a/b/u0;->b:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
     move-result v2
 
-    sget-object v3, Lf/a/b/s0;->a:Ljava/util/List;
+    sget-object v3, Lf/a/b/u0;->a:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -291,7 +293,7 @@
     goto :goto_1
 
     :cond_2
-    sput-boolean v0, Lf/a/b/s0;->c:Z
+    sput-boolean v0, Lf/a/b/u0;->c:Z
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -325,15 +327,9 @@
     return-void
 
     :cond_4
-    throw v10
+    const/4 v0, 0x0
 
-    :cond_5
-    :try_start_4
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    throw v10
+    throw v0
 
     :catchall_0
     move-exception v0
diff --git a/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali b/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali
index 57dc74be87..9e73547a75 100644
--- a/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$AppAction$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Class<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$a.smali b/com.discord/smali/com/discord/app/AppActivity$a.smali
index 79cb2c166f..dab9f33402 100644
--- a/com.discord/smali/com/discord/app/AppActivity$a.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$a.smali
@@ -24,7 +24,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;I)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "themeName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "localeString"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,7 +62,7 @@
 
     iget-object v1, p1, Lcom/discord/app/AppActivity$a;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -64,7 +72,7 @@
 
     iget-object v1, p1, Lcom/discord/app/AppActivity$a;->b:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$b.smali b/com.discord/smali/com/discord/app/AppActivity$b.smali
index c88655abf3..77c36593af 100644
--- a/com.discord/smali/com/discord/app/AppActivity$b.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     const-string v2, "application"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream$Companion;->initialize(Landroid/app/Application;)V
 
@@ -92,7 +92,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils;->initAppOpen(Landroid/app/Application;)V
 
@@ -104,7 +104,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->initialize(Landroid/app/Application;)V
 
@@ -116,7 +116,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/accessibility/AccessibilityMonitor$Companion;->initialize(Landroid/app/Application;)V
 
@@ -130,7 +130,7 @@
 
     const-string v2, "applicationContext"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/ShareUtils;->updateDirectShareTargets(Landroid/content/Context;)V
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$c.smali b/com.discord/smali/com/discord/app/AppActivity$c.smali
index 76706abc7a..ee72092876 100644
--- a/com.discord/smali/com/discord/app/AppActivity$c.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,15 +68,15 @@
 
     move-result-object v1
 
-    const-string v2, "userSettings.theme"
+    const-string/jumbo v2, "userSettings.theme"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v0, :cond_4
 
-    sget-object v2, Lf/a/b/k;->f:Lf/a/b/k;
+    sget-object v2, Lf/a/b/m;->f:Lf/a/b/m;
 
-    sget-object v2, Lf/a/b/k;->e:Ljava/util/List;
+    sget-object v2, Lf/a/b/m;->e:Ljava/util/List;
 
     invoke-virtual {v0, v2}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
 
@@ -91,7 +91,7 @@
     :cond_0
     const-string v2, "light"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -104,7 +104,7 @@
     :cond_1
     const-string v2, "dark"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -115,7 +115,7 @@
     :cond_2
     const-string v2, "pureEvil"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -137,9 +137,9 @@
 
     move-result-object v1
 
-    const-string v2, "userSettings.locale"
+    const-string/jumbo v2, "userSettings.locale"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$d.smali b/com.discord/smali/com/discord/app/AppActivity$d.smali
index 33e79e9731..27761fe93e 100644
--- a/com.discord/smali/com/discord/app/AppActivity$d.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$d.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz v0, :cond_b
+    if-eqz v0, :cond_9
 
     sget-object v3, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
 
@@ -84,7 +84,7 @@
 
     iget-object v1, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
 
-    if-eqz v1, :cond_a
+    if-eqz v1, :cond_8
 
     if-eqz v0, :cond_0
 
@@ -114,9 +114,9 @@
     goto :goto_1
 
     :cond_2
-    sget-object v0, Lf/a/b/k;->f:Lf/a/b/k;
+    sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
 
-    sget-object v0, Lf/a/b/k;->c:Ljava/util/List;
+    sget-object v0, Lf/a/b/m;->c:Ljava/util/List;
 
     invoke-virtual {v1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
 
@@ -136,15 +136,10 @@
 
     invoke-virtual {v0}, Lcom/discord/app/AppTransitionActivity$Transition;->getAnimations()Lcom/discord/app/AppTransitionActivity$a;
 
-    move-result-object v0
-
-    goto :goto_2
+    move-result-object v2
 
     :cond_4
-    move-object v0, v2
-
-    :goto_2
-    iput-object v0, v1, Lcom/discord/app/AppTransitionActivity;->d:Lcom/discord/app/AppTransitionActivity$a;
+    iput-object v2, v1, Lcom/discord/app/AppTransitionActivity;->d:Lcom/discord/app/AppTransitionActivity$a;
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
 
@@ -170,18 +165,18 @@
 
     const/4 v0, 0x1
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     const/4 v0, 0x0
 
-    :goto_3
+    :goto_2
     if-eqz v0, :cond_6
 
     return-void
 
     :cond_6
-    sget-object v0, Lf/a/b/k;->f:Lf/a/b/k;
+    sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
 
@@ -193,67 +188,57 @@
 
     invoke-virtual {v1}, Lcom/discord/app/AppActivity;->g()Ljava/lang/Class;
 
-    move-result-object v3
+    move-result-object v2
 
-    const v4, 0x1020002
+    const v3, 0x1020002
 
-    if-eqz v1, :cond_9
+    const-string v4, "context"
 
-    if-eqz v3, :cond_8
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "screen"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez v0, :cond_7
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
     move-result-object v0
 
-    const-string v2, "fragmentManager.beginTransaction()"
+    const-string v4, "fragmentManager.beginTransaction()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Ljava/lang/Class;->getName()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v4
 
-    invoke-static {v1, v2}, Landroidx/fragment/app/Fragment;->instantiate(Landroid/content/Context;Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+    invoke-static {v1, v4}, Landroidx/fragment/app/Fragment;->instantiate(Landroid/content/Context;Ljava/lang/String;)Landroidx/fragment/app/Fragment;
 
     move-result-object v1
 
-    const-string v2, "Fragment.instantiate(context, screen.name)"
+    const-string v4, "Fragment.instantiate(context, screen.name)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Ljava/lang/Class;->getName()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v0, v4, v1, v2}, Landroidx/fragment/app/FragmentTransaction;->replace(ILandroidx/fragment/app/Fragment;Ljava/lang/String;)Landroidx/fragment/app/FragmentTransaction;
+    invoke-virtual {v0, v3, v1, v2}, Landroidx/fragment/app/FragmentTransaction;->replace(ILandroidx/fragment/app/Fragment;Ljava/lang/String;)Landroidx/fragment/app/FragmentTransaction;
 
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentTransaction;->commit()I
 
-    :goto_4
+    :goto_3
     return-void
 
     :cond_8
-    const-string v0, "screen"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     throw v2
 
     :cond_9
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_a
-    throw v2
-
-    :cond_b
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$e.smali b/com.discord/smali/com/discord/app/AppActivity$e.smali
index cfe63f8531..735451929e 100644
--- a/com.discord/smali/com/discord/app/AppActivity$e.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$e.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     check-cast v1, Landroidx/appcompat/widget/Toolbar;
 
-    invoke-virtual {v0, v1}, Lcom/discord/app/AppActivity;->t(Landroidx/appcompat/widget/Toolbar;)V
+    invoke-virtual {v0, v1}, Lcom/discord/app/AppActivity;->s(Landroidx/appcompat/widget/Toolbar;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/app/AppActivity$f.smali b/com.discord/smali/com/discord/app/AppActivity$f.smali
index 6ad315225a..6df8005247 100644
--- a/com.discord/smali/com/discord/app/AppActivity$f.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$f.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/app/AppActivity$a;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/app/AppActivity$a;
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/app/AppActivity$f;->this$0:Lcom/discord/app/AppActivity;
 
@@ -71,13 +73,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$g.smali b/com.discord/smali/com/discord/app/AppActivity$g.smali
index 365abdda94..a56554991d 100644
--- a/com.discord/smali/com/discord/app/AppActivity$g.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$g.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Class<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$h.smali b/com.discord/smali/com/discord/app/AppActivity$h.smali
index 9300728a52..b3a9c5af44 100644
--- a/com.discord/smali/com/discord/app/AppActivity$h.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$h.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/AppActivity;->s(ZLandroid/view/View;)V
+    value = Lcom/discord/app/AppActivity;->r(ZLandroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,7 +39,7 @@
 
 # virtual methods
 .method public final run()V
-    .locals 5
+    .locals 3
 
     :try_start_0
     iget-object v0, p0, Lcom/discord/app/AppActivity$h;->d:Landroid/view/View;
@@ -86,13 +86,9 @@
 
     sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x0
+    const-string v2, "Error Opening/Closing the Keyboard"
 
-    const/4 v3, 0x3
-
-    const-string v4, "Error Opening/Closing the Keyboard"
-
-    invoke-virtual {v1, v4, v3, v0, v2}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v1, v2, v0}, Lcom/discord/app/AppLog;->d(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_1
     return-void
diff --git a/com.discord/smali/com/discord/app/AppActivity$i.smali b/com.discord/smali/com/discord/app/AppActivity$i.smali
index 5976282301..3fe0a5dbe4 100644
--- a/com.discord/smali/com/discord/app/AppActivity$i.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$i.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/app/AppActivity;->t(Landroidx/appcompat/widget/Toolbar;)V
+    value = Lcom/discord/app/AppActivity;->s(Landroidx/appcompat/widget/Toolbar;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/app/AppActivity$j.smali b/com.discord/smali/com/discord/app/AppActivity$j.smali
index bec4931f4b..be0804e147 100644
--- a/com.discord/smali/com/discord/app/AppActivity$j.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$j.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppActivity$j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/stores/StoreUserSettings;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity.smali b/com.discord/smali/com/discord/app/AppActivity.smali
index 9a9497b094..4f6fe4132a 100644
--- a/com.discord/smali/com/discord/app/AppActivity.smali
+++ b/com.discord/smali/com/discord/app/AppActivity.smali
@@ -112,17 +112,19 @@
 
     const-string v1, "PublishSubject.create()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/app/AppActivity;->k:Lrx/subjects/Subject;
 
     sget-object v0, Lcom/discord/app/AppActivity$j;->d:Lcom/discord/app/AppActivity$j;
 
-    if-eqz v0, :cond_0
+    const-string v1, "initializer"
 
-    new-instance v1, Lj0/g;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, v0}, Lj0/g;-><init>(Lkotlin/jvm/functions/Function0;)V
+    new-instance v1, Lk0/h;
+
+    invoke-direct {v1, v0}, Lk0/h;-><init>(Lkotlin/jvm/functions/Function0;)V
 
     iput-object v1, p0, Lcom/discord/app/AppActivity;->m:Lkotlin/Lazy;
 
@@ -141,15 +143,6 @@
     iput-object v0, p0, Lcom/discord/app/AppActivity;->o:Landroid/content/Intent;
 
     return-void
-
-    :cond_0
-    const-string v0, "initializer"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public static final synthetic b(Lcom/discord/app/AppActivity;)Lcom/discord/stores/StoreUserSettings;
@@ -175,7 +168,7 @@
 
     const-string v1, "ModelUserSettings.getLoc\u2026bject(model.localeString)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppActivity;->k(Ljava/util/Locale;)Z
 
@@ -196,9 +189,9 @@
     :cond_0
     iget-object v0, p1, Lcom/discord/app/AppActivity$a;->a:Ljava/lang/String;
 
-    sget-object v3, Lf/a/b/k;->f:Lf/a/b/k;
+    sget-object v3, Lf/a/b/m;->f:Lf/a/b/m;
 
-    sget-object v3, Lf/a/b/k;->e:Ljava/util/List;
+    sget-object v3, Lf/a/b/m;->e:Ljava/util/List;
 
     invoke-virtual {p0, v3}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
 
@@ -215,7 +208,7 @@
 
     invoke-direct {v3, p0}, Lf/a/b/e;-><init>(Lcom/discord/app/AppActivity;)V
 
-    const v4, 0x7f04053c
+    const v4, 0x7f04052e
 
     new-instance v5, Landroid/util/TypedValue;
 
@@ -231,7 +224,7 @@
 
     iget-object v3, v5, Landroid/util/TypedValue;->string:Ljava/lang/CharSequence;
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -250,7 +243,7 @@
 
     const-string v4, "contentResolver"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v3}, Lcom/discord/utilities/font/FontUtils;->getSystemFontScaleInt(Landroid/content/ContentResolver;)I
 
@@ -309,7 +302,7 @@
     return-void
 .end method
 
-.method public static synthetic q(Lcom/discord/app/AppActivity;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+.method public static synthetic p(Lcom/discord/app/AppActivity;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
     .locals 0
 
     and-int/lit8 p2, p5, 0x1
@@ -327,7 +320,7 @@
 
     const/4 p2, 0x0
 
-    invoke-virtual {p0, p1, p2, p2, p2}, Lcom/discord/app/AppActivity;->p(ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+    invoke-virtual {p0, p1, p2, p2, p2}, Lcom/discord/app/AppActivity;->o(ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
 
     move-result-object p0
 
@@ -349,7 +342,7 @@
 
     const-string v2, "baseContext"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -357,7 +350,7 @@
 
     const-string v2, "baseContext.resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -390,7 +383,7 @@
 
     const-string v1, "oldContext.resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -420,7 +413,7 @@
 
     const-string v0, "oldContext.createConfigurationContext(config)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/appcompat/app/AppCompatActivity;->attachBaseContext(Landroid/content/Context;)V
 
@@ -436,7 +429,7 @@
 
     const-string v0, "locale"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppActivity;->k(Ljava/util/Locale;)Z
 
@@ -458,7 +451,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -473,7 +466,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -490,7 +483,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -500,7 +493,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -527,7 +520,7 @@
 
     const-string v1, "application"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/app/Application;->getApplicationContext()Landroid/content/Context;
 
@@ -535,7 +528,7 @@
 
     const-string v1, "application.applicationContext"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -592,7 +585,7 @@
     return-object v0
 .end method
 
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -650,7 +643,7 @@
 
     const/4 v0, 0x0
 
-    invoke-virtual {p0, v0, p1}, Lcom/discord/app/AppActivity;->s(ZLandroid/view/View;)V
+    invoke-virtual {p0, v0, p1}, Lcom/discord/app/AppActivity;->r(ZLandroid/view/View;)V
 
     return-void
 .end method
@@ -688,7 +681,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -696,7 +689,7 @@
 
     const-string v4, "resources.configuration"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Configuration;->getLocales()Landroid/os/LocaleList;
 
@@ -704,7 +697,7 @@
 
     const-string v5, "resources.configuration.locales"
 
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/os/LocaleList;->isEmpty()Z
 
@@ -716,13 +709,13 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
     move-result-object v0
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Configuration;->getLocales()Landroid/os/LocaleList;
 
@@ -732,7 +725,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -747,7 +740,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -761,7 +754,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -769,7 +762,7 @@
 
     iget-object v0, v0, Landroid/content/res/Configuration;->locale:Ljava/util/Locale;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -794,14 +787,16 @@
             "(",
             "Ljava/util/List<",
             "+",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;>;)Z"
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "screens"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -829,9 +824,9 @@
 
     move-result-object v0
 
-    check-cast v0, Lj0/r/b;
+    check-cast v0, Lk0/s/b;
 
-    invoke-static {v0}, Lf/n/a/k/a;->getJavaClass(Lj0/r/b;)Ljava/lang/Class;
+    invoke-static {v0}, Lf/n/a/k/a;->getJavaClass(Lk0/s/b;)Ljava/lang/Class;
 
     move-result-object v0
 
@@ -839,7 +834,7 @@
 
     move-result-object v2
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -850,30 +845,25 @@
     :cond_2
     :goto_0
     return v1
-
-    :cond_3
-    const-string p1, "screens"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public final m(Lj0/r/b;)Z
+.method public final m(Lk0/s/b;)Z
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;)Z"
         }
     .end annotation
 
-    invoke-static {p1}, Lf/n/a/k/a;->getJavaClass(Lj0/r/b;)Ljava/lang/Class;
+    const-string v0, "screen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lf/n/a/k/a;->getJavaClass(Lk0/s/b;)Ljava/lang/Class;
 
     move-result-object p1
 
@@ -881,7 +871,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -919,32 +909,103 @@
 
     move-result-object v0
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     invoke-virtual {p0}, Landroid/app/Activity;->finish()V
 
     return-void
 .end method
 
-.method public final o(Landroid/content/Context;)V
-    .locals 1
+.method public final o(ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+    .locals 4
+    .param p2    # Ljava/lang/Integer;
+        .annotation build Landroidx/annotation/DrawableRes;
+        .end annotation
+    .end param
+    .param p3    # Ljava/lang/Integer;
+        .annotation build Landroidx/annotation/StringRes;
+        .end annotation
+    .end param
+    .param p4    # Ljava/lang/Integer;
+        .annotation build Landroidx/annotation/ColorInt;
+        .end annotation
+    .end param
 
-    const-class v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const/4 v1, 0x0
 
-    move-result-object v0
+    if-eqz v0, :cond_3
 
-    invoke-virtual {p0, v0}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    if-eqz p1, :cond_2
 
-    move-result v0
+    const p1, 0x7f040274
 
-    if-nez v0, :cond_0
+    const/4 v2, 0x0
 
-    invoke-static {p1}, Lf/a/b/k;->d(Landroid/content/Context;)V
+    const/4 v3, 0x2
+
+    invoke-static {v0, p1, v2, v3, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+
+    move-result p1
+
+    invoke-virtual {v0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
 
     :cond_0
-    return-void
+    invoke-static {v1, p1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
+    if-eqz p4, :cond_1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    invoke-static {v1, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTint(Landroid/graphics/drawable/Drawable;I)V
+
+    :cond_1
+    const p1, 0x7f12027c
+
+    invoke-virtual {p0, p1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroidx/appcompat/widget/Toolbar;->setNavigationContentDescription(Ljava/lang/CharSequence;)V
+
+    :cond_2
+    invoke-virtual {v0, v1}, Landroidx/appcompat/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
+
+    if-eqz p3, :cond_4
+
+    invoke-virtual {p3}, Ljava/lang/Number;->intValue()I
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroidx/appcompat/widget/Toolbar;->setNavigationContentDescription(Ljava/lang/CharSequence;)V
+
+    goto :goto_0
+
+    :cond_3
+    move-object v0, v1
+
+    :cond_4
+    :goto_0
+    return-object v0
 .end method
 
 .method public onCreate(Landroid/os/Bundle;)V
@@ -983,11 +1044,11 @@
 
     const-class v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p0, v0}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result v0
 
@@ -1034,11 +1095,11 @@
     :cond_1
     const-class p1, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
-    invoke-static {p1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {p1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result p1
 
@@ -1056,7 +1117,7 @@
 
     const-string v2, "screen.name"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0, v0, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash$Companion;->launch(Landroid/content/Context;Ljava/lang/Throwable;Ljava/lang/String;)V
 
@@ -1157,7 +1218,7 @@
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1167,17 +1228,21 @@
 
     invoke-super {p0}, Lcom/discord/app/AppTransitionActivity;->onResume()V
 
-    sget-object v0, Lf/a/b/k;->f:Lf/a/b/k;
+    sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+
+    const-string v0, "activity"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity;->f()Landroid/content/Intent;
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    const-string v1, "INTENT_RECREATE"
 
-    const-string v2, "INTENT_RECREATE"
+    const/4 v2, 0x0
 
-    invoke-virtual {v0, v2, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+    invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -1185,17 +1250,17 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity;->f()Landroid/content/Intent;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1, v2}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+    invoke-virtual {v2, v1}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
     new-instance v1, Landroid/os/Handler;
 
     invoke-direct {v1}, Landroid/os/Handler;-><init>()V
 
-    new-instance v2, Lf/a/b/j;
+    new-instance v2, Lf/a/b/l;
 
-    invoke-direct {v2, p0}, Lf/a/b/j;-><init>(Lcom/discord/app/AppActivity;)V
+    invoke-direct {v2, p0}, Lf/a/b/l;-><init>(Lcom/discord/app/AppActivity;)V
 
     invoke-virtual {v1, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -1215,7 +1280,7 @@
 
     iget-object v1, p0, Lcom/discord/app/AppActivity;->i:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1229,7 +1294,7 @@
 
     const-string v2, ""
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1250,9 +1315,9 @@
 
     move-result-object v0
 
-    const-string v2, "userSettings.locale"
+    const-string/jumbo v2, "userSettings.locale"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/app/AppActivity;->i:Ljava/lang/String;
 
@@ -1305,7 +1370,7 @@
 
     const-string v1, "Observable.combineLatest\u2026        ::Model\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -1340,99 +1405,7 @@
     return-void
 .end method
 
-.method public final p(ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
-    .locals 4
-    .param p2    # Ljava/lang/Integer;
-        .annotation build Landroidx/annotation/DrawableRes;
-        .end annotation
-    .end param
-    .param p3    # Ljava/lang/Integer;
-        .annotation build Landroidx/annotation/StringRes;
-        .end annotation
-    .end param
-    .param p4    # Ljava/lang/Integer;
-        .annotation build Landroidx/annotation/ColorInt;
-        .end annotation
-    .end param
-
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_3
-
-    if-eqz p1, :cond_2
-
-    const p1, 0x7f040274
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    invoke-static {v0, p1, v2, v3, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
-
-    move-result p1
-
-    invoke-virtual {v0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    :cond_0
-    invoke-static {v1, p1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v1
-
-    if-eqz p4, :cond_1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    invoke-static {v1, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTint(Landroid/graphics/drawable/Drawable;I)V
-
-    :cond_1
-    const p1, 0x7f12027c
-
-    invoke-virtual {p0, p1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Landroidx/appcompat/widget/Toolbar;->setNavigationContentDescription(Ljava/lang/CharSequence;)V
-
-    :cond_2
-    invoke-virtual {v0, v1}, Landroidx/appcompat/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
-
-    if-eqz p3, :cond_4
-
-    invoke-virtual {p3}, Ljava/lang/Number;->intValue()I
-
-    move-result p1
-
-    invoke-virtual {p0, p1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Landroidx/appcompat/widget/Toolbar;->setNavigationContentDescription(Ljava/lang/CharSequence;)V
-
-    goto :goto_0
-
-    :cond_3
-    move-object v0, v1
-
-    :cond_4
-    :goto_0
-    return-object v0
-.end method
-
-.method public final r(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
+.method public final q(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
     .locals 1
     .param p2    # Ljava/lang/Integer;
         .annotation build Landroidx/annotation/DrawableRes;
@@ -1458,8 +1431,8 @@
     return-object p1
 .end method
 
-.method public final s(ZLandroid/view/View;)V
-    .locals 4
+.method public final r(ZLandroid/view/View;)V
+    .locals 3
 
     const-string v0, "input_method"
 
@@ -1473,43 +1446,41 @@
 
     const/4 v1, 0x0
 
-    const/4 v2, 0x0
-
     if-eqz p2, :cond_0
 
     invoke-virtual {p2}, Landroid/view/View;->getWindowToken()Landroid/os/IBinder;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const v3, 0x1020002
+    const v2, 0x1020002
 
-    invoke-virtual {p0, v3}, Landroidx/appcompat/app/AppCompatActivity;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p0, v2}, Landroidx/appcompat/app/AppCompatActivity;->findViewById(I)Landroid/view/View;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Landroid/widget/FrameLayout;
+    check-cast v2, Landroid/widget/FrameLayout;
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    invoke-virtual {v3, v1}, Landroid/widget/FrameLayout;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {v2, v1}, Landroid/widget/FrameLayout;->getChildAt(I)Landroid/view/View;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    invoke-virtual {v3}, Landroid/view/View;->getApplicationWindowToken()Landroid/os/IBinder;
+    invoke-virtual {v2}, Landroid/view/View;->getApplicationWindowToken()Landroid/os/IBinder;
 
-    move-result-object v3
+    move-result-object v2
 
     goto :goto_0
 
     :cond_1
-    move-object v3, v2
+    const/4 v2, 0x0
 
     :goto_0
     if-eqz p1, :cond_2
@@ -1528,7 +1499,7 @@
 
     :cond_2
     :try_start_0
-    invoke-virtual {v0, v3, v1}, Landroid/view/inputmethod/InputMethodManager;->hideSoftInputFromWindow(Landroid/os/IBinder;I)Z
+    invoke-virtual {v0, v2, v1}, Landroid/view/inputmethod/InputMethodManager;->hideSoftInputFromWindow(Landroid/os/IBinder;I)Z
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1539,48 +1510,25 @@
 
     sget-object p2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v0, 0x3
+    const-string v0, "Error Opening/Closing the Keyboard"
 
-    const-string v1, "Error Opening/Closing the Keyboard"
-
-    invoke-virtual {p2, v1, v0, p1, v2}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {p2, v0, p1}, Lcom/discord/app/AppLog;->d(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_3
     :goto_1
     return-void
 
     :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.view.inputmethod.InputMethodManager"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
 
-.method public final showKeyboard(Landroid/view/View;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p0, v0, p1}, Lcom/discord/app/AppActivity;->s(ZLandroid/view/View;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final t(Landroidx/appcompat/widget/Toolbar;)V
+.method public final s(Landroidx/appcompat/widget/Toolbar;)V
     .locals 4
 
     iput-object p1, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
@@ -1610,7 +1558,7 @@
 
     if-eqz p1, :cond_1
 
-    const v1, 0x7f04047e
+    const v1, 0x7f040470
 
     const/4 v2, 0x2
 
@@ -1640,3 +1588,17 @@
     :cond_2
     return-void
 .end method
+
+.method public final showKeyboard(Landroid/view/View;)V
+    .locals 1
+
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0, p1}, Lcom/discord/app/AppActivity;->r(ZLandroid/view/View;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$a.smali b/com.discord/smali/com/discord/app/AppBottomSheet$a.smali
index fe257169bf..6ad817c6f6 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$a.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$a.smali
@@ -63,25 +63,23 @@
 
 # virtual methods
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
-    .locals 5
+    .locals 4
 
     iget v0, p0, Lcom/discord/app/AppBottomSheet$a;->a:I
 
     const-string v1, "insets"
 
-    const-string v2, "v"
-
-    const/4 v3, 0x0
+    const-string/jumbo v2, "v"
 
     if-eqz v0, :cond_1
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    if-ne v0, v4, :cond_0
+    if-ne v0, v3, :cond_0
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetLeft()I
 
@@ -108,12 +106,14 @@
     return-object p1
 
     :cond_0
-    throw v3
+    const/4 p1, 0x0
+
+    throw p1
 
     :cond_1
-    if-eqz p1, :cond_3
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
@@ -137,29 +137,19 @@
 
     move-result p1
 
-    const/4 v0, 0x0
-
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetRight()I
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
-    move-result v2
+    move-result v1
 
-    invoke-virtual {p2, p1, v0, v1, v2}, Landroidx/core/view/WindowInsetsCompat;->replaceSystemWindowInsets(IIII)Landroidx/core/view/WindowInsetsCompat;
+    const/4 v2, 0x0
+
+    invoke-virtual {p2, p1, v2, v0, v1}, Landroidx/core/view/WindowInsetsCompat;->replaceSystemWindowInsets(IIII)Landroidx/core/view/WindowInsetsCompat;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$b.smali b/com.discord/smali/com/discord/app/AppBottomSheet$b.smali
index bb1e1f5be3..f53b3afd9d 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$b.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppBottomSheet$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/app/AppPermissions;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet$c.smali b/com.discord/smali/com/discord/app/AppBottomSheet$c.smali
index 78327a988d..0543330fe6 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet$c.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet$c.smali
@@ -34,11 +34,19 @@
 .method public onSlide(Landroid/view/View;F)V
     .locals 0
 
+    const-string p2, "bottomSheet"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-void
 .end method
 
 .method public onStateChanged(Landroid/view/View;I)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "bottomSheet"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x5
 
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet.smali b/com.discord/smali/com/discord/app/AppBottomSheet.smali
index f55d21ad97..92191af41b 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet.smali
@@ -12,7 +12,11 @@
 
 .field public compositeSubscription:Lrx/subscriptions/CompositeSubscription;
 
-.field public final paused:Lrx/subjects/Subject;
+.field public peekBottomView:Landroid/view/View;
+
+.field public final peekLayoutListener:Landroid/view/View$OnLayoutChangeListener;
+
+.field public final unsubscribeSignal:Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/Subject<",
@@ -23,10 +27,6 @@
     .end annotation
 .end field
 
-.field public peekBottomView:Landroid/view/View;
-
-.field public final peekLayoutListener:Landroid/view/View$OnLayoutChangeListener;
-
 
 # direct methods
 .method public constructor <init>()V
@@ -40,9 +40,9 @@
 
     const-string v1, "PublishSubject.create()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/discord/app/AppBottomSheet;->paused:Lrx/subjects/Subject;
+    iput-object v0, p0, Lcom/discord/app/AppBottomSheet;->unsubscribeSignal:Lrx/subjects/Subject;
 
     new-instance v0, Lcom/discord/app/AppBottomSheet$b;
 
@@ -76,7 +76,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0289
+    const v2, 0x7f0a028c
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -92,7 +92,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a02c3
+    const v2, 0x7f0a02c6
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -100,7 +100,7 @@
 
     const-string v2, "designBottomSheet"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -249,20 +249,13 @@
 
 # virtual methods
 .method public bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "compositeSubscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "compositeSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public dismiss()V
@@ -308,7 +301,7 @@
     :goto_0
     const-string v1, "arguments ?: Bundle()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -318,7 +311,7 @@
     .end annotation
 .end method
 
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -330,7 +323,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppBottomSheet;->paused:Lrx/subjects/Subject;
+    iget-object v0, p0, Lcom/discord/app/AppBottomSheet;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-object v0
 .end method
@@ -363,7 +356,7 @@
 
     const-string v0, "super.onCreateDialog(sav\u2026dOnTouchOutside(true)\n  }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -371,26 +364,21 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 0
 
-    const/4 p2, 0x0
+    const-string p2, "inflater"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getContentViewResId()I
 
-    move-result p3
+    move-result p2
 
-    invoke-virtual {p1, p3, p2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
+    const/4 p3, 0x0
+
+    invoke-virtual {p1, p2, p3}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public onPause()V
@@ -405,13 +393,13 @@
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->b()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -419,11 +407,13 @@
 .method public onRequestPermissionsResult(I[Ljava/lang/String;[I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "permissions"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "grantResults"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/fragment/app/Fragment;->onRequestPermissionsResult(I[Ljava/lang/String;[I)V
 
@@ -434,20 +424,6 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/app/AppPermissions;->c(I[I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "grantResults"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "permissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onResume()V
@@ -469,9 +445,11 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/fragment/app/Fragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -491,15 +469,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public requestCameraQRScanner(Lrx/functions/Action0;)V
@@ -579,16 +548,9 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final setBottomSheetState(I)V
@@ -620,11 +582,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setOnClickAndDismissListener"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/app/AppBottomSheet$e;
 
@@ -633,20 +597,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "$this$setOnClickAndDismissListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setPeekHeightBottomView(Landroid/view/View;)V
@@ -654,7 +604,7 @@
 
     iget-object v0, p0, Lcom/discord/app/AppBottomSheet;->peekBottomView:Landroid/view/View;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -696,9 +646,11 @@
 .end method
 
 .method public show(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transaction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-super {p0, p1, p2}, Landroidx/fragment/app/DialogFragment;->show(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;)I
@@ -714,21 +666,14 @@
 
     :goto_0
     return p1
-
-    :cond_0
-    const-string p1, "transaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "manager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Landroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
 
@@ -746,21 +691,14 @@
 
     :catch_0
     return-void
-
-    :cond_1
-    const-string p1, "manager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final showKeyboard(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppActivity()Lcom/discord/app/AppActivity;
 
@@ -772,15 +710,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updatePeekHeightPx(I)V
diff --git a/com.discord/smali/com/discord/app/AppComponent.smali b/com.discord/smali/com/discord/app/AppComponent.smali
index 1d95e35c72..5023355a59 100644
--- a/com.discord/smali/com/discord/app/AppComponent.smali
+++ b/com.discord/smali/com/discord/app/AppComponent.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract getPaused()Lrx/subjects/Subject;
+.method public abstract getUnsubscribeSignal()Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali/com/discord/app/AppDialog.smali b/com.discord/smali/com/discord/app/AppDialog.smali
index 03a7affff0..f98a547677 100644
--- a/com.discord/smali/com/discord/app/AppDialog.smali
+++ b/com.discord/smali/com/discord/app/AppDialog.smali
@@ -11,7 +11,7 @@
 
 .field public onViewBoundOrOnResumeInvoked:Z
 
-.field public final paused:Lrx/subjects/Subject;
+.field public final unsubscribeSignal:Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/Subject<",
@@ -35,9 +35,9 @@
 
     const-string v1, "PublishSubject.create<Void>()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/discord/app/AppDialog;->paused:Lrx/subjects/Subject;
+    iput-object v0, p0, Lcom/discord/app/AppDialog;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-void
 .end method
@@ -113,7 +113,7 @@
     :goto_0
     const-string v1, "arguments ?: Bundle()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -123,7 +123,7 @@
     .end annotation
 .end method
 
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -135,7 +135,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppDialog;->paused:Lrx/subjects/Subject;
+    iget-object v0, p0, Lcom/discord/app/AppDialog;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-object v0
 .end method
@@ -182,21 +182,23 @@
 
     move-result-object p1
 
+    const-string v0, "super.onCreateDialog(savedInstanceState)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x1
 
     invoke-virtual {p1, v0}, Landroid/app/Dialog;->requestWindowFeature(I)Z
 
-    const-string v0, "super.onCreateDialog(sav\u2026FEATURE_NO_TITLE)\n      }"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     return-object p1
 .end method
 
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string p3, "inflater"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppDialog;->getContentViewResId()I
 
@@ -209,15 +211,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onPause()V
@@ -225,13 +218,13 @@
 
     invoke-super {p0}, Landroidx/fragment/app/Fragment;->onPause()V
 
-    invoke-virtual {p0}, Lcom/discord/app/AppDialog;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lcom/discord/app/AppDialog;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -259,22 +252,15 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/CallSuper;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -288,7 +274,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/fragment/app/Fragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -315,15 +303,6 @@
     iput-boolean v0, p0, Lcom/discord/app/AppDialog;->onViewBoundOrOnResumeInvoked:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
@@ -340,11 +319,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setOnClickAndDismissListener"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/app/AppDialog$a;
 
@@ -353,26 +334,14 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "$this$setOnClickAndDismissListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public show(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;)I
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "transaction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-super {p0, p1, p2}, Landroidx/fragment/app/DialogFragment;->show(Landroidx/fragment/app/FragmentTransaction;Ljava/lang/String;)I
@@ -388,29 +357,20 @@
 
     :goto_0
     return p1
-
-    :cond_0
-    const-string p1, "transaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "manager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentManager;->isDestroyed()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     :try_start_0
     invoke-super {p0, p1, p2}, Landroidx/fragment/app/DialogFragment;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
@@ -422,11 +382,11 @@
     :cond_0
     sget-object p2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const-string v1, "Could not show "
+    const-string v0, "Could not show "
 
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -436,36 +396,33 @@
 
     move-result-object p1
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string p1, ": FragmentManager destroyed"
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p2, p1, v0, v1, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    invoke-static {p2, p1, v1, v0, v1}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     :catch_0
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "manager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final showKeyboard(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppDialog;->getAppActivity()Lcom/discord/app/AppActivity;
 
@@ -477,13 +434,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppFragment$a.smali b/com.discord/smali/com/discord/app/AppFragment$a.smali
index 72158755be..78e6df1a47 100644
--- a/com.discord/smali/com/discord/app/AppFragment$a.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppFragment$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppFragment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/app/AppPermissions;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali
index 82347cccf9..b9f9cd077f 100644
--- a/com.discord/smali/com/discord/app/AppFragment$b.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppFragment$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppFragment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lf/b/a/d/b;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali
index 0f265e1045..79d2ba8e7a 100644
--- a/com.discord/smali/com/discord/app/AppFragment$c.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$c.smali
@@ -46,7 +46,11 @@
 .end method
 
 .method public onError(Ljava/io/IOException;)V
-    .locals 5
+    .locals 4
+
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/app/AppFragment$c;->a:Lcom/discord/app/AppFragment;
 
@@ -56,29 +60,29 @@
 
     iget-object v1, p0, Lcom/discord/app/AppFragment$c;->a:Lcom/discord/app/AppFragment;
 
-    const v2, 0x7f1216a0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
-
-    new-array v3, v3, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
 
     move-result-object p1
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    aput-object p1, v3, v4
+    aput-object p1, v2, v3
 
-    invoke-virtual {v1, v2, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const p1, 0x7f1216ca
+
+    invoke-virtual {v1, p1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    const/16 v1, 0xc
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/16 v2, 0xc
 
-    invoke-static {v0, p1, v4, v2, v1}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v3, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
@@ -86,31 +90,37 @@
 .method public onSuccess(Landroid/net/Uri;Lcom/miguelgaeta/media_picker/RequestType;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/app/AppFragment$c;->a:Lcom/discord/app/AppFragment;
+    const-string v0, "request"
 
-    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v1
+    iget-object v0, p0, Lcom/discord/app/AppFragment$c;->a:Lcom/discord/app/AppFragment;
 
-    if-eqz v1, :cond_0
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+    move-result-object v0
 
-    move-result-object v1
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
     const/4 v2, 0x4
 
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType$default(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType$default(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -135,11 +145,4 @@
 
     :goto_1
     return-void
-
-    :cond_2
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppFragment$d.smali b/com.discord/smali/com/discord/app/AppFragment$d.smali
index fdb1e55f29..ee3c305042 100644
--- a/com.discord/smali/com/discord/app/AppFragment$d.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$d.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppFragment$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppFragment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,9 +56,17 @@
 
     const-string v1, "onBackAction.call()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Ljava/lang/Boolean;
 
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppFragment.smali b/com.discord/smali/com/discord/app/AppFragment.smali
index 7d42a0d69b..2f8e9748ed 100644
--- a/com.discord/smali/com/discord/app/AppFragment.smali
+++ b/com.discord/smali/com/discord/app/AppFragment.smali
@@ -17,7 +17,7 @@
 
 .field public onViewBoundOrOnResumeInvoked:Z
 
-.field public final paused:Lrx/subjects/Subject;
+.field public final unsubscribeSignal:Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/Subject<",
@@ -41,9 +41,9 @@
 
     const-string v1, "PublishSubject.create()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/discord/app/AppFragment;->paused:Lrx/subjects/Subject;
+    iput-object v0, p0, Lcom/discord/app/AppFragment;->unsubscribeSignal:Lrx/subjects/Subject;
 
     new-instance v0, Lcom/discord/app/AppFragment$a;
 
@@ -85,7 +85,7 @@
 
     iget-object v0, p1, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -93,7 +93,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1, p2}, Lcom/discord/app/AppActivity;->t(Landroidx/appcompat/widget/Toolbar;)V
+    invoke-virtual {p1, p2}, Lcom/discord/app/AppActivity;->s(Landroidx/appcompat/widget/Toolbar;)V
 
     :cond_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -389,7 +389,7 @@
     return-object v0
 .end method
 
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -401,12 +401,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppFragment;->paused:Lrx/subjects/Subject;
+    iget-object v0, p0, Lcom/discord/app/AppFragment;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-object v0
 .end method
 
-.method public hideKeyboard()V
+.method public final hideKeyboard()V
     .locals 2
 
     const/4 v0, 0x0
@@ -462,7 +462,9 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string p3, "inflater"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getContentViewResId()I
 
@@ -475,15 +477,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDestroyView()V
@@ -505,7 +498,11 @@
 
     const-string v2, "javaClass.name"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "key"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, v0, Lf/a/b/f;->f:Ljava/util/TreeMap;
 
@@ -515,7 +512,7 @@
 
     const-string v2, "backPressHandlers\n        .values"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -539,9 +536,15 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Ll0/i;->b:Ll0/i;
+    const-string v0, "target"
 
-    sget-object v0, Ll0/i;->a:Ljava/util/WeakHashMap;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lm0/i;->b:Lm0/i;
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lm0/i;->a:Ljava/util/WeakHashMap;
 
     invoke-virtual {v0, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -566,16 +569,16 @@
 
     move-result-object v1
 
-    check-cast v1, Ll0/h;
+    check-cast v1, Lm0/h;
 
-    sget-object v2, Ll0/h$a;->a:Ll0/h$a;
+    sget-object v2, Lm0/h$a;->a:Lm0/h$a;
 
-    iput-object v2, v1, Ll0/h;->a:Ljava/lang/Object;
+    iput-object v2, v1, Lm0/h;->a:Ljava/lang/Object;
 
     goto :goto_1
 
     :cond_1
-    sget-object v0, Ll0/i;->a:Ljava/util/WeakHashMap;
+    sget-object v0, Lm0/i;->a:Ljava/util/WeakHashMap;
 
     invoke-virtual {v0, p0}, Ljava/util/WeakHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -597,6 +600,10 @@
 
     if-eqz v0, :cond_0
 
+    const-string v1, "fragmentOwner"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, v0, Lcom/discord/app/AppActivity;->g:Ljava/util/LinkedHashMap;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getId()I
@@ -618,65 +625,41 @@
 .method public onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "mimeType"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "mimeType"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onPause()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-super {p0}, Landroidx/fragment/app/Fragment;->onPause()V
 
@@ -686,11 +669,13 @@
 .method public onRequestPermissionsResult(I[Ljava/lang/String;[I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "permissions"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "grantResults"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/fragment/app/Fragment;->onRequestPermissionsResult(I[Ljava/lang/String;[I)V
 
@@ -701,20 +686,6 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/app/AppPermissions;->c(I[I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "grantResults"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "permissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onResume()V
@@ -740,22 +711,15 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/CallSuper;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -769,7 +733,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/fragment/app/Fragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -805,15 +771,6 @@
     iput-boolean v0, p0, Lcom/discord/app/AppFragment;->onViewBoundOrOnResumeInvoked:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public requestCameraQRScanner(Lrx/functions/Action0;)V
@@ -893,16 +850,9 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
@@ -942,7 +892,7 @@
 
     move v1, p1
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/app/AppActivity;->q(Lcom/discord/app/AppActivity;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static/range {v0 .. v6}, Lcom/discord/app/AppActivity;->p(Lcom/discord/app/AppActivity;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     move-result-object p1
 
@@ -976,7 +926,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1, p2, p3, p4}, Lcom/discord/app/AppActivity;->p(ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+    invoke-virtual {v0, p1, p2, p3, p4}, Lcom/discord/app/AppActivity;->o(ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
 
     move-result-object p1
 
@@ -1174,7 +1124,7 @@
 
     move-result-object p1
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppActivity;->r(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
+    invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppActivity;->q(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
 
     move-result-object v1
 
@@ -1193,7 +1143,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppActivity;->r(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
+    invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppActivity;->q(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
 
     move-result-object v1
 
@@ -1214,7 +1164,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppActivity;->r(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppActivity;->q(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
 
     move-result-object p1
 
@@ -1228,39 +1178,36 @@
 .end method
 
 .method public final setActionBarTitleClick(Landroid/view/View$OnClickListener;)Lkotlin/Unit;
-    .locals 2
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "onClickListener"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
     move-result-object v1
 
+    const/4 v2, 0x0
+
     if-eqz v1, :cond_0
 
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v1}, Lcom/discord/app/AppActivity;->h()Lcom/discord/views/ToolbarTitleLayout;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1, p1}, Landroid/view/ViewGroup;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, p1}, Landroid/view/ViewGroup;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    move-object v0, p1
+    move-object v2, p1
 
     :cond_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v2
 .end method
 
 .method public final setActionBarTitleColor(I)Lkotlin/Unit;
@@ -1397,7 +1344,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "onBackAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
@@ -1419,7 +1368,15 @@
 
     const-string v2, "javaClass.name"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "handler"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "key"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, v0, Lf/a/b/f;->f:Ljava/util/TreeMap;
 
@@ -1443,10 +1400,6 @@
     invoke-direct {v2}, Ljava/util/HashMap;-><init>()V
 
     :goto_0
-    const-string v3, "backPressHandlers[priority] ?: HashMap()"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-interface {v2, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object p1, v0, Lf/a/b/f;->f:Ljava/util/TreeMap;
@@ -1459,19 +1412,10 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "onBackAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnNewIntentListener(Lkotlin/jvm/functions/Function1;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1483,15 +1427,23 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
-    move-result-object v0
+    move-result-object v1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/discord/app/AppActivity;->g:Ljava/util/LinkedHashMap;
+    const-string v2, "fragmentOwner"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, v1, Lcom/discord/app/AppActivity;->g:Ljava/util/LinkedHashMap;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getId()I
 
@@ -1505,21 +1457,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "action"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public showKeyboard(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
@@ -1531,13 +1476,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali b/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
index 480a044179..0991b3947c 100644
--- a/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
+++ b/com.discord/smali/com/discord/app/AppLog$LoggedItem.smali
@@ -29,9 +29,11 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;Ljava/lang/Throwable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,20 +53,11 @@
 
     const-string p2, "UUID.randomUUID().toString()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/app/AppLog$LoggedItem;->d:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -90,7 +83,7 @@
 
     iget-object v1, p1, Lcom/discord/app/AppLog$LoggedItem;->f:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -100,7 +93,7 @@
 
     iget-object p1, p1, Lcom/discord/app/AppLog$LoggedItem;->g:Ljava/lang/Throwable;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/app/AppLog$a$a.smali b/com.discord/smali/com/discord/app/AppLog$a$a.smali
index 45ef67d86e..deb0c62351 100644
--- a/com.discord/smali/com/discord/app/AppLog$a$a.smali
+++ b/com.discord/smali/com/discord/app/AppLog$a$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppLog$a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
         "Ljava/lang/Integer;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,13 +68,25 @@
 .method public final invoke(Ljava/lang/String;I)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lj0/t/r;->d:Lj0/t/r;
+    const-string v0, "$this$chunked"
 
-    if-eqz v1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$windowed"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lk0/u/r;->d:Lk0/u/r;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "transform"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -176,7 +188,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Lj0/t/r;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v2}, Lk0/u/r;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -221,18 +233,4 @@
 
     :cond_8
     return-void
-
-    :cond_9
-    const-string p1, "transform"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog$a.smali b/com.discord/smali/com/discord/app/AppLog$a.smali
index af38ea5c76..10776f2e4e 100644
--- a/com.discord/smali/com/discord/app/AppLog$a.smali
+++ b/com.discord/smali/com/discord/app/AppLog$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppLog$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 10
 
-    if-eqz p1, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/app/AppLog$a$a;
 
@@ -103,7 +105,7 @@
 
     const-string v3, "\n\t"
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -134,18 +136,9 @@
 
     const-string v2, "Log.getStackTraceString(throwable)"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppLog$a$a;->invoke(Ljava/lang/String;I)V
 
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog$b.smali b/com.discord/smali/com/discord/app/AppLog$b.smali
index f06aef936f..48de2caf22 100644
--- a/com.discord/smali/com/discord/app/AppLog$b.smali
+++ b/com.discord/smali/com/discord/app/AppLog$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppLog$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 10
 
-    if-eqz p1, :cond_4
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     iget-object v0, p0, Lcom/discord/app/AppLog$b;->$throwable:Ljava/lang/Throwable;
@@ -176,7 +178,7 @@
 
     const-string v3, "e.stackTrace"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v2, p1}, Lcom/discord/app/AppLog;->a(Lcom/discord/app/AppLog;[Ljava/lang/StackTraceElement;Ljava/lang/String;)[Ljava/lang/StackTraceElement;
 
@@ -198,7 +200,7 @@
 
     const-string v4, "cause.stackTrace"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, v3, p1}, Lcom/discord/app/AppLog;->a(Lcom/discord/app/AppLog;[Ljava/lang/StackTraceElement;Ljava/lang/String;)[Ljava/lang/StackTraceElement;
 
@@ -262,7 +264,7 @@
 
     const-string v1, "throwable.stackTrace"
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "\n"
 
@@ -306,13 +308,4 @@
     :cond_3
     :goto_2
     return-void
-
-    :cond_4
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog$c.smali b/com.discord/smali/com/discord/app/AppLog$c.smali
index c4a029a995..4c98edd243 100644
--- a/com.discord/smali/com/discord/app/AppLog$c.smali
+++ b/com.discord/smali/com/discord/app/AppLog$c.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/app/AppLog$c;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AppLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
         "Ljava/lang/Throwable;",
@@ -30,72 +30,47 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/app/AppLog;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/app/AppLog;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string/jumbo v4, "v"
+
+    const-string/jumbo v5, "v(Ljava/lang/String;Ljava/lang/Throwable;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "v"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/app/AppLog;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "v(Ljava/lang/String;Ljava/lang/Throwable;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
+    .locals 1
 
     check-cast p1, Ljava/lang/String;
 
     check-cast p2, Ljava/lang/Throwable;
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
-    check-cast v1, Lcom/discord/app/AppLog;
+    check-cast v0, Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x2
-
-    invoke-virtual {v1, p1, v2, p2, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppLog;->v(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog$d.smali b/com.discord/smali/com/discord/app/AppLog$d.smali
index 15ba3833c3..5dc04f3705 100644
--- a/com.discord/smali/com/discord/app/AppLog$d.smali
+++ b/com.discord/smali/com/discord/app/AppLog$d.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppLog$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,9 @@
 
     check-cast p1, Landroid/content/SharedPreferences$Editor;
 
-    if-eqz p1, :cond_3
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/app/AppLog$d;->$userId:Ljava/lang/Long;
 
@@ -99,13 +101,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_3
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppLog.smali b/com.discord/smali/com/discord/app/AppLog.smali
index 9c009b20da..a42e5744f3 100644
--- a/com.discord/smali/com/discord/app/AppLog.smali
+++ b/com.discord/smali/com/discord/app/AppLog.smali
@@ -42,19 +42,19 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    new-instance v1, Lr0/q/a$d;
+    new-instance v1, Ls0/q/a$d;
 
     const/16 v2, 0xfa
 
-    invoke-direct {v1, v2}, Lr0/q/a$d;-><init>(I)V
+    invoke-direct {v1, v2}, Ls0/q/a$d;-><init>(I)V
 
-    new-instance v2, Lr0/q/a$c;
+    new-instance v2, Ls0/q/a$c;
 
-    invoke-direct {v2, v1}, Lr0/q/a$c;-><init>(Lr0/q/a$a;)V
+    invoke-direct {v2, v1}, Ls0/q/a$c;-><init>(Ls0/q/a$a;)V
 
-    new-instance v1, Lr0/q/a;
+    new-instance v1, Ls0/q/a;
 
-    invoke-direct {v1, v2}, Lr0/q/a;-><init>(Lr0/q/a$c;)V
+    invoke-direct {v1, v2}, Ls0/q/a;-><init>(Ls0/q/a$c;)V
 
     invoke-direct {v0, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
@@ -113,11 +113,11 @@
 
     const-string v8, "stackTraceElement.className"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v9, "MediaEngineLegacy"
 
-    invoke-static {v7, v9, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v7, v9, v1, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v7
 
@@ -129,7 +129,7 @@
 
     const-string v9, "e"
 
-    invoke-static {v7, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -147,7 +147,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v10, Lcom/discord/utilities/logging/Logger;
 
@@ -157,9 +157,9 @@
 
     const-string v11, "Logger::class.java.name"
 
-    invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v9, v10, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v9, v10, v1, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v9
 
@@ -169,7 +169,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v10, Lorg/webrtc/Logging;
 
@@ -179,9 +179,9 @@
 
     const-string v11, "Logging::class.java.name"
 
-    invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v9, v10, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v9, v10, v1, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v9
 
@@ -191,7 +191,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v8, Lcom/discord/app/AppLog;
 
@@ -201,9 +201,9 @@
 
     const-string v9, "AppLog::class.java.name"
 
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v6, v8, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v6, v8, v1, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v6
 
@@ -280,7 +280,7 @@
 
     if-eqz v11, :cond_6
 
-    invoke-static {v11, v10, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v11, v10, v1, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v10
 
@@ -369,7 +369,11 @@
 .end method
 
 .method public static final b(Landroid/app/Application;)V
-    .locals 2
+    .locals 9
+
+    const-string v0, "application"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
@@ -393,7 +397,40 @@
 
     invoke-virtual {p0, v0}, Lcom/google/firebase/crashlytics/FirebaseCrashlytics;->setCrashlyticsCollectionEnabled(Z)V
 
+    sget-object p0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    if-eqz p0, :cond_0
+
+    sget-object p0, Lcom/discord/utilities/SystemLogUtils;->INSTANCE:Lcom/discord/utilities/SystemLogUtils;
+
+    invoke-virtual {p0}, Lcom/discord/utilities/SystemLogUtils;->fetchLastTombstone()Lrx/Observable;
+
+    move-result-object v0
+
+    const-class v1, Lcom/discord/app/AppLog;
+
+    sget-object v4, Lf/a/b/i;->d:Lf/a/b/i;
+
+    sget-object v6, Lf/a/b/j;->d:Lf/a/b/j;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v7, 0x16
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
     return-void
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
 .end method
 
 .method public static final h(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;)V
@@ -440,7 +477,7 @@
 
     move-result-object p0
 
-    const-string v0, "userEmail"
+    const-string/jumbo v0, "userEmail"
 
     invoke-virtual {p0, v0, p1}, Lcom/google/firebase/crashlytics/FirebaseCrashlytics;->setCustomKey(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -451,7 +488,7 @@
 
     move-result-object p0
 
-    const-string p1, "userName"
+    const-string/jumbo p1, "userName"
 
     invoke-virtual {p0, p1, p2}, Lcom/google/firebase/crashlytics/FirebaseCrashlytics;->setCustomKey(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -462,22 +499,17 @@
 .method public static final i(Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    invoke-virtual {v1, p0, v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, p0, v1}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "message"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -507,9 +539,9 @@
 
     invoke-direct {v2, p2, p1, p3}, Lcom/discord/app/AppLog$LoggedItem;-><init>(ILjava/lang/String;Ljava/lang/Throwable;)V
 
-    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v1, v2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     new-instance v1, Lcom/discord/app/AppLog$b;
 
@@ -540,11 +572,13 @@
 .method public d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -565,41 +599,22 @@
     invoke-virtual {p0, p1, p3}, Lcom/discord/app/AppLog;->d(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public d(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x3
 
     invoke-virtual {p0, p1, v1, p2, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
@@ -617,35 +632,33 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "message"
 
-    const-string v0, " -> "
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, v0, p2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, " -> "
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     invoke-virtual {p0, p1, p3, p4}, Lcom/discord/app/AppLog;->e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
@@ -662,22 +675,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x6
 
     invoke-virtual {p0, p1, v0, p2, p3}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final f(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function2;)V
@@ -698,13 +704,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "category"
 
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "loggingFn"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -749,37 +759,18 @@
     invoke-virtual {p2, p1}, Lcom/google/firebase/crashlytics/FirebaseCrashlytics;->log(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "loggingFn"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "category"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final g(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "from"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "to"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -810,30 +801,18 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "to"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "from"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -854,104 +833,72 @@
     invoke-virtual {p0, p1, p3}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public i(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x4
 
     invoke-virtual {p0, p1, v1, p2, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "category"
 
-    new-instance v1, Lcom/discord/app/AppLog$c;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p0}, Lcom/discord/app/AppLog$c;-><init>(Lcom/discord/app/AppLog;)V
+    new-instance v0, Lcom/discord/app/AppLog$c;
 
-    invoke-virtual {p0, p1, p2, v0, v1}, Lcom/discord/app/AppLog;->f(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {v0, p0}, Lcom/discord/app/AppLog$c;-><init>(Lcom/discord/app/AppLog;)V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, p1, p2, v1, v0}, Lcom/discord/app/AppLog;->f(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function2;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "category"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public v(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x2
 
     invoke-virtual {p0, p1, v1, p2, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -972,39 +919,20 @@
     invoke-virtual {p0, p1, p3}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public w(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x5
 
     invoke-virtual {p0, p1, v1, p2, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppPermissions$a.smali b/com.discord/smali/com/discord/app/AppPermissions$a.smali
index 8959a3d673..e390e89701 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$a.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppPermissions$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppPermissions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/jvm/functions/Function0<",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,9 +57,9 @@
 
     move-result p1
 
-    new-instance v0, Lf/a/b/i;
+    new-instance v0, Lf/a/b/k;
 
-    invoke-direct {v0, p0, p1}, Lf/a/b/i;-><init>(Lcom/discord/app/AppPermissions$a;I)V
+    invoke-direct {v0, p0, p1}, Lf/a/b/k;-><init>(Lcom/discord/app/AppPermissions$a;I)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppPermissions$c.smali b/com.discord/smali/com/discord/app/AppPermissions$c.smali
index e7dd56527c..e51bb35f7d 100644
--- a/com.discord/smali/com/discord/app/AppPermissions$c.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/AppPermissions$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppPermissions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali
index 3092099ecf..87bf286db1 100644
--- a/com.discord/smali/com/discord/app/AppPermissions.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions.smali
@@ -131,9 +131,11 @@
 .end method
 
 .method public constructor <init>(Landroidx/fragment/app/Fragment;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -146,15 +148,6 @@
     iput-object p1, p0, Lcom/discord/app/AppPermissions;->a:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic a(Lcom/discord/app/AppPermissions;[I)Z
@@ -210,104 +203,111 @@
 .end method
 
 .method public final declared-synchronized c(I[I)V
-    .locals 4
+    .locals 3
 
     monitor-enter p0
 
-    const/4 v0, 0x0
-
     :try_start_0
-    new-instance v1, Lcom/discord/app/AppPermissions$a;
+    const-string v0, "grantResults"
 
-    invoke-direct {v1, p0}, Lcom/discord/app/AppPermissions$a;-><init>(Lcom/discord/app/AppPermissions;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/app/AppPermissions;->a:Ljava/util/HashMap;
+    new-instance v0, Lcom/discord/app/AppPermissions$a;
+
+    invoke-direct {v0, p0}, Lcom/discord/app/AppPermissions$a;-><init>(Lcom/discord/app/AppPermissions;)V
+
+    iget-object v1, p0, Lcom/discord/app/AppPermissions;->a:Ljava/util/HashMap;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
     move-result-object v2
 
-    check-cast v2, Lkotlin/jvm/functions/Function0;
+    invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    const/16 v3, 0xd2
+    move-result-object v1
 
-    if-eq p1, v3, :cond_4
+    check-cast v1, Lkotlin/jvm/functions/Function0;
 
-    const/16 v3, 0xd3
+    const/16 v2, 0xd2
 
-    if-eq p1, v3, :cond_3
+    if-eq p1, v2, :cond_4
 
-    const/16 v3, 0xd5
+    const/16 v2, 0xd3
 
-    if-eq p1, v3, :cond_2
+    if-eq p1, v2, :cond_3
 
-    const/16 v3, 0xd6
+    const/16 v2, 0xd5
 
-    if-eq p1, v3, :cond_1
+    if-eq p1, v2, :cond_2
 
-    const/16 v3, 0xde
+    const/16 v2, 0xd6
 
-    if-eq p1, v3, :cond_0
+    if-eq p1, v2, :cond_1
 
-    goto :goto_0
+    const/16 v2, 0xde
+
+    if-eq p1, v2, :cond_0
+
+    const/4 p1, 0x0
+
+    goto :goto_1
 
     :cond_0
-    const p1, 0x7f12111f
+    const p1, 0x7f12114a
 
-    new-instance v0, Lf/a/b/i;
+    new-instance v2, Lf/a/b/k;
 
-    invoke-direct {v0, v1, p1}, Lf/a/b/i;-><init>(Lcom/discord/app/AppPermissions$a;I)V
+    invoke-direct {v2, v0, p1}, Lf/a/b/k;-><init>(Lcom/discord/app/AppPermissions$a;I)V
 
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f121126
+    const p1, 0x7f121151
 
-    new-instance v0, Lf/a/b/i;
+    new-instance v2, Lf/a/b/k;
 
-    invoke-direct {v0, v1, p1}, Lf/a/b/i;-><init>(Lcom/discord/app/AppPermissions$a;I)V
+    invoke-direct {v2, v0, p1}, Lf/a/b/k;-><init>(Lcom/discord/app/AppPermissions$a;I)V
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f121120
+    const p1, 0x7f12114b
 
-    new-instance v0, Lf/a/b/i;
+    new-instance v2, Lf/a/b/k;
 
-    invoke-direct {v0, v1, p1}, Lf/a/b/i;-><init>(Lcom/discord/app/AppPermissions$a;I)V
+    invoke-direct {v2, v0, p1}, Lf/a/b/k;-><init>(Lcom/discord/app/AppPermissions$a;I)V
 
     goto :goto_0
 
     :cond_3
-    const p1, 0x7f121121
+    const p1, 0x7f12114c
 
-    new-instance v0, Lf/a/b/i;
+    new-instance v2, Lf/a/b/k;
 
-    invoke-direct {v0, v1, p1}, Lf/a/b/i;-><init>(Lcom/discord/app/AppPermissions$a;I)V
+    invoke-direct {v2, v0, p1}, Lf/a/b/k;-><init>(Lcom/discord/app/AppPermissions$a;I)V
 
     goto :goto_0
 
     :cond_4
-    const p1, 0x7f120f7b
+    const p1, 0x7f120fa5
 
-    new-instance v0, Lf/a/b/i;
+    new-instance v2, Lf/a/b/k;
 
-    invoke-direct {v0, v1, p1}, Lf/a/b/i;-><init>(Lcom/discord/app/AppPermissions$a;I)V
+    invoke-direct {v2, v0, p1}, Lf/a/b/k;-><init>(Lcom/discord/app/AppPermissions$a;I)V
 
     :goto_0
-    new-instance p1, Landroid/os/Handler;
+    move-object p1, v2
 
-    invoke-direct {p1}, Landroid/os/Handler;-><init>()V
+    :goto_1
+    new-instance v0, Landroid/os/Handler;
 
-    new-instance v1, Lcom/discord/app/AppPermissions$b;
+    invoke-direct {v0}, Landroid/os/Handler;-><init>()V
 
-    invoke-direct {v1, p0, p2, v2, v0}, Lcom/discord/app/AppPermissions$b;-><init>(Lcom/discord/app/AppPermissions;[ILkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    new-instance v2, Lcom/discord/app/AppPermissions$b;
 
-    invoke-virtual {p1, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+    invoke-direct {v2, p0, p2, v1, p1}, Lcom/discord/app/AppPermissions$b;-><init>(Lcom/discord/app/AppPermissions;[ILkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+
+    invoke-virtual {v0, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -349,7 +349,7 @@
 
     const-string v1, "PERMISSION_GROUPS[requestCode] ?: return"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/app/AppPermissions;->b:Landroidx/fragment/app/Fragment;
 
@@ -389,7 +389,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/i/l;->toIntArray(Ljava/util/Collection;)[I
+    invoke-static {v2}, Lk0/j/l;->toIntArray(Ljava/util/Collection;)[I
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali b/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
index e78097c8a6..6bbb294f50 100644
--- a/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
+++ b/com.discord/smali/com/discord/app/AppScrollingViewBehavior$a.smali
@@ -35,11 +35,13 @@
 .method public onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 5
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "v"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->a:Landroid/graphics/Rect;
 
@@ -115,18 +117,4 @@
     invoke-virtual {p1, v2, v1, v4, v3}, Landroid/view/View;->setPadding(IIII)V
 
     return-object p2
-
-    :cond_2
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali b/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
index 4ebdcc1b20..4c1d803ff7 100644
--- a/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
+++ b/com.discord/smali/com/discord/app/AppScrollingViewBehavior.smali
@@ -19,11 +19,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/appbar/AppBarLayout$ScrollingViewBehavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -34,26 +36,24 @@
     iput-object p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->a:Lcom/discord/app/AppScrollingViewBehavior$a;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public onApplyWindowInsets(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
-    .locals 0
+    .locals 1
+
+    const-string v0, "coordinatorLayout"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "child"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "insets"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/display/DisplayUtils;->getNO_OP_WINDOW_INSETS_LISTENER()Landroidx/core/view/OnApplyWindowInsetsListener;
 
diff --git a/com.discord/smali/com/discord/app/AppTextView.smali b/com.discord/smali/com/discord/app/AppTextView.smali
index fde452185e..b881475f7a 100644
--- a/com.discord/smali/com/discord/app/AppTextView.smali
+++ b/com.discord/smali/com/discord/app/AppTextView.smali
@@ -17,7 +17,7 @@
 
     const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -88,13 +88,13 @@
 
     const-string v5, "resources"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
     move-result-object v5
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p0, Lcom/discord/app/AppTextView;->d:I
 
@@ -128,7 +128,7 @@
 
     const-string p2, "java.lang.String.format(format, *args)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -144,13 +144,6 @@
     :cond_2
     :goto_0
     return-void
-
-    :cond_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -162,6 +155,10 @@
         .end annotation
     .end param
 
+    const-string v0, "formatArgs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p0}, Landroid/widget/TextView;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
@@ -184,9 +181,9 @@
 .method public final varargs b(Ljava/lang/String;[Ljava/lang/Object;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "formatArgs"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_2
 
@@ -221,21 +218,19 @@
     move-result-object p1
 
     :cond_1
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_1
 
     :cond_2
-    invoke-virtual {p0, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    const/4 p1, 0x0
+
+    :goto_1
+    invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "formatArgs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getAttrText()Ljava/lang/String;
@@ -257,7 +252,9 @@
 .method public final varargs setTextFormatArgs([Ljava/lang/Object;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "formatArgs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/app/AppTextView;->f:Ljava/lang/String;
 
@@ -287,18 +284,9 @@
 
     const-string v0, "java.lang.String.format(format, *args)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "formatArgs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppViewFlipper.smali b/com.discord/smali/com/discord/app/AppViewFlipper.smali
index fb6b423e29..b454cd900e 100644
--- a/com.discord/smali/com/discord/app/AppViewFlipper.smali
+++ b/com.discord/smali/com/discord/app/AppViewFlipper.smali
@@ -11,11 +11,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/ViewFlipper;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -52,20 +54,6 @@
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
     throw p2
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$a.smali b/com.discord/smali/com/discord/app/DiscordConnectService$a.smali
index 09e45079e8..ce283ef69c 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$a.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$a.smali
@@ -36,7 +36,7 @@
 
     const-string p0, "DiscordConnectService::class.java.simpleName"
 
-    invoke-static {v1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -56,7 +56,9 @@
 .method public final b(Landroid/content/Context;J)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils$RouteBuilders;
 
@@ -74,7 +76,7 @@
 
     const-string p3, "IntentUtils.RouteBuilder\u2026kage(context.packageName)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget p3, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -91,13 +93,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$b.smali b/com.discord/smali/com/discord/app/DiscordConnectService$b.smali
index e8bb356323..6c1048cd54 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$b.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/DiscordConnectService$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordConnectService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Object;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$c.smali b/com.discord/smali/com/discord/app/DiscordConnectService$c.smali
index 8fe3a71756..f9599a0691 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$c.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/DiscordConnectService$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordConnectService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService$d.smali b/com.discord/smali/com/discord/app/DiscordConnectService$d.smali
index d277c876e9..f065e1ff98 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService$d.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService$d.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/app/DiscordConnectService$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordConnectService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,9 @@
 
     check-cast p1, Lcom/discord/utilities/error/Error;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -98,13 +100,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService.smali b/com.discord/smali/com/discord/app/DiscordConnectService.smali
index f1222cade7..71c4660177 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService.smali
@@ -67,7 +67,7 @@
 
     const-string v2, "DiscordConnectService::class.java.simpleName"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -79,9 +79,9 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    sget-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v0, Lf/a/b/o;->c:Lf/a/b/o;
 
-    invoke-virtual {v0, p0}, Lf/a/b/m;->a(Ljava/lang/Object;)V
+    invoke-virtual {v0, p0}, Lf/a/b/o;->a(Ljava/lang/Object;)V
 
     new-instance v0, Landroidx/core/app/NotificationCompat$Builder;
 
@@ -103,7 +103,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080365
+    const v1, 0x7f080368
 
     invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
@@ -119,7 +119,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1204a0
+    const v1, 0x7f1204a1
 
     invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
 
@@ -129,7 +129,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1204a7
+    const v1, 0x7f1204a8
 
     invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
 
@@ -155,7 +155,7 @@
 
     const-string v2, "application"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream$Companion;->initialize(Landroid/app/Application;)V
 
@@ -165,7 +165,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils;->initAppOpen(Landroid/app/Application;)V
 
@@ -185,7 +185,7 @@
 
     const-string v2, "DiscordConnectService::class.java.simpleName"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -197,9 +197,9 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    sget-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v0, Lf/a/b/o;->c:Lf/a/b/o;
 
-    invoke-virtual {v0, p0}, Lf/a/b/m;->b(Ljava/lang/Object;)V
+    invoke-virtual {v0, p0}, Lf/a/b/o;->b(Ljava/lang/Object;)V
 
     invoke-super {p0}, Landroid/app/Service;->onDestroy()V
 
@@ -229,7 +229,7 @@
 
     const-string v2, "DiscordConnectService::class.java.simpleName"
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -279,7 +279,7 @@
 
     if-eqz v6, :cond_2
 
-    invoke-static {v6}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v6}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v6
 
@@ -301,9 +301,9 @@
 
     if-eqz v6, :cond_3
 
-    const v2, 0x7f1210ad
+    const v2, 0x7f1210d7
 
-    invoke-static {v0, v2, v7, v3, v8}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v2, v7, v3, v8}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     new-instance v2, Ljava/lang/IllegalStateException;
 
@@ -317,14 +317,14 @@
 
     const-string v3, "Observable.error(Illegal\u2026ateException(\"UNAUTHED\"))"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_5
 
     :cond_3
-    sget-object v6, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v6, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v6, Lf/a/b/t0/b;->s:Lkotlin/text/Regex;
+    sget-object v6, Lf/a/b/v0/b;->s:Lkotlin/text/Regex;
 
     invoke-virtual {v4}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -350,7 +350,7 @@
 
     if-eqz v7, :cond_5
 
-    invoke-static {v7, v5}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v7, v5}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -358,7 +358,7 @@
 
     if-eqz v5, :cond_5
 
-    invoke-static {v5}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v5}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v3
 
@@ -412,13 +412,13 @@
 
     if-eqz v4, :cond_8
 
-    const v2, 0x7f121121
+    const v2, 0x7f12114c
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    invoke-static {v0, v2, v4, v3, v8}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v2, v4, v3, v8}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     new-instance v2, Ljava/lang/IllegalStateException;
 
@@ -432,7 +432,7 @@
 
     const-string v3, "Observable.error(\n      \u2026to main app\")\n          )"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_5
 
@@ -449,7 +449,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x0
 
@@ -485,15 +485,15 @@
 
     move-result-object v2
 
-    sget-object v3, Lf/a/b/p0;->d:Lf/a/b/p0;
+    sget-object v3, Lf/a/b/r0;->d:Lf/a/b/r0;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
     const-string v2, "StoreStream\n        .get\u2026()\n        .filter { it }"
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v5, 0x2710
 
@@ -507,15 +507,15 @@
 
     move-result-object v2
 
-    sget-object v3, Lf/a/b/r0;->d:Lf/a/b/r0;
+    sget-object v3, Lf/a/b/t0;->d:Lf/a/b/t0;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v3, "isConnectedObs.switchMap\u2026nnected\n          }\n    }"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_5
 
@@ -528,13 +528,13 @@
 
     sget-object v2, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    new-instance v3, Lr0/l/e/j;
+    new-instance v3, Ls0/l/e/j;
 
-    invoke-direct {v3, v2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v3, v2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v2, "Observable.just(Unit)"
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_6
 
@@ -563,7 +563,7 @@
 
     const-string v3, "Observable.error(Illegal\u2026\"Invalid Request: $uri\"))"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_5
     move-object v3, v2
@@ -628,7 +628,7 @@
 
     move-result-object v7
 
-    invoke-static {v7, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v9, 0x0
 
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$a.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$a.smali
index 20afade6f4..b5db61fdd6 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$a.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$a.smali
@@ -94,16 +94,16 @@
     return-void
 
     :cond_2
-    const-string p1, "uri"
+    const-string/jumbo p1, "uri"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_3
     const-string p1, "provider"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
index 2b0d885d07..378ec2e885 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
@@ -66,9 +66,9 @@
     return-void
 
     :cond_0
-    const-string p1, "uri"
+    const-string/jumbo p1, "uri"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
index e6fb387633..61d466835f 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
@@ -54,81 +54,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/dialogs/ImageUploadDialog;
 
-    const-class v2, Lcom/discord/dialogs/ImageUploadDialog;
+    const-string/jumbo v2, "upload"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUpload()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "upload"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUpload()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/dialogs/ImageUploadDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "crop"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCrop()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/dialogs/ImageUploadDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "crop"
-
-    const-string v4, "getCrop()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/dialogs/ImageUploadDialog;
 
-    const-class v2, Lcom/discord/dialogs/ImageUploadDialog;
+    const-string v2, "cancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancel()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancel"
-
-    const-string v4, "getCancel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/dialogs/ImageUploadDialog;
 
-    const-class v2, Lcom/discord/dialogs/ImageUploadDialog;
+    const-string v2, "image"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "image"
-
-    const-string v4, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -152,7 +128,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a062d
+    const v0, 0x7f0a0633
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -160,7 +136,7 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0628
+    const v0, 0x7f0a062e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -168,7 +144,7 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0627
+    const v0, 0x7f0a062d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -176,7 +152,7 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a062b
+    const v0, 0x7f0a0631
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -218,181 +194,185 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 16
+    .locals 17
 
     move-object/from16 v0, p0
 
+    move-object/from16 v1, p1
+
+    const-string/jumbo v2, "view"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super/range {p0 .. p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    iget-object v1, v0, Lcom/discord/dialogs/ImageUploadDialog;->l:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    iget-object v2, v0, Lcom/discord/dialogs/ImageUploadDialog;->l:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
-    iget-object v2, v0, Lcom/discord/dialogs/ImageUploadDialog;->j:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/dialogs/ImageUploadDialog;->j:Ljava/lang/String;
 
-    if-eqz v1, :cond_5
+    if-eqz v2, :cond_5
 
-    if-nez v2, :cond_0
+    if-nez v3, :cond_0
 
     goto/16 :goto_2
 
     :cond_0
-    const-string v3, "image/gif"
+    const-string v4, "image/gif"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v3
+    move-result v4
 
-    iget-object v4, v0, Lcom/discord/dialogs/ImageUploadDialog;->d:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v5, v0, Lcom/discord/dialogs/ImageUploadDialog;->d:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog;->m:[Lkotlin/reflect/KProperty;
+
+    const/4 v7, 0x0
+
+    aget-object v6, v6, v7
+
+    invoke-interface {v5, v0, v6}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroid/view/View;
+
+    new-instance v6, Lcom/discord/dialogs/ImageUploadDialog$c;
+
+    invoke-direct {v6, v0, v3}, Lcom/discord/dialogs/ImageUploadDialog$c;-><init>(Lcom/discord/dialogs/ImageUploadDialog;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v6}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object v3, v0, Lcom/discord/dialogs/ImageUploadDialog;->e:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->m:[Lkotlin/reflect/KProperty;
 
-    const/4 v6, 0x0
+    const/4 v6, 0x1
 
     aget-object v5, v5, v6
 
-    invoke-interface {v4, v0, v5}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-interface {v3, v0, v5}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v3
 
-    check-cast v4, Landroid/view/View;
+    check-cast v3, Landroid/view/View;
 
-    new-instance v5, Lcom/discord/dialogs/ImageUploadDialog$c;
+    if-eqz v4, :cond_1
 
-    invoke-direct {v5, v0, v2}, Lcom/discord/dialogs/ImageUploadDialog$c;-><init>(Lcom/discord/dialogs/ImageUploadDialog;Ljava/lang/String;)V
-
-    invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object v2, v0, Lcom/discord/dialogs/ImageUploadDialog;->e:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v4, Lcom/discord/dialogs/ImageUploadDialog;->m:[Lkotlin/reflect/KProperty;
-
-    const/4 v5, 0x1
-
-    aget-object v4, v4, v5
-
-    invoke-interface {v2, v0, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/view/View;
-
-    if-eqz v3, :cond_1
-
-    const/4 v4, 0x4
+    const/4 v5, 0x4
 
     goto :goto_0
 
     :cond_1
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     :goto_0
-    invoke-virtual {v2, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v3, v5}, Landroid/view/View;->setVisibility(I)V
 
-    if-nez v3, :cond_2
+    if-nez v4, :cond_2
 
-    iget-object v2, v0, Lcom/discord/dialogs/ImageUploadDialog;->e:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v3, v0, Lcom/discord/dialogs/ImageUploadDialog;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v3, Lcom/discord/dialogs/ImageUploadDialog;->m:[Lkotlin/reflect/KProperty;
+    sget-object v4, Lcom/discord/dialogs/ImageUploadDialog;->m:[Lkotlin/reflect/KProperty;
 
-    aget-object v3, v3, v5
+    aget-object v4, v4, v6
 
-    invoke-interface {v2, v0, v3}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-interface {v3, v0, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Landroid/view/View;
+    check-cast v3, Landroid/view/View;
 
-    new-instance v3, Lcom/discord/dialogs/ImageUploadDialog$a;
+    new-instance v4, Lcom/discord/dialogs/ImageUploadDialog$a;
 
-    invoke-direct {v3, v6, v0}, Lcom/discord/dialogs/ImageUploadDialog$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v4, v7, v0}, Lcom/discord/dialogs/ImageUploadDialog$a;-><init>(ILjava/lang/Object;)V
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v3, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_2
-    iget-object v2, v0, Lcom/discord/dialogs/ImageUploadDialog;->f:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v3, v0, Lcom/discord/dialogs/ImageUploadDialog;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v3, Lcom/discord/dialogs/ImageUploadDialog;->m:[Lkotlin/reflect/KProperty;
+    sget-object v4, Lcom/discord/dialogs/ImageUploadDialog;->m:[Lkotlin/reflect/KProperty;
 
-    const/4 v4, 0x2
+    const/4 v5, 0x2
 
-    aget-object v3, v3, v4
+    aget-object v4, v4, v5
 
-    invoke-interface {v2, v0, v3}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-interface {v3, v0, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Landroid/view/View;
+    check-cast v3, Landroid/view/View;
 
-    new-instance v3, Lcom/discord/dialogs/ImageUploadDialog$a;
+    new-instance v4, Lcom/discord/dialogs/ImageUploadDialog$a;
 
-    invoke-direct {v3, v5, v0}, Lcom/discord/dialogs/ImageUploadDialog$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v4, v6, v0}, Lcom/discord/dialogs/ImageUploadDialog$a;-><init>(ILjava/lang/Object;)V
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v3, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->getPreviewSizeDimenId()I
+    invoke-virtual {v2}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->getPreviewSizeDimenId()I
 
-    move-result v3
+    move-result v4
 
-    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
-    move-result v9
-
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/dialogs/ImageUploadDialog;->f()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Landroid/widget/ImageView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v2
-
-    iput v9, v2, Landroid/view/ViewGroup$LayoutParams;->height:I
-
-    iput v9, v2, Landroid/view/ViewGroup$LayoutParams;->width:I
+    move-result v10
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/dialogs/ImageUploadDialog;->f()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v3
 
-    invoke-virtual {v3, v2}, Landroid/widget/ImageView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+    invoke-virtual {v3}, Landroid/widget/ImageView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+    move-result-object v3
 
-    move-result v1
+    iput v10, v3, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    if-eq v1, v5, :cond_3
+    iput v10, v3, Landroid/view/ViewGroup$LayoutParams;->width:I
 
-    if-eq v1, v4, :cond_3
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/dialogs/ImageUploadDialog;->f()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v4
+
+    invoke-virtual {v4, v3}, Landroid/widget/ImageView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    invoke-virtual {v2}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v2
+
+    if-eq v2, v6, :cond_3
+
+    if-eq v2, v5, :cond_3
 
     goto :goto_1
 
     :cond_3
     invoke-virtual/range {p0 .. p0}, Lcom/discord/dialogs/ImageUploadDialog;->f()Lcom/facebook/drawee/view/SimpleDraweeView;
 
+    move-result-object v2
+
+    int-to-float v3, v10
+
+    const v4, 0x7f04041b
+
+    invoke-static {v1, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
     move-result-object v1
 
-    int-to-float v2, v9
-
-    const v3, 0x7f04041b
-
-    move-object/from16 v4, p1
-
-    invoke-static {v4, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
-
-    move-result v3
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v3
-
-    invoke-static {v1, v2, v5, v3}, Lcom/discord/utilities/images/MGImages;->setCornerRadius(Landroid/widget/ImageView;FZLjava/lang/Integer;)V
+    invoke-static {v2, v3, v6, v1}, Lcom/discord/utilities/images/MGImages;->setCornerRadius(Landroid/widget/ImageView;FZLjava/lang/Integer;)V
 
     :goto_1
     invoke-virtual/range {p0 .. p0}, Lcom/discord/dialogs/ImageUploadDialog;->f()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v6
+    move-result-object v7
 
     iget-object v1, v0, Lcom/discord/dialogs/ImageUploadDialog;->h:Landroid/net/Uri;
 
@@ -400,9 +380,7 @@
 
     invoke-virtual {v1}, Landroid/net/Uri;->toString()Ljava/lang/String;
 
-    move-result-object v7
-
-    const/4 v10, 0x0
+    move-result-object v8
 
     const/4 v11, 0x0
 
@@ -410,20 +388,22 @@
 
     const/4 v13, 0x0
 
-    const/16 v14, 0xf0
+    const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v15, 0xf0
 
-    move v8, v9
+    const/16 v16, 0x0
 
-    invoke-static/range {v6 .. v15}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
+    move v9, v10
+
+    invoke-static/range {v7 .. v16}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     return-void
 
     :cond_4
-    const-string v1, "uri"
+    const-string/jumbo v1, "uri"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1.smali
index 5d0aa11870..9a148acef2 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewayDiscovery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewayDiscovery$Cache$setGatewayUrl$1;->$gatewayUrl:Ljava/lang/String;
 
@@ -70,13 +72,4 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
index 06234b5a2e..d2d68ce0a3 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$Cache.smali
@@ -65,7 +65,7 @@
     :cond_0
     const-string v0, "sharedPreferences"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -73,7 +73,9 @@
 .method public final init(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
@@ -81,20 +83,11 @@
 
     const-string v0, "PreferenceManager.getDef\u2026haredPreferences(context)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/gateway/GatewayDiscovery$Cache;->sharedPreferences:Landroid/content/SharedPreferences;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setGatewayUrl(Ljava/lang/String;)V
@@ -115,7 +108,7 @@
     :cond_0
     const-string p1, "sharedPreferences"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali
index b8d75ddb61..1d9683cb1d 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewayDiscovery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,28 +65,23 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "throwable"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;->this$0:Lcom/discord/gateway/GatewayDiscovery;
+    iget-object v0, p0, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;->this$0:Lcom/discord/gateway/GatewayDiscovery;
 
-    invoke-static {v1, v0}, Lcom/discord/gateway/GatewayDiscovery;->access$setGatewayUrl$p(Lcom/discord/gateway/GatewayDiscovery;Ljava/lang/String;)V
+    const/4 v1, 0x0
 
-    sget-object v1, Lcom/discord/gateway/GatewayDiscovery$Cache;->INSTANCE:Lcom/discord/gateway/GatewayDiscovery$Cache;
+    invoke-static {v0, v1}, Lcom/discord/gateway/GatewayDiscovery;->access$setGatewayUrl$p(Lcom/discord/gateway/GatewayDiscovery;Ljava/lang/String;)V
 
-    invoke-virtual {v1, v0}, Lcom/discord/gateway/GatewayDiscovery$Cache;->setGatewayUrl(Ljava/lang/String;)V
+    sget-object v0, Lcom/discord/gateway/GatewayDiscovery$Cache;->INSTANCE:Lcom/discord/gateway/GatewayDiscovery$Cache;
+
+    invoke-virtual {v0, v1}, Lcom/discord/gateway/GatewayDiscovery$Cache;->setGatewayUrl(Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;->$onFailure:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "throwable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali
index 750e5a460d..bffe28869a 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewayDiscovery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali
index b0bccad986..e259b58293 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GatewayDiscovery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -33,43 +33,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2;)V
-    .locals 0
+    .locals 6
 
     iput-object p1, p0, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$3;->$handleSuccess$2:Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$2;
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/g;-><init>(I)V
+    const/4 v2, 0x0
+
+    const-string v3, "handleSuccess"
+
+    const-string v4, "invoke(Ljava/lang/String;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSuccess"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke(Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali
index 7c045fd430..dda1f5db09 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GatewayDiscovery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -33,43 +33,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;)V
-    .locals 0
+    .locals 6
 
     iput-object p1, p0, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4;->$handleFailure$1:Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/g;-><init>(I)V
+    const/4 v2, 0x0
+
+    const-string v3, "handleFailure"
+
+    const-string v4, "invoke(Ljava/lang/Throwable;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFailure"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke(Ljava/lang/Throwable;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -85,20 +71,13 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$4;->$handleFailure$1:Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;
 
     invoke-virtual {v0, p1}, Lcom/discord/gateway/GatewayDiscovery$discoverGatewayUrl$1;->invoke(Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali
index 91740d780d..d4193d6845 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery$sam$rx_functions_Action1$0.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali b/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali
index 38ae6bf752..05914b97c5 100644
--- a/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali
+++ b/com.discord/smali/com/discord/gateway/GatewayDiscovery.smali
@@ -62,17 +62,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "scheduler"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "backoff"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "log"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "gatewayUrlProvider"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -97,41 +105,6 @@
     iput-object p1, p0, Lcom/discord/gateway/GatewayDiscovery;->gatewayUrl:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "gatewayUrlProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "log"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "backoff"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getGatewayUrl$p(Lcom/discord/gateway/GatewayDiscovery;)Ljava/lang/String;
@@ -178,11 +151,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onSuccess"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "onFailure"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewayDiscovery;->backoff:Lcom/discord/utilities/networking/Backoff;
 
@@ -271,18 +246,4 @@
     iput-object p1, p0, Lcom/discord/gateway/GatewayDiscovery;->gatewayUrlDiscoverySubscription:Lrx/Subscription;
 
     return-void
-
-    :cond_2
-    const-string p1, "onFailure"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "onSuccess"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
index c2ad8e513f..c7e12feb52 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,36 +59,29 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
 
-    sget-object v0, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+    sget-object v1, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
 
-    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
+    iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
-    move-result-object v1
+    invoke-static {v0}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
 
-    const/4 v3, 0x0
+    move-result-object v2
 
-    const/4 v4, 0x2
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x2
 
-    move-object v2, p1
+    const/4 v6, 0x0
 
-    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
+    move-object v3, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/gateway/GatewaySocket$Companion;->log$default(Lcom/discord/gateway/GatewaySocket$Companion;Lcom/discord/utilities/logging/Logger;Ljava/lang/String;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali
index a95b98d3b7..27b98b8b20 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$2.smali
@@ -3,7 +3,7 @@
 .source "GatewaySocket.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
index ad8de8772e..ccd4736e27 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/gateway/GatewaySocket$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/gateway/GatewaySocket;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/gateway/GatewaySocket;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleDeviceConnectivityChange"
+
+    const-string v5, "handleDeviceConnectivityChange(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleDeviceConnectivityChange"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/gateway/GatewaySocket;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleDeviceConnectivityChange(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/gateway/GatewaySocket;
 
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali
index 71bfd6e7e9..9753ac4a66 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$IdentifyData.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/gateway/io/OutgoingPayload$IdentifyClientState;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/gateway/GatewaySocket$IdentifyData;->clientState:Lcom/discord/gateway/io/OutgoingPayload$IdentifyClientState;
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$SizeRecordingInputStreamReader.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$SizeRecordingInputStreamReader.smali
index 67aaf47f9b..609efd99e2 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$SizeRecordingInputStreamReader.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$SizeRecordingInputStreamReader.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/io/InputStreamReader;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/io/Reader;-><init>()V
 
@@ -33,15 +35,6 @@
     iput p2, p0, Lcom/discord/gateway/GatewaySocket$SizeRecordingInputStreamReader;->size:I
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/io/InputStreamReader;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -90,7 +83,9 @@
 .method public read([CII)I
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "buffer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$SizeRecordingInputStreamReader;->source:Ljava/io/InputStreamReader;
 
@@ -110,15 +105,6 @@
 
     :cond_0
     return p1
-
-    :cond_1
-    const-string p1, "buffer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setSize(I)V
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali
index 6dd0b0cfd4..3c492b02f8 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$Timer.smali
@@ -25,24 +25,17 @@
 
 # direct methods
 .method public constructor <init>(Lrx/Scheduler;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "scheduler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/gateway/GatewaySocket$Timer;->scheduler:Lrx/Scheduler;
 
     return-void
-
-    :cond_0
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getSubscription$p(Lcom/discord/gateway/GatewaySocket$Timer;)Lrx/Subscription;
@@ -143,7 +136,7 @@
 .end method
 
 .method public final postInterval(Lkotlin/jvm/functions/Function0;J)V
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -153,21 +146,23 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$Timer;->cancel()V
 
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v5, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
-    move-result-object v5
+    move-result-object v6
 
-    move-wide v0, p2
+    move-wide v1, p2
 
-    move-wide v2, p2
+    move-wide v3, p2
 
-    invoke-static/range {v0 .. v5}, Lrx/Observable;->C(JJLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)Lrx/Observable;
+    invoke-static/range {v1 .. v6}, Lrx/Observable;->C(JJLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)Lrx/Observable;
 
     move-result-object p2
 
@@ -190,15 +185,6 @@
     iput-object p1, p0, Lcom/discord/gateway/GatewaySocket$Timer;->subscription:Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public schedule(Lkotlin/jvm/functions/Function0;J)V
@@ -212,7 +198,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/gateway/GatewaySocket$Timer;->cancel()V
 
@@ -241,13 +229,4 @@
     iput-object p1, p0, Lcom/discord/gateway/GatewaySocket$Timer;->subscription:Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "action"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali
index af68c8a49a..eba4706a0e 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$callConnect$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$callConnect$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$close$1$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$close$1$1.smali
index 155f7f3204..193f951034 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$close$1$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$close$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$close$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali
index da00cf22f1..416430fe79 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$close$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$close$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1.smali
index 9cb1dc6ab5..fa617f0f6f 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Opened;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Opened;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
@@ -74,13 +76,4 @@
     invoke-static {p1, v0}, Lcom/discord/gateway/GatewaySocket;->access$handleWebSocketOpened(Lcom/discord/gateway/GatewaySocket;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2.smali
index 49c74dc73c..0a2036b32c 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Closed;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,20 +65,13 @@
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Closed;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$2;->this$0:Lcom/discord/gateway/GatewaySocket;
 
     invoke-static {v0, p1}, Lcom/discord/gateway/GatewaySocket;->access$handleWebSocketClose(Lcom/discord/gateway/GatewaySocket;Lcom/discord/utilities/websocket/WebSocket$Closed;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3.smali
index 5cea992a13..22462cade0 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/io/InputStreamReader;",
         "Ljava/lang/Integer;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,20 +72,13 @@
 .method public final invoke(Ljava/io/InputStreamReader;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$3;->this$0:Lcom/discord/gateway/GatewaySocket;
 
     invoke-static {v0, p1, p2}, Lcom/discord/gateway/GatewaySocket;->access$handleWebSocketMessage(Lcom/discord/gateway/GatewaySocket;Ljava/io/InputStreamReader;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4.smali
index 3ef08c2fa5..e684af5a5d 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4.smali
@@ -41,7 +41,9 @@
 .method public onRawMessage(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "rawMessage"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4;->this$0:Lcom/discord/gateway/GatewaySocket;
 
@@ -52,21 +54,14 @@
     invoke-interface {v0, p1}, Lcom/discord/gateway/GatewaySocketLogger;->logInboundMessage(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "rawMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onRawMessageInflateFailed(Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "throwable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$4;->this$0:Lcom/discord/gateway/GatewaySocket;
 
@@ -77,13 +72,4 @@
     invoke-interface {v0, p1}, Lcom/discord/gateway/GatewaySocketLogger;->logMessageInflateFailed(Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "throwable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$5.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$5.smali
index 59f137c7f0..4ecda40298 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$5.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,22 +63,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/gateway/GatewaySocket$connect$$inlined$apply$lambda$5;->this$0:Lcom/discord/gateway/GatewaySocket;
 
     invoke-static {p1}, Lcom/discord/gateway/GatewaySocket;->access$handleWebSocketError(Lcom/discord/gateway/GatewaySocket;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali
index 462ab71b58..d9344045bc 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$connect$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali
index 6bd1a08411..8dd1708bbb 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$connect$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali
index 15343c0e25..0607f663d4 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$connect$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali
index 7b77f0a537..d947696c9e 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$connect$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/gateway/GatewaySocket$connect$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/String;",
         "Ljava/lang/Exception;",
@@ -35,45 +35,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/gateway/GatewaySocket;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/gateway/GatewaySocket;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "logError"
+
+    const-string v5, "logError(Ljava/lang/String;Ljava/lang/Exception;Ljava/util/Map;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "logError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/gateway/GatewaySocket;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "logError(Ljava/lang/String;Ljava/lang/Exception;Ljava/util/Map;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -104,31 +88,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/gateway/GatewaySocket;
 
     invoke-static {v0, p1, p2, p3}, Lcom/discord/gateway/GatewaySocket;->access$logError(Lcom/discord/gateway/GatewaySocket;Ljava/lang/String;Ljava/lang/Exception;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali
index 13a86dee8c..bb99446981 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$discover$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "gatewayUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$discover$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
@@ -85,13 +87,4 @@
     invoke-static {v0, p1}, Lcom/discord/gateway/GatewaySocket;->access$connect(Lcom/discord/gateway/GatewaySocket;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "gatewayUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali
index 49825503e6..6f4d6d0452 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discover$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$discover$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Ljava/lang/Throwable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/gateway/GatewaySocket$discover$2;->this$0:Lcom/discord/gateway/GatewaySocket;
 
     invoke-static {p1}, Lcom/discord/gateway/GatewaySocket;->access$discoveryFailed(Lcom/discord/gateway/GatewaySocket;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$discoveryFailed$delay$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$discoveryFailed$delay$1.smali
index 6b478c4b6e..f8f78193e5 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$discoveryFailed$delay$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$discoveryFailed$delay$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$discoveryFailed$delay$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1.smali
index 00ad3e31ff..c9ba2a8120 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,45 +59,47 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_1
+    const-string v0, "reason"
 
-    sget-object v0, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1;->this$0:Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;
+    sget-object v1, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
 
-    iget-object v1, v1, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+    iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1;->this$0:Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;
 
-    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
+    iget-object v0, v0, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v3, "Connection backoff reset "
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2e
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
 
     move-result-object v2
 
-    const/4 v3, 0x0
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    const/4 v4, 0x2
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const/4 v5, 0x0
+    const-string v3, "Connection backoff reset "
 
-    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
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2e
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v1 .. v6}, 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 p1, p0, Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$1;->this$0:Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;
 
@@ -135,13 +137,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2.smali
index bd5460ac04..430e34f69a 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali
index 8bb0c5bba4..a32b32a22b 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$expeditedHeartbeat$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     if-eqz v0, :cond_0
 
-    const-string v0, "with reason \'"
+    const-string/jumbo v0, "with reason \'"
 
     invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali
index 4f6c3e3fab..1aff7eff17 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$handleClose$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$delay$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$delay$1.smali
index 9e96d37526..ede90365ec 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$delay$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleClose$delay$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$handleClose$delay$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali
index 63edf4d7eb..cb79447f19 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatAck$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$handleHeartbeatAck$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali
index 20f5a18b1a..be9c567d12 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1.smali
index 0174d95887..97a7d846b6 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$handleHeartbeatTimeout$delay$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali
index fb3c0a930d..5ece26a034 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleReconnect$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$handleReconnect$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$handleWebSocketMessage$incomingParser$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$handleWebSocketMessage$incomingParser$1.smali
index 094fc9a1ef..3abe95aed3 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$handleWebSocketMessage$incomingParser$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$handleWebSocketMessage$incomingParser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$handleWebSocketMessage$incomingParser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,36 +59,29 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    sget-object v0, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$handleWebSocketMessage$incomingParser$1;->this$0:Lcom/discord/gateway/GatewaySocket;
+    sget-object v1, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
 
-    invoke-static {v1}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
+    iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$handleWebSocketMessage$incomingParser$1;->this$0:Lcom/discord/gateway/GatewaySocket;
 
-    move-result-object v1
+    invoke-static {v0}, Lcom/discord/gateway/GatewaySocket;->access$getLogger$p(Lcom/discord/gateway/GatewaySocket;)Lcom/discord/utilities/logging/Logger;
 
-    const/4 v3, 0x0
+    move-result-object v2
 
-    const/4 v4, 0x2
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x2
 
-    move-object v2, p1
+    const/4 v6, 0x0
 
-    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
+    move-object v3, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/gateway/GatewaySocket$Companion;->log$default(Lcom/discord/gateway/GatewaySocket$Companion;Lcom/discord/utilities/logging/Logger;Ljava/lang/String;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1$1.smali
index e6edd5b177..c25fed8d17 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -49,29 +49,19 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
-
-    invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;->invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/String;
+.method public final invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getName()Ljava/lang/String;
 
@@ -79,16 +69,19 @@
 
     const-string v0, "it.name"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
+
+    invoke-virtual {p0, p1}, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1$1;->invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
+
+    move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 454af1bce9..124c85de0c 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 
     const/16 v11, 0x1f
 
-    invoke-static/range {v4 .. v11}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v4 .. v11}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v3
 
@@ -166,7 +166,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v3, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_1
     iget-object v4, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$afk:Ljava/lang/Boolean;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
index a3071e5c50..31e9ec48c4 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$requestGuildMembers$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$requestGuildMembers$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -138,7 +138,7 @@
 
     const-string v2, "gsonOmitNulls"
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$resetOnError$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$resetOnError$1.smali
index 9ab7f15332..45926d3363 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$resetOnError$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$resetOnError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$resetOnError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali
index aad7018542..3c08ea1db3 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$sam$rx_functions_Action1$0.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali
index 288b403db6..c043653abd 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$startHeartbeater$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$startHeartbeater$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$streamDelete$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$streamDelete$1.smali
index f02de49744..802786e246 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$streamDelete$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$streamDelete$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$streamDelete$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$streamWatch$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$streamWatch$1.smali
index c5a8d123b8..4cc82cb0ea 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$streamWatch$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$streamWatch$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$streamWatch$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$voiceServerPing$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$voiceServerPing$1.smali
index 93567b16f2..715d13f7bf 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$voiceServerPing$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$voiceServerPing$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$voiceServerPing$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali
index dde6173c22..0ee51946b6 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket$voiceStateUpdate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/gateway/GatewaySocket$voiceStateUpdate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GatewaySocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -62,7 +62,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket.smali b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
index e40e78474a..ec0832b680 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final CLIENT_CAPABILITIES:J = 0xfL
+.field public static final CLIENT_CAPABILITIES:J = 0x1fL
 
 .field public static final CLOSE_CODE_CLEAN:I = 0x3e8
 
@@ -31,6 +31,8 @@
 
 .field public static final Companion:Lcom/discord/gateway/GatewaySocket$Companion;
 
+.field public static final DEDUPE_USER_OBJECTS:J = 0x10L
+
 .field public static final DISCONNECTED:I = 0x0
 
 .field public static final DISCOVERING:I = 0x1
@@ -434,25 +436,41 @@
 
     move-object/from16 v9, p11
 
-    const/4 v10, 0x0
+    const-string v10, "identifyDataProvider"
 
-    if-eqz v1, :cond_8
+    invoke-static {v1, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_7
+    const-string v10, "trackReadyPayload"
 
-    if-eqz v3, :cond_6
+    invoke-static {v2, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_5
+    const-string v10, "eventHandler"
 
-    if-eqz v5, :cond_4
+    invoke-static {v3, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_3
+    const-string v10, "scheduler"
 
-    if-eqz v7, :cond_2
+    invoke-static {v4, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v8, :cond_1
+    const-string v10, "logger"
 
-    if-eqz v9, :cond_0
+    invoke-static {v5, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "restConfig"
+
+    invoke-static {v6, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "context"
+
+    invoke-static {v7, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "identifyProperties"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "gatewaySocketLogger"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
 
@@ -480,6 +498,10 @@
 
     new-instance v1, Lcom/discord/utilities/networking/Backoff;
 
+    new-instance v15, Lcom/discord/gateway/GatewaySocket$Timer;
+
+    invoke-direct {v15, v4}, Lcom/discord/gateway/GatewaySocket$Timer;-><init>(Lrx/Scheduler;)V
+
     const-wide/16 v9, 0x3e8
 
     const-wide/16 v11, 0x2710
@@ -488,10 +510,6 @@
 
     const/4 v14, 0x1
 
-    new-instance v15, Lcom/discord/gateway/GatewaySocket$Timer;
-
-    invoke-direct {v15, v4}, Lcom/discord/gateway/GatewaySocket$Timer;-><init>(Lrx/Scheduler;)V
-
     move-object v8, v1
 
     invoke-direct/range {v8 .. v15}, Lcom/discord/utilities/networking/Backoff;-><init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;)V
@@ -570,7 +588,7 @@
 
     invoke-direct {v1, v7}, Lcom/discord/utilities/networking/NetworkMonitor;-><init>(Landroid/content/Context;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
+    invoke-virtual {v1}, Lcom/discord/utilities/networking/NetworkMonitor;->observeIsConnected()Lrx/Observable;
 
     move-result-object v1
 
@@ -586,19 +604,19 @@
 
     sget-object v2, Lcom/discord/gateway/GatewaySocket$2;->INSTANCE:Lcom/discord/gateway/GatewaySocket$2;
 
-    new-instance v3, Lr0/l/a/z1;
+    new-instance v3, Ls0/l/a/z1;
 
-    new-instance v4, Lr0/l/a/y1;
+    new-instance v4, Ls0/l/a/y1;
 
-    invoke-direct {v4, v2}, Lr0/l/a/y1;-><init>(Lr0/k/b;)V
+    invoke-direct {v4, v2}, Ls0/l/a/y1;-><init>(Ls0/k/b;)V
 
-    invoke-direct {v3, v4}, Lr0/l/a/z1;-><init>(Lrx/functions/Func2;)V
+    invoke-direct {v3, v4}, Ls0/l/a/z1;-><init>(Lrx/functions/Func2;)V
 
-    new-instance v2, Lr0/l/a/u;
+    new-instance v2, Ls0/l/a/u;
 
     iget-object v1, v1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v2, v1, v3}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v2, v1, v3}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -615,69 +633,6 @@
     invoke-virtual {v1, v3}, Lrx/Observable;->R(Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    const-string v1, "gatewaySocketLogger"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_1
-    const-string v1, "identifyProperties"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_2
-    const-string v1, "context"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_3
-    const-string v1, "restConfig"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_4
-    const-string v1, "logger"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_5
-    const-string v1, "scheduler"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_6
-    const-string v1, "eventHandler"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_7
-    const-string v1, "trackReadyPayload"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_8
-    const-string v1, "identifyDataProvider"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
 .end method
 
 .method public constructor <init>(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lcom/discord/gateway/GatewayEventHandler;Lrx/Scheduler;Lcom/discord/utilities/logging/Logger;Lcom/discord/gateway/rest/RestConfig;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Ljavax/net/ssl/SSLSocketFactory;Ljava/util/Map;Lcom/discord/gateway/GatewaySocketLogger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -715,7 +670,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     move-object v13, v0
 
@@ -1397,7 +1352,7 @@
 
     move-result-object v7
 
-    const-wide/16 v10, 0xf
+    const-wide/16 v10, 0x1f
 
     iget-object v12, p0, Lcom/discord/gateway/GatewaySocket;->identifyProperties:Ljava/util/Map;
 
@@ -1611,7 +1566,7 @@
 
     const-string v2, "java.lang.String.format(this, *args)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1699,11 +1654,11 @@
 
     if-eqz v1, :cond_1
 
-    instance-of v1, p1, Lj0/n/c/v/a;
+    instance-of v1, p1, Lk0/o/c/w/a;
 
     if-eqz v1, :cond_0
 
-    instance-of v1, p1, Lj0/n/c/v/c;
+    instance-of v1, p1, Lk0/o/c/w/c;
 
     if-eqz v1, :cond_1
 
@@ -1765,11 +1720,11 @@
 
     if-eqz v6, :cond_5
 
-    instance-of v6, v4, Lj0/n/c/v/a;
+    instance-of v6, v4, Lk0/o/c/w/a;
 
     if-eqz v6, :cond_4
 
-    instance-of v6, v4, Lj0/n/c/v/d;
+    instance-of v6, v4, Lk0/o/c/w/d;
 
     if-eqz v6, :cond_5
 
@@ -1893,7 +1848,7 @@
 
     const-string v1, " -> "
 
-    invoke-static/range {v0 .. v7}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v0 .. v7}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -2186,7 +2141,7 @@
     :cond_0
     const-string v0, "READY"
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v8, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2194,7 +2149,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {v8, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v8, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2303,7 +2258,7 @@
 
     const-string v0, "StringBuilder()\n        \u2026              .toString()"
 
-    invoke-static {v15, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v13, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
 
@@ -2427,7 +2382,7 @@
     :cond_8
     sget-object v0, Lcom/discord/gateway/GatewaySocket;->EXPECTED_NULL_DATA_EVENTS:Ljava/util/Set;
 
-    invoke-static {v0, v8}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {v0, v8}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2729,7 +2684,7 @@
     goto :goto_1
 
     :cond_1
-    const-string v0, "unspecified reason"
+    const-string/jumbo v0, "unspecified reason"
 
     :goto_1
     invoke-virtual {p1}, Lcom/discord/utilities/websocket/WebSocket$Closed;->getCode()I
@@ -2900,11 +2855,11 @@
     goto :goto_0
 
     :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.models.domain.ModelPayload.Hello"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -2926,11 +2881,11 @@
     goto :goto_0
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type kotlin.Boolean"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -3097,7 +3052,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p3, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p3, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-virtual {v0, p1, p2, p3}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
@@ -3298,9 +3253,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/gateway/GatewaySocket;->scheduler:Lrx/Scheduler;
 
@@ -3379,7 +3334,7 @@
 
     const-string p3, "json"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p1}, Lcom/discord/gateway/GatewaySocketLogger;->logOutboundMessage(Ljava/lang/String;)V
 
@@ -3447,7 +3402,7 @@
 
     const-string p4, "gsonIncludeNulls"
 
-    invoke-static {p3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_1
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/gateway/GatewaySocket;->send(Lcom/discord/gateway/io/Outgoing;ZLcom/google/gson/Gson;)V
@@ -3535,7 +3490,7 @@
 
     const-string v7, "guild"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelGuild;->getChannels()Ljava/util/List;
 
@@ -3571,7 +3526,7 @@
 
     const-string v8, "channel"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->isCategory()Z
 
@@ -3622,7 +3577,7 @@
 
     const-string v9, "gateway-"
 
-    invoke-static {v8, v9, v3, v7}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v8, v9, v3, v7}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v8
 
@@ -3670,7 +3625,7 @@
 
     const-string v12, "start_session"
 
-    invoke-static {v11, v12}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v11, v12}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v12
 
@@ -3683,7 +3638,7 @@
     :cond_5
     const-string v12, "guilds_connect"
 
-    invoke-static {v11, v12}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v11, v12}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v11
 
@@ -3818,7 +3773,7 @@
 
     new-instance v7, Lkotlin/Pair;
 
-    const-string v8, "uncompressed_byte_size"
+    const-string/jumbo v8, "uncompressed_byte_size"
 
     invoke-direct {v7, v8, v6}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -3856,7 +3811,7 @@
 
     new-instance v7, Lkotlin/Pair;
 
-    const-string v8, "unpack_duration_ms"
+    const-string/jumbo v8, "unpack_duration_ms"
 
     invoke-direct {v7, v8, v6}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -4171,36 +4126,29 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildIds"
 
-    new-instance v6, Lcom/discord/gateway/GatewaySocket$requestGuildMembers$1;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/gateway/GatewaySocket$requestGuildMembers$1;
 
-    move-object v1, p0
+    move-object v1, v0
 
-    move-object v2, p1
+    move-object v2, p0
 
-    move-object v3, p2
+    move-object v3, p1
 
-    move-object v4, p3
+    move-object v4, p2
 
-    move-object v5, p4
+    move-object v5, p3
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/gateway/GatewaySocket$requestGuildMembers$1;-><init>(Lcom/discord/gateway/GatewaySocket;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;)V
+    move-object v6, p4
 
-    invoke-direct {p0, v6}, Lcom/discord/gateway/GatewaySocket;->schedule(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/gateway/GatewaySocket$requestGuildMembers$1;-><init>(Lcom/discord/gateway/GatewaySocket;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;)V
+
+    invoke-direct {p0, v0}, Lcom/discord/gateway/GatewaySocket;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final resetOnError()V
@@ -4215,10 +4163,96 @@
     return-void
 .end method
 
+.method public final streamCreate(Ljava/lang/String;JLjava/lang/Long;Ljava/lang/String;)V
+    .locals 13
+
+    const-string v0, "streamType"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v3, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
+
+    move-object v0, p0
+
+    iget-object v4, v0, Lcom/discord/gateway/GatewaySocket;->logger:Lcom/discord/utilities/logging/Logger;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v5, "Sending STREAM_CREATE: "
+
+    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-wide v9, p2
+
+    invoke-virtual {v1, v9, v10}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const/16 v5, 0x20
+
+    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    move-object/from16 v11, p4
+
+    invoke-virtual {v1, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x2
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v3 .. v8}, Lcom/discord/gateway/GatewaySocket$Companion;->log$default(Lcom/discord/gateway/GatewaySocket$Companion;Lcom/discord/utilities/logging/Logger;Ljava/lang/String;ZILjava/lang/Object;)V
+
+    new-instance v7, Lcom/discord/gateway/io/Outgoing;
+
+    sget-object v8, Lcom/discord/gateway/opcodes/Opcode;->STREAM_CREATE:Lcom/discord/gateway/opcodes/Opcode;
+
+    new-instance v12, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;
+
+    move-object v1, v12
+
+    move-wide v3, p2
+
+    move-object/from16 v5, p4
+
+    move-object/from16 v6, p5
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;-><init>(Ljava/lang/String;JLjava/lang/Long;Ljava/lang/String;)V
+
+    invoke-direct {v7, v8, v12}, Lcom/discord/gateway/io/Outgoing;-><init>(Lcom/discord/gateway/opcodes/Opcode;Ljava/lang/Object;)V
+
+    const/4 v6, 0x0
+
+    const/4 v1, 0x0
+
+    const/4 v8, 0x6
+
+    const/4 v9, 0x0
+
+    move-object v4, p0
+
+    move-object v5, v7
+
+    move-object v7, v1
+
+    invoke-static/range {v4 .. v9}, 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
+
 .method public final streamDelete(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/gateway/GatewaySocket$streamDelete$1;
 
@@ -4227,21 +4261,14 @@
     invoke-direct {p0, v0}, Lcom/discord/gateway/GatewaySocket;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final streamWatch(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/gateway/GatewaySocket$streamWatch$1;
 
@@ -4250,31 +4277,22 @@
     invoke-direct {p0, v0}, Lcom/discord/gateway/GatewaySocket;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateGuildSubscriptions(JLcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;)V
-    .locals 17
+    .locals 13
 
     move-object/from16 v0, p3
 
-    const/4 v1, 0x0
+    const-string v1, "guildSubscriptions"
 
-    if-eqz v0, :cond_1
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion;
 
-    move-object/from16 v9, p0
+    move-object v1, p0
 
-    iget-object v3, v9, Lcom/discord/gateway/GatewaySocket;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v3, v1, Lcom/discord/gateway/GatewaySocket;->logger:Lcom/discord/utilities/logging/Logger;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -4284,9 +4302,9 @@
 
     invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-wide/from16 v11, p1
+    move-wide v8, p1
 
-    invoke-virtual {v4, v11, v12}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v4, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     const-string v5, " -- "
 
@@ -4314,34 +4332,41 @@
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;->getTyping()Ljava/lang/Boolean;
 
-    move-result-object v13
+    move-result-object v5
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;->getActivities()Ljava/lang/Boolean;
 
-    move-result-object v14
+    move-result-object v10
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;->getMembers()Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v6
 
-    if-eqz v5, :cond_0
+    if-eqz v6, :cond_0
 
-    invoke-static {v5}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v6}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v6
+
+    goto :goto_0
 
     :cond_0
-    move-object v15, v1
+    const/4 v6, 0x0
+
+    :goto_0
+    move-object v11, v6
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;->getChannels()Ljava/util/Map;
 
-    move-result-object v16
+    move-result-object v12
 
-    move-object v10, v3
+    move-object v6, v3
 
-    move-wide/from16 v11, p1
+    move-wide v7, p1
 
-    invoke-direct/range {v10 .. v16}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate;-><init>(JLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/Map;)V
+    move-object v9, v5
+
+    invoke-direct/range {v6 .. v12}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate;-><init>(JLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/Map;)V
 
     invoke-direct {v4, v2, v3}, Lcom/discord/gateway/io/Outgoing;-><init>(Lcom/discord/gateway/opcodes/Opcode;Ljava/lang/Object;)V
 
@@ -4351,26 +4376,17 @@
 
     const-string v0, "gsonOmitNulls"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v7, 0x2
 
     const/4 v8, 0x0
 
-    move-object/from16 v3, p0
+    move-object v3, p0
 
     invoke-static/range {v3 .. v8}, 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
-
-    :cond_1
-    move-object/from16 v9, p0
-
-    const-string v0, "guildSubscriptions"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final voiceServerPing()V
diff --git a/com.discord/smali/com/discord/gateway/R$attr.smali b/com.discord/smali/com/discord/gateway/R$attr.smali
index 058ccabf67..aab537e73a 100644
--- a/com.discord/smali/com/discord/gateway/R$attr.smali
+++ b/com.discord/smali/com/discord/gateway/R$attr.smali
@@ -1214,419 +1214,419 @@
 
 .field public static final roundingBorderWidth:I = 0x7f040456
 
-.field public static final scopeUris:I = 0x7f040467
+.field public static final scopeUris:I = 0x7f040459
 
-.field public static final scrimAnimationDuration:I = 0x7f040468
+.field public static final scrimAnimationDuration:I = 0x7f04045a
 
-.field public static final scrimBackground:I = 0x7f040469
+.field public static final scrimBackground:I = 0x7f04045b
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f04046a
+.field public static final scrimVisibleHeightTrigger:I = 0x7f04045c
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final seekBarIncrement:I = 0x7f04047a
+.field public static final seekBarIncrement:I = 0x7f04046c
 
-.field public static final seekBarPreferenceStyle:I = 0x7f04047b
+.field public static final seekBarPreferenceStyle:I = 0x7f04046d
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final selectable:I = 0x7f04047d
+.field public static final selectable:I = 0x7f04046f
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final selectionRequired:I = 0x7f040480
+.field public static final selectionRequired:I = 0x7f040472
 
-.field public static final shapeAppearance:I = 0x7f040484
+.field public static final shapeAppearance:I = 0x7f040476
 
-.field public static final shapeAppearanceLargeComponent:I = 0x7f040485
+.field public static final shapeAppearanceLargeComponent:I = 0x7f040477
 
-.field public static final shapeAppearanceMediumComponent:I = 0x7f040486
+.field public static final shapeAppearanceMediumComponent:I = 0x7f040478
 
-.field public static final shapeAppearanceOverlay:I = 0x7f040487
+.field public static final shapeAppearanceOverlay:I = 0x7f040479
 
-.field public static final shapeAppearanceSmallComponent:I = 0x7f040488
+.field public static final shapeAppearanceSmallComponent:I = 0x7f04047a
 
-.field public static final shouldDisableView:I = 0x7f040489
+.field public static final shouldDisableView:I = 0x7f04047b
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final showDivider:I = 0x7f04048c
+.field public static final showDivider:I = 0x7f04047e
 
-.field public static final showDividerHorizontal:I = 0x7f04048d
+.field public static final showDividerHorizontal:I = 0x7f04047f
 
-.field public static final showDividerVertical:I = 0x7f04048e
+.field public static final showDividerVertical:I = 0x7f040480
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final showMotionSpec:I = 0x7f040490
+.field public static final showMotionSpec:I = 0x7f040482
 
-.field public static final showSeekBarValue:I = 0x7f040491
+.field public static final showSeekBarValue:I = 0x7f040483
 
-.field public static final showText:I = 0x7f040492
+.field public static final showText:I = 0x7f040484
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final shrinkMotionSpec:I = 0x7f040497
+.field public static final shrinkMotionSpec:I = 0x7f040489
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final singleLine:I = 0x7f04049a
+.field public static final singleLine:I = 0x7f04048c
 
-.field public static final singleLineTitle:I = 0x7f04049b
+.field public static final singleLineTitle:I = 0x7f04048d
 
-.field public static final singleSelection:I = 0x7f04049c
+.field public static final singleSelection:I = 0x7f04048e
 
-.field public static final sliderStyle:I = 0x7f04049d
+.field public static final sliderStyle:I = 0x7f04048f
 
-.field public static final snackbarButtonStyle:I = 0x7f04049e
+.field public static final snackbarButtonStyle:I = 0x7f040490
 
-.field public static final snackbarStyle:I = 0x7f04049f
+.field public static final snackbarStyle:I = 0x7f040491
 
-.field public static final snackbarTextViewStyle:I = 0x7f0404a0
+.field public static final snackbarTextViewStyle:I = 0x7f040492
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final startIconCheckable:I = 0x7f0404aa
+.field public static final startIconCheckable:I = 0x7f04049c
 
-.field public static final startIconContentDescription:I = 0x7f0404ab
+.field public static final startIconContentDescription:I = 0x7f04049d
 
-.field public static final startIconDrawable:I = 0x7f0404ac
+.field public static final startIconDrawable:I = 0x7f04049e
 
-.field public static final startIconTint:I = 0x7f0404ad
+.field public static final startIconTint:I = 0x7f04049f
 
-.field public static final startIconTintMode:I = 0x7f0404ae
+.field public static final startIconTintMode:I = 0x7f0404a0
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final state_collapsed:I = 0x7f0404b0
+.field public static final state_collapsed:I = 0x7f0404a2
 
-.field public static final state_collapsible:I = 0x7f0404b1
+.field public static final state_collapsible:I = 0x7f0404a3
 
-.field public static final state_dragged:I = 0x7f0404b2
+.field public static final state_dragged:I = 0x7f0404a4
 
-.field public static final state_liftable:I = 0x7f0404b3
+.field public static final state_liftable:I = 0x7f0404a5
 
-.field public static final state_lifted:I = 0x7f0404b4
+.field public static final state_lifted:I = 0x7f0404a6
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final statusBarForeground:I = 0x7f0404b6
+.field public static final statusBarForeground:I = 0x7f0404a8
 
-.field public static final statusBarScrim:I = 0x7f0404b7
+.field public static final statusBarScrim:I = 0x7f0404a9
 
-.field public static final strokeColor:I = 0x7f0404ba
+.field public static final strokeColor:I = 0x7f0404ac
 
-.field public static final strokeWidth:I = 0x7f0404bb
+.field public static final strokeWidth:I = 0x7f0404ad
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final suffixText:I = 0x7f0404c5
+.field public static final suffixText:I = 0x7f0404b7
 
-.field public static final suffixTextAppearance:I = 0x7f0404c6
+.field public static final suffixTextAppearance:I = 0x7f0404b8
 
-.field public static final suffixTextColor:I = 0x7f0404c7
+.field public static final suffixTextColor:I = 0x7f0404b9
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final summary:I = 0x7f0404c9
+.field public static final summary:I = 0x7f0404bb
 
-.field public static final summaryOff:I = 0x7f0404ca
+.field public static final summaryOff:I = 0x7f0404bc
 
-.field public static final summaryOn:I = 0x7f0404cb
+.field public static final summaryOn:I = 0x7f0404bd
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final switchPreferenceCompatStyle:I = 0x7f0404d4
+.field public static final switchPreferenceCompatStyle:I = 0x7f0404c6
 
-.field public static final switchPreferenceStyle:I = 0x7f0404d5
+.field public static final switchPreferenceStyle:I = 0x7f0404c7
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final switchTextOff:I = 0x7f0404d8
+.field public static final switchTextOff:I = 0x7f0404ca
 
-.field public static final switchTextOn:I = 0x7f0404d9
+.field public static final switchTextOn:I = 0x7f0404cb
 
-.field public static final tabBackground:I = 0x7f0404da
+.field public static final tabBackground:I = 0x7f0404cc
 
-.field public static final tabContentStart:I = 0x7f0404db
+.field public static final tabContentStart:I = 0x7f0404cd
 
-.field public static final tabGravity:I = 0x7f0404dc
+.field public static final tabGravity:I = 0x7f0404ce
 
-.field public static final tabIconTint:I = 0x7f0404dd
+.field public static final tabIconTint:I = 0x7f0404cf
 
-.field public static final tabIconTintMode:I = 0x7f0404de
+.field public static final tabIconTintMode:I = 0x7f0404d0
 
-.field public static final tabIndicator:I = 0x7f0404df
+.field public static final tabIndicator:I = 0x7f0404d1
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f0404e0
+.field public static final tabIndicatorAnimationDuration:I = 0x7f0404d2
 
-.field public static final tabIndicatorColor:I = 0x7f0404e1
+.field public static final tabIndicatorColor:I = 0x7f0404d3
 
-.field public static final tabIndicatorFullWidth:I = 0x7f0404e2
+.field public static final tabIndicatorFullWidth:I = 0x7f0404d4
 
-.field public static final tabIndicatorGravity:I = 0x7f0404e3
+.field public static final tabIndicatorGravity:I = 0x7f0404d5
 
-.field public static final tabIndicatorHeight:I = 0x7f0404e4
+.field public static final tabIndicatorHeight:I = 0x7f0404d6
 
-.field public static final tabInlineLabel:I = 0x7f0404e5
+.field public static final tabInlineLabel:I = 0x7f0404d7
 
-.field public static final tabMaxWidth:I = 0x7f0404e6
+.field public static final tabMaxWidth:I = 0x7f0404d8
 
-.field public static final tabMinWidth:I = 0x7f0404e7
+.field public static final tabMinWidth:I = 0x7f0404d9
 
-.field public static final tabMode:I = 0x7f0404e8
+.field public static final tabMode:I = 0x7f0404da
 
-.field public static final tabPadding:I = 0x7f0404e9
+.field public static final tabPadding:I = 0x7f0404db
 
-.field public static final tabPaddingBottom:I = 0x7f0404ea
+.field public static final tabPaddingBottom:I = 0x7f0404dc
 
-.field public static final tabPaddingEnd:I = 0x7f0404eb
+.field public static final tabPaddingEnd:I = 0x7f0404dd
 
-.field public static final tabPaddingStart:I = 0x7f0404ec
+.field public static final tabPaddingStart:I = 0x7f0404de
 
-.field public static final tabPaddingTop:I = 0x7f0404ed
+.field public static final tabPaddingTop:I = 0x7f0404df
 
-.field public static final tabRippleColor:I = 0x7f0404ee
+.field public static final tabRippleColor:I = 0x7f0404e0
 
-.field public static final tabSelectedTextColor:I = 0x7f0404ef
+.field public static final tabSelectedTextColor:I = 0x7f0404e1
 
-.field public static final tabStyle:I = 0x7f0404f0
+.field public static final tabStyle:I = 0x7f0404e2
 
-.field public static final tabTextAppearance:I = 0x7f0404f1
+.field public static final tabTextAppearance:I = 0x7f0404e3
 
-.field public static final tabTextColor:I = 0x7f0404f2
+.field public static final tabTextColor:I = 0x7f0404e4
 
-.field public static final tabUnboundedRipple:I = 0x7f0404f3
+.field public static final tabUnboundedRipple:I = 0x7f0404e5
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final textAppearanceBody1:I = 0x7f0404f9
+.field public static final textAppearanceBody1:I = 0x7f0404eb
 
-.field public static final textAppearanceBody2:I = 0x7f0404fa
+.field public static final textAppearanceBody2:I = 0x7f0404ec
 
-.field public static final textAppearanceButton:I = 0x7f0404fb
+.field public static final textAppearanceButton:I = 0x7f0404ed
 
-.field public static final textAppearanceCaption:I = 0x7f0404fc
+.field public static final textAppearanceCaption:I = 0x7f0404ee
 
-.field public static final textAppearanceHeadline1:I = 0x7f0404fd
+.field public static final textAppearanceHeadline1:I = 0x7f0404ef
 
-.field public static final textAppearanceHeadline2:I = 0x7f0404fe
+.field public static final textAppearanceHeadline2:I = 0x7f0404f0
 
-.field public static final textAppearanceHeadline3:I = 0x7f0404ff
+.field public static final textAppearanceHeadline3:I = 0x7f0404f1
 
-.field public static final textAppearanceHeadline4:I = 0x7f040500
+.field public static final textAppearanceHeadline4:I = 0x7f0404f2
 
-.field public static final textAppearanceHeadline5:I = 0x7f040501
+.field public static final textAppearanceHeadline5:I = 0x7f0404f3
 
-.field public static final textAppearanceHeadline6:I = 0x7f040502
+.field public static final textAppearanceHeadline6:I = 0x7f0404f4
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final textAppearanceLineHeightEnabled:I = 0x7f040504
+.field public static final textAppearanceLineHeightEnabled:I = 0x7f0404f6
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearanceOverline:I = 0x7f040508
+.field public static final textAppearanceOverline:I = 0x7f0404fa
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04050d
+.field public static final textAppearanceSubtitle1:I = 0x7f0404ff
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04050e
+.field public static final textAppearanceSubtitle2:I = 0x7f040500
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final textEndPadding:I = 0x7f040511
+.field public static final textEndPadding:I = 0x7f040503
 
-.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040512
+.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040504
 
-.field public static final textInputStyle:I = 0x7f040513
+.field public static final textInputStyle:I = 0x7f040505
 
-.field public static final textLocale:I = 0x7f040514
+.field public static final textLocale:I = 0x7f040506
 
-.field public static final textStartPadding:I = 0x7f040515
+.field public static final textStartPadding:I = 0x7f040507
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme:I = 0x7f040509
 
-.field public static final themeLineHeight:I = 0x7f040518
+.field public static final themeLineHeight:I = 0x7f04050a
 
-.field public static final thickness:I = 0x7f040543
+.field public static final thickness:I = 0x7f040535
 
-.field public static final thumbColor:I = 0x7f040544
+.field public static final thumbColor:I = 0x7f040536
 
-.field public static final thumbElevation:I = 0x7f040545
+.field public static final thumbElevation:I = 0x7f040537
 
-.field public static final thumbRadius:I = 0x7f040546
+.field public static final thumbRadius:I = 0x7f040538
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final tickColor:I = 0x7f04054a
+.field public static final tickColor:I = 0x7f04053c
 
-.field public static final tickColorActive:I = 0x7f04054b
+.field public static final tickColorActive:I = 0x7f04053d
 
-.field public static final tickColorInactive:I = 0x7f04054c
+.field public static final tickColorInactive:I = 0x7f04053e
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final tint:I = 0x7f040551
+.field public static final tint:I = 0x7f040543
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final title:I = 0x7f040553
+.field public static final title:I = 0x7f040545
 
-.field public static final titleEnabled:I = 0x7f040554
+.field public static final titleEnabled:I = 0x7f040546
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final toolbarId:I = 0x7f040560
+.field public static final toolbarId:I = 0x7f040552
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final tooltipStyle:I = 0x7f040565
+.field public static final tooltipStyle:I = 0x7f040557
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final topLeftRadius:I = 0x7f040567
+.field public static final topLeftRadius:I = 0x7f040559
 
-.field public static final topRightRadius:I = 0x7f040568
+.field public static final topRightRadius:I = 0x7f04055a
 
-.field public static final track:I = 0x7f04056a
+.field public static final track:I = 0x7f04055c
 
-.field public static final trackColor:I = 0x7f04056b
+.field public static final trackColor:I = 0x7f04055d
 
-.field public static final trackColorActive:I = 0x7f04056c
+.field public static final trackColorActive:I = 0x7f04055e
 
-.field public static final trackColorInactive:I = 0x7f04056d
+.field public static final trackColorInactive:I = 0x7f04055f
 
-.field public static final trackHeight:I = 0x7f04056e
+.field public static final trackHeight:I = 0x7f040560
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final transitionShapeAppearance:I = 0x7f040571
+.field public static final transitionShapeAppearance:I = 0x7f040563
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final updatesContinuously:I = 0x7f040588
+.field public static final updatesContinuously:I = 0x7f04057a
 
-.field public static final useCompatPadding:I = 0x7f040589
+.field public static final useCompatPadding:I = 0x7f04057b
 
-.field public static final useMaterialThemeColors:I = 0x7f04058a
+.field public static final useMaterialThemeColors:I = 0x7f04057c
 
-.field public static final useSimpleSummaryProvider:I = 0x7f04058b
+.field public static final useSimpleSummaryProvider:I = 0x7f04057d
 
-.field public static final values:I = 0x7f040598
+.field public static final values:I = 0x7f04058a
 
-.field public static final verticalOffset:I = 0x7f04059b
+.field public static final verticalOffset:I = 0x7f04058d
 
-.field public static final viewAspectRatio:I = 0x7f04059c
+.field public static final viewAspectRatio:I = 0x7f04058e
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final widgetLayout:I = 0x7f0405a0
+.field public static final widgetLayout:I = 0x7f040592
 
-.field public static final windowActionBar:I = 0x7f0405a1
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final windowNoTitle:I = 0x7f0405aa
+.field public static final windowNoTitle:I = 0x7f04059c
 
-.field public static final yearSelectedStyle:I = 0x7f0405ab
+.field public static final yearSelectedStyle:I = 0x7f04059d
 
-.field public static final yearStyle:I = 0x7f0405ac
+.field public static final yearStyle:I = 0x7f04059e
 
-.field public static final yearTodayStyle:I = 0x7f0405ad
+.field public static final yearTodayStyle:I = 0x7f04059f
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali
index 6a4b744b11..67900934f9 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -262,85 +262,85 @@
 
 .field public static final drawable_chip_delete:I = 0x7f080128
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801f4
+.field public static final googleg_disabled_color_18:I = 0x7f0801f5
 
-.field public static final googleg_standard_color_18:I = 0x7f0801f5
+.field public static final googleg_standard_color_18:I = 0x7f0801f6
 
-.field public static final ic_arrow_down_24dp:I = 0x7f08021d
+.field public static final ic_arrow_down_24dp:I = 0x7f08021e
 
-.field public static final ic_mtrl_checked_circle:I = 0x7f08034f
+.field public static final ic_mtrl_checked_circle:I = 0x7f080352
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080350
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080353
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080351
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080354
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080352
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080355
 
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804e9
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ec
 
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804ea
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804ed
 
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804eb
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804ee
 
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ec
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ef
 
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804ed
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f0
 
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804ee
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f1
 
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f2
 
-.field public static final mtrl_dialog_background:I = 0x7f0804f0
+.field public static final mtrl_dialog_background:I = 0x7f0804f3
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f1
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f4
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f2
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f5
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f3
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f6
 
-.field public static final mtrl_ic_cancel:I = 0x7f0804f4
+.field public static final mtrl_ic_cancel:I = 0x7f0804f7
 
-.field public static final mtrl_ic_error:I = 0x7f0804f5
+.field public static final mtrl_ic_error:I = 0x7f0804f8
 
-.field public static final mtrl_popupmenu_background:I = 0x7f0804f6
+.field public static final mtrl_popupmenu_background:I = 0x7f0804f9
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f7
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fa
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f8
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fb
 
-.field public static final navigation_empty_icon:I = 0x7f0804f9
+.field public static final navigation_empty_icon:I = 0x7f0804fc
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final preference_list_divider_material:I = 0x7f080506
+.field public static final preference_list_divider_material:I = 0x7f080509
 
-.field public static final test_custom_background:I = 0x7f080518
+.field public static final test_custom_background:I = 0x7f08051c
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$id.smali b/com.discord/smali/com/discord/gateway/R$id.smali
index 47a767812b..4502353d5e 100644
--- a/com.discord/smali/com/discord/gateway/R$id.smali
+++ b/com.discord/smali/com/discord/gateway/R$id.smali
@@ -150,471 +150,471 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final cancel_action:I = 0x7f0a013c
+.field public static final cancel_action:I = 0x7f0a013f
 
-.field public static final cancel_button:I = 0x7f0a013d
+.field public static final cancel_button:I = 0x7f0a0140
 
-.field public static final center:I = 0x7f0a0141
+.field public static final center:I = 0x7f0a0144
 
-.field public static final centerCrop:I = 0x7f0a0142
+.field public static final centerCrop:I = 0x7f0a0145
 
-.field public static final centerInside:I = 0x7f0a0143
+.field public static final centerInside:I = 0x7f0a0146
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0266
 
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0267
 
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0268
 
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0269
 
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a026a
 
-.field public static final chip_image:I = 0x7f0a0268
+.field public static final chip_image:I = 0x7f0a026b
 
-.field public static final chip_text:I = 0x7f0a0269
+.field public static final chip_text:I = 0x7f0a026c
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026f
 
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a0270
 
-.field public static final column:I = 0x7f0a0276
+.field public static final column:I = 0x7f0a0279
 
-.field public static final column_reverse:I = 0x7f0a0277
+.field public static final column_reverse:I = 0x7f0a027a
 
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027b
 
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028c
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0292
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02ba
 
-.field public static final dark:I = 0x7f0a02b8
+.field public static final dark:I = 0x7f0a02bb
 
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bd
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c6
 
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c7
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c8
 
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c9
 
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02ca
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02ff
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a0352
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a038d
 
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a4
 
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a7
 
-.field public static final fitBottomStart:I = 0x7f0a03a5
+.field public static final fitBottomStart:I = 0x7f0a03ab
 
-.field public static final fitCenter:I = 0x7f0a03a6
+.field public static final fitCenter:I = 0x7f0a03ac
 
-.field public static final fitEnd:I = 0x7f0a03a7
+.field public static final fitEnd:I = 0x7f0a03ad
 
-.field public static final fitStart:I = 0x7f0a03a8
+.field public static final fitStart:I = 0x7f0a03ae
 
-.field public static final fitXY:I = 0x7f0a03aa
+.field public static final fitXY:I = 0x7f0a03b0
 
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03b1
 
-.field public static final flex_end:I = 0x7f0a03ae
+.field public static final flex_end:I = 0x7f0a03b4
 
-.field public static final flex_start:I = 0x7f0a03bf
+.field public static final flex_start:I = 0x7f0a03c5
 
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c6
 
-.field public static final focusCrop:I = 0x7f0a03c2
+.field public static final focusCrop:I = 0x7f0a03c8
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e9
 
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03ea
 
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0416
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04db
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final icon_only:I = 0x7f0a04d7
+.field public static final icon_only:I = 0x7f0a04dd
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ee
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a057d
 
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057f
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final light:I = 0x7f0a0585
+.field public static final light:I = 0x7f0a058b
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058e
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a05a1
 
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a7
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final mini:I = 0x7f0a05df
+.field public static final mini:I = 0x7f0a05e5
 
-.field public static final month_grid:I = 0x7f0a05e1
+.field public static final month_grid:I = 0x7f0a05e7
 
-.field public static final month_navigation_bar:I = 0x7f0a05e2
+.field public static final month_navigation_bar:I = 0x7f0a05e8
 
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e3
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e9
 
-.field public static final month_navigation_next:I = 0x7f0a05e4
+.field public static final month_navigation_next:I = 0x7f0a05ea
 
-.field public static final month_navigation_previous:I = 0x7f0a05e5
+.field public static final month_navigation_previous:I = 0x7f0a05eb
 
-.field public static final month_title:I = 0x7f0a05e6
+.field public static final month_title:I = 0x7f0a05ec
 
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e7
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05ed
 
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e8
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ee
 
-.field public static final mtrl_calendar_frame:I = 0x7f0a05e9
+.field public static final mtrl_calendar_frame:I = 0x7f0a05ef
 
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ea
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05f0
 
-.field public static final mtrl_calendar_months:I = 0x7f0a05eb
+.field public static final mtrl_calendar_months:I = 0x7f0a05f1
 
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ec
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f2
 
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f3
 
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05ee
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f4
 
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05ef
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f5
 
-.field public static final mtrl_child_content_container:I = 0x7f0a05f0
+.field public static final mtrl_child_content_container:I = 0x7f0a05f6
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f1
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f7
 
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f2
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f8
 
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f3
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f9
 
-.field public static final mtrl_picker_header:I = 0x7f0a05f4
+.field public static final mtrl_picker_header:I = 0x7f0a05fa
 
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f5
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05fb
 
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f6
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fc
 
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f7
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fd
 
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f8
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fe
 
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f9
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05ff
 
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fa
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a0600
 
-.field public static final mtrl_picker_title_text:I = 0x7f0a05fb
+.field public static final mtrl_picker_title_text:I = 0x7f0a0601
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final navigation_header_container:I = 0x7f0a060e
+.field public static final navigation_header_container:I = 0x7f0a0614
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final nowrap:I = 0x7f0a0634
+.field public static final nowrap:I = 0x7f0a063a
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final outgoing:I = 0x7f0a066a
+.field public static final outgoing:I = 0x7f0a0670
 
-.field public static final outline:I = 0x7f0a066b
+.field public static final outline:I = 0x7f0a0671
 
-.field public static final parallax:I = 0x7f0a067b
+.field public static final parallax:I = 0x7f0a0681
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final parent_matrix:I = 0x7f0a067e
+.field public static final parent_matrix:I = 0x7f0a0684
 
-.field public static final password_toggle:I = 0x7f0a068c
+.field public static final password_toggle:I = 0x7f0a0692
 
-.field public static final pin:I = 0x7f0a06b9
+.field public static final pin:I = 0x7f0a06bf
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final recycler_view:I = 0x7f0a073f
+.field public static final recycler_view:I = 0x7f0a0745
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final rounded:I = 0x7f0a0786
+.field public static final rounded:I = 0x7f0a078c
 
-.field public static final row:I = 0x7f0a0787
+.field public static final row:I = 0x7f0a078d
 
-.field public static final row_index_key:I = 0x7f0a0788
+.field public static final row_index_key:I = 0x7f0a078e
 
-.field public static final row_reverse:I = 0x7f0a0789
+.field public static final row_reverse:I = 0x7f0a078f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a078a
+.field public static final save_non_transition_alpha:I = 0x7f0a0790
 
-.field public static final save_overlay_view:I = 0x7f0a078b
+.field public static final save_overlay_view:I = 0x7f0a0791
 
-.field public static final scale:I = 0x7f0a078c
+.field public static final scale:I = 0x7f0a0792
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final scrollable:I = 0x7f0a0796
+.field public static final scrollable:I = 0x7f0a079c
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final seekbar:I = 0x7f0a07af
+.field public static final seekbar:I = 0x7f0a07b5
 
-.field public static final seekbar_value:I = 0x7f0a07b0
+.field public static final seekbar_value:I = 0x7f0a07b6
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final selected:I = 0x7f0a07b2
+.field public static final selected:I = 0x7f0a07b8
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final slide:I = 0x7f0a0916
+.field public static final slide:I = 0x7f0a091a
 
-.field public static final smallLabel:I = 0x7f0a0917
+.field public static final smallLabel:I = 0x7f0a091b
 
-.field public static final snackbar_action:I = 0x7f0a0918
+.field public static final snackbar_action:I = 0x7f0a091c
 
-.field public static final snackbar_text:I = 0x7f0a0919
+.field public static final snackbar_text:I = 0x7f0a091d
 
-.field public static final space_around:I = 0x7f0a091d
+.field public static final space_around:I = 0x7f0a0921
 
-.field public static final space_between:I = 0x7f0a091e
+.field public static final space_between:I = 0x7f0a0922
 
-.field public static final space_evenly:I = 0x7f0a091f
+.field public static final space_evenly:I = 0x7f0a0923
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final spinner:I = 0x7f0a0923
+.field public static final spinner:I = 0x7f0a0927
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final standard:I = 0x7f0a092c
+.field public static final standard:I = 0x7f0a0930
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0933
+.field public static final status_bar_latest_event_content:I = 0x7f0a0937
 
-.field public static final stretch:I = 0x7f0a0948
+.field public static final stretch:I = 0x7f0a094c
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final switchWidget:I = 0x7f0a0958
+.field public static final switchWidget:I = 0x7f0a095c
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0976
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a097a
 
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a097b
 
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0978
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a097c
 
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097d
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final text_input_end_icon:I = 0x7f0a0981
+.field public static final text_input_end_icon:I = 0x7f0a0985
 
-.field public static final text_input_start_icon:I = 0x7f0a0982
+.field public static final text_input_start_icon:I = 0x7f0a0986
 
-.field public static final textinput_counter:I = 0x7f0a0985
+.field public static final textinput_counter:I = 0x7f0a0989
 
-.field public static final textinput_error:I = 0x7f0a0986
+.field public static final textinput_error:I = 0x7f0a098a
 
-.field public static final textinput_helper_text:I = 0x7f0a0987
+.field public static final textinput_helper_text:I = 0x7f0a098b
 
-.field public static final textinput_placeholder:I = 0x7f0a0988
+.field public static final textinput_placeholder:I = 0x7f0a098c
 
-.field public static final textinput_prefix_text:I = 0x7f0a0989
+.field public static final textinput_prefix_text:I = 0x7f0a098d
 
-.field public static final textinput_suffix_text:I = 0x7f0a098a
+.field public static final textinput_suffix_text:I = 0x7f0a098e
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final touch_outside:I = 0x7f0a099c
+.field public static final touch_outside:I = 0x7f0a09a0
 
-.field public static final transition_current_scene:I = 0x7f0a099d
+.field public static final transition_current_scene:I = 0x7f0a09a1
 
-.field public static final transition_layout_save:I = 0x7f0a099e
+.field public static final transition_layout_save:I = 0x7f0a09a2
 
-.field public static final transition_position:I = 0x7f0a099f
+.field public static final transition_position:I = 0x7f0a09a3
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a0
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a4
 
-.field public static final transition_transform:I = 0x7f0a09a1
+.field public static final transition_transform:I = 0x7f0a09a5
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final unlabeled:I = 0x7f0a09b4
+.field public static final unlabeled:I = 0x7f0a09b8
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final view_offset_helper:I = 0x7f0a0a38
+.field public static final view_offset_helper:I = 0x7f0a0a3c
 
-.field public static final visible:I = 0x7f0a0a4c
+.field public static final visible:I = 0x7f0a0a50
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
-.field public static final wide:I = 0x7f0a0a7f
+.field public static final wide:I = 0x7f0a0a84
 
-.field public static final withinBounds:I = 0x7f0a0ab6
+.field public static final withinBounds:I = 0x7f0a0abb
 
-.field public static final wrap:I = 0x7f0a0ab7
+.field public static final wrap:I = 0x7f0a0abc
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
-.field public static final wrap_reverse:I = 0x7f0a0ab9
+.field public static final wrap_reverse:I = 0x7f0a0abe
 
-.field public static final zero_corner_chip:I = 0x7f0a0abe
+.field public static final zero_corner_chip:I = 0x7f0a0ac3
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$plurals.smali b/com.discord/smali/com/discord/gateway/R$plurals.smali
index c5b5bd7808..2e6ffe2d0e 100644
--- a/com.discord/smali/com/discord/gateway/R$plurals.smali
+++ b/com.discord/smali/com/discord/gateway/R$plurals.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final mtrl_badge_content_description:I = 0x7f1000b3
+.field public static final mtrl_badge_content_description:I = 0x7f1000b5
 
 
 # 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 a45a100bc8..3e18b702bd 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -74,165 +74,165 @@
 
 .field public static final bottom_sheet_behavior:I = 0x7f120357
 
-.field public static final character_counter_content_description:I = 0x7f12041e
+.field public static final character_counter_content_description:I = 0x7f12041f
 
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041f
+.field public static final character_counter_overflowed_content_description:I = 0x7f120420
 
-.field public static final character_counter_pattern:I = 0x7f120420
+.field public static final character_counter_pattern:I = 0x7f120421
 
-.field public static final chip_text:I = 0x7f120429
+.field public static final chip_text:I = 0x7f12042a
 
-.field public static final clear_text_end_icon_content_description:I = 0x7f120436
+.field public static final clear_text_end_icon_content_description:I = 0x7f120437
 
-.field public static final common_google_play_services_enable_button:I = 0x7f120465
+.field public static final common_google_play_services_enable_button:I = 0x7f120466
 
-.field public static final common_google_play_services_enable_text:I = 0x7f120466
+.field public static final common_google_play_services_enable_text:I = 0x7f120467
 
-.field public static final common_google_play_services_enable_title:I = 0x7f120467
+.field public static final common_google_play_services_enable_title:I = 0x7f120468
 
-.field public static final common_google_play_services_install_button:I = 0x7f120468
+.field public static final common_google_play_services_install_button:I = 0x7f120469
 
-.field public static final common_google_play_services_install_text:I = 0x7f120469
+.field public static final common_google_play_services_install_text:I = 0x7f12046a
 
-.field public static final common_google_play_services_install_title:I = 0x7f12046a
+.field public static final common_google_play_services_install_title:I = 0x7f12046b
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046b
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046c
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f12046c
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12046d
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f12046d
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046e
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046e
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046f
 
-.field public static final common_google_play_services_update_button:I = 0x7f12046f
+.field public static final common_google_play_services_update_button:I = 0x7f120470
 
-.field public static final common_google_play_services_update_text:I = 0x7f120470
+.field public static final common_google_play_services_update_text:I = 0x7f120471
 
-.field public static final common_google_play_services_update_title:I = 0x7f120471
+.field public static final common_google_play_services_update_title:I = 0x7f120472
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120472
+.field public static final common_google_play_services_updating_text:I = 0x7f120473
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120473
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120474
 
-.field public static final common_open_on_phone:I = 0x7f120474
+.field public static final common_open_on_phone:I = 0x7f120475
 
-.field public static final common_signin_button_text:I = 0x7f120475
+.field public static final common_signin_button_text:I = 0x7f120476
 
-.field public static final common_signin_button_text_long:I = 0x7f120476
+.field public static final common_signin_button_text_long:I = 0x7f120477
 
-.field public static final copy:I = 0x7f1204d3
+.field public static final copy:I = 0x7f1204d5
 
-.field public static final error_icon_content_description:I = 0x7f12064a
+.field public static final error_icon_content_description:I = 0x7f12064c
 
-.field public static final expand_button_title:I = 0x7f120681
+.field public static final expand_button_title:I = 0x7f120683
 
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068f
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f120691
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120698
+.field public static final fab_transformation_scrim_behavior:I = 0x7f12069a
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120699
+.field public static final fab_transformation_sheet_behavior:I = 0x7f12069b
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bd9
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bff
 
-.field public static final icon_content_description:I = 0x7f120c66
+.field public static final icon_content_description:I = 0x7f120c8c
 
-.field public static final item_view_role_description:I = 0x7f120d87
+.field public static final item_view_role_description:I = 0x7f120dad
 
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f11
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f3b
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f12
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f3c
 
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f13
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f3d
 
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f14
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f3e
 
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f15
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f3f
 
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f16
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f40
 
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f17
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f41
 
-.field public static final mtrl_picker_cancel:I = 0x7f120f18
+.field public static final mtrl_picker_cancel:I = 0x7f120f42
 
-.field public static final mtrl_picker_confirm:I = 0x7f120f19
+.field public static final mtrl_picker_confirm:I = 0x7f120f43
 
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f1a
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f44
 
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f1b
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f45
 
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f1c
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f46
 
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f1d
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f47
 
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f1e
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f48
 
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f1f
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f49
 
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f20
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f4a
 
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f21
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f4b
 
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f22
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f4c
 
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f23
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f4d
 
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f24
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f4e
 
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f25
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f4f
 
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f26
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f50
 
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f27
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f51
 
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f28
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f52
 
-.field public static final mtrl_picker_save:I = 0x7f120f29
+.field public static final mtrl_picker_save:I = 0x7f120f53
 
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f2a
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f54
 
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f2b
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f55
 
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f2c
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f56
 
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f2d
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f57
 
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f2e
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f58
 
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f2f
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f59
 
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f30
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f5a
 
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f31
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f5b
 
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f32
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f5c
 
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f33
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f5d
 
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f34
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f5e
 
-.field public static final not_set:I = 0x7f120fb7
+.field public static final not_set:I = 0x7f120fe1
 
-.field public static final password_toggle_content_description:I = 0x7f1210db
+.field public static final password_toggle_content_description:I = 0x7f121106
 
-.field public static final path_password_eye:I = 0x7f1210dd
+.field public static final path_password_eye:I = 0x7f121108
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210de
+.field public static final path_password_eye_mask_strike_through:I = 0x7f121109
 
-.field public static final path_password_eye_mask_visible:I = 0x7f1210df
+.field public static final path_password_eye_mask_visible:I = 0x7f12110a
 
-.field public static final path_password_strike_through:I = 0x7f1210e0
+.field public static final path_password_strike_through:I = 0x7f12110b
 
-.field public static final preference_copied:I = 0x7f121150
+.field public static final preference_copied:I = 0x7f12117b
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final summary_collapsed_preference_list:I = 0x7f12153a
+.field public static final summary_collapsed_preference_list:I = 0x7f121564
 
-.field public static final v7_preference_off:I = 0x7f121762
+.field public static final v7_preference_off:I = 0x7f12178c
 
-.field public static final v7_preference_on:I = 0x7f121763
+.field public static final v7_preference_on:I = 0x7f12178d
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$style.smali b/com.discord/smali/com/discord/gateway/R$style.smali
index 05379857e7..8f67141b8a 100644
--- a/com.discord/smali/com/discord/gateway/R$style.smali
+++ b/com.discord/smali/com/discord/gateway/R$style.smali
@@ -1108,379 +1108,379 @@
 
 .field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f13029b
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_TextView:I = 0x7f1303dd
+.field public static final Widget_AppCompat_TextView:I = 0x7f1303dc
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e3
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e2
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e4
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e3
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e5
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e4
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e6
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e5
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e7
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e6
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1303e8
+.field public static final Widget_Design_NavigationView:I = 0x7f1303e7
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e9
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e8
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1303ea
+.field public static final Widget_Design_Snackbar:I = 0x7f1303e9
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1303eb
+.field public static final Widget_Design_TabLayout:I = 0x7f1303ea
 
-.field public static final Widget_Design_TextInputEditText:I = 0x7f1303ec
+.field public static final Widget_Design_TextInputEditText:I = 0x7f1303eb
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ed
+.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ec
 
-.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ee
+.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ed
 
-.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ef
+.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ee
 
-.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303f0
+.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303ef
 
-.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f1
+.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f0
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f2
+.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f1
 
-.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f3
+.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f2
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f4
+.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f3
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f5
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f4
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f6
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f5
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f7
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f6
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f8
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f7
 
-.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f9
+.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f8
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303fa
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303f9
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fb
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fa
 
-.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fc
+.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fb
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fd
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fc
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fe
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fd
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303ff
+.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303fe
 
-.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f130400
+.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f1303ff
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130401
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130400
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130402
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130401
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130403
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130402
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130404
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130403
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130405
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130404
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130406
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130405
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130407
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130406
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130408
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130407
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130409
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130408
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13040a
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130409
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040b
+.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040a
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040c
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040b
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040d
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040c
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040e
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040d
 
-.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040f
+.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040e
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130414
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130413
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130410
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f13040f
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130411
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130410
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130412
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130411
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130413
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130412
 
-.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130415
+.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130414
 
-.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130416
+.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130415
 
-.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130417
+.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130416
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130418
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130417
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130419
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130418
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f13041a
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130419
 
-.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041b
+.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041a
 
-.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041c
+.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041b
 
-.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041d
+.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041e
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041d
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130422
+.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130421
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041f
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041e
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f130420
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f13041f
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130421
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130420
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130423
+.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130422
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130424
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130423
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130425
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130424
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130426
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130425
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130427
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130426
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130428
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130427
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130429
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130428
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f13042a
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f130429
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042b
+.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042a
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042c
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042b
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042d
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042e
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042d
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042f
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042e
 
-.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f130430
+.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f13042f
 
-.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130431
+.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130430
 
-.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130432
+.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130431
 
-.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130433
+.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130432
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130434
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130433
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130435
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130434
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130436
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130435
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130437
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130436
 
-.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130438
+.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130437
 
-.field public static final Widget_MaterialComponents_Slider:I = 0x7f130439
+.field public static final Widget_MaterialComponents_Slider:I = 0x7f130438
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13043a
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130439
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043b
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043a
 
-.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043c
+.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043b
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043d
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043c
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043e
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043d
 
-.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043f
+.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043e
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f130440
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13043f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130441
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130440
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130442
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130441
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130443
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130442
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130444
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130443
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130445
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130444
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130446
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130445
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130447
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130446
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130448
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130447
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130449
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130448
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f13044a
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f130449
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044b
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044a
 
-.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044c
+.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044b
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044d
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044c
 
-.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044e
+.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044d
 
-.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044f
+.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044e
 
-.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f130450
+.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f13044f
 
-.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130451
+.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130450
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # 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 e146670982..22be4ec703 100644
--- a/com.discord/smali/com/discord/gateway/R$styleable.smali
+++ b/com.discord/smali/com/discord/gateway/R$styleable.smali
@@ -2771,7 +2771,7 @@
 
     new-array v13, v1, [I
 
-    const v14, 0x7f04058b
+    const v14, 0x7f04057d
 
     aput v14, v13, v4
 
@@ -3053,7 +3053,7 @@
 
     new-array v0, v1, [I
 
-    const v8, 0x7f0404af
+    const v8, 0x7f0404a1
 
     aput v8, v0, v4
 
@@ -3107,7 +3107,7 @@
 
     new-array v8, v1, [I
 
-    const v9, 0x7f040598
+    const v9, 0x7f04058a
 
     aput v9, v8, v4
 
@@ -3241,7 +3241,7 @@
 
     new-array v2, v1, [I
 
-    const v3, 0x7f04058a
+    const v3, 0x7f04057c
 
     aput v3, v2, v4
 
@@ -3281,7 +3281,7 @@
 
     new-array v0, v1, [I
 
-    const v2, 0x7f040512
+    const v2, 0x7f040504
 
     aput v2, v0, v4
 
@@ -3372,10 +3372,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -3384,8 +3384,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -3402,8 +3402,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -3439,15 +3439,15 @@
         0x7f04021a
         0x7f040380
         0x7f040381
-        0x7f0404b6
+        0x7f0404a8
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f0404b0
-        0x7f0404b1
-        0x7f0404b3
-        0x7f0404b4
+        0x7f0404a2
+        0x7f0404a3
+        0x7f0404a5
+        0x7f0404a6
     .end array-data
 
     :array_9
@@ -3459,17 +3459,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_c
@@ -3504,8 +3504,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_e
@@ -3603,44 +3603,44 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_f
     .array-data 4
         0x101030e
-        0x7f04047e
+        0x7f040470
     .end array-data
 
     :array_10
@@ -3651,7 +3651,7 @@
         0x7f040271
         0x7f0403bc
         0x7f0403d1
-        0x7f04059b
+        0x7f04058d
     .end array-data
 
     :array_11
@@ -3698,8 +3698,8 @@
         0x7f04006b
         0x7f04006c
         0x7f040251
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_14
@@ -3725,8 +3725,8 @@
         0x10101f0
         0x10101f1
         0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
+        0x7f0404bc
+        0x7f0404bd
     .end array-data
 
     :array_16
@@ -3767,11 +3767,11 @@
         0x7f0402d6
         0x7f0402db
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040511
-        0x7f040515
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f040503
+        0x7f040507
     .end array-data
 
     :array_17
@@ -3780,9 +3780,9 @@
         0x7f040100
         0x7f040101
         0x7f040102
-        0x7f040480
-        0x7f04049a
-        0x7f04049c
+        0x7f040472
+        0x7f04048c
+        0x7f04048e
     .end array-data
 
     :array_18
@@ -3823,12 +3823,12 @@
         0x7f040220
         0x7f040221
         0x7f0403c0
-        0x7f040468
-        0x7f04046a
-        0x7f0404b7
-        0x7f040553
-        0x7f040554
-        0x7f040560
+        0x7f04045a
+        0x7f04045c
+        0x7f0404a9
+        0x7f040545
+        0x7f040546
+        0x7f040552
     .end array-data
 
     :array_1a
@@ -3855,7 +3855,7 @@
     :array_1d
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_1e
@@ -3893,8 +3893,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_21
@@ -3902,8 +3902,8 @@
         0x7f040201
         0x7f040222
         0x7f040266
-        0x7f040490
-        0x7f040497
+        0x7f040482
+        0x7f040489
     .end array-data
 
     :array_22
@@ -3923,9 +3923,9 @@
         0x7f040241
         0x7f040323
         0x7f0403bf
-        0x7f04048c
-        0x7f04048d
-        0x7f04048e
+        0x7f04047e
+        0x7f04047f
+        0x7f040480
     .end array-data
 
     :array_24
@@ -3957,10 +3957,10 @@
         0x7f0403be
         0x7f040407
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040589
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f04057b
     .end array-data
 
     :array_26
@@ -3992,7 +3992,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_29
@@ -4045,7 +4045,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_2d
@@ -4087,7 +4087,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_31
@@ -4110,7 +4110,7 @@
         0x10101f8
         0x7f040210
         0x7f040211
-        0x7f04058b
+        0x7f04057d
     .end array-data
 
     :array_34
@@ -4156,17 +4156,17 @@
         0x7f0402dc
         0x7f0402dd
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_38
     .array-data 4
         0x7f0400ee
-        0x7f040480
-        0x7f04049c
+        0x7f040472
+        0x7f04048e
     .end array-data
 
     :array_39
@@ -4177,9 +4177,9 @@
         0x7f0401ca
         0x7f0401cb
         0x7f04043c
-        0x7f0405ab
-        0x7f0405ac
-        0x7f0405ad
+        0x7f04059d
+        0x7f04059e
+        0x7f04059f
     .end array-data
 
     :array_3a
@@ -4203,29 +4203,29 @@
         0x7f0400f0
         0x7f0400f2
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404b2
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404a4
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_3c
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_3d
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_3e
     .array-data 4
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_3f
@@ -4274,8 +4274,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_43
@@ -4288,7 +4288,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_44
@@ -4363,12 +4363,12 @@
         0x7f04032d
         0x7f0403d3
         0x7f0403eb
-        0x7f04047d
-        0x7f040489
-        0x7f04049b
-        0x7f0404c9
-        0x7f040553
-        0x7f0405a0
+        0x7f04046f
+        0x7f04047b
+        0x7f04048d
+        0x7f0404bb
+        0x7f040545
+        0x7f040592
     .end array-data
 
     :array_48
@@ -4417,9 +4417,9 @@
         0x7f0403ff
         0x7f040400
         0x7f040401
-        0x7f04047b
-        0x7f0404d4
-        0x7f0404d5
+        0x7f04046d
+        0x7f0404c6
+        0x7f0404c7
     .end array-data
 
     :array_4d
@@ -4434,7 +4434,7 @@
         0x7f040302
         0x7f040307
         0x7f040384
-        0x7f04056b
+        0x7f04055d
     .end array-data
 
     :array_4e
@@ -4455,24 +4455,24 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_50
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_51
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_52
@@ -4489,11 +4489,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_53
@@ -4502,9 +4502,9 @@
         0x1010136
         0x7f04002a
         0x7f0403c6
-        0x7f04047a
-        0x7f040491
-        0x7f040588
+        0x7f04046c
+        0x7f040483
+        0x7f04057a
     .end array-data
 
     :array_54
@@ -4523,17 +4523,17 @@
 
     :array_55
     .array-data 4
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_56
     .array-data 4
         0x7f04009e
         0x7f040157
-        0x7f040467
+        0x7f040459
     .end array-data
 
     :array_57
@@ -4568,7 +4568,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_58
@@ -4581,23 +4581,23 @@
         0x7f04025f
         0x7f040327
         0x7f040328
-        0x7f040544
-        0x7f040545
-        0x7f040546
-        0x7f04054a
-        0x7f04054b
-        0x7f04054c
-        0x7f04056b
-        0x7f04056c
-        0x7f04056d
-        0x7f04056e
+        0x7f040536
+        0x7f040537
+        0x7f040538
+        0x7f04053c
+        0x7f04053d
+        0x7f04053e
+        0x7f04055d
+        0x7f04055e
+        0x7f04055f
+        0x7f040560
     .end array-data
 
     :array_59
     .array-data 4
-        0x7f04049e
-        0x7f04049f
-        0x7f0404a0
+        0x7f040490
+        0x7f040491
+        0x7f040492
     .end array-data
 
     :array_5a
@@ -4636,17 +4636,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_5e
@@ -4657,10 +4657,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_5f
@@ -4671,10 +4671,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_60
@@ -4686,6 +4686,20 @@
 
     :array_61
     .array-data 4
+        0x7f0404cc
+        0x7f0404cd
+        0x7f0404ce
+        0x7f0404cf
+        0x7f0404d0
+        0x7f0404d1
+        0x7f0404d2
+        0x7f0404d3
+        0x7f0404d4
+        0x7f0404d5
+        0x7f0404d6
+        0x7f0404d7
+        0x7f0404d8
+        0x7f0404d9
         0x7f0404da
         0x7f0404db
         0x7f0404dc
@@ -4694,23 +4708,9 @@
         0x7f0404df
         0x7f0404e0
         0x7f0404e1
-        0x7f0404e2
         0x7f0404e3
         0x7f0404e4
         0x7f0404e5
-        0x7f0404e6
-        0x7f0404e7
-        0x7f0404e8
-        0x7f0404e9
-        0x7f0404ea
-        0x7f0404eb
-        0x7f0404ec
-        0x7f0404ed
-        0x7f0404ee
-        0x7f0404ef
-        0x7f0404f1
-        0x7f0404f2
-        0x7f0404f3
     .end array-data
 
     :array_62
@@ -4729,8 +4729,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_63
@@ -4787,16 +4787,16 @@
         0x7f040402
         0x7f040403
         0x7f040404
-        0x7f040484
-        0x7f040487
-        0x7f0404aa
-        0x7f0404ab
-        0x7f0404ac
-        0x7f0404ad
-        0x7f0404ae
-        0x7f0404c5
-        0x7f0404c6
-        0x7f0404c7
+        0x7f040476
+        0x7f040479
+        0x7f04049c
+        0x7f04049d
+        0x7f04049e
+        0x7f04049f
+        0x7f0404a0
+        0x7f0404b7
+        0x7f0404b8
+        0x7f0404b9
     .end array-data
 
     :array_64
@@ -4826,18 +4826,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_66
@@ -4857,7 +4857,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_68
diff --git a/com.discord/smali/com/discord/gateway/io/Incoming.smali b/com.discord/smali/com/discord/gateway/io/Incoming.smali
index e8951ad616..3c00029813 100644
--- a/com.discord/smali/com/discord/gateway/io/Incoming.smali
+++ b/com.discord/smali/com/discord/gateway/io/Incoming.smali
@@ -15,9 +15,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/gateway/opcodes/Opcode;Ljava/lang/Object;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "opcode"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,15 +32,6 @@
     iput-object p4, p0, Lcom/discord/gateway/io/Incoming;->data:Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "opcode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/gateway/io/IncomingParser.smali b/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
index 764d95e1cb..286d2b2e19 100644
--- a/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
+++ b/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
@@ -29,7 +29,7 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,22 +41,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "log"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->log:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "log"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -69,45 +62,45 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     goto/16 :goto_d
 
     :cond_0
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
-    move-result v2
+    move-result v1
 
-    const/16 v3, 0x64
+    const/16 v2, 0x64
 
-    if-eq v2, v3, :cond_4
+    if-eq v1, v2, :cond_4
 
-    const/16 v0, 0xde1
+    const/16 v2, 0xde1
 
-    if-eq v2, v0, :cond_3
+    if-eq v1, v2, :cond_3
 
-    const/16 v0, 0x73
+    const/16 v2, 0x73
 
-    if-eq v2, v0, :cond_2
+    if-eq v1, v2, :cond_2
 
-    const/16 v0, 0x74
+    const/16 v2, 0x74
 
-    if-eq v2, v0, :cond_1
+    if-eq v1, v2, :cond_1
 
     goto/16 :goto_d
 
     :cond_1
-    const-string v0, "t"
+    const-string v1, "t"
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -124,9 +117,9 @@
     goto/16 :goto_e
 
     :cond_2
-    const-string v0, "s"
+    const-string v1, "s"
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -141,9 +134,9 @@
     goto/16 :goto_e
 
     :cond_3
-    const-string v0, "op"
+    const-string v1, "op"
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -166,19 +159,19 @@
     goto/16 :goto_e
 
     :cond_4
-    const-string v2, "d"
+    const-string v1, "d"
 
-    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_b
+    if-eqz v0, :cond_b
 
-    iget-object v1, p0, Lcom/discord/gateway/io/IncomingParser;->opcode:Lcom/discord/gateway/opcodes/Opcode;
+    iget-object v0, p0, Lcom/discord/gateway/io/IncomingParser;->opcode:Lcom/discord/gateway/opcodes/Opcode;
 
-    if-eqz v1, :cond_a
+    if-eqz v0, :cond_a
 
-    invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
 
     move-result v0
 
@@ -1218,9 +1211,11 @@
     :cond_a
     const-string p1, "opcode"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
+
+    throw p1
 
     :cond_b
     :goto_d
@@ -1229,12 +1224,7 @@
     :goto_e
     return-void
 
-    :cond_c
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    nop
 
     :sswitch_data_0
     .sparse-switch
@@ -1316,7 +1306,7 @@
     :cond_0
     const-string v0, "opcode"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/gateway/io/Outgoing.smali b/com.discord/smali/com/discord/gateway/io/Outgoing.smali
index 2e6ed9e83d..940c1c4430 100644
--- a/com.discord/smali/com/discord/gateway/io/Outgoing.smali
+++ b/com.discord/smali/com/discord/gateway/io/Outgoing.smali
@@ -38,9 +38,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/gateway/opcodes/Opcode;Ljava/lang/Object;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "opcode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/gateway/opcodes/Opcode;->getApiInt()I
 
@@ -49,15 +51,6 @@
     invoke-direct {p0, p1, p2}, Lcom/discord/gateway/io/Outgoing;-><init>(ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "opcode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/gateway/opcodes/Opcode;Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$CreateStream.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$CreateStream.smali
new file mode 100644
index 0000000000..732c0c11cd
--- /dev/null
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$CreateStream.smali
@@ -0,0 +1,80 @@
+.class public final Lcom/discord/gateway/io/OutgoingPayload$CreateStream;
+.super Ljava/lang/Object;
+.source "Outgoing.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/gateway/io/OutgoingPayload;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "CreateStream"
+.end annotation
+
+
+# instance fields
+.field public final channel_id:J
+
+.field public final guild_id:Ljava/lang/Long;
+
+.field public final preferred_region:Ljava/lang/String;
+
+.field public final type:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;JLjava/lang/Long;Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->type:Ljava/lang/String;
+
+    iput-wide p2, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->channel_id:J
+
+    iput-object p4, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->guild_id:Ljava/lang/Long;
+
+    iput-object p5, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->preferred_region:Ljava/lang/String;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getChannel_id()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->channel_id:J
+
+    return-wide v0
+.end method
+
+.method public final getGuild_id()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->guild_id:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final getPreferred_region()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->preferred_region:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getType()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/gateway/io/OutgoingPayload$CreateStream;->type:Ljava/lang/String;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$DeleteStream.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$DeleteStream.smali
index d9df52c7c7..a16c062066 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$DeleteStream.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$DeleteStream.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream_key"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;->stream_key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream_key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali
index e3a4a98bd2..6641781157 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$GuildMembersRequest.smali
@@ -60,9 +60,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guild_id"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -77,13 +79,6 @@
     iput-boolean p5, p0, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;->presences:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild_id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -291,34 +286,27 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild_id"
 
-    new-instance v6, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-object v2, p2
+    move-object v2, p1
 
-    move-object v3, p3
+    move-object v3, p2
 
-    move-object v4, p4
+    move-object v4, p3
 
-    move v5, p5
+    move-object v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;-><init>(Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Z)V
+    move v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;-><init>(Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Z)V
 
-    :cond_0
-    const-string p1, "guild_id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -336,7 +324,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;->guild_id:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -346,7 +334,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;->query:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -356,7 +344,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;->user_ids:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -366,7 +354,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/io/OutgoingPayload$GuildMembersRequest;->limit:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
index c492b3b175..4d1e7ed112 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
@@ -55,12 +55,16 @@
         }
     .end annotation
 
+    const-string v0, "token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "properties"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p6, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->token:Ljava/lang/String;
@@ -76,18 +80,4 @@
     iput-object p7, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->client_state:Lcom/discord/gateway/io/OutgoingPayload$IdentifyClientState;
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$IdentifyClientState.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$IdentifyClientState.smali
index fe31090149..ac32bc490e 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$IdentifyClientState.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$IdentifyClientState.smali
@@ -36,7 +36,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/Map;JII)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -48,7 +48,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild_hashes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,15 +63,6 @@
     iput p5, p0, Lcom/discord/gateway/io/OutgoingPayload$IdentifyClientState;->user_guild_settings_version:I
 
     return-void
-
-    :cond_0
-    const-string p1, "guild_hashes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
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 fee51c6f3a..3fd3e6ffb1 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali
@@ -49,9 +49,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "activities"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -64,13 +66,6 @@
     iput-object p4, p0, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;->afk:Ljava/lang/Boolean;
 
     return-void
-
-    :cond_0
-    const-string p1, "activities"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -97,7 +92,7 @@
 
     if-eqz p6, :cond_1
 
-    sget-object p3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p3, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_1
     and-int/lit8 p5, p5, 0x8
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali
index 632121f579..9ef50d1adf 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$VoiceStateUpdate.smali
@@ -245,7 +245,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;->guild_id:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -255,7 +255,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;->channel_id:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -283,7 +283,7 @@
 
     iget-object p1, p1, Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;->preferred_region:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali
index 92693d30f0..bba262316b 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream_key"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/gateway/io/OutgoingPayload$WatchStream;->stream_key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream_key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
index 2be90022b5..b236d49bd8 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
@@ -16,7 +16,8 @@
         Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptionsUpdate;,
         Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;,
         Lcom/discord/gateway/io/OutgoingPayload$WatchStream;,
-        Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;
+        Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;,
+        Lcom/discord/gateway/io/OutgoingPayload$CreateStream;
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/gateway/opcodes/Opcode.smali b/com.discord/smali/com/discord/gateway/opcodes/Opcode.smali
index e06ac29589..b22af64495 100644
--- a/com.discord/smali/com/discord/gateway/opcodes/Opcode.smali
+++ b/com.discord/smali/com/discord/gateway/opcodes/Opcode.smali
@@ -48,6 +48,8 @@
 
 .field public static final enum RESUME:Lcom/discord/gateway/opcodes/Opcode;
 
+.field public static final enum STREAM_CREATE:Lcom/discord/gateway/opcodes/Opcode;
+
 .field public static final enum STREAM_DELETE:Lcom/discord/gateway/opcodes/Opcode;
 
 .field public static final enum STREAM_WATCH:Lcom/discord/gateway/opcodes/Opcode;
@@ -76,223 +78,235 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 7
 
-    const/16 v0, 0x11
+    const/16 v0, 0x12
 
-    new-array v0, v0, [Lcom/discord/gateway/opcodes/Opcode;
+    new-array v1, v0, [Lcom/discord/gateway/opcodes/Opcode;
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "UNHANDLED"
+    const-string v3, "UNHANDLED"
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    const/4 v4, -0x1
+    const/4 v5, -0x1
 
-    invoke-direct {v1, v2, v3, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->UNHANDLED:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->UNHANDLED:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v3
+    aput-object v2, v1, v4
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "DISPATCH"
+    const-string v3, "DISPATCH"
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    invoke-direct {v1, v2, v4, v3}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->DISPATCH:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->DISPATCH:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "HEARTBEAT"
+    const-string v3, "HEARTBEAT"
 
-    const/4 v5, 0x2
+    const/4 v6, 0x2
 
-    invoke-direct {v1, v2, v5, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v6, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->HEARTBEAT:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->HEARTBEAT:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v5
+    aput-object v2, v1, v6
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "IDENTIFY"
+    const-string v3, "IDENTIFY"
 
-    const/4 v4, 0x3
+    const/4 v5, 0x3
 
-    invoke-direct {v1, v2, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v6}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->IDENTIFY:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->IDENTIFY:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "PRESENCE_UPDATE"
+    const-string v3, "PRESENCE_UPDATE"
 
-    const/4 v5, 0x4
+    const/4 v6, 0x4
 
-    invoke-direct {v1, v2, v5, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v6, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->PRESENCE_UPDATE:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->PRESENCE_UPDATE:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v5
+    aput-object v2, v1, v6
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "VOICE_STATE_UPDATE"
+    const-string v3, "VOICE_STATE_UPDATE"
 
-    const/4 v4, 0x5
+    const/4 v5, 0x5
 
-    invoke-direct {v1, v2, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v6}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->VOICE_STATE_UPDATE:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->VOICE_STATE_UPDATE:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "VOICE_SERVER_PING"
+    const-string v3, "VOICE_SERVER_PING"
 
-    const/4 v5, 0x6
+    const/4 v6, 0x6
 
-    invoke-direct {v1, v2, v5, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v6, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->VOICE_SERVER_PING:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->VOICE_SERVER_PING:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v5
+    aput-object v2, v1, v6
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "RESUME"
+    const-string v3, "RESUME"
 
-    const/4 v4, 0x7
+    const/4 v5, 0x7
 
-    invoke-direct {v1, v2, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v6}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->RESUME:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->RESUME:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "RECONNECT"
+    const-string v3, "RECONNECT"
 
-    const/16 v5, 0x8
+    const/16 v6, 0x8
 
-    invoke-direct {v1, v2, v5, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v6, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->RECONNECT:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->RECONNECT:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v5
+    aput-object v2, v1, v6
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "REQUEST_GUILD_MEMBERS"
+    const-string v3, "REQUEST_GUILD_MEMBERS"
 
-    const/16 v4, 0x9
+    const/16 v5, 0x9
 
-    invoke-direct {v1, v2, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v6}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->REQUEST_GUILD_MEMBERS:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->REQUEST_GUILD_MEMBERS:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "INVALID_SESSION"
+    const-string v3, "INVALID_SESSION"
 
-    const/16 v5, 0xa
+    const/16 v6, 0xa
 
-    invoke-direct {v1, v2, v5, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v6, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->INVALID_SESSION:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->INVALID_SESSION:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v5
+    aput-object v2, v1, v6
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "HELLO"
+    const-string v3, "HELLO"
 
-    const/16 v4, 0xb
+    const/16 v5, 0xb
 
-    invoke-direct {v1, v2, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v6}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->HELLO:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->HELLO:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "HEARTBEAT_ACK"
+    const-string v3, "HEARTBEAT_ACK"
 
-    const/16 v5, 0xc
+    const/16 v6, 0xc
 
-    invoke-direct {v1, v2, v5, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v6, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->HEARTBEAT_ACK:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->HEARTBEAT_ACK:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v5
+    aput-object v2, v1, v6
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "CALL_CONNECT"
+    const-string v3, "CALL_CONNECT"
 
-    const/16 v4, 0xd
+    const/16 v5, 0xd
 
-    invoke-direct {v1, v2, v4, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->CALL_CONNECT:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->CALL_CONNECT:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
 
-    const-string v2, "GUILD_SUBSCRIPTIONS"
+    const-string v3, "GUILD_SUBSCRIPTIONS"
 
-    const/16 v4, 0xe
+    const/16 v5, 0xe
 
-    invoke-direct {v1, v2, v4, v4}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v2, v3, v5, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->GUILD_SUBSCRIPTIONS:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->GUILD_SUBSCRIPTIONS:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v2, v1, v5
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v2, Lcom/discord/gateway/opcodes/Opcode;
+
+    const-string v3, "STREAM_CREATE"
+
+    const/16 v5, 0xf
+
+    invoke-direct {v2, v3, v5, v0}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+
+    sput-object v2, Lcom/discord/gateway/opcodes/Opcode;->STREAM_CREATE:Lcom/discord/gateway/opcodes/Opcode;
+
+    aput-object v2, v1, v5
+
+    new-instance v0, Lcom/discord/gateway/opcodes/Opcode;
 
     const-string v2, "STREAM_DELETE"
 
-    const/16 v4, 0xf
+    const/16 v3, 0x10
 
     const/16 v5, 0x13
 
-    invoke-direct {v1, v2, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v0, v2, v3, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->STREAM_DELETE:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v0, Lcom/discord/gateway/opcodes/Opcode;->STREAM_DELETE:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v0, v1, v3
 
-    new-instance v1, Lcom/discord/gateway/opcodes/Opcode;
+    new-instance v0, Lcom/discord/gateway/opcodes/Opcode;
 
     const-string v2, "STREAM_WATCH"
 
-    const/16 v4, 0x10
+    const/16 v3, 0x11
 
     const/16 v5, 0x14
 
-    invoke-direct {v1, v2, v4, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
+    invoke-direct {v0, v2, v3, v5}, Lcom/discord/gateway/opcodes/Opcode;-><init>(Ljava/lang/String;II)V
 
-    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->STREAM_WATCH:Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v0, Lcom/discord/gateway/opcodes/Opcode;->STREAM_WATCH:Lcom/discord/gateway/opcodes/Opcode;
 
-    aput-object v1, v0, v4
+    aput-object v0, v1, v3
 
-    sput-object v0, Lcom/discord/gateway/opcodes/Opcode;->$VALUES:[Lcom/discord/gateway/opcodes/Opcode;
+    sput-object v1, Lcom/discord/gateway/opcodes/Opcode;->$VALUES:[Lcom/discord/gateway/opcodes/Opcode;
 
     new-instance v0, Lcom/discord/gateway/opcodes/Opcode$Companion;
 
@@ -313,19 +327,19 @@
     array-length v2, v1
 
     :goto_0
-    if-ge v3, v2, :cond_0
+    if-ge v4, v2, :cond_0
 
-    aget-object v4, v1, v3
+    aget-object v3, v1, v4
 
-    iget v5, v4, Lcom/discord/gateway/opcodes/Opcode;->apiInt:I
+    iget v5, v3, Lcom/discord/gateway/opcodes/Opcode;->apiInt:I
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v5
 
-    invoke-virtual {v0, v5, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v5, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/gateway/rest/RestApi.smali b/com.discord/smali/com/discord/gateway/rest/RestApi.smali
index 539394b029..a9af0ab17c 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestApi.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestApi.smali
@@ -14,7 +14,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gateway"
     .end annotation
 .end method
diff --git a/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali b/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali
index 86ec2574b5..5907899e8b 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestClient$getGateway$1.smali
@@ -3,7 +3,7 @@
 .source "RestClient.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGateway;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
@@ -74,7 +76,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGateway;->getUrl()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/gateway/rest/RestClient.smali b/com.discord/smali/com/discord/gateway/rest/RestClient.smali
index 9fba3db8fe..beb1f19220 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestClient.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestClient.smali
@@ -53,7 +53,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lr0/p/a;->d()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->d()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -63,7 +63,7 @@
 
     const-string v2, "restApi\n          .getGa\u2026scribeOn(Schedulers.io())"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v2, 0x0
 
@@ -81,20 +81,20 @@
 
     sget-object v1, Lcom/discord/gateway/rest/RestClient$getGateway$1;->INSTANCE:Lcom/discord/gateway/rest/RestClient$getGateway$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "restApi\n          .getGa\u2026          .map { it.url }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
     :cond_0
     const-string v0, "restApi"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -104,11 +104,13 @@
 .method public final init(Lcom/discord/gateway/rest/RestConfig;Landroid/content/Context;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "restConfig"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/gateway/rest/RestConfig;->component1()Ljava/lang/String;
 
@@ -138,48 +140,48 @@
 
     invoke-direct {v1, v3, v4}, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;-><init>(Lcom/franmontiel/persistentcookiejar/cache/CookieCache;Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;)V
 
-    const/4 p2, 0x2
+    new-instance p2, Ljava/util/ArrayList;
 
-    new-instance v3, Ljava/util/ArrayList;
+    const/4 v3, 0x2
 
-    invoke-direct {v3, p2}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {p2, v3}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p2, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    const/4 p2, 0x0
+    const/4 v2, 0x0
 
-    new-array p2, p2, [Lokhttp3/Interceptor;
+    new-array v2, v2, [Lokhttp3/Interceptor;
 
-    invoke-interface {p1, p2}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    invoke-interface {p1, v2}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object p1
 
     if-eqz p1, :cond_1
 
-    array-length p2, p1
-
-    if-lez p2, :cond_0
-
-    invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
-
-    move-result p2
-
     array-length v2, p1
 
-    add-int/2addr p2, v2
+    if-lez v2, :cond_0
 
-    invoke-virtual {v3, p2}, Ljava/util/ArrayList;->ensureCapacity(I)V
+    invoke-virtual {p2}, Ljava/util/ArrayList;->size()I
 
-    invoke-static {v3, p1}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
+    move-result v2
+
+    array-length v3, p1
+
+    add-int/2addr v2, v3
+
+    invoke-virtual {p2, v2}, Ljava/util/ArrayList;->ensureCapacity(I)V
+
+    invoke-static {p2, p1}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
     :cond_0
-    invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {p2}, Ljava/util/ArrayList;->size()I
 
     move-result p1
 
     new-array p1, p1, [Lokhttp3/Interceptor;
 
-    invoke-virtual {v3, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    invoke-virtual {p2, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object p1
 
@@ -191,7 +193,7 @@
 
     new-instance v2, Lcom/discord/restapi/RestAPIBuilder;
 
-    invoke-direct {v2, v0, v1}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Ln0/p;)V
+    invoke-direct {v2, v0, v1}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lo0/p;)V
 
     const-class v3, Lcom/discord/gateway/rest/RestApi;
 
@@ -220,25 +222,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "restConfig"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/gateway/rest/RestConfig.smali b/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
index fb15681515..cadae99aa7 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestConfig.smali
@@ -34,13 +34,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "baseUrl"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "headersProvider"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "optionalInterceptors"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,27 +55,6 @@
     iput-object p3, p0, Lcom/discord/gateway/rest/RestConfig;->optionalInterceptors:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "optionalInterceptors"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "headersProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "baseUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -81,7 +64,7 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p3, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_0
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
@@ -169,40 +152,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "baseUrl"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "headersProvider"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "optionalInterceptors"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/gateway/rest/RestConfig;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "optionalInterceptors"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "headersProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "baseUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -220,7 +186,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/rest/RestConfig;->baseUrl:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -230,7 +196,7 @@
 
     iget-object v1, p1, Lcom/discord/gateway/rest/RestConfig;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -240,7 +206,7 @@
 
     iget-object p1, p1, Lcom/discord/gateway/rest/RestConfig;->optionalInterceptors:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/application/Unread$Companion.smali b/com.discord/smali/com/discord/models/application/Unread$Companion.smali
index c4191a9c8b..cdc9827459 100644
--- a/com.discord/smali/com/discord/models/application/Unread$Companion.smali
+++ b/com.discord/smali/com/discord/models/application/Unread$Companion.smali
@@ -75,20 +75,20 @@
 
     move-result-object p2
 
-    check-cast p2, Lj0/i/c;
+    check-cast p2, Lk0/j/c;
 
-    new-instance v0, Lj0/i/c$a;
+    new-instance v0, Lk0/j/c$a;
 
-    invoke-direct {v0, p2}, Lj0/i/c$a;-><init>(Lj0/i/c;)V
+    invoke-direct {v0, p2}, Lk0/j/c$a;-><init>(Lk0/j/c;)V
 
     :goto_0
-    invoke-virtual {v0}, Lj0/i/c$a;->hasNext()Z
+    invoke-virtual {v0}, Lk0/j/c$a;->hasNext()Z
 
     move-result p2
 
     if-eqz p2, :cond_3
 
-    invoke-virtual {v0}, Lj0/i/c$a;->next()Ljava/lang/Object;
+    invoke-virtual {v0}, Lk0/j/c$a;->next()Ljava/lang/Object;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/models/application/Unread$Marker.smali b/com.discord/smali/com/discord/models/application/Unread$Marker.smali
index adb1013db9..ed35b47dc4 100644
--- a/com.discord/smali/com/discord/models/application/Unread$Marker.smali
+++ b/com.discord/smali/com/discord/models/application/Unread$Marker.smali
@@ -154,7 +154,7 @@
 
     iget-object p1, p1, Lcom/discord/models/application/Unread$Marker;->messageId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/application/Unread.smali b/com.discord/smali/com/discord/models/application/Unread.smali
index a4763f97d3..c8553ddc03 100644
--- a/com.discord/smali/com/discord/models/application/Unread.smali
+++ b/com.discord/smali/com/discord/models/application/Unread.smali
@@ -66,9 +66,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/application/Unread$Marker;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "marker"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -77,15 +79,6 @@
     iput p2, p0, Lcom/discord/models/application/Unread;->count:I
 
     return-void
-
-    :cond_0
-    const-string p1, "marker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/application/Unread$Marker;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -125,11 +118,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "marker"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "messages"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/models/application/Unread;->Companion:Lcom/discord/models/application/Unread$Companion;
 
@@ -140,20 +135,6 @@
     invoke-direct {p0, p1, p2}, Lcom/discord/models/application/Unread;-><init>(Lcom/discord/models/application/Unread$Marker;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "messages"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "marker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/application/Unread;Lcom/discord/models/application/Unread$Marker;IILjava/lang/Object;)Lcom/discord/models/application/Unread;
@@ -201,22 +182,15 @@
 .method public final copy(Lcom/discord/models/application/Unread$Marker;I)Lcom/discord/models/application/Unread;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "marker"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/application/Unread;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/application/Unread;-><init>(Lcom/discord/models/application/Unread$Marker;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "marker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final createWithEmptyCount()Lcom/discord/models/application/Unread;
@@ -248,7 +222,7 @@
 
     iget-object v1, p1, Lcom/discord/models/application/Unread;->marker:Lcom/discord/models/application/Unread$Marker;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/Consent.smali b/com.discord/smali/com/discord/models/domain/Consent.smali
index 43cb3b766b..9bbadf9a3f 100644
--- a/com.discord/smali/com/discord/models/domain/Consent.smali
+++ b/com.discord/smali/com/discord/models/domain/Consent.smali
@@ -131,7 +131,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/Consent;->changedAt:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/Consents.smali b/com.discord/smali/com/discord/models/domain/Consents.smali
index a7d98a9088..b924401cc0 100644
--- a/com.discord/smali/com/discord/models/domain/Consents.smali
+++ b/com.discord/smali/com/discord/models/domain/Consents.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/Consent;Lcom/discord/models/domain/Consent;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "usageStatistics"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "personalization"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,20 +28,6 @@
     iput-object p2, p0, Lcom/discord/models/domain/Consents;->personalization:Lcom/discord/models/domain/Consent;
 
     return-void
-
-    :cond_0
-    const-string p1, "personalization"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "usageStatistics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/Consents;Lcom/discord/models/domain/Consent;Lcom/discord/models/domain/Consent;ILjava/lang/Object;)Lcom/discord/models/domain/Consents;
@@ -87,31 +75,19 @@
 .method public final copy(Lcom/discord/models/domain/Consent;Lcom/discord/models/domain/Consent;)Lcom/discord/models/domain/Consents;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "usageStatistics"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "personalization"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/Consents;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/Consents;-><init>(Lcom/discord/models/domain/Consent;Lcom/discord/models/domain/Consent;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "personalization"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "usageStatistics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -129,7 +105,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/Consents;->usageStatistics:Lcom/discord/models/domain/Consent;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -139,7 +115,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/Consents;->personalization:Lcom/discord/models/domain/Consent;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/Harvest.smali b/com.discord/smali/com/discord/models/domain/Harvest.smali
index b15df5b063..fd75d3aa8d 100644
--- a/com.discord/smali/com/discord/models/domain/Harvest.smali
+++ b/com.discord/smali/com/discord/models/domain/Harvest.smali
@@ -17,11 +17,13 @@
 .method public constructor <init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "createdAt"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,20 +36,6 @@
     iput-object p5, p0, Lcom/discord/models/domain/Harvest;->completedAt:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "createdAt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic canRequest$default(Lcom/discord/models/domain/Harvest;JILjava/lang/Object;)Z
@@ -198,11 +186,13 @@
 .method public final copy(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/Harvest;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "createdAt"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/Harvest;
 
@@ -219,20 +209,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/Harvest;-><init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "createdAt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -250,7 +226,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/Harvest;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -268,7 +244,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/Harvest;->createdAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -278,7 +254,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/Harvest;->completedAt:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali
index f7bb1941e7..82a83a5c3f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser$parse$1.smali
@@ -179,7 +179,7 @@
 
     const-string v3, "reader.nextString(\"\")"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v1, v0, v2}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
 
@@ -227,7 +227,7 @@
 
     const-string v3, "reader.nextLongOrNull()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v1, v0, v2}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
index 55c8f0e1b3..ff11ff1264 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
@@ -42,37 +42,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/k;
+    new-instance v2, Lk0/o/c/l;
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "id"
 
-    move-result-object v3
+    const-string v4, "<v#0>"
 
-    const-string v4, "id"
+    const/4 v5, 0x0
 
-    const-string v5, "<v#0>"
+    invoke-direct {v2, v0, v3, v4, v5}, Lk0/o/c/l;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/k;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/t;->mutableProperty0(Lk0/o/c/k;)Lkotlin/reflect/KMutableProperty0;
 
-    invoke-static {v2}, Lj0/n/c/s;->mutableProperty0(Lj0/n/c/j;)Lkotlin/reflect/KMutableProperty0;
+    aput-object v2, v1, v5
 
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/k;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
+    new-instance v2, Lk0/o/c/l;
 
     const-string v3, "name"
 
     const-string v4, "<v#1>"
 
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/k;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v2, v0, v3, v4, v5}, Lk0/o/c/l;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
-    invoke-static {v2}, Lj0/n/c/s;->mutableProperty0(Lj0/n/c/j;)Lkotlin/reflect/KMutableProperty0;
+    invoke-static {v2}, Lk0/o/c/t;->mutableProperty0(Lk0/o/c/k;)Lkotlin/reflect/KMutableProperty0;
 
     const/4 v0, 0x1
 
@@ -100,69 +92,71 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelApplication;
-    .locals 34
+    .locals 35
 
     move-object/from16 v12, p1
 
-    const/4 v13, 0x0
+    const-string v0, "reader"
 
-    if-eqz v12, :cond_2
+    invoke-static {v12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v14, Lj0/o/a;
+    new-instance v13, Lk0/p/a;
 
-    invoke-direct {v14}, Lj0/o/a;-><init>()V
+    invoke-direct {v13}, Lk0/p/a;-><init>()V
 
     sget-object v0, Lcom/discord/models/domain/ModelApplication$Parser;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
-    aget-object v11, v0, v15
+    aget-object v15, v0, v14
 
-    new-instance v10, Lj0/o/a;
+    new-instance v11, Lk0/p/a;
 
-    invoke-direct {v10}, Lj0/o/a;-><init>()V
+    invoke-direct {v11}, Lk0/p/a;-><init>()V
 
     sget-object v0, Lcom/discord/models/domain/ModelApplication$Parser;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v1, 0x1
 
-    aget-object v9, v0, v1
+    aget-object v10, v0, v1
 
-    new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v13, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    const/4 v8, 0x0
+
+    iput-object v8, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v13, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v8, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v6, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v6}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v13, v6, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v8, v6, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v5, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v5}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v13, v5, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v8, v5, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v4, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v4}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v13, v4, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v8, v4, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v3, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v3}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v13, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v8, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lcom/discord/models/domain/ModelApplication$Parser$parse$1;
 
@@ -170,31 +164,33 @@
 
     move-object v1, v5
 
-    move-object v15, v2
+    move-object v14, v2
 
     move-object/from16 v2, p1
 
     move-object/from16 v16, v3
 
-    move-object v3, v14
+    move-object v3, v13
 
     move-object/from16 v17, v4
 
-    move-object v4, v11
+    move-object v4, v15
 
     move-object/from16 v18, v5
 
-    move-object v5, v10
+    move-object v5, v11
 
     move-object/from16 v19, v6
 
-    move-object v6, v9
+    move-object v6, v10
 
     move-object/from16 v20, v7
 
-    move-object v7, v8
+    move-object v7, v9
 
-    move-object/from16 v21, v8
+    move-object/from16 v21, v13
+
+    move-object v13, v8
 
     move-object/from16 v8, v20
 
@@ -206,49 +202,41 @@
 
     move-object/from16 v10, v17
 
-    move-object v13, v11
+    move-object/from16 v24, v11
 
     move-object/from16 v11, v16
 
     invoke-direct/range {v0 .. v11}, Lcom/discord/models/domain/ModelApplication$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/properties/ReadWriteProperty;Lkotlin/reflect/KProperty;Lkotlin/properties/ReadWriteProperty;Lkotlin/reflect/KProperty;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {v12, v15}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {v12, v14}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelApplication;
 
-    const/4 v1, 0x0
-
-    invoke-virtual {v14, v1, v13}, Lj0/o/a;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/Number;
-
-    invoke-virtual {v2}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v25
-
-    move-object/from16 v2, v22
-
-    move-object/from16 v3, v23
-
-    invoke-virtual {v3, v1, v2}, Lj0/o/a;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object/from16 v27, v2
-
-    check-cast v27, Ljava/lang/String;
-
     move-object/from16 v1, v21
 
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    invoke-virtual {v1, v13, v15}, Lk0/p/a;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Number;
+
+    invoke-virtual {v1}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v26
+
+    move-object/from16 v1, v23
+
+    move-object/from16 v2, v24
+
+    invoke-virtual {v2, v13, v1}, Lk0/p/a;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v1
 
     move-object/from16 v28, v1
 
     check-cast v28, Ljava/lang/String;
 
-    move-object/from16 v1, v20
+    move-object/from16 v1, v22
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -256,7 +244,7 @@
 
     check-cast v29, Ljava/lang/String;
 
-    move-object/from16 v1, v19
+    move-object/from16 v1, v20
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -264,7 +252,7 @@
 
     check-cast v30, Ljava/lang/String;
 
-    move-object/from16 v1, v18
+    move-object/from16 v1, v19
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -272,13 +260,21 @@
 
     check-cast v31, Ljava/lang/String;
 
-    move-object/from16 v1, v17
+    move-object/from16 v1, v18
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object/from16 v32, v1
 
-    check-cast v32, Ljava/util/List;
+    check-cast v32, Ljava/lang/String;
+
+    move-object/from16 v1, v17
+
+    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    move-object/from16 v33, v1
+
+    check-cast v33, Ljava/util/List;
 
     move-object/from16 v1, v16
 
@@ -290,59 +286,64 @@
 
     const-string v2, "/"
 
-    const/4 v3, 0x2
+    const-string v3, "$this$removeSuffix"
 
-    const/4 v4, 0x0
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v2, v4, v3}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    const-string v3, "suffix"
 
-    move-result v3
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v3, :cond_0
+    const/4 v4, 0x2
+
+    const-string v5, "$this$endsWith"
+
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    invoke-static {v1, v2, v3, v4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
-    move-result v3
+    move-result v4
 
     invoke-interface {v2}, Ljava/lang/CharSequence;->length()I
 
     move-result v2
 
-    sub-int/2addr v3, v2
+    sub-int/2addr v4, v2
 
-    invoke-virtual {v1, v4, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v1, v3, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v1
 
     const-string v2, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
-    move-object v13, v1
+    move-object v8, v1
 
-    move-object/from16 v33, v13
+    move-object/from16 v34, v8
 
     goto :goto_0
 
     :cond_1
-    const/16 v33, 0x0
+    move-object/from16 v34, v13
 
     :goto_0
-    move-object/from16 v24, v0
+    move-object/from16 v25, v0
 
-    invoke-direct/range {v24 .. v33}, Lcom/discord/models/domain/ModelApplication;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;)V
+    invoke-direct/range {v25 .. v34}, Lcom/discord/models/domain/ModelApplication;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_2
-    const-string v0, "reader"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser$parse$1.smali
index c8ff0bbf9f..37abe54a6f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser$parse$1.smali
@@ -165,7 +165,7 @@
 
     const-string v3, "reader.nextString(\"\")"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v0, v1, v2}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali
index de6d784333..d63e59cb8d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali
@@ -34,31 +34,27 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 5
+    .locals 6
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/k;
+    new-instance v1, Lk0/o/c/l;
 
     const-class v2, Lcom/discord/models/domain/ModelApplication$ThirdPartySku$Parser;
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
     const-string v3, "id"
 
     const-string v4, "<v#0>"
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/k;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    const/4 v5, 0x0
 
-    invoke-static {v1}, Lj0/n/c/s;->mutableProperty0(Lj0/n/c/j;)Lkotlin/reflect/KMutableProperty0;
+    invoke-direct {v1, v2, v3, v4, v5}, Lk0/o/c/l;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
-    const/4 v2, 0x0
+    invoke-static {v1}, Lk0/o/c/t;->mutableProperty0(Lk0/o/c/k;)Lkotlin/reflect/KMutableProperty0;
 
-    aput-object v1, v0, v2
+    aput-object v1, v0, v5
 
     sput-object v0, Lcom/discord/models/domain/ModelApplication$ThirdPartySku$Parser;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -84,43 +80,45 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelApplication$ThirdPartySku;
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v7, Lj0/o/a;
+    new-instance v0, Lk0/p/a;
 
-    invoke-direct {v7}, Lj0/o/a;-><init>()V
+    invoke-direct {v0}, Lk0/p/a;-><init>()V
 
     sget-object v1, Lcom/discord/models/domain/ModelApplication$ThirdPartySku$Parser;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x0
 
-    aget-object v8, v1, v2
+    aget-object v7, v1, v2
 
-    new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    const/4 v9, 0x0
+
+    iput-object v9, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v9, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v11, Lcom/discord/models/domain/ModelApplication$ThirdPartySku$Parser$parse$1;
 
     move-object v1, v11
 
-    move-object v2, v7
+    move-object v2, v0
 
-    move-object v3, v8
+    move-object v3, v7
 
     move-object v4, p1
 
-    move-object v5, v9
+    move-object v5, v8
 
     move-object v6, v10
 
@@ -130,13 +128,13 @@
 
     new-instance p1, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;
 
-    invoke-virtual {v7, v0, v8}, Lj0/o/a;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-virtual {v0, v9, v7}, Lk0/p/a;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
-    iget-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/String;
 
@@ -147,13 +145,6 @@
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku.smali b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku.smali
index b6d72f7dc2..dbf1c3cd8f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku.smali
@@ -30,9 +30,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "id"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,15 +45,6 @@
     iput-object p3, p0, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;->distributor:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelApplication$ThirdPartySku;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelApplication$ThirdPartySku;
@@ -114,22 +107,15 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/ModelApplication$ThirdPartySku;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "id"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -147,7 +133,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -157,7 +143,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;->sku:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -167,7 +153,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelApplication$ThirdPartySku;->distributor:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication.smali b/com.discord/smali/com/discord/models/domain/ModelApplication.smali
index 3282ac5cda..ee07ab5910 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication.smali
@@ -63,7 +63,7 @@
 .end method
 
 .method public constructor <init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -80,7 +80,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_1
+    const-string v0, "name"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -131,15 +133,6 @@
     iput-object p1, p0, Lcom/discord/models/domain/ModelApplication;->deeplinkUri:Ljava/lang/String;
 
     return-void
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -401,40 +394,33 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
-
-    new-instance v10, Lcom/discord/models/domain/ModelApplication;
-
-    move-object v0, v10
-
-    move-wide v1, p1
-
-    move-object v3, p3
-
-    move-object v4, p4
-
-    move-object/from16 v5, p5
-
-    move-object/from16 v6, p6
-
-    move-object/from16 v7, p7
-
-    move-object/from16 v8, p8
-
-    move-object/from16 v9, p9
-
-    invoke-direct/range {v0 .. v9}, Lcom/discord/models/domain/ModelApplication;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;)V
-
-    return-object v10
-
-    :cond_0
     const-string v0, "name"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v4, p3
 
-    const/4 v0, 0x0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/models/domain/ModelApplication;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move-object v5, p4
+
+    move-object/from16 v6, p5
+
+    move-object/from16 v7, p6
+
+    move-object/from16 v8, p7
+
+    move-object/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/models/domain/ModelApplication;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -460,7 +446,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -470,7 +456,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication;->description:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -480,7 +466,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication;->splash:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -490,7 +476,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication;->coverImage:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -500,7 +486,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication;->icon:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -510,7 +496,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelApplication;->thirdPartySkus:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -520,7 +506,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelApplication;->deeplinkBaseUri:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -609,7 +595,7 @@
 
     const-string v4, "google_play"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -653,7 +639,7 @@
     goto :goto_1
 
     :cond_3
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_4
     return-object v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$CallStream.smali b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$CallStream.smali
index 7f7d45f0b0..57a336f40c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$CallStream.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$CallStream.smali
@@ -19,6 +19,8 @@
 
 .field public final ownerId:J
 
+.field public final type:Ljava/lang/String;
+
 
 # direct methods
 .method public constructor <init>(JJ)V
@@ -38,6 +40,14 @@
 
     iput-wide p3, p0, Lcom/discord/models/domain/ModelApplicationStream$CallStream;->ownerId:J
 
+    sget-object p1, Lcom/discord/models/domain/StreamType;->CALL:Lcom/discord/models/domain/StreamType;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamType;->getSerializedRepresentation()Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelApplicationStream$CallStream;->type:Ljava/lang/String;
+
     return-void
 .end method
 
@@ -206,6 +216,14 @@
     return-wide v0
 .end method
 
+.method public getType()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelApplicationStream$CallStream;->type:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public hashCode()I
     .locals 7
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali
index c07a1dd5dd..005c11eef6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali
@@ -36,7 +36,9 @@
 .method public final decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
     .locals 9
 
-    if-eqz p1, :cond_2
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, ":"
 
@@ -44,15 +46,15 @@
 
     move-result-object v0
 
-    const/4 v1, 0x6
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, 0x6
 
-    invoke-static {p1, v0, v2, v2, v1}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {p1, v0, v1, v1, v2}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object p1
 
-    invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -149,13 +151,4 @@
     invoke-direct/range {v2 .. v8}, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;-><init>(JJJ)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$GuildStream.smali b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$GuildStream.smali
index 2338a8859e..ff10560799 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$GuildStream.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$GuildStream.smali
@@ -21,6 +21,8 @@
 
 .field public final ownerId:J
 
+.field public final type:Ljava/lang/String;
+
 
 # direct methods
 .method public constructor <init>(JJJ)V
@@ -42,6 +44,14 @@
 
     iput-wide p5, p0, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;->ownerId:J
 
+    sget-object p1, Lcom/discord/models/domain/StreamType;->GUILD:Lcom/discord/models/domain/StreamType;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamType;->getSerializedRepresentation()Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;->type:Ljava/lang/String;
+
     return-void
 .end method
 
@@ -263,6 +273,14 @@
     return-wide v0
 .end method
 
+.method public getType()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;->type:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public hashCode()I
     .locals 7
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$encodedStreamKey$2.smali b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$encodedStreamKey$2.smali
index da692eed18..4531ac83c2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$encodedStreamKey$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$encodedStreamKey$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelApplicationStream$encodedStreamKey$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelApplicationStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali b/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
index 272efed168..e17b286167 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
@@ -104,3 +104,6 @@
 
     return-wide v0
 .end method
+
+.method public abstract getType()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplicationStreamPreview.smali b/com.discord/smali/com/discord/models/domain/ModelApplicationStreamPreview.smali
index a88fce1c25..16f2dce797 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStreamPreview.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStreamPreview.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelApplicationStreamPreview;->url:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelApplicationStreamPreview;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelApplicationStreamPreview;
@@ -59,22 +52,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStreamPreview;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelApplicationStreamPreview;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelApplicationStreamPreview;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -92,7 +78,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelApplicationStreamPreview;->url:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali
index 656ff74984..27b556d660 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLog.smali
@@ -183,7 +183,7 @@
     goto :goto_1
 
     :sswitch_1
-    const-string v1, "users"
+    const-string/jumbo v1, "users"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -209,7 +209,7 @@
     goto :goto_1
 
     :sswitch_3
-    const-string v1, "webhooks"
+    const-string/jumbo v1, "webhooks"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
index 664cd29b61..50b7331ab3 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
@@ -577,7 +577,7 @@
     goto :goto_1
 
     :sswitch_3
-    const-string v1, "user_id"
+    const-string/jumbo v1, "user_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -723,8 +723,6 @@
     :goto_2
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x4a797962 -> :sswitch_6
diff --git a/com.discord/smali/com/discord/models/domain/ModelBackupCodes$BackupCode.smali b/com.discord/smali/com/discord/models/domain/ModelBackupCodes$BackupCode.smali
index 2aaebde56e..ca85f5704e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelBackupCodes$BackupCode.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelBackupCodes$BackupCode.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-boolean p2, p0, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;->consumed:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelBackupCodes$BackupCode;Ljava/lang/String;ZILjava/lang/Object;)Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
@@ -89,22 +82,15 @@
 .method public final copy(Ljava/lang/String;Z)Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;-><init>(Ljava/lang/String;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;->code:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelBackupCodes.smali b/com.discord/smali/com/discord/models/domain/ModelBackupCodes.smali
index 66c99f7674..53f706d036 100644
--- a/com.discord/smali/com/discord/models/domain/ModelBackupCodes.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelBackupCodes.smali
@@ -25,7 +25,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -35,22 +35,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "backupCodes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelBackupCodes;->backupCodes:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "backupCodes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelBackupCodes;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelBackupCodes;
@@ -100,22 +93,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "backupCodes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelBackupCodes;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelBackupCodes;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "backupCodes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -133,7 +119,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelBackupCodes;->backupCodes:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelBan.smali b/com.discord/smali/com/discord/models/domain/ModelBan.smali
index 801d6f78b7..75741a0783 100644
--- a/com.discord/smali/com/discord/models/domain/ModelBan.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelBan.smali
@@ -63,7 +63,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelCall.smali b/com.discord/smali/com/discord/models/domain/ModelCall.smali
index e5a5ed27b1..f91a65e8ae 100644
--- a/com.discord/smali/com/discord/models/domain/ModelCall.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelCall.smali
@@ -168,7 +168,7 @@
     goto :goto_1
 
     :sswitch_1
-    const-string v1, "voice_states"
+    const-string/jumbo v1, "voice_states"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -324,6 +324,8 @@
     :goto_2
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x7315ce29 -> :sswitch_5
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali b/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali
index 1b89c09806..5aa10ec616 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannel$Recipient.smali
@@ -71,7 +71,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannel.smali b/com.discord/smali/com/discord/models/domain/ModelChannel.smali
index bff9b5657c..fc68b670c4 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannel.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannel.smali
@@ -136,6 +136,16 @@
 
 .field public rateLimitPerUser:I
 
+.field public recipientIds:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public recipients:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -278,6 +288,10 @@
 
     iput-object p2, p0, Lcom/discord/models/domain/ModelChannel;->recipients:Ljava/util/List;
 
+    iget-object p2, p1, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
+
+    iput-object p2, p0, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
+
     iget p2, p1, Lcom/discord/models/domain/ModelChannel;->position:I
 
     iput p2, p0, Lcom/discord/models/domain/ModelChannel;->position:I
@@ -444,7 +458,22 @@
     return-object p0
 .end method
 
-.method public static synthetic b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPermissionOverwrite;
+.method public static synthetic b(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static synthetic c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPermissionOverwrite;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -465,27 +494,6 @@
     return-object p0
 .end method
 
-.method public static synthetic c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel$RecipientNick;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Lcom/discord/models/domain/ModelChannel$RecipientNick;
-
-    invoke-direct {v0}, Lcom/discord/models/domain/ModelChannel$RecipientNick;-><init>()V
-
-    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
-
-    move-result-object p0
-
-    check-cast p0, Lcom/discord/models/domain/ModelChannel$RecipientNick;
-
-    return-object p0
-.end method
-
 .method private computeName()Ljava/lang/String;
     .locals 1
 
@@ -601,7 +609,28 @@
     return-object v9
 .end method
 
-.method public static synthetic d(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)I
+.method public static synthetic d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel$RecipientNick;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelChannel$RecipientNick;-><init>()V
+
+    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+
+    return-object p0
+.end method
+
+.method public static synthetic e(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)I
     .locals 6
 
     const/4 v0, 0x0
@@ -942,12 +971,12 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x12
+    const/16 v0, 0x13
 
     goto/16 :goto_1
 
     :sswitch_1
-    const-string v1, "user_limit"
+    const-string/jumbo v1, "user_limit"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -955,7 +984,7 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xb
+    const/16 v0, 0xc
 
     goto/16 :goto_1
 
@@ -981,7 +1010,7 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x14
+    const/16 v0, 0x15
 
     goto/16 :goto_1
 
@@ -994,7 +1023,7 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xa
+    const/16 v0, 0xb
 
     goto/16 :goto_1
 
@@ -1007,11 +1036,24 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x9
+    const/16 v0, 0xa
 
     goto/16 :goto_1
 
     :sswitch_6
+    const-string v1, "recipient_ids"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/16 v0, 0x9
+
+    goto/16 :goto_1
+
+    :sswitch_7
     const-string v1, "origin_channel_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1020,11 +1062,11 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xe
+    const/16 v0, 0xf
 
     goto/16 :goto_1
 
-    :sswitch_7
+    :sswitch_8
     const-string v1, "topic"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1037,7 +1079,7 @@
 
     goto/16 :goto_1
 
-    :sswitch_8
+    :sswitch_9
     const-string v1, "token"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1050,7 +1092,7 @@
 
     goto/16 :goto_1
 
-    :sswitch_9
+    :sswitch_a
     const-string v1, "nicks"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1059,11 +1101,11 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x10
+    const/16 v0, 0x11
 
     goto/16 :goto_1
 
-    :sswitch_a
+    :sswitch_b
     const-string v1, "type"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1076,7 +1118,7 @@
 
     goto/16 :goto_1
 
-    :sswitch_b
+    :sswitch_c
     const-string v1, "nsfw"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1085,11 +1127,11 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x11
+    const/16 v0, 0x12
 
     goto/16 :goto_1
 
-    :sswitch_c
+    :sswitch_d
     const-string v1, "name"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1102,7 +1144,7 @@
 
     goto :goto_1
 
-    :sswitch_d
+    :sswitch_e
     const-string v1, "icon"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1111,11 +1153,11 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xd
+    const/16 v0, 0xe
 
     goto :goto_1
 
-    :sswitch_e
+    :sswitch_f
     const-string v1, "id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1128,7 +1170,7 @@
 
     goto :goto_1
 
-    :sswitch_f
+    :sswitch_10
     const-string v1, "last_message_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1141,7 +1183,7 @@
 
     goto :goto_1
 
-    :sswitch_10
+    :sswitch_11
     const-string v1, "bitrate"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1150,11 +1192,11 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xc
+    const/16 v0, 0xd
 
     goto :goto_1
 
-    :sswitch_11
+    :sswitch_12
     const-string v1, "recipients"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1167,7 +1209,7 @@
 
     goto :goto_1
 
-    :sswitch_12
+    :sswitch_13
     const-string v1, "guild_hashes"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1176,11 +1218,11 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x15
+    const/16 v0, 0x16
 
     goto :goto_1
 
-    :sswitch_13
+    :sswitch_14
     const-string v1, "application_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1189,11 +1231,11 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xf
+    const/16 v0, 0x10
 
     goto :goto_1
 
-    :sswitch_14
+    :sswitch_15
     const-string v1, "guild_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1206,7 +1248,7 @@
 
     goto :goto_1
 
-    :sswitch_15
+    :sswitch_16
     const-string v1, "member_list_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1215,7 +1257,7 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x13
+    const/16 v0, 0x14
 
     goto :goto_1
 
@@ -1290,7 +1332,7 @@
 
     invoke-direct {v0, p1}, Lf/a/d/a/p;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
-    sget-object v1, Lf/a/d/a/f1;->a:Lf/a/d/a/f1;
+    sget-object v1, Lf/a/d/a/m1;->a:Lf/a/d/a/m1;
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextListAsMap(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;Lcom/discord/models/domain/Model$JsonReader$KeySelector;)Ljava/util/HashMap;
 
@@ -1356,11 +1398,11 @@
     goto/16 :goto_2
 
     :pswitch_b
-    new-instance v0, Lf/a/d/a/r;
+    new-instance v0, Lf/a/d/a/t;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/r;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/t;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
-    sget-object v1, Lf/a/d/a/d1;->a:Lf/a/d/a/d1;
+    sget-object v1, Lf/a/d/a/k1;->a:Lf/a/d/a/k1;
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextListAsMap(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;Lcom/discord/models/domain/Model$JsonReader$KeySelector;)Ljava/util/HashMap;
 
@@ -1390,11 +1432,24 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/models/domain/ModelChannel;->recipients:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
 
     goto :goto_2
 
     :pswitch_e
+    new-instance v0, Lf/a/d/a/r;
+
+    invoke-direct {v0, p1}, Lf/a/d/a/r;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelChannel;->recipients:Ljava/util/List;
+
+    goto :goto_2
+
+    :pswitch_f
     iget-wide v0, p0, Lcom/discord/models/domain/ModelChannel;->ownerId:J
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -1405,7 +1460,7 @@
 
     goto :goto_2
 
-    :pswitch_f
+    :pswitch_10
     iget-wide v0, p0, Lcom/discord/models/domain/ModelChannel;->id:J
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -1416,7 +1471,7 @@
 
     goto :goto_2
 
-    :pswitch_10
+    :pswitch_11
     iget-wide v0, p0, Lcom/discord/models/domain/ModelChannel;->lastMessageId:J
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -1427,7 +1482,7 @@
 
     goto :goto_2
 
-    :pswitch_11
+    :pswitch_12
     iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->name:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -1438,7 +1493,7 @@
 
     goto :goto_2
 
-    :pswitch_12
+    :pswitch_13
     const-wide/16 v0, -0x1
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -1449,7 +1504,7 @@
 
     goto :goto_2
 
-    :pswitch_13
+    :pswitch_14
     iget v0, p0, Lcom/discord/models/domain/ModelChannel;->type:I
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -1460,7 +1515,7 @@
 
     goto :goto_2
 
-    :pswitch_14
+    :pswitch_15
     iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->token:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -1471,7 +1526,7 @@
 
     goto :goto_2
 
-    :pswitch_15
+    :pswitch_16
     iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->topic:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -1483,24 +1538,27 @@
     :goto_2
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
-        -0x75d47449 -> :sswitch_15
-        -0x4de03319 -> :sswitch_14
-        -0x4cb85596 -> :sswitch_13
-        -0x2f9843f8 -> :sswitch_12
-        -0x14b32e86 -> :sswitch_11
-        -0x6188493 -> :sswitch_10
-        -0x4f2f664 -> :sswitch_f
-        0xd1b -> :sswitch_e
-        0x313c79 -> :sswitch_d
-        0x337a8b -> :sswitch_c
-        0x33bd56 -> :sswitch_b
-        0x368f3a -> :sswitch_a
-        0x63f5570 -> :sswitch_9
-        0x696b9f9 -> :sswitch_8
-        0x696cd2f -> :sswitch_7
-        0x17b20490 -> :sswitch_6
+        -0x75d47449 -> :sswitch_16
+        -0x4de03319 -> :sswitch_15
+        -0x4cb85596 -> :sswitch_14
+        -0x2f9843f8 -> :sswitch_13
+        -0x14b32e86 -> :sswitch_12
+        -0x6188493 -> :sswitch_11
+        -0x4f2f664 -> :sswitch_10
+        0xd1b -> :sswitch_f
+        0x313c79 -> :sswitch_e
+        0x337a8b -> :sswitch_d
+        0x33bd56 -> :sswitch_c
+        0x368f3a -> :sswitch_b
+        0x63f5570 -> :sswitch_a
+        0x696b9f9 -> :sswitch_9
+        0x696cd2f -> :sswitch_8
+        0x17b20490 -> :sswitch_7
+        0x20658392 -> :sswitch_6
         0x2c929929 -> :sswitch_5
         0x32c91ab8 -> :sswitch_4
         0x3ad6caf0 -> :sswitch_3
@@ -1511,6 +1569,7 @@
 
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_16
         :pswitch_15
         :pswitch_14
         :pswitch_13
@@ -1757,6 +1816,31 @@
     return v2
 
     :cond_10
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getRecipientIds()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getRecipientIds()Ljava/util/List;
+
+    move-result-object v3
+
+    if-nez v1, :cond_11
+
+    if-eqz v3, :cond_12
+
+    goto :goto_5
+
+    :cond_11
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_12
+
+    :goto_5
+    return v2
+
+    :cond_12
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getPosition()I
 
     move-result v1
@@ -1765,11 +1849,11 @@
 
     move-result v3
 
-    if-eq v1, v3, :cond_11
+    if-eq v1, v3, :cond_13
 
     return v2
 
-    :cond_11
+    :cond_13
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getPermissionOverwrites()Ljava/util/Map;
 
     move-result-object v1
@@ -1778,23 +1862,23 @@
 
     move-result-object v3
 
-    if-nez v1, :cond_12
+    if-nez v1, :cond_14
 
-    if-eqz v3, :cond_13
+    if-eqz v3, :cond_15
 
-    goto :goto_5
+    goto :goto_6
 
-    :cond_12
+    :cond_14
     invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-nez v1, :cond_13
+    if-nez v1, :cond_15
 
-    :goto_5
+    :goto_6
     return v2
 
-    :cond_13
+    :cond_15
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I
 
     move-result v1
@@ -1803,11 +1887,11 @@
 
     move-result v3
 
-    if-eq v1, v3, :cond_14
+    if-eq v1, v3, :cond_16
 
     return v2
 
-    :cond_14
+    :cond_16
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getBitrate()I
 
     move-result v1
@@ -1816,11 +1900,11 @@
 
     move-result v3
 
-    if-eq v1, v3, :cond_15
+    if-eq v1, v3, :cond_17
 
     return v2
 
-    :cond_15
+    :cond_17
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getIcon()Ljava/lang/String;
 
     move-result-object v1
@@ -1829,23 +1913,23 @@
 
     move-result-object v3
 
-    if-nez v1, :cond_16
+    if-nez v1, :cond_18
 
-    if-eqz v3, :cond_17
+    if-eqz v3, :cond_19
 
-    goto :goto_6
+    goto :goto_7
 
-    :cond_16
+    :cond_18
     invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-nez v1, :cond_17
+    if-nez v1, :cond_19
 
-    :goto_6
+    :goto_7
     return v2
 
-    :cond_17
+    :cond_19
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getOriginChannelId()J
 
     move-result-wide v3
@@ -1856,11 +1940,11 @@
 
     cmp-long v1, v3, v5
 
-    if-eqz v1, :cond_18
+    if-eqz v1, :cond_1a
 
     return v2
 
-    :cond_18
+    :cond_1a
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getApplicationId()J
 
     move-result-wide v3
@@ -1871,11 +1955,11 @@
 
     cmp-long v1, v3, v5
 
-    if-eqz v1, :cond_19
+    if-eqz v1, :cond_1b
 
     return v2
 
-    :cond_19
+    :cond_1b
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
 
     move-result-object v1
@@ -1884,23 +1968,23 @@
 
     move-result-object v3
 
-    if-nez v1, :cond_1a
+    if-nez v1, :cond_1c
 
-    if-eqz v3, :cond_1b
+    if-eqz v3, :cond_1d
 
-    goto :goto_7
+    goto :goto_8
 
-    :cond_1a
+    :cond_1c
     invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-nez v1, :cond_1b
+    if-nez v1, :cond_1d
 
-    :goto_7
+    :goto_8
     return v2
 
-    :cond_1b
+    :cond_1d
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->isNsfw()Z
 
     move-result v1
@@ -1909,11 +1993,11 @@
 
     move-result v3
 
-    if-eq v1, v3, :cond_1c
+    if-eq v1, v3, :cond_1e
 
     return v2
 
-    :cond_1c
+    :cond_1e
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
     move-result-wide v3
@@ -1924,11 +2008,11 @@
 
     cmp-long v1, v3, v5
 
-    if-eqz v1, :cond_1d
+    if-eqz v1, :cond_1f
 
     return v2
 
-    :cond_1d
+    :cond_1f
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getMemberListId()Ljava/lang/String;
 
     move-result-object v1
@@ -1937,23 +2021,23 @@
 
     move-result-object v3
 
-    if-nez v1, :cond_1e
+    if-nez v1, :cond_20
 
-    if-eqz v3, :cond_1f
+    if-eqz v3, :cond_21
 
-    goto :goto_8
+    goto :goto_9
 
-    :cond_1e
+    :cond_20
     invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-nez v1, :cond_1f
+    if-nez v1, :cond_21
 
-    :goto_8
+    :goto_9
     return v2
 
-    :cond_1f
+    :cond_21
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getRateLimitPerUser()I
 
     move-result v1
@@ -1962,11 +2046,11 @@
 
     move-result v3
 
-    if-eq v1, v3, :cond_20
+    if-eq v1, v3, :cond_22
 
     return v2
 
-    :cond_20
+    :cond_22
     invoke-direct {p0}, Lcom/discord/models/domain/ModelChannel;->getComputedName()Ljava/lang/String;
 
     move-result-object v1
@@ -1975,23 +2059,23 @@
 
     move-result-object p1
 
-    if-nez v1, :cond_21
+    if-nez v1, :cond_23
 
-    if-eqz p1, :cond_22
+    if-eqz p1, :cond_24
 
-    goto :goto_9
+    goto :goto_a
 
-    :cond_21
+    :cond_23
     invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-nez p1, :cond_22
+    if-nez p1, :cond_24
 
-    :goto_9
+    :goto_a
     return v2
 
-    :cond_22
+    :cond_24
     return v0
 .end method
 
@@ -2202,6 +2286,22 @@
     return v0
 .end method
 
+.method public getRecipientIds()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
+
+    return-object v0
+.end method
+
 .method public getRecipients()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -2472,6 +2572,26 @@
     :goto_4
     add-int/2addr v3, v4
 
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getRecipientIds()Ljava/util/List;
+
+    move-result-object v4
+
+    mul-int/lit8 v3, v3, 0x3b
+
+    if-nez v4, :cond_5
+
+    const/16 v4, 0x2b
+
+    goto :goto_5
+
+    :cond_5
+    invoke-virtual {v4}, Ljava/lang/Object;->hashCode()I
+
+    move-result v4
+
+    :goto_5
+    add-int/2addr v3, v4
+
     mul-int/lit8 v3, v3, 0x3b
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getPosition()I
@@ -2486,18 +2606,18 @@
 
     mul-int/lit8 v4, v4, 0x3b
 
-    if-nez v3, :cond_5
+    if-nez v3, :cond_6
 
     const/16 v3, 0x2b
 
-    goto :goto_5
+    goto :goto_6
 
-    :cond_5
+    :cond_6
     invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
     move-result v3
 
-    :goto_5
+    :goto_6
     add-int/2addr v4, v3
 
     mul-int/lit8 v4, v4, 0x3b
@@ -2522,18 +2642,18 @@
 
     mul-int/lit8 v4, v4, 0x3b
 
-    if-nez v3, :cond_6
+    if-nez v3, :cond_7
 
     const/16 v3, 0x2b
 
-    goto :goto_6
+    goto :goto_7
 
-    :cond_6
+    :cond_7
     invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
     move-result v3
 
-    :goto_6
+    :goto_7
     add-int/2addr v4, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getOriginChannelId()J
@@ -2570,18 +2690,18 @@
 
     mul-int/lit8 v4, v4, 0x3b
 
-    if-nez v3, :cond_7
+    if-nez v3, :cond_8
 
     const/16 v3, 0x2b
 
-    goto :goto_7
+    goto :goto_8
 
-    :cond_7
+    :cond_8
     invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
     move-result v3
 
-    :goto_7
+    :goto_8
     add-int/2addr v4, v3
 
     mul-int/lit8 v4, v4, 0x3b
@@ -2590,16 +2710,16 @@
 
     move-result v3
 
-    if-eqz v3, :cond_8
+    if-eqz v3, :cond_9
 
     const/16 v3, 0x4f
 
-    goto :goto_8
+    goto :goto_9
 
-    :cond_8
+    :cond_9
     const/16 v3, 0x61
 
-    :goto_8
+    :goto_9
     add-int/2addr v4, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
@@ -2622,18 +2742,18 @@
 
     mul-int/lit8 v4, v4, 0x3b
 
-    if-nez v0, :cond_9
+    if-nez v0, :cond_a
 
     const/16 v0, 0x2b
 
-    goto :goto_9
+    goto :goto_a
 
-    :cond_9
+    :cond_a
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
 
-    :goto_9
+    :goto_a
     add-int/2addr v4, v0
 
     mul-int/lit8 v4, v4, 0x3b
@@ -2650,16 +2770,16 @@
 
     mul-int/lit8 v0, v0, 0x3b
 
-    if-nez v3, :cond_a
+    if-nez v3, :cond_b
 
-    goto :goto_a
+    goto :goto_b
 
-    :cond_a
+    :cond_b
     invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
-    :goto_a
+    :goto_b
     add-int/2addr v0, v1
 
     return v0
@@ -2693,6 +2813,89 @@
     return-object p0
 .end method
 
+.method public hydrateUsers(Ljava/util/Map;)Lcom/discord/models/domain/ModelChannel;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelChannel;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
+
+    if-eqz v0, :cond_1
+
+    new-instance v0, Lcom/discord/models/domain/ModelChannel;
+
+    iget-wide v1, p0, Lcom/discord/models/domain/ModelChannel;->guildId:J
+
+    invoke-direct {v0, p0, v1, v2}, Lcom/discord/models/domain/ModelChannel;-><init>(Lcom/discord/models/domain/ModelChannel;J)V
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    iget-object v2, p0, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
+
+    invoke-interface {v2}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    iput-object v1, v0, Lcom/discord/models/domain/ModelChannel;->recipients:Ljava/util/List;
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->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, Ljava/lang/Long;
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v2
+
+    iget-object v4, v0, Lcom/discord/models/domain/ModelChannel;->recipients:Ljava/util/List;
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-interface {p1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-interface {v4, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    iput-object p1, v0, Lcom/discord/models/domain/ModelChannel;->recipientIds:Ljava/util/List;
+
+    return-object v0
+
+    :cond_1
+    return-object p0
+.end method
+
 .method public isCategory()Z
     .locals 2
 
@@ -3035,6 +3238,16 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", recipientIds="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getRecipientIds()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
     const-string v1, ", position="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1.smali
index 6e68fedb22..edc304a57c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1.smali
@@ -101,7 +101,7 @@
 
     const-string v1, "reader.nextList { ModelR\u2026te.Parser.parse(reader) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser.smali
index 0d14018215..4dd8f879ad 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate$Parser.smali
@@ -56,47 +56,40 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;
 
-    invoke-direct {v2, v1, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v2, v0, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelChannelUnreadUpdate;
 
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    check-cast v1, Ljava/util/List;
+    check-cast v0, Ljava/util/List;
 
-    invoke-direct {p1, v1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate;-><init>(Ljava/util/List;)V
+    invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelChannelUnreadUpdate;-><init>(Ljava/util/List;)V
 
     return-object p1
 
     :cond_0
     const-string p1, "channelReadStates"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate.smali b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate.smali
index 999787d9ce..55bdffa09e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelChannelUnreadUpdate.smali
@@ -25,7 +25,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -35,22 +35,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelReadStates"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelReadStates"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelChannelUnreadUpdate;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelChannelUnreadUpdate;
@@ -100,22 +93,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelReadStates"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelChannelUnreadUpdate;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelChannelUnreadUpdate;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channelReadStates"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -133,7 +119,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelChannelUnreadUpdate;->channelReadStates:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali b/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali
index a5b4ebdd33..eaf401ac9c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelConnectedAccount.smali
@@ -65,7 +65,7 @@
     goto :goto_0
 
     :sswitch_0
-    const-string v1, "visibility"
+    const-string/jumbo v1, "visibility"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -156,7 +156,7 @@
     goto :goto_1
 
     :sswitch_7
-    const-string v1, "verified"
+    const-string/jumbo v1, "verified"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelConnectionAccessToken.smali b/com.discord/smali/com/discord/models/domain/ModelConnectionAccessToken.smali
index afdb2097d7..9a28204c19 100644
--- a/com.discord/smali/com/discord/models/domain/ModelConnectionAccessToken.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelConnectionAccessToken.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "accessToken"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelConnectionAccessToken;->accessToken:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "accessToken"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelConnectionAccessToken;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelConnectionAccessToken;
@@ -59,22 +52,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelConnectionAccessToken;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "accessToken"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelConnectionAccessToken;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelConnectionAccessToken;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "accessToken"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -92,7 +78,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelConnectionAccessToken;->accessToken:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting$Parser.smali
index b257b67d26..43986c15bb 100644
--- a/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting$Parser.smali
@@ -56,41 +56,41 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelCustomStatusSetting;
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
-
-    invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
-
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->peek()Lcom/google/gson/stream/JsonToken;
 
-    move-result-object v0
+    move-result-object v1
 
-    sget-object v1, Lcom/google/gson/stream/JsonToken;->NULL:Lcom/google/gson/stream/JsonToken;
+    sget-object v2, Lcom/google/gson/stream/JsonToken;->NULL:Lcom/google/gson/stream/JsonToken;
 
-    if-ne v0, v1, :cond_0
+    if-ne v1, v2, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextNull()V
 
@@ -103,52 +103,45 @@
     return-object p1
 
     :cond_0
-    new-instance v0, Lcom/discord/models/domain/ModelCustomStatusSetting$Parser$parse$1;
+    new-instance v10, Lcom/discord/models/domain/ModelCustomStatusSetting$Parser$parse$1;
 
-    move-object v1, v0
+    move-object v1, v10
 
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v3, p1
 
-    move-object v4, v8
+    move-object v4, v7
 
-    move-object v5, v9
+    move-object v5, v8
 
-    move-object v6, v10
+    move-object v6, v9
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelCustomStatusSetting$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelCustomStatusSetting;
 
-    iget-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
-    iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
-    iget-object v2, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v2, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v2, Ljava/lang/String;
 
-    iget-object v3, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v3, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/String;
 
     invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/models/domain/ModelCustomStatusSetting;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting.smali b/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting.smali
index 0c33046581..291389c826 100644
--- a/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelCustomStatusSetting.smali
@@ -170,7 +170,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelCustomStatusSetting;->text:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -180,7 +180,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelCustomStatusSetting;->emojiId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -190,7 +190,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelCustomStatusSetting;->emojiName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -200,7 +200,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelCustomStatusSetting;->expiresAt:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelEntitlement.smali b/com.discord/smali/com/discord/models/domain/ModelEntitlement.smali
index 37b90a8eea..b8ea6d8ad2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelEntitlement.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelEntitlement.smali
@@ -23,9 +23,11 @@
 
 # direct methods
 .method public constructor <init>(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p10, :cond_0
+    const-string v0, "sku"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,15 +48,6 @@
     iput-object p12, p0, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "sku"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelEntitlement;JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/models/domain/ModelEntitlement;
@@ -252,40 +245,33 @@
 .method public final copy(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;)Lcom/discord/models/domain/ModelEntitlement;
     .locals 14
 
-    if-eqz p10, :cond_0
-
-    new-instance v13, Lcom/discord/models/domain/ModelEntitlement;
-
-    move-object v0, v13
-
-    move-wide v1, p1
-
-    move-wide/from16 v3, p3
-
-    move/from16 v5, p5
-
-    move-wide/from16 v6, p6
-
-    move-wide/from16 v8, p8
-
-    move-object/from16 v10, p10
-
-    move-object/from16 v11, p11
-
-    move-object/from16 v12, p12
-
-    invoke-direct/range {v0 .. v12}, Lcom/discord/models/domain/ModelEntitlement;-><init>(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;)V
-
-    return-object v13
-
-    :cond_0
     const-string v0, "sku"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v11, p10
 
-    const/4 v0, 0x0
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/models/domain/ModelEntitlement;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move-wide/from16 v4, p3
+
+    move/from16 v6, p5
+
+    move-wide/from16 v7, p6
+
+    move-wide/from16 v9, p8
+
+    move-object/from16 v12, p11
+
+    move-object/from16 v13, p12
+
+    invoke-direct/range {v1 .. v13}, Lcom/discord/models/domain/ModelEntitlement;-><init>(JJIJJLcom/discord/models/domain/ModelSku;Lcom/discord/models/domain/ModelSubscriptionPlan;Ljava/lang/Long;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -341,7 +327,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelEntitlement;->sku:Lcom/discord/models/domain/ModelSku;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -351,7 +337,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelEntitlement;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -361,7 +347,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelEntitlement;->parentId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali
index b9d8ab8c97..67d8a39a17 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment$Assignments.smali
@@ -104,7 +104,7 @@
     :cond_3
     new-instance v0, Lcom/discord/models/domain/ModelExperiment$Experiments;
 
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-direct {v0, p1, v1}, Lcom/discord/models/domain/ModelExperiment$Experiments;-><init>(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali
index b621b03d90..fd01ad8d56 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment$Experiments.smali
@@ -38,9 +38,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    new-instance v0, Lf/a/d/a/t;
+    new-instance v0, Lf/a/d/a/u;
 
-    invoke-direct {v0, p1, p2}, Lf/a/d/a/t;-><init>(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)V
+    invoke-direct {v0, p1, p2}, Lf/a/d/a/u;-><init>(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)V
 
     sget-object p2, Lf/a/d/a/a;->a:Lf/a/d/a/a;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
index 13fe964a56..d65d538445 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
@@ -54,9 +54,9 @@
 
     iput-object p2, p0, Lcom/discord/models/domain/ModelExperiment;->type:Ljava/lang/String;
 
-    new-instance v0, Lf/a/d/a/u;
+    new-instance v0, Lf/a/d/a/v;
 
-    invoke-direct {v0, p0, p2, p1}, Lf/a/d/a/u;-><init>(Lcom/discord/models/domain/ModelExperiment;Ljava/lang/String;Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p0, p2, p1}, Lf/a/d/a/v;-><init>(Lcom/discord/models/domain/ModelExperiment;Ljava/lang/String;Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextListIndexed(Lcom/discord/models/domain/Model$JsonReader$ItemRunnable;)V
 
@@ -72,7 +72,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {p0, v1, v0, v1}, Lf/n/a/k/a;->P(Ljava/lang/CharSequence;III)I
+    invoke-static {p0, v1, v0, v1}, Lf/n/a/k/a;->M(Ljava/lang/CharSequence;III)I
 
     move-result p0
 
@@ -261,7 +261,7 @@
     goto :goto_1
 
     :cond_1
-    const-string v0, "user"
+    const-string/jumbo v0, "user"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGateway.smali b/com.discord/smali/com/discord/models/domain/ModelGateway.smali
index 59b7193ae6..e0d32ed9a6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGateway.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGateway.smali
@@ -44,7 +44,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "url"
+    const-string/jumbo v1, "url"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali
index 330a1a46ff..fe90d7df0e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGift$Parser$parse$1.smali
@@ -176,7 +176,7 @@
     goto/16 :goto_1
 
     :sswitch_3
-    const-string v0, "uses"
+    const-string/jumbo v0, "uses"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -197,7 +197,7 @@
     goto :goto_1
 
     :sswitch_4
-    const-string v0, "user"
+    const-string/jumbo v0, "user"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
index dd99b753f2..7a63c977d6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGift$Parser.smali
@@ -58,109 +58,107 @@
 
     move-object/from16 v11, p1
 
-    const/4 v12, 0x0
+    const-string v0, "reader"
 
-    if-eqz v11, :cond_7
+    invoke-static {v11, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v12
+
+    const/4 v0, 0x0
+
+    iput-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v14, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v14}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v15, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v15}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v6, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v6}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v12, v6, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v6, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v5, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v5, Lcom/discord/models/domain/ModelGift$Parser$parse$1;
 
-    invoke-direct {v5}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v0, v5
 
-    iput-object v12, v5, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v4, Lcom/discord/models/domain/ModelGift$Parser$parse$1;
-
-    move-object v0, v4
-
-    move-object v1, v13
+    move-object v1, v12
 
     move-object/from16 v2, p1
 
-    move-object v3, v14
+    move-object v3, v13
 
-    move-object v12, v4
+    move-object v4, v14
 
-    move-object v4, v15
+    move-object/from16 v16, v14
 
-    move-object/from16 v16, v5
+    move-object v14, v5
 
-    move-object v5, v10
+    move-object v5, v15
 
     move-object/from16 v17, v6
 
-    move-object v6, v9
+    move-object v6, v10
 
     move-object/from16 v18, v7
 
-    move-object v7, v8
+    move-object v7, v9
 
     move-object/from16 v19, v8
 
-    move-object/from16 v8, v18
-
     move-object/from16 v20, v9
 
-    move-object/from16 v9, v17
+    move-object/from16 v9, v18
 
     move-object/from16 v21, v10
 
-    move-object/from16 v10, v16
+    move-object/from16 v10, v17
 
     invoke-direct/range {v0 .. v10}, Lcom/discord/models/domain/ModelGift$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {v11, v12}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {v11, v14}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGift;
 
-    iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
@@ -178,12 +176,10 @@
     :goto_0
     move-wide/from16 v23, v1
 
-    iget-object v1, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Boolean;
 
-    const/4 v2, 0x0
-
     if-eqz v1, :cond_1
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
@@ -192,17 +188,23 @@
 
     move/from16 v25, v1
 
+    move-object/from16 v1, v16
+
     goto :goto_1
 
     :cond_1
+    const/4 v1, 0x0
+
+    move-object/from16 v1, v16
+
     const/16 v25, 0x0
 
     :goto_1
-    iget-object v1, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/String;
 
-    const-string v3, ""
+    const-string v2, ""
 
     if-eqz v1, :cond_2
 
@@ -211,12 +213,10 @@
     goto :goto_2
 
     :cond_2
-    move-object/from16 v26, v3
+    move-object/from16 v26, v2
 
     :goto_2
-    move-object/from16 v1, v21
-
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/String;
 
@@ -227,10 +227,10 @@
     goto :goto_3
 
     :cond_3
-    move-object/from16 v27, v3
+    move-object/from16 v27, v2
 
     :goto_3
-    move-object/from16 v1, v20
+    move-object/from16 v1, v21
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -244,12 +244,14 @@
 
     move/from16 v28, v1
 
-    move-object/from16 v1, v19
+    move-object/from16 v1, v20
 
     goto :goto_4
 
     :cond_4
-    move-object/from16 v1, v19
+    const/4 v1, 0x0
+
+    move-object/from16 v1, v20
 
     const/16 v28, 0x0
 
@@ -260,9 +262,9 @@
 
     check-cast v29, Lcom/discord/models/domain/ModelStoreListing;
 
-    if-eqz v29, :cond_6
+    invoke-static/range {v29 .. v29}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    move-object/from16 v1, v18
+    move-object/from16 v1, v19
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -276,12 +278,14 @@
 
     move/from16 v30, v1
 
-    move-object/from16 v1, v17
+    move-object/from16 v1, v18
 
     goto :goto_5
 
     :cond_5
-    move-object/from16 v1, v17
+    const/4 v1, 0x0
+
+    move-object/from16 v1, v18
 
     const/16 v30, 0x0
 
@@ -292,7 +296,7 @@
 
     check-cast v31, Lcom/discord/models/domain/ModelUser;
 
-    move-object/from16 v1, v16
+    move-object/from16 v1, v17
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -305,22 +309,6 @@
     invoke-direct/range {v22 .. v32}, Lcom/discord/models/domain/ModelGift;-><init>(JZLjava/lang/String;Ljava/lang/String;ILcom/discord/models/domain/ModelStoreListing;ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelSubscriptionPlan;)V
 
     return-object v0
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_7
-    move-object v0, v12
-
-    const-string v1, "reader"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGift.smali b/com.discord/smali/com/discord/models/domain/ModelGift.smali
index d0e8b723ca..1388e18817 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGift.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGift.smali
@@ -33,9 +33,11 @@
 
 # direct methods
 .method public constructor <init>(JZLjava/lang/String;Ljava/lang/String;ILcom/discord/models/domain/ModelStoreListing;ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelSubscriptionPlan;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p5, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,15 +60,6 @@
     iput-object p10, p0, Lcom/discord/models/domain/ModelGift;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
 
     return-void
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGift;JZLjava/lang/String;Ljava/lang/String;ILcom/discord/models/domain/ModelStoreListing;ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelSubscriptionPlan;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGift;
@@ -286,42 +279,35 @@
 .method public final copy(JZLjava/lang/String;Ljava/lang/String;ILcom/discord/models/domain/ModelStoreListing;ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelSubscriptionPlan;)Lcom/discord/models/domain/ModelGift;
     .locals 12
 
-    if-eqz p5, :cond_0
-
-    new-instance v11, Lcom/discord/models/domain/ModelGift;
-
-    move-object v0, v11
-
-    move-wide v1, p1
-
-    move v3, p3
-
-    move-object/from16 v4, p4
-
-    move-object/from16 v5, p5
-
-    move/from16 v6, p6
-
-    move-object/from16 v7, p7
-
-    move/from16 v8, p8
-
-    move-object/from16 v9, p9
-
-    move-object/from16 v10, p10
-
-    invoke-direct/range {v0 .. v10}, Lcom/discord/models/domain/ModelGift;-><init>(JZLjava/lang/String;Ljava/lang/String;ILcom/discord/models/domain/ModelStoreListing;ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelSubscriptionPlan;)V
-
-    return-object v11
-
-    :cond_0
     const-string v0, "code"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v6, p5
 
-    const/4 v0, 0x0
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/models/domain/ModelGift;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move v4, p3
+
+    move-object/from16 v5, p4
+
+    move/from16 v7, p6
+
+    move-object/from16 v8, p7
+
+    move/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    move-object/from16 v11, p10
+
+    invoke-direct/range {v1 .. v11}, Lcom/discord/models/domain/ModelGift;-><init>(JZLjava/lang/String;Ljava/lang/String;ILcom/discord/models/domain/ModelStoreListing;ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelSubscriptionPlan;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -353,7 +339,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGift;->expiresAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -363,7 +349,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGift;->code:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -379,7 +365,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGift;->storeListing:Lcom/discord/models/domain/ModelStoreListing;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -395,7 +381,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGift;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -405,7 +391,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGift;->subscriptionPlan:Lcom/discord/models/domain/ModelSubscriptionPlan;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuild.smali b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
index 18dada760a..7c33e1bd2e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
@@ -1801,7 +1801,7 @@
     goto/16 :goto_1
 
     :sswitch_2
-    const-string v1, "welcome_screen"
+    const-string/jumbo v1, "welcome_screen"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1814,7 +1814,7 @@
     goto/16 :goto_1
 
     :sswitch_3
-    const-string v1, "vanity_url_code"
+    const-string/jumbo v1, "vanity_url_code"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1918,7 +1918,7 @@
     goto/16 :goto_1
 
     :sswitch_b
-    const-string v1, "voice_states"
+    const-string/jumbo v1, "voice_states"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -2035,7 +2035,7 @@
     goto/16 :goto_1
 
     :sswitch_14
-    const-string v1, "verification_level"
+    const-string/jumbo v1, "verification_level"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -2267,9 +2267,9 @@
     goto/16 :goto_2
 
     :pswitch_1
-    new-instance v0, Lf/a/d/a/b0;
+    new-instance v0, Lf/a/d/a/c0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/b0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/c0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2430,9 +2430,9 @@
     :pswitch_f
     new-instance v0, Ljava/util/ArrayList;
 
-    new-instance v1, Lf/a/d/a/c0;
+    new-instance v1, Lf/a/d/a/d0;
 
-    invoke-direct {v1, p1}, Lf/a/d/a/c0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v1, p1}, Lf/a/d/a/d0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2504,9 +2504,9 @@
     goto/16 :goto_2
 
     :pswitch_15
-    new-instance v0, Lf/a/d/a/x;
+    new-instance v0, Lf/a/d/a/y;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/x;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/y;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2517,11 +2517,11 @@
     goto/16 :goto_2
 
     :pswitch_16
-    new-instance v0, Lf/a/d/a/d0;
+    new-instance v0, Lf/a/d/a/e0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/d0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/e0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
-    sget-object v1, Lf/a/d/a/w;->a:Lf/a/d/a/w;
+    sget-object v1, Lf/a/d/a/x;->a:Lf/a/d/a/x;
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextListAsMap(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;Lcom/discord/models/domain/Model$JsonReader$KeySelector;)Ljava/util/HashMap;
 
@@ -2532,9 +2532,9 @@
     goto/16 :goto_2
 
     :pswitch_17
-    new-instance v0, Lf/a/d/a/z;
+    new-instance v0, Lf/a/d/a/a0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/z;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/a0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2545,9 +2545,9 @@
     goto/16 :goto_2
 
     :pswitch_18
-    new-instance v0, Lf/a/d/a/y;
+    new-instance v0, Lf/a/d/a/z;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/y;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/z;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2647,9 +2647,9 @@
     goto :goto_2
 
     :pswitch_22
-    new-instance v0, Lf/a/d/a/a0;
+    new-instance v0, Lf/a/d/a/b0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/a0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/b0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2660,9 +2660,9 @@
     goto :goto_2
 
     :pswitch_23
-    new-instance v0, Lf/a/d/a/v;
+    new-instance v0, Lf/a/d/a/w;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/v;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/w;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -4943,7 +4943,7 @@
     return v3
 .end method
 
-.method public hydrate(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;)Lcom/discord/models/domain/ModelGuild;
+.method public hydrate(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;)Lcom/discord/models/domain/ModelGuild;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -4957,6 +4957,13 @@
             ">;",
             "Ljava/util/Collection<",
             "Lcom/discord/models/domain/ModelGuildRole;",
+            ">;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelGuildMember;",
             ">;)",
             "Lcom/discord/models/domain/ModelGuild;"
         }
@@ -5189,6 +5196,16 @@
     iput-object p1, v0, Lcom/discord/models/domain/ModelGuild;->roles:Ljava/util/List;
 
     :cond_6
+    if-eqz p5, :cond_7
+
+    iput-object p5, v0, Lcom/discord/models/domain/ModelGuild;->presences:Ljava/util/List;
+
+    :cond_7
+    if-eqz p6, :cond_8
+
+    iput-object p6, v0, Lcom/discord/models/domain/ModelGuild;->members:Ljava/util/Map;
+
+    :cond_8
     return-object v0
 .end method
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildFolder$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildFolder$Parser.smali
index bdf7b36e5d..4c14f17676 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildFolder$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildFolder$Parser.smali
@@ -54,89 +54,77 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildFolder;
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v10, Lcom/discord/models/domain/ModelGuildFolder$Parser$parse$1;
 
-    invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v1, v10
 
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v11, Lcom/discord/models/domain/ModelGuildFolder$Parser$parse$1;
-
-    move-object v1, v11
-
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v3, p1
 
-    move-object v4, v8
+    move-object v4, v7
 
-    move-object v5, v9
+    move-object v5, v8
 
-    move-object v6, v10
+    move-object v6, v9
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelGuildFolder$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v11}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildFolder;
 
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Long;
+
     iget-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Long;
+    check-cast v1, Ljava/util/List;
+
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iget-object v2, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v2, Ljava/util/List;
+    check-cast v2, Ljava/lang/Integer;
 
-    if-eqz v2, :cond_0
-
-    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Integer;
-
-    iget-object v3, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v3, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/String;
 
-    invoke-direct {p1, v1, v2, v0, v3}, Lcom/discord/models/domain/ModelGuildFolder;-><init>(Ljava/lang/Long;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
+    invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/models/domain/ModelGuildFolder;-><init>(Ljava/lang/Long;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildFolder.smali b/com.discord/smali/com/discord/models/domain/ModelGuildFolder.smali
index 6572cfc7bf..ac617151bc 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildFolder.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildFolder.smali
@@ -31,7 +31,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Long;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -45,7 +45,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildIds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,15 +60,6 @@
     iput-object p4, p0, Lcom/discord/models/domain/ModelGuildFolder;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/Long;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -189,22 +182,15 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildIds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildFolder;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/domain/ModelGuildFolder;-><init>(Ljava/lang/Long;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -222,7 +208,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildFolder;->id:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -232,7 +218,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildFolder;->guildIds:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -242,7 +228,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildFolder;->color:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -252,7 +238,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildFolder;->name:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash$Parser.smali
index 733ccf9b2d..509fa8e42f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash$Parser.smali
@@ -56,15 +56,15 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildHash$GuildHash;
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lkotlin/jvm/internal/Ref$BooleanRef;
 
@@ -76,17 +76,17 @@
 
     new-instance v4, Lcom/discord/models/domain/ModelGuildHash$GuildHash$Parser$parse$1;
 
-    invoke-direct {v4, v1, p1, v2}, Lcom/discord/models/domain/ModelGuildHash$GuildHash$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$BooleanRef;)V
+    invoke-direct {v4, v0, p1, v2}, Lcom/discord/models/domain/ModelGuildHash$GuildHash$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$BooleanRef;)V
 
     invoke-virtual {p1, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
-    iget-object p1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object p1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast p1, Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
@@ -101,34 +101,20 @@
     goto :goto_0
 
     :cond_2
-    new-instance p1, Lcom/discord/models/domain/ModelGuildHash$GuildHash;
+    new-instance v1, Lcom/discord/models/domain/ModelGuildHash$GuildHash;
 
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object p1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/String;
+    check-cast p1, Ljava/lang/String;
 
-    if-eqz v1, :cond_3
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iget-boolean v0, v2, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
 
-    invoke-direct {p1, v1, v0}, Lcom/discord/models/domain/ModelGuildHash$GuildHash;-><init>(Ljava/lang/String;Z)V
-
-    move-object v0, p1
+    invoke-direct {v1, p1, v0}, Lcom/discord/models/domain/ModelGuildHash$GuildHash;-><init>(Ljava/lang/String;Z)V
 
     :goto_0
-    return-object v0
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash.smali b/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash.smali
index e9633eacf9..10973f8845 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildHash$GuildHash.smali
@@ -28,9 +28,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "hash"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,15 +41,6 @@
     iput-boolean p2, p0, Lcom/discord/models/domain/ModelGuildHash$GuildHash;->omitted:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "hash"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildHash$GuildHash;Ljava/lang/String;ZILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildHash$GuildHash;
@@ -95,22 +88,15 @@
 .method public final copy(Ljava/lang/String;Z)Lcom/discord/models/domain/ModelGuildHash$GuildHash;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "hash"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildHash$GuildHash;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelGuildHash$GuildHash;-><init>(Ljava/lang/String;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "hash"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -128,7 +114,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildHash$GuildHash;->hash:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser$parse$1.smali
index 70863f2af3..aa1cd83724 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser$parse$1.smali
@@ -112,7 +112,7 @@
     goto :goto_1
 
     :sswitch_1
-    const-string v0, "version"
+    const-string/jumbo v0, "version"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -189,6 +189,8 @@
     :goto_1
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x1ad284d1 -> :sswitch_3
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser.smali
index 2f1b81b425..2083b82017 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildHash$Parser.smali
@@ -48,27 +48,27 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildHash;
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v7, 0x0
 
-    iput-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v7, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v7, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v7, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v10, Lkotlin/jvm/internal/Ref$IntRef;
 
@@ -82,7 +82,7 @@
 
     move-object v1, v11
 
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v3, p1
 
@@ -102,31 +102,24 @@
 
     if-ne p1, v1, :cond_0
 
-    new-instance v0, Lcom/discord/models/domain/ModelGuildHash;
+    new-instance v7, Lcom/discord/models/domain/ModelGuildHash;
 
-    iget-object p1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object p1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast p1, Lcom/discord/models/domain/ModelGuildHash$GuildHash;
 
-    iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/models/domain/ModelGuildHash$GuildHash;
+
+    iget-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Lcom/discord/models/domain/ModelGuildHash$GuildHash;
 
-    iget-object v2, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    check-cast v2, Lcom/discord/models/domain/ModelGuildHash$GuildHash;
-
-    invoke-direct {v0, p1, v1, v2}, Lcom/discord/models/domain/ModelGuildHash;-><init>(Lcom/discord/models/domain/ModelGuildHash$GuildHash;Lcom/discord/models/domain/ModelGuildHash$GuildHash;Lcom/discord/models/domain/ModelGuildHash$GuildHash;)V
+    invoke-direct {v7, p1, v0, v1}, Lcom/discord/models/domain/ModelGuildHash;-><init>(Lcom/discord/models/domain/ModelGuildHash$GuildHash;Lcom/discord/models/domain/ModelGuildHash$GuildHash;Lcom/discord/models/domain/ModelGuildHash$GuildHash;)V
 
     :cond_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v7
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildHash.smali b/com.discord/smali/com/discord/models/domain/ModelGuildHash.smali
index 3e537b05d9..f341116814 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildHash.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildHash.smali
@@ -149,7 +149,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildHash;->metadataHash:Lcom/discord/models/domain/ModelGuildHash$GuildHash;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -159,7 +159,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildHash;->channelsHash:Lcom/discord/models/domain/ModelGuildHash$GuildHash;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -169,7 +169,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildHash;->rolesHash:Lcom/discord/models/domain/ModelGuildHash$GuildHash;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali
index b38e8863fb..40697ea6eb 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildIntegration.smali
@@ -59,7 +59,7 @@
 
     const-string v0, "twitch"
 
-    const-string v1, "youtube"
+    const-string/jumbo v1, "youtube"
 
     filled-new-array {v0, v1}, [Ljava/lang/String;
 
@@ -153,7 +153,7 @@
     goto :goto_1
 
     :sswitch_4
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -432,6 +432,8 @@
     :goto_2
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x67f0950f -> :sswitch_c
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali
index 614efa4b38..eb1464ce62 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMember$Chunk.smali
@@ -247,9 +247,9 @@
     goto :goto_2
 
     :cond_1
-    new-instance v0, Lf/a/d/a/g0;
+    new-instance v0, Lf/a/d/a/h0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/g0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/h0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -260,9 +260,9 @@
     goto :goto_2
 
     :cond_2
-    new-instance v0, Lf/a/d/a/e0;
+    new-instance v0, Lf/a/d/a/f0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/e0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/f0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -273,9 +273,9 @@
     goto :goto_2
 
     :cond_3
-    new-instance v0, Lf/a/d/a/f0;
+    new-instance v0, Lf/a/d/a/g0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/f0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/g0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali
index cdc6737623..a339170a81 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMember.smali
@@ -64,6 +64,8 @@
 
 .field public user:Lcom/discord/models/domain/ModelUser;
 
+.field public userId:Ljava/lang/Long;
+
 
 # direct methods
 .method public static constructor <clinit>()V
@@ -134,6 +136,56 @@
     return-void
 .end method
 
+.method public constructor <init>(Lcom/discord/models/domain/ModelGuildMember;)V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->joinedAtMillis:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iget-wide v0, p1, Lcom/discord/models/domain/ModelGuildMember;->id:J
+
+    iput-wide v0, p0, Lcom/discord/models/domain/ModelGuildMember;->id:J
+
+    iget-wide v0, p1, Lcom/discord/models/domain/ModelGuildMember;->guildId:J
+
+    iput-wide v0, p0, Lcom/discord/models/domain/ModelGuildMember;->guildId:J
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelGuildMember;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelGuildMember;->userId:Ljava/lang/Long;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->userId:Ljava/lang/Long;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelGuildMember;->roles:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->roles:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelGuildMember;->nick:Ljava/lang/String;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->nick:Ljava/lang/String;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelGuildMember;->joinedAt:Ljava/lang/String;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->joinedAt:Ljava/lang/String;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelGuildMember;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->presence:Lcom/discord/models/domain/ModelPresence;
+
+    iget-object p1, p1, Lcom/discord/models/domain/ModelGuildMember;->premiumSince:Ljava/lang/String;
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelGuildMember;->premiumSince:Ljava/lang/String;
+
+    return-void
+.end method
+
 .method public static synthetic access$000()Ljava/util/List;
     .locals 1
 
@@ -290,7 +342,7 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x3
+    const/4 v0, 0x4
 
     goto :goto_1
 
@@ -303,12 +355,12 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x7
+    const/16 v0, 0x8
 
     goto :goto_1
 
     :sswitch_2
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -329,7 +381,7 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x4
+    const/4 v0, 0x5
 
     goto :goto_1
 
@@ -347,7 +399,7 @@
     goto :goto_1
 
     :sswitch_5
-    const-string v1, "joined_at"
+    const-string/jumbo v1, "user_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -355,12 +407,12 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v0, 0x5
+    const/4 v0, 0x3
 
     goto :goto_1
 
     :sswitch_6
-    const-string v1, "presence"
+    const-string v1, "joined_at"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -373,6 +425,19 @@
     goto :goto_1
 
     :sswitch_7
+    const-string v1, "presence"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x7
+
+    goto :goto_1
+
+    :sswitch_8
     const-string v1, "guild_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -443,9 +508,9 @@
     :pswitch_4
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/e1;
+    new-instance v0, Lf/a/d/a/l1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/e1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/l1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -456,6 +521,15 @@
     goto :goto_2
 
     :pswitch_5
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelGuildMember;->userId:Ljava/lang/Long;
+
+    goto :goto_2
+
+    :pswitch_6
     new-instance v0, Lcom/discord/models/domain/ModelUser;
 
     invoke-direct {v0}, Lcom/discord/models/domain/ModelUser;-><init>()V
@@ -470,7 +544,7 @@
 
     goto :goto_2
 
-    :pswitch_6
+    :pswitch_7
     iget-wide v0, p0, Lcom/discord/models/domain/ModelGuildMember;->guildId:J
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -481,7 +555,7 @@
 
     goto :goto_2
 
-    :pswitch_7
+    :pswitch_8
     iget-wide v0, p0, Lcom/discord/models/domain/ModelGuildMember;->id:J
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -497,9 +571,10 @@
 
     :sswitch_data_0
     .sparse-switch
-        -0x4de03319 -> :sswitch_7
-        -0x4c186305 -> :sswitch_6
-        -0x1d260717 -> :sswitch_5
+        -0x4de03319 -> :sswitch_8
+        -0x4c186305 -> :sswitch_7
+        -0x1d260717 -> :sswitch_6
+        -0x8c511f1 -> :sswitch_5
         0xd1b -> :sswitch_4
         0x339763 -> :sswitch_3
         0x36ebcb -> :sswitch_2
@@ -509,6 +584,7 @@
 
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_8
         :pswitch_7
         :pswitch_6
         :pswitch_5
@@ -613,11 +689,11 @@
     return v2
 
     :cond_6
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getUserId()Ljava/lang/Long;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getUserId()Ljava/lang/Long;
 
     move-result-object v3
 
@@ -638,11 +714,11 @@
     return v2
 
     :cond_8
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getNick()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getNick()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
 
     move-result-object v3
 
@@ -663,6 +739,31 @@
     return v2
 
     :cond_a
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getNick()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getNick()Ljava/lang/String;
+
+    move-result-object v3
+
+    if-nez v1, :cond_b
+
+    if-eqz v3, :cond_c
+
+    goto :goto_3
+
+    :cond_b
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_c
+
+    :goto_3
+    return v2
+
+    :cond_c
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getJoinedAt()J
 
     move-result-wide v3
@@ -673,11 +774,11 @@
 
     cmp-long v1, v3, v5
 
-    if-eqz v1, :cond_b
+    if-eqz v1, :cond_d
 
     return v2
 
-    :cond_b
+    :cond_d
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v1
@@ -686,31 +787,6 @@
 
     move-result-object v3
 
-    if-nez v1, :cond_c
-
-    if-eqz v3, :cond_d
-
-    goto :goto_3
-
-    :cond_c
-    invoke-virtual {v1, v3}, Lcom/discord/models/domain/ModelPresence;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_d
-
-    :goto_3
-    return v2
-
-    :cond_d
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getPremiumSince()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getPremiumSince()Ljava/lang/String;
-
-    move-result-object v3
-
     if-nez v1, :cond_e
 
     if-eqz v3, :cond_f
@@ -718,7 +794,7 @@
     goto :goto_4
 
     :cond_e
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v3}, Lcom/discord/models/domain/ModelPresence;->equals(Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -728,6 +804,31 @@
     return v2
 
     :cond_f
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getPremiumSince()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getPremiumSince()Ljava/lang/String;
+
+    move-result-object v3
+
+    if-nez v1, :cond_10
+
+    if-eqz v3, :cond_11
+
+    goto :goto_5
+
+    :cond_10
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_11
+
+    :goto_5
+    return v2
+
+    :cond_11
     invoke-direct {p0}, Lcom/discord/models/domain/ModelGuildMember;->getJoinedAtMillis()J
 
     move-result-wide v3
@@ -738,11 +839,11 @@
 
     cmp-long p1, v3, v5
 
-    if-eqz p1, :cond_10
+    if-eqz p1, :cond_12
 
     return v2
 
-    :cond_10
+    :cond_12
     return v0
 .end method
 
@@ -828,6 +929,14 @@
     return-object v0
 .end method
 
+.method public getUserId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->userId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
 .method public hashCode()I
     .locals 9
 
@@ -883,7 +992,7 @@
     :goto_0
     add-int/2addr v1, v3
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getUserId()Ljava/lang/Long;
 
     move-result-object v3
 
@@ -903,7 +1012,7 @@
     :goto_1
     add-int/2addr v1, v3
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getNick()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
 
     move-result-object v3
 
@@ -923,6 +1032,26 @@
     :goto_2
     add-int/2addr v1, v3
 
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getNick()Ljava/lang/String;
+
+    move-result-object v3
+
+    mul-int/lit8 v1, v1, 0x3b
+
+    if-nez v3, :cond_3
+
+    const/16 v3, 0x2b
+
+    goto :goto_3
+
+    :cond_3
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    :goto_3
+    add-int/2addr v1, v3
+
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getJoinedAt()J
 
     move-result-wide v5
@@ -943,18 +1072,18 @@
 
     mul-int/lit8 v1, v1, 0x3b
 
-    if-nez v3, :cond_3
+    if-nez v3, :cond_4
 
     const/16 v3, 0x2b
 
-    goto :goto_3
+    goto :goto_4
 
-    :cond_3
+    :cond_4
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->hashCode()I
 
     move-result v3
 
-    :goto_3
+    :goto_4
     add-int/2addr v1, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getPremiumSince()Ljava/lang/String;
@@ -963,16 +1092,16 @@
 
     mul-int/lit8 v1, v1, 0x3b
 
-    if-nez v3, :cond_4
+    if-nez v3, :cond_5
 
-    goto :goto_4
+    goto :goto_5
 
-    :cond_4
+    :cond_5
     invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
 
     move-result v4
 
-    :goto_4
+    :goto_5
     add-int/2addr v1, v4
 
     invoke-direct {p0}, Lcom/discord/models/domain/ModelGuildMember;->getJoinedAtMillis()J
@@ -992,6 +1121,47 @@
     return v1
 .end method
 
+.method public hydrate(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuildMember;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelGuildMember;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelGuildMember;->userId:Ljava/lang/Long;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lcom/discord/models/domain/ModelGuildMember;
+
+    invoke-direct {v0, p0}, Lcom/discord/models/domain/ModelGuildMember;-><init>(Lcom/discord/models/domain/ModelGuildMember;)V
+
+    iget-object v1, v0, Lcom/discord/models/domain/ModelGuildMember;->userId:Ljava/lang/Long;
+
+    invoke-interface {p1, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    iput-object p1, v0, Lcom/discord/models/domain/ModelGuildMember;->user:Lcom/discord/models/domain/ModelUser;
+
+    const/4 p1, 0x0
+
+    iput-object p1, v0, Lcom/discord/models/domain/ModelGuildMember;->userId:Ljava/lang/Long;
+
+    return-object v0
+
+    :cond_0
+    return-object p0
+.end method
+
 .method public toString()Ljava/lang/String;
     .locals 4
 
@@ -1027,6 +1197,16 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", userId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildMember;->getUserId()Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
     const-string v1, ", roles="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali
index 79593b12af..e39eb1c7dd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.smali
@@ -105,7 +105,7 @@
 
     const-string v1, "reader.nextIntOrNull()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -136,7 +136,7 @@
 
     const-string v1, "reader.nextString(\"\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali
index 55994be95a..f32077d0ef 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser.smali
@@ -56,7 +56,9 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lkotlin/jvm/internal/Ref$IntRef;
 
@@ -91,15 +93,6 @@
     invoke-direct {p1, v1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;-><init>(Ljava/lang/String;I)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali
index 5ac921f6f4..86d76251ba 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Group.smali
@@ -33,7 +33,9 @@
 .method public constructor <init>(Ljava/lang/String;I)V
     .locals 1
 
-    if-eqz p1, :cond_3
+    const-string v0, "id"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -89,15 +91,6 @@
     iput-object p1, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;->type:Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group$Type;
 
     return-void
-
-    :cond_3
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;Ljava/lang/String;IILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
@@ -145,22 +138,15 @@
 .method public final copy(Ljava/lang/String;I)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "id"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;-><init>(Ljava/lang/String;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -178,7 +164,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali
index e8ded4f76c..bc241c8847 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "item"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x2
 
@@ -37,13 +39,6 @@
     iput-object p2, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;->item:Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;
@@ -95,22 +90,15 @@
 .method public final copy(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -138,7 +126,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali
index 7233810761..d0dcf222e6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate.smali
@@ -22,9 +22,11 @@
 .method public constructor <init>(Lkotlin/ranges/IntRange;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "range"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x3
 
@@ -33,13 +35,6 @@
     iput-object p1, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;->range:Lkotlin/ranges/IntRange;
 
     return-void
-
-    :cond_0
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;Lkotlin/ranges/IntRange;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;
@@ -72,22 +67,15 @@
 .method public final copy(Lkotlin/ranges/IntRange;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "range"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;-><init>(Lkotlin/ranges/IntRange;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -105,7 +93,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;->range:Lkotlin/ranges/IntRange;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali
index 3b17400626..12fa12f08d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "group"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;->group:Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
 
     return-void
-
-    :cond_0
-    const-string p1, "group"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "group"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;-><init>(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "group"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;->group:Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali
index acd277f032..a8ad9fab3e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuildMember;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "member"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;->member:Lcom/discord/models/domain/ModelGuildMember;
 
     return-void
-
-    :cond_0
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;Lcom/discord/models/domain/ModelGuildMember;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuildMember;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "member"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;-><init>(Lcom/discord/models/domain/ModelGuildMember;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;->member:Lcom/discord/models/domain/ModelGuildMember;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali
index 8bd7f4f383..d4508ce7ac 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser.smali
@@ -54,79 +54,69 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v3, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1;
+    new-instance v1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1;
 
-    invoke-direct {v3, v1, p1, v2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    invoke-direct {v1, v0, p1, v2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v3}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     iget-object p1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    move-object v2, p1
+    move-object v1, p1
 
-    check-cast v2, Lcom/discord/models/domain/ModelGuildMember;
+    check-cast v1, Lcom/discord/models/domain/ModelGuildMember;
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_0
 
-    new-instance v1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
+    new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
 
     check-cast p1, Lcom/discord/models/domain/ModelGuildMember;
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-direct {v1, p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;-><init>(Lcom/discord/models/domain/ModelGuildMember;)V
+    invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;-><init>(Lcom/discord/models/domain/ModelGuildMember;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    iget-object p1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    throw v0
+    move-object v0, p1
 
-    :cond_1
-    iget-object p1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    check-cast v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
 
-    move-object v1, p1
+    if-eqz v0, :cond_1
 
-    check-cast v1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
-
-    if-eqz v1, :cond_3
-
-    new-instance v1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
+    new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
 
     check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
 
-    if-eqz p1, :cond_2
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-direct {v1, p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;-><init>(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)V
+    invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;-><init>(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)V
 
     :goto_0
-    return-object v1
+    return-object v0
 
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
+    :cond_1
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const-string v0, "either member or group must be present."
@@ -134,13 +124,6 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_4
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali
index 5c2c3ff383..df8d2c3517 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1.smali
@@ -123,7 +123,7 @@
 
     const-string v3, "it[0]"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Ljava/lang/Number;
 
@@ -139,7 +139,7 @@
 
     const-string v3, "it[1]"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Ljava/lang/Number;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali
index 69a719b892..7fa8eac71b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser.smali
@@ -54,67 +54,67 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;
-    .locals 14
+    .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v12, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1;
 
-    invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v1, v12
 
-    iput-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v13, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1;
-
-    move-object v1, v13
-
-    move-object v2, v8
+    move-object v2, v0
 
     move-object v3, p1
 
-    move-object v4, v9
+    move-object v4, v8
 
-    move-object v5, v11
+    move-object v5, v10
 
-    move-object v6, v10
+    move-object v6, v9
 
-    move-object v7, v12
+    move-object v7, v11
 
     invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v13}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v12}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
-    iget-object p1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object p1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast p1, Ljava/lang/String;
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
@@ -131,28 +131,23 @@
 
     move-result p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_0
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete;
 
-    iget-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Integer;
+    check-cast v0, Ljava/lang/Integer;
 
-    if-eqz v1, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
 
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Delete;-><init>(I)V
 
-    goto/16 :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
+    goto :goto_0
 
     :sswitch_1
     const-string v1, "SYNC"
@@ -161,36 +156,26 @@
 
     move-result p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_0
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;
 
+    iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Lkotlin/ranges/IntRange;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
     iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Lkotlin/ranges/IntRange;
+    check-cast v1, Ljava/util/List;
 
-    if-eqz v1, :cond_2
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget-object v2, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    check-cast v2, Ljava/util/List;
-
-    if-eqz v2, :cond_1
-
-    invoke-direct {p1, v1, v2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;-><init>(Lkotlin/ranges/IntRange;Ljava/util/List;)V
+    invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;-><init>(Lkotlin/ranges/IntRange;Ljava/util/List;)V
 
     goto :goto_0
 
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
     :sswitch_2
     const-string v1, "INVALIDATE"
 
@@ -198,25 +183,20 @@
 
     move-result p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_0
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;
 
-    iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Lkotlin/ranges/IntRange;
+    check-cast v0, Lkotlin/ranges/IntRange;
 
-    if-eqz v1, :cond_3
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-direct {p1, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;-><init>(Lkotlin/ranges/IntRange;)V
+    invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Invalidate;-><init>(Lkotlin/ranges/IntRange;)V
 
     goto :goto_0
 
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
     :sswitch_3
     const-string v1, "UPDATE"
 
@@ -224,40 +204,30 @@
 
     move-result p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_0
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;
 
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Integer;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
     iget-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Integer;
+    check-cast v1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
 
-    if-eqz v1, :cond_5
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
-
-    iget-object v2, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    check-cast v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
-
-    if-eqz v2, :cond_4
-
-    invoke-direct {p1, v1, v2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
+    invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
 
     goto :goto_0
 
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
     :sswitch_4
     const-string v1, "INSERT"
 
@@ -265,58 +235,48 @@
 
     move-result p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_0
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;
 
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Integer;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
     iget-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Integer;
+    check-cast v1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
 
-    if-eqz v1, :cond_7
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
-
-    iget-object v2, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    check-cast v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
-
-    if-eqz v2, :cond_6
-
-    invoke-direct {p1, v1, v2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
+    invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Insert;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
 
     :goto_0
     return-object p1
 
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_8
+    :cond_0
     :goto_1
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    const-string v0, "Invalid operation type: "
+    const-string v1, "Invalid operation type: "
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    move-result-object v1
 
-    iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/String;
+    check-cast v0, Ljava/lang/String;
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
@@ -324,13 +284,6 @@
 
     throw p1
 
-    :cond_9
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
     :sswitch_data_0
     .sparse-switch
         -0x7efc4947 -> :sswitch_4
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali
index 005cf46f42..cc3c10bb67 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync.smali
@@ -42,12 +42,16 @@
         }
     .end annotation
 
+    const-string v0, "range"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "items"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     const/4 v1, 0x1
 
     invoke-direct {p0, v0, p2, v1, v0}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation;-><init>(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -57,20 +61,6 @@
     iput-object p2, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;Lkotlin/ranges/IntRange;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;
@@ -141,31 +131,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "range"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;-><init>(Lkotlin/ranges/IntRange;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -183,7 +161,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;->range:Lkotlin/ranges/IntRange;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -197,7 +175,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali
index 8c2d1c7bba..8ba0eae001 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "item"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x2
 
@@ -37,13 +39,6 @@
     iput-object p2, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;->item:Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;
@@ -95,22 +90,15 @@
 .method public final copy(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Update;-><init>(ILcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -138,7 +126,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
index eb15216d5e..84649a94de 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate$Parser.smali
@@ -54,123 +54,101 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMemberListUpdate;
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v10, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1;
 
-    invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v1, v10
 
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v11, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1;
-
-    move-object v1, v11
-
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v3, p1
 
-    move-object v4, v8
+    move-object v4, v7
 
-    move-object v5, v9
+    move-object v5, v8
 
-    move-object v6, v10
+    move-object v6, v9
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v11}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate;
 
-    iget-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/Long;
 
-    if-eqz v1, :cond_3
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v2
 
-    iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/String;
+    check-cast v0, Ljava/lang/String;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const-string v1, "everyone"
+    const-string v0, "everyone"
 
     :goto_0
-    move-object v4, v1
+    move-object v4, v0
 
-    iget-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    move-object v5, v1
+    move-object v5, v0
 
     check-cast v5, Ljava/util/List;
 
-    if-eqz v5, :cond_2
+    invoke-static {v5}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget-object v1, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    move-object v6, v1
+    move-object v6, v0
 
     check-cast v6, Ljava/util/List;
 
-    if-eqz v6, :cond_1
+    invoke-static {v6}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     move-object v1, p1
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelGuildMemberListUpdate;-><init>(JLjava/lang/String;Ljava/util/List;Ljava/util/List;)V
 
     return-object p1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali
index 75a398e521..02077c0adf 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildMemberListUpdate.smali
@@ -77,13 +77,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "operations"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "groups"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -96,27 +100,6 @@
     iput-object p5, p0, Lcom/discord/models/domain/ModelGuildMemberListUpdate;->groups:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "groups"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "operations"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildMemberListUpdate;JLjava/lang/String;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildMemberListUpdate;
@@ -234,13 +217,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "operations"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "groups"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildMemberListUpdate;
 
@@ -257,27 +244,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelGuildMemberListUpdate;-><init>(JLjava/lang/String;Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "groups"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "operations"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -303,7 +269,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -313,7 +279,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate;->operations:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -323,7 +289,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate;->groups:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildPreview.smali b/com.discord/smali/com/discord/models/domain/ModelGuildPreview.smali
index 85bd7b6d33..06bef23f44 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildPreview.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildPreview.smali
@@ -64,13 +64,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_1
+    const-string v0, "emojis"
 
-    if-eqz p11, :cond_0
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "features"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -95,27 +99,6 @@
     iput-object p11, p0, Lcom/discord/models/domain/ModelGuildPreview;->features:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "features"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final calculatedFeatures()Ljava/util/Set;
@@ -167,7 +150,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v1}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v1}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v0
 
@@ -449,13 +432,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p3, :cond_2
+    move-object/from16 v4, p3
 
-    if-eqz p10, :cond_1
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_0
+    const-string v0, "emojis"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "features"
+
+    move-object/from16 v12, p11
+
+    invoke-static {v12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildPreview;
 
@@ -463,8 +456,6 @@
 
     move-wide v2, p1
 
-    move-object/from16 v4, p3
-
     move-object/from16 v5, p4
 
     move-object/from16 v6, p5
@@ -477,34 +468,9 @@
 
     move-object/from16 v10, p9
 
-    move-object/from16 v11, p10
-
-    move-object/from16 v12, p11
-
     invoke-direct/range {v1 .. v12}, Lcom/discord/models/domain/ModelGuildPreview;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "features"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "emojis"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -530,7 +496,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -540,7 +506,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->description:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -550,7 +516,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->splash:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -560,7 +526,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->banner:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -570,7 +536,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->icon:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -580,7 +546,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->approximatePresenceCount:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -590,7 +556,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->approximateMemberCount:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -600,7 +566,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildPreview;->emojis:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -610,7 +576,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildPreview;->features:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -914,7 +880,7 @@
 
     const-string v1, "ModelGuild.computeShortName(name)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildTemplate.smali b/com.discord/smali/com/discord/models/domain/ModelGuildTemplate.smali
index ee997e3e09..7aceccced9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildTemplate.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildTemplate.smali
@@ -29,17 +29,25 @@
 .method public constructor <init>(JLcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelGuild;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "createdAt"
 
-    if-eqz p7, :cond_4
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_3
+    const-string/jumbo v0, "updatedAt"
 
-    if-eqz p10, :cond_2
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_1
+    const-string v0, "code"
 
-    if-eqz p12, :cond_0
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "name"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "description"
+
+    invoke-static {p12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -64,41 +72,6 @@
     iput-object p12, p0, Lcom/discord/models/domain/ModelGuildTemplate;->description:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "description"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "updatedAt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "createdAt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelGuildTemplate;JLcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelGuild;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelGuildTemplate;
@@ -340,17 +313,35 @@
 .method public final copy(JLcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelGuild;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/ModelGuildTemplate;
     .locals 14
 
-    const/4 v0, 0x0
+    const-string v0, "createdAt"
 
-    if-eqz p7, :cond_4
+    move-object/from16 v8, p7
 
-    if-eqz p8, :cond_3
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_2
+    const-string/jumbo v0, "updatedAt"
 
-    if-eqz p11, :cond_1
+    move-object/from16 v9, p8
 
-    if-eqz p12, :cond_0
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "code"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "name"
+
+    move-object/from16 v12, p11
+
+    invoke-static {v12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "description"
+
+    move-object/from16 v13, p12
+
+    invoke-static {v13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelGuildTemplate;
 
@@ -364,56 +355,11 @@
 
     move-object/from16 v7, p6
 
-    move-object/from16 v8, p7
-
-    move-object/from16 v9, p8
-
     move/from16 v10, p9
 
-    move-object/from16 v11, p10
-
-    move-object/from16 v12, p11
-
-    move-object/from16 v13, p12
-
     invoke-direct/range {v1 .. v13}, Lcom/discord/models/domain/ModelGuildTemplate;-><init>(JLcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelGuild;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "description"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "code"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "updatedAt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "createdAt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -439,7 +385,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildTemplate;->creator:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -457,7 +403,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildTemplate;->serializedSourceGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -467,7 +413,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildTemplate;->createdAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -477,7 +423,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildTemplate;->updatedAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -493,7 +439,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildTemplate;->code:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -503,7 +449,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildTemplate;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -513,7 +459,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildTemplate;->description:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel$Parser.smali
index 50447438b0..4a529fe83c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel$Parser.smali
@@ -48,71 +48,73 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildWelcomeChannel;
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v7, Lkotlin/jvm/internal/Ref$LongRef;
+    new-instance v0, Lkotlin/jvm/internal/Ref$LongRef;
 
-    invoke-direct {v7}, Lkotlin/jvm/internal/Ref$LongRef;-><init>()V
+    invoke-direct {v0}, Lkotlin/jvm/internal/Ref$LongRef;-><init>()V
 
     const-wide/16 v1, 0x0
 
-    iput-wide v1, v7, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+    iput-wide v1, v0, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+
+    new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    const/4 v1, 0x0
+
+    iput-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v10, Lcom/discord/models/domain/ModelGuildWelcomeChannel$Parser$parse$1;
 
-    invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v1, v10
 
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v0, Lcom/discord/models/domain/ModelGuildWelcomeChannel$Parser$parse$1;
-
-    move-object v1, v0
-
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v3, p1
 
-    move-object v4, v8
+    move-object v4, v7
 
-    move-object v5, v9
+    move-object v5, v8
 
-    move-object v6, v10
+    move-object v6, v9
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelGuildWelcomeChannel$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$LongRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildWelcomeChannel;
 
-    iget-wide v2, v7, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+    iget-wide v2, v0, Lkotlin/jvm/internal/Ref$LongRef;->element:J
 
-    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object v4, v0
 
     check-cast v4, Ljava/lang/String;
 
-    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object v5, v0
 
     check-cast v5, Ljava/lang/Long;
 
-    iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object v6, v0
 
@@ -123,13 +125,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelGuildWelcomeChannel;-><init>(JLjava/lang/String;Ljava/lang/Long;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel.smali b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel.smali
index 74415b9840..37c92d887a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeChannel.smali
@@ -193,7 +193,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->description:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -203,7 +203,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->emojiId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -213,7 +213,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->emojiName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1.smali
index 62cb01a858..871e0ff777 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1.smali
@@ -87,7 +87,7 @@
     goto :goto_0
 
     :cond_1
-    const-string v0, "welcome_channels"
+    const-string/jumbo v0, "welcome_channels"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser.smali
index 2fde537d77..d2d5cfa0df 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen$Parser.smali
@@ -48,31 +48,31 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildWelcomeScreen;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v0, Lcom/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1;
+    new-instance v1, Lcom/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1;
 
-    invoke-direct {v0, v1, p1, v2}, Lcom/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    invoke-direct {v1, v0, p1, v2}, Lcom/discord/models/domain/ModelGuildWelcomeScreen$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelGuildWelcomeScreen;
 
-    iget-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -83,13 +83,6 @@
     invoke-direct {p1, v0, v1}, Lcom/discord/models/domain/ModelGuildWelcomeScreen;-><init>(Ljava/lang/String;Ljava/util/List;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen.smali b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen.smali
index ec7a0d555f..cecbb4ef9c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildWelcomeScreen.smali
@@ -162,7 +162,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelGuildWelcomeScreen;->description:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -172,7 +172,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelGuildWelcomeScreen;->welcomeChannels:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
index 5c89b52b93..28b676bc20 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication$Parser.smali
@@ -54,75 +54,73 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelLibraryApplication;
-    .locals 15
+    .locals 14
 
-    move-object/from16 v7, p1
+    const-string v0, "reader"
 
-    const/4 v8, 0x0
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    if-eqz v7, :cond_5
+    move-result-object v8
+
+    const/4 v0, 0x0
+
+    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v8, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v8, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v8, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v8, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v13, Lcom/discord/models/domain/ModelLibraryApplication$Parser$parse$1;
 
-    invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v0, v13
 
-    iput-object v8, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    move-object v1, v8
 
-    new-instance v14, Lcom/discord/models/domain/ModelLibraryApplication$Parser$parse$1;
+    move-object v2, p1
 
-    move-object v0, v14
+    move-object v3, v9
 
-    move-object v1, v9
+    move-object v4, v10
 
-    move-object/from16 v2, p1
+    move-object v5, v11
 
-    move-object v3, v10
-
-    move-object v4, v11
-
-    move-object v5, v12
-
-    move-object v6, v13
+    move-object v6, v12
 
     invoke-direct/range {v0 .. v6}, Lcom/discord/models/domain/ModelLibraryApplication$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {v7, v14}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v13}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
-    new-instance v14, Lcom/discord/models/domain/ModelLibraryApplication;
+    new-instance v13, Lcom/discord/models/domain/ModelLibraryApplication;
 
-    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object v1, v0
 
     check-cast v1, Lcom/discord/models/domain/ModelApplication;
 
-    if-eqz v1, :cond_4
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -136,7 +134,7 @@
     :goto_0
     move-object v2, v0
 
-    iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -154,7 +152,7 @@
     move-wide v5, v3
 
     :goto_1
-    iget-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -174,7 +172,7 @@
     const/4 v7, 0x0
 
     :goto_2
-    iget-object v0, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -187,7 +185,7 @@
     :cond_3
     move-wide v8, v3
 
-    move-object v0, v14
+    move-object v0, v13
 
     move-wide v3, v5
 
@@ -197,19 +195,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/models/domain/ModelLibraryApplication;-><init>(Lcom/discord/models/domain/ModelApplication;Ljava/lang/String;JIJ)V
 
-    return-object v14
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v8
-
-    :cond_5
-    const-string v0, "reader"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
+    return-object v13
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali
index db8e7651cd..373441640f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLibraryApplication.smali
@@ -27,11 +27,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelApplication;Ljava/lang/String;JIJ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "application"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "createdAt"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,20 +48,6 @@
     iput-wide p6, p0, Lcom/discord/models/domain/ModelLibraryApplication;->branchId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "createdAt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelLibraryApplication;Lcom/discord/models/domain/ModelApplication;Ljava/lang/String;JIJILjava/lang/Object;)Lcom/discord/models/domain/ModelLibraryApplication;
@@ -172,20 +160,22 @@
 .method public final copy(Lcom/discord/models/domain/ModelApplication;Ljava/lang/String;JIJ)Lcom/discord/models/domain/ModelLibraryApplication;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "application"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "createdAt"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelLibraryApplication;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move-wide v4, p3
 
     move v6, p5
@@ -195,20 +185,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/models/domain/ModelLibraryApplication;-><init>(Lcom/discord/models/domain/ModelApplication;Ljava/lang/String;JIJ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "createdAt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "application"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -226,7 +202,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelLibraryApplication;->application:Lcom/discord/models/domain/ModelApplication;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -236,7 +212,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelLibraryApplication;->createdAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelLocalizedString$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelLocalizedString$Parser.smali
index 072809ceee..d4a894129d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLocalizedString$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLocalizedString$Parser.smali
@@ -46,47 +46,35 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelLocalizedString;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v2, Lcom/discord/models/domain/ModelLocalizedString$Parser$parse$1;
+    new-instance v1, Lcom/discord/models/domain/ModelLocalizedString$Parser$parse$1;
 
-    invoke-direct {v2, v1, p1}, Lcom/discord/models/domain/ModelLocalizedString$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v1, v0, p1}, Lcom/discord/models/domain/ModelLocalizedString$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
 
-    invoke-virtual {p1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelLocalizedString;
 
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/String;
+    check-cast v0, Ljava/lang/String;
 
-    if-eqz v1, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-direct {p1, v1}, Lcom/discord/models/domain/ModelLocalizedString;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelLocalizedString;-><init>(Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelLocalizedString.smali b/com.discord/smali/com/discord/models/domain/ModelLocalizedString.smali
index c60d9df1b3..ef3bddcc5a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelLocalizedString.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelLocalizedString.smali
@@ -35,24 +35,17 @@
 .end method
 
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "default"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelLocalizedString;->default:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "default"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelLocalizedString;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelLocalizedString;
@@ -85,22 +78,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelLocalizedString;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "default"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelLocalizedString;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelLocalizedString;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "default"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -118,7 +104,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelLocalizedString;->default:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali b/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali
index b85cf8d259..84734a2099 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage$Call.smali
@@ -123,9 +123,9 @@
     :cond_4
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/e1;
+    new-instance v0, Lf/a/d/a/l1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/e1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/l1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali b/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali
index 50e725d20a..b6a71955e0 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage$Content.smali
@@ -142,9 +142,9 @@
     goto :goto_2
 
     :cond_3
-    new-instance v0, Lf/a/d/a/h0;
+    new-instance v0, Lf/a/d/a/i0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/h0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/i0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage.smali b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
index 995a763c61..0507b4d9b3 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
@@ -1607,7 +1607,7 @@
     goto/16 :goto_1
 
     :sswitch_4
-    const-string v1, "webhook_id"
+    const-string/jumbo v1, "webhook_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1906,9 +1906,9 @@
     goto/16 :goto_2
 
     :pswitch_0
-    new-instance v0, Lf/a/d/a/m0;
+    new-instance v0, Lf/a/d/a/n0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/m0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/n0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2013,13 +2013,13 @@
     goto/16 :goto_2
 
     :pswitch_9
-    new-instance v0, Lf/a/d/a/n0;
+    new-instance v0, Lf/a/d/a/o0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/n0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/o0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
-    sget-object v1, Lf/a/d/a/i0;->a:Lf/a/d/a/i0;
+    sget-object v1, Lf/a/d/a/j0;->a:Lf/a/d/a/j0;
 
-    sget-object v2, Lf/a/d/a/g1;->d:Lf/a/d/a/g1;
+    sget-object v2, Lf/a/d/a/n1;->d:Lf/a/d/a/n1;
 
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextListAsMap(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;Lcom/discord/models/domain/Model$JsonReader$KeySelector;Lrx/functions/Func0;)Ljava/util/Map;
 
@@ -2093,9 +2093,9 @@
     :pswitch_f
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/e1;
+    new-instance v0, Lf/a/d/a/l1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/e1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/l1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2106,9 +2106,9 @@
     goto :goto_2
 
     :pswitch_10
-    new-instance v0, Lf/a/d/a/l0;
+    new-instance v0, Lf/a/d/a/m0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/l0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/m0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2119,9 +2119,9 @@
     goto :goto_2
 
     :pswitch_11
-    new-instance v0, Lf/a/d/a/j0;
+    new-instance v0, Lf/a/d/a/k0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/j0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/k0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2156,9 +2156,9 @@
     goto :goto_2
 
     :pswitch_14
-    new-instance v0, Lf/a/d/a/k0;
+    new-instance v0, Lf/a/d/a/l0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/k0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/l0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -2218,8 +2218,6 @@
     :goto_2
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x7f5b87d8 -> :sswitch_19
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali b/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali
index f1b992cb0c..3bbbefa950 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageAttachment.smali
@@ -105,7 +105,7 @@
     goto :goto_0
 
     :sswitch_0
-    const-string v1, "width"
+    const-string/jumbo v1, "width"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -131,7 +131,7 @@
     goto :goto_1
 
     :sswitch_2
-    const-string v1, "url"
+    const-string/jumbo v1, "url"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali b/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali
index b5a54f8290..ca604a16a1 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageDelete.smali
@@ -161,9 +161,9 @@
     :cond_5
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/e1;
+    new-instance v0, Lf/a/d/a/l1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/e1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/l1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali
index c55e7708cd..bd2e08989a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Field.smali
@@ -71,7 +71,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "value"
+    const-string/jumbo v1, "value"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali
index aac1424c41..3d9b9535d9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed$Item.smali
@@ -120,7 +120,7 @@
     goto :goto_1
 
     :sswitch_1
-    const-string v1, "width"
+    const-string/jumbo v1, "width"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -159,7 +159,7 @@
     goto :goto_1
 
     :sswitch_4
-    const-string v1, "url"
+    const-string/jumbo v1, "url"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali
index 6f2d789bd8..0ab4ada10f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageEmbed.smali
@@ -150,7 +150,7 @@
 
     iput-object p2, p0, Lcom/discord/models/domain/ModelMessageEmbed;->thumbnail:Lcom/discord/models/domain/ModelMessageEmbed$Item;
 
-    const-string p1, "video"
+    const-string/jumbo p1, "video"
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelMessageEmbed;->type:Ljava/lang/String;
 
@@ -235,7 +235,7 @@
     goto/16 :goto_1
 
     :sswitch_1
-    const-string v1, "video"
+    const-string/jumbo v1, "video"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -313,7 +313,7 @@
     goto :goto_1
 
     :sswitch_7
-    const-string v1, "url"
+    const-string/jumbo v1, "url"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -547,9 +547,9 @@
     goto :goto_2
 
     :pswitch_a
-    new-instance v0, Lf/a/d/a/o0;
+    new-instance v0, Lf/a/d/a/p0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/o0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/p0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -1078,7 +1078,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "video"
+    const-string/jumbo v1, "video"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1165,7 +1165,7 @@
     goto :goto_0
 
     :sswitch_0
-    const-string v1, "video"
+    const-string/jumbo v1, "video"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1289,6 +1289,8 @@
 
     return-object v0
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x2ba7330a -> :sswitch_6
@@ -1819,7 +1821,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "video"
+    const-string/jumbo v1, "video"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1958,7 +1960,7 @@
 
     iget-object v0, p0, Lcom/discord/models/domain/ModelMessageEmbed;->type:Ljava/lang/String;
 
-    const-string v1, "video"
+    const-string/jumbo v1, "video"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali b/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali
index 96e2f92359..7dd7f4a1e6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessageReaction$Update.smali
@@ -94,7 +94,7 @@
     goto :goto_1
 
     :sswitch_1
-    const-string v1, "user_id"
+    const-string/jumbo v1, "user_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -198,8 +198,6 @@
     :goto_2
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x7315ce29 -> :sswitch_3
diff --git a/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali
index 5be0d67e57..57348cf105 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali
@@ -48,38 +48,31 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v0, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;
+    new-instance v1, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;
 
-    invoke-direct {v0, v1, p1}, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v1, v0, p1}, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelMuteConfig;
 
-    iget-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
     invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelMuteConfig;-><init>(Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali b/com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali
index 7b4dfe1218..285e00c1bf 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali
@@ -178,7 +178,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelMuteConfig;->endTimeMs:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -188,7 +188,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelNotificationSettings.smali b/com.discord/smali/com/discord/models/domain/ModelNotificationSettings.smali
index 1d0e9d401e..931583f860 100644
--- a/com.discord/smali/com/discord/models/domain/ModelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelNotificationSettings.smali
@@ -216,7 +216,7 @@
     goto :goto_1
 
     :sswitch_3
-    const-string v1, "version"
+    const-string/jumbo v1, "version"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -316,9 +316,9 @@
     goto :goto_2
 
     :pswitch_1
-    new-instance v0, Lf/a/d/a/p0;
+    new-instance v0, Lf/a/d/a/q0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/p0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/q0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -419,8 +419,6 @@
     :goto_2
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x7986afd8 -> :sswitch_8
diff --git a/com.discord/smali/com/discord/models/domain/ModelOAuth2Token.smali b/com.discord/smali/com/discord/models/domain/ModelOAuth2Token.smali
index 89eafd263b..da0fad7f5b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelOAuth2Token.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelOAuth2Token.smali
@@ -33,11 +33,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "scopes"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,20 +50,6 @@
     iput-object p4, p0, Lcom/discord/models/domain/ModelOAuth2Token;->application:Lcom/discord/models/domain/ModelApplication;
 
     return-void
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "scopes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelOAuth2Token;JLjava/util/List;Lcom/discord/models/domain/ModelApplication;ILjava/lang/Object;)Lcom/discord/models/domain/ModelOAuth2Token;
@@ -143,31 +131,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "scopes"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelOAuth2Token;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/domain/ModelOAuth2Token;-><init>(JLjava/util/List;Lcom/discord/models/domain/ModelApplication;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "scopes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -193,7 +169,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelOAuth2Token;->scopes:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -203,7 +179,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelOAuth2Token;->application:Lcom/discord/models/domain/ModelApplication;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali b/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali
index 2d414243b6..c944b08ebc 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPayload$Hello.smali
@@ -127,9 +127,9 @@
     goto :goto_2
 
     :cond_3
-    new-instance v0, Lf/a/d/a/t0;
+    new-instance v0, Lf/a/d/a/u0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/t0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/u0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPayload$MergedPresences.smali b/com.discord/smali/com/discord/models/domain/ModelPayload$MergedPresences.smali
new file mode 100644
index 0000000000..eaef138326
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelPayload$MergedPresences.smali
@@ -0,0 +1,422 @@
+.class public Lcom/discord/models/domain/ModelPayload$MergedPresences;
+.super Ljava/lang/Object;
+.source "ModelPayload.java"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/ModelPayload;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "MergedPresences"
+.end annotation
+
+
+# instance fields
+.field public friends:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public guilds:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static synthetic a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/models/domain/ModelPresence$Parser;->INSTANCE:Lcom/discord/models/domain/ModelPresence$Parser;
+
+    invoke-virtual {v0, p0}, Lcom/discord/models/domain/ModelPresence$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static synthetic access$000(Lcom/discord/models/domain/ModelPayload$MergedPresences;)Ljava/util/List;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/models/domain/ModelPayload$MergedPresences;->friends:Ljava/util/List;
+
+    return-object p0
+.end method
+
+.method public static synthetic access$100(Lcom/discord/models/domain/ModelPayload$MergedPresences;)Ljava/util/List;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/models/domain/ModelPayload$MergedPresences;->guilds:Ljava/util/List;
+
+    return-object p0
+.end method
+
+.method public static synthetic b(Lcom/discord/models/domain/Model$JsonReader;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lf/a/d/a/y0;
+
+    invoke-direct {v0, p0}, Lf/a/d/a/y0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static synthetic c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/models/domain/ModelPresence$Parser;->INSTANCE:Lcom/discord/models/domain/ModelPresence$Parser;
+
+    invoke-virtual {v0, p0}, Lcom/discord/models/domain/ModelPresence$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    const v2, -0x499abd20
+
+    const/4 v3, 0x1
+
+    if-eq v1, v2, :cond_1
+
+    const v2, -0x23c4b66b
+
+    if-eq v1, v2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "friends"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    const-string v1, "guilds"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    const/4 v0, -0x1
+
+    :goto_1
+    if-eqz v0, :cond_4
+
+    if-eq v0, v3, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
+
+    goto :goto_2
+
+    :cond_3
+    new-instance v0, Lf/a/d/a/w0;
+
+    invoke-direct {v0, p1}, Lf/a/d/a/w0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload$MergedPresences;->guilds:Ljava/util/List;
+
+    goto :goto_2
+
+    :cond_4
+    new-instance v0, Lf/a/d/a/x0;
+
+    invoke-direct {v0, p1}, Lf/a/d/a/x0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload$MergedPresences;->friends:Ljava/util/List;
+
+    :goto_2
+    return-void
+.end method
+
+.method public canEqual(Ljava/lang/Object;)Z
+    .locals 0
+
+    instance-of p1, p1, Lcom/discord/models/domain/ModelPayload$MergedPresences;
+
+    return p1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lcom/discord/models/domain/ModelPayload$MergedPresences;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_1
+
+    return v2
+
+    :cond_1
+    check-cast p1, Lcom/discord/models/domain/ModelPayload$MergedPresences;
+
+    invoke-virtual {p1, p0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->canEqual(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    return v2
+
+    :cond_2
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getFriends()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getFriends()Ljava/util/List;
+
+    move-result-object v3
+
+    if-nez v1, :cond_3
+
+    if-eqz v3, :cond_4
+
+    goto :goto_0
+
+    :cond_3
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_4
+
+    :goto_0
+    return v2
+
+    :cond_4
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getGuilds()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getGuilds()Ljava/util/List;
+
+    move-result-object p1
+
+    if-nez v1, :cond_5
+
+    if-eqz p1, :cond_6
+
+    goto :goto_1
+
+    :cond_5
+    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_6
+
+    :goto_1
+    return v2
+
+    :cond_6
+    return v0
+.end method
+
+.method public getFriends()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPayload$MergedPresences;->friends:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public getGuilds()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPayload$MergedPresences;->guilds:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getFriends()Ljava/util/List;
+
+    move-result-object v0
+
+    const/16 v1, 0x2b
+
+    if-nez v0, :cond_0
+
+    const/16 v0, 0x2b
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    :goto_0
+    const/16 v2, 0x3b
+
+    add-int/2addr v0, v2
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getGuilds()Ljava/util/List;
+
+    move-result-object v3
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :goto_1
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "ModelPayload.MergedPresences(friends="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getFriends()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guilds="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->getGuilds()Ljava/util/List;
+
+    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;
+
+    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/models/domain/ModelPayload$VersionedModel.smali b/com.discord/smali/com/discord/models/domain/ModelPayload$VersionedModel.smali
index 53c7a15bbb..c04827818b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPayload$VersionedModel.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPayload$VersionedModel.smali
@@ -109,7 +109,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "version"
+    const-string/jumbo v1, "version"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -174,9 +174,9 @@
     goto :goto_2
 
     :cond_5
-    new-instance v0, Lf/a/d/a/w0;
+    new-instance v0, Lf/a/d/a/d1;
 
-    invoke-direct {v0, p0, p1}, Lf/a/d/a/w0;-><init>(Lcom/discord/models/domain/ModelPayload$VersionedModel;Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p0, p1}, Lf/a/d/a/d1;-><init>(Lcom/discord/models/domain/ModelPayload$VersionedModel;Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPayload.smali b/com.discord/smali/com/discord/models/domain/ModelPayload.smali
index 55905395e4..a622e2b405 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPayload.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPayload.smali
@@ -9,6 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lcom/discord/models/domain/ModelPayload$MergedPresences;,
         Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;,
         Lcom/discord/models/domain/ModelPayload$VersionedReadStates;,
         Lcom/discord/models/domain/ModelPayload$VersionedModel;,
@@ -34,6 +35,28 @@
 
 .field public guildExperiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
 
+.field public guildMembers:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelGuildMember;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field public guildPresences:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
 .field public guilds:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -98,6 +121,16 @@
 
 .field public userSettings:Lcom/discord/models/domain/ModelUserSettings;
 
+.field public users:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public v:I
 
 
@@ -110,6 +143,94 @@
     return-void
 .end method
 
+.method public constructor <init>(Lcom/discord/models/domain/ModelPayload;)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget v0, p1, Lcom/discord/models/domain/ModelPayload;->v:I
+
+    iput v0, p0, Lcom/discord/models/domain/ModelPayload;->v:I
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->me:Lcom/discord/models/domain/ModelUser;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->me:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->userSettings:Lcom/discord/models/domain/ModelUserSettings;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->userSettings:Lcom/discord/models/domain/ModelUserSettings;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->userGuildSettings:Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->userGuildSettings:Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->sessionId:Ljava/lang/String;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->sessionId:Ljava/lang/String;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->relationships:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->relationships:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->readState:Lcom/discord/models/domain/ModelPayload$VersionedReadStates;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->readState:Lcom/discord/models/domain/ModelPayload$VersionedReadStates;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->privateChannels:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->privateChannels:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->guilds:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->guilds:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->analyticsToken:Ljava/lang/String;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->analyticsToken:Ljava/lang/String;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->requiredAction:Ljava/lang/String;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->requiredAction:Ljava/lang/String;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->experiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->experiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->guildExperiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->guildExperiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->connectedAccounts:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->connectedAccounts:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->sessions:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->sessions:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->users:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->users:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->guildPresences:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->guildPresences:Ljava/util/List;
+
+    iget-object v0, p1, Lcom/discord/models/domain/ModelPayload;->guildMembers:Ljava/util/List;
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->guildMembers:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/models/domain/ModelPayload;->trace:Ljava/lang/Object;
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload;->trace:Ljava/lang/Object;
+
+    return-void
+.end method
+
 .method public static synthetic a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUserRelationship;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -190,7 +311,26 @@
     return-object p0
 .end method
 
-.method public static synthetic e(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelConnectedAccount;
+.method public static synthetic e(Lcom/discord/models/domain/Model$JsonReader;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lf/a/d/a/s0;
+
+    invoke-direct {v0, p0}, Lf/a/d/a/s0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static synthetic f(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelConnectedAccount;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -211,7 +351,7 @@
     return-object p0
 .end method
 
-.method public static synthetic f(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelSession;
+.method public static synthetic g(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelSession;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -232,6 +372,48 @@
     return-object p0
 .end method
 
+.method public static synthetic h(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelUser;-><init>()V
+
+    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/discord/models/domain/ModelUser;
+
+    return-object p0
+.end method
+
+.method public static synthetic i(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMember;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lcom/discord/models/domain/ModelGuildMember;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelGuildMember;-><init>()V
+
+    invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/discord/models/domain/ModelGuildMember;
+
+    return-object p0
+.end method
+
 
 # virtual methods
 .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -250,7 +432,7 @@
 
     move-result v1
 
-    const-string v2, "user"
+    const-string/jumbo v2, "user"
 
     const/4 v3, 0x0
 
@@ -293,12 +475,12 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xc
+    const/16 v0, 0xe
 
     goto/16 :goto_1
 
     :sswitch_3
-    const-string v1, "user_settings"
+    const-string/jumbo v1, "user_settings"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -319,7 +501,7 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xf
+    const/16 v0, 0x11
 
     goto/16 :goto_1
 
@@ -332,7 +514,7 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xa
+    const/16 v0, 0xc
 
     goto/16 :goto_1
 
@@ -345,7 +527,7 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xb
+    const/16 v0, 0xd
 
     goto/16 :goto_1
 
@@ -360,7 +542,7 @@
 
     const/4 v0, 0x5
 
-    goto :goto_1
+    goto/16 :goto_1
 
     :sswitch_8
     const-string v1, "guild_experiments"
@@ -371,9 +553,9 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xd
+    const/16 v0, 0xf
 
-    goto :goto_1
+    goto/16 :goto_1
 
     :sswitch_9
     const-string v1, "connected_accounts"
@@ -384,11 +566,24 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0xe
+    const/16 v0, 0x10
+
+    goto/16 :goto_1
+
+    :sswitch_a
+    const-string/jumbo v1, "users"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/16 v0, 0x12
 
     goto :goto_1
 
-    :sswitch_a
+    :sswitch_b
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
@@ -399,8 +594,8 @@
 
     goto :goto_1
 
-    :sswitch_b
-    const-string v1, "v"
+    :sswitch_c
+    const-string/jumbo v1, "v"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -412,7 +607,7 @@
 
     goto :goto_1
 
-    :sswitch_c
+    :sswitch_d
     const-string v1, "read_state"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -425,7 +620,7 @@
 
     goto :goto_1
 
-    :sswitch_d
+    :sswitch_e
     const-string v1, "presences"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -438,7 +633,7 @@
 
     goto :goto_1
 
-    :sswitch_e
+    :sswitch_f
     const-string v1, "guilds"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -451,7 +646,33 @@
 
     goto :goto_1
 
-    :sswitch_f
+    :sswitch_10
+    const-string v1, "merged_presences"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/16 v0, 0xa
+
+    goto :goto_1
+
+    :sswitch_11
+    const-string v1, "merged_members"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/16 v0, 0xb
+
+    goto :goto_1
+
+    :sswitch_12
     const-string v1, "_trace"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -460,12 +681,12 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x10
+    const/16 v0, 0x13
 
     goto :goto_1
 
-    :sswitch_10
-    const-string v1, "user_guild_settings"
+    :sswitch_13
+    const-string/jumbo v1, "user_guild_settings"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -489,9 +710,9 @@
     goto/16 :goto_2
 
     :pswitch_0
-    new-instance v0, Lf/a/d/a/s0;
+    new-instance v0, Lf/a/d/a/r0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/s0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/r0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -530,9 +751,22 @@
     goto/16 :goto_2
 
     :pswitch_1
-    new-instance v0, Lf/a/d/a/q0;
+    new-instance v0, Lf/a/d/a/c1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/q0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/c1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload;->users:Ljava/util/List;
+
+    goto/16 :goto_2
+
+    :pswitch_2
+    new-instance v0, Lf/a/d/a/e1;
+
+    invoke-direct {v0, p1}, Lf/a/d/a/e1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -542,10 +776,10 @@
 
     goto/16 :goto_2
 
-    :pswitch_2
-    new-instance v0, Lf/a/d/a/x0;
+    :pswitch_3
+    new-instance v0, Lf/a/d/a/b1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/x0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/b1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -555,7 +789,7 @@
 
     goto/16 :goto_2
 
-    :pswitch_3
+    :pswitch_4
     new-instance v0, Lcom/discord/models/domain/ModelExperiment$Experiments;
 
     const-string v1, "guild"
@@ -566,7 +800,7 @@
 
     goto/16 :goto_2
 
-    :pswitch_4
+    :pswitch_5
     new-instance v0, Lcom/discord/models/domain/ModelExperiment$Experiments;
 
     invoke-direct {v0, p1, v2}, Lcom/discord/models/domain/ModelExperiment$Experiments;-><init>(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)V
@@ -575,7 +809,7 @@
 
     goto/16 :goto_2
 
-    :pswitch_5
+    :pswitch_6
     iget-object v0, p0, Lcom/discord/models/domain/ModelPayload;->requiredAction:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -586,7 +820,7 @@
 
     goto/16 :goto_2
 
-    :pswitch_6
+    :pswitch_7
     iget-object v0, p0, Lcom/discord/models/domain/ModelPayload;->analyticsToken:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -597,19 +831,6 @@
 
     goto/16 :goto_2
 
-    :pswitch_7
-    new-instance v0, Lf/a/d/a/u0;
-
-    invoke-direct {v0, p1}, Lf/a/d/a/u0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
-
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
-
-    goto/16 :goto_2
-
     :pswitch_8
     new-instance v0, Lf/a/d/a/v0;
 
@@ -619,14 +840,65 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload;->guildMembers:Ljava/util/List;
+
+    goto/16 :goto_2
+
+    :pswitch_9
+    new-instance v0, Lcom/discord/models/domain/ModelPayload$MergedPresences;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;-><init>()V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/models/domain/ModelPayload$MergedPresences;
+
+    invoke-static {p1}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->access$000(Lcom/discord/models/domain/ModelPayload$MergedPresences;)Ljava/util/List;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
+
+    invoke-static {p1}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->access$100(Lcom/discord/models/domain/ModelPayload$MergedPresences;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload;->guildPresences:Ljava/util/List;
+
+    goto/16 :goto_2
+
+    :pswitch_a
+    new-instance v0, Lf/a/d/a/z0;
+
+    invoke-direct {v0, p1}, Lf/a/d/a/z0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
+
+    goto/16 :goto_2
+
+    :pswitch_b
+    new-instance v0, Lf/a/d/a/a1;
+
+    invoke-direct {v0, p1}, Lf/a/d/a/a1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/models/domain/ModelPayload;->guilds:Ljava/util/List;
 
     goto :goto_2
 
-    :pswitch_9
-    new-instance v0, Lf/a/d/a/r0;
+    :pswitch_c
+    new-instance v0, Lf/a/d/a/t0;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/r0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/t0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -636,7 +908,7 @@
 
     goto :goto_2
 
-    :pswitch_a
+    :pswitch_d
     new-instance v0, Lcom/discord/models/domain/ModelPayload$VersionedReadStates;
 
     invoke-direct {v0}, Lcom/discord/models/domain/ModelPayload$VersionedReadStates;-><init>()V
@@ -651,10 +923,10 @@
 
     goto :goto_2
 
-    :pswitch_b
-    new-instance v0, Lf/a/d/a/y0;
+    :pswitch_e
+    new-instance v0, Lf/a/d/a/f1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/y0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/f1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -664,7 +936,7 @@
 
     goto :goto_2
 
-    :pswitch_c
+    :pswitch_f
     iget-object v0, p0, Lcom/discord/models/domain/ModelPayload;->sessionId:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -675,7 +947,7 @@
 
     goto :goto_2
 
-    :pswitch_d
+    :pswitch_10
     new-instance v0, Lcom/discord/models/domain/ModelUser;
 
     invoke-direct {v0}, Lcom/discord/models/domain/ModelUser;-><init>()V
@@ -690,7 +962,7 @@
 
     goto :goto_2
 
-    :pswitch_e
+    :pswitch_11
     new-instance v0, Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;
 
     invoke-direct {v0}, Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;-><init>()V
@@ -705,7 +977,7 @@
 
     goto :goto_2
 
-    :pswitch_f
+    :pswitch_12
     new-instance v0, Lcom/discord/models/domain/ModelUserSettings;
 
     invoke-direct {v0}, Lcom/discord/models/domain/ModelUserSettings;-><init>()V
@@ -720,7 +992,7 @@
 
     goto :goto_2
 
-    :pswitch_10
+    :pswitch_13
     iget v0, p0, Lcom/discord/models/domain/ModelPayload;->v:I
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -735,13 +1007,16 @@
 
     :sswitch_data_0
     .sparse-switch
-        -0x73247a1d -> :sswitch_10
-        -0x574babba -> :sswitch_f
-        -0x499abd20 -> :sswitch_e
-        -0x36f3fd28 -> :sswitch_d
-        -0x9638758 -> :sswitch_c
-        0x76 -> :sswitch_b
-        0x36ebcb -> :sswitch_a
+        -0x73247a1d -> :sswitch_13
+        -0x574babba -> :sswitch_12
+        -0x54ec98fa -> :sswitch_11
+        -0x531f267b -> :sswitch_10
+        -0x499abd20 -> :sswitch_f
+        -0x36f3fd28 -> :sswitch_e
+        -0x9638758 -> :sswitch_d
+        0x76 -> :sswitch_c
+        0x36ebcb -> :sswitch_b
+        0x6a68e08 -> :sswitch_a
         0xd9f545c -> :sswitch_9
         0x18fee9ca -> :sswitch_8
         0x1c2a513b -> :sswitch_7
@@ -756,6 +1031,9 @@
 
     :pswitch_data_0
     .packed-switch 0x0
+        :pswitch_13
+        :pswitch_12
+        :pswitch_11
         :pswitch_10
         :pswitch_f
         :pswitch_e
@@ -1202,6 +1480,81 @@
     return v2
 
     :cond_21
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getUsers()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getUsers()Ljava/util/List;
+
+    move-result-object v3
+
+    if-nez v1, :cond_22
+
+    if-eqz v3, :cond_23
+
+    goto :goto_f
+
+    :cond_22
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_23
+
+    :goto_f
+    return v2
+
+    :cond_23
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getGuildPresences()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuildPresences()Ljava/util/List;
+
+    move-result-object v3
+
+    if-nez v1, :cond_24
+
+    if-eqz v3, :cond_25
+
+    goto :goto_10
+
+    :cond_24
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_25
+
+    :goto_10
+    return v2
+
+    :cond_25
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getGuildMembers()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuildMembers()Ljava/util/List;
+
+    move-result-object v3
+
+    if-nez v1, :cond_26
+
+    if-eqz v3, :cond_27
+
+    goto :goto_11
+
+    :cond_26
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_27
+
+    :goto_11
+    return v2
+
+    :cond_27
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getTrace()Ljava/lang/Object;
 
     move-result-object v1
@@ -1210,23 +1563,23 @@
 
     move-result-object p1
 
-    if-nez v1, :cond_22
+    if-nez v1, :cond_28
 
-    if-eqz p1, :cond_23
+    if-eqz p1, :cond_29
 
-    goto :goto_f
+    goto :goto_12
 
-    :cond_22
+    :cond_28
     invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-nez p1, :cond_23
+    if-nez p1, :cond_29
 
-    :goto_f
+    :goto_12
     return v2
 
-    :cond_23
+    :cond_29
     return v0
 .end method
 
@@ -1270,6 +1623,40 @@
     return-object v0
 .end method
 
+.method public getGuildMembers()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelGuildMember;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPayload;->guildMembers:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public getGuildPresences()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPayload;->guildPresences:Ljava/util/List;
+
+    return-object v0
+.end method
+
 .method public getGuilds()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -1406,6 +1793,22 @@
     return-object v0
 .end method
 
+.method public getUsers()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPayload;->users:Ljava/util/List;
+
+    return-object v0
+.end method
+
 .method public getV()I
     .locals 1
 
@@ -1725,7 +2128,7 @@
     :goto_e
     add-int/2addr v0, v1
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getTrace()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getUsers()Ljava/util/List;
 
     move-result-object v1
 
@@ -1733,14 +2136,74 @@
 
     if-nez v1, :cond_f
 
+    const/16 v1, 0x2b
+
     goto :goto_f
 
     :cond_f
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
-    move-result v2
+    move-result v1
 
     :goto_f
+    add-int/2addr v0, v1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getGuildPresences()Ljava/util/List;
+
+    move-result-object v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v1, :cond_10
+
+    const/16 v1, 0x2b
+
+    goto :goto_10
+
+    :cond_10
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :goto_10
+    add-int/2addr v0, v1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getGuildMembers()Ljava/util/List;
+
+    move-result-object v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v1, :cond_11
+
+    const/16 v1, 0x2b
+
+    goto :goto_11
+
+    :cond_11
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :goto_11
+    add-int/2addr v0, v1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getTrace()Ljava/lang/Object;
+
+    move-result-object v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v1, :cond_12
+
+    goto :goto_12
+
+    :cond_12
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    :goto_12
     add-int/2addr v0, v2
 
     return v0
@@ -1911,6 +2374,36 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", users="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getUsers()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guildPresences="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getGuildPresences()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guildMembers="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPayload;->getGuildMembers()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
     const-string v1, ", trace="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -1933,7 +2426,7 @@
 .end method
 
 .method public withGuilds(Ljava/util/List;)Lcom/discord/models/domain/ModelPayload;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1946,69 +2439,52 @@
 
     new-instance v0, Lcom/discord/models/domain/ModelPayload;
 
-    invoke-direct {v0}, Lcom/discord/models/domain/ModelPayload;-><init>()V
-
-    iget v1, p0, Lcom/discord/models/domain/ModelPayload;->v:I
-
-    iput v1, v0, Lcom/discord/models/domain/ModelPayload;->v:I
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPayload;->me:Lcom/discord/models/domain/ModelUser;
-
-    iput-object v1, v0, Lcom/discord/models/domain/ModelPayload;->me:Lcom/discord/models/domain/ModelUser;
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPayload;->userSettings:Lcom/discord/models/domain/ModelUserSettings;
-
-    iput-object v1, v0, Lcom/discord/models/domain/ModelPayload;->userSettings:Lcom/discord/models/domain/ModelUserSettings;
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPayload;->userGuildSettings:Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;
-
-    iput-object v1, v0, Lcom/discord/models/domain/ModelPayload;->userGuildSettings:Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPayload;->sessionId:Ljava/lang/String;
-
-    iput-object v1, v0, Lcom/discord/models/domain/ModelPayload;->sessionId:Ljava/lang/String;
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPayload;->relationships:Ljava/util/List;
-
-    iput-object v1, v0, Lcom/discord/models/domain/ModelPayload;->relationships:Ljava/util/List;
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPayload;->readState:Lcom/discord/models/domain/ModelPayload$VersionedReadStates;
-
-    iput-object v1, v0, Lcom/discord/models/domain/ModelPayload;->readState:Lcom/discord/models/domain/ModelPayload$VersionedReadStates;
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPayload;->privateChannels:Ljava/util/List;
-
-    iput-object v1, v0, Lcom/discord/models/domain/ModelPayload;->privateChannels:Ljava/util/List;
+    invoke-direct {v0, p0}, Lcom/discord/models/domain/ModelPayload;-><init>(Lcom/discord/models/domain/ModelPayload;)V
 
     iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->guilds:Ljava/util/List;
 
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
+    return-object v0
+.end method
 
-    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
+.method public withHydratedUserData(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;)Lcom/discord/models/domain/ModelPayload;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelUserRelationship;",
+            ">;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelChannel;",
+            ">;",
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;>;",
+            "Ljava/util/List<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelGuildMember;",
+            ">;>;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelPayload;"
+        }
+    .end annotation
 
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPayload;->analyticsToken:Ljava/lang/String;
+    new-instance v0, Lcom/discord/models/domain/ModelPayload;
 
-    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->analyticsToken:Ljava/lang/String;
+    invoke-direct {v0, p0}, Lcom/discord/models/domain/ModelPayload;-><init>(Lcom/discord/models/domain/ModelPayload;)V
 
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPayload;->requiredAction:Ljava/lang/String;
+    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->relationships:Ljava/util/List;
 
-    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->requiredAction:Ljava/lang/String;
+    iput-object p2, v0, Lcom/discord/models/domain/ModelPayload;->privateChannels:Ljava/util/List;
 
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPayload;->experiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
+    iput-object p3, v0, Lcom/discord/models/domain/ModelPayload;->guildPresences:Ljava/util/List;
 
-    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->experiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
+    iput-object p4, v0, Lcom/discord/models/domain/ModelPayload;->guildMembers:Ljava/util/List;
 
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPayload;->guildExperiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
-
-    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->guildExperiments:Lcom/discord/models/domain/ModelExperiment$Experiments;
-
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPayload;->connectedAccounts:Ljava/util/List;
-
-    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->connectedAccounts:Ljava/util/List;
-
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPayload;->sessions:Ljava/util/List;
-
-    iput-object p1, v0, Lcom/discord/models/domain/ModelPayload;->sessions:Ljava/util/List;
+    iput-object p5, v0, Lcom/discord/models/domain/ModelPayload;->presences:Ljava/util/List;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$Companion.smali
index 1d9f37613c..365eacb716 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$Companion.smali
@@ -41,69 +41,61 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "raw"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getType()I
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    if-eq v1, v2, :cond_2
+    if-eq v0, v1, :cond_1
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    if-ne v1, v2, :cond_1
+    if-ne v0, v1, :cond_0
 
-    new-instance v1, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
+    new-instance v0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getEmail()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-eqz v4, :cond_0
+    invoke-static {v3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getId()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getInvalid()Z
 
-    move-result v6
+    move-result v5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getBillingAddress()Lcom/discord/models/domain/billing/ModelBillingAddress;
 
-    move-result-object v7
+    move-result-object v6
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getDefault()Z
 
-    move-result v8
+    move-result v7
 
-    move-object v3, v1
+    move-object v2, v0
 
-    invoke-direct/range {v3 .. v8}, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;-><init>(Ljava/lang/String;Ljava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)V
+    invoke-direct/range {v2 .. v7}, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;-><init>(Ljava/lang/String;Ljava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)V
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-
-    :cond_1
-    :try_start_1
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v2, "unsupported payment source type: "
+    const-string/jumbo v2, "unsupported payment source type: "
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -121,20 +113,20 @@
 
     throw v0
 
-    :cond_2
+    :cond_1
     new-instance v9, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getBrand()Ljava/lang/String;
 
     move-result-object v1
 
-    if-eqz v1, :cond_4
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getLast_4()Ljava/lang/String;
 
     move-result-object v2
 
-    if-eqz v2, :cond_3
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/PaymentSourceRaw;->getExpiresMonth()I
 
@@ -163,26 +155,13 @@
     move-object v0, v9
 
     invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;-><init>(Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    move-object v1, v9
+    move-object v0, v9
 
     :goto_0
-    return-object v1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-
-    :cond_4
-    :try_start_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw v0
+    return-object v0
 
     :catchall_0
     move-exception p1
@@ -192,11 +171,4 @@
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelPaymentSource$UnableToWrapException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
-
-    :cond_5
-    const-string p1, "raw"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard.smali b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard.smali
index 171e96827b..d92a7656f2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard.smali
@@ -36,15 +36,21 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "brand"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "last4"
 
-    if-eqz p5, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_0
+    const-string v0, "id"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "billingAddress"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -77,34 +83,6 @@
     iput-boolean p8, p0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;->default:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "billingAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "last4"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "brand"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;ZILjava/lang/Object;)Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;
@@ -318,67 +296,45 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "brand"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p2, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "last4"
 
-    if-eqz p7, :cond_0
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "id"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "billingAddress"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move v4, p3
 
     move v5, p4
 
-    move-object v6, p5
-
     move/from16 v7, p6
 
-    move-object/from16 v8, p7
-
     move/from16 v9, p8
 
     invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;-><init>(Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "billingAddress"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "id"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "last4"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "brand"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -396,7 +352,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;->brand:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -406,7 +362,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;->last4:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -432,7 +388,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -456,7 +412,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal.smali b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal.smali
index ab568330a7..f5ce468153 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal.smali
@@ -30,13 +30,17 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "email"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "id"
 
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "billingAddress"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -63,27 +67,6 @@
     iput-boolean p5, p0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;->default:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "billingAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "email"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;Ljava/lang/String;Ljava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;ZILjava/lang/Object;)Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
@@ -212,13 +195,17 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "email"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "id"
 
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "billingAddress"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
 
@@ -237,27 +224,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;-><init>(Ljava/lang/String;Ljava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "billingAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "email"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -275,7 +241,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;->email:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -289,7 +255,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -313,7 +279,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$UnableToWrapException.smali b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$UnableToWrapException.smali
index bf6ff447e7..a1f4e71500 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPaymentSource$UnableToWrapException.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPaymentSource$UnableToWrapException.smali
@@ -16,20 +16,13 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Throwable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.smali b/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.smali
index 619880f0c2..322c438f92 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.smali
@@ -178,7 +178,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -204,7 +204,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion$deserialize$1.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion$deserialize$1.smali
index d817132173..4fbe5cf148 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion$deserialize$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion$deserialize$1.smali
@@ -124,7 +124,7 @@
     goto :goto_0
 
     :cond_2
-    const-string v0, "web"
+    const-string/jumbo v0, "web"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion.smali
index a4935e447b..217cb15c63 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses$Companion.smali
@@ -36,11 +36,11 @@
 .method public final deserialize(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence$ClientStatuses;
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "reader"
 
-    new-instance v0, Lkotlin/jvm/internal/Ref$ObjectRef;
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    invoke-direct {v0}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-result-object v0
 
     sget-object v1, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
 
@@ -85,15 +85,6 @@
     invoke-direct {p1, v1, v2, v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses.smali
index 4d2e68cd86..8cbb24bbe4 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$ClientStatuses.smali
@@ -50,13 +50,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "desktopStatus"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "webStatus"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mobileStatus"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -67,27 +71,6 @@
     iput-object p3, p0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->mobileStatus:Lcom/discord/models/domain/ModelPresence$Status;
 
     return-void
-
-    :cond_0
-    const-string p1, "mobileStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "desktopStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;ILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence$ClientStatuses;
@@ -150,40 +133,23 @@
 .method public final copy(Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;)Lcom/discord/models/domain/ModelPresence$ClientStatuses;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "desktopStatus"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "webStatus"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mobileStatus"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/ModelPresence$ClientStatuses;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;Lcom/discord/models/domain/ModelPresence$Status;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "mobileStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "desktopStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -201,7 +167,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->desktopStatus:Lcom/discord/models/domain/ModelPresence$Status;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -211,7 +177,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->webStatus:Lcom/discord/models/domain/ModelPresence$Status;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -221,7 +187,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->mobileStatus:Lcom/discord/models/domain/ModelPresence$Status;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
index aaecb9259d..bcd08f94ff 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
@@ -42,9 +42,11 @@
 
 .field public final synthetic $user:Lkotlin/jvm/internal/Ref$ObjectRef;
 
+.field public final synthetic $userId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
 
 # direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
+.method public constructor <init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$status:Lkotlin/jvm/internal/Ref$ObjectRef;
@@ -57,7 +59,9 @@
 
     iput-object p5, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$user:Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    iput-object p6, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$guildId:Lkotlin/jvm/internal/Ref$LongRef;
+    iput-object p6, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$userId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iput-object p7, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$guildId:Lkotlin/jvm/internal/Ref$LongRef;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -115,7 +119,7 @@
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    goto :goto_1
+    goto/16 :goto_1
 
     :sswitch_1
     const-string v0, "client_status"
@@ -141,7 +145,7 @@
     goto :goto_1
 
     :sswitch_2
-    const-string v0, "user"
+    const-string/jumbo v0, "user"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -168,6 +172,27 @@
     goto :goto_1
 
     :sswitch_3
+    const-string/jumbo v0, "user_id"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$userId:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+    move-result-object v0
+
+    iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    goto :goto_1
+
+    :sswitch_4
     const-string v0, "status"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -194,7 +219,7 @@
 
     goto :goto_1
 
-    :sswitch_4
+    :sswitch_5
     const-string v0, "guild_id"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -213,7 +238,7 @@
 
     const-string v1, "reader.nextLongOrNull()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -236,8 +261,9 @@
 
     :sswitch_data_0
     .sparse-switch
-        -0x4de03319 -> :sswitch_4
-        -0x3532300e -> :sswitch_3
+        -0x4de03319 -> :sswitch_5
+        -0x3532300e -> :sswitch_4
+        -0x8c511f1 -> :sswitch_3
         0x36ebcb -> :sswitch_2
         0x22120ee6 -> :sswitch_1
         0x7a1b3bed -> :sswitch_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
index e553b2ed8c..b86e346c27 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
@@ -54,22 +54,18 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
-    .locals 14
+    .locals 16
+
+    move-object/from16 v8, p1
+
+    const-string v0, "reader"
+
+    invoke-static {v8, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v9
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
-
-    invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
-
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
-
-    invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
-
     iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
@@ -84,52 +80,66 @@
 
     iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v12, Lkotlin/jvm/internal/Ref$LongRef;
+    new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    invoke-direct {v12}, Lkotlin/jvm/internal/Ref$LongRef;-><init>()V
+    invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    const-wide/16 v1, 0x0
+    iput-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    iput-wide v1, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+    new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v13, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+    invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    move-object v1, v13
+    iput-object v0, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    move-object v2, v8
+    new-instance v14, Lkotlin/jvm/internal/Ref$LongRef;
 
-    move-object v3, p1
+    invoke-direct {v14}, Lkotlin/jvm/internal/Ref$LongRef;-><init>()V
 
-    move-object v4, v9
+    const-wide/16 v0, 0x0
 
-    move-object v5, v10
+    iput-wide v0, v14, Lkotlin/jvm/internal/Ref$LongRef;->element:J
 
-    move-object v6, v11
+    new-instance v15, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
 
-    move-object v7, v12
+    move-object v0, v15
 
-    invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
+    move-object v1, v9
 
-    invoke-virtual {p1, v13}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    move-object/from16 v2, p1
 
-    new-instance p1, Lcom/discord/models/domain/ModelPresence;
+    move-object v3, v10
 
-    iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    move-object v4, v11
 
-    move-object v2, v1
+    move-object v5, v12
 
-    check-cast v2, Lcom/discord/models/domain/ModelPresence$Status;
+    move-object v6, v13
 
-    if-eqz v2, :cond_1
+    move-object v7, v14
+
+    invoke-direct/range {v0 .. v7}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
+
+    invoke-virtual {v8, v15}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+
+    new-instance v8, Lcom/discord/models/domain/ModelPresence;
 
     iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    move-object v3, v0
+    move-object v1, v0
 
-    check-cast v3, Ljava/util/List;
+    check-cast v1, Lcom/discord/models/domain/ModelPresence$Status;
+
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
+    move-object v2, v0
+
+    check-cast v2, Ljava/util/List;
+
+    iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
     check-cast v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
 
     if-eqz v0, :cond_0
@@ -144,33 +154,27 @@
     move-result-object v0
 
     :goto_0
+    move-object v3, v0
+
+    iget-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
     move-object v4, v0
 
-    iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    check-cast v4, Lcom/discord/models/domain/ModelUser;
+
+    iget-object v0, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object v5, v0
 
-    check-cast v5, Lcom/discord/models/domain/ModelUser;
+    check-cast v5, Ljava/lang/Long;
 
-    iget-wide v6, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+    iget-wide v6, v14, Lkotlin/jvm/internal/Ref$LongRef;->element:J
 
-    move-object v1, p1
+    move-object v0, v8
 
-    invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    invoke-direct/range {v0 .. v7}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 
-    return-object p1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v8
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Status$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Status$Companion.smali
index 3ae20e503b..445942b949 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Status$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Status$Companion.smali
@@ -61,7 +61,7 @@
 
     const-string v6, "Locale.ROOT"
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v3}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
@@ -69,10 +69,10 @@
 
     const-string v6, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
-    invoke-static {v5, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
index bcb585ea4d..a342794346 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelPresence$customStatusActivity$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelPresence.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
index 1b3756ee9f..b82a87a98f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelPresence$listeningActivity$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelPresence.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
index d6db40f9fd..71f6c92423 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelPresence$playingActivity$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelPresence.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
index f384a030dd..c41c8217dd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelPresence$primaryActivity$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelPresence.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
index 47fb560c73..4299214308 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelPresence$streamingActivity$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelPresence.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
index 170a97d2f0..ddb50bb896 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelPresence$watchingActivity$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelPresence.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    value = Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence.smali b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
index 00f091f35e..eabf763f3a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
@@ -42,11 +42,13 @@
 
 .field public final user:Lcom/discord/models/domain/ModelUser;
 
+.field public final userId:Ljava/lang/Long;
+
 .field public final watchingActivity$delegate:Lkotlin/Lazy;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+.method public constructor <init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -58,15 +60,18 @@
             ">;",
             "Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
             "Lcom/discord/models/domain/ModelUser;",
+            "Ljava/lang/Long;",
             "J)V"
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "status"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "clientStatuses"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -78,7 +83,9 @@
 
     iput-object p4, p0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
 
-    iput-wide p5, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+    iput-object p5, p0, Lcom/discord/models/domain/ModelPresence;->userId:Ljava/lang/Long;
+
+    iput-wide p6, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
 
     new-instance p1, Lcom/discord/models/domain/ModelPresence$playingActivity$2;
 
@@ -141,63 +148,76 @@
     iput-object p1, p0, Lcom/discord/models/domain/ModelPresence;->primaryActivity$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "clientStatuses"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "status"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 7
+.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 9
 
-    and-int/lit8 p8, p7, 0x4
+    and-int/lit8 v0, p8, 0x4
 
-    if-eqz p8, :cond_0
+    if-eqz v0, :cond_0
 
-    sget-object p3, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+    sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
 
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
 
-    move-result-object p3
+    move-result-object v0
+
+    move-object v4, v0
+
+    goto :goto_0
 
     :cond_0
-    move-object v3, p3
+    move-object v4, p3
 
-    and-int/lit8 p3, p7, 0x8
+    :goto_0
+    and-int/lit8 v0, p8, 0x8
 
-    if-eqz p3, :cond_1
+    const/4 v1, 0x0
 
-    const/4 p4, 0x0
+    if-eqz v0, :cond_1
+
+    move-object v5, v1
+
+    goto :goto_1
 
     :cond_1
-    move-object v4, p4
+    move-object v5, p4
 
-    and-int/lit8 p3, p7, 0x10
+    :goto_1
+    and-int/lit8 v0, p8, 0x10
 
-    if-eqz p3, :cond_2
+    if-eqz v0, :cond_2
 
-    const-wide/16 p5, 0x0
+    move-object v6, v1
+
+    goto :goto_2
 
     :cond_2
-    move-wide v5, p5
+    move-object v6, p5
 
-    move-object v0, p0
+    :goto_2
+    and-int/lit8 v0, p8, 0x20
 
-    move-object v1, p1
+    if-eqz v0, :cond_3
 
-    move-object v2, p2
+    const-wide/16 v0, 0x0
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    move-wide v7, v0
+
+    goto :goto_3
+
+    :cond_3
+    move-wide v7, p6
+
+    :goto_3
+    move-object v1, p0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 
     return-void
 .end method
@@ -212,26 +232,34 @@
     return-object p0
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
-    .locals 4
+.method private final component5()Ljava/lang/Long;
+    .locals 1
 
-    and-int/lit8 p8, p7, 0x1
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->userId:Ljava/lang/Long;
 
-    if-eqz p8, :cond_0
+    return-object v0
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
+    .locals 5
+
+    and-int/lit8 p9, p8, 0x1
+
+    if-eqz p9, :cond_0
 
     iget-object p1, p0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
 
     :cond_0
-    and-int/lit8 p8, p7, 0x2
+    and-int/lit8 p9, p8, 0x2
 
-    if-eqz p8, :cond_1
+    if-eqz p9, :cond_1
 
     iget-object p2, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
 
     :cond_1
-    move-object p8, p2
+    move-object p9, p2
 
-    and-int/lit8 p2, p7, 0x4
+    and-int/lit8 p2, p8, 0x4
 
     if-eqz p2, :cond_2
 
@@ -240,7 +268,7 @@
     :cond_2
     move-object v0, p3
 
-    and-int/lit8 p2, p7, 0x8
+    and-int/lit8 p2, p8, 0x8
 
     if-eqz p2, :cond_3
 
@@ -249,28 +277,39 @@
     :cond_3
     move-object v1, p4
 
-    and-int/lit8 p2, p7, 0x10
+    and-int/lit8 p2, p8, 0x10
 
     if-eqz p2, :cond_4
 
-    iget-wide p5, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+    iget-object p5, p0, Lcom/discord/models/domain/ModelPresence;->userId:Ljava/lang/Long;
 
     :cond_4
-    move-wide v2, p5
+    move-object v2, p5
+
+    and-int/lit8 p2, p8, 0x20
+
+    if-eqz p2, :cond_5
+
+    iget-wide p6, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+
+    :cond_5
+    move-wide v3, p6
 
     move-object p2, p0
 
     move-object p3, p1
 
-    move-object p4, p8
+    move-object p4, p9
 
     move-object p5, v0
 
     move-object p6, v1
 
-    move-wide p7, v2
+    move-object p7, v2
 
-    invoke-virtual/range {p2 .. p8}, Lcom/discord/models/domain/ModelPresence;->copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)Lcom/discord/models/domain/ModelPresence;
+    move-wide p8, v3
+
+    invoke-virtual/range {p2 .. p9}, Lcom/discord/models/domain/ModelPresence;->copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)Lcom/discord/models/domain/ModelPresence;
 
     move-result-object p0
 
@@ -372,7 +411,7 @@
     return-object v0
 .end method
 
-.method public final component5()J
+.method public final component6()J
     .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
@@ -380,8 +419,8 @@
     return-wide v0
 .end method
 
-.method public final copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)Lcom/discord/models/domain/ModelPresence;
-    .locals 8
+.method public final copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)Lcom/discord/models/domain/ModelPresence;
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -392,48 +431,39 @@
             ">;",
             "Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
             "Lcom/discord/models/domain/ModelUser;",
+            "Ljava/lang/Long;",
             "J)",
             "Lcom/discord/models/domain/ModelPresence;"
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "status"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p3, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clientStatuses"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelPresence;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-object v3, p2
 
-    move-object v4, p3
-
     move-object v5, p4
 
-    move-wide v6, p5
+    move-object v6, p5
 
-    invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+    move-wide v7, p6
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "clientStatuses"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "status"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -451,7 +481,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -461,7 +491,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -471,7 +501,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPresence;->clientStatuses:Lcom/discord/models/domain/ModelPresence$ClientStatuses;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -481,7 +511,17 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->userId:Ljava/lang/Long;
+
+    iget-object v1, p1, Lcom/discord/models/domain/ModelPresence;->userId:Ljava/lang/Long;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -704,9 +744,27 @@
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->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/models/domain/ModelPresence;->userId:Ljava/lang/Long;
+
+    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
@@ -726,6 +784,65 @@
     return v0
 .end method
 
+.method public final hydrate(Ljava/util/Map;)Lcom/discord/models/domain/ModelPresence;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelPresence;"
+        }
+    .end annotation
+
+    const-string/jumbo v0, "users"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->userId:Ljava/lang/Long;
+
+    if-eqz v0, :cond_0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v5, p1
+
+    check-cast v5, Lcom/discord/models/domain/ModelUser;
+
+    const-wide/16 v7, 0x0
+
+    const/16 v9, 0x27
+
+    const/4 v10, 0x0
+
+    move-object v1, p0
+
+    invoke-static/range {v1 .. v10}, Lcom/discord/models/domain/ModelPresence;->copy$default(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, p0
+
+    :goto_0
+    return-object p1
+.end method
+
 .method public toString()Ljava/lang/String;
     .locals 4
 
@@ -763,6 +880,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", userId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelPresence;->userId:Ljava/lang/Long;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
     const-string v1, ", guildId="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/ModelReadState$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelReadState$Parser$parse$1.smali
index 0c58c940d3..7a7d6b2997 100644
--- a/com.discord/smali/com/discord/models/domain/ModelReadState$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelReadState$Parser$parse$1.smali
@@ -120,7 +120,7 @@
     goto/16 :goto_1
 
     :sswitch_1
-    const-string v0, "version"
+    const-string/jumbo v0, "version"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -243,6 +243,8 @@
     :goto_1
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x7315ce29 -> :sswitch_5
diff --git a/com.discord/smali/com/discord/models/domain/ModelReadState$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelReadState$Parser.smali
index 22ef21e7a6..ee4a0a4e95 100644
--- a/com.discord/smali/com/discord/models/domain/ModelReadState$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelReadState$Parser.smali
@@ -58,7 +58,9 @@
 
     move-object/from16 v8, p1
 
-    if-eqz v8, :cond_0
+    const-string v0, "reader"
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v9, Lkotlin/jvm/internal/Ref$IntRef;
 
@@ -155,15 +157,6 @@
     invoke-direct/range {v16 .. v27}, Lcom/discord/models/domain/ModelReadState;-><init>(JJJJIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v0
-
-    :cond_0
-    const-string v0, "reader"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelRemoteAuthHandshake.smali b/com.discord/smali/com/discord/models/domain/ModelRemoteAuthHandshake.smali
index 87ab299c1a..087a037b5e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelRemoteAuthHandshake.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelRemoteAuthHandshake.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "handshakeToken"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/models/domain/ModelRemoteAuthHandshake;->handshakeToken:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "handshakeToken"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelRemoteAuthHandshake;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelRemoteAuthHandshake;
@@ -59,22 +52,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelRemoteAuthHandshake;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "handshakeToken"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelRemoteAuthHandshake;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelRemoteAuthHandshake;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "handshakeToken"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -92,7 +78,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelRemoteAuthHandshake;->handshakeToken:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelRtcLatencyRegion.smali b/com.discord/smali/com/discord/models/domain/ModelRtcLatencyRegion.smali
new file mode 100644
index 0000000000..5f7f951f55
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelRtcLatencyRegion.smali
@@ -0,0 +1,258 @@
+.class public final Lcom/discord/models/domain/ModelRtcLatencyRegion;
+.super Ljava/lang/Object;
+.source "ModelRtcLatencyRegion.kt"
+
+
+# instance fields
+.field public final ips:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final region:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "region"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ips"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelRtcLatencyRegion;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelRtcLatencyRegion;
+    .locals 0
+
+    and-int/lit8 p4, p3, 0x1
+
+    if-eqz p4, :cond_0
+
+    iget-object p1, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    iget-object p2, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    :cond_1
+    invoke-virtual {p0, p1, p2}, Lcom/discord/models/domain/ModelRtcLatencyRegion;->copy(Ljava/lang/String;Ljava/util/List;)Lcom/discord/models/domain/ModelRtcLatencyRegion;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;Ljava/util/List;)Lcom/discord/models/domain/ModelRtcLatencyRegion;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelRtcLatencyRegion;"
+        }
+    .end annotation
+
+    const-string v0, "region"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ips"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/models/domain/ModelRtcLatencyRegion;
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelRtcLatencyRegion;-><init>(Ljava/lang/String;Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/models/domain/ModelRtcLatencyRegion;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/models/domain/ModelRtcLatencyRegion;
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    iget-object v1, p1, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getIps()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final getRegion()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_1
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "ModelRtcLatencyRegion(region="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->region:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", ips="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelRtcLatencyRegion;->ips:Ljava/util/List;
+
+    const-string v2, ")"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->w(Ljava/lang/StringBuilder;Ljava/util/List;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali b/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali
index 68e9e8c735..0dc3aec6b4 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSearchResponse$hits$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/models/domain/ModelSearchResponse$hits$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ModelSearchResponse.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -138,14 +138,14 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {v1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_4
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_2
     return-object v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali b/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali
index 992b8e7254..bd89f53222 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSearchResponse.smali
@@ -454,7 +454,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSearchResponse;->messages:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -464,7 +464,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSearchResponse;->analyticsId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -474,7 +474,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSearchResponse;->message:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -484,7 +484,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSearchResponse;->errorCode:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -494,7 +494,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSearchResponse;->documentIndexed:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -504,7 +504,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelSearchResponse;->retryAfter:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSession.smali b/com.discord/smali/com/discord/models/domain/ModelSession.smali
index 6c523df726..94e97113a1 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSession.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSession.smali
@@ -224,9 +224,9 @@
     goto :goto_2
 
     :cond_3
-    new-instance v0, Lf/a/d/a/z0;
+    new-instance v0, Lf/a/d/a/g1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/z0;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/g1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
index af11b72dba..d6140f23a1 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSku$Parser.smali
@@ -54,182 +54,167 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelSku;
-    .locals 25
+    .locals 16
 
     move-object/from16 v8, p1
 
-    const/4 v9, 0x0
+    const-string v0, "reader"
 
-    if-eqz v8, :cond_5
+    invoke-static {v8, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v9
+
+    const/4 v0, 0x0
+
+    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v9, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v9, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v9, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v9, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v14, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v14}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v9, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v15, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v15, Lcom/discord/models/domain/ModelSku$Parser$parse$1;
 
-    invoke-direct {v15}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v0, v15
 
-    iput-object v9, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v7, Lcom/discord/models/domain/ModelSku$Parser$parse$1;
-
-    move-object v0, v7
-
-    move-object v1, v10
+    move-object v1, v9
 
     move-object/from16 v2, p1
 
-    move-object v3, v11
+    move-object v3, v10
 
-    move-object v4, v12
+    move-object v4, v11
 
-    move-object v5, v13
+    move-object v5, v12
 
-    move-object v6, v14
+    move-object v6, v13
 
-    move-object v9, v7
-
-    move-object v7, v15
+    move-object v7, v14
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/models/domain/ModelSku$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {v8, v9}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {v8, v15}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
-    new-instance v0, Lcom/discord/models/domain/ModelSku;
+    new-instance v15, Lcom/discord/models/domain/ModelSku;
 
-    iget-object v1, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/Long;
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v4
-
-    move-wide/from16 v17, v4
+    move-result-wide v3
 
     goto :goto_0
 
     :cond_0
-    move-wide/from16 v17, v2
+    move-wide v3, v1
 
     :goto_0
-    iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/String;
+    check-cast v0, Ljava/lang/String;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     goto :goto_1
 
     :cond_1
-    const-string v1, ""
+    const-string v0, ""
 
     :goto_1
-    move-object/from16 v19, v1
+    move-object v5, v0
 
-    iget-object v1, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/Long;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    move-wide/from16 v20, v1
+    move-wide v6, v0
 
     goto :goto_2
 
     :cond_2
-    move-wide/from16 v20, v2
+    move-wide v6, v1
 
     :goto_2
-    iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    move-object/from16 v22, v1
+    move-object v8, v0
 
-    check-cast v22, Lcom/discord/models/domain/ModelApplication;
+    check-cast v8, Lcom/discord/models/domain/ModelApplication;
 
-    iget-object v1, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Boolean;
+    check-cast v0, Ljava/lang/Boolean;
 
-    if-eqz v1, :cond_4
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v23
+    move-result v9
 
-    iget-object v1, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Ljava/lang/Integer;
+    check-cast v0, Ljava/lang/Integer;
 
-    if-eqz v1, :cond_3
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    move-result v24
+    move-result v10
 
-    move-object/from16 v16, v0
+    move-object v0, v15
 
-    invoke-direct/range {v16 .. v24}, Lcom/discord/models/domain/ModelSku;-><init>(JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZI)V
+    move-wide v1, v3
 
-    return-object v0
+    move-object v3, v5
 
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    move-wide v4, v6
 
-    const/4 v0, 0x0
+    move-object v6, v8
 
-    throw v0
+    move v7, v9
 
-    :cond_4
-    const/4 v0, 0x0
+    move v8, v10
 
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelSku;-><init>(JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZI)V
 
-    throw v0
-
-    :cond_5
-    move-object v0, v9
-
-    const-string v1, "reader"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v15
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelSku.smali b/com.discord/smali/com/discord/models/domain/ModelSku.smali
index 607c527e39..6c2d8e2367 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSku.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSku.smali
@@ -28,9 +28,11 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZI)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,15 +49,6 @@
     iput p8, p0, Lcom/discord/models/domain/ModelSku;->type:I
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelSku;JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZIILjava/lang/Object;)Lcom/discord/models/domain/ModelSku;
@@ -207,36 +200,29 @@
 .method public final copy(JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZI)Lcom/discord/models/domain/ModelSku;
     .locals 10
 
-    if-eqz p3, :cond_0
-
-    new-instance v9, Lcom/discord/models/domain/ModelSku;
-
-    move-object v0, v9
-
-    move-wide v1, p1
-
-    move-object v3, p3
-
-    move-wide v4, p4
-
-    move-object/from16 v6, p6
-
-    move/from16 v7, p7
-
-    move/from16 v8, p8
-
-    invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelSku;-><init>(JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZI)V
-
-    return-object v9
-
-    :cond_0
     const-string v0, "name"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v4, p3
 
-    const/4 v0, 0x0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/models/domain/ModelSku;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move-wide v5, p4
+
+    move-object/from16 v7, p6
+
+    move/from16 v8, p7
+
+    move/from16 v9, p8
+
+    invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelSku;-><init>(JLjava/lang/String;JLcom/discord/models/domain/ModelApplication;ZI)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -262,7 +248,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSku;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -280,7 +266,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSku;->application:Lcom/discord/models/domain/ModelApplication;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
index 3b5c7818ba..afef66f5ec 100644
--- a/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelStoreListing$Parser.smali
@@ -54,69 +54,57 @@
 
 # virtual methods
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelStoreListing;
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v3, Lcom/discord/models/domain/ModelStoreListing$Parser$parse$1;
+    new-instance v1, Lcom/discord/models/domain/ModelStoreListing$Parser$parse$1;
 
-    invoke-direct {v3, v1, p1, v2}, Lcom/discord/models/domain/ModelStoreListing$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    invoke-direct {v1, v0, p1, v2}, Lcom/discord/models/domain/ModelStoreListing$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v3}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelStoreListing;
 
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Lcom/discord/models/domain/ModelSku;
+    check-cast v0, Lcom/discord/models/domain/ModelSku;
 
-    if-eqz v1, :cond_1
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v0, Ljava/lang/Long;
+    check-cast v1, Ljava/lang/Long;
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v1
 
     goto :goto_0
 
     :cond_0
-    const-wide/16 v2, 0x0
+    const-wide/16 v1, 0x0
 
     :goto_0
-    invoke-direct {p1, v1, v2, v3}, Lcom/discord/models/domain/ModelStoreListing;-><init>(Lcom/discord/models/domain/ModelSku;J)V
+    invoke-direct {p1, v0, v1, v2}, Lcom/discord/models/domain/ModelStoreListing;-><init>(Lcom/discord/models/domain/ModelSku;J)V
 
     return-object p1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali b/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali
index 26eef83775..33c482b82a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelStoreListing.smali
@@ -19,9 +19,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelSku;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "sku"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,15 +32,6 @@
     iput-wide p2, p0, Lcom/discord/models/domain/ModelStoreListing;->id:J
 
     return-void
-
-    :cond_0
-    const-string p1, "sku"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelStoreListing;Lcom/discord/models/domain/ModelSku;JILjava/lang/Object;)Lcom/discord/models/domain/ModelStoreListing;
@@ -86,22 +79,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelSku;J)Lcom/discord/models/domain/ModelStoreListing;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "sku"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelStoreListing;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/ModelStoreListing;-><init>(Lcom/discord/models/domain/ModelSku;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "sku"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -119,7 +105,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelStoreListing;->sku:Lcom/discord/models/domain/ModelSku;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscription$PaymentGateway$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelSubscription$PaymentGateway$Companion.smali
index d4d002a88c..2f53103cbb 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscription$PaymentGateway$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscription$PaymentGateway$Companion.smali
@@ -53,7 +53,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscription$Status$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelSubscription$Status$Companion.smali
index cdacde203e..0bd9b75e1f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscription$Status$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscription$Status$Companion.smali
@@ -83,7 +83,7 @@
     :cond_3
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    const-string v1, "unsupported subscription status: "
+    const-string/jumbo v1, "unsupported subscription status: "
 
     invoke-static {v1, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations.smali b/com.discord/smali/com/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations.smali
index 2bd4fb0472..414da3b4ab 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations.smali
@@ -141,7 +141,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;->additionalPlans:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscription$Type$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelSubscription$Type$Companion.smali
index 3b9982e3e9..9c5d9450c2 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscription$Type$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscription$Type$Companion.smali
@@ -47,7 +47,7 @@
     :cond_0
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    const-string v1, "unsupported subscription type: "
+    const-string/jumbo v1, "unsupported subscription type: "
 
     invoke-static {v1, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscription.smali b/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
index 3838b7d854..4085410480 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
@@ -105,17 +105,25 @@
 
     move-object/from16 v5, p16
 
-    const/4 v6, 0x0
+    const-string v6, "id"
 
-    if-eqz v1, :cond_4
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_3
+    const-string v6, "createdAt"
 
-    if-eqz v3, :cond_2
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_1
+    const-string v6, "currentPeriodStart"
 
-    if-eqz v5, :cond_0
+    invoke-static {p4, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "currentPeriodEnd"
+
+    invoke-static {p5, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "paymentGatewayPlanId"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -174,47 +182,6 @@
     iput v1, v0, Lcom/discord/models/domain/ModelSubscription;->type:I
 
     return-void
-
-    :cond_0
-    const-string v1, "paymentGatewayPlanId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string v1, "currentPeriodEnd"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string v1, "currentPeriodStart"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string v1, "createdAt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_4
-    const-string v1, "id"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-.end method
-
-.method public static synthetic additionalPlans$annotations()V
-    .locals 0
-
-    return-void
 .end method
 
 .method private final component14()I
@@ -481,7 +448,13 @@
     return-object v0
 .end method
 
-.method public static synthetic planId$annotations()V
+.method public static synthetic getAdditionalPlans$annotations()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public static synthetic getPlanId$annotations()V
     .locals 0
 
     return-void
@@ -610,7 +583,7 @@
 .end method
 
 .method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;Ljava/util/List;Ljava/util/List;ILjava/lang/String;I)Lcom/discord/models/domain/ModelSubscription;
-    .locals 19
+    .locals 20
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -637,92 +610,77 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_4
+    move-object/from16 v2, p2
 
-    if-eqz p2, :cond_3
+    move-object/from16 v3, p3
 
-    if-eqz p4, :cond_2
+    move-object/from16 v4, p4
 
-    if-eqz p5, :cond_1
+    move-object/from16 v5, p5
 
-    if-eqz p16, :cond_0
+    move-object/from16 v6, p6
 
-    new-instance v0, Lcom/discord/models/domain/ModelSubscription;
+    move-wide/from16 v7, p7
 
-    move-object v1, v0
+    move-object/from16 v9, p9
 
-    move-object/from16 v2, p1
+    move-object/from16 v10, p10
 
-    move-object/from16 v3, p2
+    move-object/from16 v11, p11
 
-    move-object/from16 v4, p3
+    move-object/from16 v12, p12
 
-    move-object/from16 v5, p4
+    move-object/from16 v13, p13
 
-    move-object/from16 v6, p5
+    move-object/from16 v14, p14
 
-    move-object/from16 v7, p6
+    move/from16 v15, p15
 
-    move-wide/from16 v8, p7
+    move-object/from16 v16, p16
 
-    move-object/from16 v10, p9
+    move/from16 v17, p17
 
-    move-object/from16 v11, p10
+    const-string v0, "id"
 
-    move-object/from16 v12, p11
+    move-object/from16 v18, v1
 
-    move-object/from16 v13, p12
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v14, p13
+    const-string v0, "createdAt"
 
-    move-object/from16 v15, p14
+    move-object/from16 v1, p2
 
-    move/from16 v16, p15
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v17, p16
+    const-string v0, "currentPeriodStart"
 
-    move/from16 v18, p17
+    move-object/from16 v1, p4
 
-    invoke-direct/range {v1 .. v18}, Lcom/discord/models/domain/ModelSubscription;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;Ljava/util/List;Ljava/util/List;ILjava/lang/String;I)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    const-string v0, "currentPeriodEnd"
 
-    :cond_0
-    const-string v1, "paymentGatewayPlanId"
+    move-object/from16 v1, p5
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "paymentGatewayPlanId"
 
-    :cond_1
-    const-string v1, "currentPeriodEnd"
+    move-object/from16 v1, p16
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v19, Lcom/discord/models/domain/ModelSubscription;
 
-    :cond_2
-    const-string v1, "currentPeriodStart"
+    move-object/from16 v0, v19
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, v18
 
-    throw v0
+    invoke-direct/range {v0 .. v17}, Lcom/discord/models/domain/ModelSubscription;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;Ljava/util/List;Ljava/util/List;ILjava/lang/String;I)V
 
-    :cond_3
-    const-string v1, "createdAt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "id"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v19
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -740,7 +698,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -750,7 +708,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->createdAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -760,7 +718,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->canceledAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -770,7 +728,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->currentPeriodStart:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -780,7 +738,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->currentPeriodEnd:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -790,7 +748,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->paymentSourceId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -808,7 +766,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->paymentGateway:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -818,7 +776,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->trialId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -828,7 +786,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->trialEndsAt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -838,7 +796,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->renewalMutations:Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -848,7 +806,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->additionalPlans:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -858,7 +816,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->planItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -874,7 +832,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscription;->paymentGatewayPlanId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1073,7 +1031,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_8
+    const-string v0, "planIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/models/domain/ModelSubscription;->additionalPlans:Ljava/util/List;
 
@@ -1197,15 +1157,6 @@
     :cond_7
     :goto_4
     return v1
-
-    :cond_8
-    const-string p1, "planIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public hashCode()I
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali
index 28064fbefe..dbcaeb84dc 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$Parser.smali
@@ -56,55 +56,55 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelSubscriptionPlan;
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v10, Lcom/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1;
 
-    invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v1, v10
 
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v0, Lcom/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1;
-
-    move-object v1, v0
-
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v3, p1
 
-    move-object v4, v8
+    move-object v4, v7
 
-    move-object v5, v9
+    move-object v5, v8
 
-    move-object v6, v10
+    move-object v6, v9
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelSubscriptionPlan$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {p1, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/ModelSubscriptionPlan;
 
-    iget-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -122,12 +122,10 @@
     :goto_0
     move-wide v2, v0
 
-    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
-    const/4 v1, -0x1
-
     if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
@@ -139,10 +137,12 @@
     goto :goto_1
 
     :cond_1
+    const/4 v0, -0x1
+
     const/4 v4, -0x1
 
     :goto_1
-    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -156,7 +156,7 @@
     :goto_2
     move-object v5, v0
 
-    iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -171,6 +171,8 @@
     goto :goto_3
 
     :cond_3
+    const/4 v0, -0x1
+
     const/4 v6, -0x1
 
     :goto_3
@@ -179,13 +181,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelSubscriptionPlan;-><init>(JILjava/lang/String;I)V
 
     return-object p1
-
-    :cond_4
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval$Companion.smali
index 69c732a4b7..64bca04fc7 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval$Companion.smali
@@ -51,7 +51,7 @@
     :cond_0
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    const-string v1, "unsupported interval: "
+    const-string/jumbo v1, "unsupported interval: "
 
     invoke-static {v1, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType$Companion.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType$Companion.smali
index d71377eccb..52bc88c174 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType$Companion.smali
@@ -85,7 +85,7 @@
     :cond_3
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    const-string v1, "unsupported type plan id: "
+    const-string/jumbo v1, "unsupported type plan id: "
 
     invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali
index 63d7734039..037eb18939 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan.smali
@@ -26,9 +26,11 @@
 
 # direct methods
 .method public constructor <init>(JILjava/lang/String;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p4, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +43,6 @@
     iput p5, p0, Lcom/discord/models/domain/ModelSubscriptionPlan;->interval:I
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component3()Ljava/lang/String;
@@ -137,32 +130,25 @@
 .method public final copy(JILjava/lang/String;I)Lcom/discord/models/domain/ModelSubscriptionPlan;
     .locals 7
 
-    if-eqz p4, :cond_0
+    const-string v0, "name"
 
-    new-instance v6, Lcom/discord/models/domain/ModelSubscriptionPlan;
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/models/domain/ModelSubscriptionPlan;
 
-    move-wide v1, p1
+    move-object v1, v0
 
-    move v3, p3
+    move-wide v2, p1
 
-    move-object v4, p4
+    move v4, p3
 
-    move v5, p5
+    move-object v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/models/domain/ModelSubscriptionPlan;-><init>(JILjava/lang/String;I)V
+    move v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/models/domain/ModelSubscriptionPlan;-><init>(JILjava/lang/String;I)V
 
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -194,7 +180,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelSubscriptionPlan;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali b/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali
index 2a36b018f0..d81af2281a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelTypingResponse.smali
@@ -70,7 +70,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelTypingResponse;->messageSendCooldownMs:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali
index 909cba8b66..a2a469da02 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser$Typing.smali
@@ -65,7 +65,7 @@
     goto :goto_0
 
     :sswitch_0
-    const-string v1, "user_id"
+    const-string/jumbo v1, "user_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -182,8 +182,6 @@
     :goto_2
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x7315ce29 -> :sswitch_3
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser.smali b/com.discord/smali/com/discord/models/domain/ModelUser.smali
index 0ee51d7743..7bf9a88fef 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser.smali
@@ -151,7 +151,7 @@
 .method public static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lf/a/d/a/h1;->d:Lf/a/d/a/h1;
+    sget-object v0, Lf/a/d/a/o1;->d:Lf/a/d/a/o1;
 
     sput-object v0, Lcom/discord/models/domain/ModelUser;->sortByName:Ljava/util/Comparator;
 
@@ -630,7 +630,7 @@
     goto :goto_1
 
     :sswitch_8
-    const-string v1, "username"
+    const-string/jumbo v1, "username"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -734,7 +734,7 @@
     goto :goto_1
 
     :sswitch_10
-    const-string v1, "verified"
+    const-string/jumbo v1, "verified"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali b/com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali
index d21281fc4c..0c92a5d395 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali
@@ -40,11 +40,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userAffinities"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "inverseUserAffinities"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,20 +55,6 @@
     iput-object p2, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "inverseUserAffinities"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "userAffinities"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelUserAffinities;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelUserAffinities;
@@ -142,31 +130,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userAffinities"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "inverseUserAffinities"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelUserAffinities;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelUserAffinities;-><init>(Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "inverseUserAffinities"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "userAffinities"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -184,7 +160,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -194,7 +170,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.smali
index 6b03fbf976..f7aa7a76da 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.smali
@@ -107,7 +107,7 @@
 
     const-string v1, "reader.nextString(\"\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser.smali
index e851fd7b9b..9aca6e25e5 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserNote$Update$Parser.smali
@@ -56,7 +56,9 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUserNote$Update;
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lkotlin/jvm/internal/Ref$LongRef;
 
@@ -91,15 +93,6 @@
     invoke-direct {p1, v2, v3, v0}, Lcom/discord/models/domain/ModelUserNote$Update;-><init>(JLjava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserNote$Update.smali b/com.discord/smali/com/discord/models/domain/ModelUserNote$Update.smali
index 3830e511f3..775d55507b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserNote$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserNote$Update.smali
@@ -28,9 +28,11 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "note"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,15 +41,6 @@
     iput-object p3, p0, Lcom/discord/models/domain/ModelUserNote$Update;->note:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "note"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelUserNote$Update;JLjava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelUserNote$Update;
@@ -95,22 +88,15 @@
 .method public final copy(JLjava/lang/String;)Lcom/discord/models/domain/ModelUserNote$Update;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "note"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelUserNote$Update;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/ModelUserNote$Update;-><init>(JLjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "note"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +122,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelUserNote$Update;->note:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserNote.smali b/com.discord/smali/com/discord/models/domain/ModelUserNote.smali
index 081a497b08..a5d396fa75 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserNote.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserNote.smali
@@ -19,9 +19,11 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "note"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,15 +32,6 @@
     iput-object p3, p0, Lcom/discord/models/domain/ModelUserNote;->note:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "note"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/ModelUserNote;JLjava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelUserNote;
@@ -86,22 +79,15 @@
 .method public final copy(JLjava/lang/String;)Lcom/discord/models/domain/ModelUserNote;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "note"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/ModelUserNote;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/ModelUserNote;-><init>(JLjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "note"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -127,7 +113,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/ModelUserNote;->note:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali b/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
index ce464fa5e9..6b560145a6 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
@@ -237,7 +237,7 @@
     goto :goto_1
 
     :sswitch_3
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -319,9 +319,9 @@
     goto :goto_2
 
     :cond_4
-    new-instance v0, Lf/a/d/a/a1;
+    new-instance v0, Lf/a/d/a/h1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/a1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/h1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     sget-object v1, Lf/a/d/a/c;->a:Lf/a/d/a/c;
 
@@ -334,9 +334,9 @@
     goto :goto_2
 
     :cond_5
-    new-instance v0, Lf/a/d/a/b1;
+    new-instance v0, Lf/a/d/a/i1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/b1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/i1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -347,8 +347,6 @@
     :goto_2
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x7811b695 -> :sswitch_4
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali b/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali
index c57eb770b1..f55143ad47 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserRelationship.smali
@@ -25,6 +25,8 @@
 
 .field public user:Lcom/discord/models/domain/ModelUser;
 
+.field public userId:Ljava/lang/Long;
+
 
 # direct methods
 .method public constructor <init>()V
@@ -35,7 +37,7 @@
     return-void
 .end method
 
-.method public constructor <init>(JILcom/discord/models/domain/ModelUser;)V
+.method public constructor <init>(JILcom/discord/models/domain/ModelUser;Ljava/lang/Long;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -46,6 +48,26 @@
 
     iput-object p4, p0, Lcom/discord/models/domain/ModelUserRelationship;->user:Lcom/discord/models/domain/ModelUser;
 
+    iput-object p5, p0, Lcom/discord/models/domain/ModelUserRelationship;->userId:Ljava/lang/Long;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/models/domain/ModelUserRelationship;)V
+    .locals 6
+
+    iget-wide v1, p1, Lcom/discord/models/domain/ModelUserRelationship;->id:J
+
+    iget v3, p1, Lcom/discord/models/domain/ModelUserRelationship;->type:I
+
+    iget-object v4, p1, Lcom/discord/models/domain/ModelUserRelationship;->user:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v5, p1, Lcom/discord/models/domain/ModelUserRelationship;->userId:Ljava/lang/Long;
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/models/domain/ModelUserRelationship;-><init>(JILcom/discord/models/domain/ModelUser;Ljava/lang/Long;)V
+
     return-void
 .end method
 
@@ -91,7 +113,7 @@
 
 # virtual methods
 .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 5
+    .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -106,12 +128,18 @@
 
     move-result v1
 
+    const v2, -0x8c511f1
+
+    const/4 v3, 0x3
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x1
+
+    if-eq v1, v2, :cond_3
+
     const/16 v2, 0xd1b
 
-    const/4 v3, 0x2
-
-    const/4 v4, 0x1
-
     if-eq v1, v2, :cond_2
 
     const v2, 0x368f3a
@@ -125,13 +153,13 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     const/4 v0, 0x2
 
@@ -144,7 +172,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     const/4 v0, 0x0
 
@@ -157,28 +185,52 @@
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     const/4 v0, 0x1
 
     goto :goto_1
 
     :cond_3
+    const-string/jumbo v1, "user_id"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    const/4 v0, 0x3
+
+    goto :goto_1
+
+    :cond_4
     :goto_0
     const/4 v0, -0x1
 
     :goto_1
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_8
 
-    if-eq v0, v4, :cond_5
+    if-eq v0, v5, :cond_7
 
-    if-eq v0, v3, :cond_4
+    if-eq v0, v4, :cond_6
+
+    if-eq v0, v3, :cond_5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
 
     goto :goto_2
 
-    :cond_4
+    :cond_5
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelUserRelationship;->userId:Ljava/lang/Long;
+
+    goto :goto_2
+
+    :cond_6
     new-instance v0, Lcom/discord/models/domain/ModelUser;
 
     invoke-direct {v0}, Lcom/discord/models/domain/ModelUser;-><init>()V
@@ -193,7 +245,7 @@
 
     goto :goto_2
 
-    :cond_5
+    :cond_7
     iget-wide v0, p0, Lcom/discord/models/domain/ModelUserRelationship;->id:J
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -204,7 +256,7 @@
 
     goto :goto_2
 
-    :cond_6
+    :cond_8
     iget v0, p0, Lcom/discord/models/domain/ModelUserRelationship;->type:I
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -289,25 +341,50 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserRelationship;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object p1
+    move-result-object v3
 
     if-nez v1, :cond_5
 
-    if-eqz p1, :cond_6
+    if-eqz v3, :cond_6
 
     goto :goto_0
 
     :cond_5
-    invoke-virtual {v1, p1}, Lcom/discord/models/domain/ModelUser;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v3}, Lcom/discord/models/domain/ModelUser;->equals(Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v1
 
-    if-nez p1, :cond_6
+    if-nez v1, :cond_6
 
     :goto_0
     return v2
 
     :cond_6
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserRelationship;->getUserId()Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserRelationship;->getUserId()Ljava/lang/Long;
+
+    move-result-object p1
+
+    if-nez v1, :cond_7
+
+    if-eqz p1, :cond_8
+
+    goto :goto_1
+
+    :cond_7
+    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_8
+
+    :goto_1
+    return v2
+
+    :cond_8
     return v0
 .end method
 
@@ -335,6 +412,14 @@
     return-object v0
 .end method
 
+.method public getUserId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelUserRelationship;->userId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
 .method public hashCode()I
     .locals 4
 
@@ -368,23 +453,84 @@
 
     mul-int/lit8 v2, v2, 0x3b
 
+    const/16 v3, 0x2b
+
     if-nez v1, :cond_0
 
-    const/16 v0, 0x2b
+    const/16 v1, 0x2b
 
     goto :goto_0
 
     :cond_0
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->hashCode()I
 
-    move-result v0
+    move-result v1
 
     :goto_0
-    add-int/2addr v2, v0
+    add-int/2addr v2, v1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserRelationship;->getUserId()Ljava/lang/Long;
+
+    move-result-object v1
+
+    mul-int/lit8 v2, v2, 0x3b
+
+    if-nez v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    :goto_1
+    add-int/2addr v2, v3
 
     return v2
 .end method
 
+.method public hydrate(Ljava/util/Map;)Lcom/discord/models/domain/ModelUserRelationship;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelUserRelationship;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelUserRelationship;->userId:Ljava/lang/Long;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lcom/discord/models/domain/ModelUserRelationship;
+
+    invoke-direct {v0, p0}, Lcom/discord/models/domain/ModelUserRelationship;-><init>(Lcom/discord/models/domain/ModelUserRelationship;)V
+
+    iget-object v1, v0, Lcom/discord/models/domain/ModelUserRelationship;->userId:Ljava/lang/Long;
+
+    invoke-interface {p1, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    iput-object p1, v0, Lcom/discord/models/domain/ModelUserRelationship;->user:Lcom/discord/models/domain/ModelUser;
+
+    const/4 p1, 0x0
+
+    iput-object p1, v0, Lcom/discord/models/domain/ModelUserRelationship;->userId:Ljava/lang/Long;
+
+    return-object v0
+
+    :cond_0
+    return-object p0
+.end method
+
 .method public toString()Ljava/lang/String;
     .locals 3
 
@@ -420,6 +566,16 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", userId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserRelationship;->getUserId()Ljava/lang/Long;
+
+    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/models/domain/ModelUserSettings.smali b/com.discord/smali/com/discord/models/domain/ModelUserSettings.smali
index fd9106d581..1a84d68d83 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserSettings.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserSettings.smali
@@ -636,9 +636,9 @@
     :pswitch_9
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/e1;
+    new-instance v0, Lf/a/d/a/l1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/e1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/l1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -700,9 +700,9 @@
     :cond_1
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/e1;
+    new-instance v0, Lf/a/d/a/l1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/e1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/l1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -717,9 +717,9 @@
     goto :goto_2
 
     :pswitch_f
-    new-instance v0, Lf/a/d/a/c1;
+    new-instance v0, Lf/a/d/a/j1;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/c1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/j1;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
index a88be5d01b..7a7e82350d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
@@ -134,7 +134,7 @@
     goto :goto_1
 
     :sswitch_3
-    const-string v1, "user_id"
+    const-string/jumbo v1, "user_id"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -396,8 +396,6 @@
     :goto_2
     return-void
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x7315ce29 -> :sswitch_b
diff --git a/com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali b/com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali
index 9fc5b402e3..1e3cc1d0fd 100644
--- a/com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali
+++ b/com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali
@@ -31,7 +31,9 @@
 .method public static final isMuted(ZLcom/discord/models/domain/ModelMuteConfig;Lcom/discord/utilities/time/Clock;)Z
     .locals 5
 
-    if-eqz p2, :cond_3
+    const-string v0, "clock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -77,13 +79,4 @@
 
     :goto_1
     return v0
-
-    :cond_3
-    const-string p0, "clock"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/PatchPaymentSourceRaw.smali b/com.discord/smali/com/discord/models/domain/PatchPaymentSourceRaw.smali
index 2b3f668d83..11df8a859e 100644
--- a/com.discord/smali/com/discord/models/domain/PatchPaymentSourceRaw.smali
+++ b/com.discord/smali/com/discord/models/domain/PatchPaymentSourceRaw.smali
@@ -11,9 +11,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/billing/ModelBillingAddress;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "billingAddress"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,15 +24,6 @@
     iput-boolean p2, p0, Lcom/discord/models/domain/PatchPaymentSourceRaw;->default:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "billingAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/PatchPaymentSourceRaw;Lcom/discord/models/domain/billing/ModelBillingAddress;ZILjava/lang/Object;)Lcom/discord/models/domain/PatchPaymentSourceRaw;
@@ -78,22 +71,15 @@
 .method public final copy(Lcom/discord/models/domain/billing/ModelBillingAddress;Z)Lcom/discord/models/domain/PatchPaymentSourceRaw;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "billingAddress"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/PatchPaymentSourceRaw;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/PatchPaymentSourceRaw;-><init>(Lcom/discord/models/domain/billing/ModelBillingAddress;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "billingAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -111,7 +97,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/PatchPaymentSourceRaw;->billingAddress:Lcom/discord/models/domain/billing/ModelBillingAddress;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/PaymentSourceRaw.smali b/com.discord/smali/com/discord/models/domain/PaymentSourceRaw.smali
index 4cb7143a4b..5aaa4f1ece 100644
--- a/com.discord/smali/com/discord/models/domain/PaymentSourceRaw.smali
+++ b/com.discord/smali/com/discord/models/domain/PaymentSourceRaw.smali
@@ -29,11 +29,13 @@
 .method public constructor <init>(ILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "billingAddress"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,20 +60,6 @@
     iput p10, p0, Lcom/discord/models/domain/PaymentSourceRaw;->expiresYear:I
 
     return-void
-
-    :cond_0
-    const-string p1, "billingAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/PaymentSourceRaw;ILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIILjava/lang/Object;)Lcom/discord/models/domain/PaymentSourceRaw;
@@ -313,11 +301,17 @@
 .method public final copy(ILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;II)Lcom/discord/models/domain/PaymentSourceRaw;
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p2, :cond_1
+    move-object v3, p2
 
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "billingAddress"
+
+    move-object/from16 v5, p4
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/PaymentSourceRaw;
 
@@ -325,12 +319,8 @@
 
     move v2, p1
 
-    move-object v3, p2
-
     move v4, p3
 
-    move-object/from16 v5, p4
-
     move/from16 v6, p5
 
     move-object/from16 v7, p6
@@ -346,20 +336,6 @@
     invoke-direct/range {v1 .. v11}, Lcom/discord/models/domain/PaymentSourceRaw;-><init>(ILjava/lang/String;ZLcom/discord/models/domain/billing/ModelBillingAddress;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "billingAddress"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "id"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -383,7 +359,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/PaymentSourceRaw;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -399,7 +375,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/PaymentSourceRaw;->billingAddress:Lcom/discord/models/domain/billing/ModelBillingAddress;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -415,7 +391,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/PaymentSourceRaw;->email:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -425,7 +401,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/PaymentSourceRaw;->brand:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -435,7 +411,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/PaymentSourceRaw;->last_4:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1$1.smali b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1$1.smali
index 6ed6105eaf..9ee558b73b 100644
--- a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1$1.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1$1.smali
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method public final get()J
+.method public final get()Ljava/lang/Long;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1$1;->this$0:Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1;
@@ -59,19 +59,19 @@
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic get()Ljava/lang/Object;
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1$1;->get()J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
     return-object v0
 .end method
+
+.method public bridge synthetic get()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1$1;->get()Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1.smali
index c26e2433f0..08694888d4 100644
--- a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1.smali
@@ -95,7 +95,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1;->$rtcServerId:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -116,7 +116,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1;->$paused:Lkotlin/jvm/internal/Ref$BooleanRef;
 
@@ -128,7 +128,7 @@
 
     const-string v1, "reader.nextBooleanOrNull()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -145,7 +145,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -155,27 +155,20 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     goto :goto_1
 
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :sswitch_3
-    const-string v0, "viewer_ids"
+    const-string/jumbo v0, "viewer_ids"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1;->$viewerIds:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -193,7 +186,7 @@
 
     goto :goto_1
 
-    :cond_2
+    :cond_1
     :goto_0
     iget-object p1, p0, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
 
@@ -202,6 +195,8 @@
     :goto_1
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x506b60f5 -> :sswitch_3
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser.smali
index 5c1536e139..2d02ce4dae 100644
--- a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate$Parser.smali
@@ -56,21 +56,21 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamCreateOrUpdate;
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v7, 0x0
 
-    iput-object v0, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v7, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v7, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v9, Lkotlin/jvm/internal/Ref$BooleanRef;
 
@@ -84,13 +84,13 @@
 
     invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v7, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v11, Lcom/discord/models/domain/StreamCreateOrUpdate$Parser$parse$1;
 
     move-object v1, v11
 
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v3, p1
 
@@ -106,16 +106,16 @@
 
     new-instance p1, Lcom/discord/models/domain/StreamCreateOrUpdate;
 
-    iget-object v1, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    if-eqz v1, :cond_1
-
-    check-cast v1, Ljava/lang/String;
-
-    iget-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    if-eqz v0, :cond_1
 
     check-cast v0, Ljava/lang/String;
 
+    iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v1, Ljava/lang/String;
+
     iget-boolean v2, v9, Lkotlin/jvm/internal/Ref$BooleanRef;->element:Z
 
     iget-object v3, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
@@ -127,26 +127,19 @@
     goto :goto_0
 
     :cond_0
-    sget-object v3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v3, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
-    invoke-direct {p1, v1, v0, v2, v3}, Lcom/discord/models/domain/StreamCreateOrUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
+    invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/models/domain/StreamCreateOrUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
 
     return-object p1
 
     :cond_1
     const-string p1, "streamKey"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_2
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v7
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate.smali b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate.smali
index cd9fe01532..aaa351e4ae 100644
--- a/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamCreateOrUpdate.smali
@@ -44,11 +44,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,20 +63,6 @@
     iput-object p4, p0, Lcom/discord/models/domain/StreamCreateOrUpdate;->viewerIds:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "viewerIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/StreamCreateOrUpdate;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/StreamCreateOrUpdate;
@@ -172,31 +160,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/StreamCreateOrUpdate;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/domain/StreamCreateOrUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "viewerIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -214,7 +190,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/StreamCreateOrUpdate;->streamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -224,7 +200,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/StreamCreateOrUpdate;->rtcServerId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -240,7 +216,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/StreamCreateOrUpdate;->viewerIds:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/StreamDelete$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser$parse$1.smali
index 2724ab700d..cc523b9dfd 100644
--- a/com.discord/smali/com/discord/models/domain/StreamDelete$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser$parse$1.smali
@@ -101,7 +101,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$unavailable:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -122,7 +122,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reasonStr:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -143,7 +143,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -153,20 +153,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_4
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     goto :goto_1
 
     :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_5
     :goto_0
     iget-object p1, p0, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
 
diff --git a/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali
index 27246336cd..1241b0f905 100644
--- a/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali
@@ -56,31 +56,31 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamDelete;
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v3, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v3}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v4, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;
 
-    invoke-direct {v4, v1, p1, v2, v3}, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    invoke-direct {v4, v0, p1, v2, v3}, Lcom/discord/models/domain/StreamDelete$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
     invoke-virtual {p1, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
@@ -138,7 +138,7 @@
     goto :goto_1
 
     :cond_3
-    const-string v2, "user_requested"
+    const-string/jumbo v2, "user_requested"
 
     invoke-virtual {p1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -157,45 +157,38 @@
     :goto_1
     new-instance v2, Lcom/discord/models/domain/StreamDelete;
 
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
-    check-cast v1, Ljava/lang/String;
+    check-cast v0, Ljava/lang/String;
 
-    iget-object v0, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v0, Ljava/lang/Boolean;
+    check-cast v1, Ljava/lang/Boolean;
 
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v0
+    move-result v1
 
     goto :goto_2
 
     :cond_5
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_2
-    invoke-direct {v2, v1, p1, v0}, Lcom/discord/models/domain/StreamDelete;-><init>(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)V
+    invoke-direct {v2, v0, p1, v1}, Lcom/discord/models/domain/StreamDelete;-><init>(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)V
 
     return-object v2
 
     :cond_6
     const-string p1, "streamKey"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_7
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/StreamDelete.smali b/com.discord/smali/com/discord/models/domain/StreamDelete.smali
index 1c76df72d3..d23b8ffd23 100644
--- a/com.discord/smali/com/discord/models/domain/StreamDelete.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamDelete.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "reason"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,20 +41,6 @@
     iput-boolean p3, p0, Lcom/discord/models/domain/StreamDelete;->unavailable:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/StreamDelete;Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;ZILjava/lang/Object;)Lcom/discord/models/domain/StreamDelete;
@@ -115,31 +103,19 @@
 .method public final copy(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)Lcom/discord/models/domain/StreamDelete;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "reason"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/StreamDelete;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/StreamDelete;-><init>(Ljava/lang/String;Lcom/discord/models/domain/StreamDelete$Reason;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -157,7 +133,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/StreamDelete;->streamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -167,7 +143,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/StreamDelete;->reason:Lcom/discord/models/domain/StreamDelete$Reason;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser$parse$1.smali
index d10a03627b..56e7d3f399 100644
--- a/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser$parse$1.smali
@@ -69,7 +69,7 @@
 .end method
 
 .method public final call(Ljava/lang/String;)V
-    .locals 3
+    .locals 2
 
     if-nez p1, :cond_0
 
@@ -82,13 +82,11 @@
 
     const v1, -0x4731a2e0
 
-    const/4 v2, 0x0
-
-    if-eq v0, v1, :cond_4
+    if-eq v0, v1, :cond_3
 
     const v1, 0x696b9f9
 
-    if-eq v0, v1, :cond_3
+    if-eq v0, v1, :cond_2
 
     const v1, 0x67c71d95
 
@@ -103,7 +101,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$endpoint:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -113,25 +111,20 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     goto :goto_1
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_3
     const-string v0, "token"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$token:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -145,14 +138,14 @@
 
     goto :goto_1
 
-    :cond_4
+    :cond_3
     const-string v0, "stream_key"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$streamKey:Lkotlin/jvm/internal/Ref$ObjectRef;
 
@@ -162,18 +155,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_5
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     goto :goto_1
 
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_6
+    :cond_4
     :goto_0
     iget-object p1, p0, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
 
diff --git a/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali
index e6783373f1..5fa2a3e7c1 100644
--- a/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali
@@ -56,41 +56,41 @@
 .method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/StreamServerUpdate;
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "reader"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    new-instance v1, Lkotlin/jvm/internal/Ref$ObjectRef;
+    move-result-object v0
 
-    invoke-direct {v1}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object v0, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v2, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v3, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v3}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v4, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;
 
-    invoke-direct {v4, v1, p1, v2, v3}, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+    invoke-direct {v4, v0, p1, v2, v3}, Lcom/discord/models/domain/StreamServerUpdate$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
     invoke-virtual {p1, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance p1, Lcom/discord/models/domain/StreamServerUpdate;
 
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    check-cast v1, Ljava/lang/String;
+    check-cast v0, Ljava/lang/String;
 
     iget-object v2, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -98,34 +98,27 @@
 
     check-cast v2, Ljava/lang/String;
 
-    iget-object v0, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v0, Ljava/lang/String;
+    check-cast v1, Ljava/lang/String;
 
-    invoke-direct {p1, v1, v2, v0}, Lcom/discord/models/domain/StreamServerUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {p1, v0, v2, v1}, Lcom/discord/models/domain/StreamServerUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object p1
 
     :cond_0
     const-string p1, "endpoint"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
     const-string p1, "streamKey"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_2
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali b/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali
index 8fde6c445a..c6b27e6883 100644
--- a/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali
@@ -23,11 +23,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "endpoint"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,20 +40,6 @@
     iput-object p3, p0, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "endpoint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/StreamServerUpdate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/StreamServerUpdate;
@@ -114,31 +102,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/StreamServerUpdate;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "endpoint"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/StreamServerUpdate;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/StreamServerUpdate;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "endpoint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -156,7 +132,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/StreamServerUpdate;->streamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -166,7 +142,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/StreamServerUpdate;->endpoint:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -176,7 +152,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/StreamServerUpdate;->token:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/StreamType$Companion.smali b/com.discord/smali/com/discord/models/domain/StreamType$Companion.smali
index 714acc4a02..dbd4874218 100644
--- a/com.discord/smali/com/discord/models/domain/StreamType$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/StreamType$Companion.smali
@@ -34,49 +34,49 @@
 
 # virtual methods
 .method public final fromString(Ljava/lang/String;)Lcom/discord/models/domain/StreamType;
-    .locals 6
+    .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "string"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/models/domain/StreamType;->access$getVALUES$cp()[Lcom/discord/models/domain/StreamType;
 
-    move-result-object v1
+    move-result-object v0
 
-    array-length v2, v1
+    array-length v1, v0
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-ge v3, v2, :cond_1
+    if-ge v2, v1, :cond_1
 
-    aget-object v4, v1, v3
+    aget-object v3, v0, v2
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/StreamType;->getSerializedRepresentation()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/discord/models/domain/StreamType;->getSerializedRepresentation()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_0
-
-    move-object v0, v4
+    if-eqz v4, :cond_0
 
     goto :goto_1
 
     :cond_0
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
 
     :cond_1
-    :goto_1
-    if-eqz v0, :cond_2
+    const/4 v3, 0x0
 
-    return-object v0
+    :goto_1
+    if-eqz v3, :cond_2
+
+    return-object v3
 
     :cond_2
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -90,11 +90,4 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_3
-    const-string p1, "string"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/models/domain/activity/ModelActivity.smali b/com.discord/smali/com/discord/models/domain/activity/ModelActivity.smali
index df2c63782a..95f41a4e63 100644
--- a/com.discord/smali/com/discord/models/domain/activity/ModelActivity.smali
+++ b/com.discord/smali/com/discord/models/domain/activity/ModelActivity.smali
@@ -558,7 +558,7 @@
     goto :goto_1
 
     :sswitch_d
-    const-string v1, "url"
+    const-string/jumbo v1, "url"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -625,9 +625,9 @@
     :pswitch_0
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/i1/a;
+    new-instance v0, Lf/a/d/a/p1/a;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/i1/a;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/p1/a;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -640,9 +640,9 @@
     :pswitch_1
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/i1/a;
+    new-instance v0, Lf/a/d/a/p1/a;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/i1/a;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/p1/a;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -828,6 +828,8 @@
     :goto_2
     return-void
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         -0x67dc72c1 -> :sswitch_10
@@ -1417,7 +1419,7 @@
 
     if-eqz v0, :cond_0
 
-    const-string v0, "xbox"
+    const-string/jumbo v0, "xbox"
 
     return-object v0
 
@@ -1472,7 +1474,7 @@
 
     if-eqz v0, :cond_0
 
-    const-string v0, "xbox"
+    const-string/jumbo v0, "xbox"
 
     return-object v0
 
@@ -2092,7 +2094,7 @@
 
     if-eqz v0, :cond_0
 
-    const-string v1, "xbox"
+    const-string/jumbo v1, "xbox"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali
index 5748ecc180..97bd45d550 100644
--- a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali
+++ b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali
@@ -131,9 +131,9 @@
 
     :cond_3
     :try_start_0
-    new-instance v0, Lf/a/d/a/i1/b;
+    new-instance v0, Lf/a/d/a/p1/b;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/i1/b;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/p1/b;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/auth/ModelLoginResult.smali b/com.discord/smali/com/discord/models/domain/auth/ModelLoginResult.smali
index d45f22c451..44afdf8a4a 100644
--- a/com.discord/smali/com/discord/models/domain/auth/ModelLoginResult.smali
+++ b/com.discord/smali/com/discord/models/domain/auth/ModelLoginResult.smali
@@ -148,7 +148,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/auth/ModelLoginResult;->ticket:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -158,7 +158,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/auth/ModelLoginResult;->token:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -168,7 +168,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/auth/ModelLoginResult;->userSettings:Lcom/discord/models/domain/auth/ModelUserSettingsBootstrap;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/auth/ModelUserSettingsBootstrap.smali b/com.discord/smali/com/discord/models/domain/auth/ModelUserSettingsBootstrap.smali
index c6bba11e29..b1c0821fed 100644
--- a/com.discord/smali/com/discord/models/domain/auth/ModelUserSettingsBootstrap.smali
+++ b/com.discord/smali/com/discord/models/domain/auth/ModelUserSettingsBootstrap.smali
@@ -89,7 +89,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/auth/ModelUserSettingsBootstrap;->theme:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -99,7 +99,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/auth/ModelUserSettingsBootstrap;->locale:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/auth/Scopes.smali b/com.discord/smali/com/discord/models/domain/auth/Scopes.smali
index fa22b49a8c..376d844e47 100644
--- a/com.discord/smali/com/discord/models/domain/auth/Scopes.smali
+++ b/com.discord/smali/com/discord/models/domain/auth/Scopes.smali
@@ -64,7 +64,7 @@
     return-void
 .end method
 
-.method public static synthetic WEBHOOK_INCOMING$annotations()V
+.method public static synthetic getWEBHOOK_INCOMING$annotations()V
     .locals 0
 
     return-void
diff --git a/com.discord/smali/com/discord/models/domain/billing/ModelBillingAddress.smali b/com.discord/smali/com/discord/models/domain/billing/ModelBillingAddress.smali
index 718ca22376..4c1f0ac4d7 100644
--- a/com.discord/smali/com/discord/models/domain/billing/ModelBillingAddress.smali
+++ b/com.discord/smali/com/discord/models/domain/billing/ModelBillingAddress.smali
@@ -23,21 +23,33 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "line_1"
 
-    if-eqz p3, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "line_2"
 
-    if-eqz p5, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "city"
 
-    if-eqz p7, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "country"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "postalCode"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,55 +68,6 @@
     iput-object p7, p0, Lcom/discord/models/domain/billing/ModelBillingAddress;->postalCode:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "postalCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "country"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "city"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "line_2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "line_1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/billing/ModelBillingAddress;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/billing/ModelBillingAddress;
@@ -255,92 +218,55 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/billing/ModelBillingAddress;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_6
+    move-object v2, p1
 
-    if-eqz p2, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "line_1"
 
-    if-eqz p4, :cond_3
+    move-object v3, p2
 
-    if-eqz p5, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "line_2"
 
-    if-eqz p7, :cond_0
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "city"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "country"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "postalCode"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/billing/ModelBillingAddress;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
-    move-object v7, p6
-
-    move-object/from16 v8, p7
-
     invoke-direct/range {v1 .. v8}, Lcom/discord/models/domain/billing/ModelBillingAddress;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "postalCode"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "country"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "state"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "city"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "line_2"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "line_1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -358,7 +284,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelBillingAddress;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -368,7 +294,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelBillingAddress;->line_1:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -378,7 +304,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelBillingAddress;->line_2:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -388,7 +314,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelBillingAddress;->city:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -398,7 +324,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelBillingAddress;->state:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -408,7 +334,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelBillingAddress;->country:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -418,7 +344,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/billing/ModelBillingAddress;->postalCode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/billing/ModelInvoiceItem.smali b/com.discord/smali/com/discord/models/domain/billing/ModelInvoiceItem.smali
index 171af38ca9..7191e2e8fb 100644
--- a/com.discord/smali/com/discord/models/domain/billing/ModelInvoiceItem.smali
+++ b/com.discord/smali/com/discord/models/domain/billing/ModelInvoiceItem.smali
@@ -29,7 +29,7 @@
 
 # direct methods
 .method public constructor <init>(ILjava/util/List;JZIJI)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I",
@@ -39,7 +39,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "discount"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,15 +60,6 @@
     iput p9, p0, Lcom/discord/models/domain/billing/ModelInvoiceItem;->subscriptionPlanPrice:I
 
     return-void
-
-    :cond_0
-    const-string p1, "discount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/billing/ModelInvoiceItem;ILjava/util/List;JZIJIILjava/lang/Object;)Lcom/discord/models/domain/billing/ModelInvoiceItem;
@@ -257,38 +250,31 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
-
-    new-instance v10, Lcom/discord/models/domain/billing/ModelInvoiceItem;
-
-    move-object v0, v10
-
-    move v1, p1
-
-    move-object v2, p2
-
-    move-wide v3, p3
-
-    move/from16 v5, p5
-
-    move/from16 v6, p6
-
-    move-wide/from16 v7, p7
-
-    move/from16 v9, p9
-
-    invoke-direct/range {v0 .. v9}, Lcom/discord/models/domain/billing/ModelInvoiceItem;-><init>(ILjava/util/List;JZIJI)V
-
-    return-object v10
-
-    :cond_0
     const-string v0, "discount"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v3, p2
 
-    const/4 v0, 0x0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/models/domain/billing/ModelInvoiceItem;
+
+    move-object v1, v0
+
+    move v2, p1
+
+    move-wide v4, p3
+
+    move/from16 v6, p5
+
+    move/from16 v7, p6
+
+    move-wide/from16 v8, p7
+
+    move/from16 v10, p9
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/models/domain/billing/ModelInvoiceItem;-><init>(ILjava/util/List;JZIJI)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -312,7 +298,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelInvoiceItem;->discount:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/billing/ModelInvoicePreview.smali b/com.discord/smali/com/discord/models/domain/billing/ModelInvoicePreview.smali
index 1c516c0ed4..13abf07788 100644
--- a/com.discord/smali/com/discord/models/domain/billing/ModelInvoicePreview.smali
+++ b/com.discord/smali/com/discord/models/domain/billing/ModelInvoicePreview.smali
@@ -48,15 +48,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "currency"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "invoiceItems"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "subscriptionPeriodEnd"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "subscriptionPeriodStart"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -79,34 +85,6 @@
     iput p10, p0, Lcom/discord/models/domain/billing/ModelInvoicePreview;->total:I
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptionPeriodStart"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscriptionPeriodEnd"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "invoiceItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "currency"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/billing/ModelInvoicePreview;Ljava/lang/String;JLjava/util/List;Ljava/lang/String;Ljava/lang/String;IIZIILjava/lang/Object;)Lcom/discord/models/domain/billing/ModelInvoicePreview;
@@ -348,30 +326,36 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "currency"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p4, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "invoiceItems"
 
-    if-eqz p6, :cond_0
+    move-object/from16 v5, p4
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "subscriptionPeriodEnd"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "subscriptionPeriodStart"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/billing/ModelInvoicePreview;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-wide v3, p2
 
-    move-object/from16 v5, p4
-
-    move-object/from16 v6, p5
-
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
     move/from16 v9, p8
@@ -383,34 +367,6 @@
     invoke-direct/range {v1 .. v11}, Lcom/discord/models/domain/billing/ModelInvoicePreview;-><init>(Ljava/lang/String;JLjava/util/List;Ljava/lang/String;Ljava/lang/String;IIZI)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "subscriptionPeriodStart"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "subscriptionPeriodEnd"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "invoiceItems"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "currency"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -428,7 +384,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelInvoicePreview;->currency:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -446,7 +402,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelInvoicePreview;->invoiceItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -456,7 +412,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelInvoicePreview;->subscriptionPeriodEnd:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -466,7 +422,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/billing/ModelInvoicePreview;->subscriptionPeriodStart:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali
index 183ef86267..71e0550c8e 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom$Update.smali
@@ -165,9 +165,9 @@
     goto :goto_2
 
     :cond_5
-    new-instance v0, Lf/a/d/a/j1/a;
+    new-instance v0, Lf/a/d/a/q1/a;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/j1/a;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/q1/a;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali
index 54b234b47e..dcc463032d 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiCustom.smali
@@ -300,7 +300,7 @@
     goto :goto_0
 
     :cond_0
-    const-string p0, "webp"
+    const-string/jumbo p0, "webp"
 
     :goto_0
     const/4 p1, 0x1
@@ -549,9 +549,9 @@
     :pswitch_4
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lf/a/d/a/j1/e;
+    new-instance v0, Lf/a/d/a/q1/e;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/j1/e;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/q1/e;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiGuild.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiGuild.smali
index c8528e8978..6a9d0e122a 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiGuild.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiGuild.smali
@@ -45,13 +45,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "roles"
 
-    if-eqz p7, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "user"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -72,27 +76,6 @@
     iput-boolean p9, p0, Lcom/discord/models/domain/emoji/ModelEmojiGuild;->available:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "roles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/emoji/ModelEmojiGuild;JLjava/lang/String;ZLjava/util/List;ZLcom/discord/models/domain/ModelUser;ZZILjava/lang/Object;)Lcom/discord/models/domain/emoji/ModelEmojiGuild;
@@ -311,13 +294,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p3, :cond_2
+    move-object v4, p3
 
-    if-eqz p5, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_0
+    const-string v0, "roles"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "user"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/emoji/ModelEmojiGuild;
 
@@ -325,16 +318,10 @@
 
     move-wide v2, p1
 
-    move-object v4, p3
-
     move v5, p4
 
-    move-object/from16 v6, p5
-
     move/from16 v7, p6
 
-    move-object/from16 v8, p7
-
     move/from16 v9, p8
 
     move/from16 v10, p9
@@ -342,27 +329,6 @@
     invoke-direct/range {v1 .. v10}, Lcom/discord/models/domain/emoji/ModelEmojiGuild;-><init>(JLjava/lang/String;ZLjava/util/List;ZLcom/discord/models/domain/ModelUser;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "roles"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -388,7 +354,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/emoji/ModelEmojiGuild;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -404,7 +370,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/emoji/ModelEmojiGuild;->roles:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -420,7 +386,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/emoji/ModelEmojiGuild;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali
index d780256a8d..14e01e280c 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode$Bundle.smali
@@ -89,9 +89,9 @@
 
     iget-object v1, p0, Lcom/discord/models/domain/emoji/ModelEmojiUnicode$Bundle;->emojis:Ljava/util/Map;
 
-    new-instance v2, Lf/a/d/a/j1/b;
+    new-instance v2, Lf/a/d/a/q1/b;
 
-    invoke-direct {v2, p1}, Lf/a/d/a/j1/b;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v2, p1}, Lf/a/d/a/q1/b;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali
index 4a6b305d2f..d6cff65b46 100644
--- a/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali
+++ b/com.discord/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali
@@ -469,9 +469,9 @@
     goto :goto_2
 
     :pswitch_0
-    new-instance v0, Lf/a/d/a/j1/c;
+    new-instance v0, Lf/a/d/a/q1/c;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/j1/c;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/q1/c;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
@@ -537,9 +537,9 @@
     goto :goto_2
 
     :pswitch_6
-    new-instance v0, Lf/a/d/a/j1/d;
+    new-instance v0, Lf/a/d/a/q1/d;
 
-    invoke-direct {v0, p1}, Lf/a/d/a/j1/d;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    invoke-direct {v0, p1}, Lf/a/d/a/q1/d;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali
index fe1892350b..9b341d03ca 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage.smali
@@ -81,7 +81,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum$AlbumImage;->url:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali
index 07fabf3858..b33520bc5d 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyAlbum.smali
@@ -45,15 +45,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "albumType"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "id"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "images"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "name"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,34 +72,6 @@
     iput-object p4, p0, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "images"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "albumType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
@@ -192,49 +170,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "albumType"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "id"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "images"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "name"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "images"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "albumType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -252,7 +208,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->albumType:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -262,7 +218,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -272,7 +228,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->images:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -282,7 +238,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->name:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali
index 967d906d45..f686d10d41 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyArtist.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,20 +28,6 @@
     iput-object p2, p0, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
@@ -87,31 +75,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -129,7 +105,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -139,7 +115,7 @@
 
     iget-object p1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;->name:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali
index e0954b4c9e..5cc7d17c84 100644
--- a/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali
+++ b/com.discord/smali/com/discord/models/domain/spotify/ModelSpotifyTrack.smali
@@ -41,13 +41,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "name"
 
-    if-eqz p6, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "artists"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -64,27 +68,6 @@
     iput-boolean p7, p0, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->isLocal:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "artists"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/domain/spotify/ModelSpotifyTrack;Ljava/lang/String;Ljava/lang/String;JLcom/discord/models/domain/spotify/ModelSpotifyAlbum;Ljava/util/List;ZILjava/lang/Object;)Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
@@ -237,54 +220,37 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "name"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "artists"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move-wide v4, p3
 
     move-object v6, p5
 
-    move-object v7, p6
-
     move/from16 v8, p7
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;-><init>(Ljava/lang/String;Ljava/lang/String;JLcom/discord/models/domain/spotify/ModelSpotifyAlbum;Ljava/util/List;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "artists"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "id"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -302,7 +268,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -312,7 +278,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -330,7 +296,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->album:Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -340,7 +306,7 @@
 
     iget-object v1, p1, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->artists:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/dsti/dto/ModelDsti$Parser.smali b/com.discord/smali/com/discord/models/dsti/dto/ModelDsti$Parser.smali
index 297631a09d..ee81c7b309 100644
--- a/com.discord/smali/com/discord/models/dsti/dto/ModelDsti$Parser.smali
+++ b/com.discord/smali/com/discord/models/dsti/dto/ModelDsti$Parser.smali
@@ -50,135 +50,133 @@
 
     move-object/from16 v9, p1
 
-    const/4 v10, 0x0
+    const-string v0, "reader"
 
-    if-eqz v9, :cond_4
+    invoke-static {v9, v0}, Lf/e/b/a/a;->L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    move-result-object v10
+
+    const/4 v0, 0x0
+
+    iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v10, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v10, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v10, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v14, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v14}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v10, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v15, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v15}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v10, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v10, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
+    new-instance v7, Lcom/discord/models/dsti/dto/ModelDsti$Parser$parse$1;
 
-    invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    move-object v0, v7
 
-    iput-object v10, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    new-instance v6, Lcom/discord/models/dsti/dto/ModelDsti$Parser$parse$1;
-
-    move-object v0, v6
-
-    move-object v1, v11
+    move-object v1, v10
 
     move-object/from16 v2, p1
 
-    move-object v3, v12
+    move-object v3, v11
 
-    move-object v4, v13
+    move-object v4, v12
 
-    move-object v5, v14
+    move-object v5, v13
 
-    move-object v10, v6
+    move-object v6, v14
 
-    move-object v6, v15
+    move-object/from16 v16, v14
 
-    move-object/from16 v16, v7
+    move-object v14, v7
 
-    move-object v7, v8
+    move-object v7, v15
 
     move-object/from16 v17, v8
 
-    move-object/from16 v8, v16
-
     invoke-direct/range {v0 .. v8}, Lcom/discord/models/dsti/dto/ModelDsti$Parser$parse$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
 
-    invoke-virtual {v9, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+    invoke-virtual {v9, v14}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
 
     new-instance v0, Lcom/discord/models/dsti/dto/ModelDsti;
 
-    iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
-    if-eqz v1, :cond_3
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v19
 
-    iget-object v1, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
-    if-eqz v1, :cond_2
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v21
 
-    iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object/from16 v23, v1
 
     check-cast v23, Ljava/lang/String;
 
-    if-eqz v23, :cond_1
+    invoke-static/range {v23 .. v23}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget-object v1, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object/from16 v24, v1
 
     check-cast v24, Ljava/lang/String;
 
-    if-eqz v24, :cond_0
+    invoke-static/range {v24 .. v24}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget-object v1, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    move-object/from16 v1, v16
+
+    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object/from16 v25, v1
 
     check-cast v25, Ljava/lang/String;
 
-    move-object/from16 v1, v17
-
-    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     move-object/from16 v26, v1
 
     check-cast v26, Ljava/lang/String;
 
-    move-object/from16 v1, v16
+    move-object/from16 v1, v17
 
     iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
@@ -191,43 +189,6 @@
     invoke-direct/range {v18 .. v27}, Lcom/discord/models/dsti/dto/ModelDsti;-><init>(JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V
 
     return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    const/4 v0, 0x0
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
-    const/4 v0, 0x0
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    move-object v0, v10
-
-    const-string v1, "reader"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/models/dsti/dto/ModelDsti.smali b/com.discord/smali/com/discord/models/dsti/dto/ModelDsti.smali
index ed088aaa18..212e644d48 100644
--- a/com.discord/smali/com/discord/models/dsti/dto/ModelDsti.smali
+++ b/com.discord/smali/com/discord/models/dsti/dto/ModelDsti.smali
@@ -50,11 +50,13 @@
 .method public constructor <init>(JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p5, :cond_1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "description"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -73,20 +75,6 @@
     iput-object p9, p0, Lcom/discord/models/dsti/dto/ModelDsti;->formatType:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "description"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/dsti/dto/ModelDsti;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/discord/models/dsti/dto/ModelDsti;
@@ -272,11 +260,17 @@
 .method public final copy(JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)Lcom/discord/models/dsti/dto/ModelDsti;
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p5, :cond_1
+    move-object/from16 v6, p5
 
-    if-eqz p6, :cond_0
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "description"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/dsti/dto/ModelDsti;
 
@@ -286,10 +280,6 @@
 
     move-wide v4, p3
 
-    move-object/from16 v6, p5
-
-    move-object/from16 v7, p6
-
     move-object/from16 v8, p7
 
     move-object/from16 v9, p8
@@ -299,20 +289,6 @@
     invoke-direct/range {v1 .. v10}, Lcom/discord/models/dsti/dto/ModelDsti;-><init>(JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "description"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -346,7 +322,7 @@
 
     iget-object v1, p1, Lcom/discord/models/dsti/dto/ModelDsti;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -356,7 +332,7 @@
 
     iget-object v1, p1, Lcom/discord/models/dsti/dto/ModelDsti;->description:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -366,7 +342,7 @@
 
     iget-object v1, p1, Lcom/discord/models/dsti/dto/ModelDsti;->asset:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -376,7 +352,7 @@
 
     iget-object v1, p1, Lcom/discord/models/dsti/dto/ModelDsti;->previewAsset:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -386,7 +362,7 @@
 
     iget-object p1, p1, Lcom/discord/models/dsti/dto/ModelDsti;->formatType:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -461,7 +437,7 @@
     :goto_0
     iget-object v1, p0, Lcom/discord/models/dsti/dto/ModelDsti;->asset:Ljava/lang/String;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1, v0}, Lk0/o/c/i;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/models/dsti/dto/ModelDstiPack.smali b/com.discord/smali/com/discord/models/dsti/dto/ModelDstiPack.smali
index db53da471e..cb1f83530c 100644
--- a/com.discord/smali/com/discord/models/dsti/dto/ModelDstiPack.smali
+++ b/com.discord/smali/com/discord/models/dsti/dto/ModelDstiPack.smali
@@ -36,11 +36,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "stickers"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,20 +55,6 @@
     iput-object p5, p0, Lcom/discord/models/dsti/dto/ModelDstiPack;->storeListing:Lcom/discord/models/dsti/dto/ModelDstiStoreListing;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stickers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/dsti/dto/ModelDstiPack;JLjava/util/List;Ljava/lang/String;Lcom/discord/models/dsti/dto/ModelDstiStoreListing;ILjava/lang/Object;)Lcom/discord/models/dsti/dto/ModelDstiPack;
@@ -174,11 +162,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "stickers"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/dsti/dto/ModelDstiPack;
 
@@ -195,20 +185,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/models/dsti/dto/ModelDstiPack;-><init>(JLjava/util/List;Ljava/lang/String;Lcom/discord/models/dsti/dto/ModelDstiStoreListing;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stickers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -234,7 +210,7 @@
 
     iget-object v1, p1, Lcom/discord/models/dsti/dto/ModelDstiPack;->stickers:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -244,7 +220,7 @@
 
     iget-object v1, p1, Lcom/discord/models/dsti/dto/ModelDstiPack;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -254,7 +230,7 @@
 
     iget-object p1, p1, Lcom/discord/models/dsti/dto/ModelDstiPack;->storeListing:Lcom/discord/models/dsti/dto/ModelDstiStoreListing;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/dsti/dto/ModelDstiStoreListing.smali b/com.discord/smali/com/discord/models/dsti/dto/ModelDstiStoreListing.smali
index f5553a5da3..89b847e523 100644
--- a/com.discord/smali/com/discord/models/dsti/dto/ModelDstiStoreListing.smali
+++ b/com.discord/smali/com/discord/models/dsti/dto/ModelDstiStoreListing.smali
@@ -15,11 +15,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelSku;JLjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "sku"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "description"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,20 +32,6 @@
     iput-object p4, p0, Lcom/discord/models/dsti/dto/ModelDstiStoreListing;->description:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "description"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sku"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/dsti/dto/ModelDstiStoreListing;Lcom/discord/models/domain/ModelSku;JLjava/lang/String;ILjava/lang/Object;)Lcom/discord/models/dsti/dto/ModelDstiStoreListing;
@@ -106,31 +94,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelSku;JLjava/lang/String;)Lcom/discord/models/dsti/dto/ModelDstiStoreListing;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "sku"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "description"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/dsti/dto/ModelDstiStoreListing;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/dsti/dto/ModelDstiStoreListing;-><init>(Lcom/discord/models/domain/ModelSku;JLjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "description"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sku"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -148,7 +124,7 @@
 
     iget-object v1, p1, Lcom/discord/models/dsti/dto/ModelDstiStoreListing;->sku:Lcom/discord/models/domain/ModelSku;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -166,7 +142,7 @@
 
     iget-object p1, p1, Lcom/discord/models/dsti/dto/ModelDstiStoreListing;->description:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/gifpicker/domain/ModelGifCategory.smali b/com.discord/smali/com/discord/models/gifpicker/domain/ModelGifCategory.smali
index 1ebe77ef7c..686d293fa2 100644
--- a/com.discord/smali/com/discord/models/gifpicker/domain/ModelGifCategory.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/domain/ModelGifCategory.smali
@@ -16,11 +16,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "categoryName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "gifPreviewUrl"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,20 +31,6 @@
     iput-object p2, p0, Lcom/discord/models/gifpicker/domain/ModelGifCategory;->gifPreviewUrl:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifPreviewUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "categoryName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/gifpicker/domain/ModelGifCategory;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/gifpicker/domain/ModelGifCategory;
@@ -90,31 +78,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/gifpicker/domain/ModelGifCategory;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "categoryName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "gifPreviewUrl"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/domain/ModelGifCategory;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/gifpicker/domain/ModelGifCategory;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifPreviewUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "categoryName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -132,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/domain/ModelGifCategory;->categoryName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -142,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/models/gifpicker/domain/ModelGifCategory;->gifPreviewUrl:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/gifpicker/dto/GifCategoryDto.smali b/com.discord/smali/com/discord/models/gifpicker/dto/GifCategoryDto.smali
index 7b9d297a17..6d3a4fa889 100644
--- a/com.discord/smali/com/discord/models/gifpicker/dto/GifCategoryDto.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/dto/GifCategoryDto.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "src"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,20 +28,6 @@
     iput-object p2, p0, Lcom/discord/models/gifpicker/dto/GifCategoryDto;->src:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "src"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/gifpicker/dto/GifCategoryDto;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/gifpicker/dto/GifCategoryDto;
@@ -87,31 +75,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/gifpicker/dto/GifCategoryDto;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "src"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/dto/GifCategoryDto;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/gifpicker/dto/GifCategoryDto;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "src"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -129,7 +105,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/dto/GifCategoryDto;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -139,7 +115,7 @@
 
     iget-object p1, p1, Lcom/discord/models/gifpicker/dto/GifCategoryDto;->src:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/gifpicker/dto/GifDto.smali b/com.discord/smali/com/discord/models/gifpicker/dto/GifDto.smali
index 2bf56bf03d..83bbf0f758 100644
--- a/com.discord/smali/com/discord/models/gifpicker/dto/GifDto.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/dto/GifDto.smali
@@ -17,11 +17,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;II)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "src"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,20 +36,6 @@
     iput p4, p0, Lcom/discord/models/gifpicker/dto/GifDto;->height:I
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "src"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/gifpicker/dto/GifDto;Ljava/lang/String;Ljava/lang/String;IIILjava/lang/Object;)Lcom/discord/models/gifpicker/dto/GifDto;
@@ -125,31 +113,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;II)Lcom/discord/models/gifpicker/dto/GifDto;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "src"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/dto/GifDto;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/gifpicker/dto/GifDto;-><init>(Ljava/lang/String;Ljava/lang/String;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "src"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -167,7 +143,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/dto/GifDto;->src:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -177,7 +153,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/dto/GifDto;->url:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif$Companion.smali b/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif$Companion.smali
index 25e7c69697..4d7bbd1bee 100644
--- a/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif$Companion.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif$Companion.smali
@@ -36,7 +36,9 @@
 .method public final createFromGifDto(Lcom/discord/models/gifpicker/dto/GifDto;)Lcom/discord/models/gifpicker/dto/ModelGif;
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifDto"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/dto/ModelGif;
 
@@ -59,13 +61,4 @@
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/discord/models/gifpicker/dto/ModelGif;-><init>(Ljava/lang/String;Ljava/lang/String;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifDto"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif.smali b/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif.smali
index b0603459f9..5520127acf 100644
--- a/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/dto/ModelGif.smali
@@ -43,11 +43,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;II)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gifImageUrl"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "tenorGifUrl"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,20 +62,6 @@
     iput p4, p0, Lcom/discord/models/gifpicker/dto/ModelGif;->height:I
 
     return-void
-
-    :cond_0
-    const-string p1, "tenorGifUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "gifImageUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/gifpicker/dto/ModelGif;Ljava/lang/String;Ljava/lang/String;IIILjava/lang/Object;)Lcom/discord/models/gifpicker/dto/ModelGif;
@@ -151,31 +139,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;II)Lcom/discord/models/gifpicker/dto/ModelGif;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gifImageUrl"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "tenorGifUrl"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/dto/ModelGif;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/gifpicker/dto/ModelGif;-><init>(Ljava/lang/String;Ljava/lang/String;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "tenorGifUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "gifImageUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -193,7 +169,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/dto/ModelGif;->gifImageUrl:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -203,7 +179,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/dto/ModelGif;->tenorGifUrl:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto.smali b/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto.smali
index 47126b835f..c398d7db85 100644
--- a/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto.smali
@@ -40,11 +40,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "categories"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "gifs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,20 +55,6 @@
     iput-object p2, p0, Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;->gifs:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "categories"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;
@@ -142,31 +130,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "categories"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "gifs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;-><init>(Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "categories"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -184,7 +160,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;->categories:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -194,7 +170,7 @@
 
     iget-object p1, p1, Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;->gifs:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifPreviewDto.smali b/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifPreviewDto.smali
index 69354f1d0a..cf8187a191 100644
--- a/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifPreviewDto.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifPreviewDto.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "src"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/models/gifpicker/dto/TrendingGifPreviewDto;->src:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "src"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/gifpicker/dto/TrendingGifPreviewDto;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/gifpicker/dto/TrendingGifPreviewDto;
@@ -59,22 +52,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/models/gifpicker/dto/TrendingGifPreviewDto;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "src"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/dto/TrendingGifPreviewDto;
 
     invoke-direct {v0, p1}, Lcom/discord/models/gifpicker/dto/TrendingGifPreviewDto;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "src"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -92,7 +78,7 @@
 
     iget-object p1, p1, Lcom/discord/models/gifpicker/dto/TrendingGifPreviewDto;->src:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifsResponseDto.smali b/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifsResponseDto.smali
index b0df1e4172..2e3fe3a15d 100644
--- a/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifsResponseDto.smali
+++ b/com.discord/smali/com/discord/models/gifpicker/dto/TrendingGifsResponseDto.smali
@@ -40,11 +40,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "categories"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "gifs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,20 +55,6 @@
     iput-object p2, p0, Lcom/discord/models/gifpicker/dto/TrendingGifsResponseDto;->gifs:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "categories"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/gifpicker/dto/TrendingGifsResponseDto;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/gifpicker/dto/TrendingGifsResponseDto;
@@ -142,31 +130,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "categories"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "gifs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/gifpicker/dto/TrendingGifsResponseDto;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/models/gifpicker/dto/TrendingGifsResponseDto;-><init>(Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "categories"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -184,7 +160,7 @@
 
     iget-object v1, p1, Lcom/discord/models/gifpicker/dto/TrendingGifsResponseDto;->categories:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -194,7 +170,7 @@
 
     iget-object p1, p1, Lcom/discord/models/gifpicker/dto/TrendingGifsResponseDto;->gifs:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/models/ktx/ModelUserExtensionsKt.smali b/com.discord/smali/com/discord/models/ktx/ModelUserExtensionsKt.smali
index 92c40379a8..738354c912 100644
--- a/com.discord/smali/com/discord/models/ktx/ModelUserExtensionsKt.smali
+++ b/com.discord/smali/com/discord/models/ktx/ModelUserExtensionsKt.smali
@@ -7,7 +7,9 @@
 .method public static final toPerson(Lcom/discord/models/domain/ModelUser;)Landroidx/core/app/Person;
     .locals 3
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toPerson"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/core/app/Person$Builder;
 
@@ -47,16 +49,7 @@
 
     const-string v0, "Person.Builder()\n       \u2026t(isBot)\n        .build()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$toPerson"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/models/messages/LocalAttachment.smali b/com.discord/smali/com/discord/models/messages/LocalAttachment.smali
index b25ba73ff7..94fa3b164e 100644
--- a/com.discord/smali/com/discord/models/messages/LocalAttachment.smali
+++ b/com.discord/smali/com/discord/models/messages/LocalAttachment.smali
@@ -15,11 +15,13 @@
 .method public constructor <init>(JLjava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uriString"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "displayName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,20 +32,6 @@
     iput-object p4, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "displayName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uriString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/models/messages/LocalAttachment;JLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/messages/LocalAttachment;
@@ -106,31 +94,19 @@
 .method public final copy(JLjava/lang/String;Ljava/lang/String;)Lcom/discord/models/messages/LocalAttachment;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uriString"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "displayName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/messages/LocalAttachment;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/messages/LocalAttachment;-><init>(JLjava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "displayName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uriString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -156,7 +132,7 @@
 
     iget-object v1, p1, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -166,7 +142,7 @@
 
     iget-object p1, p1, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$a.smali b/com.discord/smali/com/discord/overlay/OverlayManager$a.smali
index 4329c78147..128d04df8b 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$a.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$a.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "event"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
 
@@ -218,11 +218,11 @@
     goto :goto_1
 
     :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.overlay.views.OverlayBubbleWrap"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$b.smali b/com.discord/smali/com/discord/overlay/OverlayManager$b.smali
index 83aa3fcadd..4838997ca3 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$b.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/overlay/OverlayManager$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,22 +57,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$c.smali b/com.discord/smali/com/discord/overlay/OverlayManager$c.smali
index 627d73e487..df70c9407b 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager$c.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/overlay/OverlayManager$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,22 +57,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager.smali b/com.discord/smali/com/discord/overlay/OverlayManager.smali
index d4b0aa938d..c05edc511a 100644
--- a/com.discord/smali/com/discord/overlay/OverlayManager.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayManager.smali
@@ -68,6 +68,10 @@
 .method public constructor <init>(Landroid/view/WindowManager;)V
     .locals 1
 
+    const-string/jumbo v0, "windowManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->m:Landroid/view/WindowManager;
@@ -118,6 +122,10 @@
 .method public final a(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 2
 
+    const-string v0, "bubble"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->m:Landroid/view/WindowManager;
 
     invoke-virtual {p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getWindowLayoutParams()Landroid/view/WindowManager$LayoutParams;
@@ -140,7 +148,9 @@
 .method public final b(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 14
 
-    if-eqz p1, :cond_1
+    const-string v0, "bubble"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->m:Landroid/view/WindowManager;
 
@@ -205,15 +215,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "bubble"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final c(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
@@ -221,7 +222,7 @@
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->l:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -279,6 +280,10 @@
 .method public final d(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 1
 
+    const-string v0, "bubble"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->e:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/com/discord/overlay/OverlayService$b.smali b/com.discord/smali/com/discord/overlay/OverlayService$b.smali
index f1f35f00ea..e4fb1628a9 100644
--- a/com.discord/smali/com/discord/overlay/OverlayService$b.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayService$b.smali
@@ -48,7 +48,9 @@
 .method public b(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "bubble"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayService$b;->d:Lcom/discord/overlay/OverlayService;
 
@@ -59,13 +61,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/overlay/OverlayManager;->d(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "bubble"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/OverlayService$c.smali b/com.discord/smali/com/discord/overlay/OverlayService$c.smali
index 9b48d1013f..07edf28b73 100644
--- a/com.discord/smali/com/discord/overlay/OverlayService$c.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayService$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/overlay/OverlayService$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/overlay/OverlayService$c;->this$0:Lcom/discord/overlay/OverlayService;
 
@@ -72,7 +74,7 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lj0/c;
+    new-instance p1, Lk0/c;
 
     const-string v0, "An operation is not implemented: "
 
@@ -82,16 +84,7 @@
 
     move-result-object v0
 
-    invoke-direct {p1, v0}, Lj0/c;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Lk0/c;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/OverlayService.smali b/com.discord/smali/com/discord/overlay/OverlayService.smali
index 94212b235e..53e413c9be 100644
--- a/com.discord/smali/com/discord/overlay/OverlayService.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayService.smali
@@ -51,15 +51,15 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_5
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayService;->overlayManager:Lcom/discord/overlay/OverlayManager;
 
-    const/4 v1, 0x0
+    const-string v1, "overlayManager"
 
-    const-string v2, "overlayManager"
+    const/4 v2, 0x0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     invoke-virtual {v0, p1}, Lcom/discord/overlay/OverlayManager;->a(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
@@ -71,11 +71,11 @@
 
     iget-object p1, p0, Lcom/discord/overlay/OverlayService;->overlayManager:Lcom/discord/overlay/OverlayManager;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_3
 
     iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->i:Lf/a/e/f/a;
 
-    if-nez p1, :cond_1
+    if-nez p1, :cond_2
 
     new-instance p1, Lf/a/e/f/a;
 
@@ -85,14 +85,20 @@
 
     const-string v3, "applicationContext"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0}, Lf/a/e/f/a;-><init>(Landroid/content/Context;)V
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayService;->overlayManager:Lcom/discord/overlay/OverlayManager;
 
+    if-eqz v0, :cond_1
+
     if-eqz v0, :cond_0
 
+    const-string v1, "trashWrap"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p1, v0, Lcom/discord/overlay/OverlayManager;->i:Lf/a/e/f/a;
 
     iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->m:Landroid/view/WindowManager;
@@ -106,27 +112,30 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
+    throw v2
 
     :cond_1
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_2
     :goto_0
     const/4 p1, 0x1
 
     return p1
 
-    :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v1
+    throw v2
 
     :cond_4
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_5
     const/4 p1, 0x0
 
     return p1
@@ -152,7 +161,7 @@
     :cond_0
     const-string v0, "overlayManager"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -168,7 +177,7 @@
 .end method
 
 .method public onCreate()V
-    .locals 2
+    .locals 3
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
@@ -176,7 +185,7 @@
 
     move-result-object v0
 
-    const-string v1, "window"
+    const-string/jumbo v1, "window"
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -206,6 +215,10 @@
 
     invoke-direct {v1, p0}, Lcom/discord/overlay/OverlayService$c;-><init>(Lcom/discord/overlay/OverlayService;)V
 
+    const-string v2, "<set-?>"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->h:Lkotlin/jvm/functions/Function1;
 
     return-void
@@ -213,18 +226,18 @@
     :cond_0
     const-string v0, "overlayManager"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     throw v0
 
     :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type android.view.WindowManager"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -245,7 +258,7 @@
     :cond_0
     const-string v0, "overlayManager"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -298,20 +311,13 @@
 .end method
 
 .method public final setOverlayManager(Lcom/discord/overlay/OverlayManager;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/overlay/OverlayService;->overlayManager:Lcom/discord/overlay/OverlayManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/R$b.smali b/com.discord/smali/com/discord/overlay/R$b.smali
index 9ffccceca4..1a072c2e18 100644
--- a/com.discord/smali/com/discord/overlay/R$b.smali
+++ b/com.discord/smali/com/discord/overlay/R$b.smali
@@ -254,7 +254,7 @@
 
 .field public static final trash_wrap_min_dimen:I = 0x7f0701c9
 
-.field public static final vertical_safe_margin:I = 0x7f0701f9
+.field public static final vertical_safe_margin:I = 0x7f0701f2
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$c.smali b/com.discord/smali/com/discord/overlay/R$c.smali
index 8894089dfa..fdcc811083 100644
--- a/com.discord/smali/com/discord/overlay/R$c.smali
+++ b/com.discord/smali/com/discord/overlay/R$c.smali
@@ -204,39 +204,39 @@
 
 .field public static final bubble_state_selector:I = 0x7f0800c8
 
-.field public static final ic_close_24dp:I = 0x7f080283
+.field public static final ic_close_24dp:I = 0x7f080284
 
-.field public static final ic_trash_outline:I = 0x7f080403
+.field public static final ic_trash_outline:I = 0x7f080406
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
-.field public static final trash_bg:I = 0x7f08051b
+.field public static final trash_bg:I = 0x7f08051f
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$d.smali b/com.discord/smali/com/discord/overlay/R$d.smali
index cf64a00480..cdb9569330 100644
--- a/com.discord/smali/com/discord/overlay/R$d.smali
+++ b/com.discord/smali/com/discord/overlay/R$d.smali
@@ -128,181 +128,181 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final trash_wrap_icon:I = 0x7f0a09a6
+.field public static final trash_wrap_icon:I = 0x7f0a09aa
 
-.field public static final trash_wrap_target_container:I = 0x7f0a09a7
+.field public static final trash_wrap_target_container:I = 0x7f0a09ab
 
-.field public static final trash_wrap_target_zone:I = 0x7f0a09a8
+.field public static final trash_wrap_target_zone:I = 0x7f0a09ac
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$a.smali b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$a.smali
index 4522bdba83..4b8806e814 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$a.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/overlay/views/OverlayBubbleWrap$a;
-.super Lj0/o/b;
+.super Lk0/p/b;
 .source "Delegates.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/o/b<",
+        "Lk0/p/b<",
         "Ljava/lang/Boolean;",
         ">;"
     }
@@ -36,7 +36,7 @@
 
     iput-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->b:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    invoke-direct {p0, p2}, Lj0/o/b;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, p2}, Lk0/p/b;-><init>(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 # virtual methods
 .method public afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -56,6 +56,10 @@
         }
     .end annotation
 
+    const-string v0, "property"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     check-cast p3, Ljava/lang/Boolean;
 
     invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
diff --git a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$b.smali b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$b.smali
index 18fcaa9332..901fb6bdff 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$b.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap$b.smali
@@ -37,7 +37,9 @@
 .method public onLayoutChange(Landroid/view/View;IIIIIIII)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p2, "view"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
@@ -46,13 +48,4 @@
     invoke-static {p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->a(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
index 6ee506ff2e..73e827a036 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
@@ -49,31 +49,27 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 5
+    .locals 6
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/m;
+    new-instance v1, Lk0/o/c/n;
 
     const-class v2, Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
     const-string v3, "isMoving"
 
     const-string v4, "isMoving()Z"
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/m;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    const/4 v5, 0x0
 
-    invoke-static {v1}, Lj0/n/c/s;->mutableProperty1(Lj0/n/c/l;)Lj0/r/c;
+    invoke-direct {v1, v2, v3, v4, v5}, Lk0/o/c/n;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
-    const/4 v2, 0x0
+    invoke-static {v1}, Lk0/o/c/t;->mutableProperty1(Lk0/o/c/m;)Lk0/s/c;
 
-    aput-object v1, v0, v2
+    aput-object v1, v0, v5
 
     sput-object v0, Lcom/discord/overlay/views/OverlayBubbleWrap;->r:[Lkotlin/reflect/KProperty;
 
@@ -83,13 +79,17 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 6
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const-string v0, "window"
+    const-string/jumbo v0, "window"
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -215,7 +215,7 @@
 
     const-string v3, "spring"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/high16 v4, 0x43480000    # 200.0f
 
@@ -225,7 +225,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/high16 v5, 0x3f400000    # 0.75f
 
@@ -245,7 +245,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v5}, Landroidx/dynamicanimation/animation/SpringForce;->setDampingRatio(F)Landroidx/dynamicanimation/animation/SpringForce;
 
@@ -253,7 +253,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v4}, Landroidx/dynamicanimation/animation/SpringForce;->setStiffness(F)Landroidx/dynamicanimation/animation/SpringForce;
 
@@ -274,11 +274,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.WindowManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -419,12 +419,22 @@
 .method public d(Landroid/view/View;)V
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "targetView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
     new-array v1, v0, [I
 
+    const-string/jumbo v2, "view"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "outLocation"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p1, v1}, Landroid/view/View;->getLocationOnScreen([I)V
 
     const/4 v2, 0x0
@@ -540,21 +550,14 @@
     invoke-static {v0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
-
-    :cond_0
-    const-string p1, "targetView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public dispatchTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 4
 
-    if-eqz p1, :cond_6
+    const-string v0, "motionEvent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
@@ -718,61 +721,52 @@
     move-result p1
 
     return p1
-
-    :cond_6
-    const-string p1, "motionEvent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final e(IILandroid/graphics/Rect;)V
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "screenBounds"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget v1, p3, Landroid/graphics/Rect;->left:I
+    iget v0, p3, Landroid/graphics/Rect;->left:I
 
-    iget v2, p3, Landroid/graphics/Rect;->right:I
+    iget v1, p3, Landroid/graphics/Rect;->right:I
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getWidth()I
 
-    move-result v3
+    move-result v2
 
-    sub-int/2addr v2, v3
+    sub-int/2addr v1, v2
 
-    invoke-static {v1, p1}, Ljava/lang/Math;->max(II)I
+    invoke-static {v0, p1}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
-    invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
+    invoke-static {p1, v1}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->n:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->n:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->e:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->e:Landroid/view/WindowManager$LayoutParams;
 
-    iget v2, v2, Landroid/view/WindowManager$LayoutParams;->x:I
+    iget v1, v1, Landroid/view/WindowManager$LayoutParams;->x:I
 
-    int-to-float v2, v2
+    int-to-float v1, v1
 
     int-to-float p1, p1
 
-    const-string v3, "$this$animateTo"
+    const-string v2, "$this$animateTo"
 
-    if-eqz v1, :cond_1
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
+    invoke-virtual {v0}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
-    invoke-virtual {v1, v2}, Landroidx/dynamicanimation/animation/DynamicAnimation;->setStartValue(F)Landroidx/dynamicanimation/animation/DynamicAnimation;
+    invoke-virtual {v0, v1}, Landroidx/dynamicanimation/animation/DynamicAnimation;->setStartValue(F)Landroidx/dynamicanimation/animation/DynamicAnimation;
 
-    invoke-virtual {v1, p1}, Landroidx/dynamicanimation/animation/SpringAnimation;->animateToFinalPosition(F)V
+    invoke-virtual {v0, p1}, Landroidx/dynamicanimation/animation/SpringAnimation;->animateToFinalPosition(F)V
 
     iget p1, p3, Landroid/graphics/Rect;->top:I
 
@@ -780,9 +774,9 @@
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getHeight()I
 
-    move-result v1
+    move-result v0
 
-    sub-int/2addr p3, v1
+    sub-int/2addr p3, v0
 
     invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
 
@@ -802,7 +796,7 @@
 
     int-to-float p1, p1
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
@@ -811,23 +805,6 @@
     invoke-virtual {p2, p1}, Landroidx/dynamicanimation/animation/SpringAnimation;->animateToFinalPosition(F)V
 
     return-void
-
-    :cond_0
-    invoke-static {v3}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "screenBounds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final g(Landroid/graphics/Rect;)V
@@ -1150,7 +1127,9 @@
 .method public onInterceptTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "motionEvent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
@@ -1173,15 +1152,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "motionEvent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onLayout(ZIIII)V
@@ -1200,7 +1170,9 @@
 .method public final setAnchorAt(Landroid/graphics/Point;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "newAnchorPoint"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->p:Landroid/graphics/Point;
 
@@ -1257,15 +1229,6 @@
     invoke-static {p1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     return-void
-
-    :cond_0
-    const-string p1, "newAnchorPoint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setBubbleTouchable(Z)V
@@ -1273,10 +1236,16 @@
 
     iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->e:Landroid/view/WindowManager$LayoutParams;
 
-    if-eqz v0, :cond_1
+    const-string v1, "$this$setFlagTouchable"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
+    const-string p1, "$this$removeFlag"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget p1, v0, Landroid/view/WindowManager$LayoutParams;->flags:I
 
     and-int/lit8 p1, p1, -0x11
@@ -1288,6 +1257,10 @@
     :cond_0
     const/16 p1, 0x10
 
+    const-string v1, "$this$addFlag"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget v1, v0, Landroid/view/WindowManager$LayoutParams;->flags:I
 
     or-int/2addr p1, v1
@@ -1302,15 +1275,6 @@
     invoke-interface {p1, p0, v0}, Landroid/view/WindowManager;->updateViewLayout(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "$this$setFlagTouchable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setMoving(Z)V
@@ -1352,22 +1316,15 @@
 .end method
 
 .method public final setWindowLayoutParams(Landroid/view/WindowManager$LayoutParams;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->e:Landroid/view/WindowManager$LayoutParams;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setX(F)V
diff --git a/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali b/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali
index 4105a9b95c..73549b18e7 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayDialog.smali
@@ -7,6 +7,10 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;-><init>(Landroid/content/Context;)V
 
     invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getWindowLayoutParams()Landroid/view/WindowManager$LayoutParams;
@@ -25,6 +29,10 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->y:I
 
+    const-string v0, "$this$addFlag"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget v0, p1, Landroid/view/WindowManager$LayoutParams;->flags:I
 
     or-int/lit8 v0, v0, 0x2
diff --git a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$a.smali b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$a.smali
index 7832a6d5f4..6db8d379da 100644
--- a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$a.smali
+++ b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field public final synthetic d:I
+.field public final synthetic a:I
 
-.field public final synthetic e:Ljava/lang/Object;
+.field public final synthetic b:Ljava/lang/Object;
 
 
 # direct methods
 .method public constructor <init>(ILjava/lang/Object;)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->d:I
+    iput p1, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->a:I
 
-    iput-object p2, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->e:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->b:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 4
 
-    iget v0, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->d:I
+    iget v0, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->a:I
 
     const-string v1, "null cannot be cast to non-null type kotlin.Float"
 
@@ -53,11 +53,11 @@
 
     if-ne v0, v3, :cond_1
 
-    iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->e:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->b:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/panels/OverlappingPanelsLayout;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
@@ -88,11 +88,11 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->e:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout$a;->b:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/panels/OverlappingPanelsLayout;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$c.smali b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$c.smali
index 2aab6faf33..99360e9322 100644
--- a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$c.smali
+++ b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/panels/OverlappingPanelsLayout$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlappingPanelsLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$d.smali b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$d.smali
index dc7a7f8bec..6c7b7d4006 100644
--- a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$d.smali
+++ b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$d.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/panels/OverlappingPanelsLayout$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlappingPanelsLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$e.smali b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$e.smali
index 3778bea3dc..7ebaca495a 100644
--- a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$e.smali
+++ b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout$e.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/panels/OverlappingPanelsLayout$e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlappingPanelsLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali
index a882273d6b..d775cdc034 100644
--- a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali
+++ b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali
@@ -139,7 +139,9 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
@@ -183,7 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelState:Lcom/discord/panels/PanelState;
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->childGestureRegions:Ljava/util/List;
 
@@ -202,21 +204,14 @@
     iput-boolean p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isSystemGestureNavigationPossible:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -260,7 +255,7 @@
 
     iput-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelState:Lcom/discord/panels/PanelState;
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->childGestureRegions:Ljava/util/List;
 
@@ -281,21 +276,14 @@
     invoke-direct {p0, p2}, Lcom/discord/panels/OverlappingPanelsLayout;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -339,7 +327,7 @@
 
     iput-object p3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelState:Lcom/discord/panels/PanelState;
 
-    sget-object p3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p3, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->childGestureRegions:Ljava/util/List;
 
@@ -360,15 +348,6 @@
     invoke-direct {p0, p2}, Lcom/discord/panels/OverlappingPanelsLayout;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -428,7 +407,7 @@
     :cond_0
     const-string p0, "centerPanel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -447,7 +426,7 @@
     :cond_0
     const-string p0, "startPanel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -952,13 +931,13 @@
 .end method
 
 .method private final handleCenterPanelX(FF)V
-    .locals 11
+    .locals 12
 
     iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanel:Landroid/view/View;
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_1b
+    if-eqz v0, :cond_1a
 
     iget-boolean v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isLeftToRight:Z
 
@@ -987,7 +966,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1017,7 +996,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1029,7 +1008,7 @@
 
     iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanel:Landroid/view/View;
 
-    if-eqz v0, :cond_1a
+    if-eqz v0, :cond_19
 
     iget-boolean v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isLeftToRight:Z
 
@@ -1052,7 +1031,7 @@
     goto :goto_2
 
     :cond_5
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1082,7 +1061,7 @@
     goto :goto_3
 
     :cond_8
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1158,13 +1137,15 @@
     :goto_6
     iget-object v8, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
 
-    if-eqz v8, :cond_19
+    if-eqz v8, :cond_18
 
     xor-int/lit8 v9, v6, 0x1
 
     const/high16 v10, 0x3f000000    # 0.5f
 
-    if-eqz v8, :cond_18
+    const-string v11, "$this$setEnabledAlpha"
+
+    invoke-static {v8, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v9, :cond_f
 
@@ -1284,38 +1265,31 @@
     return-void
 
     :cond_16
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_17
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_18
-    const-string p1, "$this$setEnabledAlpha"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_19
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    const-string p1, "endPanel"
+
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1a
-    const-string p1, "endPanel"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1b
     const-string p1, "startPanel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1392,14 +1366,14 @@
     :cond_3
     const-string v0, "centerPanel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_4
     const-string v0, "endPanel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
@@ -1474,14 +1448,14 @@
     :cond_3
     const-string v0, "centerPanel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_4
     const-string v0, "startPanel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
@@ -1497,7 +1471,7 @@
 
     const-string v2, "getChildAt(0)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanel:Landroid/view/View;
 
@@ -1509,7 +1483,7 @@
 
     const-string v3, "getChildAt(1)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
 
@@ -1521,7 +1495,7 @@
 
     const-string v3, "getChildAt(2)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanel:Landroid/view/View;
 
@@ -1617,42 +1591,42 @@
     return-void
 
     :cond_1
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_2
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_3
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_4
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_5
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_6
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_7
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_8
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
@@ -1668,7 +1642,9 @@
 
     const-string v1, "context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lf/a/f/a;->a:Lkotlin/jvm/functions/Function1;
 
@@ -1740,7 +1716,7 @@
 
     const-string v3, "resources"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -1754,7 +1730,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -1769,7 +1745,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -1971,12 +1947,12 @@
     return v2
 
     :cond_7
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_8
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2260,12 +2236,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2310,12 +2286,12 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -2355,7 +2331,7 @@
 
     const-string v2, "resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -2411,7 +2387,7 @@
     :cond_3
     const-string p1, "centerPanel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -2635,12 +2611,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2745,7 +2721,7 @@
     :cond_3
     const-string p1, "centerPanel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -2865,13 +2841,15 @@
 .method public final handleEndPanelState(Lcom/discord/panels/PanelState;)V
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "endPanelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelState:Lcom/discord/panels/PanelState;
 
     sget-object v1, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2879,7 +2857,7 @@
 
     sget-object v1, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2898,7 +2876,7 @@
 
     sget-object v1, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2911,27 +2889,20 @@
     iput-object p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelState:Lcom/discord/panels/PanelState;
 
     return-void
-
-    :cond_2
-    const-string p1, "endPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleStartPanelState(Lcom/discord/panels/PanelState;)V
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "startPanelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanelState:Lcom/discord/panels/PanelState;
 
     sget-object v1, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2939,7 +2910,7 @@
 
     sget-object v1, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2954,7 +2925,7 @@
     :cond_0
     sget-object v1, Lcom/discord/panels/PanelState$a;->a:Lcom/discord/panels/PanelState$a;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2962,7 +2933,7 @@
 
     sget-object v1, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2975,43 +2946,36 @@
     iput-object p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanelState:Lcom/discord/panels/PanelState;
 
     return-void
-
-    :cond_2
-    const-string p1, "startPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onInterceptTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "event"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/4 v3, 0x1
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
-    if-eq v1, v3, :cond_3
+    if-eq v0, v3, :cond_3
 
     const/4 v4, 0x2
 
-    if-eq v1, v4, :cond_0
+    if-eq v0, v4, :cond_0
 
     const/4 p1, 0x3
 
-    if-eq v1, p1, :cond_3
+    if-eq v0, p1, :cond_3
 
     iget-boolean v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->wasActionDownOnClosedCenterPanel:Z
 
@@ -3081,7 +3045,7 @@
     invoke-virtual {p1}, Landroid/view/VelocityTracker;->recycle()V
 
     :cond_4
-    iput-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->velocityTracker:Landroid/view/VelocityTracker;
+    iput-object v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->velocityTracker:Landroid/view/VelocityTracker;
 
     iget-boolean p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isScrollingHorizontally:Z
 
@@ -3098,15 +3062,15 @@
 
     invoke-direct {p0, p1}, Lcom/discord/panels/OverlappingPanelsLayout;->isTouchingCenterPanelWhileSidePanelOpen(Landroid/view/MotionEvent;)Z
 
-    move-result v1
+    move-result v0
 
-    iput-boolean v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->wasActionDownOnClosedCenterPanel:Z
+    iput-boolean v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->wasActionDownOnClosedCenterPanel:Z
 
-    iget-object v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
 
-    if-eqz v1, :cond_a
+    if-eqz v0, :cond_a
 
-    invoke-virtual {v1}, Landroid/view/View;->getX()F
+    invoke-virtual {v0}, Landroid/view/View;->getX()F
 
     move-result v0
 
@@ -3136,7 +3100,7 @@
 
     const-string v4, "resources"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -3199,16 +3163,9 @@
     :cond_a
     const-string p1, "centerPanel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_b
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onLayout(ZIIII)V
@@ -3237,36 +3194,36 @@
 .method public onTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "event"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isHomeSystemGesture:Z
+    iget-boolean v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isHomeSystemGesture:Z
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    return v2
+    return v1
 
     :cond_0
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
 
-    move-result v1
+    move-result v0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    if-eqz v1, :cond_a
+    if-eqz v0, :cond_a
 
-    if-eq v1, v3, :cond_6
+    if-eq v0, v2, :cond_6
 
-    const/4 v4, 0x2
+    const/4 v3, 0x2
 
-    if-eq v1, v4, :cond_1
+    if-eq v0, v3, :cond_1
 
-    const/4 v4, 0x3
+    const/4 v3, 0x3
 
-    if-eq v1, v4, :cond_6
+    if-eq v0, v3, :cond_6
 
     goto/16 :goto_4
 
@@ -3277,7 +3234,7 @@
 
     if-eqz v0, :cond_2
 
-    return v2
+    return v1
 
     :cond_2
     iget v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->xFromInterceptActionDown:F
@@ -3288,19 +3245,19 @@
 
     invoke-static {v0}, Ljava/lang/Math;->abs(F)F
 
-    move-result v1
+    move-result v3
 
     iget v4, p0, Lcom/discord/panels/OverlappingPanelsLayout;->scrollingSlopPx:F
 
-    cmpl-float v1, v1, v4
+    cmpl-float v3, v3, v4
 
-    if-lez v1, :cond_4
+    if-lez v3, :cond_4
 
-    iget-object v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->swipeDirection:Lcom/discord/panels/OverlappingPanelsLayout$SwipeDirection;
+    iget-object v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->swipeDirection:Lcom/discord/panels/OverlappingPanelsLayout$SwipeDirection;
 
-    if-nez v1, :cond_4
+    if-nez v3, :cond_4
 
-    int-to-float v1, v2
+    int-to-float v1, v1
 
     cmpl-float v0, v0, v1
 
@@ -3335,76 +3292,71 @@
     goto :goto_3
 
     :cond_6
-    iget-boolean v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->wasActionDownOnClosedCenterPanel:Z
+    iget-boolean v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->wasActionDownOnClosedCenterPanel:Z
 
-    if-eqz v1, :cond_7
+    if-eqz v0, :cond_7
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
-    move-result v1
+    move-result v0
 
-    iget v4, p0, Lcom/discord/panels/OverlappingPanelsLayout;->xFromInterceptActionDown:F
+    iget v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->xFromInterceptActionDown:F
 
-    sub-float/2addr v1, v4
+    sub-float/2addr v0, v3
 
-    invoke-static {v1}, Ljava/lang/Math;->abs(F)F
+    invoke-static {v0}, Ljava/lang/Math;->abs(F)F
 
-    move-result v1
+    move-result v0
 
-    iget v4, p0, Lcom/discord/panels/OverlappingPanelsLayout;->scrollingSlopPx:F
+    iget v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->scrollingSlopPx:F
 
-    cmpg-float v1, v1, v4
+    cmpg-float v0, v0, v3
 
-    if-gez v1, :cond_7
+    if-gez v0, :cond_7
 
-    iget-boolean v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isScrollingHorizontally:Z
+    iget-boolean v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isScrollingHorizontally:Z
 
-    if-nez v1, :cond_7
+    if-nez v0, :cond_7
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_1
 
     :cond_7
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
-    if-eqz v1, :cond_8
+    if-eqz v0, :cond_8
 
     invoke-virtual {p0}, Lcom/discord/panels/OverlappingPanelsLayout;->closePanels()V
 
     goto :goto_2
 
     :cond_8
-    iget-object v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->velocityTracker:Landroid/view/VelocityTracker;
+    iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->velocityTracker:Landroid/view/VelocityTracker;
 
-    if-eqz v1, :cond_9
+    if-eqz v0, :cond_9
 
-    invoke-virtual {v1, p1}, Landroid/view/VelocityTracker;->addMovement(Landroid/view/MotionEvent;)V
+    invoke-virtual {v0, p1}, Landroid/view/VelocityTracker;->addMovement(Landroid/view/MotionEvent;)V
 
     :cond_9
     invoke-direct {p0, p1}, Lcom/discord/panels/OverlappingPanelsLayout;->snapOpenOrClose(Landroid/view/MotionEvent;)V
 
     :goto_2
-    iput-boolean v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->wasActionDownOnClosedCenterPanel:Z
+    iput-boolean v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->wasActionDownOnClosedCenterPanel:Z
 
-    iput-boolean v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isScrollingHorizontally:Z
+    iput-boolean v1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isScrollingHorizontally:Z
 
-    iput-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->swipeDirection:Lcom/discord/panels/OverlappingPanelsLayout$SwipeDirection;
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->swipeDirection:Lcom/discord/panels/OverlappingPanelsLayout$SwipeDirection;
 
     :cond_a
     :goto_3
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :goto_4
-    return v2
-
-    :cond_b
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v1
 .end method
 
 .method public final openEndPanel()V
@@ -3430,7 +3382,9 @@
 .method public final varargs registerEndPanelStateListeners([Lcom/discord/panels/OverlappingPanelsLayout$PanelStateListener;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "panelStateListenerArgs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -3451,21 +3405,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "panelStateListenerArgs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final varargs registerStartPanelStateListeners([Lcom/discord/panels/OverlappingPanelsLayout$PanelStateListener;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "panelStateListenerArgs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -3486,19 +3433,10 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "panelStateListenerArgs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setChildGestureRegions(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -3508,26 +3446,21 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "childGestureRegions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->childGestureRegions:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "childGestureRegions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setEndPanelLockState(Lcom/discord/panels/OverlappingPanelsLayout$LockState;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "lockState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelLockState:Lcom/discord/panels/OverlappingPanelsLayout$LockState;
 
@@ -3539,21 +3472,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "lockState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setStartPanelLockState(Lcom/discord/panels/OverlappingPanelsLayout$LockState;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "lockState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanelLockState:Lcom/discord/panels/OverlappingPanelsLayout$LockState;
 
@@ -3565,15 +3491,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "lockState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setStartPanelUseFullPortraitWidth(Z)V
diff --git a/com.discord/smali/com/discord/panels/R$b.smali b/com.discord/smali/com/discord/panels/R$b.smali
index d5660d2bdc..4700cbd28b 100644
--- a/com.discord/smali/com/discord/panels/R$b.smali
+++ b/com.discord/smali/com/discord/panels/R$b.smali
@@ -1181,7 +1181,7 @@
 
     new-array v4, v0, [I
 
-    const v5, 0x7f0404af
+    const v5, 0x7f0404a1
 
     aput v5, v4, v3
 
@@ -1296,10 +1296,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1308,8 +1308,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1326,8 +1326,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -1357,17 +1357,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_9
@@ -1402,8 +1402,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_b
@@ -1501,38 +1501,38 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_c
@@ -1558,8 +1558,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_f
@@ -1583,7 +1583,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_11
@@ -1618,7 +1618,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_14
@@ -1668,8 +1668,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_18
@@ -1682,7 +1682,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_19
@@ -1712,11 +1712,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_1c
@@ -1743,17 +1743,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_1f
@@ -1772,8 +1772,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_20
@@ -1796,18 +1796,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_21
@@ -1816,7 +1816,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_22
diff --git a/com.discord/smali/com/discord/player/AppMediaPlayer.smali b/com.discord/smali/com/discord/player/AppMediaPlayer.smali
index ec0ad9570c..23247bf3af 100644
--- a/com.discord/smali/com/discord/player/AppMediaPlayer.smali
+++ b/com.discord/smali/com/discord/player/AppMediaPlayer.smali
@@ -51,7 +51,27 @@
 
 # direct methods
 .method public constructor <init>(Lf/h/a/c/s0;Lf/a/g/k;Lf/h/a/c/h1/j$a;Lrx/Scheduler;Lcom/discord/utilities/logging/Logger;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "exoPlayer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rxPlayerEventListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dataSourceFactory"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "timerScheduler"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "logger"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,7 +91,7 @@
 
     const-string p2, "PublishSubject.create<Event>()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/player/AppMediaPlayer;->a:Lrx/subjects/PublishSubject;
 
@@ -95,7 +115,7 @@
 
     const-string p2, "BehaviorSubject.create<Float>(exoPlayer.volume)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/player/AppMediaPlayer;->d:Lrx/subjects/BehaviorSubject;
 
@@ -105,7 +125,7 @@
 
     const-string p2, "playerStateChangeSubject"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lf/a/g/e;
 
@@ -129,7 +149,7 @@
 
     const-string p2, "isPlayingChangeSubject"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lf/a/g/a;
 
@@ -167,7 +187,7 @@
 
     const-string p3, "playerErrorSubject"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Lf/a/g/c;
 
@@ -249,7 +269,7 @@
 
 # virtual methods
 .method public final a(Lcom/discord/player/MediaSource;ZZJLcom/google/android/exoplayer2/ui/PlayerView;Lcom/google/android/exoplayer2/ui/PlayerControlView;)V
-    .locals 23
+    .locals 22
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -263,68 +283,70 @@
 
     move-object/from16 v5, p7
 
-    const/4 v6, 0x0
+    const-string v6, "mediaSource"
 
-    if-eqz v1, :cond_b
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_a
+    const-string v6, "playerView"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, v0, Lcom/discord/player/AppMediaPlayer;->e:Lcom/discord/player/MediaSource;
 
-    iget-object v7, v0, Lcom/discord/player/AppMediaPlayer;->f:Lf/h/a/c/s0;
+    iget-object v6, v0, Lcom/discord/player/AppMediaPlayer;->f:Lf/h/a/c/s0;
 
-    invoke-virtual {v7}, Lf/h/a/c/s0;->S()V
+    invoke-virtual {v6}, Lf/h/a/c/s0;->S()V
 
-    iget-object v8, v7, Lf/h/a/c/s0;->b:[Lf/h/a/c/p0;
+    iget-object v7, v6, Lf/h/a/c/s0;->b:[Lf/h/a/c/p0;
 
-    array-length v9, v8
+    array-length v8, v7
+
+    const/4 v9, 0x0
 
     const/4 v10, 0x0
 
-    const/4 v11, 0x0
-
     :goto_0
-    const/4 v12, 0x2
+    const/4 v11, 0x2
 
-    const/4 v13, 0x1
+    const/4 v12, 0x1
 
-    if-ge v11, v9, :cond_1
+    if-ge v10, v8, :cond_1
 
-    aget-object v14, v8, v11
+    aget-object v13, v7, v10
 
-    invoke-interface {v14}, Lf/h/a/c/p0;->u()I
+    invoke-interface {v13}, Lf/h/a/c/p0;->u()I
 
-    move-result v15
+    move-result v14
 
-    if-ne v15, v12, :cond_0
+    if-ne v14, v11, :cond_0
 
-    iget-object v12, v7, Lf/h/a/c/s0;->c:Lf/h/a/c/a0;
+    iget-object v11, v6, Lf/h/a/c/s0;->c:Lf/h/a/c/a0;
 
-    invoke-virtual {v12, v14}, Lf/h/a/c/a0;->a(Lf/h/a/c/n0$b;)Lf/h/a/c/n0;
+    invoke-virtual {v11, v13}, Lf/h/a/c/a0;->a(Lf/h/a/c/n0$b;)Lf/h/a/c/n0;
+
+    move-result-object v11
+
+    const/4 v13, 0x4
+
+    invoke-virtual {v11, v13}, Lf/h/a/c/n0;->e(I)Lf/h/a/c/n0;
+
+    invoke-static {v12}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v12
 
-    const/4 v14, 0x4
+    invoke-virtual {v11, v12}, Lf/h/a/c/n0;->d(Ljava/lang/Object;)Lf/h/a/c/n0;
 
-    invoke-virtual {v12, v14}, Lf/h/a/c/n0;->e(I)Lf/h/a/c/n0;
-
-    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    invoke-virtual {v12, v13}, Lf/h/a/c/n0;->d(Ljava/lang/Object;)Lf/h/a/c/n0;
-
-    invoke-virtual {v12}, Lf/h/a/c/n0;->c()Lf/h/a/c/n0;
+    invoke-virtual {v11}, Lf/h/a/c/n0;->c()Lf/h/a/c/n0;
 
     :cond_0
-    add-int/lit8 v11, v11, 0x1
+    add-int/lit8 v10, v10, 0x1
 
     goto :goto_0
 
     :cond_1
-    iget-object v7, v0, Lcom/discord/player/AppMediaPlayer;->f:Lf/h/a/c/s0;
+    iget-object v6, v0, Lcom/discord/player/AppMediaPlayer;->f:Lf/h/a/c/s0;
 
-    invoke-virtual {v4, v7}, Lcom/google/android/exoplayer2/ui/PlayerView;->setPlayer(Lf/h/a/c/m0;)V
+    invoke-virtual {v4, v6}, Lcom/google/android/exoplayer2/ui/PlayerView;->setPlayer(Lf/h/a/c/m0;)V
 
     if-eqz v5, :cond_2
 
@@ -333,33 +355,31 @@
     invoke-virtual {v5, v4}, Lcom/google/android/exoplayer2/ui/PlayerControlView;->setPlayer(Lf/h/a/c/m0;)V
 
     :cond_2
-    iget-object v4, v0, Lcom/discord/player/AppMediaPlayer;->h:Lf/h/a/c/h1/j$a;
+    iget-object v15, v0, Lcom/discord/player/AppMediaPlayer;->h:Lf/h/a/c/h1/j$a;
 
-    new-instance v17, Lf/h/a/c/a1/f;
+    new-instance v16, Lf/h/a/c/a1/f;
 
-    invoke-direct/range {v17 .. v17}, Lf/h/a/c/a1/f;-><init>()V
+    invoke-direct/range {v16 .. v16}, Lf/h/a/c/a1/f;-><init>()V
 
-    sget-object v18, Lf/h/a/c/z0/i;->a:Lf/h/a/c/z0/i;
+    sget-object v17, Lf/h/a/c/z0/i;->a:Lf/h/a/c/z0/i;
 
-    new-instance v19, Lf/h/a/c/h1/r;
+    new-instance v18, Lf/h/a/c/h1/r;
 
-    invoke-direct/range {v19 .. v19}, Lf/h/a/c/h1/r;-><init>()V
+    invoke-direct/range {v18 .. v18}, Lf/h/a/c/h1/r;-><init>()V
 
-    const/high16 v21, 0x100000
+    const/high16 v20, 0x100000
 
-    iget-object v15, v1, Lcom/discord/player/MediaSource;->d:Landroid/net/Uri;
+    iget-object v14, v1, Lcom/discord/player/MediaSource;->d:Landroid/net/Uri;
 
     new-instance v1, Lf/h/a/c/d1/s;
 
-    const/16 v20, 0x0
+    const/16 v19, 0x0
 
-    const/16 v22, 0x0
+    const/16 v21, 0x0
 
-    move-object v14, v1
+    move-object v13, v1
 
-    move-object/from16 v16, v4
-
-    invoke-direct/range {v14 .. v22}, Lf/h/a/c/d1/s;-><init>(Landroid/net/Uri;Lf/h/a/c/h1/j$a;Lf/h/a/c/a1/j;Lf/h/a/c/z0/i;Lf/h/a/c/h1/u;Ljava/lang/String;ILjava/lang/Object;)V
+    invoke-direct/range {v13 .. v21}, Lf/h/a/c/d1/s;-><init>(Landroid/net/Uri;Lf/h/a/c/h1/j$a;Lf/h/a/c/a1/j;Lf/h/a/c/z0/i;Lf/h/a/c/h1/u;Ljava/lang/String;ILjava/lang/Object;)V
 
     iget-object v4, v0, Lcom/discord/player/AppMediaPlayer;->f:Lf/h/a/c/s0;
 
@@ -367,6 +387,8 @@
 
     iget-object v5, v4, Lf/h/a/c/s0;->C:Lf/h/a/c/d1/p;
 
+    const/4 v6, 0x0
+
     if-eqz v5, :cond_4
 
     iget-object v7, v4, Lf/h/a/c/s0;->m:Lf/h/a/c/v0/a;
@@ -402,11 +424,11 @@
 
     check-cast v8, Lf/h/a/c/v0/a$a;
 
-    iget v9, v8, Lf/h/a/c/v0/a$a;->c:I
+    iget v10, v8, Lf/h/a/c/v0/a$a;->c:I
 
     iget-object v8, v8, Lf/h/a/c/v0/a$a;->a:Lf/h/a/c/d1/p$a;
 
-    invoke-virtual {v5, v9, v8}, Lf/h/a/c/v0/a;->V(ILf/h/a/c/d1/p$a;)V
+    invoke-virtual {v5, v10, v8}, Lf/h/a/c/v0/a;->V(ILf/h/a/c/d1/p$a;)V
 
     goto :goto_1
 
@@ -436,7 +458,7 @@
 
     if-eqz v6, :cond_5
 
-    invoke-virtual {v5, v13}, Lf/h/a/c/r;->a(Z)V
+    invoke-virtual {v5, v12}, Lf/h/a/c/r;->a(Z)V
 
     :cond_5
     const/4 v5, 0x1
@@ -453,47 +475,47 @@
 
     invoke-virtual {v4, v6, v5}, Lf/h/a/c/s0;->R(ZI)V
 
-    iget-object v14, v4, Lf/h/a/c/s0;->c:Lf/h/a/c/a0;
+    iget-object v13, v4, Lf/h/a/c/s0;->c:Lf/h/a/c/a0;
 
-    invoke-virtual {v14, v13, v13, v13, v12}, Lf/h/a/c/a0;->I(ZZZI)Lf/h/a/c/i0;
+    invoke-virtual {v13, v12, v12, v12, v11}, Lf/h/a/c/a0;->I(ZZZI)Lf/h/a/c/i0;
 
-    move-result-object v15
+    move-result-object v14
 
-    iput-boolean v13, v14, Lf/h/a/c/a0;->p:Z
+    iput-boolean v12, v13, Lf/h/a/c/a0;->p:Z
 
-    iget v4, v14, Lf/h/a/c/a0;->o:I
+    iget v4, v13, Lf/h/a/c/a0;->o:I
 
-    add-int/2addr v4, v13
+    add-int/2addr v4, v12
 
-    iput v4, v14, Lf/h/a/c/a0;->o:I
+    iput v4, v13, Lf/h/a/c/a0;->o:I
 
-    iget-object v4, v14, Lf/h/a/c/a0;->f:Lf/h/a/c/b0;
+    iget-object v4, v13, Lf/h/a/c/a0;->f:Lf/h/a/c/b0;
 
     iget-object v4, v4, Lf/h/a/c/b0;->j:Lf/h/a/c/i1/z;
 
     iget-object v4, v4, Lf/h/a/c/i1/z;->a:Landroid/os/Handler;
 
-    invoke-virtual {v4, v10, v13, v13, v1}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
+    invoke-virtual {v4, v9, v12, v12, v1}, Landroid/os/Handler;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
 
     move-result-object v1
 
     invoke-virtual {v1}, Landroid/os/Message;->sendToTarget()V
 
-    const/16 v16, 0x0
+    const/4 v15, 0x0
 
-    const/16 v17, 0x4
+    const/16 v16, 0x4
 
-    const/16 v18, 0x1
+    const/16 v17, 0x1
 
-    const/16 v19, 0x0
+    const/16 v18, 0x0
 
-    invoke-virtual/range {v14 .. v19}, Lf/h/a/c/a0;->V(Lf/h/a/c/i0;ZIIZ)V
+    invoke-virtual/range {v13 .. v18}, Lf/h/a/c/a0;->V(Lf/h/a/c/i0;ZIIZ)V
 
     if-eqz p2, :cond_7
 
     iget-object v1, v0, Lcom/discord/player/AppMediaPlayer;->f:Lf/h/a/c/s0;
 
-    invoke-virtual {v1, v13}, Lf/h/a/c/s0;->n(Z)V
+    invoke-virtual {v1, v12}, Lf/h/a/c/s0;->n(Z)V
 
     :cond_7
     const-wide/16 v4, 0x0
@@ -525,20 +547,6 @@
 
     :cond_9
     throw v6
-
-    :cond_a
-    const-string v1, "playerView"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_b
-    const-string v1, "mediaSource"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public final c()V
diff --git a/com.discord/smali/com/discord/player/MediaSource$a.smali b/com.discord/smali/com/discord/player/MediaSource$a.smali
index 7eed00fc19..222cf67952 100644
--- a/com.discord/smali/com/discord/player/MediaSource$a.smali
+++ b/com.discord/smali/com/discord/player/MediaSource$a.smali
@@ -38,77 +38,57 @@
 
 # virtual methods
 .method public createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "parcel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/player/MediaSource;
 
-    const-class v2, Landroid/net/Uri;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+    const-class v0, Landroid/net/Uri;
 
-    move-result-object v2
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
 
-    invoke-virtual {p1, v2}, Landroid/os/Parcel;->readParcelable(Ljava/lang/ClassLoader;)Landroid/os/Parcelable;
+    move-result-object v0
 
-    move-result-object v2
+    invoke-virtual {p1, v0}, Landroid/os/Parcel;->readParcelable(Ljava/lang/ClassLoader;)Landroid/os/Parcelable;
 
-    if-eqz v2, :cond_2
+    move-result-object v0
 
-    check-cast v2, Landroid/net/Uri;
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    check-cast v0, Landroid/net/Uri;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
+    move-result-object v2
+
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    const-string v3, "parcel.readString()!!"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v3, Lcom/discord/player/MediaType;
+
+    invoke-virtual {v3}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
     move-result-object v3
 
-    if-eqz v3, :cond_1
-
-    const-string v4, "parcel.readString()!!"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-class v4, Lcom/discord/player/MediaType;
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v4
-
-    invoke-virtual {p1, v4}, Landroid/os/Parcel;->readParcelable(Ljava/lang/ClassLoader;)Landroid/os/Parcelable;
+    invoke-virtual {p1, v3}, Landroid/os/Parcel;->readParcelable(Ljava/lang/ClassLoader;)Landroid/os/Parcelable;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     check-cast p1, Lcom/discord/player/MediaType;
 
-    invoke-direct {v1, v2, v3, p1}, Lcom/discord/player/MediaSource;-><init>(Landroid/net/Uri;Ljava/lang/String;Lcom/discord/player/MediaType;)V
+    invoke-direct {v1, v0, v2, p1}, Lcom/discord/player/MediaSource;-><init>(Landroid/net/Uri;Ljava/lang/String;Lcom/discord/player/MediaType;)V
 
     return-object v1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public newArray(I)[Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/player/MediaSource.smali b/com.discord/smali/com/discord/player/MediaSource.smali
index 6a9bffcb69..3c01d5a3d2 100644
--- a/com.discord/smali/com/discord/player/MediaSource.smali
+++ b/com.discord/smali/com/discord/player/MediaSource.smali
@@ -44,11 +44,17 @@
 .method public constructor <init>(Landroid/net/Uri;Ljava/lang/String;Lcom/discord/player/MediaType;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "progressiveMediaUri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "featureTag"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaType"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,20 +65,6 @@
     iput-object p3, p0, Lcom/discord/player/MediaSource;->f:Lcom/discord/player/MediaType;
 
     return-void
-
-    :cond_0
-    const-string p1, "mediaType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "progressiveMediaUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -100,7 +92,7 @@
 
     iget-object v1, p1, Lcom/discord/player/MediaSource;->d:Landroid/net/Uri;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -110,7 +102,7 @@
 
     iget-object v1, p1, Lcom/discord/player/MediaSource;->e:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -120,7 +112,7 @@
 
     iget-object p1, p1, Lcom/discord/player/MediaSource;->f:Lcom/discord/player/MediaType;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -236,7 +228,9 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "parcel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/player/MediaSource;->d:Landroid/net/Uri;
 
@@ -251,13 +245,4 @@
     invoke-virtual {p1, v0, p2}, Landroid/os/Parcel;->writeParcelable(Landroid/os/Parcelable;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/player/MediaType$a.smali b/com.discord/smali/com/discord/player/MediaType$a.smali
index 1c19468ca8..2610cb93c8 100644
--- a/com.discord/smali/com/discord/player/MediaType$a.smali
+++ b/com.discord/smali/com/discord/player/MediaType$a.smali
@@ -40,37 +40,25 @@
 .method public createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "parcel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v0, "parcel.readString()!!"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/player/MediaType;->valueOf(Ljava/lang/String;)Lcom/discord/player/MediaType;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public newArray(I)[Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/player/MediaType.smali b/com.discord/smali/com/discord/player/MediaType.smali
index cebbf24d45..14726fd5ea 100644
--- a/com.discord/smali/com/discord/player/MediaType.smali
+++ b/com.discord/smali/com/discord/player/MediaType.smali
@@ -132,7 +132,9 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "parcel"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Enum;->name()Ljava/lang/String;
 
@@ -141,13 +143,4 @@
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali b/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
index 42fed694e7..dfc1afa028 100644
--- a/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
@@ -12,24 +12,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/logging/Logger;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "logger"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/BreadcrumbInterceptor;->logger:Lcom/discord/utilities/logging/Logger;
 
     return-void
-
-    :cond_0
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -37,15 +30,17 @@
 .method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
     .locals 5
 
-    if-eqz p1, :cond_0
+    const-string v0, "chain"
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
 
     move-result-object v0
 
-    iget-object v1, v0, Ln0/a0;->c:Ljava/lang/String;
+    iget-object v1, v0, Lo0/a0;->c:Ljava/lang/String;
 
-    iget-object v0, v0, Ln0/a0;->b:Ln0/w;
+    iget-object v0, v0, Lo0/a0;->b:Lo0/w;
 
     iget-object v2, p0, Lcom/discord/restapi/BreadcrumbInterceptor;->logger:Lcom/discord/utilities/logging/Logger;
 
@@ -73,22 +68,13 @@
 
     invoke-virtual {v2, v0, v1}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
 
     move-result-object v0
 
-    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
+    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "chain"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/R$attr.smali b/com.discord/smali/com/discord/restapi/R$attr.smali
index 620a7f418a..8aebafc80d 100644
--- a/com.discord/smali/com/discord/restapi/R$attr.smali
+++ b/com.discord/smali/com/discord/restapi/R$attr.smali
@@ -1214,419 +1214,419 @@
 
 .field public static final roundingBorderWidth:I = 0x7f040456
 
-.field public static final scopeUris:I = 0x7f040467
+.field public static final scopeUris:I = 0x7f040459
 
-.field public static final scrimAnimationDuration:I = 0x7f040468
+.field public static final scrimAnimationDuration:I = 0x7f04045a
 
-.field public static final scrimBackground:I = 0x7f040469
+.field public static final scrimBackground:I = 0x7f04045b
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f04046a
+.field public static final scrimVisibleHeightTrigger:I = 0x7f04045c
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final seekBarIncrement:I = 0x7f04047a
+.field public static final seekBarIncrement:I = 0x7f04046c
 
-.field public static final seekBarPreferenceStyle:I = 0x7f04047b
+.field public static final seekBarPreferenceStyle:I = 0x7f04046d
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final selectable:I = 0x7f04047d
+.field public static final selectable:I = 0x7f04046f
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final selectionRequired:I = 0x7f040480
+.field public static final selectionRequired:I = 0x7f040472
 
-.field public static final shapeAppearance:I = 0x7f040484
+.field public static final shapeAppearance:I = 0x7f040476
 
-.field public static final shapeAppearanceLargeComponent:I = 0x7f040485
+.field public static final shapeAppearanceLargeComponent:I = 0x7f040477
 
-.field public static final shapeAppearanceMediumComponent:I = 0x7f040486
+.field public static final shapeAppearanceMediumComponent:I = 0x7f040478
 
-.field public static final shapeAppearanceOverlay:I = 0x7f040487
+.field public static final shapeAppearanceOverlay:I = 0x7f040479
 
-.field public static final shapeAppearanceSmallComponent:I = 0x7f040488
+.field public static final shapeAppearanceSmallComponent:I = 0x7f04047a
 
-.field public static final shouldDisableView:I = 0x7f040489
+.field public static final shouldDisableView:I = 0x7f04047b
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final showDivider:I = 0x7f04048c
+.field public static final showDivider:I = 0x7f04047e
 
-.field public static final showDividerHorizontal:I = 0x7f04048d
+.field public static final showDividerHorizontal:I = 0x7f04047f
 
-.field public static final showDividerVertical:I = 0x7f04048e
+.field public static final showDividerVertical:I = 0x7f040480
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final showMotionSpec:I = 0x7f040490
+.field public static final showMotionSpec:I = 0x7f040482
 
-.field public static final showSeekBarValue:I = 0x7f040491
+.field public static final showSeekBarValue:I = 0x7f040483
 
-.field public static final showText:I = 0x7f040492
+.field public static final showText:I = 0x7f040484
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final shrinkMotionSpec:I = 0x7f040497
+.field public static final shrinkMotionSpec:I = 0x7f040489
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final singleLine:I = 0x7f04049a
+.field public static final singleLine:I = 0x7f04048c
 
-.field public static final singleLineTitle:I = 0x7f04049b
+.field public static final singleLineTitle:I = 0x7f04048d
 
-.field public static final singleSelection:I = 0x7f04049c
+.field public static final singleSelection:I = 0x7f04048e
 
-.field public static final sliderStyle:I = 0x7f04049d
+.field public static final sliderStyle:I = 0x7f04048f
 
-.field public static final snackbarButtonStyle:I = 0x7f04049e
+.field public static final snackbarButtonStyle:I = 0x7f040490
 
-.field public static final snackbarStyle:I = 0x7f04049f
+.field public static final snackbarStyle:I = 0x7f040491
 
-.field public static final snackbarTextViewStyle:I = 0x7f0404a0
+.field public static final snackbarTextViewStyle:I = 0x7f040492
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final startIconCheckable:I = 0x7f0404aa
+.field public static final startIconCheckable:I = 0x7f04049c
 
-.field public static final startIconContentDescription:I = 0x7f0404ab
+.field public static final startIconContentDescription:I = 0x7f04049d
 
-.field public static final startIconDrawable:I = 0x7f0404ac
+.field public static final startIconDrawable:I = 0x7f04049e
 
-.field public static final startIconTint:I = 0x7f0404ad
+.field public static final startIconTint:I = 0x7f04049f
 
-.field public static final startIconTintMode:I = 0x7f0404ae
+.field public static final startIconTintMode:I = 0x7f0404a0
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final state_collapsed:I = 0x7f0404b0
+.field public static final state_collapsed:I = 0x7f0404a2
 
-.field public static final state_collapsible:I = 0x7f0404b1
+.field public static final state_collapsible:I = 0x7f0404a3
 
-.field public static final state_dragged:I = 0x7f0404b2
+.field public static final state_dragged:I = 0x7f0404a4
 
-.field public static final state_liftable:I = 0x7f0404b3
+.field public static final state_liftable:I = 0x7f0404a5
 
-.field public static final state_lifted:I = 0x7f0404b4
+.field public static final state_lifted:I = 0x7f0404a6
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final statusBarForeground:I = 0x7f0404b6
+.field public static final statusBarForeground:I = 0x7f0404a8
 
-.field public static final statusBarScrim:I = 0x7f0404b7
+.field public static final statusBarScrim:I = 0x7f0404a9
 
-.field public static final strokeColor:I = 0x7f0404ba
+.field public static final strokeColor:I = 0x7f0404ac
 
-.field public static final strokeWidth:I = 0x7f0404bb
+.field public static final strokeWidth:I = 0x7f0404ad
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final suffixText:I = 0x7f0404c5
+.field public static final suffixText:I = 0x7f0404b7
 
-.field public static final suffixTextAppearance:I = 0x7f0404c6
+.field public static final suffixTextAppearance:I = 0x7f0404b8
 
-.field public static final suffixTextColor:I = 0x7f0404c7
+.field public static final suffixTextColor:I = 0x7f0404b9
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final summary:I = 0x7f0404c9
+.field public static final summary:I = 0x7f0404bb
 
-.field public static final summaryOff:I = 0x7f0404ca
+.field public static final summaryOff:I = 0x7f0404bc
 
-.field public static final summaryOn:I = 0x7f0404cb
+.field public static final summaryOn:I = 0x7f0404bd
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final switchPreferenceCompatStyle:I = 0x7f0404d4
+.field public static final switchPreferenceCompatStyle:I = 0x7f0404c6
 
-.field public static final switchPreferenceStyle:I = 0x7f0404d5
+.field public static final switchPreferenceStyle:I = 0x7f0404c7
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final switchTextOff:I = 0x7f0404d8
+.field public static final switchTextOff:I = 0x7f0404ca
 
-.field public static final switchTextOn:I = 0x7f0404d9
+.field public static final switchTextOn:I = 0x7f0404cb
 
-.field public static final tabBackground:I = 0x7f0404da
+.field public static final tabBackground:I = 0x7f0404cc
 
-.field public static final tabContentStart:I = 0x7f0404db
+.field public static final tabContentStart:I = 0x7f0404cd
 
-.field public static final tabGravity:I = 0x7f0404dc
+.field public static final tabGravity:I = 0x7f0404ce
 
-.field public static final tabIconTint:I = 0x7f0404dd
+.field public static final tabIconTint:I = 0x7f0404cf
 
-.field public static final tabIconTintMode:I = 0x7f0404de
+.field public static final tabIconTintMode:I = 0x7f0404d0
 
-.field public static final tabIndicator:I = 0x7f0404df
+.field public static final tabIndicator:I = 0x7f0404d1
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f0404e0
+.field public static final tabIndicatorAnimationDuration:I = 0x7f0404d2
 
-.field public static final tabIndicatorColor:I = 0x7f0404e1
+.field public static final tabIndicatorColor:I = 0x7f0404d3
 
-.field public static final tabIndicatorFullWidth:I = 0x7f0404e2
+.field public static final tabIndicatorFullWidth:I = 0x7f0404d4
 
-.field public static final tabIndicatorGravity:I = 0x7f0404e3
+.field public static final tabIndicatorGravity:I = 0x7f0404d5
 
-.field public static final tabIndicatorHeight:I = 0x7f0404e4
+.field public static final tabIndicatorHeight:I = 0x7f0404d6
 
-.field public static final tabInlineLabel:I = 0x7f0404e5
+.field public static final tabInlineLabel:I = 0x7f0404d7
 
-.field public static final tabMaxWidth:I = 0x7f0404e6
+.field public static final tabMaxWidth:I = 0x7f0404d8
 
-.field public static final tabMinWidth:I = 0x7f0404e7
+.field public static final tabMinWidth:I = 0x7f0404d9
 
-.field public static final tabMode:I = 0x7f0404e8
+.field public static final tabMode:I = 0x7f0404da
 
-.field public static final tabPadding:I = 0x7f0404e9
+.field public static final tabPadding:I = 0x7f0404db
 
-.field public static final tabPaddingBottom:I = 0x7f0404ea
+.field public static final tabPaddingBottom:I = 0x7f0404dc
 
-.field public static final tabPaddingEnd:I = 0x7f0404eb
+.field public static final tabPaddingEnd:I = 0x7f0404dd
 
-.field public static final tabPaddingStart:I = 0x7f0404ec
+.field public static final tabPaddingStart:I = 0x7f0404de
 
-.field public static final tabPaddingTop:I = 0x7f0404ed
+.field public static final tabPaddingTop:I = 0x7f0404df
 
-.field public static final tabRippleColor:I = 0x7f0404ee
+.field public static final tabRippleColor:I = 0x7f0404e0
 
-.field public static final tabSelectedTextColor:I = 0x7f0404ef
+.field public static final tabSelectedTextColor:I = 0x7f0404e1
 
-.field public static final tabStyle:I = 0x7f0404f0
+.field public static final tabStyle:I = 0x7f0404e2
 
-.field public static final tabTextAppearance:I = 0x7f0404f1
+.field public static final tabTextAppearance:I = 0x7f0404e3
 
-.field public static final tabTextColor:I = 0x7f0404f2
+.field public static final tabTextColor:I = 0x7f0404e4
 
-.field public static final tabUnboundedRipple:I = 0x7f0404f3
+.field public static final tabUnboundedRipple:I = 0x7f0404e5
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final textAppearanceBody1:I = 0x7f0404f9
+.field public static final textAppearanceBody1:I = 0x7f0404eb
 
-.field public static final textAppearanceBody2:I = 0x7f0404fa
+.field public static final textAppearanceBody2:I = 0x7f0404ec
 
-.field public static final textAppearanceButton:I = 0x7f0404fb
+.field public static final textAppearanceButton:I = 0x7f0404ed
 
-.field public static final textAppearanceCaption:I = 0x7f0404fc
+.field public static final textAppearanceCaption:I = 0x7f0404ee
 
-.field public static final textAppearanceHeadline1:I = 0x7f0404fd
+.field public static final textAppearanceHeadline1:I = 0x7f0404ef
 
-.field public static final textAppearanceHeadline2:I = 0x7f0404fe
+.field public static final textAppearanceHeadline2:I = 0x7f0404f0
 
-.field public static final textAppearanceHeadline3:I = 0x7f0404ff
+.field public static final textAppearanceHeadline3:I = 0x7f0404f1
 
-.field public static final textAppearanceHeadline4:I = 0x7f040500
+.field public static final textAppearanceHeadline4:I = 0x7f0404f2
 
-.field public static final textAppearanceHeadline5:I = 0x7f040501
+.field public static final textAppearanceHeadline5:I = 0x7f0404f3
 
-.field public static final textAppearanceHeadline6:I = 0x7f040502
+.field public static final textAppearanceHeadline6:I = 0x7f0404f4
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final textAppearanceLineHeightEnabled:I = 0x7f040504
+.field public static final textAppearanceLineHeightEnabled:I = 0x7f0404f6
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearanceOverline:I = 0x7f040508
+.field public static final textAppearanceOverline:I = 0x7f0404fa
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04050d
+.field public static final textAppearanceSubtitle1:I = 0x7f0404ff
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04050e
+.field public static final textAppearanceSubtitle2:I = 0x7f040500
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final textEndPadding:I = 0x7f040511
+.field public static final textEndPadding:I = 0x7f040503
 
-.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040512
+.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040504
 
-.field public static final textInputStyle:I = 0x7f040513
+.field public static final textInputStyle:I = 0x7f040505
 
-.field public static final textLocale:I = 0x7f040514
+.field public static final textLocale:I = 0x7f040506
 
-.field public static final textStartPadding:I = 0x7f040515
+.field public static final textStartPadding:I = 0x7f040507
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme:I = 0x7f040509
 
-.field public static final themeLineHeight:I = 0x7f040518
+.field public static final themeLineHeight:I = 0x7f04050a
 
-.field public static final thickness:I = 0x7f040543
+.field public static final thickness:I = 0x7f040535
 
-.field public static final thumbColor:I = 0x7f040544
+.field public static final thumbColor:I = 0x7f040536
 
-.field public static final thumbElevation:I = 0x7f040545
+.field public static final thumbElevation:I = 0x7f040537
 
-.field public static final thumbRadius:I = 0x7f040546
+.field public static final thumbRadius:I = 0x7f040538
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final tickColor:I = 0x7f04054a
+.field public static final tickColor:I = 0x7f04053c
 
-.field public static final tickColorActive:I = 0x7f04054b
+.field public static final tickColorActive:I = 0x7f04053d
 
-.field public static final tickColorInactive:I = 0x7f04054c
+.field public static final tickColorInactive:I = 0x7f04053e
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final tint:I = 0x7f040551
+.field public static final tint:I = 0x7f040543
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final title:I = 0x7f040553
+.field public static final title:I = 0x7f040545
 
-.field public static final titleEnabled:I = 0x7f040554
+.field public static final titleEnabled:I = 0x7f040546
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final toolbarId:I = 0x7f040560
+.field public static final toolbarId:I = 0x7f040552
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final tooltipStyle:I = 0x7f040565
+.field public static final tooltipStyle:I = 0x7f040557
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final topLeftRadius:I = 0x7f040567
+.field public static final topLeftRadius:I = 0x7f040559
 
-.field public static final topRightRadius:I = 0x7f040568
+.field public static final topRightRadius:I = 0x7f04055a
 
-.field public static final track:I = 0x7f04056a
+.field public static final track:I = 0x7f04055c
 
-.field public static final trackColor:I = 0x7f04056b
+.field public static final trackColor:I = 0x7f04055d
 
-.field public static final trackColorActive:I = 0x7f04056c
+.field public static final trackColorActive:I = 0x7f04055e
 
-.field public static final trackColorInactive:I = 0x7f04056d
+.field public static final trackColorInactive:I = 0x7f04055f
 
-.field public static final trackHeight:I = 0x7f04056e
+.field public static final trackHeight:I = 0x7f040560
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final transitionShapeAppearance:I = 0x7f040571
+.field public static final transitionShapeAppearance:I = 0x7f040563
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final updatesContinuously:I = 0x7f040588
+.field public static final updatesContinuously:I = 0x7f04057a
 
-.field public static final useCompatPadding:I = 0x7f040589
+.field public static final useCompatPadding:I = 0x7f04057b
 
-.field public static final useMaterialThemeColors:I = 0x7f04058a
+.field public static final useMaterialThemeColors:I = 0x7f04057c
 
-.field public static final useSimpleSummaryProvider:I = 0x7f04058b
+.field public static final useSimpleSummaryProvider:I = 0x7f04057d
 
-.field public static final values:I = 0x7f040598
+.field public static final values:I = 0x7f04058a
 
-.field public static final verticalOffset:I = 0x7f04059b
+.field public static final verticalOffset:I = 0x7f04058d
 
-.field public static final viewAspectRatio:I = 0x7f04059c
+.field public static final viewAspectRatio:I = 0x7f04058e
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final widgetLayout:I = 0x7f0405a0
+.field public static final widgetLayout:I = 0x7f040592
 
-.field public static final windowActionBar:I = 0x7f0405a1
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final windowNoTitle:I = 0x7f0405aa
+.field public static final windowNoTitle:I = 0x7f04059c
 
-.field public static final yearSelectedStyle:I = 0x7f0405ab
+.field public static final yearSelectedStyle:I = 0x7f04059d
 
-.field public static final yearStyle:I = 0x7f0405ac
+.field public static final yearStyle:I = 0x7f04059e
 
-.field public static final yearTodayStyle:I = 0x7f0405ad
+.field public static final yearTodayStyle:I = 0x7f04059f
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index d9c0ea4505..9830e9f59f 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -262,85 +262,85 @@
 
 .field public static final drawable_chip_delete:I = 0x7f080128
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801f4
+.field public static final googleg_disabled_color_18:I = 0x7f0801f5
 
-.field public static final googleg_standard_color_18:I = 0x7f0801f5
+.field public static final googleg_standard_color_18:I = 0x7f0801f6
 
-.field public static final ic_arrow_down_24dp:I = 0x7f08021d
+.field public static final ic_arrow_down_24dp:I = 0x7f08021e
 
-.field public static final ic_mtrl_checked_circle:I = 0x7f08034f
+.field public static final ic_mtrl_checked_circle:I = 0x7f080352
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080350
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080353
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080351
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080354
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080352
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080355
 
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804e9
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ec
 
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804ea
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804ed
 
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804eb
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804ee
 
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ec
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ef
 
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804ed
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f0
 
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804ee
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f1
 
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f2
 
-.field public static final mtrl_dialog_background:I = 0x7f0804f0
+.field public static final mtrl_dialog_background:I = 0x7f0804f3
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f1
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f4
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f2
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f5
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f3
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f6
 
-.field public static final mtrl_ic_cancel:I = 0x7f0804f4
+.field public static final mtrl_ic_cancel:I = 0x7f0804f7
 
-.field public static final mtrl_ic_error:I = 0x7f0804f5
+.field public static final mtrl_ic_error:I = 0x7f0804f8
 
-.field public static final mtrl_popupmenu_background:I = 0x7f0804f6
+.field public static final mtrl_popupmenu_background:I = 0x7f0804f9
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f7
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fa
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f8
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fb
 
-.field public static final navigation_empty_icon:I = 0x7f0804f9
+.field public static final navigation_empty_icon:I = 0x7f0804fc
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final preference_list_divider_material:I = 0x7f080506
+.field public static final preference_list_divider_material:I = 0x7f080509
 
-.field public static final test_custom_background:I = 0x7f080518
+.field public static final test_custom_background:I = 0x7f08051c
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$id.smali b/com.discord/smali/com/discord/restapi/R$id.smali
index aa78d24b4f..8125ddec7a 100644
--- a/com.discord/smali/com/discord/restapi/R$id.smali
+++ b/com.discord/smali/com/discord/restapi/R$id.smali
@@ -150,471 +150,471 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final cancel_action:I = 0x7f0a013c
+.field public static final cancel_action:I = 0x7f0a013f
 
-.field public static final cancel_button:I = 0x7f0a013d
+.field public static final cancel_button:I = 0x7f0a0140
 
-.field public static final center:I = 0x7f0a0141
+.field public static final center:I = 0x7f0a0144
 
-.field public static final centerCrop:I = 0x7f0a0142
+.field public static final centerCrop:I = 0x7f0a0145
 
-.field public static final centerInside:I = 0x7f0a0143
+.field public static final centerInside:I = 0x7f0a0146
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0266
 
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0267
 
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0268
 
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0269
 
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a026a
 
-.field public static final chip_image:I = 0x7f0a0268
+.field public static final chip_image:I = 0x7f0a026b
 
-.field public static final chip_text:I = 0x7f0a0269
+.field public static final chip_text:I = 0x7f0a026c
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026f
 
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a0270
 
-.field public static final column:I = 0x7f0a0276
+.field public static final column:I = 0x7f0a0279
 
-.field public static final column_reverse:I = 0x7f0a0277
+.field public static final column_reverse:I = 0x7f0a027a
 
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027b
 
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028c
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0292
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02ba
 
-.field public static final dark:I = 0x7f0a02b8
+.field public static final dark:I = 0x7f0a02bb
 
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bd
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c6
 
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c7
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c8
 
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c9
 
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02ca
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02ff
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a0352
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a038d
 
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a4
 
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a7
 
-.field public static final fitBottomStart:I = 0x7f0a03a5
+.field public static final fitBottomStart:I = 0x7f0a03ab
 
-.field public static final fitCenter:I = 0x7f0a03a6
+.field public static final fitCenter:I = 0x7f0a03ac
 
-.field public static final fitEnd:I = 0x7f0a03a7
+.field public static final fitEnd:I = 0x7f0a03ad
 
-.field public static final fitStart:I = 0x7f0a03a8
+.field public static final fitStart:I = 0x7f0a03ae
 
-.field public static final fitXY:I = 0x7f0a03aa
+.field public static final fitXY:I = 0x7f0a03b0
 
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03b1
 
-.field public static final flex_end:I = 0x7f0a03ae
+.field public static final flex_end:I = 0x7f0a03b4
 
-.field public static final flex_start:I = 0x7f0a03bf
+.field public static final flex_start:I = 0x7f0a03c5
 
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c6
 
-.field public static final focusCrop:I = 0x7f0a03c2
+.field public static final focusCrop:I = 0x7f0a03c8
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e9
 
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03ea
 
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0416
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04db
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final icon_only:I = 0x7f0a04d7
+.field public static final icon_only:I = 0x7f0a04dd
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ee
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a057d
 
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057f
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final light:I = 0x7f0a0585
+.field public static final light:I = 0x7f0a058b
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058e
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a05a1
 
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a7
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final mini:I = 0x7f0a05df
+.field public static final mini:I = 0x7f0a05e5
 
-.field public static final month_grid:I = 0x7f0a05e1
+.field public static final month_grid:I = 0x7f0a05e7
 
-.field public static final month_navigation_bar:I = 0x7f0a05e2
+.field public static final month_navigation_bar:I = 0x7f0a05e8
 
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e3
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e9
 
-.field public static final month_navigation_next:I = 0x7f0a05e4
+.field public static final month_navigation_next:I = 0x7f0a05ea
 
-.field public static final month_navigation_previous:I = 0x7f0a05e5
+.field public static final month_navigation_previous:I = 0x7f0a05eb
 
-.field public static final month_title:I = 0x7f0a05e6
+.field public static final month_title:I = 0x7f0a05ec
 
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e7
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05ed
 
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e8
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ee
 
-.field public static final mtrl_calendar_frame:I = 0x7f0a05e9
+.field public static final mtrl_calendar_frame:I = 0x7f0a05ef
 
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ea
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05f0
 
-.field public static final mtrl_calendar_months:I = 0x7f0a05eb
+.field public static final mtrl_calendar_months:I = 0x7f0a05f1
 
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ec
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f2
 
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f3
 
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05ee
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f4
 
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05ef
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f5
 
-.field public static final mtrl_child_content_container:I = 0x7f0a05f0
+.field public static final mtrl_child_content_container:I = 0x7f0a05f6
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f1
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f7
 
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f2
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f8
 
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f3
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f9
 
-.field public static final mtrl_picker_header:I = 0x7f0a05f4
+.field public static final mtrl_picker_header:I = 0x7f0a05fa
 
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f5
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05fb
 
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f6
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fc
 
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f7
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fd
 
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f8
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fe
 
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f9
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05ff
 
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fa
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a0600
 
-.field public static final mtrl_picker_title_text:I = 0x7f0a05fb
+.field public static final mtrl_picker_title_text:I = 0x7f0a0601
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final navigation_header_container:I = 0x7f0a060e
+.field public static final navigation_header_container:I = 0x7f0a0614
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final nowrap:I = 0x7f0a0634
+.field public static final nowrap:I = 0x7f0a063a
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final outgoing:I = 0x7f0a066a
+.field public static final outgoing:I = 0x7f0a0670
 
-.field public static final outline:I = 0x7f0a066b
+.field public static final outline:I = 0x7f0a0671
 
-.field public static final parallax:I = 0x7f0a067b
+.field public static final parallax:I = 0x7f0a0681
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final parent_matrix:I = 0x7f0a067e
+.field public static final parent_matrix:I = 0x7f0a0684
 
-.field public static final password_toggle:I = 0x7f0a068c
+.field public static final password_toggle:I = 0x7f0a0692
 
-.field public static final pin:I = 0x7f0a06b9
+.field public static final pin:I = 0x7f0a06bf
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final recycler_view:I = 0x7f0a073f
+.field public static final recycler_view:I = 0x7f0a0745
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final rounded:I = 0x7f0a0786
+.field public static final rounded:I = 0x7f0a078c
 
-.field public static final row:I = 0x7f0a0787
+.field public static final row:I = 0x7f0a078d
 
-.field public static final row_index_key:I = 0x7f0a0788
+.field public static final row_index_key:I = 0x7f0a078e
 
-.field public static final row_reverse:I = 0x7f0a0789
+.field public static final row_reverse:I = 0x7f0a078f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a078a
+.field public static final save_non_transition_alpha:I = 0x7f0a0790
 
-.field public static final save_overlay_view:I = 0x7f0a078b
+.field public static final save_overlay_view:I = 0x7f0a0791
 
-.field public static final scale:I = 0x7f0a078c
+.field public static final scale:I = 0x7f0a0792
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final scrollable:I = 0x7f0a0796
+.field public static final scrollable:I = 0x7f0a079c
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final seekbar:I = 0x7f0a07af
+.field public static final seekbar:I = 0x7f0a07b5
 
-.field public static final seekbar_value:I = 0x7f0a07b0
+.field public static final seekbar_value:I = 0x7f0a07b6
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final selected:I = 0x7f0a07b2
+.field public static final selected:I = 0x7f0a07b8
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final slide:I = 0x7f0a0916
+.field public static final slide:I = 0x7f0a091a
 
-.field public static final smallLabel:I = 0x7f0a0917
+.field public static final smallLabel:I = 0x7f0a091b
 
-.field public static final snackbar_action:I = 0x7f0a0918
+.field public static final snackbar_action:I = 0x7f0a091c
 
-.field public static final snackbar_text:I = 0x7f0a0919
+.field public static final snackbar_text:I = 0x7f0a091d
 
-.field public static final space_around:I = 0x7f0a091d
+.field public static final space_around:I = 0x7f0a0921
 
-.field public static final space_between:I = 0x7f0a091e
+.field public static final space_between:I = 0x7f0a0922
 
-.field public static final space_evenly:I = 0x7f0a091f
+.field public static final space_evenly:I = 0x7f0a0923
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final spinner:I = 0x7f0a0923
+.field public static final spinner:I = 0x7f0a0927
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final standard:I = 0x7f0a092c
+.field public static final standard:I = 0x7f0a0930
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0933
+.field public static final status_bar_latest_event_content:I = 0x7f0a0937
 
-.field public static final stretch:I = 0x7f0a0948
+.field public static final stretch:I = 0x7f0a094c
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final switchWidget:I = 0x7f0a0958
+.field public static final switchWidget:I = 0x7f0a095c
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0976
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a097a
 
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a097b
 
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0978
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a097c
 
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097d
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final text_input_end_icon:I = 0x7f0a0981
+.field public static final text_input_end_icon:I = 0x7f0a0985
 
-.field public static final text_input_start_icon:I = 0x7f0a0982
+.field public static final text_input_start_icon:I = 0x7f0a0986
 
-.field public static final textinput_counter:I = 0x7f0a0985
+.field public static final textinput_counter:I = 0x7f0a0989
 
-.field public static final textinput_error:I = 0x7f0a0986
+.field public static final textinput_error:I = 0x7f0a098a
 
-.field public static final textinput_helper_text:I = 0x7f0a0987
+.field public static final textinput_helper_text:I = 0x7f0a098b
 
-.field public static final textinput_placeholder:I = 0x7f0a0988
+.field public static final textinput_placeholder:I = 0x7f0a098c
 
-.field public static final textinput_prefix_text:I = 0x7f0a0989
+.field public static final textinput_prefix_text:I = 0x7f0a098d
 
-.field public static final textinput_suffix_text:I = 0x7f0a098a
+.field public static final textinput_suffix_text:I = 0x7f0a098e
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final touch_outside:I = 0x7f0a099c
+.field public static final touch_outside:I = 0x7f0a09a0
 
-.field public static final transition_current_scene:I = 0x7f0a099d
+.field public static final transition_current_scene:I = 0x7f0a09a1
 
-.field public static final transition_layout_save:I = 0x7f0a099e
+.field public static final transition_layout_save:I = 0x7f0a09a2
 
-.field public static final transition_position:I = 0x7f0a099f
+.field public static final transition_position:I = 0x7f0a09a3
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a0
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a4
 
-.field public static final transition_transform:I = 0x7f0a09a1
+.field public static final transition_transform:I = 0x7f0a09a5
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final unlabeled:I = 0x7f0a09b4
+.field public static final unlabeled:I = 0x7f0a09b8
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final view_offset_helper:I = 0x7f0a0a38
+.field public static final view_offset_helper:I = 0x7f0a0a3c
 
-.field public static final visible:I = 0x7f0a0a4c
+.field public static final visible:I = 0x7f0a0a50
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
-.field public static final wide:I = 0x7f0a0a7f
+.field public static final wide:I = 0x7f0a0a84
 
-.field public static final withinBounds:I = 0x7f0a0ab6
+.field public static final withinBounds:I = 0x7f0a0abb
 
-.field public static final wrap:I = 0x7f0a0ab7
+.field public static final wrap:I = 0x7f0a0abc
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
-.field public static final wrap_reverse:I = 0x7f0a0ab9
+.field public static final wrap_reverse:I = 0x7f0a0abe
 
-.field public static final zero_corner_chip:I = 0x7f0a0abe
+.field public static final zero_corner_chip:I = 0x7f0a0ac3
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$plurals.smali b/com.discord/smali/com/discord/restapi/R$plurals.smali
index 5987fec8af..9ca873ed1c 100644
--- a/com.discord/smali/com/discord/restapi/R$plurals.smali
+++ b/com.discord/smali/com/discord/restapi/R$plurals.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final mtrl_badge_content_description:I = 0x7f1000b3
+.field public static final mtrl_badge_content_description:I = 0x7f1000b5
 
 
 # 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 10a02230aa..7c0b71940f 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -72,165 +72,165 @@
 
 .field public static final bottom_sheet_behavior:I = 0x7f120357
 
-.field public static final character_counter_content_description:I = 0x7f12041e
+.field public static final character_counter_content_description:I = 0x7f12041f
 
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041f
+.field public static final character_counter_overflowed_content_description:I = 0x7f120420
 
-.field public static final character_counter_pattern:I = 0x7f120420
+.field public static final character_counter_pattern:I = 0x7f120421
 
-.field public static final chip_text:I = 0x7f120429
+.field public static final chip_text:I = 0x7f12042a
 
-.field public static final clear_text_end_icon_content_description:I = 0x7f120436
+.field public static final clear_text_end_icon_content_description:I = 0x7f120437
 
-.field public static final common_google_play_services_enable_button:I = 0x7f120465
+.field public static final common_google_play_services_enable_button:I = 0x7f120466
 
-.field public static final common_google_play_services_enable_text:I = 0x7f120466
+.field public static final common_google_play_services_enable_text:I = 0x7f120467
 
-.field public static final common_google_play_services_enable_title:I = 0x7f120467
+.field public static final common_google_play_services_enable_title:I = 0x7f120468
 
-.field public static final common_google_play_services_install_button:I = 0x7f120468
+.field public static final common_google_play_services_install_button:I = 0x7f120469
 
-.field public static final common_google_play_services_install_text:I = 0x7f120469
+.field public static final common_google_play_services_install_text:I = 0x7f12046a
 
-.field public static final common_google_play_services_install_title:I = 0x7f12046a
+.field public static final common_google_play_services_install_title:I = 0x7f12046b
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046b
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046c
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f12046c
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12046d
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f12046d
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046e
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046e
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046f
 
-.field public static final common_google_play_services_update_button:I = 0x7f12046f
+.field public static final common_google_play_services_update_button:I = 0x7f120470
 
-.field public static final common_google_play_services_update_text:I = 0x7f120470
+.field public static final common_google_play_services_update_text:I = 0x7f120471
 
-.field public static final common_google_play_services_update_title:I = 0x7f120471
+.field public static final common_google_play_services_update_title:I = 0x7f120472
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120472
+.field public static final common_google_play_services_updating_text:I = 0x7f120473
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120473
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120474
 
-.field public static final common_open_on_phone:I = 0x7f120474
+.field public static final common_open_on_phone:I = 0x7f120475
 
-.field public static final common_signin_button_text:I = 0x7f120475
+.field public static final common_signin_button_text:I = 0x7f120476
 
-.field public static final common_signin_button_text_long:I = 0x7f120476
+.field public static final common_signin_button_text_long:I = 0x7f120477
 
-.field public static final copy:I = 0x7f1204d3
+.field public static final copy:I = 0x7f1204d5
 
-.field public static final error_icon_content_description:I = 0x7f12064a
+.field public static final error_icon_content_description:I = 0x7f12064c
 
-.field public static final expand_button_title:I = 0x7f120681
+.field public static final expand_button_title:I = 0x7f120683
 
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068f
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f120691
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120698
+.field public static final fab_transformation_scrim_behavior:I = 0x7f12069a
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120699
+.field public static final fab_transformation_sheet_behavior:I = 0x7f12069b
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bd9
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bff
 
-.field public static final icon_content_description:I = 0x7f120c66
+.field public static final icon_content_description:I = 0x7f120c8c
 
-.field public static final item_view_role_description:I = 0x7f120d87
+.field public static final item_view_role_description:I = 0x7f120dad
 
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f11
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f3b
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f12
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f3c
 
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f13
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f3d
 
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f14
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f3e
 
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f15
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f3f
 
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f16
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f40
 
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f17
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f41
 
-.field public static final mtrl_picker_cancel:I = 0x7f120f18
+.field public static final mtrl_picker_cancel:I = 0x7f120f42
 
-.field public static final mtrl_picker_confirm:I = 0x7f120f19
+.field public static final mtrl_picker_confirm:I = 0x7f120f43
 
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f1a
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f44
 
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f1b
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f45
 
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f1c
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f46
 
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f1d
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f47
 
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f1e
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f48
 
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f1f
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f49
 
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f20
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f4a
 
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f21
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f4b
 
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f22
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f4c
 
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f23
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f4d
 
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f24
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f4e
 
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f25
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f4f
 
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f26
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f50
 
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f27
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f51
 
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f28
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f52
 
-.field public static final mtrl_picker_save:I = 0x7f120f29
+.field public static final mtrl_picker_save:I = 0x7f120f53
 
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f2a
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f54
 
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f2b
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f55
 
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f2c
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f56
 
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f2d
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f57
 
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f2e
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f58
 
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f2f
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f59
 
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f30
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f5a
 
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f31
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f5b
 
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f32
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f5c
 
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f33
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f5d
 
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f34
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f5e
 
-.field public static final not_set:I = 0x7f120fb7
+.field public static final not_set:I = 0x7f120fe1
 
-.field public static final password_toggle_content_description:I = 0x7f1210db
+.field public static final password_toggle_content_description:I = 0x7f121106
 
-.field public static final path_password_eye:I = 0x7f1210dd
+.field public static final path_password_eye:I = 0x7f121108
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210de
+.field public static final path_password_eye_mask_strike_through:I = 0x7f121109
 
-.field public static final path_password_eye_mask_visible:I = 0x7f1210df
+.field public static final path_password_eye_mask_visible:I = 0x7f12110a
 
-.field public static final path_password_strike_through:I = 0x7f1210e0
+.field public static final path_password_strike_through:I = 0x7f12110b
 
-.field public static final preference_copied:I = 0x7f121150
+.field public static final preference_copied:I = 0x7f12117b
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final summary_collapsed_preference_list:I = 0x7f12153a
+.field public static final summary_collapsed_preference_list:I = 0x7f121564
 
-.field public static final v7_preference_off:I = 0x7f121762
+.field public static final v7_preference_off:I = 0x7f12178c
 
-.field public static final v7_preference_on:I = 0x7f121763
+.field public static final v7_preference_on:I = 0x7f12178d
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$style.smali b/com.discord/smali/com/discord/restapi/R$style.smali
index 6c5a430b74..ef29e4ac96 100644
--- a/com.discord/smali/com/discord/restapi/R$style.smali
+++ b/com.discord/smali/com/discord/restapi/R$style.smali
@@ -1108,379 +1108,379 @@
 
 .field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f13029b
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_TextView:I = 0x7f1303dd
+.field public static final Widget_AppCompat_TextView:I = 0x7f1303dc
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e3
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e2
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e4
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e3
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e5
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e4
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e6
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e5
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e7
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e6
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1303e8
+.field public static final Widget_Design_NavigationView:I = 0x7f1303e7
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e9
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e8
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1303ea
+.field public static final Widget_Design_Snackbar:I = 0x7f1303e9
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1303eb
+.field public static final Widget_Design_TabLayout:I = 0x7f1303ea
 
-.field public static final Widget_Design_TextInputEditText:I = 0x7f1303ec
+.field public static final Widget_Design_TextInputEditText:I = 0x7f1303eb
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ed
+.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ec
 
-.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ee
+.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ed
 
-.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ef
+.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ee
 
-.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303f0
+.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303ef
 
-.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f1
+.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f0
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f2
+.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f1
 
-.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f3
+.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f2
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f4
+.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f3
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f5
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f4
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f6
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f5
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f7
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f6
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f8
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f7
 
-.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f9
+.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f8
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303fa
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303f9
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fb
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fa
 
-.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fc
+.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fb
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fd
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fc
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fe
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fd
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303ff
+.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303fe
 
-.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f130400
+.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f1303ff
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130401
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130400
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130402
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130401
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130403
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130402
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130404
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130403
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130405
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130404
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130406
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130405
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130407
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130406
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130408
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130407
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130409
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130408
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13040a
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130409
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040b
+.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040a
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040c
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040b
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040d
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040c
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040e
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040d
 
-.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040f
+.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040e
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130414
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130413
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130410
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f13040f
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130411
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130410
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130412
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130411
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130413
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130412
 
-.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130415
+.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130414
 
-.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130416
+.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130415
 
-.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130417
+.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130416
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130418
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130417
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130419
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130418
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f13041a
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130419
 
-.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041b
+.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041a
 
-.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041c
+.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041b
 
-.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041d
+.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041e
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041d
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130422
+.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130421
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041f
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041e
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f130420
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f13041f
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130421
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130420
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130423
+.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130422
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130424
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130423
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130425
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130424
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130426
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130425
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130427
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130426
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130428
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130427
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130429
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130428
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f13042a
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f130429
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042b
+.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042a
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042c
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042b
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042d
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042e
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042d
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042f
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042e
 
-.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f130430
+.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f13042f
 
-.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130431
+.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130430
 
-.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130432
+.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130431
 
-.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130433
+.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130432
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130434
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130433
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130435
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130434
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130436
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130435
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130437
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130436
 
-.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130438
+.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130437
 
-.field public static final Widget_MaterialComponents_Slider:I = 0x7f130439
+.field public static final Widget_MaterialComponents_Slider:I = 0x7f130438
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13043a
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130439
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043b
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043a
 
-.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043c
+.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043b
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043d
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043c
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043e
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043d
 
-.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043f
+.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043e
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f130440
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13043f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130441
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130440
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130442
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130441
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130443
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130442
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130444
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130443
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130445
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130444
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130446
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130445
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130447
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130446
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130448
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130447
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130449
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130448
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f13044a
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f130449
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044b
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044a
 
-.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044c
+.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044b
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044d
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044c
 
-.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044e
+.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044d
 
-.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044f
+.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044e
 
-.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f130450
+.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f13044f
 
-.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130451
+.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130450
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # 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 30a1bb5036..aef94f0086 100644
--- a/com.discord/smali/com/discord/restapi/R$styleable.smali
+++ b/com.discord/smali/com/discord/restapi/R$styleable.smali
@@ -2771,7 +2771,7 @@
 
     new-array v13, v1, [I
 
-    const v14, 0x7f04058b
+    const v14, 0x7f04057d
 
     aput v14, v13, v4
 
@@ -3053,7 +3053,7 @@
 
     new-array v0, v1, [I
 
-    const v8, 0x7f0404af
+    const v8, 0x7f0404a1
 
     aput v8, v0, v4
 
@@ -3107,7 +3107,7 @@
 
     new-array v8, v1, [I
 
-    const v9, 0x7f040598
+    const v9, 0x7f04058a
 
     aput v9, v8, v4
 
@@ -3241,7 +3241,7 @@
 
     new-array v2, v1, [I
 
-    const v3, 0x7f04058a
+    const v3, 0x7f04057c
 
     aput v3, v2, v4
 
@@ -3281,7 +3281,7 @@
 
     new-array v0, v1, [I
 
-    const v2, 0x7f040512
+    const v2, 0x7f040504
 
     aput v2, v0, v4
 
@@ -3372,10 +3372,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -3384,8 +3384,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -3402,8 +3402,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -3439,15 +3439,15 @@
         0x7f04021a
         0x7f040380
         0x7f040381
-        0x7f0404b6
+        0x7f0404a8
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f0404b0
-        0x7f0404b1
-        0x7f0404b3
-        0x7f0404b4
+        0x7f0404a2
+        0x7f0404a3
+        0x7f0404a5
+        0x7f0404a6
     .end array-data
 
     :array_9
@@ -3459,17 +3459,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_c
@@ -3504,8 +3504,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_e
@@ -3603,44 +3603,44 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_f
     .array-data 4
         0x101030e
-        0x7f04047e
+        0x7f040470
     .end array-data
 
     :array_10
@@ -3651,7 +3651,7 @@
         0x7f040271
         0x7f0403bc
         0x7f0403d1
-        0x7f04059b
+        0x7f04058d
     .end array-data
 
     :array_11
@@ -3698,8 +3698,8 @@
         0x7f04006b
         0x7f04006c
         0x7f040251
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_14
@@ -3725,8 +3725,8 @@
         0x10101f0
         0x10101f1
         0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
+        0x7f0404bc
+        0x7f0404bd
     .end array-data
 
     :array_16
@@ -3767,11 +3767,11 @@
         0x7f0402d6
         0x7f0402db
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040511
-        0x7f040515
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f040503
+        0x7f040507
     .end array-data
 
     :array_17
@@ -3780,9 +3780,9 @@
         0x7f040100
         0x7f040101
         0x7f040102
-        0x7f040480
-        0x7f04049a
-        0x7f04049c
+        0x7f040472
+        0x7f04048c
+        0x7f04048e
     .end array-data
 
     :array_18
@@ -3823,12 +3823,12 @@
         0x7f040220
         0x7f040221
         0x7f0403c0
-        0x7f040468
-        0x7f04046a
-        0x7f0404b7
-        0x7f040553
-        0x7f040554
-        0x7f040560
+        0x7f04045a
+        0x7f04045c
+        0x7f0404a9
+        0x7f040545
+        0x7f040546
+        0x7f040552
     .end array-data
 
     :array_1a
@@ -3855,7 +3855,7 @@
     :array_1d
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_1e
@@ -3893,8 +3893,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_21
@@ -3902,8 +3902,8 @@
         0x7f040201
         0x7f040222
         0x7f040266
-        0x7f040490
-        0x7f040497
+        0x7f040482
+        0x7f040489
     .end array-data
 
     :array_22
@@ -3923,9 +3923,9 @@
         0x7f040241
         0x7f040323
         0x7f0403bf
-        0x7f04048c
-        0x7f04048d
-        0x7f04048e
+        0x7f04047e
+        0x7f04047f
+        0x7f040480
     .end array-data
 
     :array_24
@@ -3957,10 +3957,10 @@
         0x7f0403be
         0x7f040407
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040589
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f04057b
     .end array-data
 
     :array_26
@@ -3992,7 +3992,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_29
@@ -4045,7 +4045,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_2d
@@ -4087,7 +4087,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_31
@@ -4110,7 +4110,7 @@
         0x10101f8
         0x7f040210
         0x7f040211
-        0x7f04058b
+        0x7f04057d
     .end array-data
 
     :array_34
@@ -4156,17 +4156,17 @@
         0x7f0402dc
         0x7f0402dd
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_38
     .array-data 4
         0x7f0400ee
-        0x7f040480
-        0x7f04049c
+        0x7f040472
+        0x7f04048e
     .end array-data
 
     :array_39
@@ -4177,9 +4177,9 @@
         0x7f0401ca
         0x7f0401cb
         0x7f04043c
-        0x7f0405ab
-        0x7f0405ac
-        0x7f0405ad
+        0x7f04059d
+        0x7f04059e
+        0x7f04059f
     .end array-data
 
     :array_3a
@@ -4203,29 +4203,29 @@
         0x7f0400f0
         0x7f0400f2
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404b2
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404a4
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_3c
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_3d
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_3e
     .array-data 4
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_3f
@@ -4274,8 +4274,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_43
@@ -4288,7 +4288,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_44
@@ -4363,12 +4363,12 @@
         0x7f04032d
         0x7f0403d3
         0x7f0403eb
-        0x7f04047d
-        0x7f040489
-        0x7f04049b
-        0x7f0404c9
-        0x7f040553
-        0x7f0405a0
+        0x7f04046f
+        0x7f04047b
+        0x7f04048d
+        0x7f0404bb
+        0x7f040545
+        0x7f040592
     .end array-data
 
     :array_48
@@ -4417,9 +4417,9 @@
         0x7f0403ff
         0x7f040400
         0x7f040401
-        0x7f04047b
-        0x7f0404d4
-        0x7f0404d5
+        0x7f04046d
+        0x7f0404c6
+        0x7f0404c7
     .end array-data
 
     :array_4d
@@ -4434,7 +4434,7 @@
         0x7f040302
         0x7f040307
         0x7f040384
-        0x7f04056b
+        0x7f04055d
     .end array-data
 
     :array_4e
@@ -4455,24 +4455,24 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_50
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_51
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_52
@@ -4489,11 +4489,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_53
@@ -4502,9 +4502,9 @@
         0x1010136
         0x7f04002a
         0x7f0403c6
-        0x7f04047a
-        0x7f040491
-        0x7f040588
+        0x7f04046c
+        0x7f040483
+        0x7f04057a
     .end array-data
 
     :array_54
@@ -4523,17 +4523,17 @@
 
     :array_55
     .array-data 4
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_56
     .array-data 4
         0x7f04009e
         0x7f040157
-        0x7f040467
+        0x7f040459
     .end array-data
 
     :array_57
@@ -4568,7 +4568,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_58
@@ -4581,23 +4581,23 @@
         0x7f04025f
         0x7f040327
         0x7f040328
-        0x7f040544
-        0x7f040545
-        0x7f040546
-        0x7f04054a
-        0x7f04054b
-        0x7f04054c
-        0x7f04056b
-        0x7f04056c
-        0x7f04056d
-        0x7f04056e
+        0x7f040536
+        0x7f040537
+        0x7f040538
+        0x7f04053c
+        0x7f04053d
+        0x7f04053e
+        0x7f04055d
+        0x7f04055e
+        0x7f04055f
+        0x7f040560
     .end array-data
 
     :array_59
     .array-data 4
-        0x7f04049e
-        0x7f04049f
-        0x7f0404a0
+        0x7f040490
+        0x7f040491
+        0x7f040492
     .end array-data
 
     :array_5a
@@ -4636,17 +4636,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_5e
@@ -4657,10 +4657,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_5f
@@ -4671,10 +4671,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_60
@@ -4686,6 +4686,20 @@
 
     :array_61
     .array-data 4
+        0x7f0404cc
+        0x7f0404cd
+        0x7f0404ce
+        0x7f0404cf
+        0x7f0404d0
+        0x7f0404d1
+        0x7f0404d2
+        0x7f0404d3
+        0x7f0404d4
+        0x7f0404d5
+        0x7f0404d6
+        0x7f0404d7
+        0x7f0404d8
+        0x7f0404d9
         0x7f0404da
         0x7f0404db
         0x7f0404dc
@@ -4694,23 +4708,9 @@
         0x7f0404df
         0x7f0404e0
         0x7f0404e1
-        0x7f0404e2
         0x7f0404e3
         0x7f0404e4
         0x7f0404e5
-        0x7f0404e6
-        0x7f0404e7
-        0x7f0404e8
-        0x7f0404e9
-        0x7f0404ea
-        0x7f0404eb
-        0x7f0404ec
-        0x7f0404ed
-        0x7f0404ee
-        0x7f0404ef
-        0x7f0404f1
-        0x7f0404f2
-        0x7f0404f3
     .end array-data
 
     :array_62
@@ -4729,8 +4729,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_63
@@ -4787,16 +4787,16 @@
         0x7f040402
         0x7f040403
         0x7f040404
-        0x7f040484
-        0x7f040487
-        0x7f0404aa
-        0x7f0404ab
-        0x7f0404ac
-        0x7f0404ad
-        0x7f0404ae
-        0x7f0404c5
-        0x7f0404c6
-        0x7f0404c7
+        0x7f040476
+        0x7f040479
+        0x7f04049c
+        0x7f04049d
+        0x7f04049e
+        0x7f04049f
+        0x7f0404a0
+        0x7f0404b7
+        0x7f0404b8
+        0x7f0404b9
     .end array-data
 
     :array_64
@@ -4826,18 +4826,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_66
@@ -4857,7 +4857,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_68
diff --git a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
index 76ce1e9e9d..9baa850d6f 100644
--- a/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/RequiredHeadersInterceptor.smali
@@ -20,111 +20,182 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "headersProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RequiredHeadersInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
     return-void
-
-    :cond_0
-    const-string p1, "headersProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 6
+    .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "chain"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/restapi/RequiredHeadersInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
+
+    invoke-interface {v0}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getAuthToken()Ljava/lang/String;
+
+    move-result-object v0
 
     iget-object v1, p0, Lcom/discord/restapi/RequiredHeadersInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
-    invoke-interface {v1}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getAuthToken()Ljava/lang/String;
+    invoke-interface {v1}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getFingerprint()Ljava/lang/String;
 
     move-result-object v1
 
     iget-object v2, p0, Lcom/discord/restapi/RequiredHeadersInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
-    invoke-interface {v2}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getFingerprint()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getLocale()Ljava/lang/String;
 
     move-result-object v2
 
     iget-object v3, p0, Lcom/discord/restapi/RequiredHeadersInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
-    invoke-interface {v3}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getLocale()Ljava/lang/String;
+    invoke-interface {v3}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getUserAgent()Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/discord/restapi/RequiredHeadersInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
-
-    invoke-interface {v4}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getUserAgent()Ljava/lang/String;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
 
     move-result-object v4
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
+    if-eqz v4, :cond_5
+
+    const-string v5, "request"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v5}, Ljava/util/LinkedHashMap;-><init>()V
+
+    iget-object v7, v4, Lo0/a0;->b:Lo0/w;
+
+    iget-object v8, v4, Lo0/a0;->c:Ljava/lang/String;
+
+    iget-object v10, v4, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    iget-object v5, v4, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-interface {v5}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    new-instance v5, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v5}, Ljava/util/LinkedHashMap;-><init>()V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v5, v4, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-static {v5}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v5
 
-    if-eqz v5, :cond_3
+    :goto_0
+    iget-object v4, v4, Lo0/a0;->d:Lokhttp3/Headers;
 
-    new-instance v0, Ln0/a0$a;
+    invoke-virtual {v4}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
 
-    invoke-direct {v0, v5}, Ln0/a0$a;-><init>(Ln0/a0;)V
+    move-result-object v4
 
-    const-string v5, "User-Agent"
+    const-string v6, "User-Agent"
 
-    invoke-virtual {v0, v5, v4}, Ln0/a0$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
+    const-string v9, "name"
 
-    if-eqz v1, :cond_0
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "Authorization"
+    const-string/jumbo v11, "value"
 
-    invoke-virtual {v0, v4, v1}, Ln0/a0$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
+    invoke-static {v3, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_0
-    if-eqz v2, :cond_1
+    invoke-virtual {v4, v6, v3}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
-    const-string v1, "X-Fingerprint"
+    if-eqz v0, :cond_1
 
-    invoke-virtual {v0, v1, v2}, Ln0/a0$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
+    const-string v3, "Authorization"
+
+    invoke-static {v3, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4, v3, v0}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
     :cond_1
-    if-eqz v3, :cond_2
+    if-eqz v1, :cond_2
 
-    const-string v1, "Accept-Language"
+    const-string v0, "X-Fingerprint"
 
-    invoke-virtual {v0, v1, v3}, Ln0/a0$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
+    invoke-static {v0, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4, v0, v1}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
     :cond_2
-    invoke-virtual {v0}, Ln0/a0$a;->b()Ln0/a0;
+    if-eqz v2, :cond_3
 
-    move-result-object v0
+    const-string v0, "Accept-Language"
 
-    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
+    invoke-static {v0, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4, v0, v2}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :cond_3
+    if-eqz v7, :cond_4
+
+    invoke-virtual {v4}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v9
+
+    invoke-static {v5}, Lo0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v11
+
+    new-instance v0, Lo0/a0;
+
+    move-object v6, v0
+
+    invoke-direct/range {v6 .. v11}, Lo0/a0;-><init>(Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+
+    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
 
     move-result-object p1
 
     return-object p1
 
-    :cond_3
-    throw v0
-
     :cond_4
-    const-string p1, "chain"
+    new-instance p1, Ljava/lang/IllegalStateException;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string/jumbo v0, "url == null"
 
-    throw v0
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    const/4 p1, 0x0
+
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion$clientCallback$1.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion$clientCallback$1.smali
index 7ebed30608..279d11bf02 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion$clientCallback$1.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion$clientCallback$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/restapi/RestAPIBuilder$Companion$clientCallback$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RestAPIBuilder.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
-        "Ln0/x;",
+        "Lo0/x;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,37 +62,25 @@
 
     check-cast p1, Ljava/lang/String;
 
-    check-cast p2, Ln0/x;
+    check-cast p2, Lo0/x;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/restapi/RestAPIBuilder$Companion$clientCallback$1;->invoke(Ljava/lang/String;Ln0/x;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/restapi/RestAPIBuilder$Companion$clientCallback$1;->invoke(Ljava/lang/String;Lo0/x;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/lang/String;Ln0/x;)V
+.method public final invoke(Ljava/lang/String;Lo0/x;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali
index e6d88b096b..51a85fd961 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder$Companion.smali
@@ -31,7 +31,7 @@
     return-void
 .end method
 
-.method public static synthetic clientCallback$annotations()V
+.method public static synthetic getClientCallback$annotations()V
     .locals 0
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
@@ -48,7 +48,7 @@
             "()",
             "Lkotlin/jvm/functions/Function2<",
             "Ljava/lang/String;",
-            "Ln0/x;",
+            "Lo0/x;",
             "Lkotlin/Unit;",
             ">;"
         }
@@ -62,7 +62,7 @@
 .end method
 
 .method public final setClientCallback(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -70,24 +70,17 @@
             "-",
             "Ljava/lang/String;",
             "-",
-            "Ln0/x;",
+            "Lo0/x;",
             "Lkotlin/Unit;",
             ">;)V"
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/restapi/RestAPIBuilder;->access$setClientCallback$cp(Lkotlin/jvm/functions/Function2;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
index 213fc6c9be..f0fbb00ce4 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
@@ -29,7 +29,7 @@
             "-",
             "Ljava/lang/String;",
             "-",
-            "Ln0/x;",
+            "Lo0/x;",
             "Lkotlin/Unit;",
             ">;"
         }
@@ -40,7 +40,7 @@
 # instance fields
 .field public final baseApiUrl:Ljava/lang/String;
 
-.field public final cookieJar:Ln0/p;
+.field public final cookieJar:Lo0/p;
 
 
 # direct methods
@@ -62,36 +62,24 @@
     return-void
 .end method
 
-.method public constructor <init>(Ljava/lang/String;Ln0/p;)V
+.method public constructor <init>(Ljava/lang/String;Lo0/p;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "baseApiUrl"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "cookieJar"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIBuilder;->baseApiUrl:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/discord/restapi/RestAPIBuilder;->cookieJar:Ln0/p;
+    iput-object p2, p0, Lcom/discord/restapi/RestAPIBuilder;->cookieJar:Lo0/p;
 
     return-void
-
-    :cond_0
-    const-string p1, "cookieJar"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "baseApiUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getClientCallback$cp()Lkotlin/jvm/functions/Function2;
@@ -208,14 +196,14 @@
     return-object v0
 .end method
 
-.method private final buildApi(Ln0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;)Ljava/lang/Object;
+.method private final buildApi(Lo0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;)Ljava/lang/Object;
     .locals 26
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
             "Ljava/lang/Object;",
             ">(",
-            "Ln0/x;",
+            "Lo0/x;",
             "Ljava/lang/Class<",
             "TT;>;",
             "Ljava/lang/String;",
@@ -389,7 +377,7 @@
 
     if-eqz p5, :cond_3
 
-    const-string v2, "v8/"
+    const-string/jumbo v2, "v8/"
 
     move-object/from16 v6, p3
 
@@ -405,7 +393,7 @@
 
     move-result-object v2
 
-    sget-object v6, Lq0/l;->a:Lq0/l;
+    sget-object v6, Lr0/l;->a:Lr0/l;
 
     new-instance v8, Ljava/util/ArrayList;
 
@@ -415,33 +403,33 @@
 
     invoke-direct {v9}, Ljava/util/ArrayList;-><init>()V
 
-    new-instance v10, Lq0/a;
+    new-instance v10, Lr0/a;
 
-    invoke-direct {v10}, Lq0/a;-><init>()V
+    invoke-direct {v10}, Lr0/a;-><init>()V
 
     invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     const-string v10, "client == null"
 
-    invoke-static {v1, v10}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v1, v10}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     const-string v10, "factory == null"
 
-    invoke-static {v1, v10}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v1, v10}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    new-instance v11, Lq0/s/a/i;
+    new-instance v11, Lr0/s/a/i;
 
-    invoke-direct {v11, v5, v4}, Lq0/s/a/i;-><init>(Lrx/Scheduler;Z)V
+    invoke-direct {v11, v5, v4}, Lr0/s/a/i;-><init>(Lrx/Scheduler;Z)V
 
-    invoke-static {v11, v10}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v11, v10}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     invoke-virtual {v9, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    new-instance v4, Lq0/t/b/k;
+    new-instance v4, Lr0/t/b/k;
 
-    invoke-direct {v4}, Lq0/t/b/k;-><init>()V
+    invoke-direct {v4}, Lr0/t/b/k;-><init>()V
 
-    invoke-static {v4, v10}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v4, v10}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     invoke-virtual {v8, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -449,34 +437,34 @@
 
     move-object/from16 v5, p6
 
-    invoke-static {v5, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
     if-eqz v4, :cond_4
 
-    new-instance v4, Lq0/t/a/a;
+    new-instance v4, Lr0/t/a/a;
 
-    invoke-direct {v4, v3}, Lq0/t/a/a;-><init>(Lcom/google/gson/Gson;)V
+    invoke-direct {v4, v3}, Lr0/t/a/a;-><init>(Lcom/google/gson/Gson;)V
 
-    invoke-static {v4, v10}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v4, v10}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     invoke-virtual {v8, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_4
     const-string v3, "baseUrl == null"
 
-    invoke-static {v2, v3}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2, v3}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-static {v2}, Ln0/w;->h(Ljava/lang/String;)Ln0/w;
+    invoke-static {v2}, Lo0/w;->h(Ljava/lang/String;)Lo0/w;
 
     move-result-object v4
 
     if-eqz v4, :cond_a
 
-    invoke-static {v4, v3}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v4, v3}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v2, v4, Ln0/w;->g:Ljava/util/List;
+    iget-object v2, v4, Lo0/w;->g:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -494,7 +482,7 @@
 
     if-eqz v0, :cond_9
 
-    invoke-virtual {v6}, Lq0/l;->b()Ljava/util/concurrent/Executor;
+    invoke-virtual {v6}, Lr0/l;->b()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
@@ -502,7 +490,7 @@
 
     invoke-direct {v10, v9}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    invoke-virtual {v6, v5}, Lq0/l;->a(Ljava/util/concurrent/Executor;)Lq0/c$a;
+    invoke-virtual {v6, v5}, Lr0/l;->a(Ljava/util/concurrent/Executor;)Lr0/c$a;
 
     move-result-object v0
 
@@ -512,7 +500,7 @@
 
     invoke-direct {v3, v8}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    new-instance v8, Lq0/p;
+    new-instance v8, Lr0/p;
 
     const/4 v6, 0x0
 
@@ -528,7 +516,7 @@
 
     move-object v4, v10
 
-    invoke-direct/range {v0 .. v6}, Lq0/p;-><init>(Ln0/f$a;Ln0/w;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;Z)V
+    invoke-direct/range {v0 .. v6}, Lr0/p;-><init>(Lo0/f$a;Lo0/w;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;Z)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Class;->isInterface()Z
 
@@ -544,11 +532,11 @@
 
     if-gtz v0, :cond_7
 
-    iget-boolean v0, v8, Lq0/p;->f:Z
+    iget-boolean v0, v8, Lr0/p;->f:Z
 
     if-eqz v0, :cond_6
 
-    sget-object v0, Lq0/l;->a:Lq0/l;
+    sget-object v0, Lr0/l;->a:Lr0/l;
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Class;->getDeclaredMethods()[Ljava/lang/reflect/Method;
 
@@ -563,13 +551,13 @@
 
     aget-object v4, v1, v3
 
-    invoke-virtual {v0, v4}, Lq0/l;->d(Ljava/lang/reflect/Method;)Z
+    invoke-virtual {v0, v4}, Lr0/l;->d(Ljava/lang/reflect/Method;)Z
 
     move-result v5
 
     if-nez v5, :cond_5
 
-    invoke-virtual {v8, v4}, Lq0/p;->b(Ljava/lang/reflect/Method;)Lq0/q;
+    invoke-virtual {v8, v4}, Lr0/p;->b(Ljava/lang/reflect/Method;)Lr0/q;
 
     :cond_5
     add-int/lit8 v3, v3, 0x1
@@ -585,9 +573,9 @@
 
     aput-object v7, v1, v9
 
-    new-instance v2, Lq0/o;
+    new-instance v2, Lr0/o;
 
-    invoke-direct {v2, v8, v7}, Lq0/o;-><init>(Lq0/p;Ljava/lang/Class;)V
+    invoke-direct {v2, v8, v7}, Lr0/o;-><init>(Lr0/p;Ljava/lang/Class;)V
 
     invoke-static {v0, v1, v2}, Ljava/lang/reflect/Proxy;->newProxyInstance(Ljava/lang/ClassLoader;[Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;
 
@@ -648,7 +636,7 @@
     throw v0
 .end method
 
-.method public static synthetic buildApi$default(Lcom/discord/restapi/RestAPIBuilder;Ln0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
+.method public static synthetic buildApi$default(Lcom/discord/restapi/RestAPIBuilder;Lo0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
     .locals 7
 
     and-int/lit8 p7, p7, 0x8
@@ -677,15 +665,15 @@
 
     move-object v6, p6
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/restapi/RestAPIBuilder;->buildApi(Ln0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;)Ljava/lang/Object;
+    invoke-direct/range {v0 .. v6}, Lcom/discord/restapi/RestAPIBuilder;->buildApi(Lo0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;)Ljava/lang/Object;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method private final buildOkHttpClient(Ljava/lang/Long;Ljava/util/List;)Ln0/x;
-    .locals 6
+.method private final buildOkHttpClient(Ljava/lang/Long;Ljava/util/List;)Lo0/x;
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -694,17 +682,15 @@
             "+",
             "Lokhttp3/Interceptor;",
             ">;)",
-            "Ln0/x;"
+            "Lo0/x;"
         }
     .end annotation
 
-    new-instance v0, Ln0/x$a;
+    new-instance v0, Lo0/x$a;
 
-    invoke-direct {v0}, Ln0/x$a;-><init>()V
+    invoke-direct {v0}, Lo0/x$a;-><init>()V
 
-    const/4 v1, 0x0
-
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
     invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -713,109 +699,86 @@
     :goto_0
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_0
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lokhttp3/Interceptor;
+    check-cast v1, Lokhttp3/Interceptor;
 
-    if-eqz v2, :cond_0
+    const-string v2, "interceptor"
 
-    iget-object v3, v0, Ln0/x$a;->c:Ljava/util/List;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v3, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    iget-object v2, v0, Lo0/x$a;->c:Ljava/util/List;
+
+    invoke-interface {v2, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
-    const-string p1, "interceptor"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v1
 
     sget-object p2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-virtual {v0, v2, v3, p2}, Ln0/x$a;->a(JLjava/util/concurrent/TimeUnit;)Ln0/x$a;
+    invoke-virtual {v0, v1, v2, p2}, Lo0/x$a;->a(JLjava/util/concurrent/TimeUnit;)Lo0/x$a;
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v1
 
     sget-object p2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    const-string v4, "unit"
+    const-string/jumbo v3, "unit"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v5, "timeout"
+    const-string v4, "timeout"
 
-    invoke-static {v5, v2, v3, p2}, Ln0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
+    invoke-static {v4, v1, v2, p2}, Lo0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
 
     move-result p2
 
-    iput p2, v0, Ln0/x$a;->A:I
+    iput p2, v0, Lo0/x$a;->A:I
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide p1
 
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    if-eqz v2, :cond_2
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v5, p1, p2, v2}, Ln0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
+    invoke-static {v4, p1, p2, v1}, Lo0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
 
     move-result p1
 
-    iput p1, v0, Ln0/x$a;->y:I
+    iput p1, v0, Lo0/x$a;->y:I
 
-    goto :goto_1
+    :cond_1
+    iget-object p1, p0, Lcom/discord/restapi/RestAPIBuilder;->cookieJar:Lo0/p;
 
-    :cond_2
-    invoke-static {v4}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string p2, "cookieJar"
 
-    throw v1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_3
-    invoke-static {v4}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    iput-object p1, v0, Lo0/x$a;->j:Lo0/p;
 
-    throw v1
+    new-instance p1, Lo0/x;
 
-    :cond_4
-    :goto_1
-    iget-object p1, p0, Lcom/discord/restapi/RestAPIBuilder;->cookieJar:Ln0/p;
-
-    if-eqz p1, :cond_5
-
-    iput-object p1, v0, Ln0/x$a;->j:Ln0/p;
-
-    new-instance p1, Ln0/x;
-
-    invoke-direct {p1, v0}, Ln0/x;-><init>(Ln0/x$a;)V
+    invoke-direct {p1, v0}, Lo0/x;-><init>(Lo0/x$a;)V
 
     return-object p1
-
-    :cond_5
-    const-string p1, "cookieJar"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
-.method public static synthetic buildOkHttpClient$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Long;Ljava/util/List;ILjava/lang/Object;)Ln0/x;
+.method public static synthetic buildOkHttpClient$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Long;Ljava/util/List;ILjava/lang/Object;)Lo0/x;
     .locals 1
 
     and-int/lit8 p4, p3, 0x1
@@ -834,7 +797,7 @@
     move-object p2, v0
 
     :cond_1
-    invoke-direct {p0, p1, p2}, Lcom/discord/restapi/RestAPIBuilder;->buildOkHttpClient(Ljava/lang/Long;Ljava/util/List;)Ln0/x;
+    invoke-direct {p0, p1, p2}, Lcom/discord/restapi/RestAPIBuilder;->buildOkHttpClient(Ljava/lang/Long;Ljava/util/List;)Lo0/x;
 
     move-result-object p0
 
@@ -863,17 +826,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "apiDefinition"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_1
+    const-string v0, "contentType"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p3, p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p3
 
-    invoke-direct {p0, p3, p5}, Lcom/discord/restapi/RestAPIBuilder;->buildOkHttpClient(Ljava/lang/Long;Ljava/util/List;)Ln0/x;
+    invoke-direct {p0, p3, p5}, Lcom/discord/restapi/RestAPIBuilder;->buildOkHttpClient(Ljava/lang/Long;Ljava/util/List;)Lo0/x;
 
     move-result-object v1
 
@@ -896,23 +861,9 @@
 
     move-object v6, p8
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/restapi/RestAPIBuilder;->buildApi(Ln0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;)Ljava/lang/Object;
+    invoke-direct/range {v0 .. v6}, Lcom/discord/restapi/RestAPIBuilder;->buildApi(Lo0/x;Ljava/lang/Class;Ljava/lang/String;ZZLjava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "contentType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "apiDefinition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali
index 9ef052f751..119db71cfa 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface$Dynamic.smali
@@ -17,7 +17,7 @@
 # virtual methods
 .method public abstract get(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/v;
+        .annotation runtime Lr0/u/v;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -31,6 +31,6 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
     .end annotation
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface$Files.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface$Files.smali
index 351a85fd78..fa53355f3f 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface$Files.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface$Files.smali
@@ -17,7 +17,7 @@
 # virtual methods
 .method public abstract getFile(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/v;
+        .annotation runtime Lr0/u/v;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -31,6 +31,6 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
     .end annotation
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface$RtcLatency.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface$RtcLatency.smali
new file mode 100644
index 0000000000..ac69aac0c6
--- /dev/null
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface$RtcLatency.smali
@@ -0,0 +1,37 @@
+.class public interface abstract Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+.super Ljava/lang/Object;
+.source "RestAPIInterface.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/restapi/RestAPIInterface;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "RtcLatency"
+.end annotation
+
+
+# virtual methods
+.method public abstract get(Ljava/lang/String;)Lrx/Observable;
+    .param p1    # Ljava/lang/String;
+        .annotation runtime Lr0/u/v;
+        .end annotation
+    .end param
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+            ">;>;"
+        }
+    .end annotation
+
+    .annotation runtime Lr0/u/e;
+    .end annotation
+.end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface$Text.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface$Text.smali
deleted file mode 100644
index 1a9e731fd3..0000000000
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface$Text.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public interface abstract Lcom/discord/restapi/RestAPIInterface$Text;
-.super Ljava/lang/Object;
-.source "RestAPIInterface.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/restapi/RestAPIInterface;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "Text"
-.end annotation
-
-
-# virtual methods
-.method public abstract get(Ljava/lang/String;)Lrx/Observable;
-    .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/v;
-        .end annotation
-    .end param
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")",
-            "Lrx/Observable<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Lq0/u/e;
-    .end annotation
-.end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
index f283a29181..f23e22facc 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
@@ -7,7 +7,7 @@
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
         Lcom/discord/restapi/RestAPIInterface$Dynamic;,
-        Lcom/discord/restapi/RestAPIInterface$Text;,
+        Lcom/discord/restapi/RestAPIInterface$RtcLatency;,
         Lcom/discord/restapi/RestAPIInterface$Files;,
         Lcom/discord/restapi/RestAPIInterface$DefaultImpls;,
         Lcom/discord/restapi/RestAPIInterface$Companion;
@@ -34,7 +34,7 @@
 # virtual methods
 .method public abstract acceptGift(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
@@ -49,14 +49,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "entitlements/gift-codes/{code}/redeem"
     .end annotation
 .end method
 
 .method public abstract ackGuild(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -69,19 +69,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/ack"
     .end annotation
 .end method
 
 .method public abstract addChannelPin(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
@@ -94,19 +94,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/pins/{messageId}"
     .end annotation
 .end method
 
 .method public abstract addChannelRecipient(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "recipientId"
         .end annotation
     .end param
@@ -119,24 +119,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/recipients/{recipientId}"
     .end annotation
 .end method
 
 .method public abstract addReaction(JJLjava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "reaction"
         .end annotation
@@ -152,23 +152,23 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/messages/{messageId}/reactions/{reaction}/@me"
     .end annotation
 .end method
 
 .method public abstract addRelationship(JLcom/discord/restapi/RestAPIParams$UserRelationship;Ljava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UserRelationship;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -184,14 +184,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "users/@me/relationships/{userId}"
     .end annotation
 .end method
 
 .method public abstract authorizeConnection(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
@@ -206,24 +206,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "connections/{connection}/authorize"
     .end annotation
 .end method
 
 .method public abstract banGuildMember(JJLcom/discord/restapi/RestAPIParams$BanGuildMember;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$BanGuildMember;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -237,19 +237,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "guilds/{guildId}/bans/{userId}"
     .end annotation
 .end method
 
 .method public abstract batchUpdateRole(JLjava/util/List;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Ljava/util/List;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -264,14 +264,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/roles"
     .end annotation
 .end method
 
 .method public abstract call(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
@@ -284,14 +284,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/call"
     .end annotation
 .end method
 
 .method public abstract cancelSubscriptionSlot(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionSlotId"
         .end annotation
     .end param
@@ -304,24 +304,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/guilds/premium/subscription-slots/{subscriptionSlotId}/cancel"
     .end annotation
 .end method
 
 .method public abstract changeGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMember;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$GuildMember;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -335,19 +335,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/members/{userId}"
     .end annotation
 .end method
 
 .method public abstract changeGuildNickname(JLcom/discord/restapi/RestAPIParams$Nick;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Nick;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -361,19 +361,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/members/@me/nick"
     .end annotation
 .end method
 
 .method public abstract convertDMToGroup(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "recipientId"
         .end annotation
     .end param
@@ -386,19 +386,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/recipients/{recipientId}"
     .end annotation
 .end method
 
 .method public abstract createChannelFollower(JLcom/discord/restapi/RestAPIParams$ChannelFollowerPost;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$ChannelFollowerPost;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -412,14 +412,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/followers"
     .end annotation
 .end method
 
 .method public abstract createGuild(Lcom/discord/restapi/RestAPIParams$CreateGuild;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$CreateGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -433,19 +433,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds"
     .end annotation
 .end method
 
 .method public abstract createGuildChannel(JLcom/discord/restapi/RestAPIParams$CreateGuildChannel;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$CreateGuildChannel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -459,19 +459,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/channels"
     .end annotation
 .end method
 
 .method public abstract createGuildFromTemplate(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildTemplateCode"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -486,14 +486,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/templates/{guildTemplateCode}"
     .end annotation
 .end method
 
 .method public abstract createRole(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -506,14 +506,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/roles"
     .end annotation
 .end method
 
 .method public abstract deleteAccount(Lcom/discord/restapi/RestAPIParams$DisableAccount;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$DisableAccount;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -527,14 +527,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/delete"
     .end annotation
 .end method
 
 .method public abstract deleteChannel(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
@@ -547,19 +547,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}"
     .end annotation
 .end method
 
 .method public abstract deleteChannelPin(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
@@ -572,19 +572,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/pins/{messageId}"
     .end annotation
 .end method
 
 .method public abstract deleteConnection(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connectionId"
         .end annotation
     .end param
@@ -600,19 +600,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/connections/{connection}/{connectionId}"
     .end annotation
 .end method
 
 .method public abstract deleteGuild(JLcom/discord/restapi/RestAPIParams$DeleteGuild;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$DeleteGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -626,19 +626,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/delete"
     .end annotation
 .end method
 
 .method public abstract deleteGuildEmoji(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "emojiId"
         .end annotation
     .end param
@@ -651,19 +651,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/emojis/{emojiId}"
     .end annotation
 .end method
 
 .method public abstract deleteGuildIntegration(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "integrationId"
         .end annotation
     .end param
@@ -676,19 +676,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/integrations/{integrationId}"
     .end annotation
 .end method
 
 .method public abstract deleteMessage(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channel_id"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "message_id"
         .end annotation
     .end param
@@ -701,14 +701,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channel_id}/messages/{message_id}"
     .end annotation
 .end method
 
 .method public abstract deleteOAuthToken(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "oauthId"
         .end annotation
     .end param
@@ -721,14 +721,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "oauth2/tokens/{oauthId}"
     .end annotation
 .end method
 
 .method public abstract deletePaymentSource(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "paymentSourceId"
         .end annotation
     .end param
@@ -743,19 +743,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/billing/payment-sources/{paymentSourceId}"
     .end annotation
 .end method
 
 .method public abstract deletePermissionOverwrites(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "targetId"
         .end annotation
     .end param
@@ -768,19 +768,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/permissions/{targetId}"
     .end annotation
 .end method
 
 .method public abstract deleteRole(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "roleId"
         .end annotation
     .end param
@@ -793,14 +793,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/roles/{roleId}"
     .end annotation
 .end method
 
 .method public abstract deleteSubscription(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionId"
         .end annotation
     .end param
@@ -815,14 +815,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/billing/subscriptions/{subscriptionId}"
     .end annotation
 .end method
 
 .method public abstract disableAccount(Lcom/discord/restapi/RestAPIParams$DisableAccount;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$DisableAccount;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -836,14 +836,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/disable"
     .end annotation
 .end method
 
 .method public abstract disableMFA(Lcom/discord/restapi/RestAPIParams$AuthCode;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$AuthCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -857,14 +857,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/totp/disable"
     .end annotation
 .end method
 
 .method public abstract disableMfaSMS(Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -878,24 +878,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/sms/disable"
     .end annotation
 .end method
 
 .method public abstract disconnectGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMemberDisconnect;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$GuildMemberDisconnect;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -909,19 +909,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/members/{userId}"
     .end annotation
 .end method
 
 .method public abstract editChannel(JLcom/discord/restapi/RestAPIParams$Channel;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Channel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -935,19 +935,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "channels/{channelId}"
     .end annotation
 .end method
 
 .method public abstract editGroupDM(JLcom/discord/restapi/RestAPIParams$GroupDM;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$GroupDM;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -961,24 +961,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "channels/{channelId}"
     .end annotation
 .end method
 
 .method public abstract editMessage(JJLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channel_id"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "message_id"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$Message;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -992,19 +992,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "channels/{channel_id}/messages/{message_id}"
     .end annotation
 .end method
 
 .method public abstract enableIntegration(JLcom/discord/restapi/RestAPIParams$EnableIntegration;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$EnableIntegration;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1018,14 +1018,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/integrations"
     .end annotation
 .end method
 
 .method public abstract enableMFA(Lcom/discord/restapi/RestAPIParams$EnableMFA;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$EnableMFA;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1039,14 +1039,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/totp/enable"
     .end annotation
 .end method
 
 .method public abstract enableMfaSMS(Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1060,14 +1060,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/sms/enable"
     .end annotation
 .end method
 
 .method public abstract forgotPassword(Lcom/discord/restapi/RestAPIParams$ForgotPassword;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$ForgotPassword;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1081,14 +1081,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/forgot"
     .end annotation
 .end method
 
 .method public abstract generateGiftCode(Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1102,24 +1102,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/entitlements/gift-codes"
     .end annotation
 .end method
 
 .method public abstract getActivityMetadata(JLjava/lang/String;J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "sessionId"
         .end annotation
     .end param
     .param p4    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "applicationId"
         .end annotation
     .end param
@@ -1134,14 +1134,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/sessions/{sessionId}/activities/{applicationId}/metadata"
     .end annotation
 .end method
 
 .method public abstract getApplications(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "application_ids"
         .end annotation
     .end param
@@ -1155,34 +1155,34 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "applications/public"
     .end annotation
 .end method
 
 .method public abstract getAuditLogs(JILjava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
     .param p4    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "before"
         .end annotation
     .end param
     .param p5    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "user_id"
         .end annotation
     .end param
     .param p6    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "action_type"
         .end annotation
     .end param
@@ -1199,14 +1199,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/audit-logs"
     .end annotation
 .end method
 
 .method public abstract getBackupCodes(Lcom/discord/restapi/RestAPIParams$BackupCodesRequest;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$BackupCodesRequest;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1220,14 +1220,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/codes"
     .end annotation
 .end method
 
 .method public abstract getBans(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1241,29 +1241,29 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/bans"
     .end annotation
 .end method
 
 .method public abstract getChannelMessages(JLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "before"
         .end annotation
     .end param
     .param p4    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "after"
         .end annotation
     .end param
     .param p5    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -1281,24 +1281,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages"
     .end annotation
 .end method
 
 .method public abstract getChannelMessagesAround(JIJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
     .param p4    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "around"
         .end annotation
     .end param
@@ -1312,14 +1312,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages"
     .end annotation
 .end method
 
 .method public abstract getChannelPins(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
@@ -1333,19 +1333,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/pins"
     .end annotation
 .end method
 
 .method public abstract getConnectionAccessToken(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "platformType"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "accountId"
         .end annotation
     .end param
@@ -1361,19 +1361,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/connections/{platformType}/{accountId}/access-token"
     .end annotation
 .end method
 
 .method public abstract getConnectionState(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "pinNumber"
         .end annotation
     .end param
@@ -1389,7 +1389,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "connections/{connection}/callback-continuation/{pinNumber}"
     .end annotation
 .end method
@@ -1405,7 +1405,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/connections"
     .end annotation
 .end method
@@ -1420,7 +1420,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "auth/consent-required"
     .end annotation
 .end method
@@ -1435,7 +1435,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/consent"
     .end annotation
 .end method
@@ -1450,34 +1450,34 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "experiments"
     .end annotation
 .end method
 
 .method public abstract getGifSearchResults(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "q"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "media_format"
         .end annotation
     .end param
     .param p5    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -1496,29 +1496,29 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/search"
     .end annotation
 .end method
 
 .method public abstract getGifSuggestedSearchTerms(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "q"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p4    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -1536,24 +1536,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/suggest"
     .end annotation
 .end method
 
 .method public abstract getGifTrendingSearchTerms(Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -1570,7 +1570,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/trending_search"
     .end annotation
 .end method
@@ -1586,14 +1586,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/entitlements/gifts"
     .end annotation
 .end method
 
 .method public abstract getGuildEmojis(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1607,14 +1607,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/emojis"
     .end annotation
 .end method
 
 .method public abstract getGuildIntegrations(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1628,14 +1628,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/integrations"
     .end annotation
 .end method
 
 .method public abstract getGuildInvites(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1649,14 +1649,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/invites"
     .end annotation
 .end method
 
 .method public abstract getGuildPreview(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1669,14 +1669,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/preview"
     .end annotation
 .end method
 
 .method public abstract getGuildTemplateCode(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildTemplateCode"
         .end annotation
     .end param
@@ -1691,7 +1691,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/templates/{guildTemplateCode}"
     .end annotation
 .end method
@@ -1707,14 +1707,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "voice/regions"
     .end annotation
 .end method
 
 .method public abstract getGuildVoiceRegions(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1728,14 +1728,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/regions"
     .end annotation
 .end method
 
 .method public abstract getGuildWelcomeScreen(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1748,7 +1748,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/welcome-screen"
     .end annotation
 .end method
@@ -1763,19 +1763,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/harvest"
     .end annotation
 .end method
 
 .method public abstract getInviteCode(Ljava/lang/String;Z)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
     .param p2    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "with_counts"
         .end annotation
     .end param
@@ -1790,14 +1790,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "invites/{code}"
     .end annotation
 .end method
 
 .method public abstract getInvoicePreview(Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1811,7 +1811,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/billing/invoices/preview"
     .end annotation
 .end method
@@ -1827,34 +1827,34 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/library"
     .end annotation
 .end method
 
 .method public abstract getMentions(IZZLjava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
     .param p1    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
     .param p2    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "roles"
         .end annotation
     .end param
     .param p3    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "everyone"
         .end annotation
     .end param
     .param p4    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "guild_id"
         .end annotation
     .end param
     .param p5    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "before"
         .end annotation
     .end param
@@ -1871,14 +1871,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/mentions"
     .end annotation
 .end method
 
 .method public abstract getMyEntitlements(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "applicationId"
         .end annotation
     .end param
@@ -1892,7 +1892,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/applications/{applicationId}/entitlements"
     .end annotation
 .end method
@@ -1908,44 +1908,44 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "oauth2/tokens"
     .end annotation
 .end method
 
 .method public abstract getOauth2Authorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "client_id"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "state"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "response_type"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "redirect_uri"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "prompt"
         .end annotation
     .end param
     .param p6    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "scope"
         .end annotation
     .end param
     .param p7    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "permissions"
         .end annotation
     .end param
@@ -1966,39 +1966,39 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "oauth2/authorize"
     .end annotation
 .end method
 
 .method public abstract getOauth2SamsungAuthorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "client_id"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "state"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "response_type"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "redirect_uri"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "prompt"
         .end annotation
     .end param
     .param p6    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "scope"
         .end annotation
     .end param
@@ -2018,7 +2018,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "oauth2/samsung/authorize"
     .end annotation
 .end method
@@ -2034,19 +2034,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/billing/payment-sources"
     .end annotation
 .end method
 
 .method public abstract getPruneCount(JI)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "days"
         .end annotation
     .end param
@@ -2059,30 +2059,30 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/prune"
     .end annotation
 .end method
 
 .method public abstract getReactionUsers(JJLjava/lang/String;Ljava/lang/Integer;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "emoji"
         .end annotation
     .end param
     .param p6    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -2099,7 +2099,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages/{messageId}/reactions/{emoji}"
     .end annotation
 .end method
@@ -2115,14 +2115,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/relationships"
     .end annotation
 .end method
 
 .method public abstract getRelationships(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -2136,14 +2136,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/relationships"
     .end annotation
 .end method
 
 .method public abstract getSpotifyTrack(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "id"
         .end annotation
     .end param
@@ -2158,19 +2158,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "tracks/{id}"
     .end annotation
 .end method
 
 .method public abstract getStreamPreview(Ljava/lang/String;J)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "streamKey"
         .end annotation
     .end param
     .param p2    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "version"
         .end annotation
     .end param
@@ -2185,7 +2185,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "streams/{streamKey}/preview"
     .end annotation
 .end method
@@ -2201,7 +2201,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/guilds/premium/subscription-slots"
     .end annotation
 .end method
@@ -2217,24 +2217,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/billing/subscriptions"
     .end annotation
 .end method
 
 .method public abstract getTrendingGifCategories(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "media_format"
         .end annotation
     .end param
@@ -2251,29 +2251,29 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/trending"
     .end annotation
 .end method
 
 .method public abstract getTrendingGifCategory(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "media_format"
         .end annotation
     .end param
     .param p4    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -2291,7 +2291,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/trending-gifs"
     .end annotation
 .end method
@@ -2306,14 +2306,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/affinities/users"
     .end annotation
 .end method
 
 .method public abstract getUserNote(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -2326,24 +2326,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/notes/{userId}"
     .end annotation
 .end method
 
 .method public abstract joinGuild(JZLjava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "lurker"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "session_id"
         .end annotation
     .end param
@@ -2358,24 +2358,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "guilds/{guildId}/members/@me"
     .end annotation
 .end method
 
 .method public abstract kickGuildMember(JJLjava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "reason"
         .end annotation
     .end param
@@ -2390,14 +2390,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/members/{userId}"
     .end annotation
 .end method
 
 .method public abstract leaveGuild(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -2410,14 +2410,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/guilds/{guildId}"
     .end annotation
 .end method
 
 .method public abstract logout(Lcom/discord/restapi/RestAPIParams$UserDevices;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserDevices;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2431,24 +2431,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/logout"
     .end annotation
 .end method
 
 .method public abstract patchGuildEmoji(JJLcom/discord/restapi/RestAPIParams$PatchGuildEmoji;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "emojiId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$PatchGuildEmoji;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2462,14 +2462,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/emojis/{emojiId}"
     .end annotation
 .end method
 
 .method public abstract patchUser(Lcom/discord/restapi/RestAPIParams$UserInfo;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserInfo;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2483,14 +2483,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me"
     .end annotation
 .end method
 
 .method public abstract postAuthFingerprint(Lcom/discord/restapi/RestAPIParams$EmptyBody;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2504,14 +2504,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/fingerprint"
     .end annotation
 .end method
 
 .method public abstract postAuthHandoff(Ljava/util/Map;)Lrx/Observable;
     .param p1    # Ljava/util/Map;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2527,14 +2527,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/handoff"
     .end annotation
 .end method
 
 .method public abstract postAuthLogin(Lcom/discord/restapi/RestAPIParams$AuthLogin;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$AuthLogin;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2548,14 +2548,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/login"
     .end annotation
 .end method
 
 .method public abstract postAuthRegister(Lcom/discord/restapi/RestAPIParams$AuthRegister;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$AuthRegister;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2569,14 +2569,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/register"
     .end annotation
 .end method
 
 .method public abstract postAuthVerifyResend(Lcom/discord/restapi/RestAPIParams$EmptyBody;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2590,19 +2590,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/verify/resend"
     .end annotation
 .end method
 
 .method public abstract postChannelInvite(JLcom/discord/restapi/RestAPIParams$Invite;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Invite;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2616,24 +2616,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/invites"
     .end annotation
 .end method
 
 .method public abstract postChannelMessagesAck(JLjava/lang/Long;Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p4    # Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2648,19 +2648,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/messages/{messageId}/ack"
     .end annotation
 .end method
 
 .method public abstract postGuildEmoji(JLcom/discord/restapi/RestAPIParams$PostGuildEmoji;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$PostGuildEmoji;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2674,23 +2674,23 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/emojis"
     .end annotation
 .end method
 
 .method public abstract postInviteCode(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$EmptyBody;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -2707,14 +2707,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "invites/{code}"
     .end annotation
 .end method
 
 .method public abstract postMFACode(Lcom/discord/restapi/RestAPIParams$MFALogin;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$MFALogin;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2728,59 +2728,59 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/mfa/totp"
     .end annotation
 .end method
 
 .method public abstract postOauth2Authorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "client_id"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "state"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "response_type"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "redirect_uri"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "prompt"
         .end annotation
     .end param
     .param p6    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "scope"
         .end annotation
     .end param
     .param p7    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "permissions"
         .end annotation
     .end param
     .param p8    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "code_challenge"
         .end annotation
     .end param
     .param p9    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "code_challenge_method"
         .end annotation
     .end param
     .param p10    # Ljava/util/Map;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2805,14 +2805,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "oauth2/authorize"
     .end annotation
 .end method
 
 .method public abstract postRemoteAuthCancel(Lcom/discord/restapi/RestAPIParams$RemoteAuthCancel;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$RemoteAuthCancel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2826,14 +2826,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/remote-auth/cancel"
     .end annotation
 .end method
 
 .method public abstract postRemoteAuthFinish(Lcom/discord/restapi/RestAPIParams$RemoteAuthFinish;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$RemoteAuthFinish;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2847,14 +2847,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/remote-auth/finish"
     .end annotation
 .end method
 
 .method public abstract postRemoteAuthInitialize(Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2868,19 +2868,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/remote-auth"
     .end annotation
 .end method
 
 .method public abstract pruneMembers(JLcom/discord/restapi/RestAPIParams$PruneGuild;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$PruneGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2894,19 +2894,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/prune"
     .end annotation
 .end method
 
 .method public abstract removeAllReactions(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
@@ -2919,19 +2919,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/messages/{messageId}/reactions"
     .end annotation
 .end method
 
 .method public abstract removeChannelRecipient(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "recipientId"
         .end annotation
     .end param
@@ -2944,30 +2944,30 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/recipients/{recipientId}"
     .end annotation
 .end method
 
 .method public abstract removeReaction(JJLjava/lang/String;J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "reaction"
         .end annotation
     .end param
     .param p6    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -2982,19 +2982,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/messages/{messageId}/reactions/{reaction}/{userId}"
     .end annotation
 .end method
 
 .method public abstract removeRelationship(JLjava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -3009,24 +3009,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/relationships/{userId}"
     .end annotation
 .end method
 
 .method public abstract removeSelfReaction(JJLjava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "reaction"
         .end annotation
@@ -3042,19 +3042,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/messages/{messageId}/reactions/{reaction}/@me"
     .end annotation
 .end method
 
 .method public abstract reorderChannels(JLjava/util/List;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Ljava/util/List;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3069,7 +3069,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/channels"
     .end annotation
 .end method
@@ -3084,24 +3084,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/harvest"
     .end annotation
 .end method
 
 .method public abstract resolveGiftCode(Ljava/lang/String;ZZ)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
     .param p2    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "with_application"
         .end annotation
     .end param
     .param p3    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "with_subscription_plan"
         .end annotation
     .end param
@@ -3116,19 +3116,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "entitlements/gift-codes/{code}"
     .end annotation
 .end method
 
 .method public abstract resolveSkuIdGift(JLjava/lang/Long;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "sku_id"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "subscription_plan_id"
         .end annotation
     .end param
@@ -3144,14 +3144,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/entitlements/gift-codes"
     .end annotation
 .end method
 
 .method public abstract revokeGiftCode(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
@@ -3166,14 +3166,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/entitlements/gift-codes/{code}"
     .end annotation
 .end method
 
 .method public abstract revokeInvite(Ljava/lang/String;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "inviteCode"
         .end annotation
     .end param
@@ -3188,23 +3188,23 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "invites/{inviteCode}"
     .end annotation
 .end method
 
 .method public abstract ring(JLcom/discord/restapi/RestAPIParams$Ring;Ljava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Ring;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -3220,14 +3220,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/call/ring"
     .end annotation
 .end method
 
 .method public abstract science(Lcom/discord/restapi/RestAPIParams$Science;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$Science;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3241,54 +3241,54 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "science"
     .end annotation
 .end method
 
 .method public abstract searchChannelMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "max_id"
         .end annotation
     .end param
     .param p4    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "author_id"
         .end annotation
     .end param
     .param p5    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "mentions"
         .end annotation
     .end param
     .param p6    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "has"
         .end annotation
     .end param
     .param p7    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "context_size"
         .end annotation
     .end param
     .param p8    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "content"
         .end annotation
     .end param
     .param p9    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "attempts"
         .end annotation
     .end param
     .param p10    # Ljava/lang/Boolean;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "include_nsfw"
         .end annotation
     .end param
@@ -3318,59 +3318,59 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages/search"
     .end annotation
 .end method
 
 .method public abstract searchGuildMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "max_id"
         .end annotation
     .end param
     .param p4    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "author_id"
         .end annotation
     .end param
     .param p5    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "mentions"
         .end annotation
     .end param
     .param p6    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "channel_id"
         .end annotation
     .end param
     .param p7    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "has"
         .end annotation
     .end param
     .param p8    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "context_size"
         .end annotation
     .end param
     .param p9    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "content"
         .end annotation
     .end param
     .param p10    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "attempts"
         .end annotation
     .end param
     .param p11    # Ljava/lang/Boolean;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "include_nsfw"
         .end annotation
     .end param
@@ -3403,19 +3403,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/messages/search"
     .end annotation
 .end method
 
 .method public abstract sendMessage(JLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Message;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3429,29 +3429,29 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/messages"
     .end annotation
 .end method
 
 .method public abstract sendMessage(JLjava/lang/String;Ljava/lang/String;[Lokhttp3/MultipartBody$Part;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/o;
+        .annotation runtime Lr0/u/o;
             value = "content"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/o;
+        .annotation runtime Lr0/u/o;
             value = "nonce"
         .end annotation
     .end param
     .param p5    # [Lokhttp3/MultipartBody$Part;
-        .annotation runtime Lq0/u/o;
+        .annotation runtime Lr0/u/o;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3468,21 +3468,21 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/j;
+    .annotation runtime Lr0/u/j;
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/messages"
     .end annotation
 .end method
 
 .method public abstract sendRelationshipRequest(Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;Ljava/lang/String;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -3498,14 +3498,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/relationships"
     .end annotation
 .end method
 
 .method public abstract setConsents(Lcom/discord/restapi/RestAPIParams$Consents;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$Consents;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3519,19 +3519,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/consent"
     .end annotation
 .end method
 
 .method public abstract setMfaLevel(JLcom/discord/restapi/RestAPIParams$GuildMFA;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$GuildMFA;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3545,19 +3545,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/mfa"
     .end annotation
 .end method
 
 .method public abstract setUserTyping(JLcom/discord/restapi/RestAPIParams$EmptyBody;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3571,23 +3571,23 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/typing"
     .end annotation
 .end method
 
 .method public abstract stopRinging(JLcom/discord/restapi/RestAPIParams$Ring;Ljava/lang/String;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Ring;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -3603,19 +3603,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/call/stop-ringing"
     .end annotation
 .end method
 
 .method public abstract submitConnectionState(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$ConnectionState;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$ConnectionState;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3630,19 +3630,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "connections/{connection}/callback"
     .end annotation
 .end method
 
 .method public abstract subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3657,19 +3657,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "guilds/{guildId}/premium/subscriptions"
     .end annotation
 .end method
 
 .method public abstract syncIntegration(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "integrationId"
         .end annotation
     .end param
@@ -3682,19 +3682,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/integrations/{integrationId}/sync"
     .end annotation
 .end method
 
 .method public abstract transferGuildOwnership(JLcom/discord/restapi/RestAPIParams$TransferGuildOwnership;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$TransferGuildOwnership;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3708,19 +3708,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}"
     .end annotation
 .end method
 
 .method public abstract unbanUser(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -3733,14 +3733,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/bans/{userId}"
     .end annotation
 .end method
 
 .method public abstract uncancelSubscriptionSlot(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionSlotId"
         .end annotation
     .end param
@@ -3753,19 +3753,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/guilds/premium/subscription-slots/{subscriptionSlotId}/uncancel"
     .end annotation
 .end method
 
 .method public abstract unsubscribeToGuild(JJ)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionId"
         .end annotation
     .end param
@@ -3778,24 +3778,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/premium/subscriptions/{subscriptionId}"
     .end annotation
 .end method
 
 .method public abstract updateConnection(Ljava/lang/String;Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$ConnectedAccount;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connectionId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3811,19 +3811,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/connections/{connection}/{connectionId}"
     .end annotation
 .end method
 
 .method public abstract updateGuild(JLcom/discord/restapi/RestAPIParams$UpdateGuild;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UpdateGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3837,24 +3837,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}"
     .end annotation
 .end method
 
 .method public abstract updateGuildIntegration(JJLcom/discord/restapi/RestAPIParams$GuildIntegration;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "integrationId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$GuildIntegration;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3868,19 +3868,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/integrations/{integrationId}"
     .end annotation
 .end method
 
 .method public abstract updatePaymentSource(Ljava/lang/String;Lcom/discord/models/domain/PatchPaymentSourceRaw;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "paymentSourceId"
         .end annotation
     .end param
     .param p2    # Lcom/discord/models/domain/PatchPaymentSourceRaw;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3895,24 +3895,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/billing/payment-sources/{paymentSourceId}"
     .end annotation
 .end method
 
 .method public abstract updatePermissionOverwrites(JJLcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "targetId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3926,14 +3926,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/permissions/{targetId}"
     .end annotation
 .end method
 
 .method public abstract updatePrivateChannelSettings(Lcom/discord/restapi/RestAPIParams$UserGuildSettings;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3947,19 +3947,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/guilds/@me/settings"
     .end annotation
 .end method
 
 .method public abstract updatePublicGuild(JLcom/discord/restapi/RestAPIParams$UpdatePublicGuild;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -3973,24 +3973,24 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}"
     .end annotation
 .end method
 
 .method public abstract updateRole(JJLcom/discord/restapi/RestAPIParams$Role;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "roleId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$Role;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4004,19 +4004,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/roles/{roleId}"
     .end annotation
 .end method
 
 .method public abstract updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionId"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4031,19 +4031,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/billing/subscriptions/{subscriptionId}"
     .end annotation
 .end method
 
 .method public abstract updateUserGuildSettings(JLcom/discord/restapi/RestAPIParams$UserGuildSettings;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4057,19 +4057,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/guilds/{guildId}/settings"
     .end annotation
 .end method
 
 .method public abstract updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4083,14 +4083,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "users/@me/notes/{userId}"
     .end annotation
 .end method
 
 .method public abstract updateUserSettings(Lcom/discord/restapi/RestAPIParams$UserSettings;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserSettings;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4104,14 +4104,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/settings"
     .end annotation
 .end method
 
 .method public abstract updateUserSettingsCustomStatus(Lcom/discord/restapi/RestAPIParams$UserSettingsCustomStatus;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserSettingsCustomStatus;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4125,19 +4125,19 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/settings"
     .end annotation
 .end method
 
 .method public abstract updateVanityUrl(JLcom/discord/restapi/RestAPIParams$VanityUrl;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$VanityUrl;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4151,39 +4151,90 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/vanity-url"
     .end annotation
 .end method
 
+.method public abstract uploadLog(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
+    .param p1    # Ljava/lang/String;
+        .annotation runtime Lr0/u/q;
+            value = "filename"
+        .end annotation
+    .end param
+    .param p2    # Ljava/lang/String;
+        .annotation runtime Lr0/u/a;
+        .end annotation
+    .end param
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Lr0/u/m;
+        value = "debug-logs/4/{filename}"
+    .end annotation
+.end method
+
+.method public abstract uploadLogs([Lokhttp3/MultipartBody$Part;)Lrx/Observable;
+    .param p1    # [Lokhttp3/MultipartBody$Part;
+        .annotation runtime Lr0/u/o;
+        .end annotation
+    .end param
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Lokhttp3/MultipartBody$Part;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Lr0/u/j;
+    .end annotation
+
+    .annotation runtime Lr0/u/m;
+        value = "debug-logs/multi/4"
+    .end annotation
+.end method
+
 .method public abstract userActivityAction(JJLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "applicationId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "sessionId"
         .end annotation
     .end param
     .param p6    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "actionType"
         .end annotation
     .end param
     .param p7    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "channel_id"
         .end annotation
     .end param
     .param p8    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "message_id"
         .end annotation
     .end param
@@ -4201,14 +4252,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/sessions/{sessionId}/activities/{applicationId}/{actionType}"
     .end annotation
 .end method
 
 .method public abstract userAddPhone(Lcom/discord/restapi/RestAPIParams$Phone;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$Phone;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4222,14 +4273,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/phone"
     .end annotation
 .end method
 
 .method public abstract userAgreements(Lcom/discord/restapi/RestAPIParams$UserAgreements;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserAgreements;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4243,14 +4294,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/agreements"
     .end annotation
 .end method
 
 .method public abstract userCaptchaVerify(Lcom/discord/restapi/RestAPIParams$CaptchaCode;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$CaptchaCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4264,14 +4315,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/captcha/verify"
     .end annotation
 .end method
 
 .method public abstract userCreateChannel(Lcom/discord/restapi/RestAPIParams$CreateChannel;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$CreateChannel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4285,14 +4336,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/channels"
     .end annotation
 .end method
 
 .method public abstract userCreateDevice(Lcom/discord/restapi/RestAPIParams$UserDevices;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserDevices;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4306,14 +4357,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/devices"
     .end annotation
 .end method
 
 .method public abstract userGet(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -4326,14 +4377,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}"
     .end annotation
 .end method
 
 .method public abstract userPhoneVerify(Lcom/discord/restapi/RestAPIParams$VerificationCode;)Lrx/Observable;
     .param p1    # Lcom/discord/restapi/RestAPIParams$VerificationCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4347,14 +4398,14 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/phone/verify"
     .end annotation
 .end method
 
 .method public abstract userProfileGet(J)Lrx/Observable;
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -4367,7 +4418,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/profile"
     .end annotation
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ActivateMfaSMS.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ActivateMfaSMS.smali
index be259bceb9..274e5d127d 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ActivateMfaSMS.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ActivateMfaSMS.smali
@@ -20,22 +20,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "password"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;->password:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$AuthCode.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$AuthCode.smali
index 6eff2a5b8f..8bb45aa456 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$AuthCode.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$AuthCode.smali
@@ -20,22 +20,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$AuthCode;->code:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$BackupCodesRequest.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$BackupCodesRequest.smali
index cdd8ca9f13..3fac4d180b 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$BackupCodesRequest.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$BackupCodesRequest.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "password"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,13 +35,4 @@
     iput-boolean p2, p0, Lcom/discord/restapi/RestAPIParams$BackupCodesRequest;->regenerate:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali
index 8038353c4a..1df31d778d 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPosition$Serializer.smali
@@ -44,7 +44,7 @@
 
     const-class p3, Lcom/discord/restapi/RestAPIParams$ChannelPosition;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali
index 3a7486b313..9df908b922 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount$Companion.smali
@@ -36,60 +36,53 @@
 .method public final create(Lcom/discord/models/domain/ModelConnectedAccount;ZZI)Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "connectedAccount"
 
-    new-instance v9, Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    const-string v0, "connectedAccount.id"
+    const-string v1, "connectedAccount.id"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    const-string v0, "connectedAccount.username"
+    const-string v1, "connectedAccount.username"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->isRevoked()Z
 
-    move-result v4
+    move-result v5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getType()Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v7
 
-    const-string v0, "connectedAccount.type"
+    const-string v1, "connectedAccount.type"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->isVerified()Z
 
-    move-result v7
+    move-result v8
 
-    move-object v0, v9
+    move-object v1, v0
 
-    move v1, p2
+    move v2, p2
 
-    move v5, p3
+    move v6, p3
 
-    move v8, p4
+    move v9, p4
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/restapi/RestAPIParams$ConnectedAccount;-><init>(ZLjava/lang/String;Ljava/lang/String;ZZLjava/lang/String;ZI)V
+    invoke-direct/range {v1 .. v9}, Lcom/discord/restapi/RestAPIParams$ConnectedAccount;-><init>(ZLjava/lang/String;Ljava/lang/String;ZZLjava/lang/String;ZI)V
 
-    return-object v9
-
-    :cond_0
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali
index e316eb6bbe..9f4f26752d 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ConnectedAccount.smali
@@ -60,13 +60,17 @@
 .method public constructor <init>(ZLjava/lang/String;Ljava/lang/String;ZZLjava/lang/String;ZI)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "name"
 
-    if-eqz p6, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "type"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -87,25 +91,4 @@
     iput p8, p0, Lcom/discord/restapi/RestAPIParams$ConnectedAccount;->visibility:I
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
index 9a726e3caf..cac4fb763a 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Consents.smali
@@ -69,11 +69,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "grant"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "revoke"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -82,20 +84,6 @@
     iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$Consents;->revoke:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "revoke"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "grant"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -105,14 +93,14 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_0
     and-int/lit8 p3, p3, 0x2
 
     if-eqz p3, :cond_1
 
-    sget-object p2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p2, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_1
     invoke-direct {p0, p1, p2}, Lcom/discord/restapi/RestAPIParams$Consents;-><init>(Ljava/util/List;Ljava/util/List;)V
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
index e5d695d8fc..6e4b4e38dc 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateChannel.smali
@@ -61,7 +61,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$CreateChannel;->recipients:Ljava/util/List;
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali
index db24317112..54b9eac7cc 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuild.smali
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -48,7 +48,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,15 +63,6 @@
     iput-object p4, p0, Lcom/discord/restapi/RestAPIParams$CreateGuild;->systemChannelId:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildFromTemplate.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildFromTemplate.smali
index a4afbbfff2..b777825844 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildFromTemplate.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$CreateGuildFromTemplate.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,13 +35,4 @@
     iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;->icon:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$DisableAccount.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$DisableAccount.smali
index ae8307dbfe..eb582f565f 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$DisableAccount.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$DisableAccount.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "password"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$DisableAccount;->code:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$EnableMFA.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$EnableMFA.smali
index f581ef02a4..de46650571 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$EnableMFA.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$EnableMFA.smali
@@ -26,13 +26,17 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "code"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "secret"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "password"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,25 +47,4 @@
     iput-object p3, p0, Lcom/discord/restapi/RestAPIParams$EnableMFA;->password:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "secret"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$InvoicePreviewBody.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$InvoicePreviewBody.smali
index 9c7b1b8027..388b1be309 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$InvoicePreviewBody.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$InvoicePreviewBody.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;ZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput-boolean p3, p0, Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;->applyEntitlements:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;Ljava/lang/String;ZZILjava/lang/Object;)Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;
@@ -108,22 +101,15 @@
 .method public final copy(Ljava/lang/String;ZZ)Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;-><init>(Ljava/lang/String;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subscriptionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;->subscriptionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Message$Activity.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Message$Activity.smali
index 91b8a99a56..f3ca803b9f 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Message$Activity.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Message$Activity.smali
@@ -26,11 +26,13 @@
 .method public constructor <init>(ILjava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "partyId"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "sessionId"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,20 +43,6 @@
     iput-object p3, p0, Lcom/discord/restapi/RestAPIParams$Message$Activity;->sessionId:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "sessionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "partyId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali
index 094d14198a..76fefada71 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Message.smali
@@ -288,7 +288,7 @@
 
     iget-object v1, p1, Lcom/discord/restapi/RestAPIParams$Message;->content:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -298,7 +298,7 @@
 
     iget-object v1, p1, Lcom/discord/restapi/RestAPIParams$Message;->nonce:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -308,7 +308,7 @@
 
     iget-object v1, p1, Lcom/discord/restapi/RestAPIParams$Message;->applicationId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -318,7 +318,7 @@
 
     iget-object v1, p1, Lcom/discord/restapi/RestAPIParams$Message;->activity:Lcom/discord/restapi/RestAPIParams$Message$Activity;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -328,7 +328,7 @@
 
     iget-object p1, p1, Lcom/discord/restapi/RestAPIParams$Message;->stickerIds:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet.smali
index 108dfcd09e..6b263fa34f 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet.smali
@@ -58,15 +58,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "application"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "connections"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guilds"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -79,34 +85,6 @@
     iput-object p4, p0, Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;->guilds:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connections"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost.smali
index b4869d4d44..5971087e0b 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost.smali
@@ -20,24 +20,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "location"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;->location:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$PatchGuildEmoji.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$PatchGuildEmoji.smali
index 71024eaab9..fd9edd6c5d 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$PatchGuildEmoji.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$PatchGuildEmoji.smali
@@ -20,22 +20,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$PatchGuildEmoji;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$PostGuildEmoji.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$PostGuildEmoji.smali
index 662dc12c6b..6b78a84af5 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$PostGuildEmoji.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$PostGuildEmoji.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "image"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,18 +39,4 @@
     iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$PostGuildEmoji;->image:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "image"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali
index 2e94212e4f..4d51dc81f4 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali
@@ -28,7 +28,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -38,22 +38,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userPremiumGuildSubscriptionSlotIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;->userPremiumGuildSubscriptionSlotIds:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "userPremiumGuildSubscriptionSlotIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthCancel.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthCancel.smali
index 6c5bdaf160..bdf18d44d9 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthCancel.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthCancel.smali
@@ -20,22 +20,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "handshakeToken"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$RemoteAuthCancel;->handshakeToken:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "handshakeToken"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthFinish.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthFinish.smali
index 26e8d1fd17..d2f61fbb0f 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthFinish.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthFinish.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(ZLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "handshakeToken"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,13 +35,4 @@
     iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$RemoteAuthFinish;->handshakeToken:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "handshakeToken"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthInitialize.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthInitialize.smali
index f06ba9ee24..d66f39e96a 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthInitialize.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$RemoteAuthInitialize.smali
@@ -20,22 +20,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "fingerprint"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;->fingerprint:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "fingerprint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali
index d2f054469d..b25ec3b01e 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Role$Companion.smali
@@ -68,70 +68,63 @@
 .method public final createWithRole(Lcom/discord/models/domain/ModelGuildRole;)Lcom/discord/restapi/RestAPIParams$Role;
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "role"
 
-    new-instance v9, Lcom/discord/restapi/RestAPIParams$Role;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$Role;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->isHoist()Z
 
-    move-result v0
+    move-result v1
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->isMentionable()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getColor()I
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->isMentionable()Z
 
-    move-result v0
+    move-result v1
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v4
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getPosition()I
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getColor()I
 
-    move-result v0
+    move-result v1
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v5
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getPermissions()J
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getPosition()I
 
-    move-result-wide v6
+    move-result v1
 
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v6
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getPermissions()J
 
     move-result-wide v7
 
-    move-object v0, v9
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/restapi/RestAPIParams$Role;-><init>(Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;J)V
+    move-result-object v7
 
-    return-object v9
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
 
-    :cond_0
-    const-string p1, "role"
+    move-result-wide v8
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v1, v0
 
-    const/4 p1, 0x0
+    invoke-direct/range {v1 .. v9}, Lcom/discord/restapi/RestAPIParams$Role;-><init>(Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;J)V
 
-    throw p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$Science$Event.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$Science$Event.smali
index 57264eb3af..4b2fbbc0af 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$Science$Event.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$Science$Event.smali
@@ -44,11 +44,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "type"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,20 +59,6 @@
     iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$Science$Event;->properties:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/restapi/RestAPIParams$Science$Event;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/restapi/RestAPIParams$Science$Event;
@@ -139,31 +127,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "type"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/restapi/RestAPIParams$Science$Event;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/restapi/RestAPIParams$Science$Event;-><init>(Ljava/lang/String;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -181,7 +157,7 @@
 
     iget-object v1, p1, Lcom/discord/restapi/RestAPIParams$Science$Event;->type:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -191,7 +167,7 @@
 
     iget-object p1, p1, Lcom/discord/restapi/RestAPIParams$Science$Event;->properties:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali
index 3f73c5b39a..4db9fd50a7 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserGuildSettings.smali
@@ -77,19 +77,9 @@
 .method public constructor <init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
     .locals 10
 
-    if-eqz p3, :cond_0
+    const-string v0, "channelOverride"
 
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -107,20 +97,23 @@
 
     const/4 v9, 0x0
 
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
     move-object v0, p0
 
     invoke-direct/range {v0 .. v9}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channelOverride"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;)V
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali
index 2de56414cf..05c8d3bfce 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserInfo$Companion.smali
@@ -36,16 +36,20 @@
 .method public final createForEmail(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Lcom/discord/restapi/RestAPIParams$UserInfo;
     .locals 14
 
-    const/4 v0, 0x0
+    const-string v0, "email"
 
-    if-eqz p1, :cond_1
+    move-object v1, p1
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "password"
+
+    move-object/from16 v2, p2
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/restapi/RestAPIParams$UserInfo;
 
-    const/4 v2, 0x0
-
     invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
     move-result-object v3
@@ -54,6 +58,8 @@
 
     move-result-object v4
 
+    const/4 v2, 0x0
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -77,18 +83,4 @@
     invoke-direct/range {v1 .. v13}, Lcom/discord/restapi/RestAPIParams$UserInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "password"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "email"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
index 67711a0aae..aec131b7f8 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
@@ -81,7 +81,7 @@
 
     iget-object p1, p1, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->note:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali
index 54013576f8..58223ddad7 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserRelationship$Add.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "username"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,13 +35,4 @@
     iput p2, p0, Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;->discriminator:I
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali
index 001d923b94..e334a79738 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserSettings$Companion.smali
@@ -349,7 +349,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    move-object/from16 v11, p1
+
+    const-string v0, "guildFolders"
+
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v19, Lcom/discord/restapi/RestAPIParams$UserSettings;
 
@@ -389,20 +395,9 @@
 
     const/16 v18, 0x0
 
-    move-object/from16 v11, p1
-
     invoke-direct/range {v0 .. v18}, Lcom/discord/restapi/RestAPIParams$UserSettings;-><init>(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/util/Collection;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Collection;Ljava/lang/Boolean;Lcom/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v19
-
-    :cond_0
-    const-string v0, "guildFolders"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final createWithInlineAttachmentMedia(Z)Lcom/discord/restapi/RestAPIParams$UserSettings;
@@ -508,7 +503,13 @@
 .method public final createWithLocale(Ljava/lang/String;)Lcom/discord/restapi/RestAPIParams$UserSettings;
     .locals 20
 
-    if-eqz p1, :cond_0
+    move-object/from16 v7, p1
+
+    const-string v0, "locale"
+
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v19, Lcom/discord/restapi/RestAPIParams$UserSettings;
 
@@ -548,20 +549,9 @@
 
     const/16 v18, 0x0
 
-    move-object/from16 v7, p1
-
     invoke-direct/range {v0 .. v18}, Lcom/discord/restapi/RestAPIParams$UserSettings;-><init>(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/util/Collection;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Collection;Ljava/lang/Boolean;Lcom/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v19
-
-    :cond_0
-    const-string v0, "locale"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final createWithRenderEmbeds(Z)Lcom/discord/restapi/RestAPIParams$UserSettings;
@@ -723,17 +713,21 @@
 .end method
 
 .method public final createWithStatus(Lcom/discord/models/domain/ModelPresence$Status;)Lcom/discord/restapi/RestAPIParams$UserSettings;
-    .locals 20
+    .locals 21
 
-    if-eqz p1, :cond_0
+    const-string v0, "status"
 
-    new-instance v19, Lcom/discord/restapi/RestAPIParams$UserSettings;
+    move-object/from16 v1, p1
 
-    move-object/from16 v0, v19
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$UserSettings;
 
-    const/4 v2, 0x0
+    move-object v2, v0
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelPresence$Status;->serialize()Ljava/lang/String;
+
+    move-result-object v11
 
     const/4 v3, 0x0
 
@@ -747,14 +741,10 @@
 
     const/4 v8, 0x0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelPresence$Status;->serialize()Ljava/lang/String;
-
-    move-result-object v9
+    const/4 v9, 0x0
 
     const/4 v10, 0x0
 
-    const/4 v11, 0x0
-
     const/4 v12, 0x0
 
     const/4 v13, 0x0
@@ -765,28 +755,29 @@
 
     const/16 v16, 0x0
 
-    const v17, 0xfeff
+    const/16 v17, 0x0
 
     const/16 v18, 0x0
 
-    invoke-direct/range {v0 .. v18}, Lcom/discord/restapi/RestAPIParams$UserSettings;-><init>(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/util/Collection;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Collection;Ljava/lang/Boolean;Lcom/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const v19, 0xfeff
 
-    return-object v19
+    const/16 v20, 0x0
 
-    :cond_0
-    const-string v0, "status"
+    invoke-direct/range {v2 .. v20}, Lcom/discord/restapi/RestAPIParams$UserSettings;-><init>(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/util/Collection;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Collection;Ljava/lang/Boolean;Lcom/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
+    return-object v0
 .end method
 
 .method public final createWithTheme(Ljava/lang/String;)Lcom/discord/restapi/RestAPIParams$UserSettings;
     .locals 20
 
-    if-eqz p1, :cond_0
+    move-object/from16 v1, p1
+
+    const-string v0, "theme"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v19, Lcom/discord/restapi/RestAPIParams$UserSettings;
 
@@ -826,18 +817,7 @@
 
     const/16 v18, 0x0
 
-    move-object/from16 v1, p1
-
     invoke-direct/range {v0 .. v18}, Lcom/discord/restapi/RestAPIParams$UserSettings;-><init>(Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/util/Collection;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Collection;Ljava/lang/Boolean;Lcom/discord/restapi/RestAPIParams$UserSettings$FriendSourceFlags;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v19
-
-    :cond_0
-    const-string v0, "theme"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
index 5a1fe6716c..b271eb0c0b 100644
--- a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
@@ -12,120 +12,123 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "headersProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/restapi/SpotifyTokenInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
     return-void
-
-    :cond_0
-    const-string p1, "headersProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "chain"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_2
 
-    new-instance v2, Ljava/util/LinkedHashMap;
+    const-string v1, "request"
 
-    invoke-direct {v2}, Ljava/util/LinkedHashMap;-><init>()V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v4, v1, Ln0/a0;->b:Ln0/w;
+    new-instance v1, Ljava/util/LinkedHashMap;
 
-    iget-object v5, v1, Ln0/a0;->c:Ljava/lang/String;
+    invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iget-object v7, v1, Ln0/a0;->e:Lokhttp3/RequestBody;
+    iget-object v3, v0, Lo0/a0;->b:Lo0/w;
 
-    iget-object v2, v1, Ln0/a0;->f:Ljava/util/Map;
+    iget-object v4, v0, Lo0/a0;->c:Ljava/lang/String;
 
-    invoke-interface {v2}, Ljava/util/Map;->isEmpty()Z
+    iget-object v6, v0, Lo0/a0;->e:Lokhttp3/RequestBody;
 
-    move-result v2
+    iget-object v1, v0, Lo0/a0;->f:Ljava/util/Map;
 
-    if-eqz v2, :cond_0
+    invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
-    new-instance v2, Ljava/util/LinkedHashMap;
+    move-result v1
 
-    invoke-direct {v2}, Ljava/util/LinkedHashMap;-><init>()V
+    if-eqz v1, :cond_0
+
+    new-instance v1, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v2, v1, Ln0/a0;->f:Ljava/util/Map;
+    iget-object v1, v0, Lo0/a0;->f:Ljava/util/Map;
 
-    invoke-static {v2}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
-
-    move-result-object v2
-
-    :goto_0
-    iget-object v1, v1, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {v1}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+    invoke-static {v1}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v1
 
-    const-string v3, "Bearer "
+    :goto_0
+    iget-object v0, v0, Lo0/a0;->d:Lokhttp3/Headers;
 
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
 
-    move-result-object v3
+    move-result-object v0
 
-    iget-object v6, p0, Lcom/discord/restapi/SpotifyTokenInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
+    const-string v2, "Authorization"
 
-    invoke-interface {v6}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getSpotifyToken()Ljava/lang/String;
+    const-string v5, "Bearer "
 
-    move-result-object v6
+    invoke-static {v5}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    move-result-object v5
 
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    iget-object v7, p0, Lcom/discord/restapi/SpotifyTokenInterceptor;->headersProvider:Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
 
-    move-result-object v3
+    invoke-interface {v7}, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;->getSpotifyToken()Ljava/lang/String;
 
-    if-eqz v3, :cond_2
+    move-result-object v7
 
-    const-string v0, "Authorization"
+    invoke-virtual {v5, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v0, v3}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    if-eqz v4, :cond_1
+    move-result-object v5
 
-    invoke-virtual {v1}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+    const-string v7, "name"
 
-    move-result-object v6
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Ln0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+    const-string/jumbo v7, "value"
 
-    move-result-object v8
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ln0/a0;
+    invoke-virtual {v0, v2, v5}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
-    move-object v3, v0
+    if-eqz v3, :cond_1
 
-    invoke-direct/range {v3 .. v8}, Ln0/a0;-><init>(Ln0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
 
-    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
+    move-result-object v5
+
+    invoke-static {v1}, Lo0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v7
+
+    new-instance v0, Lo0/a0;
+
+    move-object v2, v0
+
+    invoke-direct/range {v2 .. v7}, Lo0/a0;-><init>(Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+
+    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
 
     move-result-object p1
 
@@ -134,7 +137,7 @@
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
 
-    const-string v0, "url == null"
+    const-string/jumbo v0, "url == null"
 
     invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
@@ -145,19 +148,7 @@
     throw p1
 
     :cond_2
-    const-string p1, "value"
+    const/4 p1, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    throw v0
-
-    :cond_4
-    const-string p1, "chain"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali
index 35808267d6..77e0dc9310 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$CountingSink.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/restapi/utils/CountingRequestBody$CountingSink;
-.super Lo0/h;
+.super Lp0/h;
 .source "CountingRequestBody.kt"
 
 
@@ -30,12 +30,12 @@
 
 
 # direct methods
-.method public constructor <init>(Lo0/u;Lkotlin/jvm/functions/Function1;)V
+.method public constructor <init>(Lp0/u;Lkotlin/jvm/functions/Function1;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lo0/u;",
+            "Lp0/u;",
             "Lkotlin/jvm/functions/Function1<",
             "-",
             "Ljava/lang/Long;",
@@ -44,36 +44,24 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "delegate"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "listener"
 
-    invoke-direct {p0, p1}, Lo0/h;-><init>(Lo0/u;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lp0/h;-><init>(Lp0/u;)V
 
     iput-object p2, p0, Lcom/discord/restapi/utils/CountingRequestBody$CountingSink;->listener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "delegate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
-.method public write(Lo0/e;J)V
+.method public write(Lp0/e;J)V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -81,9 +69,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "source"
 
-    invoke-super {p0, p1, p2, p3}, Lo0/h;->write(Lo0/e;J)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1, p2, p3}, Lp0/h;->write(Lp0/e;J)V
 
     iget-wide v0, p0, Lcom/discord/restapi/utils/CountingRequestBody$CountingSink;->bytesWritten:J
 
@@ -100,13 +90,4 @@
     invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1.smali b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1.smali
index d4e5f6fb41..04db29a941 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "CountingRequestBody.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/restapi/utils/CountingRequestBody;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/restapi/utils/CountingRequestBody;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string/jumbo v4, "updateProgress"
+
+    const-string/jumbo v5, "updateProgress(J)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateProgress"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/restapi/utils/CountingRequestBody;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateProgress(J)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -87,7 +71,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/restapi/utils/CountingRequestBody;
 
diff --git a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
index c72aaec8cc..fcccf959f3 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
@@ -33,9 +33,11 @@
 
 # direct methods
 .method public constructor <init>(Lokhttp3/RequestBody;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -64,15 +66,6 @@
     iput-wide p1, p0, Lcom/discord/restapi/utils/CountingRequestBody;->estimatedContentLength:J
 
     return-void
-
-    :cond_0
-    const-string p1, "delegate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lokhttp3/RequestBody;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -169,7 +162,7 @@
 
     const-string v1, "bytesWrittenSubject.dist\u2026().onBackpressureLatest()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -190,7 +183,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p0, Lcom/discord/restapi/utils/CountingRequestBody;->numWriteToCalls:I
 
@@ -204,28 +199,21 @@
 
     invoke-direct {v1, p0}, Lcom/discord/restapi/utils/CountingRequestBody$writeTo$countingSink$1;-><init>(Lcom/discord/restapi/utils/CountingRequestBody;)V
 
-    invoke-direct {v0, p1, v1}, Lcom/discord/restapi/utils/CountingRequestBody$CountingSink;-><init>(Lo0/u;Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, p1, v1}, Lcom/discord/restapi/utils/CountingRequestBody$CountingSink;-><init>(Lp0/u;Lkotlin/jvm/functions/Function1;)V
 
-    invoke-static {v0}, Lf/n/a/k/a;->o(Lo0/u;)Lokio/BufferedSink;
+    const-string p1, "$receiver"
 
-    move-result-object p1
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lp0/p;
+
+    invoke-direct {p1, v0}, Lp0/p;-><init>(Lp0/u;)V
 
     iget-object v0, p0, Lcom/discord/restapi/utils/CountingRequestBody;->delegate:Lokhttp3/RequestBody;
 
     invoke-virtual {v0, p1}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
-    check-cast p1, Lo0/p;
-
-    invoke-virtual {p1}, Lo0/p;->flush()V
+    invoke-virtual {p1}, Lp0/p;->flush()V
 
     return-void
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali
index 63dd9ead82..befd21b05c 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/restapi/utils/RetryWithDelay$restRetry$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RetryWithDelay.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(Ljava/lang/Throwable;)Z
     .locals 4
 
-    if-eqz p1, :cond_4
+    const-string v0, "throwable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lretrofit2/HttpException;
 
@@ -89,25 +91,25 @@
 
     iget v2, v0, Lretrofit2/HttpException;->code:I
 
-    iget-object v0, v0, Lretrofit2/HttpException;->d:Lq0/n;
+    iget-object v0, v0, Lretrofit2/HttpException;->d:Lr0/n;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lq0/n;->a:Lokhttp3/Response;
+    iget-object v0, v0, Lr0/n;->a:Lokhttp3/Response;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/Response;->d:Ln0/a0;
+    iget-object v0, v0, Lokhttp3/Response;->d:Lo0/a0;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Ln0/a0;->c:Ljava/lang/String;
+    iget-object v0, v0, Lo0/a0;->c:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
     const-string v3, "GET"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -144,13 +146,4 @@
     instance-of p1, p1, Ljava/io/IOException;
 
     return p1
-
-    :cond_4
-    const-string p1, "throwable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali
index 96b891596b..9d4e2f4e8a 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/restapi/utils/RetryWithDelay$restRetry$2$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "RetryWithDelay.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Ljava/lang/Boolean;",
@@ -45,41 +45,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v2, 0x0
+
+    const-string v3, "isNetworkError"
+
+    const-string v4, "invoke(Ljava/lang/Throwable;)Z"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "isNetworkError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke(Ljava/lang/Throwable;)Z"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -99,7 +85,9 @@
 .method public final invoke(Ljava/lang/Throwable;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/restapi/utils/RetryWithDelay$restRetry$1;->INSTANCE:Lcom/discord/restapi/utils/RetryWithDelay$restRetry$1;
 
@@ -108,13 +96,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali
index 3eb7b0db46..28325441c7 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$restRetry$2.smali
@@ -3,7 +3,7 @@
 .source "RetryWithDelay.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lrx/Observable<",
         "+",
         "Ljava/lang/Throwable;",
@@ -82,8 +82,7 @@
             "Ljava/lang/Throwable;",
             ">;)",
             "Lrx/Observable<",
-            "Ljava/lang/Object;",
-            ">;"
+            "*>;"
         }
     .end annotation
 
@@ -91,7 +90,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v2, p0, Lcom/discord/restapi/utils/RetryWithDelay$restRetry$2;->$delayMillis:J
 
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali
index fbbe6412b8..a0de6b8a09 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.smali
@@ -3,7 +3,7 @@
 .source "RetryWithDelay.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Throwable;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Object;",
+        ">;>;"
     }
 .end annotation
 
@@ -111,7 +113,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali
index 9f45234e5c..ee9c3de5cd 100644
--- a/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali
+++ b/com.discord/smali/com/discord/restapi/utils/RetryWithDelay.smali
@@ -165,13 +165,13 @@
 
     invoke-direct/range {v1 .. v7}, Lcom/discord/restapi/utils/RetryWithDelay$retryWithDelay$1;-><init>(ILkotlin/jvm/internal/Ref$IntRef;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/Ref$IntRef;Lkotlin/jvm/internal/Ref$LongRef;)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "flatMap {\n      if (curr\u2026able.error<Any>(it)\n    }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -195,7 +195,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "$this$restRetry"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/restapi/utils/RetryWithDelay$restRetry$1;->INSTANCE:Lcom/discord/restapi/utils/RetryWithDelay$restRetry$1;
 
@@ -203,13 +205,13 @@
 
     invoke-direct {v0, p2, p3, p4, p5}, Lcom/discord/restapi/utils/RetryWithDelay$restRetry$2;-><init>(JLjava/lang/Integer;Ljava/lang/Integer;)V
 
-    new-instance v3, Lr0/l/e/e$d;
+    new-instance v3, Ls0/l/e/e$d;
 
-    invoke-direct {v3, v0}, Lr0/l/e/e$d;-><init>(Lr0/k/b;)V
+    invoke-direct {v3, v0}, Ls0/l/e/e$d;-><init>(Ls0/k/b;)V
 
-    new-instance p2, Lr0/l/a/b0;
+    new-instance p2, Ls0/l/a/b0;
 
-    invoke-static {}, Lr0/p/a;->e()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->e()Lrx/Scheduler;
 
     move-result-object v6
 
@@ -221,7 +223,7 @@
 
     move-object v2, p1
 
-    invoke-direct/range {v1 .. v6}, Lr0/l/a/b0;-><init>(Lrx/Observable;Lr0/k/b;ZZLrx/Scheduler;)V
+    invoke-direct/range {v1 .. v6}, Ls0/l/a/b0;-><init>(Lrx/Observable;Ls0/k/b;ZZLrx/Scheduler;)V
 
     invoke-static {p2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -229,16 +231,7 @@
 
     const-string p2, "retryWhen({ it.retryWith\u2026ies, ::isNetworkError) })"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$this$restRetry"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/rlottie/RLottieDrawable$a.smali b/com.discord/smali/com/discord/rlottie/RLottieDrawable$a.smali
index aee393840c..74a3cd8798 100644
--- a/com.discord/smali/com/discord/rlottie/RLottieDrawable$a.smali
+++ b/com.discord/smali/com/discord/rlottie/RLottieDrawable$a.smali
@@ -47,20 +47,20 @@
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x1
 
     packed-switch v0, :pswitch_data_0
 
-    throw v5
+    throw v4
 
     :pswitch_0
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
-    iput-object v5, v0, Lcom/discord/rlottie/RLottieDrawable;->q:Ljava/lang/Runnable;
+    iput-object v4, v0, Lcom/discord/rlottie/RLottieDrawable;->q:Ljava/lang/Runnable;
 
     invoke-static {v0}, Lcom/discord/rlottie/RLottieDrawable;->a(Lcom/discord/rlottie/RLottieDrawable;)V
 
@@ -71,7 +71,7 @@
 
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
-    iput-boolean v4, v0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
+    iput-boolean v5, v0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
 
     iput-boolean v3, v0, Lcom/discord/rlottie/RLottieDrawable;->F:Z
 
@@ -176,7 +176,7 @@
 
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
-    iput-object v5, v0, Lcom/discord/rlottie/RLottieDrawable;->p:Ljava/lang/Runnable;
+    iput-object v4, v0, Lcom/discord/rlottie/RLottieDrawable;->p:Ljava/lang/Runnable;
 
     invoke-static {v0}, Lcom/discord/rlottie/RLottieDrawable;->a(Lcom/discord/rlottie/RLottieDrawable;)V
 
@@ -187,7 +187,7 @@
 
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
-    iput-boolean v4, v0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
+    iput-boolean v5, v0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
 
     invoke-virtual {v0}, Lcom/discord/rlottie/RLottieDrawable;->c()V
 
@@ -297,7 +297,7 @@
 
     iget-object v0, v0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    if-eqz v0, :cond_12
+    if-eqz v0, :cond_10
 
     :try_start_4
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
@@ -313,7 +313,7 @@
 
     move-result v0
 
-    xor-int/2addr v0, v4
+    xor-int/2addr v0, v5
 
     if-eqz v0, :cond_6
 
@@ -411,6 +411,10 @@
 
     iget-wide v7, v0, Lcom/discord/rlottie/RLottieDrawable;->H:J
 
+    const-string v0, "$this$toIntArray"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length v0, v2
 
     new-array v9, v0, [I
@@ -440,7 +444,7 @@
 
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
-    iput-object v5, v0, Lcom/discord/rlottie/RLottieDrawable;->i:[Ljava/lang/Integer;
+    iput-object v4, v0, Lcom/discord/rlottie/RLottieDrawable;->i:[Ljava/lang/Integer;
 
     :try_start_9
     sget-object v6, Lcom/discord/rlottie/RLottieDrawable;->U:Lcom/discord/rlottie/RLottieDrawable$Companion;
@@ -465,7 +469,7 @@
     :try_start_b
     iget-object v10, v0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    if-eqz v10, :cond_11
+    invoke-static {v10}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_b
@@ -494,7 +498,7 @@
     :try_start_e
     iget-object v0, v0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    if-eqz v0, :cond_10
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getRowBytes()I
 
@@ -541,16 +545,16 @@
 
     sget-object v0, Lcom/discord/rlottie/RLottieDrawable;->P:Landroid/os/Handler;
 
-    iget-object v5, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_10
     .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_10} :catch_1
 
-    check-cast v5, Lcom/discord/rlottie/RLottieDrawable;
+    check-cast v4, Lcom/discord/rlottie/RLottieDrawable;
 
     :try_start_11
-    iget-object v5, v5, Lcom/discord/rlottie/RLottieDrawable;->N:Ljava/lang/Runnable;
+    iget-object v4, v4, Lcom/discord/rlottie/RLottieDrawable;->N:Ljava/lang/Runnable;
 
-    invoke-virtual {v0, v5}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+    invoke-virtual {v0, v4}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_11
@@ -571,16 +575,16 @@
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
     :try_start_13
-    iget-object v5, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_13
     .catch Ljava/lang/Exception; {:try_start_13 .. :try_end_13} :catch_1
 
-    check-cast v5, Lcom/discord/rlottie/RLottieDrawable;
+    check-cast v4, Lcom/discord/rlottie/RLottieDrawable;
 
     :try_start_14
-    iget-object v5, v5, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
+    iget-object v4, v4, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    iput-object v5, v0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iput-object v4, v0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_14
@@ -610,18 +614,18 @@
 
     add-int/2addr v0, v2
 
-    iget-object v5, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_16
     .catch Ljava/lang/Exception; {:try_start_16 .. :try_end_16} :catch_1
 
-    check-cast v5, Lcom/discord/rlottie/RLottieDrawable;
+    check-cast v4, Lcom/discord/rlottie/RLottieDrawable;
 
     :try_start_17
-    iget-object v5, v5, Lcom/discord/rlottie/RLottieDrawable;->f:[I
+    iget-object v4, v4, Lcom/discord/rlottie/RLottieDrawable;->f:[I
 
-    aget v5, v5, v3
+    aget v4, v4, v3
 
-    if-ge v0, v5, :cond_d
+    if-ge v0, v4, :cond_d
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_17
@@ -632,9 +636,9 @@
     :try_start_18
     iget-object v0, v0, Lcom/discord/rlottie/RLottieDrawable;->l:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
 
-    sget-object v5, Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;->FREEZE:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
+    sget-object v4, Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;->FREEZE:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
 
-    if-ne v0, v5, :cond_c
+    if-ne v0, v4, :cond_c
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_18
@@ -643,7 +647,7 @@
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
     :try_start_19
-    iput-boolean v4, v0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
+    iput-boolean v5, v0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_19
@@ -654,7 +658,7 @@
     :try_start_1a
     iget v2, v0, Lcom/discord/rlottie/RLottieDrawable;->m:I
 
-    add-int/2addr v2, v4
+    add-int/2addr v2, v5
 
     iput v2, v0, Lcom/discord/rlottie/RLottieDrawable;->m:I
 
@@ -749,7 +753,7 @@
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
     :try_start_22
-    iput-boolean v4, v0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
+    iput-boolean v5, v0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable$a;->e:Ljava/lang/Object;
     :try_end_22
@@ -760,7 +764,7 @@
     :try_start_23
     iget v2, v0, Lcom/discord/rlottie/RLottieDrawable;->m:I
 
-    add-int/2addr v2, v4
+    add-int/2addr v2, v5
 
     iput v2, v0, Lcom/discord/rlottie/RLottieDrawable;->m:I
 
@@ -774,24 +778,11 @@
     check-cast v0, Lcom/discord/rlottie/RLottieDrawable;
 
     :try_start_24
-    iput-boolean v4, v0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
-
-    goto :goto_5
-
-    :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    iput-boolean v5, v0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
     :try_end_24
     .catch Ljava/lang/Exception; {:try_start_24 .. :try_end_24} :catch_1
 
-    throw v5
-
-    :cond_11
-    :try_start_25
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_25
-    .catch Ljava/lang/Exception; {:try_start_25 .. :try_end_25} :catch_1
-
-    throw v5
+    goto :goto_5
 
     :catch_1
     move-exception v0
@@ -800,7 +791,7 @@
 
     invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    :cond_12
+    :cond_10
     :goto_5
     sget-object v0, Lcom/discord/rlottie/RLottieDrawable;->P:Landroid/os/Handler;
 
@@ -815,6 +806,8 @@
     :goto_6
     return-void
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_6
diff --git a/com.discord/smali/com/discord/rlottie/RLottieDrawable.smali b/com.discord/smali/com/discord/rlottie/RLottieDrawable.smali
index d57fbb76d1..81d4b0e088 100644
--- a/com.discord/smali/com/discord/rlottie/RLottieDrawable.smali
+++ b/com.discord/smali/com/discord/rlottie/RLottieDrawable.smali
@@ -184,7 +184,13 @@
         .end annotation
     .end param
 
-    if-eqz p3, :cond_3
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "name"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroid/graphics/drawable/BitmapDrawable;-><init>()V
 
@@ -289,36 +295,30 @@
 
     const-string p2, "context.resources.openRawResource(rawRes)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p2, Lkotlin/jvm/internal/Ref$IntRef;
-
-    invoke-direct {p2}, Lkotlin/jvm/internal/Ref$IntRef;-><init>()V
-
-    const/4 v0, 0x0
+    const/4 p2, 0x0
 
     :goto_0
+    sget-object v0, Lcom/discord/rlottie/RLottieDrawable;->R:[B
+
     sget-object v4, Lcom/discord/rlottie/RLottieDrawable;->R:[B
 
-    sget-object v5, Lcom/discord/rlottie/RLottieDrawable;->R:[B
+    array-length v4, v4
 
-    array-length v5, v5
+    invoke-virtual {p1, v0, v1, v4}, Ljava/io/InputStream;->read([BII)I
 
-    invoke-virtual {p1, v4, v1, v5}, Ljava/io/InputStream;->read([BII)I
+    move-result v0
 
-    move-result v4
+    if-lez v0, :cond_1
 
-    iput v4, p2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+    sget-object v4, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
 
-    if-lez v4, :cond_1
+    array-length v4, v4
 
-    sget-object v5, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
+    add-int v5, p2, v0
 
-    array-length v5, v5
-
-    add-int/2addr v4, v0
-
-    if-ge v5, v4, :cond_0
+    if-ge v4, v5, :cond_0
 
     sget-object v4, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
 
@@ -328,35 +328,31 @@
 
     new-array v4, v4, [B
 
-    sget-object v5, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
+    sget-object v6, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
 
-    invoke-static {v5, v1, v4, v1, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+    invoke-static {v6, v1, v4, v1, p2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     sput-object v4, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
 
     :cond_0
     sget-object v4, Lcom/discord/rlottie/RLottieDrawable;->R:[B
 
-    sget-object v5, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
+    sget-object v6, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
 
-    iget v6, p2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+    invoke-static {v4, v1, v6, p2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    invoke-static {v4, v1, v5, v0, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget v4, p2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    add-int/2addr v0, v4
+    move p2, v5
 
     goto :goto_0
 
     :cond_1
-    sget-object p2, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
+    sget-object v0, Lcom/discord/rlottie/RLottieDrawable;->Q:[B
 
     new-instance v4, Ljava/lang/String;
 
-    sget-object v5, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object v5, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
-    invoke-direct {v4, p2, v1, v0, v5}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
+    invoke-direct {v4, v0, v1, p2, v5}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
     invoke-virtual {p1}, Ljava/io/InputStream;->close()V
 
@@ -372,7 +368,7 @@
 
     const-string p2, "paint"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v2}, Landroid/graphics/Paint;->setFlags(I)V
 
@@ -430,165 +426,162 @@
     :cond_2
     :goto_1
     return-void
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/io/File;IIZZF[II)V
-    .locals 13
+    .locals 14
 
     move-object v0, p0
 
+    const-string v1, "file"
+
+    move-object v2, p1
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Landroid/graphics/drawable/BitmapDrawable;-><init>()V
 
     const/4 v1, 0x3
 
-    new-array v2, v1, [I
+    new-array v3, v1, [I
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->f:[I
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->f:[I
 
-    new-instance v2, Ljava/util/HashMap;
+    new-instance v3, Ljava/util/HashMap;
 
-    invoke-direct {v2}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v3}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->j:Ljava/util/HashMap;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->j:Ljava/util/HashMap;
 
-    new-instance v2, Ljava/util/HashMap;
+    new-instance v3, Ljava/util/HashMap;
 
-    invoke-direct {v2}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v3}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->k:Ljava/util/HashMap;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->k:Ljava/util/HashMap;
 
-    sget-object v2, Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;->LOOP:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
+    sget-object v3, Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;->LOOP:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->l:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->l:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
 
-    const/high16 v2, 0x42700000    # 60.0f
+    const/high16 v3, 0x42700000    # 60.0f
 
-    iput v2, v0, Lcom/discord/rlottie/RLottieDrawable;->A:F
+    iput v3, v0, Lcom/discord/rlottie/RLottieDrawable;->A:F
 
-    const/high16 v2, 0x3f800000    # 1.0f
+    const/high16 v3, 0x3f800000    # 1.0f
 
-    iput v2, v0, Lcom/discord/rlottie/RLottieDrawable;->B:F
+    iput v3, v0, Lcom/discord/rlottie/RLottieDrawable;->B:F
 
-    iput v2, v0, Lcom/discord/rlottie/RLottieDrawable;->C:F
+    iput v3, v0, Lcom/discord/rlottie/RLottieDrawable;->C:F
 
-    new-instance v2, Landroid/graphics/Rect;
+    new-instance v3, Landroid/graphics/Rect;
 
-    invoke-direct {v2}, Landroid/graphics/Rect;-><init>()V
+    invoke-direct {v3}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
 
-    new-instance v2, Ljava/util/ArrayList;
+    new-instance v3, Ljava/util/ArrayList;
 
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->I:Ljava/util/ArrayList;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->I:Ljava/util/ArrayList;
 
-    new-instance v2, Lcom/discord/rlottie/RLottieDrawable$a;
+    new-instance v3, Lcom/discord/rlottie/RLottieDrawable$a;
 
-    const/4 v3, 0x6
+    const/4 v4, 0x6
 
-    invoke-direct {v2, v3, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v3, v4, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->J:Ljava/lang/Runnable;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->J:Ljava/lang/Runnable;
 
-    new-instance v2, Lcom/discord/rlottie/RLottieDrawable$a;
+    new-instance v3, Lcom/discord/rlottie/RLottieDrawable$a;
 
-    const/4 v3, 0x2
+    const/4 v4, 0x2
 
-    invoke-direct {v2, v3, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v3, v4, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->K:Ljava/lang/Runnable;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->K:Ljava/lang/Runnable;
 
-    new-instance v2, Lcom/discord/rlottie/RLottieDrawable$a;
+    new-instance v3, Lcom/discord/rlottie/RLottieDrawable$a;
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    invoke-direct {v2, v4, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v3, v5, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->L:Ljava/lang/Runnable;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->L:Ljava/lang/Runnable;
 
-    new-instance v2, Lcom/discord/rlottie/RLottieDrawable$a;
+    new-instance v3, Lcom/discord/rlottie/RLottieDrawable$a;
 
-    const/4 v5, 0x4
+    const/4 v6, 0x4
 
-    invoke-direct {v2, v5, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v3, v6, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->M:Ljava/lang/Runnable;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->M:Ljava/lang/Runnable;
 
-    new-instance v2, Lcom/discord/rlottie/RLottieDrawable$a;
+    new-instance v3, Lcom/discord/rlottie/RLottieDrawable$a;
 
-    invoke-direct {v2, v1, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v3, v1, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
 
-    iput-object v2, v0, Lcom/discord/rlottie/RLottieDrawable;->N:Ljava/lang/Runnable;
+    iput-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->N:Ljava/lang/Runnable;
 
     new-instance v1, Lcom/discord/rlottie/RLottieDrawable$a;
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    invoke-direct {v1, v2, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v1, v3, p0}, Lcom/discord/rlottie/RLottieDrawable$a;-><init>(ILjava/lang/Object;)V
 
     iput-object v1, v0, Lcom/discord/rlottie/RLottieDrawable;->O:Ljava/lang/Runnable;
 
-    move v1, p2
+    move/from16 v1, p2
 
     iput v1, v0, Lcom/discord/rlottie/RLottieDrawable;->d:I
 
-    move/from16 v8, p3
+    move/from16 v9, p3
 
-    iput v8, v0, Lcom/discord/rlottie/RLottieDrawable;->e:I
+    iput v9, v0, Lcom/discord/rlottie/RLottieDrawable;->e:I
 
-    move/from16 v5, p5
+    move/from16 v6, p5
 
-    iput-boolean v5, v0, Lcom/discord/rlottie/RLottieDrawable;->z:Z
+    iput-boolean v6, v0, Lcom/discord/rlottie/RLottieDrawable;->z:Z
 
-    move/from16 v5, p6
+    move/from16 v6, p6
 
-    iput v5, v0, Lcom/discord/rlottie/RLottieDrawable;->A:F
+    iput v6, v0, Lcom/discord/rlottie/RLottieDrawable;->A:F
 
     invoke-virtual {p0}, Landroid/graphics/drawable/BitmapDrawable;->getPaint()Landroid/graphics/Paint;
 
-    move-result-object v5
+    move-result-object v6
 
-    const-string v6, "paint"
+    const-string v7, "paint"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v5, v3}, Landroid/graphics/Paint;->setFlags(I)V
+    invoke-virtual {v6, v4}, Landroid/graphics/Paint;->setFlags(I)V
 
-    sget-object v5, Lcom/discord/rlottie/RLottieDrawable;->U:Lcom/discord/rlottie/RLottieDrawable$Companion;
+    sget-object v6, Lcom/discord/rlottie/RLottieDrawable;->U:Lcom/discord/rlottie/RLottieDrawable$Companion;
 
     invoke-virtual {p1}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v7
 
-    const-string v3, "file.absolutePath"
+    const-string v4, "file.absolutePath"
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v9, v0, Lcom/discord/rlottie/RLottieDrawable;->f:[I
+    iget-object v10, v0, Lcom/discord/rlottie/RLottieDrawable;->f:[I
 
-    iget-boolean v12, v0, Lcom/discord/rlottie/RLottieDrawable;->z:Z
+    iget-boolean v13, v0, Lcom/discord/rlottie/RLottieDrawable;->z:Z
 
-    const/4 v11, 0x0
+    const/4 v12, 0x0
 
-    move v7, p2
+    move/from16 v8, p2
 
-    move/from16 v10, p4
+    move/from16 v11, p4
 
-    invoke-static/range {v5 .. v12}, Lcom/discord/rlottie/RLottieDrawable$Companion;->a(Lcom/discord/rlottie/RLottieDrawable$Companion;Ljava/lang/String;II[IZ[IZ)J
+    invoke-static/range {v6 .. v13}, Lcom/discord/rlottie/RLottieDrawable$Companion;->a(Lcom/discord/rlottie/RLottieDrawable$Companion;Ljava/lang/String;II[IZ[IZ)J
 
-    move-result-wide v5
+    move-result-wide v6
 
-    iput-wide v5, v0, Lcom/discord/rlottie/RLottieDrawable;->H:J
+    iput-wide v6, v0, Lcom/discord/rlottie/RLottieDrawable;->H:J
 
     if-eqz p4, :cond_0
 
@@ -598,40 +591,40 @@
 
     new-instance v1, Ljava/util/concurrent/ThreadPoolExecutor;
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    const/4 v6, 0x1
 
-    const-wide/16 v6, 0x0
+    const-wide/16 v7, 0x0
 
-    sget-object v8, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    new-instance v9, Ljava/util/concurrent/LinkedBlockingQueue;
+    new-instance v10, Ljava/util/concurrent/LinkedBlockingQueue;
 
-    invoke-direct {v9}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
+    invoke-direct {v10}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
 
-    move-object p2, v1
+    move-object/from16 p2, v1
 
-    move/from16 p3, v3
+    move/from16 p3, v4
 
-    move/from16 p4, v5
+    move/from16 p4, v6
 
-    move-wide/from16 p5, v6
+    move-wide/from16 p5, v7
 
-    move-object/from16 p7, v8
+    move-object/from16 p7, v9
 
-    move-object/from16 p8, v9
+    move-object/from16 p8, v10
 
     invoke-direct/range {p2 .. p8}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;)V
 
     sput-object v1, Lcom/discord/rlottie/RLottieDrawable;->T:Ljava/util/concurrent/ThreadPoolExecutor;
 
     :cond_0
-    iget-wide v5, v0, Lcom/discord/rlottie/RLottieDrawable;->H:J
+    iget-wide v6, v0, Lcom/discord/rlottie/RLottieDrawable;->H:J
 
-    const-wide/16 v7, 0x0
+    const-wide/16 v8, 0x0
 
-    cmp-long v1, v5, v7
+    cmp-long v1, v6, v8
 
     if-nez v1, :cond_1
 
@@ -644,13 +637,13 @@
 
     iget-object v1, v0, Lcom/discord/rlottie/RLottieDrawable;->f:[I
 
-    aget v1, v1, v4
+    aget v1, v1, v5
 
-    const/16 v3, 0x3c
+    const/16 v2, 0x3c
 
-    if-ge v1, v3, :cond_2
+    if-ge v1, v2, :cond_2
 
-    iput-boolean v2, v0, Lcom/discord/rlottie/RLottieDrawable;->z:Z
+    iput-boolean v3, v0, Lcom/discord/rlottie/RLottieDrawable;->z:Z
 
     :cond_2
     iget-boolean v1, v0, Lcom/discord/rlottie/RLottieDrawable;->z:Z
@@ -669,7 +662,7 @@
 
     iget-object v3, v0, Lcom/discord/rlottie/RLottieDrawable;->f:[I
 
-    aget v3, v3, v4
+    aget v3, v3, v5
 
     int-to-float v3, v3
 
@@ -695,66 +688,53 @@
 
     cmp-long v4, v0, v2
 
-    if-nez v4, :cond_3
+    if-nez v4, :cond_1
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->recycle()V
 
     iput-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    goto :goto_0
-
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
-    :goto_0
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_3
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    if-eqz v0, :cond_2
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->recycle()V
 
     iput-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
+    :cond_1
     invoke-virtual {p0}, Lcom/discord/rlottie/RLottieDrawable;->b()Z
 
     move-result v0
 
-    if-nez v0, :cond_4
+    if-nez v0, :cond_2
 
     const/4 v0, 0x0
 
     iput-boolean v0, p0, Lcom/discord/rlottie/RLottieDrawable;->F:Z
 
-    :cond_4
+    :cond_2
     invoke-virtual {p0}, Lcom/discord/rlottie/RLottieDrawable;->d()Z
 
-    :cond_5
-    :goto_1
+    :cond_3
+    :goto_0
     return-void
 .end method
 
@@ -967,105 +947,107 @@
 .method public draw(Landroid/graphics/Canvas;)V
     .locals 14
 
-    const/4 v0, 0x0
+    const-string v0, "canvas"
 
-    if-eqz p1, :cond_12
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/discord/rlottie/RLottieDrawable;->H:J
+    iget-wide v0, p0, Lcom/discord/rlottie/RLottieDrawable;->H:J
 
-    const-wide/16 v3, 0x0
+    const-wide/16 v2, 0x0
 
-    cmp-long v5, v1, v3
+    cmp-long v4, v0, v2
 
-    if-eqz v5, :cond_11
+    if-eqz v4, :cond_10
 
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    iget-wide v3, p0, Lcom/discord/rlottie/RLottieDrawable;->n:J
+    iget-wide v2, p0, Lcom/discord/rlottie/RLottieDrawable;->n:J
 
-    sub-long v3, v1, v3
+    sub-long v2, v0, v2
 
-    invoke-static {v3, v4}, Ljava/lang/Math;->abs(J)J
+    invoke-static {v2, v3}, Ljava/lang/Math;->abs(J)J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    iget v5, p0, Lcom/discord/rlottie/RLottieDrawable;->A:F
+    iget v4, p0, Lcom/discord/rlottie/RLottieDrawable;->A:F
 
-    const/16 v6, 0x3c
+    const/16 v5, 0x3c
 
-    int-to-float v6, v6
+    int-to-float v5, v5
 
-    cmpg-float v5, v5, v6
+    cmpg-float v4, v4, v5
 
-    if-gtz v5, :cond_0
+    if-gtz v4, :cond_0
 
-    iget v5, p0, Lcom/discord/rlottie/RLottieDrawable;->g:I
+    iget v4, p0, Lcom/discord/rlottie/RLottieDrawable;->g:I
 
-    add-int/lit8 v5, v5, -0x6
+    add-int/lit8 v4, v4, -0x6
 
     goto :goto_0
 
     :cond_0
-    iget v5, p0, Lcom/discord/rlottie/RLottieDrawable;->g:I
+    iget v4, p0, Lcom/discord/rlottie/RLottieDrawable;->g:I
 
     :goto_0
-    iget-boolean v7, p0, Lcom/discord/rlottie/RLottieDrawable;->F:Z
+    iget-boolean v6, p0, Lcom/discord/rlottie/RLottieDrawable;->F:Z
 
-    const-wide/16 v8, 0x10
+    const-wide/16 v7, 0x10
 
-    const/4 v10, 0x1
+    const/4 v9, 0x1
+
+    const/4 v10, 0x0
 
     const/4 v11, 0x0
 
-    if-eqz v7, :cond_9
+    if-eqz v6, :cond_9
 
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    if-nez v7, :cond_1
+    if-nez v6, :cond_1
 
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
-    if-nez v7, :cond_1
+    if-nez v6, :cond_1
 
     invoke-virtual {p0}, Lcom/discord/rlottie/RLottieDrawable;->d()Z
 
     goto/16 :goto_6
 
     :cond_1
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
-    if-eqz v7, :cond_d
+    if-eqz v6, :cond_d
 
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    if-eqz v7, :cond_2
+    if-eqz v6, :cond_2
 
-    int-to-long v12, v5
+    int-to-long v12, v4
 
-    cmp-long v7, v3, v12
+    cmp-long v6, v2, v12
 
-    if-ltz v7, :cond_d
+    if-ltz v6, :cond_d
 
     :cond_2
     invoke-virtual {p0}, Landroid/graphics/drawable/BitmapDrawable;->getCallback()Landroid/graphics/drawable/Drawable$Callback;
 
-    move-result-object v7
+    move-result-object v6
 
-    if-eqz v7, :cond_3
+    if-eqz v6, :cond_3
 
     goto :goto_2
 
     :cond_3
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->I:Ljava/util/ArrayList;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->I:Ljava/util/ArrayList;
 
-    invoke-virtual {v7}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v6}, Ljava/util/ArrayList;->size()I
 
-    move-result v7
+    move-result v6
 
     :goto_1
-    if-lez v7, :cond_6
+    if-lez v6, :cond_6
 
     iget-object v12, p0, Lcom/discord/rlottie/RLottieDrawable;->I:Ljava/util/ArrayList;
 
@@ -1085,147 +1067,147 @@
 
     invoke-virtual {v12, v11}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
 
-    add-int/lit8 v7, v7, -0x1
+    add-int/lit8 v6, v6, -0x1
 
     goto :goto_1
 
     :cond_4
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->I:Ljava/util/ArrayList;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->I:Ljava/util/ArrayList;
 
-    invoke-virtual {v7, v11}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    invoke-virtual {v6, v11}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v6
 
-    check-cast v7, Ljava/lang/ref/WeakReference;
+    check-cast v6, Ljava/lang/ref/WeakReference;
 
-    invoke-virtual {v7}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+    invoke-virtual {v6}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v6
 
-    check-cast v7, Landroid/view/View;
+    check-cast v6, Landroid/view/View;
 
-    if-nez v7, :cond_5
+    if-nez v6, :cond_5
 
     goto :goto_2
 
     :cond_5
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     goto :goto_3
 
     :cond_6
     :goto_2
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     :goto_3
-    if-eqz v7, :cond_d
+    if-eqz v6, :cond_d
 
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    iput-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
+    iput-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
-    iput-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iput-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    iget-boolean v7, p0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
+    iget-boolean v6, p0, Lcom/discord/rlottie/RLottieDrawable;->o:Z
 
-    if-eqz v7, :cond_7
+    if-eqz v6, :cond_7
 
     iput-boolean v11, p0, Lcom/discord/rlottie/RLottieDrawable;->F:Z
 
     :cond_7
-    iput-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->q:Ljava/lang/Runnable;
+    iput-object v10, p0, Lcom/discord/rlottie/RLottieDrawable;->q:Ljava/lang/Runnable;
 
-    iput-boolean v10, p0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
+    iput-boolean v9, p0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
 
-    iput-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iput-object v10, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
-    iget v7, p0, Lcom/discord/rlottie/RLottieDrawable;->A:F
+    iget v6, p0, Lcom/discord/rlottie/RLottieDrawable;->A:F
 
-    cmpg-float v6, v7, v6
+    cmpg-float v5, v6, v5
 
-    if-gtz v6, :cond_8
+    if-gtz v5, :cond_8
 
     goto :goto_4
 
     :cond_8
-    int-to-long v5, v5
+    int-to-long v4, v4
 
-    sub-long/2addr v3, v5
+    sub-long/2addr v2, v4
 
-    invoke-static {v8, v9, v3, v4}, Ljava/lang/Math;->min(JJ)J
+    invoke-static {v7, v8, v2, v3}, Ljava/lang/Math;->min(JJ)J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    sub-long/2addr v1, v3
+    sub-long/2addr v0, v2
 
     :goto_4
-    iput-wide v1, p0, Lcom/discord/rlottie/RLottieDrawable;->n:J
+    iput-wide v0, p0, Lcom/discord/rlottie/RLottieDrawable;->n:J
 
     invoke-virtual {p0}, Lcom/discord/rlottie/RLottieDrawable;->d()Z
 
     goto :goto_6
 
     :cond_9
-    iget-boolean v7, p0, Lcom/discord/rlottie/RLottieDrawable;->x:Z
+    iget-boolean v6, p0, Lcom/discord/rlottie/RLottieDrawable;->x:Z
 
-    if-nez v7, :cond_a
+    if-nez v6, :cond_a
 
-    iget-boolean v7, p0, Lcom/discord/rlottie/RLottieDrawable;->v:Z
+    iget-boolean v6, p0, Lcom/discord/rlottie/RLottieDrawable;->v:Z
 
-    if-eqz v7, :cond_d
+    if-eqz v6, :cond_d
 
-    int-to-long v12, v5
+    int-to-long v12, v4
 
-    cmp-long v7, v3, v12
+    cmp-long v6, v2, v12
 
-    if-ltz v7, :cond_d
+    if-ltz v6, :cond_d
 
     :cond_a
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
-    if-eqz v7, :cond_d
+    if-eqz v6, :cond_d
 
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    iput-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
+    iput-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->t:Landroid/graphics/Bitmap;
 
-    iget-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
-    iput-object v7, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iput-object v6, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    iput-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->q:Ljava/lang/Runnable;
+    iput-object v10, p0, Lcom/discord/rlottie/RLottieDrawable;->q:Ljava/lang/Runnable;
 
-    iput-boolean v10, p0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
+    iput-boolean v9, p0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
 
-    iput-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
+    iput-object v10, p0, Lcom/discord/rlottie/RLottieDrawable;->s:Landroid/graphics/Bitmap;
 
-    iget v7, p0, Lcom/discord/rlottie/RLottieDrawable;->A:F
+    iget v6, p0, Lcom/discord/rlottie/RLottieDrawable;->A:F
 
-    cmpg-float v6, v7, v6
+    cmpg-float v5, v6, v5
 
-    if-gtz v6, :cond_b
+    if-gtz v5, :cond_b
 
     goto :goto_5
 
     :cond_b
-    int-to-long v5, v5
+    int-to-long v4, v4
 
-    sub-long/2addr v3, v5
+    sub-long/2addr v2, v4
 
-    invoke-static {v8, v9, v3, v4}, Ljava/lang/Math;->min(JJ)J
+    invoke-static {v7, v8, v2, v3}, Ljava/lang/Math;->min(JJ)J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    sub-long/2addr v1, v3
+    sub-long/2addr v0, v2
 
     :goto_5
-    iput-wide v1, p0, Lcom/discord/rlottie/RLottieDrawable;->n:J
+    iput-wide v0, p0, Lcom/discord/rlottie/RLottieDrawable;->n:J
 
-    iget-boolean v1, p0, Lcom/discord/rlottie/RLottieDrawable;->x:Z
+    iget-boolean v0, p0, Lcom/discord/rlottie/RLottieDrawable;->x:Z
 
-    if-eqz v1, :cond_c
+    if-eqz v0, :cond_c
 
     iput-boolean v11, p0, Lcom/discord/rlottie/RLottieDrawable;->w:Z
 
@@ -1236,88 +1218,88 @@
 
     :cond_d
     :goto_6
-    iget-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
 
-    if-eqz v1, :cond_11
+    if-eqz v0, :cond_10
 
-    iget-boolean v1, p0, Lcom/discord/rlottie/RLottieDrawable;->D:Z
+    iget-boolean v0, p0, Lcom/discord/rlottie/RLottieDrawable;->D:Z
 
-    if-eqz v1, :cond_e
+    if-eqz v0, :cond_e
 
-    iget-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
 
     invoke-virtual {p0}, Landroid/graphics/drawable/BitmapDrawable;->getBounds()Landroid/graphics/Rect;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/graphics/Rect;->set(Landroid/graphics/Rect;)V
+    invoke-virtual {v0, v1}, Landroid/graphics/Rect;->set(Landroid/graphics/Rect;)V
 
-    iget-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
 
-    invoke-virtual {v1}, Landroid/graphics/Rect;->width()I
+    invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
-    move-result v1
+    move-result v0
+
+    int-to-float v0, v0
+
+    iget v1, p0, Lcom/discord/rlottie/RLottieDrawable;->d:I
 
     int-to-float v1, v1
 
-    iget v2, p0, Lcom/discord/rlottie/RLottieDrawable;->d:I
+    div-float/2addr v0, v1
 
-    int-to-float v2, v2
+    iput v0, p0, Lcom/discord/rlottie/RLottieDrawable;->B:F
 
-    div-float/2addr v1, v2
+    iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
 
-    iput v1, p0, Lcom/discord/rlottie/RLottieDrawable;->B:F
+    invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
-    iget-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
+    move-result v0
 
-    invoke-virtual {v1}, Landroid/graphics/Rect;->height()I
+    int-to-float v0, v0
 
-    move-result v1
+    iget v1, p0, Lcom/discord/rlottie/RLottieDrawable;->e:I
 
     int-to-float v1, v1
 
-    iget v2, p0, Lcom/discord/rlottie/RLottieDrawable;->e:I
+    div-float/2addr v0, v1
 
-    int-to-float v2, v2
-
-    div-float/2addr v1, v2
-
-    iput v1, p0, Lcom/discord/rlottie/RLottieDrawable;->C:F
+    iput v0, p0, Lcom/discord/rlottie/RLottieDrawable;->C:F
 
     iput-boolean v11, p0, Lcom/discord/rlottie/RLottieDrawable;->D:Z
 
     :cond_e
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
-    iget-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->E:Landroid/graphics/Rect;
 
-    iget v2, v1, Landroid/graphics/Rect;->left:I
-
-    int-to-float v2, v2
-
-    iget v1, v1, Landroid/graphics/Rect;->top:I
+    iget v1, v0, Landroid/graphics/Rect;->left:I
 
     int-to-float v1, v1
 
-    invoke-virtual {p1, v2, v1}, Landroid/graphics/Canvas;->translate(FF)V
+    iget v0, v0, Landroid/graphics/Rect;->top:I
 
-    iget v1, p0, Lcom/discord/rlottie/RLottieDrawable;->B:F
+    int-to-float v0, v0
 
-    iget v2, p0, Lcom/discord/rlottie/RLottieDrawable;->C:F
+    invoke-virtual {p1, v1, v0}, Landroid/graphics/Canvas;->translate(FF)V
 
-    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->scale(FF)V
+    iget v0, p0, Lcom/discord/rlottie/RLottieDrawable;->B:F
 
-    iget-object v1, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+    iget v1, p0, Lcom/discord/rlottie/RLottieDrawable;->C:F
 
-    if-eqz v1, :cond_10
+    invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->scale(FF)V
+
+    iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->r:Landroid/graphics/Bitmap;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p0}, Landroid/graphics/drawable/BitmapDrawable;->getPaint()Landroid/graphics/Paint;
 
-    move-result-object v0
+    move-result-object v1
 
     const/4 v2, 0x0
 
-    invoke-virtual {p1, v1, v2, v2, v0}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;FFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, v0, v2, v2, v1}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;FFLandroid/graphics/Paint;)V
 
     iget-boolean v0, p0, Lcom/discord/rlottie/RLottieDrawable;->F:Z
 
@@ -1328,23 +1310,8 @@
     :cond_f
     invoke-virtual {p1}, Landroid/graphics/Canvas;->restore()V
 
-    goto :goto_7
-
     :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_11
-    :goto_7
     return-void
-
-    :cond_12
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final e(Z)V
@@ -1363,7 +1330,9 @@
 .method public final f(Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/rlottie/RLottieDrawable;->l:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
 
@@ -1385,15 +1354,6 @@
     iput-object p1, p0, Lcom/discord/rlottie/RLottieDrawable;->l:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
 
     return-void
-
-    :cond_1
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getIntrinsicHeight()I
@@ -1445,9 +1405,11 @@
 .end method
 
 .method public onBoundsChange(Landroid/graphics/Rect;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "bounds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroid/graphics/drawable/BitmapDrawable;->onBoundsChange(Landroid/graphics/Rect;)V
 
@@ -1456,15 +1418,6 @@
     iput-boolean p1, p0, Lcom/discord/rlottie/RLottieDrawable;->D:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "bounds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public start()V
diff --git a/com.discord/smali/com/discord/rlottie/RLottieImageView.smali b/com.discord/smali/com/discord/rlottie/RLottieImageView.smali
index 7937787759..23afbf07d5 100644
--- a/com.discord/smali/com/discord/rlottie/RLottieImageView.smali
+++ b/com.discord/smali/com/discord/rlottie/RLottieImageView.smali
@@ -39,22 +39,30 @@
     move-object p5, p6
 
     :goto_0
-    if-eqz p0, :cond_4
+    if-eqz p0, :cond_2
 
-    if-eqz p2, :cond_3
+    const-string p6, "context"
 
-    if-eqz p5, :cond_2
+    invoke-static {p1, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "file"
+
+    invoke-static {p2, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "playbackMode"
+
+    invoke-static {p5, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p6, Lcom/discord/rlottie/RLottieDrawable;
 
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
     invoke-static {p1}, Lcom/discord/utilities/display/DisplayUtils;->getScreenRefreshRate(Landroid/content/Context;)F
 
     move-result v6
 
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
     const/4 v7, 0x0
 
     const/16 v8, 0x40
@@ -89,20 +97,6 @@
     return-void
 
     :cond_2
-    const-string p0, "playbackMode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_3
-    const-string p0, "file"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_4
     throw p6
 .end method
 
@@ -151,20 +145,13 @@
 .end method
 
 .method public final setPlaybackMode(Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "playbackMode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "playbackMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setProgress(F)V
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
index 8f3f052010..bee6f9421f 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$d.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/RtcConnection$b;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,24 +57,17 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/rtcconnection/RtcConnection$b;->onFatalClose()V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
index 8b15785a7c..03134ebadd 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$e.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/RtcConnection$b;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "listener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$e;->$event:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
@@ -66,13 +68,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
index 59a02a0d1d..c4a76f8f78 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/rtcconnection/RtcConnection$f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    value = Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/RtcConnection$b;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$f;->$state:Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
index b0e0d3f202..de9d97abc0 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali
@@ -17,9 +17,9 @@
 
 
 # static fields
-.field public static G:I
+.field public static H:I
 
-.field public static final H:Lcom/discord/rtcconnection/RtcConnection$a;
+.field public static final I:Lcom/discord/rtcconnection/RtcConnection$a;
 
 
 # instance fields
@@ -44,6 +44,8 @@
     .end annotation
 .end field
 
+.field public final G:Ljava/lang/String;
+
 .field public final a:Ljava/lang/String;
 
 .field public final b:Ljava/lang/String;
@@ -123,13 +125,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/RtcConnection$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection;->H:Lcom/discord/rtcconnection/RtcConnection$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection;->I:Lcom/discord/rtcconnection/RtcConnection$a;
 
     return-void
 .end method
 
-.method public constructor <init>(Ljava/lang/Long;JLjava/lang/String;ZLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/time/Clock;Lcom/discord/rtcconnection/RtcConnection$c;Lcom/discord/utilities/networking/NetworkMonitor;Ljava/util/Map;I)V
-    .locals 13
+.method public constructor <init>(Ljava/lang/Long;JLjava/lang/String;ZLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/time/Clock;Lcom/discord/rtcconnection/RtcConnection$c;Lcom/discord/utilities/networking/NetworkMonitor;Ljava/util/Map;Ljava/lang/String;I)V
+    .locals 14
 
     move-object v0, p0
 
@@ -143,7 +145,7 @@
 
     move-object/from16 v5, p11
 
-    move/from16 v6, p15
+    move/from16 v6, p16
 
     and-int/lit16 v7, v6, 0x200
 
@@ -157,47 +159,75 @@
     move-object/from16 v7, p12
 
     :goto_0
-    and-int/lit16 v6, v6, 0x800
+    and-int/lit16 v8, v6, 0x800
 
-    if-eqz v6, :cond_1
+    if-eqz v8, :cond_1
 
-    new-instance v6, Ljava/util/HashMap;
+    new-instance v8, Ljava/util/HashMap;
 
-    invoke-direct {v6}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v8}, Ljava/util/HashMap;-><init>()V
 
     goto :goto_1
 
     :cond_1
-    move-object/from16 v6, p14
+    move-object/from16 v8, p14
 
     :goto_1
-    const/4 v8, 0x0
-
-    if-eqz v1, :cond_9
-
-    if-eqz v2, :cond_8
-
-    if-eqz v3, :cond_7
-
-    if-eqz v4, :cond_6
-
-    if-eqz v5, :cond_5
-
-    if-eqz v7, :cond_4
-
-    if-eqz p13, :cond_3
+    and-int/lit16 v6, v6, 0x1000
 
     if-eqz v6, :cond_2
 
+    const/4 v6, 0x0
+
+    goto :goto_2
+
+    :cond_2
+    move-object/from16 v6, p15
+
+    :goto_2
+    const-string v9, "sessionId"
+
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "rtcServerId"
+
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "mediaEngine"
+
+    invoke-static {v3, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "logger"
+
+    invoke-static {v4, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "clock"
+
+    invoke-static {v5, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "rtcConnectionType"
+
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "networkMonitor"
+
+    move-object/from16 v10, p13
+
+    invoke-static {v10, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "mutedUsers"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    move-object v8, p1
+    move-object v9, p1
 
-    iput-object v8, v0, Lcom/discord/rtcconnection/RtcConnection;->v:Ljava/lang/Long;
+    iput-object v9, v0, Lcom/discord/rtcconnection/RtcConnection;->v:Ljava/lang/Long;
 
-    move-wide v8, p2
+    move-wide/from16 v11, p2
 
-    iput-wide v8, v0, Lcom/discord/rtcconnection/RtcConnection;->w:J
+    iput-wide v11, v0, Lcom/discord/rtcconnection/RtcConnection;->w:J
 
     iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->x:Ljava/lang/String;
 
@@ -219,7 +249,9 @@
 
     iput-object v7, v0, Lcom/discord/rtcconnection/RtcConnection;->E:Lcom/discord/rtcconnection/RtcConnection$c;
 
-    iput-object v6, v0, Lcom/discord/rtcconnection/RtcConnection;->F:Ljava/util/Map;
+    iput-object v8, v0, Lcom/discord/rtcconnection/RtcConnection;->F:Ljava/util/Map;
+
+    iput-object v6, v0, Lcom/discord/rtcconnection/RtcConnection;->G:Ljava/lang/String;
 
     invoke-static {}, Ljava/util/UUID;->randomUUID()Ljava/util/UUID;
 
@@ -231,7 +263,7 @@
 
     const-string v2, "UUID.randomUUID().toString()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->a:Ljava/lang/String;
 
@@ -251,13 +283,13 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget v2, Lcom/discord/rtcconnection/RtcConnection;->G:I
+    sget v2, Lcom/discord/rtcconnection/RtcConnection;->H:I
 
     const/4 v3, 0x1
 
     add-int/2addr v2, v3
 
-    sput v2, Lcom/discord/rtcconnection/RtcConnection;->G:I
+    sput v2, Lcom/discord/rtcconnection/RtcConnection;->H:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -275,10 +307,10 @@
 
     new-instance v1, Lf/a/h/t/d;
 
-    const-wide/16 v4, 0x3e8
-
     iget-object v2, v0, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
 
+    const-wide/16 v4, 0x3e8
+
     invoke-direct {v1, v4, v5, v2}, Lf/a/h/t/d;-><init>(JLcom/discord/utilities/logging/Logger;)V
 
     iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->d:Lf/a/h/t/d;
@@ -297,17 +329,17 @@
 
     const/4 v9, 0x0
 
-    const-wide/16 v10, 0x3e8
+    const-wide/16 v11, 0x3e8
 
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
     move-object p1, v1
 
-    move-wide p2, v10
+    move-wide/from16 p2, v11
 
     move-wide/from16 p4, v4
 
-    move/from16 p6, v12
+    move/from16 p6, v13
 
     move/from16 p7, v6
 
@@ -361,7 +393,7 @@
 
     invoke-virtual {v1, v2, v4}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual/range {p13 .. p13}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
+    invoke-virtual/range {p13 .. p13}, Lcom/discord/utilities/networking/NetworkMonitor;->observeIsConnected()Lrx/Observable;
 
     move-result-object v1
 
@@ -388,62 +420,6 @@
     iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->u:Lf/a/h/j;
 
     return-void
-
-    :cond_2
-    const-string v1, "mutedUsers"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_3
-    const-string v1, "networkMonitor"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_4
-    const-string v1, "rtcConnectionType"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_5
-    const-string v1, "clock"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_6
-    const-string v1, "logger"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_7
-    const-string v1, "mediaEngine"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_8
-    const-string v1, "rtcServerId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_9
-    const-string v1, "sessionId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
 .end method
 
 .method public static synthetic d(Lcom/discord/rtcconnection/RtcConnection;ZLjava/lang/String;Ljava/lang/Throwable;I)V
@@ -599,7 +575,7 @@
 
     invoke-direct {p1, v2}, Lcom/discord/rtcconnection/RtcConnection$State$d;-><init>(Z)V
 
-    invoke-virtual {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->c:Ljava/util/List;
 
@@ -654,7 +630,7 @@
 
     invoke-direct {p3, p1}, Lcom/discord/rtcconnection/RtcConnection$State$d;-><init>(Z)V
 
-    invoke-virtual {p0, p3}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {p0, p3}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     if-eqz p1, :cond_1
 
@@ -716,6 +692,11 @@
 
     if-eqz v1, :cond_1
 
+    const-string v2, "media_session_id"
+
+    invoke-virtual {v0, v2, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_1
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
@@ -724,7 +705,15 @@
 
     invoke-virtual {v0, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_1
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->G:Ljava/lang/String;
+
+    if-eqz p1, :cond_2
+
+    const-string p2, "parent_media_session_id"
+
+    invoke-virtual {v0, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_2
     invoke-virtual {v0, p3}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
 
     sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->VIDEO_STREAM_ENDED:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
@@ -760,6 +749,10 @@
     return-void
 
     :cond_1
+    const-string v0, "$this$toAnalyticsProperties"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x5
 
     new-array v0, v0, [Lkotlin/Pair;
@@ -919,113 +912,115 @@
     :cond_0
     iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->i:Ljava/util/LinkedList;
 
-    const/4 p2, 0x0
+    const-string p2, "$this$average"
 
-    if-eqz p1, :cond_1b
-
-    const-wide/16 v5, 0x0
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
-    const/4 v7, 0x0
+    const-wide/16 v5, 0x0
+
+    const/4 p2, 0x0
 
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_2
+    const/4 v8, 0x0
+
+    if-eqz v7, :cond_2
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v7
 
-    check-cast v8, Ljava/lang/Number;
+    check-cast v7, Ljava/lang/Number;
 
-    invoke-virtual {v8}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v7}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v8
+    move-result-wide v9
 
-    long-to-double v8, v8
+    long-to-double v9, v9
 
-    add-double/2addr v5, v8
+    add-double/2addr v5, v9
 
-    add-int/lit8 v7, v7, 0x1
+    add-int/lit8 p2, p2, 0x1
 
-    if-ltz v7, :cond_1
+    if-ltz p2, :cond_1
 
     goto :goto_0
 
     :cond_1
     invoke-static {}, Lf/n/a/k/a;->throwCountOverflow()V
 
-    throw p2
+    throw v8
 
     :cond_2
-    if-nez v7, :cond_3
+    if-nez p2, :cond_3
 
-    const-wide/high16 v5, 0x7ff8000000000000L    # Double.NaN
+    const-wide/high16 p1, 0x7ff8000000000000L    # Double.NaN
 
     goto :goto_1
 
     :cond_3
-    int-to-double v7, v7
+    int-to-double p1, p2
 
-    div-double/2addr v5, v7
+    div-double p1, v5, p1
 
     :goto_1
-    invoke-static {v5, v6}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static {p1, p2}, Ljava/lang/Double;->isNaN(D)Z
 
-    move-result p1
+    move-result v5
 
-    if-nez p1, :cond_7
+    if-nez v5, :cond_7
 
-    invoke-static {v5, v6}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static {p1, p2}, Ljava/lang/Double;->isNaN(D)Z
 
-    move-result p1
+    move-result v5
 
-    if-nez p1, :cond_6
+    if-nez v5, :cond_6
 
-    const p1, 0x7fffffff
+    const v5, 0x7fffffff
 
-    int-to-double v7, p1
+    int-to-double v6, v5
 
     const/high16 v9, -0x80000000
 
-    cmpl-double v10, v5, v7
+    cmpl-double v10, p1, v6
 
     if-lez v10, :cond_4
 
     goto :goto_2
 
     :cond_4
-    int-to-double v7, v9
+    int-to-double v5, v9
 
-    cmpg-double p1, v5, v7
+    cmpg-double v7, p1, v5
 
-    if-gez p1, :cond_5
+    if-gez v7, :cond_5
 
-    const/high16 p1, -0x80000000
+    const/high16 v5, -0x80000000
 
     goto :goto_2
 
     :cond_5
-    invoke-static {v5, v6}, Ljava/lang/Math;->round(D)J
+    invoke-static {p1, p2}, Ljava/lang/Math;->round(D)J
 
-    move-result-wide v5
+    move-result-wide p1
 
-    long-to-int p1, v5
+    long-to-int v5, p1
 
     :goto_2
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
-    const-string v5, "ping_average"
+    const-string p2, "ping_average"
 
-    invoke-virtual {v4, v5, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_3
 
@@ -1044,9 +1039,9 @@
 
     if-eqz p1, :cond_8
 
-    const-string v5, "media_session_id"
+    const-string p2, "media_session_id"
 
-    invoke-virtual {v4, v5, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_8
     iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->d:Lf/a/h/t/d;
@@ -1057,23 +1052,11 @@
 
     invoke-virtual {p1}, Lco/discord/media_engine/Stats;->getOutboundRtpAudio()Lco/discord/media_engine/OutboundRtpAudio;
 
-    move-result-object v5
+    move-result-object p2
 
-    if-eqz v5, :cond_9
+    if-eqz p2, :cond_9
 
-    invoke-virtual {v5}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsSent()I
-
-    move-result v6
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    const-string v7, "packets_sent"
-
-    invoke-virtual {v4, v7, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-virtual {v5}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsLost()I
+    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsSent()I
 
     move-result v5
 
@@ -1081,10 +1064,22 @@
 
     move-result-object v5
 
-    const-string v6, "packets_sent_lost"
+    const-string v6, "packets_sent"
 
     invoke-virtual {v4, v6, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpAudio;->getPacketsLost()I
+
+    move-result p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    const-string v5, "packets_sent_lost"
+
+    invoke-virtual {v4, v5, p2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     :cond_9
     invoke-virtual {p1}, Lco/discord/media_engine/Stats;->getInboundRtpAudio()Ljava/util/Map;
 
@@ -1098,53 +1093,53 @@
 
     move-result-object p1
 
-    const/4 v5, 0x0
+    const/4 p2, 0x0
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     :goto_4
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v6
 
-    if-eqz v7, :cond_a
+    if-eqz v6, :cond_a
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v6
 
-    check-cast v7, Lco/discord/media_engine/InboundRtpAudio;
+    check-cast v6, Lco/discord/media_engine/InboundRtpAudio;
 
-    invoke-virtual {v7}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsLost()I
-
-    move-result v8
-
-    add-int/2addr v6, v8
-
-    invoke-virtual {v7}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsReceived()I
+    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsLost()I
 
     move-result v7
 
     add-int/2addr v5, v7
 
+    invoke-virtual {v6}, Lco/discord/media_engine/InboundRtpAudio;->getPacketsReceived()I
+
+    move-result v6
+
+    add-int/2addr p2, v6
+
     goto :goto_4
 
     :cond_a
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    const-string p2, "packets_received"
+
+    invoke-virtual {v4, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
-    const-string v5, "packets_received"
+    const-string p2, "packets_received_lost"
 
-    invoke-virtual {v4, v5, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    const-string v5, "packets_received_lost"
-
-    invoke-virtual {v4, v5, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->d:Lf/a/h/t/d;
 
@@ -1197,39 +1192,39 @@
 
     invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
 
+    move-result-wide p1
+
+    iget-object v5, p0, Lcom/discord/rtcconnection/RtcConnection;->D:Lcom/discord/utilities/time/Clock;
+
+    invoke-interface {v5}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+
     move-result-wide v5
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->D:Lcom/discord/utilities/time/Clock;
+    sub-long/2addr v5, p1
 
-    invoke-interface {p1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
-
-    move-result-wide v7
-
-    sub-long/2addr v7, v5
-
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     goto :goto_5
 
     :cond_10
-    move-object p1, p2
+    move-object p1, v8
 
     :goto_5
     if-eqz p1, :cond_11
 
     invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v5
+    move-result-wide p1
 
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
-    const-string v5, "duration"
+    const-string p2, "duration"
 
-    invoke-virtual {v4, v5, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_11
     iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->f:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
@@ -1241,7 +1236,7 @@
     goto :goto_6
 
     :cond_12
-    move-object p1, p2
+    move-object p1, v8
 
     :goto_6
     if-eqz p1, :cond_15
@@ -1269,9 +1264,9 @@
     const-string p1, "udp"
 
     :goto_7
-    const-string v5, "protocol"
+    const-string p2, "protocol"
 
-    invoke-virtual {v4, v5, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, p2, p1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_15
     sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->VOICE_DISCONNECT:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
@@ -1308,199 +1303,196 @@
     :goto_8
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result p2
 
-    if-eqz v1, :cond_17
+    if-eqz p2, :cond_17
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object p2
 
-    check-cast v1, Ljava/util/Map$Entry;
+    check-cast p2, Ljava/util/Map$Entry;
 
-    invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/String;
-
-    invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {p2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
     move-result-object v1
 
-    check-cast v1, Lco/discord/media_engine/InboundRtpVideo;
+    check-cast v1, Ljava/lang/String;
 
-    invoke-static {v4}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-interface {p2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object p2
 
-    if-eqz v4, :cond_16
+    check-cast p2, Lco/discord/media_engine/InboundRtpVideo;
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    invoke-static {v1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_16
+
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v4
 
-    invoke-virtual {p0, v4, v5, v1}, Lcom/discord/rtcconnection/RtcConnection;->f(JLco/discord/media_engine/InboundRtpVideo;)V
+    invoke-virtual {p0, v4, v5, p2}, Lcom/discord/rtcconnection/RtcConnection;->f(JLco/discord/media_engine/InboundRtpVideo;)V
 
     goto :goto_8
 
     :cond_17
-    iget-wide v4, p0, Lcom/discord/rtcconnection/RtcConnection;->A:J
+    iget-wide p1, p0, Lcom/discord/rtcconnection/RtcConnection;->A:J
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->d:Lf/a/h/t/d;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->d:Lf/a/h/t/d;
 
-    iget-object p1, p1, Lf/a/h/t/d;->a:Lco/discord/media_engine/Stats;
+    iget-object v1, v1, Lf/a/h/t/d;->a:Lco/discord/media_engine/Stats;
 
-    if-eqz p1, :cond_18
+    if-eqz v1, :cond_18
 
-    invoke-virtual {p1}, Lco/discord/media_engine/Stats;->getOutboundRtpVideo()Lco/discord/media_engine/OutboundRtpVideo;
+    invoke-virtual {v1}, Lco/discord/media_engine/Stats;->getOutboundRtpVideo()Lco/discord/media_engine/OutboundRtpVideo;
 
-    move-result-object p2
+    move-result-object v8
 
     :cond_18
-    if-nez p2, :cond_19
+    if-nez v8, :cond_19
 
     goto/16 :goto_9
 
     :cond_19
-    const/4 p1, 0x7
+    const-string v1, "$this$toAnalyticsProperties"
 
-    new-array p1, p1, [Lkotlin/Pair;
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lkotlin/Pair;
+    const/4 v1, 0x7
 
-    const-string v6, "participant_type"
+    new-array v1, v1, [Lkotlin/Pair;
 
-    const-string v7, "sender"
+    new-instance v4, Lkotlin/Pair;
 
-    invoke-direct {v1, v6, v7}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const-string v5, "participant_type"
 
-    aput-object v1, p1, v2
+    const-string v6, "sender"
 
-    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpVideo;->getBitrate()I
+    invoke-direct {v4, v5, v6}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    move-result v1
+    aput-object v4, v1, v2
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {v8}, Lco/discord/media_engine/OutboundRtpVideo;->getBitrate()I
 
-    move-result-object v1
+    move-result v2
 
-    new-instance v2, Lkotlin/Pair;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const-string v6, "avg_bitrate"
+    move-result-object v2
 
-    invoke-direct {v2, v6, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    new-instance v4, Lkotlin/Pair;
 
-    aput-object v2, p1, v3
+    const-string v5, "avg_bitrate"
 
-    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpVideo;->getBitrateTarget()I
+    invoke-direct {v4, v5, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    move-result v1
+    aput-object v4, v1, v3
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {v8}, Lco/discord/media_engine/OutboundRtpVideo;->getBitrateTarget()I
 
-    move-result-object v1
+    move-result v2
 
-    new-instance v2, Lkotlin/Pair;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const-string v3, "target_bitrate"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    new-instance v3, Lkotlin/Pair;
 
-    aput-object v2, p1, v0
+    const-string v4, "target_bitrate"
+
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    aput-object v3, v1, v0
 
     const/4 v0, 0x3
 
-    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpVideo;->getNackCount()I
+    invoke-virtual {v8}, Lco/discord/media_engine/OutboundRtpVideo;->getNackCount()I
 
-    move-result v1
+    move-result v2
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v2
 
-    new-instance v2, Lkotlin/Pair;
+    new-instance v3, Lkotlin/Pair;
 
-    const-string v3, "num_nacks"
+    const-string v4, "num_nacks"
 
-    invoke-direct {v2, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, p1, v0
+    aput-object v3, v1, v0
 
     const/4 v0, 0x4
 
-    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpVideo;->getPacketsLost()I
+    invoke-virtual {v8}, Lco/discord/media_engine/OutboundRtpVideo;->getPacketsLost()I
 
-    move-result v1
+    move-result v2
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v2
 
-    new-instance v2, Lkotlin/Pair;
+    new-instance v3, Lkotlin/Pair;
 
-    const-string v3, "num_packets_lost"
+    const-string v4, "num_packets_lost"
 
-    invoke-direct {v2, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, p1, v0
+    aput-object v3, v1, v0
 
     const/4 v0, 0x5
 
-    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpVideo;->getPliCount()I
+    invoke-virtual {v8}, Lco/discord/media_engine/OutboundRtpVideo;->getPliCount()I
 
-    move-result v1
+    move-result v2
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v2
 
-    new-instance v2, Lkotlin/Pair;
+    new-instance v3, Lkotlin/Pair;
 
-    const-string v3, "num_plis"
+    const-string v4, "num_plis"
 
-    invoke-direct {v2, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, p1, v0
+    aput-object v3, v1, v0
 
     const/4 v0, 0x6
 
-    invoke-virtual {p2}, Lco/discord/media_engine/OutboundRtpVideo;->getResolution()Lco/discord/media_engine/Resolution;
+    invoke-virtual {v8}, Lco/discord/media_engine/OutboundRtpVideo;->getResolution()Lco/discord/media_engine/Resolution;
 
-    move-result-object p2
+    move-result-object v2
 
-    invoke-virtual {p2}, Lco/discord/media_engine/Resolution;->getHeight()I
+    invoke-virtual {v2}, Lco/discord/media_engine/Resolution;->getHeight()I
 
-    move-result p2
+    move-result v2
 
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object p2
+    move-result-object v2
 
-    new-instance v1, Lkotlin/Pair;
+    new-instance v3, Lkotlin/Pair;
 
-    const-string v2, "target_resolution_height"
+    const-string v4, "target_resolution_height"
 
-    invoke-direct {v1, v2, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v1, p1, v0
+    aput-object v3, v1, v0
 
-    invoke-static {p1}, Lf/n/a/k/a;->mutableMapOf([Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v1}, Lf/n/a/k/a;->mutableMapOf([Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p0, v4, v5, p1}, Lcom/discord/rtcconnection/RtcConnection;->e(JLjava/util/Map;)V
+    invoke-virtual {p0, p1, p2, v0}, Lcom/discord/rtcconnection/RtcConnection;->e(JLjava/util/Map;)V
 
     :cond_1a
     :goto_9
     return-void
-
-    :cond_1b
-    const-string p1, "$this$average"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public final h(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
@@ -1522,6 +1514,32 @@
 
     invoke-interface {p2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->E:Lcom/discord/rtcconnection/RtcConnection$c;
+
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$c$a;->a:Lcom/discord/rtcconnection/RtcConnection$c$a;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    const-string v0, "default"
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v0, v0, Lcom/discord/rtcconnection/RtcConnection$c$b;
+
+    if-eqz v0, :cond_1
+
+    const-string v0, "stream"
+
+    :goto_0
+    const-string v1, "context"
+
+    invoke-interface {p2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
     new-instance v0, Lcom/discord/rtcconnection/RtcConnection$e;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/rtcconnection/RtcConnection$e;-><init>(Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;Ljava/util/Map;)V
@@ -1529,6 +1547,13 @@
     invoke-virtual {p0, v0}, Lcom/discord/rtcconnection/RtcConnection;->i(Lkotlin/jvm/functions/Function1;)V
 
     return-void
+
+    :cond_1
+    new-instance p1, Lkotlin/NoWhenBranchMatchedException;
+
+    invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
+
+    throw p1
 .end method
 
 .method public final i(Lkotlin/jvm/functions/Function1;)V
@@ -1630,7 +1655,7 @@
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->B:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->k()Ljava/util/concurrent/ExecutorService;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->l()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -1652,12 +1677,47 @@
     return-object p1
 .end method
 
-.method public final l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+.method public final l(Landroid/content/Intent;)V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->E:Lcom/discord/rtcconnection/RtcConnection$c;
+
+    instance-of v0, v0, Lcom/discord/rtcconnection/RtcConnection$c$b;
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Setting screenshare "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
+
+    invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public final m(Lcom/discord/rtcconnection/RtcConnection$State;)V
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->g:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo.smali
index 015772b07f..5209e7a313 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo.smali
@@ -22,7 +22,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "audioSubsystem"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "audioLayer"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +58,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -60,7 +68,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;->b:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali
index 3680473eea..1f941c6edb 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine$a.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "ip"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->c:I
 
     return-void
-
-    :cond_0
-    const-string p1, "ip"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -71,7 +64,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->b:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
index ed90ef76c9..0c744aa23f 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
@@ -27,13 +27,27 @@
     .end annotation
 .end method
 
-.method public abstract b(Z)V
+.method public abstract b([Lco/discord/media_engine/RtcRegion;Lkotlin/jvm/functions/Function1;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Lco/discord/media_engine/RtcRegion;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-[",
+            "Ljava/lang/String;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
 .end method
 
 .method public abstract c(Z)V
 .end method
 
-.method public abstract d()Lrx/Observable;
+.method public abstract d(Z)V
+.end method
+
+.method public abstract e()Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -44,10 +58,10 @@
     .end annotation
 .end method
 
-.method public abstract e(I)V
+.method public abstract f(I)V
 .end method
 
-.method public abstract f(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.method public abstract g(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -63,9 +77,6 @@
     .end annotation
 .end method
 
-.method public abstract g(F)V
-.end method
-
 .method public abstract getConnections()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -77,13 +88,16 @@
     .end annotation
 .end method
 
-.method public abstract h(Z)V
+.method public abstract h(F)V
 .end method
 
-.method public abstract i()Lcom/hammerandchisel/libdiscord/Discord;
+.method public abstract i(Z)V
 .end method
 
-.method public abstract j(Lkotlin/jvm/functions/Function1;)V
+.method public abstract j()Lcom/hammerandchisel/libdiscord/Discord;
+.end method
+
+.method public abstract k(Lkotlin/jvm/functions/Function1;)V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -96,13 +110,13 @@
     .end annotation
 .end method
 
-.method public abstract k()Ljava/util/concurrent/ExecutorService;
+.method public abstract l()Ljava/util/concurrent/ExecutorService;
 .end method
 
-.method public abstract l(Z)V
+.method public abstract m(Z)V
 .end method
 
-.method public abstract m(Lkotlin/jvm/functions/Function1;)V
+.method public abstract n(Lkotlin/jvm/functions/Function1;)V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali
index 124d526bad..6332eadb9f 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException.smali
@@ -26,22 +26,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;->type:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
index 1719146a98..adbad96d0d 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
@@ -30,9 +30,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;ILcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "address"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocol"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,15 +49,6 @@
     iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->c:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;
 
     return-void
-
-    :cond_0
-    const-string p1, "protocol"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -71,7 +68,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -87,7 +84,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->c:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
index 2897732d7f..6f2afa5ed4 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
@@ -49,6 +49,9 @@
     .end annotation
 .end method
 
+.method public abstract getType()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+.end method
+
 .method public abstract h(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
 .end method
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali
index 11539e6a78..d34dbec0d6 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Description.smali
@@ -67,15 +67,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "secretKey"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "audioCodec"
 
-    if-eqz p4, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string/jumbo v0, "videoCodec"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mode"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -90,34 +96,6 @@
     iput-object p5, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Description;->mode:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "videoCodec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "audioCodec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "secretKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Description;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Description;
@@ -252,15 +230,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "secretKey"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "audioCodec"
 
-    if-eqz p4, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string/jumbo v0, "videoCodec"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mode"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 
@@ -279,34 +263,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/rtcconnection/socket/io/Payloads$Description;-><init>(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "videoCodec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "audioCodec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "secretKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -324,7 +280,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Description;->secretKey:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -334,7 +290,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Description;->mediaSessionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -344,7 +300,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Description;->audioCodec:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -354,7 +310,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Description;->videoCodec:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -364,7 +320,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Description;->mode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali
index 42b39051f2..63fb6abccb 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Identify.smali
@@ -42,13 +42,17 @@
 .method public constructor <init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "serverId"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "sessionId"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "token"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,27 +67,6 @@
     iput-boolean p6, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;->video:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sessionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "serverId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Identify;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Identify;
@@ -196,13 +179,17 @@
 .method public final copy(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Z)Lcom/discord/rtcconnection/socket/io/Payloads$Identify;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "serverId"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "sessionId"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "token"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;
 
@@ -221,27 +208,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;-><init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sessionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "serverId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -259,7 +225,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;->serverId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -277,7 +243,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;->sessionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -287,7 +253,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;->token:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali
index 546e16fb8b..6e287d2d26 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Incoming.smali
@@ -30,9 +30,11 @@
 
 # direct methods
 .method public constructor <init>(ILcom/google/gson/JsonElement;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +43,6 @@
     iput-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->data:Lcom/google/gson/JsonElement;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;ILcom/google/gson/JsonElement;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
@@ -97,22 +90,15 @@
 .method public final copy(ILcom/google/gson/JsonElement;)Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;-><init>(ILcom/google/gson/JsonElement;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +122,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->data:Lcom/google/gson/JsonElement;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali
index a28c9c5618..86e747c0db 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Outgoing.smali
@@ -30,9 +30,11 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/Object;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +43,6 @@
     iput-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;->data:Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;ILjava/lang/Object;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;
@@ -97,22 +90,15 @@
 .method public final copy(ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;-><init>(ILjava/lang/Object;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +122,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;->data:Ljava/lang/Object;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo.smali
index 90a54eaa1b..6801633a7c 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo.smali
@@ -38,11 +38,13 @@
 .method public constructor <init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,20 +59,6 @@
     iput-object p5, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;->rtxPayloadType:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;
@@ -183,11 +171,13 @@
 .method public final copy(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;
 
@@ -206,20 +196,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;-><init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -237,7 +213,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -253,7 +229,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;->type:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -269,7 +245,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;->rtxPayloadType:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali
index 100c35a293..f1cdaf199c 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo.smali
@@ -26,11 +26,13 @@
 .method public constructor <init>(Ljava/lang/String;ILjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "address"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "mode"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,20 +43,6 @@
     iput-object p3, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;->mode:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "address"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;Ljava/lang/String;ILjava/lang/String;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;
@@ -117,31 +105,19 @@
 .method public final copy(Ljava/lang/String;ILjava/lang/String;)Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "address"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "mode"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "address"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -159,7 +135,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;->address:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -175,7 +151,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;->mode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali
index b680273db8..092aa436f0 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Protocol.smali
@@ -51,11 +51,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "protocol"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,20 +68,6 @@
     iput-object p3, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;->codecs:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "protocol"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;Ljava/lang/String;Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;
@@ -161,31 +149,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "protocol"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "protocol"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -203,7 +179,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;->protocol:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -213,7 +189,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;->data:Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -223,7 +199,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;->codecs:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali
index 4606b3b202..6bcf6a34ff 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Ready.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(IILjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "ip"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput-object p3, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;->ip:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "ip"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Ready;IILjava/lang/String;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
@@ -108,22 +101,15 @@
 .method public final copy(IILjava/lang/String;)Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "ip"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;-><init>(IILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "ip"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -153,7 +139,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;->ip:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali
index 2115e4695f..187adac195 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Resume.smali
@@ -34,13 +34,17 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "token"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "sessionId"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "serverId"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,27 +55,6 @@
     iput-object p3, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Resume;->serverId:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "serverId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sessionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/rtcconnection/socket/io/Payloads$Resume;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/rtcconnection/socket/io/Payloads$Resume;
@@ -134,40 +117,23 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/rtcconnection/socket/io/Payloads$Resume;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "token"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "sessionId"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "serverId"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Resume;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/rtcconnection/socket/io/Payloads$Resume;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "serverId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sessionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -185,7 +151,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Resume;->token:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -195,7 +161,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Resume;->sessionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -205,7 +171,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Resume;->serverId:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$SessionUpdate.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$SessionUpdate.smali
index 466404e351..2a5fed24c5 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$SessionUpdate.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$SessionUpdate.smali
@@ -85,7 +85,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;->mediaSessionId:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Speaking.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Speaking.smali
index 1b154c4849..b206cd5c7c 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Speaking.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Speaking.smali
@@ -207,7 +207,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -217,7 +217,7 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->delay:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -227,7 +227,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->userId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali
index 8d358006ac..267a67806a 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/io/Payloads$Video.smali
@@ -187,7 +187,7 @@
 
     iget-object p1, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Video;->userId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnect$SamsungCallbackException.smali b/com.discord/smali/com/discord/samsung/SamsungConnect$SamsungCallbackException.smali
index f8ca462e78..e4881e713f 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnect$SamsungCallbackException.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnect$SamsungCallbackException.smali
@@ -18,6 +18,10 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
+    const-string v0, "errorCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnect.smali b/com.discord/smali/com/discord/samsung/SamsungConnect.smali
index c7a338ee14..1b9be5a697 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnect.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnect.smali
@@ -73,7 +73,7 @@
 
     if-eqz v4, :cond_1
 
-    invoke-static {v4, v2, v3, p0}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v4, v2, v3, p0}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p0
 
@@ -129,9 +129,13 @@
     goto :goto_3
 
     :cond_5
-    const-string v2, "unknown"
+    const-string/jumbo v2, "unknown"
 
     :goto_3
+    const-string v3, "location?.getQueryParameter(\"error\") ?: \"unknown\""
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     if-eqz v0, :cond_6
 
     const-string v1, "error_description"
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali
index 57d6837250..f549bbd9ea 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$a.smali
@@ -28,7 +28,9 @@
 .method public final a(Landroidx/fragment/app/Fragment;II)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -54,18 +56,9 @@
 
     const-string v0, "Intent(fragment.requireA\u2026AG_ACTIVITY_NO_ANIMATION)"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p3, p2}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
index ce1d7caca1..9df09b4642 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
@@ -180,7 +180,7 @@
     :cond_2
     const-string p1, "samsungAccountServiceCallback"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
index 84b41b49ed..133564290a 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
@@ -63,7 +63,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -85,7 +85,7 @@
 
     if-eqz p2, :cond_3
 
-    invoke-static {p2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -163,7 +163,7 @@
 
     const-string v0, "Intent(SAMSUNG_REQ_SA_SE\u2026(SAMSUNG_ACCOUNT_SERVICE)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Samsung starting SA Service"
 
diff --git a/com.discord/smali/com/discord/simpleast/core/node/Node.smali b/com.discord/smali/com/discord/simpleast/core/node/Node.smali
index 934dd51458..91b3ff3b37 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/Node.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/Node.smali
@@ -47,7 +47,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "child"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/simpleast/core/node/Node;->children:Ljava/util/Collection;
 
@@ -66,15 +68,6 @@
     iput-object v0, p0, Lcom/discord/simpleast/core/node/Node;->children:Ljava/util/Collection;
 
     return-void
-
-    :cond_1
-    const-string p1, "child"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getChildren()Ljava/util/Collection;
@@ -129,16 +122,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "builder"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali b/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali
index b24850ff09..81f1f9c7fe 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/StyleNode$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/simpleast/core/node/StyleNode$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StyleNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/simpleast/core/node/Node<",
         "TRC;>;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -58,24 +58,17 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/discord/simpleast/core/node/Node;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali b/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali
index ac3ace0693..acbadb36d4 100644
--- a/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali
+++ b/com.discord/smali/com/discord/simpleast/core/node/StyleNode.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -39,22 +39,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "styles"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/simpleast/core/node/Node;-><init>()V
 
     iput-object p1, p0, Lcom/discord/simpleast/core/node/StyleNode;->a:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "styles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -69,6 +62,10 @@
         }
     .end annotation
 
+    const-string v0, "builder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I
 
     move-result v0
@@ -173,7 +170,7 @@
 
     const-string v5, "\n>|"
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/Parser$ParseException.smali b/com.discord/smali/com/discord/simpleast/core/parser/Parser$ParseException.smali
index cae9ad98a2..54b8be22de 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Parser$ParseException.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Parser$ParseException.smali
@@ -18,7 +18,9 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/Throwable;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -43,13 +45,4 @@
     invoke-direct {p0, p1, p3}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali b/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali
index 551b6c3fe1..7694cec4ff 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Parser.smali
@@ -267,22 +267,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "rule"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/simpleast/core/parser/Parser;->rules:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     return-object p0
-
-    :cond_0
-    const-string p1, "rule"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final addRules(Ljava/util/Collection;)Lcom/discord/simpleast/core/parser/Parser;
@@ -299,7 +292,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "rules"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
@@ -324,15 +319,6 @@
 
     :cond_0
     return-object p0
-
-    :cond_1
-    const-string p1, "rules"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final parse(Ljava/lang/CharSequence;Ljava/lang/Object;)Ljava/util/List;
@@ -382,19 +368,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "rules"
 
-    if-eqz p3, :cond_c
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/util/Stack;
+    new-instance v0, Ljava/util/Stack;
 
-    invoke-direct {v1}, Ljava/util/Stack;-><init>()V
+    invoke-direct {v0}, Ljava/util/Stack;-><init>()V
 
-    new-instance v2, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
@@ -422,22 +410,22 @@
 
     move-result v6
 
-    invoke-direct {v5, v0, p2, v4, v6}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
+    invoke-direct {v5, v4, p2, v3, v6}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
 
-    invoke-virtual {v1, v5}, Ljava/util/Stack;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v5}, Ljava/util/Stack;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    move-object p2, v0
+    move-object p2, v4
 
     :cond_2
     :goto_1
-    invoke-virtual {v1}, Ljava/util/Stack;->isEmpty()Z
+    invoke-virtual {v0}, Ljava/util/Stack;->isEmpty()Z
 
     move-result v5
 
     if-nez v5, :cond_b
 
-    invoke-virtual {v1}, Ljava/util/Stack;->pop()Ljava/lang/Object;
+    invoke-virtual {v0}, Ljava/util/Stack;->pop()Ljava/lang/Object;
 
     move-result-object v5
 
@@ -514,7 +502,7 @@
     goto :goto_3
 
     :cond_4
-    invoke-virtual {v2, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_5
     :goto_3
@@ -528,7 +516,7 @@
 
     invoke-direct {v11, v8, v5, p2, v9}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
 
-    invoke-virtual {v1, v11}, Ljava/util/Stack;->push(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v11}, Ljava/util/Stack;->push(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_6
     iget-boolean p2, v6, Lcom/discord/simpleast/core/parser/ParseSpec;->b:Z
@@ -547,11 +535,11 @@
 
     iput p2, v6, Lcom/discord/simpleast/core/parser/ParseSpec;->e:I
 
-    invoke-virtual {v1, v6}, Ljava/util/Stack;->push(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v6}, Ljava/util/Stack;->push(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_7
     :try_start_0
-    invoke-virtual {v10, v4}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {v10, v3}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object p2
     :try_end_0
@@ -590,18 +578,11 @@
 
     const-string p3, "failed to find rule to match source"
 
-    invoke-direct {p2, p3, p1, v0}, Lcom/discord/simpleast/core/parser/Parser$ParseException;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/Throwable;)V
+    invoke-direct {p2, p3, p1, v4}, Lcom/discord/simpleast/core/parser/Parser$ParseException;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/Throwable;)V
 
     throw p2
 
     :cond_b
     :goto_5
-    return-object v2
-
-    :cond_c
-    const-string p1, "rules"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/Rule$BlockRule.smali b/com.discord/smali/com/discord/simpleast/core/parser/Rule$BlockRule.smali
index 8007f5eed7..7b53e8b230 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Rule$BlockRule.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Rule$BlockRule.smali
@@ -30,28 +30,21 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/regex/Pattern;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "pattern"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "pattern"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public match(Ljava/lang/CharSequence;Ljava/lang/String;Ljava/lang/Object;)Ljava/util/regex/Matcher;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -62,45 +55,51 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "inspectionSource"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_2
 
-    const/16 v1, 0xa
+    const/16 v0, 0xa
+
+    const-string v1, "$this$endsWith"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
 
-    move-result v2
+    move-result v1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    if-lez v2, :cond_0
+    if-lez v1, :cond_0
 
-    invoke-static {p2}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result v2
-
-    invoke-interface {p2, v2}, Ljava/lang/CharSequence;->charAt(I)C
-
-    move-result v2
-
-    invoke-static {v2, v1, v3}, Lf/n/a/k/a;->equals(CCZ)Z
+    invoke-static {p2}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
 
     move-result v1
 
-    if-eqz v1, :cond_0
+    invoke-interface {p2, v1}, Ljava/lang/CharSequence;->charAt(I)C
 
-    const/4 v3, 0x1
+    move-result v1
+
+    invoke-static {v1, v0, v2}, Lf/n/a/k/a;->equals(CCZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v2, 0x1
 
     :cond_0
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
     goto :goto_0
 
     :cond_1
-    return-object v0
+    const/4 p1, 0x0
+
+    return-object p1
 
     :cond_2
     :goto_0
@@ -109,11 +108,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_3
-    const-string p1, "inspectionSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali b/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali
index 0034a89f93..c05919b305 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/Rule.smali
@@ -30,30 +30,25 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/regex/Matcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "matcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/simpleast/core/parser/Rule;->matcher:Ljava/util/regex/Matcher;
 
     return-void
-
-    :cond_0
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/util/regex/Pattern;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "pattern"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, ""
 
@@ -63,20 +58,11 @@
 
     const-string v0, "pattern.matcher(\"\")"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Matcher;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "pattern"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -101,13 +87,13 @@
         }
     .end annotation
 
-    const/4 p2, 0x0
+    const-string p2, "inspectionSource"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p3, p0, Lcom/discord/simpleast/core/parser/Rule;->matcher:Ljava/util/regex/Matcher;
+    iget-object p2, p0, Lcom/discord/simpleast/core/parser/Rule;->matcher:Ljava/util/regex/Matcher;
 
-    invoke-virtual {p3, p1}, Ljava/util/regex/Matcher;->reset(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+    invoke-virtual {p2, p1}, Ljava/util/regex/Matcher;->reset(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
     iget-object p1, p0, Lcom/discord/simpleast/core/parser/Rule;->matcher:Ljava/util/regex/Matcher;
 
@@ -117,17 +103,15 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p0, Lcom/discord/simpleast/core/parser/Rule;->matcher:Ljava/util/regex/Matcher;
+    iget-object p1, p0, Lcom/discord/simpleast/core/parser/Rule;->matcher:Ljava/util/regex/Matcher;
+
+    goto :goto_0
 
     :cond_0
-    return-object p2
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "inspectionSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    :goto_0
+    return-object p1
 .end method
 
 .method public abstract parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
diff --git a/com.discord/smali/com/discord/stores/Dispatcher.smali b/com.discord/smali/com/discord/stores/Dispatcher.smali
index 931143ae16..9a44e51a2e 100644
--- a/com.discord/smali/com/discord/stores/Dispatcher.smali
+++ b/com.discord/smali/com/discord/stores/Dispatcher.smali
@@ -23,9 +23,11 @@
 
 # direct methods
 .method public constructor <init>(Lrx/Scheduler;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "scheduler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,15 +42,6 @@
     iput-object p1, p0, Lcom/discord/stores/Dispatcher;->dispatchHandlers:Ljava/util/ArrayList;
 
     return-void
-
-    :cond_0
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lrx/Scheduler;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -83,7 +76,7 @@
 .end method
 
 .method private final assertCleanDispatch()V
-    .locals 5
+    .locals 3
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -99,13 +92,9 @@
 
     invoke-direct {v1}, Ljava/lang/RuntimeException;-><init>()V
 
-    const/4 v2, 0x0
+    const-string v2, "dirty dispatch"
 
-    const/4 v3, 0x5
-
-    const-string v4, "dirty dispatch"
-
-    invoke-virtual {v0, v4, v3, v1, v2}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, v2, v1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_0
     return-void
@@ -158,7 +147,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "dispatchHandlerArgs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -179,15 +170,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "dispatchHandlerArgs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final schedule(Lkotlin/jvm/functions/Function0;)V
@@ -201,7 +183,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/Dispatcher;->dispatchHandlers:Ljava/util/ArrayList;
 
@@ -221,7 +205,7 @@
 
     const-string v0, "javaClass.name"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -256,15 +240,6 @@
     invoke-virtual {v0, v1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
 
     return-void
-
-    :cond_2
-    const-string p1, "action"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final varargs unregisterDispatchHandlers([Lcom/discord/stores/DispatchHandler;)V
@@ -272,7 +247,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "dispatchHandlerArgs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -293,13 +270,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "dispatchHandlerArgs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/NotificationTextUtils.smali b/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
index 71139b0988..154845ca14 100644
--- a/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
+++ b/com.discord/smali/com/discord/stores/NotificationTextUtils.smali
@@ -322,7 +322,7 @@
 
     const-string p5, "message.mentions"
 
-    invoke-static {p1, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -355,7 +355,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p5}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -392,7 +392,7 @@
 
     const-string p2, "message.mentionRoles"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -522,25 +522,37 @@
 
     move-object/from16 v2, p7
 
-    const/4 v3, 0x0
+    const-string v3, "msg"
 
-    if-eqz p2, :cond_e
+    move-object/from16 v8, p2
 
-    if-eqz p3, :cond_d
+    invoke-static {v8, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_c
+    const-string v3, "channel"
 
-    if-eqz v1, :cond_b
+    move-object/from16 v4, p3
 
-    if-eqz v2, :cond_a
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "blockedRelationships"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "guildMembers"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "guildSettings"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->isManaged()Z
 
-    move-result v4
+    move-result v3
 
     const/4 v5, 0x0
 
-    if-eqz v4, :cond_0
+    if-eqz v3, :cond_0
 
     return v5
 
@@ -549,48 +561,50 @@
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v4
+    move-result-object v3
 
     sget-object v6, Lcom/discord/models/domain/ModelUser;->EMPTY:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
+    const/4 v7, 0x0
+
     if-nez v6, :cond_1
 
     goto :goto_0
 
     :cond_1
-    move-object v4, v3
+    move-object v3, v7
 
     :goto_0
-    if-eqz v4, :cond_9
+    if-eqz v3, :cond_9
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v6
+    move-result-wide v9
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v11
 
-    cmp-long v10, v6, v8
+    cmp-long v6, v9, v11
 
-    if-nez v10, :cond_2
+    if-nez v6, :cond_2
 
     return v5
 
     :cond_2
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v6
+    move-result-wide v9
 
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-interface {v0, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v0, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -603,9 +617,9 @@
 
     move-result v0
 
-    const/4 v4, 0x3
+    const/4 v3, 0x3
 
-    if-ne v0, v4, :cond_4
+    if-ne v0, v3, :cond_4
 
     return v5
 
@@ -624,9 +638,9 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v4
+    move-result-wide v5
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -639,7 +653,7 @@
     goto :goto_1
 
     :cond_5
-    move-object v0, v3
+    move-object v0, v7
 
     :goto_1
     if-eqz v0, :cond_6
@@ -653,24 +667,18 @@
     goto :goto_2
 
     :cond_6
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_2
-    move-object v7, v0
-
-    const-string v0, "member?.roles ?: emptyList()"
-
-    invoke-static {v7, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-interface {v2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
-    move-object v5, v0
+    move-object v5, v1
 
     check-cast v5, Lcom/discord/models/domain/ModelNotificationSettings;
 
@@ -688,6 +696,8 @@
 
     move-object v6, p1
 
+    move-object v7, v0
+
     move-object/from16 v8, p2
 
     move-object/from16 v9, p5
@@ -696,22 +706,27 @@
 
     move-result v0
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_7
     if-eqz p5, :cond_8
 
     invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelGuild;->getDefaultMessageNotifications()I
 
-    move-result v0
+    move-result v1
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v1
+
+    move-object v5, v1
+
+    goto :goto_3
 
     :cond_8
-    move-object v5, v3
+    move-object v5, v7
 
+    :goto_3
     const/4 v9, 0x0
 
     const/4 v10, 0x0
@@ -724,50 +739,17 @@
 
     move-object v6, p1
 
+    move-object v7, v0
+
     move-object/from16 v8, p2
 
     invoke-static/range {v4 .. v12}, Lcom/discord/stores/NotificationTextUtils;->shouldNotifyForLevel$default(Lcom/discord/stores/NotificationTextUtils;Ljava/lang/Integer;Lcom/discord/models/domain/ModelUser$Me;Ljava/util/Collection;Lcom/discord/models/domain/ModelMessage;ZZILjava/lang/Object;)Z
 
     move-result v0
 
-    :goto_3
+    :goto_4
     return v0
 
     :cond_9
     return v5
-
-    :cond_a
-    const-string v0, "guildSettings"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_b
-    const-string v0, "guildMembers"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_c
-    const-string v0, "blockedRelationships"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_d
-    const-string v0, "channel"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_e
-    const-string v0, "msg"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
diff --git a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$Companion$INSTANCE$2.smali
index fad999f0c4..3679c582a1 100644
--- a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$Companion$INSTANCE$2.smali
+++ b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$Companion$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PersistLocalMessagesFeatureFlag.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/stores/PersistLocalMessagesFeatureFlag;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1.smali b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1.smali
index 95659ca869..db9892e25b 100644
--- a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1.smali
+++ b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PersistLocalMessagesFeatureFlag.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreExperiments$Experiment;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/stores/StoreExperiments$Experiment;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1.smali b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1.smali
index acb5eb200c..ce2ffa8779 100644
--- a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1.smali
+++ b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1.smali
@@ -3,7 +3,7 @@
 .source "PersistLocalMessagesFeatureFlag.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/stores/StoreExperiments$Experiment;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 0
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getRawExperiment()Lcom/discord/models/domain/ModelExperiment;
@@ -92,5 +76,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$2.smali b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$2.smali
index 74e6b14e05..cd6e406cb2 100644
--- a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$2.smali
+++ b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$2.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "experiment"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->access$writeExperimentToCache(Lcom/discord/stores/PersistLocalMessagesFeatureFlag;Lcom/discord/stores/StoreExperiments$Experiment;)V
 
diff --git a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag.smali b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag.smali
index f7b2fa6218..44cf5efa2c 100644
--- a/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag.smali
+++ b/com.discord/smali/com/discord/stores/PersistLocalMessagesFeatureFlag.smali
@@ -63,32 +63,25 @@
 .method public constructor <init>(Landroid/content/SharedPreferences;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "sharedPreferences"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->sharedPreferences:Landroid/content/SharedPreferences;
 
-    const/4 v0, 0x0
+    const-string v0, "CACHE_KEY_PERSIST_LOCAL_MESSAGES_EXPERIMENT_BUCKET"
 
-    const-string v1, "CACHE_KEY_PERSIST_LOCAL_MESSAGES_EXPERIMENT_BUCKET"
+    const/4 v1, 0x0
 
-    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences;->getInt(Ljava/lang/String;I)I
+    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences;->getInt(Ljava/lang/String;I)I
 
     move-result p1
 
     iput p1, p0, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->experimentBucket:I
 
     return-void
-
-    :cond_0
-    const-string p1, "sharedPreferences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/SharedPreferences;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -151,7 +144,7 @@
 
     sget-object v0, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1;->INSTANCE:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$observeExperiment$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -171,7 +164,7 @@
 
     const-string v0, "storeExperiments.getExpe\u2026che(experiment)\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -207,17 +200,19 @@
 
 # virtual methods
 .method public final fetchExperiment(Lcom/discord/stores/StoreExperiments;)V
-    .locals 9
+    .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeExperiments"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->observeExperiment(Lcom/discord/stores/StoreExperiments;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v1
 
-    const-class v1, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;
+    const-class v2, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;
 
-    const/4 v2, 0x0
+    sget-object v7, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1;->INSTANCE:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1;
 
     const/4 v3, 0x0
 
@@ -225,24 +220,15 @@
 
     const/4 v5, 0x0
 
-    sget-object v6, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1;->INSTANCE:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$fetchExperiment$1;
+    const/4 v6, 0x0
 
-    const/16 v7, 0x1e
+    const/16 v8, 0x1e
 
-    const/4 v8, 0x0
+    const/4 v9, 0x0
 
-    invoke-static/range {v0 .. v8}, 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
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeExperiments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final isEnabled()Z
diff --git a/com.discord/smali/com/discord/stores/ReadyPayloadUtils$GuildCache.smali b/com.discord/smali/com/discord/stores/ReadyPayloadUtils$GuildCache.smali
index 71bd9642c9..dfe810f424 100644
--- a/com.discord/smali/com/discord/stores/ReadyPayloadUtils$GuildCache.smali
+++ b/com.discord/smali/com/discord/stores/ReadyPayloadUtils$GuildCache.smali
@@ -50,7 +50,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -70,7 +70,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -83,15 +85,6 @@
     iput-object p4, p0, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->roles:Ljava/util/Collection;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/ReadyPayloadUtils$GuildCache;Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;ILjava/lang/Object;)Lcom/discord/stores/ReadyPayloadUtils$GuildCache;
@@ -212,22 +205,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -245,7 +231,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -255,7 +241,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->emojis:Ljava/util/Collection;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -265,7 +251,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->channels:Ljava/util/Collection;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -275,7 +261,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->roles:Ljava/util/Collection;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success.smali b/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success.smali
index 638b074d0a..74fb921575 100644
--- a/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success.smali
+++ b/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateResult$Success.smali b/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateResult$Success.smali
index 620f6eadc9..b7d2734438 100644
--- a/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateResult$Success.smali
+++ b/com.discord/smali/com/discord/stores/ReadyPayloadUtils$HydrateResult$Success.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelPayload;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "payload"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;->payload:Lcom/discord/models/domain/ModelPayload;
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;Lcom/discord/models/domain/ModelPayload;ILjava/lang/Object;)Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelPayload;)Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;-><init>(Lcom/discord/models/domain/ModelPayload;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;->payload:Lcom/discord/models/domain/ModelPayload;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/ReadyPayloadUtils.smali b/com.discord/smali/com/discord/stores/ReadyPayloadUtils.smali
index 669fdc23ef..a52032ad32 100644
--- a/com.discord/smali/com/discord/stores/ReadyPayloadUtils.smali
+++ b/com.discord/smali/com/discord/stores/ReadyPayloadUtils.smali
@@ -55,6 +55,32 @@
     return-void
 .end method
 
+.method public static synthetic hydrateGuild$default(Lcom/discord/stores/ReadyPayloadUtils;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
+    .locals 1
+
+    and-int/lit8 p5, p4, 0x2
+
+    const/4 v0, 0x0
+
+    if-eqz p5, :cond_0
+
+    move-object p2, v0
+
+    :cond_0
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_1
+
+    move-object p3, v0
+
+    :cond_1
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/ReadyPayloadUtils;->hydrateGuild(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/util/Map;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 
 # virtual methods
 .method public final getCache()Ljava/util/HashMap;
@@ -74,14 +100,30 @@
     return-object v0
 .end method
 
-.method public final hydrateGuild(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
+.method public final hydrateGuild(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/util/Map;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
     .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelGuild;",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPresence;",
+            ">;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelGuildMember;",
+            ">;)",
+            "Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;"
+        }
+    .end annotation
 
-    if-eqz p1, :cond_b
+    const-string v1, "guild"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
@@ -192,11 +234,11 @@
 
     if-eqz v4, :cond_4
 
-    new-instance v0, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
+    new-instance v1, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
 
-    invoke-direct {v0, p1}, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;-><init>(Lcom/discord/models/domain/ModelGuild;)V
+    invoke-direct {v1, p1}, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
-    return-object v0
+    return-object v1
 
     :cond_4
     sget-object v4, Lcom/discord/stores/ReadyPayloadUtils;->cache:Ljava/util/HashMap;
@@ -209,127 +251,181 @@
 
     move-result-object v5
 
-    invoke-virtual {v4, v5}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v4, v5}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v4
 
     check-cast v4, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;
 
-    sget-object v5, Lcom/discord/stores/ReadyPayloadUtils;->cache:Ljava/util/HashMap;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
-
-    move-result-wide v6
-
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v6
-
-    invoke-virtual {v5, v6}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
     if-nez v1, :cond_5
 
     if-nez v3, :cond_5
 
-    if-nez v2, :cond_5
-
-    new-instance v0, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
-
-    invoke-direct {v0, p1}, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;-><init>(Lcom/discord/models/domain/ModelGuild;)V
-
-    return-object v0
+    if-eqz v2, :cond_6
 
     :cond_5
     if-nez v4, :cond_6
 
-    sget-object p1, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Error;->INSTANCE:Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Error;
+    sget-object v0, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Error;->INSTANCE:Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Error;
 
-    return-object p1
+    return-object v0
 
     :cond_6
-    new-instance v5, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
+    const/4 v5, 0x0
+
+    if-eqz v4, :cond_8
 
     if-eqz v1, :cond_7
 
-    invoke-virtual {v4}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v6
+    move-object v6, v4
 
     goto :goto_3
 
     :cond_7
-    move-object v6, v0
+    move-object v6, v5
 
     :goto_3
-    if-eqz v1, :cond_8
+    if-eqz v6, :cond_8
 
-    invoke-virtual {v4}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->getEmojis()Ljava/util/Collection;
+    invoke-virtual {v6}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v6
 
     goto :goto_4
 
     :cond_8
-    move-object v1, v0
+    move-object v6, v5
 
     :goto_4
-    if-eqz v3, :cond_9
+    if-eqz v4, :cond_a
 
-    invoke-virtual {v4}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->getChannels()Ljava/util/Collection;
+    if-eqz v1, :cond_9
 
-    move-result-object v3
+    move-object v1, v4
 
     goto :goto_5
 
     :cond_9
-    move-object v3, v0
+    move-object v1, v5
 
     :goto_5
-    if-eqz v2, :cond_a
+    if-eqz v1, :cond_a
+
+    invoke-virtual {v1}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->getEmojis()Ljava/util/Collection;
+
+    move-result-object v1
+
+    move-object v7, v1
+
+    goto :goto_6
+
+    :cond_a
+    move-object v7, v5
+
+    :goto_6
+    if-eqz v4, :cond_c
+
+    if-eqz v3, :cond_b
+
+    move-object v1, v4
+
+    goto :goto_7
+
+    :cond_b
+    move-object v1, v5
+
+    :goto_7
+    if-eqz v1, :cond_c
+
+    invoke-virtual {v1}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->getChannels()Ljava/util/Collection;
+
+    move-result-object v1
+
+    move-object v3, v1
+
+    goto :goto_8
+
+    :cond_c
+    move-object v3, v5
+
+    :goto_8
+    if-eqz v4, :cond_e
+
+    if-eqz v2, :cond_d
+
+    goto :goto_9
+
+    :cond_d
+    move-object v4, v5
+
+    :goto_9
+    if-eqz v4, :cond_e
 
     invoke-virtual {v4}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;->getRoles()Ljava/util/Collection;
 
+    move-result-object v1
+
+    move-object v4, v1
+
+    goto :goto_a
+
+    :cond_e
+    move-object v4, v5
+
+    :goto_a
+    move-object v0, p1
+
+    move-object v1, v6
+
+    move-object v2, v7
+
+    move-object v5, p2
+
+    move-object v6, p3
+
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/models/domain/ModelGuild;->hydrate(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;)Lcom/discord/models/domain/ModelGuild;
+
     move-result-object v0
 
-    :cond_a
-    invoke-virtual {p1, v6, v1, v3, v0}, Lcom/discord/models/domain/ModelGuild;->hydrate(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;)Lcom/discord/models/domain/ModelGuild;
+    const-string v1, "guild.hydrate(\n         \u2026        members\n        )"
 
-    move-result-object p1
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "guild.hydrate(\n         \u2026roles else null\n        )"
+    new-instance v1, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v1, v0}, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
-    invoke-direct {v5, p1}, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;-><init>(Lcom/discord/models/domain/ModelGuild;)V
-
-    return-object v5
-
-    :cond_b
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public final hydrateReadyPayload(Lcom/discord/models/domain/ModelPayload;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreEmojiCustom;)Lcom/discord/stores/ReadyPayloadUtils$HydrateResult;
-    .locals 9
+    .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "payload_"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_8
+    const-string v0, "storeGuilds"
 
-    if-eqz p3, :cond_7
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_6
+    const-string v0, "storeChannels"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeEmojiCustom"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/ReadyPayloadUtils;->hydrateUsers(Lcom/discord/models/domain/ModelPayload;)Lcom/discord/models/domain/ModelPayload;
+
+    move-result-object p1
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreGuilds;->getRoles()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
 
@@ -346,17 +442,19 @@
     :goto_0
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_3
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_3
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lcom/discord/models/domain/ModelGuild;
+    check-cast v1, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v3
 
@@ -364,7 +462,7 @@
 
     move-result-object v3
 
-    invoke-interface {v1, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -379,10 +477,10 @@
     goto :goto_1
 
     :cond_0
-    move-object v3, v0
+    move-object v3, v2
 
     :goto_1
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v4
 
@@ -399,10 +497,10 @@
     goto :goto_2
 
     :cond_1
-    move-object v4, v0
+    move-object v4, v2
 
     :goto_2
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v5
 
@@ -414,29 +512,24 @@
 
     invoke-interface {v5}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v5
-
-    goto :goto_3
+    move-result-object v2
 
     :cond_2
-    move-object v5, v0
+    sget-object v5, Lcom/discord/stores/ReadyPayloadUtils;->cache:Ljava/util/HashMap;
 
-    :goto_3
-    sget-object v6, Lcom/discord/stores/ReadyPayloadUtils;->cache:Ljava/util/HashMap;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    move-result-wide v6
 
-    move-result-wide v7
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v6
 
-    move-result-object v7
+    new-instance v7, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;
 
-    new-instance v8, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;
+    invoke-direct {v7, v1, v2, v4, v3}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;)V
 
-    invoke-direct {v8, v2, v5, v4, v3}, Lcom/discord/stores/ReadyPayloadUtils$GuildCache;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;)V
-
-    invoke-interface {v6, v7, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v5, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
@@ -451,38 +544,136 @@
 
     const-string p4, "payload.guilds"
 
-    invoke-static {p3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p4, 0x0
 
     invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p3
 
-    :goto_4
+    :goto_3
     invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result p4
+    move-result v0
 
-    if-eqz p4, :cond_5
+    if-eqz v0, :cond_a
 
     invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
+    move-result-object v0
+
+    add-int/lit8 v1, p4, 0x1
+
+    if-ltz p4, :cond_9
+
+    check-cast v0, Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuildPresences()Ljava/util/List;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_4
+
+    invoke-interface {v3, p4}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    goto :goto_4
+
+    :cond_4
+    move-object v3, v2
+
+    :goto_4
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuildMembers()Ljava/util/List;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_6
+
+    invoke-interface {v4, p4}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
     move-result-object p4
 
-    check-cast p4, Lcom/discord/models/domain/ModelGuild;
+    check-cast p4, Ljava/util/List;
 
-    sget-object v0, Lcom/discord/stores/ReadyPayloadUtils;->INSTANCE:Lcom/discord/stores/ReadyPayloadUtils;
+    if-eqz p4, :cond_6
 
-    const-string v1, "guild"
+    const/16 v4, 0xa
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    invoke-virtual {v0, p4}, Lcom/discord/stores/ReadyPayloadUtils;->hydrateGuild(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
+    move-result v4
+
+    invoke-static {v4}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v4
+
+    const/16 v5, 0x10
+
+    if-ge v4, v5, :cond_5
+
+    const/16 v4, 0x10
+
+    :cond_5
+    new-instance v5, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v5, v4}, Ljava/util/LinkedHashMap;-><init>(I)V
+
+    invoke-interface {p4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p4
+
+    :goto_5
+    invoke-interface {p4}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_7
+
+    invoke-interface {p4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    move-object v6, v4
+
+    check-cast v6, Lcom/discord/models/domain/ModelGuildMember;
+
+    const-string v7, "member"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelGuildMember;->getId()J
+
+    move-result-wide v6
+
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v6
+
+    invoke-interface {v5, v6, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_5
+
+    :cond_6
+    move-object v5, v2
+
+    :cond_7
+    sget-object p4, Lcom/discord/stores/ReadyPayloadUtils;->INSTANCE:Lcom/discord/stores/ReadyPayloadUtils;
+
+    const-string v4, "guild"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4, v0, v3, v5}, Lcom/discord/stores/ReadyPayloadUtils;->hydrateGuild(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/util/Map;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
 
     move-result-object p4
 
     instance-of v0, p4, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_8
 
     check-cast p4, Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult$Success;
 
@@ -492,14 +683,21 @@
 
     invoke-virtual {p2, p4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto :goto_4
+    move p4, v1
 
-    :cond_4
+    goto :goto_3
+
+    :cond_8
     sget-object p1, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Error;->INSTANCE:Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Error;
 
     return-object p1
 
-    :cond_5
+    :cond_9
+    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
+
+    throw v2
+
+    :cond_a
     new-instance p3, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;
 
     invoke-virtual {p1, p2}, Lcom/discord/models/domain/ModelPayload;->withGuilds(Ljava/util/List;)Lcom/discord/models/domain/ModelPayload;
@@ -508,37 +706,399 @@
 
     const-string p2, "payload.withGuilds(guilds)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p3, p1}, Lcom/discord/stores/ReadyPayloadUtils$HydrateResult$Success;-><init>(Lcom/discord/models/domain/ModelPayload;)V
 
     return-object p3
+.end method
+
+.method public final hydrateUsers(Lcom/discord/models/domain/ModelPayload;)Lcom/discord/models/domain/ModelPayload;
+    .locals 12
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getUsers()Ljava/util/List;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_d
+
+    const/16 v1, 0xa
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v2
+
+    invoke-static {v2}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v2
+
+    const/16 v3, 0x10
+
+    if-ge v2, v3, :cond_0
+
+    const/16 v2, 0x10
+
+    :cond_0
+    new-instance v3, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v3, v2}, Ljava/util/LinkedHashMap;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    move-object v4, v2
+
+    check-cast v4, Lcom/discord/models/domain/ModelUser;
+
+    const-string/jumbo v5, "user"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v4
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    invoke-interface {v3, v4, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getRelationships()Ljava/util/List;
+
+    move-result-object v0
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_3
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v5
+
+    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/models/domain/ModelUserRelationship;
+
+    invoke-virtual {v5, v3}, Lcom/discord/models/domain/ModelUserRelationship;->hydrate(Ljava/util/Map;)Lcom/discord/models/domain/ModelUserRelationship;
+
+    move-result-object v5
+
+    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_2
+    move-object v7, v4
+
+    goto :goto_2
+
+    :cond_3
+    move-object v7, v2
+
+    :goto_2
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getPrivateChannels()Ljava/util/List;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v5
+
+    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_3
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_4
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v5, v3}, Lcom/discord/models/domain/ModelChannel;->hydrateUsers(Ljava/util/Map;)Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v5
+
+    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_3
+
+    :cond_4
+    move-object v8, v4
+
+    goto :goto_4
+
+    :cond_5
+    move-object v8, v2
+
+    :goto_4
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuildPresences()Ljava/util/List;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_8
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v5
+
+    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_5
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_7
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/util/List;
+
+    const-string v6, "guildPresences"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v6, Ljava/util/ArrayList;
+
+    invoke-static {v5, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v9
+
+    invoke-direct {v6, v9}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v5
+
+    :goto_6
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_6
+
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v9, v3}, Lcom/discord/models/domain/ModelPresence;->hydrate(Ljava/util/Map;)Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object v9
+
+    invoke-interface {v6, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_6
 
     :cond_6
-    const-string p1, "storeEmojiCustom"
+    invoke-interface {v4, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    goto :goto_5
 
     :cond_7
-    const-string p1, "storeChannels"
+    move-object v9, v4
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    goto :goto_7
 
     :cond_8
-    const-string p1, "storeGuilds"
+    move-object v9, v2
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :goto_7
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getPresences()Ljava/util/List;
 
-    throw v0
+    move-result-object v0
+
+    if-eqz v0, :cond_a
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v5
+
+    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_8
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_9
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v5, v3}, Lcom/discord/models/domain/ModelPresence;->hydrate(Ljava/util/Map;)Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object v5
+
+    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_8
 
     :cond_9
-    const-string p1, "payload"
+    move-object v11, v4
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    goto :goto_9
 
-    throw v0
+    :cond_a
+    move-object v11, v2
+
+    :goto_9
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuildMembers()Ljava/util/List;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_c
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v4
+
+    invoke-direct {v2, v4}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_a
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_c
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/util/List;
+
+    const-string v5, "members"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Ljava/util/ArrayList;
+
+    invoke-static {v4, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v6
+
+    invoke-direct {v5, v6}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v4
+
+    :goto_b
+    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_b
+
+    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Lcom/discord/models/domain/ModelGuildMember;
+
+    invoke-virtual {v6, v3}, Lcom/discord/models/domain/ModelGuildMember;->hydrate(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuildMember;
+
+    move-result-object v6
+
+    invoke-interface {v5, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_b
+
+    :cond_b
+    invoke-interface {v2, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_a
+
+    :cond_c
+    move-object v10, v2
+
+    move-object v6, p1
+
+    invoke-virtual/range {v6 .. v11}, Lcom/discord/models/domain/ModelPayload;->withHydratedUserData(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;)Lcom/discord/models/domain/ModelPayload;
+
+    move-result-object p1
+
+    const-string v0, "payload.withHydratedUser\u2026Members, friendPresences)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_d
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/RtcLatencyTestResult.smali b/com.discord/smali/com/discord/stores/RtcLatencyTestResult.smali
new file mode 100644
index 0000000000..c77ad93c37
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/RtcLatencyTestResult.smali
@@ -0,0 +1,388 @@
+.class public final Lcom/discord/stores/RtcLatencyTestResult;
+.super Ljava/lang/Object;
+.source "StoreRtcRegion.kt"
+
+
+# instance fields
+.field public final geoRankedRegions:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final lastTestTimestampMs:J
+
+.field public final latencyRankedRegions:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 7
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const-wide/16 v3, 0x0
+
+    const/4 v5, 0x7
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/RtcLatencyTestResult;-><init>(Ljava/util/List;Ljava/util/List;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/List;Ljava/util/List;J)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;J)V"
+        }
+    .end annotation
+
+    const-string v0, "latencyRankedRegions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "geoRankedRegions"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    iput-object p2, p0, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    iput-wide p3, p0, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/List;Ljava/util/List;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    and-int/lit8 p6, p5, 0x1
+
+    if-eqz p6, :cond_0
+
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
+
+    :cond_0
+    and-int/lit8 p6, p5, 0x2
+
+    if-eqz p6, :cond_1
+
+    sget-object p2, Lk0/j/n;->d:Lk0/j/n;
+
+    :cond_1
+    and-int/lit8 p5, p5, 0x4
+
+    if-eqz p5, :cond_2
+
+    const-wide/16 p3, 0x0
+
+    :cond_2
+    invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/stores/RtcLatencyTestResult;-><init>(Ljava/util/List;Ljava/util/List;J)V
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/stores/RtcLatencyTestResult;Ljava/util/List;Ljava/util/List;JILjava/lang/Object;)Lcom/discord/stores/RtcLatencyTestResult;
+    .locals 0
+
+    and-int/lit8 p6, p5, 0x1
+
+    if-eqz p6, :cond_0
+
+    iget-object p1, p0, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    :cond_0
+    and-int/lit8 p6, p5, 0x2
+
+    if-eqz p6, :cond_1
+
+    iget-object p2, p0, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    :cond_1
+    and-int/lit8 p5, p5, 0x4
+
+    if-eqz p5, :cond_2
+
+    iget-wide p3, p0, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/RtcLatencyTestResult;->copy(Ljava/util/List;Ljava/util/List;J)Lcom/discord/stores/RtcLatencyTestResult;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final component3()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    return-wide v0
+.end method
+
+.method public final copy(Ljava/util/List;Ljava/util/List;J)Lcom/discord/stores/RtcLatencyTestResult;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;J)",
+            "Lcom/discord/stores/RtcLatencyTestResult;"
+        }
+    .end annotation
+
+    const-string v0, "latencyRankedRegions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "geoRankedRegions"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/stores/RtcLatencyTestResult;
+
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/stores/RtcLatencyTestResult;-><init>(Ljava/util/List;Ljava/util/List;J)V
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/stores/RtcLatencyTestResult;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/stores/RtcLatencyTestResult;
+
+    iget-object v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    iget-object v1, p1, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    iget-object v1, p1, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-wide v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    iget-wide v2, p1, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    cmp-long p1, v0, v2
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getGeoRankedRegions()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final getLastTestTimestampMs()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    return-wide v0
+.end method
+
+.method public final getLatencyRankedRegions()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_1
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v1, p0, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    invoke-static {v1, v2}, Ld;->a(J)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 4
+
+    const-string v0, "RtcLatencyTestResult(latencyRankedRegions="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/RtcLatencyTestResult;->latencyRankedRegions:Ljava/util/List;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", geoRankedRegions="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/RtcLatencyTestResult;->geoRankedRegions:Ljava/util/List;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", lastTestTimestampMs="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Lcom/discord/stores/RtcLatencyTestResult;->lastTestTimestampMs:J
+
+    const-string v3, ")"
+
+    invoke-static {v0, v1, v2, v3}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2.smali
index f491095c70..774c81de3e 100644
--- a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2.smali
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SlowTtiExperimentManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/stores/SlowTtiExperimentManager;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$fetchExperiment$1.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$fetchExperiment$1.smali
index 7a11f85db7..c51177d8a9 100644
--- a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$fetchExperiment$1.smali
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$fetchExperiment$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SlowTtiExperimentManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreExperiments$Experiment;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/stores/StoreExperiments$Experiment;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$1.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$1.smali
index df7d1f447c..19c2338b12 100644
--- a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$1.smali
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$1.smali
@@ -3,7 +3,7 @@
 .source "SlowTtiExperimentManager.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/stores/StoreExperiments$Experiment;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 0
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getRawExperiment()Lcom/discord/models/domain/ModelExperiment;
@@ -92,5 +76,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$2.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$2.smali
index 353d09d11f..ccc2e3fc23 100644
--- a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$2.smali
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$2.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "experiment"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/stores/SlowTtiExperimentManager;->access$writeExperimentToCache(Lcom/discord/stores/SlowTtiExperimentManager;Lcom/discord/stores/StoreExperiments$Experiment;)V
 
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager.smali
index 12841428e7..b27855174f 100644
--- a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager.smali
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager.smali
@@ -113,7 +113,7 @@
 
     sget-object v0, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -133,7 +133,7 @@
 
     const-string v0, "storeExperiments.getExpe\u2026che(experiment)\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -169,17 +169,19 @@
 
 # virtual methods
 .method public final fetchExperiment(Lcom/discord/stores/StoreExperiments;)V
-    .locals 9
+    .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeExperiments"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager;->observeExperiment(Lcom/discord/stores/StoreExperiments;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v1
 
-    const-class v1, Lcom/discord/stores/SlowTtiExperimentManager;
+    const-class v2, Lcom/discord/stores/SlowTtiExperimentManager;
 
-    const/4 v2, 0x0
+    sget-object v7, Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;
 
     const/4 v3, 0x0
 
@@ -187,24 +189,15 @@
 
     const/4 v5, 0x0
 
-    sget-object v6, Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;
+    const/4 v6, 0x0
 
-    const/16 v7, 0x1e
+    const/16 v8, 0x1e
 
-    const/4 v8, 0x0
+    const/4 v9, 0x0
 
-    invoke-static/range {v0 .. v8}, 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
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeExperiments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getDelayMs()J
diff --git a/com.discord/smali/com/discord/stores/Store.smali b/com.discord/smali/com/discord/stores/Store.smali
index c3874df5c9..8df95c6796 100644
--- a/com.discord/smali/com/discord/stores/Store.smali
+++ b/com.discord/smali/com/discord/stores/Store.smali
@@ -32,7 +32,7 @@
     :cond_0
     const-string v0, "prefs"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -51,7 +51,7 @@
     :cond_0
     const-string v0, "prefsSessionDurable"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -61,7 +61,9 @@
 .method public init(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
@@ -69,70 +71,47 @@
 
     const-string v1, "PreferenceManager.getDef\u2026haredPreferences(context)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/stores/Store;->prefs:Landroid/content/SharedPreferences;
 
-    const/4 v0, 0x0
+    const-string v0, "prefsSessionDurable"
 
-    const-string v1, "prefsSessionDurable"
+    const/4 v1, 0x0
 
-    invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
 
     move-result-object p1
 
     const-string v0, "context.getSharedPrefere\u2026e\", Context.MODE_PRIVATE)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/Store;->prefsSessionDurable:Landroid/content/SharedPreferences;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setPrefs(Landroid/content/SharedPreferences;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/Store;->prefs:Landroid/content/SharedPreferences;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setPrefsSessionDurable(Landroid/content/SharedPreferences;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/Store;->prefsSessionDurable:Landroid/content/SharedPreferences;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAccessibility$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreAccessibility$init$1$1.smali
index 7dec1475ff..c851f18d7b 100644
--- a/com.discord/smali/com/discord/stores/StoreAccessibility$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAccessibility$init$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAccessibility$init$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAccessibility.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAccessibility$init$1.smali b/com.discord/smali/com/discord/stores/StoreAccessibility$init$1.smali
index 3227c2022a..cc33bdfb49 100644
--- a/com.discord/smali/com/discord/stores/StoreAccessibility$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAccessibility$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAccessibility$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAccessibility.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/accessibility/AccessibilityState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/accessibility/AccessibilityState;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAccessibility$init$1;->this$0:Lcom/discord/stores/StoreAccessibility;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAccessibility$observeAccessibilityFeatures$1.smali b/com.discord/smali/com/discord/stores/StoreAccessibility$observeAccessibilityFeatures$1.smali
index d97164d94a..da4b008114 100644
--- a/com.discord/smali/com/discord/stores/StoreAccessibility$observeAccessibilityFeatures$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAccessibility$observeAccessibilityFeatures$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAccessibility$observeAccessibilityFeatures$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAccessibility.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/EnumSet<",
         "Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAccessibility$observeScreenreaderEnabled$1.smali b/com.discord/smali/com/discord/stores/StoreAccessibility$observeScreenreaderEnabled$1.smali
index df1a900e24..7a08092cb8 100644
--- a/com.discord/smali/com/discord/stores/StoreAccessibility$observeScreenreaderEnabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAccessibility$observeScreenreaderEnabled$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAccessibility$observeScreenreaderEnabled$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAccessibility.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAccessibility.smali b/com.discord/smali/com/discord/stores/StoreAccessibility.smali
index 865264bc53..b2fda0e246 100644
--- a/com.discord/smali/com/discord/stores/StoreAccessibility.smali
+++ b/com.discord/smali/com/discord/stores/StoreAccessibility.smali
@@ -43,15 +43,21 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/updates/ObservationDeck;Lcom/discord/utilities/accessibility/AccessibilityMonitor;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "userSettings"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "observationDeck"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "accessibilityMonitor"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreV2;-><init>()V
 
@@ -79,39 +85,11 @@
 
     const-string p2, "EnumSet.of(AccessibilityFeatureFlags.NONE)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreAccessibility;->accessibilityFeaturesSnapshot:Ljava/util/EnumSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "accessibilityMonitor"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "observationDeck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/updates/ObservationDeck;Lcom/discord/utilities/accessibility/AccessibilityMonitor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -271,7 +249,9 @@
 .method public init(Landroid/content/Context;)V
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreAccessibility;->accessibilityMonitor:Lcom/discord/utilities/accessibility/AccessibilityMonitor;
 
@@ -281,6 +261,10 @@
 
     const-class v1, Lcom/discord/stores/StoreAccessibility;
 
+    new-instance v6, Lcom/discord/stores/StoreAccessibility$init$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/stores/StoreAccessibility$init$1;-><init>(Lcom/discord/stores/StoreAccessibility;)V
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -289,10 +273,6 @@
 
     const/4 v5, 0x0
 
-    new-instance v6, Lcom/discord/stores/StoreAccessibility$init$1;
-
-    invoke-direct {v6, p0}, Lcom/discord/stores/StoreAccessibility$init$1;-><init>(Lcom/discord/stores/StoreAccessibility;)V
-
     const/16 v7, 0x1e
 
     const/4 v8, 0x0
@@ -300,15 +280,6 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final isScreenreaderEnabled()Z
@@ -446,7 +417,7 @@
     :cond_2
     const-string v1, "features"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/stores/StoreAccessibility;->accessibilityFeaturesSnapshot:Ljava/util/EnumSet;
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
index 4dbd34c803..c8215fa40f 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$ScreenViewed.smali
@@ -31,7 +31,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Class;J)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -42,7 +42,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "screen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,15 +53,6 @@
     iput-wide p2, p0, Lcom/discord/stores/StoreAnalytics$ScreenViewed;->timestamp:J
 
     return-void
-
-    :cond_0
-    const-string p1, "screen"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreAnalytics$ScreenViewed;Ljava/lang/Class;JILjava/lang/Object;)Lcom/discord/stores/StoreAnalytics$ScreenViewed;
@@ -126,22 +119,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "screen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreAnalytics$ScreenViewed;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreAnalytics$ScreenViewed;-><init>(Ljava/lang/Class;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "screen"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -159,7 +145,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAnalytics$ScreenViewed;->screen:Ljava/lang/Class;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1$1.smali
index 31f31a4e62..0a7ac6aeaa 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$ackMessage$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1.smali
index 4eba048d00..46d5e8a177 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$ackMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$ackMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$deepLinkReceived$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$deepLinkReceived$1.smali
index c30593556a..8dc1800170 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$deepLinkReceived$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$deepLinkReceived$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$deepLinkReceived$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_1
     invoke-virtual {v1, v2, v3, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->deepLinkReceived(Landroid/content/Intent;Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;Ljava/util/Map;)V
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali
index c3915f12d5..9640c90a44 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$init$1;->this$0:Lcom/discord/stores/StoreAnalytics;
 
@@ -72,13 +74,4 @@
     invoke-static {v0, p1}, Lcom/discord/stores/StoreAnalytics;->access$setInputMode$p(Lcom/discord/stores/StoreAnalytics;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali
index f97f167ef6..25f4a55b1a 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$init$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali
index 78a7d9f78d..e5444632a4 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAnalytics.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/stores/StoreAnalytics$ScreenViewed;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali
index a3c06aeddf..3ebc8a2ed6 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$3.smali
@@ -3,7 +3,7 @@
 .source "StoreAnalytics.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreAnalytics$ScreenViewed;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreAnalytics$ScreenViewed;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/stores/StoreAnalytics$ScreenViewed;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/stores/StoreAnalytics$ScreenViewed;",
             ">;"
         }
@@ -90,7 +93,7 @@
 
     const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -108,16 +111,16 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreAnalytics$init$3$1;-><init>(Lcom/discord/stores/StoreAnalytics$ScreenViewed;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali
index 06bf7cd26b..63353431a8 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$init$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreAnalytics$init$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreAnalytics$ScreenViewed;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreAnalytics;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreAnalytics;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onScreenViewed"
+
+    const-string v5, "onScreenViewed(Lcom/discord/stores/StoreAnalytics$ScreenViewed;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onScreenViewed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreAnalytics;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onScreenViewed(Lcom/discord/stores/StoreAnalytics$ScreenViewed;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/stores/StoreAnalytics$ScreenViewed;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreAnalytics;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreAnalytics;->access$onScreenViewed(Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreAnalytics$ScreenViewed;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$inviteSent$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$inviteSent$1.smali
index fb5f6da2e9..de015fd266 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$inviteSent$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$inviteSent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$inviteSent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -127,7 +127,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali
index 5d8928e428..3fc2897ff7 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$onGuildSettingsPaneViewed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$onNotificationSettingsUpdated$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$onNotificationSettingsUpdated$1.smali
index 3b1e9a107c..2bdda245e1 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onNotificationSettingsUpdated$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onNotificationSettingsUpdated$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$onNotificationSettingsUpdated$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     const-string v5, "notifSettings.channelOverrides"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
 
@@ -121,7 +121,7 @@
 
     const-string v8, "it"
 
-    invoke-static {v5, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getChannelId()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.smali
index 9609f37b6e..cfc920c443 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -89,7 +89,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     iget-boolean v1, p0, Lcom/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1;->$isActive:Z
@@ -112,7 +112,7 @@
 
     const-string v3, "it.guildId"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -127,7 +127,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_1
     invoke-static {v1, v0}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
@@ -153,7 +153,7 @@
     goto :goto_2
 
     :cond_2
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_2
     invoke-static {v0, v1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali
index 236fe158c3..688cb23c5a 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onScreenViewed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$onScreenViewed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -108,7 +108,7 @@
     :cond_1
     const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -121,7 +121,7 @@
     :cond_2
     const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -134,7 +134,7 @@
     :cond_3
     const-class v1, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -157,7 +157,7 @@
 
     const-string v1, "screenViewed.screen.simpleName"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     sget-object v1, Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;->Companion:Lcom/discord/utilities/analytics/AppStartAnalyticsTracker$Companion;
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1.smali
index 4328fbd592..9f325428f8 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     iget-object v2, p0, Lcom/discord/stores/StoreAnalytics$onUserSettingsPaneViewed$1;->$pane:Ljava/lang/String;
 
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
index ef256c52c2..dbc8de8f66 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -66,7 +66,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -84,135 +84,129 @@
 .end method
 
 .method public final invoke()V
-    .locals 17
+    .locals 15
 
-    move-object/from16 v0, p0
+    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
 
-    iget-object v1, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+    invoke-static {v0}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
 
-    invoke-static {v1}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+    move-result-object v0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+    move-result-object v0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
+    move-result-object v0
 
-    move-result-object v1
+    if-eqz v0, :cond_1
 
-    if-eqz v1, :cond_1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    move-result-wide v2
 
-    move-result-wide v3
+    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
 
-    iget-object v1, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+    invoke-static {v0}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
 
-    invoke-static {v1}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+    move-result-object v0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getChannels$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannels;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getChannels$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannels;
+    move-result-object v0
 
-    move-result-object v1
+    iget-wide v4, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$channelId:J
 
-    iget-wide v5, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$channelId:J
+    invoke-virtual {v0, v4, v5}, Lcom/discord/stores/StoreChannels;->getBlocking$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {v1, v5, v6}, Lcom/discord/stores/StoreChannels;->getBlocking$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
+    move-result-object v5
+
+    if-eqz v5, :cond_1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    iget-object v4, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$rtcConnectionId:Ljava/lang/String;
+
+    iget-object v6, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+
+    invoke-static {v6}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
 
     move-result-object v6
 
-    if-eqz v6, :cond_1
+    invoke-virtual {v6}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates;
 
-    iget-object v1, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+    move-result-object v6
 
-    invoke-static {v1}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+    invoke-virtual {v6}, Lcom/discord/stores/StoreVoiceStates;->getMediaStatesBlocking()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v6
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
-
-    iget-object v5, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$rtcConnectionId:Ljava/lang/String;
-
-    iget-object v7, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
-
-    invoke-static {v7}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates;
+    invoke-interface {v6, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v6
 
-    invoke-virtual {v7}, Lcom/discord/stores/StoreVoiceStates;->getMediaStatesBlocking()Ljava/util/Map;
+    check-cast v6, Ljava/util/Map;
 
-    move-result-object v7
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v8
-
-    invoke-interface {v7, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Ljava/util/Map;
-
-    if-eqz v7, :cond_0
+    if-eqz v6, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v7, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v6, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
-    iget-object v8, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$duration:Ljava/lang/Long;
+    iget-object v7, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$duration:Ljava/lang/Long;
 
-    iget-object v9, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$mediaSessionId:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$mediaSessionId:Ljava/lang/String;
 
-    iget-object v10, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$feedbackRating:Lcom/discord/widgets/voice/feedback/FeedbackRating;
+    iget-object v9, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$feedbackRating:Lcom/discord/widgets/voice/feedback/FeedbackRating;
 
-    iget-object v11, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonCode:Ljava/lang/Integer;
+    iget-object v10, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonCode:Ljava/lang/Integer;
 
-    iget-object v12, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonDescription:Ljava/lang/String;
+    iget-object v11, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonDescription:Ljava/lang/String;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfigurationBlocking()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfigurationBlocking()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v12
+
+    iget-object v13, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+
+    invoke-static {v13}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
 
     move-result-object v13
 
-    iget-object v14, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+    invoke-virtual {v13}, Lcom/discord/stores/StoreStream;->getAudioDevices$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices;
 
-    invoke-static {v14}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+    move-result-object v13
 
-    move-result-object v14
+    invoke-virtual {v13}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    invoke-virtual {v14}, Lcom/discord/stores/StoreStream;->getAudioDevices$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices;
+    move-result-object v13
 
-    move-result-object v14
+    invoke-virtual {v13}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    invoke-virtual {v14}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+    move-result-object v13
 
-    move-result-object v14
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getVideoHardwareScalingBlocking()Z
 
-    invoke-virtual {v14}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+    move-result v14
 
-    move-result-object v14
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getVideoHardwareScalingBlocking()Z
-
-    move-result v15
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getAudioModeBlocking()I
-
-    move-result v16
-
-    invoke-virtual/range {v2 .. v16}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZI)V
+    invoke-virtual/range {v1 .. v14}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;Z)V
 
     :cond_1
     return-void
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.smali
index be612ebd24..9c1efe7709 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -49,7 +49,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackFailedMessageResolved$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackFailedMessageResolved$1.smali
index d335ab0161..d43d972c65 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackFailedMessageResolved$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackFailedMessageResolved$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackFailedMessageResolved$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -74,7 +74,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -125,7 +125,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     move-object v11, v0
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1.smali
index 95c4efd0a0..6af6170379 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -66,7 +66,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -125,7 +125,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     move-object v9, v0
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackGuildViewed$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackGuildViewed$1.smali
index 4b469554f4..56043642a1 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackGuildViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackGuildViewed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackGuildViewed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,10 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
+        "+",
         "Ljava/lang/Object;",
         ">;>;"
     }
@@ -44,7 +45,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali
index 6a3179c671..d292d957ab 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackOpenGiftAcceptModal$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultSelected$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultSelected$1.smali
index 4cf29b3d59..39ee85bb5e 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultSelected$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultSelected$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackSearchResultSelected$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-virtual {v1, v2, v3, v4, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->searchResultSelected(Lcom/discord/utilities/analytics/SearchType;ILcom/discord/utilities/analytics/SourceObject;Ljava/util/Map;)V
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultViewed$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultViewed$1.smali
index b0306087f0..60bd2f002d 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultViewed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchResultViewed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackSearchResultViewed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -95,7 +95,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-virtual {v1, v2, v3, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->searchResultViewed(Lcom/discord/utilities/analytics/SearchType;ILjava/util/Map;)V
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchStarted$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchStarted$1.smali
index 01103d6c4d..4005e86f21 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchStarted$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackSearchStarted$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackSearchStarted$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -89,7 +89,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-virtual {v1, v2, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->searchStart(Lcom/discord/utilities/analytics/SearchType;Ljava/util/Map;)V
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.smali
index c64c32d22a..2e1b24b6a6 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionFailure$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionFailure$1.smali
index b1ce8ede4a..c14a40b9ec 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionFailure$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionFailure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackVoiceConnectionFailure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreRtcRegion;->getCloudflareBestRegion$app_productionDiscordExternalRelease()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreRtcRegion;->getPreferredRegion()Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1$1.smali
index d7b5f7070d..840ad97bc9 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "audioInfo"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -85,20 +87,11 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreRtcRegion;->getCloudflareBestRegion$app_productionDiscordExternalRelease()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreRtcRegion;->getPreferredRegion()Ljava/lang/String;
 
     move-result-object v1
 
     invoke-virtual {v0, v2, p1, v3, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->voiceConnectionSuccess(Ljava/util/Map;Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "audioInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1.smali
index a33e254064..c865c5ce04 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackVoiceConnectionSuccess$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->d()Lrx/Observable;
+    invoke-interface {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->e()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceDisconnect$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceDisconnect$1.smali
index d79b545c0b..7f4a0977a2 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceDisconnect$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackVoiceDisconnect$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAnalytics$trackVoiceDisconnect$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAnalytics.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreRtcRegion;->getCloudflareBestRegion$app_productionDiscordExternalRelease()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/discord/stores/StoreRtcRegion;->getPreferredRegion()Ljava/lang/String;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics.smali b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
index 29424169a1..86bc6e18dd 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
@@ -45,13 +45,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stores"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -76,27 +80,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreAnalytics;->screenViewedSubject:Lrx/subjects/PublishSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stores"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getChannelProperties(Lcom/discord/stores/StoreAnalytics;Lcom/discord/models/domain/ModelChannel;Z)Ljava/util/Map;
@@ -321,7 +304,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_1
     invoke-static {v0, p1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
@@ -419,7 +402,7 @@
     :goto_0
     const-string v3, "stores.guildMemberCounts\u2026emberCounts[guildId] ?: 0"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
@@ -504,7 +487,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v4, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v4, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_3
     iget-object v3, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
@@ -872,7 +855,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -1185,7 +1168,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "screen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->screenViewedSubject:Lrx/subjects/PublishSubject;
 
@@ -1204,25 +1189,18 @@
     invoke-virtual {p1, v1}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "screen"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final deepLinkReceived(Landroid/content/Intent;Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "metadata"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1233,20 +1211,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "metadata"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleAuthToken(Ljava/lang/String;)V
@@ -1279,11 +1243,13 @@
 .end method
 
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getAnalyticsToken()Ljava/lang/String;
 
@@ -1294,15 +1260,6 @@
     invoke-direct {p0}, Lcom/discord/stores/StoreAnalytics;->updateTrackingData()V
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleFingerprint(Ljava/lang/String;)V
@@ -1332,7 +1289,7 @@
 
     const-string v1, "editor"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreAnalytics;->clock:Lcom/discord/utilities/time/Clock;
 
@@ -1363,77 +1320,70 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "speakingUsers"
 
-    iget-object v6, p0, Lcom/discord/stores/StoreAnalytics;->inputMode:Ljava/lang/String;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_1
+    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->inputMode:Ljava/lang/String;
+
+    if-eqz v0, :cond_1
 
     iget-object v7, p0, Lcom/discord/stores/StoreAnalytics;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
 
     if-eqz v7, :cond_1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
+    iget-object v1, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
 
-    move-result-object v0
+    move-result-object v1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v0
+    move-result-wide v1
 
     goto :goto_0
 
     :cond_0
-    const-wide/16 v0, 0x0
+    const-wide/16 v1, 0x0
 
     :goto_0
-    move-wide v8, v0
+    move-wide v8, v1
 
-    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    move-wide v1, v8
+    move-wide v2, v8
 
-    move-object v3, p1
+    move-object v4, p1
 
-    move-object v4, v6
+    move-object v5, v0
 
-    move-object v5, v7
+    move-object v6, v7
 
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->userSpeaking(JLjava/util/Set;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)V
+    invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/analytics/AnalyticsTracker;->userSpeaking(JLjava/util/Set;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)V
 
-    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->userListening(JLjava/util/Set;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)V
+    invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/analytics/AnalyticsTracker;->userListening(JLjava/util/Set;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "speakingUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleVideoInputDeviceSelected(Lco/discord/media_engine/VideoInputDeviceDescription;)V
-    .locals 6
+    .locals 7
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
     iget-object v3, p0, Lcom/discord/stores/StoreAnalytics;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
 
-    if-eqz v3, :cond_2
+    if-eqz v3, :cond_3
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -1441,7 +1391,7 @@
 
     const-string v1, "selectedVoiceChannel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -1472,7 +1422,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     move-object v4, v0
@@ -1503,18 +1453,44 @@
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    move-object v5, p1
+    iget-object v5, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
 
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->videoInputDeviceSelected(JLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;)V
+    invoke-virtual {v5}, Lcom/discord/stores/StoreStream;->getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreRtcConnection;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Lcom/discord/stores/StoreRtcConnection;->getRtcConnectionAnalyticsInfo()Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_2
+
+    invoke-virtual {v5}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->getMediaSessionId()Ljava/lang/String;
+
+    move-result-object v5
+
+    goto :goto_2
 
     :cond_2
+    const/4 v5, 0x0
+
+    :goto_2
+    move-object v6, v5
+
+    move-object v5, p1
+
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/utilities/analytics/AnalyticsTracker;->videoInputDeviceSelected(JLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;)V
+
+    :cond_3
     return-void
 .end method
 
 .method public init(Landroid/content/Context;)V
-    .locals 14
+    .locals 11
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -1534,22 +1510,10 @@
 
     const-class v1, Lcom/discord/stores/StoreAnalytics;
 
-    const/4 p1, 0x0
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
     new-instance v6, Lcom/discord/stores/StoreAnalytics$init$1;
 
     invoke-direct {v6, p0}, Lcom/discord/stores/StoreAnalytics$init$1;-><init>(Lcom/discord/stores/StoreAnalytics;)V
 
-    const/16 v12, 0x1e
-
-    const/4 v13, 0x0
-
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -1564,45 +1528,33 @@
 
     invoke-static/range {v0 .. v8}, 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
 
-    iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
+    iget-object p1, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getVoiceChannelSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceChannelSelected;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream;->getVoiceChannelSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->get()Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceChannelSelected;->get()Lrx/Observable;
+    const-class v1, Lcom/discord/stores/StoreAnalytics;
 
-    move-result-object v0
+    new-instance v6, Lcom/discord/stores/StoreAnalytics$init$2;
 
-    invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+    invoke-direct {v6, p0}, Lcom/discord/stores/StoreAnalytics$init$2;-><init>(Lcom/discord/stores/StoreAnalytics;)V
 
-    move-result-object v2
-
-    const-class v3, Lcom/discord/stores/StoreAnalytics;
-
-    new-instance v8, Lcom/discord/stores/StoreAnalytics$init$2;
-
-    invoke-direct {v8, p0}, Lcom/discord/stores/StoreAnalytics$init$2;-><init>(Lcom/discord/stores/StoreAnalytics;)V
-
-    move-object v4, p1
-
-    move-object v5, v9
-
-    move-object v6, v10
-
-    move-object v7, v11
-
-    move v9, v12
-
-    move-object v10, v13
-
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, 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
 
     iget-object p1, p0, Lcom/discord/stores/StoreAnalytics;->screenViewedSubject:Lrx/subjects/PublishSubject;
 
     sget-object v0, Lcom/discord/stores/StoreAnalytics$init$3;->INSTANCE:Lcom/discord/stores/StoreAnalytics$init$3;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1612,13 +1564,13 @@
 
     move-result-object p1
 
-    sget-object v0, Lr0/l/a/u1$a;->a:Lr0/l/a/u1;
+    sget-object v0, Ls0/l/a/u1$a;->a:Ls0/l/a/u1;
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, p1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, p1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1626,22 +1578,18 @@
 
     const-string p1, "screenViewedSubject\n    \u2026       }\n        .first()"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreAnalytics;
 
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
     new-instance v8, Lcom/discord/stores/StoreAnalytics$init$4;
 
     invoke-direct {v8, p0}, Lcom/discord/stores/StoreAnalytics$init$4;-><init>(Lcom/discord/stores/StoreAnalytics;)V
 
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -1649,25 +1597,18 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final inviteSent(Lcom/discord/models/domain/ModelInvite;Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "location"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1678,26 +1619,14 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onGuildSettingsPaneViewed(Ljava/lang/String;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "pane"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1708,21 +1637,14 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "pane"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onNotificationSettingsUpdated(Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Long;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "notifSettings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1733,15 +1655,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "notifSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onOverlayVoiceEvent(Z)V
@@ -1761,7 +1674,9 @@
 .method public final onUserSettingsPaneViewed(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "pane"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1772,62 +1687,44 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "pane"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final trackCallReportProblem(JLjava/lang/String;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;)V
     .locals 13
 
-    if-eqz p6, :cond_0
+    const-string v0, "feedbackRating"
 
-    move-object v10, p0
+    move-object/from16 v8, p6
 
-    iget-object v11, v10, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v11, v0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     new-instance v12, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;
 
-    move-object v0, v12
+    move-object v1, v12
 
-    move-object v1, p0
+    move-object v2, p0
 
-    move-wide v2, p1
+    move-wide v3, p1
 
-    move-object/from16 v4, p3
+    move-object/from16 v5, p3
 
-    move-object/from16 v5, p4
+    move-object/from16 v6, p4
 
-    move-object/from16 v6, p5
+    move-object/from16 v7, p5
 
-    move-object/from16 v7, p6
+    move-object/from16 v9, p7
 
-    move-object/from16 v8, p7
+    move-object/from16 v10, p8
 
-    move-object/from16 v9, p8
-
-    invoke-direct/range {v0 .. v9}, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;-><init>(Lcom/discord/stores/StoreAnalytics;JLjava/lang/String;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;)V
+    invoke-direct/range {v1 .. v10}, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;-><init>(Lcom/discord/stores/StoreAnalytics;JLjava/lang/String;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;)V
 
     invoke-virtual {v11, v12}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    move-object v10, p0
-
-    const-string v0, "feedbackRating"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final trackChannelOpened(J)V
@@ -1862,120 +1759,95 @@
 .method public final trackChatInputComponentViewed(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->chatInputComponentViewed(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final trackFailedMessageResolved(IIIZZLcom/discord/stores/FailedMessageResolutionType;JIJ)V
     .locals 16
 
-    if-eqz p6, :cond_0
+    const-string v0, "resolutionType"
 
-    move-object/from16 v13, p0
+    move-object/from16 v10, p6
 
-    iget-object v14, v13, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v0, p0
+
+    iget-object v14, v0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     new-instance v15, Lcom/discord/stores/StoreAnalytics$trackFailedMessageResolved$1;
 
-    move-object v0, v15
+    move-object v1, v15
 
-    move-object/from16 v1, p0
+    move-object/from16 v2, p0
 
-    move-wide/from16 v2, p10
+    move-wide/from16 v3, p10
 
-    move/from16 v4, p1
+    move/from16 v5, p1
 
-    move/from16 v5, p2
+    move/from16 v6, p2
 
-    move/from16 v6, p3
+    move/from16 v7, p3
 
-    move/from16 v7, p4
+    move/from16 v8, p4
 
-    move/from16 v8, p5
+    move/from16 v9, p5
 
-    move-object/from16 v9, p6
+    move-wide/from16 v11, p7
 
-    move-wide/from16 v10, p7
+    move/from16 v13, p9
 
-    move/from16 v12, p9
-
-    invoke-direct/range {v0 .. v12}, Lcom/discord/stores/StoreAnalytics$trackFailedMessageResolved$1;-><init>(Lcom/discord/stores/StoreAnalytics;JIIIZZLcom/discord/stores/FailedMessageResolutionType;JI)V
+    invoke-direct/range {v1 .. v13}, Lcom/discord/stores/StoreAnalytics$trackFailedMessageResolved$1;-><init>(Lcom/discord/stores/StoreAnalytics;JIIIZZLcom/discord/stores/FailedMessageResolutionType;JI)V
 
     invoke-virtual {v14, v15}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    move-object/from16 v13, p0
-
-    const-string v0, "resolutionType"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final trackFileUploadAlertViewed(Lcom/discord/utilities/rest/FileUploadAlertType;IIIZZZ)V
     .locals 12
 
-    if-eqz p1, :cond_0
+    const-string v0, "alertType"
 
-    move-object v9, p0
+    move-object v3, p1
 
-    iget-object v10, v9, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v10, v0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     new-instance v11, Lcom/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1;
 
-    move-object v0, v11
+    move-object v1, v11
 
-    move-object v1, p0
+    move-object v2, p0
 
-    move-object v2, p1
+    move v4, p2
 
-    move v3, p2
+    move v5, p3
 
-    move v4, p3
+    move/from16 v6, p4
 
-    move/from16 v5, p4
+    move/from16 v7, p5
 
-    move/from16 v6, p5
+    move/from16 v8, p6
 
-    move/from16 v7, p6
+    move/from16 v9, p7
 
-    move/from16 v8, p7
-
-    invoke-direct/range {v0 .. v8}, Lcom/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1;-><init>(Lcom/discord/stores/StoreAnalytics;Lcom/discord/utilities/rest/FileUploadAlertType;IIIZZZ)V
+    invoke-direct/range {v1 .. v9}, Lcom/discord/stores/StoreAnalytics$trackFileUploadAlertViewed$1;-><init>(Lcom/discord/stores/StoreAnalytics;Lcom/discord/utilities/rest/FileUploadAlertType;IIIZZZ)V
 
     invoke-virtual {v10, v11}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    move-object v9, p0
-
-    const-string v0, "alertType"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final trackGuildProfileOpened(J)V
@@ -2007,11 +1879,13 @@
 .method public final trackOpenGiftAcceptModal(Ljava/lang/String;Ljava/lang/String;J)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "giftCode"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "location"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -2032,30 +1906,18 @@
     invoke-virtual {v0, v7}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final trackSearchResultSelected(Lcom/discord/utilities/analytics/SearchType;ILcom/discord/utilities/analytics/SourceObject;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "searchType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "sourceObject"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -2066,26 +1928,14 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "sourceObject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final trackSearchResultViewed(Lcom/discord/utilities/analytics/SearchType;I)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -2096,21 +1946,14 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final trackSearchStarted(Lcom/discord/utilities/analytics/SearchType;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -2121,15 +1964,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final trackShowCallFeedbackSheet(J)V
@@ -2147,7 +1981,7 @@
 .end method
 
 .method public final trackVideoStreamEnded(Ljava/util/Map;)V
-    .locals 8
+    .locals 9
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -2161,79 +1995,81 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "properties"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "sender_user_id"
+    const-string v0, "sender_user_id"
 
-    invoke-interface {p1, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Ljava/lang/Long;
+    instance-of v1, v0, Ljava/lang/Long;
 
-    if-nez v2, :cond_0
+    const/4 v2, 0x0
 
-    move-object v1, v0
+    if-nez v1, :cond_0
+
+    move-object v0, v2
 
     :cond_0
-    check-cast v1, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/Long;
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v4
 
-    const-string v1, "channel_id"
+    const-string v0, "channel_id"
 
-    invoke-interface {p1, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Ljava/lang/Long;
+    instance-of v1, v0, Ljava/lang/Long;
 
-    if-nez v2, :cond_1
+    if-nez v1, :cond_1
 
-    move-object v1, v0
+    move-object v0, v2
 
     :cond_1
-    check-cast v1, Ljava/lang/Long;
+    check-cast v0, Ljava/lang/Long;
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v6
 
-    const-string v1, "guild_id"
+    const-string v0, "guild_id"
 
-    invoke-interface {p1, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Ljava/lang/Long;
+    instance-of v1, v0, Ljava/lang/Long;
 
-    if-nez v2, :cond_2
+    if-nez v1, :cond_2
 
     goto :goto_0
 
     :cond_2
-    move-object v0, v1
+    move-object v2, v0
 
     :goto_0
-    move-object v7, v0
+    move-object v8, v2
 
-    check-cast v7, Ljava/lang/Long;
+    check-cast v8, Ljava/lang/Long;
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getApplicationStreaming$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual/range {v2 .. v7}, Lcom/discord/stores/StoreApplicationStreaming;->getMaxViewersForStream(JJLjava/lang/Long;)Ljava/lang/Integer;
+    invoke-virtual/range {v3 .. v8}, Lcom/discord/stores/StoreApplicationStreaming;->getMaxViewersForStream(JJLjava/lang/Long;)Ljava/lang/Integer;
 
     move-result-object v0
 
@@ -2250,13 +2086,6 @@
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final trackVoiceConnectionFailure(Ljava/util/Map;)V
@@ -2271,7 +2100,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -2282,15 +2113,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final trackVoiceConnectionSuccess(Ljava/util/Map;)V
@@ -2305,7 +2127,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -2316,15 +2140,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final trackVoiceDisconnect(Ljava/util/Map;)V
@@ -2339,7 +2154,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAnalytics;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -2350,13 +2167,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali b/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali
index c22f8b979c..07caff6cde 100644
--- a/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAndroidPackages$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAndroidPackages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,9 +68,9 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreAndroidPackages$1$1;->$weakRef:Ljava/lang/ref/WeakReference;
 
-    const-string v2, "weakRef"
+    const-string/jumbo v2, "weakRef"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreAndroidPackages;->access$handleGetInstallPackages(Lcom/discord/stores/StoreAndroidPackages;Ljava/lang/ref/WeakReference;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali b/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
index a609f9814e..f739348f2c 100644
--- a/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
+++ b/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
@@ -33,13 +33,15 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreAndroidPackages;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -53,9 +55,9 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreAndroidPackages;->updateSubject:Lrx/subjects/PublishSubject;
 
-    const-string v0, "updateSubject"
+    const-string/jumbo v0, "updateSubject"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x5
 
@@ -72,15 +74,6 @@
     invoke-virtual {p1, v0}, Lrx/Observable;->R(Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$handleGetInstallPackages(Lcom/discord/stores/StoreAndroidPackages;Ljava/lang/ref/WeakReference;)V
@@ -113,9 +106,9 @@
 
     if-eqz p1, :cond_7
 
-    const-string v0, "weakPackageManager.get() ?: return"
+    const-string/jumbo v0, "weakPackageManager.get() ?: return"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
@@ -130,7 +123,11 @@
 
     const-string v1, "installedPackages"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "allPackages"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -162,7 +159,7 @@
 
     const/4 v7, 0x1
 
-    invoke-static {v5, v6, v7}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v5, v6, v7}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v5
 
@@ -172,7 +169,7 @@
 
     const-string v5, "com.samsung.android.game.gamehome"
 
-    invoke-static {v4, v5, v7}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v4, v5, v7}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v4
 
@@ -222,7 +219,7 @@
 
     const-string v5, "it.applicationInfo"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4, v3}, Lcom/discord/utilities/games/GameDetectionHelper;->isSystemApp(Landroid/content/pm/ApplicationInfo;)Z
 
@@ -246,7 +243,7 @@
     goto :goto_3
 
     :cond_6
-    invoke-static {v0, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -303,7 +300,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAndroidPackages;->updateSubject:Lrx/subjects/PublishSubject;
 
@@ -323,16 +322,7 @@
 
     const-string v0, "installedPackagesSubject.distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1$1.smali
index 94c5bad142..cf1d738b70 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1.smali
index cd30c15e20..f7a238983e 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "results"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$1;->this$0:Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1;
 
@@ -89,13 +91,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "results"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2$1.smali
index b95514dc34..4fd7decfa8 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2.smali b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2.smali
index 50161aee8b..1cb30146be 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1$2;->this$0:Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1;
 
@@ -78,13 +80,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1.smali b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1.smali
index 650adf0c1a..d2d4f1e61a 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication$fetchIfNonexisting$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplication$fetchIfNonexisting$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplication$get$1.smali b/com.discord/smali/com/discord/stores/StoreApplication$get$1.smali
index e9187ea929..98a6f82e7f 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelApplication;",
+        ">;",
+        "Lcom/discord/models/domain/ModelApplication;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplication.smali b/com.discord/smali/com/discord/stores/StoreApplication.smali
index 94b888e92f..d41962f556 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication.smali
@@ -89,9 +89,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -110,15 +112,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreApplication;->applicationSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$clearSentinel(Lcom/discord/stores/StoreApplication;J)V
@@ -200,7 +193,7 @@
 
     sget-object v2, Lcom/discord/stores/StoreApplication;->LOADING_SENTINEL:Lcom/discord/models/domain/ModelApplication;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -286,13 +279,13 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(null)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -309,7 +302,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreApplication$get$1;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -319,7 +312,7 @@
 
     const-string v0, "applicationSubject\n     \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1.smali
index 3991a7b957..b5e2c67b4a 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplicationStreamPreviews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2$1.smali
index a2790d34ee..673c69de92 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplicationStreamPreviews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2.smali
index 31ab7ccb9e..f37580abd7 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplicationStreamPreviews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelApplicationStreamPreview;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3$1.smali
index 0e16109169..682678929a 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplicationStreamPreviews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     const-string v3, "error.response"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error$Response;->getRetryAfterMs()Ljava/lang/Long;
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3.smali
index 2ba08a2e73..69b9609245 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplicationStreamPreviews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->INSTANCE:Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions.smali
index b7c947ec2a..5a6ddcc331 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$Actions.smali
@@ -57,7 +57,7 @@
     :cond_0
     const-string p0, "dispatcher"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -76,7 +76,7 @@
     :cond_0
     const-string p0, "store"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -102,25 +102,27 @@
 .method public static final fetchStreamPreview(Ljava/lang/String;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->dispatcher:Lcom/discord/stores/Dispatcher;
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    if-eqz v1, :cond_1
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
 
     new-instance v2, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1;
 
     invoke-direct {v2, p0}, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions$fetchStreamPreview$1;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v0, v2}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v0
 
     sget-object v2, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->clock:Lcom/discord/utilities/time/Clock;
 
@@ -128,9 +130,9 @@
 
     invoke-interface {v2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-virtual {v1, p0, v2, v3}, Lcom/discord/utilities/rest/RestAPI;->getStreamPreview(Ljava/lang/String;J)Lrx/Observable;
+    invoke-virtual {v0, p0, v1, v2}, Lcom/discord/utilities/rest/RestAPI;->getStreamPreview(Ljava/lang/String;J)Lrx/Observable;
 
     move-result-object v0
 
@@ -138,7 +140,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -148,7 +150,7 @@
 
     const-string v0, "RestAPI\n          .api\n \u2026ormers.restSubscribeOn())"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->INSTANCE:Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;
 
@@ -181,23 +183,16 @@
     :cond_0
     const-string p0, "clock"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
     const-string p0, "dispatcher"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_2
-    const-string p0, "streamKey"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 
@@ -205,13 +200,17 @@
 .method public final init(Lcom/discord/stores/StoreApplicationStreamPreviews;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "store"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->store:Lcom/discord/stores/StoreApplicationStreamPreviews;
 
@@ -220,25 +219,4 @@
     sput-object p3, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->clock:Lcom/discord/utilities/time/Clock;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "store"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved.smali
index ab0b509dff..36297aeb3c 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved.smali
@@ -102,7 +102,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;->url:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$get$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$get$1.smali
index eb67e97a7d..462c342c14 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreamPreviews.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;",
+        ">;",
+        "Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali
index 1d606eb3c3..f0987fcc1f 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali
@@ -18,9 +18,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/stores/StoreApplicationStreamPreviews$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final READ_PREVIEW_DEFAULT_RETRY:J = 0x2710L
 
@@ -85,11 +82,13 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "clock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -111,7 +110,7 @@
 
     const-string v0, "BehaviorSubject.create(HashMap())"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->previewsPublisher:Lrx/subjects/BehaviorSubject;
 
@@ -128,20 +127,6 @@
     invoke-virtual {p2, p0, p1, v0}, Lcom/discord/stores/StoreApplicationStreamPreviews$Actions;->init(Lcom/discord/stores/StoreApplicationStreamPreviews;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getClock$p(Lcom/discord/stores/StoreApplicationStreamPreviews;)Lcom/discord/utilities/time/Clock;
@@ -155,7 +140,7 @@
 
 # virtual methods
 .method public final get(Lcom/discord/models/domain/ModelApplicationStream;)Lrx/Observable;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -167,7 +152,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "applicationStream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
 
@@ -178,15 +165,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "applicationStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final get(Ljava/lang/String;)Lrx/Observable;
@@ -202,7 +180,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->previewsPublisher:Lrx/subjects/BehaviorSubject;
 
@@ -210,7 +190,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreApplicationStreamPreviews$get$1;-><init>(Lcom/discord/stores/StoreApplicationStreamPreviews;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -220,107 +200,97 @@
 
     const-string v0, "previewsPublisher\n      \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleFetchFailed(Ljava/lang/String;Ljava/lang/Long;)V
-    .locals 7
+    .locals 6
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->fetchAttempts:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->fetchAttempts:Ljava/util/HashMap;
 
-    invoke-virtual {v1, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Ljava/lang/Integer;
+    check-cast v0, Ljava/lang/Integer;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_0
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    const-string v1, "fetchAttempts[streamKey] ?: 0"
 
-    move-result v1
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x1
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    add-int/2addr v1, v2
+    move-result v0
+
+    const/4 v1, 0x1
+
+    add-int/2addr v0, v1
 
     if-eqz p2, :cond_1
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v2
 
     goto :goto_1
 
     :cond_1
-    const-wide/16 v3, 0x2710
+    const-wide/16 v2, 0x2710
 
-    int-to-long v5, v1
+    int-to-long v4, v0
 
-    mul-long v3, v3, v5
+    mul-long v2, v2, v4
 
     :goto_1
     iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->clock:Lcom/discord/utilities/time/Clock;
 
     invoke-interface {p2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v5
+    move-result-wide v4
 
-    add-long/2addr v5, v3
+    add-long/2addr v4, v2
 
     iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->previews:Ljava/util/HashMap;
 
-    new-instance v3, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;
+    new-instance v2, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;
 
-    invoke-direct {v3, v0, v5, v6}, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;-><init>(Ljava/lang/String;J)V
+    const/4 v3, 0x0
 
-    invoke-interface {p2, p1, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-direct {v2, v3, v4, v5}, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;-><init>(Ljava/lang/String;J)V
+
+    invoke-interface {p2, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->fetchAttempts:Ljava/util/HashMap;
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
     invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-boolean v2, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->isDirty:Z
+    iput-boolean v1, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleFetchStart(Ljava/lang/String;)V
@@ -328,7 +298,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->previews:Ljava/util/HashMap;
 
@@ -341,15 +313,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleFetchSuccess(Ljava/lang/String;Ljava/lang/String;)V
@@ -357,11 +320,13 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamKey"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->clock:Lcom/discord/utilities/time/Clock;
 
@@ -390,20 +355,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreApplicationStreamPreviews;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State$Companion.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State$Companion.smali
index f583334ffc..d1319c6eef 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State$Companion.smali
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method public final getWATCHING_STATES()Ljava/util/List;
+.method public final getACTIVE_STATES()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->access$getWATCHING_STATES$cp()Ljava/util/List;
+    invoke-static {}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->access$getACTIVE_STATES$cp()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali
index 098e2a4f55..775721538e 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali
@@ -33,24 +33,7 @@
 
 .field public static final enum ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
-.field public static final enum CONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-.field public static final Companion:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
-
-.field public static final enum DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-.field public static final enum ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-.field public static final enum LEFT:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-.field public static final enum PAUSED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-.field public static final enum RECONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-.field public static final WATCHING_STATES:Ljava/util/List;
+.field public static final ACTIVE_STATES:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -60,12 +43,24 @@
     .end annotation
 .end field
 
+.field public static final enum CONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+.field public static final Companion:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State$Companion;
+
+.field public static final enum DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+.field public static final enum ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+.field public static final enum PAUSED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+.field public static final enum RECONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
 
 # direct methods
 .method public static constructor <clinit>()V
     .locals 9
 
-    const/4 v0, 0x7
+    const/4 v0, 0x6
 
     new-array v0, v0, [Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
@@ -119,33 +114,21 @@
 
     new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
-    const-string v2, "LEFT"
+    const-string v2, "PAUSED"
 
     const/4 v7, 0x4
 
     invoke-direct {v1, v2, v7}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->LEFT:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->PAUSED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
     aput-object v1, v0, v7
 
     new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
-    const-string v2, "PAUSED"
-
-    const/4 v8, 0x5
-
-    invoke-direct {v1, v2, v8}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->PAUSED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    aput-object v1, v0, v8
-
-    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
     const-string v2, "DENIED_FULL"
 
-    const/4 v8, 0x6
+    const/4 v8, 0x5
 
     invoke-direct {v1, v2, v8}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;-><init>(Ljava/lang/String;I)V
 
@@ -185,7 +168,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->WATCHING_STATES:Ljava/util/List;
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE_STATES:Ljava/util/List;
 
     return-void
 .end method
@@ -203,10 +186,10 @@
     return-void
 .end method
 
-.method public static final synthetic access$getWATCHING_STATES$cp()Ljava/util/List;
+.method public static final synthetic access$getACTIVE_STATES$cp()Ljava/util/List;
     .locals 1
 
-    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->WATCHING_STATES:Ljava/util/List;
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE_STATES:Ljava/util/List;
 
     return-object v0
 .end method
@@ -241,10 +224,10 @@
 
 
 # virtual methods
-.method public final isUserWatching()Z
+.method public final isStreamActive()Z
     .locals 1
 
-    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->WATCHING_STATES:Ljava/util/List;
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE_STATES:Ljava/util/List;
 
     invoke-interface {v0, p0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali
index 5bc403cac8..33c8104484 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali
@@ -30,11 +30,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "state"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,20 +45,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
@@ -104,31 +92,19 @@
 .method public final copy(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "state"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;-><init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -146,7 +122,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->state:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -156,7 +132,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali
index 5386e13c80..0e9f6cf7be 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali
@@ -63,11 +63,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamsByUser"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "streamSpectators"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -78,20 +80,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
     return-void
-
-    :cond_0
-    const-string p1, "streamSpectators"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamsByUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreApplicationStreaming$State;Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$State;
@@ -192,31 +180,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamsByUser"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "streamSpectators"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$State;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreApplicationStreaming$State;-><init>(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "streamSpectators"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamsByUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -234,7 +210,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreApplicationStreaming$State;->streamsByUser:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -244,7 +220,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreApplicationStreaming$State;->streamSpectators:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -254,7 +230,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreApplicationStreaming$State;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$StreamViewerTracker.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$StreamViewerTracker.smali
index a1deb5eff5..d60001b8a0 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$StreamViewerTracker.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$StreamViewerTracker.smali
@@ -57,7 +57,9 @@
 .method public final getMaxViewers(Ljava/lang/String;)Ljava/lang/Integer;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$StreamViewerTracker;->maxViewersByStream:Ljava/util/Map;
 
@@ -68,21 +70,14 @@
     check-cast p1, Ljava/lang/Integer;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onStreamUpdated(Ljava/lang/String;I)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$StreamViewerTracker;->maxViewersByStream:Ljava/util/Map;
 
@@ -117,34 +112,18 @@
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final remove(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$StreamViewerTracker;->maxViewersByStream:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$createStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$createStream$1.smali
new file mode 100644
index 0000000000..0213783c49
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$createStream$1.smali
@@ -0,0 +1,262 @@
+.class public final Lcom/discord/stores/StoreApplicationStreaming$createStream$1;
+.super Lk0/o/c/j;
+.source "StoreApplicationStreaming.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->createStream(JLjava/lang/Long;Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $channelId:J
+
+.field public final synthetic $guildId:Ljava/lang/Long;
+
+.field public final synthetic $preferredRegion:Ljava/lang/String;
+
+.field public final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreApplicationStreaming;JLjava/lang/Long;Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$channelId:J
+
+    iput-object p4, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$guildId:Ljava/lang/Long;
+
+    iput-object p5, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$preferredRegion:Ljava/lang/String;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 9
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreApplicationStreaming;->access$getRtcConnectionStore$p(Lcom/discord/stores/StoreApplicationStreaming;)Lcom/discord/stores/StoreRtcConnection;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreRtcConnection;->getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_7
+
+    iget-wide v1, v0, Lcom/discord/rtcconnection/RtcConnection;->w:J
+
+    iget-wide v3, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$channelId:J
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_7
+
+    iget-object v0, v0, Lcom/discord/rtcconnection/RtcConnection;->v:Ljava/lang/Long;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$guildId:Ljava/lang/Long;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_0
+
+    goto/16 :goto_3
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreApplicationStreaming;->access$getUserStore$p(Lcom/discord/stores/StoreApplicationStreaming;)Lcom/discord/stores/StoreUser;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_7
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v7
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$guildId:Ljava/lang/Long;
+
+    if-eqz v0, :cond_1
+
+    new-instance v0, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
+
+    iget-object v2, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$guildId:Ljava/lang/Long;
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    iget-wide v5, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$channelId:J
+
+    move-object v2, v0
+
+    invoke-direct/range {v2 .. v8}, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;-><init>(JJJ)V
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Lcom/discord/models/domain/ModelApplicationStream$CallStream;
+
+    iget-wide v2, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$channelId:J
+
+    invoke-direct {v0, v2, v3, v7, v8}, Lcom/discord/models/domain/ModelApplicationStream$CallStream;-><init>(JJ)V
+
+    :goto_0
+    iget-object v2, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming;->getActiveApplicationStream$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_2
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v3
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v3, 0x0
+
+    :goto_1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v4
+
+    const/4 v5, 0x0
+
+    if-ne v3, v4, :cond_3
+
+    const/4 v3, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v3, 0x0
+
+    :goto_2
+    if-eqz v3, :cond_4
+
+    if-eqz v2, :cond_4
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_4
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isStreamActive()Z
+
+    move-result v3
+
+    if-ne v3, v1, :cond_4
+
+    const/4 v5, 0x1
+
+    :cond_4
+    if-eqz v5, :cond_5
+
+    return-void
+
+    :cond_5
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_6
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isStreamActive()Z
+
+    move-result v3
+
+    if-ne v3, v1, :cond_6
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Lcom/discord/stores/StoreApplicationStreaming;->access$stopStreamInternal(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
+
+    :cond_6
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-static {v1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStoreStream$p(Lcom/discord/stores/StoreApplicationStreaming;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-object v2, p0, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;->$preferredRegion:Ljava/lang/String;
+
+    invoke-virtual {v1, v0, v2}, Lcom/discord/stores/StoreStream;->streamCreate(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_7
+    :goto_3
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
index e6f90c8e99..ee3a193a7f 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreApplicationStreaming$State;",
+        "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getState$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getState$1.smali
index ff3f4b9114..f21a44b37c 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getState$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreApplicationStreaming$State;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/stores/StoreApplicationStreaming$State;",
             ">;"
         }
@@ -76,7 +79,7 @@
 
     const-string v0, "isInSpectatorExperiment"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -95,15 +98,15 @@
     :cond_0
     new-instance p1, Lcom/discord/stores/StoreApplicationStreaming$State;
 
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     const/4 v1, 0x0
 
     invoke-direct {p1, v0, v0, v1}, Lcom/discord/stores/StoreApplicationStreaming$State;-><init>(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsByUser$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsByUser$1.smali
index 2ef96656f0..c9dd2b2ea1 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsByUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsByUser$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreApplicationStreaming$State;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
index 708af73df2..d8f5e9384f 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;>;"
     }
 .end annotation
 
@@ -78,7 +87,7 @@
 
     const-string v0, "streams"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
index 73680de30a..ea65558897 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreApplicationStreaming$State;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$2.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$2.smali
index a9ca2d6896..9f83aa1d36 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$2.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
index 8ac99c0ef8..a2816645c7 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 1
 
     const/4 v0, 0x1
@@ -92,5 +78,21 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$2.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$2.smali
index 7840cd1508..5ad897a5fb 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$2.smali
@@ -3,7 +3,7 @@
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Boolean;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     const-string v0, "isInExperiment"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -96,9 +99,9 @@
 
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$stopStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$stopStream$1.smali
new file mode 100644
index 0000000000..15a2d3c25d
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$stopStream$1.smali
@@ -0,0 +1,72 @@
+.class public final Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;
+.super Lk0/o/c/j;
+.source "StoreApplicationStreaming.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->stopStream(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $streamKey:Ljava/lang/String;
+
+.field public final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;->$streamKey:Ljava/lang/String;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;->$streamKey:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lcom/discord/stores/StoreApplicationStreaming;->access$stopStreamInternal(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$stopWatchingStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$stopWatchingStream$1.smali
deleted file mode 100644
index 87ecb09f56..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$stopWatchingStream$1.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public final Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;
-.super Lj0/n/c/i;
-.source "StoreApplicationStreaming.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming;->stopWatchingStream(Ljava/lang/String;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $streamKey:Ljava/lang/String;
-
-.field public final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
-
-    iput-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;->$streamKey:Ljava/lang/String;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
-
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;->$streamKey:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lcom/discord/stores/StoreApplicationStreaming;->access$stopWatchingStreamInternal(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$targetStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$targetStream$1.smali
index dbb78c882d..3003975e85 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$targetStream$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$targetStream$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreApplicationStreaming$targetStream$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreApplicationStreaming.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     :goto_0
     iget-object v2, p0, Lcom/discord/stores/StoreApplicationStreaming$targetStream$1;->$streamKey:Ljava/lang/String;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -100,7 +100,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isUserWatching()Z
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isStreamActive()Z
 
     move-result v1
 
@@ -127,7 +127,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isUserWatching()Z
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isStreamActive()Z
 
     move-result v1
 
@@ -143,7 +143,7 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lcom/discord/stores/StoreApplicationStreaming;->access$stopWatchingStreamInternal(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lcom/discord/stores/StoreApplicationStreaming;->access$stopStreamInternal(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
 
     :cond_3
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$targetStream$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
index edda7ce234..5bc01c0f98 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
@@ -23,6 +23,8 @@
 
 .field public isDirty:Z
 
+.field public final rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
+
 .field public final stateSubject:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,18 +70,28 @@
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;)V
+.method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeStream"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "userStore"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "voiceChannelSelectedStore"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcConnectionStore"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -91,6 +103,8 @@
 
     iput-object p4, p0, Lcom/discord/stores/StoreApplicationStreaming;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
 
+    iput-object p5, p0, Lcom/discord/stores/StoreApplicationStreaming;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
+
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
@@ -105,9 +119,11 @@
 
     new-instance p1, Lcom/discord/stores/StoreApplicationStreaming$State;
 
-    sget-object p2, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p2, Lk0/j/o;->d:Lk0/j/o;
 
-    invoke-direct {p1, p2, p2, v0}, Lcom/discord/stores/StoreApplicationStreaming$State;-><init>(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
+    const/4 p3, 0x0
+
+    invoke-direct {p1, p2, p2, p3}, Lcom/discord/stores/StoreApplicationStreaming$State;-><init>(Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;)V
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -122,34 +138,14 @@
     iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamViewerTracker:Lcom/discord/stores/StoreApplicationStreaming$StreamViewerTracker;
 
     return-void
+.end method
 
-    :cond_0
-    const-string p1, "voiceChannelSelectedStore"
+.method public static final synthetic access$getRtcConnectionStore$p(Lcom/discord/stores/StoreApplicationStreaming;)Lcom/discord/stores/StoreRtcConnection;
+    .locals 0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    iget-object p0, p0, Lcom/discord/stores/StoreApplicationStreaming;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
 
-    throw v0
-
-    :cond_1
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static final synthetic access$getStateSubject$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
@@ -168,10 +164,33 @@
     return-object p0
 .end method
 
-.method public static final synthetic access$stopWatchingStreamInternal(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
+.method public static final synthetic access$getUserStore$p(Lcom/discord/stores/StoreApplicationStreaming;)Lcom/discord/stores/StoreUser;
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->stopWatchingStreamInternal(Ljava/lang/String;)V
+    iget-object p0, p0, Lcom/discord/stores/StoreApplicationStreaming;->userStore:Lcom/discord/stores/StoreUser;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$stopStreamInternal(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->stopStreamInternal(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static synthetic createStream$default(Lcom/discord/stores/StoreApplicationStreaming;JLjava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)V
+    .locals 0
+
+    and-int/lit8 p5, p5, 0x4
+
+    if-eqz p5, :cond_0
+
+    const/4 p4, 0x0
+
+    :cond_0
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreApplicationStreaming;->createStream(JLjava/lang/Long;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -330,24 +349,24 @@
 
     sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$2;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n        .get\u2026a()\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
-.method private final stopWatchingStreamInternal(Ljava/lang/String;)V
+.method private final stopStreamInternal(Ljava/lang/String;)V
     .locals 4
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
@@ -369,6 +388,30 @@
 
 
 # virtual methods
+.method public final createStream(JLjava/lang/Long;Ljava/lang/String;)V
+    .locals 8
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+    new-instance v7, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;
+
+    move-object v1, v7
+
+    move-object v2, p0
+
+    move-wide v3, p1
+
+    move-object v5, p3
+
+    move-object v6, p4
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreApplicationStreaming$createStream$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;JLjava/lang/Long;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v7}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
 .method public final getActiveApplicationStream$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
     .locals 1
 
@@ -394,13 +437,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "getState()\n      .map { \u2026activeApplicationStream }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -466,13 +509,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreApplicationStreaming$getState$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "isInSpectatorExperimentO\u2026            }\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -496,7 +539,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$getStreamsByUser$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsByUser$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -506,7 +549,7 @@
 
     const-string v1, "getState()\n          .ma\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -532,7 +575,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -542,7 +585,7 @@
 
     const-string p2, "getStreamsByUser()\n     \u2026 }.distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -564,7 +607,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -572,7 +615,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -582,7 +625,7 @@
 
     const-string p2, "getState()\n        .map \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -592,7 +635,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
@@ -608,7 +653,7 @@
 
     const-string v0, "payload.guilds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -629,7 +674,7 @@
 
     const-string v1, "guild"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getVoiceStates()Ljava/util/List;
 
@@ -654,9 +699,9 @@
 
     check-cast v2, Lcom/discord/models/domain/ModelVoice$State;
 
-    const-string v3, "voiceState"
+    const-string/jumbo v3, "voiceState"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -672,15 +717,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleStreamCreate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V
@@ -688,7 +724,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamCreate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamViewerTracker:Lcom/discord/stores/StoreApplicationStreaming$StreamViewerTracker;
 
@@ -713,301 +751,16 @@
     invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamCreateOrUpdate(Ljava/lang/String;ZLjava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamCreate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public final handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
-    .locals 4
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_7
-
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamSpectators:Ljava/util/HashMap;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getStreamKey()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getReason()Lcom/discord/models/domain/StreamDelete$Reason;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/models/domain/StreamDelete$Reason;->STREAM_FULL:Lcom/discord/models/domain/StreamDelete$Reason;
-
-    const/4 v3, 0x1
-
-    if-ne v1, v2, :cond_0
-
-    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    sget-object v2, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getStreamKey()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v2, p1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
-
-    move-result-object p1
-
-    invoke-direct {v0, v1, p1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;-><init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)V
-
-    iput-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    iput-boolean v3, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
-
-    return-void
-
-    :cond_0
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
-
-    :goto_0
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_1
-
-    :cond_2
-    move-object v1, v0
-
-    :goto_1
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getStreamKey()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_6
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getUnavailable()Z
-
-    move-result v1
-
-    const/4 v2, 0x2
-
-    if-eqz v1, :cond_3
-
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    if-eqz p1, :cond_5
-
-    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->RECONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_3
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getReason()Lcom/discord/models/domain/StreamDelete$Reason;
-
-    move-result-object p1
-
-    sget-object v1, Lcom/discord/models/domain/StreamDelete$Reason;->USER_REQUESTED:Lcom/discord/models/domain/StreamDelete$Reason;
-
-    if-ne p1, v1, :cond_4
-
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    if-eqz p1, :cond_5
-
-    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->LEFT:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_4
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    if-eqz p1, :cond_5
-
-    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    move-result-object v0
-
-    :cond_5
-    :goto_2
-    iput-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    iput-boolean v3, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
-
-    :cond_6
-    return-void
-
-    :cond_7
-    const-string p1, "streamDelete"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final handleStreamTargeted(Ljava/lang/String;)V
-    .locals 6
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    sget-object v1, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
-
-    invoke-virtual {v1, p1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
-
-    move-result-object v2
-
-    goto :goto_0
-
-    :cond_0
-    move-object v2, v0
-
-    :goto_0
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isUserWatching()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceChannelSelected;->getSelectedVoiceChannelId$app_productionDiscordExternalRelease()J
-
-    move-result-wide v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
-
-    move-result-wide v3
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_2
-
-    iget-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Lcom/discord/stores/StoreStream;->streamWatch(Ljava/lang/String;)V
-
-    iput-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
-
-    goto :goto_1
-
-    :cond_2
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
-
-    :goto_1
-    return-void
-
-    :cond_3
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final handleStreamUpdate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V
-    .locals 2
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreateOrUpdate;->getStreamKey()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreateOrUpdate;->getPaused()Z
-
-    move-result v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreateOrUpdate;->getViewerIds()Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamCreateOrUpdate(Ljava/lang/String;ZLjava/util/List;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "streamUpdate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final handleStreamWatch(Ljava/lang/String;)V
+.method public final handleStreamCreateRequest(Ljava/lang/String;)V
     .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
@@ -1028,15 +781,287 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
     return-void
+.end method
+
+.method public final handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+    .locals 4
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamDelete"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamSpectators:Ljava/util/HashMap;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getStreamKey()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getReason()Lcom/discord/models/domain/StreamDelete$Reason;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/models/domain/StreamDelete$Reason;->STREAM_FULL:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    const/4 v2, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    sget-object v3, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getStreamKey()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v3, p1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object p1
+
+    invoke-direct {v0, v1, p1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;-><init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)V
+
+    iput-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iput-boolean v2, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+
+    return-void
 
     :cond_0
-    const-string p1, "streamKey"
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    if-eqz v0, :cond_1
 
-    const/4 p1, 0x0
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
 
-    throw p1
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    :goto_0
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_2
+    move-object v0, v1
+
+    :goto_1
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getStreamKey()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getUnavailable()Z
+
+    move-result v0
+
+    const/4 v3, 0x2
+
+    if-eqz v0, :cond_3
+
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz p1, :cond_5
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->RECONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-static {p1, v0, v1, v3, v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v1
+
+    goto :goto_2
+
+    :cond_3
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getReason()Lcom/discord/models/domain/StreamDelete$Reason;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/models/domain/StreamDelete$Reason;->USER_REQUESTED:Lcom/discord/models/domain/StreamDelete$Reason;
+
+    if-ne p1, v0, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz p1, :cond_5
+
+    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    invoke-static {p1, v0, v1, v3, v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v1
+
+    :cond_5
+    :goto_2
+    iput-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iput-boolean v2, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+
+    :cond_6
+    return-void
+.end method
+
+.method public final handleStreamTargeted(Ljava/lang/String;)V
+    .locals 6
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {v0, p1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v2
+
+    goto :goto_0
+
+    :cond_0
+    move-object v2, v1
+
+    :goto_0
+    invoke-static {p1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isStreamActive()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceChannelSelected;->getSelectedVoiceChannelId$app_productionDiscordExternalRelease()J
+
+    move-result-wide v2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v4
+
+    cmp-long v0, v2, v4
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->streamWatch(Ljava/lang/String;)V
+
+    iput-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    goto :goto_1
+
+    :cond_2
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    :goto_1
+    return-void
+.end method
+
+.method public final handleStreamUpdate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamUpdate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreateOrUpdate;->getStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreateOrUpdate;->getPaused()Z
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreateOrUpdate;->getViewerIds()Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamCreateOrUpdate(Ljava/lang/String;ZLjava/util/List;)V
+
+    return-void
+.end method
+
+.method public final handleStreamWatch(Ljava/lang/String;)V
+    .locals 3
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->CONNECTING:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    sget-object v2, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {v2, p1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object p1
+
+    invoke-direct {v0, v1, p1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;-><init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;)V
+
+    iput-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+
+    return-void
 .end method
 
 .method public final handleVoiceChannelSelected(J)V
@@ -1048,7 +1073,7 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
 
@@ -1056,13 +1081,13 @@
 
     cmp-long v0, p1, v2
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_0
 
     iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->storeStream:Lcom/discord/stores/StoreStream;
 
     iget-object p2, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    if-eqz p2, :cond_0
+    invoke-static {p2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
 
@@ -1072,23 +1097,18 @@
 
     iput-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
 
@@ -1096,28 +1116,10 @@
 
     cmp-long v0, v2, p1
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_2
 
-    :cond_2
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    if-eqz p1, :cond_3
-
-    sget-object p2, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->LEFT:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    const/4 v0, 0x2
-
-    invoke-static {p1, p2, v1, v0, v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_3
-    move-object p1, v1
-
-    :goto_0
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    :cond_1
+    iput-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
     iput-object v1, p0, Lcom/discord/stores/StoreApplicationStreaming;->targetStream:Lcom/discord/models/domain/ModelApplicationStream;
 
@@ -1125,8 +1127,8 @@
 
     iput-boolean p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
-    :cond_4
-    :goto_1
+    :cond_2
+    :goto_0
     return-void
 .end method
 
@@ -1157,13 +1159,15 @@
 
     move-object/from16 v0, p0
 
-    const/4 v1, 0x0
+    const-string/jumbo v1, "voiceState"
 
-    if-eqz p1, :cond_b
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
 
@@ -1191,9 +1195,9 @@
     const/4 v7, 0x0
 
     :goto_0
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v8
 
@@ -1209,11 +1213,11 @@
     const/4 v4, 0x0
 
     :goto_1
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_2
 
-    if-eqz v7, :cond_3
+    if-eqz v7, :cond_2
 
-    if-eqz v4, :cond_3
+    if-eqz v4, :cond_2
 
     iget-object v13, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
@@ -1223,9 +1227,9 @@
 
     new-instance v15, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
 
-    if-eqz v2, :cond_2
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v6
 
@@ -1244,14 +1248,9 @@
     goto :goto_3
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    if-eqz v3, :cond_3
 
-    throw v1
-
-    :cond_3
-    if-eqz v3, :cond_5
-
-    if-eqz v4, :cond_5
+    if-eqz v4, :cond_3
 
     iget-object v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
@@ -1261,9 +1260,9 @@
 
     new-instance v5, Lcom/discord/models/domain/ModelApplicationStream$CallStream;
 
-    if-eqz v2, :cond_4
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v6
 
@@ -1275,48 +1274,43 @@
 
     goto :goto_3
 
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_5
-    iget-object v2, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
+    :cond_3
+    iget-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
     invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
-    invoke-virtual {v2, v3}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v3}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_4
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     goto :goto_2
 
-    :cond_6
-    const/4 v2, 0x0
+    :cond_4
+    const/4 v1, 0x0
 
     :goto_2
     iget-boolean v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
-    if-nez v3, :cond_7
+    if-nez v3, :cond_5
 
-    if-eqz v2, :cond_8
+    if-eqz v1, :cond_6
 
-    :cond_7
+    :cond_5
     const/4 v6, 0x1
 
-    :cond_8
+    :cond_6
     iput-boolean v6, v0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
     :goto_3
-    iget-object v2, v0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    iget-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
-    if-eqz v2, :cond_a
+    if-eqz v1, :cond_8
 
     iget-object v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->userStore:Lcom/discord/stores/StoreUser;
 
@@ -1324,7 +1318,7 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_a
+    if-eqz v3, :cond_8
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -1332,55 +1326,42 @@
 
     cmp-long v5, v10, v3
 
-    if-nez v5, :cond_a
+    if-nez v5, :cond_8
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
 
-    move-result-object v3
+    move-result-object v1
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
 
     move-result-wide v3
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v1
 
-    if-nez v5, :cond_9
+    if-nez v1, :cond_7
 
     goto :goto_4
 
-    :cond_9
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
+    :cond_7
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v1
 
-    cmp-long v7, v3, v5
+    cmp-long v5, v3, v1
 
-    if-eqz v7, :cond_a
+    if-eqz v5, :cond_8
 
     :goto_4
-    sget-object v3, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->LEFT:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    const/4 v4, 0x2
-
-    invoke-static {v2, v3, v1, v4, v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->copy$default(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    move-result-object v1
+    const/4 v1, 0x0
 
     iput-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->activeApplicationStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
     iput-boolean v12, v0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
-    :cond_a
+    :cond_8
     return-void
-
-    :cond_b
-    const-string v2, "voiceState"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final isUserStreaming(J)Z
@@ -1466,35 +1447,30 @@
     return-void
 .end method
 
-.method public final stopWatchingStream(Ljava/lang/String;)V
+.method public final stopStream(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$stopWatchingStream$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$stopStream$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final targetStream(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1505,13 +1481,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$AudioDevicesState.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$AudioDevicesState.smali
index f1449380cd..41b500a3be 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$AudioDevicesState.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$AudioDevicesState.smali
@@ -45,13 +45,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "audioOutputState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "selectedOutputDevice"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "availableOutputDevices"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,27 +66,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->availableOutputDevices:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "availableOutputDevices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedOutputDevice"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "audioOutputState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
@@ -165,40 +148,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "audioOutputState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "selectedOutputDevice"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "availableOutputDevices"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;-><init>(Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "availableOutputDevices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedOutputDevice"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "audioOutputState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -216,7 +182,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -226,7 +192,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -236,7 +202,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->availableOutputDevices:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$Companion.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$Companion.smali
index b10dd2ad4a..dfbf659403 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$Companion.smali
@@ -31,7 +31,7 @@
     return-void
 .end method
 
-.method public static synthetic DEFAULT_AUDIO_DEVICES_STATE$annotations()V
+.method public static synthetic getDEFAULT_AUDIO_DEVICES_STATE$app_productionDiscordExternalRelease$annotations()V
     .locals 0
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
@@ -39,7 +39,7 @@
     return-void
 .end method
 
-.method public static synthetic DEFAULT_OUTPUT_STATE$annotations()V
+.method public static synthetic getDEFAULT_OUTPUT_STATE$app_productionDiscordExternalRelease$annotations()V
     .locals 0
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio.smali
index b7ee03b5ef..63a1e41b4b 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio.smali
@@ -110,7 +110,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;->name:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali
index 460520a3d2..8e6ae5f74d 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali
@@ -26,13 +26,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreUser;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channelsStore"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "voiceStatesStore"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "usersStore"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,27 +47,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;->usersStore:Lcom/discord/stores/StoreUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "usersStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "voiceStatesStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "channelsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getVoiceStatesForChannel(J)Ljava/util/Map;
@@ -186,7 +169,7 @@
     goto :goto_1
 
     :cond_4
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_5
     return-object v1
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1$1.smali
index 5c50f94bed..f802058d48 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAudioDevices$init$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAudioDevices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1.smali
index 6dc7feffbf..68183513ce 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAudioDevices$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAudioDevices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/media/AudioOutputState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/media/AudioOutputState;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$init$1;->this$0:Lcom/discord/stores/StoreAudioDevices;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$selectAudioOutput$1.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$selectAudioOutput$1.smali
index e1687b4fd3..f852f2a4f3 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$selectAudioOutput$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$selectAudioOutput$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAudioDevices$selectAudioOutput$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAudioDevices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1.smali
index 89a3b71b47..85187cbf32 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAudioDevices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices.smali
index 83f6b2e02c..a1a8ebd0ac 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices.smali
@@ -124,15 +124,21 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;Lcom/discord/stores/StoreVoiceChannelSelected;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "audioOutputMonitor"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "videoUseDetector"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "selectedVoiceChannelStore"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -159,34 +165,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesStateSubject:Lrx/subjects/SerializedSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "selectedVoiceChannelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "videoUseDetector"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "audioOutputMonitor"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$autoSelectNonSpeakerOutput(Lcom/discord/stores/StoreAudioDevices;)V
@@ -431,67 +409,77 @@
 
     new-array v3, v2, [Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    const/4 v4, 0x0
+    sget-object v4, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
 
-    sget-object v5, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+    const/4 v5, 0x0
 
-    aput-object v5, v3, v4
+    aput-object v4, v3, v5
 
-    invoke-static {v3}, Lf/n/a/k/a;->mutableSetOf([Ljava/lang/Object;)Ljava/util/Set;
+    const-string v4, "elements"
 
-    move-result-object v3
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Ljava/util/LinkedHashSet;
+
+    invoke-static {v2}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v5
+
+    invoke-direct {v4, v5}, Ljava/util/LinkedHashSet;-><init>(I)V
+
+    invoke-static {v3, v4}, Lf/n/a/k/a;->toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
 
     invoke-virtual {p1}, Lcom/discord/utilities/media/AudioOutputState;->isHeadsetUnplugged()Z
 
-    move-result v4
+    move-result v3
 
-    if-nez v4, :cond_0
+    if-nez v3, :cond_0
 
     sget-object p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$WiredAudio;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$WiredAudio;
 
-    invoke-interface {v3, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v4, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
-    iget-object v4, p0, Lcom/discord/stores/StoreAudioDevices;->selectedVoiceChannelStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+    iget-object v3, p0, Lcom/discord/stores/StoreAudioDevices;->selectedVoiceChannelStore:Lcom/discord/stores/StoreVoiceChannelSelected;
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreVoiceChannelSelected;->getSelectedVoiceChannelId$app_productionDiscordExternalRelease()J
+    invoke-virtual {v3}, Lcom/discord/stores/StoreVoiceChannelSelected;->getSelectedVoiceChannelId$app_productionDiscordExternalRelease()J
 
-    move-result-wide v4
+    move-result-wide v5
 
-    iget-object v6, p0, Lcom/discord/stores/StoreAudioDevices;->videoUseDetector:Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;
+    iget-object v3, p0, Lcom/discord/stores/StoreAudioDevices;->videoUseDetector:Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;
 
-    invoke-virtual {v6, v4, v5}, Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;->isMeUsingVideoInChannel(J)Z
+    invoke-virtual {v3, v5, v6}, Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;->isMeUsingVideoInChannel(J)Z
 
-    move-result v4
+    move-result v3
 
-    if-nez v4, :cond_1
+    if-nez v3, :cond_1
 
-    sget-object v4, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;
+    sget-object v3, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;
 
-    invoke-interface {v3, v4}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v4, v3}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothOutputConnected()Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
-    new-instance v4, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+    new-instance v3, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
 
     invoke-virtual {p1}, Lcom/discord/utilities/media/AudioOutputState;->getBluetoothDeviceName()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-direct {v4, p1}, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;-><init>(Ljava/lang/String;)V
+    invoke-direct {v3, p1}, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {v3, v4}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v4, v3}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
     :cond_2
     :goto_0
-    invoke-direct {p0, v3}, Lcom/discord/stores/StoreAudioDevices;->updateAvailableOutputDevices(Ljava/util/Set;)V
+    invoke-direct {p0, v4}, Lcom/discord/stores/StoreAudioDevices;->updateAvailableOutputDevices(Ljava/util/Set;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
@@ -638,7 +626,7 @@
 
     const-string v1, "audioDevicesStateSubject\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -656,11 +644,13 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -694,15 +684,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleVoiceChannelSelected()V
@@ -799,9 +780,9 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     const/4 v0, 0x0
 
@@ -813,7 +794,9 @@
 .method public final selectAudioOutput(Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "outputDevice"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -824,34 +807,18 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "outputDevice"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setAudioDevicesState$app_productionDiscordExternalRelease(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final toggleSpeakerOutput()V
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$AudioManagerProvider.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$AudioManagerProvider.smali
index 9aae3f976b..619c4aedf9 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$AudioManagerProvider.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$AudioManagerProvider.smali
@@ -42,36 +42,26 @@
 
 # virtual methods
 .method public final get(Landroid/content/Context;)Landroid/media/AudioManager;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "audio"
+    const-string v0, "audio"
 
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
-    instance-of v1, p1, Landroid/media/AudioManager;
+    instance-of v0, p1, Landroid/media/AudioManager;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_0
-    move-object v0, p1
+    check-cast p1, Landroid/media/AudioManager;
 
-    :goto_0
-    check-cast v0, Landroid/media/AudioManager;
-
-    return-object v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
index b17a5e3b65..22182e85d6 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
@@ -17,22 +17,20 @@
 # instance fields
 .field public final audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-.field public final audioMode:I
-
-.field public final audioModeFixEnabled:Z
-
 .field public final connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)V
+.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "connectionState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "audioDevicesState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,59 +38,27 @@
 
     iput-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    iput p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
-    iput-boolean p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
     return-void
-
-    :cond_0
-    const-string p1, "audioDevicesState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZILjava/lang/Object;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+.method public static synthetic copy$default(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ILjava/lang/Object;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
     .locals 0
 
-    and-int/lit8 p6, p5, 0x1
+    and-int/lit8 p4, p3, 0x1
 
-    if-eqz p6, :cond_0
+    if-eqz p4, :cond_0
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
     :cond_0
-    and-int/lit8 p6, p5, 0x2
+    and-int/lit8 p3, p3, 0x2
 
-    if-eqz p6, :cond_1
+    if-eqz p3, :cond_1
 
     iget-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
     :cond_1
-    and-int/lit8 p6, p5, 0x4
-
-    if-eqz p6, :cond_2
-
-    iget p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
-    :cond_2
-    and-int/lit8 p5, p5, 0x8
-
-    if-eqz p5, :cond_3
-
-    iget-boolean p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
-    :cond_3
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
 
     move-result-object p0
 
@@ -117,50 +83,22 @@
     return-object v0
 .end method
 
-.method public final component3()I
+.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
     .locals 1
 
-    iget v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
+    const-string v0, "connectionState"
 
-    return v0
-.end method
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-.method public final component4()Z
-    .locals 1
+    const-string v0, "audioDevicesState"
 
-    iget-boolean v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
-    return v0
-.end method
-
-.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
 
-    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)V
+    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "audioDevicesState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -178,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -186,25 +124,13 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    iget-object v1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+    iget-object p1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result p1
 
-    if-eqz v0, :cond_0
-
-    iget v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
-    iget v1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
-    iget-boolean p1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
-    if-ne v0, p1, :cond_0
+    if-eqz p1, :cond_0
 
     goto :goto_0
 
@@ -228,22 +154,6 @@
     return-object v0
 .end method
 
-.method public final getAudioMode()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
-    return v0
-.end method
-
-.method public final getAudioModeFixEnabled()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
-    return v0
-.end method
-
 .method public final getConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
     .locals 1
 
@@ -284,28 +194,11 @@
     :cond_1
     add-int/2addr v0, v1
 
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
-    if-eqz v1, :cond_2
-
-    const/4 v1, 0x1
-
-    :cond_2
-    add-int/2addr v0, v1
-
     return v0
 .end method
 
 .method public toString()Ljava/lang/String;
-    .locals 3
+    .locals 2
 
     const-string v0, "Configuration(connectionState="
 
@@ -325,23 +218,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    const-string v1, ", audioMode="
+    const-string v1, ")"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", audioModeFixEnabled="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioModeFixEnabled:Z
-
-    const-string v2, ")"
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
index 1aaae78902..908c997783 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
@@ -119,7 +119,7 @@
     return-void
 .end method
 
-.method private final useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;Z)V
+.method private final useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
     .locals 1
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingBluetoothScoOn()Z
@@ -147,195 +147,144 @@
     :goto_0
     invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingSpeakerPhoneOn()Z
 
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
-
-    if-nez p3, :cond_2
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingMode()I
-
     move-result p2
 
-    invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->trySetMode(Landroid/media/AudioManager;I)V
+    invoke-virtual {p1, p2}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
 
-    :cond_2
     return-void
 .end method
 
 
 # virtual methods
 .method public final configure(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-    .locals 7
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "configuration"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     return-void
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component1()Lcom/discord/rtcconnection/RtcConnection$State;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component2()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    move-result-object v2
+    move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->getAudioModeFixEnabled()Z
+    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
-    move-result v3
+    sget-object v2, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    const/4 v4, 0x3
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    if-eqz v3, :cond_2
+    move-result v2
 
-    iget-object v3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
+    if-eqz v2, :cond_1
 
-    sget-object v5, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
-
-    invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
+    const/4 v2, 0x3
 
     goto :goto_0
 
     :cond_1
-    const/4 v4, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    invoke-virtual {v3, v4}, Landroid/media/AudioManager;->setMode(I)V
+    invoke-virtual {v1, v2}, Landroid/media/AudioManager;->setMode(I)V
 
-    goto :goto_2
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    :cond_2
-    sget-object v3, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    if-ne v0, v1, :cond_5
 
-    if-ne v1, v3, :cond_4
-
-    iget-object v3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->getAudioMode()I
-
-    move-result v5
-
-    const/4 v6, 0x2
-
-    if-eq v5, v6, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v4, 0x2
-
-    :goto_1
-    invoke-virtual {v3, v4}, Landroid/media/AudioManager;->setMode(I)V
-
-    :cond_4
-    :goto_2
-    sget-object v3, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
-
-    if-ne v1, v3, :cond_8
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
-
-    move-result-object p1
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
 
     move-result-object v0
 
+    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+    move-result-object p1
+
     iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    if-eqz v1, :cond_5
+    if-eqz v1, :cond_2
 
-    goto :goto_3
+    goto :goto_1
 
-    :cond_5
+    :cond_2
     iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
     invoke-direct {p0, v1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->extractSettings(Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
     move-result-object v1
 
-    :goto_3
+    :goto_1
     iput-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
     iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
-    instance-of v2, v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+    instance-of v2, p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
 
     invoke-virtual {v1, v2}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
 
     iget-boolean v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->isBluetoothScoStarted:Z
 
-    if-eqz v1, :cond_7
+    if-eqz v1, :cond_4
 
-    instance-of v0, v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+    instance-of p1, p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
 
-    if-eqz v0, :cond_6
+    if-eqz p1, :cond_3
 
-    invoke-virtual {p1}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothOutputConnected()Z
+    invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothOutputConnected()Z
 
     move-result p1
 
-    if-nez p1, :cond_a
+    if-nez p1, :cond_7
 
-    :cond_6
+    :cond_3
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->stopBluetoothSCO(Landroid/media/AudioManager;)V
 
-    goto :goto_4
+    goto :goto_2
 
-    :cond_7
-    instance-of v0, v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+    :cond_4
+    instance-of p1, p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
 
-    if-eqz v0, :cond_a
+    if-eqz p1, :cond_7
 
-    invoke-virtual {p1}, Lcom/discord/utilities/media/AudioOutputState;->getCanBluetoothScoStart()Z
+    invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->getCanBluetoothScoStart()Z
 
     move-result p1
 
-    if-eqz p1, :cond_a
+    if-eqz p1, :cond_7
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->startBluetoothSCO(Landroid/media/AudioManager;)V
 
-    goto :goto_4
+    goto :goto_2
 
-    :cond_8
-    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+    :cond_5
+    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    if-eqz v1, :cond_9
+    if-eqz p1, :cond_6
 
-    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->getAudioModeFixEnabled()Z
+    invoke-direct {p0, v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
 
-    move-result p1
+    :cond_6
+    const/4 p1, 0x0
 
-    invoke-direct {p0, v2, v1, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;Z)V
+    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    :cond_9
-    iput-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
-
-    :cond_a
-    :goto_4
+    :cond_7
+    :goto_2
     return-void
-
-    :cond_b
-    const-string p1, "configuration"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
index f99620cfed..f1b761ac90 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
@@ -1,9 +1,9 @@
-.class public final Lcom/discord/stores/StoreAudioManager$init$1;
-.super Ljava/lang/Object;
+.class public final synthetic Lcom/discord/stores/StoreAudioManager$init$1;
+.super Lk0/o/c/h;
 .source "StoreAudioManager.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Lkotlin/jvm/functions/Function2;
 
 
 # annotations
@@ -12,20 +12,18 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
+    accessFlags = 0x1019
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+        "Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;",
+        ">;"
     }
 .end annotation
 
@@ -48,39 +46,55 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 0
+    .locals 6
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const-class v2, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
+
+    return-object v0
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioManager$init$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+    check-cast p2, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreAudioManager$init$1;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
 
     move-result-object p1
 
     return-object p1
 .end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreExperiments$Experiment;->isEnabled(I)Z
-
-    move-result p1
-
-    return p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
index 4d1b32b6ca..b43291459d 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
@@ -1,9 +1,9 @@
-.class public final synthetic Lcom/discord/stores/StoreAudioManager$init$2;
-.super Lj0/n/c/g;
+.class public final Lcom/discord/stores/StoreAudioManager$init$2;
+.super Lk0/o/c/j;
 .source "StoreAudioManager.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function4;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
@@ -12,133 +12,62 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
+    accessFlags = 0x19
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function4<",
-        "Lcom/discord/rtcconnection/RtcConnection$State;",
-        "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
-        "Ljava/lang/Integer;",
-        "Ljava/lang/Boolean;",
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;",
+        "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreAudioManager$init$2;
+# instance fields
+.field public final synthetic $audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
+    .locals 0
 
-    new-instance v0, Lcom/discord/stores/StoreAudioManager$init$2;
+    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$init$2;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
 
-    invoke-direct {v0}, Lcom/discord/stores/StoreAudioManager$init$2;-><init>()V
+    const/4 p1, 0x1
 
-    sput-object v0, Lcom/discord/stores/StoreAudioManager$init$2;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$2;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x4
-
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)V"
-
-    return-object v0
-.end method
-
-.method public final invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
-    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)V
-
-    return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+    check-cast p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
 
-    check-cast p2, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioManager$init$2;->invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
 
-    check-cast p3, Ljava/lang/Number;
-
-    invoke-virtual {p3}, Ljava/lang/Number;->intValue()I
-
-    move-result p3
-
-    check-cast p4, Ljava/lang/Boolean;
-
-    invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p4
-
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreAudioManager$init$2;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IZ)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
-    move-result-object p1
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 .end method
+
+.method public final invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$init$2;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->configure(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$init$3.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$init$3.smali
deleted file mode 100644
index 35be51ccb8..0000000000
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$3.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class public final Lcom/discord/stores/StoreAudioManager$init$3;
-.super Lj0/n/c/i;
-.source "StoreAudioManager.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreAudioManager;->init(Landroid/content/Context;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$init$3;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioManager$init$3;->invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$init$3;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->configure(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0.smali
new file mode 100644
index 0000000000..869e718b2f
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0.smali
@@ -0,0 +1,36 @@
+.class public final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0;
+.super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# instance fields
+.field public final synthetic function:Lkotlin/jvm/functions/Function2;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function2;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0;->function:Lkotlin/jvm/functions/Function2;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0;->function:Lkotlin/jvm/functions/Function2;
+
+    invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0.smali
deleted file mode 100644
index 346dc41ea9..0000000000
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;
-.super Ljava/lang/Object;
-.source "StoreAudioManager.kt"
-
-# interfaces
-.implements Lrx/functions/Func4;
-
-
-# instance fields
-.field public final synthetic function:Lkotlin/jvm/functions/Function4;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function4;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
-
-    invoke-interface {v0, p1, p2, p3, p4}, Lkotlin/jvm/functions/Function4;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
index a31d116875..649635f984 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
@@ -15,88 +15,50 @@
 # instance fields
 .field public final audioDevices:Lcom/discord/stores/StoreAudioDevices;
 
-.field public final experimentsStore:Lcom/discord/stores/StoreExperiments;
-
-.field public final mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
 .field public final rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;Lcom/discord/stores/StoreExperiments;)V
+.method public constructor <init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreRtcConnection;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "audioDevices"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "rtcConnectionStore"
 
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreAudioManager;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
 
-    iput-object p2, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
-    iput-object p3, p0, Lcom/discord/stores/StoreAudioManager;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
-
-    iput-object p4, p0, Lcom/discord/stores/StoreAudioManager;->experimentsStore:Lcom/discord/stores/StoreExperiments;
+    iput-object p2, p0, Lcom/discord/stores/StoreAudioManager;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
 
     return-void
-
-    :cond_0
-    const-string p1, "experimentsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rtcConnectionStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "mediaSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "audioDevices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public init(Landroid/content/Context;)V
-    .locals 11
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
-    new-instance v1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
+    new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
 
-    sget-object v2, Lcom/discord/stores/StoreAudioManager$AudioManagerProvider;->INSTANCE:Lcom/discord/stores/StoreAudioManager$AudioManagerProvider;
+    sget-object v1, Lcom/discord/stores/StoreAudioManager$AudioManagerProvider;->INSTANCE:Lcom/discord/stores/StoreAudioManager$AudioManagerProvider;
 
-    invoke-virtual {v2, p1}, Lcom/discord/stores/StoreAudioManager$AudioManagerProvider;->get(Landroid/content/Context;)Landroid/media/AudioManager;
+    invoke-virtual {v1, p1}, Lcom/discord/stores/StoreAudioManager$AudioManagerProvider;->get(Landroid/content/Context;)Landroid/media/AudioManager;
 
     move-result-object p1
 
-    invoke-direct {v1, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;-><init>(Landroid/media/AudioManager;)V
+    invoke-direct {v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;-><init>(Landroid/media/AudioManager;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
 
@@ -104,72 +66,52 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState()Lrx/Observable;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState()Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v1
 
-    iget-object v3, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    sget-object v2, Lcom/discord/stores/StoreAudioManager$init$1;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$1;
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
+    if-eqz v2, :cond_0
 
-    move-result-object v3
+    new-instance v3, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0;
 
-    iget-object v4, p0, Lcom/discord/stores/StoreAudioManager;->experimentsStore:Lcom/discord/stores/StoreExperiments;
+    invoke-direct {v3, v2}, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func2$0;-><init>(Lkotlin/jvm/functions/Function2;)V
 
-    const/4 v5, 0x2
-
-    const-string v6, "2020-08_android_fix_audio_mode"
-
-    invoke-static {v4, v6, v0, v5, v0}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v4, Lcom/discord/stores/StoreAudioManager$init$1;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$1;
-
-    invoke-virtual {v0, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v4, Lcom/discord/stores/StoreAudioManager$init$2;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$2;
-
-    if-eqz v4, :cond_0
-
-    new-instance v5, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;
-
-    invoke-direct {v5, v4}, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;-><init>(Lkotlin/jvm/functions/Function4;)V
-
-    move-object v4, v5
+    move-object v2, v3
 
     :cond_0
-    check-cast v4, Lrx/functions/Func4;
+    check-cast v2, Lrx/functions/Func2;
 
-    invoke-static {p1, v2, v3, v0, v4}, Lrx/Observable;->h(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
+    invoke-static {p1, v1, v2}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v0, "Observable\n        .comb\u2026::Configuration\n        )"
+    const-string v1, "Observable\n        .comb\u2026::Configuration\n        )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-wide/16 v2, 0x1f4
+    const-wide/16 v1, 0x1f4
 
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {p1, v2, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {p1, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
     invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v1
 
     const-string p1, "Observable\n        .comb\u2026  .distinctUntilChanged()"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v3, Lcom/discord/stores/StoreAudioManager;
+    const-class v2, Lcom/discord/stores/StoreAudioManager;
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
@@ -177,24 +119,15 @@
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    new-instance v7, Lcom/discord/stores/StoreAudioManager$init$2;
 
-    new-instance v8, Lcom/discord/stores/StoreAudioManager$init$3;
+    invoke-direct {v7, v0}, Lcom/discord/stores/StoreAudioManager$init$2;-><init>(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
 
-    invoke-direct {v8, v1}, Lcom/discord/stores/StoreAudioManager$init$3;-><init>(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
+    const/16 v8, 0x1e
 
-    const/16 v9, 0x1e
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
-
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali
index bdf76d372d..f0d030b9bc 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$AuditLogState.smali
@@ -111,17 +111,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_3
+    const-string/jumbo v0, "webhooks"
 
-    if-eqz p4, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "integrations"
 
-    if-eqz p7, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "filter"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "deletedTargets"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -142,41 +150,6 @@
     iput-boolean p8, p0, Lcom/discord/stores/StoreAuditLog$AuditLogState;->isLoading:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "deletedTargets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "integrations"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "webhooks"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreAuditLog$AuditLogState;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/Long;Lcom/discord/stores/StoreAuditLog$AuditLogFilter;Ljava/util/Map;ZILjava/lang/Object;)Lcom/discord/stores/StoreAuditLog$AuditLogState;
@@ -450,76 +423,49 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p1, :cond_4
+    move-object v2, p1
 
-    if-eqz p3, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string/jumbo v0, "webhooks"
 
-    if-eqz p6, :cond_1
+    move-object v4, p3
 
-    if-eqz p7, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "integrations"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "filter"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "deletedTargets"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreAuditLog$AuditLogState;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-object v3, p2
 
-    move-object v4, p3
-
-    move-object v5, p4
-
     move-object v6, p5
 
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
     move/from16 v9, p8
 
     invoke-direct/range {v1 .. v9}, Lcom/discord/stores/StoreAuditLog$AuditLogState;-><init>(Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/Long;Lcom/discord/stores/StoreAuditLog$AuditLogFilter;Ljava/util/Map;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "deletedTargets"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "filter"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "integrations"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "webhooks"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "users"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -537,7 +483,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuditLog$AuditLogState;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -547,7 +493,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuditLog$AuditLogState;->entries:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -557,7 +503,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuditLog$AuditLogState;->webhooks:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -567,7 +513,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuditLog$AuditLogState;->integrations:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -577,7 +523,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuditLog$AuditLogState;->selectedItemId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -587,7 +533,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuditLog$AuditLogState;->filter:Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -597,7 +543,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuditLog$AuditLogState;->deletedTargets:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali
index 745c9de830..32bf12c1ab 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$Companion$MANAGEMENT_PERMISSIONS$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali
index 4dba9818cb..ee3ee60107 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$fetchAuditLogs$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreAuditLog$fetchAuditLogs$1;->this$0:Lcom/discord/stores/StoreAuditLog;
 
     invoke-static {p1}, Lcom/discord/stores/StoreAuditLog;->access$handleFetchFailure(Lcom/discord/stores/StoreAuditLog;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali
index 17aad3cbc0..01e11d9a8a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$fetchAuditLogs$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$fetchAuditLogs$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelAuditLog;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     const-string v3, "newAuditLog"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1, v2, p1}, Lcom/discord/stores/StoreAuditLog;->access$handleAuditLogResponse(Lcom/discord/stores/StoreAuditLog;JLcom/discord/models/domain/ModelAuditLog;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali
index b4d0d6a8db..51d0554623 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getAuditLogState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$getAuditLogState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali
index 94e5625c3c..28fd19d480 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$getPermissionUserIds$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map$Entry<",
         "+",
@@ -48,7 +48,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -84,7 +84,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_b
+    const-string v0, "<name for destructuring parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -125,7 +127,7 @@
 
     const-string v0, "member.roles"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -253,13 +255,4 @@
     :cond_a
     :goto_4
     return v3
-
-    :cond_b
-    const-string p1, "<name for destructuring parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali
index 50c512a5b4..f3330ad209 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$getPermissionUserIds$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map$Entry<",
         "+",
@@ -54,7 +54,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -87,15 +89,6 @@
     move-result-wide v0
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
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 3c43946089..770768c395 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali
@@ -29,7 +29,21 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -101,7 +115,7 @@
 
     const-string v0, "members"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p3}, Lf/n/a/k/a;->asSequence(Ljava/util/Map;)Lkotlin/sequences/Sequence;
 
@@ -121,6 +135,10 @@
 
     move-result-object p1
 
+    const-string p2, "$this$toSet"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p2, Ljava/util/LinkedHashSet;
 
     invoke-direct {p2}, Ljava/util/LinkedHashSet;-><init>()V
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali
index 7f873ed96a..7a2fb6e562 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$handleAuditLogResponse$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$handleAuditLogResponse$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -105,7 +105,7 @@
 
     const-string v2, "newAuditLog.users"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v2, 0xa
 
@@ -147,9 +147,9 @@
 
     check-cast v4, Lcom/discord/models/domain/ModelUser;
 
-    const-string v5, "user"
+    const-string/jumbo v5, "user"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -233,7 +233,7 @@
 
     const-string v5, "newAuditLog.auditLogEntries"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v2, v3, v4}, Lcom/discord/stores/StoreAuditLog;->access$transformEntries(Lcom/discord/stores/StoreAuditLog;JLjava/util/List;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali
index af61123996..33b25e1c7b 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$handleFetchFailure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$handleFetchFailure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali
index 181139c86d..9dd42ccb0c 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$scrollToBottom$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$scrollToBottom$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali
index 32989f5ed3..8d57599b5f 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$setAuditLogFilterActionId$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali
index e9da9481a1..f72be1d659 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$setAuditLogFilterUserId$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali
index 21c2e258ae..7d60f3f861 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog$toggleSelectedState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuditLog$toggleSelectedState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog.smali b/com.discord/smali/com/discord/stores/StoreAuditLog.smali
index 56857b5047..bfafe12244 100644
--- a/com.discord/smali/com/discord/stores/StoreAuditLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuditLog.smali
@@ -128,11 +128,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -179,20 +181,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreAuditLog;->auditLogStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$fetchAuditLogs(Lcom/discord/stores/StoreAuditLog;JLcom/discord/stores/StoreAuditLog$AuditLogFilter;)V
@@ -364,7 +352,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/i/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -403,7 +391,7 @@
     :cond_1
     iget-object v0, p0, Lcom/discord/stores/StoreAuditLog;->lastBefore:Ljava/lang/Long;
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -450,7 +438,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v0}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -460,7 +448,7 @@
 
     const-string p3, "RestAPI\n        .api\n   \u2026ormers.restSubscribeOn())"
 
-    invoke-static {v1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/stores/StoreAuditLog;
 
@@ -787,7 +775,7 @@
 
     const-string v13, "change"
 
-    invoke-static {v5, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
@@ -811,7 +799,7 @@
 
     const-string v13, "name"
 
-    invoke-static {v5, v13}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v13}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -828,7 +816,7 @@
 
     const-string v13, "type"
 
-    invoke-static {v5, v13}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v13}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -922,7 +910,7 @@
 
     invoke-direct/range {v13 .. v25}, Lcom/discord/models/domain/ModelAuditLogEntry;-><init>(JIJJLjava/util/List;Lcom/discord/models/domain/ModelAuditLogEntry$Options;JLjava/lang/Long;)V
 
-    invoke-static {v9}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v9}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1036,7 +1024,7 @@
 
     if-eqz v0, :cond_b
 
-    invoke-static {v0}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object v7
 
@@ -1054,7 +1042,7 @@
     goto :goto_9
 
     :cond_c
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_9
     invoke-interface {v15, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
@@ -1154,7 +1142,7 @@
 
     move-result-object v2
 
-    invoke-static {v7, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -1195,7 +1183,7 @@
 
     const-string v4, "entry.targetType"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v14, [Lkotlin/Pair;
 
@@ -1323,7 +1311,7 @@
 
     const-string p2, "auditLogStateSubject"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1378,7 +1366,7 @@
 
     const-string p2, "Observable\n        .comb\u2026t.key }.toSet()\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1390,7 +1378,7 @@
 
     const-string p2, "Observable\n        .comb\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$AuthRequestParams.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$AuthRequestParams.smali
index 4403697aa9..03ba3d0c33 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$AuthRequestParams.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$AuthRequestParams.smali
@@ -100,7 +100,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreAuthentication$AuthRequestParams;->inviteCode:Lcom/discord/stores/StoreInviteSettings$InviteCode;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -110,7 +110,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreAuthentication$AuthRequestParams;->guildTemplateCode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$Companion.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$Companion.smali
index 6076636b86..af625d159a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$Companion.smali
@@ -63,7 +63,7 @@
 
     const-string v0, "AccountManager.get(context)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/accounts/AccountManager;->getAccounts()[Landroid/accounts/Account;
 
@@ -71,7 +71,7 @@
 
     const-string v0, "AccountManager.get(context).accounts"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$authMFA$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$authMFA$1.smali
index f4c169cf00..cedf6e45cd 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$authMFA$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$authMFA$1.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "loginResult"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreAuthentication;->access$dispatchLogin(Lcom/discord/stores/StoreAuthentication;Lcom/discord/models/domain/auth/ModelLoginResult;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$dispatchLogin$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$dispatchLogin$1.smali
index f8e471448d..a48c0c4e7b 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$dispatchLogin$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$dispatchLogin$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$dispatchLogin$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1$2.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1$2.smali
index 68257260f2..8ab8301476 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser$Fingerprint;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
@@ -74,7 +76,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Fingerprint;->getFingerprint()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.smali
index 51ef62760e..a5cdc68ee3 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/String;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/String;",
             ">;"
         }
@@ -86,9 +89,9 @@
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -119,7 +122,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1$2;->INSTANCE:Lcom/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$getIsAuthed$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$getIsAuthed$1.smali
index c0c68715f0..aeb48f15a6 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$getIsAuthed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$getIsAuthed$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$getIsAuthed$1;->call(Ljava/lang/String;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/String;)Z
+.method public final call(Ljava/lang/String;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -86,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$getIsAuthed$1;->call(Ljava/lang/String;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$getPreLogoutSignal$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$getPreLogoutSignal$1.smali
index a278e718e3..1d4a9f9da2 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$getPreLogoutSignal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$getPreLogoutSignal$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$getPreLogoutSignal$1;->call(Ljava/lang/Boolean;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;)Z
+.method public final call(Ljava/lang/Boolean;)Ljava/lang/Boolean;
     .locals 0
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
@@ -84,5 +68,21 @@
 
     xor-int/lit8 p1, p1, 0x1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$getPreLogoutSignal$1;->call(Ljava/lang/Boolean;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali
index bc2614cf35..48f3a8c70c 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/models/domain/ModelUser$Me;",
+        "Ljava/lang/String;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Lcom/discord/stores/StoreNavigation$AgeGate;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$init$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$init$1.smali
index 6e4d8b1b09..45bccd5a6a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$init$1;->call(Ljava/lang/Long;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Long;)Z
+.method public final call(Ljava/lang/Long;)Ljava/lang/Boolean;
     .locals 4
 
     if-nez p1, :cond_0
@@ -102,5 +86,21 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAuthentication$init$1;->call(Ljava/lang/Long;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$init$2.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$init$2.smali
index ad3f7dbf4f..57f2396e04 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$init$2.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Long;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/Boolean;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$init$3.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$init$3.smali
index 3930b78eec..9e066e8b11 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$init$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$init$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -87,7 +87,7 @@
 
     const-string v2, "isLoggedIn"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -95,7 +95,7 @@
 
     const-string v2, "meUserId"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$login$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$login$1.smali
index 714a5a0f17..6cac27158d 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$login$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$login$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/auth/ModelLoginResult;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,6 +83,7 @@
             "Ljava/lang/String;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/auth/ModelLoginResult;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$login$2.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$login$2.smali
index 85df7ad734..66df0dc71a 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$login$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$login$2.smali
@@ -59,7 +59,7 @@
 
     const-string v1, "loginResult"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreAuthentication;->access$dispatchLogin(Lcom/discord/stores/StoreAuthentication;Lcom/discord/models/domain/auth/ModelLoginResult;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$1.smali
index d73aaf8aeb..b061bef0cf 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Void;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Void;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/String;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$2.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$2.smali
index c1ccd56396..03399c0458 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$logout$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$3.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$3.smali
index ed39e5a31b..df0c316c5b 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$logout$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$logout$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$logout$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreAuthentication$logout$3;->this$0:Lcom/discord/stores/StoreAuthentication;
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lcom/discord/stores/StoreAuthentication;->setAuthed(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$1.smali
index e5a1735836..1cbee1f7ae 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreAuthentication$register$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/stores/StoreInviteSettings$InviteCode;",
         "Ljava/lang/String;",
@@ -46,45 +46,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Lcom/discord/stores/StoreAuthentication$AuthRequestParams;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreAuthentication$AuthRequestParams;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;)Lcom/discord/stores/StoreAuthentication$AuthRequestParams;
     .locals 1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$2.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$2.smali
index 0253051f4d..282c397d8c 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreAuthentication$AuthRequestParams;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelUser$Token;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Lcom/discord/stores/StoreAuthentication$AuthRequestParams;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelUser$Token;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$3.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$3.smali
index 9f11d36a2f..b93c497516 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1$3.smali
@@ -75,7 +75,7 @@
 
     const-string v2, "token"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Token;->getToken()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1.smali
index bc9da517ed..3687ab4687 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$register$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$register$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelUser$Token;",
+        ">;>;"
     }
 .end annotation
 
@@ -93,6 +95,7 @@
             "Ljava/lang/String;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelUser$Token;",
             ">;"
         }
@@ -137,7 +140,7 @@
 
     const-string v0, "Observable.combineLatest\u2026RequestParams\n          )"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v4, 0x1f4
 
@@ -155,13 +158,13 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreAuthentication$register$1$2;-><init>(Lcom/discord/stores/StoreAuthentication$register$1;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "Observable.combineLatest\u2026        )\n              }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$1.smali
index c5edef2390..f158021ae1 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$requestConsentRequired$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ConsentRequired;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ConsentRequired;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication$requestConsentRequired$1;->this$0:Lcom/discord/stores/StoreAuthentication;
 
@@ -72,13 +74,4 @@
     invoke-static {v0, p1}, Lcom/discord/stores/StoreAuthentication;->access$setConsentRequired$p(Lcom/discord/stores/StoreAuthentication;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$2.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$2.smali
index 00f643b348..c3dd350d61 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$requestConsentRequired$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreAuthentication$requestConsentRequired$2;->this$0:Lcom/discord/stores/StoreAuthentication;
 
@@ -70,13 +72,4 @@
     invoke-static {p1, v0}, Lcom/discord/stores/StoreAuthentication;->access$setConsentRequired$p(Lcom/discord/stores/StoreAuthentication;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$3.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$3.smali
index ba4bd10fa1..2fd007ff13 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$requestConsentRequired$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$requestConsentRequired$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "consentSubscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication$requestConsentRequired$3;->this$0:Lcom/discord/stores/StoreAuthentication;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreAuthentication;->access$setConsentRequiredSubscription$p(Lcom/discord/stores/StoreAuthentication;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "consentSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$setAgeGateError$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$setAgeGateError$1.smali
index 28e770c5d2..c8d9bdf579 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$setAgeGateError$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$setAgeGateError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreAuthentication$setAgeGateError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreAuthentication.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$startHandOffProcess$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$startHandOffProcess$1.smali
index 15447d5a8c..d63c078e77 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication$startHandOffProcess$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication$startHandOffProcess$1.smali
@@ -3,7 +3,7 @@
 .source "StoreAuthentication.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser$TokenHandoff;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
@@ -74,7 +76,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$TokenHandoff;->getHandoffToken()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication.smali b/com.discord/smali/com/discord/stores/StoreAuthentication.smali
index 8be1beade9..3859f5c847 100644
--- a/com.discord/smali/com/discord/stores/StoreAuthentication.smali
+++ b/com.discord/smali/com/discord/stores/StoreAuthentication.smali
@@ -109,11 +109,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeStream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -153,7 +155,7 @@
 
     const-string p2, "BehaviorSubject.create()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreAuthentication;->ageGateError:Lrx/subjects/BehaviorSubject;
 
@@ -170,20 +172,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreAuthentication;->oauthUriSubject:Lrx/subjects/SerializedSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$dispatchLogin(Lcom/discord/stores/StoreAuthentication;Lcom/discord/models/domain/auth/ModelLoginResult;)V
@@ -281,7 +269,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1;->INSTANCE:Lcom/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -295,7 +283,7 @@
 
     const-string v1, "fingerprintSubject\n     \u2026int(fingerprint, false) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -421,7 +409,7 @@
 
 # virtual methods
 .method public final authMFA(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
-    .locals 3
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -434,31 +422,35 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "code"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "ticket"
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    new-instance v2, Lcom/discord/restapi/RestAPIParams$MFALogin;
+    move-result-object v0
 
-    invoke-direct {v2, p2, p1}, Lcom/discord/restapi/RestAPIParams$MFALogin;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$MFALogin;
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/rest/RestAPI;->postMFACode(Lcom/discord/restapi/RestAPIParams$MFALogin;)Lrx/Observable;
+    invoke-direct {v1, p2, p1}, Lcom/discord/restapi/RestAPIParams$MFALogin;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/rest/RestAPI;->postMFACode(Lcom/discord/restapi/RestAPIParams$MFALogin;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
@@ -472,23 +464,9 @@
 
     const-string p2, "RestAPI\n        .api\n   \u2026in(loginResult)\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "ticket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final forgotPassword(Ljava/lang/String;)Lrx/Observable;
@@ -504,40 +482,35 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "email"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/restapi/RestAPIParams$ForgotPassword;
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$ForgotPassword;
 
-    invoke-direct {v2, p1}, Lcom/discord/restapi/RestAPIParams$ForgotPassword;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, p1}, Lcom/discord/restapi/RestAPIParams$ForgotPassword;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/rest/RestAPI;->forgotPassword(Lcom/discord/restapi/RestAPIParams$ForgotPassword;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/rest/RestAPI;->forgotPassword(Lcom/discord/restapi/RestAPIParams$ForgotPassword;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "email"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getAgeGateError()Lrx/Observable;
@@ -559,7 +532,7 @@
 
     const-string v1, "ageGateError.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -591,7 +564,7 @@
 
     const-string v1, "tokenSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -623,7 +596,7 @@
 
     const-string v1, "fingerprintSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -653,13 +626,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreAuthentication$getIsAuthed$1;->INSTANCE:Lcom/discord/stores/StoreAuthentication$getIsAuthed$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "getAuthedToken()\n      .\u2026 -> authedToken != null }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -683,7 +656,7 @@
 
     const-string v1, "oauthUriSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -703,13 +676,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreAuthentication$getPreLogoutSignal$1;->INSTANCE:Lcom/discord/stores/StoreAuthentication$getPreLogoutSignal$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "userInitiatedAuthEventSu\u2026LoggedIn -> !isLoggedIn }"
+    const-string/jumbo v1, "userInitiatedAuthEventSu\u2026LoggedIn -> !isLoggedIn }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -785,7 +758,7 @@
 
     const-string v1, "Observable.combineLatest\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -878,9 +851,11 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "loginResult"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x1
 
@@ -918,13 +893,6 @@
     invoke-virtual {p1, v1}, Lcom/discord/stores/StoreNux;->setFirstOpen(Z)V
 
     return-void
-
-    :cond_1
-    const-string p1, "loginResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handlePreLogout$app_productionDiscordExternalRelease()V
@@ -947,9 +915,7 @@
     :try_start_0
     const-string v0, "context"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -957,26 +923,28 @@
 
     move-result-object v0
 
-    const-string v2, "STORE_AUTHED_FINGERPRINT"
+    const-string v1, "STORE_AUTHED_FINGERPRINT"
 
-    invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    const/4 v2, 0x0
+
+    invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {p0, v0, v2}, Lcom/discord/stores/StoreAuthentication;->setFingerprint(Ljava/lang/String;Z)V
+    invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreAuthentication;->setFingerprint(Ljava/lang/String;Z)V
 
     :cond_0
     invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    const-string v2, "STORE_AUTHED_TOKEN"
+    const-string v1, "STORE_AUTHED_TOKEN"
 
-    invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -984,7 +952,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/stores/StoreAuthentication;->setAuthed(Ljava/lang/String;)V
 
-    invoke-virtual {p0, v1}, Lcom/discord/stores/StoreAuthentication;->handleAgeGateError(Ljava/lang/String;)V
+    invoke-virtual {p0, v2}, Lcom/discord/stores/StoreAuthentication;->handleAgeGateError(Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefsSessionDurable()Landroid/content/SharedPreferences;
 
@@ -1022,7 +990,7 @@
 
     sget-object v2, Lcom/discord/stores/StoreAuthentication$init$1;->INSTANCE:Lcom/discord/stores/StoreAuthentication$init$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -1034,7 +1002,7 @@
 
     const-string v1, "Observable.combineLatest\u2026 isLoggedIn to meUserId }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1072,14 +1040,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
@@ -1137,11 +1097,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "email"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "password"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreAuthentication;->setEmail(Ljava/lang/String;)V
 
@@ -1153,7 +1115,7 @@
 
     invoke-direct {v1, p1, p2, p3, p4}, Lcom/discord/stores/StoreAuthentication$login$1;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1167,23 +1129,9 @@
 
     const-string p2, "getFingerprintSnapshotOr\u2026lt)\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "email"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final logout()V
@@ -1237,13 +1185,13 @@
 
     invoke-direct {v2, v0}, Lcom/discord/stores/StoreAuthentication$logout$1;-><init>(Lcom/discord/stores/StoreAuthentication;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
     const-string v1, "RestAPI\n        .api\n   \u2026intSnapshotOrGenerate() }"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v4, 0x0
 
@@ -1302,13 +1250,21 @@
 
     move-object v3, p2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "username"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz v3, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "email"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "password"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v8, p0
 
@@ -1324,12 +1280,6 @@
 
     move-object v1, p0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
     move-object v5, p4
 
     move/from16 v6, p5
@@ -1338,42 +1288,15 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/stores/StoreAuthentication$register$1;-><init>(Lcom/discord/stores/StoreAuthentication;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
 
-    invoke-virtual {v9, v10}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v9, v10}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "getFingerprintSnapshotOr\u2026              }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    move-object v8, p0
-
-    const-string v1, "password"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    move-object v8, p0
-
-    const-string v1, "email"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    move-object v8, p0
-
-    const-string v1, "username"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final declared-synchronized requestConsentRequired()V
@@ -1475,9 +1398,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->tokenSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1515,9 +1438,9 @@
 
     iget-object p2, p0, Lcom/discord/stores/StoreAuthentication;->fingerprintSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object p2, p2, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p2, p2, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p2, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p2, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     if-eqz p1, :cond_1
 
@@ -1532,39 +1455,29 @@
     :cond_1
     iget-object p2, p0, Lcom/discord/stores/StoreAuthentication;->fingerprint:Ljava/lang/String;
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_2
 
     iget-object p2, p0, Lcom/discord/stores/StoreAuthentication;->fingerprint:Ljava/lang/String;
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
     xor-int/lit8 p2, p2, 0x1
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_2
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     iget-object p2, p0, Lcom/discord/stores/StoreAuthentication;->fingerprint:Ljava/lang/String;
 
-    if-eqz p2, :cond_2
+    invoke-static {p2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-static {p2, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->externalFingerprintDropped(Ljava/lang/String;Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_3
-    :goto_0
+    :cond_2
     monitor-exit p0
 
     return-void
@@ -1580,24 +1493,17 @@
 .method public final setOAuthUriSubject(Landroid/net/Uri;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->oauthUriSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final startHandOffProcess(Ljava/lang/String;)Lrx/Observable;
@@ -1613,54 +1519,49 @@
         }
     .end annotation
 
+    const-string v0, "handOffKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
+
+    const-string v1, "key"
+
+    invoke-static {v1, p1}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
+
+    move-result-object p1
+
+    const-string v1, "Collections.singletonMap(\"key\", handOffKey)"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/rest/RestAPI;->postAuthHandoff(Ljava/util/Map;)Lrx/Observable;
+
+    move-result-object p1
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    const/4 v1, 0x1
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    const/4 v2, 0x0
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v1
-
-    const-string v2, "key"
-
-    invoke-static {v2, p1}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
-
-    move-result-object p1
-
-    const-string v2, "Collections.singletonMap(\"key\", handOffKey)"
-
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, p1}, Lcom/discord/utilities/rest/RestAPI;->postAuthHandoff(Ljava/util/Map;)Lrx/Observable;
-
-    move-result-object p1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/stores/StoreAuthentication$startHandOffProcess$1;->INSTANCE:Lcom/discord/stores/StoreAuthentication$startHandOffProcess$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "RestAPI\n          .api\n \u2026 .map { it.handoffToken }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "handOffKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreBans$get$1.smali b/com.discord/smali/com/discord/stores/StoreBans$get$1.smali
index e24641c144..1e4af077e6 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$get$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreBans$get$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreBans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,7 +77,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "bans"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreBans$get$1;->this$0:Lcom/discord/stores/StoreBans;
 
@@ -86,13 +88,4 @@
     invoke-static {v0, v1, v2, p1}, Lcom/discord/stores/StoreBans;->access$onLoadedBans(Lcom/discord/stores/StoreBans;JLjava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "bans"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreBans$get$2.smali b/com.discord/smali/com/discord/stores/StoreBans$get$2.smali
index d6cb8b41b0..46244365ce 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$get$2.smali
@@ -3,7 +3,7 @@
 .source "StoreBans.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelBan;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelBan;",
+        ">;>;"
     }
 .end annotation
 
@@ -96,7 +108,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali b/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali
index 6ac8d4060b..d0a437d5c7 100644
--- a/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans$onLoadedBans$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreBans$onLoadedBans$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreBans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -110,7 +110,7 @@
     :goto_0
     const-string v1, "bannedUsers[guildId] ?: \u2026Users[guildId] = it\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreBans$onLoadedBans$1;->$bans:Ljava/util/List;
 
@@ -137,7 +137,7 @@
 
     const-string v4, "ban.user"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreBans.smali b/com.discord/smali/com/discord/stores/StoreBans.smali
index ebb2e7afcc..65a7cdd00b 100644
--- a/com.discord/smali/com/discord/stores/StoreBans.smali
+++ b/com.discord/smali/com/discord/stores/StoreBans.smali
@@ -41,9 +41,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -66,15 +68,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreBans;->bansSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getBannedUsers$p(Lcom/discord/stores/StoreBans;)Ljava/util/HashMap;
@@ -196,7 +189,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreBans$get$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -206,7 +199,7 @@
 
     const-string p2, "bansSubject\n        .map\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -216,7 +209,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "ban"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelBan;->getGuildId()J
 
@@ -228,7 +223,7 @@
 
     const-string v3, "ban.user"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -265,7 +260,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v5, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v5, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-direct {v4, v5}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
@@ -290,15 +285,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "ban"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleBanRemove(Lcom/discord/models/domain/ModelBan;)V
@@ -306,7 +292,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "ban"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelBan;->getGuildId()J
 
@@ -318,7 +306,7 @@
 
     const-string v3, "ban.user"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -359,7 +347,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v4, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v4, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-direct {p1, v4}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
@@ -384,15 +372,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "ban"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
index 070a5f5f21..92a500c836 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$call$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali
index eac9bf459c..475dce3aa0 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreCalls.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelCall$Ringable;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,14 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelCall$Ringable;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelCall$Ringable;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$2$1$1;->call(Lcom/discord/models/domain/ModelCall$Ringable;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall$Ringable;->isRingable()Z
 
     move-result p1
 
@@ -73,16 +77,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelCall$Ringable;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "it"
+    check-cast p1, Lcom/discord/models/domain/ModelCall$Ringable;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$2$1$1;->call(Lcom/discord/models/domain/ModelCall$Ringable;)Ljava/lang/Boolean;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall$Ringable;->isRingable()Z
+    move-result-object p1
 
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali
index 3aadad2c14..f400510a31 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreCalls.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Integer;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Boolean;",
             ">;"
         }
@@ -89,9 +92,9 @@
 
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -113,7 +116,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v0}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -123,7 +126,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreCalls$call$2$1$1;->INSTANCE:Lcom/discord/stores/StoreCalls$call$2$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2$2.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2$2.smali
index dbf8af62d2..390ae8ea87 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$call$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     const-string v1, "isRingable"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2$3.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2$3.smali
index ee02e3862e..8d908772a8 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$call$2$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreCalls$call$2$3;->this$0:Lcom/discord/stores/StoreCalls$call$2;
 
@@ -86,7 +88,7 @@
 
     const-string v1, "error.response"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -112,13 +114,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
index 9f30d805da..a2a687b2ba 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$call$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -63,7 +63,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -103,13 +103,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreCalls$call$2$1;-><init>(Lcom/discord/stores/StoreCalls$call$2;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "StoreStream\n          .g\u2026            }\n          }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
index 07b0dd18d9..3058290a9c 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$call$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
index 839436297b..acefbd2883 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$4.smali
@@ -27,7 +27,21 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
index 71d4547661..22c6432d95 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$call$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -113,7 +113,7 @@
 
     const-string v1, "channel.dmRecipient"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali
index a9314e3ef0..86b0cf18b3 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$findCall$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$findCall$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelCall;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali b/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali
index 784350dae5..afc36e151b 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$findCall$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$findCall$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelCall;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali
index ead8b7bf72..64c3297da1 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreCalls.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelCall;",
+        ">;",
+        "Lcom/discord/models/domain/ModelCall;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali
index eb1f0b3a47..a1339481f5 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$ring$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$ring$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelCall;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,52 +63,47 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelCall;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "call"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v2
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getChannelId()J
-
-    move-result-wide v3
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getMessageId()J
-
-    move-result-wide v5
-
-    iget-object v7, p0, Lcom/discord/stores/StoreCalls$ring$1;->$recipients:Ljava/util/List;
-
-    invoke-virtual/range {v2 .. v7}, Lcom/discord/utilities/rest/RestAPI;->ring(JJLjava/util/List;)Lrx/Observable;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/stores/StoreCalls$ring$1;->this$0:Lcom/discord/stores/StoreCalls;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
     move-result-object v1
 
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getChannelId()J
+
+    move-result-wide v2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getMessageId()J
+
+    move-result-wide v4
+
+    iget-object v6, p0, Lcom/discord/stores/StoreCalls$ring$1;->$recipients:Ljava/util/List;
+
+    invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/rest/RestAPI;->ring(JJLjava/util/List;)Lrx/Observable;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreCalls$ring$1;->this$0:Lcom/discord/stores/StoreCalls;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
     const/4 v2, 0x2
 
-    invoke-static {v1, v0, v2}, Lf/a/b/q;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
+    invoke-static {v0, v1, v2}, Lf/a/b/s;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
 
     move-result-object v0
 
     invoke-virtual {p1, v0}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali b/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali
index 45bba73e50..d6d91e1689 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$stopRinging$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreCalls$stopRinging$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreCalls.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelCall;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,52 +63,47 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelCall;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "call"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v2
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getChannelId()J
-
-    move-result-wide v3
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getMessageId()J
-
-    move-result-wide v5
-
-    iget-object v7, p0, Lcom/discord/stores/StoreCalls$stopRinging$1;->$recipients:Ljava/util/List;
-
-    invoke-virtual/range {v2 .. v7}, Lcom/discord/utilities/rest/RestAPI;->stopRinging(JJLjava/util/List;)Lrx/Observable;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/stores/StoreCalls$stopRinging$1;->this$0:Lcom/discord/stores/StoreCalls;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
     move-result-object v1
 
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getChannelId()J
+
+    move-result-wide v2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getMessageId()J
+
+    move-result-wide v4
+
+    iget-object v6, p0, Lcom/discord/stores/StoreCalls$stopRinging$1;->$recipients:Ljava/util/List;
+
+    invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/rest/RestAPI;->stopRinging(JJLjava/util/List;)Lrx/Observable;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreCalls$stopRinging$1;->this$0:Lcom/discord/stores/StoreCalls;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
     const/4 v2, 0x2
 
-    invoke-static {v1, v0, v2}, Lf/a/b/q;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
+    invoke-static {v0, v1, v2}, Lf/a/b/s;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
 
     move-result-object v0
 
     invoke-virtual {p1, v0}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls.smali b/com.discord/smali/com/discord/stores/StoreCalls.smali
index a8f8f5a8f8..dffcc25571 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls.smali
@@ -83,7 +83,9 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -122,15 +124,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreCalls;->visiblePrivateCallChannelOverride:Lrx/subjects/SerializedSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getStream$p(Lcom/discord/stores/StoreCalls;)Lcom/discord/stores/StoreStream;
@@ -244,9 +237,9 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     return-void
@@ -296,7 +289,7 @@
 
     const/16 v6, 0xc
 
-    invoke-static/range {v1 .. v6}, Lf/a/b/q;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
+    invoke-static/range {v1 .. v6}, Lf/a/b/s;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -306,7 +299,7 @@
 
     const-string v0, "get(channelId)\n        .\u2026l }, null as ModelCall?))"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -376,7 +369,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;JLkotlin/jvm/functions/Function0;)V
-    .locals 15
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -392,38 +385,42 @@
 
     move-wide/from16 v9, p4
 
-    const/4 v11, 0x0
+    const-string v0, "appComponent"
 
-    if-eqz p1, :cond_2
+    move-object v4, p1
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "context"
 
-    new-instance v12, Lcom/discord/stores/StoreCalls$call$1;
+    move-object/from16 v5, p2
 
-    move-object v13, p0
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v12, p0, v9, v10}, Lcom/discord/stores/StoreCalls$call$1;-><init>(Lcom/discord/stores/StoreCalls;J)V
+    const-string v0, "fragmentManager"
 
-    new-instance v14, Lcom/discord/stores/StoreCalls$call$2;
+    move-object/from16 v8, p3
 
-    move-object v0, v14
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v11, Lcom/discord/stores/StoreCalls$call$1;
+
+    move-object v12, p0
+
+    invoke-direct {v11, p0, v9, v10}, Lcom/discord/stores/StoreCalls$call$1;-><init>(Lcom/discord/stores/StoreCalls;J)V
+
+    new-instance v13, Lcom/discord/stores/StoreCalls$call$2;
+
+    move-object v0, v13
 
     move-object v1, p0
 
     move-wide/from16 v2, p4
 
-    move-object/from16 v4, p1
-
-    move-object/from16 v5, p2
-
-    move-object v6, v12
+    move-object v6, v11
 
     move-object/from16 v7, p6
 
-    move-object/from16 v8, p3
-
     invoke-direct/range {v0 .. v8}, Lcom/discord/stores/StoreCalls$call$2;-><init>(Lcom/discord/stores/StoreCalls;JLcom/discord/app/AppComponent;Landroid/content/Context;Lcom/discord/stores/StoreCalls$call$1;Lkotlin/jvm/functions/Function0;Landroidx/fragment/app/FragmentManager;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -438,11 +435,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreCalls$call$3;->INSTANCE:Lcom/discord/stores/StoreCalls$call$3;
 
-    const-wide/16 v2, 0x1388
+    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    const/4 v3, 0x0
 
-    invoke-static {v1, v11, v2, v3, v4}, Lf/a/b/q;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
+    const-wide/16 v4, 0x1388
+
+    invoke-static {v1, v3, v4, v5, v2}, Lf/a/b/s;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -476,10 +475,14 @@
 
     const-string v0, "Observable\n        .zip(\u2026       )\n        .take(1)"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreCalls;
 
+    new-instance v8, Lcom/discord/stores/StoreCalls$call$5;
+
+    invoke-direct {v8, v13, v11}, Lcom/discord/stores/StoreCalls$call$5;-><init>(Lcom/discord/stores/StoreCalls$call$2;Lcom/discord/stores/StoreCalls$call$1;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -488,10 +491,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/stores/StoreCalls$call$5;
-
-    invoke-direct {v8, v14, v12}, Lcom/discord/stores/StoreCalls$call$5;-><init>(Lcom/discord/stores/StoreCalls$call$2;Lcom/discord/stores/StoreCalls$call$1;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -499,33 +498,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    move-object v13, p0
-
-    const-string v0, "fragmentManager"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v11
-
-    :cond_1
-    move-object v13, p0
-
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v11
-
-    :cond_2
-    move-object v13, p0
-
-    const-string v0, "appComponent"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v11
 .end method
 
 .method public final get(J)Lrx/Observable;
@@ -545,13 +517,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreCalls$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "callsSubject\n          .\u2026lls -> calls[channelId] }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -563,87 +535,81 @@
 
     const-string p2, "callsSubject\n          .\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
 
 .method public final handleCallCreateOrUpdate(Lcom/discord/models/domain/ModelCall;)V
-    .locals 5
+    .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "call"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getChannelId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    iget-object v3, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
+    iget-object v2, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v4
-
-    invoke-virtual {v3, v4}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
-    check-cast v3, Lcom/discord/models/domain/ModelCall;
+    invoke-virtual {v2, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    move-result-object v2
 
-    move-result v3
+    check-cast v2, Lcom/discord/models/domain/ModelCall;
 
-    const/4 v4, 0x1
+    invoke-static {p1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    xor-int/2addr v3, v4
+    move-result v2
 
-    if-eqz v3, :cond_0
+    const/4 v3, 0x1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
+    xor-int/2addr v2, v3
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    if-eqz v2, :cond_0
 
-    move-result-object v1
+    iget-object v2, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
 
-    invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    const/4 v0, 0x1
+    move-result-object v0
+
+    invoke-interface {v2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
 
     :cond_0
-    invoke-direct {p0, v0}, Lcom/discord/stores/StoreCalls;->callSubjectUpdate(Z)V
+    const/4 v3, 0x0
+
+    :goto_0
+    invoke-direct {p0, v3}, Lcom/discord/stores/StoreCalls;->callSubjectUpdate(Z)V
 
     return-void
-
-    :cond_1
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleCallDelete(Lcom/discord/models/domain/ModelCall;)V
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "callDelete"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelCall;->getChannelId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     iget-object p1, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {p1, v3}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v2}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -651,27 +617,22 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreCalls;->calls:Ljava/util/HashMap;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    const/4 v1, 0x0
+
+    invoke-interface {p1, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/stores/StoreCalls;->callSubjectUpdate$default(Lcom/discord/stores/StoreCalls;ZILjava/lang/Object;)V
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/stores/StoreCalls;->callSubjectUpdate$default(Lcom/discord/stores/StoreCalls;ZILjava/lang/Object;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "callDelete"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleChannelSelect(J)V
@@ -770,9 +731,9 @@
 
     move-result-object p1
 
-    iget-object p2, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p2, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p2, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p2, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali b/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
index 90babee2ef..ba3a022b2d 100644
--- a/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
+++ b/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
@@ -136,7 +136,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreCallsIncoming;->incomingCallsPublisher:Lrx/subjects/Subject;
 
-    sget-object v1, Lf/a/b/o;->d:Lf/a/b/o;
+    sget-object v1, Lf/a/b/q;->d:Lf/a/b/q;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -298,7 +298,7 @@
 
     sget-object v1, Lf/a/k/a;->d:Lf/a/k/a;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -329,7 +329,7 @@
 
     invoke-direct {v1, v2}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali b/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali
index ef31cb9f95..190eee32f8 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$createChangeLogNotice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChangeLog$createChangeLogNotice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChangeLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "appActivity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChangeLog$createChangeLogNotice$1;->this$0:Lcom/discord/stores/StoreChangeLog;
 
@@ -74,13 +76,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "appActivity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog$handleConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreChangeLog$handleConnectionOpen$1.smali
index e01e16cafe..4a1f56a1a8 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$handleConnectionOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$handleConnectionOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChangeLog$handleConnectionOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChangeLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,9 +73,9 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreChangeLog$handleConnectionOpen$1;->this$0:Lcom/discord/stores/StoreChangeLog;
 
-    const-string v2, "userId"
+    const-string/jumbo v2, "userId"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -85,7 +85,7 @@
 
     const-string v4, "targetLanguage"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0, v2, v3, p1}, Lcom/discord/stores/StoreChangeLog;->access$shouldShowChangelog(Lcom/discord/stores/StoreChangeLog;Landroid/content/Context;JLjava/lang/String;)Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali b/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali
index 4cd7158774..a362a6295c 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChangeLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChangeLog$lastSeenChangeLogVersion$1;->$value:Ljava/lang/String;
 
@@ -70,13 +72,4 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
index 3a2709a1b5..eef007f93e 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
@@ -17,13 +17,17 @@
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreNotices;Lcom/discord/stores/StoreUser;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "notices"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "users"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -34,27 +38,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreChangeLog;->users:Lcom/discord/stores/StoreUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "notices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$createChangeLogNotice(Lcom/discord/stores/StoreChangeLog;)Lcom/discord/stores/StoreNotices$Notice;
@@ -216,7 +199,7 @@
 .method private final shouldShowChangelog(Landroid/content/Context;JLjava/lang/String;)Z
     .locals 4
 
-    const v0, 0x7f1203de
+    const v0, 0x7f1203df
 
     const-string v1, "en"
 
@@ -228,7 +211,7 @@
 
     move-result-object v0
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p4, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p4
 
@@ -240,7 +223,7 @@
 
     if-eqz p4, :cond_0
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p4
 
@@ -249,7 +232,7 @@
     return v3
 
     :cond_0
-    const p4, 0x7f1203df
+    const p4, 0x7f1203e0
 
     invoke-virtual {p1, p4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -257,7 +240,7 @@
 
     const-string p4, "context.getString(R.string.change_log_md_date)"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreChangeLog;->getLastSeenChangeLogVersion()Ljava/lang/String;
 
@@ -265,7 +248,7 @@
 
     if-eqz p4, :cond_2
 
-    invoke-static {p4}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p4}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p4
 
@@ -298,7 +281,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -327,7 +310,7 @@
     :cond_0
     const-string v0, "app"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -337,7 +320,9 @@
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getUserSettings()Lcom/discord/models/domain/ModelUserSettings;
 
@@ -345,7 +330,7 @@
 
     const-string v0, "payload.userSettings"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getLocale()Ljava/lang/String;
 
@@ -365,12 +350,16 @@
 
     move-result-object v1
 
-    const-string v0, "users\n        .observeMe\u2026  .distinctUntilChanged()"
+    const-string/jumbo v0, "users\n        .observeMe\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/stores/StoreChangeLog;
 
+    new-instance v7, Lcom/discord/stores/StoreChangeLog$handleConnectionOpen$1;
+
+    invoke-direct {v7, p0, p1}, Lcom/discord/stores/StoreChangeLog$handleConnectionOpen$1;-><init>(Lcom/discord/stores/StoreChangeLog;Ljava/lang/String;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -379,10 +368,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/stores/StoreChangeLog$handleConnectionOpen$1;
-
-    invoke-direct {v7, p0, p1}, Lcom/discord/stores/StoreChangeLog$handleConnectionOpen$1;-><init>(Lcom/discord/stores/StoreChangeLog;Ljava/lang/String;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -390,149 +375,112 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final init(Landroid/app/Application;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "app"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreChangeLog;->app:Landroid/app/Application;
 
     return-void
-
-    :cond_0
-    const-string p1, "app"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final markSeen(Ljava/lang/String;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "currentVersion"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreChangeLog;->setLastSeenChangeLogVersion(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/stores/StoreChangeLog;->notices:Lcom/discord/stores/StoreNotices;
+    iget-object v1, p0, Lcom/discord/stores/StoreChangeLog;->notices:Lcom/discord/stores/StoreNotices;
 
-    const-wide/16 v2, 0x0
+    const-string v2, "CHANGE_LOG"
 
-    const/4 v4, 0x2
+    const-wide/16 v3, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x2
 
-    const-string v1, "CHANGE_LOG"
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
+    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "currentVersion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final openChangeLog(Landroid/content/Context;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
 
-    sget-object v0, Lcom/discord/widgets/settings/WidgetChangeLog;->Companion:Lcom/discord/widgets/settings/WidgetChangeLog$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f1203df
+    sget-object v1, Lcom/discord/widgets/settings/WidgetChangeLog;->Companion:Lcom/discord/widgets/settings/WidgetChangeLog$Companion;
 
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    const v0, 0x7f1203e0
 
-    move-result-object v2
-
-    const-string v1, "context.getString(R.string.change_log_md_date)"
-
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v1, 0x7f1203e1
-
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const-string v1, "context.getString(R.string.change_log_md_revision)"
+    const-string v0, "context.getString(R.string.change_log_md_date)"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f1203e2
+    const v0, 0x7f1203e2
 
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
-    const-string v1, "context.getString(R.string.change_log_md_video)"
+    const-string v0, "context.getString(R.string.change_log_md_revision)"
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f1203de
+    const v0, 0x7f1203e3
 
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
-    const-string v1, "context.getString(R.string.change_log_md_body)"
+    const-string v0, "context.getString(R.string.change_log_md_video)"
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v1, p1
+    const v0, 0x7f1203df
 
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/settings/WidgetChangeLog$Companion;->launch(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v0, "context.getString(R.string.change_log_md_body)"
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v2, p1
+
+    invoke-virtual/range {v1 .. v6}, Lcom/discord/widgets/settings/WidgetChangeLog$Companion;->launch(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setApp(Landroid/app/Application;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreChangeLog;->app:Landroid/app/Application;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali
index d2365a5472..aa0fab76c4 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories$getChannelCategories$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelCategories.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
index 247f89b941..c26a974bc5 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories$getCollapsedCategories$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelCategories.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Ljava/util/HashSet<",
+        "Ljava/lang/Long;",
+        ">;>;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -92,7 +100,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories$setCollapsedCategory$1.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories$setCollapsedCategory$1.smali
index d93fd41fd3..90fa4b9336 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories$setCollapsedCategory$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories$setCollapsedCategory$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelCategories$setCollapsedCategory$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelCategories.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
index efcf2daa22..5d32a33043 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
@@ -43,11 +43,13 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreChannels;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "channelStore"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -72,20 +74,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreChannelCategories;->collapsedCategoriesCache:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$setCollapsedCategoryInternal(Lcom/discord/stores/StoreChannelCategories;JJZ)V
@@ -196,13 +184,13 @@
 
     sget-object p2, Lcom/discord/stores/StoreChannelCategories$getChannelCategories$1;->INSTANCE:Lcom/discord/stores/StoreChannelCategories$getChannelCategories$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n          .g\u2026ilter { it.isCategory } }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -214,7 +202,7 @@
 
     const-string p2, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -332,13 +320,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreChannelCategories$getCollapsedCategories$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "collapsedCategoriesCache\u2026[guildId] ?: emptySet() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -350,7 +338,7 @@
 
     const-string p2, "collapsedCategoriesCache\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -360,7 +348,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_6
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashSet;
 
@@ -378,7 +368,7 @@
 
     const-string v1, "payload.guilds"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -402,7 +392,7 @@
 
     const-string v3, "guild"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -430,7 +420,7 @@
 
     const-string v4, "guild.channels"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -451,7 +441,7 @@
 
     const-string v5, "channel"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -549,15 +539,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreChannelCategories;->isDirty:Z
 
     return-void
-
-    :cond_6
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final init()V
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$1.smali
index c5212050ef..94374b0b44 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelMembers$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelMembers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1$1.smali
index 4d8281e36a..869d0763db 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelMembers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -72,6 +78,7 @@
             "Lcom/discord/models/domain/ModelGuildRole;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/String;",
             ">;"
         }
@@ -85,7 +92,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -107,11 +114,11 @@
 
     if-eqz p1, :cond_0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
     const-string v0, "everyone"
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -126,15 +133,15 @@
 
     const-string v1, "channel.permissionOverwrites"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/stores/StoreChannelMembers$MemberListIdCalculator;->access$computeIdFromOverwrites(Lcom/discord/stores/StoreChannelMembers$MemberListIdCalculator;Ljava/util/Map;)Ljava/lang/String;
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1.smali
index f13ca677cd..1963d6812d 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelMembers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/String;",
             ">;"
         }
@@ -86,11 +89,11 @@
 
     if-nez p1, :cond_0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
     const-string v0, "everyone"
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -105,9 +108,9 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
@@ -126,7 +129,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -140,7 +143,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali
index da9f57ab30..57367082be 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali
@@ -157,7 +157,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v0}, Lj0/i/l;->sorted(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->sorted(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v2
 
@@ -175,7 +175,7 @@
 
     const-string v3, ","
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -187,7 +187,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static {p1, v2, v1, v2}, Lf/n/a/k/a;->P(Ljava/lang/CharSequence;III)I
+    invoke-static {p1, v2, v1, v2}, Lf/n/a/k/a;->M(Ljava/lang/CharSequence;III)I
 
     move-result p1
 
@@ -217,7 +217,7 @@
 
 # virtual methods
 .method public final computeMemberListId(Lkotlin/jvm/functions/Function1;J)Lrx/Observable;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -234,7 +234,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelsProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -248,22 +250,13 @@
 
     sget-object p2, Lcom/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1;->INSTANCE:Lcom/discord/stores/StoreChannelMembers$MemberListIdCalculator$computeMemberListId$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "channelsProvider(channel\u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "channelsProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateException.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateException.smali
index 34cd9fa76b..9d6977ba2f 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateException.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateException.smali
@@ -16,20 +16,13 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Exception;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger$logUpdate$groupLog$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger$logUpdate$groupLog$1.smali
index 500b54988a..e37555711b 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger$logUpdate$groupLog$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger$logUpdate$groupLog$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelMembers$MemberListUpdateLogger$logUpdate$groupLog$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelMembers.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -49,29 +49,19 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)Ljava/lang/CharSequence;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelMembers$MemberListUpdateLogger$logUpdate$groupLog$1;->invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)Ljava/lang/String;
-    .locals 0
-
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;->getCount()I
 
@@ -82,13 +72,16 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelMembers$MemberListUpdateLogger$logUpdate$groupLog$1;->invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger.smali
index b09ecfed9e..3dddbed2cc 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListUpdateLogger.smali
@@ -86,49 +86,53 @@
 
 # virtual methods
 .method public final dumpLogs(JLjava/lang/String;Ljava/lang/Exception;)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "memberListId"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "exception"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/stores/StoreChannelMembers$MemberListUpdateLogger;->makeLogKey(JLjava/lang/String;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/stores/StoreChannelMembers$MemberListUpdateLogger;->opLogs:Ljava/util/Map;
+    sget-object v1, Lcom/discord/stores/StoreChannelMembers$MemberListUpdateLogger;->opLogs:Ljava/util/Map;
 
-    invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v2, v1
+    move-object v1, v0
 
-    check-cast v2, Ljava/util/List;
+    check-cast v1, Ljava/util/List;
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v3, "guildId: "
+    const-string v2, "guildId: "
 
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     const-string p1, " -- memberListId: "
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string p1, " -- LAST 20 UPDATES:\n"
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
@@ -138,20 +142,23 @@
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0x3e
 
-    const/16 v9, 0x3e
+    const-string v2, "\n"
 
-    const-string v3, "\n"
+    invoke-static/range {v1 .. v8}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    move-result-object p1
 
-    move-result-object v0
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const/4 p1, 0x0
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    :goto_0
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
@@ -178,26 +185,14 @@
     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
 
     return-void
-
-    :cond_1
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "memberListId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final logUpdate(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
     .locals 10
 
-    if-eqz p1, :cond_8
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate;->getOperations()Ljava/util/List;
 
@@ -389,7 +384,7 @@
 
     const-string v3, ","
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -455,7 +450,7 @@
 
     const-string v3, "\n"
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -479,13 +474,4 @@
     invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_8
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$doFlush$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$doFlush$1.smali
index 93085ad71c..b26a81cd2c 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$doFlush$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$doFlush$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelMembers$doFlush$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelMembers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$get$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$get$1.smali
index 10ac1dc422..06b9053667 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelMembers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Ljava/lang/String;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
             ">;"
         }
@@ -84,7 +87,7 @@
 
     const-string v3, "listId"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1, v2, p1}, Lcom/discord/stores/StoreChannelMembers;->access$getMemberListObservable(Lcom/discord/stores/StoreChannelMembers;JLjava/lang/String;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$1.smali
index 03505d5af4..7f985127e7 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelMembers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
+        ">;>;",
+        "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2$1.smali
index d20219f17c..b7f509e62b 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelMembers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
+        ">;"
     }
 .end annotation
 
@@ -58,7 +60,7 @@
 
     const-string v2, "approximateMemberCount"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2.smali
index ba67415cc0..9acb4ae1c4 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$getMemberListObservable$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelMembers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,6 +79,7 @@
             "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
             ">;"
         }
@@ -84,9 +87,9 @@
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -113,7 +116,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreChannelMembers$getMemberListObservable$2$1;-><init>(Lcom/discord/stores/StoreChannelMembers$getMemberListObservable$2;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.smali
index d37d2ab644..81038b7e73 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelMembers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;",
         "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate$Group;)Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2;->this$0:Lcom/discord/stores/StoreChannelMembers;
 
@@ -64,15 +66,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali
index 0e90ca9a7b..1e56d697ca 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$handleGuildRoleUpdate$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelMembers$handleGuildRoleUpdate$$inlined$forEach$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelMembers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
index 36f880f17e..99653a93e2 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
@@ -110,15 +110,21 @@
         }
     .end annotation
 
-    const/4 v6, 0x0
+    const-string v0, "storeStream"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "channelsProvider"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildMemberCountsProvider"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -136,7 +142,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannelMembers;->memberLists:Ljava/util/HashMap;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -152,7 +158,7 @@
 
     const-string p2, "flushTrigger"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 p2, 0x1
 
@@ -178,7 +184,17 @@
 
     and-int/lit8 p2, p2, 0x20
 
-    new-instance p2, Lf/a/b/a0;
+    const-string p2, "onNext"
+
+    invoke-static {v4, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "errorClass"
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lf/a/b/c0;
+
+    const/4 v6, 0x0
 
     move-object v0, p2
 
@@ -188,39 +204,11 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildMemberCountsProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string p1, "channelsProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string p1, "storeStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public static final synthetic access$doFlush(Lcom/discord/stores/StoreChannelMembers;)V
@@ -472,7 +460,7 @@
 
     invoke-direct {v1, p1, p2, p3}, Lcom/discord/stores/StoreChannelMembers$getMemberListObservable$1;-><init>(JLjava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -480,13 +468,13 @@
 
     invoke-direct {v1, p0, p1, p2, p3}, Lcom/discord/stores/StoreChannelMembers$getMemberListObservable$2;-><init>(Lcom/discord/stores/StoreChannelMembers;JLjava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "memberListPublisher\n    \u2026            }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -597,6 +585,10 @@
     invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :goto_0
+    const-string v1, "memberLists[guildId]\n   \u2026mberLists[guildId] = it }"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
@@ -678,7 +670,7 @@
 
     move-result v2
 
-    if-eqz v2, :cond_5
+    if-eqz v2, :cond_4
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -688,7 +680,7 @@
 
     instance-of v3, v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_2
 
     check-cast v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
 
@@ -700,11 +692,11 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_2
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v3, "item.member.user!!"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -723,16 +715,9 @@
     goto :goto_3
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_3
     instance-of v3, v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
 
-    if-eqz v3, :cond_4
+    if-eqz v3, :cond_3
 
     check-cast v2, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
 
@@ -749,19 +734,19 @@
 
     goto :goto_2
 
-    :cond_4
+    :cond_3
     new-instance p1, Lkotlin/NoWhenBranchMatchedException;
 
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p1
 
-    :cond_5
+    :cond_4
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Sync;->getRange()Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1052,7 +1037,7 @@
 
     if-eqz v6, :cond_3
 
-    const v6, 0x7f12155f
+    const v6, 0x7f121589
 
     goto :goto_2
 
@@ -1066,9 +1051,9 @@
 
     move-result-object v7
 
-    const-string v9, "user.getNickOrUsername(member)"
+    const-string/jumbo v9, "user.getNickOrUsername(member)"
 
-    invoke-static {v7, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->isBot()Z
 
@@ -1207,7 +1192,7 @@
 
     instance-of v0, p3, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     check-cast p3, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$MemberItem;
 
@@ -1219,11 +1204,11 @@
 
     move-result-object p3
 
-    if-eqz p3, :cond_0
+    invoke-static {p3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v0, "item.member.user!!"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -1244,16 +1229,9 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
     instance-of v0, p3, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     check-cast p3, Lcom/discord/models/domain/ModelGuildMemberListUpdate$Operation$Item$GroupItem;
 
@@ -1268,7 +1246,7 @@
     :goto_0
     return-object p1
 
-    :cond_2
+    :cond_1
     new-instance p1, Lkotlin/NoWhenBranchMatchedException;
 
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
@@ -1305,13 +1283,13 @@
 
     invoke-direct {p4, p0, p1, p2}, Lcom/discord/stores/StoreChannelMembers$get$1;-><init>(Lcom/discord/stores/StoreChannelMembers;J)V
 
-    invoke-virtual {p3, p4}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, p4}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "MemberListIdCalculator.c\u2026ldId, listId)\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1321,7 +1299,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_7
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMemberListUpdate;->getGuildId()J
 
@@ -1451,15 +1431,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreChannelMembers;->isDirty:Z
 
     return-void
-
-    :cond_7
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(J)V
@@ -1492,7 +1463,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "roleUpdate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
@@ -1557,15 +1530,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreChannelMembers;->isDirty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "roleUpdate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$1.smali
index 013e17c7fb..6a718c3b51 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$1;->call(Lcom/discord/models/domain/ModelChannel;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelChannel;)Z
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -88,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$1;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$2.smali
index e5beb927c6..f87b7c6c64 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,12 +71,13 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelChannel;",
             ">;"
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
 
@@ -82,9 +85,9 @@
 
     if-eqz v0, :cond_0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -119,11 +122,4 @@
 
     :goto_0
     return-object v0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$1.smali
index 5488b887bc..cef37498f8 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Lrx/Observable<",
+        "Ljava/lang/Void;",
+        ">;>;"
     }
 .end annotation
 
@@ -82,7 +85,7 @@
 
     const-string v2, "channel"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -90,7 +93,7 @@
 
     const-string v3, "recipientId"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2$1.smali
index c2752d368d..b562471cb8 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "Ljava/lang/Void;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -47,14 +51,15 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/List;)J
+.method public final call(Ljava/util/List;)Ljava/lang/Long;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
             "Ljava/lang/Void;",
-            ">;)J"
+            ">;)",
+            "Ljava/lang/Long;"
         }
     .end annotation
 
@@ -64,27 +69,27 @@
 
     const-string v0, "channel"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$3$2$1;->call(Ljava/util/List;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$3$2$1;->call(Ljava/util/List;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2.smali
index 23fe19c4e0..52fe278326 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "Ljava/lang/Void;",
+        ">;>;",
+        "Lrx/Observable<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -71,6 +76,7 @@
             "Ljava/lang/Void;",
             ">;>;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -92,7 +98,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreChannels$addGroupRecipients$3$2$1;-><init>(Lcom/discord/stores/StoreChannels$addGroupRecipients$3$2;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3.smali
index 49f3d1b4c4..a90abb9477 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -80,7 +83,7 @@
 
     const-string v0, "channel"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -118,7 +121,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$3$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -130,7 +133,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$3$2;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$1.smali
index a69cbf5aba..014e8bd2e1 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$4$1;->call(Lcom/discord/models/domain/ModelChannel;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelChannel;)Z
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -88,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$4$1;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$2.smali
index 45174ebcf6..acfa4c9ae1 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,37 +59,30 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelChannel;)J
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
     .locals 2
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v0
 
-    return-wide v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$4$2;->call(Lcom/discord/models/domain/ModelChannel;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$addGroupRecipients$4$2;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4.smali
index 44324ae70f..e51a891c98 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$4.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -78,7 +81,7 @@
 
     const-string v1, "createdChannelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -90,13 +93,13 @@
 
     sget-object v0, Lcom/discord/stores/StoreChannels$addGroupRecipients$4$1;->INSTANCE:Lcom/discord/stores/StoreChannels$addGroupRecipients$4$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/stores/StoreChannels$addGroupRecipients$4$2;->INSTANCE:Lcom/discord/stores/StoreChannels$addGroupRecipients$4$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$1$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$1$1.smali
index ec8accd3c6..75f5091198 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannels$createGroupWithRecipients$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannels.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreChannels;->handleChannelCreated(Lcom/discord/models/domain/ModelChannel;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2.smali
index f78a39c9fb..14b732e6a3 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$createGroupWithRecipients$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,32 +59,32 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelChannel;)J
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
     .locals 2
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$createGroupWithRecipients$2;->call(Lcom/discord/models/domain/ModelChannel;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$createGroupWithRecipients$2;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$1.smali
index e155fd20d3..c28e79ad8c 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$1.smali
@@ -65,9 +65,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$2.smali
index 7ab47cbfdd..b8ab5a8bd2 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,32 +59,32 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelChannel;)J
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
     .locals 2
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$createPrivateChannel$1$2;->call(Lcom/discord/models/domain/ModelChannel;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$createPrivateChannel$1$2;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1.smali
index 3c99157324..e15784c00c 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$createPrivateChannel$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -76,6 +82,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -94,9 +101,7 @@
 
     move-result v0
 
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -106,17 +111,17 @@
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_1
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v1
 
@@ -134,18 +139,13 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
@@ -154,9 +154,9 @@
 
     new-instance v0, Lcom/discord/restapi/RestAPIParams$CreateChannel;
 
-    iget-wide v2, p0, Lcom/discord/stores/StoreChannels$createPrivateChannel$1;->$userId:J
+    iget-wide v1, p0, Lcom/discord/stores/StoreChannels$createPrivateChannel$1;->$userId:J
 
-    invoke-direct {v0, v2, v3}, Lcom/discord/restapi/RestAPIParams$CreateChannel;-><init>(J)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/restapi/RestAPIParams$CreateChannel;-><init>(J)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/rest/RestAPI;->userCreateChannel(Lcom/discord/restapi/RestAPIParams$CreateChannel;)Lrx/Observable;
 
@@ -164,9 +164,11 @@
 
     const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v0, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
@@ -180,7 +182,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreChannels$createPrivateChannel$1$2;->INSTANCE:Lcom/discord/stores/StoreChannels$createPrivateChannel$1$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$delete$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$delete$1.smali
index 86883e9975..bf71bb3fae 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$delete$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$delete$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$delete$1;->call(Lcom/discord/models/domain/ModelChannel;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelChannel;)Z
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -94,5 +78,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$delete$1;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
index 3b4b7c8ff9..5df28aae9a 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannels$delete$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannels.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     const-string v1, "channel"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isCategory()Z
 
@@ -79,12 +79,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f1203cc
+    const p1, 0x7f1203cd
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1203f8
+    const p1, 0x7f1203f9
 
     :goto_0
     const/4 v1, 0x0
@@ -93,7 +93,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$get$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$get$1.smali
index 8b399cca8d..476a29a381 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali
index 7b94794b9d..c512cd9d09 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$1.smali
index de6065a909..ae1c50abb5 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
         "+",
@@ -63,23 +63,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$getDirectShareCandidates$1;->call(Ljava/util/Map;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Map;)Z
+.method public final call(Ljava/util/Map;)Ljava/lang/Boolean;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,13 +72,14 @@
             "Ljava/lang/Long;",
             "+",
             "Lcom/discord/models/domain/ModelChannel;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map;->isEmpty()Z
 
@@ -102,5 +87,21 @@
 
     xor-int/lit8 p1, p1, 0x1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$getDirectShareCandidates$1;->call(Ljava/util/Map;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$2.smali
index cc8e45f0d3..89ff92a2bf 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$getDirectShareCandidates$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -179,7 +187,7 @@
 
     move-result v0
 
-    invoke-static {p1, v0}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$getForGuild$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$getForGuild$1.smali
index 71b607230f..c0cacd6127 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$getForGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$getForGuild$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,19 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -76,6 +85,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelChannel;",
@@ -85,7 +95,7 @@
 
     const-string v0, "channels"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -184,9 +194,9 @@
     goto :goto_0
 
     :cond_5
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$getIds$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$getIds$1.smali
index 172442130d..64825c613e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$getIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$getIds$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,19 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$getPrivate$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$getPrivate$1.smali
index b75c2af109..5843606f0f 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$getPrivate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$getPrivate$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannels.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannels.smali b/com.discord/smali/com/discord/stores/StoreChannels.smali
index 98d7e957f9..fcd4bcaacb 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels.smali
@@ -105,11 +105,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -141,7 +143,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsCache:Lcom/discord/utilities/persister/Persister;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -149,17 +151,17 @@
 
     const-string p2, "BehaviorSubject.create(emptyMap())"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsByIdSubject:Lrx/subjects/BehaviorSubject;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannels;->channelNamesSubject:Lrx/subjects/BehaviorSubject;
 
@@ -178,20 +180,6 @@
     invoke-interface {p1, p2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreChannels;)Lcom/discord/stores/Dispatcher;
@@ -230,13 +218,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreChannels$addGroupRecipients$1;->INSTANCE:Lcom/discord/stores/StoreChannels$addGroupRecipients$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "getPrivate(channelId)\n  \u2026nnel -> channel != null }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0x0
 
@@ -254,7 +242,7 @@
 
     invoke-direct {v1, p3}, Lcom/discord/stores/StoreChannels$addGroupRecipients$2;-><init>(Ljava/util/List;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -262,7 +250,7 @@
 
     invoke-direct {v1, p1, p2, p3}, Lcom/discord/stores/StoreChannels$addGroupRecipients$3;-><init>(JLjava/util/List;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -270,13 +258,13 @@
 
     invoke-direct {p2, p0}, Lcom/discord/stores/StoreChannels$addGroupRecipients$4;-><init>(Lcom/discord/stores/StoreChannels;)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string p1, "getPrivate(channelId)\n  \u2026dChannel!!.id }\n        }"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v1, 0x0
 
@@ -364,7 +352,7 @@
 
     const-string p1, "RestAPI\n          .api\n \u2026dleChannelCreated(it) } }"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v2, 0xbb8
 
@@ -380,13 +368,13 @@
 
     sget-object v0, Lcom/discord/stores/StoreChannels$createGroupWithRecipients$2;->INSTANCE:Lcom/discord/stores/StoreChannels$createGroupWithRecipients$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "RestAPI\n          .api\n \u2026\n          .map { it.id }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
@@ -427,7 +415,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "recipients"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -474,15 +464,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "recipients"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final createGroupOrAddGroupRecipients(Ljava/lang/Long;Ljava/util/List;)Lrx/Observable;
@@ -500,7 +481,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "recipientIds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -521,15 +504,6 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "recipientIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final createPrivateChannel(J)Lrx/Observable;
@@ -557,88 +531,83 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreChannels$createPrivateChannel$1;-><init>(Lcom/discord/stores/StoreChannels;J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "privateChannels\n        \u2026 .map { it.id }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
 
 .method public final delete(Landroid/content/Context;J)V
-    .locals 11
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/lang/ref/WeakReference;
+    new-instance v0, Ljava/lang/ref/WeakReference;
 
-    invoke-direct {v1, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    sget-object v2, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v2}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2, p2, p3}, Lcom/discord/utilities/rest/RestAPI;->deleteChannel(J)Lrx/Observable;
+    invoke-virtual {v1, p2, p3}, Lcom/discord/utilities/rest/RestAPI;->deleteChannel(J)Lrx/Observable;
 
     move-result-object p2
 
     const/4 p3, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p2, p3, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p2, p3, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p2
 
     sget-object p3, Lcom/discord/stores/StoreChannels$delete$1;->INSTANCE:Lcom/discord/stores/StoreChannels$delete$1;
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
     const-string p3, "RestAPI\n        .api\n   \u2026l && !channel.isPrivate }"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v1
 
-    const/4 v5, 0x0
+    new-instance v5, Lcom/discord/stores/StoreChannels$delete$2;
 
-    new-instance v6, Lcom/discord/stores/StoreChannels$delete$2;
+    invoke-direct {v5, v0}, Lcom/discord/stores/StoreChannels$delete$2;-><init>(Ljava/lang/ref/WeakReference;)V
 
-    invoke-direct {v6, v1}, Lcom/discord/stores/StoreChannels$delete$2;-><init>(Ljava/lang/ref/WeakReference;)V
+    const-string v3, "REST: delete channel"
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0x34
 
-    const/16 v9, 0x34
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    move-object v2, p1
 
-    const-string v4, "REST: delete channel"
-
-    move-object v3, p1
-
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final get()Lrx/Observable;
@@ -682,7 +651,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreChannels$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -692,7 +661,7 @@
 
     const-string p2, "get()\n          .map { c\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -861,13 +830,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreChannels$getDMs$1;->INSTANCE:Lcom/discord/stores/StoreChannels$getDMs$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "privateChannels\n        \u2026annel -> channel.isDM } }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -886,7 +855,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreChannels;->get()Lrx/Observable;
 
@@ -894,7 +865,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreChannels$getDirectShareCandidates$1;->INSTANCE:Lcom/discord/stores/StoreChannels$getDirectShareCandidates$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -902,24 +873,15 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreChannels$getDirectShareCandidates$2;-><init>(Landroid/content/Context;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "get()\n          .filter \u2026ity(context))\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getForGuild(J)Lrx/Observable;
@@ -975,13 +937,13 @@
 
     invoke-direct {v1, p1, p2, p3}, Lcom/discord/stores/StoreChannels$getForGuild$1;-><init>(JLjava/lang/Integer;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "get()\n      .switchMap {\u2026st(guildChannels)\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -993,7 +955,7 @@
 
     const-string p2, "get()\n      .switchMap {\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1048,13 +1010,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreChannels$getIds$1;->INSTANCE:Lcom/discord/stores/StoreChannels$getIds$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "get()\n          .map { c\u2026            }\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1066,7 +1028,7 @@
 
     const-string v1, "get()\n          .map { c\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1096,7 +1058,7 @@
 
     const-string v1, "channelNamesSubject\n    \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1117,13 +1079,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreChannels;->getNames()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {p1}, Lf/a/b/q;->a(Ljava/util/Collection;)Lrx/Observable$c;
+    invoke-static {p1}, Lf/a/b/s;->a(Ljava/util/Collection;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -1133,18 +1097,9 @@
 
     const-string v0, "names.compose(AppTransfo\u2026rs.filterMap(channelIds))"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "channelIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getPrivate(J)Lrx/Observable;
@@ -1166,7 +1121,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreChannels$getPrivate$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1176,7 +1131,7 @@
 
     const-string p2, "privateChannels\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1216,7 +1171,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_7
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isManaged()Z
 
@@ -1249,7 +1206,7 @@
     :goto_0
     const-string v1, "if (!channel.isPrivate) \u2026 else PRIVATE_CHANNELS_ID"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -1290,7 +1247,7 @@
 
     check-cast v4, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -1371,7 +1328,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1392,7 +1349,7 @@
 
     const-string v2, "channel.name"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1400,61 +1357,78 @@
     iput-boolean v7, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
 
     return-void
-
-    :cond_7
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleChannelDeleted(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 7
+    .locals 6
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    const-wide/16 v1, 0x0
+    const-wide/16 v0, 0x0
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_0
-    const-string v2, "if (!channel.isPrivate) \u2026 else PRIVATE_CHANNELS_ID"
+    const-string v1, "if (!channel.isPrivate) \u2026 else PRIVATE_CHANNELS_ID"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
     iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    invoke-interface {p1, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    const/4 v4, 0x1
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v5
+
+    invoke-interface {p1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v5
 
@@ -1462,73 +1436,34 @@
 
     move-result p1
 
-    const/4 v5, 0x1
-
-    if-eqz p1, :cond_3
-
-    iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v6
-
-    invoke-interface {p1, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_2
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v6
-
-    invoke-interface {p1, v6}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-interface {p1, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
     if-eqz p1, :cond_1
 
+    iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
     check-cast p1, Ljava/util/Map;
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
     invoke-interface {p1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-boolean v5, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
-
-    goto :goto_1
+    iput-boolean v4, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
 
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
-    :goto_1
     iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map;
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
@@ -1536,27 +1471,20 @@
 
     move-result p1
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_2
 
     iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map;
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
     invoke-interface {p1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-boolean v5, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
+    iput-boolean v4, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
 
-    :cond_4
+    :cond_2
     return-void
-
-    :cond_5
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
@@ -1564,7 +1492,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_9
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
 
@@ -1603,7 +1533,7 @@
 
     const-string v1, "payload.privateChannels"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -1633,7 +1563,7 @@
 
     const-string v6, "it"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->isManaged()Z
 
@@ -1667,7 +1597,7 @@
 
     const-string v3, "privateChannel"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -1688,7 +1618,7 @@
 
     const-string v0, "payload.guilds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1711,7 +1641,7 @@
 
     const-string v2, "guild"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1742,7 +1672,7 @@
 
     const-string v2, "guild.channels"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1763,7 +1693,7 @@
 
     const-string v5, "channel"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -1852,10 +1782,6 @@
 
     move-result-object v2
 
-    const-string v5, "channel.name"
-
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_3
@@ -1864,203 +1790,178 @@
     iput-boolean v4, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
 
     return-void
-
-    :cond_9
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGroupDMRecipient(Lcom/discord/models/domain/ModelChannel$Recipient;Z)V
-    .locals 16
+    .locals 13
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    move-object/from16 v0, p0
+    const-string v0, "recipient"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_5
+    iget-object v0, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
 
-    iget-object v2, v0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
+    const-wide/16 v1, 0x0
 
-    const-wide/16 v3, 0x0
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v3, v4}, 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 v0
+
+    check-cast v0, Ljava/util/Map;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getChannelId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
-    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v0
 
-    check-cast v2, Ljava/util/Map;
+    move-object v4, v0
 
-    if-eqz v2, :cond_4
+    check-cast v4, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getChannelId()J
+    if-eqz v4, :cond_3
 
-    move-result-wide v8
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object v3
+    const-string v3, "existing.guildId"
 
-    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v2
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-object v3, v2
+    move-result-wide v9
 
-    check-cast v3, Lcom/discord/models/domain/ModelChannel;
-
-    if-eqz v3, :cond_4
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v2
-
-    const-string v4, "existing.guildId"
-
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v10
-
-    const-string v2, "recipient.user"
+    const-string v0, "recipient.user"
 
     if-eqz p2, :cond_1
 
-    new-instance v4, Ljava/util/ArrayList;
+    new-instance p2, Ljava/util/ArrayList;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v3
 
-    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    invoke-direct {p2, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v5
+    move-result-object v3
 
-    invoke-static {v5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v4, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {p2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_0
-    move-object v6, v4
+    move-object v7, p2
 
     goto :goto_1
 
     :cond_1
-    new-instance v4, Ljava/util/ArrayList;
+    new-instance p2, Ljava/util/ArrayList;
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v3
 
-    invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v5
+    move-result-object v3
 
     :cond_2
     :goto_0
-    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v5
 
-    if-eqz v6, :cond_0
+    if-eqz v5, :cond_0
 
-    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v5
 
-    check-cast v6, Lcom/discord/models/domain/ModelUser;
+    check-cast v5, Lcom/discord/models/domain/ModelUser;
 
-    const-string v7, "existingRecipient"
+    const-string v6, "existingRecipient"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v12
+    move-result-wide v6
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v7
+    move-result-object v8
 
-    invoke-static {v7, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v8}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v14
+    move-result-wide v11
 
-    cmp-long v7, v12, v14
+    cmp-long v8, v6, v11
 
-    if-eqz v7, :cond_2
+    if-eqz v8, :cond_2
 
-    invoke-interface {v4, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {p2, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :goto_1
-    new-instance v12, Lcom/discord/models/domain/ModelChannel;
+    new-instance p2, Lcom/discord/models/domain/ModelChannel;
 
-    move-object v2, v12
+    move-object v3, p2
 
-    move-wide v4, v10
+    move-wide v5, v9
 
-    move-object/from16 v7, p1
+    move-object v8, p1
 
-    invoke-direct/range {v2 .. v7}, Lcom/discord/models/domain/ModelChannel;-><init>(Lcom/discord/models/domain/ModelChannel;JLjava/util/List;Lcom/discord/models/domain/ModelChannel$Recipient;)V
+    invoke-direct/range {v3 .. v8}, Lcom/discord/models/domain/ModelChannel;-><init>(Lcom/discord/models/domain/ModelChannel;JLjava/util/List;Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
-    iget-object v2, v0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
+    iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
 
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v3
+    move-result-object v0
 
-    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object p1
 
-    if-eqz v2, :cond_3
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    check-cast v2, Ljava/util/Map;
+    check-cast p1, Ljava/util/Map;
 
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v2, v1, v12}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const/4 v1, 0x1
+    const/4 p1, 0x1
 
-    iput-boolean v1, v0, Lcom/discord/stores/StoreChannels;->isDirty:Z
-
-    return-void
+    iput-boolean p1, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
 
     :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_4
     return-void
-
-    :cond_5
-    const-string v2, "recipient"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
@@ -2068,7 +1969,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChannels;->channelsByGuild:Ljava/util/Map;
 
@@ -2118,7 +2021,7 @@
 
     const-string v3, "channel"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -2154,7 +2057,7 @@
 
     const-string v5, "channel.name"
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v4, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2166,15 +2069,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -2182,7 +2076,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -2270,15 +2166,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final init$app_productionDiscordExternalRelease()V
@@ -2294,7 +2181,7 @@
 
     check-cast v0, Ljava/lang/Iterable;
 
-    invoke-static {v0}, Lj0/i/l;->filterNotNull(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->filterNotNull(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali
index 7fdca76092..a391041c5d 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;
-.super Lj0/o/b;
+.super Lk0/p/b;
 .source "Delegates.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/o/b<",
+        "Lk0/p/b<",
         "Ljava/lang/Long;",
         ">;"
     }
@@ -36,7 +36,7 @@
 
     iput-object p3, p0, Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;->this$0:Lcom/discord/stores/StoreChannelsSelected;
 
-    invoke-direct {p0, p2}, Lj0/o/b;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, p2}, Lk0/p/b;-><init>(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -56,7 +56,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "property"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p3, Ljava/lang/Number;
 
@@ -84,19 +86,10 @@
 
     move-result-object p1
 
-    iget-object p2, p3, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p2, p3, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p2, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p2, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali
index 172d30b2ac..9016cc9abf 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/ModelChannel;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali
index 61e9a9c670..61cd6b34b0 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/ModelChannel;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -137,13 +137,13 @@
 
     const-string v2, "ModelChannel.getSortByNameAndType()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali
index e0ef2f4842..626f1e7b58 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion.smali
@@ -34,7 +34,7 @@
 
 # virtual methods
 .method public final create(Ljava/lang/Long;Ljava/util/Map;JLjava/util/Map;)Lcom/discord/stores/StoreChannelsSelected$Selected;
-    .locals 8
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -52,15 +52,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channels"
 
-    if-eqz p2, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_3
+    const-string v0, "permissions"
 
-    new-instance v7, Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$1;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v1, v7
+    new-instance v0, Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$1;
+
+    move-object v1, v0
 
     move-object v2, p1
 
@@ -76,7 +78,7 @@
 
     invoke-direct {p1, p2, p3, p4, p5}, Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$2;-><init>(Ljava/util/Map;JLjava/util/Map;)V
 
-    invoke-virtual {v7}, Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$1;->invoke()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$1;->invoke()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object p2
 
@@ -89,15 +91,17 @@
     goto :goto_0
 
     :cond_0
-    const-wide/16 v1, 0x0
+    const/4 p2, 0x0
 
-    cmp-long p2, p3, v1
+    const-wide/16 v0, 0x0
 
-    if-nez p2, :cond_1
+    cmp-long p5, p3, v0
+
+    if-nez p5, :cond_1
 
     new-instance p1, Lcom/discord/stores/StoreChannelsSelected$Selected;
 
-    invoke-direct {p1, v0, v1, v2}, Lcom/discord/stores/StoreChannelsSelected$Selected;-><init>(Lcom/discord/models/domain/ModelChannel;J)V
+    invoke-direct {p1, p2, v0, v1}, Lcom/discord/stores/StoreChannelsSelected$Selected;-><init>(Lcom/discord/models/domain/ModelChannel;J)V
 
     goto :goto_0
 
@@ -110,9 +114,9 @@
 
     new-instance p1, Lcom/discord/stores/StoreChannelsSelected$Selected;
 
-    const-wide/16 p2, -0x1
+    const-wide/16 p3, -0x1
 
-    invoke-direct {p1, v0, p2, p3}, Lcom/discord/stores/StoreChannelsSelected$Selected;-><init>(Lcom/discord/models/domain/ModelChannel;J)V
+    invoke-direct {p1, p2, p3, p4}, Lcom/discord/stores/StoreChannelsSelected$Selected;-><init>(Lcom/discord/models/domain/ModelChannel;J)V
 
     goto :goto_0
 
@@ -125,18 +129,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_3
-    const-string p1, "permissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
index f380e6b72b..b4324426da 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected.smali
@@ -48,7 +48,9 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -57,15 +59,6 @@
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/stores/StoreChannelsSelected$Selected;-><init>(Lcom/discord/models/domain/ModelChannel;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;J)V
@@ -147,7 +140,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreChannelsSelected$Selected;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali
index 4de6d9f2d5..9b7cbd41d9 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelsSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali
index 460d6712ad..b16c3dc9ff 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1.smali
@@ -27,7 +27,18 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lcom/discord/stores/StoreChannelsSelected$Selected;",
+        ">;"
     }
 .end annotation
 
@@ -77,7 +88,7 @@
 
     const-string v2, "channels"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2$1;->this$0:Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2;
 
@@ -85,7 +96,7 @@
 
     const-string v3, "selectedGuildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
@@ -93,7 +104,7 @@
 
     const-string v2, "permissions"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v2, p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali
index dde3b4406d..7b918469a5 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelsSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreChannelsSelected$Selected;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/stores/StoreChannelsSelected$Selected;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali
index 62036e80fd..616217de65 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelsSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreChannelsSelected$Selected;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/stores/StoreChannelsSelected$Selected;",
             ">;"
         }
@@ -88,7 +91,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$1;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -100,7 +103,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1$2;-><init>(Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1;Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
index 3620896c23..7d0550fdd5 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreChannelsSelected$Selected;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 
     move-result-object v1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreChannelsSelected$Selected;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -89,7 +89,7 @@
 
     const-string v2, "guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali
index 42ef4cd9a7..6b55cda296 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$1.smali
@@ -27,7 +27,18 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali
index f8f1a468f3..5614939ab8 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$2.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelsSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$2;->call(Lcom/discord/models/domain/ModelChannel;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelChannel;)Z
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -88,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$2;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali
index 12af0b5854..a4664d8109 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$findAndSet$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali
index 256a6068e4..c41772b4da 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelsSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2$1.smali
index 5f1242f1e5..b9424129fe 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2$1;->this$0:Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;
 
@@ -73,9 +75,9 @@
 
     move-result-object p1
 
-    const-string v1, "view.context"
+    const-string/jumbo v1, "view.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2$1;->this$0:Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;
 
@@ -86,13 +88,4 @@
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/stores/StoreChannelsSelected;->findAndSet(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
index b674ec3c5a..c993cad8c2 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     const-string p1, "StringBuilder()\n        \u2026              .toString()"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "android.resource://"
 
@@ -101,7 +101,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v2, "/2131231474"
+    const-string v2, "/2131231475"
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -115,7 +115,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/notice/WidgetNoticePopup;->Companion:Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali
index c2d80e1974..c3f032e1fc 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$findAndSet$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,11 @@
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_0
+    const-string v1, "it"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -93,13 +97,13 @@
 
     sget-object v2, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$1;->INSTANCE:Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "StoreStream\n            \u2026isExperimentalAlphaUser }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -111,6 +115,10 @@
 
     move-result-object v4
 
+    new-instance v9, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;
+
+    invoke-direct {v9, v0}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;-><init>(Lcom/discord/stores/StoreChannelsSelected$findAndSet$4;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -119,10 +127,6 @@
 
     const/4 v8, 0x0
 
-    new-instance v9, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;
-
-    invoke-direct {v9, v0}, Lcom/discord/stores/StoreChannelsSelected$findAndSet$4$2;-><init>(Lcom/discord/stores/StoreChannelsSelected$findAndSet$4;)V
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -143,7 +147,7 @@
 
     const-string v1, "javaClass.simpleName"
 
-    invoke-static {v13, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -170,13 +174,4 @@
     invoke-static/range {v12 .. v17}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "it"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali
index d767d86339..2c529e56b2 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$findAndSetDirectMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali
index 53ee0a3c08..7c8c69d5b8 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleConnectionOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$handleConnectionOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,7 +81,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "selectedChannelIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -177,13 +179,4 @@
 
     :goto_1
     return-object v0
-
-    :cond_3
-    const-string p1, "selectedChannelIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali
index 458e223b7a..4f83064a37 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$handleSelectChannelId$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$observeId$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$observeId$1.smali
index 52053b594a..911e78d084 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$observeId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$observeId$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChannelsSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelChannel;)J
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
     .locals 2
 
     if-eqz p1, :cond_0
@@ -72,21 +74,21 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$observeId$1;->call(Lcom/discord/models/domain/ModelChannel;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannelsSelected$observeId$1;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali
index aa1cb05c73..92c3b47cac 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$set$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$2.smali
index 46a89a0a1d..83c63145b3 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$set$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -37,7 +37,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$3.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$3.smali
index 2fff626a24..3f8fd228a3 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$set$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreChannelsSelected$set$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreChannelsSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
index 1b04b1bab5..5544d19824 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
@@ -78,31 +78,27 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 5
+    .locals 6
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/m;
+    new-instance v1, Lk0/o/c/n;
 
     const-class v2, Lcom/discord/stores/StoreChannelsSelected;
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
     const-string v3, "selectedId"
 
     const-string v4, "getSelectedId$app_productionDiscordExternalRelease()J"
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/m;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    const/4 v5, 0x0
 
-    invoke-static {v1}, Lj0/n/c/s;->mutableProperty1(Lj0/n/c/l;)Lj0/r/c;
+    invoke-direct {v1, v2, v3, v4, v5}, Lk0/o/c/n;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
-    const/4 v2, 0x0
+    invoke-static {v1}, Lk0/o/c/t;->mutableProperty1(Lk0/o/c/m;)Lk0/s/c;
 
-    aput-object v1, v0, v2
+    aput-object v1, v0, v5
 
     sput-object v0, Lcom/discord/stores/StoreChannelsSelected;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -118,13 +114,15 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -132,17 +130,17 @@
 
     iput-object p2, p0, Lcom/discord/stores/StoreChannelsSelected;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    new-instance p1, Ljava/util/LinkedHashMap;
+    new-instance p1, Lcom/discord/utilities/persister/Persister;
 
-    invoke-direct {p1}, Ljava/util/LinkedHashMap;-><init>()V
+    new-instance p2, Ljava/util/LinkedHashMap;
 
-    new-instance p2, Lcom/discord/utilities/persister/Persister;
+    invoke-direct {p2}, Ljava/util/LinkedHashMap;-><init>()V
 
     const-string v0, "STORE_SELECTED_CHANNELS_V6"
 
-    invoke-direct {p2, v0, p1}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lcom/discord/stores/StoreChannelsSelected;->selectedChannelIds:Lcom/discord/utilities/persister/Persister;
+    iput-object p1, p0, Lcom/discord/stores/StoreChannelsSelected;->selectedChannelIds:Lcom/discord/utilities/persister/Persister;
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
@@ -164,21 +162,21 @@
 
     invoke-static {p2}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object p2
+    move-result-object v0
 
-    invoke-direct {p1, p2}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+    invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannelsSelected;->previouslySelectedChannelIdSubject:Lrx/subjects/SerializedSubject;
 
     new-instance p1, Lcom/discord/utilities/persister/Persister;
 
-    new-instance p2, Lcom/discord/widgets/user/search/ChannelFrecencyTracker;
+    new-instance v0, Lcom/discord/widgets/user/search/ChannelFrecencyTracker;
 
-    invoke-direct {p2}, Lcom/discord/widgets/user/search/ChannelFrecencyTracker;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/search/ChannelFrecencyTracker;-><init>()V
 
-    const-string v2, "CHANNEL_HISTORY_V2"
+    const-string v1, "CHANNEL_HISTORY_V2"
 
-    invoke-direct {p1, v2, p2}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p1, v1, v0}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannelsSelected;->frecencyCache:Lcom/discord/utilities/persister/Persister;
 
@@ -190,31 +188,13 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreChannelsSelected;->frecency:Lcom/discord/widgets/user/search/ChannelFrecencyTracker;
 
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    new-instance p1, Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;
 
-    move-result-object p1
+    invoke-direct {p1, p2, p2, p0}, Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;-><init>(Ljava/lang/Object;Ljava/lang/Object;Lcom/discord/stores/StoreChannelsSelected;)V
 
-    new-instance p2, Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;
-
-    invoke-direct {p2, p1, p1, p0}, Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;-><init>(Ljava/lang/Object;Ljava/lang/Object;Lcom/discord/stores/StoreChannelsSelected;)V
-
-    iput-object p2, p0, Lcom/discord/stores/StoreChannelsSelected;->selectedId$delegate:Lkotlin/properties/ReadWriteProperty;
+    iput-object p1, p0, Lcom/discord/stores/StoreChannelsSelected;->selectedId$delegate:Lkotlin/properties/ReadWriteProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getPreviouslySelectedChannelIdSubject$p(Lcom/discord/stores/StoreChannelsSelected;)Lrx/subjects/SerializedSubject;
@@ -274,13 +254,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$1;-><init>(Lcom/discord/stores/StoreChannelsSelected;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "stream\n        .guildSel\u2026              }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -292,7 +272,7 @@
 
     const-string v0, "stream\n        .guildSel\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/stores/StoreChannelsSelected;
 
@@ -503,7 +483,9 @@
 .method public final findAndSet(Landroid/content/Context;J)V
     .locals 10
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
@@ -544,13 +526,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreChannelsSelected$findAndSet$2;->INSTANCE:Lcom/discord/stores/StoreChannelsSelected$findAndSet$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "Observable\n        .comb\u2026   .filter { it != null }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0x0
 
@@ -591,15 +573,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final findAndSetDirectMessage(Landroid/content/Context;)V
@@ -623,7 +596,9 @@
 .method public final findAndSetDirectMessage(Landroid/content/Context;J)V
     .locals 9
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
@@ -673,15 +648,6 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final get()Lrx/Observable;
@@ -816,7 +782,7 @@
     :try_start_0
     const-string v0, "payload"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuilds()Ljava/util/List;
 
@@ -824,7 +790,7 @@
 
     const-string v0, "payload.guilds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -863,7 +829,7 @@
 
     const-string v3, "guild"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -892,16 +858,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -951,13 +907,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreChannelsSelected$observeId$1;->INSTANCE:Lcom/discord/stores/StoreChannelsSelected$observeId$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "selectedChannelSubject.m\u2026it?.id ?: ID_UNSELECTED }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1017,13 +973,13 @@
 
     if-nez v3, :cond_0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, v2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v1, "Observable.just(null)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1072,19 +1028,19 @@
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v9
 
     const-string v0, "filter { it != null }.map { it!! }"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v10, 0x0
 
@@ -1132,7 +1088,7 @@
 .end method
 
 .method public final set(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 7
+    .locals 8
 
     if-eqz p1, :cond_0
 
@@ -1142,21 +1098,25 @@
 
     if-eqz v0, :cond_0
 
+    const-string v1, "channel?.guildId ?: return"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v3
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v4
+    move-result-wide v5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
-    move-result v6
+    move-result v7
 
-    move-object v1, p0
+    move-object v2, p0
 
-    invoke-virtual/range {v1 .. v6}, Lcom/discord/stores/StoreChannelsSelected;->set(JJI)V
+    invoke-virtual/range {v2 .. v7}, Lcom/discord/stores/StoreChannelsSelected;->set(JJI)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali b/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali
index bfff220bea..f69ef9cb3b 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$EditingMessage.smali
@@ -26,11 +26,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelMessage;Ljava/lang/CharSequence;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,20 +43,6 @@
     iput-boolean p3, p0, Lcom/discord/stores/StoreChat$EditingMessage;->isEdited:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreChat$EditingMessage;Lcom/discord/models/domain/ModelMessage;Ljava/lang/CharSequence;ZILjava/lang/Object;)Lcom/discord/stores/StoreChat$EditingMessage;
@@ -117,31 +105,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelMessage;Ljava/lang/CharSequence;Z)Lcom/discord/stores/StoreChat$EditingMessage;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreChat$EditingMessage;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreChat$EditingMessage;-><init>(Lcom/discord/models/domain/ModelMessage;Ljava/lang/CharSequence;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -159,7 +135,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreChat$EditingMessage;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -169,7 +145,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreChat$EditingMessage;->content:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali
index 322e4bcbea..e7b6c6cefd 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$1.smali
@@ -3,7 +3,7 @@
 .source "StoreChat.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/ArrayList<",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali
index fc4e71db33..f3e916ec44 100644
--- a/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat$toggleBlockedMessageGroup$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreChat$toggleBlockedMessageGroup$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreChat.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subjects/SerializedSubject;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subjects/SerializedSubject;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onNext"
+
+    const-string v5, "onNext(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subjects/SerializedSubject;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -94,13 +78,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChat.smali b/com.discord/smali/com/discord/stores/StoreChat.smali
index 43126eb295..7d8e29d6f7 100644
--- a/com.discord/smali/com/discord/stores/StoreChat.smali
+++ b/com.discord/smali/com/discord/stores/StoreChat.smali
@@ -109,7 +109,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -234,7 +234,7 @@
 
     const-string v1, "editingMessageSubject\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -275,7 +275,7 @@
 
     const-string v1, "externalMessageTextSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -303,7 +303,7 @@
 
     const-string v1, "interactionStateSubject\n\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -333,7 +333,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreChat;->editingMessageSubject:Lrx/subjects/Subject;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -341,7 +341,9 @@
 .method public final setExternalMessageText(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChat;->externalMessageTextSubject:Lrx/subjects/BehaviorSubject;
 
@@ -354,36 +356,20 @@
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setInteractionState(Lcom/discord/stores/StoreChat$InteractionState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "interactionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreChat;->interactionStateSubject:Lrx/subjects/Subject;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "interactionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setTextChannelInput(JLjava/lang/CharSequence;)V
@@ -449,13 +435,13 @@
 
     invoke-direct {v2, v3, v4}, Lcom/discord/stores/StoreChat$toggleBlockedMessageGroup$1;-><init>(J)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
     const-string v1, "expandedBlockedMessageGr\u2026  }\n          }\n        }"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v4, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreClientDataState$ClientDataState.smali b/com.discord/smali/com/discord/stores/StoreClientDataState$ClientDataState.smali
index d081d21190..5644bfdb52 100644
--- a/com.discord/smali/com/discord/stores/StoreClientDataState$ClientDataState.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientDataState$ClientDataState.smali
@@ -57,7 +57,7 @@
 .end method
 
 .method public constructor <init>(Ljava/util/Map;JII)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -68,7 +68,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildHashes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -81,15 +83,6 @@
     iput p5, p0, Lcom/discord/stores/StoreClientDataState$ClientDataState;->userGuildSettingsVersion:I
 
     return-void
-
-    :cond_0
-    const-string p1, "guildHashes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/util/Map;JIIILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -264,32 +257,25 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildHashes"
 
-    new-instance v6, Lcom/discord/stores/StoreClientDataState$ClientDataState;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/stores/StoreClientDataState$ClientDataState;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-wide v2, p2
+    move-object v2, p1
 
-    move v4, p4
+    move-wide v3, p2
 
-    move v5, p5
+    move v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreClientDataState$ClientDataState;-><init>(Ljava/util/Map;JII)V
+    move v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreClientDataState$ClientDataState;-><init>(Ljava/util/Map;JII)V
 
-    :cond_0
-    const-string p1, "guildHashes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -307,7 +293,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreClientDataState$ClientDataState;->guildHashes:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -567,7 +553,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_5
+    if-eqz v1, :cond_4
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -583,7 +569,7 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_4
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     check-cast v1, [Ljava/lang/String;
 
@@ -592,13 +578,6 @@
     goto :goto_3
 
     :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_5
     iget-wide v6, p0, Lcom/discord/stores/StoreClientDataState$ClientDataState;->highestLastMessageId:J
 
     iget v8, p0, Lcom/discord/stores/StoreClientDataState$ClientDataState;->readStateVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreClientDataState$observeClientState$1.smali b/com.discord/smali/com/discord/stores/StoreClientDataState$observeClientState$1.smali
index c10e6079e8..a54a2785f3 100644
--- a/com.discord/smali/com/discord/stores/StoreClientDataState$observeClientState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientDataState$observeClientState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreClientDataState$observeClientState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreClientDataState.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/stores/StoreClientDataState$ClientDataState;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreClientDataState.smali b/com.discord/smali/com/discord/stores/StoreClientDataState.smali
index 73bfc73171..f272dc14bd 100644
--- a/com.discord/smali/com/discord/stores/StoreClientDataState.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientDataState.smali
@@ -50,7 +50,9 @@
 .method public constructor <init>(Lcom/discord/stores/updates/ObservationDeck;)V
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "observationDeck"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreV2;-><init>()V
 
@@ -89,15 +91,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreClientDataState;->clientDataStateSnapshot:Lcom/discord/stores/StoreClientDataState$ClientDataState;
 
     return-void
-
-    :cond_0
-    const-string p1, "observationDeck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -142,13 +135,13 @@
 
     move-result v0
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     iget-object v0, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
 
@@ -164,24 +157,17 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v2, "guild.guildHashes!!"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
     iget-object v0, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
@@ -244,61 +230,46 @@
 .end method
 
 .method public final handleChannelCreateOrDelete(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 4
+    .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "channel.guildId"
+    const-string v2, "channel.guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    const-string v0, "channel.guildHashes!!"
+    const-string v2, "channel.guildHashes!!"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v1, v2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
-    goto :goto_0
-
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
@@ -306,7 +277,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreClientDataState;->clear()V
 
@@ -335,7 +308,7 @@
 
     const-string v3, "guild"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1}, Lcom/discord/stores/StoreClientDataState;->updateGuildHash(Lcom/discord/models/domain/ModelGuild;)V
 
@@ -360,7 +333,7 @@
 
     check-cast v3, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getLastMessageId()J
 
@@ -392,7 +365,7 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getLastMessageId()J
 
@@ -409,7 +382,7 @@
 
     const-string v1, "payload.readState"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->getVersion()I
 
@@ -423,7 +396,7 @@
 
     const-string v0, "payload.userGuildSettings"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->getVersion()I
 
@@ -434,92 +407,61 @@
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
     return-void
-
-    :cond_3
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleEmojiUpdate(Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;)V
-    .locals 4
+    .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "payload"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->getGuildId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-interface {v1, v2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
-    goto :goto_0
-
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreClientDataState;->updateGuildHash(Lcom/discord/models/domain/ModelGuild;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -527,7 +469,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
 
@@ -544,15 +488,6 @@
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildSettingUpdated(Lcom/discord/models/domain/ModelNotificationSettings;)V
@@ -560,7 +495,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "userGuildSettings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->getVersion()I
 
@@ -580,15 +517,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "userGuildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V
@@ -596,7 +524,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "readState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelReadState;->getVersion()I
 
@@ -616,15 +546,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "readState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageCreate(Lcom/discord/models/domain/ModelMessage;)V
@@ -632,7 +553,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
@@ -643,69 +566,45 @@
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleRoleAddOrRemove(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
-    .locals 4
+    .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "payload"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/stores/StoreClientDataState;->guildHashes:Ljava/util/Map;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildHashes()Lcom/discord/models/domain/ModelGuildHash;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-interface {v1, v2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
-    goto :goto_0
-
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final observeClientState()Lrx/Observable;
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali b/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali
index a829302a2c..babec8021b 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreClientVersion.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Integer;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Integer;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali b/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali
index 486a3c0834..a254416c80 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$init$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreClientVersion$init$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreClientVersion.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreClientVersion;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreClientVersion;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "setClientMinVersion"
+
+    const-string v5, "setClientMinVersion(I)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "setClientMinVersion"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreClientVersion;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "setClientMinVersion(I)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(I)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreClientVersion;
 
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali b/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali
index 198c15bdb6..db78ce05d8 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion$setClientMinVersion$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreClientVersion$setClientMinVersion$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreClientVersion.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreClientVersion$setClientMinVersion$1;->this$0:Lcom/discord/stores/StoreClientVersion;
 
@@ -78,13 +80,4 @@
     invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences$Editor;->putInt(Ljava/lang/String;I)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index b231bb0da5..90ac0cf466 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
-    const/16 v0, 0x4e1
+    const/16 v0, 0x4e3
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 
@@ -97,9 +97,9 @@
 
     move-result-object v1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences;
 
@@ -151,7 +151,7 @@
 
     const-string v1, "clientOutdatedSubject\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -164,7 +164,7 @@
     :try_start_0
     const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -196,13 +196,13 @@
 
     sget-object v0, Lcom/discord/stores/StoreClientVersion$init$1;->INSTANCE:Lcom/discord/stores/StoreClientVersion$init$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "Observable\n        .inte\u2026ClientVersion()\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -236,16 +236,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreConnectionOpen$observeConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreConnectionOpen$observeConnectionOpen$1.smali
index da64f933e1..c9939ee9d3 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectionOpen$observeConnectionOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectionOpen$observeConnectionOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreConnectionOpen$observeConnectionOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreConnectionOpen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectionOpen.smali b/com.discord/smali/com/discord/stores/StoreConnectionOpen.smali
index 55d2b5d0f8..38f6170fa0 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectionOpen.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectionOpen.smali
@@ -13,31 +13,27 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 5
+    .locals 6
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/m;
+    new-instance v1, Lk0/o/c/n;
 
     const-class v2, Lcom/discord/stores/StoreConnectionOpen;
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
     const-string v3, "isConnectionOpen"
 
     const-string v4, "isConnectionOpen()Z"
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/m;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    const/4 v5, 0x0
 
-    invoke-static {v1}, Lj0/n/c/s;->mutableProperty1(Lj0/n/c/l;)Lj0/r/c;
+    invoke-direct {v1, v2, v3, v4, v5}, Lk0/o/c/n;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
-    const/4 v2, 0x0
+    invoke-static {v1}, Lk0/o/c/t;->mutableProperty1(Lk0/o/c/m;)Lk0/s/c;
 
-    aput-object v1, v0, v2
+    aput-object v1, v0, v5
 
     sput-object v0, Lcom/discord/stores/StoreConnectionOpen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -221,10 +217,10 @@
 
     move-result-object v0
 
-    const-string p1, "it.delay(100, TimeUnit.MILLISECONDS)"
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     :cond_0
+    const-string p1, "ObservationDeckProvider\n\u2026            }\n          }"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$Companion.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$Companion.smali
index 74b9c12746..1a6212bfc9 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$Companion.smali
@@ -111,11 +111,11 @@
     return v2
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.net.ConnectivityManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1.smali
index 91279288d4..490f24bfc8 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreConnectivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;->this$0:Lcom/discord/stores/StoreConnectivity;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreConnectivity;->access$setRecentlyForegroundedClearSubscription$p(Lcom/discord/stores/StoreConnectivity;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2.smali
index 6ecad2e00b..732d35a8ff 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreConnectivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$1.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$1.smali
index 447ef92820..8640de99ad 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreConnectivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;->this$0:Lcom/discord/stores/StoreConnectivity;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreConnectivity;->access$setConnectingTransitionTimerSubscription$p(Lcom/discord/stores/StoreConnectivity;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$2.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$2.smali
index 008125586c..7c70004d5c 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreConnectivity$updateConnectivityState$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreConnectivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity.smali b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
index 353aacc29b..f24e90241d 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
@@ -225,7 +225,7 @@
 
     move-result-object p1
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -270,7 +270,7 @@
 
     const-string v0, "Observable\n        .time\u2026W, TimeUnit.MILLISECONDS)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -368,7 +368,7 @@
 
     const-string v1, "Observable\n            .\u2026ILLISECONDS\n            )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -503,7 +503,7 @@
     :try_start_0
     const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/IntentFilter;
 
@@ -527,16 +527,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -568,11 +558,13 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "intent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/stores/StoreConnectivity;->Companion:Lcom/discord/stores/StoreConnectivity$Companion;
 
@@ -583,18 +575,4 @@
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->handleDeviceConnectivityChange(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali
index 73f3f587b7..23879204e4 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$DynamicLinkData.smali
@@ -138,7 +138,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;->fingerprint:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -148,7 +148,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;->inviteCode:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -158,7 +158,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;->guildTemplateCode:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -168,7 +168,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;->authToken:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali
index ab5fc9e521..8d034ce61c 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1.smali
@@ -3,7 +3,7 @@
 .source "StoreDynamicLink.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Throwable;",
         "Landroid/net/Uri;",
         ">;"
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1.smali
index 8122031467..5d14b72782 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreDynamicLink.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/Emitter;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/Emitter;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onError"
+
+    const-string v5, "onError(Ljava/lang/Throwable;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/Emitter;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onError(Ljava/lang/Throwable;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,11 +67,11 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/Emitter;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2.smali
index 4f6745c190..5e9ee4a76b 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2.smali
@@ -80,11 +80,11 @@
     sget-object v1, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
     :goto_1
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1$2;->$it:Lrx/Emitter;
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1.smali
index 3e08657086..dcece7c34d 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Landroid/net/Uri;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali
index ebea5b2548..c649f3a9cf 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$handleDataReceived$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreDynamicLink$handleDataReceived$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreDynamicLink.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali
index fb7c0dd2b0..bfcab11bd0 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0.smali
@@ -23,14 +23,16 @@
 
 
 # virtual methods
-.method public final onFailure(Ljava/lang/Exception;)V
+.method public final synthetic onFailure(Ljava/lang/Exception;)V
     .locals 1
     .param p1    # Ljava/lang/Exception;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "p0"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreDynamicLink$sam$com_google_android_gms_tasks_OnFailureListener$0;->function:Lkotlin/jvm/functions/Function1;
 
@@ -40,16 +42,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p0"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali
index 5cdad48c83..d79b66155b 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.smali
@@ -3,7 +3,7 @@
 .source "StoreDynamicLink.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Landroid/net/Uri;",
+        "Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;",
+        ">;"
     }
 .end annotation
 
@@ -58,11 +60,11 @@
 
 # virtual methods
 .method public final call(Landroid/net/Uri;)Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;
-    .locals 7
+    .locals 8
 
     sget-object v0, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -73,21 +75,25 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    const-string v0, "uri"
+    const-string/jumbo v0, "uri"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$isInviteLink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
     move-result-object v0
 
-    sget-object v2, Lf/a/b/t0/b;->d:Ljava/lang/String;
+    sget-object v2, Lf/a/b/v0/b;->d:Ljava/lang/String;
 
     const/4 v3, 0x1
 
-    invoke-static {v0, v2, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v2, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -99,9 +105,9 @@
 
     move-result-object v0
 
-    sget-object v4, Lf/a/b/t0/b;->a:Ljava/lang/String;
+    sget-object v4, Lf/a/b/v0/b;->a:Ljava/lang/String;
 
-    invoke-static {v0, v4, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v4, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -111,9 +117,9 @@
 
     move-result-object v0
 
-    sget-object v4, Lf/a/b/t0/b;->b:Ljava/lang/String;
+    sget-object v4, Lf/a/b/v0/b;->b:Ljava/lang/String;
 
-    invoke-static {v0, v4, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v4, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -126,7 +132,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v4, Lf/a/b/t0/b;->n:Lkotlin/text/Regex;
+    sget-object v4, Lf/a/b/v0/b;->n:Lkotlin/text/Regex;
 
     invoke-virtual {v4, v0}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
 
@@ -146,27 +152,31 @@
     const/4 v0, 0x1
 
     :goto_1
-    const-string v4, ""
+    const-string/jumbo v4, "uri.path ?: \"\""
+
+    const-string v5, ""
 
     if-eqz v0, :cond_7
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v0, Lf/a/b/t0/b;->n:Lkotlin/text/Regex;
+    sget-object v0, Lf/a/b/v0/b;->n:Lkotlin/text/Regex;
 
     invoke-virtual {p1}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v6
 
-    if-eqz v5, :cond_4
+    if-eqz v6, :cond_4
 
     goto :goto_2
 
     :cond_4
-    move-object v5, v4
+    move-object v6, v5
 
     :goto_2
-    invoke-virtual {v0, v5}, Lkotlin/text/Regex;->matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
+    invoke-static {v6, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v6}, Lkotlin/text/Regex;->matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
 
     move-result-object v0
 
@@ -180,58 +190,62 @@
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
-    move-result v5
+    move-result v6
 
-    invoke-interface {v0, v5}, Ljava/util/List;->listIterator(I)Ljava/util/ListIterator;
+    invoke-interface {v0, v6}, Ljava/util/List;->listIterator(I)Ljava/util/ListIterator;
 
     move-result-object v0
 
     :cond_5
     invoke-interface {v0}, Ljava/util/ListIterator;->hasPrevious()Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_6
+    if-eqz v6, :cond_6
 
     invoke-interface {v0}, Ljava/util/ListIterator;->previous()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v6
 
-    move-object v6, v5
+    move-object v7, v6
 
-    check-cast v6, Ljava/lang/String;
+    check-cast v7, Ljava/lang/String;
 
-    invoke-static {v6}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v7}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
-    move-result v6
+    move-result v7
 
-    xor-int/2addr v6, v3
+    xor-int/2addr v7, v3
 
-    if-eqz v6, :cond_5
+    if-eqz v7, :cond_5
 
     goto :goto_3
 
     :cond_6
-    move-object v5, v1
+    move-object v6, v1
 
     :goto_3
-    check-cast v5, Ljava/lang/String;
+    check-cast v6, Ljava/lang/String;
 
     goto :goto_4
 
     :cond_7
-    move-object v5, v1
+    move-object v6, v1
 
     :goto_4
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
+
+    const-string v0, "$this$isGuildTemplateLink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
     move-result-object v0
 
-    sget-object v6, Lf/a/b/t0/b;->e:Ljava/lang/String;
+    sget-object v7, Lf/a/b/v0/b;->e:Ljava/lang/String;
 
-    invoke-static {v0, v6, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v7, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -241,9 +255,9 @@
 
     move-result-object v0
 
-    sget-object v6, Lf/a/b/t0/b;->a:Ljava/lang/String;
+    sget-object v7, Lf/a/b/v0/b;->a:Ljava/lang/String;
 
-    invoke-static {v0, v6, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v7, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -253,9 +267,9 @@
 
     move-result-object v0
 
-    sget-object v6, Lf/a/b/t0/b;->b:Ljava/lang/String;
+    sget-object v7, Lf/a/b/v0/b;->b:Ljava/lang/String;
 
-    invoke-static {v0, v6, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v7, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -268,9 +282,9 @@
 
     if-eqz v0, :cond_a
 
-    sget-object v6, Lf/a/b/t0/b;->p:Lkotlin/text/Regex;
+    sget-object v7, Lf/a/b/v0/b;->p:Lkotlin/text/Regex;
 
-    invoke-virtual {v6, v0}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
+    invoke-virtual {v7, v0}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -282,9 +296,9 @@
     :cond_a
     if-eqz v2, :cond_e
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v0, Lf/a/b/t0/b;->p:Lkotlin/text/Regex;
+    sget-object v0, Lf/a/b/v0/b;->p:Lkotlin/text/Regex;
 
     invoke-virtual {p1}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -292,10 +306,12 @@
 
     if-eqz v2, :cond_b
 
-    move-object v4, v2
+    move-object v5, v2
 
     :cond_b
-    invoke-virtual {v0, v4}, Lkotlin/text/Regex;->matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v5}, Lkotlin/text/Regex;->matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
 
     move-result-object v0
 
@@ -330,7 +346,7 @@
 
     check-cast v4, Ljava/lang/String;
 
-    invoke-static {v4}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v4}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v4
 
@@ -379,7 +395,7 @@
     :catch_1
     new-instance p1, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;
 
-    invoke-direct {p1, v0, v5, v2, v1}, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {p1, v0, v6, v2, v1}, Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali
index b1fad1d9b2..81c70dc714 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink$storeLinkIfExists$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreDynamicLink.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreDynamicLink$DynamicLinkData;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
index 056448d9a8..1d98d00f78 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
@@ -14,9 +14,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/stores/StoreDynamicLink$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final DYNAMIC_LINK_TIMEOUT_MS:J = 0x3e8L
 
@@ -45,11 +42,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,20 +57,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreDynamicLink;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getStream$p(Lcom/discord/stores/StoreDynamicLink;)Lcom/discord/stores/StoreStream;
@@ -115,13 +100,13 @@
 
     const-string v0, "Observable.create({\n    \u2026.BackpressureMode.BUFFER)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-wide/16 v2, 0x3e8
 
@@ -137,13 +122,13 @@
 
     sget-object v0, Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1;->INSTANCE:Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "Observable\n        .merg\u2026ErrorReturn { Uri.EMPTY }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -173,7 +158,7 @@
 
     if-eqz v3, :cond_1
 
-    invoke-static {v3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
@@ -189,7 +174,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -216,9 +201,9 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -231,7 +216,7 @@
 
     if-eqz v3, :cond_3
 
-    invoke-static {v3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
@@ -247,7 +232,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -274,9 +259,9 @@
     goto :goto_0
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -290,11 +275,13 @@
 .method public final storeLinkIfExists(Landroid/content/Intent;Landroid/content/Context;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreDynamicLink;->getDynamicLinkObservable(Landroid/content/Intent;)Lrx/Observable;
 
@@ -302,13 +289,13 @@
 
     sget-object v0, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$1;->INSTANCE:Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "getDynamicLinkObservable\u2026ode, authToken)\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -326,10 +313,14 @@
 
     const-string p1, "getDynamicLinkObservable\u2026  )\n          }\n        }"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/stores/StoreDynamicLink;
 
+    new-instance v7, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;
+
+    invoke-direct {v7, p0, p2}, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;-><init>(Lcom/discord/stores/StoreDynamicLink;Landroid/content/Context;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -338,10 +329,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;
-
-    invoke-direct {v7, p0, p2}, Lcom/discord/stores/StoreDynamicLink$storeLinkIfExists$3;-><init>(Lcom/discord/stores/StoreDynamicLink;Landroid/content/Context;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -349,18 +336,4 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$1.smali
index 0bf7793c0a..edba931133 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmoji.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
index aadf91be3d..2ca77cb994 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmoji.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$4.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$4.smali
index c771aef0b2..dd0c73f957 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmoji.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/util/Map<",
         "TT;",
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -85,7 +85,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "$this$increment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -111,13 +113,4 @@
     invoke-interface {p1, p2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p1, "$this$increment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5$processGuildEmojis$$inlined$sortedByDescending$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5$processGuildEmojis$$inlined$sortedByDescending$1.smali
index e75a672fbe..1196abcac3 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5$processGuildEmojis$$inlined$sortedByDescending$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5$processGuildEmojis$$inlined$sortedByDescending$1.smali
@@ -55,13 +55,13 @@
 
     const-string v0, "it.name"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
 
     const-string v2, "Locale.ROOT"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, v1}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
@@ -69,7 +69,7 @@
 
     const-string v1, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/models/domain/emoji/ModelEmojiCustom;
 
@@ -77,17 +77,17 @@
 
     move-result-object p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p1}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5.smali b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5.smali
index 10f983f8de..26291fcddd 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$buildUsableEmojiSet$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmoji.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -75,7 +75,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -283,7 +283,7 @@
 
     const-string v8, "emoji.name"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4, v5, v7}, Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$4;->invoke(Ljava/util/Map;Ljava/lang/Object;)V
 
@@ -295,7 +295,7 @@
 
     const-string v5, "emoji.uniqueId"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v4, v3, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -320,7 +320,7 @@
 
     invoke-direct {p2}, Lcom/discord/stores/StoreEmoji$buildUsableEmojiSet$5$processGuildEmojis$$inlined$sortedByDescending$1;-><init>()V
 
-    invoke-static {v2, p2}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v2, p2}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali b/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali
index 8ddfce28a0..209dc45171 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmoji.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -49,29 +49,19 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2;->invoke(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Ljava/lang/String;)Ljava/lang/String;
+.method public final invoke(Ljava/lang/String;)Ljava/lang/CharSequence;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Ljava/util/regex/Pattern;->quote(Ljava/lang/String;)Ljava/lang/String;
 
@@ -79,16 +69,19 @@
 
     const-string v0, "Pattern.quote(it)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji$compileSurrogatesPattern$emojiSurrogatesPattern$2;->invoke(Ljava/lang/String;)Ljava/lang/CharSequence;
+
+    move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$1.smali
index d42fa0be42..4b56dce28d 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$1.smali
@@ -3,7 +3,7 @@
 .source "StoreEmoji.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,14 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji$getEmojiSet$1;->call(Lcom/discord/models/domain/ModelUser;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
 
     move-result p1
 
@@ -73,16 +77,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelUser;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "it"
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji$getEmojiSet$1;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
+    move-result-object p1
 
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$2.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$2.smali
index 1714d8e6c7..7c4f460e22 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$2.smali
@@ -3,7 +3,7 @@
 .source "StoreEmoji.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/LinkedHashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -90,9 +97,9 @@
 
     const-string v0, "it.keys"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$3.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$3.smali
index 6495f6502e..1f9c1caa90 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$3.smali
@@ -29,7 +29,22 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lkotlin/Triple<",
+        "+",
+        "Ljava/lang/Boolean;",
+        "+",
+        "Ljava/lang/Boolean;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4$1.smali
index 4f0b754a3c..13aa9a627a 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4$1.smali
@@ -3,7 +3,7 @@
 .source "StoreEmoji.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/emoji/ModelEmojiCustom;",
+        ">;>;",
+        "Lcom/discord/models/domain/emoji/EmojiSet;",
+        ">;"
     }
 .end annotation
 
@@ -82,7 +91,7 @@
 
     const-string v0, "allCustomEmojis"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEmoji$getEmojiSet$4$1;->this$0:Lcom/discord/stores/StoreEmoji$getEmojiSet$4;
 
@@ -92,13 +101,13 @@
 
     const-string v0, "sortedGuildIds"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEmoji$getEmojiSet$4$1;->$isPremium:Ljava/lang/Boolean;
 
     const-string v2, "isPremium"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -114,7 +123,7 @@
 
     const-string v2, "hasExternalEmojiPermission"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4.smali
index 887502bd7f..dfdaee52f9 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$4.smali
@@ -3,7 +3,7 @@
 .source "StoreEmoji.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,21 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Triple<",
+        "+",
+        "Ljava/lang/Boolean;",
+        "+",
+        "Ljava/lang/Boolean;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/emoji/EmojiSet;",
+        ">;>;"
     }
 .end annotation
 
@@ -86,6 +97,7 @@
             "Ljava/lang/Long;",
             ">;>;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/emoji/EmojiSet;",
             ">;"
         }
@@ -117,7 +129,7 @@
 
     invoke-direct {v3, p0, p1, v0, v1}, Lcom/discord/stores/StoreEmoji$getEmojiSet$4$1;-><init>(Lcom/discord/stores/StoreEmoji$getEmojiSet$4;Ljava/util/List;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.smali
index e68e3377b6..944bfdcf34 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.smali
@@ -3,7 +3,7 @@
 .source "StoreEmoji.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Ljava/lang/Long;)Ljava/lang/Boolean;
+    .locals 2
 
-    check-cast p1, Ljava/lang/Long;
+    const-wide/32 v0, 0x40000
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1;->call(Ljava/lang/Long;)Z
+    invoke-static {v0, v1, p1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Long;)Z
-    .locals 2
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-wide/32 v0, 0x40000
+    check-cast p1, Ljava/lang/Long;
 
-    invoke-static {v0, v1, p1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1;->call(Ljava/lang/Long;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali b/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali
index 5e51d99bc7..2bb5b4735a 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmoji.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/emoji/ModelEmojiUnicode;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1;->$unicodeEmojiSurrogateMap:Ljava/util/HashMap;
 
@@ -75,7 +77,7 @@
 
     const-string v2, "emoji.surrogates"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -85,7 +87,7 @@
 
     const-string v1, "emoji\n          .names"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -108,7 +110,7 @@
 
     const-string v3, "emojiName"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -116,13 +118,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji.smali b/com.discord/smali/com/discord/stores/StoreEmoji.smali
index 39a101b91b..a8a0a1b43c 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji.smali
@@ -101,9 +101,9 @@
 
     const-string v3, "fork_and_knife"
 
-    const-string v4, "yum"
+    const-string/jumbo v4, "yum"
 
-    const-string v5, "weary"
+    const-string/jumbo v5, "weary"
 
     const-string v6, "tired_face"
 
@@ -125,15 +125,21 @@
 .method public constructor <init>(Lcom/discord/stores/StoreEmojiCustom;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreGuildsSorted;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "customEmojiStore"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "userStore"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "permissionsStore"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sortedGuildsStore"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -166,34 +172,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreEmoji;->frecency:Lcom/discord/utilities/emoji/EmojiFrecencyTracker;
 
     return-void
-
-    :cond_0
-    const-string p1, "sortedGuildsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "permissionsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "customEmojiStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$buildUsableEmojiSet(Lcom/discord/stores/StoreEmoji;Ljava/util/Map;Lcom/discord/stores/StoreEmoji$EmojiContext;Ljava/util/List;ZZZZ)Lcom/discord/models/domain/emoji/EmojiSet;
@@ -430,7 +408,7 @@
 
     iget-object v1, v0, Lcom/discord/stores/StoreEmoji;->unicodeEmojisNamesMap:Ljava/util/Map;
 
-    const-string v17, "unicodeEmojisNamesMap"
+    const-string/jumbo v17, "unicodeEmojisNamesMap"
 
     const/16 v18, 0x0
 
@@ -442,7 +420,7 @@
 
     iget-object v6, v0, Lcom/discord/stores/StoreEmoji;->unicodeEmojis:Ljava/util/Map;
 
-    const-string v19, "unicodeEmojis"
+    const-string/jumbo v19, "unicodeEmojis"
 
     if-eqz v6, :cond_13
 
@@ -560,14 +538,14 @@
 
     const-string v7, "emoji.uniqueId"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v8, v6, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_6
 
     :cond_8
-    invoke-static/range {v19 .. v19}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static/range {v19 .. v19}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v18
 
@@ -776,22 +754,22 @@
     return-object v1
 
     :cond_11
-    invoke-static/range {v19 .. v19}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static/range {v19 .. v19}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v18
 
     :cond_12
-    invoke-static/range {v17 .. v17}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static/range {v17 .. v17}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v18
 
     :cond_13
-    invoke-static/range {v19 .. v19}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static/range {v19 .. v19}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v18
 
     :cond_14
-    invoke-static/range {v17 .. v17}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static/range {v17 .. v17}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v18
 .end method
@@ -811,7 +789,7 @@
 
     invoke-direct {v1}, Lcom/discord/stores/StoreEmoji$compileSurrogatesPattern$$inlined$sortedBy$1;-><init>()V
 
-    invoke-static {v0, v1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v2
 
@@ -829,7 +807,7 @@
 
     const-string/jumbo v3, "|"
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -839,14 +817,14 @@
 
     const-string v1, "Pattern.compile(emojiSurrogatesPattern)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
     :cond_0
-    const-string v0, "unicodeEmojiSurrogateMap"
+    const-string/jumbo v0, "unicodeEmojiSurrogateMap"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -986,7 +964,7 @@
     :cond_1
     const/16 p1, 0x28
 
-    invoke-static {v1, p1}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v1, p1}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object v0
 
@@ -1036,9 +1014,9 @@
     goto :goto_1
 
     :cond_4
-    const-string p1, "unicodeEmojisNamesMap"
+    const-string/jumbo p1, "unicodeEmojisNamesMap"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
@@ -1049,7 +1027,7 @@
 
     sub-int/2addr p1, v1
 
-    invoke-static {v2, p1}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v2, p1}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
@@ -1065,9 +1043,13 @@
 
     move-result-object p1
 
-    sget-object v0, Lj0/s/l;->d:Lj0/s/l;
+    const-string v0, "$this$flatten"
 
-    invoke-static {p1, v0}, Lf/n/a/k/a;->w(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/t/l;->d:Lk0/t/l;
+
+    invoke-static {p1, v0}, Lf/n/a/k/a;->t(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -1075,7 +1057,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -1106,9 +1088,9 @@
 
     move-result-object p1
 
-    const-string v4, "unicodeEmojisBundle.emojis"
+    const-string/jumbo v4, "unicodeEmojisBundle.emojis"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1145,11 +1127,11 @@
 
     const-string v6, "category"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v6, "categoryEmojis"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v5, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1170,9 +1152,9 @@
 
     check-cast v5, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
 
-    const-string v6, "unicodeEmoji"
+    const-string/jumbo v6, "unicodeEmoji"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, v5}, Lcom/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1;->invoke(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;)V
 
@@ -1180,9 +1162,9 @@
 
     move-result-object v5
 
-    const-string v6, "unicodeEmoji\n                .asDiverse"
+    const-string/jumbo v6, "unicodeEmoji\n                .asDiverse"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1203,7 +1185,7 @@
 
     const-string v7, "diverseEmoji"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, v6}, Lcom/discord/stores/StoreEmoji$handleLoadedUnicodeEmojis$1;->invoke(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;)V
 
@@ -1258,7 +1240,7 @@
 
     const-string v0, "jsonReader.parse(ModelEmojiUnicode.Bundle())"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/models/domain/emoji/ModelEmojiUnicode$Bundle;
 
@@ -1360,7 +1342,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "emojiContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/stores/StoreEmoji$EmojiContext$Chat;
 
@@ -1392,7 +1376,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1;->INSTANCE:Lcom/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1401,9 +1385,9 @@
     :cond_0
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object v0, v1
 
@@ -1416,7 +1400,7 @@
 
     sget-object v2, Lcom/discord/stores/StoreEmoji$getEmojiSet$1;->INSTANCE:Lcom/discord/stores/StoreEmoji$getEmojiSet$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -1428,7 +1412,7 @@
 
     sget-object v3, Lcom/discord/stores/StoreEmoji$getEmojiSet$2;->INSTANCE:Lcom/discord/stores/StoreEmoji$getEmojiSet$2;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -1446,24 +1430,15 @@
 
     invoke-direct {v1, p0, p1, p3, p2}, Lcom/discord/stores/StoreEmoji$getEmojiSet$4;-><init>(Lcom/discord/stores/StoreEmoji;Lcom/discord/stores/StoreEmoji$EmojiContext;ZZ)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable\n        .comb\u2026              }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "emojiContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getUnicodeEmojiSurrogateMap()Ljava/util/Map;
@@ -1485,9 +1460,9 @@
     return-object v0
 
     :cond_0
-    const-string v0, "unicodeEmojiSurrogateMap"
+    const-string/jumbo v0, "unicodeEmojiSurrogateMap"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1513,9 +1488,9 @@
     return-object v0
 
     :cond_0
-    const-string v0, "unicodeEmojisNamesMap"
+    const-string/jumbo v0, "unicodeEmojisNamesMap"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1532,9 +1507,9 @@
     return-object v0
 
     :cond_0
-    const-string v0, "unicodeEmojisPattern"
+    const-string/jumbo v0, "unicodeEmojisPattern"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1560,9 +1535,11 @@
 .end method
 
 .method public final initBlocking(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreEmoji;->loadUnicodeEmojisFromDisk(Landroid/content/Context;)Lcom/discord/models/domain/emoji/ModelEmojiUnicode$Bundle;
 
@@ -1571,21 +1548,14 @@
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreEmoji;->handleLoadedUnicodeEmojis(Lcom/discord/models/domain/emoji/ModelEmojiUnicode$Bundle;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onEmojiUsed(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/models/domain/emoji/Emoji;->getUniqueId()Ljava/lang/String;
 
@@ -1593,28 +1563,19 @@
 
     const-string v0, "emoji.uniqueId"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEmoji;->onEmojiUsed(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onEmojiUsed(Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "emojiKey"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreEmoji;->frecency:Lcom/discord/utilities/emoji/EmojiFrecencyTracker;
 
@@ -1630,20 +1591,15 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreEmoji;->frecencyCache:Lcom/discord/utilities/persister/Persister;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreEmoji;->frecency:Lcom/discord/utilities/emoji/EmojiFrecencyTracker;
+    iget-object v0, p0, Lcom/discord/stores/StoreEmoji;->frecency:Lcom/discord/utilities/emoji/EmojiFrecencyTracker;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {p1, v1, v2, v3, v0}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+    const/4 v3, 0x0
+
+    invoke-static {p1, v0, v1, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "emojiKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
index 17fe927ead..e8aaf5745b 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmojiCustom.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Lcom/discord/models/domain/emoji/ModelEmojiCustom;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
 .method public final invoke(JLcom/discord/models/domain/emoji/ModelEmojiCustom;)V
     .locals 3
 
-    if-eqz p3, :cond_2
+    const-string v0, "emoji"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1;->$available:Ljava/util/Map;
 
@@ -109,7 +111,7 @@
 
     check-cast p1, Lcom/discord/models/domain/emoji/ModelEmojiCustom;
 
-    invoke-static {p3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -131,13 +133,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
index bfdcd4e5b2..991d4b26d1 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
@@ -88,7 +88,9 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "collector"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -119,15 +121,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreEmojiCustom;->availableGuildEmojis:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "collector"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$isDirty$p(Lcom/discord/stores/StoreEmojiCustom;)Z
@@ -462,7 +455,7 @@
 
     const-string v1, "availableGuildEmojisPubl\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -472,7 +465,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getMe()Lcom/discord/models/domain/ModelUser;
 
@@ -480,7 +475,7 @@
 
     const-string v1, "payload.me"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -511,7 +506,7 @@
 
     const-string v1, "guild"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v0}, Lcom/discord/stores/StoreEmojiCustom;->handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)Lkotlin/Unit;
 
@@ -519,15 +514,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleEmojiUpdate(Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;)V
@@ -535,7 +521,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "emojiUpdate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->getGuildId()J
 
@@ -583,7 +571,7 @@
 
     const-string v4, "emojiUpdate.emojis"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, v1, v3}, Lcom/discord/stores/StoreEmojiCustom;->updateGlobalEmojis(JLjava/util/Collection;)V
 
@@ -593,27 +581,18 @@
 
     const-string v3, "selfMember.roles"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->getEmojis()Ljava/util/List;
 
     move-result-object p1
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, v1, v2, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "emojiUpdate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)Lkotlin/Unit;
@@ -621,63 +600,61 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getMembers()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-wide v2, p0, Lcom/discord/stores/StoreEmojiCustom;->me:J
+    iget-wide v1, p0, Lcom/discord/stores/StoreEmojiCustom;->me:J
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
-    check-cast v1, Lcom/discord/models/domain/ModelGuildMember;
+    invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v1, :cond_0
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/models/domain/ModelGuildMember;
+
+    if-eqz v0, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getEmojis()Ljava/util/List;
 
     move-result-object p1
 
-    const-string v0, "emojis"
+    const-string v3, "emojis"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v2, v3, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateGlobalEmojis(JLjava/util/Collection;)V
+    invoke-direct {p0, v1, v2, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateGlobalEmojis(JLjava/util/Collection;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
 
     move-result-object v0
 
-    const-string v1, "selfMember.roles"
+    const-string v3, "selfMember.roles"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v2, v3, v0, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
+    invoke-direct {p0, v1, v2, v0, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
 
 .method public final handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -685,7 +662,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "member"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -733,21 +712,12 @@
 
     const-string v3, "member.roles"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, v1, p1, v2}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -755,7 +725,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -808,15 +780,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild$activate$1.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild$activate$1.smali
index 8854ba431e..6c1af5d89d 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$activate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$activate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmojiGuild$activate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmojiGuild.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild$deactivate$1.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild$deactivate$1.smali
index fd9242f9ae..0910424048 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$deactivate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$deactivate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmojiGuild$deactivate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmojiGuild.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild$deleteEmoji$1.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild$deleteEmoji$1.smali
index a5e01b77b8..597a944656 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$deleteEmoji$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$deleteEmoji$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmojiGuild$deleteEmoji$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmojiGuild.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -149,7 +149,7 @@
     goto :goto_0
 
     :cond_2
-    sget-object v4, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v4, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_3
     invoke-interface {v0, v1, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$1.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$1.smali
index 79e4fbbdf1..5c1f63271f 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmojiGuild$get$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmojiGuild.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojis"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEmojiGuild$get$1;->this$0:Lcom/discord/stores/StoreEmojiGuild;
 
@@ -85,13 +87,4 @@
     invoke-static {v0, v1, v2, p1}, Lcom/discord/stores/StoreEmojiGuild;->access$handleGuildEmojisLoaded(Lcom/discord/stores/StoreEmojiGuild;JLjava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$2.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$2.smali
index e856c7ba78..1d95b2222e 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$get$2.smali
@@ -3,7 +3,7 @@
 .source "StoreEmojiGuild.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/emoji/ModelEmojiGuild;",
+        ">;>;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/emoji/ModelEmojiGuild;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1.smali
index e959686fb1..828859e9ab 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEmojiGuild$handleGuildEmojisLoaded$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEmojiGuild.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali b/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali
index 480570e206..190803ecfa 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiGuild.smali
@@ -43,7 +43,9 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -72,15 +74,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreEmojiGuild;->guildsSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getActiveGuildId$p(Lcom/discord/stores/StoreEmojiGuild;)J
@@ -266,7 +259,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreEmojiGuild$get$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -276,7 +269,7 @@
 
     const-string p2, "guildsSubject.map { guil\u2026 }.distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -286,7 +279,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "emojiUpdate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->getGuildId()J
 
@@ -314,15 +309,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "emojiUpdate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$State$Loaded.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$State$Loaded.smali
index 95c730f22f..2a7e2b4f52 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$State$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$State$Loaded.smali
@@ -61,12 +61,16 @@
         }
     .end annotation
 
+    const-string v0, "giftableEntitlements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ownedEntitlements"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreEntitlements$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
@@ -74,20 +78,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "ownedEntitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "giftableEntitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreEntitlements$State$Loaded;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreEntitlements$State$Loaded;
@@ -173,31 +163,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "giftableEntitlements"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "ownedEntitlements"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreEntitlements$State$Loaded;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "ownedEntitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "giftableEntitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public deepCopy()Lcom/discord/stores/StoreEntitlements$State$Loaded;
@@ -247,7 +225,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;->giftableEntitlements:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -257,7 +235,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreEntitlements$State$Loaded;->ownedEntitlements:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$1.smali
index bd19880218..cff2eb0118 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2$1.smali
index e776d539e9..f953032a46 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2.smali
index f7e3fb3486..6a555fb80a 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$2;->this$0:Lcom/discord/stores/StoreEntitlements;
 
@@ -76,13 +78,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3$1.smali
index 8e124625b8..2b021588cc 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3.smali
index 36fae5b090..7cf60d3c42 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "entitlements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$fetchMyEntitlementsForApplication$3;->this$0:Lcom/discord/stores/StoreEntitlements;
 
@@ -91,13 +93,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "entitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$1.smali
index f271b379b5..10d75f1e9c 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2$1.smali
index 741ebdba1c..513e05b993 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2.smali
index 97a5a2467e..3437ad117c 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$2;->this$0:Lcom/discord/stores/StoreEntitlements;
 
@@ -76,13 +78,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3$1.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3$1.smali
index bb1c351ac2..cbba8e42f0 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3.smali b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3.smali
index 6b517cb751..72197d60f5 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreEntitlements.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "entitlements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEntitlements$fetchMyGiftEntitlements$3;->this$0:Lcom/discord/stores/StoreEntitlements;
 
@@ -87,13 +89,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "entitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreEntitlements.smali b/com.discord/smali/com/discord/stores/StoreEntitlements.smali
index 3fce2f2545..76fe6cc156 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements.smali
@@ -59,15 +59,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreEntitlements;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/stores/StoreEntitlements;->giftEntitlementMap:Ljava/util/Map;
 
@@ -88,15 +90,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreEntitlements;->stateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -236,7 +229,7 @@
 
     const-string v1, "stateSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -255,7 +248,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "entitlements"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreEntitlements;->entitlementMap:Ljava/util/Map;
 
@@ -280,15 +275,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreEntitlements;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "entitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleFetchError()V
@@ -321,7 +307,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "giftEntitlements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -368,10 +356,6 @@
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
     :goto_1
-    const-string v3, "newGiftEntitlementMap[en\u2026ent.skuId] ?: ArrayList()"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-interface {v2, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelEntitlement;->getSkuId()J
@@ -402,15 +386,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreEntitlements;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "giftEntitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleFetchingState()V
diff --git a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$closeFolder$1.smali b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$closeFolder$1.smali
index 8e796613a8..028ca4b9bf 100644
--- a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$closeFolder$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$closeFolder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExpandedGuildFolders$closeFolder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExpandedGuildFolders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$openFolder$1.smali b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$openFolder$1.smali
index dcb6e9fd49..9d62bb96b7 100644
--- a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$openFolder$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders$openFolder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExpandedGuildFolders$openFolder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExpandedGuildFolders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders.smali b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders.smali
index 474e31e85e..e8f47ed66a 100644
--- a/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders.smali
+++ b/com.discord/smali/com/discord/stores/StoreExpandedGuildFolders.smali
@@ -37,7 +37,9 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -62,15 +64,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreExpandedGuildFolders;->openFoldersPersister:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -153,7 +146,9 @@
 .method public init(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreExpandedGuildFolders;->openFolderIds:Ljava/util/HashSet;
 
@@ -168,15 +163,6 @@
     invoke-virtual {p1, v0}, Ljava/util/HashSet;->addAll(Ljava/util/Collection;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali
index 20c07bf19a..a2868d98b0 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$Companion$DEFAULT_CONTEXT_CALLBACK$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelExperiment;",
         "Lcom/discord/models/domain/ModelExperiment$Context;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$Experiment.smali b/com.discord/smali/com/discord/stores/StoreExperiments$Experiment.smali
index a056a33042..75ea2382e9 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$Experiment.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$Experiment.smali
@@ -171,7 +171,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreExperiments$Experiment;->displayName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -181,7 +181,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreExperiments$Experiment;->rawExperiment:Lcom/discord/models/domain/ModelExperiment;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -191,7 +191,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreExperiments$Experiment;->overrideBucket:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getAndTriggerExperiment$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getAndTriggerExperiment$1.smali
index ea8da0bfb8..320b35b695 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getAndTriggerExperiment$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getAndTriggerExperiment$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$getAndTriggerExperiment$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali
index ef29fdc485..dd6c334630 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$1.smali
@@ -3,7 +3,7 @@
 .source "StoreExperiments.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        ">;",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        ">;"
     }
 .end annotation
 
@@ -72,7 +77,7 @@
 
     const-string v1, "experiments"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreExperiments$getExperiment$1;->$name:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$2.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$2.smali
index d6f4b4c445..40db2187a2 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperiment$2.smali
@@ -62,25 +62,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    check-cast p2, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreExperiments$getExperiment$2;->call(Lcom/discord/stores/StoreExperiments$Experiment;Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 2
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getRawExperiment()Lcom/discord/models/domain/ModelExperiment;
@@ -91,7 +73,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -105,7 +87,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -119,5 +101,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    check-cast p2, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreExperiments$getExperiment$2;->call(Lcom/discord/stores/StoreExperiments$Experiment;Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentByName$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentByName$1.smali
index 39572ed909..1faddc2701 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentByName$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentByName$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$getExperimentByName$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
index bd93c1f764..014eecdbb7 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,30 +62,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    check-cast p2, Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreExperiments$getExperimentalAlpha$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
+.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "meUser"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
 
@@ -104,5 +89,23 @@
     const/4 p1, 0x1
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    check-cast p2, Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreExperiments$getExperimentalAlpha$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$getNameToExperimentMap$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$getNameToExperimentMap$1.smali
index 02af5a5f53..fc4d94ed6d 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$getNameToExperimentMap$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$getNameToExperimentMap$1.smali
@@ -3,7 +3,7 @@
 .source "StoreExperiments.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        ">;>;"
     }
 .end annotation
 
@@ -91,7 +99,7 @@
 
     const-string v0, "experimentsMap\n              .values"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -125,7 +133,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-static {v3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
@@ -175,7 +183,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_5
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -189,27 +197,24 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_5
+    invoke-static {v3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-interface {v1, v3, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_2
 
     :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    const-string p1, "$this$toMap"
 
-    const/4 p1, 0x0
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p1
-
-    :cond_6
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
     move-result p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_7
 
-    if-eq p1, v2, :cond_7
+    if-eq p1, v2, :cond_6
 
     invoke-static {v1}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -217,15 +222,15 @@
 
     goto :goto_3
 
-    :cond_7
+    :cond_6
     invoke-static {v1}, Lf/n/a/k/a;->toSingletonMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p1
 
     goto :goto_3
 
-    :cond_8
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    :cond_7
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_3
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$setExperimentOverride$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$setExperimentOverride$1.smali
index d30641d142..e60a8319e8 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$setExperimentOverride$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$setExperimentOverride$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$setExperimentOverride$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     const-string v2, "experimentsEligible[nameHash] ?: return@schedule"
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/stores/StoreExperiments$Experiment;->getOverrideBucket()Ljava/lang/Integer;
 
@@ -102,7 +102,7 @@
 
     iget-object v4, p0, Lcom/discord/stores/StoreExperiments$setExperimentOverride$1;->$overrideBucket:Ljava/lang/Integer;
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali
index df8d2aa085..5d440086da 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali
index 0ce2e776ec..9f97e213e9 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelExperiment$Assignments;->getFingerprint()Ljava/lang/String;
 
@@ -90,7 +90,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2$1;->$it:Lcom/discord/models/domain/ModelExperiment$Assignments;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelExperiment$Assignments;->getAssignments()Lcom/discord/models/domain/ModelExperiment$Experiments;
 
@@ -98,7 +98,7 @@
 
     const-string v2, "it.assignments"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreExperiments;->access$handleLoadedExperiments(Lcom/discord/stores/StoreExperiments;Lcom/discord/models/domain/ModelExperiment$Experiments;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali
index b8ddab5f48..1d842ed9cd 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelExperiment$Assignments;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3$1.smali
index ab9a318359..d37b08cd08 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3.smali
index 4d2078bd88..744d93ff69 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreExperiments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$3;->this$0:Lcom/discord/stores/StoreExperiments;
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments.smali b/com.discord/smali/com/discord/stores/StoreExperiments.smali
index 53696a103f..aa66f298fe 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments.smali
@@ -161,17 +161,25 @@
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreAuthentication;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "storeUser"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeGuilds"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeAuthentication"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -274,41 +282,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreExperiments;->experimentOverridesCache:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAuthentication"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getAndTriggerExperiment(Lcom/discord/stores/StoreExperiments;Ljava/util/Map;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/discord/stores/StoreExperiments$Experiment;
@@ -664,7 +637,7 @@
 
     const-string v1, "experiments.experiments"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/util/LinkedHashMap;
 
@@ -739,7 +712,7 @@
     return-void
 .end method
 
-.method public static synthetic isExperimentalAlpha$annotations()V
+.method public static synthetic isExperimentalAlpha$app_productionDiscordExternalRelease$annotations()V
     .locals 0
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
@@ -805,7 +778,7 @@
 
     const-string p2, "experimentTriggeredKey"
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/stores/StoreExperiments$Triggered;
 
@@ -832,7 +805,7 @@
 
     const-string v1, "UNINITIALIZED"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -840,7 +813,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->fingerprint:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -894,7 +867,7 @@
 
     const-string v0, "RestAPI\n          .api\n \u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v6, Lcom/discord/stores/StoreExperiments;
 
@@ -983,7 +956,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -1038,11 +1011,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "contextCallback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->experimentsEligibleSubject:Lrx/subjects/SerializedSubject;
 
@@ -1050,7 +1025,7 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreExperiments$getExperiment$1;-><init>(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1062,27 +1037,13 @@
 
     const-string p2, "experimentsEligibleSubje\u2026.overrideBucket\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "contextCallback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getExperimentSnapshot$app_productionDiscordExternalRelease(Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/discord/stores/StoreExperiments$Experiment;
@@ -1104,11 +1065,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "contextCallback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->experimentsEligible:Ljava/util/HashMap;
 
@@ -1117,20 +1080,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "contextCallback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getExperimentalAlpha()Lrx/Observable;
@@ -1166,7 +1115,7 @@
 
     const-string v1, "Observable.combineLatest\u2026estersGuild != null\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1188,13 +1137,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreExperiments$getNameToExperimentMap$1;->INSTANCE:Lcom/discord/stores/StoreExperiments$getNameToExperimentMap$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "experimentsEligibleSubje\u2026       .toMap()\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1218,7 +1167,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getExperiments()Lcom/discord/models/domain/ModelExperiment$Experiments;
 
@@ -1226,20 +1177,11 @@
 
     const-string v0, "payload.experiments"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreExperiments;->handleLoadedExperiments(Lcom/discord/models/domain/ModelExperiment$Experiments;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleFingerprint(Ljava/lang/String;)V
@@ -1378,9 +1320,9 @@
 
     move-result-object v1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->experimentsTriggeredCache:Lcom/discord/utilities/persister/Persister;
 
@@ -1416,9 +1358,9 @@
 
     invoke-direct {v1, v3}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iput-boolean v2, p0, Lcom/discord/stores/StoreExperiments;->isDirty:Z
 
@@ -1428,7 +1370,9 @@
 .method public final setExperimentOverride(Ljava/lang/String;Ljava/lang/Integer;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1439,13 +1383,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali
index 7ac7791122..841fa62782 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGameParty.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -78,7 +88,7 @@
 
     const-string v0, "partyMap"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGameParty$getUsersForPartyId$1;->$partyId:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali
index 6157b80b23..7e7c63b881 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGameParty.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;"
     }
 .end annotation
 
@@ -62,14 +71,14 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2$1;->call(Ljava/util/Map;)Ljava/util/SortedMap;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2$1;->call(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final call(Ljava/util/Map;)Ljava/util/SortedMap;
+.method public final call(Ljava/util/Map;)Ljava/util/Map;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -79,16 +88,16 @@
             "+",
             "Lcom/discord/models/domain/ModelUser;",
             ">;)",
-            "Ljava/util/SortedMap<",
+            "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelUser;",
             ">;"
         }
     .end annotation
 
-    const-string v0, "userMap"
+    const-string/jumbo v0, "userMap"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->toSortedMap(Ljava/util/Map;)Ljava/util/SortedMap;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
index aac2084c75..75c00f5d84 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty$getUsersForPartyId$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGameParty.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -80,6 +88,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelUser;",
@@ -98,7 +107,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->observeUsers(Ljava/util/Collection;)Lrx/Observable;
@@ -107,7 +116,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2$1;->INSTANCE:Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty.smali b/com.discord/smali/com/discord/stores/StoreGameParty.smali
index facbe4d799..810d3a898d 100644
--- a/com.discord/smali/com/discord/stores/StoreGameParty.smali
+++ b/com.discord/smali/com/discord/stores/StoreGameParty.smali
@@ -66,7 +66,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreGameParty;->parties:Ljava/util/HashMap;
 
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -247,9 +247,9 @@
 
     if-eqz p3, :cond_2
 
-    const-string p4, "userParties[userId]?.remove(guildId) ?: return"
+    const-string/jumbo p4, "userParties[userId]?.remove(guildId) ?: return"
 
-    invoke-static {p3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p4, p0, Lcom/discord/stores/StoreGameParty;->parties:Ljava/util/HashMap;
 
@@ -386,7 +386,7 @@
     :goto_1
     if-eqz p1, :cond_4
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -448,19 +448,19 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreGameParty$getUsersForPartyId$1;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2;->INSTANCE:Lcom/discord/stores/StoreGameParty$getUsersForPartyId$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "partiesSubject\n        .\u2026toSortedMap() }\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -472,7 +472,7 @@
 
     const-string v0, "partiesSubject\n        .\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -482,7 +482,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getPresences()Ljava/util/List;
 
@@ -499,7 +501,7 @@
 
     const-string v0, "payload.guilds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -524,23 +526,16 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildCreateOrSync(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPresences()Ljava/util/List;
 
@@ -552,19 +547,10 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePresenceReplace(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -577,20 +563,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "presences"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreGameParty;->handlePresences(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePresenceUpdate(Lcom/discord/models/domain/ModelPresence;)V
@@ -614,24 +593,17 @@
 .end method
 
 .method public final handlePresenceUpdate(Lcom/discord/models/domain/ModelPresence;J)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/stores/StoreGameParty;->updateParty(Lcom/discord/models/domain/ModelPresence;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali
index 961a8c611f..52b5b67b9a 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGatewayConnection$ClientState$Companion$initialize$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function5<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/String;",
@@ -33,51 +33,37 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGatewayConnection$ClientState$Companion;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x5
+    const-class v3, Lcom/discord/stores/StoreGatewayConnection$ClientState$Companion;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x5
+
+    const-string v4, "create"
+
+    const-string v5, "create(ZLjava/lang/String;JZLcom/discord/stores/StoreClientDataState$ClientDataState;)Lcom/discord/stores/StoreGatewayConnection$ClientState;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGatewayConnection$ClientState$Companion;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create(ZLjava/lang/String;JZLcom/discord/stores/StoreClientDataState$ClientDataState;)Lcom/discord/stores/StoreGatewayConnection$ClientState;"
-
-    return-object v0
-.end method
-
 .method public final invoke(ZLjava/lang/String;JZLcom/discord/stores/StoreClientDataState$ClientDataState;)Lcom/discord/stores/StoreGatewayConnection$ClientState;
     .locals 8
 
-    if-eqz p6, :cond_0
+    const-string v0, "p5"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     move-object v1, v0
 
@@ -98,15 +84,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p5"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
index b897ba54ea..8d03496135 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
@@ -95,13 +95,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "scheduler"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "callback"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/miguelgaeta/backgrounded/Backgrounded;->get()Lrx/Observable;
 
@@ -123,13 +127,13 @@
 
     move-result-object v3
 
-    sget-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v0, Lf/a/b/o;->c:Lf/a/b/o;
 
-    sget-object v0, Lf/a/b/m;->b:Lrx/subjects/BehaviorSubject;
+    sget-object v0, Lf/a/b/o;->b:Lrx/subjects/BehaviorSubject;
 
-    sget-object v4, Lf/a/b/l;->d:Lf/a/b/l;
+    sget-object v4, Lf/a/b/n;->d:Lf/a/b/n;
 
-    invoke-virtual {v0, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -139,7 +143,7 @@
 
     const-string v0, "numGatewayConnectionCons\u2026  .distinctUntilChanged()"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreStream;->getClientDataState$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreClientDataState;
 
@@ -163,7 +167,7 @@
 
     const-string v0, "Observable\n            .\u2026   ::create\n            )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -175,10 +179,12 @@
 
     const-string p1, "Observable\n            .\u2026    .observeOn(scheduler)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
+    const-string v2, "clientState"
+
     const/4 v3, 0x0
 
     const/4 v5, 0x0
@@ -189,32 +195,9 @@
 
     const/4 v8, 0x0
 
-    const-string v2, "clientState"
-
     move-object v4, p3
 
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali
index 903bce100f..b9b74c61e8 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState.smali
@@ -48,9 +48,11 @@
 .end method
 
 .method public constructor <init>(Ljava/lang/String;ZLcom/discord/stores/StoreClientDataState$ClientDataState;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "clientDataState"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,15 +63,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreGatewayConnection$ClientState;->clientDataState:Lcom/discord/stores/StoreClientDataState$ClientDataState;
 
     return-void
-
-    :cond_0
-    const-string p1, "clientDataState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGatewayConnection$ClientState;Ljava/lang/String;ZLcom/discord/stores/StoreClientDataState$ClientDataState;ILjava/lang/Object;)Lcom/discord/stores/StoreGatewayConnection$ClientState;
@@ -132,22 +125,15 @@
 .method public final copy(Ljava/lang/String;ZLcom/discord/stores/StoreClientDataState$ClientDataState;)Lcom/discord/stores/StoreGatewayConnection$ClientState;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "clientDataState"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGatewayConnection$ClientState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreGatewayConnection$ClientState;-><init>(Ljava/lang/String;ZLcom/discord/stores/StoreClientDataState$ClientDataState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "clientDataState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -165,7 +151,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreGatewayConnection$ClientState;->tokenIfAvailable:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -181,7 +167,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGatewayConnection$ClientState;->clientDataState:Lcom/discord/stores/StoreClientDataState$ClientDataState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali
index d59e575180..35c776e141 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGatewayConnection$buildGatewaySocket$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/gateway/GatewaySocket$IdentifyData;",
         ">;"
@@ -28,49 +28,33 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGatewayConnection;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/stores/StoreGatewayConnection;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "getIdentifyData"
+
+    const-string v5, "getIdentifyData()Lcom/discord/gateway/GatewaySocket$IdentifyData;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getIdentifyData"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGatewayConnection;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getIdentifyData()Lcom/discord/gateway/GatewaySocket$IdentifyData;"
-
-    return-object v0
-.end method
-
 .method public final invoke()Lcom/discord/gateway/GatewaySocket$IdentifyData;
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGatewayConnection;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$2.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$2.smali
index a22d2d16b4..550d5c4a2f 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$buildGatewaySocket$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -53,7 +53,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 .end method
 
 .method public final invoke(Ljava/util/Map;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -85,18 +85,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->readyPayloadReceived(Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali
index 221da8385c..fad6ae42ea 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/String;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,30 +71,25 @@
 .method public final invoke(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "gatewayUrl"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/16 v1, 0x3a
+    const/16 v0, 0x3a
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {p1, v1, v0, v2}, Lj0/t/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
+    invoke-static {p1, v0, v1, v2}, Lk0/u/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
-    const-string v0, "ws://:"
+    const-string/jumbo v0, "ws://:"
 
     invoke-static {v0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "gatewayUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali
index a91cb8aece..14b8b1e17f 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$callConnect$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$callConnect$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/stores/StoreGatewayConnection$callConnect$1;->$channelId:J
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/gateway/GatewaySocket;->callConnect(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali
index c9b32a457d..d5b9da2d33 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreGatewayConnection$ClientState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/stores/StoreGatewayConnection$ClientState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$init$1;->this$0:Lcom/discord/stores/StoreGatewayConnection;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGatewayConnection;->access$handleClientStateUpdate(Lcom/discord/stores/StoreGatewayConnection;Lcom/discord/stores/StoreGatewayConnection$ClientState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali
index c97ffb9a68..cdc3b75c1f 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$presenceUpdate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$presenceUpdate$1;->$status:Lcom/discord/models/domain/ModelPresence$Status;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/gateway/GatewaySocket;->presenceUpdate(Lcom/discord/models/domain/ModelPresence$Status;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali
index 978f7386ca..c405f25ce5 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$requestGuildMembers$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$requestGuildMembers$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$requestGuildMembers$1;->$guildIds:Ljava/util/List;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/gateway/GatewaySocket;->requestGuildMembers(Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamCreate$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamCreate$1.smali
new file mode 100644
index 0000000000..6cc2e1a0c7
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamCreate$1.smali
@@ -0,0 +1,169 @@
+.class public final Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;
+.super Lk0/o/c/j;
+.source "StoreGatewayConnection.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreGatewayConnection;->streamCreate(Ljava/lang/String;Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/gateway/GatewaySocket;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $newStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+.field public final synthetic $preferredRegion:Ljava/lang/String;
+
+.field public final synthetic $streamKey:Ljava/lang/String;
+
+.field public final synthetic this$0:Lcom/discord/stores/StoreGatewayConnection;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreGatewayConnection;Ljava/lang/String;Lcom/discord/models/domain/ModelApplicationStream;Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->this$0:Lcom/discord/stores/StoreGatewayConnection;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$streamKey:Ljava/lang/String;
+
+    iput-object p3, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$newStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    iput-object p4, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$preferredRegion:Ljava/lang/String;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/gateway/GatewaySocket;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->invoke(Lcom/discord/gateway/GatewaySocket;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
+    .locals 8
+
+    const-string v0, "gatewaySocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->this$0:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreGatewayConnection;->access$getStream$p(Lcom/discord/stores/StoreGatewayConnection;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getApplicationStreaming$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getActiveApplicationStream$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$streamKey:Ljava/lang/String;
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_1
+
+    iget-object v2, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->this$0:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v2, v0}, Lcom/discord/stores/StoreGatewayConnection;->streamDelete(Ljava/lang/String;)V
+
+    :cond_1
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$newStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    instance-of v2, v0, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
+
+    if-eqz v2, :cond_2
+
+    check-cast v0, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;->getGuildId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    :cond_2
+    move-object v6, v1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$newStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getType()Ljava/lang/String;
+
+    move-result-object v3
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$newStream:Lcom/discord/models/domain/ModelApplicationStream;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v4
+
+    iget-object v7, p0, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;->$preferredRegion:Ljava/lang/String;
+
+    move-object v2, p1
+
+    invoke-virtual/range {v2 .. v7}, Lcom/discord/gateway/GatewaySocket;->streamCreate(Ljava/lang/String;JLjava/lang/Long;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamDelete$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamDelete$1.smali
index 390a960a7b..5dc616254d 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamDelete$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamDelete$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;->$streamKey:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Lcom/discord/gateway/GatewaySocket;->streamDelete(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamWatch$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamWatch$1.smali
index ab42e00741..de3e682398 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamWatch$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamWatch$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,42 +65,47 @@
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;->this$0:Lcom/discord/stores/StoreGatewayConnection;
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;->this$0:Lcom/discord/stores/StoreGatewayConnection;
 
-    invoke-static {v1}, Lcom/discord/stores/StoreGatewayConnection;->access$getStream$p(Lcom/discord/stores/StoreGatewayConnection;)Lcom/discord/stores/StoreStream;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getApplicationStreaming$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming;->getActiveApplicationStream$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/stores/StoreGatewayConnection;->access$getStream$p(Lcom/discord/stores/StoreGatewayConnection;)Lcom/discord/stores/StoreStream;
 
     move-result-object v0
 
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getApplicationStreaming$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getActiveApplicationStream$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     if-eqz v0, :cond_1
 
     iget-object v1, p0, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;->$streamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -118,11 +123,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/gateway/GatewaySocket;->streamWatch(Ljava/lang/String;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali
index 21bff107db..85dd052bff 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1;->$guildId:J
 
@@ -74,13 +76,4 @@
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/gateway/GatewaySocket;->updateGuildSubscriptions(JLcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceServerPing$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceServerPing$1.smali
index 2f8552c022..d3550ce3b7 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceServerPing$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceServerPing$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$voiceServerPing$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,20 +69,13 @@
 .end method
 
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/gateway/GatewaySocket;->voiceServerPing()V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali
index b0457ca652..bbc9c49e43 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$voiceStateUpdate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGatewayConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/gateway/GatewaySocket;",
         "Lkotlin/Unit;",
@@ -59,7 +59,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,34 +79,27 @@
 .end method
 
 .method public final invoke(Lcom/discord/gateway/GatewaySocket;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    iget-object v1, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$guildId:Ljava/lang/Long;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$channelId:Ljava/lang/Long;
+    iget-object v2, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$guildId:Ljava/lang/Long;
 
-    iget-boolean v3, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$selfMute:Z
+    iget-object v3, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$channelId:Ljava/lang/Long;
 
-    iget-boolean v4, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$selfDeaf:Z
+    iget-boolean v4, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$selfMute:Z
 
-    iget-boolean v5, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$selfVideo:Z
+    iget-boolean v5, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$selfDeaf:Z
 
-    iget-object v6, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$preferredRegion:Ljava/lang/String;
+    iget-boolean v6, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$selfVideo:Z
 
-    move-object v0, p1
+    iget-object v7, p0, Lcom/discord/stores/StoreGatewayConnection$voiceStateUpdate$1;->$preferredRegion:Ljava/lang/String;
 
-    invoke-virtual/range {v0 .. v6}, Lcom/discord/gateway/GatewaySocket;->voiceStateUpdate(Ljava/lang/Long;Ljava/lang/Long;ZZZLjava/lang/String;)V
+    move-object v1, p1
+
+    invoke-virtual/range {v1 .. v7}, Lcom/discord/gateway/GatewaySocket;->voiceStateUpdate(Ljava/lang/Long;Ljava/lang/Long;ZZZLjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
index ea94594d3d..eb0001faf7 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
@@ -610,15 +610,21 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/logging/AppGatewaySocketLogger;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "clock"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "scheduler"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "gatewaySocketLogger"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -1135,34 +1141,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamDelete:Lrx/subjects/SerializedSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "gatewaySocketLogger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/logging/AppGatewaySocketLogger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -1178,13 +1156,13 @@
 
     move-result-object p3
 
-    invoke-static {p3}, Lr0/p/a;->b(Ljava/util/concurrent/Executor;)Lrx/Scheduler;
+    invoke-static {p3}, Ls0/p/a;->b(Ljava/util/concurrent/Executor;)Lrx/Scheduler;
 
     move-result-object p3
 
     const-string p5, "Schedulers.from(Executors.newFixedThreadPool(1))"
 
-    invoke-static {p3, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreGatewayConnection;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/logging/AppGatewaySocketLogger;)V
@@ -1395,9 +1373,9 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1762,7 +1740,7 @@
 
     const-string v1, "connected.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1786,7 +1764,7 @@
 
     const-string v1, "connectionReady.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -2503,9 +2481,9 @@
 
     move-result-object p1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -2519,9 +2497,9 @@
 
     move-result-object p1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -2546,7 +2524,9 @@
 .method public handleDispatch(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    if-eqz p2, :cond_2
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p1, :cond_0
 
@@ -2572,9 +2552,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2600,9 +2580,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->voiceServerUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2617,9 +2597,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->voiceStateUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2634,9 +2614,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->presenceReplace:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2651,9 +2631,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamDelete:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2668,9 +2648,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildBanRemove:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2685,9 +2665,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamCreate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2702,9 +2682,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2719,9 +2699,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildRoleDelete:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2738,9 +2718,9 @@
 
     sget-object p2, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2756,9 +2736,9 @@
     :goto_0
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildRoleCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2773,9 +2753,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userGuildSettingsUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2790,9 +2770,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageAck:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2807,9 +2787,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildEmojisUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2824,9 +2804,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageReactionRemove:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2841,9 +2821,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelRecipientAdd:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2869,9 +2849,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageCreate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2886,9 +2866,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2925,9 +2905,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->streamServerUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2942,9 +2922,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->ready:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2971,9 +2951,9 @@
     :goto_1
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageDelete:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -2988,9 +2968,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildMemberRemove:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3016,9 +2996,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelUnreadUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3033,9 +3013,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->callDelete:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3051,9 +3031,9 @@
     :goto_2
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->callCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3068,9 +3048,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildDeleted:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3086,9 +3066,9 @@
     :goto_3
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3103,9 +3083,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userPaymentSourcesUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3120,9 +3100,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->typingStart:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3137,9 +3117,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelRecipientRemove:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3154,9 +3134,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelDeleted:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3172,9 +3152,9 @@
     :goto_4
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->channelCreateOrUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3189,9 +3169,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->relationshipRemove:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3206,9 +3186,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userSettingsUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3223,9 +3203,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildIntegrationsUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3240,9 +3220,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->presenceUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3257,9 +3237,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userNoteUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3274,9 +3254,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userSubscriptionsUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3291,9 +3271,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildMemberListUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3308,9 +3288,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageReactionAdd:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3326,9 +3306,9 @@
     :goto_5
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildMembersAdd:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto/16 :goto_6
 
@@ -3343,9 +3323,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildBanAdd:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_6
 
@@ -3360,9 +3340,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->relationshipAdd:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_6
 
@@ -3377,9 +3357,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userRequiredActionUpdate:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_6
 
@@ -3394,9 +3374,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageReactionRemoveAll:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_6
 
@@ -3411,9 +3391,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->guildMembersChunk:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_6
 
@@ -3428,9 +3408,9 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->sessionsReplace:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_6
 
@@ -3445,23 +3425,14 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->messageReactionRemoveEmoji:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     :cond_1
     :goto_6
     return-void
 
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :sswitch_data_0
     .sparse-switch
         -0x7f659b57 -> :sswitch_35
@@ -3550,7 +3521,9 @@
 .method public final handleRtcConnectionStateChanged(Lcom/discord/rtcconnection/RtcConnection$State;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
@@ -3566,21 +3539,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final init(Landroid/content/Context;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreGatewayConnection;->buildGatewaySocket(Landroid/content/Context;)Lcom/discord/gateway/GatewaySocket;
 
@@ -3601,15 +3567,6 @@
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/stores/StoreGatewayConnection$ClientState$Companion;->initialize(Lcom/discord/stores/StoreStream;Lrx/Scheduler;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final presenceUpdate(Lcom/discord/models/domain/ModelPresence$Status;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)Z
@@ -3868,7 +3825,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGatewayConnection$requestGuildMembers$1;
 
@@ -3879,15 +3838,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final resetOnError()Lkotlin/Unit;
@@ -3910,10 +3860,36 @@
     return-object v0
 .end method
 
+.method public final streamCreate(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+
+    invoke-virtual {v0, p1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;
+
+    invoke-direct {v1, p0, p1, v0, p2}, Lcom/discord/stores/StoreGatewayConnection$streamCreate$1;-><init>(Lcom/discord/stores/StoreGatewayConnection;Ljava/lang/String;Lcom/discord/models/domain/ModelApplicationStream;Ljava/lang/String;)V
+
+    invoke-direct {p0, v1}, Lcom/discord/stores/StoreGatewayConnection;->requestIfSessionEstablished(Lkotlin/jvm/functions/Function1;)Z
+
+    return-void
+.end method
+
 .method public final streamDelete(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGatewayConnection$streamDelete$1;
 
@@ -3922,15 +3898,6 @@
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGatewayConnection;->requestIfSessionEstablished(Lkotlin/jvm/functions/Function1;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final streamWatch(Ljava/lang/String;)V
@@ -3938,7 +3905,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGatewayConnection$streamWatch$1;
 
@@ -3947,37 +3916,28 @@
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGatewayConnection;->requestIfSessionEstablished(Lkotlin/jvm/functions/Function1;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateGuildSubscriptions(JLcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;)Z
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "guildSubscriptions"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;
+    new-instance v0, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;
 
     invoke-virtual {p3}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->getSerializedRanges()Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {p3}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->getTyping()Ljava/lang/Boolean;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual {p3}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->getActivities()Ljava/lang/Boolean;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-virtual {p3}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->getMembers()Ljava/util/Set;
 
@@ -3985,29 +3945,27 @@
 
     if-eqz p3, :cond_0
 
-    invoke-static {p3}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p3}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
-    move-result-object v0
+    move-result-object p3
+
+    goto :goto_0
 
     :cond_0
-    invoke-direct {v1, v2, v3, v4, v0}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;-><init>(Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/util/List;)V
+    const/4 p3, 0x0
+
+    :goto_0
+    invoke-direct {v0, v1, v2, v3, p3}, Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;-><init>(Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/util/List;)V
 
     new-instance p3, Lcom/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1;
 
-    invoke-direct {p3, p1, p2, v1}, Lcom/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1;-><init>(JLcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;)V
+    invoke-direct {p3, p1, p2, v0}, Lcom/discord/stores/StoreGatewayConnection$updateGuildSubscriptions$1;-><init>(JLcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;)V
 
     invoke-direct {p0, p3}, Lcom/discord/stores/StoreGatewayConnection;->requestIfSessionEstablished(Lkotlin/jvm/functions/Function1;)Z
 
     move-result p1
 
     return p1
-
-    :cond_1
-    const-string p1, "guildSubscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final voiceStateUpdate(Ljava/lang/Long;Ljava/lang/Long;ZZZLjava/lang/String;)Z
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$1.smali
index dfef0611bf..943a9c95a7 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGifPicker$fetchGifCategories$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGifPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreGifPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleFetchGifCategoriesError"
+
+    const-string v5, "handleFetchGifCategoriesError(Lcom/discord/utilities/error/Error;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchGifCategoriesError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGifPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchGifCategoriesError(Lcom/discord/utilities/error/Error;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGifPicker;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGifPicker;->access$handleFetchGifCategoriesError(Lcom/discord/stores/StoreGifPicker;Lcom/discord/utilities/error/Error;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$2.smali
index 4e86759ae8..2643d1ed3e 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifCategories$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGifPicker$fetchGifCategories$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGifPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreGifPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleFetchGifCategoriesOnNext"
+
+    const-string v5, "handleFetchGifCategoriesOnNext(Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchGifCategoriesOnNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGifPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchGifCategoriesOnNext(Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGifPicker;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGifPicker;->access$handleFetchGifCategoriesOnNext(Lcom/discord/stores/StoreGifPicker;Lcom/discord/models/gifpicker/dto/TrendingGifCategoriesResponseDto;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$1.smali
index 56b2192bc7..0a60e57dd4 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGifPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreGifPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleFetchTrendingSearchTermsError"
+
+    const-string v5, "handleFetchTrendingSearchTermsError(Lcom/discord/utilities/error/Error;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingSearchTermsError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGifPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingSearchTermsError(Lcom/discord/utilities/error/Error;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGifPicker;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGifPicker;->access$handleFetchTrendingSearchTermsError(Lcom/discord/stores/StoreGifPicker;Lcom/discord/utilities/error/Error;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$2.smali
index 51a75eec7b..10df7a8214 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGifPicker$fetchGifTrendingSearchTerms$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGifPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreGifPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleFetchTrendingSearchTermsOnNext"
+
+    const-string v5, "handleFetchTrendingSearchTermsOnNext(Ljava/util/List;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingSearchTermsOnNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGifPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingSearchTermsOnNext(Ljava/util/List;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -94,22 +78,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGifPicker;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGifPicker;->access$handleFetchTrendingSearchTermsOnNext(Lcom/discord/stores/StoreGifPicker;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$1.smali
index 9066c250d6..a05e25e0a6 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGifPicker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/GifDto;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/ModelGif;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,7 +92,7 @@
 
     const-string v0, "gifDtos"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.smali
index cae894052d..ada1e0fc66 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.smali
@@ -67,7 +67,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2;->$query:Ljava/lang/String;
 
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-static {p1, v0, v1}, Lcom/discord/stores/StoreGifPicker;->access$handleGifSearchResults(Lcom/discord/stores/StoreGifPicker;Ljava/lang/String;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3$1.smali
index 0068136f3b..418264acf4 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     const-string v3, "gifs"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0, v2}, Lcom/discord/stores/StoreGifPicker;->access$handleGifSearchResults(Lcom/discord/stores/StoreGifPicker;Ljava/lang/String;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3.smali
index 9107ee8c51..79661c391f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.smali
index 9970641f33..202e90b6cf 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.smali
@@ -67,7 +67,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1;->$query:Ljava/lang/String;
 
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-static {p1, v0, v1}, Lcom/discord/stores/StoreGifPicker;->access$handleSuggestedSearchTerms(Lcom/discord/stores/StoreGifPicker;Ljava/lang/String;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2$1.smali
index 97a164cdf8..b22dc0423f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     const-string v3, "suggestedSearchTerms"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0, v2}, Lcom/discord/stores/StoreGifPicker;->access$handleSuggestedSearchTerms(Lcom/discord/stores/StoreGifPicker;Ljava/lang/String;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.smali
index c67d94fff7..27f933360a 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$1.smali
index ea17144cd4..601bbc3ac4 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGifPicker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/GifDto;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/ModelGif;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,7 +92,7 @@
 
     const-string v0, "gifDtos"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$2.smali
index 010335b358..cf21d65d1d 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGifPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreGifPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleFetchTrendingGifsError"
+
+    const-string v5, "handleFetchTrendingGifsError(Lcom/discord/utilities/error/Error;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingGifsError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGifPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingGifsError(Lcom/discord/utilities/error/Error;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGifPicker;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGifPicker;->access$handleFetchTrendingGifsError(Lcom/discord/stores/StoreGifPicker;Lcom/discord/utilities/error/Error;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$3.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$3.smali
index edd3e6aa38..ee005e8cbc 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGifPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreGifPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleFetchTrendingGifsOnNext"
+
+    const-string v5, "handleFetchTrendingGifsOnNext(Ljava/util/List;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingGifsOnNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGifPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFetchTrendingGifsOnNext(Ljava/util/List;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -94,22 +78,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGifPicker;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGifPicker;->access$handleFetchTrendingGifsOnNext(Lcom/discord/stores/StoreGifPicker;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesError$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesError$1.smali
index 7a651edc9f..1276dcf7a6 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesError$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$handleFetchGifCategoriesError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesOnNext$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesOnNext$1.smali
index 54c8d7a4a4..d3b0d17788 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesOnNext$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchGifCategoriesOnNext$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$handleFetchGifCategoriesOnNext$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsError$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsError$1.smali
index 3c05638c4e..01b8f52d80 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsError$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$handleFetchTrendingGifsError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsOnNext$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsOnNext$1.smali
index 9160f5090e..6a61ed0a5d 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsOnNext$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingGifsOnNext$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$handleFetchTrendingGifsOnNext$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsError$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsError$1.smali
index 40cecb61e3..e00f6ee4f8 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsError$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsOnNext$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsOnNext$1.smali
index 6782977319..af32f3eb7c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsOnNext$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsOnNext$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$handleFetchTrendingSearchTermsOnNext$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$1.smali
index 98f9ffa253..c016bb909e 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeGifCategories$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$2.smali
index cf0ad11d06..244577dc9d 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifCategories$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeGifCategories$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$1.smali
index fdce275583..fb488b7aa3 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$2.smali
index a4dbfacbd5..3210f8a248 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeGifTrendingSearchTerms$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$1.smali
index 02497b4922..adac41b7ae 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeGifsForSearchQuery$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$2.smali
index f77b8bb024..8f1e75b131 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeGifsForSearchQuery$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGifPicker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/ModelGif;",
+        ">;>;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/ModelGif;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSearchHistory$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSearchHistory$1.smali
index 4a5285e7dc..d9d044362f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSearchHistory$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSearchHistory$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeSearchHistory$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$1.smali
index 571cc7c984..3c44a35db4 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$2.smali
index 032f963c32..4b80029a2b 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$3.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$3.smali
index 86cb21c76b..1c4d4115a4 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$3.smali
@@ -3,7 +3,7 @@
 .source "StoreGifPicker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$1.smali
index ce86fbca77..9c498f528c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$2.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$2.smali
index 05e074f980..3221605fa1 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeTrendingCategoryGifs$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingGifCategoryPreviewUrl$1.smali b/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingGifCategoryPreviewUrl$1.smali
index 48bd9fd0cb..7c936ee63f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingGifCategoryPreviewUrl$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker$observeTrendingGifCategoryPreviewUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifPicker$observeTrendingGifCategoryPreviewUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifPicker.smali b/com.discord/smali/com/discord/stores/StoreGifPicker.smali
index ac03cf29bd..4a8608ae7c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifPicker.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifPicker.smali
@@ -176,7 +176,7 @@
 
     sput-object v0, Lcom/discord/stores/StoreGifPicker;->Companion:Lcom/discord/stores/StoreGifPicker$Companion;
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     sput-object v0, Lcom/discord/stores/StoreGifPicker;->searchResultsLoadingList:Ljava/util/List;
 
@@ -188,15 +188,21 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/updates/ObservationDeck;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "storeUserSettings"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "restAPI"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "observationDeck"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreV2;-><init>()V
 
@@ -208,19 +214,19 @@
 
     iput-object p4, p0, Lcom/discord/stores/StoreGifPicker;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifPicker;->gifCategoriesSnapshot:Ljava/util/List;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifPicker;->gifTrendingSearchTermsSnapshot:Ljava/util/List;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifPicker;->gifSearchHistorySnapshot:Ljava/util/Map;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifPicker;->suggestedSearchTermsSnapshot:Ljava/util/Map;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifPicker;->trendingCategoryGifsSnapshot:Ljava/util/List;
 
@@ -259,34 +265,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGifPicker;->gifSuggestedSearchTermsHistory:Lcom/discord/stores/StoreGifPicker$CacheHistory;
 
     return-void
-
-    :cond_0
-    const-string p1, "observationDeck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUserSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -626,7 +604,7 @@
 
     const-string v3, "storeUserSettings.locale"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "tenor"
 
@@ -682,7 +660,7 @@
 
     const-string v1, "storeUserSettings.locale"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "tenor"
 
@@ -698,13 +676,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$1;->INSTANCE:Lcom/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "restAPI.getGifSearchResu\u2026to)\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -726,7 +704,7 @@
 
     const-string v0, "restAPI.getGifSearchResu\u2026y, emptyList())\n        }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreGifPicker;
 
@@ -764,7 +742,7 @@
 
     const-string v2, "storeUserSettings.locale"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "tenor"
 
@@ -794,7 +772,7 @@
 
     const-string v0, "restAPI.getGifSuggestedS\u2026y, emptyList())\n        }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreGifPicker;
 
@@ -836,7 +814,7 @@
 
     const-string v3, "storeUserSettings.locale"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "tenor"
 
@@ -850,13 +828,13 @@
 
     sget-object v2, Lcom/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$1;->INSTANCE:Lcom/discord/stores/StoreGifPicker$fetchTrendingCategoryGifs$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "restAPI.getTrendingGifCa\u2026to)\n          }\n        }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -1409,7 +1387,7 @@
 
     const-string v3, "storeUserSettings.locale"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "tenor"
 
@@ -1564,7 +1542,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "query"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifPicker;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1582,40 +1562,31 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreGifPicker$observeGifsForSearchQuery$2;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "observeSearchHistory().m\u2026gifSearchHistory[query] }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "filter { it != null }.map { it!! }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeSuggestedSearchTerms(Ljava/lang/String;)Lrx/Observable;
@@ -1632,7 +1603,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "query"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifPicker;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1650,40 +1623,31 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreGifPicker$observeSuggestedSearchTerms$3;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "observeSuggestedSearchTe\u2026archTermsHistory[query] }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "filter { it != null }.map { it!! }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeTrendingCategoryGifs()Lrx/Observable;
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali
index e7b16d7f3a..e47d23895f 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$RedeemedFailed.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGift;ZLjava/lang/Integer;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGifting$GiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->errorCode:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;Lcom/discord/models/domain/ModelGift;ZLjava/lang/Integer;ILjava/lang/Object;)Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
@@ -108,22 +103,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGift;ZLjava/lang/Integer;)Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;-><init>(Lcom/discord/models/domain/ModelGift;ZLjava/lang/Integer;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +129,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->gift:Lcom/discord/models/domain/ModelGift;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -157,7 +145,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->errorCode:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali
index 53d94f6382..b40ca11cc9 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Redeeming.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGift;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGifting$GiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;->gift:Lcom/discord/models/domain/ModelGift;
 
     return-void
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGifting$GiftState$Redeeming;Lcom/discord/models/domain/ModelGift;ILjava/lang/Object;)Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGift;)Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;-><init>(Lcom/discord/models/domain/ModelGift;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;->gift:Lcom/discord/models/domain/ModelGift;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali
index c54d72416f..278f058489 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Resolved.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGift;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGifting$GiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->gift:Lcom/discord/models/domain/ModelGift;
 
     return-void
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGifting$GiftState$Resolved;Lcom/discord/models/domain/ModelGift;ILjava/lang/Object;)Lcom/discord/stores/StoreGifting$GiftState$Resolved;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGift;)Lcom/discord/stores/StoreGifting$GiftState$Resolved;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGifting$GiftState$Resolved;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreGifting$GiftState$Resolved;-><init>(Lcom/discord/models/domain/ModelGift;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGifting$GiftState$Resolved;->gift:Lcom/discord/models/domain/ModelGift;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Revoking.smali b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Revoking.smali
index b61f53df5b..d0547a758b 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Revoking.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$GiftState$Revoking.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGift;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGifting$GiftState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifting$GiftState$Revoking;->gift:Lcom/discord/models/domain/ModelGift;
 
     return-void
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGifting$GiftState$Revoking;Lcom/discord/models/domain/ModelGift;ILjava/lang/Object;)Lcom/discord/stores/StoreGifting$GiftState$Revoking;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGift;)Lcom/discord/stores/StoreGifting$GiftState$Revoking;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGifting$GiftState$Revoking;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreGifting$GiftState$Revoking;-><init>(Lcom/discord/models/domain/ModelGift;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGifting$GiftState$Revoking;->gift:Lcom/discord/models/domain/ModelGift;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1$1.smali
index a672c023fd..7ba2fd344a 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$acceptGift$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 
     const-string v3, "error.response"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -122,7 +122,7 @@
 
     move-result-object v7
 
-    invoke-static {v7, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1.smali
index 3df3881383..ad4fbbd8fd 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$acceptGift$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$acceptGift$1$1;->this$0:Lcom/discord/stores/StoreGifting$acceptGift$1;
 
@@ -78,13 +80,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2$1.smali
index 2d313e785c..adda68fdaa 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$acceptGift$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2.smali b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2.smali
index 0621431f2f..76f6c91de3 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$acceptGift$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali
index 6218d477a1..703cc3195c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$acceptGift$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$acceptGift$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lr0/p/a;->d()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->d()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -104,7 +104,7 @@
 
     const-string v0, "RestAPI\n        .api\n   \u2026scribeOn(Schedulers.io())"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$acceptGift$1;->this$0:Lcom/discord/stores/StoreGifting;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali
index 39a477f6bd..7fc5eba946 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchGift$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali
index b2da840c26..24ab8e3bb8 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchGift$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGift;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGift;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$fetchGift$1;->this$0:Lcom/discord/stores/StoreGifting;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2$1.smali
index ae1409804f..60940e5e59 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchGift$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali
index 8f4619f2d8..3fb92dbe1d 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchGift$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchGift$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$fetchGift$2;->this$0:Lcom/discord/stores/StoreGifting;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$1.smali
index 37cd0b3e22..9685b5de92 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2$1.smali
index ff343d0f03..9c17b8a45b 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2.smali
index 261c7931ce..a5e2594c3e 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$2;->this$0:Lcom/discord/stores/StoreGifting;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3$1.smali
index fca74cb84c..3cde1e6e1d 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3.smali b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3.smali
index 8d3f4ba2fe..493aef36eb 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$fetchMyGiftsForSku$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifts"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$fetchMyGiftsForSku$3;->this$0:Lcom/discord/stores/StoreGifting;
 
@@ -91,13 +93,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gifts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$1.smali
index 4333451da8..1ab5e95a72 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$generateGiftCode$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2$1.smali
index 27f17fa50c..98bc44f55c 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$generateGiftCode$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2.smali b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2.smali
index 2d28547759..aa9b8e1117 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$generateGiftCode$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$generateGiftCode$2;->this$0:Lcom/discord/stores/StoreGifting;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3$1.smali
index 3034e5eb41..d8d1c0b222 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$generateGiftCode$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3.smali b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3.smali
index 7019de84aa..1da0d5bf9e 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$generateGiftCode$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$generateGiftCode$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGift;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGift;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "newGift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$generateGiftCode$3;->this$0:Lcom/discord/stores/StoreGifting;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newGift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$getMyResolvedGifts$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$getMyResolvedGifts$1.smali
index 95351bebb2..95094f5e22 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$getMyResolvedGifts$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$getMyResolvedGifts$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGifting.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreGifting$GiftState;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelGift;",
+        ">;>;"
     }
 .end annotation
 
@@ -184,11 +192,11 @@
     goto :goto_2
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.stores.StoreGifting.GiftState.Resolved"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali
index 4bf180a8f4..7608685452 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$requestGift$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali
index ed490e80f5..2fc8a12360 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$requestGift$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGifting.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreGifting$GiftState;",
+        ">;",
+        "Lcom/discord/stores/StoreGifting$GiftState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$1.smali
index b10f97c3b8..48b0abc19b 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$revokeGiftCode$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2$1.smali
index 6e6d6cadd0..735e02d848 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$revokeGiftCode$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2.smali b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2.smali
index 2efd4bbd2d..0bd9261097 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$revokeGiftCode$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting$revokeGiftCode$2;->this$0:Lcom/discord/stores/StoreGifting;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3$1.smali b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3$1.smali
index 62fb0536ca..afa9d11cb8 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$revokeGiftCode$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3.smali b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3.smali
index 950d1b2abe..a0006f7807 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting$revokeGiftCode$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGifting$revokeGiftCode$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGifting.smali b/com.discord/smali/com/discord/stores/StoreGifting.smali
index 9c09c4c814..d26e1e8a13 100644
--- a/com.discord/smali/com/discord/stores/StoreGifting.smali
+++ b/com.discord/smali/com/discord/stores/StoreGifting.smali
@@ -59,9 +59,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -73,7 +75,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGifting;->knownGifts:Ljava/util/HashMap;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -82,15 +84,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGifting;->knownGiftsSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$fetchGift(Lcom/discord/stores/StoreGifting;Ljava/lang/String;)V
@@ -173,11 +166,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.stores.StoreGifting.GiftState.Resolved"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -297,7 +290,9 @@
 .method public final acceptGift(Lcom/discord/models/domain/ModelGift;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -308,15 +303,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final fetchMyGiftsForSku(JLjava/lang/Long;)V
@@ -523,13 +509,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGifting$getMyResolvedGifts$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "knownGiftsSubject\n      \u2026              }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -559,7 +545,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "giftCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGifting;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -575,7 +563,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreGifting$requestGift$2;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -585,83 +573,76 @@
 
     const-string v0, "knownGiftsSubject\n      \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final revokeGiftCode(Lcom/discord/models/domain/ModelGift;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreGifting;->knownGifts:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/stores/StoreGifting;->knownGifts:Ljava/util/HashMap;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
 
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lcom/discord/stores/StoreGifting;->knownGifts:Ljava/util/HashMap;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
     move-result-object v1
 
-    instance-of v1, v1, Lcom/discord/stores/StoreGifting$GiftState$Revoking;
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
-    if-eqz v1, :cond_0
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreGifting;->knownGifts:Ljava/util/HashMap;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v0, v0, Lcom/discord/stores/StoreGifting$GiftState$Revoking;
+
+    if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/stores/StoreGifting;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v0, p0, Lcom/discord/stores/StoreGifting;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    new-instance v2, Lcom/discord/stores/StoreGifting$revokeGiftCode$1;
+    new-instance v1, Lcom/discord/stores/StoreGifting$revokeGiftCode$1;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/stores/StoreGifting$revokeGiftCode$1;-><init>(Lcom/discord/stores/StoreGifting;Lcom/discord/models/domain/ModelGift;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreGifting$revokeGiftCode$1;-><init>(Lcom/discord/stores/StoreGifting;Lcom/discord/models/domain/ModelGift;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
 
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/rest/RestAPI;->revokeGiftCode(Ljava/lang/String;)Lrx/Observable;
-
     move-result-object v1
 
-    const/4 v2, 0x0
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/rest/RestAPI;->revokeGiftCode(Ljava/lang/String;)Lrx/Observable;
 
-    const/4 v3, 0x1
+    move-result-object v0
 
-    invoke-static {v1, v2, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
@@ -688,11 +669,4 @@
     invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali
index 29ff59e6e5..8549cbccbc 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildIntegration;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildIntegration;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali
index cfd61bd223..b9598fea8c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$get$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildIntegration;",
+        ">;",
+        "Lcom/discord/models/domain/ModelGuildIntegration;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1.smali
index f7b1ea39b0..784091caaf 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGuildIntegrations;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/stores/StoreGuildIntegrations;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "handleIntegrationScreenClosed"
+
+    const-string v5, "handleIntegrationScreenClosed()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleIntegrationScreenClosed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGuildIntegrations;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleIntegrationScreenClosed()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGuildIntegrations;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali
index cbc3ae7d9d..9b2428bf94 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali
index c22e02eae5..9800a4b6ac 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenClosed$2;->this$0:Lcom/discord/stores/StoreGuildIntegrations;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreGuildIntegrations;->access$setCloseIntegrationScreenSubscription$p(Lcom/discord/stores/StoreGuildIntegrations;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali
index fed9416a77..c0f40f8c7f 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildIntegrations$onIntegrationScreenOpened$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1.smali
index 367274fc98..3c84b62fc8 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     const-string v4, "integrations"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v2, v3, v0}, Lcom/discord/stores/StoreGuildIntegrations;->access$handleIntegrationsLoaded(Lcom/discord/stores/StoreGuildIntegrations;JLjava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali
index 701204c314..18060bc918 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali b/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
index 7402e6522c..743fb32ef1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
@@ -40,9 +40,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -65,15 +67,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuildIntegrations;->integrationsSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getCloseIntegrationScreenSubscription$p(Lcom/discord/stores/StoreGuildIntegrations;)Lrx/Subscription;
@@ -261,7 +254,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -285,7 +278,15 @@
 
     and-int/lit8 p1, p1, 0x20
 
-    new-instance p1, Lf/a/b/a0;
+    const-string p1, "onNext"
+
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "errorClass"
+
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/b/c0;
 
     const/4 v7, 0x0
 
@@ -297,7 +298,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -325,7 +326,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuildIntegrations$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -335,7 +336,7 @@
 
     const-string p2, "integrationsSubject\n    \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -359,7 +360,7 @@
 
     invoke-direct {p2, p3, p4}, Lcom/discord/stores/StoreGuildIntegrations$get$2;-><init>(J)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -369,7 +370,7 @@
 
     const-string p2, "get(guildId)\n          .\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -450,9 +451,15 @@
 
     and-int/lit8 v1, v2, 0x20
 
-    if-eqz v3, :cond_2
+    const-string v1, "onNext"
 
-    new-instance v8, Lf/a/b/a0;
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "errorClass"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lf/a/b/c0;
 
     move-object v1, v8
 
@@ -460,7 +467,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
     :try_end_0
@@ -470,16 +477,6 @@
 
     return-void
 
-    :cond_2
-    :try_start_1
-    const-string v0, "errorClass"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
     :catchall_0
     move-exception v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali
index 006b510daf..12df9cf710 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildMemberCounts.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -47,7 +53,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;)I
+.method public final call(Ljava/util/Map;)Ljava/lang/Integer;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,7 +61,8 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
-            ">;)I"
+            ">;)",
+            "Ljava/lang/Integer;"
         }
     .end annotation
 
@@ -83,7 +90,11 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -91,11 +102,7 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1;->call(Ljava/util/Map;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1;->call(Ljava/util/Map;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
index 7ff2bbd533..1015784691 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberCounts.smali
@@ -45,7 +45,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreGuildMemberCounts;->guildMemberCounts:Ljava/util/HashMap;
 
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuildMemberCounts$getApproximateMemberCount$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -85,7 +85,7 @@
 
     const-string p2, "guildMemberCountsPublish\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -112,7 +112,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuilds()Ljava/util/List;
 
@@ -141,7 +143,7 @@
 
     const-string v2, "guild"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -169,15 +171,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreGuildMemberCounts;->isDirty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildCreate(Lcom/discord/models/domain/ModelGuild;)V
@@ -185,7 +178,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildMemberCounts;->guildMemberCounts:Ljava/util/HashMap;
 
@@ -212,15 +207,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreGuildMemberCounts;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildDelete(J)V
@@ -266,7 +252,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "member"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildMemberCounts;->guildMemberCounts:Ljava/util/HashMap;
 
@@ -314,15 +302,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildMemberRemove(J)V
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali
index bc8230f293..1f62c5ba6c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGuildMemberRequester$requestManager$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGuildMemberRequester.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -30,45 +30,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGuildMemberRequester;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/stores/StoreGuildMemberRequester;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string v4, "guildMemberExists"
+
+    const-string v5, "guildMemberExists(JJ)Z"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "guildMemberExists"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGuildMemberRequester;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "guildMemberExists(JJ)Z"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -98,7 +82,7 @@
 .method public final invoke(JJ)Z
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGuildMemberRequester;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali
index c4318d73d4..6036ad787c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester$requestManager$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreGuildMemberRequester$requestManager$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreGuildMemberRequester.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/util/List<",
@@ -33,45 +33,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGuildMemberRequester;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/stores/StoreGuildMemberRequester;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string v4, "sendRequests"
+
+    const-string v5, "sendRequests(JLjava/util/List;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "sendRequests"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGuildMemberRequester;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "sendRequests(JLjava/util/List;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -101,22 +85,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "p2"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGuildMemberRequester;
 
     invoke-static {v0, p1, p2, p3}, Lcom/discord/stores/StoreGuildMemberRequester;->access$sendRequests(Lcom/discord/stores/StoreGuildMemberRequester;JLjava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
index 89bfff86ce..c775b9d3e3 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
@@ -28,7 +28,9 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "collector"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -55,15 +57,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuildMemberRequester;->channelPendingMessages:Ljava/util/TreeMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "collector"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$guildMemberExists(Lcom/discord/stores/StoreGuildMemberRequester;JJ)Z
@@ -193,7 +186,7 @@
 
     const-string v1, "message.mentions"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -216,7 +209,7 @@
 
     const-string v3, "it"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -359,7 +352,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_4
+    const-string v0, "chunk"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->getGuildId()J
 
@@ -395,7 +390,7 @@
 
     const-string v5, "it"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -427,9 +422,9 @@
 
     iget-object v4, p0, Lcom/discord/stores/StoreGuildMemberRequester;->requestManager:Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager;
 
-    const-string v5, "user"
+    const-string/jumbo v5, "user"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -467,7 +462,7 @@
 
     const-string v4, "notFoundUserId"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
@@ -479,19 +474,10 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "chunk"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleLoadMessages(JLjava/util/Collection;)V
-    .locals 5
+    .locals 4
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -505,21 +491,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "messages"
 
-    if-eqz p3, :cond_6
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/discord/stores/StoreGuildMemberRequester;->isConnected:Z
+    iget-boolean v0, p0, Lcom/discord/stores/StoreGuildMemberRequester;->isConnected:Z
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    iget-object v1, p0, Lcom/discord/stores/StoreGuildMemberRequester;->collector:Lcom/discord/stores/StoreStream;
+    iget-object v0, p0, Lcom/discord/stores/StoreGuildMemberRequester;->collector:Lcom/discord/stores/StoreStream;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getChannels$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannels;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getChannels$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannels;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/stores/StoreChannels;->getBlocking$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreChannels;->getBlocking$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
 
     move-result-object p1
 
@@ -533,11 +519,11 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    const-wide/16 v3, 0x0
+    const-wide/16 v2, 0x0
 
-    cmp-long p2, v1, v3
+    cmp-long p2, v0, v2
 
     if-lez p2, :cond_0
 
@@ -551,16 +537,19 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    move-object v0, p1
+    goto :goto_1
 
     :cond_1
-    if-eqz v0, :cond_5
+    const/4 p1, 0x0
 
-    const-string p1, "guildId"
+    :goto_1
+    if-eqz p1, :cond_5
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string p2, "guildId"
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide p1
 
@@ -570,7 +559,7 @@
 
     invoke-virtual {p1}, Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager;->flush()V
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_2
     iget-object v0, p0, Lcom/discord/stores/StoreGuildMemberRequester;->channelPendingMessages:Ljava/util/TreeMap;
@@ -587,7 +576,7 @@
 
     if-eqz v0, :cond_3
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_3
     new-instance v0, Ljava/util/HashMap;
@@ -598,16 +587,12 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(I)V
 
-    :goto_1
-    const-string v1, "channelPendingMessages[c\u2026?: HashMap(messages.size)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
+    :goto_2
     invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p3
 
-    :goto_2
+    :goto_3
     invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
@@ -632,7 +617,7 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     iget-object p3, p0, Lcom/discord/stores/StoreGuildMemberRequester;->channelPendingMessages:Ljava/util/TreeMap;
@@ -644,13 +629,6 @@
     invoke-interface {p3, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_5
-    :goto_3
+    :goto_4
     return-void
-
-    :cond_6
-    const-string p1, "messages"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$GuildProfileData.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$GuildProfileData.smali
index e00a604b9a..f70e2aff7e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$GuildProfileData.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$GuildProfileData.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGuildProfiles$FetchStates;Lcom/discord/models/domain/ModelGuildPreview;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "fetchState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;->data:Lcom/discord/models/domain/ModelGuildPreview;
 
     return-void
-
-    :cond_0
-    const-string p1, "fetchState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;Lcom/discord/stores/StoreGuildProfiles$FetchStates;Lcom/discord/models/domain/ModelGuildPreview;ILjava/lang/Object;)Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;
@@ -89,22 +82,15 @@
 .method public final copy(Lcom/discord/stores/StoreGuildProfiles$FetchStates;Lcom/discord/models/domain/ModelGuildPreview;)Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "fetchState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;-><init>(Lcom/discord/stores/StoreGuildProfiles$FetchStates;Lcom/discord/models/domain/ModelGuildPreview;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "fetchState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;->fetchState:Lcom/discord/stores/StoreGuildProfiles$FetchStates;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -132,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;->data:Lcom/discord/models/domain/ModelGuildPreview;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1$1.smali
index ccba94a52e..03c3221cb1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildProfiles.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1.smali
index 906ef3ee55..c08258148f 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildProfiles.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildPreview;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildPreview;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildPreview"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$1;->this$0:Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1;
 
@@ -78,13 +80,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildPreview"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2$1.smali
index 2dba6a5dd9..e40df203e9 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildProfiles.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2.smali
index 507c769db5..5e4762afd7 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildProfiles.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1$2;->this$0:Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1;
 
@@ -78,13 +80,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1.smali
index 0830449f4b..9c04e36b59 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$fetchGuildProfile$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildProfiles$fetchGuildProfile$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildProfiles.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$1.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$1.smali
index 69bf105ab1..a7285ebace 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildProfiles$getGuildProfile$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildProfiles.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$2.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$2.smali
index 416add50bd..740897f217 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles$getGuildProfile$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildProfiles.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;",
+        ">;",
+        "Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildProfiles.smali b/com.discord/smali/com/discord/stores/StoreGuildProfiles.smali
index 43b501ad61..37769cf378 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildProfiles.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildProfiles.smali
@@ -46,9 +46,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,15 +73,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuildProfiles;->guildProfilesStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$fetchIfNonexisting(Lcom/discord/stores/StoreGuildProfiles;J)V
@@ -294,7 +287,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuildProfiles$getGuildProfile$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -304,7 +297,7 @@
 
     const-string p2, "guildProfilesStateSubjec\u2026 }.distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$dispatchSampleGuildIdSelected$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$dispatchSampleGuildIdSelected$1.smali
index 6b56f0bb89..b654639842 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$dispatchSampleGuildIdSelected$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$dispatchSampleGuildIdSelected$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSelected$dispatchSampleGuildIdSelected$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali
index bc0cd4b5d0..9cbc119a26 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali
index e05497e187..7c7f077ac1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelGuild;",
             ">;"
         }
@@ -92,7 +95,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreGuildSelected$get$1$1;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali
index df56f864d2..471659ee88 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSelected$handleConnectionOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -87,7 +87,7 @@
 
     const-string v3, "payload.guilds"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
 
@@ -120,7 +120,7 @@
 
     const-string v4, "it"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali
index 1bc008d4d7..632df8d7a1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$id$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,44 +62,37 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/List;)J
-    .locals 2
+.method public final call(Ljava/util/List;)Ljava/lang/Long;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
             "Ljava/lang/Long;",
-            ">;)J"
+            ">;)",
+            "Ljava/lang/Long;"
         }
     .end annotation
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
-    check-cast p1, Ljava/lang/Number;
+    check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 0
 
     check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildSelected$id$1;->call(Ljava/util/List;)J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuildSelected$id$1;->call(Ljava/util/List;)Ljava/lang/Long;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali
index 609d2240d0..18b6d7500e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected$set$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSelected$set$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
index df7d4e9c79..69fdbf0d92 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
@@ -103,11 +103,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -119,6 +121,8 @@
 
     const/4 p2, 0x5
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-direct {p1, p2, v0, v1, v0}, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;-><init>(ILjava/util/LinkedHashSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -143,7 +147,7 @@
 
     const-string p2, "selectedGuildIdsSubject"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -155,19 +159,19 @@
 
     const-string p2, "selectedGuildIdsSubject\n\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildSelected;->mostRecent:Lrx/Observable;
 
     sget-object p2, Lcom/discord/stores/StoreGuildSelected$id$1;->INSTANCE:Lcom/discord/stores/StoreGuildSelected$id$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "mostRecent\n      .map { it.first() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -179,25 +183,11 @@
 
     const-string p2, "mostRecent\n      .map { \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildSelected;->id:Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getSelectedGuildIds$p(Lcom/discord/stores/StoreGuildSelected;)Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
@@ -280,7 +270,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreGuildSelected$get$1;-><init>(Lcom/discord/stores/StoreGuildSelected;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -290,7 +280,7 @@
 
     const-string v1, "id\n      .switchMap { se\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -337,43 +327,35 @@
 .end method
 
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
-    .locals 3
+    .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "payload"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIds:Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
+    iget-object v0, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIds:Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
 
-    new-instance v2, Lcom/discord/stores/StoreGuildSelected$handleConnectionOpen$1;
+    new-instance v1, Lcom/discord/stores/StoreGuildSelected$handleConnectionOpen$1;
 
-    invoke-direct {v2, p1}, Lcom/discord/stores/StoreGuildSelected$handleConnectionOpen$1;-><init>(Lcom/discord/models/domain/ModelPayload;)V
+    invoke-direct {v1, p1}, Lcom/discord/stores/StoreGuildSelected$handleConnectionOpen$1;-><init>(Lcom/discord/models/domain/ModelPayload;)V
 
-    if-eqz v1, :cond_0
+    const-string p1, "$this$removeAll"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "predicate"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
-    invoke-static {v1, v2, p1}, Lf/n/a/k/a;->v(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
+    invoke-static {v0, v1, p1}, Lf/n/a/k/a;->s(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
 
     iput-boolean p1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIdsDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "$this$removeAll"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -381,7 +363,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIds:Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
 
@@ -400,15 +384,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIdsDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePreLogout()V
@@ -450,7 +425,9 @@
 .method public init(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -475,15 +452,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIdsDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -517,7 +485,7 @@
     :cond_1
     iget-object v0, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIds:Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
 
-    invoke-static {v0}, Lj0/i/l;->last(Ljava/lang/Iterable;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->last(Ljava/lang/Iterable;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -618,7 +586,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIds:Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
 
-    invoke-static {v1}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1}, Lk0/j/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali
index fdedd3c205..e00182a34e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSubscriptions$RangeComputer$computeRanges$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Integer;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
index 6abc252b35..0af2f3ea7d 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali
@@ -76,7 +76,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "range"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -96,7 +98,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static {v2, p2}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v2, p2}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object v2
 
@@ -105,11 +107,11 @@
     :cond_0
     iget p1, p1, Lkotlin/ranges/IntProgression;->e:I
 
-    invoke-static {v1, p1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, p1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
-    invoke-static {p1, p2}, Lj0/q/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
+    invoke-static {p1, p2}, Lk0/r/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
 
     move-result-object p1
 
@@ -131,7 +133,7 @@
     :goto_0
     add-int v3, v1, p2
 
-    invoke-static {v1, v3}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v3}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object v3
 
@@ -145,13 +147,4 @@
 
     :cond_2
     return-object v0
-
-    :cond_3
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
index 49aae324f7..d25c08703a 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSubscriptions$subscribeChannelRange$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali
index e2d3aa6ded..92428c45bb 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscribeUser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSubscriptions$subscribeUser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali
index e4d4face9a..b1f61397e6 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(JLcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;)V
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "subscriptions"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildSubscriptions$subscriptionsManager$1;->this$0:Lcom/discord/stores/StoreGuildSubscriptions;
 
@@ -83,13 +85,4 @@
     invoke-virtual {v0, p1, p2, p3}, Lcom/discord/stores/StoreGatewayConnection;->updateGuildSubscriptions(JLcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali
index ae0802da35..da88fe5703 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildSubscriptions$unsubscribeUser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
index e7800dfd09..17081cc3fb 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions.smali
@@ -26,11 +26,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeStream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -49,20 +51,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuildSubscriptions;->subscriptionsManager:Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getStoreStream$p(Lcom/discord/stores/StoreGuildSubscriptions;)Lcom/discord/stores/StoreStream;
@@ -274,7 +262,9 @@
 .method public final subscribeChannelRange(JJLkotlin/ranges/IntRange;)V
     .locals 9
 
-    if-eqz p5, :cond_2
+    const-string v0, "range"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
@@ -310,15 +300,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final subscribeUser(JJ)V
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved.smali
index 6c724534e5..ed2a017167 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuildTemplate;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guildTemplate"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;->guildTemplate:Lcom/discord/models/domain/ModelGuildTemplate;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;Lcom/discord/models/domain/ModelGuildTemplate;ILjava/lang/Object;)Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuildTemplate;)Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;-><init>(Lcom/discord/models/domain/ModelGuildTemplate;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;->guildTemplate:Lcom/discord/models/domain/ModelGuildTemplate;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$clearDynamicLinkGuildTemplateCode$1.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$clearDynamicLinkGuildTemplateCode$1.smali
index 9680c47ad3..19b5987bef 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$clearDynamicLinkGuildTemplateCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$clearDynamicLinkGuildTemplateCode$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildTemplates$clearDynamicLinkGuildTemplateCode$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildTemplates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$1.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$1.smali
index 2eba087e3f..eae84c3ee2 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildTemplates$observeGuildTemplate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildTemplates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$2.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$2.smali
index f218d19842..4868d26561 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$observeGuildTemplate$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildTemplates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;",
+        ">;",
+        "Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1$1.smali
index 51760d2f93..9b13c010f5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildTemplates$requestGuildTemplate$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildTemplates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-string v2, "guildTemplate"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreGuildTemplates;->access$handleRequestGuildTemplateSuccess(Lcom/discord/stores/StoreGuildTemplates;Lcom/discord/models/domain/ModelGuildTemplate;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1.smali
index a6702ed2ce..938edfe53b 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildTemplates$requestGuildTemplate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildTemplates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildTemplate;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2$1.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2$1.smali
index 04da33af9a..1f2ba79c9c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildTemplates$requestGuildTemplate$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildTemplates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 
     const-string v3, "error.type"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0, v2}, Lcom/discord/stores/StoreGuildTemplates;->access$handleRequestGuildTemplateError(Lcom/discord/stores/StoreGuildTemplates;Ljava/lang/String;Lcom/discord/utilities/error/Error$Type;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2.smali
index 8d9571761e..031e11fd71 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$requestGuildTemplate$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildTemplates$requestGuildTemplate$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildTemplates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildTemplates$requestGuildTemplate$2;->this$0:Lcom/discord/stores/StoreGuildTemplates;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates$setDynamicLinkGuildTemplateCode$1.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates$setDynamicLinkGuildTemplateCode$1.smali
index 77de589de5..b65c7ffe10 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates$setDynamicLinkGuildTemplateCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates$setDynamicLinkGuildTemplateCode$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildTemplates$setDynamicLinkGuildTemplateCode$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildTemplates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildTemplates.smali b/com.discord/smali/com/discord/stores/StoreGuildTemplates.smali
index 4be8b849d8..f3ad948a40 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildTemplates.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildTemplates.smali
@@ -55,9 +55,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -84,15 +86,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuildTemplates;->guildTemplatesByCodePublisher:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreGuildTemplates;)Lcom/discord/stores/Dispatcher;
@@ -261,7 +254,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -271,7 +264,7 @@
 
     const-string v0, "RestAPI\n        .api\n   \u2026ormers.restSubscribeOn())"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreGuildTemplates;
 
@@ -333,7 +326,7 @@
 
     const-string v1, "dynamicLinkGuildTemplate\u2026er.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -351,7 +344,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplateCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildTemplates;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -367,7 +362,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreGuildTemplates$observeGuildTemplate$2;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -377,18 +372,9 @@
 
     const-string v0, "guildTemplatesByCodePubl\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "guildTemplateCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -416,7 +402,9 @@
 .method public final setDynamicLinkGuildTemplateCode(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplateCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildTemplates;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -427,13 +415,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplateCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen$Loaded.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen$Loaded.smali
index d00a65e541..3b106227fb 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen$Loaded.smali
@@ -83,7 +83,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen$Loaded;->data:Lcom/discord/models/domain/ModelGuildWelcomeScreen;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1$1.smali
index bc49353960..f7ac3bc1c6 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildWelcomeScreens.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1.smali
index c79d0de436..43cffbd83e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildWelcomeScreens.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildWelcomeScreen;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildWelcomeScreen;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildWelcomeScreen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$1;->this$0:Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1;
 
@@ -78,13 +80,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildWelcomeScreen"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2$1.smali
index f2d3e04a01..49fa59c146 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildWelcomeScreens.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2.smali
index 63d190d143..886aa821c8 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildWelcomeScreens.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1$2;->this$0:Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1;
 
@@ -78,13 +80,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1.smali
index 193da55e10..38e931e884 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildWelcomeScreens$fetchIfNonexisting$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildWelcomeScreens.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$markWelcomeScreenShown$1.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$markWelcomeScreenShown$1.smali
index 153a57cd0e..546ad346ed 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$markWelcomeScreenShown$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$markWelcomeScreenShown$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildWelcomeScreens$markWelcomeScreenShown$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildWelcomeScreens.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$observeGuildWelcomeScreen$1.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$observeGuildWelcomeScreen$1.smali
index 1b75b4b02f..bcf921e99d 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$observeGuildWelcomeScreen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens$observeGuildWelcomeScreen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildWelcomeScreens$observeGuildWelcomeScreen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildWelcomeScreens.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens.smali b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens.smali
index 41ec4b5a80..a80ea51773 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildWelcomeScreens.smali
@@ -64,11 +64,13 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "observationDeck"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreV2;-><init>()V
 
@@ -76,11 +78,11 @@
 
     iput-object p2, p0, Lcom/discord/stores/StoreGuildWelcomeScreens;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildWelcomeScreens;->guildWelcomeScreensSnapshot:Ljava/util/Map;
 
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildWelcomeScreens;->guildWelcomeScreensSeenSnapshot:Ljava/util/Set;
 
@@ -97,20 +99,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuildWelcomeScreens;->guildWelcomeScreensSeen:Ljava/util/HashSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "observationDeck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -353,7 +341,7 @@
 
     const-string p2, "observationDeck.connectR\u2026 }.distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$1.smali
index 319ca1b05a..fd48b6f9af 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
@@ -106,7 +108,7 @@
 
     const-string v0, "(this as java.lang.String).substring(startIndex)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_2
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$2.smali
index c72890a131..a964e3dcfe 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/String;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$2;->call(Ljava/lang/String;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/String;)Z
+.method public final call(Ljava/lang/String;)Ljava/lang/Boolean;
     .locals 7
 
     const/4 v0, 0x0
@@ -113,7 +97,11 @@
 
     const/16 v6, 0x20
 
-    if-gt v5, v6, :cond_1
+    invoke-static {v5, v6}, Lk0/o/c/i;->compare(II)I
+
+    move-result v5
+
+    if-gtz v5, :cond_1
 
     const/4 v5, 0x1
 
@@ -177,5 +165,21 @@
     const/4 v0, 0x1
 
     :cond_7
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$2;->call(Ljava/lang/String;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3$1.smali
index daf152be89..1f773742d6 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3$1.smali
@@ -57,7 +57,7 @@
 
     const-string v0, "selectedGuildId"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3.smali
index 66c9efa9b4..e922a20b34 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$3.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/String;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$4.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$4.smali
index 0d1db29854..e5b4f01cca 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions$requestMembers$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuilds$Actions$requestMembers$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuilds.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
index 68aa7828c8..c8151bcb65 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
@@ -51,31 +51,33 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "partialUserNameTokenEmitted"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
     const-wide/16 v1, 0x3e8
 
-    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {p1, v1, v2, v3}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-virtual {p1, v1, v2, v0}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$1;
+    new-instance v0, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$1;
 
-    invoke-direct {v1, p2}, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$1;-><init>(Z)V
+    invoke-direct {v0, p2}, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$1;-><init>(Z)V
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object p2, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$2;->INSTANCE:Lcom/discord/stores/StoreGuilds$Actions$requestMembers$2;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -85,29 +87,33 @@
 
     sget-object p2, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$3;->INSTANCE:Lcom/discord/stores/StoreGuilds$Actions$requestMembers$3;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "partialUserNameTokenEmit\u2026            }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p1, p0, p2, v0, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
+    sget-object v5, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$4;->INSTANCE:Lcom/discord/stores/StoreGuilds$Actions$requestMembers$4;
+
     const/4 v2, 0x0
 
-    const/4 v4, 0x0
+    const-string v3, "requestGuildMembers"
 
-    sget-object v5, Lcom/discord/stores/StoreGuilds$Actions$requestMembers$4;->INSTANCE:Lcom/discord/stores/StoreGuilds$Actions$requestMembers$4;
+    const/4 v4, 0x0
 
     const/4 v6, 0x0
 
@@ -117,23 +123,7 @@
 
     const/4 v9, 0x0
 
-    const-string v3, "requestGuildMembers"
-
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "partialUserNameTokenEmitted"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali
index 1cbc2ce8e5..e368f87dac 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuilds$observeComputed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuilds.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$2.smali
index 7969d0d222..3ba5939fe1 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeFromChannelId$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeFromChannelId$1.smali
index 15d37cf1e8..1e6372e7e0 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeFromChannelId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeFromChannelId$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,7 +87,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -100,9 +102,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeGuild$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeGuild$1.smali
index d85349972d..501b07b5c8 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeGuild$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeGuilds$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeGuilds$1.smali
index e059cff4d0..fb6760f329 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeGuilds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeGuilds$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuilds$observeGuilds$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuilds.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali
index 018db67a59..e9c709d78a 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuilds.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$2.smali
index 79b5acdd08..c92dd363b4 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -47,7 +53,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;)J
+.method public final call(Ljava/util/Map;)Ljava/lang/Long;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,7 +61,8 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Long;",
-            ">;)J"
+            ">;)",
+            "Ljava/lang/Long;"
         }
     .end annotation
 
@@ -75,21 +82,21 @@
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;->call(Ljava/util/Map;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;->call(Ljava/util/Map;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali
index 8656b7ba07..2b64c37f1c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuilds$observeRoles$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuilds.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$2.smali
index 9002d344d6..80bc710e3c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$2.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeSortedRoles$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeSortedRoles$1.smali
index 1f3c17b3e2..a73f2481e5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeSortedRoles$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeSortedRoles$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -82,6 +90,7 @@
             "Lcom/discord/models/domain/ModelGuildRole;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelGuildRole;",
             ">;>;"
@@ -92,13 +101,13 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->sorted(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->sorted(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeUnavailableGuilds$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeUnavailableGuilds$1.smali
index ef773634f6..8a7902fcc5 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeUnavailableGuilds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeUnavailableGuilds$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuilds$observeUnavailableGuilds$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuilds.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Set<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeVerificationLevel$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeVerificationLevel$1.smali
index fe477305b6..50df46d314 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeVerificationLevel$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeVerificationLevel$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuilds.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -57,28 +59,28 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelGuild;)I
+.method public final call(Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Integer;
     .locals 0
 
     invoke-static {p1}, Lcom/discord/models/domain/ModelGuild;->getVerificationLevel(Lcom/discord/models/domain/ModelGuild;)I
 
     move-result p1
 
-    return p1
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeVerificationLevel$1;->call(Lcom/discord/models/domain/ModelGuild;)I
-
-    move-result p1
-
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeVerificationLevel$1;->call(Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds.smali b/com.discord/smali/com/discord/stores/StoreGuilds.smali
index 7c3ad05f05..4a9da9fb59 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds.smali
@@ -264,11 +264,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userStore"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "observationDeck"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreV2;-><init>()V
 
@@ -276,7 +278,7 @@
 
     iput-object p2, p0, Lcom/discord/stores/StoreGuilds;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsSnapshot:Ljava/util/Map;
 
@@ -284,11 +286,11 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesSnapshot:Ljava/util/Map;
 
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailableSnapshot:Ljava/util/Set;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtSnapshot:Ljava/util/Map;
 
@@ -365,20 +367,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtCache:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "observationDeck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -488,7 +476,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -504,7 +492,7 @@
 
     const-string v1, "merged"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -522,7 +510,7 @@
 .end method
 
 .method private final handleGuildMember(Lcom/discord/models/domain/ModelGuildMember;J)V
-    .locals 8
+    .locals 7
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -539,190 +527,180 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    if-eqz v0, :cond_9
+    const-string v1, "member.user!!"
 
-    const-string v2, "member.user!!"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v2
+    move-result-wide v0
 
-    iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
+    iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-interface {v0, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v2, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v2
 
-    if-nez v0, :cond_1
+    if-nez v2, :cond_1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
+    iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    new-instance v5, Ljava/util/HashMap;
+    new-instance v4, Ljava/util/HashMap;
 
-    invoke-direct {v5}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v4}, Ljava/util/HashMap;-><init>()V
 
-    invoke-interface {v0, v4, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v3, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
+    iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-interface {v0, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v2, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v2
 
-    if-nez v0, :cond_2
+    if-nez v2, :cond_2
 
-    iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
+    iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    new-instance v5, Ljava/util/HashMap;
+    new-instance v4, Ljava/util/HashMap;
 
-    invoke-direct {v5}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v4}, Ljava/util/HashMap;-><init>()V
 
-    invoke-interface {v0, v4, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v3, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_2
-    iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
+    iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
+
+    invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    check-cast v2, Ljava/util/Map;
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelGuildMember;
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    xor-int/2addr v2, v3
+
+    if-eqz v2, :cond_3
+
+    iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v4
 
-    invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v2
 
-    if-eqz v0, :cond_8
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    check-cast v0, Ljava/util/Map;
+    check-cast v2, Ljava/util/Map;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v4
 
-    invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/models/domain/ModelGuildMember;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v4, 0x1
-
-    xor-int/2addr v0, v4
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
-
-    invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-interface {v0, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_3
-
-    check-cast v0, Ljava/util/Map;
-
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-interface {v0, v5, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
+    invoke-interface {v2, v4, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    new-instance v2, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    throw v1
-
-    :cond_4
-    :goto_0
-    new-instance v0, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    iget-object v5, p0, Lcom/discord/stores/StoreGuilds;->guildRoles:Ljava/util/Map;
+    iget-object v4, p0, Lcom/discord/stores/StoreGuilds;->guildRoles:Ljava/util/Map;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v6
-
-    invoke-interface {v5, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
     move-result-object v5
 
-    check-cast v5, Ljava/util/Map;
+    invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/util/Map;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
 
-    move-result-object v6
+    move-result-object v5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getNick()Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v6
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getPremiumSince()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-direct {v0, v5, v6, v7, p1}, Lcom/discord/models/domain/ModelGuildMember$Computed;-><init>(Ljava/util/Map;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v2, v4, v5, v6, p1}, Lcom/discord/models/domain/ModelGuildMember$Computed;-><init>(Ljava/util/Map;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-interface {p1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
-    if-eqz p1, :cond_7
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-interface {p1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
     check-cast p1, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
-    xor-int/2addr p1, v4
+    xor-int/2addr p1, v3
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
 
@@ -734,17 +712,17 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_5
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p2
 
-    invoke-interface {p1, p2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, p2, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    new-array p1, v4, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+    new-array p1, v3, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
 
     const/4 p2, 0x0
 
@@ -754,31 +732,8 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
 
-    goto :goto_1
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_6
-    :goto_1
+    :cond_4
     return-void
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
 .end method
 
 .method private final handleGuildMembers(JJLjava/util/Collection;Z)V
@@ -1162,7 +1117,7 @@
 
     check-cast p4, Lcom/discord/models/domain/ModelGuildRole;
 
-    invoke-static {p4, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p4, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p4
 
@@ -1573,7 +1528,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
 
@@ -1620,7 +1577,7 @@
 
     const-string v2, "guild"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1691,15 +1648,6 @@
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
@@ -1707,7 +1655,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1769,15 +1719,6 @@
     invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreGuilds;->handleHasRoleAndJoinedAt(JLjava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -1785,7 +1726,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "member"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getGuildId()J
 
@@ -1794,15 +1737,6 @@
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/stores/StoreGuilds;->handleGuildMember(Lcom/discord/models/domain/ModelGuildMember;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -1810,9 +1744,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "member"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getGuildId()J
 
@@ -1822,11 +1756,11 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v0, "member.user!!"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -1841,53 +1775,34 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreGuilds;->handleGuildMembers(JJLjava/util/Collection;Z)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleGuildMembersChunk(Lcom/discord/models/domain/ModelGuildMember$Chunk;)V
-    .locals 7
+    .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "chunk"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->getGuildId()J
 
-    move-result-wide v1
-
-    const-wide/16 v3, 0x0
+    move-result-wide v2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->getMembers()Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v6
 
-    const/4 v6, 0x0
+    const-wide/16 v4, 0x0
 
-    move-object v0, p0
+    const/4 v7, 0x0
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/StoreGuilds;->handleGuildMembers(JJLjava/util/Collection;Z)V
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreGuilds;->handleGuildMembers(JJLjava/util/Collection;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "chunk"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -1895,7 +1810,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1932,29 +1849,20 @@
     invoke-direct/range {v0 .. v6}, Lcom/discord/stores/StoreGuilds;->handleGuildMembers(JJLjava/util/Collection;Z)V
 
     return-void
-
-    :cond_0
-    const-string v0, "guild"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final handleGuildRoleAdd(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
-    .locals 7
+    .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "role"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
-    move-result-wide v1
-
-    const-wide/16 v3, 0x0
+    move-result-wide v2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getRole()Lcom/discord/models/domain/ModelGuildRole;
 
@@ -1962,13 +1870,15 @@
 
     invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v6
 
-    const/4 v6, 0x0
+    const-wide/16 v4, 0x0
 
-    move-object v0, p0
+    const/4 v7, 0x0
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/StoreGuilds;->handleGuildRoles(JJLjava/util/List;Z)V
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreGuilds;->handleGuildRoles(JJLjava/util/List;Z)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
@@ -2015,47 +1925,40 @@
     invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreGuilds;->handleHasRoleAndJoinedAt(JLjava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "role"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRoleRemove(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
-    .locals 7
+    .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "role"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
-    move-result-wide v1
+    move-result-wide v2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getRole()Lcom/discord/models/domain/ModelGuildRole;
 
     move-result-object v0
 
-    const-string v3, "role.role"
+    const-string v1, "role.role"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
 
-    move-result-wide v3
+    move-result-wide v4
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    const/4 v6, 0x1
+    const/4 v7, 0x1
 
-    move-object v0, p0
+    move-object v1, p0
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/StoreGuilds;->handleGuildRoles(JJLjava/util/List;Z)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreGuilds;->handleGuildRoles(JJLjava/util/List;Z)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
@@ -2102,21 +2005,14 @@
     invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreGuilds;->handleHasRoleAndJoinedAt(JLjava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "role"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public init(Landroid/content/Context;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
 
@@ -2221,15 +2117,6 @@
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeComputed()Lrx/Observable;
@@ -2303,7 +2190,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeComputed$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2313,13 +2200,13 @@
 
     const-string p2, "observeComputed()\n      \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
 
 .method public final observeComputed(JLjava/util/Collection;)Lrx/Observable;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -2334,13 +2221,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string/jumbo v0, "userIds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreGuilds;->observeComputed(J)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {p3}, Lf/a/b/q;->a(Ljava/util/Collection;)Lrx/Observable$c;
+    invoke-static {p3}, Lf/a/b/s;->a(Ljava/util/Collection;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -2350,18 +2239,9 @@
 
     const-string p2, "observeComputed(guildId)\u2026mpose(filterMap(userIds))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeFromChannelId(J)Lrx/Observable;
@@ -2389,13 +2269,13 @@
 
     invoke-direct {p2, p0}, Lcom/discord/stores/StoreGuilds$observeFromChannelId$1;-><init>(Lcom/discord/stores/StoreGuilds;)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n        .get\u2026ll)\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -2419,7 +2299,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeGuild$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2429,7 +2309,7 @@
 
     const-string p2, "observeGuilds()\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -2533,7 +2413,7 @@
 
     const-string v1, "observationDeck\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -2557,7 +2437,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2567,7 +2447,7 @@
 
     const-string p2, "observeJoinedAt()\n      \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -2643,7 +2523,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeRoles$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2653,13 +2533,13 @@
 
     const-string p2, "observeRoles()\n        .\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
 
 .method public final observeRoles(JLjava/util/Collection;)Lrx/Observable;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -2674,13 +2554,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "roleIds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreGuilds;->observeRoles(J)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {p3}, Lf/a/b/q;->a(Ljava/util/Collection;)Lrx/Observable$c;
+    invoke-static {p3}, Lf/a/b/s;->a(Ljava/util/Collection;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -2690,18 +2572,9 @@
 
     const-string p2, "observeRoles(guildId)\n  \u2026mpose(filterMap(roleIds))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "roleIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeSortedRoles(J)Lrx/Observable;
@@ -2722,7 +2595,7 @@
 
     sget-object p2, Lcom/discord/stores/StoreGuilds$observeSortedRoles$1;->INSTANCE:Lcom/discord/stores/StoreGuilds$observeSortedRoles$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2732,7 +2605,7 @@
 
     const-string p2, "observeRoles(guildId)\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -2787,7 +2660,7 @@
 
     const-string v1, "observationDeck\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -2809,7 +2682,7 @@
 
     sget-object p2, Lcom/discord/stores/StoreGuilds$observeVerificationLevel$1;->INSTANCE:Lcom/discord/stores/StoreGuilds$observeVerificationLevel$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2819,7 +2692,7 @@
 
     const-string p2, "observeGuild(guildId)\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali
index ab039e20c2..10efdf5099 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$allow$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildsNsfw$allow$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildsNsfw.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/stores/StoreGuildsNsfw;->access$Companion()Lcom/discord/stores/StoreGuildsNsfw$Companion;
 
@@ -80,13 +82,4 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putStringSet(Ljava/lang/String;Ljava/util/Set;)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali
index 76e3dc829a..066c34f4a2 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw$deny$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildsNsfw$deny$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildsNsfw.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali b/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
index 0628b62d5a..3e5a0f8016 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsNsfw.smali
@@ -13,9 +13,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/stores/StoreGuildsNsfw$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final GUILDS_ALLOWED_KEY:Ljava/lang/String; = "GUILDS_ALLOWED_KEY"
 
@@ -50,28 +47,21 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsNsfw;->stream:Lcom/discord/stores/StoreStream;
 
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsNsfw;->guildsIdsAllowed:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$Companion()Lcom/discord/stores/StoreGuildsNsfw$Companion;
@@ -144,7 +134,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    invoke-static {v1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -155,7 +145,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {v0}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v0}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object p1
 
@@ -216,7 +206,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v0}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v0}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object p1
 
@@ -331,7 +321,7 @@
     :try_start_0
     const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -341,7 +331,7 @@
 
     const-string v0, "GUILDS_ALLOWED_KEY"
 
-    sget-object v1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v1, Lk0/j/p;->d:Lk0/j/p;
 
     invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences;->getStringSet(Ljava/lang/String;Ljava/util/Set;)Ljava/util/Set;
 
@@ -358,7 +348,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsNsfw;->guildsIdsAllowed:Ljava/util/Set;
@@ -369,16 +359,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$Folder.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$Folder.smali
index fc76bc1de5..38cdfd631a 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$Folder.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$Folder.smali
@@ -48,9 +48,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guilds"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGuildsSorted$Entry;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -63,13 +65,6 @@
     iput-object p5, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;JLjava/util/List;Ljava/lang/Integer;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;
@@ -240,32 +235,25 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "guilds"
 
-    new-instance v6, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;
 
-    move-wide v1, p1
+    move-object v1, v0
 
-    move-object v3, p3
+    move-wide v2, p1
 
-    move-object v4, p4
+    move-object v4, p3
 
-    move-object v5, p5
+    move-object v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;-><init>(JLjava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
+    move-object v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;-><init>(JLjava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
 
-    :cond_0
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -291,7 +279,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->guilds:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -301,7 +289,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->color:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -311,7 +299,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->name:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$SingletonGuild.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$SingletonGuild.smali
index a817e88f14..635966ce56 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$SingletonGuild.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$Entry$SingletonGuild.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreGuildsSorted$Entry;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;
@@ -106,22 +101,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -139,7 +127,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$State.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$State.smali
index 4974c4f12d..024040c450 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$State.smali
@@ -66,13 +66,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "mutedGuilds"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "joinedAt"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "userSettingsGuildPositions"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -83,27 +87,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreGuildsSorted$State;->userSettingsGuildPositions:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "userSettingsGuildPositions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "joinedAt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "mutedGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreGuildsSorted$State;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/stores/StoreGuildsSorted$State;
@@ -207,40 +190,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "mutedGuilds"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "joinedAt"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "userSettingsGuildPositions"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreGuildsSorted$State;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreGuildsSorted$State;-><init>(Ljava/util/Set;Ljava/util/Map;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "userSettingsGuildPositions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "joinedAt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "mutedGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -258,7 +224,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreGuildsSorted$State;->mutedGuilds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -268,7 +234,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreGuildsSorted$State;->joinedAt:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -278,7 +244,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreGuildsSorted$State;->userSettingsGuildPositions:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$ensureValidPositions$6.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$ensureValidPositions$6.smali
index 98f0e397d1..084aab9d62 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$ensureValidPositions$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$ensureValidPositions$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildsSorted$ensureValidPositions$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildsSorted.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildFolder;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,9 +73,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelGuildFolder;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildFolder;->getGuildIds()Ljava/util/List;
 
@@ -86,13 +88,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$getFlat$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$getFlat$1.smali
index 77e9a473e9..509c5e9ab2 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$getFlat$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$getFlat$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildsSorted.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/stores/StoreGuildsSorted$Entry;",
+        ">;",
+        "Ljava/util/LinkedHashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;"
     }
 .end annotation
 
@@ -91,7 +98,7 @@
 
     const-string v1, "folders"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1$1.smali
index 10020493d8..291d1d0186 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildsSorted$init$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildsSorted.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali
index 0c1859e595..0071f30310 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildsSorted$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildsSorted.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreGuildsSorted$State;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/stores/StoreGuildsSorted$State;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildsSorted$init$1;->this$0:Lcom/discord/stores/StoreGuildsSorted;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$1.smali
index c15a4b5481..f9e66f746f 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "StoreGuildsSorted.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,9 +92,9 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {p1}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$2.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$2.smali
index 255c229404..4337f6335c 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$observeStores$2.smali
@@ -31,7 +31,25 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/ModelGuildFolder;",
+        ">;",
+        "Lcom/discord/stores/StoreGuildsSorted$State;",
+        ">;"
     }
 .end annotation
 
@@ -91,15 +109,15 @@
 
     const-string v0, "mutedGuilds"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "joinedAt"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "folders"
 
-    invoke-static {p4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, p2, p3, p4}, Lcom/discord/stores/StoreGuildsSorted$State;-><init>(Ljava/util/Set;Ljava/util/Map;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$setPositions$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$setPositions$1.smali
index 3b68a67b7d..ac99949827 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$setPositions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$setPositions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreGuildsSorted$setPositions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreGuildsSorted.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted$updatePositions$1.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted$updatePositions$1.smali
index 623f79a0ad..22e69d5e83 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted$updatePositions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted$updatePositions$1.smali
@@ -188,7 +188,7 @@
     :cond_6
     const/4 p2, 0x0
 
-    invoke-static {p1, v0, p2}, Lj0/t/k;->compareTo(Ljava/lang/String;Ljava/lang/String;Z)I
+    invoke-static {p1, v0, p2}, Lk0/u/k;->compareTo(Ljava/lang/String;Ljava/lang/String;Z)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
index 71424c3792..7810a5586e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
@@ -60,13 +60,17 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreLurking;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "guildStore"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "lurkingGuildStore"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -82,7 +86,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsSorted;->entries:Ljava/util/ArrayList;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -90,7 +94,7 @@
 
     const-string p2, "BehaviorSubject.create(emptyList())"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsSorted;->entriesSubject:Lrx/subjects/BehaviorSubject;
 
@@ -101,27 +105,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreGuildsSorted;->positions:Ljava/util/ArrayList;
 
     return-void
-
-    :cond_0
-    const-string p1, "lurkingGuildStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreGuildsSorted;)Lcom/discord/stores/Dispatcher;
@@ -665,7 +648,7 @@
 
     sget-object v2, Lcom/discord/stores/StoreGuildsSorted$observeStores$1;->INSTANCE:Lcom/discord/stores/StoreGuildsSorted$observeStores$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -697,13 +680,13 @@
 
     const-string v1, "Observable.combineLatest\u2026lds, joinedAt, folders) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
 .method private final rebuildSortedGuilds()V
-    .locals 10
+    .locals 9
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -722,7 +705,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_2
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -734,27 +717,25 @@
 
     move-result-object v2
 
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_1
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v4
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildFolder;->getGuildIds()Ljava/util/List;
 
     move-result-object v2
 
-    new-instance v7, Ljava/util/ArrayList;
+    new-instance v6, Ljava/util/ArrayList;
 
-    const/16 v4, 0xa
+    const/16 v3, 0xa
 
-    invoke-static {v2, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v2, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v4
+    move-result v3
 
-    invoke-direct {v7, v4}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v6, v3}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -763,61 +744,56 @@
     :goto_1
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_0
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v3
 
-    check-cast v4, Ljava/lang/Number;
+    check-cast v3, Ljava/lang/Number;
 
-    invoke-virtual {v4}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v8
+    move-result-wide v7
 
-    iget-object v4, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
+    iget-object v3, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-interface {v4, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-eqz v4, :cond_0
+    invoke-static {v3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    check-cast v4, Lcom/discord/models/domain/ModelGuild;
+    check-cast v3, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-interface {v7, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v6, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_1
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildFolder;->getColor()Ljava/lang/Integer;
 
-    move-result-object v8
+    move-result-object v7
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildFolder;->getName()Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v8
 
     new-instance v1, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;
 
-    move-object v4, v1
+    move-object v3, v1
 
-    invoke-direct/range {v4 .. v9}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;-><init>(JLjava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
+    invoke-direct/range {v3 .. v8}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;-><init>(JLjava/util/List;Ljava/lang/Integer;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/stores/StoreGuildsSorted;->entries:Ljava/util/ArrayList;
 
@@ -825,28 +801,28 @@
 
     goto :goto_0
 
-    :cond_2
+    :cond_1
     new-instance v2, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;
 
-    iget-object v4, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
+    iget-object v3, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildFolder;->getGuildIds()Ljava/util/List;
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
-    invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
-    if-eqz v1, :cond_3
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     check-cast v1, Lcom/discord/models/domain/ModelGuild;
 
@@ -858,12 +834,7 @@
 
     goto/16 :goto_0
 
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_4
+    :cond_2
     const/4 v0, 0x1
 
     iput-boolean v0, p0, Lcom/discord/stores/StoreGuildsSorted;->isDirty:Z
@@ -919,7 +890,7 @@
 
     invoke-direct {v3, p1, v0}, Lcom/discord/stores/StoreGuildsSorted$updatePositions$1;-><init>(Lcom/discord/stores/StoreGuildsSorted$State;Ljava/util/Map;)V
 
-    invoke-static {v2, v3}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v2, v3}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -1025,13 +996,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreGuildsSorted$getFlat$1;->INSTANCE:Lcom/discord/stores/StoreGuildsSorted$getFlat$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "entriesSubject\n      .ma\u2026        guildsMap\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1041,7 +1012,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -1049,16 +1022,20 @@
 
     move-result-object p1
 
-    const-wide/16 v0, 0x1
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v1, 0x1
 
-    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v3
 
     const-class v4, Lcom/discord/stores/StoreGuildsSorted;
 
+    new-instance v9, Lcom/discord/stores/StoreGuildsSorted$init$1;
+
+    invoke-direct {v9, p0}, Lcom/discord/stores/StoreGuildsSorted$init$1;-><init>(Lcom/discord/stores/StoreGuildsSorted;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -1067,10 +1044,6 @@
 
     const/4 v8, 0x0
 
-    new-instance v9, Lcom/discord/stores/StoreGuildsSorted$init$1;
-
-    invoke-direct {v9, p0}, Lcom/discord/stores/StoreGuildsSorted$init$1;-><init>(Lcom/discord/stores/StoreGuildsSorted;)V
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -1078,15 +1051,6 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -1128,7 +1092,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildPositions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreGuildsSorted;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -1139,13 +1105,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildPositions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali
index 2a62d2bfb7..20726071fd 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$InviteState$Resolved.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelInvite;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "invite"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreInstantInvites$InviteState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;->invite:Lcom/discord/models/domain/ModelInvite;
 
     return-void
-
-    :cond_0
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;Lcom/discord/models/domain/ModelInvite;ILjava/lang/Object;)Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelInvite;)Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "invite"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;-><init>(Lcom/discord/models/domain/ModelInvite;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;->invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali
index b8a89c9242..4d316c1eda 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreInstantInvites$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreInstantInvites.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreInstantInvites;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreInstantInvites;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onLoadedInvites"
+
+    const-string v5, "onLoadedInvites(Ljava/util/List;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onLoadedInvites"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreInstantInvites;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onLoadedInvites(Ljava/util/List;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -95,22 +79,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreInstantInvites;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreInstantInvites;->access$onLoadedInvites(Lcom/discord/stores/StoreInstantInvites;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali
index 6d3f073cff..25a514240c 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreInstantInvites$requestInvite$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreInstantInvites.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     const-string v3, "it"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, p1}, Lcom/discord/stores/StoreInstantInvites$InviteState$Resolved;-><init>(Lcom/discord/models/domain/ModelInvite;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali
index 7cf90d9c84..d8062284ed 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreInstantInvites$requestInvite$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreInstantInvites.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_3
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getType()Lcom/discord/utilities/error/Error$Type;
 
@@ -124,13 +126,4 @@
     :cond_2
     :goto_0
     return-void
-
-    :cond_3
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali
index 4c75d4d7bb..f0b8575a9a 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites$requestInvite$3.smali
@@ -3,7 +3,7 @@
 .source "StoreInstantInvites.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreInstantInvites$InviteState;",
+        ">;",
+        "Lcom/discord/stores/StoreInstantInvites$InviteState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreInstantInvites.smali b/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
index ed26027771..a781d853f2 100644
--- a/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
+++ b/com.discord/smali/com/discord/stores/StoreInstantInvites.smali
@@ -169,7 +169,7 @@
 
     const-string v3, "invite.code"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -192,9 +192,9 @@
 
     invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -267,7 +267,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {p2, v0}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {p2, v0}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -277,7 +277,7 @@
 
     const-string p1, "RestAPI\n        .api\n   \u2026ormers.restSubscribeOn())"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lcom/discord/stores/StoreInstantInvites;
 
@@ -307,7 +307,7 @@
 
     const-string p2, "invitesPublisher\n        .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -315,7 +315,9 @@
 .method public final onInviteRemoved(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "inviteCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreInstantInvites;->invites:Ljava/util/HashMap;
 
@@ -331,15 +333,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final requestInvite(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
@@ -356,7 +349,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "inviteCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreInstantInvites;->knownInvites:Ljava/util/HashMap;
 
@@ -397,7 +392,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static {v2, v1}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v2, v1}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -407,7 +402,7 @@
 
     const-string v0, "RestAPI\n          .api\n \u2026ormers.restSubscribeOn())"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreInstantInvites;
 
@@ -438,7 +433,7 @@
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreInstantInvites$requestInvite$3;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -448,16 +443,7 @@
 
     const-string p2, "knownInvitesPublisher\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali
index 2ed714ebb1..f5f7f26b81 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$InviteCode.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "inviteCode"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreInviteSettings$InviteCode;->source:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreInviteSettings$InviteCode;
@@ -98,31 +86,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/stores/StoreInviteSettings$InviteCode;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "inviteCode"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreInviteSettings$InviteCode;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreInviteSettings$InviteCode;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreInviteSettings$InviteCode;->inviteCode:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreInviteSettings$InviteCode;->source:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali
index 02613652ea..c00a8f5b82 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1.smali
@@ -3,7 +3,7 @@
 .source "StoreInviteSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali
index 0b2df08f7b..57c79c22c0 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2.smali
@@ -3,7 +3,7 @@
 .source "StoreInviteSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -86,7 +93,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator;
 
@@ -94,9 +101,9 @@
 
     const-string v1, "ModelChannel.getSortByNameAndType()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali
index 48c30912d6..ba165afdca 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.smali
@@ -3,7 +3,7 @@
 .source "StoreInviteSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -72,9 +77,9 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali
index 5298a028de..5804c3554f 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.smali
@@ -3,7 +3,7 @@
 .source "StoreInviteSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelInvite;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelInvite;",
             ">;"
         }
@@ -95,11 +98,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lr0/l/a/f;->e:Lrx/Observable;
-
-    const-string v0, "Observable.empty()"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object p1, Ls0/l/a/f;->e:Lrx/Observable;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali
index d9ba9b0d3c..cdfac9fb24 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.smali
@@ -29,7 +29,25 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -70,14 +88,14 @@
 
     check-cast p3, Ljava/util/Map;
 
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreInviteSettings$getInvitableChannels$1;->call(Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;)Ljava/util/HashMap;
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreInviteSettings$getInvitableChannels$1;->call(Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;)Ljava/util/HashMap;
+.method public final call(Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +113,7 @@
             "Ljava/lang/Long;",
             "Ljava/lang/Long;",
             ">;>;)",
-            "Ljava/util/HashMap<",
+            "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelChannel;",
             ">;"
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali
index 4ee90ab738..acf2fc7f22 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$1.smali
@@ -3,7 +3,7 @@
 .source "StoreInviteSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreInviteSettings$InviteCode;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreInstantInvites$InviteState;",
+        ">;>;"
     }
 .end annotation
 
@@ -89,9 +91,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali
index 10f42e817e..d26936f829 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$getInvite$2.smali
@@ -3,7 +3,7 @@
 .source "StoreInviteSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreInstantInvites$InviteState;",
+        "Lcom/discord/models/domain/ModelInvite;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali
index d8f0f39e39..8a7a85ab98 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$1.smali
@@ -3,7 +3,7 @@
 .source "StoreInviteSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelInvite;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$1;->call(Lcom/discord/models/domain/ModelInvite;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelInvite;)Z
+.method public final call(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -88,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelInvite;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$1;->call(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali
index 4f8ab36d47..0997fe3603 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings$trackWithInvite$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreInviteSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;->$trackBlock:Lkotlin/jvm/functions/Function1;
 
+    const/4 v0, 0x0
+
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreInviteSettings.smali b/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
index 80ebe8eb1b..356c9403fc 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
@@ -164,9 +164,7 @@
     :try_start_0
     const-string v0, "settings"
 
-    const/4 v1, 0x0
-
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -174,23 +172,25 @@
 
     move-result-object v0
 
-    new-instance v2, Lcom/discord/restapi/RestAPIParams$Invite;
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$Invite;
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
 
-    move-result v4
+    move-result v3
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelInvite$Settings;->isTemporary()Z
 
     move-result p3
 
-    invoke-direct {v2, v3, v4, p3, v1}, Lcom/discord/restapi/RestAPIParams$Invite;-><init>(IIZLjava/lang/String;)V
+    const/4 v4, 0x0
 
-    invoke-virtual {v0, p1, p2, v2}, Lcom/discord/utilities/rest/RestAPI;->postChannelInvite(JLcom/discord/restapi/RestAPIParams$Invite;)Lrx/Observable;
+    invoke-direct {v1, v2, v3, p3, v4}, Lcom/discord/restapi/RestAPIParams$Invite;-><init>(IIZLjava/lang/String;)V
+
+    invoke-virtual {v0, p1, p2, v1}, Lcom/discord/utilities/rest/RestAPI;->postChannelInvite(JLcom/discord/restapi/RestAPIParams$Invite;)Lrx/Observable;
 
     move-result-object p1
 
@@ -198,7 +198,7 @@
 
     const/4 p3, 0x1
 
-    invoke-static {p2, p3}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {p2, p3}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -208,7 +208,7 @@
 
     const-string p2, "RestAPI\n          .api\n \u2026ormers.restSubscribeOn())"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -216,14 +216,6 @@
 
     return-object p1
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
@@ -249,19 +241,19 @@
 
     sget-object v1, Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1;->INSTANCE:Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2;->INSTANCE:Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3;->INSTANCE:Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -275,13 +267,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4;-><init>(Lcom/discord/stores/StoreInviteSettings;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "getInvitableChannels()\n \u2026} ?: Observable.empty() }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -337,7 +329,7 @@
 
     const-string v1, "Observable\n        .comb\u2026         }\n            })"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -359,19 +351,19 @@
 
     sget-object v1, Lcom/discord/stores/StoreInviteSettings$getInvite$1;->INSTANCE:Lcom/discord/stores/StoreInviteSettings$getInvite$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/stores/StoreInviteSettings$getInvite$2;->INSTANCE:Lcom/discord/stores/StoreInviteSettings$getInvite$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "getInviteCode()\n      .f\u2026-> null\n        }\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -395,7 +387,7 @@
 
     const-string v1, "pendingInviteCodeSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -415,7 +407,7 @@
 
     const-string v1, "inviteSettingsSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -427,7 +419,7 @@
 
     const-string v1, "inviteSettingsSubject\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -435,11 +427,13 @@
 .method public final setInviteCode(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "inviteCode"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreInviteSettings;->pendingInviteCodeSubject:Lrx/subjects/BehaviorSubject;
 
@@ -450,20 +444,6 @@
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final declared-synchronized setInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
@@ -474,7 +454,7 @@
     :try_start_0
     const-string v0, "settings"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreInviteSettings;->inviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
 
@@ -488,16 +468,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -521,11 +491,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "clazz"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "trackBlock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreInviteSettings;->getInvite()Lrx/Observable;
 
@@ -533,13 +505,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$1;->INSTANCE:Lcom/discord/stores/StoreInviteSettings$trackWithInvite$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "getInvite()\n        .filter { it != null }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0xfa
 
@@ -557,16 +529,16 @@
 
     move-result-object v1
 
+    new-instance v5, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;
+
+    invoke-direct {v5, p2}, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;-><init>(Lkotlin/jvm/functions/Function1;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     const/4 v6, 0x0
 
-    new-instance v5, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;
-
-    invoke-direct {v5, p2}, Lcom/discord/stores/StoreInviteSettings$trackWithInvite$2;-><init>(Lkotlin/jvm/functions/Function1;)V
-
     const/16 v8, 0x16
 
     const/4 v9, 0x0
@@ -578,18 +550,4 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "trackBlock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clazz"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali
index c17e9163fd..36bd99b703 100644
--- a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLibrary$fetchApplications$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLibrary.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali
index 47ca60fc76..9eed3383d1 100644
--- a/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLibrary$fetchApplications$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLibrary$fetchApplications$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLibrary.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "libraryApps"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreLibrary$fetchApplications$1;->this$0:Lcom/discord/stores/StoreLibrary;
 
@@ -87,13 +89,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "libraryApps"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLibrary.smali b/com.discord/smali/com/discord/stores/StoreLibrary.smali
index 020b2ab853..c947afcb19 100644
--- a/com.discord/smali/com/discord/stores/StoreLibrary.smali
+++ b/com.discord/smali/com/discord/stores/StoreLibrary.smali
@@ -21,15 +21,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreLibrary;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -38,15 +40,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreLibrary;->libraryApplicationsSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getLibraryApplicationsSubject$p(Lcom/discord/stores/StoreLibrary;)Lrx/subjects/BehaviorSubject;
@@ -130,7 +123,7 @@
 
     const-string v1, "libraryApplicationsSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLocalMessagesHolder.smali b/com.discord/smali/com/discord/stores/StoreLocalMessagesHolder.smali
index f413c9d344..83a922872a 100644
--- a/com.discord/smali/com/discord/stores/StoreLocalMessagesHolder.smali
+++ b/com.discord/smali/com/discord/stores/StoreLocalMessagesHolder.smali
@@ -104,7 +104,7 @@
 
     iput-object v1, v0, Lcom/discord/stores/StoreLocalMessagesHolder;->messagesPublisher:Lrx/subjects/Subject;
 
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object v1, v0, Lcom/discord/stores/StoreLocalMessagesHolder;->messagesSnapshot:Ljava/util/Map;
 
@@ -275,9 +275,9 @@
 
     const-string v4, "entry.value.values"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v2}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v2
 
@@ -288,7 +288,7 @@
     :cond_1
     iget-object v1, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->cacheSnapshot:Ljava/util/Map;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -325,7 +325,7 @@
     :cond_2
     const-string v0, "sharedPreferences"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -410,7 +410,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_1
     invoke-direct {v4, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
@@ -428,7 +428,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messagesPublisher:Lrx/subjects/Subject;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreLocalMessagesHolder;->messageCacheTryPersist()V
 
@@ -453,84 +453,75 @@
 
 # virtual methods
 .method public final addMessage(Lcom/discord/models/domain/ModelMessage;)V
-    .locals 6
+    .locals 5
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    iget-object v3, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messages:Ljava/util/HashMap;
+    iget-object v2, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messages:Ljava/util/HashMap;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v4
-
-    invoke-virtual {v3, v4}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
-    check-cast v3, Ljava/util/TreeMap;
+    invoke-virtual {v2, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v3, :cond_0
+    move-result-object v2
+
+    check-cast v2, Ljava/util/TreeMap;
+
+    if-eqz v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    new-instance v3, Ljava/util/TreeMap;
+    new-instance v2, Ljava/util/TreeMap;
 
-    invoke-direct {v3}, Ljava/util/TreeMap;-><init>()V
+    invoke-direct {v2}, Ljava/util/TreeMap;-><init>()V
 
     :goto_0
-    const-string v4, "messages[channelId] ?: TreeMap()"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-interface {v3, v4, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v3, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object p1, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messages:Ljava/util/HashMap;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-interface {p1, v4, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object p1, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->updatedChannels:Ljava/util/Set;
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {p1, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-interface {p1, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/stores/StoreLocalMessagesHolder;->publishIfUpdated$default(Lcom/discord/stores/StoreLocalMessagesHolder;ZILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/stores/StoreLocalMessagesHolder;->publishIfUpdated$default(Lcom/discord/stores/StoreLocalMessagesHolder;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final clearCache()V
@@ -577,7 +568,7 @@
 
     const-string v4, "channelId"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -598,21 +589,21 @@
 .end method
 
 .method public final deleteMessage(JLjava/lang/String;)V
-    .locals 3
+    .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "nonce"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messages:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messages:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
-    invoke-virtual {v1, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -622,7 +613,7 @@
 
     const-string p2, "messages[channelId] ?: return"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/util/TreeMap;->values()Ljava/util/Collection;
 
@@ -630,7 +621,7 @@
 
     const-string p2, "messagesForChannel.values"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -647,72 +638,68 @@
 
     move-result-object p2
 
-    move-object v1, p2
-
-    check-cast v1, Lcom/discord/models/domain/ModelMessage;
-
-    const-string v2, "message"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getNonce()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
     move-object v0, p2
 
-    :cond_1
     check-cast v0, Lcom/discord/models/domain/ModelMessage;
 
-    if-eqz v0, :cond_2
+    const-string v1, "message"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getNonce()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_0
+    check-cast p2, Lcom/discord/models/domain/ModelMessage;
+
+    if-eqz p2, :cond_2
 
     const-string p1, "messagesForChannel.value\u2026once == nonce } ?: return"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0, v0}, Lcom/discord/stores/StoreLocalMessagesHolder;->deleteMessage(Lcom/discord/models/domain/ModelMessage;)V
+    invoke-virtual {p0, p2}, Lcom/discord/stores/StoreLocalMessagesHolder;->deleteMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "nonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final deleteMessage(Lcom/discord/models/domain/ModelMessage;)V
-    .locals 6
+    .locals 5
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
     iget-object p1, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messages:Ljava/util/HashMap;
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {p1, v5}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {p1, v4}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -720,33 +707,33 @@
 
     if-eqz p1, :cond_1
 
-    const-string v5, "messages[channelId] ?: return"
+    const-string v4, "messages[channelId] ?: return"
 
-    invoke-static {p1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {p1, v5}, Ljava/util/TreeMap;->containsKey(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v4}, Ljava/util/TreeMap;->containsKey(Ljava/lang/Object;)Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_0
+    if-eqz v4, :cond_0
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Ljava/util/TreeMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->updatedChannels:Ljava/util/Set;
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
-    invoke-virtual {p1, v1}, Ljava/util/TreeMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    iget-object v1, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->updatedChannels:Ljava/util/Set;
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     invoke-virtual {p1}, Ljava/util/TreeMap;->isEmpty()Z
 
@@ -756,28 +743,23 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreLocalMessagesHolder;->messages:Ljava/util/HashMap;
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {p1, v0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/stores/StoreLocalMessagesHolder;->publishIfUpdated$default(Lcom/discord/stores/StoreLocalMessagesHolder;ZILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/stores/StoreLocalMessagesHolder;->publishIfUpdated$default(Lcom/discord/stores/StoreLocalMessagesHolder;ZILjava/lang/Object;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getFlattenedMessages()Ljava/util/List;
@@ -872,7 +854,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
@@ -944,10 +926,6 @@
     invoke-direct {v4}, Ljava/util/TreeMap;-><init>()V
 
     :goto_2
-    const-string v5, "messages[channelId] ?: TreeMap()"
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
     move-result-object v1
@@ -1005,7 +983,7 @@
     :cond_3
     const-string p1, "sharedPreferences"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$Companion.smali b/com.discord/smali/com/discord/stores/StoreLurking$Companion.smali
index a7a70a282e..ea20744430 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$Companion.smali
@@ -44,39 +44,43 @@
 .method private final varargs isLurking(Lcom/discord/models/domain/ModelGuild;[J)Z
     .locals 8
 
-    const/4 v0, 0x0
-
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getJoinedAt()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    const/4 v0, 0x0
 
     :goto_0
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    if-nez v1, :cond_6
+    if-nez v0, :cond_5
 
     if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
     goto :goto_1
 
     :cond_1
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
     :goto_1
-    if-eqz p2, :cond_5
+    const-string p1, "$this$contains"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "$this$indexOf"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length p1, p2
 
@@ -85,11 +89,11 @@
     :goto_2
     if-ge v0, p1, :cond_3
 
-    aget-wide v6, p2, v0
+    aget-wide v5, p2, v0
 
-    cmp-long v1, v4, v6
+    cmp-long v7, v3, v5
 
-    if-nez v1, :cond_2
+    if-nez v7, :cond_2
 
     goto :goto_3
 
@@ -112,20 +116,13 @@
     const/4 p1, 0x0
 
     :goto_4
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_5
 
     goto :goto_5
 
     :cond_5
-    const-string p1, "$this$contains"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_5
-    return v2
+    return v1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$LurkRequest.smali b/com.discord/smali/com/discord/stores/StoreLurking$LurkRequest.smali
index f673001f31..a4d8379d02 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$LurkRequest.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$LurkRequest.smali
@@ -123,7 +123,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreLurking$LurkRequest;->channelId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$getLurkingGuildIds$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$getLurkingGuildIds$1.smali
index 00a7ab7940..2256d931cf 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$getLurkingGuildIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$getLurkingGuildIds$1.smali
@@ -3,7 +3,7 @@
 .source "StoreLurking.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;[J>;"
     }
 .end annotation
 
@@ -82,9 +85,9 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->toLongArray(Ljava/util/Collection;)[J
+    invoke-static {p1}, Lk0/j/l;->toLongArray(Ljava/util/Collection;)[J
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$isLurkingObs$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$isLurkingObs$1.smali
index 8cb4886933..ad864b907c 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$isLurkingObs$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$isLurkingObs$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "[J",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,32 +62,14 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, [J
-
-    check-cast p2, Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreLurking$isLurkingObs$1;->call([JLcom/discord/models/domain/ModelGuild;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call([JLcom/discord/models/domain/ModelGuild;)Z
+.method public final call([JLcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
     .locals 2
 
     sget-object v0, Lcom/discord/stores/StoreLurking;->Companion:Lcom/discord/stores/StoreLurking$Companion;
 
     const-string v1, "lurkingGuildIds"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v1, p1
 
@@ -96,5 +81,23 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, [J
+
+    check-cast p2, Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreLurking$isLurkingObs$1;->call([JLcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali
index cb188ddc4d..0bd350b69a 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$joinGuild$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$postLeaveGuild$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$postLeaveGuild$1.smali
index e61a19c297..4a2ee1de96 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$postLeaveGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$postLeaveGuild$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$postLeaveGuild$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$startLurking$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$startLurking$1.smali
index 1e75668904..5405e3c4f3 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurking$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurking$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$startLurking$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$startLurking$2.smali b/com.discord/smali/com/discord/stores/StoreLurking$startLurking$2.smali
index ac89729586..e8bb21c05f 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurking$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurking$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$startLurking$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1$1.smali
index 7833c98b09..7f33cde1da 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$startLurkingInternal$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1.smali
index 41474b0ede..f8b73d3762 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$startLurkingInternal$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreLurking$startLurkingInternal$1;->this$0:Lcom/discord/stores/StoreLurking;
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2$1.smali
index aaf6ff76b5..cd265592e2 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$startLurkingInternal$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,9 +75,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -85,20 +85,15 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/stores/StoreNavigation$PanelAction;->OPEN:Lcom/discord/stores/StoreNavigation$PanelAction;
+    sget-object v0, Lcom/discord/stores/StoreNavigation$PanelAction;->OPEN:Lcom/discord/stores/StoreNavigation$PanelAction;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
 
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2.smali b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2.smali
index 2da5c58e7c..2977ea066e 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$startLurkingInternal$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreLurking$startLurkingInternal$2;->$jumpToDestination:Lkotlin/jvm/functions/Function0;
 
@@ -151,13 +153,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreNavigation;->launchNotice(Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$jumpToDestination$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$jumpToDestination$1.smali
index 9db78c0f90..46e01b6a09 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$jumpToDestination$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking$startLurkingInternal$jumpToDestination$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreLurking$startLurkingInternal$jumpToDestination$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreLurking.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking.smali b/com.discord/smali/com/discord/stores/StoreLurking.smali
index 016992e8c2..553762fb09 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking.smali
@@ -69,13 +69,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "guildsStore"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dispatcher"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -91,7 +95,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreLurking;->lurkingGuildIds:Ljava/util/ArrayList;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -100,27 +104,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreLurking;->guildIdSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreLurking;)Lcom/discord/stores/Dispatcher;
@@ -420,13 +403,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreLurking$getLurkingGuildIds$1;->INSTANCE:Lcom/discord/stores/StoreLurking$getLurkingGuildIds$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "guildIdSubject.map { it.toLongArray() }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -464,13 +447,13 @@
 .end method
 
 .method public final handleConnectionOpen$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelPayload;)V
-    .locals 3
+    .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "payload"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getSessionId()Ljava/lang/String;
 
@@ -484,25 +467,20 @@
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreLurking$LurkRequest;->getGuildId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreLurking$LurkRequest;->getChannelId()Ljava/lang/Long;
 
     move-result-object p1
 
-    invoke-direct {p0, v1, v2, p1}, Lcom/discord/stores/StoreLurking;->startLurkingInternal(JLjava/lang/Long;)V
+    invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreLurking;->startLurkingInternal(JLjava/lang/Long;)V
 
     :cond_0
-    iput-object v0, p0, Lcom/discord/stores/StoreLurking;->lurkRequest:Lcom/discord/stores/StoreLurking$LurkRequest;
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreLurking;->lurkRequest:Lcom/discord/stores/StoreLurking$LurkRequest;
 
     return-void
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleGuildAdd$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelGuild;)V
@@ -510,7 +488,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreLurking;->lurkingGuildIds:Ljava/util/ArrayList;
 
@@ -564,15 +544,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelGuild;)V
@@ -580,7 +551,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -589,15 +562,6 @@
     invoke-direct {p0, v0, v1}, Lcom/discord/stores/StoreLurking;->stopLurking(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildSelected$app_productionDiscordExternalRelease(J)V
@@ -763,7 +727,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreLurking;->lurkingGuildIds:Ljava/util/ArrayList;
 
-    invoke-static {v1}, Lj0/i/l;->toLongArray(Ljava/util/Collection;)[J
+    invoke-static {v1}, Lk0/j/l;->toLongArray(Ljava/util/Collection;)[J
 
     move-result-object v1
 
@@ -817,7 +781,7 @@
 
     const-string p2, "Observable\n          .co\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMFA$State.smali b/com.discord/smali/com/discord/stores/StoreMFA$State.smali
index c041524dd1..7fbcd0581d 100644
--- a/com.discord/smali/com/discord/stores/StoreMFA$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreMFA$State.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMFA$MFAActivationState;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activationState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-boolean p2, p0, Lcom/discord/stores/StoreMFA$State;->isTogglingSMSBackup:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "activationState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreMFA$State;Lcom/discord/stores/StoreMFA$MFAActivationState;ZILjava/lang/Object;)Lcom/discord/stores/StoreMFA$State;
@@ -89,22 +82,15 @@
 .method public final copy(Lcom/discord/stores/StoreMFA$MFAActivationState;Z)Lcom/discord/stores/StoreMFA$State;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activationState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMFA$State;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreMFA$State;-><init>(Lcom/discord/stores/StoreMFA$MFAActivationState;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "activationState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreMFA$State;->activationState:Lcom/discord/stores/StoreMFA$MFAActivationState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMFA$togglingSMSBackup$1.smali b/com.discord/smali/com/discord/stores/StoreMFA$togglingSMSBackup$1.smali
index 91c9cf5f46..80f8d5fdb5 100644
--- a/com.discord/smali/com/discord/stores/StoreMFA$togglingSMSBackup$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMFA$togglingSMSBackup$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMFA$togglingSMSBackup$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMFA.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMFA$updatePendingMFAState$1.smali b/com.discord/smali/com/discord/stores/StoreMFA$updatePendingMFAState$1.smali
index cef376dfab..d400a44196 100644
--- a/com.discord/smali/com/discord/stores/StoreMFA$updatePendingMFAState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMFA$updatePendingMFAState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMFA$updatePendingMFAState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMFA.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMFA.smali b/com.discord/smali/com/discord/stores/StoreMFA.smali
index 995d372b3f..1b55f8ca7e 100644
--- a/com.discord/smali/com/discord/stores/StoreMFA.smali
+++ b/com.discord/smali/com/discord/stores/StoreMFA.smali
@@ -39,11 +39,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -68,20 +70,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreMFA;->stateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getState$p(Lcom/discord/stores/StoreMFA;)Lcom/discord/stores/StoreMFA$State;
@@ -133,7 +121,7 @@
 
     const-string v1, "stateSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -143,7 +131,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -185,15 +175,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -236,7 +217,9 @@
 .method public final updatePendingMFAState(Lcom/discord/stores/StoreMFA$MFAActivationState;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "newActivationState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMFA;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -247,13 +230,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newActivationState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMaskedLinks$Companion.smali b/com.discord/smali/com/discord/stores/StoreMaskedLinks$Companion.smali
index f64ba370c8..b9659d6748 100644
--- a/com.discord/smali/com/discord/stores/StoreMaskedLinks$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMaskedLinks$Companion.smali
@@ -51,7 +51,7 @@
 
     const-string v0, "Uri.parse(url)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1$1.smali b/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1$1.smali
index ae4273e4aa..6f48239617 100644
--- a/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMaskedLinks.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -47,23 +49,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Integer;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1$1;->call(Ljava/lang/Integer;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Integer;)Z
+.method public final call(Ljava/lang/Integer;)Ljava/lang/Boolean;
     .locals 1
 
     const/4 v0, 0x1
@@ -84,5 +70,21 @@
     iget-boolean p1, p1, Lcom/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1;->$isLinkUnmasked:Z
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1$1;->call(Ljava/lang/Integer;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1.smali b/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1.smali
index 0abe51d8db..ee90579def 100644
--- a/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMaskedLinks.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Boolean;",
             ">;"
         }
@@ -104,7 +107,7 @@
 
     const-string v1, "selectedChannel.dmRecipient"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -118,7 +121,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1$1;-><init>(Lcom/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -131,9 +134,9 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMaskedLinks$onDispatchEnded$1.smali b/com.discord/smali/com/discord/stores/StoreMaskedLinks$onDispatchEnded$1.smali
index 94890a22de..41eaf09a77 100644
--- a/com.discord/smali/com/discord/stores/StoreMaskedLinks$onDispatchEnded$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMaskedLinks$onDispatchEnded$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMaskedLinks$onDispatchEnded$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMaskedLinks.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/stores/StoreMaskedLinks;->access$Companion()Lcom/discord/stores/StoreMaskedLinks$Companion;
 
@@ -76,13 +78,4 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putStringSet(Ljava/lang/String;Ljava/util/Set;)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMaskedLinks$trustDomain$1.smali b/com.discord/smali/com/discord/stores/StoreMaskedLinks$trustDomain$1.smali
index 902c3f628d..7fef06471d 100644
--- a/com.discord/smali/com/discord/stores/StoreMaskedLinks$trustDomain$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMaskedLinks$trustDomain$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMaskedLinks$trustDomain$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMaskedLinks.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMaskedLinks.smali b/com.discord/smali/com/discord/stores/StoreMaskedLinks.smali
index ee7f4e8fb2..9b9bc94851 100644
--- a/com.discord/smali/com/discord/stores/StoreMaskedLinks.smali
+++ b/com.discord/smali/com/discord/stores/StoreMaskedLinks.smali
@@ -16,9 +16,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/stores/StoreMaskedLinks$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final HOST_SPOTIFY:Ljava/lang/String; = "https://spotify.com"
 
@@ -187,11 +184,13 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeStream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -205,25 +204,11 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreMaskedLinks;->userTrustedDomains:Ljava/util/Set;
 
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     iput-object p1, p0, Lcom/discord/stores/StoreMaskedLinks;->userTrustedDomainsCopy:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$Companion()Lcom/discord/stores/StoreMaskedLinks$Companion;
@@ -301,7 +286,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreMaskedLinks;->TRUSTED_DOMAINS:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -309,7 +294,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMaskedLinks;->userTrustedDomainsCopy:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -333,56 +318,49 @@
 
 # virtual methods
 .method public init(Landroid/content/Context;)V
-    .locals 2
+    .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
+    new-instance p1, Ljava/util/HashSet;
+
     invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefs()Landroid/content/SharedPreferences;
 
-    move-result-object p1
+    move-result-object v0
 
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v1, Lk0/j/p;->d:Lk0/j/p;
 
-    const-string v1, "USER_TRUSTED_DOMAINS_CACHE_KEY"
+    const-string v2, "USER_TRUSTED_DOMAINS_CACHE_KEY"
 
-    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences;->getStringSet(Ljava/lang/String;Ljava/util/Set;)Ljava/util/Set;
+    invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getStringSet(Ljava/lang/String;Ljava/util/Set;)Ljava/util/Set;
 
-    move-result-object p1
+    move-result-object v0
 
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    new-instance p1, Ljava/util/LinkedHashSet;
+    new-instance v0, Ljava/util/LinkedHashSet;
 
-    invoke-direct {p1}, Ljava/util/LinkedHashSet;-><init>()V
+    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
 
     :goto_0
-    new-instance v0, Ljava/util/HashSet;
+    invoke-direct {p1, v0}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    invoke-direct {v0, p1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
-
-    iput-object v0, p0, Lcom/discord/stores/StoreMaskedLinks;->userTrustedDomains:Ljava/util/Set;
+    iput-object p1, p0, Lcom/discord/stores/StoreMaskedLinks;->userTrustedDomains:Ljava/util/Set;
 
     const/4 p1, 0x1
 
     iput-boolean p1, p0, Lcom/discord/stores/StoreMaskedLinks;->isDirty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeIsTrustedDomain(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
@@ -399,7 +377,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMaskedLinks;->isTrustedDomain(Ljava/lang/String;)Z
 
@@ -409,20 +389,20 @@
 
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance p2, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {p2, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(true)"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p2
 
     :cond_0
     if-eqz p2, :cond_2
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -454,24 +434,15 @@
 
     invoke-direct {v0, p0, p1}, Lcom/discord/stores/StoreMaskedLinks$observeIsTrustedDomain$1;-><init>(Lcom/discord/stores/StoreMaskedLinks;Z)V
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "storeStream\n          .c\u2026            }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_3
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -510,7 +481,9 @@
 .method public final trustDomain(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMaskedLinks;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -521,13 +494,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
index 819fc42e86..08fff45b97 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$Companion.smali
@@ -46,13 +46,13 @@
 
     move-result v0
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->g(F)V
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->h(F)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getEchoCancellation()Z
 
     move-result v0
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->b(Z)V
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->c(Z)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
 
@@ -74,13 +74,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->h(Z)V
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->i(Z)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
 
     move-result v0
 
-    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->l(Z)V
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->m(Z)V
 
     invoke-virtual {p3}, Lcom/discord/stores/StoreMediaEngine$ExperimentConfig;->getNoiseCancellationExperimentEnabled()Z
 
@@ -104,7 +104,7 @@
     const/4 p3, 0x0
 
     :goto_1
-    invoke-interface {p1, p3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->c(Z)V
+    invoke-interface {p1, p3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->d(Z)V
 
     :cond_2
     invoke-interface {p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->getConnections()Ljava/util/List;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali
index 385821f942..8831dea06f 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$EngineListener.smali
@@ -58,20 +58,13 @@
 .method public onNewConnection(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$EngineListener;->this$0:Lcom/discord/stores/StoreMediaEngine;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreMediaEngine;->access$handleNewConnection(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$WhenMappings.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$WhenMappings.smali
new file mode 100644
index 0000000000..8ead501ea4
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$WhenMappings.smali
@@ -0,0 +1,32 @@
+.class public final synthetic Lcom/discord/stores/StoreMediaEngine$WhenMappings;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+
+# direct methods
+.method public static synthetic constructor <clinit>()V
+    .locals 3
+
+    invoke-static {}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;->values()[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/stores/StoreMediaEngine$WhenMappings;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;->DEFAULT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali
index c4fc834df2..569bfa204c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subjects/SerializedSubject;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subjects/SerializedSubject;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onNext"
+
+    const-string v5, "onNext(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subjects/SerializedSubject;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,13 +67,13 @@
 .method public final invoke(Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$getRankedRtcRegions$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$getRankedRtcRegions$1.smali
new file mode 100644
index 0000000000..4b36d9a318
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$getRankedRtcRegions$1.smali
@@ -0,0 +1,78 @@
+.class public final Lcom/discord/stores/StoreMediaEngine$getRankedRtcRegions$1;
+.super Lk0/o/c/j;
+.source "StoreMediaEngine.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreMediaEngine;->getRankedRtcRegions(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "[",
+        "Ljava/lang/String;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $callback:Lkotlin/jvm/functions/Function1;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine$getRankedRtcRegions$1;->$callback:Lkotlin/jvm/functions/Function1;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, [Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$getRankedRtcRegions$1;->invoke([Ljava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke([Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$getRankedRtcRegions$1;->$callback:Lkotlin/jvm/functions/Function1;
+
+    invoke-static {p1}, Lf/n/a/k/a;->toList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali
index 80e6371aba..79e7961b16 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "[",
         "Lco/discord/media_engine/VideoInputDeviceDescription;",
@@ -30,45 +30,29 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lkotlin/jvm/functions/Function1;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "invoke"
+
+    const-string v5, "invoke(Ljava/lang/Object;)Ljava/lang/Object;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lkotlin/jvm/functions/Function1;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke(Ljava/lang/Object;)Ljava/lang/Object;"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -84,22 +68,15 @@
 .method public final invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
index 749a8252c5..8fd5577ed6 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
@@ -41,105 +41,57 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "supportedVideoCodecs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
     const-string p1, "transportInfo"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string p1, "supportedVideoCodecs"
 
-    :cond_2
-    const-string p1, "connection"
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "connectionState"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "exception"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onSpeaking(JIZ)V
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali
index 6e74475cc2..43c0cb330a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMediaEngine$handleNewConnection$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "[",
         "Lco/discord/media_engine/VideoInputDeviceDescription;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,23 +62,28 @@
 .method public final invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "devices"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$2;->this$0:Lcom/discord/stores/StoreMediaEngine;
 
     invoke-static {v1}, Lcom/discord/stores/StoreMediaEngine;->access$getSelectedVideoInputDevice$p(Lcom/discord/stores/StoreMediaEngine;)Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    move-result-object v2
+    move-result-object v0
 
-    if-eqz v2, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v2}, Lco/discord/media_engine/VideoInputDeviceDescription;->getGuid()Ljava/lang/String;
+    invoke-virtual {v0}, Lco/discord/media_engine/VideoInputDeviceDescription;->getGuid()Ljava/lang/String;
 
     move-result-object v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     move-object v3, v0
 
     const/4 v4, 0x0
@@ -92,11 +97,4 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreMediaEngine;->handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "devices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
index 0d9d513f7e..365cf955df 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "[",
         "Lco/discord/media_engine/VideoInputDeviceDescription;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -60,32 +60,25 @@
 .end method
 
 .method public final invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x4
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x4
 
-    move-object v1, p1
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreMediaEngine;->handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreMediaEngine;->handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali
index 1b1000b3c2..23fb314ec0 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMediaEngine$localVoiceStatus$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMediaEngine;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/stores/StoreMediaEngine;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "enableLocalVoiceStatusListening"
+
+    const-string v5, "enableLocalVoiceStatusListening()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "enableLocalVoiceStatusListening"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreMediaEngine;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "enableLocalVoiceStatusListening()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreMediaEngine;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali
index d8bfa0ff94..76af171664 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$localVoiceStatus$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMediaEngine$localVoiceStatus$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMediaEngine;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/stores/StoreMediaEngine;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "disableLocalVoiceStatusListening"
+
+    const-string v5, "disableLocalVoiceStatusListening()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "disableLocalVoiceStatusListening"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreMediaEngine;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "disableLocalVoiceStatusListening()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreMediaEngine;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali
index 2c0761e8e5..1caf087293 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali
index 5c48a38786..715b4cd153 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "[",
         "Lco/discord/media_engine/VideoInputDeviceDescription;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,71 +66,73 @@
 .method public final invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "devices"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    array-length v1, p1
+    array-length v0, p1
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
-    const/4 v3, 0x0
-
     :goto_0
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    if-ge v3, v1, :cond_1
+    if-ge v2, v0, :cond_1
 
-    aget-object v5, p1, v3
+    aget-object v4, p1, v2
 
-    invoke-virtual {v5}, Lco/discord/media_engine/VideoInputDeviceDescription;->getGuid()Ljava/lang/String;
+    invoke-virtual {v4}, Lco/discord/media_engine/VideoInputDeviceDescription;->getGuid()Ljava/lang/String;
+
+    move-result-object v4
+
+    iget-object v5, p0, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+
+    invoke-static {v5}, Lcom/discord/stores/StoreMediaEngine;->access$getPreferredVideoInputDeviceGUID$p(Lcom/discord/stores/StoreMediaEngine;)Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+    invoke-static {v4, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    invoke-static {v6}, Lcom/discord/stores/StoreMediaEngine;->access$getPreferredVideoInputDeviceGUID$p(Lcom/discord/stores/StoreMediaEngine;)Ljava/lang/String;
+    move-result v4
 
-    move-result-object v6
+    if-eqz v4, :cond_0
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_0
-
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_1
 
     :cond_0
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
 
     :cond_1
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
-    if-eqz v1, :cond_2
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_2
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
 
     invoke-static {v0}, Lcom/discord/stores/StoreMediaEngine;->access$getPreferredVideoInputDeviceGUID$p(Lcom/discord/stores/StoreMediaEngine;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
     goto :goto_6
 
     :cond_2
-    array-length v1, p1
+    array-length v0, p1
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     :goto_2
-    if-ge v3, v1, :cond_5
+    if-ge v4, v0, :cond_5
 
-    aget-object v5, p1, v3
+    aget-object v5, p1, v4
 
     invoke-virtual {v5}, Lco/discord/media_engine/VideoInputDeviceDescription;->getFacing()Lco/discord/media_engine/VideoInputDeviceFacing;
 
@@ -153,12 +155,12 @@
     goto :goto_4
 
     :cond_4
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_2
 
     :cond_5
-    move-object v5, v0
+    move-object v5, v2
 
     :goto_4
     if-eqz v5, :cond_6
@@ -168,9 +170,9 @@
     :cond_6
     invoke-static {p1}, Lf/n/a/k/a;->firstOrNull([Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v5, v1
+    move-object v5, v0
 
     check-cast v5, Lco/discord/media_engine/VideoInputDeviceDescription;
 
@@ -179,22 +181,15 @@
 
     invoke-virtual {v5}, Lco/discord/media_engine/VideoInputDeviceDescription;->getGuid()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
     :cond_7
     :goto_6
-    iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->$onSelected:Lkotlin/jvm/functions/Function0;
+    iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1;->$onSelected:Lkotlin/jvm/functions/Function0;
 
-    invoke-static {v1, p1, v0, v2}, Lcom/discord/stores/StoreMediaEngine;->access$handleVideoInputDevices(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+    invoke-static {v0, p1, v2, v1}, Lcom/discord/stores/StoreMediaEngine;->access$handleVideoInputDevices(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_8
-    const-string p1, "devices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
index 05b0c674f7..feb436afa1 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMediaEngine$selectVideoInputDevice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "[",
         "Lco/discord/media_engine/VideoInputDeviceDescription;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,32 +64,25 @@
 .end method
 
 .method public final invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "devices"
 
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$selectVideoInputDevice$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/stores/StoreMediaEngine$selectVideoInputDevice$1;->$deviceGUID:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine$selectVideoInputDevice$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
 
-    const/4 v3, 0x0
+    iget-object v3, p0, Lcom/discord/stores/StoreMediaEngine$selectVideoInputDevice$1;->$deviceGUID:Ljava/lang/String;
 
-    const/4 v4, 0x4
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x4
 
-    move-object v1, p1
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreMediaEngine;->handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreMediaEngine;->handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "devices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupMediaEngineSettingsSubscription$1$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupMediaEngineSettingsSubscription$1$1.smali
index 49851cac78..2677bcce3b 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$setupMediaEngineSettingsSubscription$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$setupMediaEngineSettingsSubscription$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMediaEngine$setupMediaEngineSettingsSubscription$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMediaEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
index 323dffb39f..de7da1933f 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
@@ -26,6 +26,18 @@
 # instance fields
 .field public final dispatcher:Lcom/discord/stores/Dispatcher;
 
+.field public hasNativeEngineEverInitialized:Z
+
+.field public hasNativeEngineEverInitializedCache:Lcom/discord/utilities/persister/Persister;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/discord/utilities/persister/Persister<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public final isNativeEngineInitializedSubject:Lrx/subjects/SerializedSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -160,11 +172,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "mediaSettingsStore"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -260,6 +274,20 @@
 
     iput-wide p1, p0, Lcom/discord/stores/StoreMediaEngine;->userId:J
 
+    new-instance p1, Lcom/discord/utilities/persister/Persister;
+
+    iget-boolean p2, p0, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitialized:Z
+
+    invoke-static {p2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p2
+
+    const-string v0, "CACHE_KEY_NATIVE_ENGINE_EVER_INITIALIZED"
+
+    invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitializedCache:Lcom/discord/utilities/persister/Persister;
+
     iget-object p1, p0, Lcom/discord/stores/StoreMediaEngine;->localVoiceStatusSubject:Lrx/subjects/SerializedSubject;
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
@@ -278,15 +306,15 @@
 
     invoke-direct {v0, p2}, Lcom/discord/stores/StoreMediaEngine$sam$rx_functions_Action0$0;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    new-instance p2, Lr0/l/a/y0;
+    new-instance p2, Ls0/l/a/y0;
 
-    invoke-direct {p2, v0}, Lr0/l/a/y0;-><init>(Lrx/functions/Action0;)V
+    invoke-direct {p2, v0}, Ls0/l/a/y0;-><init>(Lrx/functions/Action0;)V
 
-    new-instance v0, Lr0/l/a/u;
+    new-instance v0, Ls0/l/a/u;
 
     iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v0, p1, p2}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v0, p1, p2}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -310,25 +338,11 @@
 
     const-string p2, "localVoiceStatusSubject\n\u2026ening)\n          .share()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine;->localVoiceStatus:Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$disableLocalVoiceStatusListening(Lcom/discord/stores/StoreMediaEngine;)V
@@ -431,7 +445,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->m(Lkotlin/jvm/functions/Function1;)V
+    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->n(Lkotlin/jvm/functions/Function1;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -443,7 +457,7 @@
     :try_start_1
     const-string v0, "mediaEngine"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -473,7 +487,7 @@
 
     invoke-direct {v1, v2}, Lcom/discord/stores/StoreMediaEngine$enableLocalVoiceStatusListening$1;-><init>(Lrx/subjects/SerializedSubject;)V
 
-    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->m(Lkotlin/jvm/functions/Function1;)V
+    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->n(Lkotlin/jvm/functions/Function1;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -485,7 +499,7 @@
     :try_start_1
     const-string v0, "mediaEngine"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -525,7 +539,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreMediaEngine$getVideoInputDevicesNative$1;-><init>(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->j(Lkotlin/jvm/functions/Function1;)V
+    invoke-interface {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->k(Lkotlin/jvm/functions/Function1;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -537,7 +551,7 @@
     :try_start_1
     const-string p1, "mediaEngine"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -554,18 +568,28 @@
 .end method
 
 .method private final declared-synchronized handleNativeEngineInitialized()V
-    .locals 2
+    .locals 3
 
     monitor-enter p0
 
+    const/4 v0, 0x1
+
     :try_start_0
+    iput-boolean v0, p0, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitialized:Z
+
+    iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitializedCache:Lcom/discord/utilities/persister/Persister;
+
+    sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    invoke-virtual {v1, v2, v0}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
+
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->isNativeEngineInitializedSubject:Lrx/subjects/SerializedSubject;
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -616,7 +640,7 @@
 .end method
 
 .method private final declared-synchronized handleVideoInputDevices([Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-    .locals 5
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "([",
@@ -648,7 +672,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -679,20 +703,20 @@
 
     const/4 v4, 0x0
 
+    if-eqz v0, :cond_b
+
+    invoke-interface {v0, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->f(I)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+
     if-eqz v0, :cond_a
 
-    invoke-interface {v0, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->e(I)V
+    invoke-interface {v0, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->f(I)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
     if-eqz v0, :cond_9
 
-    invoke-interface {v0, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->e(I)V
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
-
-    if-eqz v0, :cond_8
-
     invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->getConnections()Ljava/util/List;
 
     move-result-object v0
@@ -706,7 +730,7 @@
 
     move-result v3
 
-    if-eqz v3, :cond_3
+    if-eqz v3, :cond_4
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -714,12 +738,25 @@
 
     check-cast v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    invoke-interface {v3, p2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->c(Z)V
+    invoke-interface {v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->getType()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v5
+
+    if-eqz v5, :cond_3
 
     goto :goto_3
 
     :cond_3
-    if-eqz p3, :cond_4
+    invoke-interface {v3, p2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->c(Z)V
+
+    goto :goto_3
+
+    :cond_4
+    if-eqz p3, :cond_5
 
     invoke-interface {p3}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
@@ -727,14 +764,14 @@
 
     check-cast p3, Lkotlin/Unit;
 
-    :cond_4
-    if-eqz p2, :cond_5
+    :cond_5
+    if-eqz p2, :cond_6
 
     aget-object p2, p1, v2
 
     goto :goto_4
 
-    :cond_5
+    :cond_6
     move-object p2, v4
 
     :goto_4
@@ -756,21 +793,21 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreMediaEngine;->selectedVideoInputDevice:Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_8
 
     iget-object p1, p0, Lcom/discord/stores/StoreMediaEngine;->selectedVideoInputDevice:Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     invoke-virtual {p1}, Lco/discord/media_engine/VideoInputDeviceDescription;->getGuid()Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     goto :goto_5
 
-    :cond_6
+    :cond_7
     const-string p1, ""
 
     :goto_5
@@ -788,36 +825,36 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    :cond_7
+    :cond_8
     monitor-exit p0
 
     return-void
 
-    :cond_8
+    :cond_9
     :try_start_1
     const-string p1, "mediaEngine"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     throw v4
 
-    :cond_9
+    :cond_a
     :try_start_2
     const-string p1, "mediaEngine"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     throw v4
 
-    :cond_a
+    :cond_b
     :try_start_3
     const-string p1, "mediaEngine"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -869,7 +906,7 @@
     :cond_0
     const-string p1, "mediaEngine"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1061,7 +1098,7 @@
     :cond_0
     const-string v0, "mediaEngine"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1084,6 +1121,158 @@
     return-object v0
 .end method
 
+.method public final declared-synchronized getRankedRtcRegions(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+            ">;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "regionsWithIps"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "callback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {p1, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/models/domain/ModelRtcLatencyRegion;
+
+    new-instance v3, Lco/discord/media_engine/RtcRegion;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelRtcLatencyRegion;->getRegion()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelRtcLatencyRegion;->getIps()Ljava/util/List;
+
+    move-result-object v1
+
+    new-array v2, v2, [Ljava/lang/String;
+
+    invoke-interface {v1, v2}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    check-cast v1, [Ljava/lang/String;
+
+    invoke-direct {v3, v4, v1}, Lco/discord/media_engine/RtcRegion;-><init>(Ljava/lang/String;[Ljava/lang/String;)V
+
+    invoke-interface {v0, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    new-array p1, v2, [Lco/discord/media_engine/RtcRegion;
+
+    invoke-interface {v0, p1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_3
+
+    check-cast p1, [Lco/discord/media_engine/RtcRegion;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+
+    if-eqz v0, :cond_2
+
+    new-instance v1, Lcom/discord/stores/StoreMediaEngine$getRankedRtcRegions$1;
+
+    invoke-direct {v1, p2}, Lcom/discord/stores/StoreMediaEngine$getRankedRtcRegions$1;-><init>(Lkotlin/jvm/functions/Function1;)V
+
+    invoke-interface {v0, p1, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->b([Lco/discord/media_engine/RtcRegion;Lkotlin/jvm/functions/Function1;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_2
+    :try_start_1
+    const-string p1, "mediaEngine"
+
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_3
+    :try_start_2
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
 .method public final getSelectedVideoInputDevice()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -1103,7 +1292,7 @@
 
     const-string v1, "selectedVideoInputDevice\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1134,9 +1323,9 @@
 
     move-result-object v0
 
-    const-string v1, "videoInputDevicesSubject\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "videoInputDevicesSubject\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1151,7 +1340,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->i()Lcom/hammerandchisel/libdiscord/Discord;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->j()Lcom/hammerandchisel/libdiscord/Discord;
 
     move-result-object v0
     :try_end_0
@@ -1165,7 +1354,7 @@
     :try_start_1
     const-string v0, "mediaEngine"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -1189,7 +1378,7 @@
     :try_start_0
     const-string v0, "payload"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getMe()Lcom/discord/models/domain/ModelUser;
 
@@ -1197,7 +1386,7 @@
 
     const-string v0, "payload.me"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -1211,16 +1400,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -1288,12 +1467,34 @@
     throw p1
 .end method
 
+.method public final declared-synchronized hasNativeEngineEverInitialized()Z
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitialized:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
 .method public init(Landroid/content/Context;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -1307,6 +1508,20 @@
 
     iput-object v1, p0, Lcom/discord/stores/StoreMediaEngine;->preferredVideoInputDeviceGUID:Ljava/lang/String;
 
+    iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitializedCache:Lcom/discord/utilities/persister/Persister;
+
+    invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Boolean;
+
+    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v1
+
+    iput-boolean v1, p0, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitialized:Z
+
     invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefsSessionDurable()Landroid/content/SharedPreferences;
 
     move-result-object v1
@@ -1337,7 +1552,7 @@
     :goto_0
     const-string v2, "prefsSessionDurable\n    \u2026AULT_OPENSLES_CONFIG.name"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->valueOf(Ljava/lang/String;)Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
@@ -1345,9 +1560,9 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreMediaEngine;->openSLESConfigSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v1, v6}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v6}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     invoke-static {}, Ljava/util/concurrent/Executors;->newSingleThreadExecutor()Ljava/util/concurrent/ExecutorService;
 
@@ -1355,13 +1570,23 @@
 
     const-string v1, "Executors.newSingleThreadExecutor()"
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v7, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    if-eqz v6, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v7, :cond_1
+    const-string v0, "singleThreadExecutorService"
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "openSLESConfig"
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "logger"
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ln;
 
@@ -1379,6 +1604,10 @@
 
     invoke-direct {p1, p0}, Lcom/discord/stores/StoreMediaEngine$EngineListener;-><init>(Lcom/discord/stores/StoreMediaEngine;)V
 
+    const-string v1, "listener"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v1, v0, Ln;->c:Ljava/util/ArrayList;
 
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
@@ -1386,27 +1615,6 @@
     iput-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
     return-void
-
-    :cond_1
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "openSLESConfig"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final selectDefaultVideoDevice(Lkotlin/jvm/functions/Function0;)V
@@ -1454,13 +1662,13 @@
     :try_start_0
     const-string v0, "openSLESConfig"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->openSLESConfigSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/Store;->getPrefsSessionDurable()Landroid/content/SharedPreferences;
 
@@ -1488,16 +1696,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -1548,9 +1746,9 @@
 
     move-result-object p1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1562,7 +1760,7 @@
     :try_start_1
     const-string p1, "mediaEngine"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$Companion.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$Companion.smali
deleted file mode 100644
index 0ed082f3d0..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$Companion.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$Companion;
-.super Ljava/lang/Object;
-.source "StoreMediaNotification.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/stores/StoreMediaNotification;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/stores/StoreMediaNotification$Companion;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
deleted file mode 100644
index 0032604a7d..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
+++ /dev/null
@@ -1,563 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$NotificationData;
-.super Ljava/lang/Object;
-.source "StoreMediaNotification.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/stores/StoreMediaNotification;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "NotificationData"
-.end annotation
-
-
-# instance fields
-.field public final channelName:Ljava/lang/String;
-
-.field public final isSelfDeafened:Z
-
-.field public final isSelfMuted:Z
-
-.field public final proximityLockEnabled:Z
-
-.field public final rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-.field public final stateString:I
-    .annotation build Landroidx/annotation/StringRes;
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZ)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_9
-
-    if-eqz p2, :cond_8
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    iput-object p2, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    iput-boolean p3, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    iput-boolean p4, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    iput-boolean p5, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    instance-of p2, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
-
-    if-eqz p2, :cond_0
-
-    const p1, 0x7f1204aa
-
-    goto :goto_0
-
-    :cond_0
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->a:Lcom/discord/rtcconnection/RtcConnection$State$b;
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_1
-
-    const p1, 0x7f1204a7
-
-    goto :goto_0
-
-    :cond_1
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->a:Lcom/discord/rtcconnection/RtcConnection$State$a;
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_2
-
-    const p1, 0x7f1204a6
-
-    goto :goto_0
-
-    :cond_2
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->a:Lcom/discord/rtcconnection/RtcConnection$State$c;
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_3
-
-    const p1, 0x7f1204a9
-
-    goto :goto_0
-
-    :cond_3
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_4
-
-    const p1, 0x7f1204ae
-
-    goto :goto_0
-
-    :cond_4
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->a:Lcom/discord/rtcconnection/RtcConnection$State$g;
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_5
-
-    const p1, 0x7f1204ad
-
-    goto :goto_0
-
-    :cond_5
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_6
-
-    const p1, 0x7f1204a8
-
-    goto :goto_0
-
-    :cond_6
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->a:Lcom/discord/rtcconnection/RtcConnection$State$e;
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_7
-
-    const p1, 0x7f1204ac
-
-    :goto_0
-    iput p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I
-
-    return-void
-
-    :cond_7
-    new-instance p1, Lkotlin/NoWhenBranchMatchedException;
-
-    invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
-
-    throw p1
-
-    :cond_8
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "rtcConnectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/stores/StoreMediaNotification$NotificationData;Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZILjava/lang/Object;)Lcom/discord/stores/StoreMediaNotification$NotificationData;
-    .locals 3
-
-    and-int/lit8 p7, p6, 0x1
-
-    if-eqz p7, :cond_0
-
-    iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    :cond_0
-    and-int/lit8 p7, p6, 0x2
-
-    if-eqz p7, :cond_1
-
-    iget-object p2, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    :cond_1
-    move-object p7, p2
-
-    and-int/lit8 p2, p6, 0x4
-
-    if-eqz p2, :cond_2
-
-    iget-boolean p3, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    :cond_2
-    move v0, p3
-
-    and-int/lit8 p2, p6, 0x8
-
-    if-eqz p2, :cond_3
-
-    iget-boolean p4, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    :cond_3
-    move v1, p4
-
-    and-int/lit8 p2, p6, 0x10
-
-    if-eqz p2, :cond_4
-
-    iget-boolean p5, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    :cond_4
-    move v2, p5
-
-    move-object p2, p0
-
-    move-object p3, p1
-
-    move-object p4, p7
-
-    move p5, v0
-
-    move p6, v1
-
-    move p7, v2
-
-    invoke-virtual/range {p2 .. p7}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZ)Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/rtcconnection/RtcConnection$State;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    return-object v0
-.end method
-
-.method public final component2()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final component3()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    return v0
-.end method
-
-.method public final component4()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    return v0
-.end method
-
-.method public final component5()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    return v0
-.end method
-
-.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZ)Lcom/discord/stores/StoreMediaNotification$NotificationData;
-    .locals 7
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    new-instance v0, Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    move-object v1, v0
-
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move v4, p3
-
-    move v5, p4
-
-    move v6, p5
-
-    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreMediaNotification$NotificationData;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZ)V
-
-    return-object v0
-
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rtcConnectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    iget-object v1, p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    iget-object v1, p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    iget-boolean v1, p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    iget-boolean v1, p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    iget-boolean p1, p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    if-ne v0, p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public final getChannelName()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final getProximityLockEnabled()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    return v0
-.end method
-
-.method public final getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    return-object v0
-.end method
-
-.method public final getStateString()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I
-
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :cond_1
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_2
-
-    const/4 v1, 0x1
-
-    :cond_2
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    if-eqz v1, :cond_3
-
-    const/4 v1, 0x1
-
-    :cond_3
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    if-eqz v1, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    move v2, v1
-
-    :goto_1
-    add-int/2addr v0, v2
-
-    return v0
-.end method
-
-.method public final isSelfDeafened()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    return v0
-.end method
-
-.method public final isSelfMuted()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "NotificationData(rtcConnectionState="
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", channelName="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->channelName:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isSelfMuted="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isSelfDeafened="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", proximityLockEnabled="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->proximityLockEnabled:Z
-
-    const-string v2, ")"
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$1.smali
deleted file mode 100644
index 32e766b98c..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$1.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$init$1;
-.super Lj0/n/c/i;
-.source "StoreMediaNotification.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaNotification;->init(Landroid/content/Context;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaNotification;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreMediaNotification;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$1;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/stores/StoreMediaNotification$init$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$1;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    invoke-static {v0}, Lcom/discord/stores/StoreMediaNotification;->access$getVoiceChannelSelectedStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clear()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$2.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$2.smali
deleted file mode 100644
index cb5598346c..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$2.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$init$2;
-.super Lj0/n/c/i;
-.source "StoreMediaNotification.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaNotification;->init(Landroid/content/Context;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaNotification;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreMediaNotification;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$2;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/stores/StoreMediaNotification$init$2;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$2;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    invoke-static {v0}, Lcom/discord/stores/StoreMediaNotification;->access$getMediaSettingsStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->toggleSelfDeafened()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
deleted file mode 100644
index 21107a1cd4..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$init$3;
-.super Lj0/n/c/i;
-.source "StoreMediaNotification.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaNotification;->init(Landroid/content/Context;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $context:Landroid/content/Context;
-
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaNotification;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreMediaNotification;Landroid/content/Context;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    iput-object p2, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/stores/StoreMediaNotification$init$3;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 5
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    invoke-static {v0}, Lcom/discord/stores/StoreMediaNotification;->access$getMediaSettingsStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->toggleSelfMuted()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context;
-
-    const v1, 0x7f121765
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/16 v4, 0xc
-
-    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali
deleted file mode 100644
index 4161239414..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali
+++ /dev/null
@@ -1,148 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$init$4;
-.super Lj0/n/c/i;
-.source "StoreMediaNotification.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaNotification;->init(Landroid/content/Context;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/stores/StoreMediaNotification$NotificationData;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $context:Landroid/content/Context;
-
-.field public final synthetic $serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
-
-
-# direct methods
-.method public constructor <init>(Landroid/content/Context;Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$context:Landroid/content/Context;
-
-    iput-object p2, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaNotification$init$4;->invoke(Lcom/discord/stores/StoreMediaNotification$NotificationData;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/stores/StoreMediaNotification$NotificationData;)V
-    .locals 8
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lcom/discord/rtcconnection/RtcConnection$State$d;
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$context:Landroid/content/Context;
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->requestOverlayClose(Landroid/content/Context;)V
-
-    sget-object p1, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->stopForegroundAndUnbind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v1, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;
-
-    iget-object v2, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$context:Landroid/content/Context;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getStateString()I
-
-    move-result v3
-
-    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    const-string v0, "context.getString(it.stateString)"
-
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getChannelName()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfMuted()Z
-
-    move-result v5
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->isSelfDeafened()Z
-
-    move-result v6
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getProximityLockEnabled()Z
-
-    move-result v7
-
-    invoke-virtual/range {v1 .. v7}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZZ)V
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
-
-    move-result-object p1
-
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    sget-object p1, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$context:Landroid/content/Context;
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchOverlayForVoice(Landroid/content/Context;)V
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
deleted file mode 100644
index 6f3bf3dbe0..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;
-.super Ljava/lang/Object;
-.source "StoreMediaNotification.kt"
-
-# interfaces
-.implements Lrx/functions/Func2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaNotification;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T1:",
-        "Ljava/lang/Object;",
-        "T2:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;
-
-    invoke-direct {v0}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;-><init>()V
-
-    sput-object v0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;->INSTANCE:Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    check-cast p2, Lcom/discord/rtcconnection/RtcConnection$State;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;->call(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;)Lkotlin/Pair;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;)Lkotlin/Pair;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/models/domain/ModelChannel;",
-            "Lcom/discord/rtcconnection/RtcConnection$State;",
-            ")",
-            "Lkotlin/Pair<",
-            "Lcom/discord/models/domain/ModelChannel;",
-            "Lcom/discord/rtcconnection/RtcConnection$State;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Lkotlin/Pair;
-
-    invoke-direct {v0, p1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2$1.smali
deleted file mode 100644
index 44e4ad7c60..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2$1.smali
+++ /dev/null
@@ -1,146 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;
-.super Ljava/lang/Object;
-.source "StoreMediaNotification.kt"
-
-# interfaces
-.implements Lrx/functions/Func4;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;->call(Lkotlin/Pair;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T1:",
-        "Ljava/lang/Object;",
-        "T2:",
-        "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
-        "T4:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;->$connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/stores/StoreMediaNotification$NotificationData;
-    .locals 8
-
-    invoke-virtual {p3}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
-
-    move-result-object p3
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-eqz p4, :cond_1
-
-    invoke-virtual {p4}, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall()Z
-
-    move-result p4
-
-    if-eq p4, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p4, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 p4, 0x1
-
-    :goto_1
-    instance-of p3, p3, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;
-
-    if-eqz p4, :cond_2
-
-    if-eqz p3, :cond_2
-
-    const/4 v7, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v7, 0x0
-
-    :goto_2
-    new-instance p3, Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    iget-object v3, p0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;->$connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
-    const-string p4, "connectionState"
-
-    invoke-static {v3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string p4, "channelName"
-
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
-
-    move-result v5
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isDeafened()Z
-
-    move-result v6
-
-    move-object v2, p3
-
-    move-object v4, p1
-
-    invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreMediaNotification$NotificationData;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZ)V
-
-    return-object p3
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    check-cast p2, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    check-cast p3, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
-
-    check-cast p4, Lcom/discord/widgets/voice/model/CallModel;
-
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;->call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2.smali
deleted file mode 100644
index 372e2c4c8d..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2.smali
+++ /dev/null
@@ -1,180 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;
-.super Ljava/lang/Object;
-.source "StoreMediaNotification.kt"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreMediaNotification;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TR;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaNotification;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreMediaNotification;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lkotlin/Pair;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;->call(Lkotlin/Pair;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lkotlin/Pair;)Lrx/Observable;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/Pair<",
-            "+",
-            "Lcom/discord/models/domain/ModelChannel;",
-            "+",
-            "Lcom/discord/rtcconnection/RtcConnection$State;",
-            ">;)",
-            "Lrx/Observable<",
-            "Lcom/discord/stores/StoreMediaNotification$NotificationData;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/models/domain/ModelChannel;
-
-    iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
-
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-static {}, Lcom/discord/stores/StoreMediaNotification;->access$getNOTIFICATION_DATA_DISCONNECTED$cp()Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    move-result-object p1
-
-    new-instance v0, Lr0/l/e/j;
-
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    goto :goto_3
-
-    :cond_0
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const-string v1, ""
-
-    :goto_1
-    new-instance v2, Lr0/l/e/j;
-
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    invoke-static {v1}, Lcom/discord/stores/StoreMediaNotification;->access$getMediaSettingsStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfig()Lrx/Observable;
-
-    move-result-object v1
-
-    iget-object v3, p0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;->this$0:Lcom/discord/stores/StoreMediaNotification;
-
-    invoke-static {v3}, Lcom/discord/stores/StoreMediaNotification;->access$getAudioDevicesStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreAudioDevices;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState()Lrx/Observable;
-
-    move-result-object v3
-
-    sget-object v4, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v5
-
-    goto :goto_2
-
-    :cond_3
-    const-wide/16 v5, -0x1
-
-    :goto_2
-    invoke-virtual {v4, v5, v6}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v4, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;
-
-    invoke-direct {v4, p1}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;)V
-
-    invoke-static {v2, v1, v3, v0, v4}, Lrx/Observable;->h(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
-
-    move-result-object v0
-
-    :goto_3
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
deleted file mode 100644
index 65b683cd2e..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
+++ /dev/null
@@ -1,279 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaNotification;
-.super Lcom/discord/stores/Store;
-.source "StoreMediaNotification.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/stores/StoreMediaNotification$NotificationData;,
-        Lcom/discord/stores/StoreMediaNotification$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/stores/StoreMediaNotification$Companion;
-
-.field public static final NOTIFICATION_DATA_DISCONNECTED:Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-
-# instance fields
-.field public final audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
-
-.field public final mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
-
-.field public final notificationDataObservable:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "Lcom/discord/stores/StoreMediaNotification$NotificationData;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 8
-
-    new-instance v0, Lcom/discord/stores/StoreMediaNotification$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/stores/StoreMediaNotification$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/stores/StoreMediaNotification;->Companion:Lcom/discord/stores/StoreMediaNotification$Companion;
-
-    new-instance v0, Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    new-instance v3, Lcom/discord/rtcconnection/RtcConnection$State$d;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v3, v1}, Lcom/discord/rtcconnection/RtcConnection$State$d;-><init>(Z)V
-
-    const-string v4, ""
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    move-object v2, v0
-
-    invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreMediaNotification$NotificationData;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZ)V
-
-    sput-object v0, Lcom/discord/stores/StoreMediaNotification;->NOTIFICATION_DATA_DISCONNECTED:Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
-    invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification;->audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
-
-    iput-object p2, p0, Lcom/discord/stores/StoreMediaNotification;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
-
-    iput-object p3, p0, Lcom/discord/stores/StoreMediaNotification;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    invoke-virtual {p3}, Lcom/discord/stores/StoreVoiceChannelSelected;->get()Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p4}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
-
-    move-result-object p2
-
-    sget-object p3, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;->INSTANCE:Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$1;
-
-    invoke-static {p1, p2, p3}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance p2, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;
-
-    invoke-direct {p2, p0}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;-><init>(Lcom/discord/stores/StoreMediaNotification;)V
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "Observable.combineLatest\u2026            }\n          }"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification;->notificationDataObservable:Lrx/Observable;
-
-    return-void
-
-    :cond_0
-    const-string p1, "rtcConnectionStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "voiceChannelSelectedStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "audioDevicesStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final synthetic access$getAudioDevicesStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreAudioDevices;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/stores/StoreMediaNotification;->audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getMediaSettingsStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreMediaSettings;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/stores/StoreMediaNotification;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getNOTIFICATION_DATA_DISCONNECTED$cp()Lcom/discord/stores/StoreMediaNotification$NotificationData;
-    .locals 1
-
-    sget-object v0, Lcom/discord/stores/StoreMediaNotification;->NOTIFICATION_DATA_DISCONNECTED:Lcom/discord/stores/StoreMediaNotification$NotificationData;
-
-    return-object v0
-.end method
-
-.method public static final synthetic access$getVoiceChannelSelectedStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreVoiceChannelSelected;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/stores/StoreMediaNotification;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public init(Landroid/content/Context;)V
-    .locals 8
-
-    const/4 v6, 0x0
-
-    if-eqz p1, :cond_0
-
-    invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
-
-    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->Companion:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;
-
-    new-instance v1, Lcom/discord/stores/StoreMediaNotification$init$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/stores/StoreMediaNotification$init$1;-><init>(Lcom/discord/stores/StoreMediaNotification;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;->setOnDisconnect(Lkotlin/jvm/functions/Function0;)V
-
-    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->Companion:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;
-
-    new-instance v1, Lcom/discord/stores/StoreMediaNotification$init$2;
-
-    invoke-direct {v1, p0}, Lcom/discord/stores/StoreMediaNotification$init$2;-><init>(Lcom/discord/stores/StoreMediaNotification;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;->setOnToggleSelfDeafen(Lkotlin/jvm/functions/Function0;)V
-
-    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->Companion:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;
-
-    new-instance v1, Lcom/discord/stores/StoreMediaNotification$init$3;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreMediaNotification$init$3;-><init>(Lcom/discord/stores/StoreMediaNotification;Landroid/content/Context;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;->setOnToggleSelfMute(Lkotlin/jvm/functions/Function0;)V
-
-    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
-
-    invoke-direct {v0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;-><init>(Landroid/content/Context;)V
-
-    iget-object v7, p0, Lcom/discord/stores/StoreMediaNotification;->notificationDataObservable:Lrx/Observable;
-
-    new-instance v4, Lcom/discord/stores/StoreMediaNotification$init$4;
-
-    invoke-direct {v4, p1, v0}, Lcom/discord/stores/StoreMediaNotification$init$4;-><init>(Landroid/content/Context;Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
-
-    const-class v2, Lcom/discord/stores/StoreMediaNotification;
-
-    const/16 p1, 0x3c
-
-    and-int/lit8 v0, p1, 0x4
-
-    and-int/lit8 v0, p1, 0x8
-
-    and-int/lit8 v0, p1, 0x10
-
-    and-int/lit8 p1, p1, 0x20
-
-    new-instance p1, Lf/a/b/a0;
-
-    move-object v0, p1
-
-    move-object v1, v6
-
-    move-object v3, v6
-
-    move-object v5, v6
-
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
-
-    invoke-virtual {v7, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
index 21b4330221..6e58225ab0 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
@@ -38,11 +38,13 @@
 .method public constructor <init>(ZZZZZLcom/discord/stores/StoreMediaSettings$NoiseProcessing;FLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "noiseProcessing"
 
-    if-eqz p6, :cond_1
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_0
+    const-string v0, "inputMode"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -65,20 +67,6 @@
     iput p9, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
 
     return-void
-
-    :cond_0
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "noiseProcessing"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZLcom/discord/stores/StoreMediaSettings$NoiseProcessing;FLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
@@ -298,11 +286,17 @@
 .method public final copy(ZZZZZLcom/discord/stores/StoreMediaSettings$NoiseProcessing;FLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "noiseProcessing"
 
-    if-eqz p6, :cond_1
+    move-object/from16 v7, p6
 
-    if-eqz p8, :cond_0
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inputMode"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
@@ -318,31 +312,13 @@
 
     move/from16 v6, p5
 
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
-    move-object/from16 v9, p8
-
     move/from16 v10, p9
 
     invoke-direct/range {v1 .. v10}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;-><init>(ZZZZZLcom/discord/stores/StoreMediaSettings$NoiseProcessing;FLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "inputMode"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "noiseProcessing"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -390,7 +366,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->noiseProcessing:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -410,7 +386,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali
index aaec9d04f2..d226aac823 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticGainControl$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getAutomaticGainControl$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
 
     move-result p1
 
@@ -73,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
+    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getAutomaticGainControl$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali
index 881ddd57cb..d118eb863c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getAutomaticVAD$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getAutomaticVAD$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
 
     move-result p1
 
@@ -73,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
+    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getAutomaticVAD$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali
index 5d1f04c334..bdb53ab9f9 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getEchoCancellation$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getEchoCancellation$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getEchoCancellation()Z
 
     move-result p1
 
@@ -73,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getEchoCancellation()Z
+    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getEchoCancellation$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali
index c5dc88d795..220d610cb9 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getInputMode$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseProcessing$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseProcessing$1.smali
index fd55fddf0f..a4db63e6fe 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseProcessing$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getNoiseProcessing$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali
index 07d0343273..86e4290b20 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputVolume$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Float;",
+        ">;"
     }
 .end annotation
 
@@ -57,28 +59,28 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)F
+.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Float;
     .locals 0
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputVolume()F
 
     move-result p1
 
-    return p1
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getOutputVolume$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)F
-
-    move-result p1
-
     invoke-static {p1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getOutputVolume$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Float;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali
index 968124ebdc..676efc79c5 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getSensitivity$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Float;",
+        ">;"
     }
 .end annotation
 
@@ -57,28 +59,28 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)F
+.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Float;
     .locals 0
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getSensitivity()F
 
     move-result p1
 
-    return p1
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getSensitivity$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)F
-
-    move-result p1
-
     invoke-static {p1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getSensitivity$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Float;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali
index 0d2f02d78e..a079aa11ba 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserMuted$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -47,23 +53,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getUserMuted$1;->call(Ljava/util/Map;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Map;)Z
+.method public final call(Ljava/util/Map;)Ljava/lang/Boolean;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -71,7 +61,8 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Boolean;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -99,5 +90,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getUserMuted$1;->call(Ljava/util/Map;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali
index c5d583739d..4354631c1d 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$getUserOutputVolume$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Float;",
+        ">;",
+        "Ljava/lang/Float;",
+        ">;"
     }
 .end annotation
 
@@ -47,7 +53,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;)F
+.method public final call(Ljava/util/Map;)Ljava/lang/Float;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,7 +61,8 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Float;",
-            ">;)F"
+            ">;)",
+            "Ljava/lang/Float;"
         }
     .end annotation
 
@@ -83,7 +90,11 @@
     const/high16 p1, 0x42c80000    # 100.0f
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -91,11 +102,7 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getUserOutputVolume$1;->call(Ljava/util/Map;)F
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getUserOutputVolume$1;->call(Ljava/util/Map;)Ljava/lang/Float;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1$1.smali
index 7ee5404f57..b37062a99f 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Ljava/lang/Long;)Ljava/lang/Boolean;
+    .locals 2
 
-    check-cast p1, Ljava/lang/Long;
+    const-wide/32 v0, 0x2000000
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$1$1$1;->call(Ljava/lang/Long;)Z
+    invoke-static {v0, v1, p1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Long;)Z
-    .locals 2
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-wide/32 v0, 0x2000000
+    check-cast p1, Ljava/lang/Long;
 
-    invoke-static {v0, v1, p1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$1$1$1;->call(Ljava/lang/Long;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1.smali
index 583ec55ab5..70d055d42a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Boolean;",
             ">;"
         }
@@ -105,7 +108,7 @@
 
     const-string v1, "id"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -117,7 +120,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreMediaSettings$init$1$1$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$init$1$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -127,9 +130,9 @@
     :goto_0
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
index 1220b55420..53f35949c2 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Boolean;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     const-string v1, "id"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -100,7 +103,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$1$1;-><init>(Lcom/discord/stores/StoreMediaSettings$init$1;Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
index b979d52a65..78390ec7a2 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMediaSettings$init$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMediaSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMediaSettings;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleCanUseVad"
+
+    const-string v5, "handleCanUseVad(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleCanUseVad"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreMediaSettings;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleCanUseVad(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreMediaSettings;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali
index 2e49f2a33a..295413afd8 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfDeafened$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$isSelfDeafened$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isDeafened()Z
 
     move-result p1
 
@@ -73,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isDeafened()Z
+    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$isSelfDeafened$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali
index bdb2dd3479..9aa403b55c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$isSelfMuted$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMediaSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$isSelfMuted$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
 
     move-result p1
 
@@ -73,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
+    check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$isSelfMuted$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
index 8358bdc7a1..9ae9cec923 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
@@ -16,35 +16,10 @@
 # static fields
 .field public static final Companion:Lcom/discord/stores/StoreMediaSettings$Companion;
 
-.field public static final DEFAULT_AUDIO_MODE:I = 0x3
-
 .field public static final DEFAULT_OUTPUT_VOLUME:F = 100.0f
 
 
 # instance fields
-.field public audioMode:I
-
-.field public final audioModeCache:Lcom/discord/utilities/persister/Persister;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/discord/utilities/persister/Persister<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final audioModeSubject:Lrx/subjects/SerializedSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/SerializedSubject<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field public canUseVad:Z
 
 .field public enableVideoHardwareScaling:Z
@@ -207,9 +182,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 3
+    .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -251,25 +228,11 @@
 
     new-instance p1, Lcom/discord/utilities/persister/Persister;
 
-    const/4 v0, 0x3
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const-string v1, "CACHE_KEY_HIDE_VOICE_PARTICIPANTS"
 
-    move-result-object v1
-
-    const-string v2, "AUDIO_MODE"
-
-    invoke-direct {p1, v2, v1}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeCache:Lcom/discord/utilities/persister/Persister;
-
-    new-instance p1, Lcom/discord/utilities/persister/Persister;
-
-    sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    const-string v2, "CACHE_KEY_HIDE_VOICE_PARTICIPANTS"
-
-    invoke-direct {p1, v2, v1}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p1, v1, v0}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenCache:Lcom/discord/utilities/persister/Persister;
 
@@ -281,13 +244,11 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
-    iput-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->mutedUsers:Ljava/util/Map;
+    iput-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->mutedUsers:Ljava/util/Map;
 
-    iput-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->userOutputVolumes:Ljava/util/Map;
-
-    iput v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioMode:I
+    iput-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->userOutputVolumes:Ljava/util/Map;
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
@@ -341,22 +302,6 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    iget v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioMode:I
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeSubject:Lrx/subjects/SerializedSubject;
-
-    new-instance p1, Lrx/subjects/SerializedSubject;
-
     iget-boolean v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHidden:Z
 
     invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
@@ -376,15 +321,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreMediaSettings;->canUseVad:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$handleCanUseVad(Lcom/discord/stores/StoreMediaSettings;Z)V
@@ -419,34 +355,6 @@
     throw p1
 .end method
 
-.method private final setAudioMode(I)V
-    .locals 3
-
-    iput p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioMode:I
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeCache:Lcom/discord/utilities/persister/Persister;
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeSubject:Lrx/subjects/SerializedSubject;
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
-
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
 .method private final setEnableVideoHardwareScaling(Z)V
     .locals 5
 
@@ -472,9 +380,9 @@
 
     move-result-object p1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -495,9 +403,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->mutedUsersSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->mutedUsersCache:Lcom/discord/utilities/persister/Persister;
 
@@ -528,9 +436,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->userOutputVolumesSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->userOutputVolumesCache:Lcom/discord/utilities/persister/Persister;
 
@@ -552,9 +460,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfigurationSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfigurationCache:Lcom/discord/stores/VoiceConfigurationCache;
 
@@ -565,9 +473,9 @@
     return-void
 
     :cond_0
-    const-string p1, "voiceConfigurationCache"
+    const-string/jumbo p1, "voiceConfigurationCache"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -595,9 +503,9 @@
 
     move-result-object p1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -667,44 +575,6 @@
 
 
 # virtual methods
-.method public final getAudioMode()Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeSubject:Lrx/subjects/SerializedSubject;
-
-    return-object v0
-.end method
-
-.method public final declared-synchronized getAudioModeBlocking()I
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioMode:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
 .method public final getAutomaticGainControl()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -720,13 +590,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$getAutomaticGainControl$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getAutomaticGainControl$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026it.automaticGainControl }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026it.automaticGainControl }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -736,9 +606,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -758,13 +628,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$getAutomaticVAD$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getAutomaticVAD$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026 .map { it.automaticVad }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026 .map { it.automaticVad }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -774,9 +644,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -796,13 +666,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$getEchoCancellation$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getEchoCancellation$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026p { it.echoCancellation }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026p { it.echoCancellation }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -812,9 +682,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -842,7 +712,7 @@
 
     const-string v1, "enableVideoHardwareScali\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -862,13 +732,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$getInputMode$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getInputMode$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026    .map { it.inputMode }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026    .map { it.inputMode }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -878,9 +748,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -931,13 +801,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$getNoiseProcessing$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getNoiseProcessing$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026ap { it.noiseProcessing }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026ap { it.noiseProcessing }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -947,9 +817,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -969,13 +839,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$getOutputVolume$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getOutputVolume$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026 .map { it.outputVolume }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026 .map { it.outputVolume }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -985,9 +855,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1007,13 +877,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$getSensitivity$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getSensitivity$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .map { it.sensitivity }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .map { it.sensitivity }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1023,9 +893,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1055,13 +925,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMediaSettings$getUserMuted$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "mutedUsersSubject\n      \u2026p { it[userId] ?: false }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1073,7 +943,7 @@
 
     const-string p2, "mutedUsersSubject\n      \u2026().distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1095,13 +965,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMediaSettings$getUserOutputVolume$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string p2, "userOutputVolumesSubject\u2026: DEFAULT_OUTPUT_VOLUME }"
+    const-string/jumbo p2, "userOutputVolumesSubject\u2026: DEFAULT_OUTPUT_VOLUME }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1111,9 +981,9 @@
 
     move-result-object p1
 
-    const-string p2, "userOutputVolumesSubject\u2026  .distinctUntilChanged()"
+    const-string/jumbo p2, "userOutputVolumesSubject\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1143,7 +1013,7 @@
 
     const-string v1, "mutedUsersSubject\n      \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1171,9 +1041,9 @@
 
     move-result-object v0
 
-    const-string v1, "userOutputVolumesSubject\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "userOutputVolumesSubject\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1221,9 +1091,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1287,9 +1157,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceParticipantsHiddenS\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceParticipantsHiddenS\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1347,20 +1217,6 @@
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setEnableVideoHardwareScaling(Z)V
 
-    iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeCache:Lcom/discord/utilities/persister/Persister;
-
-    invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v0
-
-    invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setAudioMode(I)V
-
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenCache:Lcom/discord/utilities/persister/Persister;
 
     invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
@@ -1389,7 +1245,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreMediaSettings$init$1;-><init>(Lcom/discord/stores/StoreMediaSettings;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1409,7 +1265,15 @@
 
     and-int/lit8 v1, v1, 0x20
 
-    new-instance v8, Lf/a/b/a0;
+    const-string v1, "onNext"
+
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "errorClass"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lf/a/b/c0;
 
     const/4 v7, 0x0
 
@@ -1421,7 +1285,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1443,13 +1307,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$isSelfDeafened$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$isSelfDeafened$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026   .map { it.isDeafened }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026   .map { it.isDeafened }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1459,9 +1323,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1481,13 +1345,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMediaSettings$isSelfMuted$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$isSelfMuted$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026      .map { it.isMuted }"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026      .map { it.isMuted }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1497,9 +1361,9 @@
 
     move-result-object v0
 
-    const-string v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "voiceConfigurationSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1512,7 +1376,7 @@
     :try_start_0
     const-string v0, "noiseProcessing"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
@@ -1559,16 +1423,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -1916,7 +1770,7 @@
     :try_start_0
     const-string v0, "noiseProcessing"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
@@ -1954,16 +1808,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -1980,7 +1824,7 @@
     :try_start_0
     const-string v0, "inputMode"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
@@ -2020,16 +1864,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -2458,7 +2292,7 @@
     :goto_0
     const-string v2, "get(userId) ?: false"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -2500,28 +2334,6 @@
     throw p1
 .end method
 
-.method public final declared-synchronized updateAudioMode(I)V
-    .locals 0
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaSettings;->setAudioMode(I)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
 .method public final declared-synchronized updateVoiceParticipantsHidden(Z)V
     .locals 0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali b/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali
index f0c4eac253..20da22f937 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$getTotal$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMentions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +63,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;)I
+.method public final call(Ljava/util/Map;)Ljava/lang/Integer;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -65,7 +71,8 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
-            ">;)I"
+            ">;)",
+            "Ljava/lang/Integer;"
         }
     .end annotation
 
@@ -73,19 +80,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->sumOfInt(Ljava/lang/Iterable;)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMentions$getTotal$1;->call(Ljava/util/Map;)I
+    invoke-static {p1}, Lk0/j/l;->sumOfInt(Ljava/lang/Iterable;)I
 
     move-result p1
 
@@ -95,3 +90,15 @@
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMentions$getTotal$1;->call(Ljava/util/Map;)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$3.smali b/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$3.smali
index b8c5f9e11f..6648bd1934 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMentions$handleConnectionOpen$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelReadState;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelReadState;)Z
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "readState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMentions$handleConnectionOpen$3;->$newReadStateChannelIds:Ljava/util/HashSet;
 
@@ -82,13 +84,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "readState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$5.smali b/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$5.smali
index db1cc4b6cc..43747a3c73 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$handleConnectionOpen$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMentions$handleConnectionOpen$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelReadState;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelReadState;)Z
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "readState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMentions$handleConnectionOpen$5;->this$0:Lcom/discord/stores/StoreMentions;
 
@@ -92,13 +94,4 @@
     xor-int/lit8 p1, p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "readState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$handleMessageAck$1.smali b/com.discord/smali/com/discord/stores/StoreMentions$handleMessageAck$1.smali
index df7983076e..e216d68613 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$handleMessageAck$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$handleMessageAck$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMentions$handleMessageAck$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelReadState;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelReadState;)Z
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J
 
@@ -90,13 +92,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMentions$processMarkUnread$1.smali b/com.discord/smali/com/discord/stores/StoreMentions$processMarkUnread$1.smali
index 1d81fd0b57..9a7fe33c7f 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions$processMarkUnread$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions$processMarkUnread$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMentions$processMarkUnread$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelReadState;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelReadState;)Z
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J
 
@@ -86,13 +88,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMentions.smali b/com.discord/smali/com/discord/stores/StoreMentions.smali
index f78c422702..865b82ba9f 100644
--- a/com.discord/smali/com/discord/stores/StoreMentions.smali
+++ b/com.discord/smali/com/discord/stores/StoreMentions.smali
@@ -105,17 +105,25 @@
 .method public constructor <init>(Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreChannels;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeUserRelationships"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "storePermissions"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "storeMessageAck"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUserGuildSettings"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeChannels"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -176,41 +184,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreMentions;->channelGuildIds:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeUserGuildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeMessageAck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storePermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeUserRelationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getStoreChannels$p(Lcom/discord/stores/StoreMentions;)Lcom/discord/stores/StoreChannels;
@@ -399,7 +372,7 @@
 
     const-string v6, "message"
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
@@ -411,7 +384,7 @@
 
     const-string v9, "message.author"
 
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -565,7 +538,7 @@
     :goto_0
     const-string v4, "channelGuildIds[channelId] ?: 0"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -577,7 +550,7 @@
 
     const-string v6, "author"
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -660,7 +633,7 @@
 
     const-string v3, "mentions"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
 
@@ -693,7 +666,7 @@
 
     const-string v7, "it"
 
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -934,7 +907,7 @@
 
     const-string v1, "countsSubject\n          \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -960,13 +933,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMentions$getTotal$1;->INSTANCE:Lcom/discord/stores/StoreMentions$getTotal$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "getCounts()\n          .map { it.values.sum() }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -976,7 +949,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMentions;->channelGuildIds:Ljava/util/HashMap;
 
@@ -994,7 +969,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1024,15 +999,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleChannelSelected(J)V
@@ -1054,7 +1020,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_8
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMentions;->privateChannels:Ljava/util/HashSet;
 
@@ -1078,7 +1046,7 @@
 
     const-string v1, "payload.me"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -1109,7 +1077,7 @@
 
     const-string v2, "guild"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v1}, Lcom/discord/stores/StoreMentions;->handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
 
@@ -1124,7 +1092,7 @@
 
     const-string v2, "payload.privateChannels"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -1154,7 +1122,7 @@
 
     check-cast v6, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->isManaged()Z
 
@@ -1196,7 +1164,7 @@
 
     check-cast v6, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -1219,7 +1187,7 @@
 
     const-string v1, "payload.readState"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->isPartial()Z
 
@@ -1240,13 +1208,13 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->getEntries()Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v5, Ljava/util/ArrayList;
 
@@ -1286,7 +1254,7 @@
     goto :goto_3
 
     :cond_5
-    invoke-static {v5}, Lj0/i/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
+    invoke-static {v5}, Lk0/j/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
 
     move-result-object v0
 
@@ -1305,13 +1273,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->getEntries()Ljava/util/List;
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -1361,15 +1329,6 @@
     iput-boolean v4, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z
 
     return-void
-
-    :cond_8
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
@@ -1377,7 +1336,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getMembers()Ljava/util/Map;
 
@@ -1413,7 +1374,7 @@
 
     const-string v3, "roles"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1443,7 +1404,7 @@
 
     const-string v3, "channel"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -1467,15 +1428,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -1483,7 +1435,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "member"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -1513,21 +1467,12 @@
 
     const-string v1, "member.roles"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V
@@ -1535,7 +1480,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "readState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMentions;->serverInitReadStates:Ljava/util/ArrayList;
 
@@ -1554,15 +1501,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "readState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageCreateOrUpdate(Lcom/discord/models/domain/ModelMessage;)V
@@ -1570,7 +1508,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMentions;->hasMention(Lcom/discord/models/domain/ModelMessage;)Z
 
@@ -1596,15 +1536,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageDeleted(Lcom/discord/models/domain/ModelMessageDelete;)V
@@ -1612,7 +1543,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "messageDeleteBulk"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMentions;->privateChannels:Ljava/util/HashSet;
 
@@ -1636,7 +1569,7 @@
 
     const-string v0, "messageDeleteBulk.messageIds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1659,7 +1592,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1672,15 +1605,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "messageDeleteBulk"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -1729,14 +1653,16 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_2
+    const-string v0, "messagesAfter"
 
-    const/4 v0, 0x0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object p3
 
+    const/4 v0, 0x0
+
     :cond_0
     :goto_0
     invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
@@ -1803,13 +1729,4 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z
 
     return v0
-
-    :cond_2
-    const-string p1, "messagesAfter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
index 3f8b713f48..af3807abdb 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$PendingAck.smali
@@ -62,9 +62,11 @@
 .end method
 
 .method public constructor <init>(JLcom/discord/stores/StoreMessageAck$Ack;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "ack"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -73,15 +75,6 @@
     iput-object p3, p0, Lcom/discord/stores/StoreMessageAck$PendingAck;->ack:Lcom/discord/stores/StoreMessageAck$Ack;
 
     return-void
-
-    :cond_0
-    const-string p1, "ack"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getEMPTY$cp()Lcom/discord/stores/StoreMessageAck$PendingAck;
@@ -137,22 +130,15 @@
 .method public final copy(JLcom/discord/stores/StoreMessageAck$Ack;)Lcom/discord/stores/StoreMessageAck$PendingAck;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "ack"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMessageAck$PendingAck;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreMessageAck$PendingAck;-><init>(JLcom/discord/stores/StoreMessageAck$Ack;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "ack"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -178,7 +164,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreMessageAck$PendingAck;->ack:Lcom/discord/stores/StoreMessageAck$Ack;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
index a1fca15039..ad81f07331 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$ack$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -123,7 +123,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali
index 479df52dd5..5c49960b3a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$ackGuild$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$2.smali
index 22f5c344da..9aaa02b92d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$ackGuild$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$ackGuild$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali
index bc50c3d780..a8e1372ac9 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageAck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        ">;",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali
index b211e5539b..ef2cd32759 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$getPendingAck$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/stores/StoreMessageAck$Ack;",
         "Ljava/lang/Long;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2$1.smali
index b815ccbefc..e80e3030ab 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/stores/StoreMessageAck$PendingAck;",
+        ">;"
     }
 .end annotation
 
@@ -66,7 +69,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreMessageAck$getPendingAck$2;->$isUpdateRequired$1:Lcom/discord/stores/StoreMessageAck$getPendingAck$1;
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
@@ -97,7 +100,7 @@
 
     const-string v1, "channelId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -105,7 +108,7 @@
 
     new-instance v3, Lcom/discord/stores/StoreMessageAck$Ack;
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2.smali
index 324f2eaf40..930a121d2a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$getPendingAck$2.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageAck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreMessageAck$PendingAck;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,6 +79,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/stores/StoreMessageAck$PendingAck;",
             ">;"
         }
@@ -104,7 +107,7 @@
 
     const-string v1, "channelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -149,9 +152,9 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali
index dce7dc278c..7685ede62b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageAck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1$1;->call(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Z
+.method public final call(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Ljava/lang/Boolean;
     .locals 1
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->isInitialMessagesLoaded()Z
@@ -96,5 +82,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1$1;->call(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali
index fe513f7e36..f6a82d0057 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageAck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/stores/StoreChat$InteractionState;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,23 +49,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreChat$InteractionState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1$2;->call(Lcom/discord/stores/StoreChat$InteractionState;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Z
+.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Ljava/lang/Boolean;
     .locals 4
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
@@ -96,5 +80,21 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreChat$InteractionState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1$2;->call(Lcom/discord/stores/StoreChat$InteractionState;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$3.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$3.smali
index 115e2f60ac..2acc947b55 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$3.smali
@@ -31,7 +31,15 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/stores/StoreChat$InteractionState;",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -63,7 +71,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Set;Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;Lcom/discord/stores/StoreMessageAck$Ack;)J
+.method public final call(Ljava/util/Set;Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;Lcom/discord/stores/StoreMessageAck$Ack;)Ljava/lang/Long;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -74,7 +82,8 @@
             "Ljava/lang/Boolean;",
             "Lcom/discord/stores/StoreChat$InteractionState;",
             "Lcom/discord/stores/StoreMessageAck$Ack;",
-            ")J"
+            ")",
+            "Ljava/lang/Long;"
         }
     .end annotation
 
@@ -86,7 +95,7 @@
 
     const-string v0, "isLoadingSettled"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -127,7 +136,11 @@
     const-wide/16 p1, 0x0
 
     :goto_0
-    return-wide p1
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -141,11 +154,7 @@
 
     check-cast p4, Lcom/discord/stores/StoreMessageAck$Ack;
 
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreMessageAck$init$1$3;->call(Ljava/util/Set;Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;Lcom/discord/stores/StoreMessageAck$Ack;)J
-
-    move-result-wide p1
-
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreMessageAck$init$1$3;->call(Ljava/util/Set;Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;Lcom/discord/stores/StoreMessageAck$Ack;)Ljava/lang/Long;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
index f20063afe1..b0a3fa8b3b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageAck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -108,7 +111,7 @@
 
     const-string v2, "selectedChannelId"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -120,7 +123,7 @@
 
     sget-object v2, Lcom/discord/stores/StoreMessageAck$init$1$1;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -146,7 +149,7 @@
 
     invoke-direct {v3, p1}, Lcom/discord/stores/StoreMessageAck$init$1$2;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$1.smali
index 94315eceed..948b5cc2de 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageAck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/List<",
         "+",
         "Lcom/discord/models/domain/ModelMessage;",
@@ -62,15 +62,29 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Ljava/util/List;)Ljava/lang/Boolean;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lcom/discord/models/domain/ModelMessage;",
+            ">;)",
+            "Ljava/lang/Boolean;"
+        }
+    .end annotation
 
-    check-cast p1, Ljava/util/List;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$markUnread$1;->call(Ljava/util/List;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
     move-result p1
 
+    xor-int/lit8 p1, p1, 0x1
+
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -78,27 +92,14 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/util/List;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lcom/discord/models/domain/ModelMessage;",
-            ">;)Z"
-        }
-    .end annotation
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "it"
+    check-cast p1, Ljava/util/List;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$markUnread$1;->call(Ljava/util/List;)Ljava/lang/Boolean;
 
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+    move-result-object p1
 
-    move-result p1
-
-    xor-int/lit8 p1, p1, 0x1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali
index 7e9a4d3f83..bef7a79e0e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$markUnread$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     const-string v1, "channelMessages"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -195,7 +195,7 @@
 
     iget-object v2, p0, Lcom/discord/stores/StoreMessageAck$markUnread$2$1;->$channelMessages:Ljava/util/List;
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -314,13 +314,13 @@
 
     invoke-direct {v3, v4, v5, v0}, Lcom/discord/stores/StoreMessageAck$PendingAck;-><init>(JLcom/discord/stores/StoreMessageAck$Ack;)V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, v3}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v3}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v3, "Observable.just(PendingAck(channelId, ack))"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, v0, v1}, Lcom/discord/stores/StoreMessageAck;->access$postPendingAck(Lcom/discord/stores/StoreMessageAck;Lrx/Observable;I)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2.smali
index fcf3d1212f..681ce86b80 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$markUnread$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$1.smali
index c917b58bd7..23d59126b2 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$postPendingAck$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$3.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$3.smali
index 2e982d176d..700916ac8d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$postPendingAck$1$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1.smali
index 9f49977715..eb554672f5 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageAck$postPendingAck$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessageAck$PendingAck;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,45 +65,45 @@
 .method public final invoke(Lcom/discord/stores/StoreMessageAck$PendingAck;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "pendingAck"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessageAck$PendingAck;->component1()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessageAck$PendingAck;->component2()Lcom/discord/stores/StoreMessageAck$Ack;
 
     move-result-object p1
 
-    iget-object v3, p0, Lcom/discord/stores/StoreMessageAck$postPendingAck$1;->this$0:Lcom/discord/stores/StoreMessageAck;
+    iget-object v2, p0, Lcom/discord/stores/StoreMessageAck$postPendingAck$1;->this$0:Lcom/discord/stores/StoreMessageAck;
 
-    invoke-static {v3}, Lcom/discord/stores/StoreMessageAck;->access$getDispatcher$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/Dispatcher;
+    invoke-static {v2}, Lcom/discord/stores/StoreMessageAck;->access$getDispatcher$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/Dispatcher;
 
-    move-result-object v3
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$1;
+    new-instance v3, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$1;
 
-    invoke-direct {v4, p0, v1, v2, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$1;-><init>(Lcom/discord/stores/StoreMessageAck$postPendingAck$1;JLcom/discord/stores/StoreMessageAck$Ack;)V
+    invoke-direct {v3, p0, v0, v1, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$1;-><init>(Lcom/discord/stores/StoreMessageAck$postPendingAck$1;JLcom/discord/stores/StoreMessageAck$Ack;)V
 
-    invoke-virtual {v3, v4}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v2, v3}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
-    sget-object v3, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v2, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v3}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v2}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessageAck$Ack;->getMessageId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
-    new-instance v5, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;
+    new-instance v4, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessageAck$Ack;->isLockedAck()Z
 
@@ -113,44 +113,46 @@
 
     move-result-object p1
 
-    iget v6, p0, Lcom/discord/stores/StoreMessageAck$postPendingAck$1;->$mentionCount:I
+    iget v5, p0, Lcom/discord/stores/StoreMessageAck$postPendingAck$1;->$mentionCount:I
 
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-direct {v5, p1, v6}, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;-><init>(Ljava/lang/Boolean;Ljava/lang/Integer;)V
+    invoke-direct {v4, p1, v5}, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;-><init>(Ljava/lang/Boolean;Ljava/lang/Integer;)V
 
-    invoke-virtual {v3, v1, v2, v4, v5}, Lcom/discord/utilities/rest/RestAPI;->postChannelMessagesAck(JLjava/lang/Long;Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;)Lrx/Observable;
+    invoke-virtual {v2, v0, v1, v3, v4}, Lcom/discord/utilities/rest/RestAPI;->postChannelMessagesAck(JLjava/lang/Long;Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    invoke-static {p1, v3, v4, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v4, 0x0
+
+    invoke-static {p1, v2, v3, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$2;
+    new-instance v2, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$2;
 
-    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$2;-><init>(J)V
+    invoke-direct {v2, v0, v1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$2;-><init>(J)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->t(Lrx/functions/Action1;)Lrx/Observable;
+    invoke-virtual {p1, v2}, Lrx/Observable;->t(Lrx/functions/Action1;)Lrx/Observable;
 
     move-result-object v3
 
     const-string p1, "RestAPI\n          .api\n \u2026).ackMessage(channelId) }"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x0
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v7, Lcom/discord/stores/StoreMessageAck$postPendingAck$1$3;->INSTANCE:Lcom/discord/stores/StoreMessageAck$postPendingAck$1$3;
 
+    const-string v5, "REST: ack"
+
+    const/4 v6, 0x0
+
     const/4 v8, 0x0
 
     const/4 v9, 0x0
@@ -159,16 +161,7 @@
 
     const/4 v11, 0x0
 
-    const-string v5, "REST: ack"
-
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "pendingAck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$2.smali
index df17fab828..f425bb1a6f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$2.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageAck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/stores/StoreMessageAck$PendingAck;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreMessageAck$PendingAck;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$2;->call(Lcom/discord/stores/StoreMessageAck$PendingAck;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreMessageAck$PendingAck;)Z
+.method public final call(Lcom/discord/stores/StoreMessageAck$PendingAck;)Ljava/lang/Boolean;
     .locals 1
 
     sget-object v0, Lcom/discord/stores/StoreMessageAck$PendingAck;->Companion:Lcom/discord/stores/StoreMessageAck$PendingAck$Companion;
@@ -84,11 +68,27 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     xor-int/lit8 p1, p1, 0x1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreMessageAck$PendingAck;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$2;->call(Lcom/discord/stores/StoreMessageAck$PendingAck;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$3.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$3.smali
index c8c2be0b2c..151e896d4f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$postPendingAck$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMessageAck$postPendingAck$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMessageAck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessageAck$PendingAck;",
         "Lkotlin/Unit;",
@@ -33,43 +33,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMessageAck$postPendingAck$1;)V
-    .locals 0
+    .locals 6
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessageAck$postPendingAck$3;->$postChannelMessagesAck$1:Lcom/discord/stores/StoreMessageAck$postPendingAck$1;
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/g;-><init>(I)V
+    const/4 v2, 0x0
+
+    const-string v3, "postChannelMessagesAck"
+
+    const-string v4, "invoke(Lcom/discord/stores/StoreMessageAck$PendingAck;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "postChannelMessagesAck"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke(Lcom/discord/stores/StoreMessageAck$PendingAck;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -85,20 +71,13 @@
 .method public final invoke(Lcom/discord/stores/StoreMessageAck$PendingAck;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageAck$postPendingAck$3;->$postChannelMessagesAck$1:Lcom/discord/stores/StoreMessageAck$postPendingAck$1;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessageAck$postPendingAck$1;->invoke(Lcom/discord/stores/StoreMessageAck$PendingAck;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
index a2a25bb241..da5a73fb0e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
@@ -50,11 +50,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -83,20 +85,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreMessageAck;->acksSubject:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/Dispatcher;
@@ -191,13 +179,13 @@
 
     invoke-direct {p3, p0, p2, v0}, Lcom/discord/stores/StoreMessageAck$getPendingAck$2;-><init>(Lcom/discord/stores/StoreMessageAck;ZLcom/discord/stores/StoreMessageAck$getPendingAck$1;)V
 
-    invoke-virtual {p1, p3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "switchMap { channelId ->\u2026gAck.EMPTY)\n      }\n    }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -213,13 +201,13 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(channel.id)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, p2, p3}, Lcom/discord/stores/StoreMessageAck;->getPendingAck(Lrx/Observable;ZZ)Lrx/Observable;
 
@@ -265,13 +253,13 @@
 
     sget-object p2, Lcom/discord/stores/StoreMessageAck$postPendingAck$2;->INSTANCE:Lcom/discord/stores/StoreMessageAck$postPendingAck$2;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
     const-string v1, "filter { it != PendingAck.EMPTY }"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -426,34 +414,38 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onSuccess"
 
-    if-eqz p4, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p2, p3}, Lcom/discord/utilities/rest/RestAPI;->ackGuild(J)Lrx/Observable;
+    invoke-virtual {v0, p2, p3}, Lcom/discord/utilities/rest/RestAPI;->ackGuild(J)Lrx/Observable;
 
     move-result-object p2
 
     const/4 p3, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p2, p3, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p2, p3, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v2
 
-    const/4 v5, 0x0
-
     new-instance v6, Lcom/discord/stores/StoreMessageAck$ackGuild$2;
 
     invoke-direct {v6, p4}, Lcom/discord/stores/StoreMessageAck$ackGuild$2;-><init>(Lkotlin/jvm/functions/Function0;)V
 
+    const-string v4, "REST: ackGuild"
+
+    const/4 v5, 0x0
+
     const/4 v7, 0x0
 
     const/4 v8, 0x0
@@ -462,20 +454,11 @@
 
     const/4 v10, 0x0
 
-    const-string v4, "REST: ackGuild"
-
     move-object v3, p1
 
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onSuccess"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final get()Lrx/Observable;
@@ -523,7 +506,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMessageAck$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -533,7 +516,7 @@
 
     const-string p2, "get()\n          .map { i\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -638,7 +621,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_c
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getReadState()Lcom/discord/models/domain/ModelPayload$VersionedReadStates;
 
@@ -646,7 +631,7 @@
 
     const-string v1, "payload.readState"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->isPartial()Z
 
@@ -665,7 +650,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->getEntries()Ljava/util/List;
 
@@ -673,7 +658,7 @@
 
     const-string v2, "payload.readState.entries"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v2, 0xa
 
@@ -748,7 +733,7 @@
 
     const-string v1, "payload.guilds"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -771,7 +756,7 @@
 
     const-string v3, "guild"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getMembers()Ljava/util/Map;
 
@@ -783,7 +768,7 @@
 
     const-string v6, "payload.me"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -817,7 +802,7 @@
 
     const-string v3, "guild.channels"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Ljava/util/ArrayList;
 
@@ -845,7 +830,7 @@
 
     check-cast v9, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->isGuildTextyChannel()Z
 
@@ -908,7 +893,7 @@
 
     check-cast v9, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getLastMessageId()J
 
@@ -960,7 +945,7 @@
 
     iget-object v3, p0, Lcom/discord/stores/StoreMessageAck;->acks:Ljava/util/HashMap;
 
-    invoke-static {v2, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -986,15 +971,6 @@
     iput-boolean v2, p0, Lcom/discord/stores/StoreMessageAck;->acksUpdated:Z
 
     return-void
-
-    :cond_c
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V
@@ -1002,7 +978,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "readState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J
 
@@ -1017,15 +995,6 @@
     invoke-direct {p0, v0, v1, v2}, Lcom/discord/stores/StoreMessageAck;->updateAcks(JLcom/discord/stores/StoreMessageAck$Ack;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "readState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageCreate(Lcom/discord/models/domain/ModelMessage;)V
@@ -1033,7 +1002,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
@@ -1041,7 +1012,7 @@
 
     const-string v1, "message.author"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -1085,23 +1056,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public init(Landroid/content/Context;)V
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -1119,52 +1081,47 @@
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/stores/StoreMessageAck$init$1;
+    new-instance v0, Lcom/discord/stores/StoreMessageAck$init$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/stores/StoreMessageAck$init$1;-><init>(Lcom/discord/stores/StoreMessageAck;)V
+    invoke-direct {v0, p0}, Lcom/discord/stores/StoreMessageAck$init$1;-><init>(Lcom/discord/stores/StoreMessageAck;)V
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v1, "StoreStream\n        .get\u2026 0L\n          }\n        }"
+    const-string v0, "StoreStream\n        .get\u2026 0L\n          }\n        }"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
     const-wide/16 v1, 0x1f4
 
-    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {p1, v1, v2, v3}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-virtual {p1, v1, v2, v0}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v1, "StoreStream\n        .get\u20260, TimeUnit.MILLISECONDS)"
+    const-string v0, "StoreStream\n        .get\u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-direct {p0, p1, v1, v1}, Lcom/discord/stores/StoreMessageAck;->getPendingAck(Lrx/Observable;ZZ)Lrx/Observable;
+    invoke-direct {p0, p1, v0, v0}, Lcom/discord/stores/StoreMessageAck;->getPendingAck(Lrx/Observable;ZZ)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p0, p1, v1, v2, v0}, Lcom/discord/stores/StoreMessageAck;->postPendingAck$default(Lcom/discord/stores/StoreMessageAck;Lrx/Observable;IILjava/lang/Object;)V
+    const/4 v2, 0x0
+
+    invoke-static {p0, p1, v0, v1, v2}, Lcom/discord/stores/StoreMessageAck;->postPendingAck$default(Lcom/discord/stores/StoreMessageAck;Lrx/Observable;IILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final markUnread(JJ)V
@@ -1184,13 +1141,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMessageAck$markUnread$1;->INSTANCE:Lcom/discord/stores/StoreMessageAck$markUnread$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n        .get\u2026ilter { it.isNotEmpty() }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v1, 0xa
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Failure.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Failure.smali
index c9623a3a62..40554f335e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Failure.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Failure.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "emoji"
 
-    if-eqz p5, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessageReactions$EmojiResults;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-object p5, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;
@@ -116,30 +111,23 @@
 .method public final copy(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;
     .locals 7
 
-    if-eqz p5, :cond_0
+    const-string v0, "emoji"
 
-    new-instance v6, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;
 
-    move-wide v1, p1
+    move-object v1, v0
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;-><init>(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)V
+    move-object v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;-><init>(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)V
 
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -173,7 +161,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Users.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Users.smali
index 7b6cce06a8..5e84e12d45 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Users.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$EmojiResults$Users.smali
@@ -48,12 +48,16 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "users"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emoji"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p6, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessageReactions$EmojiResults;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->users:Ljava/util/LinkedHashMap;
@@ -65,20 +69,6 @@
     iput-object p6, p0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;Ljava/util/LinkedHashMap;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
@@ -191,11 +181,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
 
@@ -212,20 +204,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;-><init>(Ljava/util/LinkedHashMap;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final deepCopy()Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
@@ -267,7 +245,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->users:Ljava/util/LinkedHashMap;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -293,7 +271,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$1$1.smali
index 43f815d791..b224eac35a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageReactions$fetchReactions$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageReactions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 
     const-string v0, "reactionUsers"
 
-    invoke-static {v7, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessageReactions;->access$handleReactionUsers(Lcom/discord/stores/StoreMessageReactions;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$2$1.smali
index 0a5e00424c..f2566f766d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$fetchReactions$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageReactions$fetchReactions$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageReactions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1.smali
index d2dfed3511..a09d663811 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageReactions$forceRetryFetchReactions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageReactions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$1.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$1.smali
index 9ef1b06cd7..76e804dd17 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageReactions$getMessageReactions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageReactions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$2.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$2.smali
index fc8dc07c37..ff31166874 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$2.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageReactions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreMessageReactions$EmojiResults;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreMessageReactions$EmojiResults;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$3.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$3.smali
index 817aebbd06..4327a98789 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions$getMessageReactions$3.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageReactions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreMessageReactions$EmojiResults;",
+        ">;",
+        "Lcom/discord/stores/StoreMessageReactions$EmojiResults;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions.smali
index 24f4325d19..9bc990a702 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions.smali
@@ -53,11 +53,13 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "userStore"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,7 +73,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessageReactions;->reactions:Ljava/util/Map;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -80,20 +82,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreMessageReactions;->reactionsSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$fetchReactions(Lcom/discord/stores/StoreMessageReactions;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)V
@@ -219,7 +207,7 @@
 
     const-string v1, "emoji.key"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-wide/from16 v4, p3
 
@@ -274,7 +262,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Loading;->INSTANCE:Lcom/discord/stores/StoreMessageReactions$EmojiResults$Loading;
 
@@ -380,7 +368,7 @@
 
     const-string v0, "emoji.name"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
@@ -397,7 +385,7 @@
 
     const-string v1, "emoji.key"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p3, p4, v0}, Lcom/discord/stores/StoreMessageReactions;->ensureReactionResults(JLjava/lang/String;)Lcom/discord/stores/StoreMessageReactions$EmojiResults;
 
@@ -419,7 +407,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Failure;
 
@@ -469,7 +457,7 @@
 
     const-string v1, "emoji.key"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p3, p4, v0}, Lcom/discord/stores/StoreMessageReactions;->ensureReactionResults(JLjava/lang/String;)Lcom/discord/stores/StoreMessageReactions$EmojiResults;
 
@@ -527,7 +515,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
 
@@ -558,66 +546,61 @@
 
 # virtual methods
 .method public final deleteEmoji(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;J)V
-    .locals 11
+    .locals 10
 
-    move-object/from16 v0, p5
+    move-object v0, p5
 
-    const/4 v1, 0x0
+    const-string v1, "emoji"
 
-    if-eqz v0, :cond_0
+    invoke-static {p5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v2, p0
+    move-object v1, p0
 
-    invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessageReactions;->getReactionEmojiRequestParam(Lcom/discord/models/domain/ModelMessageReaction$Emoji;)Ljava/lang/String;
+    invoke-direct {p0, p5}, Lcom/discord/stores/StoreMessageReactions;->getReactionEmojiRequestParam(Lcom/discord/models/domain/ModelMessageReaction$Emoji;)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-wide v4, p1
+    move-wide v3, p1
 
-    move-wide v6, p3
+    move-wide v5, p3
 
-    move-wide/from16 v9, p6
+    move-wide/from16 v8, p6
 
-    invoke-virtual/range {v3 .. v10}, Lcom/discord/utilities/rest/RestAPI;->removeReaction(JJLjava/lang/String;J)Lrx/Observable;
+    invoke-virtual/range {v2 .. v9}, Lcom/discord/utilities/rest/RestAPI;->removeReaction(JJLjava/lang/String;J)Lrx/Observable;
 
     move-result-object v0
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    invoke-static {v0, v3, v4, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v4, 0x0
+
+    invoke-static {v0, v2, v3, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/stores/StoreMessageReactions$deleteEmoji$1;->INSTANCE:Lcom/discord/stores/StoreMessageReactions$deleteEmoji$1;
+    sget-object v2, Lcom/discord/stores/StoreMessageReactions$deleteEmoji$1;->INSTANCE:Lcom/discord/stores/StoreMessageReactions$deleteEmoji$1;
 
     sget-object v3, Lcom/discord/stores/StoreMessageReactions$deleteEmoji$2;->INSTANCE:Lcom/discord/stores/StoreMessageReactions$deleteEmoji$2;
 
-    invoke-virtual {v0, v1, v3}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+    invoke-virtual {v0, v2, v3}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    move-object v2, p0
-
-    const-string v0, "emoji"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final forceRetryFetchReactions(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)V
     .locals 9
 
-    if-eqz p5, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageReactions;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -638,15 +621,6 @@
     invoke-virtual {v0, v8}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getMessageReactions(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)Lrx/Observable;
@@ -662,7 +636,9 @@
         }
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageReactions;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -688,7 +664,7 @@
 
     invoke-direct {p2, p3, p4}, Lcom/discord/stores/StoreMessageReactions$getMessageReactions$2;-><init>(J)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -696,24 +672,15 @@
 
     invoke-direct {p2, p5}, Lcom/discord/stores/StoreMessageReactions$getMessageReactions$3;-><init>(Lcom/discord/models/domain/ModelMessageReaction$Emoji;)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "reactionsSubject\n       \u2026?: EmojiResults.Loading }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleConnectionOpen()V
@@ -744,111 +711,35 @@
 .end method
 
 .method public final handleReactionAdd(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
-    .locals 6
+    .locals 5
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "update"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreMessageReactions;->userStore:Lcom/discord/stores/StoreUser;
+    iget-object v0, p0, Lcom/discord/stores/StoreMessageReactions;->userStore:Lcom/discord/stores/StoreUser;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getUsersInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getUserId()J
-
-    move-result-wide v2
-
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/models/domain/ModelUser;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getMessageId()J
-
-    move-result-wide v2
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getEmoji()Lcom/discord/models/domain/ModelMessageReaction$Emoji;
-
-    move-result-object v4
-
-    const-string v5, "update.emoji"
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "update.emoji.key"
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, v2, v3, v4}, Lcom/discord/stores/StoreMessageReactions;->ensureReactionResults(JLjava/lang/String;)Lcom/discord/stores/StoreMessageReactions$EmojiResults;
-
-    move-result-object v2
-
-    instance-of v3, v2, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
-
-    if-nez v3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, v2
-
-    :goto_0
-    check-cast v0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->getUsers()Ljava/util/LinkedHashMap;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getUsersInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
 
     move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getUserId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p1
+    move-result-object v1
 
-    invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    const/4 p1, 0x1
+    move-result-object v0
 
-    iput-boolean p1, p0, Lcom/discord/stores/StoreMessageReactions;->isDirty:Z
+    check-cast v0, Lcom/discord/models/domain/ModelUser;
 
-    :cond_1
-    return-void
-
-    :cond_2
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final handleReactionRemove(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
-    .locals 5
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getMessageId()J
 
@@ -858,17 +749,17 @@
 
     move-result-object v3
 
-    const-string v4, "update.emoji"
+    const-string/jumbo v4, "update.emoji"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
 
     move-result-object v3
 
-    const-string v4, "update.emoji.key"
+    const-string/jumbo v4, "update.emoji.key"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1, v2, v3}, Lcom/discord/stores/StoreMessageReactions;->ensureReactionResults(JLjava/lang/String;)Lcom/discord/stores/StoreMessageReactions$EmojiResults;
 
@@ -878,12 +769,75 @@
 
     if-nez v2, :cond_0
 
-    goto :goto_0
+    const/4 v1, 0x0
 
     :cond_0
-    move-object v0, v1
+    check-cast v1, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
 
-    :goto_0
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;->getUsers()Ljava/util/LinkedHashMap;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getUserId()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lcom/discord/stores/StoreMessageReactions;->isDirty:Z
+
+    :cond_1
+    return-void
+.end method
+
+.method public final handleReactionRemove(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
+    .locals 4
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getMessageId()J
+
+    move-result-wide v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getEmoji()Lcom/discord/models/domain/ModelMessageReaction$Emoji;
+
+    move-result-object v2
+
+    const-string/jumbo v3, "update.emoji"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string/jumbo v3, "update.emoji.key"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, v0, v1, v2}, Lcom/discord/stores/StoreMessageReactions;->ensureReactionResults(JLjava/lang/String;)Lcom/discord/stores/StoreMessageReactions$EmojiResults;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
     check-cast v0, Lcom/discord/stores/StoreMessageReactions$EmojiResults$Users;
 
     if-eqz v0, :cond_1
@@ -908,13 +862,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleReactionRemoveAll(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
@@ -922,7 +869,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageReactions;->reactions:Ljava/util/Map;
 
@@ -941,15 +890,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreMessageReactions;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleReactionRemoveEmoji(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
@@ -957,7 +897,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Update;->getMessageId()J
 
@@ -967,9 +909,9 @@
 
     move-result-object p1
 
-    const-string v2, "update.emoji"
+    const-string/jumbo v2, "update.emoji"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
 
@@ -977,7 +919,7 @@
 
     const-string v2, "emojiKey"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreMessageReactions;->ensureReactionResults(JLjava/lang/String;)Lcom/discord/stores/StoreMessageReactions$EmojiResults;
 
@@ -1007,15 +949,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreMessageReactions;->isDirty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$State.smali b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
index 3f9934a556..38f72bbfca 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali
@@ -68,11 +68,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "visibleSpoilerNodeIndices"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "visibleSpoilerEmbedMap"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -81,20 +83,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerEmbedMap:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "visibleSpoilerEmbedMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "visibleSpoilerNodeIndices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/util/Set;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -104,14 +92,14 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     :cond_0
     and-int/lit8 p3, p3, 0x2
 
     if-eqz p3, :cond_1
 
-    sget-object p2, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p2, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_1
     invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreMessageState$State;-><init>(Ljava/util/Set;Ljava/util/Map;)V
@@ -197,31 +185,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "visibleSpoilerNodeIndices"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "visibleSpoilerEmbedMap"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMessageState$State;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreMessageState$State;-><init>(Ljava/util/Set;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "visibleSpoilerEmbedMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "visibleSpoilerNodeIndices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -239,7 +215,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -249,7 +225,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerEmbedMap:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
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
index 7ead4300e9..ab4c60f2e5 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageState.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessageState$State;",
         "Lcom/discord/stores/StoreMessageState$State;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -49,40 +49,35 @@
 .method public final invoke(Lcom/discord/stores/StoreMessageState$State;)Lcom/discord/stores/StoreMessageState$State;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "currentState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerNodeIndices()Ljava/util/Set;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-object v2, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoiler$1;
+    iget-object v1, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoiler$1;
 
-    iget v2, v2, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->$spoilerIndex:I
+    iget v1, v1, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->$spoilerIndex:I
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lf/n/a/k/a;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
+    invoke-static {v0, v1}, Lf/n/a/k/a;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
     const/4 v2, 0x2
 
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/stores/StoreMessageState$State;->copy$default(Lcom/discord/stores/StoreMessageState$State;Ljava/util/Set;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageState$State;
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/stores/StoreMessageState$State;->copy$default(Lcom/discord/stores/StoreMessageState$State;Ljava/util/Set;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageState$State;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "currentState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
index a011e23344..5d5e1c0192 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageState$revealSpoiler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageState.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali
index c606771971..4398796c24 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageState.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessageState$State;",
         "Lcom/discord/stores/StoreMessageState$State;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,48 +47,43 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessageState$State;)Lcom/discord/stores/StoreMessageState$State;
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "currentState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerEmbedMap()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-object v2, p0, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1;
+    iget-object v1, p0, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1;
 
-    iget v2, v2, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1;->$spoilerEmbedIndex:I
+    iget v1, v1, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1;->$spoilerEmbedIndex:I
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    sget-object v3, Lj0/i/p;->d:Lj0/i/p;
-
-    new-instance v4, Lkotlin/Pair;
-
-    invoke-direct {v4, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    invoke-static {v1, v4}, Lf/n/a/k/a;->plus(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    sget-object v2, Lk0/j/p;->d:Lk0/j/p;
 
-    invoke-static {p1, v0, v1, v2, v0}, Lcom/discord/stores/StoreMessageState$State;->copy$default(Lcom/discord/stores/StoreMessageState$State;Ljava/util/Set;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageState$State;
+    new-instance v3, Lkotlin/Pair;
+
+    invoke-direct {v3, v1, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    invoke-static {v0, v3}, Lf/n/a/k/a;->plus(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    invoke-static {p1, v2, v0, v1, v2}, Lcom/discord/stores/StoreMessageState$State;->copy$default(Lcom/discord/stores/StoreMessageState$State;Ljava/util/Set;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageState$State;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "currentState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali
index 970e4d2f15..607c99d2e6 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageState$revealSpoilerEmbed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageState.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1.smali
index 8c83bb47c8..edd1da29d8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageState.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessageState$State;",
         "Lcom/discord/stores/StoreMessageState$State;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,11 +47,37 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessageState$State;)Lcom/discord/stores/StoreMessageState$State;
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "currentState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerEmbedMap()Ljava/util/Map;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;
+
+    iget v1, v1, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;->$spoilerEmbedIndex:I
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
+
+    :goto_0
+    check-cast v0, Ljava/util/Set;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerEmbedMap()Ljava/util/Map;
 
@@ -65,62 +91,31 @@
 
     move-result-object v2
 
-    invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v1, Lj0/i/p;->d:Lj0/i/p;
-
-    :goto_0
-    check-cast v1, Ljava/util/Set;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerEmbedMap()Ljava/util/Map;
-
-    move-result-object v2
-
     iget-object v3, p0, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;
 
-    iget v3, v3, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;->$spoilerEmbedIndex:I
+    iget-object v3, v3, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;->$key:Ljava/lang/String;
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0, v3}, Lf/n/a/k/a;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
 
-    move-result-object v3
+    move-result-object v0
 
-    iget-object v4, p0, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;
+    new-instance v3, Lkotlin/Pair;
 
-    iget-object v4, v4, Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;->$key:Ljava/lang/String;
+    invoke-direct {v3, v2, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-static {v1, v4}, Lf/n/a/k/a;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v1, v3}, Lf/n/a/k/a;->plus(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v4, Lkotlin/Pair;
+    const/4 v1, 0x1
 
-    invoke-direct {v4, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 v2, 0x0
 
-    invoke-static {v2, v4}, Lf/n/a/k/a;->plus(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
-
-    move-result-object v1
-
-    const/4 v2, 0x1
-
-    invoke-static {p1, v0, v1, v2, v0}, Lcom/discord/stores/StoreMessageState$State;->copy$default(Lcom/discord/stores/StoreMessageState$State;Ljava/util/Set;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageState$State;
+    invoke-static {p1, v2, v0, v1, v2}, Lcom/discord/stores/StoreMessageState$State;->copy$default(Lcom/discord/stores/StoreMessageState$State;Ljava/util/Set;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageState$State;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "currentState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1.smali
index 8d4fbfee53..2971527dc8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoilerEmbedData$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessageState$revealSpoilerEmbedData$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessageState.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)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
index 608a102597..0148625cfe 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState.smali
@@ -31,13 +31,15 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessageState;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -45,20 +47,11 @@
 
     const-string v0, "BehaviorSubject.create(emptyMap())"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$updateState(Lcom/discord/stores/StoreMessageState;JLkotlin/jvm/functions/Function1;)V
@@ -121,7 +114,7 @@
 
     move-result-wide v4
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -149,7 +142,7 @@
     :cond_2
     iget-object p1, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lf/n/a/k/a;->minus(Ljava/util/Map;Ljava/lang/Iterable;)Ljava/util/Map;
 
@@ -218,7 +211,7 @@
 
     const-string v2, "messageStateMap"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -260,7 +253,7 @@
 
     const-string v1, "messageStateSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -272,7 +265,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject;
 
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -284,7 +277,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "messageDelete"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageDelete;->getMessageIds()Ljava/util/List;
 
@@ -292,20 +287,11 @@
 
     const-string v0, "messageDelete.messageIds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessageState;->resetState(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "messageDelete"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageUpdate(Lcom/discord/models/domain/ModelMessage;)V
@@ -313,7 +299,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
@@ -330,15 +318,6 @@
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessageState;->resetState(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final revealSpoiler(JI)V
@@ -382,7 +361,9 @@
 .method public final revealSpoilerEmbedData(JILjava/lang/String;)V
     .locals 8
 
-    if-eqz p4, :cond_1
+    const-string v0, "key"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-gez p3, :cond_0
 
@@ -408,13 +389,4 @@
     invoke-virtual {v0, v7}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
index eab87bd879..41dadd3a41 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing.smali
@@ -127,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing;->displayName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -137,7 +137,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing;->mimeType:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali
index 2584c46410..6e36fed16e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$MessageUploadState$Uploading.smali
@@ -38,22 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uploads"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessageUploads$MessageUploadState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;->uploads:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;
@@ -103,22 +98,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uploads"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +124,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;->uploads:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali
index 8e4a4be833..f107a8caea 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads$getUploadProgress$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessageUploads.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreMessageUploads$MessageUploadState;",
+        ">;",
+        "Lcom/discord/stores/StoreMessageUploads$MessageUploadState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessageUploads.smali b/com.discord/smali/com/discord/stores/StoreMessageUploads.smali
index 7db13a2ab2..b65019bda1 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageUploads.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageUploads.smali
@@ -70,7 +70,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreMessageUploads;->messageUploadSubscriptions:Ljava/util/HashMap;
 
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -135,11 +135,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "nonce"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "uploads"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Uploading;
 
@@ -148,20 +150,6 @@
     invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreMessageUploads;->updateState(Ljava/lang/String;Lcom/discord/stores/StoreMessageUploads$MessageUploadState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "nonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getUploadProgress(Ljava/lang/String;)Lrx/Observable;
@@ -177,7 +165,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "nonce"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageUploads;->uploadsSubject:Lrx/subjects/BehaviorSubject;
 
@@ -185,32 +175,25 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreMessageUploads$getUploadProgress$1;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v0, "uploadsSubject\n         \u2026MessageUploadState.None }"
+    const-string/jumbo v0, "uploadsSubject\n         \u2026MessageUploadState.None }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "nonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageCreate(Lcom/discord/models/domain/ModelMessage;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getNonce()Ljava/lang/String;
 
@@ -218,40 +201,28 @@
 
     if-eqz p1, :cond_0
 
+    const-string v0, "message.nonce ?: return"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessageUploads;->cleanupSubscription(Ljava/lang/String;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageCreateFailure(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "nonce"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessageUploads;->cleanupSubscription(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "nonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -288,7 +259,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "nonce"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreMessageUploads$MessageUploadState$Preprocessing;
 
@@ -297,13 +270,4 @@
     invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreMessageUploads;->updateState(Ljava/lang/String;Lcom/discord/stores/StoreMessageUploads$MessageUploadState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "nonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$Companion.smali b/com.discord/smali/com/discord/stores/StoreMessages$Companion.smali
index 6edc5708d8..af76b77162 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$Companion.smali
@@ -56,7 +56,7 @@
 
     const-string v0, "WorkManager.getInstance(\u2026dWorker.UNIQUE_WORK_NAME)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$deleteMessage$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$deleteMessage$1.smali
index 0743639aae..f7df8359cf 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$deleteMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$deleteMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$deleteMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     const-string v2, "nonce"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v0}, Lcom/discord/utilities/messagesend/MessageQueue;->cancel(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
index da6d35afcf..21fe99f04d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$get$1.smali
@@ -29,7 +29,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;>;"
     }
 .end annotation
 
@@ -100,7 +112,7 @@
 
     const-string v0, "isDetached"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -113,13 +125,13 @@
     :cond_0
     const-string p3, "messages"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p3, "localMessages"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, p2}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, p2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali
index 883ec330b1..66bd69d67b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$get$2.smali
@@ -3,7 +3,7 @@
 .source "StoreMessages.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;"
     }
 .end annotation
 
@@ -62,7 +67,7 @@
 
     const-string v0, "messages"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$1.smali
index c6d6ddf2be..866461cb27 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessages.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;>;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;>;"
     }
 .end annotation
 
@@ -94,7 +104,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$2.smali
index a059228546..b60cda6863 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$getLocalMessages$2.smali
@@ -68,25 +68,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/List;
-
-    check-cast p2, Ljava/util/List;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessages$getLocalMessages$2;->call(Ljava/util/List;Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/List;Ljava/util/List;)Z
+.method public final call(Ljava/util/List;Ljava/util/List;)Ljava/lang/Boolean;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -98,7 +80,8 @@
             "Ljava/util/List<",
             "+",
             "Lcom/discord/models/domain/ModelMessage;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -112,5 +95,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    check-cast p2, Ljava/util/List;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessages$getLocalMessages$2;->call(Ljava/util/List;Ljava/util/List;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$1.smali
index 76c2f06f86..388231acc0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessages.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;>;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;>;"
     }
 .end annotation
 
@@ -92,7 +100,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$2.smali
index eaa29f08a7..91f7792db8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$getSyncedMessages$2.smali
@@ -28,9 +28,11 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
         "Ljava/util/List<",
+        "+",
         "Lcom/discord/models/domain/ModelMessage;",
         ">;",
         "Ljava/util/List<",
+        "+",
         "Lcom/discord/models/domain/ModelMessage;",
         ">;",
         "Ljava/lang/Boolean;",
@@ -66,44 +68,23 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/util/List;Ljava/util/List;)Ljava/lang/Boolean;
     .locals 0
-
-    check-cast p1, Ljava/util/List;
-
-    check-cast p2, Ljava/util/List;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessages$getSyncedMessages$2;->call(Ljava/util/List;Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/List;Ljava/util/List;)Z
-    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
+            "+",
             "Lcom/discord/models/domain/ModelMessage;",
             ">;",
             "Ljava/util/List<",
+            "+",
             "Lcom/discord/models/domain/ModelMessage;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
     if-ne p1, p2, :cond_0
 
     const/4 p1, 0x1
@@ -114,19 +95,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    :cond_1
-    const-string p1, "messages2"
+    move-result-object p1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "messages1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    check-cast p2, Ljava/util/List;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessages$getSyncedMessages$2;->call(Ljava/util/List;Ljava/util/List;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali
index d60a6efc92..84f2e3f869 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$isDetached$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessages.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -47,30 +52,15 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Set;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages$isDetached$1;->call(Ljava/util/Set;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Set;)Z
+.method public final call(Ljava/util/Set;)Ljava/lang/Boolean;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/Set<",
             "Ljava/lang/Long;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -84,5 +74,21 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Set;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages$isDetached$1;->call(Ljava/util/Set;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$1.smali
index 9b2972cf4a..47c6e2591d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$resendAllLocalMessages$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$2.smali
index c788b7f415..d885772224 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$resendAllLocalMessages$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$resendAllLocalMessages$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/messagesend/MessageResult;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$resendMessage$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$resendMessage$1.smali
index b68fd47f71..9d6d63b6a0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$resendMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$resendMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$resendMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
index e86d969e99..9c854eba3e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     const-string v2, "invalidAttachmentsMessage"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreMessages;->access$handleLocalMessageCreate(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
index 57c93732c8..ea75434c1f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Lcom/discord/utilities/messagesend/MessageResult;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +80,9 @@
 
     sget-object v0, Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;->INSTANCE:Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali
index e717d0a96d..491fb63126 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     const-string v2, "localMessage"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreMessages;->access$handleLocalMessageCreate(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali
index d30bd6692d..a9394d1e7b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,7 +64,9 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    const-string v1, "context"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroidx/work/OneTimeWorkRequest$Builder;
 
@@ -108,7 +110,7 @@
 
     const-string v2, "OneTimeWorkRequestBuilde\u2026     )\n          .build()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Landroidx/work/OneTimeWorkRequest;
 
@@ -123,13 +125,4 @@
     invoke-virtual {v0, v3, v2, v1}, Landroidx/work/WorkManager;->enqueueUniqueWork(Ljava/lang/String;Landroidx/work/ExistingWorkPolicy;Landroidx/work/OneTimeWorkRequest;)Landroidx/work/Operation;
 
     return-void
-
-    :cond_0
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$5.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$5.smali
index 04feac3f54..47f1d25180 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$5.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Lcom/discord/utilities/messagesend/MessageResult;",
+        ">;>;"
     }
 .end annotation
 
@@ -87,7 +88,7 @@
 
     const-string v2, "emitter"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
index b6839e26ae..679b6170c1 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -147,7 +147,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getNumRetries()Ljava/lang/Integer;
 
@@ -167,7 +167,7 @@
     :goto_0
     const-string v1, "localMessage.numRetries ?: 0"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -183,7 +183,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/stores/FailedMessageResolutionType;->RESENT:Lcom/discord/stores/FailedMessageResolutionType;
 
@@ -208,7 +208,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0, v4, v3, v4}, Lcom/discord/stores/StoreMessages;->handleSendMessageFailure$default(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;ILjava/lang/Object;)V
 
@@ -232,7 +232,7 @@
 
     iget-object v1, v1, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
@@ -270,7 +270,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0}, Lcom/discord/stores/StoreMessages;->access$handleLocalMessageDelete(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
 
@@ -293,7 +293,7 @@
 
     const-string v1, "result.error.response"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -311,7 +311,7 @@
 
     iget-object v1, v1, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;->this$0:Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;
 
@@ -332,7 +332,7 @@
     goto :goto_1
 
     :cond_6
-    const v0, 0x7f120f56
+    const v0, 0x7f120f80
 
     :goto_1
     invoke-virtual {v2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -386,7 +386,7 @@
 
     iget-object v0, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0, v4, v3, v4}, Lcom/discord/stores/StoreMessages;->handleSendMessageFailure$default(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;ILjava/lang/Object;)V
 
@@ -398,13 +398,13 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;->$result:Lcom/discord/utilities/messagesend/MessageResult;
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;->this$0:Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;
 
     iget-object v0, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;->$emitter:Lrx/Emitter;
 
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1.smali
index c07ed133d4..3f4365982d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/utilities/messagesend/MessageResult;",
         "Ljava/lang/Boolean;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
 .method public final invoke(Lcom/discord/utilities/messagesend/MessageResult;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "result"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;->this$0:Lcom/discord/stores/StoreMessages$sendMessage$request$1;
 
@@ -89,13 +91,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2$1.smali
index 282c66f8fd..7b0a9a346a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$request$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -92,17 +92,17 @@
 
     const-string v2, "localMessage"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getNonce()Ljava/lang/String;
 
     move-result-object v1
 
-    if-eqz v1, :cond_0
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v2, "localMessage.nonce!!"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2$1;->$numFiles:I
 
@@ -113,11 +113,4 @@
     invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreMessageUploads;->onPreprocessing(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali
index 33156b585b..3aa025298c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$request$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "<name for destructuring parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;->component1()I
 
@@ -90,13 +92,4 @@
     invoke-virtual {v2, v3}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<name for destructuring parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3$1.smali
index 9c8f073f01..361491fa8c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$request$1$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -84,28 +84,21 @@
 
     const-string v2, "localMessage"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getNonce()Ljava/lang/String;
 
     move-result-object v1
 
-    if-eqz v1, :cond_0
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v2, "localMessage.nonce!!"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3$1;->$uploads:Ljava/util/List;
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreMessageUploads;->bindUpload(Ljava/lang/String;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali
index d8d7040b73..d570d9e58f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uploads"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;->this$0:Lcom/discord/stores/StoreMessages$sendMessage$request$1;
 
@@ -89,13 +91,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
index 1d69e158af..26cf3070b8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessages$sendMessage$request$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Emitter<",
         "Lcom/discord/utilities/messagesend/MessageResult;",
@@ -57,7 +57,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,54 +76,47 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emitter"
 
-    new-instance v9, Lcom/discord/utilities/messagesend/MessageRequest$Send;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
+    new-instance v0, Lcom/discord/utilities/messagesend/MessageRequest$Send;
 
-    const-string v0, "localMessage"
+    iget-object v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "localMessage"
 
-    iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$validAttachments:Lkotlin/jvm/internal/Ref$ObjectRef;
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$validAttachments:Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    move-object v3, v0
+    iget-object v1, v1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v3, Ljava/util/List;
+    move-object v4, v1
 
-    iget-object v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$activity:Lcom/discord/models/domain/activity/ModelActivity;
+    check-cast v4, Ljava/util/List;
 
-    iget-wide v7, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$attemptTimestamp:J
+    iget-object v3, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$activity:Lcom/discord/models/domain/activity/ModelActivity;
 
-    new-instance v4, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;
+    iget-wide v8, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$attemptTimestamp:J
 
-    invoke-direct {v4, p0, p1}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;-><init>(Lcom/discord/stores/StoreMessages$sendMessage$request$1;Lrx/Emitter;)V
+    new-instance v5, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;
 
-    new-instance v5, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2;
+    invoke-direct {v5, p0, p1}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1;-><init>(Lcom/discord/stores/StoreMessages$sendMessage$request$1;Lrx/Emitter;)V
 
-    invoke-direct {v5, p0}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2;-><init>(Lcom/discord/stores/StoreMessages$sendMessage$request$1;)V
+    new-instance v6, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2;
 
-    new-instance v6, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;
+    invoke-direct {v6, p0}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$2;-><init>(Lcom/discord/stores/StoreMessages$sendMessage$request$1;)V
 
-    invoke-direct {v6, p0}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;-><init>(Lcom/discord/stores/StoreMessages$sendMessage$request$1;)V
+    new-instance v7, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;
 
-    move-object v0, v9
+    invoke-direct {v7, p0}, Lcom/discord/stores/StoreMessages$sendMessage$request$1$3;-><init>(Lcom/discord/stores/StoreMessages$sendMessage$request$1;)V
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/utilities/messagesend/MessageRequest$Send;-><init>(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;J)V
+    move-object v1, v0
 
-    return-object v9
+    invoke-direct/range {v1 .. v9}, Lcom/discord/utilities/messagesend/MessageRequest$Send;-><init>(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;J)V
 
-    :cond_0
-    const-string p1, "emitter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages.smali b/com.discord/smali/com/discord/stores/StoreMessages.smali
index 2b39338a2b..2764cc0499 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages.smali
@@ -72,13 +72,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -121,27 +125,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreMessages;->initResendFinished:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getContext$p(Lcom/discord/stores/StoreMessages;)Landroid/content/Context;
@@ -156,7 +139,7 @@
     :cond_0
     const-string p0, "context"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -267,13 +250,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMessages$getLocalMessages$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "localMessagesHolder\n    \u2026annelId] ?: emptyList() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -287,7 +270,7 @@
 
     const-string p2, "localMessagesHolder\n    \u2026messages1 === messages2 }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -327,13 +310,13 @@
 
     const-string v2, "context.contentResolver"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/stores/StoreMessages;->queueExecutor:Ljava/util/concurrent/ExecutorService;
 
     const-string v3, "queueExecutor"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
 
@@ -368,7 +351,7 @@
     :try_start_1
     const-string p1, "context"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -406,13 +389,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMessages$getSyncedMessages$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "holder\n          .messag\u2026annelId] ?: emptyList() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -426,7 +409,7 @@
 
     const-string p2, "holder\n          .messag\u2026messages1 === messages2 }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -546,7 +529,7 @@
 
     const-string v3, "nonce"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v1}, Lcom/discord/stores/StoreMessageUploads;->handleMessageCreateFailure(Ljava/lang/String;)V
 
@@ -859,13 +842,13 @@
 
     move-result-object v0
 
-    sget-object v1, Lr0/l/a/a1$a;->a:Lr0/l/a/a1;
+    sget-object v1, Ls0/l/a/a1$a;->a:Ls0/l/a/a1;
 
-    new-instance v2, Lr0/l/a/u;
+    new-instance v2, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v2, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v2, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -873,7 +856,7 @@
 
     const-string v0, "Observable\n        .mergeDelayError(observables)"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v4, Lcom/discord/stores/StoreMessages;
 
@@ -1065,7 +1048,7 @@
 
     check-cast v9, Lcom/discord/models/messages/LocalAttachment;
 
-    invoke-static {v9, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v10, v0, Lcom/discord/stores/StoreMessages;->context:Landroid/content/Context;
 
@@ -1075,7 +1058,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v9, v10}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->isImageAttachment(Lcom/discord/models/messages/LocalAttachment;Landroid/content/ContentResolver;)Z
 
@@ -1088,7 +1071,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
@@ -1136,7 +1119,7 @@
 
     check-cast v9, Lcom/discord/models/messages/LocalAttachment;
 
-    invoke-static {v9, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v10, v0, Lcom/discord/stores/StoreMessages;->context:Landroid/content/Context;
 
@@ -1146,7 +1129,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v9, v10}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->isVideoAttachment(Lcom/discord/models/messages/LocalAttachment;Landroid/content/ContentResolver;)Z
 
@@ -1159,7 +1142,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
@@ -1215,7 +1198,7 @@
 
     const-string v9, "Uri.parse(localAttachment.uriString)"
 
-    invoke-static {v7, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v9, v0, Lcom/discord/stores/StoreMessages;->context:Landroid/content/Context;
 
@@ -1225,7 +1208,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v7, v9}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeBytes(Landroid/net/Uri;Landroid/content/ContentResolver;)J
 
@@ -1240,7 +1223,7 @@
     goto :goto_4
 
     :cond_a
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
@@ -1250,7 +1233,7 @@
     :cond_c
     if-eqz v6, :cond_d
 
-    invoke-static {v6}, Lj0/i/l;->max(Ljava/lang/Iterable;)Ljava/lang/Comparable;
+    invoke-static {v6}, Lk0/j/l;->max(Ljava/lang/Iterable;)Ljava/lang/Comparable;
 
     move-result-object v2
 
@@ -1274,7 +1257,7 @@
     :goto_5
     if-eqz v6, :cond_e
 
-    invoke-static {v6}, Lj0/i/l;->sumOfLong(Ljava/lang/Iterable;)J
+    invoke-static {v6}, Lk0/j/l;->sumOfLong(Ljava/lang/Iterable;)J
 
     move-result-wide v2
 
@@ -1326,6 +1309,10 @@
     move-result-object v2
 
     :goto_8
+    const-string v3, "localMessage.initialAttemptTimestamp ?: 0L"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v16
@@ -1344,6 +1331,10 @@
     move-result-object v2
 
     :goto_9
+    const-string v3, "localMessage.numRetries ?: 0"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
     move-result v18
@@ -1362,9 +1353,11 @@
 
 # virtual methods
 .method public final cancelMessageSend(JLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "requestId"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreMessages;->getMessageQueue(J)Lcom/discord/utilities/messagesend/MessageQueue;
 
@@ -1373,15 +1366,6 @@
     invoke-virtual {p1, p3}, Lcom/discord/utilities/messagesend/MessageQueue;->cancel(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "requestId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final deleteMessage(Lcom/discord/models/domain/ModelMessage;)V
@@ -1404,7 +1388,7 @@
 
     move-result v4
 
-    if-nez v4, :cond_2
+    if-nez v4, :cond_1
 
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -1420,7 +1404,7 @@
 
     const/4 v1, 0x1
 
-    invoke-static {v0, v1}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v0, v1}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -1428,21 +1412,31 @@
 
     move-result-object v1
 
-    sget-object v5, Lf/a/b/d0;->d:Lf/a/b/d0;
+    const-string v3, "deleteMessage"
 
-    const/4 v6, 0x0
+    const-string p1, "err"
 
-    if-eqz v5, :cond_1
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v5, Lf/a/b/f0;->d:Lf/a/b/f0;
 
     const/4 v4, 0x0
 
+    const/4 v6, 0x0
+
+    const-string p1, "onNext"
+
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "errorTag"
+
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string p1, "observable"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v7, Lf/a/b/b0;->d:Lf/a/b/b0;
-
-    const-string v3, "deleteMessage"
+    sget-object v7, Lf/a/b/d0;->d:Lf/a/b/d0;
 
     move-object v2, v4
 
@@ -1451,15 +1445,6 @@
     goto :goto_0
 
     :cond_1
-    const-string p1, "onNext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_2
     iget-object v0, p0, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     new-instance v1, Lcom/discord/stores/StoreMessages$deleteMessage$1;
@@ -1475,7 +1460,9 @@
 .method public final editMessage(JJLjava/lang/String;)V
     .locals 10
 
-    if-eqz p5, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p3, p4}, Lcom/discord/stores/StoreMessages;->getMessageQueue(J)Lcom/discord/utilities/messagesend/MessageQueue;
 
@@ -1502,15 +1489,6 @@
     invoke-virtual {v0, v9}, Lcom/discord/utilities/messagesend/MessageQueue;->enqueue(Lcom/discord/utilities/messagesend/MessageRequest;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final get(J)Lrx/Observable;
@@ -1557,7 +1535,7 @@
 
     const-string p2, "Observable.combineLatest\u2026s + localMessages\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -1589,7 +1567,7 @@
 
     invoke-direct {p2, p3, p4}, Lcom/discord/stores/StoreMessages$get$2;-><init>(J)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1599,7 +1577,7 @@
 
     const-string p2, "get(channelId)\n         \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1624,7 +1602,7 @@
 
     const-string v1, "holder\n          .detachedChannelSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1663,7 +1641,7 @@
 
     const-string v0, "messageQueues.values"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1694,7 +1672,9 @@
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages;->holder:Lcom/discord/stores/StoreMessagesHolder;
 
@@ -1704,7 +1684,7 @@
 
     const-string v1, "payload.me"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -1713,15 +1693,6 @@
     invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreMessagesHolder;->setMyUserId(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageCreate(Ljava/util/List;)V
@@ -1736,7 +1707,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "messagesList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1778,21 +1751,14 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesHolder;->addMessages(Ljava/util/List;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "messagesList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "messageDelete"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageDelete;->getChannelId()J
 
@@ -1804,47 +1770,33 @@
 
     const-string v2, "messageDelete.messageIds"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreMessages;->handleMessageDelete(JLjava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "messageDelete"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageUpdate(Lcom/discord/models/domain/ModelMessage;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages;->holder:Lcom/discord/stores/StoreMessagesHolder;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesHolder;->updateMessages(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessagesLoaded(Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "chunk"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages;->holder:Lcom/discord/stores/StoreMessagesHolder;
 
@@ -1855,15 +1807,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesHolder;->loadMessageChunks(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "chunk"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePreLogout()V
@@ -1888,72 +1831,51 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "updates"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages;->holder:Lcom/discord/stores/StoreMessagesHolder;
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreMessagesHolder;->updateReactions(Ljava/util/List;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "updates"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleReactionsRemoveAll(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages;->holder:Lcom/discord/stores/StoreMessagesHolder;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesHolder;->removeAllReactions(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleReactionsRemoveEmoji(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessages;->holder:Lcom/discord/stores/StoreMessagesHolder;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesHolder;->removeEmojiReactions(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public init(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -1961,15 +1883,17 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreMessages;->holder:Lcom/discord/stores/StoreMessagesHolder;
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p1, v1}, Lcom/discord/stores/StoreMessagesHolder;->init(Z)V
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreMessagesHolder;->init(Z)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreMessages;->localMessagesHolder:Lcom/discord/stores/StoreLocalMessagesHolder;
 
+    const/4 v1, 0x0
+
     const/4 v2, 0x0
 
-    invoke-static {p1, v2, v1, v0}, Lcom/discord/stores/StoreLocalMessagesHolder;->init$default(Lcom/discord/stores/StoreLocalMessagesHolder;ZILjava/lang/Object;)V
+    invoke-static {p1, v1, v0, v2}, Lcom/discord/stores/StoreLocalMessagesHolder;->init$default(Lcom/discord/stores/StoreLocalMessagesHolder;ZILjava/lang/Object;)V
 
     sget-object p1, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->Companion:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;
 
@@ -1988,13 +1912,6 @@
     invoke-direct {p0}, Lcom/discord/stores/StoreMessages;->resendAllLocalMessages()V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final isDetached(J)Lrx/Observable;
@@ -2016,7 +1933,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMessages$isDetached$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2026,7 +1943,7 @@
 
     const-string p2, "allDetached\n          .m\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -2046,7 +1963,7 @@
 
     const-string v1, "initResendFinished"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -2070,30 +1987,30 @@
 
     move/from16 v1, p2
 
-    const/4 v2, 0x0
+    const-string v2, "message"
 
-    if-eqz v0, :cond_7
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v1, :cond_0
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
 
-    move-result v3
+    move-result v2
 
-    const/4 v4, -0x1
+    const/4 v3, -0x1
 
-    if-ne v3, v4, :cond_1
+    if-ne v2, v3, :cond_1
 
     :cond_0
     if-nez v1, :cond_2
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
 
-    move-result v3
+    move-result v2
 
-    const/4 v4, -0x2
+    const/4 v3, -0x2
 
-    if-ne v3, v4, :cond_1
+    if-ne v2, v3, :cond_1
 
     goto :goto_0
 
@@ -2130,88 +2047,90 @@
 
     :cond_2
     :goto_0
-    iget-object v3, v15, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v2, v15, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    new-instance v4, Lcom/discord/stores/StoreMessages$resendMessage$1;
+    new-instance v3, Lcom/discord/stores/StoreMessages$resendMessage$1;
 
-    invoke-direct {v4, v15, v0}, Lcom/discord/stores/StoreMessages$resendMessage$1;-><init>(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+    invoke-direct {v3, v15, v0}, Lcom/discord/stores/StoreMessages$resendMessage$1;-><init>(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
 
-    invoke-virtual {v3, v4}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v2, v3}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getNumRetries()Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_3
+    if-eqz v2, :cond_3
 
     goto :goto_1
 
     :cond_3
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
     :goto_1
-    const-string v4, "message.numRetries ?: 0"
+    const-string v3, "message.numRetries ?: 0"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v6
+    move-result-object v5
 
-    const-string v7, "message.author"
+    const-string v6, "message.author"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v6
 
-    const-string v8, "message.content"
+    const-string v7, "message.content"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List;
 
-    move-result-object v8
+    move-result-object v7
 
-    iget-object v9, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
+    iget-object v8, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
 
-    if-eqz v9, :cond_4
+    const/4 v9, 0x0
+
+    if-eqz v8, :cond_4
 
     new-instance v10, Ljava/util/ArrayList;
 
     const/16 v11, 0xa
 
-    invoke-static {v9, v11}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v8, v11}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
     move-result v11
 
     invoke-direct {v10, v11}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v9}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v8}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v9
+    move-result-object v8
 
     :goto_2
-    invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v8}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v11
 
     if-eqz v11, :cond_5
 
-    invoke-interface {v9}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v8}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v11
 
@@ -2233,7 +2152,7 @@
 
     const-string v14, "contentUri"
 
-    invoke-static {v12, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v12, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v11}, Lcom/discord/models/messages/LocalAttachment;->getDisplayName()Ljava/lang/String;
 
@@ -2252,10 +2171,10 @@
     goto :goto_2
 
     :cond_4
-    move-object v10, v2
+    move-object v10, v9
 
     :cond_5
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     const/4 v11, 0x0
 
@@ -2272,16 +2191,16 @@
     goto :goto_3
 
     :cond_6
-    move-object v13, v2
+    move-object v13, v9
 
     :goto_3
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getInitialAttemptTimestamp()Ljava/lang/Long;
 
     move-result-object v14
 
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v16
 
@@ -2291,17 +2210,17 @@
 
     move-object/from16 v0, p0
 
-    move-wide v1, v4
+    move-wide v1, v3
 
-    move-object v3, v6
+    move-object v3, v5
 
-    move-object v4, v7
+    move-object v4, v6
 
-    move-object v5, v8
+    move-object v5, v7
 
     move-object v6, v10
 
-    move-object v7, v9
+    move-object v7, v8
 
     move-object v8, v11
 
@@ -2322,17 +2241,10 @@
     move-result-object v0
 
     return-object v0
-
-    :cond_7
-    const-string v0, "message"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public final sendMessage(JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)Lrx/Observable;
-    .locals 25
+    .locals 24
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -2371,17 +2283,19 @@
 
     sget-object v4, Lrx/Emitter$BackpressureMode;->e:Lrx/Emitter$BackpressureMode;
 
-    const/4 v3, 0x0
+    const-string v3, "author"
 
-    if-eqz v0, :cond_11
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_10
+    const-string v3, "content"
 
-    new-instance v15, Lkotlin/jvm/internal/Ref$ObjectRef;
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v15}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+    new-instance v3, Lkotlin/jvm/internal/Ref$ObjectRef;
 
-    iput-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    invoke-direct {v3}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    iput-object v2, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     sget-object v8, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->Companion:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;
 
@@ -2393,13 +2307,15 @@
 
     move-result v8
 
-    const-string v14, "Observable.create({ emit\u2026r.BackpressureMode.ERROR)"
+    const-string v15, "Observable.create({ emit\u2026r.BackpressureMode.ERROR)"
 
     const/16 v9, 0xa
 
     const/4 v10, 0x0
 
-    const/4 v11, 0x1
+    const/4 v11, 0x0
+
+    const/4 v12, 0x1
 
     if-eqz v8, :cond_8
 
@@ -2427,11 +2343,11 @@
 
     sget-object v8, Lcom/discord/utilities/rest/ProcessedMessageContent;->Companion:Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;
 
-    iget-object v12, v7, Lcom/discord/stores/StoreMessages;->context:Landroid/content/Context;
+    iget-object v13, v7, Lcom/discord/stores/StoreMessages;->context:Landroid/content/Context;
 
-    if-eqz v12, :cond_7
+    if-eqz v13, :cond_7
 
-    invoke-virtual {v8, v2, v1, v12}, Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;->fromAttachments(Ljava/util/List;Ljava/lang/String;Landroid/content/Context;)Lcom/discord/utilities/rest/ProcessedMessageContent;
+    invoke-virtual {v8, v2, v1, v13}, Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;->fromAttachments(Ljava/util/List;Ljava/lang/String;Landroid/content/Context;)Lcom/discord/utilities/rest/ProcessedMessageContent;
 
     move-result-object v1
 
@@ -2443,19 +2359,19 @@
 
     move-result v8
 
-    xor-int/2addr v8, v11
+    xor-int/2addr v8, v12
 
     if-eqz v8, :cond_3
 
     iget-object v8, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
 
-    new-instance v12, Ljava/util/ArrayList;
+    new-instance v13, Ljava/util/ArrayList;
 
     invoke-static {v2, v9}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v13
+    move-result v14
 
-    invoke-direct {v12, v13}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v13, v14}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -2464,49 +2380,49 @@
     :goto_2
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v13
+    move-result v14
 
-    if-eqz v13, :cond_2
+    if-eqz v14, :cond_2
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v13
+    move-result-object v14
 
-    check-cast v13, Lcom/lytefast/flexinput/model/Attachment;
+    check-cast v14, Lcom/lytefast/flexinput/model/Attachment;
 
-    invoke-static {v13}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
+    invoke-static {v14}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
 
-    move-result-object v13
+    move-result-object v14
 
-    invoke-interface {v12, v13}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v13, v14}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
     :cond_2
-    invoke-static {v5, v6, v0, v8, v12}, Lcom/discord/models/domain/ModelMessage;->createInvalidAttachmentsMessage(JLcom/discord/models/domain/ModelUser;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
+    invoke-static {v5, v6, v0, v8, v13}, Lcom/discord/models/domain/ModelMessage;->createInvalidAttachmentsMessage(JLcom/discord/models/domain/ModelUser;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
 
     move-result-object v2
 
     iget-object v8, v7, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    new-instance v12, Lcom/discord/stores/StoreMessages$sendMessage$1;
+    new-instance v13, Lcom/discord/stores/StoreMessages$sendMessage$1;
 
-    invoke-direct {v12, v7, v2}, Lcom/discord/stores/StoreMessages$sendMessage$1;-><init>(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+    invoke-direct {v13, v7, v2}, Lcom/discord/stores/StoreMessages$sendMessage$1;-><init>(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
 
-    invoke-virtual {v8, v12}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v8, v13}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     :cond_3
     invoke-virtual {v1}, Lcom/discord/utilities/rest/ProcessedMessageContent;->getValidAttachments()Ljava/util/List;
 
     move-result-object v2
 
-    iput-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v2, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     invoke-virtual {v1}, Lcom/discord/utilities/rest/ProcessedMessageContent;->getContent()Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v2, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v2, Ljava/util/List;
 
@@ -2554,16 +2470,16 @@
 
     move-result-object v0
 
-    invoke-static {v0, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
     :cond_7
     const-string v0, "context"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v3
+    throw v10
 
     :cond_8
     move-object v8, v1
@@ -2588,7 +2504,7 @@
 
     const/4 v13, 0x0
 
-    iget-object v1, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v1, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     check-cast v1, Ljava/util/List;
 
@@ -2612,51 +2528,51 @@
     const/4 v1, 0x1
 
     :goto_8
-    xor-int/2addr v1, v11
+    xor-int/lit8 v14, v1, 0x1
 
-    iget-object v2, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
 
-    iget-object v11, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v2, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v11, Ljava/util/List;
+    check-cast v2, Ljava/util/List;
 
-    if-eqz v11, :cond_c
+    if-eqz v2, :cond_c
 
-    new-instance v3, Ljava/util/ArrayList;
+    new-instance v10, Ljava/util/ArrayList;
 
-    invoke-static {v11, v9}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v2, v9}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
     move-result v9
 
-    invoke-direct {v3, v9}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v10, v9}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v11}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :goto_9
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_c
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v9
 
-    :goto_9
-    invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
+    check-cast v9, Lcom/lytefast/flexinput/model/Attachment;
 
-    move-result v11
+    invoke-static {v9}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
 
-    if-eqz v11, :cond_c
+    move-result-object v9
 
-    invoke-interface {v9}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v11
-
-    check-cast v11, Lcom/lytefast/flexinput/model/Attachment;
-
-    invoke-static {v11}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
-
-    move-result-object v11
-
-    invoke-interface {v3, v11}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v10, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_9
 
     :cond_c
-    move-object/from16 v18, v3
+    move-object/from16 v18, v10
 
     invoke-static/range {v22 .. v23}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -2664,59 +2580,52 @@
 
     if-eqz p11, :cond_d
 
-    move-object/from16 v20, p11
+    invoke-virtual/range {p11 .. p11}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v9
 
     goto :goto_a
 
     :cond_d
-    iget-object v3, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-interface {v3}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+    invoke-interface {v2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v11
-
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v3
-
-    move-object/from16 v20, v3
+    move-result-wide v9
 
     :goto_a
+    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v20
+
     if-eqz p12, :cond_e
 
-    move-object/from16 v21, p12
+    invoke-virtual/range {p12 .. p12}, Ljava/lang/Integer;->intValue()I
 
-    goto :goto_b
+    move-result v11
 
     :cond_e
-    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v21
 
-    move-object/from16 v21, v3
-
-    :goto_b
     move-wide/from16 v9, p1
 
     move-object/from16 v11, p3
 
     move-object/from16 v12, p5
 
-    move-object v3, v14
-
-    move v14, v1
-
-    move-object/from16 v24, v15
+    move-object v2, v15
 
     move-object/from16 v15, p7
 
     move-object/from16 v16, p9
 
-    move-object/from16 v17, v2
+    move-object/from16 v17, v1
 
     invoke-static/range {v8 .. v21}, Lcom/discord/models/domain/ModelMessage;->createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;Ljava/util/List;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)Lcom/discord/models/domain/ModelMessage;
 
-    move-result-object v2
+    move-result-object v8
 
     if-nez p9, :cond_f
 
@@ -2724,7 +2633,7 @@
 
     new-instance v1, Lcom/discord/stores/StoreMessages$sendMessage$3;
 
-    invoke-direct {v1, v7, v2}, Lcom/discord/stores/StoreMessages$sendMessage$3;-><init>(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+    invoke-direct {v1, v7, v8}, Lcom/discord/stores/StoreMessages$sendMessage$3;-><init>(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
@@ -2737,17 +2646,17 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
-    new-instance v8, Lcom/discord/stores/StoreMessages$sendMessage$request$1;
+    new-instance v9, Lcom/discord/stores/StoreMessages$sendMessage$request$1;
 
-    move-object v0, v8
+    move-object v0, v9
 
     move-object/from16 v1, p0
 
-    move-object v9, v3
+    move-object v10, v2
 
-    move-object/from16 v3, v24
+    move-object v2, v8
 
-    move-object v10, v4
+    move-object v8, v4
 
     move-object/from16 v4, p8
 
@@ -2759,27 +2668,13 @@
 
     new-instance v0, Lcom/discord/stores/StoreMessages$sendMessage$5;
 
-    invoke-direct {v0, v7, v11, v12, v8}, Lcom/discord/stores/StoreMessages$sendMessage$5;-><init>(Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, v7, v11, v12, v9}, Lcom/discord/stores/StoreMessages$sendMessage$5;-><init>(Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
 
-    invoke-static {v0, v10}, Lrx/Observable;->n(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
+    invoke-static {v0, v8}, Lrx/Observable;->n(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_10
-    const-string v0, "content"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_11
-    const-string v0, "author"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
index a0a22e08e0..cfa1f857ec 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
@@ -629,9 +629,9 @@
     :cond_2
     const/4 v1, 0x0
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -816,7 +816,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessagesHolder;->messagesPublisher:Lrx/subjects/Subject;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreMessagesHolder;->messageCacheTryPersist()V
 
@@ -1052,7 +1052,7 @@
 
     invoke-direct {p2, p3}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     goto :goto_4
 
@@ -1077,7 +1077,7 @@
 
     invoke-direct {p2, p3}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_9
     :goto_4
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
index 7d5d153190..5d6b0cbe0c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$ChannelChunk.smali
@@ -38,7 +38,7 @@
 
 # direct methods
 .method public constructor <init>(JLjava/util/List;ZZZZ)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -49,7 +49,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "messages"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,15 +68,6 @@
     iput-boolean p7, p0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->isJump:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "messages"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;JLjava/util/List;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;
@@ -244,36 +237,29 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
-
-    new-instance v8, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;
-
-    move-object v0, v8
-
-    move-wide v1, p1
-
-    move-object v3, p3
-
-    move v4, p4
-
-    move v5, p5
-
-    move v6, p6
-
-    move/from16 v7, p7
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;-><init>(JLjava/util/List;ZZZZ)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "messages"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v4, p3
 
-    const/4 v0, 0x0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move v5, p4
+
+    move v6, p5
+
+    move v7, p6
+
+    move/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;-><init>(JLjava/util/List;ZZZZ)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -299,7 +285,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->messages:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali
index 5e9716f062..d72b5f8cfd 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessagesLoader.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
+        ">;",
+        "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali
index 03438c5f60..8c187d00a5 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$getScrollTo$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessagesLoader.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$getScrollTo$1;->call(Ljava/lang/Long;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Long;)Z
+.method public final call(Ljava/lang/Long;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -88,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$getScrollTo$1;->call(Ljava/lang/Long;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali
index e946b29ed8..2fbbabb066 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChannelSelected$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$handleChannelSelected$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x7
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x7
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali
index 229e5d2d08..75e998c9ad 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,42 +47,35 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader$handleChatInteraction$1$1;->$this_apply:Lcom/discord/stores/StoreChat$InteractionState;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreChat$InteractionState;->isTouchedSinceLastJump()Z
 
-    move-result v4
+    move-result v5
 
-    const/4 v5, 0x7
+    const/4 v2, 0x0
 
-    const/4 v6, 0x0
+    const/4 v3, 0x0
 
-    move-object v0, p1
+    const/4 v4, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    const/4 v6, 0x7
+
+    const/4 v7, 0x0
+
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali
index fefcdb8c76..7101c4322f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$handleLoadMessagesError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xb
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xb
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali
index 48fd59ae27..4247f46dea 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$handleLoadedMessages$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,7 +57,9 @@
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
     .locals 8
 
-    if-eqz p1, :cond_3
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/stores/StoreMessagesLoader$handleLoadedMessages$1;->$isInitial:Z
 
@@ -116,15 +118,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_3
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali
index da13b6ab14..2f11552284 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMessagesLoader$init$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreChat$InteractionState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMessagesLoader;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreMessagesLoader;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleChatInteraction"
+
+    const-string v5, "handleChatInteraction(Lcom/discord/stores/StoreChat$InteractionState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChatInteraction"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreMessagesLoader;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChatInteraction(Lcom/discord/stores/StoreChat$InteractionState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/stores/StoreChat$InteractionState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreMessagesLoader;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreMessagesLoader;->access$handleChatInteraction(Lcom/discord/stores/StoreMessagesLoader;Lcom/discord/stores/StoreChat$InteractionState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali
index c4d577ff92..ee20ff7f92 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$init$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMessagesLoader$init$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Set<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMessagesLoader;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreMessagesLoader;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleChatDetached"
+
+    const-string v5, "handleChatDetached(Ljava/util/Set;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChatDetached"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreMessagesLoader;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChatDetached(Ljava/util/Set;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -94,22 +78,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreMessagesLoader;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreMessagesLoader;->access$handleChatDetached(Lcom/discord/stores/StoreMessagesLoader;Ljava/util/Set;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali
index 35dfc8af8f..8a2a56153b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xd
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xd
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali
index d6f5935667..c5b3234407 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessage;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -88,9 +88,9 @@
 
     move-result-object p1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali
index 5fde21e9ec..c3c07c660e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,38 +57,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xe
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xe
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali
index 5f64121dfc..6eef1dc6b8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
     :try_start_0
     const-string v0, "channel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -113,16 +113,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali
index f5adf49b49..8960ba61a5 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali
index c3f61be08d..dbb2ad3dd8 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.smali
@@ -3,7 +3,7 @@
 .source "StoreMessagesLoader.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,6 +79,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelMessage;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali
index bac79fa5a6..693528ad1f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$5;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessage;",
         "Lkotlin/Unit;",
@@ -33,43 +33,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1;)V
-    .locals 0
+    .locals 6
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$5;->$handleTargetChannelSelected$1:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$1;
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/g;-><init>(I)V
+    const/4 v2, 0x0
+
+    const-string v3, "handleTargetChannelSelected"
+
+    const-string v4, "invoke(Lcom/discord/models/domain/ModelMessage;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleTargetChannelSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke(Lcom/discord/models/domain/ModelMessage;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
index 1f9a9b79ef..9d270712e0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
@@ -3,7 +3,7 @@
 .source "StoreMessagesLoader.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelChannel;",
             ">;"
         }
@@ -80,7 +83,7 @@
 
     const-string v0, "isConnected"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -114,19 +117,19 @@
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "filter { it != null }.map { it!! }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     int-to-long v0, p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali
index 843d2adda1..d0558997b9 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,24 +71,19 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v1, 0x2
+    const-string v0, "Dropped message jump action"
 
-    const-string v2, "Dropped message jump action"
+    const/4 v1, 0x0
 
-    invoke-static {p1, v2, v0, v1, v0}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
index 595126fd03..fd2267340b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -33,43 +33,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;)V
-    .locals 0
+    .locals 6
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;->$handleTargetChannelResolved$2:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/g;-><init>(I)V
+    const/4 v2, 0x0
+
+    const-string v3, "handleTargetChannelResolved"
+
+    const-string v4, "invoke(Lcom/discord/models/domain/ModelChannel;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleTargetChannelResolved"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke(Lcom/discord/models/domain/ModelChannel;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -85,20 +71,13 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;->$handleTargetChannelResolved$2:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali
index 6601b64207..85997af2c0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$requestNewestMessages$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$requestNewestMessages$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xe
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xe
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali
index b775d1c8c0..5d401b521e 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.smali
@@ -96,7 +96,7 @@
 
     const-string v3, "messages"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v4, p0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1;->$shouldRequestOlderMessages:Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali
index 54f5896579..78f28ab940 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali
index 17c95db671..f17b4ab0c1 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;->this$0:Lcom/discord/stores/StoreMessagesLoader;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreMessagesLoader;->access$setDelayLoadingMessagesSubscription$p(Lcom/discord/stores/StoreMessagesLoader;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali
index 7c674df57f..3f36d66ea6 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,38 +57,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/16 v5, 0xb
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xb
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2.smali
index e62ac12c9c..6053dbf545 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -58,7 +58,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -95,7 +95,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v3, p0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$2;->$channelId:J
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4.smali
index 637b56afa8..66894ccc16 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4;->this$0:Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;
 
@@ -70,13 +72,4 @@
     invoke-static {v0, p1}, Lcom/discord/stores/StoreMessagesLoader;->access$setLoadingMessagesSubscription$p(Lcom/discord/stores/StoreMessagesLoader;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali
index 1c0b6c0bbb..59bf6c98ab 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x4
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -238,7 +238,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
 
@@ -246,7 +246,7 @@
 
     const-string v1, "messagesRequest\n        \u2026s.restSubscribeOn(false))"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -282,13 +282,19 @@
 
     invoke-direct {v5, p0}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3$4;-><init>(Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;)V
 
-    if-eqz p3, :cond_5
-
     const/4 v3, 0x0
 
+    const-string p1, "onNext"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "errorClass"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string p1, "observable"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -296,13 +302,13 @@
 
     const-string p1, "errorClass.simpleName"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v7, Lf/a/b/n0;
+    new-instance v7, Lf/a/b/p0;
 
-    invoke-direct {v7, p4}, Lf/a/b/n0;-><init>(Lrx/functions/Action1;)V
+    invoke-direct {v7, p4}, Lf/a/b/p0;-><init>(Lrx/functions/Action1;)V
 
-    sget-object v8, Lf/a/b/z;->d:Lf/a/b/z;
+    sget-object v8, Lf/a/b/b0;->d:Lf/a/b/b0;
 
     move-object v6, v0
 
@@ -314,18 +320,6 @@
 
     return-void
 
-    :cond_5
-    :try_start_1
-    const-string p1, "errorClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali
index 626ca75ccf..29db265562 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xb
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xb
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali
index 544aafdc33..0599cf07c4 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/Long;",
         "Ljava/util/List<",
@@ -49,7 +49,7 @@
 
     const/4 p1, 0x4
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -107,7 +107,7 @@
     :try_start_0
     const-string v0, "messages"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3}, Ljava/util/List;->isEmpty()Z
 
@@ -208,16 +208,6 @@
 
     return-void
 
-    :cond_3
-    :try_start_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali
index d8f9e8365c..e268afdf92 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$5$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreMessagesLoader.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,38 +57,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/16 v5, 0xb
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xb
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->copy$default(Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;ZZZZILjava/lang/Object;)Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
index f35c85942b..82c849e613 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
@@ -124,11 +124,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -142,9 +142,9 @@
 
     invoke-static {}, Lrx/subjects/BehaviorSubject;->g0()Lrx/subjects/BehaviorSubject;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p1, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+    invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessagesLoader;->channelMessageChunksSubject:Lrx/subjects/SerializedSubject;
 
@@ -156,22 +156,24 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    new-instance v1, Ljava/util/HashMap;
+    new-instance v0, Ljava/util/HashMap;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStates:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStates:Ljava/util/HashMap;
 
-    invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+    invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p1, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+    invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStateSubject:Lrx/subjects/SerializedSubject;
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
+    const/4 v0, 0x0
+
     invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
@@ -180,7 +182,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessagesLoader;->scrollToSubject:Lrx/subjects/SerializedSubject;
 
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     iput-object p1, p0, Lcom/discord/stores/StoreMessagesLoader;->detachedChannels:Ljava/util/Set;
 
@@ -203,13 +205,6 @@
     iput p1, p0, Lcom/discord/stores/StoreMessagesLoader;->loadingMessagesRetryMax:I
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$channelLoadedStateUpdate(Lcom/discord/stores/StoreMessagesLoader;JLkotlin/jvm/functions/Function1;)V
@@ -376,6 +371,10 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;-><init>(ZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     :goto_0
+    const-string v1, "channelLoadedStates[chan\u2026] ?: ChannelLoadedState()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p3
@@ -398,9 +397,9 @@
 
     invoke-direct {p2, p3}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -431,9 +430,9 @@
 
     invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader;->loadingMessagesSubscription:Lrx/Subscription;
 
@@ -668,7 +667,7 @@
 
     const-string p2, "StringBuilder()\n        \u2026}ms\")\n        .toString()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessagesLoader;->log(Ljava/lang/String;)V
 
@@ -836,9 +835,9 @@
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;-><init>(JLjava/util/List;ZZZZ)V
 
-    iget-object v1, v15, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v1, v15, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v1, v14}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v14}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     const-wide/16 v1, 0x1
 
@@ -877,9 +876,9 @@
 
     move-result-object v1
 
-    iget-object v2, v5, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v2, v5, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v2, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v2, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     goto :goto_7
 
@@ -894,9 +893,9 @@
 
     move-result-object v2
 
-    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v1, v2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     :cond_9
     :goto_7
@@ -974,9 +973,9 @@
 
     move-result-object v2
 
-    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v1, v2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     :cond_e
     :goto_a
@@ -1199,7 +1198,7 @@
 
     const-string v1, "Observable\n          .ti\u2026y, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -1609,11 +1608,11 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader;->scrollToSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
     const/4 v1, 0x0
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1655,13 +1654,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMessagesLoader$getMessagesLoadedState$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "channelLoadedStateSubjec\u2026?: ChannelLoadedState() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1673,7 +1672,7 @@
 
     const-string p2, "channelLoadedStateSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1693,13 +1692,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreMessagesLoader$getScrollTo$1;->INSTANCE:Lcom/discord/stores/StoreMessagesLoader$getScrollTo$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "scrollToSubject\n      .filter { it != null }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1912,7 +1911,9 @@
 .method public init(Landroid/content/Context;)V
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -1928,6 +1929,10 @@
 
     const-class v1, Lcom/discord/stores/StoreMessagesLoader;
 
+    new-instance v6, Lcom/discord/stores/StoreMessagesLoader$init$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/stores/StoreMessagesLoader$init$1;-><init>(Lcom/discord/stores/StoreMessagesLoader;)V
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -1936,10 +1941,6 @@
 
     const/4 v5, 0x0
 
-    new-instance v6, Lcom/discord/stores/StoreMessagesLoader$init$1;
-
-    invoke-direct {v6, p0}, Lcom/discord/stores/StoreMessagesLoader$init$1;-><init>(Lcom/discord/stores/StoreMessagesLoader;)V
-
     const/16 v7, 0x1e
 
     const/4 v8, 0x0
@@ -1965,15 +1966,6 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final declared-synchronized jumpToMessage(JJ)V
@@ -2033,7 +2025,7 @@
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {v3, v4, v5, v6, v7}, Lf/a/b/q;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
+    invoke-static {v3, v4, v5, v6, v7}, Lf/a/b/s;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
 
     move-result-object v3
 
@@ -2053,13 +2045,13 @@
 
     invoke-direct/range {v3 .. v8}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$4;-><init>(Lcom/discord/stores/StoreMessagesLoader;JJ)V
 
-    invoke-virtual {v2, v9}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v9}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
     const-string p3, "stream\n        .channels\u2026lId, messageId)\n        }"
 
-    invoke-static {v3, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v4, 0x0
 
@@ -2123,13 +2115,13 @@
 
     invoke-direct {p4, p0, p1, p2}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6;-><init>(Lcom/discord/stores/StoreMessagesLoader;J)V
 
-    invoke-virtual {p3, p4}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, p4}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "stream\n        .connecti\u2026mes.ONE_SECOND)\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -2223,9 +2215,9 @@
 
     move-result-object v1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali
index ce328cf7a0..8cea518490 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreMessagesMostRecent.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -47,7 +53,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;)J
+.method public final call(Ljava/util/Map;)Ljava/lang/Long;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -55,7 +61,8 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Long;",
-            ">;)J"
+            ">;)",
+            "Ljava/lang/Long;"
         }
     .end annotation
 
@@ -83,21 +90,21 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesMostRecent$get$1;->call(Ljava/util/Map;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesMostRecent$get$1;->call(Ljava/util/Map;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
index bb7cd63d5c..623e80f46a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
@@ -332,13 +332,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreMessagesMostRecent$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "get()\n        .map { it[channelId] ?: 0L }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -350,17 +350,19 @@
 
     const-string p2, "get()\n        .map { it[\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
 
 .method public final handleChannelCreated(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
 
@@ -369,36 +371,20 @@
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdateFromChannels(Ljava/util/Collection;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelReadStateUpdate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdateFromChannels(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channelReadStateUpdate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
@@ -406,7 +392,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getPrivateChannels()Ljava/util/List;
 
@@ -414,7 +402,7 @@
 
     const-string v1, "payload.privateChannels"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdateFromChannels(Ljava/util/Collection;)V
 
@@ -424,7 +412,7 @@
 
     const-string v0, "payload.guilds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -445,7 +433,7 @@
 
     const-string v1, "it"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getChannels()Ljava/util/List;
 
@@ -453,7 +441,7 @@
 
     const-string v1, "it.channels"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdateFromChannels(Ljava/util/Collection;)V
 
@@ -465,15 +453,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreMessagesMostRecent;->updated:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
@@ -481,7 +460,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getChannels()Ljava/util/List;
 
@@ -489,41 +470,25 @@
 
     const-string v0, "guild.channels"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdateFromChannels(Ljava/util/Collection;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessageCreate(Lcom/discord/models/domain/ModelMessage;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessagesMostRecent;->mostRecentIdsUpdateFromMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali
index 49b3ea0579..88f10c8d47 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation.smali
@@ -42,13 +42,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "nuxState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string/jumbo v0, "userRequiredAction"
 
-    if-eqz p11, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "oAuthUri"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -75,27 +79,6 @@
     iput-object p11, p0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->oAuthUri:Landroid/net/Uri;
 
     return-void
-
-    :cond_0
-    const-string p1, "oAuthUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "userRequiredAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "nuxState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;ILjava/lang/Object;)Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
@@ -359,28 +342,34 @@
 .method public final copy(Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;)Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "nuxState"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p5, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_0
+    const-string/jumbo v0, "userRequiredAction"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "oAuthUri"
+
+    move-object/from16 v12, p11
+
+    invoke-static {v12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move v3, p2
 
     move-object/from16 v4, p3
 
     move/from16 v5, p4
 
-    move-object/from16 v6, p5
-
     move/from16 v7, p6
 
     move-object/from16 v8, p7
@@ -391,32 +380,9 @@
 
     move-object/from16 v11, p10
 
-    move-object/from16 v12, p11
-
     invoke-direct/range {v1 .. v12}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;-><init>(Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "oAuthUri"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "userRequiredAction"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "nuxState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -434,7 +400,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->nuxState:Lcom/discord/stores/StoreNux$NuxState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -450,7 +416,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->authToken:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -466,7 +432,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->userRequiredAction:Lcom/discord/models/domain/ModelUser$RequiredAction;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -482,7 +448,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->inviteCode:Lcom/discord/stores/StoreInviteSettings$InviteCode;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -492,7 +458,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->guildTemplateCode:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -502,7 +468,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->notice:Lcom/discord/stores/StoreNotices$Notice;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -512,7 +478,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->shouldShowAgeGate:Lcom/discord/stores/StoreNavigation$AgeGate;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -522,7 +488,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->oAuthUri:Landroid/net/Uri;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.smali
index 26ba34c38a..5eb3fd38ea 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,19 +78,21 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "model"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v0
 
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result v0
 
@@ -135,18 +137,4 @@
 
     :cond_2
     return v2
-
-    :cond_3
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1$1.smali
index 5a53b9e84c..1dc2809d23 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Ljava/lang/Boolean;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,7 +78,9 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -92,18 +94,9 @@
 
     const-string v1, "Intent()\n            .ad\u2026FLAG_ACTIVITY_CLEAR_TASK)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->b(Landroid/content/Context;ZLandroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->b(Landroid/content/Context;ZLandroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
index c080253cd4..d2a508e62a 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,15 +78,17 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "model"
 
-    sget-object v0, Lf/a/b/k;->f:Lf/a/b/k;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lf/a/b/k;->a:Ljava/util/List;
+    sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+
+    sget-object v0, Lf/a/b/m;->a:Ljava/util/List;
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
 
@@ -94,11 +96,11 @@
 
     const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v1
 
-    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result v1
 
@@ -142,18 +144,4 @@
     :cond_2
     :goto_1
     return v0
-
-    :cond_3
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali
index 4c76e3bde1..27790f152c 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,81 +76,71 @@
 .end method
 
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "model"
 
-    const/4 v1, 0x2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v1, v1, [Lj0/r/b;
+    const/4 v0, 0x2
 
-    const/4 v2, 0x0
+    new-array v0, v0, [Lk0/s/b;
 
-    const-class v3, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    aput-object v3, v1, v2
-
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v3, 0x1
-
-    aput-object v2, v1, v3
-
-    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v1
 
-    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
+    const/4 v2, 0x0
 
-    move-result v1
+    aput-object v1, v0, v2
 
-    if-nez v1, :cond_0
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    aput-object v1, v0, v2
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getIncomingCall()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     const-class p2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x4
 
-    invoke-static {p1, p2, v0, v1}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, p2, v0, v1}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     goto :goto_0
 
     :cond_0
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getIncomingCall()Z
 
-    move-result v3
+    move-result v2
 
     :goto_0
-    return v3
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v2
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali
index 99a1785bda..8f8db31a5d 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientInitializedNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,11 +78,13 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "model"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getInitialized()Z
 
@@ -91,18 +93,4 @@
     xor-int/lit8 p1, p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali
index ecb2bbde70..934c3b6452 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,33 +76,35 @@
 .end method
 
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "model"
 
-    const-class v1, Lcom/discord/widgets/client/WidgetClientOutdated;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-class v0, Lcom/discord/widgets/client/WidgetClientOutdated;
 
-    move-result-object v1
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
-    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    move-result-object v0
 
-    move-result v1
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
+
+    move-result v0
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getClientOutdated()Z
 
-    move-result v2
+    move-result v1
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
     invoke-static {p1}, Lcom/discord/widgets/client/WidgetClientOutdated;->launch(Landroid/content/Context;)V
 
@@ -111,40 +113,28 @@
     :cond_0
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getClientOutdated()Z
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_1
+    if-nez v1, :cond_1
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     const/4 p2, 0x0
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x6
 
-    invoke-static {p1, p2, v0, v1}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {p1, p2, v0, v1}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     goto :goto_0
 
     :cond_1
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getClientOutdated()Z
 
-    move-result v3
+    move-result v2
 
     :cond_2
     :goto_0
-    return v3
-
-    :cond_3
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v2
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali
index 9fb48abb6e..0f2405dde1 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function11<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Ljava/lang/Boolean;",
@@ -55,70 +55,58 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/16 v0, 0xb
+    const-class v2, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/16 v1, 0xb
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;)Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p5, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_0
+    const-string v0, "p5"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p11"
+
+    move-object/from16 v12, p11
+
+    invoke-static {v12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move v3, p2
 
     move-object/from16 v4, p3
 
     move/from16 v5, p4
 
-    move-object/from16 v6, p5
-
     move/from16 v7, p6
 
     move-object/from16 v8, p7
@@ -129,32 +117,9 @@
 
     move-object/from16 v11, p10
 
-    move-object/from16 v12, p11
-
     invoke-direct/range {v1 .. v12}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;-><init>(Lcom/discord/stores/StoreNux$NuxState;ZLjava/lang/String;ZLcom/discord/models/domain/ModelUser$RequiredAction;ZLcom/discord/stores/StoreInviteSettings$InviteCode;Ljava/lang/String;Lcom/discord/stores/StoreNotices$Notice;Lcom/discord/stores/StoreNavigation$AgeGate;Landroid/net/Uri;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "p11"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "p5"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "p1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;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/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1$1.smali
index c4d48efd89..675f50754a 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xe
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xe
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.smali
index c31881395f..7de358c60d 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,11 +68,13 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "model"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getGuildTemplateCode()Ljava/lang/String;
 
@@ -82,11 +84,11 @@
 
     const-class v0, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v0
 
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result v0
 
@@ -121,18 +123,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali
index 4d81721572..a1e5b95e83 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xe
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xe
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali
index 73e95e9987..09eeb92454 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,11 +68,13 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "model"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getInviteCode()Lcom/discord/stores/StoreInviteSettings$InviteCode;
 
@@ -82,11 +84,11 @@
 
     const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v0
 
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result v0
 
@@ -127,18 +129,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.smali
index c55a4d3add..cf20af3d0f 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,57 +66,107 @@
 .end method
 
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
-    .locals 7
+    .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "model"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getNotice()Lcom/discord/stores/StoreNotices$Notice;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_5
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getNotice()Lcom/discord/stores/StoreNotices$Notice;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Notice;->getValidScreens()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreNotices$Notice;->getValidScreens()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_0
+
+    const-class v3, Lcom/discord/widgets/home/WidgetHome;
+
+    invoke-static {v3}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v3
+
+    invoke-interface {v0, v3}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-ne v3, v2, :cond_0
+
+    const-class v3, Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    invoke-static {v3}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v3
+
+    invoke-virtual {p1, v3}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    iget-object v3, p0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1;->this$0:Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;
+
+    invoke-static {v3}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;->access$getStoreTabsNavigation$p(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;)Lcom/discord/stores/StoreTabsNavigation;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreTabsNavigation;->getSelectedTab()Lcom/discord/widgets/tabs/NavigationTab;
+
+    move-result-object v3
+
+    sget-object v4, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
+
+    if-ne v3, v4, :cond_0
 
     const/4 v3, 0x1
 
-    if-eqz v1, :cond_0
+    goto :goto_0
 
-    const-class v4, Lcom/discord/widgets/home/WidgetHome;
+    :cond_0
+    const/4 v3, 0x0
 
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const-class v4, Lcom/discord/widgets/user/WidgetUserMentions;
+
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
-    invoke-interface {v1, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+    invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
     move-result v4
 
-    if-ne v4, v3, :cond_0
+    if-ne v4, v2, :cond_1
 
     const-class v4, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
-    invoke-virtual {p1, v4}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p1, v4}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result v4
 
-    if-eqz v4, :cond_0
+    if-eqz v4, :cond_1
 
     iget-object v4, p0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1;->this$0:Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;
 
@@ -128,122 +178,76 @@
 
     move-result-object v4
 
-    sget-object v5, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
+    sget-object v5, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
 
-    if-ne v4, v5, :cond_0
+    if-ne v4, v5, :cond_1
 
     const/4 v4, 0x1
 
-    goto :goto_0
-
-    :cond_0
-    const/4 v4, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    const-class v5, Lcom/discord/widgets/user/WidgetUserMentions;
-
-    invoke-static {v5}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v5
-
-    invoke-interface {v1, v5}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-ne v5, v3, :cond_1
-
-    const-class v5, Lcom/discord/widgets/tabs/WidgetTabsHost;
-
-    invoke-static {v5}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v5
-
-    invoke-virtual {p1, v5}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    iget-object v5, p0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1;->this$0:Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;
-
-    invoke-static {v5}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;->access$getStoreTabsNavigation$p(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;)Lcom/discord/stores/StoreTabsNavigation;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/stores/StoreTabsNavigation;->getSelectedTab()Lcom/discord/widgets/tabs/NavigationTab;
-
-    move-result-object v5
-
-    sget-object v6, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
-
-    if-ne v5, v6, :cond_1
-
-    const/4 v5, 0x1
-
     goto :goto_1
 
     :cond_1
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_1
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_3
+    if-nez v0, :cond_3
 
-    if-nez v4, :cond_3
+    if-nez v3, :cond_3
 
-    if-eqz v5, :cond_2
+    if-eqz v4, :cond_2
 
     goto :goto_2
 
     :cond_2
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :cond_3
     :goto_2
-    if-eqz v3, :cond_6
+    if-eqz v2, :cond_5
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getNotice()Lcom/discord/stores/StoreNotices$Notice;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_4
 
-    if-eqz v2, :cond_4
+    const-string v2, "noticeName"
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
     const-string v3, "Notice ["
 
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/16 v2, 0x5d
+    const/16 v1, 0x5d
 
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "navigation"
 
-    invoke-virtual {v1, v0, v2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v1, v2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getNotice()Lcom/discord/stores/StoreNotices$Notice;
 
@@ -251,35 +255,16 @@
 
     invoke-virtual {p2, p1}, Lcom/discord/stores/StoreNotices$Notice;->show(Landroidx/fragment/app/FragmentActivity;)Z
 
-    move-result v2
+    move-result v1
 
     goto :goto_3
 
     :cond_4
-    const-string p1, "noticeName"
+    const/4 p1, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 
     :cond_5
-    throw v0
-
-    :cond_6
     :goto_3
-    return v2
-
-    :cond_7
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali
index dcb577b277..433fb43114 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xe
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xe
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali
index 968f1bb336..d2883eb8df 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,11 +68,13 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "model"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getNuxState()Lcom/discord/stores/StoreNux$NuxState;
 
@@ -86,11 +88,11 @@
 
     const-class p2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    invoke-static {p2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {p2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object p2
 
-    invoke-virtual {p1, p2}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    invoke-virtual {p1, p2}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
 
     move-result p2
 
@@ -106,15 +108,17 @@
 
     move-result-object p2
 
-    sget-object v1, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1;->INSTANCE:Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1;
+    sget-object v0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1;->INSTANCE:Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1$1;
 
-    invoke-virtual {p2, v1}, Lcom/discord/stores/StoreNux;->updateNux(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p2, v0}, Lcom/discord/stores/StoreNux;->updateNux(Lkotlin/jvm/functions/Function1;)V
 
     const-class p2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x4
 
-    invoke-static {p1, p2, v0, v1}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, p2, v0, v1}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     const/4 p1, 0x1
 
@@ -125,18 +129,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali
index 82f57907de..556133f8db 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,11 +68,13 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "model"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getOAuthUri()Landroid/net/Uri;
 
@@ -80,7 +82,7 @@
 
     sget-object v0, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -90,9 +92,9 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lf/a/b/k;->f:Lf/a/b/k;
+    sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
 
-    sget-object v0, Lf/a/b/k;->b:Ljava/util/List;
+    sget-object v0, Lf/a/b/m;->b:Ljava/util/List;
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
 
@@ -118,7 +120,7 @@
 
     const-string v0, "Uri.EMPTY"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/stores/StoreAuthentication;->setOAuthUriSubject(Landroid/net/Uri;)V
 
@@ -129,18 +131,4 @@
 
     :goto_0
     return v1
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1.smali
index 8804294746..81f52eea4b 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;->this$0:Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;
 
@@ -74,13 +76,4 @@
     invoke-static {v0, v1, p1}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;->access$handleGlobalNavigationData(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali
index fb0d573dc7..8b94bec4f7 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,35 +76,37 @@
 .end method
 
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "model"
 
-    const-class v1, Lcom/discord/widgets/tos/WidgetTosAccept;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-class v0, Lcom/discord/widgets/tos/WidgetTosAccept;
 
-    move-result-object v1
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
-    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->m(Lj0/r/b;)Z
+    move-result-object v0
 
-    move-result v1
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
+
+    move-result v0
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;->getUserRequiredAction()Lcom/discord/models/domain/ModelUser$RequiredAction;
 
     move-result-object p2
 
-    sget-object v2, Lcom/discord/models/domain/ModelUser$RequiredAction;->AGREEMENTS:Lcom/discord/models/domain/ModelUser$RequiredAction;
+    sget-object v1, Lcom/discord/models/domain/ModelUser$RequiredAction;->AGREEMENTS:Lcom/discord/models/domain/ModelUser$RequiredAction;
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    if-ne p2, v2, :cond_0
+    if-ne p2, v1, :cond_0
 
     const/4 p2, 0x1
 
@@ -116,7 +118,7 @@
     :goto_0
     if-eqz p2, :cond_1
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
     sget-object p2, Lcom/discord/widgets/tos/WidgetTosAccept;->Companion:Lcom/discord/widgets/tos/WidgetTosAccept$Companion;
 
@@ -127,31 +129,19 @@
     :cond_1
     if-nez p2, :cond_2
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    const/4 p2, 0x6
+    const/4 p2, 0x0
 
-    invoke-static {p1, v3, v0, p2}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    const/4 v0, 0x6
+
+    invoke-static {p1, v2, p2, v0}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     goto :goto_1
 
     :cond_2
-    move v4, p2
+    move v3, p2
 
     :goto_1
-    return v4
-
-    :cond_3
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v3
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
index f8ed26f586..041f646e76 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/app/AppActivity;",
         "Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,15 +78,17 @@
 .method public final invoke(Lcom/discord/app/AppActivity;Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ModelGlobalNavigation;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "model"
 
-    sget-object v0, Lf/a/b/k;->f:Lf/a/b/k;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lf/a/b/k;->d:Ljava/util/List;
+    sget-object v0, Lf/a/b/m;->f:Lf/a/b/m;
+
+    sget-object v0, Lf/a/b/m;->d:Ljava/util/List;
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->l(Ljava/util/List;)Z
 
@@ -147,18 +149,4 @@
 
     :goto_2
     return v3
-
-    :cond_3
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
index 545b3efbb3..1c18c5692c 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
@@ -174,11 +174,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreTabsNavigation;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeTabsNavigation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;-><init>()V
 
@@ -245,20 +247,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;->noticeHandler:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeTabsNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getStoreTabsNavigation$p(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;)Lcom/discord/stores/StoreTabsNavigation;
@@ -334,7 +322,7 @@
 
     const-string v0, "stream\n              .ca\u2026           .hasIncoming()"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;->stream:Lcom/discord/stores/StoreStream;
 
@@ -430,7 +418,7 @@
 
     const-string v1, "combineLatest(\n         \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -772,24 +760,30 @@
 .method public onActivityCreatedOrResumed(Lcom/discord/app/AppActivity;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityCreatedOrResumed(Lcom/discord/app/AppActivity;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;->getGlobalNavigationData()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
     const-class v4, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;
 
+    new-instance v9, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;
+
+    invoke-direct {v9, p0, p1}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;-><init>(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;Lcom/discord/app/AppActivity;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -798,10 +792,6 @@
 
     const/4 v8, 0x0
 
-    new-instance v9, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;
-
-    invoke-direct {v9, p0, p1}, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$onActivityCreatedOrResumed$1;-><init>(Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;Lcom/discord/app/AppActivity;)V
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -809,11 +799,4 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$launchNotice$notice$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$launchNotice$notice$1.smali
index 237a0ddc0d..8770c3e66a 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$launchNotice$notice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$launchNotice$notice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNavigation$launchNotice$notice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -100,13 +102,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1.smali
index 3796012349..979b436833 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1.smali
@@ -3,7 +3,7 @@
 .source "StoreNavigation.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/panels/PanelState;
+    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1;->call(Lcom/discord/panels/PanelState;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/panels/PanelState;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
+    check-cast p1, Lcom/discord/panels/PanelState;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1;->call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2.smali
index 1145becbc4..8db6264327 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2.smali
@@ -3,7 +3,7 @@
 .source "StoreNavigation.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/panels/PanelState;
+    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2;->call(Lcom/discord/panels/PanelState;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/panels/PanelState;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
+    check-cast p1, Lcom/discord/panels/PanelState;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2;->call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$3.smali b/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$3.smali
index 08de0adc3c..34482920da 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$3.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,30 +62,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$3;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
+.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "isLeftOpen"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -92,7 +77,7 @@
 
     const-string p1, "isRightOpen"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -112,5 +97,23 @@
     const/4 p1, 0x1
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$3;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali
index 979b436f92..d8840615e8 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali
@@ -54,11 +54,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreTabsNavigation;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeTabsNavigation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -95,20 +97,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreNavigation;->rightPanelStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeTabsNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
@@ -151,7 +139,7 @@
 
     const-string v1, "navigationPanelActionSub\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -161,28 +149,25 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "panelAction"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x2
 
     invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final init(Landroid/app/Application;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks;
 
@@ -195,15 +180,6 @@
     invoke-virtual {p1, v0}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final launchNotice(Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
@@ -224,22 +200,28 @@
 
     move-object/from16 v0, p2
 
-    const/4 v2, 0x0
+    const-string v2, "noticeName"
 
-    if-eqz v1, :cond_1
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_0
+    const-string v2, "showAction"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v15, Lcom/discord/stores/StoreNotices$Notice;
 
+    new-instance v13, Lcom/discord/stores/StoreNavigation$launchNotice$notice$1;
+
+    invoke-direct {v13, v1, v0}, Lcom/discord/stores/StoreNavigation$launchNotice$notice$1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+
     const/4 v2, 0x0
 
     const-wide/16 v3, 0x0
 
-    const/4 v6, 0x0
-
     const/4 v5, 0x0
 
+    const/4 v6, 0x0
+
     const/4 v7, 0x0
 
     const/4 v8, 0x0
@@ -248,18 +230,12 @@
 
     const-wide/16 v11, 0x0
 
-    new-instance v13, Lcom/discord/stores/StoreNavigation$launchNotice$notice$1;
-
-    invoke-direct {v13, v1, v0}, Lcom/discord/stores/StoreNavigation$launchNotice$notice$1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
     const/16 v14, 0x26
 
     const/16 v16, 0x0
 
     move-object v0, v15
 
-    move-object/from16 v1, p1
-
     move-object/from16 v17, v15
 
     move-object/from16 v15, v16
@@ -277,20 +253,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
 
     return-void
-
-    :cond_0
-    const-string v0, "showAction"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    const-string v0, "noticeName"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public final observeIsAnyNavigationPanelOpen()Lrx/Observable;
@@ -310,7 +272,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1;->INSTANCE:Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -320,7 +282,7 @@
 
     sget-object v2, Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2;->INSTANCE:Lcom/discord/stores/StoreNavigation$observeIsAnyNavigationPanelOpen$2;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -336,7 +298,7 @@
 
     const-string v1, "Observable.combineLatest\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -360,7 +322,7 @@
 
     const-string v1, "leftPanelStateSubject\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -384,7 +346,7 @@
 
     const-string v1, "rightPanelStateSubject\n \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -392,22 +354,15 @@
 .method public final setLeftPanelState(Lcom/discord/panels/PanelState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNavigation;->leftPanelStateSubject:Lrx/subjects/BehaviorSubject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setNavigationPanelAction(Lcom/discord/stores/StoreNavigation$PanelAction;)V
@@ -425,15 +380,17 @@
 .method public final setNavigationPanelAction(Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;)V
     .locals 1
 
-    if-eqz p1, :cond_3
+    const-string v0, "actionType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
     iget-object p2, p0, Lcom/discord/stores/StoreNavigation;->navigationPanelActionSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object p2, p2, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p2, p2, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p2, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p2, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 
@@ -465,39 +422,23 @@
 
     sget-object p2, Lcom/discord/stores/StoreNavigation$PanelAction;->NOOP:Lcom/discord/stores/StoreNavigation$PanelAction;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "actionType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setRightPanelState(Lcom/discord/panels/PanelState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNavigation;->rightPanelStateSubject:Lrx/subjects/BehaviorSubject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.smali
index f8bbe1f574..bd94a78ef7 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,19 +65,21 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/stores/StoreNotices$Dialog;
+    new-instance v0, Lcom/discord/stores/StoreNotices$Dialog;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1;->this$0:Lcom/discord/stores/StoreNotices$Dialog$Type;
+    iget-object v1, p0, Lcom/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1;->this$0:Lcom/discord/stores/StoreNotices$Dialog$Type;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-direct {v1, v2, v0, v3, v0}, Lcom/discord/stores/StoreNotices$Dialog;-><init>(Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1, v2, v3, v2}, Lcom/discord/stores/StoreNotices$Dialog;-><init>(Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sget-object v0, Lcom/discord/utilities/notices/NoticeBuilders;->INSTANCE:Lcom/discord/utilities/notices/NoticeBuilders;
+    sget-object v1, Lcom/discord/utilities/notices/NoticeBuilders;->INSTANCE:Lcom/discord/utilities/notices/NoticeBuilders;
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -85,18 +87,11 @@
 
     const-string v3, "activity.supportFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, p1, v2, v1}, Lcom/discord/utilities/notices/NoticeBuilders;->showNotice(Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lcom/discord/stores/StoreNotices$Dialog;)V
+    invoke-virtual {v1, p1, v2, v0}, Lcom/discord/utilities/notices/NoticeBuilders;->showNotice(Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lcom/discord/stores/StoreNotices$Dialog;)V
 
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali b/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali
index bcf9fa4146..e0c7c7e150 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Dialog.smali
@@ -37,7 +37,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/util/Map;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -50,7 +50,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,15 +61,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreNotices$Dialog;->metadata:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -151,22 +144,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreNotices$Dialog;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreNotices$Dialog;-><init>(Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -184,7 +170,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreNotices$Dialog;->type:Lcom/discord/stores/StoreNotices$Dialog$Type;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -194,7 +180,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreNotices$Dialog;->metadata:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali b/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
index 9f3b7adc33..4f543dcadd 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$Notice.smali
@@ -48,7 +48,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;>;"
@@ -68,7 +68,7 @@
             "JIZZ",
             "Ljava/util/List<",
             "+",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;>;JJ",
@@ -80,13 +80,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "clock"
 
-    if-eqz p13, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "show"
+
+    invoke-static {p13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -111,27 +115,6 @@
     iput-object p13, p0, Lcom/discord/stores/StoreNotices$Notice;->show:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "show"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Lcom/discord/utilities/time/Clock;JIZZLjava/util/List;JJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -219,11 +202,11 @@
 
     const/4 v1, 0x2
 
-    new-array v1, v1, [Lj0/r/b;
+    new-array v1, v1, [Lk0/s/b;
 
     const-class v10, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-static {v10}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v10}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v10
 
@@ -231,7 +214,7 @@
 
     const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v2
 
@@ -288,7 +271,7 @@
     return-void
 .end method
 
-.method public static synthetic hasShown$annotations()V
+.method public static synthetic getHasShown$annotations()V
     .locals 0
 
     return-void
@@ -428,7 +411,7 @@
         value = {
             "()",
             "Ljava/util/List<",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;>;"
@@ -449,7 +432,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v0, v1, v2}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v0, v1, v2}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v0
 
@@ -465,7 +448,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v0, v1, v2}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v0, v1, v2}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v0
 
@@ -492,7 +475,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "lastShownTimes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p0, Lcom/discord/stores/StoreNotices$Notice;->priority:I
 
@@ -541,15 +526,6 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "lastShownTimes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final show(Landroidx/fragment/app/FragmentActivity;)Z
@@ -557,7 +533,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/stores/StoreNotices$Notice;->hasShown:Z
 
@@ -594,15 +572,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali b/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali
index 16b07016b6..405a8b7ea4 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$PassiveNotice.smali
@@ -30,11 +30,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    move-object/from16 v2, p1
 
-    if-eqz p8, :cond_0
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "show"
+
+    move-object/from16 v14, p8
+
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -50,8 +56,6 @@
 
     move-object/from16 v1, p0
 
-    move-object/from16 v2, p1
-
     move/from16 v6, p2
 
     move/from16 v7, p3
@@ -60,25 +64,9 @@
 
     move-wide/from16 v12, p4
 
-    move-object/from16 v14, p8
-
     invoke-direct/range {v1 .. v16}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;Lcom/discord/utilities/time/Clock;JIZZLjava/util/List;JJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "show"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;IZJJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -153,7 +141,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_5
+    const-string v0, "lastShownTimes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -226,7 +216,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->max(Ljava/lang/Iterable;)Ljava/lang/Comparable;
+    invoke-static {p1}, Lk0/j/l;->max(Ljava/lang/Iterable;)Ljava/lang/Comparable;
 
     move-result-object p1
 
@@ -269,13 +259,4 @@
 
     :goto_3
     return v2
-
-    :cond_5
-    const-string p1, "lastShownTimes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$clearSeen$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$clearSeen$1.smali
index 036c4aa011..630dfcf202 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$clearSeen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$clearSeen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotices$clearSeen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/HashMap<",
         "Ljava/lang/String;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,20 +79,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "cache"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices$clearSeen$1;->$noticeName:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "cache"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali
index ad81f01820..b647282a7f 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotices$firstUseTimestamp$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices$firstUseTimestamp$2$1;->$firstUseTimestamp:Lkotlin/jvm/internal/Ref$LongRef;
 
@@ -72,13 +74,4 @@
     invoke-interface {p1, v2, v0, v1}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali
index ba301a70f1..a101059d22 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$firstUseTimestamp$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotices$firstUseTimestamp$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotices.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Long;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1$1.smali
index 037a5748b0..06b9a708f1 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreNotices.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/stores/StoreNotices$Notice;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1.smali
index 8bb911f0c8..8cb29f2b13 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$getNotices$1.smali
@@ -3,7 +3,7 @@
 .source "StoreNotices.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreNotices$Notice;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreNotices$Notice;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +81,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -104,7 +106,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreNotices$getNotices$1$1;-><init>(Lcom/discord/stores/StoreNotices$Notice;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali
index 83cae6248d..ecc3ad3908 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreNotices.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Unit;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lkotlin/Unit;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali
index 78b0cf1ae6..1bab321f5d 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotices$noticeQueue$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotices.kt"
 
 # interfaces
@@ -18,11 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNotices$Notice;",
-        "Ljava/lang/Boolean;",
-        ">;"
+        "Ljava/lang/Comparable<",
+        "*>;>;"
     }
 .end annotation
 
@@ -49,21 +49,26 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final invoke(Lcom/discord/stores/StoreNotices$Notice;)Ljava/lang/Comparable;
     .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreNotices$Notice;",
+            ")",
+            "Ljava/lang/Comparable<",
+            "*>;"
+        }
+    .end annotation
 
-    check-cast p1, Lcom/discord/stores/StoreNotices$Notice;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotices$noticeQueue$1;->invoke(Lcom/discord/stores/StoreNotices$Notice;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/stores/StoreNotices$PassiveNotice;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -72,10 +77,14 @@
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/stores/StoreNotices$Notice;)Z
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/stores/StoreNotices$PassiveNotice;
+    check-cast p1, Lcom/discord/stores/StoreNotices$Notice;
 
-    return p1
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotices$noticeQueue$1;->invoke(Lcom/discord/stores/StoreNotices$Notice;)Ljava/lang/Comparable;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali
index 84751b1187..4f29562dbf 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotices$noticeQueue$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotices.kt"
 
 # interfaces
@@ -18,11 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNotices$Notice;",
-        "Ljava/lang/Integer;",
-        ">;"
+        "Ljava/lang/Comparable<",
+        "*>;>;"
     }
 .end annotation
 
@@ -49,15 +49,24 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke(Lcom/discord/stores/StoreNotices$Notice;)I
+.method public final invoke(Lcom/discord/stores/StoreNotices$Notice;)Ljava/lang/Comparable;
     .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreNotices$Notice;",
+            ")",
+            "Ljava/lang/Comparable<",
+            "*>;"
+        }
+    .end annotation
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreNotices$Notice;->getPriority()I
 
@@ -65,7 +74,11 @@
 
     neg-int p1, p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -73,11 +86,7 @@
 
     check-cast p1, Lcom/discord/stores/StoreNotices$Notice;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotices$noticeQueue$2;->invoke(Lcom/discord/stores/StoreNotices$Notice;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotices$noticeQueue$2;->invoke(Lcom/discord/stores/StoreNotices$Notice;)Ljava/lang/Comparable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali
index c32cf104d8..d4bf989f86 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices$noticeQueue$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotices$noticeQueue$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotices.kt"
 
 # interfaces
@@ -18,11 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNotices$Notice;",
-        "Ljava/lang/Long;",
-        ">;"
+        "Ljava/lang/Comparable<",
+        "*>;>;"
     }
 .end annotation
 
@@ -49,35 +49,44 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke(Lcom/discord/stores/StoreNotices$Notice;)J
+.method public final invoke(Lcom/discord/stores/StoreNotices$Notice;)Ljava/lang/Comparable;
     .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/stores/StoreNotices$Notice;",
+            ")",
+            "Ljava/lang/Comparable<",
+            "*>;"
+        }
+    .end annotation
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreNotices$Notice;->getRequestedShowTimestamp()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/stores/StoreNotices$Notice;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotices$noticeQueue$3;->invoke(Lcom/discord/stores/StoreNotices$Notice;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreNotices$Notice;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotices$noticeQueue$3;->invoke(Lcom/discord/stores/StoreNotices$Notice;)Ljava/lang/Comparable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotices.smali b/com.discord/smali/com/discord/stores/StoreNotices.smali
index 8ed8650c8b..775838a0b3 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices.smali
@@ -109,13 +109,15 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
-    .locals 4
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -129,43 +131,43 @@
 
     invoke-direct {p2}, Ljava/util/HashMap;-><init>()V
 
-    const-string v1, "NOTICES_SHOWN_V2"
+    const-string v0, "NOTICES_SHOWN_V2"
 
-    invoke-direct {p1, v1, p2}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->noticesSeenCache:Lcom/discord/utilities/persister/Persister;
 
     new-instance p1, Ljava/util/PriorityQueue;
 
-    const/16 p2, 0xb
+    const/4 p2, 0x3
 
-    const/4 v1, 0x3
+    new-array p2, p2, [Lkotlin/jvm/functions/Function1;
 
-    new-array v1, v1, [Lkotlin/jvm/functions/Function1;
+    sget-object v0, Lcom/discord/stores/StoreNotices$noticeQueue$1;->INSTANCE:Lcom/discord/stores/StoreNotices$noticeQueue$1;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    sget-object v3, Lcom/discord/stores/StoreNotices$noticeQueue$1;->INSTANCE:Lcom/discord/stores/StoreNotices$noticeQueue$1;
+    aput-object v0, p2, v1
 
-    aput-object v3, v1, v2
+    sget-object v0, Lcom/discord/stores/StoreNotices$noticeQueue$2;->INSTANCE:Lcom/discord/stores/StoreNotices$noticeQueue$2;
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    sget-object v3, Lcom/discord/stores/StoreNotices$noticeQueue$2;->INSTANCE:Lcom/discord/stores/StoreNotices$noticeQueue$2;
+    aput-object v0, p2, v1
 
-    aput-object v3, v1, v2
+    sget-object v0, Lcom/discord/stores/StoreNotices$noticeQueue$3;->INSTANCE:Lcom/discord/stores/StoreNotices$noticeQueue$3;
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    sget-object v3, Lcom/discord/stores/StoreNotices$noticeQueue$3;->INSTANCE:Lcom/discord/stores/StoreNotices$noticeQueue$3;
+    aput-object v0, p2, v1
 
-    aput-object v3, v1, v2
+    invoke-static {p2}, Lf/n/a/k/a;->compareBy([Lkotlin/jvm/functions/Function1;)Ljava/util/Comparator;
 
-    invoke-static {v1}, Lf/n/a/k/a;->compareBy([Lkotlin/jvm/functions/Function1;)Ljava/util/Comparator;
+    move-result-object p2
 
-    move-result-object v1
+    const/16 v0, 0xb
 
-    invoke-direct {p1, p2, v1}, Ljava/util/PriorityQueue;-><init>(ILjava/util/Comparator;)V
+    invoke-direct {p1, v0, p2}, Ljava/util/PriorityQueue;-><init>(ILjava/util/Comparator;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->noticeQueue:Ljava/util/PriorityQueue;
 
@@ -185,17 +187,19 @@
 
     const-string p2, "BehaviorSubject.create()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    const/4 p1, 0x0
+
+    invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
     const-string p2, "BehaviorSubject.create(null as Notice?)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->noticePublisher:Lrx/subjects/BehaviorSubject;
 
@@ -210,20 +214,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->firstUseTimestamp$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getClock$p(Lcom/discord/stores/StoreNotices;)Lcom/discord/utilities/time/Clock;
@@ -370,21 +360,21 @@
     :try_start_0
     const-string v0, "noticeName"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticesSeenCache:Lcom/discord/utilities/persister/Persister;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    new-instance v3, Lcom/discord/stores/StoreNotices$clearSeen$1;
+    new-instance v2, Lcom/discord/stores/StoreNotices$clearSeen$1;
 
-    invoke-direct {v3, p1}, Lcom/discord/stores/StoreNotices$clearSeen$1;-><init>(Ljava/lang/String;)V
+    invoke-direct {v2, p1}, Lcom/discord/stores/StoreNotices$clearSeen$1;-><init>(Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
-    invoke-static {v0, v2, v3, p1, v1}, Lcom/discord/utilities/persister/Persister;->getAndSet$default(Lcom/discord/utilities/persister/Persister;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Object;
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v2, p1, v3}, Lcom/discord/utilities/persister/Persister;->getAndSet$default(Lcom/discord/utilities/persister/Persister;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -392,14 +382,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
@@ -443,7 +425,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreNotices$getNotices$1;-><init>(Lcom/discord/stores/StoreNotices;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -453,7 +435,7 @@
 
     const-string v1, "noticePublisher\n      .s\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -469,27 +451,29 @@
 .method public init(Landroid/content/Context;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
     sget-object p1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const-string v1, "Notices init"
+    const-string v0, "Notices init"
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     sget-object p1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const-string v1, "Notices prev seen: "
+    const-string v0, "Notices prev seen: "
 
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v1
+    move-result-object v0
 
     iget-object v3, p0, Lcom/discord/stores/StoreNotices;->noticesSeenCache:Lcom/discord/utilities/persister/Persister;
 
@@ -503,13 +487,13 @@
 
     move-result-object v3
 
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/BehaviorSubject;
 
@@ -517,21 +501,21 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreNotices$init$1;-><init>(Lcom/discord/stores/StoreNotices;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-wide/16 v0, 0x32
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v1, 0x32
 
-    invoke-virtual {p1, v0, v1, v2}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-virtual {p1, v1, v2, v0}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "processTrigger\n        .\u2026S, TimeUnit.MILLISECONDS)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -548,19 +532,14 @@
     invoke-virtual {p1, v0, v1}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final markDialogSeen(Ljava/lang/String;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "noticeDialogType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-static {p1}, Lcom/discord/stores/StoreNotices$Dialog$Type;->valueOf(Ljava/lang/String;)Lcom/discord/stores/StoreNotices$Dialog$Type;
@@ -588,46 +567,30 @@
 
     :goto_0
     return-void
-
-    :cond_0
-    const-string p1, "noticeDialogType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final markSeen(Lcom/discord/stores/StoreNotices$Dialog$Type;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->name()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v3, 0x0
 
-    const/4 v4, 0x2
+    const/4 v5, 0x2
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    move-object v0, p0
+    move-object v1, p0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
+    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final declared-synchronized markSeen(Ljava/lang/String;J)V
@@ -638,23 +601,21 @@
     :try_start_0
     const-string v0, "noticeName"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v2, "Notice seen: "
+    const-string v1, "Notice seen: "
 
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v2, " @ "
+    const-string v1, " @ "
 
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
@@ -673,15 +634,17 @@
     :cond_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    move-object v3, v2
+    move-object v3, v1
 
     check-cast v3, Lcom/discord/stores/StoreNotices$Notice;
 
@@ -689,7 +652,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -698,18 +661,18 @@
     goto :goto_0
 
     :cond_1
-    move-object v2, v1
+    move-object v1, v2
 
     :goto_0
-    check-cast v2, Lcom/discord/stores/StoreNotices$Notice;
+    check-cast v1, Lcom/discord/stores/StoreNotices$Notice;
 
-    if-eqz v2, :cond_9
+    if-eqz v1, :cond_9
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticeQueue:Ljava/util/PriorityQueue;
 
-    invoke-virtual {v0, v2}, Ljava/util/PriorityQueue;->remove(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/util/PriorityQueue;->remove(Ljava/lang/Object;)Z
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreNotices$Notice;->getDelayPeriodMs()J
+    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Notice;->getDelayPeriodMs()J
 
     move-result-wide v3
 
@@ -731,7 +694,7 @@
 
     if-nez v3, :cond_2
 
-    move-object v3, v1
+    move-object v3, v2
 
     goto :goto_1
 
@@ -805,7 +768,7 @@
     :cond_7
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->lastShownTimes:Ljava/util/HashMap;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreNotices$Notice;->getPriority()I
+    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Notice;->getPriority()I
 
     move-result v3
 
@@ -819,7 +782,7 @@
 
     invoke-interface {v0, v3, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreNotices$Notice;->getPersist()Z
+    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Notice;->getPersist()Z
 
     move-result v0
 
@@ -833,52 +796,52 @@
 
     check-cast v0, Ljava/util/HashMap;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
-    invoke-interface {v0, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v1, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/discord/stores/StoreNotices;->noticesSeenCache:Lcom/discord/utilities/persister/Persister;
+    iget-object v1, p0, Lcom/discord/stores/StoreNotices;->noticesSeenCache:Lcom/discord/utilities/persister/Persister;
 
     const/4 v3, 0x1
 
-    invoke-virtual {v2, v0, v3}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
+    invoke-virtual {v1, v0, v3}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
 
     sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
     const-string v3, "Notice seen saved: "
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const-string p1, " @ "
 
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     const/4 p2, 0x2
 
-    invoke-static {v0, p1, v1, p2, v1}, Lcom/discord/utilities/logging/Logger;->v$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {v0, p1, v2, p2, v2}, Lcom/discord/utilities/logging/Logger;->v$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     :cond_8
     iget-object p1, p0, Lcom/discord/stores/StoreNotices;->noticePublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {p1, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     :cond_9
     iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/BehaviorSubject;
@@ -893,14 +856,6 @@
 
     return-void
 
-    :cond_a
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
@@ -932,16 +887,14 @@
 .end method
 
 .method public final declared-synchronized requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
-    .locals 5
+    .locals 4
 
     monitor-enter p0
 
     :try_start_0
     const-string v0, "notice"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticesSeenCache:Lcom/discord/utilities/persister/Persister;
 
@@ -953,9 +906,9 @@
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v0, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -969,17 +922,17 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticeQueue:Ljava/util/PriorityQueue;
 
-    instance-of v2, v0, Ljava/util/Collection;
+    instance-of v1, v0, Ljava/util/Collection;
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
     invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
     goto :goto_0
 
@@ -991,35 +944,35 @@
     :cond_1
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lcom/discord/stores/StoreNotices$Notice;
+    check-cast v1, Lcom/discord/stores/StoreNotices$Notice;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :cond_2
     :goto_0
-    if-eqz v3, :cond_4
+    if-eqz v2, :cond_4
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticeQueue:Ljava/util/PriorityQueue;
 
@@ -1029,15 +982,15 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v2, "Notice Request: "
+    const-string v1, "Notice Request: "
 
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreNotices$Notice;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -1047,25 +1000,27 @@
 
     sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v3, "Notice queues: "
+    const-string v2, "Notice queues: "
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lcom/discord/stores/StoreNotices;->noticeQueue:Ljava/util/PriorityQueue;
+    iget-object v2, p0, Lcom/discord/stores/StoreNotices;->noticeQueue:Ljava/util/PriorityQueue;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {v0, v2, v1, v3, v1}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v3, v2, v3}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreNotices$Notice;->getDelayPeriodMs()J
 
@@ -1093,14 +1048,6 @@
 
     return-void
 
-    :cond_5
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
index bfb7836cc6..c891a6a94c 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreNotifications$configureNotificationClient$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreNotifications;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreNotifications;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleRegistrationToken"
+
+    const-string v5, "handleRegistrationToken(Ljava/lang/String;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRegistrationToken"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreNotifications;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRegistrationToken(Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreNotifications;
 
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 778d09d059..29c1b73c3f 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
+        "Ljava/lang/Boolean;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
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 704d9b05f2..54c8f50efe 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$configureNotificationClient$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -54,7 +54,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -97,11 +97,11 @@
 
     const-string v2, "settings"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "isBackgrounded"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali
index 8144284e81..7674b92197 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.smali
@@ -3,7 +3,7 @@
 .source "StoreNotifications.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/HashSet<",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -86,7 +93,7 @@
 
     const-string v0, "channelPermissions"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -155,7 +162,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
+    invoke-static {p1}, Lk0/j/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
 
     move-result-object p1
 
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 28f1c8ad4a..ecd90874ed 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
@@ -31,7 +31,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "Ljava/util/HashSet<",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
+        ">;"
     }
 .end annotation
 
@@ -82,13 +89,13 @@
 
     move-object/from16 v9, p3
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "nonSendableChannelIds"
 
     move-object/from16 v10, p4
 
-    invoke-static {v10, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali
index 9158183173..af22063202 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$displayPopup$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$displayPopup$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotifications$displayPopup$1;->$channel:Lcom/discord/models/domain/ModelChannel;
 
@@ -81,7 +83,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
@@ -113,20 +115,11 @@
 
     move-result-object p1
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v0, p1}, Lcom/discord/utilities/intent/IntentUtils;->consumeExternalRoutingIntent(Landroid/content/Intent;Landroid/content/Context;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$handleChannelSelected$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$handleChannelSelected$1.smali
index 017361d91d..07857df082 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$handleChannelSelected$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$handleChannelSelected$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$handleChannelSelected$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.stores.StoreNotifications$handleChannelSelected$1"
     f = "StoreNotifications.kt"
     l = {}
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p3}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p3}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreNotifications$handleChannelSelected$1;
 
@@ -88,15 +90,6 @@
     iput-object p1, v0, Lcom/discord/stores/StoreNotifications$handleChannelSelected$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
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 1ada0cbc47..3de1d331ff 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$setEnabled$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,13 +47,13 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
-    .locals 12
+    .locals 13
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    iget-boolean v1, p0, Lcom/discord/stores/StoreNotifications$setEnabled$1;->$enabled:Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    iget-boolean v2, p0, Lcom/discord/stores/StoreNotifications$setEnabled$1;->$enabled:Z
 
     const/4 v3, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v9, 0x0
 
-    const/16 v10, 0x1fe
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v11, 0x1fe
 
-    move-object v0, p1
+    const/4 v12, 0x0
 
-    invoke-static/range {v0 .. v11}, 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-object v1, p1
+
+    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
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
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 183bced557..36396bd44b 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,15 +47,15 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
-    .locals 12
+    .locals 13
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v2, p0, Lcom/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1;->$isEnabledInApp:Z
+    iget-boolean v3, p0, Lcom/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1;->$isEnabledInApp:Z
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     const/4 v4, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v9, 0x0
 
-    const/16 v10, 0x1fd
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v11, 0x1fd
 
-    move-object v0, p1
+    const/4 v12, 0x0
 
-    invoke-static/range {v0 .. v11}, 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-object v1, p1
+
+    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
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
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 6e04969674..1c10a864a8 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$setNotificationLightDisabled$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,19 +47,19 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
-    .locals 12
+    .locals 13
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v5, p0, Lcom/discord/stores/StoreNotifications$setNotificationLightDisabled$1;->$notificationLightDisabled:Z
 
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    iget-boolean v4, p0, Lcom/discord/stores/StoreNotifications$setNotificationLightDisabled$1;->$notificationLightDisabled:Z
-
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     const/4 v6, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v9, 0x0
 
-    const/16 v10, 0x1f7
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v11, 0x1f7
 
-    move-object v0, p1
+    const/4 v12, 0x0
 
-    invoke-static/range {v0 .. v11}, 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-object v1, p1
+
+    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
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
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 c595040bbf..d0b75467f1 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$setNotificationSoundDisabled$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,11 +47,13 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
-    .locals 12
+    .locals 13
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v6, p0, Lcom/discord/stores/StoreNotifications$setNotificationSoundDisabled$1;->$notificationSoundDisabled:Z
 
     const/4 v2, 0x0
 
@@ -59,9 +61,7 @@
 
     const/4 v4, 0x0
 
-    iget-boolean v5, p0, Lcom/discord/stores/StoreNotifications$setNotificationSoundDisabled$1;->$notificationSoundDisabled:Z
-
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     const/4 v7, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v9, 0x0
 
-    const/16 v10, 0x1ef
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v11, 0x1ef
 
-    move-object v0, p1
+    const/4 v12, 0x0
 
-    invoke-static/range {v0 .. v11}, 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-object v1, p1
+
+    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
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
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 202686adc3..5dbcf372b5 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,11 +47,13 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
-    .locals 12
+    .locals 13
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v7, p0, Lcom/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1;->$notificationsVibrateDisabled:Z
 
     const/4 v2, 0x0
 
@@ -61,34 +63,25 @@
 
     const/4 v5, 0x0
 
-    iget-boolean v6, p0, Lcom/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1;->$notificationsVibrateDisabled:Z
-
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     const/4 v8, 0x0
 
     const/4 v9, 0x0
 
-    const/16 v10, 0x1df
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v11, 0x1df
 
-    move-object v0, p1
+    const/4 v12, 0x0
 
-    invoke-static/range {v0 .. v11}, 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-object v1, p1
+
+    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
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali
index f53e4ab552..ff97934045 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications$tryTokenPersist$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications.smali b/com.discord/smali/com/discord/stores/StoreNotifications.smali
index e6a046101f..18e884fe13 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications.smali
@@ -57,11 +57,13 @@
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -106,20 +108,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreNotifications;->notificationSettings:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getPushToken$p(Lcom/discord/stores/StoreNotifications;)Ljava/lang/String;
@@ -209,7 +197,7 @@
 
     sget-object v4, Lcom/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1;->INSTANCE:Lcom/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1;
 
-    invoke-virtual {v3, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v3, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
@@ -235,7 +223,7 @@
 
     const-string v1, "Observable\n        .comb\u2026 isBackgrounded\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -247,7 +235,7 @@
 
     const-string v0, "Observable\n        .comb\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v5, Lcom/discord/stores/StoreNotifications$configureNotificationClient$3;->INSTANCE:Lcom/discord/stores/StoreNotifications$configureNotificationClient$3;
 
@@ -408,7 +396,7 @@
 
     iget-object v2, p0, Lcom/discord/stores/StoreNotifications;->pushTokenPersisted:Ljava/lang/String;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -437,7 +425,7 @@
 
     const/4 v3, 0x1
 
-    invoke-static {v2, v3}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v2, v3}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -447,19 +435,19 @@
 
     const-string v2, "RestAPI\n        .api\n   \u2026ormers.restSubscribeOn())"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v2, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v2, Lf/a/b/s;->a:Lf/a/b/s;
 
     new-instance v3, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;
 
     invoke-direct {v3, p0}, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;-><init>(Lcom/discord/stores/StoreNotifications;)V
 
-    invoke-virtual {v2, v1, v3, v1}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v2, v1, v3, v1}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -547,7 +535,7 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    sget-object v0, Lk0/a/j0;->a:Lk0/a/v;
+    sget-object v0, Ll0/a/j0;->a:Ll0/a/v;
 
     invoke-static {v0}, Lf/n/a/k/a;->a(Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/CoroutineScope;
 
@@ -567,7 +555,7 @@
 
     const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     return-void
 .end method
@@ -577,7 +565,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_8
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotifications;->notificationSettings:Lcom/discord/utilities/persister/Persister;
 
@@ -829,15 +819,6 @@
 
     :cond_7
     return-void
-
-    :cond_8
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePreLogout()V
@@ -885,24 +866,17 @@
 .end method
 
 .method public init(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreNotifications;->configureNotificationClient()V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setEnabled(Z)V
diff --git a/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali b/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali
index bb34dd1f3a..5922245bd9 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$NuxState.smali
@@ -216,7 +216,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreNux$NuxState;->premiumGuildHintGuildId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali b/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali
index f3e565fd49..f84eb3b423 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$setFirstOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNux$setFirstOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNux.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,38 +47,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v2, p0, Lcom/discord/stores/StoreNux$setFirstOpen$1;->$value:Z
+    iget-boolean v3, p0, Lcom/discord/stores/StoreNux$setFirstOpen$1;->$value:Z
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xd
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xd
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreNux$setPostRegister$1.smali b/com.discord/smali/com/discord/stores/StoreNux$setPostRegister$1.smali
index 86c3cc9315..ac18552846 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$setPostRegister$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$setPostRegister$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNux$setPostRegister$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNux.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,38 +47,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    iget-boolean v1, p0, Lcom/discord/stores/StoreNux$setPostRegister$1;->$value:Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    iget-boolean v2, p0, Lcom/discord/stores/StoreNux$setPostRegister$1;->$value:Z
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xe
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xe
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreNux$setPremiumGuildHintGuildId$1.smali b/com.discord/smali/com/discord/stores/StoreNux$setPremiumGuildHintGuildId$1.smali
index f190423ead..f760bb7e7c 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$setPremiumGuildHintGuildId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$setPremiumGuildHintGuildId$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNux$setPremiumGuildHintGuildId$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNux.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,38 +47,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v5, p0, Lcom/discord/stores/StoreNux$setPremiumGuildHintGuildId$1;->$value:Ljava/lang/Long;
 
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    iget-object v4, p0, Lcom/discord/stores/StoreNux$setPremiumGuildHintGuildId$1;->$value:Ljava/lang/Long;
+    const/4 v4, 0x0
 
-    const/4 v5, 0x7
+    const/4 v6, 0x7
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali b/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
index f24b51b4d7..a82ece3106 100644
--- a/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreNux$updateNux$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreNux.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNux.smali b/com.discord/smali/com/discord/stores/StoreNux.smali
index 75d284aa62..b0eab50a49 100644
--- a/com.discord/smali/com/discord/stores/StoreNux.smali
+++ b/com.discord/smali/com/discord/stores/StoreNux.smali
@@ -29,9 +29,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -39,21 +41,21 @@
 
     new-instance p1, Lcom/discord/stores/StoreNux$NuxState;
 
-    const/4 v1, 0x0
-
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xf
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xf
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;-><init>(ZZZLjava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;-><init>(ZZZLjava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreNux;->nuxState:Lcom/discord/stores/StoreNux$NuxState;
 
@@ -64,15 +66,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreNux;->nuxStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getNuxState$p(Lcom/discord/stores/StoreNux;)Lcom/discord/stores/StoreNux$NuxState;
@@ -130,7 +123,7 @@
 
     const-string v1, "nuxStateSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -267,7 +260,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "updateFunction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreNux;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -278,13 +273,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "updateFunction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded.smali
index 48907edd35..aaca0e2a57 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded.smali
@@ -39,22 +39,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSources"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;->paymentSources:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "paymentSources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;
@@ -105,22 +100,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "paymentSources"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "paymentSources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -138,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StorePaymentSources$PaymentSourcesState$Loaded;->paymentSources:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$1.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$1.smali
index d5a0ce2781..af8167b635 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$1.smali
@@ -3,7 +3,7 @@
 .source "StorePaymentSources.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/PaymentSourceRaw;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelPaymentSource;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,7 +86,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/stores/StorePaymentSources;->access$ensureDefaultPaymentSource(Lcom/discord/stores/StorePaymentSources;Ljava/util/List;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$2$1.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$2$1.smali
index bd7b755f38..1985747882 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePaymentSources$fetchPaymentSources$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePaymentSources.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     const-string v2, "paymentSources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StorePaymentSources;->access$handlePaymentSourcesFetchSuccess(Lcom/discord/stores/StorePaymentSources;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$3$1.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$3$1.smali
index ae9056def1..7bb9a73760 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePaymentSources$fetchPaymentSources$1$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePaymentSources.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.smali b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.smali
index 50ff9d427a..2ef1bc73cb 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePaymentSources$fetchPaymentSources$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePaymentSources.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StorePaymentSources$fetchPaymentSources$1$1;-><init>(Lcom/discord/stores/StorePaymentSources$fetchPaymentSources$1;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StorePaymentSources.smali b/com.discord/smali/com/discord/stores/StorePaymentSources.smali
index 41d10888b3..9e56db1d5c 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources.smali
@@ -34,9 +34,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,15 +55,6 @@
     iput-object p1, p0, Lcom/discord/stores/StorePaymentSources;->paymentSourcesStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$ensureDefaultPaymentSource(Lcom/discord/stores/StorePaymentSources;Ljava/util/List;)Ljava/util/List;
@@ -142,7 +135,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     return-object v0
 
@@ -153,17 +146,17 @@
 
     move-object/from16 v1, p1
 
-    invoke-static {v1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-static {v0}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -341,7 +334,7 @@
 
     const-string v1, "paymentSourcesStateSubje\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePermissions$getForChannel$1.smali b/com.discord/smali/com/discord/stores/StorePermissions$getForChannel$1.smali
index de53aacc78..e84d22806e 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions$getForChannel$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions$getForChannel$1.smali
@@ -3,7 +3,7 @@
 .source "StorePermissions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StorePermissions$getForChannels$1.smali b/com.discord/smali/com/discord/stores/StorePermissions$getForChannels$1.smali
index c19bad994a..88f59f7bbc 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions$getForChannels$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions$getForChannels$1.smali
@@ -3,7 +3,7 @@
 .source "StorePermissions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -80,7 +92,7 @@
 
     const-string v0, "permissions"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/stores/StorePermissions$getForChannels$1;->$guildId:J
 
@@ -97,7 +109,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     check-cast p1, Ljava/util/Map;
diff --git a/com.discord/smali/com/discord/stores/StorePermissions$getForGuild$1.smali b/com.discord/smali/com/discord/stores/StorePermissions$getForGuild$1.smali
index 1143e25e4e..f5dd1ca8e3 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions$getForGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions$getForGuild$1.smali
@@ -3,7 +3,7 @@
 .source "StorePermissions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StorePermissions.smali b/com.discord/smali/com/discord/stores/StorePermissions.smali
index f5177d7645..a774afeb56 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions.smali
@@ -93,13 +93,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeUser"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeChannels"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeGuilds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -164,27 +168,6 @@
     iput-object p1, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannelByGuildPublisher:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final computeChannelPermissions(JLjava/lang/Iterable;)Ljava/util/Map;
@@ -364,7 +347,7 @@
     return-object v13
 
     :cond_3
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     return-object v1
 .end method
@@ -562,7 +545,7 @@
 
     check-cast v1, Ljava/util/Map;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -611,7 +594,7 @@
 
     const-string v1, "permissionsForChannelPub\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -635,7 +618,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StorePermissions$getForChannel$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -645,7 +628,7 @@
 
     const-string p2, "forChannels\n        .map\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -697,7 +680,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StorePermissions$getForChannels$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -707,7 +690,7 @@
 
     const-string p2, "forChannelsByGuild\n     \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -765,7 +748,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StorePermissions$getForGuild$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -775,7 +758,7 @@
 
     const-string p2, "permissionsForGuildPubli\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -809,7 +792,7 @@
 
     const-string v1, "permissionsForGuildPubli\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -872,7 +855,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StorePermissions;->getMeId()J
 
@@ -893,7 +878,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -914,7 +899,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v2, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v2, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     check-cast v2, Ljava/util/Map;
@@ -944,15 +929,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StorePermissions;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleChannelDeleted(Lcom/discord/models/domain/ModelChannel;)V
@@ -960,7 +936,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -968,7 +946,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -989,7 +967,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v2, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     check-cast v2, Ljava/util/Map;
@@ -1008,6 +986,10 @@
 
     move-result-object p1
 
+    const-string v1, "$this$minus"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {v2}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v1
@@ -1029,15 +1011,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StorePermissions;->isDirty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleConnectionOpen()V
@@ -1159,7 +1132,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1168,15 +1143,6 @@
     invoke-direct {p0, v0, v1}, Lcom/discord/stores/StorePermissions;->updateGuildPermissions(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -1184,7 +1150,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "member"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StorePermissions;->getMeId()J
 
@@ -1225,15 +1193,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -1241,7 +1200,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1268,15 +1229,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StorePermissions;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRoleAdd(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
@@ -1284,7 +1236,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "role"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
@@ -1293,15 +1247,6 @@
     invoke-direct {p0, v0, v1}, Lcom/discord/stores/StorePermissions;->updateGuildPermissions(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "role"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRoleRemove(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
@@ -1309,7 +1254,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "role"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole$Payload;->getGuildId()J
 
@@ -1318,15 +1265,6 @@
     invoke-direct {p0, v0, v1}, Lcom/discord/stores/StorePermissions;->updateGuildPermissions(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "role"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -1433,7 +1371,7 @@
 .end method
 
 .method public final setPermissionsForChannels$app_productionDiscordExternalRelease(Ljava/util/Map;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1444,18 +1382,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannels:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
index 93812d7719..6bef04c6c0 100644
--- a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
+++ b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
@@ -229,7 +229,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -237,7 +237,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/j0;->d:Lf/a/b/j0;
+    sget-object v1, Lf/a/b/l0;->d:Lf/a/b/l0;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -247,7 +247,7 @@
 
     invoke-direct {v1, p0, p1, p2}, Lf/a/k/f;-><init>(Lcom/discord/stores/StorePinnedMessages;J)V
 
-    invoke-static {v1, p3}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {v1, p3}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -324,7 +324,7 @@
     :cond_1
     iget-object v1, p0, Lcom/discord/stores/StorePinnedMessages;->messagesPublisher:Lrx/subjects/Subject;
 
-    invoke-interface {v1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StorePinnedMessages;->updatedChannelIds:Ljava/util/Set;
 
@@ -360,7 +360,7 @@
 
     invoke-direct {v1, p1, p2}, Lf/a/k/d;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -368,13 +368,13 @@
 
     invoke-direct {p2, p3, p4}, Lf/a/k/g;-><init>(J)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "observable"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -409,13 +409,13 @@
 
     invoke-direct {v0, p1, p2}, Lf/a/k/e;-><init>(J)V
 
-    invoke-virtual {p3, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "observable"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
index a6a01c34c1..ab7a9d59bc 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
@@ -40,22 +40,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionSlotMap"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlotMap:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionSlotMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
@@ -107,22 +102,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "premiumGuildSubscriptionSlotMap"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionSlotMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +128,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlotMap:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$1.smali
index aeaec262cb..530ca6cc40 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2$1.smali
index a011bcff21..49617328ad 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2.smali
index f0ad9f02a2..15cd84695c 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$2;->this$0:Lcom/discord/stores/StorePremiumGuildSubscription;
 
@@ -76,13 +78,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3$1.smali
index f4bb35e2e7..f5d04b349f 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3.smali
index c2af49c841..e38afaacc0 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionsSlots"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$fetchUserGuildPremiumState$3;->this$0:Lcom/discord/stores/StorePremiumGuildSubscription;
 
@@ -87,13 +89,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptionsSlots"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
index 39768b8fd5..aa3722bc4d 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
@@ -3,7 +3,7 @@
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
+        "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
+        ">;"
     }
 .end annotation
 
@@ -127,7 +129,7 @@
     :goto_1
     iget-object v3, p0, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;->$guildId:Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$updateUserPremiumGuildSubscriptionSlot$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$updateUserPremiumGuildSubscriptionSlot$1.smali
index 556b157903..a2cb925f08 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$updateUserPremiumGuildSubscriptionSlot$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$updateUserPremiumGuildSubscriptionSlot$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StorePremiumGuildSubscription$updateUserPremiumGuildSubscriptionSlot$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali
index 5b13f9021e..b4480ec569 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali
@@ -34,9 +34,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,15 +55,6 @@
     iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->stateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getState$p(Lcom/discord/stores/StorePremiumGuildSubscription;)Lcom/discord/stores/StorePremiumGuildSubscription$State;
@@ -198,13 +191,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "stateSubject.map { state\u2026  state\n        }\n      }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -239,7 +232,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "premiumGuildSubscriptionSlots"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0xa
 
@@ -305,15 +300,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "premiumGuildSubscriptionSlots"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleFetchingState()V
@@ -358,7 +344,9 @@
 .method public final updateUserPremiumGuildSubscriptionSlot(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "newSlot"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -369,13 +357,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newSlot"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$1.smali b/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$1.smali
index b70ad773ab..db50ff4e5c 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$1.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/application/Unread;",
+        "Lcom/discord/models/application/Unread;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$2.smali b/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$2.smali
index 95ea6cebb3..1e3df60e61 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$clearMarker$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReadStates$clearMarker$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReadStates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/application/Unread;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "newValue"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$1.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$1.smali
index e4bd76b2fc..bb668a7ef6 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreReadStates$computeUnreadChannelIds$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreReadStates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function7<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -67,45 +67,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreReadStates;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x7
+    const-class v3, Lcom/discord/stores/StoreReadStates;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x7
+
+    const-string v4, "computeUnreadIds"
+
+    const-string v5, "computeUnreadIds(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "computeUnreadIds"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreReadStates;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "computeUnreadIds(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -131,7 +115,7 @@
 .end method
 
 .method public final invoke(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -173,99 +157,53 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    if-eqz p2, :cond_4
-
-    if-eqz p3, :cond_3
-
-    if-eqz p4, :cond_2
-
-    if-eqz p5, :cond_1
-
-    if-eqz p6, :cond_0
-
-    move-object v9, p0
-
-    iget-object v0, v9, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/stores/StoreReadStates;
+    const-string v0, "p1"
 
     move-object v2, p1
 
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p2"
+
     move-object v3, p2
 
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p3"
+
     move-object v4, p3
 
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p4"
+
     move-object v5, p4
 
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p5"
+
     move-object v6, p5
 
-    move-object/from16 v7, p6
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p6"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v1, Lcom/discord/stores/StoreReadStates;
 
     move-object/from16 v8, p7
 
     invoke-static/range {v1 .. v8}, Lcom/discord/stores/StoreReadStates;->access$computeUnreadIds(Lcom/discord/stores/StoreReadStates;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Lkotlin/Pair;
 
-    move-result-object v0
+    move-result-object v1
 
-    return-object v0
-
-    :cond_0
-    move-object v9, p0
-
-    const-string v1, "p6"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    move-object v9, p0
-
-    const-string v1, "p5"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    move-object v9, p0
-
-    const-string v1, "p4"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    move-object v9, p0
-
-    const-string v1, "p3"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    move-object v9, p0
-
-    const-string v1, "p2"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    move-object v9, p0
-
-    const-string v1, "p1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$2.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$2.smali
index bf6c69aaaf..66142c4f5c 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadChannelIds$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReadStates$computeUnreadChannelIds$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReadStates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -48,7 +48,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -97,9 +97,9 @@
 
     move-result-object v1
 
-    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreReadStates$computeUnreadChannelIds$2;->this$0:Lcom/discord/stores/StoreReadStates;
 
@@ -107,9 +107,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$1.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$1.smali
index 9a983e7cfe..2dd0f6d8d4 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        ">;",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$2.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$2.smali
index bed3354c87..db67afe018 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        ">;",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$3.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$3.smali
index 6ca9b5f218..ee4936ffa7 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1$3.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/application/Unread$Marker;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1.smali
index be967f767b..d1c2db847a 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReadStates$computeUnreadMarker$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReadStates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lrx/Observable<",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -98,7 +98,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$1$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -122,7 +122,7 @@
 
     invoke-direct {v3, p1, p2}, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$1$2;-><init>(J)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$2.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$2.smali
index 953f4ca9f4..f0ba796182 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReadStates$computeUnreadMarker$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReadStates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$3.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$3.smali
index 90eeffeb64..0a4c73a0ec 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReadStates$computeUnreadMarker$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReadStates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lrx/Observable<",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -92,7 +92,7 @@
 
     const-string p2, "getMarker(channelId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$1.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$1.smali
index cdec57e49e..b39b54887f 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$1.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;",
+        "Lcom/discord/models/application/Unread;",
+        ">;"
     }
 .end annotation
 
@@ -66,7 +71,7 @@
 
     const-string v2, "messages"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, p1}, Lcom/discord/models/application/Unread;-><init>(Lcom/discord/models/application/Unread$Marker;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$2.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$2.smali
index 547a2b965c..c2d2cc4153 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4$2.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4.smali
index 6273e55cdb..29ce74e4e8 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$4.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/application/Unread$Marker;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/application/Unread;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,12 +71,15 @@
             "Lcom/discord/models/application/Unread$Marker;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/application/Unread;",
             ">;"
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "marker"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -94,7 +99,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$4$1;-><init>(Lcom/discord/models/application/Unread$Marker;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -106,7 +111,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$4$2;->INSTANCE:Lcom/discord/stores/StoreReadStates$computeUnreadMarker$4$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -118,28 +123,19 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$4$3;-><init>(Lcom/discord/stores/StoreReadStates$computeUnreadMarker$4;)V
 
-    sget-object v1, Lr0/k/a;->a:Lr0/k/a$b;
+    sget-object v1, Ls0/k/a;->a:Ls0/k/a$b;
 
-    new-instance v2, Lr0/l/e/a;
+    new-instance v2, Ls0/l/e/a;
 
-    invoke-direct {v2, v1, v1, v0}, Lr0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    invoke-direct {v2, v1, v1, v0}, Ls0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
 
-    new-instance v0, Lr0/l/a/n;
+    new-instance v0, Ls0/l/a/n;
 
-    invoke-direct {v0, p1, v2}, Lr0/l/a/n;-><init>(Lrx/Observable;Lr0/g;)V
+    invoke-direct {v0, p1, v2}, Ls0/l/a/n;-><init>(Lrx/Observable;Ls0/g;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "marker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$5.smali b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$5.smali
index 57e90ba20d..aa02259e7e 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$computeUnreadMarker$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReadStates$computeUnreadMarker$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReadStates.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/application/Unread;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "newValue"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$getIsUnread$1.smali b/com.discord/smali/com/discord/stores/StoreReadStates$getIsUnread$1.smali
index ee8caf1ada..7f55dc6efa 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$getIsUnread$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$getIsUnread$1.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -47,30 +52,15 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Set;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreReadStates$getIsUnread$1;->call(Ljava/util/Set;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Set;)Z
+.method public final call(Ljava/util/Set;)Ljava/lang/Boolean;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/Set<",
             "Ljava/lang/Long;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -84,5 +74,21 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Set;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreReadStates$getIsUnread$1;->call(Ljava/util/Set;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates$getUnreadMarker$1.smali b/com.discord/smali/com/discord/stores/StoreReadStates$getUnreadMarker$1.smali
index 9e4d369ebc..7cfa33bceb 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates$getUnreadMarker$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates$getUnreadMarker$1.smali
@@ -3,7 +3,7 @@
 .source "StoreReadStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/application/Unread;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,26 +49,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/application/Unread;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreReadStates$getUnreadMarker$1;->call(Lcom/discord/models/application/Unread;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/application/Unread;)Z
+.method public final call(Lcom/discord/models/application/Unread;)Ljava/lang/Boolean;
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "marker"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker;
 
@@ -92,14 +78,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    :cond_1
-    const-string p1, "marker"
+    move-result-object p1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/application/Unread;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreReadStates$getUnreadMarker$1;->call(Lcom/discord/models/application/Unread;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates.smali b/com.discord/smali/com/discord/stores/StoreReadStates.smali
index bb0959b520..5908e91cf5 100644
--- a/com.discord/smali/com/discord/stores/StoreReadStates.smali
+++ b/com.discord/smali/com/discord/stores/StoreReadStates.smali
@@ -60,9 +60,9 @@
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -70,68 +70,63 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    new-instance v1, Ljava/util/HashSet;
+    new-instance v0, Ljava/util/HashSet;
 
-    invoke-direct {v1}, Ljava/util/HashSet;-><init>()V
+    invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p1, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+    invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreReadStates;->unreadChannelIds:Lrx/subjects/SerializedSubject;
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    new-instance v1, Ljava/util/HashSet;
+    new-instance v0, Ljava/util/HashSet;
 
-    invoke-direct {v1}, Ljava/util/HashSet;-><init>()V
+    invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p1, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+    invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreReadStates;->unreadGuildIds:Lrx/subjects/SerializedSubject;
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p1, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+    invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreReadStates;->markAsRead:Lrx/subjects/SerializedSubject;
 
     new-instance p1, Lcom/discord/utilities/persister/Persister;
 
-    new-instance v1, Lcom/discord/models/application/Unread;
+    new-instance v0, Lcom/discord/models/application/Unread;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/4 v3, 0x3
 
-    invoke-direct {v1, v0, v2, v3, v0}, Lcom/discord/models/application/Unread;-><init>(Lcom/discord/models/application/Unread$Marker;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1, v2, v3, v1}, Lcom/discord/models/application/Unread;-><init>(Lcom/discord/models/application/Unread$Marker;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const-string v0, "UNREAD_MESSAGE_MARKER_V3"
+    const-string v1, "UNREAD_MESSAGE_MARKER_V3"
 
-    invoke-direct {p1, v0, v1}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct {p1, v1, v0}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreReadStates;->unreadMessageMarker:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$clearMarker(Lcom/discord/stores/StoreReadStates;)V
@@ -195,7 +190,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreReadStates$clearMarker$1;->INSTANCE:Lcom/discord/stores/StoreReadStates$clearMarker$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -205,9 +200,9 @@
 
     move-result-object v2
 
-    const-string v0, "unreadMessageMarker\n    \u2026ount() }\n        .take(1)"
+    const-string/jumbo v0, "unreadMessageMarker\n    \u2026ount() }\n        .take(1)"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v6, Lcom/discord/stores/StoreReadStates$clearMarker$2;
 
@@ -215,7 +210,7 @@
 
     const/4 v3, 0x0
 
-    const-string v4, "unreadMessageMarker"
+    const-string/jumbo v4, "unreadMessageMarker"
 
     const/4 v5, 0x0
 
@@ -370,7 +365,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026imeUnit.SECONDS\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -382,7 +377,7 @@
 
     const-string v0, "ObservableWithLeadingEdg\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v5, Lcom/discord/stores/StoreReadStates$computeUnreadChannelIds$2;
 
@@ -651,7 +646,7 @@
 
     const-string v7, "channel.guildId"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v4, v6}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -699,7 +694,7 @@
 
     sget-object v3, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$3;->INSTANCE:Lcom/discord/stores/StoreReadStates$computeUnreadMarker$3;
 
-    invoke-static {v1, v2, v3}, Lf/a/b/q;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    invoke-static {v1, v2, v3}, Lf/a/b/s;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -711,13 +706,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$4;-><init>(Lcom/discord/stores/StoreReadStates;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "getChannelsSelected()\n  \u2026clearMarker() }\n        }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v6, Lcom/discord/stores/StoreReadStates$computeUnreadMarker$5;
 
@@ -725,7 +720,7 @@
 
     const/4 v3, 0x0
 
-    const-string v4, "unreadMessageMarker"
+    const-string/jumbo v4, "unreadMessageMarker"
 
     const/4 v5, 0x0
 
@@ -824,7 +819,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreReadStates$getIsUnread$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -834,7 +829,7 @@
 
     const-string p2, "getUnreadGuildIds()\n    \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -892,7 +887,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreReadStates$getUnreadMarker$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -900,9 +895,9 @@
 
     move-result-object p1
 
-    const-string p2, "unreadMarkerForSelectedC\u2026  .distinctUntilChanged()"
+    const-string/jumbo p2, "unreadMarkerForSelectedC\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -932,17 +927,19 @@
 
     move-result-object v0
 
-    const-string v1, "unreadMessageMarker\n    \u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "unreadMessageMarker\n    \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
 .method public init(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -951,15 +948,6 @@
     invoke-direct {p0}, Lcom/discord/stores/StoreReadStates;->computeUnreadMarker()V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final markAsRead(Ljava/lang/Long;)V
@@ -974,17 +962,17 @@
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreReadStates;->markAsRead:Lrx/subjects/SerializedSubject;
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
diff --git a/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali b/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali
index 1f11f3cef0..f677bebb7c 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest$onReviewRequestShown$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReviewRequest$onReviewRequestShown$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReviewRequest.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,22 +71,15 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/16 v0, 0x2b5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "CACHE_KEY_VIEWED_REVIEW_REQUEST_REVISION"
+    const-string v0, "CACHE_KEY_VIEWED_REVIEW_REQUEST_REVISION"
 
-    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putInt(Ljava/lang/String;I)Landroid/content/SharedPreferences$Editor;
+    const/16 v1, 0x2b5
+
+    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences$Editor;->putInt(Ljava/lang/String;I)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali b/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali
index 36cdcedac3..2dfb010cc6 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreReviewRequest$onUserAcceptedRequest$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreReviewRequest.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,22 +71,15 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v0, 0x1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "CACHE_KEY_HAS_ACCEPTED_REVIEW_REQUEST"
+    const-string v0, "CACHE_KEY_HAS_ACCEPTED_REVIEW_REQUEST"
 
-    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    const/4 v1, 0x1
+
+    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreReviewRequest.smali b/com.discord/smali/com/discord/stores/StoreReviewRequest.smali
index 022959ff10..0641313228 100644
--- a/com.discord/smali/com/discord/stores/StoreReviewRequest.smali
+++ b/com.discord/smali/com/discord/stores/StoreReviewRequest.smali
@@ -49,11 +49,13 @@
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -66,20 +68,6 @@
     iput p1, p0, Lcom/discord/stores/StoreReviewRequest;->requestedReviewRevision:I
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -89,7 +77,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_a
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuilds()Ljava/util/List;
 
@@ -132,7 +122,7 @@
 
     const-string v4, "it"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuild;->getMemberCount()I
 
@@ -169,7 +159,7 @@
 
     const-string v0, "payload.me"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
 
@@ -254,21 +244,14 @@
     :cond_9
     :goto_3
     return-void
-
-    :cond_a
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public init(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -301,15 +284,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreReviewRequest;->hasUserAcceptedReviewRequest:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onReviewRequestShown()V
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo.smali
index 44040db649..2b9f39fe83 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo.smali
@@ -15,16 +15,20 @@
 
 
 # instance fields
+.field public final channelId:Ljava/lang/Long;
+
 .field public final mediaSessionId:Ljava/lang/String;
 
 .field public final rtcConnectionId:Ljava/lang/String;
 
 
 # direct methods
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "rtcConnectionId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -32,36 +36,36 @@
 
     iput-object p2, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->mediaSessionId:Ljava/lang/String;
 
+    iput-object p3, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
     return-void
-
-    :cond_0
-    const-string p1, "rtcConnectionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+.method public static synthetic copy$default(Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
     .locals 0
 
-    and-int/lit8 p4, p3, 0x1
+    and-int/lit8 p5, p4, 0x1
 
-    if-eqz p4, :cond_0
+    if-eqz p5, :cond_0
 
     iget-object p1, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->rtcConnectionId:Ljava/lang/String;
 
     :cond_0
-    and-int/lit8 p3, p3, 0x2
+    and-int/lit8 p5, p4, 0x2
 
-    if-eqz p3, :cond_1
+    if-eqz p5, :cond_1
 
     iget-object p2, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->mediaSessionId:Ljava/lang/String;
 
     :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-object p3, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
 
     move-result-object p0
 
@@ -86,25 +90,26 @@
     return-object v0
 .end method
 
-.method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+.method public final component3()Ljava/lang/Long;
     .locals 1
 
-    if-eqz p1, :cond_0
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+    .locals 1
+
+    const-string v0, "rtcConnectionId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "rtcConnectionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->rtcConnectionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -130,9 +135,19 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->mediaSessionId:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->mediaSessionId:Ljava/lang/String;
+    iget-object v1, p1, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->mediaSessionId:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
+    iget-object p1, p1, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -152,6 +167,14 @@
     return p1
 .end method
 
+.method public final getChannelId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
 .method public final getMediaSessionId()Ljava/lang/String;
     .locals 1
 
@@ -195,16 +218,34 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v1
+    move-result v2
+
+    goto :goto_1
 
     :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_2
     add-int/2addr v0, v1
 
     return v0
 .end method
 
 .method public toString()Ljava/lang/String;
-    .locals 3
+    .locals 2
 
     const-string v0, "RtcConnectionAnalyticsInfo(rtcConnectionId="
 
@@ -222,9 +263,21 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->mediaSessionId:Ljava/lang/String;
 
-    const-string v2, ")"
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    const-string v1, ", channelId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->channelId:Ljava/lang/Long;
+
+    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
 
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1$1.smali
index 83d3e676e2..02c2d29982 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-string v2, "isMuted"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali
index eff1b7fc83..670277bc3d 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2$1.smali
index d8be045027..1fe7078a0a 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-string v2, "isDeafened"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali
index 8c6c4b9347..0068424cb8 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali
index cb27ce8aae..999d59f42d 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$3.smali
@@ -3,7 +3,7 @@
 .source "StoreRtcConnection.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lco/discord/media_engine/VideoInputDeviceDescription;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lco/discord/media_engine/VideoInputDeviceDescription;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcConnection$init$3;->call(Lco/discord/media_engine/VideoInputDeviceDescription;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lco/discord/media_engine/VideoInputDeviceDescription;)Z
+.method public final call(Lco/discord/media_engine/VideoInputDeviceDescription;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -86,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lco/discord/media_engine/VideoInputDeviceDescription;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcConnection$init$3;->call(Lco/discord/media_engine/VideoInputDeviceDescription;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4$1.smali
index 30327b9729..0c7fc37318 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$4$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-string v2, "isVideoSelected"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali
index ae27f4f614..981f64ae5f 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$5$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$5$1.smali
index e3e08be08a..ee021480ba 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$5$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$5$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$5$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,9 +68,9 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreRtcConnection$init$5$1;->$usersVolume:Ljava/util/Map;
 
-    const-string v2, "usersVolume"
+    const-string/jumbo v2, "usersVolume"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreRtcConnection;->access$handleUsersVolume(Lcom/discord/stores/StoreRtcConnection;Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$7$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$7$1.smali
index b5467a9e55..73c109477f 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$init$7$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$init$7$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$init$7$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,9 +68,9 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreRtcConnection$init$7$1;->$usersMuted:Ljava/util/Map;
 
-    const-string v2, "usersMuted"
+    const-string/jumbo v2, "usersMuted"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreRtcConnection;->access$handleUsersMuted(Lcom/discord/stores/StoreRtcConnection;Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$onAnalyticsEvent$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$onAnalyticsEvent$1.smali
index a2ee1a6315..cf258e3e06 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$onAnalyticsEvent$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$onAnalyticsEvent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$onAnalyticsEvent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$onMediaSessionIdReceived$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$onMediaSessionIdReceived$1.smali
index 15e306ac33..2e0df5f45c 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$onMediaSessionIdReceived$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$onMediaSessionIdReceived$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$onMediaSessionIdReceived$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection$onVideoStream$1.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection$onVideoStream$1.smali
index c59e92fc42..47c133d6c8 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection$onVideoStream$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection$onVideoStream$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRtcConnection$onVideoStream$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
index 0ab1179ea7..e65271bcb3 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
@@ -72,6 +72,8 @@
 
 .field public rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
 
+.field public rtcConnectionAnalyticsInfo:Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+
 .field public final rtcConnectionAnalyticsInfoSubject:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -121,19 +123,27 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreRtcRegion;Lcom/discord/stores/StoreAnalytics;)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "clock"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeRtcRegion"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeAnalytics"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -163,6 +173,8 @@
 
     new-instance p1, Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;
 
+    const/4 v1, 0x0
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -173,15 +185,13 @@
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/16 v7, 0x20
 
-    const/16 v8, 0x20
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    move-object v0, p1
 
-    move-object v1, p1
-
-    invoke-direct/range {v1 .. v9}, Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;-><init>(Ljava/lang/Long;Ljava/lang/Long;ZZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v0 .. v8}, Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;-><init>(Ljava/lang/Long;Ljava/lang/Long;ZZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->currentVoiceState:Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;
 
@@ -201,13 +211,15 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->connectionStateSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    const/4 p1, 0x0
+
+    invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
     const-string p2, "BehaviorSubject.create(n\u2026ConnectionAnalyticsInfo?)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnectionAnalyticsInfoSubject:Lrx/subjects/BehaviorSubject;
 
@@ -223,7 +235,7 @@
 
     const-string p2, "connectionStateSubject\n \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->connectionState:Lrx/Observable;
 
@@ -231,7 +243,7 @@
 
     const-string p2, "qualitySubject"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -243,7 +255,7 @@
 
     const-string p2, "qualitySubject\n         \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->quality:Lrx/Observable;
 
@@ -251,7 +263,7 @@
 
     const-string p2, "speakingUsersSubject"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -263,46 +275,11 @@
 
     const-string p2, "speakingUsersSubject\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->speakingUpdates:Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeRtcRegion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreRtcConnection;)Lcom/discord/stores/Dispatcher;
@@ -407,7 +384,7 @@
 
     iget-object v4, v0, Lcom/discord/rtcconnection/RtcConnection;->v:Ljava/lang/Long;
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -464,9 +441,9 @@
 
     move-result-object v2
 
-    const-string v5, "voiceServer.endpoint"
+    const-string/jumbo v5, "voiceServer.endpoint"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v4, v3, v4}, Lcom/discord/utilities/ssl/SecureSocketsLayerUtils;->createSocketFactory$default(Ljavax/net/ssl/TrustManagerFactory;ILjava/lang/Object;)Ljavax/net/ssl/SSLSocketFactory;
 
@@ -477,6 +454,10 @@
 
     move-result-object v1
 
+    const-string v3, "endpoint"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v3, Lf/a/h/g;
 
     invoke-direct {v3, v0, v2, v1, v4}, Lf/a/h/g;-><init>(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)V
@@ -489,7 +470,7 @@
 .end method
 
 .method private final createRtcConnection()V
-    .locals 20
+    .locals 21
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -616,7 +597,7 @@
     move-object v5, v2
 
     :goto_4
-    invoke-static {v5, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -634,7 +615,7 @@
     move-object v5, v2
 
     :goto_5
-    invoke-static {v5, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -643,7 +624,7 @@
     return-void
 
     :cond_7
-    new-instance v15, Lcom/discord/rtcconnection/RtcConnection;
+    new-instance v13, Lcom/discord/rtcconnection/RtcConnection;
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
@@ -673,45 +654,53 @@
 
     move-result-wide v10
 
-    sget-object v13, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    iget-object v1, v0, Lcom/discord/stores/StoreRtcConnection;->networkMonitor:Lcom/discord/utilities/networking/NetworkMonitor;
+    iget-object v3, v0, Lcom/discord/stores/StoreRtcConnection;->networkMonitor:Lcom/discord/utilities/networking/NetworkMonitor;
 
-    if-eqz v1, :cond_9
+    if-eqz v3, :cond_9
 
-    const/4 v2, 0x0
+    const/4 v15, 0x0
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
     move-result-object v14
 
-    iget-object v3, v0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
+    iget-object v2, v0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings;->getMutedUsers()Ljava/util/Map;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings;->getMutedUsers()Ljava/util/Map;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-static {v3}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
+    invoke-static {v2}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v17
 
-    const/16 v18, 0x200
+    const/16 v18, 0x0
 
-    move-object v3, v15
+    const/16 v19, 0x1200
 
-    move-object/from16 v19, v15
+    move-object v2, v3
 
-    move-object v15, v2
+    move-object v3, v13
 
-    move-object/from16 v16, v1
+    move-object/from16 v20, v13
 
-    invoke-direct/range {v3 .. v18}, Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;ZLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/time/Clock;Lcom/discord/rtcconnection/RtcConnection$c;Lcom/discord/utilities/networking/NetworkMonitor;Ljava/util/Map;I)V
+    move-object v13, v1
 
-    move-object/from16 v1, v19
+    move-object/from16 v16, v2
+
+    invoke-direct/range {v3 .. v19}, Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;ZLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/time/Clock;Lcom/discord/rtcconnection/RtcConnection$c;Lcom/discord/utilities/networking/NetworkMonitor;Ljava/util/Map;Ljava/lang/String;I)V
+
+    const-string v1, "listener"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v1, v20
 
     iget-object v2, v1, Lcom/discord/rtcconnection/RtcConnection;->c:Ljava/util/List;
 
@@ -726,7 +715,7 @@
     :cond_9
     const-string v1, "networkMonitor"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -1132,7 +1121,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     move-object v6, v0
@@ -1166,7 +1155,7 @@
     :cond_1
     const-string p1, "context"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1232,7 +1221,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     move-object v6, v0
@@ -1347,7 +1336,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->storeRtcRegion:Lcom/discord/stores/StoreRtcRegion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreRtcRegion;->getCloudflareBestRegion$app_productionDiscordExternalRelease()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreRtcRegion;->getPreferredRegion()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1393,7 +1382,7 @@
 .end method
 
 .method private final updateAnalyticsInfo()V
-    .locals 3
+    .locals 6
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -1405,9 +1394,15 @@
 
     iget-object v2, v0, Lcom/discord/rtcconnection/RtcConnection;->a:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/discord/rtcconnection/RtcConnection;->s:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->s:Ljava/lang/String;
 
-    invoke-direct {v1, v2, v0}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+    iget-wide v4, v0, Lcom/discord/rtcconnection/RtcConnection;->w:J
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    invoke-direct {v1, v2, v3, v0}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
 
     goto :goto_0
 
@@ -1415,6 +1410,8 @@
     const/4 v1, 0x0
 
     :goto_0
+    iput-object v1, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnectionAnalyticsInfo:Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnectionAnalyticsInfoSubject:Lrx/subjects/BehaviorSubject;
 
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
@@ -1488,6 +1485,16 @@
     return-object v0
 .end method
 
+.method public final getRtcConnectionAnalyticsInfo()Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnectionAnalyticsInfo:Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
+
+    return-object v0
+.end method
+
 .method public final getSpeakingUpdates()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -1511,7 +1518,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getSessionId()Ljava/lang/String;
 
@@ -1529,7 +1538,11 @@
 
     const-string v1, "payload.sessionId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "<set-?>"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, v0, Lcom/discord/rtcconnection/RtcConnection;->x:Ljava/lang/String;
 
@@ -1539,15 +1552,6 @@
     invoke-direct {p0}, Lcom/discord/stores/StoreRtcConnection;->checkForVoiceServerUpdate()V
 
     return-void
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleConnectionReady(Z)V
@@ -1606,7 +1610,7 @@
     move-object v0, v1
 
     :goto_0
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1654,13 +1658,13 @@
 
     iget-object v3, p0, Lcom/discord/stores/StoreRtcConnection;->currentVoiceState:Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_5
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_5
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -1682,21 +1686,15 @@
     :goto_2
     if-eqz v4, :cond_5
 
+    move-object v4, v0
+
     goto :goto_3
 
     :cond_5
-    move-object v0, v1
-
-    :goto_3
-    move-object v4, v0
-
-    goto :goto_4
-
-    :cond_6
     move-object v4, v1
 
-    :goto_4
-    if-eqz p1, :cond_7
+    :goto_3
+    if-eqz p1, :cond_6
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -1708,12 +1706,12 @@
 
     move-object v5, v0
 
-    goto :goto_5
+    goto :goto_4
 
-    :cond_7
+    :cond_6
     move-object v5, v1
 
-    :goto_5
+    :goto_4
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -1732,7 +1730,7 @@
 
     iput-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->currentVoiceState:Lcom/discord/gateway/io/OutgoingPayload$VoiceStateUpdate;
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_7
 
     iput-boolean v2, p0, Lcom/discord/stores/StoreRtcConnection;->hasSelectedVoiceChannel:Z
 
@@ -1752,12 +1750,12 @@
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreRtcConnection;->logChannelJoin(Lcom/discord/models/domain/ModelChannel;)V
 
-    goto :goto_6
+    goto :goto_5
 
-    :cond_8
+    :cond_7
     iput-object v1, p0, Lcom/discord/stores/StoreRtcConnection;->voiceServer:Lcom/discord/models/domain/ModelVoice$Server;
 
-    :goto_6
+    :goto_5
     invoke-direct {p0}, Lcom/discord/stores/StoreRtcConnection;->onVoiceStateUpdated()V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreRtcConnection;->checkForVoiceServerUpdate()V
@@ -1770,7 +1768,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "voiceServer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1793,227 +1793,234 @@
     invoke-direct {p0}, Lcom/discord/stores/StoreRtcConnection;->checkForVoiceServerUpdate()V
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceServer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final init(Landroid/content/Context;Lcom/discord/utilities/networking/NetworkMonitor;)V
-    .locals 8
+    .locals 20
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v7, 0x0
+    move-object/from16 v0, p0
 
-    if-eqz p1, :cond_1
+    move-object/from16 v1, p1
 
-    if-eqz p2, :cond_0
+    move-object/from16 v2, p2
 
-    iput-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->context:Landroid/content/Context;
+    const-string v3, "context"
 
-    iput-object p2, p0, Lcom/discord/stores/StoreRtcConnection;->networkMonitor:Lcom/discord/utilities/networking/NetworkMonitor;
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    const-string v3, "networkMonitor"
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object p1
+    iput-object v1, v0, Lcom/discord/stores/StoreRtcConnection;->context:Landroid/content/Context;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->isSelfMuted()Lrx/Observable;
+    iput-object v2, v0, Lcom/discord/stores/StoreRtcConnection;->networkMonitor:Lcom/discord/utilities/networking/NetworkMonitor;
 
-    move-result-object p1
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    new-instance v4, Lcom/discord/stores/StoreRtcConnection$init$1;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-direct {v4, p0}, Lcom/discord/stores/StoreRtcConnection$init$1;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
+    move-result-object v1
 
-    const-class v2, Lcom/discord/stores/StoreRtcConnection;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->isSelfMuted()Lrx/Observable;
 
-    const/16 p2, 0x3c
+    move-result-object v1
 
-    and-int/lit8 p2, p2, 0x4
+    new-instance v6, Lcom/discord/stores/StoreRtcConnection$init$1;
 
-    const/16 p2, 0x3c
+    invoke-direct {v6, v0}, Lcom/discord/stores/StoreRtcConnection$init$1;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
 
-    and-int/lit8 p2, p2, 0x8
+    const-class v4, Lcom/discord/stores/StoreRtcConnection;
 
-    const/16 p2, 0x3c
+    const/16 v2, 0x3c
 
-    and-int/lit8 p2, p2, 0x10
+    and-int/lit8 v2, v2, 0x4
 
-    const/16 p2, 0x3c
+    const/16 v2, 0x3c
 
-    and-int/lit8 p2, p2, 0x20
+    and-int/lit8 v2, v2, 0x8
 
-    new-instance p2, Lf/a/b/a0;
+    const/16 v2, 0x3c
 
-    move-object v0, p2
+    and-int/lit8 v2, v2, 0x10
 
-    move-object v1, v7
+    const/16 v2, 0x3c
 
-    move-object v3, v7
+    and-int/lit8 v2, v2, 0x20
 
-    move-object v5, v7
+    const-string v9, "onNext"
 
-    move-object v6, v7
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    const-string v10, "errorClass"
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-static {v4, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    new-instance v11, Lf/a/b/c0;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+    const/16 v19, 0x0
 
-    move-result-object p1
+    move-object v2, v11
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->isSelfDeafened()Lrx/Observable;
+    move-object/from16 v3, v19
 
-    move-result-object p1
+    move-object/from16 v5, v19
 
-    new-instance v4, Lcom/discord/stores/StoreRtcConnection$init$2;
+    move-object/from16 v7, v19
 
-    invoke-direct {v4, p0}, Lcom/discord/stores/StoreRtcConnection$init$2;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
+    move-object/from16 v8, v19
 
-    const-class v2, Lcom/discord/stores/StoreRtcConnection;
+    invoke-direct/range {v2 .. v8}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
-    const/16 p2, 0x3c
+    invoke-virtual {v1, v11}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
-    and-int/lit8 p2, p2, 0x4
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    const/16 p2, 0x3c
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
 
-    and-int/lit8 p2, p2, 0x8
+    move-result-object v1
 
-    const/16 p2, 0x3c
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->isSelfDeafened()Lrx/Observable;
 
-    and-int/lit8 p2, p2, 0x10
+    move-result-object v1
 
-    const/16 p2, 0x3c
+    new-instance v2, Lcom/discord/stores/StoreRtcConnection$init$2;
 
-    and-int/lit8 p2, p2, 0x20
+    invoke-direct {v2, v0}, Lcom/discord/stores/StoreRtcConnection$init$2;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
 
-    new-instance p2, Lf/a/b/a0;
+    const-class v14, Lcom/discord/stores/StoreRtcConnection;
 
-    move-object v0, p2
+    const/16 v3, 0x3c
 
-    move-object v1, v7
+    and-int/lit8 v3, v3, 0x4
 
-    move-object v3, v7
+    const/16 v3, 0x3c
 
-    move-object v5, v7
+    and-int/lit8 v3, v3, 0x8
 
-    move-object v6, v7
+    const/16 v3, 0x3c
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    and-int/lit8 v3, v3, 0x10
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    const/16 v3, 0x3c
 
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    and-int/lit8 v3, v3, 0x20
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object p1
+    invoke-static {v14, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
+    new-instance v3, Lf/a/b/c0;
 
-    move-result-object p1
+    move-object v12, v3
 
-    sget-object p2, Lcom/discord/stores/StoreRtcConnection$init$3;->INSTANCE:Lcom/discord/stores/StoreRtcConnection$init$3;
+    move-object/from16 v13, v19
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    move-object/from16 v15, v19
 
-    move-result-object p1
+    move-object/from16 v16, v2
 
-    new-instance v4, Lcom/discord/stores/StoreRtcConnection$init$4;
+    move-object/from16 v17, v19
 
-    invoke-direct {v4, p0}, Lcom/discord/stores/StoreRtcConnection$init$4;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
+    move-object/from16 v18, v19
 
-    const-class v2, Lcom/discord/stores/StoreRtcConnection;
+    invoke-direct/range {v12 .. v18}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
-    const/16 p2, 0x3c
+    invoke-virtual {v1, v3}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
-    and-int/lit8 v0, p2, 0x4
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    and-int/lit8 v0, p2, 0x8
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
 
-    and-int/lit8 v0, p2, 0x10
+    move-result-object v1
 
-    and-int/lit8 p2, p2, 0x20
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
 
-    new-instance p2, Lf/a/b/a0;
+    move-result-object v1
 
-    move-object v0, p2
+    sget-object v2, Lcom/discord/stores/StoreRtcConnection$init$3;->INSTANCE:Lcom/discord/stores/StoreRtcConnection$init$3;
 
-    move-object v1, v7
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
-    move-object v3, v7
+    move-result-object v1
 
-    move-object v5, v7
+    new-instance v2, Lcom/discord/stores/StoreRtcConnection$init$4;
 
-    move-object v6, v7
+    invoke-direct {v2, v0}, Lcom/discord/stores/StoreRtcConnection$init$4;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    const-class v14, Lcom/discord/stores/StoreRtcConnection;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    const/16 v3, 0x3c
 
-    iget-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
+    and-int/lit8 v4, v3, 0x4
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
+    and-int/lit8 v4, v3, 0x8
 
-    move-result-object p1
+    and-int/lit8 v4, v3, 0x10
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getUsersVolume()Lrx/Observable;
+    and-int/lit8 v3, v3, 0x20
 
-    move-result-object p1
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p2, Lcom/discord/stores/StoreRtcConnection$init$5;
+    invoke-static {v14, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p2, p0}, Lcom/discord/stores/StoreRtcConnection$init$5;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
+    new-instance v3, Lf/a/b/c0;
 
-    sget-object v0, Lcom/discord/stores/StoreRtcConnection$init$6;->INSTANCE:Lcom/discord/stores/StoreRtcConnection$init$6;
+    move-object v12, v3
 
-    invoke-virtual {p1, p2, v0}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+    move-object/from16 v13, v19
 
-    iget-object p1, p0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
+    move-object/from16 v15, v19
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
+    move-object/from16 v16, v2
 
-    move-result-object p1
+    move-object/from16 v17, v19
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getUsersMuted()Lrx/Observable;
+    move-object/from16 v18, v19
 
-    move-result-object p1
+    invoke-direct/range {v12 .. v18}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
-    new-instance p2, Lcom/discord/stores/StoreRtcConnection$init$7;
+    invoke-virtual {v1, v3}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
-    invoke-direct {p2, p0}, Lcom/discord/stores/StoreRtcConnection$init$7;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
+    iget-object v1, v0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
 
-    sget-object v0, Lcom/discord/stores/StoreRtcConnection$init$8;->INSTANCE:Lcom/discord/stores/StoreRtcConnection$init$8;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-virtual {p1, p2, v0}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getUsersVolume()Lrx/Observable;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/stores/StoreRtcConnection$init$5;
+
+    invoke-direct {v2, v0}, Lcom/discord/stores/StoreRtcConnection$init$5;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
+
+    sget-object v3, Lcom/discord/stores/StoreRtcConnection$init$6;->INSTANCE:Lcom/discord/stores/StoreRtcConnection$init$6;
+
+    invoke-virtual {v1, v2, v3}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+
+    iget-object v1, v0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getUsersMuted()Lrx/Observable;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/stores/StoreRtcConnection$init$7;
+
+    invoke-direct {v2, v0}, Lcom/discord/stores/StoreRtcConnection$init$7;-><init>(Lcom/discord/stores/StoreRtcConnection;)V
+
+    sget-object v3, Lcom/discord/stores/StoreRtcConnection$init$8;->INSTANCE:Lcom/discord/stores/StoreRtcConnection$init$8;
+
+    invoke-virtual {v1, v2, v3}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "networkMonitor"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
 .end method
 
 .method public final observeRtcConnectionAnalyticsInfo()Lrx/Observable;
@@ -2045,11 +2052,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "event"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "properties"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
@@ -2103,20 +2112,6 @@
 
     :goto_0
     return-void
-
-    :cond_4
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onFatalClose()V
@@ -2150,22 +2145,15 @@
 .method public onQualityUpdate(Lcom/discord/rtcconnection/RtcConnection$Quality;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "quality"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->qualitySubject:Lrx/subjects/BehaviorSubject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "quality"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onSpeaking(JZ)V
@@ -2195,7 +2183,9 @@
 .method public onStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -2215,20 +2205,11 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->connectionStateSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onVideoStream(JLjava/lang/Integer;)V
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$Companion.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$Companion.smali
new file mode 100644
index 0000000000..f92a04c70b
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$Companion.smali
@@ -0,0 +1,32 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$Companion;
+.super Ljava/lang/Object;
+.source "StoreRtcRegion.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreRtcRegion;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/stores/StoreRtcRegion$Companion;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1.smali
deleted file mode 100644
index 436b7e7bf1..0000000000
--- a/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public final Lcom/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1;
-.super Lj0/n/c/i;
-.source "StoreRtcRegion.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreRtcRegion;->fetchCloudflareBestRegion()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/String;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreRtcRegion;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreRtcRegion;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1;->invoke(Ljava/lang/String;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Ljava/lang/String;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
-
-    invoke-static {v0, p1}, Lcom/discord/stores/StoreRtcRegion;->access$updateCloudflareBestRegion(Lcom/discord/stores/StoreRtcRegion;Ljava/lang/String;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1.smali
new file mode 100644
index 0000000000..2d5dfe5fbc
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1.smali
@@ -0,0 +1,96 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;
+.super Ljava/lang/Object;
+.source "StoreRtcRegion.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreRtcRegion;->fetchRtcLatencyTestRegionsIps()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;->INSTANCE:Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+    .locals 0
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getRawExperiment()Lcom/discord/models/domain/ModelExperiment;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2.smali
new file mode 100644
index 0000000000..15b617dd9e
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2.smali
@@ -0,0 +1,88 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;
+.super Ljava/lang/Object;
+.source "StoreRtcRegion.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreRtcRegion;->fetchRtcLatencyTestRegionsIps()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;->INSTANCE:Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreExperiments$Experiment;->isEnabled(I)Z
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3.smali
new file mode 100644
index 0000000000..9ea5f808cd
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3.smali
@@ -0,0 +1,110 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3;
+.super Ljava/lang/Object;
+.source "StoreRtcRegion.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreRtcRegion;->fetchRtcLatencyTestRegionsIps()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lrx/Observable<",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+        ">;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreRtcRegion;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreRtcRegion;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3;->call(Ljava/lang/Boolean;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/Boolean;)Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Boolean;",
+            ")",
+            "Lrx/Observable<",
+            "+",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+            ">;>;"
+        }
+    .end annotation
+
+    const-string v0, "isRtcRegionExperimentEnabled"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    invoke-static {p1}, Lcom/discord/stores/StoreRtcRegion;->access$getRestAPI$p(Lcom/discord/stores/StoreRtcRegion;)Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI;->getRtcLatencyTestRegionsIps()Lrx/Observable;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p1, Ls0/l/a/f;->e:Lrx/Observable;
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4.smali
new file mode 100644
index 0000000000..cb0f150701
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4.smali
@@ -0,0 +1,84 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4;
+.super Lk0/o/c/j;
+.source "StoreRtcRegion.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreRtcRegion;->fetchRtcLatencyTestRegionsIps()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreRtcRegion;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreRtcRegion;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4;->invoke(Ljava/util/List;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/util/List;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+            ">;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lcom/discord/stores/StoreRtcRegion;->access$maybePerformLatencyTest(Lcom/discord/stores/StoreRtcRegion;Ljava/util/List;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$handleConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$handleConnectionOpen$1.smali
new file mode 100644
index 0000000000..d8e4a3e335
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$handleConnectionOpen$1.smali
@@ -0,0 +1,69 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$handleConnectionOpen$1;
+.super Lk0/o/c/j;
+.source "StoreRtcRegion.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreRtcRegion;->handleConnectionOpen$app_productionDiscordExternalRelease()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreRtcRegion;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreRtcRegion;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion$handleConnectionOpen$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcRegion$handleConnectionOpen$1;->invoke(Ljava/lang/Long;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Long;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/stores/StoreRtcRegion$handleConnectionOpen$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    invoke-static {p1}, Lcom/discord/stores/StoreRtcRegion;->access$fetchRtcLatencyTestRegionsIps(Lcom/discord/stores/StoreRtcRegion;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1.smali
new file mode 100644
index 0000000000..2cc8d97b9d
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1.smali
@@ -0,0 +1,118 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;
+.super Lk0/o/c/j;
+.source "StoreRtcRegion.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->invoke()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $newGeoRankedRegions:Ljava/util/List;
+
+.field public final synthetic $timeNowMs:J
+
+.field public final synthetic this$0:Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;Ljava/util/List;J)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;->this$0:Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;->$newGeoRankedRegions:Ljava/util/List;
+
+    iput-wide p3, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;->$timeNowMs:J
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;->invoke(Ljava/util/List;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/util/List;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "latencyRankedRegions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "RTC region latency test ranking is "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;->this$0:Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;
+
+    iget-object v0, v0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    new-instance v1, Lcom/discord/stores/RtcLatencyTestResult;
+
+    iget-object v2, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;->$newGeoRankedRegions:Ljava/util/List;
+
+    iget-wide v3, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;->$timeNowMs:J
+
+    invoke-direct {v1, p1, v2, v3, v4}, Lcom/discord/stores/RtcLatencyTestResult;-><init>(Ljava/util/List;Ljava/util/List;J)V
+
+    invoke-static {v0, v1}, Lcom/discord/stores/StoreRtcRegion;->access$updateLastTestResult(Lcom/discord/stores/StoreRtcRegion;Lcom/discord/stores/RtcLatencyTestResult;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1.smali
new file mode 100644
index 0000000000..99e194d821
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1.smali
@@ -0,0 +1,160 @@
+.class public final Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;
+.super Lk0/o/c/j;
+.source "StoreRtcRegion.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreRtcRegion;->maybePerformLatencyTest(Ljava/util/List;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $regionsWithIps:Ljava/util/List;
+
+.field public final synthetic this$0:Lcom/discord/stores/StoreRtcRegion;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreRtcRegion;Ljava/util/List;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    iput-object p2, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->$regionsWithIps:Ljava/util/List;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 6
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->$regionsWithIps:Ljava/util/List;
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    const/16 v2, 0xa
+
+    invoke-static {v0, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v2
+
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelRtcLatencyRegion;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelRtcLatencyRegion;->getRegion()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreRtcRegion;->access$getClock$p(Lcom/discord/stores/StoreRtcRegion;)Lcom/discord/utilities/time/Clock;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+
+    move-result-wide v2
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/stores/StoreRtcRegion;->access$shouldPerformLatencyTest(Lcom/discord/stores/StoreRtcRegion;Ljava/util/List;J)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    invoke-static {v0}, Lcom/discord/stores/StoreRtcRegion;->access$getStoreMediaEngine$p(Lcom/discord/stores/StoreRtcRegion;)Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v0
+
+    iget-object v4, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->$regionsWithIps:Ljava/util/List;
+
+    new-instance v5, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;
+
+    invoke-direct {v5, p0, v1, v2, v3}, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1$1;-><init>(Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;Ljava/util/List;J)V
+
+    invoke-virtual {v0, v4, v5}, Lcom/discord/stores/StoreMediaEngine;->getRankedRtcRegions(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
+
+    goto :goto_1
+
+    :cond_1
+    const-string v0, "RTC region latency test cached preferred region is "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreRtcRegion;->getPreferredRegion()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
+
+    :goto_1
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1.smali
deleted file mode 100644
index 3d852d14df..0000000000
--- a/com.discord/smali/com/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public final Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;
-.super Lj0/n/c/i;
-.source "StoreRtcRegion.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreRtcRegion;->updateCloudflareBestRegion(Ljava/lang/String;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $cloudflareBestRegion:Ljava/lang/String;
-
-.field public final synthetic this$0:Lcom/discord/stores/StoreRtcRegion;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreRtcRegion;Ljava/lang/String;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
-
-    iput-object p2, p0, Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;->$cloudflareBestRegion:Ljava/lang/String;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;->this$0:Lcom/discord/stores/StoreRtcRegion;
-
-    iget-object v1, p0, Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;->$cloudflareBestRegion:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreRtcRegion;->setCloudflareBestRegion$app_productionDiscordExternalRelease(Ljava/lang/String;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreRtcRegion.smali b/com.discord/smali/com/discord/stores/StoreRtcRegion.smali
index 2e351fff2d..d643165450 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcRegion.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcRegion.smali
@@ -3,98 +3,556 @@
 .source "StoreRtcRegion.kt"
 
 
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/stores/StoreRtcRegion$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/stores/StoreRtcRegion$Companion;
+
+.field public static final LATENCY_TEST_CACHE_TTL_MS:I = 0x5265c00
+
+.field public static final MAX_LATENCY_TEST_CONN_OPEN_JITTER_MS:I = 0x7530
+
+.field public static final MIN_LATENCY_TEST_CONN_OPEN_JITTER_MS:I = 0x3e8
+
+
 # instance fields
-.field public cloudflareBestRegion:Ljava/lang/String;
+.field public final clock:Lcom/discord/utilities/time/Clock;
 
 .field public final dispatcher:Lcom/discord/stores/Dispatcher;
 
+.field public lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
+
+.field public final lastTestResultCache:Lcom/discord/utilities/persister/Persister;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/discord/utilities/persister/Persister<",
+            "Lcom/discord/stores/RtcLatencyTestResult;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public final restAPI:Lcom/discord/utilities/rest/RestAPI;
 
+.field public final storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+.field public final storeMediaEngine:Lcom/discord/stores/StoreMediaEngine;
+
 
 # direct methods
-.method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;)V
-    .locals 1
+.method public static constructor <clinit>()V
+    .locals 2
 
-    const/4 v0, 0x0
+    new-instance v0, Lcom/discord/stores/StoreRtcRegion$Companion;
 
-    if-eqz p1, :cond_1
+    const/4 v1, 0x0
 
-    if-eqz p2, :cond_0
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreRtcRegion$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/stores/StoreRtcRegion;->Companion:Lcom/discord/stores/StoreRtcRegion$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreExperiments;Lcom/discord/utilities/rest/RestAPI;)V
+    .locals 7
+
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeMediaEngine"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeExperiments"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "restAPI"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iput-object p2, p0, Lcom/discord/stores/StoreRtcRegion;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    iput-object p2, p0, Lcom/discord/stores/StoreRtcRegion;->clock:Lcom/discord/utilities/time/Clock;
+
+    iput-object p3, p0, Lcom/discord/stores/StoreRtcRegion;->storeMediaEngine:Lcom/discord/stores/StoreMediaEngine;
+
+    iput-object p4, p0, Lcom/discord/stores/StoreRtcRegion;->storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+    iput-object p5, p0, Lcom/discord/stores/StoreRtcRegion;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+    new-instance p1, Lcom/discord/utilities/persister/Persister;
+
+    new-instance p2, Lcom/discord/stores/RtcLatencyTestResult;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const-wide/16 v3, 0x0
+
+    const/4 v5, 0x7
+
+    const/4 v6, 0x0
+
+    move-object v0, p2
+
+    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/RtcLatencyTestResult;-><init>(Ljava/util/List;Ljava/util/List;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    const-string p3, "CACHE_KEY_LATENCY_TEST_RESULT"
+
+    invoke-direct {p1, p3, p2}, Lcom/discord/utilities/persister/Persister;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResultCache:Lcom/discord/utilities/persister/Persister;
+
+    new-instance p1, Lcom/discord/stores/RtcLatencyTestResult;
+
+    move-object v0, p1
+
+    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/RtcLatencyTestResult;-><init>(Ljava/util/List;Ljava/util/List;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
 
     return-void
+.end method
+
+.method public synthetic constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreExperiments;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 6
+
+    and-int/lit8 p6, p6, 0x10
+
+    if-eqz p6, :cond_0
+
+    sget-object p5, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {p5}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object p5
 
     :cond_0
-    const-string p1, "restAPI"
+    move-object v5, p5
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v0, p0
 
-    throw v0
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreRtcRegion;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreExperiments;Lcom/discord/utilities/rest/RestAPI;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$fetchRtcLatencyTestRegionsIps(Lcom/discord/stores/StoreRtcRegion;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/stores/StoreRtcRegion;->fetchRtcLatencyTestRegionsIps()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getClock$p(Lcom/discord/stores/StoreRtcRegion;)Lcom/discord/utilities/time/Clock;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/stores/StoreRtcRegion;->clock:Lcom/discord/utilities/time/Clock;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getRestAPI$p(Lcom/discord/stores/StoreRtcRegion;)Lcom/discord/utilities/rest/RestAPI;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/stores/StoreRtcRegion;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getStoreMediaEngine$p(Lcom/discord/stores/StoreRtcRegion;)Lcom/discord/stores/StoreMediaEngine;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/stores/StoreRtcRegion;->storeMediaEngine:Lcom/discord/stores/StoreMediaEngine;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$maybePerformLatencyTest(Lcom/discord/stores/StoreRtcRegion;Ljava/util/List;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreRtcRegion;->maybePerformLatencyTest(Ljava/util/List;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$shouldPerformLatencyTest(Lcom/discord/stores/StoreRtcRegion;Ljava/util/List;J)Z
+    .locals 0
+
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/stores/StoreRtcRegion;->shouldPerformLatencyTest(Ljava/util/List;J)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final synthetic access$updateLastTestResult(Lcom/discord/stores/StoreRtcRegion;Lcom/discord/stores/RtcLatencyTestResult;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreRtcRegion;->updateLastTestResult(Lcom/discord/stores/RtcLatencyTestResult;)V
+
+    return-void
+.end method
+
+.method private final areStringListsEqual(Ljava/util/List;Ljava/util/List;)Z
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;)Z"
+        }
+    .end annotation
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    invoke-interface {p2}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eq v0, v1, :cond_0
+
+    return v2
+
+    :cond_0
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v3, 0x1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/String;
+
+    invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/String;
+
+    invoke-static {v4, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    xor-int/2addr v1, v3
+
+    if-eqz v1, :cond_1
+
+    return v2
 
     :cond_1
-    const-string p1, "dispatcher"
+    add-int/lit8 v0, v0, 0x1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    goto :goto_0
 
-    throw v0
+    :cond_2
+    return v3
 .end method
 
-.method public synthetic constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
+.method private final fetchRtcLatencyTestRegionsIps()V
+    .locals 11
 
-    and-int/lit8 p3, p3, 0x2
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->storeMediaEngine:Lcom/discord/stores/StoreMediaEngine;
 
-    if-eqz p3, :cond_0
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaEngine;->hasNativeEngineEverInitialized()Z
 
-    sget-object p2, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    move-result v0
 
-    invoke-virtual {p2}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    if-eqz v0, :cond_0
 
-    move-result-object p2
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->storeExperiments:Lcom/discord/stores/StoreExperiments;
+
+    const/4 v1, 0x2
+
+    const-string v2, "2020-08_rtc_latency_test_experiment"
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v2, v3, v1, v3}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;->INSTANCE:Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->V(I)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;->INSTANCE:Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3;-><init>(Lcom/discord/stores/StoreRtcRegion;)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v2
+
+    const-string v0, "storeExperiments.getExpe\u2026            }\n          }"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v3, Lcom/discord/stores/StoreRtcRegion;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    new-instance v8, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4;
+
+    invoke-direct {v8, p0}, Lcom/discord/stores/StoreRtcRegion$fetchRtcLatencyTestRegionsIps$4;-><init>(Lcom/discord/stores/StoreRtcRegion;)V
+
+    const/16 v9, 0x1e
+
+    const/4 v10, 0x0
+
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     :cond_0
-    invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreRtcRegion;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;)V
+    return-void
+.end method
+
+.method private final maybePerformLatencyTest(Ljava/util/List;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+            ">;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+    new-instance v1, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreRtcRegion$maybePerformLatencyTest$1;-><init>(Lcom/discord/stores/StoreRtcRegion;Ljava/util/List;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
 .end method
 
-.method public static final synthetic access$updateCloudflareBestRegion(Lcom/discord/stores/StoreRtcRegion;Ljava/lang/String;)V
-    .locals 0
+.method private final shouldPerformLatencyTest(Ljava/util/List;J)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;J)Z"
+        }
+    .end annotation
 
-    invoke-direct {p0, p1}, Lcom/discord/stores/StoreRtcRegion;->updateCloudflareBestRegion(Ljava/lang/String;)V
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
+
+    invoke-virtual {v0}, Lcom/discord/stores/RtcLatencyTestResult;->getLatencyRankedRegions()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
+
+    invoke-virtual {v0}, Lcom/discord/stores/RtcLatencyTestResult;->getGeoRankedRegions()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreRtcRegion;->areStringListsEqual(Ljava/util/List;Ljava/util/List;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
+
+    invoke-virtual {p1}, Lcom/discord/stores/RtcLatencyTestResult;->getLastTestTimestampMs()J
+
+    move-result-wide v0
+
+    sub-long/2addr p2, v0
+
+    const p1, 0x5265c00
+
+    int-to-long v0, p1
+
+    cmp-long p1, p2, v0
+
+    if-ltz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    :goto_1
+    return p1
+.end method
+
+.method private final updateLastTestResult(Lcom/discord/stores/RtcLatencyTestResult;)V
+    .locals 2
+
+    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResultCache:Lcom/discord/utilities/persister/Persister;
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final fetchCloudflareBestRegion()V
-    .locals 13
 
-    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+# virtual methods
+.method public final getPreferredRegion()Ljava/lang/String;
+    .locals 2
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
 
-    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI;->getCloudflareBestRegion()Lrx/Observable;
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
+
+    invoke-virtual {v0}, Lcom/discord/stores/RtcLatencyTestResult;->getLatencyRankedRegions()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
+
+    invoke-virtual {v0}, Lcom/discord/stores/RtcLatencyTestResult;->getLatencyRankedRegions()Ljava/util/List;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    const/4 v2, 0x1
+    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    const/4 v3, 0x0
+    move-result-object v0
 
-    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    check-cast v0, Ljava/lang/String;
 
-    move-result-object v4
+    goto :goto_0
 
-    const-class v5, Lcom/discord/stores/StoreRtcRegion;
+    :cond_0
+    const/4 v0, 0x0
 
-    new-instance v10, Lcom/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1;
+    :goto_0
+    return-object v0
+.end method
 
-    invoke-direct {v10, p0}, Lcom/discord/stores/StoreRtcRegion$fetchCloudflareBestRegion$1;-><init>(Lcom/discord/stores/StoreRtcRegion;)V
+.method public final handleConnectionOpen$app_productionDiscordExternalRelease()V
+    .locals 12
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    new-instance v0, Ljava/util/Random;
+
+    invoke-direct {v0}, Ljava/util/Random;-><init>()V
+
+    const/16 v1, 0x7148
+
+    invoke-virtual {v0, v1}, Ljava/util/Random;->nextInt(I)I
+
+    move-result v0
+
+    add-int/lit16 v0, v0, 0x3e8
+
+    int-to-long v0, v0
+
+    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {v0, v1, v2}, Lrx/Observable;->Z(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+    move-result-object v3
+
+    const-string v0, "Observable.timer(fetchJi\u2026), TimeUnit.MILLISECONDS)"
+
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v4, Lcom/discord/stores/StoreRtcRegion;
+
+    new-instance v9, Lcom/discord/stores/StoreRtcRegion$handleConnectionOpen$1;
+
+    invoke-direct {v9, p0}, Lcom/discord/stores/StoreRtcRegion$handleConnectionOpen$1;-><init>(Lcom/discord/stores/StoreRtcRegion;)V
+
+    const/4 v5, 0x0
 
     const/4 v6, 0x0
 
@@ -102,55 +560,27 @@
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/16 v10, 0x1e
 
-    const/16 v11, 0x1e
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
-
-    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
 .end method
 
-.method private final updateCloudflareBestRegion(Ljava/lang/String;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->dispatcher:Lcom/discord/stores/Dispatcher;
-
-    new-instance v1, Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreRtcRegion$updateCloudflareBestRegion$1;-><init>(Lcom/discord/stores/StoreRtcRegion;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getCloudflareBestRegion$app_productionDiscordExternalRelease()Ljava/lang/String;
+.method public final init()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->cloudflareBestRegion:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResultCache:Lcom/discord/utilities/persister/Persister;
 
-    return-object v0
-.end method
+    invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
 
-.method public final handleConnectionOpen$app_productionDiscordExternalRelease()V
-    .locals 0
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
+    move-result-object v0
 
-    invoke-direct {p0}, Lcom/discord/stores/StoreRtcRegion;->fetchCloudflareBestRegion()V
-
-    return-void
-.end method
-
-.method public final setCloudflareBestRegion$app_productionDiscordExternalRelease(Ljava/lang/String;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StoreRtcRegion;->cloudflareBestRegion:Ljava/lang/String;
+    check-cast v0, Lcom/discord/stores/RtcLatencyTestResult;
+
+    iput-object v0, p0, Lcom/discord/stores/StoreRtcRegion;->lastTestResult:Lcom/discord/stores/RtcLatencyTestResult;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali b/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
index 8f05a192be..2911748882 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame$RunningGame.smali
@@ -28,13 +28,17 @@
 .method public constructor <init>(JLjava/lang/String;Ljava/lang/String;Landroid/graphics/drawable/Drawable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "appName"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "packageName"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "icon"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,27 +51,6 @@
     iput-object p5, p0, Lcom/discord/stores/StoreRunningGame$RunningGame;->icon:Landroid/graphics/drawable/Drawable;
 
     return-void
-
-    :cond_0
-    const-string p1, "icon"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "packageName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "appName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreRunningGame$RunningGame;JLjava/lang/String;Ljava/lang/String;Landroid/graphics/drawable/Drawable;ILjava/lang/Object;)Lcom/discord/stores/StoreRunningGame$RunningGame;
@@ -155,13 +138,17 @@
 .method public final copy(JLjava/lang/String;Ljava/lang/String;Landroid/graphics/drawable/Drawable;)Lcom/discord/stores/StoreRunningGame$RunningGame;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "appName"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "packageName"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "icon"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreRunningGame$RunningGame;
 
@@ -178,27 +165,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreRunningGame$RunningGame;-><init>(JLjava/lang/String;Ljava/lang/String;Landroid/graphics/drawable/Drawable;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "icon"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "packageName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "appName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -224,7 +190,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreRunningGame$RunningGame;->appName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -234,7 +200,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreRunningGame$RunningGame;->packageName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -244,7 +210,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreRunningGame$RunningGame;->icon:Landroid/graphics/drawable/Drawable;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali b/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
index aa32ff7b10..5d4c259db1 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreRunningGame$setRunningGame$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreRunningGame.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreRunningGame.smali b/com.discord/smali/com/discord/stores/StoreRunningGame.smali
index 71ed90a6d6..f6dea04b57 100644
--- a/com.discord/smali/com/discord/stores/StoreRunningGame.smali
+++ b/com.discord/smali/com/discord/stores/StoreRunningGame.smali
@@ -56,13 +56,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -95,27 +99,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreRunningGame;->forceGameDetectionSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getRunningGame$p(Lcom/discord/stores/StoreRunningGame;)Lcom/discord/stores/StoreRunningGame$RunningGame;
@@ -155,7 +138,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreRunningGame;->runningGame:Lcom/discord/stores/StoreRunningGame$RunningGame;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -267,7 +250,7 @@
 
     const-string v1, "forceGameDetectionSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -291,7 +274,7 @@
 
     const-string v1, "runningGameSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
index 49d607ab31..2bd26dafd1 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$SearchTarget.smali
@@ -28,9 +28,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreSearch$SearchTarget$Type;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,15 +41,6 @@
     iput-wide p2, p0, Lcom/discord/stores/StoreSearch$SearchTarget;->id:J
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreSearch$SearchTarget;Lcom/discord/stores/StoreSearch$SearchTarget$Type;JILjava/lang/Object;)Lcom/discord/stores/StoreSearch$SearchTarget;
@@ -95,22 +88,15 @@
 .method public final copy(Lcom/discord/stores/StoreSearch$SearchTarget$Type;J)Lcom/discord/stores/StoreSearch$SearchTarget;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreSearch$SearchTarget;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreSearch$SearchTarget;-><init>(Lcom/discord/stores/StoreSearch$SearchTarget$Type;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -128,7 +114,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreSearch$SearchTarget;->type:Lcom/discord/stores/StoreSearch$SearchTarget$Type;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali b/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
index a90394a44b..5285dec5b0 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$getHistory$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSearch.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreSearch$SearchTarget;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Collection<",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;>;>;>;"
     }
 .end annotation
 
@@ -69,6 +75,7 @@
             "Lcom/discord/stores/StoreSearch$SearchTarget;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Collection<",
             "Ljava/util/List<",
             "Lcom/discord/utilities/search/query/node/QueryNode;",
@@ -91,15 +98,11 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    const-string p1, "Observable.just(emptyList())"
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali
index 1dc2d914e7..645b64fa15 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSearch.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/utilities/search/network/state/SearchState;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/utilities/search/network/state/SearchState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearch$init$1;->call(Lcom/discord/utilities/search/network/state/SearchState;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/utilities/search/network/state/SearchState;)Z
+.method public final call(Lcom/discord/utilities/search/network/state/SearchState;)Ljava/lang/Boolean;
     .locals 1
 
     invoke-virtual {p1}, Lcom/discord/utilities/search/network/state/SearchState;->getQueryFetchState()Lcom/discord/utilities/search/network/state/QueryFetchState;
@@ -94,5 +78,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/search/network/state/SearchState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearch$init$1;->call(Lcom/discord/utilities/search/network/state/SearchState;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali
index e9c8ccbfc9..605a0c1574 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$2.smali
@@ -3,7 +3,7 @@
 .source "StoreSearch.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/search/network/state/SearchState;",
+        "Lcom/discord/stores/StoreSearch$DisplayState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali
index 71e7bd1678..6eafe38900 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$3.smali
@@ -3,7 +3,7 @@
 .source "StoreSearch.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;",
+        "Lcom/discord/stores/StoreSearch$DisplayState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali
index 6dd6d0b301..2e0252ca32 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSearch$init$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreSearch;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreSearch;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleSubscription"
+
+    const-string v5, "handleSubscription(Lrx/Subscription;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSubscription"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreSearch;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSubscription(Lrx/Subscription;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreSearch;
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali b/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali
index c1ec4a4b45..2404896263 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch$init$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSearch$init$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreSearch$DisplayState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreSearch;->access$onStateChanged(Lcom/discord/stores/StoreSearch;Lcom/discord/stores/StoreSearch$DisplayState;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearch.smali b/com.discord/smali/com/discord/stores/StoreSearch.smali
index 707d7cb0e9..85fafd6223 100644
--- a/com.discord/smali/com/discord/stores/StoreSearch.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearch.smali
@@ -56,11 +56,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "storeGuildsNsfw"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeUser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/stores/StoreSearchData;
 
@@ -91,38 +93,34 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreSearch;-><init>(Lcom/discord/stores/StoreSearchData;Lcom/discord/stores/StoreSearchInput;Lcom/discord/stores/StoreSearchQuery;Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;Lcom/discord/utilities/search/history/SearchHistoryCache;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeGuildsNsfw"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreSearchData;Lcom/discord/stores/StoreSearchInput;Lcom/discord/stores/StoreSearchQuery;Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;Lcom/discord/utilities/search/history/SearchHistoryCache;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeSearchData"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "storeSearchInput"
 
-    if-eqz p3, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "storeSearchQuery"
 
-    if-eqz p5, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "storeGuildsNsfw"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUser"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "historyCache"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -161,48 +159,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreSearch;->searchTargetSubject:Lrx/subjects/SerializedSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "historyCache"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeGuildsNsfw"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeSearchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeSearchInput"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "storeSearchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getHistoryCache$p(Lcom/discord/stores/StoreSearch;)Lcom/discord/utilities/search/history/SearchHistoryCache;
@@ -334,7 +290,7 @@
     :try_start_0
     iget-object v0, p0, Lcom/discord/stores/StoreSearch;->searchTarget:Lcom/discord/stores/StoreSearch$SearchTarget;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
     :try_end_0
@@ -366,13 +322,13 @@
 
     sget-object p2, Lcom/discord/stores/StoreSearch$init$1;->INSTANCE:Lcom/discord/stores/StoreSearch$init$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object p2, Lcom/discord/stores/StoreSearch$init$2;->INSTANCE:Lcom/discord/stores/StoreSearch$init$2;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -384,7 +340,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreSearch$init$3;->INSTANCE:Lcom/discord/stores/StoreSearch$init$3;
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -394,7 +350,7 @@
 
     const-string p1, "Observable\n        .merg\u2026splayState.SUGGESTIONS })"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -439,9 +395,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearch;->displayStateSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -456,9 +412,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearch;->searchTargetSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -556,7 +512,7 @@
 
     const-string v1, "displayStateSubject\n    \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -580,13 +536,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreSearch$getHistory$1;-><init>(Lcom/discord/stores/StoreSearch;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "searchTargetSubject\n    \u2026())\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -616,38 +572,35 @@
 .end method
 
 .method public final initForChannel(JLcom/discord/utilities/search/strings/SearchStringProvider;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "searchStringProvider"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/stores/StoreSearch$SearchTarget;
+    new-instance v0, Lcom/discord/stores/StoreSearch$SearchTarget;
 
-    sget-object v2, Lcom/discord/stores/StoreSearch$SearchTarget$Type;->CHANNEL:Lcom/discord/stores/StoreSearch$SearchTarget$Type;
+    sget-object v1, Lcom/discord/stores/StoreSearch$SearchTarget$Type;->CHANNEL:Lcom/discord/stores/StoreSearch$SearchTarget$Type;
 
-    invoke-direct {v1, v2, p1, p2}, Lcom/discord/stores/StoreSearch$SearchTarget;-><init>(Lcom/discord/stores/StoreSearch$SearchTarget$Type;J)V
+    invoke-direct {v0, v1, p1, p2}, Lcom/discord/stores/StoreSearch$SearchTarget;-><init>(Lcom/discord/stores/StoreSearch$SearchTarget$Type;J)V
 
-    invoke-direct {p0, v1, p3}, Lcom/discord/stores/StoreSearch;->init(Lcom/discord/stores/StoreSearch$SearchTarget;Lcom/discord/utilities/search/strings/SearchStringProvider;)V
+    invoke-direct {p0, v0, p3}, Lcom/discord/stores/StoreSearch;->init(Lcom/discord/stores/StoreSearch$SearchTarget;Lcom/discord/utilities/search/strings/SearchStringProvider;)V
 
     sget-object p1, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->INSTANCE:Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;
 
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->setTargetGuildId(Ljava/lang/Long;)V
+    const/4 p2, 0x0
+
+    invoke-virtual {p1, p2}, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->setTargetGuildId(Ljava/lang/Long;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final initForGuild(JLcom/discord/utilities/search/strings/SearchStringProvider;)V
     .locals 2
 
-    if-eqz p3, :cond_0
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreSearch$SearchTarget;
 
@@ -666,25 +619,18 @@
     invoke-virtual {p3, p1}, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->setTargetGuildId(Ljava/lang/Long;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final loadInitial(Ljava/lang/String;Lcom/discord/utilities/search/strings/SearchStringProvider;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "queryString"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/stores/StoreSearch;->searchTarget:Lcom/discord/stores/StoreSearch$SearchTarget;
 
@@ -706,20 +652,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "queryString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final loadMore(J)V
@@ -750,29 +682,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchTarget"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "query"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearch;->historyCache:Lcom/discord/utilities/search/history/SearchHistoryCache;
 
     invoke-interface {v0, p1, p2}, Lcom/discord/utilities/search/history/SearchHistoryCache;->persistQuery(Lcom/discord/stores/StoreSearch$SearchTarget;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali b/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali
index 21489572c5..6b058025d0 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$getChannelSearchData$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSearchData$getChannelSearchData$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSearchData.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/models/domain/ModelUser;",
@@ -30,51 +30,37 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/search/validation/SearchData$Builder;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/utilities/search/validation/SearchData$Builder;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string v4, "buildForChannel"
+
+    const-string v5, "buildForChannel(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/search/validation/SearchData;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "buildForChannel"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/search/validation/SearchData$Builder;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "buildForChannel(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/search/validation/SearchData;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/search/validation/SearchData;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/search/validation/SearchData$Builder;
 
@@ -83,15 +69,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali b/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali
index b5b42c76e0..18e9a91f29 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSearchData.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -88,7 +97,7 @@
 
     const-string v0, "guildChannels"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$2.smali b/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$2.smali
index 5b4b88a0b9..25415aa1c7 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$getGuildSearchData$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSearchData$getGuildSearchData$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSearchData.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -48,45 +48,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/search/validation/SearchData$Builder;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x4
+    const-class v3, Lcom/discord/utilities/search/validation/SearchData$Builder;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x4
+
+    const-string v4, "buildForGuild"
+
+    const-string v5, "buildForGuild(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/utilities/search/validation/SearchData;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "buildForGuild"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/search/validation/SearchData$Builder;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "buildForGuild(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/utilities/search/validation/SearchData;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/utilities/search/validation/SearchData;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -115,17 +99,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "p2"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p4"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/search/validation/SearchData$Builder;
 
@@ -134,34 +124,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p4"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali b/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali
index a027a18257..0972a784be 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$init$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSearchData$init$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSearchData.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreSearchData;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreSearchData;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleSubscription"
+
+    const-string v5, "handleSubscription(Lrx/Subscription;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSubscription"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreSearchData;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSubscription(Lrx/Subscription;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreSearchData;
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali b/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali
index ee545ad150..ae3b14add5 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData$init$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSearchData$init$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSearchData.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/validation/SearchData;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreSearchData;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreSearchData;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleNewData"
+
+    const-string v5, "handleNewData(Lcom/discord/utilities/search/validation/SearchData;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleNewData"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreSearchData;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleNewData(Lcom/discord/utilities/search/validation/SearchData;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/search/validation/SearchData;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreSearchData;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreSearchData;->access$handleNewData(Lcom/discord/stores/StoreSearchData;Lcom/discord/utilities/search/validation/SearchData;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchData.smali b/com.discord/smali/com/discord/stores/StoreSearchData.smali
index ea2a08b159..c3de978f30 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchData.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchData.smali
@@ -50,7 +50,7 @@
 
     const-string v1, "BehaviorSubject.create(SearchData())"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/stores/StoreSearchData;->searchDataSubject:Lrx/subjects/Subject;
 
@@ -122,7 +122,7 @@
 
     const-string p2, "Observable.combineLatest\u2026()::buildForChannel\n    )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -178,7 +178,7 @@
 
     sget-object v3, Lcom/discord/stores/StoreSearchData$getGuildSearchData$1;->INSTANCE:Lcom/discord/stores/StoreSearchData$getGuildSearchData$1;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
@@ -214,7 +214,7 @@
 
     const-string p2, "ObservableWithLeadingEdg\u20263, TimeUnit.SECONDS\n    )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -224,7 +224,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchData;->searchDataSubject:Lrx/subjects/Subject;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -311,7 +311,9 @@
 .method public final init(Lcom/discord/stores/StoreSearch$SearchTarget;)V
     .locals 9
 
-    if-eqz p1, :cond_2
+    const-string v0, "searchTarget"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreSearch$SearchTarget;->getType()Lcom/discord/stores/StoreSearch$SearchTarget$Type;
 
@@ -364,7 +366,7 @@
 
     const-string p1, "searchDataObservable\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lcom/discord/stores/StoreSearchData;
 
@@ -389,13 +391,4 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali
index 5afe53d66d..8d266d412f 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSearchInput.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +62,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchInput$1;->call(Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/List;)Z
+.method public final call(Ljava/util/List;)Ljava/lang/Boolean;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -81,13 +70,14 @@
             "Ljava/util/List<",
             "+",
             "Lcom/discord/utilities/search/query/node/QueryNode;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -129,5 +119,21 @@
     if-eqz v0, :cond_2
 
     :goto_0
-    return v1
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSearchInput$1;->call(Ljava/util/List;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
index d25e6cf44c..575f95b98e 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSearchInput$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSearchInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,9 +67,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali
index ac5eb416bd..6dd9b8f27c 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSearchInput.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Ljava/util/List<",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali
index b214040533..c2360662b9 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSearchInput$init$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSearchInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreSearchInput;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreSearchInput;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleInputSubscription"
+
+    const-string v5, "handleInputSubscription(Lrx/Subscription;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleInputSubscription"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreSearchInput;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleInputSubscription(Lrx/Subscription;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreSearchInput;
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali b/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali
index 791a782c10..be8563f824 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput$init$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSearchInput$init$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSearchInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subjects/SerializedSubject;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subjects/SerializedSubject;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onNext"
+
+    const-string v5, "onNext(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subjects/SerializedSubject;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -95,13 +79,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchInput.smali b/com.discord/smali/com/discord/stores/StoreSearchInput.smali
index 93a15975e8..0adb282382 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchInput.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchInput.smali
@@ -142,7 +142,7 @@
 
     const-string v1, "forcedInputSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/stores/StoreSearchInput;->forcedInput:Lrx/Observable;
 
@@ -158,11 +158,11 @@
 
     sget-object v1, Lcom/discord/stores/StoreSearchInput$1;->INSTANCE:Lcom/discord/stores/StoreSearchInput$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -184,12 +184,20 @@
 
     and-int/lit8 v1, v1, 0x20
 
-    new-instance v8, Lf/a/b/c0;
+    const-string v1, "onNext"
+
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v3, "validateSearchInput"
+
+    const-string v1, "errorTag"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lf/a/b/e0;
 
     const/4 v7, 0x0
 
-    const-string v3, "validateSearchInput"
-
     move-object v1, v8
 
     move-object v2, v7
@@ -198,7 +206,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/e0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -379,11 +387,11 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchInput;->inputSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
     const-string v1, ""
 
-    invoke-virtual {v0, v1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -425,7 +433,9 @@
 .method public final init(Lcom/discord/utilities/search/strings/SearchStringProvider;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/parsing/QueryParser;
 
@@ -433,11 +443,11 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreSearchInput;->inputSubject:Lrx/subjects/SerializedSubject;
 
-    const-wide/16 v1, 0x64
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v2, 0x64
 
-    invoke-static {p1, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {p1, v2, v3, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
@@ -449,11 +459,11 @@
 
     invoke-direct {v1, v0}, Lcom/discord/stores/StoreSearchInput$init$1;-><init>(Lcom/discord/utilities/search/query/parsing/QueryParser;)V
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -463,26 +473,26 @@
 
     const-string p1, "inputSubject\n        .le\u2026Schedulers.computation())"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/stores/StoreSearchInput;
 
-    const/4 v3, 0x0
-
     new-instance v4, Lcom/discord/stores/StoreSearchInput$init$2;
 
     invoke-direct {v4, p0}, Lcom/discord/stores/StoreSearchInput$init$2;-><init>(Lcom/discord/stores/StoreSearchInput;)V
 
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
     new-instance v7, Lcom/discord/stores/StoreSearchInput$init$3;
 
     iget-object p1, p0, Lcom/discord/stores/StoreSearchInput;->astSubject:Lrx/subjects/SerializedSubject;
 
     invoke-direct {v7, p1}, Lcom/discord/stores/StoreSearchInput$init$3;-><init>(Lrx/subjects/SerializedSubject;)V
 
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
     const/16 v8, 0x1a
 
     const/4 v9, 0x0
@@ -490,15 +500,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final isInputValid()Lrx/Observable;
@@ -530,13 +531,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "filterType"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "searchStringProvider"
 
-    if-eqz p3, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "query"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -628,7 +633,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-static {v0}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -657,27 +662,6 @@
     invoke-direct {p0, p2, p1, p3}, Lcom/discord/stores/StoreSearchInput;->replaceAndPublish(ILjava/util/List;Ljava/util/List;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "filterType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onFromUserClicked(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;Ljava/lang/String;Ljava/util/List;)V
@@ -693,13 +677,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userSuggestion"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "fromFilterString"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "query"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/filter/FilterNode;
 
@@ -741,32 +729,11 @@
 
     const-string v0, "replacement"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1, p3}, Lcom/discord/stores/StoreSearchInput;->replaceAndPublish(ILjava/util/List;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fromFilterString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userSuggestion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onHasClicked(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
@@ -783,15 +750,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "hasAnswerOption"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "hasFilterString"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "hasAnswerString"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "query"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/filter/FilterNode;
 
@@ -825,39 +798,11 @@
 
     const-string p3, "replacement"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1, p4}, Lcom/discord/stores/StoreSearchInput;->replaceAndPublish(ILjava/util/List;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "hasAnswerString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "hasFilterString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "hasAnswerOption"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onInChannelClicked(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;Ljava/lang/String;Ljava/util/List;)V
@@ -873,13 +818,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channelSuggestion"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "inFilterString"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "query"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/filter/FilterNode;
 
@@ -917,32 +866,11 @@
 
     const-string v0, "replacement"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1, p3}, Lcom/discord/stores/StoreSearchInput;->replaceAndPublish(ILjava/util/List;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inFilterString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "channelSuggestion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onMentionsUserClicked(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;Ljava/lang/String;Ljava/util/List;)V
@@ -958,13 +886,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userSuggestion"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "mentionsFilterString"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "query"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/filter/FilterNode;
 
@@ -1006,32 +938,11 @@
 
     const-string v0, "replacement"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1, p3}, Lcom/discord/stores/StoreSearchInput;->replaceAndPublish(ILjava/util/List;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "mentionsFilterString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userSuggestion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onQueryClicked(Ljava/util/List;)V
@@ -1046,7 +957,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "query"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchInput;->forcedInputSubject:Lrx/subjects/PublishSubject;
 
@@ -1055,36 +968,20 @@
     invoke-virtual {v0, p1}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateInput(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchInput;->inputSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali
index b02ad8dd86..f2b7e55f09 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSearchQuery$makeQuery$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSearchQuery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelSearchResponse;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelSearchResponse;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchResponse"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchQuery$makeQuery$1;->this$0:Lcom/discord/stores/StoreSearchQuery;
 
@@ -80,13 +82,4 @@
     invoke-static {v0, v1, p1, v2}, Lcom/discord/stores/StoreSearchQuery;->access$handleResponse(Lcom/discord/stores/StoreSearchQuery;Lcom/discord/utilities/search/network/SearchQuery;Lcom/discord/models/domain/ModelSearchResponse;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchResponse"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali
index 260c934243..d9ee6db895 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSearchQuery$makeQuery$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSearchQuery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchQuery$makeQuery$2;->this$0:Lcom/discord/stores/StoreSearchQuery;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreSearchQuery;->access$setQuerySubscription$p(Lcom/discord/stores/StoreSearchQuery;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali
index f71ecad211..5db0108b13 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$makeQuery$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSearchQuery$makeQuery$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSearchQuery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreSearchQuery$makeQuery$3;->this$0:Lcom/discord/stores/StoreSearchQuery;
 
     invoke-static {p1}, Lcom/discord/stores/StoreSearchQuery;->access$handleError(Lcom/discord/stores/StoreSearchQuery;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali
index cd5ff48b5f..6ae8694b0a 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSearchQuery.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Ljava/util/List<",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali
index f4478bba56..dd5b5bf9ae 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$2.smali
@@ -27,7 +27,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/List<",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;",
+        "Lcom/discord/utilities/search/validation/SearchData;",
+        "Lcom/discord/utilities/search/network/SearchQuery;",
+        ">;"
     }
 .end annotation
 
@@ -75,11 +80,11 @@
 
     const-string v1, "queryNodes"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "searchData"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/search/query/node/QueryNode$Preprocessor;->preprocess(Ljava/util/List;Lcom/discord/utilities/search/validation/SearchData;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali
index d9de9ab60d..4874a38f5b 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSearchQuery$parseAndQuery$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSearchQuery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/network/SearchQuery;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali
index 5ef5cd3c13..1abee89aff 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery$parseAndQuery$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSearchQuery$parseAndQuery$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSearchQuery.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/network/SearchQuery;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
index 7e763637dc..03c6a23d8b 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
@@ -76,7 +76,9 @@
 .method public constructor <init>(Lcom/discord/utilities/search/network/SearchFetcher;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchFetcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -99,15 +101,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreSearchQuery;->currentSearchState:Lcom/discord/utilities/search/network/state/SearchState;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchFetcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getQuerySubscription$p(Lcom/discord/stores/StoreSearchQuery;)Lrx/Subscription;
@@ -222,7 +215,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object v0
 
@@ -460,9 +453,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchQuery;->searchStateSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -511,7 +504,7 @@
 
     const-string v1, "searchStateSubject\n        .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -524,7 +517,7 @@
     :try_start_0
     const-string v0, "searchTarget"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchQuery;->currentSearchState:Lcom/discord/utilities/search/network/state/SearchState;
 
@@ -615,16 +608,6 @@
 
     return-void
 
-    :cond_3
-    :try_start_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -646,31 +629,39 @@
 
     move-object/from16 v4, p4
 
-    const/4 v5, 0x0
+    const-string v5, "searchStore"
 
-    if-eqz v1, :cond_4
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_3
+    const-string v5, "searchTarget"
 
-    if-eqz v3, :cond_2
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_1
+    const-string v5, "queryString"
+
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "searchStringProvider"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/stores/StoreSearchQuery;->unsubscribe()V
 
-    invoke-static/range {p3 .. p3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static/range {p3 .. p3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
-    move-result v6
+    move-result v5
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
-    xor-int/2addr v6, v7
+    xor-int/2addr v5, v6
 
-    if-eqz v6, :cond_0
+    if-eqz v5, :cond_0
 
-    new-instance v6, Lcom/discord/utilities/search/network/state/SearchState;
+    new-instance v5, Lcom/discord/utilities/search/network/state/SearchState;
 
-    sget-object v9, Lcom/discord/utilities/search/network/state/QueryFetchState;->IN_PROGRESS:Lcom/discord/utilities/search/network/state/QueryFetchState;
+    sget-object v8, Lcom/discord/utilities/search/network/state/QueryFetchState;->IN_PROGRESS:Lcom/discord/utilities/search/network/state/QueryFetchState;
+
+    const/4 v9, 0x0
 
     const/4 v10, 0x0
 
@@ -678,27 +669,25 @@
 
     const/4 v12, 0x0
 
-    const/4 v13, 0x0
+    const/16 v13, 0x1e
 
-    const/16 v14, 0x1e
+    const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    move-object v7, v5
 
-    move-object v8, v6
+    invoke-direct/range {v7 .. v14}, Lcom/discord/utilities/search/network/state/SearchState;-><init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-direct/range {v8 .. v15}, Lcom/discord/utilities/search/network/state/SearchState;-><init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v5}, Lcom/discord/stores/StoreSearchQuery;->updateAndPublish(Lcom/discord/utilities/search/network/state/SearchState;)V
 
-    invoke-direct {v0, v6}, Lcom/discord/stores/StoreSearchQuery;->updateAndPublish(Lcom/discord/utilities/search/network/state/SearchState;)V
+    new-instance v5, Ls0/l/e/j;
 
-    new-instance v6, Lr0/l/e/j;
-
-    invoke-direct {v6, v3}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v5, v3}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     new-instance v3, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$1;
 
     invoke-direct {v3, v4}, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$1;-><init>(Lcom/discord/utilities/search/strings/SearchStringProvider;)V
 
-    invoke-virtual {v6, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v5, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
@@ -710,23 +699,25 @@
 
     move-result-object v4
 
-    new-instance v6, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$2;
+    new-instance v5, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$2;
 
-    move/from16 v8, p5
+    move/from16 v7, p5
 
-    invoke-direct {v6, v1, v2, v8}, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$2;-><init>(Lcom/discord/stores/StoreSearch;Lcom/discord/stores/StoreSearch$SearchTarget;Z)V
+    invoke-direct {v5, v1, v2, v7}, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$2;-><init>(Lcom/discord/stores/StoreSearch;Lcom/discord/stores/StoreSearch$SearchTarget;Z)V
 
-    invoke-static {v3, v4, v6}, Lrx/Observable;->f0(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-static {v3, v4, v5}, Lrx/Observable;->f0(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
     move-result-object v1
 
     sget-object v3, Lcom/discord/stores/StoreSearchQuery$parseAndQuery$3;->INSTANCE:Lcom/discord/stores/StoreSearchQuery$parseAndQuery$3;
 
-    const-wide/16 v8, 0x1
+    const/4 v4, 0x0
 
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v7, 0x1
 
-    invoke-static {v3, v5, v8, v9, v4}, Lf/a/b/q;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
+    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {v3, v4, v7, v8, v5}, Lf/a/b/s;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
 
     move-result-object v3
 
@@ -734,13 +725,13 @@
 
     move-result-object v1
 
-    invoke-virtual {v1, v7}, Lrx/Observable;->V(I)Lrx/Observable;
+    invoke-virtual {v1, v6}, Lrx/Observable;->V(I)Lrx/Observable;
 
     move-result-object v1
 
     const-string v3, "Observable\n            .\u2026   )\n            .take(1)"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -793,32 +784,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string v1, "searchStringProvider"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_2
-    const-string v1, "queryString"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_3
-    const-string v1, "searchTarget"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_4
-    const-string v1, "searchStore"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali
index 1e2f02af8f..1e5d349d13 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreSlowMode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -45,45 +45,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x1
+    const-class v2, Lcom/discord/utilities/permissions/PermissionUtils;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x1
+
+    const-string v3, "hasBypassSlowmodePermissions"
+
+    const-string v4, "hasBypassSlowmodePermissions(Ljava/lang/Long;)Z"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "hasBypassSlowmodePermissions"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/permissions/PermissionUtils;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "hasBypassSlowmodePermissions(Ljava/lang/Long;)Z"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali
index fe335709e3..0f593489f9 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSlowMode.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali
index e19ce4d286..cbbcf45b82 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSlowMode.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -51,7 +53,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Long;)J
+.method public final call(Ljava/lang/Long;)Ljava/lang/Long;
     .locals 6
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
@@ -74,19 +76,19 @@
 
     sub-long/2addr v2, v4
 
-    return-wide v2
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1;->call(Ljava/lang/Long;)J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1;->call(Ljava/lang/Long;)Ljava/lang/Long;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali
index 2239e69c0d..586997968d 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2.smali
@@ -3,7 +3,7 @@
 .source "StoreSlowMode.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2;->call(Ljava/lang/Long;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Long;)Z
+.method public final call(Ljava/lang/Long;)Ljava/lang/Boolean;
     .locals 4
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
@@ -96,5 +80,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2;->call(Ljava/lang/Long;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali
index 104bbe51d2..0acee5efac 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2.smali
@@ -3,7 +3,7 @@
 .source "StoreSlowMode.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -110,21 +113,21 @@
 
     invoke-direct {v3, p1, v0, v1}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$1;-><init>(Ljava/lang/Long;J)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2;->INSTANCE:Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2$2;
 
-    new-instance v1, Lr0/l/a/l2;
+    new-instance v1, Ls0/l/a/l2;
 
-    invoke-direct {v1, v0}, Lr0/l/a/l2;-><init>(Lr0/k/b;)V
+    invoke-direct {v1, v0}, Ls0/l/a/l2;-><init>(Ls0/k/b;)V
 
-    new-instance v0, Lr0/l/a/u;
+    new-instance v0, Ls0/l/a/u;
 
     iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v0, p1, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v0, p1, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -137,9 +140,9 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali
index e227387b71..f965e8f260 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.smali
@@ -3,7 +3,7 @@
 .source "StoreSlowMode.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -80,7 +83,7 @@
 
     const-string v0, "shouldOverrideCooldown"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -94,9 +97,9 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -111,7 +114,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$1;-><init>(Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -119,7 +122,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2$2;-><init>(Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali
index 36f63dbb06..fbd9604ef0 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3.smali
@@ -3,7 +3,7 @@
 .source "StoreSlowMode.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Long;)I
+.method public final call(Ljava/lang/Long;)Ljava/lang/Integer;
     .locals 4
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
@@ -72,7 +74,11 @@
 
     long-to-int p1, v0
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -80,11 +86,7 @@
 
     check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3;->call(Ljava/lang/Long;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3;->call(Ljava/lang/Long;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali b/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali
index a4ccbec4d5..2e7c9f081f 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode$sam$rx_functions_Func1$0.smali
@@ -3,7 +3,7 @@
 .source "StoreSlowMode.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/stores/StoreSlowMode.smali b/com.discord/smali/com/discord/stores/StoreSlowMode.smali
index ff1a19737a..1a09ef2d9a 100644
--- a/com.discord/smali/com/discord/stores/StoreSlowMode.smali
+++ b/com.discord/smali/com/discord/stores/StoreSlowMode.smali
@@ -15,9 +15,6 @@
 .field public static final COOLDOWN_BUFFER_MS:J = 0x3e8L
 
 .field public static final Companion:Lcom/discord/stores/StoreSlowMode$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 
 # instance fields
@@ -79,11 +76,13 @@
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -116,20 +115,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreSlowMode;->channelCooldownObservables:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getClock$p(Lcom/discord/stores/StoreSlowMode;)Lcom/discord/utilities/time/Clock;
@@ -215,9 +200,9 @@
     move-object v1, v2
 
     :cond_1
-    check-cast v1, Lr0/k/b;
+    check-cast v1, Ls0/k/b;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -229,13 +214,13 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2;-><init>(Lcom/discord/stores/StoreSlowMode;J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3;->INSTANCE:Lcom/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$3;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -249,13 +234,13 @@
 
     const/4 v1, 0x1
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->L(I)Lr0/m/c;
+    invoke-virtual {v0, v1}, Lrx/Observable;->L(I)Ls0/m/c;
 
     move-result-object v0
 
-    new-instance v1, Lr0/l/a/f0;
+    new-instance v1, Ls0/l/a/f0;
 
-    invoke-direct {v1, v0}, Lr0/l/a/f0;-><init>(Lr0/m/c;)V
+    invoke-direct {v1, v0}, Ls0/l/a/f0;-><init>(Ls0/m/c;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -269,7 +254,7 @@
 
     const-string p2, "newObservable"
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_1
@@ -388,13 +373,13 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(0)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali b/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
index da8d62fba4..5b81a09ba2 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$SpotifyState.smali
@@ -244,7 +244,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreSpotify$SpotifyState;->track:Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali
index 89bd6e2a3b..4c2f0dcb14 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSpotify.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali
index 5583dafef5..e45f2db586 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$1.smali
@@ -3,7 +3,7 @@
 .source "StoreSpotify.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/spotify/ModelSpotifyTrack;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/spotify/ModelSpotifyTrack;",
+        ">;>;"
     }
 .end annotation
 
@@ -87,9 +89,9 @@
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -104,7 +106,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreSpotify$init$1$1;->INSTANCE:Lcom/discord/stores/StoreSpotify$init$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali
index 797f8a773f..dc89264094 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$2.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lkotlin/Unit;",
+        "Lcom/discord/models/domain/spotify/ModelSpotifyTrack;",
+        "Lcom/discord/models/domain/spotify/ModelSpotifyTrack;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$3$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$3$1.smali
index 0034ca3fee..84c69752c9 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$init$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali b/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali
index 322ed00ff3..1834543499 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$init$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$init$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/spotify/ModelSpotifyTrack;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali
index d96c28f4d7..888d20b36d 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$publishState$activity$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/spotify/ModelSpotifyArtist;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -49,42 +49,35 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/CharSequence;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify$publishState$activity$1;->invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/String;
-    .locals 0
-
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;->getName()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify$publishState$activity$1;->invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali
index 33b49b6923..4bb3bf3067 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$publishState$activity$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$publishState$activity$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/spotify/ModelSpotifyArtist;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -49,42 +49,35 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/CharSequence;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify$publishState$activity$2;->invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/String;
-    .locals 0
-
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;->getId()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/spotify/ModelSpotifyArtist;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify$publishState$activity$2;->invoke(Lcom/discord/models/domain/spotify/ModelSpotifyArtist;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali
index ae8719c464..f0a7ddc7b1 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$setPlayingStatus$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$setPlayingStatus$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali
index f4dca8bae3..a4c9a0e71a 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$startStateExpiration$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSpotify$startStateExpiration$1;->this$0:Lcom/discord/stores/StoreSpotify;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreSpotify;->access$setExpireStateSub$p(Lcom/discord/stores/StoreSpotify;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2$1.smali b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2$1.smali
index 106a631455..aa1a412601 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$startStateExpiration$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali
index 6c05d0c36b..5c49992c14 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify$startStateExpiration$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSpotify$startStateExpiration$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSpotify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify.smali b/com.discord/smali/com/discord/stores/StoreSpotify.smali
index b53142a3a1..f7c885ec47 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify.smali
@@ -39,13 +39,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,27 +74,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreSpotify;->spotifyApiClient:Lcom/discord/utilities/spotify/SpotifyApiClient;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getClock$p(Lcom/discord/stores/StoreSpotify;)Lcom/discord/utilities/time/Clock;
@@ -248,7 +231,7 @@
 
     move-result-object v8
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -280,7 +263,7 @@
     :cond_5
     iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->spotifyState:Lcom/discord/stores/StoreSpotify$SpotifyState;
 
-    if-eqz v1, :cond_d
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreSpotify$SpotifyState;->component1()Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
 
@@ -310,7 +293,7 @@
 
     if-eqz v1, :cond_6
 
-    invoke-static {v1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -332,11 +315,11 @@
 
     const/4 v10, 0x6
 
-    invoke-static {v1, v7, v6, v6, v10}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {v1, v7, v6, v6, v10}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -430,7 +413,7 @@
 
     const/16 v22, 0x1f
 
-    invoke-static/range {v15 .. v22}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v15 .. v22}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v15
 
@@ -448,7 +431,7 @@
 
     const/16 v23, 0x1f
 
-    invoke-static/range {v16 .. v23}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v16 .. v23}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v16
 
@@ -559,13 +542,18 @@
 
     move-result v4
 
-    xor-int/lit8 v6, v4, 0x1
-
-    :cond_b
-    invoke-virtual {v1, v2, v6}, Lcom/discord/utilities/analytics/AnalyticsTracker;->activityUpdatedSpotify(Ljava/lang/String;Z)V
+    if-nez v4, :cond_b
 
     goto :goto_6
 
+    :cond_b
+    const/4 v3, 0x0
+
+    :goto_6
+    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/analytics/AnalyticsTracker;->activityUpdatedSpotify(Ljava/lang/String;Z)V
+
+    goto :goto_7
+
     :cond_c
     iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream;
 
@@ -575,13 +563,8 @@
 
     invoke-virtual {v1, v2, v4, v3}, Lcom/discord/stores/StoreUserPresence;->updateActivity(ILcom/discord/models/domain/activity/ModelActivity;Z)V
 
-    :goto_6
+    :goto_7
     return-void
-
-    :cond_d
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v4
 .end method
 
 .method private final startStateExpiration(J)V
@@ -601,7 +584,7 @@
 
     const-string p1, "Observable\n        .time\u2026), TimeUnit.MILLISECONDS)"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/stores/StoreSpotify;
 
@@ -635,7 +618,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getConnectedAccounts()Ljava/util/List;
 
@@ -643,7 +628,7 @@
 
     const-string v0, "payload.connectedAccounts"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreSpotify;->handleUserConnections(Ljava/util/List;)V
 
@@ -654,15 +639,6 @@
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleConnectionReady(Z)V
@@ -708,9 +684,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "accounts"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -719,15 +695,17 @@
     :cond_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v2, v1
+    move-object v2, v0
 
     check-cast v2, Lcom/discord/models/domain/ModelConnectedAccount;
 
@@ -741,7 +719,7 @@
 
     const-string v4, "SPOTIFY"
 
-    invoke-static {v4, v2, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v4, v2, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v2
 
@@ -750,36 +728,31 @@
     goto :goto_0
 
     :cond_1
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
-    check-cast v1, Lcom/discord/models/domain/ModelConnectedAccount;
+    check-cast v0, Lcom/discord/models/domain/ModelConnectedAccount;
 
     iget-object p1, p0, Lcom/discord/stores/StoreSpotify;->spotifyApiClient:Lcom/discord/utilities/spotify/SpotifyApiClient;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_2
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/spotify/SpotifyApiClient;->setSpotifyAccountId(Ljava/lang/String;)V
+    invoke-virtual {p1, v1}, Lcom/discord/utilities/spotify/SpotifyApiClient;->setSpotifyAccountId(Ljava/lang/String;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "accounts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final init(Landroid/content/Context;)V
     .locals 12
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/integrations/SpotifyHelper;->registerSpotifyBroadcastReceivers(Landroid/content/Context;)V
 
@@ -793,7 +766,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreSpotify$init$1;->INSTANCE:Lcom/discord/stores/StoreSpotify$init$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -807,20 +780,24 @@
 
     move-result-object p1
 
-    const-wide/16 v0, 0x2
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v1, 0x2
 
-    invoke-virtual {p1, v0, v1, v2}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-virtual {p1, v1, v2, v0}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v3
 
     const-string p1, "Observable.combineLatest\u2026unce(2, TimeUnit.SECONDS)"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v4, Lcom/discord/stores/StoreSpotify;
 
+    new-instance v9, Lcom/discord/stores/StoreSpotify$init$3;
+
+    invoke-direct {v9, p0}, Lcom/discord/stores/StoreSpotify$init$3;-><init>(Lcom/discord/stores/StoreSpotify;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -829,10 +806,6 @@
 
     const/4 v8, 0x0
 
-    new-instance v9, Lcom/discord/stores/StoreSpotify$init$3;
-
-    invoke-direct {v9, p0}, Lcom/discord/stores/StoreSpotify$init$3;-><init>(Lcom/discord/stores/StoreSpotify;)V
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -840,36 +813,20 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setCurrentTrackId(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "trackId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreSpotify;->spotifyApiClient:Lcom/discord/utilities/spotify/SpotifyApiClient;
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient;->fetchSpotifyTrack(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "trackId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setPlayingStatus(ZI)V
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$1.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$1.smali
index bd425435e4..98c518ee22 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$Companion$initialize$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$2.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$2.smali
index 4b15b91f66..a9581d4336 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$Companion$initialize$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$3.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$3.smali
index c1168868f7..b841d13e6c 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion$initialize$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$Companion$initialize$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
index e33d671ceb..17dc414fa1 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
@@ -1013,6 +1013,20 @@
     return-object v0
 .end method
 
+.method public final getStreamRtcConnection()Lcom/discord/stores/StoreStreamRtcConnection;
+    .locals 1
+
+    invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lcom/discord/stores/StoreStream;->access$getStreamRtcConnection$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreStreamRtcConnection;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
     .locals 1
 
@@ -1254,7 +1268,9 @@
 .method public final initialize(Landroid/app/Application;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "application"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->access$isInitialized$cp()Z
 
@@ -1304,15 +1320,6 @@
     invoke-static {p1}, Lcom/discord/stores/StoreStream;->access$setInitialized$cp(Z)V
 
     return-void
-
-    :cond_1
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final isInitializedObservable()Lrx/Observable;
@@ -1336,7 +1343,7 @@
 
     const-string v1, "collector.initialized"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
index 41ba67ae80..3bbb59394f 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$deferredInit$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
index abb3e10fea..a9a22567e3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$10;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildSelected"
+
+    const-string v5, "handleGuildSelected(J)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildSelected(J)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -87,7 +71,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
index 359e71bc84..88b5e7f49a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$11;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleBackgrounded"
+
+    const-string v5, "handleBackgrounded(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBackgrounded"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBackgrounded(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$12.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$12.smali
index df898f4d55..9bc475d758 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$12.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$12.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,30 +62,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreStream$deferredInit$1$12;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
+.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "experimentsInitialized"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -92,7 +77,7 @@
 
     const-string p1, "cachesInitialized"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -108,5 +93,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreStream$deferredInit$1$12;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
index 53a7b92c03..8feb90039b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
@@ -3,7 +3,7 @@
 .source "StoreStream.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Boolean;",
             ">;"
         }
@@ -96,7 +99,7 @@
 
     const-string v2, "isInitialized"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -110,9 +113,9 @@
 
     if-lez v4, :cond_0
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object p1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -123,9 +126,9 @@
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$14.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$14.smali
index 407bd62452..f1c7f5772b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$14.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$14.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$14;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subjects/BehaviorSubject;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subjects/BehaviorSubject;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onNext"
+
+    const-string v5, "onNext(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subjects/BehaviorSubject;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Ljava/lang/Boolean;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subjects/BehaviorSubject;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
index c6419f9d62..cdaf50395d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleAuthToken"
+
+    const-string v5, "handleAuthToken(Ljava/lang/String;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleAuthToken"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleAuthToken(Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
index f8d545817b..a96d6a4838 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleFingerprint"
+
+    const-string v5, "handleFingerprint(Ljava/lang/String;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFingerprint"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleFingerprint(Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
index 9d34b49b52..be7d66b258 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleMessagesLoaded"
+
+    const-string v5, "handleMessagesLoaded(Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessagesLoaded"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessagesLoaded(Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessagesLoaded(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
index f2dc017df9..770491c920 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$5;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleChannelSelected"
+
+    const-string v5, "handleChannelSelected(J)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelSelected(J)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -87,7 +71,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
index 670c9aa687..98c40dc084 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$6;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleVoiceChannelSelected"
+
+    const-string v5, "handleVoiceChannelSelected(J)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVoiceChannelSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVoiceChannelSelected(J)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -87,7 +71,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
index 7ac9775ea4..8944b074c5 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$7;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Set<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleSpeakingUsers"
+
+    const-string v5, "handleSpeakingUsers(Ljava/util/Set;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSpeakingUsers"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSpeakingUsers(Ljava/util/Set;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -94,22 +78,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleSpeakingUsers(Lcom/discord/stores/StoreStream;Ljava/util/Set;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
index 15bf85f951..80db393f2e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$8;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/VideoInputDeviceDescription;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleVideoInputDeviceSelected"
+
+    const-string v5, "handleVideoInputDeviceSelected(Lco/discord/media_engine/VideoInputDeviceDescription;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVideoInputDeviceSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVideoInputDeviceSelected(Lco/discord/media_engine/VideoInputDeviceDescription;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lco/discord/media_engine/VideoInputDeviceDescription;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
index 87797c6c1d..9aa175ed01 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$9;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/RtcConnection$State;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleRtcConnectionStateChanged"
+
+    const-string v5, "handleRtcConnectionStateChanged(Lcom/discord/rtcconnection/RtcConnection$State;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRtcConnectionStateChanged"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRtcConnectionStateChanged(Lcom/discord/rtcconnection/RtcConnection$State;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/rtcconnection/RtcConnection$State;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleRtcConnectionStateChanged(Lcom/discord/stores/StoreStream;Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
index 97202ef9de..8fce51d166 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$deferredInit$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -388,16 +388,6 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
 
-    invoke-static {v1}, Lcom/discord/stores/StoreStream;->access$getMediaNotification$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreMediaNotification;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMediaNotification;->init(Landroid/content/Context;)V
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
-
     invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getGuildSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserGuildSettings;
 
     move-result-object v1
@@ -522,6 +512,14 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
 
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getRtcRegion$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreRtcRegion;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreRtcRegion;->init()V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getAuthentication$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAuthentication;
 
     move-result-object v1
@@ -646,9 +644,9 @@
 
     iget-object v1, v1, Lcom/discord/stores/StoreVoiceSpeaking;->speakingUsersPublisher:Lrx/subjects/Subject;
 
-    const-string v2, "voiceSpeaking\n        .speakingUsersPublisher"
+    const-string/jumbo v2, "voiceSpeaking\n        .speakingUsersPublisher"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/stores/StoreStream$deferredInit$1$7;
 
@@ -732,7 +730,7 @@
 
     const-string v2, "Backgrounded\n        .get()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/stores/StoreStream$deferredInit$1$11;
 
@@ -772,13 +770,13 @@
 
     sget-object v2, Lcom/discord/stores/StoreStream$deferredInit$1$13;->INSTANCE:Lcom/discord/stores/StoreStream$deferredInit$1$13;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "Observable\n        .comb\u2026ed)\n          }\n        }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/stores/StoreStream$deferredInit$1$14;
 
@@ -832,5 +830,15 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/SlowTtiExperimentManager;->fetchExperiment(Lcom/discord/stores/StoreExperiments;)V
 
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->Companion:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;->getINSTANCE()Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->init(Landroid/content/Context;)V
+
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1$1.smali b/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1$1.smali
index 71c9f8dd0a..92192dcdd7 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$dispatchSubscribe$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1.smali b/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1.smali
index 092731d8d9..533b5eb36b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$dispatchSubscribe$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$dispatchSubscribe$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TT;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$1.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$1.smali
index 05eaae818e..27c1d5f04b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelPayload;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleConnectionOpen"
+
+    const-string v5, "handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleConnectionOpen"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelPayload;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleConnectionOpen(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelPayload;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$10.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$10.smali
index 599cc9b8ba..4f21cddb14 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$10.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$10.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$10;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildIntegration$Update;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildIntegrationUpdate"
+
+    const-string v5, "handleGuildIntegrationUpdate(Lcom/discord/models/domain/ModelGuildIntegration$Update;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildIntegrationUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildIntegrationUpdate(Lcom/discord/models/domain/ModelGuildIntegration$Update;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildIntegration$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildIntegrationUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelGuildIntegration$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$11.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$11.smali
index aecdf59a79..fdf71140ae 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$11.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$11.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$11;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildMember;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildMemberAdd"
+
+    const-string v5, "handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMemberAdd"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildMember;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildMemberAdd(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelGuildMember;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$12.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$12.smali
index 7177b0aa67..32cb780ccb 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$12.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$12.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$12;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildMember$Chunk;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildMembersChunk"
+
+    const-string v5, "handleGuildMembersChunk(Lcom/discord/models/domain/ModelGuildMember$Chunk;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMembersChunk"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMembersChunk(Lcom/discord/models/domain/ModelGuildMember$Chunk;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildMember$Chunk;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildMembersChunk(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelGuildMember$Chunk;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$13.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$13.smali
index ffd7ded922..5502122e12 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$13.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$13.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$13;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildMember;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildMemberRemove"
+
+    const-string v5, "handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMemberRemove"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildMember;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$14.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$14.smali
index 35e7a14a21..56b1c8a387 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$14.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$14.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$14;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleChannelCreated"
+
+    const-string v5, "handleChannelCreated(Lcom/discord/models/domain/ModelChannel;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelCreated"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelCreated(Lcom/discord/models/domain/ModelChannel;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleChannelCreated(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$15.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$15.smali
index 45e3b8048a..5df41d7a20 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$15.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$15.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$15;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleChannelDeleted"
+
+    const-string v5, "handleChannelDeleted(Lcom/discord/models/domain/ModelChannel;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelDeleted"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelDeleted(Lcom/discord/models/domain/ModelChannel;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleChannelDeleted(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali
index 85839fdf95..29c4eefa63 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannelUnreadUpdate;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleChannelUnreadUpdate"
+
+    const-string v5, "handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelUnreadUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelUnreadUpdate(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleChannelUnreadUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
index fb50d3f333..719684cc4e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleUserUpdated"
+
+    const-string v5, "handleUserUpdated(Lcom/discord/models/domain/ModelUser;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleUserUpdated"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleUserUpdated(Lcom/discord/models/domain/ModelUser;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleUserUpdated(Lcom/discord/models/domain/ModelUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
index 643e6f0325..9e971ace95 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserNote$Update;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleUserNoteUpdated"
+
+    const-string v5, "handleUserNoteUpdated(Lcom/discord/models/domain/ModelUserNote$Update;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleUserNoteUpdated"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleUserNoteUpdated(Lcom/discord/models/domain/ModelUserNote$Update;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUserNote$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleUserNoteUpdated(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUserNote$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
index 309c6e3d21..9d48ba4920 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$19;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserRelationship;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleRelationshipAdd"
+
+    const-string v5, "handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRelationshipAdd"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali
index 19e1d1dc2d..c78b9c3cb7 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleConnected"
+
+    const-string v5, "handleConnected(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleConnected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleConnected(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali
index 281d1c4eab..4e53016adc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserRelationship;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleRelationshipRemove"
+
+    const-string v5, "handleRelationshipRemove(Lcom/discord/models/domain/ModelUserRelationship;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRelationshipRemove"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRelationshipRemove(Lcom/discord/models/domain/ModelUserRelationship;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleRelationshipRemove(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUserRelationship;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
index 42be4282bf..caf0ab91c8 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$21;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessage;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleMessageUpdate"
+
+    const-string v5, "handleMessageUpdate(Lcom/discord/models/domain/ModelMessage;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageUpdate(Lcom/discord/models/domain/ModelMessage;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessage;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
index 184eeb1824..b9d08d4a00 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$22;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessage;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleMessageCreate"
+
+    const-string v5, "handleMessageCreate(Lcom/discord/models/domain/ModelMessage;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageCreate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageCreate(Lcom/discord/models/domain/ModelMessage;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessage;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageCreate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
index 4e52267e3d..3340816cd9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$23;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessageReaction$Update;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleReactionAdd"
+
+    const-string v5, "handleReactionAdd(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionAdd"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionAdd(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionAdd(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
index 2516abecdb..6457491adc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessageReaction$Update;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleReactionRemove"
+
+    const-string v5, "handleReactionRemove(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionRemove"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionRemove(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionRemove(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
index 4e2d4ee0df..260501600e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessageReaction$Update;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleReactionRemoveEmoji"
+
+    const-string v5, "handleReactionRemoveEmoji(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionRemoveEmoji"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionRemoveEmoji(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionRemoveEmoji(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
index 0ade6e0a0b..4053cf35fd 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessageReaction$Update;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleReactionRemoveAll"
+
+    const-string v5, "handleReactionRemoveAll(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionRemoveAll"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleReactionRemoveAll(Lcom/discord/models/domain/ModelMessageReaction$Update;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleReactionRemoveAll(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
index ee5055b57f..8e35c4fb1c 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessageDelete;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleMessageDelete"
+
+    const-string v5, "handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageDelete"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessageDelete;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageDelete(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelMessageDelete;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
index 49d8f5bb6b..d0b4c9d3a8 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelReadState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleMessageAck"
+
+    const-string v5, "handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageAck"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelReadState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleMessageAck(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelReadState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
index edbb539641..edd8018bdc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelVoice$State;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleVoiceStateUpdate"
+
+    const-string v5, "handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVoiceStateUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelVoice$State;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleVoiceStateUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelVoice$State;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali
index c68a31c193..25a2632b54 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleConnectionReady"
+
+    const-string v5, "handleConnectionReady(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleConnectionReady"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleConnectionReady(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali
index 198be0be58..772102cd1b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelVoice$Server;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleVoiceServerUpdate"
+
+    const-string v5, "handleVoiceServerUpdate(Lcom/discord/models/domain/ModelVoice$Server;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVoiceServerUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVoiceServerUpdate(Lcom/discord/models/domain/ModelVoice$Server;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelVoice$Server;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleVoiceServerUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelVoice$Server;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
index cae0424299..eff2dd8965 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelNotificationSettings;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildSettingUpdated"
+
+    const-string v5, "handleGuildSettingUpdated(Lcom/discord/models/domain/ModelNotificationSettings;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildSettingUpdated"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildSettingUpdated(Lcom/discord/models/domain/ModelNotificationSettings;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelNotificationSettings;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildSettingUpdated(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelNotificationSettings;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali
index 7bce17700e..ae7df2d9bc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserSettings;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleUserSettingsUpdate"
+
+    const-string v5, "handleUserSettingsUpdate(Lcom/discord/models/domain/ModelUserSettings;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleUserSettingsUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleUserSettingsUpdate(Lcom/discord/models/domain/ModelUserSettings;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUserSettings;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleUserSettingsUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUserSettings;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali
index e9323ad143..d335d4006c 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Typing;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleTypingStart"
+
+    const-string v5, "handleTypingStart(Lcom/discord/models/domain/ModelUser$Typing;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleTypingStart"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleTypingStart(Lcom/discord/models/domain/ModelUser$Typing;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser$Typing;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleTypingStart(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUser$Typing;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
index 8e759a6271..72e940c7aa 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelPresence;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v3, "it"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1, v2, p1}, Lcom/discord/stores/StoreStream;->access$handlePresenceUpdate(Lcom/discord/stores/StoreStream;JLcom/discord/models/domain/ModelPresence;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali
index b30108c2ad..cf1706e856 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$35;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handlePresenceReplace"
+
+    const-string v5, "handlePresenceReplace(Ljava/util/List;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handlePresenceReplace"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handlePresenceReplace(Ljava/util/List;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -94,22 +78,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handlePresenceReplace(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
index 39dae97601..a4f7e3a199 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel$Recipient;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGroupDMRecipientAdd"
+
+    const-string v5, "handleGroupDMRecipientAdd(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGroupDMRecipientAdd"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGroupDMRecipientAdd(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGroupDMRecipientAdd(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
index f805ae4060..cc1685b14e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$37;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel$Recipient;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGroupDMRecipientRemove"
+
+    const-string v5, "handleGroupDMRecipientRemove(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGroupDMRecipientRemove"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGroupDMRecipientRemove(Lcom/discord/models/domain/ModelChannel$Recipient;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGroupDMRecipientRemove(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
index c38c6e4a1a..61d450c51a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelCall;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleCallDelete"
+
+    const-string v5, "handleCallDelete(Lcom/discord/models/domain/ModelCall;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleCallDelete"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleCallDelete(Lcom/discord/models/domain/ModelCall;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelCall;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleCallDelete(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelCall;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
index 46bf75ddda..f6cbbfb6d9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelCall;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleCallCreateOrUpdate"
+
+    const-string v5, "handleCallCreateOrUpdate(Lcom/discord/models/domain/ModelCall;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleCallCreateOrUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleCallCreateOrUpdate(Lcom/discord/models/domain/ModelCall;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelCall;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleCallCreateOrUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelCall;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali
index 805f404d69..635e140016 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildAdd"
+
+    const-string v5, "handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildAdd"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali
index 37eab7994f..f8934e604e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEmojiUpdate"
+
+    const-string v5, "handleEmojiUpdate(Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEmojiUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEmojiUpdate(Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleEmojiUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
index 0a4956605d..d785d102e0 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleRequiredActionUpdate"
+
+    const-string v5, "handleRequiredActionUpdate(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRequiredActionUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleRequiredActionUpdate(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleRequiredActionUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali
index ff5183722a..f8fa8dbd92 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildMemberListUpdate;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildMemberListUpdate"
+
+    const-string v5, "handleGuildMemberListUpdate(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMemberListUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildMemberListUpdate(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleGuildMemberListUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali
index 9b3ec6acef..be791d8462 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$43;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleSessionsReplace"
+
+    const-string v5, "handleSessionsReplace(Ljava/util/List;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSessionsReplace"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSessionsReplace(Ljava/util/List;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -95,22 +79,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleSessionsReplace(Lcom/discord/stores/StoreStream;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali
index f2e1de2bc6..ccfdc6a4a3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$45.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$45.smali
index a9d113c97a..add5d5eae8 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$45.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$45.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$46.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$46.smali
index 24595bdab7..4b103d19e9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$46.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$46.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/StreamCreateOrUpdate;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStreamCreate"
+
+    const-string v5, "handleStreamCreate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStreamCreate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStreamCreate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/StreamCreateOrUpdate;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleStreamCreate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamCreateOrUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$47.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$47.smali
index 8888e79908..1629055fa7 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$47.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$47.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/StreamCreateOrUpdate;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStreamUpdate"
+
+    const-string v5, "handleStreamUpdate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStreamUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStreamUpdate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/StreamCreateOrUpdate;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleStreamUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamCreateOrUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$48.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$48.smali
index e9e01d9169..4c7d1cdf0d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$48.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$48.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/StreamDelete;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$49.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$49.smali
index a95ddebf88..f694226dbd 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$49.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$49.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$49;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/StreamServerUpdate;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStreamServerUpdate"
+
+    const-string v5, "handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStreamServerUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/StreamServerUpdate;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleStreamServerUpdate(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/StreamServerUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$5.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$5.smali
index c5b14a94e3..0a1f1ae36a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$5.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$5;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildRole$Payload;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildRoleAdd"
+
+    const-string v5, "handleGuildRoleAdd(Lcom/discord/models/domain/ModelGuildRole$Payload;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildRoleAdd"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildRoleAdd(Lcom/discord/models/domain/ModelGuildRole$Payload;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$6.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$6.smali
index 30a833084d..976fdb87fc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$6.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$6;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildRemove"
+
+    const-string v5, "handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildRemove"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$7.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$7.smali
index 9f5427ef2b..b28ad6f49e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$7.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$7;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuildRole$Payload;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGuildRoleRemove"
+
+    const-string v5, "handleGuildRoleRemove(Lcom/discord/models/domain/ModelGuildRole$Payload;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildRoleRemove"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGuildRoleRemove(Lcom/discord/models/domain/ModelGuildRole$Payload;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuildRole$Payload;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$8.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$8.smali
index 9b4116a407..f255aa9d42 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$8.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$8;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelBan;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleBanAdd"
+
+    const-string v5, "handleBanAdd(Lcom/discord/models/domain/ModelBan;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBanAdd"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBanAdd(Lcom/discord/models/domain/ModelBan;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelBan;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleBanAdd(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelBan;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$9.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$9.smali
index 766cbf5a07..2bc9e6198a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$9.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$9.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$initGatewaySocketListeners$9;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelBan;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreStream;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleBanRemove"
+
+    const-string v5, "handleBanRemove(Lcom/discord/models/domain/ModelBan;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBanRemove"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreStream;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBanRemove(Lcom/discord/models/domain/ModelBan;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelBan;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreStream;
 
     invoke-static {v0, p1}, Lcom/discord/stores/StoreStream;->access$handleBanRemove(Lcom/discord/stores/StoreStream;Lcom/discord/models/domain/ModelBan;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$1.smali b/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$1.smali
index de3a31d26d..d88e9227f0 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lrx/Observable<",
@@ -30,45 +30,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreChannels;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreChannels;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "get"
+
+    const-string v5, "get(J)Lrx/Observable;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "get"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreChannels;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "get(J)Lrx/Observable;"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -96,7 +80,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreChannels;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$2.smali b/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$2.smali
index 68f7140186..155c8b017b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$lazyChannelMembersStore$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreStream.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lrx/Observable<",
@@ -30,45 +30,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreGuildMemberCounts;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/stores/StoreGuildMemberCounts;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "getApproximateMemberCount"
+
+    const-string v5, "getApproximateMemberCount(J)Lrx/Observable;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getApproximateMemberCount"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreGuildMemberCounts;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getApproximateMemberCount(J)Lrx/Observable;"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -96,7 +80,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreGuildMemberCounts;
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali
index a568a76445..23c59424be 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -139,8 +139,6 @@
 
 .field public final mediaEngine:Lcom/discord/stores/StoreMediaEngine;
 
-.field public final mediaNotification:Lcom/discord/stores/StoreMediaNotification;
-
 .field public final mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
 .field public final mentions:Lcom/discord/stores/StoreMentions;
@@ -272,9 +270,11 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 15
+    .locals 20
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    move-object/from16 v8, p0
+
+    invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -282,7 +282,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->initialized:Lrx/subjects/BehaviorSubject;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->initialized:Lrx/subjects/BehaviorSubject;
 
     sget-object v0, Lcom/discord/stores/StoreStream$storeThreadScheduler$1;->INSTANCE:Lcom/discord/stores/StoreStream$storeThreadScheduler$1;
 
@@ -290,1007 +290,1017 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lr0/p/a;->b(Ljava/util/concurrent/Executor;)Lrx/Scheduler;
+    invoke-static {v0}, Ls0/p/a;->b(Ljava/util/concurrent/Executor;)Lrx/Scheduler;
 
     move-result-object v0
 
     const-string v1, "Schedulers.from(Executor\u2026       newThread\n      })"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->storeThreadScheduler:Lrx/Scheduler;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->storeThreadScheduler:Lrx/Scheduler;
 
     new-instance v1, Lcom/discord/stores/Dispatcher;
 
-    const/4 v2, 0x0
+    const/4 v9, 0x0
 
-    invoke-direct {v1, v0, v2}, Lcom/discord/stores/Dispatcher;-><init>(Lrx/Scheduler;Z)V
+    invoke-direct {v1, v0, v9}, Lcom/discord/stores/Dispatcher;-><init>(Lrx/Scheduler;Z)V
 
-    iput-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iput-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
     new-instance v1, Lcom/discord/stores/StoreAnalytics;
 
-    iget-object v3, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v1, p0, v3, v0}, Lcom/discord/stores/StoreAnalytics;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+    invoke-direct {v1, v8, v2, v0}, Lcom/discord/stores/StoreAnalytics;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
 
-    iput-object v1, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
+    iput-object v1, v8, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
 
     new-instance v0, Lcom/discord/stores/StoreAuthentication;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreAuthentication;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreAuthentication;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
 
     new-instance v0, Lcom/discord/stores/StoreChannels;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreChannels;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreChannels;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
 
     new-instance v0, Lcom/discord/stores/StoreChannelsSelected;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreChannelsSelected;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreChannelsSelected;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->channelsSelected:Lcom/discord/stores/StoreChannelsSelected;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->channelsSelected:Lcom/discord/stores/StoreChannelsSelected;
 
     new-instance v0, Lcom/discord/stores/StoreChannelConversions;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreChannelConversions;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->channelConversions:Lcom/discord/stores/StoreChannelConversions;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->channelConversions:Lcom/discord/stores/StoreChannelConversions;
 
     new-instance v0, Lcom/discord/stores/StoreClientVersion;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreClientVersion;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->clientVersion:Lcom/discord/stores/StoreClientVersion;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->clientVersion:Lcom/discord/stores/StoreClientVersion;
 
     new-instance v0, Lcom/discord/stores/StoreGuildMemberCounts;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreGuildMemberCounts;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
 
     new-instance v0, Lcom/discord/stores/StoreGuildsNsfw;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreGuildsNsfw;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreGuildsNsfw;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
 
     new-instance v0, Lcom/discord/stores/StoreBans;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreBans;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->bans:Lcom/discord/stores/StoreBans;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->bans:Lcom/discord/stores/StoreBans;
 
     new-instance v0, Lcom/discord/stores/StoreEmojiGuild;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreEmojiGuild;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildEmojis:Lcom/discord/stores/StoreEmojiGuild;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildEmojis:Lcom/discord/stores/StoreEmojiGuild;
 
     new-instance v0, Lcom/discord/stores/StoreGuildIntegrations;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreGuildIntegrations;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->integrations:Lcom/discord/stores/StoreGuildIntegrations;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->integrations:Lcom/discord/stores/StoreGuildIntegrations;
 
     new-instance v0, Lcom/discord/stores/StoreInstantInvites;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreInstantInvites;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->instantInvites:Lcom/discord/stores/StoreInstantInvites;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->instantInvites:Lcom/discord/stores/StoreInstantInvites;
 
     new-instance v0, Lcom/discord/stores/StoreGuildTemplates;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreGuildTemplates;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildTemplates:Lcom/discord/stores/StoreGuildTemplates;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildTemplates:Lcom/discord/stores/StoreGuildTemplates;
 
     new-instance v0, Lcom/discord/stores/StoreGuildSelected;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreGuildSelected;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreGuildSelected;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildSelected:Lcom/discord/stores/StoreGuildSelected;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildSelected:Lcom/discord/stores/StoreGuildSelected;
 
     new-instance v0, Lcom/discord/stores/StoreInviteSettings;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreInviteSettings;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildInvite:Lcom/discord/stores/StoreInviteSettings;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildInvite:Lcom/discord/stores/StoreInviteSettings;
 
     new-instance v0, Lcom/discord/stores/StoreMessages;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v3, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, p0, v1, v3}, Lcom/discord/stores/StoreMessages;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+    invoke-direct {v0, v8, v1, v2}, Lcom/discord/stores/StoreMessages;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->messages:Lcom/discord/stores/StoreMessages;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->messages:Lcom/discord/stores/StoreMessages;
 
     new-instance v0, Lcom/discord/stores/StoreMessagesLoader;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreMessagesLoader;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreMessagesLoader;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->messagesLoader:Lcom/discord/stores/StoreMessagesLoader;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->messagesLoader:Lcom/discord/stores/StoreMessagesLoader;
 
     new-instance v0, Lcom/discord/stores/StoreMessagesMostRecent;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreMessagesMostRecent;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
 
     new-instance v0, Lcom/discord/stores/StoreMessageAck;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreMessageAck;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreMessageAck;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
 
     new-instance v0, Lcom/discord/stores/StoreMessageState;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreMessageState;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState;
 
     new-instance v0, Lcom/discord/stores/StoreNotifications;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreNotifications;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v1, v8}, Lcom/discord/stores/StoreNotifications;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->notifications:Lcom/discord/stores/StoreNotifications;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->notifications:Lcom/discord/stores/StoreNotifications;
 
     new-instance v0, Lcom/discord/stores/StoreUserGuildSettings;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v3, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    iget-object v4, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
 
-    invoke-direct {v0, v1, v3, v4, v5}, Lcom/discord/stores/StoreUserGuildSettings;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreChannels;)V
+    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreUserGuildSettings;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreChannels;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
 
-    new-instance v0, Lcom/discord/stores/StoreUser;
+    new-instance v6, Lcom/discord/stores/StoreUser;
 
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x4
-
-    const/4 v11, 0x0
-
-    move-object v6, v0
-
-    move-object v7, p0
-
-    invoke-direct/range {v6 .. v11}, Lcom/discord/stores/StoreUser;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
-    new-instance v0, Lcom/discord/stores/StoreGuilds;
-
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x2
+    const/4 v4, 0x4
 
-    invoke-direct {v0, v1, v3, v4, v3}, Lcom/discord/stores/StoreGuilds;-><init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v5, 0x0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+    move-object v0, v6
+
+    move-object/from16 v1, p0
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreUser;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object v6, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+
+    new-instance v0, Lcom/discord/stores/StoreGuilds;
+
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x2
+
+    invoke-direct {v0, v1, v10, v11, v10}, Lcom/discord/stores/StoreGuilds;-><init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
 
     new-instance v0, Lcom/discord/stores/StoreExperiments;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v5, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    iget-object v9, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v6, v8, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
 
-    iget-object v10, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
+    iget-object v7, v8, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
 
-    move-object v5, v0
+    move-object v2, v0
 
-    invoke-direct/range {v5 .. v10}, Lcom/discord/stores/StoreExperiments;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreAuthentication;)V
+    invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreExperiments;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreAuthentication;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
 
     new-instance v0, Lcom/discord/stores/StoreLurking;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1, v5}, Lcom/discord/stores/StoreLurking;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1, v2}, Lcom/discord/stores/StoreLurking;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
 
     new-instance v0, Lcom/discord/stores/StoreUserConnections;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUserConnections;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreUserConnections;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->userConnections:Lcom/discord/stores/StoreUserConnections;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->userConnections:Lcom/discord/stores/StoreUserConnections;
 
     new-instance v0, Lcom/discord/stores/StoreUsersMutualGuilds;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreUsersMutualGuilds;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreUsersMutualGuilds;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->usersMutualGuilds:Lcom/discord/stores/StoreUsersMutualGuilds;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->usersMutualGuilds:Lcom/discord/stores/StoreUsersMutualGuilds;
 
     new-instance v0, Lcom/discord/stores/StoreUserPresence;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreUserPresence;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v1, v8}, Lcom/discord/stores/StoreUserPresence;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
 
     new-instance v0, Lcom/discord/stores/StoreUserProfile;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreUserProfile;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->userProfile:Lcom/discord/stores/StoreUserProfile;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->userProfile:Lcom/discord/stores/StoreUserProfile;
 
     new-instance v0, Lcom/discord/stores/StoreUserNotes;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreUserNotes;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->userNotes:Lcom/discord/stores/StoreUserNotes;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->userNotes:Lcom/discord/stores/StoreUserNotes;
 
     new-instance v0, Lcom/discord/stores/StoreUserTyping;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUserTyping;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreUserTyping;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->usersTyping:Lcom/discord/stores/StoreUserTyping;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->usersTyping:Lcom/discord/stores/StoreUserTyping;
 
     new-instance v0, Lcom/discord/stores/StoreUserSettings;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUserSettings;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreUserSettings;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
 
     new-instance v0, Lcom/discord/stores/StoreUserRequiredActions;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreUserRequiredActions;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->userRequiredAction:Lcom/discord/stores/StoreUserRequiredActions;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->userRequiredAction:Lcom/discord/stores/StoreUserRequiredActions;
 
     new-instance v0, Lcom/discord/stores/StoreUserRelationships;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUserRelationships;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreUserRelationships;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
 
     new-instance v0, Lcom/discord/stores/StoreVoiceStates;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreVoiceStates;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreVoiceStates;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceStates:Lcom/discord/stores/StoreVoiceStates;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->voiceStates:Lcom/discord/stores/StoreVoiceStates;
 
     new-instance v0, Lcom/discord/stores/StoreVoiceSpeaking;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreVoiceSpeaking;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceSpeaking:Lcom/discord/stores/StoreVoiceSpeaking;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->voiceSpeaking:Lcom/discord/stores/StoreVoiceSpeaking;
 
     new-instance v0, Lcom/discord/stores/StorePermissions;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
 
-    invoke-direct {v0, v1, v5, v6}, Lcom/discord/stores/StorePermissions;-><init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;)V
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StorePermissions;-><init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
 
     new-instance v0, Lcom/discord/stores/StoreTabsNavigation;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreTabsNavigation;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v1, v8}, Lcom/discord/stores/StoreTabsNavigation;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
 
     new-instance v0, Lcom/discord/stores/StoreMaskedLinks;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreMaskedLinks;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v1, v8}, Lcom/discord/stores/StoreMaskedLinks;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->maskedLinks:Lcom/discord/stores/StoreMaskedLinks;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->maskedLinks:Lcom/discord/stores/StoreMaskedLinks;
 
     new-instance v0, Lcom/discord/stores/StoreNavigation;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreNavigation;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreTabsNavigation;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreNavigation;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreTabsNavigation;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->navigation:Lcom/discord/stores/StoreNavigation;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->navigation:Lcom/discord/stores/StoreNavigation;
 
     new-instance v0, Lcom/discord/stores/StoreEmojiCustom;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreEmojiCustom;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreEmojiCustom;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
 
     new-instance v0, Lcom/discord/stores/StoreAccessibility;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
 
-    const/4 v8, 0x0
+    const/4 v4, 0x0
 
-    const/4 v9, 0x0
+    const/4 v5, 0x0
 
-    const/16 v10, 0xc
+    const/16 v6, 0xc
 
-    move-object v5, v0
+    const/4 v7, 0x0
 
-    invoke-direct/range {v5 .. v11}, Lcom/discord/stores/StoreAccessibility;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/updates/ObservationDeck;Lcom/discord/utilities/accessibility/AccessibilityMonitor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, v0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->accessibility:Lcom/discord/stores/StoreAccessibility;
+    invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreAccessibility;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/updates/ObservationDeck;Lcom/discord/utilities/accessibility/AccessibilityMonitor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->accessibility:Lcom/discord/stores/StoreAccessibility;
 
     new-instance v0, Lcom/discord/stores/StoreVoiceChannelSelected;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, p0, v1, v5}, Lcom/discord/stores/StoreVoiceChannelSelected;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+    invoke-direct {v0, v8, v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
 
     new-instance v0, Lcom/discord/stores/StoreAudioDevices;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    sget-object v5, Lcom/discord/utilities/media/AudioOutputMonitor;->Companion:Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+    sget-object v2, Lcom/discord/utilities/media/AudioOutputMonitor;->Companion:Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
 
-    invoke-virtual {v5}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/media/AudioOutputMonitor;
+    invoke-virtual {v2}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/media/AudioOutputMonitor;
 
-    move-result-object v5
+    move-result-object v2
 
-    new-instance v6, Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;
+    new-instance v3, Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
 
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->voiceStates:Lcom/discord/stores/StoreVoiceStates;
+    iget-object v5, v8, Lcom/discord/stores/StoreStream;->voiceStates:Lcom/discord/stores/StoreVoiceStates;
 
-    iget-object v9, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v6, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    invoke-direct {v6, v7, v8, v9}, Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreUser;)V
+    invoke-direct {v3, v4, v5, v6}, Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreUser;)V
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
 
-    invoke-direct {v0, v1, v5, v6, v7}, Lcom/discord/stores/StoreAudioDevices;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;Lcom/discord/stores/StoreVoiceChannelSelected;)V
+    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreAudioDevices;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;Lcom/discord/stores/StoreAudioDevices$VideoUseDetector;Lcom/discord/stores/StoreVoiceChannelSelected;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
 
-    new-instance v0, Lcom/discord/stores/StoreGatewayConnection;
+    new-instance v7, Lcom/discord/stores/StoreGatewayConnection;
 
-    iget-object v10, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    sget-object v1, Lcom/discord/utilities/logging/AppGatewaySocketLogger;->Companion:Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;
+    sget-object v0, Lcom/discord/utilities/logging/AppGatewaySocketLogger;->Companion:Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;->getINSTANCE()Lcom/discord/utilities/logging/AppGatewaySocketLogger;
+    invoke-virtual {v0}, Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;->getINSTANCE()Lcom/discord/utilities/logging/AppGatewaySocketLogger;
 
-    move-result-object v12
+    move-result-object v4
 
-    const/4 v13, 0x4
+    const/4 v3, 0x0
 
-    const/4 v14, 0x0
+    const/4 v5, 0x4
 
-    move-object v8, v0
+    const/4 v6, 0x0
 
-    move-object v9, p0
+    move-object v0, v7
 
-    invoke-direct/range {v8 .. v14}, Lcom/discord/stores/StoreGatewayConnection;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/logging/AppGatewaySocketLogger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object/from16 v1, p0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+    invoke-direct/range {v0 .. v6}, Lcom/discord/stores/StoreGatewayConnection;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/logging/AppGatewaySocketLogger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object v7, v8, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
 
     new-instance v0, Lcom/discord/stores/StoreConnectivity;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreConnectivity;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->connectivity:Lcom/discord/stores/StoreConnectivity;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->connectivity:Lcom/discord/stores/StoreConnectivity;
 
     new-instance v0, Lcom/discord/stores/StoreConnectionOpen;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreConnectionOpen;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
 
     new-instance v0, Lcom/discord/stores/StoreCalls;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreCalls;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreCalls;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->calls:Lcom/discord/stores/StoreCalls;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->calls:Lcom/discord/stores/StoreCalls;
 
     new-instance v0, Lcom/discord/stores/StoreCallsIncoming;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreCallsIncoming;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->callsIncoming:Lcom/discord/stores/StoreCallsIncoming;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->callsIncoming:Lcom/discord/stores/StoreCallsIncoming;
 
     new-instance v0, Lcom/discord/stores/StoreChat;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreChat;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat;
 
     new-instance v0, Lcom/discord/stores/StoreMentions;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
 
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
 
-    iget-object v9, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
+    iget-object v5, v8, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
 
-    iget-object v10, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+    iget-object v6, v8, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
 
-    move-object v5, v0
+    move-object v1, v0
 
-    invoke-direct/range {v5 .. v10}, Lcom/discord/stores/StoreMentions;-><init>(Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreChannels;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreMentions;-><init>(Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreChannels;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions;
 
     new-instance v0, Lcom/discord/stores/StorePinnedMessages;
 
     invoke-direct {v0}, Lcom/discord/stores/StorePinnedMessages;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->pinnedMessages:Lcom/discord/stores/StorePinnedMessages;
-
-    new-instance v9, Lcom/discord/stores/StoreRtcRegion;
-
-    iget-object v0, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
-    invoke-direct {v9, v0, v3, v4, v3}, Lcom/discord/stores/StoreRtcRegion;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object v9, p0, Lcom/discord/stores/StoreStream;->rtcRegion:Lcom/discord/stores/StoreRtcRegion;
-
-    new-instance v0, Lcom/discord/stores/StoreRtcConnection;
-
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
-    iget-object v10, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
-
-    move-object v5, v0
-
-    move-object v6, p0
-
-    invoke-direct/range {v5 .. v10}, Lcom/discord/stores/StoreRtcConnection;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreRtcRegion;Lcom/discord/stores/StoreAnalytics;)V
-
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->pinnedMessages:Lcom/discord/stores/StorePinnedMessages;
 
     new-instance v0, Lcom/discord/stores/StoreReadStates;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreReadStates;-><init>(Lcom/discord/utilities/time/Clock;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->readStates:Lcom/discord/stores/StoreReadStates;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->readStates:Lcom/discord/stores/StoreReadStates;
 
     new-instance v0, Lcom/discord/stores/StoreVoiceParticipants;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreVoiceParticipants;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreVoiceParticipants;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceParticipants:Lcom/discord/stores/StoreVoiceParticipants;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->voiceParticipants:Lcom/discord/stores/StoreVoiceParticipants;
 
     new-instance v0, Lcom/discord/stores/StoreSearch;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    invoke-direct {v0, v1, v5}, Lcom/discord/stores/StoreSearch;-><init>(Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreSearch;-><init>(Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->search:Lcom/discord/stores/StoreSearch;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->search:Lcom/discord/stores/StoreSearch;
 
     new-instance v0, Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaSettings;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreMediaSettings;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
     new-instance v0, Lcom/discord/stores/StoreDynamicLink;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreDynamicLink;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreDynamicLink;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->storeDynamicLink:Lcom/discord/stores/StoreDynamicLink;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->storeDynamicLink:Lcom/discord/stores/StoreDynamicLink;
 
     new-instance v0, Lcom/discord/stores/StoreChannelCategories;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
 
-    invoke-direct {v0, v1, v5}, Lcom/discord/stores/StoreChannelCategories;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreChannels;)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreChannelCategories;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreChannels;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->storeChannelCategories:Lcom/discord/stores/StoreChannelCategories;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->storeChannelCategories:Lcom/discord/stores/StoreChannelCategories;
 
     new-instance v0, Lcom/discord/stores/StoreVideoSupport;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreVideoSupport;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->videoSupport:Lcom/discord/stores/StoreVideoSupport;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->videoSupport:Lcom/discord/stores/StoreVideoSupport;
 
     new-instance v0, Lcom/discord/stores/StoreMediaEngine;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v1, v5}, Lcom/discord/stores/StoreMediaEngine;-><init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreMediaEngine;-><init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
 
-    new-instance v0, Lcom/discord/stores/StoreMediaNotification;
+    new-instance v4, Lcom/discord/stores/StoreRtcRegion;
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+    iget-object v13, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    iget-object v14, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+    iget-object v15, v8, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+    iget-object v0, v8, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
 
-    invoke-direct {v0, v1, v5, v6, v7}, Lcom/discord/stores/StoreMediaNotification;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+    const/16 v17, 0x0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaNotification:Lcom/discord/stores/StoreMediaNotification;
+    const/16 v18, 0x10
+
+    const/16 v19, 0x0
+
+    move-object v12, v4
+
+    move-object/from16 v16, v0
+
+    invoke-direct/range {v12 .. v19}, Lcom/discord/stores/StoreRtcRegion;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreExperiments;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object v4, v8, Lcom/discord/stores/StoreStream;->rtcRegion:Lcom/discord/stores/StoreRtcRegion;
+
+    new-instance v6, Lcom/discord/stores/StoreRtcConnection;
+
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+
+    iget-object v5, v8, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
+
+    move-object v0, v6
+
+    move-object/from16 v1, p0
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreRtcConnection;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreRtcRegion;Lcom/discord/stores/StoreAnalytics;)V
+
+    iput-object v6, v8, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
 
     new-instance v0, Lcom/discord/stores/StoreVideoStreams;
 
-    const/4 v1, 0x1
+    const/4 v12, 0x1
 
-    invoke-direct {v0, v3, v1, v3}, Lcom/discord/stores/StoreVideoStreams;-><init>(Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v10, v12, v10}, Lcom/discord/stores/StoreVideoStreams;-><init>(Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->videoStreams:Lcom/discord/stores/StoreVideoStreams;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->videoStreams:Lcom/discord/stores/StoreVideoStreams;
 
     new-instance v0, Lcom/discord/stores/StoreGameParty;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreGameParty;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->gameParty:Lcom/discord/stores/StoreGameParty;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->gameParty:Lcom/discord/stores/StoreGameParty;
 
     new-instance v0, Lcom/discord/stores/StoreNotices;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, v5, p0}, Lcom/discord/stores/StoreNotices;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v1, v8}, Lcom/discord/stores/StoreNotices;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
 
     new-instance v0, Lcom/discord/stores/StoreGuildSubscriptions;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v5}, Lcom/discord/stores/StoreGuildSubscriptions;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreGuildSubscriptions;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildSubscriptions:Lcom/discord/stores/StoreGuildSubscriptions;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildSubscriptions:Lcom/discord/stores/StoreGuildSubscriptions;
 
     new-instance v0, Lcom/discord/stores/StoreChannelMembers;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    new-instance v6, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;
+    new-instance v2, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
 
-    invoke-direct {v6, v7}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;-><init>(Lcom/discord/stores/StoreChannels;)V
+    invoke-direct {v2, v3}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;-><init>(Lcom/discord/stores/StoreChannels;)V
 
-    new-instance v7, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;
+    new-instance v3, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;
 
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
 
-    invoke-direct {v7, v8}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;-><init>(Lcom/discord/stores/StoreGuildMemberCounts;)V
+    invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;-><init>(Lcom/discord/stores/StoreGuildMemberCounts;)V
 
-    invoke-direct {v0, p0, v5, v6, v7}, Lcom/discord/stores/StoreChannelMembers;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, v8, v1, v2, v3}, Lcom/discord/stores/StoreChannelMembers;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->lazyChannelMembersStore:Lcom/discord/stores/StoreChannelMembers;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->lazyChannelMembersStore:Lcom/discord/stores/StoreChannelMembers;
 
     new-instance v0, Lcom/discord/stores/StoreGuildMemberRequester;
 
-    invoke-direct {v0, p0}, Lcom/discord/stores/StoreGuildMemberRequester;-><init>(Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v8}, Lcom/discord/stores/StoreGuildMemberRequester;-><init>(Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildMemberRequesterStore:Lcom/discord/stores/StoreGuildMemberRequester;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildMemberRequesterStore:Lcom/discord/stores/StoreGuildMemberRequester;
 
     new-instance v0, Lcom/discord/stores/StoreReviewRequest;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, v5, p0}, Lcom/discord/stores/StoreReviewRequest;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v1, v8}, Lcom/discord/stores/StoreReviewRequest;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->reviewRequestStore:Lcom/discord/stores/StoreReviewRequest;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->reviewRequestStore:Lcom/discord/stores/StoreReviewRequest;
 
     new-instance v0, Lcom/discord/stores/StoreChangeLog;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    invoke-direct {v0, v5, v6, v7}, Lcom/discord/stores/StoreChangeLog;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreNotices;Lcom/discord/stores/StoreUser;)V
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreChangeLog;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreNotices;Lcom/discord/stores/StoreUser;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->changeLogStore:Lcom/discord/stores/StoreChangeLog;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->changeLogStore:Lcom/discord/stores/StoreChangeLog;
 
     new-instance v0, Lcom/discord/stores/StoreRunningGame;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, p0, v5, v6}, Lcom/discord/stores/StoreRunningGame;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+    invoke-direct {v0, v8, v1, v2}, Lcom/discord/stores/StoreRunningGame;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->runningGame:Lcom/discord/stores/StoreRunningGame;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->runningGame:Lcom/discord/stores/StoreRunningGame;
 
     new-instance v0, Lcom/discord/stores/StoreSlowMode;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, v5, p0}, Lcom/discord/stores/StoreSlowMode;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
+    invoke-direct {v0, v1, v8}, Lcom/discord/stores/StoreSlowMode;-><init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->slowMode:Lcom/discord/stores/StoreSlowMode;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->slowMode:Lcom/discord/stores/StoreSlowMode;
 
     new-instance v0, Lcom/discord/stores/StoreAuditLog;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v5}, Lcom/discord/stores/StoreAuditLog;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreAuditLog;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->auditLog:Lcom/discord/stores/StoreAuditLog;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->auditLog:Lcom/discord/stores/StoreAuditLog;
 
     new-instance v0, Lcom/discord/stores/StoreMessageUploads;
 
     invoke-direct {v0}, Lcom/discord/stores/StoreMessageUploads;-><init>()V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageUploads:Lcom/discord/stores/StoreMessageUploads;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->messageUploads:Lcom/discord/stores/StoreMessageUploads;
 
     new-instance v0, Lcom/discord/stores/StoreNux;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreNux;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreNux;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->nux:Lcom/discord/stores/StoreNux;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->nux:Lcom/discord/stores/StoreNux;
 
     new-instance v0, Lcom/discord/stores/StoreLibrary;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreLibrary;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreLibrary;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->library:Lcom/discord/stores/StoreLibrary;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->library:Lcom/discord/stores/StoreLibrary;
 
     new-instance v0, Lcom/discord/stores/StoreGifting;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreGifting;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreGifting;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->gifting:Lcom/discord/stores/StoreGifting;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->gifting:Lcom/discord/stores/StoreGifting;
 
     new-instance v0, Lcom/discord/stores/StoreSpotify;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, p0, v5, v6}, Lcom/discord/stores/StoreSpotify;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+    invoke-direct {v0, v8, v1, v2}, Lcom/discord/stores/StoreSpotify;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->spotify:Lcom/discord/stores/StoreSpotify;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->spotify:Lcom/discord/stores/StoreSpotify;
 
     new-instance v0, Lcom/discord/stores/StoreMessageReactions;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    invoke-direct {v0, v5, v6}, Lcom/discord/stores/StoreMessageReactions;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreMessageReactions;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageReactions:Lcom/discord/stores/StoreMessageReactions;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->messageReactions:Lcom/discord/stores/StoreMessageReactions;
 
     new-instance v0, Lcom/discord/stores/StoreApplication;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreApplication;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreApplication;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->application:Lcom/discord/stores/StoreApplication;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->application:Lcom/discord/stores/StoreApplication;
 
     new-instance v0, Lcom/discord/stores/StorePaymentSources;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StorePaymentSources;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StorePaymentSources;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->paymentSources:Lcom/discord/stores/StorePaymentSources;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->paymentSources:Lcom/discord/stores/StorePaymentSources;
 
     new-instance v0, Lcom/discord/stores/StoreSubscriptions;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreSubscriptions;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreSubscriptions;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->subscriptions:Lcom/discord/stores/StoreSubscriptions;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->subscriptions:Lcom/discord/stores/StoreSubscriptions;
 
     new-instance v0, Lcom/discord/stores/StoreMFA;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, p0, v5}, Lcom/discord/stores/StoreMFA;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v8, v1}, Lcom/discord/stores/StoreMFA;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->mfa:Lcom/discord/stores/StoreMFA;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->mfa:Lcom/discord/stores/StoreMFA;
 
-    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming;
+    new-instance v6, Lcom/discord/stores/StoreApplicationStreaming;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
 
-    invoke-direct {v0, p0, v5, v6, v7}, Lcom/discord/stores/StoreApplicationStreaming;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;)V
+    iget-object v5, v8, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+    move-object v0, v6
 
-    new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection;
+    move-object/from16 v1, p0
 
-    iget-object v9, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
+    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreApplicationStreaming;-><init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
 
-    iget-object v10, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iput-object v6, v8, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
 
-    iget-object v12, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    new-instance v13, Lcom/discord/stores/StoreStreamRtcConnection;
 
-    iget-object v13, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
 
-    iget-object v14, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    move-object v8, v0
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    move-object v11, p0
+    iget-object v5, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct/range {v8 .. v14}, Lcom/discord/stores/StoreStreamRtcConnection;-><init>(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;)V
+    iget-object v6, v8, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+    iget-object v7, v8, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+
+    move-object v0, v13
+
+    move-object/from16 v3, p0
+
+    invoke-direct/range {v0 .. v7}, Lcom/discord/stores/StoreStreamRtcConnection;-><init>(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreRtcConnection;)V
+
+    iput-object v13, v8, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
 
     new-instance v0, Lcom/discord/stores/StoreAudioManager;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreAudioManager;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreRtcConnection;)V
 
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
-
-    invoke-direct {v0, v5, v6, v7, v8}, Lcom/discord/stores/StoreAudioManager;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;Lcom/discord/stores/StoreExperiments;)V
-
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
 
     new-instance v0, Lcom/discord/stores/StoreApplicationStreamPreviews;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-direct {v0, v5, v6}, Lcom/discord/stores/StoreApplicationStreamPreviews;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreApplicationStreamPreviews;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreamPreviews:Lcom/discord/stores/StoreApplicationStreamPreviews;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->applicationStreamPreviews:Lcom/discord/stores/StoreApplicationStreamPreviews;
 
     new-instance v0, Lcom/discord/stores/StoreGuildsSorted;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
 
-    invoke-direct {v0, v5, v6, v7}, Lcom/discord/stores/StoreGuildsSorted;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreLurking;)V
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreGuildsSorted;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreLurking;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
 
     new-instance v0, Lcom/discord/stores/StoreExpandedGuildFolders;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreExpandedGuildFolders;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreExpandedGuildFolders;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->expandedGuildFolders:Lcom/discord/stores/StoreExpandedGuildFolders;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->expandedGuildFolders:Lcom/discord/stores/StoreExpandedGuildFolders;
 
     new-instance v0, Lcom/discord/stores/StoreEmoji;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
 
-    iget-object v8, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
+    iget-object v4, v8, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
 
-    invoke-direct {v0, v5, v6, v7, v8}, Lcom/discord/stores/StoreEmoji;-><init>(Lcom/discord/stores/StoreEmojiCustom;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreGuildsSorted;)V
+    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreEmoji;-><init>(Lcom/discord/stores/StoreEmojiCustom;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreGuildsSorted;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->emojis:Lcom/discord/stores/StoreEmoji;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->emojis:Lcom/discord/stores/StoreEmoji;
 
     new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StorePremiumGuildSubscription;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->premiumGuildSubscriptions:Lcom/discord/stores/StorePremiumGuildSubscription;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->premiumGuildSubscriptions:Lcom/discord/stores/StorePremiumGuildSubscription;
 
     new-instance v0, Lcom/discord/stores/StoreEntitlements;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreEntitlements;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreEntitlements;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->entitlements:Lcom/discord/stores/StoreEntitlements;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->entitlements:Lcom/discord/stores/StoreEntitlements;
 
     new-instance v0, Lcom/discord/stores/StoreAndroidPackages;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreAndroidPackages;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreAndroidPackages;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->androidPackages:Lcom/discord/stores/StoreAndroidPackages;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->androidPackages:Lcom/discord/stores/StoreAndroidPackages;
 
     new-instance v0, Lcom/discord/stores/StoreGuildProfiles;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreGuildProfiles;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreGuildProfiles;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildProfiles:Lcom/discord/stores/StoreGuildProfiles;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildProfiles:Lcom/discord/stores/StoreGuildProfiles;
 
     new-instance v0, Lcom/discord/stores/StoreGuildWelcomeScreens;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5, v3, v4, v3}, Lcom/discord/stores/StoreGuildWelcomeScreens;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1, v10, v11, v10}, Lcom/discord/stores/StoreGuildWelcomeScreens;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildWelcomeScreens:Lcom/discord/stores/StoreGuildWelcomeScreens;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->guildWelcomeScreens:Lcom/discord/stores/StoreGuildWelcomeScreens;
 
     new-instance v0, Lcom/discord/stores/StoreUserAffinities;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v1, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    invoke-direct {v0, v5}, Lcom/discord/stores/StoreUserAffinities;-><init>(Lcom/discord/stores/Dispatcher;)V
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreUserAffinities;-><init>(Lcom/discord/stores/Dispatcher;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->userAffinities:Lcom/discord/stores/StoreUserAffinities;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->userAffinities:Lcom/discord/stores/StoreUserAffinities;
 
     new-instance v0, Lcom/discord/stores/StoreClientDataState;
 
-    invoke-direct {v0, v3, v1, v3}, Lcom/discord/stores/StoreClientDataState;-><init>(Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v10, v12, v10}, Lcom/discord/stores/StoreClientDataState;-><init>(Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->clientDataState:Lcom/discord/stores/StoreClientDataState;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->clientDataState:Lcom/discord/stores/StoreClientDataState;
 
     new-instance v0, Lcom/discord/stores/StoreGifPicker;
 
-    iget-object v6, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
 
-    iget-object v7, p0, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
+    iget-object v3, v8, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
 
-    const/4 v8, 0x0
+    const/4 v4, 0x0
 
-    const/4 v9, 0x0
+    const/4 v5, 0x0
 
-    const/16 v10, 0xc
+    const/16 v6, 0xc
 
-    const/4 v11, 0x0
+    const/4 v7, 0x0
 
-    move-object v5, v0
+    move-object v1, v0
 
-    invoke-direct/range {v5 .. v11}, Lcom/discord/stores/StoreGifPicker;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/stores/StoreGifPicker;-><init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->gifPicker:Lcom/discord/stores/StoreGifPicker;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->gifPicker:Lcom/discord/stores/StoreGifPicker;
 
-    const/16 v3, 0x8
+    const/16 v1, 0x8
 
-    new-array v3, v3, [Lcom/discord/stores/StoreV2;
+    new-array v1, v1, [Lcom/discord/stores/StoreV2;
 
-    iget-object v5, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    aput-object v5, v3, v2
+    aput-object v2, v1, v9
 
-    iget-object v2, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
 
-    aput-object v2, v3, v1
+    aput-object v2, v1, v12
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->accessibility:Lcom/discord/stores/StoreAccessibility;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->accessibility:Lcom/discord/stores/StoreAccessibility;
 
-    aput-object v1, v3, v4
+    aput-object v2, v1, v11
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
 
-    const/4 v2, 0x3
+    const/4 v3, 0x3
 
-    aput-object v1, v3, v2
+    aput-object v2, v1, v3
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildWelcomeScreens:Lcom/discord/stores/StoreGuildWelcomeScreens;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->guildWelcomeScreens:Lcom/discord/stores/StoreGuildWelcomeScreens;
 
-    const/4 v2, 0x4
+    const/4 v3, 0x4
 
-    aput-object v1, v3, v2
+    aput-object v2, v1, v3
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->videoStreams:Lcom/discord/stores/StoreVideoStreams;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->videoStreams:Lcom/discord/stores/StoreVideoStreams;
 
-    const/4 v2, 0x5
+    const/4 v3, 0x5
 
-    aput-object v1, v3, v2
+    aput-object v2, v1, v3
 
-    iget-object v1, p0, Lcom/discord/stores/StoreStream;->clientDataState:Lcom/discord/stores/StoreClientDataState;
+    iget-object v2, v8, Lcom/discord/stores/StoreStream;->clientDataState:Lcom/discord/stores/StoreClientDataState;
 
-    const/4 v2, 0x6
+    const/4 v3, 0x6
 
-    aput-object v1, v3, v2
+    aput-object v2, v1, v3
 
-    const/4 v1, 0x7
+    const/4 v2, 0x7
 
-    aput-object v0, v3, v1
+    aput-object v0, v1, v2
 
-    invoke-static {v3}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStream;->storesV2:Ljava/util/List;
+    iput-object v0, v8, Lcom/discord/stores/StoreStream;->storesV2:Ljava/util/List;
 
-    invoke-direct {p0}, Lcom/discord/stores/StoreStream;->registerDispatchHandlers()V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/stores/StoreStream;->registerDispatchHandlers()V
 
     return-void
 .end method
@@ -1351,14 +1361,6 @@
     return-object p0
 .end method
 
-.method public static final synthetic access$getMediaNotification$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreMediaNotification;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/stores/StoreStream;->mediaNotification:Lcom/discord/stores/StoreMediaNotification;
-
-    return-object p0
-.end method
-
 .method public static final synthetic access$getStreamRtcConnection$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreStreamRtcConnection;
     .locals 0
 
@@ -1892,7 +1894,7 @@
 
     const-string p1, "onBackpressureBuffer()"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v4, Lcom/discord/stores/StoreStream$dispatchSubscribe$1;
 
@@ -2709,6 +2711,18 @@
     return-object v0
 .end method
 
+.method public static final getStreamRtcConnection()Lcom/discord/stores/StoreStreamRtcConnection;
+    .locals 1
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getStreamRtcConnection()Lcom/discord/stores/StoreStreamRtcConnection;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public static final getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
     .locals 1
 
@@ -3017,9 +3031,9 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelVoice$State;
 
-    const-string v1, "voiceState"
+    const-string/jumbo v1, "voiceState"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreStream;->handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;)V
 
@@ -3527,7 +3541,7 @@
 .end method
 
 .method private final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 1
+    .locals 6
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -3538,7 +3552,17 @@
     :cond_0
     sget-object v0, Lcom/discord/stores/ReadyPayloadUtils;->INSTANCE:Lcom/discord/stores/ReadyPayloadUtils;
 
-    invoke-virtual {v0, p1}, Lcom/discord/stores/ReadyPayloadUtils;->hydrateGuild(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x6
+
+    const/4 v5, 0x0
+
+    move-object v1, p1
+
+    invoke-static/range {v0 .. v5}, Lcom/discord/stores/ReadyPayloadUtils;->hydrateGuild$default(Lcom/discord/stores/ReadyPayloadUtils;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/ReadyPayloadUtils$HydrateGuildResult;
 
     move-result-object p1
 
@@ -3817,7 +3841,7 @@
 
     const-string v4, "presence"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v2, v3, v1}, Lcom/discord/stores/StoreStream;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
@@ -4079,7 +4103,7 @@
 
     const-string v0, "presence"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/stores/StoreStream;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
@@ -5034,7 +5058,7 @@
 
     const-string v1, "gatewaySocket\n        .u\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;
 
@@ -5541,7 +5565,7 @@
 
     const-string v3, "mentionedUser"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getMember()Lcom/discord/models/domain/ModelGuildMember;
 
@@ -5831,6 +5855,21 @@
     return-void
 .end method
 
+.method public static synthetic streamCreate$default(Lcom/discord/stores/StoreStream;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreStream;->streamCreate(Ljava/lang/String;Ljava/lang/String;)V
+
+    return-void
+.end method
+
 .method private final synthesizeGuildMemberAdd(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember;)V
     .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
@@ -6734,22 +6773,15 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->navigation:Lcom/discord/stores/StoreNavigation;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreNavigation;->handleHomeTabSelected(Lcom/discord/stores/StoreNavigation$PanelAction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleLoginResult(Lcom/discord/models/domain/auth/ModelLoginResult;)V
@@ -6757,7 +6789,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "loginResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
 
@@ -6768,15 +6802,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUserSettings;->handleLoginResult(Lcom/discord/models/domain/auth/ModelLoginResult;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "loginResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V
@@ -6784,7 +6809,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "relationship"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
@@ -6795,15 +6822,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUserRelationships;->handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "relationship"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleSamplePremiumGuildSelected(J)V
@@ -6827,7 +6845,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "streamDelete"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
 
@@ -6849,15 +6869,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "streamDelete"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
@@ -6865,7 +6876,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
 
@@ -6876,15 +6889,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreAudioDevices;->handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleStreamTargeted(Ljava/lang/String;)V
@@ -6892,7 +6896,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
 
@@ -6903,15 +6909,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->handleStreamTargeted(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleUserConnections(Ljava/util/List;)V
@@ -6928,7 +6925,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "accounts"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->userConnections:Lcom/discord/stores/StoreUserConnections;
 
@@ -6939,15 +6938,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreSpotify;->handleUserConnections(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "accounts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleUserUpdated(Lcom/discord/models/domain/ModelUser;)V
@@ -6955,7 +6945,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
@@ -6966,15 +6958,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMFA;->handleUserUpdated(Lcom/discord/models/domain/ModelUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleVideoStreamUpdate(JLjava/lang/Integer;)V
@@ -7069,12 +7052,34 @@
     return-void
 .end method
 
+.method public final streamCreate(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreGatewayConnection;->streamCreate(Ljava/lang/String;Ljava/lang/String;)V
+
+    iget-object p2, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {p2, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamCreateRequest(Ljava/lang/String;)V
+
+    return-void
+.end method
+
 .method public final streamWatch(Ljava/lang/String;)V
     .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
 
@@ -7085,13 +7090,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->handleStreamWatch(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onAnalyticsEvent$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onAnalyticsEvent$1.smali
index 6e9339cb6f..43b8a04b09 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onAnalyticsEvent$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onAnalyticsEvent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onAnalyticsEvent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStreamRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onMediaSessionIdReceived$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onMediaSessionIdReceived$1.smali
index bde9b92092..1a99eb3968 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onMediaSessionIdReceived$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onMediaSessionIdReceived$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onMediaSessionIdReceived$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStreamRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onQualityUpdate$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onQualityUpdate$1.smali
index 8ca19c2bca..a9f213c148 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onQualityUpdate$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onQualityUpdate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onQualityUpdate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStreamRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali
index 5ab78b539c..85c57bd9aa 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStreamRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onVideoStream$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onVideoStream$1.smali
index 25dda986a9..7dcd35b2c9 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onVideoStream$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onVideoStream$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onVideoStream$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreStreamRtcConnection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener.smali
index cb1feb25f3..c24bbbbe38 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener.smali
@@ -52,11 +52,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "event"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "properties"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
@@ -83,20 +85,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onFatalClose()V
@@ -126,7 +114,9 @@
 .method public onQualityUpdate(Lcom/discord/rtcconnection/RtcConnection$Quality;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "quality"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener;->this$0:Lcom/discord/stores/StoreStreamRtcConnection;
 
@@ -141,15 +131,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "quality"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onSpeaking(JZ)V
@@ -161,7 +142,9 @@
 .method public onStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener;->this$0:Lcom/discord/stores/StoreStreamRtcConnection;
 
@@ -176,15 +159,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onVideoStream(JLjava/lang/Integer;)V
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$State.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$State.smali
index ce4ab139e9..b99b3063b1 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$State.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$State.smali
@@ -19,14 +19,18 @@
 
 .field public final mediaSessionId:Ljava/lang/String;
 
+.field public final rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
 .field public final rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;)V
-    .locals 0
+.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;)V
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "rtcConnectionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,43 +40,43 @@
 
     iput-object p3, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->mediaSessionId:Ljava/lang/String;
 
+    iput-object p4, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
     return-void
-
-    :cond_0
-    const-string p1, "rtcConnectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+.method public static synthetic copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
     .locals 0
 
-    and-int/lit8 p5, p4, 0x1
+    and-int/lit8 p6, p5, 0x1
 
-    if-eqz p5, :cond_0
+    if-eqz p6, :cond_0
 
     iget-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
     :cond_0
-    and-int/lit8 p5, p4, 0x2
+    and-int/lit8 p6, p5, 0x2
 
-    if-eqz p5, :cond_1
+    if-eqz p6, :cond_1
 
     iget-object p2, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->connectionQuality:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     :cond_1
-    and-int/lit8 p4, p4, 0x4
+    and-int/lit8 p6, p5, 0x4
 
-    if-eqz p4, :cond_2
+    if-eqz p6, :cond_2
 
     iget-object p3, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->mediaSessionId:Ljava/lang/String;
 
     :cond_2
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_3
+
+    iget-object p4, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    :cond_3
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/stores/StoreStreamRtcConnection$State;
 
     move-result-object p0
 
@@ -105,25 +109,26 @@
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+.method public final component4()Lcom/discord/rtcconnection/RtcConnection;
     .locals 1
 
-    if-eqz p1, :cond_0
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+    .locals 1
+
+    const-string v0, "rtcConnectionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection$State;
 
-    invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreStreamRtcConnection$State;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;)V
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/stores/StoreStreamRtcConnection$State;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "rtcConnectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +146,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -151,7 +156,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreStreamRtcConnection$State;->connectionQuality:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -159,9 +164,19 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->mediaSessionId:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/discord/stores/StoreStreamRtcConnection$State;->mediaSessionId:Ljava/lang/String;
+    iget-object v1, p1, Lcom/discord/stores/StoreStreamRtcConnection$State;->mediaSessionId:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    iget-object p1, p1, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -197,6 +212,14 @@
     return-object v0
 .end method
 
+.method public final getRtcConnection()Lcom/discord/rtcconnection/RtcConnection;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    return-object v0
+.end method
+
 .method public final getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
     .locals 1
 
@@ -250,16 +273,34 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v1
+    move-result v2
+
+    goto :goto_2
 
     :cond_2
+    const/4 v2, 0x0
+
+    :goto_2
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_3
     add-int/2addr v0, v1
 
     return v0
 .end method
 
 .method public toString()Ljava/lang/String;
-    .locals 3
+    .locals 2
 
     const-string v0, "State(rtcConnectionState="
 
@@ -285,9 +326,21 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->mediaSessionId:Ljava/lang/String;
 
-    const-string v2, ")"
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    const-string v1, ", rtcConnection="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStreamRtcConnection$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    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
 
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1.smali
new file mode 100644
index 0000000000..a9830729c3
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1.smali
@@ -0,0 +1,82 @@
+.class public final Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;
+.super Ljava/lang/Object;
+.source "StoreStreamRtcConnection.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/stores/StoreStreamRtcConnection;->observeRtcConnection()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreStreamRtcConnection$State;",
+        "Lcom/discord/rtcconnection/RtcConnection;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;
+
+    invoke-direct {v0}, Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;-><init>()V
+
+    sput-object v0, Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;->INSTANCE:Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/stores/StoreStreamRtcConnection$State;)Lcom/discord/rtcconnection/RtcConnection;
+    .locals 0
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStreamRtcConnection$State;->getRtcConnection()Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreStreamRtcConnection$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;->call(Lcom/discord/stores/StoreStreamRtcConnection$State;)Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
index 7f2835cdb2..c0c4156d6f 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
@@ -51,6 +51,8 @@
     .end annotation
 .end field
 
+.field public final storeRtcConnection:Lcom/discord/stores/StoreRtcConnection;
+
 .field public final storeStream:Lcom/discord/stores/StoreStream;
 
 .field public streamOwner:Ljava/lang/Long;
@@ -73,22 +75,36 @@
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;)V
+.method public constructor <init>(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreRtcConnection;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "mediaEngineStore"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string/jumbo v0, "userStore"
 
-    if-eqz p3, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "storeStream"
 
-    if-eqz p5, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "analyticsStore"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeRtcConnection"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -104,6 +120,8 @@
 
     iput-object p6, p0, Lcom/discord/stores/StoreStreamRtcConnection;->analyticsStore:Lcom/discord/stores/StoreAnalytics;
 
+    iput-object p7, p0, Lcom/discord/stores/StoreStreamRtcConnection;->storeRtcConnection:Lcom/discord/stores/StoreRtcConnection;
+
     new-instance p1, Lcom/discord/stores/StoreStreamRtcConnection$State;
 
     new-instance p2, Lcom/discord/rtcconnection/RtcConnection$State$d;
@@ -112,7 +130,11 @@
 
     invoke-direct {p2, p3}, Lcom/discord/rtcconnection/RtcConnection$State$d;-><init>(Z)V
 
-    invoke-direct {p1, p2, v0, v0}, Lcom/discord/stores/StoreStreamRtcConnection$State;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;)V
+    iget-object p3, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    const/4 p4, 0x0
+
+    invoke-direct {p1, p2, p4, p4, p3}, Lcom/discord/stores/StoreStreamRtcConnection$State;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
 
@@ -123,48 +145,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->stateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "analyticsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "mediaEngineStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreStreamRtcConnection;)Lcom/discord/stores/Dispatcher;
@@ -208,7 +188,7 @@
 .end method
 
 .method private final createRtcConnection(JLjava/lang/Long;JLjava/lang/String;Ljava/lang/String;J)Lcom/discord/rtcconnection/RtcConnection;
-    .locals 19
+    .locals 22
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -216,78 +196,128 @@
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/stores/StoreStreamRtcConnection;->destroyRtcConnection()V
 
-    new-instance v15, Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v1, v0, Lcom/discord/stores/StoreStreamRtcConnection;->storeRtcConnection:Lcom/discord/stores/StoreRtcConnection;
 
-    iget-object v1, v0, Lcom/discord/stores/StoreStreamRtcConnection;->mediaEngineStore:Lcom/discord/stores/StoreMediaEngine;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreRtcConnection;->getRtcConnectionAnalyticsInfo()Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaEngine;->getMediaEngine()Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+    move-result-object v1
 
-    move-result-object v10
+    const/4 v2, 0x0
 
-    sget-object v11, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    if-eqz v1, :cond_0
 
-    iget-object v12, v0, Lcom/discord/stores/StoreStreamRtcConnection;->clock:Lcom/discord/utilities/time/Clock;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->getChannelId()Ljava/lang/Long;
 
-    new-instance v13, Lcom/discord/rtcconnection/RtcConnection$c$b;
+    move-result-object v3
 
-    move-wide/from16 v1, p8
-
-    invoke-direct {v13, v1, v2}, Lcom/discord/rtcconnection/RtcConnection$c$b;-><init>(J)V
-
-    iget-object v14, v0, Lcom/discord/stores/StoreStreamRtcConnection;->networkMonitor:Lcom/discord/utilities/networking/NetworkMonitor;
-
-    if-eqz v14, :cond_0
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x800
-
-    const/4 v6, 0x1
-
-    move-object v1, v15
-
-    move-object/from16 v2, p3
-
-    move-wide/from16 v3, p4
-
-    move-object/from16 v5, p6
-
-    move-object/from16 v7, p7
-
-    move-wide/from16 v8, p1
-
-    move-object/from16 v18, v15
-
-    move-object/from16 v15, v16
-
-    move/from16 v16, v17
-
-    invoke-direct/range {v1 .. v16}, Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;ZLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/time/Clock;Lcom/discord/rtcconnection/RtcConnection$c;Lcom/discord/utilities/networking/NetworkMonitor;Ljava/util/Map;I)V
-
-    new-instance v1, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener;
-
-    invoke-direct {v1, v0}, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener;-><init>(Lcom/discord/stores/StoreStreamRtcConnection;)V
-
-    move-object/from16 v2, v18
-
-    iget-object v3, v2, Lcom/discord/rtcconnection/RtcConnection;->c:Ljava/util/List;
-
-    invoke-interface {v3, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    return-object v2
+    goto :goto_0
 
     :cond_0
+    move-object v3, v2
+
+    :goto_0
+    if-nez v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    cmp-long v5, v3, p4
+
+    if-nez v5, :cond_2
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;->getMediaSessionId()Ljava/lang/String;
+
+    move-result-object v1
+
+    move-object/from16 v20, v1
+
+    goto :goto_2
+
+    :cond_2
+    :goto_1
+    move-object/from16 v20, v2
+
+    :goto_2
+    new-instance v1, Lcom/discord/rtcconnection/RtcConnection;
+
+    const/4 v10, 0x1
+
+    iget-object v3, v0, Lcom/discord/stores/StoreStreamRtcConnection;->mediaEngineStore:Lcom/discord/stores/StoreMediaEngine;
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaEngine;->getMediaEngine()Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+
+    move-result-object v14
+
+    sget-object v15, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    iget-object v3, v0, Lcom/discord/stores/StoreStreamRtcConnection;->clock:Lcom/discord/utilities/time/Clock;
+
+    new-instance v4, Lcom/discord/rtcconnection/RtcConnection$c$b;
+
+    move-wide/from16 v5, p8
+
+    invoke-direct {v4, v5, v6}, Lcom/discord/rtcconnection/RtcConnection$c$b;-><init>(J)V
+
+    iget-object v12, v0, Lcom/discord/stores/StoreStreamRtcConnection;->networkMonitor:Lcom/discord/utilities/networking/NetworkMonitor;
+
+    if-eqz v12, :cond_3
+
+    const/16 v19, 0x0
+
+    const/16 v21, 0x800
+
+    move-object v5, v1
+
+    move-object/from16 v6, p3
+
+    move-wide/from16 v7, p4
+
+    move-object/from16 v9, p6
+
+    move-object/from16 v11, p7
+
+    move-object v2, v12
+
+    move-wide/from16 v12, p1
+
+    move-object/from16 v16, v3
+
+    move-object/from16 v17, v4
+
+    move-object/from16 v18, v2
+
+    invoke-direct/range {v5 .. v21}, Lcom/discord/rtcconnection/RtcConnection;-><init>(Ljava/lang/Long;JLjava/lang/String;ZLjava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;Lcom/discord/utilities/logging/Logger;Lcom/discord/utilities/time/Clock;Lcom/discord/rtcconnection/RtcConnection$c;Lcom/discord/utilities/networking/NetworkMonitor;Ljava/util/Map;Ljava/lang/String;I)V
+
+    new-instance v2, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener;
+
+    invoke-direct {v2, v0}, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener;-><init>(Lcom/discord/stores/StoreStreamRtcConnection;)V
+
+    const-string v3, "listener"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v3, v1, Lcom/discord/rtcconnection/RtcConnection;->c:Ljava/util/List;
+
+    invoke-interface {v3, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    return-object v1
+
+    :cond_3
     const-string v1, "networkMonitor"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    const/4 v1, 0x0
-
-    throw v1
+    throw v2
 .end method
 
 .method private final destroyRtcConnection()V
-    .locals 7
+    .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -303,7 +333,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+    invoke-direct {p0, v0}, Lcom/discord/stores/StoreStreamRtcConnection;->updateRtcConnection(Lcom/discord/rtcconnection/RtcConnection;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
 
@@ -313,11 +343,13 @@
 
     const/4 v3, 0x0
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x9
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
 
     move-result-object v0
 
@@ -328,7 +360,7 @@
 .end method
 
 .method private final handleMediaSessionIdReceived()V
-    .locals 7
+    .locals 8
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -352,11 +384,13 @@
 
     const/4 v3, 0x0
 
-    const/4 v5, 0x3
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xb
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
 
     move-result-object v0
 
@@ -370,7 +404,7 @@
 .end method
 
 .method private final handleQualityUpdate(Lcom/discord/rtcconnection/RtcConnection$Quality;)V
-    .locals 6
+    .locals 7
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -380,13 +414,15 @@
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x5
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/16 v5, 0xd
+
+    const/4 v6, 0x0
 
     move-object v2, p1
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
 
     move-result-object p1
 
@@ -421,14 +457,50 @@
     return-void
 .end method
 
-
-# virtual methods
-.method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
-    .locals 0
+.method private final updateRtcConnection(Lcom/discord/rtcconnection/RtcConnection;)V
+    .locals 7
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x7
+
+    const/4 v6, 0x0
+
+    move-object v4, p1
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->isDirty:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
+    .locals 1
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getSessionId()Ljava/lang/String;
 
@@ -437,15 +509,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->sessionId:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleStreamCreate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V
@@ -453,49 +516,51 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamCreate"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
+    sget-object v0, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/StreamCreateOrUpdate;->getStreamKey()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->userStore:Lcom/discord/stores/StoreUser;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/stores/StoreStreamRtcConnection;->userStore:Lcom/discord/stores/StoreUser;
+    const/4 v2, 0x0
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
+    if-eqz v1, :cond_0
 
-    move-result-object v2
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    if-eqz v2, :cond_0
+    move-result-wide v3
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-wide v2
-
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
+    move-result-object v1
 
     goto :goto_0
 
     :cond_0
-    move-object v2, v0
+    move-object v1, v2
 
     :goto_0
     iget-object v9, p0, Lcom/discord/stores/StoreStreamRtcConnection;->sessionId:Ljava/lang/String;
 
-    if-eqz v2, :cond_7
+    if-eqz v1, :cond_6
 
     if-nez v9, :cond_1
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_1
     iget-object v3, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
@@ -504,7 +569,7 @@
 
     iget-wide v3, v3, Lcom/discord/rtcconnection/RtcConnection;->w:J
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
 
     move-result-wide v5
 
@@ -521,10 +586,10 @@
     goto :goto_1
 
     :cond_2
-    move-object v3, v0
+    move-object v3, v2
 
     :goto_1
-    invoke-static {v3, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -533,39 +598,40 @@
     return-void
 
     :cond_3
-    instance-of v3, v1, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
+    instance-of v3, v0, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
 
     if-eqz v3, :cond_4
 
-    move-object v3, v1
+    move-object v2, v0
 
-    check-cast v3, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
+    check-cast v2, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;->getGuildId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;->getGuildId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v6, v3
+    :goto_2
+    move-object v6, v2
+
+    goto :goto_3
+
+    :cond_4
+    instance-of v3, v0, Lcom/discord/models/domain/ModelApplicationStream$CallStream;
+
+    if-eqz v3, :cond_5
 
     goto :goto_2
 
-    :cond_4
-    instance-of v3, v1, Lcom/discord/models/domain/ModelApplicationStream$CallStream;
-
-    if-eqz v3, :cond_6
-
-    move-object v6, v0
-
-    :goto_2
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    :goto_3
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v4
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
 
     move-result-wide v7
 
@@ -573,9 +639,9 @@
 
     move-result-object v10
 
-    if-eqz v10, :cond_5
+    invoke-static {v10}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
 
     move-result-wide v11
 
@@ -585,9 +651,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->updateRtcConnection(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
 
     move-result-wide v0
 
@@ -600,53 +666,50 @@
     return-void
 
     :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_6
     new-instance p1, Lkotlin/NoWhenBranchMatchedException;
 
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p1
 
-    :cond_7
-    :goto_3
+    :cond_6
+    :goto_4
     return-void
-
-    :cond_8
-    const-string p1, "streamCreate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleStreamDelete()V
-    .locals 1
+    .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->l(Landroid/content/Intent;)V
+
+    :cond_0
     invoke-direct {p0}, Lcom/discord/stores/StoreStreamRtcConnection;->destroyRtcConnection()V
 
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
 
     return-void
 .end method
 
 .method public final handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
-    .locals 10
+    .locals 11
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -679,13 +742,15 @@
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x4
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/16 v9, 0xc
+
+    const/4 v10, 0x0
 
     move-object v5, p1
 
-    invoke-static/range {v4 .. v9}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+    invoke-static/range {v4 .. v10}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;Lcom/discord/rtcconnection/RtcConnection;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
 
     move-result-object p1
 
@@ -696,15 +761,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->isDirty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V
@@ -712,86 +768,90 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "streamServerUpdate"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/App;->e:Lcom/discord/app/App;
+    sget-object v0, Lcom/discord/app/App;->e:Lcom/discord/app/App;
 
-    sget-boolean v1, Lcom/discord/app/App;->d:Z
+    sget-boolean v0, Lcom/discord/app/App;->d:Z
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    move-object v1, v0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {v0, v1, v0}, Lcom/discord/utilities/ssl/SecureSocketsLayerUtils;->createSocketFactory$default(Ljavax/net/ssl/TrustManagerFactory;ILjava/lang/Object;)Ljavax/net/ssl/SSLSocketFactory;
+    invoke-static {v1, v0, v1}, Lcom/discord/utilities/ssl/SecureSocketsLayerUtils;->createSocketFactory$default(Ljavax/net/ssl/TrustManagerFactory;ILjava/lang/Object;)Ljavax/net/ssl/SSLSocketFactory;
 
     move-result-object v1
 
     :goto_0
-    iget-object v2, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
 
-    if-eqz v2, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/StreamServerUpdate;->getEndpoint()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/StreamServerUpdate;->getToken()Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz v3, :cond_1
+    const-string v3, "endpoint"
 
-    new-instance v0, Lf/a/h/g;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, v2, v3, p1, v1}, Lf/a/h/g;-><init>(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)V
+    new-instance v3, Lf/a/h/g;
 
-    invoke-virtual {v2, v0}, Lcom/discord/rtcconnection/RtcConnection;->k(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-direct {v3, v0, v2, p1, v1}, Lf/a/h/g;-><init>(Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)V
 
-    goto :goto_1
+    invoke-virtual {v0, v3}, Lcom/discord/rtcconnection/RtcConnection;->k(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     :cond_1
-    const-string p1, "endpoint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    :goto_1
     return-void
-
-    :cond_3
-    const-string p1, "streamServerUpdate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final init(Lcom/discord/utilities/networking/NetworkMonitor;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "networkMonitor"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->networkMonitor:Lcom/discord/utilities/networking/NetworkMonitor;
 
     return-void
+.end method
 
-    :cond_0
-    const-string p1, "networkMonitor"
+.method public final observeRtcConnection()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/rtcconnection/RtcConnection;",
+            ">;"
+        }
+    .end annotation
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->stateSubject:Lrx/subjects/BehaviorSubject;
 
-    const/4 p1, 0x0
+    sget-object v1, Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;->INSTANCE:Lcom/discord/stores/StoreStreamRtcConnection$observeRtcConnection$1;
 
-    throw p1
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "stateSubject.map { state -> state.rtcConnection }"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded.smali
index a09cd852c4..e894312046 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded.smali
@@ -38,22 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "subscriptions"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->subscriptions:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
@@ -103,22 +98,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +124,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->subscriptions:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1$1.smali
index 238ed9f301..aa0a6839ef 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSubscriptions$fetchSubscriptions$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     const-string v2, "subscriptions"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreSubscriptions;->access$handleSubscriptionsFetchSuccess(Lcom/discord/stores/StoreSubscriptions;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$2$1.smali
index f7a05de74f..ece72c84bb 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSubscriptions$fetchSubscriptions$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1.smali
index 8cee643139..94cde36218 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions$fetchSubscriptions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreSubscriptions$fetchSubscriptions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreSubscriptions.smali b/com.discord/smali/com/discord/stores/StoreSubscriptions.smali
index 0389c256a5..2eef1b9203 100644
--- a/com.discord/smali/com/discord/stores/StoreSubscriptions.smali
+++ b/com.discord/smali/com/discord/stores/StoreSubscriptions.smali
@@ -34,9 +34,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,15 +55,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreSubscriptions;->subscriptionsStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreSubscriptions;)Lcom/discord/stores/Dispatcher;
@@ -206,7 +199,7 @@
 
     const-string v1, "subscriptionsStateSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectHomeTab$1.smali b/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectHomeTab$1.smali
index 819cb14cfc..299f209ec6 100644
--- a/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectHomeTab$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectHomeTab$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreTabsNavigation$selectHomeTab$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreTabsNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectTab$1.smali b/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectTab$1.smali
index 6e56e02ec3..357dbf2449 100644
--- a/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectTab$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreTabsNavigation$selectTab$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreTabsNavigation$selectTab$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreTabsNavigation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreTabsNavigation.smali b/com.discord/smali/com/discord/stores/StoreTabsNavigation.smali
index 057d84e2e2..d3a8e3b020 100644
--- a/com.discord/smali/com/discord/stores/StoreTabsNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreTabsNavigation.smali
@@ -40,11 +40,13 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeStream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,20 +71,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreTabsNavigation;->dismissTabsDialogEventSubject:Lrx/subjects/PublishSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$dismissTabsDialogs(Lcom/discord/stores/StoreTabsNavigation;)V
@@ -222,7 +210,7 @@
 
     const-string v1, "dismissTabsDialogEventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -246,7 +234,7 @@
 
     const-string v1, "selectedTabSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -277,7 +265,9 @@
 .method public final selectHomeTab(Lcom/discord/stores/StoreNavigation$PanelAction;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreTabsNavigation;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -288,21 +278,14 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final selectTab(Lcom/discord/widgets/tabs/NavigationTab;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "navigationTab"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreTabsNavigation;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -313,13 +296,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "navigationTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeAllUsers$1.smali b/com.discord/smali/com/discord/stores/StoreUser$observeAllUsers$1.smali
index b9c52b200e..917714b97f 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeAllUsers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeAllUsers$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUser$observeAllUsers$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUser.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali b/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali
index 3c943ee7f6..f92658eefe 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeMe$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUser.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser$Me;",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;"
     }
 .end annotation
 
@@ -57,19 +59,12 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelUser$Me;)Lcom/discord/models/domain/ModelUser$Me;
+.method public final call(Lcom/discord/models/domain/ModelUser$Me;)Lcom/discord/models/domain/ModelUser;
     .locals 0
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -77,7 +72,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelUser$Me;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUser$observeMe$1;->call(Lcom/discord/models/domain/ModelUser$Me;)Lcom/discord/models/domain/ModelUser$Me;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUser$observeMe$1;->call(Lcom/discord/models/domain/ModelUser$Me;)Lcom/discord/models/domain/ModelUser;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeMe$2.smali b/com.discord/smali/com/discord/stores/StoreUser$observeMe$2.smali
index 236ceead0e..bfa8d54dbe 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeMe$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeMe$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUser$observeMe$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUser.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/models/domain/ModelUser$Me;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeMe$3.smali b/com.discord/smali/com/discord/stores/StoreUser$observeMe$3.smali
index 7347cb58b1..365a07f892 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeMe$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeMe$3.smali
@@ -3,7 +3,7 @@
 .source "StoreUser.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelUser$Me;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,23 +49,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser$Me;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUser$observeMe$3;->call(Lcom/discord/models/domain/ModelUser$Me;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelUser$Me;)Z
+.method public final call(Lcom/discord/models/domain/ModelUser$Me;)Ljava/lang/Boolean;
     .locals 1
 
     if-eqz p1, :cond_0
@@ -88,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser$Me;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUser$observeMe$3;->call(Lcom/discord/models/domain/ModelUser$Me;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeMeId$1.smali b/com.discord/smali/com/discord/stores/StoreUser$observeMeId$1.smali
index 20ebf4c75f..d926ecbb26 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeMeId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeMeId$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUser$observeMeId$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUser.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Long;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeUser$1.smali b/com.discord/smali/com/discord/stores/StoreUser$observeUser$1.smali
index fbed5213a8..6ae87afb87 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeUser$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUser.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;"
     }
 .end annotation
 
@@ -61,7 +67,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/stores/StoreUser$observeUser$1;->$userId:J
 
@@ -76,15 +84,6 @@
     check-cast p1, Lcom/discord/models/domain/ModelUser;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/stores/StoreUser$observeUsernames$1.smali b/com.discord/smali/com/discord/stores/StoreUser$observeUsernames$1.smali
index 16592548f3..e04a59200c 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$observeUsernames$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$observeUsernames$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUser$observeUsernames$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUser.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/String;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,18 +71,11 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)Ljava/lang/String;
     .locals 0
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1$1.smali b/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1$1.smali
index 065ad08857..20cee54851 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUser$userRequestManager$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUser.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1.smali b/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1.smali
index 0b7f8daceb..8e97f1b485 100644
--- a/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser$userRequestManager$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUser$userRequestManager$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUser.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUser$userRequestManager$1;->this$0:Lcom/discord/stores/StoreUser;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUser.smali b/com.discord/smali/com/discord/stores/StoreUser.smali
index 309369518d..fcc7e5323e 100644
--- a/com.discord/smali/com/discord/stores/StoreUser.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser.smali
@@ -95,13 +95,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "collector"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "observationDeck"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreV2;-><init>()V
 
@@ -121,6 +125,8 @@
 
     const/4 p3, 0x1
 
+    const/4 v0, 0x0
+
     invoke-direct {p1, p2, p3, v0}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUser;->users:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
@@ -129,7 +135,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreUser;->meSnapshot:Lcom/discord/models/domain/ModelUser$Me;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/stores/StoreUser;->usersSnapshot:Ljava/util/Map;
 
@@ -154,27 +160,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreUser;->userRequestManager:Lcom/discord/utilities/users/UserRequestManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "observationDeck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "collector"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -340,7 +325,7 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -465,7 +450,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
 
@@ -488,9 +475,9 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelUser;
 
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
@@ -498,15 +485,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
@@ -514,7 +492,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_8
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUser;->users:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
 
@@ -538,7 +518,7 @@
 
     const-string v2, "me"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -573,7 +553,7 @@
 
     const-string v3, "channel"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
 
@@ -598,9 +578,9 @@
 
     iget-object v4, p0, Lcom/discord/stores/StoreUser;->users:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
 
-    const-string v5, "user"
+    const-string/jumbo v5, "user"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -639,7 +619,7 @@
 
     const-string v3, "relationship"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelUserRelationship;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -655,7 +635,7 @@
 
     const-string v5, "relationship.user"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -669,7 +649,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v4, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -700,7 +680,7 @@
 
     const-string v2, "guild"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getMembers()Ljava/util/Map;
 
@@ -739,7 +719,7 @@
 
     const-string v3, "member"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -839,25 +819,16 @@
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
 
     return-void
-
-    :cond_8
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildAddOrSync(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 3
+    .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getMembers()Ljava/util/Map;
 
@@ -874,48 +845,36 @@
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/discord/models/domain/ModelGuildMember;
+    check-cast v0, Lcom/discord/models/domain/ModelGuildMember;
 
-    const-string v2, "member"
+    const-string v1, "member"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    const-string v2, "member.user!!"
+    const-string v1, "member.user!!"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {p0, v0}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -923,45 +882,33 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "member"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v0, "member.user!!"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleGuildMembersChunk(Lcom/discord/models/domain/ModelGuildMember$Chunk;)V
-    .locals 3
+    .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "chunk"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->getMembers()Ljava/util/List;
 
@@ -974,48 +921,36 @@
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/discord/models/domain/ModelGuildMember;
+    check-cast v0, Lcom/discord/models/domain/ModelGuildMember;
 
-    const-string v2, "member"
+    const-string v1, "member"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    const-string v2, "member.user!!"
+    const-string v1, "member.user!!"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {p0, v0}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "chunk"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleMessageCreateOrUpdate(Lcom/discord/models/domain/ModelMessage;)V
@@ -1023,7 +958,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List;
 
@@ -1046,9 +983,9 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelUser;
 
-    const-string v2, "user"
+    const-string/jumbo v2, "user"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
@@ -1083,7 +1020,7 @@
     :goto_1
     const-string v1, "curMe.flags ?: 0 or Mode\u2026AS_UNREAD_URGENT_MESSAGES"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -1115,15 +1052,6 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleMessagesLoaded(Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;)V
@@ -1131,7 +1059,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "chunk"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMessagesLoader$ChannelChunk;->getMessages()Ljava/util/List;
 
@@ -1160,7 +1090,7 @@
 
     const-string v2, "message.author"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
@@ -1185,9 +1115,9 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelUser;
 
-    const-string v2, "user"
+    const-string/jumbo v2, "user"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
@@ -1195,15 +1125,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "chunk"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePresenceUpdate(Lcom/discord/models/domain/ModelPresence;)V
@@ -1211,7 +1132,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "presence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -1229,15 +1152,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleUserRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V
@@ -1245,7 +1159,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "relationship"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserRelationship;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -1253,20 +1169,11 @@
 
     const-string v0, "relationship.user"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "relationship"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleUserUpdated(Lcom/discord/models/domain/ModelUser;)V
@@ -1274,7 +1181,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreUser;->updateUser(Lcom/discord/models/domain/ModelUser;)V
 
@@ -1314,21 +1223,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public init(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -1346,24 +1248,15 @@
 
     new-array p1, p1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
 
-    const/4 v0, 0x0
+    sget-object v0, Lcom/discord/stores/StoreUser;->MeUpdate:Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
 
-    sget-object v1, Lcom/discord/stores/StoreUser;->MeUpdate:Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+    const/4 v1, 0x0
 
-    aput-object v1, p1, v0
+    aput-object v0, p1, v1
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeAllUsers()Lrx/Observable;
@@ -1425,13 +1318,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreUser$observeMe$1;->INSTANCE:Lcom/discord/stores/StoreUser$observeMe$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "observeMe(emitNullOrEmpt\u2026se)\n        .map { it!! }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1479,13 +1372,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreUser$observeMe$3;-><init>(Z)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "observationDeck.connectR\u2026MPTY || emitNullOrEmpty }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -1497,7 +1390,7 @@
 
     const-string v0, "observationDeck.connectR\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1543,19 +1436,19 @@
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "filter { it != null }.map { it!! }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -1567,7 +1460,7 @@
 
     const-string v1, "observationDeck.connectR\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1591,7 +1484,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUser$observeUser$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1601,7 +1494,7 @@
 
     const-string p2, "observeAllUsers()\n      \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1622,7 +1515,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUser;->observeAllUsers()Lrx/Observable;
 
@@ -1630,7 +1525,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreUser$observeUsernames$1;->INSTANCE:Lcom/discord/stores/StoreUser$observeUsernames$1;
 
-    invoke-static {p1, v1}, Lf/a/b/q;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    invoke-static {p1, v1}, Lf/a/b/s;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -1640,18 +1535,9 @@
 
     const-string v0, "observeAllUsers()\n      \u2026er!!.username }\n        )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeUsers(Ljava/util/Collection;)Lrx/Observable;
@@ -1670,7 +1556,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1679,15 +1567,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeUsers(Ljava/util/Collection;Z)Lrx/Observable;
@@ -1706,13 +1585,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUser;->observeAllUsers()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {p1}, Lf/a/b/q;->a(Ljava/util/Collection;)Lrx/Observable$c;
+    invoke-static {p1}, Lf/a/b/s;->a(Ljava/util/Collection;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1722,7 +1603,7 @@
 
     const-string v1, "observeAllUsers()\n      \u2026ser>>(filterMap(userIds))"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1738,18 +1619,9 @@
 
     const-string p2, "observeAllUsers()\n      \u2026ys)\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public snapshotData()V
diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali
index 41de6434b4..506ecbf0c8 100644
--- a/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserAffinities.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali
index 74594c2f4b..2e856176ca 100644
--- a/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserAffinities.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserAffinities;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUserAffinities;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "affinities"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;->this$0:Lcom/discord/stores/StoreUserAffinities;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "affinities"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali
index 9fe74fe4ab..dabdc79358 100644
--- a/com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserAffinities.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUserAffinities;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities.smali
index 5e83e717ad..a152cedec8 100644
--- a/com.discord/smali/com/discord/stores/StoreUserAffinities.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserAffinities.smali
@@ -28,7 +28,9 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -36,7 +38,7 @@
 
     new-instance p1, Lcom/discord/models/domain/ModelUserAffinities;
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-direct {p1, v0, v0}, Lcom/discord/models/domain/ModelUserAffinities;-><init>(Ljava/util/List;Ljava/util/List;)V
 
@@ -48,20 +50,11 @@
 
     const-string v0, "BehaviorSubject.create(affinities)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserAffinities;->affinitiesSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreUserAffinities;)Lcom/discord/stores/Dispatcher;
@@ -163,7 +156,7 @@
 
     const-string v1, "affinitiesSubject\n      \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -186,13 +179,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1;->INSTANCE:Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "get()\n          .map { a\u2026ty -> affinity.userId } }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -204,7 +197,7 @@
 
     const-string v1, "get()\n          .map { a\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali
index 24288fbf89..16a4bb2762 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$authorizeConnection$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserConnections$authorizeConnection$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUrl;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUrl;)V
     .locals 6
 
-    if-eqz p1, :cond_1
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUrl;->getUrl()Ljava/lang/String;
 
@@ -77,7 +79,7 @@
 
     const-string p1, "Uri.parse(it)"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -91,13 +93,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "response"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali
index e8b8e4003c..ddf86d0320 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$deleteUserConnection$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserConnections$deleteUserConnection$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1.smali
index 36cc1d6866..bbcfcb0c5d 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserConnections$fetchConnectedAccounts$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali
index 0835a13533..ae12867a86 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$fetchConnectedAccounts$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserConnections$fetchConnectedAccounts$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "connectedAccounts"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserConnections$fetchConnectedAccounts$1;->this$0:Lcom/discord/stores/StoreUserConnections;
 
@@ -87,13 +89,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "connectedAccounts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali
index 76ebc37b2c..eabd344584 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserConnections$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali
index b8c806fc35..54d52ba8e3 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserConnections.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelConnectionState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Void;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/models/domain/ModelConnectionState;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Void;",
             ">;"
         }
@@ -78,7 +81,7 @@
 
     const-string v1, "state"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectionState;->getState()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali
index ec6c993f65..3ea00c6d00 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$submitPinCode$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserConnections$submitPinCode$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali b/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali
index 5840c07584..c57e939613 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections$updateUserConnection$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelConnectedAccount;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelConnectedAccount;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;->this$0:Lcom/discord/stores/StoreUserConnections;
 
     invoke-static {p1}, Lcom/discord/stores/StoreUserConnections;->access$fetchConnectedAccounts(Lcom/discord/stores/StoreUserConnections;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserConnections.smali b/com.discord/smali/com/discord/stores/StoreUserConnections.smali
index 5e899eecf7..2b1876188c 100644
--- a/com.discord/smali/com/discord/stores/StoreUserConnections.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserConnections.smali
@@ -37,11 +37,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -66,20 +68,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreUserConnections;->connectedAccounts:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$fetchConnectedAccounts(Lcom/discord/stores/StoreUserConnections;)V
@@ -141,32 +129,40 @@
 .method public final authorizeConnection(Ljava/lang/String;Landroid/content/Context;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "platformName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "context"
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    invoke-virtual {v1, p1}, Lcom/discord/utilities/rest/RestAPI;->authorizeConnection(Ljava/lang/String;)Lrx/Observable;
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/rest/RestAPI;->authorizeConnection(Ljava/lang/String;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
     const-class v4, Lcom/discord/stores/StoreUserConnections;
 
+    new-instance v9, Lcom/discord/stores/StoreUserConnections$authorizeConnection$1;
+
+    invoke-direct {v9, p2}, Lcom/discord/stores/StoreUserConnections$authorizeConnection$1;-><init>(Landroid/content/Context;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -175,10 +171,6 @@
 
     const/4 v8, 0x0
 
-    new-instance v9, Lcom/discord/stores/StoreUserConnections$authorizeConnection$1;
-
-    invoke-direct {v9, p2}, Lcom/discord/stores/StoreUserConnections$authorizeConnection$1;-><init>(Landroid/content/Context;)V
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -186,51 +178,45 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "platformName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final deleteUserConnection(Ljava/lang/String;Ljava/lang/String;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "platformName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "connectionId"
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->deleteConnection(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
+    move-result-object v0
+
+    invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->deleteConnection(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v2
 
     const-class v3, Lcom/discord/stores/StoreUserConnections;
 
+    new-instance v8, Lcom/discord/stores/StoreUserConnections$deleteUserConnection$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/stores/StoreUserConnections$deleteUserConnection$1;-><init>(Lcom/discord/stores/StoreUserConnections;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -239,10 +225,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/stores/StoreUserConnections$deleteUserConnection$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/stores/StoreUserConnections$deleteUserConnection$1;-><init>(Lcom/discord/stores/StoreUserConnections;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -250,20 +232,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "connectionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "platformName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getConnectedAccounts()Ljava/util/List;
@@ -320,7 +288,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getConnectedAccounts()Ljava/util/List;
 
@@ -328,20 +298,11 @@
 
     const-string v0, "payload.connectedAccounts"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserConnections;->handleUserConnections(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleUserConnections(Ljava/util/List;)V
@@ -358,7 +319,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "accounts"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserConnections;->connectedAccounts:Ljava/util/List;
 
@@ -370,26 +333,19 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "accounts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public init(Landroid/content/Context;)V
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -405,6 +361,10 @@
 
     const-class v1, Lcom/discord/stores/StoreUserConnections;
 
+    new-instance v6, Lcom/discord/stores/StoreUserConnections$init$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/stores/StoreUserConnections$init$1;-><init>(Lcom/discord/stores/StoreUserConnections;)V
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -413,10 +373,6 @@
 
     const/4 v5, 0x0
 
-    new-instance v6, Lcom/discord/stores/StoreUserConnections$init$1;
-
-    invoke-direct {v6, p0}, Lcom/discord/stores/StoreUserConnections$init$1;-><init>(Lcom/discord/stores/StoreUserConnections;)V
-
     const/16 v7, 0x1e
 
     const/4 v8, 0x0
@@ -424,19 +380,10 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setConnectedAccounts(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -446,20 +393,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserConnections;->connectedAccounts:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final submitPinCode(Ljava/lang/String;Lcom/discord/utilities/platform/Platform;Lcom/discord/utilities/dimmer/DimmerView;Lcom/discord/app/AppComponent;Landroid/app/Activity;Lrx/functions/Action1;)V
@@ -478,49 +418,57 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "verificationCode"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "platform"
 
-    if-eqz p4, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "appComponent"
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    const-string v0, "errorHandler"
 
-    move-result-object v1
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2, p1}, Lcom/discord/utilities/rest/RestAPI;->getConnectionState(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
+    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/rest/RestAPI;->getConnectionState(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/stores/StoreUserConnections$submitPinCode$1;
+    new-instance v0, Lcom/discord/stores/StoreUserConnections$submitPinCode$1;
 
-    invoke-direct {v1, p2}, Lcom/discord/stores/StoreUserConnections$submitPinCode$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
+    invoke-direct {v0, p2}, Lcom/discord/stores/StoreUserConnections$submitPinCode$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x2
 
-    invoke-static {p4, v0, p2}, Lf/a/b/q;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
+    invoke-static {p4, v2, p2}, Lf/a/b/s;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
 
     move-result-object p4
 
@@ -530,7 +478,7 @@
 
     const-wide/16 v0, 0x0
 
-    invoke-static {p3, v0, v1, p2}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {p3, v0, v1, p2}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -538,85 +486,57 @@
 
     move-result-object p1
 
-    sget-object p2, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object p2, Lf/a/b/s;->a:Lf/a/b/s;
 
     new-instance p3, Lcom/discord/stores/StoreUserConnections$submitPinCode$2;
 
     invoke-direct {p3, p5}, Lcom/discord/stores/StoreUserConnections$submitPinCode$2;-><init>(Landroid/app/Activity;)V
 
-    invoke-virtual {p2, p5, p3, p6}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {p2, p5, p3, p6}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p2
 
     invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "errorHandler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "platform"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "verificationCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final updateUserConnection(Lcom/discord/models/domain/ModelConnectedAccount;ZZZ)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "connectedAccount"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getType()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "connectedAccount.type"
+    const-string v2, "connectedAccount.type"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v4, "connectedAccount.id"
+    const-string v3, "connectedAccount.id"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v4, Lcom/discord/restapi/RestAPIParams$ConnectedAccount;->Companion:Lcom/discord/restapi/RestAPIParams$ConnectedAccount$Companion;
+    sget-object v3, Lcom/discord/restapi/RestAPIParams$ConnectedAccount;->Companion:Lcom/discord/restapi/RestAPIParams$ConnectedAccount$Companion;
 
-    invoke-virtual {v4, p1, p2, p3, p4}, Lcom/discord/restapi/RestAPIParams$ConnectedAccount$Companion;->create(Lcom/discord/models/domain/ModelConnectedAccount;ZZI)Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
+    invoke-virtual {v3, p1, p2, p3, p4}, Lcom/discord/restapi/RestAPIParams$ConnectedAccount$Companion;->create(Lcom/discord/models/domain/ModelConnectedAccount;ZZI)Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
 
     move-result-object p1
 
-    invoke-virtual {v1, v2, v3, p1}, Lcom/discord/utilities/rest/RestAPI;->updateConnection(Ljava/lang/String;Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$ConnectedAccount;)Lrx/Observable;
+    invoke-virtual {v0, v1, v2, p1}, Lcom/discord/utilities/rest/RestAPI;->updateConnection(Ljava/lang/String;Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$ConnectedAccount;)Lrx/Observable;
 
     move-result-object p1
 
@@ -624,11 +544,15 @@
 
     const/4 p3, 0x1
 
-    invoke-static {p1, p2, p3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 p4, 0x0
 
-    move-result-object v1
+    invoke-static {p1, p2, p3, p4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/stores/StoreUserConnections;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/stores/StoreUserConnections;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -636,24 +560,15 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    new-instance v6, Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;
 
-    new-instance v7, Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;
+    invoke-direct {v6, p0}, Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;-><init>(Lcom/discord/stores/StoreUserConnections;)V
 
-    invoke-direct {v7, p0}, Lcom/discord/stores/StoreUserConnections$updateUserConnection$1;-><init>(Lcom/discord/stores/StoreUserConnections;)V
+    const/16 v7, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali
index b79ceb38ca..6e6e32f720 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali
index f97ee3f8d2..215e571fde 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -47,30 +52,15 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Set;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1;->call(Ljava/util/Set;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Set;)Z
+.method public final call(Ljava/util/Set;)Ljava/lang/Boolean;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/Set<",
             "Ljava/lang/Long;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -84,5 +74,21 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Set;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1;->call(Ljava/util/Set;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali
index 70d7f22c5e..73e8e79c03 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings;
 
@@ -79,13 +81,4 @@
     invoke-static {v0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->access$setRecomputeSettingsSubscription$p(Lcom/discord/stores/StoreUserGuildSettings;Lrx/Subscription;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali
index c2d91f7635..73c6742511 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali
index 14e05dd3b9..31c57535c4 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali
index 9d232a6678..4a64995134 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelNotificationSettings;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,14 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelNotificationSettings;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelNotificationSettings;
+    const-string v0, "setting"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;->call(Lcom/discord/models/domain/ModelNotificationSettings;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->isMuted()Z
 
     move-result p1
 
@@ -75,16 +77,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelNotificationSettings;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "setting"
+    check-cast p1, Lcom/discord/models/domain/ModelNotificationSettings;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;->call(Lcom/discord/models/domain/ModelNotificationSettings;)Ljava/lang/Boolean;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->isMuted()Z
+    move-result-object p1
 
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali
index 9eaf68dfea..65986d0d16 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,32 +59,32 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelNotificationSettings;)J
+.method public final call(Lcom/discord/models/domain/ModelNotificationSettings;)Ljava/lang/Long;
     .locals 2
 
     const-string v0, "setting"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->getGuildId()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelNotificationSettings;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;->call(Lcom/discord/models/domain/ModelNotificationSettings;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelNotificationSettings;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;->call(Lcom/discord/models/domain/ModelNotificationSettings;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali
index 36da9156f5..42938ebfa5 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "Ljava/lang/Long;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -82,6 +89,7 @@
             "Lcom/discord/models/domain/ModelNotificationSettings;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Ljava/lang/Long;",
             ">;>;"
@@ -98,13 +106,13 @@
 
     sget-object v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali
index 56b7367d93..d11405e1d7 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserGuildSettings$setChannelMuted$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -94,16 +94,16 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f12040c
+    const v1, 0x7f12040d
 
-    const v7, 0x7f12040c
+    const v7, 0x7f12040d
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f1203cf
+    const v1, 0x7f1203d0
 
-    const v7, 0x7f1203cf
+    const v7, 0x7f1203d0
 
     :goto_0
     iget-object v2, p0, Lcom/discord/stores/StoreUserGuildSettings$setChannelMuted$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings;
@@ -116,7 +116,7 @@
 
     const-string v4, "channel.guildId"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali
index 998e867381..071caf6c4e 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali
index f24f1859ac..f53b10115d 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserGuildSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelNotificationSettings;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,36 +73,31 @@
 .method public final invoke(Lcom/discord/models/domain/ModelNotificationSettings;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "notifSettings"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings;
+    iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings;
 
-    invoke-static {v1}, Lcom/discord/stores/StoreUserGuildSettings;->access$getAnalytics$p(Lcom/discord/stores/StoreUserGuildSettings;)Lcom/discord/stores/StoreAnalytics;
+    invoke-static {v0}, Lcom/discord/stores/StoreUserGuildSettings;->access$getAnalytics$p(Lcom/discord/stores/StoreUserGuildSettings;)Lcom/discord/stores/StoreAnalytics;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-object v2, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$channelId:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$channelId:Ljava/lang/Long;
 
-    invoke-virtual {v1, p1, v2}, Lcom/discord/stores/StoreAnalytics;->onNotificationSettingsUpdated(Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Long;)V
+    invoke-virtual {v0, p1, v1}, Lcom/discord/stores/StoreAnalytics;->onNotificationSettingsUpdated(Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Long;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$context:Landroid/content/Context;
 
-    iget v1, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$successString:I
+    iget v0, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$successString:I
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v1, v2, v0, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "notifSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
index dcf82d8f7d..669847f3e4 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
@@ -68,15 +68,21 @@
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreChannels;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dispatcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "clock"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "analytics"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeChannels"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -125,34 +131,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->hideMutedChannelsPublisher:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "analytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getAnalytics$p(Lcom/discord/stores/StoreUserGuildSettings;)Lcom/discord/stores/StoreAnalytics;
@@ -291,7 +269,7 @@
 
     const-string v6, "computedSettings"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelNotificationSettings;->getGuildId()J
 
@@ -307,7 +285,7 @@
 
     check-cast v5, Lcom/discord/models/domain/ModelNotificationSettings;
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -360,7 +338,7 @@
 
     const-string p1, "Observable.timer(\n      \u2026patcher.scheduler\n      )"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v5, Lcom/discord/stores/StoreUserGuildSettings;
 
@@ -543,7 +521,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/i/l;->firstOrNull(Ljava/lang/Iterable;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->firstOrNull(Ljava/lang/Iterable;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -649,7 +627,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserGuildSettings$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -659,7 +637,7 @@
 
     const-string p2, "guildSettingsPublisher\n \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -702,7 +680,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -712,7 +690,7 @@
 
     const-string p2, "hideMutedChannelsPublish\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -735,7 +713,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -745,7 +723,7 @@
 
     const-string v1, "get()\n        .switchMap\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -755,7 +733,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getUserGuildSettings()Lcom/discord/models/domain/ModelPayload$VersionedUserGuildSettings;
 
@@ -763,7 +743,7 @@
 
     const-string v1, "payload.userGuildSettings"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->isPartial()Z
 
@@ -780,7 +760,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->getEntries()Ljava/util/List;
 
@@ -788,7 +768,7 @@
 
     const-string v0, "payload.userGuildSettings.entries"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettings(Ljava/util/List;)V
 
@@ -797,19 +777,10 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->isDirty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildSettingUpdated$app_productionDiscordExternalRelease(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -823,7 +794,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildSettingsList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettings(Ljava/util/List;)V
 
@@ -832,21 +805,14 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->isDirty:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guildSettingsList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public init(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -863,15 +829,6 @@
     invoke-virtual {p1, v0}, Ljava/util/HashSet;->addAll(Ljava/util/Collection;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
@@ -908,11 +865,13 @@
 .method public final setChannelFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;I)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -920,7 +879,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -942,7 +901,7 @@
 
     invoke-direct {v6, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
 
-    const v7, 0x7f12040c
+    const v7, 0x7f12040d
 
     move-object v2, p0
 
@@ -951,26 +910,14 @@
     invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setChannelMuted(Landroid/content/Context;JZLcom/discord/models/domain/ModelMuteConfig;)V
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->dispatcher:Lcom/discord/stores/Dispatcher;
 
@@ -993,91 +940,78 @@
     invoke-virtual {v0, v8}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setChannelNotificationsDefault(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)V
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "channel.guildId"
+    const-string v1, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v4
 
-    new-instance v7, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
+    new-instance v6, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     new-instance p2, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;
 
-    sget-object v3, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget v4, Lcom/discord/models/domain/ModelNotificationSettings;->FREQUENCY_UNSET:I
+    sget v3, Lcom/discord/models/domain/ModelNotificationSettings;->FREQUENCY_UNSET:I
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-direct {p2, v3, v0, v4}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;-><init>(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Integer;)V
+    const/4 v7, 0x0
 
-    invoke-direct {v7, v1, v2, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
+    invoke-direct {p2, v2, v7, v3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;-><init>(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Integer;)V
 
-    const v8, 0x7f12040c
+    invoke-direct {v6, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
 
-    move-object v3, p0
+    const v7, 0x7f12040d
 
-    move-object v4, p1
+    move-object v2, p0
 
-    invoke-direct/range {v3 .. v8}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V
+    move-object v3, p1
+
+    invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setGuildFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;I)V
     .locals 15
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    move-object/from16 v2, p1
 
-    if-eqz p2, :cond_0
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guild"
+
+    move-object/from16 v1, p2
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1085,6 +1019,10 @@
 
     new-instance v0, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
 
+    invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v11
+
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -1095,10 +1033,6 @@
 
     const/4 v10, 0x0
 
-    invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v11
-
     const/4 v12, 0x0
 
     const/16 v13, 0x5f
@@ -1109,94 +1043,77 @@
 
     invoke-direct/range {v5 .. v14}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const v6, 0x7f121458
+    const v6, 0x7f121482
 
     move-object v1, p0
 
-    move-object/from16 v2, p1
-
     invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V
 
     return-void
-
-    :cond_0
-    const-string v1, "guild"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "context"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setGuildMuted(Landroid/content/Context;JZLcom/discord/models/domain/ModelMuteConfig;)V
-    .locals 11
+    .locals 13
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
 
-    new-instance v10, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
+    move-object v2, p1
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
 
-    invoke-static {p4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static/range {p4 .. p4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v3
+    move-result-object v6
+
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/16 v8, 0x73
+    const/4 v8, 0x0
 
     const/4 v9, 0x0
 
-    move-object v0, v10
+    const/4 v10, 0x0
 
-    move-object/from16 v4, p5
+    const/16 v11, 0x73
 
-    invoke-direct/range {v0 .. v9}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v12, 0x0
 
-    const v5, 0x7f121458
+    move-object v3, v0
 
-    move-object v0, p0
+    move-object/from16 v7, p5
 
-    move-object v1, p1
+    invoke-direct/range {v3 .. v12}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    move-wide v2, p2
+    const v6, 0x7f121482
 
-    move-object v4, v10
+    move-object v1, p0
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V
+    move-wide v3, p2
+
+    move-object v5, v0
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V
 
     return-void
-
-    :cond_0
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final setGuildToggles(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
     .locals 15
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    move-object/from16 v2, p1
 
-    if-eqz p2, :cond_0
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guild"
+
+    move-object/from16 v1, p2
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1226,29 +1143,13 @@
 
     invoke-direct/range {v5 .. v14}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const v6, 0x7f121458
+    const v6, 0x7f121482
 
     move-object v1, p0
 
-    move-object/from16 v2, p1
-
     invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V
 
     return-void
-
-    :cond_0
-    const-string v1, "guild"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "context"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setHideMutedChannels(JZ)V
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes$UserNoteState$Loaded.smali b/com.discord/smali/com/discord/stores/StoreUserNotes$UserNoteState$Loaded.smali
index a4f93fdca2..f7f1a9d646 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes$UserNoteState$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes$UserNoteState$Loaded.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUserNote;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "note"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreUserNotes$UserNoteState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;->note:Lcom/discord/models/domain/ModelUserNote;
 
     return-void
-
-    :cond_0
-    const-string p1, "note"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;Lcom/discord/models/domain/ModelUserNote;ILjava/lang/Object;)Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUserNote;)Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "note"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;-><init>(Lcom/discord/models/domain/ModelUserNote;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "note"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;->note:Lcom/discord/models/domain/ModelUserNote;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1$1.smali
index d5749c93ad..7469700e9e 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserNotes$loadNote$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserNotes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-string v2, "note"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreUserNotes;->access$handleRequestUserNoteSuccess(Lcom/discord/stores/StoreUserNotes;Lcom/discord/models/domain/ModelUserNote;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1.smali b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1.smali
index ac37ca3b4d..e5dfc6d2c6 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserNotes$loadNote$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserNotes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserNote;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2$1.smali b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2$1.smali
index daee26c9f6..d8a8d804e3 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserNotes$loadNote$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserNotes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2.smali b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2.smali
index 04ecf66f4c..0090275e9c 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes$loadNote$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserNotes$loadNote$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserNotes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreUserNotes$loadNote$2;->this$0:Lcom/discord/stores/StoreUserNotes;
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$1.smali b/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$1.smali
index 060b6e2525..4af81f185f 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserNotes$observeUserNote$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserNotes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$2.smali b/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$2.smali
index 05d275208a..d147e76682 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes$observeUserNote$2.smali
@@ -3,7 +3,7 @@
 .source "StoreUserNotes.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreUserNotes$UserNoteState;",
+        ">;",
+        "Lcom/discord/stores/StoreUserNotes$UserNoteState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserNotes.smali b/com.discord/smali/com/discord/stores/StoreUserNotes.smali
index 3d020bb6e2..9dd4f01db1 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes.smali
@@ -43,9 +43,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/Dispatcher;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -64,15 +66,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreUserNotes;->notesByUserIdPublisher:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreUserNotes;)Lcom/discord/stores/Dispatcher;
@@ -184,7 +177,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -194,7 +187,7 @@
 
     const-string v0, "RestAPI\n          .api\n \u2026ormers.restSubscribeOn())"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreUserNotes;
 
@@ -227,7 +220,7 @@
 
     if-eqz p3, :cond_1
 
-    invoke-static {p3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -299,7 +292,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "update"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserNote$Update;->getId()J
 
@@ -312,15 +307,6 @@
     invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StoreUserNotes;->updateNote(JLjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "update"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeUserNote(J)Lrx/Observable;
@@ -348,7 +334,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserNotes$observeUserNote$2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -358,7 +344,7 @@
 
     const-string p2, "notesByUserIdPublisher\n \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
index 0f95183e45..a78659e0c5 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$TimestampedPresence.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelPresence;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-wide p2, p0, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->timestamp:J
 
     return-void
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreUserPresence$TimestampedPresence;Lcom/discord/models/domain/ModelPresence;JILjava/lang/Object;)Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
@@ -89,22 +82,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelPresence;J)Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;-><init>(Lcom/discord/models/domain/ModelPresence;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$getApplicationActivity$1.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$getApplicationActivity$1.smali
index 541eff7ad7..6233fd94eb 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$getApplicationActivity$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$getApplicationActivity$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserPresence.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelPresence;",
+        "Lcom/discord/models/domain/activity/ModelActivity;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali
index d85bcb01f4..cd0c224fac 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserId$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserPresence.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali
index 64afcb8427..89e0c067f7 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence$getForUserIds$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserPresence.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,7 +86,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
index e6882408c1..fa38d1b0f6 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
@@ -80,13 +80,15 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
-    .locals 9
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -98,9 +100,11 @@
 
     const/4 p2, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-direct {p1, p2, v1, v0}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p1, p2, v0, v1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
 
@@ -134,15 +138,17 @@
 
     const/4 v4, 0x0
 
-    const-wide/16 v5, 0x0
+    const/4 v5, 0x0
 
-    const/16 v7, 0x1c
+    const-wide/16 v6, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0x3c
+
+    const/4 v9, 0x0
 
     move-object v0, p1
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v0 .. v9}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
@@ -157,20 +163,6 @@
     iput-object p2, p0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final clearPresences(J)V
@@ -285,285 +277,289 @@
 .end method
 
 .method private final flattenPresence(J)V
-    .locals 13
+    .locals 16
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+    move-object/from16 v0, p0
 
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+
+    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast v1, Ljava/util/Map;
 
-    move-result-object v0
+    const/4 v2, 0x0
 
-    check-cast v0, Ljava/util/Map;
+    if-eqz v1, :cond_4
 
-    const/4 v1, 0x0
+    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    if-eqz v0, :cond_4
+    move-result-object v1
 
-    invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
+    if-eqz v1, :cond_4
 
-    move-result-object v0
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    if-eqz v0, :cond_4
+    move-result-object v1
 
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result-object v0
+    move-result v3
 
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    if-nez v3, :cond_0
 
-    move-result v2
-
-    if-nez v2, :cond_0
-
-    move-object v2, v1
+    move-object v3, v2
 
     goto :goto_0
 
     :cond_0
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v4
 
-    if-nez v3, :cond_1
+    if-nez v4, :cond_1
 
     goto :goto_0
 
     :cond_1
-    move-object v3, v2
+    move-object v4, v3
 
-    check-cast v3, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+    check-cast v4, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
+    invoke-virtual {v4}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
 
-    move-result-wide v3
+    move-result-wide v4
 
     :cond_2
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v6
 
-    move-object v6, v5
+    move-object v7, v6
 
-    check-cast v6, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+    check-cast v7, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
 
-    invoke-virtual {v6}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
+    invoke-virtual {v7}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
 
-    move-result-wide v6
+    move-result-wide v7
 
-    cmp-long v8, v3, v6
+    cmp-long v9, v4, v7
 
-    if-gez v8, :cond_3
+    if-gez v9, :cond_3
 
-    move-object v2, v5
+    move-object v3, v6
 
-    move-wide v3, v6
+    move-wide v4, v7
 
     :cond_3
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v6
 
-    if-nez v5, :cond_2
+    if-nez v6, :cond_2
 
     :goto_0
-    check-cast v2, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+    check-cast v3, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
 
-    if-eqz v2, :cond_4
+    if-eqz v3, :cond_4
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
-    move-result-object v0
+    move-result-object v1
 
     goto :goto_1
 
     :cond_4
-    move-object v0, v1
+    move-object v1, v2
 
     :goto_1
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_5
+    if-eqz v3, :cond_5
 
     goto :goto_2
 
     :cond_5
-    sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+    sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
 
     :goto_2
-    move-object v4, v2
+    move-object v5, v3
 
-    if-eqz v0, :cond_6
+    if-eqz v1, :cond_6
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_6
-
-    sget-object v3, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
-
-    invoke-virtual {v3}, Lcom/discord/utilities/presence/PresenceUtils;->getACTIVITY_COMPARATOR$app_productionDiscordExternalRelease()Ljava/util/Comparator;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
     move-result-object v3
 
-    invoke-static {v2, v3}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    if-eqz v3, :cond_6
 
-    move-result-object v2
+    sget-object v4, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
 
-    invoke-static {v2}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-virtual {v4}, Lcom/discord/utilities/presence/PresenceUtils;->getACTIVITY_COMPARATOR$app_productionDiscordExternalRelease()Ljava/util/Comparator;
 
-    move-result-object v2
+    move-result-object v4
 
-    move-object v5, v2
+    invoke-static {v3, v4}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+
+    move-result-object v3
+
+    invoke-static {v3}, Lk0/j/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v3
+
+    move-object v6, v3
 
     goto :goto_3
 
     :cond_6
-    move-object v5, v1
+    move-object v6, v2
 
     :goto_3
-    if-eqz v0, :cond_7
+    if-eqz v1, :cond_7
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
 
-    move-result-object v0
+    move-result-object v1
 
     goto :goto_4
 
     :cond_7
-    move-object v0, v1
+    move-object v1, v2
 
     :goto_4
-    sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+    sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
 
-    const/4 v12, 0x1
+    const/4 v14, 0x1
 
-    if-ne v4, v2, :cond_8
+    if-ne v5, v3, :cond_8
 
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+    iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
 
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast v1, Lcom/discord/models/domain/ModelPresence;
 
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+    if-eqz v1, :cond_c
 
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz p1, :cond_c
-
-    iput-boolean v12, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+    iput-boolean v14, v0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
 
     goto :goto_6
 
     :cond_8
-    iget-object v2, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+    iget-object v3, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
 
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
-    invoke-virtual {v2, v3}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast v3, Lcom/discord/models/domain/ModelPresence;
+
+    if-eqz v3, :cond_9
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
 
     move-result-object v2
 
-    check-cast v2, Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz v2, :cond_9
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
-
-    move-result-object v1
-
     :cond_9
-    if-ne v1, v4, :cond_a
+    if-ne v2, v5, :cond_a
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v2
 
-    xor-int/2addr v1, v12
+    xor-int/2addr v2, v14
 
-    if-nez v1, :cond_a
+    if-nez v2, :cond_a
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v2
 
-    xor-int/2addr v1, v12
+    xor-int/2addr v2, v14
 
-    if-eqz v1, :cond_c
+    if-eqz v2, :cond_c
 
     :cond_a
-    iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+    iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
 
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p1
+    move-result-object v3
 
-    new-instance p2, Lcom/discord/models/domain/ModelPresence;
+    new-instance v15, Lcom/discord/models/domain/ModelPresence;
 
-    if-eqz v0, :cond_b
+    if-eqz v1, :cond_b
 
     goto :goto_5
 
     :cond_b
-    sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+    sget-object v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
 
-    move-result-object v0
+    move-result-object v1
 
     :goto_5
-    move-object v6, v0
+    move-object v7, v1
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
-    const-wide/16 v8, 0x0
+    const/4 v9, 0x0
 
-    const/16 v10, 0x18
+    const-wide/16 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v12, 0x38
 
-    move-object v3, p2
+    const/4 v13, 0x0
 
-    invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v4, v15
 
-    invoke-interface {v1, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-direct/range {v4 .. v13}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-boolean v12, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+    invoke-interface {v2, v3, v15}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    iput-boolean v14, v0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
 
     :cond_c
     :goto_6
@@ -623,7 +619,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_2
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->stream:Lcom/discord/stores/StoreStream;
 
@@ -635,7 +631,7 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_2
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
@@ -645,7 +641,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_3
 
     new-instance v1, Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
@@ -670,16 +666,11 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelCustomStatusSetting;->getEmojiName()Ljava/lang/String;
 
     move-result-object v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_3
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->stream:Lcom/discord/stores/StoreStream;
 
@@ -695,7 +686,7 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_4
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -703,7 +694,7 @@
 
     check-cast v0, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_3
 
     new-instance v2, Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
@@ -717,14 +708,7 @@
 
     move-object v1, v2
 
-    goto :goto_0
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_5
+    :cond_3
     :goto_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelCustomStatusSetting;->getText()Ljava/lang/String;
 
@@ -754,7 +738,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {p2}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object v0
 
@@ -871,7 +855,7 @@
 .end method
 
 .method private final updateSelfPresence(Lcom/discord/models/domain/ModelUserSettings;Ljava/util/List;Z)V
-    .locals 12
+    .locals 16
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -886,251 +870,259 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+    move-object/from16 v0, p0
 
-    if-eqz v0, :cond_a
+    iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+    if-eqz v1, :cond_a
 
-    move-result-wide v0
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v1
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_0
+    if-eqz v3, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v3, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+
+    move-result-object v3
+
+    :goto_0
+    const-string/jumbo v4, "userSettings?.presenceSt\u2026  ?: localPresence.status"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x0
+
+    if-eqz p2, :cond_3
+
+    invoke-interface/range {p2 .. p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v5
+
+    :cond_1
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_2
+
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    move-object v7, v6
+
+    check-cast v7, Lcom/discord/models/domain/ModelSession;
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelSession;->isActive()Z
+
+    move-result v7
+
+    if-eqz v7, :cond_1
+
+    goto :goto_1
+
+    :cond_2
+    move-object v6, v4
+
+    :goto_1
+    check-cast v6, Lcom/discord/models/domain/ModelSession;
+
+    if-eqz v6, :cond_3
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_3
+
+    move-object v1, v5
+
+    goto :goto_2
+
+    :cond_3
+    iget-object v5, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-virtual {v5, v1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/models/domain/ModelPresence;
+
+    if-eqz v1, :cond_4
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+    move-result-object v1
+
+    goto :goto_2
+
+    :cond_4
+    move-object v1, v4
+
+    :goto_2
+    if-eqz p1, :cond_5
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserSettings;->getCustomStatus()Lcom/discord/models/domain/ModelCustomStatusSetting;
+
+    move-result-object v4
+
+    :cond_5
+    if-eqz v4, :cond_7
+
+    invoke-direct {v0, v4}, Lcom/discord/stores/StoreUserPresence;->getCustomStatusActivityFromSetting(Lcom/discord/models/domain/ModelCustomStatusSetting;)Lcom/discord/models/domain/activity/ModelActivity;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_6
+
+    iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+    move-result-object v4
+
+    invoke-direct {v0, v2, v4}, Lcom/discord/stores/StoreUserPresence;->replaceActivityInList(Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;)Ljava/util/List;
+
+    move-result-object v2
+
+    goto :goto_3
+
+    :cond_6
+    const/4 v2, 0x4
+
+    iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+    move-result-object v4
+
+    invoke-direct {v0, v2, v4}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
+
+    move-result-object v2
+
+    goto :goto_3
+
+    :cond_7
+    iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+    move-result-object v2
+
+    :goto_3
+    move-object v6, v2
+
+    iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
 
     move-result-object v2
 
-    :goto_0
-    const-string v3, "userSettings?.presenceSt\u2026  ?: localPresence.status"
+    const/4 v14, 0x1
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    if-ne v3, v2, :cond_8
 
-    const/4 v3, 0x0
+    iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    if-eqz p2, :cond_3
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
 
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    move-result-object v2
 
-    move-result-object p2
+    invoke-static {v6, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    :cond_1
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+    move-result v2
 
-    move-result v4
+    xor-int/2addr v2, v14
 
-    if-eqz v4, :cond_2
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    move-object v5, v4
-
-    check-cast v5, Lcom/discord/models/domain/ModelSession;
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelSession;->isActive()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    goto :goto_1
-
-    :cond_2
-    move-object v4, v3
-
-    :goto_1
-    check-cast v4, Lcom/discord/models/domain/ModelSession;
-
-    if-eqz v4, :cond_3
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    iget-object p2, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    invoke-virtual {p2, v0}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz p2, :cond_4
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
-    move-result-object p2
-
-    goto :goto_2
-
-    :cond_4
-    move-object p2, v3
-
-    :goto_2
-    if-eqz p1, :cond_5
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getCustomStatus()Lcom/discord/models/domain/ModelCustomStatusSetting;
-
-    move-result-object v3
-
-    :cond_5
-    if-eqz v3, :cond_7
-
-    invoke-direct {p0, v3}, Lcom/discord/stores/StoreUserPresence;->getCustomStatusActivityFromSetting(Lcom/discord/models/domain/ModelCustomStatusSetting;)Lcom/discord/models/domain/activity/ModelActivity;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_6
-
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreUserPresence;->replaceActivityInList(Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    goto :goto_3
-
-    :cond_6
-    const/4 p1, 0x4
-
-    iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    goto :goto_3
-
-    :cond_7
-    iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
-    move-result-object p1
-
-    :goto_3
-    move-object v5, p1
-
-    iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
-
-    move-result-object p1
-
-    const/4 v0, 0x1
-
-    if-ne v2, p1, :cond_8
-
-    iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-static {v5, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    xor-int/2addr p1, v0
-
-    if-eqz p1, :cond_9
+    if-eqz v2, :cond_9
 
     :cond_8
-    new-instance p1, Lcom/discord/models/domain/ModelPresence;
-
-    const/4 v6, 0x0
+    new-instance v2, Lcom/discord/models/domain/ModelPresence;
 
     const/4 v7, 0x0
 
-    const-wide/16 v8, 0x0
+    const/4 v8, 0x0
 
-    const/16 v10, 0x1c
+    const/4 v9, 0x0
 
-    const/4 v11, 0x0
+    const-wide/16 v10, 0x0
 
-    move-object v3, p1
+    const/16 v12, 0x3c
+
+    const/4 v13, 0x0
 
     move-object v4, v2
 
-    invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v5, v3
 
-    iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+    invoke-direct/range {v4 .. v13}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
+    iput-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-virtual {v1, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    iget-object v4, v4, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+    invoke-virtual {v4, v2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
+
+    iput-boolean v14, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
 
     :cond_9
-    const-wide v0, 0x7fffffffffffffffL
+    const-wide v14, 0x7fffffffffffffffL
 
-    new-instance p1, Lcom/discord/models/domain/ModelPresence;
+    new-instance v2, Lcom/discord/models/domain/ModelPresence;
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
-    iget-object v7, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+    iget-object v8, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    const-wide/16 v8, 0x0
+    const/4 v9, 0x0
 
-    const/16 v10, 0x14
+    const-wide/16 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v12, 0x34
 
-    move-object v3, p1
+    const/4 v13, 0x0
 
     move-object v4, v2
 
-    move-object v5, p2
+    move-object v5, v3
 
-    invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v6, v1
 
-    invoke-virtual {p0, v0, v1, p1}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
+    invoke-direct/range {v4 .. v13}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v0, v14, v15, v2}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
     if-nez p3, :cond_a
 
-    iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+    iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
 
-    move-result-object p1
+    move-result-object v1
 
-    if-nez p1, :cond_a
+    if-nez v1, :cond_a
 
-    const/4 p1, 0x0
+    const/4 v1, 0x0
 
-    iput-boolean p1, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+    iput-boolean v1, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
 
     :cond_a
     return-void
@@ -1179,7 +1171,7 @@
 
     invoke-direct {p2, p3, p4}, Lcom/discord/stores/StoreUserPresence$getApplicationActivity$1;-><init>(J)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1189,7 +1181,7 @@
 
     const-string p2, "getForUserId(userId)\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1213,7 +1205,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserPresence$getForUserId$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1223,7 +1215,7 @@
 
     const-string p2, "get()\n        .map { it[\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1244,7 +1236,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUserPresence;->get()Lrx/Observable;
 
@@ -1254,7 +1248,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreUserPresence$getForUserIds$1;-><init>(Ljava/util/Collection;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1264,18 +1258,9 @@
 
     const-string v0, "get()\n        .map { it.\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getLocalPresence()Lrx/Observable;
@@ -1301,7 +1286,7 @@
 
     const-string v1, "localPresenceSubject\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1343,7 +1328,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
 
@@ -1365,7 +1352,7 @@
 
     const-string v1, "payload.guilds"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1395,7 +1382,7 @@
 
     const-string v1, "payload.presences"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1418,7 +1405,7 @@
 
     const-string v4, "presence"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v2, v3, v1}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
@@ -1442,15 +1429,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
@@ -1458,7 +1436,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPresences()Ljava/util/List;
 
@@ -1489,7 +1469,7 @@
 
     const-string v4, "presence"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v2, v3, v1}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
@@ -1497,62 +1477,48 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V
-    .locals 12
+    .locals 13
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "member"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getGuildId()J
 
     move-result-wide v0
 
-    new-instance v11, Lcom/discord/models/domain/ModelPresence;
+    new-instance v12, Lcom/discord/models/domain/ModelPresence;
 
     sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
 
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v6
 
-    const-wide/16 v7, 0x0
+    const/4 v4, 0x0
 
-    const/16 v9, 0x14
+    const/4 v5, 0x0
 
-    const/4 v10, 0x0
+    const/4 v7, 0x0
 
-    move-object v2, v11
+    const-wide/16 v8, 0x0
 
-    invoke-direct/range {v2 .. v10}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/16 v10, 0x34
 
-    invoke-virtual {p0, v0, v1, v11}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
+    const/4 v11, 0x0
+
+    move-object v2, v12
+
+    invoke-direct/range {v2 .. v11}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {p0, v0, v1, v12}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -1560,7 +1526,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -1569,15 +1537,6 @@
     invoke-direct {p0, v0, v1}, Lcom/discord/stores/StoreUserPresence;->clearPresences(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePresenceReplace(Ljava/util/List;)V
@@ -1594,7 +1553,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "presencesList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide v0, 0x7fffffffffffffffL
 
@@ -1623,15 +1584,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "presencesList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
@@ -1639,7 +1591,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p3, :cond_4
+    const-string v0, "presence"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -1725,15 +1679,6 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleSessionsReplace(Ljava/util/List;)V
@@ -1751,22 +1696,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "sessions"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x1
 
     invoke-direct {p0, v0, p1, v1}, Lcom/discord/stores/StoreUserPresence;->updateSelfPresence(Lcom/discord/models/domain/ModelUserSettings;Ljava/util/List;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "sessions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleUserSettingsUpdate(Lcom/discord/models/domain/ModelUserSettings;)V
@@ -1774,22 +1714,17 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userSettings"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x1
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/stores/StoreUserPresence;->updateSelfPresence(Lcom/discord/models/domain/ModelUserSettings;Ljava/util/List;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "userSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onDispatchEnded()V
@@ -1811,9 +1746,9 @@
 
     move-result-object v2
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, v2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iput-boolean v1, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
 
@@ -1857,7 +1792,7 @@
 .end method
 
 .method public final updateActivity(ILcom/discord/models/domain/activity/ModelActivity;Z)V
-    .locals 10
+    .locals 11
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -1927,7 +1862,7 @@
     const/4 v1, 0x0
 
     :cond_3
-    invoke-static {p2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -1976,23 +1911,25 @@
 
     const/4 v5, 0x0
 
-    const-wide/16 v6, 0x0
+    const/4 v6, 0x0
 
-    const/16 v8, 0x1c
+    const-wide/16 v7, 0x0
 
-    const/4 v9, 0x0
+    const/16 v9, 0x3c
+
+    const/4 v10, 0x0
 
     move-object v1, p1
 
-    invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v10}, Lcom/discord/models/domain/ModelPresence;-><init>(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
     iget-object p2, p0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object p2, p2, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p2, p2, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p2, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p2, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
 
@@ -2018,7 +1955,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali b/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali
index d2506fdb9f..2688225096 100644
--- a/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserProfile$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserProfile.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelUserProfile;",
+        ">;",
+        "Lcom/discord/models/domain/ModelUserProfile;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile.smali b/com.discord/smali/com/discord/stores/StoreUserProfile.smali
index 293183555e..0235a62e35 100644
--- a/com.discord/smali/com/discord/stores/StoreUserProfile.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserProfile.smali
@@ -169,9 +169,9 @@
 
     invoke-direct {p2, p3}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, p2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -208,13 +208,13 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreUserProfile$get$1;-><init>(Lcom/discord/stores/StoreUserProfile;J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "profilesSubject\n        \u2026userId] ?: emptyProfile }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -226,7 +226,7 @@
 
     const-string p2, "profilesSubject\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -295,7 +295,7 @@
 
     const-string v1, "RestAPI\n        .api\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded.smali
index 80a9e6c155..084b1f42fd 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded.smali
@@ -40,22 +40,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "relationships"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;->relationships:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;
@@ -107,22 +102,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "relationships"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;-><init>(Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +128,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;->relationships:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$1.smali
index bd7683e567..daca6923ca 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserRelationships.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,13 +90,13 @@
 
     sget-object v0, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Unloaded;->INSTANCE:Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Unloaded;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$2.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$2.smali
index 4362463b4b..0590c8f5a2 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$2.smali
@@ -3,7 +3,7 @@
 .source "StoreUserRelationships.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,7 +86,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$3.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$3.smali
index fac27ffc42..1edde26ae4 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$observe$3.smali
@@ -3,7 +3,7 @@
 .source "StoreUserRelationships.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$observeForType$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$observeForType$1.smali
index ca6e207952..45baf15540 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$observeForType$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$observeForType$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserRelationships.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,7 +86,7 @@
 
     const-string v0, "relationships"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$observePendingCount$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$observePendingCount$1.smali
index 759d70d1ea..4efea9db72 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$observePendingCount$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$observePendingCount$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserRelationships.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +63,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;)I
+.method public final call(Ljava/util/Map;)Ljava/lang/Integer;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -65,13 +71,14 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
-            ">;)I"
+            ">;)",
+            "Ljava/lang/Integer;"
         }
     .end annotation
 
     const-string v0, "relationships"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map;->isEmpty()Z
 
@@ -140,7 +147,11 @@
     move v1, v0
 
     :goto_2
-    return v1
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -148,11 +159,7 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserRelationships$observePendingCount$1;->call(Ljava/util/Map;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserRelationships$observePendingCount$1;->call(Ljava/util/Map;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
index 77ab4f6cf2..3ec9dd5731 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserRelationships.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Throwable;",
         "Ljava/util/List<",
         "+",
@@ -86,7 +86,7 @@
         }
     .end annotation
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2$1.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2$1.smali
index e2a875fcea..bec6c5f757 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserRelationships.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     const-string v1, "allRelationships"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2$1;->this$0:Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali
index 757a1e5429..25bad82e2a 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships$requestAllRelationships$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserRelationships.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
index 5df02758c9..f43e7c75a5 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
@@ -50,11 +50,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -87,20 +89,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreUserRelationships;->userRelationshipsSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreUserRelationships;)Lcom/discord/stores/Dispatcher;
@@ -140,7 +128,7 @@
     :cond_1
     new-instance v0, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;
 
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-direct {v0, v1}, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;-><init>(Ljava/util/Map;)V
 
@@ -186,7 +174,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     return-object v0
@@ -197,7 +185,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getRelationships()Ljava/util/List;
 
@@ -205,7 +195,7 @@
 
     const-string v0, "payload\n        .relationships"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0xa
 
@@ -247,7 +237,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUserRelationship;->getId()J
 
@@ -257,7 +247,7 @@
 
     move-result-object v3
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUserRelationship;->getType()I
 
@@ -283,15 +273,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreUserRelationships;->isDirty:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handlePreLogout()V
@@ -315,7 +296,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "relationship"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreUserRelationships;->ensureRelationshipLoaded()Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;
 
@@ -397,15 +380,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "relationship"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleRelationshipRemove(Lcom/discord/models/domain/ModelUserRelationship;)V
@@ -413,7 +387,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "relationship"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreUserRelationships;->ensureRelationshipLoaded()Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;
 
@@ -467,15 +443,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "relationship"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final init()V
@@ -493,7 +460,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -530,9 +497,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserRelationships;->userRelationshipsSubject:Lrx/subjects/BehaviorSubject;
 
-    const-string v1, "userRelationshipsSubject"
+    const-string/jumbo v1, "userRelationshipsSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -540,13 +507,13 @@
 
     sget-object v1, Lcom/discord/stores/StoreUserRelationships$observe$1;->INSTANCE:Lcom/discord/stores/StoreUserRelationships$observe$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "userRelationshipsSubject\u2026            }\n          }"
+    const-string/jumbo v1, "userRelationshipsSubject\u2026            }\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -570,13 +537,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserRelationships$observe$3;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "observe()\n          .map\u2026> relationships[userId] }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -597,7 +564,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreUserRelationships;->observe()Lrx/Observable;
 
@@ -607,7 +576,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreUserRelationships$observe$2;-><init>(Ljava/util/Collection;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -617,18 +586,9 @@
 
     const-string v0, "observe()\n          .map\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeForType(I)Lrx/Observable;
@@ -652,7 +612,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreUserRelationships$observeForType$1;-><init>(I)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -662,7 +622,7 @@
 
     const-string v0, "observe()\n          .map\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -684,7 +644,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreUserRelationships$observePendingCount$1;->INSTANCE:Lcom/discord/stores/StoreUserRelationships$observePendingCount$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -694,7 +654,7 @@
 
     const-string v1, "observe()\n          .map\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -712,9 +672,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserRelationships;->userRelationshipsSubject:Lrx/subjects/BehaviorSubject;
 
-    const-string v1, "userRelationshipsSubject"
+    const-string/jumbo v1, "userRelationshipsSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -799,7 +759,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -809,7 +769,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$1;->INSTANCE:Lcom/discord/stores/StoreUserRelationships$requestAllRelationships$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -827,12 +787,20 @@
 
     and-int/lit8 v1, v1, 0x20
 
-    new-instance v8, Lf/a/b/c0;
+    const-string v1, "onNext"
 
-    const/4 v7, 0x0
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "requestAllRelationships"
 
+    const-string v1, "errorTag"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lf/a/b/e0;
+
+    const/4 v7, 0x0
+
     move-object v1, v8
 
     move-object v2, v7
@@ -841,7 +809,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/e0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationshipsKt.smali b/com.discord/smali/com/discord/stores/StoreUserRelationshipsKt.smali
index db5b4ddbc9..3570767bfe 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationshipsKt.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationshipsKt.smali
@@ -18,37 +18,47 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 4
+    .locals 5
 
     const/4 v0, 0x1
 
-    new-array v0, v0, [Lkotlin/Pair;
+    new-array v1, v0, [Lkotlin/Pair;
 
-    const-wide/16 v1, -0x1
+    const-wide/16 v2, -0x1
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    const/4 v2, -0x1
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v2
 
-    new-instance v3, Lkotlin/Pair;
+    const/4 v3, -0x1
 
-    invoke-direct {v3, v1, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const/4 v1, 0x0
+    move-result-object v3
 
-    aput-object v3, v0, v1
+    new-instance v4, Lkotlin/Pair;
 
-    invoke-static {v0}, Lf/n/a/k/a;->hashMapOf([Lkotlin/Pair;)Ljava/util/HashMap;
+    invoke-direct {v4, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    move-result-object v0
+    const/4 v2, 0x0
 
-    sput-object v0, Lcom/discord/stores/StoreUserRelationshipsKt;->UNLOADED_RELATIONSHIPS_SENTINEL:Ljava/util/HashMap;
+    aput-object v4, v1, v2
+
+    const-string v2, "pairs"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Ljava/util/HashMap;
+
+    invoke-static {v0}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v0
+
+    invoke-direct {v2, v0}, Ljava/util/HashMap;-><init>(I)V
+
+    invoke-static {v2, v1}, Lf/n/a/k/a;->putAll(Ljava/util/Map;[Lkotlin/Pair;)V
+
+    sput-object v2, Lcom/discord/stores/StoreUserRelationshipsKt;->UNLOADED_RELATIONSHIPS_SENTINEL:Ljava/util/HashMap;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali b/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
index 0c70561e6f..0ceaaf4ddf 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRequiredActions.smali
@@ -46,9 +46,9 @@
 
     move-result-object p1
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -76,9 +76,9 @@
 
     move-result-object v0
 
-    const-string v1, "userRequiredActionSubjec\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "userRequiredActionSubjec\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index b332d980b6..bbd41077da 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -325,7 +325,7 @@
 
     invoke-interface {p0}, Landroid/content/SharedPreferences$Editor;->apply()V
 
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -339,7 +339,7 @@
 
     move-result p0
 
-    invoke-static {p1, p0}, Lf/a/b/n;->d(Landroid/content/Context;I)V
+    invoke-static {p1, p0}, Lf/a/b/p;->d(Landroid/content/Context;I)V
 
     :cond_0
     return-void
@@ -354,7 +354,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v2
 
@@ -364,7 +364,7 @@
 
     sget-object v2, Lf/a/k/l;->d:Lf/a/k/l;
 
-    invoke-static {v2, v0}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {v2, v0}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -610,7 +610,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_a
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getFriendSourceFlags()Lcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;
@@ -625,7 +625,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_b
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getDefaultGuildsRestricted()Ljava/lang/Boolean;
@@ -640,7 +640,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_c
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getCustomStatus()Lcom/discord/models/domain/ModelCustomStatusSetting;
@@ -800,7 +800,7 @@
     :cond_0
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->customStatusSubject:Lrx/subjects/Subject;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     sget-object v0, Lcom/discord/models/domain/ModelCustomStatusSetting;->Companion:Lcom/discord/models/domain/ModelCustomStatusSetting$Companion;
 
@@ -887,7 +887,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -895,7 +895,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -907,7 +907,7 @@
 
     invoke-direct {v0, p2, p0}, Lf/a/k/j;-><init>(Ljava/lang/Integer;Lcom/discord/app/AppActivity;)V
 
-    invoke-static {v0, p0}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {v0, p0}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object p0
 
@@ -989,11 +989,11 @@
 
     sget-object v1, Lf/a/k/h;->d:Lf/a/k/h;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1017,7 +1017,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->customStatusSubject:Lrx/subjects/Subject;
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1039,7 +1039,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->defaultGuildsRestrictedSubject:Lrx/subjects/Subject;
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1077,7 +1077,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->explicitContentFilterSubject:Lrx/subjects/Subject;
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1137,7 +1137,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->friendSourceFlagsSubject:Lrx/subjects/Subject;
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1164,7 +1164,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1291,7 +1291,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1422,7 +1422,7 @@
 
     invoke-direct {v1, p0}, Lf/a/k/k;-><init>(Lcom/discord/stores/StoreUserSettings;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1621,7 +1621,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreUserSettings;->localePublisher:Lrx/subjects/Subject;
 
@@ -1629,7 +1629,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1665,13 +1665,13 @@
 
     const-string v1, "dark"
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->localePublisher:Lrx/subjects/Subject;
 
     sget-object v1, Lcom/discord/models/domain/ModelUserSettings;->LOCALE_DEFAULT:Ljava/lang/String;
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1750,7 +1750,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1215bd
+    const v1, 0x7f1215e7
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1865,7 +1865,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f120dfa
+    const v0, 0x7f120e20
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2262,7 +2262,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1215bd
+    const v1, 0x7f1215e7
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2293,7 +2293,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1215bc
+    const v1, 0x7f1215e6
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali b/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali
index 7c70def380..a1abe049b8 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreUserTyping.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -78,7 +88,7 @@
 
     const-string v0, "typingUsersByChannel"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/stores/StoreUserTyping$get$1;->$channelId:J
 
@@ -95,7 +105,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     check-cast p1, Ljava/util/Set;
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1$1.smali
index 6526698767..9aaca38b00 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserTyping$handleTypingStart$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserTyping.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     const-string v2, "prevTyping"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/stores/StoreUserTyping;->access$handleTypingStop(Lcom/discord/stores/StoreUserTyping;Lcom/discord/models/domain/ModelUser$Typing;)V
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1.smali b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1.smali
index 85fa5c3d5d..07ed2dd576 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserTyping$handleTypingStart$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserTyping.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Typing;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$2.smali b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$2.smali
index 6784befc29..97a46ee856 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$handleTypingStart$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserTyping$handleTypingStart$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserTyping.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserTyping$handleTypingStart$2;->this$0:Lcom/discord/stores/StoreUserTyping;
 
@@ -105,13 +107,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1$1.smali
index b7899bdd95..04ddb87ebd 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserTyping$setUserTyping$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserTyping.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1.smali b/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1.smali
index 9022b71c81..7c850a4c24 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping$setUserTyping$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreUserTyping$setUserTyping$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreUserTyping.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelTypingResponse;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserTyping.smali b/com.discord/smali/com/discord/stores/StoreUserTyping.smali
index b8f180206b..d3ebf7e3ef 100644
--- a/com.discord/smali/com/discord/stores/StoreUserTyping.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserTyping.smali
@@ -56,11 +56,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dispatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -91,20 +93,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreUserTyping;->typingUsersPublisher:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreUserTyping;)Lcom/discord/stores/Dispatcher;
@@ -156,7 +144,7 @@
 
     const-string v1, "typingUsers[typing.channelId] ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Typing;->getUserId()J
 
@@ -200,7 +188,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserTyping$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -210,7 +198,7 @@
 
     const-string p2, "typingUsersPublisher\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -220,7 +208,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
@@ -228,7 +218,7 @@
 
     const-string v1, "message.author"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -254,7 +244,7 @@
 
     const-string v2, "typingUsers[message.channelId] ?: return"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -272,15 +262,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleTypingStart(Lcom/discord/models/domain/ModelUser$Typing;)V
@@ -292,7 +273,9 @@
 
     move-object/from16 v0, p1
 
-    if-eqz v0, :cond_6
+    const-string v1, "typing"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v6, Lcom/discord/stores/StoreUserTyping;->stream:Lcom/discord/stores/StoreStream;
 
@@ -367,9 +350,9 @@
     invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
 
     :cond_3
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-wide/16 v2, 0xa
 
@@ -381,7 +364,7 @@
 
     const-string v0, "Observable\n        .just\u2026lay(10, TimeUnit.SECONDS)"
 
-    invoke-static {v11, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
@@ -450,15 +433,6 @@
 
     :cond_5
     return-void
-
-    :cond_6
-    const-string v0, "typing"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
index 2c604929ad..cc5fc9cf55 100644
--- a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds$get$1.smali
@@ -27,7 +27,25 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/LinkedHashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -146,7 +164,7 @@
 
     const-string v1, "guildsList"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -174,7 +192,7 @@
 
     const-string v9, "guild"
 
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
index 80f6920936..aca860345d 100644
--- a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
+++ b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreUsersMutualGuilds;->stream:Lcom/discord/stores/StoreStream;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -48,7 +41,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreUsersMutualGuilds;->stream:Lcom/discord/stores/StoreStream;
 
@@ -74,17 +69,17 @@
 
     invoke-direct {v3, p1}, Lcom/discord/stores/StoreUsersMutualGuilds$get$1;-><init>(Ljava/util/Collection;)V
 
-    const-wide/16 v4, 0x1
-
     sget-object v6, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
+    const-wide/16 v4, 0x1
+
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "ObservableWithLeadingEdg\u2026imeUnit.SECONDS\n        )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -96,16 +91,7 @@
 
     const-string v0, "ObservableWithLeadingEdg\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreV2$MarkChangedDelegate.smali b/com.discord/smali/com/discord/stores/StoreV2$MarkChangedDelegate.smali
index 93eb85803c..151cf3bfdf 100644
--- a/com.discord/smali/com/discord/stores/StoreV2$MarkChangedDelegate.smali
+++ b/com.discord/smali/com/discord/stores/StoreV2$MarkChangedDelegate.smali
@@ -83,20 +83,13 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string p1, "property"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->value:Ljava/lang/Object;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setValue(Lcom/discord/stores/StoreV2;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
@@ -110,11 +103,13 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_2
+    const-string v0, "property"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->value:Ljava/lang/Object;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -150,13 +145,4 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreV2.smali b/com.discord/smali/com/discord/stores/StoreV2.smali
index 10263e477b..d7d086e84a 100644
--- a/com.discord/smali/com/discord/stores/StoreV2.smali
+++ b/com.discord/smali/com/discord/stores/StoreV2.smali
@@ -71,26 +71,31 @@
 .end method
 
 .method public final varargs markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
-    .locals 1
+    .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "updates"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
 
     iget-object v0, p0, Lcom/discord/stores/StoreV2;->updateSources:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
+    const-string v1, "$this$addAll"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "elements"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ljava/util/Collection;->addAll(Ljava/util/Collection;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "updates"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDispatchEnded()V
diff --git a/com.discord/smali/com/discord/stores/StoreVideoStreams$UserStreams.smali b/com.discord/smali/com/discord/stores/StoreVideoStreams$UserStreams.smali
index 533343581c..4c57df866f 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoStreams$UserStreams.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoStreams$UserStreams.smali
@@ -116,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVideoStreams$UserStreams;->callStreamId:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -126,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/stores/StoreVideoStreams$UserStreams;->applicationStreamId:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreVideoStreams$observeUserStreams$1.smali b/com.discord/smali/com/discord/stores/StoreVideoStreams$observeUserStreams$1.smali
index 5440fc077f..d4fa41f0ba 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoStreams$observeUserStreams$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoStreams$observeUserStreams$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreVideoStreams$observeUserStreams$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreVideoStreams.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVideoStreams.smali b/com.discord/smali/com/discord/stores/StoreVideoStreams.smali
index 0794ad65e6..905ba8d167 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoStreams.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoStreams.smali
@@ -51,15 +51,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/updates/ObservationDeck;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "observationDeck"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/StoreV2;-><init>()V
 
     iput-object p1, p0, Lcom/discord/stores/StoreVideoStreams;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/stores/StoreVideoStreams;->userStreamsByUserSnapshot:Ljava/util/Map;
 
@@ -70,15 +72,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreVideoStreams;->userStreamsByUser:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "observationDeck"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -251,9 +244,9 @@
     invoke-direct {v0, v1, v1}, Lcom/discord/stores/StoreVideoStreams$UserStreams;-><init>(Ljava/lang/Integer;Ljava/lang/Integer;)V
 
     :goto_0
-    const-string v2, "userStreamsByUser[userId\u2026plicationStreamId = null)"
+    const-string/jumbo v2, "userStreamsByUser[userId\u2026plicationStreamId = null)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -295,9 +288,9 @@
     invoke-direct {v0, v1, v1}, Lcom/discord/stores/StoreVideoStreams$UserStreams;-><init>(Ljava/lang/Integer;Ljava/lang/Integer;)V
 
     :goto_0
-    const-string v2, "userStreamsByUser[userId\u2026plicationStreamId = null)"
+    const-string/jumbo v2, "userStreamsByUser[userId\u2026plicationStreamId = null)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
@@ -346,7 +339,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "voiceState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->isRemoveSignal()Z
 
@@ -384,15 +379,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "voiceState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeUserStreams()Lrx/Observable;
diff --git a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali
index c41fcd69ad..c69300c5b5 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,30 +62,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreVideoSupport$init$1;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
+.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "deviceSupportsVideo"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -92,7 +77,7 @@
 
     const-string p1, "accountSupportsVideo"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -108,5 +93,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreVideoSupport$init$1;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali
index 6b8cde680e..1007466cff 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport$init$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreVideoSupport$init$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreVideoSupport.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreVideoSupport.smali b/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
index b4e0313ecf..90f44fcb05 100644
--- a/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
+++ b/com.discord/smali/com/discord/stores/StoreVideoSupport.smali
@@ -55,13 +55,13 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v0, "Observable.just(true)"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 .end method
@@ -79,13 +79,13 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v0, "Observable.just(true)"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 .end method
@@ -115,7 +115,7 @@
 
     const-string v1, "isVideoSupportedCache\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -123,7 +123,9 @@
 .method public init(Landroid/content/Context;)V
     .locals 11
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -143,10 +145,14 @@
 
     const-string p1, "Observable\n        .comb\u2026portsVideo\n            })"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/stores/StoreVideoSupport;
 
+    new-instance v8, Lcom/discord/stores/StoreVideoSupport$init$2;
+
+    invoke-direct {v8, p0}, Lcom/discord/stores/StoreVideoSupport$init$2;-><init>(Lcom/discord/stores/StoreVideoSupport;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -155,10 +161,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/stores/StoreVideoSupport$init$2;
-
-    invoke-direct {v8, p0}, Lcom/discord/stores/StoreVideoSupport$init$2;-><init>(Lcom/discord/stores/StoreVideoSupport;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -166,13 +168,4 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
index de08bf7082..b3dae09988 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$clear$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/stores/StoreVoiceChannelSelected$clear$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "StoreVoiceChannelSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreVoiceChannelSelected;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/stores/StoreVoiceChannelSelected;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "clearInternal"
+
+    const-string v5, "clearInternal()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "clearInternal"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "clearInternal()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/stores/StoreVoiceChannelSelected;
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali
index 5a19f0ffca..9a8b05ad42 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceChannelSelected.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelChannel;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     const-string v1, "selectedVoiceChannelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali
index 7815dcea2e..b6c28a187f 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$set$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreVoiceChannelSelected$set$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreVoiceChannelSelected.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
index 7cf2bc21de..c8ee15974c 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
@@ -97,13 +97,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dispatcher"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -117,20 +121,16 @@
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p3
-
-    invoke-static {p3}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object p3
-
-    iput-object p3, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelIdPublisher:Lrx/subjects/BehaviorSubject;
-
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
     move-result-object p1
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelIdPublisher:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
     move-result-object p1
 
     iput-object p1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->timeSelectedPublisher:Lrx/subjects/BehaviorSubject;
@@ -139,7 +139,7 @@
 
     const-string p2, "selectedVoiceChannelIdPublisher"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -151,7 +151,7 @@
 
     const-string p2, "selectedVoiceChannelIdPu\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->id:Lrx/Observable;
 
@@ -159,7 +159,7 @@
 
     const-string p2, "timeSelectedPublisher"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -171,32 +171,11 @@
 
     const-string p2, "timeSelectedPublisher\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->timeChannelSelected:Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dispatcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$clearInternal(Lcom/discord/stores/StoreVoiceChannelSelected;)V
@@ -236,7 +215,7 @@
 .end method
 
 .method private final getJoinability(J)Lcom/discord/utilities/voice/VoiceChannelJoinability;
-    .locals 5
+    .locals 10
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -266,30 +245,30 @@
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreChannels;->getBlocking$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    move-result-object v5
 
-    if-eqz v0, :cond_2
+    if-eqz v5, :cond_3
 
     invoke-virtual {v3}, Lcom/discord/stores/StoreVoiceStates;->getMediaStatesBlocking()Ljava/util/Map;
 
-    move-result-object v3
+    move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object v3
 
-    check-cast v3, Ljava/util/Map;
+    invoke-interface {v0, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v3, :cond_0
+    move-result-object v0
+
+    check-cast v0, Ljava/util/Map;
+
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v3, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-virtual {v2}, Lcom/discord/stores/StorePermissions;->getPermissionsForChannels$app_productionDiscordExternalRelease()Ljava/util/Map;
@@ -304,52 +283,293 @@
 
     move-result-object p1
 
-    check-cast p1, Ljava/lang/Long;
+    move-object v7, p1
+
+    check-cast v7, Ljava/lang/Long;
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object p2
 
-    check-cast p2, Lcom/discord/models/domain/ModelGuild;
+    invoke-interface {p1, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v1, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;->INSTANCE:Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;
+    move-result-object p1
 
-    invoke-interface {v3}, Ljava/util/Map;->values()Ljava/util/Collection;
+    check-cast p1, Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v2
+    if-eqz p1, :cond_1
 
-    if-eqz p2, :cond_1
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->getVerificationLevelTriggered(Lcom/discord/models/domain/ModelGuild;)I
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getMaxVideoChannelUsers()Ljava/lang/Integer;
+    move-result p2
 
-    move-result-object p2
+    move v9, p2
 
     goto :goto_1
 
     :cond_1
     const/4 p2, 0x0
 
+    const/4 v9, 0x0
+
     :goto_1
-    invoke-virtual {v1, v0, v2, p1, p2}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;->getJoinability(Lcom/discord/models/domain/ModelChannel;Ljava/util/Collection;Ljava/lang/Long;Ljava/lang/Integer;)Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    sget-object v4, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;->INSTANCE:Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;
+
+    invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v6
+
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getMaxVideoChannelUsers()Ljava/lang/Integer;
+
+    move-result-object p1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    :goto_2
+    move-object v8, p1
+
+    invoke-virtual/range {v4 .. v9}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;->getJoinability(Lcom/discord/models/domain/ModelChannel;Ljava/util/Collection;Ljava/lang/Long;Ljava/lang/Integer;I)Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     move-result-object p1
 
     return-object p1
 
-    :cond_2
+    :cond_3
     sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->CHANNEL_DOES_NOT_EXIST:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     return-object p1
 .end method
 
+.method private final getVerificationLevelTriggered(Lcom/discord/models/domain/ModelGuild;)I
+    .locals 10
+    .annotation runtime Lcom/discord/stores/StoreThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->stream:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getGuilds$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->stream:Lcom/discord/stores/StoreStream;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getVerificationLevel()I
+
+    move-result v2
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getMembers()Ljava/util/Map;
+
+    move-result-object v3
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+
+    move-result-object v1
+
+    const/4 v4, 0x0
+
+    if-eqz v1, :cond_0
+
+    if-eqz v3, :cond_0
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v5
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v5
+
+    invoke-interface {v3, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelGuildMember;
+
+    goto :goto_0
+
+    :cond_0
+    move-object v3, v4
+
+    :goto_0
+    const/4 v5, 0x1
+
+    const/4 v6, 0x0
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v7
+
+    invoke-virtual {p1, v7, v8}, Lcom/discord/models/domain/ModelGuild;->isOwner(J)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_1
+
+    const/4 v7, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v7, 0x0
+
+    :goto_1
+    if-eqz v3, :cond_2
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
+
+    move-result-object v3
+
+    invoke-interface {v3}, Ljava/util/List;->size()I
+
+    move-result v3
+
+    if-lez v3, :cond_2
+
+    const/4 v3, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v3, 0x0
+
+    :goto_2
+    if-eqz v1, :cond_3
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getPhone()Ljava/lang/String;
+
+    move-result-object v4
+
+    :cond_3
+    if-eqz v4, :cond_4
+
+    const/4 v4, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v4, 0x0
+
+    :goto_3
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsJoinedAt()Ljava/util/Map;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
+
+    move-result-wide v8
+
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Long;
+
+    if-nez v7, :cond_f
+
+    if-nez v3, :cond_f
+
+    if-eqz v4, :cond_5
+
+    goto :goto_6
+
+    :cond_5
+    if-eq v2, v5, :cond_c
+
+    const/4 v0, 0x2
+
+    if-eq v2, v0, :cond_9
+
+    const/4 v0, 0x3
+
+    if-eq v2, v0, :cond_7
+
+    const/4 p1, 0x4
+
+    if-eq v2, p1, :cond_6
+
+    return v6
+
+    :cond_6
+    return p1
+
+    :cond_7
+    if-eqz p1, :cond_8
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Lcom/discord/models/domain/ModelGuildMember;->isGuildMemberOldEnough(J)Z
+
+    move-result p1
+
+    if-nez p1, :cond_8
+
+    return v0
+
+    :cond_8
+    return v6
+
+    :cond_9
+    if-eqz v1, :cond_b
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isAccountOldEnough()Z
+
+    move-result p1
+
+    if-nez p1, :cond_a
+
+    goto :goto_4
+
+    :cond_a
+    return v6
+
+    :cond_b
+    :goto_4
+    return v0
+
+    :cond_c
+    if-eqz v1, :cond_e
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
+
+    move-result p1
+
+    if-nez p1, :cond_d
+
+    goto :goto_5
+
+    :cond_d
+    return v6
+
+    :cond_e
+    :goto_5
+    return v5
+
+    :cond_f
+    :goto_6
+    return v6
+.end method
+
 .method private final selectVoiceChannel(JZ)Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;
     .locals 11
     .annotation runtime Lcom/discord/stores/StoreThread;
@@ -621,7 +841,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/stores/StoreVoiceChannelSelected$get$1;-><init>(Lcom/discord/stores/StoreVoiceChannelSelected;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -631,7 +851,7 @@
 
     const-string v1, "id\n          .switchMap \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -722,7 +942,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getSessionId()Ljava/lang/String;
 
@@ -742,15 +964,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildMemberAdd(Lcom/discord/models/domain/ModelGuildMember;)V
@@ -758,14 +971,16 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "member"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -803,7 +1018,7 @@
     move-result-object v0
 
     :cond_1
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -813,13 +1028,6 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "member"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleGuildRemove()V
@@ -857,7 +1065,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
 
@@ -880,15 +1090,6 @@
     invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreVoiceChannelSelected;->selectVoiceChannel$default(Lcom/discord/stores/StoreVoiceChannelSelected;JZILjava/lang/Object;)Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleVoiceStateUpdates(Lcom/discord/models/domain/ModelVoice$State;)V
@@ -896,23 +1097,23 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "voiceState"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->stream:Lcom/discord/stores/StoreStream;
+    iget-object v0, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->stream:Lcom/discord/stores/StoreStream;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
 
@@ -920,14 +1121,19 @@
 
     move-result-object v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
 
     move-result-wide v1
 
     if-nez v0, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -938,7 +1144,7 @@
 
     if-eqz v0, :cond_2
 
-    :goto_0
+    :goto_1
     return-void
 
     :cond_2
@@ -952,7 +1158,7 @@
 
     iget-object v2, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->sessionId:Ljava/lang/String;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -964,7 +1170,7 @@
 
     if-nez v0, :cond_3
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_3
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -975,7 +1181,7 @@
 
     if-eqz v1, :cond_5
 
-    :goto_1
+    :goto_2
     if-eqz v0, :cond_4
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -984,12 +1190,12 @@
 
     invoke-direct {p0, v0, v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->selectVoiceChannel(JZ)Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clearInternal()V
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_5
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getSessionId()Ljava/lang/String;
@@ -998,7 +1204,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->sessionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1030,7 +1236,7 @@
 
     if-nez v0, :cond_6
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_6
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -1044,15 +1250,8 @@
     invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clearInternal()V
 
     :cond_7
-    :goto_2
+    :goto_3
     return-void
-
-    :cond_8
-    const-string p1, "voiceState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onDispatchEnded()V
@@ -1130,7 +1329,7 @@
 
     const-string p1, "resultSubject"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$VoiceUser.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$VoiceUser.smali
index e1269bbc51..e87cffe8ad 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$VoiceUser.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$VoiceUser.smali
@@ -60,9 +60,9 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZLcom/discord/stores/StoreVideoStreams$UserStreams;ZLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_f
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -121,6 +121,8 @@
 
     iget-object p2, p0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->streams:Lcom/discord/stores/StoreVideoStreams$UserStreams;
 
+    const/4 p4, 0x0
+
     if-eqz p2, :cond_2
 
     invoke-virtual {p2}, Lcom/discord/stores/StoreVideoStreams$UserStreams;->getCallStreamId()Ljava/lang/Integer;
@@ -130,7 +132,7 @@
     goto :goto_1
 
     :cond_2
-    move-object p2, v0
+    move-object p2, p4
 
     :goto_1
     iput-object p2, p0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->callStreamId:Ljava/lang/Integer;
@@ -146,7 +148,7 @@
     goto :goto_2
 
     :cond_3
-    move-object p2, v0
+    move-object p2, p4
 
     :goto_2
     iput-object p2, p0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->applicationStreamId:Ljava/lang/Integer;
@@ -157,10 +159,10 @@
 
     invoke-virtual {p2}, Lcom/discord/utilities/streams/StreamContext;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
 
-    move-result-object v0
+    move-result-object p4
 
     :cond_4
-    iput-object v0, p0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->applicationStream:Lcom/discord/models/domain/ModelApplicationStream;
+    iput-object p4, p0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->applicationStream:Lcom/discord/models/domain/ModelApplicationStream;
 
     iget-object p2, p0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
@@ -292,13 +294,6 @@
     iput-boolean p1, p0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->isDeafened:Z
 
     return-void
-
-    :cond_f
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final component10()Z
@@ -540,44 +535,37 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZLcom/discord/stores/StoreVideoStreams$UserStreams;ZLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Z)Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
     .locals 12
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
 
-    new-instance v11, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
+    move-object v2, p1
 
-    move-object v0, v11
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v1, p1
+    new-instance v0, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    move-object v2, p2
+    move-object v1, v0
 
-    move v3, p3
+    move-object v3, p2
 
-    move-object/from16 v4, p4
+    move v4, p3
 
-    move/from16 v5, p5
+    move-object/from16 v5, p4
 
-    move-object/from16 v6, p6
+    move/from16 v6, p5
 
-    move-object/from16 v7, p7
+    move-object/from16 v7, p6
 
-    move-object/from16 v8, p8
+    move-object/from16 v8, p7
 
-    move-object/from16 v9, p9
+    move-object/from16 v9, p8
 
-    move/from16 v10, p10
+    move-object/from16 v10, p9
 
-    invoke-direct/range {v0 .. v10}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZLcom/discord/stores/StoreVideoStreams$UserStreams;ZLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Z)V
+    move/from16 v11, p10
 
-    return-object v11
+    invoke-direct/range {v1 .. v11}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZLcom/discord/stores/StoreVideoStreams$UserStreams;ZLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Z)V
 
-    :cond_0
-    const-string v0, "user"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -595,7 +583,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -605,7 +593,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -621,7 +609,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->streams:Lcom/discord/stores/StoreVideoStreams$UserStreams;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -637,7 +625,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->nickname:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -647,7 +635,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->watchingStream:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -657,7 +645,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -667,7 +655,7 @@
 
     iget-object v1, p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -733,9 +721,9 @@
 
     move-result-object v0
 
-    const-string v1, "user.username"
+    const-string/jumbo v1, "user.username"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object v0
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali
index 9b66b90517..8ff3389be4 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$1.smali
@@ -27,7 +27,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$1.smali
index d595504178..9480dbde76 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelCall;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -93,7 +97,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$2.smali
index 0a8ddd2412..50f908766e 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2$2.smali
@@ -39,7 +39,40 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func8<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;",
+        "Ljava/util/Set<",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreVideoStreams$UserStreams;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Lcom/discord/stores/StoreApplicationStreaming$State;",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;>;"
     }
 .end annotation
 
@@ -96,7 +129,7 @@
 .end method
 
 .method public final call(Ljava/util/Map;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$State;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
-    .locals 12
+    .locals 13
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -135,86 +168,75 @@
 
     move-object v0, p0
 
-    if-eqz p3, :cond_0
-
     iget-object v1, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2$2;->this$0:Lcom/discord/stores/StoreVoiceParticipants$get$1$2;
 
     iget-object v1, v1, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->this$0:Lcom/discord/stores/StoreVoiceParticipants$get$1;
 
-    iget-object v1, v1, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants;
+    iget-object v2, v1, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants;
 
-    iget-object v2, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2$2;->$meUser:Lcom/discord/models/domain/ModelUser;
+    iget-object v3, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2$2;->$meUser:Lcom/discord/models/domain/ModelUser;
 
-    const-string v3, "meUser"
+    const-string v1, "meUser"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v3, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2$2;->$otherUsers:Ljava/util/Collection;
+    iget-object v4, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2$2;->$otherUsers:Ljava/util/Collection;
 
-    const-string v4, "otherUsers"
+    const-string v1, "otherUsers"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "voiceStates"
+    const-string/jumbo v1, "voiceStates"
 
     move-object v5, p1
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "speakingUsers"
+    const-string v1, "speakingUsers"
 
     move-object v6, p2
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "videoStreams"
+    const-string v1, "isRinging"
 
-    move-object/from16 v7, p4
+    move-object/from16 v7, p3
 
-    invoke-static {v7, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "guildMembers"
+    const-string/jumbo v1, "videoStreams"
 
-    move-object/from16 v8, p5
+    move-object/from16 v8, p4
 
-    invoke-static {v8, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "applicationStreamingState"
+    const-string v1, "guildMembers"
 
-    move-object/from16 v9, p6
+    move-object/from16 v9, p5
 
-    invoke-static {v9, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "voiceConfig"
+    const-string v1, "applicationStreamingState"
 
-    move-object/from16 v10, p7
+    move-object/from16 v10, p6
 
-    invoke-static {v10, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "streamContexts"
+    const-string/jumbo v1, "voiceConfig"
 
-    move-object/from16 v11, p8
+    move-object/from16 v11, p7
 
-    invoke-static {v11, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v4, p1
+    const-string v1, "streamContexts"
 
-    move-object v5, p2
+    move-object/from16 v12, p8
 
-    move-object v6, p3
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static/range {v1 .. v11}, Lcom/discord/stores/StoreVoiceParticipants;->access$create(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$State;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
+    invoke-static/range {v2 .. v12}, Lcom/discord/stores/StoreVoiceParticipants;->access$create(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$State;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v1
 
     return-object v1
-
-    :cond_0
-    const-string v1, "isRinging"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2.smali
index 3bf14a3ba8..62fbd3b230 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,22 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -83,6 +95,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ">;>;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
@@ -104,7 +117,7 @@
 
     const-string v3, "otherUsers"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Ljava/util/ArrayList;
 
@@ -148,7 +161,7 @@
     :cond_0
     const-string v4, "meUser"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -158,7 +171,7 @@
 
     move-result-object v4
 
-    invoke-static {v3, v4}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3, v4}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v3
 
@@ -204,7 +217,7 @@
 
     const-string v5, "stream\n                 \u2026                   .get()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v5, 0xfa
 
@@ -236,7 +249,7 @@
 
     sget-object v5, Lcom/discord/stores/StoreVoiceParticipants$get$1$2$1;->INSTANCE:Lcom/discord/stores/StoreVoiceParticipants$get$1$2$1;
 
-    invoke-virtual {v4, v5}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v4, v5}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v11
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali
index 7b85cba970..faf53d8983 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -73,6 +78,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
@@ -82,11 +88,11 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -108,7 +114,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -145,7 +151,7 @@
 
     invoke-direct {v3, p0, v0, v1, p1}, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;-><init>(Lcom/discord/stores/StoreVoiceParticipants$get$1;JLcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali
index fc6d77536e..bf0650af9c 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali
index e140cb2613..1a5a8dceb1 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -75,7 +82,7 @@
 
     const-string v0, "memberIds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali
index 876bddcb66..b487309cde 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali
index 5c45ceb339..27935da288 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -80,6 +87,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Collection<",
             "Lcom/discord/models/domain/ModelUser;",
             ">;>;"
@@ -94,7 +102,7 @@
 
     const-string v1, "otherMemberIds"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->observeUsers(Ljava/util/Collection;)Lrx/Observable;
 
@@ -102,7 +110,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1;->INSTANCE:Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali
index 03a45504f5..2785613389 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getOtherUsers$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -69,6 +73,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Collection<",
             "Lcom/discord/models/domain/ModelUser;",
             ">;>;"
@@ -89,7 +94,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -101,7 +106,7 @@
 
     sget-object v1, Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1;->INSTANCE:Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -109,13 +114,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$2;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3;->INSTANCE:Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1$3;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getStreamContextsForUsers$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getStreamContextsForUsers$1.smali
index 0af314cd3c..60e1f2b592 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getStreamContextsForUsers$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$getStreamContextsForUsers$1.smali
@@ -23,7 +23,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/FuncN<",
-        "TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;>;"
     }
 .end annotation
 
@@ -48,21 +52,21 @@
 .method public bridge synthetic call([Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreVoiceParticipants$getStreamContextsForUsers$1;->call([Ljava/lang/Object;)Ljava/util/LinkedHashMap;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreVoiceParticipants$getStreamContextsForUsers$1;->call([Ljava/lang/Object;)Ljava/util/Map;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final call([Ljava/lang/Object;)Ljava/util/LinkedHashMap;
+.method public final call([Ljava/lang/Object;)Ljava/util/Map;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "([",
             "Ljava/lang/Object;",
             ")",
-            "Ljava/util/LinkedHashMap<",
+            "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/utilities/streams/StreamContext;",
             ">;"
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali
index 63151564b7..9df02f65c0 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/StoreVoiceParticipants$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
index f63e820b3d..dac5794771 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
@@ -29,7 +29,9 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
@@ -48,15 +50,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants;->selectedParticipantSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$create(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Set;Ljava/util/Collection;Ljava/util/Map;Ljava/util/Map;Lcom/discord/stores/StoreApplicationStreaming$State;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
@@ -251,7 +244,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {v0}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -261,7 +254,7 @@
 
     new-instance v8, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-static {v11, v12}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v11, v12}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -281,7 +274,7 @@
 
     move-result v3
 
-    invoke-static {v11, v15}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v11, v15}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -291,7 +284,7 @@
 
     const/4 v5, 0x1
 
-    invoke-static {v11, v10}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v11, v10}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -491,7 +484,7 @@
     goto :goto_5
 
     :cond_6
-    invoke-static {v4}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v4}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -501,7 +494,7 @@
 
     new-instance v4, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-static {v3, v12}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v3, v12}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -521,7 +514,7 @@
 
     move-result v20
 
-    invoke-static {v3, v15}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v3, v15}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -531,7 +524,7 @@
 
     const/16 v22, 0x0
 
-    invoke-static {v3, v11}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v3, v11}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -555,7 +548,7 @@
     move-object/from16 v23, v16
 
     :goto_6
-    invoke-static {v3, v5}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v3, v5}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v6
 
@@ -655,15 +648,15 @@
 
     if-eq v0, v1, :cond_1
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(emptyList())"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -682,13 +675,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/stores/StoreVoiceParticipants$getOtherUsers$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string p1, "StoreStream\n            \u2026          }\n            }"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -697,13 +690,13 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(channel.recipients)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object v0
@@ -803,7 +796,7 @@
 
     const-string v1, "Observable\n        .comb\u2026}\n          map\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -837,13 +830,13 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreVoiceParticipants$get$1;-><init>(Lcom/discord/stores/StoreVoiceParticipants;J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n        .get\u2026  }\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -855,7 +848,7 @@
 
     const-string p2, "StoreStream\n        .get\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -875,7 +868,7 @@
 
     const-string v1, "selectedParticipantSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -887,7 +880,7 @@
 
     const-string v1, "selectedParticipantSubje\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -903,7 +896,9 @@
 .method public init(Landroid/content/Context;)V
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
@@ -919,6 +914,10 @@
 
     const-class v1, Lcom/discord/stores/StoreVoiceParticipants;
 
+    new-instance v6, Lcom/discord/stores/StoreVoiceParticipants$init$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/stores/StoreVoiceParticipants$init$1;-><init>(Lcom/discord/stores/StoreVoiceParticipants;)V
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -927,10 +926,6 @@
 
     const/4 v5, 0x0
 
-    new-instance v6, Lcom/discord/stores/StoreVoiceParticipants$init$1;
-
-    invoke-direct {v6, p0}, Lcom/discord/stores/StoreVoiceParticipants$init$1;-><init>(Lcom/discord/stores/StoreVoiceParticipants;)V
-
     const/16 v7, 0x1e
 
     const/4 v8, 0x0
@@ -938,15 +933,6 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final selectParticipant(Ljava/lang/Long;)V
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
index 002622cb86..3b33cf2edb 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
@@ -101,7 +101,7 @@
 
     sget-object v0, Lf/a/k/o;->d:Lf/a/k/o;
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -116,7 +116,7 @@
     return-object p0
 
     :cond_0
-    sget-object p0, Lr0/l/a/g;->e:Lrx/Observable;
+    sget-object p0, Ls0/l/a/g;->e:Lrx/Observable;
 
     return-object p0
 .end method
@@ -248,7 +248,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_4
     return-void
@@ -270,7 +270,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreVoiceSpeaking;->speakingUsersPublisher:Lrx/subjects/Subject;
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -298,7 +298,7 @@
 
     invoke-direct {v1, p1, p2}, Lf/a/k/q;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -330,7 +330,7 @@
 
     invoke-direct {p2, v0}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     return-void
@@ -353,7 +353,7 @@
 
     sget-object v0, Lf/a/k/r;->d:Lf/a/k/r;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -363,7 +363,7 @@
 
     const-class v1, Lcom/discord/stores/StoreVoiceSpeaking;
 
-    invoke-static {v0, v1}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v0, v1}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali
index 599592a6c4..a1eba88398 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;>;"
     }
 .end annotation
 
@@ -94,7 +104,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali
index 5c72b8d60a..fe48809c7a 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$1.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelVoice$State;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,28 +49,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelVoice$State;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreVoiceStates$get$2$1;->call(Lcom/discord/models/domain/ModelVoice$State;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelVoice$State;)Z
+.method public final call(Lcom/discord/models/domain/ModelVoice$State;)Ljava/lang/Boolean;
     .locals 4
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
@@ -102,5 +86,21 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelVoice$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreVoiceStates$get$2$1;->call(Lcom/discord/models/domain/ModelVoice$State;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali
index f8370df45f..f2273dc448 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2$2.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TK;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,32 +59,32 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelVoice$State;)J
+.method public final call(Lcom/discord/models/domain/ModelVoice$State;)Ljava/lang/Long;
     .locals 2
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelVoice$State;
-
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreVoiceStates$get$2$2;->call(Lcom/discord/models/domain/ModelVoice$State;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelVoice$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreVoiceStates$get$2$2;->call(Lcom/discord/models/domain/ModelVoice$State;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali
index ee50d7bbcc..4fd826f972 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates$get$2.smali
@@ -3,7 +3,7 @@
 .source "StoreVoiceStates.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -72,6 +80,7 @@
             "Lcom/discord/models/domain/ModelVoice$State;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelVoice$State;",
@@ -91,17 +100,17 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/StoreVoiceStates$get$2$1;-><init>(Lcom/discord/stores/StoreVoiceStates$get$2;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/stores/StoreVoiceStates$get$2$2;->INSTANCE:Lcom/discord/stores/StoreVoiceStates$get$2$2;
 
-    new-instance v1, Lr0/l/a/o0;
+    new-instance v1, Ls0/l/a/o0;
 
-    sget-object v2, Lr0/l/e/l;->d:Lr0/l/e/l;
+    sget-object v2, Ls0/l/e/l;->d:Ls0/l/e/l;
 
-    invoke-direct {v1, p1, v0, v2}, Lr0/l/a/o0;-><init>(Lrx/Observable;Lr0/k/b;Lr0/k/b;)V
+    invoke-direct {v1, p1, v0, v2}, Ls0/l/a/o0;-><init>(Lrx/Observable;Ls0/k/b;Ls0/k/b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
index b6527c4587..eb3797e3bb 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
@@ -74,7 +74,9 @@
 .method public constructor <init>(Lcom/discord/stores/StoreStream;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -111,15 +113,6 @@
     iput-object p1, p0, Lcom/discord/stores/StoreVoiceStates;->dirtyGuildIds:Ljava/util/HashSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final clear()V
@@ -185,7 +178,7 @@
 
     iget-object v4, p0, Lcom/discord/stores/StoreVoiceStates;->sessionId:Ljava/lang/String;
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -309,7 +302,7 @@
 
     check-cast v8, Lcom/discord/models/domain/ModelVoice$State;
 
-    invoke-static {p1, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v8
 
@@ -329,10 +322,6 @@
     const/4 v4, 0x0
 
     :goto_3
-    const-string p1, "(voiceStates[voiceStateG\u2026 = true\n        }\n      }"
-
-    invoke-static {v7, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-interface {v5, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     if-eqz v4, :cond_6
@@ -388,13 +377,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreVoiceStates$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string p2, "voiceStatesSubject\n     \u2026Id, ModelVoice.State>() }"
+    const-string/jumbo p2, "voiceStatesSubject\n     \u2026Id, ModelVoice.State>() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -404,9 +393,9 @@
 
     move-result-object p1
 
-    const-string p2, "voiceStatesSubject\n     \u2026  .distinctUntilChanged()"
+    const-string/jumbo p2, "voiceStatesSubject\n     \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -432,7 +421,7 @@
 
     invoke-direct {p2, p3, p4}, Lcom/discord/stores/StoreVoiceStates$get$2;-><init>(J)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -442,7 +431,7 @@
 
     const-string p2, "get(guildId)\n          .\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -487,7 +476,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getSessionId()Ljava/lang/String;
 
@@ -501,7 +492,7 @@
 
     const-string v1, "payload.me"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -521,7 +512,7 @@
 
     const-string v0, "payload.guilds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -542,7 +533,7 @@
 
     const-string v1, "guild"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getVoiceStates()Ljava/util/List;
 
@@ -567,9 +558,9 @@
 
     check-cast v2, Lcom/discord/models/domain/ModelVoice$State;
 
-    const-string v3, "voiceState"
+    const-string/jumbo v3, "voiceState"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -585,15 +576,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "payload"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildAdd(Lcom/discord/models/domain/ModelGuild;)V
@@ -601,7 +583,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getVoiceStates()Ljava/util/List;
 
@@ -626,9 +610,9 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelVoice$State;
 
-    const-string v2, "voiceState"
+    const-string/jumbo v2, "voiceState"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -644,15 +628,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleGuildRemove(Lcom/discord/models/domain/ModelGuild;)V
@@ -660,7 +635,9 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreVoiceStates;->voiceStates:Ljava/util/HashMap;
 
@@ -687,15 +664,6 @@
     invoke-virtual {v0, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;)V
@@ -703,22 +671,17 @@
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "voiceState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x2
 
     invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/stores/StoreVoiceStates;->updateVoiceState$default(Lcom/discord/stores/StoreVoiceStates;Lcom/discord/models/domain/ModelVoice$State;Ljava/lang/Long;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onDispatchEnded()V
@@ -838,7 +801,7 @@
 
     const-string v4, "it.key"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -846,7 +809,7 @@
 
     const-string v4, "it.value"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -857,9 +820,9 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreVoiceStates;->voiceStatesSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreVoiceStates;->dirtyGuildIds:Ljava/util/HashSet;
 
diff --git a/com.discord/smali/com/discord/stores/VoiceConfigurationCache$1.smali b/com.discord/smali/com/discord/stores/VoiceConfigurationCache$1.smali
index e044b4bd54..f59e455cc9 100644
--- a/com.discord/smali/com/discord/stores/VoiceConfigurationCache$1.smali
+++ b/com.discord/smali/com/discord/stores/VoiceConfigurationCache$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/VoiceConfigurationCache$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceConfigurationCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,9 +63,9 @@
 
     iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$1;->this$0:Lcom/discord/stores/VoiceConfigurationCache;
 
-    const-string v1, "voiceConfiguration"
+    const-string/jumbo v1, "voiceConfiguration"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/stores/VoiceConfigurationCache;->access$writeToSharedPreferences(Lcom/discord/stores/VoiceConfigurationCache;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
 
diff --git a/com.discord/smali/com/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1.smali b/com.discord/smali/com/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1.smali
index 78056511fa..6e8b0e4f1c 100644
--- a/com.discord/smali/com/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1.smali
+++ b/com.discord/smali/com/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceConfigurationCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,131 +65,133 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "editor"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
 
-    move-result v1
+    move-result v0
 
-    const-string v2, "CACHE_KEY_VOICE_SETTINGS_IS_MUTED"
+    const-string v1, "CACHE_KEY_VOICE_SETTINGS_IS_MUTED"
 
-    invoke-interface {p1, v2, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isDeafened()Z
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isDeafened()Z
 
-    move-result v1
+    move-result v0
 
-    const-string v2, "CACHE_KEY_VOICE_SETTINGS_IS_DEAFENED"
+    const-string v1, "CACHE_KEY_VOICE_SETTINGS_IS_DEAFENED"
 
-    invoke-interface {p1, v2, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
 
-    move-result v1
+    move-result v0
 
-    const-string v2, "CACHE_KEY_VOICE_SETTINGS_AUTOMATIC_VAD"
+    const-string v1, "CACHE_KEY_VOICE_SETTINGS_AUTOMATIC_VAD"
 
-    invoke-interface {p1, v2, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
 
-    move-result v1
+    move-result v0
 
-    const-string v2, "CACHE_KEY_VOICE_SETTINGS_AUTOMATIC_GAIN_CONTROL"
+    const-string v1, "CACHE_KEY_VOICE_SETTINGS_AUTOMATIC_GAIN_CONTROL"
 
-    invoke-interface {p1, v2, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+    sget-object v1, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-ne v1, v2, :cond_0
+    if-ne v0, v1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    const-string v2, "CACHE_KEY_VOICE_SETTINGS_NOISE_CANCELLATION"
+    const-string v1, "CACHE_KEY_VOICE_SETTINGS_NOISE_CANCELLATION"
 
-    invoke-interface {p1, v2, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getEchoCancellation()Z
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getEchoCancellation()Z
 
-    move-result v1
+    move-result v0
 
-    const-string v2, "CACHE_KEY_VOICE_SETTINGS_ECHO_CANCELLATION"
+    const-string v1, "CACHE_KEY_VOICE_SETTINGS_ECHO_CANCELLATION"
 
-    invoke-interface {p1, v2, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Suppression:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+    sget-object v1, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Suppression:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
 
-    if-ne v1, v2, :cond_1
+    if-ne v0, v1, :cond_1
 
     goto :goto_1
 
     :cond_1
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_1
-    const-string v1, "CACHE_KEY_VOICE_SETTINGS_NOISE_SUPPRESSION"
+    const-string v0, "CACHE_KEY_VOICE_SETTINGS_NOISE_SUPPRESSION"
 
-    invoke-interface {p1, v1, v3}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v0, v2}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getSensitivity()F
+
+    move-result v0
+
+    const-string v1, "CACHE_KEY_VOICE_SETTINGS_SENSITIVITY"
+
+    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putFloat(Ljava/lang/String;F)Landroid/content/SharedPreferences$Editor;
+
+    iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->this$0:Lcom/discord/stores/VoiceConfigurationCache;
+
+    invoke-static {v0}, Lcom/discord/stores/VoiceConfigurationCache;->access$getInputModeCache$p(Lcom/discord/stores/VoiceConfigurationCache;)Lcom/discord/utilities/persister/Persister;
+
+    move-result-object v0
 
     iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getSensitivity()F
-
-    move-result v1
-
-    const-string v2, "CACHE_KEY_VOICE_SETTINGS_SENSITIVITY"
-
-    invoke-interface {p1, v2, v1}, Landroid/content/SharedPreferences$Editor;->putFloat(Ljava/lang/String;F)Landroid/content/SharedPreferences$Editor;
-
-    iget-object v1, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->this$0:Lcom/discord/stores/VoiceConfigurationCache;
-
-    invoke-static {v1}, Lcom/discord/stores/VoiceConfigurationCache;->access$getInputModeCache$p(Lcom/discord/stores/VoiceConfigurationCache;)Lcom/discord/utilities/persister/Persister;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    const/4 v2, 0x2
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    const/4 v4, 0x0
 
-    move-result-object v2
-
-    const/4 v3, 0x2
-
-    invoke-static {v1, v2, v4, v3, v0}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1, v3, v2, v4}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache$writeToSharedPreferences$1;->$voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
@@ -202,11 +204,4 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putFloat(Ljava/lang/String;F)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_2
-    const-string p1, "editor"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/VoiceConfigurationCache.smali b/com.discord/smali/com/discord/stores/VoiceConfigurationCache.smali
index 152aee52f2..fd4899f5f9 100644
--- a/com.discord/smali/com/discord/stores/VoiceConfigurationCache.smali
+++ b/com.discord/smali/com/discord/stores/VoiceConfigurationCache.smali
@@ -85,7 +85,9 @@
 .method public constructor <init>(Landroid/content/SharedPreferences;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "sharedPreferences"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -97,21 +99,21 @@
 
     const-string v0, "PublishSubject.create()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/VoiceConfigurationCache;->voiceConfigSubject:Lrx/subjects/PublishSubject;
 
-    const-wide/16 v0, 0x12c
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v1, 0x12c
 
-    invoke-virtual {p1, v0, v1, v2}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-virtual {p1, v1, v2, v0}, Lrx/Observable;->o(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v0, "voiceConfigSubject\n     \u2026L, TimeUnit.MILLISECONDS)"
+    const-string/jumbo v0, "voiceConfigSubject\n     \u2026L, TimeUnit.MILLISECONDS)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -119,6 +121,10 @@
 
     const-class v2, Lcom/discord/stores/VoiceConfigurationCache;
 
+    new-instance v7, Lcom/discord/stores/VoiceConfigurationCache$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/stores/VoiceConfigurationCache$1;-><init>(Lcom/discord/stores/VoiceConfigurationCache;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -127,10 +133,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/stores/VoiceConfigurationCache$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/stores/VoiceConfigurationCache$1;-><init>(Lcom/discord/stores/VoiceConfigurationCache;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -148,15 +150,6 @@
     iput-object p1, p0, Lcom/discord/stores/VoiceConfigurationCache;->inputModeCache:Lcom/discord/utilities/persister/Persister;
 
     return-void
-
-    :cond_0
-    const-string p1, "sharedPreferences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getDEFAULT_VOICE_CONFIG$cp()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
@@ -429,7 +422,9 @@
 .method public final write(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "voiceConfiguration"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/VoiceConfigurationCache;->voiceConfigSubject:Lrx/subjects/PublishSubject;
 
@@ -438,13 +433,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceConfiguration"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/updates/ObservationDeck$Companion$ON_UPDATE_EMPTY$1.smali b/com.discord/smali/com/discord/stores/updates/ObservationDeck$Companion$ON_UPDATE_EMPTY$1.smali
index ec85d97dc9..0ddba7ce74 100644
--- a/com.discord/smali/com/discord/stores/updates/ObservationDeck$Companion$ON_UPDATE_EMPTY$1.smali
+++ b/com.discord/smali/com/discord/stores/updates/ObservationDeck$Companion$ON_UPDATE_EMPTY$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/updates/ObservationDeck$Companion$ON_UPDATE_EMPTY$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ObservationDeck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connect$observer$1.smali b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connect$observer$1.smali
index 99497d1c3a..bb2c861f8b 100644
--- a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connect$observer$1.smali
+++ b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connect$observer$1.smali
@@ -96,7 +96,7 @@
 .end method
 
 .method public setOnUpdate(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -106,18 +106,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/stores/updates/ObservationDeck$connect$observer$1;->onUpdate:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1$1.smali b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1$1.smali
index 4e21c37ace..bd4cb47855 100644
--- a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1$1.smali
+++ b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/updates/ObservationDeck$connectRx$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ObservationDeck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     sget-object v1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1.smali b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1.smali
index bad748c54d..888cdaffaf 100644
--- a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1.smali
+++ b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$1.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Lkotlin/Unit;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,21 +86,21 @@
 
     iget-boolean v2, p0, Lcom/discord/stores/updates/ObservationDeck$connectRx$1;->$updateOnConnect:Z
 
-    iget-object v3, p0, Lcom/discord/stores/updates/ObservationDeck$connectRx$1;->$updateSources:[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+    new-instance v3, Lcom/discord/stores/updates/ObservationDeck$connectRx$1$1;
 
-    array-length v4, v3
+    invoke-direct {v3, p1}, Lcom/discord/stores/updates/ObservationDeck$connectRx$1$1;-><init>(Lrx/Emitter;)V
 
-    invoke-static {v3, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    iget-object p1, p0, Lcom/discord/stores/updates/ObservationDeck$connectRx$1;->$updateSources:[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
 
-    move-result-object v3
+    array-length v4, p1
 
-    check-cast v3, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+    invoke-static {p1, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
-    new-instance v4, Lcom/discord/stores/updates/ObservationDeck$connectRx$1$1;
+    move-result-object p1
 
-    invoke-direct {v4, p1}, Lcom/discord/stores/updates/ObservationDeck$connectRx$1$1;-><init>(Lrx/Emitter;)V
+    check-cast p1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
 
-    invoke-virtual {v1, v3, v2, v4}, Lcom/discord/stores/updates/ObservationDeck;->connect([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLkotlin/jvm/functions/Function0;)Lcom/discord/stores/updates/ObservationDeck$Observer;
+    invoke-virtual {v1, p1, v2, v3}, Lcom/discord/stores/updates/ObservationDeck;->connect([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLkotlin/jvm/functions/Function0;)Lcom/discord/stores/updates/ObservationDeck$Observer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$3.smali b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$3.smali
index 60f0e77f1d..02b9daba38 100644
--- a/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$3.smali
+++ b/com.discord/smali/com/discord/stores/updates/ObservationDeck$connectRx$3.smali
@@ -3,7 +3,7 @@
 .source "ObservationDeck.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lkotlin/Unit;",
+        "TT;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/stores/updates/ObservationDeck.smali b/com.discord/smali/com/discord/stores/updates/ObservationDeck.smali
index 3e1194bd7d..4367749bdd 100644
--- a/com.discord/smali/com/discord/stores/updates/ObservationDeck.smali
+++ b/com.discord/smali/com/discord/stores/updates/ObservationDeck.smali
@@ -172,7 +172,7 @@
     :try_start_0
     const-string v0, "observer"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/updates/ObservationDeck;->observers:Ljava/util/Set;
 
@@ -193,16 +193,6 @@
 
     return-object p1
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -212,7 +202,7 @@
 .end method
 
 .method public final declared-synchronized connect([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLkotlin/jvm/functions/Function0;)Lcom/discord/stores/updates/ObservationDeck$Observer;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "([",
@@ -228,15 +218,13 @@
     monitor-enter p0
 
     :try_start_0
-    const-string v0, "updateSources"
+    const-string/jumbo v0, "updateSources"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "onUpdate"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/updates/ObservationDeck$connect$observer$1;
 
@@ -250,22 +238,6 @@
 
     return-object v0
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
-    :cond_1
-    :try_start_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
@@ -292,20 +264,20 @@
     monitor-enter p0
 
     :try_start_0
-    const-string v0, "updateSources"
+    const-string/jumbo v0, "updateSources"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "backpressureMode"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v0}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
+    const/4 v1, 0x0
+
     iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     new-instance v1, Lcom/discord/stores/updates/ObservationDeck$connectRx$1;
@@ -326,7 +298,7 @@
 
     const-string p2, "Observable.create<Unit>(\u2026rver?.let(::disconnect) }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -334,22 +306,6 @@
 
     return-object p1
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
-    :cond_1
-    :try_start_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
@@ -359,7 +315,7 @@
 .end method
 
 .method public final declared-synchronized connectRx([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLrx/Emitter$BackpressureMode;Lkotlin/jvm/functions/Function0;)Lrx/Observable;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -378,19 +334,17 @@
     monitor-enter p0
 
     :try_start_0
-    const-string v0, "updateSources"
+    const-string/jumbo v0, "updateSources"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "backpressureMode"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "generator"
 
-    if-eqz p4, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -408,13 +362,13 @@
 
     invoke-direct {p2, p4}, Lcom/discord/stores/updates/ObservationDeck$connectRx$3;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "connectRx(\n        *upda\u2026    ).map { generator() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -422,30 +376,6 @@
 
     return-object p1
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
-    :cond_1
-    :try_start_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw v1
-
-    :cond_2
-    :try_start_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw v1
-
     :catchall_0
     move-exception p1
 
@@ -462,7 +392,7 @@
     :try_start_0
     const-string v0, "observer"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/updates/ObservationDeck$Observer;->markStale()V
     :try_end_0
@@ -472,16 +402,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -505,9 +425,9 @@
     monitor-enter p0
 
     :try_start_0
-    const-string v0, "updates"
+    const-string/jumbo v0, "updates"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/stores/updates/ObservationDeck;->observers:Ljava/util/Set;
 
@@ -599,16 +519,6 @@
 
     return-void
 
-    :cond_6
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/stores/updates/ObservationDeckProvider$INSTANCE$2.smali b/com.discord/smali/com/discord/stores/updates/ObservationDeckProvider$INSTANCE$2.smali
index a8a0b43f28..5060d229fc 100644
--- a/com.discord/smali/com/discord/stores/updates/ObservationDeckProvider$INSTANCE$2.smali
+++ b/com.discord/smali/com/discord/stores/updates/ObservationDeckProvider$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/stores/updates/ObservationDeckProvider$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ObservationDeck.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/stores/updates/ObservationDeck;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/tooltips/DefaultTooltipCreator.smali b/com.discord/smali/com/discord/tooltips/DefaultTooltipCreator.smali
index fbeb5fc6f2..e7d9cd0b7e 100644
--- a/com.discord/smali/com/discord/tooltips/DefaultTooltipCreator.smali
+++ b/com.discord/smali/com/discord/tooltips/DefaultTooltipCreator.smali
@@ -9,22 +9,15 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/tooltips/TooltipManager;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "tooltipManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/tooltips/DefaultTooltipCreator;->a:Lcom/discord/tooltips/TooltipManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "tooltipManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/tooltips/TooltipManager$Tooltip.smali b/com.discord/smali/com/discord/tooltips/TooltipManager$Tooltip.smali
index 392d59f2b2..72e0ace6b7 100644
--- a/com.discord/smali/com/discord/tooltips/TooltipManager$Tooltip.smali
+++ b/com.discord/smali/com/discord/tooltips/TooltipManager$Tooltip.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "tooltipName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/tooltips/TooltipManager$Tooltip;->tooltipName:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "tooltipName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/tooltips/TooltipManager$a$a.smali b/com.discord/smali/com/discord/tooltips/TooltipManager$a$a.smali
index 2f0f64e93d..70e7ae98f5 100644
--- a/com.discord/smali/com/discord/tooltips/TooltipManager$a$a.smali
+++ b/com.discord/smali/com/discord/tooltips/TooltipManager$a$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/tooltips/TooltipManager$a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TooltipManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lf/a/l/a;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/tooltips/TooltipManager$a$b.smali b/com.discord/smali/com/discord/tooltips/TooltipManager$a$b.smali
index 6461fefc00..e55bbf114d 100644
--- a/com.discord/smali/com/discord/tooltips/TooltipManager$a$b.smali
+++ b/com.discord/smali/com/discord/tooltips/TooltipManager$a$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/tooltips/TooltipManager$a$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TooltipManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Set<",
         "Ljava/lang/String;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/tooltips/TooltipManager.smali b/com.discord/smali/com/discord/tooltips/TooltipManager.smali
index 5b7258ad52..367486f5be 100644
--- a/com.discord/smali/com/discord/tooltips/TooltipManager.smali
+++ b/com.discord/smali/com/discord/tooltips/TooltipManager.smali
@@ -52,13 +52,17 @@
     const/4 p3, 0x1
 
     :cond_0
-    const/4 p5, 0x0
+    const-string p5, "acknowledgedTooltipsCache"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string p5, "shownTooltipNames"
 
-    if-eqz p4, :cond_1
+    invoke-static {p2, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p5, "floatingViewManager"
+
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -77,37 +81,18 @@
     iput-object p1, p0, Lcom/discord/tooltips/TooltipManager;->a:Ljava/util/Map;
 
     return-void
-
-    :cond_1
-    const-string p1, "floatingViewManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_2
-    const-string p1, "shownTooltipNames"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_3
-    const-string p1, "acknowledgedTooltipsCache"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
 .end method
 
 
 # virtual methods
 .method public final a(Lcom/discord/tooltips/TooltipManager$Tooltip;)V
-    .locals 2
+    .locals 4
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "tooltip"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/tooltips/TooltipManager;->c(Lcom/discord/tooltips/TooltipManager$Tooltip;)V
 
@@ -115,23 +100,35 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_3
 
     iget-object v0, p0, Lcom/discord/tooltips/TooltipManager;->b:Lf/a/l/a;
 
-    iget-object v0, v0, Lf/a/l/a;->a:Landroid/content/SharedPreferences;
-
     const/4 v1, 0x0
 
-    invoke-interface {v0, p1, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+    if-eqz v0, :cond_2
+
+    const-string v2, "tooltipCacheKey"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, v0, Lf/a/l/a;->a:Landroid/content/SharedPreferences;
+
+    const/4 v3, 0x0
+
+    invoke-interface {v0, p1, v3}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
     move-result v0
 
-    if-nez v0, :cond_0
+    if-nez v0, :cond_1
 
     iget-object v0, p0, Lcom/discord/tooltips/TooltipManager;->b:Lf/a/l/a;
 
-    const/4 v1, 0x1
+    const/4 v3, 0x1
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, v0, Lf/a/l/a;->a:Landroid/content/SharedPreferences;
 
@@ -139,23 +136,26 @@
 
     move-result-object v0
 
-    invoke-interface {v0, p1, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0, p1, v3}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
     move-result-object p1
 
     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
 
+    goto :goto_0
+
     :cond_0
-    return-void
+    throw v1
 
     :cond_1
-    const-string p1, "tooltip"
+    :goto_0
+    return-void
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :cond_2
+    throw v1
 
-    const/4 p1, 0x0
-
-    throw p1
+    :cond_3
+    return-void
 .end method
 
 .method public final b(Lcom/discord/tooltips/TooltipManager$Tooltip;Z)Z
@@ -163,69 +163,69 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "tooltip"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/tooltips/TooltipManager$Tooltip;->getCacheKey()Ljava/lang/String;
 
     move-result-object v0
 
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v3, p0, Lcom/discord/tooltips/TooltipManager;->b:Lf/a/l/a;
+    iget-object v2, p0, Lcom/discord/tooltips/TooltipManager;->b:Lf/a/l/a;
 
-    iget-object v3, v3, Lf/a/l/a;->a:Landroid/content/SharedPreferences;
+    if-eqz v2, :cond_3
 
-    invoke-interface {v3, v0, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+    const-string v3, "tooltipCacheKey"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v2, Lf/a/l/a;->a:Landroid/content/SharedPreferences;
+
+    invoke-interface {v2, v0, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
     move-result v0
 
-    iget-object v3, p0, Lcom/discord/tooltips/TooltipManager;->c:Ljava/util/Set;
+    iget-object v2, p0, Lcom/discord/tooltips/TooltipManager;->c:Ljava/util/Set;
 
     invoke-virtual {p1}, Lcom/discord/tooltips/TooltipManager$Tooltip;->getTooltipName()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-interface {v3, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {v2, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
     move-result p1
 
-    iget-object v3, p0, Lcom/discord/tooltips/TooltipManager;->c:Ljava/util/Set;
+    iget-object v2, p0, Lcom/discord/tooltips/TooltipManager;->c:Ljava/util/Set;
 
-    invoke-interface {v3}, Ljava/util/Set;->size()I
+    invoke-interface {v2}, Ljava/util/Set;->size()I
 
-    move-result v3
+    move-result v2
 
-    if-nez v0, :cond_1
+    if-nez v0, :cond_2
 
-    if-nez p1, :cond_2
+    if-nez p1, :cond_1
 
-    if-nez p2, :cond_2
+    if-nez p2, :cond_1
 
     iget p1, p0, Lcom/discord/tooltips/TooltipManager;->d:I
 
-    if-ge v3, p1, :cond_1
-
-    goto :goto_0
+    if-ge v2, p1, :cond_2
 
     :cond_1
-    const/4 v1, 0x0
+    :goto_0
+    const/4 v1, 0x1
 
     :cond_2
-    :goto_0
     return v1
 
     :cond_3
-    const-string p1, "tooltip"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 p1, 0x0
 
     throw p1
@@ -236,7 +236,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "tooltip"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/tooltips/TooltipManager;->a:Ljava/util/Map;
 
@@ -262,19 +264,10 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "tooltip"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final d(Landroid/view/View;Landroid/view/View;Lcom/discord/tooltips/TooltipManager$Tooltip;Lcom/discord/floating_view_manager/FloatingViewGravity;IIZLrx/Observable;)V
-    .locals 14
+    .locals 15
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -294,48 +287,58 @@
 
     move-object v0, p0
 
-    move-object v8, p1
+    move-object/from16 v8, p1
 
     move-object/from16 v9, p2
 
     move-object/from16 v1, p3
 
-    move-object/from16 v10, p8
+    move-object/from16 v10, p4
 
-    const/4 v2, 0x0
+    move-object/from16 v11, p8
 
-    if-eqz v8, :cond_a
+    const-string v2, "anchorView"
 
-    if-eqz v9, :cond_9
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_8
+    const-string v3, "tooltipView"
 
-    if-eqz p4, :cond_7
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v10, :cond_6
+    const-string v3, "tooltip"
 
-    move/from16 v3, p7
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0, v1, v3}, Lcom/discord/tooltips/TooltipManager;->b(Lcom/discord/tooltips/TooltipManager$Tooltip;Z)Z
+    const-string v3, "tooltipGravity"
 
-    move-result v3
+    invoke-static {v10, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-nez v3, :cond_0
+    const-string v3, "componentPausedObservable"
+
+    invoke-static {v11, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move/from16 v4, p7
+
+    invoke-virtual {p0, v1, v4}, Lcom/discord/tooltips/TooltipManager;->b(Lcom/discord/tooltips/TooltipManager$Tooltip;Z)Z
+
+    move-result v4
+
+    if-nez v4, :cond_0
 
     return-void
 
     :cond_0
     invoke-virtual {p0, v1}, Lcom/discord/tooltips/TooltipManager;->c(Lcom/discord/tooltips/TooltipManager$Tooltip;)V
 
-    iget-object v3, v0, Lcom/discord/tooltips/TooltipManager;->c:Ljava/util/Set;
+    iget-object v4, v0, Lcom/discord/tooltips/TooltipManager;->c:Ljava/util/Set;
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/tooltips/TooltipManager$Tooltip;->getTooltipName()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v5
 
-    invoke-interface {v3, v4}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-interface {v4, v5}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    iget-object v3, v0, Lcom/discord/tooltips/TooltipManager;->a:Ljava/util/Map;
+    iget-object v4, v0, Lcom/discord/tooltips/TooltipManager;->a:Ljava/util/Map;
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/tooltips/TooltipManager$Tooltip;->getTooltipName()Ljava/lang/String;
 
@@ -343,33 +346,45 @@
 
     invoke-virtual/range {p2 .. p2}, Landroid/view/View;->getId()I
 
-    move-result v4
+    move-result v5
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v5
 
-    invoke-interface {v3, v1, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v1, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v11, v0, Lcom/discord/tooltips/TooltipManager;->e:Lf/a/c/a;
+    iget-object v12, v0, Lcom/discord/tooltips/TooltipManager;->e:Lf/a/c/a;
 
-    if-eqz v11, :cond_5
+    if-eqz v12, :cond_5
 
-    invoke-virtual {p1}, Landroid/view/View;->getRootView()Landroid/view/View;
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "floatingView"
+
+    invoke-static {v9, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "floatingViewGravity"
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v11, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getRootView()Landroid/view/View;
 
     move-result-object v1
 
     if-eqz v1, :cond_4
 
-    move-object v12, v1
+    move-object v13, v1
 
-    check-cast v12, Landroid/view/ViewGroup;
+    check-cast v13, Landroid/view/ViewGroup;
 
     const/4 v1, 0x4
 
     invoke-virtual {v9, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v1, v11, Lf/a/c/a;->a:Ljava/util/Map;
+    iget-object v1, v12, Lf/a/c/a;->a:Ljava/util/Map;
 
     invoke-virtual/range {p2 .. p2}, Landroid/view/View;->getId()I
 
@@ -385,7 +400,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {v12, v9}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
+    invoke-virtual {v13, v9}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
 
     :cond_1
     invoke-static/range {p2 .. p2}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
@@ -400,23 +415,23 @@
 
     if-nez v1, :cond_3
 
-    invoke-static {p1}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
+    invoke-static/range {p1 .. p1}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p1}, Landroid/view/View;->isLayoutRequested()Z
+    invoke-virtual/range {p1 .. p1}, Landroid/view/View;->isLayoutRequested()Z
 
     move-result v1
 
     if-nez v1, :cond_2
 
-    move-object v1, v11
+    move-object v1, v12
 
     move-object/from16 v2, p2
 
-    move-object v3, p1
+    move-object/from16 v3, p1
 
     move-object/from16 v4, p4
 
@@ -433,13 +448,13 @@
     goto :goto_0
 
     :cond_2
-    new-instance v13, Lf/a/c/c;
+    new-instance v14, Lf/a/c/c;
 
-    move-object v1, v13
+    move-object v1, v14
 
-    move-object v2, v11
+    move-object v2, v12
 
-    move-object v3, p1
+    move-object/from16 v3, p1
 
     move-object/from16 v4, p2
 
@@ -451,18 +466,18 @@
 
     invoke-direct/range {v1 .. v7}, Lf/a/c/c;-><init>(Lf/a/c/a;Landroid/view/View;Landroid/view/View;Lcom/discord/floating_view_manager/FloatingViewGravity;II)V
 
-    invoke-virtual {p1, v13}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
+    invoke-virtual {v8, v14}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
     goto :goto_0
 
     :cond_3
-    new-instance v13, Lf/a/c/b;
+    new-instance v14, Lf/a/c/b;
 
-    move-object v1, v13
+    move-object v1, v14
 
-    move-object v2, v11
+    move-object v2, v12
 
-    move-object v3, p1
+    move-object/from16 v3, p1
 
     move-object/from16 v4, p2
 
@@ -474,18 +489,18 @@
 
     invoke-direct/range {v1 .. v7}, Lf/a/c/b;-><init>(Lf/a/c/a;Landroid/view/View;Landroid/view/View;Lcom/discord/floating_view_manager/FloatingViewGravity;II)V
 
-    invoke-virtual {v9, v13}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
+    invoke-virtual {v9, v14}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
     :goto_0
-    new-instance v13, Lf/a/c/f;
+    new-instance v14, Lf/a/c/f;
 
-    move-object v1, v13
+    move-object v1, v14
 
-    move-object v2, v11
+    move-object v2, v12
 
     move-object/from16 v3, p2
 
-    move-object v4, p1
+    move-object/from16 v4, p1
 
     move-object/from16 v5, p4
 
@@ -495,13 +510,13 @@
 
     invoke-direct/range {v1 .. v7}, Lf/a/c/f;-><init>(Lf/a/c/a;Landroid/view/View;Landroid/view/View;Lcom/discord/floating_view_manager/FloatingViewGravity;II)V
 
-    invoke-virtual {v12}, Landroid/view/ViewGroup;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
+    invoke-virtual {v13}, Landroid/view/ViewGroup;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
 
     move-result-object v1
 
-    invoke-virtual {v1, v13}, Landroid/view/ViewTreeObserver;->addOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
+    invoke-virtual {v1, v14}, Landroid/view/ViewTreeObserver;->addOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
 
-    iget-object v1, v11, Lf/a/c/a;->a:Ljava/util/Map;
+    iget-object v1, v12, Lf/a/c/a;->a:Ljava/util/Map;
 
     invoke-virtual/range {p2 .. p2}, Landroid/view/View;->getId()I
 
@@ -513,72 +528,39 @@
 
     new-instance v3, Lf/a/c/a$a;
 
-    invoke-direct {v3, v9, v12, v13}, Lf/a/c/a$a;-><init>(Landroid/view/View;Landroid/view/ViewGroup;Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
+    invoke-direct {v3, v9, v13, v14}, Lf/a/c/a$a;-><init>(Landroid/view/View;Landroid/view/ViewGroup;Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
 
     invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const/4 v1, 0x1
 
-    invoke-virtual {v10, v1}, Lrx/Observable;->V(I)Lrx/Observable;
+    invoke-virtual {v11, v1}, Lrx/Observable;->V(I)Lrx/Observable;
 
     move-result-object v1
 
     new-instance v2, Lf/a/c/d;
 
-    invoke-direct {v2, v11, v9}, Lf/a/c/d;-><init>(Lf/a/c/a;Landroid/view/View;)V
+    invoke-direct {v2, v12, v9}, Lf/a/c/d;-><init>(Lf/a/c/a;Landroid/view/View;)V
 
     new-instance v3, Lf/a/c/e;
 
-    invoke-direct {v3, v11}, Lf/a/c/e;-><init>(Lf/a/c/a;)V
+    invoke-direct {v3, v12}, Lf/a/c/e;-><init>(Lf/a/c/a;)V
 
     invoke-virtual {v1, v2, v3}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
 
     :cond_4
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type android.view.ViewGroup"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 
     :cond_5
-    throw v2
+    const/4 v1, 0x0
 
-    :cond_6
-    const-string v1, "componentPausedObservable"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_7
-    const-string v1, "tooltipGravity"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_8
-    const-string v1, "tooltip"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_9
-    const-string v1, "tooltipView"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_a
-    const-string v1, "anchorView"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    throw v1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/ChannelShortcutInfo.smali b/com.discord/smali/com/discord/utilities/ChannelShortcutInfo.smali
index 8e98293bca..127bf02d4d 100644
--- a/com.discord/smali/com/discord/utilities/ChannelShortcutInfo.smali
+++ b/com.discord/smali/com/discord/utilities/ChannelShortcutInfo.smali
@@ -13,9 +13,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;IZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,15 +28,6 @@
     iput-boolean p3, p0, Lcom/discord/utilities/ChannelShortcutInfo;->isPinnedOnly:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/ChannelShortcutInfo;Lcom/discord/models/domain/ModelChannel;IZILjava/lang/Object;)Lcom/discord/utilities/ChannelShortcutInfo;
@@ -97,22 +90,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;IZ)Lcom/discord/utilities/ChannelShortcutInfo;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/ChannelShortcutInfo;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/ChannelShortcutInfo;-><init>(Lcom/discord/models/domain/ModelChannel;IZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -130,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/ChannelShortcutInfo;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$SharedContent.smali b/com.discord/smali/com/discord/utilities/ShareUtils$SharedContent.smali
index 9acf75b9d1..3d3ed2201e 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$SharedContent.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$SharedContent.smali
@@ -137,7 +137,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/ShareUtils$SharedContent;->text:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -147,7 +147,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/ShareUtils$SharedContent;->uris:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$1.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$1.smali
index 04073b2322..9d3f04eba8 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$1.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$1.smali
@@ -3,7 +3,7 @@
 .source "ShareUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/ChannelShortcutInfo;",
+        ">;>;"
     }
 .end annotation
 
@@ -86,7 +93,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$2.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$2.smali
index 4e43e01efb..ec4162c1d2 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$2.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$2.smali
@@ -3,7 +3,7 @@
 .source "ShareUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
         "+",
@@ -63,23 +63,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$2;->call(Ljava/util/Map;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Map;)Z
+.method public final call(Ljava/util/Map;)Ljava/lang/Boolean;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,13 +72,14 @@
             "Ljava/lang/Long;",
             "+",
             "Lcom/discord/models/domain/ModelChannel;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map;->isEmpty()Z
 
@@ -102,5 +87,21 @@
 
     xor-int/lit8 p1, p1, 0x1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$2;->call(Ljava/util/Map;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$1.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$1.smali
index 6b77e02ca5..f6bef24156 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$1.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShareUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/pm/ShortcutInfo;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/pm/ShortcutInfo;->isPinned()Z
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$2.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$2.smali
index cb0985518d..c1cae8205e 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$2.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShareUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/pm/ShortcutInfo;",
         "Ljava/lang/Long;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
     const-string v0, "shortcutInfoCompat"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/pm/ShortcutInfo;->getId()Ljava/lang/String;
 
@@ -69,7 +69,7 @@
 
     const-string v0, "shortcutInfoCompat.id"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$3.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$3.smali
index 6892308ed3..628491cfee 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$3.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShareUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$4.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$4.smali
index 7902940d5e..6c1df0bfd6 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$4.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShareUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lcom/discord/models/domain/ModelChannel;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$5.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$5.smali
index ca27bb6607..768fc7f823 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$5.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$3$pinnedOnlyShortcutChannels$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShareUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/utilities/ChannelShortcutInfo;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/utilities/ChannelShortcutInfo;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/ChannelShortcutInfo;
 
@@ -70,15 +72,6 @@
     invoke-direct {v0, p1, v1, v2}, Lcom/discord/utilities/ChannelShortcutInfo;-><init>(Lcom/discord/models/domain/ModelChannel;IZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.smali
index 4667a2f123..63f60aeb6b 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.smali
@@ -27,7 +27,23 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/ChannelShortcutInfo;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/utilities/ChannelShortcutInfo;",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -86,7 +102,7 @@
 
     const-string v0, "directShareChannels"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -132,7 +148,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v0}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v0}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v0
 
@@ -163,14 +179,10 @@
     goto :goto_1
 
     :cond_1
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v2, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_1
-    const-string v3, "(context.getSystemServic\u2026Shortcuts ?: emptyList())"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v2}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v2
 
@@ -211,9 +223,17 @@
     goto :goto_2
 
     :cond_2
-    sget-object p2, Lj0/s/f;->a:Lj0/s/f;
+    sget-object p2, Lk0/t/f;->a:Lk0/t/f;
 
     :goto_2
+    const-string v0, "$this$plus"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "elements"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-interface {p1}, Ljava/util/Collection;->size()I
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$2.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$2.smali
index 842c4fd228..9c653e96b6 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$2.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$2.smali
@@ -3,7 +3,7 @@
 .source "ShareUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;",
+        "Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;",
+        ">;"
     }
 .end annotation
 
@@ -52,7 +54,7 @@
 
     const-string v0, "iconBitmaps"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$3.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$3.smali
index 147e5176ef..7db67472cc 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$3.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4$3.smali
@@ -3,7 +3,7 @@
 .source "ShareUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/utilities/ChannelShortcutInfo;",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;+",
+        "Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.smali
index 92f02ce9c4..a60dec1b03 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.smali
@@ -3,7 +3,7 @@
 .source "ShareUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,29 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/utilities/ChannelShortcutInfo;",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/utilities/ChannelShortcutInfo;",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;+",
+        "Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -76,6 +95,7 @@
             "Ljava/lang/String;",
             ">;>;)",
             "Lrx/Observable<",
+            "+",
             "Lkotlin/Pair<",
             "Ljava/util/List<",
             "Lkotlin/Pair<",
@@ -93,7 +113,7 @@
 
     const-string v1, "channelAndIconUriPairs"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -137,7 +157,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$4$2;-><init>(Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$4;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -145,7 +165,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$4$3;-><init>(Ljava/util/List;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$5.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$5.smali
index 339136f801..82fbdb1b38 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$5.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShareUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -99,7 +99,7 @@
     :try_start_0
     const-string v2, "channelAndIconUriPairs"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/util/LinkedHashMap;
 
@@ -203,7 +203,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_1
     check-cast v0, Ljava/util/List;
@@ -219,7 +219,7 @@
     goto :goto_2
 
     :cond_3
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v2, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_2
     check-cast v2, Ljava/util/List;
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$6.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$6.smali
index be1d23c9eb..a486188a22 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$6.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$6.smali
@@ -3,7 +3,7 @@
 .source "ShareUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
         "+",
@@ -63,23 +63,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$6;->call(Ljava/util/Map;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Map;)Z
+.method public final call(Ljava/util/Map;)Ljava/lang/Boolean;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,13 +72,14 @@
             "Ljava/lang/Long;",
             "+",
             "Lcom/discord/models/domain/ModelChannel;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map;->isEmpty()Z
 
@@ -102,5 +87,21 @@
 
     xor-int/lit8 p1, p1, 0x1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$6;->call(Ljava/util/Map;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$7.smali b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$7.smali
index 96c723af1a..0efacf40f7 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$7.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils$updateDirectShareTargets$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShareUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -92,13 +92,9 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
-    const-string v1, "(shortcutManager?.dynamicShortcuts ?: emptyList())"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     new-instance v1, Ljava/util/ArrayList;
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
@@ -125,7 +121,7 @@
 
     check-cast v4, Landroid/content/pm/ShortcutInfo;
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/content/pm/ShortcutInfo;->isPinned()Z
 
@@ -139,7 +135,7 @@
 
     const-string v4, "it.id"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
@@ -197,7 +193,7 @@
 
     check-cast v1, Landroid/content/pm/ShortcutInfo;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/pm/ShortcutInfo;->getId()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/ShareUtils.smali b/com.discord/smali/com/discord/utilities/ShareUtils.smali
index 26754fc693..bd970ba70a 100644
--- a/com.discord/smali/com/discord/utilities/ShareUtils.smali
+++ b/com.discord/smali/com/discord/utilities/ShareUtils.smali
@@ -119,9 +119,9 @@
 
     move-result-object p2
 
-    sget-object p3, Lf/a/b/t0/a;->b:Lf/a/b/t0/a;
+    sget-object p3, Lf/a/b/v0/a;->b:Lf/a/b/v0/a;
 
-    sget-object p3, Lf/a/b/t0/a;->a:Ljava/util/Set;
+    sget-object p3, Lf/a/b/v0/a;->a:Ljava/util/Set;
 
     invoke-virtual {p2, p3}, Landroidx/core/content/pm/ShortcutInfoCompat$Builder;->setCategories(Ljava/util/Set;)Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
 
@@ -133,7 +133,7 @@
 
     const-string p3, "recipients"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Ljava/util/ArrayList;
 
@@ -164,7 +164,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p4}, Lcom/discord/models/ktx/ModelUserExtensionsKt;->toPerson(Lcom/discord/models/domain/ModelUser;)Landroidx/core/app/Person;
 
@@ -197,16 +197,16 @@
 
     const-string p2, "ShortcutInfoCompat.Build\u2026ray())\n          .build()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -216,93 +216,95 @@
 .method public final getSharedContent(Landroid/content/Intent;Z)Lcom/discord/utilities/ShareUtils$SharedContent;
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "android.intent.extra.TEXT"
+    const-string v0, "android.intent.extra.TEXT"
 
-    invoke-virtual {p1, v1}, Landroid/content/Intent;->getCharSequenceExtra(Ljava/lang/String;)Ljava/lang/CharSequence;
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getCharSequenceExtra(Ljava/lang/String;)Ljava/lang/CharSequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "android.intent.extra.SUBJECT"
+    const-string v2, "android.intent.extra.SUBJECT"
 
-    invoke-virtual {p1, v3}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v2}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-static {v2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
-    move-result v7
+    move-result v6
 
-    if-eqz v7, :cond_0
+    if-eqz v6, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     :goto_1
-    if-nez v7, :cond_2
+    const/4 v7, 0x0
+
+    if-nez v6, :cond_2
 
     goto :goto_4
 
     :cond_2
-    if-eqz v4, :cond_4
+    if-eqz v3, :cond_4
 
-    invoke-static {v4}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
     goto :goto_2
 
     :cond_3
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_3
 
     :cond_4
     :goto_2
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :goto_3
-    if-nez v2, :cond_5
+    if-nez v1, :cond_5
 
-    move-object v2, v4
+    move-object v1, v3
 
     goto :goto_4
 
     :cond_5
-    move-object v2, v0
+    move-object v1, v7
 
     :goto_4
     invoke-virtual {p1}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    const-string v7, "android.intent.extra.STREAM"
+    const-string v6, "android.intent.extra.STREAM"
 
-    if-nez v4, :cond_6
+    if-nez v3, :cond_6
 
     goto :goto_5
 
     :cond_6
-    invoke-virtual {v4}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {v3}, Ljava/lang/String;->hashCode()I
 
     move-result v8
 
@@ -310,81 +312,76 @@
 
     if-eq v8, v9, :cond_8
 
-    const v5, -0x37c67be
+    const v4, -0x37c67be
 
-    if-eq v8, v5, :cond_7
+    if-eq v8, v4, :cond_7
 
     goto :goto_5
 
     :cond_7
-    const-string v5, "android.intent.action.SEND_MULTIPLE"
+    const-string v4, "android.intent.action.SEND_MULTIPLE"
 
-    invoke-virtual {v4, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_9
+    if-eqz v3, :cond_9
 
-    invoke-virtual {p1, v7}, Landroid/content/Intent;->getParcelableArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList;
+    invoke-virtual {p1, v6}, Landroid/content/Intent;->getParcelableArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList;
 
-    move-result-object v0
+    move-result-object v7
 
     goto :goto_5
 
     :cond_8
     const-string v8, "android.intent.action.SEND"
 
-    invoke-virtual {v4, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v3, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_9
+    if-eqz v3, :cond_9
 
-    invoke-virtual {p1, v7}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
+    invoke-virtual {p1, v6}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
 
-    move-result-object v4
+    move-result-object v3
 
-    check-cast v4, Landroid/net/Uri;
+    check-cast v3, Landroid/net/Uri;
 
-    if-eqz v4, :cond_9
+    if-eqz v3, :cond_9
 
-    new-array v0, v6, [Landroid/net/Uri;
+    new-array v5, v5, [Landroid/net/Uri;
 
-    aput-object v4, v0, v5
+    aput-object v3, v5, v4
 
-    invoke-static {v0}, Lf/n/a/k/a;->arrayListOf([Ljava/lang/Object;)Ljava/util/ArrayList;
+    invoke-static {v5}, Lf/n/a/k/a;->arrayListOf([Ljava/lang/Object;)Ljava/util/ArrayList;
 
-    move-result-object v0
+    move-result-object v7
 
     :cond_9
     :goto_5
     if-eqz p2, :cond_a
 
-    invoke-virtual {p1, v1}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
-    invoke-virtual {p1, v3}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+    invoke-virtual {p1, v2}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
-    invoke-virtual {p1, v7}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+    invoke-virtual {p1, v6}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
     :cond_a
     new-instance p1, Lcom/discord/utilities/ShareUtils$SharedContent;
 
-    invoke-direct {p1, v2, v0}, Lcom/discord/utilities/ShareUtils$SharedContent;-><init>(Ljava/lang/CharSequence;Ljava/util/List;)V
+    invoke-direct {p1, v1, v7}, Lcom/discord/utilities/ShareUtils$SharedContent;-><init>(Ljava/lang/CharSequence;Ljava/util/List;)V
 
     return-object p1
-
-    :cond_b
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final updateDirectShareTargets(Landroid/content/Context;)V
     .locals 11
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x48
 
@@ -422,7 +419,7 @@
 
     sget-object v3, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$1;->INSTANCE:Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$1;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -438,13 +435,13 @@
 
     sget-object v4, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$2;->INSTANCE:Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$2;
 
-    invoke-virtual {v3, v4}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v3, v4}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v5
 
     const-string v3, "StoreStream\n            \u2026ilter { it.isNotEmpty() }"
 
-    invoke-static {v5, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v6, 0x0
 
@@ -468,7 +465,7 @@
 
     const-string v3, "Observable.combineLatest\u2026o to icon }\n      }\n    }"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -478,13 +475,13 @@
 
     invoke-direct {v3, v0, v1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$4;-><init>(II)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable.combineLatest\u2026riPairs to it }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -492,16 +489,16 @@
 
     const-class v3, Lcom/discord/utilities/ShareUtils;
 
+    new-instance v8, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$5;
+
+    invoke-direct {v8, p1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$5;-><init>(Landroid/content/Context;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$5;
-
-    invoke-direct {v8, p1}, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$5;-><init>(Landroid/content/Context;)V
-
     const/16 v9, 0x1c
 
     move-object v4, p1
@@ -534,13 +531,13 @@
 
     sget-object v2, Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$6;->INSTANCE:Lcom/discord/utilities/ShareUtils$updateDirectShareTargets$6;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
     const-string v1, "StoreStream.getChannels(\u2026ilter { it.isNotEmpty() }"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v4, 0x0
 
@@ -580,13 +577,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali b/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
index b444a9c652..db5730ece2 100644
--- a/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
@@ -76,7 +76,7 @@
     return-wide p0
 .end method
 
-.method public static synthetic timestampPart$annotations(J)V
+.method public static synthetic getTimestampPart$annotations(J)V
     .locals 0
 
     return-void
diff --git a/com.discord/smali/com/discord/utilities/SystemLogUtils$Tombstone.smali b/com.discord/smali/com/discord/utilities/SystemLogUtils$Tombstone.smali
new file mode 100644
index 0000000000..4584d3ebfb
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/SystemLogUtils$Tombstone.smali
@@ -0,0 +1,297 @@
+.class public final Lcom/discord/utilities/SystemLogUtils$Tombstone;
+.super Ljava/lang/Object;
+.source "SystemLogUtils.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/SystemLogUtils;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Tombstone"
+.end annotation
+
+
+# instance fields
+.field public final groupBy:Ljava/lang/String;
+
+.field public final origin:Ljava/lang/String;
+
+.field public final text:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "groupBy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "origin"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    iput-object p3, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/utilities/SystemLogUtils$Tombstone;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/utilities/SystemLogUtils$Tombstone;
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x1
+
+    if-eqz p5, :cond_0
+
+    iget-object p1, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    iget-object p2, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-object p3, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/SystemLogUtils$Tombstone;->copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/utilities/SystemLogUtils$Tombstone;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/utilities/SystemLogUtils$Tombstone;
+    .locals 1
+
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "groupBy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "origin"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/utilities/SystemLogUtils$Tombstone;
+
+    invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/SystemLogUtils$Tombstone;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/utilities/SystemLogUtils$Tombstone;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/utilities/SystemLogUtils$Tombstone;
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    iget-object v1, p1, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    iget-object v1, p1, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    iget-object p1, p1, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getGroupBy()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getOrigin()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getText()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_2
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "Tombstone(text="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->text:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", groupBy="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->groupBy:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", origin="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/utilities/SystemLogUtils$Tombstone;->origin:Ljava/lang/String;
+
+    const-string v2, ")"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/SystemLogUtils$fetch$1.smali b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetch$1.smali
new file mode 100644
index 0000000000..3396d463cf
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetch$1.smali
@@ -0,0 +1,113 @@
+.class public final Lcom/discord/utilities/SystemLogUtils$fetch$1;
+.super Ljava/lang/Object;
+.source "SystemLogUtils.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/SystemLogUtils;->fetch()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/util/LinkedList<",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/SystemLogUtils$fetch$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/SystemLogUtils$fetch$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/SystemLogUtils$fetch$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/SystemLogUtils$fetch$1;->INSTANCE:Lcom/discord/utilities/SystemLogUtils$fetch$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/LinkedList;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/SystemLogUtils$fetch$1;->call(Ljava/util/LinkedList;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/util/LinkedList;)Ljava/lang/String;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/LinkedList<",
+            "Ljava/lang/String;",
+            ">;)",
+            "Ljava/lang/String;"
+        }
+    .end annotation
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "\n"
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x3e
+
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v8}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/SystemLogUtils$fetch$2.smali b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetch$2.smali
new file mode 100644
index 0000000000..34345c44b0
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetch$2.smali
@@ -0,0 +1,198 @@
+.class public final Lcom/discord/utilities/SystemLogUtils$fetch$2;
+.super Ljava/lang/Object;
+.source "SystemLogUtils.kt"
+
+# interfaces
+.implements Ljava/util/concurrent/Callable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/SystemLogUtils;->fetch(Lkotlin/text/Regex;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/concurrent/Callable<",
+        "Ljava/util/LinkedList<",
+        "Ljava/lang/String;",
+        ">;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $filter:Lkotlin/text/Regex;
+
+.field public final synthetic $output:Ljava/util/LinkedList;
+
+.field public final synthetic $systemLogPath:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Ljava/util/LinkedList;Lkotlin/text/Regex;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/SystemLogUtils$fetch$2;->$systemLogPath:Ljava/lang/String;
+
+    iput-object p2, p0, Lcom/discord/utilities/SystemLogUtils$fetch$2;->$output:Ljava/util/LinkedList;
+
+    iput-object p3, p0, Lcom/discord/utilities/SystemLogUtils$fetch$2;->$filter:Lkotlin/text/Regex;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/SystemLogUtils$fetch$2;->call()Ljava/util/LinkedList;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final call()Ljava/util/LinkedList;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/LinkedList<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    new-instance v1, Ljava/lang/ProcessBuilder;
+
+    const/4 v2, 0x2
+
+    new-array v2, v2, [Ljava/lang/String;
+
+    const/4 v3, 0x0
+
+    iget-object v4, p0, Lcom/discord/utilities/SystemLogUtils$fetch$2;->$systemLogPath:Ljava/lang/String;
+
+    aput-object v4, v2, v3
+
+    const-string v3, "-d"
+
+    const/4 v4, 0x1
+
+    aput-object v3, v2, v4
+
+    invoke-direct {v1, v2}, Ljava/lang/ProcessBuilder;-><init>([Ljava/lang/String;)V
+
+    invoke-virtual {v1, v4}, Ljava/lang/ProcessBuilder;->redirectErrorStream(Z)Ljava/lang/ProcessBuilder;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/ProcessBuilder;->start()Ljava/lang/Process;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/utilities/SystemLogUtils;->INSTANCE:Lcom/discord/utilities/SystemLogUtils;
+
+    const-string v2, "logcatProccess"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1, v0}, Lcom/discord/utilities/SystemLogUtils;->access$waitFor(Lcom/discord/utilities/SystemLogUtils;Ljava/lang/Process;)V
+
+    invoke-virtual {v0}, Ljava/lang/Process;->getInputStream()Ljava/io/InputStream;
+
+    move-result-object v1
+
+    const-string v2, "logcatProccess.inputStream"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    new-instance v3, Ljava/io/InputStreamReader;
+
+    invoke-direct {v3, v1, v2}, Ljava/io/InputStreamReader;-><init>(Ljava/io/InputStream;Ljava/nio/charset/Charset;)V
+
+    const/16 v1, 0x2000
+
+    instance-of v2, v3, Ljava/io/BufferedReader;
+
+    if-eqz v2, :cond_0
+
+    check-cast v3, Ljava/io/BufferedReader;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v2, Ljava/io/BufferedReader;
+
+    invoke-direct {v2, v3, v1}, Ljava/io/BufferedReader;-><init>(Ljava/io/Reader;I)V
+
+    move-object v3, v2
+
+    :goto_0
+    sget-object v1, Lcom/discord/utilities/SystemLogUtils;->INSTANCE:Lcom/discord/utilities/SystemLogUtils;
+
+    iget-object v2, p0, Lcom/discord/utilities/SystemLogUtils$fetch$2;->$output:Ljava/util/LinkedList;
+
+    iget-object v4, p0, Lcom/discord/utilities/SystemLogUtils$fetch$2;->$filter:Lkotlin/text/Regex;
+
+    invoke-virtual {v1, v3, v2, v4}, Lcom/discord/utilities/SystemLogUtils;->processLogs$app_productionDiscordExternalRelease(Ljava/io/BufferedReader;Ljava/util/LinkedList;Lkotlin/text/Regex;)V
+
+    invoke-virtual {v3}, Ljava/io/BufferedReader;->close()V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_1
+    invoke-virtual {v0}, Ljava/lang/Process;->destroy()V
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception v1
+
+    goto :goto_3
+
+    :catch_0
+    move-exception v1
+
+    :try_start_1
+    invoke-virtual {v1}, Ljava/lang/Exception;->printStackTrace()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    :goto_2
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$fetch$2;->$output:Ljava/util/LinkedList;
+
+    return-object v0
+
+    :goto_3
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Ljava/lang/Process;->destroy()V
+
+    :cond_2
+    throw v1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$1.smali b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$1.smali
new file mode 100644
index 0000000000..74466f3890
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$1.smali
@@ -0,0 +1,118 @@
+.class public final Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;
+.super Ljava/lang/Object;
+.source "SystemLogUtils.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/SystemLogUtils;->fetchLastTombstone()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/util/LinkedList<",
+        "Ljava/lang/String;",
+        ">;",
+        "Lrx/Observable<",
+        "+",
+        "Lcom/discord/utilities/SystemLogUtils$Tombstone;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;->INSTANCE:Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/LinkedList;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;->call(Ljava/util/LinkedList;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/util/LinkedList;)Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/LinkedList<",
+            "Ljava/lang/String;",
+            ">;)",
+            "Lrx/Observable<",
+            "+",
+            "Lcom/discord/utilities/SystemLogUtils$Tombstone;",
+            ">;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/utilities/SystemLogUtils;->INSTANCE:Lcom/discord/utilities/SystemLogUtils;
+
+    const-string v1, "crashes"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/SystemLogUtils;->fetchLastTombstone$app_productionDiscordExternalRelease(Ljava/util/Collection;)Lcom/discord/utilities/SystemLogUtils$Tombstone;
+
+    move-result-object p1
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/f;->e:Lrx/Observable;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    move-object p1, v0
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1.smali b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1.smali
new file mode 100644
index 0000000000..c5cc2412b5
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1.smali
@@ -0,0 +1,89 @@
+.class public final Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1;
+.super Lk0/o/c/j;
+.source "SystemLogUtils.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/SystemLogUtils;->fetchLastTombstone$app_productionDiscordExternalRelease(Ljava/util/Collection;)Lcom/discord/utilities/SystemLogUtils$Tombstone;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lkotlin/text/MatchResult;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $removeDexNameExp:Lkotlin/text/Regex;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/text/Regex;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1;->$removeDexNameExp:Lkotlin/text/Regex;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/text/MatchResult;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1;->invoke(Lkotlin/text/MatchResult;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final invoke(Lkotlin/text/MatchResult;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Lkotlin/text/MatchResult;->getGroupValues()Ljava/util/List;
+
+    move-result-object p1
+
+    const/4 v0, 0x1
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    iget-object v0, p0, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1;->$removeDexNameExp:Lkotlin/text/Regex;
+
+    const-string v1, "classesN.dex"
+
+    invoke-virtual {v0, p1, v1}, Lkotlin/text/Regex;->replace(Ljava/lang/CharSequence;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1.smali b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1.smali
new file mode 100644
index 0000000000..bf9a3a186e
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1.smali
@@ -0,0 +1,129 @@
+.class public final Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1;
+.super Lk0/o/c/j;
+.source "SystemLogUtils.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/SystemLogUtils;->fetchLastTombstone$app_productionDiscordExternalRelease(Ljava/util/Collection;)Lcom/discord/utilities/SystemLogUtils$Tombstone;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $crashes:Ljava/util/Collection;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Collection;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1;->$crashes:Ljava/util/Collection;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1;->invoke()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final invoke()Ljava/lang/String;
+    .locals 6
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1;->$crashes:Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/util/Collection;->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_3
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    const/4 v3, 0x2
+
+    const-string v4, "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***"
+
+    const/4 v5, 0x0
+
+    invoke-static {v2, v4, v5, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    const-string v3, "$this$clear"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->setLength(I)V
+
+    :cond_0
+    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v3
+
+    if-lez v3, :cond_1
+
+    const/4 v5, 0x1
+
+    :cond_1
+    if-eqz v5, :cond_2
+
+    const/16 v3, 0xa
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :cond_2
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_0
+
+    :cond_3
+    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/utilities/SystemLogUtils.smali b/com.discord/smali/com/discord/utilities/SystemLogUtils.smali
new file mode 100644
index 0000000000..d58df94d1e
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/SystemLogUtils.smali
@@ -0,0 +1,574 @@
+.class public final Lcom/discord/utilities/SystemLogUtils;
+.super Ljava/lang/Object;
+.source "SystemLogUtils.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/utilities/SystemLogUtils$Tombstone;
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/SystemLogUtils;
+
+.field public static final maxLogSize:I = 0x2625a0
+
+.field public static final regexExtractTombstone:Lkotlin/text/Regex;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/utilities/SystemLogUtils;
+
+    invoke-direct {v0}, Lcom/discord/utilities/SystemLogUtils;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/SystemLogUtils;->INSTANCE:Lcom/discord/utilities/SystemLogUtils;
+
+    new-instance v0, Lkotlin/text/Regex;
+
+    const-string v1, "^(?:[^\\s]+\\s+){4}F\\s+DEBUG\\s+:\\s(.+)"
+
+    invoke-direct {v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Lcom/discord/utilities/SystemLogUtils;->regexExtractTombstone:Lkotlin/text/Regex;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$waitFor(Lcom/discord/utilities/SystemLogUtils;Ljava/lang/Process;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/utilities/SystemLogUtils;->waitFor(Ljava/lang/Process;)V
+
+    return-void
+.end method
+
+.method private final fetch(Lkotlin/text/Regex;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/text/Regex;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/util/LinkedList<",
+            "Ljava/lang/String;",
+            ">;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/util/LinkedList;
+
+    invoke-direct {v0}, Ljava/util/LinkedList;-><init>()V
+
+    new-instance v1, Ljava/io/File;
+
+    const-string v2, "/system/bin/logcat"
+
+    invoke-direct {v1, v2}, Ljava/io/File;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/io/File;->exists()Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    if-nez p1, :cond_0
+
+    const-string p1, "Unable to locate \'/system/bin/logcat\'"
+
+    invoke-virtual {v0, p1}, Ljava/util/LinkedList;->add(Ljava/lang/Object;)Z
+
+    :cond_0
+    new-instance p1, Ls0/l/e/j;
+
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    const-string v0, "Observable.just(output)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    :cond_1
+    new-instance v1, Lcom/discord/utilities/SystemLogUtils$fetch$2;
+
+    invoke-direct {v1, v2, v0, p1}, Lcom/discord/utilities/SystemLogUtils$fetch$2;-><init>(Ljava/lang/String;Ljava/util/LinkedList;Lkotlin/text/Regex;)V
+
+    new-instance p1, Ls0/l/a/s;
+
+    invoke-direct {p1, v1}, Ls0/l/a/s;-><init>(Ljava/util/concurrent/Callable;)V
+
+    invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {}, Ls0/p/a;->c()Ls0/p/a;
+
+    move-result-object v0
+
+    iget-object v0, v0, Ls0/p/a;->c:Lrx/Scheduler;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->T(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v0, "Observable.fromCallable \u2026n(Schedulers.newThread())"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method private final waitFor(Ljava/lang/Process;)V
+    .locals 5
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v0
+
+    sget-object v2, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v3, 0xf
+
+    invoke-virtual {v2, v3, v4}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v2
+
+    add-long/2addr v2, v0
+
+    :cond_0
+    :try_start_0
+    invoke-virtual {p1}, Ljava/lang/Process;->exitValue()I
+    :try_end_0
+    .catch Ljava/lang/IllegalThreadStateException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    const-wide/16 v0, 0x64
+
+    invoke-static {v0, v1}, Ljava/lang/Thread;->sleep(J)V
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v0
+
+    cmp-long v4, v0, v2
+
+    if-ltz v4, :cond_0
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final fetch()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/discord/utilities/SystemLogUtils;->fetch(Lkotlin/text/Regex;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/utilities/SystemLogUtils$fetch$1;->INSTANCE:Lcom/discord/utilities/SystemLogUtils$fetch$1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "fetch(null).map { it.joinToString(\"\\n\") }"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final fetchLastTombstone()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/utilities/SystemLogUtils$Tombstone;",
+            ">;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/utilities/SystemLogUtils;->regexExtractTombstone:Lkotlin/text/Regex;
+
+    invoke-direct {p0, v0}, Lcom/discord/utilities/SystemLogUtils;->fetch(Lkotlin/text/Regex;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;->INSTANCE:Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "fetch(regexExtractTombst\u2026ble.just(tombstone)\n    }"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final fetchLastTombstone$app_productionDiscordExternalRelease(Ljava/util/Collection;)Lcom/discord/utilities/SystemLogUtils$Tombstone;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "Ljava/lang/String;",
+            ">;)",
+            "Lcom/discord/utilities/SystemLogUtils$Tombstone;"
+        }
+    .end annotation
+
+    const-string v0, "crashes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x0
+
+    return-object p1
+
+    :cond_0
+    new-instance v0, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1;
+
+    invoke-direct {v0, p1}, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$text$1;-><init>(Ljava/util/Collection;)V
+
+    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    move-result-object p1
+
+    const-string/jumbo v0, "{\n      val sb = StringB\u2026    sb.toString()\n    }()"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/String;
+
+    new-instance v0, Lkotlin/text/Regex;
+
+    sget-object v1, Lk0/u/d;->e:Lk0/u/d;
+
+    const-string v2, "^\\s+#\\d+ pc .+/(.+? .+?)\\+?[+)]"
+
+    invoke-direct {v0, v2, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "classes\\d+.dex"
+
+    invoke-direct {v1, v2}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, p1, v2}, Lkotlin/text/Regex;->findAll(Ljava/lang/CharSequence;I)Lkotlin/sequences/Sequence;
+
+    move-result-object v0
+
+    new-instance v2, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1;
+
+    invoke-direct {v2, v1}, Lcom/discord/utilities/SystemLogUtils$fetchLastTombstone$extractedGroups$1;-><init>(Lkotlin/text/Regex;)V
+
+    invoke-static {v0, v2}, Lf/n/a/k/a;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object v3
+
+    const-string v0, "libc.so (abort"
+
+    const-string v1, "libart.so (art::Runtime::Abort(char const*"
+
+    const-string v2, "libbase.so (android::base::LogMessage::~LogMessage("
+
+    filled-new-array {v0, v1, v2}, [Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->hashSetOf([Ljava/lang/Object;)Ljava/util/HashSet;
+
+    move-result-object v0
+
+    :try_start_0
+    move-object v1, v3
+
+    check-cast v1, Lk0/t/u;
+
+    iget-object v2, v1, Lk0/t/u;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {v2}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :cond_1
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2
+
+    iget-object v4, v1, Lk0/t/u;->b:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    invoke-interface {v4, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    move-object v5, v4
+
+    check-cast v5, Ljava/lang/String;
+
+    invoke-virtual {v0, v5}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    xor-int/lit8 v5, v5, 0x1
+
+    if-eqz v5, :cond_1
+
+    check-cast v4, Ljava/lang/String;
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    const-string v1, "Sequence contains no element matching the predicate."
+
+    invoke-direct {v0, v1}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+    :try_end_0
+    .catch Ljava/util/NoSuchElementException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    const-string v4, "Unknown"
+
+    :goto_0
+    move-object v0, v4
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x3e
+
+    const-string v4, "\n"
+
+    invoke-static/range {v3 .. v10}, Lf/n/a/k/a;->joinToString$default(Lkotlin/sequences/Sequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/utilities/SystemLogUtils$Tombstone;
+
+    invoke-direct {v2, p1, v1, v0}, Lcom/discord/utilities/SystemLogUtils$Tombstone;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    return-object v2
+.end method
+
+.method public final getRegexExtractTombstone$app_productionDiscordExternalRelease()Lkotlin/text/Regex;
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/SystemLogUtils;->regexExtractTombstone:Lkotlin/text/Regex;
+
+    return-object v0
+.end method
+
+.method public final processLogs$app_productionDiscordExternalRelease(Ljava/io/BufferedReader;Ljava/util/LinkedList;Lkotlin/text/Regex;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/io/BufferedReader;",
+            "Ljava/util/LinkedList<",
+            "Ljava/lang/String;",
+            ">;",
+            "Lkotlin/text/Regex;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "reader"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "output"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    :cond_0
+    :goto_0
+    const v2, 0x2625a0
+
+    :try_start_0
+    invoke-virtual {p1}, Ljava/io/BufferedReader;->readLine()Ljava/lang/String;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_5
+
+    if-eqz p3, :cond_1
+
+    invoke-virtual {p3, v3, v0}, Lkotlin/text/Regex;->find(Ljava/lang/CharSequence;I)Lkotlin/text/MatchResult;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    invoke-interface {v3}, Lkotlin/text/MatchResult;->getGroupValues()Ljava/util/List;
+
+    move-result-object v3
+
+    invoke-static {v3}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    :cond_1
+    invoke-static {v3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const-string v4, "Accessing hidden method"
+
+    const/4 v5, 0x2
+
+    invoke-static {v3, v4, v0, v5}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    invoke-virtual {v3}, Ljava/lang/String;->length()I
+
+    move-result v4
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+
+    add-int/lit8 v4, v4, 0x1
+
+    add-int/2addr v4, v1
+
+    :try_start_1
+    invoke-virtual {p2, v3}, Ljava/util/LinkedList;->add(Ljava/lang/Object;)Z
+
+    if-le v4, v2, :cond_4
+
+    invoke-virtual {p2}, Ljava/util/LinkedList;->pop()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v1
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+
+    add-int/lit8 v1, v1, -0x1
+
+    sub-int/2addr v4, v1
+
+    :cond_4
+    move v1, v4
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    move v1, v4
+
+    goto :goto_1
+
+    :catch_1
+    move-exception p1
+
+    :goto_1
+    invoke-virtual {p1}, Ljava/lang/Exception;->printStackTrace()V
+
+    if-nez p3, :cond_5
+
+    new-instance p3, Ljava/lang/StringBuilder;
+
+    invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "IOException: "
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Ljava/util/LinkedList;->add(Ljava/lang/Object;)Z
+
+    :cond_5
+    if-le v1, v2, :cond_6
+
+    invoke-virtual {p2}, Ljava/util/LinkedList;->pop()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    :cond_6
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion$INSTANCE$2.smali
index 4bb47435bc..8ac5da6539 100644
--- a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion$INSTANCE$2.smali
+++ b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/accessibility/AccessibilityMonitor$Companion$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AccessibilityMonitor.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/accessibility/AccessibilityMonitor;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion.smali b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion.smali
index f7e36ded5a..e5e909164b 100644
--- a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor$Companion.smali
@@ -54,7 +54,9 @@
 .method public final initialize(Landroid/app/Application;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/accessibility/AccessibilityMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/accessibility/AccessibilityMonitor;
 
@@ -63,13 +65,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->bindContext(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali
index e7746d7024..e0a442ab8a 100644
--- a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityMonitor.smali
@@ -178,7 +178,7 @@
 
     const-string v1, "context.contentResolver"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->contentResolver:Landroid/content/ContentResolver;
 
@@ -204,7 +204,7 @@
 
     const-string v0, "context.resources"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -224,7 +224,7 @@
     :try_start_1
     const-string p1, "contentResolver"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -234,7 +234,7 @@
     :try_start_2
     const-string p1, "accessibilityManager"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -244,7 +244,7 @@
     :try_start_3
     const-string p1, "accessibilityManager"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -288,7 +288,7 @@
 
     const-string v2, "0.0"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -296,7 +296,7 @@
 
     const-string v2, "0"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -322,7 +322,7 @@
 
     const-string v2, "features"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v0}, Lcom/discord/utilities/accessibility/AccessibilityState;->copy(Ljava/util/EnumSet;)Lcom/discord/utilities/accessibility/AccessibilityState;
 
@@ -335,7 +335,7 @@
     :cond_2
     const-string v0, "contentResolver"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -369,7 +369,7 @@
 
     const-string p1, "services"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -395,7 +395,7 @@
 
     const-string v1, "features"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/accessibility/AccessibilityState;->copy(Ljava/util/EnumSet;)Lcom/discord/utilities/accessibility/AccessibilityState;
 
@@ -408,7 +408,7 @@
     :cond_1
     const-string p1, "accessibilityManager"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -473,7 +473,7 @@
 
     const-string v1, "features"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/accessibility/AccessibilityState;->copy(Ljava/util/EnumSet;)Lcom/discord/utilities/accessibility/AccessibilityState;
 
@@ -491,9 +491,9 @@
 
     iget-object v0, p0, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->accessibilityStateSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -501,22 +501,15 @@
 
 # virtual methods
 .method public final bindContext(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->handleInitialState(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeAccessibilityState()Lrx/Observable;
@@ -538,7 +531,7 @@
 
     const-string v1, "accessibilityStateSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityState.smali b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityState.smali
index e56ea67f88..23cf0eebc8 100644
--- a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityState.smali
+++ b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityState.smali
@@ -29,7 +29,7 @@
 .end method
 
 .method public constructor <init>(Ljava/util/EnumSet;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -39,22 +39,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "features"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/accessibility/AccessibilityState;->features:Ljava/util/EnumSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "features"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/util/EnumSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -72,7 +65,7 @@
 
     const-string p2, "EnumSet.of(AccessibilityFeatureFlags.NONE)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-direct {p0, p1}, Lcom/discord/utilities/accessibility/AccessibilityState;-><init>(Ljava/util/EnumSet;)V
@@ -127,22 +120,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "features"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/accessibility/AccessibilityState;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/accessibility/AccessibilityState;-><init>(Ljava/util/EnumSet;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "features"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -160,7 +146,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/accessibility/AccessibilityState;->features:Ljava/util/EnumSet;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityUtils.smali b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityUtils.smali
index d616f7afa0..26136c7f5d 100644
--- a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityUtils.smali
+++ b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityUtils.smali
@@ -33,70 +33,55 @@
 .method public final sendAnnouncement(Landroid/content/Context;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "message"
 
-    const-string v1, "accessibility"
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+    const-string v0, "accessibility"
+
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
-    instance-of v1, p1, Landroid/view/accessibility/AccessibilityManager;
+    instance-of v0, p1, Landroid/view/accessibility/AccessibilityManager;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_0
-    move-object v0, p1
+    check-cast p1, Landroid/view/accessibility/AccessibilityManager;
 
-    :goto_0
-    check-cast v0, Landroid/view/accessibility/AccessibilityManager;
-
-    if-eqz v0, :cond_1
+    if-eqz p1, :cond_1
 
     invoke-static {}, Landroid/view/accessibility/AccessibilityEvent;->obtain()Landroid/view/accessibility/AccessibilityEvent;
 
-    move-result-object p1
+    move-result-object v0
 
     const-string v1, "event"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v1, 0x4000
 
-    invoke-virtual {p1, v1}, Landroid/view/accessibility/AccessibilityEvent;->setEventType(I)V
+    invoke-virtual {v0, v1}, Landroid/view/accessibility/AccessibilityEvent;->setEventType(I)V
 
-    invoke-virtual {p1}, Landroid/view/accessibility/AccessibilityEvent;->getText()Ljava/util/List;
+    invoke-virtual {v0}, Landroid/view/accessibility/AccessibilityEvent;->getText()Ljava/util/List;
 
     move-result-object v1
 
     invoke-interface {v1, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :try_start_0
-    invoke-virtual {v0, p1}, Landroid/view/accessibility/AccessibilityManager;->sendAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
+    invoke-virtual {p1, v0}, Landroid/view/accessibility/AccessibilityManager;->sendAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
     :try_end_0
     .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
index f6c9264916..c7b04846c4 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
@@ -43,7 +43,7 @@
 .method public onActivityPaused(Landroid/app/Activity;)V
     .locals 1
 
-    invoke-static {}, Ld0/a/b/b/a;->N()Lf/c/a/d0;
+    invoke-static {}, Le0/a/b/b/a;->N()Lf/c/a/d0;
 
     move-result-object p1
 
@@ -67,7 +67,7 @@
 .method public onActivityResumed(Landroid/app/Activity;)V
     .locals 1
 
-    invoke-static {}, Ld0/a/b/b/a;->N()Lf/c/a/d0;
+    invoke-static {}, Le0/a/b/b/a;->N()Lf/c/a/d0;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$init$3.smali b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$init$3.smali
index 880088f694..ffe25205cd 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$init$3.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig$init$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AdjustConfig$init$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AdjustConfig.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,17 +61,17 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "referrerUrl"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/utilities/analytics/AdjustConfig$init$3;->$application:Landroid/app/Application;
 
-    invoke-static {}, Ld0/a/b/b/a;->N()Lf/c/a/d0;
+    invoke-static {}, Le0/a/b/b/a;->N()Lf/c/a/d0;
 
-    move-result-object v7
+    move-result-object v0
 
-    if-eqz v7, :cond_2
+    if-eqz v0, :cond_2
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -79,42 +79,42 @@
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
-    move-result v0
+    move-result v1
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lf/c/a/c0;
+    new-instance v7, Lf/c/a/c0;
 
-    move-object v1, v0
+    move-object v1, v7
 
-    move-object v2, v7
+    move-object v2, v0
 
     move-object v4, p1
 
     invoke-direct/range {v1 .. v6}, Lf/c/a/c0;-><init>(Lf/c/a/d0;Landroid/content/Context;Ljava/lang/String;J)V
 
-    invoke-static {v0}, Lf/c/a/e2;->G(Ljava/lang/Runnable;)V
+    invoke-static {v7}, Lf/c/a/e2;->G(Ljava/lang/Runnable;)V
 
-    const-string v0, "referrer"
+    const-string v1, "referrer"
 
-    invoke-virtual {v7, v0}, Lf/c/a/d0;->b(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Lf/c/a/d0;->b(Ljava/lang/String;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    iget-object v0, v7, Lf/c/a/d0;->c:Lf/c/a/u0;
+    iget-object v1, v0, Lf/c/a/d0;->c:Lf/c/a/u0;
 
-    invoke-interface {v0}, Lf/c/a/u0;->isEnabled()Z
+    invoke-interface {v1}, Lf/c/a/u0;->isEnabled()Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    iget-object v0, v7, Lf/c/a/d0;->c:Lf/c/a/u0;
+    iget-object v0, v0, Lf/c/a/d0;->c:Lf/c/a/u0;
 
     invoke-interface {v0}, Lf/c/a/u0;->k()V
 
@@ -127,12 +127,7 @@
     return-void
 
     :cond_2
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_3
-    const-string p1, "referrerUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali
index d5bf56cb29..080a0d383d 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AdjustConfig.smali
@@ -49,9 +49,9 @@
 .method public final init(Landroid/app/Application;Z)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "application"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -60,21 +60,23 @@
     :cond_0
     new-instance p2, Lf/c/a/w;
 
-    sget-object v1, Lcom/discord/utilities/analytics/AdjustConfig;->ADJUST_ENVIRONMENT:Ljava/lang/String;
+    sget-object v0, Lcom/discord/utilities/analytics/AdjustConfig;->ADJUST_ENVIRONMENT:Ljava/lang/String;
 
-    const-string v2, "d8fcx8xdmrr4"
+    const-string v1, "d8fcx8xdmrr4"
 
-    invoke-direct {p2, p1, v2, v1}, Lf/c/a/w;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {p2, p1, v1, v0}, Lf/c/a/w;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/analytics/AdjustConfig$init$1$1;->INSTANCE:Lcom/discord/utilities/analytics/AdjustConfig$init$1$1;
+    sget-object v0, Lcom/discord/utilities/analytics/AdjustConfig$init$1$1;->INSTANCE:Lcom/discord/utilities/analytics/AdjustConfig$init$1$1;
 
-    iput-object v1, p2, Lf/c/a/w;->k:Lf/c/a/g1;
+    iput-object v0, p2, Lf/c/a/w;->k:Lf/c/a/g1;
 
-    invoke-static {}, Ld0/a/b/b/a;->N()Lf/c/a/d0;
+    invoke-static {}, Le0/a/b/b/a;->N()Lf/c/a/d0;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_7
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_7
 
     const/4 v2, 0x0
 
@@ -97,7 +99,7 @@
     goto/16 :goto_1
 
     :cond_1
-    iget-object v3, v1, Lf/c/a/d0;->c:Lf/c/a/u0;
+    iget-object v3, v0, Lf/c/a/d0;->c:Lf/c/a/u0;
 
     if-eqz v3, :cond_2
 
@@ -114,23 +116,23 @@
     goto/16 :goto_1
 
     :cond_2
-    iput-object v0, p2, Lf/c/a/w;->u:Ljava/util/List;
+    iput-object v1, p2, Lf/c/a/w;->u:Ljava/util/List;
 
-    iput-object v0, p2, Lf/c/a/w;->x:Ljava/lang/String;
+    iput-object v1, p2, Lf/c/a/w;->x:Ljava/lang/String;
 
-    iget-object v3, v1, Lf/c/a/d0;->a:Ljava/lang/Boolean;
+    iget-object v3, v0, Lf/c/a/d0;->a:Ljava/lang/Boolean;
 
     iput-object v3, p2, Lf/c/a/w;->y:Ljava/lang/Boolean;
 
-    iget-boolean v3, v1, Lf/c/a/d0;->b:Z
+    iget-boolean v3, v0, Lf/c/a/d0;->b:Z
 
     iput-boolean v3, p2, Lf/c/a/w;->z:Z
 
-    iput-object v0, p2, Lf/c/a/w;->a:Ljava/lang/String;
+    iput-object v1, p2, Lf/c/a/w;->a:Ljava/lang/String;
 
-    iput-object v0, p2, Lf/c/a/w;->b:Ljava/lang/String;
+    iput-object v1, p2, Lf/c/a/w;->b:Ljava/lang/String;
 
-    iput-object v0, p2, Lf/c/a/w;->c:Ljava/lang/String;
+    iput-object v1, p2, Lf/c/a/w;->c:Ljava/lang/String;
 
     invoke-virtual {p2}, Lf/c/a/w;->a()Z
 
@@ -226,20 +228,20 @@
     goto :goto_0
 
     :cond_6
-    new-instance v0, Lf/c/a/a;
+    new-instance v1, Lf/c/a/a;
 
-    invoke-direct {v0, p2}, Lf/c/a/a;-><init>(Lf/c/a/w;)V
+    invoke-direct {v1, p2}, Lf/c/a/a;-><init>(Lf/c/a/w;)V
 
     :goto_0
-    iput-object v0, v1, Lf/c/a/d0;->c:Lf/c/a/u0;
+    iput-object v1, v0, Lf/c/a/d0;->c:Lf/c/a/u0;
 
     iget-object p2, p2, Lf/c/a/w;->d:Landroid/content/Context;
 
-    new-instance v0, Lf/c/a/b0;
+    new-instance v1, Lf/c/a/b0;
 
-    invoke-direct {v0, v1, p2}, Lf/c/a/b0;-><init>(Lf/c/a/d0;Landroid/content/Context;)V
+    invoke-direct {v1, v0, p2}, Lf/c/a/b0;-><init>(Lf/c/a/d0;Landroid/content/Context;)V
 
-    invoke-static {v0}, Lf/c/a/e2;->G(Ljava/lang/Runnable;)V
+    invoke-static {v1}, Lf/c/a/e2;->G(Ljava/lang/Runnable;)V
 
     :goto_1
     sget-object p2, Lcom/discord/utilities/analytics/AdjustConfig$init$2;->INSTANCE:Lcom/discord/utilities/analytics/AdjustConfig$init$2;
@@ -263,12 +265,5 @@
     return-void
 
     :cond_7
-    throw v0
-
-    :cond_8
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali
index 6846505ff1..c2bfb61f74 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1;
-.super Lj0/o/b;
+.super Lk0/p/b;
 .source "Delegates.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/o/b<",
+        "Lk0/p/b<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
         "+",
@@ -35,7 +35,7 @@
 
     iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1;->$initialValue:Ljava/lang/Object;
 
-    invoke-direct {p0, p2}, Lj0/o/b;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, p2}, Lk0/p/b;-><init>(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 
 # virtual methods
 .method public afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -62,7 +62,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "property"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p3, Ljava/util/Map;
 
@@ -94,7 +96,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object p3, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     if-eqz p2, :cond_1
 
@@ -104,7 +106,7 @@
 
     const-string p3, "(this as java.lang.String).getBytes(charset)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x2
 
@@ -114,27 +116,18 @@
 
     const-string p3, "Base64.encodeToString(su\u2026eArray(), Base64.NO_WRAP)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->access$setSuperPropertiesStringBase64$p(Lcom/discord/utilities/analytics/AnalyticSuperProperties;Ljava/lang/String;)V
 
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index 5cfa319502..f118f8bf02 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -59,31 +59,27 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 5
+    .locals 6
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/m;
+    new-instance v1, Lk0/o/c/n;
 
     const-class v2, Lcom/discord/utilities/analytics/AnalyticSuperProperties;
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
     const-string v3, "superProperties"
 
     const-string v4, "getSuperProperties()Ljava/util/Map;"
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/m;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    const/4 v5, 0x0
 
-    invoke-static {v1}, Lj0/n/c/s;->mutableProperty1(Lj0/n/c/l;)Lj0/r/c;
+    invoke-direct {v1, v2, v3, v4, v5}, Lk0/o/c/n;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
-    const/4 v2, 0x0
+    invoke-static {v1}, Lk0/o/c/t;->mutableProperty1(Lk0/o/c/m;)Lk0/s/c;
 
-    aput-object v1, v0, v2
+    aput-object v1, v0, v5
 
     sput-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -99,7 +95,7 @@
 
     sput-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superPropertiesStringBase64:Ljava/lang/String;
 
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     new-instance v2, Lcom/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1;
 
@@ -177,7 +173,7 @@
 
     const-string v3, "browser_user_agent"
 
-    const-string v4, "Discord-Android/1249"
+    const-string v4, "Discord-Android/1251"
 
     invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -185,7 +181,7 @@
 
     const/4 v1, 0x2
 
-    const/16 v2, 0x4e1
+    const/16 v2, 0x4e3
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -205,7 +201,7 @@
 
     const-string v3, "client_version"
 
-    const-string v4, "38.0"
+    const-string v4, "38.1"
 
     invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -414,14 +410,16 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "features"
 
-    const-wide/16 v0, 0x0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p2
 
+    const-wide/16 v0, 0x0
+
     :goto_0
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
@@ -483,21 +481,14 @@
     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "features"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setAdvertiserId(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "advertiserId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lkotlin/Pair;
 
@@ -512,21 +503,14 @@
     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "advertiserId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setCampaignProperties(Ljava/lang/String;)V
     .locals 7
 
-    if-eqz p1, :cond_8
+    const-string v0, "referrerUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -554,7 +538,7 @@
 
     const/4 v4, 0x6
 
-    invoke-static {p1, v2, v3, v3, v4}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {p1, v2, v3, v3, v4}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object p1
 
@@ -591,7 +575,7 @@
 
     move-result-object v6
 
-    invoke-static {v5, v6, v3, v3, v4}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {v5, v6, v3, v3, v4}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object v5
 
@@ -686,7 +670,7 @@
     goto :goto_5
 
     :sswitch_0
-    const-string v6, "utm_source"
+    const-string/jumbo v6, "utm_source"
 
     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -708,7 +692,7 @@
     goto :goto_4
 
     :sswitch_2
-    const-string v6, "utm_medium"
+    const-string/jumbo v6, "utm_medium"
 
     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -741,7 +725,7 @@
     goto :goto_4
 
     :sswitch_5
-    const-string v6, "utm_term"
+    const-string/jumbo v6, "utm_term"
 
     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -752,7 +736,7 @@
     goto :goto_4
 
     :sswitch_6
-    const-string v6, "utm_campaign"
+    const-string/jumbo v6, "utm_campaign"
 
     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -774,7 +758,7 @@
     goto :goto_4
 
     :sswitch_8
-    const-string v6, "utm_content"
+    const-string/jumbo v6, "utm_content"
 
     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -841,14 +825,7 @@
 
     return-void
 
-    :cond_8
-    const-string p1, "referrerUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    nop
 
     :sswitch_data_0
     .sparse-switch
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
index 2f26193715..2bf389c155 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
@@ -54,7 +54,7 @@
 
     invoke-direct {v0, v1}, Lf/c/a/x;-><init>(Ljava/lang/String;)V
 
-    invoke-static {}, Ld0/a/b/b/a;->N()Lf/c/a/d0;
+    invoke-static {}, Le0/a/b/b/a;->N()Lf/c/a/d0;
 
     move-result-object v1
 
@@ -84,7 +84,7 @@
 
     invoke-direct {v0, v1}, Lf/c/a/x;-><init>(Ljava/lang/String;)V
 
-    invoke-static {}, Ld0/a/b/b/a;->N()Lf/c/a/d0;
+    invoke-static {}, Le0/a/b/b/a;->N()Lf/c/a/d0;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali
index cf06954716..4690dab561 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$ackMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$ackMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,10 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
+        "+",
         "Ljava/lang/Object;",
         ">;>;"
     }
@@ -40,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali
index 45e5d9aaa6..270858b5a8 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.smali
@@ -3,7 +3,7 @@
 .source "AnalyticsTracker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Ljava/lang/Object;",
+        ">;>;"
     }
 .end annotation
 
@@ -143,7 +148,7 @@
 
     const-string v2, "it"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$2.smali
index 7ce317d333..db450951a7 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -53,7 +53,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$channelOpened$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$channelOpened$1.smali
index a66d099c50..de41bb8980 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$channelOpened$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$channelOpened$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$channelOpened$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,10 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
+        "+",
         "Ljava/lang/Object;",
         ">;>;"
     }
@@ -40,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$firebaseAnalytics$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$firebaseAnalytics$2.smali
index eaeb64438a..9650129aba 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$firebaseAnalytics$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$firebaseAnalytics$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$firebaseAnalytics$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/google/firebase/analytics/FirebaseAnalytics;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
 # virtual methods
 .method public final invoke()Lcom/google/firebase/analytics/FirebaseAnalytics;
-    .locals 1
+    .locals 2
 
     sget-object v0, Lcom/discord/utilities/app/ApplicationProvider;->INSTANCE:Lcom/discord/utilities/app/ApplicationProvider;
 
@@ -68,6 +68,10 @@
 
     move-result-object v0
 
+    const-string v1, "FirebaseAnalytics.getIns\u2026pplicationProvider.get())"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object v0
 .end method
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali
index 7e04ca651b..510a5ed78b 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelPresence;",
+        "Lcom/discord/models/domain/ModelPresence;",
+        "Lcom/discord/models/domain/activity/ModelActivity;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali
index df6dfc49aa..3fa6670b09 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2.smali
@@ -3,7 +3,7 @@
 .source "AnalyticsTracker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/activity/ModelActivity;",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "Ljava/lang/Object;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$guildViewed$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$guildViewed$1.smali
index 600c65a23e..0b1c8c77ce 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$guildViewed$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$guildViewed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$guildViewed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali
index b8c4cb1494..b747b025d1 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali
@@ -3,7 +3,7 @@
 .source "AnalyticsTracker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -84,9 +92,9 @@
         }
     .end annotation
 
-    const-string v0, "userRelationships"
+    const-string/jumbo v0, "userRelationships"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali
index fdd7355ee6..463f71ba3b 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Set<",
         "+",
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1.smali
index 439289cbae..5aa1b74ba3 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,10 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
+        "+",
         "Ljava/lang/Object;",
         ">;>;"
     }
@@ -44,7 +45,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -131,7 +132,7 @@
 
     const-string v2, "guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "server"
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.smali
index 1158d79afb..ee4cbe8ba4 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,7 +81,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gameProperties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -91,22 +93,13 @@
 
     iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1;->$throttleKey:Lkotlin/Pair;
 
-    const-wide/32 v2, 0xdbba0
+    new-instance v2, Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1;
 
-    new-instance v4, Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1;
+    invoke-direct {v2, p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1;-><init>(Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1;Ljava/util/Map;)V
 
-    invoke-direct {v4, p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1$1;-><init>(Lcom/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1;Ljava/util/Map;)V
+    const-wide/32 v3, 0xdbba0
 
-    invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v0, v1, v3, v4, v2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gameProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali
index 7504b56d00..175a82ec83 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/utilities/analytics/AnalyticsTracker;->videoInputDeviceSelected(JLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;)V
+    value = Lcom/discord/utilities/analytics/AnalyticsTracker;->videoInputDeviceSelected(JLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 .end method
 
 .method public final invoke(Ljava/util/Map;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -73,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gameProperties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -81,22 +83,19 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;->$voiceProperties:Ljava/util/Map;
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-interface {v1, p1}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
+    iget-object v2, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;->$voiceProperties:Ljava/util/Map;
 
-    const-string p1, "video_input_toggled"
+    invoke-interface {v2, p1}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+    invoke-static {v1, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->access$filterNonNullValues(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object p1
+
+    const-string/jumbo v1, "video_input_toggled"
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gameProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2.smali
index 19b55444c5..061f5125ae 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gameProperties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2;->$voiceProperties:Ljava/util/Map;
 
@@ -85,20 +87,17 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2;->$voiceProperties:Ljava/util/Map;
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+    iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelJoin$2;->$voiceProperties:Ljava/util/Map;
+
+    invoke-static {v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->access$filterNonNullValues(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v0
 
     const-string v1, "join_voice_channel"
 
     invoke-virtual {p1, v1, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gameProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1.smali
index 762902d778..986c35f343 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 .end method
 
 .method public final invoke(Ljava/util/Map;)V
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -73,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gameProperties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -81,22 +83,19 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1;->$voiceProperties:Ljava/util/Map;
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-interface {v1, p1}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
+    iget-object v2, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1;->$voiceProperties:Ljava/util/Map;
 
-    const-string p1, "leave_voice_channel"
+    invoke-interface {v2, p1}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+    invoke-static {v1, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->access$filterNonNullValues(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object p1
+
+    const-string v1, "leave_voice_channel"
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gameProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
index cdae32d548..017561dbea 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
@@ -70,12 +70,6 @@
     return-void
 .end method
 
-.method public static synthetic THROTTLE_SHORT$annotations()V
-    .locals 0
-
-    return-void
-.end method
-
 .method public static final synthetic access$filterNonNullValues(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/util/Map;)Ljava/util/Map;
     .locals 0
 
@@ -172,11 +166,13 @@
 .method public static final addAttachment(Ljava/lang/String;Ljava/lang/String;I)V
     .locals 7
 
-    const/4 v6, 0x0
+    const-string v0, "source"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "mimeType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -196,35 +192,35 @@
 
     const-string v1, "StoreStream\n        .get\u2026  .get()\n        .take(1)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "filter { it != null }.map { it!! }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$1;
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$1;-><init>(Ljava/lang/String;Ljava/lang/String;I)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     const-string p1, "StoreStream\n        .get\u2026+ it.properties\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -248,11 +244,17 @@
 
     and-int/lit8 p1, p1, 0x20
 
-    if-eqz v4, :cond_1
+    const-string p1, "onNext"
 
-    if-eqz v2, :cond_0
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p1, Lf/a/b/a0;
+    const-string p1, "errorClass"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/b/c0;
+
+    const/4 v6, 0x0
 
     move-object v0, p1
 
@@ -262,39 +264,11 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p0, "errorClass"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string p0, "onNext"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string p0, "mimeType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string p0, "source"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method private final addVoiceConnectionProperties(Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)V
@@ -452,7 +426,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "properties"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Ljava/util/Map;->isEmpty()Z
 
@@ -470,21 +446,12 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "properties"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static synthetic callReportProblem$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZIILjava/lang/Object;)V
-    .locals 16
+.method public static synthetic callReportProblem$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZILjava/lang/Object;)V
+    .locals 15
 
-    and-int/lit8 v0, p15, 0x10
+    and-int/lit8 v0, p14, 0x10
 
     if-eqz v0, :cond_0
 
@@ -498,7 +465,7 @@
     move-object/from16 v7, p6
 
     :goto_0
-    move-object/from16 v1, p0
+    move-object v1, p0
 
     move-wide/from16 v2, p1
 
@@ -522,9 +489,7 @@
 
     move/from16 v14, p13
 
-    move/from16 v15, p14
-
-    invoke-virtual/range {v1 .. v15}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZI)V
+    invoke-virtual/range {v1 .. v14}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;Z)V
 
     return-void
 .end method
@@ -631,11 +596,13 @@
 .method public static final experimentTriggered(Lcom/discord/models/domain/ModelExperiment;Ljava/lang/String;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "experiment"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_3
+    const-string v0, "experimentName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelExperiment;->getType()Ljava/lang/String;
 
@@ -669,7 +636,7 @@
     goto :goto_0
 
     :cond_1
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -759,36 +726,22 @@
     :cond_2
     :goto_1
     return-void
-
-    :cond_3
-    const-string p0, "experimentName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "experiment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final externalFingerprintDropped(Ljava/lang/String;Ljava/lang/String;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "fingerprint"
 
-    const-string v1, "fingerprint"
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p0, :cond_3
+    const-string v1, "droppedFingerprint"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ljava/util/LinkedHashMap;
+    new-instance v1, Ljava/util/LinkedHashMap;
 
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+    invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
 
     sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -806,7 +759,7 @@
 
     move-result-object p0
 
-    invoke-interface {v0, v1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v0, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
     sget-object p0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
@@ -827,28 +780,16 @@
 
     const-string p1, "dropped_fingerprint"
 
-    invoke-interface {v0, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_1
     sget-object p0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
     const-string p1, "external_fingerprint_dropped"
 
-    invoke-virtual {p0, p1, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+    invoke-virtual {p0, p1, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_2
-    const-string p0, "droppedFingerprint"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
@@ -1064,19 +1005,19 @@
 
     sget-object p2, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object p2, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "filter { it != null }.map { it!! }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$getGameProperties$1;
 
@@ -1086,7 +1027,7 @@
 
     const-string p1, "Observable\n        .comb\u2026\n            })\n        )"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v2, 0x0
 
@@ -1102,13 +1043,13 @@
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$getGameProperties$2;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable\n        .comb\u2026NonNullValues()\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1131,7 +1072,7 @@
 
     if-ne v1, v0, :cond_1
 
-    const-string p1, "wifi"
+    const-string/jumbo p1, "wifi"
 
     goto :goto_0
 
@@ -1181,7 +1122,7 @@
 
     if-ne v1, v0, :cond_5
 
-    const-string p1, "wimax"
+    const-string/jumbo p1, "wimax"
 
     goto :goto_0
 
@@ -1194,7 +1135,7 @@
 
     if-ne p1, v0, :cond_6
 
-    const-string p1, "vpn"
+    const-string/jumbo p1, "vpn"
 
     goto :goto_0
 
@@ -1205,6 +1146,12 @@
     return-object p1
 .end method
 
+.method public static synthetic getTHROTTLE_SHORT$annotations()V
+    .locals 0
+
+    return-void
+.end method
+
 .method private final getVoiceChannelProperties(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;)Ljava/util/Map;
     .locals 11
     .annotation system Ldalvik/annotation/Signature;
@@ -1354,7 +1301,7 @@
 
     new-instance v7, Lkotlin/Pair;
 
-    const-string v8, "voice_state_count"
+    const-string/jumbo v8, "voice_state_count"
 
     invoke-direct {v7, v8, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -1368,7 +1315,7 @@
 
     new-instance v6, Lkotlin/Pair;
 
-    const-string v7, "video_stream_count"
+    const-string/jumbo v7, "video_stream_count"
 
     invoke-direct {v6, v7, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -1384,7 +1331,7 @@
 
     const-string v4, "channel.guildId"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
@@ -1422,7 +1369,7 @@
 
     check-cast v3, Ljava/util/HashMap;
 
-    const-string v4, "video_enabled"
+    const-string/jumbo v4, "video_enabled"
 
     invoke-virtual {v3, v4, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1518,9 +1465,11 @@
 .end method
 
 .method public static final guildTemplateResolveFailed(Ljava/lang/String;)V
-    .locals 6
+    .locals 5
 
-    if-eqz p0, :cond_0
+    const-string v0, "guildTemplateCode"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -1528,17 +1477,17 @@
 
     new-array v1, v1, [Lkotlin/Pair;
 
+    sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    new-instance v3, Lkotlin/Pair;
+
+    const-string v4, "resolved"
+
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
     const/4 v2, 0x0
 
-    sget-object v3, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    new-instance v4, Lkotlin/Pair;
-
-    const-string v5, "resolved"
-
-    invoke-direct {v4, v5, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    aput-object v4, v1, v2
+    aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
@@ -1559,15 +1508,6 @@
     invoke-virtual {v0, v1, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "guildTemplateCode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method private final insertUriProperties(Ljava/util/Map;Landroid/net/Uri;)Ljava/util/Map;
@@ -1596,9 +1536,9 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "uri_host"
+    const-string/jumbo v2, "uri_host"
 
     invoke-interface {p1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1609,9 +1549,9 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "uri_scheme"
+    const-string/jumbo v1, "uri_scheme"
 
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1660,10 +1600,10 @@
 
     const-string v0, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_4
-    const-string v0, "uri_path"
+    const-string/jumbo v0, "uri_path"
 
     invoke-interface {p1, v0, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1674,61 +1614,66 @@
 .method public static final inviteCopied(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "source"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p0, :cond_0
 
     return-void
 
     :cond_0
-    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    const/4 v2, 0x5
+    const/4 v1, 0x5
 
-    new-array v2, v2, [Lkotlin/Pair;
+    new-array v1, v1, [Lkotlin/Pair;
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelInvite;->getCode()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    new-instance v5, Lkotlin/Pair;
+    new-instance v4, Lkotlin/Pair;
 
-    const-string v6, "code"
+    const-string v5, "code"
 
-    invoke-direct {v5, v6, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v4, v5, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v5, v2, v3
+    aput-object v4, v1, v2
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object v3
+
+    goto :goto_0
 
     :cond_1
+    const/4 v3, 0x0
+
+    :goto_0
     new-instance v4, Lkotlin/Pair;
 
     const-string v5, "server"
 
-    invoke-direct {v4, v5, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v4, v5, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v4, v2, v3
+    aput-object v4, v1, v2
 
-    const/4 v0, 0x2
+    const/4 v2, 0x2
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -1736,7 +1681,7 @@
 
     const-string v4, "invite.channel"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -1752,15 +1697,15 @@
 
     invoke-direct {v5, v6, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v5, v2, v0
+    aput-object v5, v1, v2
 
-    const/4 v0, 0x3
+    const/4 v2, 0x3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object p0
 
-    invoke-static {p0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
@@ -1776,23 +1721,23 @@
 
     invoke-direct {v3, v4, p0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v3, v2, v0
+    aput-object v3, v1, v2
 
     const/4 p0, 0x4
 
-    new-instance v0, Lkotlin/Pair;
+    new-instance v2, Lkotlin/Pair;
 
     const-string v3, "location"
 
-    invoke-direct {v0, v3, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v2, v3, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v0, v2, p0
+    aput-object v2, v1, p0
 
-    invoke-static {v2}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v1}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object p0
 
-    invoke-direct {v1, p0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
+    invoke-direct {v0, p0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p0
 
@@ -1803,19 +1748,14 @@
     invoke-virtual {p1, v0, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_2
-    const-string p0, "source"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final inviteOpened(Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p0, :cond_0
+    const-string v0, "inviteCode"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -1834,41 +1774,32 @@
     invoke-virtual {v0, v1, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "inviteCode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final inviteResolveFailed(Ljava/lang/String;Ljava/lang/String;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "inviteCode"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "location"
+    const-string v0, "location"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v0, 0x4
+    const/4 v1, 0x4
 
-    new-array v0, v0, [Lkotlin/Pair;
+    new-array v1, v1, [Lkotlin/Pair;
 
-    const/4 v2, 0x0
+    new-instance v2, Lkotlin/Pair;
 
-    new-instance v3, Lkotlin/Pair;
+    const-string v3, "code"
 
-    const-string v4, "code"
+    invoke-direct {v2, v3, p0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {v3, v4, p0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 p0, 0x0
 
-    aput-object v3, v0, v2
+    aput-object v2, v1, p0
 
     const/4 p0, 0x1
 
@@ -1880,7 +1811,7 @@
 
     invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v3, v0, p0
+    aput-object v3, v1, p0
 
     const/4 p0, 0x2
 
@@ -1900,17 +1831,17 @@
 
     invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v3, v0, p0
+    aput-object v3, v1, p0
 
     const/4 p0, 0x3
 
     new-instance v2, Lkotlin/Pair;
 
-    invoke-direct {v2, v1, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v2, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, v0, p0
+    aput-object v2, v1, p0
 
-    invoke-static {v0}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v1}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object p0
 
@@ -1921,18 +1852,6 @@
     invoke-virtual {p1, v0, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "inviteCode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final inviteShareClicked(Lcom/discord/models/domain/ModelInvite;)V
@@ -1973,7 +1892,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -2033,7 +1952,7 @@
 
     if-eqz p0, :cond_3
 
-    invoke-static {p0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -2121,15 +2040,13 @@
 
     const-string v0, "gift"
 
-    const/4 v1, 0x0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p0, :cond_3
+    const-string v1, "location"
 
-    const-string v2, "location"
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
-
-    sget-object v3, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
 
@@ -2139,30 +2056,35 @@
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
 
-    move-result-object v1
+    move-result-object p0
+
+    goto :goto_0
 
     :cond_0
-    invoke-direct {v3, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/models/domain/ModelSku;)Ljava/util/Map;
+    const/4 p0, 0x0
+
+    :goto_0
+    invoke-direct {v2, p0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/models/domain/ModelSku;)Ljava/util/Map;
 
     move-result-object p0
 
     if-eqz p1, :cond_1
 
-    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils;
+    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils;
 
-    invoke-virtual {v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils;->getProperties$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelChannel;)Ljava/util/Map;
+    invoke-virtual {v2, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils;->getProperties$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelChannel;)Ljava/util/Map;
 
     move-result-object p1
 
     if-eqz p1, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
-    :goto_0
-    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
+    :goto_1
+    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
     const/4 v3, 0x2
 
@@ -2172,19 +2094,19 @@
 
     new-instance v5, Lkotlin/Pair;
 
-    invoke-direct {v5, v2, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v5, v1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     aput-object v5, v3, v4
 
     const/4 p2, 0x1
 
-    new-instance v2, Lkotlin/Pair;
+    new-instance v1, Lkotlin/Pair;
 
     const-string v4, "type"
 
-    invoke-direct {v2, v4, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v1, v4, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, v3, p2
+    aput-object v1, v3, p2
 
     invoke-static {v3}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
@@ -2200,29 +2122,21 @@
 
     const-string p1, "open_modal"
 
-    invoke-virtual {v1, p1, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+    invoke-virtual {v2, p1, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final openModal(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "modalName"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "location"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -2230,15 +2144,15 @@
 
     new-array v1, v1, [Lkotlin/Pair;
 
-    const/4 v2, 0x0
+    new-instance v2, Lkotlin/Pair;
 
-    new-instance v3, Lkotlin/Pair;
+    const-string v3, "location_section"
 
-    const-string v4, "location_section"
+    invoke-direct {v2, v3, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {v3, v4, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 p1, 0x0
 
-    aput-object v3, v1, v2
+    aput-object v2, v1, p1
 
     const/4 p1, 0x1
 
@@ -2259,20 +2173,6 @@
     invoke-virtual {v0, p1, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "location"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "modalName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic openUserSheet$default(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
@@ -2338,7 +2238,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -2347,15 +2249,6 @@
     invoke-virtual {v0, v1, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "properties"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic registerViewed$default(Lcom/discord/utilities/analytics/AnalyticsTracker;Lcom/discord/models/domain/ModelInvite;ILjava/lang/Object;)V
@@ -2417,7 +2310,7 @@
 
     const-string v1, ""
 
-    invoke-static {p1, v0, v1}, Lj0/t/p;->substringBefore(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
+    invoke-static {p1, v0, v1}, Lk0/u/p;->substringBefore(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -2447,7 +2340,7 @@
     :goto_1
     if-eqz p1, :cond_2
 
-    invoke-static {p1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -2483,7 +2376,7 @@
 
     const-string v1, "code"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "invite_code"
 
@@ -2528,7 +2421,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -2549,7 +2442,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -2843,7 +2736,7 @@
 
     move-result-object p1
 
-    const-string v0, "voice_output_volume"
+    const-string/jumbo v0, "voice_output_volume"
 
     invoke-interface {p2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2902,7 +2795,7 @@
 
     if-eqz v0, :cond_1
 
-    const-string v0, "unicode"
+    const-string/jumbo v0, "unicode"
 
     goto :goto_0
 
@@ -3058,19 +2951,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "optionDescriptions"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "channelIds"
 
-    const-string v1, "description"
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "description"
 
-    new-instance v0, Ljava/util/HashMap;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+    new-instance v1, Ljava/util/HashMap;
+
+    invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3078,7 +2973,7 @@
 
     const-string p2, "guild_id"
 
-    invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3086,17 +2981,17 @@
 
     const-string p1, "index"
 
-    invoke-interface {v0, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const-string p0, "options"
 
-    invoke-interface {v0, p0, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, p0, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const-string p0, "options_channel_ids"
 
-    invoke-interface {v0, p0, p4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, p0, p4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {v0, v1, p5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v0, p5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-static {p6}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -3104,34 +2999,15 @@
 
     const-string p1, "has_custom_emojis"
 
-    invoke-interface {v0, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     sget-object p0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
     const-string p1, "guild_welcome_screen_option_selected"
 
-    invoke-virtual {p0, p1, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+    invoke-virtual {p0, p1, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "channelIds"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "optionDescriptions"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final withGameProperties(JLkotlin/jvm/functions/Function1;)V
@@ -3170,14 +3046,18 @@
 
     and-int/lit8 p2, p2, 0x20
 
+    const-string p2, "onNext"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "errorClass"
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lf/a/b/c0;
+
     const/4 v6, 0x0
 
-    if-eqz p3, :cond_1
-
-    if-eqz v2, :cond_0
-
-    new-instance p2, Lf/a/b/a0;
-
     move-object v0, p2
 
     move-object v1, v6
@@ -3188,25 +3068,11 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "errorClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string p1, "onNext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 
@@ -3330,11 +3196,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "propertyProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -3357,26 +3225,14 @@
     invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "propertyProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final activityUpdatedSpotify(Ljava/lang/String;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "trackId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -3411,21 +3267,14 @@
     invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "trackId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final ageGateSubmitted(JLjava/lang/String;)V
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "sourcePage"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -3450,15 +3299,6 @@
     invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "sourcePage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final appCrashed()V
@@ -3482,7 +3322,7 @@
 
     const-string v0, "stacktrace"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lkotlin/Pair;
 
@@ -3499,19 +3339,14 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final attributionChange(Lcom/adjust/sdk/AdjustAttribution;)V
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "attribution"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -3519,17 +3354,17 @@
 
     new-array v1, v1, [Lkotlin/Pair;
 
+    iget-object v2, p1, Lcom/adjust/sdk/AdjustAttribution;->trackerToken:Ljava/lang/String;
+
+    new-instance v3, Lkotlin/Pair;
+
+    const-string v4, "adjust_tracker_token"
+
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
     const/4 v2, 0x0
 
-    iget-object v3, p1, Lcom/adjust/sdk/AdjustAttribution;->trackerToken:Ljava/lang/String;
-
-    new-instance v4, Lkotlin/Pair;
-
-    const-string v5, "adjust_tracker_token"
-
-    invoke-direct {v4, v5, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    aput-object v4, v1, v2
+    aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
@@ -3595,24 +3430,15 @@
 
     move-result-object p1
 
-    const-string v1, "user_attribution_received"
+    const-string/jumbo v1, "user_attribution_received"
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attribution"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public final callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZI)V
-    .locals 16
+.method public final callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;Z)V
+    .locals 15
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -3630,11 +3456,11 @@
             "Ljava/lang/String;",
             "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
             "Lcom/discord/stores/StoreAudioDevices$OutputDevice;",
-            "ZI)V"
+            "Z)V"
         }
     .end annotation
 
-    move-object/from16 v10, p0
+    move-object v10, p0
 
     move-object/from16 v11, p9
 
@@ -3642,19 +3468,31 @@
 
     move-object/from16 v13, p12
 
-    move/from16 v14, p14
+    const-string v0, "channel"
 
-    const/4 v15, 0x0
+    move-object/from16 v3, p4
 
-    if-eqz p4, :cond_f
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_e
+    const-string v0, "guildVoiceStates"
 
-    if-eqz p8, :cond_d
+    move-object/from16 v5, p5
 
-    if-eqz v12, :cond_c
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v13, :cond_b
+    const-string v0, "feedbackRating"
+
+    move-object/from16 v14, p8
+
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "voiceConfig"
+
+    invoke-static {v12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "audioOutputDevice"
+
+    invoke-static {v13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -3662,23 +3500,19 @@
 
     const/4 v9, 0x0
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
     move-wide/from16 v1, p1
 
-    move-object/from16 v3, p4
-
     move-object/from16 v4, p6
 
-    move-object/from16 v5, p5
-
     move-object/from16 v7, p3
 
     invoke-static/range {v0 .. v9}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getVoiceChannelProperties$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/Map;
 
     move-result-object v0
 
-    invoke-direct {v10, v12, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
+    invoke-direct {p0, v12, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
 
     new-instance v1, Ljava/util/HashMap;
 
@@ -3712,14 +3546,14 @@
 
     if-eqz v0, :cond_2
 
-    const-string v0, "wired_headset"
+    const-string/jumbo v0, "wired_headset"
 
     goto :goto_0
 
     :cond_2
     instance-of v0, v13, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_6
 
     const-string v0, "earpiece"
 
@@ -3728,6 +3562,29 @@
 
     invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
+    instance-of v0, v13, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+
+    if-eqz v0, :cond_3
+
+    move-object v0, v13
+
+    check-cast v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "output_device_name"
+
+    invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_3
     invoke-virtual/range {p8 .. p8}, Lcom/discord/widgets/voice/feedback/FeedbackRating;->getAnalyticsValue()Ljava/lang/String;
 
     move-result-object v0
@@ -3750,63 +3607,13 @@
 
     move-result-object v0
 
-    const-string v2, "video_hardware_scaling_enabled"
-
-    invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const/4 v0, -0x1
-
-    if-eq v14, v0, :cond_7
-
-    if-eqz v14, :cond_6
-
-    const/4 v0, 0x1
-
-    if-eq v14, v0, :cond_5
-
-    const/4 v0, 0x2
-
-    if-eq v14, v0, :cond_4
-
-    const/4 v0, 0x3
-
-    if-eq v14, v0, :cond_3
-
-    const-string v0, "invalid"
-
-    goto :goto_1
-
-    :cond_3
-    const-string v0, "communication"
-
-    goto :goto_1
-
-    :cond_4
-    const-string v0, "call"
-
-    goto :goto_1
-
-    :cond_5
-    const-string v0, "ringtone"
-
-    goto :goto_1
-
-    :cond_6
-    const-string v0, "normal"
-
-    goto :goto_1
-
-    :cond_7
-    const-string v0, "current"
-
-    :goto_1
-    const-string v2, "audio_mode"
+    const-string/jumbo v2, "video_hardware_scaling_enabled"
 
     invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     const-string v0, "call_report_problem"
 
-    if-eqz v11, :cond_9
+    if-eqz v11, :cond_5
 
     sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -3814,62 +3621,64 @@
 
     move-result-object v3
 
-    new-instance v4, Ljava/util/LinkedHashMap;
+    const/4 v4, 0x0
+
+    new-instance v5, Ljava/util/LinkedHashMap;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
-    move-result v5
+    move-result v6
 
-    invoke-static {v5}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v5
-
-    invoke-direct {v4, v5}, Ljava/util/LinkedHashMap;-><init>(I)V
-
-    invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object v5
-
-    invoke-interface {v5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v5
-
-    :goto_2
-    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+    invoke-static {v6}, Lf/n/a/k/a;->mapCapacity(I)I
 
     move-result v6
 
-    if-eqz v6, :cond_8
+    invoke-direct {v5, v6}, Ljava/util/LinkedHashMap;-><init>(I)V
 
-    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
     move-result-object v6
 
-    check-cast v6, Ljava/util/Map$Entry;
+    invoke-interface {v6}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+    move-result-object v6
+
+    :goto_1
+    invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v7
+
+    if-eqz v7, :cond_4
+
+    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-interface {v6}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    check-cast v7, Ljava/util/Map$Entry;
 
-    move-result-object v6
+    invoke-interface {v7}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
-    invoke-static {v6}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    move-result-object v8
 
-    move-result-object v6
+    invoke-interface {v7}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    invoke-interface {v4, v7, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    move-result-object v7
 
-    goto :goto_2
+    invoke-static {v7}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    :cond_8
-    invoke-virtual {v2, v0, v3, v15, v4}, Lcom/discord/app/AppLog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
+    move-result-object v7
 
-    :cond_9
+    invoke-interface {v5, v8, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_1
+
+    :cond_4
+    invoke-virtual {v2, v0, v3, v4, v5}, Lcom/discord/app/AppLog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
+
+    :cond_5
     sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    invoke-direct {v10, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
+    invoke-direct {p0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v1
 
@@ -3877,47 +3686,12 @@
 
     return-void
 
-    :cond_a
+    :cond_6
     new-instance v0, Lkotlin/NoWhenBranchMatchedException;
 
     invoke-direct {v0}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw v0
-
-    :cond_b
-    const-string v0, "audioOutputDevice"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v15
-
-    :cond_c
-    const-string v0, "voiceConfig"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v15
-
-    :cond_d
-    const-string v0, "feedbackRating"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v15
-
-    :cond_e
-    const-string v0, "guildVoiceStates"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v15
-
-    :cond_f
-    const-string v0, "channel"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v15
 .end method
 
 .method public final captchaFailed(Ljava/lang/String;)V
@@ -3925,7 +3699,7 @@
 
     const-string v0, "reason"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -3942,13 +3716,6 @@
     invoke-virtual {v1, v0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final changeLogEvent(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
@@ -3967,15 +3734,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "event"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "version"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "revision"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "properties"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -4010,34 +3783,6 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "revision"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "version"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final channelOpened(JLkotlin/jvm/functions/Function0;)V
@@ -4055,7 +3800,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "lazyPropertyProvider"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4078,15 +3825,6 @@
     invoke-virtual {p1, p2, v0, v1, v2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "lazyPropertyProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final chatInputComponentViewed(Ljava/lang/String;)V
@@ -4094,7 +3832,7 @@
 
     const-string v0, "type"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/util/LinkedHashMap;
 
@@ -4109,13 +3847,6 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final closeFirstServerTipTutorial(Z)V
@@ -4131,11 +3862,13 @@
 .method public final createGuildViewed(Lcom/discord/widgets/guilds/create/StockGuildTemplate;Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "stockGuildTemplate"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "source"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "guild_template_name"
 
@@ -4244,30 +3977,18 @@
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stockGuildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final customStatusUpdated(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;Lcom/discord/utilities/analytics/Traits$Location;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "formState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "locationTrait"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -4284,20 +4005,6 @@
     invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locationTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "formState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final deepLinkReceived(Landroid/content/Intent;Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;Ljava/util/Map;)V
@@ -4315,13 +4022,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "metadata"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "snapshotProperties"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "actions.fulfillment.extra.ACTION_TOKEN"
 
@@ -4393,7 +4104,7 @@
 
     new-instance v1, Lkotlin/Pair;
 
-    const-string v2, "voice_action"
+    const-string/jumbo v2, "voice_action"
 
     invoke-direct {v1, v2, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -4438,39 +4149,22 @@
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "snapshotProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "metadata"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final dismissModal(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "modalName"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "location"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dismissType"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -4478,15 +4172,15 @@
 
     new-array v1, v1, [Lkotlin/Pair;
 
-    const/4 v2, 0x0
+    new-instance v2, Lkotlin/Pair;
 
-    new-instance v3, Lkotlin/Pair;
+    const-string v3, "location_section"
 
-    const-string v4, "location_section"
+    invoke-direct {v2, v3, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {v3, v4, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 p2, 0x0
 
-    aput-object v3, v1, v2
+    aput-object v2, v1, p2
 
     const/4 p2, 0x1
 
@@ -4502,7 +4196,7 @@
 
     new-instance p2, Lkotlin/Pair;
 
-    const-string v2, "dismiss_reason"
+    const-string v2, "dismiss_type"
 
     invoke-direct {p2, v2, p3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -4517,27 +4211,6 @@
     invoke-virtual {v0, p2, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "dismissReason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "modalName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final externalDynamicLinkReceived(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
@@ -4613,7 +4286,7 @@
 
     if-eqz p4, :cond_3
 
-    invoke-static {p4}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p4}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p4
 
@@ -4672,7 +4345,9 @@
 .method public final externalShare(Landroid/net/Uri;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -4689,39 +4364,28 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final externalViewClosed(Ljava/lang/String;J)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "type"
 
-    const-string v1, "type"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
+    const/4 v2, 0x2
 
-    const/4 v3, 0x2
+    new-array v2, v2, [Lkotlin/Pair;
 
-    new-array v3, v3, [Lkotlin/Pair;
+    new-instance v3, Lkotlin/Pair;
 
-    new-instance v4, Lkotlin/Pair;
-
-    invoke-direct {v4, v1, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v3, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     const/4 p1, 0x0
 
-    aput-object v4, v3, p1
+    aput-object v3, v2, p1
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4729,33 +4393,36 @@
 
     invoke-virtual {p2}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    const-wide/16 v6, 0x0
+    const-wide/16 v5, 0x0
 
     const/4 p3, 0x1
 
-    cmp-long v1, v4, v6
+    cmp-long v0, v3, v5
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     const/4 p1, 0x1
 
     :cond_0
     if-eqz p1, :cond_1
 
-    move-object v0, p2
+    goto :goto_0
 
     :cond_1
+    const/4 p2, 0x0
+
+    :goto_0
     new-instance p1, Lkotlin/Pair;
 
-    const-string p2, "duration_open_ms"
+    const-string v0, "duration_open_ms"
 
-    invoke-direct {p1, p2, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {p1, v0, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object p1, v3, p3
+    aput-object p1, v2, p3
 
-    invoke-static {v3}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v2}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object p1
 
@@ -4765,14 +4432,9 @@
 
     const-string p2, "app_external_view_closed"
 
-    invoke-virtual {v2, p2, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+    invoke-virtual {v1, p2, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final failedMessageResolved(IIIZZLcom/discord/stores/FailedMessageResolutionType;JILjava/util/Map;)V
@@ -4790,11 +4452,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "resolutionType"
 
-    if-eqz p6, :cond_1
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_0
+    const-string v0, "snapshotProperties"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -4879,20 +4543,6 @@
     invoke-virtual {p1, p3, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "snapshotProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "resolutionType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final fileUploadAlertViewed(Lcom/discord/utilities/rest/FileUploadAlertType;IIIZZZLjava/util/Map;)V
@@ -4910,11 +4560,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "alertType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_0
+    const-string v0, "snapshotProperties"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -4991,26 +4643,14 @@
     invoke-virtual {p1, p3, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "snapshotProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "alertType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final friendAddViewed(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lkotlin/Pair;
 
@@ -5029,15 +4669,6 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final friendRequestFailed(Ljava/lang/String;)V
@@ -5090,21 +4721,26 @@
 .method public final giftResolved(Lcom/discord/models/domain/ModelGift;)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
 
     move-result-object v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-direct {p0, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/models/domain/ModelSku;)Ljava/util/Map;
 
     move-result-object v0
@@ -5172,19 +4808,14 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final giftResolvedFailed(Ljava/lang/String;)V
     .locals 5
 
-    if-eqz p1, :cond_0
+    const-string v0, "giftCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -5192,15 +4823,15 @@
 
     new-array v1, v1, [Lkotlin/Pair;
 
-    const/4 v2, 0x0
+    new-instance v2, Lkotlin/Pair;
 
-    new-instance v3, Lkotlin/Pair;
+    const-string v3, "gift_code"
 
-    const-string v4, "gift_code"
+    invoke-direct {v2, v3, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {v3, v4, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 p1, 0x0
 
-    aput-object v3, v1, v2
+    aput-object v2, v1, p1
 
     const/4 p1, 0x1
 
@@ -5223,21 +4854,14 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final guildTemplateResolved(Lcom/discord/models/domain/ModelGuildTemplate;)V
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -5245,17 +4869,17 @@
 
     new-array v1, v1, [Lkotlin/Pair;
 
+    sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    new-instance v3, Lkotlin/Pair;
+
+    const-string v4, "resolved"
+
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
     const/4 v2, 0x0
 
-    sget-object v3, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    new-instance v4, Lkotlin/Pair;
-
-    const-string v5, "resolved"
-
-    invoke-direct {v4, v5, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    aput-object v4, v1, v2
+    aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
@@ -5326,15 +4950,6 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final guildViewed(JLkotlin/jvm/functions/Function0;)V
@@ -5352,7 +4967,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "lazyPropertyProvider"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -5375,15 +4992,6 @@
     invoke-virtual {p1, p2, v0, v1, v2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "lazyPropertyProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final inviteResolved(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)V
@@ -5391,23 +4999,23 @@
 
     const-string v0, "location"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x3
 
     new-array v1, v1, [Lkotlin/Pair;
 
+    sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    new-instance v3, Lkotlin/Pair;
+
+    const-string v4, "resolved"
+
+    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
     const/4 v2, 0x0
 
-    sget-object v3, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    new-instance v4, Lkotlin/Pair;
-
-    const-string v5, "resolved"
-
-    invoke-direct {v4, v5, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    aput-object v4, v1, v2
+    aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
@@ -5449,7 +5057,7 @@
 
     const-string v1, "invite.code"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v1, p2
 
@@ -5498,7 +5106,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -5519,7 +5127,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -5541,13 +5149,6 @@
     invoke-virtual {p1, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final inviteSent(Lcom/discord/models/domain/ModelInvite;Ljava/util/Map;)V
@@ -5564,7 +5165,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "snapshotProperties"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
 
@@ -5581,19 +5184,10 @@
     invoke-virtual {p2, v0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "snapshotProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final inviteSuggestionOpened(JLjava/util/List;Ljava/util/List;)V
-    .locals 13
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -5608,239 +5202,231 @@
         }
     .end annotation
 
-    move-object/from16 v0, p3
+    const-string v0, "channelSuggestions"
 
-    move-object/from16 v1, p4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v6, 0x0
+    const-string/jumbo v0, "userSuggestions"
 
-    if-eqz v0, :cond_4
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_3
+    const/4 v0, 0x2
 
-    const/4 v2, 0x2
+    new-array v0, v0, [Ljava/util/List;
 
-    new-array v2, v2, [Ljava/util/List;
+    new-instance v1, Ljava/util/ArrayList;
 
-    const/4 v3, 0x0
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    new-instance v4, Ljava/util/ArrayList;
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface/range {p3 .. p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v5
+    move-result-object v2
 
     :goto_0
-    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v3
 
-    const/16 v8, 0xa
+    const/16 v4, 0xa
 
-    if-eqz v7, :cond_1
+    if-eqz v3, :cond_1
 
-    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v3
 
-    check-cast v7, Lcom/discord/models/domain/ModelChannel;
+    check-cast v3, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List;
 
-    move-result-object v7
+    move-result-object v3
 
-    const-string v9, "channel.recipients"
+    const-string v5, "channel.recipients"
 
-    invoke-static {v7, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v9, Ljava/util/ArrayList;
+    new-instance v5, Ljava/util/ArrayList;
 
-    invoke-static {v7, v8}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v3, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v8
+    move-result v4
 
-    invoke-direct {v9, v8}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v5, v4}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v7
+    move-result-object v3
 
     :goto_1
-    invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v8
+    move-result v4
 
-    if-eqz v8, :cond_0
+    if-eqz v4, :cond_0
 
-    invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v4
 
-    check-cast v8, Lcom/discord/models/domain/ModelUser;
+    check-cast v4, Lcom/discord/models/domain/ModelUser;
 
-    const-string v10, "it"
+    const-string v6, "it"
 
-    invoke-static {v8, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v10
+    move-result-wide v6
 
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v8
+    move-result-object v4
 
-    invoke-interface {v9, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v5, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_0
-    invoke-static {v4, v9}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+    invoke-static {v1, v5}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
 
     goto :goto_0
 
     :cond_1
-    aput-object v4, v2, v3
+    const/4 v2, 0x0
 
-    const/4 v3, 0x1
+    aput-object v1, v0, v2
 
-    new-instance v4, Ljava/util/ArrayList;
+    const/4 v1, 0x1
 
-    invoke-static {v1, v8}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    new-instance v2, Ljava/util/ArrayList;
 
-    move-result v5
+    invoke-static {p4, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
+    move-result v3
 
-    invoke-interface/range {p4 .. p4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
 
-    move-result-object v5
+    invoke-interface {p4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
 
     :goto_2
-    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v4
 
-    if-eqz v7, :cond_2
+    if-eqz v4, :cond_2
 
-    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v4
 
-    check-cast v7, Lcom/discord/models/domain/ModelUser;
+    check-cast v4, Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v7
+    move-result-wide v4
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v7
+    move-result-object v4
 
-    invoke-interface {v4, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
     :cond_2
-    aput-object v4, v2, v3
+    aput-object v2, v0, v1
 
-    invoke-static {v2}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->flatten(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lk0/j/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUserRelationships()Lcom/discord/stores/StoreUserRelationships;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v0}, Lcom/discord/stores/StoreUserRelationships;->observe(Ljava/util/Collection;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
-    invoke-static {v2}, Lf/n/a/k/a;->flatten(Ljava/lang/Iterable;)Ljava/util/List;
+    const-string v0, "StoreStream\n        .get\u2026         }.keys\n        }"
 
-    move-result-object v2
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lj0/i/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
+    const-wide/16 v3, 0x0
 
-    move-result-object v2
+    const/4 v5, 0x0
 
-    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    const/4 v6, 0x3
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getUserRelationships()Lcom/discord/stores/StoreUserRelationships;
+    const/4 v7, 0x0
 
-    move-result-object v3
+    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
 
-    invoke-virtual {v3, v2}, Lcom/discord/stores/StoreUserRelationships;->observe(Ljava/util/Collection;)Lrx/Observable;
+    move-result-object v0
 
-    move-result-object v2
+    invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
-    sget-object v3, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1;
+    move-result-object v0
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    new-instance v5, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;
 
-    move-result-object v7
+    invoke-direct {v5, p3, p4, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;-><init>(Ljava/util/List;Ljava/util/List;J)V
 
-    const-string v2, "StoreStream\n        .get\u2026         }.keys\n        }"
+    const-class v3, Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-static {v7, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const/16 p1, 0x3c
 
-    const-wide/16 v8, 0x0
+    and-int/lit8 p2, p1, 0x4
 
-    const/4 v10, 0x0
+    and-int/lit8 p2, p1, 0x8
 
-    const/4 v11, 0x3
+    and-int/lit8 p2, p1, 0x10
 
-    const/4 v12, 0x0
+    and-int/lit8 p1, p1, 0x20
 
-    invoke-static/range {v7 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+    const-string p1, "onNext"
 
-    move-result-object v2
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+    const-string p1, "errorClass"
 
-    move-result-object v7
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v4, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;
+    new-instance p1, Lf/a/b/c0;
 
-    move-wide v2, p1
+    const/4 v7, 0x0
 
-    invoke-direct {v4, v0, v1, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;-><init>(Ljava/util/List;Ljava/util/List;J)V
+    move-object v1, p1
 
-    const-class v2, Lcom/discord/utilities/analytics/AnalyticsTracker;
+    move-object v2, v7
 
-    const/16 v0, 0x3c
+    move-object v4, v7
 
-    and-int/lit8 v1, v0, 0x4
+    move-object v6, v7
 
-    and-int/lit8 v1, v0, 0x8
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
-    and-int/lit8 v1, v0, 0x10
-
-    and-int/lit8 v0, v0, 0x20
-
-    new-instance v8, Lf/a/b/a0;
-
-    move-object v0, v8
-
-    move-object v1, v6
-
-    move-object v3, v6
-
-    move-object v5, v6
-
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
-
-    invoke-virtual {v7, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_3
-    const-string v0, "userSuggestions"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_4
-    const-string v0, "channelSuggestions"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public final inviteViewed()V
@@ -5878,7 +5464,9 @@
 .method public final launchGame(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "gameName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -5901,15 +5489,6 @@
     invoke-virtual {p1, v1, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gameName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final loginAttempt(Z)V
@@ -5946,29 +5525,33 @@
 .end method
 
 .method public final newUserOnboarding(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Z)V
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "flowType"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "fromStep"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "toStep"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x4
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    const/4 v1, 0x0
+    new-instance v1, Lkotlin/Pair;
 
-    new-instance v2, Lkotlin/Pair;
+    const-string v2, "flow_type"
 
-    const-string v3, "flow_type"
+    invoke-direct {v1, v2, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {v2, v3, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 p1, 0x0
 
-    aput-object v2, v0, v1
+    aput-object v1, v0, p1
 
     const/4 p1, 0x1
 
@@ -6046,169 +5629,150 @@
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "toStep"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "fromStep"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "flowType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final notificationSettingsUpdated(Lcom/discord/models/domain/ModelNotificationSettings;Lcom/discord/models/domain/ModelChannel;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userGuildSettings"
 
-    if-eqz p1, :cond_f
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/util/HashMap;
+    new-instance v0, Ljava/util/HashMap;
 
-    invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->getChannelOverrides()Ljava/util/List;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-nez v2, :cond_0
+    if-nez v1, :cond_0
 
-    const-string v2, "guild"
+    const-string v1, "guild"
 
     goto :goto_0
 
     :cond_0
-    const-string v2, "channel"
+    const-string v1, "channel"
 
     :goto_0
-    const-string v3, "update_type"
+    const-string/jumbo v2, "update_type"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->isSuppressEveryone()Z
 
-    move-result v2
+    move-result v1
 
-    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "guild_suppress_everyone"
+    const-string v2, "guild_suppress_everyone"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->isSuppressRoles()Z
 
-    move-result v2
+    move-result v1
 
-    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "guild_suppress_roles"
+    const-string v2, "guild_suppress_roles"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->isMuted()Z
 
-    move-result v2
+    move-result v1
 
-    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "guild_is_muted"
+    const-string v2, "guild_is_muted"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->getMuteConfig()Lcom/discord/models/domain/ModelMuteConfig;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_1
+    const/4 v2, 0x0
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTimeMs()Ljava/lang/Long;
+    if-eqz v1, :cond_1
 
-    move-result-object v2
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTimeMs()Ljava/lang/Long;
+
+    move-result-object v1
 
     goto :goto_1
 
     :cond_1
-    move-object v2, v0
+    move-object v1, v2
 
     :goto_1
     const-string v3, "guild_muted_until"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->isMobilePush()Z
 
-    move-result v2
+    move-result v1
 
-    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v2
+    move-result-object v1
 
     const-string v3, "guild_receive_mobile_push"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->getMessageNotifications()I
 
-    move-result v2
+    move-result v1
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getAnalyticsValueForNotificationFrequency(Ljava/lang/Integer;)Ljava/lang/String;
+    invoke-direct {p0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getAnalyticsValueForNotificationFrequency(Ljava/lang/Integer;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
     const-string v3, "guild_message_notification_settings"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     if-eqz p2, :cond_2
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
-    move-result-wide v2
+    move-result-wide v3
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
     goto :goto_2
 
     :cond_2
-    move-object v2, v0
+    move-object v1, v2
 
     :goto_2
     const-string v3, "parent_id"
 
-    invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->getChannelOverrides()Ljava/util/List;
 
     move-result-object p1
 
-    const-string v2, "userGuildSettings.channelOverrides"
+    const-string/jumbo v1, "userGuildSettings.channelOverrides"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -6217,25 +5781,25 @@
     :cond_3
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
     const/4 v3, 0x1
 
     const/4 v4, 0x0
 
-    if-eqz v2, :cond_5
+    if-eqz v1, :cond_5
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    move-object v5, v2
+    move-object v5, v1
 
     check-cast v5, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
 
     const-string v6, "it"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getChannelId()J
 
@@ -6264,14 +5828,14 @@
     goto :goto_4
 
     :cond_5
-    move-object v2, v0
+    move-object v1, v2
 
     :goto_4
-    check-cast v2, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
+    check-cast v1, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->isMuted()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->isMuted()Z
 
     move-result p1
 
@@ -6282,12 +5846,12 @@
     goto :goto_5
 
     :cond_6
-    move-object p1, v0
+    move-object p1, v2
 
     :goto_5
-    if-eqz v2, :cond_7
+    if-eqz v1, :cond_7
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getMessageNotifications()I
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getMessageNotifications()I
 
     move-result v5
 
@@ -6298,7 +5862,7 @@
     goto :goto_6
 
     :cond_7
-    move-object v5, v0
+    move-object v5, v2
 
     :goto_6
     if-eqz p2, :cond_d
@@ -6355,7 +5919,7 @@
 
     sget-object p2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -6376,16 +5940,16 @@
 
     const-string v3, "channel_is_overridden"
 
-    invoke-interface {v1, v3, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v3, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_d
     const-string p2, "channel_is_muted"
 
-    invoke-interface {v1, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v2, :cond_e
+    if-eqz v1, :cond_e
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getMuteConfig()Lcom/discord/models/domain/ModelMuteConfig;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getMuteConfig()Lcom/discord/models/domain/ModelMuteConfig;
 
     move-result-object p1
 
@@ -6393,12 +5957,12 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTimeMs()Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object v2
 
     :cond_e
     const-string p1, "channel_muted_until"
 
-    invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-direct {p0, v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getAnalyticsValueForNotificationFrequency(Ljava/lang/Integer;)Ljava/lang/String;
 
@@ -6406,11 +5970,11 @@
 
     const-string p2, "channel_message_notification_settings"
 
-    invoke-interface {v1, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    invoke-direct {p0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
+    invoke-direct {p0, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p2
 
@@ -6419,13 +5983,6 @@
     invoke-virtual {p1, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_f
-    const-string p1, "userGuildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final oauth2AuthorizedViewed(J)V
@@ -6533,11 +6090,13 @@
 .method public final openModal(Ljava/lang/String;Lcom/discord/utilities/analytics/Traits$Source;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "modalName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "sourceTrait"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -6556,20 +6115,6 @@
     invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "sourceTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "modalName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
@@ -6611,7 +6156,9 @@
 .method public final openUserStatusSheet(Lcom/discord/utilities/analytics/Traits$Location;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "locationTrait"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -6640,15 +6187,6 @@
     invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locationTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final overlayVoiceClosed(Ljava/util/Map;)V
@@ -6664,7 +6202,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -6672,7 +6212,7 @@
 
     const-string v2, "type"
 
-    const-string v3, "voice"
+    const-string/jumbo v3, "voice"
 
     invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -6689,15 +6229,6 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final overlayVoiceOpened(Ljava/util/Map;)V
@@ -6713,7 +6244,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -6721,7 +6254,7 @@
 
     const-string v2, "type"
 
-    const-string v3, "voice"
+    const-string/jumbo v3, "voice"
 
     invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -6738,27 +6271,22 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final paymentFlowOpened(Lcom/discord/utilities/analytics/Traits$Location;Lcom/discord/utilities/analytics/Traits$Subscription;Lcom/discord/utilities/analytics/Traits$Payment;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "locationTrait"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "subscriptionTrait"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "paymentTrait"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -6777,33 +6305,14 @@
     invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "paymentTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscriptionTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "locationTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final permissionsRequested(Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "permissionType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -6822,21 +6331,14 @@
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "permissionType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final premiumSettingsOpened(Lcom/discord/utilities/analytics/Traits$Location;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "locationTrait"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -6851,15 +6353,6 @@
     invoke-virtual {p1, v1, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locationTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final quickSwitcherOpen()V
@@ -6889,11 +6382,13 @@
 .method public final quickSwitcherSelect(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;I)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "model"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_9
+    const-string v0, "selected"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->getSearchType()I
 
@@ -7166,20 +6661,6 @@
     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
 
     return-void
-
-    :cond_9
-    const-string p1, "selected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final registerViewed(Lcom/discord/models/domain/ModelInvite;)V
@@ -7287,13 +6768,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchType"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "sourceObject"
 
-    if-eqz p4, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "snapshotProperties"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -7338,27 +6823,6 @@
     invoke-virtual {p1, p3, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "snapshotProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sourceObject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final searchResultViewed(Lcom/discord/utilities/analytics/SearchType;ILjava/util/Map;)V
@@ -7376,11 +6840,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "snapshotProperties"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -7417,20 +6883,6 @@
     invoke-virtual {p1, p3, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "snapshotProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final searchStart(Lcom/discord/utilities/analytics/SearchType;Ljava/util/Map;)V
@@ -7447,11 +6899,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "snapshotProperties"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -7480,24 +6934,10 @@
     invoke-virtual {p1, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "snapshotProperties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final settingsPaneViewed(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -7511,25 +6951,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "settingsType"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "pane"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    const/4 v1, 0x0
+    new-instance v1, Lkotlin/Pair;
 
-    new-instance v2, Lkotlin/Pair;
+    const-string v2, "settings_type"
 
-    const-string v3, "settings_type"
+    invoke-direct {v1, v2, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-direct {v2, v3, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 p1, 0x0
 
-    aput-object v2, v0, v1
+    aput-object v1, v0, p1
 
     const/4 p1, 0x1
 
@@ -7561,20 +7003,6 @@
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "pane"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "settingsType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final showFirstServerTipTutorial()V
@@ -7588,54 +7016,47 @@
 .end method
 
 .method public final surveyViewed(Ljava/lang/String;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "surveyId"
 
-    new-instance v3, Landroid/os/Bundle;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v3}, Landroid/os/Bundle;-><init>()V
+    new-instance v4, Landroid/os/Bundle;
+
+    invoke-direct {v4}, Landroid/os/Bundle;-><init>()V
 
     const-string v0, "survey_id"
 
-    invoke-virtual {v3, v0, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v4, v0, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getFirebaseAnalytics()Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     move-result-object p1
 
-    iget-object v0, p1, Lcom/google/firebase/analytics/FirebaseAnalytics;->a:Lf/h/a/f/h/k/g;
+    iget-object v1, p1, Lcom/google/firebase/analytics/FirebaseAnalytics;->a:Lf/h/a/f/h/k/g;
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x0
+    const-string v3, "Survey_Viewed"
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x1
 
-    const-string v2, "Survey_Viewed"
+    const/4 v7, 0x0
 
-    invoke-virtual/range {v0 .. v6}, Lf/h/a/f/h/k/g;->d(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;ZZLjava/lang/Long;)V
+    invoke-virtual/range {v1 .. v7}, Lf/h/a/f/h/k/g;->d(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;ZZLjava/lang/Long;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "surveyId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final unhandledUrl(Ljava/lang/String;)V
     .locals 3
 
-    const-string v0, "url"
+    const-string/jumbo v0, "url"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -7647,18 +7068,11 @@
 
     move-result-object p1
 
-    const-string v0, "unhandled_uri"
+    const-string/jumbo v0, "unhandled_uri"
 
     invoke-virtual {v1, v0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateNotifications(Z)V
@@ -7727,13 +7141,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "speakingList"
 
-    if-eqz p3, :cond_7
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_6
+    const-string v0, "inputMode"
 
-    if-eqz p5, :cond_5
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channel"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3}, Ljava/util/Collection;->isEmpty()Z
 
@@ -7811,27 +7229,6 @@
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "speakingList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final userSpeaking(JLjava/util/Set;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)V
@@ -7848,13 +7245,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "speakingList"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "inputMode"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channel"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -7888,30 +7289,9 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "speakingList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public final videoInputDeviceSelected(JLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;)V
+.method public final videoInputDeviceSelected(JLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;)V
     .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -7923,11 +7303,16 @@
             "Lcom/discord/models/domain/ModelVoice$State;",
             ">;",
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
+            "Ljava/lang/String;",
             ")V"
         }
     .end annotation
 
-    if-eqz p4, :cond_1
+    const-string v0, "guildVoiceStates"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p3, :cond_0
 
@@ -7954,24 +7339,52 @@
 
     invoke-static/range {v0 .. v9}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getVoiceChannelProperties$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/Map;
 
-    move-result-object p3
+    move-result-object v0
 
-    new-instance p4, Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;
+    const-string v1, "camera"
 
-    invoke-direct {p4, p3}, Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;-><init>(Ljava/util/Map;)V
+    if-eqz p5, :cond_1
 
-    invoke-direct {p0, p1, p2, p4}, Lcom/discord/utilities/analytics/AnalyticsTracker;->withGameProperties(JLkotlin/jvm/functions/Function1;)V
+    move-object v2, v1
 
-    return-void
+    goto :goto_0
 
     :cond_1
-    const-string p1, "guildVoiceStates"
+    const-string v2, "none"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :goto_0
+    const-string/jumbo v3, "video_input_type"
 
-    const/4 p1, 0x0
+    invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    throw p1
+    if-eqz p5, :cond_2
+
+    invoke-static {v1}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    const-string v2, "enabled_inputs"
+
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_2
+    const-string v1, "media_session_id"
+
+    move-object/from16 v2, p6
+
+    invoke-interface {v0, v1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    new-instance v1, Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;
+
+    invoke-direct {v1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1;-><init>(Ljava/util/Map;)V
+
+    move-object v0, p0
+
+    move-wide v2, p1
+
+    invoke-direct {p0, p1, p2, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->withGameProperties(JLkotlin/jvm/functions/Function1;)V
+
+    return-void
 .end method
 
 .method public final videoStreamEnded(Ljava/util/Map;)V
@@ -7987,7 +7400,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
@@ -7995,20 +7410,11 @@
 
     move-result-object p1
 
-    const-string v1, "video_stream_ended"
+    const-string/jumbo v1, "video_stream_ended"
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final voiceChannelJoin(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/Integer;)V
@@ -8031,13 +7437,23 @@
 
     move-object v10, p0
 
-    const/4 v0, 0x0
+    const-string v0, "rtcConnectionId"
 
-    if-eqz p3, :cond_3
+    move-object v7, p3
 
-    if-eqz p4, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "channel"
+
+    move-object v3, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildVoiceStates"
+
+    move-object/from16 v5, p5
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -8049,14 +7465,8 @@
 
     move-wide v1, p1
 
-    move-object v3, p4
-
-    move-object/from16 v5, p5
-
     move-object/from16 v6, p6
 
-    move-object v7, p3
-
     invoke-static/range {v0 .. v9}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getVoiceChannelProperties$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/Map;
 
     move-result-object v0
@@ -8083,27 +7493,6 @@
     invoke-direct {p0, p1, p2, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->withGameProperties(JLkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_1
-    const-string v1, "guildVoiceStates"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "channel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "rtcConnectionId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final voiceChannelLeave(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;)V
@@ -8123,13 +7512,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "rtcConnectionId"
 
-    if-eqz p3, :cond_2
+    move-object v8, p3
 
-    if-eqz p4, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "channel"
+
+    move-object v4, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildVoiceStates"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v7, 0x0
 
@@ -8141,14 +7540,8 @@
 
     move-wide v2, p1
 
-    move-object v4, p4
-
     move-object/from16 v5, p6
 
-    move-object/from16 v6, p5
-
-    move-object v8, p3
-
     invoke-static/range {v1 .. v10}, Lcom/discord/utilities/analytics/AnalyticsTracker;->getVoiceChannelProperties$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/Map;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/Map;
 
     move-result-object v0
@@ -8157,44 +7550,15 @@
 
     invoke-direct {v1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker$voiceChannelLeave$1;-><init>(Ljava/util/Map;)V
 
-    move-object v2, p0
-
-    move-wide v3, p1
+    move-object v0, p0
 
     invoke-direct {p0, p1, p2, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->withGameProperties(JLkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    move-object v2, p0
-
-    const-string v1, "guildVoiceStates"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    move-object v2, p0
-
-    const-string v1, "channel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    move-object v2, p0
-
-    const-string v1, "rtcConnectionId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final voiceConnectionFailure(Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -8209,7 +7573,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -8219,20 +7585,11 @@
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    const-string p3, "voice_connection_failure"
+    const-string/jumbo p3, "voice_connection_failure"
 
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final voiceConnectionSuccess(Ljava/util/Map;Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)V
@@ -8252,11 +7609,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "properties"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "audioInfo"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -8268,25 +7627,11 @@
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    const-string p3, "voice_connection_success"
+    const-string/jumbo p3, "voice_connection_success"
 
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "audioInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final voiceDisconnect(Ljava/util/Map;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)V
@@ -8306,11 +7651,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "properties"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "voiceConfig"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -8349,27 +7696,17 @@
     invoke-virtual {v0, p4, p3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    invoke-direct {p0, p2, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
+    invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->filterNonNullValues(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object p3
+
+    invoke-direct {p0, p2, p3}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    const-string p3, "voice_disconnect"
+    const-string/jumbo p3, "voice_disconnect"
 
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "voiceConfig"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion$instance$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion$instance$2.smali
index fc77887e06..9c22ff1487 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion$instance$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion$instance$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion$instance$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
index a112ac8633..469c4738ba 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
@@ -96,13 +96,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "restAPI"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "eventsQueue"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -119,27 +123,6 @@
     iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsThrottledUntilMillis:Ljava/util/concurrent/ConcurrentHashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "eventsQueue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
@@ -212,7 +195,7 @@
 
     const/4 v3, 0x1
 
-    invoke-static {v2, v3}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v2, v3}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -317,7 +300,7 @@
     :goto_0
     const-string v2, "eventsThrottledUntilMillis[throttleKey] ?: 0"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -540,7 +523,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -605,7 +588,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
@@ -616,7 +601,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p2, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p2, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-direct {v1, p1, p2}, Lcom/discord/restapi/RestAPIParams$Science$Event;-><init>(Ljava/lang/String;Ljava/util/Map;)V
@@ -638,15 +623,6 @@
     invoke-virtual {p1, p2}, Lrx/Observable;->R(Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_1
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
@@ -668,11 +644,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "throttleKey"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "lazyPropertyProvider"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->isEventThrottled(Lkotlin/Pair;)Z
 
@@ -712,20 +690,6 @@
     invoke-interface {p4, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p1, "lazyPropertyProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "throttleKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
@@ -742,11 +706,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "event"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "properties"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/os/Bundle;
 
@@ -780,18 +746,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
index bea280c7b4..72cf1398d0 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnalyticsUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Me;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali
index 85d321f020..09c5db319b 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali
@@ -70,29 +70,31 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "$this$properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    const/4 v1, 0x0
-
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
-    new-instance v3, Lkotlin/Pair;
+    new-instance v2, Lkotlin/Pair;
 
-    const-string v4, "channel_id"
+    const-string v3, "channel_id"
 
-    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v2, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v3, v0, v1
+    const/4 v1, 0x0
+
+    aput-object v2, v0, v1
 
     const/4 v1, 0x1
 
@@ -139,15 +141,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$this$properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getProperties$app_productionDiscordExternalRelease(Lcom/discord/rtcconnection/RtcConnection;)Ljava/util/Map;
@@ -164,7 +157,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "$this$properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p1, Lcom/discord/rtcconnection/RtcConnection;->a:Ljava/lang/String;
 
@@ -179,15 +174,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$this$properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final initAppOpen(Landroid/app/Application;)V
@@ -195,7 +181,9 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsUtils;->fireBaseInstance:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
@@ -241,13 +229,4 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion$instance$2.smali b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion$instance$2.smali
index 2bbbc19880..786adaf217 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion$instance$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion$instance$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AppStartAnalyticsTracker$Companion$instance$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppStartAnalyticsTracker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion.smali b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion.smali
index 93ee5d40d7..f5b06685e9 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$Companion.smali
@@ -67,9 +67,9 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "uri_host"
+    const-string/jumbo v2, "uri_host"
 
     invoke-interface {p1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -80,9 +80,9 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "uri_scheme"
+    const-string/jumbo v1, "uri_scheme"
 
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -131,10 +131,10 @@
 
     const-string v0, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_4
-    const-string v0, "uri_path"
+    const-string/jumbo v0, "uri_path"
 
     invoke-interface {p1, v0, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.smali b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.smali
index 2937d3b71b..42b534444f 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppStartAnalyticsTracker.kt"
 
 # interfaces
@@ -18,10 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
+        "+",
         "Ljava/lang/Object;",
         ">;>;"
     }
@@ -52,7 +53,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker.smali
index 71f2398c21..b56ecce461 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AppStartAnalyticsTracker.smali
@@ -55,13 +55,17 @@
 .method public constructor <init>(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreUserSettings;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tracker"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "clock"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUserSettings"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -81,32 +85,11 @@
 
     const-string p2, "UUID.randomUUID().toString()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;->openAppLoadId:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeUserSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "tracker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getAppOpenTimestamp$p(Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;)Ljava/lang/Long;
@@ -162,17 +145,19 @@
 .method public final appOpen(Landroid/net/Uri;ZZ)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lkotlin/Pair;
+    new-instance v0, Lkotlin/Pair;
 
-    const-string v2, "app_opened"
+    const-string v1, "app_opened"
 
-    invoke-direct {v1, v2, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    const/4 v2, 0x0
 
-    iget-object v0, p0, Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
+    invoke-direct {v0, v1, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    iget-object v1, p0, Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
     const-wide/32 v2, 0x493e0
 
@@ -180,22 +165,17 @@
 
     invoke-direct {v4, p0, p3, p2, p1}, Lcom/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1;-><init>(Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;ZZLandroid/net/Uri;)V
 
-    invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
+    invoke-virtual {v1, v0, v2, v3, v4}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;JLkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final appUiViewed(Ljava/lang/String;J)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "screenName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;->appOpenTimestamp:Ljava/lang/Long;
 
@@ -292,13 +272,4 @@
     invoke-virtual {p2, p3, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "screenName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion$INSTANCE$2.smali
index 969dd20aca..38d9a51453 100644
--- a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion$INSTANCE$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/InstallReferrer$Companion$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InstallReferrer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/analytics/InstallReferrer;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion.smali b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion.smali
index 323981a896..87827868dd 100644
--- a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$Companion.smali
@@ -64,7 +64,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onReceivedInstallReferrer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/analytics/InstallReferrer$Companion;->getINSTANCE()Lcom/discord/utilities/analytics/InstallReferrer;
 
@@ -73,13 +75,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/utilities/analytics/InstallReferrer;->init(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onReceivedInstallReferrer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$createReferrerStateListener$1.smali b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$createReferrerStateListener$1.smali
index 812cf3c079..9ee64e4189 100644
--- a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$createReferrerStateListener$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$createReferrerStateListener$1.smali
@@ -94,7 +94,7 @@
 
     const-string v2, "referrerClient.installReferrer"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v1, Lf/e/a/a/c;->a:Landroid/os/Bundle;
 
@@ -106,7 +106,7 @@
 
     const-string v2, "referrerClient.installReferrer.installReferrer"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -147,7 +147,7 @@
 
     const-string v2, "Unbinding from service."
 
-    invoke-static {v1, v2}, Ld0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Le0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
 
     iget-object v1, p1, Lf/e/a/a/a;->b:Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerFailed$1.smali b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerFailed$1.smali
index 85515a328f..35e6107d60 100644
--- a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerFailed$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerFailed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerFailed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InstallReferrer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p0, Lcom/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerFailed$1;->$hasExecutedAttempts:I
 
@@ -72,13 +74,4 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putInt(Ljava/lang/String;I)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerSuccessful$1.smali b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerSuccessful$1.smali
index 14e3f58113..e90b50637f 100644
--- a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerSuccessful$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerSuccessful$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/InstallReferrer$setFetchInstallReferrerSuccessful$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InstallReferrer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,22 +71,15 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v0, 0x1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "CACHE_KEY_HAS_EXECUTED"
+    const-string v0, "CACHE_KEY_HAS_EXECUTED"
 
-    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    const/4 v1, 0x1
+
+    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$sharedPreferences$2.smali b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$sharedPreferences$2.smali
index e95962a43c..d97b8b4707 100644
--- a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$sharedPreferences$2.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer$sharedPreferences$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/analytics/InstallReferrer$sharedPreferences$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InstallReferrer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroid/content/SharedPreferences;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer.smali b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer.smali
index 280d81892c..2161bdc613 100644
--- a/com.discord/smali/com/discord/utilities/analytics/InstallReferrer.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/InstallReferrer.smali
@@ -134,7 +134,7 @@
     :cond_0
     const-string p0, "referrerClient"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -267,7 +267,7 @@
 
     const-string v2, "referrerClient.installReferrer"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, v0, Lf/e/a/a/c;->a:Landroid/os/Bundle;
 
@@ -302,7 +302,7 @@
     :cond_0
     const-string v0, "referrerClient"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -359,7 +359,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "onReceivedInstallReferrer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/analytics/InstallReferrer;->shouldFetchInstallReferrer()Z
 
@@ -381,7 +383,7 @@
 
     const-string v0, "InstallReferrerClient.newBuilder(context).build()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, p0, Lcom/discord/utilities/analytics/InstallReferrer;->referrerClient:Lcom/android/installreferrer/api/InstallReferrerClient;
     :try_end_0
@@ -432,13 +434,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "onReceivedInstallReferrer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/Traits$Location.smali b/com.discord/smali/com/discord/utilities/analytics/Traits$Location.smali
index eb47f79eb2..545ac9c49b 100644
--- a/com.discord/smali/com/discord/utilities/analytics/Traits$Location.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/Traits$Location.smali
@@ -299,7 +299,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Location;->page:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -309,7 +309,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Location;->section:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -319,7 +319,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Location;->_object:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -329,7 +329,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Location;->objectType:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -339,7 +339,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/analytics/Traits$Location;->promotionId:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -500,7 +500,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_5
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/Traits$Location;->page:Ljava/lang/String;
 
@@ -556,15 +558,6 @@
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/analytics/Traits$Payment.smali b/com.discord/smali/com/discord/utilities/analytics/Traits$Payment.smali
index f0ff3afb94..879359c18e 100644
--- a/com.discord/smali/com/discord/utilities/analytics/Traits$Payment.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/Traits$Payment.smali
@@ -36,11 +36,13 @@
 .method public constructor <init>(Ljava/lang/String;IILjava/lang/String;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "type"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "currency"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,20 +57,6 @@
     iput-boolean p5, p0, Lcom/discord/utilities/analytics/Traits$Payment;->isGift:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "currency"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/analytics/Traits$Payment;Ljava/lang/String;IILjava/lang/String;ZILjava/lang/Object;)Lcom/discord/utilities/analytics/Traits$Payment;
@@ -181,11 +169,13 @@
 .method public final copy(Ljava/lang/String;IILjava/lang/String;Z)Lcom/discord/utilities/analytics/Traits$Payment;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "type"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "currency"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/analytics/Traits$Payment;
 
@@ -204,20 +194,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/analytics/Traits$Payment;-><init>(Ljava/lang/String;IILjava/lang/String;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "currency"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -235,7 +211,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Payment;->type:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -257,7 +233,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Payment;->currency:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -393,7 +369,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/Traits$Payment;->type:Ljava/lang/String;
 
@@ -438,15 +416,6 @@
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/analytics/Traits$Source.smali b/com.discord/smali/com/discord/utilities/analytics/Traits$Source.smali
index 9f04867572..1a5979ecea 100644
--- a/com.discord/smali/com/discord/utilities/analytics/Traits$Source.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/Traits$Source.smali
@@ -293,7 +293,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Source;->page:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -303,7 +303,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Source;->section:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -313,7 +313,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Source;->_object:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -323,7 +323,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Source;->objectType:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -333,7 +333,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/analytics/Traits$Source;->promotionId:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -494,7 +494,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_5
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/Traits$Source;->page:Ljava/lang/String;
 
@@ -550,15 +552,6 @@
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription$Companion.smali b/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription$Companion.smali
index 39a55ad701..7551b52841 100644
--- a/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription$Companion.smali
@@ -36,7 +36,9 @@
 .method public final from(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Lcom/discord/utilities/analytics/Traits$Subscription;
     .locals 5
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionPlanType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/analytics/Traits$Subscription;
 
@@ -57,13 +59,4 @@
     invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/utilities/analytics/Traits$Subscription;-><init>(Ljava/lang/String;Ljava/lang/Integer;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subscriptionPlanType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription.smali b/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription.smali
index ebd4609cbd..73113586d3 100644
--- a/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/Traits$Subscription.smali
@@ -143,7 +143,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Subscription;->gatewayPlanId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -153,7 +153,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/analytics/Traits$Subscription;->type:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -262,7 +262,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "properties"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/analytics/Traits$Subscription;->gatewayPlanId:Ljava/lang/String;
 
@@ -301,15 +303,6 @@
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_2
-    const-string p1, "properties"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali b/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali
index 55e7cddc85..783f84cc90 100644
--- a/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali
+++ b/com.discord/smali/com/discord/utilities/anim/RingAnimator.smali
@@ -66,11 +66,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "ringingPredicate"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -125,20 +127,6 @@
     iput-wide p1, p0, Lcom/discord/utilities/anim/RingAnimator;->ringAnimationDelay:J
 
     return-void
-
-    :cond_0
-    const-string p1, "ringingPredicate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroid/view/View;Lkotlin/jvm/functions/Function0;FFILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/animations/LoopAnimationListener.smali b/com.discord/smali/com/discord/utilities/animations/LoopAnimationListener.smali
index 9c0dec3c3a..ba2c9ef2ac 100644
--- a/com.discord/smali/com/discord/utilities/animations/LoopAnimationListener.smali
+++ b/com.discord/smali/com/discord/utilities/animations/LoopAnimationListener.smali
@@ -18,11 +18,13 @@
 .method public constructor <init>(Lcom/airbnb/lottie/LottieAnimationView;ILkotlin/ranges/IntRange;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "animationView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "loopFrames"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,20 +35,6 @@
     iput-object p3, p0, Lcom/discord/utilities/animations/LoopAnimationListener;->loopFrames:Lkotlin/ranges/IntRange;
 
     return-void
-
-    :cond_0
-    const-string p1, "loopFrames"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "animationView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/animations/LottieAnimationUtilsKt.smali b/com.discord/smali/com/discord/utilities/animations/LottieAnimationUtilsKt.smali
index 6b81dfe3d8..24202227fd 100644
--- a/com.discord/smali/com/discord/utilities/animations/LottieAnimationUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/animations/LottieAnimationUtilsKt.smali
@@ -7,11 +7,13 @@
 .method public static final loopFrom(Lcom/airbnb/lottie/LottieAnimationView;ILkotlin/ranges/IntRange;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$loopFrom"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "loopFrames"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/animations/LoopAnimationListener;
 
@@ -26,18 +28,4 @@
     invoke-interface {p0, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     return-void
-
-    :cond_0
-    const-string p0, "loopFrames"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$loopFrom"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/apng/ApngDecoder.smali b/com.discord/smali/com/discord/utilities/apng/ApngDecoder.smali
index 8b9b83a409..150c29c0a3 100644
--- a/com.discord/smali/com/discord/utilities/apng/ApngDecoder.smali
+++ b/com.discord/smali/com/discord/utilities/apng/ApngDecoder.smali
@@ -66,13 +66,13 @@
 
     const-string v2, "hexBytes"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "6163544C"
 
     const/4 v3, 0x2
 
-    invoke-static {v0, v2, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v0, v2, v1, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v0
 
@@ -116,7 +116,7 @@
 
     const-string v2, "ImagePipelineFactory.getInstance()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lf/g/j/e/m;->i()Lf/g/j/n/d;
 
diff --git a/com.discord/smali/com/discord/utilities/apng/ApngDrawableFactory.smali b/com.discord/smali/com/discord/utilities/apng/ApngDrawableFactory.smali
index ce9e1e15b1..29da32eb5e 100644
--- a/com.discord/smali/com/discord/utilities/apng/ApngDrawableFactory.smali
+++ b/com.discord/smali/com/discord/utilities/apng/ApngDrawableFactory.smali
@@ -73,6 +73,10 @@
 
     move-result-object p1
 
+    const-string v2, "stream"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v2, 0x1
 
     if-nez v0, :cond_2
diff --git a/com.discord/smali/com/discord/utilities/app/ApplicationProvider.smali b/com.discord/smali/com/discord/utilities/app/ApplicationProvider.smali
index b20c1ea9c1..aab82f0b24 100644
--- a/com.discord/smali/com/discord/utilities/app/ApplicationProvider.smali
+++ b/com.discord/smali/com/discord/utilities/app/ApplicationProvider.smali
@@ -44,7 +44,7 @@
     :cond_0
     const-string v0, "application"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -52,20 +52,13 @@
 .end method
 
 .method public final init(Landroid/app/Application;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/utilities/app/ApplicationProvider;->application:Landroid/app/Application;
 
     return-void
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali
index 9905c9c45f..7b91aed94a 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/attachments/AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AttachmentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/regex/Pattern;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali
index 948061f10a..05fec52f11 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AttachmentUtils.kt"
 
 # interfaces
@@ -18,11 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/lytefast/flexinput/model/Attachment<",
         "*>;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -50,37 +50,27 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->invoke(Lcom/lytefast/flexinput/model/Attachment;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/lytefast/flexinput/model/Attachment;)Ljava/lang/String;
+.method public final invoke(Lcom/lytefast/flexinput/model/Attachment;)Ljava/lang/CharSequence;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/lytefast/flexinput/model/Attachment<",
             "*>;)",
-            "Ljava/lang/String;"
+            "Ljava/lang/CharSequence;"
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object;
 
@@ -103,20 +93,23 @@
     return-object v0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type androidx.core.view.inputmethod.InputContentInfoCompat"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->invoke(Lcom/lytefast/flexinput/model/Attachment;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali
index e6827d650c..39f7fca0df 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/attachments/AttachmentUtilsKt$getMimeType$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AttachmentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/String;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,25 +69,25 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)Ljava/lang/String;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "file"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->access$getREGEX_FILE_NAME_PATTERN$p()Ljava/util/regex/Pattern;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+    invoke-virtual {v0, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
     move-result-object p1
 
     invoke-virtual {p1}, Ljava/util/regex/Matcher;->matches()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     const/4 v0, 0x2
 
@@ -101,15 +101,13 @@
 
     invoke-virtual {v0, p1}, Landroid/webkit/MimeTypeMap;->getMimeTypeFromExtension(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "file"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
index 8b70a1fa1d..fcce2bd802 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
@@ -49,7 +49,7 @@
 .end method
 
 .method public static final appendLinks(Ljava/lang/String;Ljava/util/List;)Ljava/lang/String;
-    .locals 8
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -62,19 +62,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "content"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "links"
 
-    const-string v0, "\n"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p0, v0}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object p0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const/4 v2, 0x0
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p0, "\n"
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v7, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->INSTANCE:Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
+
+    const-string v2, "\n"
 
     const/4 v3, 0x0
 
@@ -82,43 +90,27 @@
 
     const/4 v5, 0x0
 
-    sget-object v6, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->INSTANCE:Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
+    const/4 v6, 0x0
 
-    const/16 v7, 0x1e
+    const/16 v8, 0x1e
 
-    const-string v1, "\n"
+    move-object v1, p1
 
-    move-object v0, p1
+    invoke-static/range {v1 .. v8}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
-    invoke-static/range {v0 .. v7}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    move-result-object p0
 
-    move-result-object p1
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "links"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "content"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final extractLinks(Ljava/util/List;Landroid/content/ContentResolver;)Ljava/util/List;
-    .locals 6
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -134,15 +126,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$extractLinks"
 
-    if-eqz p0, :cond_5
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_4
+    const-string v0, "contentResolver"
 
-    new-instance v1, Ljava/util/ArrayList;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -152,81 +146,67 @@
     :goto_0
     invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
     invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    move-object v3, v2
+    move-object v2, v1
 
-    check-cast v3, Lcom/lytefast/flexinput/model/Attachment;
+    check-cast v2, Lcom/lytefast/flexinput/model/Attachment;
 
-    invoke-virtual {v3}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object;
-
-    move-result-object v4
-
-    instance-of v5, v4, Landroidx/core/view/inputmethod/InputContentInfoCompat;
-
-    if-nez v5, :cond_1
-
-    move-object v4, v0
-
-    :cond_1
-    check-cast v4, Landroidx/core/view/inputmethod/InputContentInfoCompat;
-
-    const/4 v5, 0x1
-
-    if-eqz v4, :cond_2
-
-    invoke-virtual {v4}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->getLinkUri()Landroid/net/Uri;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_2
-
-    invoke-static {v3, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object;
 
     move-result-object v3
 
-    const-string v4, "image/gif"
+    instance-of v4, v3, Landroidx/core/view/inputmethod/InputContentInfoCompat;
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    if-nez v4, :cond_1
 
-    move-result v3
+    const/4 v3, 0x0
 
-    if-ne v3, v5, :cond_2
+    :cond_1
+    check-cast v3, Landroidx/core/view/inputmethod/InputContentInfoCompat;
+
+    const/4 v4, 0x1
+
+    if-eqz v3, :cond_2
+
+    invoke-virtual {v3}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->getLinkUri()Landroid/net/Uri;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_2
+
+    invoke-static {v2, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "image/gif"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-ne v2, v4, :cond_2
 
     goto :goto_1
 
     :cond_2
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_1
-    if-eqz v5, :cond_0
+    if-eqz v4, :cond_0
 
-    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_3
-    return-object v1
-
-    :cond_4
-    const-string p0, "contentResolver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "$this$extractLinks"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
 
 .method public static final getExtension(Landroid/graphics/Bitmap$CompressFormat;)Ljava/lang/String;
@@ -255,7 +235,7 @@
     goto :goto_0
 
     :cond_0
-    const-string v1, "webp"
+    const-string/jumbo v1, "webp"
 
     goto :goto_0
 
@@ -269,9 +249,11 @@
 .method public static final getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     if-eqz p0, :cond_0
 
@@ -335,13 +317,6 @@
 
     :goto_2
     return-object v0
-
-    :cond_4
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
@@ -357,39 +332,41 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getMimeType"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Landroidx/core/view/inputmethod/InputContentInfoCompat;
+    instance-of v1, v0, Landroidx/core/view/inputmethod/InputContentInfoCompat;
 
-    if-nez v2, :cond_0
+    const/4 v2, 0x0
 
-    move-object v1, v0
+    if-nez v1, :cond_0
+
+    move-object v0, v2
 
     :cond_0
-    check-cast v1, Landroidx/core/view/inputmethod/InputContentInfoCompat;
+    check-cast v0, Landroidx/core/view/inputmethod/InputContentInfoCompat;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    invoke-virtual {v1}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->getDescription()Landroid/content/ClipDescription;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {v1, v0}, Landroid/content/ClipDescription;->getMimeType(I)Ljava/lang/String;
+    invoke-virtual {v0}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->getDescription()Landroid/content/ClipDescription;
 
     move-result-object v0
 
+    if-eqz v0, :cond_1
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroid/content/ClipDescription;->getMimeType(I)Ljava/lang/String;
+
+    move-result-object v2
+
     :cond_1
-    if-eqz v0, :cond_2
+    if-eqz v2, :cond_2
 
     goto :goto_0
 
@@ -404,17 +381,10 @@
 
     invoke-static {p1, v0, p0}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
     :goto_0
-    return-object v0
-
-    :cond_3
-    const-string p0, "$this$getMimeType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v2
 .end method
 
 .method public static synthetic getMimeType$default(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
@@ -451,7 +421,9 @@
 .method public static final getSanitizedFileName(Ljava/lang/String;Landroid/graphics/Bitmap$CompressFormat;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p0, :cond_2
+    const-string v0, "fileName"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p1, :cond_0
 
@@ -509,46 +481,30 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_2
-    const-string p0, "fileName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isImage(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
-    const/4 p1, 0x0
+    const-string p1, "image"
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    const-string v0, "image"
+    const/4 v0, 0x2
 
-    invoke-static {p0, v0, p1, p2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p0, p1, p2, v0}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isImage(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Z
@@ -563,32 +519,25 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$isImage"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
 
     move-result-object p0
 
-    const/4 p1, 0x0
+    const-string p1, "image"
 
-    const/4 v0, 0x2
+    const/4 v0, 0x0
 
-    const-string v1, "image"
+    const/4 v1, 0x2
 
-    invoke-static {p0, v1, p1, v0}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p0, p1, v0, v1}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$isImage"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic isImage$default(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;ILjava/lang/Object;)Z
@@ -611,11 +560,13 @@
 .method public static final isImageAttachment(Lcom/discord/models/messages/LocalAttachment;Landroid/content/ContentResolver;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$isImageAttachment"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getUriString()Ljava/lang/String;
 
@@ -627,7 +578,7 @@
 
     const-string v1, "Uri.parse(uriString)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getDisplayName()Ljava/lang/String;
 
@@ -638,51 +589,30 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "contentResolver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$isImageAttachment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final isVideo(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
-    const/4 p1, 0x0
+    const-string/jumbo p1, "video"
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    const-string v0, "video"
+    const/4 v0, 0x2
 
-    invoke-static {p0, v0, p1, p2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p0, p1, p2, v0}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isVideo(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Z
@@ -697,32 +627,25 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$isVideo"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
 
     move-result-object p0
 
-    const/4 p1, 0x0
+    const-string/jumbo p1, "video"
 
-    const/4 v0, 0x2
+    const/4 v0, 0x0
 
-    const-string v1, "video"
+    const/4 v1, 0x2
 
-    invoke-static {p0, v1, p1, v0}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p0, p1, v0, v1}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$isVideo"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic isVideo$default(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;ILjava/lang/Object;)Z
@@ -745,11 +668,13 @@
 .method public static final isVideoAttachment(Lcom/discord/models/messages/LocalAttachment;Landroid/content/ContentResolver;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$isVideoAttachment"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getUriString()Ljava/lang/String;
 
@@ -761,7 +686,7 @@
 
     const-string v1, "Uri.parse(uriString)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getDisplayName()Ljava/lang/String;
 
@@ -772,65 +697,44 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "contentResolver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$isVideoAttachment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final toAttachment(Lcom/discord/models/messages/LocalAttachment;)Lcom/lytefast/flexinput/model/Attachment;
     .locals 7
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toAttachment"
 
-    new-instance v6, Lcom/lytefast/flexinput/model/Attachment;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/lytefast/flexinput/model/Attachment;
 
     invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getId()J
 
-    move-result-wide v1
+    move-result-wide v2
 
     invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getUriString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-
-    move-result-object v3
-
-    const-string v0, "Uri.parse(uriString)"
-
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getDisplayName()Ljava/lang/String;
+    invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v4
 
-    const/4 v5, 0x0
+    const-string v1, "Uri.parse(uriString)"
 
-    move-object v0, v6
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {v0 .. v5}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getDisplayName()Ljava/lang/String;
 
-    return-object v6
+    move-result-object v5
 
-    :cond_0
-    const-string p0, "$this$toAttachment"
+    const/4 v6, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v1, v0
 
-    const/4 p0, 0x0
+    invoke-direct/range {v1 .. v6}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
 
-    throw p0
+    return-object v0
 .end method
 
 .method public static final toHumanReadableAscii(Ljava/lang/String;)Ljava/lang/String;
@@ -868,11 +772,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance v2, Lo0/e;
+    new-instance v2, Lp0/e;
 
-    invoke-direct {v2}, Lo0/e;-><init>()V
+    invoke-direct {v2}, Lp0/e;-><init>()V
 
-    invoke-virtual {v2, p0, v0, v1}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
+    invoke-virtual {v2, p0, v0, v1}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
 
     :goto_1
     invoke-virtual {p0}, Ljava/lang/String;->length()I
@@ -901,7 +805,7 @@
     const/16 v3, 0x3f
 
     :goto_2
-    invoke-virtual {v2, v3}, Lo0/e;->U(I)Lo0/e;
+    invoke-virtual {v2, v3}, Lp0/e;->U(I)Lp0/e;
 
     invoke-static {v0}, Ljava/lang/Character;->charCount(I)I
 
@@ -912,7 +816,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v2}, Lo0/e;->v()Ljava/lang/String;
+    invoke-virtual {v2}, Lp0/e;->v()Ljava/lang/String;
 
     move-result-object p0
 
@@ -931,7 +835,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$toLocalAttachment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/models/messages/LocalAttachment;
 
@@ -947,9 +853,9 @@
 
     move-result-object v3
 
-    const-string v4, "uri.toString()"
+    const-string/jumbo v4, "uri.toString()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
 
@@ -958,13 +864,4 @@
     invoke-direct {v0, v1, v2, v3, p0}, Lcom/discord/models/messages/LocalAttachment;-><init>(JLjava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$toLocalAttachment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali
index cc9989538d..3fa0038929 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AuditLogChangeUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Integer;",
@@ -39,14 +39,14 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke(J)I
+.method public final invoke(J)Ljava/lang/Integer;
     .locals 2
 
     sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
@@ -57,7 +57,11 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -69,11 +73,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1;->invoke(J)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1;->invoke(J)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali
index ef556f0277..994be75275 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AuditLogChangeUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali
index a9c65ebec1..22e798e350 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AuditLogChangeUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Ljava/lang/String;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali
index c699f0f1ee..2ddd6a172d 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AuditLogChangeUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,9 +73,11 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
@@ -92,13 +94,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index 7a23ceaf87..af5efe7245 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -161,7 +161,7 @@
 
     const-string v2, "java.lang.String.format(format, *args)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     aput-object v1, p5, v3
 
@@ -171,14 +171,14 @@
 
     const-string p4, "context.getString(\n     \u2026ong).toInt())\n          )"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -219,14 +219,14 @@
 
     const-string p4, "context.getString(\n     \u2026t(), context)\n          )"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -249,7 +249,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -259,7 +259,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -314,7 +314,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -324,7 +324,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -363,7 +363,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -380,7 +380,7 @@
 
     const-string v5, "$remove"
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -392,7 +392,7 @@
 
     const-string v5, "$add"
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -413,7 +413,7 @@
 
     const-string p4, "context.getString(textId\u2026erRoles(context, change))"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -478,7 +478,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -523,14 +523,14 @@
 
     const-string p4, "context.getString(textId\u2026newValue as Long) / 1000)"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
     :cond_d
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -580,11 +580,11 @@
     goto :goto_1
 
     :cond_f
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p4, "null cannot be cast to non-null type kotlin.String"
 
-    invoke-direct {p1, p4}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p4}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -600,7 +600,7 @@
 
     const-string p4, "context.getString(\n     \u2026ng).toLong())\n          )"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -655,7 +655,7 @@
 
     const-string p4, "context.getString(\n     \u2026ange.newValue\n          )"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -678,7 +678,7 @@
 
     const-string v6, "name"
 
-    invoke-static {v1, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -698,7 +698,7 @@
 
     const-string p4, "context.getString(textId, change.value)"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -729,7 +729,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -788,7 +788,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -813,7 +813,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v5, 0x7f100074
 
@@ -863,21 +863,21 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
     :cond_19
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_1a
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -922,14 +922,14 @@
 
     const-string p4, "context.getString(textId\u2026e.newValue as Long) / 60)"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
     :cond_1c
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -988,7 +988,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -1007,7 +1007,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f10007a
 
@@ -1051,21 +1051,21 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
     :cond_20
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v6}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v6}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_21
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v6}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v6}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -1124,7 +1124,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -1183,7 +1183,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -1222,7 +1222,7 @@
 
     const-string p4, "context.getString(textId\u2026ldValue, change.newValue)"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -1245,7 +1245,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -1270,7 +1270,7 @@
 
     const-string p4, "context.getString(textId, change.oldValue)"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -1281,7 +1281,7 @@
 
     const-string p4, "context.getString(textId)"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_7
     .catch Ljava/util/MissingFormatArgumentException; {:try_start_7 .. :try_end_7} :catch_1
     .catch Ljava/lang/ClassCastException; {:try_start_7 .. :try_end_7} :catch_0
@@ -1354,7 +1354,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -1403,7 +1403,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -1456,9 +1456,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f1209af
+    const v0, 0x7f1209b4
 
-    const v1, 0x7f1209ae
+    const v1, 0x7f1209b3
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1475,25 +1475,6 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f1209ad
-
-    const v1, 0x7f1209ac
-
-    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
-
-    move-result p1
-
-    goto/16 :goto_1
-
-    :sswitch_2
-    const-string v1, "topic"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
     const v0, 0x7f1209b2
 
     const v1, 0x7f1209b1
@@ -1504,6 +1485,25 @@
 
     goto/16 :goto_1
 
+    :sswitch_2
+    const-string v1, "topic"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    const v0, 0x7f1209b7
+
+    const v1, 0x7f1209b6
+
+    invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
+
+    move-result p1
+
+    goto/16 :goto_1
+
     :sswitch_3
     const-string p1, "allow"
 
@@ -1513,7 +1513,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f1209ab
+    const p1, 0x7f1209b0
 
     goto/16 :goto_1
 
@@ -1540,7 +1540,7 @@
 
     if-nez p1, :cond_1
 
-    const p1, 0x7f1209a5
+    const p1, 0x7f1209aa
 
     goto :goto_1
 
@@ -1549,7 +1549,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f1209a6
+    const p1, 0x7f1209ab
 
     goto :goto_1
 
@@ -1561,11 +1561,11 @@
     throw p1
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Boolean"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -1578,9 +1578,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f1209a4
+    const v0, 0x7f1209a9
 
-    const v1, 0x7f1209a3
+    const v1, 0x7f1209a8
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1597,7 +1597,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f1209aa
+    const p1, 0x7f1209af
 
     goto :goto_1
 
@@ -1610,9 +1610,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f1209a0
+    const v0, 0x7f1209a5
 
-    const v1, 0x7f12099f
+    const v1, 0x7f1209a4
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1629,7 +1629,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f1209b7
+    const p1, 0x7f1209bc
 
     goto :goto_1
 
@@ -1693,9 +1693,9 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f1209bb
+    const v0, 0x7f1209c0
 
-    const v1, 0x7f1209ba
+    const v1, 0x7f1209bf
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1712,7 +1712,7 @@
 
     if-eqz p1, :cond_3
 
-    const p1, 0x7f1209b7
+    const p1, 0x7f1209bc
 
     goto :goto_1
 
@@ -1766,7 +1766,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f100030
 
@@ -1789,7 +1789,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -1812,7 +1812,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -1835,7 +1835,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -1856,7 +1856,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f100033
 
@@ -1877,16 +1877,16 @@
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f120fa6
+    const p1, 0x7f120fd0
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
     :goto_0
-    const-string p2, "when (value) {\n        M\u2026       else -> \"\"\n      }"
+    const-string/jumbo p2, "when (value) {\n        M\u2026       else -> \"\"\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1922,7 +1922,7 @@
     goto/16 :goto_0
 
     :sswitch_0
-    const-string v2, "widget_enabled"
+    const-string/jumbo v2, "widget_enabled"
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1944,14 +1944,14 @@
 
     if-ne p1, v5, :cond_1
 
-    const v1, 0x7f1209e2
+    const v1, 0x7f1209e7
 
     goto/16 :goto_0
 
     :cond_1
     if-nez p1, :cond_2
 
-    const v1, 0x7f1209e1
+    const v1, 0x7f1209e6
 
     goto/16 :goto_0
 
@@ -1963,11 +1963,11 @@
     throw p1
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Boolean"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -1980,12 +1980,12 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209cd
+    const v1, 0x7f1209d2
 
     goto/16 :goto_0
 
     :sswitch_2
-    const-string v2, "widget_channel_id"
+    const-string/jumbo v2, "widget_channel_id"
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1993,9 +1993,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1209e0
+    const v0, 0x7f1209e5
 
-    const v1, 0x7f1209df
+    const v1, 0x7f1209e4
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2004,7 +2004,7 @@
     goto/16 :goto_0
 
     :sswitch_3
-    const-string v2, "vanity_url_code"
+    const-string/jumbo v2, "vanity_url_code"
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -2012,9 +2012,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1209d9
+    const v0, 0x7f1209de
 
-    const v1, 0x7f1209d8
+    const v1, 0x7f1209dd
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2052,19 +2052,19 @@
     goto/16 :goto_0
 
     :cond_4
-    const v1, 0x7f1209c2
+    const v1, 0x7f1209c7
 
     goto/16 :goto_0
 
     :cond_5
-    const v1, 0x7f1209c1
+    const v1, 0x7f1209c6
 
     goto/16 :goto_0
 
     :cond_6
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v4}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v4}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2077,9 +2077,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1209d7
+    const v0, 0x7f1209dc
 
-    const v1, 0x7f1209d6
+    const v1, 0x7f1209db
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2117,19 +2117,19 @@
     goto/16 :goto_0
 
     :cond_7
-    const v1, 0x7f1209cb
+    const v1, 0x7f1209d0
 
     goto/16 :goto_0
 
     :cond_8
-    const v1, 0x7f1209ca
+    const v1, 0x7f1209cf
 
     goto/16 :goto_0
 
     :cond_9
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v4}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v4}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2142,9 +2142,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1209d1
+    const v0, 0x7f1209d6
 
-    const v1, 0x7f1209d0
+    const v1, 0x7f1209d5
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2161,7 +2161,7 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209d2
+    const v1, 0x7f1209d7
 
     goto/16 :goto_0
 
@@ -2174,7 +2174,7 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209cc
+    const v1, 0x7f1209d1
 
     goto/16 :goto_0
 
@@ -2187,12 +2187,12 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209bf
+    const v1, 0x7f1209c4
 
     goto/16 :goto_0
 
     :sswitch_b
-    const-string v2, "verification_level"
+    const-string/jumbo v2, "verification_level"
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -2231,34 +2231,34 @@
     goto/16 :goto_0
 
     :cond_a
-    const v1, 0x7f1209de
+    const v1, 0x7f1209e3
 
     goto/16 :goto_0
 
     :cond_b
-    const v1, 0x7f1209da
+    const v1, 0x7f1209df
 
     goto/16 :goto_0
 
     :cond_c
-    const v1, 0x7f1209dc
+    const v1, 0x7f1209e1
 
     goto/16 :goto_0
 
     :cond_d
-    const v1, 0x7f1209db
+    const v1, 0x7f1209e0
 
     goto/16 :goto_0
 
     :cond_e
-    const v1, 0x7f1209dd
+    const v1, 0x7f1209e2
 
     goto/16 :goto_0
 
     :cond_f
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v4}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v4}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2271,7 +2271,7 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209cf
+    const v1, 0x7f1209d4
 
     goto/16 :goto_0
 
@@ -2284,7 +2284,7 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209b7
+    const v1, 0x7f1209bc
 
     goto/16 :goto_0
 
@@ -2297,9 +2297,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1209d4
+    const v0, 0x7f1209d9
 
-    const v1, 0x7f1209d3
+    const v1, 0x7f1209d8
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2316,7 +2316,7 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209c9
+    const v1, 0x7f1209ce
 
     goto :goto_0
 
@@ -2329,9 +2329,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1209be
+    const v0, 0x7f1209c3
 
-    const v1, 0x7f1209bd
+    const v1, 0x7f1209c2
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2371,24 +2371,24 @@
     goto :goto_0
 
     :cond_10
-    const v1, 0x7f1209c6
+    const v1, 0x7f1209cb
 
     goto :goto_0
 
     :cond_11
-    const v1, 0x7f1209c8
+    const v1, 0x7f1209cd
 
     goto :goto_0
 
     :cond_12
-    const v1, 0x7f1209c7
+    const v1, 0x7f1209cc
 
     goto :goto_0
 
     :cond_13
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v4}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v4}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2401,7 +2401,7 @@
 
     if-eqz p1, :cond_14
 
-    const v1, 0x7f1209c0
+    const v1, 0x7f1209c5
 
     :cond_14
     :goto_0
@@ -2476,7 +2476,7 @@
 
     if-eqz p1, :cond_a
 
-    const v1, 0x7f1209e9
+    const v1, 0x7f1209ee
 
     goto :goto_0
 
@@ -2510,21 +2510,21 @@
     goto :goto_0
 
     :cond_3
-    const v1, 0x7f1209e7
+    const v1, 0x7f1209ec
 
     goto :goto_0
 
     :cond_4
-    const v1, 0x7f1209e8
+    const v1, 0x7f1209ed
 
     goto :goto_0
 
     :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Long"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2551,14 +2551,14 @@
 
     if-ne p1, v4, :cond_7
 
-    const v1, 0x7f1209e6
+    const v1, 0x7f1209eb
 
     goto :goto_0
 
     :cond_7
     if-nez p1, :cond_8
 
-    const v1, 0x7f1209e5
+    const v1, 0x7f1209ea
 
     goto :goto_0
 
@@ -2570,11 +2570,11 @@
     throw p1
 
     :cond_9
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Boolean"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2632,14 +2632,14 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f1209f4
+    const p1, 0x7f1209f9
 
     goto/16 :goto_1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1209f3
+    const p1, 0x7f1209f8
 
     goto/16 :goto_1
 
@@ -2651,11 +2651,11 @@
     throw p1
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Boolean"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2684,19 +2684,19 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f1209ef
+    const p1, 0x7f1209f4
 
     goto :goto_1
 
     :cond_4
-    const p1, 0x7f1209f0
+    const p1, 0x7f1209f5
 
     goto :goto_1
 
     :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2725,19 +2725,19 @@
 
     if-eqz p1, :cond_6
 
-    const p1, 0x7f1209f1
+    const p1, 0x7f1209f6
 
     goto :goto_1
 
     :cond_6
-    const p1, 0x7f1209f2
+    const p1, 0x7f1209f7
 
     goto :goto_1
 
     :cond_7
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2750,7 +2750,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f1209ec
+    const p1, 0x7f1209f1
 
     goto :goto_1
 
@@ -2763,7 +2763,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f1209b7
+    const p1, 0x7f1209bc
 
     goto :goto_1
 
@@ -2776,7 +2776,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f1209eb
+    const p1, 0x7f1209f0
 
     goto :goto_1
 
@@ -3158,7 +3158,7 @@
 
     if-eqz p2, :cond_a
 
-    const p2, 0x7f1209ab
+    const p2, 0x7f1209b0
 
     new-array p3, v6, [Ljava/lang/Object;
 
@@ -3166,7 +3166,7 @@
 
     move-result-object p4
 
-    invoke-static {p4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v3, 0x7f100073
 
@@ -3198,7 +3198,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_4
 
@@ -3211,7 +3211,7 @@
 
     if-eqz p2, :cond_a
 
-    const p2, 0x7f1209aa
+    const p2, 0x7f1209af
 
     new-array p3, v6, [Ljava/lang/Object;
 
@@ -3219,7 +3219,7 @@
 
     move-result-object p4
 
-    invoke-static {p4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v3, 0x7f100072
 
@@ -3251,18 +3251,18 @@
 
     move-result-object v3
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_a
     :goto_4
     return-object v3
 
     :cond_b
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.collections.Collection<*>"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -3361,7 +3361,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f10007c
 
@@ -3400,7 +3400,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f100073
 
@@ -3439,7 +3439,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f100072
 
@@ -3478,7 +3478,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f10007b
 
@@ -3512,11 +3512,11 @@
     return-object p1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.collections.Collection<*>"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -3580,14 +3580,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f120a13
+    const p1, 0x7f120a18
 
     goto/16 :goto_1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f120a12
+    const p1, 0x7f120a17
 
     goto/16 :goto_1
 
@@ -3599,9 +3599,9 @@
     throw p1
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -3632,21 +3632,21 @@
 
     if-nez p1, :cond_4
 
-    const p1, 0x7f120a0f
+    const p1, 0x7f120a14
 
     goto/16 :goto_1
 
     :cond_4
-    const p1, 0x7f120a0d
+    const p1, 0x7f120a12
 
     goto/16 :goto_1
 
     :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Long"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -3659,7 +3659,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f120a19
+    const p1, 0x7f120a1e
 
     goto :goto_1
 
@@ -3686,14 +3686,14 @@
 
     if-ne p1, v3, :cond_6
 
-    const p1, 0x7f120a15
+    const p1, 0x7f120a1a
 
     goto :goto_1
 
     :cond_6
     if-nez p1, :cond_7
 
-    const p1, 0x7f120a14
+    const p1, 0x7f120a19
 
     goto :goto_1
 
@@ -3705,9 +3705,9 @@
     throw p1
 
     :cond_8
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -3720,9 +3720,9 @@
 
     if-eqz v0, :cond_9
 
-    const v0, 0x7f120a17
+    const v0, 0x7f120a1c
 
-    const v1, 0x7f120a16
+    const v1, 0x7f120a1b
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -3739,7 +3739,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f120a18
+    const p1, 0x7f120a1d
 
     goto :goto_1
 
@@ -3752,7 +3752,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f1209b7
+    const p1, 0x7f1209bc
 
     goto :goto_1
 
@@ -3788,7 +3788,7 @@
 
     if-nez v2, :cond_0
 
-    const p1, 0x7f1204fb
+    const p1, 0x7f1204fd
 
     goto/16 :goto_0
 
@@ -3799,7 +3799,7 @@
 
     if-nez v2, :cond_1
 
-    const p1, 0x7f120dee
+    const p1, 0x7f120e14
 
     goto/16 :goto_0
 
@@ -3840,12 +3840,12 @@
 
     if-ne p1, p2, :cond_4
 
-    const p1, 0x7f120e76
+    const p1, 0x7f120e9c
 
     goto/16 :goto_0
 
     :cond_4
-    const p1, 0x7f120e78
+    const p1, 0x7f120e9e
 
     goto/16 :goto_0
 
@@ -3856,7 +3856,7 @@
 
     if-nez p3, :cond_6
 
-    const p1, 0x7f120e84
+    const p1, 0x7f120eaa
 
     goto/16 :goto_0
 
@@ -3867,7 +3867,7 @@
 
     if-nez p3, :cond_7
 
-    const p1, 0x7f1203e3
+    const p1, 0x7f1203e4
 
     goto/16 :goto_0
 
@@ -3878,7 +3878,7 @@
 
     if-nez p3, :cond_8
 
-    const p1, 0x7f120e7e
+    const p1, 0x7f120ea4
 
     goto/16 :goto_0
 
@@ -3889,7 +3889,7 @@
 
     if-nez p3, :cond_9
 
-    const p1, 0x7f120e82
+    const p1, 0x7f120ea8
 
     goto/16 :goto_0
 
@@ -3900,7 +3900,7 @@
 
     if-nez p3, :cond_a
 
-    const p1, 0x7f120e88
+    const p1, 0x7f120eae
 
     goto/16 :goto_0
 
@@ -3911,7 +3911,7 @@
 
     if-nez p3, :cond_b
 
-    const p1, 0x7f120e7a
+    const p1, 0x7f120ea0
 
     goto/16 :goto_0
 
@@ -3922,7 +3922,7 @@
 
     if-nez p3, :cond_c
 
-    const p1, 0x7f1217aa
+    const p1, 0x7f1217d6
 
     goto/16 :goto_0
 
@@ -3933,7 +3933,7 @@
 
     if-nez p3, :cond_d
 
-    const p1, 0x7f121309
+    const p1, 0x7f121333
 
     goto/16 :goto_0
 
@@ -3944,7 +3944,7 @@
 
     if-nez p3, :cond_e
 
-    const p1, 0x7f121440
+    const p1, 0x7f12146a
 
     goto/16 :goto_0
 
@@ -3955,7 +3955,7 @@
 
     if-nez p3, :cond_f
 
-    const p1, 0x7f121442
+    const p1, 0x7f12146c
 
     goto/16 :goto_0
 
@@ -3966,7 +3966,7 @@
 
     if-nez p3, :cond_10
 
-    const p1, 0x7f120e7b
+    const p1, 0x7f120ea1
 
     goto/16 :goto_0
 
@@ -3977,7 +3977,7 @@
 
     if-nez p3, :cond_11
 
-    const p1, 0x7f1205f1
+    const p1, 0x7f1205f3
 
     goto/16 :goto_0
 
@@ -3999,7 +3999,7 @@
 
     if-nez p3, :cond_13
 
-    const p1, 0x7f121308
+    const p1, 0x7f121332
 
     goto/16 :goto_0
 
@@ -4010,7 +4010,7 @@
 
     if-nez p3, :cond_14
 
-    const p1, 0x7f120ec2
+    const p1, 0x7f120ee8
 
     goto/16 :goto_0
 
@@ -4021,7 +4021,7 @@
 
     if-nez p3, :cond_15
 
-    const p1, 0x7f1216ac
+    const p1, 0x7f1216d6
 
     goto :goto_0
 
@@ -4043,7 +4043,7 @@
 
     if-nez p3, :cond_17
 
-    const p1, 0x7f120489
+    const p1, 0x7f12048a
 
     goto :goto_0
 
@@ -4054,7 +4054,7 @@
 
     if-nez p3, :cond_18
 
-    const p1, 0x7f1214b9
+    const p1, 0x7f1214e3
 
     goto :goto_0
 
@@ -4065,7 +4065,7 @@
 
     if-nez p3, :cond_19
 
-    const p1, 0x7f120f40
+    const p1, 0x7f120f6a
 
     goto :goto_0
 
@@ -4076,7 +4076,7 @@
 
     if-nez p3, :cond_1a
 
-    const p1, 0x7f120559
+    const p1, 0x7f12055b
 
     goto :goto_0
 
@@ -4087,7 +4087,7 @@
 
     if-nez p3, :cond_1b
 
-    const p1, 0x7f120f0d
+    const p1, 0x7f120f37
 
     goto :goto_0
 
@@ -4098,7 +4098,7 @@
 
     if-nez p3, :cond_1c
 
-    const p1, 0x7f1216b0
+    const p1, 0x7f1216da
 
     goto :goto_0
 
@@ -4109,7 +4109,7 @@
 
     if-nez p3, :cond_1d
 
-    const p1, 0x7f12129f
+    const p1, 0x7f1212ca
 
     goto :goto_0
 
@@ -4120,7 +4120,7 @@
 
     if-nez p3, :cond_1e
 
-    const p1, 0x7f121798
+    const p1, 0x7f1217c2
 
     goto :goto_0
 
@@ -4232,7 +4232,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f120a07
+    const p1, 0x7f120a0c
 
     goto/16 :goto_1
 
@@ -4245,19 +4245,19 @@
 
     if-eqz v0, :cond_7
 
-    const v0, 0x7f120a00
+    const v0, 0x7f120a05
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    const v0, 0x7f120a01
+    const v0, 0x7f120a06
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    const v0, 0x7f120a02
+    const v0, 0x7f120a07
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -4302,14 +4302,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f1209ff
+    const p1, 0x7f120a04
 
     goto :goto_1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1209fe
+    const p1, 0x7f120a03
 
     goto :goto_1
 
@@ -4321,9 +4321,9 @@
     throw p1
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -4350,14 +4350,14 @@
 
     if-ne p1, v3, :cond_4
 
-    const p1, 0x7f1209fa
+    const p1, 0x7f1209ff
 
     goto :goto_1
 
     :cond_4
     if-nez p1, :cond_5
 
-    const p1, 0x7f1209f9
+    const p1, 0x7f1209fe
 
     goto :goto_1
 
@@ -4369,9 +4369,9 @@
     throw p1
 
     :cond_6
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -4384,7 +4384,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f120a06
+    const p1, 0x7f120a0b
 
     goto :goto_1
 
@@ -4397,7 +4397,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f1209b7
+    const p1, 0x7f1209bc
 
     goto :goto_1
 
@@ -4410,7 +4410,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f120a04
+    const p1, 0x7f120a09
 
     goto :goto_1
 
@@ -4464,7 +4464,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f120a1d
+    const p1, 0x7f120a22
 
     goto :goto_1
 
@@ -4477,9 +4477,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f120a23
+    const v0, 0x7f120a28
 
-    const v1, 0x7f120a22
+    const v1, 0x7f120a27
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -4496,7 +4496,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f1209b7
+    const p1, 0x7f1209bc
 
     goto :goto_1
 
@@ -4509,9 +4509,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f120a1f
+    const v0, 0x7f120a24
 
-    const v1, 0x7f120a1e
+    const v1, 0x7f120a23
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -4550,7 +4550,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -4585,13 +4585,17 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
-    new-instance v0, Lj0/s/q;
+    const-string v0, "$this$sorted"
 
-    invoke-direct {v0, p1}, Lj0/s/q;-><init>(Lkotlin/sequences/Sequence;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/t/q;
+
+    invoke-direct {v0, p1}, Lk0/t/q;-><init>(Lkotlin/sequences/Sequence;)V
 
     new-instance p1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$renderPermissionList$1;
 
@@ -4771,11 +4775,11 @@
     return-object p1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.collections.List<com.discord.models.domain.ModelAuditLogEntry.ChangeNameId>"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -4801,7 +4805,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -4816,7 +4820,7 @@
 
     const-string v1, "id"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -4831,7 +4835,7 @@
 
     const-string v1, "permission_overwrites"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -4871,7 +4875,7 @@
 
     const-string v0, "allow"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -4906,9 +4910,9 @@
     goto/16 :goto_1
 
     :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v5}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -4940,9 +4944,9 @@
     goto/16 :goto_1
 
     :cond_6
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -4953,7 +4957,7 @@
 
     const-string v6, "deny"
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -4982,9 +4986,9 @@
     goto/16 :goto_1
 
     :cond_8
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v5}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -5016,9 +5020,9 @@
     goto/16 :goto_1
 
     :cond_a
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -5066,7 +5070,7 @@
     goto :goto_1
 
     :cond_e
-    const-string p2, "uses"
+    const-string/jumbo p2, "uses"
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -5391,7 +5395,7 @@
     goto :goto_2
 
     :cond_4
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     goto :goto_3
 
@@ -5416,7 +5420,7 @@
 
 # virtual methods
 .method public final getChangeSummary(Landroid/content/Context;Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/util/Map;)Ljava/lang/CharSequence;
-    .locals 18
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -5437,15 +5441,23 @@
 
     move-object/from16 v7, p2
 
-    if-eqz v6, :cond_11
+    const-string v0, "context"
 
-    if-eqz v7, :cond_10
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_f
+    const-string v0, "auditLogEntry"
 
-    new-instance v8, Landroid/text/SpannableStringBuilder;
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v8}, Landroid/text/SpannableStringBuilder;-><init>()V
+    const-string v0, "targets"
+
+    move-object/from16 v8, p3
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v9, Landroid/text/SpannableStringBuilder;
+
+    invoke-direct {v9}, Landroid/text/SpannableStringBuilder;-><init>()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -5457,11 +5469,11 @@
 
     move-result-object v1
 
-    const/4 v9, 0x0
+    const/4 v10, 0x0
 
-    invoke-static {v1, v9}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;
+    invoke-static {v1, v10}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;
 
-    move-result-object v10
+    move-result-object v11
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
@@ -5488,7 +5500,7 @@
 
     const-string v3, "change"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
@@ -5577,29 +5589,29 @@
     :cond_5
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v11
+    move-result-object v12
 
     const/4 v0, 0x0
 
     :cond_6
     :goto_4
-    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v12}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
 
     if-eqz v1, :cond_e
 
-    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 v12, v1
+    move-object v13, v1
 
-    check-cast v12, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
+    check-cast v13, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v7, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->shouldNotRenderChange(Lcom/discord/models/domain/ModelAuditLogEntry;Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Z
+    invoke-direct {v1, v7, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->shouldNotRenderChange(Lcom/discord/models/domain/ModelAuditLogEntry;Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Z
 
     move-result v1
 
@@ -5625,7 +5637,7 @@
     :pswitch_0
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getIntegrationChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getIntegrationChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5634,7 +5646,7 @@
     :pswitch_1
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getEmojiChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getEmojiChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5643,7 +5655,7 @@
     :pswitch_2
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getWebhookChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getWebhookChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5652,7 +5664,7 @@
     :pswitch_3
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getInviteChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getInviteChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5661,7 +5673,7 @@
     :pswitch_4
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getRoleChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getRoleChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5670,7 +5682,7 @@
     :pswitch_5
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getUserChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getUserChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5679,7 +5691,7 @@
     :pswitch_6
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getChannelChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getChannelChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5688,7 +5700,7 @@
     :pswitch_7
     sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v1, v12}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getGuildChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
+    invoke-direct {v1, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getGuildChangeString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)I
 
     move-result v1
 
@@ -5706,24 +5718,24 @@
     :goto_7
     if-eqz v4, :cond_d
 
-    add-int/lit8 v13, v0, 0x1
+    add-int/lit8 v14, v0, 0x1
 
-    const/4 v14, 0x1
+    const/4 v15, 0x1
 
-    if-eq v13, v14, :cond_8
+    if-eq v14, v15, :cond_8
 
     const-string v0, "\n"
 
-    invoke-virtual {v8, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v9, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     :cond_8
-    invoke-virtual {v8}, Landroid/text/SpannableStringBuilder;->length()I
+    invoke-virtual {v9}, Landroid/text/SpannableStringBuilder;->length()I
 
     move-result v0
 
-    sub-int/2addr v0, v14
+    sub-int/2addr v0, v15
 
-    invoke-static {v0, v9}, Ljava/lang/Math;->max(II)I
+    invoke-static {v0, v10}, Ljava/lang/Math;->max(II)I
 
     move-result v0
 
@@ -5733,7 +5745,7 @@
 
     sget-object v2, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    invoke-direct {v2, v13}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getChangeNumberString(I)Ljava/lang/String;
+    invoke-direct {v2, v14}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getChangeNumberString(I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -5747,13 +5759,13 @@
 
     move-result-object v1
 
-    invoke-virtual {v8, v1}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v9, v1}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    invoke-virtual {v8}, Landroid/text/SpannableStringBuilder;->length()I
+    invoke-virtual {v9}, Landroid/text/SpannableStringBuilder;->length()I
 
     move-result v1
 
-    sub-int/2addr v1, v14
+    sub-int/2addr v1, v15
 
     new-instance v2, Landroid/text/style/ForegroundColorSpan;
 
@@ -5767,27 +5779,25 @@
 
     const/16 v3, 0x21
 
-    invoke-virtual {v8, v2, v0, v1, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {v9, v2, v0, v1, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     new-instance v2, Lcom/discord/utilities/spans/TypefaceSpanCompat;
 
     const-string v5, "numberTypeface"
 
-    invoke-static {v10, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v10}, Lcom/discord/utilities/spans/TypefaceSpanCompat;-><init>(Landroid/graphics/Typeface;)V
+    invoke-direct {v2, v11}, Lcom/discord/utilities/spans/TypefaceSpanCompat;-><init>(Landroid/graphics/Typeface;)V
 
-    invoke-virtual {v8, v2, v0, v1, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {v9, v2, v0, v1, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
 
-    const/16 v15, 0x21
-
     move-object/from16 v1, p1
 
     move-object/from16 v2, p2
 
-    move-object v3, v12
+    move-object v3, v13
 
     move-object/from16 v5, p3
 
@@ -5799,27 +5809,27 @@
 
     move-result-object v0
 
-    invoke-virtual {v8, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v9, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    invoke-virtual {v12}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object v0
 
     const-string v1, "color"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
     if-eqz v0, :cond_c
 
-    invoke-virtual {v12}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
+    invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
     move-result-object v0
 
     if-eqz v0, :cond_c
 
-    invoke-virtual {v12}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
+    invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -5850,82 +5860,84 @@
     :goto_8
     const-string/jumbo v0, "\u25cf"
 
-    invoke-virtual {v8, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v9, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    new-array v0, v14, [Ljava/lang/Object;
+    new-instance v0, Landroid/text/style/ForegroundColorSpan;
 
-    const v1, 0xffffff
+    new-array v1, v15, [Ljava/lang/Object;
 
-    invoke-virtual {v12}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
+    const v2, 0xffffff
+
+    invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_b
+
+    check-cast v3, Ljava/lang/Long;
+
+    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    long-to-int v4, v3
+
+    and-int/2addr v2, v4
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    if-eqz v2, :cond_b
+    aput-object v2, v1, v10
 
-    check-cast v2, Ljava/lang/Long;
-
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v2
-
-    long-to-int v3, v2
-
-    and-int/2addr v1, v3
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1, v15}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v1
 
-    aput-object v1, v0, v9
+    const-string v2, "#%06X"
 
-    invoke-static {v0, v14}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v2, v1}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    const-string v1, "#%06X"
+    const-string v2, "java.lang.String.format(format, *args)"
 
-    invoke-static {v1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
+    invoke-static {v1}, Landroid/graphics/Color;->parseColor(Ljava/lang/String;)I
 
-    const-string v1, "java.lang.String.format(format, *args)"
+    move-result v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
 
-    invoke-static {v0}, Landroid/graphics/Color;->parseColor(Ljava/lang/String;)I
+    invoke-static {v9}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
 
-    move-result v0
+    move-result v1
 
-    new-instance v1, Landroid/text/style/ForegroundColorSpan;
-
-    invoke-direct {v1, v0}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
-
-    invoke-static {v8}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result v0
-
-    invoke-static {v8}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
+    invoke-static {v9}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
 
     move-result v2
 
-    add-int/2addr v2, v14
+    add-int/2addr v2, v15
 
-    invoke-virtual {v8, v1, v0, v2, v15}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    const/16 v3, 0x21
+
+    invoke-virtual {v9, v0, v1, v2, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     goto :goto_9
 
     :cond_b
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type kotlin.Long"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
     :cond_c
     :goto_9
-    move v0, v13
+    move v0, v14
 
     goto/16 :goto_4
 
@@ -5948,7 +5960,7 @@
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v12}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
+    invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object v3
 
@@ -5956,51 +5968,26 @@
 
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v14
+    move-result-object v15
 
-    const/4 v15, 0x0
+    const/16 v16, 0x0
 
-    const/16 v16, 0x4
+    const/16 v17, 0x4
 
-    const/16 v17, 0x0
+    const/16 v18, 0x0
 
-    const-string v13, "Audit Logs"
+    const-string v14, "Audit Logs"
 
-    move-object v12, v1
+    move-object v13, v1
 
-    invoke-static/range {v12 .. v17}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static/range {v13 .. v18}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     goto/16 :goto_4
 
     :cond_e
-    return-object v8
+    return-object v9
 
-    :cond_f
-    const-string v0, "targets"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_10
-    const/4 v0, 0x0
-
-    const-string v1, "auditLogEntry"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_11
-    const/4 v0, 0x0
-
-    const-string v1, "context"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    nop
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -6019,7 +6006,9 @@
 .method public final hasChangesToRender(Lcom/discord/models/domain/ModelAuditLogEntry;)Z
     .locals 6
 
-    if-eqz p1, :cond_5
+    const-string v0, "log"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionType()Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
 
@@ -6099,7 +6088,7 @@
 
     const-string v5, "it"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, p1, v3}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->shouldNotRenderChange(Lcom/discord/models/domain/ModelAuditLogEntry;Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Z
 
@@ -6118,13 +6107,4 @@
 
     :cond_4
     return v2
-
-    :cond_5
-    const-string p1, "log"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali
index 11cd30c033..ab686e57ff 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/auditlogs/AuditLogUtils$ALL_ACTION_TYPES$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AuditLogUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
index e1632bf566..da2b19bfbf 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
@@ -95,32 +95,32 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    const p1, 0x7f120a1c
+    const p1, 0x7f120a21
 
     goto/16 :goto_0
 
     :pswitch_0
-    const p1, 0x7f1209a8
+    const p1, 0x7f1209ad
 
     goto/16 :goto_0
 
     :pswitch_1
-    const p1, 0x7f1209a9
+    const p1, 0x7f1209ae
 
     goto/16 :goto_0
 
     :pswitch_2
-    const p1, 0x7f1209a7
+    const p1, 0x7f1209ac
 
     goto/16 :goto_0
 
     :pswitch_3
-    const p1, 0x7f1209a2
+    const p1, 0x7f1209a7
 
     goto/16 :goto_0
 
     :pswitch_4
-    const p1, 0x7f1209b5
+    const p1, 0x7f1209ba
 
     goto/16 :goto_0
 
@@ -154,7 +154,7 @@
 
     const-string v3, "it"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
@@ -162,7 +162,7 @@
 
     const-string v3, "type"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -203,171 +203,171 @@
 
     if-eq p1, v0, :cond_4
 
-    const p1, 0x7f1209b0
+    const p1, 0x7f1209b5
 
     goto/16 :goto_0
 
     :cond_4
-    const p1, 0x7f1209a1
+    const p1, 0x7f1209a6
 
     goto/16 :goto_0
 
     :cond_5
-    const p1, 0x7f1209b6
+    const p1, 0x7f1209bb
 
     goto/16 :goto_0
 
     :cond_6
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Long"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :pswitch_6
-    const p1, 0x7f12099e
+    const p1, 0x7f1209a3
 
     goto/16 :goto_0
 
     :pswitch_7
-    const p1, 0x7f1209fb
+    const p1, 0x7f120a00
 
     goto/16 :goto_0
 
     :pswitch_8
-    const p1, 0x7f1209fd
+    const p1, 0x7f120a02
 
     goto/16 :goto_0
 
     :pswitch_9
-    const p1, 0x7f120a05
+    const p1, 0x7f120a0a
 
     goto/16 :goto_0
 
     :pswitch_a
-    const p1, 0x7f120a08
+    const p1, 0x7f120a0d
 
     goto/16 :goto_0
 
     :pswitch_b
-    const p1, 0x7f1209f8
+    const p1, 0x7f1209fd
 
     goto/16 :goto_0
 
     :pswitch_c
-    const p1, 0x7f1209f7
+    const p1, 0x7f1209fc
 
     goto/16 :goto_0
 
     :pswitch_d
-    const p1, 0x7f120a03
+    const p1, 0x7f120a08
 
     goto :goto_0
 
     :pswitch_e
-    const p1, 0x7f1209fc
+    const p1, 0x7f120a01
 
     goto :goto_0
 
     :pswitch_f
-    const p1, 0x7f120a11
+    const p1, 0x7f120a16
 
     goto :goto_0
 
     :pswitch_10
-    const p1, 0x7f120a1a
+    const p1, 0x7f120a1f
 
     goto :goto_0
 
     :pswitch_11
-    const p1, 0x7f120a10
+    const p1, 0x7f120a15
 
     goto :goto_0
 
     :pswitch_12
-    const p1, 0x7f1209ee
+    const p1, 0x7f1209f3
 
     goto :goto_0
 
     :pswitch_13
-    const p1, 0x7f1209f5
+    const p1, 0x7f1209fa
 
     goto :goto_0
 
     :pswitch_14
-    const p1, 0x7f1209ed
+    const p1, 0x7f1209f2
 
     goto :goto_0
 
     :pswitch_15
-    const p1, 0x7f120a21
+    const p1, 0x7f120a26
 
     goto :goto_0
 
     :pswitch_16
-    const p1, 0x7f120a24
+    const p1, 0x7f120a29
 
     goto :goto_0
 
     :pswitch_17
-    const p1, 0x7f120a20
+    const p1, 0x7f120a25
 
     goto :goto_0
 
     :pswitch_18
-    const p1, 0x7f1209b9
+    const p1, 0x7f1209be
 
     goto :goto_0
 
     :pswitch_19
-    const p1, 0x7f1209bc
+    const p1, 0x7f1209c1
 
     goto :goto_0
 
     :pswitch_1a
-    const p1, 0x7f1209b8
+    const p1, 0x7f1209bd
 
     goto :goto_0
 
     :pswitch_1b
-    const p1, 0x7f120a0c
+    const p1, 0x7f120a11
 
     goto :goto_0
 
     :pswitch_1c
-    const p1, 0x7f120a0b
+    const p1, 0x7f120a10
 
     goto :goto_0
 
     :pswitch_1d
-    const p1, 0x7f120a09
+    const p1, 0x7f120a0e
 
     goto :goto_0
 
     :pswitch_1e
-    const p1, 0x7f120a0a
+    const p1, 0x7f120a0f
 
     goto :goto_0
 
     :pswitch_1f
-    const p1, 0x7f1209e4
+    const p1, 0x7f1209e9
 
     goto :goto_0
 
     :pswitch_20
-    const p1, 0x7f1209ea
+    const p1, 0x7f1209ef
 
     goto :goto_0
 
     :pswitch_21
-    const p1, 0x7f1209e3
+    const p1, 0x7f1209e8
 
     goto :goto_0
 
     :cond_7
-    const p1, 0x7f1209d5
+    const p1, 0x7f1209da
 
     :goto_0
     return p1
@@ -521,13 +521,13 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -598,13 +598,13 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -675,13 +675,13 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -763,13 +763,13 @@
 
     check-cast p3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object p3
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -830,7 +830,7 @@
 
     check-cast p3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
@@ -838,7 +838,7 @@
 
     const-string v0, "code"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -899,13 +899,13 @@
 
     check-cast p3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object p3
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -968,13 +968,13 @@
 
     check-cast p3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object p3
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -1035,13 +1035,13 @@
 
     check-cast p3, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object p3
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -1133,7 +1133,7 @@
 
     if-gez v5, :cond_0
 
-    const v1, 0x7f120a1b
+    const v1, 0x7f120a20
 
     const/4 v2, 0x2
 
@@ -1157,14 +1157,14 @@
 
     const-string p1, "context.getString(\n     \u2026RMAT_SHOW_TIME)\n        )"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_0
     const-string p1, "timeString"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object v0
@@ -1226,182 +1226,182 @@
     goto/16 :goto_0
 
     :pswitch_0
-    const p1, 0x7f120987
+    const p1, 0x7f12098c
 
     goto/16 :goto_0
 
     :pswitch_1
-    const p1, 0x7f120988
+    const p1, 0x7f12098d
 
     goto/16 :goto_0
 
     :pswitch_2
-    const p1, 0x7f120986
+    const p1, 0x7f12098b
 
     goto/16 :goto_0
 
     :pswitch_3
-    const p1, 0x7f120997
-
-    goto/16 :goto_0
-
-    :pswitch_4
-    const p1, 0x7f120996
-
-    goto/16 :goto_0
-
-    :pswitch_5
-    const p1, 0x7f120994
-
-    goto/16 :goto_0
-
-    :pswitch_6
-    const p1, 0x7f120995
-
-    goto/16 :goto_0
-
-    :pswitch_7
-    const p1, 0x7f120983
-
-    goto/16 :goto_0
-
-    :pswitch_8
-    const p1, 0x7f120984
-
-    goto/16 :goto_0
-
-    :pswitch_9
-    const p1, 0x7f120982
-
-    goto/16 :goto_0
-
-    :pswitch_a
     const p1, 0x7f12099c
 
     goto/16 :goto_0
 
-    :pswitch_b
-    const p1, 0x7f12099d
-
-    goto/16 :goto_0
-
-    :pswitch_c
+    :pswitch_4
     const p1, 0x7f12099b
 
     goto/16 :goto_0
 
+    :pswitch_5
+    const p1, 0x7f120999
+
+    goto/16 :goto_0
+
+    :pswitch_6
+    const p1, 0x7f12099a
+
+    goto/16 :goto_0
+
+    :pswitch_7
+    const p1, 0x7f120988
+
+    goto/16 :goto_0
+
+    :pswitch_8
+    const p1, 0x7f120989
+
+    goto/16 :goto_0
+
+    :pswitch_9
+    const p1, 0x7f120987
+
+    goto/16 :goto_0
+
+    :pswitch_a
+    const p1, 0x7f1209a1
+
+    goto/16 :goto_0
+
+    :pswitch_b
+    const p1, 0x7f1209a2
+
+    goto/16 :goto_0
+
+    :pswitch_c
+    const p1, 0x7f1209a0
+
+    goto/16 :goto_0
+
     :pswitch_d
-    const p1, 0x7f12098a
+    const p1, 0x7f12098f
 
     goto/16 :goto_0
 
     :pswitch_e
-    const p1, 0x7f12098b
-
-    goto :goto_0
-
-    :pswitch_f
-    const p1, 0x7f120989
-
-    goto :goto_0
-
-    :pswitch_10
-    const p1, 0x7f120999
-
-    goto :goto_0
-
-    :pswitch_11
-    const p1, 0x7f12099a
-
-    goto :goto_0
-
-    :pswitch_12
-    const p1, 0x7f120998
-
-    goto :goto_0
-
-    :pswitch_13
-    const p1, 0x7f12097b
-
-    goto :goto_0
-
-    :pswitch_14
-    const p1, 0x7f12098e
-
-    goto :goto_0
-
-    :pswitch_15
     const p1, 0x7f120990
 
     goto :goto_0
 
-    :pswitch_16
-    const p1, 0x7f120992
+    :pswitch_f
+    const p1, 0x7f12098e
 
     goto :goto_0
 
-    :pswitch_17
-    const p1, 0x7f120993
+    :pswitch_10
+    const p1, 0x7f12099e
 
     goto :goto_0
 
-    :pswitch_18
-    const p1, 0x7f12098d
+    :pswitch_11
+    const p1, 0x7f12099f
 
     goto :goto_0
 
-    :pswitch_19
-    const p1, 0x7f12098c
+    :pswitch_12
+    const p1, 0x7f12099d
 
     goto :goto_0
 
-    :pswitch_1a
-    const p1, 0x7f120991
-
-    goto :goto_0
-
-    :pswitch_1b
-    const p1, 0x7f12098f
-
-    goto :goto_0
-
-    :pswitch_1c
-    const p1, 0x7f12097f
-
-    goto :goto_0
-
-    :pswitch_1d
+    :pswitch_13
     const p1, 0x7f120980
 
     goto :goto_0
 
-    :pswitch_1e
-    const p1, 0x7f12097e
+    :pswitch_14
+    const p1, 0x7f120993
 
     goto :goto_0
 
-    :pswitch_1f
-    const p1, 0x7f12097d
+    :pswitch_15
+    const p1, 0x7f120995
 
     goto :goto_0
 
-    :pswitch_20
-    const p1, 0x7f120981
+    :pswitch_16
+    const p1, 0x7f120997
 
     goto :goto_0
 
-    :pswitch_21
-    const p1, 0x7f12097c
+    :pswitch_17
+    const p1, 0x7f120998
 
     goto :goto_0
 
-    :cond_0
+    :pswitch_18
+    const p1, 0x7f120992
+
+    goto :goto_0
+
+    :pswitch_19
+    const p1, 0x7f120991
+
+    goto :goto_0
+
+    :pswitch_1a
+    const p1, 0x7f120996
+
+    goto :goto_0
+
+    :pswitch_1b
+    const p1, 0x7f120994
+
+    goto :goto_0
+
+    :pswitch_1c
+    const p1, 0x7f120984
+
+    goto :goto_0
+
+    :pswitch_1d
     const p1, 0x7f120985
 
     goto :goto_0
 
+    :pswitch_1e
+    const p1, 0x7f120983
+
+    goto :goto_0
+
+    :pswitch_1f
+    const p1, 0x7f120982
+
+    goto :goto_0
+
+    :pswitch_20
+    const p1, 0x7f120986
+
+    goto :goto_0
+
+    :pswitch_21
+    const p1, 0x7f120981
+
+    goto :goto_0
+
+    :cond_0
+    const p1, 0x7f12098a
+
+    goto :goto_0
+
     :cond_1
-    const p1, 0x7f120a9d
+    const p1, 0x7f120aa2
 
     :goto_0
     return p1
@@ -1509,17 +1509,17 @@
     goto :goto_1
 
     :cond_1
-    const p1, 0x7f08022b
-
-    goto :goto_1
-
-    :cond_2
     const p1, 0x7f08022c
 
     goto :goto_1
 
+    :cond_2
+    const p1, 0x7f08022d
+
+    goto :goto_1
+
     :cond_3
-    const p1, 0x7f08022a
+    const p1, 0x7f08022b
 
     :goto_1
     return p1
@@ -1550,21 +1550,33 @@
 
     move-object/from16 v1, p1
 
-    move-object/from16 v2, p3
+    move-object/from16 v2, p2
 
-    move-object/from16 v3, p4
+    move-object/from16 v3, p3
 
-    move-object/from16 v4, p5
+    move-object/from16 v4, p4
 
-    if-eqz v1, :cond_25
+    move-object/from16 v5, p5
 
-    if-eqz p2, :cond_24
+    const-string v6, "auditLogEntry"
 
-    if-eqz v2, :cond_23
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v3, :cond_22
+    const-string/jumbo v6, "username"
 
-    if-eqz v4, :cond_21
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "context"
+
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "targets"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "prefix"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
@@ -1590,7 +1602,7 @@
 
     const/16 v7, 0x1a
 
-    const/4 v13, 0x3
+    const/4 v14, 0x3
 
     if-eq v6, v7, :cond_14
 
@@ -1610,19 +1622,19 @@
 
     new-array v7, v8, [Ljava/lang/Object;
 
-    aput-object p2, v7, v10
+    aput-object v2, v7, v10
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    move-result-object v8
+    move-result-object v2
 
-    invoke-interface {v3, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Ljava/util/Map;
+    check-cast v2, Ljava/util/Map;
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
@@ -1630,29 +1642,29 @@
 
     invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-interface {v3, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v5, v3
+    move-object v13, v2
 
-    check-cast v5, Ljava/lang/String;
+    check-cast v13, Ljava/lang/String;
 
     goto :goto_0
 
     :cond_0
-    const/4 v5, 0x0
+    const/4 v13, 0x0
 
     :goto_0
-    invoke-direct {v0, v1, v5, v4}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {v0, v1, v13, v5}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
     aput-object v1, v7, v9
 
-    invoke-virtual {v2, v6, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v6, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1685,43 +1697,43 @@
 
     move-result v7
 
-    new-array v11, v13, [Ljava/lang/Object;
+    new-array v11, v14, [Ljava/lang/Object;
 
-    aput-object p2, v11, v10
+    aput-object v2, v11, v10
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    move-result-object v10
+    move-result-object v2
 
-    invoke-interface {v3, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v10
+    move-result-object v2
 
-    check-cast v10, Ljava/util/Map;
+    check-cast v2, Ljava/util/Map;
 
-    if-eqz v10, :cond_2
+    if-eqz v2, :cond_2
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
-    move-result-wide v12
+    move-result-wide v14
 
-    invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v12
-
-    invoke-interface {v10, v12}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v14, v15}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v10
 
-    check-cast v10, Ljava/lang/String;
+    invoke-interface {v2, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
 
     goto :goto_2
 
     :cond_2
-    const/4 v10, 0x0
+    const/4 v2, 0x0
 
     :goto_2
-    invoke-direct {v0, v1, v10, v4}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {v0, v1, v2, v5}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1729,7 +1741,7 @@
 
     sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    invoke-interface {v3, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1745,7 +1757,7 @@
 
     if-eqz v1, :cond_3
 
-    move-object v5, v1
+    move-object v13, v1
 
     goto :goto_3
 
@@ -1754,21 +1766,21 @@
 
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v1
 
-    invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v13
 
     goto :goto_3
 
     :cond_4
-    const/4 v5, 0x0
+    const/4 v13, 0x0
 
     :goto_3
-    aput-object v5, v11, v8
+    aput-object v13, v11, v8
 
-    invoke-virtual {v2, v7, v11}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v7, v11}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1781,30 +1793,30 @@
 
     move-result v6
 
-    new-array v7, v13, [Ljava/lang/Object;
+    new-array v7, v14, [Ljava/lang/Object;
 
-    aput-object p2, v7, v10
+    aput-object v2, v7, v10
 
     invoke-virtual/range {p3 .. p3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v11
+    move-result-object v2
 
-    const v12, 0x7f10007d
+    const v11, 0x7f10007d
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
-    move-result-object v13
+    move-result-object v12
 
-    if-eqz v13, :cond_5
+    if-eqz v12, :cond_5
 
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getCount()I
+    invoke-virtual {v12}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getCount()I
 
-    move-result v13
+    move-result v12
 
     goto :goto_4
 
     :cond_5
-    const/4 v13, 0x0
+    const/4 v12, 0x0
 
     :goto_4
     new-array v14, v9, [Ljava/lang/Object;
@@ -1819,37 +1831,35 @@
 
     move-result v15
 
+    goto :goto_5
+
+    :cond_6
+    const/4 v15, 0x0
+
+    :goto_5
     invoke-static {v15}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v15
 
-    goto :goto_5
-
-    :cond_6
-    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v15
-
-    :goto_5
     aput-object v15, v14, v10
 
-    invoke-virtual {v11, v12, v13, v14}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v2, v11, v12, v14}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v10
+    move-result-object v2
 
-    aput-object v10, v7, v9
+    aput-object v2, v7, v9
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    move-result-object v9
+    move-result-object v2
 
-    invoke-interface {v3, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Ljava/util/Map;
+    check-cast v2, Ljava/util/Map;
 
-    if-eqz v3, :cond_7
+    if-eqz v2, :cond_7
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
@@ -1857,29 +1867,29 @@
 
     invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-interface {v3, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v5, v3
+    move-object v13, v2
 
-    check-cast v5, Ljava/lang/String;
+    check-cast v13, Ljava/lang/String;
 
     goto :goto_6
 
     :cond_7
-    const/4 v5, 0x0
+    const/4 v13, 0x0
 
     :goto_6
-    invoke-direct {v0, v1, v5, v4}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {v0, v1, v13, v5}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
     aput-object v1, v7, v8
 
-    invoke-virtual {v2, v6, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v6, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -1916,13 +1926,13 @@
 
     new-array v11, v11, [Ljava/lang/Object;
 
-    aput-object p2, v11, v10
+    aput-object v2, v11, v10
 
     invoke-virtual/range {p3 .. p3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v12
+    move-result-object v2
 
-    const v14, 0x7f10007e
+    const v12, 0x7f10007e
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
@@ -1940,7 +1950,7 @@
     const/4 v15, 0x0
 
     :goto_8
-    new-array v5, v9, [Ljava/lang/Object;
+    new-array v13, v9, [Ljava/lang/Object;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
@@ -1952,37 +1962,35 @@
 
     move-result v16
 
+    goto :goto_9
+
+    :cond_a
+    const/16 v16, 0x0
+
+    :goto_9
     invoke-static/range {v16 .. v16}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v16
 
-    goto :goto_9
+    aput-object v16, v13, v10
 
-    :cond_a
-    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {v2, v12, v15, v13}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v16
+    move-result-object v2
 
-    :goto_9
-    aput-object v16, v5, v10
-
-    invoke-virtual {v12, v14, v15, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v5
-
-    aput-object v5, v11, v9
+    aput-object v2, v11, v9
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType()Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    move-result-object v5
+    move-result-object v2
 
-    invoke-interface {v3, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v2
 
-    check-cast v5, Ljava/util/Map;
+    check-cast v2, Ljava/util/Map;
 
-    if-eqz v5, :cond_b
+    if-eqz v2, :cond_b
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetId()J
 
@@ -1992,19 +2000,19 @@
 
     move-result-object v9
 
-    invoke-interface {v5, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v2
 
-    check-cast v5, Ljava/lang/String;
+    check-cast v2, Ljava/lang/String;
 
     goto :goto_a
 
     :cond_b
-    const/4 v5, 0x0
+    const/4 v2, 0x0
 
     :goto_a
-    invoke-direct {v0, v1, v5, v4}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {v0, v1, v2, v5}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetText(Lcom/discord/models/domain/ModelAuditLogEntry;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2012,7 +2020,7 @@
 
     sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    invoke-interface {v3, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -2028,7 +2036,7 @@
 
     if-eqz v1, :cond_c
 
-    move-object v5, v1
+    move-object v13, v1
 
     goto :goto_b
 
@@ -2037,36 +2045,36 @@
 
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v1
 
-    invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v13
 
     goto :goto_b
 
     :cond_d
-    const/4 v5, 0x0
+    const/4 v13, 0x0
 
     :goto_b
-    aput-object v5, v11, v13
+    aput-object v13, v11, v14
 
-    invoke-virtual {v2, v7, v11}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v7, v11}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
     goto/16 :goto_16
 
     :pswitch_3
-    sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    invoke-direct {v3, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
+    invoke-direct {v4, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
 
-    move-result v3
+    move-result v4
 
-    new-array v4, v8, [Ljava/lang/Object;
+    new-array v5, v8, [Ljava/lang/Object;
 
-    aput-object p2, v4, v10
+    aput-object v2, v5, v10
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
@@ -2081,35 +2089,35 @@
     :cond_e
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v2
 
-    if-eqz v5, :cond_f
+    if-eqz v2, :cond_f
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v2
 
-    check-cast v5, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
+    check-cast v2, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {v5, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object v6
 
     const-string v7, "name"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
     if-eqz v6, :cond_e
 
-    if-eqz v5, :cond_10
+    if-eqz v2, :cond_10
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getValue()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v13
 
     goto :goto_c
 
@@ -2121,35 +2129,35 @@
     throw v1
 
     :cond_10
-    const/4 v5, 0x0
+    const/4 v13, 0x0
 
     :goto_c
-    invoke-static {v5}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v13}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    aput-object v1, v4, v9
+    aput-object v1, v5, v9
 
-    invoke-virtual {v2, v3, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v4, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
     goto/16 :goto_16
 
     :cond_11
-    sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    invoke-direct {v3, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
+    invoke-direct {v4, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
 
-    move-result v3
+    move-result v4
 
-    new-array v4, v8, [Ljava/lang/Object;
+    new-array v5, v8, [Ljava/lang/Object;
 
-    aput-object p2, v4, v10
+    aput-object v2, v5, v10
 
     invoke-virtual/range {p3 .. p3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v5
+    move-result-object v2
 
     const v6, 0x7f100077
 
@@ -2181,27 +2189,25 @@
 
     move-result v1
 
+    goto :goto_e
+
+    :cond_13
+    const/4 v1, 0x0
+
+    :goto_e
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    goto :goto_e
-
-    :cond_13
-    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    :goto_e
     aput-object v1, v8, v10
 
-    invoke-virtual {v5, v6, v7, v8}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v2, v6, v7, v8}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    aput-object v1, v4, v9
+    aput-object v1, v5, v9
 
-    invoke-virtual {v2, v3, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v4, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -2210,37 +2216,37 @@
     :cond_14
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
-    move-result-object v4
+    move-result-object v5
 
-    if-eqz v4, :cond_15
+    if-eqz v5, :cond_15
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getChannelId()J
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getChannelId()J
 
-    move-result-wide v4
+    move-result-wide v5
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v5
 
     goto :goto_f
 
     :cond_15
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     :goto_f
-    sget-object v5, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v6, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    invoke-direct {v5, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
+    invoke-direct {v6, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
 
-    move-result v5
+    move-result v6
 
-    new-array v6, v13, [Ljava/lang/Object;
+    new-array v7, v14, [Ljava/lang/Object;
 
-    aput-object p2, v6, v10
+    aput-object v2, v7, v10
 
     invoke-virtual/range {p3 .. p3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v7
+    move-result-object v2
 
     const v11, 0x7f100078
 
@@ -2272,29 +2278,27 @@
 
     move-result v1
 
+    goto :goto_11
+
+    :cond_17
+    const/4 v1, 0x0
+
+    :goto_11
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    goto :goto_11
-
-    :cond_17
-    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    :goto_11
     aput-object v1, v13, v10
 
-    invoke-virtual {v7, v11, v12, v13}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v2, v11, v12, v13}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    aput-object v1, v6, v9
+    aput-object v1, v7, v9
 
     sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
-    invoke-interface {v3, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -2302,7 +2306,7 @@
 
     if-eqz v1, :cond_18
 
-    invoke-interface {v1, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -2310,43 +2314,45 @@
 
     if-eqz v1, :cond_18
 
+    move-object v13, v1
+
     goto :goto_12
 
     :cond_18
-    if-eqz v4, :cond_19
+    if-eqz v5, :cond_19
 
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v1
 
-    invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v13
 
     goto :goto_12
 
     :cond_19
-    const/4 v1, 0x0
+    const/4 v13, 0x0
 
     :goto_12
-    aput-object v1, v6, v8
+    aput-object v13, v7, v8
 
-    invoke-virtual {v2, v5, v6}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v6, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
     goto/16 :goto_16
 
     :cond_1a
-    sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    invoke-direct {v3, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
+    invoke-direct {v4, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
 
-    move-result v3
+    move-result v4
 
-    new-array v4, v8, [Ljava/lang/Object;
+    new-array v5, v8, [Ljava/lang/Object;
 
-    aput-object p2, v4, v10
+    aput-object v2, v5, v10
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getChanges()Ljava/util/List;
 
@@ -2361,35 +2367,35 @@
     :cond_1b
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v2
 
-    if-eqz v5, :cond_1c
+    if-eqz v2, :cond_1c
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v2
 
-    check-cast v5, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
+    check-cast v2, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
 
-    invoke-static {v5, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
 
     move-result-object v6
 
     const-string v7, "code"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
     if-eqz v6, :cond_1b
 
-    if-eqz v5, :cond_1d
+    if-eqz v2, :cond_1d
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getOldValue()Ljava/lang/Object;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getOldValue()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v13
 
     goto :goto_13
 
@@ -2401,39 +2407,39 @@
     throw v1
 
     :cond_1d
-    const/4 v5, 0x0
+    const/4 v13, 0x0
 
     :goto_13
-    invoke-static {v5}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v13}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    aput-object v1, v4, v9
+    aput-object v1, v5, v9
 
-    invoke-virtual {v2, v3, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v4, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
     goto :goto_16
 
     :cond_1e
-    sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    invoke-direct {v3, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
+    invoke-direct {v4, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getEntryTitle(Lcom/discord/models/domain/ModelAuditLogEntry;)I
 
-    move-result v3
+    move-result v4
 
-    new-array v4, v8, [Ljava/lang/Object;
+    new-array v5, v8, [Ljava/lang/Object;
 
-    aput-object p2, v4, v10
+    aput-object v2, v5, v10
 
     invoke-virtual/range {p3 .. p3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v5
+    move-result-object v2
 
     const-string v6, "context.resources"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v6, 0x7f100079
 
@@ -2465,84 +2471,35 @@
 
     move-result v1
 
+    goto :goto_15
+
+    :cond_20
+    const/4 v1, 0x0
+
+    :goto_15
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    goto :goto_15
-
-    :cond_20
-    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    :goto_15
     aput-object v1, v8, v10
 
-    invoke-static {v5, v2, v6, v7, v8}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v2, v3, v6, v7, v8}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    aput-object v1, v4, v9
+    aput-object v1, v5, v9
 
-    invoke-virtual {v2, v3, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v4, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
     :goto_16
-    const-string v2, "when (auditLogEntry.acti\u2026      )\n        )\n      }"
+    const-string/jumbo v2, "when (auditLogEntry.acti\u2026      )\n        )\n      }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 
-    :cond_21
-    const-string v1, "prefix"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
-
-    :cond_22
-    const/4 v1, 0x0
-
-    const-string v2, "targets"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_23
-    const/4 v1, 0x0
-
-    const-string v2, "context"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_24
-    const/4 v1, 0x0
-
-    const-string v2, "username"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_25
-    const/4 v1, 0x0
-
-    const-string v2, "auditLogEntry"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    nop
-
     :pswitch_data_0
     .packed-switch 0x3c
         :pswitch_3
@@ -2564,7 +2521,9 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTargetType(I)Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
 
@@ -2572,17 +2531,17 @@
 
     const-string v1, "ModelAuditLogEntry.getTargetType(actionTypeId)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/16 v1, 0x48
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/16 v2, 0x48
 
-    if-ne p2, v1, :cond_0
+    if-ne p2, v2, :cond_0
 
     const p2, 0x7f040280
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
     move-result p1
 
@@ -2600,95 +2559,84 @@
     :pswitch_0
     const p2, 0x7f04027c
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_1
     const p2, 0x7f04027b
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_2
     const p2, 0x7f040283
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_3
     const p2, 0x7f04027d
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_4
     const p2, 0x7f040281
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_5
     const p2, 0x7f04027f
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_6
     const p2, 0x7f04027a
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_7
     const p2, 0x7f040282
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :pswitch_8
     const p2, 0x7f040279
 
-    invoke-static {p1, p2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
+    invoke-static {p1, p2, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
 
-    move-result v2
+    move-result v1
 
     :goto_0
-    return v2
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    nop
+    return v1
 
     :pswitch_data_0
     .packed-switch 0x0
@@ -2707,7 +2655,9 @@
 .method public final getTimestampStart(Lcom/discord/models/domain/ModelAuditLogEntry;)J
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "$this$getTimestampStart"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getId()J
 
@@ -2722,25 +2672,18 @@
     add-long/2addr v0, v2
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "$this$getTimestampStart"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getTimestampString(Lcom/discord/models/domain/ModelAuditLogEntry;Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "auditLogEntry"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getTimestampEnd()Ljava/lang/Long;
 
@@ -2772,6 +2715,10 @@
     move-result-object p1
 
     :goto_0
+    const-string v1, "auditLogEntry.timestampEnd ?: 0L"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v1
@@ -2809,18 +2756,4 @@
 
     :goto_1
     return-object p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "auditLogEntry"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils$createDiscriminatorInputValidator$1.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils$createDiscriminatorInputValidator$1.smali
index 8e40ee8834..738b04fa2d 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils$createDiscriminatorInputValidator$1.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils$createDiscriminatorInputValidator$1.smali
@@ -48,65 +48,62 @@
 
 # virtual methods
 .method public getErrorMessage(Lcom/google/android/material/textfield/TextInputLayout;)Ljava/lang/CharSequence;
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getTextOrEmpty(Lcom/google/android/material/textfield/TextInputLayout;)Ljava/lang/String;
 
+    move-result-object v0
+
+    invoke-static {v0}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+
     move-result-object v1
 
-    invoke-static {v1}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    if-eqz v1, :cond_2
 
-    move-result-object v2
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
 
-    if-eqz v2, :cond_1
+    move-result v0
 
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
+    const/4 v2, 0x4
 
-    move-result v1
-
-    const/4 v3, 0x4
-
-    if-eq v1, v3, :cond_0
+    if-eq v0, v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    move-result v1
+    move-result v0
 
-    if-gtz v1, :cond_2
+    if-gtz v0, :cond_1
 
     iget v0, p0, Lcom/discord/utilities/auth/AuthUtils$createDiscriminatorInputValidator$1;->$invalidValueResId:I
 
     invoke-static {p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_1
 
     :cond_1
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_2
     :goto_0
     iget v0, p0, Lcom/discord/utilities/auth/AuthUtils$createDiscriminatorInputValidator$1;->$invalidFormatResId:I
 
     invoke-static {p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
-    :cond_2
     :goto_1
-    return-object v0
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public bridge synthetic getErrorMessage(Ljava/lang/Object;)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils$createEmailInputValidator$1.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils$createEmailInputValidator$1.smali
index 6362a548b6..1468f99917 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils$createEmailInputValidator$1.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils$createEmailInputValidator$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/auth/AuthUtils$createEmailInputValidator$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AuthUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(Ljava/lang/String;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
@@ -84,13 +86,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils$createPasswordInputValidator$1.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils$createPasswordInputValidator$1.smali
index 2883756441..11bb11c823 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils$createPasswordInputValidator$1.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils$createPasswordInputValidator$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/auth/AuthUtils$createPasswordInputValidator$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AuthUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(Ljava/lang/String;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
@@ -84,13 +86,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali
index e5486bc777..64355b5562 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali
@@ -3,7 +3,7 @@
 .source "AuthUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Landroid/net/Uri;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
index a0d4480d99..b90aad5b5f 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
@@ -55,75 +55,70 @@
 .end method
 
 .method public static final broadcastAuthChangedEvent(Landroid/content/Context;ZJ)V
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-wide/16 v1, 0x0
+    const-wide/16 v0, 0x0
 
-    cmp-long v3, p2, v1
+    cmp-long v2, p2, v0
 
-    if-nez v3, :cond_0
+    if-nez v2, :cond_0
 
     return-void
 
     :cond_0
-    new-instance v1, Landroid/content/Intent;
+    new-instance v0, Landroid/content/Intent;
 
     if-eqz p1, :cond_1
 
-    const-string v2, "com.discord.broadcast.LOGGED_IN"
+    const-string v1, "com.discord.broadcast.LOGGED_IN"
 
     goto :goto_0
 
     :cond_1
-    const-string v2, "com.discord.broadcast.LOGGED_OUT"
+    const-string v1, "com.discord.broadcast.LOGGED_OUT"
 
     :goto_0
-    invoke-direct {v1, v2}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    const-string v2, "com.discord.intent.extra.EXTRA_USER_ID"
+    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
 
-    invoke-virtual {v1, v2, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+    invoke-virtual {v0, v1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
 
-    sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v4, "Broadcasting auth event: isLoggedIn="
+    const-string v3, "Broadcasting auth event: isLoggedIn="
 
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
     const-string p1, ", userId="
 
-    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     const/4 p2, 0x2
 
-    invoke-static {v2, p1, v0, p2, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    const/4 p3, 0x0
 
-    invoke-virtual {p0, v1}, Landroid/content/Context;->sendBroadcast(Landroid/content/Intent;)V
+    invoke-static {v1, p1, p3, p2, p3}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+
+    invoke-virtual {p0, v0}, Landroid/content/Context;->sendBroadcast(Landroid/content/Intent;)V
 
     return-void
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic getWebHandoffUrl$default(Lcom/discord/utilities/auth/AuthUtils;Landroid/net/Uri;ZILjava/lang/Object;)Lrx/Observable;
@@ -255,17 +250,19 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "secret"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x4
+    const-string v0, " "
 
-    const-string v2, " "
+    const-string v1, ""
 
-    const-string v3, ""
+    const/4 v2, 0x0
 
-    invoke-static {p1, v2, v3, v0, v1}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    const/4 v3, 0x4
+
+    invoke-static {p1, v0, v1, v2, v3}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object p1
 
@@ -275,9 +272,9 @@
 
     const-string v0, "(this as java.lang.String).toUpperCase()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -286,15 +283,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "secret"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final generateNewTotpKey()Ljava/lang/String;
@@ -313,7 +301,7 @@
 
     move-result-wide v0
 
-    new-instance v2, Lj0/p/d;
+    new-instance v2, Lk0/q/d;
 
     long-to-int v3, v0
 
@@ -323,13 +311,13 @@
 
     long-to-int v1, v0
 
-    invoke-direct {v2, v3, v1}, Lj0/p/d;-><init>(II)V
+    invoke-direct {v2, v3, v1}, Lk0/q/d;-><init>(II)V
 
     const/16 v0, 0xa
 
     new-array v0, v0, [B
 
-    invoke-virtual {v2, v0}, Lj0/p/c;->nextBytes([B)[B
+    invoke-virtual {v2, v0}, Lk0/q/c;->nextBytes([B)[B
 
     move-result-object v0
 
@@ -337,7 +325,7 @@
 
     move-result-object v0
 
-    const-string v1, "utf-8"
+    const-string/jumbo v1, "utf-8"
 
     invoke-static {v0, v1}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -345,7 +333,7 @@
 
     const-string v1, "URLEncoder\n        .enco\u2026oBase32String(), \"utf-8\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "="
 
@@ -355,7 +343,7 @@
 
     const/4 v4, 0x4
 
-    invoke-static {v0, v1, v2, v3, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v0, v1, v2, v3, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v0
 
@@ -365,9 +353,9 @@
 
     const-string v1, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v0}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object v0
 
@@ -447,7 +435,7 @@
 
     const-string v1, "builder.toString()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -465,7 +453,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "redirectUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -474,15 +464,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "redirectUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getWebHandoffUrl(Landroid/net/Uri;Z)Lrx/Observable;
@@ -498,7 +479,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "redirectUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -528,44 +511,37 @@
 
     invoke-direct {v1, p2, p1}, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;-><init>(ZLandroid/net/Uri;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream.getAuthentic\u2026       handoffUrl\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "redirectUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final isValidPasswordLength(Ljava/lang/String;)Z
-    .locals 2
+    .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "password"
 
-    const/16 v0, 0x80
-
-    const/4 v1, 0x6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
     move-result p1
 
-    if-le v1, p1, :cond_0
+    const/4 v0, 0x6
+
+    if-le v0, p1, :cond_0
 
     goto :goto_0
 
     :cond_0
+    const/16 v0, 0x80
+
     if-lt v0, p1, :cond_1
 
     const/4 p1, 0x1
@@ -578,13 +554,4 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
index 33d463d840..9179c3d267 100644
--- a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
@@ -81,7 +81,7 @@
 
     const-string v1, "Calendar.getInstance().apply { set(2020, 2, 1) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/util/Calendar;->getTime()Ljava/util/Date;
 
@@ -89,7 +89,7 @@
 
     const-string v1, "Calendar.getInstance().a\u2026 { set(2020, 2, 1) }.time"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lcom/discord/utilities/billing/PremiumUtilsKt;->GRANDFATHERED_MONTHLY_END_DATE:Ljava/util/Date;
 
@@ -105,7 +105,7 @@
 
     const-string v1, "Calendar.getInstance().apply { set(2021, 0, 1) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/util/Calendar;->getTime()Ljava/util/Date;
 
@@ -113,7 +113,7 @@
 
     const-string v1, "Calendar.getInstance().a\u2026 { set(2021, 0, 1) }.time"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lcom/discord/utilities/billing/PremiumUtilsKt;->GRANDFATHERED_YEARLY_END_DATE:Ljava/util/Date;
 
@@ -317,7 +317,7 @@
 
     sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    sget-object v3, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v3, Lk0/j/p;->d:Lk0/j/p;
 
     new-instance v4, Lkotlin/Pair;
 
@@ -337,7 +337,9 @@
 .method public static final getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     int-to-float p0, p0
 
@@ -377,18 +379,9 @@
 
     const-string p1, "numberFormat.format(priceUsdDollars)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getGRANDFATHERED_MONTHLY_END_DATE()Ljava/util/Date;
@@ -418,15 +411,17 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    if-eqz p0, :cond_3
+    const-string v0, "paymentSource"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
 
-    const v1, 0x7f08028f
+    const v1, 0x7f080290
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f080291
+    const v1, 0x7f080292
 
     goto/16 :goto_2
 
@@ -449,7 +444,7 @@
 
     const-string v0, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
 
@@ -479,7 +474,7 @@
 
     if-eqz p0, :cond_2
 
-    const v1, 0x7f08028e
+    const v1, 0x7f08028f
 
     goto :goto_2
 
@@ -495,7 +490,7 @@
     goto :goto_0
 
     :sswitch_3
-    const-string v0, "visa"
+    const-string/jumbo v0, "visa"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -503,7 +498,7 @@
 
     if-eqz p0, :cond_2
 
-    const v1, 0x7f080292
+    const v1, 0x7f080293
 
     goto :goto_2
 
@@ -517,7 +512,7 @@
     if-eqz p0, :cond_2
 
     :goto_0
-    const v1, 0x7f08028d
+    const v1, 0x7f08028e
 
     goto :goto_2
 
@@ -531,16 +526,16 @@
     if-eqz p0, :cond_2
 
     :goto_1
-    const v1, 0x7f080290
+    const v1, 0x7f080291
 
     goto :goto_2
 
     :cond_1
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 
@@ -548,17 +543,6 @@
     :goto_2
     return v1
 
-    :cond_3
-    const-string p0, "paymentSource"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x79845b8e -> :sswitch_5
diff --git a/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali b/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali
index 97dae57ea5..e985fcad10 100644
--- a/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali
+++ b/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali
@@ -57,13 +57,13 @@
 
     const-string v4, "nowCalendar"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v0, v1}, Ljava/util/Calendar;->setTimeInMillis(J)V
 
     const-string v0, "dobCalendar"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, p1, p2}, Ljava/util/Calendar;->setTimeInMillis(J)V
 
@@ -164,7 +164,7 @@
 
     const-string v3, "calendar"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v0, v1}, Ljava/util/Calendar;->setTimeInMillis(J)V
 
diff --git a/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali b/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali
index 1cb5b2afbb..571dfb3371 100644
--- a/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/cache/SharedPreferenceExtensionsKt.smali
@@ -18,11 +18,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$edit"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "onReceivedEditor"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -30,55 +32,31 @@
 
     const-string v0, "it"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-interface {p0}, Landroid/content/SharedPreferences$Editor;->apply()V
 
     return-void
-
-    :cond_0
-    const-string p0, "onReceivedEditor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$edit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getString(Landroid/content/SharedPreferences;Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
+    const-string v0, "$this$getString"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_1
-
-    if-eqz p1, :cond_0
-
     invoke-interface {p0, p1, v0}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "key"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$getString"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/cache/SharedPreferencesProvider.smali b/com.discord/smali/com/discord/utilities/cache/SharedPreferencesProvider.smali
index 0ae235b1b7..e5eb0bb9e5 100644
--- a/com.discord/smali/com/discord/utilities/cache/SharedPreferencesProvider.smali
+++ b/com.discord/smali/com/discord/utilities/cache/SharedPreferencesProvider.smali
@@ -44,7 +44,7 @@
     :cond_0
     const-string v0, "sharedPreferences"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -54,7 +54,9 @@
 .method public final init(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
@@ -62,18 +64,9 @@
 
     const-string v0, "PreferenceManager.getDef\u2026haredPreferences(context)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/utilities/cache/SharedPreferencesProvider;->sharedPreferences:Landroid/content/SharedPreferences;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
index fb22a7b7a3..a487503ac6 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$Failure.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "reasonCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Throwable;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->reasonCode:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "reasonCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/captcha/CaptchaHelper$Failure;ILjava/lang/String;ILjava/lang/Object;)Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
@@ -89,22 +82,15 @@
 .method public final copy(ILjava/lang/String;)Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "reasonCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;-><init>(ILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "reasonCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -128,7 +114,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->reasonCode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result 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 37834eefe7..658600653e 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
@@ -37,13 +37,15 @@
 .method public final onFailure(Ljava/lang/Exception;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2;->$errorHandler:Lkotlin/jvm/functions/Function1;
 
     new-instance v0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    const v1, 0x7f1203c2
+    const v1, 0x7f1203c3
 
     const-string v2, "missing_dependencies"
 
@@ -52,13 +54,4 @@
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$1.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$1.smali
index cb0160e2cb..eaaae1f94b 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$1.smali
@@ -51,7 +51,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p1, Lf/h/a/f/e/h/f;->a:Lf/h/a/f/e/h/g;
 
@@ -61,9 +61,9 @@
 
     move-result-object p1
 
-    const-string v0, "userResponseToken"
+    const-string/jumbo v0, "userResponseToken"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
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 d561ece1b8..6f255b26a0 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
@@ -37,13 +37,15 @@
 .method public final onFailure(Ljava/lang/Exception;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptcha$2;->$errorHandler:Lkotlin/jvm/functions/Function1;
 
     new-instance v0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    const v1, 0x7f1203c1
+    const v1, 0x7f1203c2
 
     const-string v2, "expired"
 
@@ -52,13 +54,4 @@
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
index 27afcfd729..e1353f82ef 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CaptchaHelper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -97,13 +99,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1.smali
index a427a72a22..18bc011dd0 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CaptchaHelper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,28 +61,21 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1;->this$0:Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1;
 
     iget-object v0, v0, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1;->$emitter:Lrx/Emitter;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1;->this$0:Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1;
 
     iget-object p1, p1, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1;->$emitter:Lrx/Emitter;
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1.smali
index 17cf94d5e1..d81f6a5b4b 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CaptchaHelper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 
     const-string v2, "SafetyNet\n                    .getClient(activity)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$1$1;
 
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1.smali
index 23c65083a8..ea7128b332 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CaptchaHelper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/captcha/CaptchaHelper$Failure;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/captcha/CaptchaHelper$Failure;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -73,16 +75,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1$errorHandler$1;->$emitter:Lrx/Emitter;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.smali
index 4aa71fb811..228fe54e97 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,7 +78,7 @@
 
     const-string v3, "GoogleApiAvailability\n          .getInstance()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1;->$activity:Landroid/app/Activity;
 
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
index 9927037189..a9b4c10b05 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
@@ -118,7 +118,7 @@
 
     const-string p2, "makeGooglePlayServicesAv\u2026ISSING_DEPS))\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -137,9 +137,9 @@
     :cond_2
     new-instance p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    const p2, 0x7f1203c3
+    const p2, 0x7f1203c4
 
-    const-string p3, "unsupported_device"
+    const-string/jumbo p3, "unsupported_device"
 
     invoke-direct {p1, p2, p3}, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;-><init>(ILjava/lang/String;)V
 
@@ -298,19 +298,19 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v2, 0x7f1203c6
+    const v2, 0x7f1203c7
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f1203c7
+    const v2, 0x7f1203c8
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f1203c5
+    const v2, 0x7f1203c6
 
     new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
 
@@ -320,7 +320,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1203b7
+    const p2, 0x7f1203b8
 
     const/4 v1, 0x2
 
@@ -332,7 +332,7 @@
 
     const-string p2, "it"
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -357,13 +357,13 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(null)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -380,7 +380,7 @@
 
     const-string v0, "Observable.create({ emit\u2026.BackpressureMode.BUFFER)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali
index f66b521a34..eeb515ad71 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1.smali
@@ -51,7 +51,7 @@
 
     const-string v0, "chan1"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -59,7 +59,7 @@
 
     const-string p1, "chan2"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali
index 7531b4f07b..96c96c6877 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ChannelUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1$1;->this$0:Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1;
 
@@ -92,13 +94,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali
index 38714a7bf6..42b82259db 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1.smali
@@ -3,7 +3,7 @@
 .source "ChannelUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;"
     }
 .end annotation
 
@@ -65,7 +71,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -83,7 +89,7 @@
 
     const-string v1, "ModelChannel.getSortByNameAndType()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lf/n/a/k/a;->sortedWith(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
 
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali
index 9a1e86a4a1..ada440d4ba 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getDefaultChannel$1.smali
@@ -3,7 +3,7 @@
 .source "ChannelUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -71,6 +77,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelChannel;",
             ">;"
         }
@@ -98,7 +105,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1$1;-><init>(Ljava/util/Map;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali
index 25c7090902..eef2e255e9 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils$getSortedCategories$sortedCategories$1.smali
@@ -23,7 +23,8 @@
         ">",
         "Ljava/lang/Object;",
         "Ljava/util/Comparator<",
-        "TK;>;"
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
index f7dac3da48..d68b7cd6ef 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -51,11 +51,13 @@
 .method public static final getDisplayName(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Z)Ljava/lang/String;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getDisplayName"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
 
@@ -72,20 +74,6 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$getDisplayName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic getDisplayName$default(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;ZILjava/lang/Object;)Ljava/lang/String;
@@ -149,13 +137,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "channelMembers"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "nicks"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0xa
 
@@ -203,7 +195,7 @@
 
     move-result-object v2
 
-    invoke-static {v0, p2}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v0, p2}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -227,27 +219,6 @@
 
     :cond_1
     return-object v1
-
-    :cond_2
-    const-string p0, "nicks"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "channelMembers"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "users"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static getNickOrUsernames$default(Ljava/lang/Iterable;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Ljava/util/Map;
@@ -257,7 +228,7 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p3, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p3, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_0
     invoke-static {p0, p1, p2, p3}, Lcom/discord/utilities/channel/ChannelUtils;->getNickOrUsernames(Ljava/lang/Iterable;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
@@ -284,22 +255,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "mostRecentMessageIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/channel/ChannelUtils$createMostRecentChannelComparator$1;-><init>(Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "mostRecentMessageIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getDefaultChannel(J)Lrx/Observable;
@@ -327,13 +291,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/utilities/channel/ChannelUtils$getDefaultChannel$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n        .get\u2026              }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -365,7 +329,9 @@
 .method public final getDisplayName(Landroid/content/Context;Ljava/lang/String;IZ)Ljava/lang/String;
     .locals 2
 
-    if-eqz p1, :cond_7
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -398,7 +364,7 @@
     :cond_0
     if-eqz v0, :cond_6
 
-    const p2, 0x7f121665
+    const p2, 0x7f12168f
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -409,7 +375,7 @@
     :cond_1
     if-eqz v0, :cond_6
 
-    const p2, 0x7f120cf9
+    const p2, 0x7f120d1f
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -420,7 +386,7 @@
     :cond_2
     if-eqz v0, :cond_3
 
-    const p2, 0x7f120592
+    const p2, 0x7f120594
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -440,7 +406,7 @@
     :cond_4
     if-eqz v0, :cond_5
 
-    const p2, 0x7f120cf8
+    const p2, 0x7f120d1e
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -458,15 +424,6 @@
     :cond_6
     :goto_0
     return-object p2
-
-    :cond_7
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getSortedCategories(Ljava/util/Map;)Ljava/util/Map;
@@ -487,7 +444,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_4
+    const-string v0, "guildChannels"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator;
 
@@ -505,7 +464,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->filterNotNull(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->filterNotNull(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
@@ -579,13 +538,4 @@
 
     :cond_3
     return-object v1
-
-    :cond_4
-    const-string p1, "guildChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali
index 1c50ca6dbf..f07bd52195 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali
@@ -126,17 +126,19 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    if-eqz p0, :cond_6
+    const-string v0, "guildChannelIconType"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/channel/GuildChannelIconType$Text;->INSTANCE:Lcom/discord/utilities/channel/GuildChannelIconType$Text;
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p0, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    const p0, 0x7f080260
+    const p0, 0x7f080261
 
     goto :goto_0
 
@@ -145,7 +147,7 @@
 
     if-eqz v0, :cond_1
 
-    const p0, 0x7f08025b
+    const p0, 0x7f08025c
 
     goto :goto_0
 
@@ -154,7 +156,7 @@
 
     if-eqz v0, :cond_2
 
-    const p0, 0x7f080265
+    const p0, 0x7f080266
 
     goto :goto_0
 
@@ -163,7 +165,7 @@
 
     if-eqz v0, :cond_3
 
-    const p0, 0x7f08025d
+    const p0, 0x7f08025e
 
     goto :goto_0
 
@@ -172,7 +174,7 @@
 
     if-eqz v0, :cond_4
 
-    const p0, 0x7f080264
+    const p0, 0x7f080265
 
     goto :goto_0
 
@@ -181,7 +183,7 @@
 
     if-eqz p0, :cond_5
 
-    const p0, 0x7f08025c
+    const p0, 0x7f08025d
 
     :goto_0
     return p0
@@ -192,13 +194,4 @@
     invoke-direct {p0}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p0
-
-    :cond_6
-    const-string p0, "guildChannelIconType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
index 85ac529dcb..cd7ce8b649 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali
@@ -39,7 +39,27 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func8<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
+        "Lcom/discord/models/domain/ModelUser$Me;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        "Ljava/lang/Boolean;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/utilities/channel/GuildChannelsInfo;",
+        ">;"
     }
 .end annotation
 
@@ -252,7 +272,7 @@
 
     move-object/from16 v4, p8
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_9
 
@@ -293,7 +313,7 @@
 
     move-object/from16 v12, p7
 
-    invoke-static {v12, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_b
 
@@ -335,13 +355,13 @@
 
     move-object/from16 v3, p3
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "hideMuted"
 
     move-object/from16 v1, p4
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p4 .. p4}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali
index c87da3bef6..de30b634c1 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion.smali
@@ -144,7 +144,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali
index 140dab078c..066afd3c6c 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo.smali
@@ -79,13 +79,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "notificationSettings"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "channelPermissions"
 
-    if-eqz p9, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "manageGuildContext"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -110,27 +114,6 @@
     iput-boolean p10, p0, Lcom/discord/utilities/channel/GuildChannelsInfo;->canChangeNickname:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "manageGuildContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channelPermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "notificationSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/channel/GuildChannelsInfo;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuildRole;Lcom/discord/models/domain/ModelNotificationSettings;ZLjava/util/Map;ZZZLcom/discord/utilities/permissions/ManageGuildContext;ZILjava/lang/Object;)Lcom/discord/utilities/channel/GuildChannelsInfo;
@@ -397,13 +380,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "notificationSettings"
 
-    if-eqz p3, :cond_2
+    move-object v4, p3
 
-    if-eqz p5, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string v0, "channelPermissions"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "manageGuildContext"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/channel/GuildChannelsInfo;
 
@@ -413,46 +406,19 @@
 
     move-object v3, p2
 
-    move-object v4, p3
-
     move/from16 v5, p4
 
-    move-object/from16 v6, p5
-
     move/from16 v7, p6
 
     move/from16 v8, p7
 
     move/from16 v9, p8
 
-    move-object/from16 v10, p9
-
     move/from16 v11, p10
 
     invoke-direct/range {v1 .. v11}, Lcom/discord/utilities/channel/GuildChannelsInfo;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuildRole;Lcom/discord/models/domain/ModelNotificationSettings;ZLjava/util/Map;ZZZLcom/discord/utilities/permissions/ManageGuildContext;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "manageGuildContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "channelPermissions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "notificationSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -470,7 +436,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/channel/GuildChannelsInfo;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -480,7 +446,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/channel/GuildChannelsInfo;->everyoneRole:Lcom/discord/models/domain/ModelGuildRole;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -490,7 +456,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/channel/GuildChannelsInfo;->notificationSettings:Lcom/discord/models/domain/ModelNotificationSettings;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -506,7 +472,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/channel/GuildChannelsInfo;->channelPermissions:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -534,7 +500,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/channel/GuildChannelsInfo;->manageGuildContext:Lcom/discord/utilities/permissions/ManageGuildContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -649,7 +615,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "guildChannels"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
 
@@ -745,15 +713,6 @@
 
     :cond_2
     return-object v0
-
-    :cond_3
-    const-string p1, "guildChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getUnelevated()Z
diff --git a/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali b/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali
index c5e5ddefc3..c859f656dc 100644
--- a/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali
+++ b/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Set;
-.implements Lj0/n/c/v/b;
+.implements Lk0/o/c/w/b;
 
 
 # annotations
@@ -50,7 +50,7 @@
 .end method
 
 .method public constructor <init>(ILjava/util/LinkedHashSet;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I",
@@ -59,7 +59,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "_set"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -68,15 +70,6 @@
     iput-object p2, p0, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->_set:Ljava/util/LinkedHashSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "_set"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(ILjava/util/LinkedHashSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -130,7 +123,7 @@
 
     const-string v2, "_set.iterator()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     iget-object v2, p0, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->_set:Ljava/util/LinkedHashSet;
@@ -180,7 +173,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->_set:Ljava/util/LinkedHashSet;
 
@@ -189,15 +184,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public clear()V
@@ -234,7 +220,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->_set:Ljava/util/LinkedHashSet;
 
@@ -243,15 +231,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getMaxSize()I
@@ -304,7 +283,7 @@
 
     const-string v1, "iterator(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -333,7 +312,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->_set:Ljava/util/LinkedHashSet;
 
@@ -342,15 +323,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public retainAll(Ljava/util/Collection;)Z
@@ -365,7 +337,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->_set:Ljava/util/LinkedHashSet;
 
@@ -374,15 +348,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final bridge size()I
@@ -398,7 +363,7 @@
 .method public toArray()[Ljava/lang/Object;
     .locals 1
 
-    invoke-static {p0}, Lj0/n/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
+    invoke-static {p0}, Lk0/o/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -415,7 +380,7 @@
         }
     .end annotation
 
-    invoke-static {p0, p1}, Lj0/n/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+    invoke-static {p0, p1}, Lk0/o/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object p1
 
@@ -433,7 +398,7 @@
 
     iget-object v1, p0, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->_set:Ljava/util/LinkedHashSet;
 
-    invoke-static {v1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali b/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali
index 7660813c46..da52ddb2f7 100644
--- a/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali
+++ b/com.discord/smali/com/discord/utilities/collections/MutablePartitionedIterator.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -55,7 +55,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "partitionIterator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,20 +73,11 @@
 
     const-string v0, "LinkedList<T>().iterator()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/collections/MutablePartitionedIterator;->currentPartitionIterator:Ljava/util/Iterator;
 
     return-void
-
-    :cond_0
-    const-string p1, "partitionIterator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
index 735fa2487f..7adc8366e8 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali
@@ -68,11 +68,13 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "partitionStrategy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
@@ -99,9 +101,9 @@
 
     move-object v1, p1
 
-    check-cast v1, Lj0/i/q;
+    check-cast v1, Lk0/j/q;
 
-    invoke-virtual {v1}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v1}, Lk0/j/q;->nextInt()I
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -117,13 +119,4 @@
     invoke-direct {p1, v0, p2}, Lcom/discord/utilities/collections/ShallowPartitionCollection;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "partitionStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
index 2e713a3760..0d2d858dd2 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Collection;
-.implements Lj0/n/c/v/b;
+.implements Lk0/o/c/w/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Collection<",
         "TE;>;",
-        "Lj0/n/c/v/b;"
+        "Lk0/o/c/w/b;"
     }
 .end annotation
 
@@ -86,11 +86,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "partitions"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "partitionStrategy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -98,12 +100,12 @@
 
     iput-object p2, p0, Lcom/discord/utilities/collections/ShallowPartitionCollection;->partitionStrategy:Lkotlin/jvm/functions/Function1;
 
-    const/4 p2, 0x0
-
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
+    const/4 p2, 0x0
+
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
@@ -129,20 +131,6 @@
     iput p2, p0, Lcom/discord/utilities/collections/ShallowPartitionCollection;->size:I
 
     return-void
-
-    :cond_1
-    const-string p1, "partitionStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "partitions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getPartition(Ljava/lang/Object;)Ljava/util/Collection;
@@ -245,7 +233,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -282,15 +272,6 @@
 
     :cond_2
     return v1
-
-    :cond_3
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public clear()V
@@ -353,7 +334,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/collections/ShallowPartitionCollection;->partitions:Ljava/util/List;
 
@@ -374,7 +357,7 @@
 
     check-cast v1, Ljava/util/Collection;
 
-    invoke-static {p1, v1}, Lj0/i/l;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, v1}, Lk0/j/l;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
@@ -386,15 +369,6 @@
     move-result p1
 
     return p1
-
-    :cond_1
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getPartitionStrategy()Lkotlin/jvm/functions/Function1;
@@ -527,7 +501,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -564,15 +540,6 @@
 
     :cond_2
     return v1
-
-    :cond_3
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public retainAll(Ljava/util/Collection;)Z
@@ -587,7 +554,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/collections/ShallowPartitionCollection;->partitions:Ljava/util/List;
 
@@ -628,15 +597,6 @@
 
     :cond_2
     return v2
-
-    :cond_3
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setSize(I)V
@@ -660,7 +620,7 @@
 .method public toArray()[Ljava/lang/Object;
     .locals 1
 
-    invoke-static {p0}, Lj0/n/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
+    invoke-static {p0}, Lk0/o/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -677,7 +637,7 @@
         }
     .end annotation
 
-    invoke-static {p0, p1}, Lj0/n/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+    invoke-static {p0, p1}, Lk0/o/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali
index 1d9b760280..af419a99a1 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShallowPartitionImmutableCollection.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TE;",
         "Ljava/lang/Integer;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali
index ec54489905..1ac24e7c5a 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection$Set.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Set;
-.implements Lj0/n/c/v/b;
+.implements Lk0/o/c/w/b;
 
 
 # annotations
@@ -48,27 +48,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "partitions"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "partitionStrategy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "partitionStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "partitions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali
index a7234517ea..348eb49e63 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionImmutableCollection.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Collection;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -25,7 +25,7 @@
         "TE;TT;>;",
         "Ljava/util/Collection<",
         "TE;>;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
@@ -58,7 +58,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "partitions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection$1;->INSTANCE:Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection$1;
 
@@ -67,15 +69,6 @@
     iput-object p2, p0, Lcom/discord/utilities/collections/ShallowPartitionImmutableCollection;->readOnlyPartitionStrategy:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "partitions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -111,7 +104,7 @@
 .end method
 
 .method public addAll(Ljava/util/Collection;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -120,22 +113,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public clear()Ljava/lang/Void;
@@ -252,7 +238,7 @@
 .end method
 
 .method public removeAll(Ljava/util/Collection;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -263,26 +249,19 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public retainAll(Ljava/util/Collection;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -293,20 +272,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion$getHashCodePartitionStrategy$1.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion$getHashCodePartitionStrategy$1.smali
index cf46e17eab..a5856662e7 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion$getHashCodePartitionStrategy$1.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion$getHashCodePartitionStrategy$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/collections/ShallowPartitionMap$Companion$getHashCodePartitionStrategy$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShallowPartitionMap.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TK;",
         "Ljava/lang/Integer;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion.smali
index cd6fdeb3e8..111cecb38a 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$Companion.smali
@@ -131,62 +131,55 @@
         }
     .end annotation
 
-    if-eqz p4, :cond_1
+    const-string p1, "partitionStrategy"
 
-    const/4 p1, 0x0
+    invoke-static {p4, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lkotlin/ranges/IntRange;
+    new-instance p1, Lkotlin/ranges/IntRange;
 
-    invoke-direct {v0, p1, p3}, Lkotlin/ranges/IntRange;-><init>(II)V
+    const/4 v0, 0x0
 
-    new-instance p1, Ljava/util/ArrayList;
+    invoke-direct {p1, v0, p3}, Lkotlin/ranges/IntRange;-><init>(II)V
 
-    const/16 p3, 0xa
+    new-instance p3, Ljava/util/ArrayList;
 
-    invoke-static {v0, p3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    const/16 v0, 0xa
 
-    move-result p3
+    invoke-static {p1, v0}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    invoke-direct {p1, p3}, Ljava/util/ArrayList;-><init>(I)V
+    move-result v0
 
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-direct {p3, v0}, Ljava/util/ArrayList;-><init>(I)V
 
-    move-result-object p3
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
 
     :goto_0
-    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    move-object v0, p3
+    move-object v0, p1
 
-    check-cast v0, Lj0/i/q;
+    check-cast v0, Lk0/j/q;
 
-    invoke-virtual {v0}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v0}, Lk0/j/q;->nextInt()I
 
     new-instance v0, Ljava/util/HashMap;
 
     invoke-direct {v0, p2}, Ljava/util/HashMap;-><init>(I)V
 
-    invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {p3, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
-    new-instance p2, Lcom/discord/utilities/collections/ShallowPartitionMap;
+    new-instance p1, Lcom/discord/utilities/collections/ShallowPartitionMap;
 
-    invoke-direct {p2, p1, p4}, Lcom/discord/utilities/collections/ShallowPartitionMap;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {p1, p3, p4}, Lcom/discord/utilities/collections/ShallowPartitionMap;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 
-    return-object p2
-
-    :cond_1
-    const-string p1, "partitionStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
index d28cf053ae..8e068744e9 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap.smali
@@ -51,7 +51,7 @@
 
 # direct methods
 .method public constructor <init>(ILkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I",
@@ -62,7 +62,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "partitionStrategy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/collections/ShallowPartitionMap;-><init>(ILkotlin/jvm/functions/Function1;)V
 
@@ -74,7 +76,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
+    invoke-static {p1}, Lk0/j/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
 
     move-result-object p1
 
@@ -91,15 +93,6 @@
     iput-object p1, p0, Lcom/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap;->defensiveCopyPartitions:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "partitionStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -125,7 +118,7 @@
 .end method
 
 .method public final defensiveCopy(Ljava/util/List;)Ljava/util/List;
-    .locals 7
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -139,90 +132,85 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$defensiveCopy"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance v0, Ljava/util/ArrayList;
 
-    const/16 v2, 0xa
+    const/16 v1, 0xa
 
-    invoke-static {p1, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {p1, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v2
+    move-result v1
 
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    const/4 v2, 0x0
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
+    const/4 v1, 0x0
+
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v3
-
-    add-int/lit8 v4, v2, 0x1
-
-    if-ltz v2, :cond_1
-
-    check-cast v3, Ljava/util/Map;
-
-    iget-object v5, p0, Lcom/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap;->dirtyPartitionIndices:Ljava/util/HashSet;
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    invoke-virtual {v5, v6}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_0
-
-    new-instance v3, Ljava/util/HashMap;
-
-    invoke-virtual {p0}, Lcom/discord/utilities/collections/ShallowPartitionMap;->getPartitions()Ljava/util/List;
-
-    move-result-object v5
-
-    invoke-interface {v5, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
     move-result-object v2
 
+    add-int/lit8 v3, v1, 0x1
+
+    if-ltz v1, :cond_1
+
     check-cast v2, Ljava/util/Map;
 
-    invoke-direct {v3, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+    iget-object v4, p0, Lcom/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap;->dirtyPartitionIndices:Ljava/util/HashSet;
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v5
+
+    invoke-virtual {v4, v5}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    new-instance v2, Ljava/util/HashMap;
+
+    invoke-virtual {p0}, Lcom/discord/utilities/collections/ShallowPartitionMap;->getPartitions()Ljava/util/List;
+
+    move-result-object v4
+
+    invoke-interface {v4, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/util/Map;
+
+    invoke-direct {v2, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
     :cond_0
-    invoke-interface {v1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    move v2, v4
+    move v1, v3
 
     goto :goto_0
 
     :cond_1
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
-    throw v0
+    const/4 p1, 0x0
+
+    throw p1
 
     :cond_2
-    return-object v1
-
-    :cond_3
-    const-string p1, "$this$defensiveCopy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
 
 .method public fastCopy()Ljava/util/Map;
@@ -318,7 +306,7 @@
 .end method
 
 .method public final setDefensiveCopyPartitions(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -329,7 +317,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/collections/ShallowPartitionMap$CopiablePartitionMap;->defensiveCopyPartitions:Ljava/util/List;
 
@@ -338,13 +328,4 @@
     invoke-virtual {p1}, Ljava/util/HashSet;->clear()V
 
     return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali
index 1f669bde69..2ae50ba6c1 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap$entries$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/collections/ShallowPartitionMap$entries$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ShallowPartitionMap.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map$Entry<",
         "TK;TV;>;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,7 +57,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/collections/ShallowPartitionMap$entries$2;->this$0:Lcom/discord/utilities/collections/ShallowPartitionMap;
 
@@ -80,15 +82,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
index a6a08619ae..3209281fd0 100644
--- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Map;
-.implements Lj0/n/c/v/d;
+.implements Lk0/o/c/w/d;
 
 
 # annotations
@@ -25,7 +25,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Map<",
         "TK;TV;>;",
-        "Lj0/n/c/v/d;"
+        "Lk0/o/c/w/d;"
     }
 .end annotation
 
@@ -88,11 +88,13 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "partitionStrategy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
@@ -119,9 +121,9 @@
 
     move-object v1, p1
 
-    check-cast v1, Lj0/i/q;
+    check-cast v1, Lk0/j/q;
 
-    invoke-virtual {v1}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v1}, Lk0/j/q;->nextInt()I
 
     new-instance v1, Ljava/util/HashMap;
 
@@ -135,15 +137,6 @@
     invoke-direct {p0, v0, p2}, Lcom/discord/utilities/collections/ShallowPartitionMap;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "partitionStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -177,11 +170,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "partitions"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "partitionStrategy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -197,12 +192,12 @@
 
     iget-object p1, p0, Lcom/discord/utilities/collections/ShallowPartitionMap;->partitions:Ljava/util/List;
 
-    const/4 p2, 0x0
-
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
+    const/4 p2, 0x0
+
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
@@ -228,20 +223,6 @@
     iput p2, p0, Lcom/discord/utilities/collections/ShallowPartitionMap;->size:I
 
     return-void
-
-    :cond_1
-    const-string p1, "partitionStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "partitions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getPartition(Ljava/lang/Object;)Ljava/util/Map;
@@ -751,7 +732,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "from"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -788,15 +771,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "from"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public remove(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali
index 70c0857161..626f60877d 100644
--- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/collections/SnowflakePartitionMap$Companion$PARTITION_SNOWFLAKE_ID_STRATEGY$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SnowflakePartitionMap.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Integer;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
index f5bab50056..6bd13787f9 100644
--- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali
@@ -64,7 +64,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
@@ -91,9 +91,9 @@
 
     move-object v1, p1
 
-    check-cast v1, Lj0/i/q;
+    check-cast v1, Lk0/j/q;
 
-    invoke-virtual {v1}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v1}, Lk0/j/q;->nextInt()I
 
     new-instance v1, Ljava/util/HashMap;
 
@@ -122,22 +122,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "partitions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/collections/SnowflakePartitionMap;->PARTITION_SNOWFLAKE_ID_STRATEGY:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, p1, v0}, Lcom/discord/utilities/collections/ShallowPartitionMap;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "partitions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getPARTITION_SNOWFLAKE_ID_STRATEGY$cp()Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali
index 7f672cbd96..0d3864764b 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk$Companion.smali
@@ -59,7 +59,7 @@
 .end method
 
 .method public final tryMergeChunks(Lcom/discord/utilities/collections/SparseMutableList$Chunk;Lcom/discord/utilities/collections/SparseMutableList$Chunk;)Lcom/discord/utilities/collections/SparseMutableList$Chunk;
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -74,81 +74,83 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "chunk1"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "chunk2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
 
-    move-result v1
+    move-result v0
 
     invoke-static {p2}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
 
-    move-result v2
+    move-result v1
 
-    if-ge v1, v2, :cond_0
+    if-ge v0, v1, :cond_0
 
-    move-object v1, p1
+    move-object v0, p1
 
     goto :goto_0
 
     :cond_0
     invoke-static {p2}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
 
-    move-result v1
+    move-result v0
 
     invoke-static {p1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
 
-    move-result v2
+    move-result v1
 
-    if-ge v1, v2, :cond_4
+    if-ge v0, v1, :cond_4
 
-    move-object v1, p2
+    move-object v0, p2
 
     :goto_0
-    if-ne p1, v1, :cond_1
+    if-ne p1, v0, :cond_1
 
-    move-object v2, p2
+    move-object v1, p2
 
     goto :goto_1
 
     :cond_1
-    move-object v2, p1
+    move-object v1, p1
 
     :goto_1
+    invoke-static {v0}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
+
+    move-result v2
+
+    invoke-virtual {v0}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->getSize()I
+
+    move-result v3
+
+    add-int/2addr v3, v2
+
+    add-int/lit8 v3, v3, -0x1
+
     invoke-static {v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
 
-    move-result v3
+    move-result v2
 
-    invoke-virtual {v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->getSize()I
+    if-ge v3, v2, :cond_3
 
-    move-result v4
-
-    add-int/2addr v4, v3
-
-    add-int/lit8 v4, v4, -0x1
-
-    invoke-static {v2}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
-
-    move-result v3
-
-    if-ge v4, v3, :cond_3
-
-    invoke-static {v2}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
+    invoke-static {v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
 
     move-result p1
 
     add-int/lit8 p1, p1, -0x1
 
-    if-ne v4, p1, :cond_2
+    if-ne v3, p1, :cond_2
 
-    invoke-virtual {v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->getList()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->getList()Ljava/util/List;
 
     move-result-object p1
 
-    invoke-virtual {v2}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->getList()Ljava/util/List;
+    invoke-virtual {v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->getList()Ljava/util/List;
 
     move-result-object p2
 
@@ -156,7 +158,7 @@
 
     new-instance p2, Lcom/discord/utilities/collections/SparseMutableList$Chunk;
 
-    invoke-static {v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
+    invoke-static {v0}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
 
     move-result v0
 
@@ -165,7 +167,9 @@
     return-object p2
 
     :cond_2
-    return-object v0
+    const/4 p1, 0x0
+
+    return-object p1
 
     :cond_3
     new-instance v0, Ljava/lang/IllegalArgumentException;
@@ -202,18 +206,4 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_5
-    const-string p1, "chunk2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "chunk1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali
index 414bd72971..f5901cf962 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$Chunk.smali
@@ -68,7 +68,7 @@
 .end method
 
 .method public constructor <init>(ILjava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I",
@@ -77,7 +77,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "list"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -86,15 +88,6 @@
     iput-object p2, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->list:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "list"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getStartIndex$p(Lcom/discord/utilities/collections/SparseMutableList$Chunk;)I
@@ -204,7 +197,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->startIndex:I
 
@@ -213,15 +208,6 @@
     sub-int/2addr v0, p1
 
     return v0
-
-    :cond_0
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic compareTo(Ljava/lang/Object;)I
@@ -297,22 +283,15 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "list"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;-><init>(ILjava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "list"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final decrementStartIndex()V
@@ -353,7 +332,7 @@
 .end method
 
 .method public final deepCopy(Lkotlin/jvm/functions/Function1;)Lcom/discord/utilities/collections/SparseMutableList$Chunk;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
@@ -366,68 +345,61 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "transform"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v2, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->list:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->list:Ljava/util/List;
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    iget-object v1, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->list:Ljava/util/List;
+
+    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
 
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+    if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->list:Ljava/util/List;
-
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v2
 
-    :goto_0
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    if-eqz v2, :cond_0
 
-    move-result v3
+    invoke-interface {p1, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v3, :cond_1
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_0
-
-    invoke-interface {p1, v3}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
+    move-result-object v2
 
     goto :goto_1
 
     :cond_0
-    move-object v3, v0
+    const/4 v2, 0x0
 
     :goto_1
-    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_1
     new-instance p1, Lcom/discord/utilities/collections/SparseMutableList$Chunk;
 
-    iget v0, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->startIndex:I
+    iget v1, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->startIndex:I
 
-    invoke-direct {p1, v0, v1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;-><init>(ILjava/util/List;)V
+    invoke-direct {p1, v1, v0}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;-><init>(ILjava/util/List;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "transform"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -451,7 +423,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->list:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -496,7 +468,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -642,7 +614,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -775,7 +747,7 @@
 .end method
 
 .method public final setList(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -784,20 +756,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->list:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali
index fd657dde76..912690b9f4 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList$SparseMutableListIterator.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/ListIterator;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -45,7 +45,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/collections/SparseMutableList;I)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -54,7 +54,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "sparseMutableList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,15 +65,6 @@
     iput p2, p0, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;->index:I
 
     return-void
-
-    :cond_0
-    const-string p1, "sparseMutableList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/utilities/collections/SparseMutableList;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
index d5bd75d7f6..5b1cbb6b1b 100644
--- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
+++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/List;
-.implements Lj0/n/c/v/c;
+.implements Lk0/o/c/w/c;
 
 
 # annotations
@@ -23,7 +23,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/List<",
         "TT;>;",
-        "Lj0/n/c/v/c;"
+        "Lk0/o/c/w/c;"
     }
 .end annotation
 
@@ -561,22 +561,15 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string p1, "elements"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public addAll(Ljava/util/Collection;)Z
@@ -589,7 +582,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/collections/SparseMutableList;->size()I
 
@@ -600,15 +595,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public clear()V
@@ -654,7 +640,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -679,7 +665,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashSet;
 
@@ -735,15 +723,6 @@
 
     :cond_2
     return v2
-
-    :cond_3
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final deepCopy()Lcom/discord/utilities/collections/SparseMutableList;
@@ -817,42 +796,44 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "transform"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/utilities/collections/SparseMutableList;
+    new-instance v0, Lcom/discord/utilities/collections/SparseMutableList;
 
     invoke-virtual {p0}, Lcom/discord/utilities/collections/SparseMutableList;->size()I
 
-    move-result v2
+    move-result v1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x2
+    const/4 v3, 0x2
 
-    invoke-direct {v1, v2, v3, v4, v0}, Lcom/discord/utilities/collections/SparseMutableList;-><init>(IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v4, 0x0
 
-    iget-object v0, p0, Lcom/discord/utilities/collections/SparseMutableList;->chunks:Ljava/util/List;
+    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/utilities/collections/SparseMutableList;-><init>(IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    iget-object v1, p0, Lcom/discord/utilities/collections/SparseMutableList;->chunks:Ljava/util/List;
 
-    move-result-object v0
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
 
     :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
     if-eqz v2, :cond_0
 
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Lcom/discord/utilities/collections/SparseMutableList$Chunk;
 
-    iget-object v3, v1, Lcom/discord/utilities/collections/SparseMutableList;->chunks:Ljava/util/List;
+    iget-object v3, v0, Lcom/discord/utilities/collections/SparseMutableList;->chunks:Ljava/util/List;
 
     invoke-virtual {v2, p1}, Lcom/discord/utilities/collections/SparseMutableList$Chunk;->deepCopy(Lkotlin/jvm/functions/Function1;)Lcom/discord/utilities/collections/SparseMutableList$Chunk;
 
@@ -863,14 +844,7 @@
     goto :goto_0
 
     :cond_0
-    return-object v1
-
-    :cond_1
-    const-string p1, "transform"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
 
 .method public get(I)Ljava/lang/Object;
@@ -1011,7 +985,7 @@
 
     if-ltz v1, :cond_4
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -1083,15 +1057,17 @@
 
     const/4 v0, -0x1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     iget-object v1, p0, Lcom/discord/utilities/collections/SparseMutableList;->chunks:Ljava/util/List;
 
-    if-eqz v1, :cond_2
+    const-string v2, "$this$asReversed"
 
-    new-instance v2, Lj0/i/s;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v1}, Lj0/i/s;-><init>(Ljava/util/List;)V
+    new-instance v2, Lk0/j/s;
+
+    invoke-direct {v2, v1}, Lk0/j/s;-><init>(Ljava/util/List;)V
 
     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1122,40 +1098,31 @@
     return v0
 
     :cond_2
-    const-string p1, "$this$asReversed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_3
     invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
 
     move-result v1
 
     :goto_0
-    if-ltz v1, :cond_5
+    if-ltz v1, :cond_4
 
     invoke-virtual {p0, v1}, Lcom/discord/utilities/collections/SparseMutableList;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
-    if-eqz v2, :cond_4
+    if-eqz v2, :cond_3
 
     return v1
 
-    :cond_4
+    :cond_3
     add-int/lit8 v1, v1, -0x1
 
     goto :goto_0
 
-    :cond_5
+    :cond_4
     return v0
 .end method
 
@@ -1244,7 +1211,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -1272,53 +1239,46 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "elements"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;
+    new-instance v0, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
     const/4 v3, 0x0
 
-    invoke-direct {v1, p0, v3, v2, v0}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;-><init>(Lcom/discord/utilities/collections/SparseMutableList;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, p0, v1, v2, v3}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;-><init>(Lcom/discord/utilities/collections/SparseMutableList;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     :cond_0
     :goto_0
-    invoke-virtual {v1}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;->hasNext()Z
+    invoke-virtual {v0}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;->hasNext()Z
 
-    move-result v0
+    move-result v2
 
-    if-eqz v0, :cond_1
+    if-eqz v2, :cond_1
 
-    invoke-virtual {v1}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;->next()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;->next()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-interface {p1, v0}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
+    invoke-interface {p1, v2}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v2
 
-    if-eqz v0, :cond_0
+    if-eqz v2, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;->remove()V
+    invoke-virtual {v0}, Lcom/discord/utilities/collections/SparseMutableList$SparseMutableListIterator;->remove()V
 
-    const/4 v0, 0x1
-
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :cond_1
-    return v3
-
-    :cond_2
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v1
 .end method
 
 .method public removeAt(I)Ljava/lang/Object;
@@ -1417,7 +1377,7 @@
 .end method
 
 .method public retainAll(Ljava/util/Collection;)Z
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1428,22 +1388,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public set(ILjava/lang/Object;)Ljava/lang/Object;
@@ -1585,7 +1538,7 @@
 .method public toArray()[Ljava/lang/Object;
     .locals 1
 
-    invoke-static {p0}, Lj0/n/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
+    invoke-static {p0}, Lk0/o/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1602,7 +1555,7 @@
         }
     .end annotation
 
-    invoke-static {p0, p1}, Lj0/n/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+    invoke-static {p0, p1}, Lk0/o/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/color/ColorCompat.smali b/com.discord/smali/com/discord/utilities/color/ColorCompat.smali
index 024f54f85d..fa8f892996 100644
--- a/com.discord/smali/com/discord/utilities/color/ColorCompat.smali
+++ b/com.discord/smali/com/discord/utilities/color/ColorCompat.smali
@@ -53,7 +53,7 @@
 .end method
 
 .method public static final getColor(Landroid/view/View;I)I
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/ColorRes;
         .end annotation
@@ -61,7 +61,9 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -72,19 +74,10 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getColor(Landroidx/fragment/app/Fragment;I)I
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/ColorRes;
         .end annotation
@@ -92,7 +85,9 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -103,15 +98,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getThemedColor(Landroid/content/Context;I)I
@@ -152,7 +138,7 @@
 .end method
 
 .method public static final getThemedColor(Landroid/view/View;I)I
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/AttrRes;
         .end annotation
@@ -160,7 +146,9 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -171,19 +159,10 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getThemedColor(Landroidx/fragment/app/Fragment;I)I
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/AttrRes;
         .end annotation
@@ -191,7 +170,9 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -202,15 +183,6 @@
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final isColorDark(I)Z
@@ -439,13 +411,15 @@
 .end method
 
 .method public static final setStatusBarColor(Landroidx/fragment/app/Fragment;IZ)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
@@ -454,15 +428,6 @@
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColor(Landroid/app/Activity;IZ)V
 
     return-void
-
-    :cond_0
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setStatusBarColor$default(Landroid/app/Activity;IZILjava/lang/Object;)V
@@ -569,13 +534,15 @@
 .end method
 
 .method public static final setStatusBarColorResourceId(Landroidx/fragment/app/Fragment;I)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/ColorRes;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
@@ -584,15 +551,6 @@
     invoke-static {p0, p1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
 
     return-void
-
-    :cond_0
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setStatusBarTranslucent(Landroid/app/Activity;)V
@@ -629,9 +587,11 @@
 .end method
 
 .method public static final setStatusBarTranslucent(Landroidx/fragment/app/Fragment;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
@@ -640,15 +600,6 @@
     invoke-static {p0}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarTranslucent(Landroid/app/Activity;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/color/ColorCompatKt.smali b/com.discord/smali/com/discord/utilities/color/ColorCompatKt.smali
index 1d0e3f3470..a04d5e16d8 100644
--- a/com.discord/smali/com/discord/utilities/color/ColorCompatKt.smali
+++ b/com.discord/smali/com/discord/utilities/color/ColorCompatKt.smali
@@ -11,7 +11,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$setDrawableColor"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/TextView;->getCompoundDrawables()[Landroid/graphics/drawable/Drawable;
 
@@ -19,7 +21,7 @@
 
     const-string v0, "compoundDrawables"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lf/n/a/k/a;->filterNotNull([Ljava/lang/Object;)Ljava/util/List;
 
@@ -54,25 +56,18 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "$this$setDrawableColor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setTint(Landroid/graphics/drawable/Drawable;IZ)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
     .end param
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$setTint"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -82,15 +77,6 @@
     invoke-static {p0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTint(Landroid/graphics/drawable/Drawable;I)V
 
     return-void
-
-    :cond_1
-    const-string p0, "$this$setTint"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setTint$default(Landroid/graphics/drawable/Drawable;IZILjava/lang/Object;)V
@@ -109,9 +95,11 @@
 .end method
 
 .method public static final tintWithColor(Landroid/widget/ImageView;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$tintWithColor"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
 
@@ -120,21 +108,14 @@
     invoke-virtual {p0, p1}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$tintWithColor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final tintWithColorResource(Landroid/widget/ImageView;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$tintWithColorResource"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -143,13 +124,4 @@
     invoke-static {p0, p1}, Lcom/discord/utilities/color/ColorCompatKt;->tintWithColor(Landroid/widget/ImageView;I)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$tintWithColorResource"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/device/DeviceUtils.smali b/com.discord/smali/com/discord/utilities/device/DeviceUtils.smali
index 5f8527a394..98dcccfa7f 100644
--- a/com.discord/smali/com/discord/utilities/device/DeviceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/device/DeviceUtils.smali
@@ -99,7 +99,9 @@
 .method public final canDrawOverlays(Landroid/content/Context;)Z
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -126,15 +128,6 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final isDevice(Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)Z
@@ -244,9 +237,9 @@
 
     const-string v4, "Build.MANUFACTURER"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3, v2, v1}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v3, v2, v1}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v2
 
@@ -344,9 +337,9 @@
 
     const-string v4, "Build.MODEL"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3, v2, v1}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v3, v2, v1}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v2
 
diff --git a/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali b/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
index fec3dcf4e8..df392e6c84 100644
--- a/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
+++ b/com.discord/smali/com/discord/utilities/dimen/DimenUtils.smali
@@ -17,7 +17,7 @@
 
     const-string v1, "Resources.getSystem()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -59,7 +59,9 @@
 .method public static final getScreenHeightPx(Landroid/view/WindowManager;)I
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$screenHeightPx"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/DisplayMetrics;
 
@@ -74,21 +76,14 @@
     iget p0, v0, Landroid/util/DisplayMetrics;->heightPixels:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$screenHeightPx"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getScreenWidthPx(Landroid/view/WindowManager;)I
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$screenWidthPx"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/util/DisplayMetrics;
 
@@ -103,15 +98,6 @@
     iget p0, v0, Landroid/util/DisplayMetrics;->widthPixels:I
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$screenWidthPx"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final pixelsToDp(I)I
diff --git a/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali b/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali
index 09f040ef9c..5a7e2ea640 100644
--- a/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali
+++ b/com.discord/smali/com/discord/utilities/dimmer/DimmerView.smali
@@ -49,9 +49,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -70,15 +72,6 @@
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali b/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali
index 9f3aae87c3..e1070b764e 100644
--- a/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali
+++ b/com.discord/smali/com/discord/utilities/display/DisplayUtils.smali
@@ -21,7 +21,9 @@
 .method public static final drawUnderSystemBars(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -36,15 +38,6 @@
     invoke-virtual {p0, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
     return-void
-
-    :cond_0
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getNO_OP_WINDOW_INSETS_LISTENER()Landroidx/core/view/OnApplyWindowInsetsListener;
@@ -58,7 +51,9 @@
 .method public static final getNavigationBarHeight(Landroid/content/res/Resources;)I
     .locals 3
 
-    if-eqz p0, :cond_1
+    const-string v0, "resources"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "navigation_bar_height"
 
@@ -83,23 +78,16 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "resources"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getScreenRefreshRate(Landroid/content/Context;)F
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "context"
 
-    const-string v0, "window"
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "window"
 
     invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -115,7 +103,7 @@
 
     const-string v0, "(context.getSystemServic\u2026owManager).defaultDisplay"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/Display;->getRefreshRate()F
 
@@ -124,20 +112,11 @@
     return p0
 
     :cond_0
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.WindowManager"
 
-    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
+    invoke-direct {p0, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 .end method
@@ -145,9 +124,11 @@
 .method public static final getScreenSize(Landroid/content/Context;)Landroid/graphics/Rect;
     .locals 3
 
-    if-eqz p0, :cond_1
+    const-string v0, "context"
 
-    const-string v0, "window"
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "window"
 
     invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -180,20 +161,11 @@
     return-object p0
 
     :cond_0
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.WindowManager"
 
-    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
+    invoke-direct {p0, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 .end method
@@ -201,7 +173,9 @@
 .method public static final getStatusBarHeight(Landroid/content/res/Resources;)I
     .locals 3
 
-    if-eqz p0, :cond_1
+    const-string v0, "resources"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "status_bar_height"
 
@@ -226,21 +200,14 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "resources"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final hasNavigationBar(Landroid/content/res/Resources;)Z
     .locals 3
 
-    if-eqz p0, :cond_1
+    const-string v0, "resources"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "config_showNavigationBar"
 
@@ -269,25 +236,18 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "resources"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final resizeToFit(Landroid/graphics/Rect;Landroid/graphics/Rect;)Landroid/graphics/Rect;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "in"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "bounds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/graphics/Rect;->width()I
 
@@ -358,30 +318,18 @@
     invoke-direct {p1, v1, v1, v0, p0}, Landroid/graphics/Rect;-><init>(IIII)V
 
     return-object p1
-
-    :cond_2
-    const-string p0, "bounds"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "in"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final resizeToFitScreen(Landroid/content/Context;Landroid/graphics/Rect;)Landroid/graphics/Rect;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "in"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lcom/discord/utilities/display/DisplayUtils;->getScreenSize(Landroid/content/Context;)Landroid/graphics/Rect;
 
@@ -392,18 +340,4 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "in"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali b/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali
index 17899135ec..ef13853f80 100644
--- a/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali
+++ b/com.discord/smali/com/discord/utilities/drawable/DrawableCompat.smali
@@ -31,7 +31,9 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getThemedDrawableRes"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -52,15 +54,6 @@
     invoke-virtual {p0}, Landroid/content/res/TypedArray;->recycle()V
 
     return p1
-
-    :cond_0
-    const-string p0, "$this$getThemedDrawableRes"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getThemedDrawableRes(Landroid/view/View;I)I
@@ -94,7 +87,9 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getThemedDrawableRes"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -102,22 +97,13 @@
 
     const-string v0, "context"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
 
     move-result p0
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$getThemedDrawableRes"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
@@ -155,7 +141,7 @@
 .end method
 
 .method public static final setCompoundDrawablesCompat(Landroid/widget/TextView;IIII)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/DrawableRes;
         .end annotation
@@ -173,39 +159,25 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setCompoundDrawablesCompat"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/widget/TextView;->setCompoundDrawablesRelativeWithIntrinsicBounds(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setCompoundDrawablesCompat"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setCompoundDrawablesCompat(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setCompoundDrawablesCompat"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/widget/TextView;->setCompoundDrawablesRelativeWithIntrinsicBounds(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setCompoundDrawablesCompat"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali b/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali
index 0d24dca112..a9a3ab94b9 100644
--- a/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali
+++ b/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali
@@ -46,11 +46,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "dsti"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/dsti/dto/ModelDsti;->getType()Lcom/discord/models/dsti/dto/ModelDsti$Type;
 
@@ -84,13 +86,13 @@
 
     invoke-direct {p1, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;-><init>(Ljava/lang/Exception;)V
 
-    new-instance p2, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {p2, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(\n       \u2026()}\")\n          )\n      )"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p2
 
@@ -117,13 +119,13 @@
 
     invoke-direct {p1, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;-><init>(Ljava/io/File;)V
 
-    new-instance p2, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {p2, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(Download\u2026oadState.Completed(file))"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -142,7 +144,7 @@
 
     const-string v2, "context.cacheDir"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0, p2, v1}, Lcom/discord/utilities/file/DownloadUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
 
@@ -150,26 +152,14 @@
 
     :goto_0
     return-object p2
-
-    :cond_2
-    const-string p1, "dsti"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getCDNAssetUrl(Lcom/discord/models/dsti/dto/ModelDsti;)Ljava/lang/String;
     .locals 5
 
-    if-eqz p1, :cond_2
+    const-string v0, "dsti"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/dsti/dto/ModelDsti;->getType()Lcom/discord/models/dsti/dto/ModelDsti$Type;
 
@@ -251,27 +241,22 @@
 
     :goto_0
     return-object p1
-
-    :cond_2
-    const-string p1, "dsti"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getCDNPreviewAssetUrl(Lcom/discord/models/dsti/dto/ModelDsti;)Ljava/lang/String;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "dsti"
 
-    const-string v0, "https://media.discordapp.net/stickers/"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "https://media.discordapp.net/stickers/"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/dsti/dto/ModelDsti;->getId()J
 
@@ -298,15 +283,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "dsti"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final parseFromMessageNotificationJson(Ljava/lang/String;)Lcom/discord/models/dsti/dto/ModelDsti;
@@ -340,66 +316,68 @@
 
     const-string v2, "JSONObject(data).getJSON\u2026ickers\").getJSONObject(0)"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catch Lorg/json/JSONException; {:try_start_0 .. :try_end_0} :catch_1
 
     :try_start_1
-    const-string v2, "id"
+    new-instance v2, Lcom/discord/models/dsti/dto/ModelDsti;
 
-    invoke-virtual {p1, v2}, Lorg/json/JSONObject;->get(Ljava/lang/String;)Ljava/lang/Object;
+    const-string v3, "id"
 
-    move-result-object v2
+    invoke-virtual {p1, v3}, Lorg/json/JSONObject;->get(Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    move-result-object v3
 
-    move-result-object v2
+    invoke-virtual {v3}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    invoke-static {v2}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+    move-result-object v3
+
+    invoke-static {v3}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
     move-result-wide v4
 
-    const-string v2, "pack_id"
+    const-string v3, "pack_id"
 
-    invoke-virtual {p1, v2}, Lorg/json/JSONObject;->get(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {p1, v3}, Lorg/json/JSONObject;->get(Ljava/lang/String;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-virtual {v3}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-static {v2}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+    invoke-static {v3}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
     move-result-wide v6
 
-    const-string v2, "name"
+    const-string v3, "name"
 
-    invoke-virtual {p1, v2}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
+    invoke-virtual {p1, v3}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v2, v0}, Lorg/json/JSONObject;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v0}, Lorg/json/JSONObject;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v8
 
-    const-string v2, "jsonSticker.getJSONObjec\u2026me\").getString(\"default\")"
+    const-string v3, "jsonSticker.getJSONObjec\u2026me\").getString(\"default\")"
 
-    invoke-static {v8, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "description"
+    const-string v3, "description"
 
-    invoke-virtual {p1, v2}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
+    invoke-virtual {p1, v3}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v2, v0}, Lorg/json/JSONObject;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v0}, Lorg/json/JSONObject;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v9
 
     const-string v0, "jsonSticker.getJSONObjec\u2026on\").getString(\"default\")"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "asset"
 
@@ -439,15 +417,13 @@
 
     move-result-object v12
 
-    new-instance p1, Lcom/discord/models/dsti/dto/ModelDsti;
-
-    move-object v3, p1
+    move-object v3, v2
 
     invoke-direct/range {v3 .. v12}, Lcom/discord/models/dsti/dto/ModelDsti;-><init>(JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V
     :try_end_1
     .catch Lorg/json/JSONException; {:try_start_1 .. :try_end_1} :catch_0
 
-    move-object v1, p1
+    move-object v1, v2
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali b/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
index 7d2a8ad626..b3deea8f30 100644
--- a/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
@@ -11,7 +11,9 @@
 .method public static final humanizeDuration(Landroid/content/Context;J)Ljava/lang/String;
     .locals 8
 
-    if-eqz p0, :cond_4
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -23,7 +25,7 @@
 
     if-gtz v3, :cond_0
 
-    const p1, 0x7f120be7
+    const p1, 0x7f120c0d
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -31,7 +33,7 @@
 
     const-string p1, "context.getString(\n     \u2026ation_a_few_seconds\n    )"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto/16 :goto_1
 
@@ -48,11 +50,11 @@
 
     if-gtz v5, :cond_1
 
-    const v1, 0x7f120beb
+    const v1, 0x7f120c11
 
     new-array v2, v4, [Ljava/lang/Object;
 
-    const v5, 0x7f10009b
+    const v5, 0x7f10009d
 
     const-wide/16 v6, 0x3e8
 
@@ -78,7 +80,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     move-object p0, p1
@@ -92,7 +94,79 @@
 
     if-gtz v7, :cond_2
 
-    const v5, 0x7f120bea
+    const v5, 0x7f120c10
+
+    new-array v6, v4, [Ljava/lang/Object;
+
+    const v7, 0x7f10009c
+
+    div-long/2addr p1, v1
+
+    long-to-int p2, p1
+
+    new-array p1, v4, [Ljava/lang/Object;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    aput-object v1, p1, v3
+
+    invoke-virtual {v0, v7, p2, p1}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    aput-object p1, v6, v3
+
+    invoke-virtual {v0, v5, v6}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_2
+    const-wide/32 v1, 0x5265c00
+
+    cmp-long v7, p1, v1
+
+    if-gtz v7, :cond_3
+
+    const v1, 0x7f120c0f
+
+    new-array v2, v4, [Ljava/lang/Object;
+
+    const v7, 0x7f10009b
+
+    div-long/2addr p1, v5
+
+    long-to-int p2, p1
+
+    new-array p1, v4, [Ljava/lang/Object;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    aput-object v4, p1, v3
+
+    invoke-virtual {v0, v7, p2, p1}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    aput-object p1, v2, v3
+
+    invoke-virtual {v0, v1, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_3
+    const v5, 0x7f120c0e
 
     new-array v6, v4, [Ljava/lang/Object;
 
@@ -120,91 +194,10 @@
 
     move-result-object p1
 
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_2
-    const-wide/32 v1, 0x5265c00
-
-    cmp-long v7, p1, v1
-
-    if-gtz v7, :cond_3
-
-    const v1, 0x7f120be9
-
-    new-array v2, v4, [Ljava/lang/Object;
-
-    const v7, 0x7f100099
-
-    div-long/2addr p1, v5
-
-    long-to-int p2, p1
-
-    new-array p1, v4, [Ljava/lang/Object;
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    aput-object v4, p1, v3
-
-    invoke-virtual {v0, v7, p2, p1}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    aput-object p1, v2, v3
-
-    invoke-virtual {v0, v1, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_3
-    const v5, 0x7f120be8
-
-    new-array v6, v4, [Ljava/lang/Object;
-
-    const v7, 0x7f100098
-
-    div-long/2addr p1, v1
-
-    long-to-int p2, p1
-
-    new-array p1, v4, [Ljava/lang/Object;
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    aput-object v1, p1, v3
-
-    invoke-virtual {v0, v7, p2, p1}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    aput-object p1, v6, v3
-
-    invoke-virtual {v0, v5, v6}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
     :goto_1
     return-object p0
-
-    :cond_4
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
index d163d140bc..6d555c79cf 100644
--- a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
@@ -229,7 +229,9 @@
         }
     .end annotation
 
-    if-eqz p5, :cond_7
+    const-string v0, "resources"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p5}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -355,15 +357,6 @@
 
     :goto_5
     return-object p3
-
-    :cond_7
-    const-string p1, "resources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final calculateSize(IIIII)Lkotlin/Pair;
@@ -455,7 +448,9 @@
 .method public final computeMaximumImageWidthPx(Landroid/content/Context;)I
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -481,32 +476,25 @@
 
     move-result p1
 
-    const/16 v2, 0x5a0
-
     add-int/2addr v1, v0
 
     sub-int/2addr p1, v1
 
-    invoke-static {v2, p1}, Ljava/lang/Math;->min(II)I
+    const/16 v0, 0x5a0
+
+    invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final createAttachmentEmbed(Lcom/discord/models/domain/ModelMessageAttachment;)Lcom/discord/models/domain/ModelMessageEmbed;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "attachment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/embed/EmbedResourceUtils;->asVideoItem(Lcom/discord/models/domain/ModelMessageAttachment;)Lcom/discord/models/domain/ModelMessageEmbed$Item;
 
@@ -521,15 +509,6 @@
     invoke-direct {v2, p1, v0, v1}, Lcom/discord/models/domain/ModelMessageEmbed;-><init>(Lcom/discord/models/domain/ModelMessageAttachment;Lcom/discord/models/domain/ModelMessageEmbed$Item;Lcom/discord/models/domain/ModelMessageEmbed$Item;)V
 
     return-object v2
-
-    :cond_0
-    const-string p1, "attachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getFileDrawable(Ljava/lang/String;)I
@@ -543,7 +522,7 @@
 
     const/16 v1, 0x2e
 
-    invoke-static {p1, v1, v0}, Lj0/t/p;->substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
+    invoke-static {p1, v1, v0}, Lk0/u/p;->substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -563,7 +542,7 @@
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f0802da
+    const p1, 0x7f0802db
 
     :goto_0
     return p1
@@ -580,7 +559,9 @@
 .method public final getPreviewUrls(Ljava/lang/String;II)[Ljava/lang/String;
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "originalUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -610,7 +591,7 @@
 
     const/4 v1, 0x2
 
-    invoke-static {p1, p3, v0, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, p3, v0, v1}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p3
 
@@ -620,7 +601,7 @@
 
     const-string p3, ".gif"
 
-    invoke-static {p1, p3, v0, v1}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, p3, v0, v1}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p1
 
@@ -651,13 +632,4 @@
 
     :goto_1
     return-object p1
-
-    :cond_2
-    const-string p1, "originalUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/embed/FileType$Companion.smali b/com.discord/smali/com/discord/utilities/embed/FileType$Companion.smali
index 3d49805b2a..90155be15f 100644
--- a/com.discord/smali/com/discord/utilities/embed/FileType$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/embed/FileType$Companion.smali
@@ -34,48 +34,41 @@
 
 # virtual methods
 .method public final getFromExtension(Ljava/lang/String;)Lcom/discord/utilities/embed/FileType;
-    .locals 6
+    .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "extension"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/embed/FileType;->values()[Lcom/discord/utilities/embed/FileType;
 
-    move-result-object v1
+    move-result-object v0
 
-    array-length v2, v1
+    array-length v1, v0
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-ge v3, v2, :cond_1
+    if-ge v2, v1, :cond_1
 
-    aget-object v4, v1, v3
+    aget-object v3, v0, v2
 
-    invoke-static {v4, p1}, Lcom/discord/utilities/embed/FileType;->access$matches(Lcom/discord/utilities/embed/FileType;Ljava/lang/String;)Z
+    invoke-static {v3, p1}, Lcom/discord/utilities/embed/FileType;->access$matches(Lcom/discord/utilities/embed/FileType;Ljava/lang/String;)Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_0
-
-    move-object v0, v4
+    if-eqz v4, :cond_0
 
     goto :goto_1
 
     :cond_0
-    add-int/lit8 v3, v3, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
 
     :cond_1
+    const/4 v3, 0x0
+
     :goto_1
-    return-object v0
-
-    :cond_2
-    const-string p1, "extension"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v3
 .end method
diff --git a/com.discord/smali/com/discord/utilities/embed/FileType.smali b/com.discord/smali/com/discord/utilities/embed/FileType.smali
index b277db3184..0ae5b38630 100644
--- a/com.discord/smali/com/discord/utilities/embed/FileType.smali
+++ b/com.discord/smali/com/discord/utilities/embed/FileType.smali
@@ -65,237 +65,237 @@
 
     new-array v0, v0, [Lcom/discord/utilities/embed/FileType;
 
-    const-string v1, "(?:avi|flv|wmv|mov|mp4)$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    const/4 v2, 0x0
+    const-string v2, "(?:avi|flv|wmv|mov|mp4)$"
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const/4 v3, 0x0
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    const-string v3, "java.util.regex.Pattern.compile(this, flags)"
+    move-result-object v2
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v4, "java.util.regex.Pattern.compile(this, flags)"
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "VIDEO"
 
-    invoke-direct {v4, v5, v2, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v3, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->VIDEO:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->VIDEO:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v2
+    aput-object v1, v0, v3
 
-    const-string v1, "pdf$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "pdf$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "ACROBAT"
 
     const/4 v6, 0x1
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->ACROBAT:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->ACROBAT:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    const-string v1, "ae$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "ae$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "AE"
 
     const/4 v6, 0x2
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->AE:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->AE:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    const-string v1, "sketch$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "sketch$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "SKETCH"
 
     const/4 v6, 0x3
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->SKETCH:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->SKETCH:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    const-string v1, "ai$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "ai$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "AI"
 
     const/4 v6, 0x4
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->AI:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->AI:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    const-string v1, "(?:rar|zip|7z|tar|tar\\.gz)$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "(?:rar|zip|7z|tar|tar\\.gz)$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "ARCHIVE"
 
     const/4 v6, 0x5
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->ARCHIVE:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->ARCHIVE:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    const-string v4, "(?:"
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v5, "(?:"
 
-    const-string v4, "c\\+\\+|cpp|cc|c|h|hpp|mm|m|json|js|rb|rake|py|asm|fs|pyc|dtd|cgi|bat|rss|"
+    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v5, "c\\+\\+|cpp|cc|c|h|hpp|mm|m|json|js|rb|rake|py|asm|fs|pyc|dtd|cgi|bat|rss|"
 
-    const-string v4, "java|graphml|idb|lua|o|gml|prl|sls|conf|cmake|make|sln|vbe|cxx|wbf|vbs|"
+    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v5, "java|graphml|idb|lua|o|gml|prl|sls|conf|cmake|make|sln|vbe|cxx|wbf|vbs|"
 
-    const-string v4, "r|wml|php|bash|applescript|fcgi|yaml|ex|exs|sh|ml|actionscript"
+    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v5, "r|wml|php|bash|applescript|fcgi|yaml|ex|exs|sh|ml|actionscript"
 
-    const-string v4, ")$"
+    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v5, ")$"
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v1
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    const-string v4, "StringBuilder()\n      .a\u2026(\")\\$\")\n      .toString()"
+    move-result-object v2
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "StringBuilder()\n      .a\u2026(\")\\$\")\n      .toString()"
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "CODE"
 
     const/4 v6, 0x6
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->CODE:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->CODE:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    const-string v1, "(?:txt|rtf|doc|docx|md|pages|ppt|pptx|pptm|key|log)$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "(?:txt|rtf|doc|docx|md|pages|ppt|pptx|pptm|key|log)$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "DOCUMENT"
 
     const/4 v6, 0x7
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->DOCUMENT:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->DOCUMENT:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    const-string v1, "(?:xls|xlsx|numbers|csv|xliff)$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "(?:xls|xlsx|numbers|csv|xliff)$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "SPREADSHEET"
 
     const/16 v6, 0x8
 
-    invoke-direct {v4, v5, v6, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v5, v6, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v4, Lcom/discord/utilities/embed/FileType;->SPREADSHEET:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->SPREADSHEET:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v4, v0, v6
+    aput-object v1, v0, v6
 
-    const-string v1, "(?:html|xhtml|htm|js|xml|xls|xsd|css|styl)$"
+    new-instance v1, Lcom/discord/utilities/embed/FileType;
 
-    invoke-static {v1, v2}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
+    const-string v2, "(?:html|xhtml|htm|js|xml|xls|xsd|css|styl)$"
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    new-instance v2, Lcom/discord/utilities/embed/FileType;
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "WEBCODE"
 
     const/16 v4, 0x9
 
-    invoke-direct {v2, v3, v4, v1}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
+    invoke-direct {v1, v3, v4, v2}, Lcom/discord/utilities/embed/FileType;-><init>(Ljava/lang/String;ILjava/util/regex/Pattern;)V
 
-    sput-object v2, Lcom/discord/utilities/embed/FileType;->WEBCODE:Lcom/discord/utilities/embed/FileType;
+    sput-object v1, Lcom/discord/utilities/embed/FileType;->WEBCODE:Lcom/discord/utilities/embed/FileType;
 
-    aput-object v2, v0, v4
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/utilities/embed/FileType;->$VALUES:[Lcom/discord/utilities/embed/FileType;
 
@@ -350,7 +350,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     check-cast v0, Ljava/util/regex/Matcher;
 
@@ -363,13 +363,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static valueOf(Ljava/lang/String;)Lcom/discord/utilities/embed/FileType;
@@ -420,52 +413,52 @@
     throw v0
 
     :pswitch_0
-    const v0, 0x7f0802dd
+    const v0, 0x7f0802de
 
     goto :goto_0
 
     :pswitch_1
-    const v0, 0x7f0802d9
+    const v0, 0x7f0802da
 
     goto :goto_0
 
     :pswitch_2
-    const v0, 0x7f0802d2
+    const v0, 0x7f0802d3
 
     goto :goto_0
 
     :pswitch_3
-    const v0, 0x7f0802d1
+    const v0, 0x7f0802d2
 
     goto :goto_0
 
     :pswitch_4
-    const v0, 0x7f0802d0
+    const v0, 0x7f0802d1
 
     goto :goto_0
 
     :pswitch_5
-    const v0, 0x7f0802cf
+    const v0, 0x7f0802d0
 
     goto :goto_0
 
     :pswitch_6
-    const v0, 0x7f0802d8
+    const v0, 0x7f0802d9
 
     goto :goto_0
 
     :pswitch_7
-    const v0, 0x7f0802ce
+    const v0, 0x7f0802cf
 
     goto :goto_0
 
     :pswitch_8
-    const v0, 0x7f0802cd
+    const v0, 0x7f0802ce
 
     goto :goto_0
 
     :pswitch_9
-    const v0, 0x7f0802dc
+    const v0, 0x7f0802dd
 
     :goto_0
     return v0
diff --git a/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali b/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali
index 06ea8e99a9..0611414561 100644
--- a/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali
+++ b/com.discord/smali/com/discord/utilities/emoji/EmojiFrecencyTracker.smali
@@ -107,14 +107,16 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "$this$computeScore"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
@@ -146,13 +148,4 @@
 
     :cond_0
     return v0
-
-    :cond_1
-    const-string p1, "$this$computeScore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index 04d5008c79..411c183486 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -144,15 +144,15 @@
 
     iget v3, v0, Lretrofit2/HttpException;->code:I
 
-    iget-object v0, v0, Lretrofit2/HttpException;->d:Lq0/n;
+    iget-object v0, v0, Lretrofit2/HttpException;->d:Lr0/n;
 
     if-eqz v0, :cond_3
 
-    iget-object v4, v0, Lq0/n;->a:Lokhttp3/Response;
+    iget-object v4, v0, Lr0/n;->a:Lokhttp3/Response;
 
     iget-object v4, v4, Lokhttp3/Response;->i:Lokhttp3/Headers;
 
-    iget-object v5, v0, Lq0/n;->c:Lokhttp3/ResponseBody;
+    iget-object v5, v0, Lr0/n;->c:Lokhttp3/ResponseBody;
 
     if-eqz v5, :cond_2
 
@@ -207,7 +207,7 @@
     move-object v7, v6
 
     :goto_1
-    iget-object v0, v0, Lq0/n;->a:Lokhttp3/Response;
+    iget-object v0, v0, Lr0/n;->a:Lokhttp3/Response;
 
     invoke-static {v0}, Lcom/discord/utilities/error/Error;->getRequestUrl(Lokhttp3/Response;)Ljava/lang/String;
 
@@ -633,11 +633,11 @@
     return-object p0
 
     :cond_0
-    iget-object p0, p0, Lokhttp3/Response;->d:Ln0/a0;
+    iget-object p0, p0, Lokhttp3/Response;->d:Lo0/a0;
 
-    iget-object p0, p0, Ln0/a0;->b:Ln0/w;
+    iget-object p0, p0, Lo0/a0;->b:Lo0/w;
 
-    iget-object p0, p0, Ln0/w;->j:Ljava/lang/String;
+    iget-object p0, p0, Lo0/w;->j:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -671,7 +671,7 @@
     packed-switch v0, :pswitch_data_0
 
     :pswitch_0
-    const v0, 0x7f120f56
+    const v0, 0x7f120f80
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -684,7 +684,7 @@
     return-object p1
 
     :pswitch_1
-    const v0, 0x7f120cf1
+    const v0, 0x7f120d17
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -697,7 +697,7 @@
     return-object p1
 
     :pswitch_2
-    const v0, 0x7f120f55
+    const v0, 0x7f120f7f
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -710,7 +710,7 @@
     return-object p1
 
     :pswitch_3
-    const v0, 0x7f120f52
+    const v0, 0x7f120f7c
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -723,7 +723,7 @@
     return-object p1
 
     :pswitch_4
-    const v0, 0x7f1215cb
+    const v0, 0x7f1215f5
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -736,7 +736,7 @@
     return-object p1
 
     :pswitch_5
-    const v0, 0x7f120f54
+    const v0, 0x7f120f7e
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -749,7 +749,7 @@
     return-object p1
 
     :pswitch_6
-    const v0, 0x7f120f50
+    const v0, 0x7f120f7a
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -764,7 +764,7 @@
     :pswitch_7
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
-    const v1, 0x7f120f4d
+    const v1, 0x7f120f77
 
     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;
 
@@ -779,7 +779,7 @@
     :pswitch_8
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
-    const v1, 0x7f120f51
+    const v1, 0x7f120f7b
 
     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;
 
@@ -792,7 +792,7 @@
     return-object p1
 
     :pswitch_9
-    const v0, 0x7f1212fb
+    const v0, 0x7f121325
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -805,7 +805,7 @@
     return-object p1
 
     :pswitch_a
-    const v0, 0x7f120f4f
+    const v0, 0x7f120f79
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -818,7 +818,7 @@
     return-object p1
 
     :pswitch_b
-    const v0, 0x7f120f4e
+    const v0, 0x7f120f78
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -833,7 +833,7 @@
     :pswitch_c
     iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
 
-    const v1, 0x7f120f53
+    const v1, 0x7f120f7d
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali b/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali
index cc42252773..8b84a65b82 100644
--- a/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali
@@ -5,35 +5,35 @@
 
 # direct methods
 .method public static final configureAsGuildIcon(Lcom/facebook/drawee/view/SimpleDraweeView;ZLcom/discord/models/domain/ModelGuild;FLjava/lang/Integer;Ljava/lang/Integer;Z)V
-    .locals 9
+    .locals 8
     .param p5    # Ljava/lang/Integer;
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "$this$configureAsGuildIcon"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "asset://asset/images/default_icon_selected.jpg"
+    const-string v0, "asset://asset/images/default_icon_selected.jpg"
 
-    invoke-static {p2, v1, p6, p4}, Lcom/discord/utilities/icon/IconUtils;->getForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;)Ljava/lang/String;
+    invoke-static {p2, v0, p6, p4}, Lcom/discord/utilities/icon/IconUtils;->getForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x1c
 
-    const/16 v7, 0x1c
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    move-object v1, p0
 
-    move-object v2, p0
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     xor-int/lit8 p1, p1, 0x1
 
@@ -56,26 +56,21 @@
 
     if-eqz p1, :cond_1
 
-    const p2, 0x7f120be3
+    const p2, 0x7f120c09
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_1
-    move-object p1, v0
+    const/4 p1, 0x0
 
     :goto_0
     invoke-virtual {p0, p1}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_2
-    const-string p0, "$this$configureAsGuildIcon"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic configureAsGuildIcon$default(Lcom/facebook/drawee/view/SimpleDraweeView;ZLcom/discord/models/domain/ModelGuild;FLjava/lang/Integer;Ljava/lang/Integer;ZILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali
index ff08a4c580..73783bbe49 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationActions$Companion.smali
@@ -36,7 +36,9 @@
 .method public final callAction(Landroid/content/Context;JJZ)Landroid/content/Intent;
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p6, :cond_0
 
@@ -87,21 +89,14 @@
     invoke-direct {p3, p5, p2, p1, p4}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;Landroid/content/Context;Ljava/lang/Class;)V
 
     return-object p3
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final cancel(Landroid/content/Context;I)Landroid/content/Intent;
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -137,24 +132,17 @@
 
     const-string p2, "Intent(\n          Intent\u2026ATION_ID, notificationId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final delete(Landroid/content/Context;J)Landroid/content/Intent;
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -190,24 +178,17 @@
 
     const-string p2, "Intent(\n          Intent\u2026ON_CHANNEL_ID, channelId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final directReply(Landroid/content/Context;JLjava/lang/CharSequence;)Landroid/content/Intent;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -240,33 +221,32 @@
     invoke-virtual {p3, p1, p4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/CharSequence;)Landroid/content/Intent;
 
     return-object p3
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final markAsRead(Landroid/content/Context;JJ)Landroid/content/Intent;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
 
-    const-string v0, "discord://action/message/ack?channelId="
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "&messageId="
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-static {v0, p2, p3, v1}, Lf/e/b/a/a;->G(Ljava/lang/String;JLjava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    move-result-object p2
+    const-string v1, "discord://action/message/ack?channelId="
 
-    invoke-virtual {p2, p4, p5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v0, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string p2, "&messageId="
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p4, p5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p2
 
@@ -283,21 +263,14 @@
     invoke-direct {p3, p5, p2, p1, p4}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;Landroid/content/Context;Ljava/lang/Class;)V
 
     return-object p3
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final timedMute(Landroid/content/Context;JJJ)Landroid/content/Intent;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "discord://action/channel/mute"
 
@@ -333,7 +306,7 @@
 
     move-result-object p3
 
-    const-string p4, "until"
+    const-string/jumbo p4, "until"
 
     invoke-virtual {p2, p4, p3}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
 
@@ -352,13 +325,4 @@
     invoke-direct {p3, p5, p2, p1, p4}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;Landroid/content/Context;Ljava/lang/Class;)V
 
     return-object p3
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
index fc0679f715..e7c468a51f 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
@@ -43,17 +43,17 @@
 .end method
 
 .method private final enqueueAckMessage(Landroid/content/Context;Landroid/content/Intent;)V
-    .locals 9
+    .locals 8
 
     invoke-virtual {p2}, Landroid/content/Intent;->getData()Landroid/net/Uri;
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
     const-string v0, "intent.data ?: return"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "channelId"
 
@@ -61,13 +61,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -79,19 +79,21 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
 
-    if-eqz p1, :cond_0
+    const-string p2, "context"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Landroidx/work/Data$Builder;
 
@@ -101,19 +103,19 @@
 
     new-array v4, v4, [Lkotlin/Pair;
 
-    const/4 v5, 0x0
-
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v6
+    move-result-object v5
 
-    new-instance v7, Lkotlin/Pair;
+    new-instance v6, Lkotlin/Pair;
 
-    const-string v8, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v7, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-direct {v7, v8, v6}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v6, v7, v5}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v7, v4, v5
+    const/4 v5, 0x0
+
+    aput-object v6, v4, v5
 
     const/4 v5, 0x1
 
@@ -143,7 +145,7 @@
 
     const-string v0, "Data.Builder()\n         \u2026     )\n          .build()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/work/OneTimeWorkRequest$Builder;
 
@@ -211,7 +213,7 @@
 
     const-string v0, "OneTimeWorkRequestBuilde\u2026     )\n          .build()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroidx/work/OneTimeWorkRequest;
 
@@ -233,18 +235,7 @@
 
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
 
-    return-void
-
     :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
     return-void
 .end method
 
@@ -255,7 +246,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_3
 
     const-string v1, "channelId"
 
@@ -263,13 +254,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_3
 
-    invoke-static {v0}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_3
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -285,7 +276,7 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_2
 
     const-string v4, "discord_notif_text_input"
 
@@ -293,13 +284,13 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_2
 
     const-string v4, "it"
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v4
 
@@ -317,29 +308,33 @@
     move-object p2, v6
 
     :goto_0
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_2
 
     invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
     move-result-object p2
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_2
 
     sget-object v4, Lcom/discord/utilities/fcm/NotificationCache;->INSTANCE:Lcom/discord/utilities/fcm/NotificationCache;
 
     invoke-virtual {v4, v2, v3, v5}, Lcom/discord/utilities/fcm/NotificationCache;->setIgnoreNextClearForAck(JZ)V
 
-    if-eqz p1, :cond_2
+    const-string v4, "context"
 
-    new-instance v4, Landroidx/work/Data$Builder;
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v4}, Landroidx/work/Data$Builder;-><init>()V
+    const-string v4, "message"
 
-    const/4 v7, 0x5
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v7, v7, [Lkotlin/Pair;
+    new-instance v7, Landroidx/work/Data$Builder;
 
-    const/4 v8, 0x0
+    invoke-direct {v7}, Landroidx/work/Data$Builder;-><init>()V
+
+    const/4 v8, 0x5
+
+    new-array v8, v8, [Lkotlin/Pair;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -351,7 +346,9 @@
 
     invoke-direct {v3, v9, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v3, v7, v8
+    const/4 v2, 0x0
+
+    aput-object v3, v8, v2
 
     if-eqz v1, :cond_1
 
@@ -369,7 +366,7 @@
 
     invoke-direct {v2, v0, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, v7, v5
+    aput-object v2, v8, v5
 
     const/4 v0, 0x2
 
@@ -387,7 +384,7 @@
 
     invoke-direct {v2, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, v7, v0
+    aput-object v2, v8, v0
 
     const/4 v0, 0x3
 
@@ -397,7 +394,7 @@
 
     invoke-direct {v1, v2, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v1, v7, v0
+    aput-object v1, v8, v0
 
     const/4 p2, 0x4
 
@@ -407,13 +404,13 @@
 
     invoke-direct {v0, v1, v6}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v0, v7, p2
+    aput-object v0, v8, p2
 
-    invoke-static {v7}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v8}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object p2
 
-    invoke-virtual {v4, p2}, Landroidx/work/Data$Builder;->putAll(Ljava/util/Map;)Landroidx/work/Data$Builder;
+    invoke-virtual {v7, p2}, Landroidx/work/Data$Builder;->putAll(Ljava/util/Map;)Landroidx/work/Data$Builder;
 
     move-result-object p2
 
@@ -423,7 +420,7 @@
 
     const-string v0, "Data.Builder()\n         \u2026     )\n          .build()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/work/OneTimeWorkRequest$Builder;
 
@@ -437,9 +434,7 @@
 
     check-cast p2, Landroidx/work/OneTimeWorkRequest$Builder;
 
-    const-string v0, "message"
-
-    invoke-virtual {p2, v0}, Landroidx/work/WorkRequest$Builder;->addTag(Ljava/lang/String;)Landroidx/work/WorkRequest$Builder;
+    invoke-virtual {p2, v4}, Landroidx/work/WorkRequest$Builder;->addTag(Ljava/lang/String;)Landroidx/work/WorkRequest$Builder;
 
     move-result-object p2
 
@@ -479,7 +474,7 @@
 
     const-string v0, "OneTimeWorkRequestBuilde\u2026     )\n          .build()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroidx/work/OneTimeWorkRequest;
 
@@ -492,13 +487,6 @@
     return-void
 
     :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
     sget-object v1, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
     const/4 v5, 0x0
@@ -511,7 +499,7 @@
 
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
 
-    :cond_4
+    :cond_3
     return-void
 .end method
 
@@ -522,11 +510,11 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
     const-string v0, "intent.data ?: return"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "guildId"
 
@@ -534,13 +522,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -552,37 +540,39 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_1
+    if-eqz v2, :cond_0
 
-    invoke-static {v2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
-    if-eqz v2, :cond_1
+    if-eqz v2, :cond_0
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v4
 
-    const-string v2, "until"
+    const-string/jumbo v2, "until"
 
     invoke-virtual {p2, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    if-eqz p2, :cond_0
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v2
 
-    if-eqz p1, :cond_0
+    const-string p2, "context"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Landroidx/work/Data$Builder;
 
@@ -592,19 +582,19 @@
 
     new-array v6, v6, [Lkotlin/Pair;
 
-    const/4 v7, 0x0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
     new-instance v1, Lkotlin/Pair;
 
-    const-string v8, "com.discord.intent.extra.EXTRA_GUILD_ID"
+    const-string v7, "com.discord.intent.extra.EXTRA_GUILD_ID"
 
-    invoke-direct {v1, v8, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v1, v7, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v1, v6, v7
+    const/4 v0, 0x0
+
+    aput-object v1, v6, v0
 
     const/4 v0, 0x1
 
@@ -648,7 +638,7 @@
 
     const-string v0, "Data.Builder()\n         \u2026     )\n          .build()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/work/OneTimeWorkRequest$Builder;
 
@@ -716,7 +706,7 @@
 
     const-string v0, "OneTimeWorkRequestBuilde\u2026     )\n          .build()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroidx/work/OneTimeWorkRequest;
 
@@ -738,18 +728,7 @@
 
     invoke-static/range {v3 .. v9}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
 
-    return-void
-
     :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
     return-void
 .end method
 
@@ -763,11 +742,11 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_2
+    if-eqz p2, :cond_1
 
     const-string v0, "intent.data ?: return"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "channelId"
 
@@ -775,13 +754,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
-    invoke-static {v0}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -793,13 +772,13 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_2
+    if-eqz p2, :cond_1
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
-    if-eqz p2, :cond_2
+    if-eqz p2, :cond_1
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
@@ -814,7 +793,9 @@
     goto/16 :goto_0
 
     :cond_0
-    if-eqz p1, :cond_1
+    const-string p2, "context"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Landroidx/work/Data$Builder;
 
@@ -824,19 +805,19 @@
 
     new-array p3, p3, [Lkotlin/Pair;
 
-    const/4 v4, 0x0
-
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    new-instance v6, Lkotlin/Pair;
+    new-instance v5, Lkotlin/Pair;
 
-    const-string v7, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v6, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-direct {v6, v7, v5}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v5, v6, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v6, p3, v4
+    const/4 v4, 0x0
+
+    aput-object v5, p3, v4
 
     const/4 v4, 0x1
 
@@ -866,7 +847,7 @@
 
     const-string p3, "Data.Builder()\n         \u2026     )\n          .build()"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Landroidx/work/OneTimeWorkRequest$Builder;
 
@@ -942,7 +923,7 @@
 
     const-string p3, "OneTimeWorkRequestBuilde\u2026     )\n          .build()"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroidx/work/OneTimeWorkRequest;
 
@@ -965,18 +946,7 @@
 
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
 
-    return-void
-
     :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_2
     return-void
 .end method
 
@@ -988,31 +958,35 @@
         value = 0x18
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "intent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/content/Intent;->getData()Landroid/net/Uri;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1}, Landroid/net/Uri;->getAuthority()Ljava/lang/String;
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Landroid/net/Uri;->getAuthority()Ljava/lang/String;
 
     move-result-object v2
 
     goto :goto_0
 
     :cond_0
-    move-object v2, v0
+    move-object v2, v1
 
     :goto_0
     const-string v3, "action"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -1021,16 +995,16 @@
     goto :goto_1
 
     :cond_1
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_1
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
     const-string v2, "intent.data.takeIf { it?\u2026y == \"action\" } ?: return"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Landroid/net/Uri;->getPath()Ljava/lang/String;
+    invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1126,38 +1100,24 @@
 
     move-result-object p2
 
-    invoke-virtual {v1}, Landroid/net/Uri;->getPath()Ljava/lang/String;
+    invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p2
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p2, v0, v1, v0}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {p1, p2, v1, v0, v1}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     :cond_4
     :goto_3
     return-void
 
-    :cond_5
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
     nop
 
     :sswitch_data_0
@@ -1176,11 +1136,13 @@
         value = 0x18
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "intent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1340,18 +1302,4 @@
     :cond_5
     :goto_0
     return-void
-
-    :cond_6
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali
index 393d137a5e..dd87872ea5 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali
@@ -80,7 +80,7 @@
 
     const-string v1, "cache.get().values"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -157,70 +157,62 @@
     :try_start_0
     const-string v0, "data"
 
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/HashMap;
 
-    sget-object v2, Lcom/discord/utilities/fcm/NotificationCache;->cache:Lcom/discord/utilities/persister/Persister;
+    sget-object v1, Lcom/discord/utilities/fcm/NotificationCache;->cache:Lcom/discord/utilities/persister/Persister;
 
-    invoke-virtual {v2}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Ljava/util/Map;
+    check-cast v1, Ljava/util/Map;
 
-    invoke-direct {v0, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+    invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+
+    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getKey()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;
+
+    if-nez v1, :cond_0
+
+    new-instance v1, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;
+
+    invoke-direct {v1, p1}, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;-><init>(Lcom/discord/utilities/fcm/NotificationData;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getKey()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;
-
-    if-nez v2, :cond_0
-
-    new-instance v2, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;
-
-    invoke-direct {v2, p1}, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;-><init>(Lcom/discord/utilities/fcm/NotificationData;)V
-
-    invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationData;->getKey()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x2
+    const/4 v3, 0x2
 
-    invoke-static {v2, p1, v3, v4, v1}, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;->update$default(Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;Lcom/discord/utilities/fcm/NotificationData;IILjava/lang/Object;)V
+    const/4 v4, 0x0
+
+    invoke-static {v1, p1, v2, v3, v4}, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;->update$default(Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;Lcom/discord/utilities/fcm/NotificationData;IILjava/lang/Object;)V
 
     sget-object p1, Lcom/discord/utilities/fcm/NotificationCache;->cache:Lcom/discord/utilities/persister/Persister;
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
+    invoke-virtual {p1, v0, v2}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     monitor-exit p0
 
-    return-object v2
-
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
+    return-object v1
 
     :catchall_0
     move-exception p1
@@ -248,7 +240,7 @@
     :try_start_0
     const-string v0, "notificationRemovedCallback"
 
-    if-eqz p4, :cond_3
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationCache;->cache:Lcom/discord/utilities/persister/Persister;
 
@@ -345,16 +337,6 @@
 
     return-void
 
-    :cond_3
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -383,7 +365,7 @@
 
     const-string v2, "content.entries"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -423,7 +405,7 @@
     :goto_1
     const-string v5, "entry.key ?: \"\""
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -513,7 +495,7 @@
 
     const-string v4, "StringBuilder()\n        \u2026: $notificationDataType\")"
 
-    invoke-static {v5, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v4, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -521,9 +503,9 @@
 
     move-result-object v5
 
-    const-string v6, "warningMessage.toString()"
+    const-string/jumbo v6, "warningMessage.toString()"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x2
 
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 4839007334..549615f6b6 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
@@ -28,7 +28,9 @@
 .method public onMessageReceived(Lcom/google/firebase/messaging/RemoteMessage;)V
     .locals 11
 
-    if-eqz p1, :cond_b
+    const-string v0, "remoteMessage"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->e:Ljava/util/Map;
 
@@ -124,7 +126,7 @@
 
     const-string v0, "remoteMessage.data"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -302,7 +304,7 @@
 
     const-string v2, "MESSAGE_CREATE"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -394,34 +396,18 @@
 
     :cond_a
     return-void
-
-    :cond_b
-    const-string p1, "remoteMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onNewToken(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/fcm/NotificationClient;->onNewToken(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali
index ce7c7a901d..257c69c125 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali
@@ -90,11 +90,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "locale"
 
-    if-eqz p8, :cond_2
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_1
+    const-string v0, "sendBlockedChannels"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -129,20 +131,6 @@
     iput-boolean p1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "sendBlockedChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -523,11 +511,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "locale"
 
-    if-eqz p8, :cond_1
+    move-object/from16 v9, p8
 
-    if-eqz p9, :cond_0
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sendBlockedChannels"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;
 
@@ -547,27 +541,9 @@
 
     move-object/from16 v8, p7
 
-    move-object/from16 v9, p8
-
-    move-object/from16 v10, p9
-
     invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;-><init>(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "sendBlockedChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "locale"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -621,7 +597,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -631,7 +607,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -641,7 +617,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
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 f8ca1dec15..763210517f 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/fcm/NotificationClient$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NotificationClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
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 52d8bd46df..97a151eb05 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/fcm/NotificationClient$init$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NotificationClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali
index 1c69694c7e..075e85c6ce 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$3.smali
@@ -63,7 +63,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/google/firebase/iid/InstanceIdResult;->a()Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$5.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$5.smali
index 4e07fe6325..1d51f5d558 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$5.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$5.smali
@@ -45,26 +45,17 @@
 
 # virtual methods
 .method public final onFailure(Ljava/lang/Exception;)V
-    .locals 4
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "exception"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x5
+    const-string v1, "FCM getInstanceId failed"
 
-    const-string v3, "FCM getInstanceId failed"
-
-    invoke-virtual {v1, v3, v2, p1, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$tokenCallback$1.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$tokenCallback$1.smali
index 22f7aef47e..1709e33eb9 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$tokenCallback$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$tokenCallback$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/fcm/NotificationClient$tokenCallback$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NotificationClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -85,7 +85,7 @@
 
     const-string p1, "javaClass.simpleName"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "FCM token was not sent to server"
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
index 40a303a5ae..eb7fed5d43 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali
@@ -253,26 +253,26 @@
 .end method
 
 .method public final init(Landroid/app/Application;)V
-    .locals 4
+    .locals 2
     .annotation build Landroid/annotation/TargetApi;
         value = 0x1a
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "application"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/utilities/fcm/NotificationClient;->context:Landroid/content/Context;
 
     invoke-virtual {p0}, Lcom/discord/utilities/fcm/NotificationClient;->isOsLevelNotificationEnabled()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
+    sget-object v0, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
 
-    invoke-virtual {v1, p1}, Lcom/discord/utilities/fcm/NotificationRenderer;->initNotificationChannels(Landroid/app/Application;)V
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/fcm/NotificationRenderer;->initNotificationChannels(Landroid/app/Application;)V
 
     :cond_0
     sget-object p1, Lcom/discord/utilities/fcm/NotificationClient$init$1;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient$init$1;
@@ -288,33 +288,37 @@
 
     move-result-object p1
 
-    const-string v1, "FirebaseInstanceId.getInstance()"
+    const-string v0, "FirebaseInstanceId.getInstance()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->h()Lcom/google/android/gms/tasks/Task;
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/utilities/fcm/NotificationClient$init$3;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient$init$3;
+    sget-object v0, Lcom/discord/utilities/fcm/NotificationClient$init$3;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient$init$3;
 
     check-cast p1, Lf/h/a/f/o/c0;
 
-    sget-object v2, Lf/h/a/f/o/g;->a:Ljava/util/concurrent/Executor;
+    sget-object v1, Lf/h/a/f/o/g;->a:Ljava/util/concurrent/Executor;
 
-    invoke-virtual {p1, v2, v1}, Lf/h/a/f/o/c0;->d(Ljava/util/concurrent/Executor;Lf/h/a/f/o/e;)Lcom/google/android/gms/tasks/Task;
+    invoke-virtual {p1, v1, v0}, Lf/h/a/f/o/c0;->d(Ljava/util/concurrent/Executor;Lf/h/a/f/o/e;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v1, Lcom/discord/utilities/fcm/NotificationClient$init$4;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient$init$4;
+    sget-object v0, Lcom/discord/utilities/fcm/NotificationClient$init$4;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient$init$4;
 
-    sget-object v2, Lf/h/a/f/o/g;->a:Ljava/util/concurrent/Executor;
+    sget-object v1, Lf/h/a/f/o/g;->a:Ljava/util/concurrent/Executor;
 
-    invoke-virtual {p1, v2, v1}, Lf/h/a/f/o/c0;->a(Ljava/util/concurrent/Executor;Lf/h/a/f/o/b;)Lcom/google/android/gms/tasks/Task;
+    invoke-virtual {p1, v1, v0}, Lf/h/a/f/o/c0;->a(Ljava/util/concurrent/Executor;Lf/h/a/f/o/b;)Lcom/google/android/gms/tasks/Task;
 
-    sget-object v1, Lcom/discord/utilities/fcm/NotificationClient$init$5;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient$init$5;
+    sget-object v0, Lcom/discord/utilities/fcm/NotificationClient$init$5;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient$init$5;
 
-    sget-object v2, Lf/h/a/f/o/g;->a:Ljava/util/concurrent/Executor;
+    sget-object v1, Lf/h/a/f/o/g;->a:Ljava/util/concurrent/Executor;
 
-    invoke-virtual {p1, v2, v1}, Lf/h/a/f/o/c0;->c(Ljava/util/concurrent/Executor;Lf/h/a/f/o/d;)Lcom/google/android/gms/tasks/Task;
+    invoke-virtual {p1, v1, v0}, Lf/h/a/f/o/c0;->c(Ljava/util/concurrent/Executor;Lf/h/a/f/o/d;)Lcom/google/android/gms/tasks/Task;
+
+    const-string v0, "FirebaseInstanceId.getIn\u2026\", exception)\n          }"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -323,23 +327,14 @@
     :catch_0
     move-exception p1
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x5
+    const-string v1, "FCM service start error"
 
-    const-string v3, "FCM service start error"
-
-    invoke-virtual {v1, v3, v2, p1, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final declared-synchronized isAuthed()Z
@@ -476,7 +471,7 @@
     :try_start_0
     const-string v0, "onDeviceRegistrationIdReceived"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/utilities/fcm/NotificationClient;->tokenCallback:Lkotlin/jvm/functions/Function1;
 
@@ -490,16 +485,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -516,7 +501,7 @@
     :try_start_0
     const-string v0, "settings"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->settings:Lcom/discord/utilities/persister/Persister;
 
@@ -530,16 +515,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
index f76e5e2ce8..36f05b42d5 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData$Companion.smali
@@ -200,7 +200,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static {p1, v0, v2, v2, v1}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {p1, v0, v2, v2, v1}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object p1
 
@@ -233,7 +233,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    invoke-static {v1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -377,7 +377,7 @@
 
     const-string v2, "com.discord.intent.ORIGIN_NOTIF_INAPP"
 
-    invoke-static {p1, v2, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {p1, v2, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
index 1018ec7383..f3e71824fc 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData$DisplayPayload.smali
@@ -49,7 +49,9 @@
 .method public constructor <init>(Lcom/discord/utilities/fcm/NotificationData;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -74,15 +76,6 @@
     iput-object p1, p0, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;->extras:Ljava/util/LinkedHashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final trimExtrasWhenOversized(I)V
@@ -107,7 +100,7 @@
 
     const-string v1, "extras\n          .entries"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;->extras:Ljava/util/LinkedHashMap;
 
@@ -119,7 +112,7 @@
 
     sub-int/2addr v1, p1
 
-    invoke-static {v0, v1}, Lj0/i/l;->drop(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->drop(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
@@ -236,9 +229,9 @@
 
     const-string v1, "extras.values"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
     :try_end_0
@@ -273,22 +266,15 @@
 .end method
 
 .method public final setData(Lcom/discord/utilities/fcm/NotificationData;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;->data:Lcom/discord/utilities/fcm/NotificationData;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setIgnoreNextClearForAck(Z)V
@@ -307,7 +293,7 @@
     :try_start_0
     const-string v0, "data"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;->data:Lcom/discord/utilities/fcm/NotificationData;
 
@@ -345,16 +331,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 92a2c239c4..e5c7b92baa 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -152,7 +152,7 @@
 .end method
 
 .method public constructor <init>(Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;Lcom/discord/models/dsti/dto/ModelDsti;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -189,19 +189,21 @@
 
     move-object/from16 v2, p10
 
-    const/4 v3, 0x0
+    const-string v3, "type"
 
-    if-eqz v1, :cond_7
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_6
+    const-string v3, "ackChannelIds"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    move-wide v4, p2
+    move-wide v3, p2
 
-    iput-wide v4, v0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J
+    iput-wide v3, v0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J
 
     move v1, p4
 
@@ -211,7 +213,7 @@
 
     iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageApplicationName:Ljava/lang/String;
 
-    move/from16 v1, p6
+    move v1, p6
 
     iput v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageType:I
 
@@ -219,9 +221,9 @@
 
     iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageContent:Ljava/lang/String;
 
-    move-wide/from16 v4, p8
+    move-wide/from16 v3, p8
 
-    iput-wide v4, v0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
+    iput-wide v3, v0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
 
     iput-object v2, v0, Lcom/discord/utilities/fcm/NotificationData;->ackChannelIds:Ljava/util/List;
 
@@ -291,97 +293,86 @@
 
     invoke-virtual {v1}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v2
 
-    const/4 v2, 0x0
+    const/4 v4, 0x0
 
-    const-wide/16 v6, -0x1
+    const-wide/16 v5, -0x1
 
-    const/4 v8, 0x1
+    const/4 v7, 0x1
 
-    cmp-long v9, v4, v6
+    cmp-long v8, v2, v5
 
-    if-nez v9, :cond_0
+    if-nez v8, :cond_0
 
-    const/4 v4, 0x1
+    const/4 v2, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v4, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-nez v4, :cond_1
+    if-nez v2, :cond_1
 
-    move-object v3, v1
+    goto :goto_1
 
     :cond_1
-    const/4 v1, 0x3
-
-    if-eqz v3, :cond_2
-
-    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v6
-
-    goto :goto_1
-
-    :cond_2
-    iget v3, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
-
-    if-eq v3, v8, :cond_3
-
-    if-eq v3, v1, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const-wide/16 v6, 0x0
+    const/4 v1, 0x0
 
     :goto_1
-    iput-wide v6, v0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J
+    const/4 v2, 0x3
 
-    iget-object v3, v0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    if-eqz v1, :cond_2
 
-    const-string v4, "MESSAGE_CREATE"
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    move-result-wide v5
 
-    move-result v3
+    goto :goto_2
 
-    if-eqz v3, :cond_5
+    :cond_2
+    iget v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
 
-    iget v3, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
+    if-eq v1, v7, :cond_3
 
-    if-eqz v3, :cond_4
+    if-eq v1, v2, :cond_3
 
-    if-eq v3, v1, :cond_4
+    goto :goto_2
 
-    const/16 v1, 0x9
+    :cond_3
+    const-wide/16 v5, 0x0
 
-    if-ne v3, v1, :cond_5
+    :goto_2
+    iput-wide v5, v0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J
+
+    iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+
+    const-string v3, "MESSAGE_CREATE"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    iget v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
+
+    if-eqz v1, :cond_4
+
+    if-eq v1, v2, :cond_4
+
+    const/16 v2, 0x9
+
+    if-ne v1, v2, :cond_5
 
     :cond_4
-    const/4 v2, 0x1
+    const/4 v4, 0x1
 
     :cond_5
-    iput-boolean v2, v0, Lcom/discord/utilities/fcm/NotificationData;->isGroupConversation:Z
+    iput-boolean v4, v0, Lcom/discord/utilities/fcm/NotificationData;->isGroupConversation:Z
 
     return-void
-
-    :cond_6
-    const-string v1, "ackChannelIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_7
-    const-string v1, "type"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public constructor <init>(Ljava/util/Map;)V
@@ -398,7 +389,9 @@
 
     move-object/from16 v0, p1
 
-    if-eqz v0, :cond_b
+    const-string v1, "data"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "type"
 
@@ -430,7 +423,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {v1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -458,7 +451,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {v1}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v1}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v1
 
@@ -492,7 +485,7 @@
 
     if-eqz v9, :cond_3
 
-    invoke-static {v9}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v9}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v9
 
@@ -526,7 +519,7 @@
 
     if-eqz v11, :cond_4
 
-    invoke-static {v11}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v11}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v11
 
@@ -566,7 +559,7 @@
 
     if-eqz v14, :cond_5
 
-    invoke-static {v14}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v14}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v14
 
@@ -600,7 +593,7 @@
 
     check-cast v17, Ljava/lang/String;
 
-    const-string v2, "user_id"
+    const-string/jumbo v2, "user_id"
 
     invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -610,7 +603,7 @@
 
     if-eqz v2, :cond_6
 
-    invoke-static {v2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -626,7 +619,7 @@
     move-wide/from16 v18, v4
 
     :goto_6
-    const-string v2, "user_username"
+    const-string/jumbo v2, "user_username"
 
     invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -636,7 +629,7 @@
 
     check-cast v20, Ljava/lang/String;
 
-    const-string v2, "user_avatar"
+    const-string/jumbo v2, "user_avatar"
 
     invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -656,7 +649,7 @@
 
     if-eqz v2, :cond_7
 
-    invoke-static {v2}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v2}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v2
 
@@ -684,7 +677,7 @@
 
     if-eqz v2, :cond_8
 
-    invoke-static {v2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -730,7 +723,7 @@
 
     if-eqz v2, :cond_9
 
-    invoke-static {v2}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v2}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v2
 
@@ -768,7 +761,7 @@
 
     if-eqz v2, :cond_a
 
-    invoke-static {v2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -860,15 +853,6 @@
     invoke-direct/range {v2 .. v31}, Lcom/discord/utilities/fcm/NotificationData;-><init>(Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;Lcom/discord/models/dsti/dto/ModelDsti;)V
 
     return-void
-
-    :cond_b
-    const-string v0, "data"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method private final addTrackingData(Landroid/content/Intent;)Landroid/content/Intent;
@@ -956,7 +940,7 @@
 
     const-string v0, "intent\n        .putExtra\u2026IVITY_NAME, activityName)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1171,7 +1155,7 @@
 .method private final renderMarkdown(Ljava/lang/String;)Ljava/lang/CharSequence;
     .locals 0
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1181,13 +1165,17 @@
 
 # virtual methods
 .method public final copyForDirectReply(Lcom/discord/models/domain/ModelMessage;)Lcom/discord/utilities/fcm/NotificationData;
-    .locals 35
+    .locals 36
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_3
+    const-string v1, "message"
 
-    new-instance v32, Lcom/discord/utilities/fcm/NotificationData;
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lcom/discord/utilities/fcm/NotificationData;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
@@ -1195,103 +1183,105 @@
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_0
+    if-eqz v3, :cond_0
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
 
-    move-result v2
+    move-result v3
 
-    move v6, v2
+    move v6, v3
 
     goto :goto_0
 
     :cond_0
-    const/4 v2, -0x1
+    const/4 v3, -0x1
 
     const/4 v6, -0x1
 
     :goto_0
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getApplication()Lcom/discord/models/domain/ModelApplication;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_1
+    if-eqz v3, :cond_1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    move-object v7, v2
+    move-object v8, v3
 
     goto :goto_1
 
     :cond_1
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
     :goto_1
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
 
-    move-result v8
+    move-result v9
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v10
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    move-result-wide v10
+    move-result-wide v11
 
-    sget-object v12, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v13, Lk0/j/n;->d:Lk0/j/n;
 
-    iget v13, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
+    iget v14, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
 
-    iget-object v14, v0, Lcom/discord/utilities/fcm/NotificationData;->channelName:Ljava/lang/String;
+    iget-object v15, v0, Lcom/discord/utilities/fcm/NotificationData;->channelName:Ljava/lang/String;
 
-    iget-object v15, v0, Lcom/discord/utilities/fcm/NotificationData;->channelIcon:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/utilities/fcm/NotificationData;->channelIcon:Ljava/lang/String;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v2
+    move-result-object v7
 
-    const-string v3, "message.author"
+    const-string v2, "message.author"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v16
+    move-result-wide v17
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v2
+    move-result-object v7
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
-
-    move-result-object v18
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v2
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object v19
 
-    const/16 v20, -0x1
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    iget-wide v2, v0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J
+    move-result-object v7
 
-    iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->guildName:Ljava/lang/String;
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v23, v1
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
 
-    iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->guildIcon:Ljava/lang/String;
+    move-result-object v20
+
+    const/16 v21, -0x1
+
+    move/from16 v22, v14
+
+    move-object/from16 v23, v15
+
+    iget-wide v14, v0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J
+
+    iget-object v7, v0, Lcom/discord/utilities/fcm/NotificationData;->guildName:Ljava/lang/String;
+
+    iget-object v2, v0, Lcom/discord/utilities/fcm/NotificationData;->guildIcon:Ljava/lang/String;
 
     const/16 v25, -0x1
 
@@ -1305,17 +1295,17 @@
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getStickers()Ljava/util/List;
 
-    move-result-object v22
+    move-result-object v24
 
-    if-eqz v22, :cond_2
+    if-eqz v24, :cond_2
 
-    invoke-static/range {v22 .. v22}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static/range {v24 .. v24}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
-    move-result-object v21
+    move-result-object v16
 
-    check-cast v21, Lcom/discord/models/dsti/dto/ModelDsti;
+    check-cast v16, Lcom/discord/models/dsti/dto/ModelDsti;
 
-    move-object/from16 v31, v21
+    move-object/from16 v31, v16
 
     goto :goto_2
 
@@ -1323,30 +1313,53 @@
     const/16 v31, 0x0
 
     :goto_2
-    const-string v21, "MESSAGE_CREATE"
+    const-string v16, "MESSAGE_CREATE"
 
-    move-wide/from16 v33, v2
+    move-object/from16 v24, v3
 
-    move-object/from16 v3, v21
+    move-object/from16 v3, v16
 
-    move-object/from16 v2, v32
+    move-object/from16 v32, v2
 
-    move-wide/from16 v21, v33
+    move-object v2, v1
 
-    move-object/from16 v24, v1
+    move-object/from16 v33, v7
+
+    move-object v7, v8
+
+    move v8, v9
+
+    move-object v9, v10
+
+    move-wide v10, v11
+
+    move-object v12, v13
+
+    move/from16 v13, v22
+
+    move-wide/from16 v34, v14
+
+    move-object/from16 v14, v23
+
+    move-object/from16 v15, v24
+
+    move-wide/from16 v16, v17
+
+    move-object/from16 v18, v19
+
+    move-object/from16 v19, v20
+
+    move/from16 v20, v21
+
+    move-wide/from16 v21, v34
+
+    move-object/from16 v23, v33
+
+    move-object/from16 v24, v32
 
     invoke-direct/range {v2 .. v31}, Lcom/discord/utilities/fcm/NotificationData;-><init>(Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;Lcom/discord/models/dsti/dto/ModelDsti;)V
 
-    return-object v32
-
-    :cond_3
-    const-string v1, "message"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
+    return-object v1
 .end method
 
 .method public final getAckChannelIds()Ljava/util/List;
@@ -1371,36 +1384,38 @@
         value = 0x18
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    const-string v2, "CALL_RING"
+    const-string v1, "CALL_RING"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/lit8 v1, v1, 0x1
+    xor-int/lit8 v0, v0, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    return-object v0
+    const/4 p1, 0x0
+
+    return-object p1
 
     :cond_0
-    sget-object v2, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
+    sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
 
-    iget-wide v4, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
+    iget-wide v2, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
 
-    iget-wide v6, p0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J
+    iget-wide v4, p0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J
 
-    move-object v3, p1
+    move-object v1, p1
 
-    move v8, p2
+    move v6, p2
 
-    invoke-virtual/range {v2 .. v8}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->callAction(Landroid/content/Context;JJZ)Landroid/content/Intent;
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->callAction(Landroid/content/Context;JJZ)Landroid/content/Intent;
 
     move-result-object v0
 
@@ -1416,7 +1431,7 @@
 
     if-eqz p2, :cond_1
 
-    const v1, 0x7f120d8b
+    const v1, 0x7f120db1
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1435,7 +1450,7 @@
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f12055e
+    const v1, 0x7f120560
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1474,7 +1489,7 @@
 
     const-string v3, "ctx.getString(nameRes)"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v4, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
@@ -1510,12 +1525,12 @@
 
     if-eqz p2, :cond_2
 
-    const p2, 0x7f08024f
+    const p2, 0x7f080250
 
     goto :goto_1
 
     :cond_2
-    const p2, 0x7f080250
+    const p2, 0x7f080251
 
     :goto_1
     invoke-direct {v1, p2, p1, v0}, Landroidx/core/app/NotificationCompat$Action$Builder;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
@@ -1525,13 +1540,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_3
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getChannelId()J
@@ -1543,44 +1551,44 @@
 .end method
 
 .method public final getContent(Landroid/content/Context;)Ljava/lang/CharSequence;
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
-    move-result v2
+    move-result v1
 
-    const/4 v3, 0x3
+    const/4 v2, 0x3
 
-    const/4 v4, 0x2
+    const/4 v3, 0x2
 
-    const-string v5, ""
+    const-string v4, ""
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
-    sparse-switch v2, :sswitch_data_0
+    sparse-switch v1, :sswitch_data_0
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :sswitch_0
-    const-string v0, "CALL_RING"
+    const-string v1, "CALL_RING"
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
     if-eqz v0, :cond_a
 
-    const v0, 0x7f1210a0
+    const v0, 0x7f1210ca
 
-    new-array v1, v7, [Ljava/lang/Object;
+    new-array v1, v6, [Ljava/lang/Object;
 
     const-string v2, "**"
 
@@ -1594,7 +1602,7 @@
 
     move-result-object v2
 
-    aput-object v2, v1, v6
+    aput-object v2, v1, v5
 
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1602,63 +1610,65 @@
 
     const-string v0, "context.getString(R.stri\u2026ing, \"**$userUsername**\")"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/fcm/NotificationData;->renderMarkdown(Ljava/lang/String;)Ljava/lang/CharSequence;
 
-    move-result-object v5
+    move-result-object v4
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :sswitch_1
-    const-string v2, "MESSAGE_CREATE"
+    const-string v1, "MESSAGE_CREATE"
 
-    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_a
+    if-eqz v0, :cond_a
 
-    iget v1, p0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
+    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
 
-    if-eqz v1, :cond_3
+    const/4 v1, 0x0
 
-    if-eq v1, v7, :cond_0
+    if-eqz v0, :cond_3
 
-    if-eq v1, v3, :cond_0
+    if-eq v0, v6, :cond_0
+
+    if-eq v0, v2, :cond_0
 
     const/4 v2, 0x5
 
-    if-eq v1, v2, :cond_3
+    if-eq v0, v2, :cond_3
 
     const/16 v2, 0x9
 
-    if-eq v1, v2, :cond_3
+    if-eq v0, v2, :cond_3
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_0
-    iget v1, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
+    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
 
-    if-ne v1, v7, :cond_1
+    if-ne v0, v6, :cond_1
 
-    const v0, 0x7f120ff4
+    const v0, 0x7f12101e
 
-    new-array v1, v4, [Ljava/lang/Object;
+    new-array v1, v3, [Ljava/lang/Object;
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->userUsername:Ljava/lang/String;
 
-    aput-object v2, v1, v6
+    aput-object v2, v1, v5
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->messageApplicationName:Ljava/lang/String;
 
-    aput-object v2, v1, v7
+    aput-object v2, v1, v6
 
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_1
     iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationData;->sticker:Lcom/discord/models/dsti/dto/ModelDsti;
@@ -1667,9 +1677,9 @@
 
     invoke-virtual {p1}, Lcom/discord/models/dsti/dto/ModelDsti;->getName()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_2
     iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationData;->messageContent:Ljava/lang/String;
@@ -1678,16 +1688,16 @@
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/fcm/NotificationData;->renderMarkdown(Ljava/lang/String;)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object p1
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :cond_3
-    iget v1, p0, Lcom/discord/utilities/fcm/NotificationData;->messageType:I
+    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageType:I
 
     const/4 v2, 0x7
 
-    if-ne v1, v2, :cond_4
+    if-ne v0, v2, :cond_4
 
     iget-wide v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J
 
@@ -1695,40 +1705,40 @@
 
     move-result v0
 
-    new-array v1, v7, [Ljava/lang/Object;
+    new-array v1, v6, [Ljava/lang/Object;
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->userUsername:Ljava/lang/String;
 
-    aput-object v2, v1, v6
+    aput-object v2, v1, v5
 
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_4
-    iget v1, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
+    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
 
-    if-ne v1, v7, :cond_5
+    if-ne v0, v6, :cond_5
 
-    const v0, 0x7f120ff9
+    const v0, 0x7f121023
 
-    new-array v1, v4, [Ljava/lang/Object;
+    new-array v1, v3, [Ljava/lang/Object;
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->userUsername:Ljava/lang/String;
 
-    aput-object v2, v1, v6
+    aput-object v2, v1, v5
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->messageApplicationName:Ljava/lang/String;
 
-    aput-object v2, v1, v7
+    aput-object v2, v1, v6
 
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    goto/16 :goto_2
+    goto/16 :goto_1
 
     :cond_5
     iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationData;->sticker:Lcom/discord/models/dsti/dto/ModelDsti;
@@ -1737,9 +1747,9 @@
 
     invoke-virtual {p1}, Lcom/discord/models/dsti/dto/ModelDsti;->getName()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_6
     iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationData;->messageContent:Ljava/lang/String;
@@ -1748,18 +1758,19 @@
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/fcm/NotificationData;->renderMarkdown(Ljava/lang/String;)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_7
-    :goto_0
-    move-object v5, v0
+    move-object v4, v1
 
-    goto :goto_2
+    goto :goto_1
 
     :sswitch_2
-    const-string v0, "ACTIVITY_START"
+    const-string v1, "ACTIVITY_START"
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1769,51 +1780,51 @@
 
     if-nez v0, :cond_a
 
-    const v0, 0x7f120ff2
+    const v0, 0x7f12101c
 
-    new-array v1, v4, [Ljava/lang/Object;
+    new-array v1, v3, [Ljava/lang/Object;
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->userUsername:Ljava/lang/String;
 
-    aput-object v2, v1, v6
+    aput-object v2, v1, v5
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->activityName:Ljava/lang/String;
 
-    aput-object v2, v1, v7
+    aput-object v2, v1, v6
 
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    goto :goto_1
+    goto :goto_0
 
     :sswitch_3
-    const-string v0, "APPLICATION_LIBRARY_INSTALL_COMPLETE"
+    const-string v1, "APPLICATION_LIBRARY_INSTALL_COMPLETE"
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
     if-eqz v0, :cond_a
 
-    const v0, 0x7f12081d
+    const v0, 0x7f12081f
 
-    new-array v1, v7, [Ljava/lang/Object;
+    new-array v1, v6, [Ljava/lang/Object;
 
     iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationData;->applicationName:Ljava/lang/String;
 
-    aput-object v2, v1, v6
+    aput-object v2, v1, v5
 
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    goto :goto_2
+    goto :goto_1
 
     :sswitch_4
-    const-string v0, "RELATIONSHIP_ADD"
+    const-string v1, "RELATIONSHIP_ADD"
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1821,41 +1832,36 @@
 
     iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->relationshipType:I
 
-    if-eq v0, v7, :cond_9
+    if-eq v0, v6, :cond_9
 
-    if-eq v0, v3, :cond_8
-
-    goto :goto_2
-
-    :cond_8
-    const v0, 0x7f120ffd
-
-    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object p1
+    if-eq v0, v2, :cond_8
 
     goto :goto_1
 
-    :cond_9
-    const v0, 0x7f120ff0
+    :cond_8
+    const v0, 0x7f121027
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    :goto_1
-    move-object v5, p1
+    goto :goto_0
+
+    :cond_9
+    const v0, 0x7f12101a
+
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    :goto_0
+    move-object v4, p1
 
     :cond_a
-    :goto_2
-    return-object v5
+    :goto_1
+    return-object v4
 
-    :cond_b
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    nop
 
     :sswitch_data_0
     .sparse-switch
@@ -1870,7 +1876,9 @@
 .method public final getContentIntent(Landroid/content/Context;)Landroid/app/PendingIntent;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/fcm/NotificationData;->getContentIntentInternal()Landroid/content/Intent;
 
@@ -1886,12 +1894,12 @@
 
     invoke-virtual {v0, p1, v1}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
 
-    const/4 v1, 0x0
-
     invoke-direct {p0, v0}, Lcom/discord/utilities/fcm/NotificationData;->addTrackingData(Landroid/content/Intent;)Landroid/content/Intent;
 
     move-result-object v0
 
+    const/4 v1, 0x0
+
     const/high16 v2, 0x8000000
 
     invoke-static {p1, v1, v0, v2}, Landroid/app/PendingIntent;->getActivity(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
@@ -1900,24 +1908,17 @@
 
     const-string v0, "PendingIntent.getActivit\u2026FLAG_UPDATE_CURRENT\n    )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getContentIntentInApp(Landroid/content/Context;)Landroid/app/PendingIntent;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/fcm/NotificationData;->getContentIntentInternal()Landroid/content/Intent;
 
@@ -1933,12 +1934,12 @@
 
     invoke-virtual {v0, p1, v1}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
 
-    const/4 v1, 0x0
-
     invoke-direct {p0, v0}, Lcom/discord/utilities/fcm/NotificationData;->addTrackingData(Landroid/content/Intent;)Landroid/content/Intent;
 
     move-result-object v0
 
+    const/4 v1, 0x0
+
     const/high16 v2, 0x8000000
 
     invoke-static {p1, v1, v0, v2}, Landroid/app/PendingIntent;->getActivity(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
@@ -1947,82 +1948,75 @@
 
     const-string v0, "PendingIntent.getActivit\u2026FLAG_UPDATE_CURRENT\n    )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getConversationTitle(Landroid/content/Context;)Ljava/lang/CharSequence;
-    .locals 9
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
-    move-result v2
+    move-result v1
+
+    const/4 v2, 0x0
 
     const v3, 0x3b7f2454
 
-    if-eq v2, v3, :cond_0
+    if-eq v1, v3, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const-string v2, "MESSAGE_CREATE"
+    const-string v1, "MESSAGE_CREATE"
 
-    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    iget v5, p0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
+    iget v6, p0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I
 
-    if-eqz v5, :cond_2
+    if-eqz v6, :cond_2
 
-    const/4 v1, 0x3
+    const/4 v0, 0x3
 
-    if-eq v5, v1, :cond_1
+    if-eq v6, v0, :cond_1
 
-    const/4 v1, 0x5
+    const/4 v0, 0x5
 
-    if-eq v5, v1, :cond_2
+    if-eq v6, v0, :cond_2
 
-    const/16 v1, 0x9
+    const/16 v0, 0x9
 
-    if-eq v5, v1, :cond_2
+    if-eq v6, v0, :cond_2
 
     goto :goto_0
 
     :cond_1
-    sget-object v2, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
+    sget-object v3, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
 
-    iget-object v4, p0, Lcom/discord/utilities/fcm/NotificationData;->channelName:Ljava/lang/String;
+    iget-object v5, p0, Lcom/discord/utilities/fcm/NotificationData;->channelName:Ljava/lang/String;
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
-    const/16 v7, 0x8
+    const/16 v8, 0x8
 
-    const/4 v8, 0x0
+    const/4 v9, 0x0
 
-    move-object v3, p1
+    move-object v4, p1
 
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/utilities/channel/ChannelUtils;Landroid/content/Context;Ljava/lang/String;IZILjava/lang/Object;)Ljava/lang/String;
+    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/utilities/channel/ChannelUtils;Landroid/content/Context;Ljava/lang/String;IZILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
     goto :goto_0
 
@@ -2071,24 +2065,19 @@
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/fcm/NotificationData;->renderMarkdown(Ljava/lang/String;)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object v2
 
     :cond_3
     :goto_0
-    return-object v0
-
-    :cond_4
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v2
 .end method
 
 .method public final getDeleteIntent(Landroid/content/Context;)Landroid/app/PendingIntent;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
 
@@ -2108,18 +2097,9 @@
 
     const-string v0, "PendingIntent.getBroadca\u2026tent.FLAG_UPDATE_CURRENT)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getDirectReplyAction(Landroid/content/Context;Ljava/util/Set;)Landroidx/core/app/NotificationCompat$Action;
@@ -2139,33 +2119,35 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "deniedChannels"
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "MESSAGE_CREATE"
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    const-string v1, "MESSAGE_CREATE"
 
-    move-result v1
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    const/4 v2, 0x1
+    move-result v0
 
-    xor-int/2addr v1, v2
+    const/4 v1, 0x1
 
-    if-nez v1, :cond_1
+    xor-int/2addr v0, v1
 
-    iget-wide v3, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
+    if-nez v0, :cond_1
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    iget-wide v2, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
 
-    move-result-object v1
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-interface {p2, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    move-result-object v0
+
+    invoke-interface {p2, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -2180,7 +2162,7 @@
 
     invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;-><init>(Ljava/lang/String;)V
 
-    const v0, 0x7f12143e
+    const v0, 0x7f121468
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2196,51 +2178,51 @@
 
     const-string v0, "RemoteInput.Builder(Inte\u2026essage))\n        .build()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
 
-    iget-wide v3, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
+    iget-wide v2, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/fcm/NotificationData;->getTitle(Landroid/content/Context;)Ljava/lang/CharSequence;
 
-    move-result-object v1
+    move-result-object v4
 
-    invoke-virtual {v0, p1, v3, v4, v1}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->directReply(Landroid/content/Context;JLjava/lang/CharSequence;)Landroid/content/Intent;
+    invoke-virtual {v0, p1, v2, v3, v4}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->directReply(Landroid/content/Context;JLjava/lang/CharSequence;)Landroid/content/Intent;
 
     move-result-object v0
 
-    iget-wide v3, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
+    iget-wide v2, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
 
-    long-to-int v1, v3
+    long-to-int v3, v2
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/fcm/NotificationData;->addTrackingData(Landroid/content/Intent;)Landroid/content/Intent;
 
     move-result-object v0
 
-    const/high16 v3, 0x8000000
+    const/high16 v2, 0x8000000
 
-    invoke-static {p1, v1, v0, v3}, Landroid/app/PendingIntent;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
+    invoke-static {p1, v3, v0, v2}, Landroid/app/PendingIntent;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
 
     move-result-object v0
 
-    new-instance v1, Landroidx/core/app/NotificationCompat$Action$Builder;
+    new-instance v2, Landroidx/core/app/NotificationCompat$Action$Builder;
 
-    const v3, 0x7f0803bf
+    const v3, 0x7f0803c2
 
-    const v4, 0x7f120ffe
+    const v4, 0x7f121028
 
     invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-direct {v1, v3, p1, v0}, Landroidx/core/app/NotificationCompat$Action$Builder;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
+    invoke-direct {v2, v3, p1, v0}, Landroidx/core/app/NotificationCompat$Action$Builder;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
 
-    invoke-virtual {v1, p2}, Landroidx/core/app/NotificationCompat$Action$Builder;->addRemoteInput(Landroidx/core/app/RemoteInput;)Landroidx/core/app/NotificationCompat$Action$Builder;
+    invoke-virtual {v2, p2}, Landroidx/core/app/NotificationCompat$Action$Builder;->addRemoteInput(Landroidx/core/app/RemoteInput;)Landroidx/core/app/NotificationCompat$Action$Builder;
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, Landroidx/core/app/NotificationCompat$Action$Builder;->setAllowGeneratedReplies(Z)Landroidx/core/app/NotificationCompat$Action$Builder;
+    invoke-virtual {p1, v1}, Landroidx/core/app/NotificationCompat$Action$Builder;->setAllowGeneratedReplies(Z)Landroidx/core/app/NotificationCompat$Action$Builder;
 
     move-result-object p1
 
@@ -2252,45 +2234,35 @@
 
     :cond_1
     :goto_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_2
-    const-string p1, "deniedChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public final getFullScreenIntent(Landroid/content/Context;)Landroid/app/PendingIntent;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/fcm/NotificationData;->getNotificationCategory()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "call"
+    const-string v1, "call"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/lit8 v1, v1, 0x1
+    xor-int/lit8 v0, v0, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    return-object v0
+    const/4 p1, 0x0
+
+    return-object p1
 
     :cond_0
     new-instance v0, Landroid/content/Intent;
@@ -2316,13 +2288,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getGroupKey()Ljava/lang/String;
@@ -2648,39 +2613,41 @@
 .end method
 
 .method public final getMarkAsReadAction(Landroid/content/Context;)Landroidx/core/app/NotificationCompat$Action;
-    .locals 8
+    .locals 6
     .annotation build Landroidx/annotation/RequiresApi;
         value = 0x18
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    const-string v2, "MESSAGE_CREATE"
+    const-string v1, "MESSAGE_CREATE"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/lit8 v1, v1, 0x1
+    xor-int/lit8 v0, v0, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    return-object v0
+    const/4 p1, 0x0
+
+    return-object p1
 
     :cond_0
-    sget-object v2, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
+    sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
 
-    iget-wide v4, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
+    iget-wide v2, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J
 
-    iget-wide v6, p0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J
+    iget-wide v4, p0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J
 
-    move-object v3, p1
+    move-object v1, p1
 
-    invoke-virtual/range {v2 .. v7}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->markAsRead(Landroid/content/Context;JJ)Landroid/content/Intent;
+    invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->markAsRead(Landroid/content/Context;JJ)Landroid/content/Intent;
 
     move-result-object v0
 
@@ -2696,9 +2663,9 @@
 
     new-instance v1, Landroidx/core/app/NotificationCompat$Action$Builder;
 
-    const v2, 0x7f080276
+    const v2, 0x7f080277
 
-    const v3, 0x7f120e8d
+    const v3, 0x7f120eb3
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2711,13 +2678,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getMessageId()J
@@ -2990,32 +2950,32 @@
 .end method
 
 .method public final getNotificationSound(Landroid/content/Context;)Landroid/net/Uri;
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
-    move-result v2
+    move-result v1
 
-    const v3, 0x69807371
+    const v2, 0x69807371
 
-    if-eq v2, v3, :cond_0
+    if-eq v1, v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const-string v2, "CALL_RING"
+    const-string v1, "CALL_RING"
 
-    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     const-string v0, "android.resource://"
 
@@ -3057,150 +3017,164 @@
 
     const-string v0, "StringBuilder()\n        \u2026)\n            .toString()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_1
 
     :cond_1
     :goto_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_1
+    return-object p1
 .end method
 
 .method public final getSender(Landroid/content/Context;)Landroidx/core/app/Person;
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    const-string v2, "MESSAGE_CREATE"
+    const-string v1, "MESSAGE_CREATE"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    iget v1, p0, Lcom/discord/utilities/fcm/NotificationData;->messageType:I
+    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageType:I
 
-    const/4 v3, 0x7
+    const/4 v2, 0x7
 
-    if-eq v1, v3, :cond_0
+    if-eq v0, v2, :cond_0
 
-    iget v1, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
+    iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    if-eq v1, v3, :cond_0
+    if-eq v0, v2, :cond_0
 
-    if-eq v1, v2, :cond_0
+    if-eq v0, v1, :cond_0
 
     iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationData;->userUsername:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f1205ad
+    const v0, 0x7f1205af
 
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
     :goto_0
-    iget-wide v3, p0, Lcom/discord/utilities/fcm/NotificationData;->userId:J
+    iget-wide v2, p0, Lcom/discord/utilities/fcm/NotificationData;->userId:J
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    iget-object v6, p0, Lcom/discord/utilities/fcm/NotificationData;->userAvatar:Ljava/lang/String;
+    iget-object v5, p0, Lcom/discord/utilities/fcm/NotificationData;->userAvatar:Ljava/lang/String;
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/16 v9, 0x1c
 
-    const/16 v10, 0x1c
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    invoke-static/range {v4 .. v10}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
-    invoke-static/range {v5 .. v11}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    move-result-object v0
 
-    move-result-object v1
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    if-eqz v0, :cond_3
 
-    if-eqz v1, :cond_4
+    const/16 v3, 0x2e
 
-    const/16 v4, 0x2e
+    const-string v4, "jpg"
 
-    if-eqz v1, :cond_3
+    const-string v5, "$this$replaceAfterLast"
 
-    const/4 v5, 0x6
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v4, v3, v3, v5}, Lj0/t/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
+    const-string v5, "replacement"
 
-    move-result v4
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v5, -0x1
+    const-string v6, "missingDelimiterValue"
 
-    if-ne v4, v5, :cond_1
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v6, 0x6
+
+    invoke-static {v0, v3, v2, v2, v6}, Lk0/u/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v3
+
+    const/4 v6, -0x1
+
+    if-ne v3, v6, :cond_1
 
     goto :goto_1
 
     :cond_1
-    add-int/2addr v4, v2
+    add-int/2addr v3, v1
 
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
 
-    move-result v5
+    move-result v6
 
-    if-lt v5, v4, :cond_2
+    const-string v7, "$this$replaceRange"
 
-    new-instance v6, Ljava/lang/StringBuilder;
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v6, v1, v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
+    if-lt v6, v3, :cond_2
 
-    const-string v3, "this.append(value, startIndex, endIndex)"
+    new-instance v5, Ljava/lang/StringBuilder;
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v4, "jpg"
+    invoke-virtual {v5, v0, v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/StringBuilder;
+    const-string v2, "this.append(value, startIndex, endIndex)"
 
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
+    invoke-static {v5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result v4
+    invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6, v1, v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result v3
 
-    invoke-virtual {v6}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-virtual {v5, v0, v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
 
-    move-result-object v1
+    invoke-static {v5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
 
     :goto_1
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_3
 
-    invoke-static {v1}, Landroidx/core/graphics/drawable/IconCompat;->createWithContentUri(Ljava/lang/String;)Landroidx/core/graphics/drawable/IconCompat;
+    invoke-static {v0}, Landroidx/core/graphics/drawable/IconCompat;->createWithContentUri(Ljava/lang/String;)Landroidx/core/graphics/drawable/IconCompat;
 
     move-result-object v0
 
@@ -3215,7 +3189,7 @@
 
     const-string v2, ")."
 
-    invoke-static {v0, v5, v1, v4, v2}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v6, v1, v3, v2}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -3224,29 +3198,24 @@
     throw p1
 
     :cond_3
-    const-string p1, "missingDelimiterValue"
+    const/4 v0, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
     :goto_2
-    new-instance v1, Landroidx/core/app/Person$Builder;
+    new-instance v2, Landroidx/core/app/Person$Builder;
 
-    invoke-direct {v1}, Landroidx/core/app/Person$Builder;-><init>()V
+    invoke-direct {v2}, Landroidx/core/app/Person$Builder;-><init>()V
 
-    invoke-virtual {v1, p1}, Landroidx/core/app/Person$Builder;->setName(Ljava/lang/CharSequence;)Landroidx/core/app/Person$Builder;
+    invoke-virtual {v2, p1}, Landroidx/core/app/Person$Builder;->setName(Ljava/lang/CharSequence;)Landroidx/core/app/Person$Builder;
 
     move-result-object p1
 
-    iget-wide v3, p0, Lcom/discord/utilities/fcm/NotificationData;->userId:J
+    iget-wide v2, p0, Lcom/discord/utilities/fcm/NotificationData;->userId:J
 
-    invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {v2, v3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {p1, v1}, Landroidx/core/app/Person$Builder;->setKey(Ljava/lang/String;)Landroidx/core/app/Person$Builder;
+    invoke-virtual {p1, v2}, Landroidx/core/app/Person$Builder;->setKey(Ljava/lang/String;)Landroidx/core/app/Person$Builder;
 
     move-result-object p1
 
@@ -3256,15 +3225,15 @@
 
     iget v0, p0, Lcom/discord/utilities/fcm/NotificationData;->relationshipType:I
 
-    if-ne v0, v2, :cond_5
+    if-ne v0, v1, :cond_4
 
     goto :goto_3
 
-    :cond_5
-    const/4 v2, 0x0
+    :cond_4
+    const/4 v1, 0x0
 
     :goto_3
-    invoke-virtual {p1, v2}, Landroidx/core/app/Person$Builder;->setImportant(Z)Landroidx/core/app/Person$Builder;
+    invoke-virtual {p1, v1}, Landroidx/core/app/Person$Builder;->setImportant(Z)Landroidx/core/app/Person$Builder;
 
     move-result-object p1
 
@@ -3274,16 +3243,9 @@
 
     const-string v0, "Person.Builder()\n       \u2026_FRIEND)\n        .build()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_6
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getShouldGroup()Z
@@ -3370,7 +3332,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080366
+    const v0, 0x7f080369
 
     goto :goto_1
 
@@ -3383,7 +3345,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080368
+    const v0, 0x7f08036b
 
     goto :goto_1
 
@@ -3396,13 +3358,13 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080367
+    const v0, 0x7f08036a
 
     goto :goto_1
 
     :cond_3
     :goto_0
-    const v0, 0x7f080365
+    const v0, 0x7f080368
 
     :goto_1
     return v0
@@ -3422,27 +3384,29 @@
         value = 0x18
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "clock"
 
-    iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "MESSAGE_CREATE"
+    iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    const-string v1, "MESSAGE_CREATE"
 
-    move-result v1
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    xor-int/lit8 v1, v1, 0x1
+    move-result v0
 
-    if-nez v1, :cond_1
+    xor-int/lit8 v0, v0, 0x1
 
-    const/4 v1, 0x2
+    if-nez v0, :cond_1
 
-    if-ge p3, v1, :cond_0
+    const/4 v0, 0x2
+
+    if-ge p3, v0, :cond_0
 
     goto :goto_0
 
@@ -3479,9 +3443,9 @@
 
     new-instance p3, Landroidx/core/app/NotificationCompat$Action$Builder;
 
-    const v0, 0x7f08036b
+    const v0, 0x7f08036e
 
-    const v1, 0x7f120ffb
+    const v1, 0x7f121025
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3497,27 +3461,17 @@
 
     :cond_1
     :goto_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_2
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public final getTitle(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 11
 
-    if-eqz p1, :cond_5
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String;
 
@@ -3551,7 +3505,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120c72
+    const v0, 0x7f120c98
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3677,7 +3631,7 @@
 
     if-nez v0, :cond_4
 
-    const v0, 0x7f121003
+    const v0, 0x7f12102d
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3694,7 +3648,7 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f12081e
+    const v0, 0x7f120820
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3717,15 +3671,6 @@
     :goto_1
     return-object v3
 
-    :cond_5
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     nop
 
     :sswitch_data_0
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$NotificationDisplaySubscriptionManager.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$NotificationDisplaySubscriptionManager.smali
index bbf76b022a..99db966734 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$NotificationDisplaySubscriptionManager.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$NotificationDisplaySubscriptionManager.smali
@@ -63,7 +63,7 @@
 
     const-string v0, "subscription"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationRenderer$NotificationDisplaySubscriptionManager;->notificationDisplaySubscriptions:Ljava/util/HashMap;
 
@@ -94,13 +94,6 @@
     monitor-exit v0
 
     throw p1
-
-    :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final cancel(I)V
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$clear$1.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$clear$1.smali
index e9d1a4d308..4d05f7d16f 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$clear$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$clear$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/fcm/NotificationRenderer$clear$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NotificationRenderer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$4.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$4.smali
index ec8fb7082f..703dcedc7b 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$4.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "NotificationRenderer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subscriptions/CompositeSubscription;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "add"
+
+    const-string v5, "add(Lrx/Subscription;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "add"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "add(Lrx/Subscription;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subscriptions/CompositeSubscription;
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$5.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$5.smali
index 4b46fc187c..ffa4bf091b 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$5.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NotificationRenderer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     const-string v3, "notificationBuilder"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/fcm/NotificationRenderer;->access$displayNotification(Lcom/discord/utilities/fcm/NotificationRenderer;Landroid/content/Context;ILandroidx/core/app/NotificationCompat$Builder;)V
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$6.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$6.smali
index fcb833f859..60a1b76b03 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$6.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$6.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$6;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "NotificationRenderer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subscriptions/CompositeSubscription;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "add"
+
+    const-string v5, "add(Lrx/Subscription;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "add"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "add(Lrx/Subscription;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subscriptions/CompositeSubscription;
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$7.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$7.smali
index 6236bb154b..35dbbb1519 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$7.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/fcm/NotificationRenderer$displayAndUpdateCache$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NotificationRenderer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;",
         "Lkotlin/Unit;",
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -180,7 +180,7 @@
 
     const-string v6, "bitmapsForIconUris"
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, v3, v4, v5, p1}, Lcom/discord/utilities/fcm/NotificationRenderer;->access$getMessageStyle(Lcom/discord/utilities/fcm/NotificationRenderer;Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Ljava/util/List;Ljava/util/Map;)Landroidx/core/app/NotificationCompat$MessagingStyle;
 
@@ -204,7 +204,7 @@
 
     const-string v5, "notificationBuilder"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v2, v3, v4}, Lcom/discord/utilities/fcm/NotificationRenderer;->access$displayNotification(Lcom/discord/utilities/fcm/NotificationRenderer;Landroid/content/Context;ILandroidx/core/app/NotificationCompat$Builder;)V
     :try_end_0
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayInApp$1.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayInApp$1.smali
index 035656e7fa..62de8b0112 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayInApp$1.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$displayInApp$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/fcm/NotificationRenderer$displayInApp$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NotificationRenderer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationRenderer$displayInApp$1;->$notificationData:Lcom/discord/utilities/fcm/NotificationData;
 
@@ -78,13 +80,4 @@
     invoke-virtual {p1}, Landroid/app/PendingIntent;->send()V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
index 6ad93d0fe0..a5a1e7ed36 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -100,11 +100,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.app.AlarmManager"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -255,7 +255,7 @@
 
     new-instance v1, Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;
 
-    sget-object v9, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v9, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-direct {v1, v9}, Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;-><init>(Ljava/util/Map;)V
 
@@ -279,7 +279,7 @@
 
     const-string v10, "ShortcutManagerCompat.getDynamicShortcuts(context)"
 
-    invoke-static {v9, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v9}, Ljava/util/Collection;->isEmpty()Z
 
@@ -312,13 +312,13 @@
 
     const-string v11, "it"
 
-    invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v10}, Landroidx/core/content/pm/ShortcutInfoCompat;->getId()Ljava/lang/String;
 
     move-result-object v10
 
-    invoke-static {v10, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v10, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v10
 
@@ -552,7 +552,7 @@
 
     move-result-object v1
 
-    invoke-static {v9, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v9, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
@@ -592,7 +592,7 @@
     goto :goto_4
 
     :cond_c
-    invoke-static {v9}, Lj0/i/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v9}, Lk0/j/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v1
 
@@ -641,21 +641,21 @@
 
     move-result-object v9
 
-    sget-object v10, Lr0/l/a/g;->e:Lrx/Observable;
+    sget-object v10, Ls0/l/a/g;->e:Lrx/Observable;
 
-    new-instance v11, Lr0/l/a/i1;
+    new-instance v11, Ls0/l/a/i1;
 
-    new-instance v12, Lr0/l/a/g1;
+    new-instance v12, Ls0/l/a/g1;
 
-    invoke-direct {v12, v10}, Lr0/l/a/g1;-><init>(Lrx/Observable;)V
+    invoke-direct {v12, v10}, Ls0/l/a/g1;-><init>(Lrx/Observable;)V
 
-    invoke-direct {v11, v12}, Lr0/l/a/i1;-><init>(Lr0/k/b;)V
+    invoke-direct {v11, v12}, Ls0/l/a/i1;-><init>(Ls0/k/b;)V
 
-    new-instance v10, Lr0/l/a/u;
+    new-instance v10, Ls0/l/a/u;
 
     iget-object v12, v3, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v10, v12, v11}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v10, v12, v11}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v10}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -665,7 +665,7 @@
 
     move-result-object v9
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v10
 
@@ -675,7 +675,7 @@
 
     const-string v9, "Observable\n        .time\u2026dSchedulers.mainThread())"
 
-    invoke-static {v11, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
@@ -699,7 +699,7 @@
 
     invoke-static/range {v11 .. v19}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v9
 
@@ -709,7 +709,7 @@
 
     const-string v3, "bitmapsObservable\n      \u2026dSchedulers.mainThread())"
 
-    invoke-static {v10, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v11, 0x0
 
@@ -835,7 +835,7 @@
 
     invoke-direct {v0}, Landroidx/core/app/Person$Builder;-><init>()V
 
-    const v1, 0x7f120eb6
+    const v1, 0x7f120edc
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -857,7 +857,7 @@
 
     const-string v1, "Person.Builder()\n       \u2026ey(\"me\")\n        .build()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroidx/core/app/NotificationCompat$MessagingStyle;
 
@@ -936,7 +936,7 @@
 
     const-string v3, "data.getSender(context).\u2026(icon)\n          .build()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez v1, :cond_1
 
@@ -967,7 +967,7 @@
     :cond_2
     const-string p1, "msgStyle"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p2
 .end method
@@ -1012,13 +1012,17 @@
 .method public final display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "notificationData"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "settings"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/fcm/NotificationRenderer;->displayAndUpdateCache(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
@@ -1044,37 +1048,18 @@
 
     :goto_0
     return-void
-
-    :cond_0
-    const-string p1, "settings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "notificationData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final displayInApp(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "notificationData"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/utilities/fcm/NotificationData;->getChannelId()J
 
@@ -1119,13 +1104,13 @@
     move-object v5, v1
 
     :goto_1
-    invoke-static {v4}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v4}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
-    invoke-static {v5}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v5}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -1173,158 +1158,130 @@
     invoke-static/range {v2 .. v11}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;->enqueue$default(Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/net/Uri;ILjava/util/List;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "notificationData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final displaySent(Landroid/content/Context;JLjava/lang/CharSequence;ZI)V
-    .locals 13
+    .locals 14
 
     move-object v0, p1
 
-    move/from16 v1, p6
+    move-object/from16 v1, p4
 
-    const/4 v2, 0x0
+    move/from16 v2, p6
 
-    if-eqz v0, :cond_2
+    const-string v3, "context"
 
-    if-eqz p4, :cond_1
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "channelName"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p5, :cond_0
 
-    const v2, 0x7f121000
+    const v3, 0x7f12102a
 
     goto :goto_0
 
     :cond_0
-    const v2, 0x7f120fff
+    const v3, 0x7f121029
 
     :goto_0
-    sget-object v3, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
+    sget-object v4, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
 
-    move-wide v4, p2
+    move-wide/from16 v5, p2
 
-    invoke-virtual {v3, p1, v4, v5}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->delete(Landroid/content/Context;J)Landroid/content/Intent;
+    invoke-virtual {v4, p1, v5, v6}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->delete(Landroid/content/Context;J)Landroid/content/Intent;
 
-    move-result-object v3
+    move-result-object v4
+
+    const/4 v12, 0x0
+
+    const/high16 v13, 0x8000000
+
+    invoke-static {p1, v12, v4, v13}, Landroid/app/PendingIntent;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
+
+    move-result-object v4
+
+    const-wide/16 v7, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x6
 
     const/4 v11, 0x0
 
-    const/high16 v12, 0x8000000
-
-    invoke-static {p1, v11, v3, v12}, Landroid/app/PendingIntent;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
-
-    move-result-object v3
-
-    const-wide/16 v6, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x6
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v4 .. v10}, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders;->selectChannel$default(JJLjava/lang/Long;ILjava/lang/Object;)Landroid/content/Intent;
-
-    move-result-object v4
-
-    const-class v5, Lcom/discord/app/AppActivity$Main;
-
-    invoke-virtual {v4, p1, v5}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
-
-    invoke-static {p1, v11, v4, v12}, Landroid/app/PendingIntent;->getActivity(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
-
-    move-result-object v4
-
-    new-instance v5, Landroidx/core/app/NotificationCompat$Builder;
-
-    const-string v6, "Messages"
-
-    invoke-direct {v5, p1, v6}, Landroidx/core/app/NotificationCompat$Builder;-><init>(Landroid/content/Context;Ljava/lang/String;)V
-
-    const/4 v6, 0x1
-
-    invoke-virtual {v5, v6}, Landroidx/core/app/NotificationCompat$Builder;->setAutoCancel(Z)Landroidx/core/app/NotificationCompat$Builder;
+    invoke-static/range {v5 .. v11}, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders;->selectChannel$default(JJLjava/lang/Long;ILjava/lang/Object;)Landroid/content/Intent;
 
     move-result-object v5
 
-    const v7, 0x7f080368
+    const-class v6, Lcom/discord/app/AppActivity$Main;
 
-    invoke-virtual {v5, v7}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
+    invoke-virtual {v5, p1, v6}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
+
+    invoke-static {p1, v12, v5, v13}, Landroid/app/PendingIntent;->getActivity(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
 
     move-result-object v5
 
-    const-string v7, "msg"
+    new-instance v6, Landroidx/core/app/NotificationCompat$Builder;
 
-    invoke-virtual {v5, v7}, Landroidx/core/app/NotificationCompat$Builder;->setCategory(Ljava/lang/String;)Landroidx/core/app/NotificationCompat$Builder;
+    const-string v7, "Messages"
 
-    move-result-object v5
+    invoke-direct {v6, p1, v7}, Landroidx/core/app/NotificationCompat$Builder;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    new-array v6, v6, [Ljava/lang/Object;
+    const/4 v7, 0x1
 
-    aput-object p4, v6, v11
+    invoke-virtual {v6, v7}, Landroidx/core/app/NotificationCompat$Builder;->setAutoCancel(Z)Landroidx/core/app/NotificationCompat$Builder;
 
-    invoke-virtual {p1, v2, v6}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    move-result-object v6
 
-    move-result-object v2
+    const v8, 0x7f08036b
 
-    invoke-virtual {v5, v2}, Landroidx/core/app/NotificationCompat$Builder;->setContentText(Ljava/lang/CharSequence;)Landroidx/core/app/NotificationCompat$Builder;
+    invoke-virtual {v6, v8}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
-    move-result-object v2
+    move-result-object v6
 
-    invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setDeleteIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
+    const-string v8, "msg"
 
-    move-result-object v2
+    invoke-virtual {v6, v8}, Landroidx/core/app/NotificationCompat$Builder;->setCategory(Ljava/lang/String;)Landroidx/core/app/NotificationCompat$Builder;
 
-    invoke-virtual {v2, v4}, Landroidx/core/app/NotificationCompat$Builder;->setContentIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
+    move-result-object v6
 
-    move-result-object v2
+    new-array v7, v7, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Landroidx/core/app/NotificationCompat$Builder;->build()Landroid/app/Notification;
+    aput-object v1, v7, v12
 
-    move-result-object v2
+    invoke-virtual {p1, v3, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v6, v1}, Landroidx/core/app/NotificationCompat$Builder;->setContentText(Ljava/lang/CharSequence;)Landroidx/core/app/NotificationCompat$Builder;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v4}, Landroidx/core/app/NotificationCompat$Builder;->setDeleteIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v5}, Landroidx/core/app/NotificationCompat$Builder;->setContentIntent(Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroidx/core/app/NotificationCompat$Builder;->build()Landroid/app/Notification;
+
+    move-result-object v1
 
     invoke-static {p1}, Landroidx/core/app/NotificationManagerCompat;->from(Landroid/content/Context;)Landroidx/core/app/NotificationManagerCompat;
 
     move-result-object v3
 
-    invoke-virtual {v3, v1, v2}, Landroidx/core/app/NotificationManagerCompat;->notify(ILandroid/app/Notification;)V
+    invoke-virtual {v3, v2, v1}, Landroidx/core/app/NotificationManagerCompat;->notify(ILandroid/app/Notification;)V
 
-    move-object v3, p0
+    move-object v1, p0
 
-    invoke-direct {p0, p1, v1}, Lcom/discord/utilities/fcm/NotificationRenderer;->autoDismissNotification(Landroid/content/Context;I)V
+    invoke-direct {p0, p1, v2}, Lcom/discord/utilities/fcm/NotificationRenderer;->autoDismissNotification(Landroid/content/Context;I)V
 
     return-void
-
-    :cond_1
-    move-object v3, p0
-
-    const-string v0, "channelName"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_2
-    move-object v3, p0
-
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public final initNotificationChannels(Landroid/app/Application;)V
@@ -1333,7 +1290,9 @@
         value = 0x1a
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/app/NotificationChannel;
 
@@ -1351,7 +1310,7 @@
 
     new-instance v2, Landroid/app/NotificationChannel;
 
-    const v3, 0x7f1217b7
+    const v3, 0x7f1217e3
 
     invoke-virtual {p1, v3}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1365,7 +1324,7 @@
 
     new-instance v3, Landroid/app/NotificationChannel;
 
-    const v5, 0x7f120ee6
+    const v5, 0x7f120f0c
 
     invoke-virtual {p1, v5}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1377,7 +1336,7 @@
 
     new-instance v5, Landroid/app/NotificationChannel;
 
-    const v7, 0x7f120595
+    const v7, 0x7f120597
 
     invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1389,7 +1348,7 @@
 
     new-instance v7, Landroid/app/NotificationChannel;
 
-    const v8, 0x7f1207b4
+    const v8, 0x7f1207b6
 
     invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1401,7 +1360,7 @@
 
     new-instance v8, Landroid/app/NotificationChannel;
 
-    const v9, 0x7f1207fd
+    const v9, 0x7f1207ff
 
     invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1531,7 +1490,7 @@
 
     const-string v4, "StringBuilder()\n        \u2026)\n            .toString()"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
@@ -1576,20 +1535,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.app.NotificationManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
index d01b831b97..a18c97ec29 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/io/File;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "file"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;->file:Ljava/io/File;
 
     return-void
-
-    :cond_0
-    const-string p1, "file"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
index 1e0f05109d..ec5afeaa2b 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/Exception;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "exception"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
 
     return-void
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
index 724c408bc7..6341d1052e 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
@@ -95,11 +95,11 @@
     const/4 v5, 0x0
 
     :goto_0
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->c()Lo0/g;
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->c()Lp0/g;
 
     move-result-object v6
 
-    invoke-interface {v6}, Lo0/g;->W0()Ljava/io/InputStream;
+    invoke-interface {v6}, Lp0/g;->W0()Ljava/io/InputStream;
 
     move-result-object v6
 
@@ -117,11 +117,11 @@
 
     invoke-direct {v2, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;-><init>(Ljava/io/File;)V
 
-    invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v1, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
 
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     goto :goto_1
 
@@ -138,7 +138,7 @@
 
     invoke-direct {v8, v9}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;-><init>(F)V
 
-    invoke-interface {v7, v8}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v7, v8}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-virtual {v2, v1, v4, v6}, Ljava/io/FileOutputStream;->write([BII)V
     :try_end_0
@@ -164,7 +164,7 @@
 
     invoke-direct {v2, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;-><init>(Ljava/lang/Exception;)V
 
-    invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v1, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
index 6932112d21..78b4ea87ce 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
+        ">;>;"
     }
 .end annotation
 
@@ -75,7 +76,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emitter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;
 
@@ -83,7 +86,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;-><init>(F)V
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -104,13 +107,4 @@
     invoke-virtual {v0, v1}, Lrx/Observable;->R(Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "emitter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
index 8074338ced..38bfa98b7c 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
@@ -57,15 +57,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string p0, "fileUrl"
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string p0, "fileName"
+
+    invoke-static {p2, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "downloadDirectory"
+
+    invoke-static {p3, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
 
@@ -79,37 +85,9 @@
 
     const-string p1, "Observable.create({ emit\u2026.BackpressureMode.BUFFER)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "downloadDirectory"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "fileName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "fileUrl"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic downloadFile$default(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;ILjava/lang/Object;)Lrx/Observable;
@@ -125,7 +103,7 @@
 
     const-string p4, "context.cacheDir"
 
-    invoke-static {p3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-static {p0, p1, p2, p3}, Lcom/discord/utilities/file/DownloadUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
diff --git a/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali b/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali
index bb913b385d..ed17f8b4d0 100644
--- a/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali
@@ -96,36 +96,38 @@
 .end method
 
 .method public static final getIconForFiletype(Landroid/content/Context;Ljava/lang/String;)I
-    .locals 4
+    .locals 3
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "mimeType"
 
-    const-string v1, "image"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    const-string v0, "image"
 
-    const/4 v3, 0x2
+    const/4 v1, 0x0
 
-    invoke-static {p1, v1, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    const/4 v2, 0x2
 
-    move-result v1
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
-    if-eqz v1, :cond_0
+    move-result v0
+
+    if-eqz v0, :cond_0
 
     const p1, 0x7f0402c8
 
     goto :goto_0
 
     :cond_0
-    const-string v1, "video"
+    const-string/jumbo v0, "video"
 
-    invoke-static {p1, v1, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p1
 
@@ -139,25 +141,13 @@
     const p1, 0x7f0402c6
 
     :goto_0
-    invoke-static {p0, p1, v2, v3, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    const/4 v0, 0x0
+
+    invoke-static {p0, p1, v1, v2, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result p0
 
     return p0
-
-    :cond_2
-    const-string p0, "mimeType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getSizeSubtitle(J)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/font/FontUtils.smali b/com.discord/smali/com/discord/utilities/font/FontUtils.smali
index 2013985a31..2ebc2d24f4 100644
--- a/com.discord/smali/com/discord/utilities/font/FontUtils.smali
+++ b/com.discord/smali/com/discord/utilities/font/FontUtils.smali
@@ -39,13 +39,15 @@
 .method public final getSystemFontScaleInt(Landroid/content/ContentResolver;)I
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "contentResolver"
 
-    const/high16 v0, 0x3f800000    # 1.0f
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "font_scale"
+    const-string v0, "font_scale"
 
-    invoke-static {p1, v1, v0}, Landroid/provider/Settings$System;->getFloat(Landroid/content/ContentResolver;Ljava/lang/String;F)F
+    const/high16 v1, 0x3f800000    # 1.0f
+
+    invoke-static {p1, v0, v1}, Landroid/provider/Settings$System;->getFloat(Landroid/content/ContentResolver;Ljava/lang/String;F)F
 
     move-result p1
 
@@ -60,21 +62,14 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "contentResolver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getTargetFontScaleFloat(Landroid/content/Context;)F
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -123,13 +118,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali
index 5768a76918..e8b5d3fb38 100644
--- a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali
+++ b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker$computeScores$1.smali
@@ -73,7 +73,7 @@
 
     check-cast v1, Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -104,7 +104,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -130,7 +130,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {p2}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p2}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali
index 35d5bb15f8..9f570709f4 100644
--- a/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali
+++ b/com.discord/smali/com/discord/utilities/frecency/FrecencyTracker.smali
@@ -63,7 +63,7 @@
 
     iput-boolean p1, p0, Lcom/discord/utilities/frecency/FrecencyTracker;->dirty:Z
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/utilities/frecency/FrecencyTracker;->sortedKeys:Ljava/util/List;
 
@@ -152,13 +152,13 @@
 
     const-string p2, "scores.keys"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/utilities/frecency/FrecencyTracker$computeScores$1;
 
     invoke-direct {p2, p0, v0}, Lcom/discord/utilities/frecency/FrecencyTracker$computeScores$1;-><init>(Lcom/discord/utilities/frecency/FrecencyTracker;Ljava/util/HashMap;)V
 
-    invoke-static {p1, p2}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p1, p2}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -303,7 +303,7 @@
 .end method
 
 .method public final declared-synchronized track(Ljava/lang/Object;J)V
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;J)V"
@@ -326,24 +326,20 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
-    const-string v1, "history[key] ?: emptyList()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p2
 
-    invoke-static {v0, p2}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0, p2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p2
 
     iget p3, p0, Lcom/discord/utilities/frecency/FrecencyTracker;->maxSamples:I
 
-    invoke-static {p2, p3}, Lj0/i/l;->takeLast(Ljava/util/List;I)Ljava/util/List;
+    invoke-static {p2, p3}, Lk0/j/l;->takeLast(Ljava/util/List;I)Ljava/util/List;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali b/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali
index 03bb86b899..963b324e8a 100644
--- a/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/fresco/GrayscalePostprocessor.smali
@@ -25,7 +25,7 @@
 
     const-string v1, "javaClass.simpleName"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
index c877d88ae9..9a75c21012 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
@@ -70,7 +70,9 @@
 .method public static final appHasUsagePermission(Landroid/content/Context;)Z
     .locals 4
 
-    if-eqz p0, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/games/GameDetectionHelper;->isGameDetectionSupported()Z
 
@@ -113,15 +115,6 @@
 
     :cond_1
     return v1
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method private final chooseAppToShow(Landroid/content/Context;Ljava/util/Collection;)Lcom/discord/stores/StoreRunningGame$RunningGame;
@@ -219,6 +212,8 @@
 
     move-result-wide v3
 
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
     invoke-virtual {v1}, Landroid/app/usage/UsageStats;->getLastTimeStamp()J
 
     move-result-wide v5
@@ -251,7 +246,7 @@
 
     const-string v0, "installedAppsMap[it.packageName] ?: return null"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StoreRunningGame$RunningGame;
 
@@ -271,7 +266,7 @@
 
     const-string v1, "appInfo.packageName"
 
-    invoke-static {v6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p2, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 
@@ -281,7 +276,7 @@
 
     const-string p1, "pm.getApplicationIcon(appInfo.packageName)"
 
-    invoke-static {v7, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v2, v0
 
@@ -403,7 +398,7 @@
 
     const-string v3, "it.activityInfo.packageName"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 
@@ -411,7 +406,7 @@
 
     const-string v3, "it.activityInfo.applicationInfo"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -429,27 +424,29 @@
         value = 0x17
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/games/GameDetectionHelper;->appHasUsagePermission(Landroid/content/Context;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_6
+    const/4 v1, 0x0
 
-    sget-object v1, Lcom/discord/utilities/games/GameDetectionHelper;->usageStatsManager:Landroid/app/usage/UsageStatsManager;
+    if-eqz v0, :cond_5
 
-    if-eqz v1, :cond_6
+    sget-object v0, Lcom/discord/utilities/games/GameDetectionHelper;->usageStatsManager:Landroid/app/usage/UsageStatsManager;
+
+    if-eqz v0, :cond_5
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/games/GameDetectionHelper;->loadInstalledApps(Landroid/content/Context;)V
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+    invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
     move-result-wide v2
 
@@ -459,7 +456,7 @@
 
     sget-object v6, Lcom/discord/utilities/games/GameDetectionHelper;->usageStatsManager:Landroid/app/usage/UsageStatsManager;
 
-    if-eqz v6, :cond_5
+    invoke-static {v6}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v6, v4, v5, v2, v3}, Landroid/app/usage/UsageStatsManager;->queryAndAggregateUsageStats(JJ)Ljava/util/Map;
 
@@ -481,7 +478,7 @@
 
     move-result-object v2
 
-    invoke-interface {v1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+    invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
     move-result-wide v3
 
@@ -489,16 +486,16 @@
 
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {p1, v1, v0, v6, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, v6, v1}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     return-void
 
     :cond_0
-    const-string v3, "usageGeneral"
+    const-string/jumbo v3, "usageGeneral"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Ljava/util/LinkedHashMap;
 
@@ -532,7 +529,7 @@
 
     const-string v9, "it.value"
 
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v8, Landroid/app/usage/UsageStats;
 
@@ -592,7 +589,7 @@
     goto :goto_2
 
     :cond_4
-    move-object v4, v0
+    move-object v4, v1
 
     :goto_2
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -601,7 +598,7 @@
 
     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-interface {v1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+    invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
     move-result-wide v4
 
@@ -609,9 +606,9 @@
 
     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v2, v1, v0, v6, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {v2, v0, v1, v6, v1}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -624,18 +621,13 @@
     goto :goto_3
 
     :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    throw v0
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getRunningGame()Lcom/discord/stores/StoreRunningGame;
 
-    :cond_6
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getRunningGame()Lcom/discord/stores/StoreRunningGame;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v0}, Lcom/discord/stores/StoreRunningGame;->setRunningGame(Lcom/discord/stores/StoreRunningGame$RunningGame;)V
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreRunningGame;->setRunningGame(Lcom/discord/stores/StoreRunningGame$RunningGame;)V
 
     sget-object v0, Lcom/discord/utilities/games/GameDetectionService;->Companion:Lcom/discord/utilities/games/GameDetectionService$Companion;
 
@@ -643,19 +635,14 @@
 
     :goto_3
     return-void
-
-    :cond_7
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final isSystemApp(Landroid/content/pm/ApplicationInfo;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "$this$isSystemApp"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget p1, p1, Landroid/content/pm/ApplicationInfo;->flags:I
 
@@ -672,21 +659,14 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "$this$isSystemApp"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setup(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/games/GameDetectionHelper;->isGameDetectionSupported()Z
 
@@ -724,13 +704,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/utilities/games/GameDetectionService$Companion;->stop(Landroid/content/Context;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 69cb54cfe8..cfbb1ad65b 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
@@ -106,13 +106,13 @@
 
     move-result-object v2
 
-    const v3, 0x7f080365
+    const v3, 0x7f080368
 
     invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v2
 
-    const v3, 0x7f1205ad
+    const v3, 0x7f1205af
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -124,7 +124,7 @@
 
     if-nez p2, :cond_0
 
-    const p2, 0x7f1207fd
+    const p2, 0x7f1207ff
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -133,7 +133,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f1207fa
+    const v3, 0x7f1207fc
 
     const/4 v4, 0x1
 
@@ -164,7 +164,7 @@
 
     const-string p2, "NotificationCompat.Build\u2026ntent)\n          .build()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -267,7 +267,9 @@
 .method public final stop(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -278,13 +280,4 @@
     invoke-virtual {p1, v0}, Landroid/content/Context;->stopService(Landroid/content/Intent;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$1.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$1.smali
index 5c498909c7..23ff3f427b 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$1.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$2.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$2.smali
index bc5c1a1f0f..b7c547df52 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$2.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/games/GameDetectionService$onCreate$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GameDetectionService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$4.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$4.smali
index d23412461a..5e1b78dbda 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$4.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/games/GameDetectionService$onCreate$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GameDetectionService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/games/GameDetectionService$onCreate$4;->this$0:Lcom/discord/utilities/games/GameDetectionService;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/games/GameDetectionService;->access$setDetectionSub$p(Lcom/discord/utilities/games/GameDetectionService;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$5.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$5.smali
index f35bda152e..d9824e6155 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$5.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$5.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/games/GameDetectionService$onCreate$5;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GameDetectionService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreRunningGame$RunningGame;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/games/GameDetectionService;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/games/GameDetectionService;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string/jumbo v4, "updateNotification"
+
+    const-string/jumbo v5, "updateNotification(Lcom/discord/stores/StoreRunningGame$RunningGame;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateNotification"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/games/GameDetectionService;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateNotification(Lcom/discord/stores/StoreRunningGame$RunningGame;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/stores/StoreRunningGame$RunningGame;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/games/GameDetectionService;
 
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$6.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$6.smali
index dc5550f910..a47c324374 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$6.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$onCreate$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/games/GameDetectionService$onCreate$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GameDetectionService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/games/GameDetectionService$onCreate$6;->this$0:Lcom/discord/utilities/games/GameDetectionService;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/games/GameDetectionService;->access$setRunningGameSub$p(Lcom/discord/utilities/games/GameDetectionService;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
index b7420e80fe..f8c3f8f8c8 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService.smali
@@ -160,9 +160,9 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    sget-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v0, Lf/a/b/o;->c:Lf/a/b/o;
 
-    invoke-virtual {v0, p0}, Lf/a/b/m;->a(Ljava/lang/Object;)V
+    invoke-virtual {v0, p0}, Lf/a/b/o;->a(Ljava/lang/Object;)V
 
     sget-object v0, Lcom/discord/utilities/games/GameDetectionHelper;->INSTANCE:Lcom/discord/utilities/games/GameDetectionHelper;
 
@@ -256,17 +256,25 @@
 
     and-int/lit8 v1, v1, 0x20
 
-    new-instance v8, Lf/a/b/a0;
+    const-string v8, "onNext"
 
-    move-object v1, v8
+    invoke-static {v5, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "errorClass"
+
+    invoke-static {v3, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v10, Lf/a/b/c0;
+
+    move-object v1, v10
 
     move-object v2, v12
 
     move-object v7, v12
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {v0, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, v10}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -282,43 +290,46 @@
 
     invoke-direct {v10, p0}, Lcom/discord/utilities/games/GameDetectionService$onCreate$5;-><init>(Lcom/discord/utilities/games/GameDetectionService;)V
 
-    const-class v8, Lcom/discord/utilities/games/GameDetectionService;
+    const-class v1, Lcom/discord/utilities/games/GameDetectionService;
 
-    new-instance v1, Lcom/discord/utilities/games/GameDetectionService$onCreate$6;
+    new-instance v2, Lcom/discord/utilities/games/GameDetectionService$onCreate$6;
 
-    invoke-direct {v1, p0}, Lcom/discord/utilities/games/GameDetectionService$onCreate$6;-><init>(Lcom/discord/utilities/games/GameDetectionService;)V
+    invoke-direct {v2, p0}, Lcom/discord/utilities/games/GameDetectionService$onCreate$6;-><init>(Lcom/discord/utilities/games/GameDetectionService;)V
 
-    const/16 v2, 0x34
+    const/16 v3, 0x34
 
-    and-int/lit8 v3, v2, 0x4
+    and-int/lit8 v4, v3, 0x4
 
-    and-int/lit8 v3, v2, 0x8
+    and-int/lit8 v4, v3, 0x8
 
-    if-eqz v3, :cond_2
+    if-eqz v4, :cond_2
 
-    move-object v9, v12
-
-    goto :goto_2
+    move-object v2, v12
 
     :cond_2
-    move-object v9, v1
+    and-int/lit8 v4, v3, 0x10
 
-    :goto_2
-    and-int/lit8 v1, v2, 0x10
+    and-int/lit8 v3, v3, 0x20
 
-    and-int/lit8 v1, v2, 0x20
+    invoke-static {v10, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lf/a/b/a0;
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v6, v1
+    new-instance v3, Lf/a/b/c0;
+
+    move-object v6, v3
 
     move-object v7, v12
 
+    move-object v8, v1
+
+    move-object v9, v2
+
     move-object v11, v12
 
-    invoke-direct/range {v6 .. v12}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v6 .. v12}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
 .end method
@@ -340,9 +351,9 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_1
-    sget-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v0, Lf/a/b/o;->c:Lf/a/b/o;
 
-    invoke-virtual {v0, p0}, Lf/a/b/m;->b(Ljava/lang/Object;)V
+    invoke-virtual {v0, p0}, Lf/a/b/o;->b(Ljava/lang/Object;)V
 
     invoke-super {p0}, Landroid/app/Service;->onDestroy()V
 
diff --git a/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali b/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali
index 86de26358c..c91f01a075 100644
--- a/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali
+++ b/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali
@@ -31,32 +31,35 @@
 
 # virtual methods
 .method public final generateGiftUrl(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
+    .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "giftCode"
 
-    const-string v0, "https://discord.gift/"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "https://discord.gift/"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getTimeString(JLandroid/content/res/Resources;)Ljava/lang/String;
     .locals 3
 
-    if-eqz p3, :cond_1
+    const-string v0, "resources"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
 
@@ -86,7 +89,7 @@
 
     const-string p2, "resources.getQuantityStr\u2026ours_hours, hours, hours)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -113,16 +116,7 @@
 
     const-string p2, "resources.getQuantityStr\u2026s_mins, minutes, minutes)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "resources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/guilds/PublicGuildUtils.smali b/com.discord/smali/com/discord/utilities/guilds/PublicGuildUtils.smali
index 42c8061274..c3890cad6f 100644
--- a/com.discord/smali/com/discord/utilities/guilds/PublicGuildUtils.smali
+++ b/com.discord/smali/com/discord/utilities/guilds/PublicGuildUtils.smali
@@ -35,26 +35,31 @@
 .method public static final isPublicGuildSystemMessage(Lcom/discord/models/domain/ModelMessage;)Z
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getMessageReference()Lcom/discord/models/domain/ModelMessage$MessageReference;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage$MessageReference;->getGuildId()Ljava/lang/Long;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage$MessageReference;->getGuildId()Ljava/lang/Long;
 
     move-result-object v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     const-wide v1, 0x943a6b05080000bL
 
     if-nez v0, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@@ -65,7 +70,7 @@
 
     if-eqz v0, :cond_3
 
-    :goto_0
+    :goto_1
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p0
@@ -82,24 +87,17 @@
 
     if-nez p0, :cond_2
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     const/4 p0, 0x0
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
-    :goto_1
+    :goto_2
     const/4 p0, 0x1
 
-    :goto_2
+    :goto_3
     return p0
-
-    :cond_4
-    const-string p0, "message"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali b/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali
index 38b406e286..5a7ce85ae4 100644
--- a/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali
+++ b/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali
@@ -55,11 +55,13 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getRoleColor"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuildRole;->isDefaultColor()Z
 
@@ -80,20 +82,6 @@
 
     :goto_0
     return p0
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$getRoleColor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic getRoleColor$default(Lcom/discord/models/domain/ModelGuildRole;Landroid/content/Context;IILjava/lang/Object;)I
diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
index 3ad4b8bc31..df3115fbb7 100644
--- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
+++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
@@ -71,9 +71,9 @@
 
     move-object v5, v0
 
-    check-cast v5, Lj0/i/q;
+    check-cast v5, Lk0/j/q;
 
-    invoke-virtual {v5}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v5}, Lk0/j/q;->nextInt()I
 
     move-result v5
 
@@ -856,13 +856,13 @@
 
     move-result v0
 
-    if-nez v0, :cond_8
+    if-nez v0, :cond_7
 
-    if-eqz p0, :cond_8
+    if-eqz p0, :cond_7
 
     const-string v0, "ICON_UNSET"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -944,31 +944,26 @@
     goto :goto_3
 
     :cond_3
-    if-eqz p3, :cond_5
+    if-eqz p3, :cond_4
 
-    if-eqz p1, :cond_4
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const/4 p3, 0x2
 
     const-string v1, "a_"
 
-    invoke-static {p1, v1, v2, p3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, v1, v2, p3}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p3
 
-    if-eqz p3, :cond_5
+    if-eqz p3, :cond_4
 
     const-string p3, "gif"
 
     goto :goto_2
 
     :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p2
-
-    :cond_5
-    const-string p3, "webp"
+    const-string/jumbo p3, "webp"
 
     :goto_2
     new-instance v1, Ljava/lang/StringBuilder;
@@ -1000,7 +995,7 @@
     :goto_3
     invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    if-eqz p4, :cond_6
+    if-eqz p4, :cond_5
 
     invoke-virtual {p4}, Ljava/lang/Number;->intValue()I
 
@@ -1012,12 +1007,12 @@
 
     move-result-object p2
 
-    :cond_6
-    if-eqz p2, :cond_7
+    :cond_5
+    if-eqz p2, :cond_6
 
     goto :goto_4
 
-    :cond_7
+    :cond_6
     const-string p2, ""
 
     :goto_4
@@ -1029,7 +1024,7 @@
 
     return-object p0
 
-    :cond_8
+    :cond_7
     :goto_5
     return-object p2
 .end method
@@ -1326,7 +1321,7 @@
 
     const-string p3, "a_"
 
-    invoke-static {p1, p3, v1, p2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, p3, v1, p2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p2
 
@@ -1337,7 +1332,7 @@
     goto :goto_1
 
     :cond_3
-    const-string p2, "webp"
+    const-string/jumbo p2, "webp"
 
     :goto_1
     new-instance p3, Ljava/lang/StringBuilder;
@@ -1606,12 +1601,16 @@
         .end annotation
     .end param
 
+    const-string v0, "imageView"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "changeDetector"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_2
-
-    if-eqz p3, :cond_1
-
     const/4 v1, 0x2
 
     invoke-static {p1, v0, v1, v0}, Lcom/discord/utilities/icon/IconUtils;->getForChannel$default(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
@@ -1642,20 +1641,6 @@
     invoke-virtual {p0, v0}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_1
-    const-string p0, "changeDetector"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "imageView"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelGuild;)V
@@ -1733,43 +1718,49 @@
 .end method
 
 .method public static final setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelGuild;ILcom/discord/utilities/images/MGImages$ChangeDetector;Z)V
-    .locals 8
+    .locals 14
     .param p2    # I
         .annotation build Landroidx/annotation/DimenRes;
         .end annotation
     .end param
 
-    const/4 v7, 0x0
+    move-object v7, p0
 
-    if-eqz p0, :cond_2
+    const-string v0, "imageView"
 
-    if-eqz p3, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const-string v0, "changeDetector"
 
-    const/4 v3, 0x0
+    move-object/from16 v4, p3
 
-    const/16 v4, 0xa
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v5, 0x0
+    const/4 v9, 0x0
 
-    move-object v0, p1
+    const/4 v11, 0x0
 
-    move v2, p4
+    const/16 v12, 0xa
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    const/4 v13, 0x0
+
+    move-object v8, p1
+
+    move/from16 v10, p4
+
+    invoke-static/range {v8 .. v13}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
+    const/4 v3, 0x0
+
     const/16 v5, 0x8
 
     const/4 v6, 0x0
 
     move-object v0, p0
 
-    move v2, p2
-
-    move-object v4, p3
+    move/from16 v2, p2
 
     invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
@@ -1777,26 +1768,17 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v0
+
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {p0, v7}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-virtual {p0, v0}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_1
-    const-string v0, "changeDetector"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_2
-    const-string v0, "imageView"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
 .end method
 
 .method public static final setIcon(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;)V
@@ -1914,12 +1896,18 @@
 
     move v0, p2
 
+    const-string v1, "imageView"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "changeDetector"
+
+    move-object/from16 v6, p4
+
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v11, 0x0
 
-    if-eqz v9, :cond_5
-
-    if-eqz p4, :cond_4
-
     const v1, 0x7f07005d
 
     if-eq v0, v1, :cond_0
@@ -2006,20 +1994,6 @@
     invoke-virtual {p0, v11}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_4
-    const-string v0, "changeDetector"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v11
-
-    :cond_5
-    const-string v0, "imageView"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v11
 .end method
 
 .method public static final setIcon(Landroid/widget/ImageView;Ljava/lang/String;)V
@@ -2179,11 +2153,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "imageView"
 
-    if-eqz p0, :cond_1
+    move-object v1, p0
 
-    if-eqz p6, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "changeDetector"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x0
 
@@ -2191,8 +2171,6 @@
 
     const/4 v10, 0x0
 
-    move-object v1, p0
-
     move-object v2, p1
 
     move v3, p2
@@ -2203,25 +2181,9 @@
 
     move-object/from16 v6, p5
 
-    move-object/from16 v7, p6
-
     invoke-static/range {v1 .. v10}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "changeDetector"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "imageView"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setIcon(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;)V
@@ -2285,11 +2247,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "imageView"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "changeDetector"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/ImageView;->getResources()Landroid/content/res/Resources;
 
@@ -2320,20 +2284,6 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "changeDetector"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "imageView"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelChannel;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
@@ -2535,7 +2485,9 @@
 .method public final getApplicationIcon(JLjava/lang/String;I)Ljava/lang/String;
     .locals 2
 
-    if-eqz p3, :cond_0
+    const-string v0, "imageId"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -2564,52 +2516,43 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "imageId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getAssetImage(Ljava/lang/Long;Ljava/lang/String;I)Ljava/lang/String;
-    .locals 5
+    .locals 4
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "DefaultLocale"
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "imageId"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/16 v1, 0x3a
+    const/16 v0, 0x3a
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {p2, v1, v2, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
+    invoke-static {p2, v0, v1, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
     const/4 p1, 0x1
 
     new-array p3, p1, [C
 
-    aput-char v1, p3, v2
+    aput-char v0, p3, v1
 
-    invoke-static {p2, p3, v2, v3, v3}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {p2, p3, v1, v2, v2}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
     move-result-object p2
 
-    invoke-interface {p2, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {p2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object p3
 
@@ -2623,7 +2566,7 @@
 
     const-string v0, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2633,16 +2576,16 @@
 
     invoke-direct {p0, p3, p1}, Lcom/discord/utilities/icon/IconUtils;->getAssetPlatformUrl(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2673,18 +2616,15 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_2
+    const/4 p1, 0x0
+
     :goto_0
-    return-object v0
-
-    :cond_3
-    const-string p1, "imageId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public final getBannerForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Ljava/lang/String;
@@ -2862,7 +2802,7 @@
     return-object v0
 
     :cond_0
-    if-eqz p4, :cond_8
+    if-eqz p4, :cond_7
 
     invoke-virtual {p4}, Ljava/lang/Number;->intValue()I
 
@@ -2887,11 +2827,7 @@
 
     move-result v7
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->compare(II)I
-
-    move-result v6
-
-    if-lez v6, :cond_1
+    if-le v6, v7, :cond_1
 
     const/4 v6, 0x1
 
@@ -2903,6 +2839,8 @@
     :goto_1
     if-eqz v6, :cond_2
 
+    move-object v0, v5
+
     goto :goto_2
 
     :cond_2
@@ -2911,12 +2849,10 @@
     goto :goto_0
 
     :cond_3
-    move-object v5, v0
-
     :goto_2
-    if-eqz v5, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result p4
 
@@ -2925,7 +2861,9 @@
     :cond_4
     sget-object p4, Lcom/discord/utilities/icon/IconUtils;->MEDIA_PROXY_SIZES:[Ljava/lang/Integer;
 
-    if-eqz p4, :cond_7
+    const-string v0, "$this$last"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p4
 
@@ -2963,13 +2901,6 @@
     throw p1
 
     :cond_7
-    const-string p1, "$this$last"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
     :goto_4
     const-string p4, "?"
 
@@ -2977,7 +2908,7 @@
 
     move-result-object p4
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_8
 
     invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
 
@@ -2999,15 +2930,15 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_8
 
     goto :goto_5
 
-    :cond_9
+    :cond_8
     const-string v0, "keep_aspect_ratio=true"
 
     :goto_5
-    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -3041,9 +2972,11 @@
 .method public final getGuildSplashUrl(JLjava/lang/String;Ljava/lang/Integer;)Ljava/lang/String;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "splashHash"
 
-    if-eqz p3, :cond_5
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     if-eqz p4, :cond_0
 
@@ -3165,13 +3098,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_5
-    const-string p1, "splashHash"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getGuildSplashUrl(Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Ljava/lang/String;
@@ -3216,19 +3142,23 @@
 .end method
 
 .method public final getResourceUriString(Landroid/content/Context;I)Ljava/lang/String;
-    .locals 1
+    .locals 2
     .param p2    # I
         .annotation build Landroidx/annotation/DrawableRes;
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
 
-    const-string v0, "android.resource://"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "android.resource://"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -3247,15 +3177,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getVoiceRegionIconResourceId(Ljava/lang/String;)I
@@ -3285,7 +3206,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080448
+    const p1, 0x7f08044b
 
     goto/16 :goto_3
 
@@ -3298,7 +3219,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080455
+    const p1, 0x7f080458
 
     goto/16 :goto_3
 
@@ -3311,12 +3232,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080458
+    const p1, 0x7f08045b
 
     goto/16 :goto_3
 
     :sswitch_3
-    const-string v0, "us-west"
+    const-string/jumbo v0, "us-west"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -3327,7 +3248,7 @@
     goto/16 :goto_0
 
     :sswitch_4
-    const-string v0, "us-east"
+    const-string/jumbo v0, "us-east"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -3346,7 +3267,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080451
+    const p1, 0x7f080454
 
     goto/16 :goto_3
 
@@ -3359,7 +3280,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080444
+    const p1, 0x7f080447
 
     goto :goto_3
 
@@ -3372,7 +3293,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08045d
+    const p1, 0x7f080460
 
     goto :goto_3
 
@@ -3385,7 +3306,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080450
+    const p1, 0x7f080453
 
     goto :goto_3
 
@@ -3398,12 +3319,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08045b
+    const p1, 0x7f08045e
 
     goto :goto_3
 
     :sswitch_a
-    const-string v0, "us-central"
+    const-string/jumbo v0, "us-central"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -3433,12 +3354,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08045e
+    const p1, 0x7f080461
 
     goto :goto_3
 
     :sswitch_d
-    const-string v0, "us-south"
+    const-string/jumbo v0, "us-south"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -3447,7 +3368,7 @@
     if-eqz p1, :cond_1
 
     :goto_0
-    const p1, 0x7f08044b
+    const p1, 0x7f08044e
 
     goto :goto_3
 
@@ -3461,13 +3382,13 @@
     if-eqz p1, :cond_1
 
     :goto_1
-    const p1, 0x7f08044d
+    const p1, 0x7f080450
 
     goto :goto_3
 
     :cond_1
     :goto_2
-    const p1, 0x7f080463
+    const p1, 0x7f080466
 
     :goto_3
     return p1
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali b/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali
index 49d503fc24..f79bc8d442 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$AlwaysUpdateChangeDetector.smali
@@ -47,18 +47,11 @@
 .method public track(Ljava/lang/Object;Ljava/lang/Object;)Z
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "key"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali b/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali
index 2dae476cfa..3b4f9f8288 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$DistinctChangeDetector.smali
@@ -50,7 +50,9 @@
 .method public track(Ljava/lang/Object;Ljava/lang/Object;)Z
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;->dataMap:Ljava/util/HashMap;
 
@@ -66,7 +68,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -84,13 +86,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_1
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 5a3b463a16..cba023b67d 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
@@ -45,7 +45,7 @@
 
     if-eqz v0, :cond_0
 
-    const v3, 0x7f12164e    # 1.941831E38f
+    const v3, 0x7f121678
 
     const/4 v4, 0x1
 
@@ -69,7 +69,7 @@
     :goto_0
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages.smali b/com.discord/smali/com/discord/utilities/images/MGImages.smali
index d583d13ccd..59f82b75b9 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages.smali
@@ -57,11 +57,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.facebook.drawee.view.DraweeView<*>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -105,11 +105,11 @@
     return-object p1
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.facebook.drawee.generic.GenericDraweeHierarchy"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -117,7 +117,9 @@
 .method public static final getImageRequest(Ljava/lang/String;IIZ)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
     .locals 3
 
-    if-eqz p0, :cond_4
+    const-string/jumbo v0, "url"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
@@ -133,7 +135,7 @@
 
     const-string v1, "requestBuilder"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -143,7 +145,7 @@
 
     const-string v2, "gif"
 
-    invoke-static {p0, v2, v1, p3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p0, v2, v1, p3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p0
 
@@ -180,19 +182,10 @@
 
     :cond_3
     return-object v0
-
-    :cond_4
-    const-string p0, "url"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final prepareImageUpload(Landroid/net/Uri;Ljava/lang/String;Landroidx/fragment/app/FragmentManager;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Lrx/functions/Action1;Lcom/discord/dialogs/ImageUploadDialog$PreviewType;)V
-    .locals 2
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -208,28 +201,52 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p0, :cond_5
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_4
+    const-string v1, "mimeType"
 
-    if-eqz p2, :cond_3
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v2, "fragmentManager"
 
-    if-eqz p5, :cond_1
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog;->n:Lcom/discord/dialogs/ImageUploadDialog$b;
+    const-string v3, "provider"
 
-    if-eqz v1, :cond_0
+    invoke-static {p3, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "previewType"
+
+    invoke-static {p5, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->n:Lcom/discord/dialogs/ImageUploadDialog$b;
+
+    if-eqz v5, :cond_0
+
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p5, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/dialogs/ImageUploadDialog;
 
     invoke-direct {v0}, Lcom/discord/dialogs/ImageUploadDialog;-><init>()V
 
+    const-string v1, "<set-?>"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p0, v0, Lcom/discord/dialogs/ImageUploadDialog;->h:Landroid/net/Uri;
 
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p3, v0, Lcom/discord/dialogs/ImageUploadDialog;->i:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
     iput-object p1, v0, Lcom/discord/dialogs/ImageUploadDialog;->j:Ljava/lang/String;
@@ -249,52 +266,21 @@
     return-void
 
     :cond_0
-    throw v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "previewType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "provider"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "fragmentManager"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "mimeType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p0
 .end method
 
 .method public static final requestAvatarCrop(Landroid/content/Context;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "provider"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "inputUri"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v6, Lf/n/a/a;
 
@@ -346,14 +332,14 @@
 
     invoke-virtual {v1, v2, v0}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    const/16 v3, 0x400
-
-    const/16 v4, 0x400
-
     new-instance v5, Lcom/discord/utilities/images/MGImages$requestAvatarCrop$1;
 
     invoke-direct {v5, p0}, Lcom/discord/utilities/images/MGImages$requestAvatarCrop$1;-><init>(Landroid/content/Context;)V
 
+    const/16 v3, 0x400
+
+    const/16 v4, 0x400
+
     move-object v1, p1
 
     move-object v2, p2
@@ -361,20 +347,6 @@
     invoke-static/range {v1 .. v6}, Lcom/miguelgaeta/media_picker/MediaPicker;->startForImageCrop(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Landroid/net/Uri;IILcom/miguelgaeta/media_picker/MediaPicker$OnError;Lf/n/a/a;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "inputUri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "provider"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final requestDataUrl(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lrx/functions/Action1;)V
@@ -391,19 +363,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p0, :cond_1
 
-    const/16 v1, 0xc
+    const/16 v0, 0xc
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    const v3, 0x7f120274
+    const v2, 0x7f120274
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
@@ -454,7 +430,7 @@
 
     :cond_0
     :goto_0
-    invoke-static {p1, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {p1, v3}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
     :try_end_3
     .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_1
     .catch Ljava/lang/NullPointerException; {:try_start_3 .. :try_end_3} :catch_0
@@ -464,7 +440,7 @@
     :catch_0
     move-exception p1
 
-    new-array p2, v2, [Ljava/lang/Object;
+    new-array p2, v1, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Ljava/lang/NullPointerException;->getMessage()Ljava/lang/String;
 
@@ -472,18 +448,18 @@
 
     aput-object p1, p2, v4
 
-    invoke-virtual {p0, v3, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p0, p1, v4, v0, v1}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p0, p1, v4, v3, v0}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     goto :goto_1
 
     :catch_1
     move-exception p1
 
-    new-array p2, v2, [Ljava/lang/Object;
+    new-array p2, v1, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
 
@@ -491,29 +467,15 @@
 
     aput-object p1, p2, v4
 
-    invoke-virtual {p0, v3, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p0, p1, v4, v0, v1}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p0, p1, v4, v3, v0}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_1
     :goto_1
     return-void
-
-    :cond_2
-    const-string p0, "mimeType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setCornerRadius(Landroid/widget/ImageView;FZLjava/lang/Integer;)V
@@ -525,7 +487,9 @@
 
     sget-object v0, Lf/g/g/f/c$a;->d:Lf/g/g/f/c$a;
 
-    if-eqz p0, :cond_a
+    const-string/jumbo v1, "view"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
@@ -572,7 +536,7 @@
 
     if-ne p2, v2, :cond_2
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-boolean v1, p1, Lf/g/g/f/c;->i:Z
 
@@ -581,7 +545,7 @@
 
     invoke-virtual {p3}, Ljava/lang/Number;->intValue()I
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I
 
@@ -713,15 +677,6 @@
 
     :cond_9
     return-void
-
-    :cond_a
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setCornerRadius$default(Landroid/widget/ImageView;FZLjava/lang/Integer;ILjava/lang/Object;)V
@@ -746,11 +701,13 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "changeDetector"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -780,20 +737,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "changeDetector"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setImage(Landroid/widget/ImageView;Ljava/lang/String;)V
@@ -1019,30 +962,36 @@
 
     move-object/from16 v6, p6
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "view"
 
-    if-eqz v0, :cond_5
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_4
+    const-string v2, "changeDetector"
 
-    if-eqz p7, :cond_3
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "customImageFormats"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v6, p0, p1}, Lcom/discord/utilities/images/MGImages$ChangeDetector;->track(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v3
+    move-result v2
 
-    if-nez v3, :cond_0
+    if-nez v2, :cond_0
 
     return-void
 
     :cond_0
     if-eqz v1, :cond_2
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
     goto :goto_0
 
@@ -1089,31 +1038,12 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v2}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/interfaces/DraweeController;)V
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/interfaces/DraweeController;)V
 
     :goto_1
     return-void
-
-    :cond_3
-    const-string v0, "customImageFormats"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_4
-    const-string v0, "changeDetector"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_5
-    const-string v0, "view"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public static final setImage(Landroid/widget/ImageView;[Ljava/lang/String;)V
@@ -1399,15 +1329,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p0, :cond_d
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_c
+    const-string/jumbo v0, "urls"
 
-    if-eqz p6, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_a
+    const-string v0, "changeDetector"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "customImageFormats"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p6, p0, p1}, Lcom/discord/utilities/images/MGImages$ChangeDetector;->track(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -1420,9 +1356,9 @@
     :cond_0
     array-length p6, p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     if-nez p6, :cond_1
 
@@ -1434,6 +1370,8 @@
     const/4 p6, 0x0
 
     :goto_0
+    const/4 v2, 0x0
+
     if-eqz p6, :cond_2
 
     sget-object p1, Lcom/discord/utilities/images/MGImages;->INSTANCE:Lcom/discord/utilities/images/MGImages;
@@ -1442,7 +1380,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0, v0}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/interfaces/DraweeController;)V
+    invoke-virtual {p0, v2}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/interfaces/DraweeController;)V
 
     return-void
 
@@ -1486,7 +1424,7 @@
     goto :goto_1
 
     :cond_4
-    new-array p1, v1, [Lcom/facebook/imagepipeline/request/ImageRequest;
+    new-array p1, v0, [Lcom/facebook/imagepipeline/request/ImageRequest;
 
     invoke-virtual {p6, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
@@ -1516,7 +1454,7 @@
 
     iput-object p7, p3, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->h:Lcom/facebook/drawee/controller/ControllerListener;
 
-    iput-boolean v2, p3, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->k:Z
+    iput-boolean v1, p3, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->k:Z
 
     array-length p4, p1
 
@@ -1532,11 +1470,11 @@
     :goto_2
     const-string p5, "No requests specified!"
 
-    invoke-static {p4, p5}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {p4, p5}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     iput-object p1, p3, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->f:[Ljava/lang/Object;
 
-    iput-boolean v2, p3, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->g:Z
+    iput-boolean v1, p3, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->g:Z
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -1582,7 +1520,7 @@
     goto :goto_3
 
     :cond_6
-    new-array p4, v1, [Lcom/discord/utilities/apng/ApngDrawableFactory;
+    new-array p4, v0, [Lcom/discord/utilities/apng/ApngDrawableFactory;
 
     invoke-virtual {p1, p4}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
@@ -1627,49 +1565,21 @@
     return-void
 
     :cond_7
-    throw v0
+    throw v2
 
     :cond_8
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
-    invoke-direct {p0, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 
     :cond_9
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
-    invoke-direct {p0, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_a
-    const-string p0, "customImageFormats"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p0, "changeDetector"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p0, "urls"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
@@ -1754,7 +1664,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     goto :goto_5
 
@@ -1864,7 +1774,7 @@
 
     if-eqz v0, :cond_6
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     goto :goto_6
 
@@ -1913,11 +1823,13 @@
 .method public static final setScaleType(Landroid/widget/ImageView;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "scaleType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/images/MGImages;->INSTANCE:Lcom/discord/utilities/images/MGImages;
 
@@ -1934,30 +1846,16 @@
     invoke-virtual {p0, p1}, Lf/g/g/e/p;->r(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "scaleType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "view"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public final centerBitmapInTransparentBitmap(Landroid/graphics/Bitmap;IIII)Landroid/graphics/Bitmap;
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "src"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-le p5, p3, :cond_0
 
@@ -1965,31 +1863,31 @@
 
     invoke-virtual {p1}, Landroid/graphics/Bitmap;->getConfig()Landroid/graphics/Bitmap$Config;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {p5, p4, v1}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
+    invoke-static {p5, p4, v0}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Landroid/graphics/Canvas;
+    new-instance v1, Landroid/graphics/Canvas;
 
-    invoke-direct {v2, v1}, Landroid/graphics/Canvas;-><init>(Landroid/graphics/Bitmap;)V
+    invoke-direct {v1, v0}, Landroid/graphics/Canvas;-><init>(Landroid/graphics/Bitmap;)V
 
     sub-int/2addr p5, p3
 
     int-to-float p5, p5
 
-    const/high16 v3, 0x40000000    # 2.0f
+    const/high16 v2, 0x40000000    # 2.0f
 
-    div-float/2addr p5, v3
+    div-float/2addr p5, v2
 
     sub-int/2addr p4, p2
 
     int-to-float p4, p4
 
-    div-float/2addr p4, v3
+    div-float/2addr p4, v2
 
-    new-instance v3, Landroid/graphics/RectF;
+    new-instance v2, Landroid/graphics/RectF;
 
     int-to-float p3, p3
 
@@ -1999,15 +1897,17 @@
 
     add-float/2addr p2, p4
 
-    invoke-direct {v3, p5, p4, p3, p2}, Landroid/graphics/RectF;-><init>(FFFF)V
+    invoke-direct {v2, p5, p4, p3, p2}, Landroid/graphics/RectF;-><init>(FFFF)V
 
-    invoke-virtual {v2, p1, v0, v3, v0}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;Landroid/graphics/Rect;Landroid/graphics/RectF;Landroid/graphics/Paint;)V
+    const/4 p2, 0x0
+
+    invoke-virtual {v1, p1, p2, v2, p2}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;Landroid/graphics/Rect;Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
     const-string p1, "dest"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v1
+    return-object v0
 
     :cond_0
     new-instance p1, Ljava/lang/IllegalArgumentException;
@@ -2039,25 +1939,22 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "src"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setImage(Landroid/widget/ImageView;Landroid/net/Uri;Lcom/discord/utilities/images/MGImages$ChangeDetector;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string/jumbo v0, "uri"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "changeDetector"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
@@ -2065,7 +1962,7 @@
 
     const-string v1, "android.resource"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2079,15 +1976,15 @@
 
     move-result-object v1
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2099,7 +1996,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {p2}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object p2
 
@@ -2146,25 +2043,4 @@
 
     :goto_1
     return-void
-
-    :cond_2
-    const-string p1, "changeDetector"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CloseableBitmaps.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CloseableBitmaps.smali
index 60950f520a..9cf7604553 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CloseableBitmaps.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$CloseableBitmaps.smali
@@ -5,7 +5,7 @@
 # interfaces
 .implements Ljava/util/Map;
 .implements Ljava/io/Closeable;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -26,7 +26,7 @@
         "Landroid/graphics/Bitmap;",
         ">;",
         "Ljava/io/Closeable;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
@@ -46,7 +46,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/Map;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -57,22 +57,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "underlyingMap"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;->underlyingMap:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "underlyingMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -268,7 +261,9 @@
 .method public containsKey(Ljava/lang/String;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;->underlyingMap:Ljava/util/Map;
 
@@ -277,21 +272,14 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public containsValue(Landroid/graphics/Bitmap;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;->underlyingMap:Ljava/util/Map;
 
@@ -300,15 +288,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final bridge containsValue(Ljava/lang/Object;)Z
@@ -355,7 +334,9 @@
 .method public get(Ljava/lang/String;)Landroid/graphics/Bitmap;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;->underlyingMap:Ljava/util/Map;
 
@@ -366,15 +347,6 @@
     check-cast p1, Landroid/graphics/Bitmap;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final bridge get(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$DecodeException.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$DecodeException.smali
index 4c562ff46a..28d4af480f 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$DecodeException.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$DecodeException.smali
@@ -18,7 +18,9 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "imageUri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -41,13 +43,4 @@
     invoke-direct {p0, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "imageUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageNotFoundException.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageNotFoundException.smali
index 3a641886ce..269d16baeb 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageNotFoundException.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageNotFoundException.smali
@@ -16,26 +16,27 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 1
+    .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "imageUri"
 
-    const-string v0, "404 image not found: "
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "404 image not found: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     invoke-direct {p0, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "imageUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageRequest.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageRequest.smali
index 82cf82679d..84bb0fa683 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageRequest.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$ImageRequest.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "imageUri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-boolean p2, p0, Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;->roundAsCircle:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "imageUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;Ljava/lang/String;ZILjava/lang/Object;)Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;
@@ -89,22 +82,15 @@
 .method public final copy(Ljava/lang/String;Z)Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "imageUri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;-><init>(Ljava/lang/String;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "imageUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;->imageUri:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$MissingBitmapException.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$MissingBitmapException.smali
index c612d99537..92bf1aa77a 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$MissingBitmapException.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$MissingBitmapException.smali
@@ -16,26 +16,27 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 1
+    .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "imageUri"
 
-    const-string v0, "Unable to decode image as bitmap: "
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Unable to decode image as bitmap: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
     invoke-direct {p0, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "imageUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali
index 2b5dcb8e14..527191804b 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali
@@ -74,7 +74,7 @@
 
     const-string v3, "404"
 
-    invoke-static {v0, v3, v1, v2}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v0, v3, v1, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v0
 
@@ -92,7 +92,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/utilities/images/MGImagesBitmap$ImageNotFoundException;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     goto :goto_1
 
@@ -119,7 +119,7 @@
     invoke-direct {p1, v1}, Lcom/discord/utilities/images/MGImagesBitmap$DecodeException;-><init>(Ljava/lang/String;)V
 
     :goto_0
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     :goto_1
     return-void
@@ -136,11 +136,11 @@
 
     move-result-object p1
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$1$1;->$emitter:Lrx/Subscriber;
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     goto :goto_0
 
@@ -155,7 +155,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/utilities/images/MGImagesBitmap$MissingBitmapException;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     :goto_0
     return-void
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1.smali
index 329073e3c4..c2c8c14381 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1.smali
@@ -23,7 +23,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/Observable$a<",
-        "TT;>;"
+        "Landroid/graphics/Bitmap;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1$1.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1$1.smali
index 364ebee4c5..f002282fa0 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1$1.smali
@@ -3,7 +3,7 @@
 .source "MGImagesBitmap.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Landroid/graphics/Bitmap;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/String;",
+        "+",
+        "Landroid/graphics/Bitmap;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.smali
index 234c1f918d..1235500bc5 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.smali
@@ -3,7 +3,7 @@
 .source "MGImagesBitmap.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/String;",
+        "+",
+        "Landroid/graphics/Bitmap;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -79,6 +85,7 @@
             "Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lkotlin/Pair<",
             "Ljava/lang/String;",
             "Landroid/graphics/Bitmap;",
@@ -104,7 +111,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/utilities/images/MGImagesBitmap$getBitmaps$1$1;-><init>(Lcom/discord/utilities/images/MGImagesBitmap$ImageRequest;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$2.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$2.smali
index f4a9b79f57..20cdeae4fa 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$2.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$2.smali
@@ -3,7 +3,7 @@
 .source "MGImagesBitmap.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TK;>;"
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/String;",
+        "+",
+        "Landroid/graphics/Bitmap;",
+        ">;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$3.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$3.smali
index e8e7bb5744..c88b732769 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$3.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$3.smali
@@ -3,7 +3,7 @@
 .source "MGImagesBitmap.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TV;>;"
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/String;",
+        "+",
+        "Landroid/graphics/Bitmap;",
+        ">;",
+        "Landroid/graphics/Bitmap;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$4.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$4.smali
index d739e45e44..5c57477260 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$4.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmaps$4.smali
@@ -3,7 +3,7 @@
 .source "MGImagesBitmap.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "Landroid/graphics/Bitmap;",
+        ">;",
+        "Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;",
+        ">;"
     }
 .end annotation
 
@@ -74,7 +79,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/images/MGImagesBitmap$CloseableBitmaps;-><init>(Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
index da095102f4..0f645d291a 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
@@ -47,9 +47,9 @@
 
     move-result-object p1
 
-    const-string v0, "uri"
+    const-string/jumbo v0, "uri"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
@@ -61,7 +61,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -87,7 +87,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -113,7 +113,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
@@ -154,15 +154,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "imageUri"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/images/MGImagesBitmap;->isValidUri(Ljava/lang/String;)Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
@@ -176,41 +176,43 @@
 
     const-string p2, "Observable.error(Illegal\u2026Exception(\"invalid uri\"))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
     :cond_0
     invoke-static {}, Lf/g/j/e/m;->f()Lf/g/j/e/m;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lf/g/j/e/m;->e()Lf/g/j/e/i;
+    invoke-virtual {v0}, Lf/g/j/e/m;->e()Lf/g/j/e/i;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-static {p1, v1, v1, v1}, Lcom/discord/utilities/images/MGImages;->getImageRequest(Ljava/lang/String;IIZ)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
     move-result-object v1
 
-    const/4 v2, 0x0
-
-    invoke-static {p1, v2, v2, v2}, Lcom/discord/utilities/images/MGImages;->getImageRequest(Ljava/lang/String;IIZ)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
-
-    move-result-object v2
-
     if-eqz p2, :cond_1
 
     new-instance p2, Lcom/discord/utilities/images/RoundAsCirclePostprocessor;
 
     invoke-direct {p2, p1}, Lcom/discord/utilities/images/RoundAsCirclePostprocessor;-><init>(Ljava/lang/String;)V
 
-    iput-object p2, v2, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->j:Lf/g/j/q/b;
+    iput-object p2, v1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->j:Lf/g/j/q/b;
 
     :cond_1
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a()Lcom/facebook/imagepipeline/request/ImageRequest;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a()Lcom/facebook/imagepipeline/request/ImageRequest;
 
     move-result-object p2
 
-    sget-object v2, Lcom/facebook/imagepipeline/request/ImageRequest$b;->d:Lcom/facebook/imagepipeline/request/ImageRequest$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/ImageRequest$b;->d:Lcom/facebook/imagepipeline/request/ImageRequest$b;
 
-    invoke-virtual {v1, p2, v0, v2, v0}, Lf/g/j/e/i;->a(Lcom/facebook/imagepipeline/request/ImageRequest;Ljava/lang/Object;Lcom/facebook/imagepipeline/request/ImageRequest$b;Lf/g/j/k/c;)Lcom/facebook/datasource/DataSource;
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, p2, v2, v1, v2}, Lf/g/j/e/i;->a(Lcom/facebook/imagepipeline/request/ImageRequest;Ljava/lang/Object;Lcom/facebook/imagepipeline/request/ImageRequest$b;Lf/g/j/k/c;)Lcom/facebook/datasource/DataSource;
 
     move-result-object p2
 
@@ -224,16 +226,9 @@
 
     const-string p2, "Observable.unsafeCreate \u2026y emits the bitmap.\n    }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "imageUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getBitmaps(Ljava/util/Set;)Lrx/Observable;
@@ -250,7 +245,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "imageRequests"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -280,7 +277,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -299,7 +296,7 @@
 
     sget-object v0, Lcom/discord/utilities/images/MGImagesBitmap$getBitmaps$1;->INSTANCE:Lcom/discord/utilities/images/MGImagesBitmap$getBitmaps$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -307,17 +304,17 @@
 
     sget-object v1, Lcom/discord/utilities/images/MGImagesBitmap$getBitmaps$3;->INSTANCE:Lcom/discord/utilities/images/MGImagesBitmap$getBitmaps$3;
 
-    invoke-virtual {p1, v0, v1}, Lrx/Observable;->c0(Lr0/k/b;Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0, v1}, Lrx/Observable;->c0(Ls0/k/b;Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/utilities/images/MGImagesBitmap$getBitmaps$4;->INSTANCE:Lcom/discord/utilities/images/MGImagesBitmap$getBitmaps$4;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -327,16 +324,7 @@
 
     const-string v0, "Observable\n        .from\u2026Schedulers.computation())"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "imageRequests"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali b/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
index 45f7b51387..2531db3f52 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
@@ -91,11 +91,11 @@
     return-object v0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.app.ActivityManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -131,7 +131,7 @@
 
     const-string p2, "DiskCacheConfig\n        \u2026HE_SIZE)\n        .build()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -158,46 +158,48 @@
 .method public final init(Landroid/app/Application;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lf/g/j/h/c$b;
+    new-instance v0, Lf/g/j/h/c$b;
 
-    invoke-direct {v1}, Lf/g/j/h/c$b;-><init>()V
+    invoke-direct {v0}, Lf/g/j/h/c$b;-><init>()V
 
-    sget-object v2, Lf/g/i/b;->b:Lf/g/i/c;
+    sget-object v1, Lf/g/i/b;->b:Lf/g/i/c;
 
-    new-instance v3, Lcom/discord/utilities/apng/ApngDecoder;
+    new-instance v2, Lcom/discord/utilities/apng/ApngDecoder;
 
-    invoke-direct {v3}, Lcom/discord/utilities/apng/ApngDecoder;-><init>()V
+    invoke-direct {v2}, Lcom/discord/utilities/apng/ApngDecoder;-><init>()V
 
-    iget-object v4, v1, Lf/g/j/h/c$b;->a:Ljava/util/Map;
+    iget-object v3, v0, Lf/g/j/h/c$b;->a:Ljava/util/Map;
 
-    if-nez v4, :cond_0
+    if-nez v3, :cond_0
 
-    new-instance v4, Ljava/util/HashMap;
+    new-instance v3, Ljava/util/HashMap;
 
-    invoke-direct {v4}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {v3}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v4, v1, Lf/g/j/h/c$b;->a:Ljava/util/Map;
+    iput-object v3, v0, Lf/g/j/h/c$b;->a:Ljava/util/Map;
 
     :cond_0
-    iget-object v4, v1, Lf/g/j/h/c$b;->a:Ljava/util/Map;
+    iget-object v3, v0, Lf/g/j/h/c$b;->a:Ljava/util/Map;
 
-    invoke-interface {v4, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    new-instance v2, Lf/g/j/h/c;
+    new-instance v1, Lf/g/j/h/c;
 
-    invoke-direct {v2, v1, v0}, Lf/g/j/h/c;-><init>(Lf/g/j/h/c$b;Lf/g/j/h/c$a;)V
+    const/4 v2, 0x0
 
-    new-instance v1, Lf/g/j/e/k$a;
+    invoke-direct {v1, v0, v2}, Lf/g/j/h/c;-><init>(Lf/g/j/h/c$b;Lf/g/j/h/c$a;)V
 
-    invoke-direct {v1, p1, v0}, Lf/g/j/e/k$a;-><init>(Landroid/content/Context;Lf/g/j/e/j;)V
+    new-instance v0, Lf/g/j/e/k$a;
+
+    invoke-direct {v0, p1, v2}, Lf/g/j/e/k$a;-><init>(Landroid/content/Context;Lf/g/j/e/j;)V
 
     const/4 v3, 0x1
 
-    iput-boolean v3, v1, Lf/g/j/e/k$a;->c:Z
+    iput-boolean v3, v0, Lf/g/j/e/k$a;->c:Z
 
     const-string v4, "app_images_cache"
 
@@ -205,7 +207,7 @@
 
     move-result-object v4
 
-    iput-object v4, v1, Lf/g/j/e/k$a;->e:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v4, v0, Lf/g/j/e/k$a;->e:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     const-string v4, "app_images_cache_small"
 
@@ -213,7 +215,7 @@
 
     move-result-object v4
 
-    iput-object v4, v1, Lf/g/j/e/k$a;->h:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v4, v0, Lf/g/j/e/k$a;->h:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/images/MGImagesConfig;->getAppBitmapMemoryCacheParamsSupplier(Landroid/content/Context;)Lcom/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier;
 
@@ -221,19 +223,19 @@
 
     if-eqz v4, :cond_2
 
-    iput-object v4, v1, Lf/g/j/e/k$a;->a:Lcom/facebook/common/internal/Supplier;
+    iput-object v4, v0, Lf/g/j/e/k$a;->a:Lcom/facebook/common/internal/Supplier;
 
-    iget-object v1, v1, Lf/g/j/e/k$a;->k:Lf/g/j/e/l$b;
+    iget-object v0, v0, Lf/g/j/e/k$a;->k:Lf/g/j/e/l$b;
 
-    iput-boolean v3, v1, Lf/g/j/e/l$b;->l:Z
+    iput-boolean v3, v0, Lf/g/j/e/l$b;->l:Z
 
-    iget-object v1, v1, Lf/g/j/e/l$b;->a:Lf/g/j/e/k$a;
+    iget-object v0, v0, Lf/g/j/e/l$b;->a:Lf/g/j/e/k$a;
 
-    iput-object v2, v1, Lf/g/j/e/k$a;->i:Lf/g/j/h/c;
+    iput-object v1, v0, Lf/g/j/e/k$a;->i:Lf/g/j/h/c;
 
-    new-instance v2, Lf/g/j/e/k;
+    new-instance v1, Lf/g/j/e/k;
 
-    invoke-direct {v2, v1, v0}, Lf/g/j/e/k;-><init>(Lf/g/j/e/k$a;Lf/g/j/e/j;)V
+    invoke-direct {v1, v0, v2}, Lf/g/j/e/k;-><init>(Lf/g/j/e/k$a;Lf/g/j/e/j;)V
 
     invoke-static {}, Lf/g/j/r/b;->b()Z
 
@@ -243,9 +245,9 @@
 
     sget-object v0, Lf/g/g/a/a/b;->a:Ljava/lang/Class;
 
-    const-string v1, "Fresco has already been initialized! `Fresco.initialize(...)` should only be called 1 single time to avoid memory leaks!"
+    const-string v2, "Fresco has already been initialized! `Fresco.initialize(...)` should only be called 1 single time to avoid memory leaks!"
 
-    invoke-static {v0, v1}, Lf/g/d/e/a;->m(Ljava/lang/Class;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lf/g/d/e/a;->m(Ljava/lang/Class;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -268,7 +270,7 @@
 
     move-result-object p1
 
-    invoke-static {v2}, Lf/g/j/e/m;->k(Lf/g/j/e/k;)V
+    invoke-static {v1}, Lf/g/j/e/m;->k(Lf/g/j/e/k;)V
 
     invoke-static {}, Lf/g/j/r/b;->b()Z
 
@@ -300,14 +302,7 @@
     throw v0
 
     :cond_2
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v2
 .end method
 
 .method public final onTrimMemory(I)V
diff --git a/com.discord/smali/com/discord/utilities/images/RoundAsCirclePostprocessor.smali b/com.discord/smali/com/discord/utilities/images/RoundAsCirclePostprocessor.smali
index 4cb40664ba..9734d5079a 100644
--- a/com.discord/smali/com/discord/utilities/images/RoundAsCirclePostprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/images/RoundAsCirclePostprocessor.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "imageUri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lf/g/j/o/a;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/images/RoundAsCirclePostprocessor;->imageUri:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "imageUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1$1.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1$1.smali
index 95c113dbbe..23bd65a3f3 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyHelper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelActivityMetaData;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1.smali
index 50c96bbf06..accc50eeda 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchAlbum$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyHelper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1.smali
index d00ae95fc7..2cf2506918 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/integrations/SpotifyHelper$launchTrack$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyHelper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali
index 6d4e1595a0..1ced4e571e 100644
--- a/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali
+++ b/com.discord/smali/com/discord/utilities/integrations/SpotifyHelper.smali
@@ -95,7 +95,9 @@
 .method public static final registerSpotifyBroadcastReceivers(Landroid/content/Context;)V
     .locals 3
 
-    if-eqz p0, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/receiver/spotify/SpotifyMetadataReceiver;
 
@@ -122,15 +124,6 @@
     invoke-virtual {p0, v0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
     return-void
-
-    :cond_0
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method private final runIfSpotifyInstalled(Lkotlin/jvm/functions/Function0;Landroid/content/Context;)V
@@ -172,7 +165,9 @@
 .method public final isSpotifyInstalled(Landroid/content/Context;)Z
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -191,21 +186,14 @@
 
     :catch_0
     return v0
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final launchAlbum(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;JZ)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p5, :cond_0
 
@@ -218,13 +206,13 @@
 
     invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivity;->getSessionId()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    if-eqz v3, :cond_1
+    if-eqz v4, :cond_1
 
     const-string p5, "activity?.sessionId ?: return"
 
-    invoke-static {v3, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivity;->getApplicationId()Ljava/lang/Long;
 
@@ -234,41 +222,34 @@
 
     const-string p5, "activity?.applicationId ?: return"
 
-    invoke-static {p2, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v5
 
     new-instance p2, Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$1;
 
-    move-object v0, p2
+    move-object v1, p2
 
-    move-wide v1, p3
+    move-wide v2, p3
 
-    move-object v6, p1
+    move-object v7, p1
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$1;-><init>(JLjava/lang/String;JLandroid/content/Context;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/utilities/integrations/SpotifyHelper$launchAlbum$1;-><init>(JLjava/lang/String;JLandroid/content/Context;)V
 
     invoke-direct {p0, p2, p1}, Lcom/discord/utilities/integrations/SpotifyHelper;->runIfSpotifyInstalled(Lkotlin/jvm/functions/Function0;Landroid/content/Context;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final launchTrack(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -288,21 +269,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final openPlayStoreForSpotify(Landroid/content/Context;)V
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/Thread;
 
@@ -316,34 +290,27 @@
 
     sget-object v2, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
+    const-string v4, "https://play.google.com/store/apps/details?id=com.spotify.music&utm_source=discord&utm_medium=mobile"
+
     const/4 v5, 0x0
 
     const/4 v6, 0x4
 
     const/4 v7, 0x0
 
-    const-string v4, "https://play.google.com/store/apps/details?id=com.spotify.music&utm_source=discord&utm_medium=mobile"
-
     move-object v3, p1
 
     invoke-static/range {v2 .. v7}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Lcom/discord/utilities/uri/UriHandler;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final openSpotifyApp(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -361,13 +328,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$SDK.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$SDK.smali
index f2086fb02d..0ff3d77a26 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$SDK.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$SDK.smali
@@ -42,7 +42,9 @@
 .method public static final join(Ljava/lang/String;JLjava/lang/String;)Landroid/content/Intent;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "deeplink"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
@@ -85,13 +87,4 @@
     invoke-direct {p1, p2, p0}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;)V
 
     return-object p1
-
-    :cond_0
-    const-string p0, "deeplink"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$Uris.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$Uris.smali
index bb8aa676ed..58a91fb0ed 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$Uris.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders$Uris.smali
@@ -52,7 +52,7 @@
 
     const-string v1, "Uri.parse(\"discord://app\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -68,7 +68,7 @@
 
     const-string v1, "Uri.parse(\"discord://action/oauth2/authorize\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -100,7 +100,7 @@
 
     const-string p2, "Uri.parse(\"discord://app\u2026/$guildId/premiumguild/\")"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -116,7 +116,7 @@
 
     const-string v1, "Uri.parse(\"discord://app/settings/billing\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -132,7 +132,7 @@
 
     const-string v1, "Uri.parse(\"discord://app/settings/nitro\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -148,7 +148,7 @@
 
     const-string v1, "Uri.parse(\"discord://app/settings/voice\")"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
index 8e2ebfcb1f..6b42c2ba09 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
@@ -243,9 +243,9 @@
 
     move-result-object v0
 
-    const-string v1, "uri"
+    const-string/jumbo v1, "uri"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
@@ -258,15 +258,15 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v0, Lf/a/b/t0/b;->e:Ljava/lang/String;
+    sget-object v0, Lf/a/b/v0/b;->e:Ljava/lang/String;
 
     const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {p1, v0, v1, v2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v0
 
@@ -330,7 +330,7 @@
 
     const-string p2, "Intent().setData(uriMerged)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -342,9 +342,9 @@
 
     move-result-object v0
 
-    const-string v1, "uri"
+    const-string/jumbo v1, "uri"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
@@ -357,15 +357,15 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v0, Lf/a/b/t0/b;->d:Ljava/lang/String;
+    sget-object v0, Lf/a/b/v0/b;->d:Ljava/lang/String;
 
     const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {p1, v0, v1, v2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v0
 
@@ -429,7 +429,7 @@
 
     const-string p2, "Intent().setData(uriMerged)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.smali
index 43494fa3ae..e5e1362f3e 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/net/Uri;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(Landroid/net/Uri;Z)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "uri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
@@ -123,13 +125,4 @@
     invoke-virtual {v1, p1, p2, v0}, Lcom/discord/utilities/analytics/AppStartAnalyticsTracker;->appOpen(Landroid/net/Uri;ZZ)V
 
     return-void
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1.smali
index a4a2337c64..a0d69cd67f 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/IntentUtils$consumeRoutingIntent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/net/Uri;",
         "Ljava/lang/Boolean;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,16 +78,9 @@
 .method public final invoke(Landroid/net/Uri;Z)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali
index d54497e97e..27ed839a92 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "selectChannel"
+
+    const-string v5, "selectChannel(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectChannel"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectChannel(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$10.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$10.smali
index ccf4025237..43f0be40e5 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$10.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$10.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$10;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "remoteAuth"
+
+    const-string v5, "remoteAuth(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "remoteAuth"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "remoteAuth(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$11.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$11.smali
index 7b75b0ee56..0000bb5750 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$11.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$11.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$11;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "selectPremiumGuild"
+
+    const-string v5, "selectPremiumGuild(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectPremiumGuild"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectPremiumGuild(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$12.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$12.smali
index 2a74025169..a2d13fb71a 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$12.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$12.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$12;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "handleQuery"
+
+    const-string v5, "handleQuery(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleQuery"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleQuery(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$13.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$13.smali
index 3b1c2cca6d..ec82886c49 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$13.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$13.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$13;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string/jumbo v4, "wildCardMatcher"
+
+    const-string/jumbo v5, "wildCardMatcher(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "wildCardMatcher"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "wildCardMatcher(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali
index d096b151db..36af7fabb4 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "navigateToFriendsScreen"
+
+    const-string v5, "navigateToFriendsScreen(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "navigateToFriendsScreen"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "navigateToFriendsScreen(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali
index 394cf00b76..977edefea9 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "selectDirectMessage"
+
+    const-string v5, "selectDirectMessage(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectDirectMessage"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectDirectMessage(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali
index f0fb6ae5f3..81baaa1588 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "selectUserProfile"
+
+    const-string v5, "selectUserProfile(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectUserProfile"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectUserProfile(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali
index b99ce786b2..a71f30839a 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$5;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "selectFeature"
+
+    const-string v5, "selectFeature(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectFeature"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectFeature(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$6.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$6.smali
index ad7c6389d2..f7ebd27320 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$6.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$6.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$6;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "selectFeature"
+
+    const-string v5, "selectFeature(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectFeature"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectFeature(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$7.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$7.smali
index c04449998d..08c8147bf2 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$7.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$7.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$7;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string/jumbo v4, "voiceConnect"
+
+    const-string/jumbo v5, "voiceConnect(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "voiceConnect"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "voiceConnect(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$8.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$8.smali
index 0fdacae214..12af59c099 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$8.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$8.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$8;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "selectLurk"
+
+    const-string v5, "selectLurk(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectLurk"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectLurk(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$9.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$9.smali
index f74f653615..8acc8383bc 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$9.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$pathRouterMap$9.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$9;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "IntentUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "authorize"
+
+    const-string v5, "authorize(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "authorize"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "authorize(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
index d0a690c736..9e7549d5c1 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
@@ -44,9 +44,9 @@
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->t:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->t:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$1;
 
@@ -62,9 +62,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->u:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->u:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$2;
 
@@ -80,9 +80,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->w:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->w:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$3;
 
@@ -98,9 +98,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->x:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->x:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$4;
 
@@ -116,9 +116,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->y:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->y:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$5;
 
@@ -134,9 +134,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->z:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->z:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$6;
 
@@ -152,9 +152,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->s:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->s:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$7;
 
@@ -170,9 +170,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->v:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->v:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$8;
 
@@ -188,9 +188,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->B:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->B:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$9;
 
@@ -206,9 +206,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->C:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->C:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$10;
 
@@ -224,9 +224,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->D:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->D:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$11;
 
@@ -242,9 +242,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->A:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->A:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$12;
 
@@ -260,9 +260,9 @@
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v1, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v1, Lf/a/b/t0/b;->m:Lkotlin/text/Regex;
+    sget-object v1, Lf/a/b/v0/b;->m:Lkotlin/text/Regex;
 
     new-instance v2, Lcom/discord/utilities/intent/IntentUtils$pathRouterMap$13;
 
@@ -325,9 +325,9 @@
 
     move-result-object p1
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v0, Lf/a/b/t0/b;->a:Ljava/lang/String;
+    sget-object v0, Lf/a/b/v0/b;->a:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Landroid/net/Uri$Builder;->authority(Ljava/lang/String;)Landroid/net/Uri$Builder;
 
@@ -343,13 +343,13 @@
 .method private final isHttpDomainUrl(Landroid/net/Uri;)Z
     .locals 3
 
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
 
     new-instance v1, Lkotlin/text/Regex;
 
     const-string v2, "https?"
 
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
@@ -363,19 +363,23 @@
     const-string v0, ""
 
     :goto_0
+    const-string/jumbo v2, "uri.scheme ?: \"\""
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v1, v0}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {v0, p1}, Lf/a/b/t0/b;->a(Ljava/lang/String;)Z
+    invoke-virtual {v0, p1}, Lf/a/b/v0/b;->a(Ljava/lang/String;)Z
 
     move-result p1
 
@@ -550,13 +554,17 @@
 .method public static final performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "text"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "chooserText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
 
@@ -577,27 +585,6 @@
     invoke-virtual {p0, p1}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "chooserText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "text"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic performChooserSendIntent$default(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
@@ -607,7 +594,7 @@
 
     if-eqz p3, :cond_0
 
-    const p2, 0x7f121487
+    const p2, 0x7f1214b1
 
     invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -615,7 +602,7 @@
 
     const-string p3, "context.getString(R.string.share)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
@@ -654,11 +641,13 @@
 .method public final consumeExternalRoutingIntent(Landroid/content/Intent;Landroid/content/Context;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -677,20 +666,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final consumeRoutingIntent(Landroid/content/Intent;Landroid/content/Context;Lkotlin/jvm/functions/Function2;)Z
@@ -710,91 +685,99 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_8
+    const-string v0, "context"
 
-    if-eqz p3, :cond_7
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "callback"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Intent;->getData()Landroid/net/Uri;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
+    sget-object v0, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
     :goto_0
-    const-string v2, "uri"
+    const-string/jumbo v1, "uri"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0, v1}, Lcom/discord/utilities/intent/IntentUtils;->isDiscordAppUri(Landroid/net/Uri;)Z
+    invoke-virtual {p0, v0}, Lcom/discord/utilities/intent/IntentUtils;->isDiscordAppUri(Landroid/net/Uri;)Z
 
-    move-result v2
+    move-result v1
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-nez v2, :cond_2
+    if-nez v1, :cond_2
 
-    invoke-direct {p0, v1}, Lcom/discord/utilities/intent/IntentUtils;->isHttpDomainUrl(Landroid/net/Uri;)Z
+    invoke-direct {p0, v0}, Lcom/discord/utilities/intent/IntentUtils;->isHttpDomainUrl(Landroid/net/Uri;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
     goto :goto_1
 
     :cond_1
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_2
 
     :cond_2
     :goto_1
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :goto_2
-    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-interface {p3, v1, v5}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p3, v0, v4}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
 
     sget-object p3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const-class v2, Lcom/discord/utilities/intent/IntentUtils;
+    const-class v1, Lcom/discord/utilities/intent/IntentUtils;
 
-    invoke-virtual {v2}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v5, "javaClass.simpleName"
+    const-string v4, "javaClass.simpleName"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Landroid/net/Uri;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Landroid/net/Uri;->toString()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    if-eqz v5, :cond_3
+    if-eqz v4, :cond_3
 
     goto :goto_3
 
     :cond_3
-    const-string v5, "<null>"
+    const-string v4, "<null>"
 
     :goto_3
-    invoke-virtual {p3, v2, v5}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
+    const-string/jumbo v5, "uri?.toString() ?: \"<null>\""
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p3, v1, v4}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
 
     sget-object p3, Lcom/discord/utilities/intent/IntentUtils;->pathRouterMap:Ljava/util/Map;
 
@@ -809,52 +792,54 @@
     :cond_4
     invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
 
     invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Ljava/util/Map$Entry;
+    check-cast v1, Ljava/util/Map$Entry;
 
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lkotlin/text/Regex;
+
+    invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlin/jvm/functions/Function3;
+
+    invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
     move-result-object v5
 
-    check-cast v5, Lkotlin/text/Regex;
+    const/4 v6, 0x0
 
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/jvm/functions/Function3;
-
-    invoke-virtual {v1}, Landroid/net/Uri;->getPath()Ljava/lang/String;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_5
+    if-eqz v5, :cond_5
 
     const-string v7, "it"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v5, v6}, Lkotlin/text/Regex;->matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
+    invoke-virtual {v4, v5}, Lkotlin/text/Regex;->matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
 
-    move-result-object v5
+    move-result-object v4
 
     goto :goto_4
 
     :cond_5
-    move-object v5, v0
+    move-object v4, v6
 
     :goto_4
-    if-eqz v5, :cond_4
+    if-eqz v4, :cond_4
 
     :try_start_0
-    invoke-interface {v2, v1, v5, p2}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v0, v4, p2}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -882,37 +867,37 @@
 
     move-result-object p3
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
-    xor-int/2addr p3, v3
+    xor-int/2addr p3, v2
 
-    sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v4, "Intent handler activated for "
+    const-string v3, "Intent handler activated for "
 
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    const-string v1, ", consumed: "
+    const-string v0, ", consumed: "
 
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, p3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p3}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {v2, v1, v0, v3, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {v1, v0, v6, v2, v6}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     invoke-direct {p0, p1, p3}, Lcom/discord/utilities/intent/IntentUtils;->notifyFirebaseUserActionStatus(Landroid/content/Intent;Z)V
 
@@ -927,84 +912,61 @@
     return p3
 
     :cond_6
-    invoke-direct {p0, p1, v4}, Lcom/discord/utilities/intent/IntentUtils;->notifyFirebaseUserActionStatus(Landroid/content/Intent;Z)V
+    invoke-direct {p0, p1, v3}, Lcom/discord/utilities/intent/IntentUtils;->notifyFirebaseUserActionStatus(Landroid/content/Intent;Z)V
 
-    return v4
-
-    :cond_7
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v3
 .end method
 
 .method public final getDirectShareId(Landroid/content/Intent;)Ljava/lang/Long;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getDirectShareId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "android.intent.extra.shortcut.ID"
+    const-string v0, "android.intent.extra.shortcut.ID"
 
-    invoke-virtual {p1, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "$this$getDirectShareId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
 
 .method public final isDiscordAppUri(Landroid/net/Uri;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "discord"
+    const-string v1, "discord"
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    invoke-static {v1, v2, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v1, v2}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
@@ -1014,136 +976,132 @@
 
     sget-object v0, Ljava/util/Locale;->ENGLISH:Ljava/util/Locale;
 
-    const-string v1, "Locale.ENGLISH"
+    const-string v3, "Locale.ENGLISH"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
-    const-string p1, "(this as java.lang.String).toLowerCase(locale)"
+    const-string v0, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_0
-    if-nez v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result p1
-
-    const v1, -0x54d081ca
-
-    if-eq p1, v1, :cond_3
-
-    const v1, 0x17a21
-
-    if-eq p1, v1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const-string p1, "app"
-
-    invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
-    :cond_3
-    const-string p1, "action"
-
-    invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
+    :cond_0
+    const/4 p1, 0x0
 
     :goto_0
-    const/4 p1, 0x1
+    if-nez p1, :cond_1
 
     goto :goto_2
 
-    :cond_4
-    :goto_1
-    const/4 p1, 0x0
+    :cond_1
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
-    :goto_2
-    if-eqz p1, :cond_5
+    move-result v0
+
+    const v3, -0x54d081ca
+
+    if-eq v0, v3, :cond_3
+
+    const v3, 0x17a21
+
+    if-eq v0, v3, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const-string v0, "app"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    goto :goto_1
+
+    :cond_3
+    const-string v0, "action"
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    :goto_1
+    const/4 p1, 0x1
 
     goto :goto_3
 
-    :cond_5
-    const/4 v3, 0x0
+    :cond_4
+    :goto_2
+    const/4 p1, 0x0
 
     :goto_3
-    return v3
+    if-eqz p1, :cond_5
 
-    :cond_6
-    const-string p1, "uri"
+    goto :goto_4
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :cond_5
+    const/4 v2, 0x0
 
-    throw v0
+    :goto_4
+    return v2
 .end method
 
 .method public final toExternalizedSend(Landroid/content/Intent;)Landroid/content/Intent;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toExternalizedSend"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Intent;->getData()Landroid/net/Uri;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    sget-object v2, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
+    sget-object v1, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
 
-    invoke-direct {v2, v1}, Lcom/discord/utilities/intent/IntentUtils;->externalize(Landroid/net/Uri;)Landroid/net/Uri;
+    invoke-direct {v1, v0}, Lcom/discord/utilities/intent/IntentUtils;->externalize(Landroid/net/Uri;)Landroid/net/Uri;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
+    sget-object v0, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
     :goto_0
-    invoke-virtual {p1, v1}, Landroid/content/Intent;->setData(Landroid/net/Uri;)Landroid/content/Intent;
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->setData(Landroid/net/Uri;)Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
+    sget-object v0, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
 
     invoke-virtual {p1}, Landroid/content/Intent;->getData()Landroid/net/Uri;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v2}, Landroid/net/Uri;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Landroid/net/Uri;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
+
+    goto :goto_1
 
     :cond_1
-    invoke-direct {v1, p1, v0}, Lcom/discord/utilities/intent/IntentUtils;->sendText(Landroid/content/Intent;Ljava/lang/String;)Landroid/content/Intent;
+    const/4 v1, 0x0
+
+    :goto_1
+    invoke-direct {v0, p1, v1}, Lcom/discord/utilities/intent/IntentUtils;->sendText(Landroid/content/Intent;Ljava/lang/String;)Landroid/content/Intent;
 
     return-object p1
-
-    :cond_2
-    const-string p1, "$this$toExternalizedSend"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$AnalyticsMetadata.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$AnalyticsMetadata.smali
index f1cbc19fb0..22e418af6b 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$AnalyticsMetadata.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$AnalyticsMetadata.smali
@@ -48,7 +48,7 @@
 
     new-instance v0, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
 
-    const-string v3, "unknown"
+    const-string/jumbo v3, "unknown"
 
     const/4 v4, 0x0
 
@@ -68,9 +68,11 @@
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -81,15 +83,6 @@
     iput-object p3, p0, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;->channelId:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$handleQuery$1.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$handleQuery$1.smali
index 1ed826408c..b93dc66c7a 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$handleQuery$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$handleQuery$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$handleQuery$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/intent/RouteHandlers$handleQuery$1;->$queryMessageText:Ljava/lang/String;
 
@@ -110,7 +112,7 @@
 
     const-string v2, "ctx.supportFragmentManager"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/utilities/intent/RouteHandlers$handleQuery$1;->$query:Ljava/lang/String;
 
@@ -118,13 +120,4 @@
 
     :goto_1
     return v1
-
-    :cond_2
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$1.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$1.smali
index bd9b3cc6ca..ec1463319d 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/intent/RouteHandlers$selectFeature$1;->$settingMap:Ljava/util/Map;
 
@@ -93,13 +95,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_1
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$1.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$1.smali
index 0e9a3b47f7..59e5140954 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,20 +71,13 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->Companion:Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion;->launch(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$10.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$10.smali
index d62ef7d68a..df9c39d293 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$10.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$10.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$10;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreTabsNavigation;->selectTab(Lcom/discord/widgets/tabs/NavigationTab;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$2.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$2.smali
index ddee323606..31e0f31eb8 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$2.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,32 +69,25 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
 
-    sget-object v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->Companion:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    sget-object v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->Companion:Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Companion;
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x6
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x6
 
-    move-object v1, p1
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Companion;->launch$default(Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Companion;Landroid/content/Context;ZLcom/discord/widgets/settings/account/WidgetSettingsAccount$Redirect;ILjava/lang/Object;)V
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Companion;->launch$default(Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Companion;Landroid/content/Context;ZLcom/discord/widgets/settings/account/WidgetSettingsAccount$Redirect;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$3.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$3.smali
index d8b26d58cb..b8e887ff5d 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$3.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,22 +71,17 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;Landroid/content/Context;Ljava/lang/Integer;ILjava/lang/Object;)V
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;Landroid/content/Context;Ljava/lang/Integer;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.smali
index 8714be3dd5..56c54b1074 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,20 +71,13 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->Companion:Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$Companion;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$Companion;->launch(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$5.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$5.smali
index e86ce07bbc..485919e964 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$5.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,32 +69,25 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
 
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x6
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x6
 
-    move-object v1, p1
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->launch$default(Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;Landroid/content/Context;Ljava/lang/Integer;ZILjava/lang/Object;)V
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->launch$default(Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;Landroid/content/Context;Ljava/lang/Integer;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$6.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$6.smali
index 91a8f88e1e..c0c264a256 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$6.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,36 +69,29 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
-    .locals 8
+    .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
 
-    sget-object v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->Companion:Lcom/discord/widgets/guilds/create/WidgetGuildCreate$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    sget-object v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->Companion:Lcom/discord/widgets/guilds/create/WidgetGuildCreate$Companion;
 
     const/4 v3, 0x0
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/16 v6, 0x16
+    const-string v5, "Deeplink"
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    const-string v4, "Deeplink"
+    const/16 v7, 0x16
 
-    move-object v1, p1
+    const/4 v8, 0x0
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$Companion;->show$default(Lcom/discord/widgets/guilds/create/WidgetGuildCreate$Companion;Landroid/content/Context;Lcom/discord/widgets/guilds/create/StockGuildTemplate;ZLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$Companion;->show$default(Lcom/discord/widgets/guilds/create/WidgetGuildCreate$Companion;Landroid/content/Context;Lcom/discord/widgets/guilds/create/StockGuildTemplate;ZLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$7.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$7.smali
index 19f6c67bf2..9b69cce0df 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$7.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,30 +71,25 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;
+    sget-object v0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object p1
 
-    const-string v2, "ctx.supportFragmentManager"
+    const-string v1, "ctx.supportFragmentManager"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;->show$default(Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;ILjava/lang/Object;)V
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;->show$default(Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$8.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$8.smali
index fb331ac208..d9eca0e689 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$8.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$8.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$8;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreTabsNavigation;->selectTab(Lcom/discord/widgets/tabs/NavigationTab;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$9.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$9.smali
index faa4e4a0d7..3dc62de8c1 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$9.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$9.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$9;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreTabsNavigation;->selectTab(Lcom/discord/widgets/tabs/NavigationTab;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.smali
index 5baa5f1421..9c156c04cf 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$voiceConnect$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,13 +81,13 @@
 
     if-eqz v2, :cond_0
 
-    const-string v0, "weakContext.get() ?: return@appSubscribe"
+    const-string/jumbo v0, "weakContext.get() ?: return@appSubscribe"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "channel"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$1.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$1.smali
index 7b5c4fabd1..276702a7fa 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "acceptGift"
+
+    const-string v5, "acceptGift(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "acceptGift"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "acceptGift(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$2.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$2.smali
index fe236c97e1..fac2222152 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$2.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string/jumbo v4, "useInvite"
+
+    const-string/jumbo v5, "useInvite(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "useInvite"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "useInvite(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$3.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$3.smali
index de642a1993..93311edd73 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$3.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/intent/RouteHandlers$wildCardMatcher$1$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/net/Uri;",
         "Lkotlin/text/MatchResult;",
@@ -31,55 +31,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/intent/RouteHandlers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/intent/RouteHandlers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string/jumbo v4, "useGuildTemplate"
+
+    const-string/jumbo v5, "useGuildTemplate(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "useGuildTemplate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/intent/RouteHandlers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "useGuildTemplate(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/intent/RouteHandlers;
 
@@ -88,20 +74,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1.smali
index 108404ec1d..d90df08512 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/intent/RouteHandlers$wildCardMatcher$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RouteHandlers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/reflect/KFunction<",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali b/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
index e7f508c24f..e4b7d4c3ea 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
@@ -49,7 +49,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p2}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -73,9 +73,9 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v1
 
@@ -94,13 +94,13 @@
     const-string p3, "Deeplink"
 
     :goto_1
-    const-string p1, "uri.getQueryParameter(\"s\u2026ettings.LOCATION_DEEPLINK"
+    const-string/jumbo p1, "uri.getQueryParameter(\"s\u2026ettings.LOCATION_DEEPLINK"
 
-    invoke-static {p3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_3
 
-    invoke-static {p2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
@@ -175,7 +175,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -230,7 +230,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p2}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -244,7 +244,7 @@
     :goto_0
     const-string v1, "invite"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -270,9 +270,9 @@
 
     const-string v2, "it"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -291,9 +291,9 @@
     move-object v0, v1
 
     :goto_2
-    const-string p1, "uri.getQueryParameter(\"s\u2026        ?: inviteLocation"
+    const-string/jumbo p1, "uri.getQueryParameter(\"s\u2026        ?: inviteLocation"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_4
 
@@ -337,47 +337,54 @@
 .method public final authorize(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 6
 
-    const/4 p2, 0x0
+    const-string/jumbo p2, "uri"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p2, "context"
 
-    instance-of v0, p3, Landroid/app/Activity;
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_1
+    instance-of p2, p3, Landroid/app/Activity;
 
-    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+    if-eqz p2, :cond_1
 
-    const/16 v1, 0x16
+    sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-lt v0, v1, :cond_1
+    const/16 v0, 0x16
+
+    if-lt p2, v0, :cond_1
 
     check-cast p3, Landroid/app/Activity;
 
     invoke-virtual {p3}, Landroid/app/Activity;->getReferrer()Landroid/net/Uri;
 
-    move-result-object p3
+    move-result-object p2
 
-    if-eqz p3, :cond_0
+    if-eqz p2, :cond_0
 
-    invoke-virtual {p3}, Landroid/net/Uri;->getAuthority()Ljava/lang/String;
+    invoke-virtual {p2}, Landroid/net/Uri;->getAuthority()Ljava/lang/String;
 
     move-result-object p2
 
+    goto :goto_0
+
     :cond_0
+    const/4 p2, 0x0
+
+    :goto_0
     const-string p3, "com.discord"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     const/4 p2, 0x0
 
-    :goto_0
+    :goto_1
     invoke-virtual {p1}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
 
     move-result-object p1
@@ -404,7 +411,7 @@
 
     const-string p3, "oAuthUri"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p1}, Lcom/discord/stores/StoreAuthentication;->setOAuthUriSubject(Landroid/net/Uri;)V
 
@@ -425,30 +432,18 @@
     invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_3
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public final handleQuery(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 7
 
-    const/4 p2, 0x0
+    const-string/jumbo p2, "uri"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_b
+    const-string p2, "context"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p2, "type"
 
@@ -472,9 +467,9 @@
     move-object p3, v0
 
     :goto_0
-    const-string v1, "uri.getQueryParameter(\"channelName\") ?: \"\""
+    const-string/jumbo v1, "uri.getQueryParameter(\"channelName\") ?: \"\""
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "serverName"
 
@@ -490,11 +485,11 @@
     move-object v1, v0
 
     :goto_1
-    const-string v2, "uri.getQueryParameter(\"serverName\") ?: \"\""
+    const-string/jumbo v2, "uri.getQueryParameter(\"serverName\") ?: \"\""
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "userName"
+    const-string/jumbo v2, "userName"
 
     invoke-virtual {p1, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
@@ -508,9 +503,9 @@
     move-object v2, v0
 
     :goto_2
-    const-string v3, "uri.getQueryParameter(\"userName\") ?: \"\""
+    const-string/jumbo v3, "uri.getQueryParameter(\"userName\") ?: \"\""
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "messageText"
 
@@ -526,9 +521,9 @@
     move-object p1, v0
 
     :goto_3
-    const-string v3, "uri.getQueryParameter(\"messageText\") ?: \"\""
+    const-string/jumbo v3, "uri.getQueryParameter(\"messageText\") ?: \"\""
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_4
 
@@ -600,7 +595,7 @@
     goto :goto_5
 
     :cond_8
-    const-string p3, "user"
+    const-string/jumbo p3, "user"
 
     invoke-virtual {p2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -689,30 +684,18 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_b
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_c
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public final navigateToFriendsScreen(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 6
 
-    const/4 p2, 0x0
+    const-string/jumbo p2, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -728,6 +711,8 @@
 
     new-instance p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
 
+    const-string v1, "friends"
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -736,37 +721,23 @@
 
     const/4 v5, 0x0
 
-    const-string v1, "friends"
-
     move-object v0, p1
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public final remoteAuth(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -776,16 +747,19 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
-    move-object v0, p1
+    check-cast p1, Ljava/lang/String;
 
-    check-cast v0, Ljava/lang/String;
+    goto :goto_0
 
     :cond_0
-    if-eqz v0, :cond_1
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
 
     sget-object p1, Lcom/discord/widgets/media/WidgetQRScanner;->Companion:Lcom/discord/widgets/media/WidgetQRScanner$Companion;
 
@@ -811,30 +785,18 @@
     invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final selectChannel(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_5
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -858,7 +820,7 @@
 
     const-string v3, "@me"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -871,7 +833,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -934,7 +896,7 @@
 
     if-eqz p2, :cond_3
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
@@ -999,30 +961,18 @@
     invoke-direct {p1, v0, p2, p3}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
 
     return-object p1
-
-    :cond_5
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final selectDirectMessage(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -1032,7 +982,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1040,7 +990,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -1076,30 +1026,18 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final selectFeature(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -1111,7 +1049,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2, p1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {p2, p1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -1302,30 +1240,18 @@
 
     :goto_1
     return-object p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final selectLurk(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -1347,12 +1273,12 @@
 
     invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
-    move-result-wide v1
+    move-result-wide v0
 
     goto :goto_0
 
     :cond_0
-    const-wide/16 v1, 0x0
+    const-wide/16 v0, 0x0
 
     :goto_0
     if-eqz p2, :cond_1
@@ -1373,54 +1299,47 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
-
-    move-result-object v0
-
-    :cond_1
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getLurking()Lcom/discord/stores/StoreLurking;
+    invoke-static {p1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
-    invoke-virtual {p1, v1, v2, v0}, Lcom/discord/stores/StoreLurking;->startLurking(JLjava/lang/Long;)V
+    goto :goto_1
 
-    new-instance p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
+    :cond_1
+    const/4 p1, 0x0
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    :goto_1
+    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getLurking()Lcom/discord/stores/StoreLurking;
 
     move-result-object p2
 
-    const-string p3, "lurk"
+    invoke-virtual {p2, v0, v1, p1}, Lcom/discord/stores/StoreLurking;->startLurking(JLjava/lang/Long;)V
 
-    invoke-direct {p1, p3, p2, v0}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
+    new-instance p2, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
 
-    return-object p1
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    :cond_2
-    const-string p1, "context"
+    move-result-object p3
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v0, "lurk"
 
-    throw v0
+    invoke-direct {p2, v0, p3, p1}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
 
-    :cond_3
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p2
 .end method
 
 .method public final selectPremiumGuild(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
@@ -1480,30 +1399,18 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p3
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final selectUserProfile(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -1513,7 +1420,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p2}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -1521,26 +1428,31 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p2
+
+    goto :goto_0
 
     :cond_0
-    const-string p2, "friend_token"
+    const/4 p2, 0x0
 
-    invoke-virtual {p1, p2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+    :goto_0
+    const-string p3, "friend_token"
+
+    invoke-virtual {p1, p3}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz v0, :cond_1
+    if-eqz p2, :cond_1
 
-    sget-object p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+    sget-object p3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
 
-    invoke-virtual {p2, v0, v1, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->enqueueNotice(JLjava/lang/String;)V
+    invoke-virtual {p3, v0, v1, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->enqueueNotice(JLjava/lang/String;)V
 
     :cond_1
     new-instance p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
@@ -1560,20 +1472,6 @@
     invoke-direct/range {v2 .. v7}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final voiceConnect(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
@@ -1583,11 +1481,13 @@
 
     move-object/from16 v1, p3
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "uri"
 
-    if-eqz v0, :cond_2
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_1
+    const-string v2, "context"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -1607,7 +1507,7 @@
 
     if-eqz v2, :cond_0
 
-    invoke-static {v2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
@@ -1647,19 +1547,19 @@
 
     sget-object v5, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v1, v5}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v5}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     sget-object v5, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v1, v5}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v5}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v6
 
     const-string v1, "filter { it != null }.map { it!! }"
 
-    invoke-static {v6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v7, 0x0
 
@@ -1709,51 +1609,44 @@
 
     const/16 v19, 0x0
 
-    const-string v15, "voice"
+    const-string/jumbo v15, "voice"
 
     move-object v14, v0
 
     invoke-direct/range {v14 .. v19}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v0
-
-    :cond_1
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_2
-    const-string v0, "uri"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public final wildCardMatcher(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_3
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getPathSegments()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-static {v1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/lang/String;
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
     move-result-object v1
@@ -1766,14 +1659,14 @@
 
     if-eqz v0, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     invoke-virtual {v2, v1}, Lcom/discord/utilities/intent/RouteHandlers$wildCardMatcher$1;->invoke(Ljava/lang/String;)Lkotlin/reflect/KFunction;
 
     move-result-object v0
 
-    :goto_0
+    :goto_1
     if-eqz v0, :cond_2
 
     check-cast v0, Lkotlin/jvm/functions/Function3;
@@ -1786,7 +1679,7 @@
 
     if-eqz p1, :cond_2
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     sget-object p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;->Companion:Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata$Companion;
@@ -1795,20 +1688,6 @@
 
     move-result-object p1
 
-    :goto_1
+    :goto_2
     return-object p1
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali
index 269755facd..7173da0ede 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils$NetworkDownloadReceiver.smali
@@ -28,36 +28,41 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
-    move-result-object v0
-
-    :cond_0
-    if-nez v0, :cond_1
+    move-result-object p1
 
     goto :goto_0
 
-    :cond_1
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+    :cond_0
+    const/4 p1, 0x0
 
-    move-result p1
+    :goto_0
+    if-nez p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
 
     const v1, 0x4a702ceb    # 3935034.8f
 
-    if-eq p1, v1, :cond_2
+    if-eq v0, v1, :cond_2
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_2
-    const-string p1, "android.intent.action.DOWNLOAD_COMPLETE"
+    const-string v0, "android.intent.action.DOWNLOAD_COMPLETE"
 
-    invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -96,13 +101,6 @@
     check-cast p1, Lkotlin/Unit;
 
     :cond_3
-    :goto_0
+    :goto_1
     return-void
-
-    :cond_4
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali
index cb2fd400a4..2a7de3f451 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/io/NetworkUtils$downloadFile$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NetworkUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -135,7 +135,7 @@
 
     const-string v4, "downloadedFileName"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
index cadc8a824c..793d1809ff 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
@@ -95,14 +95,20 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "uri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onSuccess"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onError"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_9
-
-    if-eqz p4, :cond_8
-
-    if-eqz p5, :cond_7
-
     if-eqz p0, :cond_0
 
     const-string v1, "download"
@@ -255,27 +261,23 @@
 
     :goto_5
     return-void
+.end method
 
-    :cond_7
-    const-string p0, "onError"
+.method public static synthetic isDeviceConnected$default(Lcom/discord/utilities/io/NetworkUtils;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Z
+    .locals 0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    and-int/lit8 p3, p3, 0x2
 
-    throw v0
+    if-eqz p3, :cond_0
 
-    :cond_8
-    const-string p0, "onSuccess"
+    const/4 p2, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :cond_0
+    invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;Landroid/content/Intent;)Z
 
-    throw v0
+    move-result p0
 
-    :cond_9
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return p0
 .end method
 
 
@@ -283,9 +285,11 @@
 .method public final getNetworkType(Landroid/content/Context;)Ljava/lang/Integer;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     :try_start_0
     const-string v1, "connectivity"
@@ -317,11 +321,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type android.net.ConnectivityManager"
 
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
     :try_end_0
@@ -331,28 +335,52 @@
     :cond_1
     :goto_0
     return-object v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public final isDeviceConnected(Landroid/content/Context;)Z
-    .locals 1
+.method public final isAirplaneModeOn(Landroid/content/Context;)Z
+    .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "context"
 
-    :try_start_0
-    const-string v0, "connectivity"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object p1
 
-    if-eqz p1, :cond_1
+    const-string v0, "airplane_mode_on"
+
+    const/4 v1, 0x0
+
+    invoke-static {p1, v0, v1}, Landroid/provider/Settings$Global;->getInt(Landroid/content/ContentResolver;Ljava/lang/String;I)I
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 v1, 0x1
+
+    :cond_0
+    return v1
+.end method
+
+.method public final isDeviceConnected(Landroid/content/Context;Landroid/content/Intent;)Z
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    :try_start_0
+    const-string v1, "connectivity"
+
+    invoke-virtual {p1, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_3
 
     check-cast p1, Landroid/net/ConnectivityManager;
 
@@ -360,42 +388,61 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p2, :cond_0
 
-    invoke-virtual {p1}, Landroid/net/NetworkInfo;->isConnected()Z
+    const-string v1, "networkInfo"
 
-    move-result p1
+    invoke-virtual {p2, v1}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
+
+    move-result-object p2
+
+    check-cast p2, Landroid/net/NetworkInfo;
 
     goto :goto_0
 
     :cond_0
-    const/4 p1, 0x0
+    const/4 p2, 0x0
 
-    goto :goto_0
+    :goto_0
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p1}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z
+
+    move-result p1
+
+    if-eq p1, v0, :cond_4
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    if-eqz p2, :cond_2
 
-    const-string v0, "null cannot be cast to non-null type android.net.ConnectivityManager"
+    invoke-virtual {p2}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    move-result p1
+
+    if-ne p1, v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 p1, 0x0
+
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_3
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string p2, "null cannot be cast to non-null type android.net.ConnectivityManager"
+
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    const/4 p1, 0x1
-
-    :goto_0
-    return p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    :cond_4
+    :goto_1
+    return v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
index 7bd54f74a1..f41ff7f32c 100644
--- a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
+++ b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali
@@ -39,33 +39,39 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "kryo"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "input"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "type"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x1
 
     invoke-virtual {p2, p3}, Lcom/esotericsoftware/kryo/io/Input;->readInt(Z)I
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p2, p3}, Lcom/esotericsoftware/kryo/io/Input;->readInt(Z)I
 
     move-result p3
 
-    new-instance v2, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
+    new-instance v1, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-direct {v2, v1, v0, v3, v0}, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;-><init>(ILjava/util/LinkedHashSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v1, v0, v2, v3, v2}, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;-><init>(ILjava/util/LinkedHashSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p3}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p3}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p3
 
@@ -82,45 +88,24 @@
 
     move-object v0, p3
 
-    check-cast v0, Lj0/i/q;
+    check-cast v0, Lk0/j/q;
 
-    invoke-virtual {v0}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v0}, Lk0/j/q;->nextInt()I
 
     invoke-virtual {p1, p2}, Lcom/esotericsoftware/kryo/Kryo;->readClassAndObject(Lcom/esotericsoftware/kryo/io/Input;)Ljava/lang/Object;
 
     move-result-object v0
 
-    const-string v1, "kryo.readClassAndObject(input)"
+    const-string v2, "kryo.readClassAndObject(input)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2, v0}, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_0
-    return-object v2
-
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "kryo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public bridge synthetic read(Lcom/esotericsoftware/kryo/Kryo;Lcom/esotericsoftware/kryo/io/Input;Ljava/lang/Class;)Ljava/lang/Object;
@@ -145,13 +130,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "kryo"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "output"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "target"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/utilities/collections/LeastRecentlyAddedSet;->getMaxSize()I
 
@@ -188,27 +177,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "target"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "output"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "kryo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic write(Lcom/esotericsoftware/kryo/Kryo;Lcom/esotericsoftware/kryo/io/Output;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
index ee46f508f4..60bea536a9 100644
--- a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
+++ b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali
@@ -39,13 +39,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "kryo"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "input"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "type"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x1
 
@@ -63,7 +67,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0, p3}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p3}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p3
 
@@ -80,9 +84,9 @@
 
     move-object v0, p3
 
-    check-cast v0, Lj0/i/q;
+    check-cast v0, Lk0/j/q;
 
-    invoke-virtual {v0}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v0}, Lk0/j/q;->nextInt()I
 
     invoke-virtual {p2}, Lcom/esotericsoftware/kryo/io/Input;->readLong()J
 
@@ -102,27 +106,6 @@
 
     :cond_0
     return-object v1
-
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "kryo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic read(Lcom/esotericsoftware/kryo/Kryo;Lcom/esotericsoftware/kryo/io/Input;Ljava/lang/Class;)Ljava/lang/Object;
@@ -147,13 +130,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "kryo"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "output"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "target"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/utilities/collections/ShallowPartitionMap;->getNumPartitions()I
 
@@ -212,27 +199,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "target"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "output"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "kryo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic write(Lcom/esotericsoftware/kryo/Kryo;Lcom/esotericsoftware/kryo/io/Output;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member.smali b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member.smali
index e773b77e38..a636ab7679 100644
--- a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member.smali
@@ -46,15 +46,17 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, v1}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->userId:J
 
@@ -79,13 +81,6 @@
     iput-boolean p12, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->isApplicationStreaming:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;JLjava/lang/String;ZLjava/lang/Integer;ZLcom/discord/models/domain/ModelPresence;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/String;ZILjava/lang/Object;)Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;
@@ -353,46 +348,39 @@
         .end annotation
     .end param
 
-    if-eqz p3, :cond_0
-
-    new-instance v13, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;
-
-    move-object v0, v13
-
-    move-wide v1, p1
-
-    move-object/from16 v3, p3
-
-    move/from16 v4, p4
-
-    move-object/from16 v5, p5
-
-    move/from16 v6, p6
-
-    move-object/from16 v7, p7
-
-    move-object/from16 v8, p8
-
-    move-object/from16 v9, p9
-
-    move/from16 v10, p10
-
-    move-object/from16 v11, p11
-
-    move/from16 v12, p12
-
-    invoke-direct/range {v0 .. v12}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;-><init>(JLjava/lang/String;ZLjava/lang/Integer;ZLcom/discord/models/domain/ModelPresence;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/String;Z)V
-
-    return-object v13
-
-    :cond_0
     const-string v0, "name"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v4, p3
 
-    const/4 v0, 0x0
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move/from16 v5, p4
+
+    move-object/from16 v6, p5
+
+    move/from16 v7, p6
+
+    move-object/from16 v8, p7
+
+    move-object/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    move/from16 v11, p10
+
+    move-object/from16 v12, p11
+
+    move/from16 v13, p12
+
+    invoke-direct/range {v1 .. v13}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;-><init>(JLjava/lang/String;ZLjava/lang/Integer;ZLcom/discord/models/domain/ModelPresence;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/String;Z)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -418,7 +406,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -434,7 +422,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->tagText:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -450,7 +438,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -460,7 +448,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->color:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -470,7 +458,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->avatarUrl:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -486,7 +474,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->premiumSince:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader.smali b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader.smali
index 3e2f6c21c8..838132d420 100644
--- a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader.smali
@@ -26,15 +26,17 @@
 .method public constructor <init>(JLjava/lang/String;I)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "roleName"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, v1}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;->roleId:J
 
@@ -43,13 +45,6 @@
     iput p4, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;->memberCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "roleName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;JLjava/lang/String;IILjava/lang/Object;)Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;
@@ -112,22 +107,15 @@
 .method public final copy(JLjava/lang/String;I)Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "roleName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;-><init>(JLjava/lang/String;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "roleName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -153,7 +141,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$RoleHeader;->roleName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader.smali b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader.smali
index e90a372afc..6e5a426346 100644
--- a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader.smali
@@ -32,12 +32,16 @@
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader$Type;I)V
     .locals 1
 
+    const-string v0, "rowId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "type"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p1, v0}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;->rowId:Ljava/lang/String;
@@ -47,20 +51,6 @@
     iput p3, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;->memberCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rowId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;Ljava/lang/String;Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader$Type;IILjava/lang/Object;)Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;
@@ -127,31 +117,19 @@
 .method public final copy(Ljava/lang/String;Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader$Type;I)Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "rowId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;-><init>(Ljava/lang/String;Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader$Type;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rowId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -173,7 +151,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -183,7 +161,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;->type:Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader$Type;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
index c2201cf093..32ad60f94e 100644
--- a/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/memberlist/ChannelMemberList.smali
@@ -52,23 +52,25 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
 
-    iget-object v1, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->listId:Ljava/lang/String;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    iget-object v2, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->listId:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v4, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->logger:Lcom/discord/utilities/logging/Logger;
 
-    const/4 v4, 0x2
+    const/4 v3, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x2
 
-    move-object v0, p0
+    const/4 v6, 0x0
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;-><init>(Ljava/lang/String;ILcom/discord/utilities/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;-><init>(Ljava/lang/String;ILcom/discord/utilities/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iget-object v0, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
 
@@ -95,21 +97,14 @@
     iput-object v0, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->groupIndices:Ljava/util/SortedMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/lang/String;ILcom/discord/utilities/logging/Logger;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "listId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -125,7 +120,7 @@
 
     iput-object p1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object p1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->groups:Ljava/util/Map;
 
@@ -136,15 +131,6 @@
     iput-object p1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->groupIndices:Ljava/util/SortedMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;ILcom/discord/utilities/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -340,63 +326,65 @@
 .end method
 
 .method public final invalidate(Lkotlin/ranges/IntRange;)V
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "range"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v0, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->logger:Lcom/discord/utilities/logging/Logger;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const-string v2, "memberListId: "
+    const-string v1, "memberListId: "
 
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v2
+    move-result-object v1
 
-    iget-object v3, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->listId:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->listId:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v3, " INVALIDATE range: "
+    const-string v2, " INVALIDATE range: "
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "ChannelMemberList"
+    const-string v2, "ChannelMemberList"
 
-    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    iget v1, p1, Lkotlin/ranges/IntProgression;->e:I
+    iget v0, p1, Lkotlin/ranges/IntProgression;->e:I
 
-    iget-object v2, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
+    iget-object v1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
 
-    invoke-static {v2}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v2
-
-    invoke-static {v1, v2}, Ljava/lang/Math;->min(II)I
+    invoke-static {v1}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
 
     move-result v1
 
+    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
+
+    move-result v0
+
     iget p1, p1, Lkotlin/ranges/IntProgression;->d:I
 
-    if-gt p1, v1, :cond_1
+    if-gt p1, v0, :cond_1
 
     :goto_0
-    iget-object v2, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
+    iget-object v1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
 
-    invoke-virtual {v2, p1, v0}, Lcom/discord/utilities/collections/SparseMutableList;->set(ILjava/lang/Object;)Ljava/lang/Object;
+    const/4 v2, 0x0
 
-    if-eq p1, v1, :cond_1
+    invoke-virtual {v1, p1, v2}, Lcom/discord/utilities/collections/SparseMutableList;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    if-eq p1, v0, :cond_1
 
     add-int/lit8 p1, p1, 0x1
 
@@ -404,17 +392,10 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final rebuildMembers(Lkotlin/jvm/functions/Function1;)V
-    .locals 7
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -427,80 +408,75 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "makeMember"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
+    iget-object v0, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
 
-    const/4 v2, 0x0
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    move-result-object v0
 
-    move-result-object v1
+    const/4 v1, 0x0
 
     :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    add-int/lit8 v4, v2, 0x1
+    add-int/lit8 v3, v1, 0x1
 
-    if-ltz v2, :cond_1
+    if-ltz v1, :cond_1
 
-    check-cast v3, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;
+    check-cast v2, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;
 
-    instance-of v5, v3, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;
+    instance-of v4, v2, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;
 
-    if-eqz v5, :cond_0
+    if-eqz v4, :cond_0
 
-    check-cast v3, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;
+    check-cast v2, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;
 
-    invoke-virtual {v3}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->getUserId()J
+    invoke-virtual {v2}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$Member;->getUserId()J
 
-    move-result-wide v5
+    move-result-wide v4
 
-    iget-object v3, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
+    iget-object v2, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->rows:Lcom/discord/utilities/collections/SparseMutableList;
 
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-interface {p1, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v4}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v3, v2, v5}, Lcom/discord/utilities/collections/SparseMutableList;->set(ILjava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v2, v1, v4}, Lcom/discord/utilities/collections/SparseMutableList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    move v2, v4
+    move v1, v3
 
     goto :goto_0
 
     :cond_1
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
-    throw v0
+    const/4 p1, 0x0
+
+    throw p1
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "makeMember"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setGroupIndices(Ljava/util/SortedMap;)V
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
 
@@ -514,20 +490,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "groupIndices"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->groupIndices:Ljava/util/SortedMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "groupIndices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setGroups(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
@@ -547,11 +516,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "groups"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "makeGroup"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->logger:Lcom/discord/utilities/logging/Logger;
 
@@ -666,24 +637,10 @@
     invoke-virtual {p1, v0}, Lcom/discord/utilities/collections/SparseMutableList;->setSize(I)V
 
     return-void
-
-    :cond_3
-    const-string p1, "makeGroup"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "groups"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final sync(ILjava/util/List;)V
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I",
@@ -694,50 +651,50 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "items"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v0, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->logger:Lcom/discord/utilities/logging/Logger;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const-string v2, "memberListId: "
+    const-string v1, "memberListId: "
 
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v2
+    move-result-object v1
 
-    iget-object v3, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->listId:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->listId:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v3, " SYNC: startIndex: "
+    const-string v2, " SYNC: startIndex: "
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    const-string v3, " -- items size: "
+    const-string v2, " -- items size: "
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-interface {p2}, Ljava/util/List;->size()I
 
-    move-result v3
+    move-result v2
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "ChannelMemberList"
+    const-string v2, "ChannelMemberList"
 
-    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -746,42 +703,37 @@
     :goto_0
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    add-int/lit8 v3, v1, 0x1
+    add-int/lit8 v2, v0, 0x1
 
-    if-ltz v1, :cond_1
+    if-ltz v0, :cond_1
 
-    check-cast v2, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;
+    check-cast v1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;
 
-    add-int/2addr v1, p1
+    add-int/2addr v0, p1
 
-    invoke-virtual {p0, v1, v2}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->update(ILcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;)V
+    invoke-virtual {p0, v0, v1}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->update(ILcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;)V
 
-    move v1, v3
+    move v0, v2
 
     goto :goto_0
 
     :cond_1
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
-    throw v0
+    const/4 p1, 0x0
+
+    throw p1
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final update(ILcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;)V
diff --git a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali
index 6e4e9b37a0..79e07dfa9f 100644
--- a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState.smali
@@ -63,7 +63,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager;JLkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -75,7 +75,9 @@
         }
     .end annotation
 
-    if-eqz p4, :cond_0
+    const-string v0, "guildMemberExists"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState;->this$0:Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager;
 
@@ -104,15 +106,6 @@
     iput-object p1, p0, Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState;->unacknowledgedRequests:Ljava/util/HashSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildMemberExists"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -167,9 +160,9 @@
 
     iget-object v3, p0, Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager$GuildMemberRequestState;->guildMemberExists:Lkotlin/jvm/functions/Function1;
 
-    const-string v4, "userId"
+    const-string/jumbo v4, "userId"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -219,7 +212,7 @@
 
     move-result-object v2
 
-    invoke-static {v0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -372,7 +365,7 @@
 
     const-string v1, "unacknowledgedRequests.iterator()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
@@ -387,7 +380,7 @@
 
     const-string v2, "iter.next()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Ljava/lang/Number;
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali
index 75483178cb..81762528e5 100644
--- a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager$getGuildRequestState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildMemberRequestManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
index fecb41b0a1..19360fc46d 100644
--- a/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/requester/GuildMemberRequestManager.smali
@@ -75,11 +75,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildMemberExists"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onFlush"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -94,20 +96,6 @@
     iput-object p1, p0, Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager;->guildRequestStates:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "onFlush"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildMemberExists"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getGuildMemberExists$p(Lcom/discord/utilities/lazy/requester/GuildMemberRequestManager;)Lkotlin/jvm/functions/Function2;
@@ -237,7 +225,7 @@
 
     const-string v1, "guildRequestStates.values"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali
index 7a21f4beaa..e5e752050d 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager.smali
@@ -38,7 +38,7 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -57,7 +57,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "changeHandler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,15 +72,6 @@
     iput-object p1, p0, Lcom/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager;->subscriptions:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "changeHandler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -119,7 +112,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     return-object p1
@@ -160,7 +153,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "guildIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager;->subscriptions:Ljava/util/HashMap;
 
@@ -212,15 +207,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final subscribe(JJLjava/util/List;)V
@@ -234,7 +220,9 @@
         }
     .end annotation
 
-    if-eqz p5, :cond_2
+    const-string v0, "ranges"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager;->subscriptions:Ljava/util/HashMap;
 
@@ -260,10 +248,6 @@
     invoke-direct {v0, v1}, Landroid/util/LruCache;-><init>(I)V
 
     :goto_0
-    const-string v1, "subscriptions[guildId] ?: LruCache(MAX_CHANNELS)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-static {p3, p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
@@ -274,7 +258,7 @@
 
     check-cast v1, Ljava/util/List;
 
-    invoke-static {v1, p5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -309,18 +293,9 @@
 
     const-string p4, "guildSubscriptions.snapshot()"
 
-    invoke-static {p2, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_2
-    const-string p1, "ranges"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali
index cdb2fddb80..3a1970828d 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildMemberSubscriptionsManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1;->this$0:Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;->access$setDelayedFlushSubscription$p(Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2$1.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2$1.smali
index bda337ce61..e8d684bfe4 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GuildMemberSubscriptionsManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "flushUnsubscriptions"
+
+    const-string v5, "flushUnsubscriptions()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "flushUnsubscriptions"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "flushUnsubscriptions()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2.smali
index 9375eb6300..3faaaf3b24 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildMemberSubscriptionsManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali
index 47233f41ef..684f2da174 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.smali
@@ -91,13 +91,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onChange"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "requestFlushUnsubscriptions"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "delayScheduler"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -120,27 +124,6 @@
     iput-object p1, p0, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;->pendingUnsubscriptions:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "delayScheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "requestFlushUnsubscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onChange"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Lrx/Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -150,13 +133,13 @@
 
     if-eqz p4, :cond_0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object p3
 
     const-string p4, "Schedulers.computation()"
 
-    invoke-static {p3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;-><init>(Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Lrx/Scheduler;)V
@@ -266,7 +249,7 @@
 
     const-string v5, "subscriptions[guildId] ?: continue"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -420,7 +403,7 @@
 
     const-string v0, "Observable\n          .ti\u2026.SECONDS, delayScheduler)"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v5, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;
 
@@ -484,7 +467,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     return-object p1
@@ -548,7 +531,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "guildIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager;->subscriptions:Ljava/util/HashMap;
 
@@ -600,15 +585,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final subscribe(JJ)V
@@ -636,10 +612,6 @@
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
     :goto_0
-    const-string v1, "subscriptions[guildId] ?: HashMap()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-static {p3, p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
@@ -784,10 +756,6 @@
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
     :goto_1
-    const-string v1, "pendingUnsubscriptions[guildId] ?: HashMap()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-static {p3, p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali
index 3315bf1d94..4064c37337 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions$serializedRanges$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildSubscriptions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali
index 518f7b9bd0..751686e98c 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.smali
@@ -268,7 +268,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->channels:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -278,7 +278,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->typing:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -288,7 +288,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->activities:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -298,7 +298,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptions;->members:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1.smali
index 5c2790eb92..1e00e101e7 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildChannelSubscriptionsManager$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GuildSubscriptionsManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/util/Map<",
@@ -36,45 +36,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string v4, "handleChannelSubscriptionsChange"
+
+    const-string v5, "handleChannelSubscriptionsChange(JLjava/util/Map;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelSubscriptionsChange"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelSubscriptionsChange(JLjava/util/Map;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -107,22 +91,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "p2"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 
     invoke-static {v0, p1, p2, p3}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;->access$handleChannelSubscriptionsChange(Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;JLjava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1.smali
index b2876840d5..f31347f91c 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GuildSubscriptionsManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Long;",
         "Ljava/util/Set<",
@@ -34,45 +34,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "handleMemberSubscriptionsChange"
+
+    const-string v5, "handleMemberSubscriptionsChange(JLjava/util/Set;Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMemberSubscriptionsChange"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleMemberSubscriptionsChange(JLjava/util/Set;Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -108,22 +92,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "p2"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 
     invoke-static {v0, p1, p2, p3, p4}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;->access$handleMemberSubscriptionsChange(Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;JLjava/util/Set;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$2.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$2.smali
index 241f84b8b3..68b740581d 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$2.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildMemberSubscriptionsManager$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GuildSubscriptionsManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/jvm/functions/Function0<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "requestFlushUnsubscriptions"
+
+    const-string v5, "requestFlushUnsubscriptions(Lkotlin/jvm/functions/Function0;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestFlushUnsubscriptions"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestFlushUnsubscriptions(Lkotlin/jvm/functions/Function0;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -94,22 +78,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;->access$requestFlushUnsubscriptions(Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali
index a1dcdae959..120c0d588b 100644
--- a/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.smali
@@ -78,7 +78,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onChange"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -141,15 +143,6 @@
     iput-object p1, p0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;->subscribedGuilds:Ljava/util/HashSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "onChange"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$handleChannelSubscriptionsChange(Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;JLjava/util/Map;)V
@@ -724,7 +717,7 @@
     :try_start_0
     const-string v0, "guildIds"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;->subscribedGuilds:Ljava/util/HashSet;
 
@@ -801,16 +794,6 @@
 
     return-void
 
-    :cond_2
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -947,7 +930,7 @@
     :try_start_0
     const-string v0, "ranges"
 
-    if-eqz p5, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager;->guildChannelSubscriptionsManager:Lcom/discord/utilities/lazy/subscriptions/GuildChannelSubscriptionsManager;
 
@@ -965,16 +948,6 @@
 
     return-void
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/locale/LocaleManager.smali b/com.discord/smali/com/discord/utilities/locale/LocaleManager.smali
index de9185f43a..d246210051 100644
--- a/com.discord/smali/com/discord/utilities/locale/LocaleManager.smali
+++ b/com.discord/smali/com/discord/utilities/locale/LocaleManager.smali
@@ -25,7 +25,7 @@
 
     const-string v0, "context.resources"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -43,7 +43,7 @@
 
     const-string v0, "ConfigurationCompat.getL\u2026sources.configuration)[0]"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -54,7 +54,7 @@
 
     const-string v0, "Locale.getDefault()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/utilities/logging/AppGatewaySocketLogger.smali b/com.discord/smali/com/discord/utilities/logging/AppGatewaySocketLogger.smali
index 930bb58e86..dceca12ab2 100644
--- a/com.discord/smali/com/discord/utilities/logging/AppGatewaySocketLogger.smali
+++ b/com.discord/smali/com/discord/utilities/logging/AppGatewaySocketLogger.smali
@@ -76,52 +76,31 @@
 .end method
 
 .method public logInboundMessage(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "rawMessage"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "rawMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public logMessageInflateFailed(Ljava/lang/Throwable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "throwable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "throwable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public logOutboundMessage(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "rawMessage"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "rawMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/logging/Logger.smali b/com.discord/smali/com/discord/utilities/logging/Logger.smali
index 527ee2870e..99562d5396 100644
--- a/com.discord/smali/com/discord/utilities/logging/Logger.smali
+++ b/com.discord/smali/com/discord/utilities/logging/Logger.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "defaultTag"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/logging/Logger;->defaultTag:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "defaultTag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
@@ -312,11 +305,13 @@
 .method public d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -329,41 +324,20 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public d(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/logging/Logger;->defaultTag:Ljava/lang/String;
 
     invoke-virtual {p0, v0, p1, p2}, Lcom/discord/utilities/logging/Logger;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
@@ -381,11 +355,13 @@
         }
     .end annotation
 
-    const/4 p4, 0x0
+    const-string p4, "tag"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p4, "message"
+
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -398,20 +374,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_2
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
 
 .method public e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
@@ -428,22 +390,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/logging/Logger;->defaultTag:Ljava/lang/String;
 
     invoke-virtual {p0, v0, p1, p2, p3}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getDefaultTag()Ljava/lang/String;
@@ -454,7 +409,7 @@
     return-object v0
 .end method
 
-.method public i(Ljava/lang/String;)V
+.method public final i(Ljava/lang/String;)V
     .locals 2
 
     const/4 v0, 0x0
@@ -469,11 +424,13 @@
 .method public i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -486,77 +443,46 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public i(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/logging/Logger;->defaultTag:Ljava/lang/String;
 
     invoke-virtual {p0, v0, p1, p2}, Lcom/discord/utilities/logging/Logger;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "category"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -569,51 +495,32 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public v(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/logging/Logger;->defaultTag:Ljava/lang/String;
 
     invoke-virtual {p0, v0, p1, p2}, Lcom/discord/utilities/logging/Logger;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "tag"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -626,39 +533,18 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public w(Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/logging/Logger;->defaultTag:Ljava/lang/String;
 
     invoke-virtual {p0, v0, p1, p2}, Lcom/discord/utilities/logging/Logger;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/logging/LoggingProvider.smali b/com.discord/smali/com/discord/utilities/logging/LoggingProvider.smali
index 6dc368635d..a193c1293e 100644
--- a/com.discord/smali/com/discord/utilities/logging/LoggingProvider.smali
+++ b/com.discord/smali/com/discord/utilities/logging/LoggingProvider.smali
@@ -44,7 +44,7 @@
     :cond_0
     const-string v0, "logger"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -52,20 +52,13 @@
 .end method
 
 .method public final init(Lcom/discord/utilities/logging/Logger;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "logger"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/utilities/logging/LoggingProvider;->logger:Lcom/discord/utilities/logging/Logger;
 
     return-void
-
-    :cond_0
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AppSoundManager$Provider$INSTANCE$2.smali b/com.discord/smali/com/discord/utilities/media/AppSoundManager$Provider$INSTANCE$2.smali
index 104eced800..8c4f49e19c 100644
--- a/com.discord/smali/com/discord/utilities/media/AppSoundManager$Provider$INSTANCE$2.smali
+++ b/com.discord/smali/com/discord/utilities/media/AppSoundManager$Provider$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/media/AppSoundManager$Provider$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppSoundManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/media/AppSoundManager;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AppSoundManager$SoundPlayer.smali b/com.discord/smali/com/discord/utilities/media/AppSoundManager$SoundPlayer.smali
index 62506ec524..6be0f4b505 100644
--- a/com.discord/smali/com/discord/utilities/media/AppSoundManager$SoundPlayer.smali
+++ b/com.discord/smali/com/discord/utilities/media/AppSoundManager$SoundPlayer.smali
@@ -20,7 +20,7 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Lcom/discord/utilities/media/AppSound;Lkotlin/jvm/functions/Function0;)V
-    .locals 8
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -32,23 +32,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "sound"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onCompletion"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    new-instance v7, Landroid/media/MediaPlayer;
+    new-instance v0, Landroid/media/MediaPlayer;
 
-    invoke-direct {v7}, Landroid/media/MediaPlayer;-><init>()V
+    invoke-direct {v0}, Landroid/media/MediaPlayer;-><init>()V
 
-    iput-object v7, p0, Lcom/discord/utilities/media/AppSoundManager$SoundPlayer;->mediaPlayer:Landroid/media/MediaPlayer;
+    iput-object v0, p0, Lcom/discord/utilities/media/AppSoundManager$SoundPlayer;->mediaPlayer:Landroid/media/MediaPlayer;
 
-    if-eqz v7, :cond_0
+    if-eqz v0, :cond_0
 
     new-instance v1, Landroid/media/AudioAttributes$Builder;
 
@@ -74,7 +78,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v7, v1}, Landroid/media/MediaPlayer;->setAudioAttributes(Landroid/media/AudioAttributes;)V
+    invoke-virtual {v0, v1}, Landroid/media/MediaPlayer;->setAudioAttributes(Landroid/media/AudioAttributes;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -90,7 +94,7 @@
 
     const-string v2, "assetFileDescriptor"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/AssetFileDescriptor;->getFileDescriptor()Ljava/io/FileDescriptor;
 
@@ -104,7 +108,7 @@
 
     move-result-wide v5
 
-    move-object v1, v7
+    move-object v1, v0
 
     invoke-virtual/range {v1 .. v6}, Landroid/media/MediaPlayer;->setDataSource(Ljava/io/FileDescriptor;JJ)V
 
@@ -112,48 +116,29 @@
 
     move-result v1
 
-    invoke-virtual {v7, v1}, Landroid/media/MediaPlayer;->setLooping(Z)V
+    invoke-virtual {v0, v1}, Landroid/media/MediaPlayer;->setLooping(Z)V
 
     new-instance v1, Lcom/discord/utilities/media/AppSoundManager$SoundPlayer$$special$$inlined$apply$lambda$1;
 
     invoke-direct {v1, p0, p2, p1, p3}, Lcom/discord/utilities/media/AppSoundManager$SoundPlayer$$special$$inlined$apply$lambda$1;-><init>(Lcom/discord/utilities/media/AppSoundManager$SoundPlayer;Lcom/discord/utilities/media/AppSound;Landroid/content/Context;Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {v7, v1}, Landroid/media/MediaPlayer;->setOnCompletionListener(Landroid/media/MediaPlayer$OnCompletionListener;)V
+    invoke-virtual {v0, v1}, Landroid/media/MediaPlayer;->setOnCompletionListener(Landroid/media/MediaPlayer$OnCompletionListener;)V
 
     :try_start_0
-    invoke-virtual {v7}, Landroid/media/MediaPlayer;->prepare()V
+    invoke-virtual {v0}, Landroid/media/MediaPlayer;->prepare()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_0
 
     :catch_0
-    iput-object v0, p0, Lcom/discord/utilities/media/AppSoundManager$SoundPlayer;->mediaPlayer:Landroid/media/MediaPlayer;
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/utilities/media/AppSoundManager$SoundPlayer;->mediaPlayer:Landroid/media/MediaPlayer;
 
     :cond_0
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "onCompletion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "sound"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/media/AppSoundManager$play$1.smali b/com.discord/smali/com/discord/utilities/media/AppSoundManager$play$1.smali
index 8cd2585ad4..b9aef0d7be 100644
--- a/com.discord/smali/com/discord/utilities/media/AppSoundManager$play$1.smali
+++ b/com.discord/smali/com/discord/utilities/media/AppSoundManager$play$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/media/AppSoundManager$play$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppSoundManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali b/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali
index fd0bf00245..36eab9e8d5 100644
--- a/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali
+++ b/com.discord/smali/com/discord/utilities/media/AppSoundManager.smali
@@ -29,9 +29,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/app/Application;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,15 +46,6 @@
     iput-object p1, p0, Lcom/discord/utilities/media/AppSoundManager;->soundPlayers:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -60,7 +53,9 @@
 .method public final play(Lcom/discord/utilities/media/AppSound;)V
     .locals 5
 
-    if-eqz p1, :cond_2
+    const-string v0, "sound"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/media/AppSoundManager;->soundPlayers:Ljava/util/Map;
 
@@ -127,21 +122,14 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "sound"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final stop(Lcom/discord/utilities/media/AppSound;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "sound"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/media/AppSoundManager;->soundPlayers:Ljava/util/Map;
 
@@ -177,13 +165,4 @@
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p1, "sound"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2.smali
index 150ede1bee..276ffc00e2 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AudioOutputMonitor.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/media/AudioOutputMonitor;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion.smali
index 57067f2184..d7c49d0010 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion.smali
@@ -54,7 +54,9 @@
 .method public final initialize(Landroid/app/Application;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/media/AudioOutputMonitor;
 
@@ -63,13 +65,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->bindContext(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$1.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$1.smali
index 41127aa02c..ab5cb60f56 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$1.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AudioOutputMonitor.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Intent;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/media/AudioOutputMonitor;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/media/AudioOutputMonitor;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleHeadsetPlugIntent"
+
+    const-string v5, "handleHeadsetPlugIntent(Landroid/content/Intent;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleHeadsetPlugIntent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/media/AudioOutputMonitor;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleHeadsetPlugIntent(Landroid/content/Intent;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Landroid/content/Intent;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/media/AudioOutputMonitor;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->access$handleHeadsetPlugIntent(Lcom/discord/utilities/media/AudioOutputMonitor;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$2.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$2.smali
index fe7eb5a84f..62e5d9c683 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$2.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AudioOutputMonitor.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Intent;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/media/AudioOutputMonitor;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/media/AudioOutputMonitor;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleBluetoothAdapterUpdate"
+
+    const-string v5, "handleBluetoothAdapterUpdate(Landroid/content/Intent;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBluetoothAdapterUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/media/AudioOutputMonitor;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBluetoothAdapterUpdate(Landroid/content/Intent;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Landroid/content/Intent;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/media/AudioOutputMonitor;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->access$handleBluetoothAdapterUpdate(Lcom/discord/utilities/media/AudioOutputMonitor;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$3.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$3.smali
index e1c3728c26..72b430dcc5 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$3.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AudioOutputMonitor.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Intent;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/media/AudioOutputMonitor;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/media/AudioOutputMonitor;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleScoUpdate"
+
+    const-string v5, "handleScoUpdate(Landroid/content/Intent;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleScoUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/media/AudioOutputMonitor;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleScoUpdate(Landroid/content/Intent;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Landroid/content/Intent;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/media/AudioOutputMonitor;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->access$handleScoUpdate(Lcom/discord/utilities/media/AudioOutputMonitor;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$4.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$4.smali
index 2c4130e84d..5a714bbd4b 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$4.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$intentHandlers$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/media/AudioOutputMonitor$intentHandlers$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AudioOutputMonitor.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Intent;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/media/AudioOutputMonitor;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/media/AudioOutputMonitor;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleBluetoothConnectionUpdate"
+
+    const-string v5, "handleBluetoothConnectionUpdate(Landroid/content/Intent;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBluetoothConnectionUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/media/AudioOutputMonitor;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleBluetoothConnectionUpdate(Landroid/content/Intent;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Landroid/content/Intent;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/media/AudioOutputMonitor;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->access$handleBluetoothConnectionUpdate(Lcom/discord/utilities/media/AudioOutputMonitor;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
index c0ada0ed57..244e42100f 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
@@ -668,9 +668,9 @@
 
     iget-object v0, p0, Lcom/discord/utilities/media/AudioOutputMonitor;->outputStateSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -680,7 +680,9 @@
 .method public final bindContext(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/media/AudioOutputMonitor;->intentFilter:Landroid/content/IntentFilter;
 
@@ -689,15 +691,6 @@
     invoke-direct {p0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->handleInitialState(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getOutputState()Lrx/Observable;
@@ -719,7 +712,7 @@
 
     const-string v1, "outputStateSubject\n        .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -737,7 +730,7 @@
 
     const-string v0, "intent?.action ?: return"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/media/AudioOutputMonitor;->intentHandlers:Ljava/util/Map;
 
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
index b60ab23ad6..8d062b14c5 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
@@ -358,7 +358,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/media/AudioOutputState;->bluetoothDeviceName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali
index 03577036c8..b9049663bd 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$DrainListener.smali
@@ -43,7 +43,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onCompleted"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,15 +60,6 @@
     iput-object p1, p0, Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;->isCompleted:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
-
-    :cond_0
-    const-string p1, "onCompleted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -79,7 +72,7 @@
     :try_start_0
     const-string v0, "result"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;->isCompleted:Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -102,16 +95,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali
index 169a0e827f..4ff9012576 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$InflightRequest.smali
@@ -26,13 +26,17 @@
 .method public constructor <init>(Lcom/discord/utilities/messagesend/MessageRequest;Lrx/Subscription;Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "baseRequest"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "networkSubscription"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "drainListener"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,27 +47,6 @@
     iput-object p3, p0, Lcom/discord/utilities/messagesend/MessageQueue$InflightRequest;->drainListener:Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;
 
     return-void
-
-    :cond_0
-    const-string p1, "drainListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "networkSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "baseRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali
index d6b2f0485a..d82f84e74a 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$cancel$1.smali
@@ -59,7 +59,7 @@
 
     iget-object v2, p0, Lcom/discord/utilities/messagesend/MessageQueue$cancel$1;->$requestId:Ljava/lang/String;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -113,7 +113,7 @@
 
     iget-object v3, p0, Lcom/discord/utilities/messagesend/MessageQueue$cancel$1;->$requestId:Ljava/lang/String;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$1.smali
index 332b8c5627..ebab8a5cf7 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doEdit$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessage;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelMessage;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue$doEdit$1;->this$0:Lcom/discord/utilities/messagesend/MessageQueue;
 
@@ -74,13 +76,4 @@
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/messagesend/MessageQueue;->access$handleSuccess(Lcom/discord/utilities/messagesend/MessageQueue;Lcom/discord/models/domain/ModelMessage;Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$2.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$2.smali
index deb480b808..f39c492047 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$2.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doEdit$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue$doEdit$2;->this$0:Lcom/discord/utilities/messagesend/MessageQueue;
 
@@ -74,13 +76,4 @@
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/messagesend/MessageQueue;->access$handleError(Lcom/discord/utilities/messagesend/MessageQueue;Lcom/discord/utilities/error/Error;Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$3.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$3.smali
index 3cc6abe91b..b57530e014 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$3.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doEdit$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doEdit$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue$doEdit$3;->this$0:Lcom/discord/utilities/messagesend/MessageQueue;
 
@@ -84,13 +86,4 @@
     invoke-static {v0, v1}, Lcom/discord/utilities/messagesend/MessageQueue;->access$setInFlightRequest$p(Lcom/discord/utilities/messagesend/MessageQueue;Lcom/discord/utilities/messagesend/MessageQueue$InflightRequest;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali
index 3fae3639cd..5a8abe63f8 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -73,10 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali
index fb6f3b0349..5b09ba18c3 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.utilities.rest.SendUtils.SendPayload.ReadyToSend"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali
index 86256205eb..d9fda809e3 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$2.smali
@@ -3,7 +3,7 @@
 .source "MessageQueue.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelMessage;",
             ">;"
         }
@@ -171,11 +174,11 @@
     goto :goto_1
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$3.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$3.smali
index 0f497d3c25..4417d4bd0a 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$3.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doSend$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelMessage;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "resultMessage"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/messagesend/MessageQueue$doSend$3;->$drainListener:Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$4.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$4.smali
index 9d5fcab938..be2953e1d6 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$4.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doSend$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue$doSend$4;->this$0:Lcom/discord/utilities/messagesend/MessageQueue;
 
@@ -74,13 +76,4 @@
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/messagesend/MessageQueue;->access$handleError(Lcom/discord/utilities/messagesend/MessageQueue;Lcom/discord/utilities/error/Error;Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$5.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$5.smali
index e904374e81..d1a318a6c9 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$5.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$doSend$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$doSend$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue$doSend$5;->this$0:Lcom/discord/utilities/messagesend/MessageQueue;
 
@@ -84,13 +86,4 @@
     invoke-static {v0, v1}, Lcom/discord/utilities/messagesend/MessageQueue;->access$setInFlightRequest$p(Lcom/discord/utilities/messagesend/MessageQueue;Lcom/discord/utilities/messagesend/MessageQueue$InflightRequest;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2$1.smali
index 21886d57a5..bfb53b24b0 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.smali
index a0ff84614d..af4013e9e0 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/messagesend/MessageResult;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/messagesend/MessageResult;)V
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "result"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/utilities/messagesend/MessageResult$RateLimited;
 
@@ -131,13 +133,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
index a18ae9adbc..4461dce4b6 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
@@ -15,9 +15,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/utilities/messagesend/MessageQueue$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final DEFAULT_MESSAGE_TIMEOUT_MS:J = 0x36ee80L
 
@@ -72,13 +69,17 @@
 .method public constructor <init>(Landroid/content/ContentResolver;Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/time/Clock;Z)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "contentResolver"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "executorService"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -119,27 +120,6 @@
     iput-object p1, p0, Lcom/discord/utilities/messagesend/MessageQueue;->networkBackoff:Lcom/discord/utilities/networking/Backoff;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "executorService"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "contentResolver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getExecutorService$p(Lcom/discord/utilities/messagesend/MessageQueue;)Ljava/util/concurrent/ExecutorService;
@@ -372,13 +352,13 @@
 
     const-string v9, "request.activity?.sessionId ?: return@let null"
 
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v9, Lcom/discord/restapi/RestAPIParams$Message$Activity;
 
     const-string v10, "it"
 
-    invoke-static {v6, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
 
@@ -390,7 +370,7 @@
 
     const-string v11, "it.partyId"
 
-    invoke-static {v6, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v9, v10, v6, v8}, Lcom/discord/restapi/RestAPIParams$Message$Activity;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -477,23 +457,23 @@
 
     const-string v7, "SendUtils\n        .getSe\u2026  }\n          }\n        }"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v7, Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1;->INSTANCE:Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$1;
 
-    invoke-virtual {v6, v7}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v6, v7}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v6
 
     sget-object v7, Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2;->INSTANCE:Lcom/discord/utilities/messagesend/MessageQueue$doSend$$inlined$filterIs$2;
 
-    invoke-virtual {v6, v7}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v6, v7}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v6
 
     const-string v7, "filter { it is T }.map { it as T }"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6, v5}, Lrx/Observable;->V(I)Lrx/Observable;
 
@@ -503,13 +483,13 @@
 
     invoke-direct {v6, v3}, Lcom/discord/utilities/messagesend/MessageQueue$doSend$2;-><init>(Lcom/discord/models/domain/ModelMessage;)V
 
-    invoke-virtual {v5, v6}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v5, v6}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
     const-string v5, "SendUtils\n        .getSe\u2026ge)\n          }\n        }"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
 
@@ -543,7 +523,7 @@
 .end method
 
 .method private final handleError(Lcom/discord/utilities/error/Error;Lcom/discord/utilities/messagesend/MessageQueue$DrainListener;)V
-    .locals 4
+    .locals 5
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
@@ -551,21 +531,23 @@
 
     const-string v1, "error.response"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
     move-result v0
 
-    const-wide/16 v2, 0x64
+    const-string v2, "error.response.retryAfterMs ?: DEFAULT_RETRY_MS"
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    const-wide/16 v3, 0x64
 
-    move-result-object v2
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    const/16 v3, 0x4e30
+    move-result-object v3
 
-    if-ne v0, v3, :cond_1
+    const/16 v4, 0x4e30
+
+    if-ne v0, v4, :cond_1
 
     new-instance v0, Lcom/discord/utilities/messagesend/MessageResult$Slowmode;
 
@@ -573,7 +555,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getRetryAfterMs()Ljava/lang/Long;
 
@@ -581,10 +563,12 @@
 
     if-eqz p1, :cond_0
 
-    move-object v2, p1
+    move-object v3, p1
 
     :cond_0
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v1
 
@@ -597,9 +581,9 @@
 
     move-result-object v0
 
-    sget-object v3, Lcom/discord/utilities/error/Error$Type;->RATE_LIMITED:Lcom/discord/utilities/error/Error$Type;
+    sget-object v4, Lcom/discord/utilities/error/Error$Type;->RATE_LIMITED:Lcom/discord/utilities/error/Error$Type;
 
-    if-ne v0, v3, :cond_3
+    if-ne v0, v4, :cond_3
 
     new-instance v0, Lcom/discord/utilities/messagesend/MessageResult$RateLimited;
 
@@ -607,7 +591,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getRetryAfterMs()Ljava/lang/Long;
 
@@ -615,10 +599,12 @@
 
     if-eqz p1, :cond_2
 
-    move-object v2, p1
+    move-object v3, p1
 
     :cond_2
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v1
 
@@ -812,7 +798,9 @@
 .method public final cancel(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "requestId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue;->executorService:Ljava/util/concurrent/ExecutorService;
 
@@ -823,21 +811,14 @@
     invoke-interface {v0, v1}, Ljava/util/concurrent/ExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "requestId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final enqueue(Lcom/discord/utilities/messagesend/MessageRequest;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "request"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/messagesend/MessageQueue;->executorService:Ljava/util/concurrent/ExecutorService;
 
@@ -848,15 +829,6 @@
     invoke-interface {v0, v1}, Ljava/util/concurrent/ExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "request"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final handleConnected()V
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit$1.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit$1.smali
index 4ff90142ff..c504881099 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit$1.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/messagesend/MessageRequest$Edit$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageQueue.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/utilities/messagesend/MessageResult;",
         "Ljava/lang/Boolean;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,16 +78,9 @@
 .method public final invoke(Lcom/discord/utilities/messagesend/MessageResult;Z)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali
index 585059bfe5..b896826ee6 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Edit.smali
@@ -24,23 +24,25 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/String;JJ)V
-    .locals 6
+    .locals 7
 
-    if-eqz p3, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p4, p5}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    sget-object v2, Lcom/discord/utilities/messagesend/MessageRequest$Edit$1;->INSTANCE:Lcom/discord/utilities/messagesend/MessageRequest$Edit$1;
+    sget-object v3, Lcom/discord/utilities/messagesend/MessageRequest$Edit$1;->INSTANCE:Lcom/discord/utilities/messagesend/MessageRequest$Edit$1;
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    move-object v0, p0
+    move-object v1, p0
 
-    move-wide v3, p6
+    move-wide v4, p6
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/messagesend/MessageRequest;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function2;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/messagesend/MessageRequest;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function2;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/utilities/messagesend/MessageRequest$Edit;->channelId:J
 
@@ -49,15 +51,6 @@
     iput-wide p4, p0, Lcom/discord/utilities/messagesend/MessageRequest$Edit;->messageId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
index 8185beb10c..8e954c5f33 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageRequest$Send.smali
@@ -88,25 +88,31 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "onCompleted"
 
-    if-eqz p5, :cond_2
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "onPreprocessing"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onProgress"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getNonce()Ljava/lang/String;
 
     move-result-object v2
 
-    if-eqz v2, :cond_0
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v0, "message.nonce!!"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -129,39 +135,6 @@
     iput-object p6, p0, Lcom/discord/utilities/messagesend/MessageRequest$Send;->onProgress:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onProgress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onPreprocessing"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "onCompleted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali
index 72e801920b..bb12817913 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$Success.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelMessage;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/messagesend/MessageResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/messagesend/MessageResult$Success;->message:Lcom/discord/models/domain/ModelMessage;
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali
index ff15ea7ce8..4554708fc9 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$UnknownFailure.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "error"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/messagesend/MessageResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;->error:Lcom/discord/utilities/error/Error;
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$ValidationError.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$ValidationError.smali
index 005afbad1b..07e84a8aa9 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$ValidationError.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$ValidationError.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/messagesend/MessageResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/messagesend/MessageResult$ValidationError;->message:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali
index 7a0a9ec123..a8ff2c005a 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter.smali
@@ -106,7 +106,7 @@
 
     move-result-object v7
 
-    invoke-static {v7, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -127,7 +127,7 @@
 
     const-string v7, "item.getKey()"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;->getOrigPositions()Ljava/util/Map;
 
@@ -229,9 +229,9 @@
 
     move-object p2, p1
 
-    check-cast p2, Lj0/i/q;
+    check-cast p2, Lk0/j/q;
 
-    invoke-virtual {p2}, Lj0/i/q;->nextInt()I
+    invoke-virtual {p2}, Lk0/j/q;->nextInt()I
 
     move-result p2
 
@@ -249,7 +249,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
index 1307aed440..2fbfab93a2 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali
@@ -90,7 +90,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v0}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
@@ -117,9 +117,9 @@
 
     move-object v2, v0
 
-    check-cast v2, Lj0/i/q;
+    check-cast v2, Lk0/j/q;
 
-    invoke-virtual {v2}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v2}, Lk0/j/q;->nextInt()I
 
     move-result v2
 
@@ -159,7 +159,7 @@
 
     const-string v3, "item.getKey()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Lcom/discord/utilities/mg_recycler/DragAndDropAdapter$Payload;->getPosition()I
 
@@ -424,7 +424,7 @@
 .end method
 
 .method public setData(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -433,26 +433,19 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;->computeOriginalPositions(Ljava/util/List;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;->setAndCopyData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setDataCopy(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -461,24 +454,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;->dataCopy:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOrigPositions(Ljava/util/Map;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -489,18 +475,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/mg_recycler/DragAndDropAdapter;->origPositions:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali
index 158d282f1a..2306754b72 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion.smali
@@ -45,77 +45,79 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "adapter"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-virtual {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Landroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+    invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 
-    move-result-object v2
+    move-result-object v1
 
-    instance-of v3, v2, Landroidx/recyclerview/widget/LinearLayoutManager;
+    instance-of v2, v1, Landroidx/recyclerview/widget/LinearLayoutManager;
 
-    if-nez v3, :cond_0
+    const/4 v3, 0x0
 
-    move-object v2, v0
+    if-nez v2, :cond_0
+
+    move-object v1, v3
 
     :cond_0
-    check-cast v2, Landroidx/recyclerview/widget/LinearLayoutManager;
+    check-cast v1, Landroidx/recyclerview/widget/LinearLayoutManager;
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->getOrientation()I
+    invoke-virtual {v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->getOrientation()I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :cond_1
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :goto_0
     new-instance v4, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager;
 
-    invoke-direct {v4, p1, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager;-><init>(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;I)V
+    invoke-direct {v4, p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager;-><init>(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;I)V
 
-    invoke-virtual {v1, v4}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+    invoke-virtual {v0, v4}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
 
-    invoke-virtual {v1, p1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+    invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
-    invoke-virtual {v1, v3}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+    invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
-    invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView;->getItemAnimator()Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
+    invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getItemAnimator()Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Landroidx/recyclerview/widget/SimpleItemAnimator;
+    instance-of v1, v0, Landroidx/recyclerview/widget/SimpleItemAnimator;
 
-    if-nez v2, :cond_2
+    if-nez v1, :cond_2
 
     goto :goto_1
 
     :cond_2
-    move-object v0, v1
+    move-object v3, v0
 
     :goto_1
-    check-cast v0, Landroidx/recyclerview/widget/SimpleItemAnimator;
+    check-cast v3, Landroidx/recyclerview/widget/SimpleItemAnimator;
 
-    if-eqz v0, :cond_3
+    if-eqz v3, :cond_3
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/SimpleItemAnimator;->setSupportsChangeAnimations(Z)V
+    invoke-virtual {v3, v0}, Landroidx/recyclerview/widget/SimpleItemAnimator;->setSupportsChangeAnimations(Z)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -130,11 +132,4 @@
     invoke-direct {v0, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
-
-    :cond_4
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager.smali
index 2bcf2094f2..49449813cd 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager.smali
@@ -49,7 +49,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->getContext()Landroid/content/Context;
 
@@ -86,15 +88,6 @@
     invoke-virtual {p0, p1}, Landroidx/recyclerview/widget/LinearLayoutManager;->setSmoothScrollbarEnabled(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final resetAdapter(Ljava/lang/Throwable;)V
@@ -167,7 +160,9 @@
 .method public onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 4
 
-    if-eqz p2, :cond_3
+    const-string v0, "state"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-super {p0, p1, p2}, Landroidx/recyclerview/widget/LinearLayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
@@ -195,7 +190,7 @@
 
     const-string v3, "trying to unhide"
 
-    invoke-static {p2, v3, v2, v1}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p2, v3, v2, v1}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p2
 
@@ -210,7 +205,7 @@
 
     const-string v3, "tying to hide"
 
-    invoke-static {p2, v3, v2, v1}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p2, v3, v2, v1}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p2
 
@@ -238,13 +233,4 @@
 
     :goto_0
     return-void
-
-    :cond_3
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
index 20540bcc20..3a8a015433 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
@@ -49,9 +49,11 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -64,15 +66,6 @@
     iput-object p1, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->cellSubscriptions:Lrx/subscriptions/CompositeSubscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
@@ -129,7 +122,7 @@
 
     const-string v1, "recycler.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -210,7 +203,7 @@
 .end method
 
 .method public onBindViewHolder(Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;I)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -219,37 +212,23 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onBindViewHolder(I)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setRecycler(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali
index 66cf4fc9a0..afb08653df 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.smali
@@ -186,7 +186,7 @@
 .end method
 
 .method private handleError(Ljava/lang/Throwable;)V
-    .locals 4
+    .locals 3
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -196,11 +196,9 @@
 
     sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x6
+    const-string v2, "Unable to configure recycler."
 
-    const-string v3, "Unable to configure recycler."
-
-    invoke-virtual {v1, v3, v2, p1, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v1, v2, p1, v0}, Lcom/discord/app/AppLog;->e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
     return-void
 .end method
@@ -320,11 +318,11 @@
 
     move-result-object v1
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -332,7 +330,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali
index 1ab8db2d0e..4fbfd6c30f 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerViewHolder.smali
@@ -39,7 +39,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -61,20 +63,11 @@
 
     const-string v0, "adapter.recycler.let {\n \u2026te(layout, it, false)\n  }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(Landroid/view/View;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/view/View;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
@@ -87,31 +80,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "itemView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     iput-object p2, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -194,11 +175,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onClickListener"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string/jumbo v0, "views"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p2
 
@@ -247,20 +230,6 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "views"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final varargs setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
@@ -277,11 +246,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onLongClickListener"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string/jumbo v0, "views"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p2
 
@@ -330,18 +301,4 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "views"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "onLongClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali b/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali
index eeccfe5db5..038aa4127a 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff$TimerScheduler.smali
@@ -75,7 +75,7 @@
     :try_start_0
     const-string v0, "action"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/networking/Backoff$TimerScheduler;->timeoutTimerTask:Ljava/util/TimerTask;
 
@@ -98,16 +98,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/networking/Backoff$fail$1.smali b/com.discord/smali/com/discord/utilities/networking/Backoff$fail$1.smali
index a2da253375..2c246fa276 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff$fail$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff$fail$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/networking/Backoff$fail$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Backoff.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/networking/Backoff.smali b/com.discord/smali/com/discord/utilities/networking/Backoff.smali
index f70189b98e..96538fa460 100644
--- a/com.discord/smali/com/discord/utilities/networking/Backoff.smali
+++ b/com.discord/smali/com/discord/utilities/networking/Backoff.smali
@@ -56,9 +56,11 @@
 .end method
 
 .method public constructor <init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p7, :cond_0
+    const-string v0, "scheduler"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -75,15 +77,6 @@
     iput-wide p1, p0, Lcom/discord/utilities/networking/Backoff;->current:J
 
     return-void
-
-    :cond_0
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$State.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$State.smali
new file mode 100644
index 0000000000..02c83a1581
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$State.smali
@@ -0,0 +1,123 @@
+.class public final enum Lcom/discord/utilities/networking/NetworkMonitor$State;
+.super Ljava/lang/Enum;
+.source "NetworkMonitor.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/networking/NetworkMonitor;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "State"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/discord/utilities/networking/NetworkMonitor$State;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic $VALUES:[Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+.field public static final enum OFFLINE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+.field public static final enum OFFLINE_AIRPLANE_MODE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+.field public static final enum ONLINE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    new-instance v1, Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    const-string v2, "ONLINE"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Lcom/discord/utilities/networking/NetworkMonitor$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/utilities/networking/NetworkMonitor$State;->ONLINE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    const-string v2, "OFFLINE"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Lcom/discord/utilities/networking/NetworkMonitor$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/utilities/networking/NetworkMonitor$State;->OFFLINE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    const-string v2, "OFFLINE_AIRPLANE_MODE"
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, v2, v3}, Lcom/discord/utilities/networking/NetworkMonitor$State;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lcom/discord/utilities/networking/NetworkMonitor$State;->OFFLINE_AIRPLANE_MODE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lcom/discord/utilities/networking/NetworkMonitor$State;->$VALUES:[Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/discord/utilities/networking/NetworkMonitor$State;
+    .locals 1
+
+    const-class v0, Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/discord/utilities/networking/NetworkMonitor$State;
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/networking/NetworkMonitor$State;->$VALUES:[Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    invoke-virtual {v0}, [Lcom/discord/utilities/networking/NetworkMonitor$State;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$observeIsConnected$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$observeIsConnected$1.smali
new file mode 100644
index 0000000000..993725ccc6
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$observeIsConnected$1.smali
@@ -0,0 +1,94 @@
+.class public final Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;
+.super Ljava/lang/Object;
+.source "NetworkMonitor.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/networking/NetworkMonitor;->observeIsConnected()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/networking/NetworkMonitor$State;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;->INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/utilities/networking/NetworkMonitor$State;)Ljava/lang/Boolean;
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/networking/NetworkMonitor$State;->ONLINE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;->call(Lcom/discord/utilities/networking/NetworkMonitor$State;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1.smali
new file mode 100644
index 0000000000..2cd2b452dc
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1.smali
@@ -0,0 +1,59 @@
+.class public final Lcom/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1;
+.super Landroid/content/BroadcastReceiver;
+.source "NetworkMonitor.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/networking/NetworkMonitor;->registerAirplaneModeBroadcast(Landroid/content/Context;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/utilities/networking/NetworkMonitor;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+    invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "intent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    invoke-static {p2, p1, v0, v1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->updateNetworkState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1$1.smali
index a1403a5a76..3ff3cd1621 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1$1.smali
@@ -39,31 +39,19 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "intent"
 
-    iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p2, p2, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+    iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;
 
-    invoke-static {p2, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+    iget-object v0, v0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+    invoke-static {v0, p1, p2}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateNetworkState(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali
index 291d9b2d25..f9eb31add1 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NetworkMonitor.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali
index 2933089c2a..82c5aaa5e2 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali
@@ -43,59 +43,81 @@
 
 # virtual methods
 .method public onAvailable(Landroid/net/Network;)V
-    .locals 1
+    .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "network"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
 
     iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
 
-    invoke-static {p1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/utilities/networking/NetworkMonitor;->updateNetworkState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)V
 
     return-void
+.end method
 
-    :cond_0
-    const-string p1, "network"
+.method public onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V
+    .locals 2
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v0, "network"
 
-    const/4 p1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p1
+    const-string p1, "networkCapabilities"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+    iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    invoke-static {p1, p2, v0, v1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->updateNetworkState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)V
+
+    return-void
 .end method
 
 .method public onLost(Landroid/net/Network;)V
-    .locals 1
+    .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "network"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
 
     iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
 
-    invoke-static {p1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/utilities/networking/NetworkMonitor;->updateNetworkState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "network"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onUnavailable()V
-    .locals 2
+    .locals 4
 
     iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
 
     iget-object v1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
 
-    invoke-static {v0, v1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/networking/NetworkMonitor;->updateNetworkState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
index 431c09985e..d1ea1b8fbc 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
@@ -3,12 +3,20 @@
 .source "NetworkMonitor.kt"
 
 
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/utilities/networking/NetworkMonitor$State;
+    }
+.end annotation
+
+
 # instance fields
-.field public final isConnectedSubject:Lrx/subjects/BehaviorSubject;
+.field public final networkStateSubject:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/BehaviorSubject<",
-            "Ljava/lang/Boolean;",
+            "Lcom/discord/utilities/networking/NetworkMonitor$State;",
             ">;"
         }
     .end annotation
@@ -17,17 +25,19 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
+    .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->isDeviceConnected(Landroid/content/Context;)Z
+    const/4 v0, 0x0
 
-    move-result v0
+    const/4 v1, 0x2
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->getState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Lcom/discord/utilities/networking/NetworkMonitor$State;
 
     move-result-object v0
 
@@ -35,44 +45,93 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->isConnectedSubject:Lrx/subjects/BehaviorSubject;
+    iput-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject;
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->registerConnectivityNetworkMonitor(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public static final synthetic access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+.method public static final synthetic access$updateNetworkState(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;)V
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->updateIsConnected(Landroid/content/Context;)V
+    invoke-direct {p0, p1, p2}, Lcom/discord/utilities/networking/NetworkMonitor;->updateNetworkState(Landroid/content/Context;Landroid/content/Intent;)V
 
     return-void
 .end method
 
-.method private final isDeviceConnected(Landroid/content/Context;)Z
+.method private final getState(Landroid/content/Context;Landroid/content/Intent;)Lcom/discord/utilities/networking/NetworkMonitor$State;
     .locals 1
 
     sget-object v0, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
 
-    invoke-virtual {v0, p1}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;)Z
+    invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;Landroid/content/Intent;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_0
+
+    sget-object p1, Lcom/discord/utilities/networking/NetworkMonitor$State;->ONLINE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p2, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
+
+    invoke-virtual {p2, p1}, Lcom/discord/utilities/io/NetworkUtils;->isAirplaneModeOn(Landroid/content/Context;)Z
 
     move-result p1
 
-    return p1
+    if-eqz p1, :cond_1
+
+    sget-object p1, Lcom/discord/utilities/networking/NetworkMonitor$State;->OFFLINE_AIRPLANE_MODE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    goto :goto_0
+
+    :cond_1
+    sget-object p1, Lcom/discord/utilities/networking/NetworkMonitor$State;->OFFLINE:Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public static synthetic getState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Lcom/discord/utilities/networking/NetworkMonitor$State;
+    .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/networking/NetworkMonitor;->getState(Landroid/content/Context;Landroid/content/Intent;)Lcom/discord/utilities/networking/NetworkMonitor$State;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final registerAirplaneModeBroadcast(Landroid/content/Context;)V
+    .locals 2
+
+    new-instance v0, Landroid/content/IntentFilter;
+
+    const-string v1, "android.intent.action.AIRPLANE_MODE"
+
+    invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
+
+    new-instance v1, Lcom/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/utilities/networking/NetworkMonitor$registerAirplaneModeBroadcast$1;-><init>(Lcom/discord/utilities/networking/NetworkMonitor;)V
+
+    invoke-virtual {p1, v1, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
+
+    return-void
 .end method
 
 .method private final registerConnectivityNetworkMonitor(Landroid/content/Context;)V
-    .locals 4
+    .locals 5
 
     const-string v0, "connectivity"
 
@@ -99,11 +158,11 @@
 
     invoke-direct {v2, p0, v0, v1, p1}, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;-><init>(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/net/ConnectivityManager;Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;Landroid/content/Context;)V
 
-    sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v3, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v3, 0x18
+    const/16 v4, 0x18
 
-    if-lt p1, v3, :cond_1
+    if-lt v3, v4, :cond_1
 
     :try_start_0
     invoke-virtual {v0, v1}, Landroid/net/ConnectivityManager;->registerDefaultNetworkCallback(Landroid/net/ConnectivityManager$NetworkCallback;)V
@@ -120,21 +179,19 @@
     :cond_1
     invoke-virtual {v2}, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->invoke()V
 
-    :cond_2
     :goto_0
+    invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->registerAirplaneModeBroadcast(Landroid/content/Context;)V
+
+    :cond_2
     return-void
 .end method
 
-.method private final updateIsConnected(Landroid/content/Context;)V
+.method private final updateNetworkState(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->isConnectedSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->isDeviceConnected(Landroid/content/Context;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-direct {p0, p1, p2}, Lcom/discord/utilities/networking/NetworkMonitor;->getState(Landroid/content/Context;Landroid/content/Intent;)Lcom/discord/utilities/networking/NetworkMonitor$State;
 
     move-result-object p1
 
@@ -143,9 +200,24 @@
     return-void
 .end method
 
+.method public static synthetic updateNetworkState$default(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)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/networking/NetworkMonitor;->updateNetworkState(Landroid/content/Context;Landroid/content/Intent;)V
+
+    return-void
+.end method
+
 
 # virtual methods
-.method public final getIsConnected()Lrx/Observable;
+.method public final observeIsConnected()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -156,15 +228,45 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->isConnectedSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject;
+
+    sget-object v1, Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;->INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$observeIsConnected$1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
 
     invoke-virtual {v0}, Lrx/Observable;->q()Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "isConnectedSubject.distinctUntilChanged()"
+    const-string v1, "networkStateSubject.map \u2026 }.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final observeState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Lcom/discord/utilities/networking/NetworkMonitor$State;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->networkStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0}, Lrx/Observable;->q()Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "networkStateSubject.distinctUntilChanged()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali
index 7554992c03..6183455a47 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$DialogData.smali
@@ -62,11 +62,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "headerText"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "bodyText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -83,20 +85,6 @@
     iput-object p6, p0, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->extraLayoutId:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "bodyText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "headerText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -323,11 +311,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "headerText"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "bodyText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
 
@@ -348,20 +338,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "bodyText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "headerText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -379,7 +355,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->headerText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -389,7 +365,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->bodyText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -399,7 +375,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->okText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -409,7 +385,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->cancelText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -419,7 +395,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->listenerMap:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -429,7 +405,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->extraLayoutId:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali
index ae3ef91c0c..243423920e 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NoticeBuilders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;->$notice:Lcom/discord/stores/StoreNotices$Dialog;
 
@@ -79,56 +79,58 @@
 
     move-result-object p1
 
-    const-string v1, "platform_name"
+    const-string v0, "platform_name"
 
-    invoke-interface {p1, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
-    instance-of v1, p1, Ljava/lang/String;
+    instance-of v0, p1, Ljava/lang/String;
 
-    if-nez v1, :cond_0
+    const/4 v1, 0x0
 
-    move-object p1, v0
+    if-nez v0, :cond_0
+
+    move-object p1, v1
 
     :cond_0
     check-cast p1, Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;->$notice:Lcom/discord/stores/StoreNotices$Dialog;
+    iget-object v0, p0, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;->$notice:Lcom/discord/stores/StoreNotices$Dialog;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices$Dialog;->getMetadata()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreNotices$Dialog;->getMetadata()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, "connection_id"
 
-    invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Ljava/lang/String;
+    instance-of v2, v0, Ljava/lang/String;
 
     if-nez v2, :cond_1
 
     goto :goto_0
 
     :cond_1
-    move-object v0, v1
+    move-object v1, v0
 
     :goto_0
-    check-cast v0, Ljava/lang/String;
+    check-cast v1, Ljava/lang/String;
 
     if-eqz p1, :cond_2
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUserConnections()Lcom/discord/stores/StoreUserConnections;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserConnections()Lcom/discord/stores/StoreUserConnections;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p1, v0}, Lcom/discord/stores/StoreUserConnections;->deleteUserConnection(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, p1, v1}, Lcom/discord/stores/StoreUserConnections;->deleteUserConnection(Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_1
 
@@ -137,9 +139,9 @@
 
     new-instance v4, Ljava/lang/Exception;
 
-    const-string v1, ", "
+    const-string v0, ", "
 
-    invoke-static {p1, v1, v0}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -158,11 +160,4 @@
     :cond_3
     :goto_1
     return-void
-
-    :cond_4
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali
index 26d250a7d3..216df6c02c 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "NoticeBuilders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/content/Context;",
         "Lcom/discord/stores/StoreNotices$Dialog;",
@@ -30,55 +30,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/notices/NoticeBuilders;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/utilities/notices/NoticeBuilders;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string v4, "requestRatingModalBuilder"
+
+    const-string v5, "requestRatingModalBuilder(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestRatingModalBuilder"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/notices/NoticeBuilders;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestRatingModalBuilder(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/notices/NoticeBuilders;
 
@@ -87,20 +73,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali
index bced061062..c7fc54d11d 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/notices/NoticeBuilders$noticeDataBuilders$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "NoticeBuilders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/content/Context;",
         "Lcom/discord/stores/StoreNotices$Dialog;",
@@ -30,55 +30,41 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/notices/NoticeBuilders;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/utilities/notices/NoticeBuilders;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string v4, "deleteConnectionModalBuilder"
+
+    const-string v5, "deleteConnectionModalBuilder(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "deleteConnectionModalBuilder"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/notices/NoticeBuilders;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "deleteConnectionModalBuilder(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/notices/NoticeBuilders;
 
@@ -87,20 +73,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1.smali
index 5ee630c6b7..1101e42ec9 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NoticeBuilders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,9 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -82,13 +84,4 @@
     invoke-virtual {p1}, Lcom/discord/stores/StoreReviewRequest;->onReviewRequestShown()V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2.smali
index de128387b8..ce360269c0 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NoticeBuilders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,36 +71,31 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getReviewRequest()Lcom/discord/stores/StoreReviewRequest;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getReviewRequest()Lcom/discord/stores/StoreReviewRequest;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreReviewRequest;->onUserAcceptedRequest()V
+    invoke-virtual {v0}, Lcom/discord/stores/StoreReviewRequest;->onUserAcceptedRequest()V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const-string v1, "view.context"
+    const-string/jumbo v0, "view.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x6
 
     invoke-static {p1, v0, v0, v1, v0}, Lcom/discord/utilities/uri/UriHandler;->directToPlayStore$default(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$3.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$3.smali
index e62587eda0..c2dfb9ce49 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$3.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/notices/NoticeBuilders$requestRatingModalBuilder$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "NoticeBuilders.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,9 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -82,13 +84,4 @@
     invoke-virtual {p1}, Lcom/discord/stores/StoreReviewRequest;->onUserDismissedRequest()V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
index f544dba82a..a825d70c2d 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
@@ -109,13 +109,15 @@
 .end method
 
 .method private final deleteConnectionModalBuilder(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
-    .locals 11
+    .locals 10
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "DefaultLocale"
         }
     .end annotation
 
+    new-instance v9, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
+
     const/4 v0, 0x1
 
     new-array v0, v0, [Ljava/lang/Object;
@@ -142,7 +144,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1205aa
+    const v1, 0x7f1205ac
 
     invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -150,69 +152,67 @@
 
     const-string v1, "context.getString(\n     \u2026ATFORM_TITLE)\n          )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v1
 
     const-string v0, "(this as java.lang.String).toUpperCase()"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1205a9
+    const v0, 0x7f1205ab
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v2
 
     const-string v0, "context.getString(R.stri\u2026.disconnect_account_body)"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a062c
+    const v0, 0x7f0a0632
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;
+    new-instance v3, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;
 
-    invoke-direct {v1, p2}, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;-><init>(Lcom/discord/stores/StoreNotices$Dialog;)V
+    invoke-direct {v3, p2}, Lcom/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$1;-><init>(Lcom/discord/stores/StoreNotices$Dialog;)V
 
     new-instance p2, Lkotlin/Pair;
 
-    invoke-direct {p2, v0, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {p2, v0, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     invoke-static {p2}, Lf/n/a/k/a;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result-object v7
-
-    const p2, 0x7f1203b7
-
-    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v6
-
-    const p2, 0x7f1205a7
-
-    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
     move-result-object v5
 
+    const p2, 0x7f1203b8
+
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    const p2, 0x7f1205a9
+
+    invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x20
+
     const/4 v8, 0x0
 
-    const/16 v9, 0x20
+    move-object v0, v9
 
-    const/4 v10, 0x0
+    invoke-direct/range {v0 .. v8}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    new-instance p1, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
-
-    move-object v2, p1
-
-    invoke-direct/range {v2 .. v10}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object p1
+    return-object v9
 .end method
 
 .method private final requestRatingModalBuilder(Landroid/content/Context;Lcom/discord/stores/StoreNotices$Dialog;)Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
@@ -220,7 +220,7 @@
 
     new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
 
-    const v0, 0x7f1212fd
+    const v0, 0x7f121327
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -228,9 +228,9 @@
 
     const-string v0, "context.getString(R.string.rating_request_title)"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1212fc
+    const v0, 0x7f121326
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -238,7 +238,7 @@
 
     const-string v0, "context.getString(R.stri\u2026ing_request_body_android)"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0127
 
@@ -266,7 +266,7 @@
 
     const/4 v3, 0x1
 
-    const v4, 0x7f0a062c
+    const v4, 0x7f0a0632
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -282,7 +282,7 @@
 
     const/4 v3, 0x2
 
-    const v4, 0x7f0a0627
+    const v4, 0x7f0a062d
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -300,13 +300,13 @@
 
     move-result-object v5
 
-    const v0, 0x7f12107e
+    const v0, 0x7f1210a8
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v0, 0x7f120fa5
+    const v0, 0x7f120fcf
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -328,58 +328,67 @@
 
     move-object/from16 v1, p3
 
-    const/4 v2, 0x0
+    const-string v2, "context"
 
-    if-eqz v0, :cond_4
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v2, "fragmentManager"
 
-    if-eqz v1, :cond_2
+    move-object/from16 v4, p2
 
-    sget-object v3, Lcom/discord/utilities/notices/NoticeBuilders;->noticeDataBuilders:Ljava/util/Map;
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "notice"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lcom/discord/utilities/notices/NoticeBuilders;->noticeDataBuilders:Ljava/util/Map;
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/stores/StoreNotices$Dialog;->getType()Lcom/discord/stores/StoreNotices$Dialog$Type;
 
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
     move-result-object v3
 
-    check-cast v3, Lkotlin/jvm/functions/Function2;
+    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v3, :cond_0
+    move-result-object v2
 
-    invoke-interface {v3, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast v2, Lkotlin/jvm/functions/Function2;
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {v2, v0, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    move-object v2, v0
+    check-cast v0, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
 
-    check-cast v2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
+    goto :goto_0
 
     :cond_0
-    if-eqz v2, :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
 
     sget-object v3, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    invoke-virtual {v2}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getHeaderText()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getHeaderText()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v2}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getBodyText()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getBodyText()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v2}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getOkText()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getOkText()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {v2}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getCancelText()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getCancelText()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v2}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getListenerMap()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getListenerMap()Ljava/util/Map;
 
     move-result-object v9
 
@@ -387,7 +396,7 @@
 
     move-result-object v10
 
-    invoke-virtual {v2}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getExtraLayoutId()Ljava/lang/Integer;
+    invoke-virtual {v0}, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;->getExtraLayoutId()Ljava/lang/Integer;
 
     move-result-object v11
 
@@ -411,25 +420,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string v0, "notice"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_3
-    const-string v0, "fragmentManager"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_4
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali
index 2bbb5f318c..8f6b283857 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali
@@ -34,7 +34,7 @@
 
 # virtual methods
 .method public final from(Ljava/util/List;ZLjava/lang/Long;Ljava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext;
-    .locals 16
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -55,21 +55,25 @@
 
     move-object/from16 v1, p4
 
-    const/4 v2, 0x0
+    const-string v2, "categories"
 
-    if-eqz p1, :cond_13
+    move-object/from16 v3, p1
 
-    if-eqz v1, :cond_12
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "channelPermissions"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface/range {p1 .. p1}, Ljava/util/Collection;->isEmpty()Z
 
     move-result v2
 
-    const-wide/16 v3, 0x10
+    const-wide/16 v4, 0x10
 
-    const/4 v5, 0x1
+    const/4 v6, 0x1
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
     if-eqz v2, :cond_1
 
@@ -86,44 +90,44 @@
     :cond_2
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v3
 
-    if-eqz v7, :cond_0
+    if-eqz v3, :cond_0
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v3
 
-    check-cast v7, Lcom/discord/models/domain/ModelChannel;
+    check-cast v3, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v7
+    move-result-wide v8
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v7
+    move-result-object v3
 
-    invoke-interface {v1, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v3
 
-    check-cast v7, Ljava/lang/Long;
+    check-cast v3, Ljava/lang/Long;
 
-    invoke-static {v3, v4, v7}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v4, v5, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
-    move-result v7
+    move-result v3
 
-    if-eqz v7, :cond_2
+    if-eqz v3, :cond_2
 
     const/4 v1, 0x1
 
     :goto_0
     if-nez p2, :cond_4
 
-    const-wide/16 v7, 0x20
+    const-wide/16 v2, 0x20
 
-    invoke-static {v7, v8, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v2, v3, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result v2
 
@@ -132,18 +136,18 @@
     goto :goto_1
 
     :cond_3
-    const/4 v8, 0x0
+    const/4 v9, 0x0
 
     goto :goto_2
 
     :cond_4
     :goto_1
-    const/4 v8, 0x1
+    const/4 v9, 0x1
 
     :goto_2
     if-nez p2, :cond_6
 
-    invoke-static {v3, v4, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v4, v5, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result v2
 
@@ -154,13 +158,13 @@
     goto :goto_3
 
     :cond_5
-    const/4 v9, 0x0
+    const/4 v10, 0x0
 
     goto :goto_4
 
     :cond_6
     :goto_3
-    const/4 v9, 0x1
+    const/4 v10, 0x1
 
     :goto_4
     if-nez p2, :cond_8
@@ -176,13 +180,13 @@
     goto :goto_5
 
     :cond_7
-    const/4 v10, 0x0
+    const/4 v11, 0x0
 
     goto :goto_6
 
     :cond_8
     :goto_5
-    const/4 v10, 0x1
+    const/4 v11, 0x1
 
     :goto_6
     if-nez p2, :cond_a
@@ -198,13 +202,13 @@
     goto :goto_7
 
     :cond_9
-    const/4 v11, 0x0
+    const/4 v12, 0x0
 
     goto :goto_8
 
     :cond_a
     :goto_7
-    const/4 v11, 0x1
+    const/4 v12, 0x1
 
     :goto_8
     if-nez p2, :cond_c
@@ -220,13 +224,13 @@
     goto :goto_9
 
     :cond_b
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
     goto :goto_a
 
     :cond_c
     :goto_9
-    const/4 v12, 0x1
+    const/4 v13, 0x1
 
     :goto_a
     if-nez p2, :cond_e
@@ -242,13 +246,13 @@
     goto :goto_b
 
     :cond_d
-    const/4 v13, 0x0
+    const/4 v14, 0x0
 
     goto :goto_c
 
     :cond_e
     :goto_b
-    const/4 v13, 0x1
+    const/4 v14, 0x1
 
     :goto_c
     if-nez p2, :cond_10
@@ -264,13 +268,13 @@
     goto :goto_d
 
     :cond_f
-    const/4 v14, 0x0
+    const/4 v15, 0x0
 
     goto :goto_e
 
     :cond_10
     :goto_d
-    const/4 v14, 0x1
+    const/4 v15, 0x1
 
     :goto_e
     if-eqz p2, :cond_11
@@ -285,33 +289,19 @@
 
     if-eqz v0, :cond_11
 
-    const/4 v15, 0x1
+    const/16 v16, 0x1
 
     goto :goto_f
 
     :cond_11
-    const/4 v15, 0x0
+    const/16 v16, 0x0
 
     :goto_f
     new-instance v0, Lcom/discord/utilities/permissions/ManageGuildContext;
 
-    move-object v7, v0
+    move-object v8, v0
 
-    invoke-direct/range {v7 .. v15}, Lcom/discord/utilities/permissions/ManageGuildContext;-><init>(ZZZZZZZZ)V
+    invoke-direct/range {v8 .. v16}, Lcom/discord/utilities/permissions/ManageGuildContext;-><init>(ZZZZZZZZ)V
 
     return-object v0
-
-    :cond_12
-    const-string v0, "channelPermissions"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_13
-    const-string v0, "categories"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali b/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali
index 571f9d5587..80c9b3a668 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageMessageContext$Companion.smali
@@ -34,23 +34,29 @@
 
 # virtual methods
 .method public final from(Lcom/discord/models/domain/ModelMessage;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/lang/Integer;ZZ)Lcom/discord/utilities/permissions/ManageMessageContext;
-    .locals 11
+    .locals 12
 
     move-object v0, p2
 
-    const/4 v1, 0x0
+    const-string v1, "message"
 
-    if-eqz p1, :cond_d
+    move-object v2, p1
 
-    if-eqz p3, :cond_c
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "meUser"
+
+    move-object v3, p3
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
 
     move-result v1
 
-    const/4 v2, 0x1
+    const/4 v4, 0x1
 
-    const/4 v3, 0x0
+    const/4 v5, 0x0
 
     if-nez v1, :cond_0
 
@@ -64,125 +70,125 @@
     :goto_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v4
+    move-result-object v6
 
-    const-string v5, "message.author"
+    const-string v7, "message.author"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v4
-
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v6
 
-    cmp-long v8, v4, v6
+    invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    if-nez v8, :cond_1
+    move-result-wide v8
 
-    const/4 v4, 0x1
+    cmp-long v10, v6, v8
+
+    if-nez v10, :cond_1
+
+    const/4 v6, 0x1
 
     goto :goto_1
 
     :cond_1
-    const/4 v4, 0x0
+    const/4 v6, 0x0
 
     :goto_1
     if-eqz p5, :cond_2
 
     if-nez p6, :cond_2
 
-    const/4 v5, 0x1
+    const/4 v7, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v5, 0x0
+    const/4 v7, 0x0
 
     :goto_2
     if-eqz p4, :cond_3
 
-    const-wide/16 v6, 0x2000
+    const-wide/16 v8, 0x2000
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
-    move-result v8
+    move-result v3
 
-    invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual/range {p4 .. p4}, Ljava/lang/Integer;->intValue()I
 
-    move-result v9
+    move-result v10
 
-    invoke-static {v6, v7, p2, v8, v9}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
+    invoke-static {v8, v9, p2, v3, v10}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
 
-    move-result v6
+    move-result v3
 
-    if-eqz v6, :cond_3
+    if-eqz v3, :cond_3
 
-    const/4 v6, 0x1
+    const/4 v3, 0x1
 
     goto :goto_3
 
     :cond_3
-    const/4 v6, 0x0
+    const/4 v3, 0x0
 
     :goto_3
-    if-nez v6, :cond_5
+    if-nez v3, :cond_5
 
-    if-eqz v5, :cond_4
+    if-eqz v7, :cond_4
 
     goto :goto_4
 
     :cond_4
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
     goto :goto_5
 
     :cond_5
     :goto_4
-    const/4 v7, 0x1
+    const/4 v8, 0x1
 
     :goto_5
-    if-eqz v4, :cond_6
+    if-eqz v6, :cond_6
 
     if-eqz v1, :cond_6
 
-    const/4 v8, 0x1
+    const/4 v9, 0x1
 
     goto :goto_6
 
     :cond_6
-    const/4 v8, 0x0
+    const/4 v9, 0x0
 
     :goto_6
-    if-nez v6, :cond_8
+    if-nez v3, :cond_8
 
-    if-eqz v4, :cond_7
+    if-eqz v6, :cond_7
 
     goto :goto_7
 
     :cond_7
-    const/4 v4, 0x0
+    const/4 v6, 0x0
 
     goto :goto_8
 
     :cond_8
     :goto_7
-    const/4 v4, 0x1
+    const/4 v6, 0x1
 
     :goto_8
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isLocal()Z
 
-    move-result v9
+    move-result v2
 
-    if-nez v9, :cond_a
+    if-nez v2, :cond_a
 
-    if-nez v5, :cond_9
+    if-nez v7, :cond_9
 
-    const-wide/16 v9, 0x40
+    const-wide/16 v10, 0x40
 
-    invoke-static {v9, v10, p2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v10, v11, p2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result v0
 
@@ -197,7 +203,7 @@
     const/4 v0, 0x0
 
     :goto_9
-    if-eqz v7, :cond_b
+    if-eqz v8, :cond_b
 
     if-eqz v1, :cond_b
 
@@ -206,38 +212,24 @@
     goto :goto_a
 
     :cond_b
-    const/4 v2, 0x0
+    const/4 v4, 0x0
 
     :goto_a
     new-instance v1, Lcom/discord/utilities/permissions/ManageMessageContext;
 
     move-object p1, v1
 
-    move p2, v6
+    move p2, v3
 
-    move p3, v8
+    move p3, v9
 
-    move p4, v4
+    move/from16 p4, v6
 
     move/from16 p5, v0
 
-    move/from16 p6, v2
+    move/from16 p6, v4
 
     invoke-direct/range {p1 .. p6}, Lcom/discord/utilities/permissions/ManageMessageContext;-><init>(ZZZZZ)V
 
     return-object v1
-
-    :cond_c
-    const-string v0, "meUser"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_d
-    const-string v0, "message"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali b/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali
index 7853676a30..332847303c 100644
--- a/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/ManageUserContext$Companion.smali
@@ -34,7 +34,7 @@
 
 # virtual methods
 .method public final from(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;Ljava/util/Collection;Ljava/lang/Long;Ljava/util/Map;)Lcom/discord/utilities/permissions/ManageUserContext;
-    .locals 20
+    .locals 22
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -65,79 +65,99 @@
 
     move-object/from16 v3, p7
 
-    const/4 v4, 0x0
+    const-string v4, "guild"
 
-    if-eqz p1, :cond_1d
+    move-object/from16 v5, p1
 
-    if-eqz p2, :cond_1c
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1b
+    const-string v4, "actingUser"
 
-    if-eqz v0, :cond_1a
+    move-object/from16 v6, p2
 
-    if-eqz v1, :cond_19
+    invoke-static {v6, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v3, :cond_18
+    const-string v4, "targetUser"
+
+    move-object/from16 v7, p3
+
+    invoke-static {v7, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "actingUserRoles"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v4, "userRoles"
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "guildRoles"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v4
+    move-result-wide v7
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v6
+    move-result-wide v9
 
-    cmp-long v10, v6, v4
+    const/4 v4, 0x1
 
-    if-nez v10, :cond_0
+    const/4 v11, 0x0
 
-    const/4 v10, 0x1
+    cmp-long v12, v9, v7
+
+    if-nez v12, :cond_0
+
+    const/4 v12, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v10, 0x0
+    const/4 v12, 0x0
 
     :goto_0
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getOwnerId()J
 
-    move-result-wide v11
+    move-result-wide v13
 
-    cmp-long v13, v6, v11
+    cmp-long v15, v9, v13
 
-    if-nez v13, :cond_1
+    if-nez v15, :cond_1
 
-    const/4 v6, 0x1
+    const/4 v9, 0x1
 
     goto :goto_1
 
     :cond_1
-    const/4 v6, 0x0
+    const/4 v9, 0x0
 
     :goto_1
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getOwnerId()J
 
-    move-result-wide v11
+    move-result-wide v13
 
-    cmp-long v7, v4, v11
+    cmp-long v10, v7, v13
 
-    if-nez v7, :cond_2
+    if-nez v10, :cond_2
 
-    const/4 v4, 0x1
+    const/4 v7, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v4, 0x0
+    const/4 v7, 0x0
 
     :goto_2
     invoke-static {v3, v0}, Lcom/discord/models/domain/ModelGuildRole;->getHighestRole(Ljava/util/Map;Ljava/util/Collection;)Lcom/discord/models/domain/ModelGuildRole;
 
     move-result-object v0
 
-    if-nez v6, :cond_4
+    if-nez v9, :cond_4
 
-    if-nez v4, :cond_3
+    if-nez v7, :cond_3
 
     invoke-static {v3, v1}, Lcom/discord/models/domain/ModelGuildRole;->getHighestRole(Ljava/util/Map;Ljava/util/Collection;)Lcom/discord/models/domain/ModelGuildRole;
 
@@ -169,166 +189,166 @@
 
     move-result v3
 
-    if-nez v6, :cond_6
+    if-nez v9, :cond_6
 
-    const-wide/16 v4, 0x8
+    const-wide/16 v5, 0x8
 
-    invoke-static {v4, v5, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
+    invoke-static {v5, v6, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
 
-    move-result v4
+    move-result v5
 
-    if-eqz v4, :cond_5
+    if-eqz v5, :cond_5
 
     goto :goto_5
 
     :cond_5
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     goto :goto_6
 
     :cond_6
     :goto_5
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
     :goto_6
-    if-nez v10, :cond_7
+    if-nez v12, :cond_7
 
     if-eqz v0, :cond_8
 
     :cond_7
-    if-nez v4, :cond_9
+    if-nez v5, :cond_9
 
-    const-wide/32 v11, 0x10000000
+    const-wide/32 v6, 0x10000000
 
-    invoke-static {v11, v12, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
+    invoke-static {v6, v7, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_8
+    if-eqz v6, :cond_8
 
     goto :goto_7
 
     :cond_8
-    const/4 v12, 0x0
+    const/4 v14, 0x0
 
     goto :goto_8
 
     :cond_9
     :goto_7
-    const/4 v12, 0x1
+    const/4 v14, 0x1
 
     :goto_8
-    if-nez v10, :cond_b
+    if-nez v12, :cond_b
 
     if-eqz v0, :cond_b
 
-    if-nez v4, :cond_a
+    if-nez v5, :cond_a
 
-    const-wide/16 v13, 0x2
+    const-wide/16 v6, 0x2
 
-    invoke-static {v13, v14, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
+    invoke-static {v6, v7, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_b
+    if-eqz v6, :cond_b
 
     :cond_a
-    const/4 v13, 0x1
+    const/4 v15, 0x1
 
     goto :goto_9
 
     :cond_b
-    const/4 v13, 0x0
+    const/4 v15, 0x0
 
     :goto_9
-    if-nez v10, :cond_d
+    if-nez v12, :cond_d
 
     if-eqz v0, :cond_d
 
-    if-nez v4, :cond_c
+    if-nez v5, :cond_c
 
-    const-wide/16 v14, 0x4
+    const-wide/16 v6, 0x4
 
-    invoke-static {v14, v15, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
+    invoke-static {v6, v7, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_d
+    if-eqz v6, :cond_d
 
     :cond_c
-    const/4 v14, 0x1
+    const/16 v16, 0x1
 
     goto :goto_a
 
     :cond_d
-    const/4 v14, 0x0
+    const/16 v16, 0x0
 
     :goto_a
-    const-wide/32 v8, 0x400000
+    const-wide/32 v6, 0x400000
 
-    if-nez v4, :cond_f
+    if-nez v5, :cond_f
 
-    invoke-static {v8, v9, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v6, v7, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
-    move-result v7
+    move-result v8
 
-    if-eqz v7, :cond_e
+    if-eqz v8, :cond_e
 
     goto :goto_b
 
     :cond_e
-    const/4 v15, 0x0
+    const/16 v17, 0x0
 
     goto :goto_c
 
     :cond_f
     :goto_b
-    const/4 v15, 0x1
+    const/16 v17, 0x1
 
     :goto_c
-    if-nez v4, :cond_11
+    if-nez v5, :cond_11
 
-    invoke-static {v8, v9, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v6, v7, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
-    move-result v7
+    move-result v8
 
-    if-eqz v7, :cond_10
+    if-eqz v8, :cond_10
 
     goto :goto_d
 
     :cond_10
-    const/16 v16, 0x0
+    const/16 v18, 0x0
 
     goto :goto_e
 
     :cond_11
     :goto_d
-    const/16 v16, 0x1
+    const/16 v18, 0x1
 
     :goto_e
-    if-nez v4, :cond_13
+    if-nez v5, :cond_13
 
-    invoke-static {v8, v9, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v6, v7, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
-    move-result v7
+    move-result v6
 
-    if-eqz v7, :cond_12
+    if-eqz v6, :cond_12
 
     goto :goto_f
 
     :cond_12
-    const/16 v17, 0x0
+    const/16 v19, 0x0
 
     goto :goto_10
 
     :cond_13
     :goto_f
-    const/16 v17, 0x1
+    const/16 v19, 0x1
 
     :goto_10
-    if-eqz v10, :cond_15
+    if-eqz v12, :cond_15
 
-    if-nez v4, :cond_14
+    if-nez v5, :cond_14
 
     const-wide/32 v0, 0x4000000
 
@@ -340,18 +360,18 @@
 
     :cond_14
     :goto_11
-    const/16 v18, 0x1
+    const/16 v20, 0x1
 
     goto :goto_12
 
     :cond_15
     if-eqz v0, :cond_16
 
-    if-nez v4, :cond_14
+    if-nez v5, :cond_14
 
-    const-wide/32 v7, 0x8000000
+    const-wide/32 v5, 0x8000000
 
-    invoke-static {v7, v8, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
+    invoke-static {v5, v6, v2, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
 
     move-result v0
 
@@ -360,68 +380,26 @@
     goto :goto_11
 
     :cond_16
-    const/16 v18, 0x0
+    const/16 v20, 0x0
 
     :goto_12
-    if-nez v10, :cond_17
+    if-nez v12, :cond_17
 
-    if-eqz v6, :cond_17
+    if-eqz v9, :cond_17
 
-    const/16 v19, 0x1
+    const/16 v21, 0x1
 
     goto :goto_13
 
     :cond_17
-    const/16 v19, 0x0
+    const/16 v21, 0x0
 
     :goto_13
     new-instance v0, Lcom/discord/utilities/permissions/ManageUserContext;
 
-    move-object v11, v0
+    move-object v13, v0
 
-    invoke-direct/range {v11 .. v19}, Lcom/discord/utilities/permissions/ManageUserContext;-><init>(ZZZZZZZZ)V
+    invoke-direct/range {v13 .. v21}, Lcom/discord/utilities/permissions/ManageUserContext;-><init>(ZZZZZZZZ)V
 
     return-object v0
-
-    :cond_18
-    const-string v0, "guildRoles"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_19
-    const-string v0, "userRoles"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1a
-    const-string v0, "actingUserRoles"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1b
-    const-string v0, "targetUser"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1c
-    const-string v0, "actingUser"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1d
-    const-string v0, "guild"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
diff --git a/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali b/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali
index 49260cb05e..71f2b2ba20 100644
--- a/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali
+++ b/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali
@@ -21,24 +21,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/utilities/permissions/PermissionsManager;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "permissionsManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/permissions/VideoPermissionsManager;->permissionsManager:Lcom/discord/utilities/permissions/PermissionsManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "permissionsManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/utilities/permissions/PermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -63,7 +56,9 @@
 .method public final hasVideoPermission(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;)Z
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
@@ -94,13 +89,4 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali
index 2dfbcace1a..df6ed1cf69 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$1.smali
@@ -3,7 +3,7 @@
 .source "Persister.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$2.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$2.smali
index 35be334ee5..493de01c1c 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$2.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$init$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/Persister$Companion$init$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Persister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryoConfig$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryoConfig$1.smali
index b57d0408e2..e1555429f5 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryoConfig$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$kryoConfig$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/Persister$Companion$kryoConfig$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Persister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/esotericsoftware/kryo/Kryo;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/esotericsoftware/kryo/Kryo;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$logger$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$logger$1.smali
index 9205bd06e1..2cfe88f763 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$logger$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$logger$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/Persister$Companion$logger$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Persister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Integer;",
         "Ljava/lang/String;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,16 +81,9 @@
 .method public final invoke(ILjava/lang/String;Ljava/lang/Exception;)V
     .locals 0
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$persistAll$1$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$persistAll$1$1.smali
index 59ebfd58b1..1a066c5052 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion$persistAll$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion$persistAll$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/Persister$Companion$persistAll$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Persister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/persister/Persister<",
         "*>;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -164,7 +164,7 @@
     :cond_0
     const-string p1, "clock"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
index cbcdd9ce05..d031608e74 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
@@ -99,7 +99,7 @@
     :cond_2
     const-string v0, "context"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -120,7 +120,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_1
+    if-eqz v1, :cond_0
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -132,13 +132,13 @@
 
     move-result-object v1
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v1, "Observable\n          .just(weakPreference.get())"
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -158,12 +158,18 @@
 
     and-int/lit8 v2, v2, 0x20
 
+    const-string v2, "onNext"
+
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "errorClass"
+
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v9, Lf/a/b/c0;
+
     const/4 v8, 0x0
 
-    if-eqz v6, :cond_0
-
-    new-instance v9, Lf/a/b/a0;
-
     move-object v2, v9
 
     move-object v3, v8
@@ -172,20 +178,13 @@
 
     move-object v7, v8
 
-    invoke-direct/range {v2 .. v8}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v2 .. v8}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v1, v9}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     goto :goto_0
 
     :cond_0
-    const-string v0, "onNext"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_1
     return-void
 .end method
 
@@ -244,13 +243,17 @@
         }
     .end annotation
 
-    const/4 v6, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "clock"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "persistenceStrategy"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/persister/Persister;->access$getInitialized$cp()Z
 
@@ -277,13 +280,13 @@
 
     sget-object p1, Lcom/discord/utilities/persister/Persister$Companion$init$1;->INSTANCE:Lcom/discord/utilities/persister/Persister$Companion$init$1;
 
-    invoke-virtual {p3, p1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, p1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "persistenceStrategy\n    \u2026er { persist -> persist }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -303,9 +306,17 @@
 
     and-int/lit8 p2, p2, 0x20
 
-    if-eqz v4, :cond_1
+    const-string p2, "onNext"
 
-    new-instance p2, Lf/a/b/a0;
+    invoke-static {v4, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "errorClass"
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lf/a/b/c0;
+
+    const/4 v6, 0x0
 
     move-object v0, p2
 
@@ -315,39 +326,11 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_1
-    const-string p1, "onNext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string p1, "persistenceStrategy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_4
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public final isPreloaded()Lrx/Observable;
@@ -376,7 +359,7 @@
     :cond_0
     const-string v0, "preferencesPreloader"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -431,7 +414,7 @@
 .end method
 
 .method public final setKryoConfig(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -443,24 +426,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/persister/Persister;->access$setKryoConfig$cp(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setLogger(Lkotlin/jvm/functions/Function3;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -476,18 +452,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/persister/Persister;->access$setLogger$cp(Lkotlin/jvm/functions/Function3;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali
index 5cb8bc32ea..a69e681f87 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$1.smali
@@ -3,7 +3,7 @@
 .source "Persister.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/utilities/persister/Persister<",
         "*>;",
         "Ljava/lang/Boolean;",
@@ -60,29 +60,14 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/utilities/persister/Persister;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Preloader$1;->call(Lcom/discord/utilities/persister/Persister;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/utilities/persister/Persister;)Z
+.method public final call(Lcom/discord/utilities/persister/Persister;)Ljava/lang/Boolean;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/discord/utilities/persister/Persister<",
-            "*>;)Z"
+            "*>;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -96,5 +81,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/persister/Persister;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Preloader$1;->call(Lcom/discord/utilities/persister/Persister;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$2.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$2.smali
index 81e9cc8e70..5aa3ed9a03 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$2.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/Persister$Preloader$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Persister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/persister/Persister<",
         "*>;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali
index 19ebced0c3..7304920f26 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader$isPreloaded$1.smali
@@ -3,7 +3,7 @@
 .source "Persister.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/persister/Persister<",
+        "*>;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,29 +60,14 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/utilities/persister/Persister;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Preloader$isPreloaded$1;->call(Lcom/discord/utilities/persister/Persister;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/utilities/persister/Persister;)Z
+.method public final call(Lcom/discord/utilities/persister/Persister;)Ljava/lang/Boolean;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/discord/utilities/persister/Persister<",
-            "*>;)Z"
+            "*>;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -93,5 +81,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/persister/Persister;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister$Preloader$isPreloaded$1;->call(Lcom/discord/utilities/persister/Persister;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali
index 5a4c054d5e..8e03fa9b50 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Preloader.smali
@@ -44,27 +44,27 @@
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;)V
     .locals 8
 
-    const/4 v6, 0x0
+    const-string v0, "clock"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    new-instance v7, Lcom/discord/utilities/time/TimeElapsed;
+    new-instance v0, Lcom/discord/utilities/time/TimeElapsed;
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v3, 0x0
 
-    const/4 v4, 0x2
+    const/4 v5, 0x2
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    move-object v0, v7
+    move-object v1, v0
 
-    move-object v1, p1
+    move-object v2, p1
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/time/TimeElapsed;-><init>(Lcom/discord/utilities/time/Clock;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/time/TimeElapsed;-><init>(Lcom/discord/utilities/time/Clock;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object v7, p0, Lcom/discord/utilities/persister/Persister$Preloader;->preloadTime:Lcom/discord/utilities/time/TimeElapsed;
+    iput-object v0, p0, Lcom/discord/utilities/persister/Persister$Preloader;->preloadTime:Lcom/discord/utilities/time/TimeElapsed;
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
@@ -96,13 +96,13 @@
 
     sget-object v0, Lcom/discord/utilities/persister/Persister$Preloader$1;->INSTANCE:Lcom/discord/utilities/persister/Persister$Preloader$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->X(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->X(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "preloadSubject\n          .takeUntil { it == null }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -124,7 +124,17 @@
 
     and-int/lit8 v0, v0, 0x20
 
-    new-instance v7, Lf/a/b/a0;
+    const-string v0, "onNext"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "errorClass"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v7, Lf/a/b/c0;
+
+    const/4 v6, 0x0
 
     move-object v0, v7
 
@@ -134,18 +144,11 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p1, v7}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public static final synthetic access$handlePreload(Lcom/discord/utilities/persister/Persister$Preloader;Lcom/discord/utilities/persister/Persister;)V
@@ -204,11 +207,11 @@
 
     iget-object p1, p0, Lcom/discord/utilities/persister/Persister$Preloader;->preloadSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
     const/4 v0, 0x0
 
-    invoke-virtual {p1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     sget-object p1, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
 
@@ -280,7 +283,7 @@
 
     sget-object v1, Lcom/discord/utilities/persister/Persister$Preloader$isPreloaded$1;->INSTANCE:Lcom/discord/utilities/persister/Persister$Preloader$isPreloaded$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -290,7 +293,7 @@
 
     const-string v1, "preloadSubject\n         \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -312,7 +315,7 @@
     :try_start_0
     const-string v0, "preference"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/persister/Persister$Preloader;->preloadCacheKeys:Ljava/util/List;
 
@@ -328,9 +331,9 @@
 
     iget-object v0, p0, Lcom/discord/utilities/persister/Persister$Preloader;->preloadSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -339,16 +342,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali
index 9d3739212c..3daec103b7 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/Persister$getObservable$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Persister.kt"
 
 # interfaces
@@ -33,7 +33,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     move-result-object v0
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1.smali b/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1.smali
index 8ac760f7f9..91af32a956 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$getObservable$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/Persister$getObservable$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Persister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lrx/subjects/Subject<",
         "TT;TT;>;>;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,15 +73,15 @@
 
     invoke-direct {v0, v1}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
     const/4 v2, 0x0
 
-    invoke-direct {v1, v2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v2, "Observable\n          .just(null)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister.smali b/com.discord/smali/com/discord/utilities/persister/Persister.smali
index 8d893a2403..5ff98c749a 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister.smali
@@ -158,11 +158,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "key"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "defaultValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -195,23 +197,11 @@
     :cond_0
     const-string p1, "preferencesPreloader"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "defaultValue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public static final synthetic access$getClock$cp()Lcom/discord/utilities/time/Clock;
@@ -345,12 +335,6 @@
     return-object p0
 .end method
 
-.method public static synthetic fileValue$annotations()V
-    .locals 0
-
-    return-void
-.end method
-
 .method public static synthetic getAndSet$default(Lcom/discord/utilities/persister/Persister;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -406,7 +390,7 @@
     :cond_0
     const-string v0, "context"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -474,14 +458,14 @@
 
     const-string v1, "context.openFileOutput(key, Context.MODE_PRIVATE)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
     :cond_0
     const-string v0, "context"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -522,7 +506,7 @@
 
     const-string v4, "kryos.get() ?: return@use this.value"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v1}, Lcom/esotericsoftware/kryo/Kryo;->readClassAndObject(Lcom/esotericsoftware/kryo/io/Input;)Ljava/lang/Object;
 
@@ -613,7 +597,7 @@
 
     const-string v5, "StringBuilder()\n        \u2026              .toString()"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v5, Lcom/discord/utilities/persister/Persister;->logger:Lkotlin/jvm/functions/Function3;
 
@@ -728,6 +712,12 @@
     return-object v4
 .end method
 
+.method public static synthetic getFileValue$annotations()V
+    .locals 0
+
+    return-void
+.end method
+
 .method public static final isPreloaded()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -1026,7 +1016,7 @@
     :try_start_0
     const-string v0, "setter"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
 
@@ -1046,16 +1036,6 @@
 
     return-object p1
 
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
@@ -1151,7 +1131,7 @@
     :try_start_0
     const-string v0, "newValue"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -1169,7 +1149,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-interface {v1, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v1, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     if-eqz p2, :cond_1
@@ -1183,16 +1163,6 @@
 
     return-object v0
 
-    :cond_2
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$1.smali b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$1.smali
index ca8596d2a1..1c916c2a6f 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$init$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/persister/PersisterConfig$init$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PersisterConfig.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/esotericsoftware/kryo/Kryo;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,17 +71,19 @@
 .method public final invoke(Lcom/esotericsoftware/kryo/Kryo;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;
 
-    new-instance v1, Lp0/b/b/c;
+    new-instance v1, Lq0/b/b/c;
 
-    invoke-direct {v1}, Lp0/b/b/c;-><init>()V
+    invoke-direct {v1}, Lq0/b/b/c;-><init>()V
 
-    invoke-direct {v0, v1}, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;-><init>(Lp0/b/b/a;)V
+    invoke-direct {v0, v1}, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;-><init>(Lq0/b/b/a;)V
 
-    invoke-virtual {p1, v0}, Lcom/esotericsoftware/kryo/Kryo;->setInstantiatorStrategy(Lp0/b/b/a;)V
+    invoke-virtual {p1, v0}, Lcom/esotericsoftware/kryo/Kryo;->setInstantiatorStrategy(Lq0/b/b/a;)V
 
     invoke-virtual {p1}, Lcom/esotericsoftware/kryo/Kryo;->getFieldSerializerConfig()Lcom/esotericsoftware/kryo/serializers/FieldSerializerConfig;
 
@@ -89,7 +91,7 @@
 
     const-string v1, "it.fieldSerializerConfig"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
@@ -112,13 +114,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/esotericsoftware/kryo/Kryo;->register(Ljava/lang/Class;Lcom/esotericsoftware/kryo/Serializer;)Lcom/esotericsoftware/kryo/Registration;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$isNotActive$1.smali b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$isNotActive$1.smali
index 4b2a712ef5..86eefd947e 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$isNotActive$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$isNotActive$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,30 +62,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/persister/PersisterConfig$isNotActive$1;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
+.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "isBackgrounded"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -104,5 +89,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/persister/PersisterConfig$isNotActive$1;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali
index 581755dfdd..8c5c0dd60e 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig$persistenceStrategy$1.smali
@@ -3,7 +3,7 @@
 .source "PersisterConfig.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,26 +59,22 @@
 
 
 # virtual methods
+.method public final call(Ljava/lang/Long;)Ljava/lang/Boolean;
+    .locals 0
+
+    sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    return-object p1
+.end method
+
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/PersisterConfig$persistenceStrategy$1;->call(Ljava/lang/Long;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/PersisterConfig$persistenceStrategy$1;->call(Ljava/lang/Long;)Ljava/lang/Boolean;
 
     move-result-object p1
 
     return-object p1
 .end method
-
-.method public final call(Ljava/lang/Long;)Z
-    .locals 0
-
-    const/4 p1, 0x1
-
-    return p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali b/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
index b1a1fa053a..57e314794e 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
@@ -53,7 +53,7 @@
 
     sget-object v2, Lcom/discord/utilities/persister/PersisterConfig$persistenceStrategy$1;->INSTANCE:Lcom/discord/utilities/persister/PersisterConfig$persistenceStrategy$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -63,7 +63,7 @@
 
     const-string v1, "Observable\n        .merg\u2026  .map { true }\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -89,13 +89,13 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v1, Lf/a/b/o;->c:Lf/a/b/o;
 
-    sget-object v1, Lf/a/b/m;->b:Lrx/subjects/BehaviorSubject;
+    sget-object v1, Lf/a/b/o;->b:Lrx/subjects/BehaviorSubject;
 
-    sget-object v2, Lf/a/b/l;->d:Lf/a/b/l;
+    sget-object v2, Lf/a/b/n;->d:Lf/a/b/n;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -105,7 +105,7 @@
 
     const-string v2, "numGatewayConnectionCons\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/utilities/persister/PersisterConfig$isNotActive$1;->INSTANCE:Lcom/discord/utilities/persister/PersisterConfig$isNotActive$1;
 
@@ -125,31 +125,37 @@
 .method public final init(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "clock"
 
-    sget-object v1, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/utilities/persister/PersisterConfig$init$1;->INSTANCE:Lcom/discord/utilities/persister/PersisterConfig$init$1;
+    sget-object v0, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/persister/Persister$Companion;->setKryoConfig(Lkotlin/jvm/functions/Function1;)V
+    sget-object v1, Lcom/discord/utilities/persister/PersisterConfig$init$1;->INSTANCE:Lcom/discord/utilities/persister/PersisterConfig$init$1;
 
-    sget-object v1, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/persister/Persister$Companion;->setKryoConfig(Lkotlin/jvm/functions/Function1;)V
 
-    sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
 
-    if-eqz v2, :cond_0
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    new-instance v0, Lf/a/b/h;
+    if-eqz v1, :cond_0
 
-    const-string v2, "[Persister]"
+    const-string v1, "[Persister]"
 
-    invoke-direct {v0, v2}, Lf/a/b/h;-><init>(Ljava/lang/String;)V
+    const-string v2, "tag"
 
-    invoke-virtual {v1, v0}, Lcom/discord/utilities/persister/Persister$Companion;->setLogger(Lkotlin/jvm/functions/Function3;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lf/a/b/h;
+
+    invoke-direct {v2, v1}, Lf/a/b/h;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/persister/Persister$Companion;->setLogger(Lkotlin/jvm/functions/Function3;)V
 
     sget-object v0, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
 
@@ -162,19 +168,7 @@
     return-void
 
     :cond_0
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali b/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali
index d67cceb063..41f56106a5 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform$Companion.smali
@@ -36,7 +36,9 @@
 .method public final from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "connectedAccount"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getType()Ljava/lang/String;
 
@@ -44,31 +46,24 @@
 
     const-string v0, "connectedAccount.type"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "platformName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -80,7 +75,7 @@
 
     const-string v1, "Locale.ENGLISH"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -90,7 +85,7 @@
 
     const-string v0, "(this as java.lang.String).toUpperCase(locale)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/platform/Platform;->valueOf(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
 
@@ -99,11 +94,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
     :try_end_0
@@ -114,13 +109,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "platformName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index 81f929ff5a..b4c8b842bb 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali
@@ -95,13 +95,13 @@
 
     move-result-object v5
 
-    const v1, 0x7f080208
+    const v1, 0x7f080209
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v6
 
-    const v1, 0x7f080441
+    const v1, 0x7f080444
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -141,13 +141,13 @@
 
     move-result-object v18
 
-    const v2, 0x7f0801f6
+    const v2, 0x7f0801f7
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v19
 
-    const v2, 0x7f080247
+    const v2, 0x7f080248
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -187,13 +187,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f0801fb
+    const v2, 0x7f0801fc
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f0802c2
+    const v2, 0x7f0802c3
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -231,13 +231,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f0801fd
+    const v2, 0x7f0801fe
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f0802ef
+    const v2, 0x7f0802f0
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -273,13 +273,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f0801fe
+    const v2, 0x7f0801ff
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f080332
+    const v2, 0x7f080333
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -303,7 +303,7 @@
 
     new-instance v1, Lcom/discord/utilities/platform/Platform;
 
-    const v2, 0x7f080200
+    const v2, 0x7f080201
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -333,7 +333,7 @@
 
     new-instance v1, Lcom/discord/utilities/platform/Platform;
 
-    const v2, 0x7f080201
+    const v2, 0x7f080202
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -363,13 +363,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f080202
+    const v2, 0x7f080203
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f0803ae
+    const v2, 0x7f0803b1
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -433,13 +433,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f080203
+    const v2, 0x7f080204
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f0803d4
+    const v2, 0x7f0803d7
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -473,13 +473,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f080204
+    const v2, 0x7f080205
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f0803de
+    const v2, 0x7f0803e1
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -515,13 +515,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f080205
+    const v2, 0x7f080206
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f0803e7
+    const v2, 0x7f0803ea
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -555,13 +555,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f080206
+    const v2, 0x7f080207
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f080404
+    const v2, 0x7f080407
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -591,13 +591,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f080207
+    const v2, 0x7f080208
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f080406
+    const v2, 0x7f080409
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -621,7 +621,7 @@
 
     new-instance v1, Lcom/discord/utilities/platform/Platform;
 
-    const v2, 0x7f080209
+    const v2, 0x7f08020a
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -659,13 +659,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f08020a
+    const v2, 0x7f08020b
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f080442
+    const v2, 0x7f080445
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -699,13 +699,13 @@
 
     move-result-object v7
 
-    const v2, 0x7f0801fc
+    const v2, 0x7f0801fd
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v8
 
-    const v2, 0x7f0802ed
+    const v2, 0x7f0802ee
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -817,7 +817,7 @@
 
     const-string p3, "Locale.ENGLISH"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -827,18 +827,18 @@
 
     const-string p2, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/platform/Platform;->platformId:Ljava/lang/String;
 
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -1050,33 +1050,35 @@
 .end method
 
 .method public final getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "connectedAccount"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    if-eq v1, v2, :cond_3
+    if-eq v0, v1, :cond_3
 
-    const/4 v2, 0x7
+    const/4 v1, 0x7
 
-    if-eq v1, v2, :cond_2
+    if-eq v0, v1, :cond_2
 
-    const/16 v2, 0xf
+    const/16 v1, 0xf
 
-    if-eq v1, v2, :cond_1
+    if-eq v0, v1, :cond_1
 
-    const/16 v2, 0x10
+    const/16 v1, 0x10
 
-    if-eq v1, v2, :cond_0
+    if-eq v0, v1, :cond_0
 
-    packed-switch v1, :pswitch_data_0
+    packed-switch v0, :pswitch_data_0
+
+    const/4 p1, 0x0
 
     goto/16 :goto_0
 
@@ -1095,7 +1097,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto/16 :goto_0
 
@@ -1114,7 +1116,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
@@ -1133,7 +1135,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
@@ -1152,7 +1154,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
@@ -1171,7 +1173,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
@@ -1190,7 +1192,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
@@ -1209,7 +1211,7 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
@@ -1228,19 +1230,10 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     :goto_0
-    return-object v0
-
-    :cond_4
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    nop
+    return-object p1
 
     :pswitch_data_0
     .packed-switch 0xa
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1.smali
index 2ee3f89c5a..6d2a3674fa 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription;->updateUserPremiumGuildSubscriptionSlot(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;)V
 
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.smali
index 17cc4c3ecd..cc1fb6e3bb 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.smali
@@ -3,7 +3,7 @@
 .source "PremiumGuildSubscriptionUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,26 +59,22 @@
 
 
 # virtual methods
+.method public final call(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;)Ljava/lang/Boolean;
+    .locals 0
+
+    sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    return-object p1
+.end method
+
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2;->call(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2;->call(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;)Ljava/lang/Boolean;
 
     move-result-object p1
 
     return-object p1
 .end method
-
-.method public final call(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;)Z
-    .locals 0
-
-    const/4 p1, 0x1
-
-    return p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.smali
index 5d9ef4c29f..b096c36b72 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.smali
@@ -3,7 +3,7 @@
 .source "PremiumGuildSubscriptionUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Throwable;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,26 +59,22 @@
 
 
 # virtual methods
+.method public final call(Ljava/lang/Throwable;)Ljava/lang/Boolean;
+    .locals 0
+
+    sget-object p1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    return-object p1
+.end method
+
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3;->call(Ljava/lang/Throwable;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3;->call(Ljava/lang/Throwable;)Ljava/lang/Boolean;
 
     move-result-object p1
 
     return-object p1
 .end method
-
-.method public final call(Ljava/lang/Throwable;)Z
-    .locals 0
-
-    const/4 p1, 0x0
-
-    return p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$1.smali
index d8e54d0713..adea05eecc 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$1.smali
@@ -3,7 +3,7 @@
 .source "PremiumGuildSubscriptionUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Void;",
+        "Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$2.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$2.smali
index 1aeeb282e5..5ec57ad5ec 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$2.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$2.smali
@@ -3,7 +3,7 @@
 .source "PremiumGuildSubscriptionUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Throwable;",
         "Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;",
         ">;"
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.smali
index 2f1ed073f9..4184a60fe9 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.smali
@@ -3,7 +3,7 @@
 .source "PremiumGuildSubscriptionUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,6 +79,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;",
             ">;"
         }
@@ -90,9 +93,9 @@
 
     sget-object p1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;->FAILURE_MODIFYING_SLOT:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -147,13 +150,13 @@
 
     sget-object v0, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$1;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$2;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
index a257085095..7cdd5885e0 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
@@ -139,7 +139,7 @@
     move-result-object p2
 
     :goto_0
-    invoke-static {}, Lr0/p/a;->d()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->d()Lrx/Scheduler;
 
     move-result-object p3
 
@@ -157,13 +157,13 @@
 
     sget-object p3, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2;
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
     sget-object p3, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3;
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -171,13 +171,13 @@
 
     invoke-direct {p3, p1, p4, p5}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4;-><init>(Lcom/discord/utilities/rest/RestAPI;Lcom/discord/models/domain/ModelSubscription;Z)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "apiObs\n        .subscrib\u2026N }\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -197,37 +197,39 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "subscription"
 
-    if-eqz p1, :cond_d
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getRenewalMutations()Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;->getAdditionalPlans()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription$SubscriptionRenewalMutations;->getAdditionalPlans()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getAdditionalPlans()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_0
-    const/4 v2, 0x1
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v4
 
@@ -288,15 +290,15 @@
     :goto_2
     if-eqz v6, :cond_1
 
-    move-object v0, v5
+    move-object v2, v5
 
     :cond_4
-    check-cast v0, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;
+    check-cast v2, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;
 
     :cond_5
-    if-eqz v0, :cond_6
+    if-eqz v2, :cond_6
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;->getQuantity()I
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;->getQuantity()I
 
     move-result v4
 
@@ -310,7 +312,7 @@
 
     if-ltz v4, :cond_c
 
-    if-nez v0, :cond_7
+    if-nez v2, :cond_7
 
     goto :goto_6
 
@@ -319,7 +321,7 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p2
 
@@ -327,15 +329,15 @@
     :goto_4
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_a
+    if-eqz v0, :cond_a
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v5, v1
+    move-object v5, v0
 
     check-cast v5, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;
 
@@ -377,7 +379,7 @@
     :goto_5
     if-eqz v5, :cond_8
 
-    invoke-interface {p1, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_4
 
@@ -389,7 +391,7 @@
     :cond_b
     new-instance p2, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;->getPlanId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription$SubscriptionAdditionalPlan;->getPlanId()J
 
     move-result-wide v0
 
@@ -399,7 +401,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, p2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
@@ -442,13 +444,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_d
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final calculatePercentToNextTier(II)I
@@ -553,13 +548,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "api"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "subscription"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storePremiumGuild"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x1
 
@@ -578,27 +577,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "storePremiumGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "api"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getPremiumGuildTier(I)I
@@ -651,13 +629,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "api"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "subscription"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storePremiumGuild"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -676,25 +658,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "storePremiumGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "api"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
index a8a5091b7d..2dfb18d901 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/browser/customtabs/CustomTabsIntent;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,26 +61,19 @@
 .method public final invoke(Landroidx/browser/customtabs/CustomTabsIntent;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;->$fragment:Lcom/discord/app/AppFragment;
 
     iget-object v1, p1, Landroidx/browser/customtabs/CustomTabsIntent;->intent:Landroid/content/Intent;
 
-    const v2, 0xfbbc
-
     iget-object p1, p1, Landroidx/browser/customtabs/CustomTabsIntent;->startAnimationBundle:Landroid/os/Bundle;
 
+    const v2, 0xfbbc
+
     invoke-virtual {v0, v1, v2, p1}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;ILandroid/os/Bundle;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
index 703f15dc26..1e49b0272d 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/net/Uri;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/net/Uri;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "handoffUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->$weakFragment:Ljava/lang/ref/WeakReference;
 
@@ -73,9 +75,9 @@
 
     if-eqz v0, :cond_0
 
-    const-string v1, "weakFragment.get() ?: return@appSubscribe"
+    const-string/jumbo v1, "weakFragment.get() ?: return@appSubscribe"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -83,7 +85,7 @@
 
     const-string v2, "fragment.requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -95,13 +97,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "handoffUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
index 795cb06ca7..70998d1805 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
@@ -88,7 +88,7 @@
 
     const-string p3, "redirectUrl.build()"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p1}, Lcom/discord/utilities/auth/AuthUtils;->getBillingWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
 
@@ -209,9 +209,9 @@
 .method public final getNitroGiftIcon(Lcom/discord/models/domain/ModelGift;)I
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
 
@@ -221,21 +221,19 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {p0, v0}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelSku;)I
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelSku;)I
 
     move-result p1
 
     return p1
-
-    :cond_1
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getNitroGiftIcon(Lcom/discord/models/domain/ModelSku;)I
@@ -290,7 +288,9 @@
 .method public final getPremiumGuildSubscriptionCountFromSubscription(Lcom/discord/models/domain/ModelSubscription;)I
     .locals 5
 
-    if-eqz p1, :cond_2
+    const-string v0, "$this$getPremiumGuildSubscriptionCountFromSubscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanId()J
 
@@ -333,21 +333,14 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "$this$getPremiumGuildSubscriptionCountFromSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final isNitroSku(Lcom/discord/models/domain/ModelSku;)Z
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "sku"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSku;->getSkuCategory()Lcom/discord/models/domain/ModelSku$SkuCategory;
 
@@ -378,21 +371,14 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "sku"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final openAppleBilling(Landroid/content/Context;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f1200fb
 
@@ -406,7 +392,7 @@
 
     const-string v0, "Uri.parse(context.getStr\u2026tring.apple_billing_url))"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -421,25 +407,20 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/uri/UriHandler;->openUrlWithCustomTabs$default(Landroid/content/Context;Landroid/net/Uri;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final openWebAddPaymentSource(Lcom/discord/app/AppFragment;Landroid/net/Uri;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "redirectPath"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "/billing/payment-sources/create"
 
     const/4 v5, 0x0
 
@@ -447,8 +428,6 @@
 
     const/4 v7, 0x0
 
-    const-string v4, "/billing/payment-sources/create"
-
     move-object v1, p0
 
     move-object v2, p1
@@ -458,34 +437,26 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "redirectPath"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZLandroid/net/Uri;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "planType"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "locationTrait"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "redirectPath"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -501,7 +472,7 @@
 
     const-string v2, "subscription"
 
-    const-string v5, "usd"
+    const-string/jumbo v5, "usd"
 
     move-object v1, v7
 
@@ -560,52 +531,30 @@
     invoke-static/range {v2 .. v8}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "redirectPath"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "locationTrait"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "planType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final openWebPurchasePremiumGuildSubscription(Lcom/discord/app/AppFragment;JLcom/discord/utilities/analytics/Traits$Location;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
-    .locals 13
+    .locals 14
 
     move-object v0, p1
 
     move-object/from16 v1, p4
 
-    const/4 v2, 0x0
+    const-string v2, "fragment"
 
-    if-eqz v0, :cond_2
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_1
+    const-string v2, "locationTrait"
 
-    if-eqz p5, :cond_0
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v3, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    const-string v2, "planType"
+
+    move-object/from16 v3, p5
+
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
     new-instance v4, Lcom/discord/utilities/analytics/Traits$Subscription;
 
@@ -615,33 +564,35 @@
 
     move-result-wide v5
 
-    invoke-direct {v4, v2, v2, v5, v6}, Lcom/discord/utilities/analytics/Traits$Subscription;-><init>(Ljava/lang/String;Ljava/lang/Integer;J)V
+    const/4 v7, 0x0
 
-    new-instance v2, Lcom/discord/utilities/analytics/Traits$Payment;
+    invoke-direct {v4, v7, v7, v5, v6}, Lcom/discord/utilities/analytics/Traits$Subscription;-><init>(Ljava/lang/String;Ljava/lang/Integer;J)V
 
-    invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPrice()I
-
-    move-result v9
+    new-instance v5, Lcom/discord/utilities/analytics/Traits$Payment;
 
     invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPrice()I
 
     move-result v10
 
-    const/4 v12, 0x0
+    invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPrice()I
 
-    const-string v8, "subscription"
+    move-result v11
 
-    const-string v11, "usd"
+    const-string v9, "subscription"
 
-    move-object v7, v2
+    const-string/jumbo v12, "usd"
 
-    invoke-direct/range {v7 .. v12}, Lcom/discord/utilities/analytics/Traits$Payment;-><init>(Ljava/lang/String;IILjava/lang/String;Z)V
+    const/4 v13, 0x0
 
-    invoke-virtual {v3, v1, v4, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->paymentFlowOpened(Lcom/discord/utilities/analytics/Traits$Location;Lcom/discord/utilities/analytics/Traits$Subscription;Lcom/discord/utilities/analytics/Traits$Payment;)V
+    move-object v8, v5
+
+    invoke-direct/range {v8 .. v13}, Lcom/discord/utilities/analytics/Traits$Payment;-><init>(Ljava/lang/String;IILjava/lang/String;Z)V
+
+    invoke-virtual {v2, v1, v4, v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->paymentFlowOpened(Lcom/discord/utilities/analytics/Traits$Location;Lcom/discord/utilities/analytics/Traits$Subscription;Lcom/discord/utilities/analytics/Traits$Payment;)V
 
     sget-object v1, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;
 
-    move-wide v2, p2
+    move-wide/from16 v2, p2
 
     invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->getPremiumGuild(J)Landroid/net/Uri;
 
@@ -658,39 +609,14 @@
     invoke-direct {p0, p1, v1, v3, v2}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;)V
 
     return-void
-
-    :cond_0
-    move-object v4, p0
-
-    const-string v0, "planType"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    move-object v4, p0
-
-    const-string v0, "locationTrait"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_2
-    move-object v4, p0
-
-    const-string v0, "fragment"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public final openWebSwitchPlans(Lcom/discord/app/AppFragment;Ljava/lang/Long;)V
     .locals 8
 
-    if-eqz p1, :cond_1
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -739,21 +665,14 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final warmupBillingTabs(Landroid/content/Context;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
-    .locals 6
+    .locals 5
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
@@ -765,52 +684,43 @@
 
     const-string v2, "Uri.parse(\"${BuildConfig.HOST}/login/handoff\")"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
     new-array v2, v2, [Landroid/net/Uri;
 
-    const/4 v3, 0x0
+    const-string v3, "https://discord.com/billing/premium/subscribe"
 
-    const-string v4, "https://discord.com/billing/premium/subscribe"
+    invoke-static {v3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
-    invoke-static {v4}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+    move-result-object v3
 
-    move-result-object v4
+    const-string v4, "Uri.parse(\"${BuildConfig\u2026lling/premium/subscribe\")"
 
-    const-string v5, "Uri.parse(\"${BuildConfig\u2026lling/premium/subscribe\")"
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 v4, 0x0
 
-    aput-object v4, v2, v3
+    aput-object v3, v2, v4
 
-    const/4 v3, 0x1
+    const-string v3, "https://discord.com/billing/payment-sources/create"
 
-    const-string v4, "https://discord.com/billing/payment-sources/create"
+    invoke-static {v3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
-    invoke-static {v4}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+    move-result-object v3
 
-    move-result-object v4
+    const-string v4, "Uri.parse(\"${BuildConfig\u2026/payment-sources/create\")"
 
-    const-string v5, "Uri.parse(\"${BuildConfig\u2026/payment-sources/create\")"
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 v4, 0x1
 
-    aput-object v4, v2, v3
+    aput-object v3, v2, v4
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/utilities/uri/UriHandler;->warmUp(Landroid/content/Context;Landroid/net/Uri;[Landroid/net/Uri;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$1.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$1.smali
index d8636d91f6..98c817d670 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$1.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PresenceUtils.kt"
 
 # interfaces
@@ -18,11 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
-        "Ljava/lang/Integer;",
-        ">;"
+        "Ljava/lang/Comparable<",
+        "*>;>;"
     }
 .end annotation
 
@@ -49,46 +49,48 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke(Lcom/discord/models/domain/activity/ModelActivity;)I
-    .locals 0
+.method public final invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/Comparable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/activity/ModelActivity;",
+            ")",
+            "Ljava/lang/Comparable<",
+            "*>;"
+        }
+    .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getType()I
 
     move-result p1
 
-    return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$1;->invoke(Lcom/discord/models/domain/activity/ModelActivity;)I
-
-    move-result p1
-
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$1;->invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/Comparable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$2.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$2.smali
index 546b5946a4..963f2d65eb 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$2.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PresenceUtils.kt"
 
 # interfaces
@@ -18,11 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
-        "Ljava/lang/Boolean;",
-        ">;"
+        "Ljava/lang/Comparable<",
+        "*>;>;"
     }
 .end annotation
 
@@ -49,19 +49,30 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/Comparable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/activity/ModelActivity;",
+            ")",
+            "Ljava/lang/Comparable<",
+            "*>;"
+        }
+    .end annotation
 
-    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$2;->invoke(Lcom/discord/models/domain/activity/ModelActivity;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->isRichPresence()Z
 
     move-result p1
 
@@ -72,23 +83,14 @@
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/models/domain/activity/ModelActivity;)Z
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    if-eqz p1, :cond_0
+    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->isRichPresence()Z
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$2;->invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/Comparable;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$3.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$3.smali
index 4b64de98a3..fbbfd526f0 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$3.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/presence/PresenceUtils$ACTIVITY_COMPARATOR$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PresenceUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         "Ljava/lang/Comparable<",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/Comparable;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -68,7 +68,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getCreatedAt()Ljava/lang/Long;
 
@@ -87,15 +89,6 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index d53f352c4a..11e87b0046 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
@@ -69,17 +69,19 @@
 .method public static final getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_7
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_6
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getType()I
 
     move-result v0
 
-    const v1, 0x7f1216c4
+    const v1, 0x7f1216ee
 
     const/4 v2, 0x0
 
@@ -104,7 +106,7 @@
     goto :goto_1
 
     :cond_0
-    const v0, 0x7f1216c7
+    const v0, 0x7f1216f1
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -121,7 +123,7 @@
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f1216c2
+    const v0, 0x7f1216ec
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -138,7 +140,7 @@
     goto :goto_1
 
     :cond_2
-    const v0, 0x7f1216c3
+    const v0, 0x7f1216ed
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -165,7 +167,7 @@
 
     const-string v4, "serverPlatformName"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
 
@@ -185,7 +187,7 @@
     :goto_0
     if-eqz p1, :cond_5
 
-    const v0, 0x7f1216c5
+    const v0, 0x7f1216ef
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -207,29 +209,15 @@
     move-result-object p0
 
     :goto_1
-    const-string p1, "when (activity.type) {\n \u2026ity_header_playing)\n    }"
+    const-string/jumbo p1, "when (activity.type) {\n \u2026ity_header_playing)\n    }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lcom/discord/utilities/textprocessing/Parsers;->parseBoldMarkdown(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_6
-    const-string p0, "activity"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getActivityString(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
@@ -267,7 +255,7 @@
     goto :goto_2
 
     :cond_1
-    const v1, 0x7f1217d6
+    const v1, 0x7f121802
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -294,7 +282,7 @@
     goto :goto_2
 
     :cond_3
-    const v1, 0x7f120e1c
+    const v1, 0x7f120e42
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -311,7 +299,7 @@
     goto :goto_2
 
     :cond_4
-    const v1, 0x7f121532
+    const v1, 0x7f12155c
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -338,7 +326,7 @@
     goto :goto_2
 
     :cond_6
-    const v1, 0x7f12114a
+    const v1, 0x7f121175
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -376,7 +364,7 @@
 
     if-eqz p2, :cond_0
 
-    const v0, 0x7f121532
+    const v0, 0x7f12155c
 
     const/4 v1, 0x1
 
@@ -399,7 +387,7 @@
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f121533
+    const p2, 0x7f12155d
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -408,7 +396,7 @@
     :goto_0
     const-string p1, "presence?.playingActivit\u2026.string.streaming_a_game)"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Lcom/discord/utilities/textprocessing/Parsers;->parseBoldMarkdown(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
@@ -444,7 +432,7 @@
 
     const-string v4, "it"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -562,22 +550,22 @@
     if-eq p1, v0, :cond_2
 
     :goto_1
-    const p1, 0x7f1214dd
+    const p1, 0x7f121507
 
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f1214d8
+    const p1, 0x7f121502
 
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f1214da
+    const p1, 0x7f121504
 
     goto :goto_2
 
     :cond_4
-    const p1, 0x7f1214de
+    const p1, 0x7f121508
 
     :goto_2
     return p1
@@ -675,33 +663,35 @@
 .end method
 
 .method public static final setPresenceText(Lcom/discord/models/domain/ModelPresence;ZLcom/discord/utilities/view/text/SimpleDraweeSpanTextView;Z)V
-    .locals 8
+    .locals 9
 
-    if-eqz p2, :cond_2
+    const-string v0, "textView"
 
-    sget-object v0, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
 
     invoke-virtual {p2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-string v2, "textView.context"
+    const-string v0, "textView.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    const/16 v6, 0x10
+    const/16 v7, 0x10
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
-    move-object v2, p0
+    move-object v3, p0
 
-    move v3, p1
+    move v4, p1
 
-    move v4, p3
+    move v5, p3
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/utilities/presence/PresenceUtils;->getStatusDraweeSpanStringBuilder$default(Lcom/discord/utilities/presence/PresenceUtils;Landroid/content/Context;Lcom/discord/models/domain/ModelPresence;ZZZILjava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    invoke-static/range {v1 .. v8}, Lcom/discord/utilities/presence/PresenceUtils;->getStatusDraweeSpanStringBuilder$default(Lcom/discord/utilities/presence/PresenceUtils;Landroid/content/Context;Lcom/discord/models/domain/ModelPresence;ZZZILjava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     move-result-object p0
 
@@ -734,15 +724,6 @@
     invoke-virtual {p2, p1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_2
-    const-string p0, "textView"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setPresenceText$default(Lcom/discord/models/domain/ModelPresence;ZLcom/discord/utilities/view/text/SimpleDraweeSpanTextView;ZILjava/lang/Object;)V
@@ -779,26 +760,19 @@
 .end method
 
 .method public final getStatusStringResForPresence(Lcom/discord/models/domain/ModelPresence;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/StringRes;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getStatusText(Lcom/discord/models/domain/ModelPresence;)I
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final shouldShowRichPresenceIcon(Lcom/discord/models/domain/ModelPresence;)Z
diff --git a/com.discord/smali/com/discord/utilities/press/OnPressListener.smali b/com.discord/smali/com/discord/utilities/press/OnPressListener.smali
index 9b215707f8..f2b338a3c1 100644
--- a/com.discord/smali/com/discord/utilities/press/OnPressListener.smali
+++ b/com.discord/smali/com/discord/utilities/press/OnPressListener.smali
@@ -22,24 +22,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/press/OnPressListener$OnPress;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "onPress"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/press/OnPressListener;->onPress:Lcom/discord/utilities/press/OnPressListener$OnPress;
 
     return-void
-
-    :cond_0
-    const-string p1, "onPress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
@@ -55,7 +48,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onPress"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/press/OnPressListener$1;
 
@@ -64,15 +59,6 @@
     invoke-direct {p0, v0}, Lcom/discord/utilities/press/OnPressListener;-><init>(Lcom/discord/utilities/press/OnPressListener$OnPress;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onPress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final isPressed(Landroid/view/MotionEvent;)Ljava/lang/Boolean;
@@ -121,11 +107,13 @@
 .method public onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "event"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2}, Lcom/discord/utilities/press/OnPressListener;->isPressed(Landroid/view/MotionEvent;)Ljava/lang/Boolean;
 
@@ -151,18 +139,4 @@
     const/4 p1, 0x0
 
     return p1
-
-    :cond_1
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali
index 3e525ca68e..ca561b2018 100644
--- a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali
+++ b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.smali
@@ -3,7 +3,7 @@
 .source "RepeatingOnTouchListener.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     move-result-object v4
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
index 825dce41c9..2d1d40d58b 100644
--- a/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
+++ b/com.discord/smali/com/discord/utilities/press/RepeatingOnTouchListener.smali
@@ -48,13 +48,17 @@
 .method public constructor <init>(JJLjava/util/concurrent/TimeUnit;Lrx/functions/Action0;Lrx/functions/Action0;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "timeUnit"
 
-    if-eqz p5, :cond_2
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "action"
 
-    if-eqz p7, :cond_0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "initialAction"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,27 +73,6 @@
     iput-object p7, p0, Lcom/discord/utilities/press/RepeatingOnTouchListener;->initialAction:Lrx/functions/Action0;
 
     return-void
-
-    :cond_0
-    const-string p1, "initialAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "action"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "timeUnit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JJLjava/util/concurrent/TimeUnit;Lrx/functions/Action0;Lrx/functions/Action0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -137,11 +120,11 @@
 
     invoke-direct {v1, p0}, Lcom/discord/utilities/press/RepeatingOnTouchListener$subscribe$1;-><init>(Lcom/discord/utilities/press/RepeatingOnTouchListener;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali b/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
index 77ce891b26..3564aba603 100644
--- a/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
@@ -47,11 +47,11 @@
 
     const/4 v2, 0x0
 
-    invoke-static {p1, v0, v2, v2, v1}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {p1, v0, v2, v2, v1}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/recycler/DiffCreator$createDiffUtilCallback$1.smali b/com.discord/smali/com/discord/utilities/recycler/DiffCreator$createDiffUtilCallback$1.smali
index c1b40ea97b..c818c2738e 100644
--- a/com.discord/smali/com/discord/utilities/recycler/DiffCreator$createDiffUtilCallback$1.smali
+++ b/com.discord/smali/com/discord/utilities/recycler/DiffCreator$createDiffUtilCallback$1.smali
@@ -54,7 +54,7 @@
 
     check-cast p2, Lcom/discord/utilities/recycler/DiffKeyProvider;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -88,7 +88,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1.smali b/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1.smali
index 79c3178a39..8a9bfe950b 100644
--- a/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1.smali
+++ b/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1.smali
@@ -23,7 +23,8 @@
         ">",
         "Ljava/lang/Object;",
         "Ljava/util/concurrent/Callable<",
-        "TT;>;"
+        "Landroidx/recyclerview/widget/DiffUtil$DiffResult;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2.smali b/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2.smali
index cdf6b5c651..35c6e1b33c 100644
--- a/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2.smali
+++ b/com.discord/smali/com/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiffCreator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/recyclerview/widget/DiffUtil$DiffResult;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/recycler/DiffCreator.smali b/com.discord/smali/com/discord/utilities/recycler/DiffCreator.smali
index c4688c9568..242eba250c 100644
--- a/com.discord/smali/com/discord/utilities/recycler/DiffCreator.smali
+++ b/com.discord/smali/com/discord/utilities/recycler/DiffCreator.smali
@@ -250,7 +250,7 @@
 
 # virtual methods
 .method public final calculateDiffResult(Ljava/util/List;Ljava/util/List;)Landroidx/recyclerview/widget/DiffUtil$DiffResult;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;TT;)",
@@ -258,19 +258,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "oldItems"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "newItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/recycler/DiffCreator;->isExpensiveDiff(Ljava/util/List;Ljava/util/List;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    return-object v0
+    const/4 p1, 0x0
+
+    return-object p1
 
     :cond_0
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/recycler/DiffCreator;->createDiffUtilCallback(Ljava/util/List;Ljava/util/List;)Lcom/discord/utilities/recycler/DiffCreator$createDiffUtilCallback$1;
@@ -284,20 +288,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "newItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "oldItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final dispatchDiffUpdates(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;)V
@@ -314,15 +304,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "adapter"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "setItems"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "oldItems"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "newItems"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p3, p4}, Lcom/discord/utilities/recycler/DiffCreator;->calculateDiffResult(Ljava/util/List;Ljava/util/List;)Landroidx/recyclerview/widget/DiffUtil$DiffResult;
 
@@ -331,34 +327,6 @@
     invoke-direct {p0, p1, p2, p4, p3}, Lcom/discord/utilities/recycler/DiffCreator;->setItemsAndDispatchUpdate(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Landroidx/recyclerview/widget/DiffUtil$DiffResult;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "oldItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "setItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final dispatchDiffUpdatesAsync(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;Lcom/discord/app/AppComponent;)V
@@ -389,38 +357,48 @@
 
     move-object/from16 v5, p5
 
-    const/4 v6, 0x0
+    const-string v6, "adapter"
 
-    if-eqz v1, :cond_4
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_3
+    const-string v6, "setItems"
 
-    if-eqz v3, :cond_2
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_1
+    const-string v6, "oldItems"
 
-    if-eqz v5, :cond_0
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v7, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1;
+    const-string v6, "newItems"
 
-    invoke-direct {v7, v0, v3, v4}, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1;-><init>(Lcom/discord/utilities/recycler/DiffCreator;Ljava/util/List;Ljava/util/List;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v3, Lr0/l/a/s;
+    const-string v6, "appComponent"
 
-    invoke-direct {v3, v7}, Lr0/l/a/s;-><init>(Ljava/util/concurrent/Callable;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v6, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1;
+
+    invoke-direct {v6, v0, v3, v4}, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$1;-><init>(Lcom/discord/utilities/recycler/DiffCreator;Ljava/util/List;Ljava/util/List;)V
+
+    new-instance v3, Ls0/l/a/s;
+
+    invoke-direct {v3, v6}, Ls0/l/a/s;-><init>(Ljava/util/concurrent/Callable;)V
 
     invoke-static {v3}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object v3
 
-    const-string v7, "Observable.fromCallable \u2026oldItems, newItems)\n    }"
+    const-string v6, "Observable.fromCallable \u2026oldItems, newItems)\n    }"
 
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v3
 
+    const/4 v6, 0x0
+
     const/4 v7, 0x2
 
     invoke-static {v3, v5, v6, v7, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -429,6 +407,10 @@
 
     const-class v9, Lcom/discord/utilities/recycler/DiffCreator;
 
+    new-instance v14, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2;
+
+    invoke-direct {v14, v0, v1, v2, v4}, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2;-><init>(Lcom/discord/utilities/recycler/DiffCreator;Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;)V
+
     const/4 v10, 0x0
 
     const/4 v11, 0x0
@@ -437,10 +419,6 @@
 
     const/4 v13, 0x0
 
-    new-instance v14, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2;
-
-    invoke-direct {v14, v0, v1, v2, v4}, Lcom/discord/utilities/recycler/DiffCreator$dispatchDiffUpdatesAsync$2;-><init>(Lcom/discord/utilities/recycler/DiffCreator;Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;)V
-
     const/16 v15, 0x1e
 
     const/16 v16, 0x0
@@ -448,39 +426,4 @@
     invoke-static/range {v8 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "appComponent"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string v1, "newItems"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string v1, "oldItems"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string v1, "setItems"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_4
-    const-string v1, "adapter"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
diff --git a/com.discord/smali/com/discord/utilities/recycler/GridColumnSpaceItemDecoration.smali b/com.discord/smali/com/discord/utilities/recycler/GridColumnSpaceItemDecoration.smali
index fed3c238de..b42b96d8da 100644
--- a/com.discord/smali/com/discord/utilities/recycler/GridColumnSpaceItemDecoration.smali
+++ b/com.discord/smali/com/discord/utilities/recycler/GridColumnSpaceItemDecoration.smali
@@ -27,15 +27,21 @@
 .method public getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "outRect"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3, p4}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 
@@ -78,32 +84,4 @@
     invoke-virtual {p1, p2, p3, v0, p4}, Landroid/graphics/Rect;->set(IIII)V
 
     return-void
-
-    :cond_2
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "outRect"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/recycler/NpaLinearLayoutManager.smali b/com.discord/smali/com/discord/utilities/recycler/NpaLinearLayoutManager.smali
index 0dc3325234..121c06d89b 100644
--- a/com.discord/smali/com/discord/utilities/recycler/NpaLinearLayoutManager.smali
+++ b/com.discord/smali/com/discord/utilities/recycler/NpaLinearLayoutManager.smali
@@ -5,22 +5,15 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;IZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/recyclerview/widget/LinearLayoutManager;-><init>(Landroid/content/Context;IZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/resources/StringResourceUtilsKt.smali b/com.discord/smali/com/discord/utilities/resources/StringResourceUtilsKt.smali
index 4d53ba9d57..198f65cdfe 100644
--- a/com.discord/smali/com/discord/utilities/resources/StringResourceUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/resources/StringResourceUtilsKt.smali
@@ -20,11 +20,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getQuantityString"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "formatArgs"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -40,7 +42,7 @@
 
     const-string p1, "getQuantityString(id, quantity, *formatArgs)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -51,24 +53,10 @@
 
     const-string p1, "getString(zeroCountStringId)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "formatArgs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$getQuantityString"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final varargs getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
@@ -78,13 +66,17 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getQuantityString"
 
-    if-eqz p0, :cond_5
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_4
+    const-string v0, "context"
 
-    if-eqz p4, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "formatArgs"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -139,37 +131,16 @@
 
     const-string p1, "getQuantityString(resId, quantity, *newArgs)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 
     :cond_2
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_3
-    const-string p0, "formatArgs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "$this$getQuantityString"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
index 7e0dfb6450..54bb0f31e4 100644
--- a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
+++ b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
@@ -30,11 +30,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "contentResolver"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "attachment"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -50,21 +52,18 @@
 
     if-nez p2, :cond_0
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_0
-    move-object v0, p1
+    check-cast p1, Ljava/io/File;
 
-    :goto_0
-    check-cast v0, Ljava/io/File;
+    if-eqz p1, :cond_1
 
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Ljava/io/File;->length()J
+    invoke-virtual {p1}, Ljava/io/File;->length()J
 
     move-result-wide p1
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     iget-object p1, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->attachment:Lcom/lytefast/flexinput/model/Attachment;
@@ -79,24 +78,10 @@
 
     move-result-wide p1
 
-    :goto_1
+    :goto_0
     iput-wide p1, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->size:J
 
     return-void
-
-    :cond_2
-    const-string p1, "attachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "contentResolver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -130,57 +115,67 @@
 .end method
 
 .method public writeTo(Lokio/BufferedSink;)V
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "sink"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v1, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->contentResolver:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->contentResolver:Landroid/content/ContentResolver;
 
-    iget-object v2, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->attachment:Lcom/lytefast/flexinput/model/Attachment;
+    iget-object v1, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->attachment:Lcom/lytefast/flexinput/model/Attachment;
 
-    invoke-virtual {v2}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
 
     move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
+
+    move-result-object v0
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     :try_start_1
-    const-string v2, "inputStream"
+    const-string v1, "inputStream"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
+    const-string v1, "$receiver"
 
-    move-result-object v2
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lp0/m;
+
+    new-instance v2, Lp0/x;
+
+    invoke-direct {v2}, Lp0/x;-><init>()V
+
+    invoke-direct {v1, v0, v2}, Lp0/m;-><init>(Ljava/io/InputStream;Lp0/x;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
-    invoke-interface {p1, v2}, Lokio/BufferedSink;->i0(Lo0/w;)J
+    invoke-interface {p1, v1}, Lokio/BufferedSink;->i0(Lp0/w;)J
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
+    const/4 p1, 0x0
+
     :try_start_3
-    invoke-static {v2, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v1, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_2
 
     :try_start_4
-    invoke-static {v1, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
     :try_end_4
     .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
 
@@ -195,12 +190,12 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
     :catchall_1
-    move-exception v3
+    move-exception v2
 
     :try_start_6
-    invoke-static {v2, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v1, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
-    throw v3
+    throw v2
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_2
 
@@ -213,12 +208,12 @@
     .catchall {:try_start_7 .. :try_end_7} :catchall_3
 
     :catchall_3
-    move-exception v2
+    move-exception v1
 
     :try_start_8
-    invoke-static {v1, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
-    throw v2
+    throw v1
     :try_end_8
     .catch Ljava/io/IOException; {:try_start_8 .. :try_end_8} :catch_0
 
@@ -229,20 +224,11 @@
     :catch_0
     move-exception p1
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x4
+    const-string v1, "Could not write to sink"
 
-    const-string v3, "Could not write to sink"
-
-    invoke-virtual {v1, v3, v2, p1, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali
index 1312542a4f..1228c6a34a 100644
--- a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali
@@ -77,13 +77,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "attachments"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "content"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -99,7 +103,7 @@
 
     const-string v3, "context.contentResolver"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->extractLinks(Ljava/util/List;Landroid/content/ContentResolver;)Ljava/util/List;
 
@@ -109,7 +113,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, v2}, Lj0/i/l;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, v2}, Lk0/j/l;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
@@ -138,7 +142,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v4, v5}, Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;->isUriValid(Landroid/net/Uri;Landroid/content/ContentResolver;)Z
 
@@ -161,25 +165,4 @@
     invoke-direct {p1, v0, v1, p2}, Lcom/discord/utilities/rest/ProcessedMessageContent;-><init>(Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "attachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent.smali b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent.smali
index b2879cfd7e..1ad3f6b522 100644
--- a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent.smali
+++ b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent.smali
@@ -72,13 +72,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "validAttachments"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "invalidAttachments"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "content"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -89,27 +93,6 @@
     iput-object p3, p0, Lcom/discord/utilities/rest/ProcessedMessageContent;->content:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "invalidAttachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "validAttachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/rest/ProcessedMessageContent;Ljava/util/List;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/utilities/rest/ProcessedMessageContent;
@@ -204,40 +187,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "validAttachments"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "invalidAttachments"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "content"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/rest/ProcessedMessageContent;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/rest/ProcessedMessageContent;-><init>(Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "invalidAttachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "validAttachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -255,7 +221,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/rest/ProcessedMessageContent;->validAttachments:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -265,7 +231,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/rest/ProcessedMessageContent;->invalidAttachments:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -275,7 +241,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/rest/ProcessedMessageContent;->content:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali
index be24ea9ba9..4720ea3982 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$authTokenProvider$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RestAPI.kt"
 
 # interfaces
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali
index fb7df317c8..607c909395 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$fingerprintProvider$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RestAPI.kt"
 
 # interfaces
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali
index 631a3066b5..c4eeb6822c 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$localeProvider$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RestAPI.kt"
 
 # interfaces
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali
index 949b346cef..5a6efe2a84 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider$spotifyTokenProvider$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RestAPI.kt"
 
 # interfaces
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .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 a86dbdc3de..38fa2897cb 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -159,7 +159,7 @@
 .method public getUserAgent()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "Discord-Android/1249"
+    const-string v0, "Discord-Android/1251"
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.smali
index 7d4fb7b2d9..fb1f76799a 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.smali
@@ -29,85 +29,95 @@
 
 # virtual methods
 .method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "chain"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_2
 
-    new-instance v2, Ljava/util/LinkedHashMap;
+    const-string v1, "request"
 
-    invoke-direct {v2}, Ljava/util/LinkedHashMap;-><init>()V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v4, v1, Ln0/a0;->b:Ln0/w;
+    new-instance v1, Ljava/util/LinkedHashMap;
 
-    iget-object v5, v1, Ln0/a0;->c:Ljava/lang/String;
+    invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iget-object v7, v1, Ln0/a0;->e:Lokhttp3/RequestBody;
+    iget-object v3, v0, Lo0/a0;->b:Lo0/w;
 
-    iget-object v2, v1, Ln0/a0;->f:Ljava/util/Map;
+    iget-object v4, v0, Lo0/a0;->c:Ljava/lang/String;
 
-    invoke-interface {v2}, Ljava/util/Map;->isEmpty()Z
+    iget-object v6, v0, Lo0/a0;->e:Lokhttp3/RequestBody;
 
-    move-result v2
+    iget-object v1, v0, Lo0/a0;->f:Ljava/util/Map;
 
-    if-eqz v2, :cond_0
+    invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
-    new-instance v2, Ljava/util/LinkedHashMap;
+    move-result v1
 
-    invoke-direct {v2}, Ljava/util/LinkedHashMap;-><init>()V
+    if-eqz v1, :cond_0
+
+    new-instance v1, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v2, v1, Ln0/a0;->f:Ljava/util/Map;
+    iget-object v1, v0, Lo0/a0;->f:Ljava/util/Map;
 
-    invoke-static {v2}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
-
-    move-result-object v2
-
-    :goto_0
-    iget-object v1, v1, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {v1}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+    invoke-static {v1}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v1
 
-    sget-object v3, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticSuperProperties;
+    :goto_0
+    iget-object v0, v0, Lo0/a0;->d:Lokhttp3/Headers;
 
-    invoke-virtual {v3}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperPropertiesStringBase64()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
 
-    move-result-object v3
+    move-result-object v0
 
-    if-eqz v3, :cond_2
+    const-string v2, "X-Super-Properties"
 
-    const-string v0, "X-Super-Properties"
+    sget-object v5, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticSuperProperties;
 
-    invoke-virtual {v1, v0, v3}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+    invoke-virtual {v5}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperPropertiesStringBase64()Ljava/lang/String;
 
-    if-eqz v4, :cond_1
+    move-result-object v5
 
-    invoke-virtual {v1}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+    const-string v7, "name"
 
-    move-result-object v6
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Ln0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+    const-string/jumbo v7, "value"
 
-    move-result-object v8
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ln0/a0;
+    invoke-virtual {v0, v2, v5}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
-    move-object v3, v0
+    if-eqz v3, :cond_1
 
-    invoke-direct/range {v3 .. v8}, Ln0/a0;-><init>(Ln0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
 
-    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
+    move-result-object v5
+
+    invoke-static {v1}, Lo0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v7
+
+    new-instance v0, Lo0/a0;
+
+    move-object v2, v0
+
+    invoke-direct/range {v2 .. v7}, Lo0/a0;-><init>(Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+
+    invoke-interface {p1, v0}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
 
     move-result-object p1
 
@@ -116,7 +126,7 @@
     :cond_1
     new-instance p1, Ljava/lang/IllegalStateException;
 
-    const-string v0, "url == null"
+    const-string/jumbo v0, "url == null"
 
     invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
@@ -127,19 +137,7 @@
     throw p1
 
     :cond_2
-    const-string p1, "value"
+    const/4 p1, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    throw v0
-
-    :cond_4
-    const-string p1, "chain"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildLoggingInterceptor$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildLoggingInterceptor$1.smali
index 5cd8935425..61908ece7d 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildLoggingInterceptor$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$buildLoggingInterceptor$1.smali
@@ -3,7 +3,7 @@
 .source "RestAPI.kt"
 
 # interfaces
-.implements Ln0/h0/a$b;
+.implements Lo0/h0/a$b;
 
 
 # annotations
@@ -31,22 +31,17 @@
 .method public log(Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/utilities/logging/Logger;->v$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/utilities/logging/Logger;->v$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1.smali
new file mode 100644
index 0000000000..66dee64cf5
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1.smali
@@ -0,0 +1,117 @@
+.class public final Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;
+.super Ljava/lang/Object;
+.source "RestAPI.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/rest/RestAPI$Companion;->uploadSystemLog()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Lrx/Observable<",
+        "+",
+        "Ljava/lang/Void;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;->call(Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Ljava/lang/String;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")",
+            "Lrx/Observable<",
+            "+",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "android_system_log.txt"
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/rest/RestAPI;->uploadLog(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
index 79704c112e..efe14011a0 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
@@ -31,19 +31,19 @@
     return-void
 .end method
 
-.method public static synthetic api$annotations()V
+.method public static synthetic getApi$annotations()V
     .locals 0
 
     return-void
 .end method
 
-.method public static synthetic apiSerializeNulls$annotations()V
+.method public static synthetic getApiSerializeNulls$annotations()V
     .locals 0
 
     return-void
 .end method
 
-.method public static synthetic apiSpotify$annotations()V
+.method public static synthetic getApiSpotify$annotations()V
     .locals 0
 
     return-void
@@ -64,19 +64,23 @@
 .end method
 
 .method public final buildLoggingInterceptor()Lokhttp3/Interceptor;
-    .locals 2
+    .locals 3
 
-    new-instance v0, Ln0/h0/a;
+    new-instance v0, Lo0/h0/a;
 
     new-instance v1, Lcom/discord/utilities/rest/RestAPI$Companion$buildLoggingInterceptor$1;
 
     invoke-direct {v1}, Lcom/discord/utilities/rest/RestAPI$Companion$buildLoggingInterceptor$1;-><init>()V
 
-    invoke-direct {v0, v1}, Ln0/h0/a;-><init>(Ln0/h0/a$b;)V
+    invoke-direct {v0, v1}, Lo0/h0/a;-><init>(Lo0/h0/a$b;)V
 
-    sget-object v1, Ln0/h0/a$a;->e:Ln0/h0/a$a;
+    sget-object v1, Lo0/h0/a$a;->e:Lo0/h0/a$a;
 
-    iput-object v1, v0, Ln0/h0/a;->c:Ln0/h0/a$a;
+    const-string v2, "<set-?>"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v1, v0, Lo0/h0/a;->c:Lo0/h0/a$a;
 
     return-object v0
 .end method
@@ -95,7 +99,7 @@
     :cond_0
     const-string v0, "api"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -116,7 +120,7 @@
     :cond_0
     const-string v0, "apiClientVersions"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -137,7 +141,28 @@
     :cond_0
     const-string v0, "apiFiles"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public final getApiRtcLatency()Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+    .locals 1
+
+    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->access$getApiRtcLatency$cp()Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    const-string v0, "apiRtcLatency"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -158,7 +183,7 @@
     :cond_0
     const-string v0, "apiSerializeNulls"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -179,28 +204,7 @@
     :cond_0
     const-string v0, "apiSpotify"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public final getTextApi()Lcom/discord/restapi/RestAPIInterface$Text;
-    .locals 1
-
-    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->access$getTextApi$cp()Lcom/discord/restapi/RestAPIInterface$Text;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    const-string v0, "textApi"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -208,13 +212,15 @@
 .end method
 
 .method public final init(Landroid/content/Context;)V
-    .locals 28
+    .locals 22
 
     move-object/from16 v0, p0
 
     move-object/from16 v1, p1
 
-    if-eqz v1, :cond_0
+    const-string v2, "context"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/restapi/RequiredHeadersInterceptor;
 
@@ -290,7 +296,7 @@
 
     const-string v9, "https://discord.com/api/"
 
-    invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Ln0/p;)V
+    invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lo0/p;)V
 
     new-instance v15, Lcom/discord/utilities/rest/RestAPI;
 
@@ -298,25 +304,17 @@
 
     const/4 v11, 0x0
 
-    const-wide/16 v20, 0x0
-
-    const/16 v23, 0x0
-
-    const/16 v22, 0x0
-
-    const/16 v18, 0x66
-
-    const/16 v27, 0x0
-
     const-wide/16 v12, 0x0
 
-    const/16 v16, 0x0
+    const-string v16, "client_base"
 
     const/16 v17, 0x0
 
-    const/16 v19, 0x0
+    const/16 v18, 0x0
 
-    const-string v24, "client_base"
+    const/16 v19, 0x66
+
+    const/16 v20, 0x0
 
     move-object v9, v1
 
@@ -324,7 +322,15 @@
 
     move-object v2, v15
 
-    move-object/from16 v15, v24
+    move-object/from16 v15, v16
+
+    move/from16 v16, v17
+
+    move-object/from16 v17, v18
+
+    move/from16 v18, v19
+
+    move-object/from16 v19, v20
 
     invoke-static/range {v9 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -342,9 +348,15 @@
 
     const/4 v11, 0x1
 
+    const-string v15, "client_serialize_nulls"
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0x0
+
     const/16 v18, 0x64
 
-    const-string v15, "client_serialize_nulls"
+    const/16 v19, 0x0
 
     move-object v9, v1
 
@@ -360,105 +372,87 @@
 
     const-class v10, Lcom/discord/restapi/RestAPIInterface$Dynamic;
 
-    const/4 v2, 0x0
-
-    const/16 v18, 0x66
-
     const/4 v11, 0x0
 
     const-string v15, "client_dynamic"
 
-    move-object v14, v3
+    const/16 v18, 0x66
 
-    move-object/from16 v17, v22
+    move-object v14, v3
 
     invoke-static/range {v9 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v2
 
-    check-cast v4, Lcom/discord/restapi/RestAPIInterface$Dynamic;
+    check-cast v2, Lcom/discord/restapi/RestAPIInterface$Dynamic;
 
-    invoke-virtual {v0, v4}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiClientVersions(Lcom/discord/restapi/RestAPIInterface$Dynamic;)V
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiClientVersions(Lcom/discord/restapi/RestAPIInterface$Dynamic;)V
 
-    const-class v10, Lcom/discord/restapi/RestAPIInterface$Text;
+    const-class v10, Lcom/discord/restapi/RestAPIInterface$RtcLatency;
 
-    const/16 v18, 0x6
+    const-string v15, "client_rtc_latency"
 
-    const-string v15, "client_text"
+    invoke-static/range {v9 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
 
-    const-string v17, "text/plain"
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiRtcLatency(Lcom/discord/restapi/RestAPIInterface$RtcLatency;)V
+
+    new-instance v2, Lcom/discord/utilities/rest/RestAPI;
+
+    new-instance v9, Lcom/discord/restapi/RestAPIBuilder;
+
+    const-string v3, "https://api.spotify.com/v1/"
+
+    invoke-direct {v9, v3, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lo0/p;)V
+
+    const-class v10, Lcom/discord/restapi/RestAPIInterface;
+
+    new-array v3, v8, [Lokhttp3/Interceptor;
+
+    aput-object v5, v3, v7
+
+    new-instance v4, Lcom/discord/restapi/SpotifyTokenInterceptor;
+
+    sget-object v6, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
+
+    invoke-direct {v4, v6}, Lcom/discord/restapi/SpotifyTokenInterceptor;-><init>(Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;)V
+
+    const/4 v6, 0x1
+
+    aput-object v4, v3, v6
+
+    invoke-static {v3}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v14
+
+    const-string v15, "client_spotify"
+
+    const/16 v18, 0x46
 
     invoke-static/range {v9 .. v19}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
-    check-cast v3, Lcom/discord/restapi/RestAPIInterface$Text;
+    check-cast v3, Lcom/discord/restapi/RestAPIInterface;
 
-    invoke-virtual {v0, v3}, Lcom/discord/utilities/rest/RestAPI$Companion;->setTextApi(Lcom/discord/restapi/RestAPIInterface$Text;)V
+    invoke-direct {v2, v3}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
 
-    new-instance v3, Lcom/discord/utilities/rest/RestAPI;
-
-    new-instance v4, Lcom/discord/restapi/RestAPIBuilder;
-
-    const-string v9, "https://api.spotify.com/v1/"
-
-    invoke-direct {v4, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Ln0/p;)V
-
-    const-class v17, Lcom/discord/restapi/RestAPIInterface;
-
-    new-array v6, v8, [Lokhttp3/Interceptor;
-
-    aput-object v5, v6, v7
-
-    new-instance v7, Lcom/discord/restapi/SpotifyTokenInterceptor;
-
-    sget-object v8, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
-
-    invoke-direct {v7, v8}, Lcom/discord/restapi/SpotifyTokenInterceptor;-><init>(Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;)V
-
-    const/4 v8, 0x1
-
-    aput-object v7, v6, v8
-
-    invoke-static {v6}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v6
-
-    const/16 v24, 0x0
-
-    const/16 v25, 0x46
-
-    const/16 v26, 0x0
-
-    const-string v22, "client_spotify"
-
-    move-object/from16 v16, v4
-
-    move/from16 v18, v2
-
-    move-wide/from16 v19, v20
-
-    move-object/from16 v21, v6
-
-    invoke-static/range {v16 .. v26}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/restapi/RestAPIInterface;
-
-    invoke-direct {v3, v2}, Lcom/discord/utilities/rest/RestAPI;-><init>(Lcom/discord/restapi/RestAPIInterface;)V
-
-    invoke-virtual {v0, v3}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSpotify(Lcom/discord/utilities/rest/RestAPI;)V
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiSpotify(Lcom/discord/utilities/rest/RestAPI;)V
 
     const-class v12, Lcom/discord/restapi/RestAPIInterface$Files;
 
+    invoke-static {v5}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v16
+
     const/4 v13, 0x0
 
     const-wide/16 v14, 0x0
 
-    invoke-static {v5}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v16
+    const-string v17, "client_files"
 
     const/16 v18, 0x0
 
@@ -466,12 +460,8 @@
 
     const/16 v21, 0x0
 
-    const-string v17, "client_files"
-
     move-object v11, v1
 
-    move-object/from16 v19, v27
-
     invoke-static/range {v11 .. v21}, Lcom/discord/restapi/RestAPIBuilder;->build$default(Lcom/discord/restapi/RestAPIBuilder;Ljava/lang/Class;ZJLjava/util/List;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
@@ -481,127 +471,106 @@
     invoke-virtual {v0, v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->setApiFiles(Lcom/discord/restapi/RestAPIInterface$Files;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "context"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
 
 .method public final setApi(Lcom/discord/utilities/rest/RestAPI;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rest/RestAPI;->access$setApi$cp(Lcom/discord/utilities/rest/RestAPI;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setApiClientVersions(Lcom/discord/restapi/RestAPIInterface$Dynamic;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rest/RestAPI;->access$setApiClientVersions$cp(Lcom/discord/restapi/RestAPIInterface$Dynamic;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setApiFiles(Lcom/discord/restapi/RestAPIInterface$Files;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rest/RestAPI;->access$setApiFiles$cp(Lcom/discord/restapi/RestAPIInterface$Files;)V
 
     return-void
+.end method
 
-    :cond_0
-    const-string p1, "<set-?>"
+.method public final setApiRtcLatency(Lcom/discord/restapi/RestAPIInterface$RtcLatency;)V
+    .locals 1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v0, "<set-?>"
 
-    const/4 p1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p1
+    invoke-static {p1}, Lcom/discord/utilities/rest/RestAPI;->access$setApiRtcLatency$cp(Lcom/discord/restapi/RestAPIInterface$RtcLatency;)V
+
+    return-void
 .end method
 
 .method public final setApiSerializeNulls(Lcom/discord/utilities/rest/RestAPI;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rest/RestAPI;->access$setApiSerializeNulls$cp(Lcom/discord/utilities/rest/RestAPI;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setApiSpotify(Lcom/discord/utilities/rest/RestAPI;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rest/RestAPI;->access$setApiSpotify$cp(Lcom/discord/utilities/rest/RestAPI;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public final setTextApi(Lcom/discord/restapi/RestAPIInterface$Text;)V
-    .locals 0
+.method public final uploadSystemLog()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
 
-    if-eqz p1, :cond_0
+    sget-object v0, Lcom/discord/utilities/SystemLogUtils;->INSTANCE:Lcom/discord/utilities/SystemLogUtils;
 
-    invoke-static {p1}, Lcom/discord/utilities/rest/RestAPI;->access$setTextApi$cp(Lcom/discord/restapi/RestAPIInterface$Text;)V
+    invoke-virtual {v0}, Lcom/discord/utilities/SystemLogUtils;->fetch()Lrx/Observable;
 
-    return-void
+    move-result-object v0
 
-    :cond_0
-    const-string p1, "<set-?>"
+    sget-object v1, Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$Companion$uploadSystemLog$1;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
-    const/4 p1, 0x0
+    move-result-object v0
 
-    throw p1
+    const-string v1, "SystemLogUtils.fetch().s\u2026restSubscribeOn()\n      }"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali
index 674dff0b4c..cddc1b601c 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$HarvestState$LastRequested.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/Harvest;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/rest/RestAPI$HarvestState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/rest/RestAPI$HarvestState$LastRequested;->data:Lcom/discord/models/domain/Harvest;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$getClientVersion$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$getClientVersion$1.smali
index 5bfd2a11f4..02a8e7bc40 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$getClientVersion$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$getClientVersion$1.smali
@@ -3,7 +3,7 @@
 .source "RestAPI.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/google/gson/JsonObject;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/google/gson/JsonObject;)I
+.method public final call(Lcom/google/gson/JsonObject;)Ljava/lang/Integer;
     .locals 1
 
     if-eqz p1, :cond_1
@@ -94,7 +96,11 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -102,11 +108,7 @@
 
     check-cast p1, Lcom/google/gson/JsonObject;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/rest/RestAPI$getClientVersion$1;->call(Lcom/google/gson/JsonObject;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/rest/RestAPI$getClientVersion$1;->call(Lcom/google/gson/JsonObject;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1.smali
deleted file mode 100644
index b9eae27964..0000000000
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.class public final Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;
-.super Ljava/lang/Object;
-.source "RestAPI.kt"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/utilities/rest/RestAPI;->getCloudflareBestRegion()Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;
-
-    invoke-direct {v0}, Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;-><init>()V
-
-    sput-object v0, Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;->call(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "response"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali
index 9611031f4e..ce00d0da02 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1.smali
@@ -3,7 +3,7 @@
 .source "RestAPI.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/Harvest;",
+        "Lcom/discord/utilities/rest/RestAPI$HarvestState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
index e17e946955..f876d0a60c 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
@@ -25,12 +25,12 @@
 
 .field public static apiFiles:Lcom/discord/restapi/RestAPIInterface$Files;
 
+.field public static apiRtcLatency:Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+
 .field public static apiSerializeNulls:Lcom/discord/utilities/rest/RestAPI;
 
 .field public static apiSpotify:Lcom/discord/utilities/rest/RestAPI;
 
-.field public static textApi:Lcom/discord/restapi/RestAPIInterface$Text;
-
 
 # instance fields
 .field public final _api:Lcom/discord/restapi/RestAPIInterface;
@@ -52,24 +52,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/restapi/RestAPIInterface;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "_api"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
     return-void
-
-    :cond_0
-    const-string p1, "_api"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getApi$cp()Lcom/discord/utilities/rest/RestAPI;
@@ -96,6 +89,14 @@
     return-object v0
 .end method
 
+.method public static final synthetic access$getApiRtcLatency$cp()Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->apiRtcLatency:Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+
+    return-object v0
+.end method
+
 .method public static final synthetic access$getApiSerializeNulls$cp()Lcom/discord/utilities/rest/RestAPI;
     .locals 1
 
@@ -112,14 +113,6 @@
     return-object v0
 .end method
 
-.method public static final synthetic access$getTextApi$cp()Lcom/discord/restapi/RestAPIInterface$Text;
-    .locals 1
-
-    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->textApi:Lcom/discord/restapi/RestAPIInterface$Text;
-
-    return-object v0
-.end method
-
 .method public static final synthetic access$setApi$cp(Lcom/discord/utilities/rest/RestAPI;)V
     .locals 0
 
@@ -144,6 +137,14 @@
     return-void
 .end method
 
+.method public static final synthetic access$setApiRtcLatency$cp(Lcom/discord/restapi/RestAPIInterface$RtcLatency;)V
+    .locals 0
+
+    sput-object p0, Lcom/discord/utilities/rest/RestAPI;->apiRtcLatency:Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+
+    return-void
+.end method
+
 .method public static final synthetic access$setApiSerializeNulls$cp(Lcom/discord/utilities/rest/RestAPI;)V
     .locals 0
 
@@ -160,14 +161,6 @@
     return-void
 .end method
 
-.method public static final synthetic access$setTextApi$cp(Lcom/discord/restapi/RestAPIInterface$Text;)V
-    .locals 0
-
-    sput-object p0, Lcom/discord/utilities/rest/RestAPI;->textApi:Lcom/discord/restapi/RestAPIInterface$Text;
-
-    return-void
-.end method
-
 .method public static synthetic addRelationship$default(Lcom/discord/utilities/rest/RestAPI;Ljava/lang/String;JLjava/lang/Integer;Ljava/lang/String;ILjava/lang/Object;)Lrx/Observable;
     .locals 7
 
@@ -334,7 +327,7 @@
     :cond_0
     const-string v0, "api"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -353,7 +346,7 @@
     :cond_0
     const-string v0, "apiSerializeNulls"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -372,7 +365,7 @@
     :cond_0
     const-string v0, "apiSpotify"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -500,9 +493,9 @@
 
     const-string v0, "it.toString()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
@@ -510,7 +503,7 @@
 
     const-string v0, "(this as java.lang.String).getBytes(charset)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -518,13 +511,9 @@
 
     move-result-object p1
 
-    const-string v0, "Base64.encodeToString(it\u2026).toByteArray(), NO_WRAP)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     const-string v0, "JSONObject().apply {\n   \u2026toByteArray(), NO_WRAP) }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -593,7 +582,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     if-eqz p2, :cond_1
@@ -605,7 +594,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object p2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p2, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_1
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
@@ -706,7 +695,7 @@
 .method public acceptGift(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
@@ -721,11 +710,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "entitlements/gift-codes/{code}/redeem"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -734,21 +725,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public ackGuild(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -761,7 +743,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/ack"
     .end annotation
 
@@ -777,12 +759,12 @@
 .method public addChannelPin(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
@@ -795,7 +777,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/pins/{messageId}"
     .end annotation
 
@@ -811,12 +793,12 @@
 .method public addChannelRecipient(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "recipientId"
         .end annotation
     .end param
@@ -829,7 +811,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/recipients/{recipientId}"
     .end annotation
 
@@ -843,19 +825,19 @@
 .end method
 
 .method public addReaction(JJLjava/lang/String;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "reaction"
         .end annotation
@@ -871,49 +853,42 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/messages/{messageId}/reactions/{reaction}/@me"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "reaction"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->addReaction(JJLjava/lang/String;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->addReaction(JJLjava/lang/String;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public addRelationship(JLcom/discord/restapi/RestAPIParams$UserRelationship;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UserRelationship;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -929,15 +904,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "users/@me/relationships/{userId}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "relationship"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -946,24 +923,10 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "relationship"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final addRelationship(Ljava/lang/String;JLjava/lang/Integer;Ljava/lang/String;)Lrx/Observable;
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -978,54 +941,49 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "location"
 
-    const-string v1, "location"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    iget-object v2, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    new-instance v2, Lcom/discord/restapi/RestAPIParams$UserRelationship;
 
-    new-instance v3, Lcom/discord/restapi/RestAPIParams$UserRelationship;
-
-    invoke-direct {v3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserRelationship;-><init>(Ljava/lang/Integer;Ljava/lang/String;)V
+    invoke-direct {v2, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserRelationship;-><init>(Ljava/lang/Integer;Ljava/lang/String;)V
 
     const/4 p4, 0x1
 
     new-array p5, p4, [Lkotlin/Pair;
 
-    new-instance v4, Lkotlin/Pair;
+    new-instance v3, Lkotlin/Pair;
 
-    invoke-direct {v4, v1, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v3, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     const/4 p1, 0x0
 
-    aput-object v4, p5, p1
+    aput-object v3, p5, p1
 
     invoke-direct {p0, p5}, Lcom/discord/utilities/rest/RestAPI;->jsonObjectOf([Lkotlin/Pair;)Ljava/lang/String;
 
     move-result-object p5
 
-    invoke-interface {v2, p2, p3, v3, p5}, Lcom/discord/restapi/RestAPIInterface;->addRelationship(JLcom/discord/restapi/RestAPIParams$UserRelationship;Ljava/lang/String;)Lrx/Observable;
+    invoke-interface {v1, p2, p3, v2, p5}, Lcom/discord/restapi/RestAPIInterface;->addRelationship(JLcom/discord/restapi/RestAPIParams$UserRelationship;Ljava/lang/String;)Lrx/Observable;
 
     move-result-object p2
 
-    invoke-static {p2, p1, p4, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x0
+
+    invoke-static {p2, p1, p4, p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public authorizeConnection(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
@@ -1040,11 +998,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "connections/{connection}/authorize"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1053,31 +1013,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public banGuildMember(JJLcom/discord/restapi/RestAPIParams$BanGuildMember;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$BanGuildMember;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1091,45 +1042,38 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "guilds/{guildId}/bans/{userId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "body"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->banGuildMember(JJLcom/discord/restapi/RestAPIParams$BanGuildMember;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->banGuildMember(JJLcom/discord/restapi/RestAPIParams$BanGuildMember;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public batchUpdateRole(JLjava/util/List;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Ljava/util/List;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1144,11 +1088,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/roles"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1157,21 +1103,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public call(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
@@ -1184,7 +1121,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/call"
     .end annotation
 
@@ -1200,7 +1137,7 @@
 .method public cancelSubscriptionSlot(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionSlotId"
         .end annotation
     .end param
@@ -1213,7 +1150,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/guilds/premium/subscription-slots/{subscriptionSlotId}/cancel"
     .end annotation
 
@@ -1227,19 +1164,19 @@
 .end method
 
 .method public changeGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMember;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$GuildMember;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1253,45 +1190,38 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/members/{userId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "body"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->changeGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMember;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->changeGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMember;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public changeGuildNickname(JLcom/discord/restapi/RestAPIParams$Nick;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Nick;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1305,11 +1235,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/members/@me/nick"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1318,26 +1250,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public convertDMToGroup(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "recipientId"
         .end annotation
     .end param
@@ -1350,7 +1273,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/recipients/{recipientId}"
     .end annotation
 
@@ -1366,12 +1289,12 @@
 .method public createChannelFollower(JLcom/discord/restapi/RestAPIParams$ChannelFollowerPost;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$ChannelFollowerPost;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1385,11 +1308,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/followers"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1398,21 +1323,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public createGuild(Lcom/discord/restapi/RestAPIParams$CreateGuild;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$CreateGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1426,11 +1342,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1439,26 +1357,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public createGuildChannel(JLcom/discord/restapi/RestAPIParams$CreateGuildChannel;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$CreateGuildChannel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1472,11 +1381,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/channels"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1485,26 +1396,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public createGuildFromTemplate(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildTemplateCode"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1519,15 +1421,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/templates/{guildTemplateCode}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildTemplateCode"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1536,26 +1440,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildTemplateCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public createRole(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -1568,7 +1458,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/roles"
     .end annotation
 
@@ -1584,7 +1474,7 @@
 .method public deleteAccount(Lcom/discord/restapi/RestAPIParams$DisableAccount;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$DisableAccount;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1598,11 +1488,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/delete"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1611,21 +1503,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public deleteChannel(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
@@ -1638,7 +1521,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}"
     .end annotation
 
@@ -1654,12 +1537,12 @@
 .method public deleteChannelPin(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
@@ -1672,7 +1555,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/pins/{messageId}"
     .end annotation
 
@@ -1688,12 +1571,12 @@
 .method public deleteConnection(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connectionId"
         .end annotation
     .end param
@@ -1709,15 +1592,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/connections/{connection}/{connectionId}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "connectionId"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1726,31 +1611,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "connectionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public deleteGuild(JLcom/discord/restapi/RestAPIParams$DeleteGuild;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$DeleteGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -1764,11 +1635,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/delete"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1777,26 +1650,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public deleteGuildEmoji(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "emojiId"
         .end annotation
     .end param
@@ -1809,7 +1673,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/emojis/{emojiId}"
     .end annotation
 
@@ -1825,12 +1689,12 @@
 .method public deleteGuildIntegration(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "integrationId"
         .end annotation
     .end param
@@ -1843,7 +1707,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/integrations/{integrationId}"
     .end annotation
 
@@ -1859,12 +1723,12 @@
 .method public deleteMessage(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channel_id"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "message_id"
         .end annotation
     .end param
@@ -1877,7 +1741,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channel_id}/messages/{message_id}"
     .end annotation
 
@@ -1893,7 +1757,7 @@
 .method public deleteOAuthToken(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "oauthId"
         .end annotation
     .end param
@@ -1906,7 +1770,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "oauth2/tokens/{oauthId}"
     .end annotation
 
@@ -1922,7 +1786,7 @@
 .method public deletePaymentSource(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "paymentSourceId"
         .end annotation
     .end param
@@ -1937,11 +1801,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/billing/payment-sources/{paymentSourceId}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "paymentSourceId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -1950,26 +1816,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "paymentSourceId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public deletePermissionOverwrites(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "targetId"
         .end annotation
     .end param
@@ -1982,7 +1839,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/permissions/{targetId}"
     .end annotation
 
@@ -1998,12 +1855,12 @@
 .method public deleteRole(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "roleId"
         .end annotation
     .end param
@@ -2016,7 +1873,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/roles/{roleId}"
     .end annotation
 
@@ -2032,7 +1889,7 @@
 .method public deleteSubscription(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionId"
         .end annotation
     .end param
@@ -2047,11 +1904,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/billing/subscriptions/{subscriptionId}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2060,21 +1919,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "subscriptionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public disableAccount(Lcom/discord/restapi/RestAPIParams$DisableAccount;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$DisableAccount;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2088,11 +1938,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/disable"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2101,21 +1953,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public disableMFA(Lcom/discord/restapi/RestAPIParams$AuthCode;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$AuthCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2129,11 +1972,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/totp/disable"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2142,21 +1987,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public disableMfaSMS(Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2170,11 +2006,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/sms/disable"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2183,31 +2021,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public disconnectGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMemberDisconnect;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$GuildMemberDisconnect;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2221,45 +2050,38 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/members/{userId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "body"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->disconnectGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMemberDisconnect;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->disconnectGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMemberDisconnect;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public editChannel(JLcom/discord/restapi/RestAPIParams$Channel;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Channel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2273,11 +2095,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "channels/{channelId}"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2286,15 +2110,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final editChannel(JLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;)Lrx/Observable;
@@ -2359,12 +2174,12 @@
 .method public editGroupDM(JLcom/discord/restapi/RestAPIParams$GroupDM;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$GroupDM;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2378,11 +2193,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "channels/{channelId}"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2391,31 +2208,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public editMessage(JJLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channel_id"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "message_id"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$Message;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2429,45 +2237,38 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "channels/{channel_id}/messages/{message_id}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "message"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->editMessage(JJLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->editMessage(JJLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public enableIntegration(JLcom/discord/restapi/RestAPIParams$EnableIntegration;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$EnableIntegration;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2481,11 +2282,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/integrations"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2494,21 +2297,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public enableMFA(Lcom/discord/restapi/RestAPIParams$EnableMFA;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$EnableMFA;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2522,11 +2316,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/totp/enable"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2535,21 +2331,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public enableMfaSMS(Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2563,11 +2350,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/sms/enable"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2576,21 +2365,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public forgotPassword(Lcom/discord/restapi/RestAPIParams$ForgotPassword;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$ForgotPassword;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2604,11 +2384,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/forgot"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2617,21 +2399,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public generateGiftCode(Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2645,11 +2418,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/entitlements/gift-codes"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2658,31 +2433,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getActivityMetadata(JLjava/lang/String;J)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "sessionId"
         .end annotation
     .end param
     .param p4    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "applicationId"
         .end annotation
     .end param
@@ -2697,40 +2463,33 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/sessions/{sessionId}/activities/{applicationId}/metadata"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "sessionId"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-object v3, p3
+    move-wide v2, p1
 
-    move-wide v4, p4
+    move-object v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->getActivityMetadata(JLjava/lang/String;J)Lrx/Observable;
+    move-wide v5, p4
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->getActivityMetadata(JLjava/lang/String;J)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "sessionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getApplications(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "application_ids"
         .end annotation
     .end param
@@ -2744,7 +2503,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "applications/public"
     .end annotation
 
@@ -2760,27 +2519,27 @@
 .method public getAuditLogs(JILjava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)Lrx/Observable;
     .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
     .param p4    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "before"
         .end annotation
     .end param
     .param p5    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "user_id"
         .end annotation
     .end param
     .param p6    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "action_type"
         .end annotation
     .end param
@@ -2797,7 +2556,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/audit-logs"
     .end annotation
 
@@ -2903,7 +2662,7 @@
 .method public getBackupCodes(Lcom/discord/restapi/RestAPIParams$BackupCodesRequest;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$BackupCodesRequest;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -2917,11 +2676,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/mfa/codes"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "backupCodesRequest"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -2930,21 +2691,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "backupCodesRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getBans(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -2958,7 +2710,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/bans"
     .end annotation
 
@@ -2974,22 +2726,22 @@
 .method public getChannelMessages(JLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)Lrx/Observable;
     .locals 6
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "before"
         .end annotation
     .end param
     .param p4    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "after"
         .end annotation
     .end param
     .param p5    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -3007,7 +2759,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages"
     .end annotation
 
@@ -3031,17 +2783,17 @@
 .method public getChannelMessagesAround(JIJ)Lrx/Observable;
     .locals 6
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
     .param p4    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "around"
         .end annotation
     .end param
@@ -3055,7 +2807,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages"
     .end annotation
 
@@ -3077,7 +2829,7 @@
 .method public getChannelPins(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
@@ -3091,7 +2843,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/pins"
     .end annotation
 
@@ -3129,13 +2881,13 @@
 
     sget-object v2, Lcom/discord/utilities/rest/RestAPI$getClientVersion$1;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$getClientVersion$1;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v2, "apiClientVersions\n      \u2026n_version\")?.asInt ?: 0 }"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -3150,58 +2902,7 @@
     :cond_0
     const-string v0, "apiClientVersions"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final getCloudflareBestRegion()Lrx/Observable;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->textApi:Lcom/discord/restapi/RestAPIInterface$Text;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const-string v2, "https://best.discord.media/region"
-
-    invoke-interface {v0, v2}, Lcom/discord/restapi/RestAPIInterface$Text;->get(Ljava/lang/String;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v2, Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$getCloudflareBestRegion$1;
-
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string v2, "textApi\n      .get(\"http\u2026onse -> response.trim() }"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-static {v0, v2, v3, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    const-string v0, "textApi"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -3209,12 +2910,12 @@
 .method public getConnectionAccessToken(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "platformType"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "accountId"
         .end annotation
     .end param
@@ -3230,15 +2931,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/connections/{platformType}/{accountId}/access-token"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "platformType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "accountId"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -3247,31 +2950,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "accountId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "platformType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getConnectionState(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "pinNumber"
         .end annotation
     .end param
@@ -3287,15 +2976,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "connections/{connection}/callback-continuation/{pinNumber}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "pinNumber"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -3304,20 +2995,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "pinNumber"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getConnections()Lrx/Observable;
@@ -3332,7 +3009,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/connections"
     .end annotation
 
@@ -3356,7 +3033,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "auth/consent-required"
     .end annotation
 
@@ -3380,7 +3057,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/consent"
     .end annotation
 
@@ -3404,7 +3081,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "experiments"
     .end annotation
 
@@ -3420,27 +3097,27 @@
 .method public getGifSearchResults(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .locals 7
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "q"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "media_format"
         .end annotation
     .end param
     .param p5    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -3459,19 +3136,25 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/search"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "query"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "provider"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "locale"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaFormat"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -3490,55 +3173,27 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "mediaFormat"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "provider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getGifSuggestedSearchTerms(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "q"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p4    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -3556,17 +3211,21 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/suggest"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "provider"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "query"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "locale"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -3575,43 +3234,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "provider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getGifTrendingSearchTerms(Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -3628,15 +3266,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/trending_search"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "provider"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "locale"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -3645,20 +3285,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "provider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getGifts()Lrx/Observable;
@@ -3673,7 +3299,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/entitlements/gifts"
     .end annotation
 
@@ -3689,7 +3315,7 @@
 .method public getGuildEmojis(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -3703,7 +3329,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/emojis"
     .end annotation
 
@@ -3719,7 +3345,7 @@
 .method public getGuildIntegrations(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -3733,7 +3359,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/integrations"
     .end annotation
 
@@ -3749,7 +3375,7 @@
 .method public getGuildInvites(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -3763,7 +3389,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/invites"
     .end annotation
 
@@ -3779,7 +3405,7 @@
 .method public getGuildPreview(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -3792,7 +3418,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/preview"
     .end annotation
 
@@ -3808,7 +3434,7 @@
 .method public getGuildTemplateCode(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildTemplateCode"
         .end annotation
     .end param
@@ -3823,11 +3449,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/templates/{guildTemplateCode}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplateCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -3836,15 +3464,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "guildTemplateCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getGuildVoiceRegions()Lrx/Observable;
@@ -3859,7 +3478,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "voice/regions"
     .end annotation
 
@@ -3875,7 +3494,7 @@
 .method public getGuildVoiceRegions(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -3889,7 +3508,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/regions"
     .end annotation
 
@@ -3905,7 +3524,7 @@
 .method public getGuildWelcomeScreen(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -3918,7 +3537,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/welcome-screen"
     .end annotation
 
@@ -3942,7 +3561,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/harvest"
     .end annotation
 
@@ -3974,13 +3593,13 @@
 
     sget-object v1, Lcom/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$getHarvestStatusGuarded$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "_api.getHarvestStatus()\n\u2026erRequested()\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -3994,12 +3613,12 @@
 .method public getInviteCode(Ljava/lang/String;Z)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
     .param p2    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "with_counts"
         .end annotation
     .end param
@@ -4014,11 +3633,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "invites/{code}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -4027,21 +3648,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getInvoicePreview(Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$InvoicePreviewBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -4055,11 +3667,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/billing/invoices/preview"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "invoicePreviewBody"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -4068,15 +3682,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "invoicePreviewBody"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getLibrary()Lrx/Observable;
@@ -4091,7 +3696,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/library"
     .end annotation
 
@@ -4107,27 +3712,27 @@
 .method public getMentions(IZZLjava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
     .locals 6
     .param p1    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
     .param p2    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "roles"
         .end annotation
     .end param
     .param p3    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "everyone"
         .end annotation
     .end param
     .param p4    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "guild_id"
         .end annotation
     .end param
     .param p5    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "before"
         .end annotation
     .end param
@@ -4144,7 +3749,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/mentions"
     .end annotation
 
@@ -4170,7 +3775,7 @@
 .method public getMyEntitlements(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "applicationId"
         .end annotation
     .end param
@@ -4184,7 +3789,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/applications/{applicationId}/entitlements"
     .end annotation
 
@@ -4209,7 +3814,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "oauth2/tokens"
     .end annotation
 
@@ -4223,39 +3828,39 @@
 .end method
 
 .method public getOauth2Authorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
-    .locals 10
+    .locals 9
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "client_id"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "state"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "response_type"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "redirect_uri"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "prompt"
         .end annotation
     .end param
     .param p6    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "scope"
         .end annotation
     .end param
     .param p7    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "permissions"
         .end annotation
     .end param
@@ -4276,99 +3881,76 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "oauth2/authorize"
     .end annotation
 
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p5, :cond_1
-
-    if-eqz p6, :cond_0
-
-    move-object v9, p0
-
-    iget-object v1, v9, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    const-string v0, "clientId"
 
     move-object v2, p1
 
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "prompt"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "scope"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
     move-object v3, p2
 
     move-object v4, p3
 
     move-object v5, p4
 
-    move-object v6, p5
-
-    move-object/from16 v7, p6
-
     move-object/from16 v8, p7
 
     invoke-interface/range {v1 .. v8}, Lcom/discord/restapi/RestAPIInterface;->getOauth2Authorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v1
 
-    return-object v0
-
-    :cond_0
-    move-object v9, p0
-
-    const-string v1, "scope"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    move-object v9, p0
-
-    const-string v1, "prompt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    move-object v9, p0
-
-    const-string v1, "clientId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public getOauth2SamsungAuthorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .locals 8
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "client_id"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "state"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "response_type"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "redirect_uri"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "prompt"
         .end annotation
     .end param
     .param p6    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "scope"
         .end annotation
     .end param
@@ -4388,17 +3970,21 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "oauth2/samsung/authorize"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "clientId"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "prompt"
 
-    if-eqz p6, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "scope"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -4419,27 +4005,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "scope"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "prompt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "clientId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getPaymentSources()Lrx/Observable;
@@ -4454,7 +4019,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/billing/payment-sources"
     .end annotation
 
@@ -4470,12 +4035,12 @@
 .method public getPruneCount(JI)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "days"
         .end annotation
     .end param
@@ -4488,7 +4053,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/prune"
     .end annotation
 
@@ -4502,25 +4067,25 @@
 .end method
 
 .method public getReactionUsers(JJLjava/lang/String;Ljava/lang/Integer;)Lrx/Observable;
-    .locals 7
+    .locals 8
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "emoji"
         .end annotation
     .end param
     .param p6    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -4537,36 +4102,29 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages/{messageId}/reactions/{emoji}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "emoji"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    move-object v6, p6
+    move-object v6, p5
 
-    invoke-interface/range {v0 .. v6}, Lcom/discord/restapi/RestAPIInterface;->getReactionUsers(JJLjava/lang/String;Ljava/lang/Integer;)Lrx/Observable;
+    move-object v7, p6
+
+    invoke-interface/range {v1 .. v7}, Lcom/discord/restapi/RestAPIInterface;->getReactionUsers(JJLjava/lang/String;Ljava/lang/Integer;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getRelationships()Lrx/Observable;
@@ -4581,7 +4139,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/relationships"
     .end annotation
 
@@ -4597,7 +4155,7 @@
 .method public getRelationships(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -4611,7 +4169,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/relationships"
     .end annotation
 
@@ -4624,10 +4182,52 @@
     return-object p1
 .end method
 
+.method public final getRtcLatencyTestRegionsIps()Lrx/Observable;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelRtcLatencyRegion;",
+            ">;>;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->apiRtcLatency:Lcom/discord/restapi/RestAPIInterface$RtcLatency;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const-string v2, "https://latency.discord.media/rtc"
+
+    invoke-interface {v0, v2}, Lcom/discord/restapi/RestAPIInterface$RtcLatency;->get(Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object v0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    invoke-static {v0, v2, v3, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    const-string v0, "apiRtcLatency"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
 .method public getSpotifyTrack(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "id"
         .end annotation
     .end param
@@ -4642,11 +4242,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "tracks/{id}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "id"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -4655,26 +4257,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getStreamPreview(Ljava/lang/String;J)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "streamKey"
         .end annotation
     .end param
     .param p2    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "version"
         .end annotation
     .end param
@@ -4689,11 +4282,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "streams/{streamKey}/preview"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -4702,15 +4297,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getSubscriptionSlots()Lrx/Observable;
@@ -4725,7 +4311,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/guilds/premium/subscription-slots"
     .end annotation
 
@@ -4750,7 +4336,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/billing/subscriptions"
     .end annotation
 
@@ -4766,17 +4352,17 @@
 .method public getTrendingGifCategories(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "media_format"
         .end annotation
     .end param
@@ -4793,17 +4379,21 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/trending"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "provider"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "locale"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaFormat"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -4812,48 +4402,27 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "mediaFormat"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "provider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getTrendingGifCategory(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "provider"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "locale"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "media_format"
         .end annotation
     .end param
     .param p4    # I
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "limit"
         .end annotation
     .end param
@@ -4871,17 +4440,21 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "gifs/trending-gifs"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "provider"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "locale"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaFormat"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -4890,27 +4463,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "mediaFormat"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "provider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getUserAffinities()Lrx/Observable;
@@ -4924,7 +4476,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/affinities/users"
     .end annotation
 
@@ -4940,7 +4492,7 @@
 .method public getUserNote(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -4953,7 +4505,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/notes/{userId}"
     .end annotation
 
@@ -4969,17 +4521,17 @@
 .method public joinGuild(JZLjava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "lurker"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "session_id"
         .end annotation
     .end param
@@ -4994,7 +4546,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "guilds/{guildId}/members/@me"
     .end annotation
 
@@ -5010,17 +4562,17 @@
 .method public kickGuildMember(JJLjava/lang/String;)Lrx/Observable;
     .locals 6
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "reason"
         .end annotation
     .end param
@@ -5035,7 +4587,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/members/{userId}"
     .end annotation
 
@@ -5057,7 +4609,7 @@
 .method public leaveGuild(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
@@ -5070,7 +4622,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/guilds/{guildId}"
     .end annotation
 
@@ -5086,7 +4638,7 @@
 .method public logout(Lcom/discord/restapi/RestAPIParams$UserDevices;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserDevices;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5100,11 +4652,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/logout"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5113,31 +4667,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public patchGuildEmoji(JJLcom/discord/restapi/RestAPIParams$PatchGuildEmoji;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "emojiId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$PatchGuildEmoji;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5151,40 +4696,33 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/emojis/{emojiId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "body"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->patchGuildEmoji(JJLcom/discord/restapi/RestAPIParams$PatchGuildEmoji;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->patchGuildEmoji(JJLcom/discord/restapi/RestAPIParams$PatchGuildEmoji;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public patchUser(Lcom/discord/restapi/RestAPIParams$UserInfo;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserInfo;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5198,11 +4736,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userInfo"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5211,21 +4751,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postAuthFingerprint(Lcom/discord/restapi/RestAPIParams$EmptyBody;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5239,11 +4770,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/fingerprint"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5252,21 +4785,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postAuthHandoff(Ljava/util/Map;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/util/Map;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5282,11 +4806,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/handoff"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5295,21 +4821,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postAuthLogin(Lcom/discord/restapi/RestAPIParams$AuthLogin;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$AuthLogin;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5323,11 +4840,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/login"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5336,21 +4855,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postAuthRegister(Lcom/discord/restapi/RestAPIParams$AuthRegister;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$AuthRegister;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5364,11 +4874,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/register"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5377,21 +4889,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postAuthVerifyResend(Lcom/discord/restapi/RestAPIParams$EmptyBody;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5405,11 +4908,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/verify/resend"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5418,26 +4923,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postChannelInvite(JLcom/discord/restapi/RestAPIParams$Invite;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Invite;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5451,11 +4947,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/invites"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5464,31 +4962,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postChannelMessagesAck(JLjava/lang/Long;Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p4    # Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5503,11 +4992,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/messages/{messageId}/ack"
     .end annotation
 
-    if-eqz p4, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5516,26 +5007,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postGuildEmoji(JLcom/discord/restapi/RestAPIParams$PostGuildEmoji;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$PostGuildEmoji;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5549,11 +5031,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/emojis"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5562,15 +5046,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final postInviteCode(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)Lrx/Observable;
@@ -5587,69 +5062,71 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "invite"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "location"
+    const-string v0, "location"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getCode()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v4, "invite.code"
+    const-string v3, "invite.code"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v4, Lcom/discord/restapi/RestAPIParams$EmptyBody;
+    new-instance v3, Lcom/discord/restapi/RestAPIParams$EmptyBody;
 
-    invoke-direct {v4}, Lcom/discord/restapi/RestAPIParams$EmptyBody;-><init>()V
+    invoke-direct {v3}, Lcom/discord/restapi/RestAPIParams$EmptyBody;-><init>()V
 
-    const/4 v5, 0x4
+    const/4 v4, 0x4
 
-    new-array v5, v5, [Lkotlin/Pair;
+    new-array v4, v4, [Lkotlin/Pair;
 
-    new-instance v6, Lkotlin/Pair;
+    new-instance v5, Lkotlin/Pair;
 
-    invoke-direct {v6, v1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v5, v0, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     const/4 p2, 0x0
 
-    aput-object v6, v5, p2
+    aput-object v5, v4, p2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const/4 v5, 0x0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v6
 
     invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v5
 
     :goto_0
     new-instance v6, Lkotlin/Pair;
 
     const-string v7, "location_guild_id"
 
-    invoke-direct {v6, v7, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v6, v7, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    aput-object v6, v5, v1
+    aput-object v6, v4, v0
 
     const/4 v6, 0x2
 
@@ -5670,7 +5147,7 @@
     goto :goto_1
 
     :cond_1
-    move-object v7, v0
+    move-object v7, v5
 
     :goto_1
     new-instance v8, Lkotlin/Pair;
@@ -5679,7 +5156,7 @@
 
     invoke-direct {v8, v9, v7}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v8, v5, v6
+    aput-object v8, v4, v6
 
     const/4 v6, 0x3
 
@@ -5700,7 +5177,7 @@
     goto :goto_2
 
     :cond_2
-    move-object p1, v0
+    move-object p1, v5
 
     :goto_2
     new-instance v7, Lkotlin/Pair;
@@ -5709,48 +5186,36 @@
 
     invoke-direct {v7, v8, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v7, v5, v6
+    aput-object v7, v4, v6
 
-    invoke-direct {p0, v5}, Lcom/discord/utilities/rest/RestAPI;->jsonObjectOf([Lkotlin/Pair;)Ljava/lang/String;
+    invoke-direct {p0, v4}, Lcom/discord/utilities/rest/RestAPI;->jsonObjectOf([Lkotlin/Pair;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-interface {v2, v3, v4, p1}, Lcom/discord/restapi/RestAPIInterface;->postInviteCode(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$EmptyBody;Ljava/lang/String;)Lrx/Observable;
+    invoke-interface {v1, v2, v3, p1}, Lcom/discord/restapi/RestAPIInterface;->postInviteCode(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$EmptyBody;Ljava/lang/String;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p2, v0, v5}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public postInviteCode(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$EmptyBody;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -5767,17 +5232,21 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "invites/{code}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "code"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "body"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5786,33 +5255,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public postMFACode(Lcom/discord/restapi/RestAPIParams$MFALogin;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$MFALogin;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5826,11 +5274,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "auth/mfa/totp"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -5839,66 +5289,57 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postOauth2Authorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lrx/Observable;
-    .locals 13
+    .locals 12
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "client_id"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "state"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "response_type"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "redirect_uri"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "prompt"
         .end annotation
     .end param
     .param p6    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "scope"
         .end annotation
     .end param
     .param p7    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "permissions"
         .end annotation
     .end param
     .param p8    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "code_challenge"
         .end annotation
     .end param
     .param p9    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "code_challenge_method"
         .end annotation
     .end param
     .param p10    # Ljava/util/Map;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -5923,91 +5364,61 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "oauth2/authorize"
     .end annotation
 
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p5, :cond_2
-
-    if-eqz p6, :cond_1
-
-    if-eqz p10, :cond_0
-
-    move-object v12, p0
-
-    iget-object v1, v12, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    const-string v0, "clientId"
 
     move-object v2, p1
 
-    move-object v3, p2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v4, p3
-
-    move-object/from16 v5, p4
+    const-string v0, "prompt"
 
     move-object/from16 v6, p5
 
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "scope"
+
     move-object/from16 v7, p6
 
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "body"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object/from16 v5, p4
+
     move-object/from16 v8, p7
 
     move-object/from16 v9, p8
 
     move-object/from16 v10, p9
 
-    move-object/from16 v11, p10
-
     invoke-interface/range {v1 .. v11}, Lcom/discord/restapi/RestAPIInterface;->postOauth2Authorize(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v1
 
-    return-object v0
-
-    :cond_0
-    move-object v12, p0
-
-    const-string v1, "body"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    move-object v12, p0
-
-    const-string v1, "scope"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    move-object v12, p0
-
-    const-string v1, "prompt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    move-object v12, p0
-
-    const-string v1, "clientId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public postRemoteAuthCancel(Lcom/discord/restapi/RestAPIParams$RemoteAuthCancel;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$RemoteAuthCancel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -6021,11 +5432,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/remote-auth/cancel"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6034,21 +5447,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postRemoteAuthFinish(Lcom/discord/restapi/RestAPIParams$RemoteAuthFinish;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$RemoteAuthFinish;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -6062,11 +5466,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/remote-auth/finish"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6075,21 +5481,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public postRemoteAuthInitialize(Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$RemoteAuthInitialize;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -6103,11 +5500,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/remote-auth"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6116,26 +5515,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public pruneMembers(JLcom/discord/restapi/RestAPIParams$PruneGuild;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$PruneGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -6149,11 +5539,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/prune"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6162,26 +5554,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public removeAllReactions(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
@@ -6194,7 +5577,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/messages/{messageId}/reactions"
     .end annotation
 
@@ -6210,12 +5593,12 @@
 .method public removeChannelRecipient(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "recipientId"
         .end annotation
     .end param
@@ -6228,7 +5611,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/recipients/{recipientId}"
     .end annotation
 
@@ -6242,25 +5625,25 @@
 .end method
 
 .method public removeReaction(JJLjava/lang/String;J)Lrx/Observable;
-    .locals 8
+    .locals 9
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "reaction"
         .end annotation
     .end param
     .param p6    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -6275,47 +5658,42 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/messages/{messageId}/reactions/{reaction}/{userId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "reaction"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    move-object v6, p5
 
-    move-wide v1, p1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v3, p3
+    move-object v0, p0
 
-    move-object v5, p5
+    iget-object v1, v0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v6, p6
+    move-wide v2, p1
 
-    invoke-interface/range {v0 .. v7}, Lcom/discord/restapi/RestAPIInterface;->removeReaction(JJLjava/lang/String;J)Lrx/Observable;
+    move-wide v4, p3
 
-    move-result-object p1
+    move-wide v7, p6
 
-    return-object p1
+    invoke-interface/range {v1 .. v8}, Lcom/discord/restapi/RestAPIInterface;->removeReaction(JJLjava/lang/String;J)Lrx/Observable;
 
-    :cond_0
-    const-string p1, "reaction"
+    move-result-object v1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v1
 .end method
 
 .method public removeRelationship(JLjava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -6330,11 +5708,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/relationships/{userId}"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6343,19 +5723,10 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final removeRelationship(Ljava/lang/String;J)Lrx/Observable;
-    .locals 6
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -6367,60 +5738,55 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "location"
 
-    const-string v1, "location"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    iget-object v2, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    new-array v3, v2, [Lkotlin/Pair;
 
-    new-array v4, v3, [Lkotlin/Pair;
+    new-instance v4, Lkotlin/Pair;
 
-    new-instance v5, Lkotlin/Pair;
-
-    invoke-direct {v5, v1, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v4, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     const/4 p1, 0x0
 
-    aput-object v5, v4, p1
+    aput-object v4, v3, p1
 
-    invoke-direct {p0, v4}, Lcom/discord/utilities/rest/RestAPI;->jsonObjectOf([Lkotlin/Pair;)Ljava/lang/String;
+    invoke-direct {p0, v3}, Lcom/discord/utilities/rest/RestAPI;->jsonObjectOf([Lkotlin/Pair;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v2, p2, p3, v1}, Lcom/discord/restapi/RestAPIInterface;->removeRelationship(JLjava/lang/String;)Lrx/Observable;
+    invoke-interface {v1, p2, p3, v0}, Lcom/discord/restapi/RestAPIInterface;->removeRelationship(JLjava/lang/String;)Lrx/Observable;
 
     move-result-object p2
 
-    invoke-static {p2, p1, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x0
+
+    invoke-static {p2, p1, v2, p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public removeSelfReaction(JJLjava/lang/String;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "messageId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             encoded = true
             value = "reaction"
         .end annotation
@@ -6436,45 +5802,38 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "channels/{channelId}/messages/{messageId}/reactions/{reaction}/@me"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "reaction"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->removeSelfReaction(JJLjava/lang/String;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->removeSelfReaction(JJLjava/lang/String;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public reorderChannels(JLjava/util/List;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Ljava/util/List;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -6489,11 +5848,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/channels"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6502,15 +5863,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public requestHarvest()Lrx/Observable;
@@ -6524,7 +5876,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/harvest"
     .end annotation
 
@@ -6540,17 +5892,17 @@
 .method public resolveGiftCode(Ljava/lang/String;ZZ)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
     .param p2    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "with_application"
         .end annotation
     .end param
     .param p3    # Z
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "with_subscription_plan"
         .end annotation
     .end param
@@ -6565,11 +5917,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "entitlements/gift-codes/{code}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6578,26 +5932,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public resolveSkuIdGift(JLjava/lang/Long;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "sku_id"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "subscription_plan_id"
         .end annotation
     .end param
@@ -6613,7 +5958,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/@me/entitlements/gift-codes"
     .end annotation
 
@@ -6629,7 +5974,7 @@
 .method public revokeGiftCode(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "code"
         .end annotation
     .end param
@@ -6644,11 +5989,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "users/@me/entitlements/gift-codes/{code}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6657,21 +6004,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public revokeInvite(Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "inviteCode"
         .end annotation
     .end param
@@ -6686,11 +6024,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "invites/{inviteCode}"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "inviteCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6699,15 +6039,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final ring(JJLjava/util/List;)Lrx/Observable;
@@ -6768,16 +6099,16 @@
 .method public ring(JLcom/discord/restapi/RestAPIParams$Ring;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Ring;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -6793,15 +6124,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/call/ring"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "body"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6810,26 +6143,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public science(Lcom/discord/restapi/RestAPIParams$Science;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$Science;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -6843,11 +6162,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "science"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -6856,61 +6177,52 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public searchChannelMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
     .locals 12
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "max_id"
         .end annotation
     .end param
     .param p4    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "author_id"
         .end annotation
     .end param
     .param p5    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "mentions"
         .end annotation
     .end param
     .param p6    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "has"
         .end annotation
     .end param
     .param p7    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "context_size"
         .end annotation
     .end param
     .param p8    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "content"
         .end annotation
     .end param
     .param p9    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "attempts"
         .end annotation
     .end param
     .param p10    # Ljava/lang/Boolean;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "include_nsfw"
         .end annotation
     .end param
@@ -6940,101 +6252,92 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "channels/{channelId}/messages/search"
     .end annotation
 
-    if-eqz p7, :cond_0
-
-    move-object v11, p0
-
-    iget-object v0, v11, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
-    move-wide v1, p1
-
-    move-object v3, p3
-
-    move-object/from16 v4, p4
-
-    move-object/from16 v5, p5
-
-    move-object/from16 v6, p6
-
-    move-object/from16 v7, p7
-
-    move-object/from16 v8, p8
-
-    move-object/from16 v9, p9
-
-    move-object/from16 v10, p10
-
-    invoke-interface/range {v0 .. v10}, Lcom/discord/restapi/RestAPIInterface;->searchChannelMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    move-object v11, p0
-
     const-string v0, "contextSize"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v8, p7
 
-    const/4 v0, 0x0
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    move-wide v2, p1
+
+    move-object v4, p3
+
+    move-object/from16 v5, p4
+
+    move-object/from16 v6, p5
+
+    move-object/from16 v7, p6
+
+    move-object/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    move-object/from16 v11, p10
+
+    invoke-interface/range {v1 .. v11}, Lcom/discord/restapi/RestAPIInterface;->searchChannelMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
+
+    move-result-object v1
+
+    return-object v1
 .end method
 
 .method public searchGuildMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
     .locals 13
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "max_id"
         .end annotation
     .end param
     .param p4    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "author_id"
         .end annotation
     .end param
     .param p5    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "mentions"
         .end annotation
     .end param
     .param p6    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "channel_id"
         .end annotation
     .end param
     .param p7    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "has"
         .end annotation
     .end param
     .param p8    # Ljava/lang/String;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "context_size"
         .end annotation
     .end param
     .param p9    # Ljava/util/List;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "content"
         .end annotation
     .end param
     .param p10    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "attempts"
         .end annotation
     .end param
     .param p11    # Ljava/lang/Boolean;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "include_nsfw"
         .end annotation
     .end param
@@ -7067,63 +6370,54 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "guilds/{guildId}/messages/search"
     .end annotation
 
-    if-eqz p8, :cond_0
-
-    move-object v12, p0
-
-    iget-object v0, v12, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
-    move-wide v1, p1
-
-    move-object/from16 v3, p3
-
-    move-object/from16 v4, p4
-
-    move-object/from16 v5, p5
-
-    move-object/from16 v6, p6
-
-    move-object/from16 v7, p7
-
-    move-object/from16 v8, p8
-
-    move-object/from16 v9, p9
-
-    move-object/from16 v10, p10
-
-    move-object/from16 v11, p11
-
-    invoke-interface/range {v0 .. v11}, Lcom/discord/restapi/RestAPIInterface;->searchGuildMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    move-object v12, p0
-
     const-string v0, "contextSize"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v9, p8
 
-    const/4 v0, 0x0
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    move-wide v2, p1
+
+    move-object/from16 v4, p3
+
+    move-object/from16 v5, p4
+
+    move-object/from16 v6, p5
+
+    move-object/from16 v7, p6
+
+    move-object/from16 v8, p7
+
+    move-object/from16 v10, p9
+
+    move-object/from16 v11, p10
+
+    move-object/from16 v12, p11
+
+    invoke-interface/range {v1 .. v12}, Lcom/discord/restapi/RestAPIInterface;->searchGuildMessages(JLjava/lang/Long;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Boolean;)Lrx/Observable;
+
+    move-result-object v1
+
+    return-object v1
 .end method
 
 .method public sendMessage(JLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Message;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7137,11 +6431,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/messages"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7150,36 +6446,27 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public sendMessage(JLjava/lang/String;Ljava/lang/String;[Lokhttp3/MultipartBody$Part;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Ljava/lang/String;
-        .annotation runtime Lq0/u/o;
+        .annotation runtime Lr0/u/o;
             value = "content"
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/o;
+        .annotation runtime Lr0/u/o;
             value = "nonce"
         .end annotation
     .end param
     .param p5    # [Lokhttp3/MultipartBody$Part;
-        .annotation runtime Lq0/u/o;
+        .annotation runtime Lr0/u/o;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7196,49 +6483,42 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/j;
+    .annotation runtime Lr0/u/j;
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/messages"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "files"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-object v3, p3
+    move-wide v2, p1
 
-    move-object v4, p4
+    move-object v4, p3
 
-    move-object v5, p5
+    move-object v5, p4
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->sendMessage(JLjava/lang/String;Ljava/lang/String;[Lokhttp3/MultipartBody$Part;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->sendMessage(JLjava/lang/String;Ljava/lang/String;[Lokhttp3/MultipartBody$Part;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "files"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public sendRelationshipRequest(Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -7254,15 +6534,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/relationships"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "relationship"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7271,24 +6553,10 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "relationship"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final sendRelationshipRequest(Ljava/lang/String;Ljava/lang/String;I)Lrx/Observable;
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -7303,55 +6571,45 @@
 
     const-string v0, "location"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v1, "username"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    new-instance v3, Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;
+    new-instance v2, Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;
 
-    invoke-direct {v3, p2, p3}, Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;-><init>(Ljava/lang/String;I)V
+    invoke-direct {v2, p2, p3}, Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;-><init>(Ljava/lang/String;I)V
 
     const/4 p2, 0x1
 
     new-array p3, p2, [Lkotlin/Pair;
 
-    new-instance v4, Lkotlin/Pair;
+    new-instance v3, Lkotlin/Pair;
 
-    invoke-direct {v4, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v3, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     const/4 p1, 0x0
 
-    aput-object v4, p3, p1
+    aput-object v3, p3, p1
 
     invoke-direct {p0, p3}, Lcom/discord/utilities/rest/RestAPI;->jsonObjectOf([Lkotlin/Pair;)Ljava/lang/String;
 
     move-result-object p3
 
-    invoke-interface {v2, v3, p3}, Lcom/discord/restapi/RestAPIInterface;->sendRelationshipRequest(Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;Ljava/lang/String;)Lrx/Observable;
+    invoke-interface {v1, v2, p3}, Lcom/discord/restapi/RestAPIInterface;->sendRelationshipRequest(Lcom/discord/restapi/RestAPIParams$UserRelationship$Add;Ljava/lang/String;)Lrx/Observable;
 
     move-result-object p3
 
-    invoke-static {p3, p1, p2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x0
+
+    invoke-static {p3, p1, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final setConsent(ZLjava/lang/String;)Lrx/Observable;
@@ -7367,9 +6625,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "consentType"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     if-eqz p1, :cond_0
 
@@ -7390,19 +6650,12 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "consentType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public setConsents(Lcom/discord/restapi/RestAPIParams$Consents;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$Consents;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7416,11 +6669,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/consent"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7429,26 +6684,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setMfaLevel(JLcom/discord/restapi/RestAPIParams$GuildMFA;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$GuildMFA;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7462,11 +6708,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/mfa"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7475,26 +6723,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setUserTyping(JLcom/discord/restapi/RestAPIParams$EmptyBody;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$EmptyBody;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7508,11 +6747,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/typing"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7521,15 +6762,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final stopRinging(JJLjava/util/List;)Lrx/Observable;
@@ -7590,16 +6822,16 @@
 .method public stopRinging(JLcom/discord/restapi/RestAPIParams$Ring;Ljava/lang/String;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$Ring;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .param p4    # Ljava/lang/String;
-        .annotation runtime Lq0/u/h;
+        .annotation runtime Lr0/u/h;
             value = "X-Context-Properties"
         .end annotation
     .end param
@@ -7615,15 +6847,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "channels/{channelId}/call/stop-ringing"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "body"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7632,31 +6866,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public submitConnectionState(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$ConnectionState;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$ConnectionState;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7671,15 +6891,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "connections/{connection}/callback"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "state"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7688,31 +6910,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7727,11 +6935,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "guilds/{guildId}/premium/subscriptions"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "premiumGuildSubscribe"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7740,26 +6950,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "premiumGuildSubscribe"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public syncIntegration(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "integrationId"
         .end annotation
     .end param
@@ -7772,7 +6973,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "guilds/{guildId}/integrations/{integrationId}/sync"
     .end annotation
 
@@ -7788,12 +6989,12 @@
 .method public transferGuildOwnership(JLcom/discord/restapi/RestAPIParams$TransferGuildOwnership;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$TransferGuildOwnership;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7807,11 +7008,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "transferGuildOwnership"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7820,26 +7023,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "transferGuildOwnership"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public unbanUser(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -7852,7 +7046,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/bans/{userId}"
     .end annotation
 
@@ -7868,7 +7062,7 @@
 .method public uncancelSubscriptionSlot(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionSlotId"
         .end annotation
     .end param
@@ -7881,7 +7075,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/guilds/premium/subscription-slots/{subscriptionSlotId}/uncancel"
     .end annotation
 
@@ -7897,12 +7091,12 @@
 .method public unsubscribeToGuild(JJ)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionId"
         .end annotation
     .end param
@@ -7915,7 +7109,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/b;
+    .annotation runtime Lr0/u/b;
         value = "guilds/{guildId}/premium/subscriptions/{subscriptionId}"
     .end annotation
 
@@ -7931,17 +7125,17 @@
 .method public updateConnection(Ljava/lang/String;Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$ConnectedAccount;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connection"
         .end annotation
     .end param
     .param p2    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "connectionId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$ConnectedAccount;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -7957,17 +7151,21 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/connections/{connection}/{connectionId}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "connectionId"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectedAccount"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -7976,38 +7174,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public updateGuild(JLcom/discord/restapi/RestAPIParams$UpdateGuild;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UpdateGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8021,11 +7198,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8034,31 +7213,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateGuildIntegration(JJLcom/discord/restapi/RestAPIParams$GuildIntegration;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "integrationId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$GuildIntegration;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8072,45 +7242,38 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/integrations/{integrationId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "body"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->updateGuildIntegration(JJLcom/discord/restapi/RestAPIParams$GuildIntegration;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->updateGuildIntegration(JJLcom/discord/restapi/RestAPIParams$GuildIntegration;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updatePaymentSource(Ljava/lang/String;Lcom/discord/models/domain/PatchPaymentSourceRaw;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "paymentSourceId"
         .end annotation
     .end param
     .param p2    # Lcom/discord/models/domain/PatchPaymentSourceRaw;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8125,15 +7288,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/billing/payment-sources/{paymentSourceId}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSourceId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "PatchPaymentSourceRaw"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8142,36 +7307,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "PatchPaymentSourceRaw"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "paymentSourceId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public updatePermissionOverwrites(JJLcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "channelId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "targetId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8185,40 +7336,33 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "channels/{channelId}/permissions/{targetId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "body"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->updatePermissionOverwrites(JJLcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->updatePermissionOverwrites(JJLcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updatePrivateChannelSettings(Lcom/discord/restapi/RestAPIParams$UserGuildSettings;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8232,11 +7376,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/guilds/@me/settings"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userGuildSettings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8245,26 +7391,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userGuildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updatePublicGuild(JLcom/discord/restapi/RestAPIParams$UpdatePublicGuild;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8278,11 +7415,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8291,31 +7430,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateRole(JJLcom/discord/restapi/RestAPIParams$Role;)Lrx/Observable;
-    .locals 6
+    .locals 7
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "roleId"
         .end annotation
     .end param
     .param p5    # Lcom/discord/restapi/RestAPIParams$Role;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8329,45 +7459,38 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/roles/{roleId}"
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "body"
 
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v1, p1
+    iget-object v1, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/restapi/RestAPIInterface;->updateRole(JJLcom/discord/restapi/RestAPIParams$Role;)Lrx/Observable;
+    move-object v6, p5
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/restapi/RestAPIInterface;->updateRole(JJLcom/discord/restapi/RestAPIParams$Role;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
     .locals 1
     .param p1    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "subscriptionId"
         .end annotation
     .end param
     .param p2    # Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8382,15 +7505,17 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/billing/subscriptions/{subscriptionId}"
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "subscriptionId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "updateSubscription"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8399,20 +7524,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "updateSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscriptionId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public updateUserGuildSettings(JLcom/discord/restapi/RestAPIParams$UserGuildSettings;)Lrx/Observable;
@@ -8428,7 +7539,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_1
+    const-string/jumbo v0, "userGuildSettings"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
@@ -8453,26 +7566,17 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "userGuildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8486,11 +7590,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/n;
+    .annotation runtime Lr0/u/n;
         value = "users/@me/notes/{userId}"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string/jumbo v0, "userNoteUpdate"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8499,21 +7605,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userNoteUpdate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateUserSettings(Lcom/discord/restapi/RestAPIParams$UserSettings;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserSettings;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8527,11 +7624,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/settings"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userSettings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8540,21 +7639,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateUserSettingsCustomStatus(Lcom/discord/restapi/RestAPIParams$UserSettingsCustomStatus;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserSettingsCustomStatus;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8568,11 +7658,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/settings"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userSettingsCustomStatus"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8581,26 +7673,17 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "userSettingsCustomStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateVanityUrl(JLcom/discord/restapi/RestAPIParams$VanityUrl;)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "guildId"
         .end annotation
     .end param
     .param p3    # Lcom/discord/restapi/RestAPIParams$VanityUrl;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8614,11 +7697,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "guilds/{guildId}/vanity-url"
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8627,46 +7712,118 @@
     move-result-object p1
 
     return-object p1
+.end method
 
-    :cond_0
-    const-string p1, "body"
+.method public uploadLog(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
+    .locals 1
+    .param p1    # Ljava/lang/String;
+        .annotation runtime Lr0/u/q;
+            value = "filename"
+        .end annotation
+    .end param
+    .param p2    # Ljava/lang/String;
+        .annotation runtime Lr0/u/a;
+        .end annotation
+    .end param
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    .annotation runtime Lr0/u/m;
+        value = "debug-logs/4/{filename}"
+    .end annotation
 
-    const/4 p1, 0x0
+    const-string v0, "filename"
 
-    throw p1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "content"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    invoke-interface {v0, p1, p2}, Lcom/discord/restapi/RestAPIInterface;->uploadLog(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public uploadLogs([Lokhttp3/MultipartBody$Part;)Lrx/Observable;
+    .locals 1
+    .param p1    # [Lokhttp3/MultipartBody$Part;
+        .annotation runtime Lr0/u/o;
+        .end annotation
+    .end param
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Lokhttp3/MultipartBody$Part;",
+            ")",
+            "Lrx/Observable<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Lr0/u/j;
+    .end annotation
+
+    .annotation runtime Lr0/u/m;
+        value = "debug-logs/multi/4"
+    .end annotation
+
+    const-string v0, "files"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    invoke-interface {v0, p1}, Lcom/discord/restapi/RestAPIInterface;->uploadLogs([Lokhttp3/MultipartBody$Part;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public userActivityAction(JJLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
     .locals 10
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
     .param p3    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "applicationId"
         .end annotation
     .end param
     .param p5    # Ljava/lang/String;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "sessionId"
         .end annotation
     .end param
     .param p6    # Ljava/lang/Integer;
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "actionType"
         .end annotation
     .end param
     .param p7    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "channel_id"
         .end annotation
     .end param
     .param p8    # Ljava/lang/Long;
-        .annotation runtime Lq0/u/r;
+        .annotation runtime Lr0/u/r;
             value = "message_id"
         .end annotation
     .end param
@@ -8684,44 +7841,35 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/sessions/{sessionId}/activities/{applicationId}/{actionType}"
     .end annotation
 
-    if-eqz p5, :cond_0
-
-    move-object v9, p0
-
-    iget-object v0, v9, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    move-object v5, p5
-
-    move-object/from16 v6, p6
-
-    move-object/from16 v7, p7
-
-    move-object/from16 v8, p8
-
-    invoke-interface/range {v0 .. v8}, Lcom/discord/restapi/RestAPIInterface;->userActivityAction(JJLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    move-object v9, p0
-
     const-string v0, "sessionId"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v6, p5
 
-    const/4 v0, 0x0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    move-wide v2, p1
+
+    move-wide v4, p3
+
+    move-object/from16 v7, p6
+
+    move-object/from16 v8, p7
+
+    move-object/from16 v9, p8
+
+    invoke-interface/range {v1 .. v9}, Lcom/discord/restapi/RestAPIInterface;->userActivityAction(JJLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
+
+    move-result-object v1
+
+    return-object v1
 .end method
 
 .method public final userActivityActionJoin(JJLjava/lang/String;)Lrx/Observable;
@@ -8812,50 +7960,41 @@
         }
     .end annotation
 
-    if-eqz p5, :cond_0
-
-    move-object v9, p0
-
-    iget-object v0, v9, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
-    const/4 v1, 0x1
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    move-object v5, p5
-
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
-    invoke-interface/range {v0 .. v8}, Lcom/discord/restapi/RestAPIInterface;->userActivityAction(JJLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    move-object v9, p0
-
     const-string v0, "sessionId"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v6, p5
 
-    const/4 v0, 0x0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    const/4 v2, 0x1
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v7
+
+    move-wide v2, p1
+
+    move-wide v4, p3
+
+    move-object/from16 v8, p6
+
+    move-object/from16 v9, p7
+
+    invoke-interface/range {v1 .. v9}, Lcom/discord/restapi/RestAPIInterface;->userActivityAction(JJLjava/lang/String;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
+
+    move-result-object v1
+
+    return-object v1
 .end method
 
 .method public userAddPhone(Lcom/discord/restapi/RestAPIParams$Phone;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$Phone;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8869,11 +8008,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/phone"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8882,21 +8023,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public userAgreements(Lcom/discord/restapi/RestAPIParams$UserAgreements;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserAgreements;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8910,11 +8042,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/l;
+    .annotation runtime Lr0/u/l;
         value = "users/@me/agreements"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8923,21 +8057,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public userCaptchaVerify(Lcom/discord/restapi/RestAPIParams$CaptchaCode;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$CaptchaCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8951,11 +8076,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/captcha/verify"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -8964,21 +8091,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public userCreateChannel(Lcom/discord/restapi/RestAPIParams$CreateChannel;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$CreateChannel;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -8992,11 +8110,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/channels"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -9005,21 +8125,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public userCreateDevice(Lcom/discord/restapi/RestAPIParams$UserDevices;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$UserDevices;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -9033,11 +8144,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/devices"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -9046,21 +8159,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public userGet(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -9073,7 +8177,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}"
     .end annotation
 
@@ -9089,7 +8193,7 @@
 .method public userPhoneVerify(Lcom/discord/restapi/RestAPIParams$VerificationCode;)Lrx/Observable;
     .locals 1
     .param p1    # Lcom/discord/restapi/RestAPIParams$VerificationCode;
-        .annotation runtime Lq0/u/a;
+        .annotation runtime Lr0/u/a;
         .end annotation
     .end param
     .annotation system Ldalvik/annotation/Signature;
@@ -9103,11 +8207,13 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/m;
+    .annotation runtime Lr0/u/m;
         value = "users/@me/phone/verify"
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
@@ -9116,21 +8222,12 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public userProfileGet(J)Lrx/Observable;
     .locals 1
     .param p1    # J
-        .annotation runtime Lq0/u/q;
+        .annotation runtime Lr0/u/q;
             value = "userId"
         .end annotation
     .end param
@@ -9143,7 +8240,7 @@
         }
     .end annotation
 
-    .annotation runtime Lq0/u/e;
+    .annotation runtime Lr0/u/e;
         value = "users/{userId}/profile"
     .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$ResponseResolver.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$ResponseResolver.smali
index 6a27ce453c..b025b2b185 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$ResponseResolver.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$ResponseResolver.smali
@@ -44,33 +44,35 @@
 .method public final getRelationshipResponse(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/CharSequence;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "username"
 
-    if-eqz p3, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Lcom/discord/utilities/rest/RestAPIAbortMessages;->getAbortCodeMessageResId(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    move-result v1
+    move-result v0
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f12008f
+    const v0, 0x7f12008f
 
     :goto_0
-    const v2, 0x13880
+    const v1, 0x13880
 
-    if-eq p2, v2, :cond_1
+    const/4 v2, 0x0
+
+    if-eq p2, v1, :cond_1
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -83,33 +85,26 @@
 
     new-array p2, p2, [Ljava/lang/Object;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    aput-object p3, p2, v2
+    aput-object p3, p2, v1
 
-    invoke-virtual {p1, v1, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p1, v0, p2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     goto :goto_1
 
     :cond_2
-    move-object p1, v0
+    move-object p1, v2
 
     :goto_1
     if-eqz p1, :cond_3
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    move-result-object v0
+    move-result-object v2
 
     :cond_3
-    return-object v0
-
-    :cond_4
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v2
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$handleAbortCodeOrDefault$1.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$handleAbortCodeOrDefault$1.smali
index dc6dc90939..f3d41542ed 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$handleAbortCodeOrDefault$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages$handleAbortCodeOrDefault$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rest/RestAPIAbortMessages$handleAbortCodeOrDefault$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RestAPIAbortMessages.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .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 12b6c4946f..4c0cb180fd 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
@@ -295,13 +295,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "errorResponse"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "onHandle"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onDefault"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getType()Lcom/discord/utilities/error/Error$Type;
 
@@ -334,25 +338,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "onDefault"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onHandle"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "errorResponse"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
index 2e1a92ac7c..eb10681d0e 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$FileUpload.smali
@@ -76,15 +76,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "part"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "bytesWrittenObservable"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -99,34 +105,6 @@
     iput-object p6, p0, Lcom/discord/utilities/rest/SendUtils$FileUpload;->bytesWrittenObservable:Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "bytesWrittenObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "part"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/rest/SendUtils$FileUpload;Ljava/lang/String;JLokhttp3/MultipartBody$Part;Ljava/lang/String;Lrx/Observable;ILjava/lang/Object;)Lcom/discord/utilities/rest/SendUtils$FileUpload;
@@ -260,15 +238,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "part"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "bytesWrittenObservable"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/rest/SendUtils$FileUpload;
 
@@ -287,34 +271,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/utilities/rest/SendUtils$FileUpload;-><init>(Ljava/lang/String;JLokhttp3/MultipartBody$Part;Ljava/lang/String;Lrx/Observable;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "bytesWrittenObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "part"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -332,7 +288,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/rest/SendUtils$FileUpload;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -350,7 +306,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/rest/SendUtils$FileUpload;->part:Lokhttp3/MultipartBody$Part;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -360,7 +316,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/rest/SendUtils$FileUpload;->mimeType:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -370,7 +326,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/rest/SendUtils$FileUpload;->bytesWrittenObservable:Lrx/Observable;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali
index 86f36289f0..90ffe0ff41 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$Preprocessing.smali
@@ -127,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -137,7 +137,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;->mimeType:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali
index bc1f2db75d..9f99682e67 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend.smali
@@ -41,12 +41,16 @@
         }
     .end annotation
 
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "uploads"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/utilities/rest/SendUtils$SendPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;->message:Lcom/discord/restapi/RestAPIParams$Message;
@@ -54,20 +58,6 @@
     iput-object p2, p0, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;->uploads:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
@@ -133,31 +123,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "uploads"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;-><init>(Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -175,7 +153,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;->message:Lcom/discord/restapi/RestAPIParams$Message;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -185,7 +163,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;->uploads:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
index b0fc59b132..3811756444 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rest/SendUtils$getPart$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SendUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Lokhttp3/RequestBody;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -49,19 +49,21 @@
 
 # virtual methods
 .method public final invoke(Lokhttp3/RequestBody;Ljava/lang/String;Landroid/graphics/Bitmap$CompressFormat;)Lcom/discord/utilities/rest/SendUtils$FileUpload;
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "requestBody"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
 
-    const/4 v0, 0x0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/restapi/utils/CountingRequestBody;
+    new-instance v0, Lcom/discord/restapi/utils/CountingRequestBody;
 
-    invoke-direct {v1, p1, v0}, Lcom/discord/restapi/utils/CountingRequestBody;-><init>(Lokhttp3/RequestBody;I)V
+    const/4 v1, 0x0
+
+    invoke-direct {v0, p1, v1}, Lcom/discord/restapi/utils/CountingRequestBody;-><init>(Lokhttp3/RequestBody;I)V
 
     iget-object p1, p0, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->this$0:Lcom/discord/utilities/rest/SendUtils$getPart$1;
 
@@ -73,47 +75,33 @@
 
     invoke-static {p1, p3}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getSanitizedFileName(Ljava/lang/String;Landroid/graphics/Bitmap$CompressFormat;)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
     iget-object p1, p0, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->this$0:Lcom/discord/utilities/rest/SendUtils$getPart$1;
 
     iget-object p1, p1, Lcom/discord/utilities/rest/SendUtils$getPart$1;->$name:Ljava/lang/String;
 
-    invoke-static {p1, v3, v1}, Lokhttp3/MultipartBody$Part;->b(Ljava/lang/String;Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$Part;
+    invoke-static {p1, v2, v0}, Lokhttp3/MultipartBody$Part;->b(Ljava/lang/String;Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$Part;
 
-    move-result-object v6
+    move-result-object v5
 
     new-instance p1, Lcom/discord/utilities/rest/SendUtils$FileUpload;
 
-    invoke-virtual {v1}, Lcom/discord/restapi/utils/CountingRequestBody;->getEstimatedContentLength()J
+    invoke-virtual {v0}, Lcom/discord/restapi/utils/CountingRequestBody;->getEstimatedContentLength()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    invoke-virtual {v1}, Lcom/discord/restapi/utils/CountingRequestBody;->getBytesWrittenObservable()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/restapi/utils/CountingRequestBody;->getBytesWrittenObservable()Lrx/Observable;
 
-    move-result-object v8
+    move-result-object v7
 
-    move-object v2, p1
+    move-object v1, p1
 
-    move-object v7, p2
+    move-object v6, p2
 
-    invoke-direct/range {v2 .. v8}, Lcom/discord/utilities/rest/SendUtils$FileUpload;-><init>(Ljava/lang/String;JLokhttp3/MultipartBody$Part;Ljava/lang/String;Lrx/Observable;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/utilities/rest/SendUtils$FileUpload;-><init>(Ljava/lang/String;JLokhttp3/MultipartBody$Part;Ljava/lang/String;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "requestBody"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali
index 488b6583a3..b8af1b232a 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getPart$1.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Lcom/discord/utilities/rest/SendUtils$FileUpload;",
+        ">;>;"
     }
 .end annotation
 
@@ -101,9 +102,9 @@
 
     move-result-object v0
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali
index 0c49ed0013..7ddff185c5 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils$getSendPayload$2.smali
@@ -3,7 +3,7 @@
 .source "SendUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "Lcom/discord/utilities/rest/SendUtils$FileUpload;",
+        ">;",
+        "Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;",
+        ">;"
     }
 .end annotation
 
@@ -65,7 +69,7 @@
 
     const-string v2, "attachmentParts"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, p1}, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;-><init>(Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index ccd3cfa73c..10daec3451 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
@@ -105,17 +105,17 @@
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f1206a6
+    const p2, 0x7f1206a8
 
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f1206a5
+    const p2, 0x7f1206a7
 
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f1206a7
+    const p2, 0x7f1206a9
 
     :goto_0
     const v0, 0x7f0d0189
@@ -140,9 +140,9 @@
 
     const-string v3, "AlertDialog.Builder(cont\u2026View(dialogView).create()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f0a020a
+    const v3, 0x7f0a020d
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -160,7 +160,7 @@
 
     const-string p2, "context.getString(sizeStringId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     aput-object p1, v3, v1
 
@@ -196,7 +196,7 @@
 
 # virtual methods
 .method public final getSendPayload(Landroid/content/ContentResolver;Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;)Lrx/Observable;
-    .locals 14
+    .locals 12
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -212,42 +212,38 @@
         }
     .end annotation
 
-    move-object v0, p1
+    const-string v0, "contentResolver"
 
-    move-object/from16 v1, p2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v9, p3
+    const-string v0, "apiParamMessage"
 
-    const/4 v10, 0x0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_8
+    const-string v0, "Observable.just(SendPayl\u2026ramMessage, emptyList()))"
 
-    if-eqz v1, :cond_7
+    if-nez p3, :cond_0
 
-    const-string v11, "Observable.just(SendPayl\u2026ramMessage, emptyList()))"
+    new-instance p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
 
-    if-nez v9, :cond_0
+    sget-object p3, Lk0/j/n;->d:Lk0/j/n;
 
-    new-instance v0, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
+    invoke-direct {p1, p2, p3}, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;-><init>(Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;)V
 
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {v0, v1, v2}, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;-><init>(Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    new-instance v1, Lr0/l/e/j;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    invoke-static {v1, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v1
+    return-object p2
 
     :cond_0
-    invoke-static {v9, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->extractLinks(Ljava/util/List;Landroid/content/ContentResolver;)Ljava/util/List;
+    invoke-static {p3, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->extractLinks(Ljava/util/List;Landroid/content/ContentResolver;)Ljava/util/List;
 
-    move-result-object v12
+    move-result-object v1
 
-    invoke-virtual/range {p2 .. p2}, Lcom/discord/restapi/RestAPIParams$Message;->getContent()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/discord/restapi/RestAPIParams$Message;->getContent()Ljava/lang/String;
 
     move-result-object v2
 
@@ -259,225 +255,213 @@
     const-string v2, ""
 
     :goto_0
-    invoke-static {v2, v12}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->appendLinks(Ljava/lang/String;Ljava/util/List;)Ljava/lang/String;
+    invoke-static {v2, v1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->appendLinks(Ljava/lang/String;Ljava/util/List;)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {p2}, Lcom/discord/restapi/RestAPIParams$Message;->getContent()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p2 .. p2}, Lcom/discord/restapi/RestAPIParams$Message;->getContent()Ljava/lang/String;
+    invoke-static {v4, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result-object v3
+    move-result v2
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    const/4 v11, 0x1
 
-    move-result v3
+    xor-int/2addr v2, v11
 
-    const/4 v13, 0x1
-
-    xor-int/2addr v3, v13
-
-    if-eqz v3, :cond_2
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
+    if-eqz v2, :cond_2
 
     const/4 v5, 0x0
 
     const/4 v6, 0x0
 
-    const/16 v7, 0x1e
+    const/4 v7, 0x0
 
     const/4 v8, 0x0
 
-    move-object/from16 v1, p2
+    const/16 v9, 0x1e
 
-    invoke-static/range {v1 .. v8}, Lcom/discord/restapi/RestAPIParams$Message;->copy$default(Lcom/discord/restapi/RestAPIParams$Message;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Lcom/discord/restapi/RestAPIParams$Message$Activity;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/restapi/RestAPIParams$Message;
+    const/4 v10, 0x0
 
-    move-result-object v1
+    move-object v3, p2
+
+    invoke-static/range {v3 .. v10}, Lcom/discord/restapi/RestAPIParams$Message;->copy$default(Lcom/discord/restapi/RestAPIParams$Message;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Lcom/discord/restapi/RestAPIParams$Message$Activity;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/restapi/RestAPIParams$Message;
+
+    move-result-object p2
 
     :cond_2
-    invoke-static {v9, v12}, Lj0/i/l;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p3, v1}, Lk0/j/l;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
 
-    move-result-object v2
+    move-result-object p3
 
-    invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {p3}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v3
+    move-result v1
 
-    xor-int/2addr v3, v13
+    xor-int/2addr v1, v11
 
-    if-eqz v3, :cond_6
+    if-eqz v1, :cond_6
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-interface {p3}, Ljava/util/List;->size()I
 
-    move-result v3
+    move-result v0
 
-    if-ne v3, v13, :cond_3
+    const/4 v1, 0x0
 
-    invoke-static {v2}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    if-ne v0, v11, :cond_3
+
+    invoke-static {p3}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/lytefast/flexinput/model/Attachment;
+
+    new-instance v2, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;
+
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
 
     move-result-object v3
 
-    check-cast v3, Lcom/lytefast/flexinput/model/Attachment;
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
 
-    new-instance v4, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;
+    move-result-object v4
 
-    invoke-virtual {v3}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v0
 
-    invoke-virtual {v3}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
+    invoke-static {p1, v4, v0}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v0
 
-    invoke-virtual {v3}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {p1, v6, v3}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-direct {v4, v13, v5, v3}, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v2, v11, v3, v0}, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_3
-    new-instance v4, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;
+    new-instance v2, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;
 
-    invoke-interface {v2}, Ljava/util/List;->size()I
+    invoke-interface {p3}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    invoke-direct {v2, v0, v1, v1}, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+
+    :goto_1
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, v2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    const/16 v3, 0xa
+
+    invoke-static {p3, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
     move-result v3
 
-    invoke-direct {v4, v3, v10, v10}, Lcom/discord/utilities/rest/SendUtils$SendPayload$Preprocessing;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
 
-    :goto_1
-    new-instance v3, Lr0/l/e/j;
+    const/4 v3, 0x0
 
-    invoke-direct {v3, v4}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    new-instance v4, Ljava/util/ArrayList;
-
-    const/16 v5, 0xa
-
-    invoke-static {v2, v5}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v5
-
-    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
-
-    const/4 v5, 0x0
-
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
+    move-result-object p3
 
     :goto_2
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v4
 
-    if-eqz v6, :cond_5
+    if-eqz v4, :cond_5
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v4
 
-    add-int/lit8 v7, v5, 0x1
+    add-int/lit8 v5, v3, 0x1
 
-    if-ltz v5, :cond_4
+    if-ltz v3, :cond_4
 
-    check-cast v6, Lcom/lytefast/flexinput/model/Attachment;
+    check-cast v4, Lcom/lytefast/flexinput/model/Attachment;
 
-    sget-object v8, Lcom/discord/utilities/rest/SendUtils;->INSTANCE:Lcom/discord/utilities/rest/SendUtils;
+    sget-object v6, Lcom/discord/utilities/rest/SendUtils;->INSTANCE:Lcom/discord/utilities/rest/SendUtils;
 
-    const-string v9, "file"
+    const-string v7, "file"
 
-    invoke-static {v9, v5}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+    invoke-static {v7, v3}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v3
 
-    invoke-direct {v8, v6, p1, v5}, Lcom/discord/utilities/rest/SendUtils;->getPart(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;Ljava/lang/String;)Lrx/Observable;
+    invoke-direct {v6, v4, p1, v3}, Lcom/discord/utilities/rest/SendUtils;->getPart(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;Ljava/lang/String;)Lrx/Observable;
 
-    move-result-object v5
+    move-result-object v3
 
-    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    move v5, v7
+    move v3, v5
 
     goto :goto_2
 
     :cond_4
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
-    throw v10
+    throw v1
 
     :cond_5
-    invoke-static {v4}, Lrx/Observable;->z(Ljava/lang/Iterable;)Lrx/Observable;
+    invoke-static {v2}, Lrx/Observable;->z(Ljava/lang/Iterable;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-static {v0}, Lrx/Observable;->l(Lrx/Observable;)Lrx/Observable;
+    invoke-static {p1}, Lrx/Observable;->l(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-virtual {v0}, Lrx/Observable;->b0()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->b0()Lrx/Observable;
 
-    move-result-object v0
+    move-result-object p1
 
-    new-instance v2, Lcom/discord/utilities/rest/SendUtils$getSendPayload$2;
+    new-instance p3, Lcom/discord/utilities/rest/SendUtils$getSendPayload$2;
 
-    invoke-direct {v2, v1}, Lcom/discord/utilities/rest/SendUtils$getSendPayload$2;-><init>(Lcom/discord/restapi/RestAPIParams$Message;)V
+    invoke-direct {p3, p2}, Lcom/discord/utilities/rest/SendUtils$getSendPayload$2;-><init>(Lcom/discord/restapi/RestAPIParams$Message;)V
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-static {v3, v0}, Lrx/Observable;->m(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
+    invoke-static {v0, p1}, Lrx/Observable;->m(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object p1
 
-    const-string v1, "Observable.concat(\n     \u2026)\n              }\n      )"
+    const-string p2, "Observable.concat(\n     \u2026)\n              }\n      )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_3
 
     :cond_6
-    new-instance v0, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
+    new-instance p1, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;
 
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p3, Lk0/j/n;->d:Lk0/j/n;
 
-    invoke-direct {v0, v1, v2}, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;-><init>(Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;)V
+    invoke-direct {p1, p2, p3}, Lcom/discord/utilities/rest/SendUtils$SendPayload$ReadyToSend;-><init>(Lcom/discord/restapi/RestAPIParams$Message;Ljava/util/List;)V
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {v1, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v1
+    move-object p1, p2
 
     :goto_3
-    return-object v0
-
-    :cond_7
-    const-string v0, "apiParamMessage"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_8
-    const-string v0, "contentResolver"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
+    return-object p1
 .end method
 
 .method public final handleSendError(Lcom/discord/utilities/error/Error;Landroid/content/Context;Lkotlin/jvm/functions/Function0;)V
-    .locals 4
+    .locals 3
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -492,23 +476,25 @@
         }
     .end annotation
 
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_5
-
-    if-eqz p2, :cond_4
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getType()Lcom/discord/utilities/error/Error$Type;
 
-    move-result-object v2
+    move-result-object v1
 
-    sget-object v3, Lcom/discord/utilities/error/Error$Type;->REQUEST_TOO_LARGE:Lcom/discord/utilities/error/Error$Type;
+    sget-object v2, Lcom/discord/utilities/error/Error$Type;->REQUEST_TOO_LARGE:Lcom/discord/utilities/error/Error$Type;
 
-    if-ne v2, v3, :cond_0
+    if-ne v1, v2, :cond_0
 
     if-eqz p3, :cond_3
 
@@ -525,9 +511,9 @@
 
     move-result-object p3
 
-    const-string v2, "error.response"
+    const-string v1, "error.response"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/utilities/error/Error$Response;->isKnownResponse()Z
 
@@ -539,18 +525,20 @@
 
     move-result-object p3
 
-    sget-object v2, Lcom/discord/utilities/error/Error$Type;->NETWORK:Lcom/discord/utilities/error/Error$Type;
+    sget-object v1, Lcom/discord/utilities/error/Error$Type;->NETWORK:Lcom/discord/utilities/error/Error$Type;
 
-    if-ne p3, v2, :cond_1
+    if-ne p3, v1, :cond_1
 
     goto :goto_0
 
     :cond_1
-    const p3, 0x7f120f4d
+    const p3, 0x7f120f77
+
+    const/4 v1, 0x0
 
     const/16 v2, 0xc
 
-    invoke-static {p2, p3, v1, v0, v2}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p2, p3, v0, v1, v2}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     goto :goto_1
 
@@ -565,20 +553,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/utilities/error/Error;->showToasts(Landroid/content/Context;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final tryShowFilesTooLargeDialog(Landroid/content/Context;Landroidx/fragment/app/FragmentManager;FIFZIZZ)Z
@@ -588,11 +562,15 @@
 
     move/from16 v1, p4
 
-    const/4 v2, 0x0
+    const-string v2, "context"
 
-    if-eqz v0, :cond_4
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v2, "fragmentManager"
+
+    move-object v10, p2
+
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     int-to-float v2, v1
 
@@ -649,7 +627,7 @@
 
     const/4 v5, 0x3
 
-    const v1, 0x7f12129b
+    const v1, 0x7f1212c6
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -659,7 +637,7 @@
 
     const/4 v8, 0x0
 
-    const/4 v10, 0x0
+    const/4 v0, 0x0
 
     const/4 v11, 0x0
 
@@ -669,14 +647,16 @@
 
     move-object v4, p2
 
+    move-object v10, v0
+
     invoke-static/range {v3 .. v12}, Lf/a/a/a/a$b;->b(Lf/a/a/a/a$b;Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 
-    move-object v3, p0
+    move-object v2, p0
 
     goto :goto_1
 
     :cond_2
-    move-object v3, p0
+    move-object v2, p0
 
     invoke-direct {p0, p1, v1}, Lcom/discord/utilities/rest/SendUtils;->showFilesTooLargeDialog(Landroid/content/Context;I)V
 
@@ -684,22 +664,4 @@
     const/4 v0, 0x1
 
     return v0
-
-    :cond_3
-    move-object v3, p0
-
-    const-string v0, "fragmentManager"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_4
-    move-object v3, p0
-
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali b/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali
index 8bc504e799..88d7ea6544 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali
@@ -7,11 +7,13 @@
 .method public static final computeFileSizeBytes(Landroid/net/Uri;Landroid/content/ContentResolver;)J
     .locals 10
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p0, :cond_6
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_5
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -30,22 +32,24 @@
     :try_start_0
     invoke-virtual/range {v1 .. v6}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
 
     :try_start_1
     const-string v2, "_size"
 
-    invoke-interface {v1, v2}, Landroid/database/Cursor;->getColumnIndex(Ljava/lang/String;)I
+    invoke-interface {v0, v2}, Landroid/database/Cursor;->getColumnIndex(Ljava/lang/String;)I
 
     move-result v2
 
-    invoke-interface {v1}, Landroid/database/Cursor;->moveToFirst()Z
+    invoke-interface {v0}, Landroid/database/Cursor;->moveToFirst()Z
 
-    invoke-interface {v1, v2}, Landroid/database/Cursor;->getLong(I)J
+    invoke-interface {v0, v2}, Landroid/database/Cursor;->getLong(I)J
 
     move-result-wide v2
 
@@ -61,7 +65,7 @@
     goto :goto_3
 
     :cond_0
-    move-object v2, v0
+    move-object v2, v1
 
     :goto_0
     if-eqz v2, :cond_1
@@ -102,7 +106,7 @@
     goto :goto_1
 
     :cond_2
-    move-object v2, v0
+    move-object v2, v1
 
     :goto_1
     if-eqz p1, :cond_3
@@ -126,9 +130,9 @@
 
     :goto_2
     :try_start_2
-    invoke-static {v1, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, v1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
     :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
 
     return-wide v2
 
@@ -139,18 +143,18 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     :catchall_1
-    move-exception v0
+    move-exception v1
 
     :try_start_4
-    invoke-static {v1, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
-    throw v0
+    throw v1
 
     :catch_0
     move-wide v2, v7
 
     :goto_4
-    invoke-static {v1, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, v1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
     :try_end_4
     .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_1
 
@@ -186,30 +190,18 @@
     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
 
     return-wide v7
-
-    :cond_5
-    const-string p0, "contentResolver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final computeFileSizeMegabytes(Landroid/net/Uri;Landroid/content/ContentResolver;)F
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeBytes(Landroid/net/Uri;Landroid/content/ContentResolver;)J
 
@@ -224,18 +216,4 @@
     div-float/2addr p0, p1
 
     return p0
-
-    :cond_0
-    const-string p0, "contentResolver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "uri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali b/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali
index 4af891966a..e52ab50046 100644
--- a/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ActivityLifecycleCallbacks.smali
@@ -32,7 +32,9 @@
 .method public final onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/app/AppActivity;
 
@@ -44,21 +46,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivityCreated(Lcom/discord/app/AppActivity;Landroid/os/Bundle;)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "activity"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Ljava/lang/ref/WeakReference;
 
@@ -69,38 +64,24 @@
     invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityCreatedOrResumed(Lcom/discord/app/AppActivity;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivityCreatedOrResumed(Lcom/discord/app/AppActivity;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onActivityDestroyed(Landroid/app/Activity;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/app/AppActivity;
 
@@ -112,38 +93,24 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivityDestroyed(Lcom/discord/app/AppActivity;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onActivityPaused(Landroid/app/Activity;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/app/AppActivity;
 
@@ -155,38 +122,24 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivityPaused(Lcom/discord/app/AppActivity;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/app/AppActivity;
 
@@ -198,47 +151,40 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivityResumed(Lcom/discord/app/AppActivity;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityCreatedInvoked:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityCreatedInvoked:Ljava/lang/ref/WeakReference;
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+    if-eqz v0, :cond_0
 
-    move-result-object v1
+    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
-    check-cast v1, Lcom/discord/app/AppActivity;
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/app/AppActivity;
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    iput-object v0, p0, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityCreatedInvoked:Ljava/lang/ref/WeakReference;
+    iput-object v1, p0, Lcom/discord/utilities/rx/ActivityLifecycleCallbacks;->onActivityCreatedInvoked:Ljava/lang/ref/WeakReference;
 
     goto :goto_1
 
@@ -247,19 +193,14 @@
 
     :goto_1
     return-void
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onActivitySaveInstanceState(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/app/AppActivity;
 
@@ -271,38 +212,24 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivitySaveInstanceState(Lcom/discord/app/AppActivity;Landroid/os/Bundle;)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "activity"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onActivityStarted(Landroid/app/Activity;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/app/AppActivity;
 
@@ -314,38 +241,24 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivityStarted(Lcom/discord/app/AppActivity;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/app/AppActivity;
 
@@ -357,30 +270,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onActivityStopped(Lcom/discord/app/AppActivity;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali
index c8c36ab24c..e4e9c09b16 100644
--- a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$1.smali
@@ -99,9 +99,9 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/LeadingEdgeThrottle$1;->val$s:Lrx/observers/SerializedSubscriber;
 
-    iget-object v0, v0, Lrx/observers/SerializedSubscriber;->d:Lr0/g;
+    iget-object v0, v0, Lrx/observers/SerializedSubscriber;->d:Ls0/g;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
 
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali
index a71475185a..eb65afe2fc 100644
--- a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali
+++ b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle$DebounceState.smali
@@ -135,7 +135,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    invoke-interface {p2, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p2, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
@@ -157,7 +157,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-interface {p2}, Lr0/g;->onCompleted()V
+    invoke-interface {p2}, Ls0/g;->onCompleted()V
 
     return-void
 
@@ -174,7 +174,7 @@
     :catchall_1
     move-exception p2
 
-    invoke-static {p2, p3, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
+    invoke-static {p2, p3, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
 
     return-void
 
@@ -244,7 +244,7 @@
     if-eqz v2, :cond_1
 
     :try_start_1
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -253,13 +253,13 @@
     :catchall_0
     move-exception p1
 
-    invoke-static {p1, p2, v0}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
+    invoke-static {p1, p2, v0}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
 
     return-void
 
     :cond_1
     :goto_0
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
 
diff --git a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali
index ef257834c0..01beffa66d 100644
--- a/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali
+++ b/com.discord/smali/com/discord/utilities/rx/LeadingEdgeThrottle.smali
@@ -35,7 +35,7 @@
 .method public constructor <init>(JLjava/util/concurrent/TimeUnit;)V
     .locals 1
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$1.smali
index cdfa92c83d..cd704d4dd3 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$1.smali
@@ -27,7 +27,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;TT10;TR;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$2.smali
index ee57915372..9ec65a3c75 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$2.smali
@@ -29,7 +29,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;TT10;TT11;TR;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$3.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$3.smali
index fa038026f0..07dbaa8341 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$3.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$3.smali
@@ -31,7 +31,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;TT10;TT11;TT12;TR;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$4.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$4.smali
index c565519d0e..57fbd66c89 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$4.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$4.smali
@@ -33,7 +33,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;TT10;TT11;TT12;TT13;TR;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$5.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$5.smali
index 240958a93e..7fc80e694d 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$5.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$5.smali
@@ -35,7 +35,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;TT10;TT11;TT12;TT13;TT14;TR;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6.smali
index 50936587dc..eda5e738d3 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6.smali
@@ -37,7 +37,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func7<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TR;>;"
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;TT10;TT11;TT12;TT13;TT14;TT15;TR;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.smali
index 0bce77604f..885812d63c 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.smali
@@ -39,7 +39,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func8<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;TT10;TT11;TT12;TT13;TT14;TT15;TT16;TR;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$createHolderObservable$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$createHolderObservable$1.smali
index c0c25d588f..ca9e864c52 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$createHolderObservable$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$createHolderObservable$1.smali
@@ -41,7 +41,9 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func9<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;",
+        "Lcom/discord/utilities/rx/Holder<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.smali b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.smali
index a6d31058bd..747935611c 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.smali
@@ -58,29 +58,49 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "o1"
 
-    if-eqz p0, :cond_a
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_9
+    const-string v0, "o2"
 
-    if-eqz p2, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_7
+    const-string v0, "o3"
 
-    if-eqz p4, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_5
+    const-string v0, "o4"
 
-    if-eqz p6, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_3
+    const-string v0, "o5"
 
-    if-eqz p8, :cond_2
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_1
+    const-string v0, "o6"
 
-    if-eqz p10, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o7"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o8"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o9"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o10"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "combineFunction"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p0 .. p8}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
@@ -96,86 +116,9 @@
 
     const-string p1, "Observable\n        .comb\u2026t10\n          )\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "combineFunction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "o10"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "o9"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "o8"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "o7"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "o6"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "o5"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "o4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p0, "o3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p0, "o2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p0, "o1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function11;)Lrx/Observable;
@@ -236,31 +179,53 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "o1"
 
-    if-eqz p0, :cond_b
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_a
+    const-string v0, "o2"
 
-    if-eqz p2, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_8
+    const-string v0, "o3"
 
-    if-eqz p4, :cond_7
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_6
+    const-string v0, "o4"
 
-    if-eqz p6, :cond_5
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_4
+    const-string v0, "o5"
 
-    if-eqz p8, :cond_3
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_2
+    const-string v0, "o6"
 
-    if-eqz p10, :cond_1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_0
+    const-string v0, "o7"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o8"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o9"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o10"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o11"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "combineFunction"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p0 .. p8}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
@@ -276,93 +241,9 @@
 
     const-string p1, "Observable\n        .comb\u2026t11\n          )\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "combineFunction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "o11"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "o10"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "o9"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "o8"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "o7"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "o6"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "o5"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p0, "o4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p0, "o3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p0, "o2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p0, "o1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function12;)Lrx/Observable;
@@ -427,33 +308,57 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "o1"
 
-    if-eqz p0, :cond_c
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_b
+    const-string v0, "o2"
 
-    if-eqz p2, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_9
+    const-string v0, "o3"
 
-    if-eqz p4, :cond_8
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_7
+    const-string v0, "o4"
 
-    if-eqz p6, :cond_6
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_5
+    const-string v0, "o5"
 
-    if-eqz p8, :cond_4
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_3
+    const-string v0, "o6"
 
-    if-eqz p10, :cond_2
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_1
+    const-string v0, "o7"
 
-    if-eqz p12, :cond_0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o8"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o9"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o10"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o11"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o12"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "combineFunction"
+
+    invoke-static {p12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p0 .. p8}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
@@ -469,100 +374,9 @@
 
     const-string p1, "Observable\n        .comb\u2026t12\n          )\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "combineFunction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "o12"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "o11"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "o10"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "o9"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "o8"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "o7"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "o6"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p0, "o5"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p0, "o4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p0, "o3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p0, "o2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p0, "o1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function13;)Lrx/Observable;
@@ -631,35 +445,61 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "o1"
 
-    if-eqz p0, :cond_d
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_c
+    const-string v0, "o2"
 
-    if-eqz p2, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_a
+    const-string v0, "o3"
 
-    if-eqz p4, :cond_9
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_8
+    const-string v0, "o4"
 
-    if-eqz p6, :cond_7
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_6
+    const-string v0, "o5"
 
-    if-eqz p8, :cond_5
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_4
+    const-string v0, "o6"
 
-    if-eqz p10, :cond_3
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_2
+    const-string v0, "o7"
 
-    if-eqz p12, :cond_1
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p13, :cond_0
+    const-string v0, "o8"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o9"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o10"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o11"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o12"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o13"
+
+    invoke-static {p12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "combineFunction"
+
+    invoke-static {p13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p0 .. p8}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
@@ -683,107 +523,9 @@
 
     const-string p1, "Observable\n        .comb\u2026t13\n          )\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "combineFunction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "o13"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "o12"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "o11"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "o10"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "o9"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "o8"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "o7"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p0, "o6"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p0, "o5"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p0, "o4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p0, "o3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p0, "o2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    const-string p0, "o1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function14;)Lrx/Observable;
@@ -856,37 +598,65 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "o1"
 
-    if-eqz p0, :cond_e
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_d
+    const-string v0, "o2"
 
-    if-eqz p2, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_b
+    const-string v0, "o3"
 
-    if-eqz p4, :cond_a
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_9
+    const-string v0, "o4"
 
-    if-eqz p6, :cond_8
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_7
+    const-string v0, "o5"
 
-    if-eqz p8, :cond_6
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_5
+    const-string v0, "o6"
 
-    if-eqz p10, :cond_4
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_3
+    const-string v0, "o7"
 
-    if-eqz p12, :cond_2
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p13, :cond_1
+    const-string v0, "o8"
 
-    if-eqz p14, :cond_0
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o9"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o10"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o11"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o12"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o13"
+
+    invoke-static {p12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "o14"
+
+    invoke-static {p13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "combineFunction"
+
+    invoke-static {p14, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p0 .. p8}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
@@ -912,118 +682,13 @@
 
     const-string p1, "Observable\n        .comb\u2026t14\n          )\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "combineFunction"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "o14"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "o13"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "o12"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "o11"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "o10"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "o9"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "o8"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p0, "o7"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p0, "o6"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p0, "o5"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p0, "o4"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p0, "o3"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    const-string p0, "o2"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
-    const-string p0, "o1"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function15;)Lrx/Observable;
-    .locals 3
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T1:",
@@ -1098,63 +763,123 @@
 
     move-object/from16 v0, p15
 
-    const/4 v1, 0x0
+    const-string v1, "o1"
 
-    if-eqz p0, :cond_f
+    move-object/from16 v2, p0
 
-    if-eqz p1, :cond_e
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_d
+    const-string v1, "o2"
 
-    if-eqz p3, :cond_c
+    move-object/from16 v3, p1
 
-    if-eqz p4, :cond_b
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_a
+    const-string v1, "o3"
 
-    if-eqz p6, :cond_9
+    move-object/from16 v4, p2
 
-    if-eqz p7, :cond_8
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_7
+    const-string v1, "o4"
 
-    if-eqz p9, :cond_6
+    move-object/from16 v5, p3
 
-    if-eqz p10, :cond_5
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_4
+    const-string v1, "o5"
 
-    if-eqz p12, :cond_3
+    move-object/from16 v6, p4
 
-    if-eqz p13, :cond_2
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p14, :cond_1
+    const-string v1, "o6"
 
-    if-eqz v0, :cond_0
+    move-object/from16 v7, p5
+
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o7"
+
+    move-object/from16 v8, p6
+
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o8"
+
+    move-object/from16 v9, p7
+
+    invoke-static {v9, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o9"
+
+    move-object/from16 v10, p8
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o10"
+
+    move-object/from16 v11, p9
+
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o11"
+
+    move-object/from16 v12, p10
+
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o12"
+
+    move-object/from16 v13, p11
+
+    invoke-static {v13, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o13"
+
+    move-object/from16 v14, p12
+
+    invoke-static {v14, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o14"
+
+    move-object/from16 v15, p13
+
+    invoke-static {v15, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o15"
+
+    move-object/from16 v2, p14
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "combineFunction"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p0 .. p8}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6;
+    new-instance v3, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6;
 
-    invoke-direct {v2, v0}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6;-><init>(Lkotlin/jvm/functions/Function15;)V
+    invoke-direct {v3, v0}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$6;-><init>(Lkotlin/jvm/functions/Function15;)V
 
-    move-object p0, v1
+    move-object/from16 p0, v1
 
-    move-object p1, p9
+    move-object/from16 p1, p9
 
-    move-object p2, p10
+    move-object/from16 p2, p10
 
-    move-object p3, p11
+    move-object/from16 p3, p11
 
-    move-object p4, p12
+    move-object/from16 p4, p12
 
     move-object/from16 p5, p13
 
     move-object/from16 p6, p14
 
-    move-object p7, v2
+    move-object/from16 p7, v3
 
     invoke-static/range {p0 .. p7}, Lrx/Observable;->e(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable;
 
@@ -1162,125 +887,13 @@
 
     const-string v1, "Observable\n        .comb\u2026t15\n          )\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string v0, "combineFunction"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const-string v0, "o15"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_2
-    const-string v0, "o14"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    const-string v0, "o13"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    const-string v0, "o12"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    const-string v0, "o11"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    const-string v0, "o10"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_7
-    const-string v0, "o9"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_8
-    const-string v0, "o8"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_9
-    const-string v0, "o7"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_a
-    const-string v0, "o6"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_b
-    const-string v0, "o5"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_c
-    const-string v0, "o4"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_d
-    const-string v0, "o3"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_e
-    const-string v0, "o2"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_f
-    const-string v0, "o1"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function16;)Lrx/Observable;
-    .locals 3
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T1:",
@@ -1359,59 +972,123 @@
 
     move-object/from16 v0, p16
 
-    const/4 v1, 0x0
+    const-string v1, "o1"
 
-    if-eqz p0, :cond_10
+    move-object/from16 v2, p0
 
-    if-eqz p1, :cond_f
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_e
+    const-string v1, "o2"
 
-    if-eqz p3, :cond_d
+    move-object/from16 v3, p1
 
-    if-eqz p4, :cond_c
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_b
+    const-string v1, "o3"
 
-    if-eqz p6, :cond_a
+    move-object/from16 v4, p2
 
-    if-eqz p7, :cond_9
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_8
+    const-string v1, "o4"
 
-    if-eqz p9, :cond_7
+    move-object/from16 v5, p3
 
-    if-eqz p10, :cond_6
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_5
+    const-string v1, "o5"
 
-    if-eqz p12, :cond_4
+    move-object/from16 v6, p4
 
-    if-eqz p13, :cond_3
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p14, :cond_2
+    const-string v1, "o6"
 
-    if-eqz p15, :cond_1
+    move-object/from16 v7, p5
 
-    if-eqz v0, :cond_0
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o7"
+
+    move-object/from16 v8, p6
+
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o8"
+
+    move-object/from16 v9, p7
+
+    invoke-static {v9, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o9"
+
+    move-object/from16 v10, p8
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o10"
+
+    move-object/from16 v11, p9
+
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o11"
+
+    move-object/from16 v12, p10
+
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o12"
+
+    move-object/from16 v13, p11
+
+    invoke-static {v13, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o13"
+
+    move-object/from16 v14, p12
+
+    invoke-static {v14, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o14"
+
+    move-object/from16 v15, p13
+
+    invoke-static {v15, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o15"
+
+    move-object/from16 v2, p14
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "o16"
+
+    move-object/from16 v2, p15
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "combineFunction"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p0 .. p8}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7;
+    new-instance v3, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7;
 
-    invoke-direct {v2, v0}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7;-><init>(Lkotlin/jvm/functions/Function16;)V
+    invoke-direct {v3, v0}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7;-><init>(Lkotlin/jvm/functions/Function16;)V
 
-    move-object p0, v1
+    move-object/from16 p0, v1
 
-    move-object p1, p9
+    move-object/from16 p1, p9
 
-    move-object p2, p10
+    move-object/from16 p2, p10
 
-    move-object p3, p11
+    move-object/from16 p3, p11
 
-    move-object p4, p12
+    move-object/from16 p4, p12
 
     move-object/from16 p5, p13
 
@@ -1419,7 +1096,7 @@
 
     move-object/from16 p7, p15
 
-    move-object p8, v2
+    move-object/from16 p8, v3
 
     invoke-static/range {p0 .. p8}, Lrx/Observable;->d(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func8;)Lrx/Observable;
 
@@ -1427,128 +1104,9 @@
 
     const-string v1, "Observable\n        .comb\u2026t16\n          )\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string v0, "combineFunction"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const-string v0, "o16"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_2
-    const-string v0, "o15"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    const-string v0, "o14"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    const-string v0, "o13"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    const-string v0, "o12"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    const-string v0, "o11"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_7
-    const-string v0, "o10"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_8
-    const-string v0, "o9"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_9
-    const-string v0, "o8"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_a
-    const-string v0, "o7"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_b
-    const-string v0, "o6"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_c
-    const-string v0, "o5"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_d
-    const-string v0, "o4"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_e
-    const-string v0, "o3"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_f
-    const-string v0, "o2"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_10
-    const-string v0, "o1"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final createHolderObservable(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;)Lrx/Observable;
@@ -1624,7 +1182,7 @@
 
     const-string v1, "Observable\n    .combineL\u2026t5, t6, t7, t8, t9)\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1.smali
index b9a60296d9..1017aa30e1 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ObservableExtensions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2.smali
index 1da849e01d..87ad543796 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/rx/ObservableExtensionsKt$appSubscribe$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ObservableExtensions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1.smali
index e752131ccb..5e0051e7cf 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "TT;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,25 +49,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Object;)Z
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(TT;)Z"
+            "(TT;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -115,5 +102,19 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali
index 0714aa180c..7324d5d607 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,26 +59,22 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Object;)Z
-    .locals 0
-
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
     const/4 p1, 0x0
 
     throw p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali
index ebf247e362..96f8f6be3f 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -67,7 +68,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lj0/n/c/h;->reifiedOperationMarker()V
+    invoke-static {}, Lk0/o/c/i;->reifiedOperationMarker()V
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$1.smali
index b948919f7b..e8bd84b186 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "TT;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,25 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Object;)Z
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(TT;)Z"
+            "(TT;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -91,5 +78,19 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$2.smali
index 22bfb6a362..34741b3554 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$filterNull$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,8 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "TT;TT;>;"
     }
 .end annotation
 
@@ -65,14 +65,7 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali
index 0615c0ff32..07bc8fa18f 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali
index cc68451a17..ed2c9c25d2 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action1$0.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
index b4aa18449c..2740d41cb6 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
@@ -35,15 +35,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$appSubscribe"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "errorTag"
 
-    if-eqz p4, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "onNext"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onCompleted"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
@@ -61,9 +67,9 @@
 
     invoke-direct {p2, p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt$sam$rx_functions_Action0$0;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    new-instance p5, Lr0/l/e/b;
+    new-instance p5, Ls0/l/e/b;
 
-    invoke-direct {p5, p1, p4, p2}, Lr0/l/e/b;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    invoke-direct {p5, p1, p4, p2}, Ls0/l/e/b;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
 
     invoke-virtual {p0, p5}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
 
@@ -73,7 +79,7 @@
 
     const-string p1, "subscription"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -83,34 +89,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "onCompleted"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "onNext"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "errorTag"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "$this$appSubscribe"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final appSubscribe(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
@@ -145,15 +123,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$appSubscribe"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "errorClass"
 
-    if-eqz p5, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "onCompleted"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onNext"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -161,7 +145,7 @@
 
     const-string p1, "errorClass.simpleName"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v1, p0
 
@@ -178,34 +162,6 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "onNext"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "onCompleted"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "errorClass"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$appSubscribe"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
@@ -356,13 +312,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$bindToComponentLifecycle"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "appComponent"
 
-    invoke-interface {p1}, Lcom/discord/app/AppComponent;->getPaused()Lrx/subjects/Subject;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Lcom/discord/app/AppComponent;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
@@ -378,37 +336,16 @@
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1;-><init>(Lcom/discord/app/AppComponent;)V
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    const-string p1, "observable.filter {\n    \u2026ng == false\n            }"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_0
-
     :cond_0
-    const-string p1, "observable"
+    const-string p1, "takeUntil(appComponent.u\u2026ble\n          }\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "appComponent"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$bindToComponentLifecycle"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final computationBuffered(Lrx/Observable;)Lrx/Observable;
@@ -425,13 +362,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$computationBuffered"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lrx/Observable;->I()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -439,7 +378,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -449,18 +388,9 @@
 
     const-string v0, "onBackpressureBuffer()\n \u2026Schedulers.computation())"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$computationBuffered"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final computationLatest(Lrx/Observable;)Lrx/Observable;
@@ -477,13 +407,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$computationLatest"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lrx/Observable;->J()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -491,7 +423,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -501,18 +433,9 @@
 
     const-string v0, "onBackpressureLatest()\n \u2026Schedulers.computation())"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$computationLatest"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final filterIs(Lrx/Observable;)Lrx/Observable;
@@ -529,7 +452,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$filterIs"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p0, Ljava/lang/UnsupportedOperationException;
 
@@ -538,18 +463,9 @@
     invoke-direct {p0, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_0
-    const-string p0, "$this$filterIs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final filterNull(Lrx/Observable;)Lrx/Observable;
+.method public static final synthetic filterNull(Lrx/Observable;)Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -563,34 +479,27 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$filterNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     const-string v0, "filter { it != null }.map { it!! }"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$filterNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
@@ -609,21 +518,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$leadingEdgeThrottle"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "timeUnit"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/rx/LeadingEdgeThrottle;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object p0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, p0, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, p0, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -631,23 +542,9 @@
 
     const-string p1, "lift(LeadingEdgeThrottle\u2026indowDuration, timeUnit))"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "timeUnit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$leadingEdgeThrottle"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
@@ -664,9 +561,11 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$restSubscribeOn"
 
-    invoke-static {}, Lr0/p/a;->d()Lrx/Scheduler;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ls0/p/a;->d()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -674,13 +573,13 @@
 
     move-result-object v2
 
-    const-string p0, "observable"
-
     if-eqz p1, :cond_0
 
     sget-object v1, Lcom/discord/restapi/utils/RetryWithDelay;->INSTANCE:Lcom/discord/restapi/utils/RetryWithDelay;
 
-    invoke-static {v2, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string p0, "observable"
+
+    invoke-static {v2, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0x0
 
@@ -696,22 +595,12 @@
 
     move-result-object v2
 
-    goto :goto_0
-
     :cond_0
-    invoke-static {v2, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string p0, "subscribeOn(Schedulers.i\u2026 observable\n      }\n    }"
+
+    invoke-static {v2, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :goto_0
     return-object v2
-
-    :cond_1
-    const-string p0, "$this$restSubscribeOn"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
@@ -747,7 +636,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$takeSingleUntilTimeout"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -779,22 +670,13 @@
     :goto_0
     const-string p1, "take(1).let {\n      if (\u2026LISECONDS))\n      }\n    }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_1
-    const-string p0, "$this$takeSingleUntilTimeout"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
@@ -835,9 +717,11 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$ui"
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -847,18 +731,9 @@
 
     const-string v0, "observeOn(AndroidSchedulers.mainThread())"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$ui"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
@@ -878,13 +753,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$ui"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "appComponent"
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -894,7 +771,7 @@
 
     const-string v0, "observeOn(AndroidSchedulers.mainThread())"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -910,23 +787,9 @@
 
     const-string p1, "observeOn(AndroidSchedul\u2026beFromUpdates()\n        }"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "appComponent"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$ui"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali
index fa8678ca57..52c867b913 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableWithLeadingEdgeThrottle.java"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali
index c0eef4f6a1..5ad05022fb 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.smali
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -102,11 +102,11 @@
 
     invoke-direct {v0, p2, p3, p4, p5}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
-    new-instance p2, Lr0/l/a/u;
+    new-instance p2, Ls0/l/a/u;
 
     iget-object p0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p2, p0, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p2, p0, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -116,7 +116,7 @@
 
     invoke-direct {p2, p1}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle$2;-><init>(Lrx/functions/FuncN;)V
 
-    invoke-virtual {p0, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -175,9 +175,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/c;
+    new-instance v0, Ls0/k/c;
 
-    invoke-direct {v0, p9}, Lr0/k/c;-><init>(Lrx/functions/Func9;)V
+    invoke-direct {v0, p9}, Ls0/k/c;-><init>(Lrx/functions/Func9;)V
 
     const/16 p9, 0x9
 
@@ -283,9 +283,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/c;
+    new-instance v0, Ls0/k/c;
 
-    invoke-direct {v0, p9}, Lr0/k/c;-><init>(Lrx/functions/Func9;)V
+    invoke-direct {v0, p9}, Ls0/k/c;-><init>(Lrx/functions/Func9;)V
 
     const/16 p9, 0x9
 
@@ -394,9 +394,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/j;
+    new-instance v0, Ls0/k/j;
 
-    invoke-direct {v0, p8}, Lr0/k/j;-><init>(Lrx/functions/Func8;)V
+    invoke-direct {v0, p8}, Ls0/k/j;-><init>(Lrx/functions/Func8;)V
 
     const/16 p8, 0x8
 
@@ -494,9 +494,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/j;
+    new-instance v0, Ls0/k/j;
 
-    invoke-direct {v0, p8}, Lr0/k/j;-><init>(Lrx/functions/Func8;)V
+    invoke-direct {v0, p8}, Ls0/k/j;-><init>(Lrx/functions/Func8;)V
 
     const/16 p8, 0x8
 
@@ -597,9 +597,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/i;
+    new-instance v0, Ls0/k/i;
 
-    invoke-direct {v0, p7}, Lr0/k/i;-><init>(Lrx/functions/Func7;)V
+    invoke-direct {v0, p7}, Ls0/k/i;-><init>(Lrx/functions/Func7;)V
 
     const/4 p7, 0x7
 
@@ -689,9 +689,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/i;
+    new-instance v0, Ls0/k/i;
 
-    invoke-direct {v0, p7}, Lr0/k/i;-><init>(Lrx/functions/Func7;)V
+    invoke-direct {v0, p7}, Ls0/k/i;-><init>(Lrx/functions/Func7;)V
 
     const/4 p7, 0x7
 
@@ -784,9 +784,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/h;
+    new-instance v0, Ls0/k/h;
 
-    invoke-direct {v0, p6}, Lr0/k/h;-><init>(Lrx/functions/Func6;)V
+    invoke-direct {v0, p6}, Ls0/k/h;-><init>(Lrx/functions/Func6;)V
 
     const/4 p6, 0x6
 
@@ -868,9 +868,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/h;
+    new-instance v0, Ls0/k/h;
 
-    invoke-direct {v0, p6}, Lr0/k/h;-><init>(Lrx/functions/Func6;)V
+    invoke-direct {v0, p6}, Ls0/k/h;-><init>(Lrx/functions/Func6;)V
 
     const/4 p6, 0x6
 
@@ -955,9 +955,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/g;
+    new-instance v0, Ls0/k/g;
 
-    invoke-direct {v0, p5}, Lr0/k/g;-><init>(Lrx/functions/Func5;)V
+    invoke-direct {v0, p5}, Ls0/k/g;-><init>(Lrx/functions/Func5;)V
 
     const/4 p5, 0x5
 
@@ -1031,9 +1031,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/g;
+    new-instance v0, Ls0/k/g;
 
-    invoke-direct {v0, p5}, Lr0/k/g;-><init>(Lrx/functions/Func5;)V
+    invoke-direct {v0, p5}, Ls0/k/g;-><init>(Lrx/functions/Func5;)V
 
     const/4 p5, 0x5
 
@@ -1110,9 +1110,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/f;
+    new-instance v0, Ls0/k/f;
 
-    invoke-direct {v0, p4}, Lr0/k/f;-><init>(Lrx/functions/Func4;)V
+    invoke-direct {v0, p4}, Ls0/k/f;-><init>(Lrx/functions/Func4;)V
 
     const/4 p4, 0x4
 
@@ -1178,9 +1178,9 @@
         }
     .end annotation
 
-    new-instance v1, Lr0/k/f;
+    new-instance v1, Ls0/k/f;
 
-    invoke-direct {v1, p4}, Lr0/k/f;-><init>(Lrx/functions/Func4;)V
+    invoke-direct {v1, p4}, Ls0/k/f;-><init>(Lrx/functions/Func4;)V
 
     const/4 p4, 0x4
 
@@ -1247,9 +1247,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/e;
+    new-instance v0, Ls0/k/e;
 
-    invoke-direct {v0, p3}, Lr0/k/e;-><init>(Lrx/functions/Func3;)V
+    invoke-direct {v0, p3}, Ls0/k/e;-><init>(Lrx/functions/Func3;)V
 
     const/4 p3, 0x3
 
@@ -1307,9 +1307,9 @@
         }
     .end annotation
 
-    new-instance v1, Lr0/k/e;
+    new-instance v1, Ls0/k/e;
 
-    invoke-direct {v1, p3}, Lr0/k/e;-><init>(Lrx/functions/Func3;)V
+    invoke-direct {v1, p3}, Ls0/k/e;-><init>(Lrx/functions/Func3;)V
 
     const/4 p3, 0x3
 
@@ -1368,9 +1368,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/k/d;
+    new-instance v0, Ls0/k/d;
 
-    invoke-direct {v0, p2}, Lr0/k/d;-><init>(Lrx/functions/Func2;)V
+    invoke-direct {v0, p2}, Ls0/k/d;-><init>(Lrx/functions/Func2;)V
 
     const/4 p2, 0x2
 
@@ -1420,9 +1420,9 @@
         }
     .end annotation
 
-    new-instance v1, Lr0/k/d;
+    new-instance v1, Ls0/k/d;
 
-    invoke-direct {v1, p2}, Lr0/k/d;-><init>(Lrx/functions/Func2;)V
+    invoke-direct {v1, p2}, Ls0/k/d;-><init>(Lrx/functions/Func2;)V
 
     const/4 p2, 0x2
 
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$2.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$2.smali
index bf67a0c900..27c617b9cf 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "OnDelayedEmissionHandler.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onError"
+
+    const-string v5, "onError(Ljava/lang/Throwable;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onError(Ljava/lang/Throwable;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;->onError(Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2.smali
index 933b705fa1..a9f9f2bd34 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "OnDelayedEmissionHandler.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onError"
+
+    const-string v5, "onError(Ljava/lang/Throwable;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onError(Ljava/lang/Throwable;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;->onError(Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali
index e3754870b4..a059f9dcd9 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.smali
@@ -63,9 +63,9 @@
     :cond_0
     const/4 v0, 0x0
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;->this$0:Lcom/discord/utilities/rx/OnDelayedEmissionHandler;
 
@@ -111,7 +111,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;->$subscriber:Lrx/Subscriber;
 
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     :cond_0
     return-void
@@ -120,7 +120,9 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;->$subscriber:Lrx/Subscriber;
 
@@ -134,19 +136,10 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;->$subscriber:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onNext(Ljava/lang/Object;)V
@@ -169,7 +162,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;->$subscriber:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali
index 12a3c9ce56..b6017a0d4c 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler$sam$rx_functions_Action1$0.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
index 838eef9ad8..e9ca6f904c 100644
--- a/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OnDelayedEmissionHandler.smali
@@ -59,13 +59,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onDelayCallback"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string/jumbo v0, "unit"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "scheduler"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -86,27 +90,6 @@
     iput-object p1, p0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler;->hasFinished:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
-
-    :cond_0
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "unit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onDelayCallback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lkotlin/jvm/functions/Function1;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -134,13 +117,13 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object p5
 
     const-string p2, "AndroidSchedulers.mainThread()"
 
-    invoke-static {p5, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_2
     move-object v5, p5
@@ -220,7 +203,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriber"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1;
 
@@ -259,13 +244,4 @@
     iput-object p1, p0, Lcom/discord/utilities/rx/OnDelayedEmissionHandler;->delaySubscription:Lrx/Subscription;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subscriber"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali
index 35ad860314..234220d4f2 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$Companion.smali
@@ -47,13 +47,13 @@
 
     if-eqz p4, :cond_1
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object p6
 
     const-string p4, "Schedulers.computation()"
 
-    invoke-static {p6, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p6, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_1
     move-object v6, p6
@@ -94,13 +94,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$bufferedDelay"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "timeUnit"
 
-    if-eqz p6, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "scheduler"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/rx/OperatorBufferedDelay;
 
@@ -116,11 +120,11 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/rx/OperatorBufferedDelay;-><init>(JLjava/util/concurrent/TimeUnit;ILrx/Scheduler;)V
 
-    new-instance p2, Lr0/l/a/u;
+    new-instance p2, Ls0/l/a/u;
 
     iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p2, p1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p2, p1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -128,28 +132,7 @@
 
     const-string p2, "this.lift(OperatorBuffer\u2026meUnit, size, scheduler))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "timeUnit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "$this$bufferedDelay"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali
index 1702e1fea5..6319772338 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber.smali
@@ -65,11 +65,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "child"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "inner"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;->this$0:Lcom/discord/utilities/rx/OperatorBufferedDelay;
 
@@ -86,20 +88,6 @@
     iput-object p1, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;->buffer:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "inner"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "child"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final cancelBufferTimer()V
@@ -159,7 +147,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;->child:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -168,9 +156,9 @@
     :catchall_0
     move-exception p1
 
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
 
-    invoke-interface {p0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {p0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     :cond_0
     :goto_0
@@ -283,7 +271,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;->child:Lrx/Subscriber;
 
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -299,7 +287,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;->child:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
 
diff --git a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
index 2dd1767bc8..c42beffc5d 100644
--- a/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
+++ b/com.discord/smali/com/discord/utilities/rx/OperatorBufferedDelay.smali
@@ -59,11 +59,13 @@
 .method public constructor <init>(JLjava/util/concurrent/TimeUnit;ILrx/Scheduler;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "timeUnit"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "scheduler"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -76,20 +78,6 @@
     iput-object p5, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay;->scheduler:Lrx/Scheduler;
 
     return-void
-
-    :cond_0
-    const-string p1, "scheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "timeUnit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLjava/util/concurrent/TimeUnit;ILrx/Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -145,7 +133,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "childSubscriber"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/rx/OperatorBufferedDelay;->scheduler:Lrx/Scheduler;
 
@@ -161,7 +151,7 @@
 
     const-string v3, "inner"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, p0, v1, v0}, Lcom/discord/utilities/rx/OperatorBufferedDelay$ExactSubscriber;-><init>(Lcom/discord/utilities/rx/OperatorBufferedDelay;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
 
@@ -170,15 +160,6 @@
     invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
     return-object v2
-
-    :cond_0
-    const-string p1, "childSubscriber"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getScheduler()Lrx/Scheduler;
diff --git a/com.discord/smali/com/discord/utilities/search/SearchUtils.smali b/com.discord/smali/com/discord/utilities/search/SearchUtils.smali
index b2985c1b73..583c8be899 100644
--- a/com.discord/smali/com/discord/utilities/search/SearchUtils.smali
+++ b/com.discord/smali/com/discord/utilities/search/SearchUtils.smali
@@ -33,11 +33,13 @@
 .method public final fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "query"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "target"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
@@ -64,7 +66,7 @@
 
     if-ne v0, v1, :cond_1
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -132,18 +134,4 @@
 
     :goto_3
     return v2
-
-    :cond_6
-    const-string p1, "target"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali
index b9ad461dfc..90856c2c46 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory.smali
@@ -43,11 +43,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchTarget"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "recentQueries"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,20 +58,6 @@
     iput-object p2, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;->recentQueries:Ljava/util/LinkedList;
 
     return-void
-
-    :cond_0
-    const-string p1, "recentQueries"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;Lcom/discord/stores/StoreSearch$SearchTarget;Ljava/util/LinkedList;ILjava/lang/Object;)Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;
@@ -137,31 +125,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchTarget"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "recentQueries"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;-><init>(Lcom/discord/stores/StoreSearch$SearchTarget;Ljava/util/LinkedList;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "recentQueries"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -179,7 +155,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;->searchTarget:Lcom/discord/stores/StoreSearch$SearchTarget;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -189,7 +165,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;->recentQueries:Ljava/util/LinkedList;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali
index 9c8ecbb6aa..34552328c9 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1.smali
@@ -3,7 +3,7 @@
 .source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/LinkedList<",
+        "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
+        ">;",
+        "Ljava/util/LinkedList<",
+        "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,7 +86,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1;->$searchTarget:Lcom/discord/stores/StoreSearch$SearchTarget;
 
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2.smali
index 7160ff68a6..3baa0dd4dc 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/LinkedList<",
         "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali
index 26292cb066..557f6592de 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1.smali
@@ -3,7 +3,7 @@
 .source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/LinkedList<",
+        "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
+        ">;",
+        "Ljava/util/Collection<",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -56,14 +64,14 @@
 
     check-cast p1, Ljava/util/LinkedList;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1;->call(Ljava/util/LinkedList;)Ljava/util/LinkedList;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1;->call(Ljava/util/LinkedList;)Ljava/util/Collection;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final call(Ljava/util/LinkedList;)Ljava/util/LinkedList;
+.method public final call(Ljava/util/LinkedList;)Ljava/util/Collection;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -71,7 +79,7 @@
             "Ljava/util/LinkedList<",
             "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
             ">;)",
-            "Ljava/util/LinkedList<",
+            "Ljava/util/Collection<",
             "Ljava/util/List<",
             "Lcom/discord/utilities/search/query/node/QueryNode;",
             ">;>;"
@@ -82,7 +90,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1;->$searchTarget:Lcom/discord/stores/StoreSearch$SearchTarget;
 
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali
index e997d8a3e6..2b9b6c7377 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1.smali
@@ -3,7 +3,7 @@
 .source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/LinkedList<",
+        "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
+        ">;",
+        "Ljava/util/LinkedList<",
+        "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,7 +90,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1;->$searchTarget:Lcom/discord/stores/StoreSearch$SearchTarget;
 
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2.smali
index 6d52e345e3..5f76dcad7b 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MGPreferenceSearchHistoryCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/LinkedList<",
         "Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali
index 50ff2613e5..2b5ef07b0c 100644
--- a/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali
+++ b/com.discord/smali/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.smali
@@ -121,7 +121,7 @@
 
     const-string v0, "iterator()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
@@ -136,7 +136,7 @@
 
     const-string v1, "iter.next()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;
 
@@ -144,7 +144,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -189,7 +189,7 @@
 
     const-string v1, "iterator()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
@@ -204,7 +204,7 @@
 
     const-string v2, "targetsIter.next()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;
 
@@ -212,7 +212,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -250,7 +250,7 @@
 
     const-string v2, "targetHistory.recentQueries.iterator()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_3
     :goto_2
@@ -266,11 +266,11 @@
 
     const-string v3, "queriesIter.next()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Ljava/util/List;
 
-    invoke-static {v2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -297,7 +297,7 @@
 
     iget v2, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;->MAX_QUERIES_PER_TARGET:I
 
-    invoke-static {v1, v2}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v1, v2}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object v1
 
@@ -311,7 +311,7 @@
 
     iget p3, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;->MAX_SEARCH_TARGETS:I
 
-    invoke-static {p1, p3}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {p1, p3}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
@@ -342,7 +342,7 @@
 
     const-string v1, "iterator()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
@@ -357,7 +357,7 @@
 
     const-string v2, "iter.next()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$TargetHistory;
 
@@ -365,7 +365,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -386,9 +386,9 @@
 .method public clear(Lcom/discord/stores/StoreSearch$SearchTarget;)V
     .locals 8
 
-    const/4 v6, 0x0
+    const-string v0, "searchTarget"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;->backingCache:Lcom/discord/utilities/persister/Persister;
 
@@ -406,7 +406,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$clear$1;-><init>(Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;Lcom/discord/stores/StoreSearch$SearchTarget;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -424,10 +424,20 @@
 
     and-int/lit8 v0, v0, 0x20
 
-    new-instance v7, Lf/a/b/c0;
+    const-string v0, "onNext"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "clear history"
 
+    const-string v0, "errorTag"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v7, Lf/a/b/e0;
+
+    const/4 v6, 0x0
+
     move-object v0, v7
 
     move-object v1, v6
@@ -436,18 +446,11 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/e0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p1, v7}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public getHistory(Lcom/discord/stores/StoreSearch$SearchTarget;)Lrx/Observable;
@@ -465,7 +468,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchTarget"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;->backingCache:Lcom/discord/utilities/persister/Persister;
 
@@ -477,24 +482,15 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$getHistory$1;-><init>(Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;Lcom/discord/stores/StoreSearch$SearchTarget;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "backingCache\n        .ge\u2026{ it.find(searchTarget) }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public persistQuery(Lcom/discord/stores/StoreSearch$SearchTarget;Ljava/util/List;)V
@@ -510,11 +506,13 @@
         }
     .end annotation
 
-    const/4 v6, 0x0
+    const-string v0, "searchTarget"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "query"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;->backingCache:Lcom/discord/utilities/persister/Persister;
 
@@ -532,7 +530,7 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache$persistQuery$1;-><init>(Lcom/discord/utilities/search/history/MGPreferenceSearchHistoryCache;Lcom/discord/stores/StoreSearch$SearchTarget;Ljava/util/List;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -550,10 +548,20 @@
 
     and-int/lit8 p2, p2, 0x20
 
-    new-instance p2, Lf/a/b/c0;
+    const-string p2, "onNext"
+
+    invoke-static {v4, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "persist query"
 
+    const-string p2, "errorTag"
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lf/a/b/e0;
+
+    const/4 v6, 0x0
+
     move-object v0, p2
 
     move-object v1, v6
@@ -562,23 +570,9 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/e0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali
index aa8796742a..de43e18d5d 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/search/network/SearchFetcher$getRestObservable$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SearchFetcher.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/concurrent/atomic/AtomicInteger;",
         "Ljava/lang/Integer;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,9 +59,9 @@
 .method public final invoke(Ljava/util/concurrent/atomic/AtomicInteger;)Ljava/lang/Integer;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getNullIfZero"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -71,17 +71,15 @@
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "$this$getNullIfZero"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali
index b63eeb258b..1b90df1e75 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$2.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Func0<",
         "Lrx/Observable<",
-        "TT;>;>;"
+        "Ljava/lang/Integer;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +80,9 @@
 
     move-result-object v0
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali
index 87dc0dbdb4..342c6e83f2 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.smali
@@ -3,7 +3,7 @@
 .source "SearchFetcher.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelSearchResponse;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,6 +87,7 @@
             "Ljava/lang/Integer;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelSearchResponse;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali
index 2ad293d451..db90ac9b4a 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$1.smali
@@ -57,7 +57,7 @@
 
     const-string v1, "searchResponse"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/utilities/search/network/SearchFetcher;->access$isIndexing(Lcom/discord/utilities/search/network/SearchFetcher;Lcom/discord/models/domain/ModelSearchResponse;)Z
 
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali
index 6a19e531ad..a3a3f5f363 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2$1.smali
@@ -3,7 +3,7 @@
 .source "SearchFetcher.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Void;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Void;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Long;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali
index 8c8afcf3a9..a211d7fe8c 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.smali
@@ -3,7 +3,7 @@
 .source "SearchFetcher.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lrx/Observable<",
         "+",
         "Ljava/lang/Void;",
@@ -74,8 +74,7 @@
             "Ljava/lang/Void;",
             ">;)",
             "Lrx/Observable<",
-            "Ljava/lang/Long;",
-            ">;"
+            "*>;"
         }
     .end annotation
 
@@ -83,7 +82,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$2$1;-><init>(Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$2;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali
index 323fa207b1..53ce594034 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher$makeQuery$3.smali
@@ -3,7 +3,7 @@
 .source "SearchFetcher.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelSearchResponse;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,15 +49,21 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelSearchResponse;)Ljava/lang/Boolean;
+    .locals 2
 
-    check-cast p1, Lcom/discord/models/domain/ModelSearchResponse;
+    iget-object v0, p0, Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$3;->this$0:Lcom/discord/utilities/search/network/SearchFetcher;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$3;->call(Lcom/discord/models/domain/ModelSearchResponse;)Z
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lcom/discord/utilities/search/network/SearchFetcher;->access$isIndexing(Lcom/discord/utilities/search/network/SearchFetcher;Lcom/discord/models/domain/ModelSearchResponse;)Z
 
     move-result p1
 
+    xor-int/lit8 p1, p1, 0x1
+
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -65,20 +71,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelSearchResponse;)Z
-    .locals 2
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    iget-object v0, p0, Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$3;->this$0:Lcom/discord/utilities/search/network/SearchFetcher;
+    check-cast p1, Lcom/discord/models/domain/ModelSearchResponse;
 
-    const-string v1, "it"
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$3;->call(Lcom/discord/models/domain/ModelSearchResponse;)Ljava/lang/Boolean;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object p1
 
-    invoke-static {v0, p1}, Lcom/discord/utilities/search/network/SearchFetcher;->access$isIndexing(Lcom/discord/utilities/search/network/SearchFetcher;Lcom/discord/models/domain/ModelSearchResponse;)Z
-
-    move-result p1
-
-    xor-int/lit8 p1, p1, 0x1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
index 5152e482f6..affb4ba35a 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchFetcher.smali
@@ -75,9 +75,9 @@
 
     invoke-direct {v0, p0}, Lcom/discord/utilities/search/network/SearchFetcher$getRestObservable$2;-><init>(Lcom/discord/utilities/search/network/SearchFetcher;)V
 
-    new-instance v1, Lr0/l/a/m;
+    new-instance v1, Ls0/l/a/m;
 
-    invoke-direct {v1, v0}, Lr0/l/a/m;-><init>(Lrx/functions/Func0;)V
+    invoke-direct {v1, v0}, Ls0/l/a/m;-><init>(Lrx/functions/Func0;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -97,7 +97,7 @@
 
     invoke-direct/range {v1 .. v7}, Lcom/discord/utilities/search/network/SearchFetcher$getRestObservable$3;-><init>(Lcom/discord/stores/StoreSearch$SearchTarget;Ljava/lang/Long;Ljava/util/Map;JLcom/discord/utilities/search/network/SearchQuery;)V
 
-    invoke-virtual {v0, v8}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v8}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -105,7 +105,7 @@
 
     const/4 p3, 0x1
 
-    invoke-static {p2, p3}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {p2, p3}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -115,7 +115,7 @@
 
     const-string p2, "Observable\n        .defe\u2026ormers.restSubscribeOn())"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -207,11 +207,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchTarget"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "searchQuery"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -247,13 +249,13 @@
 
     invoke-direct {p1, v0}, Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$2;-><init>(Ljava/util/concurrent/atomic/AtomicLong;)V
 
-    new-instance v3, Lr0/l/e/e$c;
+    new-instance v3, Ls0/l/e/e$c;
 
-    invoke-direct {v3, p1}, Lr0/l/e/e$c;-><init>(Lr0/k/b;)V
+    invoke-direct {v3, p1}, Ls0/l/e/e$c;-><init>(Ls0/k/b;)V
 
-    new-instance p1, Lr0/l/a/b0;
+    new-instance p1, Ls0/l/a/b0;
 
-    invoke-static {}, Lr0/p/a;->e()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->e()Lrx/Scheduler;
 
     move-result-object v6
 
@@ -263,7 +265,7 @@
 
     move-object v1, p1
 
-    invoke-direct/range {v1 .. v6}, Lr0/l/a/b0;-><init>(Lrx/Observable;Lr0/k/b;ZZLrx/Scheduler;)V
+    invoke-direct/range {v1 .. v6}, Ls0/l/a/b0;-><init>(Lrx/Observable;Ls0/k/b;ZZLrx/Scheduler;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -273,27 +275,13 @@
 
     invoke-direct {p2, p0}, Lcom/discord/utilities/search/network/SearchFetcher$makeQuery$3;-><init>(Lcom/discord/utilities/search/network/SearchFetcher;)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->X(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->X(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "getRestObservable(search\u2026ntil { !it.isIndexing() }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchTarget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali b/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali
index cfacefa1a6..540b7b19b6 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchQuery$Builder.smali
@@ -70,13 +70,15 @@
 
 # virtual methods
 .method public final appendParam(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "paramKey"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "param"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/search/network/SearchQuery$Builder;->paramsMap:Ljava/util/HashMap;
 
@@ -96,10 +98,6 @@
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     :goto_0
-    const-string v1, "paramsMap[paramKey] ?: ArrayList()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     iget-object p2, p0, Lcom/discord/utilities/search/network/SearchQuery$Builder;->paramsMap:Ljava/util/HashMap;
@@ -107,20 +105,6 @@
     invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p1, "param"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "paramKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final buildFrom(Ljava/util/List;Lcom/discord/utilities/search/validation/SearchData;)Lcom/discord/utilities/search/network/SearchQuery;
@@ -138,16 +122,20 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "queryNodes"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "searchData"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     :goto_0
     move-object v1, v0
 
@@ -190,7 +178,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v1}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {v4, v1}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -231,9 +219,9 @@
 
     const-string p2, "contentBuilder.toString()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -285,20 +273,6 @@
     invoke-direct {p1, p2, v0}, Lcom/discord/utilities/search/network/SearchQuery;-><init>(Ljava/util/Map;Z)V
 
     return-object p1
-
-    :cond_7
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "queryNodes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setIncludeNsfw(Z)Lcom/discord/utilities/search/network/SearchQuery$Builder;
diff --git a/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali b/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali
index d2900af14d..e5e8c45e8b 100644
--- a/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/SearchQuery.smali
@@ -29,7 +29,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/Map;Z)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -42,7 +42,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,15 +53,6 @@
     iput-boolean p2, p0, Lcom/discord/utilities/search/network/SearchQuery;->includeNsfw:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali b/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali
index 85aaa2d422..ec5ebd4c96 100644
--- a/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali
+++ b/com.discord/smali/com/discord/utilities/search/network/state/SearchState.smali
@@ -25,7 +25,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZI)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -38,7 +38,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "queryFetchState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,15 +55,6 @@
     iput p5, p0, Lcom/discord/utilities/search/network/state/SearchState;->totalResults:I
 
     return-void
-
-    :cond_0
-    const-string p1, "queryFetchState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -258,34 +251,27 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "queryFetchState"
 
-    new-instance v6, Lcom/discord/utilities/search/network/state/SearchState;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/utilities/search/network/state/SearchState;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-object v2, p2
+    move-object v2, p1
 
-    move-object v3, p3
+    move-object v3, p2
 
-    move v4, p4
+    move-object v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/search/network/state/SearchState;-><init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZI)V
+    move v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/search/network/state/SearchState;-><init>(Lcom/discord/utilities/search/network/state/QueryFetchState;Lcom/discord/utilities/search/network/SearchQuery;Ljava/util/List;ZI)V
 
-    :cond_0
-    const-string p1, "queryFetchState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -303,7 +289,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/network/state/SearchState;->queryFetchState:Lcom/discord/utilities/search/network/state/QueryFetchState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -313,7 +299,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/network/state/SearchState;->searchQuery:Lcom/discord/utilities/search/network/SearchQuery;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -323,7 +309,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/network/state/SearchState;->hits:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali b/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali
index ac3e55fff8..a86b30ed35 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/QueryNode$Preprocessor.smali
@@ -125,7 +125,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v2}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object v2
 
@@ -164,11 +164,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$preprocess"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "searchData"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -232,18 +234,4 @@
     invoke-direct {p2, p1}, Lcom/discord/utilities/search/query/node/QueryNode$Preprocessor;->consolidateContentNodes(Ljava/util/List;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "$this$preprocess"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali
index c08fcef0f9..fb8e045c18 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/AnswerNode.smali
@@ -31,11 +31,13 @@
 .method public render(Landroid/text/SpannableStringBuilder;Landroid/content/Context;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "renderContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/search/query/node/QueryNode;->getText()Ljava/lang/String;
 
@@ -50,20 +52,6 @@
     invoke-virtual {p1, p2}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
 
     return-void
-
-    :cond_0
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali
index 8f6cd45b5a..c55b1d5595 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/ChannelNode.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/search/query/node/answer/AnswerNode;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/search/query/node/answer/ChannelNode;->channelName:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/query/node/answer/ChannelNode;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/utilities/search/query/node/answer/ChannelNode;
@@ -59,22 +52,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/utilities/search/query/node/answer/ChannelNode;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/answer/ChannelNode;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/search/query/node/answer/ChannelNode;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -92,7 +78,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/query/node/answer/ChannelNode;->channelName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -183,7 +169,9 @@
 .method public isValid(Lcom/discord/utilities/search/validation/SearchData;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchData"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/search/validation/SearchData;->getChannelNameIndex()Ljava/util/Map;
 
@@ -196,15 +184,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
@@ -230,17 +209,19 @@
 .method public updateQuery(Lcom/discord/utilities/search/network/SearchQuery$Builder;Lcom/discord/utilities/search/validation/SearchData;Lcom/discord/utilities/search/query/FilterType;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "queryBuilder"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "searchData"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/search/query/node/answer/ChannelNode;->getValidFilters()Ljava/util/Set;
 
     move-result-object v0
 
-    invoke-static {v0, p3}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {v0, p3}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -277,18 +258,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "queryBuilder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali
index d3d0d3b956..52ba33dccf 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption$Companion.smali
@@ -36,17 +36,19 @@
 .method public final getOptionFromString(Ljava/lang/String;Lcom/discord/utilities/search/strings/SearchStringProvider;)Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "match"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2}, Lcom/discord/utilities/search/strings/SearchStringProvider;->getLinkAnswerString()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -61,7 +63,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -76,7 +78,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -91,7 +93,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -106,7 +108,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -121,7 +123,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -144,18 +146,4 @@
     invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p2
-
-    :cond_6
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "match"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali
index ffa6c4bb13..8d2d01648c 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasAnswerOption.smali
@@ -97,7 +97,7 @@
 
     const/4 v3, 0x3
 
-    const-string v4, "video"
+    const-string/jumbo v4, "video"
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
@@ -196,7 +196,9 @@
 .method public final getLocalizedInputText(Lcom/discord/utilities/search/strings/SearchStringProvider;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p1, :cond_6
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Enum;->ordinal()I
 
@@ -272,15 +274,6 @@
 
     :goto_0
     return-object p1
-
-    :cond_6
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getRestParamValue()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali
index 4f260ae5c2..13c5e35eda 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/HasNode.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "hasAnswerOption"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/search/query/node/answer/AnswerNode;-><init>()V
 
@@ -26,30 +28,18 @@
     iput-object p2, p0, Lcom/discord/utilities/search/query/node/answer/HasNode;->text:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "hasAnswerOption"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/utilities/search/strings/SearchStringProvider;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "match"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;->Companion:Lcom/discord/utilities/search/query/node/answer/HasAnswerOption$Companion;
 
@@ -60,20 +50,6 @@
     invoke-direct {p0, p2, p1}, Lcom/discord/utilities/search/query/node/answer/HasNode;-><init>(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "match"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final component1()Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;
@@ -125,31 +101,19 @@
 .method public final copy(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;Ljava/lang/String;)Lcom/discord/utilities/search/query/node/answer/HasNode;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "hasAnswerOption"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/answer/HasNode;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/search/query/node/answer/HasNode;-><init>(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "hasAnswerOption"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -167,7 +131,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/query/node/answer/HasNode;->hasAnswerOption:Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -181,7 +145,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -267,22 +231,15 @@
 .end method
 
 .method public isValid(Lcom/discord/utilities/search/validation/SearchData;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchData"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
@@ -322,17 +279,19 @@
 .method public updateQuery(Lcom/discord/utilities/search/network/SearchQuery$Builder;Lcom/discord/utilities/search/validation/SearchData;Lcom/discord/utilities/search/query/FilterType;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "queryBuilder"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "searchData"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/search/query/node/answer/HasNode;->getValidFilters()Ljava/util/Set;
 
     move-result-object p2
 
-    invoke-static {p2, p3}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -352,18 +311,4 @@
     invoke-virtual {p1, p3, p2}, Lcom/discord/utilities/search/network/SearchQuery$Builder;->appendParam(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "queryBuilder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/answer/UserNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/UserNode.smali
index afa2086c79..ae2f0c0035 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/answer/UserNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/answer/UserNode.smali
@@ -11,9 +11,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/search/query/node/answer/AnswerNode;-><init>()V
 
@@ -22,15 +24,6 @@
     iput p2, p0, Lcom/discord/utilities/search/query/node/answer/UserNode;->discriminator:I
 
     return-void
-
-    :cond_0
-    const-string p1, "userName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component2()I
@@ -78,22 +71,15 @@
 .method public final copy(Ljava/lang/String;I)Lcom/discord/utilities/search/query/node/answer/UserNode;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "userName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/answer/UserNode;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/search/query/node/answer/UserNode;-><init>(Ljava/lang/String;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "userName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -111,7 +97,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/query/node/answer/UserNode;->userName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -178,7 +164,7 @@
 
     const-string v2, "java.lang.String.format(format, *args)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -260,7 +246,9 @@
 .method public isValid(Lcom/discord/utilities/search/validation/SearchData;)Z
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "searchData"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/search/query/node/answer/UserNode;->userName:Ljava/lang/String;
 
@@ -281,15 +269,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
@@ -323,11 +302,13 @@
 .method public updateQuery(Lcom/discord/utilities/search/network/SearchQuery$Builder;Lcom/discord/utilities/search/validation/SearchData;Lcom/discord/utilities/search/query/FilterType;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "queryBuilder"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "searchData"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p3, :cond_0
 
@@ -371,18 +352,4 @@
     invoke-virtual {p1, p3, p2}, Lcom/discord/utilities/search/network/SearchQuery$Builder;->appendParam(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "queryBuilder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali
index 0d412f699e..a8270f7ad7 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/content/ContentNode.smali
@@ -11,11 +11,13 @@
 .method public constructor <init>(Lcom/discord/utilities/search/query/node/content/ContentNode;Lcom/discord/utilities/search/query/node/content/ContentNode;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "node1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "node2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -40,41 +42,20 @@
     invoke-direct {p0, p1}, Lcom/discord/utilities/search/query/node/content/ContentNode;-><init>(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "node2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "node1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/lang/CharSequence;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/search/query/node/QueryNode;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/search/query/node/content/ContentNode;->content:Ljava/lang/CharSequence;
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/query/node/content/ContentNode;Ljava/lang/CharSequence;ILjava/lang/Object;)Lcom/discord/utilities/search/query/node/content/ContentNode;
@@ -107,22 +88,15 @@
 .method public final copy(Ljava/lang/CharSequence;)Lcom/discord/utilities/search/query/node/content/ContentNode;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/content/ContentNode;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/search/query/node/content/ContentNode;-><init>(Ljava/lang/CharSequence;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +114,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/query/node/content/ContentNode;->content:Ljava/lang/CharSequence;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -203,11 +177,13 @@
 .method public render(Landroid/text/SpannableStringBuilder;Landroid/content/Context;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "renderContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lcom/discord/utilities/search/query/node/content/ContentNode;->content:Ljava/lang/CharSequence;
 
@@ -220,20 +196,6 @@
     invoke-virtual {p1, p2}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
 
     return-void
-
-    :cond_0
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali
index 0f8a3184e5..b3e7b3d7d2 100644
--- a/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali
+++ b/com.discord/smali/com/discord/utilities/search/query/node/filter/FilterNode.smali
@@ -13,11 +13,13 @@
 .method public constructor <init>(Lcom/discord/utilities/search/query/FilterType;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "filterType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/search/query/node/QueryNode;-><init>()V
 
@@ -26,20 +28,6 @@
     iput-object p2, p0, Lcom/discord/utilities/search/query/node/filter/FilterNode;->text:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "filterType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/query/node/filter/FilterNode;Lcom/discord/utilities/search/query/FilterType;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/utilities/search/query/node/filter/FilterNode;
@@ -91,31 +79,19 @@
 .method public final copy(Lcom/discord/utilities/search/query/FilterType;Ljava/lang/String;)Lcom/discord/utilities/search/query/node/filter/FilterNode;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "filterType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/query/node/filter/FilterNode;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/search/query/node/filter/FilterNode;-><init>(Lcom/discord/utilities/search/query/FilterType;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "filterType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -133,7 +109,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/query/node/filter/FilterNode;->filterType:Lcom/discord/utilities/search/query/FilterType;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -147,7 +123,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -223,15 +199,17 @@
 .method public render(Landroid/text/SpannableStringBuilder;Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "renderContext"
 
-    const v1, 0x7f090001
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2, v1}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface;
+    const v0, 0x7f090001
+
+    invoke-static {p2, v0}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface;
 
     move-result-object p2
 
@@ -241,7 +219,12 @@
 
     invoke-direct {v0, p2}, Lcom/discord/utilities/spans/TypefaceSpanCompat;-><init>(Landroid/graphics/Typeface;)V
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I
 
     move-result p2
@@ -275,20 +258,6 @@
     invoke-virtual {p1, v0, p2, v1, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-void
-
-    :cond_1
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)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 8a09d4f966..d28d091f17 100644
--- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
+++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
@@ -32,11 +32,13 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const v0, 0x7f1213fd
+    const v0, 0x7f121427
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -44,11 +46,11 @@
 
     const-string v1, "context.getString(R.string.search_filter_from)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String;
 
-    const v0, 0x7f1213ff
+    const v0, 0x7f121429
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -56,11 +58,11 @@
 
     const-string v1, "context.getString(R.string.search_filter_in)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String;
 
-    const v0, 0x7f121401
+    const v0, 0x7f12142b
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -68,11 +70,11 @@
 
     const-string v1, "context.getString(R.string.search_filter_mentions)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String;
 
-    const v0, 0x7f1213fe
+    const v0, 0x7f121428
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -80,11 +82,11 @@
 
     const-string v1, "context.getString(R.string.search_filter_has)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String;
 
-    const v0, 0x7f1213e8
+    const v0, 0x7f121412
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -92,11 +94,11 @@
 
     const-string v1, "context.getString(R.string.search_answer_has_link)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f1213e6
+    const v0, 0x7f121410
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -104,11 +106,11 @@
 
     const-string v1, "context.getString(R.stri\u2026.search_answer_has_embed)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f1213e5
+    const v0, 0x7f12140f
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -116,11 +118,11 @@
 
     const-string v1, "context.getString(R.stri\u2026ch_answer_has_attachment)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f1213ea
+    const v0, 0x7f121414
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -128,11 +130,11 @@
 
     const-string v1, "context.getString(R.stri\u2026.search_answer_has_video)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f1213e7
+    const v0, 0x7f121411
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -140,11 +142,11 @@
 
     const-string v1, "context.getString(R.stri\u2026.search_answer_has_image)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String;
 
-    const v0, 0x7f1213e9
+    const v0, 0x7f121413
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -152,20 +154,11 @@
 
     const-string v0, "context.getString(R.stri\u2026.search_answer_has_sound)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->soundAnswerString:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali
index 5577f3b5f7..c5b36be90b 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$sam$rx_functions_Func1$0.smali
@@ -3,7 +3,7 @@
 .source "SearchSuggestionEngine.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali
index 2e530439a6..91ceef42cb 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1.smali
@@ -3,7 +3,7 @@
 .source "SearchSuggestionEngine.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/CharSequence;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali
index 7d841da29c..432c0d4f38 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "SearchSuggestionEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/CharSequence;",
         "Ljava/lang/Boolean;",
@@ -45,56 +45,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x1
+    const-class v2, Lk0/u/e;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x1
+
+    const-string v3, "isNotEmpty"
+
+    const-string v4, "isNotEmpty(Ljava/lang/CharSequence;)Z"
+
+    const/4 v5, 0x1
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "isNotEmpty"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 3
-
-    const-class v0, Lj0/t/e;
-
-    sget-object v1, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    if-eqz v1, :cond_0
-
-    new-instance v1, Lj0/n/c/o;
-
-    const-string v2, "app_productionDiscordExternalRelease"
-
-    invoke-direct {v1, v0, v2}, Lj0/n/c/o;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
-
-    return-object v1
-
-    :cond_0
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "isNotEmpty(Ljava/lang/CharSequence;)Z"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -112,9 +83,11 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
@@ -131,13 +104,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3.smali
index a65403987e..d53ab1c815 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SearchSuggestionEngine.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
index cbf17d97d3..777ed50d07 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/SearchSuggestionEngine.smali
@@ -6,11 +6,9 @@
 # static fields
 .field public static final INSTANCE:Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;
 
-# The value of this static final field might be set in the static constructor
-.field public static final MAX_ENTRY_TYPE_COUNT:I = 0xa
+.field public static final MAX_ENTRY_TYPE_COUNT:I
 
-# The value of this static final field might be set in the static constructor
-.field public static final MAX_USER_SORTING_THRESHOLD:I = 0x64
+.field public static final MAX_USER_SORTING_THRESHOLD:I
 
 .field public static final membersRequestSubject:Lrx/subjects/SerializedSubject;
     .annotation system Ldalvik/annotation/Signature;
@@ -93,7 +91,7 @@
 
     if-eq p2, v0, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     return-object p1
 
@@ -185,7 +183,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v1, p1}, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion;->canComplete(Ljava/lang/String;Ljava/lang/CharSequence;)Z
 
@@ -204,9 +202,9 @@
 
     const-string p3, "ModelChannel.getSortByNameAndType()"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2, p1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p2, p1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -243,7 +241,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -258,7 +256,7 @@
     :cond_5
     sget p1, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->MAX_ENTRY_TYPE_COUNT:I
 
-    invoke-static {p2, p1}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {p2, p1}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
@@ -289,7 +287,7 @@
     return-object v1
 
     :cond_0
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -507,7 +505,7 @@
 
     if-eq p2, v0, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     return-object p1
 
@@ -658,7 +656,7 @@
     return-object v1
 
     :cond_0
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -680,7 +678,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -691,11 +689,11 @@
     goto :goto_0
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.CharSequence"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -727,15 +725,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "input"
 
-    if-eqz p0, :cond_5
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_4
+    const-string v0, "searchData"
 
-    if-eqz p2, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "recentQueries"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -829,34 +833,6 @@
 
     :cond_1
     return-object v0
-
-    :cond_2
-    const-string p0, "recentQueries"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "searchStringProvider"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "searchData"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "input"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getUserSuggestions(Ljava/lang/CharSequence;Lcom/discord/utilities/search/query/FilterType;Ljava/util/Map;)Ljava/util/Collection;
@@ -888,7 +864,7 @@
 
     if-eq v1, v2, :cond_0
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     return-object v0
 
@@ -903,9 +879,9 @@
     :goto_0
     sget-object v3, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->membersRequestSubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v3, v3, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v3, v3, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v3, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v3, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     new-instance v11, Ljava/util/TreeSet;
 
@@ -990,9 +966,9 @@
 
     sget-object v3, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->Companion:Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$Companion;
 
-    const-string v8, "username"
+    const-string/jumbo v8, "username"
 
-    invoke-static {v4, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, v4, v5, v9, v0}, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$Companion;->canComplete(Ljava/lang/String;ILjava/lang/String;Ljava/lang/CharSequence;)Z
 
@@ -1047,7 +1023,7 @@
     :cond_4
     sget v0, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;->MAX_ENTRY_TYPE_COUNT:I
 
-    invoke-static {v11, v0}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v11, v0}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object v0
 
@@ -1069,7 +1045,7 @@
 
     sget-object v1, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1;->INSTANCE:Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine$setupMemberRequestSubscription$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1084,9 +1060,9 @@
     move-object v1, v2
 
     :cond_0
-    check-cast v1, Lr0/k/b;
+    check-cast v1, Ls0/k/b;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1096,7 +1072,7 @@
 
     const-string v0, "membersRequestSubject\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/utilities/search/suggestion/SearchSuggestionEngine;
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali
index 48c0b03266..a7428cd49c 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion$Companion.smali
@@ -36,11 +36,13 @@
 .method public final canComplete(Ljava/lang/String;Ljava/lang/CharSequence;)Z
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "channelName"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "currentInput"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
 
@@ -70,6 +72,10 @@
 
     if-ne v0, v1, :cond_2
 
+    const-string v0, "$this$drop"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
 
     move-result v0
@@ -91,23 +97,9 @@
     move-result-object p2
 
     :cond_2
-    invoke-static {p1, p2, v2}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {p1, p2, v2}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result p1
 
     return p1
-
-    :cond_3
-    const-string p1, "currentInput"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali
index af87cbe8a0..a482b1ba58 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/ChannelSuggestion.smali
@@ -42,9 +42,11 @@
 .end method
 
 .method public constructor <init>(Ljava/lang/String;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,15 +59,6 @@
     iput-object p1, p0, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;->category:Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;Ljava/lang/String;JILjava/lang/Object;)Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
@@ -113,22 +106,15 @@
 .method public final copy(Ljava/lang/String;J)Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;-><init>(Ljava/lang/String;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -146,7 +132,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;->channelName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali
index e564c8c453..5a27b560e9 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion.smali
@@ -107,13 +107,17 @@
 .method public final canComplete(Ljava/lang/CharSequence;Lcom/discord/utilities/search/query/FilterType;Lcom/discord/utilities/search/strings/SearchStringProvider;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "currentInput"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "filterType"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p3}, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion$Companion;->getStringRepresentation(Lcom/discord/utilities/search/query/FilterType;Lcom/discord/utilities/search/strings/SearchStringProvider;)Ljava/lang/String;
 
@@ -123,30 +127,9 @@
 
     const/4 v0, 0x2
 
-    invoke-static {p2, p1, p3, v0}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p2, p1, p3, v0}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "filterType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "currentInput"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali
index c914d6ef56..8266da554e 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/FilterSuggestion.smali
@@ -40,9 +40,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/utilities/search/query/FilterType;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "filterType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,15 +55,6 @@
     iput-object p1, p0, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;->category:Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
     return-void
-
-    :cond_0
-    const-string p1, "filterType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;Lcom/discord/utilities/search/query/FilterType;ILjava/lang/Object;)Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
@@ -94,22 +87,15 @@
 .method public final copy(Lcom/discord/utilities/search/query/FilterType;)Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "filterType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;-><init>(Lcom/discord/utilities/search/query/FilterType;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "filterType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -127,7 +113,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;->filterType:Lcom/discord/utilities/search/query/FilterType;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali
index accb1dcb09..72b42b3c3c 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion$Companion.smali
@@ -36,13 +36,17 @@
 .method public final canComplete(Ljava/lang/CharSequence;Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;Lcom/discord/utilities/search/strings/SearchStringProvider;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "currentInput"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "hasAnswerOption"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p3}, Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;->getLocalizedInputText(Lcom/discord/utilities/search/strings/SearchStringProvider;)Ljava/lang/String;
 
@@ -52,30 +56,9 @@
 
     const/4 v0, 0x2
 
-    invoke-static {p2, p1, p3, v0}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p2, p1, p3, v0}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "hasAnswerOption"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "currentInput"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali
index 76f7de799b..9aa265d41b 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/HasSuggestion.smali
@@ -40,9 +40,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "hasAnswerOption"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,15 +55,6 @@
     iput-object p1, p0, Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;->category:Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
     return-void
-
-    :cond_0
-    const-string p1, "hasAnswerOption"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;ILjava/lang/Object;)Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
@@ -94,22 +87,15 @@
 .method public final copy(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;)Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "hasAnswerOption"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;-><init>(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "hasAnswerOption"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -127,7 +113,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;->hasAnswerOption:Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali
index ac860914bc..f594f38ead 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/RecentQuerySuggestion.smali
@@ -22,7 +22,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -33,7 +33,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "query"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,15 +46,6 @@
     iput-object p1, p0, Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;->category:Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
     return-void
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
@@ -103,22 +96,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "query"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +122,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;->query:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali
index e0aac4a805..8288c019f7 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion$Companion.smali
@@ -71,11 +71,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "username"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_4
+    const-string v0, "currentInput"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$Companion;->getUsernameWithDiscriminator(Ljava/lang/String;I)Ljava/lang/String;
 
@@ -93,11 +95,11 @@
 
     const-string p4, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {p2, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p4, 0x1
 
-    invoke-static {p1, p2, p4}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {p1, p2, p4}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result p1
 
@@ -107,7 +109,7 @@
 
     if-eqz p3, :cond_0
 
-    invoke-static {p3, p2, p4}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {p3, p2, p4}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result p1
 
@@ -129,25 +131,11 @@
     return p4
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_4
-    const-string p1, "currentInput"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali
index b94951195b..26f51b459e 100644
--- a/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali
+++ b/com.discord/smali/com/discord/utilities/search/suggestion/entries/UserSuggestion.smali
@@ -66,11 +66,13 @@
 .method public constructor <init>(Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userName"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_2
+    const-string v0, "targetType"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -126,20 +128,6 @@
     iput-object p1, p0, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->usernameWithDiscriminator:Ljava/lang/String;
 
     return-void
-
-    :cond_2
-    const-string p1, "targetType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "userName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -257,7 +245,9 @@
 .method public compareTo(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)I
     .locals 2
 
-    if-eqz p1, :cond_3
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->nickname:Ljava/lang/String;
 
@@ -298,15 +288,6 @@
 
     :goto_2
     return v0
-
-    :cond_3
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic compareTo(Ljava/lang/Object;)I
@@ -372,18 +353,22 @@
 .method public final copy(Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;)Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userName"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p7, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "targetType"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move v3, p2
 
     move-wide v4, p3
@@ -392,25 +377,9 @@
 
     move-object v7, p6
 
-    move-object/from16 v8, p7
-
     invoke-direct/range {v1 .. v8}, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;-><init>(Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "targetType"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "userName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -428,7 +397,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->userName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -452,7 +421,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->avatarUrl:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -462,7 +431,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->nickname:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -472,7 +441,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->targetType:Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1.smali
index 586a53baa5..ae09e93697 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SearchData.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,32 +73,37 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$process"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;
+    new-instance v0, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;
 
-    iget-object v2, p0, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->$nicknames:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->$nicknames:Ljava/util/Map;
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-static {p1, v2}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p1, v1}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+    check-cast v1, Lcom/discord/models/domain/ModelChannel$RecipientNick;
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getNick()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getNick()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
+
+    goto :goto_0
 
     :cond_0
-    invoke-direct {v1, p1, v0}, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)V
+    const/4 v1, 0x0
 
-    iget-object v0, p0, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->$users:Ljava/util/HashMap;
+    :goto_0
+    invoke-direct {v0, p1, v1}, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->$users:Ljava/util/HashMap;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -108,7 +113,7 @@
 
     move-result-object v2
 
-    invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p0, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->$usernameAndDiscriminatorIndex:Ljava/util/HashMap;
 
@@ -129,11 +134,4 @@
     invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p1, "$this$process"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali
index 7189d14468..18fce0c007 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData$Builder.smali
@@ -64,9 +64,9 @@
 .method public final buildForChannel(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/search/validation/SearchData;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "meUser"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -74,7 +74,12 @@
 
     move-result-object v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     new-instance v4, Ljava/util/HashMap;
 
     invoke-direct {v4}, Ljava/util/HashMap;-><init>()V
@@ -99,7 +104,7 @@
 
     move-result-object p1
 
-    :goto_0
+    :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
@@ -114,7 +119,7 @@
 
     invoke-virtual {v1, v0}, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     invoke-virtual {v1, p2}, Lcom/discord/utilities/search/validation/SearchData$Builder$buildForChannel$1;->invoke(Lcom/discord/models/domain/ModelUser;)V
@@ -136,13 +141,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/utilities/search/validation/SearchData;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final buildForGuild(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/utilities/search/validation/SearchData;
@@ -173,15 +171,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildMembers"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "allUsers"
 
-    if-eqz p3, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_4
+    const-string v0, "guildSearchableChannels"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildChannelPermissions"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Ljava/util/HashMap;
 
@@ -214,7 +218,7 @@
 
     const-string v4, "channel.name"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -328,32 +332,4 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/search/validation/SearchData;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object p1
-
-    :cond_4
-    const-string p1, "guildChannelPermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "guildSearchableChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "allUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "guildMembers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali
index 546706d3a9..05fe023e90 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData$UserWithNickname.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;->nickname:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;
@@ -89,22 +82,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -132,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/validation/SearchData$UserWithNickname;->nickname:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali b/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali
index 9df9359af4..94db440acb 100644
--- a/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali
+++ b/com.discord/smali/com/discord/utilities/search/validation/SearchData.smali
@@ -123,17 +123,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "usernameAndDiscriminatorIndex"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "channelNameIndex"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string/jumbo v0, "users"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channels"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelPermissions"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -148,41 +156,6 @@
     iput-object p5, p0, Lcom/discord/utilities/search/validation/SearchData;->channelPermissions:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelPermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channelNameIndex"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "usernameAndDiscriminatorIndex"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -192,14 +165,14 @@
 
     if-eqz p7, :cond_0
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_0
     and-int/lit8 p7, p6, 0x2
 
     if-eqz p7, :cond_1
 
-    sget-object p2, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p2, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_1
     move-object p7, p2
@@ -208,7 +181,7 @@
 
     if-eqz p2, :cond_2
 
-    sget-object p3, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p3, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_2
     move-object v0, p3
@@ -217,7 +190,7 @@
 
     if-eqz p2, :cond_3
 
-    sget-object p4, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p4, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_3
     move-object v1, p4
@@ -226,7 +199,7 @@
 
     if-eqz p2, :cond_4
 
-    sget-object p5, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p5, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_4
     move-object v2, p5
@@ -430,17 +403,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "usernameAndDiscriminatorIndex"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "channelNameIndex"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string/jumbo v0, "users"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channels"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelPermissions"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/search/validation/SearchData;
 
@@ -459,41 +440,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/search/validation/SearchData;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channelPermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channelNameIndex"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "usernameAndDiscriminatorIndex"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -511,7 +457,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/validation/SearchData;->usernameAndDiscriminatorIndex:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -521,7 +467,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/validation/SearchData;->channelNameIndex:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -531,7 +477,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/validation/SearchData;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -541,7 +487,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/search/validation/SearchData;->channels:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -551,7 +497,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/search/validation/SearchData;->channelPermissions:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -625,7 +571,9 @@
 .method public final getUserId(Ljava/lang/String;I)Ljava/lang/Long;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "username"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/search/validation/SearchData;->usernameAndDiscriminatorIndex:Ljava/util/Map;
 
@@ -648,15 +596,6 @@
     check-cast p1, Ljava/lang/Long;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getUsers()Ljava/util/Map;
diff --git a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali
index 3b5db4c73d..4ad69c31f6 100644
--- a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali
+++ b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter$Item.smali
@@ -42,11 +42,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "title"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "creator"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,20 +57,6 @@
     iput-object p2, p0, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;->creator:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "creator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali
index 95493e5201..237fe9e657 100644
--- a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali
+++ b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager$Adapter.smali
@@ -36,11 +36,13 @@
 .method public varargs constructor <init>(Landroidx/fragment/app/FragmentManager;[Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "fm"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -53,20 +55,6 @@
     iput-object p1, p0, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fm"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -88,7 +76,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;->items:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v0, p1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -143,7 +131,7 @@
 
     iget-object v0, p0, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;->items:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v0, p1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali
index 49f9ce6e83..65f9ffb849 100644
--- a/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali
+++ b/com.discord/smali/com/discord/utilities/simple_pager/SimplePager.smali
@@ -35,9 +35,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/viewpager/widget/ViewPager;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -50,15 +52,6 @@
     iput-boolean p1, p0, Lcom/discord/utilities/simple_pager/SimplePager;->isScrollingEnabled:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -76,13 +69,13 @@
     return-void
 .end method
 
-.method public static synthetic keepAllPagesLoaded$annotations()V
+.method public static synthetic getKeepAllPagesLoaded$annotations()V
     .locals 0
 
     return-void
 .end method
 
-.method public static synthetic preserveSelectedPage$annotations()V
+.method public static synthetic getPreserveSelectedPage$annotations()V
     .locals 0
 
     return-void
@@ -125,7 +118,9 @@
 .method public onInterceptTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/utilities/simple_pager/SimplePager;->isScrollingEnabled:Z
 
@@ -146,15 +141,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onMeasure(II)V
@@ -194,7 +180,7 @@
 
     const-string v5, "child"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I
 
@@ -227,7 +213,9 @@
 .method public onTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/utilities/simple_pager/SimplePager;->isScrollingEnabled:Z
 
@@ -248,15 +236,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
diff --git a/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali b/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali
index 2f673926ea..6fda8d5d50 100644
--- a/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/BlockBackgroundSpan.smali
@@ -84,7 +84,9 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "canvas"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/spans/BlockBackgroundSpan;->rect:Landroid/graphics/RectF;
 
@@ -103,41 +105,38 @@
     invoke-virtual {p1, v0, v1, v1, v2}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public drawBackground(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;III)V
     .locals 0
 
-    const/4 p6, 0x0
+    const-string p6, "canvas"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string p6, "paint"
 
-    if-eqz p8, :cond_3
+    invoke-static {p2, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "text"
+
+    invoke-static {p8, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of p2, p8, Landroid/text/Spanned;
 
     if-nez p2, :cond_0
 
+    const/4 p2, 0x0
+
     goto :goto_0
 
     :cond_0
-    move-object p6, p8
+    move-object p2, p8
 
     :goto_0
-    check-cast p6, Landroid/text/Spanned;
+    check-cast p2, Landroid/text/Spanned;
 
-    if-eqz p6, :cond_2
+    if-eqz p2, :cond_2
 
     check-cast p8, Landroid/text/Spanned;
 
@@ -184,27 +183,6 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_4
-    const-string p1, "paint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_5
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
 .end method
 
 .method public final getLeftMargin()I
diff --git a/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali b/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
index 9b761ef933..9c95186b6c 100644
--- a/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/BulletSpan.smali
@@ -17,11 +17,9 @@
 # static fields
 .field public static final Companion:Lcom/discord/utilities/spans/BulletSpan$Companion;
 
-# The value of this static final field might be set in the static constructor
-.field public static final STANDARD_BULLET_RADIUS:I = 0x4
+.field public static final STANDARD_BULLET_RADIUS:I
 
-# The value of this static final field might be set in the static constructor
-.field public static final STANDARD_GAP_WIDTH:I = 0x2
+.field public static final STANDARD_GAP_WIDTH:I
 
 .field public static sBulletPath:Landroid/graphics/Path;
 
@@ -151,110 +149,108 @@
 
 # virtual methods
 .method public drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V
-    .locals 3
+    .locals 2
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "NewApi"
         }
     .end annotation
 
-    const/4 p6, 0x0
+    const-string p6, "c"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_9
+    const-string p6, "p"
 
-    if-eqz p8, :cond_8
+    invoke-static {p2, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p12, :cond_7
+    const-string p6, "text"
+
+    invoke-static {p8, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "l"
+
+    invoke-static {p12, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p8, Landroid/text/Spanned;
 
     invoke-interface {p8, p0}, Landroid/text/Spanned;->getSpanStart(Ljava/lang/Object;)I
 
-    move-result p8
+    move-result p6
 
-    if-ne p8, p9, :cond_6
+    if-ne p6, p9, :cond_4
 
     invoke-virtual {p2}, Landroid/graphics/Paint;->getStyle()Landroid/graphics/Paint$Style;
 
-    move-result-object p8
+    move-result-object p6
 
-    const/4 p9, 0x0
+    const/4 p8, 0x0
 
-    iget-boolean p10, p0, Lcom/discord/utilities/spans/BulletSpan;->mWantColor:Z
+    iget-boolean p9, p0, Lcom/discord/utilities/spans/BulletSpan;->mWantColor:Z
 
-    if-eqz p10, :cond_0
+    if-eqz p9, :cond_0
 
     invoke-virtual {p2}, Landroid/graphics/Paint;->getColor()I
 
-    move-result p9
+    move-result p8
 
-    iget p10, p0, Lcom/discord/utilities/spans/BulletSpan;->mColor:I
+    iget p9, p0, Lcom/discord/utilities/spans/BulletSpan;->mColor:I
 
-    invoke-virtual {p2, p10}, Landroid/graphics/Paint;->setColor(I)V
+    invoke-virtual {p2, p9}, Landroid/graphics/Paint;->setColor(I)V
 
     :cond_0
-    sget-object p10, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
+    sget-object p9, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
 
-    invoke-virtual {p2, p10}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
+    invoke-virtual {p2, p9}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->isHardwareAccelerated()Z
 
-    move-result p10
+    move-result p9
 
-    const/high16 p11, 0x40000000    # 2.0f
+    const/high16 p10, 0x40000000    # 2.0f
 
-    if-eqz p10, :cond_4
+    if-eqz p9, :cond_2
 
-    sget-object p10, Lcom/discord/utilities/spans/BulletSpan;->sBulletPath:Landroid/graphics/Path;
+    sget-object p9, Lcom/discord/utilities/spans/BulletSpan;->sBulletPath:Landroid/graphics/Path;
 
-    const p12, 0x3f99999a    # 1.2f
+    const p11, 0x3f99999a    # 1.2f
 
-    if-nez p10, :cond_2
+    if-nez p9, :cond_1
 
-    new-instance p10, Landroid/graphics/Path;
+    new-instance p9, Landroid/graphics/Path;
 
-    invoke-direct {p10}, Landroid/graphics/Path;-><init>()V
+    invoke-direct {p9}, Landroid/graphics/Path;-><init>()V
 
-    sput-object p10, Lcom/discord/utilities/spans/BulletSpan;->sBulletPath:Landroid/graphics/Path;
+    sput-object p9, Lcom/discord/utilities/spans/BulletSpan;->sBulletPath:Landroid/graphics/Path;
 
-    if-eqz p10, :cond_1
+    invoke-static {p9}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget v0, p0, Lcom/discord/utilities/spans/BulletSpan;->mBulletRadius:I
+    iget p12, p0, Lcom/discord/utilities/spans/BulletSpan;->mBulletRadius:I
 
-    int-to-float v0, v0
+    int-to-float p12, p12
 
-    mul-float v0, v0, p12
+    mul-float p12, p12, p11
 
-    sget-object v1, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
+    sget-object v0, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {p10, v2, v2, v0, v1}, Landroid/graphics/Path;->addCircle(FFFLandroid/graphics/Path$Direction;)V
-
-    goto :goto_0
+    invoke-virtual {p9, v1, v1, p12, v0}, Landroid/graphics/Path;->addCircle(FFFLandroid/graphics/Path$Direction;)V
 
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p6
-
-    :cond_2
-    :goto_0
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
     int-to-float p3, p3
 
     int-to-float p4, p4
 
-    mul-float p4, p4, p12
+    mul-float p4, p4, p11
 
-    iget p10, p0, Lcom/discord/utilities/spans/BulletSpan;->mBulletRadius:I
+    iget p9, p0, Lcom/discord/utilities/spans/BulletSpan;->mBulletRadius:I
 
-    int-to-float p10, p10
+    int-to-float p9, p9
 
-    mul-float p4, p4, p10
+    mul-float p4, p4, p9
 
     add-float/2addr p4, p3
 
@@ -262,29 +258,24 @@
 
     int-to-float p3, p5
 
-    div-float/2addr p3, p11
+    div-float/2addr p3, p10
 
     invoke-virtual {p1, p4, p3}, Landroid/graphics/Canvas;->translate(FF)V
 
     sget-object p3, Lcom/discord/utilities/spans/BulletSpan;->sBulletPath:Landroid/graphics/Path;
 
-    if-eqz p3, :cond_3
+    invoke-static {p3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1, p3, p2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->restore()V
 
-    goto :goto_1
+    goto :goto_0
 
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    :cond_2
+    iget p9, p0, Lcom/discord/utilities/spans/BulletSpan;->mBulletRadius:I
 
-    throw p6
-
-    :cond_4
-    iget p6, p0, Lcom/discord/utilities/spans/BulletSpan;->mBulletRadius:I
-
-    mul-int p4, p4, p6
+    mul-int p4, p4, p9
 
     add-int/2addr p4, p3
 
@@ -294,52 +285,24 @@
 
     int-to-float p4, p5
 
-    div-float/2addr p4, p11
+    div-float/2addr p4, p10
 
-    int-to-float p5, p6
+    int-to-float p5, p9
 
     invoke-virtual {p1, p3, p4, p5, p2}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
 
-    :goto_1
+    :goto_0
     iget-boolean p1, p0, Lcom/discord/utilities/spans/BulletSpan;->mWantColor:Z
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_3
 
-    invoke-virtual {p2, p9}, Landroid/graphics/Paint;->setColor(I)V
+    invoke-virtual {p2, p8}, Landroid/graphics/Paint;->setColor(I)V
 
-    :cond_5
-    invoke-virtual {p2, p8}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
+    :cond_3
+    invoke-virtual {p2, p6}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
 
-    :cond_6
+    :cond_4
     return-void
-
-    :cond_7
-    const-string p1, "l"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_8
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_9
-    const-string p1, "p"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_a
-    const-string p1, "c"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
 .end method
 
 .method public getLeadingMargin(Z)I
diff --git a/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali b/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali
index 917ab63f18..916b66a203 100644
--- a/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/ClickableSpan.smali
@@ -33,7 +33,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -52,7 +52,9 @@
         }
     .end annotation
 
-    if-eqz p4, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroid/text/style/ClickableSpan;-><init>()V
 
@@ -65,15 +67,6 @@
     iput-object p4, p0, Lcom/discord/utilities/spans/ClickableSpan;->onClickListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -96,58 +89,49 @@
 .method public onClick(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/spans/ClickableSpan;->onClickListener:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onLongPress(Landroid/view/View;)Lkotlin/Unit;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/spans/ClickableSpan;->onLongPress:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/utilities/spans/ClickableSpan;->onLongPress:Lkotlin/jvm/functions/Function1;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-interface {v1, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
-    move-object v0, p1
+    check-cast p1, Lkotlin/Unit;
 
-    check-cast v0, Lkotlin/Unit;
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
 
 .method public updateDrawState(Landroid/text/TextPaint;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "drawState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/utilities/spans/ClickableSpan;->underline:Z
 
@@ -165,13 +149,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "drawState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spans/QuoteSpan.smali b/com.discord/smali/com/discord/utilities/spans/QuoteSpan.smali
index ce76230e8d..83238cb27d 100644
--- a/com.discord/smali/com/discord/utilities/spans/QuoteSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/QuoteSpan.smali
@@ -102,15 +102,21 @@
 .method public drawLeadingMargin(Landroid/graphics/Canvas;Landroid/graphics/Paint;IIIIILjava/lang/CharSequence;IIZLandroid/text/Layout;)V
     .locals 0
 
-    const/4 p6, 0x0
+    const-string p6, "c"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string p6, "p"
 
-    if-eqz p8, :cond_5
+    invoke-static {p2, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p12, :cond_4
+    const-string p6, "text"
+
+    invoke-static {p8, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "layout"
+
+    invoke-static {p12, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of p6, p8, Landroid/text/Spanned;
 
@@ -179,34 +185,6 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "layout"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_5
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_6
-    const-string p1, "p"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
-
-    :cond_7
-    const-string p1, "c"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
 .end method
 
 .method public final getGapWidth()I
diff --git a/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali b/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali
index b31d98ab43..eb52309052 100644
--- a/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali
+++ b/com.discord/smali/com/discord/utilities/spans/TypefaceSpanCompat.smali
@@ -17,24 +17,17 @@
 
 # direct methods
 .method public constructor <init>(Landroid/graphics/Typeface;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "typeface"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroid/text/style/MetricAffectingSpan;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/spans/TypefaceSpanCompat;->typeface:Landroid/graphics/Typeface;
 
     return-void
-
-    :cond_0
-    const-string p1, "typeface"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final apply(Landroid/graphics/Paint;)V
@@ -94,39 +87,25 @@
 
 # virtual methods
 .method public updateDrawState(Landroid/text/TextPaint;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "drawState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/spans/TypefaceSpanCompat;->apply(Landroid/graphics/Paint;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "drawState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateMeasureState(Landroid/text/TextPaint;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "paint"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/spans/TypefaceSpanCompat;->apply(Landroid/graphics/Paint;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "paint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali b/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali
index 25bd41901f..87c54f2b7f 100644
--- a/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali
+++ b/com.discord/smali/com/discord/utilities/spans/VerticalPaddingSpan.smali
@@ -50,16 +50,20 @@
 .method public chooseHeight(Ljava/lang/CharSequence;IIIILandroid/graphics/Paint$FontMetricsInt;)V
     .locals 0
 
+    const-string p4, "text"
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "fontMetrics"
+
+    invoke-static {p6, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of p4, p1, Landroid/text/Spanned;
+
+    if-nez p4, :cond_0
+
     const/4 p4, 0x0
 
-    if-eqz p1, :cond_6
-
-    if-eqz p6, :cond_5
-
-    instance-of p5, p1, Landroid/text/Spanned;
-
-    if-nez p5, :cond_0
-
     goto :goto_0
 
     :cond_0
@@ -163,20 +167,6 @@
     :cond_4
     :goto_2
     return-void
-
-    :cond_5
-    const-string p1, "fontMetrics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_6
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
 
 .method public final getPaddingBottom()I
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali
index 3a14d987df..ead2c8cccf 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyApiClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
@@ -73,7 +75,7 @@
 
     const-string v0, "it.response"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -95,13 +97,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2.smali
index e6e91b96b7..7f429908e7 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyApiClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/spotify/ModelSpotifyTrack;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/spotify/ModelSpotifyTrack;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "track"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/spotify/SpotifyApiClient$fetchSpotifyTrack$2;->this$0:Lcom/discord/utilities/spotify/SpotifyApiClient;
 
@@ -88,13 +90,4 @@
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "track"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali
index 6bbfce2c74..f2a13a7990 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyApiClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1.smali
index 02a1281665..f2b422acba 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyApiClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelConnectionAccessToken;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali
index eebd29d985..ccfce10afc 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpotifyApiClient.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/spotify/SpotifyApiClient$refreshSpotifyToken$2;->this$0:Lcom/discord/utilities/spotify/SpotifyApiClient;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient;->access$setTokenSubscription$p(Lcom/discord/utilities/spotify/SpotifyApiClient;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
index f8530b08c6..1aea88d7d4 100644
--- a/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
+++ b/com.discord/smali/com/discord/utilities/spotify/SpotifyApiClient.smali
@@ -38,9 +38,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "clock"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,15 +61,6 @@
     iput-object p1, p0, Lcom/discord/utilities/spotify/SpotifyApiClient;->spotifyTrackSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getCachedTrack(Lcom/discord/utilities/spotify/SpotifyApiClient;Ljava/lang/String;)Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
@@ -303,7 +296,7 @@
 
     const-string v4, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v3, v0}, Lcom/discord/utilities/rest/RestAPI;->getConnectionAccessToken(Ljava/lang/String;Ljava/lang/String;)Lrx/Observable;
 
@@ -347,7 +340,15 @@
 
     and-int/lit8 v1, v2, 0x20
 
-    new-instance v1, Lf/a/b/a0;
+    const-string v1, "onNext"
+
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "errorClass"
+
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lf/a/b/c0;
 
     move-object v3, v1
 
@@ -355,7 +356,7 @@
 
     move-object v8, v9
 
-    invoke-direct/range {v3 .. v9}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v3 .. v9}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -363,11 +364,11 @@
     return-void
 
     :cond_3
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -452,15 +453,15 @@
 .method public final fetchSpotifyTrack(Ljava/lang/String;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "trackId"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient;->getCachedTrack(Ljava/lang/String;)Lcom/discord/models/domain/spotify/ModelSpotifyTrack;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     iget-object v0, p0, Lcom/discord/utilities/spotify/SpotifyApiClient;->spotifyTrackSubject:Lrx/subjects/BehaviorSubject;
 
@@ -473,15 +474,17 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/utilities/spotify/SpotifyApiClient;->spotifyTrackSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/utilities/spotify/SpotifyApiClient;->spotifyTrackSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/spotify/SpotifyApiClient;->isTokenExpiring()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/spotify/SpotifyApiClient;->setTrackIdToFetch(Ljava/lang/String;)V
 
@@ -490,21 +493,21 @@
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApiSpotify()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApiSpotify()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p1}, Lcom/discord/utilities/rest/RestAPI;->getSpotifyTrack(Ljava/lang/String;)Lrx/Observable;
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/rest/RestAPI;->getSpotifyTrack(Ljava/lang/String;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
     const/4 v2, 0x0
 
     const/4 v3, 0x1
 
-    invoke-static {v1, v2, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v2, v3, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
@@ -532,13 +535,6 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "trackId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getSpotifyTrack()Lrx/Observable;
@@ -556,7 +552,7 @@
 
     const-string v1, "spotifyTrackSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali b/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali
index 7e91fcbbd0..4a89fca7d6 100644
--- a/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali
+++ b/com.discord/smali/com/discord/utilities/ssl/SecureSocketsLayerUtils.smali
@@ -83,7 +83,7 @@
 
     const-string v0, "sslContext.socketFactory"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 
@@ -118,7 +118,7 @@
 
     const-string v0, "SSLContext.getInstance(protocol)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/security/NoSuchAlgorithmException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -150,19 +150,21 @@
 .method public static final getTrustManagerFactory(Landroid/content/res/AssetManager;Ljava/lang/String;)Ljavax/net/ssl/TrustManagerFactory;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "assetManager"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "certificatePath"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Ljavax/net/ssl/TrustManagerFactory;->getDefaultAlgorithm()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1}, Ljavax/net/ssl/TrustManagerFactory;->getInstance(Ljava/lang/String;)Ljavax/net/ssl/TrustManagerFactory;
+    invoke-static {v0}, Ljavax/net/ssl/TrustManagerFactory;->getInstance(Ljava/lang/String;)Ljavax/net/ssl/TrustManagerFactory;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p0, p1}, Landroid/content/res/AssetManager;->open(Ljava/lang/String;)Ljava/io/InputStream;
 
@@ -185,37 +187,39 @@
 
     invoke-static {}, Ljava/security/KeyStore;->getDefaultType()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v2}, Ljava/security/KeyStore;->getInstance(Ljava/lang/String;)Ljava/security/KeyStore;
+    invoke-static {v1}, Ljava/security/KeyStore;->getInstance(Ljava/lang/String;)Ljava/security/KeyStore;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2, v0}, Ljava/security/KeyStore;->load(Ljava/security/KeyStore$LoadStoreParameter;)V
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2}, Ljava/security/KeyStore;->load(Ljava/security/KeyStore$LoadStoreParameter;)V
 
     const-string v3, "caCert"
 
-    invoke-virtual {v2, v3, p1}, Ljava/security/KeyStore;->setCertificateEntry(Ljava/lang/String;Ljava/security/cert/Certificate;)V
+    invoke-virtual {v1, v3, p1}, Ljava/security/KeyStore;->setCertificateEntry(Ljava/lang/String;Ljava/security/cert/Certificate;)V
 
-    invoke-virtual {v1, v2}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
+    invoke-virtual {v0, v1}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
 
     const-string p1, "tmf"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {p0, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {p0, v2}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
-    return-object v1
+    return-object v0
 
     :cond_0
     :try_start_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type java.security.cert.X509Certificate"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
     :try_end_1
@@ -235,18 +239,4 @@
     invoke-static {p0, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
     throw v0
-
-    :cond_1
-    const-string p0, "certificatePath"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "assetManager"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
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 63deeaa411..13c8320b08 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
@@ -43,11 +43,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "hasAnythingChanged"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -64,20 +66,6 @@
     iput-object p1, p0, Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;->discardConfirmed:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
-
-    :cond_0
-    const-string p1, "hasAnythingChanged"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDiscardConfirmed$p(Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;)Ljava/util/concurrent/atomic/AtomicBoolean;
@@ -168,9 +156,9 @@
 
     const-string v2, "AlertDialog.Builder(acti\u2026y).setView(view).create()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0a0a35
+    const v2, 0x7f0a0a39
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -178,7 +166,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a0a36
+    const v3, 0x7f0a0a3a
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -186,7 +174,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a0a33
+    const v4, 0x7f0a0a37
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -194,7 +182,7 @@
 
     check-cast v4, Landroid/widget/TextView;
 
-    const v5, 0x7f0a0a34
+    const v5, 0x7f0a0a38
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -202,11 +190,11 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    const v5, 0x7f1205a3
+    const v5, 0x7f1205a5
 
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
 
-    const v2, 0x7f1205a4
+    const v2, 0x7f1205a6
 
     invoke-virtual {v3, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -216,7 +204,7 @@
 
     invoke-virtual {v4, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v2, 0x7f12107e
+    const v2, 0x7f1210a8
 
     invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$1.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$1.smali
index 2d784ea9bf..6196b46b2b 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/stateful/StatefulViews$configureSaveActionView$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StatefulViews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "$this$smartHide"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
@@ -90,13 +92,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "$this$smartHide"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$2.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$2.smali
index ab5d580556..b3701e3865 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$2.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$configureSaveActionView$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/stateful/StatefulViews$configureSaveActionView$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StatefulViews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "$this$smartShow"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
@@ -90,13 +92,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "$this$smartShow"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1.smali
index da331c497e..19de23e276 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StatefulViews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1;->this$0:Lcom/discord/utilities/stateful/StatefulViews;
 
@@ -96,13 +98,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/utilities/stateful/StatefulViews;->configureSaveActionView(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali
index 8f46fcca02..02b33f72cf 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "StatefulViews.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali
index ba998d38a5..26390fc19e 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1.smali
@@ -46,21 +46,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;->$onBackPressedHandler:Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;
@@ -77,5 +63,19 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
index 4464b870ab..cb56607f48 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews.smali
@@ -69,7 +69,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "views"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -114,19 +116,10 @@
     invoke-direct {p0, v0}, Lcom/discord/utilities/stateful/StatefulViews;-><init>(Ljava/util/List;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "views"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -136,7 +129,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "ids"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -161,21 +156,14 @@
     iput-object p1, p0, Lcom/discord/utilities/stateful/StatefulViews;->requiredFieldIds:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "ids"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public varargs constructor <init>([I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ids"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->toList([I)Ljava/util/List;
 
@@ -184,15 +172,6 @@
     invoke-direct {p0, p1}, Lcom/discord/utilities/stateful/StatefulViews;-><init>(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ids"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$hasAnythingChanged(Lcom/discord/utilities/stateful/StatefulViews;)Z
@@ -339,7 +318,7 @@
 
     move-result-object v1
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -440,7 +419,7 @@
 
     if-eqz v1, :cond_4
 
-    invoke-static {v1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v1
 
@@ -465,7 +444,9 @@
 .method public final varargs addOptionalFields([Landroid/view/View;)V
     .locals 5
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "views"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -496,15 +477,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "views"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final clear()V
@@ -611,7 +583,7 @@
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -699,7 +671,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -738,11 +710,13 @@
 .method public final varargs setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string/jumbo v0, "views"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p3
 
@@ -787,6 +761,10 @@
     sget-object v5, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
     :goto_1
+    const-string v6, "requiredFieldIds[view.id] ?: true"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {v3, v4, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     new-instance v3, Lcom/discord/utilities/stateful/StatefulViews$setupTextWatcherWithSaveAction$$inlined$forEach$lambda$1;
@@ -840,69 +818,50 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "views"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setupUnsavedChangesConfirmation(Lcom/discord/app/AppFragment;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
 
     new-instance v2, Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;
 
     const-string v3, "it"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1;
 
     invoke-direct {v3, p0}, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$$inlined$let$lambda$1;-><init>(Lcom/discord/utilities/stateful/StatefulViews;)V
 
-    invoke-direct {v2, v1, v3}, Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;-><init>(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v2, v0, v3}, Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;-><init>(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;)V
 
     goto :goto_0
 
     :cond_0
-    move-object v2, v0
+    move-object v2, v1
 
     :goto_0
-    new-instance v1, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;
+    new-instance v0, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;
 
-    invoke-direct {v1, v2}, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;-><init>(Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;)V
+    invoke-direct {v0, v2}, Lcom/discord/utilities/stateful/StatefulViews$setupUnsavedChangesConfirmation$1;-><init>(Lcom/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler;)V
 
     const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-static {p1, v1, v2, v3, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p1, v0, v2, v3, v1}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContext.smali b/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
index 874e71353a..5cc94b6de3 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
@@ -31,13 +31,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Lcom/discord/utilities/streams/StreamContext$Joinability;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "joinability"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "user"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,27 +60,6 @@
     iput-boolean p7, p0, Lcom/discord/utilities/streams/StreamContext;->isCurrentUserSpectating:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "joinability"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Lcom/discord/utilities/streams/StreamContext$Joinability;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;ZILjava/lang/Object;)Lcom/discord/utilities/streams/StreamContext;
@@ -227,28 +210,32 @@
 .method public final copy(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Lcom/discord/utilities/streams/StreamContext$Joinability;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Z)Lcom/discord/utilities/streams/StreamContext;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p4, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "joinability"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "user"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/streams/StreamContext;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-object v3, p2
 
     move-object v4, p3
 
-    move-object v5, p4
-
-    move-object v6, p5
-
     move-object v7, p6
 
     move/from16 v8, p7
@@ -256,27 +243,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/utilities/streams/StreamContext;-><init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Lcom/discord/utilities/streams/StreamContext$Joinability;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "joinability"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "stream"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -294,7 +260,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -304,7 +270,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -314,7 +280,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -324,7 +290,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->joinability:Lcom/discord/utilities/streams/StreamContext$Joinability;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -334,7 +300,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -344,7 +310,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->userNickname:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForActiveStream$1.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForActiveStream$1.smali
index fd55739835..1c12321846 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForActiveStream$1.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForActiveStream$1.smali
@@ -3,7 +3,7 @@
 .source "StreamContextService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +81,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$1.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$1.smali
index 52cc2ba649..a7eafd88d3 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$1.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$1.smali
@@ -3,7 +3,7 @@
 .source "StreamContextService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2$1.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2$1.smali
index a3c979dbca..8c3b5a73d4 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2$1.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2$1.smali
@@ -23,7 +23,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/FuncN<",
-        "TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,7 +85,7 @@
 
     const-string v0, "allUserStreamContexts"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2.smali
index f6528506d9..4834769375 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2.smali
@@ -3,7 +3,7 @@
 .source "StreamContextService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -71,6 +79,7 @@
             "Lcom/discord/models/domain/ModelApplicationStream;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/utilities/streams/StreamContext;",
@@ -84,18 +93,18 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
     :cond_0
     const-string v0, "allUserStreams"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$1.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$1.smali
index 7546c39a8a..bd5948c392 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$1.smali
@@ -3,7 +3,7 @@
 .source "StreamContextService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$2.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$2.smali
index 79248a9db3..b380a627a3 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$2.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$2.smali
@@ -3,7 +3,7 @@
 .source "StreamContextService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali
index bd9206a50d..233b1a8e3d 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali
@@ -39,7 +39,20 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func8<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/String;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;"
     }
 .end annotation
 
@@ -181,7 +194,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isUserWatching()Z
+    invoke-virtual {v1}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->isStreamActive()Z
 
     move-result v1
 
@@ -193,7 +206,7 @@
 
     iget-object v3, v0, Lcom/discord/utilities/streams/StreamContextService$getForUser$1$3;->$stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1.smali
index 923d509486..79a489d95f 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1.smali
@@ -3,7 +3,7 @@
 .source "StreamContextService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;>;"
     }
 .end annotation
 
@@ -87,9 +89,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto/16 :goto_1
 
@@ -178,13 +180,13 @@
 
     invoke-direct {v7, p0}, Lcom/discord/utilities/streams/StreamContextService$getForUser$1$1;-><init>(Lcom/discord/utilities/streams/StreamContextService$getForUser$1;)V
 
-    invoke-virtual {v2, v7}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v7}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     sget-object v7, Lcom/discord/utilities/streams/StreamContextService$getForUser$1$2;->INSTANCE:Lcom/discord/utilities/streams/StreamContextService$getForUser$1$2;
 
-    invoke-virtual {v2, v7}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v7}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService.smali
index c10eb771ae..3fabf4ad11 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContextService.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService.smali
@@ -51,21 +51,33 @@
 .method public constructor <init>(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreamPreviews;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "applicationStreamingStore"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "guildStore"
 
-    if-eqz p3, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "permissionsStore"
 
-    if-eqz p5, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string/jumbo v0, "userStore"
 
-    if-eqz p7, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "voiceStateStore"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelStore"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "applicationStreamPreviewStore"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -84,55 +96,6 @@
     iput-object p7, p0, Lcom/discord/utilities/streams/StreamContextService;->applicationStreamPreviewStore:Lcom/discord/stores/StoreApplicationStreamPreviews;
 
     return-void
-
-    :cond_0
-    const-string p1, "applicationStreamPreviewStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "voiceStateStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "permissionsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "guildStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "applicationStreamingStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreamPreviews;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -341,13 +304,13 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance p2, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {p2, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(null)"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object p1, p2
 
@@ -378,13 +341,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/utilities/streams/StreamContextService$getForActiveStream$1;-><init>(Lcom/discord/utilities/streams/StreamContextService;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "applicationStreamingStor\u2026  )\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -410,7 +373,7 @@
 
     sget-object v1, Lcom/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$1;->INSTANCE:Lcom/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -418,13 +381,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/utilities/streams/StreamContextService$getForAllStreamingUsers$2;-><init>(Lcom/discord/utilities/streams/StreamContextService;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "applicationStreamingStor\u2026  }\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -450,13 +413,13 @@
 
     invoke-direct {v1, p0, p3, p1, p2}, Lcom/discord/utilities/streams/StreamContextService$getForUser$1;-><init>(Lcom/discord/utilities/streams/StreamContextService;ZJ)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "applicationStreamingStor\u2026  }\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/string/StringUtilsKt.smali b/com.discord/smali/com/discord/utilities/string/StringUtilsKt.smali
index 5a36a92c17..c6eb2e1715 100644
--- a/com.discord/smali/com/discord/utilities/string/StringUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/string/StringUtilsKt.smali
@@ -25,7 +25,9 @@
 .method public static final encodeToBase32String([B)Ljava/lang/String;
     .locals 7
 
-    if-eqz p0, :cond_6
+    const-string v0, "$this$encodeToBase32String"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuffer;
 
@@ -147,24 +149,17 @@
 
     const-string v0, "Base32.encodeOriginal(this)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_6
-    const-string p0, "$this$encodeToBase32String"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final filenameSanitized(Ljava/lang/CharSequence;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$filenameSanitized"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lkotlin/text/Regex;
 
@@ -179,21 +174,14 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$filenameSanitized"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final format(ILandroid/content/Context;)Ljava/lang/String;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/locale/LocaleManager;
 
@@ -217,59 +205,52 @@
 
     const-string p1, "NumberFormat.getInstance\u2026le(context)).format(this)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getStringByLocale(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/String;
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getStringByLocale"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "locale"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    new-instance v1, Landroid/content/res/Configuration;
+    new-instance v0, Landroid/content/res/Configuration;
 
     invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "resources"
+    const-string v2, "resources"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
+    invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {v1, v2}, Landroid/content/res/Configuration;-><init>(Landroid/content/res/Configuration;)V
+    invoke-direct {v0, v1}, Landroid/content/res/Configuration;-><init>(Landroid/content/res/Configuration;)V
 
-    new-instance v2, Ljava/util/Locale;
+    new-instance v1, Ljava/util/Locale;
 
-    invoke-direct {v2, p2}, Ljava/util/Locale;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, p2}, Ljava/util/Locale;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, v2}, Landroid/content/res/Configuration;->setLocale(Ljava/util/Locale;)V
+    invoke-virtual {v0, v1}, Landroid/content/res/Configuration;->setLocale(Ljava/util/Locale;)V
 
-    invoke-virtual {p0, v1}, Landroid/content/Context;->createConfigurationContext(Landroid/content/res/Configuration;)Landroid/content/Context;
+    invoke-virtual {p0, v0}, Landroid/content/Context;->createConfigurationContext(Landroid/content/res/Configuration;)Landroid/content/Context;
 
     move-result-object p0
 
     const-string p2, "createConfigurationContext(configuration)"
 
-    invoke-static {p0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -277,32 +258,25 @@
 
     invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Landroid/content/res/Resources$NotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
+    goto :goto_0
+
     :catch_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "locale"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$getStringByLocale"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final stripAccents(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$stripAccents"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Ljava/text/Normalizer$Form;->NFKD:Ljava/text/Normalizer$Form;
 
@@ -312,7 +286,7 @@
 
     const-string v0, "normalizedString"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/string/StringUtilsKt;->STRIP_ACCENTS_REGEX:Lkotlin/text/Regex;
 
@@ -323,13 +297,4 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$stripAccents"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey.smali
index 02446aa796..af83768a09 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey.smali
@@ -22,13 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
 
-    const-string v0, "https://www.surveymonkey.com/r/9W5KLQ3?id="
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "https://www.surveymonkey.com/r/9W5KLQ3?id="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -40,16 +44,16 @@
 
     move-result-object v5
 
+    const-string v4, "9W5KLQ3"
+
+    const-string v6, "NOTICE_KEY_CONSOLE_RESEARCH_SURVEY"
+
     const/4 v7, 0x0
 
     const/16 v8, 0x8
 
     const/4 v9, 0x0
 
-    const-string v4, "9W5KLQ3"
-
-    const-string v6, "NOTICE_KEY_CONSOLE_RESEARCH_SURVEY"
-
     move-object v3, p0
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -57,15 +61,6 @@
     iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;
@@ -98,22 +93,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -131,7 +119,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali
index 50b03aba9a..16228d40fd 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SurveyUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/app/Activity;",
         "Ljava/lang/String;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,9 +71,11 @@
 .method public final invoke(Landroid/app/Activity;)Ljava/lang/String;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "activity"
 
-    const v0, 0x7f1204e2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f1204e4
 
     invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -81,16 +83,7 @@
 
     const-string v0, "activity.getString(R.str\u2026d_new_user_survey_prompt)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey.smali
index d9a25b0a0d..2246537842 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey.smali
@@ -22,13 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
 
-    const-string v0, "https://www.surveymonkey.com/r/TW9SLVJ?user_id="
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "https://www.surveymonkey.com/r/TW9SLVJ?user_id="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -42,12 +46,12 @@
 
     sget-object v7, Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1;
 
-    const/4 v8, 0x0
-
     const-string v4, "TW9SLVJ"
 
     const-string v6, "NOTICE_KEY_COVID_NEW_USER_SURVEY"
 
+    const/4 v8, 0x0
+
     move-object v3, p0
 
     invoke-direct/range {v3 .. v8}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -55,15 +59,6 @@
     iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;
@@ -96,22 +91,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -129,7 +117,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey.smali
index 1f8adac234..abbc2cc119 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey.smali
@@ -22,13 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
 
-    const-string v0, "https://www.surveymonkey.com/r/XY9V3XH?id="
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "https://www.surveymonkey.com/r/XY9V3XH?id="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -40,16 +44,16 @@
 
     move-result-object v5
 
+    const-string v4, "XY9V3XH"
+
+    const-string v6, "NOTICE_KEY_USER_SURVEY"
+
     const/4 v7, 0x0
 
     const/16 v8, 0x8
 
     const/4 v9, 0x0
 
-    const-string v4, "XY9V3XH"
-
-    const-string v6, "NOTICE_KEY_USER_SURVEY"
-
     move-object v3, p0
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -57,15 +61,6 @@
     iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;
@@ -98,22 +93,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -131,7 +119,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$EngagedUserSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey.smali
index ba108cf4c0..b36958a004 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey.smali
@@ -22,13 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
 
-    const-string v0, "https://www.surveymonkey.com/r/XY8XCX9?id="
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "https://www.surveymonkey.com/r/XY8XCX9?id="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -40,16 +44,16 @@
 
     move-result-object v5
 
+    const-string v4, "XY8XCX9"
+
+    const-string v6, "NOTICE_KEY_USER_SURVEY"
+
     const/4 v7, 0x0
 
     const/16 v8, 0x8
 
     const/4 v9, 0x0
 
-    const-string v4, "XY8XCX9"
-
-    const-string v6, "NOTICE_KEY_USER_SURVEY"
-
     move-object v3, p0
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -57,15 +61,6 @@
     iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;
@@ -98,22 +93,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -131,7 +119,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$HypesquadSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey.smali
index 29bcfbed33..a50fe82b15 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey.smali
@@ -22,13 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
 
-    const-string v0, "https://www.surveymonkey.com/r/PKSGNJ8?id="
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    move-result-object v0
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "https://www.surveymonkey.com/r/PKSGNJ8?id="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -40,16 +44,16 @@
 
     move-result-object v5
 
+    const-string v4, "PKSGNJ8"
+
+    const-string v6, "NOTICE_KEY_NPS_SURVEY"
+
     const/4 v7, 0x0
 
     const/16 v8, 0x8
 
     const/4 v9, 0x0
 
-    const-string v4, "PKSGNJ8"
-
-    const-string v6, "NOTICE_KEY_NPS_SURVEY"
-
     move-object v3, p0
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -57,15 +61,6 @@
     iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
@@ -98,22 +93,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -131,7 +119,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
index c61c566f05..8c10a393ac 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
@@ -109,25 +109,25 @@
 .end method
 
 .method public final getSurveyBody(Landroid/app/Activity;)Ljava/lang/String;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;->getSurveyBody()Lkotlin/jvm/functions/Function1;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
     invoke-virtual {p0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;->getSurveyBody()Lkotlin/jvm/functions/Function1;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-interface {v1, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -136,12 +136,7 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const v0, 0x7f120fea
+    const v0, 0x7f121014
 
     invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -149,16 +144,9 @@
 
     const-string v0, "activity.getString(R.string.notice_survey_body)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getSurveyBody()Lkotlin/jvm/functions/Function1;
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1.smali
index 598fe579e8..c817741b66 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali
index 79ab7c3b59..6833eacc73 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1.smali
index 34ae1798bd..ff7a3ffb28 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,28 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1;->call(Lcom/discord/models/domain/ModelUser;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelUser;)Z
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
 
@@ -96,5 +80,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1.smali
index 030e35c389..f08d2ef2e1 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
             ">;"
         }
@@ -78,9 +81,9 @@
 
     if-nez v0, :cond_0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -91,7 +94,7 @@
 
     const-string v1, "meUser"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils;->access$getGenericSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2.smali
index d9a06f5b2b..e2da56164f 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
             ">;"
         }
@@ -88,7 +91,7 @@
 
     const-string v1, "meUser"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils;->access$getUserSurvey(Lcom/discord/utilities/surveys/SurveyUtils;Lcom/discord/models/domain/ModelUser;)Lrx/Observable;
 
@@ -98,7 +101,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$1.smali
index 6c06f7c844..2a9b3b04df 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$1.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$1.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 1
 
     const/4 v0, 0x1
@@ -92,5 +78,21 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$2.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$2.smali
index bb7eff67e0..dce8fc7e52 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$2.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$2.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
+        ">;"
     }
 .end annotation
 
@@ -52,7 +54,7 @@
 
     const-string v0, "isInExperiment"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$3.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$3.smali
index 5d3ba33278..b81246795b 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$3.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$3.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$3;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 1
 
     const/4 v0, 0x1
@@ -92,5 +78,21 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$3;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$4.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$4.smali
index 82eb64bbae..1a43b7410b 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$4.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getUserSurvey$4.smali
@@ -3,7 +3,7 @@
 .source "SurveyUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
+        ">;"
     }
 .end annotation
 
@@ -52,7 +54,7 @@
 
     const-string v0, "isInExperiment"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali
index 631f9b11a2..03f51fc975 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali
@@ -97,7 +97,7 @@
 
     sget-object v1, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -105,13 +105,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "StoreStream\n        .get\u2026one\n          }\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -164,7 +164,7 @@
 
     sget-object v2, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$3;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$3;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -172,11 +172,11 @@
 
     invoke-direct {v2, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$4;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_1
 
@@ -196,7 +196,7 @@
 
     sget-object v2, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$1;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -204,11 +204,11 @@
 
     invoke-direct {v2, p1}, Lcom/discord/utilities/surveys/SurveyUtils$getUserSurvey$2;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
     return-object p1
@@ -270,7 +270,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -278,7 +278,7 @@
 
     :cond_1
     :try_start_2
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_2
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_2 .. :try_end_2} :catch_0
 
@@ -311,13 +311,13 @@
 
     sget-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v0, "Observable.just(Survey.None)"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 
@@ -334,38 +334,31 @@
 
     sget-object v1, Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n        .get\u2026              }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
 .method public final init(Landroid/app/Application;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "applicationContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p1, Lcom/discord/utilities/surveys/SurveyUtils;->applicationContext:Landroid/app/Application;
 
     return-void
-
-    :cond_0
-    const-string p1, "applicationContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali b/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali
index e0f8008be3..fa83dda2a8 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/AstRenderer.smali
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;-><init>()V
 
-    invoke-static {v0, p0, p1}, Lf/a/j/a/b/g;->a(Landroid/text/SpannableStringBuilder;Ljava/util/Collection;Ljava/lang/Object;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v0, p0, p1}, Lf/a/j/a/b/h;->a(Landroid/text/SpannableStringBuilder;Ljava/util/Collection;Ljava/lang/Object;)Landroid/text/SpannableStringBuilder;
 
     invoke-static {v0}, Lcom/discord/utilities/textprocessing/AstRenderer;->trim(Landroid/text/SpannableStringBuilder;)V
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processQuoteChildren$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processQuoteChildren$1.smali
index 9236e787e1..b81d39094b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processQuoteChildren$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processQuoteChildren$1.smali
@@ -51,7 +51,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/n/c/u;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
+    invoke-static {p1}, Lk0/o/c/v;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
index c33b6869dc..8fa2fdfc5d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
@@ -298,7 +298,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/n/c/u;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
+    invoke-static {p1}, Lk0/o/c/v;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
 
     move-result-object v0
 
@@ -325,7 +325,7 @@
 
     check-cast v1, Lcom/discord/simpleast/core/node/Node;
 
-    invoke-static {v1, v0}, Ld0/a/b/b/a;->Z0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
+    invoke-static {v1, v0}, Le0/a/b/b/a;->Z0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
 
     goto :goto_0
 
@@ -333,11 +333,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.collections.MutableCollection<com.discord.simpleast.core.node.Node<R>>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -441,7 +441,7 @@
 
     sget-object v2, Lcom/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1;->INSTANCE:Lcom/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1;
 
-    invoke-static {v1, v2}, Ld0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
+    invoke-static {v1, v2}, Le0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
 
     goto :goto_4
 
@@ -484,7 +484,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    invoke-static {p1, v0}, Lj0/i/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/j/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -608,15 +608,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "ast"
 
-    invoke-static {p1}, Lj0/n/c/u;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lk0/o/c/v;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
 
     move-result-object v0
 
     invoke-direct {p0, v0}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->stripSimpleEmbedLink(Ljava/util/Collection;)V
 
-    invoke-static {p1, p0}, Ld0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
+    invoke-static {p1, p0}, Le0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
 
     iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->shouldJumboify:Z
 
@@ -624,7 +626,7 @@
 
     sget-object v0, Lcom/discord/utilities/textprocessing/MessagePreprocessor$process$1;->INSTANCE:Lcom/discord/utilities/textprocessing/MessagePreprocessor$process$1;
 
-    invoke-static {p1, v0}, Ld0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
+    invoke-static {p1, v0}, Le0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->processSpoilerChildren()V
@@ -632,15 +634,6 @@
     invoke-direct {p0, p1}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->processQuoteChildren(Ljava/util/Collection;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "ast"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public processNode(Lcom/discord/simpleast/core/node/Node;)V
@@ -653,7 +646,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_a
+    const-string v0, "node"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->shouldJumboify:Z
 
@@ -707,7 +702,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -807,13 +802,4 @@
     :cond_9
     :goto_4
     return-void
-
-    :cond_a
-    const-string p1, "node"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali
index 3e29ef80ec..18f5725b0a 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageRenderContext$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageRenderContext.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,27 +77,15 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "clickContext"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2, p3}, Lcom/discord/utilities/uri/UriHandler;->handleOrUntrusted(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clickContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$2.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$2.smali
index e83c2e17a5..df260c4b4f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$2.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageRenderContext$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageRenderContext.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .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 65de53f1ef..1c9708b9a5 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali
@@ -792,13 +792,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_1
+    const-string v0, "onClickUrl"
 
-    if-eqz p10, :cond_0
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onLongPressUrl"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -829,27 +833,6 @@
     iput-object p14, p0, Lcom/discord/utilities/textprocessing/MessageRenderContext;->userMentionOnClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onLongPressUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onClickUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -943,7 +926,7 @@
 
     if-eqz v2, :cond_6
 
-    const v2, 0x7f04052c
+    const v2, 0x7f04051e
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -961,7 +944,7 @@
 
     if-eqz v2, :cond_7
 
-    const v2, 0x7f04052d
+    const v2, 0x7f04051f
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1479,20 +1462,28 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    move-object/from16 v2, p1
 
-    if-eqz p9, :cond_1
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_0
+    const-string v0, "onClickUrl"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onLongPressUrl"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/textprocessing/MessageRenderContext;
 
     move-object v1, v0
 
-    move-object/from16 v2, p1
-
     move-wide/from16 v3, p2
 
     move/from16 v5, p4
@@ -1505,10 +1496,6 @@
 
     move/from16 v9, p8
 
-    move-object/from16 v10, p9
-
-    move-object/from16 v11, p10
-
     move/from16 v12, p11
 
     move/from16 v13, p12
@@ -1520,27 +1507,6 @@
     invoke-direct/range {v1 .. v15}, Lcom/discord/utilities/textprocessing/MessageRenderContext;-><init>(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "onLongPressUrl"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "onClickUrl"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "context"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -1562,7 +1528,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1598,7 +1564,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1612,7 +1578,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1626,7 +1592,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1650,7 +1616,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1664,7 +1630,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1698,7 +1664,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1712,7 +1678,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.smali
index 958916a911..08b61c6375 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.smali
@@ -69,11 +69,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -83,7 +85,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
@@ -141,7 +143,7 @@
 
     const-string v0, "content"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -150,18 +152,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.smali
index b2255ba85a..bf2a547fea 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.smali
@@ -69,11 +69,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x3
 
@@ -132,18 +134,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.smali
index fe3389042a..9086905d66 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.smali
@@ -53,7 +53,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 7
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -69,11 +69,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -83,7 +85,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
@@ -91,12 +93,12 @@
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     goto :goto_0
 
     :cond_0
-    const-wide/16 v1, -0x1
+    const-wide/16 v0, -0x1
 
     :goto_0
     iget-object p2, p0, Lcom/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1;->$guildRoles:Ljava/util/List;
@@ -108,42 +110,45 @@
     :cond_1
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_3
+    if-eqz v2, :cond_3
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v4, v3
+    move-object v3, v2
 
-    check-cast v4, Lcom/discord/models/domain/ModelGuildRole;
+    check-cast v3, Lcom/discord/models/domain/ModelGuildRole;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    cmp-long v6, v4, v1
+    cmp-long v5, v3, v0
 
-    if-nez v6, :cond_2
+    if-nez v5, :cond_2
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     goto :goto_1
 
     :cond_2
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :goto_1
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    move-object v0, v3
+    goto :goto_2
 
     :cond_3
-    check-cast v0, Lcom/discord/models/domain/ModelGuildRole;
+    const/4 v2, 0x0
 
-    if-eqz v0, :cond_4
+    :goto_2
+    check-cast v2, Lcom/discord/models/domain/ModelGuildRole;
+
+    if-eqz v2, :cond_4
 
     const/16 p1, 0x40
 
@@ -151,7 +156,7 @@
 
     move-result-object p1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
 
     move-result-object p2
 
@@ -161,19 +166,19 @@
 
     move-result-object p1
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     invoke-virtual {p1}, Ljava/util/regex/Matcher;->group()Ljava/lang/String;
 
     move-result-object p1
 
-    :goto_2
+    :goto_3
     new-instance p2, Lf/a/j/a/a/a;
 
     const-string v0, "content"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -182,18 +187,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_5
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.smali
index ec7e27be26..92672bcb8b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.smali
@@ -69,11 +69,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -83,7 +85,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p2
 
@@ -147,7 +149,7 @@
 
     const-string v0, "content"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -156,18 +158,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
index 71db15e67e..696c8e1588 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
@@ -95,7 +95,7 @@
 
     const-string v2, "PATTERN_CHANNEL_MENTION"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, p1, v1}, Lcom/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1;-><init>(Lcom/discord/utilities/textprocessing/MessageUnparser;Ljava/util/Map;Ljava/util/regex/Pattern;)V
 
@@ -126,7 +126,7 @@
 
     const-string v2, "PATTERN_CUSTOM_EMOJI"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, p1, v1}, Lcom/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1;-><init>(Lcom/discord/utilities/textprocessing/MessageUnparser;Lcom/discord/models/domain/emoji/EmojiSet;Ljava/util/regex/Pattern;)V
 
@@ -159,7 +159,7 @@
 
     const-string v2, "PATTERN_ROLE_MENTION"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, p1, v1}, Lcom/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1;-><init>(Lcom/discord/utilities/textprocessing/MessageUnparser;Ljava/util/List;Ljava/util/regex/Pattern;)V
 
@@ -193,7 +193,7 @@
 
     const-string v2, "PATTERN_USER_MENTION"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, p1, v1}, Lcom/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1;-><init>(Lcom/discord/utilities/textprocessing/MessageUnparser;Ljava/util/Map;Ljava/util/regex/Pattern;)V
 
@@ -201,7 +201,7 @@
 .end method
 
 .method public static final unparse(Ljava/lang/String;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/emoji/EmojiSet;)Ljava/lang/CharSequence;
-    .locals 7
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -223,36 +223,44 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "rawMessageContent"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "channels"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string/jumbo v0, "users"
 
-    new-instance v1, Lcom/discord/simpleast/core/parser/Parser;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    const-string v0, "emojiSet"
 
-    const/4 v3, 0x1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    new-instance v0, Lcom/discord/simpleast/core/parser/Parser;
 
-    sget-object v2, Lcom/discord/utilities/textprocessing/MessageUnparser;->INSTANCE:Lcom/discord/utilities/textprocessing/MessageUnparser;
+    const/4 v1, 0x0
 
-    invoke-direct {v2, p3}, Lcom/discord/utilities/textprocessing/MessageUnparser;->getUserMentionRule(Ljava/util/Map;)Lcom/discord/simpleast/core/parser/Rule;
+    const/4 v2, 0x1
 
-    move-result-object p3
+    const/4 v3, 0x0
 
-    invoke-virtual {v1, p3}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
-
-    move-result-object p3
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     sget-object v1, Lcom/discord/utilities/textprocessing/MessageUnparser;->INSTANCE:Lcom/discord/utilities/textprocessing/MessageUnparser;
 
+    invoke-direct {v1, p3}, Lcom/discord/utilities/textprocessing/MessageUnparser;->getUserMentionRule(Ljava/util/Map;)Lcom/discord/simpleast/core/parser/Rule;
+
+    move-result-object p3
+
+    invoke-virtual {v0, p3}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+
+    move-result-object p3
+
+    sget-object v0, Lcom/discord/utilities/textprocessing/MessageUnparser;->INSTANCE:Lcom/discord/utilities/textprocessing/MessageUnparser;
+
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getRoles()Ljava/util/List;
@@ -264,10 +272,10 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
-    invoke-direct {v1, p1}, Lcom/discord/utilities/textprocessing/MessageUnparser;->getRoleMentionRule(Ljava/util/List;)Lcom/discord/simpleast/core/parser/Rule;
+    invoke-direct {v0, p1}, Lcom/discord/utilities/textprocessing/MessageUnparser;->getRoleMentionRule(Ljava/util/List;)Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p1
 
@@ -297,63 +305,35 @@
 
     sget-object p2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {p2}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p2
 
     invoke-virtual {p1, p2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    move-result-object v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x4
+    move-result-object v4
 
     const/4 v6, 0x0
 
-    move-object v2, p0
+    const/4 v7, 0x0
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
+    const/4 v8, 0x4
+
+    const/4 v9, 0x0
+
+    move-object v5, p0
+
+    invoke-static/range {v4 .. v9}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
 
     move-result-object p0
 
-    invoke-static {p0, v0}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    invoke-static {p0, v3}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     move-result-object p0
 
     const-string p1, "AstRenderer.render(parse\u2026sageContent, null), null)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_1
-    const-string p0, "emojiSet"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "users"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "channels"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "rawMessageContent"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$cleanEmojisInQuotedText$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$cleanEmojisInQuotedText$1.smali
index 1e95660432..e2a50efc00 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$cleanEmojisInQuotedText$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$cleanEmojisInQuotedText$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUtils$cleanEmojisInQuotedText$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/text/MatchResult;",
         "Ljava/lang/CharSequence;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -49,7 +49,9 @@
 .method public final invoke(Lkotlin/text/MatchResult;)Ljava/lang/CharSequence;
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "matches"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lkotlin/text/MatchResult;->getGroupValues()Ljava/util/List;
 
@@ -96,15 +98,6 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "matches"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$formatTextAsQuote$formattedText$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$formatTextAsQuote$formattedText$1.smali
index 011333cc0a..f9733a59a7 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$formatTextAsQuote$formattedText$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$formatTextAsQuote$formattedText$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/MessageUtils$formatTextAsQuote$formattedText$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageUtils.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -49,29 +49,19 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/MessageUtils$formatTextAsQuote$formattedText$1;->invoke(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Ljava/lang/String;)Ljava/lang/String;
+.method public final invoke(Ljava/lang/String;)Ljava/lang/CharSequence;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -92,13 +82,16 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/MessageUtils$formatTextAsQuote$formattedText$1;->invoke(Ljava/lang/String;)Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
index 52556d00d7..f1e113894e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
@@ -33,19 +33,19 @@
 
     :array_0
     .array-data 4
-        0x7f121571
-        0x7f121572
-        0x7f121573
-        0x7f121574
-        0x7f121575
-        0x7f121576
-        0x7f121577
-        0x7f121578
-        0x7f121579
-        0x7f12157a    # 1.941788E38f
-        0x7f12157b
-        0x7f12157c
-        0x7f12157d
+        0x7f12159b
+        0x7f12159c
+        0x7f12159d
+        0x7f12159e
+        0x7f12159f
+        0x7f1215a0
+        0x7f1215a1
+        0x7f1215a2
+        0x7f1215a3
+        0x7f1215a4
+        0x7f1215a5
+        0x7f1215a6
+        0x7f1215a7
     .end array-data
 .end method
 
@@ -92,7 +92,7 @@
 
     const/4 v2, 0x6
 
-    invoke-static {p1, v1, v3, v3, v2}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {p1, v1, v3, v3, v2}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
     move-result-object p1
 
@@ -124,7 +124,7 @@
 
     const-string v6, "> "
 
-    invoke-static {v4, v6, v3, v5}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v4, v6, v3, v5}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v4
 
@@ -156,7 +156,7 @@
 
     check-cast v2, Ljava/lang/String;
 
-    invoke-static {v2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -186,11 +186,11 @@
 
     move-result p1
 
-    invoke-static {v3, p1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v3, p1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
-    invoke-static {v1, p1}, Lj0/i/l;->slice(Ljava/util/List;Lkotlin/ranges/IntRange;)Ljava/util/List;
+    invoke-static {v1, p1}, Lk0/j/l;->slice(Ljava/util/List;Lkotlin/ranges/IntRange;)Ljava/util/List;
 
     move-result-object v2
 
@@ -208,7 +208,7 @@
 
     const-string v3, "\n"
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -228,7 +228,7 @@
 
     const/4 v2, 0x6
 
-    invoke-static {p1, v0, v1, v1, v2}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {p1, v0, v1, v1, v2}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object v3
 
@@ -246,7 +246,7 @@
 
     const/16 v10, 0x1e
 
-    invoke-static/range {v3 .. v10}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v3 .. v10}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -284,13 +284,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "channelMembers"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "nicks"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List;
 
@@ -298,13 +302,13 @@
 
     const-string v1, "message.mentions"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p0
 
-    invoke-static {v0, p0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0, p0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p0
 
@@ -313,27 +317,6 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "nicks"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "channelMembers"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "message"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static getNickOrUsernames$default(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Ljava/util/Map;
@@ -343,7 +326,7 @@
 
     if-eqz p4, :cond_0
 
-    sget-object p3, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p3, Lk0/j/o;->d:Lk0/j/o;
 
     :cond_0
     invoke-static {p0, p1, p2, p3}, 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;
@@ -356,15 +339,17 @@
 .method public static final getSystemMessageUserJoin(Landroid/content/Context;J)I
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_4
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/4 v1, 0x0
 
     const/16 v2, 0x18
 
-    if-lt v1, v2, :cond_0
+    if-lt v0, v2, :cond_0
 
     invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -384,9 +369,9 @@
 
     if-eqz p0, :cond_1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p0, v1}, Landroid/os/LocaleList;->get(I)Ljava/util/Locale;
+    invoke-virtual {p0, v0}, Landroid/os/LocaleList;->get(I)Ljava/util/Locale;
 
     move-result-object p0
 
@@ -410,27 +395,27 @@
     goto :goto_0
 
     :cond_1
-    move-object p0, v0
+    move-object p0, v1
 
     :goto_0
-    new-instance v1, Ljava/util/Locale;
+    new-instance v0, Ljava/util/Locale;
 
     const-string v2, "en"
 
-    invoke-direct {v1, v2}, Ljava/util/Locale;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v2}, Ljava/util/Locale;-><init>(Ljava/lang/String;)V
 
     if-eqz p0, :cond_2
 
     invoke-virtual {p0}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_2
-    invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
 
     move-result-object p0
 
-    invoke-static {v0, p0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p0
 
@@ -467,43 +452,40 @@
     aget p0, p2, p1
 
     return p0
-
-    :cond_4
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public final createQuotedText(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;)Ljava/lang/String;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "message.content"
+    const-string v1, "message.content"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lcom/discord/utilities/textprocessing/MessageUtils;->cleanTextOfQuotes(Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, v0}, Lcom/discord/utilities/textprocessing/MessageUtils;->cleanTextOfQuotes(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    const/4 v1, 0x0
 
-    invoke-direct {p0, v1}, Lcom/discord/utilities/textprocessing/MessageUtils;->cleanEmojisInQuotedText(Ljava/lang/String;)Ljava/lang/String;
+    if-eqz v0, :cond_1
 
-    move-result-object v1
+    invoke-direct {p0, v0}, Lcom/discord/utilities/textprocessing/MessageUtils;->cleanEmojisInQuotedText(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->isDM()Z
 
@@ -524,9 +506,9 @@
 
     move-result-object p1
 
-    const-string v0, "message.author"
+    const-string v1, "message.author"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
 
@@ -540,37 +522,25 @@
 
     invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :goto_0
-    invoke-direct {p0, v1, v0}, Lcom/discord/utilities/textprocessing/MessageUtils;->formatTextAsQuote(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct {p0, v0, v1}, Lcom/discord/utilities/textprocessing/MessageUtils;->formatTextAsQuote(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
     :cond_1
-    return-object v0
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public final isContentQuotable(Lcom/discord/models/domain/ModelMessage;)Z
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
@@ -594,13 +564,4 @@
     :cond_1
     :goto_0
     return v0
-
-    :cond_2
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali
index 6a772da3ca..392c0cfe9f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Parsers.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/text/MatchResult;",
-        "Ljava/lang/String;",
+        "Ljava/lang/CharSequence;",
         ">;"
     }
 .end annotation
@@ -49,60 +49,53 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lkotlin/text/MatchResult;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1;->invoke(Lkotlin/text/MatchResult;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final invoke(Lkotlin/text/MatchResult;)Ljava/lang/String;
+.method public final invoke(Lkotlin/text/MatchResult;)Ljava/lang/CharSequence;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "matchResult"
 
-    const/16 v0, 0x5c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lkotlin/text/MatchResult;->getValue()Ljava/lang/String;
 
     move-result-object p1
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-static {v0}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
+    const/16 v1, 0x5c
 
-    move-result-object v0
+    invoke-static {v1}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    move-result-object v1
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/text/MatchResult;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/Parsers$escapeMarkdownCharacters$1;->invoke(Lkotlin/text/MatchResult;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "matchResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onClickUrl$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onClickUrl$1.smali
index ea564c4632..2f2bfe5638 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onClickUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onClickUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onClickUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Parsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,11 +67,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onClickUrl$1;->this$0:Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1;
 
@@ -97,18 +99,4 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Lcom/discord/utilities/uri/UriHandler;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onLongPressUrl$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onLongPressUrl$1.smali
index 52ae24427a..459f950ae7 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onLongPressUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onLongPressUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onLongPressUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Parsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1$onLongPressUrl$1;->this$0:Lcom/discord/utilities/textprocessing/Parsers$parseMarkdown$renderContext$1;
 
@@ -71,16 +73,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {v0, p1, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {v0, p1, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$1.smali
index b0c6bc1beb..796dadd789 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Parsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,11 +77,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 6
 
-    const/4 p3, 0x0
+    const-string p3, "clickContext"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo p3, "url"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
@@ -98,18 +100,4 @@
     invoke-static/range {v0 .. v5}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Lcom/discord/utilities/uri/UriHandler;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "clickContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$2.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$2.smali
index de47485c86..a89b5edafa 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$2.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Parsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$2;->$context:Landroid/content/Context;
 
@@ -69,16 +71,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {v0, p1, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {v0, p1, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onClickUrl$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onClickUrl$1.smali
index 029b2d21ed..e7ce2634fc 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onClickUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onClickUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onClickUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Parsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,11 +67,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onClickUrl$1;->this$0:Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1;
 
@@ -80,18 +82,4 @@
     invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onLongPressUrl$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onLongPressUrl$1.smali
index 6c76f03648..91c7e966c8 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onLongPressUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onLongPressUrl$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onLongPressUrl$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Parsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1$onLongPressUrl$1;->this$0:Lcom/discord/utilities/textprocessing/Parsers$parseMaskedLinks$renderContext$1;
 
@@ -77,13 +79,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
index a6ed35e204..553c84c445 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
@@ -312,183 +312,173 @@
 .end method
 
 .method public static final parseBoldMarkdown(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-    .locals 9
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "input"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/simpleast/core/parser/Parser;
+    new-instance v0, Lcom/discord/simpleast/core/parser/Parser;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v3, 0x0
 
-    sget-object v2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    new-instance v3, Lf/a/j/a/b/b;
+    sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+
+    new-instance v2, Lf/a/j/a/b/b;
 
     sget-object v4, Lf/a/j/a/b/a;->f:Ljava/util/regex/Pattern;
 
     const-string v5, "PATTERN_ESCAPE"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v3, v2, v4}, Lf/a/j/a/b/b;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
+    invoke-direct {v2, v1, v4}, Lf/a/j/a/b/b;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
 
-    invoke-virtual {v1, v3}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {v0, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+
+    move-result-object v0
+
+    sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+
+    invoke-virtual {v1}, Lf/a/j/a/b/a;->a()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
-    sget-object v2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+    invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-virtual {v2}, Lf/a/j/a/b/a;->a()Lcom/discord/simpleast/core/parser/Rule;
+    move-result-object v0
 
-    move-result-object v2
+    sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {v1}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
-    sget-object v2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+    invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-virtual {v2}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
-
-    move-result-object v3
-
-    const/4 v5, 0x0
+    move-result-object v4
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x4
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/4 v8, 0x4
 
-    move-object v4, p0
+    const/4 v9, 0x0
 
-    invoke-static/range {v3 .. v8}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
+    move-object v5, p0
+
+    invoke-static/range {v4 .. v9}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
 
     move-result-object p0
 
-    invoke-static {p0, v0}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    invoke-static {p0, v3}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     move-result-object p0
 
     const-string v0, "AstRenderer.render(ast, null)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "input"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final parseHookedLinks(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-    .locals 9
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "input"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/simpleast/core/parser/Parser;
+    new-instance v0, Lcom/discord/simpleast/core/parser/Parser;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v3, 0x0
 
-    sget-object v2, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-virtual {v2}, Lcom/discord/utilities/textprocessing/Rules;->createSoftHyphenRule()Lcom/discord/simpleast/core/parser/Rule;
+    sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {v1}, Lcom/discord/utilities/textprocessing/Rules;->createSoftHyphenRule()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
+    invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-virtual {v2}, Lcom/discord/utilities/textprocessing/Rules;->createNonMarkdownRule()Lcom/discord/simpleast/core/parser/Rule;
+    move-result-object v0
 
-    move-result-object v2
+    sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
-    invoke-virtual {v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {v1}, Lcom/discord/utilities/textprocessing/Rules;->createNonMarkdownRule()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
+    invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-virtual {v2}, Lcom/discord/utilities/textprocessing/Rules;->createHookedLinkRule()Lcom/discord/simpleast/core/parser/Rule;
+    move-result-object v0
 
-    move-result-object v2
+    sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
-    invoke-virtual {v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {v1}, Lcom/discord/utilities/textprocessing/Rules;->createHookedLinkRule()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
-    sget-object v2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+    invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-virtual {v2}, Lf/a/j/a/b/a;->a()Lcom/discord/simpleast/core/parser/Rule;
+    move-result-object v0
 
-    move-result-object v2
+    sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {v1}, Lf/a/j/a/b/a;->a()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
-    sget-object v2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+    invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-virtual {v2}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
+    move-result-object v0
 
-    move-result-object v2
+    sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {v1}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 
-    move-result-object v3
+    move-result-object v1
 
-    sget-object v5, Lkotlin/Unit;->a:Lkotlin/Unit;
+    invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
-    const/4 v6, 0x0
+    move-result-object v4
 
-    const/4 v7, 0x4
+    sget-object v6, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    move-object v4, p0
+    const/4 v8, 0x4
 
-    invoke-static/range {v3 .. v8}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
+    const/4 v9, 0x0
+
+    move-object v5, p0
+
+    invoke-static/range {v4 .. v9}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
 
     move-result-object p0
 
-    invoke-static {p0, v0}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    invoke-static {p0, v3}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     move-result-object p0
 
     const-string v0, "AstRenderer.render(ast, null)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "input"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Ljava/lang/CharSequence;
@@ -657,7 +647,7 @@
 .end method
 
 .method public static final parseMaskedLinks(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;)Ljava/lang/CharSequence;
-    .locals 10
+    .locals 9
     .param p4    # Ljava/lang/Integer;
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
@@ -687,39 +677,45 @@
         }
     .end annotation
 
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClickListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_2
+    const/4 v1, 0x1
 
-    if-eqz p1, :cond_1
+    invoke-static {v0, v1}, Lf/a/j/a/b/a;->c(ZI)Ljava/util/List;
 
-    if-eqz p2, :cond_0
+    move-result-object v8
 
-    const/4 v1, 0x0
+    sget-object v2, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
-    const/4 v2, 0x1
+    const/4 v5, 0x0
 
-    invoke-static {v1, v2}, Lf/a/j/a/b/a;->c(ZI)Ljava/util/List;
+    const/4 v6, 0x4
 
-    move-result-object v9
+    const/4 v7, 0x0
 
-    sget-object v3, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
+    move-object v3, v8
 
-    const/4 v6, 0x0
+    move-object v4, p4
 
-    const/4 v7, 0x4
-
-    const/4 v8, 0x0
-
-    move-object v4, v9
-
-    move-object v5, p4
-
-    invoke-static/range {v3 .. v8}, Lcom/discord/utilities/textprocessing/Parsers;->updateSimpleRulesCustomColors$default(Lcom/discord/utilities/textprocessing/Parsers;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)V
+    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/textprocessing/Parsers;->updateSimpleRulesCustomColors$default(Lcom/discord/utilities/textprocessing/Parsers;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)V
 
     new-instance p4, Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-direct {p4, v1, v2, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p4, v0, v1, v2}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     sget-object v0, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
@@ -761,7 +757,7 @@
 
     move-result-object p4
 
-    invoke-virtual {p4, v9}, Lcom/discord/simpleast/core/parser/Parser;->addRules(Ljava/util/Collection;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {p4, v8}, Lcom/discord/simpleast/core/parser/Parser;->addRules(Ljava/util/Collection;)Lcom/discord/simpleast/core/parser/Parser;
 
     move-result-object v0
 
@@ -771,8 +767,6 @@
 
     const/4 v4, 0x4
 
-    const/4 v5, 0x0
-
     move-object v1, p1
 
     invoke-static/range {v0 .. v5}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
@@ -789,30 +783,9 @@
 
     const-string p1, "AstRenderer.render(ast, renderContext)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "onClickListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "input"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
@@ -927,7 +900,7 @@
 
     move-result-object v5
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -992,7 +965,7 @@
 
     move-result-object v3
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -1068,7 +1041,7 @@
 .end method
 
 .method public final parseMarkdown(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;Lkotlin/jvm/functions/Function3;)Ljava/lang/CharSequence;
-    .locals 10
+    .locals 9
     .param p3    # Ljava/lang/Integer;
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
@@ -1097,21 +1070,23 @@
         }
     .end annotation
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "input"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
+    const/4 v1, 0x1
 
-    if-eqz p2, :cond_0
+    invoke-static {v0, v1}, Lf/a/j/a/b/a;->c(ZI)Ljava/util/List;
 
-    const/4 v1, 0x0
+    move-result-object v2
 
-    const/4 v2, 0x1
-
-    invoke-static {v1, v2}, Lf/a/j/a/b/a;->c(ZI)Ljava/util/List;
-
-    move-result-object v3
-
-    invoke-direct {p0, v3, p3, p4}, Lcom/discord/utilities/textprocessing/Parsers;->updateSimpleRulesCustomColors(Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;)V
+    invoke-direct {p0, v2, p3, p4}, Lcom/discord/utilities/textprocessing/Parsers;->updateSimpleRulesCustomColors(Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/textprocessing/Parsers;->createMarkdownRules(Landroid/content/Context;)Ljava/util/List;
 
@@ -1119,7 +1094,9 @@
 
     new-instance p4, Lcom/discord/simpleast/core/parser/Parser;
 
-    invoke-direct {p4, v1, v2, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v3, 0x0
+
+    invoke-direct {p4, v0, v1, v3}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     sget-object v0, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
@@ -1185,25 +1162,25 @@
 
     move-result-object p3
 
-    invoke-virtual {p3, v3}, Lcom/discord/simpleast/core/parser/Parser;->addRules(Ljava/util/Collection;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-virtual {p3, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRules(Ljava/util/Collection;)Lcom/discord/simpleast/core/parser/Parser;
 
-    move-result-object v4
+    move-result-object v3
 
     sget-object p3, Lcom/discord/utilities/textprocessing/MessageParseState;->Companion:Lcom/discord/utilities/textprocessing/MessageParseState$Companion;
 
     invoke-virtual {p3}, Lcom/discord/utilities/textprocessing/MessageParseState$Companion;->getInitialState()Lcom/discord/utilities/textprocessing/MessageParseState;
 
-    move-result-object v6
+    move-result-object v5
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    const/4 v8, 0x4
+    const/4 v7, 0x4
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    move-object v5, p2
+    move-object v4, p2
 
-    invoke-static/range {v4 .. v9}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
+    invoke-static/range {v3 .. v8}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
 
     move-result-object p2
 
@@ -1217,21 +1194,7 @@
 
     const-string p2, "AstRenderer.render(ast, renderContext)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali
index c87906e58c..0292d638be 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderLineClassedRule.smali
@@ -68,40 +68,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "headerPaddingSpanProvider"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "styleSpanProvider"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "classSpanProvider"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p3}, Lf/a/j/b/a$a;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 
     iput-object p1, p0, Lcom/discord/utilities/textprocessing/Rules$HeaderLineClassedRule;->headerPaddingSpanProvider:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "classSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "styleSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "headerPaddingSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -123,11 +106,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Lf/a/j/b/a$a;->parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
 
@@ -159,18 +144,4 @@
 
     :cond_0
     return-object p1
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderRule.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderRule.smali
index 66f189ed3d..bb7e2ea743 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderRule.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$HeaderRule.smali
@@ -60,31 +60,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "headerPaddingSpanProvider"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "styleSpanProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2}, Lf/a/j/b/a$c;-><init>(Lkotlin/jvm/functions/Function1;)V
 
     iput-object p1, p0, Lcom/discord/utilities/textprocessing/Rules$HeaderRule;->headerPaddingSpanProvider:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "styleSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "headerPaddingSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -106,11 +94,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -126,11 +116,11 @@
 
     sget-object v2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {v2}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
-    invoke-static {v1, v2}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1, v2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
@@ -146,7 +136,7 @@
 
     const-string v0, "matcher.group(1)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lf/a/j/b/a$c;->createHeaderStyleNode(Ljava/lang/String;)Lcom/discord/simpleast/core/node/StyleNode;
 
@@ -176,11 +166,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.simpleast.core.node.Node<RC>"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -204,18 +194,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
index 05ba99a12a..ee2f3214ce 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$MarkdownListItemRule.smali
@@ -56,7 +56,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "spansProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lf/a/j/b/a;->e:Lf/a/j/b/a;
 
@@ -67,15 +69,6 @@
     iput-object p1, p0, Lcom/discord/utilities/textprocessing/Rules$MarkdownListItemRule;->spansProvider:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "spansProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -97,11 +90,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
 
@@ -130,18 +125,4 @@
     invoke-direct {v0, p2, p3, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali
index bed59a69a0..d48acd015d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$PATTERN_UNICODE_EMOJI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Rules.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/regex/Pattern;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBlockQuoteRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBlockQuoteRule$1.smali
index 44349cbf72..ff148696ca 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBlockQuoteRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBlockQuoteRule$1.smali
@@ -48,7 +48,7 @@
 
 # virtual methods
 .method public match(Ljava/lang/CharSequence;Ljava/lang/String;Lcom/discord/utilities/textprocessing/Rules$BlockQuoteState;)Ljava/util/regex/Matcher;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -59,41 +59,31 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "inspectionSource"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "state"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3}, Lcom/discord/utilities/textprocessing/Rules$BlockQuoteState;->isInQuote()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x0
 
     goto :goto_0
 
     :cond_0
     invoke-super {p0, p1, p2, p3}, Lcom/discord/simpleast/core/parser/Rule$BlockRule;->match(Ljava/lang/CharSequence;Ljava/lang/String;Ljava/lang/Object;)Ljava/util/regex/Matcher;
 
-    move-result-object v0
+    move-result-object p1
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "inspectionSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public bridge synthetic match(Ljava/lang/CharSequence;Ljava/lang/String;Ljava/lang/Object;)Ljava/util/regex/Matcher;
@@ -125,13 +115,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "state"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -170,27 +164,6 @@
     invoke-direct {v0, p3, p2, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
 
     return-object v0
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBoldColoredRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBoldColoredRule$1.smali
index 06cbc0c664..5a84296dd9 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBoldColoredRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createBoldColoredRule$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createBoldColoredRule$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Rules.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createChannelMentionRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createChannelMentionRule$1.smali
index ee8abca3a6..1f29e44da8 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createChannelMentionRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createChannelMentionRule$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
@@ -97,18 +99,4 @@
     invoke-direct {p1, v0, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.smali
index 58897db118..efe9dd1ea2 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.smali
@@ -64,13 +64,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "state"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x2
 
@@ -107,27 +111,6 @@
     invoke-direct {p1, v0, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
index 15b5f1065e..78890a9274 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Rules.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Integer;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,9 @@
 .method public final invoke(ZILandroid/content/Context;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p3, :cond_1
+    const-string v0, "<anonymous parameter 2>"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1;->$emojiId:J
 
@@ -103,16 +105,7 @@
 
     const-string p2, "ModelEmojiCustom.getImag\u2026bled && isAnimated, size)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "<anonymous parameter 2>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1.smali
index c8d1f806a8..921e763abd 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1.smali
@@ -48,7 +48,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -64,90 +64,73 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
     invoke-virtual {p1, p2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/2addr p2, v1
+    xor-int/2addr p2, v0
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_0
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    sget-object v4, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
+    sget-object v3, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
     const/4 v0, 0x3
 
     invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    const-wide/16 v6, 0x0
+    const-wide/16 v5, 0x0
 
-    const/4 v8, 0x1
+    const/4 v7, 0x1
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    invoke-static/range {v4 .. v9}, Lcom/discord/utilities/textprocessing/Rules;->toLongOrDefault$default(Lcom/discord/utilities/textprocessing/Rules;Ljava/lang/String;JILjava/lang/Object;)J
+    invoke-static/range {v3 .. v8}, Lcom/discord/utilities/textprocessing/Rules;->toLongOrDefault$default(Lcom/discord/utilities/textprocessing/Rules;Ljava/lang/String;JILjava/lang/Object;)J
 
     move-result-wide v0
 
     new-instance p1, Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
-    new-instance v4, Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1;
+    new-instance v3, Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1;
 
-    invoke-direct {v4, v0, v1, p2}, Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1;-><init>(JZ)V
+    invoke-direct {v3, v0, v1, p2}, Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1;-><init>(JZ)V
+
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xc
 
-    const/16 v7, 0xc
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    move-object v1, p1
 
-    move-object v2, p1
-
-    invoke-direct/range {v2 .. v8}, Lcom/discord/utilities/textprocessing/node/EmojiNode;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function3;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/utilities/textprocessing/node/EmojiNode;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function3;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     new-instance p2, Lcom/discord/simpleast/core/parser/ParseSpec;
 
     invoke-direct {p2, p1, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p2
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createHookedLinkRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createHookedLinkRule$1.smali
index 9fa1ea4ffb..77e2f834c2 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createHookedLinkRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createHookedLinkRule$1.smali
@@ -64,15 +64,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-direct {p2, v0}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
@@ -91,18 +93,4 @@
     invoke-direct {v0, p2, p3, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.smali
index a5d70d096d..1fc35b0c94 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.smali
@@ -64,63 +64,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "state"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/CodeNode;
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
-
-    const/4 v1, 0x1
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-interface {p3}, Lcom/discord/utilities/textprocessing/Rules$BlockQuoteState;->isInQuote()Z
 
-    move-result v2
+    move-result v0
 
-    invoke-direct {p2, p1, v1, v2, v0}, Lcom/discord/utilities/textprocessing/node/CodeNode;-><init>(Ljava/lang/String;ZZLjava/lang/String;)V
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    invoke-direct {p2, p1, v1, v0, v2}, Lcom/discord/utilities/textprocessing/node/CodeNode;-><init>(Ljava/lang/String;ZZLjava/lang/String;)V
 
     new-instance p1, Lcom/discord/simpleast/core/parser/ParseSpec;
 
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createMaskedLinkRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createMaskedLinkRule$1.smali
index 9cc5a7ed8a..2452ae5d48 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createMaskedLinkRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createMaskedLinkRule$1.smali
@@ -48,7 +48,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -76,15 +78,15 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    invoke-static {p2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     new-instance v0, Lcom/discord/utilities/textprocessing/node/UrlNode;
 
@@ -95,28 +97,4 @@
     invoke-direct {p1, v0, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNamedEmojiRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNamedEmojiRule$1.smali
index bb3c8576c5..5e2ca5cc9c 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNamedEmojiRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNamedEmojiRule$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -76,19 +78,19 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    invoke-static {p2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
+    sget-object v0, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
-    invoke-static {v1}, Lcom/discord/utilities/textprocessing/Rules;->access$getEmojiDataProvider$p(Lcom/discord/utilities/textprocessing/Rules;)Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;
+    invoke-static {v0}, Lcom/discord/utilities/textprocessing/Rules;->access$getEmojiDataProvider$p(Lcom/discord/utilities/textprocessing/Rules;)Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1}, Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;->getUnicodeEmojisNamesMap()Ljava/util/Map;
+    invoke-interface {v0}, Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;->getUnicodeEmojisNamesMap()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -98,11 +100,13 @@
 
     sget-object p1, Lcom/discord/utilities/textprocessing/node/EmojiNode;->Companion:Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    invoke-static {p1, p2, v1, v2, v0}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from$default(Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;Lcom/discord/models/domain/emoji/ModelEmojiUnicode;IILjava/lang/Object;)Lcom/discord/utilities/textprocessing/node/EmojiNode;
+    const/4 v2, 0x0
+
+    invoke-static {p1, p2, v0, v1, v2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from$default(Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;Lcom/discord/models/domain/emoji/ModelEmojiUnicode;IILjava/lang/Object;)Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
     move-result-object p1
 
@@ -121,7 +125,7 @@
 
     const-string v0, "matcher.group()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -133,23 +137,4 @@
 
     :goto_0
     return-object p2
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNonMarkdownRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNonMarkdownRule$1.smali
index facb978e64..f22e0aeaff 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNonMarkdownRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createNonMarkdownRule$1.smali
@@ -48,7 +48,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -64,21 +64,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lf/a/j/a/a/a;
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -87,23 +89,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createRoleMentionRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createRoleMentionRule$1.smali
index 18691dc1c1..94f88b92a3 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createRoleMentionRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createRoleMentionRule$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
@@ -97,18 +99,4 @@
     invoke-direct {p1, v0, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSoftHyphenRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSoftHyphenRule$1.smali
index a0c29a1ffa..8aadbb21a8 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSoftHyphenRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSoftHyphenRule$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "parser"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lf/a/j/a/a/a;
 
@@ -81,18 +83,4 @@
     invoke-direct {p2, p1, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .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
index e40af681d6..a0d41a5441 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSpoilerRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSpoilerRule$1.smali
@@ -48,7 +48,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 3
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -64,54 +64,37 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode;
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_0
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-direct {p2, v2}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;-><init>(Ljava/lang/String;)V
+    invoke-direct {p2, v1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->start(I)I
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->start(I)I
 
-    move-result v0
+    move-result v1
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->end(I)I
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->end(I)I
 
     move-result p1
 
-    new-instance v1, Lcom/discord/simpleast/core/parser/ParseSpec;
+    new-instance v0, Lcom/discord/simpleast/core/parser/ParseSpec;
 
-    invoke-direct {v1, p2, p3, v0, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
+    invoke-direct {v0, p2, p3, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
 
-    return-object v1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createStrikethroughColoredRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createStrikethroughColoredRule$1.smali
index b783dd6cd4..c8f474709f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createStrikethroughColoredRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createStrikethroughColoredRule$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Rules$createStrikethroughColoredRule$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Rules.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.smali
index a97e65a6b3..164b871b67 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.smali
@@ -70,7 +70,7 @@
 
     sget-object p2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {p2}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p2
 
@@ -124,11 +124,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
@@ -138,7 +140,7 @@
 
     const-string v1, "matcher.group()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/utilities/textprocessing/Rules;->access$replaceEmojiSurrogates(Lcom/discord/utilities/textprocessing/Rules;Ljava/lang/String;)Ljava/lang/String;
 
@@ -154,13 +156,13 @@
 
     move-result p2
 
-    const/4 v0, 0x1
+    const-string v0, "null cannot be cast to non-null type com.discord.simpleast.core.node.Node<T>"
 
-    const-string v1, "null cannot be cast to non-null type com.discord.simpleast.core.node.Node<T>"
+    const/4 v1, 0x1
 
-    if-ne p2, v0, :cond_1
+    if-ne p2, v1, :cond_1
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -171,18 +173,18 @@
     goto :goto_1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_1
     new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
-    invoke-direct {p2, v0}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
+    invoke-direct {p2, v1}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -191,26 +193,26 @@
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    check-cast v0, Lcom/discord/simpleast/core/node/Node;
+    check-cast v1, Lcom/discord/simpleast/core/node/Node;
 
-    invoke-virtual {p2, v0}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
+    invoke-virtual {p2, v1}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
 
     goto :goto_0
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -223,18 +225,4 @@
     invoke-direct {p2, p1, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p2
-
-    :cond_4
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnescapeEmoticonRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnescapeEmoticonRule$1.smali
index bf1b8c2e58..f97f173484 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnescapeEmoticonRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnescapeEmoticonRule$1.smali
@@ -48,7 +48,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -64,21 +64,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lf/a/j/a/a/a;
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -87,23 +89,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnicodeEmojiRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnicodeEmojiRule$1.smali
index d13fd1b2fa..70d0a23b52 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnicodeEmojiRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUnicodeEmojiRule$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/util/regex/Matcher;->group()Ljava/lang/String;
 
@@ -94,11 +96,13 @@
 
     sget-object p1, Lcom/discord/utilities/textprocessing/node/EmojiNode;->Companion:Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    invoke-static {p1, p2, v1, v2, v0}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from$default(Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;Lcom/discord/models/domain/emoji/ModelEmojiUnicode;IILjava/lang/Object;)Lcom/discord/utilities/textprocessing/node/EmojiNode;
+    const/4 v2, 0x0
+
+    invoke-static {p1, p2, v0, v1, v2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from$default(Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;Lcom/discord/models/domain/emoji/ModelEmojiUnicode;IILjava/lang/Object;)Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
     move-result-object p1
 
@@ -113,7 +117,7 @@
 
     const-string v0, "match"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -125,18 +129,4 @@
 
     :goto_0
     return-object p2
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlNoEmbedRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlNoEmbedRule$1.smali
index c2493cd96f..02cb4ad36b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlNoEmbedRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlNoEmbedRule$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -76,10 +78,12 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/UrlNode;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-direct {p2, p1, v0, v1, v0}, Lcom/discord/utilities/textprocessing/node/UrlNode;-><init>(Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -89,23 +93,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlRule$1.smali
index 8d6a5f308b..a9d90e6f3d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUrlRule$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -76,10 +78,12 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/UrlNode;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-direct {p2, p1, v0, v1, v0}, Lcom/discord/utilities/textprocessing/node/UrlNode;-><init>(Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -89,23 +93,4 @@
     invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUserMentionRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUserMentionRule$1.smali
index d402fb5ef1..ea95777f19 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUserMentionRule$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createUserMentionRule$1.smali
@@ -48,7 +48,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 8
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -64,37 +64,39 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
     invoke-virtual {p1, p2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    sget-object v2, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
+    sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->INSTANCE:Lcom/discord/utilities/textprocessing/Rules;
 
     invoke-virtual {p1, p2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/textprocessing/Rules;->toLongOrDefault$default(Lcom/discord/utilities/textprocessing/Rules;Ljava/lang/String;JILjava/lang/Object;)J
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/textprocessing/Rules;->toLongOrDefault$default(Lcom/discord/utilities/textprocessing/Rules;Ljava/lang/String;JILjava/lang/Object;)J
 
     move-result-wide p1
 
@@ -117,7 +119,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_2
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     new-instance p2, Lcom/discord/utilities/textprocessing/node/UserMentionNode;
 
@@ -139,17 +141,17 @@
     sget-object p1, Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;->EVERYONE:Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;
 
     :goto_0
-    move-object v2, p1
+    move-object v1, p1
 
-    const-wide/16 v3, 0x0
+    const-wide/16 v2, 0x0
 
-    const/4 v5, 0x2
+    const/4 v4, 0x2
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    move-object v1, p2
+    move-object v0, p2
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/textprocessing/node/UserMentionNode;-><init>(Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/textprocessing/node/UserMentionNode;-><init>(Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     new-instance p1, Lcom/discord/simpleast/core/parser/ParseSpec;
 
@@ -157,23 +159,4 @@
 
     :goto_1
     return-object p1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .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 a761972472..ca5a6decb6 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
@@ -238,7 +238,7 @@
     :cond_0
     const-string p0, "emojiDataProvider"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -351,7 +351,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -364,33 +364,26 @@
 
     const-string v0, "stringBuffer.toString()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
     :cond_3
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
 
 .method public static final setEmojiDataProvider(Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "emojiDataProvider"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object p0, Lcom/discord/utilities/textprocessing/Rules;->emojiDataProvider:Lcom/discord/utilities/textprocessing/Rules$EmojiDataProvider;
 
     return-void
-
-    :cond_0
-    const-string p0, "emojiDataProvider"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method private final toLongOrDefault(Ljava/lang/String;J)J
@@ -398,7 +391,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {p1}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {p1}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -453,7 +446,7 @@
 
     const-string v2, "PATTERN_BLOCK_QUOTE"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createBlockQuoteRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -486,15 +479,23 @@
 
     const-string v1, "PATTERN_BOLD"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/utilities/textprocessing/Rules$createBoldColoredRule$1;
 
     invoke-direct {v1, p1}, Lcom/discord/utilities/textprocessing/Rules$createBoldColoredRule$1;-><init>(I)V
 
-    invoke-static {v0, v1}, Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+    const-string p1, "pattern"
 
-    move-result-object p1
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "styleFactory"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/j/a/b/e;
+
+    invoke-direct {p1, v1, v0, v0}, Lf/a/j/a/b/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
 
     return-object p1
 .end method
@@ -521,7 +522,7 @@
 
     const-string v2, "PATTERN_CHANNEL_MENTION"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createChannelMentionRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -550,7 +551,7 @@
 
     const-string v2, "PATTERN_CODE_BLOCK"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createCodeBlockRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -579,7 +580,7 @@
 
     const-string v2, "PATTERN_CUSTOM_EMOJI"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -608,7 +609,7 @@
 
     const-string v2, "PATTERN_HOOKED_LINK"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createHookedLinkRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -637,7 +638,7 @@
 
     const-string v2, "PATTERN_INLINE_CODE"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createInlineCodeRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -666,7 +667,7 @@
 
     const-string v2, "PATTERN_MASKED_LINK"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createMaskedLinkRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -695,7 +696,7 @@
 
     const-string v2, "PATTERN_NAMED_EMOJI"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createNamedEmojiRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -724,7 +725,7 @@
 
     const-string v2, "PATTERN_NON_MARKDOWN"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createNonMarkdownRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -753,7 +754,7 @@
 
     const-string v2, "PATTERN_ROLE_MENTION"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createRoleMentionRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -782,7 +783,7 @@
 
     const-string v2, "PATTERN_SOFT_HYPHEN"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createSoftHyphenRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -811,7 +812,7 @@
 
     const-string v2, "PATTERN_SPOILER"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createSpoilerRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -844,15 +845,23 @@
 
     const-string v1, "PATTERN_STRIKETHRU"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/utilities/textprocessing/Rules$createStrikethroughColoredRule$1;
 
     invoke-direct {v1, p1}, Lcom/discord/utilities/textprocessing/Rules$createStrikethroughColoredRule$1;-><init>(I)V
 
-    invoke-static {v0, v1}, Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+    const-string p1, "pattern"
 
-    move-result-object p1
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "styleFactory"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/j/a/b/e;
+
+    invoke-direct {p1, v1, v0, v0}, Lf/a/j/a/b/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
 
     return-object p1
 .end method
@@ -881,7 +890,7 @@
 
     const-string v2, "SimpleMarkdownRules.PATTERN_TEXT"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createTextReplacementRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -910,7 +919,7 @@
 
     const-string v2, "PATTERN_UNESCAPE_EMOTICON"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createUnescapeEmoticonRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -941,7 +950,7 @@
 
     const-string v2, "PATTERN_UNICODE_EMOJI"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createUnicodeEmojiRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -970,7 +979,7 @@
 
     const-string v2, "PATTERN_URL_NO_EMBED"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createUrlNoEmbedRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -999,7 +1008,7 @@
 
     const-string v2, "PATTERN_URL"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createUrlRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
@@ -1028,7 +1037,7 @@
 
     const-string v2, "PATTERN_MENTION"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createUserMentionRule$1;-><init>(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali
index 6197348b23..e4f984dafb 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Spans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/Object;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,121 +65,119 @@
 .method public final invoke(Ljava/lang/String;)Ljava/lang/Object;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "className"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
-    move-result v1
+    move-result v0
 
-    sparse-switch v1, :sswitch_data_0
+    sparse-switch v0, :sswitch_data_0
 
     goto :goto_0
 
     :sswitch_0
-    const-string v1, "fixed"
+    const-string v0, "fixed"
 
-    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Landroid/text/style/TextAppearanceSpan;
+    new-instance p1, Landroid/text/style/TextAppearanceSpan;
 
-    iget-object p1, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
+    iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
     const v1, 0x7f13017b
 
-    invoke-direct {v0, p1, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
+    invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
-    goto :goto_0
+    goto :goto_1
 
     :sswitch_1
-    const-string v1, "added"
+    const-string v0, "added"
 
-    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Landroid/text/style/TextAppearanceSpan;
+    new-instance p1, Landroid/text/style/TextAppearanceSpan;
 
-    iget-object p1, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
+    iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
     const v1, 0x7f13017a
 
-    invoke-direct {v0, p1, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
+    invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
-    goto :goto_0
+    goto :goto_1
 
     :sswitch_2
-    const-string v1, "improved"
+    const-string v0, "improved"
 
-    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Landroid/text/style/TextAppearanceSpan;
+    new-instance p1, Landroid/text/style/TextAppearanceSpan;
 
-    iget-object p1, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
+    iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
     const v1, 0x7f13017c
 
-    invoke-direct {v0, p1, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
+    invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
-    goto :goto_0
+    goto :goto_1
 
     :sswitch_3
-    const-string v1, "progress"
+    const-string v0, "progress"
 
-    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Landroid/text/style/TextAppearanceSpan;
+    new-instance p1, Landroid/text/style/TextAppearanceSpan;
 
-    iget-object p1, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
+    iget-object v0, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$context:Landroid/content/Context;
 
     const v1, 0x7f13017d
 
-    invoke-direct {v0, p1, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
+    invoke-direct {p1, v0, v1}, Landroid/text/style/TextAppearanceSpan;-><init>(Landroid/content/Context;I)V
 
-    goto :goto_0
+    goto :goto_1
 
     :sswitch_4
-    const-string v1, "marginTop"
+    const-string v0, "marginTop"
 
-    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    new-instance v0, Lcom/discord/utilities/spans/VerticalPaddingSpan;
+    new-instance p1, Lcom/discord/utilities/spans/VerticalPaddingSpan;
 
-    const/4 p1, 0x0
+    const/4 v0, 0x0
 
     iget v1, p0, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;->$marginTopPx:I
 
-    invoke-direct {v0, p1, v1}, Lcom/discord/utilities/spans/VerticalPaddingSpan;-><init>(II)V
+    invoke-direct {p1, v0, v1}, Lcom/discord/utilities/spans/VerticalPaddingSpan;-><init>(II)V
+
+    goto :goto_1
 
     :cond_0
     :goto_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "className"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_1
+    return-object p1
 
     :sswitch_data_0
     .sparse-switch
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali
index 7ab18a50f7..9269d77087 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Spans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali
index 2a08b31f33..a77ef13b9b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Spans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Landroid/text/style/CharacterStyle;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali
index b479903f0e..77b8ca421b 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Spans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -48,7 +48,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
index ad3873481a..04bbbabf9f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
@@ -46,7 +46,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -63,15 +65,6 @@
     invoke-direct {v1, p1, v0}, Lcom/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1;-><init>(Landroid/content/Context;I)V
 
     return-object v1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final createHeaderPaddingSpansProvider(Landroid/content/Context;)Lkotlin/jvm/functions/Function0;
@@ -88,7 +81,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -115,15 +110,6 @@
     invoke-direct {v1, v0, p1}, Lcom/discord/utilities/textprocessing/Spans$createHeaderPaddingSpansProvider$1;-><init>(II)V
 
     return-object v1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final createHeaderStyleSpanProvider(Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
@@ -140,22 +126,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1;
 
     invoke-direct {v0, p1}, Lcom/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1;-><init>(Landroid/content/Context;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final createMarkdownBulletSpansProvider(Landroid/content/Context;)Lkotlin/jvm/functions/Function0;
@@ -172,7 +151,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -188,13 +169,13 @@
 
     move-result-object v1
 
-    const v2, 0x7f060052
-
     invoke-virtual {p1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-static {v1, v2, v3}, Landroidx/core/content/res/ResourcesCompat;->getColor(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)I
+    const v3, 0x7f060052
+
+    invoke-static {v1, v3, v2}, Landroidx/core/content/res/ResourcesCompat;->getColor(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)I
 
     move-result v1
 
@@ -213,13 +194,4 @@
     invoke-direct {v2, p1, v0, v1}, Lcom/discord/utilities/textprocessing/Spans$createMarkdownBulletSpansProvider$1$1;-><init>(III)V
 
     return-object v2
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali b/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali
index 9a6e5806c6..0188352551 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Tags.smali
@@ -55,13 +55,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "channels"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "roles"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -104,27 +108,6 @@
     iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/Tags;->isEmpty:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "roles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/textprocessing/Tags;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/textprocessing/Tags;
@@ -226,40 +209,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "channels"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "roles"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/textprocessing/Tags;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/textprocessing/Tags;-><init>(Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "roles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -277,7 +243,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/textprocessing/Tags;->users:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -287,7 +253,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/textprocessing/Tags;->channels:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -297,7 +263,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/textprocessing/Tags;->roles:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali
index abed79eb5f..52251a57ac 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder$Companion.smali
@@ -46,7 +46,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "ast"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/textprocessing/TagsBuilder;
 
@@ -59,13 +61,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "ast"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
index 7f7aacb8d1..cc65e4607e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/TagsBuilder.smali
@@ -177,7 +177,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     iget-object v3, p0, Lcom/discord/utilities/textprocessing/TagsBuilder;->taggedChannelIds:Ljava/util/Set;
@@ -191,7 +191,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
     iget-object v4, p0, Lcom/discord/utilities/textprocessing/TagsBuilder;->taggedRoleIds:Ljava/util/Set;
@@ -205,7 +205,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_2
     invoke-direct {v0, v1, v3, v4}, Lcom/discord/utilities/textprocessing/Tags;-><init>(Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
@@ -214,7 +214,7 @@
 .end method
 
 .method public final processAst(Ljava/util/Collection;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -225,20 +225,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "ast"
 
-    invoke-static {p1, p0}, Ld0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p0}, Le0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ast"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public processNode(Lcom/discord/simpleast/core/node/Node;)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/BlockQuoteNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/BlockQuoteNode.smali
index fbbfb89af0..5a7a836093 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/BlockQuoteNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/BlockQuoteNode.smali
@@ -96,11 +96,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "renderContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0xa
 
@@ -179,7 +181,7 @@
 
     new-instance v3, Lcom/discord/utilities/spans/QuoteSpan;
 
-    const v4, 0x7f04051a
+    const v4, 0x7f04050c
 
     invoke-static {p2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -218,20 +220,6 @@
     invoke-virtual {p1, v0, v1, v2, p2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     return-void
-
-    :cond_2
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$render$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$render$1.smali
index ceb472eb85..b12088b74e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$render$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$render$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ChannelMentionNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -75,7 +77,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;->this$0:Lcom/discord/utilities/textprocessing/node/ChannelMentionNode;
 
@@ -86,13 +88,4 @@
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/stores/StoreChannelsSelected;->findAndSet(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali
index 4a6a7bef99..45e5cb0dcc 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode.smali
@@ -75,7 +75,7 @@
 .end method
 
 .method public render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext;)V
-    .locals 19
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -88,11 +88,15 @@
 
     move-object/from16 v1, p1
 
-    const/4 v2, 0x0
+    const-string v2, "builder"
 
-    if-eqz v1, :cond_4
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v2, "renderContext"
+
+    move-object/from16 v3, p2
+
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface/range {p2 .. p2}, Lcom/discord/utilities/textprocessing/node/BasicRenderContext;->getContext()Landroid/content/Context;
 
@@ -100,21 +104,21 @@
 
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v10
+    move-result v2
 
-    new-instance v11, Ljava/util/ArrayList;
+    new-instance v10, Ljava/util/ArrayList;
 
-    const/4 v3, 0x3
+    const/4 v5, 0x3
 
-    invoke-direct {v11, v3}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v10, v5}, Ljava/util/ArrayList;-><init>(I)V
 
-    new-instance v3, Landroid/text/style/StyleSpan;
+    new-instance v5, Landroid/text/style/StyleSpan;
 
-    const/4 v5, 0x1
+    const/4 v6, 0x1
 
-    invoke-direct {v3, v5}, Landroid/text/style/StyleSpan;-><init>(I)V
+    invoke-direct {v5, v6}, Landroid/text/style/StyleSpan;-><init>(I)V
 
-    invoke-virtual {v11, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v10, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     invoke-interface/range {p2 .. p2}, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext;->getChannelNames()Ljava/util/Map;
 
@@ -126,76 +130,79 @@
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v5
 
-    invoke-interface {v3, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Ljava/lang/String;
-
-    :cond_0
-    move-object v5, v2
-
-    const v2, 0x7f0601d8
-
-    if-eqz v5, :cond_1
-
-    new-instance v3, Lcom/discord/utilities/spans/ClickableSpan;
-
-    invoke-static {v4, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
-
-    move-result v2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    new-instance v2, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;
-
-    invoke-direct {v2, v0}, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;-><init>(Lcom/discord/utilities/textprocessing/node/ChannelMentionNode;)V
-
-    const/16 v17, 0x4
-
-    const/16 v18, 0x0
-
-    move-object v12, v3
-
-    move-object/from16 v16, v2
-
-    invoke-direct/range {v12 .. v18}, Lcom/discord/utilities/spans/ClickableSpan;-><init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v11, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    check-cast v3, Ljava/lang/String;
 
     goto :goto_0
 
-    :cond_1
-    new-instance v3, Landroid/text/style/ForegroundColorSpan;
-
-    invoke-static {v4, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
-
-    move-result v2
-
-    invoke-direct {v3, v2}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
-
-    invoke-virtual {v11, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    :cond_0
+    const/4 v3, 0x0
 
     :goto_0
-    new-instance v2, Landroid/text/style/BackgroundColorSpan;
+    move-object v5, v3
 
-    const v3, 0x7f0601d9
+    const v3, 0x7f0601d8
+
+    if-eqz v5, :cond_1
+
+    new-instance v6, Lcom/discord/utilities/spans/ClickableSpan;
 
     invoke-static {v4, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v3
 
-    invoke-direct {v2, v3}, Landroid/text/style/BackgroundColorSpan;-><init>(I)V
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-virtual {v11, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    move-result-object v12
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    new-instance v15, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;
+
+    invoke-direct {v15, v0}, Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$render$1;-><init>(Lcom/discord/utilities/textprocessing/node/ChannelMentionNode;)V
+
+    const/16 v16, 0x4
+
+    const/16 v17, 0x0
+
+    move-object v11, v6
+
+    invoke-direct/range {v11 .. v17}, Lcom/discord/utilities/spans/ClickableSpan;-><init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v10, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v6, Landroid/text/style/ForegroundColorSpan;
+
+    invoke-static {v4, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v3
+
+    invoke-direct {v6, v3}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
+
+    invoke-virtual {v10, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :goto_1
+    new-instance v3, Landroid/text/style/BackgroundColorSpan;
+
+    const v6, 0x7f0601d9
+
+    invoke-static {v4, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v6
+
+    invoke-direct {v3, v6}, Landroid/text/style/BackgroundColorSpan;-><init>(I)V
+
+    invoke-virtual {v10, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     sget-object v3, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
 
@@ -209,53 +216,39 @@
 
     invoke-static/range {v3 .. v9}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/utilities/channel/ChannelUtils;Landroid/content/Context;Ljava/lang/String;IZILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v1, v2}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v1, v3}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    invoke-interface {v11}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :goto_1
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v10}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v3
 
-    check-cast v3, Landroid/text/style/CharacterStyle;
-
-    invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
+    :goto_2
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
-    const/16 v5, 0x21
+    if-eqz v4, :cond_2
 
-    invoke-virtual {v1, v3, v10, v4, v5}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    goto :goto_1
+    move-result-object v4
+
+    check-cast v4, Landroid/text/style/CharacterStyle;
+
+    invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
+
+    move-result v5
+
+    const/16 v6, 0x21
+
+    invoke-virtual {v1, v4, v2, v5, v6}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+
+    goto :goto_2
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string v1, "renderContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_4
-    const-string v1, "builder"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
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 26f517d7db..ce627b7d4e 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali
@@ -31,9 +31,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;ZZLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -48,15 +50,6 @@
     iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->isRevealed:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -80,7 +73,7 @@
 
     iget-object v1, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->language:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -94,7 +87,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -120,7 +113,7 @@
 .end method
 
 .method public render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/BasicRenderContext;)V
-    .locals 20
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -135,164 +128,166 @@
 
     move-object/from16 v2, p2
 
-    const/4 v3, 0x0
+    const-string v3, "builder"
 
-    if-eqz v1, :cond_a
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_9
+    const-string v3, "renderContext"
 
-    new-instance v4, Ljava/util/ArrayList;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+    new-instance v3, Ljava/util/ArrayList;
+
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface/range {p2 .. p2}, Lcom/discord/utilities/textprocessing/node/BasicRenderContext;->getContext()Landroid/content/Context;
 
+    move-result-object v4
+
+    const/high16 v5, 0x7f090000
+
+    invoke-static {v4, v5}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface;
+
     move-result-object v5
 
-    const/high16 v6, 0x7f090000
+    const/4 v6, 0x0
 
-    invoke-static {v5, v6}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface;
+    invoke-static {v5, v6}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;
 
-    move-result-object v6
+    move-result-object v5
 
-    const/4 v7, 0x0
+    new-instance v7, Lcom/discord/utilities/spans/TypefaceSpanCompat;
 
-    invoke-static {v6, v7}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;
+    const-string v8, "codeTypeface"
 
-    move-result-object v6
+    invoke-static {v5, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v8, Lcom/discord/utilities/spans/TypefaceSpanCompat;
+    invoke-direct {v7, v5}, Lcom/discord/utilities/spans/TypefaceSpanCompat;-><init>(Landroid/graphics/Typeface;)V
 
-    const-string v9, "codeTypeface"
+    invoke-virtual {v3, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    invoke-static {v6, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    new-instance v5, Landroid/text/style/RelativeSizeSpan;
 
-    invoke-direct {v8, v6}, Lcom/discord/utilities/spans/TypefaceSpanCompat;-><init>(Landroid/graphics/Typeface;)V
+    const v7, 0x3f59999a    # 0.85f
 
-    invoke-virtual {v4, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-direct {v5, v7}, Landroid/text/style/RelativeSizeSpan;-><init>(F)V
 
-    new-instance v6, Landroid/text/style/RelativeSizeSpan;
+    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    const v8, 0x3f59999a    # 0.85f
+    new-instance v5, Landroid/text/style/ForegroundColorSpan;
 
-    invoke-direct {v6, v8}, Landroid/text/style/RelativeSizeSpan;-><init>(F)V
+    const v7, 0x7f06007a
 
-    invoke-virtual {v4, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-static {v4, v7}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
-    new-instance v6, Landroid/text/style/ForegroundColorSpan;
+    move-result v7
 
-    const v8, 0x7f06007a
+    invoke-direct {v5, v7}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
 
-    invoke-static {v5, v8}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    move-result v8
+    iget-boolean v5, v0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z
 
-    invoke-direct {v6, v8}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
+    const/4 v7, 0x5
 
-    invoke-virtual {v4, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    const v8, 0x7f04050f
 
-    iget-boolean v6, v0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z
+    const/16 v9, 0xa
 
-    const/4 v8, 0x5
+    const/4 v10, 0x1
 
-    const v9, 0x7f04051d
+    if-eqz v5, :cond_0
 
-    const/16 v10, 0xa
+    new-instance v5, Landroid/text/style/BackgroundColorSpan;
 
-    const/4 v11, 0x1
+    invoke-static {v4, v8}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
-    if-eqz v6, :cond_0
+    move-result v11
 
-    new-instance v6, Landroid/text/style/BackgroundColorSpan;
+    invoke-direct {v5, v11}, Landroid/text/style/BackgroundColorSpan;-><init>(I)V
 
-    invoke-static {v5, v9}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
-    move-result v12
-
-    invoke-direct {v6, v12}, Landroid/text/style/BackgroundColorSpan;-><init>(I)V
-
-    invoke-virtual {v4, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_0
     invoke-interface/range {p1 .. p1}, Ljava/lang/CharSequence;->length()I
 
-    move-result v6
+    move-result v5
 
-    if-lez v6, :cond_1
+    if-lez v5, :cond_1
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
     goto :goto_0
 
     :cond_1
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     :goto_0
-    if-eqz v6, :cond_2
+    if-eqz v5, :cond_2
 
-    new-array v6, v8, [C
+    new-array v5, v7, [C
+
+    invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
+
+    move-result v11
+
+    sub-int/2addr v11, v10
 
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
     move-result v12
 
-    sub-int/2addr v12, v11
+    invoke-virtual {v1, v11, v12, v5, v6}, Landroid/text/SpannableStringBuilder;->getChars(II[CI)V
 
-    invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
+    aget-char v5, v5, v6
 
-    move-result v13
+    if-eq v5, v9, :cond_2
 
-    invoke-virtual {v1, v12, v13, v6, v7}, Landroid/text/SpannableStringBuilder;->getChars(II[CI)V
-
-    aget-char v6, v6, v7
-
-    if-eq v6, v10, :cond_2
-
-    invoke-virtual {v1, v10}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v1, v9}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
 
     :cond_2
     :goto_1
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v6
+    move-result v5
 
     invoke-virtual/range {p0 .. p0}, Lf/a/j/a/a/a;->getContent()Ljava/lang/String;
 
-    move-result-object v12
+    move-result-object v11
 
-    invoke-virtual {v1, v12}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v1, v11}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    iget-boolean v12, v0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z
+    iget-boolean v11, v0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z
 
-    const/16 v13, 0x21
+    const/16 v12, 0x21
 
-    if-nez v12, :cond_7
+    if-nez v11, :cond_7
 
-    invoke-virtual {v1, v10}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v1, v9}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/utilities/textprocessing/node/CodeNode;->isRevealed()Z
 
-    move-result v10
+    move-result v9
 
-    if-eqz v10, :cond_3
+    if-eqz v9, :cond_3
 
-    invoke-static {v5, v9}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v4, v8}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v2
 
     :goto_2
-    move v15, v2
+    move v14, v2
 
     goto :goto_3
 
     :cond_3
-    instance-of v9, v2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
+    instance-of v8, v2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
 
-    if-nez v9, :cond_4
+    if-nez v8, :cond_4
 
-    move-object v2, v3
+    const/4 v2, 0x0
 
     :cond_4
     check-cast v2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
@@ -306,89 +301,89 @@
     goto :goto_2
 
     :cond_5
-    const v2, 0x7f04052c
+    const v2, 0x7f04051e
 
-    invoke-static {v5, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v4, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v2
 
     goto :goto_2
 
     :goto_3
-    const v2, 0x7f04051e
+    const v2, 0x7f040510
 
-    invoke-static {v5, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v4, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
-    move-result v16
+    move-result v15
 
     new-instance v2, Lcom/discord/utilities/spans/BlockBackgroundSpan;
 
-    invoke-static {v11}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
+    invoke-static {v10}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
+
+    move-result v16
+
+    const/4 v4, 0x4
+
+    invoke-static {v4}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v17
 
-    const/4 v3, 0x4
+    iget-boolean v4, v0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inQuote:Z
 
-    invoke-static {v3}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
+    if-eqz v4, :cond_6
 
-    move-result v18
+    sget-object v4, Lcom/discord/utilities/textprocessing/node/BlockQuoteNode;->Companion:Lcom/discord/utilities/textprocessing/node/BlockQuoteNode$Companion;
 
-    iget-boolean v3, v0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inQuote:Z
+    invoke-virtual {v4}, Lcom/discord/utilities/textprocessing/node/BlockQuoteNode$Companion;->getTOTAL_LEFT_MARGIN()I
 
-    if-eqz v3, :cond_6
+    move-result v6
 
-    sget-object v3, Lcom/discord/utilities/textprocessing/node/BlockQuoteNode;->Companion:Lcom/discord/utilities/textprocessing/node/BlockQuoteNode$Companion;
-
-    invoke-virtual {v3}, Lcom/discord/utilities/textprocessing/node/BlockQuoteNode$Companion;->getTOTAL_LEFT_MARGIN()I
-
-    move-result v7
-
-    move/from16 v19, v7
+    move/from16 v18, v6
 
     goto :goto_4
 
     :cond_6
-    const/16 v19, 0x0
+    const/16 v18, 0x0
 
     :goto_4
-    move-object v14, v2
+    move-object v13, v2
 
-    invoke-direct/range {v14 .. v19}, Lcom/discord/utilities/spans/BlockBackgroundSpan;-><init>(IIIII)V
+    invoke-direct/range {v13 .. v18}, Lcom/discord/utilities/spans/BlockBackgroundSpan;-><init>(IIIII)V
 
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v3
+    move-result v4
 
-    invoke-virtual {v1, v2, v6, v3, v13}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {v1, v2, v5, v4, v12}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     new-instance v2, Landroid/text/style/LeadingMarginSpan$Standard;
 
-    const/16 v3, 0xf
+    const/16 v4, 0xf
 
-    invoke-direct {v2, v3}, Landroid/text/style/LeadingMarginSpan$Standard;-><init>(I)V
+    invoke-direct {v2, v4}, Landroid/text/style/LeadingMarginSpan$Standard;-><init>(I)V
 
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v3
+    move-result v4
 
-    invoke-virtual {v1, v2, v6, v3, v13}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {v1, v2, v5, v4, v12}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
-    invoke-static {v8}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
+    invoke-static {v7}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v2
 
-    new-instance v3, Lcom/discord/utilities/spans/VerticalPaddingSpan;
+    new-instance v4, Lcom/discord/utilities/spans/VerticalPaddingSpan;
 
-    invoke-direct {v3, v2, v2}, Lcom/discord/utilities/spans/VerticalPaddingSpan;-><init>(II)V
+    invoke-direct {v4, v2, v2}, Lcom/discord/utilities/spans/VerticalPaddingSpan;-><init>(II)V
 
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
     move-result v2
 
-    invoke-virtual {v1, v3, v6, v2, v13}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {v1, v4, v5, v2, v12}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     :cond_7
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v2
 
@@ -409,26 +404,12 @@
 
     move-result v4
 
-    invoke-virtual {v1, v3, v6, v4, v13}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {v1, v3, v5, v4, v12}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     goto :goto_5
 
     :cond_8
     return-void
-
-    :cond_9
-    const-string v1, "renderContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_a
-    const-string v1, "builder"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali
index 7db024d838..ef91ae5caa 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "EmojiNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Integer;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(ZILandroid/content/Context;)Ljava/lang/String;
     .locals 0
 
-    if-eqz p3, :cond_0
+    const-string p1, "context"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1;->$codePoints:Ljava/lang/String;
 
@@ -85,16 +87,7 @@
 
     const-string p2, "ModelEmojiUnicode.getImageUri(codePoints, context)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali
index 89556be4ed..cd60d2406f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "EmojiNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Integer;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,9 @@
 .method public final invoke(ZILandroid/content/Context;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p3, :cond_1
+    const-string v0, "<anonymous parameter 2>"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$from$5;->$emojiId:J
 
@@ -103,16 +105,7 @@
 
     const-string p2, "ModelEmojiCustom.getImag\u2026isAnimationEnabled, size)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "<anonymous parameter 2>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali
index f24f069df0..111519162c 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$Companion.smali
@@ -146,29 +146,31 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "reactionEmoji"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->isCustom()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    move-object v1, p1
+    if-eqz v0, :cond_0
+
+    move-object v0, p1
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_2
 
     sget-object v2, Lcom/discord/utilities/textprocessing/node/EmojiNode;->Companion:Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getName()Ljava/lang/String;
 
     move-result-object v3
 
@@ -180,21 +182,21 @@
     const-string v3, ""
 
     :goto_1
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getId()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getId()Ljava/lang/String;
 
     move-result-object v4
 
-    if-eqz v4, :cond_2
+    invoke-static {v4}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v5, "it.id!!"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v4}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
     move-result-wide v4
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->isAnimated()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->isAnimated()Z
 
     move-result v6
 
@@ -202,62 +204,50 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from(Ljava/lang/String;JZI)Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_2
 
-    move-object v0, v1
+    move-object v1, v0
 
     goto :goto_2
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    throw v0
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getEmojis()Lcom/discord/stores/StoreEmoji;
 
-    :cond_3
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getEmojis()Lcom/discord/stores/StoreEmoji;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreEmoji;->getUnicodeEmojiSurrogateMap()Ljava/util/Map;
 
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreEmoji;->getUnicodeEmojiSurrogateMap()Ljava/util/Map;
-
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getName()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
     check-cast p1, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_3
 
     sget-object v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->Companion:Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;I)Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
-    move-result-object v0
+    move-result-object v1
 
-    :cond_4
+    :cond_3
     :goto_2
-    return-object v0
-
-    :cond_5
-    const-string p1, "reactionEmoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public final from(Lcom/discord/models/domain/emoji/ModelEmojiCustom;I)Lcom/discord/utilities/textprocessing/node/EmojiNode;
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T::",
@@ -270,42 +260,35 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "customEmoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
     const-string v0, "customEmoji.name"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->getId()J
 
-    move-result-wide v2
+    move-result-wide v3
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->isAnimated()Z
 
-    move-result v4
+    move-result v5
 
-    move-object v0, p0
+    move-object v1, p0
 
-    move v5, p2
+    move v6, p2
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from(Ljava/lang/String;JZI)Lcom/discord/utilities/textprocessing/node/EmojiNode;
+    invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->from(Ljava/lang/String;JZI)Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "customEmoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final from(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;I)Lcom/discord/utilities/textprocessing/node/EmojiNode;
@@ -322,7 +305,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "unicodeEmoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->getCodePoints()Ljava/lang/String;
 
@@ -334,9 +319,9 @@
 
     move-result-object p1
 
-    const-string v2, "unicodeEmoji.firstName"
+    const-string/jumbo v2, "unicodeEmoji.firstName"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion$from$1;
 
@@ -345,15 +330,6 @@
     invoke-direct {v1, p1, v2, p2, p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function3;II)V
 
     return-object v1
-
-    :cond_0
-    const-string p1, "unicodeEmoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final renderEmoji(Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;Lcom/discord/models/domain/ModelMessageReaction$Emoji;Z)V
@@ -381,9 +357,11 @@
 .method public final renderEmoji(Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;Lcom/discord/models/domain/ModelMessageReaction$Emoji;ZI)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "$this$renderEmoji"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     if-eqz p2, :cond_0
 
@@ -431,11 +409,4 @@
 
     :goto_1
     return-void
-
-    :cond_3
-    const-string p1, "$this$renderEmoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1.smali
index 6553230150..49d957bc4f 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "EmojiNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,13 +63,57 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 6
+    .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/utilities/textprocessing/node/EmojiNode;
+    new-instance v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;
+
+    iget-object v1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
+
+    invoke-virtual {v1}, Lf/a/j/a/a/a;->getContent()Ljava/lang/String;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
+
+    invoke-static {v2}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getUrlProvider$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)Lkotlin/jvm/functions/Function3;
+
+    move-result-object v2
+
+    iget-object v3, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
+
+    invoke-static {v3}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getWidth$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)I
+
+    move-result v3
+
+    iget-object v4, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
+
+    invoke-static {v4}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getHeight$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)I
+
+    move-result v4
+
+    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/utilities/textprocessing/node/EmojiNode;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function3;II)V
+
+    new-instance v1, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+
+    invoke-direct {v1}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;-><init>()V
+
+    new-instance v2, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1$1;
+
+    invoke-direct {v2, p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1$1;-><init>(Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;)V
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;)V
+
+    const/16 v0, 0x2002
+
+    invoke-virtual {v1, v0}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
+
+    const/16 v0, 0x589
+
+    invoke-virtual {v1, v0}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
 
     iget-object v2, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
 
@@ -77,70 +121,21 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
+    invoke-virtual {v1, v2}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    invoke-static {v3}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getUrlProvider$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)Lkotlin/jvm/functions/Function3;
-
-    move-result-object v3
-
-    iget-object v4, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
-
-    invoke-static {v4}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getWidth$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)I
-
-    move-result v4
-
-    iget-object v5, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
-
-    invoke-static {v5}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getHeight$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)I
-
-    move-result v5
-
-    invoke-direct {v1, v2, v3, v4, v5}, Lcom/discord/utilities/textprocessing/node/EmojiNode;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function3;II)V
-
-    new-instance v2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
-    invoke-direct {v2}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;-><init>()V
-
-    new-instance v3, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1$1;
-
-    invoke-direct {v3, p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1$1;-><init>(Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;)V
-
-    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;)V
-
-    const/16 v1, 0x2002
-
-    invoke-virtual {v2, v1}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
-
-    const/16 v1, 0x589
-
-    invoke-virtual {v2, v1}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
-
-    iget-object v3, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode;
-
-    invoke-virtual {v3}, Lf/a/j/a/a/a;->getContent()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
-
-    invoke-virtual {v2, v1}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v1, v0}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
+
+    const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v2, v1, v0, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v1, v0, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
index f43ee58dc9..6200e8856d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
@@ -172,11 +172,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "emojiName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "urlProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
@@ -191,20 +193,6 @@
     iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "urlProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emojiName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Lkotlin/jvm/functions/Function3;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -312,7 +300,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -364,7 +352,7 @@
 .end method
 
 .method public render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;)V
-    .locals 25
+    .locals 26
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -379,155 +367,159 @@
 
     move-object/from16 v2, p2
 
-    const/4 v3, 0x0
+    const-string v3, "builder"
 
-    if-eqz v1, :cond_d
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_c
+    const-string v3, "renderContext"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface/range {p2 .. p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->getContext()Landroid/content/Context;
 
-    move-result-object v4
+    move-result-object v3
 
-    move-object v5, v1
+    move-object v4, v1
 
-    check-cast v5, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    check-cast v4, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v6
+    move-result v5
 
     invoke-virtual/range {p0 .. p0}, Lf/a/j/a/a/a;->getContent()Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v6
 
-    invoke-virtual {v1, v7}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v1, v6}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    iget-boolean v7, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isJumbo:Z
+    iget-boolean v6, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isJumbo:Z
 
-    if-eqz v7, :cond_0
+    if-eqz v6, :cond_0
 
-    iget v7, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
+    iget v6, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
 
-    mul-int/lit8 v7, v7, 0x3
+    mul-int/lit8 v6, v6, 0x3
 
     goto :goto_0
 
     :cond_0
-    iget v7, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
+    iget v6, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->width:I
 
     :goto_0
-    iget-boolean v8, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isJumbo:Z
+    iget-boolean v7, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isJumbo:Z
 
-    if-eqz v8, :cond_1
+    if-eqz v7, :cond_1
 
-    iget v8, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
+    iget v7, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
 
-    mul-int/lit8 v8, v8, 0x3
+    mul-int/lit8 v7, v7, 0x3
 
     goto :goto_1
 
     :cond_1
-    iget v8, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
+    iget v7, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->height:I
 
     :goto_1
-    iget-boolean v9, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isJumbo:Z
-
-    const/4 v10, 0x1
-
-    if-eqz v9, :cond_2
+    iget-boolean v8, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isJumbo:Z
 
     const/4 v9, 0x1
 
+    if-eqz v8, :cond_2
+
+    const/4 v8, 0x1
+
     goto :goto_2
 
     :cond_2
-    const/4 v9, 0x2
+    const/4 v8, 0x2
 
     :goto_2
-    iget-object v11, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->urlProvider:Lkotlin/jvm/functions/Function3;
+    iget-object v10, v0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->urlProvider:Lkotlin/jvm/functions/Function3;
 
     invoke-interface/range {p2 .. p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->isAnimationEnabled()Z
 
+    move-result v11
+
+    invoke-static {v11}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v11
+
+    invoke-static {v6}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
+
     move-result v12
 
-    invoke-static {v12}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {v12}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v12
 
-    invoke-static {v7}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
-
-    move-result v13
-
-    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-interface/range {p2 .. p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->getContext()Landroid/content/Context;
 
     move-result-object v13
 
-    invoke-interface/range {p2 .. p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;->getContext()Landroid/content/Context;
+    invoke-interface {v10, v11, v12, v13}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v14
+    move-result-object v10
 
-    invoke-interface {v11, v12, v13, v14}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast v10, Ljava/lang/String;
 
-    move-result-object v11
+    const/4 v11, 0x0
 
-    check-cast v11, Ljava/lang/String;
+    invoke-static {v10, v11, v11, v9}, Lcom/discord/utilities/images/MGImages;->getImageRequest(Ljava/lang/String;IIZ)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
-    const/4 v12, 0x0
+    move-result-object v10
 
-    invoke-static {v11, v12, v12, v10}, Lcom/discord/utilities/images/MGImages;->getImageRequest(Ljava/lang/String;IIZ)Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
+    invoke-virtual {v10}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a()Lcom/facebook/imagepipeline/request/ImageRequest;
 
-    move-result-object v11
-
-    invoke-virtual {v11}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->a()Lcom/facebook/imagepipeline/request/ImageRequest;
-
-    move-result-object v11
+    move-result-object v10
 
     invoke-static {}, Lf/g/g/a/a/b;->a()Lf/g/g/a/a/d;
 
-    move-result-object v13
+    move-result-object v12
 
-    iput-object v11, v13, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->d:Ljava/lang/Object;
+    iput-object v10, v12, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->d:Ljava/lang/Object;
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed()Z
 
-    move-result v11
+    move-result v10
 
-    iput-boolean v11, v13, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->k:Z
+    iput-boolean v10, v12, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->k:Z
 
-    invoke-virtual {v13}, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->b()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v12}, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->b()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    move-result-object v11
+    move-result-object v10
 
-    invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v13
+    move-result-object v12
 
-    new-instance v14, Lf/g/g/f/a;
+    new-instance v13, Lf/g/g/f/a;
 
-    invoke-direct {v14, v13}, Lf/g/g/f/a;-><init>(Landroid/content/res/Resources;)V
+    invoke-direct {v13, v12}, Lf/g/g/f/a;-><init>(Landroid/content/res/Resources;)V
 
-    new-instance v13, Landroid/graphics/drawable/ColorDrawable;
+    new-instance v12, Landroid/graphics/drawable/ColorDrawable;
 
-    invoke-direct {v13, v12}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
+    invoke-direct {v12, v11}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
-    iput-object v13, v14, Lf/g/g/f/a;->d:Landroid/graphics/drawable/Drawable;
+    iput-object v12, v13, Lf/g/g/f/a;->d:Landroid/graphics/drawable/Drawable;
 
-    sget-object v13, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->c:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v12, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->c:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object v13, v14, Lf/g/g/f/a;->l:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v12, v13, Lf/g/g/f/a;->l:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed()Z
 
-    move-result v13
+    move-result v12
 
-    if-nez v13, :cond_6
+    if-nez v12, :cond_6
 
-    instance-of v13, v2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
+    instance-of v12, v2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
 
-    if-nez v13, :cond_3
+    const/4 v14, 0x0
 
-    move-object v15, v3
+    if-nez v12, :cond_3
+
+    move-object v15, v14
 
     goto :goto_3
 
@@ -537,73 +529,73 @@
     :goto_3
     check-cast v15, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
 
-    if-nez v13, :cond_4
+    if-nez v12, :cond_4
 
     goto :goto_4
 
     :cond_4
-    move-object v3, v2
+    move-object v14, v2
 
     :goto_4
-    check-cast v3, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
+    check-cast v14, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;
 
-    if-eqz v3, :cond_5
+    if-eqz v14, :cond_5
 
-    invoke-interface {v3}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;->getSpoilerColorRes()I
+    invoke-interface {v14}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;->getSpoilerColorRes()I
 
-    move-result v3
+    move-result v12
 
     goto :goto_5
 
     :cond_5
-    const v3, 0x7f04052c
+    const v12, 0x7f04051e
 
-    invoke-static {v4, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v3, v12}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
-    move-result v3
+    move-result v12
 
     :goto_5
-    new-instance v13, Landroid/graphics/drawable/ColorDrawable;
+    new-instance v14, Landroid/graphics/drawable/ColorDrawable;
 
-    invoke-direct {v13, v3}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
+    invoke-direct {v14, v12}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
-    invoke-virtual {v14, v13}, Lf/g/g/f/a;->b(Landroid/graphics/drawable/Drawable;)Lf/g/g/f/a;
+    invoke-virtual {v13, v14}, Lf/g/g/f/a;->b(Landroid/graphics/drawable/Drawable;)Lf/g/g/f/a;
 
     :cond_6
     invoke-virtual/range {p1 .. p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v3
+    move-result v12
 
-    sub-int/2addr v3, v10
+    sub-int/2addr v12, v9
 
-    invoke-virtual {v14}, Lf/g/g/f/a;->a()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v13}, Lf/g/g/f/a;->a()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    move-result-object v10
+    move-result-object v9
 
     new-instance v13, Lcom/facebook/drawee/view/DraweeHolder;
 
-    invoke-direct {v13, v10}, Lcom/facebook/drawee/view/DraweeHolder;-><init>(Lcom/facebook/drawee/interfaces/DraweeHierarchy;)V
+    invoke-direct {v13, v9}, Lcom/facebook/drawee/view/DraweeHolder;-><init>(Lcom/facebook/drawee/interfaces/DraweeHierarchy;)V
 
-    invoke-virtual {v13, v11}, Lcom/facebook/drawee/view/DraweeHolder;->g(Lcom/facebook/drawee/interfaces/DraweeController;)V
+    invoke-virtual {v13, v10}, Lcom/facebook/drawee/view/DraweeHolder;->g(Lcom/facebook/drawee/interfaces/DraweeController;)V
 
-    invoke-virtual {v5}, Landroid/text/SpannableStringBuilder;->length()I
+    invoke-virtual {v4}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v10
+    move-result v9
 
-    const/16 v11, 0x21
+    const/16 v10, 0x21
 
-    if-lt v3, v10, :cond_7
+    if-lt v12, v9, :cond_7
 
     goto :goto_6
 
     :cond_7
     invoke-virtual {v13}, Lcom/facebook/drawee/view/DraweeHolder;->d()Landroid/graphics/drawable/Drawable;
 
-    move-result-object v10
+    move-result-object v9
 
-    if-eqz v10, :cond_9
+    if-eqz v9, :cond_9
 
-    invoke-virtual {v10}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
+    invoke-virtual {v9}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
 
     move-result-object v14
 
@@ -613,80 +605,80 @@
 
     if-eqz v14, :cond_8
 
-    invoke-virtual {v10, v12, v12, v7, v8}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+    invoke-virtual {v9, v11, v11, v6, v7}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
 
     :cond_8
-    iget-object v7, v5, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->e:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;
+    iget-object v6, v4, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->e:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;
 
-    invoke-virtual {v10, v7}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
+    invoke-virtual {v9, v6}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
     :cond_9
-    new-instance v7, Lf/g/g/i/a;
+    new-instance v6, Lf/g/g/i/a;
 
-    invoke-direct {v7, v13, v9}, Lf/g/g/i/a;-><init>(Lcom/facebook/drawee/view/DraweeHolder;I)V
+    invoke-direct {v6, v13, v8}, Lf/g/g/i/a;-><init>(Lcom/facebook/drawee/view/DraweeHolder;I)V
 
-    iget-object v9, v13, Lcom/facebook/drawee/view/DraweeHolder;->e:Lcom/facebook/drawee/interfaces/DraweeController;
+    iget-object v8, v13, Lcom/facebook/drawee/view/DraweeHolder;->e:Lcom/facebook/drawee/interfaces/DraweeController;
 
-    instance-of v10, v9, Lcom/facebook/drawee/controller/AbstractDraweeController;
+    instance-of v9, v8, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    if-eqz v10, :cond_a
+    if-eqz v9, :cond_a
 
-    check-cast v9, Lcom/facebook/drawee/controller/AbstractDraweeController;
+    check-cast v8, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    new-instance v10, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
+    new-instance v9, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
 
-    invoke-direct {v10, v5, v7, v12, v8}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;-><init>(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Lf/g/g/i/a;ZI)V
+    invoke-direct {v9, v4, v6, v11, v7}, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;-><init>(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Lf/g/g/i/a;ZI)V
 
-    invoke-virtual {v9, v10}, Lcom/facebook/drawee/controller/AbstractDraweeController;->f(Lcom/facebook/drawee/controller/ControllerListener;)V
+    invoke-virtual {v8, v9}, Lcom/facebook/drawee/controller/AbstractDraweeController;->f(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     :cond_a
-    iget-object v8, v5, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->d:Ljava/util/Set;
+    iget-object v7, v4, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->d:Ljava/util/Set;
 
-    invoke-interface {v8, v7}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    invoke-interface {v7, v6}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    add-int/lit8 v8, v3, 0x1
+    add-int/lit8 v7, v12, 0x1
 
-    invoke-virtual {v5, v7, v6, v8, v11}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {v4, v6, v5, v7, v10}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     :goto_6
-    new-instance v5, Lcom/discord/utilities/spans/ClickableSpan;
+    new-instance v4, Lcom/discord/utilities/spans/ClickableSpan;
 
-    const v7, 0x7f0601d8
+    const v6, 0x7f0601d8
 
-    invoke-static {v4, v7}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-static {v3, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
-    move-result v4
+    move-result v3
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v13
-
-    const/4 v14, 0x0
+    move-result-object v14
 
     const/4 v15, 0x0
 
-    new-instance v4, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;
+    const/16 v16, 0x0
 
-    invoke-direct {v4, v0, v2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;-><init>(Lcom/discord/utilities/textprocessing/node/EmojiNode;Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;)V
+    new-instance v3, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;
 
-    const/16 v17, 0x4
+    invoke-direct {v3, v0, v2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$render$clickableSpan$1;-><init>(Lcom/discord/utilities/textprocessing/node/EmojiNode;Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;)V
 
-    const/16 v18, 0x0
+    const/16 v18, 0x4
 
-    move-object v12, v5
+    const/16 v19, 0x0
 
-    move-object/from16 v16, v4
+    move-object v13, v4
 
-    invoke-direct/range {v12 .. v18}, Lcom/discord/utilities/spans/ClickableSpan;-><init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object/from16 v17, v3
 
-    if-gt v6, v3, :cond_b
+    invoke-direct/range {v13 .. v19}, Lcom/discord/utilities/spans/ClickableSpan;-><init>(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-virtual {v1, v5, v6, v3, v11}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    if-gt v5, v12, :cond_b
+
+    invoke-virtual {v1, v4, v5, v12, v10}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
     goto :goto_7
 
     :cond_b
-    sget-object v19, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v20, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/Exception;
 
@@ -712,34 +704,20 @@
 
     invoke-direct {v1, v2}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
-    const/16 v22, 0x0
+    const/16 v23, 0x0
 
-    const/16 v23, 0x4
+    const/16 v24, 0x4
 
-    const/16 v24, 0x0
+    const/16 v25, 0x0
 
-    const-string v20, "Unable to render emoji tappable span."
+    const-string v21, "Unable to render emoji tappable span."
 
-    move-object/from16 v21, v1
+    move-object/from16 v22, v1
 
-    invoke-static/range {v19 .. v24}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    invoke-static/range {v20 .. v25}, 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_7
     return-void
-
-    :cond_c
-    const-string v1, "renderContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_d
-    const-string v1, "builder"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali
index 4517cc4336..b80f8a37fe 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/RoleMentionNode.smali
@@ -84,36 +84,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "renderContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I
 
-    move-result v1
+    move-result v0
 
     invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext;->getRoles()Ljava/util/Map;
 
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    iget-wide v2, p0, Lcom/discord/utilities/textprocessing/node/RoleMentionNode;->roleId:J
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
     move-result-object v2
 
-    if-eqz v2, :cond_0
+    invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-wide v3, p0, Lcom/discord/utilities/textprocessing/node/RoleMentionNode;->roleId:J
+    move-result-object v1
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    check-cast v1, Lcom/discord/models/domain/ModelGuildRole;
 
-    move-result-object v0
-
-    invoke-interface {v2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/models/domain/ModelGuildRole;
+    goto :goto_0
 
     :cond_0
-    if-nez v0, :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    if-nez v1, :cond_1
 
     const-string p2, "deleted-role"
 
@@ -128,7 +135,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
 
     move-result-object v3
 
@@ -138,13 +145,13 @@
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->isDefaultColor()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->isDefaultColor()Z
 
     move-result v3
 
     if-nez v3, :cond_2
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->getColor()I
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->getColor()I
 
     move-result v3
 
@@ -154,7 +161,7 @@
 
     move-result v3
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_2
     invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext;->getContext()Landroid/content/Context;
@@ -167,40 +174,40 @@
 
     move-result v3
 
-    :goto_0
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->isDefaultColor()Z
+    :goto_1
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->isDefaultColor()Z
 
     move-result v4
 
     if-nez v4, :cond_3
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->getColor()I
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->getColor()I
 
     move-result p2
 
-    const/16 v0, 0x19
+    const/16 v1, 0x19
 
-    invoke-static {p2, v0}, Landroidx/core/graphics/ColorUtils;->setAlphaComponent(II)I
+    invoke-static {p2, v1}, Landroidx/core/graphics/ColorUtils;->setAlphaComponent(II)I
 
     move-result p2
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_3
     invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext;->getContext()Landroid/content/Context;
 
     move-result-object p2
 
-    const v0, 0x7f0601d9
+    const v1, 0x7f0601d9
 
-    invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result p2
 
-    :goto_1
-    const/4 v0, 0x3
+    :goto_2
+    const/4 v1, 0x3
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
     const/4 v4, 0x0
 
@@ -210,13 +217,13 @@
 
     invoke-direct {v5, v6}, Landroid/text/style/StyleSpan;-><init>(I)V
 
-    aput-object v5, v0, v4
+    aput-object v5, v1, v4
 
     new-instance v4, Landroid/text/style/ForegroundColorSpan;
 
     invoke-direct {v4, v3}, Landroid/text/style/ForegroundColorSpan;-><init>(I)V
 
-    aput-object v4, v0, v6
+    aput-object v4, v1, v6
 
     const/4 v3, 0x2
 
@@ -224,9 +231,9 @@
 
     invoke-direct {v4, p2}, Landroid/text/style/BackgroundColorSpan;-><init>(I)V
 
-    aput-object v4, v0, v3
+    aput-object v4, v1, v3
 
-    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p2
 
@@ -236,16 +243,16 @@
 
     move-result-object p2
 
-    :goto_2
+    :goto_3
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I
 
@@ -253,26 +260,12 @@
 
     const/16 v3, 0x21
 
-    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
+    invoke-virtual {p1, v1, v0, v2, v3}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1.smali
index 45a6d93bd3..8b12710ad7 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SpoilerNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$$inlined$let$lambda$1;->$handler:Lkotlin/jvm/functions/Function1;
 
@@ -78,13 +80,4 @@
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .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
index a0beca0851..de26773ff3 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
@@ -35,9 +35,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/simpleast/core/node/Node;-><init>()V
 
@@ -48,15 +50,6 @@
     iput p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->id:I
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final createStyles(Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;)Ljava/util/List;
@@ -211,11 +204,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "renderContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I
 
@@ -267,7 +262,7 @@
 
     const-string v2, "builder.getSpans(startIn\u2026lickableSpan::class.java)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v2, v1
 
@@ -318,20 +313,6 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali
index ad1a9b2b68..05febd07eb 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$Companion.smali
@@ -38,7 +38,9 @@
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/net/URL;
 
@@ -101,16 +103,7 @@
 
     const-string v0, "safeUrlStringBuilder.toString()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$1.smali
index 5a91b3c2b7..435226e494 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UrlNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$1;->$renderContext:Lcom/discord/utilities/textprocessing/node/UrlNode$RenderContext;
 
@@ -78,13 +80,4 @@
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$2.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$2.smali
index f8654533df..a216fefd07 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$2.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UrlNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$2;->$renderContext:Lcom/discord/utilities/textprocessing/node/UrlNode$RenderContext;
 
@@ -83,7 +85,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/textprocessing/node/UrlNode$render$style$2;->$safeUrl:Ljava/lang/String;
 
@@ -96,13 +98,4 @@
     invoke-interface {v0, p1, v1, v2}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali
index 2ee23803d5..b71a2dd040 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode.smali
@@ -48,9 +48,11 @@
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/simpleast/core/node/Node;-><init>()V
 
@@ -59,15 +61,6 @@
     iput-object p2, p0, Lcom/discord/utilities/textprocessing/node/UrlNode;->mask:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -113,11 +106,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "renderContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     sget-object v0, Lcom/discord/utilities/textprocessing/node/UrlNode;->Companion:Lcom/discord/utilities/textprocessing/node/UrlNode$Companion;
@@ -189,20 +184,6 @@
     invoke-virtual {p1, p2}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     return-void
-
-    :cond_1
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1.smali
index feead0ba9b..2f8edc6138 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserMentionNode.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/textprocessing/node/UserMentionNode$renderUserMention$clickableSpan$1;->$renderContext:Lcom/discord/utilities/textprocessing/node/UserMentionNode$RenderContext;
 
@@ -93,13 +95,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali
index c11ab3204f..86280a2e7a 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UserMentionNode.smali
@@ -30,9 +30,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/simpleast/core/node/Node;-><init>()V
 
@@ -41,15 +43,6 @@
     iput-wide p2, p0, Lcom/discord/utilities/textprocessing/node/UserMentionNode;->userId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -156,7 +149,7 @@
     const-string v3, "invalid-user"
 
     :goto_1
-    invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -323,11 +316,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "builder"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "renderContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/textprocessing/node/UserMentionNode;->type:Lcom/discord/utilities/textprocessing/node/UserMentionNode$Type;
 
@@ -440,20 +435,6 @@
     :cond_2
     :goto_2
     return-void
-
-    :cond_3
-    const-string p1, "renderContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/time/ClockFactory.smali b/com.discord/smali/com/discord/utilities/time/ClockFactory.smali
index bf29b0f11a..59a716a7ae 100644
--- a/com.discord/smali/com/discord/utilities/time/ClockFactory.smali
+++ b/com.discord/smali/com/discord/utilities/time/ClockFactory.smali
@@ -42,7 +42,7 @@
     :cond_0
     const-string v0, "ntpClock"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -52,35 +52,41 @@
 
 # virtual methods
 .method public final init(Landroid/app/Application;)V
-    .locals 13
+    .locals 14
 
-    const/4 v0, 0x0
+    const-string v0, "application"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
-    sget-object v1, Lf/k/a/b;->e:Lf/k/a/b;
+    sget-object v0, Lf/k/a/b;->e:Lf/k/a/b;
 
     sget-object v6, Lf/k/a/b;->a:Ljava/util/List;
 
-    sget-object v1, Lf/k/a/b;->e:Lf/k/a/b;
+    sget-object v0, Lf/k/a/b;->e:Lf/k/a/b;
 
     sget-wide v7, Lf/k/a/b;->d:J
 
-    sget-object v1, Lf/k/a/b;->e:Lf/k/a/b;
+    sget-object v0, Lf/k/a/b;->e:Lf/k/a/b;
 
     sget-wide v9, Lf/k/a/b;->c:J
 
-    sget-object v1, Lf/k/a/b;->e:Lf/k/a/b;
+    sget-object v0, Lf/k/a/b;->e:Lf/k/a/b;
 
     sget-wide v11, Lf/k/a/b;->b:J
 
-    if-eqz v6, :cond_1
+    const-string v0, "context"
 
-    new-instance v0, Lf/k/a/f/a;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0}, Lf/k/a/f/a;-><init>()V
+    const-string v0, "ntpHosts"
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v13, Lf/k/a/f/a;
+
+    invoke-direct {v13}, Lf/k/a/f/a;-><init>()V
 
     new-instance v1, Lf/k/a/f/c;
 
@@ -94,11 +100,21 @@
 
     const-string v2, "context.getSharedPrefere\u2026ME, Context.MODE_PRIVATE)"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v1, p1}, Lf/k/a/f/c;-><init>(Landroid/content/SharedPreferences;)V
 
-    instance-of p1, v0, Lcom/lyft/kronos/KronosClock;
+    const-string p1, "localClock"
+
+    invoke-static {v13, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "syncResponseCache"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of p1, v13, Lcom/lyft/kronos/KronosClock;
 
     if-nez p1, :cond_0
 
@@ -108,35 +124,35 @@
 
     invoke-direct {p1}, Lf/k/a/f/d/d;-><init>()V
 
-    new-instance v3, Lf/k/a/f/d/b;
+    new-instance v0, Lf/k/a/f/d/b;
 
-    invoke-direct {v3}, Lf/k/a/f/d/b;-><init>()V
+    invoke-direct {v0}, Lf/k/a/f/d/b;-><init>()V
 
-    invoke-direct {v2, v0, p1, v3}, Lf/k/a/f/d/e;-><init>(Lf/k/a/a;Lf/k/a/f/d/c;Lf/k/a/f/d/a;)V
+    invoke-direct {v2, v13, p1, v0}, Lf/k/a/f/d/e;-><init>(Lf/k/a/a;Lf/k/a/f/d/c;Lf/k/a/f/d/a;)V
 
     new-instance v4, Lf/k/a/f/d/g;
 
-    invoke-direct {v4, v1, v0}, Lf/k/a/f/d/g;-><init>(Lf/k/a/e;Lf/k/a/a;)V
+    invoke-direct {v4, v1, v13}, Lf/k/a/f/d/g;-><init>(Lf/k/a/e;Lf/k/a/a;)V
 
     new-instance p1, Lf/k/a/f/d/i;
 
     move-object v1, p1
 
-    move-object v3, v0
+    move-object v3, v13
 
     invoke-direct/range {v1 .. v12}, Lf/k/a/f/d/i;-><init>(Lf/k/a/f/d/e;Lf/k/a/a;Lf/k/a/f/d/f;Lf/k/a/d;Ljava/util/List;JJJ)V
 
-    new-instance v1, Lf/k/a/f/b;
+    new-instance v0, Lf/k/a/f/b;
 
-    invoke-direct {v1, p1, v0}, Lf/k/a/f/b;-><init>(Lf/k/a/f/d/h;Lf/k/a/a;)V
+    invoke-direct {v0, p1, v13}, Lf/k/a/f/b;-><init>(Lf/k/a/f/d/h;Lf/k/a/a;)V
 
-    iget-object p1, v1, Lf/k/a/f/b;->a:Lf/k/a/f/d/h;
+    iget-object p1, v0, Lf/k/a/f/b;->a:Lf/k/a/f/d/h;
 
     invoke-interface {p1}, Lf/k/a/f/d/h;->b()V
 
     new-instance p1, Lcom/discord/utilities/time/NtpClock;
 
-    invoke-direct {p1, v1}, Lcom/discord/utilities/time/NtpClock;-><init>(Lcom/lyft/kronos/KronosClock;)V
+    invoke-direct {p1, v0}, Lcom/discord/utilities/time/NtpClock;-><init>(Lcom/lyft/kronos/KronosClock;)V
 
     sput-object p1, Lcom/discord/utilities/time/ClockFactory;->ntpClock:Lcom/discord/utilities/time/NtpClock;
 
@@ -150,18 +166,4 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "ntpHosts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/time/NtpClock.smali b/com.discord/smali/com/discord/utilities/time/NtpClock.smali
index f6e510137f..21302ff459 100644
--- a/com.discord/smali/com/discord/utilities/time/NtpClock.smali
+++ b/com.discord/smali/com/discord/utilities/time/NtpClock.smali
@@ -12,24 +12,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lyft/kronos/KronosClock;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "kronosClock"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/time/NtpClock;->kronosClock:Lcom/lyft/kronos/KronosClock;
 
     return-void
-
-    :cond_0
-    const-string p1, "kronosClock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/time/TimeElapsed$milliseconds$2.smali b/com.discord/smali/com/discord/utilities/time/TimeElapsed$milliseconds$2.smali
index f4418b279b..7327598eb9 100644
--- a/com.discord/smali/com/discord/utilities/time/TimeElapsed$milliseconds$2.smali
+++ b/com.discord/smali/com/discord/utilities/time/TimeElapsed$milliseconds$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/time/TimeElapsed$milliseconds$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TimeElapsed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Long;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/time/TimeElapsed$seconds$2.smali b/com.discord/smali/com/discord/utilities/time/TimeElapsed$seconds$2.smali
index b46e907925..c9467becbc 100644
--- a/com.discord/smali/com/discord/utilities/time/TimeElapsed$seconds$2.smali
+++ b/com.discord/smali/com/discord/utilities/time/TimeElapsed$seconds$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/time/TimeElapsed$seconds$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TimeElapsed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Float;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/time/TimeElapsed.smali b/com.discord/smali/com/discord/utilities/time/TimeElapsed.smali
index 7d4a52f504..619330ee83 100644
--- a/com.discord/smali/com/discord/utilities/time/TimeElapsed.smali
+++ b/com.discord/smali/com/discord/utilities/time/TimeElapsed.smali
@@ -13,9 +13,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "clock"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,15 +44,6 @@
     iput-object p1, p0, Lcom/discord/utilities/time/TimeElapsed;->seconds$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/utilities/time/Clock;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/time/TimeUtils.smali b/com.discord/smali/com/discord/utilities/time/TimeUtils.smali
index ae27f27931..fb4b466dc1 100644
--- a/com.discord/smali/com/discord/utilities/time/TimeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/time/TimeUtils.smali
@@ -47,20 +47,22 @@
 .end method
 
 .method public static final currentTimeUTCDateString(Lcom/discord/utilities/time/Clock;)Ljava/lang/String;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "clock"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p0
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-static {p0, v0, v1, v0}, Lcom/discord/utilities/time/TimeUtils;->toUTCDateTime$default(Ljava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
@@ -68,23 +70,18 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "clock"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getMonthsBetweenDates(Ljava/util/Date;Ljava/util/Date;)I
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "firstDate"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "secondDate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Ljava/util/Calendar;->getInstance()Ljava/util/Calendar;
 
@@ -98,7 +95,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p0}, Ljava/util/Calendar;->setTime(Ljava/util/Date;)V
 
@@ -107,7 +104,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Ljava/util/Calendar;->setTime(Ljava/util/Date;)V
 
@@ -139,26 +136,14 @@
     sub-int/2addr p1, v2
 
     return p1
-
-    :cond_2
-    const-string p0, "secondDate"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "firstDate"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getReadableTimeString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p0, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/time/TimeUtils;->parseUTCDate(Ljava/lang/String;)J
 
@@ -173,15 +158,6 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final parseSnowflake(Ljava/lang/Long;)J
@@ -282,7 +258,7 @@
 
     const-string p3, "calendar"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -310,7 +286,7 @@
 
     const-string p2, "outputFormat.format(offsetDate)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -354,7 +330,7 @@
 
     const-string p3, "DateFormat.getMediumDateFormat(context)"
 
-    invoke-static {p4, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_1
     move-object v4, p4
@@ -467,7 +443,7 @@
 
     const-string v1, "calendar"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p0, p1}, Ljava/util/Calendar;->setTimeInMillis(J)V
 
@@ -532,7 +508,9 @@
 .method public static final toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence;
     .locals 8
 
-    if-eqz p0, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/time/TimeUtils;->localeManager:Lcom/discord/utilities/locale/LocaleManager;
 
@@ -546,7 +524,7 @@
 
     const-string v1, "en"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -583,33 +561,24 @@
 
     const-string p1, "DateUtils.getRelativeDat\u2026RMAT_NUMERIC_DATE\n      )"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final toUTCDateTime(Ljava/lang/Long;Ljava/lang/String;)Ljava/lang/String;
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "format"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/text/SimpleDateFormat;
+    new-instance v0, Ljava/text/SimpleDateFormat;
 
-    sget-object v2, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
+    sget-object v1, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
 
-    invoke-direct {v1, p1, v2}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;Ljava/util/Locale;)V
+    invoke-direct {v0, p1, v1}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;Ljava/util/Locale;)V
 
     const-string p1, "UTC"
 
@@ -617,10 +586,12 @@
 
     move-result-object p1
 
-    invoke-virtual {v1, p1}, Ljava/text/SimpleDateFormat;->setTimeZone(Ljava/util/TimeZone;)V
+    invoke-virtual {v0, p1}, Ljava/text/SimpleDateFormat;->setTimeZone(Ljava/util/TimeZone;)V
 
     if-nez p0, :cond_0
 
+    const/4 p0, 0x0
+
     goto :goto_0
 
     :cond_0
@@ -628,23 +599,16 @@
 
     invoke-virtual {p0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-direct {p1, v2, v3}, Ljava/util/Date;-><init>(J)V
+    invoke-direct {p1, v1, v2}, Ljava/util/Date;-><init>(J)V
 
-    invoke-virtual {v1, p1}, Ljava/text/SimpleDateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
+    invoke-virtual {v0, p1}, Ljava/text/SimpleDateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "format"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method public static synthetic toUTCDateTime$default(Ljava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
@@ -693,7 +657,9 @@
 .method public final getLocalizedMonthName(ILandroid/content/Context;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p2, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/text/DateFormatSymbols;
 
@@ -715,18 +681,9 @@
 
     const-string p2, "DateFormatSymbols(locale\u2026xt)).months[monthInt - 1]"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getMinutesFromMillis(J)I
@@ -756,7 +713,9 @@
 .method public final renderUtcDate(JLandroid/content/Context;I)Ljava/lang/String;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/time/TimeUtils;->localeManager:Lcom/discord/utilities/locale/LocaleManager;
 
@@ -778,32 +737,29 @@
 
     const-string p2, "formatter.format(unixTimeMillis)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final renderUtcDate(Ljava/lang/String;Landroid/content/Context;Ljava/lang/String;Ljava/text/DateFormat;I)Ljava/lang/String;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "utcDate"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "context"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "inputFormat"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "outputFormat"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/time/TimeUtils;->localeManager:Lcom/discord/utilities/locale/LocaleManager;
 
@@ -826,46 +782,22 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "outputFormat"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inputFormat"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "utcDate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final renderUtcDateTime(Ljava/lang/String;Landroid/content/Context;Ljava/lang/String;II)Ljava/lang/String;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "utcDateTime"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "context"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inputFormat"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/text/SimpleDateFormat;
 
@@ -909,30 +841,9 @@
 
     const-string p2, "outputDateFormatInstance.format(date)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "inputFormat"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "utcDateTime"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final toFriendlyString(JJLjava/lang/String;)Ljava/lang/CharSequence;
@@ -973,7 +884,7 @@
 
     const-string p2, "DateUtils.getRelativeTim\u2026AT_NUMERIC_DATE\n        )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
@@ -1024,7 +935,7 @@
     const-string p2, "elapsedTime"
 
     :goto_0
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1032,7 +943,9 @@
 .method public final toReadableTimeStringEN(Ljava/util/Locale;J)Ljava/lang/String;
     .locals 5
 
-    if-eqz p1, :cond_3
+    const-string v0, "locale"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
 
@@ -1040,7 +953,7 @@
 
     const-string v1, "en"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1173,17 +1086,8 @@
 
     const-string p2, "formatterDateTime.format(unixTimeMillis)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
-
-    :cond_3
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali
index 2bff55bc53..4473c6fbb6 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/uri/UriHandler$directToPlayStore$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UriHandler.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/String;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
@@ -83,7 +85,7 @@
 
     move-result-object p1
 
-    const-string v0, "utm_source="
+    const-string/jumbo v0, "utm_source="
 
     invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -113,16 +115,7 @@
 
     const-string v0, "Uri.parse(uri).buildUpon\u2026ild()\n        .toString()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali
index 87cbd1a53c..4ffacda03c 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/uri/UriHandler$directToPlayStore$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UriHandler.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1$notice$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1$notice$1.smali
index 932f4e9293..9188ffdd23 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1$notice$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1$notice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1$notice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UriHandler.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,41 +65,47 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lf/a/a/e/a;->i:Lf/a/a/e/a$b;
+    sget-object v0, Lf/a/a/e/a;->i:Lf/a/a/e/a$b;
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object p1
 
-    const-string v2, "activity.supportFragmentManager"
+    const-string v1, "activity.supportFragmentManager"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1$notice$1;->this$0:Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;
+    iget-object v1, p0, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1$notice$1;->this$0:Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;
 
-    iget-object v2, v2, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;->$url:Ljava/lang/String;
+    iget-object v1, v1, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;->$url:Ljava/lang/String;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    if-eqz v2, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "url"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/a/e/a;
 
     invoke-direct {v0}, Lf/a/a/e/a;-><init>()V
 
-    new-instance v1, Landroid/os/Bundle;
+    new-instance v2, Landroid/os/Bundle;
 
-    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
+    invoke-direct {v2}, Landroid/os/Bundle;-><init>()V
 
     const-string v3, "WIDGET_SPOOPY_LINKS_DIALOG_URL"
 
-    invoke-virtual {v1, v3, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v2, v3, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
     const-string v1, "WIDGET_SPOOPY_LINKS_DIALOG"
 
@@ -110,19 +116,7 @@
     return p1
 
     :cond_0
-    const-string p1, "url"
+    const/4 p1, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    throw v0
-
-    :cond_2
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1.smali
index 50c3284da7..8f63e6d52f 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$handleOrUntrusted$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UriHandler.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     move-object/from16 v2, p1
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -116,13 +116,13 @@
 
     const/4 v2, 0x5
 
-    new-array v2, v2, [Lj0/r/b;
+    new-array v2, v2, [Lk0/s/b;
 
     const/4 v3, 0x0
 
     const-class v4, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
@@ -132,7 +132,7 @@
 
     const-class v4, Lcom/discord/widgets/user/WidgetUserMentions;
 
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
@@ -142,7 +142,7 @@
 
     const-class v4, Lcom/discord/widgets/search/WidgetSearch;
 
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
@@ -152,7 +152,7 @@
 
     const-class v4, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;
 
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
@@ -162,7 +162,7 @@
 
     const-class v4, Lcom/discord/widgets/media/WidgetMedia;
 
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$openUrlWithCustomTabs$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$openUrlWithCustomTabs$1.smali
index 16225901c9..97f2f27e6a 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$openUrlWithCustomTabs$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$openUrlWithCustomTabs$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/uri/UriHandler$openUrlWithCustomTabs$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UriHandler.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/browser/customtabs/CustomTabsIntent;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroidx/browser/customtabs/CustomTabsIntent;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/uri/UriHandler$openUrlWithCustomTabs$1;->$context:Landroid/content/Context;
 
@@ -74,13 +76,4 @@
     invoke-virtual {p1, v0, v1}, Landroidx/browser/customtabs/CustomTabsIntent;->launchUrl(Landroid/content/Context;Landroid/net/Uri;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali
index 01aea80c34..b4c31efefb 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$showUnhandledUrlDialog$$inlined$apply$lambda$1.smali
@@ -41,11 +41,11 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    const-string v1, "v.context"
+    const-string/jumbo v1, "v.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
@@ -55,7 +55,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$warmUp$connection$1.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$warmUp$connection$1.smali
index 8f6c623bad..60109a7a19 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$warmUp$connection$1.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$warmUp$connection$1.smali
@@ -38,11 +38,13 @@
 .method public onCustomTabsServiceConnected(Landroid/content/ComponentName;Landroidx/browser/customtabs/CustomTabsClient;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "client"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
@@ -68,20 +70,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "client"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onServiceDisconnected(Landroid/content/ComponentName;)V
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
index d423288457..90329a8278 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
@@ -69,13 +69,17 @@
 .method public static final directToPlayStore(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "packageName"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/uri/UriHandler$directToPlayStore$1;
 
@@ -96,27 +100,6 @@
     invoke-virtual {p1, p0, p2, v1}, Lcom/discord/utilities/uri/UriHandler;->handle(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "source"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "packageName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic directToPlayStore$default(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
@@ -184,7 +167,7 @@
 
     const-string v5, "pm.queryIntentActivities(activityIntent, 0)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v5, Ljava/util/ArrayList;
 
@@ -277,7 +260,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-static {v4}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v4}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v4
 
@@ -414,11 +397,13 @@
 
     move-object/from16 v1, p1
 
-    const/4 v2, 0x0
+    const-string v2, "context"
 
-    if-eqz v0, :cond_1
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    const-string/jumbo v2, "url"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -454,6 +439,10 @@
 
     move-result-object v10
 
+    new-instance v15, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;
+
+    invoke-direct {v15, v0, v1}, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;-><init>(Landroid/content/Context;Ljava/lang/String;)V
+
     const/4 v11, 0x0
 
     const/4 v12, 0x0
@@ -462,10 +451,6 @@
 
     const/4 v14, 0x0
 
-    new-instance v15, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;
-
-    invoke-direct {v15, v0, v1}, Lcom/discord/utilities/uri/UriHandler$handleOrUntrusted$1;-><init>(Landroid/content/Context;Ljava/lang/String;)V
-
     const/16 v16, 0x1e
 
     const/16 v17, 0x0
@@ -473,20 +458,6 @@
     invoke-static/range {v9 .. v17}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v0, "url"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public static synthetic handleOrUntrusted$default(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
@@ -518,7 +489,7 @@
 
     const-string p2, "packageManager.queryInte\u2026ager.GET_RESOLVED_FILTER)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -717,13 +688,17 @@
         }
     .end annotation
 
-    const/4 v3, 0x0
+    const-string v3, "context"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v3, "uri"
 
-    if-eqz p3, :cond_1
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "launchFunction"
+
+    invoke-static {p3, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v3, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
@@ -733,7 +708,7 @@
 
     const-string v5, "context.packageManager"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v3, v4}, Lcom/discord/utilities/uri/UriHandler;->getPackageNameToUse(Landroid/content/pm/PackageManager;)Ljava/lang/String;
 
@@ -777,14 +752,14 @@
 
     const-string v4, "CustomTabsIntent.Builder\u2026nsition()\n      }.build()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     iget-object v4, v3, Landroidx/browser/customtabs/CustomTabsIntent;->intent:Landroid/content/Intent;
 
     const-string v5, "customTabsIntent.intent"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4, p1}, Landroid/content/Intent;->setData(Landroid/net/Uri;)Landroid/content/Intent;
 
@@ -832,27 +807,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string v0, "launchFunction"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_2
-    const-string v0, "uri"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_3
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public static synthetic openUrlWithCustomTabs$default(Landroid/content/Context;Landroid/net/Uri;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -910,7 +864,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0a09b1
+    const v1, 0x7f0a09b5
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -918,7 +872,7 @@
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f0a09b2
+    const v2, 0x7f0a09b6
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -928,7 +882,7 @@
 
     const-string v3, "dialogDisplayTextView"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -964,9 +918,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -977,9 +931,17 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    :catch_0
+    :goto_0
     move-object v2, v0
 
+    goto :goto_1
+
+    :catch_0
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :goto_1
     if-eqz v2, :cond_1
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -1006,65 +968,60 @@
 
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/uri/UriHandler;->openUrlWithCustomTabs$default(Landroid/content/Context;Landroid/net/Uri;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
-    goto :goto_0
+    goto :goto_2
 
     :cond_0
     invoke-direct {p0, p1, v2, p2, p3}, Lcom/discord/utilities/uri/UriHandler;->openUrlExternally(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 
     :cond_1
-    :goto_0
+    :goto_2
     return-void
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleExternally(Landroid/content/Context;Landroid/net/Uri;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string/jumbo v0, "uri"
 
-    new-instance v1, Landroid/content/Intent;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "android.intent.action.VIEW"
+    new-instance v0, Landroid/content/Intent;
 
-    invoke-direct {v1, v2, p2}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;)V
+    const-string v1, "android.intent.action.VIEW"
+
+    invoke-direct {v0, v1, p2}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;)V
 
     new-instance p2, Landroid/content/Intent;
 
-    const-string v3, "http://127.0.0.1"
+    const-string v2, "http://127.0.0.1"
 
-    invoke-static {v3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-
-    move-result-object v3
-
-    invoke-direct {p2, v2, v3}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;)V
-
-    invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+    invoke-static {v2}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object v2
 
-    const/4 v3, 0x0
+    invoke-direct {p2, v1, v2}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;)V
 
-    invoke-virtual {v2, p2, v3}, Landroid/content/pm/PackageManager;->queryIntentActivities(Landroid/content/Intent;I)Ljava/util/List;
+    invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, p2, v2}, Landroid/content/pm/PackageManager;->queryIntentActivities(Landroid/content/Intent;I)Ljava/util/List;
 
     move-result-object p2
 
-    const-string v2, "context.packageManager.q\u2026(genericBrowserIntent, 0)"
+    const-string v1, "context.packageManager.q\u2026(genericBrowserIntent, 0)"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v2, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -1074,61 +1031,63 @@
     :goto_0
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v3
 
-    move-object v5, v4
+    move-object v4, v3
 
-    check-cast v5, Landroid/content/pm/ResolveInfo;
+    check-cast v4, Landroid/content/pm/ResolveInfo;
 
-    iget-object v5, v5, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
+    iget-object v4, v4, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 
-    iget-object v5, v5, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
+    iget-object v4, v4, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
 
-    iget-object v5, v5, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
+    iget-object v4, v4, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 
-    const-string v6, "it.activityInfo.applicationInfo.packageName"
+    const-string v5, "it.activityInfo.applicationInfo.packageName"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v6, 0x2
+    const/4 v5, 0x2
 
-    const-string v7, "com.discord"
+    const-string v6, "com.discord"
 
-    invoke-static {v5, v7, v3, v6}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v4, v6, v2, v5}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
-    move-result v5
+    move-result v4
 
-    if-nez v5, :cond_0
+    if-nez v4, :cond_0
 
-    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p2
 
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_2
+    const/4 v3, 0x0
 
-    move-object v2, v0
+    if-nez v1, :cond_2
+
+    move-object v1, v3
 
     goto :goto_1
 
     :cond_2
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
@@ -1139,7 +1098,7 @@
     goto :goto_1
 
     :cond_3
-    move-object v4, v2
+    move-object v4, v1
 
     check-cast v4, Landroid/content/pm/ResolveInfo;
 
@@ -1158,7 +1117,7 @@
 
     if-ge v4, v6, :cond_5
 
-    move-object v2, v5
+    move-object v1, v5
 
     move v4, v6
 
@@ -1170,11 +1129,11 @@
     if-nez v5, :cond_4
 
     :goto_1
-    check-cast v2, Landroid/content/pm/ResolveInfo;
+    check-cast v1, Landroid/content/pm/ResolveInfo;
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
 
-    iget-object p2, v2, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
+    iget-object p2, v1, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 
     if-eqz p2, :cond_6
 
@@ -1186,11 +1145,11 @@
 
     if-eqz p2, :cond_6
 
-    invoke-virtual {v1, p2}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
+    invoke-virtual {v0, p2}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
     const-string p2, "Choose Browser"
 
-    invoke-static {v1, p2}, Landroid/content/Intent;->createChooser(Landroid/content/Intent;Ljava/lang/CharSequence;)Landroid/content/Intent;
+    invoke-static {v0, p2}, Landroid/content/Intent;->createChooser(Landroid/content/Intent;Ljava/lang/CharSequence;)Landroid/content/Intent;
 
     move-result-object p2
 
@@ -1199,53 +1158,45 @@
     return-void
 
     :cond_6
-    const p2, 0x7f12165a
+    const p2, 0x7f121684
 
-    const/16 v1, 0xc
+    const/16 v0, 0xc
 
-    invoke-static {p1, p2, v3, v0, v1}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, p2, v2, v3, v0}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
-
-    :cond_7
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final varargs warmUp(Landroid/content/Context;Landroid/net/Uri;[Landroid/net/Uri;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string/jumbo v0, "url"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "otherUrls"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "context.packageManager"
+    const-string v1, "context.packageManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lcom/discord/utilities/uri/UriHandler;->getPackageNameToUse(Landroid/content/pm/PackageManager;)Ljava/lang/String;
+    invoke-direct {p0, v0}, Lcom/discord/utilities/uri/UriHandler;->getPackageNameToUse(Landroid/content/pm/PackageManager;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -1281,35 +1232,14 @@
 
     invoke-direct {p3, p2, v2}, Lcom/discord/utilities/uri/UriHandler$warmUp$connection$1;-><init>(Landroid/net/Uri;Ljava/util/List;)V
 
-    invoke-static {p1, v1, p3}, Landroidx/browser/customtabs/CustomTabsClient;->bindCustomTabsService(Landroid/content/Context;Ljava/lang/String;Landroidx/browser/customtabs/CustomTabsServiceConnection;)Z
+    invoke-static {p1, v0, p3}, Landroidx/browser/customtabs/CustomTabsClient;->bindCustomTabsService(Landroid/content/Context;Ljava/lang/String;Landroidx/browser/customtabs/CustomTabsServiceConnection;)Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    move-object v0, p3
+    move-object v1, p3
 
     :cond_1
-    return-object v0
-
-    :cond_2
-    const-string p1, "otherUrls"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali
index 449da4d6de..2aab8bd3da 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager$requestUser$3.smali
@@ -69,7 +69,7 @@
 
     const-string v3, "it"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1, v2, p1}, Lcom/discord/utilities/users/UserRequestManager;->access$onRequestStarted(Lcom/discord/utilities/users/UserRequestManager;JLrx/Subscription;)V
 
diff --git a/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali b/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
index cda955ab87..c1a4cccd12 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
@@ -29,7 +29,7 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,7 +41,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onFlush"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,15 +56,6 @@
     iput-object p1, p0, Lcom/discord/utilities/users/UserRequestManager;->userRequests:Ljava/util/HashMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "onFlush"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getOnFlush$p(Lcom/discord/utilities/users/UserRequestManager;)Lkotlin/jvm/functions/Function1;
@@ -196,7 +189,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -210,19 +203,19 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v2, Lr0/k/a;->a:Lr0/k/a$b;
+    sget-object v2, Ls0/k/a;->a:Ls0/k/a$b;
 
-    new-instance v3, Lr0/k/a$a;
+    new-instance v3, Ls0/k/a$a;
 
-    invoke-direct {v3, v1}, Lr0/k/a$a;-><init>(Lrx/functions/Action0;)V
+    invoke-direct {v3, v1}, Ls0/k/a$a;-><init>(Lrx/functions/Action0;)V
 
-    new-instance v4, Lr0/l/e/a;
+    new-instance v4, Ls0/l/e/a;
 
-    invoke-direct {v4, v2, v3, v1}, Lr0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    invoke-direct {v4, v2, v3, v1}, Ls0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
 
-    new-instance v1, Lr0/l/a/n;
+    new-instance v1, Ls0/l/a/n;
 
-    invoke-direct {v1, v0, v4}, Lr0/l/a/n;-><init>(Lrx/Observable;Lr0/g;)V
+    invoke-direct {v1, v0, v4}, Ls0/l/a/n;-><init>(Lrx/Observable;Ls0/g;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -244,7 +237,7 @@
 
     const/16 v6, 0x14
 
-    invoke-static/range {v1 .. v6}, Lf/a/b/q;->i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
+    invoke-static/range {v1 .. v6}, Lf/a/b/s;->i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -286,9 +279,9 @@
     monitor-enter p0
 
     :try_start_0
-    const-string v0, "userIds"
+    const-string/jumbo v0, "userIds"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -322,16 +315,6 @@
 
     return-void
 
-    :cond_1
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :catchall_0
     move-exception p1
 
diff --git a/com.discord/smali/com/discord/utilities/video/VideoPlayerIdleDetector.smali b/com.discord/smali/com/discord/utilities/video/VideoPlayerIdleDetector.smali
index 1e866555e4..cedf952159 100644
--- a/com.discord/smali/com/discord/utilities/video/VideoPlayerIdleDetector.smali
+++ b/com.discord/smali/com/discord/utilities/video/VideoPlayerIdleDetector.smali
@@ -42,13 +42,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "idleDetectionScheduler"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "backgroundThreadScheduler"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onIdleStateChanged"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,27 +65,6 @@
     iput-object p5, p0, Lcom/discord/utilities/video/VideoPlayerIdleDetector;->onIdleStateChanged:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onIdleStateChanged"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "backgroundThreadScheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "idleDetectionScheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLrx/Scheduler;Lrx/Scheduler;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -100,13 +83,13 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object p3
 
     const-string p1, "AndroidSchedulers.mainThread()"
 
-    invoke-static {p3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_1
     move-object v3, p3
@@ -115,13 +98,13 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object p4
 
     const-string p1, "Schedulers.computation()"
 
-    invoke-static {p4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_2
     move-object v4, p4
diff --git a/com.discord/smali/com/discord/utilities/view/ToastManager.smali b/com.discord/smali/com/discord/utilities/view/ToastManager.smali
index 51df80c48c..a0d556729d 100644
--- a/com.discord/smali/com/discord/utilities/view/ToastManager.smali
+++ b/com.discord/smali/com/discord/utilities/view/ToastManager.smali
@@ -117,7 +117,7 @@
 .end method
 
 .method public final show(Landroid/content/Context;II)V
-    .locals 0
+    .locals 1
     .param p2    # I
         .annotation build Landroidx/annotation/StringRes;
         .end annotation
@@ -125,7 +125,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -134,19 +136,10 @@
     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/view/ToastManager;->show(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public show(Landroid/content/Context;Ljava/lang/CharSequence;I)V
-    .locals 0
+    .locals 1
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "ShowToast"
@@ -156,7 +149,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2, p3}, Landroid/widget/Toast;->makeText(Landroid/content/Context;Ljava/lang/CharSequence;I)Landroid/widget/Toast;
 
@@ -164,20 +159,11 @@
 
     const-string p2, "Toast.makeText(context, text, duration)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/view/ToastManager;->show(Landroid/widget/Toast;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public show(Landroid/widget/Toast;)V
@@ -185,7 +171,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "newToast"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/ToastManager;->toast:Landroid/widget/Toast;
 
@@ -199,13 +187,4 @@
     iput-object p1, p0, Lcom/discord/utilities/view/ToastManager;->toast:Landroid/widget/Toast;
 
     return-void
-
-    :cond_1
-    const-string p1, "newToast"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/CleanupViewAnimationListener.smali b/com.discord/smali/com/discord/utilities/view/extensions/CleanupViewAnimationListener.smali
index 9b3dbe6a5d..b789dbbcde 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/CleanupViewAnimationListener.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/CleanupViewAnimationListener.smali
@@ -12,24 +12,17 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/view/extensions/CleanupViewAnimationListener;->view:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/FadeAnimation.smali b/com.discord/smali/com/discord/utilities/view/extensions/FadeAnimation.smali
index cebf20437e..974c6ff5d4 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/FadeAnimation.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/FadeAnimation.smali
@@ -21,11 +21,13 @@
 .method public constructor <init>(Landroid/view/ViewPropertyAnimator;Lcom/discord/utilities/view/extensions/FadeAnimation$Type;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "viewPropertyAnimator"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,20 +36,6 @@
     iput-object p2, p0, Lcom/discord/utilities/view/extensions/FadeAnimation;->type:Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "viewPropertyAnimator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali
index 01842a148b..cc727109bd 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/extensions/ViewExtensions$fadeIn$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewExtensions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$2.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$2.smali
index 5ea9692ccd..332ae44236 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$2.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeIn$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/extensions/ViewExtensions$fadeIn$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewExtensions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$1.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$1.smali
index e53eaccfc5..485b23f54e 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$fadeOut$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/extensions/ViewExtensions$fadeOut$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewExtensions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnClickListener$0.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnClickListener$0.smali
index 30bc155939..e0a293dca1 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnClickListener$0.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnClickListener$0.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnFocusChangeListener$0.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnFocusChangeListener$0.smali
index 942fa8f5e9..6757a1c3a0 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnFocusChangeListener$0.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_view_View_OnFocusChangeListener$0.smali
@@ -38,7 +38,7 @@
 
     const-string p2, "invoke(...)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_widget_TextView_OnEditorActionListener$0.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_widget_TextView_OnEditorActionListener$0.smali
index 69620399cf..f12936e6a5 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_widget_TextView_OnEditorActionListener$0.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$sam$android_widget_TextView_OnEditorActionListener$0.smali
@@ -38,7 +38,7 @@
 
     const-string p2, "invoke(...)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Ljava/lang/Boolean;
 
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setForwardingWindowInsetsListener$1.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setForwardingWindowInsetsListener$1.smali
index b1511dd35d..dde4415118 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setForwardingWindowInsetsListener$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setForwardingWindowInsetsListener$1.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "v"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Landroid/view/ViewGroup;
 
@@ -90,18 +92,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali
index 6c0a74a874..9990a1d6ed 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewExtensions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/widget/TextView;",
         "Ljava/lang/Integer;",
@@ -49,7 +49,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -83,7 +83,9 @@
 .method public final invoke(Landroid/widget/TextView;ILandroid/view/KeyEvent;)Z
     .locals 0
 
-    if-eqz p1, :cond_2
+    const-string p3, "textView"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x6
 
@@ -119,13 +121,4 @@
     iget-boolean p1, p0, Lcom/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1;->$isEventConsumed:Z
 
     return p1
-
-    :cond_2
-    const-string p1, "textView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
index e1ff5f3457..23f6e81d4c 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
@@ -57,13 +57,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addBindedTextWatcher"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "fragment"
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onAfterTextChanged"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -73,37 +77,23 @@
 
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/view/text/TextWatcherKt;->addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "onAfterTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$addBindedTextWatcher"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final cancelFadeAnimations(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$cancelFadeAnimations"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
 
@@ -125,23 +115,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "$this$cancelFadeAnimations"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final clear(Lcom/google/android/material/textfield/TextInputLayout;)Lkotlin/Unit;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$clear"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -157,17 +138,15 @@
 
     invoke-interface {p0}, Landroid/text/Editable;->clear()V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$clear"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final fadeBy(Landroid/view/View;Z)V
@@ -343,43 +322,50 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "setup"
 
-    if-eqz p3, :cond_6
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_5
+    const-string v0, "additionalAnimation"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p0, :cond_4
 
-    sget-object v1, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
 
-    invoke-virtual {v1, p0}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/utilities/view/extensions/FadeAnimation;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getType()Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
+    invoke-virtual {v0, p0}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
+    check-cast v0, Lcom/discord/utilities/view/extensions/FadeAnimation;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getType()Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
+
+    move-result-object v1
+
+    goto :goto_0
+
     :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
     sget-object v2, Lcom/discord/utilities/view/extensions/FadeAnimation$Type;->FADE_IN:Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
 
-    if-ne v0, v2, :cond_1
+    if-ne v1, v2, :cond_1
 
     return-void
 
     :cond_1
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    sget-object v0, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
+    sget-object v1, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
 
-    invoke-virtual {v0, p0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, p0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getViewPropertyAnimator()Landroid/view/ViewPropertyAnimator;
+    invoke-virtual {v0}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getViewPropertyAnimator()Landroid/view/ViewPropertyAnimator;
 
     move-result-object v0
 
@@ -438,9 +424,9 @@
 
     new-instance p3, Lcom/discord/utilities/view/extensions/FadeAnimation;
 
-    const-string p4, "viewPropertyAnimator"
+    const-string/jumbo p4, "viewPropertyAnimator"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p4, Lcom/discord/utilities/view/extensions/FadeAnimation$Type;->FADE_IN:Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
 
@@ -450,28 +436,14 @@
 
     invoke-virtual {p1}, Landroid/view/ViewPropertyAnimator;->start()V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_3
     invoke-virtual {p0, v1}, Landroid/view/View;->setAlpha(F)V
 
     :cond_4
-    :goto_0
+    :goto_1
     return-void
-
-    :cond_5
-    const-string p0, "additionalAnimation"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "setup"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic fadeIn$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -561,41 +533,46 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "additionalAnimation"
 
-    if-eqz p3, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p0, :cond_3
 
-    sget-object v1, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
 
-    invoke-virtual {v1, p0}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/utilities/view/extensions/FadeAnimation;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getType()Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
+    invoke-virtual {v0, p0}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
+    check-cast v0, Lcom/discord/utilities/view/extensions/FadeAnimation;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getType()Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
+
+    move-result-object v1
+
+    goto :goto_0
+
     :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
     sget-object v2, Lcom/discord/utilities/view/extensions/FadeAnimation$Type;->FADE_OUT:Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
 
-    if-ne v0, v2, :cond_1
+    if-ne v1, v2, :cond_1
 
     return-void
 
     :cond_1
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    sget-object v0, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
+    sget-object v1, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeAnimations:Ljava/util/HashMap;
 
-    invoke-virtual {v0, p0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, p0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getViewPropertyAnimator()Landroid/view/ViewPropertyAnimator;
+    invoke-virtual {v0}, Lcom/discord/utilities/view/extensions/FadeAnimation;->getViewPropertyAnimator()Landroid/view/ViewPropertyAnimator;
 
     move-result-object v0
 
@@ -652,9 +629,9 @@
 
     new-instance p3, Lcom/discord/utilities/view/extensions/FadeAnimation;
 
-    const-string v0, "viewPropertyAnimator"
+    const-string/jumbo v0, "viewPropertyAnimator"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/view/extensions/FadeAnimation$Type;->FADE_OUT:Lcom/discord/utilities/view/extensions/FadeAnimation$Type;
 
@@ -666,13 +643,6 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p0, "additionalAnimation"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic fadeOut$default(Landroid/view/View;JLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -700,7 +670,9 @@
 .method public static final getContentView(Landroidx/core/widget/NestedScrollView;)Landroid/view/View;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getContentView"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -710,22 +682,13 @@
 
     const-string v0, "getChildAt(0)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$getContentView"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getString(Landroid/view/View;I)Ljava/lang/String;
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/StringRes;
         .end annotation
@@ -736,7 +699,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$getString"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
@@ -748,18 +713,9 @@
 
     const-string p1, "resources.getString(stringRes)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$getString"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final varargs getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -774,11 +730,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getString"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
@@ -796,31 +754,17 @@
 
     const-string p1, "resources.getString(stringRes, *params)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "params"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$getString"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getTextOrEmpty(Lcom/google/android/material/textfield/TextInputLayout;)Ljava/lang/String;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getTextOrEmpty"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -836,31 +780,31 @@
 
     invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    move-result-object v0
-
-    :cond_0
-    if-eqz v0, :cond_1
+    move-result-object p0
 
     goto :goto_0
 
-    :cond_1
-    const-string v0, ""
+    :cond_0
+    const/4 p0, 0x0
 
     :goto_0
-    return-object v0
+    if-eqz p0, :cond_1
 
-    :cond_2
-    const-string p0, "$this$getTextOrEmpty"
+    goto :goto_1
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :cond_1
+    const-string p0, ""
 
-    throw v0
+    :goto_1
+    return-object p0
 .end method
 
 .method public static final hintWithRipple(Landroid/view/View;J)V
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$hintWithRipple"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -877,15 +821,6 @@
     invoke-virtual {p0, v0, p1, p2}, Landroid/view/View;->postDelayed(Ljava/lang/Runnable;J)Z
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$hintWithRipple"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic hintWithRipple$default(Landroid/view/View;JILjava/lang/Object;)V
@@ -904,26 +839,19 @@
 .end method
 
 .method public static final setBackgroundAndKeepPadding(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setBackgroundAndKeepPadding"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/View;->setBackground(Landroid/graphics/drawable/Drawable;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setBackgroundAndKeepPadding"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setCompoundDrawableWithIntrinsicBounds(Landroid/widget/TextView;IIII)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/DrawableRes;
         .end annotation
@@ -941,20 +869,13 @@
         .end annotation
     .end param
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setCompoundDrawableWithIntrinsicBounds"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroid/widget/TextView;->setCompoundDrawablesRelativeWithIntrinsicBounds(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setCompoundDrawableWithIntrinsicBounds"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
@@ -996,9 +917,11 @@
 .end method
 
 .method public static final setEnabledAlpha(Landroid/view/View;ZF)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$setEnabledAlpha"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -1008,15 +931,6 @@
     invoke-virtual {p0, p2}, Landroid/view/View;->setAlpha(F)V
 
     return-void
-
-    :cond_1
-    const-string p0, "$this$setEnabledAlpha"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
@@ -1035,24 +949,17 @@
 .end method
 
 .method public static final setEnabledAndAlpha(Landroid/view/View;ZF)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setEnabledAndAlpha"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/view/View;->setEnabled(Z)V
 
     invoke-static {p0, p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha(Landroid/view/View;ZF)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setEnabledAndAlpha"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic setEnabledAndAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
@@ -1073,28 +980,23 @@
 .method public static final setForwardingWindowInsetsListener(Landroid/view/ViewGroup;)V
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setForwardingWindowInsetsListener"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/view/extensions/ViewExtensions$setForwardingWindowInsetsListener$1;->INSTANCE:Lcom/discord/utilities/view/extensions/ViewExtensions$setForwardingWindowInsetsListener$1;
 
     invoke-static {p0, v0}, Landroidx/core/view/ViewCompat;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setForwardingWindowInsetsListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setHint(Lcom/google/android/material/textfield/TextInputLayout;I)V
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setHint"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
@@ -1107,15 +1009,6 @@
     invoke-virtual {p0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->setHint(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setHint"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setOnEditTextClickListener(Lcom/google/android/material/textfield/TextInputLayout;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
@@ -1133,11 +1026,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setOnEditTextClickListener"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "l"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -1151,24 +1046,15 @@
 
     invoke-virtual {p0, v0}, Landroid/widget/EditText;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "l"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$setOnEditTextClickListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final setOnEditTextFocusChangeListener(Lcom/google/android/material/textfield/TextInputLayout;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
@@ -1188,11 +1074,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setOnEditTextFocusChangeListener"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "l"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -1206,24 +1094,15 @@
 
     invoke-virtual {p0, v0}, Landroid/widget/EditText;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "l"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$setOnEditTextFocusChangeListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final setOnEditorActionListener(Lcom/google/android/material/textfield/TextInputLayout;Lkotlin/jvm/functions/Function3;)Lkotlin/Unit;
@@ -1245,11 +1124,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setOnEditorActionListener"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "l"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -1263,24 +1144,15 @@
 
     invoke-virtual {p0, v0}, Landroid/widget/EditText;->setOnEditorActionListener(Landroid/widget/TextView$OnEditorActionListener;)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "l"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$setOnEditorActionListener"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final setOnImeActionDone(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;)Lkotlin/Unit;
@@ -1299,11 +1171,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setOnImeActionDone"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onImeActionDone"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/view/extensions/ViewExtensions$setOnImeActionDone$1;
 
@@ -1314,20 +1188,6 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "onImeActionDone"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$setOnImeActionDone"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
@@ -1354,11 +1214,13 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setPluralText"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "formatArgs"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/TextView;->getResources()Landroid/content/res/Resources;
 
@@ -1366,7 +1228,7 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
@@ -1374,19 +1236,19 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v3, 0x0
-
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v3
 
-    aput-object v4, v2, v3
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
 
     invoke-static {v0, v1, p1, p2, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1410,33 +1272,19 @@
 
     const-string p2, "java.lang.String.format(format, *args)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "formatArgs"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$setPluralText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setSelection(Lcom/google/android/material/textfield/TextInputLayout;I)Lkotlin/Unit;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setSelection"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -1446,23 +1294,23 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/EditText;->setSelection(I)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$setSelection"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final setSelectionEnd(Lcom/google/android/material/textfield/TextInputLayout;)Lkotlin/Unit;
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$setSelectionEnd"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -1485,21 +1333,14 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_1
-    const-string p0, "$this$setSelectionEnd"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setSingleLineHint(Lcom/google/android/material/textfield/TextInputLayout;I)V
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$setSingleLineHint"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
@@ -1511,30 +1352,23 @@
 
     const-string v0, "context.getString(resId)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setSingleLineHint(Lcom/google/android/material/textfield/TextInputLayout;Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$setSingleLineHint"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final setSingleLineHint(Lcom/google/android/material/textfield/TextInputLayout;Ljava/lang/CharSequence;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setSingleLineHint"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "charSequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1550,28 +1384,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "charSequence"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$setSingleLineHint"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final setText(Lcom/google/android/material/textfield/TextInputLayout;I)Lkotlin/Unit;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setText"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -1581,25 +1401,23 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/EditText;->setText(I)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$setText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final setText(Lcom/google/android/material/textfield/TextInputLayout;Ljava/lang/CharSequence;)Lkotlin/Unit;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setText"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -1609,23 +1427,23 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_1
-    const-string p0, "$this$setText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
 
 .method public static final setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
     .locals 2
 
-    if-eqz p0, :cond_3
+    const-string v0, "$this$setTextAndVisibilityBy"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -1635,7 +1453,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
@@ -1666,13 +1484,4 @@
     invoke-virtual {p0, v0}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_3
-    const-string p0, "$this$setTextAndVisibilityBy"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali
index c80e4f7439..fe1e7311ed 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$Children.smali
@@ -55,11 +55,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "boundChildren"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "unboundChildren"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -68,20 +70,6 @@
     iput-object p2, p0, Lcom/discord/utilities/view/grid/FrameGridLayout$Children;->unboundChildren:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "unboundChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "boundChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/utilities/view/grid/FrameGridLayout$Children;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/utilities/view/grid/FrameGridLayout$Children;
@@ -161,31 +149,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "boundChildren"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "unboundChildren"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/view/grid/FrameGridLayout$Children;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/utilities/view/grid/FrameGridLayout$Children;-><init>(Ljava/util/Map;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "unboundChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "boundChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -203,7 +179,7 @@
 
     iget-object v1, p1, Lcom/discord/utilities/view/grid/FrameGridLayout$Children;->boundChildren:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -213,7 +189,7 @@
 
     iget-object p1, p1, Lcom/discord/utilities/view/grid/FrameGridLayout$Children;->unboundChildren:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$bindViews$1.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$bindViews$1.smali
index b5b0102b32..88e6fb87d0 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$bindViews$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$bindViews$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/grid/FrameGridLayout$bindViews$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FrameGridLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/utilities/view/grid/FrameGridLayout$Data;",
         "Landroid/view/View;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,17 +62,17 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/view/grid/FrameGridLayout$Data;Landroid/view/View;)V
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$bindView"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v1, p2, Lcom/discord/utilities/view/grid/FrameGridLayout$DataView;
+    instance-of v0, p2, Lcom/discord/utilities/view/grid/FrameGridLayout$DataView;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    move-object p2, v0
+    const/4 p2, 0x0
 
     :cond_0
     check-cast p2, Lcom/discord/utilities/view/grid/FrameGridLayout$DataView;
@@ -99,11 +99,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "$this$bindView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onLayout$1.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onLayout$1.smali
index 98d3c331fb..d0e9bedc0d 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onLayout$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onLayout$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/grid/FrameGridLayout$onLayout$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FrameGridLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,29 +64,17 @@
 .method public final invoke(Landroid/view/View;Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "childBounds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/grid/FrameGridLayout$onLayout$1;->this$0:Lcom/discord/utilities/view/grid/FrameGridLayout;
 
     invoke-static {v0, p1, p2}, Lcom/discord/utilities/view/grid/FrameGridLayout;->access$layout(Lcom/discord/utilities/view/grid/FrameGridLayout;Landroid/view/View;Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;)Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;
 
     return-void
-
-    :cond_0
-    const-string p1, "childBounds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onMeasure$1.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onMeasure$1.smali
index cde8b4f6e7..1a27ab416d 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onMeasure$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout$onMeasure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/grid/FrameGridLayout$onMeasure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FrameGridLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,29 +64,17 @@
 .method public final invoke(Landroid/view/View;Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "childBounds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/grid/FrameGridLayout$onMeasure$1;->this$0:Lcom/discord/utilities/view/grid/FrameGridLayout;
 
     invoke-static {v0, p1, p2}, Lcom/discord/utilities/view/grid/FrameGridLayout;->access$measure(Lcom/discord/utilities/view/grid/FrameGridLayout;Landroid/view/View;Lcom/discord/utilities/view/grid/FrameGridLayout$PositionSpec;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "childBounds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
index 4eae331466..2f87f92ac3 100644
--- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
+++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali
@@ -18,9 +18,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/utilities/view/grid/FrameGridLayout$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final DEFAULT_MAX_LINEAR_VIEWS:I = 0x3
 
@@ -114,11 +111,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    sget-object p3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p3, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p3, p0, Lcom/discord/utilities/view/grid/FrameGridLayout;->dataset:Ljava/util/List;
 
@@ -159,15 +158,6 @@
     iput-object p1, p0, Lcom/discord/utilities/view/grid/FrameGridLayout;->sizeCalculator:Lcom/discord/utilities/view/grid/FrameGridLayout$SizeCalculator;
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -251,7 +241,7 @@
 
     move-result v1
 
-    invoke-static {v0, v1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, v1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
@@ -268,9 +258,9 @@
 
     move-object v1, v0
 
-    check-cast v1, Lj0/i/q;
+    check-cast v1, Lk0/j/q;
 
-    invoke-virtual {v1}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v1}, Lk0/j/q;->nextInt()I
 
     move-result v1
 
@@ -288,7 +278,7 @@
 
     const-string v3, "context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v2}, Lcom/discord/utilities/view/grid/FrameGridLayout$Data;->createView(Landroid/content/Context;)Landroid/view/View;
 
@@ -516,7 +506,7 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v3, v2}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v3, v2}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object v2
 
@@ -543,9 +533,9 @@
 
     move-object v4, v2
 
-    check-cast v4, Lj0/i/q;
+    check-cast v4, Lk0/j/q;
 
-    invoke-virtual {v4}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v4}, Lk0/j/q;->nextInt()I
 
     move-result v4
 
@@ -597,11 +587,11 @@
     goto :goto_1
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.utilities.view.grid.FrameGridLayout.DataView"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -704,7 +694,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v1}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v1}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v0
 
@@ -716,7 +706,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static {v1, v2}, Lj0/q/f;->downTo(II)Lkotlin/ranges/IntProgression;
+    invoke-static {v1, v2}, Lk0/r/f;->downTo(II)Lkotlin/ranges/IntProgression;
 
     move-result-object v1
 
@@ -734,9 +724,9 @@
 
     move-object v2, v1
 
-    check-cast v2, Lj0/i/q;
+    check-cast v2, Lk0/j/q;
 
-    invoke-virtual {v2}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v2}, Lk0/j/q;->nextInt()I
 
     move-result v2
 
@@ -752,7 +742,7 @@
 
     move-result-object v4
 
-    invoke-static {v0, v4}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {v0, v4}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -765,11 +755,11 @@
     goto :goto_1
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.utilities.view.grid.FrameGridLayout.DataView"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -798,7 +788,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v0}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object v0
 
@@ -816,9 +806,9 @@
 
     move-object v2, v0
 
-    check-cast v2, Lj0/i/q;
+    check-cast v2, Lk0/j/q;
 
-    invoke-virtual {v2}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v2}, Lk0/j/q;->nextInt()I
 
     move-result v2
 
@@ -861,7 +851,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -903,11 +893,11 @@
     goto :goto_0
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.utilities.view.grid.FrameGridLayout.DataView"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -946,7 +936,7 @@
 .end method
 
 .method public final setData(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -960,7 +950,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/view/grid/FrameGridLayout;->dataset:Ljava/util/List;
 
@@ -971,15 +963,6 @@
     invoke-direct {p0}, Lcom/discord/utilities/view/grid/FrameGridLayout;->bindViews()V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnBindView(Lkotlin/jvm/functions/Function2;)V
diff --git a/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali b/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali
index 9cecbf5833..ae21dc6e24 100644
--- a/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt.smali
@@ -5,20 +5,13 @@
 
 # direct methods
 .method public static final removeRuleCompat(Landroid/widget/RelativeLayout$LayoutParams;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$removeRuleCompat"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout$LayoutParams;->removeRule(I)V
 
     return-void
-
-    :cond_0
-    const-string p0, "$this$removeRuleCompat"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali b/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali
index 58ce3d34d4..b834d2befe 100644
--- a/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali
+++ b/com.discord/smali/com/discord/utilities/view/recycler/MaxHeightRecyclerView.smali
@@ -49,9 +49,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -64,15 +66,6 @@
     iput p1, p0, Lcom/discord/utilities/view/recycler/MaxHeightRecyclerView;->maxHeight:I
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali b/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali
index 6df76b2cd6..76358bf631 100644
--- a/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali
+++ b/com.discord/smali/com/discord/utilities/view/recycler/PaddedItemDecorator.smali
@@ -45,69 +45,26 @@
     return-void
 .end method
 
-.method public constructor <init>(ILandroid/content/res/Resources;II)V
-    .locals 7
-    .param p3    # I
-        .annotation build Landroidx/annotation/DimenRes;
-        .end annotation
-    .end param
-    .param p4    # I
-        .annotation build Landroidx/annotation/DimenRes;
-        .end annotation
-    .end param
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result p3
-
-    float-to-int v2, p3
-
-    invoke-virtual {p2, p4}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result p2
-
-    float-to-int v3, p2
-
-    const/4 v4, 0x0
-
-    const/16 v5, 0x8
-
-    const/4 v6, 0x0
-
-    move-object v0, p0
-
-    move v1, p1
-
-    invoke-direct/range {v0 .. v6}, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;-><init>(IIIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "resources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
 
 # virtual methods
 .method public getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "outRect"
 
-    if-eqz p1, :cond_d
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_c
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_b
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_a
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3, p4}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 
@@ -202,7 +159,7 @@
 
     move-result-object p1
 
-    new-instance p2, Lj0/c;
+    new-instance p2, Lk0/c;
 
     const-string p3, "An operation is not implemented: "
 
@@ -210,7 +167,7 @@
 
     move-result-object p1
 
-    invoke-direct {p2, p1}, Lj0/c;-><init>(Ljava/lang/String;)V
+    invoke-direct {p2, p1}, Lk0/c;-><init>(Ljava/lang/String;)V
 
     throw p2
 
@@ -251,34 +208,6 @@
 
     :goto_4
     return-void
-
-    :cond_a
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    const-string p1, "outRect"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getOrientation()I
diff --git a/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout$draw$1.smali b/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout$draw$1.smali
index 93542060d4..1458658800 100644
--- a/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout$draw$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout$draw$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout$draw$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RoundedCoordinatorLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/graphics/Canvas;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Landroid/graphics/Canvas;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout$draw$1;->this$0:Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->access$draw$s-747643027(Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;Landroid/graphics/Canvas;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout.smali b/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout.smali
index 3bff22d37e..774c77824d 100644
--- a/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout.smali
+++ b/com.discord/smali/com/discord/utilities/view/rounded/RoundedCoordinatorLayout.smali
@@ -9,9 +9,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;)V
 
@@ -22,21 +24,14 @@
     iput-object p1, p0, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->roundedViewCoordinator:Lcom/discord/utilities/view/rounded/RoundedCornerViewCoordinator;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -49,21 +44,14 @@
     invoke-direct {p0, p2}, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -76,15 +64,6 @@
     invoke-direct {p0, p2}, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -141,7 +120,7 @@
 
     const-string v1, "R.styleable.RoundedCoordinatorLayout"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v4, Lcom/discord/utils/R$e;->RoundedCoordinatorLayout_topLeftRadius:I
 
@@ -165,7 +144,9 @@
 .method public draw(Landroid/graphics/Canvas;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "canvas"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->roundedViewCoordinator:Lcom/discord/utilities/view/rounded/RoundedCornerViewCoordinator;
 
@@ -176,15 +157,6 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/view/rounded/RoundedCornerViewCoordinator;->draw(Landroid/graphics/Canvas;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onSizeChanged(IIII)V
diff --git a/com.discord/smali/com/discord/utilities/view/rounded/RoundedCornerViewCoordinator.smali b/com.discord/smali/com/discord/utilities/view/rounded/RoundedCornerViewCoordinator.smali
index 4bb995d16a..2c95bd0413 100644
--- a/com.discord/smali/com/discord/utilities/view/rounded/RoundedCornerViewCoordinator.smali
+++ b/com.discord/smali/com/discord/utilities/view/rounded/RoundedCornerViewCoordinator.smali
@@ -62,11 +62,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "canvas"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onDraw"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
@@ -79,20 +81,6 @@
     invoke-virtual {p1}, Landroid/graphics/Canvas;->restore()V
 
     return-void
-
-    :cond_0
-    const-string p1, "onDraw"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final initialize(Landroid/view/View;Landroid/util/AttributeSet;[IIIII)V
@@ -118,11 +106,13 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "attrsIndexArray"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -175,20 +165,6 @@
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
     throw p2
-
-    :cond_0
-    const-string p1, "attrsIndexArray"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onSizeChanged(II)V
@@ -268,11 +244,13 @@
 .method public final updateRadius(Landroid/view/View;FLcom/discord/utilities/view/rounded/RoundedCornerViewCoordinator$Corner;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "corner"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Enum;->ordinal()I
 
@@ -316,18 +294,4 @@
     invoke-virtual {p1}, Landroid/view/View;->invalidate()V
 
     return-void
-
-    :cond_4
-    const-string p1, "corner"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout$draw$1.smali b/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout$draw$1.smali
index 0ba8b090ff..094cca748b 100644
--- a/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout$draw$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout$draw$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/rounded/RoundedRelativeLayout$draw$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RoundedRelativeLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/graphics/Canvas;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Landroid/graphics/Canvas;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout$draw$1;->this$0:Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;
 
     invoke-static {v0, p1}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->access$draw$s1843631363(Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;Landroid/graphics/Canvas;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout.smali b/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout.smali
index e8b2c3b1bc..c3b50d4b21 100644
--- a/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout.smali
+++ b/com.discord/smali/com/discord/utilities/view/rounded/RoundedRelativeLayout.smali
@@ -9,9 +9,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
 
@@ -22,21 +24,14 @@
     iput-object p1, p0, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->roundedViewCoordinator:Lcom/discord/utilities/view/rounded/RoundedCornerViewCoordinator;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -49,21 +44,14 @@
     invoke-direct {p0, p2}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -76,15 +64,6 @@
     invoke-direct {p0, p2}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -141,7 +120,7 @@
 
     const-string v1, "R.styleable.RoundedRelativeLayout"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v4, Lcom/discord/utils/R$e;->RoundedRelativeLayout_topLeftRadius:I
 
@@ -165,7 +144,9 @@
 .method public draw(Landroid/graphics/Canvas;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "canvas"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->roundedViewCoordinator:Lcom/discord/utilities/view/rounded/RoundedCornerViewCoordinator;
 
@@ -176,15 +157,6 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/view/rounded/RoundedCornerViewCoordinator;->draw(Landroid/graphics/Canvas;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onSizeChanged(IIII)V
diff --git a/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali b/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali
index 9ee114dc1d..19036620b2 100644
--- a/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali
+++ b/com.discord/smali/com/discord/utilities/view/scroll/MaxHeightScrollView.smali
@@ -49,9 +49,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/ScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -64,15 +66,6 @@
     iput p1, p0, Lcom/discord/utilities/view/scroll/MaxHeightScrollView;->maxHeight:I
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1.smali
index 2a01a2e508..82b586438a 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LinkifiedTextView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1.smali
index 30165f4620..6017efb4dd 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "LinkifiedTextView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p2}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p2}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -76,7 +76,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;
 
@@ -93,15 +95,6 @@
     iput-object p1, v0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -147,7 +140,7 @@
 
     const-string v1, "it"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/spans/ClickableSpan;->onLongPress(Landroid/view/View;)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.smali
index 0d063e996d..b13f5b236d 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "LinkifiedTextView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.utilities.view.text.LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1"
     f = "LinkifiedTextView.kt"
     l = {
@@ -66,7 +66,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p4}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p4}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -87,7 +87,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
@@ -104,15 +106,6 @@
     iput-object p1, v0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -138,7 +131,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 10
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->label:I
 
@@ -195,55 +188,64 @@
     goto :goto_1
 
     :cond_2
-    new-instance v1, Lk0/a/g;
+    new-instance v1, Ll0/a/g;
 
     invoke-static {p0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
     move-result-object v6
 
-    invoke-direct {v1, v6, v3}, Lk0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
+    invoke-direct {v1, v6, v3}, Ll0/a/g;-><init>(Lkotlin/coroutines/Continuation;I)V
 
-    invoke-virtual {v1}, Lk0/a/g;->getContext()Lkotlin/coroutines/CoroutineContext;
+    invoke-virtual {v1}, Ll0/a/g;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v6
 
-    if-eqz v6, :cond_9
+    const-string v7, "$this$delay"
 
-    sget-object v7, Lj0/k/d;->a:Lj0/k/d$a;
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v7, Lk0/l/d;->a:Lk0/l/d$a;
 
     invoke-interface {v6, v7}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
 
     move-result-object v6
 
-    instance-of v7, v6, Lk0/a/e0;
+    instance-of v7, v6, Ll0/a/e0;
 
     if-nez v7, :cond_3
 
     move-object v6, v2
 
     :cond_3
-    check-cast v6, Lk0/a/e0;
+    check-cast v6, Ll0/a/e0;
 
     if-eqz v6, :cond_4
 
     goto :goto_0
 
     :cond_4
-    sget-object v6, Lk0/a/d0;->a:Lk0/a/e0;
+    sget-object v6, Ll0/a/d0;->a:Ll0/a/e0;
 
     :goto_0
-    invoke-interface {v6, v4, v5, v1}, Lk0/a/e0;->b(JLk0/a/f;)V
+    invoke-interface {v6, v4, v5, v1}, Ll0/a/e0;->b(JLl0/a/f;)V
 
-    invoke-virtual {v1}, Lk0/a/g;->k()Ljava/lang/Object;
+    invoke-virtual {v1}, Ll0/a/g;->k()Ljava/lang/Object;
 
     move-result-object v1
 
-    :goto_1
     if-ne v1, v0, :cond_5
 
+    const-string v4, "frame"
+
+    invoke-static {p0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_5
+    :goto_1
+    if-ne v1, v0, :cond_6
+
     return-object v0
 
-    :cond_5
+    :cond_6
     move-object v4, p1
 
     :goto_2
@@ -259,7 +261,9 @@
 
     if-nez p1, :cond_8
 
-    if-eqz v4, :cond_7
+    const-string p1, "$this$isActive"
+
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v4}, Lkotlinx/coroutines/CoroutineScope;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -273,13 +277,13 @@
 
     check-cast p1, Lkotlinx/coroutines/Job;
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     invoke-interface {p1}, Lkotlinx/coroutines/Job;->a()Z
 
     move-result v3
 
-    :cond_6
+    :cond_7
     if-eqz v3, :cond_8
 
     iget-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->$weakView:Ljava/lang/ref/WeakReference;
@@ -292,7 +296,7 @@
 
     if-eqz p1, :cond_8
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
     move-result-object v5
 
@@ -306,27 +310,10 @@
 
     const/4 v9, 0x0
 
-    invoke-static/range {v4 .. v9}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-
-    goto :goto_3
-
-    :cond_7
-    const-string p1, "$this$isActive"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    invoke-static/range {v4 .. v9}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     :cond_8
-    :goto_3
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_9
-    const-string p1, "$this$delay"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener.smali
index 2eb1f7075a..0b289630e4 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener.smali
@@ -225,7 +225,7 @@
 
     const-string p2, "spanned.getSpans(off, of\u2026lickableSpan::class.java)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, [Landroid/text/style/ClickableSpan;
 
@@ -252,31 +252,35 @@
 .method public onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
     .locals 12
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_12
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_11
+    const-string v0, "event"
 
-    instance-of v1, p1, Landroid/widget/TextView;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-nez v1, :cond_0
+    instance-of v0, p1, Landroid/widget/TextView;
 
-    move-object v1, v0
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    move-object v0, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v1, p1
+    move-object v0, p1
 
     :goto_0
-    check-cast v1, Landroid/widget/TextView;
+    check-cast v0, Landroid/widget/TextView;
 
     new-instance v2, Lkotlin/jvm/internal/Ref$ObjectRef;
 
     invoke-direct {v2}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 
-    iput-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iput-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     const/4 v3, 0x3
 
@@ -284,10 +288,10 @@
 
     const/4 v5, 0x1
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     :try_start_0
-    invoke-direct {p0, v1, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->getTouchedClickableSpans(Landroid/widget/TextView;Landroid/view/MotionEvent;)[Landroid/text/style/ClickableSpan;
+    invoke-direct {p0, v0, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->getTouchedClickableSpans(Landroid/widget/TextView;Landroid/view/MotionEvent;)[Landroid/text/style/ClickableSpan;
 
     move-result-object v6
 
@@ -307,7 +311,7 @@
     goto :goto_2
 
     :cond_1
-    move-object v6, v0
+    move-object v6, v1
 
     :goto_1
     iput-object v6, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
@@ -321,16 +325,16 @@
 
     new-array v7, v7, [Lkotlin/Pair;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Landroid/widget/TextView;->getText()Ljava/lang/CharSequence;
+    invoke-virtual {v0}, Landroid/widget/TextView;->getText()Ljava/lang/CharSequence;
 
     move-result-object v8
 
     goto :goto_3
 
     :cond_2
-    move-object v8, v0
+    move-object v8, v1
 
     :goto_3
     invoke-static {v8}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -345,9 +349,9 @@
 
     aput-object v9, v7, v4
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    invoke-virtual {v1}, Landroid/widget/TextView;->getX()F
+    invoke-virtual {v0}, Landroid/widget/TextView;->getX()F
 
     move-result v8
 
@@ -358,7 +362,7 @@
     goto :goto_4
 
     :cond_3
-    move-object v8, v0
+    move-object v8, v1
 
     :goto_4
     invoke-static {v8}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -367,7 +371,7 @@
 
     new-instance v9, Lkotlin/Pair;
 
-    const-string v10, "view_x"
+    const-string/jumbo v10, "view_x"
 
     invoke-direct {v9, v10, v8}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -375,9 +379,9 @@
 
     const/4 v8, 0x2
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-virtual {v1}, Landroid/widget/TextView;->getY()F
+    invoke-virtual {v0}, Landroid/widget/TextView;->getY()F
 
     move-result v9
 
@@ -388,7 +392,7 @@
     goto :goto_5
 
     :cond_4
-    move-object v9, v0
+    move-object v9, v1
 
     :goto_5
     invoke-static {v9}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -397,7 +401,7 @@
 
     new-instance v10, Lkotlin/Pair;
 
-    const-string v11, "view_y"
+    const-string/jumbo v11, "view_y"
 
     invoke-direct {v10, v11, v9}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -457,9 +461,9 @@
 
     const/4 v8, 0x6
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
-    invoke-virtual {v1}, Landroid/widget/TextView;->getWidth()I
+    invoke-virtual {v0}, Landroid/widget/TextView;->getWidth()I
 
     move-result v9
 
@@ -470,7 +474,7 @@
     goto :goto_6
 
     :cond_5
-    move-object v9, v0
+    move-object v9, v1
 
     :goto_6
     invoke-static {v9}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
@@ -479,7 +483,7 @@
 
     new-instance v10, Lkotlin/Pair;
 
-    const-string v11, "width"
+    const-string/jumbo v11, "width"
 
     invoke-direct {v10, v11, v9}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -487,37 +491,37 @@
 
     const/4 v8, 0x7
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
-    invoke-virtual {v1}, Landroid/widget/TextView;->getHeight()I
+    invoke-virtual {v0}, Landroid/widget/TextView;->getHeight()I
 
-    move-result v1
+    move-result v0
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_7
 
     :cond_6
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_7
-    invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     new-instance v9, Lkotlin/Pair;
 
     const-string v10, "height"
 
-    invoke-direct {v9, v10, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v9, v10, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     aput-object v9, v7, v8
 
     invoke-static {v7}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
     sget-object v7, Lcom/discord/utilities/view/text/LinkifiedTextView;->Companion:Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;
 
@@ -533,18 +537,18 @@
 
     const-string v9, "javaClass.name"
 
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v9, "failed to get touched clickable spans"
 
-    invoke-virtual {v7, v8, v9, v6, v1}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v7, v8, v9, v6, v0}, Lcom/discord/utilities/logging/Logger;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
     :goto_8
-    iget-object v1, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+    iget-object v0, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
-    check-cast v1, Landroid/text/style/ClickableSpan;
+    check-cast v0, Landroid/text/style/ClickableSpan;
 
-    if-nez v1, :cond_8
+    if-nez v0, :cond_8
 
     iget-object p1, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->job:Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -556,7 +560,7 @@
 
     if-eqz p1, :cond_7
 
-    invoke-static {p1, v0, v5, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {p1, v1, v5, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_7
     return v4
@@ -585,7 +589,7 @@
 
     if-eqz p1, :cond_a
 
-    invoke-static {p1, v0, v5, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {p1, v1, v5, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_a
     :goto_9
@@ -604,7 +608,7 @@
 
     if-eqz p2, :cond_c
 
-    invoke-static {p2, v0, v5, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {p2, v1, v5, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_c
     iget-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->isClickHandled:Ljava/util/concurrent/atomic/AtomicBoolean;
@@ -639,7 +643,7 @@
 
     const-string v1, "clickableSpan.url"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -682,7 +686,7 @@
 
     if-eqz p2, :cond_10
 
-    invoke-static {p2, v0, v5, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {p2, v1, v5, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_10
     iget-object p2, v2, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
@@ -697,21 +701,21 @@
 
     invoke-direct {p2, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    sget-object v6, Lk0/a/s0;->d:Lk0/a/s0;
+    sget-object v6, Ll0/a/s0;->d:Ll0/a/s0;
 
-    sget-object v7, Lk0/a/j0;->a:Lk0/a/v;
+    sget-object v7, Ll0/a/j0;->a:Ll0/a/v;
 
     const/4 v8, 0x0
 
     new-instance v9, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
-    invoke-direct {v9, p0, p2, v2, v0}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;-><init>(Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;Ljava/lang/ref/WeakReference;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/coroutines/Continuation;)V
+    invoke-direct {v9, p0, p2, v2, v1}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;-><init>(Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;Ljava/lang/ref/WeakReference;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/coroutines/Continuation;)V
 
     const/4 v10, 0x2
 
     const/4 v11, 0x0
 
-    invoke-static/range {v6 .. v11}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v6 .. v11}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     move-result-object p1
 
@@ -719,7 +723,7 @@
 
     invoke-direct {p2, p1, p0}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1;-><init>(Lkotlinx/coroutines/Job;Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;)V
 
-    invoke-interface {p1, p2}, Lkotlinx/coroutines/Job;->i(Lkotlin/jvm/functions/Function1;)Lk0/a/k0;
+    invoke-interface {p1, p2}, Lkotlinx/coroutines/Job;->i(Lkotlin/jvm/functions/Function1;)Ll0/a/k0;
 
     iget-object p2, p0, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;->job:Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -731,24 +735,10 @@
 
     if-eqz p1, :cond_a
 
-    invoke-static {p1, v0, v5, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {p1, v1, v5, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     goto/16 :goto_9
 
     :goto_a
     return v4
-
-    :cond_11
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_12
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion$logger$2.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion$logger$2.smali
index 555844d3c5..9468dafcf5 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion$logger$2.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView$Companion$logger$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/text/LinkifiedTextView$Companion$logger$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LinkifiedTextView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/logging/Logger;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
index 0182e9ec70..9b83b9c4f8 100644
--- a/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/LinkifiedTextView.smali
@@ -96,38 +96,31 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     new-instance p1, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;
 
-    const-wide/16 v1, 0x0
+    sget-object v4, Lcom/discord/utilities/view/text/LinkifiedTextView;->onURLSpanClicked:Lkotlin/jvm/functions/Function2;
 
-    sget-object v3, Lcom/discord/utilities/view/text/LinkifiedTextView;->onURLSpanClicked:Lkotlin/jvm/functions/Function2;
+    const-wide/16 v2, 0x0
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;-><init>(JLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener;-><init>(JLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/TextView;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -181,9 +174,11 @@
 .method public setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "type"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     :try_start_0
     invoke-super {p0, p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
@@ -267,11 +262,4 @@
     invoke-virtual {p0, v0}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1.smali b/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1.smali
index 33b25e43ac..23f3ebcbda 100644
--- a/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TextWatcher.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1;->$onAfterTextChanged:Lrx/functions/Action1;
 
@@ -72,13 +74,4 @@
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion.smali b/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion.smali
index 2bf0e2e0cf..c06d9f935a 100644
--- a/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/TextWatcher$Companion.smali
@@ -46,13 +46,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "textView"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onAfterTextChanged"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/view/text/TextWatcher$Companion$addBindedTextWatcher$1;
 
@@ -61,33 +65,14 @@
     invoke-static {p2, p1, v0}, Lcom/discord/utilities/view/text/TextWatcherKt;->addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onAfterTextChanged"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "textView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final reset(Landroidx/fragment/app/Fragment;)V
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/view/text/TextWatcherKt;->access$getBindedTextWatchers$p()Ljava/util/HashMap;
 
@@ -163,13 +148,4 @@
     invoke-virtual {v0, p1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_2
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/TextWatcher.smali b/com.discord/smali/com/discord/utilities/view/text/TextWatcher.smali
index f7014c4160..3ad9d29cd3 100644
--- a/com.discord/smali/com/discord/utilities/view/text/TextWatcher.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/TextWatcher.smali
@@ -196,7 +196,9 @@
 .method public afterTextChanged(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "s"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/text/TextWatcher;->onAfterTextChanged:Lkotlin/jvm/functions/Function1;
 
@@ -210,21 +212,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "s"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public beforeTextChanged(Ljava/lang/CharSequence;III)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "s"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/text/TextWatcher;->onBeforeTextChanged:Lkotlin/jvm/functions/Function4;
 
@@ -250,21 +245,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "s"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTextChanged(Ljava/lang/CharSequence;III)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "s"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/view/text/TextWatcher;->onTextChanged:Lkotlin/jvm/functions/Function4;
 
@@ -290,13 +278,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "s"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/text/TextWatcherKt.smali b/com.discord/smali/com/discord/utilities/view/text/TextWatcherKt.smali
index c7e4e9cb70..4341f86277 100644
--- a/com.discord/smali/com/discord/utilities/view/text/TextWatcherKt.smali
+++ b/com.discord/smali/com/discord/utilities/view/text/TextWatcherKt.smali
@@ -43,13 +43,17 @@
 .method public static final addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Landroid/text/TextWatcher;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addBindedTextWatcher"
 
-    if-eqz p0, :cond_5
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_4
+    const-string v0, "fragment"
 
-    if-eqz p2, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "textWatcher"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/view/text/TextWatcherKt;->bindedTextWatchers:Ljava/util/HashMap;
 
@@ -69,10 +73,6 @@
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
     :goto_0
-    const-string v1, "bindedTextWatchers[fragment] ?: HashMap()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-virtual {v0, p0}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v1
@@ -89,10 +89,6 @@
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
     :goto_1
-    const-string v2, "textViewWatchersAcrossFr\u2026ents[this] ?: ArrayList()"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     sget-object v2, Lcom/discord/utilities/view/text/TextWatcherKt;->bindedTextWatchers:Ljava/util/HashMap;
 
     invoke-interface {v2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -119,27 +115,6 @@
     invoke-virtual {p0, p2}, Landroid/widget/TextView;->addTextChangedListener(Landroid/text/TextWatcher;)V
 
     return-void
-
-    :cond_3
-    const-string p0, "textWatcher"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "$this$addBindedTextWatcher"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)V
@@ -157,13 +132,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addBindedTextWatcher"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "fragment"
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onAfterTextChanged"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/view/text/TextWatcher;
 
@@ -184,25 +163,4 @@
     invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/text/TextWatcherKt;->addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Landroid/text/TextWatcher;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "onAfterTextChanged"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$addBindedTextWatcher"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion$createRequiredInputValidator$1.smali b/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion$createRequiredInputValidator$1.smali
index df4639769c..582bea1314 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion$createRequiredInputValidator$1.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator$Companion$createRequiredInputValidator$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion$createRequiredInputValidator$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "BasicTextInputValidator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,9 +73,11 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
@@ -92,13 +94,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator.smali b/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator.smali
index 1a545a086a..230b7b8ee6 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/BasicTextInputValidator.smali
@@ -58,7 +58,7 @@
 .end method
 
 .method public constructor <init>(ILkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/StringRes;
         .end annotation
@@ -74,7 +74,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "inputPredicate"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -83,15 +85,6 @@
     iput-object p2, p0, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->inputPredicate:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "inputPredicate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -109,45 +102,43 @@
 .end method
 
 .method public getErrorMessage(Lcom/google/android/material/textfield/TextInputLayout;)Ljava/lang/String;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->inputPredicate:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->inputPredicate:Lkotlin/jvm/functions/Function1;
 
     invoke-static {p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getTextOrEmpty(Lcom/google/android/material/textfield/TextInputLayout;)Ljava/lang/String;
 
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
     move-result-object v1
 
-    check-cast v1, Ljava/lang/Boolean;
+    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    move-result-object v0
 
-    move-result v1
+    check-cast v0, Ljava/lang/Boolean;
 
-    if-nez v1, :cond_0
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
 
     iget v0, p0, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->messageResId:I
 
     invoke-static {p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
 
 .method public final getMessageResId()I
diff --git a/com.discord/smali/com/discord/utilities/view/validators/Input$EditTextInput.smali b/com.discord/smali/com/discord/utilities/view/validators/Input$EditTextInput.smali
index 2df9876691..985270ecf9 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/Input$EditTextInput.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/Input$EditTextInput.smali
@@ -38,13 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "validators"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p3
 
@@ -57,27 +61,6 @@
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/view/validators/Input;-><init>(Ljava/lang/String;Landroid/view/View;[Lcom/discord/utilities/view/validators/InputValidator;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "validators"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -97,7 +80,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/view/validators/Input$GenericInput.smali b/com.discord/smali/com/discord/utilities/view/validators/Input$GenericInput.smali
index 4f408b711f..d7f9cacbf8 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/Input$GenericInput.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/Input$GenericInput.smali
@@ -56,15 +56,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "validator"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onError"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -79,34 +85,6 @@
     iput-object p4, p0, Lcom/discord/utilities/view/validators/Input$GenericInput;->onError:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "onError"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "validator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -118,7 +96,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/utilities/view/validators/Input$TextInputLayoutInput.smali b/com.discord/smali/com/discord/utilities/view/validators/Input$TextInputLayoutInput.smali
index 4345041c02..430f24500e 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/Input$TextInputLayoutInput.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/Input$TextInputLayoutInput.smali
@@ -38,13 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "validators"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p3
 
@@ -57,27 +61,6 @@
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/view/validators/Input;-><init>(Ljava/lang/String;Landroid/view/View;[Lcom/discord/utilities/view/validators/InputValidator;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "validators"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -120,7 +103,7 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/view/validators/Input.smali b/com.discord/smali/com/discord/utilities/view/validators/Input.smali
index a7bdbeb3c0..c9905f26cd 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/Input.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/Input.smali
@@ -57,13 +57,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "validators"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -74,27 +78,6 @@
     iput-object p3, p0, Lcom/discord/utilities/view/validators/Input;->validators:[Lcom/discord/utilities/view/validators/InputValidator;
 
     return-void
-
-    :cond_0
-    const-string p1, "validators"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic validate$default(Lcom/discord/utilities/view/validators/Input;ZILjava/lang/Object;)Z
diff --git a/com.discord/smali/com/discord/utilities/view/validators/ValidationManager.smali b/com.discord/smali/com/discord/utilities/view/validators/ValidationManager.smali
index c2a85c1077..1cef56a346 100644
--- a/com.discord/smali/com/discord/utilities/view/validators/ValidationManager.smali
+++ b/com.discord/smali/com/discord/utilities/view/validators/ValidationManager.smali
@@ -19,7 +19,7 @@
 
 # direct methods
 .method public varargs constructor <init>([Lcom/discord/utilities/view/validators/Input;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "([",
@@ -30,22 +30,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "inputs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/view/validators/ValidationManager;->inputs:[Lcom/discord/utilities/view/validators/Input;
 
     return-void
-
-    :cond_0
-    const-string p1, "inputs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic validate$default(Lcom/discord/utilities/view/validators/ValidationManager;ZILjava/lang/Object;)Z
@@ -70,7 +63,7 @@
 
 # virtual methods
 .method public final setErrors(Ljava/util/Map;)Ljava/util/Collection;
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -86,97 +79,103 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "errorMap"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance v0, Ljava/util/ArrayList;
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v2, p0, Lcom/discord/utilities/view/validators/ValidationManager;->inputs:[Lcom/discord/utilities/view/validators/Input;
+    iget-object v1, p0, Lcom/discord/utilities/view/validators/ValidationManager;->inputs:[Lcom/discord/utilities/view/validators/Input;
 
-    if-eqz v2, :cond_a
+    const-string v2, "$this$reversed"
 
-    array-length v3, v2
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-nez v3, :cond_0
+    array-length v2, v1
 
-    const/4 v3, 0x1
+    if-nez v2, :cond_0
+
+    const/4 v2, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     goto :goto_1
 
     :cond_1
-    invoke-static {v2}, Lf/n/a/k/a;->toMutableList([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v1}, Lf/n/a/k/a;->toMutableList([Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v2}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
+    const-string v2, "$this$reverse"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
 
     :goto_1
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v2
+    move-result-object v1
 
     :cond_2
     :goto_2
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_4
+    if-eqz v2, :cond_4
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/utilities/view/validators/Input;
+
+    invoke-virtual {v2}, Lcom/discord/utilities/view/validators/Input;->getName()Ljava/lang/String;
 
     move-result-object v3
 
-    check-cast v3, Lcom/discord/utilities/view/validators/Input;
+    invoke-interface {p1, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v3}, Lcom/discord/utilities/view/validators/Input;->getName()Ljava/lang/String;
+    move-result-object v3
 
-    move-result-object v4
+    check-cast v3, Ljava/util/List;
 
-    invoke-interface {p1, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    if-eqz v3, :cond_3
 
-    move-result-object v4
+    invoke-static {v3}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
-    check-cast v4, Ljava/util/List;
+    move-result-object v3
 
-    if-eqz v4, :cond_3
-
-    invoke-static {v4}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/String;
+    check-cast v3, Ljava/lang/String;
 
     goto :goto_3
 
     :cond_3
-    move-object v4, v0
+    const/4 v3, 0x0
 
     :goto_3
-    invoke-virtual {v3, v4}, Lcom/discord/utilities/view/validators/Input;->setErrorMessage(Ljava/lang/CharSequence;)Z
+    invoke-virtual {v2, v3}, Lcom/discord/utilities/view/validators/Input;->setErrorMessage(Ljava/lang/CharSequence;)Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
-    invoke-virtual {v3}, Lcom/discord/utilities/view/validators/Input;->getName()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/discord/utilities/view/validators/Input;->getName()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-interface {v1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
@@ -185,9 +184,15 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_9
+    const-string v1, "$this$minus"
 
-    invoke-static {v1, p1}, Lf/n/a/k/a;->convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "elements"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lf/n/a/k/a;->convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
 
     move-result-object v0
 
@@ -197,7 +202,7 @@
 
     if-eqz v1, :cond_5
 
-    invoke-static {p1}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {p1}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object p1
 
@@ -250,27 +255,6 @@
 
     :goto_5
     return-object p1
-
-    :cond_9
-    const-string p1, "$this$minus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "$this$reversed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p1, "errorMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final validate(Z)Z
diff --git a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$bind$1.smali b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$bind$1.smali
index 1cac3ab941..e129cb9bca 100644
--- a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$bind$1.smali
+++ b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$bind$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/viewcontroller/RxViewController$bind$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RxViewController.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TT;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$1.smali b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$1.smali
index 2c65a5e153..e2d97fedd3 100644
--- a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$1.smali
+++ b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$1.smali
@@ -3,7 +3,7 @@
 .source "RxViewController.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "TT;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,10 +49,18 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)",
+            "Ljava/lang/Boolean;"
+        }
+    .end annotation
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$1;->call(Ljava/lang/Object;)Z
+    iget-object p1, p0, Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$1;->$view:Landroid/view/View;
+
+    invoke-virtual {p1}, Landroid/view/View;->isAttachedToWindow()Z
 
     move-result p1
 
@@ -63,19 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
 
-    iget-object p1, p0, Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$1;->$view:Landroid/view/View;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    invoke-virtual {p1}, Landroid/view/View;->isAttachedToWindow()Z
+    move-result-object p1
 
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.smali b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.smali
index b8a0a1398a..c55320f96b 100644
--- a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.smali
+++ b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RxViewController.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$2;->$subscriptionResult:Lkotlin/jvm/internal/Ref$ObjectRef;
 
     iput-object p1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$3.smali b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$3.smali
index 857064e5e2..dd8f25fe7a 100644
--- a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$3.smali
+++ b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RxViewController.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TT;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController.smali b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController.smali
index b466a95714..3633c4fbff 100644
--- a/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController.smali
+++ b/com.discord/smali/com/discord/utilities/viewcontroller/RxViewController.smali
@@ -30,29 +30,22 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TV;)V"
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/viewcontroller/RxViewController;->view:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final connectViewRx(Landroid/view/View;Lrx/Observable;Lkotlin/jvm/functions/Function1;)Lrx/Subscription;
@@ -93,7 +86,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -105,13 +98,13 @@
 
     invoke-direct {v2, p1}, Lcom/discord/utilities/viewcontroller/RxViewController$connectViewRx$1;-><init>(Landroid/view/View;)V
 
-    invoke-virtual {p2, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
     const-string p1, "observable\n        .take\u2026view.isAttachedToWindow }"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -148,7 +141,7 @@
     :cond_0
     const-string p1, "subscriptionResult"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.smali b/com.discord/smali/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.smali
index b26798dc0e..bdc3496117 100644
--- a/com.discord/smali/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.smali
+++ b/com.discord/smali/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.smali
@@ -22,7 +22,9 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,15 +37,6 @@
     invoke-virtual {p1, p0}, Landroid/view/View;->addOnAttachStateChangeListener(Landroid/view/View$OnAttachStateChangeListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -63,7 +56,7 @@
 
     const-string v1, "onDetachSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout$onMeasure$1.smali b/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout$onMeasure$1.smali
index dad28fee58..51431850b3 100644
--- a/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout$onMeasure$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout$onMeasure$1.smali
@@ -1,13 +1,25 @@
 .class public final synthetic Lcom/discord/utilities/views/ContentResizingCoordinatorLayout$onMeasure$1;
-.super Lj0/n/c/j;
+.super Lk0/o/c/l;
 .source "ContentResizingCoordinatorLayout.kt"
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/views/ContentResizingCoordinatorLayout;)V
-    .locals 0
+    .locals 6
 
-    invoke-direct {p0, p1}, Lj0/n/c/j;-><init>(Ljava/lang/Object;)V
+    const-class v2, Lcom/discord/utilities/views/ContentResizingCoordinatorLayout;
+
+    const-string v3, "appBarLayout"
+
+    const-string v4, "getAppBarLayout()Lcom/google/android/material/appbar/AppBarLayout;"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/l;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
@@ -17,7 +29,7 @@
 .method public get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/views/ContentResizingCoordinatorLayout;
 
@@ -28,38 +40,10 @@
     return-object v0
 .end method
 
-.method public getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "appBarLayout"
-
-    return-object v0
-.end method
-
-.method public getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/utilities/views/ContentResizingCoordinatorLayout;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getAppBarLayout()Lcom/google/android/material/appbar/AppBarLayout;"
-
-    return-object v0
-.end method
-
 .method public set(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/utilities/views/ContentResizingCoordinatorLayout;
 
diff --git a/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout.smali b/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout.smali
index a8851cd2f9..c95ef2bcd9 100644
--- a/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout.smali
+++ b/com.discord/smali/com/discord/utilities/views/ContentResizingCoordinatorLayout.smali
@@ -11,60 +11,39 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -116,7 +95,7 @@
     :cond_0
     const-string p0, "appBarLayout"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -169,12 +148,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -261,40 +240,40 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_1
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_2
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_3
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.view.View"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.google.android.material.appbar.AppBarLayout"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali
index 967c1549f2..91f07cb65e 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1.smali
@@ -51,7 +51,9 @@
 .method public createAnimator(Landroid/view/View;)Landroid/animation/Animator;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryFadeIn$1;->this$0:Lcom/discord/utilities/views/FloatingButtonMenuInitializer;
 
@@ -68,13 +70,4 @@
     invoke-virtual {v0, p1}, Landroid/animation/Animator;->setTarget(Ljava/lang/Object;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali
index 3909eb7b62..775faadaeb 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali
@@ -52,13 +52,13 @@
 .method public createAnimator(Landroid/view/ViewGroup;)Landroid/animation/Animator;
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a0385
+    const v0, 0x7f0a038b
 
-    invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
@@ -102,15 +102,14 @@
 
     invoke-virtual {v0, v2}, Landroid/animation/AnimatorSet;->playTogether([Landroid/animation/Animator;)V
 
-    :cond_0
     return-object v0
 
-    :cond_1
-    const-string p1, "view"
+    :cond_0
+    const/4 p1, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    return-object p1
 
-    throw v0
+    nop
 
     :array_0
     .array-data 4
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali
index 8d17ca71d4..254aed313d 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactorySlideUp$1.smali
@@ -38,9 +38,11 @@
 
 # virtual methods
 .method public createAnimator(Landroid/view/View;)Landroid/animation/Animator;
-    .locals 5
+    .locals 4
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Landroid/view/View;->TRANSLATION_Y:Landroid/util/Property;
 
@@ -48,19 +50,19 @@
 
     new-array v1, v1, [F
 
-    const/4 v2, 0x0
-
     invoke-virtual {p1}, Landroid/view/View;->getHeight()I
 
-    move-result v3
+    move-result v2
 
-    int-to-float v3, v3
+    int-to-float v2, v2
 
-    const/high16 v4, 0x3f800000    # 1.0f
+    const/high16 v3, 0x3f800000    # 1.0f
 
-    mul-float v3, v3, v4
+    mul-float v2, v2, v3
 
-    aput v3, v1, v2
+    const/4 v3, 0x0
+
+    aput v2, v1, v3
 
     const/4 v2, 0x1
 
@@ -73,13 +75,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali
index dcefbd4fcc..9f6e2d8f15 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1.smali
@@ -34,7 +34,9 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/views/FloatingButtonMenuInitializer$getMenuAnimators$1;->$row:Landroid/view/ViewGroup;
 
@@ -43,13 +45,4 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setVisibility(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
index 756f75b45b..dc98a21be0 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
@@ -71,11 +71,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onClickListenerMap"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -102,20 +104,6 @@
     iput-object p1, p0, Lcom/discord/utilities/views/FloatingButtonMenuInitializer;->animatorFactoryScaleUp:Lcom/discord/utilities/views/FloatingButtonMenuInitializer$AnimatorFactory;
 
     return-void
-
-    :cond_0
-    const-string p1, "onClickListenerMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$configureEntranceAnimator(Lcom/discord/utilities/views/FloatingButtonMenuInitializer;[Landroid/animation/Animator;)Landroid/animation/Animator;
@@ -193,7 +181,7 @@
 
     const-string v0, "animatorEntrance.setDura\u2026n(totalDuration.toLong())"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -205,7 +193,7 @@
 
     move-result v0
 
-    const v1, 0x7f0a0384
+    const v1, 0x7f0a038a
 
     if-ne v0, v1, :cond_0
 
@@ -351,11 +339,11 @@
     goto :goto_0
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.ViewGroup"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -394,11 +382,13 @@
 .method public final initialize(Landroid/view/ViewGroup;Landroid/view/View$OnClickListener;)Lcom/discord/utilities/views/FloatingButtonMenuInitializer;
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "menuContainer"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "defaultRowOnClickListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -442,11 +432,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.TableRow"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -462,18 +452,4 @@
     invoke-virtual {p2, v0}, Landroid/view/ViewTreeObserver;->addOnGlobalLayoutListener(Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V
 
     return-object p0
-
-    :cond_2
-    const-string p1, "defaultRowOnClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "menuContainer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
index 56d76eb197..c56f02de0f 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$Companion.smali
@@ -36,17 +36,19 @@
 .method public final addThemedDivider(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$addThemedDivider"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f040153
+    const v0, 0x7f040153
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {p1, v1, v2, v3, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    const/4 v3, 0x0
+
+    invoke-static {p1, v0, v1, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result v0
 
@@ -60,7 +62,7 @@
 
     const-string v3, "context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
 
@@ -74,7 +76,7 @@
 
     const-string v1, "ResourcesCompat.getDrawa\u2026 context.theme) ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroidx/recyclerview/widget/DividerItemDecoration;
 
@@ -103,21 +105,14 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type androidx.recyclerview.widget.LinearLayoutManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "$this$addThemedDivider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder.smali
index 3ac2809dd1..449d51ca6e 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder.smali
@@ -25,22 +25,15 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
index 6bcf1d7f6f..410960f955 100644
--- a/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/views/SimpleRecyclerAdapter.smali
@@ -81,11 +81,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "createViewHolder"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -94,20 +96,6 @@
     iput-object p2, p0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->createViewHolder:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "createViewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -117,7 +105,7 @@
 
     if-eqz p3, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_0
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;)V
@@ -157,7 +145,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->data:Ljava/util/List;
 
@@ -168,15 +158,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;->bind(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -199,7 +180,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->createViewHolder:Lkotlin/jvm/functions/Function2;
 
@@ -213,7 +196,7 @@
 
     const-string v1, "LayoutInflater.from(parent.context)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, v0, p1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -222,19 +205,10 @@
     check-cast p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -243,20 +217,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->data:Ljava/util/List;
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali
index 3146b87b4c..47266ab626 100644
--- a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali
+++ b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager.smali
@@ -44,11 +44,13 @@
 .method public final layoutHeaderView(Landroid/view/ViewGroup;Landroid/view/View;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "parent"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getWidth()I
 
@@ -123,18 +125,4 @@
     invoke-virtual {p2, v2, v2, p1, v0}, Landroid/view/View;->layout(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali
index dc74a202e4..ad15032aa4 100644
--- a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.smali
@@ -39,11 +39,13 @@
 .method public onInterceptTouchEvent(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/MotionEvent;)Z
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "recyclerView"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "event"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
 
@@ -196,18 +198,4 @@
 
     :goto_2
     return v1
-
-    :cond_5
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali
index 7f2b72b441..825151889d 100644
--- a/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali
+++ b/com.discord/smali/com/discord/utilities/views/StickyHeaderItemDecoration.smali
@@ -24,24 +24,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/views/StickyHeaderItemDecoration;->adapter:Lcom/discord/utilities/views/StickyHeaderItemDecoration$StickyHeaderAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getActionDownRawX$p(Lcom/discord/utilities/views/StickyHeaderItemDecoration;)Ljava/lang/Float;
@@ -193,7 +186,7 @@
 
     const-string v3, "child"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getTop()I
 
@@ -241,7 +234,9 @@
 .method public final blockClicks(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1;
 
@@ -250,27 +245,22 @@
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->addOnItemTouchListener(Landroidx/recyclerview/widget/RecyclerView$OnItemTouchListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDrawOver(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "canvas"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "parent"
 
-    if-eqz p3, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;->onDrawOver(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 
@@ -365,25 +355,4 @@
     :cond_4
     :goto_0
     return-void
-
-    :cond_5
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali b/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali
index f8b33abf0f..65af5a081f 100644
--- a/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali
+++ b/com.discord/smali/com/discord/utilities/views/SwipeableItemTouchHelper.smali
@@ -119,19 +119,23 @@
 .method public onChildDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;FFIZ)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "c"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "recyclerView"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "viewHolder"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p3, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v1, "viewHolder.itemView"
+    const-string/jumbo v1, "viewHolder.itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -363,62 +367,24 @@
     invoke-super/range {p0 .. p7}, Landroidx/recyclerview/widget/ItemTouchHelper$Callback;->onChildDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;FFIZ)V
 
     return-void
-
-    :cond_2
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "c"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onMove(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recyclerView"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo p1, "viewHolder"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "target"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
     return p1
-
-    :cond_0
-    const-string p1, "target"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserver.smali b/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserver.smali
index 0608f94767..9aa2c29905 100644
--- a/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserver.smali
+++ b/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserver.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "isVisibleSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserverProvider.smali b/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserverProvider.smali
index 0ba357e8c2..28126f0b14 100644
--- a/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserverProvider.smali
+++ b/com.discord/smali/com/discord/utilities/views/ViewVisibilityObserverProvider.smali
@@ -57,27 +57,32 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "featureName"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/views/ViewVisibilityObserverProvider;->featureNameToObserverRefMap:Ljava/util/Map;
+    sget-object v0, Lcom/discord/utilities/views/ViewVisibilityObserverProvider;->featureNameToObserverRefMap:Ljava/util/Map;
 
-    invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Ljava/lang/ref/WeakReference;
+    check-cast v0, Ljava/lang/ref/WeakReference;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/discord/utilities/views/ViewVisibilityObserver;
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     if-nez v0, :cond_1
 
     new-instance v0, Lcom/discord/utilities/views/ViewVisibilityObserver;
@@ -94,11 +99,4 @@
 
     :cond_1
     return-object v0
-
-    :cond_2
-    const-string p1, "featureName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$1.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$1.smali
index d04a571ab5..7437a1ecce 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$1.smali
@@ -3,7 +3,7 @@
 .source "DiscordOverlayService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$2.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$2.smali
index b29bbf21f4..1b07f0f8af 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$2.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordOverlayService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,9 +79,13 @@
 
     if-eqz v2, :cond_0
 
+    const-string/jumbo v3, "weakContext.get() ?: return@appSubscribe"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string v3, "action"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v2, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->access$createOverlayIntent(Lcom/discord/utilities/voice/DiscordOverlayService$Companion;Landroid/content/Context;Ljava/lang/String;)Landroid/content/Intent;
 
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
index 7419249009..e4301b874f 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
@@ -60,29 +60,31 @@
 .method public final launchForConnect(Landroid/content/Context;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getMobileOverlay()Z
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getMobileOverlay()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    const v1, 0x7f1210aa
+    const v0, 0x7f1210d4
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
 
     const/16 v3, 0x8
 
-    invoke-static {p1, v1, v2, v0, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 
@@ -115,13 +117,13 @@
 
     sget-object v2, Lcom/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$1;->INSTANCE:Lcom/discord/utilities/voice/DiscordOverlayService$Companion$launchForConnect$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "StoreStream\n          .g\u2026            }\n          }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -146,19 +148,14 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final launchForVoiceChannelSelect(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -182,21 +179,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final launchOverlayForVoice(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -220,21 +210,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final requestOverlayClose(Landroid/content/Context;)V
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     const-string v0, "com.discord.actions.OVERLAY_CLOSE"
@@ -268,13 +251,4 @@
 
     :goto_0
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createMenu$1.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createMenu$1.smali
index 52b5e50315..8a6804da1a 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createMenu$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createMenu$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/DiscordOverlayService$createMenu$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordOverlayService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/overlay/views/OverlayDialog;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/overlay/views/OverlayDialog;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/voice/DiscordOverlayService$createMenu$1;->this$0:Lcom/discord/utilities/voice/DiscordOverlayService;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/overlay/OverlayManager;->d(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali
index 85e18d8117..7adb055810 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordOverlayService.kt"
 
 # interfaces
@@ -18,10 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/overlay/views/OverlayBubbleWrap;",
-        "Lcom/discord/overlay/views/OverlayDialog;",
+        "Lcom/discord/overlay/views/OverlayBubbleWrap;",
         ">;"
     }
 .end annotation
@@ -43,200 +43,195 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke(Lcom/discord/overlay/views/OverlayBubbleWrap;)Lcom/discord/overlay/views/OverlayDialog;
-    .locals 9
+.method public final invoke(Lcom/discord/overlay/views/OverlayBubbleWrap;)Lcom/discord/overlay/views/OverlayBubbleWrap;
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "srcBubble"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1;->this$0:Lcom/discord/utilities/voice/DiscordOverlayService;
+    iget-object v0, p0, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1;->this$0:Lcom/discord/utilities/voice/DiscordOverlayService;
 
-    invoke-static {v1}, Lcom/discord/utilities/voice/DiscordOverlayService;->access$createMenu(Lcom/discord/utilities/voice/DiscordOverlayService;)Lcom/discord/overlay/views/OverlayDialog;
+    invoke-static {v0}, Lcom/discord/utilities/voice/DiscordOverlayService;->access$createMenu(Lcom/discord/utilities/voice/DiscordOverlayService;)Lcom/discord/overlay/views/OverlayDialog;
+
+    move-result-object v0
+
+    const v1, 0x7f0a0678
+
+    invoke-virtual {v0, v1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
 
-    const v2, 0x7f0a0672
+    const-string v2, "dialogBubble.findViewByI\u2026erlay_linked_anchor_view)"
 
-    invoke-virtual {v1, v2}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v2
+    instance-of v2, p1, Lf/a/n/b0;
 
-    const-string v3, "dialogBubble.findViewByI\u2026erlay_linked_anchor_view)"
+    const/4 v3, 0x0
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    if-nez v2, :cond_0
 
-    instance-of v3, p1, Lf/a/n/b0;
-
-    if-nez v3, :cond_0
-
-    move-object v3, v0
+    move-object v2, v3
 
     goto :goto_0
 
     :cond_0
-    move-object v3, p1
+    move-object v2, p1
 
     :goto_0
-    check-cast v3, Lf/a/n/b0;
+    check-cast v2, Lf/a/n/b0;
 
-    if-eqz v3, :cond_9
+    if-eqz v2, :cond_9
 
-    invoke-virtual {v3}, Lf/a/n/b0;->getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-virtual {v2}, Lf/a/n/b0;->getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_9
+    if-eqz v2, :cond_9
 
-    invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    new-instance v4, Landroid/graphics/Rect;
 
-    move-result-object v4
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    instance-of v5, v4, Landroid/view/ViewGroup$MarginLayoutParams;
+    move-result-object v5
 
-    if-nez v5, :cond_1
+    instance-of v6, v5, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    move-object v4, v0
+    if-nez v6, :cond_1
+
+    move-object v5, v3
 
     :cond_1
-    check-cast v4, Landroid/view/ViewGroup$MarginLayoutParams;
+    check-cast v5, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    if-eqz v4, :cond_2
+    if-eqz v5, :cond_2
 
-    iget v4, v4, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
+    iget v5, v5, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
 
     goto :goto_1
 
     :cond_2
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     :goto_1
-    invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v6
-
-    instance-of v7, v6, Landroid/view/ViewGroup$MarginLayoutParams;
-
-    if-nez v7, :cond_3
-
-    move-object v6, v0
-
-    :cond_3
-    check-cast v6, Landroid/view/ViewGroup$MarginLayoutParams;
-
-    if-eqz v6, :cond_4
-
-    iget v6, v6, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
-
-    goto :goto_2
-
-    :cond_4
-    const/4 v6, 0x0
-
-    :goto_2
-    invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v7
 
     instance-of v8, v7, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-nez v8, :cond_5
+    if-nez v8, :cond_3
 
-    move-object v7, v0
+    move-object v7, v3
 
-    :cond_5
+    :cond_3
     check-cast v7, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-eqz v7, :cond_6
+    if-eqz v7, :cond_4
 
-    iget v7, v7, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
+    iget v7, v7, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
+
+    goto :goto_2
+
+    :cond_4
+    const/4 v7, 0x0
+
+    :goto_2
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v8
+
+    instance-of v9, v8, Landroid/view/ViewGroup$MarginLayoutParams;
+
+    if-nez v9, :cond_5
+
+    move-object v8, v3
+
+    :cond_5
+    check-cast v8, Landroid/view/ViewGroup$MarginLayoutParams;
+
+    if-eqz v8, :cond_6
+
+    iget v8, v8, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
 
     goto :goto_3
 
     :cond_6
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
     :goto_3
-    invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v3
+    move-result-object v2
 
-    instance-of v8, v3, Landroid/view/ViewGroup$MarginLayoutParams;
+    instance-of v9, v2, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-nez v8, :cond_7
+    if-nez v9, :cond_7
 
     goto :goto_4
 
     :cond_7
-    move-object v0, v3
+    move-object v3, v2
 
     :goto_4
-    check-cast v0, Landroid/view/ViewGroup$MarginLayoutParams;
+    check-cast v3, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    if-eqz v0, :cond_8
+    if-eqz v3, :cond_8
 
-    iget v5, v0, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
+    iget v6, v3, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
     :cond_8
-    new-instance v0, Landroid/graphics/Rect;
-
-    invoke-direct {v0, v4, v6, v7, v5}, Landroid/graphics/Rect;-><init>(IIII)V
+    invoke-direct {v4, v5, v7, v8, v6}, Landroid/graphics/Rect;-><init>(IIII)V
 
     goto :goto_5
 
     :cond_9
-    new-instance v0, Landroid/graphics/Rect;
+    new-instance v4, Landroid/graphics/Rect;
 
-    invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
+    invoke-direct {v4}, Landroid/graphics/Rect;-><init>()V
 
     :goto_5
-    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual {p1}, Landroid/widget/FrameLayout;->getWidth()I
 
-    move-result v4
+    move-result v3
 
-    iget v5, v0, Landroid/graphics/Rect;->left:I
+    iget v5, v4, Landroid/graphics/Rect;->left:I
 
-    sub-int/2addr v4, v5
+    sub-int/2addr v3, v5
 
-    iget v0, v0, Landroid/graphics/Rect;->right:I
+    iget v4, v4, Landroid/graphics/Rect;->right:I
 
-    sub-int/2addr v4, v0
+    sub-int/2addr v3, v4
 
-    iput v4, v3, Landroid/view/ViewGroup$LayoutParams;->width:I
+    iput v3, v2, Landroid/view/ViewGroup$LayoutParams;->width:I
 
     invoke-virtual {p1}, Landroid/widget/FrameLayout;->getHeight()I
 
     move-result p1
 
-    iput p1, v3, Landroid/view/ViewGroup$LayoutParams;->height:I
+    iput p1, v2, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    invoke-virtual {v2}, Landroid/view/View;->requestLayout()V
+    invoke-virtual {v1}, Landroid/view/View;->requestLayout()V
 
     iget-object p1, p0, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1;->$anchorTag:Ljava/lang/String;
 
-    invoke-virtual {v2, p1}, Landroid/view/View;->setTag(Ljava/lang/Object;)V
+    invoke-virtual {v1, p1}, Landroid/view/View;->setTag(Ljava/lang/Object;)V
 
-    return-object v1
-
-    :cond_a
-    const-string p1, "srcBubble"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -244,7 +239,7 @@
 
     check-cast p1, Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1;->invoke(Lcom/discord/overlay/views/OverlayBubbleWrap;)Lcom/discord/overlay/views/OverlayDialog;
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1;->invoke(Lcom/discord/overlay/views/OverlayBubbleWrap;)Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceSelector$1.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceSelector$1.smali
index fe659507b1..fb432fabe4 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceSelector$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceSelector$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceSelector$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordOverlayService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/overlay/views/OverlayDialog;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/overlay/views/OverlayDialog;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceSelector$1;->this$0:Lcom/discord/utilities/voice/DiscordOverlayService;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/overlay/OverlayManager;->d(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$1.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$1.smali
index c04c873548..4555dcb259 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordOverlayService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of p1, p1, Lf/a/n/b0;
 
@@ -89,13 +91,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$2.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$2.smali
index 958c86f37b..4890fe52c5 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$2.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$onCreate$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "DiscordOverlayService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$2;->this$0:Lcom/discord/utilities/voice/DiscordOverlayService;
 
@@ -132,13 +134,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
index 6cab890257..62841258bb 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
@@ -87,7 +87,7 @@
 
     const-string v2, "applicationContext"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1}, Lf/a/n/l;-><init>(Landroid/content/Context;)V
 
@@ -99,7 +99,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0701f9
+    const v3, 0x7f0701f2
 
     invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelOffset(I)I
 
@@ -117,7 +117,7 @@
 .end method
 
 .method private final createVoiceBubble()Lcom/discord/overlay/views/OverlayBubbleWrap;
-    .locals 5
+    .locals 6
 
     invoke-virtual {p0}, Landroid/app/Service;->getResources()Landroid/content/res/Resources;
 
@@ -137,7 +137,7 @@
 
     const-string v3, "applicationContext"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v1, v2}, Lf/a/n/b0;-><init>(Landroid/content/Context;)V
 
@@ -159,18 +159,38 @@
 
     invoke-direct {v2, p0, v3}, Lcom/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1;-><init>(Lcom/discord/utilities/voice/DiscordOverlayService;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_0
+    const/4 v4, 0x0
 
-    new-instance v4, Lf/a/e/c;
+    if-eqz v0, :cond_1
 
-    invoke-direct {v4, v0, v2, v1, v3}, Lf/a/e/c;-><init>(Lcom/discord/overlay/OverlayManager;Lkotlin/jvm/functions/Function1;Lcom/discord/overlay/views/OverlayBubbleWrap;Ljava/lang/Object;)V
+    const-string v5, "srcBubble"
 
-    invoke-virtual {v1, v4}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "anchorViewTag"
+
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "menuBubbleProvider"
+
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Lf/a/e/c;
+
+    invoke-direct {v5, v0, v2, v1, v3}, Lf/a/e/c;-><init>(Lcom/discord/overlay/OverlayManager;Lkotlin/jvm/functions/Function1;Lcom/discord/overlay/views/OverlayBubbleWrap;Ljava/lang/Object;)V
+
+    invoke-virtual {v1, v5}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p0}, Lcom/discord/overlay/OverlayService;->getOverlayManager()Lcom/discord/overlay/OverlayManager;
 
     move-result-object v0
 
+    if-eqz v0, :cond_0
+
+    const-string v2, "bubble"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v2, v0, Lcom/discord/overlay/OverlayManager;->k:Landroid/view/View$OnTouchListener;
 
     invoke-virtual {v1, v2}, Landroid/widget/FrameLayout;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
@@ -184,9 +204,10 @@
     return-object v1
 
     :cond_0
-    const/4 v0, 0x0
+    throw v4
 
-    throw v0
+    :cond_1
+    throw v4
 .end method
 
 .method private final createVoiceSelector()Lcom/discord/overlay/views/OverlayBubbleWrap;
@@ -200,7 +221,7 @@
 
     const-string v2, "applicationContext"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1}, Lf/a/n/e0;-><init>(Landroid/content/Context;)V
 
@@ -278,7 +299,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f080365
+    const v3, 0x7f080368
 
     invoke-virtual {v1, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
@@ -294,7 +315,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f121099
+    const v3, 0x7f1210c3
 
     invoke-virtual {p0, v3}, Landroid/app/Service;->getString(I)Ljava/lang/String;
 
@@ -304,7 +325,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f1210ab
+    const v3, 0x7f1210d5
 
     invoke-virtual {p0, v3}, Landroid/app/Service;->getString(I)Ljava/lang/String;
 
@@ -318,25 +339,25 @@
 
     move-result-object v1
 
-    const v2, 0x7f12043a
+    const v2, 0x7f12043b
 
     invoke-virtual {p0, v2}, Landroid/app/Service;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
-    const v3, 0x7f080285
+    const v3, 0x7f080286
 
     invoke-virtual {v1, v3, v2, p1}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object p1
 
-    const v1, 0x7f121466
+    const v1, 0x7f121490
 
     invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
-    const v2, 0x7f0803c3
+    const v2, 0x7f0803c6
 
     invoke-virtual {p1, v2, v1, v0}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
 
@@ -348,7 +369,7 @@
 
     const-string v0, "NotificationCompat.Build\u2026       )\n        .build()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -356,14 +377,16 @@
 .method public createOverlayBubble(Landroid/content/Intent;)Lcom/discord/overlay/views/OverlayBubbleWrap;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     if-nez p1, :cond_0
 
     goto/16 :goto_2
@@ -519,17 +542,10 @@
     :cond_a
     :goto_2
     return-object v0
-
-    :cond_b
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onCreate()V
-    .locals 3
+    .locals 4
 
     invoke-super {p0}, Lcom/discord/overlay/OverlayService;->onCreate()V
 
@@ -541,7 +557,7 @@
 
     const-string v2, "application"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream$Companion;->initialize(Landroid/app/Application;)V
 
@@ -551,7 +567,13 @@
 
     sget-object v1, Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$1;->INSTANCE:Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$1;
 
-    if-eqz v1, :cond_0
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
+
+    const-string v3, "<set-?>"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->g:Lkotlin/jvm/functions/Function1;
 
@@ -563,18 +585,19 @@
 
     invoke-direct {v1, p0}, Lcom/discord/utilities/voice/DiscordOverlayService$onCreate$2;-><init>(Lcom/discord/utilities/voice/DiscordOverlayService;)V
 
+    if-eqz v0, :cond_0
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->h:Lkotlin/jvm/functions/Function1;
 
     return-void
 
     :cond_0
-    const-string v0, "<set-?>"
+    throw v2
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
+    :cond_1
+    throw v2
 .end method
 
 .method public onStartCommand(Landroid/content/Intent;II)I
@@ -623,7 +646,7 @@
     :cond_1
     const-string v0, "com.discord.actions.OVERLAY_CLOSE"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$State.smali b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$State.smali
new file mode 100644
index 0000000000..dd3294bcc4
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$State.smali
@@ -0,0 +1,277 @@
+.class public final Lcom/discord/utilities/voice/ScreenShareManager$State;
+.super Ljava/lang/Object;
+.source "ScreenShareManager.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/voice/ScreenShareManager;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "State"
+.end annotation
+
+
+# instance fields
+.field public final activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+.field public final meId:Ljava/lang/Long;
+
+.field public final rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Long;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iput-object p2, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    iput-object p3, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/utilities/voice/ScreenShareManager$State;Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/utilities/voice/ScreenShareManager$State;
+    .locals 0
+
+    and-int/lit8 p5, p4, 0x1
+
+    if-eqz p5, :cond_0
+
+    iget-object p1, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    :cond_0
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    iget-object p2, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-object p3, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/voice/ScreenShareManager$State;->copy(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Long;)Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final component2()Lcom/discord/rtcconnection/RtcConnection;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    return-object v0
+.end method
+
+.method public final component3()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Long;)Lcom/discord/utilities/voice/ScreenShareManager$State;
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/voice/ScreenShareManager$State;-><init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Long;)V
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    iget-object v1, p1, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    iget-object v1, p1, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    iget-object p1, p1, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getActiveStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    return-object v0
+.end method
+
+.method public final getMeId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final getRtcConnection()Lcom/discord/rtcconnection/RtcConnection;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_2
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "State(activeStream="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", rtcConnection="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", meId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager$State;->meId:Ljava/lang/Long;
+
+    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/utilities/voice/ScreenShareManager$subscribeToStores$1.smali b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$1.smali
new file mode 100644
index 0000000000..0fa82eeb05
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$1.smali
@@ -0,0 +1,108 @@
+.class public final Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;
+.super Ljava/lang/Object;
+.source "ScreenShareManager.kt"
+
+# interfaces
+.implements Lrx/functions/Func3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/ScreenShareManager;->subscribeToStores()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        "T3:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func3<",
+        "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+        "Lcom/discord/rtcconnection/RtcConnection;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/utilities/voice/ScreenShareManager$State;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;->INSTANCE:Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/voice/ScreenShareManager$State;
+    .locals 3
+
+    new-instance v0, Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    if-eqz p3, :cond_0
+
+    invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p3
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p3, 0x0
+
+    :goto_0
+    invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/voice/ScreenShareManager$State;-><init>(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Ljava/lang/Long;)V
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    check-cast p2, Lcom/discord/rtcconnection/RtcConnection;
+
+    check-cast p3, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;->call(Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$2.smali b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$2.smali
new file mode 100644
index 0000000000..40d7f8a829
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$2.smali
@@ -0,0 +1,73 @@
+.class public final Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$2;
+.super Lk0/o/c/j;
+.source "ScreenShareManager.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/ScreenShareManager;->subscribeToStores()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/voice/ScreenShareManager$State;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/utilities/voice/ScreenShareManager;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/utilities/voice/ScreenShareManager;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$2;->this$0:Lcom/discord/utilities/voice/ScreenShareManager;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$2;->invoke(Lcom/discord/utilities/voice/ScreenShareManager$State;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/voice/ScreenShareManager$State;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$2;->this$0:Lcom/discord/utilities/voice/ScreenShareManager;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lcom/discord/utilities/voice/ScreenShareManager;->access$handleStateUpdate(Lcom/discord/utilities/voice/ScreenShareManager;Lcom/discord/utilities/voice/ScreenShareManager$State;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/ScreenShareManager.smali b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager.smali
new file mode 100644
index 0000000000..75a459b182
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/ScreenShareManager.smali
@@ -0,0 +1,459 @@
+.class public final Lcom/discord/utilities/voice/ScreenShareManager;
+.super Ljava/lang/Object;
+.source "ScreenShareManager.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/utilities/voice/ScreenShareManager$State;
+    }
+.end annotation
+
+
+# instance fields
+.field public final appComponent:Lcom/discord/app/AppComponent;
+
+.field public final channelId:J
+
+.field public final guildId:Ljava/lang/Long;
+
+.field public previousState:Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+.field public screenshareIntent:Landroid/content/Intent;
+
+.field public final storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+.field public final storeStreamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+.field public final storeUser:Lcom/discord/stores/StoreUser;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/app/AppComponent;JLjava/lang/Long;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreStreamRtcConnection;Lcom/discord/stores/StoreUser;)V
+    .locals 1
+
+    const-string v0, "appComponent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeApplicationStreaming"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeStreamRtcConnection"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUser"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->appComponent:Lcom/discord/app/AppComponent;
+
+    iput-wide p2, p0, Lcom/discord/utilities/voice/ScreenShareManager;->channelId:J
+
+    iput-object p4, p0, Lcom/discord/utilities/voice/ScreenShareManager;->guildId:Ljava/lang/Long;
+
+    iput-object p5, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    iput-object p6, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeStreamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    iput-object p7, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeUser:Lcom/discord/stores/StoreUser;
+
+    invoke-direct {p0}, Lcom/discord/utilities/voice/ScreenShareManager;->subscribeToStores()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lcom/discord/app/AppComponent;JLjava/lang/Long;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreStreamRtcConnection;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 9
+
+    and-int/lit8 v0, p8, 0x8
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v0
+
+    move-object v6, v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v6, p5
+
+    :goto_0
+    and-int/lit8 v0, p8, 0x10
+
+    if-eqz v0, :cond_1
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getStreamRtcConnection()Lcom/discord/stores/StoreStreamRtcConnection;
+
+    move-result-object v0
+
+    move-object v7, v0
+
+    goto :goto_1
+
+    :cond_1
+    move-object v7, p6
+
+    :goto_1
+    and-int/lit8 v0, p8, 0x20
+
+    if-eqz v0, :cond_2
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
+
+    move-result-object v0
+
+    move-object v8, v0
+
+    goto :goto_2
+
+    :cond_2
+    move-object/from16 v8, p7
+
+    :goto_2
+    move-object v1, p0
+
+    move-object v2, p1
+
+    move-wide v3, p2
+
+    move-object v5, p4
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/utilities/voice/ScreenShareManager;-><init>(Lcom/discord/app/AppComponent;JLjava/lang/Long;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreStreamRtcConnection;Lcom/discord/stores/StoreUser;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$handleStateUpdate(Lcom/discord/utilities/voice/ScreenShareManager;Lcom/discord/utilities/voice/ScreenShareManager$State;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/utilities/voice/ScreenShareManager;->handleStateUpdate(Lcom/discord/utilities/voice/ScreenShareManager$State;)V
+
+    return-void
+.end method
+
+.method private final handleStateUpdate(Lcom/discord/utilities/voice/ScreenShareManager$State;)V
+    .locals 6
+    .annotation build Landroidx/annotation/UiThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager;->previousState:Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getActiveStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    :goto_0
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getActiveStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_1
+    move-object v0, v1
+
+    :goto_1
+    iget-object v4, p0, Lcom/discord/utilities/voice/ScreenShareManager;->previousState:Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    if-eqz v4, :cond_2
+
+    invoke-virtual {v4}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getActiveStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_2
+
+    invoke-virtual {v4}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_2
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v4
+
+    goto :goto_2
+
+    :cond_2
+    move-object v4, v1
+
+    :goto_2
+    invoke-static {v0, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/2addr v0, v3
+
+    if-eqz v0, :cond_3
+
+    const/4 v0, 0x1
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :goto_3
+    if-eqz v0, :cond_4
+
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getRtcConnection()Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->l(Landroid/content/Intent;)V
+
+    :cond_4
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getActiveStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+
+    move-result-wide v4
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    goto :goto_4
+
+    :cond_5
+    move-object v0, v1
+
+    :goto_4
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getMeId()Ljava/lang/Long;
+
+    move-result-object v4
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_6
+
+    return-void
+
+    :cond_6
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager;->previousState:Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    if-eqz v0, :cond_7
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getRtcConnection()Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object v1
+
+    :cond_7
+    if-nez v1, :cond_8
+
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getRtcConnection()Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_8
+
+    const/4 v2, 0x1
+
+    :cond_8
+    if-eqz v2, :cond_9
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager;->screenshareIntent:Landroid/content/Intent;
+
+    if-eqz v0, :cond_9
+
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getRtcConnection()Lcom/discord/rtcconnection/RtcConnection;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_9
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->screenshareIntent:Landroid/content/Intent;
+
+    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->l(Landroid/content/Intent;)V
+
+    :cond_9
+    iput-object p1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->previousState:Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    return-void
+.end method
+
+.method private final subscribeToStores()V
+    .locals 13
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getActiveStream()Lrx/Observable;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeStreamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStreamRtcConnection;->observeRtcConnection()Lrx/Observable;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeUser:Lcom/discord/stores/StoreUser;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->observeMe()Lrx/Observable;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;->INSTANCE:Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$1;
+
+    invoke-static {v0, v1, v2, v3}, Lrx/Observable;->i(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lrx/Observable;->q()Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable.combineLatest\u2026  .distinctUntilChanged()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->appComponent:Lcom/discord/app/AppComponent;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-class v5, Lcom/discord/utilities/voice/ScreenShareManager;
+
+    new-instance v10, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$2;
+
+    invoke-direct {v10, p0}, Lcom/discord/utilities/voice/ScreenShareManager$subscribeToStores$2;-><init>(Lcom/discord/utilities/voice/ScreenShareManager;)V
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v11, 0x1e
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final startStream(Landroid/content/Intent;)V
+    .locals 8
+
+    const-string v0, "intent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    iget-wide v2, p0, Lcom/discord/utilities/voice/ScreenShareManager;->channelId:J
+
+    iget-object v4, p0, Lcom/discord/utilities/voice/ScreenShareManager;->guildId:Ljava/lang/Long;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x4
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreApplicationStreaming;->createStream$default(Lcom/discord/stores/StoreApplicationStreaming;JLjava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)V
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->screenshareIntent:Landroid/content/Intent;
+
+    return-void
+.end method
+
+.method public final stopStream()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager;->previousState:Lcom/discord/utilities/voice/ScreenShareManager$State;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/ScreenShareManager$State;->getActiveStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/ScreenShareManager;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Lcom/discord/stores/StoreApplicationStreaming;->stopStream(Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lcom/discord/utilities/voice/ScreenShareManager;->screenshareIntent:Landroid/content/Intent;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1.smali
index 296406484f..01141f6cb4 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1.smali
@@ -3,7 +3,7 @@
 .source "VoiceChannelJoinabilityUtils.kt"
 
 # interfaces
-.implements Lrx/functions/Func3;
+.implements Lrx/functions/Func4;
 
 
 # annotations
@@ -24,12 +24,23 @@
         "Ljava/lang/Object;",
         "T3:",
         "Ljava/lang/Object;",
+        "T4:",
+        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lrx/functions/Func4<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/utilities/voice/VoiceChannelJoinability;",
+        ">;"
     }
 .end annotation
 
@@ -51,8 +62,8 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/utilities/voice/VoiceChannelJoinability;
-    .locals 2
+.method public final call(Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -63,6 +74,7 @@
             ">;",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelGuild;",
+            "Ljava/lang/Integer;",
             ")",
             "Lcom/discord/utilities/voice/VoiceChannelJoinability;"
         }
@@ -74,28 +86,40 @@
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object p1
+    move-result-object v2
 
     if-eqz p3, :cond_0
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelGuild;->getMaxVideoChannelUsers()Ljava/lang/Integer;
 
-    move-result-object p3
+    move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    const/4 p3, 0x0
+    const/4 p1, 0x0
 
     :goto_0
-    invoke-virtual {v0, v1, p1, p2, p3}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;->getJoinability(Lcom/discord/models/domain/ModelChannel;Ljava/util/Collection;Ljava/lang/Long;Ljava/lang/Integer;)Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    move-object v4, p1
+
+    const-string/jumbo p1, "verificationLevelTriggered"
+
+    invoke-static {p4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
+
+    move-result v5
+
+    move-object v3, p2
+
+    invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils;->getJoinability(Lcom/discord/models/domain/ModelChannel;Ljava/util/Collection;Ljava/lang/Long;Ljava/lang/Integer;I)Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Ljava/util/Map;
@@ -104,7 +128,9 @@
 
     check-cast p3, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1;->call(Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    check-cast p4, Ljava/lang/Integer;
+
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1;->call(Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.smali
index 7df6891cf8..ad30579e96 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.smali
@@ -3,7 +3,7 @@
 .source "VoiceChannelJoinabilityUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/voice/VoiceChannelJoinability;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,6 +83,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/utilities/voice/VoiceChannelJoinability;",
             ">;"
         }
@@ -90,9 +93,9 @@
 
     sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->CHANNEL_DOES_NOT_EXIST:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -105,7 +108,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -131,7 +134,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
@@ -139,13 +142,27 @@
 
     invoke-virtual {v3, v4, v5}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
 
+    move-result-object v3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v4
+
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v4
+
+    invoke-static {v4, v5}, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->getVerificationLevelTriggered(J)Lrx/Observable;
+
     move-result-object v2
 
-    new-instance v3, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1;
+    new-instance v4, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1;
 
-    invoke-direct {v3, p1}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
+    invoke-direct {v4, p1}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-static {v0, v1, v2, v3}, Lrx/Observable;->i(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+    invoke-static {v0, v1, v3, v2, v4}, Lrx/Observable;->h(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.smali
index b540418334..a24ad45014 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.smali
@@ -96,8 +96,8 @@
 
 
 # virtual methods
-.method public final getJoinability(Lcom/discord/models/domain/ModelChannel;Ljava/util/Collection;Ljava/lang/Long;Ljava/lang/Integer;)Lcom/discord/utilities/voice/VoiceChannelJoinability;
-    .locals 9
+.method public final getJoinability(Lcom/discord/models/domain/ModelChannel;Ljava/util/Collection;Ljava/lang/Long;Ljava/lang/Integer;I)Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -108,16 +108,18 @@
             ">;",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
-            ")",
+            "I)",
             "Lcom/discord/utilities/voice/VoiceChannelJoinability;"
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_10
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_f
+    const-string v0, "channelVoiceStates"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
@@ -130,227 +132,227 @@
     return-object p1
 
     :cond_0
-    const-wide/32 v0, 0x100000
+    const/4 v0, 0x1
 
-    invoke-static {v0, v1, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    const/4 v1, 0x0
 
-    move-result v0
+    if-lez p5, :cond_1
 
-    if-nez v0, :cond_1
+    const/4 p5, 0x1
 
-    sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->PERMISSIONS_MISSING:Lcom/discord/utilities/voice/VoiceChannelJoinability;
-
-    return-object p1
+    goto :goto_0
 
     :cond_1
-    new-instance v0, Ljava/util/ArrayList;
+    const/4 p5, 0x0
 
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+    :goto_0
+    const-wide/32 v2, 0x100000
+
+    invoke-static {v2, v3, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_10
+
+    if-eqz p5, :cond_2
+
+    goto/16 :goto_9
+
+    :cond_2
+    new-instance p5, Ljava/util/ArrayList;
+
+    invoke-direct {p5}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p2
 
-    :cond_2
-    :goto_0
+    :cond_3
+    :goto_1
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v2
 
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-eqz v1, :cond_5
+    if-eqz v2, :cond_6
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v2
 
-    move-object v4, v1
+    move-object v3, v2
 
-    check-cast v4, Lcom/discord/models/domain/ModelVoice$State;
+    check-cast v3, Lcom/discord/models/domain/ModelVoice$State;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v5
+    move-result-wide v4
 
-    if-nez v4, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v7
-
-    cmp-long v4, v7, v5
-
-    if-nez v4, :cond_4
+    if-nez v3, :cond_4
 
     goto :goto_2
 
     :cond_4
-    :goto_1
-    const/4 v2, 0x0
+    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
-    :goto_2
-    if-eqz v2, :cond_2
+    move-result-wide v6
 
-    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    cmp-long v3, v6, v4
 
-    goto :goto_0
+    if-nez v3, :cond_5
 
-    :cond_5
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result p2
-
-    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    :cond_6
-    const/4 v0, 0x0
+    const/4 v3, 0x1
 
     goto :goto_3
 
-    :cond_7
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_8
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_6
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/models/domain/ModelVoice$State;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_8
-
-    const/4 v0, 0x1
+    :cond_5
+    :goto_2
+    const/4 v3, 0x0
 
     :goto_3
-    const-wide/32 v4, 0x1000000
+    if-eqz v3, :cond_3
 
-    invoke-static {v4, v5, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-interface {p5, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    move-result v1
+    goto :goto_1
+
+    :cond_6
+    invoke-interface {p5}, Ljava/util/List;->size()I
+
+    move-result p2
+
+    invoke-interface {p5}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_8
+
+    :cond_7
+    const/4 p5, 0x0
+
+    goto :goto_4
+
+    :cond_8
+    invoke-interface {p5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p5
+
+    :cond_9
+    invoke-interface {p5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_7
+
+    invoke-interface {p5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelVoice$State;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_9
+
+    const/4 p5, 0x1
+
+    :goto_4
+    const-wide/32 v2, 0x1000000
+
+    invoke-static {v2, v3, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+
+    move-result v2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_9
+    if-eqz v3, :cond_a
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I
 
     move-result p1
 
-    goto :goto_4
+    goto :goto_5
 
-    :cond_9
+    :cond_a
     const p1, 0x7fffffff
 
-    :goto_4
-    if-lt p2, p1, :cond_a
+    :goto_5
+    if-lt p2, p1, :cond_b
 
-    if-nez v1, :cond_a
+    if-nez v2, :cond_b
 
     sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->CHANNEL_FULL:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     return-object p1
 
-    :cond_a
-    const-wide/16 v4, 0x8
+    :cond_b
+    const-wide/16 v3, 0x8
 
-    invoke-static {v4, v5, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v3, v4, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result p1
 
-    if-eqz v0, :cond_b
+    if-eqz p5, :cond_c
 
-    if-eqz p4, :cond_b
+    if-eqz p4, :cond_c
 
     invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
 
     move-result p3
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->compare(II)I
-
-    move-result p3
-
-    if-ltz p3, :cond_b
-
-    goto :goto_5
-
-    :cond_b
-    const/4 v2, 0x0
-
-    :goto_5
-    if-eqz v2, :cond_e
-
-    if-nez p1, :cond_e
-
-    if-nez p4, :cond_c
+    if-lt p2, p3, :cond_c
 
     goto :goto_6
 
     :cond_c
-    invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
+    const/4 v0, 0x0
 
-    move-result p1
+    :goto_6
+    if-eqz v0, :cond_f
 
-    if-ne p2, p1, :cond_d
+    if-nez p1, :cond_f
 
-    if-eqz v1, :cond_d
-
-    sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->CAN_JOIN:Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    if-nez p4, :cond_d
 
     goto :goto_7
 
     :cond_d
-    :goto_6
-    sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->GUILD_VIDEO_AT_CAPACITY:Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I
 
-    :goto_7
-    return-object p1
+    move-result p1
+
+    if-ne p2, p1, :cond_e
+
+    if-eqz v2, :cond_e
+
+    sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->CAN_JOIN:Lcom/discord/utilities/voice/VoiceChannelJoinability;
+
+    goto :goto_8
 
     :cond_e
+    :goto_7
+    sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->GUILD_VIDEO_AT_CAPACITY:Lcom/discord/utilities/voice/VoiceChannelJoinability;
+
+    :goto_8
+    return-object p1
+
+    :cond_f
     sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->CAN_JOIN:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     return-object p1
 
-    :cond_f
-    const-string p1, "channelVoiceStates"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
     :cond_10
-    const-string p1, "channel"
+    :goto_9
+    sget-object p1, Lcom/discord/utilities/voice/VoiceChannelJoinability;->PERMISSIONS_MISSING:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public final observeJoinability(JLcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreVoiceStates;)Lrx/Observable;
@@ -369,15 +371,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channelsStore"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "guildsStore"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "permissionsStore"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "voiceStatesStore"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3, p1, p2}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
 
@@ -397,41 +405,13 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1;-><init>(Lcom/discord/stores/StoreVoiceStates;JLcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreGuilds;)V
 
-    invoke-virtual {p3, v6}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, v6}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "channelsStore\n        .g\u2026  }\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "voiceStatesStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "permissionsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "guildsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channelsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali
index f5d42ec33b..da3e316728 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali
@@ -89,16 +89,20 @@
 
 
 # virtual methods
-.method public final startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZZ)V
+.method public final startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZZJLjava/lang/Long;Z)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "title"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "subtitle"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-virtual {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->getContext()Landroid/content/Context;
@@ -131,10 +135,22 @@
 
     invoke-virtual {v1, p2, p5}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
 
-    const-string p2, "com.discord.utilities.voice.extra.proximity_lock_enabled"
+    const-string p2, "com.discord.utilities.voice.extra.item_streaming"
 
     invoke-virtual {v1, p2, p6}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
 
+    const-string p2, "com.discord.utilities.voice.extra.proximity_lock_enabled"
+
+    invoke-virtual {v1, p2, p10}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
+
+    const-string p2, "com.discord.utilities.voice.extra.channel_id"
+
+    invoke-virtual {v1, p2, p7, p8}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+
+    const-string p2, "com.discord.utilities.voice.extra.guild_id"
+
+    invoke-virtual {v1, p2, p9}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
+
     invoke-virtual {v0, v1}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName;
 
     invoke-virtual {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->getContext()Landroid/content/Context;
@@ -158,33 +174,48 @@
 
     :goto_0
     return-void
+.end method
 
-    :cond_0
-    const-string p1, "subtitle"
+.method public final startStream(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Landroid/content/Intent;)V
+    .locals 2
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v0, "connection"
 
-    throw v0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_1
-    const-string p1, "title"
+    const-string v0, "permissionIntent"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->getContext()Landroid/content/Context;
 
-    :cond_2
-    const-string p1, "connection"
+    move-result-object p1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    new-instance v0, Landroid/content/Intent;
 
-    throw v0
+    const-class v1, Lcom/discord/utilities/voice/VoiceEngineForegroundService;
+
+    invoke-direct {v0, p1, v1}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
+
+    const-string v1, "com.discord.utilities.voice.action.start_stream"
+
+    invoke-virtual {v0, v1}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
+
+    const-string v1, "android.intent.extra.INTENT"
+
+    invoke-virtual {v0, v1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
+
+    invoke-virtual {p1, v0}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName;
+
+    return-void
 .end method
 
 .method public final stopForegroundAndUnbind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-virtual {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->getService()Lcom/discord/utilities/voice/VoiceEngineForegroundService;
@@ -248,13 +279,30 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+.end method
+
+.method public final stopStream(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
+    .locals 2
+
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    new-instance v0, Landroid/content/Intent;
+
+    const-class v1, Lcom/discord/utilities/voice/VoiceEngineForegroundService;
+
+    invoke-direct {v0, p1, v1}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
+
+    const-string v1, "com.discord.utilities.voice.action.stop_stream"
+
+    invoke-virtual {v0, v1}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
+
+    invoke-virtual {p1, v0}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName;
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onDisconnect$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onDisconnect$1.smali
index 08f65079ab..91c7b98f0a 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onDisconnect$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onDisconnect$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion$onDisconnect$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceEngineForegroundService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfDeafen$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfDeafen$1.smali
index 26dd530163..50a3de25c1 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfDeafen$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfDeafen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfDeafen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceEngineForegroundService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfMute$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfMute$1.smali
index e37d6b766c..402316d3ac 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfMute$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfMute$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion$onToggleSelfMute$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceEngineForegroundService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion.smali
index eda41833d4..0bb5b97c31 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Companion.smali
@@ -88,7 +88,7 @@
 .end method
 
 .method public final setOnDisconnect(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -98,24 +98,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->access$setOnDisconnect$cp(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnToggleSelfDeafen(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -125,24 +118,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->access$setOnToggleSelfDeafen$cp(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnToggleSelfMute(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -152,18 +138,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->access$setOnToggleSelfMute$cp(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1.smali
index d1e2776845..2495ff3990 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1.smali
@@ -42,11 +42,13 @@
 .method public onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "className"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "binder"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder;
 
@@ -71,49 +73,30 @@
     invoke-virtual {p1, p2}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->setUnbinding(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "binder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "className"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onServiceDisconnected(Landroid/content/ComponentName;)V
-    .locals 2
+    .locals 1
+
+    const-string v0, "className"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1;->this$0:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->setUnbinding(Z)V
 
     iget-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1;->this$0:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
 
-    const/4 v1, 0x0
-
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->setUnbinding(Z)V
+    invoke-static {p1, v0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->access$setServiceBound$p(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Z)V
 
     iget-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1;->this$0:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
 
-    invoke-static {p1, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->access$setServiceBound$p(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Z)V
-
-    iget-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection$connection$1;->this$0:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+    const/4 v0, 0x0
 
     invoke-static {p1, v0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->access$setService$p(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Lcom/discord/utilities/voice/VoiceEngineForegroundService;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "className"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali
index 36a9088ecf..590d0989fd 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Connection.smali
@@ -28,9 +28,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,15 +45,6 @@
     iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->connection:Landroid/content/ServiceConnection;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getService$p(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)Lcom/discord/utilities/voice/VoiceEngineForegroundService;
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali
index d85a861aa6..24e83742ed 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali
@@ -23,8 +23,12 @@
 
 .field public static final START_FOREGROUND:Ljava/lang/String; = "com.discord.utilities.voice.action.start_foreground"
 
+.field public static final START_STREAM:Ljava/lang/String; = "com.discord.utilities.voice.action.start_stream"
+
 .field public static final STOP_SERVICE:Ljava/lang/String; = "com.discord.utilities.voice.action.stop"
 
+.field public static final STOP_STREAM:Ljava/lang/String; = "com.discord.utilities.voice.action.stop_stream"
+
 .field public static final TOGGLE_DEAFENED:Ljava/lang/String; = "com.discord.utilities.voice.action.toggle_deafened"
 
 .field public static final TOGGLE_MUTED:Ljava/lang/String; = "com.discord.utilities.voice.action.toggle_muted"
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali
index eee7b55670..cdbca26014 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali
@@ -29,8 +29,12 @@
 
 .field public static final START_FOREGROUND:Ljava/lang/String; = "com.discord.utilities.voice.action.start_foreground"
 
+.field public static final START_STREAM:Ljava/lang/String; = "com.discord.utilities.voice.action.start_stream"
+
 .field public static final STOP_SERVICE:Ljava/lang/String; = "com.discord.utilities.voice.action.stop"
 
+.field public static final STOP_STREAM:Ljava/lang/String; = "com.discord.utilities.voice.action.stop_stream"
+
 .field public static final TOGGLE_DEAFENED:Ljava/lang/String; = "com.discord.utilities.voice.action.toggle_deafened"
 
 .field public static final TOGGLE_MUTED:Ljava/lang/String; = "com.discord.utilities.voice.action.toggle_muted"
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA$Companion.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA$Companion.smali
index 7b9bf5214e..ae761ff179 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA$Companion.smali
@@ -17,10 +17,16 @@
 # static fields
 .field public static final synthetic $$INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA$Companion;
 
+.field public static final CHANNEL_ID:Ljava/lang/String; = "com.discord.utilities.voice.extra.channel_id"
+
+.field public static final GUILD_ID:Ljava/lang/String; = "com.discord.utilities.voice.extra.guild_id"
+
 .field public static final ITEM_DEAFENED:Ljava/lang/String; = "com.discord.utilities.voice.extra.item_deafened"
 
 .field public static final ITEM_MUTED:Ljava/lang/String; = "com.discord.utilities.voice.extra.item_muted"
 
+.field public static final ITEM_STREAMING:Ljava/lang/String; = "com.discord.utilities.voice.extra.item_streaming"
+
 .field public static final PROXIMITY_LOCK_ENABLED:Ljava/lang/String; = "com.discord.utilities.voice.extra.proximity_lock_enabled"
 
 .field public static final TITLE:Ljava/lang/String; = "com.discord.utilities.voice.extra.title"
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali
index eb339e863b..f8095ea6fe 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA.smali
@@ -21,12 +21,18 @@
 
 
 # static fields
+.field public static final CHANNEL_ID:Ljava/lang/String; = "com.discord.utilities.voice.extra.channel_id"
+
 .field public static final Companion:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Constants$EXTRA$Companion;
 
+.field public static final GUILD_ID:Ljava/lang/String; = "com.discord.utilities.voice.extra.guild_id"
+
 .field public static final ITEM_DEAFENED:Ljava/lang/String; = "com.discord.utilities.voice.extra.item_deafened"
 
 .field public static final ITEM_MUTED:Ljava/lang/String; = "com.discord.utilities.voice.extra.item_muted"
 
+.field public static final ITEM_STREAMING:Ljava/lang/String; = "com.discord.utilities.voice.extra.item_streaming"
+
 .field public static final PROXIMITY_LOCK_ENABLED:Ljava/lang/String; = "com.discord.utilities.voice.extra.proximity_lock_enabled"
 
 .field public static final TITLE:Ljava/lang/String; = "com.discord.utilities.voice.extra.title"
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali
index b7fc855520..4fb55373f4 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder.smali
@@ -20,24 +20,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/voice/VoiceEngineForegroundService;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "service"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroid/os/Binder;-><init>()V
 
     iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder;->service:Lcom/discord/utilities/voice/VoiceEngineForegroundService;
 
     return-void
-
-    :cond_0
-    const-string p1, "service"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
index fc21200a8e..d6a09d37e0 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
@@ -15,10 +15,11 @@
 
 
 # instance fields
-.field public final actions:Ljava/util/List;
+.field public actions:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
+            "+",
             "Landroidx/core/app/NotificationCompat$Action;",
             ">;"
         }
@@ -36,11 +37,13 @@
 .method public constructor <init>(Landroid/content/Intent;Landroid/content/Context;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "intent"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -74,31 +77,21 @@
 
     invoke-virtual {p1, v2, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
 
+    move-result v2
+
+    const-string v3, "com.discord.utilities.voice.extra.item_streaming"
+
+    invoke-virtual {p1, v3, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+
     move-result p1
 
-    new-instance v2, Landroid/content/Intent;
-
-    const-class v3, Lcom/discord/utilities/voice/VoiceEngineForegroundService;
-
-    invoke-direct {v2, p2, v3}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
-
-    const-string v3, "com.discord.utilities.voice.action.disconnect"
-
-    invoke-virtual {v2, v3}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
-
-    move-result-object v2
-
-    invoke-static {p2, v1, v2, v1}, Landroid/app/PendingIntent;->getService(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
-
-    move-result-object v2
-
     new-instance v3, Landroid/content/Intent;
 
     const-class v4, Lcom/discord/utilities/voice/VoiceEngineForegroundService;
 
     invoke-direct {v3, p2, v4}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
 
-    const-string v4, "com.discord.utilities.voice.action.toggle_deafened"
+    const-string v4, "com.discord.utilities.voice.action.disconnect"
 
     invoke-virtual {v3, v4}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
 
@@ -114,7 +107,7 @@
 
     invoke-direct {v4, p2, v5}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
 
-    const-string v5, "com.discord.utilities.voice.action.toggle_muted"
+    const-string v5, "com.discord.utilities.voice.action.toggle_deafened"
 
     invoke-virtual {v4, v5}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
 
@@ -124,133 +117,185 @@
 
     move-result-object v4
 
-    const/4 v5, 0x3
+    new-instance v5, Landroid/content/Intent;
 
-    new-array v5, v5, [Landroidx/core/app/NotificationCompat$Action;
+    const-class v6, Lcom/discord/utilities/voice/VoiceEngineForegroundService;
 
-    new-instance v6, Landroidx/core/app/NotificationCompat$Action;
+    invoke-direct {v5, p2, v6}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
 
-    const v7, 0x7f080250
+    const-string v6, "com.discord.utilities.voice.action.toggle_muted"
+
+    invoke-virtual {v5, v6}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
+
+    move-result-object v5
+
+    invoke-static {p2, v1, v5, v1}, Landroid/app/PendingIntent;->getService(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
+
+    move-result-object v5
+
+    new-instance v6, Landroid/content/Intent;
+
+    const-class v7, Lcom/discord/utilities/voice/VoiceEngineForegroundService;
+
+    invoke-direct {v6, p2, v7}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
+
+    const-string v7, "com.discord.utilities.voice.action.stop_stream"
+
+    invoke-virtual {v6, v7}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
+
+    move-result-object v6
+
+    invoke-static {p2, v1, v6, v1}, Landroid/app/PendingIntent;->getService(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
+
+    move-result-object v6
+
+    new-instance v7, Landroidx/core/app/NotificationCompat$Action;
 
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v8
 
-    const v9, 0x7f1205a7
+    const v9, 0x7f1205a9
 
     invoke-virtual {v8, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-direct {v6, v7, v8, v2}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
+    const v9, 0x7f080251
 
-    aput-object v6, v5, v1
+    invoke-direct {v7, v9, v8, v3}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
 
-    const/4 v1, 0x1
+    invoke-static {v7}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
 
-    if-eqz v0, :cond_0
+    move-result-object v3
 
-    new-instance v0, Landroidx/core/app/NotificationCompat$Action;
+    iput-object v3, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;->actions:Ljava/util/List;
 
-    const v2, 0x7f080347
-
-    invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v6
-
-    const v7, 0x7f12165f
-
-    invoke-virtual {v6, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-direct {v0, v2, v6, v4}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Landroidx/core/app/NotificationCompat$Action;
-
-    const v2, 0x7f080346
-
-    invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v6
-
-    const v7, 0x7f120f35
-
-    invoke-virtual {v6, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-direct {v0, v2, v6, v4}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
-
-    :goto_0
-    aput-object v0, v5, v1
-
-    const/4 v0, 0x2
-
-    if-eqz p1, :cond_1
+    if-eqz p1, :cond_0
 
     new-instance p1, Landroidx/core/app/NotificationCompat$Action;
 
-    const v1, 0x7f080314
+    const v0, 0x7f08034d
 
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v2, 0x7f121658
+    const v1, 0x7f121512
 
-    invoke-virtual {p2, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+    invoke-virtual {p2, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-direct {p1, v1, p2, v3}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
+    invoke-direct {p1, v0, p2, v6}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
 
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Landroidx/core/app/NotificationCompat$Action;
-
-    const v1, 0x7f080313
-
-    invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p2
-
-    const v2, 0x7f120558
-
-    invoke-virtual {p2, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, v1, p2, v3}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
-
-    :goto_1
-    aput-object p1, v5, v0
-
-    invoke-static {v5}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3, p1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p1
 
     iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;->actions:Ljava/util/List;
 
-    return-void
+    goto :goto_2
+
+    :cond_0
+    const/4 p1, 0x2
+
+    new-array p1, p1, [Landroidx/core/app/NotificationCompat$Action;
+
+    if-eqz v0, :cond_1
+
+    new-instance v0, Landroidx/core/app/NotificationCompat$Action;
+
+    const v6, 0x7f080348
+
+    invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v7
+
+    const v8, 0x7f121689
+
+    invoke-virtual {v7, v8}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-direct {v0, v6, v7, v5}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Landroidx/core/app/NotificationCompat$Action;
+
+    const v6, 0x7f080347
+
+    invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v7
+
+    const v8, 0x7f120f5f
+
+    invoke-virtual {v7, v8}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-direct {v0, v6, v7, v5}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
+
+    :goto_0
+    aput-object v0, p1, v1
+
+    const/4 v0, 0x1
+
+    if-eqz v2, :cond_2
+
+    new-instance v1, Landroidx/core/app/NotificationCompat$Action;
+
+    const v2, 0x7f080315
+
+    invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p2
+
+    const v5, 0x7f121682
+
+    invoke-virtual {p2, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {v1, v2, p2, v4}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
+
+    goto :goto_1
 
     :cond_2
-    const-string p1, "context"
+    new-instance v1, Landroidx/core/app/NotificationCompat$Action;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const v2, 0x7f080314
 
-    throw v0
+    invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    :cond_3
-    const-string p1, "intent"
+    move-result-object p2
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const v5, 0x7f12055a
 
-    throw v0
+    invoke-virtual {p2, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {v1, v2, p2, v4}, Landroidx/core/app/NotificationCompat$Action;-><init>(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
+
+    :goto_1
+    aput-object v1, p1, v0
+
+    invoke-static {p1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-static {v3, p1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;->actions:Ljava/util/List;
+
+    :goto_2
+    return-void
 .end method
 
 
@@ -306,9 +351,27 @@
 
     move-result-object v1
 
-    const v2, 0x7f080365
+    iget-object v2, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;->context:Landroid/content/Context;
 
-    invoke-virtual {v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
+    const v3, 0x7f060045
+
+    invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setColor(I)Landroidx/core/app/NotificationCompat$Builder;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setColorized(Z)Landroidx/core/app/NotificationCompat$Builder;
+
+    move-result-object v1
+
+    const v3, 0x7f080368
+
+    invoke-virtual {v1, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v1
 
@@ -316,9 +379,7 @@
 
     move-result-object v0
 
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$Builder;->setOngoing(Z)Landroidx/core/app/NotificationCompat$Builder;
+    invoke-virtual {v0, v2}, Landroidx/core/app/NotificationCompat$Builder;->setOngoing(Z)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v0
 
@@ -352,7 +413,7 @@
 
     const-string v1, "builder.build()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock$proximityWakeLock$2.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock$proximityWakeLock$2.smali
index 465d094322..a7cfad37c0 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock$proximityWakeLock$2.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock$proximityWakeLock$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock$proximityWakeLock$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceEngineForegroundService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroid/os/PowerManager$WakeLock;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -94,11 +94,11 @@
     throw v0
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type android.os.PowerManager"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali
index 03166648cd..bd82c56879 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$WakeLock.smali
@@ -56,11 +56,13 @@
 .method public constructor <init>(Landroid/app/Application;)V
     .locals 3
 
-    if-eqz p1, :cond_3
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const-string v0, "wifi"
+    const-string/jumbo v0, "wifi"
 
     invoke-virtual {p1, v0}, Landroid/app/Application;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -80,7 +82,7 @@
 
     const-string v1, "(context.getSystemServic\u2026       TAG_WIFI\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock;->wakeLockWifi:Landroid/net/wifi/WifiManager$WifiLock;
 
@@ -104,7 +106,7 @@
 
     const-string v1, "(context.getSystemServic\u2026      TAG_POWER\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock;->wakeLock:Landroid/os/PowerManager$WakeLock;
 
@@ -132,29 +134,20 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.os.PowerManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.net.wifi.WifiManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$wakeLock$2.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$wakeLock$2.smali
index 43f3f23a46..6ed101252c 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$wakeLock$2.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$wakeLock$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/voice/VoiceEngineForegroundService$wakeLock$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceEngineForegroundService.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     const-string v2, "application"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock;-><init>(Landroid/app/Application;)V
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
index 063fc4e24a..f7f15cda10 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali
@@ -2,6 +2,9 @@
 .super Landroid/app/IntentService;
 .source "VoiceEngineForegroundService.kt"
 
+# interfaces
+.implements Lcom/discord/app/AppComponent;
+
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
@@ -66,6 +69,19 @@
 # instance fields
 .field public final binder:Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder;
 
+.field public screenShareManager:Lcom/discord/utilities/voice/ScreenShareManager;
+
+.field public final unsubscribeSignal:Lrx/subjects/Subject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/Subject<",
+            "Ljava/lang/Void;",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public final wakeLock$delegate:Lkotlin/Lazy;
 
 
@@ -101,12 +117,22 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 2
 
     const-string v0, "VoiceEngineForegroundService"
 
     invoke-direct {p0, v0}, Landroid/app/IntentService;-><init>(Ljava/lang/String;)V
 
+    invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
+
+    move-result-object v0
+
+    const-string v1, "PublishSubject.create()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->unsubscribeSignal:Lrx/subjects/Subject;
+
     new-instance v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder;
 
     invoke-direct {v0, p0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder;-><init>(Lcom/discord/utilities/voice/VoiceEngineForegroundService;)V
@@ -196,6 +222,100 @@
     return-object v0
 .end method
 
+.method private final initScreenShareManager(Landroid/content/Intent;)V
+    .locals 11
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->screenShareManager:Lcom/discord/utilities/voice/ScreenShareManager;
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const-string v0, "com.discord.utilities.voice.extra.channel_id"
+
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getSerializableExtra(Ljava/lang/String;)Ljava/io/Serializable;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    const-string v0, "com.discord.utilities.voice.extra.guild_id"
+
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getSerializableExtra(Ljava/lang/String;)Ljava/io/Serializable;
+
+    move-result-object p1
+
+    move-object v5, p1
+
+    check-cast v5, Ljava/lang/Long;
+
+    new-instance p1, Lcom/discord/utilities/voice/ScreenShareManager;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/16 v9, 0x38
+
+    const/4 v10, 0x0
+
+    move-object v1, p1
+
+    move-object v2, p0
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/voice/ScreenShareManager;-><init>(Lcom/discord/app/AppComponent;JLjava/lang/Long;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreStreamRtcConnection;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->screenShareManager:Lcom/discord/utilities/voice/ScreenShareManager;
+
+    :cond_1
+    return-void
+.end method
+
+.method private final onStartStream(Landroid/content/Intent;)V
+    .locals 1
+
+    const-string v0, "android.intent.extra.INTENT"
+
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/content/Intent;
+
+    if-eqz p1, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->screenShareManager:Lcom/discord/utilities/voice/ScreenShareManager;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/voice/ScreenShareManager;->startStream(Landroid/content/Intent;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method private final onStopStream()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->screenShareManager:Lcom/discord/utilities/voice/ScreenShareManager;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/ScreenShareManager;->stopStream()V
+
+    :cond_0
+    return-void
+.end method
+
 .method private final setProximityLock(Z)V
     .locals 0
 
@@ -222,23 +342,33 @@
 
 
 # virtual methods
-.method public onBind(Landroid/content/Intent;)Landroid/os/IBinder;
-    .locals 0
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/subjects/Subject<",
+            "Ljava/lang/Void;",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
 
-    if-eqz p1, :cond_0
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->unsubscribeSignal:Lrx/subjects/Subject;
+
+    return-object v0
+.end method
+
+.method public onBind(Landroid/content/Intent;)Landroid/os/IBinder;
+    .locals 1
+
+    const-string v0, "intent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->binder:Lcom/discord/utilities/voice/VoiceEngineForegroundService$LocalBinder;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "intent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreate()V
@@ -252,9 +382,9 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v0, Lf/a/b/o;->c:Lf/a/b/o;
 
-    invoke-virtual {v0, p0}, Lf/a/b/m;->a(Ljava/lang/Object;)V
+    invoke-virtual {v0, p0}, Lf/a/b/o;->a(Ljava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->getWakeLock()Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock;
 
@@ -276,9 +406,9 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    sget-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sget-object v0, Lf/a/b/o;->c:Lf/a/b/o;
 
-    invoke-virtual {v0, p0}, Lf/a/b/m;->b(Ljava/lang/Object;)V
+    invoke-virtual {v0, p0}, Lf/a/b/o;->b(Ljava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->getWakeLock()Lcom/discord/utilities/voice/VoiceEngineForegroundService$WakeLock;
 
@@ -302,7 +432,7 @@
 
     const-string v1, "intent?.action ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -330,7 +460,7 @@
 
     sparse-switch v1, :sswitch_data_0
 
-    goto :goto_0
+    goto/16 :goto_0
 
     :sswitch_0
     const-string p1, "com.discord.utilities.voice.action.toggle_muted"
@@ -356,6 +486,8 @@
 
     if-eqz v0, :cond_0
 
+    invoke-direct {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->initScreenShareManager(Landroid/content/Intent;)V
+
     const/16 v0, 0x65
 
     new-instance v1, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;
@@ -381,6 +513,19 @@
     goto :goto_0
 
     :sswitch_2
+    const-string v1, "com.discord.utilities.voice.action.start_stream"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-direct {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->onStartStream(Landroid/content/Intent;)V
+
+    goto :goto_0
+
+    :sswitch_3
     const-string p1, "com.discord.utilities.voice.action.disconnect"
 
     invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -399,7 +544,20 @@
 
     goto :goto_0
 
-    :sswitch_3
+    :sswitch_4
+    const-string p1, "com.discord.utilities.voice.action.stop_stream"
+
+    invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-direct {p0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->onStopStream()V
+
+    goto :goto_0
+
+    :sswitch_5
     const-string p1, "com.discord.utilities.voice.action.stop"
 
     invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -414,7 +572,7 @@
 
     goto :goto_0
 
-    :sswitch_4
+    :sswitch_6
     const-string p1, "com.discord.utilities.voice.action.toggle_deafened"
 
     invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -433,10 +591,30 @@
 
     :sswitch_data_0
     .sparse-switch
-        -0x78b14b10 -> :sswitch_4
-        -0x593bf795 -> :sswitch_3
-        -0x29e659bb -> :sswitch_2
+        -0x78b14b10 -> :sswitch_6
+        -0x593bf795 -> :sswitch_5
+        -0x2a79fa2c -> :sswitch_4
+        -0x29e659bb -> :sswitch_3
+        0x9a8bd66 -> :sswitch_2
         0x20467429 -> :sswitch_1
         0x5f84c829 -> :sswitch_0
     .end sparse-switch
 .end method
+
+.method public onUnbind(Landroid/content/Intent;)Z
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->getUnsubscribeSignal()Lrx/subjects/Subject;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    invoke-super {p0, p1}, Landroid/app/IntentService;->onUnbind(Landroid/content/Intent;)Z
+
+    move-result p1
+
+    return p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2.smali
new file mode 100644
index 0000000000..88e17f2cac
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2.smali
@@ -0,0 +1,100 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;
+.super Lk0/o/c/j;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lcom/discord/utilities/voice/VoiceEngineServiceController;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;
+
+    invoke-direct {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke()Lcom/discord/utilities/voice/VoiceEngineServiceController;
+    .locals 5
+
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getAudioDevices()Lcom/discord/stores/StoreAudioDevices;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object v3
+
+    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getRtcConnection()Lcom/discord/stores/StoreRtcConnection;
+
+    move-result-object v4
+
+    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/utilities/voice/VoiceEngineServiceController;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+
+    return-object v0
+.end method
+
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;->invoke()Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$Companion.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$Companion.smali
new file mode 100644
index 0000000000..7413b903fb
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$Companion.smali
@@ -0,0 +1,52 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+.super Ljava/lang/Object;
+.source "VoiceEngineServiceController.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getINSTANCE()Lcom/discord/utilities/voice/VoiceEngineServiceController;
+    .locals 2
+
+    invoke-static {}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getINSTANCE$cp()Lkotlin/Lazy;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/utilities/voice/VoiceEngineServiceController;->Companion:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$NotificationData.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$NotificationData.smali
new file mode 100644
index 0000000000..b37c9f63b3
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$NotificationData.smali
@@ -0,0 +1,832 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+.super Ljava/lang/Object;
+.source "VoiceEngineServiceController.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "NotificationData"
+.end annotation
+
+
+# instance fields
+.field public final channelId:J
+
+.field public final channelName:Ljava/lang/String;
+
+.field public final guildId:Ljava/lang/Long;
+
+.field public final isSelfDeafened:Z
+
+.field public final isSelfMuted:Z
+
+.field public final isSelfStreaming:Z
+
+.field public final isVideo:Z
+
+.field public final proximityLockEnabled:Z
+
+.field public final rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+.field public final stateString:I
+    .annotation build Landroidx/annotation/StringRes;
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZZJLjava/lang/Long;Z)V
+    .locals 1
+
+    const-string v0, "rtcConnectionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    iput-object p2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    iput-boolean p3, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    iput-boolean p4, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    iput-boolean p5, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    iput-boolean p6, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    iput-wide p7, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    iput-object p9, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    iput-boolean p10, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    instance-of p2, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
+
+    if-eqz p2, :cond_0
+
+    const p1, 0x7f1204ab
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->a:Lcom/discord/rtcconnection/RtcConnection$State$b;
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_1
+
+    const p1, 0x7f1204a8
+
+    goto :goto_0
+
+    :cond_1
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->a:Lcom/discord/rtcconnection/RtcConnection$State$a;
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_2
+
+    const p1, 0x7f1204a7
+
+    goto :goto_0
+
+    :cond_2
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->a:Lcom/discord/rtcconnection/RtcConnection$State$c;
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_3
+
+    const p1, 0x7f1204aa
+
+    goto :goto_0
+
+    :cond_3
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_4
+
+    const p1, 0x7f1204af
+
+    goto :goto_0
+
+    :cond_4
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->a:Lcom/discord/rtcconnection/RtcConnection$State$g;
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_5
+
+    const p1, 0x7f1204ae
+
+    goto :goto_0
+
+    :cond_5
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_8
+
+    iget-boolean p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    if-eqz p1, :cond_6
+
+    const p1, 0x7f1204b1
+
+    goto :goto_0
+
+    :cond_6
+    iget-boolean p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    if-eqz p1, :cond_7
+
+    const p1, 0x7f1204b2
+
+    goto :goto_0
+
+    :cond_7
+    const p1, 0x7f1204b3
+
+    goto :goto_0
+
+    :cond_8
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->a:Lcom/discord/rtcconnection/RtcConnection$State$e;
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_9
+
+    const p1, 0x7f1204ad
+
+    :goto_0
+    iput p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->stateString:I
+
+    return-void
+
+    :cond_9
+    new-instance p1, Lkotlin/NoWhenBranchMatchedException;
+
+    invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
+
+    throw p1
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZZJLjava/lang/Long;ZILjava/lang/Object;)Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+    .locals 11
+
+    move-object v0, p0
+
+    move/from16 v1, p11
+
+    and-int/lit8 v2, v1, 0x1
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    goto :goto_0
+
+    :cond_0
+    move-object v2, p1
+
+    :goto_0
+    and-int/lit8 v3, v1, 0x2
+
+    if-eqz v3, :cond_1
+
+    iget-object v3, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    goto :goto_1
+
+    :cond_1
+    move-object v3, p2
+
+    :goto_1
+    and-int/lit8 v4, v1, 0x4
+
+    if-eqz v4, :cond_2
+
+    iget-boolean v4, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    goto :goto_2
+
+    :cond_2
+    move v4, p3
+
+    :goto_2
+    and-int/lit8 v5, v1, 0x8
+
+    if-eqz v5, :cond_3
+
+    iget-boolean v5, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    goto :goto_3
+
+    :cond_3
+    move v5, p4
+
+    :goto_3
+    and-int/lit8 v6, v1, 0x10
+
+    if-eqz v6, :cond_4
+
+    iget-boolean v6, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    goto :goto_4
+
+    :cond_4
+    move/from16 v6, p5
+
+    :goto_4
+    and-int/lit8 v7, v1, 0x20
+
+    if-eqz v7, :cond_5
+
+    iget-boolean v7, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    goto :goto_5
+
+    :cond_5
+    move/from16 v7, p6
+
+    :goto_5
+    and-int/lit8 v8, v1, 0x40
+
+    if-eqz v8, :cond_6
+
+    iget-wide v8, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    goto :goto_6
+
+    :cond_6
+    move-wide/from16 v8, p7
+
+    :goto_6
+    and-int/lit16 v10, v1, 0x80
+
+    if-eqz v10, :cond_7
+
+    iget-object v10, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    goto :goto_7
+
+    :cond_7
+    move-object/from16 v10, p9
+
+    :goto_7
+    and-int/lit16 v1, v1, 0x100
+
+    if-eqz v1, :cond_8
+
+    iget-boolean v1, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    goto :goto_8
+
+    :cond_8
+    move/from16 v1, p10
+
+    :goto_8
+    move-object p1, v2
+
+    move-object p2, v3
+
+    move p3, v4
+
+    move p4, v5
+
+    move/from16 p5, v6
+
+    move/from16 p6, v7
+
+    move-wide/from16 p7, v8
+
+    move-object/from16 p9, v10
+
+    move/from16 p10, v1
+
+    invoke-virtual/range {p0 .. p10}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZZJLjava/lang/Long;Z)Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/rtcconnection/RtcConnection$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    return-object v0
+.end method
+
+.method public final component2()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final component3()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    return v0
+.end method
+
+.method public final component4()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    return v0
+.end method
+
+.method public final component5()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    return v0
+.end method
+
+.method public final component6()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    return v0
+.end method
+
+.method public final component7()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    return-wide v0
+.end method
+
+.method public final component8()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final component9()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    return v0
+.end method
+
+.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZZJLjava/lang/Long;Z)Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+    .locals 12
+
+    const-string v0, "rtcConnectionState"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelName"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    move-object v1, v0
+
+    move v4, p3
+
+    move/from16 v5, p4
+
+    move/from16 v6, p5
+
+    move/from16 v7, p6
+
+    move-wide/from16 v8, p7
+
+    move-object/from16 v10, p9
+
+    move/from16 v11, p10
+
+    invoke-direct/range {v1 .. v11}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZZJLjava/lang/Long;Z)V
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 5
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    iget-object v1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    iget-object v1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    iget-boolean v1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    iget-boolean v1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    iget-boolean v1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    iget-boolean v1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-wide v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    iget-wide v2, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    iget-object v1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    iget-boolean p1, p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    if-ne v0, p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getChannelId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    return-wide v0
+.end method
+
+.method public final getChannelName()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final getGuildId()Ljava/lang/Long;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    return-object v0
+.end method
+
+.method public final getProximityLockEnabled()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    return v0
+.end method
+
+.method public final getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    return-object v0
+.end method
+
+.method public final getStateString()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->stateString:I
+
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 6
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    const/4 v3, 0x1
+
+    if-eqz v2, :cond_2
+
+    const/4 v2, 0x1
+
+    :cond_2
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    if-eqz v2, :cond_3
+
+    const/4 v2, 0x1
+
+    :cond_3
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    if-eqz v2, :cond_4
+
+    const/4 v2, 0x1
+
+    :cond_4
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    if-eqz v2, :cond_5
+
+    const/4 v2, 0x1
+
+    :cond_5
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v4, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    invoke-static {v4, v5}, Ld;->a(J)I
+
+    move-result v2
+
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_6
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    if-eqz v1, :cond_7
+
+    goto :goto_2
+
+    :cond_7
+    move v3, v1
+
+    :goto_2
+    add-int/2addr v0, v3
+
+    return v0
+.end method
+
+.method public final isSelfDeafened()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    return v0
+.end method
+
+.method public final isSelfMuted()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    return v0
+.end method
+
+.method public final isSelfStreaming()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    return v0
+.end method
+
+.method public final isVideo()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "NotificationData(rtcConnectionState="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->rtcConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", channelName="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelName:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isSelfMuted="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isSelfDeafened="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isSelfStreaming="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isVideo="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isVideo:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", channelId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->channelId:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, ", guildId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->guildId:Ljava/lang/Long;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", proximityLockEnabled="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->proximityLockEnabled:Z
+
+    const-string v2, ")"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$1.smali
new file mode 100644
index 0000000000..8f4970fecf
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$1.smali
@@ -0,0 +1,70 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$init$1;
+.super Lk0/o/c/j;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;->init(Landroid/content/Context;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$1;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$1;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-static {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getVoiceChannelSelectedStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clear()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$2.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$2.smali
new file mode 100644
index 0000000000..6ced0b11dc
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$2.smali
@@ -0,0 +1,70 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$init$2;
+.super Lk0/o/c/j;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;->init(Landroid/content/Context;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$2;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$2;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$2;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-static {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getMediaSettingsStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->toggleSelfDeafened()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$3.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$3.smali
new file mode 100644
index 0000000000..eaed10e7d7
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$3.smali
@@ -0,0 +1,91 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;
+.super Lk0/o/c/j;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;->init(Landroid/content/Context;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $context:Landroid/content/Context;
+
+.field public final synthetic this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;Landroid/content/Context;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    iput-object p2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;->$context:Landroid/content/Context;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 5
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-static {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getMediaSettingsStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->toggleSelfMuted()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;->$context:Landroid/content/Context;
+
+    const v1, 0x7f12178f
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/16 v4, 0xc
+
+    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$4.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$4.smali
new file mode 100644
index 0000000000..a6f43ec189
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$init$4.smali
@@ -0,0 +1,184 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;
+.super Lk0/o/c/j;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;->init(Landroid/content/Context;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $context:Landroid/content/Context;
+
+.field public final synthetic this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;Landroid/content/Context;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    iput-object p2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->$context:Landroid/content/Context;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->invoke(Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;)V
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
+
+    move-result-object v1
+
+    instance-of v1, v1, Lcom/discord/rtcconnection/RtcConnection$State$d;
+
+    if-eqz v1, :cond_0
+
+    sget-object v1, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion;
+
+    iget-object v2, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->$context:Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->requestOverlayClose(Landroid/content/Context;)V
+
+    sget-object v1, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;
+
+    iget-object v2, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-static {v2}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getServiceBinding$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->stopForegroundAndUnbind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->$context:Landroid/content/Context;
+
+    const v2, 0x7f12038f
+
+    const/4 v3, 0x1
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->getStateString()I
+
+    move-result v5
+
+    invoke-virtual {v1, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    aput-object v5, v3, v4
+
+    invoke-virtual {v1, v2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v1, "context.getString(R.stri\u2026etString(it.stateString))"
+
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v6, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;
+
+    iget-object v1, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-static {v1}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getServiceBinding$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    move-result-object v7
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->getChannelName()Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfMuted()Z
+
+    move-result v10
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfDeafened()Z
+
+    move-result v11
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->isSelfStreaming()Z
+
+    move-result v12
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->getChannelId()J
+
+    move-result-wide v13
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v15
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->getProximityLockEnabled()Z
+
+    move-result v16
+
+    invoke-virtual/range {v6 .. v16}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZZJLjava/lang/Long;Z)V
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    sget-object v1, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion;
+
+    iget-object v2, v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;->$context:Landroid/content/Context;
+
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchOverlayForVoice(Landroid/content/Context;)V
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.smali
new file mode 100644
index 0000000000..91913df008
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.smali
@@ -0,0 +1,103 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;
+.super Ljava/lang/Object;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func2<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "+",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;
+
+    invoke-direct {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;-><init>()V
+
+    sput-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    check-cast p2, Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;->call(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;)Lkotlin/Pair;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;)Lkotlin/Pair;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelChannel;",
+            "Lcom/discord/rtcconnection/RtcConnection$State;",
+            ")",
+            "Lkotlin/Pair<",
+            "Lcom/discord/models/domain/ModelChannel;",
+            "Lcom/discord/rtcconnection/RtcConnection$State;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Lkotlin/Pair;
+
+    invoke-direct {v0, p1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1.smali
new file mode 100644
index 0000000000..2fd088c674
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1.smali
@@ -0,0 +1,207 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1;
+.super Ljava/lang/Object;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Lrx/functions/Func4;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;->call(Lkotlin/Pair;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        "T3:",
+        "Ljava/lang/Object;",
+        "T4:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func4<",
+        "Ljava/lang/String;",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        "Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1;->$connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+    .locals 15
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz p4, :cond_0
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall()Z
+
+    move-result v3
+
+    if-ne v3, v2, :cond_0
+
+    const/4 v10, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v10, 0x0
+
+    :goto_0
+    instance-of v0, v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;
+
+    if-nez v10, :cond_1
+
+    if-eqz v0, :cond_1
+
+    const/4 v14, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v14, 0x0
+
+    :goto_1
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    move-object v3, p0
+
+    iget-object v5, v3, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1;->$connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+
+    const-string v4, "connectionState"
+
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "channelName"
+
+    move-object/from16 v6, p1
+
+    invoke-static {v6, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
+
+    move-result v7
+
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isDeafened()Z
+
+    move-result v8
+
+    if-eqz p4, :cond_2
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
+
+    move-result v4
+
+    if-ne v4, v2, :cond_2
+
+    const/4 v9, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v9, 0x0
+
+    :goto_2
+    if-eqz p4, :cond_3
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_3
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v1
+
+    goto :goto_3
+
+    :cond_3
+    const-wide/16 v1, -0x1
+
+    :goto_3
+    move-wide v11, v1
+
+    if-eqz p4, :cond_4
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_4
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v1
+
+    goto :goto_4
+
+    :cond_4
+    const/4 v1, 0x0
+
+    :goto_4
+    move-object v13, v1
+
+    move-object v4, v0
+
+    move-object/from16 v6, p1
+
+    invoke-direct/range {v4 .. v14}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZZJLjava/lang/Long;Z)V
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    check-cast p2, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    check-cast p3, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+    check-cast p4, Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1;->call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2.smali
new file mode 100644
index 0000000000..64ee315fd2
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2.smali
@@ -0,0 +1,188 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;
+.super Ljava/lang/Object;
+.source "VoiceEngineServiceController.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/utilities/voice/VoiceEngineServiceController;-><init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "+",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        ">;",
+        "Lrx/Observable<",
+        "+",
+        "Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;",
+        ">;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lkotlin/Pair;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;->call(Lkotlin/Pair;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final call(Lkotlin/Pair;)Lrx/Observable;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/Pair<",
+            "+",
+            "Lcom/discord/models/domain/ModelChannel;",
+            "+",
+            "Lcom/discord/rtcconnection/RtcConnection$State;",
+            ">;)",
+            "Lrx/Observable<",
+            "+",
+            "Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/models/domain/ModelChannel;
+
+    iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getNOTIFICATION_DATA_DISCONNECTED$cp()Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    move-result-object p1
+
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    goto :goto_3
+
+    :cond_0
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const-string v1, ""
+
+    :goto_1
+    new-instance v2, Ls0/l/e/j;
+
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-static {v1}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getMediaSettingsStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfig()Lrx/Observable;
+
+    move-result-object v1
+
+    iget-object v3, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;->this$0:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-static {v3}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->access$getAudioDevicesStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreAudioDevices;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState()Lrx/Observable;
+
+    move-result-object v3
+
+    sget-object v4, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v5
+
+    goto :goto_2
+
+    :cond_3
+    const-wide/16 v5, -0x1
+
+    :goto_2
+    invoke-virtual {v4, v5, v6}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v4, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1;
+
+    invoke-direct {v4, p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2$1;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;)V
+
+    invoke-static {v2, v1, v3, v0, v4}, Lrx/Observable;->h(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
+
+    move-result-object v0
+
+    :goto_3
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController.smali
new file mode 100644
index 0000000000..7ab0fb61d4
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineServiceController.smali
@@ -0,0 +1,365 @@
+.class public final Lcom/discord/utilities/voice/VoiceEngineServiceController;
+.super Ljava/lang/Object;
+.source "VoiceEngineServiceController.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;,
+        Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+.field public static final INSTANCE$delegate:Lkotlin/Lazy;
+
+.field public static final NOTIFICATION_DATA_DISCONNECTED:Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+
+# instance fields
+.field public final audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
+
+.field public final mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
+
+.field public final notificationDataObservable:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+.field public final voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 12
+
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->Companion:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion$INSTANCE$2;
+
+    invoke-static {v0}, Lf/n/a/k/a;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->INSTANCE$delegate:Lkotlin/Lazy;
+
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    new-instance v2, Lcom/discord/rtcconnection/RtcConnection$State$d;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v2, v1}, Lcom/discord/rtcconnection/RtcConnection$State$d;-><init>(Z)V
+
+    const-string v3, ""
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const-wide/16 v8, -0x1
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    move-object v1, v0
+
+    invoke-direct/range {v1 .. v11}, Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;-><init>(Lcom/discord/rtcconnection/RtcConnection$State;Ljava/lang/String;ZZZZJLjava/lang/Long;Z)V
+
+    sput-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->NOTIFICATION_DATA_DISCONNECTED:Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+    .locals 1
+
+    const-string v0, "audioDevicesStore"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaSettingsStore"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "voiceChannelSelectedStore"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcConnectionStore"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
+
+    iput-object p2, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
+
+    iput-object p3, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    invoke-virtual {p3}, Lcom/discord/stores/StoreVoiceChannelSelected;->get()Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p4}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
+
+    move-result-object p2
+
+    sget-object p3, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1;
+
+    invoke-static {p1, p2, p3}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;
+
+    invoke-direct {p2, p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$2;-><init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;)V
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "Observable.combineLatest\u2026            }\n          }"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->notificationDataObservable:Lrx/Observable;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getAudioDevicesStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreAudioDevices;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getINSTANCE$cp()Lkotlin/Lazy;
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->INSTANCE$delegate:Lkotlin/Lazy;
+
+    return-object v0
+.end method
+
+.method public static final synthetic access$getMediaSettingsStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreMediaSettings;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getNOTIFICATION_DATA_DISCONNECTED$cp()Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->NOTIFICATION_DATA_DISCONNECTED:Lcom/discord/utilities/voice/VoiceEngineServiceController$NotificationData;
+
+    return-object v0
+.end method
+
+.method public static final synthetic access$getServiceBinding$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    if-eqz p0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const-string p0, "serviceBinding"
+
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static final synthetic access$getVoiceChannelSelectedStore$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;)Lcom/discord/stores/StoreVoiceChannelSelected;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$setServiceBinding$p(Lcom/discord/utilities/voice/VoiceEngineServiceController;Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final init(Landroid/content/Context;)V
+    .locals 8
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->Companion:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;
+
+    new-instance v1, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$1;-><init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;->setOnDisconnect(Lkotlin/jvm/functions/Function0;)V
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->Companion:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;
+
+    new-instance v1, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$2;-><init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;->setOnToggleSelfDeafen(Lkotlin/jvm/functions/Function0;)V
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->Companion:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;
+
+    new-instance v1, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$3;-><init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;Landroid/content/Context;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Companion;->setOnToggleSelfMute(Lkotlin/jvm/functions/Function0;)V
+
+    new-instance v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    invoke-direct {v0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;-><init>(Landroid/content/Context;)V
+
+    iput-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    iget-object v0, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->notificationDataObservable:Lrx/Observable;
+
+    new-instance v5, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;
+
+    invoke-direct {v5, p0, p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController$init$4;-><init>(Lcom/discord/utilities/voice/VoiceEngineServiceController;Landroid/content/Context;)V
+
+    const-class v3, Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    const/16 p1, 0x3c
+
+    and-int/lit8 v1, p1, 0x4
+
+    and-int/lit8 v1, p1, 0x8
+
+    and-int/lit8 v1, p1, 0x10
+
+    and-int/lit8 p1, p1, 0x20
+
+    const-string p1, "onNext"
+
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "errorClass"
+
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/b/c0;
+
+    const/4 v7, 0x0
+
+    move-object v1, p1
+
+    move-object v2, v7
+
+    move-object v4, v7
+
+    move-object v6, v7
+
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+
+    invoke-virtual {v0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+
+    return-void
+.end method
+
+.method public final startStream(Landroid/content/Intent;)V
+    .locals 2
+
+    const-string v0, "permissionIntent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->startStream(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Landroid/content/Intent;)V
+
+    return-void
+
+    :cond_0
+    const-string p1, "serviceBinding"
+
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public final stopStream()V
+    .locals 2
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;
+
+    iget-object v1, p0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->stopStream(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;)V
+
+    return-void
+
+    :cond_0
+    const-string v0, "serviceBinding"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
index 0cd36c447e..081e0edf2f 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
@@ -60,19 +60,19 @@
 
     if-ne p2, v0, :cond_0
 
-    const p1, 0x7f080251
+    const p1, 0x7f080252
 
     goto :goto_0
 
     :cond_0
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080252
+    const p1, 0x7f080253
 
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f080253
+    const p1, 0x7f080254
 
     :goto_0
     return p1
@@ -81,7 +81,9 @@
 .method public final getConnectedText(Landroid/content/Context;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/utilities/streams/StreamContext;Z)Ljava/lang/String;
     .locals 2
 
-    if-eqz p1, :cond_c
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
@@ -97,7 +99,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const p2, 0x7f1204af
+    const p2, 0x7f1204b0
 
     new-array p4, v1, [Ljava/lang/Object;
 
@@ -129,79 +131,79 @@
 
     const-string p2, "context.getString(\n     \u2026ext.user.username\n      )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
     :cond_1
     sget-object p3, Lcom/discord/rtcconnection/RtcConnection$State$c;->a:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
     if-eqz p3, :cond_2
 
-    const p2, 0x7f1204a9
+    const p2, 0x7f1204aa
 
     goto :goto_2
 
     :cond_2
     sget-object p3, Lcom/discord/rtcconnection/RtcConnection$State$e;->a:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
     if-eqz p3, :cond_3
 
-    const p2, 0x7f1204ac
+    const p2, 0x7f1204ad
 
     goto :goto_2
 
     :cond_3
     sget-object p3, Lcom/discord/rtcconnection/RtcConnection$State$b;->a:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
     if-eqz p3, :cond_4
 
-    const p2, 0x7f1204a7
+    const p2, 0x7f1204a8
 
     goto :goto_2
 
     :cond_4
     sget-object p3, Lcom/discord/rtcconnection/RtcConnection$State$a;->a:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
     if-eqz p3, :cond_5
 
-    const p2, 0x7f1204a6
+    const p2, 0x7f1204a7
 
     goto :goto_2
 
     :cond_5
     sget-object p3, Lcom/discord/rtcconnection/RtcConnection$State$g;->a:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
     if-eqz p3, :cond_6
 
-    const p2, 0x7f1204ad
+    const p2, 0x7f1204ae
 
     goto :goto_2
 
     :cond_6
     sget-object p3, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -209,12 +211,12 @@
 
     if-eqz p4, :cond_7
 
-    const p2, 0x7f1204b0
+    const p2, 0x7f1204b2
 
     goto :goto_2
 
     :cond_7
-    const p2, 0x7f1204b1
+    const p2, 0x7f1204b3
 
     goto :goto_2
 
@@ -228,7 +230,7 @@
     :cond_9
     sget-object p3, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
@@ -240,7 +242,7 @@
     if-nez p2, :cond_b
 
     :goto_1
-    const p2, 0x7f1204aa
+    const p2, 0x7f1204ab
 
     :goto_2
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -249,7 +251,7 @@
 
     const-string p2, "context.getString(resId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -259,15 +261,6 @@
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p1
-
-    :cond_c
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getConnectionStatusColor(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Landroid/content/Context;)I
@@ -275,11 +268,13 @@
     .annotation build Landroidx/annotation/ColorInt;
     .end annotation
 
-    if-eqz p3, :cond_c
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -346,7 +341,7 @@
     :cond_4
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->a:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -357,7 +352,7 @@
     :cond_5
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->a:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -368,7 +363,7 @@
     :cond_6
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->a:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -379,7 +374,7 @@
     :cond_7
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->a:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -395,7 +390,7 @@
     :cond_8
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->a:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -417,7 +412,7 @@
     :cond_a
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -437,15 +432,26 @@
 
     :goto_4
     return p1
+.end method
 
-    :cond_c
-    const-string p1, "context"
+.method public final getIsSoundshareSupported()Z
+    .locals 2
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/4 p1, 0x0
+    const/16 v1, 0x1d
 
-    throw p1
+    if-lt v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
 .end method
 
 .method public final getQualityIndicator(Lcom/discord/rtcconnection/RtcConnection$Quality;)I
@@ -453,7 +459,7 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    const v0, 0x7f080437
+    const v0, 0x7f08043a
 
     if-nez p1, :cond_0
 
@@ -481,17 +487,17 @@
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f080436
+    const v0, 0x7f080439
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f080434
+    const v0, 0x7f080437
 
     goto :goto_0
 
     :cond_3
-    const v0, 0x7f080435
+    const v0, 0x7f080438
 
     :cond_4
     :goto_0
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali
index 74707cefb1..bc745ab614 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$2.smali
@@ -63,7 +63,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/utilities/websocket/WebSocket$2;->this$0:Lcom/discord/utilities/websocket/WebSocket;
 
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali
index cb360bd896..92e5f82a62 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$Error.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Throwable;Lokhttp3/Response;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "throwable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/utilities/websocket/WebSocket$Error;->response:Lokhttp3/Response;
 
     return-void
-
-    :cond_0
-    const-string p1, "throwable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onClosed$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onClosed$1.smali
index e074930eb0..eb23834304 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onClosed$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onClosed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$connect$1$onClosed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onFailure$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onFailure$1.smali
index bfd0d481a7..691a1f2625 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onFailure$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onFailure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$connect$1$onFailure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onOpen$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onOpen$1.smali
index e7b6c1b5cd..f21566868d 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onOpen$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1$onOpen$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$connect$1$onOpen$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali
index b92e7cbe50..3bb80e4e4f 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$connect$1.smali
@@ -60,7 +60,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p3, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p3, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     iget-object v0, p0, Lcom/discord/utilities/websocket/WebSocket$connect$1;->this$0:Lcom/discord/utilities/websocket/WebSocket;
@@ -110,11 +110,13 @@
 .method public onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string p1, "reason"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/websocket/WebSocket$connect$1;->this$0:Lcom/discord/utilities/websocket/WebSocket;
 
@@ -125,30 +127,18 @@
     invoke-static {p1, v0}, Lcom/discord/utilities/websocket/WebSocket;->access$schedule(Lcom/discord/utilities/websocket/WebSocket;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onClosing(Lokhttp3/WebSocket;ILjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string p1, "reason"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/websocket/WebSocket$connect$1;->this$0:Lcom/discord/utilities/websocket/WebSocket;
 
@@ -169,30 +159,18 @@
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "t"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/utilities/websocket/WebSocket$connect$1;->this$0:Lcom/discord/utilities/websocket/WebSocket;
 
@@ -203,61 +181,42 @@
     invoke-static {p1, v0}, Lcom/discord/utilities/websocket/WebSocket;->access$schedule(Lcom/discord/utilities/websocket/WebSocket;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "t"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onInflateError(Ljava/lang/Exception;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "e"
 
-    const/4 v3, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v4, 0x4
+    const-string v3, "Unable to inflate message."
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const-string v2, "Unable to inflate message."
+    const/4 v5, 0x4
 
-    move-object v0, p0
+    const/4 v6, 0x0
 
-    move-object v1, p1
+    move-object v1, p0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/websocket/WebSocket$connect$1;->handleError$default(Lcom/discord/utilities/websocket/WebSocket$connect$1;Ljava/lang/Exception;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/websocket/WebSocket$connect$1;->handleError$default(Lcom/discord/utilities/websocket/WebSocket$connect$1;Ljava/lang/Exception;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onInflatedMessage(Lokhttp3/WebSocket;Ljava/io/InputStreamReader;I)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "reader"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     iget-object p1, p0, Lcom/discord/utilities/websocket/WebSocket$connect$1;->this$0:Lcom/discord/utilities/websocket/WebSocket;
@@ -295,30 +254,18 @@
 
     :goto_0
     return-void
-
-    :cond_0
-    const-string p1, "reader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "response"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/websocket/WebSocket$connect$1;->this$0:Lcom/discord/utilities/websocket/WebSocket;
 
@@ -329,18 +276,4 @@
     invoke-static {v0, v1}, Lcom/discord/utilities/websocket/WebSocket;->access$schedule(Lcom/discord/utilities/websocket/WebSocket;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "response"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onClosed$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onClosed$1.smali
index 29f43b65d9..843ad1a006 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onClosed$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onClosed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$onClosed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Closed;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Closed;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onError$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onError$1.smali
index 0d189fe412..730fb01eb4 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onError$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$onError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Error;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onMessage$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onMessage$1.smali
index 2b50ae24a6..15cf3edcce 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onMessage$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$onMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/io/InputStreamReader;",
         "Ljava/lang/Integer;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,16 +78,9 @@
 .method public final invoke(Ljava/io/InputStreamReader;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onOpened$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onOpened$1.smali
index 5833928b10..20dcf0aa93 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$onOpened$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$onOpened$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$onOpened$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Opened;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Opened;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$1.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$1.smali
index d131a4265c..9724c8d4be 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$1.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$resetListeners$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Opened;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Opened;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$2.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$2.smali
index 79cc1d6261..70116bffc9 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$2.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$resetListeners$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Closed;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Closed;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$3.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$3.smali
index 2fc6e1526f..ea1f6ac7b9 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$3.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$resetListeners$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/io/InputStreamReader;",
         "Ljava/lang/Integer;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,16 +78,9 @@
 .method public final invoke(Ljava/io/InputStreamReader;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$4.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$4.smali
index 97ec159beb..4de253d4f4 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$4.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket$resetListeners$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/utilities/websocket/WebSocket$resetListeners$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WebSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/websocket/WebSocket$Error;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/websocket/WebSocket$Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali b/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
index 6e0a4aefae..743ba2327c 100644
--- a/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/WebSocket.smali
@@ -124,7 +124,7 @@
 .end method
 
 .method public constructor <init>(Lrx/Scheduler;Lkotlin/jvm/functions/Function3;Ljavax/net/ssl/SSLSocketFactory;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -146,7 +146,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "errorLogger"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -189,7 +191,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lr0/p/a;->e()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->e()Lrx/Scheduler;
 
     move-result-object p1
 
@@ -207,15 +209,6 @@
     invoke-virtual {p1, p2, p3}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
 
     return-void
-
-    :cond_1
-    const-string p1, "errorLogger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getClient$p(Lcom/discord/utilities/websocket/WebSocket;)Lokhttp3/WebSocket;
@@ -277,44 +270,44 @@
 .method private final createWebSocket(Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;Lokhttp3/WebSocketListener;)Lokhttp3/WebSocket;
     .locals 3
 
-    new-instance v0, Ln0/x$a;
+    new-instance v0, Lo0/x$a;
 
-    invoke-direct {v0}, Ln0/x$a;-><init>()V
+    invoke-direct {v0}, Lo0/x$a;-><init>()V
 
     if-eqz p2, :cond_0
 
-    sget-object v1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
+    sget-object v1, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
 
-    sget-object v1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
+    sget-object v1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
 
-    invoke-virtual {v1}, Ln0/g0/h/f;->n()Ljavax/net/ssl/X509TrustManager;
+    invoke-virtual {v1}, Lo0/g0/h/f;->n()Ljavax/net/ssl/X509TrustManager;
 
     move-result-object v1
 
-    invoke-virtual {v0, p2, v1}, Ln0/x$a;->b(Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/X509TrustManager;)Ln0/x$a;
+    invoke-virtual {v0, p2, v1}, Lo0/x$a;->b(Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/X509TrustManager;)Lo0/x$a;
 
     :cond_0
     const-wide/16 v1, 0x1
 
     sget-object p2, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
 
-    invoke-virtual {v0, v1, v2, p2}, Ln0/x$a;->a(JLjava/util/concurrent/TimeUnit;)Ln0/x$a;
+    invoke-virtual {v0, v1, v2, p2}, Lo0/x$a;->a(JLjava/util/concurrent/TimeUnit;)Lo0/x$a;
 
-    new-instance p2, Ln0/x;
+    new-instance p2, Lo0/x;
 
-    invoke-direct {p2, v0}, Ln0/x;-><init>(Ln0/x$a;)V
+    invoke-direct {p2, v0}, Lo0/x;-><init>(Lo0/x$a;)V
 
-    new-instance v0, Ln0/a0$a;
+    new-instance v0, Lo0/a0$a;
 
-    invoke-direct {v0}, Ln0/a0$a;-><init>()V
+    invoke-direct {v0}, Lo0/a0$a;-><init>()V
 
-    invoke-virtual {v0, p1}, Ln0/a0$a;->f(Ljava/lang/String;)Ln0/a0$a;
+    invoke-virtual {v0, p1}, Lo0/a0$a;->f(Ljava/lang/String;)Lo0/a0$a;
 
-    invoke-virtual {v0}, Ln0/a0$a;->b()Ln0/a0;
+    invoke-virtual {v0}, Lo0/a0$a;->b()Lo0/a0;
 
     move-result-object p1
 
-    invoke-virtual {p2, p1, p3}, Ln0/x;->d(Ln0/a0;Lokhttp3/WebSocketListener;)Lokhttp3/WebSocket;
+    invoke-virtual {p2, p1, p3}, Lo0/x;->d(Lo0/a0;Lokhttp3/WebSocketListener;)Lokhttp3/WebSocket;
 
     move-result-object p1
 
@@ -416,7 +409,9 @@
 .method public final connect(Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x3e8
 
@@ -445,15 +440,6 @@
     iput-object p1, p0, Lcom/discord/utilities/websocket/WebSocket;->client:Lokhttp3/WebSocket;
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final disconnect()V
@@ -621,24 +607,24 @@
 .end method
 
 .method public final message(Ljava/lang/String;)V
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/utilities/websocket/WebSocket;->client:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/utilities/websocket/WebSocket;->client:Lokhttp3/WebSocket;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    iget-object v2, p0, Lcom/discord/utilities/websocket/WebSocket;->state:Lcom/discord/utilities/websocket/WebSocket$State;
+    iget-object v1, p0, Lcom/discord/utilities/websocket/WebSocket;->state:Lcom/discord/utilities/websocket/WebSocket$State;
 
-    sget-object v3, Lcom/discord/utilities/websocket/WebSocket$State;->CONNECTED:Lcom/discord/utilities/websocket/WebSocket$State;
+    sget-object v2, Lcom/discord/utilities/websocket/WebSocket$State;->CONNECTED:Lcom/discord/utilities/websocket/WebSocket$State;
 
-    if-ne v2, v3, :cond_0
+    if-ne v1, v2, :cond_0
 
     :try_start_0
-    invoke-interface {v1, p1}, Lokhttp3/WebSocket;->a(Ljava/lang/String;)Z
+    invoke-interface {v0, p1}, Lokhttp3/WebSocket;->a(Ljava/lang/String;)Z
     :try_end_0
     .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -647,6 +633,8 @@
     :catch_0
     move-exception p1
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x1
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/websocket/WebSocket;->handleOnFailure(Ljava/lang/Throwable;Lokhttp3/Response;Z)V
@@ -654,13 +642,6 @@
     :cond_0
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final resetListeners()V
@@ -690,7 +671,7 @@
 .end method
 
 .method public final setOnClosed(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -702,24 +683,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/websocket/WebSocket;->onClosed:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnError(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -731,24 +705,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/websocket/WebSocket;->onError:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnMessage(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -762,24 +729,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/websocket/WebSocket;->onMessage:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnOpened(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -791,20 +751,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/utilities/websocket/WebSocket;->onOpened:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setRawMessageHandler(Lcom/discord/utilities/websocket/RawMessageHandler;)V
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali
index d8dc88d192..a45438ff37 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$Listener.smali
@@ -46,59 +46,35 @@
 .method public final onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "text"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "bytes"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/UnsupportedOperationException;
 
     invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "bytes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali
index 6ba86db499..76b09b187f 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream.smali
@@ -60,11 +60,13 @@
 .method public constructor <init>(Lokio/ByteString;Ljava/util/zip/Inflater;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "bytes"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "inflater"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lokio/ByteString;->h()I
 
@@ -85,20 +87,6 @@
     invoke-virtual {v0}, Ljava/util/zip/InflaterOutputStream;->flush()V
 
     return-void
-
-    :cond_0
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "bytes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
index e83239d17c..3ce07e4b08 100644
--- a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
+++ b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "listener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lokhttp3/WebSocketListener;-><init>()V
 
@@ -43,15 +45,6 @@
     iput-object p1, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->inflater:Ljava/util/zip/Inflater;
 
     return-void
-
-    :cond_0
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final resetInflaters()V
@@ -81,11 +74,13 @@
 .method public onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "reason"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->resetInflaters()V
 
@@ -94,30 +89,18 @@
     invoke-virtual {v0, p1, p2, p3}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onClosing(Lokhttp3/WebSocket;ILjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "reason"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->resetInflaters()V
 
@@ -126,30 +109,18 @@
     invoke-virtual {v0, p1, p2, p3}, Lokhttp3/WebSocketListener;->onClosing(Lokhttp3/WebSocket;ILjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "t"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->resetInflaters()V
 
@@ -158,179 +129,104 @@
     invoke-virtual {v0, p1, p2, p3}, Lokhttp3/WebSocketListener;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "t"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->listener:Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
-    .locals 6
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "bytes"
 
-    iget-object v1, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->listener:Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->getRawMessageHandler()Lcom/discord/utilities/websocket/RawMessageHandler;
+    iget-object v0, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->listener:Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->getRawMessageHandler()Lcom/discord/utilities/websocket/RawMessageHandler;
 
-    if-eqz v1, :cond_4
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
 
     :try_start_0
-    new-instance v1, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;
+    new-instance v0, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;
 
     iget-object v2, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->loggingInflater:Ljava/util/zip/Inflater;
 
-    invoke-direct {v1, p2, v2}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;-><init>(Lokio/ByteString;Ljava/util/zip/Inflater;)V
+    invoke-direct {v0, p2, v2}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;-><init>(Lokio/ByteString;Ljava/util/zip/Inflater;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;->toReader()Ljava/io/InputStreamReader;
+    invoke-virtual {v0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;->toReader()Ljava/io/InputStreamReader;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
-    if-eqz v1, :cond_2
-
     :try_start_1
-    new-instance v2, Ljava/io/StringWriter;
-
-    invoke-direct {v2}, Ljava/io/StringWriter;-><init>()V
-
-    const/16 v3, 0x2000
-
-    new-array v3, v3, [C
-
-    invoke-virtual {v1, v3}, Ljava/io/Reader;->read([C)I
-
-    move-result v4
-
-    :goto_0
-    if-ltz v4, :cond_0
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v2, v3, v5, v4}, Ljava/io/Writer;->write([CII)V
-
-    invoke-virtual {v1, v3}, Ljava/io/Reader;->read([C)I
-
-    move-result v4
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v2}, Ljava/io/StringWriter;->toString()Ljava/lang/String;
+    invoke-static {v0}, Lf/n/a/k/a;->readText(Ljava/io/Reader;)Ljava/lang/String;
 
     move-result-object v2
 
-    const-string v3, "buffer.toString()"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     iget-object v3, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->listener:Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
 
     invoke-virtual {v3}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->getRawMessageHandler()Lcom/discord/utilities/websocket/RawMessageHandler;
 
     move-result-object v3
 
-    if-eqz v3, :cond_1
+    invoke-static {v3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-interface {v3, v2}, Lcom/discord/utilities/websocket/RawMessageHandler;->onRawMessage(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-static {v1, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, v1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
-    goto :goto_2
-
-    :cond_1
-    :try_start_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw v0
+    goto :goto_0
 
     :catchall_0
     move-exception v2
 
-    goto :goto_1
-
-    :cond_2
-    :try_start_4
-    const-string v2, "$this$readText"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    throw v0
-
-    :goto_1
-    :try_start_5
+    :try_start_3
     throw v2
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     :catchall_1
     move-exception v3
 
-    :try_start_6
-    invoke-static {v1, v2}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    :try_start_4
+    invoke-static {v0, v2}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
     throw v3
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_2
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     :catchall_2
-    move-exception v1
+    move-exception v0
 
     iget-object v2, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->listener:Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
 
@@ -338,59 +234,52 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_3
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-interface {v2, v1}, Lcom/discord/utilities/websocket/RawMessageHandler;->onRawMessageInflateFailed(Ljava/lang/Throwable;)V
+    invoke-interface {v2, v0}, Lcom/discord/utilities/websocket/RawMessageHandler;->onRawMessageInflateFailed(Ljava/lang/Throwable;)V
 
-    goto :goto_2
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    :goto_2
-    :try_start_7
-    new-instance v1, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;
+    :cond_0
+    :goto_0
+    :try_start_5
+    new-instance v0, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;
 
     iget-object v2, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->inflater:Ljava/util/zip/Inflater;
 
-    invoke-direct {v1, p2, v2}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;-><init>(Lokio/ByteString;Ljava/util/zip/Inflater;)V
+    invoke-direct {v0, p2, v2}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;-><init>(Lokio/ByteString;Ljava/util/zip/Inflater;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;->toReader()Ljava/io/InputStreamReader;
+    invoke-virtual {v0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$ZLibByteStream;->toReader()Ljava/io/InputStreamReader;
 
-    move-result-object v1
-    :try_end_7
-    .catch Ljava/lang/Exception; {:try_start_7 .. :try_end_7} :catch_0
+    move-result-object v0
+    :try_end_5
+    .catch Ljava/lang/Exception; {:try_start_5 .. :try_end_5} :catch_0
 
-    :try_start_8
+    :try_start_6
     iget-object v2, p0, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->listener:Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;
 
     invoke-virtual {p2}, Lokio/ByteString;->h()I
 
     move-result p2
 
-    invoke-virtual {v2, p1, v1, p2}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->onInflatedMessage(Lokhttp3/WebSocket;Ljava/io/InputStreamReader;I)V
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_3
+    invoke-virtual {v2, p1, v0, p2}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->onInflatedMessage(Lokhttp3/WebSocket;Ljava/io/InputStreamReader;I)V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_3
 
-    invoke-static {v1, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, v1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
     return-void
 
     :catchall_3
     move-exception p1
 
-    :try_start_9
+    :try_start_7
     throw p1
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_4
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_4
 
     :catchall_4
     move-exception p2
 
-    invoke-static {v1, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {v0, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
     throw p2
 
@@ -402,30 +291,18 @@
     invoke-virtual {p2, p1}, Lcom/discord/utilities/websocket/ZLibWebSocketListener$Listener;->onInflateError(Ljava/lang/Exception;)V
 
     return-void
-
-    :cond_5
-    const-string p1, "bytes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "response"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/utilities/websocket/ZLibWebSocketListener;->resetInflaters()V
 
@@ -434,18 +311,4 @@
     invoke-virtual {v0, p1, p2}, Lokhttp3/WebSocketListener;->onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "response"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/utils/R$b.smali b/com.discord/smali/com/discord/utils/R$b.smali
index e00461d207..37e5d010b1 100644
--- a/com.discord/smali/com/discord/utils/R$b.smali
+++ b/com.discord/smali/com/discord/utils/R$b.smali
@@ -262,85 +262,85 @@
 
 .field public static final drawable_chip_delete:I = 0x7f080128
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801f4
+.field public static final googleg_disabled_color_18:I = 0x7f0801f5
 
-.field public static final googleg_standard_color_18:I = 0x7f0801f5
+.field public static final googleg_standard_color_18:I = 0x7f0801f6
 
-.field public static final ic_arrow_down_24dp:I = 0x7f08021d
+.field public static final ic_arrow_down_24dp:I = 0x7f08021e
 
-.field public static final ic_mtrl_checked_circle:I = 0x7f08034f
+.field public static final ic_mtrl_checked_circle:I = 0x7f080352
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080350
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080353
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080351
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080354
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080352
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080355
 
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804e9
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ec
 
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804ea
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804ed
 
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804eb
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804ee
 
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ec
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ef
 
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804ed
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f0
 
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804ee
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f1
 
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f2
 
-.field public static final mtrl_dialog_background:I = 0x7f0804f0
+.field public static final mtrl_dialog_background:I = 0x7f0804f3
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f1
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f4
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f2
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f5
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f3
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f6
 
-.field public static final mtrl_ic_cancel:I = 0x7f0804f4
+.field public static final mtrl_ic_cancel:I = 0x7f0804f7
 
-.field public static final mtrl_ic_error:I = 0x7f0804f5
+.field public static final mtrl_ic_error:I = 0x7f0804f8
 
-.field public static final mtrl_popupmenu_background:I = 0x7f0804f6
+.field public static final mtrl_popupmenu_background:I = 0x7f0804f9
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f7
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fa
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f8
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fb
 
-.field public static final navigation_empty_icon:I = 0x7f0804f9
+.field public static final navigation_empty_icon:I = 0x7f0804fc
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final preference_list_divider_material:I = 0x7f080506
+.field public static final preference_list_divider_material:I = 0x7f080509
 
-.field public static final test_custom_background:I = 0x7f080518
+.field public static final test_custom_background:I = 0x7f08051c
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utils/R$c.smali b/com.discord/smali/com/discord/utils/R$c.smali
index d318f56b3d..0c964e7215 100644
--- a/com.discord/smali/com/discord/utils/R$c.smali
+++ b/com.discord/smali/com/discord/utils/R$c.smali
@@ -150,471 +150,471 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final cancel_action:I = 0x7f0a013c
+.field public static final cancel_action:I = 0x7f0a013f
 
-.field public static final cancel_button:I = 0x7f0a013d
+.field public static final cancel_button:I = 0x7f0a0140
 
-.field public static final center:I = 0x7f0a0141
+.field public static final center:I = 0x7f0a0144
 
-.field public static final centerCrop:I = 0x7f0a0142
+.field public static final centerCrop:I = 0x7f0a0145
 
-.field public static final centerInside:I = 0x7f0a0143
+.field public static final centerInside:I = 0x7f0a0146
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0266
 
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0267
 
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0268
 
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0269
 
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a026a
 
-.field public static final chip_image:I = 0x7f0a0268
+.field public static final chip_image:I = 0x7f0a026b
 
-.field public static final chip_text:I = 0x7f0a0269
+.field public static final chip_text:I = 0x7f0a026c
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026f
 
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a0270
 
-.field public static final column:I = 0x7f0a0276
+.field public static final column:I = 0x7f0a0279
 
-.field public static final column_reverse:I = 0x7f0a0277
+.field public static final column_reverse:I = 0x7f0a027a
 
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027b
 
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028c
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0292
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02ba
 
-.field public static final dark:I = 0x7f0a02b8
+.field public static final dark:I = 0x7f0a02bb
 
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bd
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c6
 
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c7
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c8
 
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c9
 
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02ca
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02ff
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a0352
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a038d
 
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a4
 
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a7
 
-.field public static final fitBottomStart:I = 0x7f0a03a5
+.field public static final fitBottomStart:I = 0x7f0a03ab
 
-.field public static final fitCenter:I = 0x7f0a03a6
+.field public static final fitCenter:I = 0x7f0a03ac
 
-.field public static final fitEnd:I = 0x7f0a03a7
+.field public static final fitEnd:I = 0x7f0a03ad
 
-.field public static final fitStart:I = 0x7f0a03a8
+.field public static final fitStart:I = 0x7f0a03ae
 
-.field public static final fitXY:I = 0x7f0a03aa
+.field public static final fitXY:I = 0x7f0a03b0
 
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03b1
 
-.field public static final flex_end:I = 0x7f0a03ae
+.field public static final flex_end:I = 0x7f0a03b4
 
-.field public static final flex_start:I = 0x7f0a03bf
+.field public static final flex_start:I = 0x7f0a03c5
 
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c6
 
-.field public static final focusCrop:I = 0x7f0a03c2
+.field public static final focusCrop:I = 0x7f0a03c8
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e9
 
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03ea
 
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0416
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04db
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final icon_only:I = 0x7f0a04d7
+.field public static final icon_only:I = 0x7f0a04dd
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ee
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a057d
 
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057f
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final light:I = 0x7f0a0585
+.field public static final light:I = 0x7f0a058b
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058e
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a05a1
 
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a7
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final mini:I = 0x7f0a05df
+.field public static final mini:I = 0x7f0a05e5
 
-.field public static final month_grid:I = 0x7f0a05e1
+.field public static final month_grid:I = 0x7f0a05e7
 
-.field public static final month_navigation_bar:I = 0x7f0a05e2
+.field public static final month_navigation_bar:I = 0x7f0a05e8
 
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e3
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e9
 
-.field public static final month_navigation_next:I = 0x7f0a05e4
+.field public static final month_navigation_next:I = 0x7f0a05ea
 
-.field public static final month_navigation_previous:I = 0x7f0a05e5
+.field public static final month_navigation_previous:I = 0x7f0a05eb
 
-.field public static final month_title:I = 0x7f0a05e6
+.field public static final month_title:I = 0x7f0a05ec
 
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e7
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05ed
 
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e8
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ee
 
-.field public static final mtrl_calendar_frame:I = 0x7f0a05e9
+.field public static final mtrl_calendar_frame:I = 0x7f0a05ef
 
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ea
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05f0
 
-.field public static final mtrl_calendar_months:I = 0x7f0a05eb
+.field public static final mtrl_calendar_months:I = 0x7f0a05f1
 
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ec
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f2
 
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f3
 
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05ee
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f4
 
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05ef
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f5
 
-.field public static final mtrl_child_content_container:I = 0x7f0a05f0
+.field public static final mtrl_child_content_container:I = 0x7f0a05f6
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f1
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f7
 
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f2
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f8
 
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f3
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f9
 
-.field public static final mtrl_picker_header:I = 0x7f0a05f4
+.field public static final mtrl_picker_header:I = 0x7f0a05fa
 
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f5
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05fb
 
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f6
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fc
 
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f7
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fd
 
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f8
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fe
 
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f9
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05ff
 
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fa
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a0600
 
-.field public static final mtrl_picker_title_text:I = 0x7f0a05fb
+.field public static final mtrl_picker_title_text:I = 0x7f0a0601
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final navigation_header_container:I = 0x7f0a060e
+.field public static final navigation_header_container:I = 0x7f0a0614
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final nowrap:I = 0x7f0a0634
+.field public static final nowrap:I = 0x7f0a063a
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final outgoing:I = 0x7f0a066a
+.field public static final outgoing:I = 0x7f0a0670
 
-.field public static final outline:I = 0x7f0a066b
+.field public static final outline:I = 0x7f0a0671
 
-.field public static final parallax:I = 0x7f0a067b
+.field public static final parallax:I = 0x7f0a0681
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final parent_matrix:I = 0x7f0a067e
+.field public static final parent_matrix:I = 0x7f0a0684
 
-.field public static final password_toggle:I = 0x7f0a068c
+.field public static final password_toggle:I = 0x7f0a0692
 
-.field public static final pin:I = 0x7f0a06b9
+.field public static final pin:I = 0x7f0a06bf
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final recycler_view:I = 0x7f0a073f
+.field public static final recycler_view:I = 0x7f0a0745
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final rounded:I = 0x7f0a0786
+.field public static final rounded:I = 0x7f0a078c
 
-.field public static final row:I = 0x7f0a0787
+.field public static final row:I = 0x7f0a078d
 
-.field public static final row_index_key:I = 0x7f0a0788
+.field public static final row_index_key:I = 0x7f0a078e
 
-.field public static final row_reverse:I = 0x7f0a0789
+.field public static final row_reverse:I = 0x7f0a078f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a078a
+.field public static final save_non_transition_alpha:I = 0x7f0a0790
 
-.field public static final save_overlay_view:I = 0x7f0a078b
+.field public static final save_overlay_view:I = 0x7f0a0791
 
-.field public static final scale:I = 0x7f0a078c
+.field public static final scale:I = 0x7f0a0792
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final scrollable:I = 0x7f0a0796
+.field public static final scrollable:I = 0x7f0a079c
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final seekbar:I = 0x7f0a07af
+.field public static final seekbar:I = 0x7f0a07b5
 
-.field public static final seekbar_value:I = 0x7f0a07b0
+.field public static final seekbar_value:I = 0x7f0a07b6
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final selected:I = 0x7f0a07b2
+.field public static final selected:I = 0x7f0a07b8
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final slide:I = 0x7f0a0916
+.field public static final slide:I = 0x7f0a091a
 
-.field public static final smallLabel:I = 0x7f0a0917
+.field public static final smallLabel:I = 0x7f0a091b
 
-.field public static final snackbar_action:I = 0x7f0a0918
+.field public static final snackbar_action:I = 0x7f0a091c
 
-.field public static final snackbar_text:I = 0x7f0a0919
+.field public static final snackbar_text:I = 0x7f0a091d
 
-.field public static final space_around:I = 0x7f0a091d
+.field public static final space_around:I = 0x7f0a0921
 
-.field public static final space_between:I = 0x7f0a091e
+.field public static final space_between:I = 0x7f0a0922
 
-.field public static final space_evenly:I = 0x7f0a091f
+.field public static final space_evenly:I = 0x7f0a0923
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final spinner:I = 0x7f0a0923
+.field public static final spinner:I = 0x7f0a0927
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final standard:I = 0x7f0a092c
+.field public static final standard:I = 0x7f0a0930
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0933
+.field public static final status_bar_latest_event_content:I = 0x7f0a0937
 
-.field public static final stretch:I = 0x7f0a0948
+.field public static final stretch:I = 0x7f0a094c
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final switchWidget:I = 0x7f0a0958
+.field public static final switchWidget:I = 0x7f0a095c
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0976
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a097a
 
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a097b
 
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0978
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a097c
 
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097d
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final text_input_end_icon:I = 0x7f0a0981
+.field public static final text_input_end_icon:I = 0x7f0a0985
 
-.field public static final text_input_start_icon:I = 0x7f0a0982
+.field public static final text_input_start_icon:I = 0x7f0a0986
 
-.field public static final textinput_counter:I = 0x7f0a0985
+.field public static final textinput_counter:I = 0x7f0a0989
 
-.field public static final textinput_error:I = 0x7f0a0986
+.field public static final textinput_error:I = 0x7f0a098a
 
-.field public static final textinput_helper_text:I = 0x7f0a0987
+.field public static final textinput_helper_text:I = 0x7f0a098b
 
-.field public static final textinput_placeholder:I = 0x7f0a0988
+.field public static final textinput_placeholder:I = 0x7f0a098c
 
-.field public static final textinput_prefix_text:I = 0x7f0a0989
+.field public static final textinput_prefix_text:I = 0x7f0a098d
 
-.field public static final textinput_suffix_text:I = 0x7f0a098a
+.field public static final textinput_suffix_text:I = 0x7f0a098e
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final touch_outside:I = 0x7f0a099c
+.field public static final touch_outside:I = 0x7f0a09a0
 
-.field public static final transition_current_scene:I = 0x7f0a099d
+.field public static final transition_current_scene:I = 0x7f0a09a1
 
-.field public static final transition_layout_save:I = 0x7f0a099e
+.field public static final transition_layout_save:I = 0x7f0a09a2
 
-.field public static final transition_position:I = 0x7f0a099f
+.field public static final transition_position:I = 0x7f0a09a3
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a0
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a4
 
-.field public static final transition_transform:I = 0x7f0a09a1
+.field public static final transition_transform:I = 0x7f0a09a5
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final unlabeled:I = 0x7f0a09b4
+.field public static final unlabeled:I = 0x7f0a09b8
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final view_offset_helper:I = 0x7f0a0a38
+.field public static final view_offset_helper:I = 0x7f0a0a3c
 
-.field public static final visible:I = 0x7f0a0a4c
+.field public static final visible:I = 0x7f0a0a50
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
-.field public static final wide:I = 0x7f0a0a7f
+.field public static final wide:I = 0x7f0a0a84
 
-.field public static final withinBounds:I = 0x7f0a0ab6
+.field public static final withinBounds:I = 0x7f0a0abb
 
-.field public static final wrap:I = 0x7f0a0ab7
+.field public static final wrap:I = 0x7f0a0abc
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
-.field public static final wrap_reverse:I = 0x7f0a0ab9
+.field public static final wrap_reverse:I = 0x7f0a0abe
 
-.field public static final zero_corner_chip:I = 0x7f0a0abe
+.field public static final zero_corner_chip:I = 0x7f0a0ac3
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/utils/R$e.smali b/com.discord/smali/com/discord/utils/R$e.smali
index cb29dcf9e4..a48e00ce4a 100644
--- a/com.discord/smali/com/discord/utils/R$e.smali
+++ b/com.discord/smali/com/discord/utils/R$e.smali
@@ -2771,7 +2771,7 @@
 
     new-array v13, v1, [I
 
-    const v14, 0x7f04058b
+    const v14, 0x7f04057d
 
     aput v14, v13, v4
 
@@ -3053,7 +3053,7 @@
 
     new-array v0, v1, [I
 
-    const v8, 0x7f0404af
+    const v8, 0x7f0404a1
 
     aput v8, v0, v4
 
@@ -3107,7 +3107,7 @@
 
     new-array v8, v1, [I
 
-    const v9, 0x7f040598
+    const v9, 0x7f04058a
 
     aput v9, v8, v4
 
@@ -3241,7 +3241,7 @@
 
     new-array v2, v1, [I
 
-    const v3, 0x7f04058a
+    const v3, 0x7f04057c
 
     aput v3, v2, v4
 
@@ -3281,7 +3281,7 @@
 
     new-array v0, v1, [I
 
-    const v2, 0x7f040512
+    const v2, 0x7f040504
 
     aput v2, v0, v4
 
@@ -3372,10 +3372,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -3384,8 +3384,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -3402,8 +3402,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -3439,15 +3439,15 @@
         0x7f04021a
         0x7f040380
         0x7f040381
-        0x7f0404b6
+        0x7f0404a8
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f0404b0
-        0x7f0404b1
-        0x7f0404b3
-        0x7f0404b4
+        0x7f0404a2
+        0x7f0404a3
+        0x7f0404a5
+        0x7f0404a6
     .end array-data
 
     :array_9
@@ -3459,17 +3459,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_c
@@ -3504,8 +3504,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_e
@@ -3603,44 +3603,44 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_f
     .array-data 4
         0x101030e
-        0x7f04047e
+        0x7f040470
     .end array-data
 
     :array_10
@@ -3651,7 +3651,7 @@
         0x7f040271
         0x7f0403bc
         0x7f0403d1
-        0x7f04059b
+        0x7f04058d
     .end array-data
 
     :array_11
@@ -3698,8 +3698,8 @@
         0x7f04006b
         0x7f04006c
         0x7f040251
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_14
@@ -3725,8 +3725,8 @@
         0x10101f0
         0x10101f1
         0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
+        0x7f0404bc
+        0x7f0404bd
     .end array-data
 
     :array_16
@@ -3767,11 +3767,11 @@
         0x7f0402d6
         0x7f0402db
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040511
-        0x7f040515
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f040503
+        0x7f040507
     .end array-data
 
     :array_17
@@ -3780,9 +3780,9 @@
         0x7f040100
         0x7f040101
         0x7f040102
-        0x7f040480
-        0x7f04049a
-        0x7f04049c
+        0x7f040472
+        0x7f04048c
+        0x7f04048e
     .end array-data
 
     :array_18
@@ -3823,12 +3823,12 @@
         0x7f040220
         0x7f040221
         0x7f0403c0
-        0x7f040468
-        0x7f04046a
-        0x7f0404b7
-        0x7f040553
-        0x7f040554
-        0x7f040560
+        0x7f04045a
+        0x7f04045c
+        0x7f0404a9
+        0x7f040545
+        0x7f040546
+        0x7f040552
     .end array-data
 
     :array_1a
@@ -3855,7 +3855,7 @@
     :array_1d
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_1e
@@ -3893,8 +3893,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_21
@@ -3902,8 +3902,8 @@
         0x7f040201
         0x7f040222
         0x7f040266
-        0x7f040490
-        0x7f040497
+        0x7f040482
+        0x7f040489
     .end array-data
 
     :array_22
@@ -3923,9 +3923,9 @@
         0x7f040241
         0x7f040323
         0x7f0403bf
-        0x7f04048c
-        0x7f04048d
-        0x7f04048e
+        0x7f04047e
+        0x7f04047f
+        0x7f040480
     .end array-data
 
     :array_24
@@ -3957,10 +3957,10 @@
         0x7f0403be
         0x7f040407
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040589
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f04057b
     .end array-data
 
     :array_26
@@ -3992,7 +3992,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_29
@@ -4045,7 +4045,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_2d
@@ -4087,7 +4087,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_31
@@ -4110,7 +4110,7 @@
         0x10101f8
         0x7f040210
         0x7f040211
-        0x7f04058b
+        0x7f04057d
     .end array-data
 
     :array_34
@@ -4156,17 +4156,17 @@
         0x7f0402dc
         0x7f0402dd
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_38
     .array-data 4
         0x7f0400ee
-        0x7f040480
-        0x7f04049c
+        0x7f040472
+        0x7f04048e
     .end array-data
 
     :array_39
@@ -4177,9 +4177,9 @@
         0x7f0401ca
         0x7f0401cb
         0x7f04043c
-        0x7f0405ab
-        0x7f0405ac
-        0x7f0405ad
+        0x7f04059d
+        0x7f04059e
+        0x7f04059f
     .end array-data
 
     :array_3a
@@ -4203,29 +4203,29 @@
         0x7f0400f0
         0x7f0400f2
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404b2
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404a4
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_3c
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_3d
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_3e
     .array-data 4
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_3f
@@ -4274,8 +4274,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_43
@@ -4288,7 +4288,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_44
@@ -4363,12 +4363,12 @@
         0x7f04032d
         0x7f0403d3
         0x7f0403eb
-        0x7f04047d
-        0x7f040489
-        0x7f04049b
-        0x7f0404c9
-        0x7f040553
-        0x7f0405a0
+        0x7f04046f
+        0x7f04047b
+        0x7f04048d
+        0x7f0404bb
+        0x7f040545
+        0x7f040592
     .end array-data
 
     :array_48
@@ -4417,9 +4417,9 @@
         0x7f0403ff
         0x7f040400
         0x7f040401
-        0x7f04047b
-        0x7f0404d4
-        0x7f0404d5
+        0x7f04046d
+        0x7f0404c6
+        0x7f0404c7
     .end array-data
 
     :array_4d
@@ -4434,7 +4434,7 @@
         0x7f040302
         0x7f040307
         0x7f040384
-        0x7f04056b
+        0x7f04055d
     .end array-data
 
     :array_4e
@@ -4455,24 +4455,24 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_50
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_51
     .array-data 4
         0x7f040083
         0x7f040085
-        0x7f040567
-        0x7f040568
+        0x7f040559
+        0x7f04055a
     .end array-data
 
     :array_52
@@ -4489,11 +4489,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_53
@@ -4502,9 +4502,9 @@
         0x1010136
         0x7f04002a
         0x7f0403c6
-        0x7f04047a
-        0x7f040491
-        0x7f040588
+        0x7f04046c
+        0x7f040483
+        0x7f04057a
     .end array-data
 
     :array_54
@@ -4523,17 +4523,17 @@
 
     :array_55
     .array-data 4
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_56
     .array-data 4
         0x7f04009e
         0x7f040157
-        0x7f040467
+        0x7f040459
     .end array-data
 
     :array_57
@@ -4568,7 +4568,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_58
@@ -4581,23 +4581,23 @@
         0x7f04025f
         0x7f040327
         0x7f040328
-        0x7f040544
-        0x7f040545
-        0x7f040546
-        0x7f04054a
-        0x7f04054b
-        0x7f04054c
-        0x7f04056b
-        0x7f04056c
-        0x7f04056d
-        0x7f04056e
+        0x7f040536
+        0x7f040537
+        0x7f040538
+        0x7f04053c
+        0x7f04053d
+        0x7f04053e
+        0x7f04055d
+        0x7f04055e
+        0x7f04055f
+        0x7f040560
     .end array-data
 
     :array_59
     .array-data 4
-        0x7f04049e
-        0x7f04049f
-        0x7f0404a0
+        0x7f040490
+        0x7f040491
+        0x7f040492
     .end array-data
 
     :array_5a
@@ -4636,17 +4636,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_5e
@@ -4657,10 +4657,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_5f
@@ -4671,10 +4671,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_60
@@ -4686,6 +4686,20 @@
 
     :array_61
     .array-data 4
+        0x7f0404cc
+        0x7f0404cd
+        0x7f0404ce
+        0x7f0404cf
+        0x7f0404d0
+        0x7f0404d1
+        0x7f0404d2
+        0x7f0404d3
+        0x7f0404d4
+        0x7f0404d5
+        0x7f0404d6
+        0x7f0404d7
+        0x7f0404d8
+        0x7f0404d9
         0x7f0404da
         0x7f0404db
         0x7f0404dc
@@ -4694,23 +4708,9 @@
         0x7f0404df
         0x7f0404e0
         0x7f0404e1
-        0x7f0404e2
         0x7f0404e3
         0x7f0404e4
         0x7f0404e5
-        0x7f0404e6
-        0x7f0404e7
-        0x7f0404e8
-        0x7f0404e9
-        0x7f0404ea
-        0x7f0404eb
-        0x7f0404ec
-        0x7f0404ed
-        0x7f0404ee
-        0x7f0404ef
-        0x7f0404f1
-        0x7f0404f2
-        0x7f0404f3
     .end array-data
 
     :array_62
@@ -4729,8 +4729,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_63
@@ -4787,16 +4787,16 @@
         0x7f040402
         0x7f040403
         0x7f040404
-        0x7f040484
-        0x7f040487
-        0x7f0404aa
-        0x7f0404ab
-        0x7f0404ac
-        0x7f0404ad
-        0x7f0404ae
-        0x7f0404c5
-        0x7f0404c6
-        0x7f0404c7
+        0x7f040476
+        0x7f040479
+        0x7f04049c
+        0x7f04049d
+        0x7f04049e
+        0x7f04049f
+        0x7f0404a0
+        0x7f0404b7
+        0x7f0404b8
+        0x7f0404b9
     .end array-data
 
     :array_64
@@ -4826,18 +4826,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_66
@@ -4857,7 +4857,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_68
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
index db64b5c391..78434495a5 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
@@ -62,13 +62,13 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f0804c7
+    const v4, 0x7f0804ca
 
-    const v5, 0x7f0804c5
+    const v5, 0x7f0804c8
 
-    const v6, 0x7f0804c8
+    const v6, 0x7f0804cb
 
-    const v7, 0x7f0804c6
+    const v7, 0x7f0804c9
 
     const v8, 0x7f0800b0
 
@@ -92,13 +92,13 @@
 
     const/4 v14, 0x1
 
-    const v15, 0x7f0804cf
+    const v15, 0x7f0804d2
 
-    const v16, 0x7f0804cd
+    const v16, 0x7f0804d0
 
-    const v17, 0x7f0804d0
+    const v17, 0x7f0804d3
 
-    const v18, 0x7f0804ce
+    const v18, 0x7f0804d1
 
     const v19, 0x7f0800b4
 
@@ -122,13 +122,13 @@
 
     const/4 v5, 0x2
 
-    const v6, 0x7f0804cb
+    const v6, 0x7f0804ce
 
-    const v7, 0x7f0804c9
+    const v7, 0x7f0804cc
 
-    const v8, 0x7f0804cc
+    const v8, 0x7f0804cf
 
-    const v9, 0x7f0804ca
+    const v9, 0x7f0804cd
 
     const v10, 0x7f0800b1
 
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
index 8adfec42bf..08209b5141 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
@@ -29,11 +29,13 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
+    .locals 2
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    const-string v1, "context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, v0}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -49,7 +51,7 @@
 
     const-string p2, "findViewById(R.id.active_subscription_header_text)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -63,7 +65,7 @@
 
     const-string p2, "findViewById(R.id.active\u2026iption_header_background)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -77,7 +79,7 @@
 
     const-string p2, "findViewById(R.id.active_subscription_header_icon)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -91,7 +93,7 @@
 
     const-string p2, "findViewById(R.id.active_subscription_header_logo)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -105,7 +107,7 @@
 
     const-string p2, "findViewById(R.id.active_subscription_top_button)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/Button;
 
@@ -119,7 +121,7 @@
 
     const-string p2, "findViewById(R.id.active\u2026bscription_cancel_button)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->i:Landroid/view/View;
 
@@ -131,22 +133,13 @@
 
     const-string p2, "findViewById(R.id.active_subscription_progress)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ProgressBar;
 
     iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->j:Landroid/widget/ProgressBar;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static a(Lcom/discord/views/ActiveSubscriptionView;Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;Lcom/discord/models/domain/ModelSubscription$Status;ZZLjava/lang/CharSequence;ZILkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ZI)V
@@ -158,267 +151,276 @@
 
     move-object/from16 v2, p2
 
-    move/from16 v3, p11
+    move-object/from16 v3, p5
 
-    and-int/lit8 v4, v3, 0x8
+    move/from16 v4, p11
+
+    and-int/lit8 v5, v4, 0x8
+
+    if-eqz v5, :cond_0
 
     const/4 v5, 0x0
 
-    if-eqz v4, :cond_0
-
-    const/4 v4, 0x0
-
     goto :goto_0
 
     :cond_0
-    move/from16 v4, p4
+    move/from16 v5, p4
 
     :goto_0
-    and-int/lit8 v6, v3, 0x20
+    and-int/lit8 v7, v4, 0x20
 
-    if-eqz v6, :cond_1
+    if-eqz v7, :cond_1
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
     goto :goto_1
 
     :cond_1
-    move/from16 v6, p6
+    move/from16 v7, p6
 
     :goto_1
-    and-int/lit8 v7, v3, 0x40
+    and-int/lit8 v8, v4, 0x40
 
-    if-eqz v7, :cond_2
+    if-eqz v8, :cond_2
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
     goto :goto_2
 
     :cond_2
-    move/from16 v7, p7
+    move/from16 v8, p7
 
     :goto_2
-    and-int/lit16 v8, v3, 0x80
+    and-int/lit16 v9, v4, 0x80
 
-    const/4 v9, 0x0
+    const/4 v10, 0x0
 
-    if-eqz v8, :cond_3
+    if-eqz v9, :cond_3
 
-    move-object v8, v9
+    move-object v9, v10
 
     goto :goto_3
 
     :cond_3
-    move-object/from16 v8, p8
+    move-object/from16 v9, p8
 
     :goto_3
-    and-int/lit16 v10, v3, 0x100
+    and-int/lit16 v11, v4, 0x100
 
-    if-eqz v10, :cond_4
+    if-eqz v11, :cond_4
 
-    move-object v10, v9
+    move-object v11, v10
 
     goto :goto_4
 
     :cond_4
-    move-object/from16 v10, p9
+    move-object/from16 v11, p9
 
     :goto_4
-    and-int/lit16 v3, v3, 0x200
+    and-int/lit16 v4, v4, 0x200
 
-    if-eqz v3, :cond_5
+    if-eqz v4, :cond_5
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     goto :goto_5
 
     :cond_5
-    move/from16 v3, p10
+    move/from16 v4, p10
 
     :goto_5
-    if-eqz v1, :cond_1b
+    if-eqz v0, :cond_1a
 
-    if-eqz v2, :cond_1a
+    const-string v10, "activeSubscriptionType"
 
-    iget-object v9, v0, Lcom/discord/views/ActiveSubscriptionView;->e:Landroid/widget/ImageView;
+    invoke-static {v1, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "status"
+
+    invoke-static {v2, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "priceText"
+
+    invoke-static {v3, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v10, v0, Lcom/discord/views/ActiveSubscriptionView;->e:Landroid/widget/ImageView;
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v11
-
-    const/4 v12, 0x2
+    move-result v12
 
     const/4 v13, 0x3
 
-    if-eq v11, v12, :cond_7
+    const/4 v14, 0x2
 
-    if-eq v11, v13, :cond_6
+    if-eq v12, v14, :cond_7
+
+    if-eq v12, v13, :cond_6
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->getHeaderBackground()I
 
-    move-result v11
+    move-result v12
 
     goto :goto_6
 
     :cond_6
     invoke-virtual/range {p1 .. p1}, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->getHeaderBackgroundResub()I
 
-    move-result v11
+    move-result v12
 
     goto :goto_6
 
     :cond_7
     invoke-virtual/range {p1 .. p1}, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->getHeaderBackgroundError()I
 
-    move-result v11
+    move-result v12
 
     :goto_6
-    invoke-virtual {v9, v11}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v10, v12}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v9, v0, Lcom/discord/views/ActiveSubscriptionView;->f:Landroid/widget/ImageView;
+    iget-object v10, v0, Lcom/discord/views/ActiveSubscriptionView;->f:Landroid/widget/ImageView;
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v11
+    move-result v12
 
-    if-eq v11, v12, :cond_9
+    if-eq v12, v14, :cond_9
 
-    if-eq v11, v13, :cond_8
+    if-eq v12, v13, :cond_8
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->getHeaderImage()I
 
-    move-result v11
+    move-result v12
 
     goto :goto_7
 
     :cond_8
     invoke-virtual/range {p1 .. p1}, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->getHeaderImageResub()I
 
-    move-result v11
+    move-result v12
 
     goto :goto_7
 
     :cond_9
     invoke-virtual/range {p1 .. p1}, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->getHeaderImageError()I
 
-    move-result v11
+    move-result v12
 
     :goto_7
-    invoke-virtual {v9, v11}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v10, v12}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v9, v0, Lcom/discord/views/ActiveSubscriptionView;->g:Landroid/widget/ImageView;
+    iget-object v10, v0, Lcom/discord/views/ActiveSubscriptionView;->g:Landroid/widget/ImageView;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->getHeaderLogo()I
 
-    move-result v11
+    move-result v12
 
-    invoke-virtual {v9, v11}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v10, v12}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v9, v0, Lcom/discord/views/ActiveSubscriptionView;->d:Landroid/widget/TextView;
+    iget-object v10, v0, Lcom/discord/views/ActiveSubscriptionView;->d:Landroid/widget/TextView;
 
-    sget-object v11, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
+    sget-object v12, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
     invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
-    move-result-object v14
+    move-result-object v15
 
-    const-string v15, "context"
+    const-string v13, "context"
 
-    invoke-static {v14, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v15
+    move-result v13
 
-    const/4 v13, 0x1
+    const/4 v6, 0x1
 
-    if-eqz v15, :cond_e
+    if-eqz v13, :cond_e
 
-    if-eq v15, v13, :cond_c
+    if-eq v13, v6, :cond_c
 
-    if-ne v15, v12, :cond_b
+    if-ne v13, v14, :cond_b
 
     invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v15
+    move-result-object v13
 
-    new-array v12, v13, [Ljava/lang/Object;
+    new-array v14, v6, [Ljava/lang/Object;
 
-    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v16
+    move-result-object v17
 
-    aput-object v16, v12, v5
+    const/16 v16, 0x0
 
-    const v13, 0x7f1000e4
+    aput-object v17, v14, v16
 
-    invoke-virtual {v15, v13, v7, v12}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    const v6, 0x7f1000e6
 
-    move-result-object v12
+    invoke-virtual {v13, v6, v8, v14}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v6
 
     const-string v13, "resources.getQuantityStr\u2026bscriptionCount\n        )"
 
-    invoke-static {v12, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Enum;->ordinal()I
 
     move-result v13
 
-    const/4 v15, 0x3
+    const/4 v14, 0x3
 
-    if-eq v13, v15, :cond_a
+    if-eq v13, v14, :cond_a
 
-    new-array v13, v15, [Ljava/lang/Object;
+    new-array v13, v14, [Ljava/lang/Object;
 
-    invoke-static {v7}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v8}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v8
 
-    aput-object v7, v13, v5
+    aput-object v8, v13, v16
 
-    const/16 v16, 0x1
+    const/16 v17, 0x1
 
-    aput-object v12, v13, v16
+    aput-object v6, v13, v17
 
-    const/4 v7, 0x2
+    const/4 v6, 0x2
 
-    aput-object p5, v13, v7
+    aput-object v3, v13, v6
 
-    const v12, 0x7f121211
+    const v3, 0x7f12123c
 
-    invoke-static {v0, v12, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v3, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v12
+    move-result-object v3
 
     goto :goto_8
 
     :cond_a
-    const/16 v16, 0x1
+    const/16 v17, 0x1
 
-    new-array v13, v15, [Ljava/lang/Object;
+    new-array v13, v14, [Ljava/lang/Object;
 
-    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v7
+    move-result-object v8
 
-    aput-object v7, v13, v5
+    aput-object v8, v13, v16
 
-    aput-object v12, v13, v16
+    aput-object v6, v13, v17
 
-    const/4 v7, 0x2
+    const/4 v6, 0x2
 
-    aput-object p5, v13, v7
+    aput-object v3, v13, v6
 
-    const v12, 0x7f121213
+    const v3, 0x7f12123e
 
-    invoke-static {v0, v12, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v3, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v12
+    move-result-object v3
 
-    :goto_8
-    const/4 v15, 0x1
-
-    goto :goto_9
+    goto :goto_8
 
     :cond_b
     new-instance v0, Lkotlin/NoWhenBranchMatchedException;
@@ -428,190 +430,193 @@
     throw v0
 
     :cond_c
-    const/4 v7, 0x2
+    const/4 v6, 0x2
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v12
+    move-result v8
 
     const/4 v13, 0x3
 
-    if-eq v12, v13, :cond_d
+    if-eq v8, v13, :cond_d
 
-    const v12, 0x7f121258
+    const v8, 0x7f121283
 
-    new-array v13, v7, [Ljava/lang/Object;
+    new-array v13, v6, [Ljava/lang/Object;
 
-    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v15
+    move-result-object v14
 
-    aput-object v15, v13, v5
+    const/16 v16, 0x0
 
-    const/4 v15, 0x1
+    aput-object v14, v13, v16
 
-    aput-object p5, v13, v15
+    const/4 v14, 0x1
 
-    invoke-static {v0, v12, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v3, v13, v14
 
-    move-result-object v12
+    invoke-static {v0, v8, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    :goto_9
-    move-object v7, v12
+    move-result-object v3
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_d
-    const/4 v15, 0x1
+    const/4 v14, 0x1
 
-    const v12, 0x7f121259
+    const/16 v16, 0x0
 
-    new-array v13, v7, [Ljava/lang/Object;
+    const v8, 0x7f121284
 
-    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    new-array v13, v6, [Ljava/lang/Object;
 
-    move-result-object v16
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    aput-object v16, v13, v5
+    move-result-object v17
 
-    aput-object p5, v13, v15
+    aput-object v17, v13, v16
 
-    invoke-static {v0, v12, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v3, v13, v14
 
-    move-result-object v7
+    invoke-static {v0, v8, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    goto :goto_a
+    move-result-object v3
+
+    goto :goto_8
 
     :cond_e
-    const/4 v15, 0x1
+    const/4 v14, 0x1
+
+    const/16 v16, 0x0
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v7
+    move-result v6
 
-    const/4 v12, 0x3
+    const/4 v8, 0x3
 
-    if-eq v7, v12, :cond_f
+    if-eq v6, v8, :cond_f
 
-    const v7, 0x7f121256
+    const v6, 0x7f121281
 
-    new-array v12, v15, [Ljava/lang/Object;
+    new-array v8, v14, [Ljava/lang/Object;
 
-    aput-object p5, v12, v5
+    aput-object v3, v8, v16
 
-    invoke-static {v0, v7, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v6, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v3
 
-    goto :goto_a
+    goto :goto_8
 
     :cond_f
-    const v7, 0x7f121257
+    const v6, 0x7f121282
 
-    new-array v12, v15, [Ljava/lang/Object;
+    new-array v8, v14, [Ljava/lang/Object;
 
-    aput-object p5, v12, v5
+    aput-object v3, v8, v16
 
-    invoke-static {v0, v7, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v6, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v3
 
-    :goto_a
-    const/4 v12, 0x0
+    :goto_8
+    const/4 v6, 0x0
+
+    const/4 v8, 0x0
 
     const/4 v13, 0x0
 
-    const/4 v15, 0x0
-
-    const/16 v17, 0x1c
+    const/16 v14, 0x1c
 
     const/16 v18, 0x0
 
-    move-object/from16 p4, v11
+    move-object/from16 p4, v12
 
-    move-object/from16 p5, v14
+    move-object/from16 p5, v15
 
-    move-object/from16 p6, v7
+    move-object/from16 p6, v3
 
-    move-object/from16 p7, v12
+    move-object/from16 p7, v6
 
-    move-object/from16 p8, v13
+    move-object/from16 p8, v8
 
-    move-object/from16 p9, v15
+    move-object/from16 p9, v13
 
-    move/from16 p10, v17
+    move/from16 p10, v14
 
     move-object/from16 p11, v18
 
     invoke-static/range {p4 .. p11}, Lcom/discord/utilities/textprocessing/Parsers;->parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    move-result-object v7
+    move-result-object v3
 
-    invoke-virtual {v9, v7}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v10, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v7, v0, Lcom/discord/views/ActiveSubscriptionView;->h:Landroid/widget/Button;
+    iget-object v3, v0, Lcom/discord/views/ActiveSubscriptionView;->h:Landroid/widget/Button;
 
     if-nez p3, :cond_10
 
-    if-nez v6, :cond_10
+    if-nez v7, :cond_10
 
-    const/4 v9, 0x1
+    const/4 v6, 0x1
 
-    goto :goto_b
+    goto :goto_9
 
     :cond_10
-    const/4 v9, 0x0
+    const/4 v6, 0x0
 
-    :goto_b
-    const/16 v11, 0x8
+    :goto_9
+    const/16 v8, 0x8
 
-    if-eqz v9, :cond_11
+    if-eqz v6, :cond_11
 
-    const/4 v9, 0x0
+    const/4 v6, 0x0
 
-    goto :goto_c
+    goto :goto_a
 
     :cond_11
-    const/16 v9, 0x8
+    const/16 v6, 0x8
 
-    :goto_c
-    invoke-virtual {v7, v9}, Landroid/view/View;->setVisibility(I)V
+    :goto_a
+    invoke-virtual {v3, v6}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v7, v0, Lcom/discord/views/ActiveSubscriptionView;->i:Landroid/view/View;
+    iget-object v3, v0, Lcom/discord/views/ActiveSubscriptionView;->i:Landroid/view/View;
 
     if-nez p3, :cond_12
 
-    sget-object v9, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM_GUILD:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
+    sget-object v6, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM_GUILD:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
 
-    if-eq v1, v9, :cond_12
+    if-eq v1, v6, :cond_12
 
-    if-nez v6, :cond_12
+    if-nez v7, :cond_12
 
-    sget-object v9, Lcom/discord/models/domain/ModelSubscription$Status;->CANCELED:Lcom/discord/models/domain/ModelSubscription$Status;
+    sget-object v6, Lcom/discord/models/domain/ModelSubscription$Status;->CANCELED:Lcom/discord/models/domain/ModelSubscription$Status;
 
-    if-eq v2, v9, :cond_12
+    if-eq v2, v6, :cond_12
 
-    if-nez v3, :cond_12
+    if-nez v4, :cond_12
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
-    goto :goto_d
+    goto :goto_b
 
     :cond_12
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    :goto_d
-    if-eqz v3, :cond_13
+    :goto_b
+    if-eqz v4, :cond_13
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    goto :goto_e
+    goto :goto_c
 
     :cond_13
-    const/16 v3, 0x8
+    const/16 v4, 0x8
 
-    :goto_e
-    invoke-virtual {v7, v3}, Landroid/view/View;->setVisibility(I)V
+    :goto_c
+    invoke-virtual {v3, v4}, Landroid/view/View;->setVisibility(I)V
 
     iget-object v3, v0, Lcom/discord/views/ActiveSubscriptionView;->h:Landroid/widget/Button;
 
@@ -621,17 +626,17 @@
 
     if-eqz v1, :cond_15
 
-    const/4 v7, 0x1
+    const/4 v4, 0x1
 
-    if-eq v1, v7, :cond_15
+    if-eq v1, v4, :cond_15
 
-    const/4 v7, 0x2
+    const/4 v4, 0x2
 
-    if-ne v1, v7, :cond_14
+    if-ne v1, v4, :cond_14
 
-    const v1, 0x7f1211a6
+    const v1, 0x7f1211d1
 
-    goto :goto_f
+    goto :goto_d
 
     :cond_14
     new-instance v0, Lkotlin/NoWhenBranchMatchedException;
@@ -651,94 +656,91 @@
 
     const v1, 0x7f120325
 
-    goto :goto_f
+    goto :goto_d
 
     :cond_16
-    const v1, 0x7f12135a
+    const v1, 0x7f121384
 
-    :goto_f
+    :goto_d
     invoke-virtual {v3, v1}, Landroid/widget/Button;->setText(I)V
 
     iget-object v1, v0, Lcom/discord/views/ActiveSubscriptionView;->h:Landroid/widget/Button;
 
     new-instance v2, Lj;
 
-    invoke-direct {v2, v5, v10}, Lj;-><init>(ILjava/lang/Object;)V
+    const/4 v3, 0x0
+
+    invoke-direct {v2, v3, v11}, Lj;-><init>(ILjava/lang/Object;)V
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     iget-object v1, v0, Lcom/discord/views/ActiveSubscriptionView;->h:Landroid/widget/Button;
 
-    if-eqz v10, :cond_17
+    if-eqz v11, :cond_17
 
-    const/4 v2, 0x1
+    const/16 v16, 0x1
 
-    goto :goto_10
+    goto :goto_e
 
     :cond_17
-    const/4 v2, 0x0
+    const/16 v16, 0x0
 
-    :goto_10
-    if-eqz v2, :cond_18
+    :goto_e
+    if-eqz v16, :cond_18
 
     const/4 v2, 0x0
 
-    goto :goto_11
+    goto :goto_f
 
     :cond_18
     const/16 v2, 0x8
 
-    :goto_11
+    :goto_f
     invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     iget-object v1, v0, Lcom/discord/views/ActiveSubscriptionView;->h:Landroid/widget/Button;
 
     const/4 v2, 0x1
 
-    xor-int/lit8 v3, v4, 0x1
+    xor-int/lit8 v4, v5, 0x1
 
-    invoke-virtual {v1, v3}, Landroid/widget/Button;->setEnabled(Z)V
+    invoke-virtual {v1, v4}, Landroid/widget/Button;->setEnabled(Z)V
 
     iget-object v1, v0, Lcom/discord/views/ActiveSubscriptionView;->i:Landroid/view/View;
 
-    new-instance v3, Lj;
+    new-instance v4, Lj;
 
-    invoke-direct {v3, v2, v8}, Lj;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v4, v2, v9}, Lj;-><init>(ILjava/lang/Object;)V
 
-    invoke-virtual {v1, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     iget-object v0, v0, Lcom/discord/views/ActiveSubscriptionView;->j:Landroid/widget/ProgressBar;
 
-    if-eqz v6, :cond_19
+    if-eqz v7, :cond_19
 
-    goto :goto_12
+    const/4 v6, 0x0
+
+    goto :goto_10
 
     :cond_19
-    const/16 v5, 0x8
+    const/16 v6, 0x8
 
-    :goto_12
-    invoke-virtual {v0, v5}, Landroid/view/View;->setVisibility(I)V
+    :goto_10
+    invoke-virtual {v0, v6}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
     :cond_1a
-    const-string v0, "status"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_1b
-    const-string v0, "activeSubscriptionType"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
+    throw v10
 .end method
 
 .method public static final b(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
     .locals 1
 
+    const-string v0, "subscription"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object p0
@@ -773,6 +775,8 @@
     :goto_0
     return-object p0
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x6
         :pswitch_1
diff --git a/com.discord/smali/com/discord/views/BoxedButton.smali b/com.discord/smali/com/discord/views/BoxedButton.smali
index de0d1698d5..9a3d608c60 100644
--- a/com.discord/smali/com/discord/views/BoxedButton.smali
+++ b/com.discord/smali/com/discord/views/BoxedButton.smali
@@ -23,61 +23,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/BoxedButton;
 
-    const-class v2, Lcom/discord/views/BoxedButton;
+    const-string v2, "textView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "textView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTextView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/BoxedButton;
 
-    const/4 v2, 0x0
+    const-string v2, "boxedTextView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBoxedTextView()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/BoxedButton;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "boxedTextView"
-
-    const-string v4, "getBoxedTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/BoxedButton;
 
-    const-class v2, Lcom/discord/views/BoxedButton;
+    const-string v2, "button"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "button"
-
-    const-string v4, "getButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -91,7 +73,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 3
 
-    if-eqz p1, :cond_3
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -212,15 +196,6 @@
     :cond_2
     :goto_0
     return-void
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getBoxedTextView()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/views/ChatActionItem.smali b/com.discord/smali/com/discord/views/ChatActionItem.smali
index 4884521644..127b511f5f 100644
--- a/com.discord/smali/com/discord/views/ChatActionItem.smali
+++ b/com.discord/smali/com/discord/views/ChatActionItem.smali
@@ -13,9 +13,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/cardview/widget/CardView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -23,33 +23,33 @@
 
     move-result-object p1
 
-    const v1, 0x7f0d00fb
+    const v0, 0x7f0d00fb
 
-    invoke-static {p1, v1, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+    invoke-static {p1, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a01f6
+    const p1, 0x7f0a01f9
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v1, "findViewById(R.id.chat_action_item_text)"
+    const-string v0, "findViewById(R.id.chat_action_item_text)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/ChatActionItem;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a01f5
+    const p1, 0x7f0a01f8
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v1, "findViewById(R.id.chat_action_item_image)"
+    const-string v0, "findViewById(R.id.chat_action_item_image)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -59,29 +59,31 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/R$a;->ChatActionItem:[I
+    sget-object v0, Lcom/discord/R$a;->ChatActionItem:[I
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {p1, p2, v1, v2, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p2, v0, v1, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p1
 
     iget-object p2, p0, Lcom/discord/views/ChatActionItem;->e:Landroid/widget/TextView;
 
+    const/4 v0, 0x0
+
     if-eqz p2, :cond_1
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    invoke-virtual {p1, v1}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v2}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p2, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     const p2, 0x7f08013b
 
-    invoke-virtual {p1, v2, p2}, Landroid/content/res/TypedArray;->getResourceId(II)I
+    invoke-virtual {p1, v1, p2}, Landroid/content/res/TypedArray;->getResourceId(II)I
 
     move-result p2
 
@@ -98,21 +100,14 @@
     :cond_0
     const-string p1, "image"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
     const-string p1, "primaryText"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/views/CheckableImageView.smali b/com.discord/smali/com/discord/views/CheckableImageView.smali
index 7ea3036fa8..1023224ee4 100644
--- a/com.discord/smali/com/discord/views/CheckableImageView.smali
+++ b/com.discord/smali/com/discord/views/CheckableImageView.smali
@@ -16,7 +16,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -42,7 +44,7 @@
 
     const-string p2, "context.obtainStyledAttr\u2026CheckableImageView, 0, 0)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     iget-boolean p2, p0, Lcom/discord/views/CheckableImageView;->e:Z
@@ -69,15 +71,6 @@
     :cond_0
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -101,7 +94,7 @@
 
     const-string v0, "super.onCreateDrawableState(extraSpace + 1)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/views/CheckableImageView;->e:Z
 
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$b.smali b/com.discord/smali/com/discord/views/CheckedSetting$b.smali
index 01a597d8c5..1469db0d55 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$b.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$b.smali
@@ -59,7 +59,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/views/CheckedSetting$c.smali b/com.discord/smali/com/discord/views/CheckedSetting$c.smali
index 4367213717..7ffe793e0a 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$c.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$c.smali
@@ -45,11 +45,13 @@
 .method public onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "host"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
 
@@ -62,30 +64,18 @@
     invoke-virtual {p2, p1}, Landroid/view/accessibility/AccessibilityEvent;->setChecked(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "host"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "info"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 
@@ -146,18 +136,4 @@
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setRoleDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/views/CheckedSetting.smali b/com.discord/smali/com/discord/views/CheckedSetting.smali
index a8c48a9cf8..4c01097a75 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting.smali
@@ -40,13 +40,13 @@
 
     const/4 v0, 0x4
 
+    const-string v1, "context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_1a
-
-    const/4 v2, 0x0
-
-    invoke-direct {p0, p1, p2, v2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    invoke-direct {p0, p1, p2, v1}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     if-nez p2, :cond_0
 
@@ -61,44 +61,46 @@
 
     move-result-object p1
 
-    sget-object v3, Lcom/discord/R$a;->CheckedSetting:[I
+    sget-object v2, Lcom/discord/R$a;->CheckedSetting:[I
 
-    invoke-virtual {p1, p2, v3, v2, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p2, v2, v1, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p1
 
     const/16 p2, 0xe
 
     :try_start_0
-    sget-object v3, Lcom/discord/views/CheckedSetting$ViewType;->CHECK:Lcom/discord/views/CheckedSetting$ViewType;
+    sget-object v2, Lcom/discord/views/CheckedSetting$ViewType;->CHECK:Lcom/discord/views/CheckedSetting$ViewType;
 
-    invoke-virtual {p1, p2, v2}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p1, p2, v1}, Landroid/content/res/TypedArray;->getInt(II)I
 
     move-result p2
 
-    sget-object v3, Lcom/discord/views/CheckedSetting$ViewType;->Companion:Lcom/discord/views/CheckedSetting$ViewType$a;
+    sget-object v2, Lcom/discord/views/CheckedSetting$ViewType;->Companion:Lcom/discord/views/CheckedSetting$ViewType$a;
 
-    if-eqz v3, :cond_19
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_19
 
     invoke-static {}, Lcom/discord/views/CheckedSetting$ViewType;->access$getVALUES$cp()[Lcom/discord/views/CheckedSetting$ViewType;
 
-    move-result-object v3
+    move-result-object v2
 
-    aget-object p2, v3, p2
+    aget-object p2, v2, p2
 
     invoke-virtual {p0, p2}, Lcom/discord/views/CheckedSetting;->f(Lcom/discord/views/CheckedSetting$ViewType;)V
 
     const/16 p2, 0xd
 
-    const/high16 v3, -0x40800000    # -1.0f
+    const/high16 v2, -0x40800000    # -1.0f
 
-    invoke-virtual {p1, p2, v3}, Landroid/content/res/TypedArray;->getDimension(IF)F
+    invoke-virtual {p1, p2, v2}, Landroid/content/res/TypedArray;->getDimension(IF)F
 
     move-result p2
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    int-to-float v4, v2
+    int-to-float v4, v1
 
     const-string v5, "label"
 
@@ -111,16 +113,16 @@
 
     if-eqz v6, :cond_1
 
-    invoke-virtual {v6, v2, p2}, Landroid/widget/TextView;->setTextSize(IF)V
+    invoke-virtual {v6, v1, p2}, Landroid/widget/TextView;->setTextSize(IF)V
 
     goto :goto_0
 
     :cond_1
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_2
     :goto_0
@@ -142,11 +144,11 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_4
     :goto_1
@@ -170,7 +172,7 @@
     goto :goto_2
 
     :cond_5
-    move-object v6, v1
+    move-object v6, v3
 
     :goto_2
     invoke-virtual {p2, v6}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
@@ -246,11 +248,11 @@
     goto :goto_3
 
     :cond_6
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_7
     :goto_3
@@ -270,7 +272,7 @@
     goto :goto_4
 
     :cond_8
-    move-object p2, v1
+    move-object p2, v3
 
     :goto_4
     const/4 v0, 0x1
@@ -313,11 +315,11 @@
     goto :goto_7
 
     :cond_b
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_c
     :try_start_6
@@ -331,33 +333,33 @@
 
     if-eqz p2, :cond_14
 
-    invoke-virtual {p2, v2}, Landroid/widget/TextView;->setVisibility(I)V
+    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setVisibility(I)V
 
     :goto_7
     const/16 p2, 0x9
 
-    invoke-virtual {p1, p2, v3}, Landroid/content/res/TypedArray;->getDimension(IF)F
+    invoke-virtual {p1, p2, v2}, Landroid/content/res/TypedArray;->getDimension(IF)F
 
     move-result p2
 
-    cmpl-float v3, p2, v4
+    cmpl-float v2, p2, v4
 
-    if-lez v3, :cond_e
+    if-lez v2, :cond_e
 
-    iget-object v3, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
+    iget-object v2, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
 
-    if-eqz v3, :cond_d
+    if-eqz v2, :cond_d
 
-    invoke-virtual {v3, v2, p2}, Landroid/widget/TextView;->setTextSize(IF)V
+    invoke-virtual {v2, v1, p2}, Landroid/widget/TextView;->setTextSize(IF)V
 
     goto :goto_8
 
     :cond_d
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_e
     :goto_8
@@ -368,25 +370,25 @@
 
     if-eqz p2, :cond_10
 
-    iget-object v3, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
+    iget-object v2, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
 
-    if-eqz v3, :cond_f
+    if-eqz v2, :cond_f
 
-    invoke-virtual {v3, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v2, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     goto :goto_9
 
     :cond_f
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_10
     :goto_9
     :try_start_8
-    invoke-virtual {p1, v2}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p1, v1}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
 
     move-result-object p2
 
@@ -419,11 +421,11 @@
     :cond_12
     const-string p2, "container"
 
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_13
     :goto_b
@@ -434,47 +436,47 @@
 
     :cond_14
     :try_start_9
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_9
     .catchall {:try_start_9 .. :try_end_9} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_15
     :try_start_a
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_a
     .catchall {:try_start_a .. :try_end_a} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_16
     :try_start_b
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_b
     .catchall {:try_start_b .. :try_end_b} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_17
     :try_start_c
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_c
     .catchall {:try_start_c .. :try_end_c} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_18
     :try_start_d
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_d
     .catchall {:try_start_d .. :try_end_d} :catchall_0
 
-    throw v1
+    throw v3
 
     :cond_19
     :try_start_e
-    throw v1
+    throw v3
     :try_end_e
     .catchall {:try_start_e .. :try_end_e} :catchall_0
 
@@ -484,13 +486,6 @@
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
     throw p2
-
-    :cond_1a
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final synthetic a(Lcom/discord/views/CheckedSetting;)Landroid/widget/CompoundButton;
@@ -505,7 +500,7 @@
     :cond_0
     const-string p0, "compoundButton"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -583,7 +578,7 @@
     :cond_0
     const-string p1, "container"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -591,7 +586,7 @@
 .end method
 
 .method public dispatchRestoreInstanceState(Landroid/util/SparseArray;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -601,24 +596,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "container"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->dispatchThawSelfOnly(Landroid/util/SparseArray;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "container"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public dispatchSaveInstanceState(Landroid/util/SparseArray;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -628,34 +616,27 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "container"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->dispatchFreezeSelfOnly(Landroid/util/SparseArray;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "container"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final e(Landroid/view/View$OnClickListener;)V
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "listener"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->e:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->e:Landroid/view/View;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1, p1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, p1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     const/high16 p1, 0x3f800000    # 1.0f
 
@@ -666,16 +647,11 @@
     :cond_0
     const-string p1, "container"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public final f(Lcom/discord/views/CheckedSetting$ViewType;)V
@@ -721,7 +697,7 @@
 
     invoke-static {v2, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const v0, 0x7f0a0855
+    const v0, 0x7f0a085b
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -729,13 +705,13 @@
 
     const-string v2, "findViewById(R.id.setting_label)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
     iput-object v0, p0, Lcom/discord/views/CheckedSetting;->g:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0856
+    const v0, 0x7f0a085c
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -743,13 +719,13 @@
 
     const-string v2, "findViewById(R.id.setting_subtext)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
     iput-object v0, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0852
+    const v0, 0x7f0a0858
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -757,13 +733,13 @@
 
     const-string v2, "findViewById(R.id.setting_button)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/CompoundButton;
 
     iput-object v0, p0, Lcom/discord/views/CheckedSetting;->f:Landroid/widget/CompoundButton;
 
-    const v0, 0x7f0a0853
+    const v0, 0x7f0a0859
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -771,7 +747,7 @@
 
     const-string v2, "findViewById(R.id.setting_container)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/views/CheckedSetting;->e:Landroid/view/View;
 
@@ -812,7 +788,7 @@
     :cond_4
     const-string p1, "container"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -847,12 +823,12 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -867,7 +843,7 @@
     return-void
 
     :cond_3
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -933,7 +909,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -942,12 +918,12 @@
     return-void
 
     :cond_5
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_6
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -968,7 +944,7 @@
     :cond_0
     const-string v0, "compoundButton"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -978,62 +954,57 @@
 .method public onRestoreInstanceState(Landroid/os/Parcelable;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "state"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v1, p1, Landroid/os/Bundle;
+    instance-of v0, p1, Landroid/os/Bundle;
 
-    if-eqz v1, :cond_1
+    const/4 v1, 0x0
 
-    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->f:Landroid/widget/CompoundButton;
+    if-eqz v0, :cond_1
 
-    if-eqz v1, :cond_0
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->f:Landroid/widget/CompoundButton;
 
-    move-object v0, p1
+    if-eqz v0, :cond_0
 
-    check-cast v0, Landroid/os/Bundle;
+    move-object v1, p1
+
+    check-cast v1, Landroid/os/Bundle;
 
     const-string v2, "STATE_CHECKED"
 
-    invoke-virtual {v0, v2}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
 
     move-result v2
 
-    invoke-virtual {v1, v2}, Landroid/widget/CompoundButton;->setChecked(Z)V
+    invoke-virtual {v0, v2}, Landroid/widget/CompoundButton;->setChecked(Z)V
 
-    const-string v1, "STATE_SUPER"
+    const-string v0, "STATE_SUPER"
 
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
+    invoke-virtual {v1, v0}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
 
-    move-result-object v0
+    move-result-object v1
 
     goto :goto_0
 
     :cond_0
     const-string p1, "compoundButton"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
     :goto_0
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    move-object p1, v0
+    move-object p1, v1
 
     :cond_2
     invoke-super {p0, p1}, Landroid/widget/RelativeLayout;->onRestoreInstanceState(Landroid/os/Parcelable;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onSaveInstanceState()Landroid/os/Parcelable;
@@ -1076,7 +1047,7 @@
     :cond_0
     const-string p1, "compoundButton"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1121,7 +1092,7 @@
     :cond_0
     const-string p1, "compoundButton"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1156,7 +1127,7 @@
     :cond_0
     const-string p1, "subLabel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1166,35 +1137,30 @@
 .method public final setSubtextOnClickListener(Lrx/functions/Action0;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "listener"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    new-instance v0, Lcom/discord/views/CheckedSetting$e;
+    new-instance v1, Lcom/discord/views/CheckedSetting$e;
 
-    invoke-direct {v0, p1}, Lcom/discord/views/CheckedSetting$e;-><init>(Lrx/functions/Action0;)V
+    invoke-direct {v1, p1}, Lcom/discord/views/CheckedSetting$e;-><init>(Lrx/functions/Action0;)V
 
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
 
     :cond_0
     const-string p1, "subLabel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public final setText(Ljava/lang/CharSequence;)V
@@ -1211,7 +1177,7 @@
     :cond_0
     const-string p1, "label"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1236,7 +1202,7 @@
     :cond_0
     const-string p1, "label"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1265,7 +1231,7 @@
     :cond_0
     const-string v0, "compoundButton"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/views/CodeVerificationView.smali b/com.discord/smali/com/discord/views/CodeVerificationView.smali
index cc8262ee56..88cd5e50c8 100644
--- a/com.discord/smali/com/discord/views/CodeVerificationView.smali
+++ b/com.discord/smali/com/discord/views/CodeVerificationView.smali
@@ -59,56 +59,56 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 6
+    .locals 5
 
     const/4 v0, 0x4
 
+    const-string v1, "context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_3
+    invoke-direct {p0, p1, p2, v1}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const/4 v2, 0x0
+    const-string v2, ""
 
-    invoke-direct {p0, p1, p2, v2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+    iput-object v2, p0, Lcom/discord/views/CodeVerificationView;->h:Ljava/lang/String;
 
-    const-string v3, ""
+    sget-object v2, Lf/a/n/d;->d:Lf/a/n/d;
 
-    iput-object v3, p0, Lcom/discord/views/CodeVerificationView;->h:Ljava/lang/String;
-
-    sget-object v3, Lf/a/n/d;->d:Lf/a/n/d;
-
-    iput-object v3, p0, Lcom/discord/views/CodeVerificationView;->i:Lkotlin/jvm/functions/Function1;
+    iput-object v2, p0, Lcom/discord/views/CodeVerificationView;->i:Lkotlin/jvm/functions/Function1;
 
     if-eqz p2, :cond_0
 
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
-    sget-object v4, Lcom/discord/R$a;->CodeVerificationView:[I
+    sget-object v3, Lcom/discord/R$a;->CodeVerificationView:[I
 
-    invoke-virtual {v3, p2, v4, v2, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-virtual {v2, p2, v3, v1, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p2
 
     :try_start_0
-    sget-object v3, Lcom/discord/views/CodeVerificationView;->j:Lcom/discord/views/CodeVerificationView$a;
+    sget-object v2, Lcom/discord/views/CodeVerificationView;->j:Lcom/discord/views/CodeVerificationView$a;
 
-    invoke-virtual {v3}, Ljava/lang/Enum;->ordinal()I
+    invoke-virtual {v2}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v3
+    move-result v2
 
-    invoke-virtual {p2, v2, v3}, Landroid/content/res/TypedArray;->getInt(II)I
+    invoke-virtual {p2, v1, v2}, Landroid/content/res/TypedArray;->getInt(II)I
 
-    move-result v3
+    move-result v2
 
-    sget-object v4, Lcom/discord/views/CodeVerificationView$a;->g:Lcom/discord/views/CodeVerificationView$a$a;
+    sget-object v3, Lcom/discord/views/CodeVerificationView$a;->g:Lcom/discord/views/CodeVerificationView$a$a;
 
-    sget-object v4, Lcom/discord/views/CodeVerificationView$a;->f:[Lcom/discord/views/CodeVerificationView$a;
+    sget-object v3, Lcom/discord/views/CodeVerificationView$a;->f:[Lcom/discord/views/CodeVerificationView$a;
 
-    aget-object v3, v4, v3
+    aget-object v2, v3, v2
 
-    iput-object v3, p0, Lcom/discord/views/CodeVerificationView;->g:Lcom/discord/views/CodeVerificationView$a;
+    iput-object v2, p0, Lcom/discord/views/CodeVerificationView;->g:Lcom/discord/views/CodeVerificationView$a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -137,119 +137,119 @@
 
     invoke-virtual {p0, p2}, Landroid/widget/LinearLayout;->setFocusableInTouchMode(Z)V
 
-    new-instance v3, Lf/a/n/a;
+    new-instance v2, Lf/a/n/a;
 
-    invoke-direct {v3, p0}, Lf/a/n/a;-><init>(Lcom/discord/views/CodeVerificationView;)V
+    invoke-direct {v2, p0}, Lf/a/n/a;-><init>(Lcom/discord/views/CodeVerificationView;)V
 
-    invoke-virtual {p0, v3}, Landroid/widget/LinearLayout;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
+    invoke-virtual {p0, v2}, Landroid/widget/LinearLayout;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
 
-    new-instance v3, Lf/a/n/b;
+    new-instance v2, Lf/a/n/b;
 
-    invoke-direct {v3, p0}, Lf/a/n/b;-><init>(Lcom/discord/views/CodeVerificationView;)V
+    invoke-direct {v2, p0}, Lf/a/n/b;-><init>(Lcom/discord/views/CodeVerificationView;)V
 
-    invoke-virtual {p0, v3}, Landroid/widget/LinearLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p0, v2}, Landroid/widget/LinearLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    new-instance v3, Lf/a/n/c;
+    new-instance v2, Lf/a/n/c;
 
-    invoke-direct {v3, p0}, Lf/a/n/c;-><init>(Lcom/discord/views/CodeVerificationView;)V
+    invoke-direct {v2, p0}, Lf/a/n/c;-><init>(Lcom/discord/views/CodeVerificationView;)V
 
-    invoke-virtual {p0, v3}, Landroid/widget/LinearLayout;->setOnKeyListener(Landroid/view/View$OnKeyListener;)V
+    invoke-virtual {p0, v2}, Landroid/widget/LinearLayout;->setOnKeyListener(Landroid/view/View$OnKeyListener;)V
 
-    const/4 v3, 0x6
+    const/4 v2, 0x6
 
-    new-array v3, v3, [Landroid/widget/TextView;
+    new-array v2, v2, [Landroid/widget/TextView;
 
-    const v4, 0x7f0a0a2b
+    const v3, 0x7f0a0a2f
 
-    invoke-virtual {p0, v4}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p0, v3}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
-    move-result-object v4
+    move-result-object v3
 
-    const-string v5, "findViewById(R.id.verify_char_1)"
+    const-string v4, "findViewById(R.id.verify_char_1)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v4, Landroid/widget/TextView;
+    check-cast v3, Landroid/widget/TextView;
 
-    aput-object v4, v3, v2
+    aput-object v3, v2, v1
 
-    const v2, 0x7f0a0a2c
+    const v1, 0x7f0a0a30
 
-    invoke-virtual {p0, v2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p0, v1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v4, "findViewById(R.id.verify_char_2)"
+    const-string v3, "findViewById(R.id.verify_char_2)"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v2, Landroid/widget/TextView;
+    check-cast v1, Landroid/widget/TextView;
 
-    aput-object v2, v3, p2
+    aput-object v1, v2, p2
 
-    const p2, 0x7f0a0a2d
+    const p2, 0x7f0a0a31
 
     invoke-virtual {p0, p2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v2, "findViewById(R.id.verify_char_3)"
+    const-string v1, "findViewById(R.id.verify_char_3)"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    aput-object p2, v3, v2
+    aput-object p2, v2, v1
 
     const/4 p2, 0x3
 
-    const v2, 0x7f0a0a2e
+    const v1, 0x7f0a0a32
 
-    invoke-virtual {p0, v2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p0, v1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v4, "findViewById(R.id.verify_char_4)"
+    const-string v3, "findViewById(R.id.verify_char_4)"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v2, Landroid/widget/TextView;
+    check-cast v1, Landroid/widget/TextView;
 
-    aput-object v2, v3, p2
+    aput-object v1, v2, p2
 
-    const p2, 0x7f0a0a2f
+    const p2, 0x7f0a0a33
 
     invoke-virtual {p0, p2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v2, "findViewById(R.id.verify_char_5)"
+    const-string v1, "findViewById(R.id.verify_char_5)"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
-    aput-object p2, v3, v0
+    aput-object p2, v2, v0
 
     const/4 p2, 0x5
 
-    const v0, 0x7f0a0a30
+    const v0, 0x7f0a0a34
 
     invoke-virtual {p0, v0}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object v0
 
-    const-string v2, "findViewById(R.id.verify_char_6)"
+    const-string v1, "findViewById(R.id.verify_char_6)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
-    aput-object v0, v3, p2
+    aput-object v0, v2, p2
 
-    invoke-static {v3}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v2}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p2
 
@@ -261,7 +261,7 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_2
+    invoke-static {p2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iput-object p2, p0, Lcom/discord/views/CodeVerificationView;->e:Landroid/graphics/drawable/Drawable;
 
@@ -271,46 +271,27 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_1
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/views/CodeVerificationView;->f:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/CodeVerificationView;->f()V
 
     return-void
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final a(Lcom/discord/views/CodeVerificationView;Landroid/view/KeyEvent;)V
     .locals 3
 
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_6
+    if-eqz p0, :cond_5
 
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getKeyCode()I
 
-    move-result v1
+    move-result v0
 
-    const/16 v2, 0x43
+    const/16 v1, 0x43
 
-    if-ne v1, v2, :cond_3
+    if-ne v0, v1, :cond_2
 
     iget-object p1, p0, Lcom/discord/views/CodeVerificationView;->h:Ljava/lang/String;
 
@@ -318,9 +299,9 @@
 
     move-result p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     if-lez p1, :cond_0
 
@@ -332,27 +313,29 @@
     const/4 p1, 0x0
 
     :goto_0
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/views/CodeVerificationView;->h:Ljava/lang/String;
 
-    if-eqz p1, :cond_2
+    const-string v2, "$this$dropLast"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
-    move-result v0
+    move-result v2
 
-    sub-int/2addr v0, v2
+    sub-int/2addr v2, v1
 
-    if-gez v0, :cond_1
+    if-gez v2, :cond_1
 
     goto :goto_1
 
     :cond_1
-    move v1, v0
+    move v0, v2
 
     :goto_1
-    invoke-static {p1, v1}, Lj0/t/s;->take(Ljava/lang/String;I)Ljava/lang/String;
+    invoke-static {p1, v0}, Lk0/u/s;->take(Ljava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -363,20 +346,13 @@
     goto :goto_2
 
     :cond_2
-    const-string p0, "$this$dropLast"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getKeyCode()I
 
     move-result v0
 
     const/4 v1, 0x7
 
-    if-ne v0, v1, :cond_4
+    if-ne v0, v1, :cond_3
 
     const/16 p1, 0x30
 
@@ -384,23 +360,25 @@
 
     goto :goto_2
 
-    :cond_4
+    :cond_3
     invoke-virtual {p1}, Landroid/view/KeyEvent;->getUnicodeChar()I
 
     move-result p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     int-to-char p1, p1
 
     invoke-virtual {p0, p1}, Lcom/discord/views/CodeVerificationView;->d(C)V
 
-    :cond_5
+    :cond_4
     :goto_2
     return-void
 
-    :cond_6
-    throw v0
+    :cond_5
+    const/4 p0, 0x0
+
+    throw p0
 .end method
 
 .method public static final b(Lcom/discord/views/CodeVerificationView;)V
@@ -427,11 +405,11 @@
     return-void
 
     :cond_0
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.inputmethod.InputMethodManager"
 
-    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 .end method
@@ -534,7 +512,7 @@
 
     iget-object v4, p0, Lcom/discord/views/CodeVerificationView;->h:Ljava/lang/String;
 
-    invoke-static {v4}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
+    invoke-static {v4}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
 
     move-result v4
 
@@ -701,17 +679,17 @@
 .method public onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "outAttrs"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/CodeVerificationView;->g:Lcom/discord/views/CodeVerificationView$a;
+    iget-object v0, p0, Lcom/discord/views/CodeVerificationView;->g:Lcom/discord/views/CodeVerificationView$a;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/discord/views/CodeVerificationView$a;->d:Lcom/discord/views/CodeVerificationView$a;
+    sget-object v1, Lcom/discord/views/CodeVerificationView$a;->d:Lcom/discord/views/CodeVerificationView$a;
 
-    if-ne v1, v0, :cond_0
+    if-ne v0, v1, :cond_0
 
     new-instance v0, Landroid/view/inputmethod/BaseInputConnection;
 
@@ -736,22 +714,19 @@
     :cond_1
     const-string p1, "inputType"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_2
-    const-string p1, "outAttrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public final setCode(Ljava/lang/CharSequence;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "code"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/views/CodeVerificationView;->h:Ljava/lang/String;
 
@@ -761,7 +736,7 @@
 
     iput-object p1, p0, Lcom/discord/views/CodeVerificationView;->h:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -773,19 +748,10 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnCodeEntered(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -797,18 +763,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/CodeVerificationView;->i:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali b/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali
index 8668687bd2..05c2f0d598 100644
--- a/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali
+++ b/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/views/CustomAppBarLayout$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CustomAppBarLayout.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Float;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/CustomAppBarLayout$b.smali b/com.discord/smali/com/discord/views/CustomAppBarLayout$b.smali
index 5480049062..a3b84b7bb1 100644
--- a/com.discord/smali/com/discord/views/CustomAppBarLayout$b.smali
+++ b/com.discord/smali/com/discord/views/CustomAppBarLayout$b.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "appBar"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/google/android/material/appbar/AppBarLayout;->getTotalScrollRange()I
 
diff --git a/com.discord/smali/com/discord/views/CustomAppBarLayout.smali b/com.discord/smali/com/discord/views/CustomAppBarLayout.smali
index 93cb2547c2..4100d3af07 100644
--- a/com.discord/smali/com/discord/views/CustomAppBarLayout.smali
+++ b/com.discord/smali/com/discord/views/CustomAppBarLayout.smali
@@ -23,9 +23,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/appbar/AppBarLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -40,15 +42,6 @@
     iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->f:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -100,7 +93,7 @@
 .end method
 
 .method public final setOnPercentCollapsedCallback(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -112,18 +105,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->f:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/FailedUploadList$a.smali b/com.discord/smali/com/discord/views/FailedUploadList$a.smali
index d655707a4a..f069c90d21 100644
--- a/com.discord/smali/com/discord/views/FailedUploadList$a.smali
+++ b/com.discord/smali/com/discord/views/FailedUploadList$a.smali
@@ -26,11 +26,13 @@
 .method public constructor <init>(Ljava/lang/String;JLjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "displayName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,20 +43,6 @@
     iput-object p4, p0, Lcom/discord/views/FailedUploadList$a;->c:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "displayName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -74,7 +62,7 @@
 
     iget-object v1, p1, Lcom/discord/views/FailedUploadList$a;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -92,7 +80,7 @@
 
     iget-object p1, p1, Lcom/discord/views/FailedUploadList$a;->c:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/views/FailedUploadList$b$a.smali b/com.discord/smali/com/discord/views/FailedUploadList$b$a.smali
index e947e7ba81..4ccbe66a17 100644
--- a/com.discord/smali/com/discord/views/FailedUploadList$b$a.smali
+++ b/com.discord/smali/com/discord/views/FailedUploadList$b$a.smali
@@ -38,6 +38,10 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "uploads"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/views/FailedUploadList$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -64,7 +68,7 @@
 
     iget-object p1, p1, Lcom/discord/views/FailedUploadList$b$a;->a:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/views/FailedUploadList.smali b/com.discord/smali/com/discord/views/FailedUploadList.smali
index 2d661cbeeb..7a3031dcc6 100644
--- a/com.discord/smali/com/discord/views/FailedUploadList.smali
+++ b/com.discord/smali/com/discord/views/FailedUploadList.smali
@@ -28,25 +28,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/FailedUploadList;
 
-    const-class v2, Lcom/discord/views/FailedUploadList;
+    const-string v2, "failedUploadViews"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFailedUploadViews()Ljava/util/List;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "failedUploadViews"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFailedUploadViews()Ljava/util/List;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/views/FailedUploadList;->e:[Lkotlin/reflect/KProperty;
 
@@ -64,7 +58,17 @@
 
     fill-array-data p1, :array_0
 
-    invoke-static {p0, p1}, Lf/n/a/k/a;->l(Landroid/view/View;[I)Lkotlin/properties/ReadOnlyProperty;
+    const-string p2, "$this$bindViews"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "ids"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p2, Lm0/d;->d:Lm0/d;
+
+    invoke-static {p1, p2}, Lf/n/a/k/a;->R([ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object p1
 
@@ -82,9 +86,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a025b
-        0x7f0a025c
-        0x7f0a025d
+        0x7f0a025e
+        0x7f0a025f
+        0x7f0a0260
     .end array-data
 .end method
 
@@ -119,7 +123,7 @@
 
 # virtual methods
 .method public final setUp(Ljava/util/List;)V
-    .locals 11
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -129,57 +133,57 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "localAttachments"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/views/FailedUploadList;->getFailedUploadViews()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lcom/discord/views/FailedUploadView;
+    check-cast v1, Lcom/discord/views/FailedUploadView;
 
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     goto :goto_0
 
     :cond_0
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    xor-int/2addr v1, v2
+    xor-int/2addr v0, v1
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance v0, Ljava/util/ArrayList;
 
-    const/16 v3, 0xa
+    const/16 v2, 0xa
 
-    invoke-static {p1, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {p1, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v4
+    move-result v3
 
-    invoke-direct {v1, v4}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v0, v3}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -188,182 +192,182 @@
     :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v3
 
-    check-cast v4, Lcom/discord/models/messages/LocalAttachment;
+    check-cast v3, Lcom/discord/models/messages/LocalAttachment;
 
-    invoke-static {v4}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toAttachment(Lcom/discord/models/messages/LocalAttachment;)Lcom/lytefast/flexinput/model/Attachment;
+    invoke-static {v3}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toAttachment(Lcom/discord/models/messages/LocalAttachment;)Lcom/lytefast/flexinput/model/Attachment;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v1, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
     move-result p1
 
-    const/4 v4, 0x3
+    const/4 v3, 0x3
 
-    const-string v5, "context.contentResolver"
+    const-string v4, "context.contentResolver"
 
-    const-string v6, "context"
+    const-string v5, "context"
 
-    if-gt p1, v4, :cond_3
+    if-gt p1, v3, :cond_3
 
     new-instance p1, Ljava/util/ArrayList;
 
-    invoke-static {v1, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v0, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v3
+    move-result v2
 
-    invoke-direct {p1, v3}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {p1, v2}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_2
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Lcom/lytefast/flexinput/model/Attachment;
+    check-cast v2, Lcom/lytefast/flexinput/model/Attachment;
 
-    new-instance v4, Lcom/discord/views/FailedUploadList$a;
+    new-instance v3, Lcom/discord/views/FailedUploadList$a;
 
-    invoke-virtual {v3}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
 
     move-result-object v7
 
-    invoke-virtual {v3}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
+    invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
     move-result-object v8
 
+    invoke-static {v8, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+
+    move-result-object v8
+
+    invoke-static {v8, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v7, v8}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeBytes(Landroid/net/Uri;Landroid/content/ContentResolver;)J
+
+    move-result-wide v7
+
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
     move-result-object v9
 
-    invoke-static {v9, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v9}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object v9
 
-    invoke-static {v9, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v9}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
 
-    invoke-static {v8, v9}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeBytes(Landroid/net/Uri;Landroid/content/ContentResolver;)J
+    move-result-object v2
 
-    move-result-wide v8
+    invoke-direct {v3, v6, v7, v8, v2}, Lcom/discord/views/FailedUploadList$a;-><init>(Ljava/lang/String;JLjava/lang/String;)V
 
-    invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
-
-    move-result-object v10
-
-    invoke-static {v10, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v10}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
-
-    move-result-object v10
-
-    invoke-static {v3, v10}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-direct {v4, v7, v8, v9, v3}, Lcom/discord/views/FailedUploadList$a;-><init>(Ljava/lang/String;JLjava/lang/String;)V
-
-    invoke-virtual {p1, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
     :cond_2
-    new-instance v1, Lcom/discord/views/FailedUploadList$b$a;
+    new-instance v0, Lcom/discord/views/FailedUploadList$b$a;
 
-    invoke-direct {v1, p1}, Lcom/discord/views/FailedUploadList$b$a;-><init>(Ljava/util/List;)V
+    invoke-direct {v0, p1}, Lcom/discord/views/FailedUploadList$b$a;-><init>(Ljava/util/List;)V
 
     goto :goto_4
 
     :cond_3
-    const-wide/16 v3, 0x0
+    const-wide/16 v2, 0x0
 
-    invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
     :goto_3
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v6
 
-    if-eqz v7, :cond_4
+    if-eqz v6, :cond_4
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v6
 
-    check-cast v7, Lcom/lytefast/flexinput/model/Attachment;
+    check-cast v6, Lcom/lytefast/flexinput/model/Attachment;
 
-    invoke-virtual {v7}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
+    invoke-virtual {v6}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
 
-    move-result-object v7
+    move-result-object v6
 
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-static {v8, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v8}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+    invoke-virtual {v7}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-static {v8, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v7, v8}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeBytes(Landroid/net/Uri;Landroid/content/ContentResolver;)J
+    invoke-static {v6, v7}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeBytes(Landroid/net/Uri;Landroid/content/ContentResolver;)J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    add-long/2addr v3, v7
+    add-long/2addr v2, v6
 
     goto :goto_3
 
     :cond_4
     new-instance p1, Lcom/discord/views/FailedUploadList$b$b;
 
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
-    move-result v1
+    move-result v0
 
-    invoke-direct {p1, v1, v3, v4}, Lcom/discord/views/FailedUploadList$b$b;-><init>(IJ)V
+    invoke-direct {p1, v0, v2, v3}, Lcom/discord/views/FailedUploadList$b$b;-><init>(IJ)V
 
-    move-object v1, p1
+    move-object v0, p1
 
     :goto_4
     nop
 
-    instance-of p1, v1, Lcom/discord/views/FailedUploadList$b$a;
+    instance-of p1, v0, Lcom/discord/views/FailedUploadList$b$a;
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     if-eqz p1, :cond_5
 
-    check-cast v1, Lcom/discord/views/FailedUploadList$b$a;
+    check-cast v0, Lcom/discord/views/FailedUploadList$b$a;
 
-    iget-object p1, v1, Lcom/discord/views/FailedUploadList$b$a;->a:Ljava/util/List;
+    iget-object p1, v0, Lcom/discord/views/FailedUploadList$b$a;->a:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/Collection;->size()I
 
@@ -376,9 +380,9 @@
 
     invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Lcom/discord/views/FailedUploadList$a;
+    check-cast v3, Lcom/discord/views/FailedUploadList$a;
 
     invoke-direct {p0}, Lcom/discord/views/FailedUploadList;->getFailedUploadViews()Ljava/util/List;
 
@@ -390,122 +394,117 @@
 
     check-cast v4, Lcom/discord/views/FailedUploadView;
 
-    invoke-virtual {v4, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v4, v2}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v5, v2, Lcom/discord/views/FailedUploadList$a;->a:Ljava/lang/String;
+    iget-object v6, v3, Lcom/discord/views/FailedUploadList$a;->a:Ljava/lang/String;
 
     invoke-virtual {v4}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object v7
 
-    invoke-static {v7, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v8, v2, Lcom/discord/views/FailedUploadList$a;->c:Ljava/lang/String;
+    iget-object v8, v3, Lcom/discord/views/FailedUploadList$a;->c:Ljava/lang/String;
 
     invoke-static {v7, v8}, Lcom/discord/utilities/file/FileUtilsKt;->getIconForFiletype(Landroid/content/Context;Ljava/lang/String;)I
 
     move-result v7
 
-    iget-wide v8, v2, Lcom/discord/views/FailedUploadList$a;->b:J
+    iget-wide v8, v3, Lcom/discord/views/FailedUploadList$a;->b:J
 
     invoke-static {v8, v9}, Lcom/discord/utilities/file/FileUtilsKt;->getSizeSubtitle(J)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v4, v5, v7, v2}, Lcom/discord/views/FailedUploadView;->a(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-virtual {v4, v6, v7, v3}, Lcom/discord/views/FailedUploadView;->a(Ljava/lang/String;ILjava/lang/String;)V
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_5
 
     :cond_5
-    instance-of p1, v1, Lcom/discord/views/FailedUploadList$b$b;
+    instance-of p1, v0, Lcom/discord/views/FailedUploadList$b$b;
 
     if-eqz p1, :cond_6
 
-    check-cast v1, Lcom/discord/views/FailedUploadList$b$b;
+    check-cast v0, Lcom/discord/views/FailedUploadList$b$b;
 
-    iget p1, v1, Lcom/discord/views/FailedUploadList$b$b;->a:I
+    iget p1, v0, Lcom/discord/views/FailedUploadList$b$b;->a:I
 
-    iget-wide v4, v1, Lcom/discord/views/FailedUploadList$b$b;->b:J
+    iget-wide v3, v0, Lcom/discord/views/FailedUploadList$b$b;->b:J
 
     invoke-direct {p0}, Lcom/discord/views/FailedUploadList;->getFailedUploadViews()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Landroid/view/View;
+    check-cast v0, Landroid/view/View;
 
-    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/views/FailedUploadList;->getFailedUploadViews()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/discord/views/FailedUploadView;
+    check-cast v0, Lcom/discord/views/FailedUploadView;
 
-    invoke-virtual {v1}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v0}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v6
+
+    const-string v7, "resources"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object v7
 
-    const-string v8, "resources"
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
-
-    move-result-object v8
-
-    invoke-static {v8, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-array v2, v2, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v9
+    move-result-object v8
 
-    aput-object v9, v2, v3
+    aput-object v8, v1, v2
 
-    const v9, 0x7f1000fd
+    const v8, 0x7f1000ff
 
-    invoke-static {v7, v8, v9, p1, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v6, v7, v8, p1, v1}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {v1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v5, 0x7f0402c7
+
+    const/4 v6, 0x2
+
+    const/4 v7, 0x0
+
+    invoke-static {v1, v5, v2, v6, v7}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v1
+
+    invoke-static {v3, v4}, Lcom/discord/utilities/file/FileUtilsKt;->getSizeSubtitle(J)Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v6, 0x7f0402c7
-
-    const/4 v7, 0x2
-
-    invoke-static {v2, v6, v3, v7, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
-
-    move-result v0
-
-    invoke-static {v4, v5}, Lcom/discord/utilities/file/FileUtilsKt;->getSizeSubtitle(J)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, p1, v0, v2}, Lcom/discord/views/FailedUploadView;->a(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/views/FailedUploadView;->a(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_6
     return-void
-
-    :cond_7
-    const-string p1, "localAttachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/views/FailedUploadView.smali b/com.discord/smali/com/discord/views/FailedUploadView.smali
index b0ed20c887..e75f8b2d34 100644
--- a/com.discord/smali/com/discord/views/FailedUploadView.smali
+++ b/com.discord/smali/com/discord/views/FailedUploadView.smali
@@ -23,61 +23,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/FailedUploadView;
 
-    const-class v2, Lcom/discord/views/FailedUploadView;
+    const-string v2, "displayName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDisplayName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "displayName"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDisplayName()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/FailedUploadView;
 
-    const/4 v2, 0x0
+    const-string v2, "subtitleText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSubtitleText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/FailedUploadView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "subtitleText"
-
-    const-string v4, "getSubtitleText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/FailedUploadView;
 
-    const-class v2, Lcom/discord/views/FailedUploadView;
+    const-string v2, "fileImage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFileImage()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "fileImage"
-
-    const-string v4, "getFileImage()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -93,7 +75,7 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f0a02f4
+    const p1, 0x7f0a02fa
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +83,7 @@
 
     iput-object p1, p0, Lcom/discord/views/FailedUploadView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a094b
+    const p1, 0x7f0a094f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +91,7 @@
 
     iput-object p1, p0, Lcom/discord/views/FailedUploadView;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a039b
+    const p1, 0x7f0a03a1
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +179,9 @@
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "title"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/views/FailedUploadView;->getDisplayName()Landroid/widget/TextView;
 
@@ -218,13 +202,4 @@
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/GuildView.smali b/com.discord/smali/com/discord/views/GuildView.smali
index 3072a80081..bb38a589ad 100644
--- a/com.discord/smali/com/discord/views/GuildView.smali
+++ b/com.discord/smali/com/discord/views/GuildView.smali
@@ -23,41 +23,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/GuildView;
 
-    const-class v2, Lcom/discord/views/GuildView;
+    const-string v2, "text"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "text"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getText()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/GuildView;
 
-    const/4 v2, 0x0
+    const-string v2, "image"
 
-    aput-object v1, v0, v2
+    const-string v3, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/GuildView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "image"
-
-    const-string v4, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -71,13 +59,15 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     invoke-direct {p0, p1, p2, v0}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const v1, 0x7f0a0499
+    const v1, 0x7f0a049f
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -85,7 +75,7 @@
 
     iput-object v1, p0, Lcom/discord/views/GuildView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0498
+    const v1, 0x7f0a049e
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -136,15 +126,6 @@
     :cond_0
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getImage()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -192,6 +173,10 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;)V
     .locals 13
 
+    const-string v0, "shortGuildName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x1
 
     const/4 v1, 0x0
@@ -216,7 +201,7 @@
 
     const-string v2, "ICON_UNSET"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
diff --git a/com.discord/smali/com/discord/views/JoinVoiceChannelButton$a.smali b/com.discord/smali/com/discord/views/JoinVoiceChannelButton$a.smali
index bbb7c2954d..ac33279e1a 100644
--- a/com.discord/smali/com/discord/views/JoinVoiceChannelButton$a.smali
+++ b/com.discord/smali/com/discord/views/JoinVoiceChannelButton$a.smali
@@ -55,7 +55,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali b/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali
index b1c778cf97..4af5f8fc3d 100644
--- a/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali
+++ b/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali
@@ -5,26 +5,19 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/button/MaterialButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f12048d
+    const p1, 0x7f12048e
 
     invoke-virtual {p0, p1}, Landroid/widget/Button;->setText(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/views/LoadingButton.smali b/com.discord/smali/com/discord/views/LoadingButton.smali
index 8e1ae3c572..fe13287ca4 100644
--- a/com.discord/smali/com/discord/views/LoadingButton.smali
+++ b/com.discord/smali/com/discord/views/LoadingButton.smali
@@ -25,41 +25,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/LoadingButton;
 
-    const-class v2, Lcom/discord/views/LoadingButton;
+    const-string v2, "progress"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getProgress()Landroid/widget/ProgressBar;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "progress"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getProgress()Landroid/widget/ProgressBar;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/LoadingButton;
 
-    const/4 v2, 0x0
+    const-string v2, "button"
 
-    aput-object v1, v0, v2
+    const-string v3, "getButton()Lcom/google/android/material/button/MaterialButton;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/LoadingButton;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "button"
-
-    const-string v4, "getButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -75,13 +63,15 @@
 
     const/4 v0, 0x4
 
-    if-eqz p1, :cond_6
+    const-string v1, "context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
     invoke-direct {p0, p1, p2, v1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const v2, 0x7f0a058d
+    const v2, 0x7f0a0593
 
     invoke-static {p0, v2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -89,7 +79,7 @@
 
     iput-object v2, p0, Lcom/discord/views/LoadingButton;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v2, 0x7f0a058c
+    const v2, 0x7f0a0592
 
     invoke-static {p0, v2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -318,15 +308,6 @@
     :cond_5
     :goto_1
     return-void
-
-    :cond_6
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getButton()Lcom/google/android/material/button/MaterialButton;
diff --git a/com.discord/smali/com/discord/views/OAuthPermissionViews$InvalidScopeException.smali b/com.discord/smali/com/discord/views/OAuthPermissionViews$InvalidScopeException.smali
index 94059f0727..a08f5a324e 100644
--- a/com.discord/smali/com/discord/views/OAuthPermissionViews$InvalidScopeException.smali
+++ b/com.discord/smali/com/discord/views/OAuthPermissionViews$InvalidScopeException.smali
@@ -20,11 +20,23 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 1
+    .locals 2
 
-    const-string v0, "invalid scope: "
+    const-string v0, "scope"
 
-    invoke-static {v0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "invalid scope: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/views/OAuthPermissionViews$a.smali b/com.discord/smali/com/discord/views/OAuthPermissionViews$a.smali
index d609a6af1d..29700074cf 100644
--- a/com.discord/smali/com/discord/views/OAuthPermissionViews$a.smali
+++ b/com.discord/smali/com/discord/views/OAuthPermissionViews$a.smali
@@ -28,7 +28,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
@@ -46,20 +50,13 @@
 
     check-cast p1, Ljava/lang/String;
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/views/OAuthPermissionViews$a;->a:Landroid/widget/TextView;
 
     invoke-static {v0, p1}, Lcom/discord/views/OAuthPermissionViews;->a(Landroid/widget/TextView;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/OAuthPermissionViews.smali b/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
index da41a88abc..3cce0848c5 100644
--- a/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
+++ b/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
@@ -16,11 +16,13 @@
 .method public static final a(Landroid/widget/TextView;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setScopePermissionText"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "scope"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
@@ -39,7 +41,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213a8
+    const p1, 0x7f1213d2
 
     goto/16 :goto_0
 
@@ -52,7 +54,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213aa
+    const p1, 0x7f1213d4
 
     goto/16 :goto_0
 
@@ -65,7 +67,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213b5
+    const p1, 0x7f1213df
 
     goto/16 :goto_0
 
@@ -78,7 +80,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213ae
+    const p1, 0x7f1213d8
 
     goto/16 :goto_0
 
@@ -91,7 +93,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213b9
+    const p1, 0x7f1213e3
 
     goto/16 :goto_0
 
@@ -104,7 +106,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213b7
+    const p1, 0x7f1213e1
 
     goto/16 :goto_0
 
@@ -117,7 +119,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213c4
+    const p1, 0x7f1213ee
 
     goto/16 :goto_0
 
@@ -130,7 +132,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213b0
+    const p1, 0x7f1213da
 
     goto/16 :goto_0
 
@@ -143,7 +145,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213bf
+    const p1, 0x7f1213e9
 
     goto :goto_0
 
@@ -156,7 +158,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213a4
+    const p1, 0x7f1213ce
 
     goto :goto_0
 
@@ -169,7 +171,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213c0
+    const p1, 0x7f1213ea
 
     goto :goto_0
 
@@ -182,7 +184,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213c6
+    const p1, 0x7f1213f0
 
     goto :goto_0
 
@@ -195,7 +197,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213ac
+    const p1, 0x7f1213d6
 
     goto :goto_0
 
@@ -208,7 +210,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213bb
+    const p1, 0x7f1213e5
 
     goto :goto_0
 
@@ -221,7 +223,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213bd
+    const p1, 0x7f1213e7
 
     goto :goto_0
 
@@ -234,7 +236,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213a6
+    const p1, 0x7f1213d0
 
     goto :goto_0
 
@@ -247,7 +249,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f1213c2
+    const p1, 0x7f1213ec
 
     :goto_0
     invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(I)V
@@ -262,22 +264,6 @@
 
     throw p0
 
-    :cond_1
-    const-string p0, "scope"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$setScopePermissionText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    nop
-
     :sswitch_data_0
     .sparse-switch
         -0x71f43197 -> :sswitch_10
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$a.smali b/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
index dbf81b8bda..1395257f32 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
@@ -22,7 +22,11 @@
 
 # direct methods
 .method public constructor <init>(ZLcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "audioDevicesState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$b.smali b/com.discord/smali/com/discord/views/OverlayMenuView$b.smali
index 094c8a9b25..db17c5687c 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$b.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$b.smali
@@ -24,13 +24,19 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/DrawableRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +47,6 @@
     iput-object p3, p0, Lcom/discord/views/OverlayMenuView$b;->c:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -75,7 +72,7 @@
 
     iget-object v1, p1, Lcom/discord/views/OverlayMenuView$b;->b:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -85,7 +82,7 @@
 
     iget-object p1, p1, Lcom/discord/views/OverlayMenuView$b;->c:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView.smali b/com.discord/smali/com/discord/views/OverlayMenuView.smali
index 228d749d96..8c567e3f6b 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView.smali
@@ -68,181 +68,127 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "networkQualityIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNetworkQualityIv()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "networkQualityIv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getNetworkQualityIv()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const/4 v2, 0x0
+    const-string v2, "guildNameTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildNameTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildNameTv"
-
-    const-string v4, "getGuildNameTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "channelNameTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelNameTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelNameTv"
-
-    const-string v4, "getChannelNameTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "inviteLinkBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteLinkBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inviteLinkBtn"
-
-    const-string v4, "getInviteLinkBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "switchChannelBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSwitchChannelBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "switchChannelBtn"
-
-    const-string v4, "getSwitchChannelBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "openAppBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOpenAppBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "openAppBtn"
-
-    const-string v4, "getOpenAppBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "srcToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSrcToggle()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "srcToggle"
-
-    const-string v4, "getSrcToggle()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "muteToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteToggle()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "muteToggle"
-
-    const-string v4, "getMuteToggle()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/OverlayMenuView;
 
-    const-class v2, Lcom/discord/views/OverlayMenuView;
+    const-string v2, "disconnectBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDisconnectBtn()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "disconnectBtn"
-
-    const-string v4, "getDisconnectBtn()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
@@ -254,9 +200,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -274,11 +222,11 @@
 
     const-string p2, "PublishSubject.create()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->d:Lrx/subjects/Subject;
 
-    const p1, 0x7f0a0676
+    const p1, 0x7f0a067c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -286,7 +234,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a066f
+    const p1, 0x7f0a0675
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -294,7 +242,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a066d
+    const p1, 0x7f0a0673
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -302,7 +250,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->g:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0671
+    const p1, 0x7f0a0677
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -310,7 +258,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->h:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0678
+    const p1, 0x7f0a067e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -318,7 +266,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->i:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0677
+    const p1, 0x7f0a067d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -326,7 +274,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->j:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a092b
+    const p1, 0x7f0a092f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -334,7 +282,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->k:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a060d
+    const p1, 0x7f0a0613
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -342,7 +290,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->l:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a02f3
+    const p1, 0x7f0a02f9
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -355,15 +303,6 @@
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->n:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic a(Lcom/discord/views/OverlayMenuView;)Landroid/widget/TextView;
@@ -624,7 +563,7 @@
     return-object v0
 .end method
 
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -670,13 +609,13 @@
 
     sget-object v4, Lf/a/n/t;->d:Lf/a/n/t;
 
-    invoke-virtual {v0, v4}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v4}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v4, "StoreStream\n        .get\u2026  }\n          }\n        }"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -686,7 +625,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v3, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
@@ -781,7 +720,7 @@
 
     const-string v4, "Observable\n        .comb\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v3, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
@@ -854,19 +793,19 @@
 
     sget-object v4, Lf/a/n/p;->d:Lf/a/n/p;
 
-    invoke-virtual {v0, v4}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v4}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v4, Lf/a/n/q;->d:Lf/a/n/q;
 
-    invoke-virtual {v0, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v4, "StoreStream\n        .get\u2026nnelPermission)\n        }"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -876,7 +815,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v3, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
@@ -908,13 +847,13 @@
 .method public onDetachedFromWindow()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/discord/views/OverlayMenuView;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lcom/discord/views/OverlayMenuView;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-super {p0}, Landroid/widget/LinearLayout;->onDetachedFromWindow()V
 
@@ -922,7 +861,7 @@
 .end method
 
 .method public final setOnDismissRequested$app_productionDiscordExternalRelease(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -932,18 +871,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->n:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/ScreenTitleView.smali b/com.discord/smali/com/discord/views/ScreenTitleView.smali
index 5ef7b73b60..0e597da227 100644
--- a/com.discord/smali/com/discord/views/ScreenTitleView.smali
+++ b/com.discord/smali/com/discord/views/ScreenTitleView.smali
@@ -21,41 +21,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/ScreenTitleView;
 
-    const-class v2, Lcom/discord/views/ScreenTitleView;
+    const-string v2, "titleTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "titleTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitleTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/ScreenTitleView;
 
-    const/4 v2, 0x0
+    const-string v2, "subtitleTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSubtitleTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/ScreenTitleView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "subtitleTv"
-
-    const-string v4, "getSubtitleTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -69,13 +57,15 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     invoke-direct {p0, p1, p2, v0}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const v1, 0x7f0a0790
+    const v1, 0x7f0a0796
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -83,7 +73,7 @@
 
     iput-object v1, p0, Lcom/discord/views/ScreenTitleView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a078f
+    const v1, 0x7f0a0795
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +111,7 @@
 
     const-string p1, "titleText"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p2}, Lcom/discord/views/ScreenTitleView;->setTitle(Ljava/lang/CharSequence;)V
 
@@ -129,15 +119,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getSubtitleTv()Landroid/widget/TextView;
@@ -197,7 +178,9 @@
 .method public final setTitle(Ljava/lang/CharSequence;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "title"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/views/ScreenTitleView;->getTitleTv()Landroid/widget/TextView;
 
@@ -206,13 +189,4 @@
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/ServerFolderView.smali b/com.discord/smali/com/discord/views/ServerFolderView.smali
index de38730995..038d81a22b 100644
--- a/com.discord/smali/com/discord/views/ServerFolderView.smali
+++ b/com.discord/smali/com/discord/views/ServerFolderView.smali
@@ -29,61 +29,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/ServerFolderView;
 
-    const-class v2, Lcom/discord/views/ServerFolderView;
+    const-string v2, "folderImg"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFolderImg()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "folderImg"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFolderImg()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/ServerFolderView;
 
-    const/4 v2, 0x0
+    const-string v2, "guildViewsContainer"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildViewsContainer()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/ServerFolderView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildViewsContainer"
-
-    const-string v4, "getGuildViewsContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/ServerFolderView;
 
-    const-class v2, Lcom/discord/views/ServerFolderView;
+    const-string v2, "guildViews"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildViews()Ljava/util/List;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildViews"
-
-    const-string v4, "getGuildViews()Ljava/util/List;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -95,17 +77,19 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 2
+    .locals 3
 
     const/4 v0, 0x4
 
     const/4 v1, 0x0
 
-    if-eqz p1, :cond_0
+    const-string v2, "context"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, v1}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p2, 0x7f0a03c5
+    const p2, 0x7f0a03cb
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +97,7 @@
 
     iput-object p2, p0, Lcom/discord/views/ServerFolderView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a049a
+    const p2, 0x7f0a04a0
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -125,7 +109,17 @@
 
     fill-array-data p2, :array_0
 
-    invoke-static {p0, p2}, Lf/n/a/k/a;->l(Landroid/view/View;[I)Lkotlin/properties/ReadOnlyProperty;
+    const-string v0, "$this$bindViews"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ids"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lm0/d;->d:Lm0/d;
+
+    invoke-static {p2, v0}, Lf/n/a/k/a;->R([ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object p2
 
@@ -141,21 +135,12 @@
 
     return-void
 
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :array_0
     .array-data 4
-        0x7f0a0494
-        0x7f0a0495
-        0x7f0a0496
-        0x7f0a0497
+        0x7f0a049a
+        0x7f0a049b
+        0x7f0a049c
+        0x7f0a049d
     .end array-data
 .end method
 
@@ -238,7 +223,7 @@
 
 # virtual methods
 .method public final b(JZLjava/util/List;Ljava/lang/Integer;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(JZ",
@@ -251,40 +236,40 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guilds"
 
-    if-eqz p4, :cond_a
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/ServerFolderView;->h:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->h:Ljava/lang/Long;
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    cmp-long v1, v4, p1
+    cmp-long v0, v3, p1
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
-    iget-boolean v1, p0, Lcom/discord/views/ServerFolderView;->i:Z
+    iget-boolean v0, p0, Lcom/discord/views/ServerFolderView;->i:Z
 
-    if-eq v1, p3, :cond_1
+    if-eq v0, p3, :cond_1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -295,9 +280,9 @@
 
     if-eqz p3, :cond_4
 
-    iput-boolean v2, p0, Lcom/discord/views/ServerFolderView;->i:Z
+    iput-boolean v1, p0, Lcom/discord/views/ServerFolderView;->i:Z
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     const p1, 0x7f010026
 
@@ -347,12 +332,12 @@
 
     invoke-static {p1, p2}, Landroidx/core/widget/ImageViewCompat;->setImageTintList(Landroid/widget/ImageView;Landroid/content/res/ColorStateList;)V
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_4
-    iput-boolean v3, p0, Lcom/discord/views/ServerFolderView;->i:Z
+    iput-boolean v2, p0, Lcom/discord/views/ServerFolderView;->i:Z
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
     const p1, 0x7f010027
 
@@ -387,6 +372,8 @@
 
     add-int/lit8 p5, p2, 0x1
 
+    const/4 v0, 0x0
+
     if-ltz p2, :cond_8
 
     check-cast p3, Lcom/discord/views/GuildView;
@@ -409,48 +396,43 @@
 
     if-eqz v1, :cond_6
 
+    const/4 v5, 0x0
+
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/16 v7, 0xc
 
-    const/16 v8, 0xc
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const-string v4, "asset://asset/images/default_icon.jpg"
 
-    const-string v5, "asset://asset/images/default_icon.jpg"
+    move-object v3, p2
 
-    move-object v4, p2
+    invoke-static/range {v3 .. v8}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
-    invoke-static/range {v4 .. v9}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_6
+    move-result-object v0
 
     :cond_6
-    move-object v1, v0
-
-    :goto_6
-    invoke-virtual {p3, v3}, Landroid/view/ViewGroup;->setVisibility(I)V
+    invoke-virtual {p3, v2}, Landroid/view/ViewGroup;->setVisibility(I)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
 
     move-result-object p2
 
-    const-string v2, "guild.shortName"
+    const-string v1, "guild.shortName"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p3, p2, v1}, Lcom/discord/views/GuildView;->a(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p3, p2, v0}, Lcom/discord/views/GuildView;->a(Ljava/lang/String;Ljava/lang/String;)V
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_7
     const/16 p2, 0x8
 
     invoke-virtual {p3, p2}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    :goto_7
+    :goto_6
     move p2, p5
 
     goto :goto_5
@@ -461,15 +443,8 @@
     throw v0
 
     :cond_9
-    :goto_8
+    :goto_7
     return-void
-
-    :cond_a
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final c()V
diff --git a/com.discord/smali/com/discord/views/StatusView.smali b/com.discord/smali/com/discord/views/StatusView.smali
index 16a54ac9b6..c443915f55 100644
--- a/com.discord/smali/com/discord/views/StatusView.smali
+++ b/com.discord/smali/com/discord/views/StatusView.smali
@@ -17,7 +17,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -104,15 +106,6 @@
     invoke-virtual {p2}, Landroid/content/res/TypedArray;->recycle()V
 
     throw p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -120,25 +113,27 @@
 .method public onDraw(Landroid/graphics/Canvas;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "canvas"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/discord/views/StatusView;->g:Z
+    iget-boolean v0, p0, Lcom/discord/views/StatusView;->g:Z
+
+    const/4 v1, 0x0
 
     const-string v2, "backgroundPaint"
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     invoke-virtual {p0}, Landroid/widget/ImageView;->getWidth()I
 
-    move-result v1
+    move-result v0
 
-    int-to-float v1, v1
+    int-to-float v0, v0
 
     const/high16 v3, 0x40000000    # 2.0f
 
-    div-float/2addr v1, v3
+    div-float/2addr v0, v3
 
     invoke-virtual {p0}, Landroid/widget/ImageView;->getHeight()I
 
@@ -160,27 +155,27 @@
 
     if-eqz v3, :cond_0
 
-    invoke-virtual {p1, v1, v4, v5, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-virtual {p1, v0, v4, v5, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
     invoke-virtual {p0}, Landroid/widget/ImageView;->getWidth()I
 
-    move-result v1
+    move-result v0
 
-    int-to-float v6, v1
+    int-to-float v6, v0
 
     invoke-virtual {p0}, Landroid/widget/ImageView;->getHeight()I
 
-    move-result v1
+    move-result v0
 
-    int-to-float v7, v1
+    int-to-float v7, v0
 
     iget v9, p0, Lcom/discord/views/StatusView;->d:F
 
@@ -204,16 +199,9 @@
     return-void
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_3
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public setBackgroundColor(I)V
@@ -283,7 +271,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const v0, 0x7f08034a
+    const v0, 0x7f08034b
 
     goto :goto_2
 
@@ -304,7 +292,7 @@
     :goto_0
     if-eqz v2, :cond_2
 
-    const v0, 0x7f0803e6
+    const v0, 0x7f0803e9
 
     goto :goto_2
 
@@ -334,22 +322,22 @@
     if-eq v0, v2, :cond_5
 
     :goto_1
-    const v0, 0x7f0803e4
+    const v0, 0x7f0803e7
 
     goto :goto_2
 
     :cond_5
-    const v0, 0x7f0803e2
+    const v0, 0x7f0803e5
 
     goto :goto_2
 
     :cond_6
-    const v0, 0x7f0803e3
+    const v0, 0x7f0803e6
 
     goto :goto_2
 
     :cond_7
-    const v0, 0x7f0803e5
+    const v0, 0x7f0803e8
 
     :goto_2
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/AppCompatImageView;->setImageResource(I)V
diff --git a/com.discord/smali/com/discord/views/StreamPreviewView.smali b/com.discord/smali/com/discord/views/StreamPreviewView.smali
index da31e1df22..31215d8347 100644
--- a/com.discord/smali/com/discord/views/StreamPreviewView.smali
+++ b/com.discord/smali/com/discord/views/StreamPreviewView.smali
@@ -13,9 +13,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -27,7 +29,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0945
+    const p1, 0x7f0a0949
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -35,13 +37,13 @@
 
     const-string p2, "findViewById(R.id.stream_preview_image)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
     iput-object p1, p0, Lcom/discord/views/StreamPreviewView;->d:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    const p1, 0x7f0a0946
+    const p1, 0x7f0a094a
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -49,13 +51,13 @@
 
     const-string p2, "findViewById(R.id.stream_preview_overlay_text)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/StreamPreviewView;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0947
+    const p1, 0x7f0a094b
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -63,7 +65,7 @@
 
     const-string p2, "findViewById(R.id.stream\u2026view_placeholder_caption)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -80,15 +82,6 @@
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->setFocusableInTouchMode(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final setCaptionText(Ljava/lang/String;)V
@@ -128,21 +121,23 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "preview"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_8
+    const-string v0, "joinability"
 
-    instance-of v1, p1, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Fetching;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    instance-of v0, p1, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Fetching;
+
+    if-eqz v0, :cond_0
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const v0, 0x7f121504
+    const v0, 0x7f12152e
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -155,17 +150,19 @@
     goto :goto_0
 
     :cond_0
-    instance-of v1, p1, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;
+    instance-of v0, p1, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;
 
-    if-eqz v1, :cond_7
+    if-eqz v0, :cond_7
 
     check-cast p1, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;->getUrl()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview$Resolved;->getUrl()Ljava/lang/String;
 
@@ -173,14 +170,14 @@
 
     invoke-direct {p0, p1}, Lcom/discord/views/StreamPreviewView;->setImage(Ljava/lang/String;)V
 
-    invoke-direct {p0, v0}, Lcom/discord/views/StreamPreviewView;->setCaptionText(Ljava/lang/String;)V
+    invoke-direct {p0, v1}, Lcom/discord/views/StreamPreviewView;->setCaptionText(Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     goto :goto_0
 
     :cond_1
-    invoke-direct {p0, v0}, Lcom/discord/views/StreamPreviewView;->setImage(Ljava/lang/String;)V
+    invoke-direct {p0, v1}, Lcom/discord/views/StreamPreviewView;->setImage(Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/utilities/streams/StreamContext$Joinability;->CAN_CONNECT:Lcom/discord/utilities/streams/StreamContext$Joinability;
 
@@ -190,7 +187,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1214fd
+    const v0, 0x7f121527
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -203,7 +200,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-direct {p0, v0}, Lcom/discord/views/StreamPreviewView;->setCaptionText(Ljava/lang/String;)V
+    invoke-direct {p0, v1}, Lcom/discord/views/StreamPreviewView;->setCaptionText(Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
@@ -212,7 +209,7 @@
 
     if-eqz p3, :cond_3
 
-    const p1, 0x7f1217d4
+    const p1, 0x7f121800
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -237,7 +234,7 @@
 
     if-ne p1, p2, :cond_4
 
-    const p1, 0x7f1203fc
+    const p1, 0x7f1203fd
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -257,7 +254,7 @@
     throw p1
 
     :cond_5
-    const p1, 0x7f12164b
+    const p1, 0x7f121675
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -270,7 +267,7 @@
     goto :goto_1
 
     :cond_6
-    const p1, 0x7f120d9c
+    const p1, 0x7f120dc2
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -292,18 +289,4 @@
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p1
-
-    :cond_8
-    const-string p1, "joinability"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "preview"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
index c199e6813b..2e1971b459 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$c.smali
@@ -55,7 +55,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali b/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
index 291f77671a..edd6280d97 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox$d.smali
@@ -55,7 +55,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox.smali b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
index 3033eaa9f2..173b689bc5 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
@@ -14,9 +14,6 @@
 
 # static fields
 .field public static final o:Lcom/discord/views/TernaryCheckBox$a;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 
 # instance fields
@@ -61,19 +58,19 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    const-string v1, "context"
-
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const/4 v2, -0x1
+    const/4 v1, -0x1
 
-    iput v2, p0, Lcom/discord/views/TernaryCheckBox;->n:I
+    iput v1, p0, Lcom/discord/views/TernaryCheckBox;->n:I
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -84,22 +81,22 @@
     :cond_0
     sget-object v4, Lcom/discord/R$a;->TernaryCheckBox:[I
 
-    invoke-virtual {p1, p2, v4, v3, v3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+    invoke-virtual {p1, p2, v4, v2, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
 
     move-result-object p2
 
     const-string v4, "context.obtainStyledAttr\u2026le.TernaryCheckBox, 0, 0)"
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    invoke-virtual {p2, v3}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+    invoke-virtual {p2, v2}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
     iput-object v4, p0, Lcom/discord/views/TernaryCheckBox;->k:Ljava/lang/String;
 
-    invoke-virtual {p2, v2}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+    invoke-virtual {p2, v1}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
 
     move-result-object v7
 
@@ -111,7 +108,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x0
 
@@ -125,15 +122,15 @@
 
     invoke-static/range {v5 .. v12}, Lcom/discord/utilities/textprocessing/Parsers;->parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_1
-    move-object v1, v0
+    move-object v0, v3
 
     :goto_0
-    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->l:Ljava/lang/CharSequence;
+    iput-object v0, p0, Lcom/discord/views/TernaryCheckBox;->l:Ljava/lang/CharSequence;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -146,61 +143,61 @@
 
     move-result-object p1
 
-    const p2, 0x7f0a0855
+    const p2, 0x7f0a085b
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.setting_label)"
+    const-string/jumbo v0, "view.findViewById(R.id.setting_label)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->d:Landroid/widget/TextView;
 
-    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->k:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->k:Ljava/lang/String;
 
     const/16 v4, 0x8
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     goto :goto_2
 
     :cond_2
-    const/16 v1, 0x8
+    const/16 v0, 0x8
 
     :goto_2
-    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setVisibility(I)V
+    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setVisibility(I)V
 
     iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->d:Landroid/widget/TextView;
 
     if-eqz p2, :cond_8
 
-    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->k:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->k:Ljava/lang/String;
 
-    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a0856
+    const p2, 0x7f0a085c
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.setting_subtext)"
+    const-string/jumbo v0, "view.findViewById(R.id.setting_subtext)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->e:Landroid/widget/TextView;
 
-    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->l:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->l:Ljava/lang/CharSequence;
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
     const/4 v4, 0x0
 
@@ -211,71 +208,71 @@
 
     if-eqz p2, :cond_7
 
-    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->l:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->l:Ljava/lang/CharSequence;
 
-    invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a0854
+    const p2, 0x7f0a085a
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.setting_disabled_overlay)"
+    const-string/jumbo v0, "view.findViewById(R.id.setting_disabled_overlay)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->i:Landroid/view/View;
 
-    const p2, 0x7f0a0665
+    const p2, 0x7f0a066b
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.off_disabled_overlay)"
+    const-string/jumbo v0, "view.findViewById(R.id.off_disabled_overlay)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->j:Landroid/view/View;
 
-    const p2, 0x7f0a0974
+    const p2, 0x7f0a0978
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.ternary_check_on)"
+    const-string/jumbo v0, "view.findViewById(R.id.ternary_check_on)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/views/CheckableImageView;
 
     iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->f:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a0973
+    const p2, 0x7f0a0977
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.ternary_check_off)"
+    const-string/jumbo v0, "view.findViewById(R.id.ternary_check_off)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/views/CheckableImageView;
 
     iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->g:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a0972
+    const p2, 0x7f0a0976
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string p2, "view.findViewById(R.id.ternary_check_neutral)"
+    const-string/jumbo p2, "view.findViewById(R.id.ternary_check_neutral)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/CheckableImageView;
 
@@ -287,7 +284,7 @@
 
     new-instance p2, Le;
 
-    invoke-direct {p2, v3, p0}, Le;-><init>(ILjava/lang/Object;)V
+    invoke-direct {p2, v2, p0}, Le;-><init>(ILjava/lang/Object;)V
 
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -297,7 +294,7 @@
 
     new-instance p2, Le;
 
-    invoke-direct {p2, v2, p0}, Le;-><init>(ILjava/lang/Object;)V
+    invoke-direct {p2, v1, p0}, Le;-><init>(ILjava/lang/Object;)V
 
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -318,37 +315,37 @@
     :cond_4
     const-string p1, "checkNeutral"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v3
 
     :cond_5
     const-string p1, "checkOff"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v3
 
     :cond_6
     const-string p1, "checkOn"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v3
 
     :cond_7
     const-string p1, "subtext"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v3
 
     :cond_8
     const-string p1, "label"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v3
 
     :catchall_0
     move-exception p1
@@ -356,11 +353,6 @@
     invoke-virtual {p2}, Landroid/content/res/TypedArray;->recycle()V
 
     throw p1
-
-    :cond_9
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic a(Lcom/discord/views/TernaryCheckBox;I)V
@@ -415,26 +407,26 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
     const-string p1, "offDisabledOverlay"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_3
     const-string p1, "checkOff"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -481,26 +473,26 @@
     return-void
 
     :cond_0
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
     const-string p1, "allDisabledOverlay"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_3
     const-string p1, "checkOff"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -573,21 +565,21 @@
     :cond_4
     const-string p1, "checkNeutral"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_5
     const-string p1, "checkOff"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_6
     const-string p1, "checkOn"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -644,21 +636,21 @@
     :cond_0
     const-string v0, "allDisabledOverlay"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
     const-string v0, "offDisabledOverlay"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
     const-string v0, "checkOff"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -722,7 +714,7 @@
 
     const-string v0, "context.getString(messageRes)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/views/TernaryCheckBox;->setDisabled(Ljava/lang/String;)V
 
@@ -742,7 +734,7 @@
 
     const-string v0, "context.getString(messageRes)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/views/TernaryCheckBox;->setOffDisabled(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
index 0654646419..a0130f7328 100644
--- a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
+++ b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
@@ -23,61 +23,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/ToolbarTitleLayout;
 
-    const-class v2, Lcom/discord/views/ToolbarTitleLayout;
+    const-string v2, "title"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "title"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitle()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/ToolbarTitleLayout;
 
-    const/4 v2, 0x0
+    const-string v2, "titleSubtext"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTitleSubtext()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/ToolbarTitleLayout;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "titleSubtext"
-
-    const-string v4, "getTitleSubtext()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/ToolbarTitleLayout;
 
-    const-class v2, Lcom/discord/views/ToolbarTitleLayout;
+    const-string v2, "statusView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusView()Lcom/discord/views/StatusView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusView"
-
-    const-string v4, "getStatusView()Lcom/discord/views/StatusView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -91,9 +73,13 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a0997
+    const p1, 0x7f0a099b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +87,7 @@
 
     iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0998
+    const p1, 0x7f0a099c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +95,7 @@
 
     iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0996
+    const p1, 0x7f0a099a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +235,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
 
diff --git a/com.discord/smali/com/discord/views/UploadProgressView.smali b/com.discord/smali/com/discord/views/UploadProgressView.smali
index 4c32f7b7e9..296d048ee2 100644
--- a/com.discord/smali/com/discord/views/UploadProgressView.smali
+++ b/com.discord/smali/com/discord/views/UploadProgressView.smali
@@ -31,7 +31,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a072f
+    const p1, 0x7f0a0735
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -39,13 +39,13 @@
 
     const-string p2, "findViewById(R.id.progress_text)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a072e
+    const p1, 0x7f0a0734
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -53,13 +53,13 @@
 
     const-string p2, "findViewById(R.id.progress_subtext)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->f:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0725
+    const p1, 0x7f0a072b
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -67,13 +67,13 @@
 
     const-string p2, "findViewById(R.id.progress_bar)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ProgressBar;
 
     iput-object p1, p0, Lcom/discord/views/UploadProgressView;->d:Landroid/widget/ProgressBar;
 
-    const p1, 0x7f0a0729
+    const p1, 0x7f0a072f
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -81,7 +81,7 @@
 
     const-string p2, "findViewById(R.id.progress_file_image)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -141,7 +141,9 @@
 .method public final a(Ljava/lang/String;ILjava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_6
+    const-string v0, "title"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/views/UploadProgressView;->e:Landroid/widget/TextView;
 
@@ -256,15 +258,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_6
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setIcon(I)V
diff --git a/com.discord/smali/com/discord/views/UserListItemView.smali b/com.discord/smali/com/discord/views/UserListItemView.smali
index 9dc19555bf..b78052677e 100644
--- a/com.discord/smali/com/discord/views/UserListItemView.smali
+++ b/com.discord/smali/com/discord/views/UserListItemView.smali
@@ -15,11 +15,13 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
+    .locals 2
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    const-string v1, "context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, v0}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -37,7 +39,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0a09c8
+    const p2, 0x7f0a09cc
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -45,13 +47,13 @@
 
     const-string v0, "content.findViewById(R.id.user_list_item_avatar)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/ImageView;
 
     iput-object p2, p0, Lcom/discord/views/UserListItemView;->d:Landroid/widget/ImageView;
 
-    const p2, 0x7f0a09c9
+    const p2, 0x7f0a09cd
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -59,13 +61,13 @@
 
     const-string v0, "content.findViewById(R.id.user_list_item_name)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/views/UserListItemView;->e:Landroid/widget/TextView;
 
-    const p2, 0x7f0a09ca
+    const p2, 0x7f0a09ce
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -73,13 +75,13 @@
 
     const-string v0, "content.findViewById(R.i\u2026list_item_name_secondary)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/views/UserListItemView;->f:Landroid/widget/TextView;
 
-    const p2, 0x7f0a09cb
+    const p2, 0x7f0a09cf
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -87,22 +89,13 @@
 
     const-string p2, "content.findViewById(R.id.user_list_item_status)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/StatusView;
 
     iput-object p1, p0, Lcom/discord/views/UserListItemView;->g:Lcom/discord/views/StatusView;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static a(Lcom/discord/views/UserListItemView;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;I)V
@@ -133,9 +126,11 @@
 
     and-int/lit8 p4, p5, 0x8
 
-    if-eqz p0, :cond_6
+    if-eqz p0, :cond_5
 
-    if-eqz p1, :cond_5
+    const-string/jumbo p4, "userNameWithDiscriminator"
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_3
 
@@ -206,13 +201,6 @@
     return-void
 
     :cond_5
-    const-string p0, "userNameWithDiscriminator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
     throw v0
 .end method
 
diff --git a/com.discord/smali/com/discord/views/UsernameView.smali b/com.discord/smali/com/discord/views/UsernameView.smali
index e9db199410..d324e37a41 100644
--- a/com.discord/smali/com/discord/views/UsernameView.smali
+++ b/com.discord/smali/com/discord/views/UsernameView.smali
@@ -21,41 +21,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/UsernameView;
 
-    const-class v2, Lcom/discord/views/UsernameView;
+    const-string/jumbo v2, "usernameTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUsernameTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "usernameTextView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUsernameTextView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/UsernameView;
 
-    const/4 v2, 0x0
+    const-string v2, "tagTextView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTagTextView()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/UsernameView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "tagTextView"
-
-    const-string v4, "getTagTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -69,11 +57,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f0a0a2a
+    const p1, 0x7f0a0a2e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -81,7 +71,7 @@
 
     iput-object p1, p0, Lcom/discord/views/UsernameView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0a29
+    const p1, 0x7f0a0a2d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -150,7 +140,7 @@
 
     const/4 p2, 0x4
 
-    const v0, 0x7f0701f4
+    const v0, 0x7f0701ed
 
     invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getResourceId(II)I
 
@@ -196,15 +186,6 @@
     :cond_0
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getTagTextView()Landroid/widget/TextView;
@@ -254,7 +235,7 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080428
+    const p1, 0x7f08042b
 
     goto :goto_0
 
@@ -332,7 +313,9 @@
 .method public final setUsernameText(Ljava/lang/CharSequence;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "usernameText"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/views/UsernameView;->getUsernameTextView()Landroid/widget/TextView;
 
@@ -341,13 +324,4 @@
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "usernameText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/VoiceUserLimitView.smali b/com.discord/smali/com/discord/views/VoiceUserLimitView.smali
index 765778f5c0..25cbf60f13 100644
--- a/com.discord/smali/com/discord/views/VoiceUserLimitView.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserLimitView.smali
@@ -27,7 +27,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -81,7 +83,7 @@
 
     invoke-static {p1, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0a6d
+    const p1, 0x7f0a0a72
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -89,13 +91,13 @@
 
     const-string v0, "findViewById(R.id.voice_user_limit_current)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/VoiceUserLimitView;->d:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0a6e
+    const p1, 0x7f0a0a73
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -103,27 +105,27 @@
 
     const-string v0, "findViewById(R.id.voice_user_limit_max)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/VoiceUserLimitView;->e:Landroid/widget/TextView;
 
-    const/high16 p1, 0x40c00000    # 6.0f
-
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v0
+    move-result-object p1
 
-    const-string v1, "resources"
+    const-string v0, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
+    invoke-virtual {p1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-static {p2, p1, v0}, Landroid/util/TypedValue;->applyDimension(IFLandroid/util/DisplayMetrics;)F
+    const/high16 v0, 0x40c00000    # 6.0f
+
+    invoke-static {p2, v0, p1}, Landroid/util/TypedValue;->applyDimension(IFLandroid/util/DisplayMetrics;)F
 
     move-result p1
 
@@ -170,15 +172,6 @@
     invoke-virtual {p1, p2}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getVideoCamDrawable()Landroid/graphics/drawable/Drawable;
@@ -290,7 +283,7 @@
 
     invoke-super {p0, p1}, Landroid/widget/LinearLayout;->dispatchDraw(Landroid/graphics/Canvas;)V
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getHeight()I
 
@@ -397,11 +390,4 @@
     invoke-virtual {p1}, Landroid/graphics/Path;->reset()V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$b.smali b/com.discord/smali/com/discord/views/VoiceUserView$b.smali
index 05398b2b97..4eddcfb50c 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$b.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/views/VoiceUserView$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceUserView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "$this$resizeLayoutParams"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -98,13 +100,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "$this$resizeLayoutParams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/VoiceUserView$c.smali b/com.discord/smali/com/discord/views/VoiceUserView$c.smali
index 8d0bad097b..59d80d5e05 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView$c.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/views/VoiceUserView$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceUserView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/facebook/imagepipeline/request/ImageRequestBuilder;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
-    if-eqz p1, :cond_0
+    const-string v0, "imageRequestBuilder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/n/j0;
 
@@ -62,13 +64,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "imageRequestBuilder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/VoiceUserView.smali b/com.discord/smali/com/discord/views/VoiceUserView.smali
index 828beeb881..4254180d76 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView.smali
@@ -49,41 +49,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/VoiceUserView;
 
-    const-class v2, Lcom/discord/views/VoiceUserView;
+    const-string v2, "avatar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "avatar"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/VoiceUserView;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "username"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUsername()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/VoiceUserView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "username"
-
-    const-string v4, "getUsername()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -97,13 +85,15 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     invoke-direct {p0, p1, p2, v0}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const v1, 0x7f0a0a6c
+    const v1, 0x7f0a0a71
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,7 +101,7 @@
 
     iput-object v1, p0, Lcom/discord/views/VoiceUserView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0a7a
+    const v1, 0x7f0a0a7f
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,15 +153,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic b(Lcom/discord/views/VoiceUserView;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;II)V
@@ -338,7 +319,7 @@
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f0801c9
+    const v0, 0x7f0801ca
 
     :goto_0
     invoke-virtual {p0, v0}, Landroid/widget/FrameLayout;->setBackgroundResource(I)V
@@ -385,17 +366,17 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "voiceUser"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/VoiceUserView;->h:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->h:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     return-void
 
@@ -404,19 +385,21 @@
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v0, p2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
-    if-lez v1, :cond_2
+    if-lez v0, :cond_2
 
-    invoke-static {v1}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
+    invoke-static {v0}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
 
-    move-result v1
+    move-result v0
 
     iget-object v3, p0, Lcom/discord/views/VoiceUserView;->h:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
@@ -429,39 +412,39 @@
     goto :goto_0
 
     :cond_1
-    move-object v3, v0
+    move-object v3, v2
 
     :goto_0
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v0
 
     const/4 v4, 0x2
 
-    invoke-static {v3, v2, v1, v4, v0}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    invoke-static {v3, v1, v0, v4, v2}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    iget-object v1, p0, Lcom/discord/views/VoiceUserView;->h:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->h:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_1
 
     :cond_3
-    move-object v1, v0
+    move-object v0, v2
 
     :goto_1
     const/4 v3, 0x6
 
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -470,7 +453,7 @@
 
     iget-object v0, p0, Lcom/discord/views/VoiceUserView;->j:Ljava/lang/String;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -512,13 +495,6 @@
     invoke-direct {p0, p1}, Lcom/discord/views/VoiceUserView;->setVoiceState(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
 
     return-void
-
-    :cond_5
-    const-string p1, "voiceUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setAvatarSize(I)V
@@ -548,7 +524,7 @@
 .end method
 
 .method public final setOnBitmapLoadedListener(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -560,20 +536,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onBitmapLoadedListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/VoiceUserView;->i:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onBitmapLoadedListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setSelected(Z)V
diff --git a/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali b/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali
index e9e179a79a..71932a0a92 100644
--- a/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali
+++ b/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali
@@ -25,81 +25,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
 
-    const-class v2, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
+    const-string v2, "searchButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "searchButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSearchButton()Lcom/google/android/material/button/MaterialButton;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
 
-    const/4 v2, 0x0
+    const-string v2, "pinsButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getPinsButton()Lcom/google/android/material/button/MaterialButton;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "pinsButton"
-
-    const-string v4, "getPinsButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
 
-    const-class v2, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
+    const-string v2, "notificationsButtons"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsButtons()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsButtons"
-
-    const-string v4, "getNotificationsButtons()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
 
-    const-class v2, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
+    const-string v2, "settingsButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsButton"
-
-    const-string v4, "getSettingsButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -113,11 +89,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a01b3
+    const p2, 0x7f0a01b6
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -125,7 +103,7 @@
 
     iput-object p2, p0, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a01b2
+    const p2, 0x7f0a01b5
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -133,7 +111,7 @@
 
     iput-object p2, p0, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a01b1
+    const p2, 0x7f0a01b4
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +119,7 @@
 
     iput-object p2, p0, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a01b4
+    const p2, 0x7f0a01b7
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -170,15 +148,6 @@
     invoke-virtual/range {v0 .. v6}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getNotificationsButtons()Lcom/google/android/material/button/MaterialButton;
@@ -291,17 +260,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onSearchClicked"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "onNotificationsClicked"
 
-    if-eqz p3, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "onPinsClicked"
 
-    const/4 v1, 0x2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onSettingsClicked"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x2
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
@@ -309,7 +286,7 @@
 
     const p5, 0x7f0402c0
 
-    invoke-static {p0, p5, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, p5, v1, v0, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result p5
 
@@ -318,7 +295,7 @@
     :cond_0
     const p5, 0x7f0402bf
 
-    invoke-static {p0, p5, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, p5, v1, v0, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result p5
 
@@ -327,39 +304,39 @@
 
     const v3, 0x7f0402bd
 
-    invoke-static {p0, v3, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, v3, v1, v0, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
-    move-result v1
+    move-result v0
 
     goto :goto_1
 
     :cond_1
     const v3, 0x7f0402be
 
-    invoke-static {p0, v3, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, v3, v1, v0, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
-    move-result v1
+    move-result v0
 
     :goto_1
     invoke-direct {p0}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->getSearchButton()Lcom/google/android/material/button/MaterialButton;
 
-    move-result-object v2
+    move-result-object v1
 
     new-instance v3, Lf/a/n/k0/e;
 
     invoke-direct {v3, p1}, Lf/a/n/k0/e;-><init>(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-virtual {v2, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->getSettingsButton()Lcom/google/android/material/button/MaterialButton;
 
     move-result-object p1
 
-    new-instance v2, Lf/a/n/k0/e;
+    new-instance v1, Lf/a/n/k0/e;
 
-    invoke-direct {v2, p4}, Lf/a/n/k0/e;-><init>(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v1, p4}, Lf/a/n/k0/e;-><init>(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-virtual {p1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->getPinsButton()Lcom/google/android/material/button/MaterialButton;
 
@@ -373,7 +350,7 @@
 
     move-result-object p4
 
-    invoke-static {p1, v0, p4, v0, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+    invoke-static {p1, v2, p4, v2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
     new-instance p4, Lf/a/n/k0/f;
 
@@ -389,11 +366,11 @@
 
     move-result-object p3
 
-    invoke-virtual {p3, v1}, Landroid/content/Context;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p3, v0}, Landroid/content/Context;->getDrawable(I)Landroid/graphics/drawable/Drawable;
 
     move-result-object p3
 
-    invoke-static {p1, v0, p3, v0, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+    invoke-static {p1, v2, p3, v2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
     new-instance p3, Lf/a/n/k0/f;
 
@@ -407,7 +384,7 @@
 
     move-result-object p2
 
-    const p3, 0x7f121005
+    const p3, 0x7f12102f
 
     invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -420,7 +397,7 @@
 
     move-result-object p2
 
-    const p3, 0x7f121004
+    const p3, 0x7f12102e
 
     invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -430,32 +407,4 @@
     invoke-virtual {p1, p2}, Landroid/widget/Button;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "onSettingsClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "onPinsClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "onNotificationsClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "onSearchClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali b/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali
index 6baa92ec2d..9b02bcdd50 100644
--- a/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali
+++ b/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali
@@ -25,81 +25,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
 
-    const-class v2, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
+    const-string v2, "callButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCallButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "callButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCallButton()Lcom/google/android/material/button/MaterialButton;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "videoButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getVideoButton()Lcom/google/android/material/button/MaterialButton;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "videoButton"
-
-    const-string v4, "getVideoButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
 
-    const-class v2, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
+    const-string v2, "notificationsButtons"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsButtons()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsButtons"
-
-    const-string v4, "getNotificationsButtons()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
 
-    const-class v2, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
+    const-string v2, "searchButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchButton"
-
-    const-string v4, "getSearchButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -113,11 +89,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a0721
+    const p2, 0x7f0a0727
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -125,7 +103,7 @@
 
     iput-object p2, p0, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0724
+    const p2, 0x7f0a072a
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -133,7 +111,7 @@
 
     iput-object p2, p0, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0722
+    const p2, 0x7f0a0728
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +119,7 @@
 
     iput-object p2, p0, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0723
+    const p2, 0x7f0a0729
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -168,15 +146,6 @@
     invoke-virtual/range {v0 .. v5}, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getCallButton()Lcom/google/android/material/button/MaterialButton;
@@ -289,17 +258,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onCallClicked"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "onVideoClicked"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "onNotificationsClicked"
 
-    const/4 v1, 0x2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onSearchClicked"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x2
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
@@ -307,7 +284,7 @@
 
     const p5, 0x7f0402bd
 
-    invoke-static {p0, p5, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, p5, v1, v0, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result p5
 
@@ -316,30 +293,30 @@
     :cond_0
     const p5, 0x7f0402be
 
-    invoke-static {p0, p5, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, p5, v1, v0, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result p5
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->getCallButton()Lcom/google/android/material/button/MaterialButton;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lf/a/n/k0/k;
+    new-instance v1, Lf/a/n/k0/k;
 
-    invoke-direct {v2, p1}, Lf/a/n/k0/k;-><init>(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v1, p1}, Lf/a/n/k0/k;-><init>(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->getVideoButton()Lcom/google/android/material/button/MaterialButton;
 
     move-result-object p1
 
-    new-instance v1, Lf/a/n/k0/k;
+    new-instance v0, Lf/a/n/k0/k;
 
-    invoke-direct {v1, p2}, Lf/a/n/k0/k;-><init>(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, p2}, Lf/a/n/k0/k;-><init>(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-virtual {p1, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->getNotificationsButtons()Lcom/google/android/material/button/MaterialButton;
 
@@ -353,7 +330,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, v0, p2, v0, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+    invoke-static {p1, v2, p2, v2, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
     new-instance p2, Lf/a/n/k0/l;
 
@@ -372,32 +349,4 @@
     invoke-virtual {p1, p2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "onSearchClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onNotificationsClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "onVideoClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "onCallClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/views/premium/AccountCreditView.smali b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
index 91e42e3c28..87bd0d45f9 100644
--- a/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
+++ b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
@@ -15,11 +15,13 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
+    .locals 2
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    const-string v1, "context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, v0}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -27,7 +29,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a02ac
+    const p1, 0x7f0a02af
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -37,7 +39,7 @@
 
     iput-object p1, p0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView;
 
-    const p1, 0x7f0a02ab
+    const p1, 0x7f0a02ae
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -47,7 +49,7 @@
 
     iput-object p1, p0, Lcom/discord/views/premium/AccountCreditView;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a02ad
+    const p1, 0x7f0a02b0
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -57,7 +59,7 @@
 
     iput-object p1, p0, Lcom/discord/views/premium/AccountCreditView;->f:Landroid/widget/TextView;
 
-    const p1, 0x7f0a02b2
+    const p1, 0x7f0a02b5
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -68,15 +70,6 @@
     iput-object p1, p0, Lcom/discord/views/premium/AccountCreditView;->g:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -125,7 +118,7 @@
 
     move-result-wide v4
 
-    const v6, 0x7f121251
+    const v6, 0x7f12127c
 
     const-string v7, "header"
 
@@ -137,7 +130,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f121272
+    const v5, 0x7f12129d
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -145,7 +138,7 @@
 
     const-string v5, "context.getString(R.string.premium_tier_1)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView;
 
@@ -155,7 +148,7 @@
 
     iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->e:Landroid/widget/TextView;
 
-    invoke-static {v5, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -188,7 +181,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f121273
+    const v5, 0x7f12129e
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -196,7 +189,7 @@
 
     const-string v5, "context.getString(R.string.premium_tier_2)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView;
 
@@ -206,7 +199,7 @@
 
     iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->e:Landroid/widget/TextView;
 
-    invoke-static {v5, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -252,7 +245,7 @@
 
     move-result-object v12
 
-    invoke-static {v12, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v12, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v13, 0x0
 
@@ -270,13 +263,13 @@
 
     iget-object v7, v0, Lcom/discord/views/premium/AccountCreditView;->f:Landroid/widget/TextView;
 
-    invoke-static {v7, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object v6
 
-    const v8, 0x7f121253
+    const v8, 0x7f12127e
 
     new-array v9, v2, [Ljava/lang/Object;
 
@@ -293,13 +286,13 @@
     :cond_5
     iget-object v7, v0, Lcom/discord/views/premium/AccountCreditView;->f:Landroid/widget/TextView;
 
-    invoke-static {v7, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object v6
 
-    const v8, 0x7f121252
+    const v8, 0x7f12127d
 
     new-array v9, v2, [Ljava/lang/Object;
 
@@ -316,7 +309,7 @@
 
     const-string v6, "timeText"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
 
@@ -324,15 +317,15 @@
 
     const-string v7, "resources"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object v7
 
-    invoke-static {v7, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f1000ec
+    const v5, 0x7f1000ee
 
     new-array v2, v2, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
index 58b89b0f85..d84f179196 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
@@ -25,9 +25,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/cardview/widget/CardView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -39,7 +41,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a06c2
+    const p1, 0x7f0a06c8
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -47,13 +49,13 @@
 
     const-string p2, "findViewById(R.id.premiu\u2026uild_confirmation_avatar)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->d:Landroid/widget/ImageView;
 
-    const p1, 0x7f0a06c3
+    const p1, 0x7f0a06c9
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -61,13 +63,13 @@
 
     const-string p2, "findViewById(R.id.premiu\u2026_confirmation_guild_name)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a06c6
+    const p1, 0x7f0a06cc
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -75,13 +77,13 @@
 
     const-string p2, "findViewById(R.id.premiu\u2026nfirmation_upgrade_arrow)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->f:Landroid/widget/ImageView;
 
-    const p1, 0x7f0a06c4
+    const p1, 0x7f0a06ca
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -89,13 +91,13 @@
 
     const-string p2, "findViewById(R.id.premiu\u2026tion_level_info_previous)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/chip/Chip;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->g:Lcom/google/android/material/chip/Chip;
 
-    const p1, 0x7f0a06c5
+    const p1, 0x7f0a06cb
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -103,22 +105,13 @@
 
     const-string p2, "findViewById(R.id.premiu\u2026ation_level_info_upgrade)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/chip/Chip;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->h:Lcom/google/android/material/chip/Chip;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -130,7 +123,9 @@
 
     sget-object v1, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView$a;->f:Lcom/discord/views/premiumguild/PremiumGuildConfirmationView$a;
 
-    if-eqz p1, :cond_9
+    const-string v2, "guild"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
 
@@ -343,15 +338,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/CheckBox;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_9
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final b(I)I
@@ -384,7 +370,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f04025c
 
@@ -399,7 +385,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f04025b
 
@@ -414,7 +400,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f04025a
 
@@ -425,7 +411,7 @@
     goto :goto_0
 
     :cond_3
-    const v0, 0x7f080300
+    const v0, 0x7f080301
 
     :goto_0
     return v0
@@ -457,7 +443,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121217
+    const v0, 0x7f121242
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -470,7 +456,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121216
+    const v0, 0x7f121241
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -483,7 +469,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121215
+    const v0, 0x7f121240
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -496,16 +482,16 @@
 
     move-result-object p1
 
-    const v0, 0x7f121194
+    const v0, 0x7f1211bf
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
     :goto_0
-    const-string v0, "when (premiumTier) {\n   \u2026       else -> \"\"\n      }"
+    const-string/jumbo v0, "when (premiumTier) {\n   \u2026       else -> \"\"\n      }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
index 2c3bcac74e..576cf3cfaa 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
@@ -13,9 +13,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -27,7 +29,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a072a
+    const p1, 0x7f0a0730
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -37,7 +39,7 @@
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildProgressView;->d:Landroid/widget/ImageView;
 
-    const p1, 0x7f0a072c
+    const p1, 0x7f0a0732
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -47,7 +49,7 @@
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildProgressView;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a072d
+    const p1, 0x7f0a0733
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -58,15 +60,6 @@
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildProgressView;->f:Landroid/widget/ProgressBar;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -95,17 +88,17 @@
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f08024d
+    const v1, 0x7f08024e
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f08024c
+    const v1, 0x7f08024d
 
     goto :goto_0
 
     :cond_2
-    const v1, 0x7f08024b
+    const v1, 0x7f08024c
 
     goto :goto_0
 
@@ -116,7 +109,7 @@
 
     const-string v6, "context"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v6, 0x7f04007c
 
@@ -133,7 +126,7 @@
 
     const-string v1, "levelText"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_7
 
@@ -152,7 +145,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121217
+    const v2, 0x7f121242
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -165,7 +158,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121216
+    const v2, 0x7f121241
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -178,7 +171,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121215
+    const v2, 0x7f121240
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -191,7 +184,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121194
+    const v2, 0x7f1211bf
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -204,7 +197,7 @@
 
     const-string v1, "progress"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
index 15a4d466af..66854a4881 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
@@ -15,7 +15,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -25,7 +27,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0a46
+    const p1, 0x7f0a0a4a
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -33,13 +35,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026m_upsell_info_subheading)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/app/AppTextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
 
-    const p1, 0x7f0a0a48
+    const p1, 0x7f0a0a4c
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -47,13 +49,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026ll_info_subheading_price)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0a47
+    const p1, 0x7f0a0a4b
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -61,22 +63,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026ll_info_subheading_blurb)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->f:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -86,9 +79,13 @@
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_4
+    const-string/jumbo v1, "userPremiumTier"
 
-    iget-object v2, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->f:Landroid/widget/TextView;
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->f:Landroid/widget/TextView;
 
     const/4 v3, 0x0
 
@@ -102,11 +99,11 @@
     const/16 v4, 0x8
 
     :goto_0
-    invoke-virtual {v2, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    new-array v4, v2, [Ljava/lang/Object;
+    new-array v4, v1, [Ljava/lang/Object;
 
     sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -120,7 +117,7 @@
 
     const-string v7, "context"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v5, v6}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -134,7 +131,7 @@
 
     move-result-object v4
 
-    new-array v6, v2, [Ljava/lang/Object;
+    new-array v6, v1, [Ljava/lang/Object;
 
     sget-object v8, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -154,7 +151,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v8, v9}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -166,9 +163,9 @@
 
     move-result-object v5
 
-    const v6, 0x7f120ae1
+    const v6, 0x7f120b07
 
-    new-array v8, v2, [Ljava/lang/Object;
+    new-array v8, v1, [Ljava/lang/Object;
 
     invoke-static {}, Ljava/text/NumberFormat;->getPercentInstance()Ljava/text/NumberFormat;
 
@@ -186,7 +183,7 @@
 
     const-string v10, "NumberFormat.getPercentI\u2026ISCOUNT_PERCENT\n        )"
 
-    invoke-static {v9, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     aput-object v9, v8, v3
 
@@ -200,9 +197,9 @@
 
     move-result-object v9
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v10, 0x7f120aea
+    const v10, 0x7f120b10
 
     const/4 v15, 0x2
 
@@ -210,7 +207,7 @@
 
     aput-object v5, v11, v3
 
-    aput-object v4, v11, v2
+    aput-object v4, v11, v1
 
     invoke-static {v0, v10, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -234,7 +231,7 @@
 
     const/4 v5, 0x0
 
-    const/4 v1, 0x2
+    const/4 v3, 0x2
 
     move-object v15, v5
 
@@ -244,18 +241,18 @@
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v8
+    move-result v2
 
-    if-eqz v8, :cond_3
+    if-eqz v2, :cond_3
 
-    if-eq v8, v2, :cond_2
+    if-eq v2, v1, :cond_2
 
-    if-eq v8, v1, :cond_1
+    if-eq v2, v3, :cond_1
 
     goto :goto_1
 
     :cond_1
-    iget-object v4, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
+    iget-object v2, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
 
     sget-object v8, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
@@ -263,21 +260,23 @@
 
     move-result-object v9
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v7, 0x7f120aef
+    const v4, 0x7f120b15
 
-    new-array v10, v1, [Ljava/lang/Object;
+    new-array v7, v3, [Ljava/lang/Object;
 
-    invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v3
 
-    aput-object v1, v10, v3
+    const/4 v10, 0x0
 
-    aput-object v6, v10, v2
+    aput-object v3, v7, v10
 
-    invoke-static {v0, v7, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v6, v7, v1
+
+    invoke-static {v0, v4, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v10
 
@@ -295,7 +294,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v4, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->e:Landroid/widget/TextView;
 
@@ -304,7 +303,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
+    iget-object v2, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
 
     sget-object v8, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
@@ -312,15 +311,17 @@
 
     move-result-object v9
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120aed
+    const v3, 0x7f120b13
 
-    new-array v2, v2, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
-    aput-object v6, v2, v3
+    const/4 v4, 0x0
 
-    invoke-static {v0, v4, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v6, v1, v4
+
+    invoke-static {v0, v3, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v10
 
@@ -336,9 +337,9 @@
 
     invoke-static/range {v8 .. v15}, Lcom/discord/utilities/textprocessing/Parsers;->parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->e:Landroid/widget/TextView;
 
@@ -347,21 +348,23 @@
     goto :goto_1
 
     :cond_3
-    iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
+    iget-object v2, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
 
-    const v5, 0x7f120ae9
+    const v3, 0x7f120b0f
 
-    new-array v2, v2, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
-    aput-object v4, v2, v3
+    const/4 v5, 0x0
 
-    invoke-static {v0, v5, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v4, v1, v5
 
-    move-result-object v2
+    invoke-static {v0, v3, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    new-array v3, v3, [Ljava/lang/Object;
+    move-result-object v1
 
-    invoke-virtual {v1, v2, v3}, Lcom/discord/app/AppTextView;->b(Ljava/lang/String;[Ljava/lang/Object;)V
+    new-array v3, v5, [Ljava/lang/Object;
+
+    invoke-virtual {v2, v1, v3}, Lcom/discord/app/AppTextView;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
     iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->e:Landroid/widget/TextView;
 
@@ -371,13 +374,4 @@
 
     :goto_1
     return-void
-
-    :cond_4
-    const/4 v2, 0x0
-
-    const-string v1, "userPremiumTier"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
index 04384c0aa3..4b7a320b7f 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
@@ -27,7 +27,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -37,7 +39,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0a43
+    const p1, 0x7f0a0a47
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -45,13 +47,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026ing_nitro_boost_discount)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->d:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0a42
+    const p1, 0x7f0a0a46
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -59,13 +61,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026keting_nitro_boost_count)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0a45
+    const p1, 0x7f0a0a49
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -73,13 +75,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026o_classic_boost_discount)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->f:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0a44
+    const p1, 0x7f0a0a48
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -87,13 +89,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026itro_classic_boost_count)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0a3e
+    const p1, 0x7f0a0a42
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -101,11 +103,11 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026ium_marketing_learn_more)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->h:Landroid/view/View;
 
-    const p1, 0x7f0a0a3f
+    const p1, 0x7f0a0a43
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -113,37 +115,37 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026ting_marketing_container)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View;
 
-    const p1, 0x7f0a0a3d
-
-    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.view_p\u2026arketing_container_tier1)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View;
-
     const p1, 0x7f0a0a41
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
+    const-string p2, "findViewById(R.id.view_p\u2026arketing_container_tier1)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View;
+
+    const p1, 0x7f0a0a45
+
+    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string p2, "findViewById(R.id.view_p\u2026arketing_marketing_title)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0a40
+    const p1, 0x7f0a0a44
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -151,22 +153,13 @@
 
     const-string p2, "findViewById(R.id.view_p\u2026eting_marketing_subtitle)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -183,129 +176,131 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string/jumbo v0, "userPremiumTier"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onlearnMoreClickCallback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    const v1, 0x7f100089
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    new-array v2, v1, [Ljava/lang/Object;
 
-    new-array v3, v2, [Ljava/lang/Object;
+    const/4 v3, 0x2
 
-    const/4 v4, 0x2
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v4
 
-    move-result-object v5
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    aput-object v4, v2, v5
 
-    aput-object v5, v3, v6
+    const v4, 0x7f10008b
 
-    invoke-virtual {v0, v1, v4, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v4, v3, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
-    const-string v1, "resources.getQuantityStr\u2026PTIONS_WITH_PREMIUM\n    )"
+    const-string v2, "resources.getQuantityStr\u2026PTIONS_WITH_PREMIUM\n    )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->d:Landroid/widget/TextView;
+    iget-object v2, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->d:Landroid/widget/TextView;
 
-    new-array v3, v2, [Ljava/lang/Object;
+    new-array v4, v1, [Ljava/lang/Object;
 
     invoke-static {}, Ljava/text/NumberFormat;->getPercentInstance()Ljava/text/NumberFormat;
 
-    move-result-object v5
+    move-result-object v6
 
     const v7, 0x3e99999a    # 0.3f
 
     invoke-static {v7}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-virtual {v5, v8}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v6, v7}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v6
 
     const-string v8, "NumberFormat.getPercentI\u2026ISCOUNT_PERCENT\n        )"
 
-    invoke-static {v5, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    aput-object v5, v3, v6
+    aput-object v6, v4, v5
 
-    const v5, 0x7f120ae1
+    const v6, 0x7f120b07
 
-    invoke-static {p0, v5, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0, v6, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView;
+    iget-object v2, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView;
 
-    const v3, 0x7f120ae3
+    new-array v4, v1, [Ljava/lang/Object;
 
-    new-array v9, v2, [Ljava/lang/Object;
+    aput-object v0, v4, v5
 
-    aput-object v0, v9, v6
+    const v9, 0x7f120b09
 
-    invoke-static {p0, v3, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0, v9, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->f:Landroid/widget/TextView;
+    iget-object v2, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->f:Landroid/widget/TextView;
 
-    new-array v3, v2, [Ljava/lang/Object;
+    new-array v4, v1, [Ljava/lang/Object;
 
     invoke-static {}, Ljava/text/NumberFormat;->getPercentInstance()Ljava/text/NumberFormat;
 
     move-result-object v9
 
-    invoke-static {v7}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object v7
-
     invoke-virtual {v9, v7}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    aput-object v7, v3, v6
+    aput-object v7, v4, v5
 
-    invoke-static {p0, v5, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0, v6, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView;
+    iget-object v2, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView;
 
-    const v3, 0x7f120ae2
+    new-array v4, v1, [Ljava/lang/Object;
 
-    new-array v5, v2, [Ljava/lang/Object;
+    aput-object v0, v4, v5
 
-    aput-object v0, v5, v6
+    const v0, 0x7f120b08
 
-    invoke-static {p0, v3, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p0, v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v0, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->h:Landroid/view/View;
 
-    new-instance v1, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a;
+    new-instance v2, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a;
 
-    invoke-direct {v1, p2}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v2, p2}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
@@ -315,9 +310,9 @@
 
     if-eqz p1, :cond_2
 
-    if-eq p1, v2, :cond_1
+    if-eq p1, v1, :cond_1
 
-    if-eq p1, v4, :cond_0
+    if-eq p1, v3, :cond_0
 
     goto :goto_0
 
@@ -331,7 +326,7 @@
     :cond_1
     iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View;
 
-    invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v5}, Landroid/view/View;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View;
 
@@ -339,7 +334,7 @@
 
     iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
 
-    const p2, 0x7f120ae6
+    const p2, 0x7f120b0c
 
     invoke-static {p0, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -349,15 +344,15 @@
 
     iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView;
 
-    const p2, 0x7f120ae7
+    const p2, 0x7f120b0d
 
-    new-array v0, v2, [Ljava/lang/Object;
+    new-array v0, v1, [Ljava/lang/Object;
 
-    invoke-static {v4}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
     move-result-object v1
 
-    aput-object v1, v0, v6
+    aput-object v1, v0, v5
 
     invoke-static {p0, p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -370,15 +365,15 @@
     :cond_2
     iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View;
 
-    invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v5}, Landroid/view/View;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View;
 
-    invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v5}, Landroid/view/View;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
 
-    const v0, 0x7f120ae5
+    const v0, 0x7f120b0b
 
     invoke-static {p0, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -392,13 +387,4 @@
 
     :goto_0
     return-void
-
-    :cond_3
-    const-string p1, "userPremiumTier"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$a.smali b/com.discord/smali/com/discord/views/steps/StepsView$a.smali
index 1bf1b0753e..43a6977bd2 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$a.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$a.smali
@@ -75,7 +75,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -113,7 +113,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
index bab5aa0174..09ddf2ebf5 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
@@ -72,24 +72,26 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
-    .locals 18
+    .locals 17
 
     move-object/from16 v10, p0
 
+    move-object/from16 v11, p1
+
     move/from16 v0, p10
 
     and-int/lit8 v1, v0, 0x2
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f120f70
+    const v1, 0x7f120f9a
 
-    const v11, 0x7f120f70
+    const v12, 0x7f120f9a
 
     goto :goto_0
 
     :cond_0
-    move/from16 v11, p2
+    move/from16 v12, p2
 
     :goto_0
     and-int/lit8 v1, v0, 0x4
@@ -98,39 +100,39 @@
 
     const v1, 0x7f12027c
 
-    const v12, 0x7f12027c
+    const v13, 0x7f12027c
 
     goto :goto_1
 
     :cond_1
-    move/from16 v12, p3
+    move/from16 v13, p3
 
     :goto_1
     and-int/lit8 v1, v0, 0x8
 
     if-eqz v1, :cond_2
 
-    const v1, 0x7f1205c6
+    const v1, 0x7f1205c8
 
-    const v13, 0x7f1205c6
+    const v14, 0x7f1205c8
 
     goto :goto_2
 
     :cond_2
-    move/from16 v13, p4
+    move/from16 v14, p4
 
     :goto_2
     and-int/lit8 v1, v0, 0x10
 
-    const/4 v14, 0x0
+    const/4 v15, 0x0
 
     and-int/lit8 v1, v0, 0x20
 
-    const/4 v15, 0x0
+    const/4 v9, 0x0
 
     and-int/lit8 v1, v0, 0x40
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     and-int/lit16 v1, v0, 0x80
 
@@ -138,47 +140,49 @@
 
     if-eqz v1, :cond_3
 
-    const/4 v8, 0x1
+    const/4 v7, 0x1
 
     goto :goto_3
 
     :cond_3
-    move/from16 v8, p8
+    move/from16 v7, p8
 
     :goto_3
     and-int/lit16 v0, v0, 0x100
 
     if-eqz v0, :cond_4
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     goto :goto_4
 
     :cond_4
-    move/from16 v7, p9
+    move/from16 v6, p9
 
     :goto_4
+    const-string v0, "fragment"
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/16 v16, 0x0
 
     move-object/from16 v0, p0
 
-    move v1, v11
+    move v1, v12
 
-    move v2, v12
+    move v2, v13
 
-    move v3, v13
+    move v3, v14
 
-    move-object v4, v14
+    move-object v4, v15
 
-    move-object v5, v15
+    move-object v5, v9
 
-    move-object v6, v9
+    move/from16 p2, v6
 
-    move/from16 p2, v7
+    move-object v6, v8
 
-    move v7, v8
-
-    move/from16 v17, v8
+    move/from16 p3, v7
 
     move/from16 v8, p2
 
@@ -186,25 +190,25 @@
 
     invoke-direct/range {v0 .. v9}, Lcom/discord/views/steps/StepsView$b;-><init>(IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    move-object/from16 v0, p1
+    iput-object v11, v10, Lcom/discord/views/steps/StepsView$b$a;->i:Ljava/lang/Class;
 
-    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->i:Ljava/lang/Class;
+    iput v12, v10, Lcom/discord/views/steps/StepsView$b$a;->j:I
 
-    iput v11, v10, Lcom/discord/views/steps/StepsView$b$a;->j:I
+    iput v13, v10, Lcom/discord/views/steps/StepsView$b$a;->k:I
 
-    iput v12, v10, Lcom/discord/views/steps/StepsView$b$a;->k:I
+    iput v14, v10, Lcom/discord/views/steps/StepsView$b$a;->l:I
 
-    iput v13, v10, Lcom/discord/views/steps/StepsView$b$a;->l:I
+    iput-object v15, v10, Lcom/discord/views/steps/StepsView$b$a;->m:Lkotlin/jvm/functions/Function1;
 
-    iput-object v14, v10, Lcom/discord/views/steps/StepsView$b$a;->m:Lkotlin/jvm/functions/Function1;
+    const/4 v0, 0x0
 
-    iput-object v15, v10, Lcom/discord/views/steps/StepsView$b$a;->n:Lkotlin/jvm/functions/Function1;
+    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->n:Lkotlin/jvm/functions/Function1;
 
     const/4 v0, 0x0
 
     iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->o:Lkotlin/jvm/functions/Function1;
 
-    move/from16 v2, v17
+    move/from16 v2, p3
 
     iput-boolean v2, v10, Lcom/discord/views/steps/StepsView$b$a;->p:Z
 
@@ -232,7 +236,7 @@
 
     iget-object v1, p1, Lcom/discord/views/steps/StepsView$b$a;->i:Ljava/lang/Class;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -260,7 +264,7 @@
 
     iget-object v1, p1, Lcom/discord/views/steps/StepsView$b$a;->m:Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -270,7 +274,7 @@
 
     iget-object v1, p1, Lcom/discord/views/steps/StepsView$b$a;->n:Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -280,7 +284,7 @@
 
     iget-object v1, p1, Lcom/discord/views/steps/StepsView$b$a;->o:Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali
index b4517cd79b..4d3ed7d7da 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali
@@ -93,7 +93,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -101,7 +101,7 @@
 
     iget-object v0, p1, Lcom/discord/views/steps/StepsView$b$b;->n:Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -109,7 +109,7 @@
 
     iget-object v0, p1, Lcom/discord/views/steps/StepsView$b$b;->o:Lkotlin/jvm/functions/Function1;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$d.smali b/com.discord/smali/com/discord/views/steps/StepsView$d.smali
index c7ed2d64cd..5b2c0ac7fd 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$d.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$d.smali
@@ -29,7 +29,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/fragment/app/FragmentManager;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/fragment/app/FragmentStatePagerAdapter;-><init>(Landroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$f.smali b/com.discord/smali/com/discord/views/steps/StepsView$f.smali
index 19f1e10323..6ecbc69943 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$f.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$f.smali
@@ -65,7 +65,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/views/steps/StepsView.smali b/com.discord/smali/com/discord/views/steps/StepsView.smali
index 4a1865da34..7d4fb3d6e1 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView.smali
@@ -31,7 +31,11 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -53,7 +57,7 @@
 
     invoke-virtual {p1, p2, p0, v0}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
-    const p1, 0x7f0a0940
+    const p1, 0x7f0a0944
 
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -61,13 +65,13 @@
 
     const-string p2, "findViewById(R.id.steps_done)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/Button;
 
     iput-object p1, p0, Lcom/discord/views/steps/StepsView;->d:Landroid/widget/Button;
 
-    const p1, 0x7f0a093f
+    const p1, 0x7f0a0943
 
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -75,11 +79,11 @@
 
     const-string p2, "findViewById(R.id.steps_close)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/steps/StepsView;->e:Landroid/view/View;
 
-    const p1, 0x7f0a0941
+    const p1, 0x7f0a0945
 
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -87,35 +91,35 @@
 
     const-string p2, "findViewById(R.id.steps_next)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/Button;
 
     iput-object p1, p0, Lcom/discord/views/steps/StepsView;->f:Landroid/widget/Button;
 
-    const p1, 0x7f0a093e
-
-    invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.steps_cancel)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->g:Landroid/widget/TextView;
-
     const p1, 0x7f0a0942
 
     invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
+    const-string p2, "findViewById(R.id.steps_cancel)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->g:Landroid/widget/TextView;
+
+    const p1, 0x7f0a0946
+
+    invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string p2, "findViewById(R.id.steps_viewpager)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/utilities/simple_pager/SimplePager;
 
@@ -124,20 +128,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.view.LayoutInflater"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/views/typing/TypingDot$a.smali b/com.discord/smali/com/discord/views/typing/TypingDot$a.smali
index b24eb79ffb..5594f0e9a5 100644
--- a/com.discord/smali/com/discord/views/typing/TypingDot$a.smali
+++ b/com.discord/smali/com/discord/views/typing/TypingDot$a.smali
@@ -31,7 +31,7 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,6 +41,10 @@
         }
     .end annotation
 
+    const-string v0, "onComplete"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/views/typing/TypingDot$a;->a:Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/views/typing/TypingDot$b.smali b/com.discord/smali/com/discord/views/typing/TypingDot$b.smali
index 6ccdc8b354..e67a6adff8 100644
--- a/com.discord/smali/com/discord/views/typing/TypingDot$b.smali
+++ b/com.discord/smali/com/discord/views/typing/TypingDot$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/views/typing/TypingDot$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TypingDot.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/typing/TypingDot$c.smali b/com.discord/smali/com/discord/views/typing/TypingDot$c.smali
index cc646eae82..f8dafe43e1 100644
--- a/com.discord/smali/com/discord/views/typing/TypingDot$c.smali
+++ b/com.discord/smali/com/discord/views/typing/TypingDot$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/views/typing/TypingDot$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TypingDot.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/typing/TypingDot.smali b/com.discord/smali/com/discord/views/typing/TypingDot.smali
index 6d02e7304c..e513de900e 100644
--- a/com.discord/smali/com/discord/views/typing/TypingDot.smali
+++ b/com.discord/smali/com/discord/views/typing/TypingDot.smali
@@ -29,11 +29,13 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
+    .locals 2
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    const-string v1, "context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, v0}, Landroid/view/View;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -45,7 +47,7 @@
 
     const-string v0, "AnimationUtils.loadAnima\u2026nim_typing_dots_scale_up)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/views/typing/TypingDot;->d:Landroid/view/animation/Animation;
 
@@ -57,20 +59,11 @@
 
     const-string p2, "AnimationUtils.loadAnima\u2026m_typing_dots_scale_down)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/typing/TypingDot;->e:Landroid/view/animation/Animation;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/views/typing/TypingDots.smali b/com.discord/smali/com/discord/views/typing/TypingDots.smali
index c7584187ce..1483245219 100644
--- a/com.discord/smali/com/discord/views/typing/TypingDots.smali
+++ b/com.discord/smali/com/discord/views/typing/TypingDots.smali
@@ -25,7 +25,9 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -67,7 +69,7 @@
 
     new-array p1, p1, [Lcom/discord/views/typing/TypingDot;
 
-    const p2, 0x7f0a0a49
+    const p2, 0x7f0a0a4d
 
     invoke-virtual {p0, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -75,13 +77,13 @@
 
     const-string v2, "findViewById(R.id.view_typing_dots_1)"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/views/typing/TypingDot;
 
     aput-object p2, p1, v0
 
-    const p2, 0x7f0a0a4a
+    const p2, 0x7f0a0a4e
 
     invoke-virtual {p0, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -89,13 +91,13 @@
 
     const-string v0, "findViewById(R.id.view_typing_dots_2)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/views/typing/TypingDot;
 
     aput-object p2, p1, v1
 
-    const p2, 0x7f0a0a4b
+    const p2, 0x7f0a0a4f
 
     invoke-virtual {p0, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -103,7 +105,7 @@
 
     const-string v0, "findViewById(R.id.view_typing_dots_3)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/views/typing/TypingDot;
 
@@ -117,7 +119,7 @@
 
     iput-object p1, p0, Lcom/discord/views/typing/TypingDots;->d:Ljava/util/ArrayList;
 
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -130,15 +132,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/views/typing/TypingDot;->setOnScaleDownCompleteListener(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic b(Lcom/discord/views/typing/TypingDots;ZI)V
diff --git a/com.discord/smali/com/discord/views/user/UserAvatarPresenceView$a.smali b/com.discord/smali/com/discord/views/user/UserAvatarPresenceView$a.smali
index b9a2448627..f28b857d11 100644
--- a/com.discord/smali/com/discord/views/user/UserAvatarPresenceView$a.smali
+++ b/com.discord/smali/com/discord/views/user/UserAvatarPresenceView$a.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput-object p3, p0, Lcom/discord/views/user/UserAvatarPresenceView$a;->c:Lcom/discord/utilities/streams/StreamContext;
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -65,7 +58,7 @@
 
     iget-object v1, p1, Lcom/discord/views/user/UserAvatarPresenceView$a;->a:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -75,7 +68,7 @@
 
     iget-object v1, p1, Lcom/discord/views/user/UserAvatarPresenceView$a;->b:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -85,7 +78,7 @@
 
     iget-object p1, p1, Lcom/discord/views/user/UserAvatarPresenceView$a;->c:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali b/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali
index 8e8a06d81b..72cc233937 100644
--- a/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali
+++ b/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali
@@ -33,61 +33,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/user/UserAvatarPresenceView;
 
-    const-class v2, Lcom/discord/views/user/UserAvatarPresenceView;
+    const-string v2, "containerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainerView()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "containerView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainerView()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/user/UserAvatarPresenceView;
 
-    const/4 v2, 0x0
+    const-string v2, "avatarSimpleDraweeView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/user/UserAvatarPresenceView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "avatarSimpleDraweeView"
-
-    const-string v4, "getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/user/UserAvatarPresenceView;
 
-    const-class v2, Lcom/discord/views/user/UserAvatarPresenceView;
+    const-string v2, "statusView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusView()Lcom/discord/views/StatusView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusView"
-
-    const-string v4, "getStatusView()Lcom/discord/views/StatusView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -101,15 +83,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const v0, 0x7f0a09c1
+    const v0, 0x7f0a09c5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -117,7 +101,7 @@
 
     iput-object v0, p0, Lcom/discord/views/user/UserAvatarPresenceView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09c0
+    const v0, 0x7f0a09c4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -125,7 +109,7 @@
 
     iput-object v0, p0, Lcom/discord/views/user/UserAvatarPresenceView;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09c2
+    const v0, 0x7f0a09c6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -149,15 +133,15 @@
 
     move-result-object p1
 
-    const/4 p2, 0x0
+    const p2, 0x7f040423
 
-    const v0, 0x7f040423
+    invoke-static {p0, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
-    invoke-static {p0, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+    move-result p2
 
-    move-result v0
+    const/4 v0, 0x0
 
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
+    invoke-virtual {p1, v0, p2}, Landroid/content/res/TypedArray;->getColor(II)I
 
     move-result p2
 
@@ -166,20 +150,6 @@
     invoke-virtual {p0, p2}, Lcom/discord/views/user/UserAvatarPresenceView;->setAvatarBackgroundColor(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -245,35 +215,39 @@
 
 # virtual methods
 .method public final a(Lcom/discord/views/user/UserAvatarPresenceView$a;)V
-    .locals 7
+    .locals 8
+
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/views/user/UserAvatarPresenceView;->getAvatarSimpleDraweeView()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v0
+    move-result-object v1
 
-    iget-object v1, p1, Lcom/discord/views/user/UserAvatarPresenceView$a;->a:Lcom/discord/models/domain/ModelUser;
+    iget-object v0, p1, Lcom/discord/views/user/UserAvatarPresenceView$a;->a:Lcom/discord/models/domain/ModelUser;
 
     const/4 v2, 0x1
 
-    const/4 v3, 0x4
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/4 v4, 0x4
 
-    invoke-static {v1, v2, v4, v3, v4}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v2, v3, v4, v3}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    const/4 v2, 0x0
+    iget-object v5, p0, Lcom/discord/views/user/UserAvatarPresenceView;->g:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
 
     const/4 v3, 0x0
 
-    iget-object v4, p0, Lcom/discord/views/user/UserAvatarPresenceView;->g:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+    const/4 v4, 0x0
 
-    const/16 v5, 0xc
+    const/16 v6, 0xc
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/views/user/UserAvatarPresenceView;->getStatusView()Lcom/discord/views/StatusView;
 
@@ -333,7 +307,7 @@
 
     const-string v2, "resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
diff --git a/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController$a.smali b/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController$a.smali
index 24edbc18b2..4c8018c63f 100644
--- a/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController$a.smali
+++ b/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController$a.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        "Lcom/discord/views/user/UserAvatarPresenceView$a;",
+        ">;"
     }
 .end annotation
 
@@ -72,9 +76,9 @@
 
     new-instance v0, Lcom/discord/views/user/UserAvatarPresenceView$a;
 
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController.smali b/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController.smali
index 72d2a2683c..45f8bf8188 100644
--- a/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController.smali
+++ b/com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController.smali
@@ -66,7 +66,7 @@
 
     if-eqz p5, :cond_2
 
-    new-instance p5, Lcom/discord/utilities/streams/StreamContextService;
+    new-instance p3, Lcom/discord/utilities/streams/StreamContextService;
 
     const/4 v1, 0x0
 
@@ -86,23 +86,26 @@
 
     const/4 v9, 0x0
 
-    move-object v0, p5
+    move-object v0, p3
 
     invoke-direct/range {v0 .. v9}, Lcom/discord/utilities/streams/StreamContextService;-><init>(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreamPreviews;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    goto :goto_2
-
     :cond_2
-    move-object p5, p3
+    const-string/jumbo p5, "view"
 
-    :goto_2
-    if-eqz p1, :cond_6
+    invoke-static {p1, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string p5, "storeUser"
 
-    if-eqz p4, :cond_4
+    invoke-static {p2, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_3
+    const-string p5, "storeUserPresence"
+
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p5, "streamContextService"
+
+    invoke-static {p3, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/viewcontroller/RxViewController;-><init>(Landroid/view/View;)V
 
@@ -110,37 +113,9 @@
 
     iput-object p4, p0, Lcom/discord/views/user/UserAvatarPresenceViewController;->c:Lcom/discord/stores/StoreUserPresence;
 
-    iput-object p5, p0, Lcom/discord/views/user/UserAvatarPresenceViewController;->d:Lcom/discord/utilities/streams/StreamContextService;
+    iput-object p3, p0, Lcom/discord/views/user/UserAvatarPresenceViewController;->d:Lcom/discord/utilities/streams/StreamContextService;
 
     return-void
-
-    :cond_3
-    const-string p1, "streamContextService"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_4
-    const-string p1, "storeUserPresence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_5
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
 
 
@@ -150,7 +125,9 @@
 
     check-cast p1, Lcom/discord/views/user/UserAvatarPresenceView$a;
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/viewcontroller/RxViewController;->getView()Landroid/view/View;
 
@@ -161,15 +138,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/views/user/UserAvatarPresenceView;->a(Lcom/discord/views/user/UserAvatarPresenceView$a;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public observeState()Lrx/Observable;
@@ -193,19 +161,19 @@
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "filter { it != null }.map { it!! }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
 
@@ -233,7 +201,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -247,7 +215,7 @@
 
     const-string v1, "Observable.combineLatest\u2026  .onBackpressureLatest()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali
index 10764032c4..d79b5404e1 100644
--- a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali
+++ b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali
@@ -59,11 +59,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lco/discord/media_engine/VideoStreamRenderer;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -75,7 +77,9 @@
 
     iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->e:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    const/4 p1, 0x0
+
+    invoke-static {p1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -88,20 +92,6 @@
     iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->k:Lorg/webrtc/RendererCommon$ScalingType;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -124,7 +114,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-static {v0}, Lj0/n/c/u;->asMutableMap(Ljava/lang/Object;)Ljava/util/Map;
+    invoke-static {v0}, Lk0/o/c/v;->asMutableMap(Ljava/lang/Object;)Ljava/util/Map;
 
     move-result-object v0
 
@@ -150,7 +140,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_1
     sput-object v1, Lcom/discord/views/video/AppVideoStreamRenderer$a;->a:Lkotlinx/coroutines/Job;
@@ -181,11 +171,11 @@
     return-void
 
     :cond_3
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type kotlin.collections.MutableMap<K, V>"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -205,7 +195,7 @@
 
     iget-object v3, v0, Lcom/discord/views/video/AppVideoStreamRenderer;->g:Ljava/lang/Integer;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -285,7 +275,7 @@
 
     if-eqz v5, :cond_2
 
-    invoke-static {v5, v2, v4, v2}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {v5, v2, v4, v2}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_2
     sput-object v2, Lcom/discord/views/video/AppVideoStreamRenderer$a;->a:Lkotlinx/coroutines/Job;
@@ -317,29 +307,29 @@
 
     invoke-direct {v5, v2}, Lf/a/n/n0/a;-><init>(Lf/a/n/n0/e;)V
 
-    invoke-virtual {v4, v5}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v4, v5}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
     const-string v5, "onSizeChangedSubject\n   \u2026rameResolutionSampled() }"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v5, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v4, v5}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v4, v5}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
     sget-object v5, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v4, v5}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v4, v5}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
     const-string v5, "filter { it != null }.map { it!! }"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -359,7 +349,7 @@
 
     const-string v4, "javaClass.simpleName"
 
-    invoke-static {v8, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v9, Lf/a/n/n0/c;
 
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali
index e83783aa30..c7fb5aad1a 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$ParticipantData.smali
@@ -48,11 +48,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;ZLorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "participant"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -99,20 +101,6 @@
     iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->a:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "participant"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;ZLorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;ZZI)V
@@ -224,7 +212,7 @@
 .end method
 
 .method public static a(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;ZLorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;ZZI)Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
-    .locals 10
+    .locals 9
 
     move-object v0, p0
 
@@ -296,41 +284,40 @@
 
     if-eqz v8, :cond_5
 
-    iget-object v8, v0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->g:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;
+    iget-object v3, v0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->g:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;
+
+    :cond_5
+    and-int/lit8 v8, v1, 0x40
+
+    if-eqz v8, :cond_6
+
+    iget-boolean v8, v0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->h:Z
 
     goto :goto_5
 
-    :cond_5
-    move-object v8, v3
+    :cond_6
+    move/from16 v8, p7
 
     :goto_5
-    and-int/lit8 v9, v1, 0x40
-
-    if-eqz v9, :cond_6
-
-    iget-boolean v9, v0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->h:Z
-
-    goto :goto_6
-
-    :cond_6
-    move/from16 v9, p7
-
-    :goto_6
     and-int/lit16 v1, v1, 0x80
 
     if-eqz v1, :cond_7
 
     iget-boolean v0, v0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->i:Z
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_7
     move/from16 v0, p8
 
-    :goto_7
-    if-eqz v2, :cond_9
+    :goto_6
+    const-string v1, "participant"
 
-    if-eqz v8, :cond_8
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "type"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
@@ -346,29 +333,15 @@
 
     move-object p5, v7
 
-    move-object/from16 p6, v8
+    move-object p6, v3
 
-    move/from16 p7, v9
+    move/from16 p7, v8
 
     move/from16 p8, v0
 
     invoke-direct/range {p0 .. p8}, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;-><init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;ZLorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;ZZ)V
 
     return-object v1
-
-    :cond_8
-    const-string v0, "type"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_9
-    const-string v0, "participant"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 
@@ -463,15 +436,19 @@
 .method public createView(Landroid/content/Context;)Landroid/view/View;
     .locals 4
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lcom/discord/views/video/VideoCallParticipantView;
 
     const/4 v1, 0x0
 
-    const/4 v2, 0x6
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    const/4 v3, 0x6
 
-    invoke-direct {v0, p1, v3, v1, v2}, Lcom/discord/views/video/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+    invoke-direct {v0, p1, v1, v2, v3}, Lcom/discord/views/video/VideoCallParticipantView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
 
     return-object v0
 .end method
@@ -491,7 +468,7 @@
 
     iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->b:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -507,7 +484,7 @@
 
     iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->d:Lorg/webrtc/RendererCommon$ScalingType;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -517,7 +494,7 @@
 
     iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->e:Lorg/webrtc/RendererCommon$ScalingType;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -527,7 +504,7 @@
 
     iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->f:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -537,7 +514,7 @@
 
     iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->g:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
index b59a797aba..b58ac0181b 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
@@ -76,241 +76,169 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string/jumbo v2, "voiceUserView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceUserView()Lcom/discord/views/VoiceUserView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "voiceUserView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getVoiceUserView()Lcom/discord/views/VoiceUserView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const/4 v2, 0x0
+    const-string v2, "backgroundAvatar"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBackgroundAvatar()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "backgroundAvatar"
-
-    const-string v4, "getBackgroundAvatar()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "loadingIndicator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoadingIndicator()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "loadingIndicator"
-
-    const-string v4, "getLoadingIndicator()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "letterbox"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLetterbox()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "letterbox"
-
-    const-string v4, "getLetterbox()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string/jumbo v2, "videoStreamRenderer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "videoStreamRenderer"
-
-    const-string v4, "getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "applicationStreamPreviewImage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getApplicationStreamPreviewImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "applicationStreamPreviewImage"
-
-    const-string v4, "getApplicationStreamPreviewImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "applicationStreamPreviewText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getApplicationStreamPreviewText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "applicationStreamPreviewText"
-
-    const-string v4, "getApplicationStreamPreviewText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "muteStatusIndicator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteStatusIndicator()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "muteStatusIndicator"
-
-    const-string v4, "getMuteStatusIndicator()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "deafenStatusIndicator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeafenStatusIndicator()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "deafenStatusIndicator"
-
-    const-string v4, "getDeafenStatusIndicator()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "liveIndicator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLiveIndicator()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "liveIndicator"
-
-    const-string v4, "getLiveIndicator()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string v2, "applicationStreamPaused"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getApplicationStreamPaused()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "applicationStreamPaused"
-
-    const-string v4, "getApplicationStreamPaused()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/views/video/VideoCallParticipantView;
 
-    const-class v2, Lcom/discord/views/video/VideoCallParticipantView;
+    const-string/jumbo v2, "videoLabel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVideoLabel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "videoLabel"
-
-    const-string v4, "getVideoLabel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
@@ -334,15 +262,13 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 2
+    .locals 1
 
     and-int/lit8 v0, p4, 0x2
 
-    const/4 v1, 0x0
-
     if-eqz v0, :cond_0
 
-    move-object p2, v1
+    const/4 p2, 0x0
 
     :cond_0
     and-int/lit8 p4, p4, 0x4
@@ -354,11 +280,13 @@
     const/4 p3, 0x0
 
     :cond_1
-    if-eqz p1, :cond_3
+    const-string p4, "context"
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a068b
+    const p3, 0x7f0a0691
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -366,7 +294,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a067f
+    const p3, 0x7f0a0685
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -374,7 +302,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0688
+    const p3, 0x7f0a068e
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -382,7 +310,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0680
+    const p3, 0x7f0a0686
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -390,7 +318,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->g:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0689
+    const p3, 0x7f0a068f
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -398,7 +326,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->h:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0685
+    const p3, 0x7f0a068b
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -406,7 +334,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->i:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0686
+    const p3, 0x7f0a068c
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -414,7 +342,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->j:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0683
+    const p3, 0x7f0a0689
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -422,7 +350,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->k:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0681
+    const p3, 0x7f0a0687
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -430,7 +358,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->l:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0682
+    const p3, 0x7f0a0688
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -438,7 +366,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->m:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0684
+    const p3, 0x7f0a068a
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -446,7 +374,7 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->n:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0687
+    const p3, 0x7f0a068d
 
     invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -507,13 +435,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/views/video/AppVideoStreamRenderer;->setMatchVideoOrientation(Z)V
 
     return-void
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final synthetic a(Lcom/discord/views/video/VideoCallParticipantView;)Landroid/view/View;
@@ -901,7 +822,11 @@
 .end method
 
 .method public onBind(Lcom/discord/utilities/view/grid/FrameGridLayout$Data;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
@@ -1005,7 +930,7 @@
 
     sget-object v3, Lf/a/n/n0/i;->d:Lf/a/n/n0/i;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->X(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->X(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -1042,7 +967,7 @@
 
     iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->r:Ljava/lang/String;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -1183,7 +1108,7 @@
     move-object v9, v0
 
     :goto_a
-    invoke-static {v9, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v9, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -1639,23 +1564,23 @@
 
     const-string v8, "currentFrameResolutionSubject"
 
-    invoke-static {v6, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v8, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v6, v8}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v6, v8}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v6
 
     sget-object v8, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v6, v8}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v6, v8}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v6
 
     const-string v8, "filter { it != null }.map { it!! }"
 
-    invoke-static {v6, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v8, Lf/a/n/n0/l;
 
@@ -1813,27 +1738,69 @@
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getDisplayName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v0, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->g:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;
 
-    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;->APPLICATION_STREAMING:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;
+    sget-object v2, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;->APPLICATION_STREAMING:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;
 
-    if-ne v0, v1, :cond_29
+    if-ne v0, v2, :cond_29
+
+    invoke-virtual {p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const v2, 0x7f1208e4
+
+    invoke-virtual {v0, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "context.getString(R.string.go_live_tile_screen)"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-array v2, v5, [Ljava/lang/Object;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getDisplayName()Ljava/lang/String;
+
+    move-result-object v1
+
+    aput-object v1, v2, v4
+
+    invoke-static {v2, v5}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "java.lang.String.format(format, *args)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, v0}, Landroid/view/ViewGroup;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoLabel()Landroid/widget/TextView;
 
     move-result-object v0
 
-    const v1, 0x7f0803b7
+    const v1, 0x7f0803ba
 
     invoke-virtual {v0, v1, v4, v4, v4}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
 
     goto :goto_1a
 
     :cond_29
+    invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getDisplayName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Landroid/view/ViewGroup;->setContentDescription(Ljava/lang/CharSequence;)V
+
     invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoLabel()Landroid/widget/TextView;
 
     move-result-object v0
@@ -1890,7 +1857,7 @@
 .end method
 
 .method public final setOnWatchStreamClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1902,18 +1869,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onWatchStreamClicked"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->s:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onWatchStreamClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1.smali b/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1.smali
index 5a6f8d6c3c..8bd17356f5 100644
--- a/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1.smali
+++ b/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AccessibilityDetectionNavigator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/accessibility/AccessibilityState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "showAccessibilityDetectionDialog"
+
+    const-string v5, "showAccessibilityDetectionDialog(Lcom/discord/utilities/accessibility/AccessibilityState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "showAccessibilityDetectionDialog"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "showAccessibilityDetectionDialog(Lcom/discord/utilities/accessibility/AccessibilityState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/accessibility/AccessibilityState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;->access$showAccessibilityDetectionDialog(Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;Lcom/discord/utilities/accessibility/AccessibilityState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.smali b/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.smali
index 652a663884..cc1efa52ae 100644
--- a/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AccessibilityDetectionNavigator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,23 +73,27 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lf/a/a/f;->i:Lf/a/a/f$b;
+    sget-object v0, Lf/a/a/f;->i:Lf/a/a/f$b;
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object p1
 
-    const-string v2, "activity.supportFragmentManager"
+    const-string v1, "activity.supportFragmentManager"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/a/f;
 
@@ -104,12 +108,7 @@
     return p1
 
     :cond_0
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator.smali b/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator.smali
index 8dd0106566..66535243b8 100644
--- a/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator.smali
+++ b/com.discord/smali/com/discord/widgets/accessibility/AccessibilityDetectionNavigator.smali
@@ -106,28 +106,34 @@
 .method public final enqueueNoticeWhenEnabled(Lcom/discord/app/AppComponent;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "appComponent"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->Companion:Lcom/discord/utilities/accessibility/AccessibilityMonitor$Companion;
+    sget-object v0, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->Companion:Lcom/discord/utilities/accessibility/AccessibilityMonitor$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/accessibility/AccessibilityMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/accessibility/AccessibilityMonitor;
+    invoke-virtual {v0}, Lcom/discord/utilities/accessibility/AccessibilityMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/accessibility/AccessibilityMonitor;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->observeAccessibilityState()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/utilities/accessibility/AccessibilityMonitor;->observeAccessibilityState()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
     const-class v4, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;
 
+    new-instance v9, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1;
+
+    invoke-direct {v9, p0}, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1;-><init>(Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -136,10 +142,6 @@
 
     const/4 v8, 0x0
 
-    new-instance v9, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1;
-
-    invoke-direct {v9, p0}, Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator$enqueueNoticeWhenEnabled$1;-><init>(Lcom/discord/widgets/accessibility/AccessibilityDetectionNavigator;)V
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -147,11 +149,4 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction.smali
index b835734484..12866bfaec 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction.smali
@@ -33,7 +33,7 @@
 
 # direct methods
 .method public constructor <init>(JLjava/util/Set;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -43,7 +43,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "channelIds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,15 +54,6 @@
     iput-object p3, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction;->channelIds:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component1()J
@@ -125,22 +118,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "channelIds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction;-><init>(JLjava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channelIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -166,7 +152,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction;->channelIds:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -219,7 +205,9 @@
 .method public includeChannel(Lcom/discord/models/domain/ModelChannel;)Z
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowChannelFilterFunction;->channelIds:Ljava/util/Set;
 
@@ -266,15 +254,6 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction.smali
index 24fb93f258..7dbdae61bd 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction.smali
@@ -31,7 +31,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/Set;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,22 +41,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction;->guildIds:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component1()Ljava/util/Set;
@@ -106,22 +99,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction;-><init>(Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -139,7 +125,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction;->guildIds:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -182,7 +168,9 @@
 .method public includeGuild(Lcom/discord/models/domain/ModelGuild;)Z
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$ChannelFollowGuildFilterFunction;->guildIds:Ljava/util/Set;
 
@@ -199,15 +187,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$Companion.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$Companion.smali
index b339856007..8491c56bc4 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;JJ)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
@@ -65,13 +67,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
index e08feb772d..2a69ba04f0 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
@@ -75,7 +75,7 @@
 
     const/4 v5, 0x0
 
-    const v6, 0x7f120fb4
+    const v6, 0x7f120fde
 
     invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
 
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
index 266ed41c0b..2e766234ee 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
@@ -59,7 +59,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f120fb4
+    const v4, 0x7f120fde
 
     invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Companion;->launch(Landroidx/fragment/app/Fragment;IZILcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;)V
 
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$1.smali
index 611db4584d..26cbdc7d0d 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelFollowSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Long;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(JLjava/lang/String;I)V
     .locals 0
 
-    if-eqz p3, :cond_0
+    const-string p4, "<anonymous parameter 1>"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p3, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$1;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p3, p1, p2}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->selectChannel(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$2.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$2.smali
index 35d41c6db2..103529ffe3 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$2.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelFollowSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Long;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(JLjava/lang/String;I)V
     .locals 0
 
-    if-eqz p3, :cond_0
+    const-string p4, "<anonymous parameter 1>"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p3, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onActivityResult$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
@@ -96,13 +98,4 @@
     invoke-virtual {p1, p2, p3}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->selectChannel(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1.smali
index d682396f78..3c475dc13b 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -73,10 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2.smali
index d887947aea..d3502cd806 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.announcements.WidgetChannelFollowSheetViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1.smali
index 643bb006b4..b9962f556a 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChannelFollowSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->access$configureUI(Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2.smali
index f3d4620ace..d0bf69d64c 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelFollowSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Event;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
@@ -77,18 +79,9 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$Companion;->show(Landroidx/fragment/app/FragmentManager;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali
index 8b4ff562e9..c4520335f8 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali
@@ -57,181 +57,127 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "createChannelFollowerButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreateChannelFollowerButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "createChannelFollowerButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCreateChannelFollowerButton()Landroid/widget/Button;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "sourceGuildIcon"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSourceGuildIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "sourceGuildIcon"
-
-    const-string v4, "getSourceGuildIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "sourceChannelName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSourceChannelName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "sourceChannelName"
-
-    const-string v4, "getSourceChannelName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "channelDropdown"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelDropdown()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelDropdown"
-
-    const-string v4, "getChannelDropdown()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "selectedChannelName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSelectedChannelName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "selectedChannelName"
-
-    const-string v4, "getSelectedChannelName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "guildDropdown"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildDropdown()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildDropdown"
-
-    const-string v4, "getGuildDropdown()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "selectedGuildName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSelectedGuildName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "selectedGuildName"
-
-    const-string v4, "getSelectedGuildName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "errorText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getErrorText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "errorText"
-
-    const-string v4, "getErrorText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "flipper"
-
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
@@ -255,7 +201,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a029e
+    const v0, 0x7f0a02a1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -263,7 +209,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->createChannelFollowerButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0159
+    const v0, 0x7f0a015c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -271,7 +217,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->sourceGuildIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0156
+    const v0, 0x7f0a0159
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -279,7 +225,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->sourceChannelName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a015a
+    const v0, 0x7f0a015d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -287,7 +233,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->channelDropdown$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a015c
+    const v0, 0x7f0a015f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -295,7 +241,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->selectedChannelName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a015b
+    const v0, 0x7f0a015e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -303,7 +249,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->guildDropdown$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a015d
+    const v0, 0x7f0a0160
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -311,7 +257,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->selectedGuildName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0157
+    const v0, 0x7f0a015a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -319,7 +265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03c6
+    const v0, 0x7f0a03cc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -348,9 +294,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -405,7 +351,7 @@
 
     const-string v4, "requireContext()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -454,7 +400,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12142b
+    const v1, 0x7f121455
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -520,7 +466,7 @@
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f12142b
+    const v1, 0x7f121455
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -615,7 +561,7 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -955,9 +901,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -973,45 +919,47 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "com.discord.intent.extra.EXTRA_GUILD_ID"
+    const-string v1, "com.discord.intent.extra.EXTRA_GUILD_ID"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    new-instance v3, Landroidx/lifecycle/ViewModelProvider;
+    new-instance v2, Landroidx/lifecycle/ViewModelProvider;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v4
+    move-result-object v3
 
-    new-instance v5, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;
+    new-instance v4, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;
 
-    invoke-direct {v5, v1, v2, p1, p2}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;-><init>(JJ)V
+    invoke-direct {v4, v0, v1, p1, p2}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;-><init>(JJ)V
 
-    invoke-direct {v3, v4, v5}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {v2, v3, v4}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
     const-class p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
 
-    invoke-virtual {v3, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {v2, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
     const-string p2, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->viewModel:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
 
-    const-string p2, "viewModel"
+    const-string/jumbo p2, "viewModel"
+
+    const/4 v0, 0x0
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -1019,25 +967,25 @@
 
     move-result-object p1
 
-    const-string v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v1, "filter { it is T }.map { it as T }"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -1100,19 +1048,12 @@
     return-void
 
     :cond_0
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1.smali
index ff4356aa33..054a4fa5ac 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->access$updateViewState(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory.smali
index fa84f08ae2..ec25a249c1 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory.smali
@@ -39,7 +39,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 8
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -50,44 +50,37 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
 
-    iget-wide v1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;->sourceGuildId:J
+    iget-wide v2, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;->sourceGuildId:J
 
-    iget-wide v3, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;->sourceChannelId:J
+    iget-wide v4, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;->sourceChannelId:J
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
 
-    move-result-object v5
+    move-result-object v6
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
 
-    move-result-object v6
+    move-result-object v7
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
 
-    move-result-object v7
+    move-result-object v8
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;-><init>(JJLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StorePermissions;)V
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;-><init>(JJLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StorePermissions;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded.smali
index 168998f1ca..0cfd24e31d 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded.smali
@@ -67,12 +67,16 @@
         }
     .end annotation
 
+    const-string v0, "availableGuilds"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "availableChannels"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p5, :cond_1
-
-    if-eqz p6, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->sourceChannel:Lcom/discord/models/domain/ModelChannel;
@@ -90,20 +94,6 @@
     iput-object p7, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->errorTextRes:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "availableChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "availableGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;Ljava/util/Set;Ljava/util/Set;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -324,11 +314,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "availableGuilds"
 
-    if-eqz p5, :cond_1
+    move-object v6, p5
 
-    if-eqz p6, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "availableChannels"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;
 
@@ -342,29 +338,11 @@
 
     move-object v5, p4
 
-    move-object v6, p5
-
-    move-object v7, p6
-
     move-object/from16 v8, p7
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;Ljava/util/Set;Ljava/util/Set;Ljava/lang/Integer;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "availableChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "availableGuilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -382,7 +360,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->sourceChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -392,7 +370,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->sourceGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -402,7 +380,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->selectedGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -412,7 +390,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->selectedChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -422,7 +400,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->availableGuilds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -432,7 +410,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->availableChannels:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -442,7 +420,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;->errorTextRes:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1$1.smali
index bb494179f1..f410848a97 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,19 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -79,7 +90,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -154,16 +165,20 @@
 
     if-eqz v2, :cond_2
 
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v2
+
     goto :goto_1
 
     :cond_2
     const-wide/16 v2, 0x0
 
+    :goto_1
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v2
 
-    :goto_1
     invoke-static {v4, v5, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result v2
@@ -224,6 +239,18 @@
 
     move-result-object v2
 
+    const-string v3, "channel.guildId"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
     invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.smali
index 88e4aa1358..7e516a0962 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,21 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;>;>;"
     }
 .end annotation
 
@@ -71,6 +82,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/util/List<",
@@ -97,7 +109,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1$1;-><init>(Ljava/util/Map;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$1.smali
index d05df79ab2..0456182c8e 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleChannelFollowError"
+
+    const-string v5, "handleChannelFollowError(Lcom/discord/utilities/error/Error;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelFollowError"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleChannelFollowError(Lcom/discord/utilities/error/Error;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->access$handleChannelFollowError(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;Lcom/discord/utilities/error/Error;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$2.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$2.smali
index 532b5dde6d..eec2714686 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$2.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$followChannel$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1.smali
index 86529dc21d..4657cdccb1 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;"
     }
 .end annotation
 
@@ -98,9 +100,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2.smali
index c6933fe691..37875a6f06 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -98,9 +100,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.smali
index b7ed7b0a7e..307acb5e68 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.smali
@@ -33,7 +33,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;",
+        ">;"
     }
 .end annotation
 
@@ -138,7 +150,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v0}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v0}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v6
 
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali
index 089b93fee1..00d4aa43fd 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetChannelFollowSheetViewModel.kt"
 
 # interfaces
@@ -17,7 +17,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState;",
         ">;",
         "Lcom/discord/app/AppComponent;"
@@ -69,7 +69,7 @@
 
 # direct methods
 .method public constructor <init>(JJLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StorePermissions;)V
-    .locals 14
+    .locals 13
 
     move-object v0, p0
 
@@ -79,25 +79,29 @@
 
     move-object/from16 v3, p7
 
-    const/4 v4, 0x0
+    const-string v4, "storeGuilds"
 
-    if-eqz v1, :cond_2
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_1
+    const-string v4, "storeChannels"
 
-    if-eqz v3, :cond_0
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v5, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Uninitialized;
+    const-string v4, "storePermissions"
 
-    invoke-direct {p0, v5}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-wide v5, p1
+    sget-object v4, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Uninitialized;
 
-    iput-wide v5, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->sourceGuildId:J
+    invoke-direct {p0, v4}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
-    move-wide/from16 v5, p3
+    move-wide v4, p1
 
-    iput-wide v5, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->sourceChannelId:J
+    iput-wide v4, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->sourceGuildId:J
+
+    move-wide/from16 v4, p3
+
+    iput-wide v4, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->sourceChannelId:J
 
     iput-object v1, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->storeGuilds:Lcom/discord/stores/StoreGuilds;
 
@@ -105,39 +109,47 @@
 
     iput-object v3, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->storePermissions:Lcom/discord/stores/StorePermissions;
 
-    invoke-static {v4}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    const/4 v1, 0x0
 
-    move-result-object v1
+    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    iput-object v1, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->selectedGuildSubject:Lrx/subjects/BehaviorSubject;
+    move-result-object v2
 
-    invoke-static {v4}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    iput-object v2, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->selectedGuildSubject:Lrx/subjects/BehaviorSubject;
 
-    move-result-object v1
+    invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    iput-object v1, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
+    move-result-object v2
+
+    iput-object v2, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
 
     invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
 
-    move-result-object v1
+    move-result-object v2
 
-    iput-object v1, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+    iput-object v2, v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
     invoke-direct {p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->observeViewStateFromStores()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+    invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    const/4 v2, 0x2
+    const/4 v3, 0x2
 
-    invoke-static {v1, p0, v4, v2, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v2, p0, v1, v3, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v5
+    move-result-object v4
 
-    const-class v6, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
+    const-class v5, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
+
+    new-instance v10, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;)V
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
@@ -145,40 +157,13 @@
 
     const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    const/16 v11, 0x1e
 
-    new-instance v11, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1;
+    const/4 v12, 0x0
 
-    invoke-direct {v11, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$1;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;)V
-
-    const/16 v12, 0x1e
-
-    const/4 v13, 0x0
-
-    invoke-static/range {v5 .. v13}, 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
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "storePermissions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1
-    const-string v1, "storeChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_2
-    const-string v1, "storeGuilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
 
 .method public static final synthetic access$getEventSubject$p(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;)Lrx/subjects/PublishSubject;
@@ -200,7 +185,7 @@
 .method public static final synthetic access$updateViewState(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState;)V
     .locals 0
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -233,7 +218,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -249,7 +234,7 @@
 
     const-string v0, "error.response"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -259,15 +244,15 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f1206b6
+    const p1, 0x7f1206b8
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1206ba
+    const p1, 0x7f1206bc
 
     :goto_0
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -301,16 +286,16 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.announcements.WidgetChannelFollowSheetViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -352,7 +337,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v6
 
@@ -362,7 +347,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v7
 
@@ -374,7 +359,7 @@
 
     const-string v1, "Observable.combineLatest\u2026  )\n\n      expected\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -480,7 +465,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$Companion.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$Companion.smali
index 612fea8ec1..c562a9db53 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;
 
@@ -51,13 +53,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali
index 1e9171831c..22b1bcafce 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali
@@ -37,61 +37,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;
+    const-string v2, "successTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSuccessTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "successTextView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSuccessTextView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "successImageView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSuccessImageView()Landroid/widget/ImageView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "successImageView"
-
-    const-string v4, "getSuccessImageView()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;
 
-    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;
+    const-string v2, "confirmButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmButton"
-
-    const-string v4, "getConfirmButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -115,7 +97,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0160
+    const v0, 0x7f0a0163
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -123,7 +105,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a015f
+    const v0, 0x7f0a0162
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +117,7 @@
 
     new-array v0, v0, [Ljava/lang/Integer;
 
-    const v1, 0x7f1206bf
+    const v1, 0x7f1206c1
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -145,7 +127,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1206c0
+    const v1, 0x7f1206c2
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -155,7 +137,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f1206c1
+    const v1, 0x7f1206c3
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -165,7 +147,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f1206c2
+    const v1, 0x7f1206c4
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -175,7 +157,7 @@
 
     aput-object v1, v0, v5
 
-    const v1, 0x7f1206c3
+    const v1, 0x7f1206c5
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -185,7 +167,7 @@
 
     aput-object v1, v0, v6
 
-    const v1, 0x7f1206c4
+    const v1, 0x7f1206c6
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -195,7 +177,7 @@
 
     aput-object v1, v0, v6
 
-    const v1, 0x7f1206c5
+    const v1, 0x7f1206c7
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -205,7 +187,7 @@
 
     aput-object v1, v0, v6
 
-    const v1, 0x7f1206c6
+    const v1, 0x7f1206c8
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -215,7 +197,7 @@
 
     aput-object v1, v0, v6
 
-    const v1, 0x7f1206c7
+    const v1, 0x7f1206c9
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -225,7 +207,7 @@
 
     aput-object v1, v0, v6
 
-    const v1, 0x7f1206c8
+    const v1, 0x7f1206ca
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -265,7 +247,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successImageOptions:[Ljava/lang/Integer;
 
-    const v0, 0x7f0a015e
+    const v0, 0x7f0a0161
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -359,9 +341,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -369,11 +351,43 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successTextOptions:[Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successTextOptions:[Ljava/lang/Integer;
 
-    sget-object v2, Lj0/p/c;->b:Lj0/p/c$a;
+    sget-object v1, Lk0/q/c;->b:Lk0/q/c$a;
 
-    invoke-static {v1, v2}, Lf/n/a/k/a;->random([Ljava/lang/Object;Lj0/p/c;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lf/n/a/k/a;->random([Ljava/lang/Object;Lk0/q/c;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v0
+
+    invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->getSuccessImageView()Landroid/widget/ImageView;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const-string v1, "requireContext()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successImageOptions:[Ljava/lang/Integer;
+
+    sget-object v2, Lk0/q/c;->b:Lk0/q/c$a;
+
+    invoke-static {v1, v2}, Lf/n/a/k/a;->random([Ljava/lang/Object;Lk0/q/c;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -383,49 +397,19 @@
 
     move-result v1
 
-    invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    const/4 v2, 0x0
 
-    move-result-object v1
+    const/4 v3, 0x2
 
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    const/4 v4, 0x0
 
-    invoke-direct {p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->getSuccessImageView()Landroid/widget/ImageView;
+    invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
-    move-result-object p1
+    move-result v0
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+    const/4 v1, 0x4
 
-    move-result-object v1
-
-    const-string v2, "requireContext()"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v2, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successImageOptions:[Ljava/lang/Integer;
-
-    sget-object v3, Lj0/p/c;->b:Lj0/p/c$a;
-
-    invoke-static {v2, v3}, Lf/n/a/k/a;->random([Ljava/lang/Object;Lj0/p/c;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/Number;
-
-    invoke-virtual {v2}, Ljava/lang/Number;->intValue()I
-
-    move-result v2
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x2
-
-    invoke-static {v1, v2, v3, v4, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
-
-    move-result v1
-
-    const/4 v2, 0x4
-
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v4, v1, v4}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->getConfirmButton()Landroid/widget/Button;
 
@@ -438,11 +422,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/AuthInviteInfoView.smali b/com.discord/smali/com/discord/widgets/auth/AuthInviteInfoView.smali
index 157b6871da..901cc9b969 100644
--- a/com.discord/smali/com/discord/widgets/auth/AuthInviteInfoView.smali
+++ b/com.discord/smali/com/discord/widgets/auth/AuthInviteInfoView.smali
@@ -25,81 +25,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/AuthInviteInfoView;
 
-    const-class v2, Lcom/discord/widgets/auth/AuthInviteInfoView;
+    const-string v2, "invitedText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInvitedText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "invitedText"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getInvitedText()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/AuthInviteInfoView;
 
-    const/4 v2, 0x0
+    const-string v2, "guildAvatar"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildAvatar()Landroid/widget/ImageView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/AuthInviteInfoView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildAvatar"
-
-    const-string v4, "getGuildAvatar()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/AuthInviteInfoView;
 
-    const-class v2, Lcom/discord/widgets/auth/AuthInviteInfoView;
+    const-string v2, "templateIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTemplateIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "templateIcon"
-
-    const-string v4, "getTemplateIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/AuthInviteInfoView;
 
-    const-class v2, Lcom/discord/widgets/auth/AuthInviteInfoView;
+    const-string v2, "guildName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildName"
-
-    const-string v4, "getGuildName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -151,9 +127,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -194,15 +172,6 @@
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -294,7 +263,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v4
 
@@ -316,7 +285,7 @@
 
     const-string v6, "channel"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
 
@@ -330,7 +299,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -342,7 +311,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -350,7 +319,7 @@
 
     const-string v5, "channel.name"
 
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
 
@@ -404,7 +373,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120ca2
+    const v0, 0x7f120cc8
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -413,7 +382,7 @@
     :goto_4
     const-string v0, "if (channel.name == null\u2026nviter?.username)\n      }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_6
 
@@ -447,7 +416,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120ca0
+    const v0, 0x7f120cc6
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -456,7 +425,7 @@
     :goto_5
     const-string v0, "if (approximateMemberCou\u2026_invited_to_join)\n      }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_6
     return-object p1
@@ -507,7 +476,9 @@
 .method public final configureGuildTemplate(Lcom/discord/models/domain/ModelGuildTemplate;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/AuthInviteInfoView;->getGuildAvatar()Landroid/widget/ImageView;
 
@@ -533,7 +504,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120b60
+    const v2, 0x7f120b86
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -541,9 +512,9 @@
 
     const-string v2, "context.getString(R.stri\u2026ild_template_modal_title)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v1
 
@@ -560,68 +531,61 @@
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final configureInvite(Lcom/discord/models/domain/ModelInvite;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "invite"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/AuthInviteInfoView;->getGuildAvatar()Landroid/widget/ImageView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/AuthInviteInfoView;->getTemplateIcon()Landroid/widget/ImageView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+    if-eqz v0, :cond_0
 
-    move-result v1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result v0
 
-    move-result-object v1
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
     const/4 v2, 0x5
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v3
 
@@ -631,12 +595,12 @@
 
     :cond_2
     :goto_1
-    if-nez v1, :cond_3
+    if-nez v0, :cond_3
 
     goto :goto_2
 
     :cond_3
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v2
 
@@ -648,12 +612,12 @@
     :goto_2
     const/4 v2, 0x2
 
-    if-nez v1, :cond_5
+    if-nez v0, :cond_5
 
     goto :goto_4
 
     :cond_5
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v3
 
@@ -704,7 +668,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -716,7 +680,7 @@
 
     const-string v1, "inviteGuild"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
@@ -730,33 +694,33 @@
     :goto_4
     const/4 v2, 0x3
 
-    if-nez v1, :cond_7
+    if-nez v0, :cond_7
 
     goto :goto_6
 
     :cond_7
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    move-result v1
+    move-result v0
 
-    if-ne v1, v2, :cond_b
+    if-ne v0, v2, :cond_b
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getInviter()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_8
+    if-eqz v0, :cond_8
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_8
+    if-eqz v0, :cond_8
 
     goto :goto_5
 
     :cond_8
-    const-string v1, ""
+    const-string v0, ""
 
     :goto_5
     invoke-direct {p0}, Lcom/discord/widgets/auth/AuthInviteInfoView;->getGuildAvatar()Landroid/widget/ImageView;
@@ -771,10 +735,10 @@
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_9
-    move-object v3, v0
+    move-object v3, v1
 
     const v4, 0x7f070058
 
@@ -790,21 +754,21 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/AuthInviteInfoView;->getInvitedText()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/auth/AuthInviteInfoView;->getIntroText(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-static {v2}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v2}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/AuthInviteInfoView;->getGuildName()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -820,25 +784,18 @@
 
     move-result-object p1
 
-    const-string v1, "invite.channel"
+    const-string v0, "invite.channel"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     :cond_a
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_b
     :goto_6
     return-void
-
-    :cond_c
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$Companion.smali
index 38f5e8dec5..9a7d6718c7 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$Companion.smali
@@ -51,7 +51,9 @@
 .method public final start(Landroid/content/Context;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Age Gate"
 
@@ -77,16 +79,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1$$special$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1$$special$$inlined$apply$lambda$1.smali
index 0f154b362e..20d84fb998 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1$$special$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1$$special$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1$$special$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAgeVerify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali
index 5869858e18..bef395e816 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAgeVerify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,33 +63,35 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
 
-    sget-object v0, Lf/a/a/i;->j:Lf/a/a/i$a;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lf/a/a/i;->j:Lf/a/a/i$a;
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v1
+    move-result-object v2
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const v2, 0x7f1200c2
+    const v0, 0x7f1200c2
 
-    invoke-virtual {p1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
     const-string p1, "getString(R.string.age_gate_date_of_birth)"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1;->$timeOfBirth:Ljava/lang/Long;
 
@@ -97,27 +99,27 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v4
 
     goto :goto_0
 
     :cond_0
     sget-object p1, Lcom/discord/utilities/birthday/BirthdayHelper;->INSTANCE:Lcom/discord/utilities/birthday/BirthdayHelper;
 
-    const/16 v3, 0x12
+    const/16 v0, 0x12
 
-    invoke-virtual {p1, v3}, Lcom/discord/utilities/birthday/BirthdayHelper;->subtractYearsFromToday(I)J
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/birthday/BirthdayHelper;->subtractYearsFromToday(I)J
 
-    move-result-wide v3
+    move-result-wide v4
 
     :goto_0
     sget-object p1, Lcom/discord/utilities/birthday/BirthdayHelper;->INSTANCE:Lcom/discord/utilities/birthday/BirthdayHelper;
 
     invoke-virtual {p1}, Lcom/discord/utilities/birthday/BirthdayHelper;->getMaxDateOfBirth()J
 
-    move-result-wide v5
+    move-result-wide v6
 
-    invoke-virtual/range {v0 .. v6}, Lf/a/a/i$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;JJ)Lf/a/a/i;
+    invoke-virtual/range {v1 .. v7}, Lf/a/a/i$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;JJ)Lf/a/a/i;
 
     move-result-object p1
 
@@ -128,13 +130,4 @@
     iput-object v0, p1, Lf/a/a/i;->d:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$1.smali
index 7eba4ea2d5..37fb206d9d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAgeVerify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBound$1;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAgeVerify;->access$configureUI(Lcom/discord/widgets/auth/WidgetAgeVerify;Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$2.smali
index c57b626f1b..4e850eb465 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAgeVerify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBound$2;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAgeVerify;->access$handleEvent(Lcom/discord/widgets/auth/WidgetAgeVerify;Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5.smali
index cc5ad47c2f..79d6260d84 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5.smali
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    if-eq p1, v0, :cond_1
+    if-eq p1, v0, :cond_2
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
@@ -61,7 +61,7 @@
 
     move-result p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
@@ -77,13 +77,36 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->o(Landroid/content/Context;)V
+    if-eqz p1, :cond_0
+
+    const-string v1, "context"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_3
+
+    invoke-static {v0}, Lf/a/b/m;->d(Landroid/content/Context;)V
 
     goto :goto_0
 
     :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_1
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
@@ -94,7 +117,7 @@
 
     goto :goto_0
 
-    :cond_1
+    :cond_2
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify$onViewBoundOrOnResume$5;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerify;
 
     invoke-static {p1}, Lcom/discord/widgets/auth/WidgetAgeVerify;->access$getViewModel$p(Lcom/discord/widgets/auth/WidgetAgeVerify;)Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
@@ -103,6 +126,7 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->onConfirmBackClicked()V
 
+    :cond_3
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify.smali
index 65bc368e2e..a828b71c21 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify.smali
@@ -55,241 +55,169 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string/jumbo v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const/4 v2, 0x0
+    const-string v2, "input"
 
-    aput-object v1, v0, v2
+    const-string v3, "getInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "input"
-
-    const-string v4, "getInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "nextButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNextButton()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nextButton"
-
-    const-string v4, "getNextButton()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "description"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDescription()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "description"
-
-    const-string v4, "getDescription()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "confirmTitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmTitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmTitle"
-
-    const-string v4, "getConfirmTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "confirmDescription"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmDescription()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmDescription"
-
-    const-string v4, "getConfirmDescription()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string/jumbo v2, "underageDescription"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnderageDescription()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "underageDescription"
-
-    const-string v4, "getUnderageDescription()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string/jumbo v2, "underageWarning"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnderageWarning()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "underageWarning"
-
-    const-string v4, "getUnderageWarning()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "backToLogin"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBackToLogin()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "backToLogin"
-
-    const-string v4, "getBackToLogin()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "confirmButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmButton()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmButton"
-
-    const-string v4, "getConfirmButton()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "confirmBackButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmBackButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmBackButton"
-
-    const-string v4, "getConfirmBackButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerify;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerify;
+    const-string v2, "backButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBackButton()Landroidx/appcompat/widget/AppCompatImageButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "backButton"
-
-    const-string v4, "getBackButton()Landroidx/appcompat/widget/AppCompatImageButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
@@ -440,9 +368,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -478,7 +406,7 @@
 
     const-string v2, "Calendar.getInstance()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v0, :cond_0
 
@@ -508,7 +436,7 @@
 
     const-string v3, "formatter"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/util/Calendar;->getTimeZone()Ljava/util/TimeZone;
 
@@ -675,7 +603,7 @@
 
     const-string v6, "resources"
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -683,7 +611,7 @@
 
     const-string v7, "requireContext()"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v8, 0x7f100007
 
@@ -711,7 +639,7 @@
 
     const-string v3, "getString(R.string.age_g\u2026ys, daysToDeletionString)"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetAgeVerify;->getUnderageWarning()Lcom/discord/app/AppTextView;
 
@@ -729,7 +657,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v3, 0x7f1200d2
 
@@ -767,7 +695,7 @@
 
     const-string v3, "getString(\n            R\u2026pDesk.AGE_GATE)\n        )"
 
-    invoke-static {v9, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v10, 0x0
 
@@ -1217,7 +1145,7 @@
 
     sget-object v0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Event$Verified;->INSTANCE:Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Event$Verified;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1227,7 +1155,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {p0, p1, v0}, Lf/a/b/n;->h(Landroidx/fragment/app/Fragment;II)V
+    invoke-static {p0, p1, v0}, Lf/a/b/p;->h(Landroidx/fragment/app/Fragment;II)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
@@ -1252,41 +1180,43 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     new-instance p1, Landroidx/lifecycle/ViewModelProvider;
 
-    new-instance v1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;
+    new-instance v0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x3
 
-    invoke-direct {v1, v0, v0, v2, v0}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;-><init>(Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreChannelsSelected;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1, v1, v2, v1}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;-><init>(Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreChannelsSelected;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-direct {p1, p0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {p1, p0, v0}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
+    const-class v0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(this, \u2026ifyViewModel::class.java)"
+    const-string v0, "ViewModelProvider(this, \u2026ifyViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerify;->viewModel:Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
 
-    const-string v1, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -1349,21 +1279,14 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1403,7 +1326,7 @@
 
     const-string v4, "requireContext()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v0, :cond_0
 
@@ -1437,7 +1360,7 @@
 
     const-string v2, "getString(\n            i\u2026pDesk.AGE_GATE)\n        )"
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$1.smali
index 72e53e3b2f..cd7ecb59b5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAgeVerifyViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$1;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->access$handleStoreState(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1$1.smali
index d0b03715dc..e8f290eb5b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetAgeVerifyViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1.smali
index 233c944b8e..9f5fc6ae88 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetAgeVerifyViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
@@ -101,9 +103,9 @@
     :goto_0
     if-nez p1, :cond_1
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -132,7 +134,7 @@
 
     sget-object v0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$2.smali
index 0af3180a57..96174ad0c1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$2.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -62,7 +66,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;
-    .locals 1
+    .locals 2
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;
 
@@ -80,6 +84,10 @@
     sget-object p1, Lcom/discord/models/domain/ModelUser$NsfwAllowance;->UNKNOWN:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
     :goto_0
+    const-string v1, "me?.nsfwAllowed ?: ModelUser.NsfwAllowance.UNKNOWN"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {v0, p3, p1, p2}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V
 
     return-object v0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory.smali
index ab0ff658c6..45978ecb1d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory.smali
@@ -39,11 +39,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreChannelsSelected;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeAuth"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeChannelsSelected"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,20 +54,6 @@
     iput-object p2, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeAuth"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreChannelsSelected;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -101,7 +89,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -112,7 +100,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
 
@@ -120,34 +110,25 @@
 
     invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v2
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
-    move-result-object v2
+    move-result-object v3
 
-    iget-object v3, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;->storeAuth:Lcom/discord/stores/StoreAuthentication;
+    iget-object v4, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;->storeAuth:Lcom/discord/stores/StoreAuthentication;
 
-    iget-object v4, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
+    iget-object v5, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
 
     invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory;->observeStores()Lrx/Observable;
 
-    move-result-object v5
+    move-result-object v6
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;-><init>(Lcom/discord/utilities/rest/RestAPI;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreChannelsSelected;Lrx/Observable;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;-><init>(Lcom/discord/utilities/rest/RestAPI;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreChannelsSelected;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeStores()Lrx/Observable;
@@ -193,7 +174,7 @@
 
     sget-object v3, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$Factory$observeStores$1;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -205,7 +186,7 @@
 
     const-string v1, "Observable.combineLatest\u2026hed\n          )\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState.smali
index f94f876265..4f7e9f929a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "nsfwAllowed"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;->authed:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "nsfwAllowed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser$NsfwAllowance;ZILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;
@@ -108,22 +101,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser$NsfwAllowance;Z)Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "nsfwAllowed"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "nsfwAllowed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;->safeChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -151,7 +137,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState.smali
index e1fa86cdc8..1104c49afb 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState.smali
@@ -245,7 +245,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;->errorStringId:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -261,7 +261,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;->dateOfBirth:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -271,7 +271,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;->underageMessage:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -281,7 +281,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;->safeChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$1.smali
index e2c4fdc701..24ec1e78d7 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAgeVerifyViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$1;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->access$handleUserUpdateSuccess(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$2.smali
index c32cbc2adb..002acb918e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAgeVerifyViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$submit$2;->this$0:Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->access$handleUserUpdateFailure(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;Lcom/discord/utilities/error/Error;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel.smali
index 4fd3ea280b..dd86e1b2dc 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerifyViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetAgeVerifyViewModel.kt"
 
 
@@ -16,7 +16,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;",
         ">;"
     }
@@ -55,7 +55,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/rest/RestAPI;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreChannelsSelected;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -69,19 +69,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "restAPI"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "clock"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "storeAuth"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v9, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;
+    const-string v0, "storeChannelsSelected"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeObservable"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;
 
     const/4 v2, 0x0
 
@@ -97,11 +105,11 @@
 
     const/4 v8, 0x0
 
-    move-object v1, v9
+    move-object v1, v0
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$ViewState;-><init>(ZLjava/lang/Integer;ILjava/lang/Long;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Z)V
 
-    invoke-direct {p0, v9}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
@@ -121,62 +129,31 @@
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->storeObservable:Lrx/Observable;
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;
+
+    new-instance v6, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$1;-><init>(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v4, 0x0
 
-    new-instance v7, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$1;
+    const/16 v7, 0x1e
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$1;-><init>(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;)V
+    const/4 v8, 0x0
 
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeAuth"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;)V
@@ -206,7 +183,7 @@
 .method private final handleStoreState(Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel$StoreState;)V
     .locals 11
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -268,7 +245,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2
     return-void
@@ -279,7 +256,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -295,7 +272,7 @@
 
     const-string v2, "error.response"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -303,7 +280,7 @@
 
     const-string v3, "error.response.messages"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v4, "date_of_birth"
 
@@ -317,13 +294,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -334,12 +311,12 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     const-string v0, "error.response.messages\n\u2026IRTH_KEY) { emptyList() }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v2, p1
 
@@ -359,7 +336,7 @@
 
     const-string v3, "\n"
 
-    invoke-static/range {v2 .. v9}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v2 .. v9}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -381,7 +358,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->storeAuth:Lcom/discord/stores/StoreAuthentication;
 
@@ -416,7 +393,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2
     :goto_1
@@ -428,7 +405,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -460,7 +437,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAgeVerifyViewModel;->eventsSubject:Lrx/subjects/PublishSubject;
 
@@ -481,7 +458,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -569,7 +546,7 @@
 
     const-string v1, "eventsSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -579,7 +556,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -611,7 +588,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_0
     return-void
@@ -622,7 +599,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -656,7 +633,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_0
     return-void
@@ -669,7 +646,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -743,7 +720,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -772,7 +749,7 @@
 
     move-result-object v3
 
-    const-string v4, "yyyy-MM-dd"
+    const-string/jumbo v4, "yyyy-MM-dd"
 
     invoke-static {v3, v4}, Lcom/discord/utilities/time/TimeUtils;->toUTCDateTime(Ljava/lang/Long;Ljava/lang/String;)Ljava/lang/String;
 
@@ -808,7 +785,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated$Companion.smali
index 7a58c5d844..98c5859aba 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated$Companion.smali
@@ -36,11 +36,13 @@
 .method public final start(Landroid/content/Context;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/os/Bundle;
 
@@ -60,21 +62,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated.smali
index ff9a44aa59..69fc906e80 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthAgeGated.smali
@@ -31,25 +31,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthAgeGated;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthAgeGated;
+    const-string v2, "navigateToLoginButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNavigateToLoginButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "navigateToLoginButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getNavigateToLoginButton()Landroid/widget/Button;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/auth/WidgetAuthAgeGated;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -113,7 +107,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -128,13 +124,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$Companion.smali
index 38bfc94b83..7887af75b8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$Companion.smali
@@ -36,15 +36,21 @@
 .method public final start(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "username"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "email"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "password"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/os/Bundle;
 
@@ -72,35 +78,7 @@
 
     move-result-object p3
 
-    invoke-static {p1, p2, p3}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, p3}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "email"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onActivityResult$1.smali
index 6da78748eb..c906e8cb59 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onActivityResult$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthBirthday$onActivityResult$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthBirthday.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$onActivityResult$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->register(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali
index dac7f9d83e..c73afbc736 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthBirthday.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali
index 7b78b46a71..bd03b617e5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali
@@ -47,7 +47,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
@@ -59,7 +59,7 @@
 
     const-string p1, "getString(R.string.age_gate_date_of_birth)"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$1.smali
index 41cceaf295..c671a0efb5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthBirthday$register$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthBirthday.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Token;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser$Token;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->registered(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$2.smali
index 319358b958..016be5f6ff 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$register$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthBirthday$register$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthBirthday.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -74,13 +76,4 @@
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->access$handleError(Lcom/discord/widgets/auth/WidgetAuthBirthday;Lcom/discord/utilities/error/Error;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali
index fb613995d0..cf3f515038 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali
@@ -49,49 +49,51 @@
 
 # virtual methods
 .method public getErrorMessage(Landroid/widget/CheckBox;)Ljava/lang/CharSequence;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;
 
-    iget-object v1, v1, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday;
+    iget-object v0, v0, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
-    invoke-static {v1}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Z
+    invoke-static {v0}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     invoke-virtual {p1}, Landroid/widget/CheckBox;->isChecked()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;
 
-    iget-object v1, v1, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday;
+    iget-object v0, v0, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
-    invoke-static {v1}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Z
+    invoke-static {v0}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
     :cond_1
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
+
+    const/4 p1, 0x0
 
     goto :goto_1
 
@@ -100,21 +102,14 @@
 
     move-result-object p1
 
-    const v0, 0x7f1215a7
+    const v0, 0x7f1215d1
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     :goto_1
-    return-object v0
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public bridge synthetic getErrorMessage(Ljava/lang/Object;)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$2.smali
index a07c37ffd6..c079570ae1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthBirthday.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/widget/CheckBox;",
         "Ljava/lang/CharSequence;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,41 +78,31 @@
 .method public final invoke(Landroid/widget/CheckBox;Ljava/lang/CharSequence;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "checkBox"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "errorMessage"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/widget/CheckBox;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {v1, p2, v2, v0, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p2, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
-    const-wide/16 v1, 0x0
+    const-wide/16 v0, 0x0
 
     const/4 p2, 0x1
 
-    invoke-static {p1, v1, v2, p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->hintWithRipple$default(Landroid/view/View;JILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, p2, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->hintWithRipple$default(Landroid/view/View;JILjava/lang/Object;)V
 
     return p2
-
-    :cond_0
-    const-string p1, "errorMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "checkBox"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali
index 66d312962a..138b579a92 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthBirthday.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/view/validators/ValidationManager;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali
index 92eaa174bd..336f0db9fc 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali
@@ -59,101 +59,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthBirthday;
+    const-string v2, "input"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "input"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getInput()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
-    const/4 v2, 0x0
+    const-string v2, "inputWrap"
 
-    aput-object v1, v0, v2
+    const-string v3, "getInputWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthBirthday;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "inputWrap"
-
-    const-string v4, "getInputWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthBirthday;
+    const-string v2, "tosOptIn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTosOptIn()Landroid/widget/CheckBox;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "tosOptIn"
-
-    const-string v4, "getTosOptIn()Landroid/widget/CheckBox;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthBirthday;
+    const-string v2, "policyLinks"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPolicyLinks()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "policyLinks"
-
-    const-string v4, "getPolicyLinks()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthBirthday;
+    const-string v2, "registerButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRegisterButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "registerButton"
-
-    const-string v4, "getRegisterButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -346,7 +316,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    const v1, 0x7f1215a4
+    const v1, 0x7f1215ce
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -356,7 +326,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1212a4
+    const v1, 0x7f1212cf
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -372,7 +342,7 @@
 
     const-string p2, "getString(\n          des\u2026ivacy_policy_url)\n      )"
 
-    invoke-static {v4, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -516,7 +486,7 @@
 
     const-string v1, "error.response"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -524,7 +494,7 @@
 
     const-string v2, "error.response.messages"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "date_of_birth"
 
@@ -544,13 +514,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -561,12 +531,12 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     const-string v1, "error.response.messages\n\u2026IRTH_KEY) { emptyList() }"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v5, p1
 
@@ -586,7 +556,7 @@
 
     const-string v6, "\n"
 
-    invoke-static/range {v5 .. v12}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v5 .. v12}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -604,7 +574,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroid/content/Intent;
 
@@ -622,7 +592,7 @@
 
     move-result-object v1
 
-    invoke-static {p1, v0, v1}, Lf/a/b/k;->b(Landroid/content/Context;ZLandroid/content/Intent;)V
+    invoke-static {p1, v0, v1}, Lf/a/b/m;->b(Landroid/content/Context;ZLandroid/content/Intent;)V
 
     return-void
 
@@ -635,13 +605,13 @@
 
     move-result-object v3
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/view/validators/ValidationManager;->setErrors(Ljava/util/Map;)Ljava/util/Collection;
 
@@ -840,13 +810,13 @@
 
     const-string v1, "Calendar.getInstance()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday;->formatter:Ljava/text/DateFormat;
 
     const-string v2, "formatter"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/util/Calendar;->getTimeZone()Ljava/util/TimeZone;
 
@@ -898,12 +868,12 @@
 
     if-eqz v2, :cond_4
 
-    const v2, 0x7f1215a6
+    const v2, 0x7f1215d0
 
     goto :goto_3
 
     :cond_4
-    const v2, 0x7f1215a5
+    const v2, 0x7f1215cf
 
     :goto_3
     invoke-direct {p0, v1, v2}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
@@ -1008,7 +978,7 @@
 
     move-result-object v0
 
-    const-string v1, "yyyy-MM-dd"
+    const-string/jumbo v1, "yyyy-MM-dd"
 
     invoke-static {v0, v1}, Lcom/discord/utilities/time/TimeUtils;->toUTCDateTime(Ljava/lang/Long;Ljava/lang/String;)Ljava/lang/String;
 
@@ -1053,21 +1023,21 @@
     :cond_1
     const-string p1, "password"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_2
     const-string p1, "email"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_3
-    const-string p1, "username"
+    const-string/jumbo p1, "username"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali
index 6fc7e4c86a..b367ab6164 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$Companion.smali
@@ -47,9 +47,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "callback"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -57,54 +57,47 @@
 
     invoke-virtual {p2, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p2
+
+    goto :goto_0
 
     :cond_0
-    if-eqz v0, :cond_1
+    const/4 p2, 0x0
 
-    const/16 p2, 0xfa0
+    :goto_0
+    if-eqz p2, :cond_1
 
-    if-ne p1, p2, :cond_1
+    const/16 v0, 0xfa0
 
-    invoke-interface {p3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    if-ne p1, v0, :cond_1
+
+    invoke-interface {p3, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     const/4 p1, 0x1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     const/4 p1, 0x0
 
-    :goto_0
+    :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final launch(Lcom/discord/app/AppFragment;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
+    const-class v0, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
+
+    const/4 v1, 0x0
 
     const/16 v2, 0xfa0
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1.smali
index 83b5d73dec..db88a685dd 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthCaptcha.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali
index 4ceedaf503..b71d7557a5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1$2.smali
@@ -51,7 +51,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getThrowable()Ljava/lang/Throwable;
 
@@ -86,7 +86,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v2, v1, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v2, v1, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_1
     return-void
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1.smali
index 5a08666ef3..4b034226c9 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$1.smali
@@ -81,7 +81,15 @@
 
     and-int/lit8 v0, v1, 0x20
 
-    new-instance v7, Lf/a/b/a0;
+    const-string v0, "onNext"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "errorClass"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v7, Lf/a/b/c0;
 
     move-object v0, v7
 
@@ -89,7 +97,7 @@
 
     move-object v3, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p1, v7}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1.smali
index dac5e76c5f..1ae9cbfbd8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthCaptcha$onViewBound$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthCaptcha.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
index 7e9da317b8..9d3516761e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthCaptcha.smali
@@ -35,41 +35,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
+    const-string/jumbo v2, "verifyButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVerifyButton()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "verifyButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getVerifyButton()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
 
-    const/4 v2, 0x0
+    const-string v2, "help"
 
-    aput-object v1, v0, v2
+    const-string v3, "getHelp()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "help"
-
-    const-string v4, "getHelp()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -165,7 +153,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -190,13 +180,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$1.smali
index 2ea2b715c6..678787d894 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$1.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$2.smali
index 19f567921f..6a9bc4d9ce 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$configureRegisterButton$2.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -57,7 +57,7 @@
 
     const-string v0, "it.context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
@@ -65,7 +65,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali
index 978af58122..5b70954d6c 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/auth/WidgetAuthLanding$onViewBound$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetAuthLanding.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/auth/WidgetAuthLanding;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/auth/WidgetAuthLanding;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthLanding;->access$configureUI(Lcom/discord/widgets/auth/WidgetAuthLanding;Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali
index 5902f4777c..9531a69354 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$2.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -57,7 +57,7 @@
 
     const-string v0, "it.context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
@@ -65,7 +65,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali
index 399d9802c9..59be609dc6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding$onViewBound$3.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -57,7 +57,7 @@
 
     const-string v0, "it.context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
@@ -65,7 +65,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
index 67765c4f3a..2e04649277 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
@@ -41,81 +41,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLanding;
+    const-string v2, "buttonLogin"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getButtonLogin()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "buttonLogin"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getButtonLogin()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
-    const/4 v2, 0x0
+    const-string v2, "buttonRegister"
 
-    aput-object v1, v0, v2
+    const-string v3, "getButtonRegister()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLanding;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "buttonRegister"
-
-    const-string v4, "getButtonRegister()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLanding;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "flipper"
-
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLanding;
+    const-string v2, "inviteInfoView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteInfoView()Lcom/discord/widgets/auth/AuthInviteInfoView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inviteInfoView"
-
-    const-string v4, "getInviteInfoView()Lcom/discord/widgets/auth/AuthInviteInfoView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -224,7 +200,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/auth/WidgetAuthAgeGated$Companion;->start(Landroid/content/Context;Ljava/lang/String;)V
 
@@ -423,7 +399,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 9
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -443,13 +421,13 @@
 
     const-string v0, "ViewModelProvider(this, \u2026ingViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthLanding;->viewModel:Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -513,7 +491,7 @@
 
     const-string v1, "samsung"
 
-    invoke-static {p1, v1, v0}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {p1, v1, v0}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result p1
 
@@ -533,13 +511,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$1.smali
index accfaf8049..863e94a8f8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLandingViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;->handleStoreState(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$1.smali
index fca63c3087..37e964a796 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetAuthLandingViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;",
+        ">;>;"
     }
 .end annotation
 
@@ -88,9 +90,9 @@
     :cond_0
     sget-object p1, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;->INSTANCE:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$2.smali
index bfb52eb1f6..8d6dd7c9a7 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$2.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelInvite;",
+        "Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;",
+        "Ljava/lang/String;",
+        "Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -68,7 +72,7 @@
 
     const-string v1, "guildTemplate"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelInvite;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory.smali
index e35c6b010a..f6183157c9 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$Factory.smali
@@ -53,7 +53,7 @@
 
     invoke-direct {v1, p2}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$Factory$observeStoreState$1;-><init>(Lcom/discord/stores/StoreGuildTemplates;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -69,7 +69,7 @@
 
     const-string p2, "Observable.combineLatest\u2026teError\n        )\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -88,7 +88,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;
 
@@ -129,13 +131,4 @@
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreAnalytics;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState.smali
index fd532ca112..024c34996a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelInvite;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildTemplateState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput-object p3, p0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;->ageGateError:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplateState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;Lcom/discord/models/domain/ModelInvite;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;
@@ -108,22 +101,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelInvite;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;)Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildTemplateState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelInvite;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildTemplateState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;->invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -151,7 +137,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;->guildTemplateState:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -161,7 +147,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;->ageGateError:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty.smali
index f0d76574aa..8286fcad2f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty.smali
@@ -91,7 +91,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate.smali
index bf4b179756..cc09439009 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guildTemplate"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p2, v0}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-object p2, p0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;->ageGateError:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;
@@ -93,22 +88,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;-><init>(Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -126,7 +114,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;->guildTemplate:Lcom/discord/models/domain/ModelGuildTemplate;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -140,7 +128,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite.smali
index bf1e6561ca..65fe8fa7cc 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "invite"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p2, v0}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-object p2, p0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;->ageGateError:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;
@@ -93,22 +88,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "invite"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;-><init>(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -126,7 +114,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;->invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -140,7 +128,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel.smali
index 41f3564b59..aeacf1bb13 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLandingViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetAuthLandingViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState;",
         ">;"
     }
@@ -39,7 +39,7 @@
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lcom/discord/stores/StoreAuthentication;Lcom/discord/stores/StoreAnalytics;)V
-    .locals 10
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -52,19 +52,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeAuthentication"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty;
+    const-string v0, "storeAnalytics"
 
-    invoke-direct {v1, v0}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty;-><init>(Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    new-instance v0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty;-><init>(Ljava/lang/String;)V
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;->storeObservable:Lrx/Observable;
 
@@ -74,13 +80,15 @@
 
     const/4 p2, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v1, p2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;
+    const-class v3, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;
 
-    const/4 v3, 0x0
+    new-instance v8, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$1;-><init>(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;)V
 
     const/4 v4, 0x0
 
@@ -88,15 +96,13 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$1;
+    const/4 v7, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$1;-><init>(Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;)V
+    const/16 v9, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v10, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel;->storeAuthentication:Lcom/discord/stores/StoreAuthentication;
 
@@ -107,27 +113,6 @@
     invoke-virtual {p1}, Lcom/discord/stores/StoreAnalytics;->appLandingViewed()V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeAuthentication"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -137,7 +122,9 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$StoreState;->getInvite()Lcom/discord/models/domain/ModelInvite;
 
@@ -157,7 +144,7 @@
 
     invoke-direct {v1, v0, p1}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Invite;-><init>(Lcom/discord/models/domain/ModelInvite;Ljava/lang/String;)V
 
-    invoke-virtual {p0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -176,7 +163,7 @@
 
     invoke-direct {v0, v1, p1}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$GuildTemplate;-><init>(Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -185,17 +172,8 @@
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthLandingViewModel$ViewState$Empty;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1.smali
index 379e7fb029..9c8322bff6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$forgotPassword$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.smali
index 544b04f59f..9eb0b08cc0 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getType()Lcom/discord/utilities/error/Error$Type;
 
@@ -87,13 +89,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$2.smali
index 8fe2e27dee..84a8acfc2b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$login$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/auth/ModelLoginResult;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     sget-object v0, Lcom/discord/widgets/auth/WidgetAuthMfa;->Companion:Lcom/discord/widgets/auth/WidgetAuthMfa$Companion;
 
@@ -75,20 +75,13 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/auth/WidgetAuthMfa$Companion;->start(Landroid/content/Context;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
     sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
     const/4 v0, 0x1
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$3.smali
index 5d47319841..00d00615b2 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$login$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$login$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin$login$3;->this$0:Lcom/discord/widgets/auth/WidgetAuthLogin;
 
@@ -74,13 +76,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->loginAttempt(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1.smali
index 61fefdb809..4496bc4a82 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2.smali
index 2d571828b7..8c2f21b4ba 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,24 +61,19 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "token"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthLogin;
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin$onActivityResult$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {v1, p1, v2, v3, v0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->login$default(Lcom/discord/widgets/auth/WidgetAuthLogin;Ljava/lang/String;ZILjava/lang/Object;)V
+    const/4 v3, 0x0
+
+    invoke-static {v0, p1, v1, v2, v3}, Lcom/discord/widgets/auth/WidgetAuthLogin;->login$default(Lcom/discord/widgets/auth/WidgetAuthLogin;Ljava/lang/String;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$1.smali
index 7b990bb54f..ac45210417 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$3.smali
index 818b36582d..637c0a71b1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,12 +61,14 @@
 .method public final invoke(Landroid/widget/TextView;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;->this$0:Lcom/discord/widgets/auth/WidgetAuthLogin;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x0
 
     const/4 v2, 0x3
@@ -74,11 +76,4 @@
     invoke-static {p1, v0, v1, v2, v0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->login$default(Lcom/discord/widgets/auth/WidgetAuthLogin;Ljava/lang/String;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
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 bc2a0b73b7..9877d432e3 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,22 +71,22 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Landroid/content/Intent;
+    new-instance v1, Landroid/content/Intent;
 
-    const-string v3, "android.settings.ACCESSIBILITY_SETTINGS"
+    const-string v2, "android.settings.ACCESSIBILITY_SETTINGS"
 
-    invoke-direct {v2, v3}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, v2}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
+    invoke-virtual {v0, v1}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
     :try_end_0
     .catch Landroid/content/ActivityNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -97,21 +97,16 @@
 
     move-result-object p1
 
-    const v1, 0x7f1210d8
+    const v0, 0x7f121103
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v1, v2, v0, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :goto_0
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
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 948699e772..bc05534e41 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
@@ -47,17 +47,17 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v0, 0x7f1210d5
+    const v0, 0x7f121100
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const v0, 0x7f1210d6
+    const v0, 0x7f121101
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -65,13 +65,13 @@
 
     sget-object v0, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;
 
-    const v1, 0x7f1210d7
+    const v1, 0x7f121102
 
     invoke-virtual {p1, v1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const v0, 0x7f1203b7
+    const v0, 0x7f1203b8
 
     const/4 v1, 0x0
 
@@ -89,7 +89,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
index d6f0cbed6c..c17dbb9e5d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthLogin$validationManager$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthLogin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/view/validators/ValidationManager;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v6, 0x7f1205ee
+    const v6, 0x7f1205f0
 
     invoke-virtual {v5, v6}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -78,7 +78,7 @@
 
     sget-object v5, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v7, 0x7f1205ed
+    const v7, 0x7f1205ef
 
     invoke-virtual {v5, v7}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -106,7 +106,7 @@
 
     sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v8, 0x7f1210da
+    const v8, 0x7f121105
 
     invoke-virtual {v5, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
index e2bf174458..59258e3771 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
@@ -33,141 +33,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
+    const-string v2, "loginContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoginContainer()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "loginContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getLoginContainer()Landroid/widget/LinearLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const/4 v2, 0x0
+    const-string v2, "emailWrap"
 
-    aput-object v1, v0, v2
+    const-string v3, "getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "emailWrap"
-
-    const-string v4, "getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
+    const-string v2, "passwordWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "passwordWrap"
-
-    const-string v4, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
+    const-string v2, "passwordForgotten"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPasswordForgotten()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "passwordForgotten"
-
-    const-string v4, "getPasswordForgotten()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
+    const-string v2, "login"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLogin()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "login"
-
-    const-string v4, "getLogin()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
+    const-string v2, "passwordManagerLink"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPasswordManagerLink()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "passwordManagerLink"
-
-    const-string v4, "getPasswordManagerLink()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -223,7 +181,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->login$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -329,13 +287,13 @@
 
     move-result-object v0
 
-    const v1, 0x7f1205ee
+    const v1, 0x7f1205f0
 
     const/4 v3, 0x0
 
     const/16 v4, 0xc
 
-    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     goto :goto_1
 
@@ -362,7 +320,7 @@
 
     const/4 v5, 0x2
 
-    invoke-static {v2, v3, v4, v5}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v2, v3, v4, v5}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -372,7 +330,7 @@
 
     const-string v1, "StoreStream\n            \u2026rmers.withDimmer(dimmer))"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -565,7 +523,7 @@
 
     const-string v1, "error.response"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -624,7 +582,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -649,13 +607,13 @@
 
     const-string v5, "errorResponse.messages"
 
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v0}, Lcom/discord/utilities/view/validators/ValidationManager;->setErrors(Ljava/util/Map;)Ljava/util/Collection;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object v0
 
@@ -711,7 +669,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v1
 
@@ -757,7 +715,7 @@
 
     const-string v0, "context ?: return"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getValidationManager()Lcom/discord/utilities/view/validators/ValidationManager;
 
@@ -813,7 +771,7 @@
 
     const-wide/16 v2, 0x0
 
-    invoke-static {v0, v2, v3, p2}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v0, v2, v3, p2}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -823,7 +781,7 @@
 
     const-string p1, "StoreStream\n          .g\u2026rmers.withDimmer(dimmer))"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -882,7 +840,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f1205ef
+    const p1, 0x7f1205f1
 
     invoke-virtual {p0, p1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -890,13 +848,13 @@
 
     const-string v0, "getString(R.string.email\u2026instructions_body, email)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -904,7 +862,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
@@ -946,9 +904,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -958,11 +916,11 @@
 
     move-result-object p1
 
-    const-class v1, Lcom/discord/widgets/auth/WidgetAuthLogin;
+    const-class v0, Lcom/discord/widgets/auth/WidgetAuthLogin;
 
-    sget-object v2, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$1;
+    sget-object v1, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$1;
 
-    invoke-virtual {p1, v1, v2}, Lcom/discord/stores/StoreInviteSettings;->trackWithInvite$app_productionDiscordExternalRelease(Ljava/lang/Class;Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreInviteSettings;->trackWithInvite$app_productionDiscordExternalRelease(Ljava/lang/Class;Lkotlin/jvm/functions/Function1;)V
 
     const p1, 0x7f04003e
 
@@ -970,9 +928,9 @@
 
     move-result p1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColor(Landroidx/fragment/app/Fragment;IZ)V
+    invoke-static {p0, p1, v0}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColor(Landroidx/fragment/app/Fragment;IZ)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->loadCachedEmail()V
 
@@ -980,23 +938,25 @@
 
     move-result-object p1
 
-    new-instance v2, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$2;
+    new-instance v1, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$2;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$2;-><init>(Lcom/discord/widgets/auth/WidgetAuthLogin;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$2;-><init>(Lcom/discord/widgets/auth/WidgetAuthLogin;)V
 
-    invoke-virtual {p1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object p1
 
+    new-instance v1, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;-><init>(Lcom/discord/widgets/auth/WidgetAuthLogin;)V
+
     const/4 v2, 0x0
 
-    new-instance v3, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;
+    const/4 v3, 0x0
 
-    invoke-direct {v3, p0}, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$3;-><init>(Lcom/discord/widgets/auth/WidgetAuthLogin;)V
-
-    invoke-static {p1, v2, v3, v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
+    invoke-static {p1, v2, v1, v0, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getPasswordForgotten()Landroid/view/View;
 
@@ -1029,11 +989,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/LinearLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali
index d29c855d4a..ea7b46c69f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$Companion.smali
@@ -36,11 +36,13 @@
 .method public final start(Landroid/content/Context;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "ticket"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -52,21 +54,7 @@
 
     const-class p2, Lcom/discord/widgets/auth/WidgetAuthMfa;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ticket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1.smali
index 9a4e11c3f6..aa8680fec5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthMfa$evaluateCode$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthMfa.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/auth/ModelLoginResult;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali
index 8e2f529c7a..5369cfd4fb 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali
@@ -54,7 +54,7 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -82,7 +82,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05ab
+    .packed-switch 0x7f0a05b1
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onResume$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onResume$1.smali
index 03f8c6bdd2..b6b3b13538 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthMfa$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthMfa.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali
index faf2a8b4b3..edf62e908d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/auth/WidgetAuthMfa$onViewBound$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetAuthMfa.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/auth/WidgetAuthMfa;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/auth/WidgetAuthMfa;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "evaluateCode"
+
+    const-string v5, "evaluateCode(Ljava/lang/String;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "evaluateCode"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/auth/WidgetAuthMfa;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "evaluateCode(Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/auth/WidgetAuthMfa;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthMfa;->access$evaluateCode(Lcom/discord/widgets/auth/WidgetAuthMfa;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali
index 16f78dacf3..51063d775c 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.smali
@@ -51,13 +51,13 @@
 
     const-string v1, "dialog"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1;->$editText:Lcom/google/android/material/textfield/TextInputLayout;
 
     const-string v2, "editText"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getTextOrEmpty(Lcom/google/android/material/textfield/TextInputLayout;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$1.smali
index 0e2dfd0b11..cc08716564 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthMfa.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$2.smali
index 9676dd8fd9..c0a113c25e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetAuthMfa.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/auth/WidgetAuthMfa;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/auth/WidgetAuthMfa;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "evaluateCode"
+
+    const-string v5, "evaluateCode(Ljava/lang/String;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "evaluateCode"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/auth/WidgetAuthMfa;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "evaluateCode(Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/auth/WidgetAuthMfa;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthMfa;->access$evaluateCode(Lcom/discord/widgets/auth/WidgetAuthMfa;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$3.smali
index 98a3599f12..a8e36c0a98 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthMfa$tryPasteCodeFromClipboard$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthMfa.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
index c8f0dc219e..bd5944b9ad 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
@@ -39,41 +39,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthMfa;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthMfa;
+    const-string v2, "codeVerificationView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCodeVerificationView()Lcom/discord/views/CodeVerificationView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "codeVerificationView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCodeVerificationView()Lcom/discord/views/CodeVerificationView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthMfa;
 
-    const/4 v2, 0x0
+    const-string v2, "dimmer"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthMfa;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -105,7 +93,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthMfa;->codeVerificationView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -181,13 +169,13 @@
 
     if-ge v0, v1, :cond_0
 
-    const p1, 0x7f121616
+    const p1, 0x7f121640
 
     const/4 p2, 0x0
 
     const/4 v0, 0x4
 
-    invoke-static {p0, p1, p2, v0}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, p2, v0}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     return-void
 
@@ -208,13 +196,13 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f121640
+    const p1, 0x7f12166a
 
     const/4 v0, 0x0
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     return-void
 
@@ -247,7 +235,7 @@
 
     const-wide/16 v2, 0x0
 
-    invoke-static {v1, v2, v3, v0}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v1, v2, v3, v0}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -255,7 +243,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -267,7 +255,7 @@
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/auth/WidgetAuthMfa$evaluateCode$2;-><init>(Lcom/discord/widgets/auth/WidgetAuthMfa;)V
 
-    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -278,7 +266,7 @@
     :cond_1
     const-string p1, "ticket"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -336,7 +324,7 @@
 
     const-string v1, "context ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f0d0159
 
@@ -346,7 +334,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0a82
+    const v2, 0x7f0a0a87
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -354,13 +342,13 @@
 
     check-cast v2, Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v3, 0x7f0a0a83
+    const v3, 0x7f0a0a88
 
     invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v3
 
-    const v4, 0x7f0a0a81
+    const v4, 0x7f0a0a86
 
     invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -407,7 +395,7 @@
 
     const-string v1, "context ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f0d015a
 
@@ -417,7 +405,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0a85
+    const v2, 0x7f0a0a8a
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -427,7 +415,7 @@
 
     check-cast v7, Landroid/widget/TextView;
 
-    const v2, 0x7f0a0a84
+    const v2, 0x7f0a0a89
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -445,7 +433,7 @@
 
     move-result-object v9
 
-    const v1, 0x7f121623
+    const v1, 0x7f12164d
 
     const/4 v2, 0x2
 
@@ -469,11 +457,11 @@
 
     const-string v2, "getString(\n        R.str\u2026OOGLE_AUTHENTICATOR\n    )"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "infoTextView"
 
-    invoke-static {v7, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -512,7 +500,7 @@
 
     const-string v1, "context ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "clipboard"
 
@@ -541,7 +529,7 @@
 
     const-string v2, "clipboard.primaryClip ?: return"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/ClipData;->getItemCount()I
 
@@ -589,7 +577,7 @@
 
     const-string v2, "clipboardText"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v0}, Lcom/discord/views/CodeVerificationView;->setCode(Ljava/lang/CharSequence;)V
 
@@ -613,7 +601,7 @@
 
     const-string v1, "Observable\n            .\u2026L, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -728,7 +716,7 @@
     :cond_2
     const-string p1, "ticket"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -738,13 +726,15 @@
 .method public onContextItemSelected(Landroid/view/MenuItem;)Z
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result v0
 
-    const v1, 0x7f0a05ba
+    const v1, 0x7f0a05c0
 
     if-eq v0, v1, :cond_0
 
@@ -761,25 +751,18 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreateContextMenu(Landroid/view/ContextMenu;Landroid/view/View;Landroid/view/ContextMenu$ContextMenuInfo;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "menu"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "v"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/fragment/app/Fragment;->onCreateContextMenu(Landroid/view/ContextMenu;Landroid/view/View;Landroid/view/ContextMenu$ContextMenuInfo;)V
 
@@ -796,20 +779,6 @@
     invoke-virtual {p2, p3, p1}, Landroid/view/MenuInflater;->inflate(ILandroid/view/Menu;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "menu"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onResume()V
@@ -823,13 +792,13 @@
 
     sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v0, "Observable\n          .just(Unit)"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -873,7 +842,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -894,13 +865,4 @@
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->registerForContextMenu(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali
index 432dfe82e5..d503c97f4d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthRegister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->access$register(Lcom/discord/widgets/auth/WidgetAuthRegister;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$1.smali
index 4cfde3a2ac..b306320cb2 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthRegister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$2.smali
index af5718ef7e..09c2076fe8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthRegister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,9 +59,11 @@
 .end method
 
 .method public final invoke(Landroid/widget/TextView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$onViewBound$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister;
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1}, Landroid/widget/Button;->performClick()Z
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$1.smali
index 910643b88f..00a2fba81c 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister$register$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthRegister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Token;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$2.smali
index 9dbcca0431..d87718dd1a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$register$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister$register$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthRegister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -74,13 +76,4 @@
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->access$handleError(Lcom/discord/widgets/auth/WidgetAuthRegister;Lcom/discord/utilities/error/Error;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
index d6f5c270c7..05bf853cd4 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
@@ -49,49 +49,51 @@
 
 # virtual methods
 .method public getErrorMessage(Landroid/widget/CheckBox;)Ljava/lang/CharSequence;
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;
 
-    iget-object v1, v1, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister;
+    iget-object v0, v0, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    invoke-static {v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthRegister;)Z
+    invoke-static {v0}, Lcom/discord/widgets/auth/WidgetAuthRegister;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthRegister;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     invoke-virtual {p1}, Landroid/widget/CheckBox;->isChecked()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;
 
-    iget-object v1, v1, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister;
+    iget-object v0, v0, Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    invoke-static {v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthRegister;)Z
+    invoke-static {v0}, Lcom/discord/widgets/auth/WidgetAuthRegister;->access$isConsentRequired$p(Lcom/discord/widgets/auth/WidgetAuthRegister;)Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
     :cond_1
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
+
+    const/4 p1, 0x0
 
     goto :goto_1
 
@@ -100,21 +102,14 @@
 
     move-result-object p1
 
-    const v0, 0x7f1215a7
+    const v0, 0x7f1215d1
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
     :goto_1
-    return-object v0
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public bridge synthetic getErrorMessage(Ljava/lang/Object;)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$2.smali
index 494ab02f88..b64a4adbe9 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthRegister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/widget/CheckBox;",
         "Ljava/lang/CharSequence;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,41 +78,31 @@
 .method public final invoke(Landroid/widget/CheckBox;Ljava/lang/CharSequence;)Z
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "checkBox"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "errorMessage"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/widget/CheckBox;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {v1, p2, v2, v0, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p2, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
-    const-wide/16 v1, 0x0
+    const-wide/16 v0, 0x0
 
     const/4 p2, 0x1
 
-    invoke-static {p1, v1, v2, p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->hintWithRipple$default(Landroid/view/View;JILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, p2, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->hintWithRipple$default(Landroid/view/View;JILjava/lang/Object;)V
 
     return p2
-
-    :cond_0
-    const-string p1, "errorMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "checkBox"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
index 51835293ff..e051938821 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetAuthRegister$validationManager$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAuthRegister.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/view/validators/ValidationManager;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v7, 0x7f121760
+    const v7, 0x7f12178a
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -78,7 +78,7 @@
 
     aput-object v6, v5, v7
 
-    const-string v6, "username"
+    const-string/jumbo v6, "username"
 
     invoke-direct {v2, v6, v3, v5}, Lcom/discord/utilities/view/validators/Input$TextInputLayoutInput;-><init>(Ljava/lang/String;Lcom/google/android/material/textfield/TextInputLayout;[Lcom/discord/utilities/view/validators/InputValidator;)V
 
@@ -98,7 +98,7 @@
 
     sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v9, 0x7f1205ee
+    const v9, 0x7f1205f0
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -108,7 +108,7 @@
 
     sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v9, 0x7f1205ed
+    const v9, 0x7f1205ef
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -134,7 +134,7 @@
 
     sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v9, 0x7f1210da
+    const v9, 0x7f121105
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -144,7 +144,7 @@
 
     sget-object v7, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v8, 0x7f1210d4
+    const v8, 0x7f1210ff
 
     invoke-virtual {v7, v8}, Lcom/discord/utilities/auth/AuthUtils;->createPasswordInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
index 8fdde163eb..cda54690f1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
@@ -39,161 +39,113 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+    const-string v2, "registerContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRegisterContainer()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "registerContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRegisterContainer()Landroid/widget/LinearLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "usernameWrap"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUsernameWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "usernameWrap"
-
-    const-string v4, "getUsernameWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+    const-string v2, "emailWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emailWrap"
-
-    const-string v4, "getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+    const-string v2, "passwordWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "passwordWrap"
-
-    const-string v4, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+    const-string v2, "registerButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRegisterButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "registerButton"
-
-    const-string v4, "getRegisterButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+    const-string v2, "policyLinks"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPolicyLinks()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "policyLinks"
-
-    const-string v4, "getPolicyLinks()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+    const-string v2, "tosOptIn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTosOptIn()Landroid/widget/CheckBox;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "tosOptIn"
-
-    const-string v4, "getTosOptIn()Landroid/widget/CheckBox;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
@@ -257,7 +209,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->policyLinks$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -409,7 +361,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120f70
+    const v1, 0x7f120f9a
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -478,7 +430,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    const v1, 0x7f1215a4
+    const v1, 0x7f1215ce
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -488,7 +440,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1212a4
+    const v1, 0x7f1212cf
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -504,7 +456,7 @@
 
     const-string p2, "getString(\n          des\u2026ivacy_policy_url)\n      )"
 
-    invoke-static {v4, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -681,7 +633,7 @@
 
     const-string v1, "error.response"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -704,7 +656,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -712,7 +664,7 @@
 
     const-string v3, "error.response.messages"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/view/validators/ValidationManager;->setErrors(Ljava/util/Map;)Ljava/util/Collection;
 
@@ -811,7 +763,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getUsernameWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -898,7 +850,7 @@
 
     const-wide/16 v2, 0x0
 
-    invoke-static {v1, v2, v3, v0}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v1, v2, v3, v0}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -908,7 +860,7 @@
 
     const-string p1, "StoreStream\n          .g\u2026rmers.withDimmer(dimmer))"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
 
@@ -980,9 +932,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -992,11 +944,13 @@
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const-string v0, "2020-04_new_user_age_gate"
 
-    const-string v2, "2020-04_new_user_age_gate"
+    const/4 v1, 0x0
 
-    invoke-static {p1, v2, v0, v1, v0}, Lcom/discord/stores/StoreExperiments;->getExperimentSnapshot$app_productionDiscordExternalRelease$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/stores/StoreExperiments$Experiment;
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/stores/StoreExperiments;->getExperimentSnapshot$app_productionDiscordExternalRelease$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/stores/StoreExperiments$Experiment;
 
     move-result-object p1
 
@@ -1004,7 +958,7 @@
 
     move-result p1
 
-    const/16 v1, 0x8
+    const/16 v0, 0x8
 
     const/4 v2, 0x0
 
@@ -1020,7 +974,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
     goto :goto_0
 
@@ -1101,10 +1055,10 @@
 
     if-eqz v3, :cond_3
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :cond_3
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getPolicyLinks()Landroid/widget/TextView;
 
@@ -1112,35 +1066,28 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
-    iget-boolean v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->isConsentRequired:Z
+    iget-boolean v1, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->isConsentRequired:Z
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_4
 
-    const v0, 0x7f1215a6
+    const v1, 0x7f1215d0
 
     goto :goto_2
 
     :cond_4
-    const v0, 0x7f1215a5
+    const v1, 0x7f1215cf
 
     :goto_2
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_5
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
index 6dc9d8c6c7..0eec4a5f27 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$Companion.smali
@@ -45,7 +45,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_2
+    const-string v0, "callback"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -68,21 +70,14 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final launch(Lcom/discord/app/AppFragment;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -96,22 +91,13 @@
 
     const-string v0, "Intent().putExtra(ARG_DISABLED_KEY, disabled)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
 
     const/16 v1, 0xfa0
 
-    invoke-static {p1, v0, p2, v1}, Lf/a/b/k;->g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, p2, v1}, Lf/a/b/m;->g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali
index b47f6eae74..891e57dfe7 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -57,7 +57,7 @@
 
     const-string v0, "it.context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -65,7 +65,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
index 0c1315aa87..5f8379a28f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
@@ -39,61 +39,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
+    const-string v2, "titleView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleView()Lcom/discord/views/ScreenTitleView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "titleView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitleView()Lcom/discord/views/ScreenTitleView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
 
-    const/4 v2, 0x0
+    const-string v2, "buttonDelete"
 
-    aput-object v1, v0, v2
+    const-string v3, "getButtonDelete()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "buttonDelete"
-
-    const-string v4, "getButtonDelete()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
+    const-string v2, "buttonCancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getButtonCancel()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buttonCancel"
-
-    const-string v4, "getButtonCancel()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -217,7 +199,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -232,15 +216,6 @@
     invoke-static {p0, p1, v0}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColor(Landroidx/fragment/app/Fragment;IZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -274,7 +249,7 @@
 
     const-string v2, "getString(R.string.account_disabled_title)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/views/ScreenTitleView;->setTitle(Ljava/lang/CharSequence;)V
 
@@ -305,7 +280,7 @@
 
     const-string v2, "getString(R.string.accou\u2026duled_for_deletion_title)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/views/ScreenTitleView;->setTitle(Ljava/lang/CharSequence;)V
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1.smali
index 867074d6e6..c5abf93505 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/net/Uri;",
         "Ljava/lang/String;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,11 +74,13 @@
 .method public final invoke(Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getQueryParameterOrThrow"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "parameterName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
@@ -94,18 +96,4 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "parameterName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "$this$getQueryParameterOrThrow"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$handleError$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$handleError$1.smali
index af9f6254c0..8b782e5736 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$handleError$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion$handleError$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion$handleError$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
index 2bc62bfeab..59b14e9605 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
@@ -98,6 +98,8 @@
 
     sget-object v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1;
 
+    new-instance v16, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+
     const-string v2, "client_id"
 
     invoke-virtual {v1, v0, v2}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1;->invoke(Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
@@ -106,73 +108,71 @@
 
     invoke-static {v2}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
-    move-result-wide v4
+    move-result-wide v3
 
     const-string v2, "redirect_uri"
 
     invoke-virtual {v0, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
     const-string v2, "response_type"
 
     invoke-virtual {v0, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v6
 
     const-string v2, "state"
 
     invoke-virtual {v0, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v5
 
     const-string v2, "scope"
 
     invoke-virtual {v1, v0, v2}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion$createOauthAuthorize$1;->invoke(Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v10
+    move-result-object v9
 
     const-string v1, "permissions"
 
     invoke-virtual {v0, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v11
+    move-result-object v10
 
     const-string v1, "code_challenge"
 
     invoke-virtual {v0, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v12
+    move-result-object v11
 
     const-string v1, "code_challenge_method"
 
     invoke-virtual {v0, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v13
+    move-result-object v12
 
     const-string v1, "internal_referrer"
 
     invoke-virtual {v0, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v14
+    move-result-object v13
 
-    new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/16 v14, 0x10
 
-    const/16 v15, 0x10
+    const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    move-object/from16 v2, v16
 
-    move-object v3, v0
+    invoke-direct/range {v2 .. v15}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-direct/range {v3 .. v16}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v0
+    return-object v16
 .end method
 
 .method private final handleError(Landroid/content/Context;Ljava/lang/Exception;Lkotlin/jvm/functions/Function0;)V
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -196,7 +196,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f121078
+    const v2, 0x7f1210a2
 
     invoke-virtual {p1, v2, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -204,19 +204,17 @@
 
     const-string v2, "context.getString(R.stri\u2026missing_param, e.message)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v3, 0x5
+    invoke-virtual {v2, v1, p2}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    const/4 v4, 0x0
+    const/4 p2, 0x0
 
-    invoke-virtual {v2, v1, v3, p2, v4}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    const/16 v2, 0x8
 
-    const/16 p2, 0x8
-
-    invoke-static {p1, v1, v0, v4, p2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v1, v0, p2, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     invoke-interface {p3}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
@@ -255,11 +253,13 @@
 .method public final launch(Landroid/content/Context;Landroid/net/Uri;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "requestUri"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-direct {p0, p2}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;->createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
@@ -285,6 +285,8 @@
 
     invoke-static/range {v1 .. v6}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;->handleError$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;Landroid/content/Context;Ljava/lang/Exception;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
+    const/4 v0, 0x0
+
     :goto_0
     if-eqz v0, :cond_3
 
@@ -302,7 +304,7 @@
 
     const-string v2, "591317049637339146"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -322,7 +324,7 @@
 
     const-string v4, "samsung"
 
-    invoke-static {v1, v4, v2}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v1, v4, v2}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v1
 
@@ -358,22 +360,8 @@
 
     move-result-object p2
 
-    invoke-static {p1, v1, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v1, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "requestUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize.smali
index a814b19781..937b6f42b8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize.smali
@@ -40,11 +40,13 @@
 .method public constructor <init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "prompt"
 
-    if-eqz p6, :cond_1
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_0
+    const-string v0, "scope"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,20 +71,6 @@
     iput-object p11, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->internalReferrer:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "scope"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "prompt"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -370,7 +358,7 @@
 
     const/4 v3, 0x6
 
-    invoke-static {v0, v1, v2, v2, v3}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {v0, v1, v2, v2, v3}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object v0
 
@@ -404,15 +392,15 @@
 
     const-string v4, "bot"
 
-    invoke-static {v1, v4, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v1, v4, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v4
 
     if-nez v4, :cond_3
 
-    const-string v4, "webhook.incoming"
+    const-string/jumbo v4, "webhook.incoming"
 
-    invoke-static {v1, v4, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v1, v4, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v1
 
@@ -541,11 +529,17 @@
 .method public final copy(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "prompt"
 
-    if-eqz p6, :cond_1
+    move-object/from16 v7, p6
 
-    if-eqz p7, :cond_0
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "scope"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
 
@@ -559,10 +553,6 @@
 
     move-object/from16 v6, p5
 
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
     move-object/from16 v9, p8
 
     move-object/from16 v10, p9
@@ -574,20 +564,6 @@
     invoke-direct/range {v1 .. v12}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "scope"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "prompt"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -613,7 +589,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->state:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -623,7 +599,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->responseType:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -633,7 +609,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->redirectUrl:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -643,7 +619,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->prompt:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -653,7 +629,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->scope:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -663,7 +639,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->permissions:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -673,7 +649,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallenge:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -683,7 +659,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->codeChallengeMethod:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -693,7 +669,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->internalReferrer:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1056,7 +1032,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     invoke-static {v0, p1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel.smali
index 96fefee034..cd0eca04e1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel.smali
@@ -43,7 +43,7 @@
     :cond_0
     const-string v0, "oauthAuthorize"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -59,22 +59,15 @@
 .end method
 
 .method public final setOauthAuthorize(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->oauthAuthorize:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOauthGetResponse(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;)V
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
index bd29fc9550..86c60087d2 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;
 
@@ -42,41 +42,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "iconIv"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconIv()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "iconIv"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getIconIv()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "nameTv"
 
-    const/4 v3, 0x0
+    const-string v3, "getNameTv()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "nameTv"
+    const/4 v2, 0x1
 
-    const-string v4, "getNameTv()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -84,13 +72,15 @@
 .end method
 
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
-    const p1, 0x7f0a0662
+    const p1, 0x7f0a0668
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -98,7 +88,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0663
+    const p1, 0x7f0a0669
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -107,15 +97,6 @@
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getIconIv()Landroid/widget/ImageView;
@@ -163,7 +144,9 @@
 .method public bind(Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;)V
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;->getScope()Ljava/lang/String;
 
@@ -175,7 +158,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080274
+    const v1, 0x7f080275
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -202,7 +185,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080284
+    const v1, 0x7f080285
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -223,15 +206,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic bind(Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.smali
index 46604e89ce..aa1b966de8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$adapter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -60,11 +60,13 @@
 .method public final invoke(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "layoutInflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00a4
 
@@ -78,25 +80,11 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "layoutInflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$1.smali
index 11a7bdd12c..976f6fd464 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getBodyText()Ljava/lang/String;
 
@@ -75,7 +77,7 @@
 
     const-string v2, "captcha_key"
 
-    invoke-static {p1, v2, v0, v1}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p1, v2, v0, v1}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p1
 
@@ -91,13 +93,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$2.smali
index 59f243111b..7729cf6c43 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;->getLocation()Ljava/lang/String;
 
@@ -73,25 +73,27 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v3, "Redirect OAuth flow to: "
+    const-string v2, "Redirect OAuth flow to: "
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -107,7 +109,7 @@
 
     const-string v0, "Intent(Intent.ACTION_VIE\u2026t.FLAG_ACTIVITY_NEW_TASK)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
@@ -145,11 +147,4 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onActivityResult$isCaptchaHandled$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onActivityResult$isCaptchaHandled$1.smali
index aad25f6326..6dc52fcce6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onActivityResult$isCaptchaHandled$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onActivityResult$isCaptchaHandled$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$onActivityResult$isCaptchaHandled$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onActivityResult$isCaptchaHandled$1;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->access$authorizeApplication(Lcom/discord/widgets/auth/WidgetOauth2Authorize;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$1.smali
index 2a4019a8d8..701e67fc69 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3.smali
index ccbb42a1ed..f7df143428 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3.smali
@@ -46,21 +46,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
@@ -74,7 +60,17 @@
     invoke-virtual {v0}, Landroid/app/Activity;->finishAndRemoveTask()V
 
     :cond_0
-    const/4 v0, 0x1
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    return v0
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$1.smali
index daacd12578..f22fc2fed6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,49 +59,52 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 4
+    .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "error"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "error.response"
+    const-string v1, "error.response"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v3, "it"
+    const-string v2, "it"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
+    invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
-    move-result v3
+    move-result v2
 
-    xor-int/lit8 v3, v3, 0x1
+    xor-int/lit8 v2, v2, 0x1
 
-    if-eqz v3, :cond_0
-
-    move-object v0, v1
-
-    :cond_0
-    if-eqz v0, :cond_1
+    if-eqz v2, :cond_0
 
     goto :goto_0
 
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
     :cond_1
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
@@ -121,7 +124,7 @@
 
     move-result-object v0
 
-    :goto_0
+    :goto_1
     iget-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
     invoke-static {v1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->access$getValidationManager$p(Lcom/discord/widgets/auth/WidgetOauth2Authorize;)Lcom/discord/utilities/view/validators/ValidationManager;
@@ -152,11 +155,4 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$2.smali
index 9be71c209b..f2a3c61c6b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->configureUI(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "response"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$1.smali
index 37f0b9b684..3b83a7e96b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$1.smali
@@ -62,7 +62,7 @@
 
     move-result-object v0
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -72,7 +72,7 @@
 
     const/4 v3, 0x1
 
-    invoke-static {v0, p1, v3, v1, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v3, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return v3
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali
index b57c6a75b6..2b3e9a30f6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali
@@ -60,7 +60,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v1}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v1
 
@@ -102,11 +102,11 @@
 
     const/4 v5, 0x6
 
-    invoke-static {v2, v4, v0, v0, v5}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {v2, v4, v0, v0, v5}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v2, v1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -148,7 +148,7 @@
 
     iget-object v2, v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const v4, 0x7f121077
+    const v4, 0x7f1210a1
 
     new-array v5, v3, [Ljava/lang/Object;
 
@@ -160,9 +160,9 @@
 
     const-string v1, "getString(R.string.oauth\u2026invalid_scope, scopeName)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v0}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v0
 
@@ -170,7 +170,7 @@
 
     const/16 v2, 0x8
 
-    invoke-static {p1, v0, v3, v1, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v3, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return v3
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.smali
index a8e2610373..445f608fd5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2Authorize.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/view/validators/ValidationManager;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
index 65d416f14a..e0885902ce 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
@@ -94,261 +94,183 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string/jumbo v2, "userIconIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "userIconIv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUserIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const/4 v2, 0x0
+    const-string v2, "appIconIv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getAppIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "appIconIv"
-
-    const-string v4, "getAppIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "appNameTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAppNameTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "appNameTv"
-
-    const-string v4, "getAppNameTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "permissionsLabelTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPermissionsLabelTv()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "permissionsLabelTv"
-
-    const-string v4, "getPermissionsLabelTv()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "ageNoticeTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAgeNoticeTv()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "ageNoticeTv"
-
-    const-string v4, "getAgeNoticeTv()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "securityNoticeTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSecurityNoticeTv()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "securityNoticeTv"
-
-    const-string v4, "getSecurityNoticeTv()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "permissionsList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPermissionsList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "permissionsList"
-
-    const-string v4, "getPermissionsList()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "grantBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGrantBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "grantBtn"
-
-    const-string v4, "getGrantBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string/jumbo v2, "unsupportedBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnsupportedBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "unsupportedBtn"
-
-    const-string v4, "getUnsupportedBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "denyBtns"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDenyBtns()Ljava/util/List;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "denyBtns"
-
-    const-string v4, "getDenyBtns()Ljava/util/List;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "loadingScreen"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoadingScreen()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "loadingScreen"
-
-    const-string v4, "getLoadingScreen()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "contentScreen"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContentScreen()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "contentScreen"
-
-    const-string v4, "getContentScreen()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+    const-string v2, "notSupportedScreen"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotSupportedScreen()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notSupportedScreen"
-
-    const-string v4, "getNotSupportedScreen()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
@@ -372,7 +294,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0661
+    const v0, 0x7f0a0667
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -380,7 +302,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->userIconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0650
+    const v0, 0x7f0a0656
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -388,7 +310,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->appIconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0651
+    const v0, 0x7f0a0657
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -396,7 +318,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->appNameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a065b
+    const v0, 0x7f0a0661
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -404,7 +326,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->permissionsLabelTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a064e
+    const v0, 0x7f0a0654
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -412,7 +334,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->ageNoticeTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a065d
+    const v0, 0x7f0a0663
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -420,7 +342,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->securityNoticeTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a065c
+    const v0, 0x7f0a0662
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -428,7 +350,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->permissionsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0656
+    const v0, 0x7f0a065c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -436,7 +358,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->grantBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a065f
+    const v0, 0x7f0a0665
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -450,13 +372,13 @@
 
     fill-array-data v0, :array_0
 
-    invoke-static {p0, v0}, Lf/n/a/k/a;->n(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->l(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->denyBtns$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0657
+    const v0, 0x7f0a065d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -464,7 +386,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->loadingScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0654
+    const v0, 0x7f0a065a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -472,7 +394,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->contentScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a065a
+    const v0, 0x7f0a0660
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -506,9 +428,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0655
-        0x7f0a0658
-        0x7f0a0660
+        0x7f0a065b
+        0x7f0a065e
+        0x7f0a0666
     .end array-data
 .end method
 
@@ -600,7 +522,7 @@
     :cond_0
     const-string p1, "oauth2ViewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -624,7 +546,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121069
+    const v2, 0x7f121093
 
     invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -632,7 +554,7 @@
 
     const-string v2, "resources.getString(R.st\u2026h2_details_creation_date)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -662,7 +584,7 @@
 
     const-string p2, "java.lang.String.format(format, *args)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -726,12 +648,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f121065
+    const p1, 0x7f12108f
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f121066
+    const p1, 0x7f121090
 
     :goto_0
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -740,7 +662,7 @@
 
     const-string p1, "getString(\n        when \u2026nd_notice\n        }\n    )"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getSecurityNoticeTv()Lcom/discord/app/AppTextView;
 
@@ -754,7 +676,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -998,52 +920,52 @@
 .method private final getRandomFakeScopeText()I
     .locals 2
 
-    sget-object v0, Lj0/p/c;->b:Lj0/p/c$a;
+    sget-object v0, Lk0/q/c;->b:Lk0/q/c$a;
 
     const/16 v1, 0x8
 
-    invoke-virtual {v0, v1}, Lj0/p/c$a;->nextInt(I)I
+    invoke-virtual {v0, v1}, Lk0/q/c$a;->nextInt(I)I
 
     move-result v0
 
     packed-switch v0, :pswitch_data_0
 
-    const v0, 0x7f121074
+    const v0, 0x7f12109e
 
     goto :goto_0
 
     :pswitch_0
-    const v0, 0x7f121073
+    const v0, 0x7f12109d
 
     goto :goto_0
 
     :pswitch_1
-    const v0, 0x7f121072
+    const v0, 0x7f12109c
 
     goto :goto_0
 
     :pswitch_2
-    const v0, 0x7f121071
+    const v0, 0x7f12109b
 
     goto :goto_0
 
     :pswitch_3
-    const v0, 0x7f121070
+    const v0, 0x7f12109a
 
     goto :goto_0
 
     :pswitch_4
-    const v0, 0x7f12106f
+    const v0, 0x7f121099
 
     goto :goto_0
 
     :pswitch_5
-    const v0, 0x7f12106e
+    const v0, 0x7f121098
 
     goto :goto_0
 
     :pswitch_6
-    const v0, 0x7f12106d
+    const v0, 0x7f121097
 
     :goto_0
     return v0
@@ -1151,7 +1073,7 @@
 
     const-string v2, "javaClass.simpleName"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
@@ -1169,7 +1091,7 @@
 
     aput-object p1, v2, v3
 
-    const p1, 0x7f121077
+    const p1, 0x7f1210a1
 
     invoke-virtual {p0, p1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1177,9 +1099,9 @@
 
     const-string v2, "getString(R.string.oauth\u2026t_invalid_scope, e.scope)"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1187,7 +1109,7 @@
 
     const/16 v4, 0x8
 
-    invoke-static {v0, p1, v1, v2, v4}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v4}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
@@ -1206,51 +1128,55 @@
 
 # virtual methods
 .method public configureUI(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;)V
-    .locals 19
+    .locals 25
 
     move-object/from16 v1, p0
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_8
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getNotSupportedScreen()Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v0
 
     const/16 v3, 0x8
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getLoadingScreen()Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v0
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getContentScreen()Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v0
 
     const/4 v3, 0x0
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v2
+    move-result-object v0
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getUserIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v4
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
 
     move-result-object v6
 
+    const/4 v14, 0x0
+
     if-eqz v6, :cond_0
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v7
 
@@ -1270,14 +1196,14 @@
 
     invoke-static/range {v5 .. v11}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v0
 
-    move-object v5, v2
+    move-object v5, v0
 
     goto :goto_0
 
     :cond_0
-    move-object v5, v0
+    move-object v5, v14
 
     :goto_0
     const/4 v6, 0x0
@@ -1300,235 +1226,235 @@
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;->getApplication()Lcom/discord/models/domain/ModelApplication;
 
-    move-result-object v2
+    move-result-object v0
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getAppNameTv()Landroid/widget/TextView;
 
+    move-result-object v2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
+
     move-result-object v4
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getPermissionsLabelTv()Lcom/discord/app/AppTextView;
 
-    move-result-object v4
+    move-result-object v2
 
-    const v5, 0x7f12107a
+    const v4, 0x7f1210a4
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
-    new-array v7, v6, [Ljava/lang/Object;
+    new-array v6, v5, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    aput-object v8, v7, v3
+    aput-object v7, v6, v3
 
-    invoke-virtual {v4, v5, v7}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
+    invoke-virtual {v2, v4, v6}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getAppIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
+    move-result-object v15
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
+
     move-result-object v9
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
+    if-eqz v9, :cond_1
 
-    move-result-object v13
+    sget-object v6, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
-    if-eqz v13, :cond_1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getId()J
 
-    sget-object v10, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+    move-result-wide v7
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplication;->getId()J
+    const/4 v10, 0x0
 
-    move-result-wide v11
+    const/4 v11, 0x4
 
-    const/4 v14, 0x0
+    const/4 v12, 0x0
 
-    const/4 v15, 0x4
+    invoke-static/range {v6 .. v12}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
 
-    const/16 v16, 0x0
+    move-result-object v0
 
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    move-object v10, v2
+    move-object/from16 v16, v0
 
     goto :goto_1
 
     :cond_1
-    move-object v10, v0
+    move-object/from16 v16, v14
 
     :goto_1
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0xfc
+    const/16 v17, 0x0
 
     const/16 v18, 0x0
 
-    invoke-static/range {v9 .. v18}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
+    const/16 v19, 0x0
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    const/16 v22, 0x0
+
+    const/16 v23, 0xfc
+
+    const/16 v24, 0x0
+
+    invoke-static/range {v15 .. v24}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     :try_start_0
-    iget-object v2, v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
+    iget-object v0, v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
-    if-eqz v2, :cond_7
+    if-eqz v0, :cond_7
 
-    invoke-virtual {v2}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->getScope()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, " "
+
+    filled-new-array {v2}, [Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->getScope()Ljava/lang/String;
+    const/4 v4, 0x6
 
-    move-result-object v2
+    invoke-static {v0, v2, v3, v3, v4}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
-    const-string v4, " "
+    move-result-object v0
 
-    filled-new-array {v4}, [Ljava/lang/String;
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_2
+    :goto_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_4
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v4
 
-    const/4 v5, 0x6
+    move-object v6, v4
 
-    invoke-static {v2, v4, v3, v3, v5}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    check-cast v6, Ljava/lang/String;
 
-    move-result-object v2
+    invoke-interface {v6}, Ljava/lang/CharSequence;->length()I
 
-    new-instance v4, Ljava/util/ArrayList;
+    move-result v6
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+    if-lez v6, :cond_3
+
+    const/4 v6, 0x1
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v6, 0x0
+
+    :goto_3
+    if-eqz v6, :cond_2
+
+    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_4
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v3, 0xa
+
+    invoke-static {v2, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v3
+
+    invoke-direct {v0, v3}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v2
 
-    :cond_2
-    :goto_2
+    :goto_4
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
-
-    if-eqz v5, :cond_4
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    move-object v7, v5
-
-    check-cast v7, Ljava/lang/String;
-
-    invoke-interface {v7}, Ljava/lang/CharSequence;->length()I
-
-    move-result v7
-
-    if-lez v7, :cond_3
-
-    const/4 v7, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v7, 0x0
-
-    :goto_3
-    if-eqz v7, :cond_2
-
-    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_4
-    new-instance v2, Ljava/util/ArrayList;
-
-    const/16 v3, 0xa
-
-    invoke-static {v4, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
     move-result v3
 
-    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
+    if-eqz v3, :cond_5
 
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v3
 
-    :goto_4
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    check-cast v3, Ljava/lang/String;
 
-    move-result v4
+    new-instance v4, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;
 
-    if-eqz v4, :cond_5
+    invoke-direct {v4, v3, v14}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;-><init>(Ljava/lang/String;Ljava/lang/Integer;)V
 
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/String;
-
-    new-instance v5, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;
-
-    invoke-direct {v5, v4, v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;-><init>(Ljava/lang/String;Ljava/lang/Integer;)V
-
-    invoke-interface {v2, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_4
 
     :cond_5
-    invoke-static {v2}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
-    move-result-object v2
+    move-result-object v0
 
-    new-instance v3, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;
+    new-instance v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getRandomFakeScopeText()I
 
-    move-result v4
+    move-result v3
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-direct {v3, v0, v4}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;-><init>(Ljava/lang/String;Ljava/lang/Integer;)V
+    invoke-direct {v2, v14, v3}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;-><init>(Ljava/lang/String;Ljava/lang/Integer;)V
 
-    iget-object v0, v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->adapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    iget-object v3, v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->adapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
 
     move-result v4
 
-    xor-int/2addr v4, v6
+    xor-int/2addr v4, v5
 
     if-eqz v4, :cond_6
 
-    invoke-static {v3}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v2}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v3
+    move-result-object v2
 
     goto :goto_5
 
     :cond_6
-    sget-object v3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v2, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_5
-    invoke-static {v2, v3}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0, v2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
-    move-result-object v2
+    move-result-object v0
 
-    invoke-virtual {v0, v2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
+    invoke-virtual {v3, v0}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
     :try_end_0
     .catch Lcom/discord/views/OAuthPermissionViews$InvalidScopeException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1546,13 +1472,13 @@
 
     :cond_7
     :try_start_1
-    const-string v2, "oauth2ViewModel"
+    const-string v0, "oauth2ViewModel"
 
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catch Lcom/discord/views/OAuthPermissionViews$InvalidScopeException; {:try_start_1 .. :try_end_1} :catch_0
 
-    throw v0
+    throw v14
 
     :catch_0
     move-exception v0
@@ -1560,19 +1486,14 @@
     invoke-direct {v1, v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->onUnknownScope(Lcom/discord/views/OAuthPermissionViews$InvalidScopeException;)V
 
     return-void
-
-    :cond_8
-    const-string v2, "data"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "requestUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->Companion:Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;
 
@@ -1581,15 +1502,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "requestUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getContentViewResId()I
@@ -1612,7 +1524,7 @@
     :cond_0
     const-string v0, "oauth2ViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1643,9 +1555,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1653,17 +1565,17 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->adapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->adapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p1
 
-    const-string v1, "REQ_URI"
+    const-string v0, "REQ_URI"
 
-    invoke-virtual {p1, v1}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
 
     move-result-object p1
 
@@ -1677,38 +1589,40 @@
     sget-object p1, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
     :goto_0
-    new-instance v1, Landroidx/lifecycle/ViewModelProvider;
+    new-instance v0, Landroidx/lifecycle/ViewModelProvider;
 
-    invoke-direct {v1, p0}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;)V
+    invoke-direct {v0, p0}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;)V
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
-    invoke-virtual {v1, v2}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "ViewModelProvider(this).\u2026th2ViewModel::class.java)"
+    const-string v1, "ViewModelProvider(this).\u2026th2ViewModel::class.java)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
+    check-cast v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
-    iput-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
-    const-string v2, "oauth2ViewModel"
+    const-string v1, "oauth2ViewModel"
 
-    if-eqz v1, :cond_5
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_5
 
     :try_start_0
     const-string v3, "requestUrl"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
 
     move-result-object p1
 
-    invoke-virtual {v1, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->setOauthAuthorize(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;)V
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->setOauthAuthorize(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;)V
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1723,21 +1637,21 @@
     :goto_1
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Landroid/widget/Button;
+    check-cast v0, Landroid/widget/Button;
 
     new-instance v3, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$$inlined$forEach$lambda$1;
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$$inlined$forEach$lambda$1;-><init>(Lcom/discord/widgets/auth/WidgetOauth2Authorize;)V
 
-    invoke-virtual {v1, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     goto :goto_1
 
@@ -1746,11 +1660,11 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$3;-><init>(Lcom/discord/widgets/auth/WidgetOauth2Authorize;)V
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
     const/4 v3, 0x0
 
-    invoke-static {p0, p1, v3, v1, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p0, p1, v3, v0, v2}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
@@ -1778,15 +1692,15 @@
 
     move-result-object p1
 
-    const-string v1, " "
+    const-string v0, " "
 
-    filled-new-array {v1}, [Ljava/lang/String;
+    filled-new-array {v0}, [Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     const/4 v4, 0x6
 
-    invoke-static {p1, v1, v3, v3, v4}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    invoke-static {p1, v0, v3, v3, v4}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
 
     move-result-object p1
 
@@ -1800,11 +1714,11 @@
 
     sget-object p1, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->Companion:Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;
 
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
 
     move-result-object v0
 
@@ -1827,19 +1741,19 @@
     return-void
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :catch_0
     move-exception p1
@@ -1848,11 +1762,11 @@
 
     :cond_5
     :try_start_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catch Ljava/lang/IllegalArgumentException; {:try_start_1 .. :try_end_1} :catch_0
 
-    throw v0
+    throw v2
 
     :goto_2
     sget-object v0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->Companion:Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;
@@ -1863,7 +1777,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$onViewBound$1;
 
@@ -1872,13 +1786,6 @@
     invoke-static {v0, v1, p1, v2}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;->access$handleError(Lcom/discord/widgets/auth/WidgetOauth2Authorize$Companion;Landroid/content/Context;Ljava/lang/Exception;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1943,7 +1850,7 @@
     :goto_0
     const-string v1, "requestUrl"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->configureNotSupportedUI(Landroid/net/Uri;)V
 
@@ -2033,7 +1940,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
@@ -2044,31 +1951,24 @@
     return-void
 
     :cond_5
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_6
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
 
 .method public final setOauth2ViewModel(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->oauth2ViewModel:Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1.smali
index 34e01a8806..9676678007 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
         "Ljava/lang/Throwable;",
@@ -30,45 +30,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/app/AppLog;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/app/AppLog;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string v4, "i"
+
+    const-string v5, "i(Ljava/lang/String;Ljava/lang/Throwable;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "i"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/app/AppLog;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "i(Ljava/lang/String;Ljava/lang/Throwable;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -84,26 +68,17 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;Ljava/lang/Throwable;)V
-    .locals 3
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
-    check-cast v1, Lcom/discord/app/AppLog;
+    check-cast v0, Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x4
-
-    invoke-virtual {v1, p1, v2, p2, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1.smali
index 89c5a9d47e..7dcc46ddc1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
         "Ljava/lang/Throwable;",
@@ -30,45 +30,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/app/AppLog;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x2
+    const-class v3, Lcom/discord/app/AppLog;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x2
+
+    const-string/jumbo v4, "w"
+
+    const-string/jumbo v5, "w(Ljava/lang/String;Ljava/lang/Throwable;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "w"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/app/AppLog;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "w(Ljava/lang/String;Ljava/lang/Throwable;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -84,26 +68,17 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;Ljava/lang/Throwable;)V
-    .locals 3
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
-    check-cast v1, Lcom/discord/app/AppLog;
+    check-cast v0, Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x5
-
-    invoke-virtual {v1, p1, v2, p2, v0}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion.smali
index afe11d3eb6..4db8633d7f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion.smali
@@ -70,7 +70,7 @@
 
     const/16 v1, 0x73
 
-    invoke-static {v0, v1}, Lj0/t/s;->take(Ljava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v1}, Lk0/u/s;->take(Ljava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -146,11 +146,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$getForSamsung"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "accountUri"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -189,18 +191,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "accountUri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "$this$getForSamsung"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.smali
index bf5be4ac08..6ceeb4336d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
@@ -93,7 +95,7 @@
 
     const-string v2, "captcha_key"
 
-    invoke-static {p1, v2, v0, v1}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p1, v2, v0, v1}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p1
 
@@ -109,13 +111,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1.smali
index fd03b39f89..58404a3893 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1"
     f = "WidgetOauth2AuthorizeSamsung.kt"
     l = {
@@ -62,7 +62,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p3}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p3}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -83,7 +83,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;
 
@@ -98,15 +100,6 @@
     iput-object p1, v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -132,7 +125,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 5
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;->label:I
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.smali
index fa35ab9573..a5c8a84f52 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,40 +63,35 @@
 .end method
 
 .method public final invoke(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;)V
-    .locals 9
+    .locals 8
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
+
+    const-string v1, "POST /authorize success"
+
+    invoke-static {v0, v1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
+
+    sget-object v2, Ll0/a/s0;->d:Ll0/a/s0;
+
+    sget-object v3, Ll0/a/j0;->b:Ll0/a/v;
+
+    const/4 v4, 0x0
+
+    new-instance v5, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    invoke-direct {v5, p0, p1, v0}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2;Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;Lkotlin/coroutines/Continuation;)V
 
-    sget-object v1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
+    const/4 v6, 0x2
 
-    const-string v2, "POST /authorize success"
+    const/4 v7, 0x0
 
-    invoke-static {v1, v2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
-
-    sget-object v3, Lk0/a/s0;->d:Lk0/a/s0;
-
-    sget-object v4, Lk0/a/j0;->b:Lk0/a/v;
-
-    const/4 v5, 0x0
-
-    new-instance v6, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;
-
-    invoke-direct {v6, p0, p1, v0}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2;Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponsePost;Lkotlin/coroutines/Continuation;)V
-
-    const/4 v7, 0x2
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v3 .. v8}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.smali
index 12306dc48b..941a82e313 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.smali
@@ -55,7 +55,7 @@
 
     const-string v0, "manager.getAccountsByType(SA_ACCOUNT_TYPE)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length p1, p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1.smali
index a976720cdc..6ceb8c6cb2 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,40 +61,35 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "captchaKey"
 
-    if-eqz p1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1;->this$0:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
-
-    invoke-static {v1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->access$getSamsungAuthCode$p(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;)Ljava/lang/String;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1;->this$0:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
 
-    invoke-static {v0, v1, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->access$authorizeForSamsung(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->access$getSamsungAuthCode$p(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v1, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$onActivityResult$isCaptchaHandled$1;->this$0:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
+
+    invoke-static {v1, v0, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->access$authorizeForSamsung(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_0
     sget-object p1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    const-string v2, "auth code not set"
+    const-string v1, "auth code not set"
 
-    invoke-static {p1, v2, v0, v1, v0}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->logW$default(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    const/4 v2, 0x0
+
+    invoke-static {p1, v1, v2, v0, v2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->logW$default(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "captchaKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.smali
index 9c122cd8f3..ffaab85910 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;
-.super Lj0/k/h/a/c;
+.super Lk0/l/h/a/c;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 
@@ -13,7 +13,7 @@
     name = null
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung"
     f = "WidgetOauth2AuthorizeSamsung.kt"
     l = {
@@ -53,7 +53,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->this$0:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
 
-    invoke-direct {p0, p2}, Lj0/k/h/a/c;-><init>(Lkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p2}, Lk0/l/h/a/c;-><init>(Lkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali
index d3e9f32475..53b55c967e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2"
     f = "WidgetOauth2AuthorizeSamsung.kt"
     l = {}
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p2}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p2}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;
 
@@ -88,15 +90,6 @@
     iput-object p1, v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -136,7 +129,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     iget-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1.smali
index edf1fa35a4..bc7c267078 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
@@ -93,13 +95,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2.smali
index a25b50d513..322d04241d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetOauth2AuthorizeSamsung.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
index 6e09b5ba71..092b4ff1b4 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
@@ -35,25 +35,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
+    const-string v2, "grantBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGrantBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "grantBtn"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGrantBtn()Landroid/widget/Button;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -73,7 +67,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;-><init>()V
 
-    const v0, 0x7f0a0656
+    const v0, 0x7f0a065c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,40 +215,40 @@
 .end method
 
 .method private final startSamsungAccountLink(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 11
+    .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "authServerUrl"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, v1}, Lj0/t/s;->take(Ljava/lang/String;I)Ljava/lang/String;
+    invoke-static {p1, v0}, Lk0/u/s;->take(Ljava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
-    move-result v2
+    move-result v1
 
-    const/16 v3, 0xc6b
+    const/16 v2, 0xc6b
 
-    if-eq v2, v3, :cond_2
+    if-eq v1, v2, :cond_2
 
-    const/16 v3, 0xcb0
+    const/16 v2, 0xcb0
 
-    if-eq v2, v3, :cond_1
+    if-eq v1, v2, :cond_1
 
-    const/16 v3, 0xe9e
+    const/16 v2, 0xe9e
 
-    if-eq v2, v3, :cond_0
+    if-eq v1, v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const-string v2, "us"
+    const-string/jumbo v1, "us"
 
-    invoke-virtual {p1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -265,16 +259,16 @@
     goto :goto_1
 
     :cond_1
-    const-string v2, "eu"
+    const-string v1, "eu"
 
-    invoke-virtual {p1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_2
-    const-string v2, "cn"
+    const-string v1, "cn"
 
-    invoke-virtual {p1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -289,82 +283,77 @@
     const-string p1, "https://account.samsung.com"
 
     :goto_1
-    sget-object v2, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
+    sget-object v1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v4, "GET /authorize "
+    const-string v3, "GET /authorize "
 
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {v2, v3}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
-
-    sget-object v2, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getOauth2ViewModel()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->getForSamsung(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;Ljava/lang/String;)Lrx/Observable;
-
-    move-result-object p1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-static {p1, v2, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v2
 
-    const-class v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
+    invoke-static {v1, v2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+    sget-object v1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
+
+    invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getOauth2ViewModel()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2, p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->getForSamsung(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    invoke-static {p1, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {p1, p0, v3, v0, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
-    const/4 v5, 0x0
+    const-class v5, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
 
-    new-instance v6, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1;
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    invoke-direct {v6, p0}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;)V
+    move-result-object v6
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2;
+    new-instance v8, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1;
 
-    invoke-direct {v8, p0, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;Ljava/lang/String;)V
+    invoke-direct {v8, p0}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$1;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;)V
 
-    const/16 v9, 0x14
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    new-instance v10, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2;
 
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-direct {v10, p0, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$startSamsungAccountLink$2;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;Ljava/lang/String;)V
+
+    const/16 v11, 0x14
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "authServerUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -372,7 +361,9 @@
 .method public configureUI(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->configureUI(Lcom/discord/restapi/RestAPIParams$OAuth2Authorize$ResponseGet;)V
 
@@ -387,49 +378,38 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
-    .locals 14
+    .locals 15
 
-    if-eqz p1, :cond_1
+    const-string v0, "requestUrl"
 
-    invoke-super {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super/range {p0 .. p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->createOauthAuthorize(Landroid/net/Uri;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->getState()Ljava/lang/String;
 
     move-result-object v0
 
-    const-wide/16 v1, 0x0
-
-    const/4 v4, 0x0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->getState()Ljava/lang/String;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
+    sget-object v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
-    invoke-static {p1}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$createSAStateId(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$createSAStateId(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;)Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object v0
 
     :goto_0
-    move-object v3, p1
-
-    const/4 v6, 0x0
+    move-object v4, v0
 
     const/4 v7, 0x0
 
@@ -441,26 +421,23 @@
 
     const/4 v11, 0x0
 
-    const/16 v12, 0x3f5
+    const/4 v12, 0x0
 
-    const/4 v13, 0x0
+    const/16 v13, 0x3f5
 
-    const-string v5, "https://discord.com/api/v6/oauth2/samsung/authorize/callback"
+    const/4 v14, 0x0
 
-    invoke-static/range {v0 .. v13}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->copy$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    const-wide/16 v2, 0x0
 
-    move-result-object p1
+    const/4 v5, 0x0
 
-    return-object p1
+    const-string v6, "https://discord.com/api/v6/oauth2/samsung/authorize/callback"
 
-    :cond_1
-    const-string p1, "requestUrl"
+    invoke-static/range {v1 .. v14}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->copy$default(Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-result-object v0
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public getContentViewResId()I
@@ -705,11 +682,11 @@
 
     invoke-static {p3, p1, v4, v3, v4}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->logW$default(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    const p1, 0x7f12069b
+    const p1, 0x7f12069d
 
     const/4 p2, 0x4
 
-    invoke-static {p0, p1, v2, p2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v2, p2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
@@ -775,25 +752,25 @@
     :goto_0
     iget-object v2, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->result:Ljava/lang/Object;
 
-    sget-object v4, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v4, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v5, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->label:I
 
-    const/4 v6, 0x3
+    const/4 v6, 0x0
 
-    const/4 v7, 0x2
+    const/4 v7, 0x3
 
-    const/4 v8, 0x1
+    const/4 v8, 0x2
 
-    const/4 v9, 0x0
+    const/4 v9, 0x1
 
     if-eqz v5, :cond_4
 
-    if-eq v5, v8, :cond_3
+    if-eq v5, v9, :cond_3
 
-    if-eq v5, v7, :cond_2
+    if-eq v5, v8, :cond_2
 
-    if-ne v5, v6, :cond_1
+    if-ne v5, v7, :cond_1
 
     iget-object v1, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$6:Ljava/lang/Object;
 
@@ -809,7 +786,7 @@
 
     iget-object v1, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
 
-    check-cast v1, Ln0/x;
+    check-cast v1, Lo0/x;
 
     iget-object v1, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$2:Ljava/lang/Object;
 
@@ -845,13 +822,13 @@
 
     check-cast v5, Landroid/net/Uri;
 
-    iget-object v7, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
+    iget-object v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
 
-    check-cast v7, Ln0/x;
+    check-cast v8, Lo0/x;
 
-    iget-object v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$2:Ljava/lang/Object;
+    iget-object v9, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$2:Ljava/lang/Object;
 
-    check-cast v8, Ljava/lang/String;
+    check-cast v9, Ljava/lang/String;
 
     iget-object v10, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$1:Ljava/lang/Object;
 
@@ -868,15 +845,15 @@
     :cond_3
     iget-object v1, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
 
-    check-cast v1, Ln0/x;
+    check-cast v1, Lo0/x;
 
     iget-object v5, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$2:Ljava/lang/Object;
 
     check-cast v5, Ljava/lang/String;
 
-    iget-object v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$1:Ljava/lang/Object;
+    iget-object v9, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$1:Ljava/lang/Object;
 
-    check-cast v8, Ljava/lang/String;
+    check-cast v9, Ljava/lang/String;
 
     iget-object v10, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$0:Ljava/lang/Object;
 
@@ -890,9 +867,9 @@
 
     move-object v5, v1
 
-    move-object v1, v8
+    move-object v1, v9
 
-    move-object v8, v2
+    move-object v9, v2
 
     move-object/from16 v2, v19
 
@@ -901,17 +878,17 @@
     :cond_4
     invoke-static {v2}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
 
-    new-instance v2, Ln0/x$a;
+    new-instance v2, Lo0/x$a;
 
-    invoke-direct {v2}, Ln0/x$a;-><init>()V
+    invoke-direct {v2}, Lo0/x$a;-><init>()V
 
     const/4 v5, 0x0
 
-    iput-boolean v5, v2, Ln0/x$a;->h:Z
+    iput-boolean v5, v2, Lo0/x$a;->h:Z
 
-    new-instance v5, Ln0/x;
+    new-instance v5, Lo0/x;
 
-    invoke-direct {v5, v2}, Ln0/x;-><init>(Ln0/x$a;)V
+    invoke-direct {v5, v2}, Lo0/x;-><init>(Lo0/x$a;)V
 
     sget-object v2, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
@@ -929,19 +906,19 @@
 
     iput-object v5, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
 
-    iput v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->label:I
+    iput v9, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->label:I
 
-    sget-object v8, Lk0/a/j0;->b:Lk0/a/v;
+    sget-object v9, Ll0/a/j0;->b:Ll0/a/v;
 
     new-instance v10, Lf/a/i/a;
 
-    invoke-direct {v10, v1, v5, v9}, Lf/a/i/a;-><init>(Ljava/lang/String;Ln0/x;Lkotlin/coroutines/Continuation;)V
+    invoke-direct {v10, v1, v5, v6}, Lf/a/i/a;-><init>(Ljava/lang/String;Lo0/x;Lkotlin/coroutines/Continuation;)V
 
-    invoke-static {v8, v10, v3}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    invoke-static {v9, v10, v3}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v9
 
-    if-ne v8, v4, :cond_5
+    if-ne v9, v4, :cond_5
 
     return-object v4
 
@@ -949,53 +926,55 @@
     move-object v15, v0
 
     :goto_1
-    check-cast v8, Landroid/net/Uri;
+    move-object v14, v9
 
-    if-eqz v8, :cond_9
+    check-cast v14, Landroid/net/Uri;
 
-    const-string v10, "redirect_uri"
+    if-eqz v14, :cond_8
 
-    invoke-virtual {v8, v10}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+    const-string v9, "redirect_uri"
 
-    move-result-object v14
+    invoke-virtual {v14, v9}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    if-eqz v14, :cond_9
+    move-result-object v13
 
-    const-string v10, "getCallbackUri?.getQuery\u2026m GET/callback\"\n        )"
+    if-eqz v13, :cond_8
 
-    invoke-static {v14, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v9, "getCallbackUri?.getQuery\u2026m GET/callback\"\n        )"
 
-    sget-object v10, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
+    invoke-static {v13, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v11, Ljava/lang/StringBuilder;
+    sget-object v9, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
-    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
+    new-instance v10, Ljava/lang/StringBuilder;
 
-    const-string v12, "POST /callback "
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v11, "POST /callback "
 
-    invoke-virtual {v11, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v10, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v11
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-static {v10, v11}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
+    move-result-object v10
+
+    invoke-static {v9, v10}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
     invoke-virtual {v15}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getOauth2ViewModel()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;
 
-    move-result-object v10
+    move-result-object v9
 
-    invoke-virtual {v10}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+    invoke-virtual {v9}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2ViewModel;->getOauthAuthorize()Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;
+
+    move-result-object v9
+
+    invoke-virtual {v9}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->getState()Ljava/lang/String;
 
     move-result-object v10
 
-    invoke-virtual {v10}, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuth2Authorize;->getState()Ljava/lang/String;
-
-    move-result-object v11
-
-    if-eqz v11, :cond_8
+    invoke-static {v10}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iput-object v15, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$0:Ljava/lang/Object;
 
@@ -1005,63 +984,63 @@
 
     iput-object v5, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
 
-    iput-object v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$4:Ljava/lang/Object;
+    iput-object v14, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$4:Ljava/lang/Object;
 
-    iput-object v14, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$5:Ljava/lang/Object;
+    iput-object v13, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$5:Ljava/lang/Object;
 
-    iput v7, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->label:I
+    iput v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->label:I
 
-    sget-object v7, Lk0/a/j0;->b:Lk0/a/v;
+    sget-object v8, Ll0/a/j0;->b:Ll0/a/v;
 
-    new-instance v13, Lf/a/i/b;
+    new-instance v12, Lf/a/i/b;
 
     const/16 v16, 0x0
 
-    move-object v10, v13
+    move-object v9, v12
 
-    move-object v12, v2
+    move-object v11, v2
 
-    move-object v6, v13
+    move-object v7, v12
 
-    move-object v13, v14
+    move-object v12, v13
 
-    move-object/from16 v17, v14
+    move-object/from16 v17, v13
 
-    move-object v14, v5
+    move-object v13, v5
 
-    move-object/from16 v18, v15
+    move-object/from16 v18, v14
 
-    move-object/from16 v15, v16
+    move-object/from16 v14, v16
 
-    invoke-direct/range {v10 .. v15}, Lf/a/i/b;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ln0/x;Lkotlin/coroutines/Continuation;)V
+    invoke-direct/range {v9 .. v14}, Lf/a/i/b;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lo0/x;Lkotlin/coroutines/Continuation;)V
 
-    invoke-static {v7, v6, v3}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    invoke-static {v8, v7, v3}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
-    move-result-object v6
+    move-result-object v7
 
-    if-ne v6, v4, :cond_6
+    if-ne v7, v4, :cond_6
 
     return-object v4
 
     :cond_6
     move-object v10, v1
 
-    move-object v7, v5
+    move-object v9, v2
 
-    move-object v5, v8
+    move-object v8, v5
+
+    move-object v2, v7
+
+    move-object v11, v15
 
     move-object/from16 v1, v17
 
-    move-object/from16 v11, v18
-
-    move-object v8, v2
-
-    move-object v2, v6
+    move-object/from16 v5, v18
 
     :goto_2
     check-cast v2, Landroid/net/Uri;
 
-    sget-object v6, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
+    sget-object v7, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;->Companion:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;
 
     new-instance v12, Ljava/lang/StringBuilder;
 
@@ -1077,23 +1056,23 @@
 
     move-result-object v12
 
-    invoke-static {v6, v12}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
+    invoke-static {v7, v12}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->access$logI(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;)V
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
-    move-result-object v6
+    move-result-object v7
 
     new-instance v12, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;
 
-    invoke-direct {v12, v11, v9}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;Lkotlin/coroutines/Continuation;)V
+    invoke-direct {v12, v11, v6}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;-><init>(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;Lkotlin/coroutines/Continuation;)V
 
     iput-object v11, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$0:Ljava/lang/Object;
 
     iput-object v10, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$1:Ljava/lang/Object;
 
-    iput-object v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$2:Ljava/lang/Object;
+    iput-object v9, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$2:Ljava/lang/Object;
 
-    iput-object v7, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
+    iput-object v8, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$3:Ljava/lang/Object;
 
     iput-object v5, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->L$4:Ljava/lang/Object;
 
@@ -1105,7 +1084,7 @@
 
     iput v1, v3, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1;->label:I
 
-    invoke-static {v6, v12, v3}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    invoke-static {v7, v12, v3}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1120,11 +1099,6 @@
     return-object v1
 
     :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_9
     new-instance v1, Lcom/discord/samsung/SamsungConnect$SamsungCallbackException;
 
     const-string v2, "no_redirect_uri"
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$Companion.smali
index 6e1986f5b3..fb9a3dfc82 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$Companion.smali
@@ -36,11 +36,13 @@
 .method public final launch(Landroid/content/Context;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "fingerprint"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -54,21 +56,7 @@
 
     const-class p2, Lcom/discord/widgets/auth/WidgetRemoteAuth;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fingerprint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$3.smali b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$3.smali
index 30810d9ab6..965653a5cb 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$3.smali
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -55,7 +55,7 @@
 
     new-instance v1, Lcom/discord/restapi/RestAPIParams$RemoteAuthFinish;
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -83,15 +83,15 @@
 
     const/4 v7, 0x0
 
-    new-instance v10, Lb0;
+    new-instance v10, Lc0;
 
-    invoke-direct {v10, p1}, Lb0;-><init>(LWidgetRemoteAuthViewModel;)V
+    invoke-direct {v10, p1}, Lc0;-><init>(LWidgetRemoteAuthViewModel;)V
 
     const/4 v9, 0x0
 
-    new-instance v8, Lc0;
+    new-instance v8, Ld0;
 
-    invoke-direct {v8, p1}, Lc0;-><init>(LWidgetRemoteAuthViewModel;)V
+    invoke-direct {v8, p1}, Ld0;-><init>(LWidgetRemoteAuthViewModel;)V
 
     const/16 v11, 0x16
 
@@ -102,11 +102,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type WidgetRemoteAuthViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$4.smali b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$4.smali
index e1c1c4dfed..0123b50b83 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$configureUI$4.smali
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -55,7 +55,7 @@
 
     new-instance v1, Lcom/discord/restapi/RestAPIParams$RemoteAuthCancel;
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -91,7 +91,7 @@
 
     const/4 v8, 0x0
 
-    sget-object v9, La0;->d:La0;
+    sget-object v9, Lb0;->d:Lb0;
 
     const/16 v10, 0x1e
 
@@ -102,11 +102,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type WidgetRemoteAuthViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$onViewBound$1.smali
index f303c0fe78..15e40d62b3 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/auth/WidgetRemoteAuth$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetRemoteAuth.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "LWidgetRemoteAuthViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/auth/WidgetRemoteAuth;->access$configureUI(Lcom/discord/widgets/auth/WidgetRemoteAuth;LWidgetRemoteAuthViewModel$ViewState;)V
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali
index 1ef43c92b3..7747bd3052 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali
@@ -51,121 +51,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetRemoteAuth;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetRemoteAuth;
+    const-string/jumbo v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/auth/WidgetRemoteAuth;
 
-    const/4 v2, 0x0
+    const-string v2, "cancelButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCancelButton()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetRemoteAuth;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "cancelButton"
-
-    const-string v4, "getCancelButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetRemoteAuth;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetRemoteAuth;
+    const-string v2, "notFoundCancelButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotFoundCancelButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notFoundCancelButton"
-
-    const-string v4, "getNotFoundCancelButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetRemoteAuth;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetRemoteAuth;
+    const-string v2, "loginButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoginButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "loginButton"
-
-    const-string v4, "getLoginButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetRemoteAuth;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetRemoteAuth;
+    const-string v2, "temporarySwitch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTemporarySwitch()Landroidx/appcompat/widget/SwitchCompat;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "temporarySwitch"
-
-    const-string v4, "getTemporarySwitch()Landroidx/appcompat/widget/SwitchCompat;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/auth/WidgetRemoteAuth;
 
-    const-class v2, Lcom/discord/widgets/auth/WidgetRemoteAuth;
+    const-string v2, "authFinishButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAuthFinishButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "authFinishButton"
-
-    const-string v4, "getAuthFinishButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -189,7 +153,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0746
+    const v0, 0x7f0a074c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +161,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0741
+    const v0, 0x7f0a0747
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +169,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->cancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0744
+    const v0, 0x7f0a074a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->notFoundCancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0743
+    const v0, 0x7f0a0749
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->loginButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0745
+    const v0, 0x7f0a074b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -229,7 +193,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->temporarySwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0742
+    const v0, 0x7f0a0748
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -258,9 +222,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -280,7 +244,7 @@
 
     sget-object v0, LWidgetRemoteAuthViewModel$ViewState$c;->a:LWidgetRemoteAuthViewModel$ViewState$c;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -299,7 +263,7 @@
     :cond_0
     sget-object v0, LWidgetRemoteAuthViewModel$ViewState$a;->a:LWidgetRemoteAuthViewModel$ViewState$a;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -328,7 +292,7 @@
     :cond_1
     sget-object v0, LWidgetRemoteAuthViewModel$ViewState$d;->a:LWidgetRemoteAuthViewModel$ViewState$d;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -575,9 +539,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -585,9 +549,9 @@
 
     move-result-object p1
 
-    const-string v1, "REMOTE_AUTH_FINGERPRINT"
+    const-string v0, "REMOTE_AUTH_FINGERPRINT"
 
-    invoke-virtual {p1, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -599,31 +563,33 @@
     const-string p1, ""
 
     :goto_0
-    new-instance v1, Landroidx/lifecycle/ViewModelProvider;
+    new-instance v0, Landroidx/lifecycle/ViewModelProvider;
 
-    new-instance v2, LWidgetRemoteAuthViewModel$c;
+    new-instance v1, LWidgetRemoteAuthViewModel$c;
 
-    invoke-direct {v2, p1}, LWidgetRemoteAuthViewModel$c;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, p1}, LWidgetRemoteAuthViewModel$c;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {v1, p0, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {v0, p0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
     const-class p1, LWidgetRemoteAuthViewModel;
 
-    invoke-virtual {v1, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {v0, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(\n     \u2026uthViewModel::class.java)"
+    const-string v0, "ViewModelProvider(\n     \u2026uthViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, LWidgetRemoteAuthViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->viewModel:LWidgetRemoteAuthViewModel;
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -631,9 +597,9 @@
 
     move-result-object p1
 
-    const-string v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -666,16 +632,9 @@
     return-void
 
     :cond_1
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
index af889fb7a3..2b4459872b 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a5
+    const v0, 0x7f0a05ab
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -61,7 +61,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a2
+    const v0, 0x7f0a05a8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
index f3abd7e295..6819d1983a 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
@@ -47,7 +47,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0830
+    const v0, 0x7f0a0836
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
index 5061f7606d..ad3e13a6e1 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
@@ -67,8 +67,8 @@
 
     :array_0
     .array-data 4
-        0x7f0a0196
-        0x7f0a08b8
+        0x7f0a0199
+        0x7f0a08be
     .end array-data
 .end method
 
@@ -217,7 +217,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f12040b
+    const v2, 0x7f12040c
 
     invoke-virtual {p0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -294,25 +294,25 @@
 
     move-result-object v4
 
-    const p1, 0x7f120f39
+    const p1, 0x7f120f63
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
-    const p1, 0x7f121663
+    const p1, 0x7f12168d
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    const p1, 0x7f12073f
+    const p1, 0x7f120741
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v7
 
-    const v8, 0x7f120740
+    const v8, 0x7f120742
 
     const/4 v9, 0x0
 
@@ -365,7 +365,7 @@
 
     aput-object p3, v1, v2
 
-    const v3, 0x7f120e0a
+    const v3, 0x7f120e30
 
     invoke-virtual {p0, v3, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -379,7 +379,7 @@
 
     aput-object p3, p1, v2
 
-    const p3, 0x7f120e07
+    const p3, 0x7f120e2d
 
     invoke-virtual {p0, p3, p1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -399,7 +399,7 @@
 
     invoke-direct {p3, p2}, Lf/a/o/a/p;-><init>(Lrx/functions/Action1;)V
 
-    const p2, 0x7f120e06
+    const p2, 0x7f120e2c
 
     invoke-virtual {p1, p2, p3}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -407,7 +407,7 @@
 
     sget-object p2, Lf/a/o/a/l;->d:Lf/a/o/a/l;
 
-    const p3, 0x7f1203b7
+    const p3, 0x7f1203b8
 
     invoke-virtual {p1, p3, p2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setNegativeButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -437,7 +437,7 @@
 
     const-class p1, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;
 
-    invoke-static {p2, p1, p0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p2, p1, p0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -453,9 +453,9 @@
 .method private handleUpdate()V
     .locals 2
 
-    const v0, 0x7f1213a3
+    const v0, 0x7f1213cd
 
-    invoke-static {p0, v0}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, v0}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
@@ -531,9 +531,9 @@
 .method public static t(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
     .locals 4
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserGuildSettings()Lcom/discord/stores/StoreUserGuildSettings;
 
@@ -611,7 +611,7 @@
 
     move-result p3
 
-    const v0, 0x7f0a05c4
+    const v0, 0x7f0a05ca
 
     if-ne p3, v0, :cond_0
 
@@ -674,7 +674,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -682,7 +682,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -698,7 +698,7 @@
 
     move-result-object p3
 
-    invoke-static {p2, p3}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {p2, p3}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -814,7 +814,7 @@
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a0196
+    const v1, 0x7f0a0199
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -824,7 +824,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->channelSettingsName:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v1, 0x7f0a01aa
+    const v1, 0x7f0a01ad
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -832,7 +832,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->saveButton:Landroid/view/View;
 
-    const v1, 0x7f0a0414
+    const v1, 0x7f0a041a
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -842,7 +842,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->scrollView:Landroidx/core/widget/NestedScrollView;
 
-    const v1, 0x7f0a0413
+    const v1, 0x7f0a0419
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -852,7 +852,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->notificationMuteSettingsView:Lcom/discord/widgets/servers/NotificationMuteSettingsView;
 
-    const v1, 0x7f0a08b9
+    const v1, 0x7f0a08bf
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -862,7 +862,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconLabel:Lcom/discord/app/AppTextView;
 
-    const v1, 0x7f0a08ba
+    const v1, 0x7f0a08c0
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -870,7 +870,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconRemove:Landroid/view/View;
 
-    const v1, 0x7f0a08b8
+    const v1, 0x7f0a08be
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -950,7 +950,7 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v2}, Lf/a/b/q;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    invoke-static {v1, v3, v2}, Lf/a/b/s;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -958,7 +958,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -972,7 +972,7 @@
 
     const-class v2, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -992,9 +992,9 @@
 .method public synthetic r()V
     .locals 2
 
-    const v0, 0x7f12042a
+    const v0, 0x7f12042b
 
-    const v1, 0x7f12164e    # 1.941831E38f
+    const v1, 0x7f121678
 
     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$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
index 2e0433b455..094623ad57 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Companion.smali
@@ -51,7 +51,9 @@
 .method public final launch(Landroid/content/Context;JZ)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -71,20 +73,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026TINGS, showSystemSetting)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
index 0e88866937..a839e9a1ac 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        "Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;",
+        "Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;",
+        ">;"
     }
 .end annotation
 
@@ -122,7 +126,7 @@
 
     if-ne v6, v7, :cond_3
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelNotificationSettings;->getMessageNotifications()I
 
@@ -188,7 +192,7 @@
     :cond_6
     move-object v10, v2
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelNotificationSettings;->isMuted()Z
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali
index ec64547c24..e57b11e8e7 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -99,7 +101,7 @@
 
     const-string v2, "it.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -119,7 +121,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
@@ -139,7 +141,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
@@ -162,9 +164,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion.smali
index 1822cc089c..c2b408c7b2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion.smali
@@ -56,13 +56,13 @@
 
     sget-object p2, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n            \u2026ust(null)\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -74,7 +74,7 @@
 
     const-string p2, "StoreStream\n            \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
index 9c727aafc9..b5ce647a74 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model.smali
@@ -60,9 +60,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/String;ZIZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -81,15 +83,6 @@
     iput-boolean p7, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->isAboveNotifyAllSize:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;Lcom/discord/models/domain/ModelChannel;ZLjava/lang/String;ZIZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
@@ -240,38 +233,31 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/String;ZIZZ)Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
     .locals 9
 
-    if-eqz p1, :cond_0
-
-    new-instance v8, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
-
-    move-object v0, v8
-
-    move-object v1, p1
-
-    move v2, p2
-
-    move-object v3, p3
-
-    move v4, p4
-
-    move v5, p5
-
-    move v6, p6
-
-    move/from16 v7, p7
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;-><init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/String;ZIZZ)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "channel"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v2, p1
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
+
+    move-object v1, v0
+
+    move v3, p2
+
+    move-object v4, p3
+
+    move v5, p4
+
+    move v6, p5
+
+    move v7, p6
+
+    move/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;-><init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/String;ZIZZ)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -289,7 +275,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -305,7 +291,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->channelMuteEndTime:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali
index a5a1cfe0f2..3c49a5c1a2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali
@@ -51,7 +51,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
index 4713c1ebbf..874df8a7cf 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;",
         "Lcom/discord/views/CheckedSetting;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,44 +71,48 @@
 .method public final invoke(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;Lcom/discord/views/CheckedSetting;I)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "$this$configureNotificationRadio"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "radio"
 
-    new-instance v1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p1, p3}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;I)V
+    new-instance v0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1;
 
-    invoke-virtual {p2, v1}, Lcom/discord/views/CheckedSetting;->e(Landroid/view/View$OnClickListener;)V
+    invoke-direct {v0, p1, p3}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;I)V
+
+    invoke-virtual {p2, v0}, Lcom/discord/views/CheckedSetting;->e(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->isAboveNotifyAllSize()Z
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    sget v1, Lcom/discord/models/domain/ModelNotificationSettings;->FREQUENCY_ALL:I
+    sget v0, Lcom/discord/models/domain/ModelNotificationSettings;->FREQUENCY_ALL:I
 
-    if-ne p3, v1, :cond_0
+    if-ne p3, v0, :cond_0
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
-    const v1, 0x7f120dfc
+    const v2, 0x7f120e22
 
-    invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p2, v0, v2}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
+    invoke-virtual {p2, v0, v1}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p2, v0, v2}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
+    const/4 v0, 0x0
+
+    invoke-virtual {p2, v0, v1}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
 
     :goto_0
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->getNotificationSetting()I
@@ -117,10 +121,10 @@
 
     if-ne v0, p3, :cond_1
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :cond_1
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->getNotificationSettingIsInherited()Z
 
@@ -138,7 +142,7 @@
     :goto_1
     invoke-virtual {p2, p1}, Lcom/discord/views/CheckedSetting;->setButtonAlpha(F)V
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
@@ -150,18 +154,4 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "radio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "$this$configureNotificationRadio"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.smali
index 23867d62fb..bf2c66497b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -82,7 +82,7 @@
 
     const-string v4, "parentFragmentManager"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$Companion;->showForChannel(JLandroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.smali
index 20e732b2ff..cd9e0d80b4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1;->$this_configureUI:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali
index a77103f41b..ee83a9c37c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -66,7 +66,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -74,7 +74,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2.smali
index dda600b57d..79b444eb99 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelNotificationSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
index 88ad42b910..b64329ae3d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
@@ -40,81 +40,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
+    const-string v2, "notificationMuteSettingsView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationMuteSettingsView()Lcom/discord/widgets/servers/NotificationMuteSettingsView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "notificationMuteSettingsView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getNotificationMuteSettingsView()Lcom/discord/widgets/servers/NotificationMuteSettingsView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
-    const/4 v2, 0x0
+    const-string v2, "notificationFrequencyWrap"
 
-    aput-object v1, v0, v2
+    const-string v3, "getNotificationFrequencyWrap()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "notificationFrequencyWrap"
-
-    const-string v4, "getNotificationFrequencyWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
+    const-string v2, "notificationSettingsRadios"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationSettingsRadios()Ljava/util/List;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationSettingsRadios"
-
-    const-string v4, "getNotificationSettingsRadios()Ljava/util/List;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
+    const-string v2, "systemNotificationsSettings"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSystemNotificationsSettings()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "systemNotificationsSettings"
-
-    const-string v4, "getSystemNotificationsSettings()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -138,7 +114,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a016e
+    const v0, 0x7f0a0171
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -146,7 +122,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->notificationMuteSettingsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a019c
+    const v0, 0x7f0a019f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -160,13 +136,13 @@
 
     fill-array-data v0, :array_0
 
-    invoke-static {p0, v0}, Lf/n/a/k/a;->n(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->l(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->notificationSettingsRadios$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a016d
+    const v0, 0x7f0a0170
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,9 +156,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0199
-        0x7f0a019a
-        0x7f0a019b
+        0x7f0a019c
+        0x7f0a019d
+        0x7f0a019e
     .end array-data
 .end method
 
@@ -206,7 +182,7 @@
     :cond_0
     const-string p0, "notificationSettingsRadioManager"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -324,7 +300,7 @@
 
     const-string v4, "requireContext()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -348,11 +324,11 @@
 
     const/4 v3, 0x1
 
-    const v8, 0x7f120f36
+    const v8, 0x7f120f60
 
     if-eqz v2, :cond_0
 
-    const v2, 0x7f120f37
+    const v2, 0x7f120f61
 
     new-array v9, v3, [Ljava/lang/Object;
 
@@ -364,7 +340,7 @@
 
     move-result-object v11
 
-    invoke-static {v11, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v10, v11, v5, v6, v7}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;ZILjava/lang/Object;)Ljava/lang/String;
 
@@ -388,7 +364,7 @@
 
     const-string v2, "if (channel.isTextChanne\u2026g(R.string.mute_category)"
 
-    invoke-static {v12, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v12, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -400,7 +376,7 @@
 
     if-eqz v9, :cond_1
 
-    const v8, 0x7f121661
+    const v8, 0x7f12168b
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -412,7 +388,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v9, v10, v5, v6, v7}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;ZILjava/lang/Object;)Ljava/lang/String;
 
@@ -434,7 +410,7 @@
     :goto_1
     move-object v13, v3
 
-    invoke-static {v13, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;
 
@@ -446,7 +422,7 @@
 
     move-result-object v11
 
-    const v3, 0x7f12073a
+    const v3, 0x7f12073c
 
     invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -454,11 +430,11 @@
 
     const-string v3, "getString(R.string.form_\u2026bel_mobile_channel_muted)"
 
-    invoke-static {v14, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v15, 0x7f12073b
+    const v15, 0x7f12073d
 
-    const v3, 0x7f12073e
+    const v3, 0x7f120740
 
     invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -588,9 +564,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -598,11 +574,13 @@
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x0
 
-    invoke-static {p0, v1, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static {p0, v0, p1, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f121001
+    const p1, 0x7f12102b
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -610,9 +588,9 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->getNotificationSettingsRadios()Ljava/util/List;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-direct {p1, v0}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
+    invoke-direct {p1, v1}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->notificationSettingsRadioManager:Lcom/discord/views/RadioManager;
 
@@ -620,34 +598,27 @@
 
     move-result-object p1
 
-    const-string v0, "SHOW_SYSTEM_SETTING"
+    const-string v1, "SHOW_SYSTEM_SETTING"
 
-    invoke-virtual {p1, v0, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+    invoke-virtual {p1, v1, v0}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
 
     move-result p1
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->getSystemNotificationsSettings()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v1
 
     if-eqz p1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/16 v1, 0x8
+    const/16 v0, 0x8
 
     :goto_0
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v0}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet$Companion.smali
index 403d5574a8..82186176ac 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet$Companion.smali
@@ -36,36 +36,31 @@
 .method public final hasUserSeenChannelOnboarding(Landroid/content/Context;)Z
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
     move-result-object p1
 
-    const/4 v0, 0x0
+    const-string v0, "CACHE_KEY_CHANNEL_ONBOARDED"
 
-    const-string v1, "CACHE_KEY_CHANNEL_ONBOARDED"
+    const/4 v1, 0x0
 
-    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final markSeenUserChannelOnboarding(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
@@ -75,32 +70,25 @@
 
     move-result-object p1
 
-    const/4 v0, 0x1
+    const-string v0, "CACHE_KEY_CHANNEL_ONBOARDED"
 
-    const-string v1, "CACHE_KEY_CHANNEL_ONBOARDED"
+    const/4 v1, 0x1
 
-    invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1, v0, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
     move-result-object p1
 
     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final show(Landroidx/fragment/app/Fragment;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelOnboardingSheet;
 
@@ -112,20 +100,11 @@
 
     const-string v1, "fragment.parentFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "javaClass"
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali
index f998fff089..85a167e35a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali
@@ -29,25 +29,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelOnboardingSheet;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelOnboardingSheet;
+    const-string v2, "channelView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelView()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "channelView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getChannelView()Lcom/google/android/material/button/MaterialButton;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/channels/WidgetChannelOnboardingSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,7 +61,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0154
+    const v0, 0x7f0a0157
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,7 +105,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -123,7 +119,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/channels/WidgetChannelOnboardingSheet$Companion;->markSeenUserChannelOnboarding(Landroid/content/Context;)V
 
@@ -138,13 +134,4 @@
     invoke-virtual {p1, p2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
index 0c2f45e053..4860b2f140 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
@@ -41,25 +41,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;
+    const-string v2, "name"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "name"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getName()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,19 +61,21 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/WidgetChannelSelector$Adapter;I)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iput p3, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;->noChannelStringId:I
 
-    const p1, 0x7f0a018d
+    const p1, 0x7f0a0190
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -98,15 +94,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getName()Landroid/widget/TextView;
@@ -142,9 +129,9 @@
 .method public onConfigure(ILcom/discord/widgets/channels/WidgetChannelSelector$Model$Item;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -154,42 +141,44 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Item;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;->getName()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget v2, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;->noChannelStringId:I
+    iget v1, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;->noChannelStringId:I
 
-    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_0
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v1, "itemView"
+    const-string v0, "itemView"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Item;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object p2
 
+    const/4 v0, 0x0
+
     if-eqz p2, :cond_1
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getType()I
@@ -268,13 +257,6 @@
     invoke-static/range {v3 .. v9}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
index dd656ee4c3..683917ca69 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
@@ -38,11 +38,13 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/channels/WidgetChannelSelector;I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recycler"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dialog"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -51,20 +53,6 @@
     iput p3, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;->noChannelStringId:I
 
     return-void
-
-    :cond_0
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDialog$p(Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;)Lcom/discord/widgets/channels/WidgetChannelSelector;
@@ -90,24 +78,17 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;
 
-    const p2, 0x7f0d0170
+    iget p2, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;->noChannelStringId:I
 
-    iget v0, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;->noChannelStringId:I
+    const v0, 0x7f0d0170
 
-    invoke-direct {p1, p2, p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;-><init>(ILcom/discord/widgets/channels/WidgetChannelSelector$Adapter;I)V
+    invoke-direct {p1, v0, p0, p2}, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;-><init>(ILcom/discord/widgets/channels/WidgetChannelSelector$Adapter;I)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction.smali
index d382c5e731..2446b8f37c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction.smali
@@ -29,22 +29,15 @@
 
 # virtual methods
 .method public includeChannel(Lcom/discord/models/domain/ModelChannel;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction$DefaultImpls;->includeChannel(Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;Lcom/discord/models/domain/ModelChannel;)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
index 5843c42803..8159b36117 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
@@ -101,9 +101,9 @@
 
     if-eqz p5, :cond_1
 
-    const p6, 0x7f120fb4
+    const p6, 0x7f120fde
 
-    const v6, 0x7f120fb4
+    const v6, 0x7f120fde
 
     goto :goto_1
 
@@ -145,9 +145,9 @@
 
     if-eqz p5, :cond_1
 
-    const p6, 0x7f120fb4
+    const p6, 0x7f120fde
 
-    const v6, 0x7f120fb4
+    const v6, 0x7f120fde
 
     goto :goto_1
 
@@ -247,7 +247,9 @@
 .method public final launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelSelector;
 
@@ -287,7 +289,7 @@
 
     const-string p2, "fragment.parentFragmentManager"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/channels/WidgetChannelSelector;
 
@@ -298,87 +300,64 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final launchForText(Landroidx/fragment/app/Fragment;JIZI)V
-    .locals 8
+    .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
 
-    new-instance v7, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;
 
     const/4 v0, 0x0
 
-    invoke-direct {v7, v0}, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;-><init>(I)V
+    invoke-direct {v8, v0}, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;-><init>(I)V
 
-    move-object v0, p0
+    move-object v1, p0
 
-    move-object v1, p1
+    move-object v2, p1
 
-    move-wide v2, p2
+    move-wide v3, p2
 
-    move v4, p4
+    move v5, p4
 
-    move v5, p5
+    move v6, p5
 
-    move v6, p6
+    move v7, p6
 
-    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
+    invoke-virtual/range {v1 .. v8}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final launchForVoice(Landroidx/fragment/app/Fragment;JIZI)V
-    .locals 8
+    .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
 
-    new-instance v7, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;
 
     const/4 v0, 0x2
 
-    invoke-direct {v7, v0}, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;-><init>(I)V
+    invoke-direct {v8, v0}, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;-><init>(I)V
 
-    move-object v0, p0
+    move-object v1, p0
 
-    move-object v1, p1
+    move-object v2, p1
 
-    move-wide v2, p2
+    move-wide v3, p2
 
-    move v4, p4
+    move v5, p4
 
-    move v5, p5
+    move v6, p5
 
-    move v6, p6
+    move v7, p6
 
-    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
+    invoke-virtual/range {v1 .. v8}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$FilterFunction$DefaultImpls.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$FilterFunction$DefaultImpls.smali
index ee9d96ee3e..222bcb74ce 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$FilterFunction$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$FilterFunction$DefaultImpls.smali
@@ -18,18 +18,11 @@
 .method public static includeChannel(Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;Lcom/discord/models/domain/ModelChannel;)Z
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p0, "channel"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p0, 0x1
 
     return p0
-
-    :cond_0
-    const-string p0, "channel"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali
index 612085c70d..700e32a7b5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelSelector.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Item;",
+        ">;>;"
     }
 .end annotation
 
@@ -137,7 +145,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_1
     invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator;
@@ -146,9 +154,9 @@
 
     const-string v2, "ModelChannel.getSortByNameAndType()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v0
 
@@ -188,7 +196,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-static {p1, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion.smali
index 6a3ffb3175..95d6130a54 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Companion.smali
@@ -47,7 +47,9 @@
         }
     .end annotation
 
-    if-eqz p4, :cond_0
+    const-string v0, "filterFunction"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -71,13 +73,13 @@
 
     invoke-direct {p2, p4, p3}, Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Companion$get$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;Z)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream.getChannels(\u2026 { Item(it) }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -89,16 +91,7 @@
 
     const-string p2, "StoreStream.getChannels(\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "filterFunction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali
index b6ae3b4fb6..1810d39c64 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Model$Item.smali
@@ -84,7 +84,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Item;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction.smali
index 280a5b289d..5a090d98d4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction.smali
@@ -111,7 +111,9 @@
 .method public includeChannel(Lcom/discord/models/domain/ModelChannel;)Z
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v0, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$TypeFilterFunction;->type:I
 
@@ -130,15 +132,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1.smali
index bb7ad05ade..080dc0f275 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelSelector;
 
@@ -83,13 +85,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
index d817c1668c..315a1e4ae3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
@@ -52,25 +52,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelSelector;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelSelector;
+    const-string v2, "list"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "list"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getList()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/channels/WidgetChannelSelector;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -90,7 +84,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a018e
+    const v0, 0x7f0a0191
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +107,7 @@
     :cond_0
     const-string p0, "adapter"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -217,116 +211,115 @@
 
 # virtual methods
 .method public bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 11
+    .locals 17
 
-    const/4 v0, 0x0
+    move-object/from16 v0, p0
 
-    if-eqz p1, :cond_3
+    const-string v1, "compositeSubscription"
 
-    invoke-super {p0, p1}, Lcom/discord/app/AppBottomSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
+    move-object/from16 v2, p1
 
-    sget-object p1, Lcom/discord/widgets/channels/WidgetChannelSelector$Model;->Companion:Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Companion;
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
+    invoke-super/range {p0 .. p1}, Lcom/discord/app/AppBottomSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
 
-    move-result-object v1
+    sget-object v1, Lcom/discord/widgets/channels/WidgetChannelSelector$Model;->Companion:Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Companion;
 
-    const-wide/16 v2, -0x1
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    const-string v4, "INTENT_EXTRA_GUILD_ID"
+    move-result-object v2
 
-    invoke-virtual {v1, v4, v2, v3}, Landroid/os/Bundle;->getLong(Ljava/lang/String;J)J
+    const-string v3, "INTENT_EXTRA_GUILD_ID"
 
-    move-result-wide v1
+    const-wide/16 v4, -0x1
 
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
+    invoke-virtual {v2, v3, v4, v5}, Landroid/os/Bundle;->getLong(Ljava/lang/String;J)J
 
-    move-result-object v3
+    move-result-wide v2
 
-    const/4 v4, 0x0
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
+
+    move-result-object v4
 
     const-string v5, "INTENT_EXTRA_INCLUDE_NO_CHANNEL"
 
-    invoke-virtual {v3, v5, v4}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
+    const/4 v6, 0x0
 
-    move-result v3
+    invoke-virtual {v4, v5, v6}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
 
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
+    move-result v4
 
-    move-result-object v4
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    const-string v5, "INTENT_EXTRA_FILTER_FUNCTION"
+    move-result-object v5
 
-    invoke-virtual {v4, v5}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
+    const-string v6, "INTENT_EXTRA_FILTER_FUNCTION"
 
-    move-result-object v4
+    invoke-virtual {v5, v6}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
 
-    instance-of v5, v4, Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;
+    move-result-object v5
 
-    if-nez v5, :cond_0
+    instance-of v6, v5, Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;
 
-    move-object v4, v0
+    const/4 v7, 0x0
+
+    if-nez v6, :cond_0
+
+    move-object v5, v7
 
     :cond_0
-    check-cast v4, Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;
+    check-cast v5, Lcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;
 
-    if-eqz v4, :cond_1
+    if-eqz v5, :cond_1
 
     goto :goto_0
 
     :cond_1
-    new-instance v4, Lcom/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction;
+    new-instance v5, Lcom/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction;
 
-    invoke-direct {v4}, Lcom/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction;-><init>()V
+    invoke-direct {v5}, Lcom/discord/widgets/channels/WidgetChannelSelector$BaseFilterFunction;-><init>()V
 
     :goto_0
-    invoke-virtual {p1, v1, v2, v3, v4}, Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Companion;->get(JZLcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)Lrx/Observable;
+    invoke-virtual {v1, v2, v3, v4, v5}, Lcom/discord/widgets/channels/WidgetChannelSelector$Model$Companion;->get(JZLcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)Lrx/Observable;
 
-    move-result-object p1
+    move-result-object v1
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSelector;->adapter:Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;
+    iget-object v2, v0, Lcom/discord/widgets/channels/WidgetChannelSelector;->adapter:Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter;
 
-    if-eqz v1, :cond_2
+    if-eqz v2, :cond_2
 
-    invoke-static {p1, p0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
+    invoke-static {v1, v0, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v8
 
-    const-class v3, Lcom/discord/widgets/channels/WidgetChannelSelector;
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    new-instance v8, Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelSelector;)V
-
-    const/16 v9, 0x1e
+    const-class v9, Lcom/discord/widgets/channels/WidgetChannelSelector;
 
     const/4 v10, 0x0
 
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    new-instance v14, Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;
+
+    invoke-direct {v14, v0}, Lcom/discord/widgets/channels/WidgetChannelSelector$bindSubscriptions$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelSelector;)V
+
+    const/16 v15, 0x1e
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v8 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
 
     :cond_2
-    const-string p1, "adapter"
+    const-string v1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_3
-    const-string p1, "compositeSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v7
 .end method
 
 .method public getContentViewResId()I
@@ -340,7 +333,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -385,13 +380,4 @@
     iput p1, p0, Lcom/discord/widgets/channels/WidgetChannelSelector;->requestCode:I
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
index 98a9c26752..0cb32b14a9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel.smali
@@ -166,7 +166,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
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 65bdca0fc2..16e5eeea4a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
@@ -236,9 +236,9 @@
 
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 
@@ -275,7 +275,7 @@
 
     invoke-direct {p1, p4}, Lf/a/o/a/w;-><init>(Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions$BaseModel;)V
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -361,11 +361,11 @@
 
     invoke-direct {p3, p0, p1, p4, p5}, Lf/a/o/a/v;-><init>(JJ)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -816,7 +816,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    const v3, 0x7f1203bc
+    const v3, 0x7f1203bd
 
     if-eqz v0, :cond_4
 
@@ -844,7 +844,7 @@
     goto :goto_1
 
     :cond_3
-    const p2, 0x7f1203ba
+    const p2, 0x7f1203bb
 
     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 655d218faf..1049608107 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
@@ -115,7 +115,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -375,7 +375,7 @@
 
     move-result p2
 
-    const p3, 0x7f1203bb
+    const p3, 0x7f1203bc
 
     if-eqz p2, :cond_0
 
@@ -402,7 +402,7 @@
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f1203ba
+    const p2, 0x7f1203bb
 
     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 fb8749db0a..58a97752aa 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
@@ -114,12 +114,12 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f1203ce
+    const v0, 0x7f1203cf
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f12040b
+    const v0, 0x7f12040c
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -371,7 +371,7 @@
 
     const-class p1, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -453,9 +453,9 @@
     :cond_1
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 .end method
@@ -584,7 +584,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0172
+    .packed-switch 0x7f0a0175
         :pswitch_13
         :pswitch_12
         :pswitch_11
@@ -850,7 +850,7 @@
 
     move-result p4
 
-    const p5, 0x7f0a05bf
+    const p5, 0x7f0a05c5
 
     if-eq p4, p5, :cond_0
 
@@ -869,7 +869,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -877,7 +877,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -889,7 +889,7 @@
 
     invoke-direct {p2, p0}, Lf/a/o/a/b0;-><init>(Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;)V
 
-    invoke-static {p2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -942,7 +942,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -950,7 +950,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -960,7 +960,7 @@
 
     sget-object p2, Lf/a/o/a/c0;->d:Lf/a/o/a/c0;
 
-    invoke-static {p2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -1021,7 +1021,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0186
+    const v0, 0x7f0a0189
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1031,7 +1031,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->userAvatar:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0189
+    const v0, 0x7f0a018c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1041,7 +1041,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->targetName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0187
+    const v0, 0x7f0a018a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1051,7 +1051,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->channelName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a018a
+    const v0, 0x7f0a018d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1059,7 +1059,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->textPermissionsContainer:Landroid/view/View;
 
-    const v0, 0x7f0a018b
+    const v0, 0x7f0a018e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1067,7 +1067,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->voicePermissionsContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0188
+    const v0, 0x7f0a018b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1081,7 +1081,7 @@
 
     new-array v0, v0, [Lcom/discord/views/TernaryCheckBox;
 
-    const v1, 0x7f0a0172
+    const v1, 0x7f0a0175
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1093,7 +1093,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0173
+    const v1, 0x7f0a0176
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1105,7 +1105,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0174
+    const v1, 0x7f0a0177
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1117,7 +1117,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0175
+    const v1, 0x7f0a0178
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1129,7 +1129,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0177
+    const v1, 0x7f0a017a
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1141,7 +1141,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0178
+    const v1, 0x7f0a017b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1153,7 +1153,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0179
+    const v1, 0x7f0a017c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1165,7 +1165,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a017a
+    const v1, 0x7f0a017d
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1177,7 +1177,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a017b
+    const v1, 0x7f0a017e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1189,7 +1189,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a017c
+    const v1, 0x7f0a017f
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1201,7 +1201,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a017d
+    const v1, 0x7f0a0180
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1213,7 +1213,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a017e
+    const v1, 0x7f0a0181
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1225,7 +1225,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a017f
+    const v1, 0x7f0a0182
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1237,7 +1237,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0176
+    const v1, 0x7f0a0179
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1249,7 +1249,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0180
+    const v1, 0x7f0a0183
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1261,7 +1261,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0181
+    const v1, 0x7f0a0184
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1273,7 +1273,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0182
+    const v1, 0x7f0a0185
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1285,7 +1285,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0183
+    const v1, 0x7f0a0186
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1297,7 +1297,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0184
+    const v1, 0x7f0a0187
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1309,7 +1309,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0185
+    const v1, 0x7f0a0188
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1395,7 +1395,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1409,7 +1409,7 @@
 
     const-class v2, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali
index 0cd29d97da..67e94d8e50 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember$Model.smali
@@ -120,9 +120,9 @@
 
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 
@@ -163,7 +163,7 @@
 
     invoke-direct {p4, p0, p1, p5}, Lf/a/o/a/g0;-><init>(JLcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {p3, p4}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, p4}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -181,7 +181,7 @@
 
     const-string p1, "observable"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -237,7 +237,7 @@
 
     invoke-direct {v1, p0, p2, p1}, Lf/a/o/a/i0;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -319,7 +319,7 @@
 .method public static synthetic f(Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-static {p1, p0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p1, p0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -392,7 +392,7 @@
 
     invoke-direct/range {v1 .. v6}, Lf/a/o/a/e0;-><init>(JJLrx/Observable;)V
 
-    invoke-virtual {v0, v7}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v7}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -437,7 +437,7 @@
 
     invoke-direct {p1, p2, p3}, Lf/a/o/a/j0;-><init>(Ljava/util/Map;Ljava/lang/String;)V
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -447,13 +447,13 @@
 .method public static synthetic h(Ljava/util/Map;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Integer;
     .locals 1
 
-    invoke-static {p1, p0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p1, p0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    invoke-static {p2, p0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p2, p0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -485,7 +485,7 @@
 
     invoke-direct {v0, p0}, Lf/a/o/a/l0;-><init>(Ljava/util/Map;)V
 
-    invoke-virtual {p3, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -493,7 +493,7 @@
 
     invoke-direct {p3, p1}, Lf/a/o/a/h0;-><init>(Ljava/util/Map;)V
 
-    invoke-virtual {p0, p3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -501,7 +501,7 @@
 
     invoke-direct {p3, p2}, Lf/a/o/a/f0;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0, p3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -515,7 +515,7 @@
 
     sget-object p1, Lf/a/o/a/q1;->d:Lf/a/o/a/q1;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
index a11cb0568b..84fc1390ca 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
@@ -163,7 +163,7 @@
 
     const-class p1, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -259,7 +259,7 @@
 
     move-result-object p1
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     const/4 p1, 0x0
 
@@ -275,7 +275,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a01a0
+    const v0, 0x7f0a01a3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -285,7 +285,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->membersRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a019f
+    const v0, 0x7f0a01a2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -295,7 +295,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->searchBox:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a01a1
+    const v0, 0x7f0a01a4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -367,7 +367,7 @@
 
     move-result-object v5
 
-    invoke-interface {v4, v5}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v4, v5}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object v4, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->nameFilterPublisher:Lrx/subjects/Subject;
 
@@ -381,7 +381,7 @@
 
     sget-object v5, Lf/a/o/a/o0;->d:Lf/a/o/a/o0;
 
-    invoke-virtual {v4, v5}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v4, v5}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
@@ -391,7 +391,7 @@
 
     const-class v6, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;
 
-    invoke-static {v5, v6}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v5, v6}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v5
 
@@ -403,7 +403,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -417,7 +417,7 @@
 
     const-class v2, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
index 47d37d79bf..447fbe3cfd 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
@@ -120,9 +120,9 @@
 
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 
@@ -179,7 +179,7 @@
 
     invoke-direct {v2, p2}, Lf/a/o/a/t0;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {p1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -257,13 +257,13 @@
 
     invoke-direct {v0, p0}, Lf/a/o/a/s0;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     sget-object p1, Lf/a/o/a/o1;->d:Lf/a/o/a/o1;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -331,11 +331,11 @@
 
     invoke-direct {v1, p0, p1}, Lf/a/o/a/v0;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
index 261a2cda6b..66462cda17 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
@@ -125,7 +125,7 @@
 
     const-class p1, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -195,7 +195,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f0a01a2
+    const v0, 0x7f0a01a5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -243,7 +243,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -257,7 +257,7 @@
 
     const-class v2, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
index 691fd2e847..29e761e575 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
@@ -262,9 +262,9 @@
 
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 
@@ -333,7 +333,7 @@
 
     sget-object p1, Lf/a/o/a/z0;->d:Lf/a/o/a/z0;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v8
 
@@ -415,7 +415,7 @@
 
     sget-object v0, Lf/a/o/a/q1;->d:Lf/a/o/a/q1;
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -487,11 +487,11 @@
 
     invoke-direct {v1, p0, p1}, Lf/a/o/a/b1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
index 322405fdf2..e61795d9aa 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
@@ -139,12 +139,12 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f1203ce
+    const v0, 0x7f1203cf
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f12040b
+    const v0, 0x7f12040c
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -241,7 +241,7 @@
 
     const-class p1, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -354,9 +354,9 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1210ca
+    const p1, 0x7f1210f4
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     :goto_0
     return-void
@@ -399,7 +399,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a01a4
+    const v0, 0x7f0a01a7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -407,7 +407,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addRole:Landroid/view/View;
 
-    const v0, 0x7f0a01a3
+    const v0, 0x7f0a01a6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -415,7 +415,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addMember:Landroid/view/View;
 
-    const v0, 0x7f0a01a6
+    const v0, 0x7f0a01a9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -423,7 +423,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->rolesContainer:Landroid/view/View;
 
-    const v0, 0x7f0a01a5
+    const v0, 0x7f0a01a8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -431,7 +431,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->membersContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0a8a
+    const v0, 0x7f0a0a8f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -441,7 +441,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a0a89
+    const v0, 0x7f0a0a8e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -523,7 +523,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -537,7 +537,7 @@
 
     const-class v2, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$1.smali
index 6ec7ecabde..fa6158e366 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelSidebarActions;
 
@@ -82,13 +84,4 @@
     invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;->access$startPrivateCall(Lcom/discord/widgets/channels/WidgetChannelSidebarActions;JZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$2.smali
index d2b48f65c6..8b376d67fc 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$2;->this$0:Lcom/discord/widgets/channels/WidgetChannelSidebarActions;
 
@@ -82,13 +84,4 @@
     invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;->access$startPrivateCall(Lcom/discord/widgets/channels/WidgetChannelSidebarActions;JZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$3.smali
index 6d57e3795d..dcc9915026 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->Companion:Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$Companion;
 
@@ -79,18 +81,9 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$Companion;->showForChannel(JLandroidx/fragment/app/FragmentManager;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$4.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$4.smali
index 2475ead3cc..e660f3bbce 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$4;->$channelId:J
 
@@ -74,13 +76,4 @@
     invoke-static {v0, v1, p1}, Lcom/discord/widgets/search/WidgetSearch;->launchForChannel(JLandroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$5.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$5.smali
index a85fb5aeac..aca8466b91 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$5;->$viewState:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState;
 
@@ -80,13 +82,4 @@
     invoke-static {v0, v1, p1}, Lcom/discord/widgets/search/WidgetSearch;->launchForGuild(JLandroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$6.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$6.smali
index 5103c49d7f..cba006a437 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$6;->$context:Landroid/content/Context;
 
@@ -74,13 +76,4 @@
     invoke-static {p1, v0, v1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->show(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$7.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$7.smali
index f7971b1531..bb00c388bd 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->Companion:Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$Companion;
 
@@ -79,18 +81,9 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$Companion;->showForChannel(JLandroidx/fragment/app/FragmentManager;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$8.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$8.smali
index c4f6f00256..b7bd430569 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$8.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$configureUI$8;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->Companion:Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;
 
@@ -76,13 +78,4 @@
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;->launch(JLandroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$onViewBoundOrOnResume$1.smali
index cc8ec51123..29f4478f46 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActions$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelSidebarActions;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;->access$configureUI(Lcom/discord/widgets/channels/WidgetChannelSidebarActions;Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali
index 4fab930f66..1cba66f21c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali
@@ -23,41 +23,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;
+    const-string v2, "guildActionView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildActionView()Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildActionView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildActionView()Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;
 
-    const/4 v2, 0x0
+    const-string v2, "privateActionView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getPrivateActionView()Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "privateActionView"
-
-    const-string v4, "getPrivateActionView()Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -73,7 +61,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0a8b
+    const v0, 0x7f0a0a90
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -81,7 +69,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;->guildActionView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a8c
+    const v0, 0x7f0a0a91
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -117,7 +105,7 @@
 
     sget-object v2, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -179,7 +167,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;->getPrivateActionView()Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;
 
@@ -226,7 +214,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;->getGuildActionView()Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;
 
@@ -335,7 +323,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -343,7 +331,7 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, p0, v1, v2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 
@@ -403,7 +391,7 @@
 
     const-string v1, "ViewModelProvider(this, \u2026onsViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;
 
@@ -411,7 +399,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -442,9 +430,9 @@
     return-void
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1.smali
index 1c4924d8a0..dc87d0f0d8 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelSidebarActionsViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;->access$handleStoreState(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$create$1.smali
index 591554fcbb..e4e0ee4c8d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$create$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelSidebarActionsViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;",
             ">;"
         }
@@ -76,7 +79,7 @@
 
     const-string v0, "isOpen"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1.smali
index 18d1827261..d33ceeaf40 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelSidebarActionsViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/panels/PanelState;
+    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1;->call(Lcom/discord/panels/PanelState;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/panels/PanelState;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
+    check-cast p1, Lcom/discord/panels/PanelState;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1;->call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali
index 10f098d2b4..fdfb9a17e1 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelSidebarActionsViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;",
+        "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;",
+        ">;"
     }
 .end annotation
 
@@ -61,7 +67,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildNotificationSettings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;
 
@@ -80,15 +88,6 @@
     invoke-direct {v0, v1, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildNotificationSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali
index 3d557550e8..3e7a969781 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelSidebarActionsViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +81,9 @@
 
     sget-object p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelNotFound;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelNotFound;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -100,7 +102,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali
index 0e92130a0d..2247dc0ce5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali
@@ -49,13 +49,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeChannelsSelected"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeNavigation"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUserGuildSettings"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,27 +70,6 @@
     iput-object p3, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->storeUserGuildSettings:Lcom/discord/stores/StoreUserGuildSettings;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeUserGuildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -167,13 +150,13 @@
 
     sget-object v1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeNavState$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "storeNavigation.observeR\u2026= PanelState.Opened\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -199,13 +182,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "storeChannelsSelected\n  \u2026  }\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -224,7 +207,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;
 
@@ -236,24 +221,15 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$create$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "observeNavState().switch\u2026State().take(1)\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;-><init>(Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali
index cfddab73f0..a56580f308 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings;
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;ILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;
@@ -89,22 +84,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -132,7 +120,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali
index 9246f4ba75..1c5256433c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetChannelSidebarActionsViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState;",
         ">;"
     }
@@ -33,14 +33,16 @@
         }
     .end annotation
 
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
-
-    sget-object v1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;
-
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
-
     const/4 v1, 0x2
 
     invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -49,6 +51,10 @@
 
     const-class v3, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;
 
+    new-instance v8, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -57,10 +63,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -68,13 +70,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel;Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;)V
@@ -90,7 +85,7 @@
 
     sget-object v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelNotFound;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelNotFound;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -98,7 +93,7 @@
 
     sget-object p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Uninitialized;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto/16 :goto_3
 
@@ -164,7 +159,7 @@
 
     const-string v7, "channelOverride"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getChannelId()J
 
@@ -215,7 +210,7 @@
 
     invoke-direct {v0, v2, v3, v1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Private;-><init>(JZ)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_3
 
@@ -238,7 +233,7 @@
 
     const-string v3, "storeState.channel.guildId"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -278,7 +273,7 @@
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;-><init>(JJZZ)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_3
     return-void
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$RenderedTopic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$RenderedTopic.smali
index 13c937e300..23dac1102a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$RenderedTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$RenderedTopic.smali
@@ -196,7 +196,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopic$RenderedTopic;->channelName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -206,7 +206,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopic$RenderedTopic;->topic:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$1.smali
index 4ce53e74d8..3fb56eca0b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelTopic.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,20 +71,13 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/chat/WidgetUrlActions;->Companion:Lcom/discord/widgets/chat/WidgetUrlActions$Companion;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/WidgetUrlActions$Companion;->requestNotice(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$2.smali
index 80014c8380..4889675d31 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/WidgetChannelTopic$getRenderedTopicForTopic$renderContext$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChannelTopic.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/textprocessing/node/SpoilerNode<",
         "*>;",
@@ -30,45 +30,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleOnIndexClicked"
+
+    const-string v5, "handleOnIndexClicked(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleOnIndexClicked"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleOnIndexClicked(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -91,22 +75,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->handleOnIndexClicked(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1$animateMaxLines$$inlined$doOnEnd$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1$animateMaxLines$$inlined$doOnEnd$1.smali
index 1cfef037ed..2528aaf36c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1$animateMaxLines$$inlined$doOnEnd$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1$animateMaxLines$$inlined$doOnEnd$1.smali
@@ -35,26 +35,21 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1$animateMaxLines$$inlined$doOnEnd$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1;
 
@@ -63,47 +58,24 @@
     invoke-static {p1}, Lcom/discord/widgets/channels/WidgetChannelTopic;->access$configureEllipsis(Lcom/discord/widgets/channels/WidgetChannelTopic;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1.smali
index dda9521b5b..d6b77f2f6d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopic$onToggleTopicExpansionState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelTopic.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -87,7 +87,7 @@
 
     const-string v0, "animation"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x96
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.smali
index c718966218..d143b6c0bb 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelTopic.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopic;->access$handleEvent(Lcom/discord/widgets/channels/WidgetChannelTopic;Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$2.smali
index fcf51788f7..53cfabdf3f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelTopic.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,9 +63,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const-string v1, "viewState"
+    const-string/jumbo v1, "viewState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopic;->access$configureUI(Lcom/discord/widgets/channels/WidgetChannelTopic;Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$2.smali
index 5b99e6a590..51dd20007d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$2.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$2;->$channelId:J
 
@@ -61,7 +61,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4$1.smali
index da6398190a..1da6b8b3d7 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelTopic.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "v"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4;
 
@@ -75,20 +77,11 @@
 
     move-result-object p1
 
-    const-string v1, "v.context"
+    const-string/jumbo v1, "v.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->handleClosePrivateChannel(Landroid/content/Context;)Lkotlin/Unit;
 
     return-void
-
-    :cond_0
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali
index cb97f15c98..24a54d98cb 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali
@@ -53,7 +53,7 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, v0, Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic;
 
@@ -67,7 +67,7 @@
 
     aput-object v5, v4, v6
 
-    const v5, 0x7f120e0a
+    const v5, 0x7f120e30
 
     invoke-virtual {v3, v5, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -81,7 +81,7 @@
 
     aput-object v7, v5, v6
 
-    const v6, 0x7f120e07
+    const v6, 0x7f120e2d
 
     invoke-virtual {v4, v6, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -89,11 +89,11 @@
 
     const-string v5, "getString(R.string.leave\u2026up_dm_body, channelTitle)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, v0, Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const v6, 0x7f120e06
+    const v6, 0x7f120e2c
 
     invoke-virtual {v5, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -101,13 +101,13 @@
 
     iget-object v6, v0, Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const v7, 0x7f1203b7
+    const v7, 0x7f1203b8
 
     invoke-virtual {v6, v7}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    const v7, 0x7f0a062c
+    const v7, 0x7f0a0632
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$5.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$5.smali
index 6b2dff0f56..ab6e4bc994 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$5.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->handleClosePrivateChannel(Landroid/content/Context;)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
index e5a1bb1d44..1a3cecc740 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
@@ -37,101 +37,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelTopic;
+    const-string v2, "moreButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMoreButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "moreButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getMoreButton()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const/4 v2, 0x0
+    const-string v2, "channelTopicTitle"
 
-    aput-object v1, v0, v2
+    const-string v3, "getChannelTopicTitle()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelTopic;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "channelTopicTitle"
-
-    const-string v4, "getChannelTopicTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelTopic;
+    const-string v2, "channelTopicEllipsis"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelTopicEllipsis()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelTopicEllipsis"
-
-    const-string v4, "getChannelTopicEllipsis()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelTopic;
+    const-string v2, "channelName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelName"
-
-    const-string v4, "getChannelName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelTopic;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelTopic;
+    const-string v2, "channelIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelIcon"
-
-    const-string v4, "getChannelIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -147,7 +117,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a01ba
+    const v0, 0x7f0a01bd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,7 +125,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->moreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01bc
+    const v0, 0x7f0a01bf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +133,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->channelTopicTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b9
+    const v0, 0x7f0a01bc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->g(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -171,7 +141,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->channelTopicEllipsis$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01bb
+    const v0, 0x7f0a01be
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +149,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->channelName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01b8
+    const v0, 0x7f0a01bb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -226,9 +196,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -443,11 +413,11 @@
     goto :goto_0
 
     :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.channels.WidgetChannelTopicViewModel.ViewState.Guild.Topic"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -471,7 +441,7 @@
 
     invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
-    const v0, 0x7f08029f
+    const v0, 0x7f0802a0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelTopic;->setChannelIcon(I)V
 
@@ -758,7 +728,7 @@
 
     const-string v2, "requireContext().getString(R.string.aka)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;->getRecipientNicknames()Ljava/util/Set;
 
@@ -778,7 +748,7 @@
 
     const-string v4, ", "
 
-    invoke-static/range {v3 .. v10}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v3 .. v10}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -856,7 +826,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -886,7 +856,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -924,7 +894,7 @@
 
     const-string v0, "channelTopicTitle.context"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->getAllowAnimatedEmojis()Z
 
@@ -1032,7 +1002,7 @@
 
     const-string v6, "requireContext()"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v4, v5, v3}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Z)Ljava/lang/String;
 
@@ -1043,9 +1013,9 @@
     return-object v2
 
     :cond_2
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1096,7 +1066,7 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -1207,17 +1177,9 @@
 
     iget v1, p1, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
 
-    invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetChannelTopic;->getChannelIcon()Landroid/widget/ImageView;
+    const/4 v2, 0x4
 
-    move-result-object v2
-
-    invoke-virtual {v2}, Landroid/widget/ImageView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v2
-
-    const v3, 0x7f0701ee
-
-    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v2}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v2
 
@@ -1228,11 +1190,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -1280,17 +1242,9 @@
 
     iget v1, p1, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
 
-    invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetChannelTopic;->getChannelIcon()Landroid/widget/ImageView;
+    const/16 v2, 0x8
 
-    move-result-object v2
-
-    invoke-virtual {v2}, Landroid/widget/ImageView;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v2
-
-    const v3, 0x7f0701ed
-
-    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v2}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v2
 
@@ -1301,11 +1255,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -1339,7 +1293,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a05cd
+    const v2, 0x7f0a05d3
 
     invoke-interface {v1, v2}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -1355,7 +1309,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a05cb
+    const v2, 0x7f0a05d1
 
     invoke-interface {v1, v2}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -1363,7 +1317,7 @@
 
     const-string v2, "copyChannelIdAction"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, p5}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -1377,7 +1331,7 @@
 
     move-result-object p5
 
-    const v1, 0x7f0a05cc
+    const v1, 0x7f0a05d2
 
     invoke-interface {p5, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -1385,7 +1339,7 @@
 
     const-string v1, "customizeGroupAction"
 
-    invoke-static {p5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p5, p1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -1399,7 +1353,7 @@
 
     move-result-object p2
 
-    const p3, 0x7f0a05ca
+    const p3, 0x7f0a05d0
 
     invoke-interface {p2, p3}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -1409,7 +1363,7 @@
 
     if-ne p1, p3, :cond_0
 
-    const p1, 0x7f120e06
+    const p1, 0x7f120e2c
 
     invoke-interface {p2, p1}, Landroid/view/MenuItem;->setTitle(I)Landroid/view/MenuItem;
 
@@ -1422,7 +1376,7 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f12043c
+    const p1, 0x7f12043d
 
     invoke-interface {p2, p1}, Landroid/view/MenuItem;->setTitle(I)Landroid/view/MenuItem;
 
@@ -1526,7 +1480,7 @@
 
     const-string v1, "ViewModelProvider(this, \u2026picViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
 
@@ -1534,7 +1488,7 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
@@ -1566,7 +1520,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1574,9 +1528,9 @@
 
     move-result-object v0
 
-    const-string v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -1613,12 +1567,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$1.smali
index ef5c477827..04c2eeaa01 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelTopicViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->access$handleStoreState(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1.smali
index b6a95a8f09..634288a2d3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelTopicViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$NavState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$NavState;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;",
             ">;"
         }
@@ -84,7 +87,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;->access$observeStoreState(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$NavState;)Lrx/Observable;
 
@@ -95,7 +98,7 @@
     :cond_0
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;->access$observeStoreState(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$NavState;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToGuildStoreState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToGuildStoreState$1.smali
index bb53f9dcb0..68c00906bf 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToGuildStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToGuildStoreState$1.smali
@@ -33,7 +33,29 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild;",
+        ">;"
     }
 .end annotation
 
@@ -59,7 +81,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;
+.method public final call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild;
     .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -86,7 +108,7 @@
             ">;",
             "Ljava/lang/Boolean;",
             ")",
-            "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;"
+            "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild;"
         }
     .end annotation
 
@@ -96,23 +118,23 @@
 
     const-string v0, "channels"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "users"
+    const-string/jumbo v0, "users"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "members"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "roles"
 
-    invoke-static {p4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "allowAnimatedEmojis"
 
-    invoke-static {p5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p5}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -158,7 +180,7 @@
 
     check-cast p5, Ljava/lang/Boolean;
 
-    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToGuildStoreState$1;->call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;
+    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToGuildStoreState$1;->call(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToPrivateStoreState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToPrivateStoreState$1.smali
index 27f4623a70..54872e39f3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToPrivateStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToPrivateStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelTopicViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;",
+        "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -55,7 +64,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;
+.method public final call(Ljava/util/Map;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -68,7 +77,7 @@
             "+",
             "Lcom/discord/models/domain/ModelGuildMember$Computed;",
             ">;>;)",
-            "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;"
+            "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;"
         }
     .end annotation
 
@@ -82,7 +91,7 @@
 
     const-string v0, "channel.dmRecipient"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -122,7 +131,7 @@
 
     check-cast p1, Ljava/util/Map;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToPrivateStoreState$1;->call(Ljava/util/Map;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToPrivateStoreState$1;->call(Ljava/util/Map;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1.smali
index 9668b62b16..43db721b6f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelTopicViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/panels/PanelState;
+    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1;->call(Lcom/discord/panels/PanelState;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/panels/PanelState;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
+    check-cast p1, Lcom/discord/panels/PanelState;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1;->call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2.smali
index 9d4f96fcb4..22556d7916 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelTopicViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/tabs/NavigationTab;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/tabs/NavigationTab;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2;->call(Lcom/discord/widgets/tabs/NavigationTab;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/widgets/tabs/NavigationTab;)Z
+.method public final call(Lcom/discord/widgets/tabs/NavigationTab;)Ljava/lang/Boolean;
     .locals 1
 
     sget-object v0, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
@@ -88,5 +74,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/tabs/NavigationTab;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2;->call(Lcom/discord/widgets/tabs/NavigationTab;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$3.smali
index b918802949..28f927859f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$3.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$NavState;",
+        ">;"
     }
 .end annotation
 
@@ -66,7 +69,7 @@
 
     const-string v1, "isOpen"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -74,7 +77,7 @@
 
     const-string v1, "isOnHomeTab"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeStoreState$1.smali
index 1f6777d81e..acb5e5513a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelTopicViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -97,9 +99,9 @@
 
     invoke-direct {p1, v0, v1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$NoChannel;-><init>(ZZ)V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_2
 
@@ -133,7 +135,7 @@
 
     const-string v1, "channel.topic"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
 
@@ -182,9 +184,9 @@
 
     invoke-direct {v0, p1, v1, v2}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;-><init>(Lcom/discord/models/domain/ModelChannel;ZZ)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object v0, p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory.smali
index 4ebb9411cf..f36eb44e69 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory.smali
@@ -71,21 +71,33 @@
 .method public constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreTabsNavigation;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeChannelsSelected"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "storeChannels"
 
-    if-eqz p3, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "storeUsers"
 
-    if-eqz p5, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "storeGuilds"
 
-    if-eqz p7, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUserSettings"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeNavigation"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeTabsNavigation"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -104,55 +116,6 @@
     iput-object p7, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;->storeTabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeTabsNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUserSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreTabsNavigation;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -328,7 +291,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -386,7 +349,7 @@
 
     const-string v2, "Observable.combineLatest\u2026HomeTab\n        )\n      }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 .end method
@@ -431,13 +394,13 @@
 
     invoke-direct {v0, p1, v1, v2, p2}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p2, "Observable.just(\n       \u2026            )\n          )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -452,13 +415,13 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelToPrivateStoreState$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$NavState;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "storeGuilds.observeCompu\u2026            )\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
@@ -483,7 +446,7 @@
 
     sget-object v1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -495,7 +458,7 @@
 
     sget-object v2, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeNavState$2;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -507,7 +470,7 @@
 
     const-string v1, "Observable.combineLatest\u2026sOpen, isOnHomeTab)\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -535,13 +498,13 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeStoreState$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$NavState;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "storeChannelsSelected\n  \u2026            }\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -549,7 +512,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -560,7 +523,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
 
@@ -572,34 +537,25 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
     const-string v0, "observeNavState().switch\u2026te).take(1)\n            }"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;->storeChannels:Lcom/discord/stores/StoreChannels;
+    iget-object v3, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$Factory;->storeChannels:Lcom/discord/stores/StoreChannels;
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
-    const/4 v4, 0x4
+    const/4 v5, 0x4
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreChannels;Lcom/discord/simpleast/core/parser/Parser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreChannels;Lcom/discord/simpleast/core/parser/Parser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM.smali
index 6d52824dfb..5734cdd87f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM.smali
@@ -56,14 +56,20 @@
         }
     .end annotation
 
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "recipient"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildMembers"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
     invoke-direct {p0, p5, p6, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;-><init>(ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;->channel:Lcom/discord/models/domain/ModelChannel;
@@ -79,27 +85,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guildMembers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recipient"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -298,13 +283,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "recipient"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildMembers"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;
 
@@ -325,27 +314,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelUser;Ljava/util/Collection;ZZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildMembers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recipient"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -363,7 +331,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -373,7 +341,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;->recipient:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -383,7 +351,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;->guildMembers:Ljava/util/Collection;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM.smali
index 1582b12d18..d1c732c737 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM.smali
@@ -28,9 +28,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p3, p4, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState;-><init>(ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -43,13 +45,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelChannel;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -150,22 +145,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZZZ)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -183,7 +171,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$GDM;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic.smali
index 75d1234462..4ddccc054f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p2, p3, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild;-><init>(ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;Lcom/discord/models/domain/ModelChannel;ZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;
@@ -116,22 +111,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZZ)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;-><init>(Lcom/discord/models/domain/ModelChannel;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -149,7 +137,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$DefaultTopic;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic.smali
index 632dd41654..eabc575615 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic.smali
@@ -98,18 +98,28 @@
         }
     .end annotation
 
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channels"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "users"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "members"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "roles"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_4
-
-    if-eqz p2, :cond_3
-
-    if-eqz p3, :cond_2
-
-    if-eqz p4, :cond_1
-
-    if-eqz p5, :cond_0
-
     invoke-direct {p0, p7, p8, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild;-><init>(ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->channel:Lcom/discord/models/domain/ModelChannel;
@@ -129,41 +139,6 @@
     iput-boolean p8, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "roles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "members"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;
@@ -432,32 +407,40 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_4
+    move-object v2, p1
 
-    if-eqz p2, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "channels"
 
-    if-eqz p4, :cond_1
+    move-object v3, p2
 
-    if-eqz p5, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "users"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "members"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "roles"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
     move/from16 v7, p6
 
     move/from16 v8, p7
@@ -467,41 +450,6 @@
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "roles"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "members"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "users"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "channels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "channel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -519,7 +467,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -529,7 +477,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->channels:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -539,7 +487,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -549,7 +497,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->members:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -559,7 +507,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->roles:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM.smali
index aa5cf9b362..627dbdf75e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM.smali
@@ -49,12 +49,16 @@
         }
     .end annotation
 
+    const-string v0, "recipientName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "recipientNicknames"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p6, p7, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState;-><init>(ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;->recipientName:Ljava/lang/String;
@@ -70,20 +74,6 @@
     iput-boolean p7, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "recipientNicknames"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recipientName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;Ljava/util/Set;JZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -275,20 +265,22 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "recipientName"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p2, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "recipientNicknames"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move-wide v4, p3
 
     move v6, p5
@@ -300,20 +292,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;-><init>(Ljava/lang/String;Ljava/util/Set;JZZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "recipientNicknames"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "recipientName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -331,7 +309,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;->recipientName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -341,7 +319,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;->recipientNicknames:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM.smali
index 3539815822..19cb607ad4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM.smali
@@ -30,9 +30,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;JZZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p5, p6, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState;-><init>(ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -47,13 +49,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelChannel;JZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -206,34 +201,27 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;JZZZ)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
 
-    new-instance v7, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-wide v2, p2
+    move-object v2, p1
 
-    move v4, p4
+    move-wide v3, p2
 
-    move v5, p5
+    move v5, p4
 
-    move v6, p6
+    move v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;-><init>(Lcom/discord/models/domain/ModelChannel;JZZZ)V
+    move v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;-><init>(Lcom/discord/models/domain/ModelChannel;JZZZ)V
 
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -251,7 +239,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic.smali
index eb6edde7f1..107c9326c9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic.smali
@@ -28,12 +28,16 @@
 .method public constructor <init>(Lcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZ)V
     .locals 1
 
+    const-string v0, "channelIconType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p1, p3, p4, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild;-><init>(Lcom/discord/utilities/channel/GuildChannelIconType;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;->channelIconType:Lcom/discord/utilities/channel/GuildChannelIconType;
@@ -45,20 +49,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channelIconType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;Lcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;
@@ -148,31 +138,19 @@
 .method public final copy(Lcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZ)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channelIconType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;-><init>(Lcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channelIconType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -194,7 +172,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -204,7 +182,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic.smali
index 68c144b6c8..aaea00f4bc 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic.smali
@@ -104,22 +104,36 @@
         }
     .end annotation
 
+    const-string v0, "rawTopicString"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelNames"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "userNames"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "roles"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ast"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelIconType"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channel"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_6
-
-    if-eqz p2, :cond_5
-
-    if-eqz p3, :cond_4
-
-    if-eqz p4, :cond_3
-
-    if-eqz p6, :cond_2
-
-    if-eqz p8, :cond_1
-
-    if-eqz p9, :cond_0
-
     invoke-direct {p0, p8, p10, p11, v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild;-><init>(Lcom/discord/utilities/channel/GuildChannelIconType;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->rawTopicString:Ljava/lang/String;
@@ -145,55 +159,6 @@
     iput-boolean p11, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channelIconType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "ast"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "roles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "userNames"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "channelNames"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "rawTopicString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZLjava/util/List;ZLcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;
@@ -532,44 +497,56 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "rawTopicString"
 
-    if-eqz p1, :cond_6
+    move-object v2, p1
 
-    if-eqz p2, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "channelNames"
 
-    if-eqz p4, :cond_3
+    move-object v3, p2
 
-    if-eqz p6, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_1
+    const-string/jumbo v0, "userNames"
 
-    if-eqz p9, :cond_0
+    move-object/from16 v4, p3
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "roles"
+
+    move-object/from16 v5, p4
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ast"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelIconType"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channel"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object/from16 v4, p3
-
-    move-object/from16 v5, p4
-
     move/from16 v6, p5
 
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
-    move-object/from16 v9, p8
-
-    move-object/from16 v10, p9
-
     move/from16 v11, p10
 
     move/from16 v12, p11
@@ -577,55 +554,6 @@
     invoke-direct/range {v1 .. v12}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;-><init>(Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZLjava/util/List;ZLcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "channel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "channelIconType"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "ast"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "roles"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "userNames"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "channelNames"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "rawTopicString"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -643,7 +571,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->rawTopicString:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -653,7 +581,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->channelNames:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -663,7 +591,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->userNames:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -673,7 +601,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->roles:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -689,7 +617,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->ast:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -709,7 +637,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -719,7 +647,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel.smali
index ac78441308..4e80e402a5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetChannelTopicViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState;",
         ">;"
     }
@@ -68,7 +68,7 @@
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lcom/discord/stores/StoreChannels;Lcom/discord/simpleast/core/parser/Parser;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -86,27 +86,31 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeStateObservable"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeChannels"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$NoChannel;
+    const-string v0, "topicParser"
 
-    const/4 v2, 0x0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, v2, v2}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$NoChannel;-><init>(ZZ)V
+    new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$NoChannel;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1, v1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$NoChannel;-><init>(ZZ)V
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
 
     iput-object p3, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->topicParser:Lcom/discord/simpleast/core/parser/Parser;
 
-    sget-object p2, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p2, Lk0/j/p;->d:Lk0/j/p;
 
     iput-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->revealedIndices:Ljava/util/Set;
 
@@ -126,11 +130,15 @@
 
     const/4 p2, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x0
 
-    move-result-object v1
+    invoke-static {p1, p0, p3, p2, p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -138,40 +146,17 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    new-instance v6, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$1;
 
-    new-instance v7, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$1;
+    invoke-direct {v6, p0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;)V
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$1;-><init>(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;)V
+    const/16 v7, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "topicParser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lrx/Observable;Lcom/discord/stores/StoreChannels;Lcom/discord/simpleast/core/parser/Parser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -279,7 +264,7 @@
 
     invoke-direct {v2, v3, v4, v5, v1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$DefaultTopic;-><init>(Lcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZ)V
 
-    invoke-virtual {v0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto/16 :goto_5
 
@@ -416,7 +401,7 @@
     :cond_2
     const-string v4, "channelTopic"
 
-    invoke-static {v5, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Guild$Topic;->getChannels()Ljava/util/Map;
 
@@ -508,7 +493,7 @@
 
     const-string v11, "name"
 
-    invoke-static {v9, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v9}, Ljava/lang/CharSequence;->length()I
 
@@ -585,7 +570,7 @@
 
     invoke-direct/range {v4 .. v15}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;-><init>(Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZLjava/util/List;ZLcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZ)V
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_5
     return-void
@@ -629,7 +614,7 @@
 
     const-string v1, "storeState.channel.dmRec\u2026ate.channel\n            )"
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DM;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -675,7 +660,7 @@
 
     const-string v9, "storeState.channel.dmRecipient"
 
-    invoke-static {v6, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -710,7 +695,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v2}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v2}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v6
 
@@ -732,7 +717,7 @@
 
     invoke-direct/range {v4 .. v11}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DM;-><init>(Ljava/lang/String;Ljava/util/Set;JZZZ)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_2
 
@@ -775,7 +760,7 @@
 
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$GDM;-><init>(Lcom/discord/models/domain/ModelChannel;JZZZ)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_4
     :goto_2
@@ -819,7 +804,7 @@
     if-eqz v4, :cond_1
 
     :goto_0
-    sget-object v2, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v2, Lk0/j/p;->d:Lk0/j/p;
 
     goto :goto_1
 
@@ -977,7 +962,7 @@
 
     invoke-direct {v0, v1, p1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$NoChannel;-><init>(ZZ)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_3
 
@@ -1032,15 +1017,15 @@
 .method public final handleClosePrivateChannel(Landroid/content/Context;)Lkotlin/Unit;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->previousChannelId:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->previousChannelId:Ljava/lang/Long;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
 
     move-result-wide v0
 
@@ -1048,17 +1033,15 @@
 
     invoke-virtual {v2, p1, v0, v1}, Lcom/discord/stores/StoreChannels;->delete(Landroid/content/Context;J)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
 
 .method public final handleOnIndexClicked(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V
@@ -1076,55 +1059,52 @@
 
     move-object/from16 v0, p0
 
-    const/4 v1, 0x0
+    const-string v1, "spoilerNode"
 
-    if-eqz p1, :cond_2
+    move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v2
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
-    instance-of v3, v2, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;
+    move-result-object v1
+
+    instance-of v3, v1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;
 
     if-nez v3, :cond_0
 
-    goto :goto_0
+    const/4 v1, 0x0
 
     :cond_0
-    move-object v1, v2
+    check-cast v1, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;
 
-    :goto_0
-    move-object v2, v1
+    if-eqz v1, :cond_1
 
-    check-cast v2, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->getRawTopicString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->generateAST(Ljava/lang/CharSequence;)Ljava/util/List;
-
-    move-result-object v8
-
-    iget-object v1, v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->revealedIndices:Ljava/util/Set;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->getId()I
-
-    move-result v3
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {v1}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->getRawTopicString()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v1, v3}, Lf/n/a/k/a;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
+    invoke-direct {v0, v3}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->generateAST(Ljava/lang/CharSequence;)Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v8
 
-    iput-object v1, v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->revealedIndices:Ljava/util/Set;
+    iget-object v3, v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->revealedIndices:Ljava/util/Set;
 
-    new-instance v1, Lcom/discord/utilities/textprocessing/MessagePreprocessor;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->getId()I
+
+    move-result v2
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    invoke-static {v3, v2}, Lf/n/a/k/a;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v2
+
+    iput-object v2, v0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->revealedIndices:Ljava/util/Set;
+
+    new-instance v2, Lcom/discord/utilities/textprocessing/MessagePreprocessor;
 
     const-wide/16 v10, -0x1
 
@@ -1136,11 +1116,11 @@
 
     const/4 v15, 0x0
 
-    move-object v9, v1
+    move-object v9, v2
 
     invoke-direct/range {v9 .. v15}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;-><init>(JLjava/util/Collection;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-virtual {v1, v8}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V
+    invoke-virtual {v2, v8}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V
 
     const/4 v3, 0x0
 
@@ -1152,7 +1132,7 @@
 
     const/4 v7, 0x0
 
-    invoke-virtual {v1}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isLinkifyConflicting()Z
+    invoke-virtual {v2}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isLinkifyConflicting()Z
 
     move-result v9
 
@@ -1166,21 +1146,16 @@
 
     const/16 v14, 0x79f
 
+    move-object v2, v1
+
     invoke-static/range {v2 .. v15}, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;->copy$default(Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZLjava/util/List;ZLcom/discord/utilities/channel/GuildChannelIconType;Lcom/discord/models/domain/ModelChannel;ZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Guild$Topic;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string v2, "spoilerNode"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final listenForEvents()Lrx/Observable;
@@ -1198,32 +1173,25 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
 .method public final setStoreChannels(Lcom/discord/stores/StoreChannels;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setTopicParser(Lcom/discord/simpleast/core/parser/Parser;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1237,18 +1205,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopicViewModel;->topicParser:Lcom/discord/simpleast/core/parser/Parser;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
index 0059cf9662..81e4d77ea0 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$Model.smali
@@ -259,7 +259,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali
index fdc238c981..8c932fba88 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali
@@ -38,7 +38,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a075f
+    const v0, 0x7f0a0765
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
index ead385618d..3f45d2c701 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
@@ -88,12 +88,12 @@
 
     if-ne v0, v1, :cond_1
 
-    const v0, 0x7f1204f3
+    const v0, 0x7f1204f5
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f1204f4
+    const v0, 0x7f1204f6
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -168,7 +168,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -176,7 +176,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -192,7 +192,7 @@
 
     move-result-object p3
 
-    invoke-static {p2, p3}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {p2, p3}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -477,7 +477,7 @@
     :cond_0
     const-class p1, Lcom/discord/widgets/channels/WidgetCreateChannel;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -499,7 +499,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a05d7
+    const p2, 0x7f0a05dd
 
     if-ne p1, p2, :cond_0
 
@@ -603,7 +603,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a029f
+    const v0, 0x7f0a02a2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -613,7 +613,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->channelNameLayout:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a02a4
+    const v0, 0x7f0a02a7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -623,7 +623,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a02a7
+    const v0, 0x7f0a02aa
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -633,7 +633,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->textRadio:Landroid/widget/RadioButton;
 
-    const v0, 0x7f0a02aa
+    const v0, 0x7f0a02ad
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -643,7 +643,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->voiceRadio:Landroid/widget/RadioButton;
 
-    const v0, 0x7f0a02a2
+    const v0, 0x7f0a02a5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -653,7 +653,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateSwitch:Landroid/widget/Switch;
 
-    const v0, 0x7f0a02a3
+    const v0, 0x7f0a02a6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -663,7 +663,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateTitle:Landroid/widget/TextView;
 
-    const v0, 0x7f0a02a1
+    const v0, 0x7f0a02a4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -673,7 +673,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateInfo:Landroid/widget/TextView;
 
-    const v0, 0x7f0a02a6
+    const v0, 0x7f0a02a9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -681,7 +681,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->textChannelContainer:Landroid/view/View;
 
-    const v0, 0x7f0a02a9
+    const v0, 0x7f0a02ac
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -689,7 +689,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->voiceChannelContainer:Landroid/view/View;
 
-    const v0, 0x7f0a02a0
+    const v0, 0x7f0a02a3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -697,7 +697,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateChannelContainer:Landroid/view/View;
 
-    const v0, 0x7f0a02a5
+    const v0, 0x7f0a02a8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -707,7 +707,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->roleHeader:Landroid/widget/TextView;
 
-    const v0, 0x7f0a02a8
+    const v0, 0x7f0a02ab
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -826,7 +826,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -840,7 +840,7 @@
 
     const-class v2, Lcom/discord/widgets/channels/WidgetCreateChannel;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -936,12 +936,12 @@
 
     if-ne v1, v2, :cond_4
 
-    const v1, 0x7f1212a6
+    const v1, 0x7f1212d1
 
     goto :goto_1
 
     :cond_4
-    const v1, 0x7f1212a8
+    const v1, 0x7f1212d3
 
     :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -952,12 +952,12 @@
 
     if-ne v1, v2, :cond_5
 
-    const v1, 0x7f1212a7
+    const v1, 0x7f1212d2
 
     goto :goto_2
 
     :cond_5
-    const v1, 0x7f1212af
+    const v1, 0x7f1212da
 
     :goto_2
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -968,12 +968,12 @@
 
     if-ne v1, v2, :cond_6
 
-    const v1, 0x7f120711
+    const v1, 0x7f120713
 
     goto :goto_3
 
     :cond_6
-    const v1, 0x7f120714
+    const v1, 0x7f120716
 
     :goto_3
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -984,12 +984,12 @@
 
     if-ne v1, v2, :cond_7
 
-    const v1, 0x7f1203cd
+    const v1, 0x7f1203ce
 
     goto :goto_4
 
     :cond_7
-    const v1, 0x7f120712
+    const v1, 0x7f120714
 
     :goto_4
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Companion.smali
index c827a03367..1cd6202c2c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Companion.smali
@@ -36,11 +36,13 @@
 .method public final launch(Landroid/content/Context;JLjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "source"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "DM Group Add"
 
@@ -56,57 +58,33 @@
 
     const-class p2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    invoke-static {p1, p2, p4}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, p4}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final launch(Landroid/content/Context;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "source"
 
-    const-string v1, "DM Group Create"
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
+    const-string v0, "DM Group Create"
+
+    invoke-static {v0, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x4
 
-    invoke-static {p1, p2, v0, v1}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, p2, v0, v1}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput.smali
index 29d882c3c9..292473be6f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput.smali
@@ -43,11 +43,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "addedUsers"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "filter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,20 +58,6 @@
     iput-object p2, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;->filter:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "addedUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;Ljava/util/Collection;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
@@ -137,31 +125,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "addedUsers"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "filter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;-><init>(Ljava/util/Collection;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "addedUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -179,7 +155,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;->addedUsers:Ljava/util/Collection;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -189,7 +165,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;->filter:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.smali
index 06f6816180..50d3bf4223 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,32 +59,32 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelUser;)J
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Long;
     .locals 2
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1;->call(Lcom/discord/models/domain/ModelUser;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$1.smali
index 1c8751376a..02dfa32b9c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/Map$Entry<",
         "+",
         "Ljava/lang/Long;",
@@ -58,23 +58,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/Map$Entry;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$1;->call(Ljava/util/Map$Entry;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/Map$Entry;)Z
+.method public final call(Ljava/util/Map$Entry;)Ljava/lang/Boolean;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -82,7 +66,8 @@
             "Ljava/util/Map$Entry<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -154,7 +139,7 @@
 
     const-string v2, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -164,7 +149,7 @@
     :goto_0
     const/4 v2, 0x2
 
-    invoke-static {p1, v0, v1, v2}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p1, v0, v1, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p1
 
@@ -179,5 +164,21 @@
     const/4 v1, 0x1
 
     :cond_2
-    return v1
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/Map$Entry;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$1;->call(Ljava/util/Map$Entry;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$2.smali
index 52863e69f0..5273db2a12 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TK;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map$Entry<",
+        "+",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,15 +64,16 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map$Entry;)J
-    .locals 2
+.method public final call(Ljava/util/Map$Entry;)Ljava/lang/Long;
+    .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/Map$Entry<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
-            ">;)J"
+            ">;)",
+            "Ljava/lang/Long;"
         }
     .end annotation
 
@@ -73,25 +81,17 @@
 
     move-result-object p1
 
-    check-cast p1, Ljava/lang/Number;
+    check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 0
 
     check-cast p1, Ljava/util/Map$Entry;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$2;->call(Ljava/util/Map$Entry;)J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$2;->call(Ljava/util/Map$Entry;)Ljava/lang/Long;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3.smali
index 47f7431935..8d7ce5a1f9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TV;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map$Entry<",
+        "+",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +64,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/util/Map$Entry;)I
+.method public final call(Ljava/util/Map$Entry;)Ljava/lang/Integer;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -65,7 +72,8 @@
             "Ljava/util/Map$Entry<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
-            ">;)I"
+            ">;)",
+            "Ljava/lang/Integer;"
         }
     .end annotation
 
@@ -73,13 +81,9 @@
 
     move-result-object p1
 
-    check-cast p1, Ljava/lang/Number;
+    check-cast p1, Ljava/lang/Integer;
 
-    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
-
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -87,11 +91,7 @@
 
     check-cast p1, Ljava/util/Map$Entry;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3;->call(Ljava/util/Map$Entry;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3;->call(Ljava/util/Map$Entry;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1.smali
index 6ff61595e7..55798e6860 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -76,6 +84,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
@@ -97,7 +106,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$1;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1;Ljava/util/Map;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -105,7 +114,7 @@
 
     sget-object v1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3;->INSTANCE:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1$3;
 
-    invoke-virtual {p1, v0, v1}, Lrx/Observable;->c0(Lr0/k/b;Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0, v1}, Lrx/Observable;->c0(Ls0/k/b;Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1.smali
index c8780a4ff7..8bde8f103d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -75,6 +83,7 @@
             "Ljava/lang/Integer;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
@@ -100,7 +109,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1$1;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1;Ljava/util/Map;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.smali
index f63af1db89..bc631e5121 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -70,6 +76,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Ljava/lang/Integer;",
@@ -93,7 +100,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2$1;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2;Ljava/util/List;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3$1.smali
index 63b1737ed8..52971d44eb 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3$1.smali
@@ -29,7 +29,23 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;",
+        ">;"
     }
 .end annotation
 
@@ -80,19 +96,19 @@
 
     const-string v2, "filteredFriends"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "presences"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "users"
+    const-string/jumbo v2, "users"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "applicationStreams"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, p1, p2, p3}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.smali
index 020253d957..90088a5d0a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,6 +86,7 @@
             "Ljava/lang/Integer;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$1.smali
index 2343955de5..7abf50efa1 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/util/Collection<",
         "+",
@@ -49,45 +49,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Ljava/util/Collection;Ljava/lang/String;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Ljava/util/Collection;Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/util/Collection;Ljava/lang/String;)Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -103,31 +85,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;-><init>(Ljava/util/Collection;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$1.smali
index 5cf8a4dfa7..cfc0d1cf76 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;",
+        ">;>;"
     }
 .end annotation
 
@@ -76,7 +80,7 @@
 
     const-string v1, "friends"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$1;->$usersFilter:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$2.smali
index 86a6109931..c35bee51a8 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -74,6 +79,7 @@
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
             ">;"
         }
@@ -99,7 +105,7 @@
 
     const-string v0, "friendItems"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -141,9 +147,9 @@
 
     invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;Ljava/util/Collection;Ljava/util/List;II)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v7}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v7}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2.smali
index 1e9abb1bbc..fbfeb5b5f3 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
             ">;"
         }
@@ -94,7 +97,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$1;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -102,7 +105,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2$2;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2;Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.smali
index 6e34f3f881..ed29f7175e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -83,9 +85,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -115,7 +117,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1$2;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$1.smali
index 69e571a56f..bcc6e3932d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/util/Collection<",
         "+",
@@ -49,45 +49,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Ljava/util/Collection;Ljava/lang/String;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Ljava/util/Collection;Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/util/Collection;Ljava/lang/String;)Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -103,31 +85,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;-><init>(Ljava/util/Collection;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$1.smali
index a7add54dc0..4f76f93141 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;",
+        ">;>;"
     }
 .end annotation
 
@@ -76,7 +80,7 @@
 
     const-string v1, "friends"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$1;->$usersFilter:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$2.smali
index f4672869a5..35d834be31 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -70,6 +75,7 @@
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
             ">;"
         }
@@ -91,7 +97,7 @@
 
     const-string v0, "friendItems"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -135,9 +141,9 @@
 
     invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;Ljava/util/Collection;Ljava/util/List;II)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v7}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v7}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.smali
index feebcd9918..86a54867e7 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
             ">;"
         }
@@ -100,7 +103,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$1;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -108,7 +111,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2$2;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$AddedUsersInput;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1.smali
index e6bc4c5335..74fb2674b7 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,32 +49,16 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1;->call(Lcom/discord/models/domain/ModelUser;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelUser;)Z
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1;
 
     iget-object v0, v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1;->$friends:Ljava/util/Map;
 
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -88,5 +72,21 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1.smali
index 2a356f1645..95d9873ceb 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Collection<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -71,6 +77,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelUser;",
             ">;>;"
@@ -85,7 +92,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1$1;-><init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.smali
index 93439121f2..006887e790 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -71,6 +78,7 @@
             "Ljava/lang/Integer;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelUser;",
             ">;>;"
@@ -83,7 +91,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1;-><init>(Ljava/util/Map;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion.smali
index ca6a66aca1..99e8e30376 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion.smali
@@ -37,12 +37,6 @@
     return-void
 .end method
 
-.method public static synthetic MODE_CREATE$annotations()V
-    .locals 0
-
-    return-void
-.end method
-
 .method public static final synthetic access$getFilteredFriends(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion;Ljava/util/Collection;Ljava/lang/String;)Lrx/Observable;
     .locals 0
 
@@ -78,7 +72,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_0
     invoke-static {p1}, Lrx/Observable;->z(Ljava/lang/Iterable;)Lrx/Observable;
@@ -87,7 +81,7 @@
 
     sget-object v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1;->INSTANCE:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -99,19 +93,19 @@
 
     invoke-direct {v0, p2}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object p2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3;->INSTANCE:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable\n            .\u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -148,13 +142,13 @@
 
     invoke-direct {p2, p3, p4}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1;-><init>(Lrx/Observable;Lrx/Observable;)V
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n            \u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -196,17 +190,23 @@
 
     sget-object p2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2;->INSTANCE:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable\n            .\u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
 
+.method public static synthetic getMODE_CREATE$annotations()V
+    .locals 0
+
+    return-void
+.end method
+
 
 # virtual methods
 .method public final get(JLrx/Observable;Lrx/Observable;)Lrx/Observable;
@@ -227,11 +227,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "addedUsersPublisher"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "filterPublisher"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, -0x1
 
@@ -252,20 +254,6 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "filterPublisher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "addedUsersPublisher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getFriendChanges(Lrx/Observable;)Lrx/Observable;
@@ -285,7 +273,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "addedUsers"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -303,7 +293,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1;-><init>(Lrx/Observable;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -313,16 +303,7 @@
 
     const-string v0, "StoreStream\n            \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "addedUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem$Companion.smali
index 4adc0ab29c..05f0c537e8 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem$Companion.smali
@@ -34,7 +34,7 @@
 
 # virtual methods
 .method public final createData(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;Ljava/util/Collection;)Ljava/util/List;
-    .locals 8
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -49,11 +49,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "friends"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "alreadyAddedUsers"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -95,7 +97,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v0}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v0}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object p2
 
@@ -136,22 +138,10 @@
 
     move-result-wide v3
 
+    new-instance v1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;
+
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->getUsers()Ljava/util/Map;
 
-    move-result-object v1
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-interface {v1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->getPresences()Ljava/util/Map;
-
     move-result-object v5
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -162,50 +152,48 @@
 
     move-result-object v5
 
-    check-cast v5, Lcom/discord/models/domain/ModelPresence;
+    check-cast v5, Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->getPresences()Ljava/util/Map;
 
     move-result-object v6
 
-    invoke-interface {p2, v6}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result v6
+    move-result-object v7
+
+    invoke-interface {v6, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Lcom/discord/models/domain/ModelPresence;
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v7
+
+    invoke-interface {p2, v7}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v7
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->getStreams()Ljava/util/Map;
 
-    move-result-object v7
+    move-result-object v8
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
-    invoke-interface {v7, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v8, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v3
 
-    new-instance v4, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;
+    invoke-direct {v1, v5, v6, v7, v3}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;ZZ)V
 
-    invoke-direct {v4, v1, v5, v6, v3}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;ZZ)V
-
-    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v2, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_1
     return-object v2
-
-    :cond_2
-    const-string p1, "alreadyAddedUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "friends"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali
index 67479289e3..51bc6cef04 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem.smali
@@ -229,7 +229,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -239,7 +239,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$FriendItem;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali
index 5b99d95eff..db78c28346 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship.smali
@@ -87,15 +87,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "relationships"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "presences"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "users"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "streams"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -108,34 +114,6 @@
     iput-object p4, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->streams:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "streams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;
@@ -273,49 +251,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "relationships"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "presences"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "users"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "streams"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "streams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -333,7 +289,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->relationships:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -343,7 +299,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->presences:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -353,7 +309,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -363,7 +319,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$ModelAppUserRelationship;->streams:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
index d21b5c5e96..6364c8dc8e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model.smali
@@ -92,11 +92,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedUsers"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "potentialAdditions"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -113,20 +115,6 @@
     iput p6, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->maxGroupMemberCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "potentialAdditions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;Ljava/util/Collection;Ljava/util/List;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -345,11 +333,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedUsers"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "potentialAdditions"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;
 
@@ -370,20 +360,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;Ljava/util/Collection;Ljava/util/List;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "potentialAdditions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -401,7 +377,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -411,7 +387,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->filterText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -421,7 +397,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->selectedUsers:Ljava/util/Collection;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -431,7 +407,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;->potentialAdditions:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
index 2f16967699..e7bd0226fa 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
@@ -58,13 +58,13 @@
 
     const-string v0, "selected"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result p2
 
-    const-string v0, "user"
+    const-string/jumbo v0, "user"
 
     if-eqz p2, :cond_1
 
@@ -84,20 +84,20 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    const p2, 0x7f1208f8
+    const p2, 0x7f1208fa
 
     const/4 v0, 0x0
 
     const/4 v1, 0x4
 
-    invoke-static {p1, p2, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, p2, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     goto :goto_0
 
     :cond_0
     iget-object p2, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->access$selectUser(Lcom/discord/widgets/channels/WidgetGroupInviteFriends;Lcom/discord/models/domain/ModelUser;)V
 
@@ -106,7 +106,7 @@
     :cond_1
     iget-object p2, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->access$unselectUser(Lcom/discord/widgets/channels/WidgetGroupInviteFriends;Lcom/discord/models/domain/ModelUser;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$3.smali
index 7e353b7b83..4d53c869aa 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Collection<",
         "+",
@@ -32,45 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subjects/BehaviorSubject;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subjects/BehaviorSubject;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onNext"
+
+    const-string v5, "onNext(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subjects/BehaviorSubject;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNext(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -95,7 +79,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subjects/BehaviorSubject;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$4.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$4.smali
index b84d1d657e..0995d4885f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/WidgetGroupInviteFriends$onViewBoundOrOnResume$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/channels/WidgetGroupInviteFriends;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
index 2248241d0b..6230da8345 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1208f8
+    const v0, 0x7f1208fa
 
     const/4 v1, 0x0
 
@@ -51,7 +51,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$1.smali
index 14ebf34979..1a26df3c0c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$1.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2$2.smali
index e4ece481d2..6b7684adcc 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2.smali
index 62fd447589..6013444cf2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGroupInviteFriends.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -93,7 +93,7 @@
 
     const-string v1, "channelId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -131,7 +131,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -242,7 +242,7 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2$2;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2;
 
@@ -254,7 +254,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.smali
index 202bd3972a..12f7e2f850 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.smali
@@ -117,7 +117,7 @@
 
     const-string v0, "Observable.combineLatest\u2026dVoiceChannelId\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
index 8bc2b7057e..9ead7b246b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
@@ -87,101 +87,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
+    const-string v2, "recycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "recycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "viewFlipper"
 
-    aput-object v1, v0, v2
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "viewFlipper"
-
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
+    const-string v2, "sendFab"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSendFab()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "sendFab"
-
-    const-string v4, "getSendFab()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
+    const-string v2, "chipsView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChipsView()Lcom/discord/utilities/view/chips/ChipsView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chipsView"
-
-    const-string v4, "getChipsView()Lcom/discord/utilities/view/chips/ChipsView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
 
-    const-class v2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
+    const-string v2, "recipientsContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecipientsContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "recipientsContainer"
-
-    const-string v4, "getRecipientsContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -205,7 +175,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0417
+    const v0, 0x7f0a041d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a041a
+    const v0, 0x7f0a0420
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +191,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0418
+    const v0, 0x7f0a041e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -229,7 +199,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->sendFab$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0415
+    const v0, 0x7f0a041b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -237,7 +207,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->chipsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0416
+    const v0, 0x7f0a041c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -432,7 +402,7 @@
 
     const-string v3, "chipsView.text"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2}, Ljava/lang/CharSequence;->length()I
 
@@ -849,7 +819,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120904
+    const v0, 0x7f120906
 
     new-array v4, v2, [Ljava/lang/Object;
 
@@ -861,7 +831,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v7, 0x2
 
@@ -882,7 +852,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120d38
+    const v0, 0x7f120d5e
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -917,7 +887,7 @@
 
     if-lt v0, v4, :cond_1
 
-    const p1, 0x7f1208f7
+    const p1, 0x7f1208f9
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -925,7 +895,7 @@
 
     const-string v0, "getString(R.string.group_dm_invite_full_main)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getRecipientsContainer()Landroid/view/View;
 
@@ -956,13 +926,13 @@
 
     move-result-object v4
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f10006c
 
@@ -983,7 +953,7 @@
     :cond_2
     if-nez v0, :cond_3
 
-    const p1, 0x7f120903
+    const p1, 0x7f120905
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -991,7 +961,7 @@
 
     const-string v0, "getString(R.string.group\u2026_invite_will_fill_mobile)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_1
 
@@ -1002,13 +972,13 @@
 
     move-result-object v4
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f10006d
 
@@ -1082,7 +1052,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1105,15 +1077,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->adapter:Lcom/discord/widgets/channels/WidgetGroupInviteFriendsAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1155,7 +1118,7 @@
 
     const-string v2, "addedUsersPublisher"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion;->getFriendChanges(Lrx/Observable;)Lrx/Observable;
 
@@ -1205,13 +1168,13 @@
 
     iget-object v4, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->addedUsersPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->filterPublisher:Lrx/subjects/BehaviorSubject;
 
     const-string v5, "filterPublisher"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, v0, v1, v4, v2}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion;->get(JLrx/Observable;Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
index 34254504db..57ab196ae6 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
@@ -53,7 +53,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a03db
+    const p2, 0x7f0a03e1
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,7 +65,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a03dc
+    const p2, 0x7f0a03e2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -77,7 +77,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a03d9
+    const p2, 0x7f0a03df
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -89,7 +89,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a03d2
+    const p2, 0x7f0a03d8
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -101,7 +101,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a03ca
+    const p2, 0x7f0a03d0
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -111,7 +111,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a09f7
+    const p2, 0x7f0a09fb
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
index c77593a9b9..889bea936b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Companion.smali
@@ -36,7 +36,9 @@
 .method public final launch(JLandroid/content/Context;)V
     .locals 2
 
-    if-eqz p3, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -50,20 +52,11 @@
 
     const-string p2, "Intent()\n          .putE\u2026RA_CHANNEL_ID, channelId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    invoke-static {p3, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p3, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
index dd1e4b5012..a475139713 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;",
+        ">;"
     }
 .end annotation
 
@@ -64,7 +68,7 @@
 
     const-string v2, "me"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
@@ -118,7 +122,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali
index 6ab91fd2e5..bc1d3ad089 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetTextChannelSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -89,7 +91,7 @@
 
     const-string v2, "it.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -134,9 +136,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion.smali
index e225e4312f..1f892fbb70 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion.smali
@@ -58,13 +58,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n            \u2026ust(null)\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -76,7 +76,7 @@
 
     const-string p2, "StoreStream\n            \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali
index 5f25b5aa7a..c9f0ea50c6 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model.smali
@@ -54,9 +54,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -73,15 +75,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;->isPublicGuildUpdatesChannel:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;Lcom/discord/models/domain/ModelChannel;ZZZZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;
@@ -213,36 +206,29 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZZZZZ)Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
 
-    new-instance v7, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move v2, p2
+    move-object v2, p1
 
-    move v3, p3
+    move v3, p2
 
-    move v4, p4
+    move v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    move v6, p6
+    move v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
+    move v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
 
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -260,7 +246,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali
index b6d5210299..b57516a68f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali
@@ -58,7 +58,7 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -77,7 +77,7 @@
 
     const-string v0, "context"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1;->$this_configureUI:Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;
 
@@ -139,7 +139,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05b1
+    .packed-switch 0x7f0a05b7
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali
index bbf79c547d..922bb6c6dd 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali
@@ -49,7 +49,7 @@
 .method public final call(Landroid/view/Menu;)V
     .locals 1
 
-    const v0, 0x7f0a05b1
+    const v0, 0x7f0a05b7
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -57,7 +57,7 @@
 
     const-string v0, "it.findItem(R.id.menu_channel_settings_delete)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2;->$this_configureUI:Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali
index b55ade0372..249ce20017 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
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 eb11c4af95..10d2e41865 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
@@ -49,13 +49,13 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const v0, 0x7f121140
+    const v0, 0x7f12116b
 
     const/4 v1, 0x0
 
@@ -63,7 +63,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali
index 67e1e9af70..7288688555 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali
index 07fd494d29..9ab71ce136 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.smali
@@ -43,11 +43,11 @@
 
     move-result-object v0
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
index d013d5c918..aa30d5e444 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
@@ -67,7 +67,7 @@
 
     move-result-object p3
 
-    const v0, 0x7f0a01af
+    const v0, 0x7f0a01b2
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1.smali
index d282a2e2f4..1dd1181215 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetTextChannelSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
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 684e032a78..5669fcc1c1 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetTextChannelSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isCategory()Z
 
@@ -77,12 +77,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f1203cf
+    const p1, 0x7f1203d0
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f12040c
+    const p1, 0x7f12040d
 
     :goto_0
     const/4 v1, 0x0
@@ -91,7 +91,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
index ef125a528f..a174de3b49 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
@@ -66,291 +66,207 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 16
+    .locals 15
 
     const/16 v0, 0xe
 
     new-array v1, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v3, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v3, "channelSettingsPinnedMessagesContainer"
 
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v4, "getChannelSettingsPinnedMessagesContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v3
+    const/4 v5, 0x0
 
-    const-string v4, "channelSettingsPinnedMessagesContainer"
+    invoke-static {v2, v3, v4, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getChannelSettingsPinnedMessagesContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    const-class v4, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
-
-    invoke-static {v4}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v4
-
-    const-string v5, "channelSettingsPinnedMessages"
-
-    const-string v6, "getChannelSettingsPinnedMessages()Landroid/view/View;"
-
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v4, 0x1
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Lj0/n/c/q;
-
-    const-class v5, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
-
-    invoke-static {v5}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v5
-
-    const-string v6, "channelSettingsPinnedMessagesDisabledOverlay"
-
-    const-string v7, "getChannelSettingsPinnedMessagesDisabledOverlay()Landroid/view/View;"
-
-    invoke-direct {v2, v5, v6, v7}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v5, 0x2
+    move-result-object v2
 
     aput-object v2, v1, v5
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v6, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v3, "channelSettingsPinnedMessages"
 
-    invoke-static {v6}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v4, "getChannelSettingsPinnedMessages()Landroid/view/View;"
 
-    move-result-object v6
+    invoke-static {v2, v3, v4, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v7, "userManagementContainer"
+    move-result-object v2
 
-    const-string v8, "getUserManagementContainer()Landroid/view/View;"
+    const/4 v3, 0x1
 
-    invoke-direct {v2, v6, v7, v8}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v3
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+
+    const-string v4, "channelSettingsPinnedMessagesDisabledOverlay"
+
+    const-string v6, "getChannelSettingsPinnedMessagesDisabledOverlay()Landroid/view/View;"
+
+    invoke-static {v2, v4, v6, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v2
+
+    const/4 v4, 0x2
+
+    aput-object v2, v1, v4
+
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+
+    const-string/jumbo v6, "userManagementContainer"
+
+    const-string v7, "getUserManagementContainer()Landroid/view/View;"
+
+    invoke-static {v2, v6, v7, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v2
 
     const/4 v6, 0x3
 
     aput-object v2, v1, v6
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v7, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v7, "channelSettingsPermissions"
 
-    invoke-static {v7}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v8, "getChannelSettingsPermissions()Landroid/view/View;"
 
-    move-result-object v7
+    invoke-static {v2, v7, v8, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v8, "channelSettingsPermissions"
-
-    const-string v9, "getChannelSettingsPermissions()Landroid/view/View;"
-
-    invoke-direct {v2, v7, v8, v9}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v7, 0x4
 
     aput-object v2, v1, v7
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v8, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v8, "channelSettingsPrivacySafetyContainer"
 
-    invoke-static {v8}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v9, "getChannelSettingsPrivacySafetyContainer()Landroid/view/View;"
 
-    move-result-object v8
+    invoke-static {v2, v8, v9, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v9, "channelSettingsPrivacySafetyContainer"
-
-    const-string v10, "getChannelSettingsPrivacySafetyContainer()Landroid/view/View;"
-
-    invoke-direct {v2, v8, v9, v10}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v8, 0x5
 
     aput-object v2, v1, v8
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v9, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v9, "channelSettingsWrap"
 
-    invoke-static {v9}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v10, "getChannelSettingsWrap()Landroid/view/View;"
 
-    move-result-object v9
+    invoke-static {v2, v9, v10, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v10, "channelSettingsWrap"
-
-    const-string v11, "getChannelSettingsWrap()Landroid/view/View;"
-
-    invoke-direct {v2, v9, v10, v11}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v9, 0x6
 
     aput-object v2, v1, v9
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v10, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v10, "channelSettingsName"
 
-    invoke-static {v10}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v11, "getChannelSettingsName()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v10
+    invoke-static {v2, v10, v11, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v11, "channelSettingsName"
-
-    const-string v12, "getChannelSettingsName()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v2, v10, v11, v12}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v10, 0x7
 
     aput-object v2, v1, v10
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v11, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v11, "channelSettingsTopic"
 
-    invoke-static {v11}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v12, "getChannelSettingsTopic()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v11
+    invoke-static {v2, v11, v12, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v12, "channelSettingsTopic"
-
-    const-string v13, "getChannelSettingsTopic()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v2, v11, v12, v13}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v11, 0x8
 
     aput-object v2, v1, v11
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v12, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v12, "channelSettingsSave"
 
-    invoke-static {v12}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v13, "getChannelSettingsSave()Landroid/view/View;"
 
-    move-result-object v12
+    invoke-static {v2, v12, v13, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v13, "channelSettingsSave"
-
-    const-string v14, "getChannelSettingsSave()Landroid/view/View;"
-
-    invoke-direct {v2, v12, v13, v14}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v12, 0x9
 
     aput-object v2, v1, v12
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v13, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v12, "channelSettingsNsfw"
 
-    invoke-static {v13}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v13, "getChannelSettingsNsfw()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v13
+    invoke-static {v2, v12, v13, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v14, "channelSettingsNsfw"
+    move-result-object v2
 
-    const-string v15, "getChannelSettingsNsfw()Lcom/discord/views/CheckedSetting;"
+    const/16 v12, 0xa
 
-    invoke-direct {v2, v13, v14, v15}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v12
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const/16 v13, 0xa
+    const-string v13, "channelSettingsSlowModeContainer"
+
+    const-string v14, "getChannelSettingsSlowModeContainer()Landroid/view/View;"
+
+    invoke-static {v2, v13, v14, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v2
+
+    const/16 v13, 0xb
 
     aput-object v2, v1, v13
 
-    new-instance v2, Lj0/n/c/q;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const-class v14, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    const-string v13, "channelSettingsSlowModeLabel"
 
-    invoke-static {v14}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v14, "getChannelSettingsSlowModeLabel()Landroid/widget/TextView;"
 
-    move-result-object v14
+    invoke-static {v2, v13, v14, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v15, "channelSettingsSlowModeContainer"
+    move-result-object v2
 
-    const-string v12, "getChannelSettingsSlowModeContainer()Landroid/view/View;"
+    const/16 v13, 0xc
 
-    invoke-direct {v2, v14, v15, v12}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v13
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v2, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
 
-    const/16 v12, 0xb
+    const-string v13, "channelSettingsSlowModeSlider"
 
-    aput-object v2, v1, v12
+    const-string v14, "getChannelSettingsSlowModeSlider()Landroid/widget/SeekBar;"
 
-    new-instance v2, Lj0/n/c/q;
+    invoke-static {v2, v13, v14, v5}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v14, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
+    move-result-object v2
 
-    invoke-static {v14}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const/16 v13, 0xd
 
-    move-result-object v14
-
-    const-string v15, "channelSettingsSlowModeLabel"
-
-    const-string v12, "getChannelSettingsSlowModeLabel()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v14, v15, v12}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v12, 0xc
-
-    aput-object v2, v1, v12
-
-    new-instance v2, Lj0/n/c/q;
-
-    const-class v14, Lcom/discord/widgets/channels/WidgetTextChannelSettings;
-
-    invoke-static {v14}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v14
-
-    const-string v15, "channelSettingsSlowModeSlider"
-
-    const-string v12, "getChannelSettingsSlowModeSlider()Landroid/widget/SeekBar;"
-
-    invoke-direct {v2, v14, v15, v12}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v12, 0xd
-
-    aput-object v2, v1, v12
+    aput-object v2, v1, v13
 
     sput-object v1, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -364,23 +280,23 @@
 
     new-array v0, v0, [Ljava/lang/Integer;
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    aput-object v1, v0, v3
+    aput-object v1, v0, v5
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    aput-object v1, v0, v4
+    aput-object v1, v0, v3
 
-    invoke-static {v13}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v12}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    aput-object v1, v0, v5
+    aput-object v1, v0, v4
 
     const/16 v1, 0xf
 
@@ -446,7 +362,7 @@
 
     move-result-object v1
 
-    aput-object v1, v0, v13
+    aput-object v1, v0, v12
 
     const/16 v1, 0xe10
 
@@ -474,7 +390,7 @@
 
     move-result-object v1
 
-    aput-object v1, v0, v12
+    aput-object v1, v0, v13
 
     invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
@@ -490,7 +406,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a01a8
+    const v0, 0x7f0a01ab
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -498,7 +414,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessagesContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01a7
+    const v0, 0x7f0a01aa
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -506,7 +422,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01a9
+    const v0, 0x7f0a01ac
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -514,7 +430,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessagesDisabledOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ad
+    const v0, 0x7f0a01b0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -522,7 +438,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->userManagementContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a019e
+    const v0, 0x7f0a01a1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -530,7 +446,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPermissions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ab
+    const v0, 0x7f0a01ae
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -538,7 +454,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPrivacySafetyContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0198
+    const v0, 0x7f0a019b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -546,7 +462,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0196
+    const v0, 0x7f0a0199
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -554,7 +470,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0197
+    const v0, 0x7f0a019a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -562,7 +478,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsTopic$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01aa
+    const v0, 0x7f0a01ad
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -570,7 +486,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a019d
+    const v0, 0x7f0a01a0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -578,7 +494,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsNsfw$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ac
+    const v0, 0x7f0a01af
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -586,7 +502,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSlowModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ae
+    const v0, 0x7f0a01b1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -594,7 +510,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSlowModeLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01af
+    const v0, 0x7f0a01b2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -620,9 +536,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0196
-        0x7f0a0197
-        0x7f0a01af
+        0x7f0a0199
+        0x7f0a019a
+        0x7f0a01b2
     .end array-data
 .end method
 
@@ -751,9 +667,9 @@
 
     new-instance v1, Landroidx/appcompat/app/AlertDialog$Builder;
 
-    const-string v2, "view"
+    const-string/jumbo v2, "view"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -771,9 +687,9 @@
 
     const-string v2, "AlertDialog.Builder(view\u2026t).setView(view).create()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0a018f
+    const v2, 0x7f0a0192
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -781,7 +697,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a0190
+    const v3, 0x7f0a0193
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -791,12 +707,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120578
+    const p1, 0x7f12057a
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f12057e
+    const p1, 0x7f120580
 
     :goto_0
     invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(I)V
@@ -847,12 +763,12 @@
 
     if-eqz v3, :cond_2
 
-    const v3, 0x7f12040b
+    const v3, 0x7f12040c
 
     goto :goto_0
 
     :cond_2
-    const v3, 0x7f1203ce
+    const v3, 0x7f1203cf
 
     :goto_0
     invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -867,7 +783,7 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x2
 
@@ -949,12 +865,12 @@
 
     if-eqz v3, :cond_4
 
-    const v3, 0x7f120712
+    const v3, 0x7f120714
 
     goto :goto_2
 
     :cond_4
-    const v3, 0x7f1203cd
+    const v3, 0x7f1203ce
 
     :goto_2
     invoke-static {v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setHint(Lcom/google/android/material/textfield/TextInputLayout;I)V
@@ -1326,7 +1242,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    const v3, 0x7f0a01af
+    const v3, 0x7f0a01b2
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -1448,9 +1364,9 @@
 
     new-instance v1, Landroidx/appcompat/app/AlertDialog$Builder;
 
-    const-string v3, "view"
+    const-string/jumbo v3, "view"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -1468,9 +1384,9 @@
 
     const-string v3, "AlertDialog.Builder(view\u2026t).setView(view).create()"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f0a0195
+    const v3, 0x7f0a0198
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1478,7 +1394,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a0192
+    const v4, 0x7f0a0195
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1486,7 +1402,7 @@
 
     check-cast v4, Landroid/widget/TextView;
 
-    const v5, 0x7f0a0193
+    const v5, 0x7f0a0196
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1494,7 +1410,7 @@
 
     check-cast v5, Landroid/widget/TextView;
 
-    const v6, 0x7f0a0194
+    const v6, 0x7f0a0197
 
     invoke-virtual {v0, v6}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1508,12 +1424,12 @@
 
     if-eqz v6, :cond_0
 
-    const v6, 0x7f12056b
+    const v6, 0x7f12056d
 
     goto :goto_0
 
     :cond_0
-    const v6, 0x7f12056a
+    const v6, 0x7f12056c
 
     :goto_0
     invoke-virtual {v3, v6}, Landroid/widget/TextView;->setText(I)V
@@ -1532,9 +1448,9 @@
 
     const-string v0, "dialogBody"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f12056c
+    const v0, 0x7f12056e
 
     const/4 v3, 0x1
 
@@ -1546,7 +1462,7 @@
 
     const-string v6, "requireContext()"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x2
 
@@ -1564,9 +1480,9 @@
 
     const-string v0, "getString(R.string.delet\u2026ayName(requireContext()))"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1908,7 +1824,7 @@
 
     move-result-object v1
 
-    sget-object v3, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v3, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -1918,7 +1834,7 @@
 
     invoke-direct {v5, p0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1;-><init>(Lcom/discord/widgets/channels/WidgetTextChannelSettings;)V
 
-    invoke-virtual {v3, v4, v5, v2}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v3, v4, v5, v2}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -1998,7 +1914,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120782
+    const v0, 0x7f120784
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2090,7 +2006,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 5
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -2163,15 +2081,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/SeekBar;->setMax(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali
index c830d2b75c..b867a1e1b0 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelListModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/list/WidgetChannelListModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/list/WidgetChannelListModel;",
             ">;"
         }
@@ -113,7 +116,7 @@
 
     const-string v1, "guildId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
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 6aea44245c..704a48b50a 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
@@ -37,7 +37,35 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func7<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        "Lcom/discord/widgets/channels/list/WidgetChannelListModel;",
+        ">;"
     }
 .end annotation
 
@@ -117,13 +145,13 @@
 
     const-string v5, "mostRecentMessageIds"
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4, v1}, Lcom/discord/utilities/channel/ChannelUtils;->createMostRecentChannelComparator(Ljava/util/Map;)Ljava/util/Comparator;
 
     move-result-object v1
 
-    invoke-static {v3, v1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v3, v1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v1
 
@@ -160,35 +188,37 @@
 
     check-cast v8, Lcom/discord/models/domain/ModelChannel;
 
-    const-string v4, "presences"
+    new-instance v4, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v7, "presences"
+
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v4
+    move-result-object v7
 
-    if-eqz v4, :cond_0
+    if-eqz v7, :cond_0
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v9
 
     invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v7
 
     goto :goto_1
 
     :cond_0
-    move-object v4, v6
+    move-object v7, v6
 
     :goto_1
-    invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v7
 
-    move-object v9, v4
+    move-object v9, v7
 
     check-cast v9, Lcom/discord/models/domain/ModelPresence;
 
@@ -196,7 +226,7 @@
 
     move-result-wide v10
 
-    const/4 v4, 0x0
+    const/4 v7, 0x0
 
     if-nez p2, :cond_1
 
@@ -207,9 +237,9 @@
 
     move-result-wide v12
 
-    cmp-long v7, v10, v12
+    cmp-long v14, v10, v12
 
-    if-nez v7, :cond_2
+    if-nez v14, :cond_2
 
     const/4 v10, 0x1
 
@@ -252,7 +282,7 @@
     :goto_4
     const-string v5, "applicationStreams"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
@@ -287,9 +317,9 @@
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->isMuted()Z
 
-    move-result v4
+    move-result v5
 
-    move v13, v4
+    move v13, v5
 
     goto :goto_5
 
@@ -297,8 +327,6 @@
     const/4 v13, 0x0
 
     :goto_5
-    new-instance v4, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
-
     move-object v7, v4
 
     invoke-direct/range {v7 .. v13}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZZ)V
@@ -314,7 +342,7 @@
 
     invoke-direct {v0, v1, v2, v5, v6}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;-><init>(JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-static {v3, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v9
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
index 5aaf13e469..1efac6ecab 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function10<",
         "Lcom/discord/utilities/channel/GuildChannelsInfo;",
         "Ljava/util/Map<",
@@ -68,7 +68,7 @@
 
     const/16 p1, 0xa
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -111,23 +111,53 @@
 
     move-object/from16 v0, p0
 
-    const/4 v1, 0x0
+    const-string v1, "guildChannelsInfo"
 
-    if-eqz p1, :cond_9
+    move-object/from16 v15, p1
 
-    if-eqz p2, :cond_8
+    invoke-static {v15, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_7
+    const-string v1, "guildChannels"
 
-    if-eqz p8, :cond_6
+    move-object/from16 v6, p2
 
-    if-eqz p9, :cond_5
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_4
+    const-string/jumbo v1, "voiceStates"
 
-    if-eqz p11, :cond_3
+    move-object/from16 v11, p7
 
-    if-eqz p12, :cond_2
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "mentionCounts"
+
+    move-object/from16 v12, p8
+
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v1, "unreadChannelIds"
+
+    move-object/from16 v13, p9
+
+    invoke-static {v13, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "collapsedCategories"
+
+    move-object/from16 v14, p10
+
+    invoke-static {v14, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "nuxState"
+
+    move-object/from16 v9, p11
+
+    invoke-static {v9, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "me"
+
+    move-object/from16 v10, p12
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
 
@@ -135,75 +165,70 @@
 
     move-object/from16 v5, p1
 
-    move-object/from16 v6, p2
-
     move-wide/from16 v7, p3
 
     move-wide/from16 v9, p5
 
-    move-object/from16 v11, p7
-
-    move-object/from16 v12, p8
-
-    move-object/from16 v13, p9
-
-    move-object/from16 v14, p10
-
     move-object/from16 v15, p12
 
     invoke-static/range {v2 .. v15}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->access$guildListBuilder(Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;JLcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/Map;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;Lcom/discord/models/domain/ModelUser;)Ljava/util/List;
 
-    move-result-object v2
+    move-result-object v1
 
-    new-instance v3, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+    new-instance v2, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
 
-    iget-wide v4, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1;->$selectedGuildId:J
+    iget-wide v3, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1;->$selectedGuildId:J
 
-    invoke-direct {v3, v4, v5}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;-><init>(J)V
+    invoke-direct {v2, v3, v4}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;-><init>(J)V
 
-    invoke-static {v2, v3}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v2
-
-    invoke-virtual/range {p11 .. p11}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_1
-
-    invoke-virtual/range {p11 .. p11}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
-
-    move-result-object v3
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_0
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuild;->getId()J
-
-    move-result-wide v4
-
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v1
 
-    :cond_0
-    invoke-static {v3, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual/range {p11 .. p11}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
 
-    move-result v1
+    move-result-object v2
 
-    if-eqz v1, :cond_1
+    if-eqz v2, :cond_1
 
-    const/4 v1, 0x1
+    invoke-virtual/range {p11 .. p11}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuild;->getId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
 
     goto :goto_0
 
-    :cond_1
-    const/4 v1, 0x0
+    :cond_0
+    const/4 v3, 0x0
 
     :goto_0
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
     new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -218,73 +243,17 @@
 
     move-object/from16 p2, v4
 
-    move-object/from16 p3, v2
+    move-object/from16 p3, v1
 
     move/from16 p4, v5
 
-    move/from16 p5, v1
+    move/from16 p5, v2
 
     move/from16 p6, v6
 
     invoke-direct/range {p1 .. p6}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZ)V
 
     return-object v3
-
-    :cond_2
-    const-string v2, "me"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    const-string v2, "nuxState"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    const-string v2, "collapsedCategories"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    const-string v2, "unreadChannelIds"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    const-string v2, "mentionCounts"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_7
-    const-string v2, "voiceStates"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_8
-    const-string v2, "guildChannels"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_9
-    const-string v2, "guildChannelsInfo"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali
index 2ff5eccca7..b1e3f10c13 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$TextLikeChannelData;",
         ">;"
@@ -132,7 +132,7 @@
 
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali
index ba72b9c0b3..294d7e7a24 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali
index 7092d839ae..1699597998 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;",
         ">;"
@@ -126,7 +126,7 @@
 
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.smali
index a335d1582b..18247110c4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->$items:Ljava/util/ArrayList;
 
-    invoke-static {v0}, Lj0/i/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
index 35d7f0e8f9..3f93523086 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
@@ -162,7 +162,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026ILLISECONDS\n            )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -806,7 +806,7 @@
     goto :goto_5
 
     :cond_a
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_5
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
@@ -876,13 +876,13 @@
 
     sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1;->INSTANCE:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$get$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n          .g\u2026List(guildId)\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -894,7 +894,7 @@
 
     const-string v1, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali
index f09dc5e32b..082c01238f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1.smali
@@ -35,7 +35,43 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$State;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -123,29 +159,29 @@
 
     sget-object v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates;->INSTANCE:Lcom/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates;
 
-    const-string v1, "voiceStates"
+    const-string/jumbo v1, "voiceStates"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "users"
+    const-string/jumbo v1, "users"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "guildMembers"
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "guildChannels"
 
-    invoke-static {p5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "guildStreams"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "guildPermissions"
 
-    invoke-static {p6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v7, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates$get$1;->$voiceUserComparator:Ljava/util/Comparator;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates.smali
index 7e8fb50554..8fe47ff91c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$VoiceStates.smali
@@ -106,6 +106,7 @@
 
     move-result-object v1
 
+    :cond_0
     :goto_0
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
@@ -139,17 +140,17 @@
 
     check-cast v6, Lcom/discord/models/domain/ModelUser;
 
-    if-eqz v6, :cond_2
+    if-eqz v6, :cond_3
 
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
     move-result-object v4
 
-    if-eqz v4, :cond_2
+    if-eqz v4, :cond_3
 
-    const-string v7, "voiceState.channelId ?: continue"
+    const-string/jumbo v7, "voiceState.channelId ?: continue"
 
-    invoke-static {v4, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
@@ -181,7 +182,7 @@
 
     move-result-object v11
 
-    if-nez v11, :cond_0
+    if-nez v11, :cond_1
 
     new-instance v11, Ljava/util/ArrayList;
 
@@ -189,7 +190,7 @@
 
     invoke-interface {v0, v4, v11}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_0
+    :cond_1
     check-cast v11, Ljava/util/List;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -206,7 +207,7 @@
 
     check-cast v14, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    if-eqz v14, :cond_1
+    if-eqz v14, :cond_2
 
     invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -220,55 +221,46 @@
 
     check-cast v4, Lcom/discord/models/domain/ModelChannel;
 
-    if-eqz v4, :cond_3
+    if-eqz v4, :cond_0
+
+    new-instance v8, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v2
 
-    move-object/from16 v8, p5
+    move-object/from16 v7, p5
 
-    invoke-interface {v8, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {v7, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
     move-result v2
 
-    new-instance v7, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
-
-    move-object v3, v7
-
-    move-object/from16 p1, v1
-
-    move-object v1, v7
+    move-object v3, v8
 
     move-object v7, v14
 
+    move-object v14, v8
+
     move v8, v2
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;ZZ)V
 
-    invoke-interface {v11, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {v11, v14}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
-
-    :cond_1
-    move-object/from16 v15, p4
-
-    goto :goto_1
+    goto/16 :goto_0
 
     :cond_2
+    move-object/from16 v15, p4
+
+    goto/16 :goto_0
+
+    :cond_3
     move-object/from16 v12, p3
 
     move-object/from16 v15, p4
 
     move-object/from16 v13, p6
 
-    :cond_3
-    :goto_1
-    move-object/from16 p1, v1
-
-    :goto_2
-    move-object/from16 v1, p1
-
     goto/16 :goto_0
 
     :cond_4
@@ -280,7 +272,7 @@
 
     move-result-object v1
 
-    :goto_3
+    :goto_1
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
@@ -303,7 +295,7 @@
 
     invoke-static {v2, v3}, Lf/n/a/k/a;->sortWith(Ljava/util/List;Ljava/util/Comparator;)V
 
-    goto :goto_3
+    goto :goto_1
 
     :cond_5
     return-object v0
@@ -363,7 +355,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string/jumbo v0, "voiceUserComparator"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -385,11 +379,11 @@
 
     move-result-object v0
 
-    const-wide/16 v2, 0xc8
+    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v3, 0xc8
 
-    invoke-static {v0, v2, v3, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v0, v3, v4, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v2
 
@@ -451,7 +445,7 @@
 
     const-string p2, "Observable\n          .co\u2026            )\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -463,16 +457,7 @@
 
     const-string p2, "Observable\n          .co\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "voiceUserComparator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
index c3aa234aea..a70a232ed6 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
@@ -52,7 +52,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZ)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -64,7 +64,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -79,15 +81,6 @@
     iput-boolean p5, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->showEmptyState:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -271,34 +264,27 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "items"
 
-    new-instance v6, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-object v2, p2
+    move-object v2, p1
 
-    move v3, p3
+    move-object v3, p2
 
-    move v4, p4
+    move v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZ)V
+    move v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZ)V
 
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -316,7 +302,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->selectedGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -326,7 +312,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->items:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali
index 9991c73348..82ff76cb85 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$1.smali
@@ -37,9 +37,11 @@
 
 # virtual methods
 .method public onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
 
@@ -58,13 +60,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali
index 9e6940ea23..732539284c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali
@@ -167,7 +167,7 @@
         }
     .end annotation
 
-    invoke-static {p1, p2}, Lj0/i/l;->slice(Ljava/util/List;Lkotlin/ranges/IntRange;)Ljava/util/List;
+    invoke-static {p1, p2}, Lk0/j/l;->slice(Ljava/util/List;Lkotlin/ranges/IntRange;)Ljava/util/List;
 
     move-result-object p1
 
@@ -236,7 +236,7 @@
 
 # virtual methods
 .method public final get(Lkotlin/ranges/IntRange;Ljava/util/List;Z)Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -249,62 +249,64 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "visibleRange"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "items"
 
-    const/4 v1, 0x1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
 
     if-eqz p3, :cond_0
 
     :try_start_0
     invoke-direct {p0, p2, p1}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion;->hasUnread(Ljava/util/List;Lkotlin/ranges/IntRange;)Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    iget v4, p1, Lkotlin/ranges/IntProgression;->d:I
+    iget v3, p1, Lkotlin/ranges/IntProgression;->d:I
 
-    invoke-static {v2, v4}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v1, v3}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, p2, v2, v3, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion;->findIndicator(Ljava/util/List;Lkotlin/ranges/IntProgression;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;
+    invoke-direct {p0, p2, v1, v2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion;->findIndicator(Ljava/util/List;Lkotlin/ranges/IntProgression;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-static {p2}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
 
-    move-result v4
+    move-result v3
 
     iget p1, p1, Lkotlin/ranges/IntProgression;->e:I
 
-    add-int/2addr p1, v1
+    add-int/2addr p1, v0
 
-    invoke-static {v4, p1}, Lj0/q/f;->downTo(II)Lkotlin/ranges/IntProgression;
+    invoke-static {v3, p1}, Lk0/r/f;->downTo(II)Lkotlin/ranges/IntProgression;
 
     move-result-object p1
 
-    invoke-direct {p0, p2, p1, v3, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion;->findIndicator(Ljava/util/List;Lkotlin/ranges/IntProgression;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;
+    invoke-direct {p0, p2, p1, v2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion;->findIndicator(Ljava/util/List;Lkotlin/ranges/IntProgression;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;
 
     move-result-object p1
 
     new-instance p2, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;
 
-    invoke-direct {p2, v2, p1}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;)V
+    invoke-direct {p2, v1, p1}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;)V
     :try_end_0
     .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -315,22 +317,10 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p2, v0, v0, p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 p3, 0x0
+
+    invoke-direct {p2, p3, p3, p1, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     :goto_1
     return-object p2
-
-    :cond_1
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "visibleRange"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali
index e94bdb0db3..4a369f7a9c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model.smali
@@ -167,7 +167,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;->topIndicator:Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -177,7 +177,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model;->bottomIndicator:Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.smali
index f3fe2f5d6b..3652cc6646 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChannelListUnreads.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "handleVisibleRangeUpdate"
+
+    const-string v5, "handleVisibleRangeUpdate()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVisibleRangeUpdate"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleVisibleRangeUpdate()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali
index 9ac9dc51e5..0586c005ea 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$sam$java_lang_Runnable$0.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali
index d42e467817..a4deda6332 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$unreads$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListUnreads.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroid/view/View;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
index 31e5f2d018..0c93fb145f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListUnreads.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroid/widget/TextView;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a01f1
+    const v1, 0x7f0a01f4
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali
index 1abbaba483..5a09b1e0c6 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelListUnreads.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroid/view/View;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a01f2
+    const v1, 0x7f0a01f5
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 6eb22c873e..1c66402f45 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
@@ -15,9 +15,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final FADE_DURATION_MS:J = 0x96L
 
@@ -96,13 +93,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "unreadsStub"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "recycler"
 
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "getItemCount"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -150,7 +151,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->unreadsTextBackground$delegate:Lkotlin/Lazy;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->data:Ljava/util/List;
 
@@ -163,27 +164,6 @@
     invoke-virtual {p1, p2}, Landroidx/recyclerview/widget/RecyclerView;->addOnScrollListener(Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "getItemCount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "unreadsStub"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroid/view/ViewStub;Landroidx/recyclerview/widget/RecyclerView;Lcom/google/android/material/appbar/AppBarLayout;Lkotlin/jvm/functions/Function0;IIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -207,9 +187,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f120f5e
+    const v0, 0x7f120f88
 
-    const v6, 0x7f120f5e
+    const v6, 0x7f120f88
 
     goto :goto_1
 
@@ -221,9 +201,9 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f120f6a
+    const v0, 0x7f120f94
 
-    const v7, 0x7f120f6a
+    const v7, 0x7f120f94
 
     goto :goto_2
 
@@ -564,9 +544,9 @@
 
     move-result-object v3
 
-    const-string v4, "unreads"
+    const-string/jumbo v4, "unreads"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v3, v2, v1}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->onConfigureView(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;Z)V
 
@@ -602,13 +582,15 @@
 .end method
 
 .method public onConfigureView(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;Z)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_9
+    const-string p1, "indicator"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->getUnreadsTextBackground()Landroid/view/View;
 
@@ -616,9 +598,9 @@
 
     invoke-direct {p0, p2}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->getIcon(Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Indicator;)I
 
-    move-result v1
+    move-result v0
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setBackgroundResource(I)V
+    invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->getUnreadsText()Landroid/widget/TextView;
 
@@ -632,37 +614,37 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->getUnreadsText()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string p1, "unreadsText"
+    const-string/jumbo p1, "unreadsText"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
-    const p1, 0x7f080223
+    const p1, 0x7f080224
 
-    const v4, 0x7f080223
+    const v3, 0x7f080224
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f08021e
+    const p1, 0x7f08021f
 
-    const v4, 0x7f08021e
+    const v3, 0x7f08021f
 
     :goto_0
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/16 v6, 0xb
+    const/16 v5, 0xb
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->getUnreads()Landroid/view/View;
 
@@ -670,7 +652,7 @@
 
     const-string p2, "it"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -680,23 +662,20 @@
 
     if-nez p2, :cond_1
 
-    goto :goto_1
+    const/4 p1, 0x0
 
     :cond_1
-    move-object v0, p1
+    check-cast p1, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    :goto_1
-    check-cast v0, Landroid/view/ViewGroup$MarginLayoutParams;
+    instance-of p2, p1, Landroid/widget/RelativeLayout$LayoutParams;
 
-    instance-of p1, v0, Landroid/widget/RelativeLayout$LayoutParams;
+    if-eqz p2, :cond_4
 
-    if-eqz p1, :cond_4
+    move-object p2, p1
 
-    move-object p1, v0
+    check-cast p2, Landroid/widget/RelativeLayout$LayoutParams;
 
-    check-cast p1, Landroid/widget/RelativeLayout$LayoutParams;
-
-    const/16 p2, 0x8
+    const/16 v0, 0x8
 
     const/4 v1, 0x6
 
@@ -704,17 +683,17 @@
 
     const/16 v2, 0x8
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_2
     const/4 v2, 0x6
 
-    :goto_2
-    invoke-static {p1, v2}, Lcom/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt;->removeRuleCompat(Landroid/widget/RelativeLayout$LayoutParams;I)V
+    :goto_1
+    invoke-static {p2, v2}, Lcom/discord/utilities/view/layoutparams/LayoutParamsExtensionsKt;->removeRuleCompat(Landroid/widget/RelativeLayout$LayoutParams;I)V
 
     if-eqz p3, :cond_3
 
-    const/4 p2, 0x6
+    const/4 v0, 0x6
 
     :cond_3
     iget-object p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->recycler:Landroidx/recyclerview/widget/RecyclerView;
@@ -723,20 +702,20 @@
 
     move-result p3
 
-    invoke-virtual {p1, p2, p3}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
+    invoke-virtual {p2, v0, p3}, Landroid/widget/RelativeLayout$LayoutParams;->addRule(II)V
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_4
-    instance-of p1, v0, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
+    instance-of p2, p1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
 
-    if-eqz p1, :cond_8
+    if-eqz p2, :cond_8
 
-    move-object p1, v0
+    move-object p2, p1
 
-    check-cast p1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
+    check-cast p2, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
 
-    const/16 p2, 0x30
+    const/16 v0, 0x30
 
     const/16 v1, 0x50
 
@@ -744,44 +723,44 @@
 
     const/16 v2, 0x30
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_5
     const/16 v2, 0x50
 
-    :goto_3
-    iput v2, p1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->anchorGravity:I
+    :goto_2
+    iput v2, p2, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->anchorGravity:I
 
     if-eqz p3, :cond_6
 
-    const/16 p2, 0x50
+    const/16 v0, 0x50
 
     :cond_6
-    iput p2, p1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->gravity:I
+    iput v0, p2, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->gravity:I
 
-    :goto_4
-    const-string p1, "unreads"
+    :goto_3
+    const-string/jumbo p2, "unreads"
 
-    if-eqz v0, :cond_7
+    if-eqz p1, :cond_7
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->getUnreads()Landroid/view/View;
 
-    move-result-object p2
+    move-result-object p3
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v0}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+    invoke-virtual {p3, p1}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
     :cond_7
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->getUnreads()Landroid/view/View;
 
-    move-result-object p2
+    move-result-object p1
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x4
+    const/4 p2, 0x4
 
-    invoke-virtual {p2, p1}, Landroid/view/View;->setImportantForAccessibility(I)V
+    invoke-virtual {p1, p2}, Landroid/view/View;->setImportantForAccessibility(I)V
 
     return-void
 
@@ -793,20 +772,6 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_9
-    const-string p1, "indicator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onDatasetChanged(Ljava/util/List;)V
@@ -821,7 +786,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->data:Ljava/util/List;
 
@@ -840,15 +807,6 @@
     invoke-virtual {p1, v1, v2, v3}, Landroid/view/ViewGroup;->postDelayed(Ljava/lang/Runnable;J)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setMentionResId(I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureBottomNavSpace$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureBottomNavSpace$1.smali
index eb8dce1431..3a41edd95a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureBottomNavSpace$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureBottomNavSpace$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$configureBottomNavSpace$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -106,11 +106,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
index 5f7ce64bf0..f17e3e2760 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
@@ -55,7 +55,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali
index d214314521..8cde4010ae 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Float;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1.smali
index a40e06ccec..e049f61143 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$11.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$11.smali
index a0134d6629..e8c411e8b4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$11.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$11.smali
@@ -47,7 +47,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "Channels List"
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.smali
index 6e40358e01..33e28a4162 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
@@ -106,7 +108,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2, p1}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion;->launch(JLandroid/content/Context;)V
 
@@ -123,7 +125,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -133,13 +135,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.smali
index 92017263db..88ef2cf368 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,69 +63,75 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 7
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isNewUser()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isNewUser()Z
 
-    move-result v1
+    move-result v0
 
-    if-ne v1, v3, :cond_0
+    if-ne v0, v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    sget-object v1, Lw;->g:Lw$a;
+    sget-object v0, Lx;->g:Lx$a;
 
-    iget-object v4, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;->$view:Landroid/view/View;
+    iget-object v3, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;->$view:Landroid/view/View;
 
-    invoke-virtual {v4}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v3}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v4
+    move-result-object v3
 
-    const-string v5, "view.context"
+    const-string/jumbo v4, "view.context"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_5
+    const/4 v4, 0x0
 
-    invoke-static {v4}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
+    if-eqz v0, :cond_4
 
-    move-result-object v1
+    const-string v0, "context"
 
-    const-string v4, "CACHE_KEY_VOICE_CHANNEL_ONBOARDED"
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v1, v4, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+    invoke-static {v3}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
-    move-result v1
+    move-result-object v0
+
+    const-string v3, "CACHE_KEY_VOICE_CHANNEL_ONBOARDED"
+
+    invoke-interface {v0, v3, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+
+    move-result v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
     new-instance v0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;
 
@@ -137,7 +143,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
@@ -147,7 +153,7 @@
 
     const-string v4, "childFragmentManager"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, v1, v2, v3}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 
@@ -160,45 +166,47 @@
     goto :goto_1
 
     :cond_1
-    if-nez v1, :cond_4
+    if-nez v0, :cond_3
 
-    if-eqz v3, :cond_4
+    if-eqz v2, :cond_3
 
-    sget-object v1, Lw;->g:Lw$a;
+    sget-object v0, Lx;->g:Lx$a;
 
-    iget-object v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_2
 
-    if-eqz v2, :cond_2
+    const-string p1, "fragment"
 
-    new-instance p1, Lw;
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p1}, Lw;-><init>()V
+    new-instance p1, Lx;
+
+    invoke-direct {p1}, Lx;-><init>()V
 
     new-instance v0, Landroid/os/Bundle;
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v4, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-virtual {v0, v1, v3, v4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v0, v4, v2, v3}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
-    invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object v0
 
     const-string v1, "fragment.parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lw;
+    const-class v1, Lx;
 
     invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
@@ -209,48 +217,34 @@
     goto :goto_1
 
     :cond_2
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v4
 
     :cond_3
-    throw v0
-
-    :cond_4
-    sget-object v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->Companion:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;
+    sget-object v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->Companion:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;
 
     iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v2
+    move-result-object v3
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v3
+    move-result-wide v4
 
-    const/4 v5, 0x1
+    const/4 v6, 0x1
 
-    sget-object v6, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;->HOME:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;
+    sget-object v7, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;->HOME:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;
 
-    invoke-virtual/range {v1 .. v6}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;->show(Landroidx/fragment/app/FragmentManager;JZLcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    invoke-virtual/range {v2 .. v7}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;->show(Landroidx/fragment/app/FragmentManager;JZLcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
     :goto_1
     return-void
 
-    :cond_5
-    throw v0
-
-    :cond_6
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :cond_4
+    throw v4
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
index a4b1db7b56..80a00c494d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;Z)V
     .locals 8
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
@@ -98,7 +100,7 @@
 
     const-string v3, "event"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v3, 0x4000
 
@@ -114,12 +116,12 @@
 
     if-eqz p2, :cond_0
 
-    const v7, 0x7f120683
+    const v7, 0x7f120685
 
     goto :goto_0
 
     :cond_0
-    const v7, 0x7f120450
+    const v7, 0x7f120451
 
     :goto_0
     invoke-virtual {v6, v7}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -169,7 +171,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -184,13 +186,4 @@
     invoke-virtual/range {v1 .. v6}, Lcom/discord/stores/StoreChannelCategories;->setCollapsedCategory(JJZ)V
 
     return-void
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 569e042ec9..2519e06197 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 
     const-string v1, "it.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "inviteLink"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f120d3c
+    const v1, 0x7f120d62
 
-    invoke-static {v0, p1, v1}, Lf/a/b/n;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+    invoke-static {v0, p1, v1}, Lf/a/b/p;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.smali
index 56b1d16a9f..9c21529847 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,29 +61,31 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreInviteSettings;->generateInviteDefaultChannel()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreInviteSettings;->generateInviteDefaultChannel()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-object v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v1, Lf/a/b/s;->a:Lf/a/b/s;
 
     iget-object v3, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
@@ -95,18 +97,11 @@
 
     invoke-direct {v4, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;Landroid/view/View;)V
 
-    invoke-virtual {v2, v3, v4, v0}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v1, v3, v4, v2}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p1
 
-    invoke-virtual {v1, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.smali
index e7053c0ce9..f533bfa828 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lcom/discord/models/domain/ModelChannel;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,11 +64,13 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
@@ -92,7 +94,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -117,18 +119,4 @@
     invoke-static/range {v1 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.smali
index fbad8ad7de..824b5c8618 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.smali
@@ -47,7 +47,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "@"
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.smali
index cd235e6f3f..b552ddddc7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Integer;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.smali
index b96f0869a2..07b561d0f4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.smali
@@ -60,11 +60,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "newData"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
@@ -78,18 +80,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "newData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1.smali
index 7d4d16c6c0..50b35e3416 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/list/WidgetChannelListModel;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureUI(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$2.smali
index 8179531056..26bd9fab6a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
index c6886c47bf..b748066828 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -44,6 +44,8 @@
 
 .field public final channelsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field public final channelsListDirectMessagesTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field public final channelsSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field public final channeslBannerForeground$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -73,290 +75,220 @@
 .method public static constructor <clinit>()V
     .locals 5
 
-    const/16 v0, 0xe
+    const/16 v0, 0xf
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "roundedContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "roundedContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const/4 v2, 0x0
+    const-string v2, "collapsingToolbar"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCollapsingToolbar()Lcom/google/android/material/appbar/CollapsingToolbarLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "collapsingToolbar"
-
-    const-string v4, "getCollapsingToolbar()Lcom/google/android/material/appbar/CollapsingToolbarLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "appBarLayout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "appBarLayout"
-
-    const-string v4, "getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "channelsHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelsHeader"
-
-    const-string v4, "getChannelsHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "channelsList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelsList"
-
-    const-string v4, "getChannelsList()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "channelsBanner"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelsBanner"
-
-    const-string v4, "getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "channeslBannerForeground"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChanneslBannerForeground()Landroid/widget/FrameLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channeslBannerForeground"
-
-    const-string v4, "getChanneslBannerForeground()Landroid/widget/FrameLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "channelsSearch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsSearch()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelsSearch"
-
-    const-string v4, "getChannelsSearch()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "privateChannelsHeaderContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivateChannelsHeaderContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privateChannelsHeaderContainer"
-
-    const-string v4, "getPrivateChannelsHeaderContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "privateChannelsStartGroupButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivateChannelsStartGroupButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privateChannelsStartGroupButton"
-
-    const-string v4, "getPrivateChannelsStartGroupButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "channelListUnreadsStub"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelListUnreadsStub()Landroid/view/ViewStub;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelListUnreadsStub"
-
-    const-string v4, "getChannelListUnreadsStub()Landroid/view/ViewStub;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "channelsListDirectMessagesTitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsListDirectMessagesTitle()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "premiumGuildHint"
-
-    const-string v4, "getPremiumGuildHint()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "premiumGuildHint"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPremiumGuildHint()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "premiumGuildHintButton"
-
-    const-string v4, "getPremiumGuildHintButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+    const-string v2, "premiumGuildHintButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPremiumGuildHintButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptyFriendsStateView"
-
-    const-string v4, "getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+    const-string v2, "emptyFriendsStateView"
+
+    const-string v3, "getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xe
+
+    aput-object v1, v0, v2
+
     sput-object v0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$Companion;
@@ -375,7 +307,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0a8f
+    const v0, 0x7f0a0a94
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -383,7 +315,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->roundedContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0275
+    const v0, 0x7f0a0278
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -399,7 +331,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->appBarLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01d5
+    const v0, 0x7f0a01d8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -407,7 +339,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01cd
+    const v0, 0x7f0a01d0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -415,7 +347,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01d2
+    const v0, 0x7f0a01d5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -423,7 +355,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01d3
+    const v0, 0x7f0a01d6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -431,7 +363,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channeslBannerForeground$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ed
+    const v0, 0x7f0a01f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -439,7 +371,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ec
+    const v0, 0x7f0a01ef
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -447,7 +379,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->privateChannelsHeaderContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ee
+    const v0, 0x7f0a01f1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -455,7 +387,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->privateChannelsStartGroupButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01f3
+    const v0, 0x7f0a01f6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -463,7 +395,15 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelListUnreadsStub$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e8
+    const v0, 0x7f0a01d7
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsListDirectMessagesTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a01eb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -471,7 +411,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->premiumGuildHint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e9
+    const v0, 0x7f0a01ec
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -479,7 +419,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->premiumGuildHintButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a90
+    const v0, 0x7f0a0a95
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -560,7 +500,7 @@
     :cond_0
     const-string p0, "adapter"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -722,7 +662,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->isCollapsed:Z
 
@@ -806,219 +746,214 @@
 
     const/4 v1, 0x0
 
-    const/4 v2, 0x0
-
     if-nez p1, :cond_1
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     goto/16 :goto_0
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->isVerifiedServer()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_3
+    if-eqz v2, :cond_3
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Lcom/discord/views/CustomAppBarLayout;->a()Z
+    invoke-virtual {v2}, Lcom/discord/views/CustomAppBarLayout;->a()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
-    const v3, 0x7f080429
+    const v2, 0x7f08042c
 
     goto/16 :goto_0
 
     :cond_2
-    const v3, 0x7f08042a
+    const v2, 0x7f08042d
 
     goto/16 :goto_0
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->isPartneredServer()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_5
+    if-eqz v2, :cond_5
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Lcom/discord/views/CustomAppBarLayout;->a()Z
+    invoke-virtual {v2}, Lcom/discord/views/CustomAppBarLayout;->a()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_4
+    if-eqz v2, :cond_4
 
-    const v3, 0x7f08037a
+    const v2, 0x7f08037d
 
     goto/16 :goto_0
 
     :cond_4
-    const v3, 0x7f08037b
+    const v2, 0x7f08037e
 
     goto/16 :goto_0
 
     :cond_5
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
 
-    move-result v3
+    move-result v2
 
-    if-nez v3, :cond_8
+    if-nez v2, :cond_7
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_8
+    if-eqz v2, :cond_7
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_7
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->compare(II)I
+    invoke-static {v2, v1}, Lk0/o/c/i;->compare(II)I
 
-    move-result v3
+    move-result v2
 
-    if-lez v3, :cond_8
+    if-lez v2, :cond_7
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Lcom/discord/views/CustomAppBarLayout;->a()Z
+    invoke-virtual {v2}, Lcom/discord/views/CustomAppBarLayout;->a()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_6
+    if-eqz v2, :cond_6
 
-    const v3, 0x7f0802ff
+    const v2, 0x7f080300
 
     goto :goto_0
 
     :cond_6
-    const v3, 0x7f080300
+    const v2, 0x7f080301
 
     goto :goto_0
 
     :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_8
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
 
-    move-result v3
+    move-result v2
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    if-ne v3, v4, :cond_a
+    if-ne v2, v3, :cond_9
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Lcom/discord/views/CustomAppBarLayout;->a()Z
+    invoke-virtual {v2}, Lcom/discord/views/CustomAppBarLayout;->a()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_9
+    if-eqz v2, :cond_8
 
-    const v3, 0x7f0802f5
+    const v2, 0x7f0802f6
+
+    goto :goto_0
+
+    :cond_8
+    const v2, 0x7f0802f7
 
     goto :goto_0
 
     :cond_9
-    const v3, 0x7f0802f6
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
+
+    move-result v2
+
+    if-ne v2, v0, :cond_b
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/views/CustomAppBarLayout;->a()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_a
+
+    const v2, 0x7f0802f8
 
     goto :goto_0
 
     :cond_a
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
-
-    move-result v3
-
-    if-ne v3, v0, :cond_c
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/views/CustomAppBarLayout;->a()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    const v3, 0x7f0802f7
+    const v2, 0x7f0802f9
 
     goto :goto_0
 
     :cond_b
-    const v3, 0x7f0802f8
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
+
+    move-result v2
+
+    const/4 v3, 0x3
+
+    if-ne v2, v3, :cond_0
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/views/CustomAppBarLayout;->a()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_c
+
+    const v2, 0x7f0802fa
 
     goto :goto_0
 
     :cond_c
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
-
-    move-result v3
-
-    const/4 v4, 0x3
-
-    if-ne v3, v4, :cond_0
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/views/CustomAppBarLayout;->a()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_d
-
-    const v3, 0x7f0802f9
-
-    goto :goto_0
-
-    :cond_d
-    const v3, 0x7f0802fa
+    const v2, 0x7f0802fb
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-nez v3, :cond_e
+    const/4 v4, 0x0
 
-    move-object v3, v2
+    if-nez v2, :cond_d
+
+    move-object v2, v4
 
     goto :goto_1
 
-    :cond_e
+    :cond_d
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v5
 
-    invoke-static {v5, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+    invoke-static {v5, v2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
-    move-result-object v3
+    move-result-object v2
 
     :goto_1
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
@@ -1031,11 +966,11 @@
 
     const-string v7, "requireContext()"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v8, 0x7f0402a6
 
-    invoke-static {v6, v8, v1, v0, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v6, v8, v1, v0, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result v0
 
@@ -1043,13 +978,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_f
+    if-eqz v0, :cond_e
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v5
 
-    invoke-static {v5, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v5, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getTintColor(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;Z)I
 
@@ -1059,11 +994,11 @@
 
     goto :goto_2
 
-    :cond_f
-    move-object v0, v2
+    :cond_e
+    move-object v0, v4
 
     :goto_2
-    invoke-virtual {v4, v3, v2, v0, v2}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v3, v2, v4, v0, v4}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
     return-void
 .end method
@@ -1163,7 +1098,7 @@
     move-object v6, v1
 
     :goto_4
-    invoke-static {v5, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -1227,7 +1162,7 @@
     goto :goto_6
 
     :cond_7
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1436,7 +1371,7 @@
     return-void
 
     :cond_12
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1541,6 +1476,26 @@
     return-object v0
 .end method
 
+.method private final getChannelsListDirectMessagesTitle()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsListDirectMessagesTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xb
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
 .method private final getChannelsSearch()Landroid/view/View;
     .locals 3
 
@@ -1608,7 +1563,7 @@
 
     sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xd
+    const/16 v2, 0xe
 
     aget-object v1, v1, v2
 
@@ -1628,7 +1583,7 @@
 
     sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xb
+    const/16 v2, 0xc
 
     aget-object v1, v1, v2
 
@@ -1648,7 +1603,7 @@
 
     sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsList;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xc
+    const/16 v2, 0xd
 
     aget-object v1, v1, v2
 
@@ -1776,37 +1731,27 @@
 .end method
 
 .method private final roundPanelCorners()V
-    .locals 3
+    .locals 2
+
+    const/16 v0, 0x8
+
+    invoke-static {v0}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
+
+    move-result v0
+
+    int-to-float v0, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;
 
-    move-result-object v0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
     move-result-object v1
 
-    const v2, 0x7f0701ed
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->updateTopLeftRadius(F)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->updateTopLeftRadius(F)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;
 
-    move-result-object v0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
     move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->updateTopRightRadius(F)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/view/rounded/RoundedCoordinatorLayout;->updateTopRightRadius(F)V
 
     return-void
 .end method
@@ -1844,121 +1789,123 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "Channels List"
+    const-string v1, "Channels List"
 
-    invoke-virtual {v1, v2}, Lcom/discord/widgets/friends/EmptyFriendsStateView;->updateView(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/friends/EmptyFriendsStateView;->updateView(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v2, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
+    new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsList()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
+    check-cast v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
-    iput-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
+    iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
-    const-string v2, "adapter"
+    const-string v1, "adapter"
 
-    if-eqz v1, :cond_6
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_6
 
     new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1;
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$1;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
 
-    invoke-virtual {v1, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectChannel(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectChannel(Lkotlin/jvm/functions/Function1;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
     new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2;
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
 
-    invoke-virtual {v1, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectChannelOptions(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectChannelOptions(Lkotlin/jvm/functions/Function1;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
     new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;
 
     invoke-direct {v3, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;Landroid/view/View;)V
 
-    invoke-virtual {v1, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnCallChannel(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnCallChannel(Lkotlin/jvm/functions/Function1;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
     if-eqz p1, :cond_3
 
-    new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;
+    new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnCollapseCategory(Lkotlin/jvm/functions/Function2;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnCollapseCategory(Lkotlin/jvm/functions/Function2;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
     if-eqz p1, :cond_2
 
-    new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;
+    new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectInvite(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectInvite(Lkotlin/jvm/functions/Function1;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
     if-eqz p1, :cond_1
 
-    new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;
+    new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectUserOptions(Lkotlin/jvm/functions/Function2;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setOnSelectUserOptions(Lkotlin/jvm/functions/Function2;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsSearch()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7;
+    new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsList()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsList()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setItemAnimator(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;)V
+    invoke-virtual {p1, v2}, Landroidx/recyclerview/widget/RecyclerView;->setItemAnimator(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;)V
 
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;
 
@@ -2032,49 +1979,48 @@
 
     invoke-static {p1, v0}, Landroidx/core/view/ViewCompat;->setAccessibilityHeading(Landroid/view/View;Z)V
 
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsListDirectMessagesTitle()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-static {p1, v0}, Landroidx/core/view/ViewCompat;->setAccessibilityHeading(Landroid/view/View;Z)V
+
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_5
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v2
 
     :cond_6
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_7
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v2
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2184,7 +2130,7 @@
     :cond_1
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item.smali
index 5332984170..e90a47f200 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item.smali
@@ -31,7 +31,9 @@
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -54,15 +56,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic setBackground$default(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;Landroid/view/View;ZLjava/lang/Integer;ILjava/lang/Object;)V
@@ -96,9 +89,11 @@
 .method public final setBackground(Landroid/view/View;ZLjava/lang/Integer;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$setBackground"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x0
 
@@ -124,7 +119,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p3, 0x7f0401f3
 
@@ -139,7 +134,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p3, 0x7f0401f2
 
@@ -159,11 +154,4 @@
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setBackgroundAndKeepPadding(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "$this$setBackground"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali
index a828a0817a..67fcf31fe8 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali
@@ -118,7 +118,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f08027d
+    const p1, 0x7f08027e
 
     goto :goto_0
 
@@ -129,7 +129,7 @@
 
     if-nez p1, :cond_1
 
-    const p1, 0x7f080279
+    const p1, 0x7f08027a
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali
index 3eb837f5a2..9b7fd46fa2 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$1.smali
@@ -28,11 +28,13 @@
 .method public onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "host"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "info"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 
@@ -41,18 +43,4 @@
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setHeading(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$2.smali
index 3578b32b31..4268a3a3de 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$2.smali
@@ -47,7 +47,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -65,7 +65,7 @@
 
     const-string v1, "item.channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali
index 08b829485f..6342d40dd8 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali
@@ -44,7 +44,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 7
+    .locals 6
 
     const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;
 
@@ -52,59 +52,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "nameTextView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNameTextView()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "nameTextView"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getNameTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v4
-
-    const-string v5, "arrow"
-
-    const-string v6, "getArrow()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v4, 0x1
+    move-result-object v2
 
     aput-object v2, v1, v4
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "arrow"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getArrow()Landroid/widget/ImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v2
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    const-string v2, "addChannel"
+
+    const-string v5, "getAddChannel()Landroid/widget/ImageView;"
+
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v5, "addChannel"
+    const/4 v2, 0x2
 
-    const-string v6, "getAddChannel()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v0, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -116,7 +98,7 @@
 
     sput-object v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;
 
-    invoke-static {v0, v4}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;->access$getAnimation(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;Z)Landroid/view/animation/RotateAnimation;
+    invoke-static {v0, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;->access$getAnimation(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;Z)Landroid/view/animation/RotateAnimation;
 
     move-result-object v0
 
@@ -124,7 +106,7 @@
 
     sget-object v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;
 
-    invoke-static {v0, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;->access$getAnimation(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;Z)Landroid/view/animation/RotateAnimation;
+    invoke-static {v0, v4}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;->access$getAnimation(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;Z)Landroid/view/animation/RotateAnimation;
 
     move-result-object v0
 
@@ -134,13 +116,15 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01bf
+    const p1, 0x7f0a01c2
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -148,7 +132,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->nameTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01be
+    const p1, 0x7f0a01c1
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -156,7 +140,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01bd
+    const p1, 0x7f0a01c0
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,15 +149,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->addChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getAddChannel()Landroid/widget/ImageView;
@@ -239,9 +214,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-    .locals 8
+    .locals 6
 
-    if-eqz p2, :cond_4
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -275,61 +252,61 @@
 
     const-string v1, "nameTextView.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    const v2, 0x7f1203cb
+    const/4 v2, 0x2
 
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    aput-object v4, v3, v5
-
-    const/4 v4, 0x1
+    aput-object v3, v2, v4
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->getNameTextView()Landroid/widget/TextView;
 
-    move-result-object v6
+    move-result-object v3
 
-    invoke-virtual {v6}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v6
+    move-result-object v3
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;->isCollapsed()Z
 
-    move-result v7
+    move-result v5
 
-    if-eqz v7, :cond_0
+    if-eqz v5, :cond_0
 
-    const v7, 0x7f120450
+    const v5, 0x7f120451
 
     goto :goto_0
 
     :cond_0
-    const v7, 0x7f120683
+    const v5, 0x7f120685
 
     :goto_0
-    invoke-virtual {v6, v7}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v3, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v3
 
-    aput-object v6, v3, v4
+    const/4 v5, 0x1
 
-    invoke-virtual {v0, v2, v3}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v3, v2, v5
+
+    const v3, 0x7f1203cc
+
+    invoke-virtual {v0, v3, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -345,7 +322,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;->access$getChannelColor(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion;Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;Landroid/content/Context;)I
 
@@ -437,10 +414,10 @@
     goto :goto_2
 
     :cond_3
-    const/16 v5, 0x8
+    const/16 v4, 0x8
 
     :goto_2
-    invoke-virtual {v0, v5}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->getAddChannel()Landroid/widget/ImageView;
 
@@ -463,15 +440,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)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 d52eaad42b..d90cde26a6 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
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;
 
@@ -42,113 +42,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemAvatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemAvatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemAvatar()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemStatus"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemStatus()Lcom/discord/views/StatusView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "itemStatus"
-
-    const-string v5, "getItemStatus()Lcom/discord/views/StatusView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemName"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemName"
-
-    const-string v5, "getItemName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemTag"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemTag()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemTag"
-
-    const-string v5, "getItemTag()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemDesc"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemDesc()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemDesc"
-
-    const-string v5, "getItemDesc()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemMentions"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemMentions()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemMentions"
+    const/4 v2, 0x5
 
-    const-string v4, "getItemMentions()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -156,37 +120,39 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01d8
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0161
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a01db
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0164
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a01de
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01dc
+    const p1, 0x7f0a01df
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -194,7 +160,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemTag$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01d9
+    const p1, 0x7f0a01dc
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -202,7 +168,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemDesc$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01da
+    const p1, 0x7f0a01dd
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,15 +177,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getContentDescription(Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;Ljava/lang/String;)Ljava/lang/String;
@@ -253,19 +210,19 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p1
 
-    const v0, 0x7f120908
+    const v0, 0x7f12090a
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -290,13 +247,13 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p1
 
-    const v0, 0x7f120907
+    const v0, 0x7f120909
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -304,7 +261,7 @@
 
     const-string v0, "itemView.resources.getSt\u2026group_message_a11y_label)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -325,19 +282,19 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p1
 
-    const v0, 0x7f120594
+    const v0, 0x7f120596
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -352,13 +309,13 @@
     :cond_2
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p1
 
-    const v0, 0x7f120593
+    const v0, 0x7f120595
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -366,7 +323,7 @@
 
     const-string v0, "itemView.resources.getSt\u2026irect_message_a11y_label)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -518,7 +475,7 @@
 
     add-int/lit8 p1, p1, 0x1
 
-    const v0, 0x7f120ebc
+    const v0, 0x7f120ee2
 
     invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -526,7 +483,7 @@
 
     const-string v0, "context.getString(R.string.members)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -556,7 +513,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f040169
 
@@ -569,7 +526,7 @@
     :cond_0
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f04012a
 
@@ -596,7 +553,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f040144
 
@@ -615,7 +572,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f040146
 
@@ -628,7 +585,7 @@
     :cond_1
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f04012f
 
@@ -647,12 +604,14 @@
 
     move-object/from16 v0, p0
 
-    if-eqz p2, :cond_9
+    move-object/from16 v1, p2
+
+    const-string v2, "data"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    move-object/from16 v1, p2
-
     check-cast v1, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
 
     invoke-virtual {v1}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->component1()Lcom/discord/models/domain/ModelChannel;
@@ -700,7 +659,7 @@
 
     const-string v2, "itemName.context"
 
-    invoke-static {v14, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -725,7 +684,7 @@
 
     const-string v13, "itemView"
 
-    invoke-static {v3, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getContentDescription(Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;Ljava/lang/String;)Ljava/lang/String;
 
@@ -856,7 +815,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12155b
+    const v3, 0x7f121585
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -887,7 +846,7 @@
 
     const-string v3, "itemDesc.context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v8, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getMemberCount(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;)Ljava/lang/String;
 
@@ -950,13 +909,13 @@
     :cond_8
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v10}, Landroid/view/View;->setSelected(Z)V
 
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
@@ -969,15 +928,6 @@
     invoke-virtual {v0, v1, v10, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->setBackground(Landroid/view/View;ZLjava/lang/Integer;)V
 
     return-void
-
-    :cond_9
-    const-string v1, "data"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
index f04dd7237b..74f1e4953d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;
 
@@ -38,77 +38,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemHash"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemHash()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemHash"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemHash()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemName"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "itemName"
-
-    const-string v5, "getItemName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemMentions"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemMentions()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemMentions"
-
-    const-string v5, "getItemMentions()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemUnread"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemUnread()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemUnread"
+    const/4 v2, 0x3
 
-    const-string v4, "getItemUnread()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -116,13 +92,15 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01c0
+    const p1, 0x7f0a01c3
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -130,7 +108,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemHash$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01c2
+    const p1, 0x7f0a01c5
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -138,7 +116,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01c1
+    const p1, 0x7f0a01c4
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -146,7 +124,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01c3
+    const p1, 0x7f0a01c6
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,15 +133,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemUnread$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getAnnouncementsIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
@@ -181,7 +150,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f08025d
+    const p1, 0x7f08025e
 
     goto :goto_0
 
@@ -192,12 +161,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08025c
+    const p1, 0x7f08025d
 
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f08025b
+    const p1, 0x7f08025c
 
     :goto_0
     return p1
@@ -228,31 +197,31 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v6, 0x7f120b1f
+    const v6, 0x7f120b45
 
     invoke-virtual {p2, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v1, v0, [Ljava/lang/Object;
 
     iget-object v6, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object v5
 
-    const v6, 0x7f10008c
+    const v6, 0x7f10008e
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMentionCount()I
 
@@ -305,19 +274,19 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v0, 0x7f120b20
+    const v0, 0x7f120b46
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-static {p2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -342,13 +311,13 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v0, 0x7f120b1e
+    const v0, 0x7f120b44
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -356,7 +325,7 @@
 
     const-string v0, "itemView.resources.getSt\u2026ement_channel_a11y_label)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -385,31 +354,31 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v6, 0x7f120b22
+    const v6, 0x7f120b48
 
     invoke-virtual {p2, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v1, v0, [Ljava/lang/Object;
 
     iget-object v6, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object v5
 
-    const v6, 0x7f10008d
+    const v6, 0x7f10008f
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMentionCount()I
 
@@ -458,19 +427,19 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v0, 0x7f120b23
+    const v0, 0x7f120b49
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-static {p2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -493,13 +462,13 @@
     :cond_4
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v0, 0x7f120b21
+    const v0, 0x7f120b47
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -507,7 +476,7 @@
 
     const-string v0, "itemView.resources.getSt\u2026fault_channel_a11y_label)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -544,7 +513,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f040146
 
@@ -563,7 +532,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f040144
 
@@ -576,7 +545,7 @@
     :cond_1
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f04012f
 
@@ -603,7 +572,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f080265
+    const p1, 0x7f080266
 
     goto :goto_0
 
@@ -614,12 +583,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080264
+    const p1, 0x7f080265
 
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f080260
+    const p1, 0x7f080261
 
     :goto_0
     return p1
@@ -718,7 +687,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -735,7 +704,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p2, 0x7f040146
 
@@ -754,7 +723,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -765,7 +734,7 @@
     :cond_2
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p2, 0x7f04012f
 
@@ -782,7 +751,9 @@
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
     .locals 6
 
-    if-eqz p2, :cond_8
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -796,13 +767,13 @@
 
     move-result p1
 
-    const/4 v0, 0x5
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, 0x5
 
-    if-ne p1, v0, :cond_0
+    if-ne p1, v2, :cond_0
 
     const/4 p1, 0x1
 
@@ -812,11 +783,11 @@
     const/4 p1, 0x0
 
     :goto_0
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     const-string v3, "itemView"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
 
@@ -834,21 +805,21 @@
 
     move-result-object v5
 
-    invoke-virtual {p0, v0, v4, v5}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->setBackground(Landroid/view/View;ZLjava/lang/Integer;)V
+    invoke-virtual {p0, v2, v4, v5}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->setBackground(Landroid/view/View;ZLjava/lang/Integer;)V
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getContentDescription(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;Z)Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v0, v4}, Landroid/view/View;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/view/View;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v2
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -858,11 +829,11 @@
 
     move-result-object v4
 
-    invoke-virtual {v0, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v2
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
 
@@ -872,11 +843,11 @@
 
     move-result v4
 
-    invoke-virtual {v0, v4}, Landroid/widget/TextView;->setTextColor(I)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setTextColor(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemHash()Landroid/widget/ImageView;
 
-    move-result-object v0
+    move-result-object v2
 
     if-eqz p1, :cond_1
 
@@ -892,7 +863,7 @@
     move-result p1
 
     :goto_1
-    invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v2, p1}, Landroid/widget/ImageView;->setImageResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemHash()Landroid/widget/ImageView;
 
@@ -900,13 +871,13 @@
 
     invoke-direct {p0, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getHashColor(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
 
-    move-result v0
+    move-result v2
 
-    invoke-static {v0}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+    invoke-static {v2}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -922,9 +893,9 @@
 
     move-result-object p1
 
-    const v0, 0x7f080267
+    const v2, 0x7f080268
 
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
     :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemMentions()Landroid/widget/TextView;
@@ -933,41 +904,41 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMentionCount()I
 
-    move-result v0
+    move-result v2
 
     const/16 v4, 0x8
 
-    if-lez v0, :cond_3
+    if-lez v2, :cond_3
 
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
     goto :goto_2
 
     :cond_3
-    const/16 v0, 0x8
+    const/16 v2, 0x8
 
     :goto_2
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemMentions()Landroid/widget/TextView;
 
     move-result-object p1
 
-    const/16 v0, 0x63
+    const/16 v2, 0x63
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMentionCount()I
 
     move-result v5
 
-    invoke-static {v0, v5}, Ljava/lang/Math;->min(II)I
+    invoke-static {v2, v5}, Ljava/lang/Math;->min(II)I
 
-    move-result v0
+    move-result v2
 
-    invoke-static {v0}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemUnread()Landroid/view/View;
 
@@ -975,37 +946,37 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->isUnread()Z
 
-    move-result v0
+    move-result v2
 
-    if-eqz v0, :cond_4
+    if-eqz v2, :cond_4
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
 
-    move-result v0
+    move-result v2
 
-    if-nez v0, :cond_4
+    if-nez v2, :cond_4
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMuted()Z
 
-    move-result v0
+    move-result v2
 
-    if-nez v0, :cond_4
+    if-nez v2, :cond_4
 
     goto :goto_3
 
     :cond_4
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_3
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
     goto :goto_4
 
     :cond_5
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_4
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
 
@@ -1013,7 +984,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -1050,15 +1021,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;)V
 
     return-void
-
-    :cond_8
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
index 7dac6a28f7..e83cc45907 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
@@ -36,7 +36,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;
 
@@ -44,59 +44,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemName"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemName"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemName()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string/jumbo v2, "userCount"
 
-    const/4 v3, 0x0
+    const-string v3, "getUserCount()Lcom/discord/views/VoiceUserLimitView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "userCount"
-
-    const-string v5, "getUserCount()Lcom/discord/views/VoiceUserLimitView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "speakerIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSpeakerIcon()Landroid/widget/ImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "speakerIcon"
+    const/4 v2, 0x2
 
-    const-string v4, "getSpeakerIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -112,13 +94,15 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01c4
+    const p1, 0x7f0a01c7
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -126,7 +110,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01c6
+    const p1, 0x7f0a01c9
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -134,7 +118,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->userCount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01c5
+    const p1, 0x7f0a01c8
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -143,15 +127,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->speakerIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;)Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
@@ -181,13 +156,13 @@
 
     iget-object v5, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v5, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object v4
 
-    const v5, 0x7f120b26
+    const v5, 0x7f120b4c
 
     invoke-virtual {v4, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -195,7 +170,7 @@
 
     const-string v5, "itemView.resources.getSt\u2026el_a11y_label_with_limit)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x3
 
@@ -242,13 +217,13 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v5, 0x7f120b27
+    const v5, 0x7f120b4d
 
     invoke-virtual {p2, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -256,7 +231,7 @@
 
     const-string v5, "itemView.resources.getSt\u2026el_a11y_label_with_users)"
 
-    invoke-static {p2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v5, v0, [Ljava/lang/Object;
 
@@ -272,13 +247,13 @@
 
     iget-object v6, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v6, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object v4
 
-    const v6, 0x7f10008e
+    const v6, 0x7f100090
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->getNumUsersConnected()I
 
@@ -311,13 +286,13 @@
     :cond_1
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object p2
 
-    const v0, 0x7f120b25
+    const v0, 0x7f120b4b
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -325,7 +300,7 @@
 
     const-string v0, "itemView.resources.getSt\u2026voice_channel_a11y_label)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v2, [Ljava/lang/Object;
 
@@ -410,16 +385,16 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-    .locals 12
+    .locals 11
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "SetTextI18n"
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_b
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -431,271 +406,259 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->component2()Z
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->component3()Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->component4()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->component5()Z
 
-    move-result v4
+    move-result v3
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->component6()Z
 
-    move-result v5
+    move-result v4
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->component7()Ljava/lang/Integer;
 
-    move-result-object v6
+    move-result-object v5
 
-    const-wide/32 v7, 0x100000
+    const-wide/32 v6, 0x100000
 
-    invoke-static {v7, v8, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {v6, v7, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+
+    move-result v6
+
+    sget-object v7, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$Companion;
+
+    iget-object v8, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const-string v9, "itemView"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v8
+
+    const-string v10, "itemView.context"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v7, v0, v8}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$Companion;->access$getVoiceChannelColor(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$Companion;ZLandroid/content/Context;)I
 
     move-result v7
 
-    sget-object v8, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$Companion;
+    iget-object v8, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    iget-object v9, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v10, "itemView"
-
-    invoke-static {v9, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v9}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v9
-
-    const-string v11, "itemView.context"
-
-    invoke-static {v9, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v8, v1, v9}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$Companion;->access$getVoiceChannelColor(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$Companion;ZLandroid/content/Context;)I
-
-    move-result v8
-
-    iget-object v9, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {v9, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v9, v1}, Landroid/view/View;->setSelected(Z)V
+    invoke-virtual {v8, v0}, Landroid/view/View;->setSelected(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getItemName()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v8
 
-    invoke-virtual {v1, v9}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v8}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getItemName()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v8}, Landroid/widget/TextView;->setTextColor(I)V
+    invoke-virtual {v0, v7}, Landroid/widget/TextView;->setTextColor(I)V
 
-    if-nez v7, :cond_0
+    if-nez v6, :cond_0
 
-    const v1, 0x7f08025e
+    const v0, 0x7f08025f
 
     goto :goto_0
 
     :cond_0
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
-    const v1, 0x7f08026d
+    const v0, 0x7f08026e
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f08026a
+    const v0, 0x7f08026b
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getSpeakerIcon()Landroid/widget/ImageView;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v3, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getSpeakerIcon()Landroid/widget/ImageView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v8}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+    invoke-static {v7}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v1, v4}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I
 
-    move-result v1
+    move-result v0
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-eqz v6, :cond_2
+    if-eqz v5, :cond_2
 
-    invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
 
-    move-result v8
+    move-result v7
 
     goto :goto_1
 
     :cond_2
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
     :goto_1
-    invoke-static {v1, v8}, Ljava/lang/Math;->min(II)I
+    invoke-static {v0, v7}, Ljava/lang/Math;->min(II)I
 
-    move-result v1
+    move-result v0
 
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
-    if-lez v1, :cond_9
+    if-lez v0, :cond_8
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
-    if-eqz v5, :cond_4
+    if-eqz v4, :cond_4
 
-    if-nez v6, :cond_3
+    if-nez v5, :cond_3
 
     goto :goto_2
 
     :cond_3
-    invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
 
-    move-result v5
+    move-result v4
 
-    if-ne v1, v5, :cond_4
+    if-ne v0, v4, :cond_4
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_3
 
     :cond_4
     :goto_2
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_3
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_5
 
-    if-eqz v6, :cond_5
+    invoke-static {v5}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
 
-    move-result v0
+    move-result v4
 
     goto :goto_4
 
     :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_6
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I
 
-    move-result v0
+    move-result v4
 
     :goto_4
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getUserCount()Lcom/discord/views/VoiceUserLimitView;
 
     move-result-object v5
 
-    if-lez v0, :cond_7
+    if-lez v4, :cond_6
 
-    if-eqz v7, :cond_7
+    if-eqz v6, :cond_6
 
     goto :goto_5
 
-    :cond_7
-    const/4 v9, 0x0
-
-    :goto_5
-    if-eqz v9, :cond_8
-
+    :cond_6
     const/4 v8, 0x0
 
-    :cond_8
-    invoke-virtual {v5, v8}, Landroid/view/View;->setVisibility(I)V
+    :goto_5
+    if-eqz v8, :cond_7
+
+    const/4 v7, 0x0
+
+    :cond_7
+    invoke-virtual {v5, v7}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getUserCount()Lcom/discord/views/VoiceUserLimitView;
 
     move-result-object v5
 
-    invoke-virtual {v5, v3, v0, v1}, Lcom/discord/views/VoiceUserLimitView;->a(IIZ)V
-
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {v1, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p2, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getContentDescription(Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {v1, p2}, Landroid/view/View;->setContentDescription(Ljava/lang/CharSequence;)V
-
-    goto :goto_6
-
-    :cond_9
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getUserCount()Lcom/discord/views/VoiceUserLimitView;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v8}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v5, v2, v4, v0}, Lcom/discord/views/VoiceUserLimitView;->a(IIZ)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p2, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getContentDescription(Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;I)Ljava/lang/String;
+    invoke-direct {p0, p2, v4}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getContentDescription(Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;I)Ljava/lang/String;
 
     move-result-object p2
 
     invoke-virtual {v0, p2}, Landroid/view/View;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    :goto_6
-    const-wide/16 v0, 0x10
+    goto :goto_6
 
-    invoke-static {v0, v1, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    :cond_8
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getUserCount()Lcom/discord/views/VoiceUserLimitView;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v7}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p2, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getContentDescription(Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {v2, p2}, Landroid/view/View;->setContentDescription(Ljava/lang/CharSequence;)V
+
+    :goto_6
+    const-wide/16 v4, 0x10
+
+    invoke-static {v4, v5, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result p2
 
-    if-eqz p2, :cond_a
+    if-eqz p2, :cond_9
 
     new-instance p2, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$onConfigure$1;
 
     invoke-direct {p2, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$onConfigure$1;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;Lcom/discord/models/domain/ModelChannel;)V
 
-    new-array p1, v4, [Landroid/view/View;
+    new-array p1, v3, [Landroid/view/View;
 
     invoke-virtual {p0, p2, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     goto :goto_7
 
-    :cond_a
+    :cond_9
     sget-object p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$onConfigure$2;->INSTANCE:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice$onConfigure$2;
 
-    new-array p2, v4, [Landroid/view/View;
+    new-array p2, v3, [Landroid/view/View;
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     :goto_7
     return-void
-
-    :cond_b
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali
index f0af3a41ce..8ce934d408 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali
index e678bca5da..ec2d111950 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
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 c1bdad07b5..9debd04f94 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
@@ -26,7 +26,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;
 
@@ -34,41 +34,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemHeader"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemHeader()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemHeader"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemHeader()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemNewChannel"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemNewChannel()Landroid/view/View;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemNewChannel"
+    const/4 v2, 0x1
 
-    const-string v4, "getItemNewChannel()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -76,13 +64,15 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01d6
+    const p1, 0x7f0a01d9
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -90,7 +80,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->itemHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01e7
+    const p1, 0x7f0a01ea
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -99,15 +89,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->itemNewChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getItemHeader()Landroid/widget/TextView;
@@ -155,9 +136,9 @@
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -169,27 +150,29 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->component3()Z
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->component4()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    const/4 p2, 0x4
+    const/4 p2, 0x0
 
-    if-eqz v1, :cond_3
+    const/4 v3, 0x4
 
-    const v1, 0x7f121092
+    if-eqz v0, :cond_3
 
-    if-eq p1, v1, :cond_2
+    const v0, 0x7f1210bc
 
-    const p2, 0x7f1215af
+    if-eq p1, v0, :cond_2
+
+    const p2, 0x7f1215d9
 
     const/4 v0, 0x0
 
     if-eq p1, p2, :cond_1
 
-    const p2, 0x7f1217c4
+    const p2, 0x7f1217f0
 
     if-eq p1, p2, :cond_0
 
@@ -208,7 +191,7 @@
 
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2;
 
-    invoke-direct {v0, v2, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2;-><init>(J)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$2;-><init>(J)V
 
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -227,7 +210,7 @@
 
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1;
 
-    invoke-direct {v0, v2, v3}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1;-><init>(J)V
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader$onConfigure$1;-><init>(J)V
 
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -236,30 +219,30 @@
     :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
 
-    move-result-object p2
+    move-result-object v0
 
-    invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     goto :goto_0
 
     :cond_3
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemNewChannel()Landroid/view/View;
 
-    move-result-object p2
+    move-result-object v0
 
-    invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->getItemHeader()Landroid/widget/TextView;
@@ -269,13 +252,6 @@
     invoke-virtual {p2, p1}, Landroid/widget/TextView;->setText(I)V
 
     return-void
-
-    :cond_4
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali
index b948bc8932..02e40b8513 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$1.smali
@@ -53,7 +53,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali
index 0bb80ebfb7..c640aafd9c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite$onConfigure$2.smali
@@ -49,7 +49,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali
index a9a7fbd733..8454c9984c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite.smali
@@ -16,22 +16,15 @@
 
 # direct methods
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;)Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
@@ -47,9 +40,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -68,15 +63,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali
index b0521ff179..43cd3d42a2 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA$onConfigure$1.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
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 0b7c81bb83..7d124a5ac0 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
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;
+    const-string v2, "itemMfaText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemMfaText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "itemMfaText"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getItemMfaText()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -65,17 +59,19 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a01d7
+    const p1, 0x7f0a01da
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -84,15 +80,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;->itemMfaText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getItemMfaText()Landroid/widget/TextView;
@@ -118,7 +105,7 @@
 .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence;
     .locals 11
 
-    const v0, 0x7f121630
+    const v0, 0x7f12165a
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -126,7 +113,7 @@
 
     const-string v1, "getString(R.string.two_fa_guild_mfa_warning)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "onClick"
 
@@ -134,7 +121,7 @@
 
     const/4 v3, 0x4
 
-    invoke-static {v0, v1, p2, v2, v3}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v0, v1, p2, v2, v3}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v5
 
@@ -160,19 +147,21 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
     sget-object p1, Lf/a/b/g;->a:Lf/a/b/g;
 
-    const-wide/32 v1, 0xd1679fc
+    const/4 p2, 0x0
 
-    invoke-virtual {p1, v1, v2, v0}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+    const-wide/32 v0, 0xd1679fc
+
+    invoke-virtual {p1, v0, v1, p2}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -190,7 +179,7 @@
 
     const-string v1, "itemMfaText.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;->getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence;
 
@@ -209,13 +198,6 @@
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemSpace.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemSpace.smali
index 70dce828a3..1bd1b56736 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemSpace.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemSpace.smali
@@ -25,26 +25,19 @@
 
 # direct methods
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -52,7 +45,9 @@
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -60,7 +55,7 @@
 
     const-string p2, "itemView"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -78,20 +73,11 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
index a63ee2b783..c8127b66d7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;
 
@@ -42,113 +42,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "voiceUserAvatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceUserAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "voiceUserAvatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getVoiceUserAvatar()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string/jumbo v2, "voiceUserName"
 
-    const/4 v3, 0x0
+    const-string v3, "getVoiceUserName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceUserName"
-
-    const-string v5, "getVoiceUserName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "voiceCamera"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceCamera()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "voiceCamera"
-
-    const-string v5, "getVoiceCamera()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "deafenIndicator"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeafenIndicator()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "deafenIndicator"
-
-    const-string v5, "getDeafenIndicator()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "muteIndicator"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteIndicator()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "muteIndicator"
-
-    const-string v5, "getMuteIndicator()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "voiceLive"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceLive()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "voiceLive"
+    const/4 v2, 0x5
 
-    const-string v4, "getVoiceLive()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -156,13 +120,15 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    const p1, 0x7f0a01c7
+    const p1, 0x7f0a01ca
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -170,7 +136,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceUserAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01cc
+    const p1, 0x7f0a01cf
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -178,7 +144,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceUserName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01c8
+    const p1, 0x7f0a01cb
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -186,7 +152,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceCamera$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01c9
+    const p1, 0x7f0a01cc
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -194,7 +160,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->deafenIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01cb
+    const p1, 0x7f0a01ce
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -202,7 +168,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->muteIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a01ca
+    const p1, 0x7f0a01cd
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,15 +177,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceLive$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getDeafenIndicator()Landroid/view/View;
@@ -347,7 +304,9 @@
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
     .locals 11
 
-    if-eqz p2, :cond_7
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -513,15 +472,6 @@
     invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_7
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1.smali
index 5ab693ad2e..44fe8c1210 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onCallChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1.smali
index d2784c9751..f8fcd17056 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onCollapseCategory$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,16 +78,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;Z)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1.smali
index b5d0235238..c2e3615616 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1.smali
index 81bd347906..bb7eee5954 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectChannelOptions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1.smali
index d7c9dc3f1f..e896cc052a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectInvite$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1.smali
index a7196fc135..fa6da4475d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$onSelectUserOptions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lcom/discord/models/domain/ModelChannel;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,25 +74,13 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
index 539408d689..0624efd085 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
@@ -112,9 +112,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -143,15 +145,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->onCollapseCategory:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getBottomNavHeight$p(Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)I
@@ -319,7 +312,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -332,7 +325,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     packed-switch p2, :pswitch_data_0
 
@@ -425,15 +420,6 @@
     :goto_0
     return-object p1
 
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_9
@@ -452,7 +438,7 @@
 .end method
 
 .method public final setOnCallChannel(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -464,24 +450,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->onCallChannel:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnCollapseCategory(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -495,24 +474,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->onCollapseCategory:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnSelectChannel(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -524,24 +496,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->onSelectChannel:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnSelectChannelOptions(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -553,24 +518,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->onSelectChannelOptions:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnSelectInvite(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -582,24 +540,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->onSelectInvite:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnSelectUserOptions(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -613,20 +564,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->onSelectUserOptions:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setSelectedGuildId(J)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali
index a4e4fb7320..9a61a0e495 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;J)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
@@ -61,13 +63,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali
index 641dffc613..fec40b5e6b 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali
@@ -31,7 +31,16 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;",
+        "Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion.smali
index 6a22db18e5..77c9d45ae5 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion.smali
@@ -92,7 +92,7 @@
 
     const-string p2, "Observable\n          .co\u2026            }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -104,7 +104,7 @@
 
     const-string p2, "Observable\n          .co\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
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 d7553741ba..86fe81896b 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
@@ -56,9 +56,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -82,11 +84,11 @@
 
     iput-boolean p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->isDeveloper:Z
 
-    const-wide/16 p1, 0x10
+    iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->permissions:Ljava/lang/Long;
 
-    iget-object p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->permissions:Ljava/lang/Long;
+    const-wide/16 p2, 0x10
 
-    invoke-static {p1, p2, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
+    invoke-static {p2, p3, p1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
 
     move-result p1
 
@@ -125,15 +127,6 @@
     iput-boolean p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->canCreateInstantInvite:Z
 
     return-void
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;ZILjava/lang/Object;)Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
@@ -211,22 +204,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Z)Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -244,7 +230,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -254,7 +240,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -264,7 +250,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->permissions:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -325,13 +311,15 @@
 .method public final getMuteChannelText(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->isMuted:Z
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f12165f
+    const v0, 0x7f121689
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -340,7 +328,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120f37
+    const v0, 0x7f120f61
 
     const/4 v1, 0x1
 
@@ -362,60 +350,46 @@
 
     const-string v0, "context.getString(\n     \u2026 channel.name\n          )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getMuteIconResId(Landroid/content/Context;)I
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->isMuted:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->isMuted:Z
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const v1, 0x7f040286
+    const v0, 0x7f040286
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f040285
+    const v0, 0x7f040285
 
     :goto_0
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {p1, v1, v2, v3, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    const/4 v3, 0x0
+
+    invoke-static {p1, v0, v1, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result p1
 
     return p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getPermissions()Ljava/lang/Long;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1.smali
index 41f3ec772c..0f9812b373 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.smali
index 34e5f63e4c..b9a5d8985c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,11 +63,13 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 11
+    .locals 12
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
@@ -79,27 +81,25 @@
 
     move-result-object p1
 
-    const-string v1, "channel.dmRecipient"
+    const-string v0, "channel.dmRecipient"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v1
-
-    const/4 v3, 0x0
+    move-result-wide v2
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v4
+    move-result-object v5
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     const/4 v6, 0x0
 
@@ -107,20 +107,13 @@
 
     const/4 v8, 0x0
 
-    const/16 v9, 0x7a
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    const/16 v10, 0x7a
 
-    invoke-static/range {v0 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
+    const/4 v11, 0x0
+
+    invoke-static/range {v1 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali
index cf6f5c24d6..0fe1891c38 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,23 +67,23 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->Companion:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->Companion:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2;->$this_apply:Landroid/view/View;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v2
 
     const-string p1, "context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
@@ -97,24 +97,17 @@
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v3
+    move-result-object v4
 
-    const/4 v5, 0x2
+    const/4 v3, 0x0
 
-    const/4 v6, 0x0
+    const-string v5, "Context Menu"
 
-    const-string v4, "Context Menu"
+    const/4 v6, 0x2
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->launch$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)V
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->launch$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali
index acd9b4264a..6ed1f28af2 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 8
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
@@ -93,7 +95,7 @@
 
     const-string p1, "context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
@@ -138,19 +140,10 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$Companion;->showForChannel(JLandroidx/fragment/app/FragmentManager;)V
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.smali
index 5b80b95b9f..b08efc6b51 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
@@ -124,19 +126,10 @@
 
     const-string v3, "context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;->launch(JLandroid/content/Context;)V
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali
index 27c203d8ac..4f8c545da4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$5.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.smali
index 6e7f3c803d..748a5b5856 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/stores/StoreMessageAck;->ack(JZZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.smali
index a181eea0ae..fab8613b5e 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelsListItemChannelActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -69,7 +71,7 @@
 
     const-string v0, "it.context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7;->$this_configureUI:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
@@ -89,16 +91,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 243452eb95..cf30011025 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -50,201 +50,141 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "icon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "icon"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getIcon()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const/4 v2, 0x0
+    const-string v2, "title"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "title"
-
-    const-string v4, "getTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "profile"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getProfile()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "profile"
-
-    const-string v4, "getProfile()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "muteChannel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteChannel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "muteChannel"
-
-    const-string v4, "getMuteChannel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "channelSettings"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelSettings()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelSettings"
-
-    const-string v4, "getChannelSettings()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "channelNotifSettings"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelNotifSettings()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelNotifSettings"
-
-    const-string v4, "getChannelNotifSettings()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "instantInvite"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInstantInvite()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "instantInvite"
-
-    const-string v4, "getInstantInvite()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "markAsRead"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMarkAsRead()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "markAsRead"
-
-    const-string v4, "getMarkAsRead()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "developerDivider"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeveloperDivider()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "developerDivider"
-
-    const-string v4, "getDeveloperDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    const-class v2, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
+    const-string v2, "copyId"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCopyId()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "copyId"
-
-    const-string v4, "getCopyId()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
@@ -268,7 +208,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a01e1
+    const v0, 0x7f0a01e4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -276,7 +216,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e6
+    const v0, 0x7f0a01e9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -284,7 +224,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e5
+    const v0, 0x7f0a01e8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -292,7 +232,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->profile$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e4
+    const v0, 0x7f0a01e7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -300,7 +240,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->muteChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01de
+    const v0, 0x7f0a01e1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -308,7 +248,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->channelSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01dd
+    const v0, 0x7f0a01e0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -316,7 +256,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->channelNotifSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e2
+    const v0, 0x7f0a01e5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -324,7 +264,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->instantInvite$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e3
+    const v0, 0x7f0a01e6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -332,7 +272,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->markAsRead$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01e0
+    const v0, 0x7f0a01e3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -340,7 +280,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01df
+    const v0, 0x7f0a01e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -431,7 +371,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x2
 
@@ -541,7 +481,7 @@
 
     const-string v4, "context"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->getMuteIconResId(Landroid/content/Context;)I
 
@@ -553,7 +493,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->getMuteChannelText(Landroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -906,7 +846,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f1205dd
+    const p1, 0x7f1205df
 
     goto :goto_0
 
@@ -919,7 +859,7 @@
 
     if-nez p2, :cond_1
 
-    const p1, 0x7f12040b
+    const p1, 0x7f12040c
 
     goto :goto_0
 
@@ -930,12 +870,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f1205dc
+    const p1, 0x7f1205de
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f121384
+    const p1, 0x7f1213ae
 
     :goto_0
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -944,7 +884,7 @@
 
     const-string p2, "getString(\n      when {\n\u2026_empty_string\n      }\n  )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -984,9 +924,9 @@
 .method public bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "compositeSubscription"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppBottomSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
 
@@ -994,20 +934,22 @@
 
     move-result-object p1
 
+    const-string v0, "INTENT_EXTRA_CHANNEL_ID"
+
     const-wide/16 v1, -0x1
 
-    const-string v3, "INTENT_EXTRA_CHANNEL_ID"
+    invoke-virtual {p1, v0, v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;J)J
 
-    invoke-virtual {p1, v3, v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;J)J
-
-    move-result-wide v1
+    move-result-wide v0
 
     sget-object p1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion;
 
-    invoke-virtual {p1, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion;->get(J)Lrx/Observable;
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion;->get(J)Lrx/Observable;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -1016,6 +958,10 @@
 
     const-class v3, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
+    new-instance v8, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -1024,10 +970,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$bindSubscriptions$1;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -1035,13 +977,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "compositeSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getContentViewResId()I
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali
index e944f97682..cb689b6028 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$OverlapDecoration.smali
@@ -34,15 +34,21 @@
 .method public getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "outRect"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p3, "state"
+
+    invoke-static {p4, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -73,39 +79,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type androidx.recyclerview.widget.RecyclerView.LayoutParams"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_2
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "outRect"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali
index a2e8d4aba8..8cdbe72ec4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali
@@ -35,7 +35,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;
 
@@ -43,41 +43,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "icon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "icon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getIcon()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "extraCountText"
 
-    const/4 v3, 0x0
+    const-string v3, "getExtraCountText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "extraCountText"
+    const/4 v2, 0x1
 
-    const-string v4, "getExtraCountText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -85,17 +73,19 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0a97
+    const p1, 0x7f0a0a9c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -103,7 +93,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0a96
+    const p1, 0x7f0a0a9b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -112,15 +102,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;->extraCountText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getExtraCountText()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali
index 33dc6d1de6..0c556dff9b 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.smali
@@ -24,7 +24,9 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -36,7 +38,7 @@
 
     const-string v2, "recycler.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -55,15 +57,6 @@
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->addItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -92,7 +85,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;
 
@@ -101,13 +96,4 @@
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;-><init>(ILcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
index ff0ef0e05a..93c200641d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method public static synthetic TYPE_FRIENDS_LIST$annotations()V
+.method public static synthetic getTYPE_FRIENDS_LIST$annotations()V
     .locals 0
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali
index 2edda87a31..e28bc044b3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemCategory.smali
@@ -18,9 +18,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;->canManageChannels:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;Lcom/discord/models/domain/ModelChannel;ZZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
@@ -119,22 +112,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZZZ)Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -152,7 +138,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali
index 31c8b49bec..e8e89de27d 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemPrivate.smali
@@ -23,9 +23,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,15 +44,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->muted:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
@@ -186,36 +179,29 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZZ)Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
 
-    new-instance v7, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-object v2, p2
+    move-object v2, p1
 
-    move v3, p3
+    move-object v3, p2
 
-    move v4, p4
+    move v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    move v6, p6
+    move v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZZ)V
+    move v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZZ)V
 
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -233,7 +219,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -243,7 +229,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali
index 7c23febf8f..297bed72bb 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.smali
@@ -23,9 +23,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZIZZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,15 +44,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->isLocked:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;Lcom/discord/models/domain/ModelChannel;ZIZZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
@@ -190,36 +183,29 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZIZZZ)Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
 
-    new-instance v7, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move v2, p2
+    move-object v2, p1
 
-    move v3, p3
+    move v3, p2
 
-    move v4, p4
+    move v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    move v6, p6
+    move v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZIZZZ)V
+    move v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZIZZZ)V
 
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -237,7 +223,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali
index 08df27ec22..fbb96a5f24 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/Long;IZZLjava/lang/Integer;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,15 +47,6 @@
     iput-object p7, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->guildVideoUserLimit:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;Lcom/discord/models/domain/ModelChannel;ZLjava/lang/Long;IZZLjava/lang/Integer;ILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
@@ -204,38 +197,31 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/Long;IZZLjava/lang/Integer;)Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
     .locals 9
 
-    if-eqz p1, :cond_0
-
-    new-instance v8, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
-
-    move-object v0, v8
-
-    move-object v1, p1
-
-    move v2, p2
-
-    move-object v3, p3
-
-    move v4, p4
-
-    move v5, p5
-
-    move v6, p6
-
-    move-object/from16 v7, p7
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/Long;IZZLjava/lang/Integer;)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "channel"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v2, p1
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
+
+    move-object v1, v0
+
+    move v3, p2
+
+    move-object v4, p3
+
+    move v5, p4
+
+    move v6, p5
+
+    move v7, p6
+
+    move-object/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/Long;IZZLjava/lang/Integer;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -253,7 +239,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -269,7 +255,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->permission:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -297,7 +283,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;->guildVideoUserLimit:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali
index 221f23f8c7..8632467b3a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemVoiceUser.smali
@@ -24,15 +24,21 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "voiceState"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "computed"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,34 +55,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;->hasChannelConnectPermission:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "computed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "voiceState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;ZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
@@ -208,15 +186,21 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;ZZ)Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "voiceState"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "computed"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
 
@@ -237,34 +221,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "computed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "voiceState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -282,7 +238,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -292,7 +248,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;->voiceState:Lcom/discord/models/domain/ModelVoice$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -302,7 +258,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -312,7 +268,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;->computed:Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali
index a42ec74b42..c4f9f63ee6 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali
@@ -51,23 +51,23 @@
 
 # virtual methods
 .method public final createEmptyUser(J)Lcom/discord/widgets/channels/list/items/CollapsedUser;
-    .locals 3
+    .locals 4
 
-    new-instance v0, Lcom/discord/models/domain/ModelUser;
+    new-instance v0, Lcom/discord/widgets/channels/list/items/CollapsedUser;
 
-    invoke-direct {v0}, Lcom/discord/models/domain/ModelUser;-><init>()V
+    new-instance v1, Lcom/discord/models/domain/ModelUser;
 
-    const-wide/16 v1, 0x63
+    invoke-direct {v1}, Lcom/discord/models/domain/ModelUser;-><init>()V
 
-    invoke-static {v1, v2, p1, p2}, Ljava/lang/Math;->min(JJ)J
+    const-wide/16 v2, 0x63
+
+    invoke-static {v2, v3, p1, p2}, Ljava/lang/Math;->min(JJ)J
 
     move-result-wide p1
 
-    new-instance v1, Lcom/discord/widgets/channels/list/items/CollapsedUser;
-
     const/4 v2, 0x1
 
-    invoke-direct {v1, v0, v2, p1, p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;-><init>(Lcom/discord/models/domain/ModelUser;ZJ)V
+    invoke-direct {v0, v1, v2, p1, p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;-><init>(Lcom/discord/models/domain/ModelUser;ZJ)V
 
-    return-object v1
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali
index 06d021528f..051e83c5b9 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/list/items/CollapsedUser$userId$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CollapsedUser.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali
index dac97db96e..ad1bff2bed 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali
@@ -44,9 +44,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;ZJ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -67,15 +69,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->userId$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelUser;ZJILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -174,22 +167,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;ZJ)Lcom/discord/widgets/channels/list/items/CollapsedUser;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/list/items/CollapsedUser;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/items/CollapsedUser;-><init>(Lcom/discord/models/domain/ModelUser;ZJ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -207,7 +193,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/list/items/CollapsedUser;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.smali
index 1b9a7cc100..2dada472af 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildMemberListItemGenerator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;",
         "Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,9 @@
 .method public final invoke(Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;
     .locals 14
 
-    if-eqz p1, :cond_5
+    const-string v0, "row"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList$Row$StatusHeader;
 
@@ -201,15 +203,6 @@
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p1
-
-    :cond_5
-    const-string p1, "row"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali
index 0b4d3b4d9b..9ec6aa390c 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali
@@ -135,7 +135,9 @@
 .method public static final generateGuildMemberListItems(Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;Z)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;
     .locals 6
 
-    if-eqz p0, :cond_3
+    const-string v0, "channelMemberList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;->getRows()Lcom/discord/utilities/collections/SparseMutableList;
 
@@ -157,7 +159,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {v0}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -190,7 +192,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f120d41
+    const v5, 0x7f120d67
 
     invoke-direct {p1, v4, v5}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;-><init>(Ljava/lang/String;I)V
 
@@ -270,13 +272,4 @@
     invoke-direct {p1, p0, v3, v0, v1}, Lcom/discord/widgets/channels/memberlist/GuildMemberListItems;-><init>(Ljava/lang/String;ILcom/discord/utilities/collections/SparseMutableList;Ljava/util/SortedMap;)V
 
     return-object p1
-
-    :cond_3
-    const-string p0, "channelMemberList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItems.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItems.smali
index 2c294158f5..269a7e8b32 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItems.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItems.smali
@@ -51,13 +51,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "listItems"
 
-    if-eqz p4, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "groupIndices"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,27 +74,6 @@
     iput-object p4, p0, Lcom/discord/widgets/channels/memberlist/GuildMemberListItems;->groupIndices:Ljava/util/SortedMap;
 
     return-void
-
-    :cond_0
-    const-string p1, "groupIndices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final component3()Lcom/discord/utilities/collections/SparseMutableList;
@@ -208,40 +191,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "listItems"
 
-    if-eqz p4, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "groupIndices"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/GuildMemberListItems;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/memberlist/GuildMemberListItems;-><init>(Ljava/lang/String;ILcom/discord/utilities/collections/SparseMutableList;Ljava/util/SortedMap;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "groupIndices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -263,7 +229,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -283,7 +249,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/GuildMemberListItems;->listItems:Lcom/discord/utilities/collections/SparseMutableList;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -293,7 +259,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/memberlist/GuildMemberListItems;->groupIndices:Ljava/util/SortedMap;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -366,7 +332,7 @@
 
     const-string v1, "groupIndices.keys"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -398,11 +364,7 @@
 
     add-int/lit8 v5, p1, 0x1
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->compare(II)I
-
-    move-result v3
-
-    if-gez v3, :cond_1
+    if-ge v3, v5, :cond_1
 
     goto :goto_1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1.smali
index 983112ab0f..1c0efd2aa8 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "PrivateChannelMemberListItemGenerator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
         "Ljava/lang/String;",
@@ -46,73 +46,43 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Ljava/lang/String;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "compareTo"
+
+    const-string v4, "compareTo(Ljava/lang/String;)I"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "compareTo"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Ljava/lang/String;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "compareTo(Ljava/lang/String;)I"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/lang/String;Ljava/lang/String;)I
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->compareTo(Ljava/lang/String;)I
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0.smali
index 83d3a3231f..28ce8772df 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0.smali
@@ -34,7 +34,7 @@
 
     const-string p2, "invoke(...)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Ljava/lang/Number;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali
index a7890fe555..7f1adaeb7d 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali
@@ -53,7 +53,7 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f12155f
+    const v0, 0x7f121589
 
     goto :goto_1
 
@@ -69,7 +69,7 @@
 
     const-string v1, "name"
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser;->isBot()Z
 
@@ -109,7 +109,7 @@
 .end method
 
 .method public static final generateGroupDmMemberListItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Z)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;
-    .locals 14
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -132,238 +132,212 @@
         }
     .end annotation
 
-    move-object/from16 v0, p2
+    const-string v0, "channel"
 
-    move-object/from16 v1, p3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p0, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_8
+    const-string v0, "presences"
 
-    if-eqz v0, :cond_7
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_6
+    const-string v0, "applicationStreams"
 
-    new-instance v3, Ljava/util/TreeMap;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v4, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1;->INSTANCE:Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1;
+    new-instance v0, Ljava/util/TreeMap;
 
-    if-eqz v4, :cond_0
+    sget-object v1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1;->INSTANCE:Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$generateGroupDmMemberListItems$memberItems$1;
 
-    new-instance v5, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0;
+    if-eqz v1, :cond_0
 
-    invoke-direct {v5, v4}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0;-><init>(Lkotlin/jvm/functions/Function2;)V
+    new-instance v2, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0;
 
-    move-object v4, v5
+    invoke-direct {v2, v1}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt$sam$java_util_Comparator$0;-><init>(Lkotlin/jvm/functions/Function2;)V
+
+    move-object v1, v2
 
     :cond_0
-    check-cast v4, Ljava/util/Comparator;
+    check-cast v1, Ljava/util/Comparator;
 
-    invoke-direct {v3, v4}, Ljava/util/TreeMap;-><init>(Ljava/util/Comparator;)V
+    invoke-direct {v0, v1}, Ljava/util/TreeMap;-><init>(Ljava/util/Comparator;)V
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v4
+    move-result-object v1
 
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v4
+    move-result-object v1
 
     :goto_0
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v2
 
-    const/4 v6, 0x0
+    const/4 v3, 0x0
 
-    if-eqz v5, :cond_3
+    if-eqz v2, :cond_3
 
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelUser;
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getUsernameLower()Ljava/lang/String;
 
     move-result-object v5
 
-    check-cast v5, Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    new-instance v7, Ljava/lang/StringBuilder;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
 
-    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
+    move-result-object v5
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getUsernameLower()Ljava/lang/String;
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v8
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v7
+    move-result-object v4
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
 
-    move-result-object v8
+    move-result-object v5
 
-    if-eqz v8, :cond_1
+    if-eqz v5, :cond_1
 
-    invoke-static {v5, v8}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v2, v5}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
-    move-result-object v8
+    move-result-object v5
 
-    check-cast v8, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+    check-cast v5, Lcom/discord/models/domain/ModelChannel$RecipientNick;
 
-    if-eqz v8, :cond_1
+    if-eqz v5, :cond_1
 
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getNick()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getNick()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v5
 
     goto :goto_1
 
     :cond_1
-    move-object v8, v2
+    const/4 v5, 0x0
 
     :goto_1
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getOwnerId()J
 
-    move-result-wide v9
+    move-result-wide v6
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v11
+    move-result-wide v8
 
-    cmp-long v13, v9, v11
+    cmp-long v10, v6, v8
 
-    if-nez v13, :cond_2
+    if-nez v10, :cond_2
 
-    const/4 v6, 0x1
+    const/4 v3, 0x1
 
     :cond_2
-    invoke-static {v5, v0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v2, p2}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object v6
 
-    check-cast v9, Lcom/discord/models/domain/ModelPresence;
+    check-cast v6, Lcom/discord/models/domain/ModelPresence;
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v10
+    move-result-wide v7
 
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v10
+    move-result-object v7
 
-    invoke-interface {v1, v10}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {p3, v7}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    move-result v10
+    move-result v7
 
-    invoke-static {v5, v9, v6, v8, v10}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt;->createMemberListItem(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;ZLjava/lang/String;Z)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
+    invoke-static {v2, v6, v3, v5, v7}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt;->createMemberListItem(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;ZLjava/lang/String;Z)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
 
-    move-result-object v5
+    move-result-object v2
 
-    invoke-interface {v3, v7, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v4, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_3
     invoke-interface {p1}, Ljava/util/Map;->size()I
 
-    move-result v0
+    move-result p1
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance p2, Ljava/util/ArrayList;
 
-    add-int/lit8 v2, v0, 0x1
+    add-int/lit8 p3, p1, 0x1
 
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {p2, p3}, Ljava/util/ArrayList;-><init>(I)V
 
     if-eqz p4, :cond_5
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->isGroup()Z
 
-    move-result v2
+    move-result p3
 
-    if-eqz v2, :cond_4
+    if-eqz p3, :cond_4
 
-    const v2, 0x7f1208f1
+    const p3, 0x7f1208f3
 
     goto :goto_2
 
     :cond_4
-    const v2, 0x7f1204f8
+    const p3, 0x7f1204fa
 
     :goto_2
-    new-instance v4, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;
+    new-instance p4, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v7
+    move-result-wide v1
 
-    invoke-static {v7, v8}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v1
 
-    invoke-direct {v4, v5, v2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;-><init>(Ljava/lang/String;I)V
+    invoke-direct {p4, v1, p3}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;-><init>(Ljava/lang/String;I)V
 
-    invoke-virtual {v1, v6, v4}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V
+    invoke-virtual {p2, v3, p4}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V
 
     :cond_5
-    invoke-static {v0}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt;->createGroupDmHeader(I)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
+    invoke-static {p1}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt;->createGroupDmHeader(I)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {v3}, Ljava/util/TreeMap;->values()Ljava/util/Collection;
+    invoke-virtual {v0}, Ljava/util/TreeMap;->values()Ljava/util/Collection;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+    invoke-virtual {p2, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    new-instance v0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;
+    new-instance p1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v2
+    move-result-wide p3
 
-    invoke-static {v2, v3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {p3, p4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object p0
 
-    invoke-direct {v0, v2, v1}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;-><init>(Ljava/lang/String;Ljava/util/List;)V
+    invoke-direct {p1, p0, p2}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;-><init>(Ljava/lang/String;Ljava/util/List;)V
 
-    return-object v0
-
-    :cond_6
-    const-string v0, "applicationStreams"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_7
-    const-string v0, "presences"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_8
-    const-string v0, "users"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_9
-    const-string v0, "channel"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItems.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItems.smali
index d0540800a5..3d8823af38 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItems.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItems.smali
@@ -34,11 +34,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "listItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,20 +49,6 @@
     iput-object p2, p0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;->listItems:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final component2()Ljava/util/List;
@@ -131,31 +119,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "listItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;-><init>(Ljava/lang/String;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -177,7 +153,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -187,7 +163,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListItems;->listItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State.smali
index dba31e3105..bd95bea218 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State.smali
@@ -75,15 +75,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "users"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "presences"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "applicationStreams"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -96,34 +102,6 @@
     iput-object p4, p0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;->applicationStreams:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "applicationStreams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;
@@ -249,49 +227,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string/jumbo v0, "users"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "presences"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "applicationStreams"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "applicationStreams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -309,7 +265,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -319,7 +275,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -329,7 +285,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;->presences:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -339,7 +295,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;->applicationStreams:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1.smali
index f57ddc2ab2..5a373f04b8 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1.smali
@@ -3,7 +3,7 @@
 .source "PrivateChannelMemberListService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,32 +59,32 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelUser;)J
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Long;
     .locals 2
 
     const-string v0, "recipient"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
 
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1;->call(Lcom/discord/models/domain/ModelUser;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2$1.smali
index 4bb043c3e2..23718a73ed 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2$1.smali
@@ -29,7 +29,23 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;",
+        ">;"
     }
 .end annotation
 
@@ -80,17 +96,17 @@
 
     iget-object v1, v1, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2;->$channel:Lcom/discord/models/domain/ModelChannel;
 
-    const-string v2, "users"
+    const-string/jumbo v2, "users"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "presences"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "applicationStreams"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, p1, p2, p3}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2.smali
index 42973b9652..e4b12b511e 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2.smali
@@ -3,7 +3,7 @@
 .source "PrivateChannelMemberListService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;",
+        ">;>;"
     }
 .end annotation
 
@@ -74,6 +78,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;",
             ">;"
         }
@@ -87,7 +92,7 @@
 
     const-string v1, "ids"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->observeUsers(Ljava/util/Collection;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.smali
index 389713dd22..a4c9122b1a 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.smali
@@ -43,13 +43,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StoreApplicationStreaming;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeUser"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storePresences"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeApplicationStreaming"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,27 +64,6 @@
     iput-object p3, p0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeApplicationStreaming"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storePresences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StoreApplicationStreaming;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -163,7 +146,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService;->storeUser:Lcom/discord/stores/StoreUser;
 
@@ -177,11 +162,11 @@
 
     move-result-object v0
 
-    const-wide/16 v1, 0x1388
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v2, 0x1388
 
-    invoke-virtual {v0, v1, v2, v3}, Lrx/Observable;->Y(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-virtual {v0, v2, v3, v1}, Lrx/Observable;->Y(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v0
 
@@ -195,7 +180,7 @@
 
     sget-object v2, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1;->INSTANCE:Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -211,22 +196,13 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$observeStateForGroupDm$2;-><init>(Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService;Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "Observable.merge(\n      \u2026            }\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$RxOnScrollListener.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$RxOnScrollListener.smali
index bfa3f251c4..ab0bc356e9 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$RxOnScrollListener.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$RxOnScrollListener.smali
@@ -58,15 +58,17 @@
 
     const-string v1, "scrollYSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
 .method public onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 
@@ -79,13 +81,4 @@
     invoke-virtual {p1, p2}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.smali
index 6bc8123829..aaedf550c8 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelMembersList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -85,7 +85,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1;->$viewState:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$2.smali
index 9bc353ac7b..60fbe43a74 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelMembersList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1.smali
index 26a0f2abb5..4812e1dfc0 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelMembersList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;->access$configureUI(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.smali
index 95c39b43a1..66ece51948 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelMembersList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,11 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Event$ScrollToTop;->INSTANCE:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Event$ScrollToTop;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -80,7 +82,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Event$UpdateRanges;->INSTANCE:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Event$UpdateRanges;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -93,13 +95,4 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$3.smali
index 5da5deda44..506a3626df 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelMembersList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali
index c37f769ce8..11422d359c 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$recycler$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelMembersList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/recyclerview/widget/RecyclerView;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,11 +61,11 @@
     return-object v0
 
     :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type androidx.recyclerview.widget.RecyclerView"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
index ae912c7f29..298dfd1d1f 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
@@ -114,7 +114,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "WidgetChannelMembersList"
 
@@ -129,7 +129,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -200,12 +200,12 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -234,7 +234,7 @@
     return-void
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -244,7 +244,7 @@
 
     sget-object v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -370,12 +370,12 @@
     return-void
 
     :cond_0
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -443,20 +443,20 @@
     return-void
 
     :cond_1
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     throw v0
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type androidx.recyclerview.widget.LinearLayoutManager"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -504,7 +504,7 @@
     :cond_0
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -512,24 +512,17 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;->setupRecyclerView()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -577,19 +570,19 @@
 
     const-string v1, "ViewModelProvider(requir\u2026istViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;
 
     iput-object v0, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;->viewModel:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;
 
-    const-string v1, "viewModel"
+    const-string/jumbo v1, "viewModel"
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -665,7 +658,7 @@
 
     const-string v1, "scrollListener\n        .\u2026S, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -673,7 +666,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -683,7 +676,7 @@
 
     const-string v0, "scrollListener\n        .\u2026Schedulers.computation())"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v3, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;
 
@@ -702,12 +695,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1.smali
index de8b44fd6a..af6ec7beae 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChannelMembersListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1;->this$0:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;->access$handleStoreState(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData.smali
index e32e3674cf..0de29eda90 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData.smali
@@ -119,7 +119,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData;->selectedGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -129,7 +129,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData;->selectedChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$create$1.smali
index 50ddb15751..c20280bbb3 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$create$1.smali
@@ -31,7 +31,9 @@
 .method public subscribeToRange(JJLkotlin/ranges/IntRange;)V
     .locals 7
 
-    if-eqz p5, :cond_0
+    const-string v0, "range"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -48,13 +50,4 @@
     invoke-virtual/range {v1 .. v6}, Lcom/discord/stores/StoreGuildSubscriptions;->subscribeChannelRange(JJLkotlin/ranges/IntRange;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1.smali
index 95644dce87..5b1fdcb9d1 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelMembersListViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/panels/PanelState;
+    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1;->call(Lcom/discord/panels/PanelState;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/panels/PanelState;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
+    check-cast p1, Lcom/discord/panels/PanelState;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1;->call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$2.smali
index b33daea434..ed6e574d8a 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$2.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData;",
+        ">;"
     }
 .end annotation
 
@@ -68,7 +72,7 @@
 
     const-string v1, "isPanelOpen"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$3.smali
index f4265dffa9..8e44b841ca 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelMembersListViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$BootstrapData;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -121,9 +123,9 @@
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$None;-><init>(Z)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForGuild$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForGuild$1.smali
index fdc10e0857..64966def11 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForGuild$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForGuild$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Long;",
+        "Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;",
+        "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;",
+        ">;"
     }
 .end annotation
 
@@ -78,7 +81,7 @@
 
     const-string v0, "channelMemberList"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v8
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForPrivateChannel$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForPrivateChannel$1.smali
index 3b0ea0d028..2cfb661cad 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForPrivateChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForPrivateChannel$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChannelMembersListViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService$State;",
+        "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory.smali
index b8ee3a33f2..d9f6118a23 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory.smali
@@ -71,21 +71,33 @@
 .method public constructor <init>(Lcom/discord/stores/StoreChannelMembers;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUserRelationships;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeChannelMembers"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "storeGuildSelected"
 
-    if-eqz p3, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "storeChannelsSelected"
 
-    if-eqz p5, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "storeNavigation"
 
-    if-eqz p7, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "privateChannelMemberListService"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storePermissions"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUserRelationships"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -104,55 +116,6 @@
     iput-object p7, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeUserRelationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storePermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "privateChannelMemberListService"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "storeGuildSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "storeChannelMembers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreChannelMembers;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/widgets/channels/memberlist/PrivateChannelMemberListService;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUserRelationships;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -360,7 +323,7 @@
 
     sget-object v3, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -374,13 +337,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreState$3;-><init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable\n          .co\u2026            }\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -433,7 +396,7 @@
 
     const-string p2, "Observable.combineLatest\u2026issions\n        )\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -461,13 +424,13 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory$observeStoreStateForPrivateChannel$1;-><init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Factory;ZLcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "privateChannelMemberList\u2026            )\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -486,7 +449,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;
 
@@ -501,13 +466,4 @@
     invoke-direct {p1, v0, v1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;-><init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$GuildChannelRangeSubscriber;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild.smali
index b204e7baf7..f06f187f97 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild.smali
@@ -30,19 +30,21 @@
 .method public constructor <init>(ZJJLcom/discord/utilities/lazy/memberlist/ChannelMemberList;Ljava/lang/Long;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "channelMembers"
 
-    if-eqz p6, :cond_0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-static {p4, p5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, p1, v1, v2, v0}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;-><init>(ZLjava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p0, p1, v0, v1, v2}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;-><init>(ZLjava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-boolean p1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;->isPanelOpen:Z
 
@@ -55,13 +57,6 @@
     iput-object p7, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;->channelPermissions:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelMembers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;ZJJLcom/discord/utilities/lazy/memberlist/ChannelMemberList;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;
@@ -202,34 +197,27 @@
 .method public final copy(ZJJLcom/discord/utilities/lazy/memberlist/ChannelMemberList;Ljava/lang/Long;)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;
     .locals 9
 
-    if-eqz p6, :cond_0
-
-    new-instance v8, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;
-
-    move-object v0, v8
-
-    move v1, p1
-
-    move-wide v2, p2
-
-    move-wide v4, p4
-
-    move-object v6, p6
-
-    move-object/from16 v7, p7
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;-><init>(ZJJLcom/discord/utilities/lazy/memberlist/ChannelMemberList;Ljava/lang/Long;)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "channelMembers"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v7, p6
 
-    const/4 v0, 0x0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;
+
+    move-object v1, v0
+
+    move v2, p1
+
+    move-wide v3, p2
+
+    move-wide v5, p4
+
+    move-object/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;-><init>(ZJJLcom/discord/utilities/lazy/memberlist/ChannelMemberList;Ljava/lang/Long;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -297,7 +285,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;->channelMembers:Lcom/discord/utilities/lazy/memberlist/ChannelMemberList;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -307,7 +295,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Guild;->channelPermissions:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private.smali
index da8f007a44..310fff6c92 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private.smali
@@ -94,23 +94,33 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p4, :cond_4
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_3
+    const-string/jumbo v0, "users"
 
-    if-eqz p6, :cond_2
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_1
+    const-string v0, "presences"
 
-    if-eqz p8, :cond_0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "applicationStreams"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relationships"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p0, p1, v0, v1, v0}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;-><init>(ZLjava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, p1, v1, v0, v1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;-><init>(ZLjava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-boolean p1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;->isPanelOpen:Z
 
@@ -127,41 +137,6 @@
     iput-object p8, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;->relationships:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "applicationStreams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;ZJLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;
@@ -412,17 +387,35 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p4, :cond_4
+    move-object v5, p4
 
-    if-eqz p5, :cond_3
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_2
+    const-string/jumbo v0, "users"
 
-    if-eqz p7, :cond_1
+    move-object v6, p5
 
-    if-eqz p8, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "presences"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "applicationStreams"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relationships"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;
 
@@ -432,54 +425,9 @@
 
     move-wide v3, p2
 
-    move-object v5, p4
-
-    move-object v6, p5
-
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
-    move-object/from16 v9, p8
-
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;-><init>(ZJLcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "relationships"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "applicationStreams"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "presences"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "users"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "channel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -527,7 +475,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -537,7 +485,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -547,7 +495,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;->presences:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -557,7 +505,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;->applicationStreams:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -567,7 +515,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState$Private;->relationships:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded.smali
index 0778aac6c4..889c853da4 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded.smali
@@ -28,15 +28,17 @@
 .method public constructor <init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;ZLjava/lang/Long;Ljava/lang/Long;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "listItems"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;->getListId()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;->listItems:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;
 
@@ -47,13 +49,6 @@
     iput-object p4, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;->guildId:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;ZLjava/lang/Long;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;
@@ -131,22 +126,15 @@
 .method public final copy(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;ZLjava/lang/Long;Ljava/lang/Long;)Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "listItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;ZLjava/lang/Long;Ljava/lang/Long;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -164,7 +152,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;->listItems:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -180,7 +168,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;->channelId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -190,7 +178,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;->guildId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.smali
index 7e14a6c1a1..8a75518d51 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetChannelMembersListViewModel.kt"
 
 
@@ -17,7 +17,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState;",
         ">;"
     }
@@ -51,15 +51,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildChannelRangeSubscriber"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeStateObservable"
 
-    sget-object v1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    sget-object v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;->guildChannelRangeSubscriber:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$GuildChannelRangeSubscriber;
 
@@ -73,14 +75,20 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p1, p0, p2, v0, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;
 
+    new-instance v7, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1;-><init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -89,10 +97,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$1;-><init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -100,20 +104,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildChannelRangeSubscriber"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$StoreState;)V
@@ -135,7 +125,7 @@
 
     sget-object p1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Empty;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -266,7 +256,7 @@
     move-result-object v0
 
     :goto_3
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v4
 
@@ -314,7 +304,7 @@
     :goto_5
     invoke-direct {v5, v0, v6, v7, v8}, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;ZLjava/lang/Long;Ljava/lang/Long;)V
 
-    invoke-virtual {p0, v5}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v5}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     if-eqz v4, :cond_7
 
@@ -327,7 +317,7 @@
 
     move-result-object v0
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -415,7 +405,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -425,24 +415,21 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
+    const-string v0, "range"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_5
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_4
@@ -498,11 +485,4 @@
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "range"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali
index a8c6ced5ff..b0573c77e5 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ChannelMembersListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;",
         "Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -60,11 +60,13 @@
 .method public final invoke(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "prevRequest"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "nextRequest"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;->getForceOverwrite()Z
 
@@ -95,7 +97,7 @@
 
     move-result-object v2
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -129,7 +131,7 @@
 
     const-string v0, "DiffUtil.calculateDiff(diffUtilCallback)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate;
 
@@ -144,20 +146,6 @@
 
     :goto_0
     return-object v0
-
-    :cond_2
-    const-string p1, "nextRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "prevRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali
index 4107803b2a..0e7a932fd7 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$2.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TR;TT;TR;>;"
+        "Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;",
+        "Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;",
+        "Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;",
+        ">;"
     }
 .end annotation
 
@@ -70,7 +73,7 @@
 
     const-string v1, "nextUpdate"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$1;->invoke(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali
index 3653488154..39890169b2 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "prevMemberList"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "nextMemberList"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/DiffUtil$Callback;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$DiffUtilCallback;->nextMemberList:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;
 
     return-void
-
-    :cond_0
-    const-string p1, "nextMemberList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "prevMemberList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -70,7 +58,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -100,7 +88,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember.smali
index 588cd12301..f7029a237f 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember.smali
@@ -28,26 +28,21 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "rowId"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->ADD_MEMBER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
+    sget-object v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->ADD_MEMBER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
 
-    invoke-direct {p0, v1, p1, v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, p1, v1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;->rowId:Ljava/lang/String;
 
     iput p2, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;->title:I
 
     return-void
-
-    :cond_0
-    const-string p1, "rowId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;Ljava/lang/String;IILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;
@@ -103,22 +98,15 @@
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "rowId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;-><init>(Ljava/lang/String;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "rowId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +128,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali
index 77c2d7df05..5efc7b3052 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header.smali
@@ -32,15 +32,19 @@
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Type;I)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "rowId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "headerType"
 
-    sget-object v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->HEADER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1, p1, v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    sget-object v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->HEADER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
+
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, p1, v1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;->rowId:Ljava/lang/String;
 
@@ -49,20 +53,6 @@
     iput p3, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;->memberCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "headerType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rowId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Type;IILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
@@ -129,31 +119,19 @@
 .method public final copy(Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Type;I)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "rowId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "headerType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;-><init>(Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Type;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "headerType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rowId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -175,7 +153,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -185,7 +163,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;->headerType:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Type;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali
index 6a115f517c..a66d8bf884 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member.smali
@@ -46,17 +46,19 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->MEMBER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
+    sget-object v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->MEMBER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, v1, v2, v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->userId:J
 
@@ -81,13 +83,6 @@
     iput-boolean p12, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->isApplicationStreaming:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;JLjava/lang/String;ZLjava/lang/Integer;ZLcom/discord/models/domain/ModelPresence;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/String;ZILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
@@ -355,46 +350,39 @@
         .end annotation
     .end param
 
-    if-eqz p3, :cond_0
-
-    new-instance v13, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
-
-    move-object v0, v13
-
-    move-wide v1, p1
-
-    move-object/from16 v3, p3
-
-    move/from16 v4, p4
-
-    move-object/from16 v5, p5
-
-    move/from16 v6, p6
-
-    move-object/from16 v7, p7
-
-    move-object/from16 v8, p8
-
-    move-object/from16 v9, p9
-
-    move/from16 v10, p10
-
-    move-object/from16 v11, p11
-
-    move/from16 v12, p12
-
-    invoke-direct/range {v0 .. v12}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;-><init>(JLjava/lang/String;ZLjava/lang/Integer;ZLcom/discord/models/domain/ModelPresence;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/String;Z)V
-
-    return-object v13
-
-    :cond_0
     const-string v0, "name"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v4, p3
 
-    const/4 v0, 0x0
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move/from16 v5, p4
+
+    move-object/from16 v6, p5
+
+    move/from16 v7, p6
+
+    move-object/from16 v8, p7
+
+    move-object/from16 v9, p8
+
+    move-object/from16 v10, p9
+
+    move/from16 v11, p10
+
+    move-object/from16 v12, p11
+
+    move/from16 v13, p12
+
+    invoke-direct/range {v1 .. v13}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;-><init>(JLjava/lang/String;ZLjava/lang/Integer;ZLcom/discord/models/domain/ModelPresence;Ljava/lang/Integer;Ljava/lang/String;ZLjava/lang/String;Z)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -420,7 +408,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -436,7 +424,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->tagText:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -452,7 +440,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -462,7 +450,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->color:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -472,7 +460,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->avatarUrl:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -488,7 +476,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->premiumSince:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader.smali
index 00928ab726..06a8cb7341 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader.smali
@@ -22,30 +22,25 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->PLACEHOLDER_HEADER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
+    sget-object v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->PLACEHOLDER_HEADER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
 
-    const-string v2, "placeholder:"
+    const-string v1, "placeholder:"
 
-    invoke-static {v2, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, v1, v2, v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;->listId:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;
@@ -78,22 +73,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "listId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -111,7 +99,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;->listId:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader.smali
index 3ff71a89ee..fad5b83819 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader.smali
@@ -26,17 +26,19 @@
 .method public constructor <init>(JLjava/lang/String;I)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "roleName"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->ROLE_HEADER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
+    sget-object v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;->ROLE_HEADER:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, v1, v2, v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ViewType;Ljava/lang/Object;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;->roleId:J
 
@@ -45,13 +47,6 @@
     iput p4, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;->memberCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "roleName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;JLjava/lang/String;IILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;
@@ -114,22 +109,15 @@
 .method public final copy(JLjava/lang/String;I)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "roleName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;-><init>(JLjava/lang/String;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "roleName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -155,7 +143,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;->roleName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali
index 1ecb8f5849..05f9cc1fc4 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate.smali
@@ -22,31 +22,21 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/DiffUtil$DiffResult;Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;)V
     .locals 1
 
+    const-string v0, "diffResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "listUpdateRequest"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p2, v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$DiffUpdate;->diffResult:Landroidx/recyclerview/widget/DiffUtil$DiffResult;
 
     return-void
-
-    :cond_0
-    const-string p1, "listUpdateRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "diffResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali
index 3ce7ffec68..7aef839178 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation$OverwriteUpdate.smali
@@ -18,18 +18,13 @@
 .method public constructor <init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "listUpdateRequest"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateOperation;-><init>(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "listUpdateRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali
index 7208cd1dd7..2aaaa241f9 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest.smali
@@ -26,11 +26,13 @@
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "rows"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,20 +43,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;->forceOverwrite:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "rows"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;ZILjava/lang/Object;)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;
@@ -117,31 +105,19 @@
 .method public final copy(Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;Z)Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "rows"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;-><init>(Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "rows"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -159,7 +135,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;->listId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -169,7 +145,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$ListUpdateRequest;->rows:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager.smali
index 089186c262..e3cea68858 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager.smali
@@ -30,11 +30,13 @@
 .method public constructor <init>(Landroid/view/View;Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "headerView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "placeholderHeaderView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,34 +65,20 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager;->currentStickyHeaderView:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "placeholderHeaderView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "headerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public final bindStickyHeaderView(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item;)V
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "row"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;
+    instance-of v0, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager;->roleStickyHeader:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader;
 
@@ -105,9 +93,9 @@
     goto :goto_0
 
     :cond_0
-    instance-of v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
+    instance-of v0, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager;->onlineOfflineStickyHeader:Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;
 
@@ -122,9 +110,9 @@
     goto :goto_0
 
     :cond_1
-    instance-of v1, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;
+    instance-of v0, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$PlaceholderHeader;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager;->placeholderHeaderView:Landroid/view/View;
 
@@ -137,18 +125,13 @@
 
     if-eqz p1, :cond_3
 
-    iput-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager;->currentStickyHeaderView:Landroid/view/View;
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager;->currentStickyHeaderView:Landroid/view/View;
 
     :cond_3
     :goto_0
     return-void
-
-    :cond_4
-    const-string p1, "row"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getCurrentStickyHeaderView()Landroid/view/View;
@@ -162,7 +145,9 @@
 .method public final layoutViews(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager;->INSTANCE:Lcom/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager;
 
@@ -177,13 +162,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/views/StickyHeaderItemDecoration$LayoutManager;->layoutHeaderView(Landroid/view/ViewGroup;Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1.smali
index ec9bd7eae9..316a2cb6b3 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ChannelMembersListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$2.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$2.smali
index 0d32933deb..2e199add3c 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ChannelMembersListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali
index 13956cc639..1362c15aca 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ChannelMembersListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Landroid/view/View;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v0, "LayoutInflater.from(pare\u2026(layoutId, parent, false)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali
index df30af90dc..f05f866aef 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali
@@ -104,9 +104,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->updatesSubject:Lrx/subjects/PublishSubject;
 
-    const-string v2, "updatesSubject"
+    const-string/jumbo v2, "updatesSubject"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -116,15 +116,15 @@
 
     if-eqz v0, :cond_0
 
-    new-instance v3, Lr0/l/a/r1;
+    new-instance v3, Ls0/l/a/r1;
 
-    invoke-direct {v3, v1, v2}, Lr0/l/a/r1;-><init>(Ljava/lang/Object;Lrx/functions/Func2;)V
+    invoke-direct {v3, v1, v2}, Ls0/l/a/r1;-><init>(Ljava/lang/Object;Lrx/functions/Func2;)V
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, v0, v3}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, v0, v3}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -136,7 +136,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -156,9 +156,9 @@
 
     move-result-object v0
 
-    const-string v1, "updatesSubject\n        .\u2026mpleName}\", throwable) })"
+    const-string/jumbo v1, "updatesSubject\n        .\u2026mpleName}\", throwable) })"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->updatesSubscription:Lrx/Subscription;
 
@@ -206,7 +206,7 @@
     :cond_0
     const-string p0, "stickyHeadersManager"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -291,13 +291,13 @@
     return-object p1
 
     :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
     :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catch Ljava/lang/ClassCastException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -338,7 +338,7 @@
     return-object p1
 
     :cond_2
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -354,7 +354,7 @@
     return-object p1
 
     :cond_3
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -442,7 +442,9 @@
 .method public onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -480,11 +482,11 @@
 
     const-string v3, "headerView"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "placeholderHeaderView"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, v0, v1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$StickyHeadersManager;-><init>(Landroid/view/View;Landroid/view/View;)V
 
@@ -497,21 +499,14 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
     .locals 1
 
-    if-eqz p1, :cond_9
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;
 
@@ -534,11 +529,11 @@
     goto/16 :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter.Item.Header"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -568,11 +563,11 @@
     goto :goto_0
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter.Item.Member"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -609,11 +604,11 @@
     goto :goto_0
 
     :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter.Item.RoleHeader"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -647,32 +642,25 @@
     goto :goto_0
 
     :cond_7
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter.Item.AddMember"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_8
     :goto_0
     return-void
-
-    :cond_9
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_6
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;
 
@@ -792,25 +780,18 @@
 
     :goto_0
     return-object p1
-
-    :cond_6
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Ljava/lang/String;Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList;Z)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "listId"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "rows"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->updatesSubject:Lrx/subjects/PublishSubject;
 
@@ -823,24 +804,10 @@
     invoke-virtual {p1, v1}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "rows"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setOnAddMemberClicked(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -850,20 +817,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "addMember"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->onAddMemberClicked:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "addMember"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnUserClicked(Lkotlin/jvm/functions/Function1;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali
index 457c6b7178..274ee4d54d 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali
@@ -21,25 +21,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd;
 
-    const-class v2, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd;
+    const-string v2, "titleView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "titleView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitleView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -47,15 +41,17 @@
 .end method
 
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd;->view:Landroid/view/View;
 
-    const p1, 0x7f0a0163
+    const p1, 0x7f0a0166
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -64,15 +60,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd;->titleView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getTitleView()Landroid/widget/TextView;
@@ -112,7 +99,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onClicked"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd;->getTitleView()Landroid/widget/TextView;
 
@@ -139,15 +128,6 @@
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getView()Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
index 03d4266f74..9fc4efff91 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
@@ -13,13 +13,15 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0169
+    const v0, 0x7f0a016c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -30,15 +32,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->textView:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -46,7 +39,9 @@
 .method public final bind(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;)V
     .locals 3
 
-    if-eqz p1, :cond_3
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header;->getHeaderType()Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Header$Type;
 
@@ -66,7 +61,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const v0, 0x7f120ebc
+    const v0, 0x7f120ee2
 
     goto :goto_0
 
@@ -78,19 +73,19 @@
     throw p1
 
     :cond_1
-    const v0, 0x7f1214dd
+    const v0, 0x7f121507
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f1214de
+    const v0, 0x7f121508
 
     :goto_0
     iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->textView:Landroid/widget/TextView;
 
     const-string v2, "textView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
@@ -102,11 +97,11 @@
 
     const-string v1, "textView.context.getText(statusTextResId)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->textView:Landroid/widget/TextView;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -131,15 +126,6 @@
     invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getView()Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali
index 0aad59ba61..51bb52adf9 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali
@@ -226,11 +226,13 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
-    const v0, 0x7f0a0a28
+    const v0, 0x7f0a0a2c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -241,15 +243,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading;->guideline:Landroidx/constraintlayout/widget/Guideline;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -271,7 +264,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     check-cast p1, Ljava/lang/Number;
 
@@ -282,11 +275,4 @@
     invoke-virtual {v0, p1}, Landroidx/constraintlayout/widget/Guideline;->setGuidelinePercent(F)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
index 537a54950d..04e1c40b02 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
@@ -49,7 +49,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f12120c
+    const v2, 0x7f121237
 
     const/4 v3, 0x1
 
@@ -89,7 +89,7 @@
 
     const/16 v2, 0xc
 
-    invoke-static {v1, p1, v4, v0, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v1, p1, v4, v0, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
index d889713d93..b88697f7e2 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
@@ -25,13 +25,15 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0164
+    const v0, 0x7f0a0167
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -43,7 +45,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a016a
+    const v0, 0x7f0a016d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +57,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0166
+    const v0, 0x7f0a0169
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,15 +69,15 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a016b
+    const v0, 0x7f0a016e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v0, "view.findViewById(R.id.c\u2026mbers_list_item_presence)"
+    const-string/jumbo v0, "view.findViewById(R.id.c\u2026mbers_list_item_presence)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/StatusView;
 
@@ -83,7 +85,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a016c
+    const v0, 0x7f0a016f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -95,7 +97,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0167
+    const v0, 0x7f0a016a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -105,7 +107,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0165
+    const v0, 0x7f0a0168
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -114,15 +116,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->itemBoosterIndicator:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -139,11 +132,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "onClicked"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
 
@@ -176,7 +171,7 @@
     :cond_0
     const-string v0, "this"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f040408
 
@@ -235,7 +230,7 @@
 
     const-string v2, "itemOwnerIndicator"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->getShowOwnerIndicator()Z
 
@@ -259,7 +254,7 @@
 
     const-string v2, "itemBoosterIndicator"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_4
 
@@ -301,7 +296,7 @@
 
     const-string p2, "itemGame"
 
-    invoke-static {v6, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v7, 0x0
 
@@ -315,7 +310,7 @@
 
     const-string v1, "itemRichPresence"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
 
@@ -341,7 +336,7 @@
 
     const-string p2, "itemAvatar"
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$Member;->getAvatarUrl()Ljava/lang/String;
 
@@ -360,20 +355,6 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "onClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getView()Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderPlaceholderHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderPlaceholderHeader.smali
index 2fdac413b9..e50c846509 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderPlaceholderHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderPlaceholderHeader.smali
@@ -5,20 +5,13 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader$bind$1.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader$bind$1.smali
index 1e3f685b6f..44cedc7549 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader$bind$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader$bind$1.smali
@@ -28,11 +28,13 @@
 .method public onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "host"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "info"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 
@@ -41,18 +43,4 @@
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setHeading(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali
index cf7b65d00a..ca5aeb7799 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali
@@ -13,13 +13,15 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader;->view:Landroid/view/View;
 
-    const v0, 0x7f0a0169
+    const v0, 0x7f0a016c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -30,15 +32,6 @@
     iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader;->textView:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -46,13 +39,15 @@
 .method public final bind(Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$RoleHeader;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader;->textView:Landroid/widget/TextView;
 
     const-string v1, "textView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -89,15 +84,6 @@
     invoke-static {p1, v0}, Landroidx/core/view/ViewCompat;->setAccessibilityDelegate(Landroid/view/View;Landroidx/core/view/AccessibilityDelegateCompat;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getView()Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge.smali
index 0d4a636d61..38120682b4 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "attachmentsRequest"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;->attachmentsRequest:Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;
 
     return-void
-
-    :cond_0
-    const-string p1, "attachmentsRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;ILjava/lang/Object;)Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;)Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "attachmentsRequest"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;-><init>(Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "attachmentsRequest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;->attachmentsRequest:Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager$MessageSendResult.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager$MessageSendResult.smali
index 78d3d00b7f..28563b2e3c 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager$MessageSendResult.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager$MessageSendResult.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/messagesend/MessageResult;Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "messageResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/widgets/chat/MessageManager$MessageSendResult;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "messageResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/MessageManager$MessageSendResult;Lcom/discord/utilities/messagesend/MessageResult;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/chat/MessageManager$MessageSendResult;
@@ -89,22 +82,15 @@
 .method public final copy(Lcom/discord/utilities/messagesend/MessageResult;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/MessageManager$MessageSendResult;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "messageResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/MessageManager$MessageSendResult;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/MessageManager$MessageSendResult;-><init>(Lcom/discord/utilities/messagesend/MessageResult;Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "messageResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/MessageManager$MessageSendResult;->messageResult:Lcom/discord/utilities/messagesend/MessageResult;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -132,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/MessageManager$MessageSendResult;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali
index 8506d92267..bd6ae7f776 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/MessageManager$MessageSendResult;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,41 +59,41 @@
 .end method
 
 .method public final invoke(Lcom/discord/widgets/chat/MessageManager$MessageSendResult;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "messageSendResult"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/MessageManager$MessageSendResult;->getMessageResult()Lcom/discord/utilities/messagesend/MessageResult;
 
     move-result-object p1
 
-    instance-of v1, p1, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
+    instance-of v0, p1, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    sget-object v2, Lcom/discord/utilities/rest/SendUtils;->INSTANCE:Lcom/discord/utilities/rest/SendUtils;
+    sget-object v1, Lcom/discord/utilities/rest/SendUtils;->INSTANCE:Lcom/discord/utilities/rest/SendUtils;
 
     check-cast p1, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
 
     invoke-virtual {p1}, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;->getError()Lcom/discord/utilities/error/Error;
 
-    move-result-object v3
+    move-result-object v2
 
     iget-object p1, p0, Lcom/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1;->this$0:Lcom/discord/widgets/chat/MessageManager;
 
     invoke-static {p1}, Lcom/discord/widgets/chat/MessageManager;->access$getContext$p(Lcom/discord/widgets/chat/MessageManager;)Landroid/content/Context;
 
-    move-result-object v4
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/4 v6, 0x4
+    const/4 v5, 0x4
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/rest/SendUtils;->handleSendError$default(Lcom/discord/utilities/rest/SendUtils;Lcom/discord/utilities/error/Error;Landroid/content/Context;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/rest/SendUtils;->handleSendError$default(Lcom/discord/utilities/rest/SendUtils;Lcom/discord/utilities/error/Error;Landroid/content/Context;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     goto :goto_0
 
@@ -108,22 +108,17 @@
 
     move-result-object p1
 
-    const v1, 0x7f120412
+    const v0, 0x7f120413
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v1, v2, v0, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "messageSendResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$1.smali
index 82e2a61201..3227976ccf 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/utilities/messagesend/MessageResult;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/widgets/chat/MessageManager$MessageSendResult;",
+        ">;"
     }
 .end annotation
 
@@ -66,7 +69,7 @@
 
     const-string v1, "messageResult"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/MessageManager$MessageSendResult;-><init>(Lcom/discord/utilities/messagesend/MessageResult;Lcom/discord/models/domain/ModelGuild;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$2.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$2.smali
index 388f00b5cf..843ae6169e 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/MessageManager$sendMessage$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageManager.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/MessageManager$MessageSendResult;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "messageSendResult"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$messageResultObservable$1.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$messageResultObservable$1.smali
index f9b02d0f61..97df199eb5 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$messageResultObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager$sendMessage$messageResultObservable$1.smali
@@ -3,7 +3,7 @@
 .source "MessageManager.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/messagesend/MessageResult;",
+        ">;>;"
     }
 .end annotation
 
@@ -101,18 +103,17 @@
 
     move-result v1
 
-    const/4 v2, 0x0
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->compare(II)I
-
-    move-result v1
-
     if-lez v1, :cond_0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
+
+    goto :goto_0
 
     :cond_0
-    if-eqz v2, :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
 
     new-instance v1, Lcom/discord/utilities/messagesend/MessageResult$Slowmode;
 
@@ -128,11 +129,11 @@
 
     invoke-direct {v1, v2, v3}, Lcom/discord/utilities/messagesend/MessageResult$Slowmode;-><init>(J)V
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     iget-object v1, v0, Lcom/discord/widgets/chat/MessageManager$sendMessage$messageResultObservable$1;->this$0:Lcom/discord/widgets/chat/MessageManager;
@@ -171,6 +172,6 @@
 
     move-result-object v2
 
-    :goto_0
+    :goto_1
     return-object v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager.smali
index 717c802d41..d7a049d456 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager.smali
@@ -45,21 +45,33 @@
 .method public constructor <init>(Landroid/content/Context;Lcom/discord/stores/StoreMessages;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreSlowMode;Lcom/discord/stores/StoreGuilds;Lcom/discord/utilities/logging/Logger;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "storeMessages"
 
-    if-eqz p3, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "storeUser"
 
-    if-eqz p5, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "storeChannelsSelected"
 
-    if-eqz p7, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeSlowMode"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeGuilds"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "logger"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -84,55 +96,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/MessageManager;->defaultMessageResultHandler:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeSlowMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "storeMessages"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Lcom/discord/stores/StoreMessages;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreSlowMode;Lcom/discord/stores/StoreGuilds;Lcom/discord/utilities/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -515,7 +478,9 @@
         }
     .end annotation
 
-    if-eqz p5, :cond_3
+    const-string v0, "content"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p5}, Lcom/discord/widgets/chat/MessageManager;->validateMessageContent(Ljava/lang/String;)Lcom/discord/widgets/chat/MessageManager$ContentValidationResult;
 
@@ -523,7 +488,7 @@
 
     sget-object v1, Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$MessageTooLong;->INSTANCE:Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$MessageTooLong;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -559,7 +524,7 @@
     :cond_1
     sget-object p6, Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$EmptyContent;->INSTANCE:Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$EmptyContent;
 
-    invoke-static {v0, p6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p6
 
@@ -570,7 +535,7 @@
     :cond_2
     sget-object p6, Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$Success;->INSTANCE:Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$Success;
 
-    invoke-static {v0, p6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     iget-object v1, p0, Lcom/discord/widgets/chat/MessageManager;->storeMessages:Lcom/discord/stores/StoreMessages;
 
@@ -585,19 +550,10 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_3
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final sendMessage(Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;Ljava/lang/Long;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Z
-    .locals 22
+    .locals 21
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -642,9 +598,15 @@
 
     move-object/from16 v9, p7
 
-    if-eqz p1, :cond_9
+    const-string v4, "content"
 
-    if-eqz v9, :cond_8
+    move-object/from16 v5, p1
+
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "messageSendResultHandler"
+
+    invoke-static {v9, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, v8, Lcom/discord/widgets/chat/MessageManager;->storeUser:Lcom/discord/stores/StoreUser;
 
@@ -652,7 +614,7 @@
 
     move-result-object v4
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
     if-nez v4, :cond_0
 
@@ -682,38 +644,38 @@
 
     invoke-static/range {p1 .. p6}, 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
 
-    return v11
+    return v10
 
     :cond_0
     invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/chat/MessageManager;->validateMessageContent(Ljava/lang/String;)Lcom/discord/widgets/chat/MessageManager$ContentValidationResult;
 
-    move-result-object v5
+    move-result-object v6
 
-    sget-object v6, Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$MessageTooLong;->INSTANCE:Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$MessageTooLong;
+    sget-object v7, Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$MessageTooLong;->INSTANCE:Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$MessageTooLong;
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v6
+    move-result v7
 
-    if-eqz v6, :cond_1
+    if-eqz v7, :cond_1
 
     if-eqz v2, :cond_1
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
 
-    move-result v6
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    const/16 v7, 0x7d0
+    move-result v7
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v7
 
-    invoke-interface {v2, v6, v7}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    const/16 v11, 0x7d0
+
+    invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v11
+
+    invoke-interface {v2, v7, v11}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -724,37 +686,37 @@
 
     move-result-object v2
 
-    instance-of v6, v2, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;
+    instance-of v7, v2, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;
 
-    if-eqz v6, :cond_2
+    if-eqz v7, :cond_2
 
-    move-object v6, v2
+    move-object v7, v2
 
-    check-cast v6, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;
+    check-cast v7, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;
 
-    invoke-virtual {v6}, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;->getAttachmentsRequest()Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;
-
-    move-result-object v6
-
-    if-eqz v3, :cond_2
-
-    invoke-virtual {v6}, Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;->getMaxFileSizeMB()I
-
-    move-result v6
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser$Me;->isPremium()Z
-
-    move-result v7
-
-    invoke-static {v7}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {v7}, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$FilesTooLarge;->getAttachmentsRequest()Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;
 
     move-result-object v7
 
-    invoke-interface {v3, v6, v7}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    if-eqz v3, :cond_2
+
+    invoke-virtual {v7}, Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;->getMaxFileSizeMB()I
+
+    move-result v7
+
+    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v7
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser$Me;->isPremium()Z
+
+    move-result v11
+
+    invoke-static {v11}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v11
+
+    invoke-interface {v3, v7, v11}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -763,29 +725,31 @@
     :cond_2
     sget-object v3, Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$Success;->INSTANCE:Lcom/discord/widgets/chat/MessageManager$ContentValidationResult$Success;
 
-    invoke-static {v5, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
-    const/4 v12, 0x1
+    const/4 v11, 0x1
 
-    xor-int/2addr v3, v12
+    xor-int/2addr v3, v11
 
     if-eqz v3, :cond_3
 
     sget-object v3, Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$Success;->INSTANCE:Lcom/discord/widgets/chat/MessageManager$AttachmentValidationResult$Success;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
-    xor-int/2addr v2, v12
+    xor-int/2addr v2, v11
 
     if-eqz v2, :cond_3
 
-    return v11
+    return v10
 
     :cond_3
+    const/4 v12, 0x0
+
     if-eqz v0, :cond_4
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;->getAttachments()Ljava/util/List;
@@ -797,7 +761,7 @@
     goto :goto_0
 
     :cond_4
-    const/4 v7, 0x0
+    move-object v7, v12
 
     :goto_0
     if-eqz v1, :cond_5
@@ -832,7 +796,7 @@
 
     const-string v2, "ShortcutManagerCompat.getDynamicShortcuts(context)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -861,9 +825,9 @@
 
     check-cast v3, Landroidx/core/content/pm/ShortcutInfoCompat;
 
-    const-string v5, "it"
+    const-string v6, "it"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Landroidx/core/content/pm/ShortcutInfoCompat;->getId()Ljava/lang/String;
 
@@ -874,7 +838,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {v2}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v2}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v0
 
@@ -929,7 +893,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/MessageManager$sendMessage$messageResultObservable$1;-><init>(Lcom/discord/widgets/chat/MessageManager;JLcom/discord/models/domain/ModelUser$Me;Ljava/lang/String;Ljava/util/List;Ljava/util/List;)V
 
-    invoke-virtual {v15, v10}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v15, v10}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -945,25 +909,27 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v12}, Lrx/Observable;->V(I)Lrx/Observable;
+    invoke-virtual {v0, v11}, Lrx/Observable;->V(I)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable.combineLatest\u2026d)\n    }\n        .take(1)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
-    invoke-static {v0, v11, v12, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v1, v11, v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v13
+    move-result-object v12
 
-    const-class v14, Lcom/discord/widgets/chat/MessageManager;
+    const-class v13, Lcom/discord/widgets/chat/MessageManager;
+
+    const/4 v14, 0x0
 
     const/4 v15, 0x0
 
@@ -971,37 +937,17 @@
 
     const/16 v17, 0x0
 
-    const/16 v18, 0x0
-
     new-instance v0, Lcom/discord/widgets/chat/MessageManager$sendMessage$2;
 
     invoke-direct {v0, v9}, Lcom/discord/widgets/chat/MessageManager$sendMessage$2;-><init>(Lkotlin/jvm/functions/Function1;)V
 
-    const/16 v20, 0x1e
+    const/16 v19, 0x1e
 
-    const/16 v21, 0x0
+    const/16 v20, 0x0
 
-    move-object/from16 v19, v0
+    move-object/from16 v18, v0
 
-    invoke-static/range {v13 .. v21}, 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
+    invoke-static/range {v12 .. v20}, 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 v12
-
-    :cond_8
-    const-string v0, "messageSendResultHandler"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_9
-    const/4 v0, 0x0
-
-    const-string v1, "content"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return v11
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1.smali
index b9d25db964..d121b3829e 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUrlActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentActivity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/chat/WidgetUrlActions;->Companion:Lcom/discord/widgets/chat/WidgetUrlActions$Companion;
 
@@ -75,7 +77,7 @@
 
     const-string v1, "fragmentActivity.supportFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1;->$url:Ljava/lang/String;
 
@@ -84,13 +86,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "fragmentActivity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion.smali
index c1e09fd652..c21ae320ff 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$Companion.smali
@@ -36,11 +36,13 @@
 .method public final launch(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/WidgetUrlActions;
 
@@ -65,20 +67,6 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final requestNotice(Ljava/lang/String;)V
@@ -86,10 +74,44 @@
 
     move-object/from16 v1, p1
 
-    if-eqz v1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v15, Lcom/discord/stores/StoreNotices$Notice;
 
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lk0/s/b;
+
+    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v3, 0x0
+
+    aput-object v2, v0, v3
+
+    const-class v2, Lcom/discord/widgets/search/results/WidgetSearchResults;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v3, 0x1
+
+    aput-object v2, v0, v3
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v8
+
+    new-instance v13, Lcom/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1;
+
+    invoke-direct {v13, v1}, Lcom/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1;-><init>(Ljava/lang/String;)V
+
     const/4 v2, 0x0
 
     const-wide/16 v3, 0x0
@@ -100,50 +122,16 @@
 
     const/4 v7, 0x0
 
-    const/4 v0, 0x2
-
-    new-array v0, v0, [Lj0/r/b;
-
-    const/4 v8, 0x0
-
-    const-class v9, Lcom/discord/widgets/home/WidgetHome;
-
-    invoke-static {v9}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v9
-
-    aput-object v9, v0, v8
-
-    const/4 v8, 0x1
-
-    const-class v9, Lcom/discord/widgets/search/results/WidgetSearchResults;
-
-    invoke-static {v9}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v9
-
-    aput-object v9, v0, v8
-
-    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v8
-
     const-wide/16 v9, 0x0
 
     const-wide/16 v11, 0x0
 
-    new-instance v13, Lcom/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1;
-
-    invoke-direct {v13, v1}, Lcom/discord/widgets/chat/WidgetUrlActions$Companion$requestNotice$notice$1;-><init>(Ljava/lang/String;)V
-
     const/16 v14, 0x36
 
     const/16 v16, 0x0
 
     move-object v0, v15
 
-    move-object/from16 v1, p1
-
     move-object/from16 v17, v15
 
     move-object/from16 v15, v16
@@ -161,13 +149,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
 
     return-void
-
-    :cond_0
-    const-string v0, "url"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$1.smali
index 36b32c5210..89a8ceccad 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$1.smali
@@ -41,7 +41,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
@@ -55,7 +55,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/WidgetUrlActions$onViewCreated$1;->this$0:Lcom/discord/widgets/chat/WidgetUrlActions;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$2.smali
index f76bade1d5..cb676a84bd 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$2.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
index a8a87404fe..18a1fa1c9b 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
@@ -45,7 +45,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions$onViewCreated$3;->this$0:Lcom/discord/widgets/chat/WidgetUrlActions;
 
@@ -55,7 +55,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/WidgetUrlActions$onViewCreated$3;->this$0:Lcom/discord/widgets/chat/WidgetUrlActions;
 
-    const v2, 0x7f120776
+    const v2, 0x7f120778
 
     invoke-virtual {v1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -63,7 +63,7 @@
 
     const-string v2, "getString(R.string.form_label_send_to)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0, v1}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$url$2.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$url$2.smali
index bc35e8976b..151819d6b3 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$url$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$url$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/WidgetUrlActions$url$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUrlActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
index 5d19764e54..0376b14858 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
@@ -39,81 +39,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/WidgetUrlActions;
 
-    const-class v2, Lcom/discord/widgets/chat/WidgetUrlActions;
+    const-string/jumbo v2, "urlTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUrlTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "urlTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUrlTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/WidgetUrlActions;
 
-    const/4 v2, 0x0
+    const-string v2, "copyBtn"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCopyBtn()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/WidgetUrlActions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "copyBtn"
-
-    const-string v4, "getCopyBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/WidgetUrlActions;
 
-    const-class v2, Lcom/discord/widgets/chat/WidgetUrlActions;
+    const-string v2, "openBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOpenBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "openBtn"
-
-    const-string v4, "getOpenBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/WidgetUrlActions;
 
-    const-class v2, Lcom/discord/widgets/chat/WidgetUrlActions;
+    const-string v2, "shareBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getShareBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "shareBtn"
-
-    const-string v4, "getShareBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -137,7 +113,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a02e8
+    const v0, 0x7f0a02ee
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -145,7 +121,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->urlTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02e5
+    const v0, 0x7f0a02eb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +129,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->copyBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02e6
+    const v0, 0x7f0a02ec
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +137,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->openBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02e7
+    const v0, 0x7f0a02ed
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -377,9 +353,11 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -424,13 +402,4 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$1.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$1.smali
index da9660708f..9185d61735 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/AppFlexInputViewModel$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AppFlexInputViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/AppFlexInputViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStoreState"
+
+    const-string v5, "handleStoreState(Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState(Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;->access$handleStoreState(Lcom/discord/widgets/chat/input/AppFlexInputViewModel;Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1$1.smali
index 16e02e5b74..3e4ccd9c97 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1$1.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/panels/PanelState;",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/stores/StoreNotices$Notice;",
+        "Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -60,11 +65,11 @@
 
     const-string v0, "leftPanelState"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "rightPanelState"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1$1;->$channel:Lcom/discord/models/domain/ModelChannel;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1.smali
index 3c86c54bae..a6fdfd7a2c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "AppFlexInputViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;",
             ">;"
         }
diff --git a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory.smali
index a3e30e1895..448b2a07d2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory.smali
@@ -49,13 +49,13 @@
 
     sget-object v1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1;->INSTANCE:Lcom/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory$observeStores$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n          .g\u2026            }\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -74,7 +74,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
 
@@ -102,26 +104,17 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$FlexInputViewModelFactory;->observeStores()Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
-    const/4 v4, 0x4
+    const/4 v5, 0x4
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    move-object v0, p1
+    move-object v1, p1
 
-    move-object v1, v9
+    move-object v2, v9
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;-><init>(Lcom/lytefast/flexinput/viewmodel/FlexInputState;Lrx/Observable;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;-><init>(Lcom/lytefast/flexinput/viewmodel/FlexInputState;Lrx/Observable;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$StoreState.smali
index fe053fe60e..9f43ba6c13 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel$StoreState.smali
@@ -30,11 +30,13 @@
 .method public constructor <init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Lcom/discord/stores/StoreNotices$Notice;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "rightPanelState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,20 +51,6 @@
     iput-object p5, p0, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;->notice:Lcom/discord/stores/StoreNotices$Notice;
 
     return-void
-
-    :cond_0
-    const-string p1, "rightPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "leftPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Lcom/discord/stores/StoreNotices$Notice;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;
@@ -175,11 +163,13 @@
 .method public final copy(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Lcom/discord/stores/StoreNotices$Notice;)Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "rightPanelState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;
 
@@ -198,20 +188,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Lcom/discord/stores/StoreNotices$Notice;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "rightPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "leftPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -229,7 +205,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;->leftPanelState:Lcom/discord/panels/PanelState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -239,7 +215,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;->rightPanelState:Lcom/discord/panels/PanelState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -249,7 +225,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;->selectedChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -259,7 +235,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;->channelPermission:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -269,7 +245,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;->notice:Lcom/discord/stores/StoreNotices$Notice;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
index 496185a92d..00747054f1 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "AppFlexInputViewModel.kt"
 
 # interfaces
@@ -16,7 +16,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/lytefast/flexinput/viewmodel/FlexInputState;",
         ">;",
         "Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;"
@@ -40,7 +40,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/viewmodel/FlexInputState;Lrx/Observable;Lcom/discord/stores/StoreAnalytics;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -53,15 +53,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "initialViewState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeObservable"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    const-string v0, "storeAnalytics"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p3, p0, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;->storeAnalytics:Lcom/discord/stores/StoreAnalytics;
 
@@ -81,15 +85,23 @@
 
     const-string p2, "storeObservable\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
+
+    new-instance v6, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$1;-><init>(Lcom/discord/widgets/chat/input/AppFlexInputViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -97,40 +109,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel$1;-><init>(Lcom/discord/widgets/chat/input/AppFlexInputViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "initialViewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/lytefast/flexinput/viewmodel/FlexInputState;Lrx/Observable;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -163,7 +148,7 @@
 .method private final handleStoreState(Lcom/discord/widgets/chat/input/AppFlexInputViewModel$StoreState;)V
     .locals 10
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -185,7 +170,7 @@
 
     sget-object v4, Lcom/discord/panels/PanelState$a;->a:Lcom/discord/panels/PanelState$a;
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -203,7 +188,7 @@
 
     sget-object v6, Lcom/discord/panels/PanelState$a;->a:Lcom/discord/panels/PanelState$a;
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -328,7 +313,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -368,7 +353,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -407,7 +392,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     const/4 v0, 0x1
 
@@ -433,7 +418,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -452,7 +437,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -476,9 +461,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "attachments"
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -506,18 +493,9 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCameraButtonClicked()V
@@ -525,7 +503,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -543,7 +521,7 @@
 
     new-instance v1, Lf/b/a/f/a$d;
 
-    const v2, 0x7f1203b8
+    const v2, 0x7f1203b9
 
     invoke-direct {v1, v2}, Lf/b/a/f/a$d;-><init>(I)V
 
@@ -580,7 +558,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -593,7 +571,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;->showKeyboard()V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -621,7 +599,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -631,7 +609,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -661,7 +639,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     if-eqz p1, :cond_2
 
@@ -709,7 +687,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -737,7 +715,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -747,7 +725,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -789,7 +767,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -809,7 +787,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -825,7 +803,7 @@
 
     new-instance v1, Lf/b/a/f/a$d;
 
-    const v2, 0x7f1203b8
+    const v2, 0x7f1203b9
 
     invoke-direct {v1, v2}, Lf/b/a/f/a$d;-><init>(I)V
 
@@ -862,48 +840,43 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
 
 .method public onInputTextAppended(Ljava/lang/String;)V
-    .locals 3
+    .locals 2
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "appendText"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/lang/StringBuilder;
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lcom/lytefast/flexinput/viewmodel/FlexInputState;
+    check-cast v1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;
 
-    iget-object v2, v2, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->a:Ljava/lang/String;
+    iget-object v1, v1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->a:Ljava/lang/String;
 
-    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p0, p1, v0, v1, v0}, Lf/h/a/c/i1/e;->g1(Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;Ljava/lang/String;Ljava/lang/Boolean;ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    invoke-static {p0, p1, v1, v0, v1}, Lf/h/a/c/i1/e;->g1(Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;Ljava/lang/String;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "appendText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onInputTextChanged(Ljava/lang/String;Ljava/lang/Boolean;)V
@@ -911,9 +884,11 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_4
+    const-string v0, "inputText"
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -923,7 +898,7 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -936,7 +911,7 @@
     :cond_0
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -996,18 +971,9 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "inputText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onInputTextClicked()Z
@@ -1017,7 +983,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;->showKeyboard()V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1045,7 +1011,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     const/4 v0, 0x0
 
@@ -1057,7 +1023,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1085,7 +1051,7 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    sget-object v4, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v4, Lk0/j/n;->d:Lk0/j/n;
 
     const/4 v5, 0x0
 
@@ -1105,7 +1071,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -1126,7 +1092,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "button"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
@@ -1149,21 +1117,12 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "button"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final showKeyboardAndHideExpressionTray()V
     .locals 10
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1191,7 +1150,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;->showKeyboard()V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/MentionUtilsKt.smali b/com.discord/smali/com/discord/widgets/chat/input/MentionUtilsKt.smali
index 9d15d42ab1..14cb4293ba 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/MentionUtilsKt.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/MentionUtilsKt.smali
@@ -87,45 +87,47 @@
 .method public static final getSelectedToken(Ljava/lang/String;I)Ljava/lang/String;
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "content"
 
-    if-eqz p0, :cond_8
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    if-eqz v1, :cond_1
+    const/4 v3, 0x0
 
-    return-object v0
+    if-eqz v0, :cond_1
+
+    return-object v3
 
     :cond_1
     invoke-virtual {p0}, Ljava/lang/String;->length()I
 
-    move-result v1
+    move-result v0
 
-    if-ne p1, v1, :cond_2
+    if-ne p1, v0, :cond_2
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_1
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
     if-eqz p1, :cond_4
@@ -154,28 +156,28 @@
     const/4 v4, 0x1
 
     :goto_3
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
     if-eqz v4, :cond_5
 
-    return-object v0
+    return-object v3
 
     :cond_5
-    const/16 v1, 0x20
+    const/16 v0, 0x20
 
-    invoke-static {p0, v1, p1}, Lcom/discord/widgets/chat/input/MentionUtilsKt;->reverseIndexOf(Ljava/lang/String;CI)I
+    invoke-static {p0, v0, p1}, Lcom/discord/widgets/chat/input/MentionUtilsKt;->reverseIndexOf(Ljava/lang/String;CI)I
 
-    move-result v1
+    move-result v0
 
-    add-int/2addr v1, v3
+    add-int/2addr v0, v2
 
-    invoke-virtual {p0, v1, p1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {p0, v0, p1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object p0
 
     const-string p1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
 
@@ -183,22 +185,15 @@
 
     if-lez p1, :cond_6
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :cond_6
-    if-eqz v2, :cond_7
+    if-eqz v1, :cond_7
 
-    move-object v0, p0
+    move-object v3, p0
 
     :cond_7
-    return-object v0
-
-    :cond_8
-    const-string p0, "content"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v3
 .end method
 
 .method public static final reverseIndexOf(Ljava/lang/String;CI)I
diff --git a/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali b/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali
index 0b18312be2..96fc4a435f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/SourcedAttachment.smali
@@ -33,50 +33,35 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "displayName"
 
-    if-eqz p6, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "source"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p5}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
 
     iput-object p6, p0, Lcom/discord/widgets/chat/input/SourcedAttachment;->source:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "displayName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Landroid/os/Parcel;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_3
+    const-string v0, "parcelIn"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readLong()J
 
-    move-result-wide v1
+    move-result-wide v2
 
     const-class v0, Landroid/net/Uri;
 
@@ -97,18 +82,18 @@
     :cond_0
     sget-object v0, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
-    const-string v3, "Uri.EMPTY"
+    const-string v1, "Uri.EMPTY"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
-    move-object v3, v0
+    move-object v4, v0
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
     move-result-object v0
 
-    const-string v4, ""
+    const-string v1, ""
 
     if-eqz v0, :cond_1
 
@@ -117,9 +102,13 @@
     goto :goto_1
 
     :cond_1
-    move-object v5, v4
+    move-object v5, v1
 
     :goto_1
+    const-string v0, "parcelIn.readString() ?: \"\""
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v6, 0x0
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
@@ -128,32 +117,21 @@
 
     if-eqz p1, :cond_2
 
+    move-object v7, p1
+
     goto :goto_2
 
     :cond_2
-    move-object p1, v4
+    move-object v7, v1
 
     :goto_2
-    move-object v0, p0
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v4, v5
+    move-object v1, p0
 
-    move-object v5, v6
-
-    move-object v6, p1
-
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/input/SourcedAttachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/input/SourcedAttachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "parcelIn"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Lcom/lytefast/flexinput/model/Attachment;Ljava/lang/String;)V
@@ -168,11 +146,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "attachment"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/model/Attachment;->getId()J
 
@@ -197,20 +177,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/input/SourcedAttachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "attachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -224,7 +190,7 @@
 .end method
 
 .method public writeToParcel(Landroid/os/Parcel;I)V
-    .locals 0
+    .locals 1
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "MissingSuperCall"
@@ -234,7 +200,9 @@
     .annotation build Landroidx/annotation/CallSuper;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "dest"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/lytefast/flexinput/model/Attachment;->writeToParcel(Landroid/os/Parcel;I)V
 
@@ -243,13 +211,4 @@
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "dest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$1.smali
index 11205cc4a7..a1cc916840 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$1.smali
@@ -49,7 +49,7 @@
 
     const-string v1, "model.channel"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -59,7 +59,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -67,7 +67,7 @@
 
     const-string v1, "model.channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$2.smali
index 8161bebf0f..aa066116fa 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$2.smali
@@ -49,7 +49,7 @@
 
     const-string v1, "model.channel"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -59,7 +59,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -67,7 +67,7 @@
 
     const-string v1, "model.channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$lurkGuild$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$lurkGuild$1.smali
index e78949454f..8fbc1552a2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$lurkGuild$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$configureUI$lurkGuild$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInput$configureUI$lurkGuild$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -75,7 +77,7 @@
 
     const-string v1, "model.channel"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -83,7 +85,7 @@
 
     const-string v1, "model.channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -92,13 +94,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreLurking;->joinGuild(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.smali
index 3b2934751a..f0c7d9b510 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/lytefast/flexinput/fragment/FlexInputFragment;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a020b
+    const v1, 0x7f0a020e
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
@@ -67,11 +67,11 @@
     return-object v0
 
     :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.lytefast.flexinput.fragment.FlexInputFragment"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.smali
index d014ab7dca..2bebd64431 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInput$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1.smali
index 1cd41f0b22..ad402941e3 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChatInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/WidgetChatInputModel;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/WidgetChatInput;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/chat/input/WidgetChatInputModel;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/WidgetChatInput;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/chat/input/WidgetChatInputModel;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/WidgetChatInputModel;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$2.smali
index b9ec66fdf2..5af883b062 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$sam$android_view_View_OnClickListener$0.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$sam$android_view_View_OnClickListener$0.smali
index 0e859b32eb..8a6e47209c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$sam$android_view_View_OnClickListener$0.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$sam$android_view_View_OnClickListener$0.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$1.smali
index c4b99030ea..84bc76ade9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$1.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$2.smali
index 271ad25d74..4a08414a09 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$2.smali
@@ -41,11 +41,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$2;->$shouldApplyWindowInsets:Z
 
@@ -81,7 +83,7 @@
 
     const-string v0, "WindowInsetsCompat.Build\u2026        )\n      ).build()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$2;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInput;
 
@@ -104,18 +106,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1$1.smali
index d23603f2b9..db1dd16e40 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatInput.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Void;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.smali
index d73ab4eb31..2a81d0b1a6 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     const-string v2, "container.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v10, v1}, Lf/a/l/d;-><init>(Landroid/content/Context;)V
 
@@ -102,19 +102,19 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    invoke-virtual {v2}, Lcom/discord/app/AppFragment;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {v2}, Lcom/discord/app/AppFragment;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v2
 
     sget-object v3, Lcom/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1$1;->INSTANCE:Lcom/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1$1;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v9
 
-    const-string v2, "paused.map { Unit }"
+    const-string/jumbo v2, "unsubscribeSignal.map { Unit }"
 
-    invoke-static {v9, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -139,7 +139,7 @@
     :cond_0
     const-string v0, "expressionBtn"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
index 0c1a6f1378..9c17a044d2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
@@ -58,221 +58,155 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const/4 v2, 0x0
+    const-string v2, "chatInputWrap"
 
-    aput-object v1, v0, v2
+    const-string v3, "getChatInputWrap()Landroid/view/ViewGroup;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "chatInputWrap"
-
-    const-string v4, "getChatInputWrap()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatInputWidget"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatInputWidget()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatInputWidget"
-
-    const-string v4, "getChatInputWidget()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatInputMentionsRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatInputMentionsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatInputMentionsRecycler"
-
-    const-string v4, "getChatInputMentionsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatInputEdit"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatInputEdit()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatInputEdit"
-
-    const-string v4, "getChatInputEdit()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatInputEditCancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatInputEditCancel()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatInputEditCancel"
-
-    const-string v4, "getChatInputEditCancel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatGuard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatGuard()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatGuard"
-
-    const-string v4, "getChatGuard()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatGuardText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatGuardText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatGuardText"
-
-    const-string v4, "getChatGuardText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatGuardSubtext"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatGuardSubtext()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatGuardSubtext"
-
-    const-string v4, "getChatGuardSubtext()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatGuardAction"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatGuardAction()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatGuardAction"
-
-    const-string v4, "getChatGuardAction()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/WidgetChatInput;
 
-    const-class v2, Lcom/discord/widgets/chat/input/WidgetChatInput;
+    const-string v2, "chatGuardActionSecondary"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatGuardActionSecondary()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatGuardActionSecondary"
-
-    const-string v4, "getChatGuardActionSecondary()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
@@ -288,7 +222,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a01f7
+    const v0, 0x7f0a01fa
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -296,7 +230,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a020c
+    const v0, 0x7f0a020f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -304,7 +238,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a020b
+    const v0, 0x7f0a020e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -312,7 +246,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputWidget$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0208
+    const v0, 0x7f0a020b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -320,7 +254,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputMentionsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01f8
+    const v0, 0x7f0a01fb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -328,7 +262,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputEdit$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01fa
+    const v0, 0x7f0a01fd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -336,7 +270,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputEditCancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01fd
+    const v0, 0x7f0a0200
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -344,7 +278,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0201
+    const v0, 0x7f0a0204
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -352,7 +286,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuardText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0200
+    const v0, 0x7f0a0203
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -360,7 +294,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuardSubtext$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01fe
+    const v0, 0x7f0a0201
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -368,7 +302,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuardAction$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ff
+    const v0, 0x7f0a0202
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -398,43 +332,49 @@
 
     sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v1, 0x0
+    const-string v1, "logger"
 
-    if-eqz v0, :cond_4
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
+    sget-object v1, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
 
-    if-eqz v2, :cond_0
+    const/4 v2, 0x0
 
-    invoke-virtual {v2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+    if-eqz v1, :cond_0
 
-    move-result-object v2
+    invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
-    check-cast v2, Lf/a/c/a;
+    move-result-object v1
+
+    check-cast v1, Lf/a/c/a;
 
     goto :goto_0
 
     :cond_0
-    move-object v2, v1
+    move-object v1, v2
 
     :goto_0
-    if-nez v2, :cond_1
+    if-nez v1, :cond_1
 
-    new-instance v2, Lf/a/c/a;
+    new-instance v1, Lf/a/c/a;
 
-    invoke-direct {v2, v0}, Lf/a/c/a;-><init>(Lcom/discord/utilities/logging/Logger;)V
+    invoke-direct {v1, v0}, Lf/a/c/a;-><init>(Lcom/discord/utilities/logging/Logger;)V
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
-    invoke-direct {v0, v2}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
     sput-object v0, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
 
     :cond_1
-    move-object v7, v2
+    move-object v7, v1
 
     sget-object v0, Lcom/discord/tooltips/TooltipManager$a;->d:Lcom/discord/tooltips/TooltipManager$a;
 
+    const-string v0, "floatingViewManager"
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object v0, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
 
     if-eqz v0, :cond_2
@@ -443,14 +383,14 @@
 
     move-result-object v0
 
-    move-object v1, v0
+    move-object v2, v0
 
-    check-cast v1, Lcom/discord/tooltips/TooltipManager;
+    check-cast v2, Lcom/discord/tooltips/TooltipManager;
 
     :cond_2
-    if-nez v1, :cond_3
+    if-nez v2, :cond_3
 
-    new-instance v1, Lcom/discord/tooltips/TooltipManager;
+    new-instance v2, Lcom/discord/tooltips/TooltipManager;
 
     sget-object v0, Lcom/discord/tooltips/TooltipManager$a;->b:Lkotlin/Lazy;
 
@@ -476,27 +416,20 @@
 
     const/4 v8, 0x4
 
-    move-object v3, v1
+    move-object v3, v2
 
     invoke-direct/range {v3 .. v8}, Lcom/discord/tooltips/TooltipManager;-><init>(Lf/a/l/a;Ljava/util/Set;ILf/a/c/a;I)V
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
-    invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v2}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
     sput-object v0, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
 
     :cond_3
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->tooltipManager:Lcom/discord/tooltips/TooltipManager;
+    iput-object v2, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->tooltipManager:Lcom/discord/tooltips/TooltipManager;
 
     return-void
-
-    :cond_4
-    const-string v0, "logger"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final synthetic access$configureUI(Lcom/discord/widgets/chat/input/WidgetChatInput;Lcom/discord/widgets/chat/input/WidgetChatInputModel;)V
@@ -727,7 +660,7 @@
     goto :goto_4
 
     :cond_8
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -755,7 +688,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f12155c
+    const v4, 0x7f121586
 
     invoke-virtual {v1, v4}, Landroid/widget/TextView;->setText(I)V
 
@@ -763,7 +696,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f12155d
+    const v4, 0x7f121587
 
     invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -788,9 +721,9 @@
     :cond_c
     iget-boolean v1, p1, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->isLurking:Z
 
-    const v4, 0x7f120841
+    const v4, 0x7f120843
 
-    const v5, 0x7f1206bc
+    const v5, 0x7f1206be
 
     if-eqz v1, :cond_e
 
@@ -800,7 +733,7 @@
 
     iget-boolean v6, p1, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->shouldShowFollow:Z
 
-    const v7, 0x7f120e66
+    const v7, 0x7f120e8c
 
     if-eqz v6, :cond_d
 
@@ -857,7 +790,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f120e67
+    const v5, 0x7f120e8d
 
     invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(I)V
 
@@ -982,7 +915,7 @@
 
     const-string v4, "model.inputHint"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v3}, Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;->setHint(Ljava/lang/CharSequence;)V
 
@@ -1023,14 +956,14 @@
     return-void
 
     :cond_12
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_13
     const-string p1, "chatAttachments"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -1306,7 +1239,7 @@
 
     if-eqz v3, :cond_1
 
-    invoke-static {v3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
@@ -1390,7 +1323,7 @@
     :cond_3
     const-string v0, "chatAttachments"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1486,7 +1419,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-wide v2, p1
 
@@ -1532,7 +1465,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026putViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
 
@@ -1582,7 +1515,7 @@
 
     const-string v0, "context ?: return"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -1590,7 +1523,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rest/SendUtils;->INSTANCE:Lcom/discord/utilities/rest/SendUtils;
 
@@ -1632,9 +1565,9 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120ee1
+    const v3, 0x7f120f07
 
     invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1660,7 +1593,7 @@
 
     aput-object v5, v4, v6
 
-    const v5, 0x7f120ee0
+    const v5, 0x7f120f06
 
     invoke-virtual {v0, v5, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1668,9 +1601,9 @@
 
     const-string v5, "getString(\n            R\u2026xCharacterCount\n        )"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1706,9 +1639,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1716,12 +1649,14 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/WidgetChatInput;->getFlexInputFragment()Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p1, v1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
+    invoke-direct {p1, v0}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatAttachments:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_0
 
     invoke-virtual {p1, p0}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->configureFlexInputFragment(Lcom/discord/app/AppFragment;)V
@@ -1757,14 +1692,7 @@
     :cond_0
     const-string p1, "chatAttachments"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -1800,7 +1728,7 @@
 
     const-string v1, "WidgetChatInputModel\n        .get(context)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -1875,14 +1803,14 @@
     :cond_2
     const-string v0, "flexInputViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_3
     const-string v0, "chatAttachments"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment.smali
index 867853dd6c..4139b668c2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordFilesFragment.smali
@@ -28,7 +28,9 @@
 .method public newPermissionsRequestAdapter(Landroid/view/View$OnClickListener;)Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter;
 
@@ -39,13 +41,4 @@
     invoke-direct {v0, v1, v2, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter;-><init>(IILandroid/view/View$OnClickListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordPhotosFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordPhotosFragment.smali
index 87bb2df252..a49187ea06 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordPhotosFragment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordPhotosFragment.smali
@@ -28,7 +28,9 @@
 .method public newPermissionsRequestAdapter(Landroid/view/View$OnClickListener;)Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter;
 
@@ -39,13 +41,4 @@
     invoke-direct {v0, v1, v2, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter;-><init>(IILandroid/view/View$OnClickListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 58370b9574..f771505b39 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
@@ -16,7 +16,7 @@
 
 # direct methods
 .method public constructor <init>(IILandroid/view/View$OnClickListener;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
@@ -26,20 +26,13 @@
         .end annotation
     .end param
 
-    if-eqz p3, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;-><init>(IILandroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -57,7 +50,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;
 
@@ -65,7 +60,7 @@
 
     iget-object p2, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a06b3
+    const v0, 0x7f0a06b9
 
     invoke-virtual {p2, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -73,22 +68,13 @@
 
     check-cast p2, Lcom/discord/app/AppTextView;
 
-    const v0, 0x7f121596
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    new-array v0, v0, [Ljava/lang/Object;
 
-    new-array v1, v1, [Ljava/lang/Object;
+    const v1, 0x7f1215c0
 
-    invoke-virtual {p2, v0, v1}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
+    invoke-virtual {p2, v1, v0}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$addExternalAttachment$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$addExternalAttachment$1.smali
index badcf8a05b..b1ded393ee 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$addExternalAttachment$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$addExternalAttachment$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$addExternalAttachment$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputAttachments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.smali
index 67e4880b81..c39b572a83 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.smali
@@ -41,7 +41,9 @@
 .method public requestDisplay(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1;
 
@@ -50,15 +52,6 @@
     invoke-virtual {v0, p1}, Lcom/discord/app/AppFragment;->showKeyboard(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public requestHide()V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.smali
index 605073f19a..8811616962 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputAttachments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/core/view/inputmethod/InputContentInfoCompat;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroidx/core/view/inputmethod/InputContentInfoCompat;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1;
 
@@ -83,18 +85,9 @@
 
     const-string v2, "inputEt.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->access$setAttachmentFromPicker(Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;Landroid/content/Context;Landroidx/core/view/inputmethod/InputContentInfoCompat;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
index d4f1fbc0a6..7dbbf2218a 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputAttachments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     new-instance v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$1;
 
-    const v3, 0x7f080320
+    const v3, 0x7f080321
 
     const v4, 0x7f12024e
 
@@ -86,7 +86,7 @@
 
     new-instance v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$2;
 
-    const v4, 0x7f0802cc
+    const v4, 0x7f0802cd
 
     const v5, 0x7f12024d
 
@@ -98,9 +98,9 @@
 
     new-instance v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$3;
 
-    const v4, 0x7f08020c
+    const v4, 0x7f08020d
 
-    const v5, 0x7f120390
+    const v5, 0x7f120391
 
     invoke-direct {v2, v4, v5}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$1$3;-><init>(II)V
 
@@ -108,6 +108,14 @@
 
     aput-object v2, v1, v4
 
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_3
+
+    const-string v4, "pageSuppliers"
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object v1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->x:[Lf/b/a/c/d$a;
 
     iget-object v1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1;->$fragment:Lcom/discord/app/AppFragment;
@@ -116,9 +124,9 @@
 
     move-result-object v1
 
-    const/4 v2, 0x0
+    const-string v4, "<set-?>"
 
-    if-eqz v1, :cond_4
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->v:Lcom/lytefast/flexinput/managers/FileManager;
 
@@ -150,7 +158,9 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_3
+    const-string v4, "previewAdapter"
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, v1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
@@ -178,7 +188,7 @@
 
     const-string v5, "fragment.childFragmentManager"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->o()Lcom/lytefast/flexinput/widget/FlexEditText;
 
@@ -229,28 +239,17 @@
     :cond_1
     const-string v0, "expressionBtn"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_2
     const-string v0, "attachmentPreviewList"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_3
-    const-string v0, "previewAdapter"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_4
-    const-string v0, "<set-?>"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali
index 8175c74f4e..de3d5e2437 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali
@@ -46,21 +46,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;
@@ -99,5 +85,19 @@
     const/4 v0, 0x0
 
     :goto_1
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.smali
index 2e062f4618..c86c1d0a7d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputAttachments.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.smali
index e80b228dcb..c196188d79 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1.smali
@@ -42,7 +42,9 @@
 .method public onEmojiPicked(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;
 
@@ -56,7 +58,13 @@
 
     const-string v1, "emoji.chatInputText"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz v0, :cond_1
+
+    const-string v1, "emojiText"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->y:Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;
 
@@ -82,10 +90,6 @@
     return-void
 
     :cond_1
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 p1, 0x0
 
     throw p1
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali
index 7dea87a870..b857ee30c5 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1.smali
@@ -27,6 +27,13 @@
 
 # instance fields
 .field public final synthetic $$delegate_0:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
 
 .field public final synthetic $oldItemSelectionListener:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
@@ -65,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;
 
@@ -76,15 +85,6 @@
     invoke-interface {v0, p1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;->onItemSelected(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onItemSelected(Ljava/lang/Object;)V
@@ -105,22 +105,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;->$$delegate_0:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     invoke-interface {v0, p1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;->onItemUnselected(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onItemUnselected(Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1.smali
index a2269f122e..c27cc0c5d1 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->invoke(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;
+    value = Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->invoke(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -71,7 +71,7 @@
 .end method
 
 .method private final track(Lcom/lytefast/flexinput/model/Attachment;)V
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;)V"
@@ -96,46 +96,44 @@
     const-string v0, "media_picker"
 
     :goto_0
-    const/4 v1, 0x0
-
     :try_start_0
+    iget-object v1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;
+
+    iget-object v1, v1, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;
+
+    invoke-static {v1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->access$getFlexInputFragment$p(Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getSize()I
+
+    move-result v1
+
     iget-object v2, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;
 
-    iget-object v2, v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;
+    iget-object v2, v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->$context:Landroid/content/Context;
 
-    invoke-static {v2}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->access$getFlexInputFragment$p(Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;)Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getSize()I
-
-    move-result v2
-
-    iget-object v3, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;
-
-    iget-object v3, v3, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->$context:Landroid/content/Context;
-
-    if-eqz v3, :cond_1
-
-    invoke-virtual {v3}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
-
-    move-result-object v3
-
     goto :goto_1
 
     :cond_1
-    move-object v3, v1
+    const/4 v2, 0x0
 
     :goto_1
-    invoke-static {p1, v3}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
+    invoke-static {p1, v2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {v0, p1, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->addAttachment(Ljava/lang/String;Ljava/lang/String;I)V
+    invoke-static {v0, p1, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->addAttachment(Ljava/lang/String;Ljava/lang/String;I)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -146,11 +144,9 @@
 
     sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x4
+    const-string v1, "Analytic error on attachment update"
 
-    const-string v3, "Analytic error on attachment update"
-
-    invoke-virtual {v0, v3, v2, p1, v1}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_2
     return-void
@@ -168,7 +164,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "selectionCoordinator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinatorInternal(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
@@ -178,16 +176,11 @@
 
     invoke-direct {v1, p0, v0}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;-><init>(Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;)V
 
+    const-string v0, "<set-?>"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     return-void
-
-    :cond_0
-    const-string p1, "selectionCoordinator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali
index 8784ed32a2..b8b280a5b4 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputAttachments.kt"
 
 # interfaces
@@ -18,12 +18,12 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter<",
         "TT;>;",
-        "Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;",
-        ">;"
+        "Lcom/lytefast/flexinput/utils/SelectionAggregator<",
+        "TT;>;>;"
     }
 .end annotation
 
@@ -44,40 +44,34 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;
+.method public final invoke(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter<",
             "TT;>;)",
-            "Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;"
+            "Lcom/lytefast/flexinput/utils/SelectionAggregator<",
+            "TT;>;"
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "previewAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;
 
     invoke-direct {v0, p0, p1, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;-><init>(Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "previewAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -85,7 +79,7 @@
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->invoke(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1$1;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1;->invoke(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p1
 
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 10517eaf52..87efb57264 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
@@ -19,24 +19,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "flexInputFragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->flexInputFragment:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     return-void
-
-    :cond_0
-    const-string p1, "flexInputFragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$createAndConfigureExpressionFragment(Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;Landroidx/fragment/app/FragmentManager;Landroid/widget/TextView;)Landroidx/fragment/app/Fragment;
@@ -86,7 +79,7 @@
 
     invoke-direct {v1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1;-><init>(Landroid/widget/TextView;)V
 
-    const p2, 0x7f0a03b8
+    const p2, 0x7f0a03be
 
     invoke-virtual {p1, p2}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
@@ -168,7 +161,7 @@
 
     const-string v1, "context.getString(R.stri\u2026achment_filename_unknown)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/lytefast/flexinput/model/Attachment;->Companion:Lcom/lytefast/flexinput/model/Attachment$Companion;
 
@@ -206,7 +199,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "attachment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->flexInputFragment:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -217,21 +212,14 @@
     invoke-virtual {v0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->n(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final configureFlexInputFragment(Lcom/discord/app/AppFragment;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->flexInputFragment:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -250,33 +238,26 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/app/AppFragment;->setOnBackPressed(Lrx/functions/Func0;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setInputListener(Lcom/lytefast/flexinput/InputListener;)V
-    .locals 1
+    .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "inputListener"
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->flexInputFragment:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->u:Lcom/lytefast/flexinput/InputListener;
+    iget-object v1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->flexInputFragment:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->u:Lcom/lytefast/flexinput/InputListener;
 
     return-void
 
     :cond_0
-    const-string p1, "inputListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 p1, 0x0
 
     throw p1
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item.smali
index 047a52129a..1585445ce7 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item.smali
@@ -52,7 +52,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0202
+    const v0, 0x7f0a0205
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -64,7 +64,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0207
+    const v0, 0x7f0a020a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -76,7 +76,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0205
+    const v0, 0x7f0a0208
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -88,7 +88,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0206
+    const v0, 0x7f0a0209
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -100,7 +100,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0203
+    const v0, 0x7f0a0206
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
index 4b998b0e50..2ded27bd71 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
@@ -688,7 +688,7 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v1, p2}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v1, p2}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -701,7 +701,7 @@
     move-result-object v2
 
     :cond_0
-    invoke-static {v1, p1}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v1, p1}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -776,7 +776,7 @@
 
     invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    const-string v2, "unflip"
+    const-string/jumbo v2, "unflip"
 
     const-string/jumbo v3, "\u252c\u2500\u252c \u30ce( \u309c-\u309c\u30ce)"
 
@@ -847,7 +847,7 @@
 
     sget-object p1, Lf/a/o/b/a/b;->d:Lf/a/o/b/a/b;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -910,9 +910,9 @@
 
     sget-object p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsModel;->EMPTY:Ljava/util/List;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 
@@ -927,7 +927,7 @@
 
     sget-object v1, Lf/a/o/b/a/a;->d:Lf/a/o/b/a/a;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -939,7 +939,7 @@
 
     invoke-direct {v1, p0}, Lf/a/o/b/a/f;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -976,13 +976,13 @@
 
     sget-object v2, Lf/a/o/b/a/m;->d:Lf/a/o/b/a/m;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v2, Lf/a/o/b/a/f0;->d:Lf/a/o/b/a/f0;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1030,11 +1030,11 @@
 
     invoke-direct {v4, v6, v7, v5}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v5, Lr0/l/a/u;
+    new-instance v5, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v5, v0, v4}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v5, v0, v4}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v5}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1054,11 +1054,11 @@
 
     invoke-direct {v5, v6, v7, v8}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v6, Lr0/l/a/u;
+    new-instance v6, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v6, v0, v5}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v6, v0, v5}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v6}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1080,11 +1080,11 @@
 
     invoke-direct {v6, v7, v8, v9}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v7, Lr0/l/a/u;
+    new-instance v7, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v7, v0, v6}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v7, v0, v6}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v7}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1354,7 +1354,7 @@
 
     sget-object v1, Lf/a/o/b/a/k;->d:Lf/a/o/b/a/k;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1362,13 +1362,13 @@
 
     invoke-direct {v1, p0}, Lf/a/o/b/a/j;-><init>(Landroid/content/Context;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     const-string v0, "observable"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -1556,9 +1556,9 @@
 
     move-result-object v1
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object v1, Lf/a/o/b/a/l;->a:Lf/a/o/b/a/l;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
index dc8f47acf4..e90daa9223 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
@@ -70,7 +70,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali
index 404954bbee..108ab005f4 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputEditText.smali
@@ -269,15 +269,17 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_0
+    const-string v3, "defaultValue"
 
-    sget-object v3, Lf/a/b/h0;->d:Lf/a/b/h0;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v4, Lf/a/b/i0;
+    sget-object v3, Lf/a/b/j0;->d:Lf/a/b/j0;
 
-    invoke-direct {v4, v2}, Lf/a/b/i0;-><init>(Lrx/Observable;)V
+    new-instance v4, Lf/a/b/k0;
 
-    invoke-static {v3, v1, v4}, Lf/a/b/q;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    invoke-direct {v4, v2}, Lf/a/b/k0;-><init>(Lrx/Observable;)V
+
+    invoke-static {v3, v1, v4}, Lf/a/b/s;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -285,7 +287,7 @@
 
     move-result-object v0
 
-    invoke-static {p1}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p1}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -301,23 +303,37 @@
 
     invoke-direct {v1, v0}, Lf/a/o/b/a/g0;-><init>(Lcom/discord/widgets/chat/input/WidgetChatInputMentions;)V
 
+    const-string v4, "mentionsData"
+
     const/4 v3, 0x0
 
-    new-instance v6, Lf/a/b/x;
+    const-string v0, "onNext"
 
-    invoke-direct {v6, v1}, Lf/a/b/x;-><init>(Lrx/functions/Action1;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "errorTag"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v6, Lf/a/b/z;
+
+    invoke-direct {v6, v1}, Lf/a/b/z;-><init>(Lrx/functions/Action1;)V
 
     const/4 v7, 0x0
 
-    const/4 v5, 0x0
+    const/4 v1, 0x0
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "observable"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v8, Lf/a/b/b0;->d:Lf/a/b/b0;
+    sget-object v8, Lf/a/b/d0;->d:Lf/a/b/d0;
 
-    const-string v4, "mentionsData"
+    move-object v5, v1
 
     invoke-static/range {v2 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
@@ -332,15 +348,6 @@
     invoke-static {p1, v0, v1}, Lcom/discord/stores/StoreGuilds$Actions;->requestMembers(Lcom/discord/app/AppComponent;Lrx/Observable;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "defaultValue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic d(Lcom/lytefast/flexinput/widget/FlexEditText;Ljava/lang/Integer;Ljava/lang/Integer;)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali
index 23b7c1c56a..9c03a4b67d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputMentions.smali
@@ -132,7 +132,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputMentions;->onPartialToken:Lrx/subjects/Subject;
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -152,7 +152,7 @@
 
     invoke-direct {v1, p0}, Lf/a/o/b/a/x;-><init>(Lcom/discord/widgets/chat/input/WidgetChatInputMentions;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -164,7 +164,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -912,7 +912,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputMentions;->onPartialToken:Lrx/subjects/Subject;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
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 45287c784b..2cd09262d8 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -211,7 +211,7 @@
 
     sget-object v1, Lf/a/o/b/a/c0;->d:Lf/a/o/b/a/c0;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -259,17 +259,17 @@
 
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v0, Lr0/l/a/u;
+    new-instance v0, Ls0/l/a/u;
 
     iget-object p0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v0, p0, p1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v0, p0, p1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -702,7 +702,7 @@
 
     const/4 p0, 0x0
 
-    invoke-static {v1, p0, v2}, Lf/a/b/q;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    invoke-static {v1, p0, v2}, Lf/a/b/s;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
 
     move-result-object p0
 
@@ -718,7 +718,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f1205c5
+    const p1, 0x7f1205c7
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -729,7 +729,7 @@
     :cond_0
     if-nez p3, :cond_1
 
-    const p1, 0x7f120fa2
+    const p1, 0x7f120fcc
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -742,7 +742,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1215b3
+    const p2, 0x7f1215dd
 
     invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -814,11 +814,11 @@
 
     invoke-direct {v4, v6, v7, v5}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v5, Lr0/l/a/u;
+    new-instance v5, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v5, v0, v4}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v5, v0, v4}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v5}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -897,7 +897,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f121794
+    const v0, 0x7f1217be
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -906,7 +906,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f12178b
+    const v0, 0x7f1217b5
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -943,7 +943,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f120bc7
+    const v0, 0x7f120bed
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -952,7 +952,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f120bc5
+    const v0, 0x7f120beb
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -967,7 +967,7 @@
     return-object p1
 
     :cond_2
-    const v0, 0x7f120bc4
+    const v0, 0x7f120bea
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -982,7 +982,7 @@
     return-object p1
 
     :cond_3
-    const v0, 0x7f120bc6
+    const v0, 0x7f120bec
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1$1.smali
index 5ccbd34c5f..2aee6a52f3 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputSend.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     const-string v2, "model.me"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
 
@@ -124,7 +124,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1.smali
index f9f895e205..c5bd72cb12 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputSend.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/utilities/messagesend/MessageResult;",
         "Lcom/discord/models/domain/ModelGuild;",
@@ -52,7 +52,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,9 @@
 .method public final invoke(Lcom/discord/utilities/messagesend/MessageResult;Lcom/discord/models/domain/ModelGuild;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "messageResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;
 
@@ -100,7 +102,7 @@
 
     const-string v2, "chatInputEdit.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$messageSendResultHandler$1$1;
 
@@ -110,13 +112,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "messageResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$onMessageTooLong$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$onMessageTooLong$1.smali
index 5f28548e88..7cda610c64 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$onMessageTooLong$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$onMessageTooLong$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$onMessageTooLong$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputSend.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Integer;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$1.smali
index d7cf24f08c..f0d90367e8 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputSend.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/MessageManager$MessageSendResult;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/chat/MessageManager$MessageSendResult;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "messageSendResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$1;->$messageSendResultHandler:Lkotlin/jvm/functions/Function2;
 
@@ -76,13 +78,4 @@
     invoke-interface {v0, v1, p1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "messageSendResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$2.smali
index e2c5dde81e..466a29d871 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$synchronousValidationSucceeded$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputSend.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -60,7 +60,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
index 6c7af9c933..6e1c8c4eb7 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputSend.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -62,7 +62,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -101,7 +101,9 @@
 
     move-object/from16 v4, p1
 
-    if-eqz v4, :cond_a
+    const-string v0, "attachments"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, v7, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
 
@@ -148,7 +150,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -198,7 +200,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v9}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -250,7 +252,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v10}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -258,7 +260,7 @@
 
     const-string v11, "chatInputEdit.context.contentResolver"
 
-    invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v9, v10}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeMegabytes(Landroid/net/Uri;Landroid/content/ContentResolver;)F
 
@@ -273,11 +275,11 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {v1}, Lj0/i/l;->sumOfFloat(Ljava/lang/Iterable;)F
+    invoke-static {v1}, Lk0/j/l;->sumOfFloat(Ljava/lang/Iterable;)F
 
     move-result v2
 
-    invoke-static {v1}, Lj0/i/l;->max(Ljava/lang/Iterable;)Ljava/lang/Float;
+    invoke-static {v1}, Lk0/j/l;->max(Ljava/lang/Iterable;)Ljava/lang/Float;
 
     move-result-object v1
 
@@ -345,13 +347,13 @@
 
     move-result-wide v12
 
-    invoke-static {v0, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage$Content;->getContent()Ljava/lang/String;
 
     move-result-object v14
 
-    invoke-static {v14, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v9, v1
 
@@ -366,13 +368,13 @@
     :cond_8
     iget-object v9, v7, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$messageManager:Lcom/discord/widgets/chat/MessageManager;
 
-    invoke-static {v0, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage$Content;->getContent()Ljava/lang/String;
 
     move-result-object v11
 
-    invoke-static {v11, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage$Content;->getMentions()Ljava/util/List;
 
@@ -461,13 +463,4 @@
     move-result v0
 
     return v0
-
-    :cond_a
-    const-string v0, "attachments"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2.smali
index b84490f371..116b9fa95f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputSend.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -85,7 +85,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali
index da6ac89ac2..2ea4ea6055 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3.smali
@@ -39,7 +39,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$3;->$sendMessage$1:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;
 
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->invoke(Ljava/util/List;)Z
 
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 596f418f44..a537188d29 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
@@ -69,7 +69,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
 
-    const p2, 0x7f120412
+    const p2, 0x7f120413
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
 
@@ -88,7 +88,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
 
@@ -100,7 +100,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
 
-    const p2, 0x7f1205e6
+    const p2, 0x7f1205e8
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
 
@@ -117,7 +117,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessage$1:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->invoke(Ljava/util/List;)Z
 
@@ -128,7 +128,7 @@
     :cond_2
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
 
-    const p2, 0x7f120fa2
+    const p2, 0x7f120fcc
 
     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/WidgetChatInputSend.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
index 1f44406f89..b943a87860 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
@@ -117,17 +117,25 @@
 
     move-object/from16 v12, p6
 
-    const/4 v1, 0x0
+    const-string v1, "chatInputWidget"
 
-    if-eqz v8, :cond_7
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v9, :cond_6
+    const-string v1, "chatInputEdit"
 
-    if-eqz v10, :cond_5
+    invoke-static {v9, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v11, :cond_4
+    const-string v1, "chatInputEditCancel"
 
-    if-eqz v0, :cond_3
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "model"
+
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "listener"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v7, :cond_2
 
@@ -143,7 +151,7 @@
 
     const-string v0, "chatInputEdit.context"
 
-    invoke-static {v14, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v15, 0x0
 
@@ -241,41 +249,6 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string v0, "listener"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    const-string v0, "model"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    const-string v0, "chatInputEditCancel"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    const-string v0, "chatInputEdit"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_7
-    const-string v0, "chatInputWidget"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method private final setText(Lcom/discord/widgets/chat/input/WidgetChatInputModel;Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$1.smali
index df784e37e4..6388b6bf1f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputTruncatedHint.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$addBindedTextWatcher$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$addBindedTextWatcher$1.smali
index 1396d37c5c..8ae2b332c9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$addBindedTextWatcher$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint$addBindedTextWatcher$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint$addBindedTextWatcher$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatInputTruncatedHint.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Landroid/text/Editable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint$addBindedTextWatcher$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;
 
     invoke-static {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;->access$syncHint(Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint.smali
index 3e149b1041..b6b6ce28ea 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputTruncatedHint.smali
@@ -17,7 +17,9 @@
 .method public constructor <init>(Lcom/lytefast/flexinput/widget/FlexEditText;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editText"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,15 +40,6 @@
     invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/widget/FlexEditText;->setOnMaxLinesChangedListener(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getHintIsTruncated$p(Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;)Z
@@ -158,7 +151,9 @@
 .method public final addBindedTextWatcher(Lcom/discord/app/AppFragment;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;->editText:Lcom/lytefast/flexinput/widget/FlexEditText;
 
@@ -169,15 +164,6 @@
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/view/text/TextWatcherKt;->addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getEditText()Lcom/lytefast/flexinput/widget/FlexEditText;
@@ -189,22 +175,15 @@
 .end method
 
 .method public final setHint(Ljava/lang/CharSequence;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "hint"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;->hint:Ljava/lang/CharSequence;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/WidgetChatInputTruncatedHint;->syncHint()V
 
     return-void
-
-    :cond_0
-    const-string p1, "hint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter$setItems$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter$setItems$1.smali
index b6f9f55b59..b35bb2f9d7 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter$setItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter$setItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter$setItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "EmojiCategoryAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,18 +73,20 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter$setItems$1;->this$0:Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter;->access$setItems$p(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter;Ljava/util/List;)V
 
-    const/4 v0, 0x0
-
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
@@ -133,13 +135,4 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.smali
index 51b39ec66f..aad07f2f3f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.smali
@@ -86,13 +86,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onCategoryClicked"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "onSelectedItemAdapterPositionUpdated"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "diffCreator"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -102,32 +106,11 @@
 
     iput-object p3, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "diffCreator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onSelectedItemAdapterPositionUpdated"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onCategoryClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/discord/utilities/recycler/DiffCreator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -267,7 +250,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder;I)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter;->items:Ljava/util/List;
 
@@ -307,15 +292,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -331,7 +307,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder;
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -341,23 +319,23 @@
 
     move-result-object v0
 
-    const/4 v1, 0x1
+    const-string v1, "itemView"
 
-    const-string v2, "itemView"
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    if-eq p2, v1, :cond_0
+    if-eq p2, v3, :cond_0
 
     const p2, 0x7f0d0049
 
-    invoke-virtual {v0, p2, p1, v3}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {v0, p2, p1, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
     new-instance p2, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;-><init>(Landroid/view/View;)V
 
@@ -366,27 +344,18 @@
     :cond_0
     const p2, 0x7f0d0048
 
-    invoke-virtual {v0, p2, p1, v3}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {v0, p2, p1, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
     new-instance p2, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild;-><init>(Landroid/view/View;)V
 
     :goto_0
     return-object p2
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setItems(Ljava/util/List;)V
@@ -401,7 +370,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "newItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
 
@@ -414,13 +385,4 @@
     invoke-virtual {v0, p0, v1, v2, p1}, Lcom/discord/utilities/recycler/DiffCreator;->dispatchDiffUpdates(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Companion.smali
index d4b8ac8fae..6d135b542f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Companion.smali
@@ -36,7 +36,9 @@
 .method public final mapEmojiCategoryToItemId(Lcom/discord/models/domain/emoji/EmojiCategory;)J
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojiCategory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->name()Ljava/lang/String;
 
@@ -49,34 +51,18 @@
     int-to-long v0, p1
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "emojiCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final mapGuildToItemId(Lcom/discord/models/domain/ModelGuild;)J
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v0
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild.smali
index 39cc18d9e2..120add44fe 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild.smali
@@ -45,11 +45,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "categoryRange"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem;->Companion:Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Companion;
 
@@ -74,20 +76,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild;->isSelected:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "categoryRange"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild;Lcom/discord/models/domain/ModelGuild;Lkotlin/Pair;ZILjava/lang/Object;)Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild;
@@ -178,31 +166,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "categoryRange"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild;-><init>(Lcom/discord/models/domain/ModelGuild;Lkotlin/Pair;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "categoryRange"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -220,7 +196,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -234,7 +210,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard.smali
index 9cb780d75b..b1ca01efa9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard.smali
@@ -45,11 +45,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "emojiCategory"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "categoryRange"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem;->Companion:Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Companion;
 
@@ -74,20 +76,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;->isSelected:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "categoryRange"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emojiCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;Lcom/discord/models/domain/emoji/EmojiCategory;Lkotlin/Pair;ZILjava/lang/Object;)Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;
@@ -178,31 +166,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "emojiCategory"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "categoryRange"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;-><init>(Lcom/discord/models/domain/emoji/EmojiCategory;Lkotlin/Pair;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "categoryRange"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emojiCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -220,7 +196,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;->emojiCategory:Lcom/discord/models/domain/emoji/EmojiCategory;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -234,7 +210,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion.smali
index d56829aa93..4d8f83fc1f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion.smali
@@ -38,74 +38,67 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojiCategory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
     move-result p1
 
-    const v0, 0x7f0802ac
+    const v0, 0x7f0802ad
 
     packed-switch p1, :pswitch_data_0
 
     goto :goto_0
 
     :pswitch_0
-    const v0, 0x7f0802b2
-
-    goto :goto_0
-
-    :pswitch_1
-    const v0, 0x7f0802ad
-
-    goto :goto_0
-
-    :pswitch_2
     const v0, 0x7f0802b3
 
     goto :goto_0
 
-    :pswitch_3
-    const v0, 0x7f0802b0
-
-    goto :goto_0
-
-    :pswitch_4
-    const v0, 0x7f0802b4
-
-    goto :goto_0
-
-    :pswitch_5
-    const v0, 0x7f0802ab
-
-    goto :goto_0
-
-    :pswitch_6
+    :pswitch_1
     const v0, 0x7f0802ae
 
     goto :goto_0
 
-    :pswitch_7
+    :pswitch_2
+    const v0, 0x7f0802b4
+
+    goto :goto_0
+
+    :pswitch_3
+    const v0, 0x7f0802b1
+
+    goto :goto_0
+
+    :pswitch_4
+    const v0, 0x7f0802b5
+
+    goto :goto_0
+
+    :pswitch_5
+    const v0, 0x7f0802ac
+
+    goto :goto_0
+
+    :pswitch_6
     const v0, 0x7f0802af
 
     goto :goto_0
 
+    :pswitch_7
+    const v0, 0x7f0802b0
+
+    goto :goto_0
+
     :pswitch_8
-    const v0, 0x7f0802b1
+    const v0, 0x7f0802b2
 
     :goto_0
     :pswitch_9
     return v0
 
-    :cond_0
-    const-string p1, "emojiCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild.smali
index 7658d458b3..18fa07bbbe 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild.smali
@@ -24,13 +24,15 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "itemView"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const v0, 0x7f0a0325
+    const v0, 0x7f0a032b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -40,7 +42,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild;->guildAvatar:Lcom/discord/widgets/chat/input/emoji/GuildAvatar;
 
-    const v0, 0x7f0a0327
+    const v0, 0x7f0a032d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,13 +51,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild;->selectionOverline:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -74,11 +69,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildCategoryItem"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "onCategoryClicked"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Guild;->guildAvatar:Lcom/discord/widgets/chat/input/emoji/GuildAvatar;
 
@@ -92,7 +89,7 @@
 
     const-string v1, "selectionOverline"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Guild;->isSelected()Z
 
@@ -119,18 +116,4 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "onCategoryClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "guildCategoryItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard.smali
index c7b83be8d1..2c4c0820a9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard.smali
@@ -24,13 +24,15 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "itemView"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const v0, 0x7f0a0326
+    const v0, 0x7f0a032c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -40,7 +42,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->iconView:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0327
+    const v0, 0x7f0a032d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,19 +51,12 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->selectionOverline:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public final configure(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;Lkotlin/jvm/functions/Function1;)V
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -74,39 +69,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "standardCategoryItem"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "onCategoryClicked"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;->getEmojiCategory()Lcom/discord/models/domain/emoji/EmojiCategory;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder;->Companion:Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion;
+    sget-object v1, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder;->Companion:Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion;
 
-    invoke-virtual {v2, v1}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion;->getCategoryIconResId(Lcom/discord/models/domain/emoji/EmojiCategory;)I
+    invoke-virtual {v1, v0}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Companion;->getCategoryIconResId(Lcom/discord/models/domain/emoji/EmojiCategory;)I
 
-    move-result v1
+    move-result v0
 
-    iget-object v2, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->iconView:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->iconView:Landroid/widget/ImageView;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v4, "itemView"
+    const-string v3, "itemView"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-static {v3, v1, v0}, Landroidx/core/content/res/ResourcesCompat;->getDrawable(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
+    const/4 v3, 0x0
+
+    invoke-static {v2, v0, v3}, Landroidx/core/content/res/ResourcesCompat;->getDrawable(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
-    invoke-virtual {v2, v0}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;->isSelected()Z
 
@@ -116,7 +115,7 @@
 
     const-string v2, "iconView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setSelected(Z)V
 
@@ -124,7 +123,7 @@
 
     const-string v3, "selectionOverline"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v0, :cond_0
 
@@ -142,7 +141,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->iconView:Landroid/widget/ImageView;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v3, 0x7f040144
 
@@ -155,7 +154,7 @@
     :cond_1
     iget-object v1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->iconView:Landroid/widget/ImageView;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v3, 0x7f040147
 
@@ -166,13 +165,13 @@
     :goto_1
     iget-object v3, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->iconView:Landroid/widget/ImageView;
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3, v1}, Lcom/discord/utilities/color/ColorCompatKt;->tintWithColor(Landroid/widget/ImageView;I)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder$Standard;->iconView:Landroid/widget/ImageView;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v0, :cond_2
 
@@ -195,18 +194,4 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "onCategoryClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "standardCategoryItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPicker.smali
index 9be8c03d57..3390987abb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPicker.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPicker.smali
@@ -21,7 +21,7 @@
 .end method
 
 .method public setOnEmojiSearchOpenedListener(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -31,16 +31,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration.smali
index 8a072f381a..defb12822c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration.smali
@@ -21,7 +21,7 @@
 
 # direct methods
 .method public constructor <init>(ILjava/util/List;I)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I",
@@ -31,7 +31,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "headerIndices"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;-><init>()V
 
@@ -42,15 +44,6 @@
     iput p3, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration;->bottomPaddingForLastRow:I
 
     return-void
-
-    :cond_0
-    const-string p1, "headerIndices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getHeaderPositionForItem(I)I
@@ -173,15 +166,21 @@
 .method public getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "outRect"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string/jumbo v0, "view"
 
-    if-eqz p3, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_5
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3, p4}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 
@@ -276,32 +275,4 @@
     iput v1, p1, Landroid/graphics/Rect;->bottom:I
 
     return-void
-
-    :cond_5
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "outRect"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerInlineViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerInlineViewModel.smali
index e8a21b6288..319d5133cc 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerInlineViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerInlineViewModel.smali
@@ -23,45 +23,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeStateObservable"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "searchSubject"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "selectedCategoryItemIdSubject"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "locale"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;-><init>(Lrx/Observable;Lrx/subjects/BehaviorSubject;Lrx/subjects/BehaviorSubject;Ljava/util/Locale;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedCategoryItemIdSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerNavigator.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerNavigator.smali
index a459787591..86e13312cd 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerNavigator.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerNavigator.smali
@@ -50,22 +50,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;->Companion:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$Companion;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$Companion;->show(Landroidx/fragment/app/FragmentManager;Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;Lcom/discord/widgets/chat/input/emoji/EmojiContextType;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "fragmentManager"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static synthetic launchBottomSheet$default(Landroidx/fragment/app/FragmentManager;Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;Lcom/discord/widgets/chat/input/emoji/EmojiContextType;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerSheetViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerSheetViewModel.smali
index 0d0187fec1..0f4899d6d1 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerSheetViewModel.smali
@@ -23,45 +23,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeStateObservable"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "searchSubject"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "selectedCategoryItemIdSubject"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "locale"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;-><init>(Lrx/Observable;Lrx/subjects/BehaviorSubject;Lrx/subjects/BehaviorSubject;Ljava/util/Locale;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedCategoryItemIdSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1.smali
index 88af6f00be..a77556a53c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "EmojiPickerViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1;->this$0:Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;->access$handleStoreState(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
index b0de0a3405..a532b71e94 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
@@ -118,7 +118,7 @@
 
     const-string v4, "name"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
 
@@ -126,7 +126,7 @@
 
     const-string v5, "Locale.getDefault()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, v4}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
@@ -134,13 +134,13 @@
 
     const-string v5, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
     const/4 v6, 0x2
 
-    invoke-static {v4, p2, v5, v6}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v4, p2, v5, v6}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v4
 
@@ -175,7 +175,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     return-object p1
 
@@ -225,7 +225,7 @@
     return-object v0
 
     :cond_1
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1.smali
index 11cb6f7309..704972a428 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1.smali
@@ -3,7 +3,7 @@
 .source "EmojiPickerViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/stores/StoreEmoji$EmojiContext;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/stores/StoreEmoji$EmojiContext$Chat;
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/stores/StoreEmoji$EmojiContext;
     .locals 5
 
     if-nez p1, :cond_0
@@ -75,7 +77,7 @@
 
     const-string v2, "selectedChannel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -98,7 +100,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1;->call(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/stores/StoreEmoji$EmojiContext$Chat;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1;->call(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/stores/StoreEmoji$EmojiContext;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1$1.smali
index 41678370bf..1e51265690 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1$1.smali
@@ -33,7 +33,16 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/models/domain/emoji/EmojiSet;",
+        "Ljava/util/LinkedHashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/lang/String;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -73,11 +82,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "allGuilds"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "searchInputString"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p1, :cond_0
 
@@ -92,7 +103,7 @@
 
     const-string v0, "selectedCategoryItemId"
 
-    invoke-static {p5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p5}, Ljava/lang/Long;->longValue()J
 
@@ -114,20 +125,6 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "searchInputString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "allGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1.smali
index ffe1d693f6..dd6068ebee 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "EmojiPickerViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreEmoji$EmojiContext;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +81,9 @@
 
     sget-object p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Uninitialized;->INSTANCE:Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Uninitialized;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory.smali
index c772c98149..7f2f721fc6 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory.smali
@@ -75,23 +75,37 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "emojiPickerMode"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_6
+    const-string v0, "locale"
 
-    if-eqz p4, :cond_5
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_4
+    const-string v0, "storeEmoji"
 
-    if-eqz p6, :cond_3
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_2
+    const-string v0, "storeGuildsSorted"
 
-    if-eqz p8, :cond_1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string v0, "storeUserSettings"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeChannelsSelected"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchSubject"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "selectedCategoryItemIdSubject"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -114,62 +128,6 @@
     iput-object p9, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory;->selectedCategoryItemIdSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "selectedCategoryItemIdSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeUserSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeGuildsSorted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "storeEmoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "emojiPickerMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/chat/input/emoji/EmojiPickerMode;Lcom/discord/widgets/chat/input/emoji/EmojiContextType;Ljava/util/Locale;Lcom/discord/stores/StoreEmoji;Lcom/discord/stores/StoreGuildsSorted;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreChannelsSelected;Lrx/subjects/BehaviorSubject;Lrx/subjects/BehaviorSubject;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -261,7 +219,7 @@
 
     const-string v2, "BehaviorSubject.create(\"\")"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v10, v1
 
@@ -293,7 +251,7 @@
 
     const-string v1, "BehaviorSubject.create(\n\u2026ry.RECENT\n        )\n    )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v11, v0
 
@@ -391,26 +349,26 @@
 
     sget-object v0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1;->INSTANCE:Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$getEmojiContextObservable$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "storeChannelsSelected.ge\u2026      }\n                }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_1
     sget-object p1, Lcom/discord/stores/StoreEmoji$EmojiContext$Global;->INSTANCE:Lcom/discord/stores/StoreEmoji$EmojiContext$Global;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(\n       \u2026ontext.Global\n          )"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object p1, v0
 
@@ -436,13 +394,13 @@
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory$observeStoreState$1;-><init>(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "emojiContextObservable.s\u2026  )\n          }\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -461,7 +419,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Factory;->emojiPickerMode:Lcom/discord/widgets/chat/input/emoji/EmojiPickerMode;
 
@@ -514,13 +474,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji.smali
index 36ad4e51aa..e200d0a71b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji.smali
@@ -54,16 +54,24 @@
         }
     .end annotation
 
+    const-string v0, "emojiSet"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emojiContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "allGuilds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchInputStringUpper"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;->emojiSet:Lcom/discord/models/domain/emoji/EmojiSet;
@@ -79,34 +87,6 @@
     iput-wide p6, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;->selectedCategoryItemId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "searchInputStringUpper"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "allGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "emojiContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "emojiSet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;Lcom/discord/models/domain/emoji/EmojiSet;Lcom/discord/stores/StoreEmoji$EmojiContext;Ljava/util/LinkedHashMap;Ljava/lang/String;ZJILjava/lang/Object;)Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;
@@ -261,28 +241,34 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "emojiSet"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p2, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "emojiContext"
 
-    if-eqz p4, :cond_0
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "allGuilds"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchInputStringUpper"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
     move v6, p5
 
     move-wide v7, p6
@@ -290,34 +276,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;-><init>(Lcom/discord/models/domain/emoji/EmojiSet;Lcom/discord/stores/StoreEmoji$EmojiContext;Ljava/util/LinkedHashMap;Ljava/lang/String;ZJ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "searchInputStringUpper"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "allGuilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "emojiContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "emojiSet"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -335,7 +293,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;->emojiSet:Lcom/discord/models/domain/emoji/EmojiSet;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -345,7 +303,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;->emojiContext:Lcom/discord/stores/StoreEmoji$EmojiContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -355,7 +313,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;->allGuilds:Ljava/util/LinkedHashMap;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -365,7 +323,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState$Emoji;->searchInputStringUpper:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch.smali
index f3ab414729..6aea8c16bf 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "searchQuery"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch;->searchQuery:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch;
@@ -74,22 +69,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchQuery"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -111,7 +99,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results$firstUnicodeEmojiCategoryItem$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results$firstUnicodeEmojiCategoryItem$2.smali
index 79df13b8fa..0956622d81 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results$firstUnicodeEmojiCategoryItem$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results$firstUnicodeEmojiCategoryItem$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results$firstUnicodeEmojiCategoryItem$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "EmojiPickerViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Standard;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results.smali
index 229bef29f2..da7908c514 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results.smali
@@ -58,14 +58,20 @@
         }
     .end annotation
 
+    const-string v0, "searchQuery"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emojiItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "categoryItems"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;->searchQuery:Ljava/lang/String;
@@ -85,27 +91,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;->firstUnicodeEmojiCategoryItem$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "categoryItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emojiItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;
@@ -203,40 +188,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchQuery"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "emojiItems"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "categoryItems"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;-><init>(Ljava/lang/String;Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "categoryItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emojiItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -258,7 +226,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -268,7 +236,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;->emojiItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -278,7 +246,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;->categoryItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.smali
index 70eb01537e..6577239f68 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.smali
@@ -1,5 +1,5 @@
 .class public Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "EmojiPickerViewModel.kt"
 
 
@@ -16,7 +16,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState;",
         ">;"
     }
@@ -95,17 +95,25 @@
         }
     .end annotation
 
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchSubject"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "selectedCategoryItemIdSubject"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "locale"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p2, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;->searchSubject:Lrx/subjects/BehaviorSubject;
 
@@ -119,7 +127,7 @@
 
     const-string p3, "PublishSubject.create()"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
@@ -137,6 +145,10 @@
 
     move-result-object v2
 
+    new-instance v7, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1;-><init>(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -145,10 +157,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$1;-><init>(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -156,34 +164,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedCategoryItemIdSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$StoreState;)V
@@ -235,7 +215,7 @@
 
     const-string v7, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v7, Ljava/util/ArrayList;
 
@@ -255,9 +235,9 @@
 
     const-string v10, "storeState.allGuilds.values"
 
-    invoke-static {v9, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v9}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v9}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v9
 
@@ -452,7 +432,7 @@
 
     invoke-interface {v8, v13}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-static {v9, v12}, Lj0/i/l;->minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v9, v12}, Lk0/j/l;->minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v9
 
@@ -501,7 +481,7 @@
 
     const-string v13, "guild"
 
-    invoke-static {v10, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v12, v10}, Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem$Companion;->mapGuildToItemId(Lcom/discord/models/domain/ModelGuild;)J
 
@@ -669,7 +649,7 @@
 
     const-string v2, ""
 
-    invoke-static {v6, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -687,7 +667,7 @@
 
     invoke-direct {v2, v1}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$EmptySearch;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_8
 
@@ -700,16 +680,16 @@
 
     invoke-direct {v2, v1, v7, v8}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState$Results;-><init>(Ljava/lang/String;Ljava/util/List;Ljava/util/List;)V
 
-    invoke-virtual {v0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_8
 
     :cond_d
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 
@@ -739,7 +719,7 @@
 .method public final onClickUnicodeEmojiCategories()V
     .locals 3
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -795,22 +775,15 @@
 .method public final setSearchText(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchText"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel;->searchSubject:Lrx/subjects/BehaviorSubject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setSelectedCategoryItemId(J)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/GuildAvatar.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/GuildAvatar.smali
index b1515b1422..e749e6cd25 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/GuildAvatar.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/GuildAvatar.smali
@@ -5,60 +5,39 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/view/SimpleDraweeView;-><init>(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/facebook/drawee/view/SimpleDraweeView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -103,7 +82,9 @@
 .method public final updateView(Lcom/discord/models/domain/ModelGuild;)V
     .locals 11
 
-    if-eqz p1, :cond_1
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->hasIcon()Z
 
@@ -151,7 +132,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, v0}, Lk0/o/c/i;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -183,13 +164,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$Companion.smali
index 1e2fd10839..3714706f9b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$Companion.smali
@@ -50,7 +50,7 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -116,7 +116,7 @@
 
     float-to-int v2, v2
 
-    if-nez v2, :cond_15
+    if-nez v2, :cond_14
 
     sget-object v6, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -196,11 +196,21 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    const-string v1, "$this$trimIndent"
 
-    if-eqz v0, :cond_14
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lj0/t/p;->lines(Ljava/lang/CharSequence;)Ljava/util/List;
+    const-string v1, "$this$replaceIndent"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, ""
+
+    const-string v2, "newIndent"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lk0/u/p;->lines(Ljava/lang/CharSequence;)Ljava/util/List;
 
     move-result-object v2
 
@@ -228,7 +238,7 @@
 
     check-cast v8, Ljava/lang/String;
 
-    invoke-static {v8}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v8}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v8
 
@@ -318,6 +328,10 @@
     goto :goto_5
 
     :cond_9
+    const-string v3, "$this$minOrNull"
+
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v4}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
     move-result-object v3
@@ -326,9 +340,11 @@
 
     move-result v4
 
+    const/4 v7, 0x0
+
     if-nez v4, :cond_a
 
-    move-object v4, v1
+    move-object v4, v7
 
     goto :goto_9
 
@@ -343,23 +359,23 @@
     :goto_8
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v7
+    move-result v8
 
-    if-eqz v7, :cond_c
+    if-eqz v8, :cond_c
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v8
 
-    check-cast v7, Ljava/lang/Comparable;
+    check-cast v8, Ljava/lang/Comparable;
 
-    invoke-interface {v4, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+    invoke-interface {v4, v8}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
 
-    move-result v8
+    move-result v9
 
-    if-lez v8, :cond_b
+    if-lez v9, :cond_b
 
-    move-object v4, v7
+    move-object v4, v8
 
     goto :goto_8
 
@@ -391,15 +407,13 @@
 
     add-int/2addr v4, v0
 
-    const-string v0, ""
-
-    invoke-static {v0}, Lj0/t/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+    invoke-static {v1}, Lk0/u/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v0
 
     invoke-static {v2}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
 
-    move-result v7
+    move-result v1
 
     new-instance v8, Ljava/util/ArrayList;
 
@@ -428,21 +442,21 @@
 
     if-eqz v5, :cond_e
 
-    if-ne v5, v7, :cond_f
+    if-ne v5, v1, :cond_f
 
     :cond_e
-    invoke-static {v9}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v9}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v5
 
     if-eqz v5, :cond_f
 
-    move-object v9, v1
+    move-object v9, v7
 
     goto :goto_c
 
     :cond_f
-    invoke-static {v9, v3}, Lj0/t/s;->drop(Ljava/lang/String;I)Ljava/lang/String;
+    invoke-static {v9, v3}, Lk0/u/s;->drop(Ljava/lang/String;I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -470,7 +484,7 @@
     :cond_12
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
-    throw v1
+    throw v7
 
     :cond_13
     new-instance v0, Ljava/lang/StringBuilder;
@@ -493,7 +507,7 @@
 
     move-object v9, v0
 
-    invoke-static/range {v8 .. v16}, Lj0/i/l;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/Appendable;
+    invoke-static/range {v8 .. v16}, Lk0/j/l;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/Appendable;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -501,7 +515,7 @@
 
     const-string v0, "mapIndexedNotNull { inde\u2026\"\\n\")\n        .toString()"
 
-    invoke-static {v7, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x0
 
@@ -513,16 +527,6 @@
 
     const/16 v2, 0x8
 
-    goto :goto_d
-
     :cond_14
-    const-string v0, "$this$trimIndent"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_15
-    :goto_d
     return v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem.smali
index 9ea820bdeb..d27d40d601 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem.smali
@@ -29,11 +29,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "emoji"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "emojiName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,20 +46,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->allowEmojisToAnimate:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "emojiName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -135,31 +123,19 @@
 .method public final copy(Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;Z)Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "emoji"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "emojiName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;-><init>(Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emojiName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -177,7 +153,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->emoji:Lcom/discord/models/domain/emoji/Emoji;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -187,7 +163,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->emojiName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -248,7 +224,7 @@
 
     const-string v1, "emoji.uniqueId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$1.smali
index 9dbfb97c60..01c47e80c9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$1.smali
@@ -113,11 +113,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.chat.input.emoji.WidgetEmojiAdapter.EmojiItem"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$2.smali
index 1eb47d381c..8d641fde4a 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder$2.smali
@@ -65,9 +65,9 @@
 .method public final call(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 2
 
-    const/4 p2, 0x0
+    const-string/jumbo p2, "v"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -75,35 +75,30 @@
 
     invoke-virtual {p3}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->getEmojiName()Ljava/lang/String;
 
-    move-result-object p3
+    move-result-object p2
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
+    const/4 p3, 0x0
+
     const/4 v0, 0x0
 
     const/16 v1, 0xc
 
-    invoke-static {p1, p3, v0, p2, v1}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, p2, p3, v0, v1}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.chat.input.emoji.WidgetEmojiAdapter.EmojiItem"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder.smali
index b14f39e68a..0bec9a5159 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder.smali
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d004b
 
@@ -39,7 +41,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v1, 0x7f0a0329
+    const v1, 0x7f0a032f
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,7 +49,7 @@
 
     const-string v1, "itemView.findViewById(R.id.emoji_item_draweeview)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -70,15 +72,6 @@
     invoke-virtual {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getDraweeView$p(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiViewHolder;)Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -94,29 +87,31 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_8
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    instance-of v1, p2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
+    instance-of v0, p2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
 
-    if-nez v1, :cond_0
+    const/4 v1, 0x0
 
-    move-object v1, v0
+    if-nez v0, :cond_0
+
+    move-object v0, v1
 
     goto :goto_0
 
     :cond_0
-    move-object v1, p2
+    move-object v0, p2
 
     :goto_0
-    check-cast v1, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
+    check-cast v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
 
-    if-nez v1, :cond_4
+    if-nez v0, :cond_4
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     const-string v2, "current adapter data size: "
 
@@ -163,7 +158,7 @@
     goto :goto_1
 
     :cond_1
-    move-object v3, v0
+    move-object v3, v1
 
     :goto_1
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
@@ -174,9 +169,9 @@
 
     const-string v3, "debug"
 
-    invoke-virtual {v1, v2, v3}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v2, v3}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     const-string v2, "item header indices: "
 
@@ -198,9 +193,9 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, v3, v2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v3, v2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     const-string v2, "item in curr data "
 
@@ -218,7 +213,7 @@
 
     if-eqz v4, :cond_2
 
-    invoke-static {v4, p1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v4, p1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -227,7 +222,7 @@
     goto :goto_2
 
     :cond_2
-    move-object v4, v0
+    move-object v4, v1
 
     :goto_2
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
@@ -236,9 +231,9 @@
 
     move-result-object v2
 
-    invoke-virtual {v1, v3, v2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v3, v2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     const-string v2, "item in next data "
 
@@ -256,20 +251,20 @@
 
     if-eqz v4, :cond_3
 
-    invoke-static {v4, p1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v4, p1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
-    check-cast v0, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
+    check-cast v1, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
 
     :cond_3
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v1, v3, v0}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v3, v1}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     sget-object v4, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -306,7 +301,7 @@
     return-void
 
     :cond_4
-    invoke-virtual {v1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->getEmoji()Lcom/discord/models/domain/emoji/Emoji;
+    invoke-virtual {v0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->getEmoji()Lcom/discord/models/domain/emoji/Emoji;
 
     move-result-object p1
 
@@ -322,14 +317,14 @@
 
     move-result p2
 
-    const/16 v0, 0x40
+    const/16 v1, 0x40
 
-    if-le p2, v0, :cond_5
+    if-le p2, v1, :cond_5
 
     const/16 p2, 0x40
 
     :cond_5
-    invoke-virtual {v1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->getAllowEmojisToAnimate()Z
+    invoke-virtual {v0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;->getAllowEmojisToAnimate()Z
 
     move-result v0
 
@@ -400,13 +395,6 @@
     invoke-virtual {p2, p1}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_8
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem.smali
index 5cfec51911..57a22545dc 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem.smali
@@ -24,7 +24,9 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
@@ -32,7 +34,7 @@
 
     const-string v1, "guild.name"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -45,26 +47,21 @@
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;->text:Ljava/lang/String;
@@ -72,20 +69,6 @@
     iput-object p2, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final component2()Ljava/lang/String;
@@ -133,31 +116,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "text"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "key"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -175,7 +146,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;->text:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -185,7 +156,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$GuildHeaderItem;->key:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem.smali
index 956c5ae9bc..cb7247572d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/emoji/EmojiCategory;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "emojiCategory"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem;->emojiCategory:Lcom/discord/models/domain/emoji/EmojiCategory;
 
     return-void
-
-    :cond_0
-    const-string p1, "emojiCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem;Lcom/discord/models/domain/emoji/EmojiCategory;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/emoji/EmojiCategory;)Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojiCategory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem;-><init>(Lcom/discord/models/domain/emoji/EmojiCategory;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emojiCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderItem$StandardHeaderItem;->emojiCategory:Lcom/discord/models/domain/emoji/EmojiCategory;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder$Companion.smali
index 5a894456b1..41502c84dc 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder$Companion.smali
@@ -34,11 +34,13 @@
 
 # virtual methods
 .method public final getCategoryString(Lcom/discord/models/domain/emoji/EmojiCategory;)I
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/StringRes;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojiCategory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
@@ -46,70 +48,61 @@
 
     packed-switch p1, :pswitch_data_0
 
-    const p1, 0x7f1214e1
+    const p1, 0x7f12150b
 
     goto :goto_0
 
     :pswitch_0
-    const p1, 0x7f1205fa
-
-    goto :goto_0
-
-    :pswitch_1
-    const p1, 0x7f1205f4
-
-    goto :goto_0
-
-    :pswitch_2
-    const p1, 0x7f1205f5
-
-    goto :goto_0
-
-    :pswitch_3
-    const p1, 0x7f1205fb
-
-    goto :goto_0
-
-    :pswitch_4
-    const p1, 0x7f1205f8
-
-    goto :goto_0
-
-    :pswitch_5
     const p1, 0x7f1205fc
 
     goto :goto_0
 
-    :pswitch_6
-    const p1, 0x7f1205f3
-
-    goto :goto_0
-
-    :pswitch_7
+    :pswitch_1
     const p1, 0x7f1205f6
 
     goto :goto_0
 
-    :pswitch_8
+    :pswitch_2
     const p1, 0x7f1205f7
 
     goto :goto_0
 
-    :pswitch_9
+    :pswitch_3
+    const p1, 0x7f1205fd
+
+    goto :goto_0
+
+    :pswitch_4
+    const p1, 0x7f1205fa
+
+    goto :goto_0
+
+    :pswitch_5
+    const p1, 0x7f1205fe
+
+    goto :goto_0
+
+    :pswitch_6
+    const p1, 0x7f1205f5
+
+    goto :goto_0
+
+    :pswitch_7
+    const p1, 0x7f1205f8
+
+    goto :goto_0
+
+    :pswitch_8
     const p1, 0x7f1205f9
 
+    goto :goto_0
+
+    :pswitch_9
+    const p1, 0x7f1205fb
+
     :goto_0
     return p1
 
-    :cond_0
-    const-string p1, "emojiCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder.smali
index 5da006f12d..cc3a306db3 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder.smali
@@ -55,7 +55,9 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d004c
 
@@ -63,7 +65,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a04bf
+    const v0, 0x7f0a04c5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,49 +73,35 @@
 
     const-string v0, "itemView.findViewById(R.id.header_item_text)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder;->headerTextView:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public final bind(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder;->onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 1
 
-    if-eqz p2, :cond_2
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -161,15 +149,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$StickyHeadersManager.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$StickyHeadersManager.smali
index ef2a6f9a49..fde177cc34 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$StickyHeadersManager.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$StickyHeadersManager.smali
@@ -24,7 +24,9 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,15 +41,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$StickyHeadersManager;->currentStickyHeaderView:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -71,7 +64,9 @@
 .method public final layoutViews(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$StickyHeadersManager;->currentStickyHeaderView:Landroid/view/View;
 
@@ -83,13 +78,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$onScrollPositionListener$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$onScrollPositionListener$1.smali
index 17d6a0b692..24ba82b494 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$onScrollPositionListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$onScrollPositionListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$onScrollPositionListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEmojiAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1$1.smali
index 9b184ac36b..c91369fe1f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1$1.smali
@@ -32,9 +32,11 @@
 
 # virtual methods
 .method public onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 
@@ -42,16 +44,7 @@
 
     sget-object p2, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1.smali
index e8c1045e38..1d12b0fb22 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1.smali
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Lkotlin/Unit;",
+        ">;>;"
     }
 .end annotation
 
@@ -67,7 +68,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emitter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$1;->this$0:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;
 
@@ -78,13 +81,4 @@
     invoke-static {v0, v1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->access$setOnScrollListener$p(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emitter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$2.smali
index 82393046de..ed630b2709 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$setupScrollObservables$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEmojiAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.smali
index 02171ce7e8..f272cb1b70 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.smali
@@ -107,11 +107,13 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/chat/input/emoji/OnEmojiSelectedListener;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "recycler"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onEmojiSelectedListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -127,7 +129,7 @@
 
     const-string v0, "recycler.context"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -176,20 +178,6 @@
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->setupScrollObservables()V
 
     return-void
-
-    :cond_0
-    const-string p1, "onEmojiSelectedListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getEmojiSizePx$p(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;)I
@@ -212,7 +200,7 @@
     :cond_0
     const-string p0, "headerIndices"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -289,7 +277,7 @@
     :cond_0
     const-string p0, "stickyHeaderManager"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -357,11 +345,11 @@
 
     invoke-direct {v1, v3, v4, v2}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v2, Lr0/l/a/u;
+    new-instance v2, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v2, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v2, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -369,7 +357,7 @@
 
     const-string v1, "Observable\n        .crea\u2026, TimeUnit.MILLISECONDS))"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -438,7 +426,7 @@
 
     const-string v4, "row"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, p1, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$HeaderViewHolder;->bind(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
 
@@ -453,12 +441,12 @@
     return-object p1
 
     :cond_0
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -538,7 +526,7 @@
     :cond_4
     const-string p1, "headerIndices"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -552,9 +540,9 @@
 
     const-string v1, "this.internalData"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0, p1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v0, p1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -566,7 +554,9 @@
 .method public onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -583,15 +573,6 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -605,7 +586,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -618,7 +599,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -646,15 +629,6 @@
 
     :goto_0
     return-object p1
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final scrollToPosition(I)V
@@ -703,73 +677,70 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->nextData:Ljava/util/List;
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance v0, Ljava/util/ArrayList;
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    const/4 v2, 0x0
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
+    const/4 v1, 0x0
+
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_3
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_3
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v3
-
-    add-int/lit8 v4, v2, 0x1
-
-    if-ltz v2, :cond_2
-
-    check-cast v3, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
-
-    invoke-interface {v3}, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;->getType()I
-
-    move-result v3
-
-    if-nez v3, :cond_0
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
     move-result-object v2
 
-    goto :goto_1
+    add-int/lit8 v4, v1, 0x1
+
+    if-ltz v1, :cond_2
+
+    check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
+
+    invoke-interface {v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;->getType()I
+
+    move-result v2
+
+    if-nez v2, :cond_0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
 
     :cond_0
-    move-object v2, v0
+    if-eqz v3, :cond_1
 
-    :goto_1
-    if-eqz v2, :cond_1
-
-    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    move v2, v4
+    move v1, v4
 
     goto :goto_0
 
     :cond_2
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
-    throw v0
+    throw v3
 
     :cond_3
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->headerIndices:Ljava/util/List;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->headerIndices:Ljava/util/List;
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->emojiItemDecoration:Lcom/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration;
 
@@ -777,36 +748,26 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p1}, Landroidx/recyclerview/widget/RecyclerView;->removeItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V
+    invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->removeItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V
 
     :cond_4
     new-instance p1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration;
 
-    iget v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->numColumns:I
+    iget v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->numColumns:I
 
-    iget-object v2, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->headerIndices:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->headerIndices:Ljava/util/List;
 
-    if-eqz v2, :cond_5
+    if-eqz v1, :cond_5
 
-    invoke-virtual {p0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
+    const/16 v2, 0x8
 
-    move-result-object v0
+    invoke-static {v2}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
-    invoke-virtual {v0}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
+    move-result v2
 
-    move-result-object v0
-
-    const v3, 0x7f0701ed
-
-    invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v0
-
-    float-to-int v0, v0
-
-    invoke-direct {p1, v1, v2, v0}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration;-><init>(ILjava/util/List;I)V
+    invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/chat/input/emoji/EmojiPickerEmojiItemDecoration;-><init>(ILjava/util/List;I)V
 
     invoke-virtual {p0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -821,20 +782,13 @@
     :cond_5
     const-string p1, "headerIndices"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_6
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v3
 .end method
 
 .method public final setOnScrollPositionListener(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -846,18 +800,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onScrollPositionListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter;->onScrollPositionListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onScrollPositionListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$configureUI$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$configureUI$1.smali
index 55f33809a8..272d8cb839 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEmojiPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$3.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$3.smali
index 5a0b25b3e3..c32531c89e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$3.smali
@@ -59,20 +59,13 @@
 .method public final call(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$3;->this$0:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->access$handleInputChanged(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$1.smali
index 402520662f..f956a320bb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEmojiPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->access$configureUI(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.smali
index dc85ca6cc1..b2c93270b0 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEmojiPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->access$handleEvent(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;Lcom/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$1.smali
index 25727d4a5c..2a4683b66e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetEmojiPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onCategoryClicked"
+
+    const-string v5, "onCategoryClicked(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onCategoryClicked"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onCategoryClicked(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->access$onCategoryClicked(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;Lcom/discord/widgets/chat/input/emoji/EmojiCategoryItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$2.smali
index 70a55e66d4..3edddcfd34 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetEmojiPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onSelectedCategoryAdapterPositionUpdated"
+
+    const-string v5, "onSelectedCategoryAdapterPositionUpdated(I)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onSelectedCategoryAdapterPositionUpdated"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onSelectedCategoryAdapterPositionUpdated(I)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(I)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$3.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$3.smali
index dc368e241a..f522a7ad31 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setUpCategoryRecycler$3.smali
@@ -37,9 +37,11 @@
 
 # virtual methods
 .method public onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 
@@ -56,13 +58,4 @@
     invoke-virtual {p1, p2}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setWindowInsetsListeners$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setWindowInsetsListeners$1.smali
index a1d3a322ba..bf31fb4fe0 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setWindowInsetsListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$setWindowInsetsListeners$1.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -74,18 +76,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1.smali
index b2ba756e97..c29aaa5d22 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEmojiPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.smali
index ec1de2e034..65ef279b0d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.smali
@@ -176,7 +176,7 @@
     :cond_0
     const-string p0, "backspaceButton"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -235,7 +235,7 @@
     :cond_0
     const-string p0, "searchInput"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -252,9 +252,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -419,7 +419,7 @@
     :cond_1
     const-string p1, "searchInput"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
@@ -463,17 +463,17 @@
     goto :goto_2
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_5
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_6
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
@@ -545,32 +545,32 @@
     :cond_8
     const-string p1, "categoryAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_9
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_a
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_b
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_c
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_d
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
@@ -601,7 +601,7 @@
 
     move-result-object p1
 
-    const-string v0, "unicodeEmojiCategoriesShortcut"
+    const-string/jumbo v0, "unicodeEmojiCategoriesShortcut"
 
     if-eqz p1, :cond_2
 
@@ -632,7 +632,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -751,22 +751,22 @@
     return-void
 
     :cond_9
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_a
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_b
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_c
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -775,12 +775,12 @@
     return-void
 
     :cond_e
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_f
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -797,13 +797,9 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    const/16 v0, 0x8
 
-    move-result-object v0
-
-    const v1, 0x7f0701ed
-
-    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v0}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v0
 
@@ -862,11 +858,11 @@
     return-object v0
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.widgets.chat.input.emoji.EmojiContextType"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -941,7 +937,7 @@
     :cond_0
     const-string p1, "emojiAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -975,12 +971,12 @@
 
     if-eqz p1, :cond_0
 
-    const v3, 0x7f0803b9
+    const v3, 0x7f0803bc
 
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f080282
+    const v3, 0x7f080283
 
     :goto_0
     invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -1031,12 +1027,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f1213f6
+    const p1, 0x7f121420
 
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f121352
+    const p1, 0x7f12137c
 
     :goto_2
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1048,24 +1044,24 @@
     return-void
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_5
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_6
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1219,19 +1215,19 @@
     return-void
 
     :cond_2
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
     :cond_3
-    const-string v0, "unicodeEmojiCategoriesShortcut"
+    const-string/jumbo v0, "unicodeEmojiCategoriesShortcut"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
     :cond_4
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 .end method
@@ -1390,12 +1386,12 @@
     goto :goto_6
 
     :cond_6
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_7
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1404,36 +1400,36 @@
     return-void
 
     :cond_9
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_a
     const-string v0, "searchClearButton"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_b
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_c
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_d
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_e
     const-string v0, "emojiAppBar"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1447,7 +1443,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiPickerListener:Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;
 
@@ -1498,7 +1494,7 @@
     :cond_0
     const-string p1, "emojiAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1587,7 +1583,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -1603,14 +1599,14 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_4
     const-string p1, "categoryAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -1619,12 +1615,12 @@
     return-void
 
     :cond_6
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_7
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -1641,9 +1637,9 @@
     return-void
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1669,7 +1665,7 @@
 
     const-string v4, "categoryRecycler.context"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -1744,44 +1740,44 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_5
     const-string v0, "categoryLayoutManager"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_6
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_7
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
@@ -1838,34 +1834,34 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_3
     const-string v0, "emojiAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_4
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_5
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -1888,7 +1884,7 @@
     :cond_0
     const-string v0, "container"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1908,11 +1904,11 @@
 
     invoke-direct {v1, v3, v4, v2}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v2, Lr0/l/a/u;
+    new-instance v2, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v2, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v2, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1920,7 +1916,7 @@
 
     const-string v1, "emojiCategoryScrollSubje\u2026, TimeUnit.MILLISECONDS))"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -1969,9 +1965,9 @@
     return-void
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -2033,7 +2029,7 @@
 
     const-string v2, "ViewModelProvider(\n     \u2026putViewModel::class.java)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
 
@@ -2125,21 +2121,21 @@
 .method public onEmojiSelected(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "emoji"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    if-nez v1, :cond_4
+    if-nez v0, :cond_4
 
     instance-of v0, p1, Lcom/discord/models/domain/emoji/ModelEmojiCustom;
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
     if-eqz v0, :cond_0
 
@@ -2151,7 +2147,7 @@
 
     if-eqz p1, :cond_0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :cond_0
     sget-object v3, Lf/a/a/a/a;->j:Lf/a/a/a/a$b;
@@ -2162,11 +2158,11 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
     const/4 v5, 0x2
 
@@ -2176,9 +2172,9 @@
     const/4 v5, 0x1
 
     :goto_0
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
-    const p1, 0x7f121286
+    const p1, 0x7f1212b1
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2187,7 +2183,7 @@
     goto :goto_1
 
     :cond_2
-    const p1, 0x7f12128d
+    const p1, 0x7f1212b8
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2196,9 +2192,9 @@
     :goto_1
     move-object v6, p1
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
-    const p1, 0x7f121287
+    const p1, 0x7f1212b2
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2207,7 +2203,7 @@
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f12128e
+    const p1, 0x7f1212b9
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2231,19 +2227,21 @@
     :cond_4
     invoke-interface {p1}, Lcom/discord/models/domain/emoji/Emoji;->isAvailable()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_5
+    if-nez v0, :cond_5
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const v1, 0x7f1205fd
+    const v0, 0x7f1205ff
+
+    const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v1, v2, v0, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 
@@ -2256,223 +2254,218 @@
 
     :cond_6
     return-void
-
-    :cond_7
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v1, 0x7f0a0330
+    const v0, 0x7f0a0336
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_picker_container)"
+    const-string/jumbo v1, "view.findViewById(R.id.emoji_picker_container)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->container:Landroid/view/View;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->container:Landroid/view/View;
 
-    if-eqz v1, :cond_5
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_5
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->getAdditionalBottomPaddingPx()I
 
     move-result v2
 
-    invoke-virtual {v1}, Landroid/view/View;->getPaddingLeft()I
+    invoke-virtual {v0}, Landroid/view/View;->getPaddingLeft()I
 
     move-result v3
 
-    invoke-virtual {v1}, Landroid/view/View;->getPaddingTop()I
+    invoke-virtual {v0}, Landroid/view/View;->getPaddingTop()I
 
     move-result v4
 
-    invoke-virtual {v1}, Landroid/view/View;->getPaddingRight()I
+    invoke-virtual {v0}, Landroid/view/View;->getPaddingRight()I
 
     move-result v5
 
-    invoke-virtual {v1, v3, v4, v5, v2}, Landroid/view/View;->setPadding(IIII)V
+    invoke-virtual {v0, v3, v4, v5, v2}, Landroid/view/View;->setPadding(IIII)V
 
-    const v1, 0x7f0a0324
+    const v0, 0x7f0a032a
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_app_bar)"
+    const-string/jumbo v2, "view.findViewById(R.id.emoji_app_bar)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Lcom/google/android/material/appbar/AppBarLayout;
+    check-cast v0, Lcom/google/android/material/appbar/AppBarLayout;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiAppBar:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiAppBar:Lcom/google/android/material/appbar/AppBarLayout;
 
-    const v1, 0x7f0a032c
+    const v0, 0x7f0a0332
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_picker_bottom_bar)"
+    const-string/jumbo v2, "view.findViewById(R.id.emoji_picker_bottom_bar)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiBottomBar:Landroid/view/View;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiBottomBar:Landroid/view/View;
 
-    const v1, 0x7f0a032d
+    const v0, 0x7f0a0333
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.e\u2026icker_bottom_bar_divider)"
+    const-string/jumbo v2, "view.findViewById(R.id.e\u2026icker_bottom_bar_divider)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiBottomBarDivider:Landroid/view/View;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiBottomBarDivider:Landroid/view/View;
 
-    const v1, 0x7f0a0336
+    const v0, 0x7f0a033c
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_toolbar)"
+    const-string/jumbo v2, "view.findViewById(R.id.emoji_toolbar)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Landroidx/appcompat/widget/Toolbar;
+    check-cast v0, Landroidx/appcompat/widget/Toolbar;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiToolbar:Landroidx/appcompat/widget/Toolbar;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiToolbar:Landroidx/appcompat/widget/Toolbar;
 
-    const v1, 0x7f0a01fc
+    const v0, 0x7f0a01ff
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.c\u2026moji_picker_view_flipper)"
+    const-string/jumbo v2, "view.findViewById(R.id.c\u2026moji_picker_view_flipper)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Lcom/discord/app/AppViewFlipper;
+    check-cast v0, Lcom/discord/app/AppViewFlipper;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiViewFlipper:Lcom/discord/app/AppViewFlipper;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiViewFlipper:Lcom/discord/app/AppViewFlipper;
 
-    const v1, 0x7f0a01fb
+    const v0, 0x7f0a01fe
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    check-cast v1, Landroidx/recyclerview/widget/RecyclerView;
+    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiRecycler:Landroidx/recyclerview/widget/RecyclerView;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v1, 0x7f0a0331
+    const v0, 0x7f0a0337
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.e\u2026de_emoji_shortcut_button)"
+    const-string/jumbo v2, "view.findViewById(R.id.e\u2026de_emoji_shortcut_button)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Landroid/widget/ImageView;
+    check-cast v0, Landroid/widget/ImageView;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->unicodeEmojiCategoriesShortcut:Landroid/widget/ImageView;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->unicodeEmojiCategoriesShortcut:Landroid/widget/ImageView;
 
-    const v1, 0x7f0a032b
+    const v0, 0x7f0a0331
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.e\u2026ji_picker_backspace_icon)"
+    const-string/jumbo v2, "view.findViewById(R.id.e\u2026ji_picker_backspace_icon)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Landroid/widget/ImageView;
+    check-cast v0, Landroid/widget/ImageView;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->backspaceButton:Landroid/widget/ImageView;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->backspaceButton:Landroid/widget/ImageView;
 
-    const v1, 0x7f0a0332
+    const v0, 0x7f0a0338
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_search_bar)"
+    const-string/jumbo v2, "view.findViewById(R.id.emoji_search_bar)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiSearchBar:Landroid/view/View;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->emojiSearchBar:Landroid/view/View;
 
-    const v1, 0x7f0a0334
+    const v0, 0x7f0a033a
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_search_input)"
+    const-string/jumbo v2, "view.findViewById(R.id.emoji_search_input)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Lcom/google/android/material/textfield/TextInputEditText;
+    check-cast v0, Lcom/google/android/material/textfield/TextInputEditText;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->searchInput:Lcom/google/android/material/textfield/TextInputEditText;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->searchInput:Lcom/google/android/material/textfield/TextInputEditText;
 
-    const v1, 0x7f0a0328
+    const v0, 0x7f0a032e
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_inline_search_button)"
+    const-string/jumbo v2, "view.findViewById(R.id.emoji_inline_search_button)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->inlineSearchButton:Landroid/view/View;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->inlineSearchButton:Landroid/view/View;
 
-    const v1, 0x7f0a0333
+    const v0, 0x7f0a0339
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "view.findViewById(R.id.emoji_search_clear)"
+    const-string/jumbo v2, "view.findViewById(R.id.emoji_search_clear)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v1, Landroid/widget/ImageView;
+    check-cast v0, Landroid/widget/ImageView;
 
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->searchClearButton:Landroid/widget/ImageView;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->searchClearButton:Landroid/widget/ImageView;
 
-    const v1, 0x7f0a032f
+    const v0, 0x7f0a0335
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v1, "view.findViewById(R.id.e\u2026picker_category_recycler)"
+    const-string/jumbo v0, "view.findViewById(R.id.e\u2026picker_category_recycler)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
 
@@ -2482,9 +2475,9 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/widgets/chat/input/emoji/EmojiPickerMode;->INLINE:Lcom/discord/widgets/chat/input/emoji/EmojiPickerMode;
+    sget-object v0, Lcom/discord/widgets/chat/input/emoji/EmojiPickerMode;->INLINE:Lcom/discord/widgets/chat/input/emoji/EmojiPickerMode;
 
-    if-ne p1, v1, :cond_0
+    if-ne p1, v0, :cond_0
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->setWindowInsetsListeners()V
 
@@ -2528,43 +2521,36 @@
     return-void
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.google.android.material.appbar.AppBarLayout.LayoutParams"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_3
     const-string p1, "emojiToolbar"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type androidx.recyclerview.widget.RecyclerView"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_5
     const-string p1, "container"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2576,11 +2562,11 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -2645,12 +2631,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2683,7 +2669,7 @@
     :cond_0
     const-string v0, "emojiRecycler"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -2694,7 +2680,7 @@
     :cond_2
     const-string v0, "emojiAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2716,7 +2702,7 @@
 .end method
 
 .method public setOnEmojiSearchOpenedListener(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -2726,18 +2712,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;->onEmojiSearchOpenedListener:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$Companion.smali
index 3133027749..e3ac1fc614 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$Companion.smali
@@ -62,7 +62,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;
 
@@ -94,13 +96,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onCreateDialog$1.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onCreateDialog$1.smali
index f856601a0d..8ffab80bb1 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onCreateDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onCreateDialog$1.smali
@@ -39,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onCreateDialog$1;->$dialog:Landroid/app/Dialog;
 
-    const v0, 0x7f0a02c3
+    const v0, 0x7f0a02c6
 
     invoke-virtual {p1, v0}, Landroid/app/Dialog;->findViewById(I)Landroid/view/View;
 
@@ -51,7 +51,7 @@
 
     const-string v0, "BottomSheetBehavior.from(bottomSheet)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onViewCreated$2.smali
index 98c55991ee..e5e17e13f9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet$onViewCreated$2.smali
@@ -57,7 +57,7 @@
 
     const-string v2, "resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.smali
index a7847791f4..7d6ae5c587 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.smali
@@ -73,7 +73,7 @@
     :cond_0
     const-string p0, "container"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -113,7 +113,7 @@
     :cond_1
     const-string v0, "emojiPickerFragment"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -146,24 +146,17 @@
 .end method
 
 .method public onCancel(Landroid/content/DialogInterface;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dialog"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/fragment/app/DialogFragment;->onCancel(Landroid/content/DialogInterface;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;->cancelDialog()V
 
     return-void
-
-    :cond_0
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreateDialog(Landroid/os/Bundle;)Landroid/app/Dialog;
@@ -196,7 +189,9 @@
 .method public onEmojiPicked(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;->emojiPickerListenerDelegate:Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;
 
@@ -210,23 +205,14 @@
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
 
     return-void
-
-    :cond_1
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -236,38 +222,40 @@
 
     move-result-object p1
 
+    const/4 p2, 0x0
+
     if-eqz p1, :cond_0
 
-    const-string p2, "ARG_EMOJI_CONTEXT_TYPE"
+    const-string v0, "ARG_EMOJI_CONTEXT_TYPE"
 
-    invoke-virtual {p1, p2}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
+    invoke-virtual {p1, v0}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    move-object p1, v0
+    move-object p1, p2
 
     :goto_0
-    instance-of p2, p1, Lcom/discord/widgets/chat/input/emoji/EmojiContextType;
+    instance-of v0, p1, Lcom/discord/widgets/chat/input/emoji/EmojiContextType;
 
-    if-nez p2, :cond_1
+    if-nez v0, :cond_1
 
-    move-object p1, v0
+    move-object p1, p2
 
     :cond_1
     check-cast p1, Lcom/discord/widgets/chat/input/emoji/EmojiContextType;
 
-    new-instance p2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
+    new-instance v0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
-    invoke-direct {p2}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;-><init>()V
 
-    iput-object p2, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;->emojiPickerFragment:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
+    iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;->emojiPickerFragment:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
     const-string v1, "emojiPickerFragment"
 
-    if-eqz p2, :cond_5
+    if-eqz v0, :cond_5
 
     new-instance v2, Landroid/os/Bundle;
 
@@ -283,7 +271,7 @@
 
     invoke-virtual {v2, v3, p1}, Landroid/os/Bundle;->putSerializable(Ljava/lang/String;Ljava/io/Serializable;)V
 
-    invoke-virtual {p2, v2}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;->emojiPickerFragment:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
@@ -299,7 +287,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0a0335
+    const v0, 0x7f0a033b
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet;->emojiPickerFragment:Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
@@ -309,13 +297,13 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v0
+    move-result-object p2
 
-    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-virtual {p2}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p2
 
-    invoke-virtual {p1, p2, v2, v0}, Landroidx/fragment/app/FragmentTransaction;->replace(ILandroidx/fragment/app/Fragment;Ljava/lang/String;)Landroidx/fragment/app/FragmentTransaction;
+    invoke-virtual {p1, v0, v2, p2}, Landroidx/fragment/app/FragmentTransaction;->replace(ILandroidx/fragment/app/Fragment;Ljava/lang/String;)Landroidx/fragment/app/FragmentTransaction;
 
     move-result-object p1
 
@@ -332,31 +320,24 @@
     return-void
 
     :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p2
 
     :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p2
 
     :cond_4
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p2
 
     :cond_5
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p2
 .end method
 
 .method public final setEmojiPickerListener(Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage.smali
index 591fd78005..229ac05e35 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gifCategoryItem"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;->gifCategoryItem:Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifCategoryItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifCategoryItem"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifCategoryItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;->gifCategoryItem:Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1.smali
index c203b162c6..e6c499e231 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ExpressionTrayViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1;->this$0:Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->access$handleStoreState(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory$observeStoreState$1.smali
index 5108eb4fd9..077dfb4fe0 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "ExpressionTrayViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -64,7 +66,7 @@
 
     const-string v1, "canShowGifPickerNfx"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory.smali
index 6f571e5e6d..2b94a01c2b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory.smali
@@ -35,24 +35,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/chat/input/gifpicker/GifPickerNfxManager;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifPickerNfxManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory;->gifPickerNfxManager:Lcom/discord/widgets/chat/input/gifpicker/GifPickerNfxManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifPickerNfxManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/chat/input/gifpicker/GifPickerNfxManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -103,13 +96,13 @@
 
     sget-object v1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "gifPickerNfxManager\n    \u2026te(canShowGifPickerNfx) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -128,26 +121,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "modelClass"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory;->observeStoreState()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x1
 
-    invoke-direct {p1, v0, v1, v2, v0}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;-><init>(Lcom/discord/stores/StoreAnalytics;Lrx/Observable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p1, v1, v0, v2, v1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;-><init>(Lcom/discord/stores/StoreAnalytics;Lrx/Observable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState.smali
index d06dcc5ee0..0d543f6a0b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState.smali
@@ -26,9 +26,11 @@
 
 # direct methods
 .method public constructor <init>(ZLcom/discord/widgets/chat/input/expression/ExpressionTrayTab;Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_1
+    const-string v0, "selectedExpressionTab"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,15 +53,6 @@
     iput-boolean p1, p0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;->showLandingPage:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "selectedExpressionTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(ZLcom/discord/widgets/chat/input/expression/ExpressionTrayTab;Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -137,22 +130,15 @@
 .method public final copy(ZLcom/discord/widgets/chat/input/expression/ExpressionTrayTab;Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage;)Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "selectedExpressionTab"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;-><init>(ZLcom/discord/widgets/chat/input/expression/ExpressionTrayTab;Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "selectedExpressionTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -176,7 +162,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;->selectedExpressionTab:Lcom/discord/widgets/chat/input/expression/ExpressionTrayTab;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -186,7 +172,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;->expressionDetailPage:Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.smali
index d754337375..ea0abeb851 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "ExpressionTrayViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;",
         ">;"
     }
@@ -51,29 +51,31 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeAnalytics"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeStateObservable"
 
-    new-instance v7, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    new-instance v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;
 
     sget-object v3, Lcom/discord/widgets/chat/input/expression/ExpressionTrayTab;->EMOJI:Lcom/discord/widgets/chat/input/expression/ExpressionTrayTab;
 
+    const/4 v2, 0x0
+
     const/4 v4, 0x0
 
     const/4 v5, 0x4
 
     const/4 v6, 0x0
 
-    move-object v1, v7
+    move-object v1, v0
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;-><init>(ZLcom/discord/widgets/chat/input/expression/ExpressionTrayTab;Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-direct {p0, v7}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->storeAnalytics:Lcom/discord/stores/StoreAnalytics;
 
@@ -83,22 +85,24 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
-    const/4 p1, 0x2
+    const/4 p1, 0x0
 
-    invoke-static {p2, p0, v0, p1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p2, p0, p1, v0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
 
-    const/4 v3, 0x0
-
-    const/4 v5, 0x0
-
     new-instance v7, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1;
 
     invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$1;-><init>(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;)V
 
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -106,20 +110,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreAnalytics;Lrx/Observable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -183,7 +173,7 @@
 .method private final handleStoreState(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$StoreState;)V
     .locals 7
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -245,7 +235,7 @@
 .method public final canShowGifPickerTooltip()Z
     .locals 1
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -261,7 +251,7 @@
 .method public final clickBack()V
     .locals 7
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -298,7 +288,7 @@
 .method public final clickSearch()V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -341,7 +331,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -384,7 +374,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -392,9 +382,11 @@
 .method public final selectGifCategory(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifCategoryItem"
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -402,14 +394,14 @@
 
     check-cast v1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;
 
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
     new-instance v4, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;
 
     invoke-direct {v4, p1}, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V
 
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
     const/4 v5, 0x3
 
     const/4 v6, 0x0
@@ -421,23 +413,16 @@
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->updateViewState(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gifCategoryItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final selectTab(Lcom/discord/widgets/chat/input/expression/ExpressionTrayTab;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "expressionTrayTab"
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -462,37 +447,33 @@
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->updateViewState(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "expressionTrayTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public updateViewState(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "viewState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;->getSelectedExpressionTab()Lcom/discord/widgets/chat/input/expression/ExpressionTrayTab;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
+    check-cast v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;->getSelectedExpressionTab()Lcom/discord/widgets/chat/input/expression/ExpressionTrayTab;
+
+    move-result-object v0
+
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     invoke-virtual {p1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;->getSelectedExpressionTab()Lcom/discord/widgets/chat/input/expression/ExpressionTrayTab;
 
     move-result-object v1
@@ -518,16 +499,9 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreAnalytics;->trackChatInputComponentViewed(Ljava/lang/String;)V
 
     :cond_1
-    invoke-super {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-super {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic updateViewState(Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$Companion.smali
index 8fd9a5361c..554ae54f19 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$Companion.smali
@@ -72,7 +72,7 @@
 
     const-string v1, "isExpressionTrayActiveSu\u2026ct.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$ExpressionTabViews.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$ExpressionTabViews.smali
index 4af49a22ec..31f19b1ce9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$ExpressionTabViews.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$ExpressionTabViews.smali
@@ -26,13 +26,17 @@
 .method public constructor <init>(Landroid/widget/TextView;Landroidx/cardview/widget/CardView;Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "button"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "card"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "content"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,27 +47,6 @@
     iput-object p3, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$ExpressionTabViews;->content:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "card"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "button"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2.smali
index f287d1ed54..b75d879031 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetExpressionTray.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onGifSelected"
+
+    const-string v5, "onGifSelected()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onGifSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onGifSelected()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$1.smali
index ff51664f89..14b21cbb06 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetExpressionTray.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onGifSelected"
+
+    const-string v5, "onGifSelected()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onGifSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onGifSelected()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$2.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$2.smali
index 217b084210..fbb7b92b67 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetExpressionTray.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onGifSearchSheetCanceled"
+
+    const-string v5, "onGifSearchSheetCanceled()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onGifSearchSheetCanceled"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onGifSearchSheetCanceled()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$1.smali
index dc208d9007..3096d338ca 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetExpressionTray.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->access$handleViewState(Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.smali
index 52050913d4..edc437addb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetExpressionTray.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->access$handleEvent(Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setUpGifPicker$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setUpGifPicker$1.smali
index 2fdd9e22dd..9fc3047c60 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setUpGifPicker$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setUpGifPicker$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$setUpGifPicker$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetExpressionTray.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "selectGifCategory"
+
+    const-string v5, "selectGifCategory(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectGifCategory"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectGifCategory(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->selectGifCategory(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$1.smali
index 7dbd0ebb8e..f8e95857bd 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$1.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$1;->this$0:Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
@@ -62,18 +64,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.smali
index c61f338c8c..9fec695260 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2;->this$0:Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
@@ -54,18 +56,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$showGifPickerTooltip$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$showGifPickerTooltip$1.smali
index 6c0918d60f..18ab39852c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$showGifPickerTooltip$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$showGifPickerTooltip$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetExpressionTray.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TR;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Void;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$subscribeToScrollPosition$1.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$subscribeToScrollPosition$1.smali
index 9b9fcd6602..ec97dd15d5 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$subscribeToScrollPosition$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray$subscribeToScrollPosition$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$subscribeToScrollPosition$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetExpressionTray.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     const-string v0, "isAtInitialScrollPosition"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray.smali b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray.smali
index ae645bbb80..14e1874208 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/expression/WidgetExpressionTray.smali
@@ -122,281 +122,197 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const/4 v2, 0x0
+    const-string v2, "landingPage"
 
-    aput-object v1, v0, v2
+    const-string v3, "getLandingPage()Landroid/view/ViewGroup;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "landingPage"
-
-    const-string v4, "getLandingPage()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "landingPageContentContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLandingPageContentContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "landingPageContentContainer"
-
-    const-string v4, "getLandingPageContentContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "detailPage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDetailPage()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "detailPage"
-
-    const-string v4, "getDetailPage()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "toolbarLayout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getToolbarLayout()Lcom/google/android/material/appbar/AppBarLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "toolbarLayout"
-
-    const-string v4, "getToolbarLayout()Lcom/google/android/material/appbar/AppBarLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "emojiCard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiCard()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojiCard"
-
-    const-string v4, "getEmojiCard()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "emojiButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiButton()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojiButton"
-
-    const-string v4, "getEmojiButton()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "gifCard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifCard()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifCard"
-
-    const-string v4, "getGifCard()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "gifButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifButton()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifButton"
-
-    const-string v4, "getGifButton()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "searchButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchButton()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchButton"
-
-    const-string v4, "getSearchButton()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "searchBar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchBar()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchBar"
-
-    const-string v4, "getSearchBar()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "searchIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchIcon"
-
-    const-string v4, "getSearchIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "emojiPickerContent"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiPickerContent()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojiPickerContent"
-
-    const-string v4, "getEmojiPickerContent()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
 
-    const-class v2, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;
+    const-string v2, "gifPickerContent"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifPickerContent()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifPickerContent"
-
-    const-string v4, "getGifPickerContent()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
@@ -420,7 +336,7 @@
 
     const-string v1, "BehaviorSubject.create(false)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->isExpressionTrayActiveSubject:Lrx/subjects/BehaviorSubject;
 
@@ -432,7 +348,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a036b
+    const v0, 0x7f0a0371
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -440,7 +356,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0374
+    const v0, 0x7f0a037a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -448,7 +364,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->landingPage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a036c
+    const v0, 0x7f0a0372
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -456,7 +372,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->landingPageContentContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a036d
+    const v0, 0x7f0a0373
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -464,7 +380,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->detailPage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a037a
+    const v0, 0x7f0a0380
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -472,7 +388,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->toolbarLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a036f
+    const v0, 0x7f0a0375
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -480,7 +396,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->emojiCard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a036e
+    const v0, 0x7f0a0374
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -488,7 +404,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->emojiButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0372
+    const v0, 0x7f0a0378
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -496,7 +412,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->gifCard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0371
+    const v0, 0x7f0a0377
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -504,7 +420,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->gifButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0376
+    const v0, 0x7f0a037c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -512,7 +428,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->searchButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0375
+    const v0, 0x7f0a037b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -520,7 +436,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->searchBar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0377
+    const v0, 0x7f0a037d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -528,7 +444,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->searchIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0370
+    const v0, 0x7f0a0376
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -536,7 +452,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->emojiPickerContent$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0373
+    const v0, 0x7f0a0379
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -546,43 +462,49 @@
 
     sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v1, 0x0
+    const-string v1, "logger"
 
-    if-eqz v0, :cond_4
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
+    sget-object v1, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
 
-    if-eqz v2, :cond_0
+    const/4 v2, 0x0
 
-    invoke-virtual {v2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+    if-eqz v1, :cond_0
 
-    move-result-object v2
+    invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
-    check-cast v2, Lf/a/c/a;
+    move-result-object v1
+
+    check-cast v1, Lf/a/c/a;
 
     goto :goto_0
 
     :cond_0
-    move-object v2, v1
+    move-object v1, v2
 
     :goto_0
-    if-nez v2, :cond_1
+    if-nez v1, :cond_1
 
-    new-instance v2, Lf/a/c/a;
+    new-instance v1, Lf/a/c/a;
 
-    invoke-direct {v2, v0}, Lf/a/c/a;-><init>(Lcom/discord/utilities/logging/Logger;)V
+    invoke-direct {v1, v0}, Lf/a/c/a;-><init>(Lcom/discord/utilities/logging/Logger;)V
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
-    invoke-direct {v0, v2}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
     sput-object v0, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
 
     :cond_1
-    move-object v7, v2
+    move-object v7, v1
 
     sget-object v0, Lcom/discord/tooltips/TooltipManager$a;->d:Lcom/discord/tooltips/TooltipManager$a;
 
+    const-string v0, "floatingViewManager"
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object v0, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
 
     if-eqz v0, :cond_2
@@ -591,14 +513,14 @@
 
     move-result-object v0
 
-    move-object v1, v0
+    move-object v2, v0
 
-    check-cast v1, Lcom/discord/tooltips/TooltipManager;
+    check-cast v2, Lcom/discord/tooltips/TooltipManager;
 
     :cond_2
-    if-nez v1, :cond_3
+    if-nez v2, :cond_3
 
-    new-instance v1, Lcom/discord/tooltips/TooltipManager;
+    new-instance v2, Lcom/discord/tooltips/TooltipManager;
 
     sget-object v0, Lcom/discord/tooltips/TooltipManager$a;->b:Lkotlin/Lazy;
 
@@ -624,22 +546,22 @@
 
     const/4 v8, 0x4
 
-    move-object v3, v1
+    move-object v3, v2
 
     invoke-direct/range {v3 .. v8}, Lcom/discord/tooltips/TooltipManager;-><init>(Lf/a/l/a;Ljava/util/Set;ILf/a/c/a;I)V
 
     new-instance v0, Ljava/lang/ref/WeakReference;
 
-    invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v2}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
     sput-object v0, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
 
     :cond_3
-    iput-object v1, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->tooltipManager:Lcom/discord/tooltips/TooltipManager;
+    iput-object v2, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->tooltipManager:Lcom/discord/tooltips/TooltipManager;
 
     new-instance v0, Lcom/discord/tooltips/DefaultTooltipCreator;
 
-    invoke-direct {v0, v1}, Lcom/discord/tooltips/DefaultTooltipCreator;-><init>(Lcom/discord/tooltips/TooltipManager;)V
+    invoke-direct {v0, v2}, Lcom/discord/tooltips/DefaultTooltipCreator;-><init>(Lcom/discord/tooltips/TooltipManager;)V
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->defaultTooltipCreator:Lcom/discord/tooltips/DefaultTooltipCreator;
 
@@ -652,13 +574,6 @@
     iput-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->isAtInitialScrollPositionSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_4
-    const-string v0, "logger"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public static final synthetic access$getEmojiPickerContent$p(Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;)Landroid/view/ViewGroup;
@@ -683,7 +598,7 @@
     :cond_0
     const-string p0, "expressionTrayViewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -807,7 +722,7 @@
 
     instance-of v0, p1, Lcom/discord/widgets/chat/input/expression/ExpressionDetailPage$GifCategoryPage;
 
-    const v1, 0x7f0a036d
+    const v1, 0x7f0a0373
 
     if-eqz v0, :cond_0
 
@@ -1057,7 +972,7 @@
 
     if-ne p1, v1, :cond_7
 
-    const p1, 0x7f121427
+    const p1, 0x7f121451
 
     goto :goto_6
 
@@ -1069,7 +984,7 @@
     throw p1
 
     :cond_8
-    const p1, 0x7f121403
+    const p1, 0x7f12142d
 
     :goto_6
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
@@ -1082,7 +997,7 @@
 
     const-string v0, "resources.getString(searchTextStringRes)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->getSearchButton()Landroid/widget/TextView;
 
@@ -1101,7 +1016,7 @@
     :cond_9
     const-string p1, "expressionTabToViewsMap"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1393,7 +1308,7 @@
 
     sget-object v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Event$ShowEmojiPickerSheet;->INSTANCE:Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Event$ShowEmojiPickerSheet;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1422,7 +1337,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->emojiPickerListener:Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;
 
@@ -1441,7 +1356,7 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Event$ShowGifPickerSheet;->INSTANCE:Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Event$ShowGifPickerSheet;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1459,7 +1374,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$handleEvent$1;
 
@@ -1541,7 +1456,7 @@
 
     const-string v0, "isAtInitialScrollPositionSubject"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
 
@@ -1549,7 +1464,7 @@
 
     const-string v0, "isAtInitialScrollPositionSubject.value"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Ljava/lang/Boolean;
 
@@ -1688,7 +1603,7 @@
     :cond_0
     const-string v0, "flexInputViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1709,7 +1624,7 @@
     :cond_0
     const-string v0, "flexInputViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1768,7 +1683,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0370
+    const v2, 0x7f0a0376
 
     const-class v3, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiPicker;
 
@@ -1823,7 +1738,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0373
+    const v2, 0x7f0a0379
 
     const-class v3, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
 
@@ -1844,7 +1759,7 @@
     :cond_1
     const-string v0, "expressionTrayViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1934,13 +1849,13 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_6
 
     invoke-virtual {v0}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->canShowGifPickerTooltip()Z
 
     move-result v0
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_5
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->defaultTooltipCreator:Lcom/discord/tooltips/DefaultTooltipCreator;
 
@@ -1962,19 +1877,15 @@
 
     const-string v4, "resources.getString(R.string._new)"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v6, Lcom/discord/floating_view_manager/FloatingViewGravity;->TOP:Lcom/discord/floating_view_manager/FloatingViewGravity;
 
     const/4 v7, 0x0
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    const/4 v4, 0x4
 
-    move-result-object v4
-
-    const v8, 0x7f0701ee
-
-    invoke-virtual {v4, v8}, Landroid/content/res/Resources;->getDimensionPixelOffset(I)I
+    invoke-static {v4}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v8
 
@@ -1982,9 +1893,11 @@
 
     sget-object v9, Lcom/discord/widgets/chat/input/expression/ExpressionPickerSparkleGifTooltip;->INSTANCE:Lcom/discord/widgets/chat/input/expression/ExpressionPickerSparkleGifTooltip;
 
+    if-eqz v4, :cond_4
+
     const-string v10, "tooltip"
 
-    if-eqz v9, :cond_7
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, v4, Lcom/discord/tooltips/TooltipManager;->c:Ljava/util/Set;
 
@@ -1996,27 +1909,39 @@
 
     move-result v9
 
-    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v4
 
     sget-object v11, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$showGifPickerTooltip$1;->INSTANCE:Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray$showGifPickerTooltip$1;
 
-    invoke-virtual {v4, v11}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v4, v11}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v11
 
-    const-string v4, "this.paused.map { Unit }"
+    const-string v4, "this.unsubscribeSignal.map { Unit }"
 
-    invoke-static {v11, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_6
+    if-eqz v0, :cond_3
 
-    if-eqz v3, :cond_5
+    const-string v1, "anchorView"
 
-    if-eqz v5, :cond_4
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_3
+    const-string v1, "tooltipText"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v5, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "tooltipGravity"
+
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "componentPausedObservable"
+
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -2060,7 +1985,7 @@
 
     check-cast v4, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0a02c0
+    const v1, 0x7f0a02c3
 
     invoke-virtual {v4, v1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -2070,7 +1995,7 @@
 
     const-string v10, "tooltipTextView"
 
-    invoke-static {v1, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -2089,54 +2014,33 @@
     goto :goto_1
 
     :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
-    invoke-direct {v0, v12}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v12}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
-    invoke-direct {v0, v12}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v12}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
     :cond_3
-    const-string v0, "tooltipGravity"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     throw v1
 
     :cond_4
-    invoke-static {v10}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     throw v1
 
     :cond_5
-    const-string v0, "anchorView"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    throw v1
-
-    :cond_7
-    invoke-static {v10}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_8
     :goto_1
     return-void
 
-    :cond_9
+    :cond_6
     const-string v0, "expressionTrayViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2152,7 +2056,7 @@
 
     const-string v1, "isAtInitialScrollPositio\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -2241,7 +2145,7 @@
     :cond_0
     const-string p1, "emojiPickerFragment"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -2262,7 +2166,7 @@
     :cond_2
     const-string p1, "gifPickerFragment"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -2296,12 +2200,12 @@
     goto :goto_2
 
     :cond_5
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_6
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -2317,7 +2221,7 @@
     return-void
 
     :cond_9
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -2351,7 +2255,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026rayViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
 
@@ -2377,7 +2281,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026putViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
 
@@ -2389,7 +2293,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -2442,15 +2348,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2466,7 +2363,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -2531,33 +2428,26 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
 
 .method public final setEmojiPickerListener(Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojiPickerListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->emojiPickerListener:Lcom/discord/widgets/chat/input/emoji/EmojiPickerListener;
 
     return-void
-
-    :cond_0
-    const-string p1, "emojiPickerListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnBackspacePressedListener(Lcom/discord/widgets/chat/input/emoji/OnBackspacePressedListener;)V
@@ -2569,7 +2459,7 @@
 .end method
 
 .method public final setOnEmojiSearchOpenedListener(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -2579,18 +2469,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/expression/WidgetExpressionTray;->onEmojiSearchOpenedListener:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$Companion.smali
index 1226bf21df..8d6a176757 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$Companion.smali
@@ -34,9 +34,11 @@
 
 # virtual methods
 .method public final calculateColumnCount(Landroidx/recyclerview/widget/RecyclerView;)I
-    .locals 2
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
 
@@ -44,7 +46,7 @@
 
     const-string v0, "recyclerView.resources"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -64,30 +66,23 @@
 
     move-result v0
 
-    const/4 v1, 0x2
-
     div-int/2addr p1, v0
 
-    invoke-static {v1, p1}, Ljava/lang/Math;->max(II)I
+    const/4 v0, 0x2
+
+    invoke-static {v0, p1}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final calculateColumnWidth(Landroidx/recyclerview/widget/RecyclerView;II)I
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
 
@@ -95,7 +90,7 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -173,13 +168,4 @@
     float-to-int p1, p3
 
     return p1
-
-    :cond_2
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1.smali
index 8a1a84f074..9c1184461b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GifAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,20 +73,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->access$setItems$p(Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter.smali
index d90e90abcc..ffae844e27 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapter.smali
@@ -119,11 +119,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "appComponent"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "diffCreator"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -137,25 +139,11 @@
 
     iput-object p5, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "diffCreator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/app/AppComponent;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/recycler/DiffCreator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -230,7 +218,7 @@
 .method public final clearItems()V
     .locals 1
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->setItems(Ljava/util/List;)V
 
@@ -284,7 +272,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder;I)V
     .locals 2
 
-    if-eqz p1, :cond_3
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->items:Ljava/util/List;
 
@@ -341,15 +331,6 @@
     :cond_2
     :goto_0
     return-void
-
-    :cond_3
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -365,7 +346,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder;
     .locals 4
 
-    if-eqz p1, :cond_3
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -418,7 +401,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;-><init>(Landroid/view/View;)V
 
@@ -433,25 +416,16 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$Gif;-><init>(Landroid/view/View;)V
 
     :goto_1
     return-object p2
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setItems(Ljava/util/List;)V
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -462,32 +436,25 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "newItems"
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v2, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1;
+    iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;)V
+    new-instance v3, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1;
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->items:Ljava/util/List;
+    invoke-direct {v3, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$setItems$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;)V
 
-    iget-object v5, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->appComponent:Lcom/discord/app/AppComponent;
+    iget-object v4, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->items:Ljava/util/List;
 
-    move-object v1, p0
+    iget-object v6, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter;->appComponent:Lcom/discord/app/AppComponent;
 
-    move-object v4, p1
+    move-object v2, p0
 
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/recycler/DiffCreator;->dispatchDiffUpdatesAsync(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;Lcom/discord/app/AppComponent;)V
+    move-object v5, p1
+
+    invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/recycler/DiffCreator;->dispatchDiffUpdatesAsync(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;Lcom/discord/app/AppComponent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem.smali
index 15348f5fcc..95c89ad77a 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem.smali
@@ -24,26 +24,21 @@
 .method public constructor <init>(Lcom/discord/models/gifpicker/dto/ModelGif;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "gif"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;->VIEW_TYPE_GIF_ITEM:Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;
+    sget-object v0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;->VIEW_TYPE_GIF_ITEM:Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;->gif:Lcom/discord/models/gifpicker/dto/ModelGif;
 
     iput-object p2, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;->query:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "gif"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/gifpicker/dto/ModelGif;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -106,22 +101,15 @@
 .method public final copy(Lcom/discord/models/gifpicker/dto/ModelGif;Ljava/lang/String;)Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gif"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;-><init>(Lcom/discord/models/gifpicker/dto/ModelGif;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gif"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -139,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;->gif:Lcom/discord/models/gifpicker/dto/ModelGif;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -149,7 +137,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;->query:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults.smali
index dd0b20bb37..e9d3510125 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults.smali
@@ -40,26 +40,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "terms"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;->VIEW_TYPE_GIF_SEARCH_TERMS_EMPTY_RESULTS:Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;
+    sget-object v0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;->VIEW_TYPE_GIF_SEARCH_TERMS_EMPTY_RESULTS:Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;
 
-    invoke-direct {p0, p1, v1, p2, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem;-><init>(Ljava/util/List;Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, p1, v0, p2, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem;-><init>(Ljava/util/List;Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;->terms:Ljava/util/List;
 
     iput p2, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;->titleResId:I
 
     return-void
-
-    :cond_0
-    const-string p1, "terms"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;Ljava/util/List;IILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;
@@ -132,22 +127,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "terms"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;-><init>(Ljava/util/List;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "terms"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -169,7 +157,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults.smali
index 4f543943be..1b4cbb607e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults.smali
@@ -40,26 +40,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "terms"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;->VIEW_TYPE_GIF_SEARCH_TERMS_NON_EMPTY_RESULTS:Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;
+    sget-object v0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;->VIEW_TYPE_GIF_SEARCH_TERMS_NON_EMPTY_RESULTS:Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;
 
-    invoke-direct {p0, p1, v1, p2, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem;-><init>(Ljava/util/List;Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, p1, v0, p2, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem;-><init>(Ljava/util/List;Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$ViewType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;->terms:Ljava/util/List;
 
     iput p2, p0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;->titleResId:I
 
     return-void
-
-    :cond_0
-    const-string p1, "terms"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;Ljava/util/List;IILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;
@@ -132,22 +127,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "terms"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;-><init>(Ljava/util/List;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "terms"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -169,7 +157,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1.smali
index 623b7689fc..b32a94328c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GifCategoryAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,20 +73,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->access$setItems$p(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.smali
index 577d8d3e61..93a3020fe7 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.smali
@@ -73,11 +73,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "appComponent"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "diffCreator"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -87,25 +89,11 @@
 
     iput-object p3, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "diffCreator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/app/AppComponent;Lkotlin/jvm/functions/Function1;Lcom/discord/utilities/recycler/DiffCreator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -168,7 +156,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->items:Ljava/util/List;
 
@@ -183,15 +173,6 @@
     invoke-virtual {p1, p2, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->configure(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -207,7 +188,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -229,24 +212,15 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setItems(Ljava/util/List;)V
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -257,32 +231,25 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "newItems"
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v2, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1;
+    iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->diffCreator:Lcom/discord/utilities/recycler/DiffCreator;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;)V
+    new-instance v3, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1;
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->items:Ljava/util/List;
+    invoke-direct {v3, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter$setItems$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;)V
 
-    iget-object v5, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->appComponent:Lcom/discord/app/AppComponent;
+    iget-object v4, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->items:Ljava/util/List;
 
-    move-object v1, p0
+    iget-object v6, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryAdapter;->appComponent:Lcom/discord/app/AppComponent;
 
-    move-object v4, p1
+    move-object v2, p0
 
-    invoke-virtual/range {v0 .. v5}, Lcom/discord/utilities/recycler/DiffCreator;->dispatchDiffUpdatesAsync(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;Lcom/discord/app/AppComponent;)V
+    move-object v5, p1
+
+    invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/recycler/DiffCreator;->dispatchDiffUpdatesAsync(Landroidx/recyclerview/widget/RecyclerView$Adapter;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;Lcom/discord/app/AppComponent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard.smali
index 152b00ed06..3bfa4f6078 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/gifpicker/domain/ModelGifCategory;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gifCategory"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;->gifCategory:Lcom/discord/models/gifpicker/domain/ModelGifCategory;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;Lcom/discord/models/gifpicker/domain/ModelGifCategory;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/gifpicker/domain/ModelGifCategory;)Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifCategory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;-><init>(Lcom/discord/models/gifpicker/domain/ModelGifCategory;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifCategory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;->gifCategory:Lcom/discord/models/gifpicker/domain/ModelGifCategory;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending.smali
index f7861b201a..7e10e6a8be 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gifPreviewUrl"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;->gifPreviewUrl:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifPreviewUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;
@@ -70,22 +65,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifPreviewUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifPreviewUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;->gifPreviewUrl:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.smali
index d0d9c17078..858524ec12 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.smali
@@ -15,11 +15,13 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
-    const v0, 0x7f0a03e8
+    const v0, 0x7f0a03ee
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -37,7 +39,7 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
-    const v0, 0x7f0a03e9
+    const v0, 0x7f0a03ef
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,7 +49,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a03e7
+    const v0, 0x7f0a03ed
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -58,15 +60,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryIcon:Landroid/widget/ImageView;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final setPreviewImage(Ljava/lang/String;)V
@@ -76,7 +69,7 @@
 
     const-string v1, "previewImage"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/widget/ImageView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -88,7 +81,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->previewImage:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -112,7 +105,7 @@
 
 # virtual methods
 .method public final configure(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;Lkotlin/jvm/functions/Function1;)V
-    .locals 6
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -125,17 +118,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "gifCategoryItem"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;
+    instance-of v0, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Standard;
 
-    const-string v2, "categoryIcon"
+    const-string v1, "categoryIcon"
 
-    const-string v3, "categoryText"
+    const-string v2, "categoryText"
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     move-object v0, p1
 
@@ -147,23 +140,23 @@
 
     invoke-virtual {v0}, Lcom/discord/models/gifpicker/domain/ModelGifCategory;->getGifPreviewUrl()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v3
 
-    invoke-direct {p0, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->setPreviewImage(Ljava/lang/String;)V
+    invoke-direct {p0, v3}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->setPreviewImage(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryText:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryText:Landroid/widget/TextView;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/gifpicker/domain/ModelGifCategory;->getCategoryName()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v3, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryIcon:Landroid/widget/ImageView;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v1, 0x8
 
@@ -172,67 +165,69 @@
     goto :goto_0
 
     :cond_0
-    instance-of v1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;
+    instance-of v0, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    move-object v1, p1
+    move-object v0, p1
 
-    check-cast v1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;
+    check-cast v0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;->getGifPreviewUrl()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem$Trending;->getGifPreviewUrl()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p0, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->setPreviewImage(Ljava/lang/String;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->setPreviewImage(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryText:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryText:Landroid/widget/TextView;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    const-string v4, "itemView"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v3
-
-    const v5, 0x7f120850
-
-    invoke-virtual {v3, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryIcon:Landroid/widget/ImageView;
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryIcon:Landroid/widget/ImageView;
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v3, "itemView"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
     move-result-object v2
 
-    const v3, 0x7f080217
+    const v4, 0x7f120852
 
-    invoke-static {v2, v3, v0}, Landroidx/core/content/res/ResourcesCompat;->getDrawable(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
+    invoke-virtual {v2, v4}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryIcon:Landroid/widget/ImageView;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder;->categoryIcon:Landroid/widget/ImageView;
+
+    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    const v2, 0x7f080218
+
+    const/4 v3, 0x0
+
+    invoke-static {v1, v2, v3}, Landroidx/core/content/res/ResourcesCompat;->getDrawable(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
     :cond_1
     :goto_0
@@ -245,11 +240,4 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "gifCategoryItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1.smali
index 30ad90f46d..b968ff56b9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GifCategoryViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;->access$handleStoreState(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory$observeStoreState$1.smali
index 2986c7eb6b..930ca67507 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "GifCategoryViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/ModelGif;",
+        ">;",
+        "Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -73,7 +78,7 @@
 
     const-string v1, "gifs"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory.smali
index 12d6750721..de2b219c26 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory.smali
@@ -29,13 +29,17 @@
 .method public constructor <init>(Landroid/content/Context;Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;Lcom/discord/stores/StoreGifPicker;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "gifCategoryItem"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeGifPicker"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,27 +50,6 @@
     iput-object p3, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory;->storeGifPicker:Lcom/discord/stores/StoreGifPicker;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeGifPicker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "gifCategoryItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;Lcom/discord/stores/StoreGifPicker;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -137,13 +120,13 @@
     :goto_0
     sget-object v1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "gifsObservable.map { gifs -> StoreState(gifs) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -169,7 +152,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;
 
@@ -199,24 +184,15 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$Factory;->observeStoreState()Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
-    const/4 v4, 0x4
+    const/4 v5, 0x4
 
-    move-object v0, p1
+    move-object v1, p1
 
-    move-object v1, v10
+    move-object v2, v10
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;-><init>(Lcom/discord/widgets/chat/MessageManager;Lrx/Observable;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;-><init>(Lcom/discord/widgets/chat/MessageManager;Lrx/Observable;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState.smali
index dbefe2b310..98083f3282 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState.smali
@@ -28,7 +28,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -38,22 +38,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;->gifs:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;
@@ -103,22 +96,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +122,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$StoreState;->gifs:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState$gifCount$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState$gifCount$2.smali
index c9fcc46498..f34138f435 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState$gifCount$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState$gifCount$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState$gifCount$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GifCategoryViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Integer;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState.smali
index c2820a5ae4..aa04e2783e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -40,7 +40,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,15 +59,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;->gifCount$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "gifItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;
@@ -115,22 +108,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -148,7 +134,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;->gifItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.smali
index 0eacd22371..1338659ca9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "GifCategoryViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;",
         ">;"
     }
@@ -52,15 +52,21 @@
         }
     .end annotation
 
+    const-string v0, "messageManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeAnalytics"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;->messageManager:Lcom/discord/widgets/chat/MessageManager;
 
@@ -90,6 +96,10 @@
 
     const-class v2, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;
 
+    new-instance v7, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -98,10 +108,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -109,27 +115,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "messageManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/chat/MessageManager;Lrx/Observable;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -220,7 +205,7 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreAnalytics;->trackSearchResultViewed(Lcom/discord/utilities/analytics/SearchType;I)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -230,9 +215,11 @@
 .method public final selectGif(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;)V
     .locals 14
 
-    if-eqz p1, :cond_1
+    const-string v0, "gifItem"
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -282,13 +269,4 @@
     invoke-static/range {v4 .. v13}, Lcom/discord/widgets/chat/MessageManager;->sendMessage$default(Lcom/discord/widgets/chat/MessageManager;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;Ljava/lang/Long;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Z
 
     return-void
-
-    :cond_1
-    const-string p1, "gifItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter.smali
index e31f586619..1bde6b551f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter.smali
@@ -40,7 +40,7 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter;->heightsDp:Ljava/util/List;
 
@@ -74,7 +74,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter;->heightsDp:Ljava/util/List;
 
@@ -91,15 +93,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder;->configure(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -115,7 +108,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -137,24 +132,15 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -164,20 +150,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "heightsDp"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter;->heightsDp:Ljava/util/List;
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "heightsDp"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder.smali
index b8eb24ca1a..ba88697aab 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifViewHolder.smali
@@ -16,22 +16,15 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -43,7 +36,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -53,7 +46,7 @@
 
     iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
@@ -61,7 +54,7 @@
 
     const-string v3, "itemView.resources"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -77,7 +70,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView.smali
index fec56560e8..a479be6205 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifLoadingView.smali
@@ -20,9 +20,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;)V
 
@@ -33,21 +35,14 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->loadingGifAdapter:Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView$LoadingGifAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -60,21 +55,14 @@
     invoke-direct {p0, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -87,15 +75,6 @@
     invoke-direct {p0, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -205,13 +184,9 @@
 
     new-instance v0, Lcom/discord/utilities/recycler/GridColumnSpaceItemDecoration;
 
-    invoke-virtual {p0}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
+    const/16 v2, 0x8
 
-    move-result-object v2
-
-    const v3, 0x7f0701ed
-
-    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v2}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v2
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager$observeCanShowGifPickerNfx$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager$observeCanShowGifPickerNfx$1.smali
index 45342525c1..f69068573f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager$observeCanShowGifPickerNfx$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager$observeCanShowGifPickerNfx$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/models/domain/ModelUser$Me;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -49,30 +52,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    check-cast p2, Lcom/discord/models/domain/ModelUser$Me;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerNfxManager$observeCanShowGifPickerNfx$1;->call(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser$Me;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser$Me;)Z
+.method public final call(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser$Me;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "isHomeInitialized"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -96,5 +81,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    check-cast p2, Lcom/discord/models/domain/ModelUser$Me;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerNfxManager$observeCanShowGifPickerNfx$1;->call(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser$Me;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager.smali
index 1f26c2a760..bf8b3fbf80 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerNfxManager.smali
@@ -75,13 +75,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userStore"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "clock"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "tooltipManager"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -92,27 +96,6 @@
     iput-object p3, p0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerNfxManager;->tooltipManager:Lcom/discord/tooltips/TooltipManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "tooltipManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -140,47 +123,53 @@
     :cond_1
     and-int/lit8 p4, p4, 0x4
 
-    if-eqz p4, :cond_6
+    if-eqz p4, :cond_5
 
     sget-object p3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 p4, 0x0
+    const-string p4, "logger"
 
-    if-eqz p3, :cond_5
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p5, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
+    sget-object p4, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
 
-    if-eqz p5, :cond_2
+    const/4 p5, 0x0
 
-    invoke-virtual {p5}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+    if-eqz p4, :cond_2
 
-    move-result-object p5
+    invoke-virtual {p4}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
-    check-cast p5, Lf/a/c/a;
+    move-result-object p4
+
+    check-cast p4, Lf/a/c/a;
 
     goto :goto_0
 
     :cond_2
-    move-object p5, p4
+    move-object p4, p5
 
     :goto_0
-    if-nez p5, :cond_3
+    if-nez p4, :cond_3
 
-    new-instance p5, Lf/a/c/a;
+    new-instance p4, Lf/a/c/a;
 
-    invoke-direct {p5, p3}, Lf/a/c/a;-><init>(Lcom/discord/utilities/logging/Logger;)V
+    invoke-direct {p4, p3}, Lf/a/c/a;-><init>(Lcom/discord/utilities/logging/Logger;)V
 
     new-instance p3, Ljava/lang/ref/WeakReference;
 
-    invoke-direct {p3, p5}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p3, p4}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
     sput-object p3, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
 
     :cond_3
-    move-object v4, p5
+    move-object v4, p4
 
     sget-object p3, Lcom/discord/tooltips/TooltipManager$a;->d:Lcom/discord/tooltips/TooltipManager$a;
 
+    const-string p3, "floatingViewManager"
+
+    invoke-static {v4, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object p3, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
 
     if-eqz p3, :cond_4
@@ -194,10 +183,10 @@
     goto :goto_1
 
     :cond_4
-    move-object p3, p4
+    move-object p3, p5
 
     :goto_1
-    if-nez p3, :cond_6
+    if-nez p3, :cond_5
 
     new-instance p3, Lcom/discord/tooltips/TooltipManager;
 
@@ -235,17 +224,7 @@
 
     sput-object p4, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
 
-    goto :goto_2
-
     :cond_5
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_6
-    :goto_2
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerNfxManager;-><init>(Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;)V
 
     return-void
@@ -368,7 +347,7 @@
 
     const-string v1, "Observable.combineLatest\u2026canShowGifPickerNfx(me) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$1.smali
index d3afab81ae..29f80bbf2d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GifPickerViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;->access$handleStoreState(Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali
index d4ea168d9c..d490e2039e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory$create$1.smali
@@ -27,7 +27,13 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/domain/ModelGifCategory;",
+        ">;",
+        "Ljava/lang/String;",
+        "Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -77,11 +83,11 @@
 
     const-string v1, "gifCategories"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "trendingGifCategoryPreviewUrl"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;-><init>(Ljava/util/List;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory.smali
index beab4d46ad..8fda462887 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory.smali
@@ -35,24 +35,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreGifPicker;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeGifPicker"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$Factory;->storeGifPicker:Lcom/discord/stores/StoreGifPicker;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeGifPicker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreGifPicker;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -88,7 +81,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;
 
@@ -112,18 +107,9 @@
 
     const-string v1, "Observable.combineLatest\u2026            )\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;-><init>(Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali
index babaf92590..cff0a2f2b4 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState.smali
@@ -42,11 +42,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "gifCategories"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "trendingGifCategoryPreviewUrl"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,20 +57,6 @@
     iput-object p2, p0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;->trendingGifCategoryPreviewUrl:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "trendingGifCategoryPreviewUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "gifCategories"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;
@@ -135,31 +123,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "gifCategories"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "trendingGifCategoryPreviewUrl"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;-><init>(Ljava/util/List;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "trendingGifCategoryPreviewUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "gifCategories"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -177,7 +153,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;->gifCategories:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -187,7 +163,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;->trendingGifCategoryPreviewUrl:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState.smali
index 720b15fbee..87aa716f47 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,7 +41,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifCategoryItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,15 +58,6 @@
     iput-boolean p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;->isLoaded:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "gifCategoryItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;
@@ -115,22 +108,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifCategoryItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "gifCategoryItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -148,7 +134,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;->gifCategoryItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel.smali
index 7f78a24f64..64c4929ab2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifPickerViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "GifPickerViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;",
         ">;"
     }
@@ -45,17 +45,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeStateObservable"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;
+    new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;
 
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;-><init>(Ljava/util/List;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;-><init>(Ljava/util/List;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;->storeStateObservable:Lrx/Observable;
 
@@ -63,9 +63,11 @@
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p1, p0, v1, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v2
 
@@ -90,13 +92,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$StoreState;)V
@@ -191,7 +186,7 @@
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;-><init>(Ljava/util/List;)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1.smali
index e40dd5d012..25dc3b206d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GifSearchViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;->access$handleStoreState(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1.smali
index d500f1e15b..3bd2d3d504 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1.smali
@@ -3,7 +3,7 @@
 .source "GifSearchViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/List<",
         "+",
         "Lcom/discord/models/gifpicker/dto/ModelGif;",
@@ -62,30 +62,15 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1;->call(Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/List;)Z
+.method public final call(Ljava/util/List;)Ljava/lang/Boolean;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
             "Lcom/discord/models/gifpicker/dto/ModelGif;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -105,5 +90,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1;->call(Ljava/util/List;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$2.smali
index 783e2444b8..1befb056bb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$2.smali
@@ -27,7 +27,16 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/gifpicker/dto/ModelGif;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;",
+        ">;"
     }
 .end annotation
 
@@ -72,11 +81,11 @@
 
     const-string v1, "gifResults"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "searchTerms"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$2;->this$0:Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2.smali
index 0ae01afb5a..36d1bc7209 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2.smali
@@ -3,7 +3,7 @@
 .source "GifSearchViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,7 +83,7 @@
 
     const-string v0, "query"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
@@ -105,9 +107,9 @@
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults;-><init>(Ljava/util/List;)V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -124,7 +126,7 @@
 
     sget-object v1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1;->INSTANCE:Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeStoreState$1.smali
index 0ecf1a710d..225b98ba0f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "GifSearchViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -70,6 +75,7 @@
             "Ljava/lang/String;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;",
             ">;"
         }
@@ -79,7 +85,7 @@
 
     const-string v1, "terms"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->access$observeQueryState(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;Ljava/util/List;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory.smali
index c2cacdf7cb..48c18446e2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory.smali
@@ -51,15 +51,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "searchSubject"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "storeGifPicker"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeAnalytics"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -72,34 +78,6 @@
     iput-object p4, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->storeAnalytics:Lcom/discord/stores/StoreAnalytics;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeGifPicker"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Lrx/subjects/BehaviorSubject;Lcom/discord/stores/StoreGifPicker;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -117,7 +95,7 @@
 
     const-string p6, "BehaviorSubject.create(\"\")"
 
-    invoke-static {p2, p6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
     and-int/lit8 p6, p5, 0x4
@@ -189,7 +167,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->searchSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lr0/p/a;->d()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->d()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -205,7 +183,7 @@
 
     sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {}, Lr0/p/a;->d()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->d()Lrx/Scheduler;
 
     move-result-object v3
 
@@ -213,11 +191,11 @@
 
     invoke-direct {v1, v4, v5, v2, v3}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
-    new-instance v2, Lr0/l/a/u;
+    new-instance v2, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v2, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v2, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -235,13 +213,13 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeQueryState$2;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;Ljava/util/List;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "searchSubject\n          \u2026          }\n            }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -267,13 +245,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory$observeStoreState$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "storeGifPicker.observeGi\u2026eryState(terms)\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -292,21 +270,21 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->observeStoreState()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    iget-object v2, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->searchSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v3, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->searchSubject:Lrx/subjects/BehaviorSubject;
 
-    new-instance v13, Lcom/discord/widgets/chat/MessageManager;
+    new-instance v0, Lcom/discord/widgets/chat/MessageManager;
 
-    iget-object v4, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->context:Landroid/content/Context;
-
-    const/4 v5, 0x0
+    iget-object v5, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Factory;->context:Landroid/content/Context;
 
     const/4 v6, 0x0
 
@@ -318,30 +296,23 @@
 
     const/4 v10, 0x0
 
-    const/16 v11, 0x7e
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
+    const/16 v12, 0x7e
 
-    move-object v3, v13
+    const/4 v13, 0x0
 
-    invoke-direct/range {v3 .. v12}, Lcom/discord/widgets/chat/MessageManager;-><init>(Landroid/content/Context;Lcom/discord/stores/StoreMessages;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreSlowMode;Lcom/discord/stores/StoreGuilds;Lcom/discord/utilities/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v4, v0
 
-    const/4 v4, 0x0
+    invoke-direct/range {v4 .. v13}, Lcom/discord/widgets/chat/MessageManager;-><init>(Landroid/content/Context;Lcom/discord/stores/StoreMessages;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreSlowMode;Lcom/discord/stores/StoreGuilds;Lcom/discord/utilities/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const/16 v5, 0x8
+    const/4 v5, 0x0
 
-    move-object v0, p1
+    const/16 v6, 0x8
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;-><init>(Lrx/Observable;Lrx/subjects/BehaviorSubject;Lcom/discord/widgets/chat/MessageManager;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;-><init>(Lrx/Observable;Lrx/subjects/BehaviorSubject;Lcom/discord/widgets/chat/MessageManager;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali
index 7438f798cd..15b000db85 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults.smali
@@ -68,14 +68,20 @@
         }
     .end annotation
 
+    const-string v0, "gifs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "suggested"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "trending"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
     invoke-direct {p0, p3, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;-><init>(Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;->gifs:Ljava/util/List;
@@ -87,27 +93,6 @@
     iput-object p4, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;->searchQuery:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "trending"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "suggested"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;
@@ -226,40 +211,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "gifs"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "suggested"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "trending"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;-><init>(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "trending"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "suggested"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "gifs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -277,7 +245,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;->gifs:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -287,7 +255,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;->suggested:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -297,7 +265,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;->trending:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -307,7 +275,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;->searchQuery:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali
index 69034dd7ff..efab287663 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults.smali
@@ -38,22 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "trending"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState;-><init>(Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults;->trending:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "trending"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults;
@@ -103,22 +98,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "trending"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "trending"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +124,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$TrendingSearchTermsResults;->trending:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded$gifCount$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded$gifCount$2.smali
index eb5c43030d..a63bd6d175 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded$gifCount$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded$gifCount$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded$gifCount$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GifSearchViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Integer;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded.smali
index e2309cb0b3..3618c0d82c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded.smali
@@ -41,9 +41,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "adapterItems"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -60,13 +62,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;->gifCount$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapterItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;
@@ -117,22 +112,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapterItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "adapterItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -150,7 +138,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;->adapterItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.smali
index a937d0f3b2..3b481223fb 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "GifSearchViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState;",
         ">;"
     }
@@ -65,17 +65,25 @@
         }
     .end annotation
 
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchSubject"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "messageManager"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeAnalytics"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;->storeStateObservable:Lrx/Observable;
 
@@ -93,6 +101,10 @@
 
     const-class v2, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;
 
+    new-instance v7, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -101,10 +113,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$1;-><init>(Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -112,34 +120,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "messageManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchSubject"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lrx/Observable;Lrx/subjects/BehaviorSubject;Lcom/discord/widgets/chat/MessageManager;Lcom/discord/stores/StoreAnalytics;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -182,7 +162,7 @@
 
     instance-of v2, p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$StoreState$SearchResults;
 
-    const v3, 0x7f12084d
+    const v3, 0x7f12084f
 
     if-eqz v2, :cond_7
 
@@ -282,7 +262,7 @@
 
     const-string v8, "searchSubject.value"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v7, Ljava/lang/CharSequence;
 
@@ -302,7 +282,7 @@
 
     new-instance p1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;
 
-    const v3, 0x7f12084f
+    const v3, 0x7f120851
 
     invoke-direct {p1, v1, v3}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;-><init>(Ljava/util/List;I)V
 
@@ -315,7 +295,7 @@
 
     new-instance p1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;
 
-    const v3, 0x7f120f8a
+    const v3, 0x7f120fb4
 
     invoke-direct {p1, v1, v3}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;-><init>(Ljava/util/List;I)V
 
@@ -328,7 +308,7 @@
 
     new-instance p1, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;
 
-    const v3, 0x7f120f89
+    const v3, 0x7f120fb3
 
     invoke-direct {p1, v1, v3}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsEmptyResults;-><init>(Ljava/util/List;I)V
 
@@ -374,7 +354,7 @@
     invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreAnalytics;->trackSearchResultViewed(Lcom/discord/utilities/analytics/SearchType;I)V
 
     :cond_9
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -384,24 +364,21 @@
 .method public final selectGif(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;)V
     .locals 14
 
+    const-string v0, "gifItem"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_1
@@ -448,19 +425,14 @@
     invoke-static/range {v4 .. v13}, Lcom/discord/widgets/chat/MessageManager;->sendMessage$default(Lcom/discord/widgets/chat/MessageManager;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/chat/MessageManager$AttachmentsRequest;Ljava/lang/Long;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Z
 
     return-void
-
-    :cond_2
-    const-string p1, "gifItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setSearchText(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "searchText"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;->searchSubject:Lrx/subjects/BehaviorSubject;
 
@@ -470,7 +442,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -496,7 +468,7 @@
 
     sget-object v0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$LoadingSearchResults;->INSTANCE:Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$LoadingSearchResults;
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;->searchSubject:Lrx/subjects/BehaviorSubject;
@@ -504,13 +476,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "searchText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$Gif.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$Gif.smali
index 1a41877eb8..b16e3e94b2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$Gif.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$Gif.smali
@@ -22,13 +22,15 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "itemView"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const v0, 0x7f0a03ec
+    const v0, 0x7f0a03f2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,13 +49,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic configure$default(Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$Gif;Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
@@ -82,7 +77,7 @@
 
     const-string v1, "gifImage"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
@@ -130,7 +125,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gifItem"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;->getGif()Lcom/discord/models/gifpicker/dto/ModelGif;
 
@@ -158,7 +155,7 @@
 
     const-string v2, "itemView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -179,13 +176,4 @@
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gifItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms.smali
index f64c686962..a4a2e1fd12 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms.smali
@@ -24,13 +24,15 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "itemView"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const v0, 0x7f0a03f8
+    const v0, 0x7f0a03fe
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -40,7 +42,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateFlexbox:Landroid/view/ViewGroup;
 
-    const v0, 0x7f0a03f9
+    const v0, 0x7f0a03ff
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -51,13 +53,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateIconText:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final configureSearchTerms(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem;Lkotlin/jvm/functions/Function1;I)V
@@ -78,7 +73,7 @@
 
     const-string v1, "gifSearchEmptyStateIconText"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem;->getTitleResId()I
 
@@ -94,7 +89,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateIconText:Landroid/widget/TextView;
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -115,7 +110,7 @@
 
     iget-object v4, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateFlexbox:Landroid/view/ViewGroup;
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -131,7 +126,7 @@
 
     iget-object v4, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateFlexbox:Landroid/view/ViewGroup;
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -177,18 +172,18 @@
     goto :goto_0
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type androidx.appcompat.widget.AppCompatTextView"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_2
     iget-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateFlexbox:Landroid/view/ViewGroup;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -200,7 +195,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateFlexbox:Landroid/view/ViewGroup;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -210,7 +205,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateFlexbox:Landroid/view/ViewGroup;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -244,7 +239,7 @@
 
     const-string p3, "itemView"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p1}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
@@ -267,34 +262,36 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "termsItem"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateIconText:Landroid/widget/TextView;
 
-    const-string v2, "gifSearchEmptyStateIconText"
+    const-string v0, "gifSearchEmptyStateIconText"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
-
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     const-string v8, "itemView"
 
-    invoke-static {v3, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f040531
-
-    const/4 v5, 0x2
+    const v2, 0x7f040523
 
     const/4 v9, 0x0
 
-    invoke-static {v3, v4, v9, v5, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    const/4 v3, 0x2
+
+    const/4 v4, 0x0
+
+    invoke-static {v0, v2, v9, v3, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result v3
 
+    const/4 v2, 0x0
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -311,7 +308,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingLeft()I
 
@@ -324,17 +321,10 @@
     invoke-virtual {p1, p2, v9, v0, v9}, Landroid/view/View;->setPadding(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p1, "termsItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final configure(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$SuggestedTermsItem$SuggestedTermsNonEmptyResults;Lkotlin/jvm/functions/Function1;)V
-    .locals 7
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -347,15 +337,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "termsItem"
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateIconText:Landroid/widget/TextView;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "gifSearchEmptyStateIconText"
+    iget-object v1, p0, Lcom/discord/widgets/chat/input/gifpicker/GifViewHolder$SuggestedTerms;->gifSearchEmptyStateIconText:Landroid/widget/TextView;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v0, "gifSearchEmptyStateIconText"
 
-    const/4 v1, 0x0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -363,11 +353,13 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xd
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xd
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;ILjava/lang/Object;)V
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;ILjava/lang/Object;)V
 
     const/4 v0, -0x2
 
@@ -377,48 +369,20 @@
 
     const-string p2, "itemView"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    const/16 p2, 0x20
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
-    invoke-virtual {v0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+    move-result p2
 
-    move-result-object v0
+    const/16 v0, 0x28
 
-    const v1, 0x7f0701f1
-
-    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v0}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v0
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p2
-
-    const-string v1, "itemView.resources"
-
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
-
-    move-result-object p2
-
-    iget p2, p2, Landroid/util/DisplayMetrics;->density:F
-
-    const/16 v1, 0x28
-
-    int-to-float v1, v1
-
-    mul-float p2, p2, v1
-
-    float-to-int p2, p2
-
     invoke-virtual {p1}, Landroid/view/View;->getPaddingLeft()I
 
     move-result v1
@@ -427,16 +391,7 @@
 
     move-result v2
 
-    invoke-virtual {p1, v1, v0, v2, p2}, Landroid/view/View;->setPadding(IIII)V
+    invoke-virtual {p1, v1, p2, v2, v0}, Landroid/view/View;->setPadding(IIII)V
 
     return-void
-
-    :cond_0
-    const-string p1, "termsItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.smali
index 666b6ef274..4f37dc6d9d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.smali
@@ -26,11 +26,13 @@
 .method public onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
     .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "event"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
 
@@ -77,13 +79,13 @@
 
     const-string v0, "scaleUpX"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, v2, v3}, Landroid/animation/ObjectAnimator;->setDuration(J)Landroid/animation/ObjectAnimator;
 
     const-string v0, "scaleUpY"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v2, v3}, Landroid/animation/ObjectAnimator;->setDuration(J)Landroid/animation/ObjectAnimator;
 
@@ -124,13 +126,13 @@
 
     const-string v0, "scaleDownX"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, v2, v3}, Landroid/animation/ObjectAnimator;->setDuration(J)Landroid/animation/ObjectAnimator;
 
     const-string v0, "scaleDownY"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v2, v3}, Landroid/animation/ObjectAnimator;->setDuration(J)Landroid/animation/ObjectAnimator;
 
@@ -148,18 +150,4 @@
 
     :goto_0
     return v4
-
-    :cond_2
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$onViewBoundOrOnResume$1.smali
index 0c56f78801..920a83c394 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGifCategory.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->access$handleViewState(Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpBackBehavior$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpBackBehavior$1.smali
index bb29714326..4b0fb7fce2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpBackBehavior$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpBackBehavior$1.smali
@@ -46,28 +46,24 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpBackBehavior$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpBackBehavior$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
     invoke-static {v0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->access$handleBack(Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;)V
 
-    const/4 v0, 0x1
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    return v0
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpBackBehavior$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpGifRecycler$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpGifRecycler$1.smali
index 4d8330c831..408793713b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpGifRecycler$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpGifRecycler$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setUpGifRecycler$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGifCategory.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "selectGif"
+
+    const-string v5, "selectGif(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectGif"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectGif(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->access$selectGif(Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$1.smali
index c205210f28..820d004bcf 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$1.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.smali
index 2b923ae895..ba901b9e9f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
@@ -56,18 +58,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.smali
index fc1527d011..16ddd219ac 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.smali
@@ -53,81 +53,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
-    const/4 v2, 0x0
+    const-string v2, "title"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "title"
-
-    const-string v4, "getTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
+    const-string v2, "gifRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifRecycler"
-
-    const-string v4, "getGifRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;
+    const-string v2, "gifsLoadingView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifsLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifsLoadingView"
-
-    const-string v4, "getGifsLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -151,7 +127,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a03e5
+    const v0, 0x7f0a03eb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03eb
+    const v0, 0x7f0a03f1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +143,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03e6
+    const v0, 0x7f0a03ec
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -175,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->gifRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03ea
+    const v0, 0x7f0a03f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -260,11 +236,11 @@
     return-object v0
 
     :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.widgets.chat.input.gifpicker.GifCategoryItem"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -343,7 +319,7 @@
     :cond_0
     const-string v0, "expressionTrayViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -384,7 +360,7 @@
     :cond_0
     const-string p1, "gifAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -416,7 +392,7 @@
     :cond_1
     const-string p1, "gifCategoryViewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -470,13 +446,9 @@
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setItemAnimator(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;)V
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    const/16 v0, 0x8
 
-    move-result-object v0
-
-    const v2, 0x7f0701ed
-
-    invoke-virtual {v0, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v0}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v0
 
@@ -537,7 +509,7 @@
     :cond_0
     const-string p1, "gifAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -578,7 +550,7 @@
 
     move-result-object v0
 
-    const v2, 0x7f120850
+    const v2, 0x7f120852
 
     invoke-virtual {v0, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -660,7 +632,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026rayViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
 
@@ -676,7 +648,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->getGifCategory()Lcom/discord/widgets/chat/input/gifpicker/GifCategoryItem;
 
@@ -702,7 +674,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026oryViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/chat/input/gifpicker/GifCategoryViewModel;
 
@@ -714,9 +686,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -724,9 +696,9 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->getGifRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$Companion;->calculateColumnCount(Landroidx/recyclerview/widget/RecyclerView;)I
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$Companion;->calculateColumnCount(Landroidx/recyclerview/widget/RecyclerView;)I
 
     move-result p1
 
@@ -738,24 +710,19 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->getGifsLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {v1, p1, v2, v3, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->updateView$default(Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;IIILjava/lang/Object;)V
+    const/4 v3, 0x0
+
+    invoke-static {v0, p1, v1, v2, v3}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->updateView$default(Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;IIILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->setWindowInsetsListeners()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -767,7 +734,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -800,7 +767,7 @@
     :cond_0
     const-string v0, "gifCategoryViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -808,7 +775,7 @@
 .end method
 
 .method public final setOnGifSelected(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -818,18 +785,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onSelected"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifCategory;->onGifSelected:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "onSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$onViewBoundOrOnResume$1.smali
index 9658ee6696..8516381012 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGifPicker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;->access$handleViewState(Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$1.smali
index fc7a71cb68..bfb50a8d83 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$1.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$2.smali
index eb98f8f7ae..87ab88d4a7 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$2.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$3.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$3.smali
index 6a0ee7728d..8530d7430a 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$3.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker$setWindowInsetsListeners$3;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
 
@@ -64,18 +66,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.smali
index 63a3825a2a..14f518d8f7 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.smali
@@ -39,61 +39,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
 
-    const/4 v2, 0x0
+    const-string v2, "categoryRecycler"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCategoryRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "categoryRecycler"
-
-    const-string v4, "getCategoryRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;
+    const-string v2, "gifCategoriesLoadingView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifCategoriesLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifCategoriesLoadingView"
-
-    const-string v4, "getGifCategoriesLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -109,7 +91,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a03ee
+    const v0, 0x7f0a03f4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -117,7 +99,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03ed
+    const v0, 0x7f0a03f3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -125,7 +107,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;->categoryRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03ef
+    const v0, 0x7f0a03f5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -286,7 +268,7 @@
     :cond_2
     const-string p1, "categoryAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -350,13 +332,9 @@
 
     new-instance v0, Lcom/discord/utilities/recycler/GridColumnSpaceItemDecoration;
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    const/16 v1, 0x8
 
-    move-result-object v1
-
-    const v2, 0x7f0701ed
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v1}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v1
 
@@ -373,7 +351,7 @@
     :cond_0
     const-string v0, "categoryAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -449,7 +427,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026kerViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/chat/input/gifpicker/GifPickerViewModel;
 
@@ -461,9 +439,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -475,20 +453,15 @@
 
     move-result-object p1
 
+    const/4 v0, 0x2
+
     const/4 v1, 0x0
 
-    const/4 v2, 0x2
+    const/4 v2, 0x0
 
-    invoke-static {p1, v2, v1, v2, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->updateView$default(Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;IIILjava/lang/Object;)V
+    invoke-static {p1, v0, v1, v0, v2}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->updateView$default(Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;IIILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -500,7 +473,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -531,9 +504,9 @@
     return-void
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -567,7 +540,7 @@
     :cond_1
     const-string v0, "categoryAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -575,7 +548,7 @@
 .end method
 
 .method public final setOnSelectGifCategory(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -587,18 +560,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onGifCategorySelected"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPicker;->onSelectGifCategory:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onGifCategorySelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$onViewBoundOrOnResume$1.smali
index bc9da2a606..9f7df2a79f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGifPickerSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,9 +63,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
-    const-string v1, "viewState"
+    const-string/jumbo v1, "viewState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->access$handleViewState(Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$1.smali
index cb64339bc5..9a9df153e2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGifPickerSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/chat/input/gifpicker/GifAdapterItem$GifItem;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "gifItem"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
@@ -87,13 +89,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "gifItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$2.smali
index 39a40c0d81..2a30547856 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setUpGifRecycler$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGifPickerSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/CharSequence;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/textfield/TextInputEditText;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/google/android/material/textfield/TextInputEditText;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "setText"
+
+    const-string v5, "setText(Ljava/lang/CharSequence;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "setText"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/google/android/material/textfield/TextInputEditText;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "setText(Ljava/lang/CharSequence;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Ljava/lang/CharSequence;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/google/android/material/textfield/TextInputEditText;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setupSearchBar$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setupSearchBar$1.smali
index 045c965ddc..7bc6363d62 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setupSearchBar$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setupSearchBar$1.smali
@@ -59,20 +59,13 @@
 .method public final call(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$setupSearchBar$1;->this$0:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->access$handleInputChanged(Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.smali
index a2e232d086..cd25717f6f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.smali
@@ -41,101 +41,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
+    const-string v2, "gifSearchViewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifSearchViewFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "gifSearchViewFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGifSearchViewFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
-    const/4 v2, 0x0
+    const-string v2, "gifLoadingView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGifLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "gifLoadingView"
-
-    const-string v4, "getGifLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
+    const-string v2, "gifRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifRecycler"
-
-    const-string v4, "getGifRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
+    const-string v2, "gifSearchInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifSearchInput()Lcom/google/android/material/textfield/TextInputEditText;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifSearchInput"
-
-    const-string v4, "getGifSearchInput()Lcom/google/android/material/textfield/TextInputEditText;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
-    const-class v2, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
+    const-string v2, "gifSearchInputClear"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGifSearchInputClear()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gifSearchInputClear"
-
-    const-string v4, "getGifSearchInputClear()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -151,7 +121,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a03fb
+    const v0, 0x7f0a0401
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +129,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->gifSearchViewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03f5
+    const v0, 0x7f0a03fb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +137,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->gifLoadingView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03f3
+    const v0, 0x7f0a03f9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -175,7 +145,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->gifRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03f4
+    const v0, 0x7f0a03fa
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -183,7 +153,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->gifSearchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03f2
+    const v0, 0x7f0a03f8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -206,7 +176,7 @@
     :cond_0
     const-string p0, "gifPickerViewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -372,12 +342,12 @@
 
     if-eqz p1, :cond_0
 
-    const v1, 0x7f0803b9
+    const v1, 0x7f0803bc
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f080282
+    const v1, 0x7f080283
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -428,12 +398,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f121406
+    const p1, 0x7f121430
 
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f121352
+    const p1, 0x7f12137c
 
     :goto_2
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -447,7 +417,7 @@
     :cond_3
     const-string p1, "gifPickerViewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -488,14 +458,14 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
     sget-object v0, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$LoadingSearchResults;->INSTANCE:Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel$ViewState$LoadingSearchResults;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -518,7 +488,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -550,13 +520,9 @@
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setItemAnimator(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;)V
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    const/16 v0, 0x8
 
-    move-result-object v0
-
-    const v2, 0x7f0701ed
-
-    invoke-virtual {v0, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-static {v0}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v0
 
@@ -623,7 +589,7 @@
     :cond_0
     const-string p1, "gifAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -695,7 +661,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -721,7 +687,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026rchViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/chat/input/gifpicker/GifSearchViewModel;
 
@@ -733,9 +699,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -743,9 +709,9 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->getGifRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$Companion;->calculateColumnCount(Landroidx/recyclerview/widget/RecyclerView;)I
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifAdapter$Companion;->calculateColumnCount(Landroidx/recyclerview/widget/RecyclerView;)I
 
     move-result p1
 
@@ -755,22 +721,17 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->getGifLoadingView()Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {v1, p1, v2, v3, v0}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->updateView$default(Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;IIILjava/lang/Object;)V
+    const/4 v3, 0x0
+
+    invoke-static {v0, p1, v1, v2, v3}, Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;->updateView$default(Lcom/discord/widgets/chat/input/gifpicker/GifLoadingView;IIILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -788,7 +749,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -798,7 +759,7 @@
 
     const-string v1, "gifPickerViewModel\n     \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -829,7 +790,7 @@
     :cond_0
     const-string v0, "gifPickerViewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -837,7 +798,7 @@
 .end method
 
 .method public final setOnGifSelected(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -847,18 +808,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onSelected"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;->onGifSelected:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "onSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$Companion.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$Companion.smali
index 7f6087475b..9abcfc4f56 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$Companion.smali
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet;
 
@@ -91,13 +93,4 @@
     invoke-virtual {v0, p3}, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet;->setOnCancel(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onCreateDialog$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onCreateDialog$1.smali
index 486ec0f77c..7a0cf784e5 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onCreateDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onCreateDialog$1.smali
@@ -39,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onCreateDialog$1;->$dialog:Landroid/app/Dialog;
 
-    const v0, 0x7f0a02c3
+    const v0, 0x7f0a02c6
 
     invoke-virtual {p1, v0}, Landroid/app/Dialog;->findViewById(I)Landroid/view/View;
 
@@ -51,7 +51,7 @@
 
     const-string v0, "BottomSheetBehavior.from(bottomSheet)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$1.smali
index 0314ed5f6f..025d19fd44 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGifPickerSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$2.smali
index 0215aed97e..9b6566f103 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet$onViewCreated$2.smali
@@ -57,7 +57,7 @@
 
     const-string v2, "resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.smali b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.smali
index be95eba148..24d890e160 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.smali
@@ -76,7 +76,7 @@
     :cond_0
     const-string p0, "container"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -135,9 +135,9 @@
 .method public onCancel(Landroid/content/DialogInterface;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dialog"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/fragment/app/DialogFragment;->onCancel(Landroid/content/DialogInterface;)V
 
@@ -163,16 +163,11 @@
     :cond_1
     const-string p1, "gifPickerFragment"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_2
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public onCreateDialog(Landroid/os/Bundle;)Landroid/app/Dialog;
@@ -205,9 +200,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -219,7 +214,9 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet;->gifPickerFragment:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
-    const-string p2, "gifPickerFragment"
+    const/4 p2, 0x0
+
+    const-string v0, "gifPickerFragment"
 
     if-eqz p1, :cond_2
 
@@ -237,7 +234,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0a03f6
+    const v1, 0x7f0a03fc
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet;->gifPickerFragment:Lcom/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch;
 
@@ -270,26 +267,19 @@
     return-void
 
     :cond_0
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p2
 
     :cond_1
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p2
 
     :cond_2
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p2
 .end method
 
 .method public final setOnCancel(Lkotlin/jvm/functions/Function0;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$1.smali b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$1.smali
index ac03d07a05..4e7300bbd8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InlineMediaView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$1;->this$0:Lcom/discord/widgets/chat/list/InlineMediaView;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$2.smali b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$2.smali
index 86ea99daeb..eec68618ea 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InlineMediaView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Float;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -82,12 +82,12 @@
     :cond_0
     if-eqz v0, :cond_1
 
-    const p1, 0x7f08043d
+    const p1, 0x7f080440
 
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f08043b
+    const p1, 0x7f08043e
 
     :goto_0
     iget-object v1, p0, Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$2;->this$0:Lcom/discord/widgets/chat/list/InlineMediaView;
@@ -122,12 +122,12 @@
 
     if-eqz v0, :cond_2
 
-    const p1, 0x7f1217a0
+    const p1, 0x7f1217ca
 
     goto :goto_1
 
     :cond_2
-    const p1, 0x7f1217a1
+    const p1, 0x7f1217cb
 
     :goto_1
     iget-object v0, p0, Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$2;->this$0:Lcom/discord/widgets/chat/list/InlineMediaView;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$3.smali b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$3.smali
index abc165c8d9..bfbab3cc37 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InlineMediaView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$3;->this$0:Lcom/discord/widgets/chat/list/InlineMediaView;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$4.smali b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$4.smali
index c55303e94f..da6c7ef12f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InlineMediaView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/player/AppMediaPlayer$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/player/AppMediaPlayer$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/InlineMediaView$updateUIWithValidatedEmbed$4;->this$0:Lcom/discord/widgets/chat/list/InlineMediaView;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/InlineMediaView;->access$handlePlayerEvent(Lcom/discord/widgets/chat/list/InlineMediaView;Lcom/discord/player/AppMediaPlayer$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView.smali b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView.smali
index 6ff4df14c8..b564a81256 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView.smali
@@ -24,7 +24,13 @@
 
 .field public final loadingIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field public final paused:Lrx/subjects/Subject;
+.field public final playButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final playerView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final storeUserSettings:Lcom/discord/stores/StoreUserSettings;
+
+.field public final unsubscribeSignal:Lrx/subjects/Subject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/Subject<",
@@ -35,12 +41,6 @@
     .end annotation
 .end field
 
-.field public final playButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final playerView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final storeUserSettings:Lcom/discord/stores/StoreUserSettings;
-
 .field public final volumeToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 
@@ -52,101 +52,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/InlineMediaView;
 
-    const-class v2, Lcom/discord/widgets/chat/list/InlineMediaView;
+    const-string v2, "imagePreview"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImagePreview()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "imagePreview"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getImagePreview()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/list/InlineMediaView;
 
-    const/4 v2, 0x0
+    const-string v2, "playButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getPlayButton()Landroid/widget/ImageView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/list/InlineMediaView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "playButton"
-
-    const-string v4, "getPlayButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/InlineMediaView;
 
-    const-class v2, Lcom/discord/widgets/chat/list/InlineMediaView;
+    const-string v2, "playerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlayerView()Lcom/google/android/exoplayer2/ui/PlayerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "playerView"
-
-    const-string v4, "getPlayerView()Lcom/google/android/exoplayer2/ui/PlayerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/InlineMediaView;
 
-    const-class v2, Lcom/discord/widgets/chat/list/InlineMediaView;
+    const-string v2, "loadingIndicator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoadingIndicator()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "loadingIndicator"
-
-    const-string v4, "getLoadingIndicator()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/InlineMediaView;
 
-    const-class v2, Lcom/discord/widgets/chat/list/InlineMediaView;
+    const-string/jumbo v2, "volumeToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVolumeToggle()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "volumeToggle"
-
-    const-string v4, "getVolumeToggle()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -160,11 +130,13 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/cardview/widget/CardView;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a04f9
+    const p1, 0x7f0a04ff
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -172,7 +144,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->imagePreview$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fb
+    const p1, 0x7f0a0501
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,7 +152,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->playButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fc
+    const p1, 0x7f0a0502
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +160,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->playerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fa
+    const p1, 0x7f0a0500
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +168,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->loadingIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fd
+    const p1, 0x7f0a0503
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -238,30 +210,23 @@
 
     const-string v0, "PublishSubject.create()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->paused:Lrx/subjects/Subject;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/cardview/widget/CardView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f0a04f9
+    const p1, 0x7f0a04ff
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +234,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->imagePreview$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fb
+    const p1, 0x7f0a0501
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -277,7 +242,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->playButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fc
+    const p1, 0x7f0a0502
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -285,7 +250,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->playerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fa
+    const p1, 0x7f0a0500
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -293,7 +258,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->loadingIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fd
+    const p1, 0x7f0a0503
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -335,30 +300,23 @@
 
     const-string p2, "PublishSubject.create()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->paused:Lrx/subjects/Subject;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/cardview/widget/CardView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a04f9
+    const p1, 0x7f0a04ff
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -366,7 +324,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->imagePreview$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fb
+    const p1, 0x7f0a0501
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -374,7 +332,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->playButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fc
+    const p1, 0x7f0a0502
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -382,7 +340,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->playerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fa
+    const p1, 0x7f0a0500
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -390,7 +348,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->loadingIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04fd
+    const p1, 0x7f0a0503
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -432,20 +390,11 @@
 
     const-string p2, "PublishSubject.create()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->paused:Lrx/subjects/Subject;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -570,13 +519,13 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/InlineMediaView;->releasePlayer()V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/chat/list/InlineMediaView;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lcom/discord/widgets/chat/list/InlineMediaView;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -686,7 +635,7 @@
 
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$a;->a:Lcom/discord/player/AppMediaPlayer$Event$a;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -711,7 +660,7 @@
     :cond_0
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$f;->a:Lcom/discord/player/AppMediaPlayer$Event$f;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -747,7 +696,7 @@
     :cond_3
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$e;->a:Lcom/discord/player/AppMediaPlayer$Event$e;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -986,7 +935,7 @@
 
     const-string v5, "embed.image"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getProxyUrl()Ljava/lang/String;
 
@@ -994,7 +943,7 @@
 
     const-string v5, "embed.image.proxyUrl"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Integer;->intValue()I
 
@@ -1073,7 +1022,7 @@
 
     const-string v5, "context"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2}, Lf/a/g/i;->a(Landroid/content/Context;)Lcom/discord/player/AppMediaPlayer;
 
@@ -1092,7 +1041,7 @@
 
     move-object/from16 v5, p4
 
-    invoke-static {v1, v4, v5}, Ld0/a/b/b/a;->t(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/player/MediaSource;
+    invoke-static {v1, v4, v5}, Le0/a/b/b/a;->t(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/player/MediaSource;
 
     move-result-object v4
 
@@ -1248,7 +1197,7 @@
 
 
 # virtual methods
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1260,7 +1209,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->paused:Lrx/subjects/Subject;
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/InlineMediaView;->unsubscribeSignal:Lrx/subjects/Subject;
 
     return-object v0
 .end method
@@ -1282,47 +1231,35 @@
 .end method
 
 .method public onViewAttachedToWindow(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/InlineMediaView;->resetCurrentEmbed()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewDetachedFromWindow(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/InlineMediaView;->clearPlayerAndSubscriptions()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onVisibilityChanged(Landroid/view/View;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "changedView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroid/widget/FrameLayout;->onVisibilityChanged(Landroid/view/View;I)V
 
@@ -1337,21 +1274,14 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "changedView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateUIWithAttachment(Lcom/discord/models/domain/ModelMessageAttachment;Ljava/lang/Integer;Ljava/lang/Integer;)V
     .locals 4
 
-    if-eqz p1, :cond_4
+    const-string v0, "attachment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageAttachment;->getType()Lcom/discord/models/domain/ModelMessageAttachment$Type;
 
@@ -1434,21 +1364,14 @@
     invoke-direct {p0, p1, p2, p3, v0}, Lcom/discord/widgets/chat/list/InlineMediaView;->updateUIWithValidatedEmbed(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "attachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateUIWithEmbed(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/Integer;Ljava/lang/Integer;)V
     .locals 3
 
-    if-eqz p1, :cond_4
+    const-string v0, "embed"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageEmbed;->getVideo()Lcom/discord/models/domain/ModelMessageEmbed$Item;
 
@@ -1529,13 +1452,4 @@
     invoke-direct {p0, p1, p2, p3, v0}, Lcom/discord/widgets/chat/list/InlineMediaView;->updateUIWithValidatedEmbed(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/String;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "embed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1.smali
index fc1ba8b68e..1b66584981 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "ViewEmbedGameInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function6<",
         "Lcom/discord/widgets/chat/list/entries/GameInviteEntry;",
         "Lcom/discord/models/domain/ModelUser;",
@@ -41,45 +41,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x6
+    const-class v3, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x6
+
+    const-string v4, "create"
+
+    const-string v5, "create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
@@ -102,17 +86,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "p2"
 
-    if-eqz p5, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "p5"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p6"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     move-object v1, v0
 
@@ -135,34 +125,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p6"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p5"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1.smali
index e83f8ba6cc..ea1941e85f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "ViewEmbedGameInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function7<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Long;",
@@ -42,47 +42,31 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x7
+    const-class v3, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x7
+
+    const-string v4, "createForShare"
+
+    const-string v5, "createForShare(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "createForShare"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "createForShare(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
-    .locals 11
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -104,79 +88,47 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p4, :cond_2
-
-    if-eqz p6, :cond_1
-
-    if-eqz p8, :cond_0
-
-    move-object v10, p0
-
-    iget-object v0, v10, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+    const-string v0, "p1"
 
     move-object v2, p1
 
-    move-wide v3, p2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p3"
 
     move-object v5, p4
 
-    move-object/from16 v6, p5
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p5"
 
     move-object/from16 v7, p6
 
-    move-object/from16 v8, p7
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p7"
 
     move-object/from16 v9, p8
 
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    move-wide v3, p2
+
+    move-object v6, p5
+
+    move-object/from16 v8, p7
+
     invoke-static/range {v1 .. v9}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->access$createForShare(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
-    move-result-object v0
+    move-result-object v1
 
-    return-object v0
-
-    :cond_0
-    move-object v10, p0
-
-    const-string v1, "p7"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    move-object v10, p0
-
-    const-string v1, "p5"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    move-object v10, p0
-
-    const-string v1, "p3"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    move-object v10, p0
-
-    const-string v1, "p1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1$1.smali
index a5c7b75933..9c4820674d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1$1.smali
@@ -3,7 +3,7 @@
 .source "ViewEmbedGameInvite.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/activity/ModelActivity;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,23 +49,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1$1;->call(Lcom/discord/models/domain/activity/ModelActivity;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/activity/ModelActivity;)Z
+.method public final call(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/Boolean;
     .locals 1
 
     if-eqz p1, :cond_1
@@ -90,7 +74,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1;->$partyId:Ljava/lang/String;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -104,5 +88,21 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1$1;->call(Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.smali
index f4a783d7cd..e43971de4d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.smali
@@ -3,7 +3,7 @@
 .source "ViewEmbedGameInvite.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/activity/ModelActivity;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/activity/ModelActivity;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     const-string v1, "authorId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -106,7 +109,7 @@
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1$1;-><init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
index 25bc6e3454..a09897c51e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
@@ -75,6 +75,8 @@
 
     move-object v0, p0
 
+    new-instance v12, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getAuthorId()J
 
     move-result-wide v3
@@ -127,8 +129,6 @@
 
     move-result v11
 
-    new-instance v12, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
-
     move-object v1, v12
 
     move-object v2, p2
@@ -301,7 +301,7 @@
 
     move-result-wide v7
 
-    invoke-static {p1, v7, v8}, Lj0/q/f;->until(IJ)Lj0/q/e;
+    invoke-static {p1, v7, v8}, Lk0/r/f;->until(IJ)Lk0/r/e;
 
     move-result-object p1
 
@@ -318,9 +318,9 @@
 
     move-object p2, p1
 
-    check-cast p2, Lj0/i/r;
+    check-cast p2, Lk0/j/r;
 
-    invoke-virtual {p2}, Lj0/i/r;->nextLong()J
+    invoke-virtual {p2}, Lk0/j/r;->nextLong()J
 
     move-result-wide v7
 
@@ -470,15 +470,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "item"
 
-    new-instance v1, Lr0/l/e/j;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    new-instance v1, Ls0/l/e/j;
+
+    invoke-direct {v1, p2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -578,7 +580,7 @@
 
     const-string p2, "Observable\n            .\u2026ion::create\n            )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -590,23 +592,9 @@
 
     const-string p2, "Observable\n            .\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getForShare(Landroid/content/Context;Lcom/discord/utilities/time/Clock;Landroid/net/Uri;Lcom/discord/models/domain/activity/ModelActivity;)Lrx/Observable;
@@ -625,13 +613,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "clock"
 
-    const-string v1, "Observable.just(null)"
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "Observable.just(null)"
+
+    const/4 v1, 0x0
 
     if-eqz p3, :cond_4
 
@@ -643,14 +635,14 @@
 
     if-eqz v2, :cond_0
 
-    invoke-static {v2}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v2}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v2
 
     goto :goto_0
 
     :cond_0
-    move-object v2, v0
+    move-object v2, v1
 
     :goto_0
     const-string v3, "party_id"
@@ -667,14 +659,14 @@
 
     if-eqz v4, :cond_1
 
-    invoke-static {v4}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v4}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v4
 
     goto :goto_1
 
     :cond_1
-    move-object v4, v0
+    move-object v4, v1
 
     :goto_1
     if-eqz v2, :cond_3
@@ -689,7 +681,7 @@
 
     const-string v6, "/send/activity"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -708,9 +700,9 @@
 
     invoke-direct {p3, v0, v3}, Lcom/discord/models/domain/ModelMessage$Activity;-><init>(ILjava/lang/String;)V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p4}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p4}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object p4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -726,7 +718,7 @@
 
     invoke-direct {v1, v2, v3}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1;-><init>(Ljava/lang/Long;Ljava/lang/String;)V
 
-    invoke-virtual {p4, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p4, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p4
 
@@ -752,13 +744,13 @@
 
     move-result-object p2
 
-    new-instance v4, Lr0/l/e/j;
+    new-instance v4, Ls0/l/e/j;
 
-    invoke-direct {v4, p2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v4, p2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    new-instance v5, Lr0/l/e/j;
+    new-instance v5, Ls0/l/e/j;
 
-    invoke-direct {v5, p3}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v5, p3}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -810,7 +802,7 @@
 
     const-string p2, "Observable\n            .\u2026ateForShare\n            )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -822,7 +814,7 @@
 
     const-string p2, "Observable\n            .\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -846,36 +838,22 @@
 
     const/4 p3, 0x2
 
-    invoke-static {p1, p2, v0, p3, v0}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static {p1, p2, v1, p3, v1}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
     :cond_4
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_5
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
index 9b146b58fa..24041eff37 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
@@ -97,15 +97,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "meUser"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_8
+    const-string v0, "application"
 
-    if-eqz p7, :cond_7
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_6
+    const-string v0, "messageActivity"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "users"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -259,34 +265,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isPartyMatch:Z
 
     return-void
-
-    :cond_6
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "messageActivity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;ZILjava/lang/Object;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
@@ -426,7 +404,7 @@
 
     const-string v1, "messageActivity.partyId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -522,67 +500,45 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "meUser"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p6, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_1
+    const-string v0, "application"
 
-    if-eqz p9, :cond_0
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "messageActivity"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "users"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-wide v3, p2
 
     move-wide/from16 v5, p4
 
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
     move-object/from16 v9, p8
 
-    move-object/from16 v10, p9
-
     move/from16 v11, p10
 
     invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;-><init>(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "users"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "messageActivity"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "application"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "meUser"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -600,7 +556,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -626,7 +582,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -636,7 +592,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -646,7 +602,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/activity/ModelActivity;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -656,7 +612,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1.smali
index ac68dc2c97..9571f27ba4 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;->$this_onConfigureActionButton:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2.smali
index 563a790e93..17beff2cdb 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2.smali
@@ -41,7 +41,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
index 6a3f19737e..de46123877 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
@@ -72,7 +72,9 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
@@ -88,7 +90,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->setOrientation(I)V
 
-    const p1, 0x7f0a053c
+    const p1, 0x7f0a0542
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -96,13 +98,13 @@
 
     const-string v0, "findViewById(R.id.item_game_invite_header)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a053e
+    const p1, 0x7f0a0544
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -110,83 +112,83 @@
 
     const-string v0, "findViewById(R.id.item_game_invite_subtext)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->subtextTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0537
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
-
-    const p1, 0x7f0a053b
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.item_game_invite_cover_iv)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0538
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.item_game_invite_avatar_iv)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0539
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
     const p1, 0x7f0a053d
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
+    const-string v0, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
+
+    const p1, 0x7f0a0541
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_game_invite_cover_iv)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053e
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_game_invite_avatar_iv)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053f
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a0543
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string v0, "findViewById(R.id.item_game_invite_recycler)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->usersRv:Landroidx/recyclerview/widget/RecyclerView;
 
-    const p1, 0x7f0a0536
+    const p1, 0x7f0a053c
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -194,7 +196,7 @@
 
     const-string v0, "findViewById(R.id.item_game_invite_action_btn)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/button/MaterialButton;
 
@@ -217,21 +219,14 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -247,7 +242,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->setOrientation(I)V
 
-    const p1, 0x7f0a053c
+    const p1, 0x7f0a0542
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -255,13 +250,13 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_header)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a053e
+    const p1, 0x7f0a0544
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -269,83 +264,83 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_subtext)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->subtextTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0537
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
-
-    const p1, 0x7f0a053b
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_game_invite_cover_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0538
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_game_invite_avatar_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0539
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
     const p1, 0x7f0a053d
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
+    const-string p2, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
+
+    const p1, 0x7f0a0541
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_cover_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053e
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_avatar_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053f
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a0543
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string p2, "findViewById(R.id.item_game_invite_recycler)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->usersRv:Landroidx/recyclerview/widget/RecyclerView;
 
-    const p1, 0x7f0a0536
+    const p1, 0x7f0a053c
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -353,7 +348,7 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_action_btn)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/button/MaterialButton;
 
@@ -376,21 +371,14 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -406,7 +394,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->setOrientation(I)V
 
-    const p1, 0x7f0a053c
+    const p1, 0x7f0a0542
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -414,13 +402,13 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_header)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a053e
+    const p1, 0x7f0a0544
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -428,83 +416,83 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_subtext)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->subtextTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0537
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
-
-    const p1, 0x7f0a053b
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_game_invite_cover_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0538
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_game_invite_avatar_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0539
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
     const p1, 0x7f0a053d
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
+    const-string p2, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
+
+    const p1, 0x7f0a0541
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_cover_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053e
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_avatar_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053f
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a0543
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string p2, "findViewById(R.id.item_game_invite_recycler)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->usersRv:Landroidx/recyclerview/widget/RecyclerView;
 
-    const p1, 0x7f0a0536
+    const p1, 0x7f0a053c
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -512,7 +500,7 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_action_btn)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/button/MaterialButton;
 
@@ -535,21 +523,14 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3, p4}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
 
@@ -565,7 +546,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->setOrientation(I)V
 
-    const p1, 0x7f0a053c
+    const p1, 0x7f0a0542
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -573,13 +554,13 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_header)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a053e
+    const p1, 0x7f0a0544
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -587,83 +568,83 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_subtext)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->subtextTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0537
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
-
-    const p1, 0x7f0a053b
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_game_invite_cover_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0538
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_game_invite_avatar_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const p1, 0x7f0a0539
-
-    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
-
     const p1, 0x7f0a053d
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
+    const-string p2, "findViewById(R.id.item_g\u2026vite_application_name_tv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameTv:Landroid/widget/TextView;
+
+    const p1, 0x7f0a0541
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_cover_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053e
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_avatar_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a053f
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_g\u2026_invite_avatar_status_iv)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->avatarStatusIv:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a0543
+
+    invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string p2, "findViewById(R.id.item_game_invite_recycler)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->usersRv:Landroidx/recyclerview/widget/RecyclerView;
 
-    const p1, 0x7f0a0536
+    const p1, 0x7f0a053c
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -671,7 +652,7 @@
 
     const-string p2, "findViewById(R.id.item_game_invite_action_btn)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/button/MaterialButton;
 
@@ -694,15 +675,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final configureActivityImages(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Z)V
@@ -852,7 +824,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v15, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v16, 0x0
 
@@ -1096,7 +1068,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerTv:Landroid/widget/TextView;
 
-    const v1, 0x7f120d16
+    const v1, 0x7f120d3c
 
     if-eqz p2, :cond_0
 
@@ -1118,7 +1090,7 @@
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f120d1a
+    const v1, 0x7f120d40
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1250,7 +1222,7 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    const v0, 0x7f120d89
+    const v0, 0x7f120daf
 
     if-nez p2, :cond_6
 
@@ -1306,7 +1278,7 @@
 
     if-eqz p3, :cond_2
 
-    const v0, 0x7f120d15
+    const v0, 0x7f120d3b
 
     goto :goto_0
 
@@ -1317,7 +1289,7 @@
 
     if-eqz p3, :cond_3
 
-    const v0, 0x7f120d21
+    const v0, 0x7f120d47
 
     :cond_3
     :goto_0
@@ -1352,7 +1324,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
 
-    const p3, 0x7f1216b6
+    const p3, 0x7f1216e0
 
     invoke-virtual {p2, p3}, Landroid/widget/Button;->setText(I)V
 
@@ -1360,7 +1332,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -1404,29 +1376,17 @@
 .method public final bind(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "model"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "clock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->configureUI(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/utilities/time/Clock;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getOnActionButtonClick()Lkotlin/jvm/functions/Function2;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
index 256adc7f3a..0542927220 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
@@ -47,7 +47,7 @@
 
     if-eqz p0, :cond_0
 
-    const v0, 0x7f1205cf
+    const v0, 0x7f1205d1
 
     const/4 v1, 0x1
 
@@ -65,7 +65,7 @@
 
     const/16 v1, 0xc
 
-    invoke-static {p0, p1, v2, v0, v1}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p0, p1, v2, v0, v1}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_0
     sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -106,7 +106,7 @@
 
     check-cast p0, Landroid/content/Context;
 
-    const v0, 0x7f1205ce
+    const v0, 0x7f1205d0
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -118,7 +118,7 @@
 
     const/16 v2, 0xc
 
-    invoke-static {p0, p1, v0, v1, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p0, p1, v0, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_0
     sget-object p0, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -396,7 +396,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1216f4
+    const p2, 0x7f12171e
 
     const/4 v0, 0x0
 
@@ -404,7 +404,7 @@
 
     const/16 v2, 0x8
 
-    invoke-static {p1, p2, v0, v1, v2}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, p2, v0, v1, v2}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 
@@ -813,7 +813,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v2
 
@@ -823,7 +823,7 @@
 
     iget-object v2, v0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
 
-    invoke-static {v2}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {v2}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -839,7 +839,7 @@
 
     const-class v3, Lcom/discord/widgets/chat/list/WidgetChatList$1;
 
-    invoke-static {v2, v3}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v2, v3}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler.smali
index 4b86143e21..60042a4e2a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler.smali
@@ -85,21 +85,21 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
-    new-instance v2, Lr0/l/a/o2;
+    new-instance v2, Ls0/l/a/o2;
 
     const-wide/16 v3, 0xfa
 
-    invoke-direct {v2, v3, v4, v0, v1}, Lr0/l/a/o2;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    invoke-direct {v2, v3, v4, v0, v1}, Ls0/l/a/o2;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
-    new-instance v0, Lr0/l/a/u;
+    new-instance v0, Ls0/l/a/u;
 
     iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v0, p1, v2}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v0, p1, v2}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -111,7 +111,7 @@
 
     const-class v1, Lcom/discord/widgets/chat/list/WidgetChatList$UserReactionHandler;
 
-    invoke-static {v0, v1}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v0, v1}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -170,7 +170,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -180,7 +180,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatList$UserReactionHandler;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
 
-    invoke-static {p2}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p2}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -192,7 +192,7 @@
 
     iget-object p3, p0, Lcom/discord/widgets/chat/list/WidgetChatList$UserReactionHandler;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
 
-    invoke-static {p2, p3}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p3}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -389,7 +389,7 @@
     :goto_1
     invoke-interface {v1, v13}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -399,7 +399,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatList$UserReactionHandler;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
 
-    invoke-static {v1}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {v1}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -421,7 +421,7 @@
 
     invoke-direct {v3, v2, v13}, Lf/a/o/b/b/l;-><init>(Lrx/functions/Action1;Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
-    invoke-static {v1, v0, v3}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {v1, v0, v3}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -457,7 +457,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/chat/list/WidgetChatList$UserReactionHandler;->requestStream:Lrx/subjects/Subject;
 
-    invoke-interface {v1, v9}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v1, v9}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali
index 3461937460..5284a77ed7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList.smali
@@ -265,7 +265,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0250
+    const v0, 0x7f0a0253
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -351,9 +351,13 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatList;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
+    const-string v2, "appComponent"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string v2, "it"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
 
@@ -365,7 +369,7 @@
 
     const-class v2, Lcom/discord/widgets/chat/list/WidgetChatList;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -379,7 +383,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -393,7 +397,7 @@
 
     const-class v2, Lcom/discord/widgets/chat/list/WidgetChatList;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
index 0981a6c1b7..b0cee0b5fa 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
@@ -70,15 +70,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;->channelNames:Ljava/util/Map;
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;->list:Ljava/util/List;
 
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;->myRoleIds:Ljava/util/Set;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler$DefaultImpls.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler$DefaultImpls.smali
index 63f64ec144..3b6593b432 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler$DefaultImpls.smali
@@ -18,18 +18,11 @@
 .method public static onUrlLongClicked(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;Ljava/lang/String;)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p0, "url"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p0, "url"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static onUserMentionClicked(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;JJJ)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali
index f7976f12b0..e9bd20d5a3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfScrolls.smali
@@ -43,7 +43,9 @@
 .method public onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
 
@@ -88,13 +90,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali
index 6ad5f16623..9f5d2538c5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali
@@ -52,13 +52,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "adapter"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "handler"
 
-    if-eqz p5, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onCompleted"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -73,27 +77,6 @@
     invoke-virtual {p2, p0}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "onCompleted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "handler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final animateHighlight(Landroid/view/View;)V
@@ -130,11 +113,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.graphics.drawable.TransitionDrawable"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -321,7 +304,7 @@
     move-result v8
 
     :cond_a
-    invoke-static {v8, v5}, Lj0/q/f;->downTo(II)Lkotlin/ranges/IntProgression;
+    invoke-static {v8, v5}, Lk0/r/f;->downTo(II)Lkotlin/ranges/IntProgression;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali
index d0666cf7f4..b52ebff313 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$disposeHandlers$1.smali
@@ -70,25 +70,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1.smali
index 603cf35def..b3fbef10d7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapter$scrollToMessageId$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali
index afbd59e9ca..7105987ef8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1.smali
@@ -60,11 +60,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$setHandlers$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
@@ -83,18 +85,4 @@
     invoke-virtual {p1, p2, v0, v1}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali
index 173c25e775..816e2a6834 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter.smali
@@ -94,13 +94,17 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recycler"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "eventHandler"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -143,27 +147,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->handlerOfUpdates:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$HandlerOfUpdates;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "eventHandler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;Lcom/discord/utilities/time/Clock;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -419,9 +402,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "parent"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     packed-switch p2, :pswitch_data_0
 
@@ -479,6 +462,8 @@
 
     const/4 p2, 0x2
 
+    const/4 v0, 0x0
+
     invoke-direct {p1, p0, v0, p2, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;Lcom/discord/utilities/time/Clock;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     goto/16 :goto_0
@@ -677,15 +662,6 @@
     :goto_0
     return-object p1
 
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    nop
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_20
@@ -798,71 +774,57 @@
 .end method
 
 .method public final onReactionClicked(JLcom/discord/models/domain/ModelMessageReaction;)V
-    .locals 8
+    .locals 9
 
-    if-eqz p3, :cond_0
+    const-string v0, "reaction"
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->eventHandler:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->data:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->eventHandler:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
 
-    invoke-interface {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getUserId()J
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->data:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
 
-    move-result-wide v1
+    invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getUserId()J
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->data:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
+    move-result-wide v2
 
-    invoke-interface {v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getChannelId()J
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->data:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
 
-    move-result-wide v3
+    invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getChannelId()J
 
-    move-wide v5, p1
+    move-result-wide v4
 
-    move-object v7, p3
+    move-wide v6, p1
 
-    invoke-interface/range {v0 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onReactionClicked(JJJLcom/discord/models/domain/ModelMessageReaction;)V
+    move-object v8, p3
+
+    invoke-interface/range {v1 .. v8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onReactionClicked(JJJLcom/discord/models/domain/ModelMessageReaction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "reaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onReactionLongClicked(JLcom/discord/models/domain/ModelMessageReaction;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p3, :cond_0
+    const-string v0, "reaction"
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->eventHandler:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->data:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->eventHandler:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
 
-    invoke-interface {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getChannelId()J
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->data:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
 
-    move-result-wide v1
+    invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getChannelId()J
 
-    move-wide v3, p1
+    move-result-wide v2
 
-    move-object v5, p3
+    move-wide v4, p1
 
-    invoke-interface/range {v0 .. v5}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onReactionLongClicked(JJLcom/discord/models/domain/ModelMessageReaction;)V
+    move-object v6, p3
+
+    invoke-interface/range {v1 .. v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onReactionLongClicked(JJLcom/discord/models/domain/ModelMessageReaction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "reaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onResume()V
@@ -919,11 +881,17 @@
 
     move-object v0, p0
 
-    const/4 v1, 0x0
+    const-string v1, "activity"
 
-    if-eqz p6, :cond_1
+    move-object/from16 v10, p6
 
-    if-eqz p7, :cond_0
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "application"
+
+    move-object/from16 v11, p7
+
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->eventHandler:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
 
@@ -939,33 +907,17 @@
 
     move/from16 v9, p5
 
-    move-object/from16 v10, p6
-
-    move-object/from16 v11, p7
-
     invoke-interface/range {v2 .. v11}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onUserActivityAction(JJJILcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelApplication;)V
 
     return-void
-
-    :cond_0
-    const-string v2, "application"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const-string v2, "activity"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final scrollToMessageId(JLrx/functions/Action0;)V
     .locals 7
 
-    if-eqz p3, :cond_3
+    const-string v0, "onCompleted"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->scrollToWithHighlight:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;
 
@@ -1030,21 +982,14 @@
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->scrollToWithHighlight:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;
 
     return-void
-
-    :cond_3
-    const-string p1, "onCompleted"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->data:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
 
@@ -1055,15 +1000,6 @@
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setHandlers()V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$1.smali
index 5c7ce8a88d..a189b22148 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$1.smali
@@ -57,7 +57,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/widget/TextView;->getText()Ljava/lang/CharSequence;
 
@@ -65,24 +65,24 @@
 
     const-string v1, "it.text"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {v0, p1, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {v0, p1, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     const/4 p1, 0x1
 
     return p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.widget.TextView"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Companion.smali
index 6826c7ca0c..e3f5d57969 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Companion.smali
@@ -94,7 +94,7 @@
 
     const-string v0, "attachment.url"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x4
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1.smali
index 11baf5b64b..e07e81a128 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemAttachment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1;->$eventHandler:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
 
     invoke-interface {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onUrlLongClicked(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model.smali
index 57885c08a8..124531b302 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model.smali
@@ -57,7 +57,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/entries/AttachmentEntry;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -78,7 +78,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "attachmentEntry"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -121,15 +123,6 @@
     iput-boolean p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->isSpoilerHidden:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "attachmentEntry"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/chat/list/entries/AttachmentEntry;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -397,34 +390,27 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "attachmentEntry"
 
-    new-instance v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-object v2, p2
+    move-object v2, p1
 
-    move-object v3, p3
+    move-object v3, p2
 
-    move-object v4, p4
+    move-object v4, p3
 
-    move-wide v5, p5
+    move-object v5, p4
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;-><init>(Lcom/discord/widgets/chat/list/entries/AttachmentEntry;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
+    move-wide v6, p5
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;-><init>(Lcom/discord/widgets/chat/list/entries/AttachmentEntry;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
 
-    :cond_0
-    const-string p1, "attachmentEntry"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public final createRenderContext(Landroid/content/Context;Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;)Lcom/discord/utilities/textprocessing/MessageRenderContext;
@@ -434,39 +420,47 @@
 
     move-object/from16 v1, p2
 
-    const/4 v2, 0x0
+    move-object/from16 v3, p1
 
-    if-eqz p1, :cond_1
+    const-string v2, "androidContext"
 
-    if-eqz v1, :cond_0
+    move-object/from16 v4, p1
 
-    new-instance v2, Lcom/discord/utilities/textprocessing/MessageRenderContext;
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v3, v2
+    const-string v2, "eventHandler"
 
-    iget-wide v5, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->myId:J
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->attachmentEntry:Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
+    new-instance v19, Lcom/discord/utilities/textprocessing/MessageRenderContext;
 
-    invoke-virtual {v4}, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->getAllowAnimatedEmojis()Z
+    move-object/from16 v2, v19
 
-    move-result v7
+    iget-wide v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->myId:J
 
-    iget-object v8, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->userNames:Ljava/util/Map;
+    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->attachmentEntry:Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
 
-    iget-object v9, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->channelNames:Ljava/util/Map;
+    invoke-virtual {v6}, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->getAllowAnimatedEmojis()Z
 
-    iget-object v10, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->roles:Ljava/util/Map;
+    move-result v6
+
+    iget-object v7, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->userNames:Ljava/util/Map;
+
+    iget-object v8, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->channelNames:Ljava/util/Map;
+
+    iget-object v9, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->roles:Ljava/util/Map;
+
+    new-instance v10, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1;
+
+    move-object v12, v10
+
+    invoke-direct {v10, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;)V
+
+    const/4 v10, 0x0
 
     const/4 v11, 0x0
 
-    const/4 v12, 0x0
-
-    new-instance v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1;
-
-    move-object v13, v4
-
-    invoke-direct {v4, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model$createRenderContext$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;)V
+    const/4 v13, 0x0
 
     const/4 v14, 0x0
 
@@ -474,31 +468,13 @@
 
     const/16 v16, 0x0
 
-    const/16 v17, 0x0
+    const/16 v17, 0x1ec0
 
-    const/16 v18, 0x1ec0
+    const/16 v18, 0x0
 
-    const/16 v19, 0x0
+    invoke-direct/range {v2 .. v18}, Lcom/discord/utilities/textprocessing/MessageRenderContext;-><init>(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    move-object/from16 v4, p1
-
-    invoke-direct/range {v3 .. v19}, Lcom/discord/utilities/textprocessing/MessageRenderContext;-><init>(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v2
-
-    :cond_0
-    const-string v1, "eventHandler"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    const-string v1, "androidContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    return-object v19
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -516,7 +492,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->attachmentEntry:Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -526,7 +502,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->channelNames:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -536,7 +512,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->userNames:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -546,7 +522,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;->roles:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureFileData$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureFileData$1.smali
index 75d9f93f7f..6fdc755612 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureFileData$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureFileData$1.smali
@@ -63,7 +63,7 @@
 
     const-string v1, "Uri.parse(data.url)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureFileData$1;->$data:Lcom/discord/models/domain/ModelMessageAttachment;
 
@@ -73,7 +73,7 @@
 
     const-string v2, "data.filename"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v0, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onQuickDownloadClicked(Landroid/net/Uri;Ljava/lang/String;)Z
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$1.smali
index 394e2a3b5c..cb238ac776 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemAttachment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->scaleY(F)Landroid/view/ViewPropertyAnimator;
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$2.smali
index cdce5c7ffc..36ca1fc704 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemAttachment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x3f666666    # 0.9f
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->scaleY(F)Landroid/view/ViewPropertyAnimator;
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$4.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$4.smali
index de2924ab03..6fe594235b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$4.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$5.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$5.smali
index ee16516156..2df250bcd0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$configureUI$5.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali
index 2117bdcbbf..9ebbf6d1e9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali
@@ -45,7 +45,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;
 
@@ -53,131 +53,89 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "inlineMedia"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInlineMedia()Lcom/discord/widgets/chat/list/InlineMediaView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "inlineMedia"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getInlineMedia()Lcom/discord/widgets/chat/list/InlineMediaView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "card"
 
-    const/4 v3, 0x0
+    const-string v3, "getCard()Landroid/view/View;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "card"
-
-    const-string v5, "getCard()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "fileIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFileIcon()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "fileIcon"
-
-    const-string v5, "getFileIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "fileName"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFileName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "fileName"
-
-    const-string v5, "getFileName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "fileDescription"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFileDescription()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "fileDescription"
-
-    const-string v5, "getFileDescription()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "fileDownload"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFileDownload()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "fileDownload"
-
-    const-string v5, "getFileDownload()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "spoilerView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSpoilerView()Landroid/widget/FrameLayout;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "spoilerView"
+    const/4 v2, 0x6
 
-    const-string v4, "getSpoilerView()Landroid/widget/FrameLayout;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x6
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -195,13 +153,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d018c
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0230
+    const p1, 0x7f0a0233
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +169,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->inlineMedia$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a022c
+    const p1, 0x7f0a022f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +177,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->card$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a022f
+    const p1, 0x7f0a0232
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +185,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0231
+    const p1, 0x7f0a0234
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +193,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a022d
+    const p1, 0x7f0a0230
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +201,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a022e
+    const p1, 0x7f0a0231
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +209,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->fileDownload$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0232
+    const p1, 0x7f0a0235
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -279,7 +239,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -287,7 +247,7 @@
 
     const-string v1, "itemView.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/embed/EmbedResourceUtils;->computeMaximumImageWidthPx(Landroid/content/Context;)I
 
@@ -296,15 +256,6 @@
     iput p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->maxAttachmentImageWidth:I
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
@@ -354,7 +305,7 @@
 
     const-string v2, "data.size"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -428,7 +379,7 @@
 
     const-string v4, "itemView.context"
 
-    invoke-static {v2, v3, v4}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {v2, v3, v4}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v2
 
@@ -571,7 +522,7 @@
 
     const-string p1, "inlineMedia.resources"
 
-    invoke-static {v9, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {v4 .. v9}, Lcom/discord/utilities/embed/EmbedResourceUtils;->calculateScaledSize(IIIILandroid/content/res/Resources;)Lkotlin/Pair;
 
@@ -620,7 +571,7 @@
 
     const-string p1, "javaClass.simpleName"
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -920,46 +871,39 @@
 .end method
 
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
-    .locals 9
+    .locals 10
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
-    move-object v1, p2
+    move-object v2, p2
 
-    check-cast v1, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
+    check-cast v2, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
 
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;
 
-    const/4 v2, 0x0
-
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const-wide/16 v5, 0x0
+    const/4 v5, 0x0
 
-    const/16 v7, 0x1e
+    const-wide/16 v6, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0x1e
 
-    move-object v0, p1
+    const/4 v9, 0x0
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;-><init>(Lcom/discord/widgets/chat/list/entries/AttachmentEntry;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;-><init>(Lcom/discord/widgets/chat/list/entries/AttachmentEntry;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment;->configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
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 39f4b3aa6e..0c29c0343e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
@@ -19,25 +19,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked;
 
-    const-class v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked;
+    const-string v2, "blocked"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBlocked()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "blocked"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getBlocked()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -47,13 +41,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d018d
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const v0, 0x7f0a020e
+    const v0, 0x7f0a0211
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -72,15 +68,6 @@
     invoke-virtual {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getBlocked()Landroid/widget/TextView;
@@ -114,7 +101,7 @@
 
     const-string v1, "getQuantityString(quantityResId, blockedCount)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
@@ -146,7 +133,7 @@
 
     const-string p2, "getString(R.string.block\u2026ing.format(blockedCount))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -156,7 +143,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 2
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -180,7 +169,7 @@
 
     const-string v1, "blocked.resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked;->getBlockedText(Landroid/content/res/Resources;I)Ljava/lang/String;
 
@@ -189,15 +178,6 @@
     invoke-virtual {p2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$1.smali
index 97304bb336..cb69ad850e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$1.smali
@@ -40,43 +40,29 @@
 
 # virtual methods
 .method public onViewAttachedToWindow(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "v"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;
 
     invoke-static {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->access$resetCurrentChatListEntry(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewDetachedFromWindow(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "v"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;
 
     invoke-static {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->access$clearSubscriptions(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$1.smali
index e8355a834a..e78b109423 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemCallMessage.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.smali
index 6e47cffec1..2185e25cc8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemCallMessage.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$configureSubtitle$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->access$setOngoingCallDurationSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 96a07c3fe9..f366101c35 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
@@ -42,7 +42,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;
 
@@ -50,113 +50,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "statusIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusIcon()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "statusIcon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getStatusIcon()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "titleText"
 
-    const/4 v3, 0x0
+    const-string v3, "getTitleText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "titleText"
-
-    const-string v5, "getTitleText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "subtitleText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubtitleText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "subtitleText"
-
-    const-string v5, "getSubtitleText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "unjoinedOngoingCallSubtitle"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnjoinedOngoingCallSubtitle()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "unjoinedOngoingCallSubtitle"
-
-    const-string v5, "getUnjoinedOngoingCallSubtitle()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "unjoinedCallDuration"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnjoinedCallDuration()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "unjoinedCallDuration"
-
-    const-string v5, "getUnjoinedCallDuration()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "callParticipantsRecycler"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCallParticipantsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "callParticipantsRecycler"
+    const/4 v2, 0x5
 
-    const-string v4, "getCallParticipantsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -166,29 +130,31 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d018e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a020f
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->statusIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a0212
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->statusIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0215
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->titleText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0211
+    const p1, 0x7f0a0214
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +162,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->subtitleText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0213
+    const p1, 0x7f0a0216
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -204,7 +170,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->unjoinedOngoingCallSubtitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0228
+    const p1, 0x7f0a022b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -212,7 +178,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->unjoinedCallDuration$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0210
+    const p1, 0x7f0a0213
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -261,15 +227,6 @@
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$clearSubscriptions(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;)V
@@ -390,7 +347,7 @@
 
     const-string v4, "message.author"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1, v2, v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->createCallParticipantUsers(Ljava/util/Map;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus;Lcom/discord/models/domain/ModelUser;)Ljava/util/List;
 
@@ -406,7 +363,7 @@
 
     const-string v4, "subtitleText.resources"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->getSubtitleText()Landroid/widget/TextView;
 
@@ -418,7 +375,7 @@
 
     const-string v5, "subtitleText.context"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, v2, v3, v4}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->configureSubtitle(Lcom/discord/widgets/chat/list/entries/MessageEntry;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus;Landroid/content/res/Resources;Landroid/content/Context;)V
 
@@ -436,7 +393,7 @@
 
     const-string v4, "statusIcon.context"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v2, v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->getCallDrawable(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus;Landroid/content/Context;)Landroid/graphics/drawable/Drawable;
 
@@ -458,7 +415,7 @@
 
     const-string v4, "titleText.resources"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v2, v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->getTitleString(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus;Landroid/content/res/Resources;)Ljava/lang/String;
 
@@ -476,7 +433,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->usersAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
 
-    invoke-static {v1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -485,11 +442,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.chat.list.entries.MessageEntry"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -526,7 +483,7 @@
 
     const-string v1, "subtitleText.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J
 
@@ -672,7 +629,7 @@
 
     const-string p2, "message.timestampMilliseconds ?: return"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -690,7 +647,7 @@
 
     const-string p4, "Observable\n            .\u20260L, 1L, TimeUnit.SECONDS)"
 
-    invoke-static {p3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -756,7 +713,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
@@ -818,7 +775,7 @@
 
     move-result p1
 
-    invoke-static {v0, p1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p1
 
@@ -835,9 +792,9 @@
 
     move-object v0, p1
 
-    check-cast v0, Lj0/i/q;
+    check-cast v0, Lk0/j/q;
 
-    invoke-virtual {v0}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v0}, Lk0/j/q;->nextInt()I
 
     move-result v0
 
@@ -917,7 +874,7 @@
 
     move-result p1
 
-    const v0, 0x7f08024f
+    const v0, 0x7f080250
 
     const/4 v1, 0x0
 
@@ -961,7 +918,7 @@
     throw p1
 
     :cond_1
-    const p1, 0x7f080250
+    const p1, 0x7f080251
 
     invoke-static {p2, p1}, Landroidx/appcompat/content/res/AppCompatResources;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -1045,7 +1002,7 @@
 
     const-string v2, "call"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage$Call;->getParticipants()Ljava/util/List;
 
@@ -1258,7 +1215,7 @@
 
     const-string p2, "resources.getString(R.string.call_ended)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -1270,7 +1227,7 @@
     throw p1
 
     :cond_1
-    const p1, 0x7f120efc
+    const p1, 0x7f120f22
 
     invoke-virtual {p2, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1278,12 +1235,12 @@
 
     const-string p2, "resources.getString(R.string.missed_call)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f121080
+    const p1, 0x7f1210aa
 
     invoke-virtual {p2, p1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1291,7 +1248,7 @@
 
     const-string p2, "resources.getString(R.string.ongoing_call)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
@@ -1389,24 +1346,17 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
     invoke-direct {p0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->configure(Lcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$configureUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$configureUI$1.smali
index 8e2a29c7e1..f7268f80e0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$configureUI$1.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -79,7 +79,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1.smali
index 6b3b223fd9..3094b8c715 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemDstiLottie.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2.smali
index 3c47206201..7e424eabd2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemDstiLottie.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/file/DownloadUtils$DownloadState;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "downloadState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;
 
@@ -78,13 +80,4 @@
     invoke-static {v0, p1, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;->access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;Lcom/discord/utilities/file/DownloadUtils$DownloadState;Lcom/discord/models/dsti/dto/ModelDsti;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "downloadState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie.smali
index 82e0cdb804..72fec0f288 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie.smali
@@ -17,7 +17,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;
 
@@ -25,41 +25,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "loadingSpinner"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoadingSpinner()Landroid/view/View;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "loadingSpinner"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getLoadingSpinner()Landroid/view/View;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "lottieView"
 
-    const/4 v3, 0x0
+    const-string v3, "getLottieView()Lcom/discord/rlottie/RLottieImageView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "lottieView"
+    const/4 v2, 0x1
 
-    const-string v4, "getLottieView()Lcom/discord/rlottie/RLottieImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -69,13 +57,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0190
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a021c
+    const p1, 0x7f0a021f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -83,7 +73,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;->loadingSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a021b
+    const p1, 0x7f0a021e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -92,15 +82,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;->lottieView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;Lcom/discord/utilities/file/DownloadUtils$DownloadState;Lcom/discord/models/dsti/dto/ModelDsti;)V
@@ -175,7 +156,7 @@
 
     const-string v2, "itemView.context"
 
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v4
 
@@ -283,11 +264,11 @@
 .end method
 
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -301,81 +282,76 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/models/dsti/dto/ModelDsti$Type;->LOTTIE:Lcom/discord/models/dsti/dto/ModelDsti$Type;
+    sget-object v0, Lcom/discord/models/dsti/dto/ModelDsti$Type;->LOTTIE:Lcom/discord/models/dsti/dto/ModelDsti$Type;
 
-    if-eq p1, v1, :cond_0
+    if-eq p1, v0, :cond_0
 
     return-void
 
     :cond_0
     sget-object p1, Lcom/discord/utilities/dsti/DstiUtils;->INSTANCE:Lcom/discord/utilities/dsti/DstiUtils;
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v2, "itemView"
+    const-string v1, "itemView"
 
-    const-string v3, "itemView.context"
+    const-string v2, "itemView.context"
 
-    invoke-static {v1, v2, v3}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/DstiEntry;->getDsti()Lcom/discord/models/dsti/dto/ModelDsti;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {p1, v1, v3}, Lcom/discord/utilities/dsti/DstiUtils;->fetchLottieSticker(Landroid/content/Context;Lcom/discord/models/dsti/dto/ModelDsti;)Lrx/Observable;
+    invoke-virtual {p1, v0, v2}, Lcom/discord/utilities/dsti/DstiUtils;->fetchLottieSticker(Landroid/content/Context;Lcom/discord/models/dsti/dto/ModelDsti;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    invoke-static {p1, v1, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v3, 0x0
+
+    invoke-static {p1, v0, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-class v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;
+    const-class v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v5
+    move-result-object v4
 
-    new-instance v6, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1;
+    new-instance v5, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1;
 
-    invoke-direct {v6, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;)V
+    invoke-direct {v5, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;)V
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    new-instance v8, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2;
 
-    new-instance v9, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2;
+    invoke-direct {v8, p0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;Lcom/discord/widgets/chat/list/entries/DstiEntry;)V
 
-    invoke-direct {v9, p0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie$onConfigure$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiLottie;Lcom/discord/widgets/chat/list/entries/DstiEntry;)V
+    const/16 v9, 0x18
 
-    const/16 v10, 0x18
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
-
-    invoke-static/range {v3 .. v11}, 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
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng$configureUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng$configureUI$1.smali
index 27a559fb78..1bee8a8114 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng$configureUI$1.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -79,7 +79,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng.smali
index 56ce80cc4f..45c7f7e14b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng.smali
@@ -19,25 +19,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng;
 
-    const-class v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng;
+    const-string v2, "pngView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPngView()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "pngView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getPngView()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -47,13 +41,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0191
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a021d
+    const p1, 0x7f0a0220
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -62,15 +58,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng;->pngView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final configureUI(Lcom/discord/models/dsti/dto/ModelDsti;)V
@@ -146,7 +133,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 1
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -186,15 +175,6 @@
     invoke-direct {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemDstiPng;->configureUI(Lcom/discord/models/dsti/dto/ModelDsti;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali
index 65f8dd294b..99f9848791 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1.smali
@@ -45,7 +45,7 @@
 
     const-string v0, "context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1;->$this_copyTextOnLongPress:Landroid/widget/TextView;
 
@@ -55,13 +55,13 @@
 
     const-string v1, "text"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     return v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1.smali
index 8eb2f97bd6..1255e7f218 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/widget/TextView;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$this$copyTextOnLongPress"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$1$1;
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "$this$copyTextOnLongPress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali
index b13f98a142..f0da0b0fcd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$bindUrlOnClick$1.smali
@@ -41,11 +41,11 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "view"
+    const-string/jumbo v0, "view"
 
-    const-string v1, "view.context"
+    const-string/jumbo v1, "view.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$1.smali
index 89d3287e11..9cef2a3690 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$1.smali
@@ -27,7 +27,20 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -96,7 +109,7 @@
 
     const-string v0, "members"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -176,7 +189,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_3
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -198,19 +211,12 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_3
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_2
 
     :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_4
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$2.smali
index 4cdc97ad7c..95ab8f8741 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion$getModel$2.smali
@@ -31,7 +31,23 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;",
+        ">;"
     }
 .end annotation
 
@@ -94,7 +110,7 @@
 
     const-string v0, "myId"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion.smali
index 373f055688..ab962a3d62 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion.smali
@@ -360,7 +360,7 @@
 
     const/4 v3, 0x2
 
-    invoke-static {v1, p3, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v1, p3, v2, v3}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v1
 
@@ -399,11 +399,11 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    invoke-static {v0, v1}, Lj0/t/s;->drop(Ljava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v1}, Lk0/u/s;->drop(Ljava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v0}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v0
 
@@ -498,11 +498,11 @@
 
     if-eqz v3, :cond_2
 
-    sget-object p1, Lr0/l/a/g;->e:Lrx/Observable;
+    sget-object p1, Ls0/l/a/g;->e:Lrx/Observable;
 
     const-string v0, "Observable.never()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -597,7 +597,7 @@
 
     const-string v0, "Observable\n          .co\u2026 roles, myId)\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -609,7 +609,7 @@
 
     const-string v0, "Observable\n          .co\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali
index ef57ecc7da..79783d6bc0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField.smali
@@ -57,11 +57,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "parsedName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parsedValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,20 +72,6 @@
     iput-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;->parsedValue:Ljava/util/Collection;
 
     return-void
-
-    :cond_0
-    const-string p1, "parsedValue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parsedName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;Ljava/util/Collection;Ljava/util/Collection;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;
@@ -165,31 +153,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "parsedName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parsedValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;-><init>(Ljava/util/Collection;Ljava/util/Collection;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "parsedValue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "parsedName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -207,7 +183,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;->parsedName:Ljava/util/Collection;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -217,7 +193,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$ParsedField;->parsedValue:Ljava/util/Collection;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1.smali
index 7b73eefeb5..36224758ae 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1;->$eventHandler:Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;
 
     invoke-interface {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onUrlLongClicked(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali
index 895efca43c..dd26f4acca 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1.smali
@@ -59,7 +59,7 @@
 
     const/4 v1, 0x1
 
-    invoke-static {p1, v0, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {p1, v0, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result p1
 
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 f8e94f25cc..544111c228 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
@@ -96,7 +96,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -125,7 +125,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_4
+    const-string v0, "embedEntry"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -272,7 +274,7 @@
 
     invoke-direct {p4, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1;-><init>(Ljava/lang/String;)V
 
-    invoke-static {p5, p4}, Ld0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
+    invoke-static {p5, p4}, Le0/a/b/b/a;->X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
     :try_end_0
     .catch Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -323,15 +325,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->isSpoilerHidden:Z
 
     return-void
-
-    :cond_4
-    const-string p1, "embedEntry"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -600,7 +593,7 @@
 
     const-string v5, "http"
 
-    invoke-static {v1, v5, v3, v4}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {v1, v5, v3, v4}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result v1
 
@@ -798,38 +791,31 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
-
-    new-instance v9, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;
-
-    move-object v0, v9
-
-    move-object v1, p1
-
-    move-object v2, p2
-
-    move-object v3, p3
-
-    move-object v4, p4
-
-    move-object v5, p5
-
-    move-object/from16 v6, p6
-
-    move-wide/from16 v7, p7
-
-    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;-><init>(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
-
-    return-object v9
-
-    :cond_0
     const-string v0, "embedEntry"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v2, p1
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;
+
+    move-object v1, v0
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    move-object/from16 v7, p6
+
+    move-wide/from16 v8, p7
+
+    invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;-><init>(Lcom/discord/widgets/chat/list/entries/EmbedEntry;Ljava/util/Collection;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;J)V
+
+    return-object v0
 .end method
 
 .method public final createRenderContext(Landroid/content/Context;Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;)Lcom/discord/utilities/textprocessing/MessageRenderContext;
@@ -839,39 +825,47 @@
 
     move-object/from16 v1, p2
 
-    const/4 v2, 0x0
+    move-object/from16 v3, p1
 
-    if-eqz p1, :cond_1
+    const-string v2, "androidContext"
 
-    if-eqz v1, :cond_0
+    move-object/from16 v4, p1
 
-    new-instance v2, Lcom/discord/utilities/textprocessing/MessageRenderContext;
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v3, v2
+    const-string v2, "eventHandler"
 
-    iget-wide v5, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->myId:J
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
+    new-instance v19, Lcom/discord/utilities/textprocessing/MessageRenderContext;
 
-    invoke-virtual {v4}, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->getAllowAnimatedEmojis()Z
+    move-object/from16 v2, v19
 
-    move-result v7
+    iget-wide v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->myId:J
 
-    iget-object v8, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->userNames:Ljava/util/Map;
+    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
-    iget-object v9, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->channelNames:Ljava/util/Map;
+    invoke-virtual {v6}, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->getAllowAnimatedEmojis()Z
 
-    iget-object v10, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->roles:Ljava/util/Map;
+    move-result v6
+
+    iget-object v7, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->userNames:Ljava/util/Map;
+
+    iget-object v8, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->channelNames:Ljava/util/Map;
+
+    iget-object v9, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->roles:Ljava/util/Map;
+
+    new-instance v10, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1;
+
+    move-object v12, v10
+
+    invoke-direct {v10, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;)V
+
+    const/4 v10, 0x0
 
     const/4 v11, 0x0
 
-    const/4 v12, 0x0
-
-    new-instance v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1;
-
-    move-object v13, v4
-
-    invoke-direct {v4, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model$createRenderContext$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;)V
+    const/4 v13, 0x0
 
     const/4 v14, 0x0
 
@@ -879,31 +873,13 @@
 
     const/16 v16, 0x0
 
-    const/16 v17, 0x0
+    const/16 v17, 0x1ec0
 
-    const/16 v18, 0x1ec0
+    const/16 v18, 0x0
 
-    const/16 v19, 0x0
+    invoke-direct/range {v2 .. v18}, Lcom/discord/utilities/textprocessing/MessageRenderContext;-><init>(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    move-object/from16 v4, p1
-
-    invoke-direct/range {v3 .. v19}, Lcom/discord/utilities/textprocessing/MessageRenderContext;-><init>(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v2
-
-    :cond_0
-    const-string v1, "eventHandler"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    const-string v1, "androidContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    return-object v19
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -921,7 +897,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->embedEntry:Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -931,7 +907,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->parsedDescription:Ljava/util/Collection;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -941,7 +917,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->parsedFields:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -951,7 +927,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->channelNames:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -961,7 +937,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->userNames:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -971,7 +947,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;->roles:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedDescription$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedDescription$1.smali
index ccb5961295..71b01b47d2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedDescription$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedDescription$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedDescription$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/textprocessing/node/SpoilerNode<",
         "*>;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "node"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -104,13 +106,4 @@
     invoke-virtual {v0, v1, v2, v3, p1}, Lcom/discord/stores/StoreMessageState;->revealSpoilerEmbedData(JILjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "node"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1.smali
index b665801c0e..588f0984b2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/textprocessing/node/SpoilerNode<",
         "*>;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "node"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -112,13 +114,4 @@
     invoke-virtual {v0, v2, v3, v1, p1}, Lcom/discord/stores/StoreMessageState;->revealSpoilerEmbedData(JILjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "node"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.smali
index 97d37723c5..9608fd6122 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/util/Collection<",
         "+",
@@ -60,7 +60,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
 # virtual methods
 .method public final invoke(Ljava/util/Collection;Ljava/lang/String;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-    .locals 29
+    .locals 28
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -89,13 +89,15 @@
 
     move-object/from16 v2, p2
 
-    const/4 v3, 0x0
+    const-string v3, "$this$toDraweeSpanStringBuilder"
 
-    if-eqz v1, :cond_2
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_1
+    const-string v3, "prefixKey"
 
-    new-instance v11, Lcom/discord/utilities/textprocessing/MessagePreprocessor;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Lcom/discord/utilities/textprocessing/MessagePreprocessor;
 
     iget-object v4, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1;->$model:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;
 
@@ -107,16 +109,21 @@
 
     if-eqz v4, :cond_0
 
-    sget-object v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;
+    sget-object v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;
 
-    iget v7, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1;->$embedIndex:I
+    iget v8, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1;->$embedIndex:I
 
-    invoke-static {v3, v4, v7, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;->access$getEmbedFieldVisibleIndices(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;Ljava/util/Map;ILjava/lang/String;)Ljava/util/List;
+    invoke-static {v7, v4, v8, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;->access$getEmbedFieldVisibleIndices(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Companion;Ljava/util/Map;ILjava/lang/String;)Ljava/util/List;
 
-    move-result-object v3
+    move-result-object v4
+
+    goto :goto_0
 
     :cond_0
-    move-object v7, v3
+    const/4 v4, 0x0
+
+    :goto_0
+    move-object v7, v4
 
     const/4 v8, 0x0
 
@@ -124,17 +131,19 @@
 
     const/4 v10, 0x0
 
-    move-object v4, v11
+    move-object v4, v3
 
     invoke-direct/range {v4 .. v10}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;-><init>(JLjava/util/Collection;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-virtual {v11, v1}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V
+    invoke-virtual {v3, v1}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V
 
-    iget-object v12, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1;->$renderContext:Lcom/discord/utilities/textprocessing/MessageRenderContext;
+    iget-object v11, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1;->$renderContext:Lcom/discord/utilities/textprocessing/MessageRenderContext;
 
-    const/4 v13, 0x0
+    const/4 v12, 0x0
 
-    const-wide/16 v14, 0x0
+    const-wide/16 v13, 0x0
+
+    const/4 v15, 0x0
 
     const/16 v16, 0x0
 
@@ -152,21 +161,19 @@
 
     const/16 v23, 0x0
 
-    const/16 v24, 0x0
-
     new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1;
 
-    move-object/from16 v25, v3
+    move-object/from16 v24, v3
 
     invoke-direct {v3, v0, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedFields$1;Ljava/lang/String;)V
 
-    const/16 v26, 0x0
+    const/16 v25, 0x0
 
-    const/16 v27, 0x17ff
+    const/16 v26, 0x17ff
 
-    const/16 v28, 0x0
+    const/16 v27, 0x0
 
-    invoke-static/range {v12 .. v28}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->copy$default(Lcom/discord/utilities/textprocessing/MessageRenderContext;Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/utilities/textprocessing/MessageRenderContext;
+    invoke-static/range {v11 .. v27}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->copy$default(Lcom/discord/utilities/textprocessing/MessageRenderContext;Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/utilities/textprocessing/MessageRenderContext;
 
     move-result-object v2
 
@@ -176,23 +183,9 @@
 
     const-string v2, "AstRenderer.render(\n    \u2026d}\")\n          })\n      )"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
-
-    :cond_1
-    const-string v1, "prefixKey"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_2
-    const-string v1, "$this$toDraweeSpanStringBuilder"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$$inlined$apply$lambda$1.smali
index 0e7769b3d6..fd8460d7b5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedImage$$inlined$apply$lambda$1.smali
@@ -51,9 +51,9 @@
 
     move-result-object v0
 
-    const-string v1, "view.context"
+    const-string/jumbo v1, "view.context"
 
-    const-string v2, "view"
+    const-string/jumbo v2, "view"
 
     if-eqz v0, :cond_0
 
@@ -65,13 +65,13 @@
 
     sget-object v3, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v4
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -86,7 +86,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/media/WidgetMedia;->Companion:Lcom/discord/widgets/media/WidgetMedia$Companion;
 
-    invoke-static {p1, v2, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v2, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.smali
index 60c7cc8cfc..0cca98a81c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/textprocessing/node/SpoilerNode<",
         "*>;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "node"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -116,13 +118,4 @@
     invoke-virtual {v0, v1, v2, v3, p1}, Lcom/discord/stores/StoreMessageState;->revealSpoilerEmbedData(JILjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "node"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureInlineEmbed$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureInlineEmbed$$inlined$apply$lambda$1.smali
index 8003546b79..a81efa581c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureInlineEmbed$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureInlineEmbed$$inlined$apply$lambda$1.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "this.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureInlineEmbed$$inlined$apply$lambda$1;->$embed$inlined:Lcom/discord/models/domain/ModelMessageEmbed;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1.smali
index 6c5d03bcf6..6e3d61acde 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->scaleY(F)Landroid/view/ViewPropertyAnimator;
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2.smali
index 49d3f19a65..83b4c0ef15 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x3f666666    # 0.9f
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->scaleY(F)Landroid/view/ViewPropertyAnimator;
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2.smali
index 462d331a0b..2c6f39aa58 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$3.smali
index 6819afc9be..6b3a43f51f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemEmbed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v2, "itemView.context"
 
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v0
 
@@ -91,7 +91,7 @@
 
     const-string v2, "model"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, p1, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->access$configureEmbedTitle(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;Lcom/discord/utilities/textprocessing/MessageRenderContext;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
index 81fac0488c..301b42d672 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
@@ -109,7 +109,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 7
+    .locals 6
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;
 
@@ -117,311 +117,209 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "containerCard"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainerCard()Lcom/google/android/material/card/MaterialCardView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "containerCard"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getContainerCard()Lcom/google/android/material/card/MaterialCardView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "embedProvider"
 
-    const/4 v3, 0x0
+    const-string v3, "getEmbedProvider()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "embedProvider"
-
-    const-string v5, "getEmbedProvider()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "embedTitle"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v5, "getEmbedTitle()Lcom/discord/utilities/view/text/LinkifiedTextView;"
 
-    move-result-object v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "embedTitle"
+    move-result-object v2
 
-    const-string v6, "getEmbedTitle()Lcom/discord/utilities/view/text/LinkifiedTextView;"
+    const/4 v5, 0x2
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v5
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "embedAuthorIcon"
 
-    const/4 v4, 0x2
+    const-string v5, "getEmbedAuthorIcon()Landroid/widget/ImageView;"
 
-    aput-object v2, v1, v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
+    move-result-object v2
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const/4 v5, 0x3
 
-    move-result-object v4
+    aput-object v2, v1, v5
 
-    const-string v5, "embedAuthorIcon"
+    const-string v2, "embedAuthorText"
 
-    const-string v6, "getEmbedAuthorIcon()Landroid/widget/ImageView;"
+    const-string v5, "getEmbedAuthorText()Landroid/widget/TextView;"
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
-    const/4 v4, 0x3
+    const/4 v5, 0x4
 
-    aput-object v2, v1, v4
+    aput-object v2, v1, v5
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "embedDescription"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v5, "getEmbedDescription()Lcom/discord/utilities/view/text/LinkifiedTextView;"
 
-    move-result-object v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "embedAuthorText"
+    move-result-object v2
 
-    const-string v6, "getEmbedAuthorText()Landroid/widget/TextView;"
+    const/4 v5, 0x5
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v5
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "embedFields"
 
-    const/4 v4, 0x4
+    const-string v5, "getEmbedFields()Landroid/view/ViewGroup;"
 
-    aput-object v2, v1, v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
+    move-result-object v2
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const/4 v5, 0x6
 
-    move-result-object v4
+    aput-object v2, v1, v5
 
-    const-string v5, "embedDescription"
+    const-string v2, "embedContent"
 
-    const-string v6, "getEmbedDescription()Lcom/discord/utilities/view/text/LinkifiedTextView;"
+    const-string v5, "getEmbedContent()Landroidx/constraintlayout/widget/ConstraintLayout;"
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
-    const/4 v4, 0x5
+    const/4 v5, 0x7
 
-    aput-object v2, v1, v4
+    aput-object v2, v1, v5
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "embedImageContainer"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v5, "getEmbedImageContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "embedFields"
+    move-result-object v2
 
-    const-string v6, "getEmbedFields()Landroid/view/ViewGroup;"
+    const/16 v5, 0x8
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v5
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "embedImage"
 
-    const/4 v4, 0x6
+    const-string v5, "getEmbedImage()Landroid/widget/ImageView;"
 
-    aput-object v2, v1, v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
+    move-result-object v2
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const/16 v5, 0x9
 
-    move-result-object v4
+    aput-object v2, v1, v5
 
-    const-string v5, "embedContent"
+    const-string v2, "embedImageIcons"
 
-    const-string v6, "getEmbedContent()Landroidx/constraintlayout/widget/ConstraintLayout;"
+    const-string v5, "getEmbedImageIcons()Landroid/widget/ImageView;"
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
-    const/4 v4, 0x7
+    const/16 v5, 0xa
 
-    aput-object v2, v1, v4
+    aput-object v2, v1, v5
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "embedInlineMedia"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v5, "getEmbedInlineMedia()Lcom/discord/widgets/chat/list/InlineMediaView;"
 
-    move-result-object v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "embedImageContainer"
+    move-result-object v2
 
-    const-string v6, "getEmbedImageContainer()Landroid/view/ViewGroup;"
+    const/16 v5, 0xb
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v5
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "embedImageThumbnail"
 
-    const/16 v4, 0x8
+    const-string v5, "getEmbedImageThumbnail()Landroid/widget/ImageView;"
 
-    aput-object v2, v1, v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
+    move-result-object v2
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const/16 v5, 0xc
 
-    move-result-object v4
+    aput-object v2, v1, v5
 
-    const-string v5, "embedImage"
+    const-string v2, "embedDivider"
 
-    const-string v6, "getEmbedImage()Landroid/widget/ImageView;"
+    const-string v5, "getEmbedDivider()Landroid/view/View;"
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
-    const/16 v4, 0x9
+    const/16 v5, 0xd
 
-    aput-object v2, v1, v4
+    aput-object v2, v1, v5
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "embedFooterIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v5, "getEmbedFooterIcon()Landroid/widget/ImageView;"
 
-    move-result-object v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "embedImageIcons"
+    move-result-object v2
 
-    const-string v6, "getEmbedImageIcons()Landroid/widget/ImageView;"
+    const/16 v5, 0xe
 
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v5
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "embedFooterText"
 
-    const/16 v4, 0xa
+    const-string v5, "getEmbedFooterText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v4
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
+    move-result-object v2
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const/16 v5, 0xf
 
-    move-result-object v4
+    aput-object v2, v1, v5
 
-    const-string v5, "embedInlineMedia"
-
-    const-string v6, "getEmbedInlineMedia()Lcom/discord/widgets/chat/list/InlineMediaView;"
-
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v4, 0xb
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v4
-
-    const-string v5, "embedImageThumbnail"
-
-    const-string v6, "getEmbedImageThumbnail()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v4, 0xc
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v4
-
-    const-string v5, "embedDivider"
-
-    const-string v6, "getEmbedDivider()Landroid/view/View;"
-
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v4, 0xd
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v4
-
-    const-string v5, "embedFooterIcon"
-
-    const-string v6, "getEmbedFooterIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v4, 0xe
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v4
-
-    const-string v5, "embedFooterText"
-
-    const-string v6, "getEmbedFooterText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v4, v5, v6}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v4, 0xf
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const-string v4, "spoilerView"
+    const-string v2, "spoilerView"
 
     const-string v5, "getSpoilerView()Landroid/widget/FrameLayout;"
 
-    invoke-direct {v2, v0, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v2, v5, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v0
 
-    const/16 v0, 0x10
+    const/16 v2, 0x10
 
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -461,125 +359,127 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0192
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a023a
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->containerCard$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0246
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedProvider$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0248
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0236
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedAuthorIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0237
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedAuthorText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a023c
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0240
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFields$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a023b
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedContent$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0322
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0243
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImage$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0244
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageIcons$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0323
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedInlineMedia$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0245
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageThumbnail$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a023d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->containerCard$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0249
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedProvider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a024b
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0239
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedAuthorIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a023a
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedAuthorText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a023f
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0243
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFields$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a023e
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedContent$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0328
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0246
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImage$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0247
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageIcons$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0329
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedInlineMedia$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0248
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedImageThumbnail$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0240
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0241
+    const p1, 0x7f0a0244
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -587,7 +487,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFooterIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0242
+    const p1, 0x7f0a0245
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -595,7 +495,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFooterText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0247
+    const p1, 0x7f0a024a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -647,7 +547,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
@@ -665,7 +565,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
 
@@ -685,7 +585,7 @@
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -693,7 +593,7 @@
 
     const-string v1, "itemView.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/embed/EmbedResourceUtils;->computeMaximumImageWidthPx(Landroid/content/Context;)I
 
@@ -710,15 +610,6 @@
     iput-boolean p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->shouldRenderEmbeds:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$configureEmbedDescription(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model;Lcom/discord/utilities/textprocessing/MessageRenderContext;)V
@@ -1257,7 +1148,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f0a023e
+    const v7, 0x7f0a0241
 
     invoke-virtual {v4, v7}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1295,7 +1186,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f0a023f
+    const v7, 0x7f0a0242
 
     invoke-virtual {v4, v7}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1365,7 +1256,7 @@
 
     const-string v3, "image"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getWidth()I
 
@@ -1381,7 +1272,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getHeight()I
 
@@ -1417,7 +1308,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->maxAttachmentImageWidth:I
 
@@ -1512,7 +1403,7 @@
 
     const-string p2, "providerName"
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
@@ -1978,7 +1869,7 @@
 
     const-string v6, "embedFooterText.context"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p2 .. p2}, Lcom/discord/utilities/time/TimeUtils;->parseUTCDate(Ljava/lang/String;)J
 
@@ -2072,7 +1963,7 @@
 
     const-string v5, "text"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
 
@@ -2184,7 +2075,7 @@
 
     const-string v0, "embedInlineMedia.resources"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {v4 .. v9}, Lcom/discord/utilities/embed/EmbedResourceUtils;->calculateScaledSize(IIIILandroid/content/res/Resources;)Lkotlin/Pair;
 
@@ -2239,7 +2130,7 @@
 
     const-string v0, "javaClass.simpleName"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -2311,7 +2202,7 @@
 
     const-string v4, "itemView.context"
 
-    invoke-static {v2, v3, v4}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {v2, v3, v4}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v2
 
@@ -2548,7 +2439,7 @@
     :goto_2
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v5}, Landroid/view/View;->setVisibility(I)V
     :try_end_0
@@ -2563,7 +2454,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
@@ -2949,7 +2840,7 @@
 
     const-string v2, "gifv"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -2957,15 +2848,15 @@
 
     const-string v2, "image"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    const-string v2, "video"
+    const-string/jumbo v2, "video"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -3151,9 +3042,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -3163,11 +3054,11 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    new-instance v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1;
+    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1;
 
-    invoke-direct {v1, p0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;Lcom/discord/widgets/chat/list/entries/ChatListEntry;)V
+    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;Lcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
     invoke-virtual {v2}, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->getEmbed()Lcom/discord/models/domain/ModelMessageEmbed;
 
@@ -3195,10 +3086,15 @@
 
     invoke-static/range {v3 .. v8}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
-    move-object v3, v0
+    const/4 p1, 0x0
+
+    :goto_0
+    move-object v3, p1
 
     invoke-virtual {v2}, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->getEmbed()Lcom/discord/models/domain/ModelMessageEmbed;
 
@@ -3250,7 +3146,7 @@
 
     const-string p2, "getModel(initialModel)\n        .take(1)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -3277,13 +3173,6 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
index 89138ad1a6..f1489ecacd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
@@ -17,7 +17,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a022a
+    const v0, 0x7f0a022d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali
index 21e5fb5f6b..c89e736b34 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,37 +66,39 @@
 .end method
 
 .method public final invoke(Landroid/view/View;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "model"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getActivity()Lcom/discord/models/domain/activity/ModelActivity;
 
-    move-result-object v7
+    move-result-object v6
 
-    if-eqz v7, :cond_0
+    if-eqz v6, :cond_0
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 
     invoke-static {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$getAdapter$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
-    move-result-object v1
+    move-result-object v0
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getAuthorId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getMessageId()J
 
-    move-result-wide v4
+    move-result-wide v3
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
 
@@ -106,30 +108,16 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
 
-    move-result v6
+    move-result v5
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-virtual/range {v1 .. v8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->onUserActivityAction(JJILcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelApplication;)V
+    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->onUserActivityAction(JJILcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelApplication;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
index d485c16432..afe7ff01d3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 
@@ -82,13 +84,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->bind(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/utilities/time/Clock;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
index 9d06ffdc65..5f18d62b19 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .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 8a48fe6ed8..2e198560ea 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
@@ -21,25 +21,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 
-    const-class v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
+    const-string v2, "gameInviteView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGameInviteView()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "gameInviteView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGameInviteView()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -49,13 +43,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0196
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0535
+    const p1, 0x7f0a053b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -64,15 +60,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->gameInviteView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
@@ -144,7 +131,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 9
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -178,8 +167,6 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
-
     new-instance v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;
 
     invoke-direct {v4, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
@@ -192,12 +179,14 @@
 
     const-string p1, "javaClass.simpleName"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
 
+    const/4 v1, 0x0
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -209,15 +198,6 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali
index cf771b15e4..de1cd8d4c1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid.smali
@@ -102,7 +102,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;->gifterUserId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali
index e1a2cd5156..0f0a0fe639 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved.smali
@@ -28,12 +28,16 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelUser;ZZ)V
     .locals 1
 
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "meUser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->gift:Lcom/discord/models/domain/ModelGift;
@@ -45,20 +49,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->redeeming:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;Lcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelUser;ZZILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;
@@ -136,31 +126,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelUser;ZZ)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "gift"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;-><init>(Lcom/discord/models/domain/ModelGift;Lcom/discord/models/domain/ModelUser;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -178,7 +156,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->gift:Lcom/discord/models/domain/ModelGift;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -188,7 +166,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali
index be958b4f31..ff9544fd14 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreGifting$GiftState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -89,9 +91,9 @@
     :goto_0
     sget-object p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Loading;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Loading;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali
index 87987ec122..6b3cd870ff 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;",
+        ">;"
     }
 .end annotation
 
@@ -59,14 +62,14 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Long;Ljava/lang/Long;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;
+.method public final call(Ljava/lang/Long;Ljava/lang/Long;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;
     .locals 3
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;
 
     const-string v1, "meId"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
@@ -84,7 +87,7 @@
 
     check-cast p2, Ljava/lang/Long;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1;->call(Ljava/lang/Long;Ljava/lang/Long;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getInvalidGift$1;->call(Ljava/lang/Long;Ljava/lang/Long;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali
index a870fb9279..349bb42014 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelLibraryApplication;",
+        ">;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;",
+        ">;"
     }
 .end annotation
 
@@ -89,7 +96,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$getResolvedGiftModel$1;->$gift:Lcom/discord/models/domain/ModelGift;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
@@ -148,7 +155,7 @@
     const/4 p2, 0x0
 
     :goto_1
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali
index b53a7cbd30..6d3c50f916 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider.smali
@@ -80,9 +80,9 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -102,7 +102,7 @@
 
     const-string v0, "Observable.combineLatest\u2026lid(authorUserId, meId) }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -150,7 +150,7 @@
 
     const-string p2, "Observable.combineLatest\u2026 me.id)\n        }\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -187,7 +187,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -207,22 +209,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$ModelProvider$get$1;-><init>(Lcom/discord/widgets/chat/list/entries/GiftEntry;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "StoreStream\n            \u2026          }\n            }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali
index 3e97760b19..9e5dab0d7e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$buttons$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali
index d30c163187..700b34a704 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/facebook/imagepipeline/request/ImageRequestBuilder;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Lcom/facebook/imagepipeline/request/ImageRequestBuilder;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->access$getSPLASH_IMAGE_POSTPROCESSOR$cp()Lcom/discord/utilities/fresco/GrayscalePostprocessor;
 
@@ -80,13 +82,4 @@
     iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->j:Lf/g/j/q/b;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali
index 7256c5a248..bf2577bee4 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$3.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$4.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$4.smali
index d028721960..e40977a5a3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$4.smali
@@ -47,7 +47,7 @@
 
     const-string p1, "context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Companion;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali
index f35ebe9ec9..095bbd8f86 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string p1, "it.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1.smali
index c30ba5f7bc..3c632e4215 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2.smali
index 5c5306e4fe..c2bc094f16 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;
 
+    const/4 v0, 0x0
+
     invoke-static {p1, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->access$configureInvalidUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3.smali
index 41b3ec11db..788eda9755 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGift.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$onConfigure$3;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 67ed47071f..217d454653 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
@@ -51,7 +51,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;
 
@@ -59,185 +59,125 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "header"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeader()Lcom/discord/app/AppTextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "header"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getHeader()Lcom/discord/app/AppTextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "nameText"
 
-    const/4 v3, 0x0
+    const-string v3, "getNameText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "nameText"
-
-    const-string v5, "getNameText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "image"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "image"
-
-    const-string v5, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "imageBackground"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "imageBackground"
-
-    const-string v5, "getImageBackground()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "expiresText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExpiresText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "expiresText"
-
-    const-string v5, "getExpiresText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "subText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "subText"
-
-    const-string v5, "getSubText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "acceptButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAcceptButton()Landroid/widget/Button;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "acceptButton"
-
-    const-string v5, "getAcceptButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "verifyButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVerifyButton()Landroid/widget/Button;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "verifyButton"
-
-    const-string v5, "getVerifyButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x7
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "cannotClaimButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCannotClaimButton()Landroid/widget/Button;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "cannotClaimButton"
-
-    const-string v5, "getCannotClaimButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v3, 0x8
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "loadingButtonPlaceholder"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoadingButtonPlaceholder()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "loadingButtonPlaceholder"
+    const/16 v2, 0x9
 
-    const-string v4, "getLoadingButtonPlaceholder()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v0, 0x9
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -261,77 +201,79 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0197
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0543
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0547
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0544
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0545
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->imageBackground$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0542
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->expiresText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0548
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->subText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a053f
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->acceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a0549
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a054d
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a054a
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a054b
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->imageBackground$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0548
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->expiresText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a054e
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->subText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0545
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->acceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a054f
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->verifyButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0540
+    const p1, 0x7f0a0546
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -339,7 +281,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->cannotClaimButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0546
+    const p1, 0x7f0a054c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -358,15 +300,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;->buttons$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$configureInvalidUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Invalid;)V
@@ -417,7 +350,7 @@
     :cond_0
     const-string p0, "item"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -483,7 +416,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -519,7 +452,7 @@
     move-object p1, v1
 
     :goto_1
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -537,7 +470,7 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f1208b1
+    const p1, 0x7f1208b3
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -546,7 +479,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f1208b0
+    const p1, 0x7f1208b2
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -559,7 +492,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f1208ad
+    const v2, 0x7f1208af
 
     invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -585,11 +518,11 @@
 
     const-string p1, "context"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p1, 0x7f0402f6
 
-    const v2, 0x7f0804c3
+    const v2, 0x7f0804c6
 
     invoke-static {v0, p1, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
 
@@ -647,7 +580,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -657,7 +590,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1208b2
+    const v2, 0x7f1208b4
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -755,7 +688,7 @@
 
     const-string v3, "itemView"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -929,7 +862,7 @@
     :goto_4
     iget-object v13, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v13, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v13}, Landroid/view/View;->getWidth()I
 
@@ -957,11 +890,11 @@
 
     if-eqz v3, :cond_5
 
-    invoke-static {v2, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v3, 0x7f040255
 
-    const v13, 0x7f0804b5
+    const v13, 0x7f0804b8
 
     invoke-static {v2, v3, v13}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
 
@@ -1028,7 +961,7 @@
 
     if-eqz v4, :cond_7
 
-    const v4, 0x7f1208b5
+    const v4, 0x7f1208b7
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1037,7 +970,7 @@
     goto :goto_6
 
     :cond_7
-    const v4, 0x7f1208b4
+    const v4, 0x7f1208b6
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1144,7 +1077,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f1208a8
+    const v4, 0x7f1208aa
 
     new-array v13, v5, [Ljava/lang/Object;
 
@@ -1166,7 +1099,7 @@
 
     move-result-wide v11
 
-    invoke-static {v2, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -1174,7 +1107,7 @@
 
     const-string v15, "context.resources"
 
-    invoke-static {v10, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v14, v11, v12, v10}, Lcom/discord/utilities/gifting/GiftingUtils;->getTimeString(JLandroid/content/res/Resources;)Ljava/lang/String;
 
@@ -1321,7 +1254,7 @@
 
     if-nez v3, :cond_f
 
-    const v3, 0x7f12085f
+    const v3, 0x7f120861
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1329,19 +1262,19 @@
 
     const-string v5, "context.getString(R.stri\u2026xt_verification_required)"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "(onClick)"
 
-    invoke-static {v3, v5, v13, v6, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v3, v5, v13, v6, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v12, v13, v6, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v3, v12, v13, v6, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v10, v13, v6, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v3, v10, v13, v6, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v12
 
@@ -1350,7 +1283,7 @@
     :cond_f
     if-eqz v7, :cond_10
 
-    const v3, 0x7f120890
+    const v3, 0x7f120892
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1365,7 +1298,7 @@
 
     if-eqz v3, :cond_11
 
-    const v3, 0x7f12085e
+    const v3, 0x7f120860
 
     new-array v5, v5, [Ljava/lang/Object;
 
@@ -1377,19 +1310,19 @@
 
     const-string v5, "context.getString(R.stri\u2026auth_help_text_owned, \"\")"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "()"
 
-    invoke-static {v3, v5, v13, v6, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v3, v5, v13, v6, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v12, v13, v6, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v3, v12, v13, v6, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v10, v13, v6, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v3, v10, v13, v6, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v12
 
@@ -1398,7 +1331,7 @@
     :cond_11
     if-eqz v8, :cond_12
 
-    const v3, 0x7f12085d
+    const v3, 0x7f12085f
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1468,11 +1401,11 @@
 
     move-result v4
 
-    const v5, 0x7f1208a4
+    const v5, 0x7f1208a6
 
     if-eqz v4, :cond_15
 
-    const v5, 0x7f1208a5
+    const v5, 0x7f1208a7
 
     goto :goto_e
 
@@ -1488,7 +1421,7 @@
 
     if-eqz v4, :cond_17
 
-    const v5, 0x7f1208a6
+    const v5, 0x7f1208a8
 
     :cond_17
     :goto_e
@@ -1846,9 +1779,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -1897,16 +1830,11 @@
     :cond_0
     const-string p1, "item"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved.smali
index 537f362cb1..2b6fcabf23 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuildTemplate;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guildTemplate"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;->guildTemplate:Lcom/discord/models/domain/ModelGuildTemplate;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;Lcom/discord/models/domain/ModelGuildTemplate;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuildTemplate;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guildTemplate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;-><init>(Lcom/discord/models/domain/ModelGuildTemplate;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;->guildTemplate:Lcom/discord/models/domain/ModelGuildTemplate;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1.smali
index 372bfcb10b..3f1932d161 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemGuildTemplate.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -99,9 +101,9 @@
     :goto_0
     sget-object p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Loading;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Loading;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -120,9 +122,9 @@
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Resolved;-><init>(Lcom/discord/models/domain/ModelGuildTemplate;)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object v0, p1
 
@@ -131,9 +133,9 @@
     :cond_2
     sget-object p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Invalid;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Invalid;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     :goto_1
     return-object v0
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider.smali
index 28224f5c87..b2c8fd5e65 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider.smali
@@ -54,7 +54,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -72,22 +74,13 @@
 
     sget-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "StoreStream\n        .get\u2026tes\n          }\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$configureResolvedUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$configureResolvedUI$1.smali
index 43208ceb91..4c83328e21 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$configureResolvedUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$configureResolvedUI$1.smali
@@ -47,7 +47,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$1.smali
index f9d1f0f6e1..f523434907 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChatListAdapterItemGuildTemplate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;->access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$2.smali
index f81af616dc..2a64e89f9d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGuildTemplate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;
 
+    const/4 v0, 0x0
+
     invoke-static {p1, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;->access$configureInvalidUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Invalid;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$3.smali
index d7b0583c44..d613a21d5c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemGuildTemplate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$onConfigure$3;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate.smali
index b550802678..3f366abdac 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;
 
@@ -38,59 +38,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "templateNameText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTemplateNameText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "templateNameText"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getTemplateNameText()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "subText"
 
-    const/4 v3, 0x0
+    const-string v3, "getSubText()Lcom/discord/app/AppTextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "subText"
-
-    const-string v5, "getSubText()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "openButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOpenButton()Landroid/widget/Button;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "openButton"
+    const/4 v2, 0x2
 
-    const-string v4, "getOpenButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -100,13 +82,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0198
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a054e
+    const p1, 0x7f0a0554
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -114,7 +98,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;->templateNameText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a054f
+    const p1, 0x7f0a0555
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -122,7 +106,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;->subText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a054d
+    const p1, 0x7f0a0553
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -131,15 +115,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;->openButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$configureInvalidUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildTemplate$Model$Invalid;)V
@@ -189,7 +164,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -197,7 +172,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120b4f
+    const v0, 0x7f120b75
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
@@ -205,7 +180,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120b4e
+    const v0, 0x7f120b74
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
@@ -235,7 +210,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120b91
+    const v1, 0x7f120bb7
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -309,7 +284,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f100096
+    const v4, 0x7f100098
 
     invoke-virtual {v1, v4, v2, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -475,9 +450,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -526,16 +501,11 @@
     :cond_0
     const-string p1, "item"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali
index ff78feba5a..d9e18697c0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$1.smali
@@ -39,11 +39,11 @@
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Companion;
 
-    const-string v1, "view"
+    const-string/jumbo v1, "view"
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali
index 2214d38362..baeb671751 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome$onConfigure$2.smali
@@ -49,11 +49,11 @@
 
     sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->Companion:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
 
-    const-string v1, "view"
+    const-string/jumbo v1, "view"
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
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 e3cb2d6208..faf44c7616 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
@@ -21,7 +21,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;
 
@@ -29,77 +29,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "header"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "header"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getHeader()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "subheader"
 
-    const/4 v3, 0x0
+    const-string v3, "getSubheader()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "subheader"
-
-    const-string v5, "getSubheader()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "addIconOption"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAddIconOption()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "addIconOption"
-
-    const-string v5, "getAddIconOption()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "inviteFriendsOption"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteFriendsOption()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "inviteFriendsOption"
+    const/4 v2, 0x3
 
-    const-string v4, "getInviteFriendsOption()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -109,11 +85,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;Lcom/discord/utilities/time/Clock;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "adapter"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "clock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0199
 
@@ -121,7 +99,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->clock:Lcom/discord/utilities/time/Clock;
 
-    const p1, 0x7f0a0550
+    const p1, 0x7f0a0556
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +107,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0551
+    const p1, 0x7f0a0557
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -137,7 +115,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->subheader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0a7d
+    const p1, 0x7f0a0a82
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -145,7 +123,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->addIconOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0a7c
+    const p1, 0x7f0a0a81
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -154,20 +132,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome;->inviteFriendsOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;Lcom/discord/utilities/time/Clock;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -272,14 +236,16 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_c
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
     instance-of p1, p2, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
 
+    const/4 v0, 0x0
+
     if-nez p1, :cond_0
 
     move-object p1, v0
@@ -302,7 +268,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1217ff
+    const v2, 0x7f12182b
 
     const/4 v3, 0x1
 
@@ -437,7 +403,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1217fb
+    const p2, 0x7f121827
 
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -456,7 +422,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1217fd
+    const p2, 0x7f121829
 
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -469,7 +435,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1217fc
+    const p2, 0x7f121828
 
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -498,7 +464,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1217fa
+    const v1, 0x7f121826
 
     new-array v2, v3, [Ljava/lang/Object;
 
@@ -580,7 +546,7 @@
 
     const-string p2, "subheader.context"
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -600,13 +566,6 @@
 
     :cond_b
     return-void
-
-    :cond_c
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali
index 4c16fa1a89..563c6eaa0a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid.smali
@@ -121,7 +121,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;->authorUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -139,7 +139,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali
index a087604459..08f23a6e34 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved.smali
@@ -30,9 +30,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelInvite;JLcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "invite"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -47,13 +49,6 @@
     iput-object p6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;->channel:Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;Lcom/discord/models/domain/ModelInvite;JLcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;
@@ -166,34 +161,27 @@
 .method public final copy(Lcom/discord/models/domain/ModelInvite;JLcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "invite"
 
-    new-instance v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-wide v2, p2
+    move-object v2, p1
 
-    move-object v4, p4
+    move-wide v3, p2
 
-    move v5, p5
+    move-object v5, p4
 
-    move-object v6, p6
+    move v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;-><init>(Lcom/discord/models/domain/ModelInvite;JLcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelChannel;)V
+    move-object v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;-><init>(Lcom/discord/models/domain/ModelInvite;JLcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelChannel;)V
 
-    :cond_0
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -211,7 +199,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;->invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -229,7 +217,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;->authorUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -245,7 +233,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Resolved;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali
index 394c05b1f3..f5662edae7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreInstantInvites$InviteState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -91,9 +93,9 @@
 
     invoke-direct {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Loading;-><init>()V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali
index 8530a601da..90876aca13 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;",
+        ">;"
     }
 .end annotation
 
@@ -59,14 +62,14 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;
+.method public final call(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;
     .locals 3
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;
 
     const-string v1, "meId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -86,7 +89,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1;->call(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getInvalidInvite$1;->call(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali
index 5aeb670777..45cf9bc5c2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1;->call(Lcom/discord/models/domain/ModelGuild;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelGuild;)Z
+.method public final call(Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -86,5 +72,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1;->call(Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali
index e9fc3b6d82..d3a3ff8a14 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;",
+        ">;"
     }
 .end annotation
 
@@ -92,7 +97,7 @@
 
     iget-object v8, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$2;->$invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -102,7 +107,7 @@
 
     move-object/from16 v3, p3
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p3 .. p3}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -121,7 +126,7 @@
     :cond_0
     new-instance v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider.smali
index 7135e25ee4..6cc6fa171f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider.smali
@@ -104,7 +104,7 @@
 
     const-string v0, "Observable.combineLatest\u2026authorUser, meId, null) }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -177,7 +177,7 @@
 
     sget-object v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$getResolvedInviteModel$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -216,7 +216,7 @@
 
     const-string p2, "Observable.combineLatest\u2026hannel)\n        }\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -236,23 +236,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "item"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getInstantInvites()Lcom/discord/stores/StoreInstantInvites;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getInstantInvites()Lcom/discord/stores/StoreInstantInvites;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/InviteEntry;->getInviteCode()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/stores/StoreInstantInvites;->requestInvite$default(Lcom/discord/stores/StoreInstantInvites;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/stores/StoreInstantInvites;->requestInvite$default(Lcom/discord/stores/StoreInstantInvites;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
@@ -260,20 +262,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$ModelProvider$get$1;-><init>(Lcom/discord/widgets/chat/list/entries/InviteEntry;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "StoreStream\n        .get\u2026tes\n          }\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali
index e089f16209..1159a2e1f7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureInvalidUI$1.smali
@@ -61,7 +61,7 @@
 
     const-string p1, "context"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1.smali
index fbe37193b2..7d9459e011 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->access$joinServerOrDM(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;Lcom/discord/models/domain/ModelInvite;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1.smali
index d4d0cd2aae..0dadf3da06 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1.smali
@@ -73,7 +73,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1;->$context:Landroid/content/Context;
 
@@ -81,7 +81,7 @@
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$configureResolvedUI$1;)V
 
-    invoke-virtual {v0, v1, v3, v2}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v0, v1, v3, v2}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1.smali
index e1f9368537..fc7e261ffd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2.smali
index 4202ea80d0..3de6caa4dd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;
 
+    const/4 v0, 0x0
+
     invoke-static {p1, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->access$configureInvalidUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3.smali
index 072effdc5b..b5f285919f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$onConfigure$3;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 0b59b90d6f..22ac028e95 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -52,7 +52,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;
 
@@ -60,257 +60,173 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "headerText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderText()Lcom/discord/app/AppTextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "headerText"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getHeaderText()Lcom/discord/app/AppTextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "nameText"
 
-    const/4 v3, 0x0
+    const-string v3, "getNameText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "nameText"
-
-    const-string v5, "getNameText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "image"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "image"
-
-    const-string v5, "getImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "imageText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImageText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "imageText"
-
-    const-string v5, "getImageText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "onlineMemberText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOnlineMemberText()Lcom/discord/app/AppTextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "onlineMemberText"
-
-    const-string v5, "getOnlineMemberText()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "totalMemberText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTotalMemberText()Lcom/discord/app/AppTextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "totalMemberText"
-
-    const-string v5, "getTotalMemberText()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "joinButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getJoinButton()Landroid/widget/Button;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "joinButton"
-
-    const-string v5, "getJoinButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "joinedButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getJoinedButton()Landroid/widget/Button;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "joinedButton"
-
-    const-string v5, "getJoinedButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x7
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "mentionButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMentionButton()Landroid/widget/Button;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "mentionButton"
-
-    const-string v5, "getMentionButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v3, 0x8
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "loadingButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoadingButton()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "loadingButton"
-
-    const-string v5, "getLoadingButton()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v3, 0x9
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "memberContainer"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMemberContainer()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "memberContainer"
-
-    const-string v5, "getMemberContainer()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v3, 0xa
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "channelNameTv"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelNameTv()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "channelNameTv"
-
-    const-string v5, "getChannelNameTv()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v3, 0xb
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "onlineDot"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOnlineDot()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "onlineDot"
-
-    const-string v5, "getOnlineDot()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/16 v3, 0xc
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "totalDot"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTotalDot()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "totalDot"
+    const/16 v2, 0xd
 
-    const-string v4, "getTotalDot()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v0, 0xd
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -320,107 +236,61 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d019a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0557
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a055f
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0558
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0559
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->imageText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0561
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0563
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->totalMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a055a
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a055b
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinedButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a055e
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->mentionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a055c
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->loadingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a055d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->memberContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0556
+    const p1, 0x7f0a0565
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->channelNameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a055e
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a055f
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->imageText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0567
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0569
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->totalMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a0560
 
@@ -428,7 +298,23 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineDot$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0561
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinedButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0564
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->mentionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a0562
 
@@ -436,18 +322,41 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->loadingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0563
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->memberContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a055c
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->channelNameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0566
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineDot$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0568
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->totalDot$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$configureInvalidUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite$Model$Invalid;)V
@@ -478,7 +387,7 @@
     :cond_0
     const-string p0, "item"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -552,7 +461,7 @@
 
     move-result-object v0
 
-    const v2, 0x7f120c94
+    const v2, 0x7f120cba
 
     const/4 v4, 0x1
 
@@ -611,9 +520,9 @@
 
     const-string v2, "context.resources"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f10009c
+    const v2, 0x7f10009e
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelInvite;->getApproximateMemberCount()I
 
@@ -705,7 +614,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -751,7 +660,7 @@
     move-object v3, v1
 
     :goto_1
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -761,7 +670,7 @@
 
     if-eqz v2, :cond_2
 
-    const v4, 0x7f120d0c
+    const v4, 0x7f120d32
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -770,7 +679,7 @@
     goto :goto_2
 
     :cond_2
-    const v4, 0x7f120d07
+    const v4, 0x7f120d2d
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -783,7 +692,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f120cfc
+    const v4, 0x7f120d22
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V
 
@@ -811,7 +720,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f0804e0
+    const v5, 0x7f0804e3
 
     invoke-virtual {v3, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
 
@@ -839,7 +748,7 @@
     :goto_3
     if-eqz v3, :cond_4
 
-    const v3, 0x7f120c8a
+    const v3, 0x7f120cb0
 
     const/4 v6, 0x1
 
@@ -878,7 +787,7 @@
     :goto_4
     if-nez v3, :cond_6
 
-    const v3, 0x7f120c89
+    const v3, 0x7f120caf
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -889,7 +798,7 @@
     :cond_6
     if-eqz v2, :cond_7
 
-    const v3, 0x7f120cfd
+    const v3, 0x7f120d23
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -937,7 +846,7 @@
 
     if-eqz v2, :cond_8
 
-    const v3, 0x7f1204fb
+    const v3, 0x7f1204fd
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -946,7 +855,7 @@
     goto :goto_6
 
     :cond_8
-    const v3, 0x7f120ec0
+    const v3, 0x7f120ee6
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -999,7 +908,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -1009,7 +918,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120c9d
+    const v2, 0x7f120cc3
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -1149,7 +1058,7 @@
 
     const-string v8, "itemView"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -1223,7 +1132,7 @@
 
     if-eqz v2, :cond_4
 
-    const v2, 0x7f120d0b
+    const v2, 0x7f120d31
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1234,7 +1143,7 @@
     :cond_4
     if-eqz v2, :cond_5
 
-    const v2, 0x7f120d0a
+    const v2, 0x7f120d30
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1247,7 +1156,7 @@
 
     if-nez v2, :cond_6
 
-    const v2, 0x7f120d06
+    const v2, 0x7f120d2c
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1264,7 +1173,7 @@
 
     if-eqz v2, :cond_8
 
-    const v2, 0x7f120ca1
+    const v2, 0x7f120cc7
 
     new-array v3, v8, [Ljava/lang/Object;
 
@@ -1293,16 +1202,16 @@
     goto :goto_5
 
     :cond_8
-    const v2, 0x7f120d05
+    const v2, 0x7f120d2b
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
     :goto_5
-    const-string v3, "when {\n      // Order is\u2026tton_title_invited)\n    }"
+    const-string/jumbo v3, "when {\n      // Order is\u2026tton_title_invited)\n    }"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->getHeaderText()Lcom/discord/app/AppTextView;
 
@@ -1324,7 +1233,7 @@
 
     if-eqz v6, :cond_9
 
-    invoke-static {v7, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v6, v7, v9, v3, v10}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;ZILjava/lang/Object;)Ljava/lang/String;
 
@@ -1476,7 +1385,7 @@
     :goto_8
     const-string v12, "ICON_UNSET"
 
-    invoke-static {v3, v12}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v12}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -1524,14 +1433,14 @@
 
     if-ne v3, v8, :cond_11
 
-    invoke-static {v7, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v6, v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->configureForVoiceChannel(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;)V
 
     goto :goto_c
 
     :cond_11
-    invoke-static {v7, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v4, v7, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->configureForTextChannel(ZLandroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V
 
@@ -2012,7 +1921,7 @@
 
     const-string v1, "it"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -2033,7 +1942,7 @@
 
     const-string v1, "invite.channel"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isVoiceChannel()Z
 
@@ -2055,7 +1964,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -2089,9 +1998,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -2140,16 +2049,11 @@
     :cond_0
     const-string p1, "item"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali
index b1d1403bac..ff3a1b98e1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1.smali
@@ -29,7 +29,15 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelPresence;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;",
+        ">;"
     }
 .end annotation
 
@@ -70,9 +78,9 @@
 
     sget-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion;
 
-    const-string v1, "userMap"
+    const-string/jumbo v1, "userMap"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion$get$1;->$item:Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
 
@@ -98,7 +106,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {p3, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p3, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p3
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali
index ac2a8ee70a..e206f4c31d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali
@@ -148,7 +148,7 @@
 
     move-result-wide v9
 
-    invoke-static {v2, v9, v10}, Lj0/q/f;->until(IJ)Lj0/q/e;
+    invoke-static {v2, v9, v10}, Lk0/r/f;->until(IJ)Lk0/r/e;
 
     move-result-object v2
 
@@ -165,9 +165,9 @@
 
     move-object v9, v2
 
-    check-cast v9, Lj0/i/r;
+    check-cast v9, Lk0/j/r;
 
-    invoke-virtual {v9}, Lj0/i/r;->nextLong()J
+    invoke-virtual {v9}, Lk0/j/r;->nextLong()J
 
     move-result-wide v9
 
@@ -222,7 +222,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -276,7 +278,7 @@
 
     const-string v0, "Observable\n             \u2026user?.id)\n              }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -288,16 +290,7 @@
 
     const-string v0, "Observable\n             \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali
index 3d6cbe6af8..0de80018e2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model.smali
@@ -71,11 +71,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -88,20 +90,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->isMe:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;ZILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
@@ -199,31 +187,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "users"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;-><init>(Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -241,7 +217,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -251,7 +227,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->users:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -261,7 +237,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->item:Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali
index d8bb2a8512..d2308b1d43 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$2.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali
index a9eeb7e73a..5edefd631e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$configureUI$3.smali
@@ -47,7 +47,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1.smali
index 2347949bfb..469ed018a4 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2.smali
index f79210a7b0..26845b8318 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali
index 88a1f6dcdb..f60523810d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$userAdapter$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemListenTogether.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
index a7d90e27dc..ac55abd493 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
@@ -46,7 +46,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;
 
@@ -54,131 +54,89 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "inviteText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "inviteText"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getInviteText()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "trackText"
 
-    const/4 v3, 0x0
+    const-string v3, "getTrackText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "trackText"
-
-    const-string v5, "getTrackText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "artistText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getArtistText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "artistText"
-
-    const-string v5, "getArtistText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "albumImage"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAlbumImage()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "albumImage"
-
-    const-string v5, "getAlbumImage()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "endedText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEndedText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "endedText"
-
-    const-string v5, "getEndedText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "recyclerView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "recyclerView"
-
-    const-string v5, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "container"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "container"
+    const/4 v2, 0x6
 
-    const-string v4, "getContainer()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x6
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -196,13 +154,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d019b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0567
+    const p1, 0x7f0a056d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -210,7 +170,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->inviteText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056b
+    const p1, 0x7f0a0571
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -218,7 +178,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->trackText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0565
+    const p1, 0x7f0a056b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -226,7 +186,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->artistText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0564
+    const p1, 0x7f0a056a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -234,7 +194,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->albumImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056a
+    const p1, 0x7f0a0570
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -242,7 +202,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->endedText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0569
+    const p1, 0x7f0a056f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -250,7 +210,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0566
+    const p1, 0x7f0a056c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,15 +229,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;->userAdapter$delegate:Lkotlin/Lazy;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;)V
@@ -345,7 +296,7 @@
 
     const-string v6, "inviteText.context"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->getItem()Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
 
@@ -359,7 +310,7 @@
 
     aput-object v5, v4, v6
 
-    const v5, 0x7f120d1b
+    const v5, 0x7f120d41
 
     invoke-virtual {v2, v5, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -530,7 +481,7 @@
 
     move-result-object v5
 
-    const v7, 0x7f1216d2
+    const v7, 0x7f1216fc
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -584,7 +535,7 @@
 
     const-string v8, "it"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x0
 
@@ -669,13 +620,13 @@
 
     const-string v0, "listenTogetherEntry.activity.partyId"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Spotify"
 
     const/4 v1, 0x1
 
-    invoke-static {p2, v0, v1}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {p2, v0, v1}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result p2
 
@@ -684,7 +635,7 @@
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f12071d
+    const p2, 0x7f12071f
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -692,7 +643,7 @@
 
     const-string p1, "context.getString(R.stri\u2026.form_label_desktop_only)"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object v0
@@ -955,7 +906,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 9
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -973,20 +926,20 @@
 
     const-class v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;
 
-    const/4 v2, 0x0
-
     new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1;
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;)V
 
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
     new-instance v6, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2;
 
     invoke-direct {v6, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$onConfigure$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether;)V
 
+    const/4 v2, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
     const/16 v7, 0x1a
 
     const/4 v8, 0x0
@@ -994,15 +947,6 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
index fb77ad77f7..dc0c643932 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
@@ -19,7 +19,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0249
+    const v0, 0x7f0a024c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -29,7 +29,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a098f
+    const v0, 0x7f0a0993
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 e257175398..38b65740db 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
@@ -103,7 +103,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0222
+    const v0, 0x7f0a0225
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -115,7 +115,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0223
+    const v0, 0x7f0a0226
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -127,7 +127,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0225
+    const v0, 0x7f0a0228
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -139,7 +139,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0226
+    const v0, 0x7f0a0229
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -151,7 +151,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0227
+    const v0, 0x7f0a022a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -163,7 +163,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0216
+    const v0, 0x7f0a0219
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -175,7 +175,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a020d
+    const v0, 0x7f0a0210
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -396,7 +396,7 @@
     :goto_2
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemTag:Landroid/widget/TextView;
 
-    const v1, 0x7f12155f
+    const v1, 0x7f121589
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -407,7 +407,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f080428
+    const p1, 0x7f08042b
 
     goto :goto_4
 
@@ -885,12 +885,12 @@
     :cond_6
     if-eqz v3, :cond_7
 
-    const p1, 0x7f120cf4
+    const p1, 0x7f120d1a
 
     goto :goto_1
 
     :cond_7
-    const p1, 0x7f12143f
+    const p1, 0x7f121469
 
     :goto_1
     iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->itemAlertText:Landroid/widget/TextView;
@@ -984,7 +984,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f1214b8
+    const v4, 0x7f1214e2
 
     invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1100,19 +1100,27 @@
 
     invoke-interface {v13, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    new-instance v3, Lcom/discord/simpleast/core/node/StyleNode;
+    const-string v3, "(edited)"
 
-    invoke-direct {v3, v2}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
+    const-string v4, "content"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "styles"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Lcom/discord/simpleast/core/node/StyleNode;
+
+    invoke-direct {v4, v2}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
     new-instance v2, Lf/a/j/a/a/a;
 
-    const-string v4, "(edited)"
+    invoke-direct {v2, v3}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {v2, v4}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
+    invoke-virtual {v4, v2}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
 
-    invoke-virtual {v3, v2}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
-
-    invoke-interface {v13, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v13, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     :cond_3
     invoke-virtual {v12}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isLinkifyConflicting()Z
@@ -1189,13 +1197,13 @@
 
     invoke-direct {v3, v0}, Lf/a/o/b/b/w;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;)V
 
-    const v2, 0x7f04052c
+    const v2, 0x7f04051e
 
     invoke-static {v15, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v18
 
-    const v2, 0x7f04052d
+    const v2, 0x7f04051f
 
     invoke-static {v15, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1384,7 +1392,7 @@
     :goto_8
     if-eqz v11, :cond_b
 
-    const v2, 0x7f040529
+    const v2, 0x7f04051b
 
     move-object/from16 v3, v24
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
index 97391c84c7..3fdab5d46e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
@@ -23,7 +23,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a024e
+    const v0, 0x7f0a0251
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -33,7 +33,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a024c
+    const v0, 0x7f0a024f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -43,7 +43,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a024b
+    const v0, 0x7f0a024e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a024d
+    const v0, 0x7f0a0250
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 81ec934609..4eef7d8a49 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
@@ -19,7 +19,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;
 
@@ -27,59 +27,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "dividerLeft"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDividerLeft()Landroid/view/View;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "dividerLeft"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getDividerLeft()Landroid/view/View;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "dividerRight"
 
-    const/4 v3, 0x0
+    const-string v3, "getDividerRight()Landroid/view/View;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "dividerRight"
-
-    const-string v5, "getDividerRight()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "text"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getText()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "text"
+    const/4 v2, 0x2
 
-    const-string v4, "getText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -89,13 +71,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01aa
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0233
+    const p1, 0x7f0a0236
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -103,7 +87,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->dividerLeft$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0234
+    const p1, 0x7f0a0237
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,7 +95,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->dividerRight$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0235
+    const p1, 0x7f0a0238
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -181,7 +165,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120f60
+    const v1, 0x7f120f8a
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -189,7 +173,7 @@
 
     const-string v1, "text.context.getString(R\u2026ing.new_messages_divider)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages;->localeManager:Lcom/discord/utilities/locale/LocaleManager;
 
@@ -211,20 +195,11 @@
 
     const-string v1, "(this as java.lang.String).toUpperCase(locale)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getDividerLeft()Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali
index 4a28d1db64..13918a5663 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali
@@ -17,7 +17,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart;
 
@@ -25,59 +25,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "channelIconView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelIconView()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "channelIconView"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getChannelIconView()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "headerView"
 
-    const/4 v3, 0x0
+    const-string v3, "getHeaderView()Lcom/discord/app/AppTextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "headerView"
-
-    const-string v5, "getHeaderView()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "descriptionView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDescriptionView()Lcom/discord/app/AppTextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "descriptionView"
+    const/4 v2, 0x2
 
-    const-string v4, "getDescriptionView()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -87,13 +69,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01a0
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0219
+    const p1, 0x7f0a021c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +85,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart;->channelIconView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0218
+    const p1, 0x7f0a021b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +93,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart;->headerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a021a
+    const p1, 0x7f0a021d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -118,15 +102,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart;->descriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getChannelIconView()Landroid/widget/ImageView;
@@ -219,12 +194,14 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 18
 
-    if-eqz p2, :cond_3
+    move-object/from16 v0, p2
+
+    const-string v1, "data"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
-    move-object/from16 v0, p2
-
     check-cast v0, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;
 
     invoke-virtual {v0}, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;->component2()Ljava/lang/String;
@@ -243,7 +220,7 @@
 
     move-result v0
 
-    invoke-static {v1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
@@ -264,7 +241,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f121665
+    const v3, 0x7f12168f
 
     invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -272,7 +249,7 @@
 
     const-string v3, "headerView.context.getString(R.string.unnamed)"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart;->getHeaderView()Lcom/discord/app/AppTextView;
@@ -327,7 +304,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12155e
+    const v1, 0x7f121588
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -356,7 +333,7 @@
 
     const-string v2, "descriptionView.context.\u2026tStartResId(channelType))"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart;->getDescriptionView()Lcom/discord/app/AppTextView;
 
@@ -380,17 +357,6 @@
 
     :goto_2
     return-void
-
-    :cond_3
-    move-object/from16 v3, p0
-
-    const-string v0, "data"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
index c1e055c0a6..5b14a6702f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
@@ -23,7 +23,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a024f
+    const v0, 0x7f0a0252
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali
index 5bcef6f486..7ed3631725 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSearchResultCount.smali
@@ -17,7 +17,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0748
+    const v0, 0x7f0a074e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 6d9cb7202f..ef6b7da79a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
@@ -17,7 +17,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemStart;
 
@@ -25,59 +25,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "header"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "header"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getHeader()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "subHeader"
 
-    const/4 v3, 0x0
+    const-string v3, "getSubHeader()Lcom/discord/app/AppTextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "subHeader"
-
-    const-string v5, "getSubHeader()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "editChannel"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEditChannel()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "editChannel"
+    const/4 v2, 0x2
 
-    const-string v4, "getEditChannel()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemStart;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -87,13 +69,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01a7
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0217
+    const p1, 0x7f0a021a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +85,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemStart;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a021e
+    const p1, 0x7f0a0221
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +93,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemStart;->subHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0214
+    const p1, 0x7f0a0217
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -118,15 +102,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemStart;->editChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemStart;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
@@ -204,7 +179,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 8
 
-    if-eqz p2, :cond_2
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -258,7 +235,7 @@
 
     const-string v6, "java.lang.String.format(this, *args)"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -337,15 +314,6 @@
     invoke-virtual {p1, v7}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali
index 364c65a290..00b3cc4df5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$1.smali
@@ -98,11 +98,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.chat.list.entries.MessageEntry"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali
index 37aa3f801b..b05ebeec0b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$2.smali
@@ -85,18 +85,18 @@
 
     const-string v0, "itemText.text"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, p2, p3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;->onMessageLongClicked(Lcom/discord/models/domain/ModelMessage;Ljava/lang/CharSequence;)V
 
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.chat.list.entries.MessageEntry"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$3.smali
index 993c085bfb..70b03820cd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$3.smali
@@ -119,11 +119,11 @@
     return-void
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.chat.list.entries.MessageEntry"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
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 4cf84ab56e..ce67d51f54 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemSystemMessage.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -59,7 +59,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,7 +81,9 @@
 .method public final invoke(Landroid/content/Context;)Ljava/lang/String;
     .locals 8
 
-    if-eqz p1, :cond_2
+    const-string v0, "$this$getString"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage;
 
@@ -91,7 +93,7 @@
 
     const/4 v1, 0x3
 
-    const v2, 0x7f12157f
+    const v2, 0x7f1215a9
 
     const/4 v3, 0x2
 
@@ -107,7 +109,7 @@
     goto/16 :goto_1
 
     :pswitch_1
-    const v0, 0x7f12156e
+    const v0, 0x7f121598
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -116,7 +118,7 @@
     goto/16 :goto_1
 
     :pswitch_2
-    const v0, 0x7f12156f
+    const v0, 0x7f121599
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -125,7 +127,7 @@
     goto/16 :goto_1
 
     :pswitch_3
-    const v0, 0x7f121570
+    const v0, 0x7f12159a
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -134,7 +136,7 @@
     goto/16 :goto_1
 
     :pswitch_4
-    const v0, 0x7f12156d
+    const v0, 0x7f121597
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -143,7 +145,7 @@
     goto/16 :goto_1
 
     :pswitch_5
-    const v0, 0x7f121567
+    const v0, 0x7f121591
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -176,7 +178,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f121217
+    const v1, 0x7f121242
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -201,7 +203,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f121216
+    const v1, 0x7f121241
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -226,7 +228,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f121215
+    const v1, 0x7f121240
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -241,7 +243,7 @@
     goto/16 :goto_1
 
     :pswitch_9
-    const v0, 0x7f12157e
+    const v0, 0x7f1215a8
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -281,7 +283,7 @@
     goto/16 :goto_1
 
     :pswitch_b
-    const v0, 0x7f12158b
+    const v0, 0x7f1215b5    # 1.9418E38f
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -296,7 +298,7 @@
     goto/16 :goto_1
 
     :pswitch_c
-    const v0, 0x7f121569
+    const v0, 0x7f121593
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -311,7 +313,7 @@
     goto :goto_1
 
     :pswitch_d
-    const v0, 0x7f12156a
+    const v0, 0x7f121594
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -344,7 +346,7 @@
 
     const-string v2, "author"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -363,7 +365,7 @@
 
     if-nez v0, :cond_1
 
-    const v0, 0x7f121591
+    const v0, 0x7f1215bb
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -379,7 +381,7 @@
 
     :cond_1
     :goto_0
-    const v0, 0x7f121590
+    const v0, 0x7f1215ba
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -398,7 +400,7 @@
     goto :goto_1
 
     :pswitch_f
-    const v0, 0x7f12158f
+    const v0, 0x7f1215b9
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -415,20 +417,13 @@
     move-result-object p1
 
     :goto_1
-    const-string v0, "when (type) {\n      Mode\u2026g)\n      else -> \"\"\n    }"
+    const-string/jumbo v0, "when (type) {\n      Mode\u2026g)\n      else -> \"\"\n    }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
-    :cond_2
-    const-string p1, "$this$getString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    nop
 
     :pswitch_data_0
     .packed-switch 0x1
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali
index cf9096d075..240abb4eb5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemSystemMessage.kt"
 
 # interfaces
@@ -18,11 +18,11 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
-        "Landroid/text/style/ForegroundColorSpan;",
+        "Landroid/text/style/CharacterStyle;",
         ">;>;"
     }
 .end annotation
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,7 +63,7 @@
         value = {
             "()",
             "Ljava/util/List<",
-            "Landroid/text/style/ForegroundColorSpan;",
+            "Landroid/text/style/CharacterStyle;",
             ">;"
         }
     .end annotation
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 0dcb888d56..6961765fae 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
@@ -17,7 +17,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;
 
@@ -25,59 +25,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "statusIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusIcon()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "statusIcon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getStatusIcon()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemText"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "itemText"
-
-    const-string v5, "getItemText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemTimestamp"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemTimestamp()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemTimestamp"
+    const/4 v2, 0x2
 
-    const-string v4, "getItemTimestamp()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -87,13 +69,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01a8
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const v0, 0x7f0a021f
+    const v0, 0x7f0a0222
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +85,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->statusIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0220
+    const v0, 0x7f0a0223
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +93,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->itemText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0221
+    const v0, 0x7f0a0224
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -144,15 +128,6 @@
     invoke-virtual {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getItemText$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;)Landroid/widget/TextView;
@@ -172,48 +147,48 @@
 
     move-result p1
 
-    const v0, 0x7f08043f
+    const v0, 0x7f080442
 
-    const v1, 0x7f0802f1
+    const v1, 0x7f0802f2
 
-    const v2, 0x7f0802f2
+    const v2, 0x7f0802f3
 
-    const v3, 0x7f08041d
+    const v3, 0x7f080420
 
     packed-switch p1, :pswitch_data_0
 
     :pswitch_0
-    const v0, 0x7f0802f1
+    const v0, 0x7f0802f2
 
     goto :goto_0
 
     :pswitch_1
-    const v0, 0x7f080275
+    const v0, 0x7f080276
 
     goto :goto_0
 
     :pswitch_2
-    const v0, 0x7f080440
+    const v0, 0x7f080443
 
     goto :goto_0
 
     :pswitch_3
-    const v0, 0x7f08041d
+    const v0, 0x7f080420
 
     goto :goto_0
 
     :pswitch_4
-    const v0, 0x7f08025f
+    const v0, 0x7f080260
 
     goto :goto_0
 
     :pswitch_5
-    const v0, 0x7f0802f3
+    const v0, 0x7f0802f4
 
     goto :goto_0
 
     :pswitch_6
-    const v0, 0x7f0802f2
+    const v0, 0x7f0802f3
 
     :goto_0
     :pswitch_7
@@ -327,9 +302,9 @@
 
     const-string v1, "mentions"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -402,9 +377,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -416,48 +391,50 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component3()Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component5()Ljava/util/Map;
 
-    move-result-object v5
+    move-result-object v4
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p2
 
-    const-string v2, "message.author"
+    const-string v1, "message.author"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p2
 
-    invoke-interface {v5, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
     check-cast p2, Ljava/lang/String;
 
+    const/4 v6, 0x0
+
     if-eqz p2, :cond_0
 
-    const-string v2, "**"
+    const-string v1, "**"
 
-    invoke-static {v2, p2, v2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1, p2, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p2
 
-    move-object v4, p2
+    move-object v3, p2
 
     goto :goto_0
 
     :cond_0
-    move-object v4, v0
+    move-object v3, v6
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView;
@@ -468,97 +445,105 @@
 
     move-result-object p2
 
-    const v2, 0x7f040142
+    const v1, 0x7f040142
 
-    invoke-static {p2, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result p2
 
-    invoke-static {v1, p2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getColor(Lcom/discord/models/domain/ModelGuildMember$Computed;I)I
+    invoke-static {v0, p2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getColor(Lcom/discord/models/domain/ModelGuildMember$Computed;I)I
 
     move-result p2
 
-    iget-object v1, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    iget-object v0, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    check-cast v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
+    check-cast v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
+    invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v6, v1
+    move-object v5, v0
 
     goto :goto_1
 
     :cond_1
-    move-object v6, v0
+    move-object v5, v6
 
     :goto_1
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v1, "itemText.context"
+    const-string v0, "itemText.context"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v1, p0
+    move-object v0, p0
 
-    move-object v2, p1
+    move-object v1, p1
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v8
 
-    new-instance v1, Lcom/discord/simpleast/core/parser/Parser;
+    new-instance v0, Lcom/discord/simpleast/core/parser/Parser;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sget-object v2, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
-
-    sget-object v2, Lf/a/j/a/b/a;->a:Ljava/util/regex/Pattern;
-
-    const-string v3, "SimpleMarkdownRules.PATTERN_BOLD"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;
-
-    invoke-direct {v3, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;-><init>(I)V
-
-    invoke-static {v2, v3}, Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
-
-    move-result-object p2
-
-    invoke-virtual {v1, p2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
-
-    move-result-object p2
+    invoke-direct {v0, v1, v2, v6}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {v1}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
+    sget-object v1, Lf/a/j/a/b/a;->a:Ljava/util/regex/Pattern;
 
-    move-result-object v1
+    const-string v2, "SimpleMarkdownRules.PATTERN_BOLD"
 
-    invoke-virtual {p2, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;
+
+    invoke-direct {v2, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;-><init>(I)V
+
+    const-string p2, "pattern"
+
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "styleFactory"
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lf/a/j/a/b/e;
+
+    invoke-direct {p2, v2, v1, v1}, Lf/a/j/a/b/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
+
+    invoke-virtual {v0, p2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+
+    move-result-object p2
+
+    sget-object v0, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
+
+    invoke-virtual {v0}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
+
+    move-result-object v0
+
+    invoke-virtual {p2, v0}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
     move-result-object v7
 
@@ -576,39 +561,39 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemTimestamp()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemTimestamp()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    const-string v3, "itemTimestamp.context"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J
-
-    move-result-wide v3
-
-    invoke-static {v2, v3, v4}, Lcom/discord/utilities/time/TimeUtils;->toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView;
+    invoke-virtual {v1}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
-    invoke-static {p2, v0}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    const-string v2, "itemTimestamp.context"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J
+
+    move-result-wide v2
+
+    invoke-static {v1, v2, v3}, Lcom/discord/utilities/time/TimeUtils;->toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    invoke-static {p2, v6}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
     move-result-object p2
 
-    invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getStatusIcon()Landroid/widget/ImageView;
 
@@ -621,13 +606,6 @@
     invoke-virtual {p2, p1}, Landroid/widget/ImageView;->setImageResource(I)V
 
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
index 624e7704d9..06a68cec54 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
@@ -17,7 +17,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;
 
@@ -25,59 +25,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "dividerLeft"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDividerLeft()Landroid/view/View;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "dividerLeft"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getDividerLeft()Landroid/view/View;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "dividerRight"
 
-    const/4 v3, 0x0
+    const-string v3, "getDividerRight()Landroid/view/View;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "dividerRight"
-
-    const-string v5, "getDividerRight()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "text"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getText()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "text"
+    const/4 v2, 0x2
 
-    const-string v4, "getText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -87,13 +69,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01aa
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0233
+    const p1, 0x7f0a0236
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +85,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->dividerLeft$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0234
+    const p1, 0x7f0a0237
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +93,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp;->dividerRight$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0235
+    const p1, 0x7f0a0238
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -162,15 +146,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setTextColor(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getDividerLeft()Landroid/view/View;
@@ -238,7 +213,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 7
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -264,7 +241,7 @@
 
     const-string p2, "text.context"
 
-    invoke-static {v3, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -279,15 +256,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali
index d7f6169b09..35d33ad32f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few.smali
@@ -38,22 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uploads"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;->uploads:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;
@@ -103,22 +98,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "uploads"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "uploads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +124,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;->uploads:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali
index e3baf80877..4b8c59c692 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing.smali
@@ -127,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->displayName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -137,7 +137,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->mimeType:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali
index c0c1c8d3f8..c928e07e6b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single.smali
@@ -28,12 +28,16 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;JI)V
     .locals 1
 
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->name:Ljava/lang/String;
@@ -45,20 +49,6 @@
     iput p5, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->progress:I
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;Ljava/lang/String;Ljava/lang/String;JIILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;
@@ -152,11 +142,13 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;JI)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;
 
@@ -173,20 +165,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;-><init>(Ljava/lang/String;Ljava/lang/String;JI)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -204,7 +182,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -214,7 +192,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->mimeType:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali
index 0cc7bba8fe..a971408a92 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMessageUploads$MessageUploadState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,9 +83,9 @@
 
     sget-object p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -110,9 +112,9 @@
 
     invoke-direct {v0, v1, v2, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object v0, p1
 
@@ -139,7 +141,7 @@
 
     sget-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider;
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali
index c4da616676..0835d6d43e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getFewUploadsObservable$2.smali
@@ -23,7 +23,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/FuncN<",
-        "TR;>;"
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Few;",
+        ">;"
     }
 .end annotation
 
@@ -60,7 +61,7 @@
 
     const-string v0, "singles"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -88,11 +89,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.chat.list.WidgetChatListAdapterItemUploadProgress.Model.Single"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali
index 4f2e50c610..954ea0c0b2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.smali
@@ -23,7 +23,8 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/FuncN<",
-        "TR;>;"
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -55,12 +56,12 @@
 
 
 # virtual methods
-.method public final call([Ljava/lang/Object;)J
+.method public final call([Ljava/lang/Object;)Ljava/lang/Long;
     .locals 5
 
     const-string v0, "bytesWrittenPerUpload"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -96,26 +97,16 @@
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Long"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_1
-    invoke-static {v0}, Lj0/i/l;->sumOfLong(Ljava/lang/Iterable;)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public bridge synthetic call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3;->call([Ljava/lang/Object;)J
+    invoke-static {v0}, Lk0/j/l;->sumOfLong(Ljava/lang/Iterable;)J
 
     move-result-wide v0
 
@@ -125,3 +116,13 @@
 
     return-object p1
 .end method
+
+.method public bridge synthetic call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3;->call([Ljava/lang/Object;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali
index aa572667c9..6037190510 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -47,14 +49,14 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Long;)I
+.method public final call(Ljava/lang/Long;)Ljava/lang/Integer;
     .locals 5
 
     sget-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider;
 
     const-string v1, "totalBytesWritten"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -68,7 +70,11 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -76,11 +82,7 @@
 
     check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4;->call(Ljava/lang/Long;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4;->call(Ljava/lang/Long;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali
index 22ddfd23ec..462c30895b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;",
+        ">;"
     }
 .end annotation
 
@@ -68,7 +70,7 @@
 
     const-string v4, "overallProgressPercent"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali
index 5695619ce4..97ed01113c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -47,14 +49,14 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Long;)I
+.method public final call(Ljava/lang/Long;)Ljava/lang/Integer;
     .locals 5
 
     sget-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider;
 
     const-string v1, "bytesWritten"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -70,7 +72,11 @@
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -78,11 +84,7 @@
 
     check-cast p1, Ljava/lang/Long;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1;->call(Ljava/lang/Long;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1;->call(Ljava/lang/Long;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali
index 6aa8e71583..4418cb74ad 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;",
+        ">;"
     }
 .end annotation
 
@@ -72,7 +74,7 @@
 
     const-string v0, "progressPercent"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider.smali
index e7aafd6dc5..7aea88c0c1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider.smali
@@ -141,7 +141,7 @@
 
     const-string p2, "Observable\n          .co\u2026{ it as Model.Single }) }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -229,13 +229,13 @@
 
     invoke-direct {p2, p1, v5, v6, p3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;-><init>(IJI)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p2, "Observable\n            .\u2026          )\n            )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -292,7 +292,7 @@
 
     invoke-direct {p3, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4;-><init>(Lkotlin/jvm/internal/Ref$LongRef;)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -304,13 +304,13 @@
 
     invoke-direct {p3, p1, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5;-><init>(Ljava/util/List;Lkotlin/jvm/internal/Ref$LongRef;)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable\n            .\u2026essPercent)\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_2
     return-object p1
@@ -405,13 +405,13 @@
 
     invoke-direct/range {v5 .. v10}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;-><init>(Ljava/lang/String;Ljava/lang/String;JI)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p2, "Observable.just(\n       \u2026E\n            )\n        )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -430,7 +430,7 @@
 
     invoke-direct {p3, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1;-><init>(Lcom/discord/utilities/rest/SendUtils$FileUpload;)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -442,13 +442,13 @@
 
     invoke-direct {p3, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2;-><init>(Lcom/discord/utilities/rest/SendUtils$FileUpload;)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string p2, "upload\n            .byte\u2026          )\n            }"
+    const-string/jumbo p2, "upload\n            .byte\u2026          )\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
@@ -470,7 +470,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "nonce"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -486,22 +488,13 @@
 
     invoke-direct {v0, p2, p3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1;-><init>(J)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n          .g\u2026            }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "nonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali
index 7a961a1dc8..d24f9b9eb2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2.smali
index 470ad2aa55..c1a7019347 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1.smali
index 7482fe790c..bc8d7f1d7c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListAdapterItemUploadProgress.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
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 3e84777a5b..06eda1a862 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
@@ -51,7 +51,9 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01ab
 
@@ -59,7 +61,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09b6
+    const v0, 0x7f0a09ba
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +69,7 @@
 
     const-string v0, "itemView.findViewById(R.id.upload_progress_1)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/UploadProgressView;
 
@@ -75,7 +77,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09b7
+    const v0, 0x7f0a09bb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -83,7 +85,7 @@
 
     const-string v0, "itemView.findViewById(R.id.upload_progress_2)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/UploadProgressView;
 
@@ -91,7 +93,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09b8
+    const v0, 0x7f0a09bc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -99,7 +101,7 @@
 
     const-string v0, "itemView.findViewById(R.id.upload_progress_3)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/UploadProgressView;
 
@@ -107,7 +109,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0727
+    const v0, 0x7f0a072d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -115,13 +117,13 @@
 
     const-string v0, "itemView.findViewById(R.id.progress_cancel_top)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->cancelButtonTop:Landroid/view/View;
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0726
+    const v0, 0x7f0a072c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -129,20 +131,11 @@
 
     const-string v0, "itemView.findViewById(R.\u2026progress_cancel_centered)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;->cancelButtonCentered:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model;)V
@@ -430,7 +423,7 @@
 
     sget-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$None;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -448,7 +441,7 @@
 
     if-eqz v0, :cond_0
 
-    const p2, 0x7f1216a1
+    const p2, 0x7f1216cb
 
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -460,7 +453,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, v3, v5, v2, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -475,7 +468,7 @@
 
     const/4 v7, 0x1
 
-    const v8, 0x7f1000fc
+    const v8, 0x7f1000fe
 
     const-string v9, "resources"
 
@@ -498,13 +491,13 @@
 
     move-result-object v0
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object v9
 
-    invoke-static {v9, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->getNumFiles()I
 
@@ -539,7 +532,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Preprocessing;->getMimeType()Ljava/lang/String;
 
@@ -558,7 +551,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, v3, v5, v2, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -607,7 +600,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Single;->getMimeType()Ljava/lang/String;
 
@@ -630,13 +623,13 @@
 
     move-result-object v0
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object v1
 
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$Model$Many;
 
@@ -688,7 +681,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, v3, v5, v2, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -714,7 +707,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 10
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListItem;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
@@ -740,7 +735,7 @@
 
     const-string v0, "ModelProvider.get(data.m\u2026  .onBackpressureLatest()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -748,20 +743,20 @@
 
     const-class v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;
 
-    const/4 v3, 0x0
-
     new-instance v7, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1;
 
     invoke-direct {v7, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;)V
 
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
     new-instance v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2;
 
     invoke-direct {v4, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$onConfigure$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress;)V
 
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
     const/16 v8, 0x1a
 
     const/4 v9, 0x0
@@ -789,15 +784,6 @@
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem$1.smali
index 132e93b881..854026db99 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem$1.smali
@@ -48,7 +48,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
index caafcd3600..de61331aa5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListItem.smali
@@ -24,7 +24,9 @@
 .method public constructor <init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 2
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -32,7 +34,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getBackground()Landroid/graphics/drawable/Drawable;
 
@@ -44,9 +46,9 @@
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f04051b
+    const v0, 0x7f04050d
 
     invoke-static {v1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -65,15 +67,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -81,7 +74,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
     .locals 1
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -89,7 +84,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2}, Lcom/discord/widgets/chat/list/entries/ChatListEntry;->isInExpandedBlockedMessageChunk()Z
 
@@ -108,15 +103,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setBackground(Landroid/graphics/drawable/Drawable;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiItem$EmojiData.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiItem$EmojiData.smali
index 7b3733fecb..19ac31be81 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiItem$EmojiData.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiItem$EmojiData.smali
@@ -22,24 +22,19 @@
 .method public constructor <init>(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "emoji"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/chat/list/actions/EmojiItem;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/chat/list/actions/EmojiItem;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;->emoji:Lcom/discord/models/domain/emoji/Emoji;
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;Lcom/discord/models/domain/emoji/Emoji;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;
@@ -72,22 +67,15 @@
 .method public final copy(Lcom/discord/models/domain/emoji/Emoji;)Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;-><init>(Lcom/discord/models/domain/emoji/Emoji;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -105,7 +93,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;->emoji:Lcom/discord/models/domain/emoji/Emoji;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiViewHolder.smali
index 58d6320d12..0dbbc75207 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/EmojiViewHolder.smali
@@ -30,25 +30,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/EmojiViewHolder;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/EmojiViewHolder;
+    const-string v2, "emojiIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "emojiIv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEmojiIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/chat/list/actions/EmojiViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -58,13 +52,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00fd
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a032a
+    const p1, 0x7f0a0330
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -73,15 +69,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/EmojiViewHolder;->emojiIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/chat/list/actions/EmojiViewHolder;)Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;
@@ -119,7 +106,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/list/actions/EmojiItem;)V
     .locals 13
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -177,7 +166,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/EmojiItem$EmojiData;->getEmoji()Lcom/discord/models/domain/emoji/Emoji;
 
@@ -197,17 +186,17 @@
 
     move-result-object p1
 
-    const/4 p2, 0x1
+    iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
+    move-result-object p2
 
-    move-result-object v1
+    const/4 v1, 0x1
 
-    invoke-interface {p1, p2, v0, v1}, Lcom/discord/models/domain/emoji/Emoji;->getImageUri(ZILandroid/content/Context;)Ljava/lang/String;
+    invoke-interface {p1, v1, v0, p2}, Lcom/discord/models/domain/emoji/Emoji;->getImageUri(ZILandroid/content/Context;)Ljava/lang/String;
 
     move-result-object v4
 
@@ -230,15 +219,6 @@
     invoke-static/range {v3 .. v12}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.smali
index ad2e35d578..b7dac1f786 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageActionDialogs.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -82,13 +84,4 @@
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
index aad92066ff..1d1e21c4ee 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageActionDialogs.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,12 +71,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120ee4
+    const p1, 0x7f120f0a
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120ed9
+    const p1, 0x7f120eff
 
     :goto_0
     iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1;->this$0:Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;
@@ -89,7 +89,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1;->this$0:Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.smali
index 235c434052..b491c5890e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageActionDialogs.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,71 +77,73 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$message:Lcom/discord/models/domain/ModelMessage;
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    iget-object v3, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$message:Lcom/discord/models/domain/ModelMessage;
+    iget-object v2, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    iget-boolean v5, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$isPinned:Z
+    iget-boolean v4, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$isPinned:Z
 
-    if-eqz v5, :cond_0
+    if-eqz v4, :cond_0
 
-    sget-object v5, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v4, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v5}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v4}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v5, v1, v2, v3, v4}, Lcom/discord/utilities/rest/RestAPI;->deleteChannelPin(JJ)Lrx/Observable;
+    invoke-virtual {v4, v0, v1, v2, v3}, Lcom/discord/utilities/rest/RestAPI;->deleteChannelPin(JJ)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    sget-object v5, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v4, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v5}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v4}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v5, v1, v2, v3, v4}, Lcom/discord/utilities/rest/RestAPI;->addChannelPin(JJ)Lrx/Observable;
+    invoke-virtual {v4, v0, v1, v2, v3}, Lcom/discord/utilities/rest/RestAPI;->addChannelPin(JJ)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_0
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    invoke-static {v2, v3}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-static {v1, v2}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v1
 
-    const-string v2, "restCall\n               \u2026ormers.restSubscribeOn())"
+    invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v0
 
-    iget-object v2, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$appComponent:Lcom/discord/app/AppComponent;
+    const-string v1, "restCall\n               \u2026ormers.restSubscribeOn())"
 
-    const/4 v3, 0x2
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;->$appComponent:Lcom/discord/app/AppComponent;
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v3, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
@@ -172,11 +174,4 @@
     invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali
index decdf9c7e4..496dcd8f4a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali
@@ -50,25 +50,33 @@
 
     move-object/from16 v2, p4
 
-    const/4 v3, 0x0
+    const-string v3, "fragmentManager"
 
-    if-eqz p1, :cond_3
+    move-object/from16 v5, p1
 
-    if-eqz v0, :cond_2
+    invoke-static {v5, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_1
+    const-string v3, "context"
 
-    if-eqz v2, :cond_0
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "message"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "onSuccess"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f12056e
+    const v3, 0x7f120570
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    const v3, 0x7f12056f
+    const v3, 0x7f120571
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -76,21 +84,21 @@
 
     const-string v3, "context.getString(R.string.delete_message_body)"
 
-    invoke-static {v7, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120563
+    const v3, 0x7f120565
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    const v3, 0x7f1203b7
+    const v3, 0x7f1203b8
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v9
 
-    const v0, 0x7f0a062c
+    const v0, 0x7f0a0632
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -135,38 +143,10 @@
     invoke-static/range {v4 .. v19}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v0, "onSuccess"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_1
-    const-string v0, "message"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_2
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_3
-    const-string v0, "fragmentManager"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public final showPinMessageConfirmation(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Lcom/discord/models/domain/ModelMessage;Lcom/discord/app/AppComponent;Lkotlin/jvm/functions/Function0;)V
-    .locals 20
+    .locals 21
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -182,85 +162,101 @@
 
     move-object/from16 v4, p2
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_7
+    move-object/from16 v6, p1
 
-    if-eqz v4, :cond_6
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_5
+    const-string v0, "context"
 
-    if-eqz p4, :cond_4
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_3
+    const-string v0, "message"
+
+    move-object/from16 v1, p3
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "appComponent"
+
+    move-object/from16 v3, p4
+
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onSuccess"
+
+    move-object/from16 v5, p5
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelMessage;->isPinned()Z
 
     move-result v2
 
-    sget-object v6, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+    sget-object v7, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
     if-eqz v2, :cond_0
 
-    const v0, 0x7f12166d
+    const v0, 0x7f121697
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f121136
+    const v0, 0x7f121161
 
     :goto_0
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v8
 
     if-eqz v2, :cond_1
 
-    const v0, 0x7f121669
+    const v0, 0x7f121693
 
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f121134
+    const v0, 0x7f12115f
 
     :goto_1
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v9
 
     const-string v0, "context.getString(\n     \u2026age_body_mobile\n        )"
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v2, :cond_2
 
-    const v0, 0x7f121666
+    const v0, 0x7f121690
 
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f121130
+    const v0, 0x7f12115b
 
     :goto_2
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v10
 
-    const v0, 0x7f1203b7
+    const v0, 0x7f1203b8
 
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v10
+    move-result-object v11
 
-    const v0, 0x7f0a062c
+    const v0, 0x7f0a0632
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v11
+    move-result-object v12
 
-    new-instance v12, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;
+    new-instance v13, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;
 
-    move-object v0, v12
+    move-object v0, v13
 
     move-object/from16 v1, p3
 
@@ -274,14 +270,12 @@
 
     new-instance v0, Lkotlin/Pair;
 
-    invoke-direct {v0, v11, v12}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v0, v12, v13}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     invoke-static {v0}, Lf/n/a/k/a;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object v0
 
-    const/4 v11, 0x0
-
     const/4 v12, 0x0
 
     const/4 v13, 0x0
@@ -294,78 +288,45 @@
 
     const/16 v17, 0x0
 
-    const/16 v18, 0x1fc0
+    const/16 v18, 0x0
 
-    const/16 v19, 0x0
+    const/16 v19, 0x1fc0
 
-    move-object v1, v6
+    const/16 v20, 0x0
+
+    move-object v1, v7
 
     move-object/from16 v2, p1
 
-    move-object v3, v7
+    move-object v3, v8
 
-    move-object v4, v8
+    move-object v4, v9
 
-    move-object v5, v9
+    move-object v5, v10
 
-    move-object v6, v10
+    move-object v6, v11
 
     move-object v7, v0
 
-    move-object v8, v11
+    move-object v8, v12
 
-    move-object v9, v12
+    move-object v9, v13
 
-    move-object v10, v13
+    move-object v10, v14
 
-    move-object v11, v14
+    move-object v11, v15
 
-    move-object v12, v15
+    move-object/from16 v12, v16
 
-    move-object/from16 v13, v16
+    move-object/from16 v13, v17
 
-    move/from16 v14, v17
+    move/from16 v14, v18
 
-    move/from16 v15, v18
+    move/from16 v15, v19
 
-    move-object/from16 v16, v19
+    move-object/from16 v16, v20
 
     invoke-static/range {v1 .. v16}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
 
     return-void
-
-    :cond_3
-    const-string v1, "onSuccess"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "appComponent"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "message"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "context"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string v1, "fragmentManager"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.smali
index ef88c90f48..847ac26a36 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.smali
@@ -18,22 +18,15 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00fe
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/chat/list/actions/MoreEmojisViewHolder;)Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;
@@ -49,9 +42,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/chat/list/actions/EmojiItem;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -64,15 +59,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Companion.smali
index 7498d0f1c6..055e8fb92a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Companion.smali
@@ -36,11 +36,13 @@
 .method public final showForChat(Landroidx/fragment/app/FragmentManager;JJLjava/lang/CharSequence;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "messageContent"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
@@ -62,11 +64,11 @@
 
     invoke-virtual {v1, p2, p6}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
-    const/4 p2, 0x0
+    const-string p2, "INTENT_EXTRA_TYPE"
 
-    const-string p3, "INTENT_EXTRA_TYPE"
+    const/4 p3, 0x0
 
-    invoke-virtual {v1, p3, p2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v1, p2, p3}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
@@ -79,30 +81,18 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "messageContent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final showForPin(Landroidx/fragment/app/FragmentManager;JJLjava/lang/CharSequence;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "messageContent"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/os/Bundle;
 
@@ -120,11 +110,11 @@
 
     invoke-virtual {v0, p2, p6}, Landroid/os/Bundle;->putCharSequence(Ljava/lang/String;Ljava/lang/CharSequence;)V
 
-    const/4 p2, 0x1
+    const-string p2, "INTENT_EXTRA_TYPE"
 
-    const-string p3, "INTENT_EXTRA_TYPE"
+    const/4 p3, 0x1
 
-    invoke-virtual {v0, p3, p2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v0, p2, p3}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
     new-instance p2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
@@ -141,18 +131,4 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "messageContent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.smali
index 805644ea69..6ab99e345a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelMessage;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$1.smali
index 26fcb26b8e..a15dc6f9f1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListActions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$2.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$2.smali
index 8e38cc0261..7af7f48463 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListActions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$3.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$3.smali
index 83441da107..9fd5bc2b27 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$3.smali
@@ -33,7 +33,13 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/models/domain/emoji/EmojiSet;",
+        "Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;",
+        ">;"
     }
 .end annotation
 
@@ -72,7 +78,7 @@
 
     const-string v2, "meUser"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v6, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$3;->$channel:Lcom/discord/models/domain/ModelChannel;
 
@@ -84,7 +90,7 @@
 
     const-string v2, "emojis"
 
-    invoke-static {p5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v2, p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.smali
index 6d6a49cbdc..738c057334 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListActions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessage;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -121,9 +128,9 @@
 
     const/4 v1, 0x0
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v2
 
@@ -162,7 +169,7 @@
 
     const-string v7, "channel.guildId"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
@@ -184,7 +191,7 @@
 
     invoke-direct {v6, v3, v4}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$1;-><init>(J)V
 
-    invoke-virtual {v5, v6}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v5, v6}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v10
 
@@ -198,7 +205,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
@@ -210,7 +217,7 @@
 
     sget-object v4, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$2;->INSTANCE:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2$2;
 
-    invoke-virtual {v3, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v3, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
@@ -228,7 +235,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali
index 4ec6535ac0..159591493c 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali
@@ -118,7 +118,7 @@
 
     const-string v2, "message.author"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
@@ -155,7 +155,7 @@
 
     const-string v3, ""
 
-    invoke-static {v0, v2, v3, v8, v1}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v0, v2, v3, v8, v1}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v0
 
@@ -182,7 +182,7 @@
     :goto_4
     const-string v1, "channel?.guildId ?: 0L"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -206,7 +206,7 @@
 
     const-string v0, "emojis.recentEmojis"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v12
 
@@ -246,9 +246,9 @@
 
     const/4 p3, 0x0
 
-    new-instance p4, Lr0/l/e/j;
+    new-instance p4, Ls0/l/e/j;
 
-    invoke-direct {p4, p3}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p4, p3}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -297,13 +297,13 @@
 
     invoke-direct {p4, p1, p2, p5, p6}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2;-><init>(JLjava/lang/CharSequence;I)V
 
-    invoke-virtual {p3, p4}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p3, p4}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable\n            .\u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model.smali
index 2d7a117ab0..84880f69fe 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model.smali
@@ -90,13 +90,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "manageMessageContext"
 
-    if-eqz p9, :cond_0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "recentEmojis"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -121,27 +125,6 @@
     iput-object p11, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->permissions:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "recentEmojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "manageMessageContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;Lcom/discord/models/domain/ModelMessage;JLjava/lang/String;Ljava/lang/CharSequence;Lcom/discord/utilities/permissions/ManageMessageContext;IZLjava/util/List;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
@@ -410,34 +393,38 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p6, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string v0, "manageMessageContext"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "recentEmojis"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-wide v3, p2
 
     move-object/from16 v5, p4
 
     move-object/from16 v6, p5
 
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
     move/from16 v9, p8
 
-    move-object/from16 v10, p9
-
     move-object/from16 v11, p10
 
     move-object/from16 v12, p11
@@ -445,27 +432,6 @@
     invoke-direct/range {v1 .. v12}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;-><init>(Lcom/discord/models/domain/ModelMessage;JLjava/lang/String;Ljava/lang/CharSequence;Lcom/discord/utilities/permissions/ManageMessageContext;IZLjava/util/List;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "recentEmojis"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "manageMessageContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "message"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -483,7 +449,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -501,7 +467,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->messageAuthorName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -511,7 +477,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->formattedMessageContent:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -521,7 +487,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->manageMessageContext:Lcom/discord/utilities/permissions/ManageMessageContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -543,7 +509,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->recentEmojis:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -553,7 +519,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -563,7 +529,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->permissions:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$addReaction$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$addReaction$1.smali
index 76603b6705..a890086484 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$addReaction$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$addReaction$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$addReaction$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali
index eb0c5cd52e..9a28f5c835 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali
@@ -59,7 +59,7 @@
 
     const-string v1, "data.message.author"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -73,7 +73,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$2.smali
index 6e54c3d000..f7d9b6bd7a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$2.smali
@@ -59,7 +59,7 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$4.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$4.smali
index 411eaf5618..90361fa546 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$4.smali
@@ -73,7 +73,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3, v2}, Lf/a/b/q;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
+    invoke-static {v0, v3, v2}, Lf/a/b/s;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.smali
index 9aa66d14b3..0b5be91864 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
@@ -61,7 +61,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$7.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$7.smali
index 815be9e1d0..7f473d0e28 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$7.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$7;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
@@ -69,7 +69,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$7;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.smali
index ebb34075c9..df92ac6645 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.smali
@@ -89,7 +89,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const v2, 0x7f12148c
+    const v2, 0x7f1214b6
 
     invoke-virtual {v1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$deleteMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$deleteMessage$1.smali
index bbf6df6d4d..f09dbfbea4 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$deleteMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$deleteMessage$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$deleteMessage$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "dismiss"
+
+    const-string v5, "dismiss()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "dismiss"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "dismiss()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1$1.smali
index c2b2429719..2ed672f2c3 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1$1.smali
@@ -29,7 +29,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Lcom/discord/models/domain/emoji/EmojiSet;",
+        "Ljava/lang/CharSequence;",
+        ">;"
     }
 .end annotation
 
@@ -90,7 +102,7 @@
 
     const-string v1, "message.content"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1$1;->$guildId:J
 
@@ -108,15 +120,15 @@
 
     const-string v2, "channels"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "users"
+    const-string/jumbo v2, "users"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "emojiSet"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p2, v1, p1, p3}, Lcom/discord/utilities/textprocessing/MessageUnparser;->unparse(Ljava/lang/String;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/emoji/EmojiSet;)Ljava/lang/CharSequence;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali
index aa412aa9e6..582fc77fad 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListActions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/CharSequence;",
+        ">;>;"
     }
 .end annotation
 
@@ -72,6 +78,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/CharSequence;",
             ">;"
         }
@@ -113,7 +120,7 @@
     :goto_0
     const-string v1, "channel?.guildId ?: 0"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.smali
index 7ba26d0ed8..96bd7ec73d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/CharSequence;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2;->$message:Lcom/discord/models/domain/ModelMessage;
 
-    const-string v3, "unparsedMessageContent"
+    const-string/jumbo v3, "unparsedMessageContent"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onResume$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onResume$1.smali
index 93ef602032..c34428383a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$1.smali
index 966530482f..9acd19e4de 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/emoji/Emoji;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$1;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->access$addReaction(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/models/domain/emoji/Emoji;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$1.smali
index 92311558cc..d8dbba933a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$1.smali
@@ -42,7 +42,9 @@
 .method public onEmojiPicked(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$1;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2;
 
@@ -51,13 +53,4 @@
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->access$addReaction(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/models/domain/emoji/Emoji;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$2.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$2.smali
index 54778b3d7f..888f792459 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2.smali
index 49c01ced4c..7d420aa685 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$onViewCreated$2$1;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1.smali
index b7b5abbfae..98edf415fe 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.smali
index 0b040f8949..347765c5aa 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,53 +65,55 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;->$model:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;->$model:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    invoke-virtual {v2}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
+    move-result-wide v1
 
-    move-result-object v2
+    iget-object v3, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;->$model:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+    invoke-virtual {v3}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
-    move-result-wide v2
+    move-result-object v3
 
-    iget-object v4, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;->$model:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getId()J
 
-    invoke-virtual {v4}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
+    move-result-wide v3
 
-    move-result-object v4
+    invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/utilities/rest/RestAPI;->removeAllReactions(JJ)Lrx/Observable;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelMessage;->getId()J
+    move-result-object v0
 
-    move-result-wide v4
+    const/4 v1, 0x0
 
-    invoke-virtual {v1, v2, v3, v4, v5}, Lcom/discord/utilities/rest/RestAPI;->removeAllReactions(JJ)Lrx/Observable;
+    const/4 v2, 0x1
 
-    move-result-object v1
+    const/4 v3, 0x0
 
-    const/4 v2, 0x0
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
-    const/4 v3, 0x1
+    move-result-object v0
 
-    invoke-static {v1, v2, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    move-result-object v1
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
-
-    const/4 v3, 0x2
-
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v1, v3, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
@@ -119,12 +121,14 @@
 
     move-result-object v5
 
-    const/4 v7, 0x0
-
     new-instance v8, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1;
 
     invoke-direct {v8, p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1$1;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1;)V
 
+    const-string v6, "REST: removeAllReactions"
+
+    const/4 v7, 0x0
+
     const/4 v9, 0x0
 
     const/4 v10, 0x0
@@ -133,16 +137,7 @@
 
     const/4 v12, 0x0
 
-    const-string v6, "REST: removeAllReactions"
-
     invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$toggleMessagePin$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$toggleMessagePin$1.smali
index cbe674d55b..0ad1e35a9d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$toggleMessagePin$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$toggleMessagePin$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$toggleMessagePin$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetChatListActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "dismiss"
+
+    const-string v5, "dismiss()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "dismiss"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "dismiss()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
index a63e9f0ccb..a9a95cd479 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
@@ -74,261 +74,183 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsAddReactionEmojisList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsAddReactionEmojisList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "chatActionsAddReactionEmojisList"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getChatActionsAddReactionEmojisList()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const/4 v2, 0x0
+    const-string v2, "chatActionsManageReactions"
 
-    aput-object v1, v0, v2
+    const-string v3, "getChatActionsManageReactions()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "chatActionsManageReactions"
-
-    const-string v4, "getChatActionsManageReactions()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsRemoveReactions"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsRemoveReactions()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsRemoveReactions"
-
-    const-string v4, "getChatActionsRemoveReactions()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsEdit"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsEdit()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsEdit"
-
-    const-string v4, "getChatActionsEdit()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsResend"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsResend()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsResend"
-
-    const-string v4, "getChatActionsResend()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsCopy"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsCopy()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsCopy"
-
-    const-string v4, "getChatActionsCopy()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsCopyId"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsCopyId()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsCopyId"
-
-    const-string v4, "getChatActionsCopyId()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsMarkUnreadId"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsMarkUnreadId()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsMarkUnreadId"
-
-    const-string v4, "getChatActionsMarkUnreadId()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsShare"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsShare()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsShare"
-
-    const-string v4, "getChatActionsShare()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsDelete"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsDelete()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsDelete"
-
-    const-string v4, "getChatActionsDelete()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsPin"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsPin()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsPin"
-
-    const-string v4, "getChatActionsPin()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsProfile"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsProfile()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsProfile"
-
-    const-string v4, "getChatActionsProfile()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
 
-    const-class v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+    const-string v2, "chatActionsQuote"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatActionsQuote()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatActionsQuote"
-
-    const-string v4, "getChatActionsQuote()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
@@ -352,7 +274,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a02d0
+    const v0, 0x7f0a02d6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -360,7 +282,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsAddReactionEmojisList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d6
+    const v0, 0x7f0a02dc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -368,7 +290,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsManageReactions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02db
+    const v0, 0x7f0a02e1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -376,7 +298,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsRemoveReactions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d5
+    const v0, 0x7f0a02db
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -384,7 +306,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsEdit$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02dc
+    const v0, 0x7f0a02e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -392,7 +314,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsResend$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d2
+    const v0, 0x7f0a02d8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -400,7 +322,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsCopy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d3
+    const v0, 0x7f0a02d9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -408,7 +330,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsCopyId$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d7
+    const v0, 0x7f0a02dd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -416,7 +338,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsMarkUnreadId$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02dd
+    const v0, 0x7f0a02e3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -424,7 +346,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsShare$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d4
+    const v0, 0x7f0a02da
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -432,7 +354,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsDelete$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d8
+    const v0, 0x7f0a02de
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -440,7 +362,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsPin$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d9
+    const v0, 0x7f0a02df
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -448,7 +370,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->chatActionsProfile$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02da
+    const v0, 0x7f0a02e0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -566,7 +488,7 @@
 
     const-string v0, "emoji.reactionKey"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/rest/RestAPI;->addReaction(JJLjava/lang/String;)Lrx/Observable;
 
@@ -629,13 +551,15 @@
 
     move-result v0
 
+    const/16 v1, 0x8
+
     if-nez v0, :cond_3
 
     if-nez p2, :cond_3
 
     if-nez p3, :cond_0
 
-    goto/16 :goto_0
+    goto :goto_0
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsAddReactionEmojisList()Landroidx/recyclerview/widget/RecyclerView;
@@ -664,41 +588,35 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsAddReactionEmojisList()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Landroid/view/ViewGroup;->getPaddingEnd()I
+    invoke-virtual {v2}, Landroid/view/ViewGroup;->getPaddingEnd()I
 
-    move-result v1
+    move-result v2
 
-    add-int/2addr v1, v0
+    add-int/2addr v2, v0
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    const v2, 0x7f07006f
+    const v3, 0x7f07006f
 
-    invoke-virtual {v0, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result v0
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    invoke-static {v1}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
-    move-result-object v2
+    move-result v1
 
-    const v3, 0x7f0701ed
+    sub-int/2addr p2, v2
 
-    invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    add-int v2, p2, v1
 
-    move-result v2
+    add-int v3, v0, v1
 
-    sub-int/2addr p2, v1
-
-    add-int v1, p2, v2
-
-    add-int v3, v0, v2
-
-    div-int/2addr v1, v3
+    div-int/2addr v2, v3
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
@@ -708,15 +626,15 @@
 
     add-int/2addr v3, v4
 
-    invoke-static {v3, v1}, Ljava/lang/Math;->min(II)I
+    invoke-static {v3, v2}, Ljava/lang/Math;->min(II)I
 
-    move-result v1
+    move-result v2
 
-    mul-int v0, v0, v1
+    mul-int v0, v0, v2
 
-    add-int/lit8 v3, v1, -0x1
+    add-int/lit8 v3, v2, -0x1
 
-    mul-int v5, v3, v2
+    mul-int v5, v3, v1
 
     add-int/2addr v5, v0
 
@@ -741,7 +659,7 @@
 
     div-int/2addr p2, v3
 
-    add-int/2addr p2, v2
+    add-int/2addr p2, v1
 
     invoke-direct {v0, p3, p2, p3, v4}, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;-><init>(IIIZ)V
 
@@ -757,14 +675,14 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p2, p1, v1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;->setData(Ljava/util/List;I)V
+    invoke-virtual {p2, p1, v2}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;->setData(Ljava/util/List;I)V
 
     return-void
 
     :cond_2
     const-string p1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -776,9 +694,7 @@
 
     move-result-object p1
 
-    const/16 p2, 0x8
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 .end method
@@ -890,7 +806,7 @@
 
     const-string v6, "data.message.reactions"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v5}, Ljava/util/Map;->isEmpty()Z
 
@@ -932,7 +848,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v5}, Ljava/util/Map;->isEmpty()Z
 
@@ -1206,12 +1122,12 @@
 
     if-eqz v1, :cond_f
 
-    const v1, 0x7f121666
+    const v1, 0x7f121690
 
     goto :goto_d
 
     :cond_f
-    const v1, 0x7f121130
+    const v1, 0x7f12115b
 
     :goto_d
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1345,7 +1261,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1353,7 +1269,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$deleteMessage$1;
 
@@ -1381,13 +1297,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1;-><init>(Lcom/discord/models/domain/ModelMessage;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n        .get\u2026              }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -1419,12 +1335,20 @@
 
     and-int/lit8 p1, p1, 0x20
 
-    new-instance p1, Lf/a/b/c0;
+    const-string p1, "onNext"
 
-    const/4 v7, 0x0
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "editMessage"
 
+    const-string p1, "errorTag"
+
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/b/e0;
+
+    const/4 v7, 0x0
+
     move-object v1, p1
 
     move-object v2, v7
@@ -1433,7 +1357,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/e0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1769,15 +1693,15 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f121328
+    const v3, 0x7f121352
 
     invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f121327
+    const v4, 0x7f121351
 
     invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1785,21 +1709,21 @@
 
     const-string v5, "getString(R.string.remov\u2026l_reactions_confirm_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f121841
+    const v5, 0x7f12186d
 
     invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
-    const v6, 0x7f120fa4
+    const v6, 0x7f120fce
 
     invoke-virtual {v0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    const v7, 0x7f0a062c
+    const v7, 0x7f0a0632
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1891,7 +1815,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1899,7 +1823,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v5, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$toggleMessagePin$1;
 
@@ -1975,7 +1899,7 @@
 
     const-string v2, "Model.get(channelId, mes\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
@@ -2009,9 +1933,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -2045,9 +1969,9 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsAddReactionEmojisList()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p2, v1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {p2, v0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
@@ -2057,7 +1981,9 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->adapter:Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;
 
-    const-string p2, "adapter"
+    const/4 p2, 0x0
+
+    const-string v0, "adapter"
 
     if-eqz p1, :cond_2
 
@@ -2098,24 +2024,17 @@
     return-void
 
     :cond_0
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p2
 
     :cond_1
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p2
 
     :cond_2
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickEmoji$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickEmoji$1.smali
index 14b37e5b48..98e713e457 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickEmoji$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickEmoji$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickEmoji$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActionsEmojisAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/emoji/Emoji;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/emoji/Emoji;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickMoreEmojis$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickMoreEmojis$1.smali
index 7d6c23e343..f2f29b077e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickMoreEmojis$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickMoreEmojis$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter$onClickMoreEmojis$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatListActionsEmojisAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter.smali
index 0aa0263517..9d64fe0902 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter.smali
@@ -39,9 +39,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -54,15 +56,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;->onClickMoreEmojis:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getEmojiItems(Ljava/util/List;I)Ljava/util/List;
@@ -93,7 +86,7 @@
     :cond_0
     add-int/lit8 p2, p2, -0x1
 
-    invoke-static {p1, p2}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {p1, p2}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
@@ -133,7 +126,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {p2}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {p2}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object p1
 
@@ -149,7 +142,7 @@
 
     :cond_2
     :goto_1
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     return-object p1
 .end method
@@ -200,7 +193,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -213,7 +206,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -241,19 +236,10 @@
 
     :goto_0
     return-object p1
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Ljava/util/List;I)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -264,7 +250,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojis"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;->getEmojiItems(Ljava/util/List;I)Ljava/util/List;
 
@@ -273,19 +261,10 @@
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickEmoji(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -297,24 +276,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;->onClickEmoji:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickMoreEmojis(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -324,18 +296,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActionsEmojisAdapter;->onClickMoreEmojis:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/AttachmentEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/AttachmentEntry.smali
index 34f6572223..5a1cf78997 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/AttachmentEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/AttachmentEntry.smali
@@ -28,11 +28,13 @@
 .method public constructor <init>(IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageAttachment;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p4, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "attachment"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -75,20 +77,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "attachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/AttachmentEntry;IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageAttachment;ZZILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
@@ -262,11 +250,17 @@
 .method public final copy(IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageAttachment;ZZ)Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p4, :cond_1
+    move-object v5, p4
 
-    if-eqz p6, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "attachment"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;
 
@@ -276,12 +270,8 @@
 
     move-wide v3, p2
 
-    move-object v5, p4
-
     move-object v6, p5
 
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
     move/from16 v9, p8
@@ -289,20 +279,6 @@
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;-><init>(IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageAttachment;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "attachment"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "message"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -334,7 +310,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -344,7 +320,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->messageState:Lcom/discord/stores/StoreMessageState$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -354,7 +330,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/AttachmentEntry;->attachment:Lcom/discord/models/domain/ModelMessageAttachment;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali
index c5739f1aaf..ec293cc138 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.smali
@@ -16,9 +16,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelMessage;IZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,15 +31,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/chat/list/entries/BlockedMessagesEntry;->isExpandedBlock:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component3()Z
@@ -100,22 +93,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelMessage;IZ)Lcom/discord/widgets/chat/list/entries/BlockedMessagesEntry;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/BlockedMessagesEntry;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/list/entries/BlockedMessagesEntry;-><init>(Lcom/discord/models/domain/ModelMessage;IZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -133,7 +119,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/BlockedMessagesEntry;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/DstiEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/DstiEntry.smali
index 8f1f7a9478..496ef20b7a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/DstiEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/DstiEntry.smali
@@ -18,9 +18,11 @@
 
 # direct methods
 .method public constructor <init>(JJJLcom/discord/models/dsti/dto/ModelDsti;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p7, :cond_0
+    const-string v0, "dsti"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p7, p0, Lcom/discord/widgets/chat/list/entries/DstiEntry;->dsti:Lcom/discord/models/dsti/dto/ModelDsti;
 
     return-void
-
-    :cond_0
-    const-string p1, "dsti"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/DstiEntry;JJJLcom/discord/models/dsti/dto/ModelDsti;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/DstiEntry;
@@ -149,32 +142,25 @@
 .method public final copy(JJJLcom/discord/models/dsti/dto/ModelDsti;)Lcom/discord/widgets/chat/list/entries/DstiEntry;
     .locals 9
 
-    if-eqz p7, :cond_0
-
-    new-instance v8, Lcom/discord/widgets/chat/list/entries/DstiEntry;
-
-    move-object v0, v8
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    move-wide v5, p5
-
-    move-object/from16 v7, p7
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/list/entries/DstiEntry;-><init>(JJJLcom/discord/models/dsti/dto/ModelDsti;)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "dsti"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v8, p7
 
-    const/4 v0, 0x0
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/DstiEntry;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move-wide v4, p3
+
+    move-wide v6, p5
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/chat/list/entries/DstiEntry;-><init>(JJJLcom/discord/models/dsti/dto/ModelDsti;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -216,7 +202,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/DstiEntry;->dsti:Lcom/discord/models/dsti/dto/ModelDsti;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali
index 29cf62a389..4d05729412 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/EmbedEntry.smali
@@ -28,11 +28,13 @@
 .method public constructor <init>(IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageEmbed;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p4, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "embed"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -75,20 +77,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "embed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/EmbedEntry;IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageEmbed;ZZILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/EmbedEntry;
@@ -262,11 +250,17 @@
 .method public final copy(IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageEmbed;ZZ)Lcom/discord/widgets/chat/list/entries/EmbedEntry;
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p4, :cond_1
+    move-object v5, p4
 
-    if-eqz p6, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "embed"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/EmbedEntry;
 
@@ -276,12 +270,8 @@
 
     move-wide v3, p2
 
-    move-object v5, p4
-
     move-object v6, p5
 
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
     move/from16 v9, p8
@@ -289,20 +279,6 @@
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/chat/list/entries/EmbedEntry;-><init>(IJLcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessageEmbed;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "embed"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "message"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -334,7 +310,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -344,7 +320,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->messageState:Lcom/discord/stores/StoreMessageState$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -354,7 +330,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/EmbedEntry;->embed:Lcom/discord/models/domain/ModelMessageEmbed;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali
index b7a3b4f36d..89d651e3e1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/EmptyPinsEntry.smali
@@ -12,24 +12,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;->text:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;
@@ -62,22 +55,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -95,7 +81,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/EmptyPinsEntry;->text:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali
index a33baba8f9..8c8d15b9d9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/GameInviteEntry.smali
@@ -20,11 +20,13 @@
 .method public constructor <init>(JJLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelApplication;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p5, :cond_1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p6, p0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->application:Lcom/discord/models/domain/ModelApplication;
 
     return-void
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;JJLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelApplication;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
@@ -138,11 +126,13 @@
 .method public final copy(JJLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p5, :cond_1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "application"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
 
@@ -159,20 +149,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;-><init>(JJLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelApplication;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "application"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -206,7 +182,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -216,7 +192,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->application:Lcom/discord/models/domain/ModelApplication;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali
index 532d726852..41297b5817 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/GiftEntry.smali
@@ -18,9 +18,11 @@
 
 # direct methods
 .method public constructor <init>(JJJLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p7, :cond_0
+    const-string v0, "giftCode"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p7, p0, Lcom/discord/widgets/chat/list/entries/GiftEntry;->giftCode:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/GiftEntry;JJJLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/GiftEntry;
@@ -149,32 +142,25 @@
 .method public final copy(JJJLjava/lang/String;)Lcom/discord/widgets/chat/list/entries/GiftEntry;
     .locals 9
 
-    if-eqz p7, :cond_0
-
-    new-instance v8, Lcom/discord/widgets/chat/list/entries/GiftEntry;
-
-    move-object v0, v8
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    move-wide v5, p5
-
-    move-object/from16 v7, p7
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/list/entries/GiftEntry;-><init>(JJJLjava/lang/String;)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "giftCode"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v8, p7
 
-    const/4 v0, 0x0
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/GiftEntry;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move-wide v4, p3
+
+    move-wide v6, p5
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/chat/list/entries/GiftEntry;-><init>(JJJLjava/lang/String;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -216,7 +202,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/GiftEntry;->giftCode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/GuildTemplateEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/GuildTemplateEntry.smali
index ad5bcabc70..f23b5b5b60 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/GuildTemplateEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/GuildTemplateEntry.smali
@@ -16,9 +16,11 @@
 
 # direct methods
 .method public constructor <init>(JJLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p5, :cond_0
+    const-string v0, "guildTemplateCode"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,15 +31,6 @@
     iput-object p5, p0, Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;->guildTemplateCode:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplateCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;JJLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;
@@ -108,30 +101,23 @@
 .method public final copy(JJLjava/lang/String;)Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;
     .locals 7
 
-    if-eqz p5, :cond_0
+    const-string v0, "guildTemplateCode"
 
-    new-instance v6, Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;
 
-    move-wide v1, p1
+    move-object v1, v0
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;-><init>(JJLjava/lang/String;)V
+    move-object v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;-><init>(JJLjava/lang/String;)V
 
-    :cond_0
-    const-string p1, "guildTemplateCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -165,7 +151,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/GuildTemplateEntry;->guildTemplateCode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali
index 46431b7d17..adf31f182e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/GuildWelcomeEntry.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(ZZZJLjava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p6, :cond_0
+    const-string v0, "guildName"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,15 +61,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;ZZZJLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
@@ -180,34 +173,27 @@
 .method public final copy(ZZZJLjava/lang/String;)Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
     .locals 8
 
-    if-eqz p6, :cond_0
+    const-string v0, "guildName"
 
-    new-instance v7, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
 
-    move v1, p1
+    move-object v1, v0
 
-    move v2, p2
+    move v2, p1
 
-    move v3, p3
+    move v3, p2
 
-    move-wide v4, p4
+    move v4, p3
 
-    move-object v6, p6
+    move-wide v5, p4
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;-><init>(ZZZJLjava/lang/String;)V
+    move-object v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;-><init>(ZZZJLjava/lang/String;)V
 
-    :cond_0
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -251,7 +237,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;->guildName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali
index a2ec131934..77b2b65156 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/InviteEntry.smali
@@ -18,9 +18,11 @@
 
 # direct methods
 .method public constructor <init>(JJLjava/lang/String;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p5, :cond_0
+    const-string v0, "inviteCode"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-wide p6, p0, Lcom/discord/widgets/chat/list/entries/InviteEntry;->guildId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/InviteEntry;JJLjava/lang/String;JILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/InviteEntry;
@@ -149,32 +142,25 @@
 .method public final copy(JJLjava/lang/String;J)Lcom/discord/widgets/chat/list/entries/InviteEntry;
     .locals 9
 
-    if-eqz p5, :cond_0
-
-    new-instance v8, Lcom/discord/widgets/chat/list/entries/InviteEntry;
-
-    move-object v0, v8
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    move-object v5, p5
-
-    move-wide v6, p6
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/list/entries/InviteEntry;-><init>(JJLjava/lang/String;J)V
-
-    return-object v8
-
-    :cond_0
     const-string v0, "inviteCode"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v6, p5
 
-    const/4 v0, 0x0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/InviteEntry;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move-wide v4, p3
+
+    move-wide v7, p6
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/chat/list/entries/InviteEntry;-><init>(JJLjava/lang/String;J)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -208,7 +194,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/InviteEntry;->inviteCode:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali
index 39303a51ab..83d28b8b66 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ListenTogetherEntry.smali
@@ -16,9 +16,11 @@
 
 # direct methods
 .method public constructor <init>(JJLcom/discord/models/domain/ModelMessage$Activity;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p5, :cond_0
+    const-string v0, "activity"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,15 +31,6 @@
     iput-object p5, p0, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
 
     return-void
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;JJLcom/discord/models/domain/ModelMessage$Activity;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
@@ -108,30 +101,23 @@
 .method public final copy(JJLcom/discord/models/domain/ModelMessage$Activity;)Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
     .locals 7
 
-    if-eqz p5, :cond_0
+    const-string v0, "activity"
 
-    new-instance v6, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;
 
-    move-wide v1, p1
+    move-object v1, v0
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    move-object v5, p5
+    move-wide v4, p3
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;-><init>(JJLcom/discord/models/domain/ModelMessage$Activity;)V
+    move-object v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;-><init>(JJLcom/discord/models/domain/ModelMessage$Activity;)V
 
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -165,7 +151,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;->activity:Lcom/discord/models/domain/ModelMessage$Activity;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
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 b0c690168c..b1df59b2bf 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
@@ -80,13 +80,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_2
+    const-string v0, "nickOrUsernames"
 
-    if-eqz p9, :cond_1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "voiceParticipants"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -153,27 +157,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_1
-    const-string p1, "voiceParticipants"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "nickOrUsernames"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZLjava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -496,60 +479,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p5, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string v0, "nickOrUsernames"
+
+    move-object/from16 v6, p5
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "voiceParticipants"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-object v3, p2
 
     move-object v4, p3
 
     move-object v5, p4
 
-    move-object/from16 v6, p5
-
     move/from16 v7, p6
 
     move/from16 v8, p7
 
     move/from16 v9, p8
 
-    move-object/from16 v10, p9
-
     invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/chat/list/entries/MessageEntry;-><init>(Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZLjava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "voiceParticipants"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "nickOrUsernames"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "message"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -567,7 +533,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -577,7 +543,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -587,7 +553,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -597,7 +563,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->roles:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -607,7 +573,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->nickOrUsernames:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -635,7 +601,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->voiceParticipants:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali
index dea54147d8..1b15f9737f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion.smali
@@ -36,11 +36,13 @@
 .method public final create(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
+
+    const/4 v1, 0x0
 
     if-eqz p3, :cond_0
 
@@ -51,24 +53,17 @@
     goto :goto_0
 
     :cond_0
-    move-object p3, v0
+    move-object p3, v1
 
     :goto_0
     if-eqz p2, :cond_1
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_1
-    invoke-direct {v1, p1, p3, v0}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;-><init>(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v0, p1, p3, v1}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;-><init>(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;)V
 
-    return-object v1
-
-    :cond_2
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali
index f4e5c6b1ed..1a67f290a5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageHeaderEntry.smali
@@ -42,9 +42,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,15 +57,6 @@
     iput-object p3, p0, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->channelName:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
@@ -138,22 +131,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;-><init>(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -171,7 +157,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -181,7 +167,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->text:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -191,7 +177,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->channelName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali
index 31387ea429..1e39237756 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/ReactionsEntry.smali
@@ -14,9 +14,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelMessage;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,15 +27,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/chat/list/entries/ReactionsEntry;->canAddReactions:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/ReactionsEntry;Lcom/discord/models/domain/ModelMessage;ZILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/ReactionsEntry;
@@ -81,22 +74,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelMessage;Z)Lcom/discord/widgets/chat/list/entries/ReactionsEntry;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/ReactionsEntry;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/list/entries/ReactionsEntry;-><init>(Lcom/discord/models/domain/ModelMessage;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -114,7 +100,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/ReactionsEntry;->message:Lcom/discord/models/domain/ModelMessage;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali
index f6b2d4e069..5ea6bd95e0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/SearchResultCountEntry.smali
@@ -12,24 +12,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;->text:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;
@@ -62,22 +55,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -95,7 +81,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/entries/SearchResultCountEntry;->text:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali
index 86e7023d8f..46b69ab9f9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfChatEntry.smali
@@ -20,9 +20,11 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/String;ZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "channelName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,15 +57,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;JLjava/lang/String;ZZILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;
@@ -151,32 +144,25 @@
 .method public final copy(JLjava/lang/String;ZZ)Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;
     .locals 7
 
-    if-eqz p3, :cond_0
+    const-string v0, "channelName"
 
-    new-instance v6, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;
 
-    move-wide v1, p1
+    move-object v1, v0
 
-    move-object v3, p3
+    move-wide v2, p1
 
-    move v4, p4
+    move-object v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;-><init>(JLjava/lang/String;ZZ)V
+    move v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;-><init>(JLjava/lang/String;ZZ)V
 
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -202,7 +188,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->channelName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfPrivateChatEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfPrivateChatEntry.smali
index ba93aeb920..3f603a4045 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfPrivateChatEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/StartOfPrivateChatEntry.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/String;ILjava/lang/String;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "channelName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -59,15 +61,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;JLjava/lang/String;ILjava/lang/String;ZILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;
@@ -172,34 +165,27 @@
 .method public final copy(JLjava/lang/String;ILjava/lang/String;Z)Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;
     .locals 8
 
-    if-eqz p3, :cond_0
+    const-string v0, "channelName"
 
-    new-instance v7, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;
 
-    move-wide v1, p1
+    move-object v1, v0
 
-    move-object v3, p3
+    move-wide v2, p1
 
-    move v4, p4
+    move-object v4, p3
 
-    move-object v5, p5
+    move v5, p4
 
-    move v6, p6
+    move-object v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;-><init>(JLjava/lang/String;ILjava/lang/String;Z)V
+    move v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;-><init>(JLjava/lang/String;ILjava/lang/String;Z)V
 
-    :cond_0
-    const-string p1, "channelName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -225,7 +211,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;->channelName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -241,7 +227,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/StartOfPrivateChatEntry;->channelIcon:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali
index a325fef234..c4a4936569 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/entries/UploadProgressEntry.smali
@@ -16,9 +16,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "messageNonce"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,15 +53,6 @@
     iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "messageNonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;Ljava/lang/String;JILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;
@@ -107,22 +100,15 @@
 .method public final copy(Ljava/lang/String;J)Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "messageNonce"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;-><init>(Ljava/lang/String;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "messageNonce"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +126,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;->messageNonce:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
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 1fe024e4fa..8c8e53e2a6 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
@@ -1121,7 +1121,7 @@
 
     invoke-direct {v1, p0}, Lf/a/o/b/b/b0/h;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1133,17 +1133,17 @@
 
     invoke-direct {v1, v7, v8, v6}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;)V
 
-    new-instance v6, Lr0/l/a/u;
+    new-instance v6, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v6, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v6, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v6}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1163,11 +1163,11 @@
 
     sget-object v1, Lf/a/o/b/b/b0/f;->d:Lf/a/o/b/b/b0/f;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1320,7 +1320,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sget-object v2, Lf/a/b/t0/b;->r:Lkotlin/text/Regex;
+    sget-object v2, Lf/a/b/v0/b;->r:Lkotlin/text/Regex;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
@@ -1332,21 +1332,21 @@
 
     move-result-object v2
 
-    check-cast v2, Lj0/s/i;
+    check-cast v2, Lk0/t/i;
 
-    new-instance v3, Lj0/s/i$a;
+    new-instance v3, Lk0/t/i$a;
 
-    invoke-direct {v3, v2}, Lj0/s/i$a;-><init>(Lj0/s/i;)V
+    invoke-direct {v3, v2}, Lk0/t/i$a;-><init>(Lk0/t/i;)V
 
     :cond_1
     :goto_0
-    invoke-virtual {v3}, Lj0/s/i$a;->hasNext()Z
+    invoke-virtual {v3}, Lk0/t/i$a;->hasNext()Z
 
     move-result v2
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {v3}, Lj0/s/i$a;->next()Ljava/lang/Object;
+    invoke-virtual {v3}, Lk0/t/i$a;->next()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1462,7 +1462,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sget-object v2, Lf/a/b/t0/b;->q:Lkotlin/text/Regex;
+    sget-object v2, Lf/a/b/v0/b;->q:Lkotlin/text/Regex;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
@@ -1474,21 +1474,21 @@
 
     move-result-object v2
 
-    check-cast v2, Lj0/s/i;
+    check-cast v2, Lk0/t/i;
 
-    new-instance v3, Lj0/s/i$a;
+    new-instance v3, Lk0/t/i$a;
 
-    invoke-direct {v3, v2}, Lj0/s/i$a;-><init>(Lj0/s/i;)V
+    invoke-direct {v3, v2}, Lk0/t/i$a;-><init>(Lk0/t/i;)V
 
     :cond_1
     :goto_0
-    invoke-virtual {v3}, Lj0/s/i$a;->hasNext()Z
+    invoke-virtual {v3}, Lk0/t/i$a;->hasNext()Z
 
     move-result v2
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {v3}, Lj0/s/i$a;->next()Ljava/lang/Object;
+    invoke-virtual {v3}, Lk0/t/i$a;->next()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1600,7 +1600,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sget-object v2, Lf/a/b/t0/b;->o:Lkotlin/text/Regex;
+    sget-object v2, Lf/a/b/v0/b;->o:Lkotlin/text/Regex;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
@@ -1612,21 +1612,21 @@
 
     move-result-object v2
 
-    check-cast v2, Lj0/s/i;
+    check-cast v2, Lk0/t/i;
 
-    new-instance v3, Lj0/s/i$a;
+    new-instance v3, Lk0/t/i$a;
 
-    invoke-direct {v3, v2}, Lj0/s/i$a;-><init>(Lj0/s/i;)V
+    invoke-direct {v3, v2}, Lk0/t/i$a;-><init>(Lk0/t/i;)V
 
     :cond_1
     :goto_0
-    invoke-virtual {v3}, Lj0/s/i$a;->hasNext()Z
+    invoke-virtual {v3}, Lk0/t/i$a;->hasNext()Z
 
     move-result v2
 
     if-eqz v2, :cond_3
 
-    invoke-virtual {v3}, Lj0/s/i$a;->next()Ljava/lang/Object;
+    invoke-virtual {v3}, Lk0/t/i$a;->next()Ljava/lang/Object;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali
index 08659012c8..18ad71ba17 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali
@@ -263,9 +263,9 @@
 .method public static c(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
     .locals 10
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     invoke-static {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;->get(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
 
@@ -289,7 +289,7 @@
 
     sget-object v4, Lf/a/o/b/b/b0/b;->d:Lf/a/o/b/b/b0/b;
 
-    invoke-virtual {v3, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v3, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
@@ -383,9 +383,9 @@
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 
@@ -398,9 +398,9 @@
 
     sget-object p0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 
@@ -419,7 +419,7 @@
 
     sget-object v0, Lf/a/o/b/b/b0/i;->d:Lf/a/o/b/b/b0/i;
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -514,7 +514,7 @@
 
     sget-object p1, Lf/a/o/b/b/b0/c;->d:Lf/a/o/b/b/b0/c;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -527,9 +527,9 @@
     :cond_0
     sget-object p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;->ATTACHED:Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 .end method
@@ -593,7 +593,7 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v2}, Lf/a/b/q;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    invoke-static {v1, v3, v2}, Lf/a/b/s;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -601,7 +601,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -633,7 +633,7 @@
 
     invoke-direct {v1, p0, p1}, Lf/a/o/b/b/b0/d;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali
index 465db91568..2318477f72 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListModelTop.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/chat/list/entries/ChatListEntry;",
+        "Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;",
+        ">;"
     }
 .end annotation
 
@@ -64,7 +66,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;-><init>(Lcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali
index 8268448e01..1a08863ae2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListModelTop.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;",
             ">;"
         }
@@ -116,9 +119,9 @@
 
     invoke-direct {p1, v0, v1}, Lcom/discord/widgets/chat/list/entries/SpacerEntry;-><init>(J)V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -128,9 +131,9 @@
 
     invoke-direct {p1}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;-><init>()V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     :goto_1
     move-object p1, v0
@@ -138,7 +141,7 @@
     :goto_2
     sget-object v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1;->INSTANCE:Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali
index 7b3155b184..69adcd876e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatListModelTop.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelChannel;)J
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
     .locals 2
 
     if-eqz p1, :cond_0
@@ -72,21 +74,21 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1;->call(Lcom/discord/models/domain/ModelChannel;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
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 75369e6487..3133b8f1a3 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
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/chat/list/entries/ChatListEntry;",
+        ">;"
     }
 .end annotation
 
@@ -134,7 +139,7 @@
 
     move-object/from16 v4, p2
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -171,6 +176,8 @@
     if-nez v9, :cond_6
 
     :cond_4
+    new-instance v2, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
+
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v11
@@ -189,13 +196,11 @@
     :goto_4
     move-object v13, v1
 
-    new-instance v1, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;
-
-    move-object v7, v1
+    move-object v7, v2
 
     invoke-direct/range {v7 .. v13}, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;-><init>(ZZZJLjava/lang/String;)V
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_6
     iget-object v1, v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2;->$channel:Lcom/discord/models/domain/ModelChannel;
@@ -222,7 +227,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2;->$channel:Lcom/discord/models/domain/ModelChannel;
 
@@ -267,14 +272,17 @@
 
     move-result-object v13
 
-    invoke-static {v13, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v10, v1
 
     invoke-direct/range {v10 .. v15}, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;-><init>(JLjava/lang/String;ZZ)V
 
     :goto_5
-    return-object v1
+    move-object v2, v1
+
+    :goto_6
+    return-object v2
 .end method
 
 .method public 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/list/model/WidgetChatListModelTop$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion.smali
index ef06998fbb..55b8248012 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion.smali
@@ -66,7 +66,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -106,7 +106,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
@@ -118,7 +118,7 @@
 
     sget-object v4, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1;->INSTANCE:Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1;
 
-    invoke-virtual {v2, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -136,7 +136,7 @@
 
     const-string v0, "Observable.combineLatest\u2026      )\n        }\n      }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -156,7 +156,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -176,7 +178,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -186,16 +188,7 @@
 
     const-string v0, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali
index 9f1294cb1e..092c8afafd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop.smali
@@ -35,24 +35,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/chat/list/entries/ChatListEntry;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;->item:Lcom/discord/widgets/chat/list/entries/ChatListEntry;
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/entries/ChatListEntry;ILjava/lang/Object;)Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;
@@ -107,22 +100,15 @@
 .method public final copy(Lcom/discord/widgets/chat/list/entries/ChatListEntry;)Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;-><init>(Lcom/discord/widgets/chat/list/entries/ChatListEntry;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;->item:Lcom/discord/widgets/chat/list/entries/ChatListEntry;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali
index a3cb743da7..a99627a784 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem.smali
@@ -25,9 +25,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelMessageReaction;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "reaction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,15 +38,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;->isSelected:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "reaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;Lcom/discord/models/domain/ModelMessageReaction;ZILjava/lang/Object;)Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;
@@ -92,22 +85,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelMessageReaction;Z)Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "reaction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;-><init>(Lcom/discord/models/domain/ModelMessageReaction;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "reaction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -125,7 +111,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;->reaction:Lcom/discord/models/domain/ModelMessageReaction;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -162,7 +148,7 @@
 
     const-string v1, "reaction.emoji"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
 
@@ -170,7 +156,7 @@
 
     const-string v1, "reaction.emoji.key"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali
index fed0b52761..68eeaed779 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder$onConfigure$1.smali
@@ -77,7 +77,7 @@
 
     const-string p3, "reaction.emoji"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
 
@@ -85,7 +85,7 @@
 
     const-string p3, "reaction.emoji.key"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali
index b279e2bbaf..468479283c 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder.smali
@@ -69,7 +69,9 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01fe
 
@@ -77,7 +79,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0592
+    const v0, 0x7f0a0598
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -85,7 +87,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026ons_emoji_emoji_textview)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
@@ -93,7 +95,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0591
+    const v0, 0x7f0a0597
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -101,7 +103,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026_reactions_emoji_counter)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -109,7 +111,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0593
+    const v0, 0x7f0a0599
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -117,20 +119,11 @@
 
     const-string v0, "itemView.findViewById(R.\u2026emoji_selected_indicator)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;->selectedIndicator:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;)Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter;
@@ -172,7 +165,9 @@
 .method public onConfigure(ILcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiItem;)V
     .locals 4
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -188,11 +183,11 @@
 
     move-result-object v1
 
-    const/4 v2, 0x1
+    sget v2, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;->emojiSizePx:I
 
-    sget v3, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;->emojiSizePx:I
+    const/4 v3, 0x1
 
-    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->renderEmoji(Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;Lcom/discord/models/domain/ModelMessageReaction$Emoji;ZI)V
+    invoke-virtual {p1, v0, v1, v3, v2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$Companion;->renderEmoji(Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;Lcom/discord/models/domain/ModelMessageReaction$Emoji;ZI)V
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter$ReactionEmojiViewHolder;->reactionCounter:Landroid/widget/TextView;
 
@@ -239,15 +234,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.smali
index 27e6ec3807..1cad59cb6e 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.smali
@@ -57,22 +57,15 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -105,7 +98,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -118,7 +111,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -134,15 +129,6 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnEmojiSelectedListener(Lkotlin/jvm/functions/Function1;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModel.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModel.smali
index 4f6430dcdb..9417cf4e90 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModel.smali
@@ -41,11 +41,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "reactionItems"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "userItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,20 +56,6 @@
     iput-object p2, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;->userItems:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "userItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "reactionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;
@@ -144,31 +132,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "reactionItems"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "userItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;-><init>(Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "userItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "reactionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -186,7 +162,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;->reactionItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -196,7 +172,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;->userItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1$1.smali
index 796d3468f3..7c85276e65 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -49,25 +52,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    check-cast p2, Lcom/discord/models/domain/ModelGuild;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1$1;->call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Z
+.method public final call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
     .locals 3
 
     if-eqz p2, :cond_0
@@ -94,5 +79,23 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    check-cast p2, Lcom/discord/models/domain/ModelGuild;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1$1;->call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.smali
index 00b9156fda..00ea335ae6 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ManageReactionsModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lrx/Observable<",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 
     const-string v0, "Observable.combineLatest\u2026ld.mfaLevel\n      )\n    }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$1.smali
index 83950aa5bd..c65944cedf 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$1.smali
@@ -27,7 +27,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessageReaction;",
+        ">;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/Boolean;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessageReaction;",
+        ">;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$1.smali
index ee42871e4c..3717bce904 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$1.smali
@@ -3,7 +3,7 @@
 .source "ManageReactionsModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Lcom/discord/models/domain/ModelMessageReaction$Emoji;",
+        ">;"
     }
 .end annotation
 
@@ -54,7 +56,7 @@
 
     const-string v1, "reactions"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -81,13 +83,13 @@
 
     const-string v4, "it.emoji"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -114,9 +116,9 @@
     :cond_2
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$1;->$reactions:Ljava/util/List;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2$1.smali
index 4110b78c29..567175f6df 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2$1.smali
@@ -3,7 +3,7 @@
 .source "ManageReactionsModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreMessageReactions$EmojiResults;",
+        "Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;",
+        ">;"
     }
 .end annotation
 
@@ -66,11 +68,11 @@
 
     const-string v0, "reactions"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "users"
+    const-string/jumbo v0, "users"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2$1;->$targetedEmoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
@@ -80,7 +82,7 @@
 
     const-string v1, "canManageMessages"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -94,7 +96,7 @@
 
     const-string v1, "me"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2.smali
index 7d76e1aac5..c94565a8d3 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2.smali
@@ -3,7 +3,7 @@
 .source "ManageReactionsModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelMessageReaction$Emoji;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,6 +79,7 @@
             "Lcom/discord/models/domain/ModelMessageReaction$Emoji;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;",
             ">;"
         }
@@ -90,7 +93,7 @@
 
     const-string v1, "targetedEmoji"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;->access$getUsersForReaction(Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;Lcom/discord/models/domain/ModelMessageReaction$Emoji;)Lrx/Observable;
 
@@ -100,7 +103,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2$1;-><init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2;Lcom/discord/models/domain/ModelMessageReaction$Emoji;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2.smali
index b3aeb1c6d7..799b47f90c 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2.smali
@@ -3,7 +3,7 @@
 .source "ManageReactionsModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,19 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/Boolean;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessageReaction;",
+        ">;>;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -100,9 +109,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -123,7 +132,7 @@
 
     invoke-direct {v2, p1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$1;-><init>(Ljava/util/List;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -131,7 +140,7 @@
 
     invoke-direct {v2, p0, p1, v0}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2$2;-><init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2;Ljava/util/List;Ljava/lang/Boolean;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.smali
index 1f52a9467f..0c8420e65a 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.smali
@@ -3,7 +3,7 @@
 .source "ManageReactionsModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,6 +79,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     const-string v1, "me"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
@@ -108,7 +111,7 @@
 
     invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2$2;-><init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2;Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.smali
index be6042059e..e115278583 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.smali
@@ -3,7 +3,7 @@
 .source "ManageReactionsModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelMessage;",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/models/domain/ModelMessageReaction;",
+        ">;>;"
     }
 .end annotation
 
@@ -94,7 +99,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2$$special$$inlined$sortedByDescending$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2$$special$$inlined$sortedByDescending$1.smali
index b59cda196c..858ae77742 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2$$special$$inlined$sortedByDescending$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2$$special$$inlined$sortedByDescending$1.smali
@@ -51,7 +51,7 @@
 
     const-string v0, "reaction"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessageReaction;->getCount()I
 
@@ -63,7 +63,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelMessageReaction;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction;->getCount()I
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2.smali
index 5c3d6e55fa..79ee60c889 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2.smali
@@ -3,7 +3,7 @@
 .source "ManageReactionsModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/models/domain/ModelMessageReaction;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelMessageReaction;",
+        ">;>;"
     }
 .end annotation
 
@@ -76,6 +84,7 @@
             "(",
             "Ljava/util/Map<",
             "Ljava/lang/String;",
+            "+",
             "Lcom/discord/models/domain/ModelMessageReaction;",
             ">;)",
             "Ljava/util/List<",
@@ -84,8 +93,6 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
-
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
     move-result-object p1
@@ -94,18 +101,9 @@
 
     invoke-direct {v0}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2$$special$$inlined$sortedByDescending$1;-><init>()V
 
-    invoke-static {p1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "reactions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.smali
index a0cf1e774a..ef156858f9 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.smali
@@ -143,7 +143,7 @@
 
     move-object/from16 v7, p3
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -170,7 +170,7 @@
 
     const-string v4, "results.users.values"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v4, Ljava/util/ArrayList;
 
@@ -203,9 +203,9 @@
 
     new-instance v5, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;
 
-    const-string v6, "user"
+    const-string/jumbo v6, "user"
 
-    invoke-static {v7, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v8, v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;->channelId:J
 
@@ -250,7 +250,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v4}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v4}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
@@ -386,19 +386,19 @@
 
     sget-object v2, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1;->INSTANCE:Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     sget-object v2, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2;->INSTANCE:Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$2;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "StoreStream\n        .get\u2026ion -> reaction.count } }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -414,13 +414,13 @@
 
     invoke-direct {v3, p0, v0, v1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2;-><init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1;Lrx/Observable;)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n        .get\u2026              }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -432,7 +432,7 @@
 
     const-string v1, "StoreStream\n        .get\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -456,22 +456,15 @@
 .method public final onEmojiTargeted(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojiKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;->targetedEmojiKeySubject:Lrx/subjects/SerializedSubject;
 
-    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emojiKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorItem.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorItem.smali
index f527710e93..39e7f07d64 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorItem.smali
@@ -27,9 +27,11 @@
 
 # direct methods
 .method public constructor <init>(JJLcom/discord/models/domain/ModelMessageReaction$Emoji;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p5, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,15 +42,6 @@
     iput-object p5, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorItem;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali
index 072f7a35df..542a898539 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder$onConfigure$1.smali
@@ -66,11 +66,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.chat.managereactions.ManageReactionsResultsAdapter.ErrorItem"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali
index 67f45c7278..2b2c6d171b 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder.smali
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01ff
 
@@ -39,7 +41,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0595
+    const v0, 0x7f0a059b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,22 +49,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026actions_result_error_img)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ErrorViewHolder;->errorImage:Landroid/widget/ImageView;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -70,7 +63,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -83,15 +78,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali
index 97589af186..a7dd711ab4 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$LoadingViewHolder.smali
@@ -27,20 +27,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0200
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem.smali
index d424f651bf..28a427efaa 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem.smali
@@ -33,11 +33,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,20 +54,6 @@
     iput-boolean p7, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;->canDelete:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;ZILjava/lang/Object;)Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;
@@ -178,43 +166,31 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;Z)Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p6, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emoji"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-wide v3, p2
 
     move-wide v5, p4
 
-    move-object v7, p6
-
     move/from16 v8, p7
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;-><init>(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelMessageReaction$Emoji;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "emoji"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -232,7 +208,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -258,7 +234,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserItem;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali
index d9e5ec9d72..1541be3cb3 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali
@@ -35,7 +35,9 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0201
 
@@ -43,7 +45,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0599
+    const v0, 0x7f0a059f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -51,7 +53,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026actions_result_user_name)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -59,7 +61,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0598
+    const v0, 0x7f0a059e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +69,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026tions_result_user_avatar)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -75,7 +77,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0597
+    const v0, 0x7f0a059d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -83,20 +85,11 @@
 
     const-string v0, "itemView.findViewById(R.\u2026s_result_remove_reaction)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder;->removeButton:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -104,7 +97,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 9
 
-    if-eqz p2, :cond_2
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -176,15 +171,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.smali
index 531b36077d..ae55645ac2 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.smali
@@ -51,22 +51,15 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -82,7 +75,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -95,7 +88,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_2
 
@@ -134,13 +129,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$Companion.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$Companion.smali
index 7805ba29af..9602433e77 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$Companion.smali
@@ -59,19 +59,19 @@
 
 # virtual methods
 .method public final create(JJLandroid/content/Context;Lcom/discord/models/domain/ModelMessageReaction;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p5, :cond_1
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Landroid/content/Intent;
+    new-instance v0, Landroid/content/Intent;
 
-    invoke-direct {v1}, Landroid/content/Intent;-><init>()V
+    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
 
-    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-virtual {v1, v2, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+    invoke-virtual {v0, v1, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
 
     move-result-object p1
 
@@ -91,29 +91,27 @@
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getKey()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p2
+
+    goto :goto_0
 
     :cond_0
-    const-string p2, "com.discord.intent.extra.EXTRA_EMOJI_KEY"
+    const/4 p2, 0x0
 
-    invoke-virtual {p1, p2, v0}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
+    :goto_0
+    const-string p3, "com.discord.intent.extra.EXTRA_EMOJI_KEY"
+
+    invoke-virtual {p1, p3, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
     move-result-object p1
 
     const-string p2, "Intent()\n          .putE\u2026etedReaction?.emoji?.key)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
 
-    invoke-static {p5, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p5, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$1.smali
index efbb6a400b..66e018454a 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$1.smali
@@ -1,13 +1,25 @@
 .class public final synthetic Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$1;
-.super Lj0/n/c/j;
+.super Lk0/o/c/l;
 .source "WidgetManageReactions.kt"
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;)V
-    .locals 0
+    .locals 6
 
-    invoke-direct {p0, p1}, Lj0/n/c/j;-><init>(Ljava/lang/Object;)V
+    const-class v2, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
+
+    const-string v3, "modelProvider"
+
+    const-string v4, "getModelProvider()Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/l;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
@@ -17,7 +29,7 @@
 .method public get()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
 
@@ -28,38 +40,10 @@
     return-object v0
 .end method
 
-.method public getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "modelProvider"
-
-    return-object v0
-.end method
-
-.method public getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getModelProvider()Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;"
-
-    return-object v0
-.end method
-
 .method public set(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2.smali
index 8aa4aedd4e..f8df5302e6 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetManageReactions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onEmojiTargeted"
+
+    const-string v5, "onEmojiTargeted(Ljava/lang/String;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onEmojiTargeted"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onEmojiTargeted(Ljava/lang/String;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;->onEmojiTargeted(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBoundOrOnResume$1.smali
index 826e5bfa61..21c9fba975 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetManageReactions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/managereactions/ManageReactionsModel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
index b3e5c0888c..daecf05a80 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
@@ -39,41 +39,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
 
-    const-class v2, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
+    const-string v2, "emojisRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojisRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "emojisRecycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEmojisRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "usersRecycler"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "usersRecycler"
-
-    const-string v4, "getUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -97,7 +85,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0594
+    const v0, 0x7f0a059a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -105,7 +93,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->emojisRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a059a
+    const v0, 0x7f0a05a0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -136,7 +124,7 @@
     :cond_0
     const-string p0, "modelProvider"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -195,14 +183,14 @@
     :cond_2
     const-string p1, "resultsAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_3
     const-string p1, "emojisAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -288,7 +276,7 @@
 
     invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f121306
+    const p1, 0x7f121330
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -296,11 +284,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -312,54 +300,54 @@
 
     move-result-object p1
 
-    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v0, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v1, 0x0
 
-    invoke-virtual {p1, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    move-result-wide v5
+    move-result-wide v4
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p1
 
-    const-string v1, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
+    const-string v0, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
 
-    invoke-virtual {p1, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    move-result-wide v7
+    move-result-wide v6
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object p1
 
-    const-string v1, "com.discord.intent.extra.EXTRA_EMOJI_KEY"
+    const-string v0, "com.discord.intent.extra.EXTRA_EMOJI_KEY"
 
-    invoke-virtual {p1, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v8
 
     new-instance p1, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;
 
-    move-object v4, p1
+    move-object v3, p1
 
-    invoke-direct/range {v4 .. v9}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;-><init>(JJLjava/lang/String;)V
+    invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;-><init>(JJLjava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->modelProvider:Lcom/discord/widgets/chat/managereactions/ManageReactionsModelProvider;
 
     :cond_0
     sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v1, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter;
+    new-instance v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->getEmojisRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -369,15 +357,15 @@
 
     sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v1, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter;
+    new-instance v0, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->getUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -387,6 +375,8 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->emojisAdapter:Lcom/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter;
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_2
 
     new-instance v1, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions$onViewBound$2;
@@ -404,21 +394,14 @@
     :cond_1
     const-string p1, "modelProvider"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_2
     const-string p1, "emojisAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -469,7 +452,7 @@
     :cond_0
     const-string v0, "modelProvider"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali
index c2f3beb09e..dc696852aa 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1.smali
@@ -27,7 +27,13 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;",
+        ">;"
     }
 .end annotation
 
@@ -67,7 +73,7 @@
 
     const-string v1, "typingUsers"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1$1;->this$0:Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1;
 
@@ -79,7 +85,7 @@
 
     const-string v2, "cooldownSecs"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1.smali
index 9039d7c0ba..4fdb0668f7 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "ChatTypingModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/overlay/ChatTypingModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,19 +81,13 @@
 
     move-result p1
 
-    const/4 v0, 0x0
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->compare(II)I
-
-    move-result p1
-
     if-lez p1, :cond_0
 
     sget-object p1, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Hide;->INSTANCE:Lcom/discord/widgets/chat/overlay/ChatTypingModel$Hide;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.smali
index 54be485bd1..32d9f64c73 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "ChatTypingModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/overlay/ChatTypingModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -89,9 +91,9 @@
 
     sget-object p1, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Hide;->INSTANCE:Lcom/discord/widgets/chat/overlay/ChatTypingModel$Hide;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -102,7 +104,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -116,7 +118,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali
index 18e3fbcc2a..ce84e651ac 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali
@@ -3,7 +3,7 @@
 .source "ChatTypingModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TU;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "[",
+        "Ljava/lang/Object;",
+        ">;"
     }
 .end annotation
 
@@ -98,7 +101,7 @@
 
     const-string v3, "guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     aput-object v2, v1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1$1.smali
index 095bfddaa5..77111a198f 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1$1.smali
@@ -27,7 +27,20 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -125,7 +138,7 @@
 
     check-cast v1, Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v1, p2}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v1, p2}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.smali
index 20a1ebb1d4..a9b15bd5e7 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.smali
@@ -3,7 +3,7 @@
 .source "ChatTypingModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -70,6 +77,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Ljava/lang/String;",
             ">;>;"
@@ -82,9 +90,9 @@
 
     move-result-object v0
 
-    const-string v1, "userIds"
+    const-string/jumbo v1, "userIds"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->observeUsers(Ljava/util/Collection;)Lrx/Observable;
 
@@ -104,7 +112,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$2.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$2.smali
index c77416cd46..3d82640a04 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$2.smali
@@ -3,7 +3,7 @@
 .source "ChatTypingModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/String;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,7 +92,7 @@
 
     const-string v0, "names"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -124,7 +131,7 @@
     :cond_1
     const/4 p1, 0x4
 
-    invoke-static {v0, p1}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v0, p1}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion.smali
index 50d141b70d..d1f9925ba9 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion.smali
@@ -64,15 +64,15 @@
 
     sget-object v1, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1;->INSTANCE:Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1;
 
-    new-instance v2, Lr0/l/a/x0;
+    new-instance v2, Ls0/l/a/x0;
 
-    invoke-direct {v2, v1}, Lr0/l/a/x0;-><init>(Lr0/k/b;)V
+    invoke-direct {v2, v1}, Ls0/l/a/x0;-><init>(Ls0/k/b;)V
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, v0, v2}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, v0, v2}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -80,7 +80,7 @@
 
     const-string v1, "StoreStream\n        .get\u2026?: emptyArray()\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -117,13 +117,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$2;->INSTANCE:Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -133,7 +133,7 @@
 
     const-string v0, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -157,7 +157,7 @@
 
     sget-object v1, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1;->INSTANCE:Lcom/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 
     const-string v1, "getTarget()\n          .s\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali
index 9f5f89e285..b5a4e0985b 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Typing.smali
@@ -42,9 +42,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "typingUsers"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/chat/overlay/ChatTypingModel;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -55,13 +57,6 @@
     iput p3, p0, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;->cooldownSecs:I
 
     return-void
-
-    :cond_0
-    const-string p1, "typingUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;Ljava/util/List;IIILjava/lang/Object;)Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;
@@ -141,22 +136,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "typingUsers"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;-><init>(Ljava/util/List;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "typingUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -174,7 +162,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;->typingUsers:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$1.smali
index 32d3448064..3bd4c08edc 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatOverlay.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel;",
+        ">;"
     }
 .end annotation
 
@@ -56,7 +58,7 @@
 
     const-string v2, "selectedChannelId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -64,7 +66,7 @@
 
     const-string v3, "isViewingOldMessages"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1.smali
index 493a0d6afd..6bd7814ca3 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatOverlay.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/stores/StoreChat$InteractionState;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,23 +49,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreChat$InteractionState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1;->call(Lcom/discord/stores/StoreChat$InteractionState;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Z
+.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Ljava/lang/Boolean;
     .locals 5
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
@@ -106,5 +90,21 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreChat$InteractionState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1;->call(Lcom/discord/stores/StoreChat$InteractionState;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.smali
index b791a2a34f..41e2695119 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/stores/StoreChat$InteractionState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,30 +62,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    check-cast p2, Lcom/discord/stores/StoreChat$InteractionState;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2;->call(Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;)Z
+.method public final call(Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;)Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "isDetached"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -114,5 +99,23 @@
     const/4 p1, 0x1
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    check-cast p2, Lcom/discord/stores/StoreChat$InteractionState;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2;->call(Ljava/lang/Boolean;Lcom/discord/stores/StoreChat$InteractionState;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.smali
index 07341bc686..563d238f82 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetChatOverlay.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel;",
             ">;"
         }
@@ -96,9 +99,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -111,7 +114,7 @@
 
     const-string v1, "selectedChannelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -135,7 +138,7 @@
 
     invoke-direct {v2, p1}, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -156,9 +159,9 @@
     :goto_0
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     invoke-static {v2, v1}, Lrx/Observable;->m(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
@@ -172,7 +175,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1$1;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion.smali
index 27829b28fd..0fc615c63f 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion.smali
@@ -60,13 +60,13 @@
 
     sget-object v1, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1;->INSTANCE:Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n            \u2026          }\n            }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali
index ecc135d69f..16ccd3d2f7 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali
@@ -30,13 +30,15 @@
 .method public constructor <init>(Landroid/view/ViewGroup;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder;->parent:Landroid/view/ViewGroup;
 
-    const v0, 0x7f0a025a
+    const v0, 0x7f0a025d
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -44,7 +46,7 @@
 
     const-string v0, "parent.findViewById(R.id.chat_typing_users_typing)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -52,7 +54,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder;->parent:Landroid/view/ViewGroup;
 
-    const v0, 0x7f0a0257
+    const v0, 0x7f0a025a
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -60,7 +62,7 @@
 
     const-string v0, "parent.findViewById(R.id.chat_overlay_typing_dots)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/typing/TypingDots;
 
@@ -68,7 +70,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder;->parent:Landroid/view/ViewGroup;
 
-    const v0, 0x7f0a0258
+    const v0, 0x7f0a025b
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -76,7 +78,7 @@
 
     const-string v0, "parent.findViewById(R.id\u2026at_typing_users_slowmode)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -84,7 +86,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder;->parent:Landroid/view/ViewGroup;
 
-    const v0, 0x7f0a0259
+    const v0, 0x7f0a025c
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -92,22 +94,13 @@
 
     const-string v0, "parent.findViewById(R.id\u2026ping_users_slowmode_icon)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
     iput-object p1, p0, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder;->slowmodeIcon:Landroid/widget/ImageView;
 
     return-void
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final configureTyping(Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;)V
@@ -156,7 +149,7 @@
 
     const-string v3, "parent.resources"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Typing;->getTypingUsers()Ljava/util/List;
 
@@ -174,7 +167,7 @@
 
     move-result v4
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v5
 
@@ -304,7 +297,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120412
+    const p2, 0x7f120413
 
     invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -312,7 +305,7 @@
 
     const-string p2, "parent.resources.getStri\u2026nnel_slowmode_desc_short)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -358,7 +351,7 @@
 
     if-eq v0, v5, :cond_0
 
-    const p2, 0x7f121486
+    const p2, 0x7f1214b0
 
     invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -366,12 +359,12 @@
 
     const-string p2, "resources.getString(R.string.several_users_typing)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1215ca
+    const v0, 0x7f1215f4
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -379,7 +372,7 @@
 
     const-string v0, "resources.getString(R.string.three_users_typing)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v5, [Ljava/lang/Object;
 
@@ -408,7 +401,7 @@
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f121644
+    const v0, 0x7f12166e
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -416,7 +409,7 @@
 
     const-string v0, "resources.getString(R.string.two_users_typing)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -439,7 +432,7 @@
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f12107f    # 1.9415294E38f
+    const v0, 0x7f1210a9
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -447,7 +440,7 @@
 
     const-string v0, "resources.getString(R.string.one_user_typing)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -475,7 +468,9 @@
 .method public final configureUI(Lcom/discord/widgets/chat/overlay/ChatTypingModel;)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "model"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/widgets/chat/overlay/ChatTypingModel$Hide;
 
@@ -501,15 +496,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getParent()Landroid/view/ViewGroup;
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$2.smali
index b28638aa24..5fd5e79c6d 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatOverlay.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$3.smali
index 05bed7a3fa..942013cbde 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$onViewBoundOrOnResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChatOverlay.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/chat/overlay/ChatTypingModel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder;->configureUI(Lcom/discord/widgets/chat/overlay/ChatTypingModel;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay.smali
index c5fa5ea3a8..c10eed08e3 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay.smali
@@ -32,41 +32,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay;
 
-    const-class v2, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay;
+    const-string v2, "jumpToPresentFab"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getJumpToPresentFab()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "jumpToPresentFab"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getJumpToPresentFab()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay;
 
-    const/4 v2, 0x0
+    const-string v2, "typingContainer"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTypingContainer()Landroid/view/ViewGroup;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "typingContainer"
-
-    const-string v4, "getTypingContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -82,7 +70,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0255
+    const v0, 0x7f0a0258
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -90,7 +78,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/overlay/WidgetChatOverlay;->jumpToPresentFab$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0256
+    const v0, 0x7f0a0259
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -123,7 +111,7 @@
     :cond_0
     const-string p0, "typingIndicatorViewHolder"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -223,7 +211,7 @@
 
     const-string v1, "OldMessageModel.get()\n  \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -273,7 +261,7 @@
 
     const-string v3, "ChatTypingModel\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
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 b9a2f381de..52728d6aa9 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
@@ -105,9 +105,9 @@
 
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 
@@ -324,12 +324,12 @@
 
     if-eqz v1, :cond_3
 
-    const v1, 0x7f120f9c
+    const v1, 0x7f120fc6
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f120f9b
+    const v1, 0x7f120fc5
 
     :goto_1
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -512,7 +512,7 @@
 
     invoke-direct {v1, p1, p2, p0}, Lf/a/o/b/c/b;-><init>(JLandroid/content/Context;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali
index 91356fe07f..2c672a2b00 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$PinsAdapterEventHandler.smali
@@ -139,7 +139,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/b/k;->a(Landroid/content/Context;)V
+    invoke-static {p1}, Lf/a/b/m;->a(Landroid/content/Context;)V
 
     return-void
 .end method
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 7e90e3ea9e..48b7cb4afe 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
@@ -118,7 +118,7 @@
 
     const-class p2, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -172,7 +172,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a018c
+    const v0, 0x7f0a018f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -184,7 +184,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f12113a
+    const p1, 0x7f121165
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -230,7 +230,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -244,7 +244,7 @@
 
     const-class v2, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
index 4aacb93e10..605a1c8596 100644
--- a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
+++ b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
@@ -45,7 +45,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p0, v0, v1, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p0, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
-    const p2, 0x7f0a026f
+    const p2, 0x7f0a0272
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali
index a68211db24..f93e7b7708 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$1.smali
@@ -60,11 +60,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$1;->$recycler:Landroidx/recyclerview/widget/RecyclerView;
 
@@ -92,25 +94,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type androidx.recyclerview.widget.LinearLayoutManager"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_2
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali
index bb7a4c4643..da46f70ac2 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item$1.smali
@@ -55,11 +55,11 @@
 .method public final call(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/app/AppLog$LoggedItem;)V
     .locals 1
 
-    const-string p2, "view"
+    const-string/jumbo p2, "view"
 
-    const-string p3, "view.context"
+    const-string/jumbo p3, "view.context"
 
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
@@ -75,13 +75,13 @@
 
     const-string p3, "message.text"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x0
 
     const/4 v0, 0x4
 
-    invoke-static {p1, p2, p3, v0}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, p2, p3, v0}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item.smali
index 64d989be06..555de1863a 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item;
+    const-string v2, "message"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMessage()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "message"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getMessage()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -65,17 +59,19 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/debugging/WidgetDebugging$Adapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a02bc
+    const p1, 0x7f0a02bf
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -94,15 +90,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getMessage$p(Lcom/discord/widgets/debugging/WidgetDebugging$Adapter$Item;)Landroid/widget/TextView;
@@ -212,7 +199,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -230,7 +219,7 @@
 
     const-string v1, "message.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v1, p2, Lcom/discord/app/AppLog$LoggedItem;->e:I
 
@@ -278,7 +267,7 @@
     const-string p2, ""
 
     :goto_0
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -303,15 +292,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali
index c632f4d095..314a9fec12 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter.smali
@@ -32,7 +32,9 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -43,15 +45,6 @@
     invoke-virtual {p0, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setOnUpdated(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -67,7 +60,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -80,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -98,13 +93,4 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali
index 72250f5d05..0c22740945 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Companion.smali
@@ -156,7 +156,7 @@
 
     const-string v0, "Intent(Intent.ACTION_SEN\u2026TRA_TEXT, log.toString())"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -166,22 +166,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/debugging/WidgetDebugging;
+    const-class v0, Lcom/discord/widgets/debugging/WidgetDebugging;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali
index d5d757ffe4..2b58eca88d 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Model.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/List;Z)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -40,7 +40,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "logs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,15 +51,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/debugging/WidgetDebugging$Model;->isFiltered:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "logs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/debugging/WidgetDebugging$Model;Ljava/util/List;ZILjava/lang/Object;)Lcom/discord/widgets/debugging/WidgetDebugging$Model;
@@ -122,22 +115,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "logs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/debugging/WidgetDebugging$Model;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/debugging/WidgetDebugging$Model;-><init>(Ljava/util/List;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "logs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -155,7 +141,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/debugging/WidgetDebugging$Model;->logs:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.smali
index 080abdede2..d63947c237 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.smali
@@ -58,7 +58,7 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -112,7 +112,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05bd
+    .packed-switch 0x7f0a05c3
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.smali
index 53731efda6..60c0381c24 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.smali
@@ -49,7 +49,7 @@
 .method public final call(Landroid/view/Menu;)V
     .locals 1
 
-    const v0, 0x7f0a05bd
+    const v0, 0x7f0a05c3
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -57,7 +57,7 @@
 
     const-string v0, "menu.findItem(R.id.menu_debugging_filter)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/debugging/WidgetDebugging$configureUI$2;->$model:Lcom/discord/widgets/debugging/WidgetDebugging$Model;
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali
index a8f1376767..176098144e 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetDebugging.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/app/AppLog$LoggedItem;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/app/AppLog$LoggedItem;",
+        ">;>;"
     }
 .end annotation
 
@@ -85,7 +92,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->asReversed(Ljava/util/List;)Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali
index cf12b63a6b..2fc22bffc6 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$2.smali
@@ -27,7 +27,13 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/app/AppLog$LoggedItem;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/debugging/WidgetDebugging$Model;",
+        ">;"
     }
 .end annotation
 
@@ -75,7 +81,7 @@
 
     const-string v0, "isFiltered"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -85,7 +91,7 @@
 
     const-string v0, "logs"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -139,7 +145,7 @@
 
     const-string v1, "filteredLogs"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3.smali
index a11d27ad85..7446184161 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetDebugging.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/debugging/WidgetDebugging$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/debugging/WidgetDebugging;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/debugging/WidgetDebugging;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/debugging/WidgetDebugging$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/debugging/WidgetDebugging;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/debugging/WidgetDebugging$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/debugging/WidgetDebugging$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/debugging/WidgetDebugging;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging;->access$configureUI(Lcom/discord/widgets/debugging/WidgetDebugging;Lcom/discord/widgets/debugging/WidgetDebugging$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali
index 43789d1023..a9777fe602 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetDebugging.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/List<",
         "Lcom/discord/app/AppLog$LoggedItem;",
         ">;",
@@ -61,15 +61,28 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Ljava/util/List;)Ljava/lang/Boolean;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/app/AppLog$LoggedItem;",
+            ">;)",
+            "Ljava/lang/Boolean;"
+        }
+    .end annotation
 
-    check-cast p1, Ljava/util/List;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1;->call(Ljava/util/List;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
     move-result p1
 
+    xor-int/lit8 p1, p1, 0x1
+
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -77,26 +90,14 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/util/List;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Lcom/discord/app/AppLog$LoggedItem;",
-            ">;)Z"
-        }
-    .end annotation
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "it"
+    check-cast p1, Ljava/util/List;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1;->call(Ljava/util/List;)Ljava/lang/Boolean;
 
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+    move-result-object p1
 
-    move-result p1
-
-    xor-int/lit8 p1, p1, 0x1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali
index bce6ab51e9..a63aa42261 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2.smali
@@ -27,7 +27,17 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TR;TT;TR;>;"
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/app/AppLog$LoggedItem;",
+        ">;",
+        "Ljava/util/List<",
+        "Lcom/discord/app/AppLog$LoggedItem;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/app/AppLog$LoggedItem;",
+        ">;>;"
     }
 .end annotation
 
@@ -92,11 +102,11 @@
 
     const-string v0, "existingLogs"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "newLogs"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -124,7 +134,7 @@
 
     iget-object v2, v2, Lcom/discord/app/AppLog$LoggedItem;->f:Ljava/lang/String;
 
-    invoke-static {v2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -137,7 +147,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {p1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
index 080da89404..63e644cc31 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
@@ -45,25 +45,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetDebugging;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetDebugging;
+    const-string v2, "recycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "recycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/debugging/WidgetDebugging;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -83,7 +77,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a02bd
+    const v0, 0x7f0a02c0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,25 +182,25 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v1, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter;
+    new-instance v0, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/debugging/WidgetDebugging;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/debugging/WidgetDebugging$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -226,37 +220,32 @@
 
     check-cast p1, Landroidx/recyclerview/widget/LinearLayoutManager;
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->setReverseLayout(Z)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->setReverseLayout(Z)V
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->setSmoothScrollbarEnabled(Z)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->setSmoothScrollbarEnabled(Z)V
 
     const/4 p1, 0x0
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    const p1, 0x7f12055d
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f12055f
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type androidx.recyclerview.widget.LinearLayoutManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -276,7 +265,7 @@
 
     const-string v1, "logsSubject\n          .c\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -288,7 +277,7 @@
 
     sget-object v1, Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1;->INSTANCE:Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -298,15 +287,15 @@
 
     sget-object v2, Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2;->INSTANCE:Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$aggregatedLogs$2;
 
-    new-instance v3, Lr0/l/a/r1;
+    new-instance v3, Ls0/l/a/r1;
 
-    invoke-direct {v3, v1, v2}, Lr0/l/a/r1;-><init>(Ljava/lang/Object;Lrx/functions/Func2;)V
+    invoke-direct {v3, v1, v2}, Ls0/l/a/r1;-><init>(Ljava/lang/Object;Lrx/functions/Func2;)V
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, v0, v3}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, v0, v3}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -314,11 +303,11 @@
 
     const-string v1, "AppLog\n        .getLogs(\u2026.isNotBlank() }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1;->INSTANCE:Lcom/discord/widgets/debugging/WidgetDebugging$onViewBoundOrOnResume$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -336,7 +325,7 @@
 
     const-string v1, "Observable\n        .comb\u2026gs, isFiltered)\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
index 955167c8ad..e6e06663c9 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash$Companion.smali
@@ -97,7 +97,7 @@
 
     const-string v0, "Intent().putExtras(extras)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -107,13 +107,17 @@
 .method public final launch(Landroid/content/Context;Ljava/lang/Throwable;Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "throwable"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "crashSource"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -125,7 +129,7 @@
 
     const-string v0, "WidgetFatalCrash::class.java.simpleName"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Ljava/lang/Throwable;
 
@@ -145,28 +149,7 @@
 
     move-result-object p3
 
-    invoke-static {p1, p2, p3}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, p3}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "crashSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "throwable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 4fac06afcf..0a73d267e2 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -43,121 +43,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetFatalCrash;
+    const-string v2, "inviteText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "inviteText"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getInviteText()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
-    const/4 v2, 0x0
+    const-string v2, "crashSourceText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCrashSourceText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetFatalCrash;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "crashSourceText"
-
-    const-string v4, "getCrashSourceText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetFatalCrash;
+    const-string v2, "crashTimeText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCrashTimeText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "crashTimeText"
-
-    const-string v4, "getCrashTimeText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetFatalCrash;
+    const-string v2, "appVersionText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAppVersionText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "appVersionText"
-
-    const-string v4, "getAppVersionText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetFatalCrash;
+    const-string v2, "osVersionText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOsVersionText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "osVersionText"
-
-    const-string v4, "getOsVersionText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/debugging/WidgetFatalCrash;
 
-    const-class v2, Lcom/discord/widgets/debugging/WidgetFatalCrash;
+    const-string v2, "deviceText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeviceText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "deviceText"
-
-    const-string v4, "getDeviceText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -181,7 +145,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a038e
+    const v0, 0x7f0a0394
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +153,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->inviteText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a038d
+    const v0, 0x7f0a0393
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +161,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->crashSourceText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a038f
+    const v0, 0x7f0a0395
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +169,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->crashTimeText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0389
+    const v0, 0x7f0a038f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->appVersionText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a038c
+    const v0, 0x7f0a0392
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/debugging/WidgetFatalCrash;->osVersionText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a038b
+    const v0, 0x7f0a0391
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -373,11 +337,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -385,19 +349,19 @@
 
     move-result-object p1
 
-    const v1, 0x7f1204ef
+    const/4 v0, 0x1
 
-    const/4 v2, 0x1
+    new-array v1, v0, [Ljava/lang/Object;
 
-    new-array v3, v2, [Ljava/lang/Object;
+    const-string v2, "https://discord.gg/discord-testers"
 
-    const-string v4, "https://discord.gg/discord-testers"
+    const/4 v3, 0x0
 
-    const/4 v5, 0x0
+    aput-object v2, v1, v3
 
-    aput-object v4, v3, v5
+    const v2, 0x7f1204f1
 
-    invoke-virtual {p0, v1, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -415,58 +379,60 @@
 
     move-result-object v1
 
-    const v3, 0x7f1204ee
+    new-array v2, v0, [Ljava/lang/Object;
 
-    new-array v4, v2, [Ljava/lang/Object;
+    const/4 v4, 0x0
 
     if-eqz p1, :cond_0
 
-    const v6, 0x7f1214e1
+    const v5, 0x7f12150b
 
-    invoke-virtual {p0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v5
 
-    const-string v7, "INTENT_EXTRA_CRASH_SOURCE"
+    const-string v6, "INTENT_EXTRA_CRASH_SOURCE"
 
-    invoke-virtual {p1, v7, v6}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v6, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v5
 
     goto :goto_0
 
     :cond_0
-    move-object v6, v0
+    move-object v5, v4
 
     :goto_0
-    aput-object v6, v4, v5
+    aput-object v5, v2, v3
 
-    invoke-virtual {p0, v3, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const v5, 0x7f1204f0
 
-    move-result-object v3
+    invoke-virtual {p0, v5, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getCrashTimeText()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const v3, 0x7f1204f0
+    const v2, 0x7f1204f2
 
-    new-array v4, v2, [Ljava/lang/Object;
+    new-array v5, v0, [Ljava/lang/Object;
 
     if-eqz p1, :cond_1
 
-    const-string v0, "INTENT_EXTRA_CRASH_TIME"
+    const-string v4, "INTENT_EXTRA_CRASH_TIME"
 
-    invoke-virtual {p1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v4}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v4
 
     :cond_1
-    aput-object v0, v4, v5
+    aput-object v4, v5, v3
 
-    invoke-virtual {p0, v3, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v2, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -476,84 +442,77 @@
 
     move-result-object p1
 
-    const v0, 0x7f1204e9
+    const v1, 0x7f1204eb
 
-    new-array v1, v2, [Ljava/lang/Object;
+    new-array v2, v0, [Ljava/lang/Object;
 
-    const-string v3, "38.0"
+    const-string v4, "38.1"
 
-    aput-object v3, v1, v5
+    aput-object v4, v2, v3
 
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getOsVersionText()Landroid/widget/TextView;
 
     move-result-object p1
 
-    const v0, 0x7f1204ec
+    const v1, 0x7f1204ee
 
-    new-array v1, v2, [Ljava/lang/Object;
+    new-array v2, v0, [Ljava/lang/Object;
 
-    sget v3, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v4, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v4}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v4
 
-    aput-object v3, v1, v5
+    aput-object v4, v2, v3
 
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getDeviceText()Landroid/widget/TextView;
 
     move-result-object p1
 
-    const v0, 0x7f1204eb
+    const v1, 0x7f1204ed
 
-    new-array v1, v2, [Ljava/lang/Object;
+    new-array v0, v0, [Ljava/lang/Object;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v3, Landroid/os/Build;->MODEL:Ljava/lang/String;
+    sget-object v4, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/16 v3, 0x20
+    const/16 v4, 0x20
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget-object v3, Landroid/os/Build;->PRODUCT:Ljava/lang/String;
+    sget-object v4, Landroid/os/Build;->PRODUCT:Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v2
 
-    aput-object v2, v1, v5
+    aput-object v2, v0, v3
 
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/CallFeedbackSheetViewModelProvider.smali b/com.discord/smali/com/discord/widgets/feedback/CallFeedbackSheetViewModelProvider.smali
index 4c29ebb23b..8e059032a9 100644
--- a/com.discord/smali/com/discord/widgets/feedback/CallFeedbackSheetViewModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/CallFeedbackSheetViewModelProvider.smali
@@ -12,24 +12,17 @@
 
 # direct methods
 .method public constructor <init>(Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "args"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/feedback/CallFeedbackSheetViewModelProvider;->args:Landroid/os/Bundle;
 
     return-void
-
-    :cond_0
-    const-string p1, "args"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -37,7 +30,9 @@
 .method public get(Lcom/discord/widgets/feedback/WidgetFeedbackSheet;)Lcom/discord/widgets/feedback/FeedbackSheetViewModel;
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "sheet"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/feedback/CallFeedbackSheetViewModelProvider;->args:Landroid/os/Bundle;
 
@@ -53,7 +48,7 @@
 
     const-string v1, "args.getParcelable<CallF\u2026ss.simpleName}\"\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroidx/lifecycle/ViewModelProvider;
 
@@ -71,7 +66,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/feedback/FeedbackSheetViewModel;
 
@@ -101,13 +96,4 @@
     invoke-direct {p1, v0}, Lcom/discord/widgets/feedback/FeedbackSheetViewModelProvider$ErrorProvidingViewModelExpection;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "sheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModel$ViewState.smali
index 416856af93..d11aa36b40 100644
--- a/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModel$ViewState.smali
@@ -60,11 +60,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedFeedbackRating"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "feedbackIssues"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -79,20 +81,6 @@
     iput p5, p0, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;->issuesHeaderTextResId:I
 
     return-void
-
-    :cond_0
-    const-string p1, "feedbackIssues"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedFeedbackRating"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/util/List;IIIILjava/lang/Object;)Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;
@@ -236,11 +224,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedFeedbackRating"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "feedbackIssues"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;
 
@@ -259,20 +249,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;-><init>(Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/util/List;III)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "feedbackIssues"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedFeedbackRating"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -290,7 +266,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;->selectedFeedbackRating:Lcom/discord/widgets/voice/feedback/FeedbackRating;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -300,7 +276,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;->feedbackIssues:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModelProvider$ErrorProvidingViewModelExpection.smali b/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModelProvider$ErrorProvidingViewModelExpection.smali
index e68460cd5a..4e196bb27b 100644
--- a/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModelProvider$ErrorProvidingViewModelExpection.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/FeedbackSheetViewModelProvider$ErrorProvidingViewModelExpection.smali
@@ -16,20 +16,13 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$Companion.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$Companion.smali
index ffe99a6a73..fcff8cfff1 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final newInstance(Lcom/discord/widgets/feedback/WidgetFeedbackSheet$FeedbackType;)Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "feedbackType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
@@ -53,13 +55,4 @@
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "feedbackType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$1.smali
index e6e16f4624..c0781cd62d 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/feedback/WidgetFeedbackSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string/jumbo v4, "updateView"
+
+    const-string/jumbo v5, "updateView(Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView(Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->access$updateView(Lcom/discord/widgets/feedback/WidgetFeedbackSheet;Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$2.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$2.smali
index 3b5a316227..67256aaf10 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$2.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/feedback/WidgetFeedbackSheet$bindSubscriptions$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/feedback/FeedbackSheetViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/feedback/WidgetFeedbackSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/feedback/FeedbackSheetViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/feedback/FeedbackSheetViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/feedback/FeedbackSheetViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->access$handleEvent(Lcom/discord/widgets/feedback/WidgetFeedbackSheet;Lcom/discord/widgets/feedback/FeedbackSheetViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali
index f6d8fa39f1..635dbfd901 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     :cond_0
     iget-object p1, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1;->this$0:Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$onDismissed$1.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$onDismissed$1.smali
index 7aeacbd1fb..60a6095924 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$onDismissed$1.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$onDismissed$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/feedback/WidgetFeedbackSheet$onDismissed$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$1.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$1.smali
index 06f4407a0c..118d4f9907 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$1.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/feedback/WidgetFeedbackSheet$updateView$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$2.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$2.smali
index 43cbf99b19..858840297f 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$2.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/feedback/WidgetFeedbackSheet$updateView$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$3.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$3.smali
index 45ca433fa3..066dce6f96 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$3.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/feedback/WidgetFeedbackSheet$updateView$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$4.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$4.smali
index 08d63288a2..a0c26e5b15 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$4.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/feedback/WidgetFeedbackSheet$updateView$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/feedback/FeedbackIssue;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/voice/feedback/FeedbackIssue;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "issue"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet$updateView$4;->this$0:Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
@@ -82,13 +84,4 @@
     invoke-interface {v0, p1, v1}, Lcom/discord/widgets/feedback/FeedbackSheetViewModel;->selectIssue(Lcom/discord/widgets/voice/feedback/FeedbackIssue;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "issue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$5.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$5.smali
index 3ddc7fdbdb..120e9c405d 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$5.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$updateView$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/feedback/WidgetFeedbackSheet$updateView$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFeedbackSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet.smali
index 5a2875a8c1..b0185ee1a9 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet.smali
@@ -62,81 +62,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
-    const-class v2, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "closeButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCloseButton()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "closeButton"
-
-    const-string v4, "getCloseButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
-    const-class v2, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
+    const-string v2, "feedbackView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFeedbackView()Lcom/discord/widgets/voice/feedback/FeedbackView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "feedbackView"
-
-    const-string v4, "getFeedbackView()Lcom/discord/widgets/voice/feedback/FeedbackView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
 
-    const-class v2, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
+    const-string v2, "titleTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "titleTextView"
-
-    const-string v4, "getTitleTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -164,7 +140,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->onDismissed:Lkotlin/jvm/functions/Function0;
 
-    const v0, 0x7f0a0398
+    const v0, 0x7f0a039e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -172,7 +148,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0397
+    const v0, 0x7f0a039d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,7 +156,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->closeButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0399
+    const v0, 0x7f0a039f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +164,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->feedbackView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a039a
+    const v0, 0x7f0a03a0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,9 +185,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -355,7 +331,7 @@
 
     const-string v1, "Observable\n            .\u2026S, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -457,7 +433,7 @@
 
     const-string v0, "getString(viewState.promptTextResId)"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;->getSelectedFeedbackRating()Lcom/discord/widgets/voice/feedback/FeedbackRating;
 
@@ -485,7 +461,7 @@
 
     const-string v0, "getString(viewState.issuesHeaderTextResId)"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;->getFeedbackIssues()Ljava/util/List;
 
@@ -509,7 +485,7 @@
 
     const-string v0, "Observable\n          .ti\u2026S, TimeUnit.MILLISECONDS)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -548,15 +524,17 @@
 .method public bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "compositeSubscription"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppBottomSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
 
     iget-object p1, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->viewModel:Lcom/discord/widgets/feedback/FeedbackSheetViewModel;
 
-    const-string v1, "viewModel"
+    const/4 v0, 0x0
+
+    const-string/jumbo v1, "viewModel"
 
     if-eqz p1, :cond_1
 
@@ -623,19 +601,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "compositeSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -665,9 +636,11 @@
 .end method
 
 .method public onCancel(Landroid/content/DialogInterface;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "dialog"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/fragment/app/DialogFragment;->onCancel(Landroid/content/DialogInterface;)V
 
@@ -676,15 +649,6 @@
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onResume()V
@@ -716,7 +680,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 6
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -748,7 +714,7 @@
 
     const-string v0, "requireArguments()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, p2}, Lcom/discord/widgets/feedback/CallFeedbackSheetViewModelProvider;-><init>(Landroid/os/Bundle;)V
 
@@ -797,26 +763,17 @@
     throw p1
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.feedback.WidgetFeedbackSheet.FeedbackType"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
 
 .method public final setOnDismissed(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -826,18 +783,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet;->onDismissed:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView$updateView$1.smali b/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView$updateView$1.smali
index caf68672d7..30ba21e845 100644
--- a/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView$updateView$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView$updateView$1.smali
@@ -51,7 +51,7 @@
 
     const-string p1, "context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/widgets/friends/EmptyFriendsStateView$updateView$1;->$addFriendSource:Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView.smali b/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView.smali
index c95e6d885b..eeb1458cc8 100644
--- a/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView.smali
+++ b/com.discord/smali/com/discord/widgets/friends/EmptyFriendsStateView.smali
@@ -21,41 +21,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/EmptyFriendsStateView;
 
-    const-class v2, Lcom/discord/widgets/friends/EmptyFriendsStateView;
+    const-string v2, "addFriendButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAddFriendButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "addFriendButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getAddFriendButton()Landroid/widget/Button;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/friends/EmptyFriendsStateView;
 
-    const/4 v2, 0x0
+    const-string v2, "titleText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTitleText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/friends/EmptyFriendsStateView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "titleText"
-
-    const-string v4, "getTitleText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -67,13 +55,15 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a0337
+    const p1, 0x7f0a033d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -81,7 +71,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/friends/EmptyFriendsStateView;->addFriendButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0338
+    const p1, 0x7f0a033e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -90,25 +80,18 @@
     iput-object p1, p0, Lcom/discord/widgets/friends/EmptyFriendsStateView;->titleText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f0a0337
+    const p1, 0x7f0a033d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -116,7 +99,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/friends/EmptyFriendsStateView;->addFriendButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0338
+    const p1, 0x7f0a033e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,25 +110,18 @@
     invoke-virtual {p0, p2}, Lcom/discord/widgets/friends/EmptyFriendsStateView;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a0337
+    const p1, 0x7f0a033d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +129,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/friends/EmptyFriendsStateView;->addFriendButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0338
+    const p1, 0x7f0a033e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -164,15 +140,6 @@
     invoke-virtual {p0, p2}, Lcom/discord/widgets/friends/EmptyFriendsStateView;->initialize(Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -277,7 +244,7 @@
 
     const/4 v0, 0x0
 
-    const v1, 0x7f0701f6
+    const v1, 0x7f0701ef
 
     invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getResourceId(II)I
 
@@ -305,7 +272,9 @@
 .method public final updateView(Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "addFriendSource"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/EmptyFriendsStateView;->getAddFriendButton()Landroid/widget/Button;
 
@@ -318,13 +287,4 @@
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "addFriendSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListLoadingViewHolder.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListLoadingViewHolder.smali
index bd02cb9631..8c9b6e25fb 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListLoadingViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListLoadingViewHolder.smali
@@ -5,20 +5,13 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$1.smali
index 7ff13a9f35..479b840aee 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/FriendsListViewModel$1;->this$0:Lcom/discord/widgets/friends/FriendsListViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/friends/FriendsListViewModel;->access$handleStoreState(Lcom/discord/widgets/friends/FriendsListViewModel;Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast.smali
index e2be1b332b..55c7e4317e 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(ILjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "username"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/friends/FriendsListViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-object p2, p0, Lcom/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast;->username:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast;ILjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast;
@@ -89,22 +84,15 @@
 .method public final copy(ILjava/lang/String;)Lcom/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v0, "username"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast;-><init>(ILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -128,7 +116,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$Event$ShowFriendRequestErrorToast;->username:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory$observeStores$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory$observeStores$1.smali
index 02bf7c5566..844e23523d 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory$observeStores$1.smali
@@ -33,7 +33,25 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelApplicationStream;",
+        ">;",
+        "Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -94,7 +112,7 @@
 
     const-string v0, "channelId"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -102,19 +120,19 @@
 
     const-string p1, "relationships"
 
-    invoke-static {p4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p1, "users"
+    const-string/jumbo p1, "users"
 
-    invoke-static {p3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "presences"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "applicationStreams"
 
-    invoke-static {p5, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v7
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory.smali
index 8bfd44b877..d04c50606b 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Factory.smali
@@ -40,7 +40,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/friends/FriendsListViewModel;
 
@@ -65,15 +67,6 @@
     invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/widgets/friends/FriendsListViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Z)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeStores()Lrx/Observable;
@@ -149,7 +142,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026ILLISECONDS\n            )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$Friend.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$Friend.smali
index 46a231b7d0..88d559a25a 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$Friend.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$Friend.smali
@@ -26,13 +26,15 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Z)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/friends/FriendsListViewModel$Item;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/friends/FriendsListViewModel$Item;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;->user:Lcom/discord/models/domain/ModelUser;
 
@@ -41,13 +43,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;->isApplicationStreaming:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;ZILjava/lang/Object;)Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;
@@ -110,22 +105,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Z)Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -143,7 +131,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -153,7 +141,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Friend;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest.smali
index 1ddc21a34a..0a0e1a48d2 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest.smali
@@ -26,13 +26,15 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;I)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/friends/FriendsListViewModel$Item;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/friends/FriendsListViewModel$Item;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;->user:Lcom/discord/models/domain/ModelUser;
 
@@ -41,13 +43,6 @@
     iput p3, p0, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;->relationshipType:I
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;IILjava/lang/Object;)Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;
@@ -110,22 +105,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;I)Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -143,7 +131,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -153,7 +141,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingFriendRequest;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ListSections.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ListSections.smali
index 2c21034ce4..c926573a82 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ListSections.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ListSections.smali
@@ -56,11 +56,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "pendingItems"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "friendsItemsWithHeaders"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,20 +73,6 @@
     iput-object p3, p0, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;->friendsItemsWithHeaders:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "friendsItemsWithHeaders"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "pendingItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;
@@ -178,31 +166,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "pendingItems"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "friendsItemsWithHeaders"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "friendsItemsWithHeaders"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "pendingItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -220,7 +196,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;->pendingHeaderItem:Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -230,7 +206,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;->pendingItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -240,7 +216,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;->friendsItemsWithHeaders:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$StoreState.smali
index 018c5068bb..118550fbe3 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$StoreState.smali
@@ -77,15 +77,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "relationshipsState"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string/jumbo v0, "users"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "presences"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "applicationStreams"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -100,34 +106,6 @@
     iput-object p6, p0, Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;->applicationStreams:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "applicationStreams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "relationshipsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;JLcom/discord/stores/StoreUserRelationships$UserRelationshipsState;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;
@@ -280,15 +258,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "relationshipsState"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string/jumbo v0, "users"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "presences"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "applicationStreams"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;
 
@@ -307,34 +291,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;-><init>(JLcom/discord/stores/StoreUserRelationships$UserRelationshipsState;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "applicationStreams"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "relationshipsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -360,7 +316,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;->relationshipsState:Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -370,7 +326,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -380,7 +336,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;->presences:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -390,7 +346,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$StoreState;->applicationStreams:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded.smali
index 5e0559c0e6..57d0dfaf05 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded.smali
@@ -39,22 +39,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "items"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded;
@@ -105,22 +100,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -138,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Loaded;->items:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.smali
index dc44371cc2..3b6a1a3526 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$1.smali
index 1f2b6a16d8..ff5f523ccf 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     const-string v2, "error.response"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$2.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$2.smali
index b14bcd1811..d643ff4941 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2;->this$0:Lcom/discord/widgets/friends/FriendsListViewModel;
 
-    const v1, 0x7f120560
+    const v1, 0x7f120562
 
     invoke-static {v0, v1}, Lcom/discord/widgets/friends/FriendsListViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/friends/FriendsListViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.smali
index 2e97b78340..8250caf092 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPIAbortMessages;->INSTANCE:Lcom/discord/utilities/rest/RestAPIAbortMessages;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/utilities/rest/RestAPIAbortMessages;->handleAbortCodeOrDefault(Lcom/discord/utilities/error/Error;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$1.smali
index 9615799b31..7d28250790 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$1.smali
@@ -72,7 +72,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$2.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$2.smali
index 7ca83dc085..1a36786095 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "TT;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$3.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$3.smali
index 9ee1e725e2..038f8552bd 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$3;->$onError:Lkotlin/jvm/functions/Function1;
 
@@ -75,13 +77,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$4.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$4.smali
index 3cebf5693c..4f10bb2873 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$4.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/FriendsListViewModel$asyncComputeAndHandleOnUiThread$4;->$subscription:Lkotlin/jvm/internal/Ref$ObjectRef;
 
     iput-object p1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$getItems$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$getItems$1.smali
index 7257c2767d..0d46b74263 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$getItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$getItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$getItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$1.smali
index 5920d582eb..bf4ba839f7 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$handleStoreState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$2.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$2.smali
index 1876f19085..197dffbf3c 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$handleStoreState$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$handleStoreState$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/FriendsListViewModel$handleStoreState$2;->this$0:Lcom/discord/widgets/friends/FriendsListViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/friends/FriendsListViewModel;->access$handleComputedItems(Lcom/discord/widgets/friends/FriendsListViewModel;Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.smali
index e8f9a87dfb..fecfaad7fd 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.smali
index ae1e7256f2..52fab84ed7 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2;->this$0:Lcom/discord/widgets/friends/FriendsListViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/friends/FriendsListViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/friends/FriendsListViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$1.smali
index b7cb57d425..e6821c87c2 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.smali
index b64efa4921..a6081651a2 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2;->this$0:Lcom/discord/widgets/friends/FriendsListViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/friends/FriendsListViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/friends/FriendsListViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel.smali b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel.smali
index a18eb328ac..c99a29c375 100644
--- a/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/friends/FriendsListViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/FriendsListViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "FriendsListViewModel.kt"
 
 
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/friends/FriendsListViewModel$ViewState;",
         ">;"
     }
@@ -83,7 +83,7 @@
 .end method
 
 .method public constructor <init>(Lrx/Observable;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Z)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -96,17 +96,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeChannels"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;
+    const-string v0, "restAPI"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/FriendsListViewModel;->storeObservable:Lrx/Observable;
 
@@ -118,9 +122,11 @@
 
     new-instance p1, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;
 
-    sget-object p2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p2, Lk0/j/n;->d:Lk0/j/n;
 
-    invoke-direct {p1, v0, p2, p2}, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;Ljava/util/List;Ljava/util/List;)V
+    const/4 p3, 0x0
+
+    invoke-direct {p1, p3, p2, p2}, Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;Ljava/util/List;Ljava/util/List;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/FriendsListViewModel;->listSections:Lcom/discord/widgets/friends/FriendsListViewModel$ListSections;
 
@@ -138,11 +144,13 @@
 
     const/4 p2, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, p3, p2, p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-class v2, Lcom/discord/widgets/friends/FriendsListViewModel;
+    const-class v1, Lcom/discord/widgets/friends/FriendsListViewModel;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -150,40 +158,17 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    new-instance v6, Lcom/discord/widgets/friends/FriendsListViewModel$1;
 
-    new-instance v7, Lcom/discord/widgets/friends/FriendsListViewModel$1;
+    invoke-direct {v6, p0}, Lcom/discord/widgets/friends/FriendsListViewModel$1;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel;)V
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/friends/FriendsListViewModel$1;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel;)V
+    const/16 v7, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lrx/Observable;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -291,7 +276,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -301,7 +286,7 @@
 
     const-string v2, "Observable\n        .crea\u2026Schedulers.computation())"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
@@ -484,7 +469,7 @@
     sget-object v1, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Empty;
 
     :goto_1
-    invoke-virtual {p0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -530,9 +515,9 @@
 
     move-result-object p1
 
-    check-cast p1, Lj0/i/l$a;
+    check-cast p1, Lk0/j/l$a;
 
-    invoke-virtual {p1}, Lj0/i/l$a;->iterator()Ljava/util/Iterator;
+    invoke-virtual {p1}, Lk0/j/l$a;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
@@ -640,11 +625,11 @@
     :cond_2
     sget-object p1, Lcom/discord/widgets/friends/FriendsListViewModel$getItems$sortedPendingItems$1;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$getItems$sortedPendingItems$1;
 
-    invoke-static {v0, p1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v0, p1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
@@ -660,33 +645,31 @@
 
     if-eqz p3, :cond_4
 
-    const p2, 0x7f1207c7
+    new-instance p2, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;
 
-    invoke-interface {p1}, Ljava/util/Collection;->size()I
-
-    move-result p3
+    const p3, 0x7f1207c9
 
     invoke-interface {p1}, Ljava/util/Collection;->size()I
 
     move-result v0
 
-    const/4 v2, 0x0
+    invoke-interface {p1}, Ljava/util/Collection;->size()I
 
-    if-le v0, v3, :cond_3
+    move-result v2
 
-    const/4 v0, 0x1
+    const/4 v4, 0x0
+
+    if-le v2, v3, :cond_3
+
+    const/4 v2, 0x1
 
     goto :goto_1
 
     :cond_3
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
     :goto_1
-    new-instance v3, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;
-
-    invoke-direct {v3, p2, p3, v2, v0}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;-><init>(IIZZ)V
-
-    move-object p2, v3
+    invoke-direct {p2, p3, v0, v4, v2}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$PendingHeader;-><init>(IIZZ)V
 
     :cond_4
     new-instance p3, Ljava/util/ArrayList;
@@ -730,11 +713,11 @@
     :cond_6
     sget-object v2, Lcom/discord/widgets/friends/FriendsListViewModel$getItems$onlineFriendItems$2;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$getItems$onlineFriendItems$2;
 
-    invoke-static {v0, v2}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v0, v2}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -746,17 +729,17 @@
 
     if-eqz v2, :cond_7
 
-    const v2, 0x7f1207c3
+    new-instance v2, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;
+
+    const v3, 0x7f1207c5
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
-    move-result v3
+    move-result v4
 
-    new-instance v4, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;
+    invoke-direct {v2, v3, v4}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;-><init>(II)V
 
-    invoke-direct {v4, v2, v3}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;-><init>(II)V
-
-    invoke-virtual {p3, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     invoke-virtual {p3, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
@@ -800,11 +783,11 @@
     :cond_9
     sget-object v1, Lcom/discord/widgets/friends/FriendsListViewModel$getItems$offlineFriendItems$2;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$getItems$offlineFriendItems$2;
 
-    invoke-static {v0, v1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -816,17 +799,17 @@
 
     if-eqz p4, :cond_a
 
-    const p4, 0x7f1207c2
+    new-instance p4, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;
+
+    const v1, 0x7f1207c4
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
-    move-result v1
+    move-result v2
 
-    new-instance v2, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;
+    invoke-direct {p4, v1, v2}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;-><init>(II)V
 
-    invoke-direct {v2, p4, v1}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;-><init>(II)V
-
-    invoke-virtual {p3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p3, p4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     invoke-virtual {p3, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
@@ -880,7 +863,7 @@
     const/4 v2, 0x2
 
     :goto_0
-    invoke-static {v1, v2}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v1, v2}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object v1
 
@@ -888,11 +871,11 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0, p1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0, p1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
@@ -948,7 +931,7 @@
 
     sget-object p1, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Empty;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -980,7 +963,7 @@
     :cond_2
     sget-object p1, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -988,14 +971,16 @@
 
 # virtual methods
 .method public final acceptFriendRequest(JLjava/lang/String;)V
-    .locals 10
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "username"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/friends/FriendsListViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
+    const-string v2, "Friends List"
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -1004,8 +989,6 @@
 
     const/4 v8, 0x0
 
-    const-string v2, "Friends List"
-
     move-wide v3, p1
 
     invoke-static/range {v1 .. v8}, Lcom/discord/utilities/rest/RestAPI;->addRelationship$default(Lcom/discord/utilities/rest/RestAPI;Ljava/lang/String;JLjava/lang/Integer;Ljava/lang/String;ILjava/lang/Object;)Lrx/Observable;
@@ -1014,46 +997,41 @@
 
     const/4 p2, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v1, p2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-class v2, Lcom/discord/widgets/friends/FriendsListViewModel;
+    const-class v3, Lcom/discord/widgets/friends/FriendsListViewModel;
 
-    const/4 v3, 0x0
+    new-instance v8, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel;)V
+
+    new-instance v6, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2;
+
+    invoke-direct {v6, p0, p3}, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
-    new-instance v7, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1;
+    const/4 v7, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel;)V
+    const/16 v9, 0x16
 
-    new-instance v5, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2;
+    const/4 v10, 0x0
 
-    invoke-direct {v5, p0, p3}, Lcom/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2;-><init>(Lcom/discord/widgets/friends/FriendsListViewModel;Ljava/lang/String;)V
-
-    const/16 v8, 0x16
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getInitRequestSectionExpanded()Z
@@ -1177,7 +1155,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1189,12 +1167,12 @@
 
     if-ne p3, v0, :cond_0
 
-    const p3, 0x7f1207ac
+    const p3, 0x7f1207ae
 
     goto :goto_0
 
     :cond_0
-    const p3, 0x7f1207a9
+    const p3, 0x7f1207ab
 
     :goto_0
     iget-object v0, p0, Lcom/discord/widgets/friends/FriendsListViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali
index 3b92286eb1..a3f7dd080d 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager$NearbyState$Connected.smali
@@ -38,22 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "nearbyUserIds"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/friends/NearbyManager$NearbyState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->nearbyUserIds:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "nearbyUserIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;
@@ -103,22 +98,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "nearbyUserIds"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;-><init>(Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "nearbyUserIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +124,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->nearbyUserIds:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
index 36b31d3ec0..22ad4c6ab3 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
@@ -291,11 +291,11 @@
 
     const-string v0, "message.content"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/String;
 
-    sget-object v1, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object v1, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     invoke-direct {v0, p1, v1}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
@@ -318,7 +318,7 @@
 
     const-string v0, "(this as java.lang.String).substring(startIndex)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
@@ -341,7 +341,7 @@
 .end method
 
 .method private final setupBroadcaster(J)V
-    .locals 8
+    .locals 12
 
     sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->l:Lcom/google/android/gms/nearby/messages/Strategy;
 
@@ -359,50 +359,50 @@
 
     iput-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
-    const-string v0, "u:"
+    new-instance v0, Lcom/google/android/gms/nearby/messages/Message;
 
-    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+    const-string v1, "u:"
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
 
     move-result-object p1
 
-    sget-object p2, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object p2, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     if-eqz p1, :cond_0
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
-    move-result-object v2
+    move-result-object v6
 
     const-string p1, "(this as java.lang.String).getBytes(charset)"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p1, Lcom/google/android/gms/nearby/messages/Message;
+    sget-object v9, Lcom/google/android/gms/nearby/messages/Message;->j:[Lcom/google/android/gms/internal/nearby/zzgs;
 
-    sget-object v5, Lcom/google/android/gms/nearby/messages/Message;->j:[Lcom/google/android/gms/internal/nearby/zzgs;
+    const/4 v5, 0x2
 
-    const/4 v1, 0x2
+    const-wide/16 v10, 0x0
 
-    const-wide/16 v6, 0x0
+    const-string v7, ""
 
-    const-string v3, ""
+    const-string v8, ""
 
-    const-string v4, ""
+    move-object v4, v0
 
-    move-object v0, p1
+    invoke-direct/range {v4 .. v11}, Lcom/google/android/gms/nearby/messages/Message;-><init>(I[BLjava/lang/String;Ljava/lang/String;[Lcom/google/android/gms/internal/nearby/zzgs;J)V
 
-    invoke-direct/range {v0 .. v7}, Lcom/google/android/gms/nearby/messages/Message;-><init>(I[BLjava/lang/String;Ljava/lang/String;[Lcom/google/android/gms/internal/nearby/zzgs;J)V
-
-    iput-object p1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
 
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -555,7 +555,9 @@
 .method public final buildClientAndPublish(Landroidx/fragment/app/FragmentActivity;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "fragmentActivity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient;
 
@@ -567,15 +569,6 @@
     invoke-virtual {p0}, Lcom/discord/widgets/friends/NearbyManager;->activateNearby()V
 
     return-void
-
-    :cond_1
-    const-string p1, "fragmentActivity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final disableNearby()V
@@ -632,7 +625,7 @@
 
     const-string v1, "nearbyStateSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
index 8e136e0ab0..dc561d8ccd 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$Companion.smali
@@ -71,11 +71,13 @@
 .method public final show(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "source"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Add Friend Modal"
 
@@ -91,21 +93,7 @@
 
     const-class p2, Lcom/discord/widgets/friends/WidgetFriendsAdd;
 
-    invoke-static {p1, p2, p3}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, p3}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali
index be1c060fc8..8731b3a2a1 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsAdd.kt"
 
 # interfaces
@@ -18,9 +18,9 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
-        "Lcom/discord/widgets/friends/WidgetFriendsAddById;",
+        "Landroidx/fragment/app/Fragment;",
         ">;"
     }
 .end annotation
@@ -48,14 +48,14 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke()Lcom/discord/widgets/friends/WidgetFriendsAddById;
+.method public final invoke()Landroidx/fragment/app/Fragment;
     .locals 1
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddById;
@@ -68,7 +68,7 @@
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1;->invoke()Lcom/discord/widgets/friends/WidgetFriendsAddById;
+    invoke-virtual {p0}, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1;->invoke()Landroidx/fragment/app/Fragment;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali
index 730f1d1e1c..9030c29aa8 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsAdd.kt"
 
 # interfaces
@@ -18,9 +18,9 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
-        "Lcom/discord/widgets/friends/WidgetFriendsFindNearby;",
+        "Landroidx/fragment/app/Fragment;",
         ">;"
     }
 .end annotation
@@ -48,14 +48,14 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke()Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+.method public final invoke()Landroidx/fragment/app/Fragment;
     .locals 1
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
@@ -68,7 +68,7 @@
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;->invoke()Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    invoke-virtual {p0}, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;->invoke()Landroidx/fragment/app/Fragment;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
index 3099cadbe4..4afe68a554 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
@@ -29,25 +29,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsAdd;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsAdd;
+    const-string/jumbo v2, "viewPager"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewPager"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/friends/WidgetFriendsAdd;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -141,25 +135,27 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    const v0, 0x7f1207cf
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+    const v1, 0x7f1207d1
+
+    invoke-virtual {p0, v1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
-    move-result-object v0
+    move-result-object v1
 
     new-instance v2, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;
 
@@ -169,7 +165,7 @@
 
     const-string v4, "parentFragmentManager"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x2
 
@@ -177,7 +173,7 @@
 
     new-instance v5, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v6, 0x7f12175d
+    const v6, 0x7f121787
 
     invoke-virtual {p0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -185,7 +181,7 @@
 
     const-string v7, "getString(R.string.username)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v7, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$1;
 
@@ -195,7 +191,7 @@
 
     new-instance p1, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v5, 0x7f120f4b
+    const v5, 0x7f120f75
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -203,24 +199,17 @@
 
     const-string v6, "getString(R.string.nearby_scan)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v6, Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsAdd$onViewBound$2;
 
     invoke-direct {p1, v5, v6}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 
-    aput-object p1, v4, v1
+    aput-object p1, v4, v0
 
     invoke-direct {v2, v3, v4}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;-><init>(Landroidx/fragment/app/FragmentManager;[Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;)V
 
-    invoke-virtual {v0, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator.smali
index 2d39f9018f..01ac971d98 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/Integer;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "username"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;->discriminator:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;Ljava/lang/String;Ljava/lang/Integer;ILjava/lang/Object;)Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;
@@ -89,22 +82,15 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/Integer;)Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "username"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;-><init>(Ljava/lang/String;Ljava/lang/Integer;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;->username:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -132,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/WidgetFriendsAddById$Companion$UserNameDiscriminator;->discriminator:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion.smali
index fe3d288d9f..45211968b0 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$Companion.smali
@@ -100,7 +100,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    invoke-static {v0}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    invoke-static {v0}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2.smali
index 1dcf6d39a3..9bb03b6805 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsAddById.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,34 +59,36 @@
 .end method
 
 .method public final invoke(Landroid/text/Editable;)V
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "editable"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-nez v1, :cond_0
+    move-result v0
 
     const/4 v1, 0x1
 
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAddById;
+    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
-    invoke-static {v1, v0}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->access$setInputEditError(Lcom/discord/widgets/friends/WidgetFriendsAddById;Ljava/lang/String;)V
+    const/4 v2, 0x0
+
+    invoke-static {v0, v2}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->access$setInputEditError(Lcom/discord/widgets/friends/WidgetFriendsAddById;Ljava/lang/String;)V
 
     :cond_1
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAddById;
@@ -104,19 +106,19 @@
     goto :goto_1
 
     :cond_2
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_1
-    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setEnabled(Z)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setEnabled(Z)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_2
 
     :catch_0
-    sget-object v3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    new-instance v5, Ljava/lang/Exception;
+    new-instance v4, Ljava/lang/Exception;
 
     const-string p1, "Detached: "
 
@@ -148,25 +150,18 @@
 
     move-result-object p1
 
-    invoke-direct {v5, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
+    invoke-direct {v4, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    const/4 v7, 0x4
+    const/4 v6, 0x4
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    const-string v4, "Failed to update views via TextWatcher"
+    const-string v3, "Failed to update views via TextWatcher"
 
-    invoke-static/range {v3 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    invoke-static/range {v2 .. v7}, 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_2
     return-void
-
-    :cond_3
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.smali
index a411d1face..2e9c517685 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsAddById.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/widget/TextView;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
@@ -71,16 +71,11 @@
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x1
 
     invoke-static {p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->hideKeyboard$default(Lcom/discord/app/AppFragment;Landroid/view/View;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.smali
index 835fefff23..be9f1608d4 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.smali
@@ -89,9 +89,9 @@
 
     const-string v2, "getString(\n             \u2026e\n                      )"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v0}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v0
 
@@ -99,7 +99,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v4, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v4, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2$1.smali
index ce64d0296a..58b1a8d895 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsAddById.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 
     const-string v3, "error"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
@@ -96,7 +96,7 @@
 
     const-string v3, "error.response"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.smali
index 9f97699266..4038631f66 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.smali
@@ -61,7 +61,7 @@
 
     const-string v1, "error"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2$1;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById.smali
index 549edc5256..0b4562753b 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddById.smali
@@ -37,81 +37,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsAddById;
+    const-string v2, "friendsAddContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFriendsAddContainer()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "friendsAddContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFriendsAddContainer()Landroid/widget/LinearLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
-    const/4 v2, 0x0
+    const-string v2, "inputEditText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getInputEditText()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsAddById;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "inputEditText"
-
-    const-string v4, "getInputEditText()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsAddById;
+    const-string/jumbo v2, "usernameIndicator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUsernameIndicator()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "usernameIndicator"
-
-    const-string v4, "getUsernameIndicator()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsAddById;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsAddById;
+    const-string v2, "send"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSend()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "send"
-
-    const-string v4, "getSend()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -143,7 +119,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a03cb
+    const v0, 0x7f0a03d1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -151,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById;->friendsAddContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03cd
+    const v0, 0x7f0a03d3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById;->inputEditText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03c9
+    const v0, 0x7f0a03cf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +143,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddById;->usernameIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03cc
+    const v0, 0x7f0a03d2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -391,7 +367,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f121433
+    const v2, 0x7f12145d
 
     invoke-virtual {v0, v2, v1}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -399,7 +375,7 @@
 
     const-string v1, "resources.getString(R.st\u2026serNameWithDiscriminator)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroid/text/SpannableStringBuilder;
 
@@ -479,7 +455,7 @@
 
     invoke-direct {v3, p0, p1, p2}, Lcom/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;Ljava/lang/String;I)V
 
-    invoke-static {v1, v2, v3}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {v1, v2, v3}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -505,7 +481,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
@@ -535,7 +511,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -626,9 +602,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -636,45 +612,47 @@
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$1;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
 
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->getInputEditText()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$2;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
 
-    invoke-static {p1, p0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
+    invoke-static {p1, p0, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->getInputEditText()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$3;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x1
 
     const/4 v3, 0x0
 
-    invoke-static {p1, v3, v1, v2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
+    invoke-static {p1, v1, v0, v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->getFriendsAddContainer()Landroid/widget/LinearLayout;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$4;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$4;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById$onViewBound$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsAddById;)V
 
-    invoke-virtual {p1, v1}, Landroid/widget/LinearLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/widget/LinearLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -690,10 +668,10 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v3
 
     :cond_0
-    invoke-direct {p0, v0}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->setInputText(Ljava/lang/String;)V
+    invoke-direct {p0, v3}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->setInputText(Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -711,7 +689,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsAddById;->getUsernameIndicator()Landroid/widget/TextView;
 
@@ -736,11 +714,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali
index d3d8738f6c..92eba97074 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;)Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;
 
@@ -59,13 +61,4 @@
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/util/List;Lcom/discord/models/domain/ModelPresence;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali
index e8e113fb18..cc5b6ae7c9 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser.smali
@@ -75,11 +75,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "aliases"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -92,20 +94,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;->isFriend:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "aliases"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/util/List;Lcom/discord/models/domain/ModelPresence;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -219,31 +207,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "aliases"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/util/List;Lcom/discord/models/domain/ModelPresence;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "aliases"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -261,7 +237,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -271,7 +247,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;->aliases:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -281,7 +257,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali
index 70fe43c1df..ee7250e021 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali
@@ -59,9 +59,9 @@
 
     move-result-object v0
 
-    const-string v1, "user.username"
+    const-string/jumbo v1, "user.username"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3;->$user:Lcom/discord/models/domain/ModelUser;
 
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 1480e50324..c64073197d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
@@ -45,7 +45,9 @@
 .method public constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d014e
 
@@ -61,7 +63,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026_friend_user_item_avatar)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -77,7 +79,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026dd_friend_user_item_name)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -93,7 +95,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026user_item_name_secondary)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -109,7 +111,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026_friend_user_item_status)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/StatusView;
 
@@ -125,7 +127,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026_friend_user_send_button)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/appcompat/widget/AppCompatImageView;
 
@@ -141,7 +143,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026_friend_user_check_image)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/appcompat/widget/AppCompatImageView;
 
@@ -157,7 +159,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026riend_user_accept_button)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/appcompat/widget/AppCompatImageView;
 
@@ -173,22 +175,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026iend_user_decline_button)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroidx/appcompat/widget/AppCompatImageView;
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder;->declineButton:Landroidx/appcompat/widget/AppCompatImageView;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder;)Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
@@ -206,7 +199,9 @@
 .method public onConfigure(ILcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;)V
     .locals 9
 
-    if-eqz p2, :cond_b
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -214,21 +209,21 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder;->avatar:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    const/4 v2, 0x0
+    iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder;->avatar:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/16 v5, 0x1c
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x1c
 
-    move-object v1, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder;->username:Landroid/widget/TextView;
 
@@ -236,7 +231,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -486,15 +481,6 @@
     invoke-virtual {p1, v3}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_b
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1.smali
index e9b5780101..a4a3c57ea4 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsAddUserAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
index 6c77d348b2..0a07102ade 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
@@ -117,9 +117,11 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -140,15 +142,6 @@
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->onItemClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAcceptHandler$p(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;)Lkotlin/jvm/functions/Function1;
@@ -247,11 +240,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "outgoingIds"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "incomingIds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->outgoingRequestUserIds:Ljava/util/HashSet;
 
@@ -272,20 +267,6 @@
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "incomingIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "outgoingIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -299,9 +280,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -319,19 +302,10 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setAcceptHandler(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -343,24 +317,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "handler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->acceptHandler:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "handler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setDeclineHandler(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -374,24 +341,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "handler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->declineHandler:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "handler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnItemClick(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -403,24 +363,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onItemClick"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->onItemClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onItemClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setSendHandler(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -434,18 +387,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "handler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->sendHandler:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "handler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Error.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Error.smali
index c6fa0f9be8..0d42db794a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Error.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$Error.smali
@@ -83,7 +83,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Error;->errorCode:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali
index 4996ddcba9..aa8932f739 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers.smali
@@ -38,22 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "items"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;
@@ -103,22 +98,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +124,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;->items:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali
index faf23cb9cb..6f62e2fc03 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/friends/NearbyManager$NearbyState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -103,9 +105,9 @@
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Error;-><init>(Ljava/lang/Integer;)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -116,9 +118,9 @@
 
     sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Uninitialized;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Uninitialized;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     :goto_0
     move-object p1, v0
@@ -159,9 +161,9 @@
     :cond_2
     sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Empty;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$Empty;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali
index b5beb4a06e..7ed6e6e8d8 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$getUserModels$1.smali
@@ -29,7 +29,23 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model$NearbyUsers;",
+        ">;"
     }
 .end annotation
 
@@ -83,9 +99,9 @@
         }
     .end annotation
 
-    const-string v0, "users"
+    const-string/jumbo v0, "users"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -134,7 +150,7 @@
 
     new-instance v4, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$ItemUser;
 
-    sget-object v5, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v5, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali
index d8e355c970..0b34e1f187 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider.smali
@@ -103,7 +103,7 @@
 
     const-string v0, "Observable\n          .co\u2026yUsers(items)\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -124,26 +124,19 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "nearbyStateObservable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$ModelProvider$get$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "nearbyStateObservable\n  \u2026          }\n            }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "nearbyStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.smali
index 9c7104a457..bc5ae09abb 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$declineFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$declineFriendRequest$1.smali
index 17636bea6d..bc930b6da6 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$declineFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$declineFriendRequest$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$declineFriendRequest$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.smali
index 4f319a34d6..2bdbc861cd 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
         "Ljava/lang/Integer;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,20 +68,13 @@
 .method public final invoke(Ljava/lang/String;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "username"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
     invoke-static {v0, p1, p2}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$sendFriendRequest(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;Ljava/lang/String;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali
index 45cc7f0918..06c714fcb2 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3.smali
index 4ca1ae2ae5..d36609a4d3 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
index d18d283a37..0c7722d03a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6.smali
index ae14dd31a6..936661c0df 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6.smali
@@ -53,7 +53,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1.smali
index 8ca1cbde43..7dfaaf9421 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "LWidgetFriendsAddUserRequestsModel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2.smali
index d1e68a7b5a..0dc89d3212 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$configureUI(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.smali
index 1525bab45c..e59fbad528 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -103,7 +103,11 @@
     const-string v0, ""
 
     :goto_0
-    invoke-static {v0}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    const-string v2, "context?.getString(R.str\u2026                    ?: \"\""
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v0
 
@@ -111,7 +115,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2$1.smali
index c33bdd4817..c5046dae0a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 
     const-string v3, "it"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
@@ -84,7 +84,7 @@
 
     const-string v3, "it.response"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -136,7 +136,7 @@
 
     const/16 v4, 0xc
 
-    invoke-static {v1, v0, v2, v3, v4}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v1, v0, v2, v3, v4}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.smali
index ac053e0194..9fd6ec8fcc 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.smali
@@ -61,7 +61,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2$1;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
index 435a1af68e..8e6f1a7dd3 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
@@ -44,121 +44,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    const-string v2, "recycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "recycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    const/4 v2, 0x0
+    const-string v2, "enableButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getEnableButton()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "enableButton"
-
-    const-string v4, "getEnableButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    const-string v2, "searchingTitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchingTitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchingTitle"
-
-    const-string v4, "getSearchingTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    const-string v2, "searchingBody"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchingBody()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchingBody"
-
-    const-string v4, "getSearchingBody()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    const-string v2, "searchingLottie"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchingLottie()Lcom/discord/rlottie/RLottieImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchingLottie"
-
-    const-string v4, "getSearchingLottie()Lcom/discord/rlottie/RLottieImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    const-string v2, "learnMore"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLearnMore()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "learnMore"
-
-    const-string v4, "getLearnMore()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -174,7 +138,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0615
+    const v0, 0x7f0a061b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -182,7 +146,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0613
+    const v0, 0x7f0a0619
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -190,7 +154,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->enableButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0618
+    const v0, 0x7f0a061e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -198,7 +162,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->searchingTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0616
+    const v0, 0x7f0a061c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -206,7 +170,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->searchingBody$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0617
+    const v0, 0x7f0a061d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -214,7 +178,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->searchingLottie$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0614
+    const v0, 0x7f0a061a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -335,7 +299,7 @@
     :cond_0
     const-string p0, "resultsAdapter"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -668,7 +632,7 @@
     :cond_6
     const-string p1, "resultsAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -684,12 +648,12 @@
 
     if-eqz p3, :cond_0
 
-    const p3, 0x7f1207ac
+    const p3, 0x7f1207ae
 
     goto :goto_0
 
     :cond_0
-    const p3, 0x7f1207a9
+    const p3, 0x7f1207ab
 
     :goto_0
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
@@ -770,11 +734,11 @@
     goto :goto_0
 
     :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type androidx.fragment.app.FragmentActivity"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -1006,7 +970,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v1, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -1020,7 +984,7 @@
 
     invoke-direct {v4, p0, p1, p2}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;Ljava/lang/String;I)V
 
-    invoke-virtual {v1, v2, v3, v4}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v1, v2, v3, v4}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -1115,9 +1079,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1125,15 +1089,15 @@
 
     sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -1141,9 +1105,11 @@
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->resultsAdapter:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
 
-    const-string v1, "resultsAdapter"
+    const-string v0, "resultsAdapter"
 
-    if-eqz p1, :cond_6
+    const/4 v1, 0x0
+
+    if-eqz p1, :cond_5
 
     new-instance v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;
 
@@ -1153,7 +1119,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->resultsAdapter:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     new-instance v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2;
 
@@ -1163,7 +1129,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->resultsAdapter:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_3
 
     new-instance v2, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;
 
@@ -1173,37 +1139,37 @@
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->resultsAdapter:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->setOnItemClick(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->setOnItemClick(Lkotlin/jvm/functions/Function1;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getEnableButton()Landroid/widget/Button;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
 
-    invoke-virtual {p1, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getLearnMore()Landroid/widget/TextView;
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
+    sget-object v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
 
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getSearchingLottie()Lcom/discord/rlottie/RLottieImageView;
 
     move-result-object p1
 
-    const/high16 v1, 0x7f110000
+    const/high16 v0, 0x7f110000
 
     const/16 v2, 0xc8
 
@@ -1215,15 +1181,17 @@
 
     move-result v8
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     const/4 v11, 0x0
 
-    sget-object v2, Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;->LOOP:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
+    sget-object v1, Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;->LOOP:Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;
 
-    if-eqz v2, :cond_1
+    const-string v2, "playbackMode"
 
-    new-instance v0, Lcom/discord/rlottie/RLottieDrawable;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lcom/discord/rlottie/RLottieDrawable;
 
     invoke-virtual {p1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
 
@@ -1231,19 +1199,19 @@
 
     const-string v3, "context"
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v0}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
     move-result-object v6
 
     invoke-virtual {p1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lcom/discord/utilities/display/DisplayUtils;->getScreenRefreshRate(Landroid/content/Context;)F
+    invoke-static {v0}, Lcom/discord/utilities/display/DisplayUtils;->getScreenRefreshRate(Landroid/content/Context;)F
 
     move-result v9
 
@@ -1251,13 +1219,13 @@
 
     const/high16 v5, 0x7f110000
 
-    move-object v3, v0
+    move-object v3, v2
 
     invoke-direct/range {v3 .. v11}, Lcom/discord/rlottie/RLottieDrawable;-><init>(Landroid/content/Context;ILjava/lang/String;IIFZ[I)V
 
-    iput-object v0, p1, Lcom/discord/rlottie/RLottieImageView;->d:Lcom/discord/rlottie/RLottieDrawable;
+    iput-object v2, p1, Lcom/discord/rlottie/RLottieImageView;->d:Lcom/discord/rlottie/RLottieDrawable;
 
-    invoke-virtual {v0, v2}, Lcom/discord/rlottie/RLottieDrawable;->f(Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;)V
+    invoke-virtual {v2, v1}, Lcom/discord/rlottie/RLottieDrawable;->f(Lcom/discord/rlottie/RLottieDrawable$PlaybackMode;)V
 
     iget-object v0, p1, Lcom/discord/rlottie/RLottieImageView;->d:Lcom/discord/rlottie/RLottieDrawable;
 
@@ -1275,41 +1243,27 @@
     return-void
 
     :cond_1
-    const-string p1, "playbackMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 
     :cond_2
-    throw v0
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
 
     :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_4
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_5
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_6
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1331,7 +1285,7 @@
 
     sget-object v1, Ll;->e:Ll;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1349,17 +1303,17 @@
 
     sget-object v2, Ll;->f:Ll;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
-    sget-object v2, Lu;->d:Lu;
+    sget-object v2, Lv;->d:Lv;
 
     if-eqz v2, :cond_0
 
-    new-instance v3, Lv;
+    new-instance v3, Lw;
 
-    invoke-direct {v3, v2}, Lv;-><init>(Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {v3, v2}, Lw;-><init>(Lkotlin/jvm/functions/Function2;)V
 
     move-object v2, v3
 
@@ -1372,7 +1326,7 @@
 
     const-string v1, "Observable\n        .comb\u2026erRequestsModel\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -1384,7 +1338,7 @@
 
     const-string v1, "Observable\n        .comb\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -1394,7 +1348,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v1, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -1404,7 +1358,7 @@
 
     invoke-direct {v4, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
 
-    invoke-virtual {v1, v3, v4, v2}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v1, v3, v4, v2}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1455,7 +1409,7 @@
     :cond_1
     const-string v0, "resultsAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.smali
index 574bb14bd1..1b48d1d083 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.smali
@@ -54,7 +54,7 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -75,7 +75,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Friends"
 
@@ -88,7 +88,7 @@
 
     const-string p1, "context"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -108,7 +108,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05c2
+    .packed-switch 0x7f0a05c8
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$2.smali
index 2a9aa5dd96..a654d7da66 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/models/domain/ModelUser;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,31 +62,35 @@
 .end method
 
 .method public final invoke(Landroid/view/View;Lcom/discord/models/domain/ModelUser;)V
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo p1, "user"
 
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v2
-
-    const/4 v4, 0x0
+    move-result-wide v1
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v5
+    move-result-object v4
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
 
     const/4 v6, 0x0
 
@@ -94,27 +98,11 @@
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/16 v9, 0x7a
 
-    const/16 v10, 0x7a
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
-
-    invoke-static/range {v1 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$3.smali
index a0532f3029..ee110b5cc3 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$4.smali
index 3167927edc..e880e4b654 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/friends/FriendsListViewModel;->launchVoiceCall(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$5.smali
index 8f25ad8f94..ccc686eb2e 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,33 +59,33 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$5;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
+
+    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$5;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
+    const-string v2, "requireContext()"
 
-    invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    const-string v3, "requireContext()"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    invoke-virtual {v1, v2, v3, v4}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
+    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -93,20 +93,15 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
+    sget-object v0, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {p1, v1, v2, v3, v0}, Lcom/discord/stores/StoreTabsNavigation;->selectHomeTab$default(Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;ZILjava/lang/Object;)V
+    const/4 v3, 0x0
+
+    invoke-static {p1, v0, v1, v2, v3}, Lcom/discord/stores/StoreTabsNavigation;->selectHomeTab$default(Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$6.smali
index a5ddce2e77..b3c0680e4f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$6;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
 
@@ -79,18 +81,9 @@
 
     const-string v3, "it.username"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2, p1}, Lcom/discord/widgets/friends/FriendsListViewModel;->acceptFriendRequest(JLjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$7.smali
index 1320462008..805a0eaf01 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBound$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Integer;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;I)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$7;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
 
@@ -83,13 +85,4 @@
     invoke-virtual {v0, v1, v2, p2}, Lcom/discord/widgets/friends/FriendsListViewModel;->removeFriendRequest(JI)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1.smali
index 73e58d77fd..7c363f9aab 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/friends/FriendsListViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/friends/FriendsListViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/friends/WidgetFriendsList;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/friends/FriendsListViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/friends/FriendsListViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/friends/WidgetFriendsList;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList;->access$configureUI(Lcom/discord/widgets/friends/WidgetFriendsList;Lcom/discord/widgets/friends/FriendsListViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$2.smali
index da1f00042f..19fd86022a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/friends/WidgetFriendsList$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetFriendsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/friends/FriendsListViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/friends/FriendsListViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/friends/WidgetFriendsList;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/friends/FriendsListViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/friends/FriendsListViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/friends/WidgetFriendsList;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList;->access$handleEvent(Lcom/discord/widgets/friends/WidgetFriendsList;Lcom/discord/widgets/friends/FriendsListViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
index 49e963e7da..44f10d251a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
@@ -56,101 +56,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsList;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "flipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    const/4 v2, 0x0
+    const-string v2, "recyclerView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsList;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "recyclerView"
-
-    const-string v4, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsList;
+    const-string v2, "emptyFriendsStateView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptyFriendsStateView"
-
-    const-string v4, "getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsList;
+    const-string v2, "loadingView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLoadingView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "loadingView"
-
-    const-string v4, "getLoadingView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsList;
+    const-string v2, "toolbarTitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "toolbarTitle"
-
-    const-string v4, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -174,7 +144,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a03cf
+    const v0, 0x7f0a03d5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -182,7 +152,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03e1
+    const v0, 0x7f0a03e7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -190,7 +160,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03ce
+    const v0, 0x7f0a03d4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -198,7 +168,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->emptyFriendsStateView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03de
+    const v0, 0x7f0a03e4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -206,7 +176,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->loadingView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0997
+    const v0, 0x7f0a099b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -235,9 +205,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -265,7 +235,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->bindToolbar()Lkotlin/Unit;
 
-    const v0, 0x7f1207b4
+    const v0, 0x7f1207b6
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -295,7 +265,7 @@
 
     sget-object v0, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Uninitialized;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -308,7 +278,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/friends/FriendsListViewModel$ViewState$Empty;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -520,7 +490,7 @@
     :cond_0
     const-string p1, "privateCallLauncher"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -552,7 +522,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
 
     return-void
 .end method
@@ -568,7 +538,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     return-void
 .end method
@@ -645,7 +615,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026istViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/friends/FriendsListViewModel;
 
@@ -659,7 +629,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -667,7 +637,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, p0, p0, v0, v1}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 
@@ -699,9 +669,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -709,41 +679,43 @@
 
     move-result-object p1
 
-    instance-of v1, p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    instance-of v0, p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    if-nez v1, :cond_0
+    const/4 v1, 0x0
 
-    move-object p1, v0
+    if-nez v0, :cond_0
+
+    move-object p1, v1
 
     :cond_0
     check-cast p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
     if-eqz p1, :cond_1
 
-    sget-object v1, Lcom/discord/widgets/tabs/NavigationTab;->FRIENDS:Lcom/discord/widgets/tabs/NavigationTab;
+    sget-object v0, Lcom/discord/widgets/tabs/NavigationTab;->FRIENDS:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-virtual {p1, v1, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
+    invoke-virtual {p1, v0, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
 
     :cond_1
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsList;->getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;
 
     move-result-object p1
 
-    const-string v1, "Friends"
+    const-string v0, "Friends"
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/EmptyFriendsStateView;->updateView(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/EmptyFriendsStateView;->updateView(Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsList;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
     new-instance v2, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
 
     invoke-direct {v2, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -753,66 +725,66 @@
 
     if-eqz p1, :cond_2
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$2;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$2;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$2;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$2;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickUserProfile(Lkotlin/jvm/functions/Function2;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickUserProfile(Lkotlin/jvm/functions/Function2;)V
 
     :cond_2
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->adapter:Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
 
     if-eqz p1, :cond_3
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$3;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$3;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$3;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$3;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickPendingHeaderExpand(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickPendingHeaderExpand(Lkotlin/jvm/functions/Function0;)V
 
     :cond_3
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->adapter:Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
 
     if-eqz p1, :cond_4
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$4;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$4;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickCall(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickCall(Lkotlin/jvm/functions/Function1;)V
 
     :cond_4
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->adapter:Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
 
     if-eqz p1, :cond_5
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$5;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$5;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$5;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$5;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickChat(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickChat(Lkotlin/jvm/functions/Function1;)V
 
     :cond_5
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->adapter:Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
 
     if-eqz p1, :cond_6
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$6;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$6;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$6;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$6;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickAcceptFriend(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickAcceptFriend(Lkotlin/jvm/functions/Function1;)V
 
     :cond_6
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->adapter:Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
 
     if-eqz p1, :cond_7
 
-    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$7;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$7;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$7;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$onViewBound$7;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickDeclineFriend(Lkotlin/jvm/functions/Function2;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->setOnClickDeclineFriend(Lkotlin/jvm/functions/Function2;)V
 
     :cond_7
     new-instance p1, Lcom/discord/widgets/friends/WidgetFriendsListLoadingAdapter;
@@ -825,27 +797,20 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->loadingAdapter:Lcom/discord/widgets/friends/WidgetFriendsListLoadingAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->loadingAdapter:Lcom/discord/widgets/friends/WidgetFriendsListLoadingAdapter;
 
-    if-eqz v1, :cond_8
+    if-eqz v0, :cond_8
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     return-void
 
     :cond_8
     const-string p1, "loadingAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_9
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -855,13 +820,13 @@
 
     iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsList;->viewModel:Lcom/discord/widgets/friends/FriendsListViewModel;
 
-    const-string v1, "viewModel"
+    const-string/jumbo v1, "viewModel"
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -926,12 +891,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali
index e58c19aa8a..69966899f6 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$Item.smali
@@ -25,20 +25,13 @@
 
 # direct methods
 .method public constructor <init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader.smali
index fd201409d5..c1f151e66d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader.smali
@@ -30,25 +30,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader;
 
-    const-class v2, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader;
+    const-string v2, "textView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "textView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTextView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -58,13 +52,15 @@
 .method public constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01c1
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const p1, 0x7f0a03da
+    const p1, 0x7f0a03e0
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -73,15 +69,6 @@
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemHeader;->textView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getTextView()Landroid/widget/TextView;
@@ -109,7 +96,9 @@
 .method public onConfigure(ILcom/discord/widgets/friends/FriendsListViewModel$Item;)V
     .locals 4
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -135,8 +124,6 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    const/4 v3, 0x0
-
     invoke-virtual {p2}, Lcom/discord/widgets/friends/FriendsListViewModel$Item$Header;->getCount()I
 
     move-result p2
@@ -145,6 +132,8 @@
 
     move-result-object p2
 
+    const/4 v3, 0x0
+
     aput-object p2, v2, v3
 
     invoke-static {v0, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -154,15 +143,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader.smali
index cd53420737..20ce41d06a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader.smali
@@ -26,7 +26,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader;
 
@@ -34,41 +34,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "textView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTextView()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "textView"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getTextView()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "expandButton"
 
-    const/4 v3, 0x0
+    const-string v3, "getExpandButton()Landroidx/appcompat/widget/AppCompatTextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "expandButton"
+    const/4 v2, 0x1
 
-    const-string v4, "getExpandButton()Landroidx/appcompat/widget/AppCompatTextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -78,13 +66,15 @@
 .method public constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01c4
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const p1, 0x7f0a03e0
+    const p1, 0x7f0a03e6
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -92,7 +82,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader;->textView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03df
+    const p1, 0x7f0a03e5
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,15 +91,6 @@
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader;->expandButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader;)Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
@@ -167,7 +148,9 @@
 .method public onConfigure(ILcom/discord/widgets/friends/FriendsListViewModel$Item;)V
     .locals 7
 
-    if-eqz p2, :cond_3
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -229,12 +212,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f1207c6
+    const p1, 0x7f1207c8
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1207c5
+    const p1, 0x7f1207c7
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader;->getExpandButton()Landroidx/appcompat/widget/AppCompatTextView;
@@ -257,12 +240,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080222
+    const p1, 0x7f080223
 
     goto :goto_1
 
     :cond_1
-    const p1, 0x7f080221
+    const p1, 0x7f080222
 
     :goto_1
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingHeader;->getExpandButton()Landroidx/appcompat/widget/AppCompatTextView;
@@ -316,15 +299,6 @@
 
     :goto_2
     return-void
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser$1.smali
index 1883dbcbc1..6c31719232 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser$1.smali
@@ -61,9 +61,9 @@
 
     move-result-object p2
 
-    const-string v0, "view"
+    const-string/jumbo v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -78,11 +78,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.friends.FriendsListViewModel.Item.PendingFriendRequest"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser.smali
index 1b610e3942..864ccda508 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser.smali
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;
 
@@ -42,113 +42,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemAvatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemAvatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemAvatar()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemName"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "itemName"
-
-    const-string v5, "getItemName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemActivity"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemActivity()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemActivity"
-
-    const-string v5, "getItemActivity()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemStatus"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemStatus()Lcom/discord/views/StatusView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemStatus"
-
-    const-string v5, "getItemStatus()Lcom/discord/views/StatusView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemAcceptButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemAcceptButton()Landroidx/appcompat/widget/AppCompatImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemAcceptButton"
-
-    const-string v5, "getItemAcceptButton()Landroidx/appcompat/widget/AppCompatImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemDeclineButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemDeclineButton()Landroidx/appcompat/widget/AppCompatImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemDeclineButton"
+    const/4 v2, 0x5
 
-    const-string v4, "getItemDeclineButton()Landroidx/appcompat/widget/AppCompatImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -158,13 +122,15 @@
 .method public constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01c3
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a03d2
+    const v0, 0x7f0a03d8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -172,7 +138,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03db
+    const v0, 0x7f0a03e1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,7 +146,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03d1
+    const v0, 0x7f0a03d7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +154,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;->itemActivity$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03dc
+    const v0, 0x7f0a03e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +162,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;->itemStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03d0
+    const v0, 0x7f0a03d6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -204,7 +170,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;->itemAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03d7
+    const v0, 0x7f0a03dd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,15 +189,6 @@
     invoke-virtual {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemPendingUser;)Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
@@ -369,7 +326,9 @@
 .method public onConfigure(ILcom/discord/widgets/friends/FriendsListViewModel$Item;)V
     .locals 8
 
-    if-eqz p2, :cond_2
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -426,7 +385,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121096
+    const v1, 0x7f1210c0
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -457,7 +416,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120c75
+    const v1, 0x7f120c9b
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -515,15 +474,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali
index 551b7745c8..1356d1556e 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser$1.smali
@@ -61,9 +61,9 @@
 
     move-result-object p2
 
-    const-string v0, "view"
+    const-string/jumbo v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -78,11 +78,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.friends.FriendsListViewModel.Item.Friend"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
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 2d324b3ca7..56db6bac01 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;
 
@@ -42,113 +42,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemAvatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemAvatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemAvatar()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemName"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "itemName"
-
-    const-string v5, "getItemName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemActivity"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemActivity()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemActivity"
-
-    const-string v5, "getItemActivity()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemStatus"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemStatus()Lcom/discord/views/StatusView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemStatus"
-
-    const-string v5, "getItemStatus()Lcom/discord/views/StatusView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemCallButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemCallButton()Landroidx/appcompat/widget/AppCompatImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemCallButton"
-
-    const-string v5, "getItemCallButton()Landroidx/appcompat/widget/AppCompatImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemChatButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemChatButton()Landroidx/appcompat/widget/AppCompatImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemChatButton"
+    const/4 v2, 0x5
 
-    const-string v4, "getItemChatButton()Landroidx/appcompat/widget/AppCompatImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -158,13 +122,15 @@
 .method public constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01c0
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a03d2
+    const v0, 0x7f0a03d8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -172,7 +138,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03db
+    const v0, 0x7f0a03e1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,7 +146,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03d1
+    const v0, 0x7f0a03d7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +154,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemActivity$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03dc
+    const v0, 0x7f0a03e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +162,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03d5
+    const v0, 0x7f0a03db
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -204,7 +170,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;->itemCallButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03d6
+    const v0, 0x7f0a03dc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,15 +189,6 @@
     invoke-virtual {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser;)Lcom/discord/widgets/friends/WidgetFriendsListAdapter;
@@ -369,7 +326,9 @@
 .method public onConfigure(ILcom/discord/widgets/friends/FriendsListViewModel$Item;)V
     .locals 10
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -456,15 +415,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1.smali
index bd0a8c7ac6..d503c3f7d7 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickAcceptFriend$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickCall$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickCall$1.smali
index 243335e0eb..16f29f7338 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickCall$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickCall$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickCall$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickChat$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickChat$1.smali
index 881d21e7b0..37a9f50b85 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickChat$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickChat$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickChat$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickDeclineFriend$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickDeclineFriend$1.smali
index 4be451cdf2..62cf186635 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickDeclineFriend$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickDeclineFriend$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickDeclineFriend$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Integer;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,16 +78,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickPendingHeaderExpand$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickPendingHeaderExpand$1.smali
index 8d5709c7f7..b901ec0183 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickPendingHeaderExpand$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickPendingHeaderExpand$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickPendingHeaderExpand$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1.smali
index 15a1c35459..89431540f2 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/friends/WidgetFriendsListAdapter$onClickUserProfile$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetFriendsListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/models/domain/ModelUser;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,25 +74,13 @@
 .method public final invoke(Landroid/view/View;Lcom/discord/models/domain/ModelUser;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali
index 2252a57cea..4e6a3f6d65 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter.smali
@@ -101,9 +101,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -132,15 +134,6 @@
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->onClickDeclineFriend:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -259,7 +252,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -272,7 +265,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_4
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_3
 
@@ -322,19 +317,10 @@
 
     :goto_0
     return-object p1
-
-    :cond_4
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickAcceptFriend(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -346,24 +332,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->onClickAcceptFriend:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickCall(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -375,24 +354,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->onClickCall:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickChat(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -404,24 +376,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->onClickChat:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickDeclineFriend(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -435,24 +400,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->onClickDeclineFriend:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickPendingHeaderExpand(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -462,24 +420,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->onClickPendingHeaderExpand:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickUserProfile(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -493,18 +444,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsListAdapter;->onClickUserProfile:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.smali
index 634aed7770..a4f9e7bec6 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.smali
@@ -61,24 +61,19 @@
 .method public onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "holder"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/widgets/friends/FriendsListLoadingViewHolder;
 
@@ -100,18 +95,9 @@
 
     const-string v0, "LayoutInflater.from(pare\u2026          false\n        )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/friends/FriendsListLoadingViewHolder;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild.smali
index 91b73e9e5c..45e625cb3e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild.smali
@@ -41,7 +41,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;
 
@@ -49,77 +49,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "name"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "name"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getName()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "iconWrap"
 
-    const/4 v3, 0x0
+    const-string v3, "getIconWrap()Landroid/view/View;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "iconWrap"
-
-    const-string v5, "getIconWrap()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "icon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "icon"
-
-    const-string v5, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "iconText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconText()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "iconText"
+    const/4 v2, 0x3
 
-    const-string v4, "getIconText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -127,19 +103,21 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;I)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iput p3, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->noGuildStringId:I
 
-    const p1, 0x7f0a0485
+    const p1, 0x7f0a048b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +125,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04ae
+    const p1, 0x7f0a04b4
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,7 +133,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->iconWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0483
+    const p1, 0x7f0a0489
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +141,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0484
+    const p1, 0x7f0a048a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -182,15 +160,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -284,11 +253,11 @@
 .end method
 
 .method public onConfigure(ILcom/discord/widgets/guilds/WidgetGuildSelector$Item;)V
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -298,39 +267,39 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->getName()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget v2, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->noGuildStringId:I
+    iget v1, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->noGuildStringId:I
 
-    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
+    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_0
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     if-eqz p1, :cond_2
 
@@ -354,7 +323,7 @@
     const/4 p1, 0x0
 
     :goto_1
-    if-ne p1, v2, :cond_2
+    if-ne p1, v1, :cond_2
 
     invoke-virtual {p2}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -364,46 +333,46 @@
 
     move-result-object p1
 
-    const-string v3, "ICON_UNSET"
+    const-string v2, "ICON_UNSET"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
-    xor-int/2addr p1, v2
+    xor-int/2addr p1, v1
 
     if-eqz p1, :cond_2
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v3
+    move-result-object v2
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     invoke-virtual {p2}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v5
+    move-result-object v4
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v6, "itemView"
+    const-string v5, "itemView"
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f040129
+    const v5, 0x7f040129
 
-    invoke-static {p1, v6}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+    invoke-static {p1, v5}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
     move-result p1
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v8
+    move-result-object v7
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -413,33 +382,35 @@
 
     move-result-object p1
 
-    const v6, 0x7f0700d1
+    const v5, 0x7f0700d1
 
-    invoke-virtual {p1, v6}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {p1, v5}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result p1
 
-    int-to-float v6, p1
+    int-to-float v5, p1
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
-    const/16 v10, 0x8
+    const/16 v9, 0x8
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
-    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/extensions/SimpleDraweeViewExtensionsKt;->configureAsGuildIcon$default(Lcom/facebook/drawee/view/SimpleDraweeView;ZLcom/discord/models/domain/ModelGuild;FLjava/lang/Integer;Ljava/lang/Integer;ZILjava/lang/Object;)V
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/extensions/SimpleDraweeViewExtensionsKt;->configureAsGuildIcon$default(Lcom/facebook/drawee/view/SimpleDraweeView;ZLcom/discord/models/domain/ModelGuild;FLjava/lang/Integer;Ljava/lang/Integer;ZILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->getIconWrap()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, Landroid/view/View;->setClipToOutline(Z)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setClipToOutline(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;->getIconText()Landroid/widget/TextView;
 
     move-result-object p1
 
-    if-eqz v1, :cond_3
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
 
     goto :goto_2
 
@@ -454,20 +425,13 @@
 
     move-result-object p2
 
-    move-object v0, p2
+    move-object v1, p2
 
     :cond_4
     :goto_2
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter.smali
index 0d050e2202..536de8f5d4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Adapter.smali
@@ -38,11 +38,13 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/guilds/WidgetGuildSelector;I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recycler"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dialog"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -51,20 +53,6 @@
     iput p3, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;->noGuildStringId:I
 
     return-void
-
-    :cond_0
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDialog$p(Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;)Lcom/discord/widgets/guilds/WidgetGuildSelector;
@@ -90,24 +78,17 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;
 
-    const p2, 0x7f0d01e3
+    iget p2, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;->noGuildStringId:I
 
-    iget v0, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;->noGuildStringId:I
+    const v0, 0x7f0d01e3
 
-    invoke-direct {p1, p2, p0, v0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;-><init>(ILcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;I)V
+    invoke-direct {p1, v0, p0, p2}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter$ItemGuild;-><init>(ILcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;I)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction.smali
index d069625429..d274a9b2d9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction.smali
@@ -29,22 +29,15 @@
 
 # virtual methods
 .method public includeGuild(Lcom/discord/models/domain/ModelGuild;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction$DefaultImpls;->includeGuild(Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;Lcom/discord/models/domain/ModelGuild;)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Companion.smali
index 4655dee46f..33e8c8d48a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Companion.smali
@@ -152,7 +152,9 @@
 .method public final launch(Landroidx/fragment/app/Fragment;IZILcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/WidgetGuildSelector;
 
@@ -188,7 +190,7 @@
 
     const-string p2, "fragment.parentFragmentManager"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/guilds/WidgetGuildSelector;
 
@@ -199,13 +201,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$FilterFunction$DefaultImpls.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$FilterFunction$DefaultImpls.smali
index 623b5805b7..aba8a8de1b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$FilterFunction$DefaultImpls.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$FilterFunction$DefaultImpls.smali
@@ -18,18 +18,11 @@
 .method public static includeGuild(Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;Lcom/discord/models/domain/ModelGuild;)Z
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p0, "guild"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p0, 0x1
 
     return p0
-
-    :cond_0
-    const-string p0, "guild"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Item.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Item.smali
index 29c918350a..a26062e0e3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Item.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$Item.smali
@@ -84,7 +84,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/WidgetGuildSelector$Item;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1.smali
index cbd454901f..5a65753a75 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1;->this$0:Lcom/discord/widgets/guilds/WidgetGuildSelector;
 
@@ -83,13 +85,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$get$1.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$get$1.smali
index e5b8c365ff..41090f7b1b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildSelector.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/LinkedHashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/guilds/WidgetGuildSelector$Item;",
+        ">;>;"
     }
 .end annotation
 
@@ -84,7 +91,7 @@
 
     const-string v0, "guilds.values"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector$get$1;->$filterFunction:Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;
 
@@ -140,7 +147,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_1
     new-instance v0, Ljava/util/ArrayList;
@@ -179,7 +186,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-static {p1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector.smali b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector.smali
index f58138a2f8..4fac5017f7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/WidgetGuildSelector.smali
@@ -49,25 +49,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/WidgetGuildSelector;
 
-    const-class v2, Lcom/discord/widgets/guilds/WidgetGuildSelector;
+    const-string v2, "list"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "list"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getList()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/guilds/WidgetGuildSelector;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -87,7 +81,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0486
+    const v0, 0x7f0a048c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -110,7 +104,7 @@
     :cond_0
     const-string p0, "adapter"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -161,13 +155,13 @@
 
     invoke-direct {v1, p2, p1}, Lcom/discord/widgets/guilds/WidgetGuildSelector$get$1;-><init>(Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;Z)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream.getGuildsSor\u2026.map { Item(it) }\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -179,7 +173,7 @@
 
     const-string p2, "StoreStream.getGuildsSor\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -265,11 +259,11 @@
 
 # virtual methods
 .method public bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 11
+    .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "compositeSubscription"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppBottomSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
 
@@ -277,58 +271,58 @@
 
     move-result-object p1
 
+    const-string v0, "INTENT_EXTRA_INCLUDE_NO_GUILD"
+
     const/4 v1, 0x0
 
-    const-string v2, "INTENT_EXTRA_INCLUDE_NO_GUILD"
-
-    invoke-virtual {p1, v2, v1}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
+    invoke-virtual {p1, v0, v1}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
 
     move-result p1
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "INTENT_EXTRA_FILTER_FUNCTION"
+    const-string v1, "INTENT_EXTRA_FILTER_FUNCTION"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;
+    instance-of v1, v0, Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;
 
-    if-nez v2, :cond_0
+    const/4 v2, 0x0
 
-    move-object v1, v0
+    if-nez v1, :cond_0
+
+    move-object v0, v2
 
     :cond_0
-    check-cast v1, Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;
+    check-cast v0, Lcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     goto :goto_0
 
     :cond_1
-    new-instance v1, Lcom/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction;
+    new-instance v0, Lcom/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction;
 
-    invoke-direct {v1}, Lcom/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$BaseFilterFunction;-><init>()V
 
     :goto_0
-    invoke-direct {p0, p1, v1}, Lcom/discord/widgets/guilds/WidgetGuildSelector;->get(ZLcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;)Lrx/Observable;
+    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/guilds/WidgetGuildSelector;->get(ZLcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;)Lrx/Observable;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector;->adapter:Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector;->adapter:Lcom/discord/widgets/guilds/WidgetGuildSelector$Adapter;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-static {p1, p0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
+    invoke-static {p1, p0, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
-    const-class v3, Lcom/discord/widgets/guilds/WidgetGuildSelector;
-
-    const/4 v4, 0x0
+    const-class v4, Lcom/discord/widgets/guilds/WidgetGuildSelector;
 
     const/4 v5, 0x0
 
@@ -336,31 +330,26 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v8, p0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1;-><init>(Lcom/discord/widgets/guilds/WidgetGuildSelector;)V
+    new-instance v9, Lcom/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1;
 
-    const/16 v9, 0x1e
+    invoke-direct {v9, p0}, Lcom/discord/widgets/guilds/WidgetGuildSelector$bindSubscriptions$1;-><init>(Lcom/discord/widgets/guilds/WidgetGuildSelector;)V
 
-    const/4 v10, 0x0
+    const/16 v10, 0x1e
 
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
 
     :cond_2
     const-string p1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_3
-    const-string p1, "compositeSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v2
 .end method
 
 .method public getContentViewResId()I
@@ -374,7 +363,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -419,13 +410,4 @@
     iput p1, p0, Lcom/discord/widgets/guilds/WidgetGuildSelector;->requestCode:I
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali
index 073fc51aa1..4938cc5aa0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Create Guild"
 
@@ -53,13 +55,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali
index a068dd90a0..4d05f81b9e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$1.smali
@@ -53,7 +53,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali
index d5c134447a..12b5d4f709 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd$onResume$2.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "Create or Join Guild Modal"
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali
index 15112c9ad8..c8249e7483 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsAdd.smali
@@ -33,41 +33,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;
 
-    const-class v2, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;
+    const-string v2, "joinGuild"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getJoinGuild()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "joinGuild"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getJoinGuild()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;
 
-    const/4 v2, 0x0
+    const-string v2, "createGuild"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCreateGuild()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "createGuild"
-
-    const-string v4, "getCreateGuild()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -91,7 +79,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a041e
+    const v0, 0x7f0a0424
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -99,7 +87,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;->joinGuild$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a041d
+    const v0, 0x7f0a0423
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1.smali
index 5418e620a8..f3db7258f5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "GuildContextMenuViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStoreState"
+
+    const-string v5, "handleStoreState(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;->access$handleStoreState(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory$observeStoreState$1.smali
index 070508cc59..baf43011f9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory$observeStoreState$1.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -77,7 +82,7 @@
 
     const-string v0, "me"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -85,7 +90,7 @@
 
     const-string p2, "isUnread"
 
-    invoke-static {p3, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -93,7 +98,7 @@
 
     const-string p2, "selectedGuildId"
 
-    invoke-static {p4, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p4}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory.smali
index cda01f872e..619786a0a9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory.smali
@@ -35,17 +35,25 @@
 .method public constructor <init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreReadStates;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/utilities/rest/RestAPI;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guildStore"
 
-    if-eqz p3, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string/jumbo v0, "userStore"
 
-    if-eqz p5, :cond_2
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "readStateStore"
 
-    if-eqz p7, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "selectedGuildStore"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "restAPI"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,41 +70,6 @@
     iput-object p7, p0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Factory;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedGuildStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "readStateStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "userStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "guildStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreReadStates;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -244,7 +217,7 @@
 
     const-string p2, "Observable.combineLatest\u2026      )\n        }\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -263,7 +236,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;
 
@@ -278,13 +253,4 @@
     invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;-><init>(JLrx/Observable;Lcom/discord/utilities/rest/RestAPI;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid.smali
index 2f1591084c..6c868e6a5b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid.smali
@@ -28,9 +28,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;JZJ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -43,13 +45,6 @@
     iput-wide p5, p0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;->selectedGuildId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;Lcom/discord/models/domain/ModelGuild;JZJILjava/lang/Object;)Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;
@@ -143,32 +138,25 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;JZJ)Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
 
-    new-instance v7, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-wide v2, p2
+    move-object v2, p1
 
-    move v4, p4
+    move-wide v3, p2
 
-    move-wide v5, p5
+    move v5, p4
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;JZJ)V
+    move-wide v6, p5
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;JZJ)V
 
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -186,7 +174,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Valid;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid.smali
index e421ea1521..0783197ef5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid.smali
@@ -28,9 +28,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;ZZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -43,13 +45,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;->isGuildSelected:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;Lcom/discord/models/domain/ModelGuild;ZZZILjava/lang/Object;)Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;
@@ -127,22 +122,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;ZZZ)Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;ZZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -160,7 +148,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$onMarkAsReadClicked$1.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$onMarkAsReadClicked$1.smali
index 7a485e8dcd..9a94889acb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$onMarkAsReadClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$onMarkAsReadClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$onMarkAsReadClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildContextMenuViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.smali
index 111cec7c0f..454fdb1700 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "GuildContextMenuViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState;",
         ">;"
     }
@@ -62,13 +62,17 @@
         }
     .end annotation
 
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "restAPI"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;->guildId:J
 
@@ -92,6 +96,10 @@
 
     const-class v2, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;
 
+    new-instance v7, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1;-><init>(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -100,10 +108,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$1;-><init>(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -111,20 +115,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getEventSubject$p(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;)Lrx/subjects/PublishSubject;
@@ -216,14 +206,14 @@
     :goto_1
     invoke-direct {v0, v1, v2, v3, v7}, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;ZZZ)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_2
 
     :cond_2
     sget-object v0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$StoreState$Invalid;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -231,7 +221,7 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Invalid;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_3
     :goto_2
@@ -287,7 +277,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$Companion.smali
index cbea61dc30..7cb7576e4f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$Companion.smali
@@ -50,9 +50,9 @@
 
     invoke-virtual {p1, v2, v2}, Landroid/view/View;->measure(II)V
 
-    const-string v0, "view"
+    const-string/jumbo v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getMeasuredHeight()I
 
@@ -84,32 +84,29 @@
 
 # virtual methods
 .method public final hide(Landroidx/fragment/app/FragmentActivity;Z)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "WidgetGuildContextMenu"
+    const-string v1, "WidgetGuildContextMenu"
 
-    invoke-virtual {v1, v2}, Landroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+    invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
+    instance-of v1, v0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    if-nez v2, :cond_0
+    if-nez v1, :cond_0
 
-    goto :goto_0
+    const/4 v0, 0x0
 
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
     if-eqz v0, :cond_4
@@ -118,7 +115,7 @@
 
     invoke-static {v0}, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->access$doCircularRemove(Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
@@ -141,7 +138,7 @@
 
     const-string v0, "activity.window"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/Window;->getDecorView()Landroid/view/View;
 
@@ -149,7 +146,7 @@
 
     const-string v1, "activity.window.decorView"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getRootView()Landroid/view/View;
 
@@ -163,21 +160,23 @@
 
     move-result-object p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/Window;->getDecorView()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getRootView()Landroid/view/View;
 
     move-result-object p1
 
+    check-cast p1, Landroid/view/ViewGroup;
+
     const-string v0, "WidgetGuildContextMenuViewContainer"
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewWithTag(Ljava/lang/Object;)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewWithTag(Ljava/lang/Object;)Landroid/view/View;
 
     move-result-object p1
 
@@ -192,37 +191,32 @@
 
     invoke-static {p1}, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->access$setShowingContextMenu$cp(Z)V
 
-    :goto_1
+    :goto_0
     return-void
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.view.ViewGroup"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final show(Landroidx/fragment/app/FragmentActivity;Landroid/graphics/PointF;J)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "absolutePosition"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->access$isShowingContextMenu$cp()Z
 
@@ -265,7 +259,7 @@
 
     const-string v2, "activity.window"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/Window;->getDecorView()Landroid/view/View;
 
@@ -273,7 +267,7 @@
 
     const-string v2, "activity.window.decorView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getRootView()Landroid/view/View;
 
@@ -371,25 +365,11 @@
     return-void
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.view.ViewGroup"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_3
-    const-string p1, "absolutePosition"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$2.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$2.smali
index 8f2f4ec7af..0d169f8bed 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$2.smali
@@ -65,7 +65,7 @@
 
     const-string v3, "requireActivity()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/servers/WidgetServerNotifications$Companion;->launch(JLandroid/content/Context;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$3.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$3.smali
index 866885f368..a9ffd268a5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$3.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$3;->$viewState:Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.smali
index fe691a017e..eb17c3a6ee 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4.smali
@@ -55,7 +55,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$configureValidUI$4;->$viewState:Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Valid;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.smali
index 922d1154fb..1391407593 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "activity"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$1.smali
index c85e27ea0b..3d4983897e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildContextMenu.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->access$configureUI(Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$2.smali
index 479949ef17..9ae35b857a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$onResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildContextMenu.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->access$handleEvent(Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.smali b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.smali
index f29f4a3914..5175cb2b4c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.smali
@@ -54,121 +54,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    const-class v2, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
+    const-string v2, "guildContextMenuCard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildContextMenuCard()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildContextMenuCard"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildContextMenuCard()Landroidx/cardview/widget/CardView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    const/4 v2, 0x0
+    const-string v2, "header"
 
-    aput-object v1, v0, v2
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "header"
-
-    const-string v4, "getHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    const-class v2, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
+    const-string v2, "markAsReadOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMarkAsReadOption()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "markAsReadOption"
-
-    const-string v4, "getMarkAsReadOption()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    const-class v2, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
+    const-string v2, "notificationsOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsOption()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsOption"
-
-    const-string v4, "getNotificationsOption()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    const-class v2, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
+    const-string v2, "leaveGuildOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLeaveGuildOption()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "leaveGuildOption"
-
-    const-string v4, "getLeaveGuildOption()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
 
-    const-class v2, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;
+    const-string v2, "moreOptionsOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMoreOptionsOption()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "moreOptionsOption"
-
-    const-string v4, "getMoreOptionsOption()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -200,7 +164,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0421
+    const v0, 0x7f0a0427
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -208,7 +172,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->guildContextMenuCard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0422
+    const v0, 0x7f0a0428
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -216,7 +180,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0425
+    const v0, 0x7f0a042b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -224,7 +188,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->markAsReadOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0427
+    const v0, 0x7f0a042d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -232,7 +196,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->notificationsOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0424
+    const v0, 0x7f0a042a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -240,7 +204,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu;->leaveGuildOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0426
+    const v0, 0x7f0a042c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -293,9 +257,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -358,7 +322,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$ViewState$Invalid;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -372,7 +336,7 @@
 
     const-string v1, "requireActivity()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -526,7 +490,7 @@
 
     const-string v3, "requireActivity()"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$Companion;->hide(Landroidx/fragment/app/FragmentActivity;Z)V
 
@@ -606,7 +570,7 @@
 
     const-string v1, "animator"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v1, 0xc8
 
@@ -706,7 +670,7 @@
 
     const-string v2, "animator"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v2, 0xc8
 
@@ -864,7 +828,7 @@
 
     sget-object v0, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Event$Dismiss;->INSTANCE:Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel$Event$Dismiss;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -907,11 +871,11 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -974,12 +938,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -987,7 +951,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 10
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -1035,7 +1001,7 @@
 
     const-string p2, "ViewModelProvider(this, \u2026ewModel::class.java\n    )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel;
 
@@ -1051,13 +1017,4 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$NormalChannel.smali b/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$NormalChannel.smali
index a291e12ff8..0f38e6867d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$NormalChannel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$NormalChannel.smali
@@ -18,18 +18,13 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0, p1, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate;-><init>(Ljava/lang/Long;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$SystemChannel.smali b/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$SystemChannel.smali
index 8e6b6f474b..d3ba184d04 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$SystemChannel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/ChannelTemplate$SystemChannel.smali
@@ -16,26 +16,21 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-wide/16 v1, 0xb
+    const-wide/16 v0, 0xb
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p0, v1, p1, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate;-><init>(Ljava/lang/Long;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v0, p1, v1}, Lcom/discord/widgets/guilds/create/ChannelTemplate;-><init>(Ljava/lang/Long;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload.smali b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload.smali
index 3ae32349bc..ad0755d0c0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;->channel:Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;
@@ -73,22 +66,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -106,7 +92,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder.smali
index f998a426cd..5c92179459 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder.smali
@@ -35,7 +35,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder;
 
@@ -43,41 +43,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "channelImage"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelImage()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "channelImage"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getChannelImage()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "channelName"
 
-    const/4 v3, 0x0
+    const-string v3, "getChannelName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "channelName"
+    const/4 v2, 0x1
 
-    const-string v4, "getChannelName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -85,17 +73,19 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelsAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0487
+    const p1, 0x7f0a048d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -103,7 +93,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder;->channelImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0488
+    const p1, 0x7f0a048e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -112,15 +102,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder;->channelName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getChannelImage()Landroid/widget/ImageView;
@@ -168,7 +149,9 @@
 .method public onConfigure(ILcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelDataPayload;)V
     .locals 3
 
-    if-eqz p2, :cond_4
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -200,7 +183,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f080279
+    const v0, 0x7f08027a
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -221,7 +204,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f08026b
+    const v0, 0x7f08026c
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -232,7 +215,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f080261
+    const v0, 0x7f080262
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -281,7 +264,7 @@
 
     const-string v2, "adapter.context.resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -298,26 +281,17 @@
     goto :goto_1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_3
     :goto_1
     return-void
-
-    :cond_4
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelsAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelsAdapter.smali
index d1385147c2..36bba07df9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelsAdapter.smali
@@ -24,22 +24,15 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -68,7 +61,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder;
 
@@ -77,13 +72,4 @@
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelViewHolder;-><init>(ILcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelsAdapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView.smali b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView.smali
index b3f08cbd03..c205c917d3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/GuildTemplateChannelsView.smali
@@ -31,25 +31,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView;
+    const-string v2, "channelsRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "channelsRecycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getChannelsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -59,15 +53,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a0489
+    const p2, 0x7f0a048f
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -106,20 +102,6 @@
     invoke-virtual {p1, p2}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getChannelsRecycler()Landroidx/recyclerview/widget/RecyclerView;
@@ -156,7 +138,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "channels"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView;->channelsAdapter:Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView$ChannelsAdapter;
 
@@ -199,13 +183,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplate.smali b/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplate.smali
index 288df6f7b9..f2006976b9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplate.smali
@@ -186,7 +186,9 @@
 
     move-object/from16 v0, p1
 
-    if-eqz v0, :cond_0
+    const-string v1, "resources"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Ljava/lang/Enum;->ordinal()I
 
@@ -194,15 +196,15 @@
 
     const-string v3, "resources.getString(R.st\u2026plate_name_announcements)"
 
-    const v4, 0x7f120b68
+    const v4, 0x7f120b8e
 
     const-string v7, "resources.getString(R.st\u2026e_name_welcome_and_rules)"
 
-    const v8, 0x7f120b8b
+    const v8, 0x7f120bb1
 
     const-string v9, "resources.getString(R.st\u2026ame_category_information)"
 
-    const v10, 0x7f120b69
+    const v10, 0x7f120b8f
 
     const-string v11, "resources.getString(R.st\u2026mplate_name_voice_lounge)"
 
@@ -229,7 +231,7 @@
     throw v0
 
     :pswitch_0
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     goto/16 :goto_0
 
@@ -238,7 +240,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v9, v6, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
@@ -248,7 +250,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v10, v8}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -260,7 +262,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v7, v4}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -268,7 +270,7 @@
 
     new-instance v3, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v4, 0x7f120b7e
+    const v4, 0x7f120ba4
 
     invoke-virtual {v0, v4}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -276,7 +278,7 @@
 
     const-string v7, "resources.getString(R.st\u2026_template_name_resources)"
 
-    invoke-static {v4, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v3, v4}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -288,25 +290,25 @@
 
     move-result-object v1
 
-    const v3, 0x7f120b6a
+    const v3, 0x7f120b90
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v6, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v6, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;
 
-    const v7, 0x7f120b71
+    const v7, 0x7f120b97
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-static {v7, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v6, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;-><init>(Ljava/lang/String;)V
 
@@ -314,7 +316,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b76
+    const v6, 0x7f120b9c
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -322,7 +324,7 @@
 
     const-string v7, "resources.getString(R.st\u2026plate_name_meeting_plans)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -330,7 +332,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b7c
+    const v6, 0x7f120ba2
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -338,7 +340,7 @@
 
     const-string v7, "resources.getString(R.st\u2026_template_name_off_topic)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -350,29 +352,29 @@
 
     move-result-object v3
 
-    invoke-static {v1, v3}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v3}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
-    const v3, 0x7f120b6b
+    const v3, 0x7f120b91
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b86
+    const v6, 0x7f120bac
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-static {v6, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -380,7 +382,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b87
+    const v6, 0x7f120bad
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -388,7 +390,7 @@
 
     const-string v6, "resources.getString(R.st\u2026_name_voice_meeting_room)"
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -400,7 +402,7 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -411,7 +413,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v9, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
@@ -421,7 +423,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v10, v8}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -433,7 +435,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v7, v4}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -445,25 +447,25 @@
 
     move-result-object v1
 
-    const v3, 0x7f120b6a
+    const v3, 0x7f120b90
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v6, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v7, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;
 
-    const v8, 0x7f120b71
+    const v8, 0x7f120b97
 
     invoke-virtual {v0, v8}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-static {v8, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v7, v8}, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;-><init>(Ljava/lang/String;)V
 
@@ -471,7 +473,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v7, 0x7f120b6d
+    const v7, 0x7f120b93
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -479,7 +481,7 @@
 
     const-string v8, "resources.getString(R.st\u2026ild_template_name_events)"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -487,7 +489,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v7, 0x7f120b75
+    const v7, 0x7f120b9b
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -495,7 +497,7 @@
 
     const-string v8, "resources.getString(R.st\u2026_name_ideas_and_feedback)"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -507,29 +509,29 @@
 
     move-result-object v3
 
-    invoke-static {v1, v3}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v3}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
-    const v3, 0x7f120b6b
+    const v3, 0x7f120b91
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v6, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b86
+    const v6, 0x7f120bac
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-static {v6, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -537,7 +539,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b82
+    const v6, 0x7f120ba8
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -545,7 +547,7 @@
 
     const-string v7, "resources.getString(R.st\u2026_voice_community_hangout)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -553,7 +555,7 @@
 
     new-instance v2, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v5, 0x7f120b88
+    const v5, 0x7f120bae
 
     invoke-virtual {v0, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -561,7 +563,7 @@
 
     const-string v5, "resources.getString(R.st\u2026e_name_voice_stream_room)"
 
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -573,7 +575,7 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -584,7 +586,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v6, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
@@ -594,7 +596,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v9, v8}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -606,7 +608,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v7, v4}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -618,25 +620,25 @@
 
     move-result-object v1
 
-    const v3, 0x7f120b6a
+    const v3, 0x7f120b90
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v6, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;
 
-    const v7, 0x7f120b71
+    const v7, 0x7f120b97
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-static {v7, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v6, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;-><init>(Ljava/lang/String;)V
 
@@ -644,7 +646,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b76
+    const v6, 0x7f120b9c
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -652,7 +654,7 @@
 
     const-string v7, "resources.getString(R.st\u2026plate_name_meeting_plans)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -664,29 +666,29 @@
 
     move-result-object v3
 
-    invoke-static {v1, v3}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v3}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
-    const v3, 0x7f120b6b
+    const v3, 0x7f120b91
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b86
+    const v6, 0x7f120bac
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-static {v6, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -694,7 +696,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b87
+    const v6, 0x7f120bad
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -702,7 +704,7 @@
 
     const-string v6, "resources.getString(R.st\u2026_name_voice_meeting_room)"
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -714,7 +716,7 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -725,7 +727,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v3, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
@@ -735,7 +737,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, v8}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -743,7 +745,7 @@
 
     new-instance v4, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v7, 0x7f120b7b
+    const v7, 0x7f120ba1
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -751,7 +753,7 @@
 
     const-string v8, "resources.getString(R.st\u2026ate_name_notes_resources)"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -763,13 +765,13 @@
 
     move-result-object v1
 
-    const v3, 0x7f120b6a
+    const v3, 0x7f120b90
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x4
 
@@ -777,13 +779,13 @@
 
     new-instance v7, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;
 
-    const v8, 0x7f120b71
+    const v8, 0x7f120b97
 
     invoke-virtual {v0, v8}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-static {v8, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v7, v8}, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;-><init>(Ljava/lang/String;)V
 
@@ -791,7 +793,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v7, 0x7f120b74
+    const v7, 0x7f120b9a
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -799,7 +801,7 @@
 
     const-string v8, "resources.getString(R.st\u2026plate_name_homework_help)"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -807,7 +809,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v7, 0x7f120b7f
+    const v7, 0x7f120ba5
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -815,7 +817,7 @@
 
     const-string v8, "resources.getString(R.st\u2026te_name_session_planning)"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -823,7 +825,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v7, 0x7f120b7c
+    const v7, 0x7f120ba2
 
     invoke-virtual {v0, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -831,7 +833,7 @@
 
     const-string v8, "resources.getString(R.st\u2026_template_name_off_topic)"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v7}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -843,29 +845,29 @@
 
     move-result-object v3
 
-    invoke-static {v1, v3}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v3}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
-    const v3, 0x7f120b6b
+    const v3, 0x7f120b91
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v6, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b86
+    const v6, 0x7f120bac
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-static {v6, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -873,7 +875,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b89
+    const v6, 0x7f120baf
 
     new-array v7, v2, [Ljava/lang/Object;
 
@@ -889,7 +891,7 @@
 
     const-string v7, "resources.getString(R.st\u2026study_room, 1.toString())"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -897,7 +899,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b89
+    const v6, 0x7f120baf
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -913,7 +915,7 @@
 
     const-string v2, "resources.getString(R.st\u2026study_room, 2.toString())"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -925,32 +927,32 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
     goto/16 :goto_0
 
     :pswitch_5
-    const v1, 0x7f120b6a
+    const v1, 0x7f120b90
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-static {v1, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v3, v6, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v4, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;
 
-    const v6, 0x7f120b71
+    const v6, 0x7f120b97
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;-><init>(Ljava/lang/String;)V
 
@@ -958,7 +960,7 @@
 
     new-instance v4, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v5, 0x7f120b6e
+    const v5, 0x7f120b94
 
     invoke-virtual {v0, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -966,7 +968,7 @@
 
     const-string v6, "resources.getString(R.st\u2026guild_template_name_game)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, v5}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -974,7 +976,7 @@
 
     new-instance v4, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v5, 0x7f120b79
+    const v5, 0x7f120b9f
 
     invoke-virtual {v0, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -982,7 +984,7 @@
 
     const-string v6, "resources.getString(R.st\u2026uild_template_name_music)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, v5}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -994,25 +996,25 @@
 
     move-result-object v1
 
-    const v3, 0x7f120b6b
+    const v3, 0x7f120b91
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b86
+    const v6, 0x7f120bac
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-static {v6, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -1020,7 +1022,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b88
+    const v6, 0x7f120bae
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1028,7 +1030,7 @@
 
     const-string v6, "resources.getString(R.st\u2026e_name_voice_stream_room)"
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -1040,32 +1042,32 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
     goto :goto_0
 
     :pswitch_6
-    const v1, 0x7f120b6a
+    const v1, 0x7f120b90
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-static {v1, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v3, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v4, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;
 
-    const v6, 0x7f120b71
+    const v6, 0x7f120b97
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$SystemChannel;-><init>(Ljava/lang/String;)V
 
@@ -1073,7 +1075,7 @@
 
     new-instance v4, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v5, 0x7f120b6c
+    const v5, 0x7f120b92
 
     invoke-virtual {v0, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1081,7 +1083,7 @@
 
     const-string v6, "resources.getString(R.st\u2026ame_clips_and_highlights)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v4, v5}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -1093,19 +1095,19 @@
 
     move-result-object v1
 
-    const v3, 0x7f120b6b
+    const v3, 0x7f120b91
 
     invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v12, [Lcom/discord/widgets/guilds/create/ChannelTemplate;
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b85
+    const v6, 0x7f120bab
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1113,7 +1115,7 @@
 
     const-string v7, "resources.getString(R.st\u2026emplate_name_voice_lobby)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v6}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -1121,7 +1123,7 @@
 
     new-instance v5, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;
 
-    const v6, 0x7f120b83
+    const v6, 0x7f120ba9
 
     invoke-virtual {v0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1129,7 +1131,7 @@
 
     const-string v6, "resources.getString(R.st\u2026mplate_name_voice_gaming)"
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v5, v0}, Lcom/discord/widgets/guilds/create/ChannelTemplate$NormalChannel;-><init>(Ljava/lang/String;)V
 
@@ -1141,22 +1143,13 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
     :goto_0
     return-object v0
 
-    :cond_0
-    const-string v0, "resources"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
     nop
 
     :pswitch_data_0
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplateKt.smali b/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplateKt.smali
index adba8b8c18..cf1f776c31 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplateKt.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplateKt.smali
@@ -105,7 +105,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v1, v2}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$Companion.smali
index ff833ef1ef..987ae99083 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$Companion.smali
@@ -51,11 +51,13 @@
 .method public final show(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "location"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -74,21 +76,7 @@
 
     const-class p2, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.smali
index 12edc15c6e..cfc4954b7a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.smali
@@ -51,7 +51,7 @@
 
     const-string v0, "channel"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
@@ -97,7 +97,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$2.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$2.smali
index 3e2faa0f25..b91a6aa0e9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$2.smali
@@ -51,7 +51,7 @@
 
     const-string v0, "role"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
 
@@ -65,7 +65,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelGuildRole;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuildRole;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone.smali
index 0510affd52..fe0efc5af5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildClone.smali
@@ -45,101 +45,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "flipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
 
-    const/4 v2, 0x0
+    const-string v2, "guildTemplateName"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildTemplateName()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildTemplateName"
-
-    const-string v4, "getGuildTemplateName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
+    const-string v2, "guildTemplatePreviewRolesLayout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildTemplatePreviewRolesLayout()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildTemplatePreviewRolesLayout"
-
-    const-string v4, "getGuildTemplatePreviewRolesLayout()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
+    const-string v2, "guildTemplatePreviewChannels"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildTemplatePreviewChannels()Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildTemplatePreviewChannels"
-
-    const-string v4, "getGuildTemplatePreviewChannels()Lcom/discord/widgets/guilds/create/GuildTemplateChannelsView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildClone;
+    const-string v2, "guildTemplatePreviewRoles"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildTemplatePreviewRoles()Lcom/discord/widgets/roles/RolesListView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildTemplatePreviewRoles"
-
-    const-string v4, "getGuildTemplatePreviewRoles()Lcom/discord/widgets/roles/RolesListView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -163,7 +133,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;-><init>()V
 
-    const v0, 0x7f0a0429
+    const v0, 0x7f0a042f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -171,7 +141,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildClone;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a048a
+    const v0, 0x7f0a0490
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +149,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildClone;->guildTemplateName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a048d
+    const v0, 0x7f0a0493
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -187,7 +157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildClone;->guildTemplatePreviewRolesLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a048b
+    const v0, 0x7f0a0491
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -195,7 +165,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildClone;->guildTemplatePreviewChannels$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a048c
+    const v0, 0x7f0a0492
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -311,7 +281,9 @@
 .method public configureUI(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;)V
     .locals 6
 
-    if-eqz p1, :cond_a
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->configureUI(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;)V
 
@@ -325,7 +297,7 @@
 
     sget-object v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -354,7 +326,7 @@
 
     sget-object v2, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;->INSTANCE:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -367,7 +339,7 @@
     :cond_1
     sget-object v2, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Invalid;->INSTANCE:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Invalid;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -378,7 +350,7 @@
     :cond_2
     sget-object v2, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$LoadFailed;->INSTANCE:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$LoadFailed;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -396,7 +368,7 @@
     :cond_3
     sget-object v2, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Loading;->INSTANCE:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Loading;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -484,13 +456,13 @@
 
     const-string v4, "guild.channels"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v4, Lcom/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1;
 
     invoke-direct {v4}, Lcom/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1;-><init>()V
 
-    invoke-static {v2, v4}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v2, v4}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v2
 
@@ -502,13 +474,13 @@
 
     const-string v0, "guild.roles"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$2;
 
     invoke-direct {v0}, Lcom/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$2;-><init>()V
 
-    invoke-static {p1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -538,7 +510,7 @@
 
     const-string v5, "role"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
 
@@ -546,7 +518,7 @@
 
     const-string v5, "@everyone"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -602,21 +574,12 @@
     :cond_9
     :goto_3
     return-void
-
-    :cond_a
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public createViewModelFactory()Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;
     .locals 8
 
-    const v0, 0x7f120504
+    const v0, 0x7f120506
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -624,7 +587,7 @@
 
     const-string v0, "getString(R.string.creat\u2026fault_server_name_format)"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$Companion.smali
index e69c29d145..fd2bf36323 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$Companion.smali
@@ -82,13 +82,17 @@
 .method public final show(Landroid/content/Context;Lcom/discord/widgets/guilds/create/StockGuildTemplate;ZLjava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "template"
 
-    if-eqz p4, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "location"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -112,28 +116,7 @@
 
     const-class p2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "template"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali
index 20a202e706..60ce6483d8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali
@@ -41,9 +41,9 @@
 
     iget-object v0, v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const v1, 0x7f12042a
+    const v1, 0x7f12042b
 
-    const v2, 0x7f12164e    # 1.941831E38f
+    const v2, 0x7f121678
 
     invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$2.smali
index e56d9e87d0..484c5cb9b2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildCreate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->updateGuildName(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$3.smali
index 858e0d753c..a6196af646 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$3.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->createGuild(Landroid/content/res/Resources;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$1.smali
index 888b3319af..1fadca6ae8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildCreate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->configureUI(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$2.smali
index 5d8833f567..a914cef67b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildCreate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->access$handleEvent(Lcom/discord/widgets/guilds/create/WidgetGuildCreate;Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 ec6437bfd7..2d05d06c47 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
@@ -53,141 +53,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
+    const-string v2, "screenTitleView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getScreenTitleView()Lcom/discord/views/ScreenTitleView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "screenTitleView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getScreenTitleView()Lcom/discord/views/ScreenTitleView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const/4 v2, 0x0
+    const-string v2, "guildCreateButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildCreateButton()Lcom/discord/views/LoadingButton;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildCreateButton"
-
-    const-string v4, "getGuildCreateButton()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
+    const-string v2, "serverNameView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getServerNameView()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "serverNameView"
-
-    const-string v4, "getServerNameView()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
+    const-string v2, "iconUploaderImage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconUploaderImage()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "iconUploaderImage"
-
-    const-string v4, "getIconUploaderImage()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
+    const-string v2, "iconUploaderPlaceholderGroup"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconUploaderPlaceholderGroup()Landroidx/constraintlayout/widget/Group;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "iconUploaderPlaceholderGroup"
-
-    const-string v4, "getIconUploaderPlaceholderGroup()Landroidx/constraintlayout/widget/Group;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
+    const-string v2, "guildCreateIconUploader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildCreateIconUploader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildCreateIconUploader"
-
-    const-string v4, "getGuildCreateIconUploader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
 
-    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
+    const-string v2, "guidelinesTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuidelinesTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guidelinesTextView"
-
-    const-string v4, "getGuidelinesTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -211,7 +169,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a042e
+    const v0, 0x7f0a0434
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->screenTitleView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0428
+    const v0, 0x7f0a042e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -227,7 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a042c
+    const v0, 0x7f0a0432
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -235,7 +193,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->serverNameView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04d8
+    const v0, 0x7f0a04de
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -243,7 +201,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->iconUploaderImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04da
+    const v0, 0x7f0a04e0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -251,7 +209,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->iconUploaderPlaceholderGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a042b
+    const v0, 0x7f0a0431
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -259,7 +217,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIconUploader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a042a
+    const v0, 0x7f0a0430
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -290,9 +248,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -328,7 +286,7 @@
 
     aput-object v2, v0, v1
 
-    const v1, 0x7f120508
+    const v1, 0x7f12050a
 
     invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -336,7 +294,7 @@
 
     const-string v0, "getString(R.string.creat\u2026idelines, GUIDELINES_URL)"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -344,7 +302,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -520,7 +478,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     goto :goto_0
 
@@ -537,7 +495,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event$LaunchChannelPrompt;
 
@@ -558,7 +516,7 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event$LaunchInviteShareScreen;->INSTANCE:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event$LaunchInviteShareScreen;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -570,7 +528,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
@@ -596,11 +554,13 @@
 .method public configureUI(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;)V
     .locals 11
 
-    if-eqz p1, :cond_7
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -627,7 +587,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -654,7 +614,7 @@
 
     move-result-object v2
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -747,21 +707,12 @@
     :cond_6
     :goto_2
     return-void
-
-    :cond_7
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public createViewModelFactory()Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;
     .locals 8
 
-    const v0, 0x7f120504
+    const v0, 0x7f120506
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -769,7 +720,7 @@
 
     const-string v0, "getString(R.string.creat\u2026fault_server_name_format)"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -856,11 +807,13 @@
 .method public onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -870,7 +823,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v5, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onImageChosen$1;
 
@@ -887,30 +840,18 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/images/MGImages;->prepareImageUpload(Landroid/net/Uri;Ljava/lang/String;Landroidx/fragment/app/FragmentManager;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Lrx/functions/Action1;Lcom/discord/dialogs/ImageUploadDialog$PreviewType;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -925,26 +866,14 @@
     invoke-static {v0, p1, p2, v1}, Lcom/discord/utilities/images/MGImages;->requestDataUrl(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -989,15 +918,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1021,7 +941,7 @@
 
     const-string v1, "ViewModelProvider(this, \u2026ateViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
 
@@ -1029,11 +949,11 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1100,12 +1020,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1.smali
index 8c2cd09f21..c34ba5ebeb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildCreateViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->handleStoreState(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1.smali
index a7c8d3b0cf..ee3c718b30 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildCreateViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;",
@@ -46,73 +46,43 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;)Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory.smali
index 01ab0f5dc8..92cb7dfa09 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory.smali
@@ -35,11 +35,13 @@
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/widgets/guilds/create/StockGuildTemplate;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "defaultGuildNameFormat"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "analyticLocation"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,26 +58,12 @@
     iput-object p6, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->customTitle:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "analyticLocation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "defaultGuildNameFormat"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 9
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -86,11 +74,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->defaultGuildNameFormat:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->defaultGuildNameFormat:Ljava/lang/String;
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->stockGuildTemplate:Lcom/discord/widgets/guilds/create/StockGuildTemplate;
 
@@ -102,19 +92,19 @@
     sget-object v0, Lcom/discord/widgets/guilds/create/StockGuildTemplate;->CREATE:Lcom/discord/widgets/guilds/create/StockGuildTemplate;
 
     :goto_0
-    move-object v3, v0
+    move-object v4, v0
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v2
+    move-result-object v3
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getGuildSelected()Lcom/discord/stores/StoreGuildSelected;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -126,77 +116,68 @@
 
     move-result-object v0
 
-    const/4 v5, 0x1
+    const/4 v1, 0x1
 
-    invoke-virtual {v0, v5}, Lrx/Observable;->V(I)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->V(I)Lrx/Observable;
 
     move-result-object v0
 
-    iget-object v5, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->guildTemplateCode:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->guildTemplateCode:Ljava/lang/String;
 
-    if-nez v5, :cond_1
+    if-nez v1, :cond_1
 
-    sget-object v5, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;->INSTANCE:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;
+    sget-object v1, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;->INSTANCE:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$None;
 
-    new-instance v6, Lr0/l/e/j;
+    new-instance v6, Ls0/l/e/j;
 
-    invoke-direct {v6, v5}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v6, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
     :cond_1
-    sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getGuildTemplates()Lcom/discord/stores/StoreGuildTemplates;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuildTemplates()Lcom/discord/stores/StoreGuildTemplates;
 
-    move-result-object v5
+    move-result-object v1
 
     iget-object v6, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->guildTemplateCode:Ljava/lang/String;
 
-    invoke-virtual {v5, v6}, Lcom/discord/stores/StoreGuildTemplates;->observeGuildTemplate(Ljava/lang/String;)Lrx/Observable;
+    invoke-virtual {v1, v6}, Lcom/discord/stores/StoreGuildTemplates;->observeGuildTemplate(Ljava/lang/String;)Lrx/Observable;
 
     move-result-object v6
 
     :goto_1
-    sget-object v5, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1;->INSTANCE:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1;
+    sget-object v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1;->INSTANCE:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory$create$1;
 
-    if-eqz v5, :cond_2
+    if-eqz v1, :cond_2
 
     new-instance v7, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$sam$rx_functions_Func2$0;
 
-    invoke-direct {v7, v5}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$sam$rx_functions_Func2$0;-><init>(Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {v7, v1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$sam$rx_functions_Func2$0;-><init>(Lkotlin/jvm/functions/Function2;)V
 
-    move-object v5, v7
+    move-object v1, v7
 
     :cond_2
-    check-cast v5, Lrx/functions/Func2;
+    check-cast v1, Lrx/functions/Func2;
 
-    invoke-static {v0, v6, v5}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-static {v0, v6, v1}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
-    move-result-object v5
+    move-result-object v6
 
     const-string v0, "Observable.combineLatest\u2026 ::StoreState\n          )"
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v6, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->showChannelPrompt:Z
+    iget-boolean v7, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->showChannelPrompt:Z
 
-    iget-object v7, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->analyticLocation:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->analyticLocation:Ljava/lang/String;
 
-    iget-object v8, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->customTitle:Ljava/lang/String;
+    iget-object v9, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Factory;->customTitle:Ljava/lang/String;
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;-><init>(Ljava/lang/String;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/widgets/guilds/create/StockGuildTemplate;Lcom/discord/stores/StoreGuildSelected;Lrx/Observable;ZLjava/lang/String;Ljava/lang/String;)V
+    invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;-><init>(Ljava/lang/String;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/widgets/guilds/create/StockGuildTemplate;Lcom/discord/stores/StoreGuildSelected;Lrx/Observable;ZLjava/lang/String;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_3
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState.smali
index 1510d657e9..d7771eb205 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "meUser"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildTemplate"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->guildTemplate:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;ILjava/lang/Object;)Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;
@@ -98,31 +86,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;)Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "meUser"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildTemplate"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->guildTemplate:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized.smali
index 16a01b60b7..d4cefbe7a2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized.smali
@@ -30,12 +30,16 @@
 .method public constructor <init>(Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
     .locals 1
 
+    const-string v0, "guildTemplate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildNameText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->guildTemplate:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
@@ -49,20 +53,6 @@
     iput-object p5, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->customTitle:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildNameText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
@@ -175,11 +165,13 @@
 .method public final copy(Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "guildTemplate"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildNameText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
 
@@ -198,20 +190,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;-><init>(Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildNameText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildTemplate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -229,7 +207,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->guildTemplate:Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -239,7 +217,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->guildNameText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -249,7 +227,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->guildIconUri:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -265,7 +243,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->customTitle:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1.smali
index cb8fe2c711..233be536f2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildCreateViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "createdGuild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->access$handleGuildCreateSuccess(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;Lcom/discord/models/domain/ModelGuild;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "createdGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2.smali
index b9c9e13fbc..359fdcdf12 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildCreateViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->access$handleGuildCreateFailure(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali
index 9054c4e83e..7123b745c5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetGuildCreateViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState;",
         ">;"
     }
@@ -62,7 +62,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/widgets/guilds/create/StockGuildTemplate;Lcom/discord/stores/StoreGuildSelected;Lrx/Observable;ZLjava/lang/String;Ljava/lang/String;)V
-    .locals 17
+    .locals 13
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -79,11 +79,11 @@
         }
     .end annotation
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
-    move-object/from16 v1, p1
+    move-object v1, p1
 
-    move-object/from16 v2, p2
+    move-object v2, p2
 
     move-object/from16 v3, p3
 
@@ -93,23 +93,33 @@
 
     move-object/from16 v6, p7
 
-    const/4 v7, 0x0
+    const-string v7, "defaultGuildNameFormat"
 
-    if-eqz v1, :cond_5
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_4
+    const-string v7, "restAPI"
 
-    if-eqz v3, :cond_3
+    invoke-static {p2, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_2
+    const-string v7, "stockGuildTemplate"
 
-    if-eqz v5, :cond_1
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_0
+    const-string v7, "selectedGuildStore"
 
-    sget-object v8, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, v8}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    const-string v7, "storeObservable"
+
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "analyticLocation"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v7, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v7}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object v1, v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->defaultGuildNameFormat:Ljava/lang/String;
 
@@ -139,75 +149,35 @@
 
     iget-object v1, v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->storeObservable:Lrx/Observable;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x0
 
-    invoke-static {v1, v0, v7, v2, v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v3, 0x2
 
-    move-result-object v8
+    invoke-static {v1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v9, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
+    move-result-object v4
 
-    const/4 v10, 0x0
+    const-class v5, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
 
-    const/4 v11, 0x0
+    new-instance v10, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1;-><init>(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v11, 0x1e
 
     const/4 v12, 0x0
 
-    const/4 v13, 0x0
-
-    new-instance v14, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1;
-
-    invoke-direct {v14, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$1;-><init>(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
-
-    const/16 v15, 0x1e
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v8 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "analyticLocation"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_1
-    const-string v1, "storeObservable"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_2
-    const-string v1, "selectedGuildStore"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_3
-    const-string v1, "stockGuildTemplate"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_4
-    const-string v1, "restAPI"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_5
-    const-string v1, "defaultGuildNameFormat"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
 .end method
 
 .method public static final synthetic access$handleGuildCreateFailure(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
@@ -245,7 +215,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -280,7 +250,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -333,40 +303,42 @@
 
 # virtual methods
 .method public final createGuild(Landroid/content/res/Resources;)V
-    .locals 12
+    .locals 13
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "resources"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
+    instance-of v1, v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
 
-    if-nez v2, :cond_0
+    const/4 v2, 0x0
 
-    move-object v1, v0
+    if-nez v1, :cond_0
+
+    move-object v0, v2
 
     :cond_0
-    move-object v2, v1
+    move-object v3, v0
 
-    check-cast v2, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
+    check-cast v3, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
 
-    if-eqz v2, :cond_4
+    if-eqz v3, :cond_4
 
-    invoke-virtual {v2}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildNameText()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildNameText()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildIconUri()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v2}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildIconUri()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v2}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->isBusy()Z
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->isBusy()Z
 
     move-result v4
 
@@ -375,7 +347,7 @@
     return-void
 
     :cond_1
-    invoke-static {v1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v4
 
@@ -383,7 +355,7 @@
 
     new-instance p1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event$ShowToast;
 
-    const v0, 0x7f121452
+    const v0, 0x7f12147c
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event$ShowToast;-><init>(I)V
 
@@ -392,7 +364,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {v2}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
     move-result-object v4
 
@@ -402,7 +374,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
     move-result-object v4
 
@@ -418,7 +390,7 @@
 
     new-instance v5, Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;
 
-    invoke-direct {v5, v1, v3}, Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v5, v0, v1}, Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {p1, v4, v5}, Lcom/discord/utilities/rest/RestAPI;->createGuildFromTemplate(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$CreateGuildFromTemplate;)Lrx/Observable;
 
@@ -447,74 +419,67 @@
 
     move-result-object v6
 
-    invoke-direct {v5, v1, v3, p1, v6}, Lcom/discord/restapi/RestAPIParams$CreateGuild;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;)V
+    invoke-direct {v5, v0, v1, p1, v6}, Lcom/discord/restapi/RestAPIParams$CreateGuild;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Long;)V
 
     invoke-virtual {v4, v5}, Lcom/discord/utilities/rest/RestAPI;->createGuild(Lcom/discord/restapi/RestAPIParams$CreateGuild;)Lrx/Observable;
 
     move-result-object p1
 
     :goto_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-static {p1, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
+    invoke-static {p1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v2, v0, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v4
 
-    const-class v4, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
-
-    const/4 v5, 0x0
+    const-class v5, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;
 
     const/4 v6, 0x0
 
-    new-instance v9, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1;
-
-    invoke-direct {v9, p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1;-><init>(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
-
-    const/4 v8, 0x0
-
-    new-instance v7, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2;-><init>(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
-
-    const/16 v10, 0x16
-
-    const/4 v11, 0x0
-
-    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x1
-
     const/4 v7, 0x0
 
-    const/16 v8, 0x17
+    new-instance v10, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$1;-><init>(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
 
     const/4 v9, 0x0
 
-    invoke-static/range {v2 .. v9}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->copy$default(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
+    new-instance v8, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$2;-><init>(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;)V
+
+    const/16 v11, 0x16
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v7, 0x1
+
+    const/4 v8, 0x0
+
+    const/16 v9, 0x17
+
+    const/4 v10, 0x0
+
+    invoke-static/range {v3 .. v10}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;->copy$default(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "resources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleStoreState(Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;)V
@@ -522,69 +487,69 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->getMeUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
+
+    new-instance v7, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
-    move-result-object v3
+    move-result-object v2
 
-    iget-object v2, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->defaultGuildNameFormat:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->defaultGuildNameFormat:Ljava/lang/String;
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    new-array v5, v4, [Ljava/lang/Object;
-
-    const/4 v6, 0x0
-
-    aput-object v1, v5, v6
-
-    const-string v1, "java.lang.String.format(this, *args)"
-
-    invoke-static {v5, v4, v2, v1}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v4
+    new-array v4, v3, [Ljava/lang/Object;
 
     const/4 v5, 0x0
 
-    iget-object v7, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->customTitle:Ljava/lang/String;
+    aput-object v0, v4, v5
 
-    new-instance v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
+    const-string v0, "java.lang.String.format(this, *args)"
 
-    move-object v2, v1
+    invoke-static {v4, v3, v1, v0}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;-><init>(Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
+    move-result-object v3
 
-    invoke-virtual {p0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    iget-object v6, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->customTitle:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->didTrackCreateGuildViewed:Z
+    const/4 v4, 0x0
 
-    if-nez v1, :cond_1
+    move-object v1, v7
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;-><init>(Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
+
+    invoke-virtual {p0, v7}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
+
+    iget-boolean v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->didTrackCreateGuildViewed:Z
+
+    if-nez v0, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v1, v1, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Loading;
+    instance-of v0, v0, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Loading;
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v1, v1, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;
+    instance-of v0, v0, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$StoreState;->getGuildTemplate()Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState;
 
@@ -594,26 +559,24 @@
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreGuildTemplates$GuildTemplateState$Resolved;->getGuildTemplate()Lcom/discord/models/domain/ModelGuildTemplate;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
-    sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    const/4 p1, 0x0
+
+    :goto_0
+    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->stockGuildTemplate:Lcom/discord/widgets/guilds/create/StockGuildTemplate;
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel;->analyticLocation:Ljava/lang/String;
 
-    invoke-virtual {p1, v1, v0, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->createGuildViewed(Lcom/discord/widgets/guilds/create/StockGuildTemplate;Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)V
+    invoke-virtual {v0, v1, p1, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->createGuildViewed(Lcom/discord/widgets/guilds/create/StockGuildTemplate;Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final observeEvents()Lrx/Observable;
@@ -631,7 +594,7 @@
 
     const-string v1, "eventsSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -641,7 +604,7 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -676,7 +639,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -687,24 +650,21 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
+    const-string v0, "guildName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     move-object v1, v0
 
     check-cast v1, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$ViewState$Initialized;
@@ -729,15 +689,8 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
index b87bcd9c25..9e36c4cd87 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
@@ -7,11 +7,13 @@
 .method public static final copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Landroid/content/Intent;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "mostRecentIntent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "com.discord.intent.ORIGIN_SOURCE"
 
@@ -35,31 +37,17 @@
 
     const-string v0, "context.resources"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->getInviteLink(Lcom/discord/models/domain/ModelInvite;Landroid/content/res/Resources;)Ljava/lang/String;
 
     move-result-object p1
 
-    const p2, 0x7f120d3c
+    const p2, 0x7f120d62
 
-    invoke-static {p0, p1, p2}, Lf/a/b/n;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+    invoke-static {p0, p1, p2}, Lf/a/b/p;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
     return-void
-
-    :cond_1
-    const-string p0, "mostRecentIntent"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final getInviteLink(Lcom/discord/models/domain/ModelInvite;Landroid/content/res/Resources;)Ljava/lang/String;
@@ -78,7 +66,7 @@
 
     const-string p0, "inviteModel.toLink(resou\u2026 BuildConfig.HOST_INVITE)"
 
-    invoke-static {v0, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object v0
@@ -87,7 +75,9 @@
 .method public static final shareLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "invite"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteShareClicked(Lcom/discord/models/domain/ModelInvite;)V
 
@@ -99,7 +89,7 @@
 
     const-string v1, "context.resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->getInviteLink(Lcom/discord/models/domain/ModelInvite;Landroid/content/res/Resources;)Ljava/lang/String;
 
@@ -109,7 +99,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1215d5
+    const v1, 0x7f1215ff
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -117,19 +107,10 @@
 
     const-string v1, "context.resources.getStr\u2026ip_instant_invite_title3)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, v0}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p0, "invite"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali
index de64972aa2..243dcb8640 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState.smali
@@ -136,7 +136,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->lastGeneratedInvite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$1.smali
index f3a3273155..173528f45e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generate$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/invite/InviteGenerator$generate$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "InviteGenerator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/InviteGenerator;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/invite/InviteGenerator;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleGeneratedInvite"
+
+    const-string v5, "handleGeneratedInvite(Lcom/discord/models/domain/ModelInvite;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGeneratedInvite"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/invite/InviteGenerator;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleGeneratedInvite(Lcom/discord/models/domain/ModelInvite;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelInvite;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/invite/InviteGenerator;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->access$handleGeneratedInvite(Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/models/domain/ModelInvite;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1.smali
index e7e9f54ebd..5209bf5d5d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "InviteGenerator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/models/domain/ModelInvite;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "invite"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;->this$0:Lcom/discord/widgets/guilds/invite/InviteGenerator;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->access$handleGeneratedInvite(Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/models/domain/ModelInvite;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "invite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
index 80e7ab6392..bf972d1b18 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
@@ -64,7 +64,7 @@
 
     const-string v1, "generationStateSubject.distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationState:Lrx/Observable;
 
@@ -110,7 +110,7 @@
 
     const-string v1, "generationStateSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
 
@@ -148,55 +148,57 @@
 .end method
 
 .method public final generate(Lcom/discord/app/AppFragment;J)V
-    .locals 8
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "generationStateSubject"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
 
-    const-string v2, "generationStateSubject"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
-
-    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
+    const/4 v2, 0x0
 
     const/4 v3, 0x1
 
-    invoke-static {v1, v0, v3, v3, v0}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->copy$default(Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Lcom/discord/models/domain/ModelInvite;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
+    invoke-static {v0, v2, v3, v3, v2}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->copy$default(Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Lcom/discord/models/domain/ModelInvite;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v2, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
 
-    move-result-object v2
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    const/4 v6, 0x2
+    const/4 v7, 0x2
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
-    move-wide v3, p2
+    move-wide v4, p2
 
-    invoke-static/range {v2 .. v7}, Lcom/discord/stores/StoreInviteSettings;->generateInvite$default(Lcom/discord/stores/StoreInviteSettings;JLcom/discord/models/domain/ModelInvite$Settings;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static/range {v3 .. v8}, Lcom/discord/stores/StoreInviteSettings;->generateInvite$default(Lcom/discord/stores/StoreInviteSettings;JLcom/discord/models/domain/ModelInvite$Settings;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p2
 
     const/4 p3, 0x2
 
-    invoke-static {p1, v0, p3}, Lf/a/b/q;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
+    invoke-static {p1, v2, p3}, Lf/a/b/s;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
 
     move-result-object p3
 
@@ -204,7 +206,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object p3, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -218,66 +220,61 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/InviteGenerator$generate$2;-><init>(Lcom/discord/widgets/guilds/invite/InviteGenerator;)V
 
-    invoke-virtual {p3, p1, v0, v1}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {p3, p1, v0, v1}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p1
 
     invoke-virtual {p2, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final generateForAppComponent(Lcom/discord/app/AppComponent;J)V
-    .locals 10
+    .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "appComponent"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v1, "generationStateSubject"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
 
-    const-string v2, "generationStateSubject"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
-
-    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/InviteGenerator;->generationStateSubject:Lrx/subjects/BehaviorSubject;
+    const/4 v2, 0x0
 
     const/4 v3, 0x1
 
-    invoke-static {v1, v0, v3, v3, v0}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->copy$default(Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Lcom/discord/models/domain/ModelInvite;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
+    invoke-static {v0, v2, v3, v3, v2}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->copy$default(Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Lcom/discord/models/domain/ModelInvite;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v2, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
 
-    move-result-object v2
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    const/4 v6, 0x2
+    const/4 v7, 0x2
 
-    const/4 v7, 0x0
+    const/4 v8, 0x0
 
-    move-wide v3, p2
+    move-wide v4, p2
 
-    invoke-static/range {v2 .. v7}, Lcom/discord/stores/StoreInviteSettings;->generateInvite$default(Lcom/discord/stores/StoreInviteSettings;JLcom/discord/models/domain/ModelInvite$Settings;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static/range {v3 .. v8}, Lcom/discord/stores/StoreInviteSettings;->generateInvite$default(Lcom/discord/stores/StoreInviteSettings;JLcom/discord/models/domain/ModelInvite$Settings;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p2
 
@@ -287,36 +284,27 @@
 
     const/4 p3, 0x2
 
-    invoke-static {p2, p1, v0, p3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p2, p1, v2, p3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v3
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/InviteGenerator;
+    const-class v4, Lcom/discord/widgets/guilds/invite/InviteGenerator;
 
-    const/4 v3, 0x0
+    new-instance v9, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;
 
-    const/4 v4, 0x0
+    invoke-direct {v9, p0}, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;-><init>(Lcom/discord/widgets/guilds/invite/InviteGenerator;)V
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;
+    const/4 v7, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;-><init>(Lcom/discord/widgets/guilds/invite/InviteGenerator;)V
+    const/16 v10, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v11, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getGenerationState()Lrx/Observable;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$Channel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$Channel.smali
index bb84bf9f5a..c2bc8742f7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$Channel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$Channel.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$User.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$User.smali
index bd52aeb364..32ee2008ec 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$User.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestion$User.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali
index 5f6290df47..c1cd0f69fb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali
@@ -27,7 +27,18 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Lcom/discord/widgets/guilds/invite/UserAffinityData;",
+        ">;"
     }
 .end annotation
 
@@ -73,15 +84,15 @@
 
     const-string v2, "affinityUserIds"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "users"
+    const-string/jumbo v2, "users"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "relationships"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, p1, p2}, Lcom/discord/widgets/guilds/invite/UserAffinityData;-><init>(Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali
index f8bc5cafb4..d1d4538a68 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali
@@ -3,7 +3,7 @@
 .source "InviteSuggestionsService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/guilds/invite/UserAffinityData;",
+        ">;>;"
     }
 .end annotation
 
@@ -70,6 +75,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/guilds/invite/UserAffinityData;",
             ">;"
         }
@@ -83,7 +89,7 @@
 
     const-string v1, "affinityUserIds"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->observeUsers(Ljava/util/Collection;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali
index bebc8327f8..0cbeeb1d04 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali
@@ -29,7 +29,21 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lcom/discord/widgets/guilds/invite/UserAffinityData;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/guilds/invite/InviteSuggestion;",
+        ">;>;"
     }
 .end annotation
 
@@ -111,13 +125,13 @@
 
     const-string v2, "mostRecentMessages"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, p2}, Lcom/discord/utilities/channel/ChannelUtils;->createMostRecentChannelComparator(Ljava/util/Map;)Ljava/util/Comparator;
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p1, p2}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -231,7 +245,7 @@
 
     move-result-object v5
 
-    invoke-static {v4, v5}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v4, v5}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -243,7 +257,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -280,7 +294,7 @@
     goto :goto_2
 
     :cond_9
-    invoke-static {v1}, Lj0/i/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1}, Lk0/j/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p3
 
@@ -334,7 +348,7 @@
 
     check-cast v3, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {p2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
index a124e4b41c..84c30c2b32 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
@@ -45,17 +45,25 @@
 .method public constructor <init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreMessagesMostRecent;Lcom/discord/stores/StoreUserAffinities;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreUserRelationships;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeChannels"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "storeMessagesMostRecent"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "storeUserAffinities"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUsers"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUserRelationships"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,41 +78,6 @@
     iput-object p5, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeUserRelationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUserAffinities"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeMessagesMostRecent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -189,7 +162,7 @@
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;-><init>(Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -201,7 +174,7 @@
 
     const-string v1, "Observable.combineLatest\u2026 inviteSuggestionList\n  }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali b/com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali
index 608863f2e2..9324284a21 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali
@@ -58,13 +58,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userIds"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "users"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relationships"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -75,27 +79,6 @@
     iput-object p3, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/UserAffinityData;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/UserAffinityData;
@@ -202,40 +185,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "userIds"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "users"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "relationships"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/UserAffinityData;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/UserAffinityData;-><init>(Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -253,7 +219,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -263,7 +229,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -273,7 +239,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali
index 333f04d4e0..c8d2cdd74d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "ViewInviteSettingsSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Ljava/lang/String;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "getExpireAfterString"
+
+    const-string v5, "getExpireAfterString(I)Ljava/lang/String;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getExpireAfterString"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getExpireAfterString(I)Ljava/lang/String;"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali
index f70d47f1c0..45db92c3e7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "ViewInviteSettingsSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Ljava/lang/String;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "getMaxUsesString"
+
+    const-string v5, "getMaxUsesString(I)Ljava/lang/String;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getMaxUsesString"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "getMaxUsesString(I)Ljava/lang/String;"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.smali
index 277ba72f5d..721d1d9c6d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewInviteSettingsSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Integer;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,12 +54,12 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f0a01b5
+    const v0, 0x7f0a01b8
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f0a01b6
+    const v0, 0x7f0a01b9
 
     :goto_0
     return v0
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter.smali
index 0f34365f63..5aa8603c9f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter.smali
@@ -30,31 +30,19 @@
 .method public constructor <init>(Landroid/content/Context;I[Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "channels"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/ArrayAdapter;-><init>(Landroid/content/Context;I[Ljava/lang/Object;)V
 
     iput-object p3, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;->channels:[Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;I[Lcom/discord/models/domain/ModelChannel;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -93,9 +81,9 @@
     move-result-object p3
 
     :goto_0
-    const-string p2, "view"
+    const-string/jumbo p2, "view"
 
-    invoke-static {p3, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p3, p1, p4}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;->setupViews(Landroid/view/View;IZ)V
 
@@ -121,7 +109,7 @@
 
     const-string p3, "label"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x1
 
@@ -151,7 +139,7 @@
 
     const-string p3, "java.lang.String.format(format, *args)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
@@ -173,7 +161,9 @@
 .method public getDropDownView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p3, 0x7f0d0113
 
@@ -184,15 +174,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getItem(I)Lcom/discord/models/domain/ModelChannel;
@@ -218,7 +199,9 @@
 .method public getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p3, 0x7f0d0112
 
@@ -229,34 +212,18 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData([Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "newData"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;->channels:[Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p0}, Landroid/widget/ArrayAdapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "newData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1.smali
index 0587f16f47..63f06f81cd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewInviteSettingsSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali
index 327084930c..1d74859d84 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.smali
@@ -51,11 +51,13 @@
         }
     .end annotation
 
-    const/4 p4, 0x0
+    const-string p4, "parent"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo p1, "view"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1;->this$0:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
@@ -83,24 +85,10 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
 
 .method public onNothingSelected(Landroid/widget/AdapterView;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -109,16 +97,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali
index 91b09c40d9..527b79b874 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewInviteSettingsSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite$Settings;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelInvite$Settings;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 1d70f31d99..1c81391105 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
@@ -63,101 +63,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+    const-string v2, "channelSpinner"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelSpinner()Landroid/widget/Spinner;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "channelSpinner"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getChannelSpinner()Landroid/widget/Spinner;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "expiresAfterRadioGroup"
 
-    aput-object v1, v0, v2
+    const-string v3, "getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "expiresAfterRadioGroup"
-
-    const-string v4, "getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+    const-string v2, "maxUsesRadioGroup"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMaxUsesRadioGroup()Landroid/widget/RadioGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "maxUsesRadioGroup"
-
-    const-string v4, "getMaxUsesRadioGroup()Landroid/widget/RadioGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+    const-string v2, "temporaryMembershipSwitch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTemporaryMembershipSwitch()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "temporaryMembershipSwitch"
-
-    const-string v4, "getTemporaryMembershipSwitch()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
+    const-string v2, "generateLinkButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGenerateLinkButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "generateLinkButton"
-
-    const-string v4, "getGenerateLinkButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -171,27 +141,29 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a0432
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a0438
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a043e
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a043c
+    const p1, 0x7f0a0442
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -199,7 +171,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0445
+    const p1, 0x7f0a044b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -207,7 +179,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0439
+    const p1, 0x7f0a043f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,7 +195,7 @@
 
     const-string v0, "context"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f0d0112
 
@@ -259,7 +231,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->setFocusable(Z)V
 
-    const p1, 0x7f120d56
+    const p1, 0x7f120d7c
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -283,7 +255,7 @@
 
     const-string v1, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1;
 
@@ -299,7 +271,7 @@
 
     const-string v1, "ModelInvite.Settings.MAX_USES_ARRAY"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2;
 
@@ -310,45 +282,38 @@
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected()V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrSet"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f0a0432
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a0438
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a043e
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a043c
+    const p1, 0x7f0a0442
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -356,7 +321,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0445
+    const p1, 0x7f0a044b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -364,7 +329,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0439
+    const p1, 0x7f0a043f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -380,7 +345,7 @@
 
     const-string p2, "context"
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f0d0112
 
@@ -416,7 +381,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->setFocusable(Z)V
 
-    const p1, 0x7f120d56
+    const p1, 0x7f120d7c
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -440,7 +405,7 @@
 
     const-string v0, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1;
 
@@ -456,7 +421,7 @@
 
     const-string v0, "ModelInvite.Settings.MAX_USES_ARRAY"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2;
 
@@ -467,50 +432,38 @@
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected()V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrSet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "ctx"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrSet"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a0432
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a0438
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a043e
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a043c
+    const p1, 0x7f0a0442
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -518,7 +471,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0445
+    const p1, 0x7f0a044b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -526,7 +479,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0439
+    const p1, 0x7f0a043f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -542,7 +495,7 @@
 
     const-string p2, "context"
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f0d0112
 
@@ -578,7 +531,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->setFocusable(Z)V
 
-    const p1, 0x7f120d56
+    const p1, 0x7f120d7c
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -602,7 +555,7 @@
 
     const-string p3, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$1;
 
@@ -618,7 +571,7 @@
 
     const-string p3, "ModelInvite.Settings.MAX_USES_ARRAY"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$2;
 
@@ -629,20 +582,6 @@
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->setOnItemSelected()V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrSet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getChannelsSpinnerAdapter$p(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;
@@ -796,11 +735,11 @@
     goto :goto_1
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.RadioGroup.LayoutParams"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -813,11 +752,11 @@
     goto :goto_0
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.RadioButton"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -889,13 +828,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f100030
 
@@ -918,13 +857,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v2, v4, [Ljava/lang/Object;
 
@@ -947,13 +886,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v2, v4, [Ljava/lang/Object;
 
@@ -976,13 +915,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v2, v4, [Ljava/lang/Object;
 
@@ -1003,13 +942,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f100033
 
@@ -1030,7 +969,7 @@
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f120fa6
+    const p1, 0x7f120fd0
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1157,203 +1096,205 @@
 
 # virtual methods
 .method public final configureUi(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_12
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelsSpinnerAdapter:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelsSpinnerAdapter:Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvitableChannels()Ljava/util/List;
 
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    new-array v4, v3, [Lcom/discord/models/domain/ModelChannel;
-
-    invoke-interface {v2, v4}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_11
-
-    check-cast v2, [Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v1, v2}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;->setData([Lcom/discord/models/domain/ModelChannel;)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvitableChannels()Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
     move-result-object v1
 
     const/4 v2, 0x0
 
+    new-array v3, v2, [Lcom/discord/models/domain/ModelChannel;
+
+    invoke-interface {v1, v3}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_11
+
+    check-cast v1, [Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter;->setData([Lcom/discord/models/domain/ModelChannel;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvitableChannels()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
     :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v3
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
-    if-eqz v4, :cond_2
+    if-eqz v3, :cond_2
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v3
 
-    check-cast v4, Lcom/discord/models/domain/ModelChannel;
+    check-cast v3, Lcom/discord/models/domain/ModelChannel;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v6
+    move-result-object v5
 
-    if-eqz v6, :cond_0
+    if-eqz v5, :cond_0
 
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v8
+    move-result-wide v7
 
-    cmp-long v4, v6, v8
+    cmp-long v3, v5, v7
 
-    if-nez v4, :cond_0
+    if-nez v3, :cond_0
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     goto :goto_1
 
     :cond_0
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :goto_1
-    if-eqz v4, :cond_1
+    if-eqz v3, :cond_1
 
     goto :goto_2
 
     :cond_1
-    add-int/lit8 v2, v2, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_2
-    const/4 v2, -0x1
+    const/4 v1, -0x1
 
     :goto_2
-    invoke-static {v2, v3}, Ljava/lang/Math;->max(II)I
+    invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
 
-    move-result v1
+    move-result v0
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getChannelSpinner()Landroid/widget/Spinner;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2, v1, v3}, Landroid/widget/Spinner;->setSelection(IZ)V
+    invoke-virtual {v1, v0, v2}, Landroid/widget/Spinner;->setSelection(IZ)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_10
+    if-eqz v0, :cond_10
 
-    iput-object v1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Landroid/widget/RadioGroup;->getChildCount()I
+    invoke-virtual {v0}, Landroid/widget/RadioGroup;->getChildCount()I
 
-    move-result v1
+    move-result v0
 
-    invoke-static {v3, v1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v2, v0}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    const/16 v4, 0xa
+    const/16 v3, 0xa
 
-    invoke-static {v1, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v0, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v6
+    move-result v5
 
-    invoke-direct {v2, v6}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v1, v5}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_3
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v6
+    move-result v5
 
-    const-string v7, "null cannot be cast to non-null type android.widget.RadioButton"
+    const-string v6, "null cannot be cast to non-null type android.widget.RadioButton"
 
-    if-eqz v6, :cond_4
+    if-eqz v5, :cond_4
 
-    move-object v6, v1
+    move-object v5, v0
 
-    check-cast v6, Lj0/i/q;
+    check-cast v5, Lk0/j/q;
 
-    invoke-virtual {v6}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v5}, Lk0/j/q;->nextInt()I
 
-    move-result v6
+    move-result v5
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-virtual {v8, v6}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {v7, v5}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
 
-    move-result-object v6
+    move-result-object v5
 
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    check-cast v6, Landroid/widget/RadioButton;
+    check-cast v5, Landroid/widget/RadioButton;
 
-    invoke-interface {v2, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_3
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v7}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v6}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_4
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_5
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v5, 0x0
+
+    if-eqz v1, :cond_7
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v1
 
-    :cond_5
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    move-object v7, v1
 
-    move-result v2
+    check-cast v7, Landroid/widget/RadioButton;
 
-    if-eqz v2, :cond_7
+    invoke-virtual {v7}, Landroid/widget/RadioButton;->getId()I
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object v6, v2
-
-    check-cast v6, Landroid/widget/RadioButton;
-
-    invoke-virtual {v6}, Landroid/widget/RadioButton;->getId()I
-
-    move-result v6
+    move-result v7
 
     iget-object v8, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
 
@@ -1363,126 +1304,126 @@
 
     move-result v8
 
-    if-ne v6, v8, :cond_6
+    if-ne v7, v8, :cond_6
 
-    const/4 v6, 0x1
+    const/4 v7, 0x1
 
     goto :goto_4
 
     :cond_6
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
     :goto_4
-    if-eqz v6, :cond_5
+    if-eqz v7, :cond_5
 
     goto :goto_5
 
     :cond_7
-    move-object v2, v0
+    move-object v1, v5
 
     :goto_5
-    check-cast v2, Landroid/widget/RadioButton;
+    check-cast v1, Landroid/widget/RadioButton;
 
-    if-eqz v2, :cond_8
+    if-eqz v1, :cond_8
 
-    invoke-virtual {v2, v5}, Landroid/widget/RadioButton;->setChecked(Z)V
+    invoke-virtual {v1, v4}, Landroid/widget/RadioButton;->setChecked(Z)V
 
     :cond_8
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getExpiresAfterRadioGroup()Landroid/widget/RadioGroup;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;
+    new-instance v1, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$4;-><init>(Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;)V
 
-    invoke-virtual {v1, v2}, Landroid/widget/RadioGroup;->setOnCheckedChangeListener(Landroid/widget/RadioGroup$OnCheckedChangeListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/RadioGroup;->setOnCheckedChangeListener(Landroid/widget/RadioGroup$OnCheckedChangeListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getMaxUsesRadioGroup()Landroid/widget/RadioGroup;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Landroid/widget/RadioGroup;->getChildCount()I
+    invoke-virtual {v0}, Landroid/widget/RadioGroup;->getChildCount()I
 
-    move-result v1
+    move-result v0
 
-    invoke-static {v3, v1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v2, v0}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Ljava/util/ArrayList;
+    new-instance v1, Ljava/util/ArrayList;
 
-    invoke-static {v1, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v0, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v4
+    move-result v3
 
-    invoke-direct {v2, v4}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v1, v3}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
     :goto_6
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v3
 
-    if-eqz v4, :cond_a
+    if-eqz v3, :cond_a
 
-    move-object v4, v1
+    move-object v3, v0
 
-    check-cast v4, Lj0/i/q;
+    check-cast v3, Lk0/j/q;
 
-    invoke-virtual {v4}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v3}, Lk0/j/q;->nextInt()I
 
-    move-result v4
+    move-result v3
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getMaxUsesRadioGroup()Landroid/widget/RadioGroup;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-virtual {v6, v4}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {v7, v3}, Landroid/widget/RadioGroup;->getChildAt(I)Landroid/view/View;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-eqz v4, :cond_9
+    if-eqz v3, :cond_9
 
-    check-cast v4, Landroid/widget/RadioButton;
+    check-cast v3, Landroid/widget/RadioButton;
 
-    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_6
 
     :cond_9
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v7}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v6}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_a
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_b
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_d
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v1
 
-    :cond_b
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    move-object v3, v1
 
-    move-result v2
+    check-cast v3, Landroid/widget/RadioButton;
 
-    if-eqz v2, :cond_d
+    invoke-virtual {v3}, Landroid/widget/RadioButton;->getId()I
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object v4, v2
-
-    check-cast v4, Landroid/widget/RadioButton;
-
-    invoke-virtual {v4}, Landroid/widget/RadioButton;->getId()I
-
-    move-result v4
+    move-result v3
 
     iget-object v6, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->pendingInviteSettings:Lcom/discord/models/domain/ModelInvite$Settings;
 
@@ -1492,26 +1433,26 @@
 
     move-result v6
 
-    if-ne v4, v6, :cond_c
+    if-ne v3, v6, :cond_c
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     goto :goto_7
 
     :cond_c
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
     :goto_7
-    if-eqz v4, :cond_b
+    if-eqz v3, :cond_b
 
-    move-object v0, v2
+    move-object v5, v1
 
     :cond_d
-    check-cast v0, Landroid/widget/RadioButton;
+    check-cast v5, Landroid/widget/RadioButton;
 
-    if-eqz v0, :cond_e
+    if-eqz v5, :cond_e
 
-    invoke-virtual {v0, v5}, Landroid/widget/RadioButton;->setChecked(Z)V
+    invoke-virtual {v5, v4}, Landroid/widget/RadioButton;->setChecked(Z)V
 
     :cond_e
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getMaxUsesRadioGroup()Landroid/widget/RadioGroup;
@@ -1534,10 +1475,10 @@
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite$Settings;->isTemporary()Z
 
-    move-result v3
+    move-result v2
 
     :cond_f
-    invoke-virtual {v0, v3}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+    invoke-virtual {v0, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->getTemporaryMembershipSwitch()Lcom/discord/views/CheckedSetting;
 
@@ -1563,20 +1504,13 @@
     return-void
 
     :cond_11
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_12
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getOnGenerateLinkListener()Lkotlin/jvm/functions/Function0;
@@ -1622,9 +1556,9 @@
     return-object v0
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1632,7 +1566,7 @@
 .end method
 
 .method public final setOnGenerateLinkListener(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1642,24 +1576,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->onGenerateLinkListener:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setUpdateSettings(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1671,37 +1598,23 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->updateSettings:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setViewModel(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali
index e0f14b021d..addc03149a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$Companion.smali
@@ -36,13 +36,17 @@
 .method public final launch(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "code"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "location"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -58,28 +62,7 @@
 
     const-class p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1.smali
index f51b46b409..2268b08a89 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->access$onAcceptedGuildInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;Lcom/discord/models/domain/ModelInvite;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.smali
index 774fa5a80f..05bd48cb56 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.smali
@@ -73,7 +73,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1;)V
 
-    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali
index 748cbc1e8b..5ed59a2c91 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildInvite.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/stores/StoreInstantInvites$InviteState;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,14 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreInstantInvites$InviteState;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreInstantInvites$InviteState;
+    instance-of p1, p1, Lcom/discord/stores/StoreInstantInvites$InviteState$Loading;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1;->call(Lcom/discord/stores/StoreInstantInvites$InviteState;)Z
-
-    move-result p1
+    xor-int/lit8 p1, p1, 0x1
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -75,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreInstantInvites$InviteState;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/stores/StoreInstantInvites$InviteState$Loading;
+    check-cast p1, Lcom/discord/stores/StoreInstantInvites$InviteState;
 
-    xor-int/lit8 p1, p1, 0x1
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1;->call(Lcom/discord/stores/StoreInstantInvites$InviteState;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1.smali
index bf3330c414..fb356154ad 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInvite.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreInstantInvites$InviteState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
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 243d87b5ab..c1ea922261 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali
@@ -47,81 +47,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
+    const-string v2, "guildInviteInfo"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildInviteInfo()Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildInviteInfo"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildInviteInfo()Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
-    const/4 v2, 0x0
+    const-string v2, "guildInviteAcceptButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildInviteAcceptButton()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildInviteAcceptButton"
-
-    const-string v4, "getGuildInviteAcceptButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
+    const-string v2, "guildInviteButtonCancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildInviteButtonCancel()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildInviteButtonCancel"
-
-    const-string v4, "getGuildInviteButtonCancel()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;
+    const-string v2, "guildInviteSplash"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildInviteSplash()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildInviteSplash"
-
-    const-string v4, "getGuildInviteSplash()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -145,7 +121,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a043a
+    const v0, 0x7f0a0440
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +129,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->guildInviteInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a042f
+    const v0, 0x7f0a0435
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +137,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->guildInviteAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0431
+    const v0, 0x7f0a0437
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,7 +145,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->guildInviteButtonCancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0442
+    const v0, 0x7f0a0448
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -458,16 +434,16 @@
 
     if-eqz v0, :cond_0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -489,7 +465,7 @@
 
     sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$getResolvedInviteOrDefault$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -498,9 +474,9 @@
     :cond_1
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
@@ -523,7 +499,7 @@
 
     const-string v1, "Intent()\n        .addFla\u2026FLAG_ACTIVITY_CLEAR_TASK)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -533,7 +509,7 @@
 
     const-string v2, "context ?: return"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -547,7 +523,7 @@
 
     const-string v4, "invite.channel"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -662,7 +638,7 @@
     invoke-virtual {v0, p1, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
 
     :cond_3
-    invoke-static {v1, v3, v0, v4}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {v1, v3, v0, v4}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
@@ -750,9 +726,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -760,9 +736,11 @@
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x0
 
-    invoke-static {p0, v1, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static {p0, v0, p1, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -779,13 +757,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -825,7 +796,7 @@
 
     const-string v1, "getResolvedInviteOrDefault(inviteCode)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -843,7 +814,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v1, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -857,7 +828,7 @@
 
     invoke-direct {v4, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite$onViewBoundOrOnResume$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;)V
 
-    invoke-virtual {v1, v2, v3, v4}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v1, v2, v3, v4}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1.smali
index fa22990683..7b6b9c8e01 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1.smali
@@ -27,7 +27,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/guilds/invite/InviteSuggestion;",
+        ">;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/guilds/invite/InviteSuggestion;",
+        ">;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali
index 095fd08403..9175215ebb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$source:Ljava/lang/String;
 
@@ -83,16 +85,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$arguments:Landroid/content/Intent;
 
-    invoke-static {p1, v0, v1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, v1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3.smali
index 82e313ad07..47dc18e380 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -133,7 +133,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3;->$arguments:Landroid/content/Intent;
 
-    invoke-static {v0, p1, v1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {v0, p1, v1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali
index d25fe94800..c959f0c5e6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion.smali
@@ -62,85 +62,89 @@
 
     move-object/from16 v1, p4
 
-    const/4 v2, 0x0
+    const-string v2, "context"
 
-    if-eqz v0, :cond_2
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_1
+    const-string v2, "source"
 
-    new-instance v3, Landroid/content/Intent;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v3}, Landroid/content/Intent;-><init>()V
+    new-instance v2, Landroid/content/Intent;
 
-    const-string v4, "INTENT_IS_NUX_FLOW"
+    invoke-direct {v2}, Landroid/content/Intent;-><init>()V
 
-    move/from16 v5, p2
+    const-string v3, "INTENT_IS_NUX_FLOW"
 
-    invoke-virtual {v3, v4, v5}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
+    move/from16 v4, p2
+
+    invoke-virtual {v2, v3, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
 
     if-eqz p3, :cond_0
 
     invoke-virtual/range {p3 .. p3}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v3
 
     goto :goto_0
 
     :cond_0
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
     :goto_0
-    const-string v6, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v5, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-virtual {v3, v6, v4, v5}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+    invoke-virtual {v2, v5, v3, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
 
-    const-string v4, "com.discord.intent.ORIGIN_SOURCE"
+    const-string v3, "com.discord.intent.ORIGIN_SOURCE"
 
-    invoke-virtual {v3, v4, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
+    invoke-virtual {v2, v3, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
-    sget-object v4, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->Companion:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
+    sget-object v3, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->Companion:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
 
-    invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;->create()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;->create()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
+
+    move-result-object v3
+
+    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
 
     move-result-object v4
 
-    sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    const/4 v5, 0x2
 
-    invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+    const-string v6, "2020-01_mobile_invite_suggestion_compact"
 
-    move-result-object v5
+    const/4 v7, 0x0
 
-    const/4 v6, 0x2
-
-    const-string v7, "2020-01_mobile_invite_suggestion_compact"
-
-    invoke-static {v5, v7, v2, v6, v2}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v2
-
-    invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->observeInviteSuggestions()Lrx/Observable;
+    invoke-static {v4, v6, v7, v5, v7}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
+    invoke-virtual {v3}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->observeInviteSuggestions()Lrx/Observable;
+
+    move-result-object v3
+
     sget-object v5, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1;
 
-    invoke-static {v2, v4, v5}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-static {v4, v3, v5}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
     const-string v4, "Observable.combineLatest\u2026-> exp to inviteService }"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+    invoke-static {v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
     const-wide/16 v4, 0x32
 
     const/4 v6, 0x0
 
-    invoke-static {v2, v4, v5, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout(Lrx/Observable;JZ)Lrx/Observable;
+    invoke-static {v3, v4, v5, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout(Lrx/Observable;JZ)Lrx/Observable;
 
     move-result-object v7
 
@@ -152,13 +156,13 @@
 
     new-instance v11, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;
 
-    invoke-direct {v11, v1, v0, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;-><init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
+    invoke-direct {v11, v1, v0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;-><init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
 
     const/4 v12, 0x0
 
     new-instance v13, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3;
 
-    invoke-direct {v13, v1, v0, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3;-><init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
+    invoke-direct {v13, v1, v0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3;-><init>(Ljava/lang/String;Landroid/content/Context;Landroid/content/Intent;)V
 
     const/16 v14, 0x16
 
@@ -167,18 +171,4 @@
     invoke-static/range {v7 .. v15}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string v0, "source"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_2
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali
index fdca5fde73..cb2021eb6f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;Lcom/discord/models/domain/ModelChannel;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;
@@ -89,22 +84,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;-><init>(Lcom/discord/models/domain/ModelChannel;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali
index 43a2729930..de716e6538 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "user"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;Lcom/discord/models/domain/ModelUser;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;
@@ -89,22 +84,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;-><init>(Lcom/discord/models/domain/ModelUser;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali
index c8ef8f77bf..4c86a5272c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali
@@ -39,7 +39,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;
 
@@ -47,77 +47,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "icon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "icon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "name"
 
-    const/4 v3, 0x0
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "name"
-
-    const-string v5, "getName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "invite"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInvite()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "invite"
-
-    const-string v5, "getInvite()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "sent"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSent()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "sent"
+    const/4 v2, 0x3
 
-    const-string v4, "getSent()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -127,13 +103,15 @@
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01da
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0554
+    const p1, 0x7f0a055a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +119,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056d
+    const p1, 0x7f0a0573
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -149,7 +127,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0555
+    const p1, 0x7f0a055b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +135,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->invite$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056e
+    const p1, 0x7f0a0574
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -166,15 +144,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->sent$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
@@ -274,7 +243,9 @@
 
     move-object/from16 v0, p2
 
-    if-eqz v0, :cond_7
+    const-string v1, "data"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -478,17 +449,6 @@
 
     :goto_5
     return-void
-
-    :cond_7
-    move-object/from16 v3, p0
-
-    const-string v0, "data"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali
index bf5b80ba05..b45c6513c9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali
index 2c152756a2..98f6912d77 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali
@@ -44,9 +44,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -55,15 +57,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->onClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -98,26 +91,19 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClick(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -129,18 +115,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->onClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali
index 08cb239798..c98afd9cca 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
@@ -80,13 +82,4 @@
     invoke-static {v0, p1, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali
index ee7ae03faa..2f0d4d5d03 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali
@@ -45,7 +45,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali
index 6f19e55218..2d83458d8b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali
@@ -89,7 +89,7 @@
 
     const-string v1, "settings.mergeMaxAge(\n  \u2026ngs.ONE_DAY\n            )"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1.smali
index 5830499d0c..5bcff596b6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1.smali
index 0854dacf97..f55a93c9dd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheetBehavior$1.smali
@@ -39,24 +39,19 @@
 .method public onSlide(Landroid/view/View;F)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "bottomSheet"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "bottomSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onStateChanged(Landroid/view/View;I)V
     .locals 8
 
-    if-eqz p1, :cond_3
+    const-string v0, "bottomSheet"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x8
 
@@ -120,13 +115,4 @@
     invoke-static/range {v2 .. v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "bottomSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali
index a08609e59c..f6626d6336 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1.smali
@@ -50,21 +50,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 5
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
@@ -111,17 +97,31 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
     const/4 v4, 0x6
 
-    invoke-static {v0, v1, v3, v4}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {v0, v1, v3, v4}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     goto :goto_0
 
     :cond_1
     :goto_1
-    return v1
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali
index c2eb398a4c..6b94d54aaf 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateSearchQuery(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.smali
index 1cf4a4b301..a76108390f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -73,10 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.smali
index 6ae806e88c..e8d199ebbc 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.guilds.invite.WidgetGuildInviteShareViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali
index 4ea5d65794..f5f3cd264d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildInviteShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
index 216bd52b64..fa9d6d3914 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
@@ -67,201 +67,141 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "searchInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "searchInput"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const/4 v2, 0x0
+    const-string v2, "suggestionsFlipper"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSuggestionsFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "suggestionsFlipper"
-
-    const-string v4, "getSuggestionsFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "suggestionRv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "suggestionRv"
-
-    const-string v4, "getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "emptyResults"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptyResults()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptyResults"
-
-    const-string v4, "getEmptyResults()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "shareBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getShareBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "shareBtn"
-
-    const-string v4, "getShareBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "neverExpireSwitch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNeverExpireSwitch()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "neverExpireSwitch"
-
-    const-string v4, "getNeverExpireSwitch()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "inviteLinkTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteLinkTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inviteLinkTv"
-
-    const-string v4, "getInviteLinkTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "inviteSettingsBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteSettingsBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inviteSettingsBtn"
-
-    const-string v4, "getInviteSettingsBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "backgroundTint"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBackgroundTint()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "backgroundTint"
-
-    const-string v4, "getBackgroundTint()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;
+    const-string v2, "bottomSheet"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bottomSheet"
-
-    const-string v4, "getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
@@ -285,7 +225,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0441
+    const v0, 0x7f0a0447
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -293,7 +233,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0444
+    const v0, 0x7f0a044a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -301,7 +241,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->suggestionsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0443
+    const v0, 0x7f0a0449
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -309,7 +249,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->suggestionRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0433
+    const v0, 0x7f0a0439
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -317,7 +257,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->emptyResults$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a043f
+    const v0, 0x7f0a0445
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -325,7 +265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->shareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a043d
+    const v0, 0x7f0a0443
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -333,7 +273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->neverExpireSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a043b
+    const v0, 0x7f0a0441
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -341,7 +281,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->inviteLinkTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a043e
+    const v0, 0x7f0a0444
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -357,7 +297,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052b
+    const v0, 0x7f0a0531
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -398,7 +338,7 @@
     :cond_0
     const-string p0, "bottomSheetBehavior"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -445,9 +385,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -517,7 +457,7 @@
 
     if-ne v4, v6, :cond_0
 
-    invoke-static {v2}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v2}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -548,7 +488,7 @@
     goto :goto_2
 
     :cond_2
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v2, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_2
     invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
@@ -856,12 +796,12 @@
     return-void
 
     :cond_e
-    invoke-static {v8}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v8}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
     :cond_f
-    invoke-static {v8}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v8}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 .end method
@@ -1106,9 +1046,9 @@
     return-void
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1160,7 +1100,7 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
@@ -1183,7 +1123,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1211,7 +1151,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1233,23 +1173,23 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -1261,31 +1201,31 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
+    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v4, "resources"
+    const-string v3, "resources"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
 
-    invoke-direct {p1, v1, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {p1, v0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(\n     \u2026areViewModel::class.java)"
+    const-string v0, "ViewModelProvider(\n     \u2026areViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
@@ -1295,131 +1235,133 @@
 
     move-result-object p1
 
-    const-string v1, "INTENT_IS_NUX_FLOW"
+    const-string v0, "INTENT_IS_NUX_FLOW"
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {p1, v1, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+    invoke-virtual {p1, v0, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
 
     move-result p1
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v3, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
-    invoke-virtual {v1, v3, v4, v5}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {v0, v2, v3, v4}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    cmp-long v1, v6, v4
+    const/4 v0, 0x0
 
-    if-eqz v1, :cond_1
+    cmp-long v2, v5, v3
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    if-eqz v2, :cond_1
 
-    if-eqz v1, :cond_0
+    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {v1, v6, v7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2, v5, v6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
 
     goto :goto_0
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
     :goto_0
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    const/4 v1, 0x2
+    const/4 v9, 0x2
 
     if-eqz p1, :cond_2
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v5, "requireContext()"
+    const-string v4, "requireContext()"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f04028a
+    const v4, 0x7f04028a
 
-    invoke-static {v3, v5, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v2, v4, v1, v9, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v5, v3
+    move-object v4, v2
 
     goto :goto_1
 
     :cond_2
-    move-object v5, v0
+    move-object v4, v0
 
     :goto_1
     if-eqz p1, :cond_3
 
-    const v3, 0x7f12043a
+    const v2, 0x7f12043b
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v6, v3
+    move-object v5, v2
 
     goto :goto_2
 
     :cond_3
-    move-object v6, v0
+    move-object v5, v0
 
     :goto_2
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    move-object v3, p0
+    move-object v2, p0
 
-    invoke-static/range {v3 .. v9}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static/range {v2 .. v8}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v3, 0x7f120d4a
+    const v2, 0x7f120d70
 
-    invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_4
+    if-eqz v2, :cond_4
 
-    invoke-virtual {v3}, Landroid/app/Activity;->getWindow()Landroid/view/Window;
+    invoke-virtual {v2}, Landroid/app/Activity;->getWindow()Landroid/view/Window;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_4
+    if-eqz v2, :cond_4
 
-    const/16 v4, 0x20
+    const/16 v3, 0x20
 
-    invoke-virtual {v3, v4}, Landroid/view/Window;->setSoftInputMode(I)V
+    invoke-virtual {v2, v3}, Landroid/view/Window;->setSoftInputMode(I)V
 
     :cond_4
-    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;
+    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;
 
-    invoke-direct {v3, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Z)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Z)V
 
-    invoke-static {p0, v3, v2, v1, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p0, v2, v1, v9, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -1441,7 +1383,7 @@
 
     const-string v1, "BottomSheetBehavior.from(bottomSheet)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
@@ -1480,14 +1422,7 @@
     :cond_5
     const-string p1, "bottomSheetBehavior"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -1503,7 +1438,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1513,19 +1448,19 @@
 
     sget-object v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v2, "filter { it is T }.map { it as T }"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;
 
@@ -1560,14 +1495,14 @@
     :cond_0
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item.smali
index 343bfca001..c3e1453f75 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item.smali
@@ -39,7 +39,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;
 
@@ -47,77 +47,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "icon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "icon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "name"
 
-    const/4 v3, 0x0
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "name"
-
-    const-string v5, "getName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "invite"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInvite()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "invite"
-
-    const-string v5, "getInvite()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "sent"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSent()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "sent"
+    const/4 v2, 0x3
 
-    const-string v4, "getSent()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -127,13 +103,15 @@
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01da
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0554
+    const p1, 0x7f0a055a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +119,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056d
+    const p1, 0x7f0a0573
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -149,7 +127,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0555
+    const p1, 0x7f0a055b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +135,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;->invite$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056e
+    const p1, 0x7f0a0574
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -166,15 +144,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;->sent$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;
@@ -274,7 +243,9 @@
 
     move-object/from16 v0, p2
 
-    if-eqz v0, :cond_7
+    const-string v1, "data"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -478,17 +449,6 @@
 
     :goto_5
     return-void
-
-    :cond_7
-    move-object/from16 v3, p0
-
-    const-string v0, "data"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$onClick$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$onClick$1.smali
index 0f24d6439f..5173d88730 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$onClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$onClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$onClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareCompact.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter.smali
index b4bbabbe42..bfb7764c7e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter.smali
@@ -44,9 +44,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -55,15 +57,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;->onClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -98,26 +91,19 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClick(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -129,18 +115,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;->onClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$configureUI$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$configureUI$3.smali
index 8d5b2eb3b6..3615e9df8a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$configureUI$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareCompact.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$configureUI$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
@@ -80,13 +82,4 @@
     invoke-static {v0, p1, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheet$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheet$1.smali
index 57883d7e0b..2be17f26a1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheet$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheet$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareCompact.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheetBehavior$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheetBehavior$1.smali
index b38045bbab..9f0f9ae565 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheetBehavior$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$initBottomSheetBehavior$1.smali
@@ -39,24 +39,19 @@
 .method public onSlide(Landroid/view/View;F)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "bottomSheet"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "bottomSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onStateChanged(Landroid/view/View;I)V
     .locals 7
 
-    if-eqz p1, :cond_2
+    const-string v0, "bottomSheet"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x5
 
@@ -100,13 +95,4 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "bottomSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1.smali
index aa2541a868..11100045cf 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1.smali
@@ -50,21 +50,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 5
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
@@ -111,17 +97,31 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
     const/4 v4, 0x6
 
-    invoke-static {v0, v1, v3, v4}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {v0, v1, v3, v4}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     goto :goto_0
 
     :cond_1
     :goto_1
-    return v1
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$2.smali
index b22bd3ed70..efe5e079ba 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareCompact.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateSearchQuery(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.smali
index b8aa675386..f00ad2aa29 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -73,10 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.smali
index 95fef33207..19f4a8a12b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.guilds.invite.WidgetGuildInviteShareViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1.smali
index 177b99e6d4..b6567ede05 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildInviteShareCompact.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->access$configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.smali
index 2ba9142411..ae3928ced4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.smali
@@ -59,181 +59,127 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "searchInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "searchInput"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const/4 v2, 0x0
+    const-string v2, "suggestionsFlipper"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSuggestionsFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "suggestionsFlipper"
-
-    const-string v4, "getSuggestionsFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "suggestionRv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "suggestionRv"
-
-    const-string v4, "getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "emptyResults"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptyResults()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptyResults"
-
-    const-string v4, "getEmptyResults()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "shareBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getShareBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "shareBtn"
-
-    const-string v4, "getShareBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "inviteSettingsBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteSettingsBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inviteSettingsBtn"
-
-    const-string v4, "getInviteSettingsBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "guildInviteExpirationTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildInviteExpirationTv()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildInviteExpirationTv"
-
-    const-string v4, "getGuildInviteExpirationTv()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "backgroundTint"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBackgroundTint()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "backgroundTint"
-
-    const-string v4, "getBackgroundTint()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;
+    const-string v2, "bottomSheet"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bottomSheet"
-
-    const-string v4, "getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
@@ -249,7 +195,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0440
+    const v0, 0x7f0a0446
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +203,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0444
+    const v0, 0x7f0a044a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -265,7 +211,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->suggestionsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0443
+    const v0, 0x7f0a0449
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -273,7 +219,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->suggestionRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0433
+    const v0, 0x7f0a0439
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -281,7 +227,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->emptyResults$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a043f
+    const v0, 0x7f0a0445
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -289,7 +235,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->shareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a043e
+    const v0, 0x7f0a0444
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -297,7 +243,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->inviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a043d
+    const v0, 0x7f0a0443
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -313,7 +259,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052b
+    const v0, 0x7f0a0531
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -354,7 +300,7 @@
     :cond_0
     const-string p0, "bottomSheetBehavior"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -371,9 +317,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -441,7 +387,7 @@
 
     if-ne v3, v5, :cond_0
 
-    invoke-static {v1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -472,7 +418,7 @@
     goto :goto_2
 
     :cond_2
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_2
     invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
@@ -737,12 +683,12 @@
     return-void
 
     :cond_d
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
     :cond_e
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 .end method
@@ -967,9 +913,9 @@
     return-void
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1007,7 +953,7 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
@@ -1030,7 +976,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1058,7 +1004,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1080,23 +1026,23 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;
+    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -1108,31 +1054,31 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
+    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v4, "resources"
+    const-string v3, "resources"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
 
-    invoke-direct {p1, v1, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {p1, v0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(\n     \u2026areViewModel::class.java)"
+    const-string v0, "ViewModelProvider(\n     \u2026areViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
@@ -1142,114 +1088,116 @@
 
     move-result-object p1
 
-    const-string v1, "INTENT_IS_NUX_FLOW"
+    const-string v0, "INTENT_IS_NUX_FLOW"
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {p1, v1, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+    invoke-virtual {p1, v0, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
 
     move-result p1
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v3, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
-    invoke-virtual {v1, v3, v4, v5}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {v0, v2, v3, v4}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    cmp-long v1, v6, v4
+    const/4 v0, 0x0
 
-    if-eqz v1, :cond_1
+    cmp-long v2, v5, v3
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    if-eqz v2, :cond_1
 
-    if-eqz v1, :cond_0
+    iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {v1, v6, v7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2, v5, v6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
 
     goto :goto_0
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
     :goto_0
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    const/4 v1, 0x2
+    const/4 v9, 0x2
 
     if-eqz p1, :cond_2
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v5, "requireContext()"
+    const-string v4, "requireContext()"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f04028a
+    const v4, 0x7f04028a
 
-    invoke-static {v3, v5, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v2, v4, v1, v9, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
-    move-result v3
+    move-result v2
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v5, v3
+    move-object v4, v2
 
     goto :goto_1
 
     :cond_2
-    move-object v5, v0
+    move-object v4, v0
 
     :goto_1
     if-eqz p1, :cond_3
 
-    const v3, 0x7f12043a
+    const v2, 0x7f12043b
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    move-object v6, v3
+    move-object v5, v2
 
     goto :goto_2
 
     :cond_3
-    move-object v6, v0
+    move-object v5, v0
 
     :goto_2
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    move-object v3, p0
+    move-object v2, p0
 
-    invoke-static/range {v3 .. v9}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static/range {v2 .. v8}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v3, 0x7f120d4a
+    const v2, 0x7f120d70
 
-    invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
-    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1;
+    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1;
 
-    invoke-direct {v3, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;Z)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;Z)V
 
-    invoke-static {p0, v3, v2, v1, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p0, v2, v1, v9, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -1271,7 +1219,7 @@
 
     const-string v1, "BottomSheetBehavior.from(bottomSheet)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
@@ -1320,14 +1268,7 @@
     :cond_4
     const-string p1, "bottomSheetBehavior"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -1343,7 +1284,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1353,19 +1294,19 @@
 
     sget-object v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v2, "filter { it is T }.map { it as T }"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$PrivateChannelAdapter;
 
@@ -1400,14 +1341,14 @@
     :cond_0
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali
index 9f2263b28d..3c2a91b417 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareEmptySuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1.smali
index fc4c1503d1..cf488f2d38 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheetBehavior$1.smali
@@ -39,24 +39,19 @@
 .method public onSlide(Landroid/view/View;F)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "bottomSheet"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "bottomSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onStateChanged(Landroid/view/View;I)V
     .locals 7
 
-    if-eqz p1, :cond_2
+    const-string v0, "bottomSheet"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x5
 
@@ -100,13 +95,4 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->fadeBy$default(Landroid/view/View;ZJILjava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "bottomSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1.smali
index 33f5b60463..45fd73a725 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1.smali
@@ -50,21 +50,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 5
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
@@ -111,17 +97,31 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
     const/4 v4, 0x6
 
-    invoke-static {v0, v1, v3, v4}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {v0, v1, v3, v4}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     goto :goto_0
 
     :cond_1
     :goto_1
-    return v1
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.smali
index 9ddce02a3a..6f98cf6f28 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -73,10 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.smali
index 1f11a54ba2..9c1e45c12d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.guilds.invite.WidgetGuildInviteShareViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali
index 705ba50c42..1e07deab8d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareEmptySuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->access$updateUi(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1.smali
index aeecf9b5a7..82d40dc642 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$updateUi$1.smali
@@ -45,7 +45,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
index 60ebf98621..1d72846990 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
@@ -41,121 +41,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+    const-string v2, "emptySuggestionsShareBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptySuggestionsShareBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "emptySuggestionsShareBtn"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEmptySuggestionsShareBtn()Landroid/widget/Button;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
 
-    const/4 v2, 0x0
+    const-string v2, "emptySuggestionsInviteSettingsBtn"
 
-    aput-object v1, v0, v2
+    const-string v3, "getEmptySuggestionsInviteSettingsBtn()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "emptySuggestionsInviteSettingsBtn"
-
-    const-string v4, "getEmptySuggestionsInviteSettingsBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+    const-string v2, "emptySuggestionsInviteLinkTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptySuggestionsInviteLinkTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptySuggestionsInviteLinkTextView"
-
-    const-string v4, "getEmptySuggestionsInviteLinkTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+    const-string v2, "emptySuggestionsSettingsInviteSubtext"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptySuggestionsSettingsInviteSubtext"
-
-    const-string v4, "getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+    const-string v2, "backgroundTint"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBackgroundTint()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "backgroundTint"
-
-    const-string v4, "getBackgroundTint()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;
+    const-string v2, "bottomSheet"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bottomSheet"
-
-    const-string v4, "getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -171,7 +135,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0435
+    const v0, 0x7f0a043b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +143,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsShareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0436
+    const v0, 0x7f0a043c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -187,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0434
+    const v0, 0x7f0a043a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -195,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteLinkTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0437
+    const v0, 0x7f0a043d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052b
+    const v0, 0x7f0a0531
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -244,7 +208,7 @@
     :cond_0
     const-string p0, "bottomSheetBehavior"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -271,9 +235,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -433,7 +397,7 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -441,7 +405,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -473,7 +437,7 @@
 
     aput-object p2, v1, v2
 
-    const p1, 0x7f120d55
+    const p1, 0x7f120d7b
 
     invoke-virtual {v0, p1, v1}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -481,7 +445,7 @@
 
     const-string p2, "resources.getString(R.st\u2026on, hoursString, maxUses)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -526,9 +490,9 @@
     return-void
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -640,7 +604,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120eb5
+    const v1, 0x7f120edb
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -653,15 +617,15 @@
 
     move-result-object v1
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v6
 
-    invoke-static {v6, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v7, 0x7f1000ae
+    const v7, 0x7f1000b0
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
 
@@ -686,7 +650,7 @@
     :goto_0
     const-string v1, "if (inviteSettings.maxUs\u2026ettings.maxUses\n        )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings;
 
@@ -702,7 +666,7 @@
 
     const/4 v6, 0x2
 
-    const v7, 0x7f120d55
+    const v7, 0x7f120d7b
 
     if-eq p1, v1, :cond_5
 
@@ -729,13 +693,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f100030
 
@@ -821,13 +785,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v2, 0x7f100034
 
@@ -876,7 +840,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120eb1
+    const v2, 0x7f120ed7
 
     invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -896,7 +860,7 @@
 
     const-string v0, "StringBuilder()\n        \u2026              .toString()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getEmptySuggestionsSettingsInviteSubtext()Landroid/widget/TextView;
 
@@ -922,9 +886,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -932,31 +896,31 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
+    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v4, "resources"
+    const-string v3, "resources"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;-><init>(Landroid/content/res/Resources;)V
 
-    invoke-direct {p1, v1, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {p1, v0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(\n     \u2026areViewModel::class.java)"
+    const-string v0, "ViewModelProvider(\n     \u2026areViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
@@ -966,52 +930,54 @@
 
     move-result-object p1
 
-    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v0, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v1, 0x0
 
-    invoke-virtual {p1, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    move-result-wide v4
+    move-result-wide v3
 
-    cmp-long p1, v4, v2
+    const/4 p1, 0x0
 
-    if-eqz p1, :cond_1
+    cmp-long v0, v3, v1
 
-    iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    if-eqz v0, :cond_1
 
-    if-eqz p1, :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-virtual {p1, v4, v5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0, v3, v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectChannel(J)V
 
     goto :goto_0
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw p1
 
     :cond_1
     :goto_0
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
-    move-result-object p1
+    move-result-object v0
 
     const-string v1, "INTENT_IS_NUX_FLOW"
 
     const/4 v2, 0x0
 
-    invoke-virtual {p1, v1, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+    invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
 
-    move-result p1
+    move-result v0
 
     const/4 v4, 0x1
 
     const/4 v1, 0x2
 
-    if-eqz p1, :cond_2
+    if-eqz v0, :cond_2
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1019,11 +985,11 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v5, 0x7f04028a
 
-    invoke-static {v3, v5, v2, v1, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v3, v5, v2, v1, p1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result v3
 
@@ -1036,12 +1002,12 @@
     goto :goto_1
 
     :cond_2
-    move-object v5, v0
+    move-object v5, p1
 
     :goto_1
-    if-eqz p1, :cond_3
+    if-eqz v0, :cond_3
 
-    const v3, 0x7f12043a
+    const v3, 0x7f12043b
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1052,7 +1018,7 @@
     goto :goto_2
 
     :cond_3
-    move-object v6, v0
+    move-object v6, p1
 
     :goto_2
     const/4 v7, 0x0
@@ -1067,27 +1033,27 @@
 
     new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;
 
-    invoke-direct {v3, p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Z)V
+    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;Z)V
 
-    invoke-static {p0, v3, v2, v1, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p0, v3, v2, v1, p1}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-static {p1}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->from(Landroid/view/View;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    invoke-static {v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->from(Landroid/view/View;)Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    move-result-object p1
+    move-result-object v0
 
     const-string v1, "BottomSheetBehavior.from(bottomSheet)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->bottomSheetBehavior:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    if-eqz p1, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->initBottomSheetBehavior(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
+    invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->initBottomSheetBehavior(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;
 
@@ -1108,18 +1074,11 @@
     return-void
 
     :cond_4
-    const-string p1, "bottomSheetBehavior"
+    const-string v0, "bottomSheetBehavior"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_5
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1133,7 +1092,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1143,19 +1102,19 @@
 
     sget-object v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v2, "filter { it is T }.map { it as T }"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
@@ -1186,9 +1145,9 @@
     return-void
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali
index 14b7e3dfff..56c372fd3f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali
@@ -51,9 +51,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    const-string v1, "viewState"
+    const-string/jumbo v1, "viewState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->access$generateInviteLinkFromViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
index 9ad7fb7130..80aebeeb6d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildInviteShareViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string/jumbo v4, "updateViewState"
+
+    const-string/jumbo v5, "updateViewState(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateViewState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateViewState(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->access$updateViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali
index 6ff65b7f3b..43812de062 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali
@@ -63,16 +63,24 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "widgetInviteModel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inviteSuggestionItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "searchQuery"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sentInvites"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
@@ -84,34 +92,6 @@
     iput-object p4, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->sentInvites:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "sentInvites"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "inviteSuggestionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "widgetInviteModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -240,49 +220,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "widgetInviteModel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "inviteSuggestionItems"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "searchQuery"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sentInvites"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "sentInvites"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "inviteSuggestionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "widgetInviteModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -300,7 +258,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -310,7 +268,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->inviteSuggestionItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -320,7 +278,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->searchQuery:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -330,7 +288,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->sentInvites:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali
index 70e807a1f8..3b44a60d36 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali
@@ -33,7 +33,22 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/guilds/invite/InviteSuggestion;",
+        ">;",
+        "Ljava/lang/String;",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;",
+        "Lkotlin/Unit;",
+        "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;",
+        ">;"
     }
 .end annotation
 
@@ -80,7 +95,7 @@
 
     const-string p5, "sentInvites"
 
-    invoke-static {p4, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p5, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
@@ -92,9 +107,9 @@
 
     move-result-object p5
 
-    const-string v0, "widgetInviteModel.invite.inviteLink"
+    const-string/jumbo v0, "widgetInviteModel.invite.inviteLink"
 
-    invoke-static {p5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p4, p5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -105,7 +120,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object p5, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p5, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     check-cast p5, Ljava/util/Set;
@@ -116,7 +131,7 @@
 
     if-eqz p3, :cond_2
 
-    invoke-static {p3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -138,12 +153,12 @@
 
     if-eqz v2, :cond_3
 
-    invoke-static {p2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_5
 
     :cond_3
-    invoke-static {p2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -185,9 +200,9 @@
 
     const-string v5, "inviteSuggestion.channel.name"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v4, p3, v1}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v4, p3, v1}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v4
 
@@ -210,9 +225,9 @@
 
     const-string v5, "inviteSuggestion.user.username"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v4, p3, v1}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v4, p3, v1}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v4
 
@@ -275,7 +290,7 @@
 
     const-string v7, "dm.recipients[0]"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v6, Lcom/discord/models/domain/ModelUser;
 
@@ -318,7 +333,7 @@
 
     if-eqz p3, :cond_9
 
-    invoke-static {p3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
@@ -429,7 +444,7 @@
 
     move-result-object v1
 
-    invoke-static {p5, v1}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {p5, v1}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -453,13 +468,13 @@
     :goto_a
     new-instance p5, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;
 
-    const-string v0, "widgetInviteModel"
+    const-string/jumbo v0, "widgetInviteModel"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "filter"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p5, p1, p2, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali
index ebd6dc5faf..809671dee5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali
@@ -35,7 +35,21 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Lcom/discord/models/domain/ModelInvite$Settings;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;",
+        ">;"
     }
 .end annotation
 
@@ -93,23 +107,23 @@
 
     const-string v1, "settings"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "invitableChannels"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "inviteGenerationState"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "me"
 
-    invoke-static {p5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "dms"
 
-    invoke-static {p6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v1, p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali
index 4e89a93975..b75187645c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/messagesend/MessageResult;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Lcom/discord/utilities/messagesend/MessageResult;)V
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "result"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/utilities/messagesend/MessageResult$Success;
 
@@ -107,7 +109,7 @@
 
     const-string v2, "inviteLink"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -118,7 +120,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v1, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     check-cast v1, Ljava/util/Set;
@@ -159,13 +161,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali
index 11a5156303..a1ebfa8895 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildInviteShareViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
index 68fb6b4ea9..68d7eed216 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetGuildInviteShareViewModel.kt"
 
 # interfaces
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;",
         ">;",
         "Lcom/discord/app/AppComponent;"
@@ -84,13 +84,13 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V
-    .locals 17
+    .locals 13
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
-    move-object/from16 v1, p1
+    move-object v1, p1
 
-    move-object/from16 v2, p2
+    move-object v2, p2
 
     move-object/from16 v3, p3
 
@@ -100,23 +100,33 @@
 
     move-object/from16 v6, p6
 
-    const/4 v7, 0x0
+    const-string v7, "storeChannels"
 
-    if-eqz v1, :cond_6
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_5
+    const-string v7, "storeInviteSettings"
 
-    if-eqz v3, :cond_4
+    invoke-static {p2, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_3
+    const-string v7, "storeUser"
 
-    if-eqz v5, :cond_2
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_1
+    const-string v7, "inviteGenerator"
 
-    sget-object v8, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized;
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, v8}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    const-string v7, "inviteSuggestionsService"
+
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "resources"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v7, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v7}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
 
@@ -134,7 +144,7 @@
 
     iput-boolean v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->subscribeOnInit:Z
 
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -142,7 +152,7 @@
 
     const-string v2, "BehaviorSubject.create(emptyMap())"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
 
@@ -154,122 +164,82 @@
 
     iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->filterPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {v7}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v1
-
-    const-string v2, "BehaviorSubject.create(null as ChannelId?)"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
-
-    sget-object v1, Lkotlin/Unit;->a:Lkotlin/Unit;
+    const/4 v1, 0x0
 
     invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-string v2, "BehaviorSubject.create(Unit)"
+    const-string v3, "BehaviorSubject.create(null as ChannelId?)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUiSubject:Lrx/subjects/BehaviorSubject;
+    iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
 
-    iget-boolean v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->subscribeOnInit:Z
+    sget-object v2, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    if-eqz v1, :cond_0
+    invoke-static {v2}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeViewStateFromStores$app_productionDiscordExternalRelease()Lrx/Observable;
+    move-result-object v2
 
-    move-result-object v1
+    const-string v3, "BehaviorSubject.create(Unit)"
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+    iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUiSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->t(Lrx/functions/Action1;)Lrx/Observable;
+    iget-boolean v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->subscribeOnInit:Z
 
-    move-result-object v1
+    if-eqz v2, :cond_0
 
-    const-string v2, "observeViewStateFromStor\u2026romViewState(viewState) }"
+    invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->observeViewStateFromStores$app_productionDiscordExternalRelease()Lrx/Observable;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v2
 
-    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;
 
-    move-result-object v1
+    invoke-direct {v3, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
 
-    const/4 v2, 0x2
+    invoke-virtual {v2, v3}, Lrx/Observable;->t(Lrx/functions/Action1;)Lrx/Observable;
 
-    invoke-static {v1, v0, v7, v2, v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    move-result-object v2
 
-    move-result-object v8
+    const-string v3, "observeViewStateFromStor\u2026romViewState(viewState) }"
 
-    const-class v9, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v10, 0x0
+    invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
-    const/4 v11, 0x0
+    move-result-object v2
+
+    const/4 v3, 0x2
+
+    invoke-static {v2, p0, v1, v3, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-class v5, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    new-instance v10, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
+
+    const/16 v11, 0x1e
 
     const/4 v12, 0x0
 
-    const/4 v13, 0x0
-
-    new-instance v14, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;
-
-    invoke-direct {v14, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V
-
-    const/16 v15, 0x1e
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v8 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string v1, "resources"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_2
-    const-string v1, "inviteSuggestionsService"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_3
-    const-string v1, "inviteGenerator"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_4
-    const-string v1, "storeUser"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_5
-    const-string v1, "storeInviteSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_6
-    const-string v1, "storeChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
 .end method
 
 .method public static final synthetic access$generateInviteLinkFromViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V
@@ -293,7 +263,7 @@
 .method public static final synthetic access$updateViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
     .locals 0
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -410,7 +380,7 @@
 
     const-string v1, "Observable\n        .comb\u2026dms\n          )\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -422,7 +392,7 @@
 
     const-string v1, "Observable\n        .comb\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -532,7 +502,7 @@
 
     const-string v1, "Observable.combineLatest\u2026sentInvites\n      )\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -564,7 +534,7 @@
 .end method
 
 .method public final sendInviteToChannel(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V
-    .locals 21
+    .locals 19
 
     move-object/from16 v0, p0
 
@@ -572,13 +542,13 @@
 
     move-object/from16 v2, p4
 
-    const/4 v3, 0x0
+    const-string/jumbo v3, "viewState"
 
-    if-eqz v1, :cond_0
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String;
 
-    move-result-object v15
+    move-result-object v3
 
     sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -596,7 +566,7 @@
 
     const-string v5, "inviteLink"
 
-    invoke-static {v15, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v9, 0x0
 
@@ -610,27 +580,17 @@
 
     const/4 v14, 0x0
 
+    const/4 v15, 0x0
+
     const/16 v16, 0x0
 
-    const/16 v17, 0x0
+    const/16 v17, 0x7e0
 
-    const/16 v18, 0x7e0
-
-    const/16 v19, 0x0
+    const/16 v18, 0x0
 
     move-wide/from16 v5, p1
 
-    move-object v8, v15
-
-    move-object/from16 v20, v15
-
-    move-object/from16 v15, v16
-
-    move-object/from16 v16, v17
-
-    move/from16 v17, v18
-
-    move-object/from16 v18, v19
+    move-object v8, v3
 
     invoke-static/range {v4 .. v18}, Lcom/discord/stores/StoreMessages;->sendMessage$default(Lcom/discord/stores/StoreMessages;JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;ILjava/lang/Object;)Lrx/Observable;
 
@@ -640,74 +600,69 @@
 
     const/4 v6, 0x1
 
-    invoke-static {v4, v5, v6, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v7, 0x0
+
+    invoke-static {v4, v5, v6, v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
     const/4 v5, 0x2
 
-    invoke-static {v4, v0, v3, v5, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v4, v0, v7, v5, v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v6
+    move-result-object v8
 
-    const-class v7, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    const-class v9, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    const/4 v8, 0x0
+    new-instance v14, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;
 
-    new-instance v12, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;
+    invoke-direct {v14, v0, v2, v1, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Ljava/lang/String;)V
 
-    move-object/from16 v3, v20
+    const/16 v15, 0x1e
 
-    invoke-direct {v12, v0, v2, v1, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Ljava/lang/String;)V
-
-    const/16 v13, 0x1e
-
-    invoke-static/range {v6 .. v14}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v8 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "viewState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public final sendInviteToUser(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V
-    .locals 10
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "viewState"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/stores/StoreChannels;->createPrivateChannel(J)Lrx/Observable;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreChannels;->createPrivateChannel(J)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v1, p2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
+    const-class v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
-    const/4 v3, 0x0
+    new-instance v8, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;
+
+    invoke-direct {v8, p0, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V
 
     const/4 v4, 0x0
 
@@ -715,66 +670,43 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;
+    const/4 v7, 0x0
 
-    invoke-direct {v7, p0, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V
+    const/16 v9, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v10, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "settings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeInviteSettings:Lcom/discord/stores/StoreInviteSettings;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreInviteSettings;->setInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "settings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateSearchQuery(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchQuery"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->filterPublisher:Lrx/subjects/BehaviorSubject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "searchQuery"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateSentInvites(Ljava/util/Map;)V
@@ -791,20 +723,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "sentInvites"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sentInvitesSubject:Lrx/subjects/BehaviorSubject;
 
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "sentInvites"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali
index 37f1465b94..8d80970e4a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali
@@ -12,30 +12,23 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/res/Resources;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "resources"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;->resources:Landroid/content/res/Resources;
 
     return-void
-
-    :cond_0
-    const-string p1, "resources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 8
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -46,7 +39,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;
 
@@ -54,48 +49,39 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
 
-    move-result-object v1
+    move-result-object v2
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings;
 
-    move-result-object v2
+    move-result-object v3
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
 
-    move-result-object v3
+    move-result-object v4
 
-    new-instance v4, Lcom/discord/widgets/guilds/invite/InviteGenerator;
+    new-instance v5, Lcom/discord/widgets/guilds/invite/InviteGenerator;
 
-    invoke-direct {v4}, Lcom/discord/widgets/guilds/invite/InviteGenerator;-><init>()V
+    invoke-direct {v5}, Lcom/discord/widgets/guilds/invite/InviteGenerator;-><init>()V
 
     sget-object v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->Companion:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;
 
     invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;->create()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;
 
-    move-result-object v5
+    move-result-object v6
 
-    iget-object v6, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;->resources:Landroid/content/res/Resources;
+    iget-object v7, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;->resources:Landroid/content/res/Resources;
 
-    const/4 v7, 0x1
+    const/4 v8, 0x1
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getResources()Landroid/content/res/Resources;
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 71ecc3a4f2..467e74c262 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
@@ -43,261 +43,183 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "inviteMessage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteMessage()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "inviteMessage"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getInviteMessage()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const/4 v2, 0x0
+    const-string v2, "title"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "title"
-
-    const-string v4, "getTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "membersWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMembersWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "membersWrap"
-
-    const-string v4, "getMembersWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "membersOnlineWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMembersOnlineWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "membersOnlineWrap"
-
-    const-string v4, "getMembersOnlineWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "membersOnlineTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMembersOnlineTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "membersOnlineTextView"
-
-    const-string v4, "getMembersOnlineTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "membersTotalTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMembersTotalTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "membersTotalTextView"
-
-    const-string v4, "getMembersTotalTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "membersTotalWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMembersTotalWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "membersTotalWrap"
-
-    const-string v4, "getMembersTotalWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "avatarBig"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatarBig()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "avatarBig"
-
-    const-string v4, "getAvatarBig()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "avatarBigWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatarBigWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "avatarBigWrap"
-
-    const-string v4, "getAvatarBigWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "avatarSmall"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatarSmall()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "avatarSmall"
-
-    const-string v4, "getAvatarSmall()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "avatarSmallCard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatarSmallCard()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "avatarSmallCard"
-
-    const-string v4, "getAvatarSmallCard()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "avatarSmallWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatarSmallWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "avatarSmallWrap"
-
-    const-string v4, "getAvatarSmallWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
 
-    const-class v2, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;
+    const-string v2, "expiredImage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExpiredImage()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "expiredImage"
-
-    const-string v4, "getExpiredImage()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
@@ -351,11 +273,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/appcompat/widget/LinearLayoutCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a0529
+    const p1, 0x7f0a052f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -363,7 +287,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->inviteMessage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a052d
+    const p1, 0x7f0a0533
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -371,7 +295,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0528
+    const p1, 0x7f0a052e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -379,7 +303,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0525
+    const p1, 0x7f0a052b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -387,7 +311,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersOnlineWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0524
+    const p1, 0x7f0a052a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -395,7 +319,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersOnlineTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0526
+    const p1, 0x7f0a052c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -403,7 +327,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersTotalTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0527
+    const p1, 0x7f0a052d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -411,7 +335,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->membersTotalWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0516
+    const p1, 0x7f0a051c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -419,7 +343,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarBig$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a051a
+    const p1, 0x7f0a0520
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -427,7 +351,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarBigWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0517
+    const p1, 0x7f0a051d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -435,7 +359,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarSmall$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0518
+    const p1, 0x7f0a051e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -443,7 +367,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarSmallCard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0519
+    const p1, 0x7f0a051f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -451,7 +375,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->avatarSmallWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0521
+    const p1, 0x7f0a0527
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -473,20 +397,11 @@
 
     const-string v0, "context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->parseAttributeSet(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -588,7 +503,7 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -600,7 +515,7 @@
     move-object v1, v0
 
     :goto_2
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
 
@@ -681,7 +596,7 @@
 
     const-string v3, "name"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->getFormattedGuildName(Ljava/lang/String;)Ljava/lang/CharSequence;
 
@@ -953,7 +868,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f080429
+    const v7, 0x7f08042c
 
     const/4 v8, 0x0
 
@@ -986,7 +901,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f08037a
+    const v7, 0x7f08037d
 
     const/4 v8, 0x0
 
@@ -1161,7 +1076,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1173,13 +1088,13 @@
 
     if-nez p1, :cond_0
 
-    const p1, 0x7f120ca0
+    const p1, 0x7f120cc6
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1200,7 +1115,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1227,20 +1142,20 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120ca2
+    const p1, 0x7f120cc8
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1281,7 +1196,7 @@
 
     const-string v3, "resources"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -1289,7 +1204,7 @@
 
     const-string v4, "context"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -1301,7 +1216,7 @@
 
     aput-object v4, v0, v5
 
-    const v4, 0x7f10009c
+    const v4, 0x7f10009e
 
     invoke-static {v2, v3, v4, p1, v0}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1309,13 +1224,13 @@
 
     aput-object p1, v1, v5
 
-    const p1, 0x7f120c95
+    const p1, 0x7f120cbb
 
     invoke-static {p0, p1, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1335,7 +1250,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v1}, Lcom/discord/utilities/string/StringUtilsKt;->format(ILandroid/content/Context;)Ljava/lang/String;
 
@@ -1345,13 +1260,13 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f120c94
+    const p1, 0x7f120cba
 
     invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1526,7 +1441,9 @@
 .method public final configureUI(Lcom/discord/models/domain/ModelInvite;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "model"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -1593,15 +1510,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final configureUIFailure(Lcom/discord/utilities/error/Error;)V
@@ -1611,7 +1519,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120c8d
+    const v1, 0x7f120cb3
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -1619,7 +1527,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120cfb
+    const v1, 0x7f120d21
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -1633,7 +1541,7 @@
 
     const-string v1, "e.response"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -1647,7 +1555,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f1215fc
+    const v1, 0x7f121626
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -1655,7 +1563,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f1215fb
+    const v1, 0x7f121625
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -1667,7 +1575,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0701f4
+    const v2, 0x7f0701ed
 
     invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali
index bee8899208..50c3b98276 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali
@@ -34,7 +34,7 @@
 
 # virtual methods
 .method public final create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
-    .locals 12
+    .locals 13
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -59,19 +59,35 @@
 
     move-object/from16 v1, p4
 
-    const/4 v2, 0x0
+    const-string v2, "settings"
 
-    if-eqz p1, :cond_7
+    move-object v5, p1
 
-    if-eqz v0, :cond_6
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_5
+    const-string v2, "invitableChannels"
 
-    if-eqz p5, :cond_4
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_3
+    const-string v2, "inviteGenerationState"
 
-    invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->getLastGeneratedInvite()Lcom/discord/models/domain/ModelInvite;
+    move-object/from16 v3, p3
+
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "me"
+
+    move-object/from16 v10, p5
+
+    invoke-static {v10, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "dms"
+
+    move-object/from16 v11, p6
+
+    invoke-static {v11, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->getLastGeneratedInvite()Lcom/discord/models/domain/ModelInvite;
 
     move-result-object v6
 
@@ -79,31 +95,29 @@
 
     invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-direct {v9, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    invoke-direct {v9, v2}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
     invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-static {v9, v3}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
+    invoke-static {v9, v2}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
 
     invoke-interface {p2, v1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    move-result v3
+    move-result v2
 
     const/4 v4, 0x0
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
     invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    move-object v2, v0
-
-    check-cast v2, Lcom/discord/models/domain/ModelChannel;
+    check-cast v0, Lcom/discord/models/domain/ModelChannel;
 
     goto :goto_0
 
@@ -118,43 +132,45 @@
 
     move-result-object v0
 
-    move-object v2, v0
+    check-cast v0, Lcom/discord/models/domain/ModelChannel;
 
-    check-cast v2, Lcom/discord/models/domain/ModelChannel;
+    goto :goto_0
 
     :cond_1
+    const/4 v0, 0x0
+
     :goto_0
     if-eqz v6, :cond_2
 
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v0
-
     if-eqz v0, :cond_2
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    move-result-object v1
 
-    const-string v1, "generatedInvite.channel"
+    if-eqz v1, :cond_2
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    const-string v2, "generatedInvite.channel"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v1
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v0
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
     move-result-wide v7
 
-    cmp-long v3, v0, v7
+    cmp-long v12, v1, v7
 
-    if-nez v3, :cond_2
+    if-nez v12, :cond_2
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     const/4 v8, 0x1
 
@@ -164,15 +180,15 @@
     const/4 v8, 0x0
 
     :goto_1
-    new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
+    new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
-    invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->isGenerating()Z
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->isGenerating()Z
 
     move-result v7
 
-    move-object v3, v0
+    move-object v3, v1
 
-    move-object v4, v2
+    move-object v4, v0
 
     move-object v5, p1
 
@@ -182,40 +198,5 @@
 
     invoke-direct/range {v3 .. v11}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)V
 
-    return-object v0
-
-    :cond_3
-    const-string v0, "dms"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_4
-    const-string v0, "me"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_5
-    const-string v0, "inviteGenerationState"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_6
-    const-string v0, "invitableChannels"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_7
-    const-string v0, "settings"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    return-object v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
index 3ed68f1542..90234a2fa6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali
@@ -85,13 +85,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "invitableChannels"
 
-    if-eqz p6, :cond_2
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_1
+    const-string v0, "me"
 
-    if-eqz p8, :cond_0
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dms"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -112,27 +116,6 @@
     iput-object p8, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "dms"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "invitableChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -413,13 +396,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "invitableChannels"
 
-    if-eqz p6, :cond_2
+    move-object/from16 v7, p6
 
-    if-eqz p7, :cond_1
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_0
+    const-string v0, "me"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dms"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;
 
@@ -435,36 +428,9 @@
 
     move v6, p5
 
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
-    move-object/from16 v9, p8
-
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "dms"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "me"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "invitableChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -482,7 +448,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->targetChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -492,7 +458,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->settings:Lcom/discord/models/domain/ModelInvite$Settings;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -502,7 +468,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->invite:Lcom/discord/models/domain/ModelInvite;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -524,7 +490,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->invitableChannels:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -534,7 +500,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -544,7 +510,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/BaseChannelViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/join/BaseChannelViewHolder.smali
index a488a94244..a056d05e27 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/BaseChannelViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/BaseChannelViewHolder.smali
@@ -5,39 +5,25 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public bind(Lcom/discord/widgets/guilds/join/ChannelItem;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/ChannelItem$ChannelData.smali b/com.discord/smali/com/discord/widgets/guilds/join/ChannelItem$ChannelData.smali
index f821b88107..15639a5516 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/ChannelItem$ChannelData.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/ChannelItem$ChannelData.smali
@@ -64,17 +64,23 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "welcomeChannel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dismissSheet"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "goToChannel"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p5, :cond_0
-
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/guilds/join/ChannelItem;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/guilds/join/ChannelItem;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->welcomeChannel:Lcom/discord/models/domain/ModelGuildWelcomeChannel;
 
@@ -87,27 +93,6 @@
     iput p6, p0, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->index:I
 
     return-void
-
-    :cond_0
-    const-string p1, "goToChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dismissSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "welcomeChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;Lcom/discord/models/domain/ModelGuildWelcomeChannel;Lkotlin/jvm/functions/Function0;JLkotlin/jvm/functions/Function2;IILjava/lang/Object;)Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;
@@ -255,13 +240,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "welcomeChannel"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "dismissSheet"
 
-    if-eqz p5, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "goToChannel"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;
 
@@ -280,27 +269,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;-><init>(Lcom/discord/models/domain/ModelGuildWelcomeChannel;Lkotlin/jvm/functions/Function0;JLkotlin/jvm/functions/Function2;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "goToChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dismissSheet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "welcomeChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -318,7 +286,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->welcomeChannel:Lcom/discord/models/domain/ModelGuildWelcomeChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -328,7 +296,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->dismissSheet:Lkotlin/jvm/functions/Function0;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -346,7 +314,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->goToChannel:Lkotlin/jvm/functions/Function2;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/ChannelViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/join/ChannelViewHolder.smali
index 28748565f8..4172dca3e9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/ChannelViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/ChannelViewHolder.smali
@@ -21,7 +21,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;
 
@@ -29,95 +29,65 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "welcomeChannel"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getWelcomeChannel()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "welcomeChannel"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getWelcomeChannel()Landroidx/cardview/widget/CardView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "emojiImageView"
 
-    const/4 v3, 0x0
+    const-string v3, "getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "emojiImageView"
-
-    const-string v5, "getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "descriptionView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDescriptionView()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "descriptionView"
-
-    const-string v5, "getDescriptionView()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "nameView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNameView()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "nameView"
-
-    const-string v5, "getNameView()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "unicodeEmojiView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnicodeEmojiView()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "unicodeEmojiView"
+    const/4 v2, 0x4
 
-    const-string v4, "getUnicodeEmojiView()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x4
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -125,45 +95,47 @@
 .end method
 
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/join/BaseChannelViewHolder;-><init>(Landroid/view/View;)V
 
-    const p1, 0x7f0a049b
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->welcomeChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a049e
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->emojiImageView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a049c
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->descriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a04a1
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->welcomeChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a04a4
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->emojiImageView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a04a2
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->descriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a04a7
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->nameView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04a3
+    const p1, 0x7f0a04a9
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -172,15 +144,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->unicodeEmojiView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getDescriptionView()Landroid/widget/TextView;
@@ -286,108 +249,115 @@
 
 # virtual methods
 .method public bind(Lcom/discord/widgets/guilds/join/ChannelItem;)V
-    .locals 14
+    .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/guilds/join/BaseChannelViewHolder;->bind(Lcom/discord/widgets/guilds/join/ChannelItem;)V
 
-    move-object v1, p1
+    move-object v0, p1
 
-    check-cast v1, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;
+    check-cast v0, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Landroid/widget/ImageView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v1}, Landroid/widget/ImageView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v1
+
+    iget v1, v1, Landroid/view/ViewGroup$LayoutParams;->width:I
+
+    invoke-static {v1}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
+
+    move-result v1
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
 
     move-result-object v2
 
-    iget v2, v2, Landroid/view/ViewGroup$LayoutParams;->width:I
-
-    invoke-static {v2}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
-
-    move-result v2
-
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
-
-    move-result-object v3
-
-    invoke-virtual {v3, v2}, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->getEmojiUri(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getDescriptionView()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->getDescription()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getNameView()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
-
-    move-result-object v3
-
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
+    invoke-virtual {v2, v1}, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->getEmojiUri(I)Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->getChannelId()J
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getDescriptionView()Landroid/widget/TextView;
 
-    move-result-wide v6
+    move-result-object v1
 
-    invoke-virtual {v3, v6, v7}, Lcom/discord/stores/StoreChannels;->getChannel$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->getDescription()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getNameView()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
 
     move-result-object v3
 
-    if-eqz v3, :cond_0
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuildWelcomeChannel;->getChannelId()J
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+    move-result-wide v5
 
-    move-result-object v0
+    invoke-virtual {v2, v5, v6}, Lcom/discord/stores/StoreChannels;->getChannel$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_0
 
     :cond_0
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    const/4 v2, 0x0
 
-    move-result-object v0
+    :goto_0
+    invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getWelcomeChannel()Landroidx/cardview/widget/CardView;
 
-    move-result-object v0
+    move-result-object v1
 
     new-instance v2, Lcom/discord/widgets/guilds/join/ChannelViewHolder$bind$1;
 
     invoke-direct {v2, p1}, Lcom/discord/widgets/guilds/join/ChannelViewHolder$bind$1;-><init>(Lcom/discord/widgets/guilds/join/ChannelItem;)V
 
-    invoke-virtual {v0, v2}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     const/16 p1, 0x8
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    if-eqz v5, :cond_1
+    if-eqz v4, :cond_1
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v4
+    move-result-object v3
+
+    const/4 v5, 0x0
 
     const/4 v6, 0x0
 
@@ -399,19 +369,17 @@
 
     const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    const/16 v11, 0xfc
 
-    const/16 v12, 0xfc
+    const/4 v12, 0x0
 
-    const/4 v13, 0x0
-
-    invoke-static/range {v4 .. v13}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
+    invoke-static/range {v3 .. v12}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v0}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getUnicodeEmojiView()Landroid/widget/TextView;
 
@@ -419,10 +387,10 @@
 
     invoke-virtual {v0, p1}, Landroid/view/View;->setVisibility(I)V
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
 
     move-result-object v2
 
@@ -442,13 +410,13 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;->getUnicodeEmojiView()Landroid/widget/TextView;
 
     move-result-object p1
 
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/join/ChannelItem$ChannelData;->getWelcomeChannel()Lcom/discord/models/domain/ModelGuildWelcomeChannel;
 
     move-result-object v0
 
@@ -459,13 +427,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_2
-    :goto_0
+    :goto_1
     return-void
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali
index 1731ed4d22..805b02c0c6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$Companion.smali
@@ -36,35 +36,25 @@
 .method public final show(Landroid/content/Context;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "location"
 
-    const-string v1, "Join Guild"
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
+    const-string v0, "Join Guild"
+
+    invoke-static {v0, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x4
 
-    invoke-static {p1, p2, v0, v1}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, p2, v0, v1}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "location"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali
index 2e17eb221c..0d91163c70 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildJoin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Landroid/widget/TextView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;->handleGuildJoin()V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali
index 221c5c8ce6..6a8836edfa 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin.smali
@@ -32,41 +32,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
+    const-string v2, "guildJoinInvite"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildJoinInvite()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildJoinInvite"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildJoinInvite()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
 
-    const/4 v2, 0x0
+    const-string v2, "guildJoinButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildJoinButton()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildJoinButton"
-
-    const-string v4, "getGuildJoinButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -90,7 +78,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0448
+    const v0, 0x7f0a044e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -98,7 +86,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;->guildJoinInvite$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0446
+    const v0, 0x7f0a044c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -206,7 +194,7 @@
 
     const-string v0, "guildJoinInvite.context"
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -225,9 +213,9 @@
     .annotation build Landroidx/annotation/CallSuper;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -235,15 +223,17 @@
 
     move-result-object p1
 
+    new-instance v0, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/join/WidgetGuildJoin;)V
+
     const/4 v1, 0x0
 
-    new-instance v2, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;
+    const/4 v2, 0x1
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/join/WidgetGuildJoin;)V
+    const/4 v3, 0x0
 
-    const/4 v3, 0x1
-
-    invoke-static {p1, v1, v2, v3, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
+    invoke-static {p1, v1, v0, v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;->getGuildJoinButton()Landroid/widget/Button;
 
@@ -256,11 +246,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$Companion.smali
index 63c1a10465..d051f8f2d6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;J)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
@@ -61,13 +63,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$dismissSheet$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$dismissSheet$1.smali
index 9c118c3814..156800a483 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$dismissSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$dismissSheet$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$dismissSheet$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildWelcomeSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$goToChannel$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$goToChannel$1.smali
index 670904a48d..8a54bff8c4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$goToChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$goToChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$configureWelcomeChannels$goToChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildWelcomeSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Integer;",
@@ -48,7 +48,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$onViewCreated$1.smali
index 48b6c23569..4cada1991d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$onViewCreated$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildWelcomeSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleViewState"
+
+    const-string v5, "handleViewState(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleViewState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleViewState(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;->access$handleViewState(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali
index 69c2fb60df..b2f12c4572 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali
@@ -47,121 +47,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
+    const-string v2, "guildWelcomeSheetFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildWelcomeSheetFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildWelcomeSheetFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildWelcomeSheetFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "guildIcon"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildIcon()Landroid/widget/ImageView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildIcon"
-
-    const-string v4, "getGuildIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
+    const-string v2, "guildIconName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildIconName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildIconName"
-
-    const-string v4, "getGuildIconName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
+    const-string v2, "guildName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildName"
-
-    const-string v4, "getGuildName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
+    const-string v2, "guildDescription"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildDescription()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildDescription"
-
-    const-string v4, "getGuildDescription()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;
+    const-string v2, "channelsRecyclerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelsRecyclerView"
-
-    const-string v4, "getChannelsRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -185,7 +149,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a04a6
+    const v0, 0x7f0a04ac
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,7 +157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;->guildWelcomeSheetFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a7
+    const v0, 0x7f0a04ad
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -201,7 +165,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;->guildIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a9
+    const v0, 0x7f0a04af
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +173,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;->guildIconName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04aa
+    const v0, 0x7f0a04b0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +181,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;->guildName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a5
+    const v0, 0x7f0a04ab
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +189,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;->guildDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a4
+    const v0, 0x7f0a04aa
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -252,9 +216,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -292,7 +256,7 @@
 
     aput-object p1, v1, v2
 
-    const p1, 0x7f121815
+    const p1, 0x7f121841
 
     invoke-virtual {p0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -772,9 +736,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -788,37 +752,39 @@
 
     move-result-wide p1
 
-    new-instance v1, Landroidx/lifecycle/ViewModelProvider;
+    new-instance v0, Landroidx/lifecycle/ViewModelProvider;
 
-    new-instance v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory;
+    new-instance v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory;
 
-    invoke-direct {v2, p1, p2}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory;-><init>(J)V
+    invoke-direct {v1, p1, p2}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory;-><init>(J)V
 
-    invoke-direct {v1, p0, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {v0, p0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
     const-class p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
 
-    invoke-virtual {v1, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {v0, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
     const-string p2, "ViewModelProvider(\n     \u2026del::class.java\n        )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet;->viewModel:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
 
+    const/4 p2, 0x0
+
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, p2, v0, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
@@ -853,16 +819,9 @@
     return-void
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.smali
index 6a4bc51aee..49cab1d0de 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.smali
@@ -32,7 +32,7 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter;->data:Ljava/util/List;
 
@@ -84,7 +84,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/guilds/join/BaseChannelViewHolder;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter;->data:Ljava/util/List;
 
@@ -97,15 +99,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/widgets/guilds/join/BaseChannelViewHolder;->bind(Lcom/discord/widgets/guilds/join/ChannelItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -121,7 +114,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/guilds/join/BaseChannelViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -143,9 +138,9 @@
 
     new-instance p2, Lcom/discord/widgets/guilds/join/ChannelViewHolder;
 
-    const-string v0, "view"
+    const-string/jumbo v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/guilds/join/ChannelViewHolder;-><init>(Landroid/view/View;)V
 
@@ -163,19 +158,10 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -186,20 +172,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter;->data:Ljava/util/List;
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1.smali
index b5671160b1..1dcb059504 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildWelcomeSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1;->this$0:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;->access$handleStoreState(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory$observeStores$1.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory$observeStores$1.smali
index 5ce740dfa8..b1da3cc5b9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory$observeStores$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen;",
+        "Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory.smali
index b1a2901ce4..bfd27c1a14 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory.smali
@@ -35,7 +35,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 6
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -46,42 +46,35 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory;->observeStores()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
 
-    move-result-object v2
+    move-result-object v3
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics;
 
-    move-result-object v3
+    move-result-object v4
 
-    iget-wide v4, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory;->guildId:J
+    iget-wide v5, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$Factory;->guildId:J
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreAnalytics;J)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreAnalytics;J)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeStores()Lrx/Observable;
@@ -127,7 +120,7 @@
 
     const-string v1, "Observable\n            .\u2026          )\n            }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState.smali
index 022479c05d..43135c280f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState.smali
@@ -100,7 +100,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -110,7 +110,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState;->guildWelcomeScreen:Lcom/discord/stores/StoreGuildWelcomeScreens$GuildWelcomeScreen;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded.smali
index 80231c003c..71423ace07 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded.smali
@@ -52,12 +52,16 @@
         }
     .end annotation
 
+    const-string v0, "guildName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildShortName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;->guildId:J
@@ -73,20 +77,6 @@
     iput-object p7, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;->welcomeChannelsData:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildShortName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;
@@ -259,11 +249,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildName"
 
-    if-eqz p3, :cond_1
+    move-object v4, p3
 
-    if-eqz p4, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildShortName"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;
 
@@ -271,10 +267,6 @@
 
     move-wide v2, p1
 
-    move-object v4, p3
-
-    move-object v5, p4
-
     move-object v6, p5
 
     move-object v7, p6
@@ -284,20 +276,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "guildShortName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "guildName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -323,7 +301,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;->guildName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -333,7 +311,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;->guildShortName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -343,7 +321,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;->guildIcon:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -353,7 +331,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;->guildDescription:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -363,7 +341,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;->welcomeChannelsData:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel.smali
index 9a64a0c444..43c33560e5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetGuildWelcomeSheetViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState;",
         ">;"
     }
@@ -41,7 +41,7 @@
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreAnalytics;J)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -54,17 +54,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeChannelsSelected"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;
+    const-string v0, "storeAnalytics"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;->storeObservable:Lrx/Observable;
 
@@ -74,13 +78,21 @@
 
     iput-wide p4, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;->guildId:J
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;
+
+    new-instance v6, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1;-><init>(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -88,17 +100,11 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$1;-><init>(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, 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
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -127,27 +133,6 @@
     invoke-static {p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$StoreState;)V
@@ -173,7 +158,7 @@
 
     const-string v0, "guild.name"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
 
@@ -181,7 +166,7 @@
 
     const-string v0, "guild.shortName"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String;
 
@@ -216,7 +201,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
 
-    invoke-virtual {p0, v8}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v8}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -236,7 +221,7 @@
 
     const-string v0, "guild.name"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
 
@@ -244,7 +229,7 @@
 
     const-string v0, "guild.shortName"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String;
 
@@ -262,7 +247,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loaded;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
 
-    invoke-virtual {p0, v8}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v8}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -310,7 +295,7 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Invalid;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_3
 
@@ -321,7 +306,7 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_3
 
@@ -376,14 +361,14 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Invalid;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_3
 
     :cond_9
     sget-object p1, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel$ViewState$Loading;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_3
     return-void
@@ -392,7 +377,7 @@
 
 # virtual methods
 .method public final onClickChannel(JJILjava/util/List;)V
-    .locals 8
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(JJI",
@@ -402,21 +387,23 @@
         }
     .end annotation
 
-    if-eqz p6, :cond_4
+    const-string/jumbo v0, "welcomeChannels"
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v5, 0x0
+    iget-object v1, p0, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheetViewModel;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
 
-    const/4 v6, 0x4
+    const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/4 v7, 0x4
 
-    move-wide v1, p1
+    const/4 v8, 0x0
 
-    move-wide v3, p3
+    move-wide v2, p1
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/stores/StoreChannelsSelected;->set$default(Lcom/discord/stores/StoreChannelsSelected;JJIILjava/lang/Object;)V
+    move-wide v4, p3
+
+    invoke-static/range {v1 .. v8}, Lcom/discord/stores/StoreChannelsSelected;->set$default(Lcom/discord/stores/StoreChannelsSelected;JJIILjava/lang/Object;)V
 
     invoke-interface {p6, p5}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -503,11 +490,11 @@
     goto :goto_1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.String"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -519,13 +506,4 @@
     invoke-static/range {v0 .. v6}, Lcom/discord/utilities/analytics/AnalyticsTracker;->welcomeScreenChannelSelected(IJLjava/util/List;Ljava/util/List;Ljava/lang/String;Z)V
 
     return-void
-
-    :cond_4
-    const-string p1, "welcomeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1.smali
index c117740491..4149cc3453 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "LeaveGuildDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStoreState"
+
+    const-string v5, "handleStoreState(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;->access$handleStoreState(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory$observeStoreState$1.smali
index de1cccd15d..b0d2507429 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "LeaveGuildDialogViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory.smali
index 05a73b2a41..f05af052be 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory.smali
@@ -29,11 +29,13 @@
 .method public constructor <init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/utilities/rest/RestAPI;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guildStore"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "restAPI"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,20 +46,6 @@
     iput-object p4, p0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -109,13 +97,13 @@
 
     sget-object p2, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "guildStore\n          .ob\u2026            }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -134,7 +122,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
 
@@ -149,13 +139,4 @@
     invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;-><init>(JLrx/Observable;Lcom/discord/utilities/rest/RestAPI;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid.smali
index ac7bb9a9ea..b17cca4732 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Valid;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid.smali
index 60396a8bf1..c09d731ed9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;->isLoading:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;Lcom/discord/models/domain/ModelGuild;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;
@@ -89,22 +84,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Z)Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$1.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$1.smali
index 5a9afa1fc5..6b146f3ec3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LeaveGuildDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$2.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$2.smali
index d31987f2d7..f6bd45b470 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LeaveGuildDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$leaveGuild$2;->this$0:Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;->access$onLeaveFailed(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.smali
index 83a8bad0b1..6982b81f40 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "LeaveGuildDialogViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState;",
         ">;"
     }
@@ -62,13 +62,17 @@
         }
     .end annotation
 
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "restAPI"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;->guildId:J
 
@@ -92,6 +96,10 @@
 
     const-class v2, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
 
+    new-instance v7, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1;-><init>(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -100,10 +108,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$1;-><init>(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -111,20 +115,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState;)V
@@ -156,7 +146,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -195,14 +185,14 @@
 
     invoke-direct {v1, p1, v0}, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;Z)V
 
-    invoke-virtual {p0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_1
 
     :cond_2
     sget-object v0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$StoreState$Invalid;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -210,7 +200,7 @@
 
     sget-object p1, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Invalid;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_3
     :goto_1
@@ -222,7 +212,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -247,7 +237,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -308,7 +298,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -331,7 +321,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
@@ -394,7 +384,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$Companion.smali
index d8863b90d1..7cc56d73ec 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/os/Bundle;
 
@@ -61,13 +63,4 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$3.smali b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$3.smali
index ad948c13a3..eab403f7fe 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetLeaveGuildDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$3;->this$0:Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;->access$configureUI(Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.smali b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.smali
index e39f3aa6ef..590599d965 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetLeaveGuildDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4;->this$0:Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;->access$handleEvent(Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.smali b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.smali
index e42c10cb8b..45fb84b2a7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.smali
@@ -37,81 +37,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
 
-    const-class v2, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
+    const-string v2, "header"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "header"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeader()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "body"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBody()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "body"
-
-    const-string v4, "getBody()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
 
-    const-class v2, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
+    const-string v2, "confirmBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmBtn"
-
-    const-string v4, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
 
-    const-class v2, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;
+    const-string v2, "cancelBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancelBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancelBtn"
-
-    const-string v4, "getCancelBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -135,7 +111,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0583
+    const v0, 0x7f0a0589
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -143,7 +119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0582
+    const v0, 0x7f0a0588
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -151,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0581
+    const v0, 0x7f0a0587
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0580
+    const v0, 0x7f0a0586
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,9 +164,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -224,7 +200,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120e0e
+    const v1, 0x7f120e34
 
     const/4 v2, 0x1
 
@@ -254,7 +230,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120e0d
+    const v1, 0x7f120e33
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -274,9 +250,9 @@
 
     const-string v2, "getString(\n             \u2026.guild.name\n            )"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v1
 
@@ -297,7 +273,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$ViewState$Invalid;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -395,7 +371,7 @@
 
     sget-object v0, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Event$Dismiss;->INSTANCE:Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel$Event$Dismiss;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -454,11 +430,11 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -521,12 +497,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -534,7 +510,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 7
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppDialog;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -576,7 +554,7 @@
 
     const-string p2, "ViewModelProvider(this, \u2026ewModel::class.java\n    )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/leave/LeaveGuildDialogViewModel;
 
@@ -592,13 +570,4 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/FolderItemDecoration.smali b/com.discord/smali/com/discord/widgets/guilds/list/FolderItemDecoration.smali
index ae10668c5e..c3a9ca8daa 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/FolderItemDecoration.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/FolderItemDecoration.smali
@@ -45,13 +45,17 @@
 .method public constructor <init>(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "drawableNoChildren"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "tintableDrawableNoChildren"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "drawableWithChildren"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;-><init>()V
 
@@ -66,27 +70,6 @@
     iput p4, p0, Lcom/discord/widgets/guilds/list/FolderItemDecoration;->halfSize:I
 
     return-void
-
-    :cond_0
-    const-string p1, "drawableWithChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "tintableDrawableNoChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "drawableNoChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final drawBackgroundForInitialFolder(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;)I
@@ -151,7 +134,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -176,7 +159,7 @@
 
     const-string v2, "firstView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getRight()I
 
@@ -244,7 +227,7 @@
 
     sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -299,13 +282,17 @@
 .method public onDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "c"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "parent"
 
-    if-eqz p3, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/ViewGroup;->getChildCount()I
 
@@ -339,7 +326,7 @@
 
     instance-of v3, v2, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;
 
-    const-string v4, "view"
+    const-string/jumbo v4, "view"
 
     if-eqz v3, :cond_3
 
@@ -353,7 +340,7 @@
 
     if-eqz v5, :cond_3
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getRight()I
 
@@ -466,7 +453,7 @@
 
     if-eqz v2, :cond_4
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getRight()I
 
@@ -517,25 +504,4 @@
 
     :cond_5
     return-void
-
-    :cond_6
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "c"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$FolderItem.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$FolderItem.smali
index 1ce28eb616..35aa012306 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$FolderItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$FolderItem.smali
@@ -63,9 +63,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guilds"
 
-    if-eqz p6, :cond_0
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, p2, v0}, Lcom/discord/widgets/guilds/list/GuildListItem;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -90,13 +92,6 @@
     iput-boolean p11, p0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isTargetedForFolderAddition:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLjava/lang/Integer;Ljava/lang/String;ZLjava/util/List;ZZIZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -411,44 +406,37 @@
         }
     .end annotation
 
-    if-eqz p6, :cond_0
-
-    new-instance v12, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
-
-    move-object v0, v12
-
-    move-wide v1, p1
-
-    move-object/from16 v3, p3
-
-    move-object/from16 v4, p4
-
-    move/from16 v5, p5
-
-    move-object/from16 v6, p6
-
-    move/from16 v7, p7
-
-    move/from16 v8, p8
-
-    move/from16 v9, p9
-
-    move/from16 v10, p10
-
-    move/from16 v11, p11
-
-    invoke-direct/range {v0 .. v11}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;-><init>(JLjava/lang/Integer;Ljava/lang/String;ZLjava/util/List;ZZIZZ)V
-
-    return-object v12
-
-    :cond_0
     const-string v0, "guilds"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v7, p6
 
-    const/4 v0, 0x0
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
+
+    move-object v1, v0
+
+    move-wide v2, p1
+
+    move-object/from16 v4, p3
+
+    move-object/from16 v5, p4
+
+    move/from16 v6, p5
+
+    move/from16 v8, p7
+
+    move/from16 v9, p8
+
+    move/from16 v10, p9
+
+    move/from16 v11, p10
+
+    move/from16 v12, p11
+
+    invoke-direct/range {v1 .. v12}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;-><init>(JLjava/lang/Integer;Ljava/lang/String;ZLjava/util/List;ZZIZZ)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -474,7 +462,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->color:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -484,7 +472,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -500,7 +488,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->guilds:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$GuildItem.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$GuildItem.smali
index 9ed2ba6521..adc326f2f1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$GuildItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$GuildItem.smali
@@ -43,15 +43,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;IZZZLjava/lang/Long;ZZZLjava/lang/Boolean;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    invoke-direct {p0, v1, v2, v0}, Lcom/discord/widgets/guilds/list/GuildListItem;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/guilds/list/GuildListItem;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->guild:Lcom/discord/models/domain/ModelGuild;
 
@@ -74,13 +76,6 @@
     iput-object p10, p0, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->isLastGuildInFolder:Ljava/lang/Boolean;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelGuild;IZZZLjava/lang/Long;ZZZLjava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -406,44 +401,37 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;IZZZLjava/lang/Long;ZZZLjava/lang/Boolean;)Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
     .locals 12
 
-    if-eqz p1, :cond_0
-
-    new-instance v11, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
-
-    move-object v0, v11
-
-    move-object v1, p1
-
-    move v2, p2
-
-    move v3, p3
-
-    move/from16 v4, p4
-
-    move/from16 v5, p5
-
-    move-object/from16 v6, p6
-
-    move/from16 v7, p7
-
-    move/from16 v8, p8
-
-    move/from16 v9, p9
-
-    move-object/from16 v10, p10
-
-    invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;-><init>(Lcom/discord/models/domain/ModelGuild;IZZZLjava/lang/Long;ZZZLjava/lang/Boolean;)V
-
-    return-object v11
-
-    :cond_0
     const-string v0, "guild"
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object v2, p1
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v0, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
+
+    move-object v1, v0
+
+    move v3, p2
+
+    move v4, p3
+
+    move/from16 v5, p4
+
+    move/from16 v6, p5
+
+    move-object/from16 v7, p6
+
+    move/from16 v8, p7
+
+    move/from16 v9, p8
+
+    move/from16 v10, p9
+
+    move-object/from16 v11, p10
+
+    invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;-><init>(Lcom/discord/models/domain/ModelGuild;IZZZLjava/lang/Long;ZZZLjava/lang/Boolean;)V
+
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -461,7 +449,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -503,7 +491,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->folderId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -531,7 +519,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->isLastGuildInFolder:Ljava/lang/Boolean;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem.smali
index 60dfdcd2e2..8420fe16b1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem.smali
@@ -29,28 +29,23 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;I)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    invoke-direct {p0, v1, v2, v0}, Lcom/discord/widgets/guilds/list/GuildListItem;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/guilds/list/GuildListItem;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;->channel:Lcom/discord/models/domain/ModelChannel;
 
     iput p2, p0, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;->mentionCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;Lcom/discord/models/domain/ModelChannel;IILjava/lang/Object;)Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
@@ -102,22 +97,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;I)Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;-><init>(Lcom/discord/models/domain/ModelChannel;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -135,7 +123,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder.smali
index 60a0de12fe..1946c1a93a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder.smali
@@ -70,101 +70,105 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClicked"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->onClicked:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a04b2
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p2
-
-    const-string v0, "view.findViewById(R.id.g\u2026ds_item_folder_container)"
-
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemFolderContainer:Landroid/view/View;
-
-    const p2, 0x7f0a04b1
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p2
-
-    const-string v0, "view.findViewById(R.id.guilds_item_folder)"
-
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Lcom/discord/views/ServerFolderView;
-
-    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemFolder:Lcom/discord/views/ServerFolderView;
-
     const p2, 0x7f0a04b8
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v0, "view.findViewById(R.id.guilds_item_selected)"
+    const-string/jumbo v0, "view.findViewById(R.id.g\u2026ds_item_folder_container)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemFolderContainer:Landroid/view/View;
+
+    const p2, 0x7f0a04b7
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p2
+
+    const-string/jumbo v0, "view.findViewById(R.id.guilds_item_folder)"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Lcom/discord/views/ServerFolderView;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemFolder:Lcom/discord/views/ServerFolderView;
+
+    const p2, 0x7f0a04be
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p2
+
+    const-string/jumbo v0, "view.findViewById(R.id.guilds_item_selected)"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemSelected:Landroid/view/View;
 
-    const p2, 0x7f0a04b9
+    const p2, 0x7f0a04bf
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v0, "view.findViewById(R.id.guilds_item_unread)"
+    const-string/jumbo v0, "view.findViewById(R.id.guilds_item_unread)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemUnread:Landroid/view/View;
 
-    const p2, 0x7f0a04b4
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p2
-
-    const-string v0, "view.findViewById(R.id.guilds_item_mentions)"
-
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Landroid/widget/TextView;
-
-    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemMentions:Landroid/widget/TextView;
-
     const p2, 0x7f0a04ba
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v0, "view.findViewById(R.id.guilds_item_voice)"
+    const-string/jumbo v0, "view.findViewById(R.id.guilds_item_mentions)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Landroid/widget/TextView;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemMentions:Landroid/widget/TextView;
+
+    const p2, 0x7f0a04c0
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p2
+
+    const-string/jumbo v0, "view.findViewById(R.id.guilds_item_voice)"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemVoice:Landroid/view/View;
 
-    const p2, 0x7f0a04b3
+    const p2, 0x7f0a04b9
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string p2, "view.findViewById(R.id.guilds_item_highlight)"
+    const-string/jumbo p2, "view.findViewById(R.id.guilds_item_highlight)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemHighlight:Landroid/view/View;
 
@@ -175,20 +179,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setClipToOutline(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getOnClicked$p(Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;)Lkotlin/jvm/functions/Function1;
@@ -228,19 +218,19 @@
 .method public final configure(Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->data:Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->getColor()Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
 
     move-result v0
 
@@ -256,7 +246,12 @@
 
     move-result-object v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->color:Ljava/lang/Integer;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->isOpen()Z
@@ -275,12 +270,12 @@
 
     move-result v0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     const/4 v0, 0x0
 
-    :goto_0
+    :goto_1
     iput v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->numChildren:I
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
@@ -329,24 +324,24 @@
 
     const/4 v2, 0x1
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     const/4 v2, 0x0
 
-    :goto_1
+    :goto_2
     const/16 v4, 0x8
 
     if-eqz v2, :cond_3
 
     const/4 v2, 0x0
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     const/16 v2, 0x8
 
-    :goto_2
+    :goto_3
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemUnread:Landroid/view/View;
@@ -365,22 +360,22 @@
 
     const/4 v2, 0x1
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_4
     const/4 v2, 0x0
 
-    :goto_3
+    :goto_4
     if-eqz v2, :cond_5
 
     const/4 v2, 0x0
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_5
     const/16 v2, 0x8
 
-    :goto_4
+    :goto_5
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemVoice:Landroid/view/View;
@@ -399,22 +394,22 @@
 
     const/4 v2, 0x1
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_6
     const/4 v2, 0x0
 
-    :goto_5
+    :goto_6
     if-eqz v2, :cond_7
 
     const/4 v2, 0x0
 
-    goto :goto_6
+    goto :goto_7
 
     :cond_7
     const/16 v2, 0x8
 
-    :goto_6
+    :goto_7
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FolderViewHolder;->itemHighlight:Landroid/view/View;
@@ -440,7 +435,7 @@
 
     iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -448,7 +443,7 @@
 
     const-string v5, "itemView.context"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -468,29 +463,29 @@
 
     move-result-object v0
 
-    goto :goto_7
+    goto :goto_8
 
     :cond_9
     const-string v0, ""
 
-    :goto_7
+    :goto_8
     const-string v4, "if (mentionCount > 0) it\u2026tionCount\n      ) else \"\""
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v2
 
-    const v5, 0x7f12093c
+    const v5, 0x7f12093e
 
     const/4 v6, 0x2
 
@@ -518,24 +513,17 @@
 
     if-eqz v2, :cond_a
 
-    goto :goto_8
+    goto :goto_9
 
     :cond_a
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->getMentionCount()I
 
     move-result v1
 
-    :goto_8
+    :goto_9
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/guilds/list/GuildListViewHolder;->configureMentionsCount(Landroid/widget/TextView;I)V
 
     return-void
-
-    :cond_b
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getColor()Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder.smali
index bed53c9498..b2f04190ea 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder.smali
@@ -48,71 +48,61 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClicked"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->onClicked:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a04b6
+    const p2, 0x7f0a04bc
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v0, "view.findViewById(R.id.g\u2026rofile_avatar_background)"
+    const-string/jumbo v0, "view.findViewById(R.id.g\u2026rofile_avatar_background)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/facebook/drawee/view/SimpleDraweeView;
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemAvatarBackground:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    const p2, 0x7f0a04b5
+    const p2, 0x7f0a04bb
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string v0, "view.findViewById(R.id.guilds_item_profile_avatar)"
+    const-string/jumbo v0, "view.findViewById(R.id.guilds_item_profile_avatar)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/ImageView;
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemAvatar:Landroid/widget/ImageView;
 
-    const p2, 0x7f0a04b7
+    const p2, 0x7f0a04bd
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string p2, "view.findViewById(R.id.g\u2026ds_item_profile_selected)"
+    const-string/jumbo p2, "view.findViewById(R.id.g\u2026ds_item_profile_selected)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemSelected:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "onClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getOnClicked$p(Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;)Lkotlin/jvm/functions/Function1;
@@ -128,73 +118,75 @@
 .method public final configure(Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemSelected:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemSelected:Landroid/view/View;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;->isSelected()Z
 
-    move-result v2
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_0
+    move-result v1
 
     const/4 v2, 0x0
 
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x0
+
     goto :goto_0
 
     :cond_0
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_0
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    new-instance v2, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder$configure$1;
+    new-instance v1, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder$configure$1;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder$configure$1;-><init>(Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder$configure$1;-><init>(Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;)V
 
-    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemAvatarBackground:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$FriendsViewHolder;->itemAvatarBackground:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-virtual {v1}, Lcom/facebook/drawee/view/DraweeView;->getHierarchy()Lcom/facebook/drawee/interfaces/DraweeHierarchy;
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/DraweeView;->getHierarchy()Lcom/facebook/drawee/interfaces/DraweeHierarchy;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    check-cast v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;->isSelected()Z
 
-    move-result v2
+    move-result v1
 
-    const-string v4, "itemView"
+    const-string v3, "itemView"
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const v0, 0x7f080192
+    const v1, 0x7f080192
 
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f04012a
+    const v4, 0x7f04012a
 
-    const/4 v6, 0x2
+    const/4 v5, 0x2
 
-    invoke-static {v2, v5, v3, v6, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    const/4 v6, 0x0
 
-    move-result v0
+    invoke-static {v1, v4, v2, v5, v6}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+
+    move-result v1
 
     :goto_1
-    invoke-virtual {v1, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->o(I)V
+    invoke-virtual {v0, v1}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->o(I)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;->isSelected()Z
 
@@ -206,7 +198,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f060291
 
@@ -227,7 +219,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f040410
 
@@ -243,11 +235,4 @@
 
     :goto_2
     return-void
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali
index 812ca446b0..9a7d76e422 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali
@@ -130,14 +130,20 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClicked"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onLongPressed"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p4, :cond_1
-
-    if-eqz p5, :cond_0
-
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->overlayColor:I
@@ -148,7 +154,7 @@
 
     iput-object p5, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->onLongPressed:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a04ae
+    const p2, 0x7f0a04b4
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -156,13 +162,13 @@
 
     const-string p3, "itemView.findViewById(R.\u2026.guilds_item_avatar_wrap)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/ViewGroup;
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup;
 
-    const p2, 0x7f0a04ac
+    const p2, 0x7f0a04b2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -170,13 +176,13 @@
 
     const-string p3, "itemView.findViewById(R.id.guilds_item_avatar)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/facebook/drawee/view/SimpleDraweeView;
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    const p2, 0x7f0a04ad
+    const p2, 0x7f0a04b3
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -184,39 +190,39 @@
 
     const-string p3, "itemView.findViewById(R.\u2026.guilds_item_avatar_text)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarText:Landroid/widget/TextView;
 
-    const p2, 0x7f0a04b4
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p2
-
-    const-string p3, "itemView.findViewById(R.id.guilds_item_mentions)"
-
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p2, Landroid/widget/TextView;
-
-    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemMentions:Landroid/widget/TextView;
-
     const p2, 0x7f0a04ba
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
+    const-string p3, "itemView.findViewById(R.id.guilds_item_mentions)"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Landroid/widget/TextView;
+
+    iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemMentions:Landroid/widget/TextView;
+
+    const p2, 0x7f0a04c0
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p2
+
     const-string p3, "itemView.findViewById(R.id.guilds_item_voice)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemVoice:Landroid/view/View;
 
-    const p2, 0x7f0a04ab
+    const p2, 0x7f0a04b1
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -224,11 +230,11 @@
 
     const-string p3, "itemView.findViewById(R.\u2026_item_application_stream)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemApplicationStream:Landroid/view/View;
 
-    const p2, 0x7f0a04b9
+    const p2, 0x7f0a04bf
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -236,11 +242,11 @@
 
     const-string p3, "itemView.findViewById(R.id.guilds_item_unread)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemUnread:Landroid/view/View;
 
-    const p2, 0x7f0a04b8
+    const p2, 0x7f0a04be
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -248,7 +254,7 @@
 
     const-string p3, "itemView.findViewById(R.id.guilds_item_selected)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemSelected:Landroid/view/View;
 
@@ -309,27 +315,6 @@
     iput p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->imageRequestSize:I
 
     return-void
-
-    :cond_0
-    const-string p1, "onLongPressed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getOnClicked$p(Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;)Lkotlin/jvm/functions/Function1;
@@ -516,7 +501,7 @@
 
     const-string v6, "a"
 
-    invoke-static {v1, v6, v4, v5}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v1, v6, v4, v5}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v1
 
@@ -542,7 +527,7 @@
 
     check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->e:Lf/g/g/e/f;
 
@@ -577,7 +562,7 @@
 
     check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v2, 0x32
 
@@ -631,7 +616,7 @@
 
     move-result-object v2
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1, v2}, Lk0/o/c/i;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v11
 
@@ -772,16 +757,16 @@
     return-void
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -815,28 +800,30 @@
 .method public final configure(Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_18
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->data:Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->data:Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    if-eqz v0, :cond_0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    if-eqz v1, :cond_0
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String;
+    if-eqz v0, :cond_0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String;
+
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
     iget-object v2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->data:Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
@@ -869,7 +856,7 @@
     const/4 v2, 0x1
 
     :goto_2
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -879,24 +866,24 @@
 
     move-result-object v5
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/2addr v1, v3
+    xor-int/2addr v0, v3
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
     goto :goto_3
 
     :cond_3
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     goto :goto_4
 
     :cond_4
     :goto_3
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     :goto_4
     iget-object v5, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->data:Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
@@ -914,7 +901,7 @@
     goto :goto_5
 
     :cond_5
-    move-object v5, v0
+    move-object v5, v1
 
     :goto_5
     if-eqz v5, :cond_7
@@ -948,13 +935,13 @@
 
     const-string v7, "itemView"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6, v4}, Landroid/view/View;->setVisibility(I)V
 
     iget-object v6, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->isSelected()Z
 
@@ -1014,7 +1001,7 @@
 
     const-string v8, "ICON_UNSET"
 
-    invoke-static {v6, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -1077,25 +1064,25 @@
     invoke-direct {p0, v5}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureGuildIconPositioning(Z)V
 
     :cond_c
-    if-nez v1, :cond_d
+    if-nez v0, :cond_d
 
     if-eqz v2, :cond_e
 
     :cond_d
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->isSelected()Z
 
     move-result v5
 
-    invoke-direct {p0, v1, v5}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureGuildIconImage(Lcom/discord/models/domain/ModelGuild;Z)V
+    invoke-direct {p0, v0, v5}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureGuildIconImage(Lcom/discord/models/domain/ModelGuild;Z)V
 
     :cond_e
     invoke-direct {p0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureDraggingAlpha()V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarText:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarText:Landroid/widget/TextView;
 
     if-eqz v6, :cond_f
 
@@ -1104,14 +1091,14 @@
     :cond_f
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :goto_b
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     if-eqz v2, :cond_11
 
@@ -1170,7 +1157,7 @@
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -1178,13 +1165,13 @@
 
     const-string v2, "itemView.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v1
 
-    const v2, 0x7f100097
+    const v2, 0x7f100099
 
     new-array v5, v3, [Ljava/lang/Object;
 
@@ -1206,21 +1193,21 @@
     :goto_d
     const-string v1, "if (mentionCount > 0) it\u2026tionCount\n      ) else \"\""
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v2, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v2
 
-    const v5, 0x7f120bc0
+    const v5, 0x7f120be6
 
     const/4 v6, 0x2
 
@@ -1329,13 +1316,6 @@
     invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_18
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getFolderId()Ljava/lang/Long;
@@ -1413,7 +1393,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x8
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder.smali
index 28e5f0c43b..399482a868 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder.smali
@@ -62,70 +62,55 @@
         }
     .end annotation
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClicked"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onLongPressed"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder;->onClicked:Lkotlin/jvm/functions/Function1;
 
     iput-object p3, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder;->onLongPressed:Lkotlin/jvm/functions/Function1;
 
-    const p2, 0x7f0a04af
+    const p2, 0x7f0a04b5
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p2
 
-    const-string p3, "view.findViewById(R.id.guilds_item_dm_avatar)"
+    const-string/jumbo p3, "view.findViewById(R.id.guilds_item_dm_avatar)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/ImageView;
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder;->itemIcon:Landroid/widget/ImageView;
 
-    const p2, 0x7f0a04b0
+    const p2, 0x7f0a04b6
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string p2, "view.findViewById(R.id.guilds_item_dm_count)"
+    const-string/jumbo p2, "view.findViewById(R.id.guilds_item_dm_count)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder;->itemCount:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "onLongPressed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getOnClicked$p(Lcom/discord/widgets/guilds/list/GuildListViewHolder$PrivateChannelViewHolder;)Lkotlin/jvm/functions/Function1;
@@ -149,7 +134,9 @@
 .method public final configure(Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;)V
     .locals 11
 
-    if-eqz p1, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;->getMentionCount()I
 
@@ -169,7 +156,7 @@
 
     iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -177,7 +164,7 @@
 
     const-string v5, "itemView.context"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -205,21 +192,21 @@
     :goto_0
     const-string v4, "if (mentionCount > 0) it\u2026tionCount\n      ) else \"\""
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v5, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v3
 
-    const v5, 0x7f1205c4
+    const v5, 0x7f1205c6
 
     const/4 v6, 0x2
 
@@ -276,13 +263,4 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SimpleViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SimpleViewHolder.smali
index ba6d461efc..1e13f9f7a6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SimpleViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SimpleViewHolder.smali
@@ -18,18 +18,13 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SpaceViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SpaceViewHolder.smali
index 4030b15877..53011c47e4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SpaceViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$SpaceViewHolder.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$SpaceViewHolder;->view:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
index c8d1a930af..18eeef0ea2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
@@ -38,7 +38,9 @@
 .method public final configureMentionsCount(Landroid/widget/TextView;I)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "textView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -63,15 +65,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "textView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDragEnded(Z)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildsDragAndDropCallback.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildsDragAndDropCallback.smali
index 4a97079270..6d5a2a8c37 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildsDragAndDropCallback.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildsDragAndDropCallback.smali
@@ -41,24 +41,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$Controller;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "controller"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/ItemTouchHelper$Callback;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback;->controller:Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$Controller;
 
     return-void
-
-    :cond_0
-    const-string p1, "controller"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -76,11 +69,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selected"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dropTargets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback;->controller:Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$Controller;
 
@@ -89,55 +84,36 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "dropTargets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getMoveThreshold(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)F
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewHolder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p1, 0x3e4ccccd    # 0.2f
 
     return p1
-
-    :cond_0
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getMovementFlags(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recyclerView"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string/jumbo p1, "viewHolder"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of p1, p2, Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$DraggableViewHolder;
 
     if-nez p1, :cond_0
 
-    move-object p2, v0
+    const/4 p2, 0x0
 
     :cond_0
     check-cast p2, Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$DraggableViewHolder;
@@ -175,26 +151,14 @@
     move-result p1
 
     return p1
-
-    :cond_3
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public interpolateOutOfBoundsScroll(Landroidx/recyclerview/widget/RecyclerView;IIIJ)I
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "recyclerView"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     int-to-float p1, p3
 
@@ -207,15 +171,6 @@
     mul-int/lit8 p1, p1, 0x14
 
     return p1
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public isItemViewSwipeEnabled()Z
@@ -237,13 +192,17 @@
 .method public onMove(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recyclerView"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "source"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "target"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback;->controller:Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$Controller;
 
@@ -252,27 +211,6 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "target"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onSelectedChanged(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
@@ -307,16 +245,9 @@
 .method public onSwiped(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p2, "viewHolder"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$createDiffUtilCallback$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$createDiffUtilCallback$1.smali
index 13783a4c2f..a2b6a4a7fe 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$createDiffUtilCallback$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$createDiffUtilCallback$1.smali
@@ -54,7 +54,7 @@
 
     check-cast p2, Lcom/discord/widgets/guilds/list/GuildListItem;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$1.smali
index 1972e0227b..24bede24aa 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$1.smali
@@ -57,7 +57,7 @@
 
     const-string v1, "holder.itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$1;->$item:Lcom/discord/widgets/guilds/list/GuildListItem;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1.smali
index 0d264e6727..d4576c7450 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Landroid/view/View;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v0, "LayoutInflater\n         \u2026layoutRes, parent, false)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$2.smali
index 33b6524e12..37b7e1b65c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$2;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
@@ -78,13 +80,4 @@
     invoke-interface {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;->onItemClicked(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$3.smali
index 65bbeb48c7..0b103bf4bc 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$3;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
@@ -78,13 +80,4 @@
     invoke-interface {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;->onItemLongPressed(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$4.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$4.smali
index be252a9efd..6d2c1a138e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$4;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
@@ -78,13 +80,4 @@
     invoke-interface {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;->onItemClicked(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$5.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$5.smali
index 7469f1e28c..9b698ac944 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$5.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$5;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
@@ -78,13 +80,4 @@
     invoke-interface {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;->onItemClicked(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$6.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$6.smali
index 59bb1b1eef..07523926e8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$6.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$6;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
@@ -78,13 +80,4 @@
     invoke-interface {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;->onItemLongPressed(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$7.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$7.smali
index e90bf7883a..9e9f35e1ba 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$7.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$7;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
@@ -78,13 +80,4 @@
     invoke-interface {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;->onItemClicked(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali
index 90a54c33a0..ca986b1b0b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali
@@ -77,11 +77,13 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/LinearLayoutManager;Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "layoutManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "interactionListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -89,7 +91,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->interactionListener:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->items:Ljava/util/List;
 
@@ -100,20 +102,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->boundingBoxRect:Landroid/graphics/Rect;
 
     return-void
-
-    :cond_0
-    const-string p1, "interactionListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "layoutManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getInteractionListener$p(Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;)Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;
@@ -163,21 +151,23 @@
         }
     .end annotation
 
-    const/4 p3, 0x0
+    const-string p3, "selected"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string p3, "dropTargets"
 
-    iget-object p4, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->layoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p3, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->layoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
 
     iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->boundingBoxRect:Landroid/graphics/Rect;
+    iget-object p4, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->boundingBoxRect:Landroid/graphics/Rect;
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p4, p1, v1, v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTransformedBoundingBox(Landroid/view/View;ZLandroid/graphics/Rect;)V
+    invoke-virtual {p3, p1, v0, p4}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTransformedBoundingBox(Landroid/view/View;ZLandroid/graphics/Rect;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->boundingBoxRect:Landroid/graphics/Rect;
 
@@ -187,74 +177,62 @@
 
     iput p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->selectedCenterY:I
 
-    const p1, 0x7fffffff
-
     invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object p2
+    move-result-object p1
+
+    const p2, 0x7fffffff
+
+    const/4 p3, 0x0
 
     :cond_0
     :goto_0
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p4
 
     if-eqz p4, :cond_1
 
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object p4
 
     check-cast p4, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->layoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->layoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
 
     iget-object v2, p4, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     iget-object v3, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->boundingBoxRect:Landroid/graphics/Rect;
 
-    invoke-virtual {v0, v2, v1, v3}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTransformedBoundingBox(Landroid/view/View;ZLandroid/graphics/Rect;)V
+    invoke-virtual {v1, v2, v0, v3}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTransformedBoundingBox(Landroid/view/View;ZLandroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->boundingBoxRect:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->boundingBoxRect:Landroid/graphics/Rect;
 
-    invoke-virtual {v0}, Landroid/graphics/Rect;->centerY()I
+    invoke-virtual {v1}, Landroid/graphics/Rect;->centerY()I
 
-    move-result v0
+    move-result v1
 
     iget v2, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->selectedCenterY:I
 
-    sub-int/2addr v2, v0
+    sub-int/2addr v2, v1
 
     invoke-static {v2}, Ljava/lang/Math;->abs(I)I
 
     move-result v2
 
-    if-ge v2, p1, :cond_0
+    if-ge v2, p2, :cond_0
 
-    iput v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->targetCenterY:I
+    iput v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->targetCenterY:I
 
     move-object p3, p4
 
-    move p1, v2
+    move p2, v2
 
     goto :goto_0
 
     :cond_1
     return-object p3
-
-    :cond_2
-    const-string p1, "dropTargets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_3
-    const-string p1, "selected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
 
 .method public getItemCount()I
@@ -336,7 +314,7 @@
     :cond_3
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$DividerItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$DividerItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -349,7 +327,7 @@
     :cond_4
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$CreateItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$CreateItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -362,7 +340,7 @@
     :cond_5
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$HelpItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$HelpItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -384,7 +362,7 @@
     :cond_7
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$SpaceItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$SpaceItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -434,7 +412,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/guilds/list/GuildListViewHolder;I)V
     .locals 2
 
-    if-eqz p1, :cond_8
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->items:Ljava/util/List;
 
@@ -539,15 +519,6 @@
     :cond_7
     :goto_1
     return-void
-
-    :cond_8
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -563,7 +534,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/guilds/list/GuildListViewHolder;
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;
 
@@ -747,15 +720,6 @@
     :goto_0
     return-object p2
 
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_8
@@ -771,9 +735,11 @@
 .end method
 
 .method public onDragStarted(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewHolder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/list/GuildListViewHolder;
 
@@ -782,15 +748,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->draggingItem:Lcom/discord/widgets/guilds/list/GuildListViewHolder;
 
     return-void
-
-    :cond_0
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDrop()V
@@ -817,19 +774,27 @@
 .end method
 
 .method public onMove(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
-    .locals 18
+    .locals 17
 
     move-object/from16 v0, p0
 
     move-object/from16 v1, p2
 
-    const/4 v2, 0x0
+    move-object/from16 v2, p3
 
-    if-eqz p1, :cond_1b
+    const-string v3, "recyclerView"
 
-    if-eqz v1, :cond_1a
+    move-object/from16 v4, p1
 
-    if-eqz p3, :cond_19
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "source"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "target"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, v0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->interactionListener:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;
 
@@ -843,85 +808,85 @@
 
     move-result-wide v3
 
-    move-object/from16 v5, p3
+    check-cast v2, Lcom/discord/widgets/guilds/list/GuildListViewHolder;
 
-    check-cast v5, Lcom/discord/widgets/guilds/list/GuildListViewHolder;
-
-    invoke-virtual {v5}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemId()J
+    invoke-virtual {v2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemId()J
 
     move-result-wide v5
 
-    iget-object v7, v0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->items:Ljava/util/List;
+    iget-object v2, v0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->items:Ljava/util/List;
 
-    invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v7
+    move-result-object v2
 
-    const/4 v8, -0x1
+    const/4 v7, -0x1
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    const/4 v10, -0x1
+    const/4 v9, -0x1
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
-    const/4 v12, -0x1
+    const/4 v11, -0x1
 
     :goto_0
-    invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v13
+    move-result v12
 
-    if-eqz v13, :cond_3
+    if-eqz v12, :cond_3
 
-    invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v13
+    move-result-object v12
 
-    add-int/lit8 v14, v11, 0x1
+    add-int/lit8 v13, v10, 0x1
 
-    if-ltz v11, :cond_2
+    if-ltz v10, :cond_2
 
-    check-cast v13, Lcom/discord/widgets/guilds/list/GuildListItem;
+    check-cast v12, Lcom/discord/widgets/guilds/list/GuildListItem;
 
-    invoke-virtual {v13}, Lcom/discord/widgets/guilds/list/GuildListItem;->getItemId()J
+    invoke-virtual {v12}, Lcom/discord/widgets/guilds/list/GuildListItem;->getItemId()J
 
-    move-result-wide v15
+    move-result-wide v14
 
-    cmp-long v17, v15, v3
+    cmp-long v16, v14, v3
 
-    if-nez v17, :cond_0
+    if-nez v16, :cond_0
 
-    move v10, v11
+    move v9, v10
 
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v13}, Lcom/discord/widgets/guilds/list/GuildListItem;->getItemId()J
+    invoke-virtual {v12}, Lcom/discord/widgets/guilds/list/GuildListItem;->getItemId()J
 
-    move-result-wide v15
+    move-result-wide v14
 
-    cmp-long v13, v15, v5
+    cmp-long v12, v14, v5
 
-    if-nez v13, :cond_1
+    if-nez v12, :cond_1
 
-    move v12, v11
+    move v11, v10
 
     :cond_1
     :goto_1
-    move v11, v14
+    move v10, v13
 
     goto :goto_0
 
     :cond_2
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
-    throw v2
+    const/4 v1, 0x0
+
+    throw v1
 
     :cond_3
-    if-eq v10, v8, :cond_18
+    if-eq v9, v7, :cond_18
 
-    if-ne v12, v8, :cond_4
+    if-ne v11, v7, :cond_4
 
     goto/16 :goto_c
 
@@ -930,7 +895,7 @@
 
     const-string v2, "source.itemView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/view/View;->getHeight()I
 
@@ -991,7 +956,7 @@
     :goto_3
     iget-object v2, v0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->items:Ljava/util/List;
 
-    invoke-interface {v2, v10}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v2, v9}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -999,7 +964,7 @@
 
     iget-object v4, v0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->items:Ljava/util/List;
 
-    invoke-interface {v4, v12}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v4, v11}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -1177,7 +1142,7 @@
     :goto_a
     if-nez v2, :cond_13
 
-    return v9
+    return v8
 
     :cond_13
     invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
@@ -1194,7 +1159,7 @@
 
     new-instance v1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;
 
-    invoke-direct {v1, v10, v12}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;-><init>(II)V
+    invoke-direct {v1, v9, v11}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;-><init>(II)V
 
     goto :goto_b
 
@@ -1208,14 +1173,14 @@
     :cond_15
     new-instance v1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;
 
-    invoke-direct {v1, v10, v12}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;-><init>(II)V
+    invoke-direct {v1, v9, v11}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;-><init>(II)V
 
     goto :goto_b
 
     :cond_16
     new-instance v1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;
 
-    invoke-direct {v1, v10, v12}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;-><init>(II)V
+    invoke-direct {v1, v9, v11}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;-><init>(II)V
 
     :goto_b
     iget-object v2, v0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->interactionListener:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$InteractionListener;
@@ -1235,28 +1200,7 @@
 
     :cond_18
     :goto_c
-    return v9
-
-    :cond_19
-    const-string v1, "target"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1a
-    const-string v1, "source"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1b
-    const-string v1, "recyclerView"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    return v8
 .end method
 
 .method public final setItems(Ljava/util/List;Z)V
@@ -1271,7 +1215,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "newItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -1289,7 +1235,7 @@
 
     const-string v0, "DiffUtil.calculateDiff(callback, true)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;->items:Ljava/util/List;
 
@@ -1304,13 +1250,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "newItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem.smali
index 4fcd496daf..72f9a78af0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem.smali
@@ -49,24 +49,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;
@@ -99,22 +92,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -132,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem.smali
index 1aea2aa3ce..8061f6351c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem.smali
@@ -35,7 +35,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;
 
@@ -43,41 +43,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "avatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "avatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "guildName"
 
-    const/4 v3, 0x0
+    const-string v3, "getGuildName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "guildName"
+    const/4 v2, 0x1
 
-    const-string v4, "getGuildName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -87,13 +75,15 @@
 .method public constructor <init>(Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d01e1
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0480
+    const p1, 0x7f0a0486
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +91,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0481
+    const p1, 0x7f0a0487
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -110,15 +100,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;->guildName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;)Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter;
@@ -174,41 +155,43 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p2}, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
-
-    const/4 v2, 0x0
+    move-result-object v2
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xe
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xe
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    const/4 v7, 0x0
 
-    move-result-object v1
+    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
-    const/4 v2, 0x0
+    move-result-object v2
 
     const/4 v3, 0x0
 
-    const/16 v5, 0x1c
+    const/4 v4, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    const/16 v6, 0x1c
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;->getGuildName()Landroid/widget/TextView;
 
@@ -233,15 +216,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$guildClickListener$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$guildClickListener$1.smali
index 82a1978272..af6751ef77 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$guildClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter$guildClickListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$guildClickListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildSearchAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter.smali
index 013710ca4c..10379f185b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSearchAdapter.smali
@@ -36,9 +36,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -47,15 +49,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter;->guildClickListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getGuildClickListener$p(Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter;)Lkotlin/jvm/functions/Function1;
@@ -92,31 +85,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildItems"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildClickListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     iput-object p2, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter;->guildClickListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -130,9 +111,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildListItem;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -148,13 +131,4 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$Companion.smali
index b5642dc647..0308c9b19c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$Companion.smali
@@ -38,7 +38,7 @@
 
     if-eqz p3, :cond_0
 
-    sget-object p2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p2, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_0
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildSelector$Companion;->createForResult(Landroidx/fragment/app/Fragment;Ljava/util/List;)V
@@ -60,11 +60,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "ignoredGuildIds"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -82,27 +84,13 @@
 
     const-string v0, "Intent().putExtra(EXTRA_\u2026rayList(ignoredGuildIds))"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/guilds/list/WidgetGuildSelector;
 
     const/4 v1, 0x1
 
-    invoke-static {p1, v0, p2, v1}, Lf/a/b/k;->g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, p2, v1}, Lf/a/b/m;->g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ignoredGuildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$configureUI$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$configureUI$1.smali
index 1ac14451c3..fcdea5fce8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildSelector$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$1.smali
index 903328e3de..4ec813eac8 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildSelector.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/LinkedHashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/Collection<",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$2.smali
index 02f37dd6f6..5692dff5cd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$2.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/String;",
+        "Ljava/util/Collection<",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;"
     }
 .end annotation
 
@@ -80,7 +87,7 @@
 
     const-string v0, "guilds"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -114,7 +121,7 @@
 
     const-string v4, "it"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -134,7 +141,7 @@
 
     const-string v4, "searchText"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
@@ -142,7 +149,7 @@
 
     const-string v5, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
@@ -150,13 +157,13 @@
 
     const-string v6, "it.name"
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3, v4, v2}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$3.smali
index 22a8e9f4dc..5cd5d8262f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildSelector.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;",
+        ">;>;"
     }
 .end annotation
 
@@ -86,7 +93,7 @@
 
     const-string v0, "matchedGuilds"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -119,7 +126,7 @@
 
     const-string v3, "guild"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, v1}, Lcom/discord/widgets/guilds/list/WidgetGuildSearchAdapter$GuildItem;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$4.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$4.smali
index 41b100c4ab..aab024d3b2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onResume$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildSelector$onResume$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 
     const-string v1, "guildItems"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildSelector;->access$configureUI(Lcom/discord/widgets/guilds/list/WidgetGuildSelector;Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onViewBound$2.smali
index a55aa1271d..9fa83e0f98 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildSelector$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSelector$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildSelector;
 
@@ -82,13 +84,4 @@
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali
index e448222dc8..99cb00d9b7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali
@@ -59,41 +59,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/list/WidgetGuildSelector;
 
-    const-class v2, Lcom/discord/widgets/guilds/list/WidgetGuildSelector;
+    const-string v2, "search"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearch()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "search"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSearch()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/list/WidgetGuildSelector;
 
-    const/4 v2, 0x0
+    const-string v2, "recyclerView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/list/WidgetGuildSelector;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "recyclerView"
-
-    const-string v4, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -117,7 +105,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a047f
+    const v0, 0x7f0a0485
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -125,7 +113,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildSelector;->search$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0482
+    const v0, 0x7f0a0488
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -210,7 +198,7 @@
     :cond_0
     const-string p1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -299,7 +287,7 @@
 
     sget-object v2, Lcom/discord/widgets/guilds/list/WidgetGuildSelector$onResume$1;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildSelector$onResume$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -313,7 +301,7 @@
 
     const-string v1, "Observable.combineLatest\u2026)\n        )\n      }\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -325,13 +313,13 @@
 
     sget-object v1, Lcom/discord/widgets/guilds/list/WidgetGuildSelector$onResume$3;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildSelector$onResume$3;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable.combineLatest\u2026  )\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -367,7 +355,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -430,20 +420,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.collections.ArrayList<com.discord.models.domain.GuildId /* = kotlin.Long */> /* = java.util.ArrayList<com.discord.models.domain.GuildId /* = kotlin.Long */> */"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali
index f8e686964b..acd210e84b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$1.smali
@@ -29,7 +29,15 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/stores/StoreNux$NuxState;",
+        "Ljava/lang/Boolean;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;",
+        ">;"
     }
 .end annotation
 
@@ -87,7 +95,7 @@
 
     const-string v1, "connectionOpen"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali
index f9f9342e54..08b1298b44 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildsList.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2;->call(Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;)Z
+    invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;->isEligible()Z
 
     move-result p1
 
@@ -75,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;->isEligible()Z
+    check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2;->call(Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali
index 74a2051ac1..6ec5284832 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildsList.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Throwable;",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;",
         ">;"
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali
index 8030a9135b..e1eeaedf36 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildsList.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/panels/PanelState;
+    sget-object v0, Lcom/discord/panels/PanelState$a;->a:Lcom/discord/panels/PanelState$a;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1;->call(Lcom/discord/panels/PanelState;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/panels/PanelState;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/panels/PanelState$a;->a:Lcom/discord/panels/PanelState$a;
+    check-cast p1, Lcom/discord/panels/PanelState;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1;->call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali
index 59b39f577a..121fa6bd7a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion.smali
@@ -88,13 +88,13 @@
 
     sget-object v1, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "Observable\n             \u2026.filter { it.isEligible }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0x0
 
@@ -110,13 +110,13 @@
 
     sget-object v1, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$get$3;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable\n             \u2026 = false)\n              }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -144,13 +144,13 @@
 
     sget-object v1, Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n            \u2026te == PanelState.Closed }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureAddGuildHint$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureAddGuildHint$1.smali
index fc0bb77d26..5bc32235a9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureAddGuildHint$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureAddGuildHint$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$configureAddGuildHint$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "nux"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xb
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xb
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "nux"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.smali
index 97f5ae0eea..36ac62e904 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -106,11 +106,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$1.smali
index 86e3772afe..1930caae2a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$1;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsList;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->access$configureUI(Lcom/discord/widgets/guilds/list/WidgetGuildsList;Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$2.smali
index 84873f761b..518c6d1a8f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$2;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsList;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->access$handleEvent(Lcom/discord/widgets/guilds/list/WidgetGuildsList;Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$3.smali
index f30635994e..5997d066a3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$3;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsList;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->access$configureAddGuildHint(Lcom/discord/widgets/guilds/list/WidgetGuildsList;Lcom/discord/widgets/guilds/list/WidgetGuildsList$AddGuildHint;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$4.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$4.smali
index 4e69d344fc..e573de7df1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onResume$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onResume$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali
index 8f11b593fa..c1bc5c10f5 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Integer;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali
index 273cdefc45..95ed1de257 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsList.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsList;
 
@@ -83,13 +85,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
index c8410be3ef..b3657f5bea 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList.smali
@@ -42,41 +42,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/list/WidgetGuildsList;
 
-    const-class v2, Lcom/discord/widgets/guilds/list/WidgetGuildsList;
+    const-string v2, "recyclerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "recyclerView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/list/WidgetGuildsList;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "unreadsStub"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUnreadsStub()Landroid/view/ViewStub;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/list/WidgetGuildsList;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "unreadsStub"
-
-    const-string v4, "getUnreadsStub()Landroid/view/ViewStub;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -92,7 +80,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0449
+    const v0, 0x7f0a044f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -100,7 +88,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a044b
+    const v0, 0x7f0a0451
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,7 +143,7 @@
     :cond_0
     const-string p0, "adapter"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -359,7 +347,7 @@
     :cond_3
     const-string p1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -523,7 +511,7 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowCreateGuild;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowCreateGuild;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -536,7 +524,7 @@
     :cond_2
     sget-object v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowHelp;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$ShowHelp;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -549,7 +537,7 @@
     :cond_3
     sget-object v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$FocusFirstElement;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$FocusFirstElement;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -597,7 +585,7 @@
 
     const/4 v5, 0x0
 
-    if-eqz v1, :cond_5
+    if-eqz v1, :cond_2
 
     invoke-virtual {v1, v2}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->setHasStableIds(Z)V
 
@@ -619,7 +607,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->adapter:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_1
 
     invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
@@ -629,7 +617,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->adapter:Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter;
 
-    if-eqz v2, :cond_3
+    if-eqz v2, :cond_0
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback;-><init>(Lcom/discord/widgets/guilds/list/GuildsDragAndDropCallback$Controller;)V
 
@@ -657,7 +645,7 @@
 
     const-string v6, "requireContext()"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v7, 0x7f040072
 
@@ -671,11 +659,11 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_2
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v4, "ContextCompat.getDrawabl\u2026children)\n            )!!"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -685,7 +673,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v10, 0x7f040073
 
@@ -697,9 +685,9 @@
 
     move-result-object v7
 
-    if-eqz v7, :cond_1
+    invoke-static {v7}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-static {v7, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -709,7 +697,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v11, 0x7f040074
 
@@ -721,15 +709,15 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_0
+    invoke-static {v3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v4
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -748,32 +736,17 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v5
 
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v5
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_3
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_4
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_5
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v5
 .end method
@@ -789,7 +762,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Companion;->show(Landroidx/fragment/app/FragmentManager;J)V
 
@@ -811,7 +784,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd$Companion;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -833,7 +806,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/nux/WidgetNavigationHelp$Companion;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -849,7 +822,7 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -857,7 +830,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -871,7 +844,7 @@
 
     aput-object v3, v2, v4
 
-    const v3, 0x7f1000bf
+    const v3, 0x7f1000c1
 
     invoke-static {v0, v1, v3, p1, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -889,7 +862,7 @@
 
     const/16 v2, 0xc
 
-    invoke-static {v0, p1, v4, v1, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v4, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
@@ -918,9 +891,9 @@
     return v0
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -930,11 +903,13 @@
 .method public onItemClicked(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "item"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
@@ -945,39 +920,29 @@
     return-void
 
     :cond_0
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public onItemLongPressed(Landroid/view/View;Lcom/discord/widgets/guilds/list/GuildListItem;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "item"
 
-    instance-of v1, p2, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    instance-of v0, p2, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
+
+    if-eqz v0, :cond_0
 
     const/4 v0, 0x2
 
@@ -1019,7 +984,7 @@
 
     const-string v2, "requireActivity()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
 
@@ -1046,25 +1011,13 @@
     return-void
 
     :cond_1
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_2
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public onItemMoved()V
@@ -1078,7 +1031,7 @@
 
     const-string v2, "requireActivity()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -1090,105 +1043,100 @@
 .method public onOperation(Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "operation"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;
+    instance-of v0, p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;
 
-    const-string v2, "viewModel"
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_1
+    const-string/jumbo v2, "viewModel"
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
+    if-eqz v0, :cond_1
 
-    if-eqz v1, :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
+
+    if-eqz v0, :cond_0
 
     check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;->getFromPosition()I
 
-    move-result v0
+    move-result v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveAbove;->getTargetPosition()I
 
     move-result p1
 
-    invoke-virtual {v1, v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->moveAbove(II)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->moveAbove(II)V
 
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
-    instance-of v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;
+    instance-of v0, p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;->getFromPosition()I
 
-    move-result v0
+    move-result v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$MoveBelow;->getTargetPosition()I
 
     move-result p1
 
-    invoke-virtual {v1, v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->moveBelow(II)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->moveBelow(II)V
 
     goto :goto_0
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_3
-    instance-of v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;
+    instance-of v0, p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
     check-cast p1, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;->getFromPosition()I
 
-    move-result v0
+    move-result v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$Operation$TargetOperation;->getTargetPosition()I
 
     move-result p1
 
-    invoke-virtual {v1, v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->target(II)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->target(II)V
 
     goto :goto_0
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_5
     :goto_0
     return-void
-
-    :cond_6
-    const-string p1, "operation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onResume()V
@@ -1216,19 +1164,19 @@
 
     const-string v1, "ViewModelProvider(this, \u2026istViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->viewModel:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
-    const-string v1, "viewModel"
+    const-string/jumbo v1, "viewModel"
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1331,12 +1279,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -1344,9 +1292,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1362,12 +1310,12 @@
 
     move-result-object v3
 
-    const/4 v4, 0x0
-
     new-instance v5, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1;
 
     invoke-direct {v5, p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$1;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsList;)V
 
+    const/4 v4, 0x0
+
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -1386,51 +1334,41 @@
 
     if-eqz p1, :cond_0
 
-    const v1, 0x7f120002
+    const v0, 0x7f120002
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->setMentionResId(I)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->setMentionResId(I)V
 
     :cond_0
     iget-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsList;->guildListUnreads:Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;
 
     if-eqz p1, :cond_1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->setUnreadsEnabled(Z)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelListUnreads;->setUnreadsEnabled(Z)V
 
     :cond_1
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
 
     move-result-object p1
 
-    instance-of v1, p1, Lcom/discord/widgets/home/WidgetHome;
+    instance-of v0, p1, Lcom/discord/widgets/home/WidgetHome;
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_2
-    move-object v0, p1
+    check-cast p1, Lcom/discord/widgets/home/WidgetHome;
 
-    :goto_0
-    check-cast v0, Lcom/discord/widgets/home/WidgetHome;
+    if-eqz p1, :cond_3
 
-    if-eqz v0, :cond_3
+    new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;
 
-    new-instance p1, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;
+    invoke-direct {v0, p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsList;)V
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsList;)V
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/home/WidgetHome;->setOnGuildListAddHintCreate(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/home/WidgetHome;->setOnGuildListAddHintCreate(Lkotlin/jvm/functions/Function1;)V
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$1.smali
index 1353157223..d175b8c4d3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "storeState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->access$handleStoreState(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali
index c3aa148188..9205889d1e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali
@@ -134,21 +134,33 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildSettings"
 
-    if-eqz p5, :cond_6
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_5
+    const-string/jumbo v0, "unreadGuildIds"
 
-    if-eqz p7, :cond_4
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_3
+    const-string v0, "mentionCounts"
 
-    if-eqz p9, :cond_2
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_1
+    const-string v0, "channelIds"
 
-    if-eqz p11, :cond_0
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "unavailableGuilds"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "privateChannels"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sortedGuilds"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -171,55 +183,6 @@
     iput-object p11, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->sortedGuilds:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "sortedGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "privateChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "unavailableGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channelIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "mentionCounts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "unreadGuildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "guildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;
@@ -536,21 +499,47 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildSettings"
 
-    if-eqz p5, :cond_6
+    move-object/from16 v6, p5
 
-    if-eqz p6, :cond_5
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_4
+    const-string/jumbo v0, "unreadGuildIds"
 
-    if-eqz p8, :cond_3
+    move-object/from16 v7, p6
 
-    if-eqz p9, :cond_2
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_1
+    const-string v0, "mentionCounts"
 
-    if-eqz p11, :cond_0
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelIds"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "unavailableGuilds"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "privateChannels"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sortedGuilds"
+
+    move-object/from16 v12, p11
+
+    invoke-static {v12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;
 
@@ -560,72 +549,9 @@
 
     move-wide/from16 v4, p3
 
-    move-object/from16 v6, p5
-
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
-    move-object/from16 v9, p8
-
-    move-object/from16 v10, p9
-
-    move-object/from16 v11, p10
-
-    move-object/from16 v12, p11
-
     invoke-direct/range {v1 .. v12}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;-><init>(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "sortedGuilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "privateChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "unavailableGuilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "channelIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "mentionCounts"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "unreadGuildIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "guildSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -659,7 +585,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->guildSettings:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -669,7 +595,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->unreadGuildIds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -679,7 +605,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->mentionCounts:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -689,7 +615,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->channelIds:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -699,7 +625,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->unavailableGuilds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -709,7 +635,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->privateChannels:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -719,7 +645,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;->sortedGuilds:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali
index e21d7baec7..35496332d2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali
@@ -41,7 +41,44 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func9<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/stores/StoreGuildsSorted$Entry;",
+        ">;",
+        "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;",
+        ">;"
     }
 .end annotation
 
@@ -120,7 +157,7 @@
 
     move-object v1, p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -130,7 +167,7 @@
 
     move-object v3, p2
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
@@ -140,43 +177,43 @@
 
     move-object/from16 v5, p3
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "unreadGuildIds"
+    const-string/jumbo v0, "unreadGuildIds"
 
     move-object/from16 v6, p4
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "mentionCounts"
 
     move-object/from16 v7, p5
 
-    invoke-static {v7, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "channelIds"
 
     move-object/from16 v8, p6
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "unavailableGuilds"
 
     move-object/from16 v9, p7
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "privateChannels"
 
     move-object/from16 v10, p8
 
-    invoke-static {v10, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "sortedGuilds"
 
     move-object/from16 v11, p9
 
-    invoke-static {v11, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v12
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1.smali
index 8cb02ab90c..9c0c689104 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lrx/Observable<",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -187,7 +187,7 @@
 
     const-string v1, "Observable.combineLatest\u2026lds\n          )\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$2.smali
index 6c5fc91bf1..151d9b0427 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "[J",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -82,7 +86,11 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$toSet"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -104,6 +112,14 @@
 
     invoke-direct {v0, v2}, Ljava/util/LinkedHashSet;-><init>(I)V
 
+    const-string v2, "$this$toCollection"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "destination"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length v2, p1
 
     :goto_0
@@ -135,7 +151,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
 
     :cond_2
     :goto_1
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali
index aa256d4a2c..9b0c344347 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -47,23 +49,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->call(Lcom/discord/models/domain/ModelUser;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelUser;)Z
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
     .locals 4
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;
@@ -94,5 +80,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali
index 06be85eada..798b0c191d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/panels/PanelState;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/panels/PanelState;
+    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;->call(Lcom/discord/panels/PanelState;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -73,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/panels/PanelState;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
+    check-cast p1, Lcom/discord/panels/PanelState;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;->call(Lcom/discord/panels/PanelState;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5.smali
index a489b2ce11..602a1746c4 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/tabs/NavigationTab;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/tabs/NavigationTab;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5;->call(Lcom/discord/widgets/tabs/NavigationTab;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/widgets/tabs/NavigationTab;)Z
+.method public final call(Lcom/discord/widgets/tabs/NavigationTab;)Ljava/lang/Boolean;
     .locals 1
 
     sget-object v0, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
@@ -88,5 +74,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/tabs/NavigationTab;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5;->call(Lcom/discord/widgets/tabs/NavigationTab;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$6.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$6.smali
index 86d3d417a2..1a0900e7d7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$6.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$6.smali
@@ -39,7 +39,30 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func8<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
+        "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -153,19 +176,19 @@
 
     move-object/from16 v0, p2
 
-    invoke-static {v0, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "openFolderIds"
 
     move-object/from16 v14, p3
 
-    invoke-static {v14, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "isNewUser"
 
     move-object/from16 v14, p4
 
-    invoke-static {v14, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p4 .. p4}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -177,19 +200,19 @@
 
     move-object/from16 v1, p5
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "allChannelPermissions"
 
     move-object/from16 v1, p6
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "isLeftPanelOpened"
 
     move-object/from16 v1, p7
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p7 .. p7}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -199,7 +222,7 @@
 
     move-object/from16 v1, p8
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p8 .. p8}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali
index 79afbda257..8a74868cd6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory.smali
@@ -29,24 +29,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/time/Clock;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "clock"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;->clock:Lcom/discord/utilities/time/Clock;
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getClock$p(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;)Lcom/discord/utilities/time/Clock;
@@ -86,7 +79,7 @@
 
     sget-object v2, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$2;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$2;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -118,7 +111,7 @@
 
     invoke-direct {v4, p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$3;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory;)V
 
-    invoke-virtual {v0, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
@@ -172,7 +165,7 @@
 
     sget-object v7, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$4;
 
-    invoke-virtual {v0, v7}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v7}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v7
 
@@ -188,7 +181,7 @@
 
     sget-object v8, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$5;
 
-    invoke-virtual {v0, v8}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v8}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v8
 
@@ -200,7 +193,7 @@
 
     const-string v1, "Observable.combineLatest\u2026HomeTab\n        )\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -227,7 +220,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
@@ -238,13 +233,4 @@
     invoke-direct {p1, v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;-><init>(Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali
index b9c2dbc8a1..e646493501 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali
@@ -220,29 +220,49 @@
 
     move-object/from16 v11, p16
 
-    const/4 v12, 0x0
+    const-string v12, "guildSettings"
 
-    if-eqz v1, :cond_a
+    invoke-static {v1, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_9
+    const-string/jumbo v12, "unreadGuildIds"
 
-    if-eqz v3, :cond_8
+    invoke-static {v2, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_7
+    const-string v12, "mentionCounts"
 
-    if-eqz v5, :cond_6
+    invoke-static {v3, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_5
+    const-string v12, "channelIds"
 
-    if-eqz v7, :cond_4
+    invoke-static {v4, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v8, :cond_3
+    const-string v12, "unavailableGuilds"
 
-    if-eqz v9, :cond_2
+    invoke-static {v5, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v10, :cond_1
+    const-string v12, "privateChannels"
 
-    if-eqz v11, :cond_0
+    invoke-static {v6, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v12, "sortedGuilds"
+
+    invoke-static {v7, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v12, "lurkingGuildIds"
+
+    invoke-static {v8, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v12, "openFolderIds"
+
+    invoke-static {v9, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v12, "allApplicationStreamContexts"
+
+    invoke-static {v10, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v12, "allChannelPermissions"
+
+    invoke-static {v11, v12}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -289,83 +309,6 @@
     iput-boolean v1, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isOnHomeTab:Z
 
     return-void
-
-    :cond_0
-    const-string v1, "allChannelPermissions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_1
-    const-string v1, "allApplicationStreamContexts"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_2
-    const-string v1, "openFolderIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_3
-    const-string v1, "lurkingGuildIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_4
-    const-string v1, "sortedGuilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_5
-    const-string v1, "privateChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_6
-    const-string v1, "unavailableGuilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_7
-    const-string v1, "channelIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_8
-    const-string v1, "mentionCounts"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_9
-    const-string v1, "unreadGuildIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
-
-    :cond_a
-    const-string v1, "guildSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v12
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;Ljava/util/Map;ZZILjava/lang/Object;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
@@ -886,146 +829,113 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    move-wide/from16 v1, p1
 
-    if-eqz p5, :cond_a
+    move-wide/from16 v3, p3
 
-    if-eqz p6, :cond_9
+    move-object/from16 v5, p5
 
-    if-eqz p7, :cond_8
+    move-object/from16 v6, p6
 
-    if-eqz p8, :cond_7
+    move-object/from16 v7, p7
 
-    if-eqz p9, :cond_6
+    move-object/from16 v8, p8
 
-    if-eqz p10, :cond_5
+    move-object/from16 v9, p9
 
-    if-eqz p11, :cond_4
+    move-object/from16 v10, p10
 
-    if-eqz p12, :cond_3
+    move-object/from16 v11, p11
 
-    if-eqz p13, :cond_2
+    move-object/from16 v12, p12
 
-    if-eqz p15, :cond_1
+    move-object/from16 v13, p13
 
-    if-eqz p16, :cond_0
+    move/from16 v14, p14
 
-    new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+    move-object/from16 v15, p15
 
-    move-object v1, v0
+    move-object/from16 v16, p16
 
-    move-wide/from16 v2, p1
+    move/from16 v17, p17
 
-    move-wide/from16 v4, p3
+    move/from16 v18, p18
 
-    move-object/from16 v6, p5
+    const-string v0, "guildSettings"
 
-    move-object/from16 v7, p6
+    move-object/from16 v1, p5
 
-    move-object/from16 v8, p7
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v9, p8
+    const-string/jumbo v0, "unreadGuildIds"
 
-    move-object/from16 v10, p9
+    move-object/from16 v1, p6
 
-    move-object/from16 v11, p10
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v12, p11
+    const-string v0, "mentionCounts"
 
-    move-object/from16 v13, p12
+    move-object/from16 v1, p7
 
-    move-object/from16 v14, p13
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v15, p14
+    const-string v0, "channelIds"
 
-    move-object/from16 v16, p15
+    move-object/from16 v1, p8
 
-    move-object/from16 v17, p16
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v18, p17
+    const-string v0, "unavailableGuilds"
 
-    move/from16 v19, p18
+    move-object/from16 v1, p9
 
-    invoke-direct/range {v1 .. v19}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;-><init>(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;Ljava/util/Map;ZZ)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    const-string v0, "privateChannels"
 
-    :cond_0
-    const-string v1, "allChannelPermissions"
+    move-object/from16 v1, p10
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "sortedGuilds"
 
-    :cond_1
-    const-string v1, "allApplicationStreamContexts"
+    move-object/from16 v1, p11
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "lurkingGuildIds"
 
-    :cond_2
-    const-string v1, "openFolderIds"
+    move-object/from16 v1, p12
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "openFolderIds"
 
-    :cond_3
-    const-string v1, "lurkingGuildIds"
+    move-object/from16 v1, p13
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "allApplicationStreamContexts"
 
-    :cond_4
-    const-string v1, "sortedGuilds"
+    move-object/from16 v1, p15
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "allChannelPermissions"
 
-    :cond_5
-    const-string v1, "privateChannels"
+    move-object/from16 v1, p16
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v19, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
-    :cond_6
-    const-string v1, "unavailableGuilds"
+    move-object/from16 v0, v19
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-wide/from16 v1, p1
 
-    throw v0
+    invoke-direct/range {v0 .. v18}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;-><init>(JJLjava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;ZLjava/util/Map;Ljava/util/Map;ZZ)V
 
-    :cond_7
-    const-string v1, "channelIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string v1, "mentionCounts"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string v1, "unreadGuildIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string v1, "guildSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v19
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -1059,7 +969,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->guildSettings:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1069,7 +979,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->unreadGuildIds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1079,7 +989,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->mentionCounts:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1089,7 +999,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->channelIds:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1099,7 +1009,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->unavailableGuilds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1109,7 +1019,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->privateChannels:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1119,7 +1029,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->sortedGuilds:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1129,7 +1039,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->lurkingGuildIds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1139,7 +1049,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->openFolderIds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1155,7 +1065,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allApplicationStreamContexts:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1165,7 +1075,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->allChannelPermissions:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded.smali
index 32abbaaaaf..d332c3d14a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded.smali
@@ -43,9 +43,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "items"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -56,13 +58,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;->wasDragResult:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;Ljava/util/List;ZZILjava/lang/Object;)Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;
@@ -143,22 +138,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;-><init>(Ljava/util/List;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -176,7 +164,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;->items:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.smali
index 65282023a9..95b28769a6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1;->$mentionCounts:Ljava/util/Map;
 
@@ -117,13 +119,4 @@
     :cond_1
     :goto_0
     return v1
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$2.smali
index 8fb6af830a..f28b551a9b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -49,7 +49,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
 
@@ -84,15 +86,6 @@
     invoke-direct {v0, p1, v1}, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;-><init>(Lcom/discord/models/domain/ModelChannel;I)V
 
     return-object v0
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$$inlined$filterIsInstance$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$$inlined$filterIsInstance$1.smali
index 2664ed98c1..4076605007 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$$inlined$filterIsInstance$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$$inlined$filterIsInstance$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$$inlined$filterIsInstance$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "_Sequences.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$2.smali
index b677dfcd41..19f7139d45 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreGuildsSorted$Entry;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/stores/StoreGuildsSorted$Entry;)Z
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;
 
@@ -110,13 +112,4 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$1.smali
index 1a69f49071..4f0d15875a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;)Z
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$1;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
@@ -90,13 +92,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2.smali
index 50a36fd4dc..0945a1737e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildsListViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;",
         "Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,116 +55,117 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;)Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
-    .locals 16
+    .locals 17
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_1
+    const-string v1, "folder"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->this$0:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v2
+    move-result-object v3
 
-    iget-object v3, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+    iget-object v4, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
-    invoke-virtual {v3}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getSelectedGuildId()J
+    invoke-virtual {v4}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getSelectedGuildId()J
 
-    move-result-wide v3
+    move-result-wide v4
 
-    iget-object v5, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+    iget-object v6, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
-    invoke-virtual {v5}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getSelectedVoiceChannelId()J
+    invoke-virtual {v6}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getSelectedVoiceChannelId()J
 
-    move-result-wide v5
-
-    iget-object v7, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
-
-    invoke-virtual {v7}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getUnreadGuildIds()Ljava/util/Set;
-
-    move-result-object v7
+    move-result-wide v6
 
     iget-object v8, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
-    invoke-virtual {v8}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getGuildSettings()Ljava/util/Map;
+    invoke-virtual {v8}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getUnreadGuildIds()Ljava/util/Set;
 
     move-result-object v8
 
-    iget-object v9, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$mentionCountsByGuild:Ljava/util/HashMap;
+    iget-object v9, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v10
-
-    invoke-virtual {v10}, Lcom/discord/models/domain/ModelGuild;->getId()J
-
-    move-result-wide v10
-
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v10
-
-    invoke-virtual {v9, v10}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v9}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getGuildSettings()Ljava/util/Map;
 
     move-result-object v9
 
-    check-cast v9, Ljava/lang/Integer;
+    iget-object v10, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$mentionCountsByGuild:Ljava/util/HashMap;
 
-    if-eqz v9, :cond_0
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreGuildsSorted$Entry$SingletonGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
+
+    move-result-wide v11
+
+    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-virtual {v10, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/Integer;
+
+    if-eqz v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v9, 0x0
+    const/4 v2, 0x0
 
-    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v9
+    move-result-object v2
 
     :goto_0
-    invoke-virtual {v9}, Ljava/lang/Integer;->intValue()I
+    const-string v10, "mentionCountsByGuild[folder.guild.id] ?: 0"
 
-    move-result v9
+    invoke-static {v2, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v10, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
-    invoke-virtual {v10}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getChannelIds()Ljava/util/Map;
+    move-result v10
 
-    move-result-object v10
+    iget-object v2, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
-    iget-object v11, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
-
-    invoke-virtual {v11}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getLurkingGuildIds()Ljava/util/Set;
+    invoke-virtual {v2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getChannelIds()Ljava/util/Map;
 
     move-result-object v11
 
-    const/4 v12, 0x0
+    iget-object v2, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+
+    invoke-virtual {v2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getLurkingGuildIds()Ljava/util/Set;
+
+    move-result-object v12
 
     const/4 v13, 0x0
 
     const/4 v14, 0x0
 
-    iget-object v15, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
+    const/4 v15, 0x0
 
-    invoke-virtual {v15}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getAllChannelPermissions()Ljava/util/Map;
+    iget-object v2, v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$handleStoreState$lurkerGuildItems$2;->$storeState:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;
 
-    move-result-object v15
+    invoke-virtual {v2}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getAllChannelPermissions()Ljava/util/Map;
 
-    invoke-static/range {v1 .. v15}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->access$createGuildItem(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;Lcom/discord/models/domain/ModelGuild;JJLjava/util/Set;Ljava/util/Map;ILjava/util/Map;Ljava/util/Set;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
+    move-result-object v16
+
+    move-object v2, v1
+
+    invoke-static/range {v2 .. v16}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->access$createGuildItem(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;Lcom/discord/models/domain/ModelGuild;JJLjava/util/Set;Ljava/util/Map;ILjava/util/Map;Ljava/util/Set;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
 
     move-result-object v1
 
     return-object v1
-
-    :cond_1
-    const-string v1, "folder"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
index 108701ed58..ac1f01af99 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetGuildsListViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState;",
         ">;"
     }
@@ -52,19 +52,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Uninitialized;
+    sget-object v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Uninitialized;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
 
-    move-result-object v1
+    move-result-object v0
 
-    iput-object v1, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+    iput-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -74,9 +74,11 @@
 
     move-result-object p1
 
-    const-string v1, "storeObservable\n        \u2026  .distinctUntilChanged()"
+    const-string v0, "storeObservable\n        \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x2
 
@@ -86,6 +88,10 @@
 
     const-class v3, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;
 
+    new-instance v8, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$1;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -94,10 +100,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$1;-><init>(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -105,13 +107,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$createGuildItem(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;Lcom/discord/models/domain/ModelGuild;JJLjava/util/Set;Ljava/util/Map;ILjava/util/Map;Ljava/util/Set;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
@@ -158,7 +153,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -180,7 +175,7 @@
 
     const-string v0, "ModelChannel.getSortByNameAndType()"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p3}, Lf/n/a/k/a;->sortedWith(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
 
@@ -418,7 +413,7 @@
 .end method
 
 .method private final handleStoreState(Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;)V
-    .locals 45
+    .locals 44
 
     move-object/from16 v15, p0
 
@@ -623,7 +618,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v0}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v0
 
@@ -657,7 +652,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v0}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v0
 
@@ -669,20 +664,20 @@
 
     move-result-object v0
 
-    check-cast v0, Lj0/s/g;
+    check-cast v0, Lk0/t/g;
 
-    new-instance v7, Lj0/s/g$a;
+    new-instance v7, Lk0/t/g$a;
 
-    invoke-direct {v7, v0}, Lj0/s/g$a;-><init>(Lj0/s/g;)V
+    invoke-direct {v7, v0}, Lk0/t/g$a;-><init>(Lk0/t/g;)V
 
     :goto_3
-    invoke-virtual {v7}, Lj0/s/g$a;->hasNext()Z
+    invoke-virtual {v7}, Lk0/t/g$a;->hasNext()Z
 
     move-result v0
 
-    if-eqz v0, :cond_17
+    if-eqz v0, :cond_18
 
-    invoke-virtual {v7}, Lj0/s/g$a;->next()Ljava/lang/Object;
+    invoke-virtual {v7}, Lk0/t/g$a;->next()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -740,9 +735,13 @@
     move-object/from16 v0, v16
 
     :goto_4
+    const-string v11, "mentionCountsByGuild[folder.guild.id] ?: 0"
+
+    invoke-static {v0, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
-    move-result v18
+    move-result v11
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getChannelIds()Ljava/util/Map;
 
@@ -772,25 +771,23 @@
 
     move-object/from16 v26, v8
 
-    move/from16 v8, v18
+    move v8, v11
 
-    move-object/from16 v27, v9
+    move-object v11, v9
 
     move-object/from16 v9, v19
 
-    move-object/from16 v28, v10
+    move-object/from16 v27, v10
 
     move-object/from16 v10, v20
 
-    const/4 v15, 0x0
+    move-object v15, v11
 
     move-object/from16 v11, v21
 
-    const/4 v15, 0x1
-
     move-object/from16 v12, v22
 
-    move-object/from16 v29, v13
+    move-object/from16 v28, v13
 
     move-object/from16 v13, v23
 
@@ -804,34 +801,32 @@
 
     invoke-virtual {v14, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    goto/16 :goto_11
+    goto/16 :goto_13
 
     :cond_5
     move-object/from16 v25, v7
 
     move-object v14, v8
 
-    move-object/from16 v27, v9
+    move-object v15, v9
 
-    move-object/from16 v28, v10
+    move-object/from16 v27, v10
 
-    move-object/from16 v29, v13
-
-    const/4 v15, 0x1
+    move-object/from16 v28, v13
 
     instance-of v1, v0, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;
 
-    if-eqz v1, :cond_16
+    if-eqz v1, :cond_17
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getOpenFolderIds()Ljava/util/Set;
 
     move-result-object v1
 
-    move-object/from16 v18, v0
+    move-object/from16 v17, v0
 
-    check-cast v18, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;
+    check-cast v17, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getId()J
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getId()J
 
     move-result-wide v2
 
@@ -843,9 +838,11 @@
 
     move-result v0
 
-    if-nez v0, :cond_10
+    const-string v13, "mentionCountsByGuild[guild.id] ?: 0"
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
+    if-nez v0, :cond_11
+
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
 
     move-result-object v1
 
@@ -866,7 +863,7 @@
 
     move-result v5
 
-    if-eqz v5, :cond_f
+    if-eqz v5, :cond_10
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -954,7 +951,7 @@
     const/4 v4, 0x1
 
     :goto_a
-    if-nez v11, :cond_d
+    if-nez v11, :cond_e
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getUnreadGuildIds()Ljava/util/Set;
 
@@ -998,20 +995,35 @@
 
     move-result v6
 
-    if-eq v6, v15, :cond_c
+    const/4 v12, 0x1
+
+    if-eq v6, v12, :cond_d
+
+    goto :goto_b
 
     :cond_b
     const/4 v12, 0x1
 
-    goto :goto_b
+    :goto_b
+    const/4 v6, 0x1
+
+    goto :goto_c
 
     :cond_c
-    const/4 v12, 0x0
-
-    :goto_b
-    move v11, v12
+    const/4 v12, 0x1
 
     :cond_d
+    const/4 v6, 0x0
+
+    :goto_c
+    move v11, v6
+
+    goto :goto_d
+
+    :cond_e
+    const/4 v12, 0x1
+
+    :goto_d
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v5
@@ -1020,25 +1032,23 @@
 
     move-result-object v5
 
-    move-object/from16 v13, v28
+    move-object/from16 v10, v27
 
-    invoke-virtual {v13, v5}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v10, v5}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v5
 
     check-cast v5, Ljava/lang/Integer;
 
-    if-eqz v5, :cond_e
+    if-eqz v5, :cond_f
 
-    goto :goto_c
+    goto :goto_e
 
-    :cond_e
+    :cond_f
     move-object/from16 v5, v16
 
-    :goto_c
-    const-string v6, "mentionCountsByGuild[guild.id] ?: 0"
-
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :goto_e
+    invoke-static {v5, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
 
@@ -1046,25 +1056,31 @@
 
     add-int/2addr v2, v5
 
-    move-object/from16 v28, v13
+    move-object/from16 v27, v10
 
     goto/16 :goto_5
 
-    :cond_f
-    move-object/from16 v13, v28
-
-    move/from16 v39, v2
-
-    move/from16 v37, v3
-
-    move/from16 v38, v4
-
-    move/from16 v40, v11
-
-    goto :goto_d
-
     :cond_10
-    move-object/from16 v13, v28
+    move-object/from16 v10, v27
+
+    const/4 v12, 0x1
+
+    move/from16 v38, v2
+
+    move/from16 v36, v3
+
+    move/from16 v37, v4
+
+    move/from16 v39, v11
+
+    goto :goto_f
+
+    :cond_11
+    move-object/from16 v10, v27
+
+    const/4 v12, 0x1
+
+    const/16 v36, 0x0
 
     const/16 v37, 0x0
 
@@ -1072,48 +1088,46 @@
 
     const/16 v39, 0x0
 
-    const/16 v40, 0x0
-
-    :goto_d
+    :goto_f
     new-instance v1, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getId()J
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getId()J
 
-    move-result-wide v31
+    move-result-wide v30
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getColor()Ljava/lang/Integer;
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getColor()Ljava/lang/Integer;
+
+    move-result-object v32
+
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getName()Ljava/lang/String;
 
     move-result-object v33
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getName()Ljava/lang/String;
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
 
-    move-result-object v34
+    move-result-object v35
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
+    const/16 v40, 0x0
 
-    move-result-object v36
+    const/16 v41, 0x200
 
-    const/16 v41, 0x0
+    const/16 v42, 0x0
 
-    const/16 v42, 0x200
+    move-object/from16 v29, v1
 
-    const/16 v43, 0x0
+    move/from16 v34, v0
 
-    move-object/from16 v30, v1
-
-    move/from16 v35, v0
-
-    invoke-direct/range {v30 .. v43}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;-><init>(JLjava/lang/Integer;Ljava/lang/String;ZLjava/util/List;ZZIZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v29 .. v42}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;-><init>(JLjava/lang/Integer;Ljava/lang/String;ZLjava/util/List;ZZIZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     invoke-virtual {v14, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    if-eqz v0, :cond_15
+    if-eqz v0, :cond_16
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
 
     move-result-object v0
 
-    new-instance v12, Ljava/util/ArrayList;
+    new-instance v11, Ljava/util/ArrayList;
 
     const/16 v1, 0xa
 
@@ -1121,30 +1135,28 @@
 
     move-result v1
 
-    invoke-direct {v12, v1}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v11, v1}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v19
 
-    const/4 v11, 0x0
+    const/4 v0, 0x0
 
-    :goto_e
+    :goto_10
     invoke-interface/range {v19 .. v19}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_14
+    if-eqz v1, :cond_15
 
     invoke-interface/range {v19 .. v19}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
-    add-int/lit8 v20, v11, 0x1
+    add-int/lit8 v20, v0, 0x1
 
-    if-ltz v11, :cond_13
-
-    move-object v1, v0
+    if-ltz v0, :cond_14
 
     check-cast v1, Lcom/discord/models/domain/ModelGuild;
 
@@ -1170,23 +1182,25 @@
 
     invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object v8
 
-    invoke-virtual {v13, v0}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v10, v8}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v8
 
-    check-cast v0, Ljava/lang/Integer;
+    check-cast v8, Ljava/lang/Integer;
 
-    if-eqz v0, :cond_11
+    if-eqz v8, :cond_12
 
-    goto :goto_f
+    goto :goto_11
 
-    :cond_11
-    move-object/from16 v0, v16
+    :cond_12
+    move-object/from16 v8, v16
 
-    :goto_f
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+    :goto_11
+    invoke-static {v8, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8}, Ljava/lang/Integer;->intValue()I
 
     move-result v8
 
@@ -1196,38 +1210,38 @@
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getLurkingGuildIds()Ljava/util/Set;
 
-    move-result-object v10
-
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getId()J
-
-    move-result-wide v21
-
-    invoke-static/range {v21 .. v22}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
     move-result-object v21
 
-    invoke-virtual/range {v18 .. v18}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getId()J
 
-    move-result-object v0
+    move-result-wide v22
 
-    invoke-static {v0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v0
-
-    if-ne v0, v11, :cond_12
-
-    const/4 v0, 0x1
-
-    goto :goto_10
-
-    :cond_12
-    const/4 v0, 0x0
-
-    :goto_10
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static/range {v22 .. v23}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v22
 
+    invoke-virtual/range {v17 .. v17}, Lcom/discord/stores/StoreGuildsSorted$Entry$Folder;->getGuilds()Ljava/util/List;
+
+    move-result-object v23
+
+    invoke-static/range {v23 .. v23}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result v12
+
+    if-ne v12, v0, :cond_13
+
+    const/4 v12, 0x1
+
+    goto :goto_12
+
+    :cond_13
+    const/4 v12, 0x0
+
+    :goto_12
+    invoke-static {v12}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v12
+
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getAllApplicationStreamContexts()Ljava/util/Map;
 
     move-result-object v23
@@ -1238,17 +1252,23 @@
 
     move-object/from16 v0, p0
 
-    move-object/from16 v11, v21
+    move-object/from16 v26, v10
 
-    move-object v15, v12
+    move-object/from16 v10, v21
 
-    move-object/from16 v12, v22
+    move-object/from16 v21, v15
 
-    move-object/from16 v22, v13
+    move-object v15, v11
+
+    move-object/from16 v11, v22
+
+    const/16 v22, 0x1
+
+    move-object/from16 v27, v13
 
     move-object/from16 v13, v23
 
-    move-object/from16 v44, v14
+    move-object/from16 v43, v14
 
     move-object/from16 v14, v24
 
@@ -1258,63 +1278,78 @@
 
     invoke-interface {v15, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    move-object v12, v15
+    move-object v11, v15
 
-    move/from16 v11, v20
+    move/from16 v0, v20
 
-    move-object/from16 v13, v22
+    move-object/from16 v15, v21
 
-    move-object/from16 v14, v44
+    move-object/from16 v10, v26
 
-    const/4 v15, 0x1
+    move-object/from16 v13, v27
 
-    goto :goto_e
+    move-object/from16 v14, v43
 
-    :cond_13
+    const/4 v12, 0x1
+
+    goto/16 :goto_10
+
+    :cond_14
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
     const/4 v0, 0x0
 
     throw v0
 
-    :cond_14
-    move-object v15, v12
-
-    move-object/from16 v22, v13
+    :cond_15
+    move-object/from16 v26, v10
 
     move-object v0, v14
 
+    move-object/from16 v21, v15
+
+    const/16 v22, 0x1
+
+    move-object v15, v11
+
     invoke-virtual {v0, v15}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    goto :goto_12
-
-    :cond_15
-    move-object/from16 v22, v13
-
-    move-object v0, v14
-
-    goto :goto_12
+    goto :goto_15
 
     :cond_16
-    :goto_11
+    move-object/from16 v26, v10
+
     move-object v0, v14
 
-    move-object/from16 v22, v28
+    move-object/from16 v21, v15
 
-    :goto_12
+    goto :goto_14
+
+    :cond_17
+    :goto_13
+    move-object v0, v14
+
+    move-object/from16 v21, v15
+
+    move-object/from16 v26, v27
+
+    :goto_14
+    const/16 v22, 0x1
+
+    :goto_15
     move-object/from16 v15, p0
 
     move-object/from16 v14, p1
 
     move-object v8, v0
 
-    move-object/from16 v10, v22
+    move-object/from16 v9, v21
 
     move-object/from16 v7, v25
 
-    move-object/from16 v9, v27
+    move-object/from16 v10, v26
 
-    move-object/from16 v13, v29
+    move-object/from16 v13, v28
 
     const/4 v11, 0x0
 
@@ -1322,13 +1357,15 @@
 
     goto/16 :goto_3
 
-    :cond_17
+    :cond_18
     move-object v0, v8
 
     move-object v2, v9
 
     move-object v1, v13
 
+    const/16 v22, 0x1
+
     invoke-static {v1, v2}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Lkotlin/sequences/Sequence;)Z
 
     sget-object v2, Lcom/discord/widgets/guilds/list/GuildListItem$DividerItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$DividerItem;
@@ -1345,11 +1382,9 @@
 
     move-result v0
 
-    const/4 v2, 0x1
+    xor-int/lit8 v0, v0, 0x1
 
-    xor-int/2addr v0, v2
-
-    if-eqz v0, :cond_18
+    if-eqz v0, :cond_19
 
     new-instance v0, Lcom/discord/widgets/guilds/list/GuildListItem$UnavailableItem;
 
@@ -1365,7 +1400,7 @@
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :cond_18
+    :cond_19
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$CreateItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$CreateItem;
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
@@ -1374,7 +1409,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_19
+    if-eqz v0, :cond_1a
 
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$DividerItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$DividerItem;
 
@@ -1384,83 +1419,81 @@
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :cond_19
+    :cond_1a
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$SpaceItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$SpaceItem;
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
+    new-instance v0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;
+
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->getChannelIds()Ljava/util/Map;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
+    invoke-interface {v2}, Ljava/util/Map;->isEmpty()Z
 
-    move-result v0
+    move-result v2
 
-    const/4 v2, 0x1
-
-    xor-int/2addr v0, v2
-
-    new-instance v2, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;
+    xor-int/lit8 v2, v2, 0x1
 
     const/4 v3, 0x0
 
-    invoke-direct {v2, v1, v0, v3}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;-><init>(Ljava/util/List;ZZ)V
+    invoke-direct {v0, v1, v2, v3}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$ViewState$Loaded;-><init>(Ljava/util/List;ZZ)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isLeftPanelOpened()Z
 
-    move-result v0
+    move-result v1
 
-    move-object/from16 v1, p0
+    move-object/from16 v2, p0
 
-    iget-boolean v3, v1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasLeftPanelOpened:Z
+    iget-boolean v3, v2, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasLeftPanelOpened:Z
 
-    if-ne v0, v3, :cond_1a
+    if-ne v1, v3, :cond_1b
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isOnHomeTab()Z
 
-    move-result v0
+    move-result v1
 
-    iget-boolean v3, v1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasOnHomeTab:Z
+    iget-boolean v3, v2, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasOnHomeTab:Z
 
-    if-eq v0, v3, :cond_1c
-
-    :cond_1a
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isLeftPanelOpened()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1b
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isOnHomeTab()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1b
-
-    iget-object v0, v1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->eventSubject:Lrx/subjects/PublishSubject;
-
-    sget-object v3, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$FocusFirstElement;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$FocusFirstElement;
-
-    iget-object v0, v0, Lrx/subjects/PublishSubject;->e:Lrx/subjects/PublishSubject$b;
-
-    invoke-virtual {v0, v3}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
+    if-eq v1, v3, :cond_1d
 
     :cond_1b
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isLeftPanelOpened()Z
 
-    move-result v0
+    move-result v1
 
-    iput-boolean v0, v1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasLeftPanelOpened:Z
+    if-eqz v1, :cond_1c
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isOnHomeTab()Z
 
-    move-result v0
+    move-result v1
 
-    iput-boolean v0, v1, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasOnHomeTab:Z
+    if-eqz v1, :cond_1c
+
+    iget-object v1, v2, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    sget-object v3, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$FocusFirstElement;->INSTANCE:Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$Event$FocusFirstElement;
+
+    iget-object v1, v1, Lrx/subjects/PublishSubject;->e:Lrx/subjects/PublishSubject$b;
+
+    invoke-virtual {v1, v3}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     :cond_1c
-    invoke-virtual {v1, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isLeftPanelOpened()Z
+
+    move-result v1
+
+    iput-boolean v1, v2, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasLeftPanelOpened:Z
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState;->isOnHomeTab()Z
+
+    move-result v1
+
+    iput-boolean v1, v2, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->wasOnHomeTab:Z
+
+    :cond_1d
+    invoke-virtual {v2, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1476,7 +1509,7 @@
 
     move-object/from16 v14, p3
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1549,7 +1582,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v14}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v14}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -1672,7 +1705,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v1}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v1
 
@@ -1703,7 +1736,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_9
     return-void
@@ -1730,7 +1763,7 @@
 
     const-string v3, "editingList[fromPosition]"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Lcom/discord/widgets/guilds/list/GuildListItem;
 
@@ -1740,7 +1773,7 @@
 
     const-string v4, "editingList[toPosition]"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v3, Lcom/discord/widgets/guilds/list/GuildListItem;
 
@@ -1758,11 +1791,11 @@
 
     new-instance v4, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
-    sget-object v7, Lj0/p/c;->b:Lj0/p/c$a;
+    sget-object v7, Lk0/q/c;->b:Lk0/q/c$a;
 
-    sget-object v7, Lj0/p/c;->a:Lj0/p/c;
+    sget-object v7, Lk0/q/c;->a:Lk0/q/c;
 
-    invoke-virtual {v7}, Lj0/p/c;->nextLong()J
+    invoke-virtual {v7}, Lk0/q/c;->nextLong()J
 
     move-result-wide v9
 
@@ -1892,7 +1925,7 @@
 
     const-string v1, "editingList.removeAt(fromPosition)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_c
 
@@ -1919,7 +1952,7 @@
 
     move-result-object v3
 
-    invoke-static {v3}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {v3}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object v3
 
@@ -1929,7 +1962,7 @@
 
     move-result-object v4
 
-    invoke-static {v3, v4}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v3, v4}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v13
 
@@ -2027,7 +2060,7 @@
 .end method
 
 .method private final rebuildFolders(Ljava/util/ArrayList;Ljava/util/Set;)V
-    .locals 23
+    .locals 22
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -2094,8 +2127,6 @@
 
     move-result v3
 
-    const-string v4, "folderGuilds[folderId] ?: ArrayList()"
-
     if-eqz v3, :cond_5
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -2106,47 +2137,45 @@
 
     invoke-virtual {v3}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getFolderId()Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v4
 
-    if-eqz v5, :cond_3
+    if-eqz v4, :cond_3
 
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v4
 
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v7
+    move-result-object v6
 
-    invoke-virtual {v1, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v6}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v7
+    move-result-object v6
 
-    check-cast v7, Ljava/util/ArrayList;
+    check-cast v6, Ljava/util/ArrayList;
 
-    if-eqz v7, :cond_4
+    if-eqz v6, :cond_4
 
     goto :goto_2
 
     :cond_4
-    new-instance v7, Ljava/util/ArrayList;
+    new-instance v6, Ljava/util/ArrayList;
 
-    invoke-direct {v7}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v6}, Ljava/util/ArrayList;-><init>()V
 
     :goto_2
-    invoke-static {v7, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     invoke-virtual {v3}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v3
 
-    invoke-virtual {v7, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v6, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
-    invoke-interface {v1, v3, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v1, v3, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_1
 
@@ -2170,75 +2199,75 @@
 
     invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v3
 
     invoke-interface/range {p1 .. p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v3
+    move-result-object v5
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x0
-
     :goto_4
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v9
+    move-result v8
 
-    if-eqz v9, :cond_8
+    if-eqz v8, :cond_8
 
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object v8
 
-    check-cast v9, Lcom/discord/widgets/guilds/list/GuildListItem;
+    check-cast v8, Lcom/discord/widgets/guilds/list/GuildListItem;
 
-    instance-of v10, v9, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
+    instance-of v9, v8, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
-    if-eqz v10, :cond_6
+    if-eqz v9, :cond_6
 
-    check-cast v9, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
+    check-cast v8, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
-    invoke-virtual {v9}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->getFolderId()J
+    invoke-virtual {v8}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->getFolderId()J
 
-    move-result-wide v9
+    move-result-wide v8
 
-    cmp-long v11, v9, v5
+    cmp-long v10, v8, v3
 
-    if-nez v11, :cond_6
+    if-nez v10, :cond_6
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
     goto :goto_5
 
     :cond_6
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     :goto_5
-    if-eqz v9, :cond_7
+    if-eqz v8, :cond_7
 
     goto :goto_6
 
     :cond_7
-    add-int/lit8 v8, v8, 0x1
+    add-int/lit8 v7, v7, 0x1
 
     goto :goto_4
 
     :cond_8
-    const/4 v8, -0x1
+    const/4 v7, -0x1
 
     :goto_6
-    invoke-virtual {v0, v8}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    invoke-virtual {v0, v7}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v5
 
-    if-eqz v3, :cond_a
+    if-eqz v5, :cond_a
 
-    move-object v9, v3
+    move-object v8, v5
 
-    check-cast v9, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
+    check-cast v8, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v3
 
@@ -2258,17 +2287,17 @@
     invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
     :goto_7
-    move-object v15, v3
+    move-object v14, v3
 
-    invoke-static {v15, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-wide/16 v9, 0x0
 
-    const-wide/16 v10, 0x0
+    const/4 v11, 0x0
 
     const/4 v12, 0x0
 
     const/4 v13, 0x0
 
-    const/4 v14, 0x0
+    const/4 v15, 0x0
 
     const/16 v16, 0x0
 
@@ -2278,26 +2307,24 @@
 
     const/16 v19, 0x0
 
-    const/16 v20, 0x0
+    const/16 v20, 0x3ef
 
-    const/16 v21, 0x3ef
+    const/16 v21, 0x0
 
-    const/16 v22, 0x0
-
-    invoke-static/range {v9 .. v22}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->copy$default(Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;JLjava/lang/Integer;Ljava/lang/String;ZLjava/util/List;ZZIZZILjava/lang/Object;)Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
+    invoke-static/range {v8 .. v21}, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;->copy$default(Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;JLjava/lang/Integer;Ljava/lang/String;ZLjava/util/List;ZZIZZILjava/lang/Object;)Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
     move-result-object v3
 
-    invoke-virtual {v0, v8, v3}, Ljava/util/ArrayList;->set(ILjava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v7, v3}, Ljava/util/ArrayList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_3
 
     :cond_a
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.widgets.guilds.list.GuildListItem.FolderItem"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
@@ -2547,7 +2574,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {p3}, Lj0/i/l;->sumOfInt(Ljava/lang/Iterable;)I
+    invoke-static {p3}, Lk0/j/l;->sumOfInt(Ljava/lang/Iterable;)I
 
     move-result p1
 
@@ -2586,7 +2613,7 @@
 
     const-string v4, "editingList[toPosition]"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v3, Lcom/discord/widgets/guilds/list/GuildListItem;
 
@@ -2693,7 +2720,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -2701,7 +2728,7 @@
 .method public final moveAbove(II)V
     .locals 3
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2780,7 +2807,7 @@
 .method public final moveBelow(II)V
     .locals 3
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2864,7 +2891,7 @@
 .method public final onDrop()Z
     .locals 13
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3073,23 +3100,25 @@
 .method public final onItemClicked(Lcom/discord/widgets/guilds/list/GuildListItem;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "item"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
+    instance-of v0, p1, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    if-eqz v1, :cond_1
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
 
     check-cast p1, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;
 
     invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->isSelected()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -3097,9 +3126,9 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
+    sget-object v0, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
 
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v2, v1, v2}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
 
     goto/16 :goto_0
 
@@ -3129,9 +3158,9 @@
     goto/16 :goto_0
 
     :cond_1
-    instance-of v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
+    instance-of v0, p1, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -3162,9 +3191,9 @@
     goto/16 :goto_0
 
     :cond_2
-    instance-of v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$UnavailableItem;
+    instance-of v0, p1, Lcom/discord/widgets/guilds/list/GuildListItem$UnavailableItem;
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/list/WidgetGuildsListViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
@@ -3185,9 +3214,9 @@
     goto/16 :goto_0
 
     :cond_3
-    instance-of v1, p1, Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;
+    instance-of v0, p1, Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
     check-cast p1, Lcom/discord/widgets/guilds/list/GuildListItem$FriendsItem;
 
@@ -3203,9 +3232,9 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
+    sget-object v0, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
 
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
+    invoke-static {p1, v0, v2, v1, v2}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
 
     goto :goto_0
 
@@ -3231,7 +3260,7 @@
     :cond_5
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$CreateItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$CreateItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -3250,7 +3279,7 @@
     :cond_6
     sget-object v0, Lcom/discord/widgets/guilds/list/GuildListItem$HelpItem;->INSTANCE:Lcom/discord/widgets/guilds/list/GuildListItem$HelpItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -3311,19 +3340,14 @@
     :cond_9
     :goto_0
     return-void
-
-    :cond_a
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onItemLongPressed(Lcom/discord/widgets/guilds/list/GuildListItem;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/widgets/guilds/list/GuildListItem$PrivateChannelItem;
 
@@ -3351,15 +3375,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final target(II)V
@@ -3369,7 +3384,7 @@
 
     move/from16 v1, p2
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -3500,7 +3515,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/BaseEmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/profile/BaseEmojiViewHolder.smali
index 08435cebd8..13e1573158 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/BaseEmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/BaseEmojiViewHolder.smali
@@ -5,39 +5,25 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public bind(Lcom/discord/widgets/guilds/profile/EmojiItem;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/EmojiItem$EmojiData.smali b/com.discord/smali/com/discord/widgets/guilds/profile/EmojiItem$EmojiData.smali
index 0ecdb1deae..ecc4f5cb2d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/EmojiItem$EmojiData.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/EmojiItem$EmojiData.smali
@@ -22,24 +22,19 @@
 .method public constructor <init>(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "emoji"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x0
 
-    invoke-direct {p0, v1, v0}, Lcom/discord/widgets/guilds/profile/EmojiItem;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/guilds/profile/EmojiItem;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/profile/EmojiItem$EmojiData;->emoji:Lcom/discord/models/domain/emoji/Emoji;
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/profile/EmojiItem$EmojiData;Lcom/discord/models/domain/emoji/Emoji;ILjava/lang/Object;)Lcom/discord/widgets/guilds/profile/EmojiItem$EmojiData;
@@ -72,22 +67,15 @@
 .method public final copy(Lcom/discord/models/domain/emoji/Emoji;)Lcom/discord/widgets/guilds/profile/EmojiItem$EmojiData;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/profile/EmojiItem$EmojiData;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/guilds/profile/EmojiItem$EmojiData;-><init>(Lcom/discord/models/domain/emoji/Emoji;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -105,7 +93,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/profile/EmojiItem$EmojiData;->emoji:Lcom/discord/models/domain/emoji/Emoji;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/EmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/profile/EmojiViewHolder.smali
index 9dfbe8cf44..2d956ddf6c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/EmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/EmojiViewHolder.smali
@@ -19,25 +19,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/EmojiViewHolder;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/EmojiViewHolder;
+    const-string v2, "emojiImageView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "emojiImageView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/guilds/profile/EmojiViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -45,13 +39,15 @@
 .end method
 
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/profile/BaseEmojiViewHolder;-><init>(Landroid/view/View;)V
 
-    const p1, 0x7f0a0460
+    const p1, 0x7f0a0466
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -60,15 +56,6 @@
     iput-object p1, p0, Lcom/discord/widgets/guilds/profile/EmojiViewHolder;->emojiImageView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getEmojiImageView()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -96,7 +83,9 @@
 .method public bind(Lcom/discord/widgets/guilds/profile/EmojiItem;)V
     .locals 11
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/guilds/profile/BaseEmojiViewHolder;->bind(Lcom/discord/widgets/guilds/profile/EmojiItem;)V
 
@@ -124,19 +113,19 @@
 
     move-result-object p1
 
-    const/4 v2, 0x1
+    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    const-string v3, "itemView"
 
-    const-string v4, "itemView"
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    invoke-virtual {v3}, Landroid/view/View;->getContext()Landroid/content/Context;
+    move-result-object v2
 
-    move-result-object v3
+    const/4 v3, 0x1
 
-    invoke-interface {p1, v2, v0, v3}, Lcom/discord/models/domain/emoji/Emoji;->getImageUri(ZILandroid/content/Context;)Ljava/lang/String;
+    invoke-interface {p1, v3, v0, v2}, Lcom/discord/models/domain/emoji/Emoji;->getImageUri(ZILandroid/content/Context;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -159,13 +148,4 @@
     invoke-static/range {v1 .. v10}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.smali
index 37291ce231..865a3af477 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.smali
@@ -5,22 +5,15 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/guilds/profile/BaseEmojiViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -28,7 +21,9 @@
 .method public bind(Lcom/discord/widgets/guilds/profile/EmojiItem;)V
     .locals 5
 
-    if-eqz p1, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/guilds/profile/BaseEmojiViewHolder;->bind(Lcom/discord/widgets/guilds/profile/EmojiItem;)V
 
@@ -44,13 +39,13 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
     iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Landroid/widget/TextView;
 
@@ -58,7 +53,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120697
+    const v2, 0x7f120699
 
     const/4 v3, 0x1
 
@@ -85,20 +80,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.widget.TextView"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$Companion.smali
index 0473791c11..e356ae3d16 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$Companion.smali
@@ -61,7 +61,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;ZJJ)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
@@ -94,13 +96,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$1.smali
index b20f08a235..30660661d1 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$1;->$this_apply:Landroid/widget/TextView;
 
@@ -88,13 +90,4 @@
     invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/channels/WidgetCreateChannel;->show(Landroid/content/Context;JI)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$2.smali
index 60d4b851ab..a2aa4a6a54 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$2;->$this_apply:Landroid/widget/TextView;
 
@@ -86,13 +88,4 @@
     invoke-static {p1, v0, v1}, Lcom/discord/widgets/channels/WidgetCreateChannel;->show(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$3.smali
index c5d6462a8a..45a25d1d15 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$3;->this$0:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
@@ -84,13 +86,4 @@
     invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->access$showChangeNicknameDialog(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;JLjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$4.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$4.smali
index b532637044..d9b15603ee 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$4.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$4.smali
@@ -73,7 +73,7 @@
 
     const-string v4, "checked"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$5.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$5.smali
index 6f730d388e..894a10e6d0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$5.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$5.smali
@@ -67,7 +67,7 @@
 
     const-string v3, "checked"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$6.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$6.smali
index c925b2fe6b..ab5cf0425f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$6.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$6;->this$0:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
@@ -78,13 +80,4 @@
     invoke-static {p1, v0, v1}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->access$showLeaveServerDialog(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$9.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$9.smali
index a9d95bb469..0264ef013a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$9.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$9.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureActions$9;->$guildId:J
 
@@ -61,7 +61,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1.smali
index 61c39134f1..ad69d98990 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "v"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Companion;
 
@@ -77,22 +79,13 @@
 
     move-result-object p1
 
-    const-string v1, "v.context"
+    const-string/jumbo v1, "v.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1;->$guildId$inlined:J
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Companion;->create(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2.smali
index 1d72f8bd8f..59c4b67933 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
@@ -82,13 +84,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->onClickJoinServer(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$3.smali
index 2940c93b46..6ec22bb0aa 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$3;->this$0:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
@@ -88,13 +90,4 @@
     invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->onClickViewServer(JLjava/lang/Long;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1.smali
index 44fac601cf..2d01b45941 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
@@ -81,22 +83,13 @@
 
     move-result-object p1
 
-    const-string v1, "view.context"
+    const-string/jumbo v1, "view.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1;->$guildId$inlined:J
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$2.smali
index 4a2523881e..25ad042d3f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerNotifications;->Companion:Lcom/discord/widgets/servers/WidgetServerNotifications$Companion;
 
@@ -79,20 +81,11 @@
 
     move-result-object p1
 
-    const-string v3, "view.context"
+    const-string/jumbo v3, "view.context"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2, p1}, Lcom/discord/widgets/servers/WidgetServerNotifications$Companion;->launch(JLandroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3.smali
index b63f4a1bf9..3051c8023c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettings;->Companion:Lcom/discord/widgets/servers/WidgetServerSettings$Companion;
 
@@ -81,22 +83,13 @@
 
     move-result-object p1
 
-    const-string v1, "view.context"
+    const-string/jumbo v1, "view.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3;->$guildId$inlined:J
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettings$Companion;->create(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$4$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$4$1.smali
index 6c858ef74b..f91e93a620 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$4$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$4$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureTabItems$4$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,40 +69,33 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
 
-    sget-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->Companion:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->Companion:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-string p1, "view.context"
+    const-string/jumbo p1, "view.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
-    const/4 v5, 0x6
+    const/4 v4, 0x0
 
-    const/4 v6, 0x0
+    const-string v5, "Guild Profile"
 
-    const-string v4, "Guild Profile"
+    const/4 v6, 0x6
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->launch$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)V
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;->launch$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion;Landroid/content/Context;ZLjava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$1.smali
index f2279c9a9a..72e207df4b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleViewState"
+
+    const-string v5, "handleViewState(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleViewState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleViewState(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->access$handleViewState(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$2.smali
index 78432bf7b9..474d249c4c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->access$handleEvent(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$3.smali
index a1eee86bce..9029ab86c6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$onViewCreated$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2$1.smali
index bd7e13a025..8ad3e0d1e2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.smali
index 5586b3471e..80a68ec506 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.smali
@@ -57,7 +57,7 @@
 
     const-string v3, "nick"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getTextOrEmpty(Lcom/google/android/material/textfield/TextInputLayout;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$3$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$3$1.smali
index 6bcfc375b2..3cd872d2bd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali
index cb6af49ba6..4038e16f52 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali
@@ -125,841 +125,589 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "guildProfileFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildProfileFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildProfileFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildProfileFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "constraintLayout"
 
-    aput-object v1, v0, v2
+    const-string v3, "getConstraintLayout()Landroidx/constraintlayout/widget/ConstraintLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "constraintLayout"
-
-    const-string v4, "getConstraintLayout()Landroidx/constraintlayout/widget/ConstraintLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "banner"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBanner()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "banner"
-
-    const-string v4, "getBanner()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "iconCard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconCard()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "iconCard"
-
-    const-string v4, "getIconCard()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "guildIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildIcon"
-
-    const-string v4, "getGuildIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "guildIconName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildIconName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildIconName"
-
-    const-string v4, "getGuildIconName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "onlineCount"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOnlineCount()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "onlineCount"
-
-    const-string v4, "getOnlineCount()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "onlineCountTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOnlineCountTextView()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "onlineCountTextView"
-
-    const-string v4, "getOnlineCountTextView()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "memberCount"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMemberCount()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "memberCount"
-
-    const-string v4, "getMemberCount()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "memberCountTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMemberCountTextView()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "memberCountTextView"
-
-    const-string v4, "getMemberCountTextView()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string/jumbo v2, "verifiedPartneredIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVerifiedPartneredIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "verifiedPartneredIcon"
-
-    const-string v4, "getVerifiedPartneredIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "guildName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildName"
-
-    const-string v4, "getGuildName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "guildDescription"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildDescription()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildDescription"
-
-    const-string v4, "getGuildDescription()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "contentContainerBottomDivider"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContentContainerBottomDivider()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "contentContainerBottomDivider"
-
-    const-string v4, "getContentContainerBottomDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "tabItemsLayout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTabItemsLayout()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "tabItemsLayout"
-
-    const-string v4, "getTabItemsLayout()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "boostsButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostsButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostsButton"
-
-    const-string v4, "getBoostsButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "notificationsButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsButton"
-
-    const-string v4, "getNotificationsButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "settingsButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsButton"
-
-    const-string v4, "getSettingsButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "inviteButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inviteButton"
-
-    const-string v4, "getInviteButton()Lcom/google/android/material/button/MaterialButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "actionsContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getActionsContainer()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "actionsContainer"
-
-    const-string v4, "getActionsContainer()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "markAsReadAction"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMarkAsReadAction()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "markAsReadAction"
-
-    const-string v4, "getMarkAsReadAction()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "markAsRead"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMarkAsRead()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "markAsRead"
-
-    const-string v4, "getMarkAsRead()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "primaryActions"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrimaryActions()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "primaryActions"
-
-    const-string v4, "getPrimaryActions()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "createChannel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreateChannel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "createChannel"
-
-    const-string v4, "getCreateChannel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "createCategory"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreateCategory()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "createCategory"
-
-    const-string v4, "getCreateCategory()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x18
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "changeNickname"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChangeNickname()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "changeNickname"
-
-    const-string v4, "getChangeNickname()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x19
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "nickname"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNickname()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nickname"
-
-    const-string v4, "getNickname()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1a
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "allowDM"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAllowDM()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "allowDM"
-
-    const-string v4, "getAllowDM()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1b
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "hideMutedChannels"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHideMutedChannels()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "hideMutedChannels"
-
-    const-string v4, "getHideMutedChannels()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1c
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "leaveServer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLeaveServer()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "leaveServer"
-
-    const-string v4, "getLeaveServer()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1d
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "developerActions"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeveloperActions()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "developerActions"
-
-    const-string v4, "getDeveloperActions()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1e
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "copyId"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCopyId()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "copyId"
-
-    const-string v4, "getCopyId()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1f
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "bottomContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBottomContainer()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bottomContainer"
-
-    const-string v4, "getBottomContainer()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x20
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "emojisCountText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojisCountText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojisCountText"
-
-    const-string v4, "getEmojisCountText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x21
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "emojisUpsellDotSeparator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojisUpsellDotSeparator()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojisUpsellDotSeparator"
-
-    const-string v4, "getEmojisUpsellDotSeparator()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x22
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "premiumUpsellText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPremiumUpsellText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "premiumUpsellText"
-
-    const-string v4, "getPremiumUpsellText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x23
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "emojisCardView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojisCardView()Landroidx/cardview/widget/CardView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojisCardView"
-
-    const-string v4, "getEmojisCardView()Landroidx/cardview/widget/CardView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x24
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "emojisRecylerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojisRecylerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojisRecylerView"
-
-    const-string v4, "getEmojisRecylerView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x25
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "bottomActionsLayout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBottomActionsLayout()Landroidx/constraintlayout/widget/ConstraintLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bottomActionsLayout"
-
-    const-string v4, "getBottomActionsLayout()Landroidx/constraintlayout/widget/ConstraintLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x26
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string/jumbo v2, "uploadEmoji"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadEmoji()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadEmoji"
-
-    const-string v4, "getUploadEmoji()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x27
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string v2, "joinServer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getJoinServer()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "joinServer"
-
-    const-string v4, "getJoinServer()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x28
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;
+    const-string/jumbo v2, "viewServer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewServer()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "viewServer"
-
-    const-string v4, "getViewServer()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x29
 
@@ -983,7 +731,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0464
+    const v0, 0x7f0a046a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -991,7 +739,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->guildProfileFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0458
+    const v0, 0x7f0a045e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -999,7 +747,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->constraintLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0453
+    const v0, 0x7f0a0459
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1007,7 +755,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->banner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0468
+    const v0, 0x7f0a046e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1015,7 +763,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->iconCard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0467
+    const v0, 0x7f0a046d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1023,7 +771,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->guildIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0469
+    const v0, 0x7f0a046f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1031,7 +779,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->guildIconName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0474
+    const v0, 0x7f0a047a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1039,7 +787,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->onlineCount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0475
+    const v0, 0x7f0a047b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1047,7 +795,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->onlineCountTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a046f
+    const v0, 0x7f0a0475
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1055,7 +803,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->memberCount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0470
+    const v0, 0x7f0a0476
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1063,7 +811,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->memberCountTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0465
+    const v0, 0x7f0a046b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1071,7 +819,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->verifiedPartneredIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0471
+    const v0, 0x7f0a0477
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1079,7 +827,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->guildName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a045e
+    const v0, 0x7f0a0464
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1087,7 +835,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->guildDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a045a
+    const v0, 0x7f0a0460
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1095,7 +843,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->contentContainerBottomDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047b
+    const v0, 0x7f0a0481
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1103,7 +851,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->tabItemsLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0454
+    const v0, 0x7f0a045a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1111,7 +859,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->boostsButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0473
+    const v0, 0x7f0a0479
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1119,7 +867,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->notificationsButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047a
+    const v0, 0x7f0a0480
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1127,7 +875,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->settingsButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a046a
+    const v0, 0x7f0a0470
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1135,7 +883,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->inviteButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0450
+    const v0, 0x7f0a0456
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1143,7 +891,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->actionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a046e
+    const v0, 0x7f0a0474
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1151,7 +899,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->markAsReadAction$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a046d
+    const v0, 0x7f0a0473
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1159,7 +907,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->markAsRead$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0478
+    const v0, 0x7f0a047e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1167,7 +915,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->primaryActions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a045d
+    const v0, 0x7f0a0463
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1175,7 +923,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->createChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a045c
+    const v0, 0x7f0a0462
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1183,7 +931,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->createCategory$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0457
+    const v0, 0x7f0a045d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1191,7 +939,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->changeNickname$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0472
+    const v0, 0x7f0a0478
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1199,7 +947,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->nickname$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0452
+    const v0, 0x7f0a0458
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1207,7 +955,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->allowDM$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0466
+    const v0, 0x7f0a046c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1215,7 +963,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->hideMutedChannels$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a046c
+    const v0, 0x7f0a0472
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1223,7 +971,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->leaveServer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a045f
+    const v0, 0x7f0a0465
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1231,7 +979,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->developerActions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a045b
+    const v0, 0x7f0a0461
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1239,7 +987,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->copyId$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0456
+    const v0, 0x7f0a045c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1247,7 +995,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->bottomContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0463
+    const v0, 0x7f0a0469
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1255,7 +1003,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->emojisCountText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0476
+    const v0, 0x7f0a047c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1263,7 +1011,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->emojisUpsellDotSeparator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0477
+    const v0, 0x7f0a047d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1271,7 +1019,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->premiumUpsellText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0462
+    const v0, 0x7f0a0468
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1279,7 +1027,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->emojisCardView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0461
+    const v0, 0x7f0a0467
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1287,7 +1035,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->emojisRecylerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0455
+    const v0, 0x7f0a045b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1295,7 +1043,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->bottomActionsLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047c
+    const v0, 0x7f0a0482
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1303,7 +1051,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->uploadEmoji$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a046b
+    const v0, 0x7f0a0471
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1311,7 +1059,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->joinServer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a047d
+    const v0, 0x7f0a0483
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1348,9 +1096,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -1864,7 +1612,7 @@
 
     const-string v5, "resources"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x1
 
@@ -1880,7 +1628,7 @@
 
     const v7, 0x7f100039
 
-    const v9, 0x7f120f82
+    const v9, 0x7f120fac
 
     invoke-static {v4, v7, v9, v2, v6}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1971,11 +1719,11 @@
     goto :goto_3
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type androidx.recyclerview.widget.GridLayoutManager"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -2346,7 +2094,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f120c94
+    const v4, 0x7f120cba
 
     new-array v5, v1, [Ljava/lang/Object;
 
@@ -2364,7 +2112,7 @@
 
     const-string v7, "onlineCount.context"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v6}, Lcom/discord/utilities/string/StringUtilsKt;->format(ILandroid/content/Context;)Ljava/lang/String;
 
@@ -2404,7 +2152,7 @@
 
     const-string v0, "resources"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -2412,9 +2160,9 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f10009c
+    const v3, 0x7f10009e
 
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
@@ -2432,7 +2180,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f120c95
+    const v0, 0x7f120cbb
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -2510,11 +2258,11 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f1000c6
+    const v1, 0x7f1000c8
 
-    const v3, 0x7f1211ca
+    const v3, 0x7f1211f5
 
     const/4 v4, 0x1
 
@@ -3772,7 +3520,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
 
@@ -3947,25 +3695,25 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a01ce
+    const v1, 0x7f0a01d1
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
 
-    const v2, 0x7f0a01d1
+    const v2, 0x7f0a01d4
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v2
 
-    const v3, 0x7f0a01d0
+    const v3, 0x7f0a01d3
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v3
 
-    const v4, 0x7f0a01cf
+    const v4, 0x7f0a01d2
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -3981,7 +3729,7 @@
 
     const-string v1, "nick"
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v4, p3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setText(Lcom/google/android/material/textfield/TextInputLayout;Ljava/lang/CharSequence;)Lkotlin/Unit;
 
@@ -3995,7 +3743,7 @@
 
     const-string v1, "reset"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -4003,7 +3751,7 @@
 
     if-eqz p3, :cond_1
 
-    invoke-static {p3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p3
 
@@ -4041,9 +3789,9 @@
 
     new-instance p1, Landroidx/appcompat/app/AlertDialog$Builder;
 
-    const-string p2, "view"
+    const-string/jumbo p2, "view"
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -4077,7 +3825,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$Companion;->show(Landroidx/fragment/app/FragmentManager;J)V
 
@@ -4129,9 +3877,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -4147,57 +3895,59 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "com.discord.intent.extra.EXTRA_VIEWING_GUILD"
+    const-string v1, "com.discord.intent.extra.EXTRA_VIEWING_GUILD"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-virtual {v2, v3}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
-    iput-object v2, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->channelId:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->channelId:Ljava/lang/Long;
 
-    new-instance v2, Landroidx/lifecycle/ViewModelProvider;
+    new-instance v1, Landroidx/lifecycle/ViewModelProvider;
 
-    new-instance v3, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;
+    new-instance v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;
 
-    invoke-direct {v3, p1, p2, v1}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;-><init>(JZ)V
+    invoke-direct {v2, p1, p2, v0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;-><init>(JZ)V
 
-    invoke-direct {v2, p0, v3}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {v1, p0, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
     const-class p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
-    invoke-virtual {v2, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {v1, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
     const-string p2, "ViewModelProvider(\n     \u2026del::class.java\n        )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->viewModel:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
-    const-string p2, "viewModel"
+    const-string/jumbo p2, "viewModel"
+
+    const/4 v0, 0x0
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -4278,19 +4028,12 @@
     return-void
 
     :cond_0
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter$onClickEmoji$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter$onClickEmoji$1.smali
index 3b7ab3d8f9..72bd5c0714 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter$onClickEmoji$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter$onClickEmoji$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter$onClickEmoji$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheetEmojisAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.smali
index eb3d2f518b..fa64491409 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.smali
@@ -42,7 +42,7 @@
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter;->data:Ljava/util/List;
 
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    invoke-static {p1, p2}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {p1, p2}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object v0
 
@@ -129,14 +129,14 @@
     add-int/lit8 p1, p1, 0x1
 
     :cond_1
-    const/16 p2, 0x63
+    new-instance p2, Lcom/discord/widgets/guilds/profile/EmojiItem$MoreEmoji;
 
-    invoke-static {p1, p2}, Ljava/lang/Math;->min(II)I
+    const/16 v0, 0x63
+
+    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    new-instance p2, Lcom/discord/widgets/guilds/profile/EmojiItem$MoreEmoji;
-
     invoke-direct {p2, p1}, Lcom/discord/widgets/guilds/profile/EmojiItem$MoreEmoji;-><init>(I)V
 
     invoke-interface {v1, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
@@ -206,7 +206,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/guilds/profile/BaseEmojiViewHolder;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter;->data:Ljava/util/List;
 
@@ -227,15 +229,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -251,9 +244,11 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/guilds/profile/BaseEmojiViewHolder;
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
 
-    const-string v0, "view"
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "view"
 
     const/4 v1, 0x0
 
@@ -279,7 +274,7 @@
 
     new-instance p2, Lcom/discord/widgets/guilds/profile/MoreEmojiViewHolder;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/guilds/profile/MoreEmojiViewHolder;-><init>(Landroid/view/View;)V
 
@@ -315,25 +310,16 @@
 
     new-instance p2, Lcom/discord/widgets/guilds/profile/EmojiViewHolder;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/guilds/profile/EmojiViewHolder;-><init>(Landroid/view/View;)V
 
     :goto_0
     return-object p2
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Ljava/util/List;I)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -344,7 +330,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "emojis"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter;->getEmojiItems(Ljava/util/List;I)Ljava/util/List;
 
@@ -355,19 +343,10 @@
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "emojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickEmoji(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -377,18 +356,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter;->onClickEmoji:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1.smali
index f99b0e0a7e..daefd5317c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1;->this$0:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->access$handleStoreState(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions.smali
index ef41298eb8..330499adb7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions.smali
@@ -310,7 +310,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions;->nick:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner.smali
index b732be0d3b..6b75c3b345 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner.smali
@@ -30,9 +30,11 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/String;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner$Type;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p4, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,15 +45,6 @@
     iput-object p4, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;->type:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner$Type;
 
     return-void
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;JLjava/lang/String;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner$Type;ILjava/lang/Object;)Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;
@@ -114,22 +107,15 @@
 .method public final copy(JLjava/lang/String;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner$Type;)Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;
     .locals 1
 
-    if-eqz p4, :cond_0
+    const-string v0, "type"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;-><init>(JLjava/lang/String;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner$Type;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -155,7 +141,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;->hash:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -165,7 +151,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;->type:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner$Type;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData.smali
index 7c0bd534ae..6bea6ad59e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData.smali
@@ -32,7 +32,7 @@
 
 # direct methods
 .method public constructor <init>(ZZLjava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ZZ",
@@ -43,7 +43,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "emojis"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,15 +56,6 @@
     iput-object p3, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;->emojis:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "emojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;
@@ -143,22 +136,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "emojis"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;-><init>(ZZLjava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -188,7 +174,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;->emojis:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1$1.smali
index 4aa1e87fdc..ca76c8de21 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;"
     }
 .end annotation
 
@@ -65,7 +71,7 @@
 
     const-string v1, "me"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1.smali
index c47b73ee07..98fb9dca55 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelGuildMember$Computed;",
             ">;"
         }
@@ -88,7 +91,7 @@
 
     const-string v3, "me"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -110,7 +113,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1$1;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$2.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$2.smali
index 15178211bf..0620137c12 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/emoji/EmojiSet;",
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/emoji/Emoji;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$3.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$3.smali
index f32882139b..958aa1f4be 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$3.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$3.smali
@@ -41,7 +41,21 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func9<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        "Ljava/util/List<",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/emoji/Emoji;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/utilities/channel/GuildChannelsInfo;",
+        "Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -102,19 +116,19 @@
 
     move-object/from16 v3, p9
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "me"
 
     move-object/from16 v4, p4
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "restrictedGuildIds"
 
     move-object/from16 v6, p6
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -133,7 +147,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     move-object v8, v0
 
@@ -142,7 +156,7 @@
 
     move-object/from16 v1, p8
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p8 .. p8}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -152,7 +166,7 @@
 
     move-object v1, p3
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory.smali
index e07821b708..be10b630ad 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory.smali
@@ -47,7 +47,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 11
+    .locals 12
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -58,68 +58,61 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;->observeStores()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
 
-    move-result-object v2
+    move-result-object v3
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserGuildSettings()Lcom/discord/stores/StoreUserGuildSettings;
 
-    move-result-object v3
+    move-result-object v4
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMessageAck()Lcom/discord/stores/StoreMessageAck;
 
-    move-result-object v4
+    move-result-object v5
 
-    iget-boolean v5, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;->viewingGuild:Z
+    iget-boolean v6, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;->viewingGuild:Z
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v6
+    move-result-object v7
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getLurking()Lcom/discord/stores/StoreLurking;
 
-    move-result-object v7
+    move-result-object v8
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics;
 
-    move-result-object v8
+    move-result-object v9
 
-    iget-wide v9, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;->guildId:J
+    iget-wide v10, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;->guildId:J
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreMessageAck;ZLcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/StoreLurking;Lcom/discord/stores/StoreAnalytics;J)V
+    invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreMessageAck;ZLcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/StoreLurking;Lcom/discord/stores/StoreAnalytics;J)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeStores()Lrx/Observable;
@@ -193,7 +186,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1;-><init>(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v7
 
@@ -235,7 +228,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$2;-><init>(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v9
 
@@ -267,7 +260,7 @@
 
     const-string v1, "Observable\n            .\u2026          )\n            }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState.smali
index 9f8a3d749b..9098a50ddb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState.smali
@@ -73,15 +73,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildChannelsInfo"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "me"
 
-    if-eqz p6, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_0
+    const-string v0, "restrictedGuildIds"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emojis"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -106,34 +112,6 @@
     iput-boolean p10, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->isUnread:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "emojis"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "restrictedGuildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "guildChannelsInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;Lcom/discord/utilities/channel/GuildChannelsInfo;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/List;ZLjava/util/List;ZZILjava/lang/Object;)Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;
@@ -409,15 +387,29 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildChannelsInfo"
 
-    if-eqz p3, :cond_3
+    move-object v4, p3
 
-    if-eqz p4, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "me"
 
-    if-eqz p8, :cond_0
+    move-object/from16 v5, p4
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "restrictedGuildIds"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emojis"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;
 
@@ -427,18 +419,10 @@
 
     move-object v3, p2
 
-    move-object v4, p3
-
-    move-object/from16 v5, p4
-
     move-object/from16 v6, p5
 
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
-    move-object/from16 v9, p8
-
     move/from16 v10, p9
 
     move/from16 v11, p10
@@ -446,34 +430,6 @@
     invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;Lcom/discord/utilities/channel/GuildChannelsInfo;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/List;ZLjava/util/List;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "emojis"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "restrictedGuildIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "me"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "guildChannelsInfo"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -491,7 +447,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -501,7 +457,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->guildProfile:Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -511,7 +467,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->guildChannelsInfo:Lcom/discord/utilities/channel/GuildChannelsInfo;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -521,7 +477,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -531,7 +487,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->computedMe:Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -541,7 +497,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->restrictedGuildIds:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -557,7 +513,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState;->emojis:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded.smali
index 52af9dc0d1..5bccd6be3b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded.smali
@@ -46,18 +46,28 @@
 .method public constructor <init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$TabItems;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$BottomActions;)V
     .locals 1
 
+    const-string v0, "guildName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildShortName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "banner"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emojisData"
+
+    invoke-static {p13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "bottomActions"
+
+    invoke-static {p14, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p3, :cond_4
-
-    if-eqz p4, :cond_3
-
-    if-eqz p8, :cond_2
-
-    if-eqz p13, :cond_1
-
-    if-eqz p14, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->guildId:J
@@ -87,41 +97,6 @@
     iput-object p14, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->bottomActions:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$BottomActions;
 
     return-void
-
-    :cond_0
-    const-string p1, "bottomActions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "emojisData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "banner"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "guildShortName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$TabItems;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$BottomActions;ILjava/lang/Object;)Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;
@@ -429,17 +404,35 @@
 .method public final copy(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$TabItems;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$BottomActions;)Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;
     .locals 16
 
-    const/4 v0, 0x0
+    const-string v0, "guildName"
 
-    if-eqz p3, :cond_4
+    move-object/from16 v4, p3
 
-    if-eqz p4, :cond_3
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_2
+    const-string v0, "guildShortName"
 
-    if-eqz p13, :cond_1
+    move-object/from16 v5, p4
 
-    if-eqz p14, :cond_0
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "banner"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "emojisData"
+
+    move-object/from16 v14, p13
+
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "bottomActions"
+
+    move-object/from16 v15, p14
+
+    invoke-static {v15, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;
 
@@ -447,18 +440,12 @@
 
     move-wide/from16 v2, p1
 
-    move-object/from16 v4, p3
-
-    move-object/from16 v5, p4
-
     move-object/from16 v6, p5
 
     move-object/from16 v7, p6
 
     move-object/from16 v8, p7
 
-    move-object/from16 v9, p8
-
     move-object/from16 v10, p9
 
     move-object/from16 v11, p10
@@ -467,48 +454,9 @@
 
     move-object/from16 v13, p12
 
-    move-object/from16 v14, p13
-
-    move-object/from16 v15, p14
-
     invoke-direct/range {v1 .. v15}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$TabItems;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$BottomActions;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "bottomActions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "emojisData"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "banner"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "guildShortName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "guildName"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -534,7 +482,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->guildName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -544,7 +492,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->guildShortName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -554,7 +502,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->guildIcon:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -564,7 +512,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->guildDescription:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -574,7 +522,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->verifiedPartneredIconRes:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -584,7 +532,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->banner:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -594,7 +542,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->onlineCount:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -604,7 +552,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->memberCount:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -614,7 +562,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->tabItems:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$TabItems;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -624,7 +572,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->actions:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -634,7 +582,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->emojisData:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -644,7 +592,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;->bottomActions:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$BottomActions;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1.smali
index 1ab4336011..967afe3355 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.smali
index 12e76aa583..ebab655036 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     new-instance v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Event$DismissAndShowToast;
 
-    const v2, 0x7f120e8f
+    const v2, 0x7f120eb5
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Event$DismissAndShowToast;-><init>(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1.smali
index 365881db7e..00d7a96178 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1.smali
index ff930b96b1..03c1bd97ec 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali
index 9aba6705c9..d3082460b9 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetGuildProfileSheetViewModel.kt"
 
 
@@ -20,7 +20,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState;",
         ">;"
     }
@@ -103,25 +103,37 @@
 
     move-object/from16 v7, p8
 
-    const/4 v8, 0x0
+    const-string v8, "storeObservable"
 
-    if-eqz v1, :cond_6
+    invoke-static {p1, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_5
+    const-string v8, "storeUserSettings"
 
-    if-eqz v3, :cond_4
+    invoke-static {p2, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_3
+    const-string v8, "storeUserGuildSettings"
 
-    if-eqz v5, :cond_2
+    invoke-static {p3, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_1
+    const-string v8, "messageAck"
 
-    if-eqz v7, :cond_0
+    invoke-static {p4, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v9, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loading;
+    const-string v8, "restAPI"
 
-    invoke-direct {p0, v9}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {v5, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeLurking"
+
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "storeAnalytics"
+
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v8, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loading;
+
+    invoke-direct {p0, v8}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object v1, v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->storeObservable:Lrx/Observable;
 
@@ -153,15 +165,19 @@
 
     iget-object v1, v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->storeObservable:Lrx/Observable;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x0
 
-    invoke-static {v1, p0, v8, v2, v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v3, 0x2
+
+    invoke-static {v1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
-    const/4 v3, 0x0
+    new-instance v3, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1;
+
+    invoke-direct {v3, p0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1;-><init>(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;)V
 
     const/4 v4, 0x0
 
@@ -169,9 +185,7 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1;-><init>(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;)V
+    const/4 v7, 0x0
 
     const/16 v8, 0x1e
 
@@ -181,15 +195,15 @@
 
     move-object p2, v2
 
-    move-object p3, v3
+    move-object p3, v4
 
-    move-object p4, v4
+    move-object p4, v5
 
-    move-object p5, v5
+    move-object p5, v6
 
-    move-object/from16 p6, v6
+    move-object/from16 p6, v7
 
-    move-object/from16 p7, v7
+    move-object/from16 p7, v3
 
     move/from16 p8, v8
 
@@ -204,55 +218,6 @@
     invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreAnalytics;->trackGuildProfileOpened(J)V
 
     return-void
-
-    :cond_0
-    const-string v1, "storeAnalytics"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_1
-    const-string v1, "storeLurking"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_2
-    const-string v1, "restAPI"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_3
-    const-string v1, "messageAck"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_4
-    const-string v1, "storeUserGuildSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_5
-    const-string v1, "storeUserSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_6
-    const-string v1, "storeObservable"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
 .end method
 
 .method public static final synthetic access$getEventSubject$p(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;)Lrx/subjects/PublishSubject;
@@ -309,7 +274,7 @@
 
     if-eqz v2, :cond_0
 
-    const v2, 0x7f080429
+    const v2, 0x7f08042c
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -333,7 +298,7 @@
 
     if-eqz v2, :cond_1
 
-    const v2, 0x7f08037a
+    const v2, 0x7f08037d
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -413,6 +378,10 @@
     move-result-object v8
 
     :goto_4
+    const-string v9, "guild.premiumSubscriptionCount ?: 0"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v8}, Ljava/lang/Integer;->intValue()I
 
     move-result v8
@@ -553,7 +522,7 @@
 
     const-string v4, "guild.name"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
 
@@ -561,7 +530,7 @@
 
     const-string v4, "guild.shortName"
 
-    invoke-static {v10, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String;
 
@@ -605,7 +574,7 @@
     goto :goto_a
 
     :cond_d
-    sget-object v6, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v6, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_a
     invoke-direct {v9, v4, v5, v6}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;-><init>(ZZLjava/util/List;)V
@@ -634,7 +603,7 @@
 
     invoke-direct/range {v4 .. v18}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner;Ljava/lang/Integer;Ljava/lang/Integer;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$TabItems;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Actions;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$EmojisData;Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$BottomActions;)V
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -650,7 +619,7 @@
 
     const-string v3, "ModelGuild.FEATURE_VERIFIED_SERVER"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
@@ -662,7 +631,7 @@
 
     if-eqz v2, :cond_0
 
-    const v2, 0x7f080429
+    const v2, 0x7f08042c
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -678,7 +647,7 @@
 
     const-string v3, "ModelGuild.FEATURE_PARTNERED"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
 
@@ -690,7 +659,7 @@
 
     if-eqz v2, :cond_1
 
-    const v2, 0x7f08037a
+    const v2, 0x7f08037d
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -816,7 +785,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -957,7 +926,7 @@
     :cond_6
     sget-object p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loading;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_3
 
@@ -965,7 +934,7 @@
     :goto_2
     sget-object p1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Invalid;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_3
     return-void
@@ -988,7 +957,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -998,7 +967,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1073,7 +1042,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -1090,7 +1059,7 @@
 .end method
 
 .method public final onClickLeaveServer(JLkotlin/jvm/functions/Function0;)V
-    .locals 10
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -1100,33 +1069,37 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onSuccess"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->leaveGuild(J)Lrx/Observable;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->leaveGuild(J)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v1, p2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
+    const-class v3, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
-    const/4 v3, 0x0
+    new-instance v8, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1;
+
+    invoke-direct {v8, p3}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1;-><init>(Lkotlin/jvm/functions/Function0;)V
 
     const/4 v4, 0x0
 
@@ -1134,24 +1107,15 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1;
+    const/4 v7, 0x0
 
-    invoke-direct {v7, p3}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickLeaveServer$1;-><init>(Lkotlin/jvm/functions/Function0;)V
+    const/16 v9, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v10, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onSuccess"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onClickMarkAsRead(Landroid/content/Context;J)V
@@ -1169,7 +1133,7 @@
 .end method
 
 .method public final onClickResetNickname(JLkotlin/jvm/functions/Function0;)V
-    .locals 10
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -1179,39 +1143,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onSuccess"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
-    new-instance v2, Lcom/discord/restapi/RestAPIParams$Nick;
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$Nick;
 
-    const-string v3, ""
+    const-string v2, ""
 
-    invoke-direct {v2, v3}, Lcom/discord/restapi/RestAPIParams$Nick;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Lcom/discord/restapi/RestAPIParams$Nick;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, p1, p2, v2}, Lcom/discord/utilities/rest/RestAPI;->changeGuildNickname(JLcom/discord/restapi/RestAPIParams$Nick;)Lrx/Observable;
+    invoke-virtual {v0, p1, p2, v1}, Lcom/discord/utilities/rest/RestAPI;->changeGuildNickname(JLcom/discord/restapi/RestAPIParams$Nick;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v1, 0x0
+
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x2
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v1, p2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
+    const-class v3, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
-    const/4 v3, 0x0
+    new-instance v8, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1;
+
+    invoke-direct {v8, p3}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1;-><init>(Lkotlin/jvm/functions/Function0;)V
 
     const/4 v4, 0x0
 
@@ -1219,24 +1187,15 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1;
+    const/4 v7, 0x0
 
-    invoke-direct {v7, p3}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickResetNickname$1;-><init>(Lkotlin/jvm/functions/Function0;)V
+    const/16 v9, 0x1e
 
-    const/16 v8, 0x1e
+    const/4 v10, 0x0
 
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onSuccess"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onClickSaveNickname(JLjava/lang/String;Lkotlin/jvm/functions/Function0;)V
@@ -1251,19 +1210,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "nick"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "onSuccess"
 
-    iget-object v1, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v2, Lcom/discord/restapi/RestAPIParams$Nick;
+    iget-object v0, p0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
-    invoke-direct {v2, p3}, Lcom/discord/restapi/RestAPIParams$Nick;-><init>(Ljava/lang/String;)V
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$Nick;
 
-    invoke-virtual {v1, p1, p2, v2}, Lcom/discord/utilities/rest/RestAPI;->changeGuildNickname(JLcom/discord/restapi/RestAPIParams$Nick;)Lrx/Observable;
+    invoke-direct {v1, p3}, Lcom/discord/restapi/RestAPIParams$Nick;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1, p2, v1}, Lcom/discord/utilities/rest/RestAPI;->changeGuildNickname(JLcom/discord/restapi/RestAPIParams$Nick;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1271,6 +1232,8 @@
 
     const/4 p3, 0x1
 
+    const/4 v0, 0x0
+
     invoke-static {p1, p2, p3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
@@ -1283,6 +1246,10 @@
 
     const-class v2, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel;
 
+    new-instance v7, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1;
+
+    invoke-direct {v7, p4}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1;-><init>(Lkotlin/jvm/functions/Function0;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -1291,10 +1258,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1;
-
-    invoke-direct {v7, p4}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickSaveNickname$1;-><init>(Lkotlin/jvm/functions/Function0;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -1302,20 +1265,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onSuccess"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "nick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onClickViewServer(JLjava/lang/Long;)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$Companion.smali
index f625e5549c..8df4baff69 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet;
 
@@ -51,13 +53,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.smali
index 4b6aa2a0cb..d490f2906a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.smali
@@ -29,25 +29,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet;
 
-    const-class v2, Lcom/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet;
+    const-string v2, "guildIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildIcon"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildIcon()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -119,38 +113,31 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet;->getGuildIcon()Landroid/widget/ImageView;
 
-    move-result-object v0
+    move-result-object v1
 
-    const v2, 0x7f07005e
+    const-string v2, "asset://asset/images/system_user_avatar.png"
 
-    const/4 v3, 0x0
+    const v3, 0x7f07005e
 
     const/4 v4, 0x0
 
-    const/16 v5, 0x18
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x18
 
-    const-string v1, "asset://asset/images/system_user_avatar.png"
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/HomeConfig.smali b/com.discord/smali/com/discord/widgets/home/HomeConfig.smali
index 2c406143e1..5002c159b7 100644
--- a/com.discord/smali/com/discord/widgets/home/HomeConfig.smali
+++ b/com.discord/smali/com/discord/widgets/home/HomeConfig.smali
@@ -128,7 +128,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/HomeConfig;->guildWelcomeSheetId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/home/HomePanelsLayout.smali b/com.discord/smali/com/discord/widgets/home/HomePanelsLayout.smali
index 1890ff74fe..92304f3879 100644
--- a/com.discord/smali/com/discord/widgets/home/HomePanelsLayout.smali
+++ b/com.discord/smali/com/discord/widgets/home/HomePanelsLayout.smali
@@ -8,60 +8,39 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/panels/OverlappingPanelsLayout;-><init>(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/panels/OverlappingPanelsLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/panels/OverlappingPanelsLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/com.discord/smali/com/discord/widgets/home/LeftPanelManager$observeShouldLockOpen$1.smali b/com.discord/smali/com/discord/widgets/home/LeftPanelManager$observeShouldLockOpen$1.smali
index 13986020e6..081520ba82 100644
--- a/com.discord/smali/com/discord/widgets/home/LeftPanelManager$observeShouldLockOpen$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/LeftPanelManager$observeShouldLockOpen$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,25 +62,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    check-cast p2, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/home/LeftPanelManager$observeShouldLockOpen$1;->call(Ljava/lang/Long;Ljava/lang/Long;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Long;Ljava/lang/Long;)Z
+.method public final call(Ljava/lang/Long;Ljava/lang/Long;)Ljava/lang/Boolean;
     .locals 8
 
     const-wide/16 v0, 0x0
@@ -155,5 +140,23 @@
     const/4 v2, 0x1
 
     :cond_5
-    return v2
+    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    check-cast p2, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/home/LeftPanelManager$observeShouldLockOpen$1;->call(Ljava/lang/Long;Ljava/lang/Long;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/LeftPanelManager.smali b/com.discord/smali/com/discord/widgets/home/LeftPanelManager.smali
index 4ae51048ed..2756df1fc8 100644
--- a/com.discord/smali/com/discord/widgets/home/LeftPanelManager.smali
+++ b/com.discord/smali/com/discord/widgets/home/LeftPanelManager.smali
@@ -25,11 +25,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreGuildSelected;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeChannelsSelected"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeGuildSelected"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,20 +40,6 @@
     iput-object p2, p0, Lcom/discord/widgets/home/LeftPanelManager;->storeGuildSelected:Lcom/discord/stores/StoreGuildSelected;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeGuildSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeChannelsSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreGuildSelected;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -121,7 +109,7 @@
 
     const-string v1, "Observable.combineLatest\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$handleExperiment$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$handleExperiment$1.smali
index db13c47c38..4df434bf5b 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$handleExperiment$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$handleExperiment$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$handleExperiment$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/SharedPreferences$Editor;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/SharedPreferences$Editor;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$handleExperiment$1;->$isEnabledExperiment:Z
 
@@ -70,13 +72,4 @@
     invoke-interface {p1, v1, v0}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1.smali
index 535bda24fc..25012618a0 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreExperiments$Experiment;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleExperiment"
+
+    const-string v5, "handleExperiment(Lcom/discord/stores/StoreExperiments$Experiment;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleExperiment"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleExperiment(Lcom/discord/stores/StoreExperiments$Experiment;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/stores/StoreExperiments$Experiment;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;->access$handleExperiment(Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;Lcom/discord/stores/StoreExperiments$Experiment;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag.smali
index 216be3c07f..563b8c614a 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag.smali
@@ -107,30 +107,36 @@
 .method public final observeExperiment(Lcom/discord/app/AppFragment;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "2020-06_android_back_button_behavior_v01"
+    const-string v1, "2020-06_android_back_button_behavior_v01"
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1, p1, v0, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, p1, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
     const-class v5, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;
 
+    new-instance v10, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1;-><init>(Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;)V
+
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -139,10 +145,6 @@
 
     const/4 v9, 0x0
 
-    new-instance v10, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1;
-
-    invoke-direct {v10, p0}, Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag$observeExperiment$1;-><init>(Lcom/discord/widgets/home/WidgetHome$BackBehaviorFeatureFlag;)V
-
     const/16 v11, 0x1e
 
     const/4 v12, 0x0
@@ -150,11 +152,4 @@
     invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$1.smali
index 0ec62c1271..49693af5ed 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$1.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -76,7 +83,7 @@
 
     const-string v0, "connectionOpen"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$1.smali
index 88993a3645..f1ff164966 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -69,26 +69,19 @@
 
     const/4 v4, 0x0
 
-    const/16 v5, 0xd
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0xd
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$2.smali
index a16d179e2d..1d7067170b 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3$1.smali
index a291f4ece0..0e331cbf4c 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lcom/discord/stores/StoreNux$NuxState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,38 +57,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/stores/StoreNux$NuxState;)Lcom/discord/stores/StoreNux$NuxState;
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/16 v5, 0x9
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x9
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/stores/StoreNux$NuxState;->copy$default(Lcom/discord/stores/StoreNux$NuxState;ZZZLjava/lang/Long;ILjava/lang/Object;)Lcom/discord/stores/StoreNux$NuxState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3.smali
index 11a8b78fa9..5bab3746af 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$4.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$4.smali
index 0503cdbc49..8f88a90bbe 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$4.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/jvm/functions/Function0<",
         "+",
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.smali
index 19bcc7b17c..bb0c7c12e8 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.smali
@@ -77,9 +77,9 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$2;-><init>(Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2;)V
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-wide/16 v1, 0x3e8
 
@@ -91,9 +91,9 @@
 
     sget-object v0, Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$3;->INSTANCE:Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2$3;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-wide/16 v2, 0x7d0
 
@@ -109,7 +109,7 @@
 
     const-string v0, "Observable\n             \u2026, TimeUnit.MILLISECONDS))"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$configureFirstOpen$2;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.smali
index db69afbcb7..d30f10dc4a 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$configureLeftPanel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.smali
index 0866e4ad61..e0ddc24751 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNavigation$PanelAction;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/stores/StoreNavigation$PanelAction;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1;->$this_configureNavigationDrawerAction:Lcom/discord/stores/StoreNavigation;
 
@@ -78,13 +80,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction(Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$1.smali
index be7a448256..d983196044 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$1.smali
@@ -42,7 +42,9 @@
 .method public onPanelStateChange(Lcom/discord/panels/PanelState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$configureOverlappingPanels$1;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
@@ -53,13 +55,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/home/WidgetHomeViewModel;->onStartPanelStateChange(Lcom/discord/panels/PanelState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$2.smali
index 6911a2af55..51451f09ac 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$configureOverlappingPanels$2.smali
@@ -42,7 +42,9 @@
 .method public onPanelStateChange(Lcom/discord/panels/PanelState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$configureOverlappingPanels$2;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
@@ -53,13 +55,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/home/WidgetHomeViewModel;->onEndPanelStateChange(Lcom/discord/panels/PanelState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onCreate$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onCreate$1.smali
index 964141e814..732b45d7be 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onCreate$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onCreate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onCreate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Context;",
         "Ljava/util/Locale;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/content/Context;)Ljava/util/Locale;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$onCreate$1;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
@@ -74,13 +76,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onGuildListAddHintCreate$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onGuildListAddHintCreate$1.smali
index b13b984334..b351b0e80c 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onGuildListAddHintCreate$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onGuildListAddHintCreate$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onGuildListAddHintCreate$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBound$1.smali
index c7bb8e8375..f6f33f8eca 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBound$1.smali
@@ -46,10 +46,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
+.method public final call()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/home/WidgetHome$onViewBound$1;->call()Z
+    iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$onViewBound$1;->this$0:Lcom/discord/widgets/home/WidgetHome;
+
+    invoke-static {v0}, Lcom/discord/widgets/home/WidgetHome;->access$handleBackPressed(Lcom/discord/widgets/home/WidgetHome;)Z
 
     move-result v0
 
@@ -60,14 +62,12 @@
     return-object v0
 .end method
 
-.method public final call()Z
+.method public bridge synthetic call()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$onViewBound$1;->this$0:Lcom/discord/widgets/home/WidgetHome;
+    invoke-virtual {p0}, Lcom/discord/widgets/home/WidgetHome$onViewBound$1;->call()Ljava/lang/Boolean;
 
-    invoke-static {v0}, Lcom/discord/widgets/home/WidgetHome;->access$handleBackPressed(Lcom/discord/widgets/home/WidgetHome;)Z
+    move-result-object v0
 
-    move-result v0
-
-    return v0
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$1.smali
index 5151cf2e01..ed774684fb 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/home/WidgetHome;->access$handleViewState(Lcom/discord/widgets/home/WidgetHome;Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.smali
index 0678121144..b3100abfd9 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$10;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.smali
index 2474071908..c201a09134 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/home/WidgetHomeViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/home/WidgetHomeViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/home/WidgetHome;->access$handleEvent(Lcom/discord/widgets/home/WidgetHome;Lcom/discord/widgets/home/WidgetHomeViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$3.smali
index add12f2de9..b1b00a39a2 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/home/WidgetHomeModel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/home/WidgetHomeModel;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$3;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/home/WidgetHome;->access$configureUI(Lcom/discord/widgets/home/WidgetHome;Lcom/discord/widgets/home/WidgetHomeModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.smali
index bc66931513..be8a03b6cc 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4.smali
@@ -3,7 +3,7 @@
 .source "WidgetHome.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,15 +59,17 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
+    sget-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4;->call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
+    xor-int/lit8 p1, p1, 0x1
+
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -75,16 +77,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+    check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4;->call(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    xor-int/lit8 p1, p1, 0x1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.smali
index ca010e233b..d103ffe92f 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$5;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/surveys/SurveyUtils$Survey;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/home/WidgetHome;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "showSurvey"
+
+    const-string v5, "showSurvey(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "showSurvey"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/home/WidgetHome;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "showSurvey(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/home/WidgetHome;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/home/WidgetHome;->access$showSurvey(Lcom/discord/widgets/home/WidgetHome;Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.smali
index fe531f3d5f..8027488731 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6.smali
@@ -3,7 +3,7 @@
 .source "WidgetHome.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/stores/StoreNux$NuxState;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/stores/StoreNux$NuxState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6;->call(Lcom/discord/stores/StoreNux$NuxState;)Z
+    invoke-virtual {p1}, Lcom/discord/stores/StoreNux$NuxState;->getFirstOpen()Z
 
     move-result p1
 
@@ -75,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/stores/StoreNux$NuxState;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreNux$NuxState;->getFirstOpen()Z
+    check-cast p1, Lcom/discord/stores/StoreNux$NuxState;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6;->call(Lcom/discord/stores/StoreNux$NuxState;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.smali
index 61af6ff798..3d0c89d5cf 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNux$NuxState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.smali
index f0d1c48368..285b12d395 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8.smali
@@ -3,7 +3,7 @@
 .source "WidgetHome.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8;->call(Lcom/discord/models/domain/ModelUser;)Z
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->hasUnreadUrgentMessages()Z
 
     move-result p1
 
@@ -75,12 +73,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelUser;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->hasUnreadUrgentMessages()Z
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.smali
index 22be695ac4..15c7e7a8a4 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$9;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.smali
index f73bf11b34..97c3a997a4 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
@@ -78,25 +80,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$2.smali
index dc6113f68b..d4063ba146 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$2.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Landroidx/core/view/WindowInsetsCompat$Builder;
 
@@ -67,7 +69,7 @@
 
     const-string v0, "WindowInsetsCompat.Build\u2026        )\n      ).build()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$2;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
@@ -101,18 +103,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.smali
index 9a5fce9254..630f9df03d 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3;->this$0:Lcom/discord/widgets/home/WidgetHome;
 
@@ -72,18 +74,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$showSurvey$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$showSurvey$1.smali
index f0ecca9790..fdcfa62c27 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$showSurvey$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$showSurvey$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$showSurvey$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "activity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/home/WidgetMainSurveyDialog;->Companion:Lcom/discord/widgets/home/WidgetMainSurveyDialog$Companion;
 
@@ -75,7 +77,7 @@
 
     const-string v2, "activity.supportFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/home/WidgetHome$showSurvey$1;->$survey:Lcom/discord/utilities/surveys/SurveyUtils$Survey;
 
@@ -120,13 +122,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.smali
index 41e05b4307..7aa6a80a35 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHome.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,23 +73,27 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "activity"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lf/a/a/t;->i:Lf/a/a/t$a;
+    sget-object v0, Lf/a/a/t;->i:Lf/a/a/t$a;
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object p1
 
-    const-string v2, "activity.supportFragmentManager"
+    const-string v1, "activity.supportFragmentManager"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/a/t;
 
@@ -104,12 +108,7 @@
     return p1
 
     :cond_0
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "activity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHome.smali b/com.discord/smali/com/discord/widgets/home/WidgetHome.smali
index 5e228f33f8..1f6873baaf 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHome.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHome.smali
@@ -90,281 +90,197 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "toolbar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getToolbar()Landroidx/appcompat/widget/Toolbar;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "toolbar"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getToolbar()Landroidx/appcompat/widget/Toolbar;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const/4 v2, 0x0
+    const-string v2, "toolbarTitle"
 
-    aput-object v1, v0, v2
+    const-string v3, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "toolbarTitle"
-
-    const-string v4, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "guildListAddHint"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildListAddHint()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildListAddHint"
-
-    const-string v4, "getGuildListAddHint()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string/jumbo v2, "unreadCountView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnreadCountView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "unreadCountView"
-
-    const-string v4, "getUnreadCountView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "container"
-
-    const-string v4, "getContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "overlappingPanels"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOverlappingPanels()Lcom/discord/widgets/home/HomePanelsLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "overlappingPanels"
-
-    const-string v4, "getOverlappingPanels()Lcom/discord/widgets/home/HomePanelsLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "leftPanel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLeftPanel()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "leftPanel"
-
-    const-string v4, "getLeftPanel()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "rightPanel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRightPanel()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "rightPanel"
-
-    const-string v4, "getRightPanel()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "rightPanelRoundedContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRightPanelRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "rightPanelRoundedContainer"
-
-    const-string v4, "getRightPanelRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "centerPanel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCenterPanel()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "centerPanel"
-
-    const-string v4, "getCenterPanel()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "guildList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildList()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildList"
-
-    const-string v4, "getGuildList()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "connectedList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectedList()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectedList"
-
-    const-string v4, "getConnectedList()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "chatInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChatInput()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "chatInput"
-
-    const-string v4, "getChatInput()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHome;
+    const-string v2, "inlineVoiceCallControls"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInlineVoiceCallControls()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inlineVoiceCallControls"
-
-    const-string v4, "getInlineVoiceCallControls()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
@@ -396,7 +312,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->toolbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0997
+    const v0, 0x7f0a099b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -404,7 +320,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->toolbarTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a044a
+    const v0, 0x7f0a0450
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -412,7 +328,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->guildListAddHint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04d2
+    const v0, 0x7f0a04d8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->g(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -420,7 +336,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->unreadCountView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a9a
+    const v0, 0x7f0a0a9f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -428,7 +344,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a9b
+    const v0, 0x7f0a0aa0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -436,7 +352,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->overlappingPanels$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04ce
+    const v0, 0x7f0a04d4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -444,7 +360,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->leftPanel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04d1
+    const v0, 0x7f0a04d7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -452,7 +368,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->rightPanel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a058f
+    const v0, 0x7f0a0595
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -460,7 +376,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->rightPanelRoundedContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04c3
+    const v0, 0x7f0a04c9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -468,7 +384,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->centerPanel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a99
+    const v0, 0x7f0a0a9e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -476,7 +392,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->guildList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a98
+    const v0, 0x7f0a0a9d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -484,7 +400,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->connectedList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a92
+    const v0, 0x7f0a0a97
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -492,7 +408,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->chatInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a95
+    const v0, 0x7f0a0a9a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -633,9 +549,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -747,13 +663,13 @@
 
     move-result-object v0
 
-    sget-object v1, Lr0/l/a/u1$a;->a:Lr0/l/a/u1;
+    sget-object v1, Ls0/l/a/u1$a;->a:Ls0/l/a/u1;
 
-    new-instance v2, Lr0/l/a/u;
+    new-instance v2, Ls0/l/a/u;
 
     iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v2, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v2, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -918,9 +834,9 @@
     return-void
 
     :cond_2
-    const-string p1, "viewModel"
+    const-string/jumbo p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1301,7 +1217,7 @@
 
     sget-object v0, Lcom/discord/widgets/home/WidgetHomeViewModel$Event$OpenLeftPanel;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeViewModel$Event$OpenLeftPanel;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1318,7 +1234,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/home/WidgetHomeViewModel$Event$ClosePanels;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeViewModel$Event$ClosePanels;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1335,7 +1251,7 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/home/WidgetHomeViewModel$Event$UnlockLeftPanel;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeViewModel$Event$UnlockLeftPanel;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1448,65 +1364,39 @@
 .end method
 
 .method private final roundPanelCorners()V
-    .locals 3
+    .locals 2
+
+    const/16 v0, 0x8
+
+    invoke-static {v0}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
+
+    move-result v0
+
+    int-to-float v0, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getCenterPanel()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;
 
-    move-result-object v0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
     move-result-object v1
 
-    const v2, 0x7f0701ed
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopLeftRadius(F)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopLeftRadius(F)V
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getCenterPanel()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;
 
-    move-result-object v0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
     move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopRightRadius(F)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopRightRadius(F)V
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getRightPanelRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;
 
-    move-result-object v0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
     move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopLeftRadius(F)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopLeftRadius(F)V
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getRightPanelRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;
 
-    move-result-object v0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
     move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopRightRadius(F)V
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;->updateTopRightRadius(F)V
 
     return-void
 .end method
@@ -1572,13 +1462,13 @@
 
     move-result v0
 
-    const v1, 0x7f080337
+    const v1, 0x7f080338
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    const v2, 0x7f1215f0
+    const v2, 0x7f12161a
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1738,7 +1628,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$Companion;->show(Landroidx/fragment/app/FragmentManager;J)V
 
@@ -1821,7 +1711,7 @@
 .end method
 
 .method public onCreate(Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
     invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onCreate(Landroid/os/Bundle;)V
 
@@ -1831,6 +1721,10 @@
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/home/WidgetHome$onCreate$1;-><init>(Lcom/discord/widgets/home/WidgetHome;)V
 
+    const-string v0, "provider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     sput-object p1, Lf/a/f/a;->a:Lkotlin/jvm/functions/Function1;
 
     return-void
@@ -1847,7 +1741,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "gestureRegions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getOverlappingPanels()Lcom/discord/widgets/home/HomePanelsLayout;
 
@@ -1856,19 +1752,10 @@
     invoke-virtual {v0, p1}, Lcom/discord/panels/OverlappingPanelsLayout;->setChildGestureRegions(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gestureRegions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onPause()V
-    .locals 1
+    .locals 2
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
 
@@ -1876,6 +1763,10 @@
 
     move-result-object v0
 
+    const-string v1, "gestureRegionsListener"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, v0, Lf/a/f/b;->e:Ljava/util/Set;
 
     invoke-interface {v0, p0}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
@@ -1899,13 +1790,17 @@
 
     move-result-object v0
 
+    const-string v1, "gestureRegionsListener"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v1, v0, Lf/a/f/b;->d:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
@@ -1960,9 +1855,9 @@
     return-void
 
     :cond_2
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1970,173 +1865,161 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    new-instance v1, Lcom/discord/utilities/locale/LocaleManager;
+    new-instance v0, Lcom/discord/utilities/locale/LocaleManager;
 
-    invoke-direct {v1}, Lcom/discord/utilities/locale/LocaleManager;-><init>()V
+    invoke-direct {v0}, Lcom/discord/utilities/locale/LocaleManager;-><init>()V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/locale/LocaleManager;->getPrimaryLocale(Landroid/content/Context;)Ljava/util/Locale;
-
     move-result-object v1
 
-    invoke-static {v1}, Landroid/text/TextUtils;->getLayoutDirectionFromLocale(Ljava/util/Locale;)I
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/locale/LocaleManager;->getPrimaryLocale(Landroid/content/Context;)Ljava/util/Locale;
 
-    move-result v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    invoke-static {v0}, Landroid/text/TextUtils;->getLayoutDirectionFromLocale(Ljava/util/Locale;)I
 
-    if-nez v1, :cond_0
+    move-result v0
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getRightPanelRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Landroid/widget/RelativeLayout;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v2}, Landroid/widget/RelativeLayout;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_6
+    if-eqz v2, :cond_6
 
-    check-cast v3, Landroid/view/ViewGroup$MarginLayoutParams;
+    check-cast v2, Landroid/view/ViewGroup$MarginLayoutParams;
 
-    const v4, 0x7f0701ed
+    const/16 v3, 0x8
 
-    if-eqz v1, :cond_1
+    invoke-static {v3}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
-    iget v5, v3, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
+    move-result v3
+
+    if-eqz v0, :cond_1
+
+    iget v4, v2, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v5
-
-    invoke-virtual {v5, v4}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v5
-
-    float-to-int v5, v5
+    move v4, v3
 
     :goto_1
-    if-eqz v1, :cond_2
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v4}, Landroid/content/res/Resources;->getDimension(I)F
-
-    move-result v1
-
-    float-to-int v1, v1
+    if-eqz v0, :cond_2
 
     goto :goto_2
 
     :cond_2
-    iget v1, v3, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
+    iget v3, v2, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
 
     :goto_2
-    iget v4, v3, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
+    iget v0, v2, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
 
-    iget v6, v3, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
+    iget v5, v2, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
 
-    invoke-virtual {v3, v5, v4, v1, v6}, Landroid/view/ViewGroup$MarginLayoutParams;->setMargins(IIII)V
+    invoke-virtual {v2, v4, v0, v3, v5}, Landroid/view/ViewGroup$MarginLayoutParams;->setMargins(IIII)V
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getRightPanelRoundedContainer()Lcom/discord/utilities/view/rounded/RoundedRelativeLayout;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v3}, Landroid/widget/RelativeLayout;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+    invoke-virtual {v0, v2}, Landroid/widget/RelativeLayout;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    new-instance v1, Landroidx/lifecycle/ViewModelProvider;
+    new-instance v0, Landroidx/lifecycle/ViewModelProvider;
 
-    new-instance v9, Lcom/discord/widgets/home/WidgetHomeViewModel$Factory;
+    new-instance v8, Lcom/discord/widgets/home/WidgetHomeViewModel$Factory;
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x7
 
-    const/4 v7, 0x7
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    move-object v2, v8
 
-    move-object v3, v9
+    invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/home/WidgetHomeViewModel$Factory;-><init>(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/stores/StoreLurking;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/home/WidgetHomeViewModel$Factory;-><init>(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/stores/StoreLurking;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, p0, v8}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    invoke-direct {v1, p0, v9}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    const-class v2, Lcom/discord/widgets/home/WidgetHomeViewModel;
 
-    const-class v3, Lcom/discord/widgets/home/WidgetHomeViewModel;
+    invoke-virtual {v0, v2}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
-    invoke-virtual {v1, v3}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    move-result-object v0
 
-    move-result-object v1
+    const-string v2, "ViewModelProvider(\n     \u2026omeViewModel::class.java)"
 
-    const-string v3, "ViewModelProvider(\n     \u2026omeViewModel::class.java)"
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    check-cast v0, Lcom/discord/widgets/home/WidgetHomeViewModel;
 
-    check-cast v1, Lcom/discord/widgets/home/WidgetHomeViewModel;
-
-    iput-object v1, p0, Lcom/discord/widgets/home/WidgetHome;->viewModel:Lcom/discord/widgets/home/WidgetHomeViewModel;
+    iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->viewModel:Lcom/discord/widgets/home/WidgetHomeViewModel;
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->setUpToolbar()V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_3
+    const/4 v2, 0x0
 
-    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
+    if-eqz v0, :cond_3
 
-    move-result-object v1
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
+
+    move-result-object v0
 
     goto :goto_3
 
     :cond_3
-    move-object v1, v0
+    move-object v0, v2
 
     :goto_3
-    instance-of v3, v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    instance-of v3, v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
     if-nez v3, :cond_4
 
-    move-object v1, v0
+    move-object v0, v2
 
     :cond_4
-    check-cast v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    check-cast v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
     sget-object v3, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-virtual {v1, v3, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
+    invoke-virtual {v0, v3, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
 
     :cond_5
-    new-instance v1, Lcom/discord/widgets/home/WidgetHomePanelNsfw;
+    new-instance v0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -2144,33 +2027,33 @@
 
     const-string v4, "childFragmentManager"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p1, v3}, Lcom/discord/widgets/home/WidgetHomePanelNsfw;-><init>(Landroid/view/View;Landroidx/fragment/app/FragmentManager;)V
+    invoke-direct {v0, p1, v3}, Lcom/discord/widgets/home/WidgetHomePanelNsfw;-><init>(Landroid/view/View;Landroidx/fragment/app/FragmentManager;)V
 
-    iput-object v1, p0, Lcom/discord/widgets/home/WidgetHome;->panelNsfw:Lcom/discord/widgets/home/WidgetHomePanelNsfw;
+    iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->panelNsfw:Lcom/discord/widgets/home/WidgetHomePanelNsfw;
 
-    new-instance v1, Lcom/discord/widgets/home/WidgetHomePanelLoading;
+    new-instance v0, Lcom/discord/widgets/home/WidgetHomePanelLoading;
 
-    invoke-direct {v1, p1}, Lcom/discord/widgets/home/WidgetHomePanelLoading;-><init>(Landroid/view/View;)V
+    invoke-direct {v0, p1}, Lcom/discord/widgets/home/WidgetHomePanelLoading;-><init>(Landroid/view/View;)V
 
-    iput-object v1, p0, Lcom/discord/widgets/home/WidgetHome;->panelLoading:Lcom/discord/widgets/home/WidgetHomePanelLoading;
+    iput-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->panelLoading:Lcom/discord/widgets/home/WidgetHomePanelLoading;
 
     iget-object p1, p0, Lcom/discord/widgets/home/WidgetHome;->onGuildListAddHintCreate:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHome;->getGuildListAddHint()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {p1, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     new-instance p1, Lcom/discord/widgets/home/WidgetHome$onViewBound$1;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/home/WidgetHome$onViewBound$1;-><init>(Lcom/discord/widgets/home/WidgetHome;)V
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p0, p1, v2, v1, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p0, p1, v1, v0, v2}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     sget-object p1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->Companion:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion;
 
@@ -2180,7 +2063,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
@@ -2193,20 +2076,13 @@
     return-void
 
     :cond_6
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_7
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2246,11 +2122,11 @@
     :cond_1
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHome;->viewModel:Lcom/discord/widgets/home/WidgetHomeViewModel;
 
-    const-string v1, "viewModel"
+    const-string/jumbo v1, "viewModel"
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -2370,29 +2246,29 @@
 
     sget-object v3, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v3, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v3, "filter { it != null }.map { it!! }"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v3, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4;->INSTANCE:Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$4;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
     const-string v0, "SurveyUtils\n        .get\u2026SurveyUtils.Survey.None }"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v5, Lcom/discord/widgets/home/WidgetHome;
 
@@ -2424,13 +2300,13 @@
 
     sget-object v3, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6;->INSTANCE:Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$6;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
     const-string v0, "StoreStream\n        .get\u2026 .filter { it.firstOpen }"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v5, 0x0
 
@@ -2478,13 +2354,13 @@
 
     sget-object v3, Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8;->INSTANCE:Lcom/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$8;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v3, "StoreStream\n        .get\u2026sUnreadUrgentMessages() }"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v2, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
@@ -2533,18 +2409,18 @@
     return-void
 
     :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
 
 .method public final setOnGuildListAddHintCreate(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -2556,20 +2432,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onGuildListAddHintCreate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/home/WidgetHome;->onGuildListAddHintCreate:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onGuildListAddHintCreate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final unreadCountView()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$HeaderData.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$HeaderData.smali
index 9efb14990c..3c6be5ce8b 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$HeaderData.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$HeaderData.smali
@@ -108,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;->title:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -118,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;->drawableRes:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
index f1e7fe6fd7..bddf85a650 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
@@ -89,11 +89,11 @@
 
     const-string v4, "menu.findItem(R.id.menu_chat_search)"
 
-    const v5, 0x7f0a05b4
+    const v5, 0x7f0a05ba
 
     const-string v6, "menu.findItem(R.id.menu_chat_side_panel)"
 
-    const v7, 0x7f0a05b5
+    const v7, 0x7f0a05bb
 
     if-eqz v3, :cond_3
 
@@ -114,7 +114,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -122,7 +122,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -133,7 +133,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -141,7 +141,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -152,7 +152,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -160,7 +160,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -197,7 +197,7 @@
     const/4 v3, 0x0
 
     :goto_2
-    const v4, 0x7f0a05b6
+    const v4, 0x7f0a05bc
 
     invoke-interface {p1, v4}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -205,7 +205,7 @@
 
     const-string v5, "menu.findItem(R.id.menu_chat_start_call)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1;->$this_getOnConfigureAction:Lcom/discord/widgets/home/WidgetHomeModel;
 
@@ -229,7 +229,7 @@
     :goto_3
     invoke-interface {v4, v5}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v4, 0x7f0a05b8
+    const v4, 0x7f0a05be
 
     invoke-interface {p1, v4}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -237,7 +237,7 @@
 
     const-string v5, "menu.findItem(R.id.menu_chat_start_video_call)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1;->$this_getOnConfigureAction:Lcom/discord/widgets/home/WidgetHomeModel;
 
@@ -269,7 +269,7 @@
     :goto_4
     invoke-interface {v4, v3}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v3, 0x7f0a05b9
+    const v3, 0x7f0a05bf
 
     invoke-interface {p1, v3}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -277,7 +277,7 @@
 
     const-string v3, "menu.findItem(R.id.menu_chat_stop_call)"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1;->$this_getOnConfigureAction:Lcom/discord/widgets/home/WidgetHomeModel;
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.smali
index a6763f4411..9e95662b55 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.smali
@@ -112,6 +112,10 @@
     move-result-object v0
 
     :goto_0
+    const-string v1, "channel?.guildId ?: 0L"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
@@ -157,27 +161,29 @@
 
 # virtual methods
 .method public call(Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 7
+    .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "menuItem"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "context"
 
-    new-instance v1, Lcom/discord/widgets/user/calls/PrivateCallLauncher;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
+    new-instance v0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;
 
-    invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+    iget-object v1, p0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
 
-    move-result-object v3
+    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    const-string v4, "appFragment.parentFragmentManager"
+    move-result-object v2
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v3, "appFragment.parentFragmentManager"
 
-    invoke-direct {v1, v2, v2, p2, v3}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, v1, v1, p2, v2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -205,7 +211,7 @@
 
     move-result-wide p1
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVideoCall(J)V
+    invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVideoCall(J)V
 
     goto :goto_0
 
@@ -221,7 +227,7 @@
 
     move-result-wide p1
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVoiceCall(J)V
+    invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVoiceCall(J)V
 
     goto :goto_0
 
@@ -238,47 +244,35 @@
     goto :goto_0
 
     :pswitch_6
-    sget-object v1, Lcom/discord/widgets/friends/WidgetFriendsAdd;->Companion:Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;
+    sget-object v0, Lcom/discord/widgets/friends/WidgetFriendsAdd;->Companion:Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v5, 0x2
+    const/4 v4, 0x2
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    const-string v4, "Toolbar"
+    const-string v3, "Toolbar"
 
-    move-object v2, p2
+    move-object v1, p2
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;->show$default(Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;->show$default(Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 
     :goto_0
     iget-object p1, p0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
 
     const/4 p2, 0x1
 
+    const/4 v0, 0x0
+
     invoke-static {p1, v0, p2, v0}, Lcom/discord/app/AppFragment;->hideKeyboard$default(Lcom/discord/app/AppFragment;Landroid/view/View;ILjava/lang/Object;)V
 
     return-void
 
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "menuItem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05b3
+    .packed-switch 0x7f0a05b9
         :pswitch_6
         :pswitch_5
         :pswitch_4
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager.smali
index d0ebe6f918..7b58b940b5 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager.smali
@@ -121,7 +121,7 @@
     move-result-object v2
 
     :cond_3
-    const p1, 0x7f0802f4
+    const p1, 0x7f0802f5
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -145,7 +145,7 @@
     move-result-object v2
 
     :cond_5
-    const p1, 0x7f08029f
+    const p1, 0x7f0802a0
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -158,7 +158,7 @@
     :cond_6
     new-instance v0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;
 
-    const p1, 0x7f12041a
+    const p1, 0x7f12041b
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -203,51 +203,53 @@
 
 # virtual methods
 .method public final configure(Lcom/discord/widgets/home/WidgetHome;Lcom/discord/widgets/home/WidgetHomeModel;)V
-    .locals 6
+    .locals 5
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "widgetHome"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_8
+    const-string v0, "model"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/home/WidgetHomeModel;->getType()I
 
-    move-result v1
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    if-eq v1, v2, :cond_0
-
-    invoke-virtual {p2}, Lcom/discord/widgets/home/WidgetHomeModel;->getType()I
-
-    move-result v1
-
-    if-eq v1, v3, :cond_0
-
-    invoke-virtual {p2}, Lcom/discord/widgets/home/WidgetHomeModel;->getType()I
-
-    move-result v1
-
-    invoke-static {v1}, Lcom/discord/models/domain/ModelChannel;->isGuildTextyType(I)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
+    move-result v0
 
     const/4 v1, 0x1
 
+    const/4 v2, 0x0
+
+    const/4 v3, 0x3
+
+    if-eq v0, v3, :cond_0
+
+    invoke-virtual {p2}, Lcom/discord/widgets/home/WidgetHomeModel;->getType()I
+
+    move-result v0
+
+    if-eq v0, v1, :cond_0
+
+    invoke-virtual {p2}, Lcom/discord/widgets/home/WidgetHomeModel;->getType()I
+
+    move-result v0
+
+    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->isGuildTextyType(I)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/home/WidgetHome;->lockCloseRightPanel(Z)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/home/WidgetHome;->lockCloseRightPanel(Z)V
 
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->bindToolbar()Lkotlin/Unit;
 
@@ -255,94 +257,94 @@
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    sget-object v2, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeHeaderManager;
+    sget-object v3, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeHeaderManager;
 
-    const-string v5, "it"
+    const-string v4, "it"
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, p2, v1}, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->getHeaderData(Lcom/discord/widgets/home/WidgetHomeModel;Landroid/content/Context;)Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;
+    invoke-direct {v3, p2, v0}, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->getHeaderData(Lcom/discord/widgets/home/WidgetHomeModel;Landroid/content/Context;)Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;->component1()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;->component1()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-virtual {v1}, Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;->component2()Ljava/lang/Integer;
+    invoke-virtual {v0}, Lcom/discord/widgets/home/WidgetHomeHeaderManager$HeaderData;->component2()Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v2, v1}, Lcom/discord/app/AppFragment;->setActionBarTitle(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
+    invoke-virtual {p1, v3, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(Ljava/lang/CharSequence;Ljava/lang/Integer;)Lkotlin/Unit;
 
     :cond_1
-    new-instance v1, Lcom/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1;
+    new-instance v0, Lcom/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1;
 
-    invoke-direct {v1, p2, p2, p1}, Lcom/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/home/WidgetHomeModel;Lcom/discord/widgets/home/WidgetHomeModel;Lcom/discord/widgets/home/WidgetHome;)V
+    invoke-direct {v0, p2, p2, p1}, Lcom/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/home/WidgetHomeModel;Lcom/discord/widgets/home/WidgetHomeModel;Lcom/discord/widgets/home/WidgetHome;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/app/AppFragment;->setActionBarTitleClick(Landroid/view/View$OnClickListener;)Lkotlin/Unit;
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppFragment;->setActionBarTitleClick(Landroid/view/View$OnClickListener;)Lkotlin/Unit;
 
-    const v1, 0x7f0e0006
+    const v0, 0x7f0e0006
 
-    sget-object v2, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeHeaderManager;
+    sget-object v3, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeHeaderManager;
 
     invoke-virtual {p1}, Lcom/discord/widgets/home/WidgetHome;->getPanelLayout()Lcom/discord/widgets/home/PanelLayout;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-direct {v2, p2, p1, v5}, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->getOnSelectedAction(Lcom/discord/widgets/home/WidgetHomeModel;Lcom/discord/app/AppFragment;Lcom/discord/widgets/home/PanelLayout;)Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1;
+    invoke-direct {v3, p2, p1, v4}, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->getOnSelectedAction(Lcom/discord/widgets/home/WidgetHomeModel;Lcom/discord/app/AppFragment;Lcom/discord/widgets/home/PanelLayout;)Lcom/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1;
 
-    move-result-object v2
+    move-result-object v3
 
-    sget-object v5, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeHeaderManager;
+    sget-object v4, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeHeaderManager;
 
-    invoke-direct {v5, p2}, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->getOnConfigureAction(Lcom/discord/widgets/home/WidgetHomeModel;)Lrx/functions/Action1;
+    invoke-direct {v4, p2}, Lcom/discord/widgets/home/WidgetHomeHeaderManager;->getOnConfigureAction(Lcom/discord/widgets/home/WidgetHomeModel;)Lrx/functions/Action1;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {p1, v1, v2, v5}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
+    invoke-virtual {p1, v0, v3, v4}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-virtual {p2}, Lcom/discord/widgets/home/WidgetHomeModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isDM()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isDM()Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_2
+    if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isSystemDM()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isSystemDM()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_1
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getActionBarTitleLayout()Lcom/discord/views/ToolbarTitleLayout;
 
-    move-result-object v2
+    move-result-object v3
 
-    if-eqz v2, :cond_3
+    if-eqz v3, :cond_3
 
     invoke-virtual {p2}, Lcom/discord/widgets/home/WidgetHomeModel;->getDmPresence()Lcom/discord/models/domain/ModelPresence;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-virtual {v2, v5, v1}, Lcom/discord/views/ToolbarTitleLayout;->a(Lcom/discord/models/domain/ModelPresence;Z)V
+    invoke-virtual {v3, v4, v0}, Lcom/discord/views/ToolbarTitleLayout;->a(Lcom/discord/models/domain/ModelPresence;Z)V
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/widgets/home/WidgetHome;->unreadCountView()Landroid/widget/TextView;
@@ -361,17 +363,19 @@
 
     invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
 
-    move-result v1
+    move-result v0
 
-    if-lez v1, :cond_4
+    if-lez v0, :cond_4
 
     goto :goto_2
 
     :cond_4
-    const/4 v3, 0x0
+    const/4 v1, 0x0
 
     :goto_2
-    if-eqz v3, :cond_5
+    const/4 v0, 0x0
+
+    if-eqz v1, :cond_5
 
     goto :goto_3
 
@@ -394,18 +398,4 @@
 
     :cond_7
     return-void
-
-    :cond_8
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "widgetHome"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali
index a542dbbfa1..ae7e00c04e 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali
@@ -39,7 +39,24 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func8<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelPresence;",
+        ">;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Integer;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Lcom/discord/widgets/home/WidgetHomeModel;",
+        ">;"
     }
 .end annotation
 
@@ -121,7 +138,7 @@
 
     move-object v4, p3
 
-    invoke-static {v3, p3}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v3, p3}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -133,19 +150,19 @@
     move-object v3, v2
 
     :goto_1
-    const-string v4, "unreadCount"
+    const-string/jumbo v4, "unreadCount"
 
     move-object/from16 v5, p5
 
-    invoke-static {v5, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p5 .. p5}, Ljava/lang/Integer;->intValue()I
 
     move-result v4
 
-    const-string v5, "userRelationships"
+    const-string/jumbo v5, "userRelationships"
 
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_2
 
@@ -223,7 +240,7 @@
 
     move-object/from16 v8, p7
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p7 .. p7}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali
index eef1b1c6ed..3c3b2353bb 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali
@@ -142,7 +142,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026.MILLISECONDS\n          )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -154,7 +154,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -186,7 +186,7 @@
 
     const-string v1, "StoreStream\n          .i\u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali
index 4d7f3b72b1..7bb9cb6057 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali
@@ -343,7 +343,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeModel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -353,7 +353,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeModel;->dmPresence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -387,7 +387,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeModel;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -656,7 +656,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading$configure$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading$configure$1.smali
index 59d5e940f2..b001a0e340 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading$configure$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading$configure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHomePanelLoading$configure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHomePanelLoading.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading.smali
index 51b0f76b02..9741fc3963 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelLoading.smali
@@ -43,58 +43,51 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const v0, 0x7f0a04cf
+    const v0, 0x7f0a04d5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v0
 
-    const-string v1, "view.findViewById(R.id.home_panel_loading)"
+    const-string/jumbo v1, "view.findViewById(R.id.home_panel_loading)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelLoading;->panelLoading:Landroid/view/View;
 
-    const v0, 0x7f0a04d0
+    const v0, 0x7f0a04d6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v0
 
-    const-string v1, "view.findViewById(R.id.home_panel_loading_logo)"
+    const-string/jumbo v1, "view.findViewById(R.id.home_panel_loading_logo)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelLoading;->panelLoadingLogo:Landroid/view/View;
 
-    const v0, 0x7f0a04c3
+    const v0, 0x7f0a04c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v0, "view.findViewById(R.id.home_panel_center)"
+    const-string/jumbo v0, "view.findViewById(R.id.home_panel_center)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/home/WidgetHomePanelLoading;->panelCenter:Landroid/view/View;
 
     invoke-direct {p0}, Lcom/discord/widgets/home/WidgetHomePanelLoading;->centerLogoRelativeToLoadingScreen()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$setLoadingPanelVisibility(Lcom/discord/widgets/home/WidgetHomePanelLoading;ZZ)V
@@ -126,7 +119,7 @@
 
     const-string v2, "panelLoadingLogo.resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/display/DisplayUtils;->getStatusBarHeight(Landroid/content/res/Resources;)I
 
@@ -157,11 +150,11 @@
     return-void
 
     :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type android.widget.FrameLayout.LayoutParams"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -272,24 +265,30 @@
 .method public final configure(Lcom/discord/app/AppFragment;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "fragment"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/home/WidgetHomeModel;->Companion:Lcom/discord/widgets/home/WidgetHomeModel$Companion;
+    sget-object v0, Lcom/discord/widgets/home/WidgetHomeModel;->Companion:Lcom/discord/widgets/home/WidgetHomeModel$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/home/WidgetHomeModel$Companion;->getInitialized()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/widgets/home/WidgetHomeModel$Companion;->getInitialized()Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
     const-class v4, Lcom/discord/widgets/home/WidgetHomePanelLoading;
 
+    new-instance v9, Lcom/discord/widgets/home/WidgetHomePanelLoading$configure$1;
+
+    invoke-direct {v9, p0}, Lcom/discord/widgets/home/WidgetHomePanelLoading$configure$1;-><init>(Lcom/discord/widgets/home/WidgetHomePanelLoading;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -298,10 +297,6 @@
 
     const/4 v8, 0x0
 
-    new-instance v9, Lcom/discord/widgets/home/WidgetHomePanelLoading$configure$1;
-
-    invoke-direct {v9, p0}, Lcom/discord/widgets/home/WidgetHomePanelLoading$configure$1;-><init>(Lcom/discord/widgets/home/WidgetHomePanelLoading;)V
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -315,11 +310,4 @@
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/home/WidgetHomePanelLoading;->setLoadingPanelVisibility(ZZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.smali
index 0992e9f9b8..b4537e78c2 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.smali
@@ -71,6 +71,10 @@
     move-result-object v0
 
     :goto_0
+    const-string v1, "model.channel?.guildId ?: 0L"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.smali
index 52fc42692d..ebc4b914e8 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.smali
@@ -71,6 +71,10 @@
     move-result-object v0
 
     :goto_0
+    const-string v1, "model.channel?.guildId ?: 0L"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v0
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali
index 9d6d8d223f..f422b2887f 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali
index 419a1f1269..8d48a8a1e7 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali
@@ -13,9 +13,6 @@
 
 # static fields
 .field public static final Companion:Lcom/discord/widgets/home/WidgetHomePanelNsfw$Companion;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-.end field
 
 .field public static final HIDE_DELAY_MILLIS:J = 0x1f4L
 
@@ -70,11 +67,13 @@
 .method public constructor <init>(Landroid/view/View;Landroidx/fragment/app/FragmentManager;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -92,7 +91,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwStore:Lcom/discord/stores/StoreGuildsNsfw;
 
-    const p2, 0x7f0a04c7
+    const p2, 0x7f0a04cd
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -115,20 +114,6 @@
     iput-object p1, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwHideRunnable:Ljava/lang/Runnable;
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getGuildsNsfwStore$p(Lcom/discord/widgets/home/WidgetHomePanelNsfw;)Lcom/discord/stores/StoreGuildsNsfw;
@@ -162,9 +147,9 @@
 
     const-string v1, "fragmentManager.get() ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a0a93
+    const v1, 0x7f0a0a98
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
@@ -174,7 +159,7 @@
 
     const-string v2, "fragmentManager.findFrag\u2026dget_chat_list) ?: return"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
 
@@ -182,7 +167,7 @@
 
     const-string v2, "fragmentManager.beginTransaction()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -311,7 +296,7 @@
 
     invoke-virtual {p1}, Landroid/view/View;->requestApplyInsets()V
 
-    const v0, 0x7f0a04ca
+    const v0, 0x7f0a04d0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -321,7 +306,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwAcceptView:Landroid/widget/Button;
 
-    const v0, 0x7f0a04cb
+    const v0, 0x7f0a04d1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -331,7 +316,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwRejectView:Landroid/widget/Button;
 
-    const v0, 0x7f0a04c9
+    const v0, 0x7f0a04cf
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -341,7 +326,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwImageView:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a04cd
+    const v0, 0x7f0a04d3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -351,7 +336,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwTitleView:Landroid/widget/TextView;
 
-    const v0, 0x7f0a04cc
+    const v0, 0x7f0a04d2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -379,7 +364,7 @@
 
     if-eqz p2, :cond_4
 
-    const p3, 0x7f08046e
+    const p3, 0x7f080471
 
     invoke-virtual {p2, p3}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -418,9 +403,9 @@
 
     move-result-object v3
 
-    const-string p3, "view.context"
+    const-string/jumbo p3, "view.context"
 
-    invoke-static {v3, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p3, 0x7f1200ce
 
@@ -506,7 +491,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "model"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwHideHandler:Landroid/os/Handler;
 
@@ -555,21 +542,14 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final dispatchApplyWindowInsets(Landroidx/core/view/WindowInsetsCompat;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "insets"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwContainerView:Landroid/view/View;
 
@@ -579,15 +559,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final unbind()V
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$1.smali
index e4a90b84ab..99053f74cf 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHomeViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHomeViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "storeState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/home/WidgetHomeViewModel;->access$handleStoreState(Lcom/discord/widgets/home/WidgetHomeViewModel;Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;)V
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$2.smali
index 7ea64d41a2..1437f2e7ad 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHomeViewModel$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetHomeViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreNavigation$PanelAction;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/stores/StoreNavigation$PanelAction;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHomeViewModel$2;->this$0:Lcom/discord/widgets/home/WidgetHomeViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/home/WidgetHomeViewModel;->access$handleNavDrawerAction(Lcom/discord/widgets/home/WidgetHomeViewModel;Lcom/discord/stores/StoreNavigation$PanelAction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$1.smali
index 8082a037b4..9c600aa94c 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/panels/PanelState;",
+        "Lcom/discord/panels/PanelState;",
+        "Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;",
+        "Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -68,15 +72,15 @@
 
     const-string v1, "leftPanelState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "rightPanelState"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "guildInfo"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;)V
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1$1.smali
index a6e34685a3..3e6f55865b 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetHomeViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;",
+        ">;"
     }
 .end annotation
 
@@ -56,7 +58,7 @@
 
     const-string v2, "selectedGuildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -64,7 +66,7 @@
 
     const-string v3, "isLurking"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1.smali
index 752931a066..eb37a8e7c5 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetHomeViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;",
             ">;"
         }
@@ -82,7 +85,7 @@
 
     const-string v1, "selectedGuildId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -96,7 +99,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1$1;-><init>(Ljava/lang/Long;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory.smali
index d49e184e72..563707d377 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$Factory.smali
@@ -49,13 +49,17 @@
 .method public constructor <init>(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/stores/StoreLurking;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeNavigation"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeGuildSelected"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeLurking"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,27 +70,6 @@
     iput-object p3, p0, Lcom/discord/widgets/home/WidgetHomeViewModel$Factory;->storeLurking:Lcom/discord/stores/StoreLurking;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeLurking"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeGuildSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/stores/StoreLurking;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -159,7 +142,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/home/WidgetHomeViewModel$Factory$observeStoreState$guildInfoObservable$1;-><init>(Lcom/discord/widgets/home/WidgetHomeViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -183,7 +166,7 @@
 
     const-string v1, "Observable.combineLatest\u2026ildInfo\n        )\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -202,7 +185,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/home/WidgetHomeViewModel;
 
@@ -221,13 +206,4 @@
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/home/WidgetHomeViewModel;-><init>(Lcom/discord/stores/StoreNavigation;Lrx/Observable;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$StoreState.smali
index cbd376fcd6..d2543bb85c 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$StoreState.smali
@@ -26,13 +26,17 @@
 .method public constructor <init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "rightPanelState"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildInfo"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,27 +47,6 @@
     iput-object p3, p0, Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;->guildInfo:Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rightPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "leftPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;ILjava/lang/Object;)Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;
@@ -126,40 +109,23 @@
 .method public final copy(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;)Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "rightPanelState"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildInfo"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rightPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "leftPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -177,7 +143,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;->leftPanelState:Lcom/discord/panels/PanelState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -187,7 +153,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;->rightPanelState:Lcom/discord/panels/PanelState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -197,7 +163,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/home/WidgetHomeViewModel$StoreState;->guildInfo:Lcom/discord/widgets/home/WidgetHomeViewModel$GuildInfo;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$ViewState.smali
index e45001f96f..d3bc2af569 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel$ViewState.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "rightPanelState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;->rightPanelState:Lcom/discord/panels/PanelState;
 
     return-void
-
-    :cond_0
-    const-string p1, "rightPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "leftPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;ILjava/lang/Object;)Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;
@@ -98,31 +86,19 @@
 .method public final copy(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;)Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "rightPanelState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "rightPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "leftPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;->leftPanelState:Lcom/discord/panels/PanelState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;->rightPanelState:Lcom/discord/panels/PanelState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel.smali
index eebb6bd363..ce9614a0f9 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/home/WidgetHomeViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetHomeViewModel.kt"
 
 
@@ -16,7 +16,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;",
         ">;"
     }
@@ -61,7 +61,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreNavigation;Lrx/Observable;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -75,21 +75,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeNavigation"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeStateObservable"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;
+    const-string v0, "navPanelActionObservable"
 
-    sget-object v2, Lcom/discord/panels/PanelState$a;->a:Lcom/discord/panels/PanelState$a;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, v2, v2}, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;)V
+    new-instance v0, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    sget-object v1, Lcom/discord/panels/PanelState$a;->a:Lcom/discord/panels/PanelState$a;
+
+    invoke-direct {v0, v1, v1}, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;)V
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/home/WidgetHomeViewModel;->storeNavigation:Lcom/discord/stores/StoreNavigation;
 
@@ -111,15 +115,23 @@
 
     const-string p2, "storeStateObservable\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHomeViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/home/WidgetHomeViewModel;
+
+    new-instance v6, Lcom/discord/widgets/home/WidgetHomeViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/home/WidgetHomeViewModel$1;-><init>(Lcom/discord/widgets/home/WidgetHomeViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -127,54 +139,27 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/home/WidgetHomeViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/home/WidgetHomeViewModel$1;-><init>(Lcom/discord/widgets/home/WidgetHomeViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, 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
 
     iget-object p1, p0, Lcom/discord/widgets/home/WidgetHomeViewModel;->navPanelActionObservable:Lrx/Observable;
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-class v2, Lcom/discord/widgets/home/WidgetHomeViewModel;
+    const-class v1, Lcom/discord/widgets/home/WidgetHomeViewModel;
 
-    new-instance v7, Lcom/discord/widgets/home/WidgetHomeViewModel$2;
+    new-instance v6, Lcom/discord/widgets/home/WidgetHomeViewModel$2;
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/home/WidgetHomeViewModel$2;-><init>(Lcom/discord/widgets/home/WidgetHomeViewModel;)V
+    invoke-direct {v6, p0}, Lcom/discord/widgets/home/WidgetHomeViewModel$2;-><init>(Lcom/discord/widgets/home/WidgetHomeViewModel;)V
 
-    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
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "navPanelActionObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreNavigation;Lrx/Observable;Lrx/Observable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -335,7 +320,7 @@
 
     invoke-direct {v4, v0, v1}, Lcom/discord/widgets/home/WidgetHomeViewModel$ViewState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/panels/PanelState;)V
 
-    invoke-virtual {p0, v4}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v4}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     if-eqz p1, :cond_0
 
@@ -386,7 +371,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -394,43 +379,29 @@
 .method public final onEndPanelStateChange(Lcom/discord/panels/PanelState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHomeViewModel;->storeNavigation:Lcom/discord/stores/StoreNavigation;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreNavigation;->setRightPanelState(Lcom/discord/panels/PanelState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onStartPanelStateChange(Lcom/discord/panels/PanelState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "panelState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/home/WidgetHomeViewModel;->storeNavigation:Lcom/discord/stores/StoreNavigation;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreNavigation;->setLeftPanelState(Lcom/discord/panels/PanelState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "panelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setWidgetHomeModel$app_productionDiscordExternalRelease(Lcom/discord/widgets/home/WidgetHomeModel;)V
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$Companion.smali b/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$Companion.smali
index 25321af562..69e26cc4fe 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$Companion.smali
@@ -51,13 +51,17 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "surveyId"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "surveyUrl"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
 
@@ -80,12 +84,16 @@
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f120fec
+    const p2, 0x7f121016
 
     invoke-virtual {v0, p2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object p4
 
+    const-string p2, "getString(R.string.notice_survey_prompt)"
+
+    invoke-static {p4, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     :goto_0
     const-string p2, "extra_survey_body"
 
@@ -98,25 +106,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "surveyUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "surveyId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$onViewBound$2.smali
index a69ce64a72..002b0ab068 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog$onViewBound$2.smali
@@ -47,7 +47,7 @@
 
     const-string v2, "button.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog.smali
index 2bcc6152ee..03c1c79979 100644
--- a/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog.smali
+++ b/com.discord/smali/com/discord/widgets/home/WidgetMainSurveyDialog.smali
@@ -41,81 +41,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
+    const-string v2, "dialogHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dialogHeader"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDialogHeader()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "dialogText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDialogText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dialogText"
-
-    const-string v4, "getDialogText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
+    const-string v2, "buttonConfirm"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getButtonConfirm()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buttonConfirm"
-
-    const-string v4, "getButtonConfirm()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
 
-    const-class v2, Lcom/discord/widgets/home/WidgetMainSurveyDialog;
+    const-string v2, "buttonCancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getButtonCancel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buttonCancel"
-
-    const-string v4, "getButtonCancel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -139,7 +115,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0a35
+    const v0, 0x7f0a0a39
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +123,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetMainSurveyDialog;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a36
+    const v0, 0x7f0a0a3a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,7 +131,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetMainSurveyDialog;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a34
+    const v0, 0x7f0a0a38
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +139,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/home/WidgetMainSurveyDialog;->buttonConfirm$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a33
+    const v0, 0x7f0a0a37
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -267,9 +243,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -277,6 +253,8 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_0
 
     const-string v1, "extra_survey_url"
@@ -369,7 +347,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120feb
+    const v3, 0x7f121015
 
     invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -387,7 +365,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120fa5
+    const v2, 0x7f120fcf
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -409,7 +387,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f12107e
+    const v2, 0x7f1210a8
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -438,11 +416,4 @@
     invoke-virtual {p0}, Lcom/discord/app/AppDialog;->dismiss()V
 
     return-void
-
-    :cond_9
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
index 62e50d8728..2b5ae3b61f 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$Companion.smali
@@ -36,23 +36,27 @@
 .method public final launch(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Lcom/discord/models/domain/ModelMessageEmbed;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_5
+    const-string v0, "embed"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelMessageEmbed;->getImage()Lcom/discord/models/domain/ModelMessageEmbed$Item;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelMessageEmbed;->getVideo()Lcom/discord/models/domain/ModelMessageEmbed$Item;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_0
+    const/4 v2, 0x0
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getProxyUrl()Ljava/lang/String;
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getProxyUrl()Ljava/lang/String;
 
     move-result-object v3
 
@@ -61,34 +65,34 @@
     goto :goto_0
 
     :cond_0
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getUrl()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getUrl()Ljava/lang/String;
 
     move-result-object v3
 
     goto :goto_0
 
     :cond_1
-    move-object v3, v0
+    move-object v3, v2
 
     :goto_0
     if-eqz v3, :cond_2
 
-    const-string v0, "javaClass"
+    const-string v1, "javaClass"
 
-    invoke-static {p4, v3, v0}, Ld0/a/b/b/a;->t(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/player/MediaSource;
+    invoke-static {p4, v3, v1}, Le0/a/b/b/a;->t(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/player/MediaSource;
 
-    move-result-object v0
+    move-result-object v2
 
     :cond_2
     new-instance p4, Landroid/content/Intent;
 
     invoke-direct {p4}, Landroid/content/Intent;-><init>()V
 
-    const-string v2, "INTENT_TITLE"
+    const-string v1, "INTENT_TITLE"
 
-    invoke-virtual {p4, v2, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
+    invoke-virtual {p4, v1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
     move-result-object p2
 
@@ -99,22 +103,22 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getUrl()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getUrl()Ljava/lang/String;
 
     move-result-object p3
 
     :goto_1
-    const-string v2, "INTENT_MEDIA_URL"
+    const-string v1, "INTENT_MEDIA_URL"
 
-    invoke-virtual {p2, v2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
+    invoke-virtual {p2, v1, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
     move-result-object p2
 
-    invoke-static {v1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getProxyUrl()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getProxyUrl()Ljava/lang/String;
 
     move-result-object p3
 
@@ -123,7 +127,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getUrl()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getUrl()Ljava/lang/String;
 
     move-result-object p3
 
@@ -134,7 +138,7 @@
 
     move-result-object p2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getWidth()I
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getWidth()I
 
     move-result p3
 
@@ -144,7 +148,7 @@
 
     move-result-object p2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getHeight()I
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed$Item;->getHeight()I
 
     move-result p3
 
@@ -156,31 +160,17 @@
 
     const-string p3, "INTENT_MEDIA_SOURCE"
 
-    invoke-virtual {p2, p3, v0}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
+    invoke-virtual {p2, p3, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
 
     move-result-object p2
 
     const-string p3, "Intent()\n          .putE\u2026EDIA_SOURCE, mediaSource)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/media/WidgetMedia;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_5
-    const-string p1, "embed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali
index e8f35a03f6..99e9e17888 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "animator"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
@@ -116,11 +116,11 @@
     return-void
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Float"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$2.smali
index 927651fa07..60cb31703d 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$2.smali
@@ -34,20 +34,15 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "animation"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/media/WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
+    const/4 v0, 0x0
+
     invoke-static {p1, v0}, Lcom/discord/widgets/media/WidgetMedia;->access$setControlsAnimationAction$p(Lcom/discord/widgets/media/WidgetMedia;Lcom/discord/widgets/media/WidgetMedia$ControlsAnimationAction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.smali
index 679687f747..1aaee6ba22 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.smali
@@ -201,7 +201,9 @@
 .method public onDoubleTapEvent(Landroid/view/MotionEvent;)Z
     .locals 13
 
-    if-eqz p1, :cond_a
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia$configureMediaImage$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
@@ -460,28 +462,21 @@
     return v12
 
     :cond_9
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.facebook.samples.zoomable.AbstractAnimatedZoomableController"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_a
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
 
 .method public onSingleTapConfirmed(Landroid/view/MotionEvent;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/media/WidgetMedia$configureMediaImage$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
@@ -490,15 +485,6 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setMDoubleTapScale(F)V
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.smali
index 371bbe517e..55f7f00033 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetMedia.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/player/AppMediaPlayer$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/player/AppMediaPlayer$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/media/WidgetMedia;->access$handlePlayerEvent(Lcom/discord/widgets/media/WidgetMedia;Lcom/discord/player/AppMediaPlayer$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 3d8f7f254e..c4b7ae14cc 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetMedia.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1;->this$0:Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1;
 
@@ -81,7 +83,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
-    const v1, 0x7f1205cf
+    const v1, 0x7f1205d1
 
     const/4 v2, 0x1
 
@@ -97,17 +99,8 @@
 
     const/4 v1, 0x4
 
-    invoke-static {v0, p1, v3, v1}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    invoke-static {v0, p1, v3, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 1f946b2a9c..a836b6d0a1 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetMedia.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Throwable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2;->this$0:Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1;
 
@@ -81,7 +83,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
-    const v0, 0x7f1205ce
+    const v0, 0x7f1205d0
 
     invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -91,17 +93,8 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali
index e1e68e8662..320f00cce3 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1.smali
@@ -49,7 +49,7 @@
 
     const-string v2, "downloadUri"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1;->this$0:Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;
 
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.smali
index 04548d71b2..c5ac684a9c 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.smali
@@ -70,7 +70,7 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -89,7 +89,7 @@
     goto :goto_0
 
     :pswitch_0
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->$sourceUri:Landroid/net/Uri;
 
@@ -97,7 +97,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p1, v3, v0, v3}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent$default(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 
@@ -115,7 +115,7 @@
     goto :goto_0
 
     :pswitch_2
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->$sourceUri:Landroid/net/Uri;
 
@@ -123,7 +123,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p1, v3, v0, v3}, Lcom/discord/utilities/uri/UriHandler;->handleOrUntrusted$default(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 
@@ -131,7 +131,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05c6
+    .packed-switch 0x7f0a05cc
         :pswitch_2
         :pswitch_1
         :pswitch_0
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$1.smali
index 0495a1694f..7460b11520 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/media/WidgetMedia$showControls$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetMedia.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/media/WidgetMedia$showControls$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/media/WidgetMedia;->access$setControlsVisibilitySubscription$p(Lcom/discord/widgets/media/WidgetMedia;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$2.smali
index 365eccbcc1..8b07021972 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$2.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$showControls$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/media/WidgetMedia$showControls$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetMedia.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
index 4c92cbb180..05057b6651 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
@@ -78,121 +78,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetMedia;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
 
-    const/4 v2, 0x0
+    const-string v2, "actionBar"
 
-    aput-object v1, v0, v2
+    const-string v3, "getActionBar()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetMedia;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "actionBar"
-
-    const-string v4, "getActionBar()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetMedia;
+    const-string v2, "mediaImage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMediaImage()Lcom/facebook/samples/zoomable/ZoomableDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mediaImage"
-
-    const-string v4, "getMediaImage()Lcom/facebook/samples/zoomable/ZoomableDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetMedia;
+    const-string v2, "playerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlayerView()Lcom/google/android/exoplayer2/ui/PlayerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "playerView"
-
-    const-string v4, "getPlayerView()Lcom/google/android/exoplayer2/ui/PlayerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetMedia;
+    const-string v2, "playerControlView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlayerControlView()Lcom/google/android/exoplayer2/ui/PlayerControlView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "playerControlView"
-
-    const-string v4, "getPlayerControlView()Lcom/google/android/exoplayer2/ui/PlayerControlView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetMedia;
+    const-string v2, "mediaLoadingIndicator"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMediaLoadingIndicator()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mediaLoadingIndicator"
-
-    const-string v4, "getMediaLoadingIndicator()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -216,7 +180,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0a9c
+    const v0, 0x7f0a0aa1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -232,7 +196,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->actionBar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a9d
+    const v0, 0x7f0a0aa2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -240,7 +204,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->mediaImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0aa0
+    const v0, 0x7f0a0aa5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -248,7 +212,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->playerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a9f
+    const v0, 0x7f0a0aa4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->g(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -256,7 +220,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/media/WidgetMedia;->playerControlView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a9e
+    const v0, 0x7f0a0aa3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -462,7 +426,7 @@
 
     const-string v3, "ScalingUtils.ScaleType.FIT_CENTER"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v2}, Lcom/discord/utilities/images/MGImages;->setScaleType(Landroid/widget/ImageView;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
 
@@ -484,7 +448,7 @@
 
     const-string v2, "mediaImage.context"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/media/WidgetMedia;->imageUri:Landroid/net/Uri;
 
@@ -523,7 +487,7 @@
     :cond_0
     const-string v0, "imageUri"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -613,7 +577,7 @@
 
     const-string v2, ".gif"
 
-    invoke-static {v0, v2, v3, v1}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v0, v2, v3, v1}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v0
 
@@ -784,7 +748,7 @@
 
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$b;->a:Lcom/discord/player/AppMediaPlayer$Event$b;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -797,7 +761,7 @@
     :cond_0
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$a;->a:Lcom/discord/player/AppMediaPlayer$Event$a;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -805,7 +769,7 @@
 
     const/4 v2, 0x0
 
-    const-string v3, "viewModel"
+    const-string/jumbo v3, "viewModel"
 
     if-eqz v0, :cond_2
 
@@ -828,7 +792,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -850,14 +814,14 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_4
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$d;->a:Lcom/discord/player/AppMediaPlayer$Event$d;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -876,14 +840,14 @@
     goto :goto_0
 
     :cond_5
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_6
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$f;->a:Lcom/discord/player/AppMediaPlayer$Event$f;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -900,14 +864,14 @@
     goto :goto_0
 
     :cond_7
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_8
     sget-object v0, Lcom/discord/player/AppMediaPlayer$Event$e;->a:Lcom/discord/player/AppMediaPlayer$Event$e;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -969,7 +933,7 @@
 
     const-string v1, "this"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/media/WidgetMedia;->configureAndStartControlsAnimation(Landroid/animation/ValueAnimator;)V
 
@@ -1093,7 +1057,7 @@
 
     const-string v2, "Observable.timer(SHOW_CO\u2026S, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -1176,7 +1140,7 @@
 
     const-string v1, "this"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/media/WidgetMedia;->configureAndStartControlsAnimation(Landroid/animation/ValueAnimator;)V
 
@@ -1225,7 +1189,7 @@
     :cond_0
     const-string v0, "appMediaPlayer"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1285,7 +1249,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1294,7 +1258,7 @@
     return-void
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1302,9 +1266,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1312,15 +1276,15 @@
 
     invoke-direct {p1, p0}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;)V
 
-    const-class v1, Lcom/discord/widgets/media/WidgetMediaViewModel;
+    const-class v0, Lcom/discord/widgets/media/WidgetMediaViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(this)\n\u2026diaViewModel::class.java)"
+    const-string v0, "ViewModelProvider(this)\n\u2026diaViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/media/WidgetMediaViewModel;
 
@@ -1330,9 +1294,9 @@
 
     move-result-object p1
 
-    const-string v1, "requireContext()"
+    const-string v0, "requireContext()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/a/g/i;->a(Landroid/content/Context;)Lcom/discord/player/AppMediaPlayer;
 
@@ -1346,11 +1310,13 @@
 
     move-result p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x4
+    const/4 v1, 0x4
 
-    invoke-static {p0, p1, v1, v2, v0}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColor$default(Landroidx/fragment/app/Fragment;IZILjava/lang/Object;)V
+    const/4 v2, 0x0
+
+    invoke-static {p0, p1, v0, v1, v2}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColor$default(Landroidx/fragment/app/Fragment;IZILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/media/WidgetMedia;->getPlayerView()Lcom/google/android/exoplayer2/ui/PlayerView;
 
@@ -1406,13 +1372,6 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1426,7 +1385,7 @@
 
     const/4 v7, 0x0
 
-    const-string v8, "viewModel"
+    const-string/jumbo v8, "viewModel"
 
     if-eqz v0, :cond_12
 
@@ -1495,7 +1454,7 @@
 
     const-string v1, "Uri.parse(mostRecentInte\u2026gExtra(INTENT_IMAGE_URL))"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, v6, Lcom/discord/widgets/media/WidgetMedia;->imageUri:Landroid/net/Uri;
 
@@ -1568,7 +1527,7 @@
 
     if-eqz v4, :cond_6
 
-    invoke-static {v4}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v4}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -1602,7 +1561,7 @@
     :goto_5
     invoke-static {v6, v9, v10, v7}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f1217ad
+    const v0, 0x7f1217d9
 
     invoke-virtual {v6, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1698,7 +1657,7 @@
     goto :goto_6
 
     :cond_9
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
@@ -1745,27 +1704,27 @@
     goto :goto_7
 
     :cond_b
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
     :cond_c
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
     :cond_d
-    invoke-static {v8}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v8}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
     :cond_e
-    invoke-static {v8}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v8}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
     :cond_f
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
@@ -1776,12 +1735,12 @@
     :cond_11
     const-string v0, "imageUri"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
     :cond_12
-    invoke-static {v8}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v8}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$Companion.smali b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$Companion.smali
index 83e824e331..34cf37c9a8 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$Companion.smali
@@ -51,7 +51,9 @@
 .method public final launch(Landroid/content/Context;Z)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -67,20 +69,11 @@
 
     const-string v0, "Intent(Intent.ACTION_VIE\u2026_HELP_CHIP, showHelpChip)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/media/WidgetQRScanner;
 
-    invoke-static {p1, v0, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$onViewBoundOrOnResume$1.smali
index 177da03f8d..d97731f3c7 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner$onViewBoundOrOnResume$1.smali
@@ -43,18 +43,18 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lm0/a/a/a/a;->h:Lm0/a/a/a/c;
+    iget-object v1, v0, Ln0/a/a/a/a;->h:Ln0/a/a/a/c;
 
     if-nez v1, :cond_0
 
-    new-instance v1, Lm0/a/a/a/c;
+    new-instance v1, Ln0/a/a/a/c;
 
-    invoke-direct {v1, v0}, Lm0/a/a/a/c;-><init>(Lm0/a/a/a/a;)V
+    invoke-direct {v1, v0}, Ln0/a/a/a/c;-><init>(Ln0/a/a/a/a;)V
 
-    iput-object v1, v0, Lm0/a/a/a/a;->h:Lm0/a/a/a/c;
+    iput-object v1, v0, Ln0/a/a/a/a;->h:Ln0/a/a/a/c;
 
     :cond_0
-    iget-object v0, v0, Lm0/a/a/a/a;->h:Lm0/a/a/a/c;
+    iget-object v0, v0, Ln0/a/a/a/a;->h:Ln0/a/a/a/c;
 
     if-eqz v0, :cond_1
 
@@ -66,11 +66,11 @@
 
     invoke-direct {v1, v2}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
 
-    new-instance v2, Lm0/a/a/a/b;
+    new-instance v2, Ln0/a/a/a/b;
 
     const/4 v3, 0x0
 
-    invoke-direct {v2, v0, v3}, Lm0/a/a/a/b;-><init>(Lm0/a/a/a/c;I)V
+    invoke-direct {v2, v0, v3}, Ln0/a/a/a/b;-><init>(Ln0/a/a/a/c;I)V
 
     invoke-virtual {v1, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali
index 38daf9091a..823844541f 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali
@@ -38,41 +38,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/media/WidgetQRScanner;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetQRScanner;
+    const-string v2, "helpChip"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHelpChip()Lcom/google/android/material/chip/Chip;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "helpChip"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHelpChip()Lcom/google/android/material/chip/Chip;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/media/WidgetQRScanner;
 
-    const/4 v2, 0x0
+    const-string v2, "scannerView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getScannerView()Lme/dm7/barcodescanner/zxing/ZXingScannerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/media/WidgetQRScanner;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "scannerView"
-
-    const-string v4, "getScannerView()Lme/dm7/barcodescanner/zxing/ZXingScannerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -96,7 +84,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0738
+    const v0, 0x7f0a073e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -104,7 +92,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/media/WidgetQRScanner;->helpChip$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0737
+    const v0, 0x7f0a073d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -192,19 +180,19 @@
 
     move-result v0
 
-    const-string v1, "uri"
+    const-string/jumbo v1, "uri"
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v0, v3}, Lf/a/b/t0/b;->a(Ljava/lang/String;)Z
+    invoke-virtual {v0, v3}, Lf/a/b/v0/b;->a(Ljava/lang/String;)Z
 
     move-result v0
 
@@ -213,7 +201,7 @@
     :cond_0
     sget-object v0, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/intent/IntentUtils;->isDiscordAppUri(Landroid/net/Uri;)Z
 
@@ -228,13 +216,13 @@
 
     if-eqz p1, :cond_2
 
-    sget-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
+    sget-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
 
-    sget-object v0, Lf/a/b/t0/b;->C:Lkotlin/text/Regex;
+    sget-object v0, Lf/a/b/v0/b;->C:Lkotlin/text/Regex;
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lkotlin/text/Regex;->matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
 
@@ -254,7 +242,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -266,7 +254,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v2, p1}, Lcom/discord/widgets/auth/WidgetRemoteAuth$Companion;->launch(Landroid/content/Context;Ljava/lang/String;)V
 
@@ -279,7 +267,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -294,13 +282,13 @@
     goto :goto_1
 
     :cond_4
-    const p1, 0x7f1212d4
+    const p1, 0x7f1212fe
 
     const/4 v0, 0x0
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     :goto_1
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
@@ -322,7 +310,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lm0/a/a/a/a;->a()V
+    invoke-virtual {v0}, Ln0/a/a/a/a;->a()V
 
     return-void
 .end method
@@ -336,7 +324,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lm0/a/a/a/a;->a()V
+    invoke-virtual {v0}, Ln0/a/a/a/a;->a()V
 
     return-void
 .end method
@@ -344,11 +332,13 @@
 .method public onRequestPermissionsResult(I[Ljava/lang/String;[I)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "permissions"
 
-    if-eqz p2, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "grantResults"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppFragment;->onRequestPermissionsResult(I[Ljava/lang/String;[I)V
 
@@ -400,26 +390,14 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "grantResults"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "permissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -446,15 +424,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->setVisibility(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -480,7 +449,7 @@
 
     invoke-static {p0, v1, v0, v3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f120e60
+    const v0, 0x7f120e86
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali
index 0797e7160c..ba5fcfb439 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod.smali
@@ -28,7 +28,7 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -38,22 +38,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "linkAction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroid/text/method/LinkMovementMethod;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;->linkAction:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "linkAction"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -61,13 +54,17 @@
 .method public onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "widget"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "buffer"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "event"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroid/text/method/LinkMovementMethod;->onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z
 
@@ -87,25 +84,4 @@
 
     :cond_0
     return p1
-
-    :cond_1
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "buffer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "widget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1.smali
index 06c0287e1d..ad31efb1f1 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$onCancel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1.smali
index cb626579df..f4eb71d087 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$onConfirm$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1.smali
index e2a1726788..cac2ea9a0a 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2.smali
index 5b69b237bc..06edf8181a 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setNegativeButton$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1.smali
index 6f0a4c8089..5838245cad 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2.smali
index 305eebbef8..46888ea575 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder$setPositiveButton$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali
index 572f943cc9..d212217e56 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Builder.smali
@@ -58,9 +58,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -85,15 +87,6 @@
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->onCancel:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic setNegativeButton$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -213,7 +206,7 @@
 
     const-string v0, "context.getString(stringResId)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->message:Ljava/lang/String;
 
@@ -221,22 +214,15 @@
 .end method
 
 .method public final setMessage(Ljava/lang/String;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->message:Ljava/lang/String;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setNegativeButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -257,7 +243,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "onCancel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->context:Landroid/content/Context;
 
@@ -267,22 +255,13 @@
 
     const-string v0, "context.getString(stringResId)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->cancelText:Ljava/lang/String;
 
     iput-object p2, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->onCancel:Lkotlin/jvm/functions/Function1;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "onCancel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setNegativeButton(Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -300,31 +279,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "text"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onCancel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->cancelText:Ljava/lang/String;
 
     iput-object p2, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->onCancel:Lkotlin/jvm/functions/Function1;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "onCancel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -345,7 +312,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "onConfirm"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->context:Landroid/content/Context;
 
@@ -355,22 +324,13 @@
 
     const-string v0, "context.getString(stringResId)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->confirmText:Ljava/lang/String;
 
     iput-object p2, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->onConfirm:Lkotlin/jvm/functions/Function1;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "onConfirm"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setPositiveButton(Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -388,50 +348,31 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "text"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onConfirm"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->confirmText:Ljava/lang/String;
 
     iput-object p2, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->onConfirm:Lkotlin/jvm/functions/Function1;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "onConfirm"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setTag(Ljava/lang/String;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "tag"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->tag:Ljava/lang/String;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "tag"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -449,7 +390,7 @@
 
     const-string v0, "context.getString(stringResId)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->title:Ljava/lang/String;
 
@@ -457,48 +398,43 @@
 .end method
 
 .method public final setTitle(Ljava/lang/String;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->title:Ljava/lang/String;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final show(Landroidx/fragment/app/FragmentManager;)V
-    .locals 17
+    .locals 18
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_0
+    const-string v1, "fragmentManager"
 
-    sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+    move-object/from16 v3, p1
 
-    iget-object v3, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->title:Ljava/lang/String;
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v4, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->message:Ljava/lang/String;
+    sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    iget-object v5, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->confirmText:Ljava/lang/String;
+    iget-object v4, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->title:Ljava/lang/String;
 
-    iget-object v6, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->cancelText:Ljava/lang/String;
+    iget-object v5, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->message:Ljava/lang/String;
 
-    const/4 v2, 0x2
+    iget-object v6, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->confirmText:Ljava/lang/String;
 
-    new-array v2, v2, [Lkotlin/Pair;
+    iget-object v7, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->cancelText:Ljava/lang/String;
 
-    const/4 v7, 0x0
+    const/4 v1, 0x2
 
-    const v8, 0x7f0a062c
+    new-array v1, v1, [Lkotlin/Pair;
+
+    const v8, 0x7f0a0632
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -510,58 +446,51 @@
 
     invoke-direct {v10, v8, v9}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v10, v2, v7
+    const/4 v8, 0x0
 
-    const/4 v7, 0x1
+    aput-object v10, v1, v8
 
-    const v8, 0x7f0a0627
+    const/4 v8, 0x1
 
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v9, 0x7f0a062d
+
+    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v9
+
+    iget-object v10, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->onCancel:Lkotlin/jvm/functions/Function1;
+
+    new-instance v11, Lkotlin/Pair;
+
+    invoke-direct {v11, v9, v10}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    aput-object v11, v1, v8
+
+    invoke-static {v1}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object v8
 
-    iget-object v9, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->onCancel:Lkotlin/jvm/functions/Function1;
-
-    new-instance v10, Lkotlin/Pair;
-
-    invoke-direct {v10, v8, v9}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    aput-object v10, v2, v7
-
-    invoke-static {v2}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
-
-    move-result-object v7
-
-    const/4 v8, 0x0
-
     const/4 v9, 0x0
 
     const/4 v10, 0x0
 
-    iget-object v11, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->themeId:Ljava/lang/Integer;
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
+    iget-object v12, v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->themeId:Ljava/lang/Integer;
 
     const/4 v13, 0x0
 
     const/4 v14, 0x0
 
-    const/16 v15, 0x1dc0
+    const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    const/16 v16, 0x1dc0
 
-    move-object/from16 v2, p1
+    const/16 v17, 0x0
 
-    invoke-static/range {v1 .. v16}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
+    move-object/from16 v3, p1
+
+    invoke-static/range {v2 .. v17}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "fragmentManager"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.smali
index a55e0ca3cf..9880dec93a 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1;->$onOKClicked:Lkotlin/jvm/functions/Function2;
 
@@ -69,19 +71,19 @@
 
     move-result-object v1
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0a0a37
+    const v2, 0x7f0a0a3b
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v2, "view.findViewById<TextIn\u2026tLayout>(R.id.view_input)"
+    const-string/jumbo v2, "view.findViewById<TextIn\u2026tLayout>(R.id.view_input)"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -92,13 +94,4 @@
     invoke-interface {v0, v1, p1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$2.smali
index 7d6948a329..a724503875 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$2;->$onCancelClicked:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.smali
index fe1aca2ec7..cd5acdf0ed 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,17 +61,19 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
 
-    const v0, 0x7f0a0a37
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f0a0a3b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v0, "view.findViewById<TextIn\u2026tLayout>(R.id.view_input)"
+    const-string/jumbo v0, "view.findViewById<TextIn\u2026tLayout>(R.id.view_input)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setHint(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
index cc6446c1de..c30a20406d 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
@@ -257,11 +257,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_6
+    const-string v0, "bodyText"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeDialog;
 
@@ -361,24 +363,14 @@
 
     move-result-object p12
 
+    const-string p2, "WidgetNoticeDialog::class.java.simpleName"
+
+    invoke-static {p12, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     :goto_0
     invoke-virtual {v0, p1, p12}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "bodyText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final showInputModal(Lcom/discord/app/AppActivity;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Ljava/lang/Boolean;)V
@@ -413,23 +405,35 @@
 
     move-object/from16 v3, p6
 
-    const/4 v4, 0x0
+    const-string v4, "activity"
 
-    if-eqz v0, :cond_5
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v4, "headerText"
 
-    if-eqz p3, :cond_3
+    move-object/from16 v7, p2
 
-    if-eqz v1, :cond_2
+    invoke-static {v7, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_1
+    const-string v4, "bodyText"
+
+    move-object/from16 v8, p3
+
+    invoke-static {v8, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "hintText"
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "onOKClicked"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v11, Ljava/util/HashMap;
 
     invoke-direct {v11}, Ljava/util/HashMap;-><init>()V
 
-    const v4, 0x7f0a062c
+    const v4, 0x7f0a0632
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -443,7 +447,7 @@
 
     if-eqz v3, :cond_0
 
-    const v2, 0x7f0a0627
+    const v2, 0x7f0a062d
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -474,7 +478,7 @@
 
     const-string v1, "activity.supportFragmentManager"
 
-    invoke-static {v6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f0d0111
 
@@ -482,13 +486,13 @@
 
     move-result-object v14
 
-    const v1, 0x7f12047e
+    const v1, 0x7f12047f
 
     invoke-virtual {v0, v1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
     move-result-object v9
 
-    const v1, 0x7f1203b7
+    const v1, 0x7f1203b8
 
     invoke-virtual {v0, v1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -519,39 +523,4 @@
     invoke-static/range {v5 .. v20}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string v0, "onOKClicked"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_2
-    const-string v0, "hintText"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_3
-    const-string v0, "bodyText"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_4
-    const-string v0, "headerText"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_5
-    const-string v0, "activity"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3.smali
index 63f9eb08a5..1609a6f3be 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
index 147e13660a..6f7977fc82 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog.smali
@@ -36,11 +36,11 @@
 
 .field public static final ARG_THEME_ID:Ljava/lang/String; = "theme_id"
 
-.field public static final CANCEL_BUTTON:I = 0x7f0a0627
+.field public static final CANCEL_BUTTON:I = 0x7f0a062d
 
 .field public static final Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-.field public static final OK_BUTTON:I = 0x7f0a062c
+.field public static final OK_BUTTON:I = 0x7f0a0632
 
 .field public static final ON_SHOW:I
 
@@ -82,121 +82,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeDialog;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;
+    const-string v2, "headerContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "headerContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeaderContainer()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "header"
 
-    aput-object v1, v0, v2
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "header"
-
-    const-string v4, "getHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeDialog;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;
+    const-string v2, "body"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBody()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "body"
-
-    const-string v4, "getBody()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeDialog;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;
+    const-string v2, "ok"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOk()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "ok"
-
-    const-string v4, "getOk()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeDialog;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;
+    const-string v2, "cancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancel()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancel"
-
-    const-string v4, "getCancel()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeDialog;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;
+    const-string v2, "bodyContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBodyContainer()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bodyContainer"
-
-    const-string v4, "getBodyContainer()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -220,7 +184,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a062a
+    const v0, 0x7f0a0630
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -228,7 +192,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->headerContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0629
+    const v0, 0x7f0a062f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -236,7 +200,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0626
+    const v0, 0x7f0a062c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -244,7 +208,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a062c
+    const v0, 0x7f0a0632
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -252,7 +216,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->ok$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0627
+    const v0, 0x7f0a062d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -260,7 +224,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0625
+    const v0, 0x7f0a062b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -628,84 +592,86 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_10
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const-string v3, "cancelable"
+    const-string v2, "cancelable"
 
-    invoke-virtual {v1, v3, v2}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;Z)Z
 
-    move-result v1
+    move-result v0
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     :goto_0
-    invoke-virtual {p0, v1}, Landroidx/fragment/app/DialogFragment;->setCancelable(Z)V
+    invoke-virtual {p0, v0}, Landroidx/fragment/app/DialogFragment;->setCancelable(Z)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v3, "it"
+    const-string v2, "it"
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const-string v4, "notice_type"
+    const-string v3, "notice_type"
 
-    invoke-virtual {v1, v4}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v4, v1}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
+    invoke-virtual {v3, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
 
     :cond_1
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_2
+    const/4 v3, 0x0
+
+    if-eqz v0, :cond_2
 
     const-string v4, "header_text"
 
-    invoke-virtual {v1, v4}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v4}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_1
 
     :cond_2
-    move-object v1, v0
+    move-object v0, v3
 
     :goto_1
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getHeader()Landroid/widget/TextView;
 
     move-result-object v4
 
-    invoke-virtual {v4, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v4, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getHeaderContainer()Landroid/view/ViewGroup;
 
@@ -713,53 +679,53 @@
 
     const/4 v5, 0x0
 
-    if-eqz v1, :cond_4
+    if-eqz v0, :cond_4
 
-    invoke-static {v1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
     goto :goto_2
 
     :cond_3
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     goto :goto_3
 
     :cond_4
     :goto_2
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     :goto_3
-    xor-int/2addr v1, v2
+    xor-int/2addr v0, v1
 
-    if-eqz v1, :cond_5
+    if-eqz v0, :cond_5
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     goto :goto_4
 
     :cond_5
-    const/16 v1, 0x8
+    const/16 v0, 0x8
 
     :goto_4
-    invoke-virtual {v4, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v4, v0}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getBody()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
 
     const-string v4, "body_text"
 
-    invoke-virtual {v2, v4}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v4}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
@@ -769,11 +735,11 @@
 
     move-result-object v6
 
-    const-string v2, "view.context"
+    const-string/jumbo v1, "view.context"
 
-    invoke-static {v6, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v7, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x0
 
@@ -787,103 +753,103 @@
 
     invoke-static/range {v6 .. v12}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    move-result-object v2
+    move-result-object v1
 
     goto :goto_5
 
     :cond_6
-    move-object v2, v0
+    move-object v1, v3
 
     :goto_5
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/DialogFragment;->isCancelable()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_7
+    if-eqz v0, :cond_7
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getBody()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;
+    new-instance v1, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;
 
-    new-instance v3, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;
+    new-instance v2, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;
 
-    invoke-direct {v3, p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;-><init>(Lcom/discord/widgets/notice/WidgetNoticeDialog;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$onViewBound$3;-><init>(Lcom/discord/widgets/notice/WidgetNoticeDialog;)V
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$ActionLinkMovementMethod;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
 
     :cond_7
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getBody()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_8
+    if-eqz v1, :cond_8
 
-    const-string v3, "body_text_alignment"
+    const-string v2, "body_text_alignment"
 
-    invoke-virtual {v2, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
 
-    move-result v2
+    move-result v1
 
     goto :goto_6
 
     :cond_8
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
     :goto_6
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setTextAlignment(I)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setTextAlignment(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getOk()Landroid/widget/Button;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_9
+    if-eqz v1, :cond_9
 
-    const-string v3, "ok_text"
+    const-string v2, "ok_text"
 
-    invoke-virtual {v2, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
     goto :goto_7
 
     :cond_9
-    move-object v2, v0
+    move-object v1, v3
 
     :goto_7
-    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v1
-
-    if-eqz v1, :cond_a
-
-    const-string v0, "cancel_text"
-
-    invoke-virtual {v1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
     move-result-object v0
 
+    if-eqz v0, :cond_a
+
+    const-string v1, "cancel_text"
+
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
     :cond_a
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeDialog;->getCancel()Landroid/widget/Button;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v0, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
@@ -1016,13 +982,6 @@
 
     :cond_f
     return-void
-
-    :cond_10
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setListenerMap(Ljava/util/Map;)V
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$Companion$enqueue$notice$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$Companion$enqueue$notice$1.smali
index 72ae41d0e4..95a44751c4 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$Companion$enqueue$notice$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$Companion$enqueue$notice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay$Companion$enqueue$notice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeNuxOverlay.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;
 
@@ -87,11 +89,11 @@
 
     const-string v1, "it.supportFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v1
 
@@ -110,13 +112,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.smali
index 44211cce34..821f069650 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.smali
@@ -43,11 +43,11 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
-    const v1, 0x7f0a0905
+    const v1, 0x7f0a0909
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay.smali
index bfd9c268c9..8a888f306e 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay.smali
@@ -33,41 +33,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;
+    const-string v2, "ok"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOk()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "ok"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getOk()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;
 
-    const/4 v2, 0x0
+    const-string v2, "cancel"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCancel()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "cancel"
-
-    const-string v4, "getCancel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -91,7 +79,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a033a
+    const v0, 0x7f0a0340
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -99,7 +87,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxOverlay;->ok$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a013d
+    const v0, 0x7f0a0140
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +176,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -223,13 +213,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali
index b8292dfe1c..b909a90a89 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetNoticeNuxSamsungLink.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/List<",
         "+",
         "Landroid/content/pm/PackageInfo;",
@@ -62,15 +62,29 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Ljava/util/List;)Ljava/lang/Boolean;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Landroid/content/pm/PackageInfo;",
+            ">;)",
+            "Ljava/lang/Boolean;"
+        }
+    .end annotation
 
-    check-cast p1, Ljava/util/List;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->call(Ljava/util/List;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
     move-result p1
 
+    xor-int/lit8 p1, p1, 0x1
+
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -78,27 +92,14 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/util/List;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Landroid/content/pm/PackageInfo;",
-            ">;)Z"
-        }
-    .end annotation
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "it"
+    check-cast p1, Ljava/util/List;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->call(Ljava/util/List;)Ljava/lang/Boolean;
 
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+    move-result-object p1
 
-    move-result p1
-
-    xor-int/lit8 p1, p1, 0x1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
index 89db53c619..9f8a19b619 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
@@ -27,7 +27,13 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/util/List<",
+        "+",
+        "Landroid/content/pm/PackageInfo;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -49,25 +55,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
-
-    check-cast p2, Ljava/util/List;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->call(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Z
+.method public final call(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Ljava/lang/Boolean;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -76,7 +64,8 @@
             "Ljava/util/List<",
             "+",
             "Landroid/content/pm/PackageInfo;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
@@ -84,13 +73,19 @@
 
     const-string v1, "meUser"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "allPackages"
+    const-string v2, "allPackages"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_c
+    const-string v3, "clock"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
@@ -100,15 +95,15 @@
 
     move-result-wide v0
 
-    const-wide v2, 0x90321000L
+    const-wide v3, 0x90321000L
 
     const/4 p1, 0x0
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
-    cmp-long v5, v0, v2
+    cmp-long v6, v0, v3
 
-    if-lez v5, :cond_0
+    if-lez v6, :cond_0
 
     const/4 v0, 0x1
 
@@ -118,6 +113,8 @@
     const/4 v0, 0x0
 
     :goto_0
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v1, Ljava/util/ArrayList;
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
@@ -134,7 +131,7 @@
 
     const-string v3, "com.samsung.android.game.gamehome"
 
-    const-string v5, "com.samsung.android.game.gametools"
+    const-string v4, "com.samsung.android.game.gametools"
 
     if-eqz v2, :cond_4
 
@@ -148,15 +145,15 @@
 
     iget-object v7, v6, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
 
-    invoke-static {v7, v5, v4}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v7, v4, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
-    move-result v5
+    move-result v4
 
-    if-nez v5, :cond_3
+    if-nez v4, :cond_3
 
-    iget-object v5, v6, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
+    iget-object v4, v6, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
 
-    invoke-static {v5, v3, v4}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v4, v3, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v3
 
@@ -211,7 +208,7 @@
 
     iget-object v0, v0, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
 
-    invoke-static {v0, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -256,7 +253,7 @@
 
     iget-object v0, v0, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -276,14 +273,23 @@
     const/4 p1, 0x1
 
     :cond_b
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    :cond_c
-    const-string p1, "clock"
+    move-result-object p1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    check-cast p2, Ljava/util/List;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->call(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3.smali
index 4a3a6f720b..ab9ec63df6 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetNoticeNuxSamsungLink.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4.smali
index f237dac965..7a45a014c3 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeNuxSamsungLink.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1.smali
index 732522dad9..dcad62f75e 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeNuxSamsungLink.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
 
@@ -87,7 +89,7 @@
 
     const-string v1, "it.supportFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
 
@@ -106,13 +108,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali
index 0d1f36c58d..20d5b0e459 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion.smali
@@ -116,11 +116,13 @@
 .method public final enqueue(Landroid/content/Context;Lcom/discord/utilities/time/Clock;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "clock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -134,7 +136,7 @@
 
     const-string v2, "samsung"
 
-    invoke-static {v0, v2, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v2, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
@@ -173,7 +175,7 @@
 
     sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$1;
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -187,7 +189,7 @@
 
     const-string p1, "Observable\n          .co\u2026 allPackages)\n          }"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0x0
 
@@ -203,13 +205,13 @@
 
     sget-object p2, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$3;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable\n          .co\u2026er { canShow -> canShow }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -234,18 +236,4 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
index 7a5f98ec0e..bc2589e52f 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetNoticeNuxSamsungLink.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/util/List<",
         "+",
         "Lcom/discord/models/domain/ModelOAuth2Token;",
@@ -62,42 +62,27 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->call(Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/List;)Z
+.method public final call(Ljava/util/List;)Ljava/lang/Boolean;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelOAuth2Token;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
     const-string v0, "591317049637339146"
 
-    invoke-static {v0}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object v0
 
     const-string v1, "authedApps"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -165,5 +150,21 @@
     if-eqz v1, :cond_2
 
     :goto_2
-    return v2
+    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->call(Ljava/util/List;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali
index 6411fbe3b4..78d67c15bf 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticeNuxSamsungLink.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
index 749df513ac..f3b05598a1 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
@@ -33,41 +33,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+    const-string v2, "ok"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOk()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "ok"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getOk()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
 
-    const/4 v2, 0x0
+    const-string v2, "cancel"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCancel()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "cancel"
-
-    const-string v4, "getCancel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -91,7 +79,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a033a
+    const v0, 0x7f0a0340
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -99,7 +87,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->ok$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a013d
+    const v0, 0x7f0a0140
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -186,11 +174,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 11
+    .locals 12
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -200,9 +188,9 @@
 
     move-result-object p1
 
-    const-string v1, "NUX/SamsungLink"
+    const-string v0, "NUX/SamsungLink"
 
-    invoke-virtual {p1, v1}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -214,63 +202,65 @@
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v3
 
-    const-wide/16 v2, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x1
+    const-wide/16 v4, 0x0
 
     const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+    const/4 v7, 0x1
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v3 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
+    sget-object v0, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1;
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v1, "RestAPI.api.getOAuthToke\u2026ApplicationId }\n        }"
+    const-string v0, "RestAPI.api.getOAuthToke\u2026ApplicationId }\n        }"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v2, v0, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
-    const-class v3, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
+    const-class v4, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;
 
-    const/4 v4, 0x0
+    new-instance v9, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
+
+    invoke-direct {v9, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;-><init>(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
 
     const/4 v5, 0x0
 
+    const/4 v6, 0x0
+
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;
+    const/16 v10, 0x1e
 
-    invoke-direct {v8, p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2;-><init>(Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;)V
+    const/4 v11, 0x0
 
-    const/16 v9, 0x1e
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v3 .. v11}, 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
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink;->getOk()Landroid/widget/TextView;
 
@@ -293,11 +283,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1.smali
index 7ca5017f3e..71b53e6cf0 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticePopup.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali
index d21d18e93c..bf3601258a 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticePopup.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;->$popupFrag:Lcom/discord/widgets/notice/WidgetNoticePopup;
 
@@ -75,7 +77,7 @@
 
     const-string v1, "it.supportFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;->$popupFrag:Lcom/discord/widgets/notice/WidgetNoticePopup;
 
@@ -88,13 +90,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali
index ff6f387a10..174e394f28 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticePopup.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -59,7 +59,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -83,47 +83,53 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragActivity"
 
-    sget-object v0, Lcom/discord/widgets/notice/WidgetNoticePopup;->Companion:Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$name:Ljava/lang/String;
+    sget-object v1, Lcom/discord/widgets/notice/WidgetNoticePopup;->Companion:Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;
 
-    iget-object v2, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$onTitle:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$name:Ljava/lang/String;
 
-    invoke-interface {v2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$onTitle:Lkotlin/jvm/functions/Function1;
 
-    move-result-object v2
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    check-cast v2, Ljava/lang/CharSequence;
+    move-result-object v0
 
-    iget-object v3, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$onBody:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v3, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
+    move-object v3, v0
 
     check-cast v3, Ljava/lang/CharSequence;
 
-    sget-object v4, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+    iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$onBody:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v4, v0
+
+    check-cast v4, Ljava/lang/CharSequence;
+
+    sget-object v0, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
     iget v5, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$iconRes:I
 
-    invoke-virtual {v4, p1, v5}, Lcom/discord/utilities/icon/IconUtils;->getResourceUriString(Landroid/content/Context;I)Ljava/lang/String;
+    invoke-virtual {v0, p1, v5}, Lcom/discord/utilities/icon/IconUtils;->getResourceUriString(Landroid/content/Context;I)Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v0
 
-    invoke-static {v4}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
-    move-result-object v4
+    move-result-object v5
 
-    iget v5, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$autoDismissPeriodSecs:I
+    iget v6, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$autoDismissPeriodSecs:I
 
-    iget-object v6, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$onClick:Lkotlin/jvm/functions/Function1;
+    iget-object v7, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$onClick:Lkotlin/jvm/functions/Function1;
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;->access$create(Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/net/Uri;ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticePopup;
+    invoke-static/range {v1 .. v7}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;->access$create(Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/net/Uri;ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticePopup;
 
     move-result-object v0
 
@@ -133,7 +139,7 @@
 
     const-string v1, "fragActivity.supportFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;->$name:Ljava/lang/String;
 
@@ -142,13 +148,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "fragActivity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali
index bf0f26d078..710517b5de 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$Companion.smali
@@ -147,7 +147,7 @@
 
     const-class p2, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-static {p2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {p2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object p2
 
@@ -198,7 +198,7 @@
 
     const-class v0, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v0
 
@@ -282,7 +282,7 @@
 
     const-class v1, Lcom/discord/widgets/home/WidgetHome;
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v1
 
@@ -337,7 +337,7 @@
             "Lcom/discord/widgets/notice/WidgetNoticePopup;",
             "Ljava/util/List<",
             "+",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;>;)V"
@@ -346,11 +346,15 @@
 
     move-object/from16 v0, p1
 
-    const/4 v1, 0x0
+    const-string v1, "popupFrag"
 
-    if-eqz v0, :cond_1
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string/jumbo v1, "validScreens"
+
+    move-object/from16 v10, p2
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/stores/StoreNotices$Notice;
 
@@ -358,6 +362,10 @@
 
     move-result-object v3
 
+    new-instance v15, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;
+
+    invoke-direct {v15, v0}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;-><init>(Lcom/discord/widgets/notice/WidgetNoticePopup;)V
+
     const/4 v4, 0x0
 
     const-wide/16 v5, 0x0
@@ -366,24 +374,18 @@
 
     const/4 v8, 0x0
 
-    const-wide/16 v11, 0x3e8
-
     const/4 v9, 0x0
 
+    const-wide/16 v11, 0x3e8
+
     const-wide/16 v13, 0x0
 
-    new-instance v15, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;
-
-    invoke-direct {v15, v0}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$1;-><init>(Lcom/discord/widgets/notice/WidgetNoticePopup;)V
-
     const/16 v16, 0x16
 
     const/16 v17, 0x0
 
     move-object v2, v1
 
-    move-object/from16 v10, p2
-
     invoke-direct/range {v2 .. v17}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;Lcom/discord/utilities/time/Clock;JIZZLjava/util/List;JJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -395,20 +397,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
 
     return-void
-
-    :cond_0
-    const-string v0, "validScreens"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const-string v0, "popupFrag"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public final enqueue(Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/net/Uri;ILjava/util/List;Lkotlin/jvm/functions/Function1;)V
@@ -423,7 +411,7 @@
             "I",
             "Ljava/util/List<",
             "+",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;>;",
@@ -435,17 +423,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "title"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "body"
 
-    if-eqz p7, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "validScreens"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClick"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, p0
 
@@ -468,45 +464,10 @@
     invoke-virtual {p0, p1, p6}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;->enqueue(Lcom/discord/widgets/notice/WidgetNoticePopup;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "validScreens"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final enqueue(Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;IIJZLjava/util/List;Lkotlin/jvm/functions/Function1;)V
-    .locals 18
+    .locals 17
     .param p4    # I
         .annotation build Landroidx/annotation/DrawableRes;
         .end annotation
@@ -529,7 +490,7 @@
             ">;IIJZ",
             "Ljava/util/List<",
             "+",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "+",
             "Lcom/discord/app/AppComponent;",
             ">;>;",
@@ -541,76 +502,74 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_4
+    move-object/from16 v8, p1
 
-    if-eqz p2, :cond_3
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
-
-    if-eqz p9, :cond_1
-
-    if-eqz p10, :cond_0
-
-    new-instance v0, Lcom/discord/stores/StoreNotices$Notice;
-
-    const/4 v8, 0x0
-
-    const-wide/16 v9, 0x0
-
-    const/4 v11, 0x1
-
-    const/4 v12, 0x0
-
-    const-wide/16 v13, 0x3e8
-
-    new-instance v15, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;
-
-    move-object v1, v15
-
-    move-object/from16 v2, p1
+    const-string v0, "onTitle"
 
     move-object/from16 v3, p2
 
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onBody"
+
     move-object/from16 v4, p3
 
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "validScreens"
+
+    move-object/from16 v9, p9
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClick"
+
+    move-object/from16 v7, p10
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/stores/StoreNotices$Notice;
+
+    new-instance v14, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;
+
+    move-object v1, v14
+
+    move-object/from16 v2, p1
+
     move/from16 v5, p4
 
     move/from16 v6, p5
 
-    move-object/from16 v7, p10
-
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion$enqueue$notice$2;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;IILkotlin/jvm/functions/Function1;)V
 
-    const/16 v16, 0x26
+    const/4 v3, 0x0
 
-    const/16 v17, 0x0
+    const-wide/16 v4, 0x0
+
+    const/4 v6, 0x1
+
+    const/4 v10, 0x0
+
+    const-wide/16 v11, 0x3e8
+
+    const/16 v15, 0x26
+
+    const/16 v16, 0x0
 
     move-object v1, v0
 
-    move-object v3, v8
-
-    move-wide v4, v9
-
-    move v6, v11
-
     move/from16 v7, p8
 
-    move v8, v12
+    move v8, v10
 
-    move-object/from16 v9, p9
-
-    move-wide v10, v13
+    move-wide v10, v11
 
     move-wide/from16 v12, p6
 
-    move-object v14, v15
-
-    move/from16 v15, v16
-
-    move-object/from16 v16, v17
-
     invoke-direct/range {v1 .. v16}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;Lcom/discord/utilities/time/Clock;JIZZLjava/util/List;JJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -622,39 +581,4 @@
     invoke-virtual {v1, v0}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "onClick"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "validScreens"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "onBody"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "onTitle"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali
index fa6e0dde82..a381787ff2 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$configureCountdownProgressUi$$inlined$apply$lambda$1.smali
@@ -49,7 +49,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
@@ -68,11 +68,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Int"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali
index c3fdd12258..53a96c9ecd 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$name$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$name$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticePopup.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onClick$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onClick$1.smali
index 267cddb003..053c1a7769 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopup$onClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticePopup.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali
index b2f1681bf6..7eb0d96038 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$$inlined$with$lambda$1.smali
@@ -34,11 +34,13 @@
 .method public onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "widget"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "event"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Landroid/text/method/LinkMovementMethod;->onTouchEvent(Landroid/widget/TextView;Landroid/text/Spannable;Landroid/view/MotionEvent;)Z
 
@@ -74,18 +76,4 @@
     :cond_1
     :goto_0
     return p2
-
-    :cond_2
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "widget"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali
index b3174de2a1..d97320a682 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$3.smali
@@ -41,7 +41,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/notice/WidgetNoticePopup;->internalOnClick(Landroid/view/View;)V
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali
index ba56145efd..02cecb7cad 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup$onViewBound$4.smali
@@ -39,7 +39,7 @@
 
     const-string p1, "event"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
index bd8c9eed2d..9c6469bdd1 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopup.smali
@@ -63,101 +63,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopup;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticePopup;
+    const-string v2, "titleTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "titleTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitleTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopup;
 
-    const/4 v2, 0x0
+    const-string v2, "bodyTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBodyTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticePopup;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "bodyTv"
-
-    const-string v4, "getBodyTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopup;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticePopup;
+    const-string v2, "iconIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "iconIv"
-
-    const-string v4, "getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopup;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticePopup;
+    const-string v2, "countdownProgress"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCountdownProgress()Landroid/widget/ProgressBar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "countdownProgress"
-
-    const-string v4, "getCountdownProgress()Landroid/widget/ProgressBar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopup;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticePopup;
+    const-string v2, "closeBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCloseBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "closeBtn"
-
-    const-string v4, "getCloseBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -181,7 +151,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a06c1
+    const v0, 0x7f0a06c7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06bc
+    const v0, 0x7f0a06c2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06bf
+    const v0, 0x7f0a06c5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06be
+    const v0, 0x7f0a06c4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->countdownProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06bd
+    const v0, 0x7f0a06c3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -581,7 +551,9 @@
 .method public final internalOnClick(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->onClick:Lkotlin/jvm/functions/Function1;
 
@@ -590,15 +562,6 @@
     invoke-virtual {p0}, Lcom/discord/widgets/notice/WidgetNoticePopup;->dismiss()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreateDialog(Landroid/os/Bundle;)Landroid/app/Dialog;
@@ -648,7 +611,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -673,7 +636,9 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 7
 
-    if-eqz p1, :cond_1
+    const-string v0, "inflater"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppDialog;->onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
 
@@ -691,15 +656,15 @@
 
     new-array p2, p2, [Ljava/lang/Integer;
 
-    const/4 p3, 0x0
+    const/16 p3, 0x1a
 
-    const/16 v2, 0x1a
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object p3
 
-    move-result-object v2
+    const/4 v2, 0x0
 
-    aput-object v2, p2, p3
+    aput-object p3, p2, v2
 
     const/16 p3, 0x1b
 
@@ -711,25 +676,25 @@
 
     aput-object p3, p2, v6
 
-    const/4 p3, 0x2
+    const/16 p3, 0x1c
 
-    const/16 v2, 0x1c
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object p3
 
-    move-result-object v2
+    const/4 v2, 0x2
 
-    aput-object v2, p2, p3
+    aput-object p3, p2, v2
 
-    const/4 p3, 0x3
+    const/16 p3, 0x1d
 
-    const/16 v2, 0x1d
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object p3
 
-    move-result-object v2
+    const/4 v2, 0x3
 
-    aput-object v2, p2, p3
+    aput-object p3, p2, v2
 
     invoke-static {p2}, Lf/n/a/k/a;->setOf([Ljava/lang/Object;)Ljava/util/Set;
 
@@ -749,7 +714,7 @@
 
     if-eqz p1, :cond_0
 
-    const p2, 0x7f0a06bc
+    const p2, 0x7f0a06c2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -763,15 +728,6 @@
 
     :cond_0
     return-object p1
-
-    :cond_1
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDestroy()V
@@ -839,9 +795,9 @@
 
     move-result-object v3
 
-    const-string v4, "windowManager"
+    const-string/jumbo v4, "windowManager"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3}, Lcom/discord/utilities/dimen/DimenUtils;->getScreenWidthPx(Landroid/view/WindowManager;)I
 
@@ -888,7 +844,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 7
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -958,7 +916,7 @@
 
     const-string v0, "it"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -994,15 +952,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setCountdownTimer(Landroid/animation/ValueAnimator;)V
@@ -1014,7 +963,7 @@
 .end method
 
 .method public final setOnClick(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1026,18 +975,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/notice/WidgetNoticePopup;->onClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali
index 1e6b32a140..00537d4077 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/notice/WidgetNoticePopupChannel;",
+        ">;"
     }
 .end annotation
 
@@ -78,7 +81,7 @@
     move-object v1, v0
 
     :goto_0
-    invoke-static {p2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2.smali
index 9aec5428f2..2d89dca06f 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticePopupChannel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/notice/WidgetNoticePopupChannel;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1$1.smali
index bbfe5a12e1..7478775f46 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoticePopupChannel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,20 +71,13 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/chat/WidgetUrlActions;->Companion:Lcom/discord/widgets/chat/WidgetUrlActions$Companion;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/WidgetUrlActions$Companion;->requestNotice(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 c8f0963017..3b4070335e 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
@@ -33,7 +33,25 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
+        "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
+        ">;"
     }
 .end annotation
 
@@ -100,7 +118,7 @@
 
     move-object/from16 v4, p1
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -112,7 +130,7 @@
 
     move-object/from16 v6, p3
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
@@ -132,7 +150,7 @@
 
     iget-object v5, v0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1;->$context:Landroid/content/Context;
 
-    const v9, 0x7f04052e
+    const v9, 0x7f040520
 
     invoke-static {v5, v9}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali
index 46e1de4970..0c4d2ac8b5 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion.smali
@@ -103,11 +103,15 @@
     move-object v3, v4
 
     :goto_0
+    const-string v5, "message.guildId ?: 0"
+
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v6
 
-    invoke-virtual {v0, v5, v6}, Lcom/discord/stores/StoreGuilds;->observeComputed(J)Lrx/Observable;
+    invoke-virtual {v0, v6, v7}, Lcom/discord/stores/StoreGuilds;->observeComputed(J)Lrx/Observable;
 
     move-result-object v3
 
@@ -121,26 +125,28 @@
 
     move-result-object v0
 
-    sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v6, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
-
-    move-result-object v5
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessage;->getGuildId()Ljava/lang/Long;
+    invoke-virtual {v6}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
 
     move-result-object v6
 
-    if-eqz v6, :cond_1
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessage;->getGuildId()Ljava/lang/Long;
 
-    move-object v4, v6
+    move-result-object v7
+
+    if-eqz v7, :cond_1
+
+    move-object v4, v7
 
     :cond_1
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v6
+    move-result-wide v4
 
-    invoke-virtual {v5, v6, v7}, Lcom/discord/stores/StoreGuilds;->observeRoles(J)Lrx/Observable;
+    invoke-virtual {v6, v4, v5}, Lcom/discord/stores/StoreGuilds;->observeRoles(J)Lrx/Observable;
 
     move-result-object v5
 
@@ -174,13 +180,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "noticeName"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "message"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClick"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -216,7 +226,7 @@
 
     const-string p1, "Observable\n          .co\u2026            }\n          }"
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v4, 0xbb8
 
@@ -236,6 +246,8 @@
 
     const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
 
+    sget-object v6, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2;
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -244,32 +256,9 @@
 
     const/4 v5, 0x0
 
-    sget-object v6, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2;->INSTANCE:Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$enqueue$2;
-
     const/16 v7, 0x1e
 
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "noticeName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali
index cc8c12a2b3..1238a7f3d3 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Model.smali
@@ -30,13 +30,17 @@
 .method public constructor <init>(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/String;Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "title"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "icon"
 
-    if-eqz p4, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "body"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,27 +55,6 @@
     iput-boolean p5, p0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->isDirectMessageType:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "icon"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/String;Lcom/facebook/drawee/span/DraweeSpanStringBuilder;ZILjava/lang/Object;)Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;
@@ -184,13 +167,17 @@
 .method public final copy(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/String;Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Z)Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "title"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "icon"
 
-    if-eqz p4, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "body"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;
 
@@ -209,27 +196,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;-><init>(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/String;Lcom/facebook/drawee/span/DraweeSpanStringBuilder;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "icon"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -247,7 +213,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->title:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -257,7 +223,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->subtitle:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -267,7 +233,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->icon:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -277,7 +243,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->body:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali
index 7e7c4c8822..85a569c592 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$configureUI$$inlined$with$lambda$1.smali
@@ -63,7 +63,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali
index 67b6491e0e..b62911bbb8 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$1.smali
@@ -33,7 +33,17 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Ljava/lang/Long;",
+        "Lcom/facebook/drawee/span/DraweeSpanStringBuilder;",
+        "Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;",
+        ">;"
     }
 .end annotation
 
@@ -84,11 +94,11 @@
 
     const-string v2, "bodyText"
 
-    invoke-static {p5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "members"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v2, p4
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2.smali
index 4bab36420b..9b67da03d7 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetNoticePopupChannel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/notice/WidgetNoticePopupChannel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali
index 6e23f1cef2..1d682a6d8f 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetNoticePopupChannel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
+        "Lcom/facebook/drawee/span/DraweeSpanStringBuilder;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
index 9710ba5e8f..5b1c00fd76 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali
@@ -34,41 +34,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
+    const-string v2, "subtitleTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubtitleTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "subtitleTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSubtitleTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
 
-    const/4 v2, 0x0
+    const-string v2, "attachmentIv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getAttachmentIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "attachmentIv"
-
-    const-string v4, "getAttachmentIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -92,7 +80,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/notice/WidgetNoticePopup;-><init>()V
 
-    const v0, 0x7f0a06c0
+    const v0, 0x7f0a06c6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -100,7 +88,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;->subtitleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06bb
+    const v0, 0x7f0a06c1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +205,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
@@ -242,11 +230,11 @@
     goto :goto_0
 
     :cond_1
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type com.discord.utilities.view.text.SimpleDraweeSpanTextView"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 
@@ -276,7 +264,7 @@
 
     if-eqz v2, :cond_8
 
-    invoke-static {v2}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v2}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -304,7 +292,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f04052e
+    const v7, 0x7f040520
 
     invoke-static {v6, v7, v5, v4, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
@@ -348,7 +336,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f080390
+    const v7, 0x7f080393
 
     invoke-static {v6, v7}, Landroidx/appcompat/content/res/AppCompatResources;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -433,7 +421,7 @@
 
     const-string v6, "requireContext()"
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;->isDirectMessageType()Z
 
@@ -472,11 +460,11 @@
     return-void
 
     :cond_a
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type android.widget.ImageView"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -769,7 +757,7 @@
     const/4 v6, 0x1
 
     :goto_8
-    invoke-static/range {p5 .. p5}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static/range {p5 .. p5}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v8
 
@@ -783,9 +771,9 @@
 
     const-string v10, "savedMessage.embeds"
 
-    invoke-static {v8, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v8}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v8}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v8
 
@@ -821,7 +809,7 @@
 
     const-string v8, "sender"
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -845,7 +833,7 @@
 
     const-string v1, "senderName"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v8, p0
 
@@ -861,6 +849,8 @@
     move-object v8, p0
 
     :goto_a
+    new-instance v7, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;
+
     if-eqz v2, :cond_e
 
     move-object v1, v2
@@ -871,8 +861,6 @@
     move-object v1, v9
 
     :goto_b
-    new-instance v7, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Model;
-
     move-object v0, v7
 
     move-object v2, v3
@@ -1002,7 +990,7 @@
 
     const-string v4, "requireContext()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v4, Lcom/discord/widgets/notice/WidgetNoticePopupChannel;->Companion:Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion;
 
@@ -1014,13 +1002,13 @@
 
     invoke-direct {v4, v0}, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$onViewBoundOrOnResume$bodyTextObs$1;-><init>(Lcom/discord/models/domain/ModelMessage;)V
 
-    invoke-virtual {v3, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v3, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
     const-string v4, "getMessageRenderContext(\u2026 renderContext)\n        }"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -1080,6 +1068,10 @@
     move-result-object v6
 
     :goto_0
+    const-string v7, "savedMessage.guildId ?: 0"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v6
@@ -1114,7 +1106,7 @@
 
     const-string v3, "Observable\n        .comb\u2026       }\n        .take(1)"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v2, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/nux/NuxAnalytics.smali b/com.discord/smali/com/discord/widgets/nux/NuxAnalytics.smali
index 9799bb1218..9207cac202 100644
--- a/com.discord/smali/com/discord/widgets/nux/NuxAnalytics.smali
+++ b/com.discord/smali/com/discord/widgets/nux/NuxAnalytics.smali
@@ -45,51 +45,48 @@
 
 # virtual methods
 .method public final postRegistrationSkip$app_productionDiscordExternalRelease(Ljava/lang/String;)V
-    .locals 8
+    .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "fromStep"
 
-    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v4, 0x0
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    const/4 v5, 0x1
+    const-string v2, "Mobile NUX Post Reg"
 
-    const/16 v6, 0x8
+    const-string v4, "Friends List"
 
-    const/4 v7, 0x0
+    const/4 v5, 0x0
 
-    const-string v1, "Mobile NUX Post Reg"
+    const/4 v6, 0x1
 
-    const-string v3, "Friends List"
+    const/16 v7, 0x8
 
-    move-object v2, p1
+    const/4 v8, 0x0
 
-    invoke-static/range {v0 .. v7}, Lcom/discord/utilities/analytics/AnalyticsTracker;->newUserOnboarding$default(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZILjava/lang/Object;)V
+    move-object v3, p1
+
+    invoke-static/range {v1 .. v8}, Lcom/discord/utilities/analytics/AnalyticsTracker;->newUserOnboarding$default(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fromStep"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final postRegistrationTransition$app_productionDiscordExternalRelease(Ljava/lang/String;Ljava/lang/String;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "fromStep"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "toStep"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
+    const-string v2, "Mobile NUX Post Reg"
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -98,8 +95,6 @@
 
     const/4 v8, 0x0
 
-    const-string v2, "Mobile NUX Post Reg"
-
     move-object v3, p1
 
     move-object v4, p2
@@ -107,18 +102,4 @@
     invoke-static/range {v1 .. v8}, Lcom/discord/utilities/analytics/AnalyticsTracker;->newUserOnboarding$default(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "toStep"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fromStep"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$Companion.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$Companion.smali
index ce8a7e6a52..e91e812f04 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Help Nav"
 
@@ -53,13 +55,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPageFragment.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPageFragment.smali
index 3ba7548e0c..5416712664 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPageFragment.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPageFragment.smali
@@ -108,7 +108,7 @@
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v3, "unknown nux page: "
+    const-string/jumbo v3, "unknown nux page: "
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPagerAdapter.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPagerAdapter.smali
index e5f6bdfeb3..33da38bd63 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPagerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$NuxPagerAdapter.smali
@@ -16,22 +16,15 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/fragment/app/Fragment;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;-><init>(Landroidx/fragment/app/Fragment;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$onViewBound$1.smali
index 2b2281db28..c2443c4c23 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp$onViewBound$1.smali
@@ -47,16 +47,9 @@
 .method public final onConfigureTab(Lcom/google/android/material/tabs/TabLayout$Tab;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp.smali
index 4f00e39349..427e782c39 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNavigationHelp.smali
@@ -35,61 +35,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNavigationHelp;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNavigationHelp;
+    const-string v2, "closeBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCloseBtn()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "closeBtn"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCloseBtn()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNavigationHelp;
 
-    const/4 v2, 0x0
+    const-string v2, "nuxPager"
 
-    aput-object v1, v0, v2
+    const-string v3, "getNuxPager()Landroidx/viewpager2/widget/ViewPager2;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNavigationHelp;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "nuxPager"
-
-    const-string v4, "getNuxPager()Landroidx/viewpager2/widget/ViewPager2;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNavigationHelp;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNavigationHelp;
+    const-string v2, "indicatorTabs"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIndicatorTabs()Lcom/google/android/material/tabs/TabLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "indicatorTabs"
-
-    const-string v4, "getIndicatorTabs()Lcom/google/android/material/tabs/TabLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -113,7 +95,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a060f
+    const v0, 0x7f0a0615
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +103,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNavigationHelp;->closeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0611
+    const v0, 0x7f0a0617
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +111,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNavigationHelp;->nuxPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0610
+    const v0, 0x7f0a0616
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -264,17 +246,15 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    const/16 p1, 0x8
 
-    move-result-object p1
-
-    const v0, 0x7f0701ed
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getDimensionPixelOffset(I)I
+    invoke-static {p1}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result p1
 
@@ -325,13 +305,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$Companion.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$Companion.smali
index 85329b5fa2..ae905b8f10 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$Companion.smali
@@ -36,7 +36,9 @@
 .method public final launch(Landroid/content/Context;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -48,16 +50,7 @@
 
     const-class p2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$1.smali
index 27cf321e38..4826597ec4 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNuxChannelPrompt.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$2.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$2.smali
index 4f7afa9b23..68fee4cc06 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$2.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "error"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->handleError(Lcom/discord/utilities/error/Error;)V
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.smali
index e501e22537..db4a1d468d 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNuxChannelPrompt.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
-    .locals 9
+    .locals 10
 
     const/4 v0, 0x0
 
@@ -90,15 +90,17 @@
 
     move-result-object v5
 
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$CreateGuildChannel;
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
-    move-result-wide v1
+    move-result-wide v6
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v6
 
@@ -106,47 +108,45 @@
 
     iget-object p1, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1;->this$0:Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    const v1, 0x7f121013
+    const v2, 0x7f12103d
 
-    invoke-virtual {p1, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
-    const-string v1, "getString(R.string.nuf_c\u2026t_channel_topic_template)"
+    const-string v2, "getString(R.string.nuf_c\u2026t_channel_topic_template)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x1
+    const/4 v9, 0x1
 
-    new-array v2, v1, [Ljava/lang/Object;
+    new-array v2, v9, [Ljava/lang/Object;
 
     aput-object v5, v2, v0
 
     const-string v8, "java.lang.String.format(this, *args)"
 
-    invoke-static {v2, v1, p1, v8}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v2, v9, p1, v8}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v8
 
-    new-instance p1, Lcom/discord/restapi/RestAPIParams$CreateGuildChannel;
-
-    move-object v2, p1
+    move-object v2, v1
 
     invoke-direct/range {v2 .. v8}, Lcom/discord/restapi/RestAPIParams$CreateGuildChannel;-><init>(ILjava/lang/Long;Ljava/lang/String;Ljava/lang/Long;Ljava/util/List;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v2}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v2
-
-    iget-wide v3, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1;->$guildId:J
-
-    invoke-virtual {v2, v3, v4, p1}, Lcom/discord/utilities/rest/RestAPI;->createGuildChannel(JLcom/discord/restapi/RestAPIParams$CreateGuildChannel;)Lrx/Observable;
+    invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
     move-result-object p1
 
-    invoke-static {v0, v1}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    iget-wide v2, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1;->$guildId:J
+
+    invoke-virtual {p1, v2, v3, v1}, Lcom/discord/utilities/rest/RestAPI;->createGuildChannel(JLcom/discord/restapi/RestAPIParams$CreateGuildChannel;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {v0, v9}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -160,7 +160,7 @@
 
     const/4 v2, 0x2
 
-    invoke-static {v0, v1, v2}, Lf/a/b/q;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
+    invoke-static {v0, v1, v2}, Lf/a/b/s;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -168,7 +168,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     iget-object v1, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1;->this$0:Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
@@ -184,7 +184,7 @@
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1$2;-><init>(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1;)V
 
-    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1.smali
index 36c02502ea..671befb37c 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNuxChannelPrompt.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$3.smali
index 7103e8b807..3ce29078fc 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$3.smali
@@ -46,28 +46,24 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$3;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$3;->this$0:Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
     invoke-static {v0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->access$finishActivity(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;)V
 
-    const/4 v0, 0x1
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    return v0
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$3;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5.smali
index 1d67e3d22a..8ced651af9 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNuxChannelPrompt.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,9 +59,11 @@
 .end method
 
 .method public final invoke(Landroid/widget/TextView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5;->this$0:Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
@@ -72,13 +74,4 @@
     invoke-virtual {p1}, Landroid/widget/FrameLayout;->performClick()Z
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.smali
index 60230a9264..92f74800b0 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNuxChannelPrompt.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/view/validators/ValidationManager;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt.smali
index 6b409ec76a..8e0a3e269e 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxChannelPrompt.smali
@@ -41,121 +41,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
+    const-string v2, "guildIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "guildIcon"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGuildIcon()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    const/4 v2, 0x0
+    const-string v2, "guildIconName"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildIconName()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildIconName"
-
-    const-string v4, "getGuildIconName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
+    const-string v2, "guildName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildName"
-
-    const-string v4, "getGuildName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
+    const-string v2, "topicWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTopicWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "topicWrap"
-
-    const-string v4, "getTopicWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
+    const-string v2, "submitButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubmitButton()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "submitButton"
-
-    const-string v4, "getSubmitButton()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
+    const-string v2, "skip"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSkip()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "skip"
-
-    const-string v4, "getSkip()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -179,7 +143,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0636
+    const v0, 0x7f0a063c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -187,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->guildIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0637
+    const v0, 0x7f0a063d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -195,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->guildIconName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0638
+    const v0, 0x7f0a063e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -203,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->guildName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a063a
+    const v0, 0x7f0a0640
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->topicWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0635
+    const v0, 0x7f0a063b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->submitButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0639
+    const v0, 0x7f0a063f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -295,7 +259,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -656,7 +620,9 @@
 .method public final handleError(Lcom/discord/utilities/error/Error;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->getSubmitButton()Lcom/discord/views/LoadingButton;
 
@@ -672,7 +638,7 @@
 
     const-string v1, "error.response"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -699,7 +665,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -707,7 +673,7 @@
 
     const-string v3, "error.response.messages"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/view/validators/ValidationManager;->setErrors(Ljava/util/Map;)Ljava/util/Collection;
 
@@ -722,23 +688,14 @@
     invoke-virtual {p1, v0}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V
 
     return-void
-
-    :cond_1
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -746,13 +703,13 @@
 
     move-result-object p1
 
+    const-string v0, "com.discord.intent.extra.EXTRA_GUILD_ID"
+
     const-wide/16 v1, 0x0
 
-    const-string v3, "com.discord.intent.extra.EXTRA_GUILD_ID"
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    invoke-virtual {p1, v3, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v1
+    move-result-wide v0
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -760,18 +717,24 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v1, v2}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
+    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
 
     move-result-object p1
 
+    const/4 v2, 0x0
+
     const/4 v3, 0x2
 
-    invoke-static {p1, p0, v0, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
     const-class v5, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
 
+    new-instance v10, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1;-><init>(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;)V
+
     const/4 v6, 0x0
 
     const/4 v7, 0x0
@@ -780,10 +743,6 @@
 
     const/4 v9, 0x0
 
-    new-instance v10, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1;
-
-    invoke-direct {v10, p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$1;-><init>(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;)V
-
     const/16 v11, 0x1e
 
     const/4 v12, 0x0
@@ -806,7 +765,7 @@
 
     const/4 v4, 0x0
 
-    invoke-static {p0, p1, v4, v3, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p0, p1, v4, v3, v2}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->getSubmitButton()Lcom/discord/views/LoadingButton;
 
@@ -818,30 +777,23 @@
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$4;
+    new-instance v2, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$4;
 
-    invoke-direct {v0, p0, v1, v2}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$4;-><init>(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;J)V
+    invoke-direct {v2, p0, v0, v1}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$4;-><init>(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;J)V
 
-    invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v2}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;->getTopicWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object p1
 
-    const/4 v0, 0x1
+    new-instance v0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5;
 
-    new-instance v1, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5;
+    invoke-direct {v0, p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5;-><init>(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;)V
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt$onViewBound$5;-><init>(Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;)V
+    const/4 v1, 0x1
 
-    invoke-static {p1, v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;)Lkotlin/Unit;
+    invoke-static {p1, v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1.smali
index bbd64fac18..4de2227444 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1.smali
@@ -56,21 +56,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 2
 
     sget-object v0, Lcom/discord/widgets/nux/NuxAnalytics;->INSTANCE:Lcom/discord/widgets/nux/NuxAnalytics;
@@ -79,7 +65,17 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/nux/NuxAnalytics;->postRegistrationSkip$app_productionDiscordExternalRelease(Ljava/lang/String;)V
 
-    const/4 v0, 0x0
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    return v0
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1.smali
index 4968214907..f183f56d16 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1.smali
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -63,7 +63,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -80,7 +80,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -97,7 +97,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -114,7 +114,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -131,7 +131,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -165,7 +165,7 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/widgets/guilds/create/StockGuildTemplate;->CREATE:Lcom/discord/widgets/guilds/create/StockGuildTemplate;
 
@@ -185,7 +185,7 @@
     :goto_2
     iget-object p1, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1;->this$0:Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const v4, 0x7f120916
+    const v4, 0x7f120918
 
     invoke-virtual {p1, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildJoinClickListener$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildJoinClickListener$1.smali
index 8b43ebc364..0db48642ea 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildJoinClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildJoinClickListener$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion;->show(Landroid/content/Context;)V
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates.smali
index e2c0874d38..6e3b2380ee 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates.smali
@@ -33,161 +33,113 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
+    const-string v2, "createBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreateBtn()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "createBtn"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCreateBtn()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const/4 v2, 0x0
+    const-string v2, "friendBtn"
 
-    aput-object v1, v0, v2
+    const-string v3, "getFriendBtn()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "friendBtn"
-
-    const-string v4, "getFriendBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
+    const-string v2, "studyBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStudyBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "studyBtn"
-
-    const-string v4, "getStudyBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
+    const-string v2, "gamingBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGamingBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "gamingBtn"
-
-    const-string v4, "getGamingBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
+    const-string v2, "clubBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getClubBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "clubBtn"
-
-    const-string v4, "getClubBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
+    const-string v2, "creatorBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreatorBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "creatorBtn"
-
-    const-string v4, "getCreatorBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
+    const-string v2, "communityBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCommunityBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "communityBtn"
-
-    const-string v4, "getCommunityBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
 
-    const-class v2, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;
+    const-string v2, "joinBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getJoinBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "joinBtn"
-
-    const-string v4, "getJoinBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
@@ -203,7 +155,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a063e
+    const v0, 0x7f0a0644
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +163,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->createBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0640
+    const v0, 0x7f0a0646
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +171,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->friendBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0643
+    const v0, 0x7f0a0649
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -227,7 +179,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->studyBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0641
+    const v0, 0x7f0a0647
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -235,7 +187,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->gamingBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a063c
+    const v0, 0x7f0a0642
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -243,7 +195,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->clubBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a063f
+    const v0, 0x7f0a0645
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -251,7 +203,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->creatorBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a063d
+    const v0, 0x7f0a0643
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -259,7 +211,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->communityBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0642
+    const v0, 0x7f0a0648
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -503,89 +455,91 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     sget-object p1, Lcom/discord/widgets/nux/NuxAnalytics;->INSTANCE:Lcom/discord/widgets/nux/NuxAnalytics;
 
-    const-string v1, "Registration"
+    const-string v0, "Registration"
 
-    const-string v2, "Guild Template"
+    const-string v1, "Guild Template"
 
-    invoke-virtual {p1, v1, v2}, Lcom/discord/widgets/nux/NuxAnalytics;->postRegistrationTransition$app_productionDiscordExternalRelease(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/nux/NuxAnalytics;->postRegistrationTransition$app_productionDiscordExternalRelease(Ljava/lang/String;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1;->INSTANCE:Lcom/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1;
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    invoke-static {p0, p1, v1, v2, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    const/4 v2, 0x0
+
+    invoke-static {p0, p1, v0, v1, v2}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     new-instance p1, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1;
 
     invoke-direct {p1, p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1;-><init>(Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;)V
 
-    const/4 v0, 0x7
+    const/4 v2, 0x7
 
-    new-array v0, v0, [Landroid/view/View;
+    new-array v2, v2, [Landroid/view/View;
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->getCreateBtn()Landroid/view/View;
 
     move-result-object v3
 
-    aput-object v3, v0, v1
-
-    const/4 v1, 0x1
+    aput-object v3, v2, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->getFriendBtn()Landroid/view/View;
 
-    move-result-object v3
+    move-result-object v0
 
-    aput-object v3, v0, v1
+    const/4 v3, 0x1
+
+    aput-object v0, v2, v3
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->getStudyBtn()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    aput-object v1, v0, v2
-
-    const/4 v1, 0x3
+    aput-object v0, v2, v1
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->getGamingBtn()Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v0
 
-    aput-object v2, v0, v1
+    const/4 v1, 0x3
 
-    const/4 v1, 0x4
+    aput-object v0, v2, v1
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->getClubBtn()Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v0
 
-    aput-object v2, v0, v1
+    const/4 v1, 0x4
 
-    const/4 v1, 0x5
+    aput-object v0, v2, v1
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->getCreatorBtn()Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v0
 
-    aput-object v2, v0, v1
+    const/4 v1, 0x5
 
-    const/4 v1, 0x6
+    aput-object v0, v2, v1
 
     invoke-direct {p0}, Lcom/discord/widgets/nux/WidgetNuxGuildTemplates;->getCommunityBtn()Landroid/view/View;
 
-    move-result-object v2
+    move-result-object v0
 
-    aput-object v2, v0, v1
+    const/4 v1, 0x6
 
-    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    aput-object v0, v2, v1
+
+    invoke-static {v2}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
@@ -622,11 +576,4 @@
     invoke-virtual {v0, p1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali
index eb411348f0..8b4c958b45 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$Companion.smali
@@ -36,22 +36,17 @@
 .method public final show(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;
+    const-class v0, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali
index d3e3578f9b..a1715ee2c2 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.smali
@@ -51,7 +51,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
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 060b875782..e58351cde7 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNuxPostRegistrationJoin.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2;->this$0:Lcom/discord/widgets/nux/WidgetNuxPostRegistrationJoin;
 
@@ -69,30 +71,21 @@
 
     move-result-object v0
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f12105e
+    const p1, 0x7f121088
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120d89
+    const p1, 0x7f120daf
 
     :goto_0
     invoke-virtual {v0, p1}, Landroid/widget/Button;->setText(I)V
 
     return-void
-
-    :cond_1
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
index ba6fb48235..1088d80a9c 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
@@ -93,7 +93,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;->onViewBound(Landroid/view/View;)V
 
@@ -126,13 +128,4 @@
     invoke-static {p1, p0, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.smali
index 377b340bda..e58ed515c7 100644
--- a/com.discord/smali/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.smali
@@ -57,7 +57,7 @@
 
     const-string v0, "context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1;->$role:Lcom/discord/models/domain/ModelGuildRole;
 
@@ -83,19 +83,19 @@
 
     const-string v4, "role.name"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
     aput-object v3, v2, v4
 
-    const v3, 0x7f121363
+    const v3, 0x7f12138d
 
     invoke-static {v1, v3, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-static {p1, v0, v1}, Lf/a/b/n;->b(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/String;)V
+    invoke-static {p1, v0, v1}, Lf/a/b/p;->b(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/roles/RolesListView.smali b/com.discord/smali/com/discord/widgets/roles/RolesListView.smali
index f6209deb94..2f3d4f796d 100644
--- a/com.discord/smali/com/discord/widgets/roles/RolesListView.smali
+++ b/com.discord/smali/com/discord/widgets/roles/RolesListView.smali
@@ -20,49 +20,31 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/chip/ChipGroup;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/roles/RolesListView;->roles:Ljava/util/List;
 
-    invoke-virtual {p0}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
+    const/4 p1, 0x4
 
-    move-result-object p1
-
-    const p2, 0x7f0701ee
-
-    invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimension(I)F
+    invoke-static {p1}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result p1
 
-    float-to-int p1, p1
-
     invoke-virtual {p0, p1}, Lcom/google/android/material/chip/ChipGroup;->setChipSpacingVertical(I)V
 
     invoke-virtual {p0, p1}, Lcom/google/android/material/chip/ChipGroup;->setChipSpacingHorizontal(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -84,7 +66,7 @@
 .end method
 
 .method public final setRoles(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -95,24 +77,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/roles/RolesListView;->roles:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateView(Ljava/util/List;I)V
-    .locals 6
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -123,30 +98,30 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "roles"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/roles/RolesListView;->roles:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/roles/RolesListView;->roles:Ljava/util/List;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getDeveloperMode()Z
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getDeveloperMode()Z
 
-    move-result v1
+    move-result v0
 
     iput-object p1, p0, Lcom/discord/widgets/roles/RolesListView;->roles:Ljava/util/List;
 
@@ -159,89 +134,84 @@
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_4
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lcom/discord/models/domain/ModelGuildRole;
+    check-cast v1, Lcom/discord/models/domain/ModelGuildRole;
 
     invoke-virtual {p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
-    const v4, 0x7f0d005f
+    const v3, 0x7f0d005f
 
-    invoke-static {v3, v4, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+    const/4 v4, 0x0
+
+    invoke-static {v2, v3, v4}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_3
+
+    check-cast v2, Lcom/google/android/material/chip/Chip;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
 
     move-result-object v3
 
-    if-eqz v3, :cond_3
+    invoke-virtual {v2, v3}, Landroid/widget/CheckBox;->setText(Ljava/lang/CharSequence;)V
 
-    check-cast v3, Lcom/google/android/material/chip/Chip;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->isDefaultColor()Z
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
+    move-result v3
 
-    move-result-object v4
+    if-eqz v3, :cond_1
 
-    invoke-virtual {v3, v4}, Landroid/widget/CheckBox;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildRole;->isDefaultColor()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    move v4, p2
+    move v3, p2
 
     goto :goto_1
 
     :cond_1
-    invoke-static {v2}, Lcom/discord/models/domain/ModelGuildRole;->getOpaqueColor(Lcom/discord/models/domain/ModelGuildRole;)I
+    invoke-static {v1}, Lcom/discord/models/domain/ModelGuildRole;->getOpaqueColor(Lcom/discord/models/domain/ModelGuildRole;)I
 
-    move-result v4
+    move-result v3
 
     :goto_1
-    sget-object v5, Lcom/discord/utilities/color/ColorCompat;->INSTANCE:Lcom/discord/utilities/color/ColorCompat;
+    sget-object v4, Lcom/discord/utilities/color/ColorCompat;->INSTANCE:Lcom/discord/utilities/color/ColorCompat;
 
-    invoke-virtual {v5, v4}, Lcom/discord/utilities/color/ColorCompat;->createDefaultColorStateList(I)Landroid/content/res/ColorStateList;
+    invoke-virtual {v4, v3}, Lcom/discord/utilities/color/ColorCompat;->createDefaultColorStateList(I)Landroid/content/res/ColorStateList;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v3, v4}, Lcom/google/android/material/chip/Chip;->setChipIconTint(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v2, v3}, Lcom/google/android/material/chip/Chip;->setChipIconTint(Landroid/content/res/ColorStateList;)V
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    new-instance v4, Lcom/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1;
+    new-instance v3, Lcom/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1;
 
-    invoke-direct {v4, v2, p0, p2, v1}, Lcom/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1;-><init>(Lcom/discord/models/domain/ModelGuildRole;Lcom/discord/widgets/roles/RolesListView;IZ)V
+    invoke-direct {v3, v1, p0, p2, v0}, Lcom/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1;-><init>(Lcom/discord/models/domain/ModelGuildRole;Lcom/discord/widgets/roles/RolesListView;IZ)V
 
-    invoke-virtual {v3, v4}, Landroid/widget/CheckBox;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v2, v3}, Landroid/widget/CheckBox;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_2
-    invoke-virtual {p0, v3}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
+    invoke-virtual {p0, v2}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
 
     goto :goto_0
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.google.android.material.chip.Chip"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "roles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
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 8c824f396f..cd9893c736 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
@@ -90,7 +90,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f121412
+    const p1, 0x7f12143c
 
     invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -125,7 +125,7 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f121412
+    const p1, 0x7f12143c
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -138,7 +138,7 @@
     return-object p0
 
     :cond_1
-    const p1, 0x7f1213f5
+    const p1, 0x7f12141f
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -225,7 +225,7 @@
 
     const-string p1, "observable"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -255,9 +255,9 @@
 
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 
@@ -274,7 +274,7 @@
 
     invoke-direct {p1, p3}, Lf/a/o/d/i;-><init>(Landroid/content/Context;)V
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -291,7 +291,7 @@
 
     sget-object p1, Lf/a/o/d/g;->d:Lf/a/o/d/g;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -299,7 +299,7 @@
 
     invoke-direct {p1, p3}, Lf/a/o/d/h;-><init>(Landroid/content/Context;)V
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
index 594f05f71a..22bfbc9b06 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch.smali
@@ -83,7 +83,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -95,13 +95,13 @@
 
     invoke-direct {v1, p0}, Lf/a/o/d/j;-><init>(Lcom/discord/widgets/search/WidgetSearch;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v1, Lf/a/o/d/a;->d:Lf/a/o/d/a;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -111,7 +111,7 @@
 
     const-class v2, Lcom/discord/widgets/search/WidgetSearch;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -280,7 +280,7 @@
 
     const-class p1, Lcom/discord/widgets/search/WidgetSearch;
 
-    invoke-static {p3, p1, p0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p3, p1, p0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -460,7 +460,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0aa2
+    const v0, 0x7f0a0aa7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -470,7 +470,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->searchInput:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a07a1
+    const v0, 0x7f0a07a7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -478,7 +478,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->sendQueryFab:Landroid/view/View;
 
-    const v0, 0x7f0a0aa4
+    const v0, 0x7f0a0aa9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -486,7 +486,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/search/WidgetSearch;->searchSuggestions:Landroid/view/View;
 
-    const v0, 0x7f0a0aa3
+    const v0, 0x7f0a0aa8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -600,7 +600,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -614,7 +614,7 @@
 
     const-class v2, Lcom/discord/widgets/search/WidgetSearch;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
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 203c7391e4..6e71409212 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
@@ -305,7 +305,7 @@
 
     move-result-object v12
 
-    const v13, 0x7f1000fb
+    const v13, 0x7f1000fd
 
     new-array v10, v10, [Ljava/lang/Object;
 
@@ -657,7 +657,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v0, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, v0}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali
index 41725a51af..631cef9fb2 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$SearchResultAdapterEventHandler.smali
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/b/k;->a(Landroid/content/Context;)V
+    invoke-static {p1}, Lf/a/b/m;->a(Landroid/content/Context;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali
index e1adc42b2d..5d661b9c1c 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults.smali
@@ -105,7 +105,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07a0
+    const v0, 0x7f0a07a6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -153,7 +153,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -167,7 +167,7 @@
 
     const-class v2, Lcom/discord/widgets/search/results/WidgetSearchResults;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion$get$1.smali
index a6c233dc30..3e2032dbe1 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion$get$1.smali
@@ -29,7 +29,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/utilities/search/validation/SearchData;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;",
+        "Ljava/util/Collection<",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/search/query/node/QueryNode;",
+        ">;>;",
+        "Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;",
+        ">;"
     }
 .end annotation
 
@@ -71,15 +83,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "searchData"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "queryNodes"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    const-string v0, "history"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 
     move-result-object p2
 
@@ -98,27 +114,6 @@
     invoke-direct {p3, p2, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;-><init>(Ljava/util/List;Ljava/util/List;)V
 
     return-object p3
-
-    :cond_0
-    const-string p1, "history"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "queryNodes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "searchData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion.smali
index c32a087811..2873706578 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model$Companion.smali
@@ -46,7 +46,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchStringProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -96,7 +98,7 @@
 
     const-string v0, "Observable.combineLatest\u2026gestionEntries)\n        }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -108,16 +110,7 @@
 
     const-string v0, "Observable.combineLatest\u2026().distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "searchStringProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali
index 5532ac7eb2..de0d98831c 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model.smali
@@ -86,11 +86,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "query"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_8
+    const-string v0, "suggestionEntries"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -110,37 +112,39 @@
 
     move-result-object p1
 
+    const/4 p2, 0x0
+
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result p2
+    move-result v0
 
-    if-eqz p2, :cond_7
+    if-eqz v0, :cond_7
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object p2
+    move-result-object v0
 
-    check-cast p2, Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
+    check-cast v0, Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;
 
-    invoke-interface {p2}, Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;->getCategory()Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
+    invoke-interface {v0}, Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion;->getCategory()Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
     move-result-object v1
 
-    if-eqz v0, :cond_0
+    if-eqz p2, :cond_0
 
-    if-eq v1, v0, :cond_1
+    if-eq v1, p2, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->suggestionItems:Ljava/util/List;
+    iget-object p2, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->suggestionItems:Ljava/util/List;
 
     new-instance v2, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;
 
     invoke-direct {v2, v1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;)V
 
-    invoke-interface {v0, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    invoke-interface {p2, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    move-object v0, v1
+    move-object p2, v1
 
     :cond_1
     invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
@@ -176,9 +180,9 @@
 
     new-instance v2, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;
 
-    check-cast p2, Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
+    check-cast v0, Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
 
-    invoke-direct {v2, p2}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;)V
 
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -189,9 +193,9 @@
 
     new-instance v2, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;
 
-    check-cast p2, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
+    check-cast v0, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
 
-    invoke-direct {v2, p2}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)V
 
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -202,9 +206,9 @@
 
     new-instance v2, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;
 
-    check-cast p2, Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
+    check-cast v0, Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
 
-    invoke-direct {v2, p2}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;)V
 
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -215,9 +219,9 @@
 
     new-instance v2, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;
 
-    check-cast p2, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
+    check-cast v0, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
 
-    invoke-direct {v2, p2}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)V
 
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -228,9 +232,9 @@
 
     new-instance v2, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;
 
-    check-cast p2, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
+    check-cast v0, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
 
-    invoke-direct {v2, p2}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;)V
 
     invoke-interface {v1, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -238,20 +242,6 @@
 
     :cond_7
     return-void
-
-    :cond_8
-    const-string p1, "suggestionEntries"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;
@@ -328,31 +318,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "query"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "suggestionEntries"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;-><init>(Ljava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "suggestionEntries"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "query"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -370,7 +348,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->query:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -380,7 +358,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;->suggestionEntries:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$1.smali
index bacdc0103a..0d8a8268a9 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/query/FilterType;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/search/query/FilterType;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "filterType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -92,13 +94,4 @@
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/stores/StoreSearchInput;->onFilterClicked(Lcom/discord/utilities/search/query/FilterType;Lcom/discord/utilities/search/strings/SearchStringProvider;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "filterType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$2.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$2.smali
index 1a3b050943..a7cacf22a6 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)V
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "userSuggestion"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;->getTargetType()Lcom/discord/utilities/search/suggestion/entries/UserSuggestion$TargetType;
 
@@ -173,13 +175,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "userSuggestion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$3.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$3.smali
index 9fa0f29760..12557062d8 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "channelSuggestion"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -96,13 +98,4 @@
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/stores/StoreSearchInput;->onInChannelClicked(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;Ljava/lang/String;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "channelSuggestion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$4.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$4.smali
index 6124acc25b..66d77d2560 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "hasAnswerOption"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -106,13 +108,4 @@
     invoke-virtual {v0, p1, v1, v2, v3}, Lcom/discord/stores/StoreSearchInput;->onHasClicked(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "hasAnswerOption"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$5.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$5.smali
index a1e66df003..a6bc4b267b 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -83,7 +83,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "queryNodes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -98,13 +100,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreSearchInput;->onQueryClicked(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "queryNodes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$6.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$6.smali
index 21b5b744f4..f33c297341 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$configureUI$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$onViewBoundOrOnResume$1.smali
index 24f70df373..836b6c83ed 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "model"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;->access$configureUI(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
index a02bca46d1..08af26f388 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
@@ -31,25 +31,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;
 
-    const-class v2, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;
+    const-string v2, "suggestionsRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSuggestionsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "suggestionsRecycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSuggestionsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -61,7 +55,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07ad
+    const v0, 0x7f0a07b3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -92,7 +86,7 @@
     :cond_0
     const-string p0, "searchStringProvider"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -183,37 +177,37 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_5
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_6
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -251,7 +245,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -274,15 +270,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestions;->adapter:Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -298,7 +285,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1}, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;-><init>(Landroid/content/Context;)V
 
@@ -345,7 +332,7 @@
     :cond_0
     const-string v0, "searchStringProvider"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali
index 492145ee6f..740553ed84 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem.smali
@@ -30,7 +30,9 @@
 .method public constructor <init>(Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;->getCategory()Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
@@ -47,15 +49,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;->data:Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component1()Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
@@ -88,22 +81,15 @@
 .method public final copy(Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -121,7 +107,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterItem;->data:Lcom/discord/utilities/search/suggestion/entries/FilterSuggestion;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
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 0a7c92e993..7382ed1ab7 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
@@ -37,7 +37,9 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchSuggestionsAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0226
 
@@ -45,7 +47,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a094d
+    const v0, 0x7f0a0951
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -53,13 +55,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026estion_example_container)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->container:Landroid/view/View;
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a094f
+    const v0, 0x7f0a0953
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +69,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026.suggestion_example_icon)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -75,7 +77,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a094e
+    const v0, 0x7f0a0952
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -83,7 +85,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026uggestion_example_filter)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -91,7 +93,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a094c
+    const v0, 0x7f0a0950
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -99,22 +101,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026uggestion_example_answer)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->answerTextView:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchSuggestionsAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
@@ -150,7 +143,7 @@
 
     if-ne p1, v0, :cond_0
 
-    const p1, 0x7f1213eb
+    const p1, 0x7f121415
 
     goto :goto_0
 
@@ -162,17 +155,17 @@
     throw p1
 
     :cond_1
-    const p1, 0x7f1213e4
+    const p1, 0x7f12140e
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f1213ed
+    const p1, 0x7f121417
 
     goto :goto_0
 
     :cond_3
-    const p1, 0x7f1213e3
+    const p1, 0x7f12140d
 
     :goto_0
     return p1
@@ -201,7 +194,7 @@
 
     if-ne p1, v0, :cond_0
 
-    const p1, 0x7f1213ff
+    const p1, 0x7f121429
 
     goto :goto_0
 
@@ -213,17 +206,17 @@
     throw p1
 
     :cond_1
-    const p1, 0x7f1213fe
+    const p1, 0x7f121428
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f121401
+    const p1, 0x7f12142b
 
     goto :goto_0
 
     :cond_3
-    const p1, 0x7f1213fd
+    const p1, 0x7f121427
 
     :goto_0
     return p1
@@ -255,7 +248,7 @@
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f0803fa
+    const p2, 0x7f0803fd
 
     invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -264,7 +257,7 @@
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f080224
+    const p2, 0x7f080225
 
     invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -273,7 +266,7 @@
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f080336
+    const p2, 0x7f080337
 
     invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -282,7 +275,7 @@
     goto :goto_0
 
     :cond_3
-    const p2, 0x7f080335
+    const p2, 0x7f080336
 
     invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -297,7 +290,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 4
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -319,7 +314,7 @@
 
     const-string v0, "icon.context"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->getIconDrawable(Landroid/content/Context;Lcom/discord/utilities/search/query/FilterType;)Landroid/graphics/drawable/Drawable;
 
@@ -345,7 +340,7 @@
 
     const-string v2, "filterTextView.context.getString(filterTextId)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->answerTextView:Landroid/widget/TextView;
 
@@ -359,7 +354,7 @@
 
     const-string v2, "answerTextView.context.getString(answerTextId)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder;->container:Landroid/view/View;
 
@@ -393,7 +388,7 @@
 
     move-result-object p2
 
-    invoke-static {p2}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p2}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p2
 
@@ -404,15 +399,6 @@
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali
index 4e38dd80f8..9269789e2f 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem.smali
@@ -30,7 +30,9 @@
 .method public constructor <init>(Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;->getHasAnswerOption()Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;
 
@@ -47,15 +49,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;->data:Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component1()Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
@@ -88,22 +81,15 @@
 .method public final copy(Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -121,7 +107,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasItem;->data:Lcom/discord/utilities/search/suggestion/entries/HasSuggestion;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder$Companion.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder$Companion.smali
index 023cc06d26..7e7b2b8aa3 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder$Companion.smali
@@ -72,7 +72,7 @@
 
     if-ne p1, v0, :cond_0
 
-    const p1, 0x7f0803da
+    const p1, 0x7f0803dd
 
     goto :goto_0
 
@@ -84,27 +84,27 @@
     throw p1
 
     :cond_1
-    const p1, 0x7f080320
+    const p1, 0x7f080321
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f080390
+    const p1, 0x7f080393
 
     goto :goto_0
 
     :cond_3
-    const p1, 0x7f080224
+    const p1, 0x7f080225
 
     goto :goto_0
 
     :cond_4
-    const p1, 0x7f0802a8
+    const p1, 0x7f0802a9
 
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f08029e
+    const p1, 0x7f08029f
 
     :goto_0
     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 5ef22ebec4..60898a9718 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
@@ -61,7 +61,9 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchSuggestionsAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0224
 
@@ -69,45 +71,45 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a4
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026stion_item_has_container)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->container:Landroid/view/View;
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    const v0, 0x7f0a07a9
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026uggestions_item_has_icon)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->iconImageView:Landroid/widget/ImageView;
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
     const v0, 0x7f0a07aa
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
+    const-string v0, "itemView.findViewById(R.\u2026stion_item_has_container)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->container:Landroid/view/View;
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const v0, 0x7f0a07af
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "itemView.findViewById(R.\u2026uggestions_item_has_icon)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->iconImageView:Landroid/widget/ImageView;
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const v0, 0x7f0a07b0
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string v0, "itemView.findViewById(R.\u2026uggestions_item_has_text)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -123,22 +125,13 @@
 
     const-string v1, "container.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0}, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;-><init>(Landroid/content/Context;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;->searchStringProvider:Lcom/discord/utilities/search/strings/SearchStringProvider;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchSuggestionsAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
@@ -169,7 +162,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -216,15 +211,6 @@
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali
index 3b447b5253..8bb96d5996 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem.smali
@@ -54,7 +54,9 @@
 .method public constructor <init>(Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "category"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->name()Ljava/lang/String;
 
@@ -71,15 +73,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;->category:Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
     return-void
-
-    :cond_0
-    const-string p1, "category"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;ILjava/lang/Object;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;
@@ -112,22 +105,15 @@
 .method public final copy(Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "category"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "category"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -145,7 +131,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderItem;->category:Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
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 b628b424c6..339a14b076 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
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchSuggestionsAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0220
 
@@ -39,7 +41,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0950
+    const v0, 0x7f0a0954
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,22 +49,13 @@
 
     const-string v0, "itemView.findViewById(R.id.suggestion_item_header)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder;->headerTextView:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchSuggestionsAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getCategoryLabel(Lcom/discord/utilities/search/suggestion/entries/SearchSuggestion$Category;)I
@@ -96,32 +89,32 @@
 
     if-ne v0, v1, :cond_5
 
-    const p1, 0x7f121407
+    const p1, 0x7f121431
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f121408
+    const p1, 0x7f121432
 
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f12140b
+    const p1, 0x7f121435
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f12140a
+    const p1, 0x7f121434
 
     goto :goto_0
 
     :cond_3
-    const p1, 0x7f12140e
+    const p1, 0x7f121438
 
     goto :goto_0
 
     :cond_4
-    const p1, 0x7f12140f
+    const p1, 0x7f121439
 
     :goto_0
     return p1
@@ -151,9 +144,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -172,15 +167,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder.smali
index 7f26237970..ed889d86ad 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder.smali
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchSuggestionsAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0221
 
@@ -39,7 +41,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0951
+    const v0, 0x7f0a0955
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,22 +49,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026eader_history_clear_icon)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder;->clearIcon:Landroid/widget/ImageView;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchSuggestionsAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HistoryHeaderViewHolder;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
@@ -78,9 +71,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -93,15 +88,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali
index 01fbe0f4fc..6f9cce85b9 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem.smali
@@ -30,7 +30,9 @@
 .method public constructor <init>(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;->getChannelId()J
 
@@ -47,15 +49,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;->data:Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component1()Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
@@ -88,22 +81,15 @@
 .method public final copy(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -121,7 +107,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelItem;->data:Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder$onConfigure$1.smali
index 8374ba3ffa..3761db6274 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder$onConfigure$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "channelSuggestion"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder.smali
index fae02e298b..1d0ee1278d 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder.smali
@@ -33,7 +33,9 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchSuggestionsAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0223
 
@@ -41,7 +43,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a3
+    const v0, 0x7f0a07a9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,13 +51,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026n_item_channel_container)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder;->container:Landroid/view/View;
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a8
+    const v0, 0x7f0a07ae
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -63,22 +65,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026stions_item_channel_text)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder;->channelNameTextView:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchSuggestionsAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$InChannelViewHolder;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
@@ -101,7 +94,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -128,15 +123,6 @@
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali
index 3110b584c2..14a00c6382 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem.smali
@@ -30,7 +30,9 @@
 .method public constructor <init>(Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;->hashCode()I
 
@@ -47,15 +49,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;->data:Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component1()Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
@@ -88,22 +81,15 @@
 .method public final copy(Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -121,7 +107,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryItem;->data:Lcom/discord/utilities/search/suggestion/entries/RecentQuerySuggestion;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder.smali
index 78efcf558d..51b2a0c3ee 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder.smali
@@ -33,7 +33,9 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "widgetSearchSuggestionsAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0225
 
@@ -41,7 +43,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a5
+    const v0, 0x7f0a07ab
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,13 +51,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026m_recent_query_container)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;->container:Landroid/view/View;
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07ac
+    const v0, 0x7f0a07b2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -63,22 +65,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026s_item_recent_query_text)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;->headerTextView:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "widgetSearchSuggestionsAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$RecentQueryViewHolder;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
@@ -96,7 +89,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -131,15 +126,6 @@
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali
index 6583cf33d7..0c36dce8cf 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem.smali
@@ -30,7 +30,9 @@
 .method public constructor <init>(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -63,15 +65,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;->data:Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final component1()Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
@@ -104,22 +97,15 @@
 .method public final copy(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;-><init>(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -137,7 +123,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserItem;->data:Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder$onConfigure$1.smali
index fcbb006f8e..b70e03779c 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder$onConfigure$1.smali
@@ -53,9 +53,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder$onConfigure$1;->$user:Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;
 
-    const-string v1, "user"
+    const-string/jumbo v1, "user"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder.smali
index d19670549b..73f3949e5a 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder.smali
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "searchSuggestionsAdapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0227
 
@@ -39,7 +41,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07a6
+    const v0, 0x7f0a07ac
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,22 +49,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026tion_item_user_container)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/UserListItemView;
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder;->container:Lcom/discord/views/UserListItemView;
 
     return-void
-
-    :cond_0
-    const-string p1, "searchSuggestionsAdapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$UserViewHolder;)Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;
@@ -80,7 +73,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 6
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -119,15 +114,6 @@
     invoke-virtual {p2, v0}, Landroid/widget/RelativeLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onChannelClicked$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onChannelClicked$1.smali
index 2d4af6f8bc..8581e3e15c 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onChannelClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onChannelClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onChannelClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestionsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/search/suggestion/entries/ChannelSuggestion;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onClearHistoryClicked$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onClearHistoryClicked$1.smali
index 68c279d3e5..7cd7fe3e59 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onClearHistoryClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onClearHistoryClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onClearHistoryClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestionsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onFilterClicked$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onFilterClicked$1.smali
index f00158b7b3..e1f8c2917b 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onFilterClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onFilterClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onFilterClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestionsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/query/FilterType;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/search/query/FilterType;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onHasClicked$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onHasClicked$1.smali
index 85210f5a0c..aa9fb65506 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onHasClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onHasClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onHasClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestionsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/search/query/node/answer/HasAnswerOption;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onRecentQueryClicked$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onRecentQueryClicked$1.smali
index ea2c82c6d6..7bc4986728 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onRecentQueryClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onRecentQueryClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onRecentQueryClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestionsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .end method
 
 .method public final invoke(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -83,16 +83,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onUserClicked$1.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onUserClicked$1.smali
index 0b20f8ca68..666597cd7e 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onUserClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onUserClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$onUserClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSearchSuggestionsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/search/suggestion/entries/UserSuggestion;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali
index efc4123327..8a51a03a73 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.smali
@@ -141,9 +141,11 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -172,15 +174,6 @@
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;->onClearHistoryClicked:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -300,7 +293,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -313,7 +306,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     packed-switch p2, :pswitch_data_0
 
@@ -373,15 +368,6 @@
     :goto_0
     return-object p1
 
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     nop
 
     :pswitch_data_0
@@ -397,7 +383,7 @@
 .end method
 
 .method public final setOnChannelClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -409,24 +395,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;->onChannelClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClearHistoryClicked(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -436,24 +415,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;->onClearHistoryClicked:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnFilterClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -465,24 +437,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;->onFilterClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnHasClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -494,24 +459,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;->onHasClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnRecentQueryClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -526,24 +484,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;->onRecentQueryClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnUserClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -555,18 +506,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter;->onUserClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView$ViewState.smali b/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView$ViewState.smali
index 4f2a69e284..3c05fd7f17 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView$ViewState.smali
@@ -38,13 +38,17 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "rawMuteText"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "rawUnmuteText"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rawMutedStatusText"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,27 +67,6 @@
     iput-object p7, p0, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;->muteDescriptionText:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "rawMutedStatusText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "rawUnmuteText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "rawMuteText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -274,13 +257,23 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "rawMuteText"
 
-    if-eqz p3, :cond_2
+    move-object v4, p3
 
-    if-eqz p4, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "rawUnmuteText"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rawMutedStatusText"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;
 
@@ -290,12 +283,6 @@
 
     move-object v3, p2
 
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
     move v7, p6
 
     move-object/from16 v8, p7
@@ -303,27 +290,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;-><init>(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "rawMutedStatusText"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "rawUnmuteText"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "rawMuteText"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -347,7 +313,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;->muteEndTime:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -357,7 +323,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;->rawMuteText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -367,7 +333,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;->rawUnmuteText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -377,7 +343,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;->rawMutedStatusText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -393,7 +359,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;->muteDescriptionText:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView.smali b/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView.smali
index b80a2fb789..b8f7910e53 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationMuteSettingsView.smali
@@ -31,61 +31,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/NotificationMuteSettingsView;
 
-    const-class v2, Lcom/discord/widgets/servers/NotificationMuteSettingsView;
+    const-string v2, "muteItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteItem()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "muteItem"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getMuteItem()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/NotificationMuteSettingsView;
 
-    const/4 v2, 0x0
+    const-string v2, "muteItemStatus"
 
-    aput-object v1, v0, v2
+    const-string v3, "getMuteItemStatus()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/NotificationMuteSettingsView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "muteItemStatus"
-
-    const-string v4, "getMuteItemStatus()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/NotificationMuteSettingsView;
 
-    const-class v2, Lcom/discord/widgets/servers/NotificationMuteSettingsView;
+    const-string v2, "muteItemDescription"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteItemDescription()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "muteItemDescription"
-
-    const-string v4, "getMuteItemDescription()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -99,15 +81,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a0631
+    const p2, 0x7f0a0637
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -115,7 +99,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationMuteSettingsView;->muteItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0633
+    const p2, 0x7f0a0639
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -123,7 +107,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationMuteSettingsView;->muteItemStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0632
+    const p2, 0x7f0a0638
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -136,20 +120,6 @@
     invoke-static {p1, p2, p0}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getMuteItem()Lcom/discord/app/AppTextView;
@@ -229,13 +199,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "viewState"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "onMute"
 
-    if-eqz p3, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onUnmute"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/NotificationMuteSettingsView$ViewState;->getRawMuteText()Ljava/lang/String;
 
@@ -294,7 +268,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -347,7 +321,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
@@ -424,25 +398,4 @@
     invoke-virtual {p1, v10}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "onUnmute"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "onMute"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali
index 8e085cab46..cc038573cd 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback.smali
@@ -51,11 +51,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "newItems"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "oldItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/DiffUtil$Callback;-><init>()V
 
@@ -64,20 +66,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback;->oldItems:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "oldItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "newItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -101,7 +89,7 @@
 
     check-cast p1, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali
index b3f5317b80..2c236040c8 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$Item.smali
@@ -26,11 +26,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "overrideSettings"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,20 +43,6 @@
     iput-object p3, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;->overrideSettings:Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
 
     return-void
-
-    :cond_0
-    const-string p1, "overrideSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
index 903a94c0e9..0ef0099884 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
@@ -37,15 +37,19 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClick"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p1, p2, v0}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const p2, 0x7f0a013e
+    const p2, 0x7f0a0141
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -53,13 +57,13 @@
 
     const-string v0, "itemView.findViewById(R.id.category_override_name)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder;->nameTv:Landroid/widget/TextView;
 
-    const p2, 0x7f0a013f
+    const p2, 0x7f0a0142
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,27 +71,13 @@
 
     const-string p2, "itemView.findViewById(R.\u2026category_override_status)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/app/AppTextView;
 
     iput-object p1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder;->statusTv:Lcom/discord/app/AppTextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "onClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -95,7 +85,9 @@
 .method public onBind(Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;->onBind(Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
 
@@ -121,7 +113,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f120758
+    const p1, 0x7f12075a
 
     goto :goto_0
 
@@ -148,13 +140,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 99194ffb02..d6be97df19 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
@@ -39,15 +39,19 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onClick"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, p1, p2, v0}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const p2, 0x7f0a0170
+    const p2, 0x7f0a0173
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,13 +59,13 @@
 
     const-string v0, "itemView.findViewById(R.id.channel_override_name)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->nameTv:Landroid/widget/TextView;
 
-    const p2, 0x7f0a016f
+    const p2, 0x7f0a0172
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -69,13 +73,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026l_override_category_name)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/TextView;
 
     iput-object p2, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->categoryTv:Landroid/widget/TextView;
 
-    const p2, 0x7f0a0171
+    const p2, 0x7f0a0174
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -83,66 +87,57 @@
 
     const-string p2, "itemView.findViewById(R.\u2026.channel_override_status)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/app/AppTextView;
 
     iput-object p1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->statusTv:Lcom/discord/app/AppTextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "onClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public onBind(Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;->onBind(Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->nameTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->nameTv:Landroid/widget/TextView;
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->categoryTv:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->categoryTv:Landroid/widget/TextView;
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;->getParent()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
+
+    goto :goto_0
 
     :cond_0
-    invoke-static {v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;->getOverrideSettings()Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
 
@@ -154,9 +149,9 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f120758
+    const p1, 0x7f12075a
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;->getOverrideSettings()Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
@@ -171,7 +166,7 @@
 
     move-result p1
 
-    :goto_0
+    :goto_1
     iget-object v0, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder;->statusTv:Lcom/discord/app/AppTextView;
 
     const/4 v1, 0x0
@@ -181,11 +176,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali
index 3baf93db65..8bb23e4a57 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1.smali
@@ -49,7 +49,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$onBind$1;->$data:Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;
 
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 4e6a862877..69d348d7e3 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
@@ -96,7 +96,7 @@
 
     if-ne p1, v0, :cond_0
 
-    const p1, 0x7f1206ff
+    const p1, 0x7f120701
 
     goto :goto_0
 
@@ -105,7 +105,7 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f120760
+    const p1, 0x7f120762
 
     goto :goto_0
 
@@ -114,7 +114,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f12075b
+    const p1, 0x7f12075d
 
     goto :goto_0
 
@@ -128,7 +128,9 @@
 .method public onBind(Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
@@ -139,13 +141,4 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
index 4be43f8afd..1d7cb1c38a 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
@@ -47,7 +47,7 @@
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -61,26 +61,19 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onClick"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->onClick:Lkotlin/jvm/functions/Function2;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->data:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "onClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -166,7 +159,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->data:Ljava/util/List;
 
@@ -179,15 +174,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;->onBind(Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -203,7 +189,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder;
     .locals 4
 
-    if-eqz p1, :cond_3
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -238,7 +226,7 @@
 
     move-result-object p1
 
-    new-instance p2, Lj0/c;
+    new-instance p2, Lk0/c;
 
     const-string v0, "An operation is not implemented: "
 
@@ -246,7 +234,7 @@
 
     move-result-object p1
 
-    invoke-direct {p2, p1}, Lj0/c;-><init>(Ljava/lang/String;)V
+    invoke-direct {p2, p1}, Lk0/c;-><init>(Ljava/lang/String;)V
 
     throw p2
 
@@ -259,7 +247,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->onClick:Lkotlin/jvm/functions/Function2;
 
@@ -277,7 +265,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->onClick:Lkotlin/jvm/functions/Function2;
 
@@ -285,15 +273,6 @@
 
     :goto_1
     return-object p2
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Ljava/util/List;)V
@@ -310,7 +289,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$DiffCallback;
 
@@ -326,20 +307,11 @@
 
     const-string v1, "DiffUtil.calculateDiff(D\u2026back(value, field), true)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->data:Ljava/util/List;
 
     invoke-virtual {v0, p0}, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->dispatchUpdatesTo(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
index 0b8b30a7f8..e8ef573016 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem.smali
@@ -217,7 +217,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryItem;->name:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
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 b9c2947583..0e2c474b9d 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
@@ -39,7 +39,9 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/SettingsChannelListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00cc
 
@@ -47,7 +49,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a089c
+    const v0, 0x7f0a08a2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +57,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026_list_category_item_text)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -63,7 +65,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a089b
+    const v0, 0x7f0a08a1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,20 +73,11 @@
 
     const-string v0, "itemView.findViewById(R.\u2026_list_category_item_drag)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;->dragIcon:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -121,7 +114,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;)V
     .locals 2
 
-    if-eqz p2, :cond_4
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -165,13 +160,13 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p2
 
-    const v0, 0x7f121655
+    const v0, 0x7f12167f
 
     invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -200,15 +195,6 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
index a6af500385..0359f8568e 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem.smali
@@ -29,9 +29,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZJZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,15 +46,6 @@
     iput-boolean p5, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;->canManageCategoryOfChannel:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;Lcom/discord/models/domain/ModelChannel;ZJZILjava/lang/Object;)Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;
@@ -146,32 +139,25 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZJZ)Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
 
-    new-instance v6, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move v2, p2
+    move-object v2, p1
 
-    move-wide v3, p3
+    move v3, p2
 
-    move v5, p5
+    move-wide v4, p3
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;-><init>(Lcom/discord/models/domain/ModelChannel;ZJZ)V
+    move v6, p5
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;-><init>(Lcom/discord/models/domain/ModelChannel;ZJZ)V
 
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -189,7 +175,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
index 132a85a357..793a4423a0 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
@@ -43,7 +43,9 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/SettingsChannelListAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00cd
 
@@ -51,7 +53,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a089e
+    const v0, 0x7f0a08a4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -59,7 +61,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026s_channel_list_item_hash)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -67,7 +69,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a089f
+    const v0, 0x7f0a08a5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -75,7 +77,7 @@
 
     const-string v0, "itemView.findViewById(R.\u2026s_channel_list_item_name)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -83,7 +85,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a08a0
+    const v0, 0x7f0a08a6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -91,13 +93,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026st_item_selected_overlay)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;->selectedOverlay:Landroid/view/View;
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a089d
+    const v0, 0x7f0a08a3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -105,22 +107,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026s_channel_list_item_drag)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
     iput-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;->dragIcon:Landroid/widget/ImageView;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -157,9 +150,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -171,6 +164,8 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     iget-object p1, p0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
@@ -210,17 +205,17 @@
 
     if-eq v0, v1, :cond_1
 
-    const v0, 0x7f080260
+    const v0, 0x7f080261
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f08025b
+    const v0, 0x7f08025c
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f08026a
+    const v0, 0x7f08026b
 
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -257,13 +252,6 @@
 
     :cond_4
     return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
index 0242f46727..30447a73ff 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition.smali
@@ -106,7 +106,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/SettingsChannelListAdapter$UpdatedPosition;->parentId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.smali
index dd48113507..f2d01646cb 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SettingsChannelListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;",
         "Ljava/lang/Long;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,49 +57,51 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;)Ljava/lang/Long;
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "item"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;->getType()I
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    if-eq v1, v2, :cond_0
+    if-eq v0, v1, :cond_0
 
-    sget-object v3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const-string v1, "Invalid type: "
+    const-string v0, "Invalid type: "
 
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-interface {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;->getType()I
 
     move-result p1
 
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
+
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x6
 
-    const/4 v7, 0x6
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
-    invoke-static/range {v3 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+    const/4 p1, 0x0
 
     goto :goto_0
 
@@ -112,7 +114,7 @@
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
@@ -129,17 +131,10 @@
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p1
 
     :goto_0
-    return-object v0
-
-    :cond_2
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali
index 7f3d853285..8252ebdf56 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SettingsChannelListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali
index b5f5a2a4e0..716480d8f4 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SettingsChannelListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;)Z
     .locals 2
 
-    if-eqz p1, :cond_2
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;->getType()I
 
@@ -109,13 +111,4 @@
 
     :goto_0
     return p1
-
-    :cond_2
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1.smali
index b45fce5086..406911ea68 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SettingsChannelListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,20 +74,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "map"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1;->$onPositionUpdateListener:Lrx/functions/Action1;
 
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "map"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
index 8aa59394cd..9343841d9f 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter.smali
@@ -79,7 +79,9 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Z)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -97,15 +99,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroidx/recyclerview/widget/RecyclerView;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -286,7 +279,7 @@
 
     const-string v9, "item.getKey()"
 
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v9, Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1;->INSTANCE:Lcom/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1;
 
@@ -387,7 +380,7 @@
 
     invoke-interface {v0, v8, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {v11, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v11, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -436,7 +429,7 @@
     :cond_7
     invoke-direct {p0, v0, v1}, Lcom/discord/widgets/servers/SettingsChannelListAdapter;->handleChangedPositions(Ljava/util/Map;Ljava/util/Map;)V
 
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     return-object v0
 .end method
@@ -480,7 +473,7 @@
 
     const-string v1, "itemAbove"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;->getType()I
 
@@ -523,7 +516,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -536,7 +529,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -564,19 +559,10 @@
 
     :goto_0
     return-object p1
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onNewPositions(Ljava/util/Map;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -587,18 +573,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "newPositions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newPositions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickListener(Lkotlin/jvm/functions/Function1;)V
@@ -632,7 +611,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onPositionUpdateListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$setPositionUpdateListener$1;
 
@@ -641,13 +622,4 @@
     iput-object v0, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter;->onPositionUpdateListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onPositionUpdateListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali
index c2a255a5aa..4de5652b23 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;J)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 
@@ -61,13 +63,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali
index c1dc224d1b..d5685eb0f7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerDeleteDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lcom/discord/models/domain/ModelGuild;",
@@ -46,64 +46,39 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion.smali
index eb2a209878..17949f8ecd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model$Companion.smali
@@ -83,7 +83,7 @@
 
     const-string p2, "Observable.combineLatest\u2026      ::Model\n          )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali
index aeba6824a9..7de69b1236 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$Model.smali
@@ -46,9 +46,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "me"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,15 +59,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali
index 4ccf84abea..717e9a0fb8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$configureUI$2.smali
@@ -105,7 +105,7 @@
 
     const/4 v3, 0x4
 
-    invoke-static {v0, v1, v2, v3}, Lf/a/b/q;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
+    invoke-static {v0, v1, v2, v3}, Lf/a/b/s;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1.smali
index 24fb828834..1d365a10ae 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerDeleteDialog$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerDeleteDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->access$configureUI(Lcom/discord/widgets/servers/WidgetServerDeleteDialog;Lcom/discord/widgets/servers/WidgetServerDeleteDialog$Model;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
index 040d86cd49..56a7cfc6f8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerDeleteDialog.smali
@@ -42,121 +42,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
+    const-string v2, "header"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeader()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "header"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeader()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "body"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBody()Lcom/discord/app/AppTextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "body"
-
-    const-string v4, "getBody()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
+    const-string v2, "cancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancel"
-
-    const-string v4, "getCancel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
+    const-string v2, "save"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSave()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "save"
-
-    const-string v4, "getSave()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
+    const-string v2, "mfaWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMfaWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mfaWrap"
-
-    const-string v4, "getMfaWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;
+    const-string v2, "mfa"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMfa()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mfa"
-
-    const-string v4, "getMfa()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -180,7 +144,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a07db
+    const v0, 0x7f0a07e1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +152,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07de
+    const v0, 0x7f0a07e4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +160,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d9
+    const v0, 0x7f0a07df
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -204,7 +168,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07da
+    const v0, 0x7f0a07e0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -212,7 +176,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->save$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07dd
+    const v0, 0x7f0a07e3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -220,7 +184,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerDeleteDialog;->mfaWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07dc
+    const v0, 0x7f0a07e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -281,7 +245,7 @@
 
     const-string v4, "guild.name"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -335,7 +299,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     aput-object v3, v1, v5
 
@@ -549,7 +513,7 @@
 
     const-string v1, "Model.get(guildId)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali
index 54ee61e12d..1520f0b3e4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerNotifications.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,11 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;",
+        ">;>;"
     }
 .end annotation
 
@@ -84,7 +87,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->getChannelOverrides()Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali
index 685c197f5a..adbc4cb7ec 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.smali
@@ -29,7 +29,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/List<",
+        "Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/utilities/channel/GuildChannelsInfo;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;",
+        ">;>;"
     }
 .end annotation
 
@@ -100,7 +112,7 @@
 
     const-string v0, "guildChannels"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3, p2}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getSortedVisibleChannels(Ljava/util/Map;)Ljava/util/List;
 
@@ -108,7 +120,7 @@
 
     const-string v0, "channelOverrides"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -140,7 +152,7 @@
 
     const-string v5, "it"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getMessageNotifications()I
 
@@ -209,7 +221,7 @@
 
     const-string v5, "override"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getChannelId()J
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
index e2ba291766..acde33d5cd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Companion.smali
@@ -65,7 +65,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -107,7 +107,9 @@
 .method public final launch(JLandroid/content/Context;)V
     .locals 2
 
-    if-eqz p3, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -121,20 +123,11 @@
 
     const-string p2, "Intent()\n          .putE\u2026.EXTRA_GUILD_ID, guildId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    invoke-static {p3, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p3, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali
index 18625701b5..9acaed345e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion$get$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        "Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;",
+        "Lcom/discord/widgets/servers/WidgetServerNotifications$Model;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion.smali
index ea58867627..314264d905 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model$Companion.smali
@@ -82,7 +82,7 @@
 
     const-string p2, "Observable\n          .co\u2026  } else null\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -94,7 +94,7 @@
 
     const-string p2, "Observable\n          .co\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali
index bb61a7cfc8..c93f73bee6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$Model.smali
@@ -56,11 +56,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "guildSettings"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -108,14 +110,19 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildPreview;->getApproximateMemberCount()Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_1
 
     :cond_1
-    iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->approximateMemberCount:Ljava/lang/Integer;
+    const/4 p1, 0x0
 
-    if-eqz v0, :cond_2
+    :goto_1
+    iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->approximateMemberCount:Ljava/lang/Integer;
 
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
     move-result p1
 
@@ -125,29 +132,15 @@
 
     const/4 p1, 0x1
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     const/4 p1, 0x0
 
-    :goto_1
+    :goto_2
     iput-boolean p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->isAboveNotifyAllSize:Z
 
     return-void
-
-    :cond_3
-    const-string p1, "guildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerNotifications$Model;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerNotifications$Model;
@@ -210,31 +203,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;)Lcom/discord/widgets/servers/WidgetServerNotifications$Model;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guildSettings"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelNotificationSettings;Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -252,7 +233,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -262,7 +243,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->guildSettings:Lcom/discord/models/domain/ModelNotificationSettings;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -272,7 +253,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->guildProfile:Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali
index c13b921d0d..6fc8c7c856 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali
@@ -47,11 +47,11 @@
 
     move-result-object v0
 
-    const-string v1, "view"
+    const-string/jumbo v1, "view"
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali
index 3728602e5c..ebcf7b11b3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali
@@ -71,7 +71,7 @@
 
     const-string p1, "notificationsSwitchEveryone.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$1;->$model:Lcom/discord/widgets/servers/WidgetServerNotifications$Model;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali
index 506ef0c140..b36e2435a9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali
@@ -71,7 +71,7 @@
 
     const-string p1, "notificationsSwitchRoles.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$2;->$model:Lcom/discord/widgets/servers/WidgetServerNotifications$Model;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali
index 98245ecad1..b572b180c4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali
@@ -71,7 +71,7 @@
 
     const-string p1, "notificationsSwitchPush.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$3;->$model:Lcom/discord/widgets/servers/WidgetServerNotifications$Model;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onMute$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onMute$1.smali
index d5eaaed14a..b6a7e13b3b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onMute$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onMute$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$onMute$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     const-string v4, "parentFragmentManager"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$Companion;->showForGuild(JLandroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onUnmute$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onUnmute$1.smali
index 139adb4eaf..4b318b3b63 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onUnmute$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$onUnmute$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$onUnmute$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v3, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$onUnmute$1;->$guildId:J
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali
index 9f69e712d5..ead6e6d5c3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali
@@ -61,7 +61,9 @@
 .method public onSwiped(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
     .locals 9
 
-    if-eqz p1, :cond_2
+    const-string/jumbo p2, "viewHolder"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1;->this$0:Lcom/discord/widgets/servers/WidgetServerNotifications;
 
@@ -77,7 +79,7 @@
 
     move-result p1
 
-    invoke-static {p2, p1}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {p2, p1}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -113,7 +115,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -142,7 +144,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v0, Lcom/discord/models/domain/ModelNotificationSettings;->FREQUENCY_UNSET:I
 
@@ -150,13 +152,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.smali
index 734b4e779e..c15972d490 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,11 +74,13 @@
 .method public final invoke(Landroid/view/View;Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "itemView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->Companion:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;
 
@@ -88,7 +90,7 @@
 
     const-string p1, "itemView.context"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$Item;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -107,18 +109,4 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;->launch$default(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;Landroid/content/Context;JZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali
index b1a461504d..60258e851b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$2.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1.smali
index 4cd46cde6a..5548c79c42 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerNotifications$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2.smali
index 6036d8be05..8bf40e9a25 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;->setData(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
index 32304fac3a..3f989a945c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
@@ -54,221 +54,155 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "notificationMuteSettingsView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationMuteSettingsView()Lcom/discord/widgets/servers/NotificationMuteSettingsView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "notificationMuteSettingsView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getNotificationMuteSettingsView()Lcom/discord/widgets/servers/NotificationMuteSettingsView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const/4 v2, 0x0
+    const-string v2, "frequencyDivider"
 
-    aput-object v1, v0, v2
+    const-string v3, "getFrequencyDivider()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "frequencyDivider"
-
-    const-string v4, "getFrequencyDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "frequencyWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFrequencyWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "frequencyWrap"
-
-    const-string v4, "getFrequencyWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "frequencyRadioAll"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFrequencyRadioAll()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "frequencyRadioAll"
-
-    const-string v4, "getFrequencyRadioAll()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "frequencyRadioMentions"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFrequencyRadioMentions()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "frequencyRadioMentions"
-
-    const-string v4, "getFrequencyRadioMentions()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "frequencyRadioNothing"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFrequencyRadioNothing()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "frequencyRadioNothing"
-
-    const-string v4, "getFrequencyRadioNothing()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "notificationsSwitchEveryone"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsSwitchEveryone()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsSwitchEveryone"
-
-    const-string v4, "getNotificationsSwitchEveryone()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "notificationsSwitchRoles"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsSwitchRoles()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsSwitchRoles"
-
-    const-string v4, "getNotificationsSwitchRoles()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "notificationsSwitchPush"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsSwitchPush()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsSwitchPush"
-
-    const-string v4, "getNotificationsSwitchPush()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "addOverride"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAddOverride()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "addOverride"
-
-    const-string v4, "getAddOverride()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotifications;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotifications;
+    const-string v2, "overrideList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOverrideList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "overrideList"
-
-    const-string v4, "getOverrideList()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
@@ -292,7 +226,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07ba
+    const v0, 0x7f0a07c0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -300,7 +234,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->notificationMuteSettingsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b8
+    const v0, 0x7f0a07be
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -308,7 +242,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b9
+    const v0, 0x7f0a07bf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -316,7 +250,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b5
+    const v0, 0x7f0a07bb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -324,7 +258,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyRadioAll$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b6
+    const v0, 0x7f0a07bc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -332,7 +266,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyRadioMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b7
+    const v0, 0x7f0a07bd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -340,7 +274,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->frequencyRadioNothing$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07b4
+    const v0, 0x7f0a07ba
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -348,7 +282,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->notificationsSwitchEveryone$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bc
+    const v0, 0x7f0a07c2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -356,7 +290,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->notificationsSwitchRoles$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bb
+    const v0, 0x7f0a07c1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -364,7 +298,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->notificationsSwitchPush$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a044c
+    const v0, 0x7f0a0452
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -372,7 +306,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->addOverride$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a044f
+    const v0, 0x7f0a0455
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -433,7 +367,7 @@
     :cond_0
     const-string p0, "overrideAdapter"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -472,7 +406,7 @@
     :cond_0
     const-string p1, "notificationSettingsRadioManager"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -494,7 +428,7 @@
 
     if-eqz p1, :cond_3
 
-    const v0, 0x7f120dfc
+    const v0, 0x7f120e22
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -552,7 +486,7 @@
 
     invoke-static {v0, v3, v4, v2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v2, 0x7f121001
+    const v2, 0x7f12102b
 
     invoke-virtual {v0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -626,7 +560,7 @@
 
     move-result-object v7
 
-    const v2, 0x7f120756
+    const v2, 0x7f120758
 
     new-array v5, v4, [Ljava/lang/Object;
 
@@ -646,9 +580,9 @@
 
     const-string v2, "getString(\n            R\u2026odel.guild.name\n        )"
 
-    invoke-static {v8, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f120791
+    const v5, 0x7f120793
 
     new-array v9, v4, [Ljava/lang/Object;
 
@@ -666,9 +600,9 @@
 
     move-result-object v9
 
-    invoke-static {v9, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f120752
+    const v2, 0x7f120754
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -676,11 +610,11 @@
 
     const-string v2, "getString(R.string.form_label_mobile_server_muted)"
 
-    invoke-static {v10, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v11, 0x7f120753
+    const v11, 0x7f120755
 
-    const v2, 0x7f120757
+    const v2, 0x7f120759
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -736,7 +670,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120786
+    const v3, 0x7f120788
 
     invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -744,9 +678,9 @@
 
     const-string v5, "getString(R.string.form_label_suppress_everyone)"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v3}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v3
 
@@ -780,7 +714,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120787
+    const v3, 0x7f120789
 
     invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -788,9 +722,9 @@
 
     const-string v5, "getString(R.string.form_label_suppress_roles)"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v3}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v3
 
@@ -850,7 +784,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120760
+    const v3, 0x7f120762
 
     invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -858,9 +792,9 @@
 
     const-string v4, "getString(R.string.form_label_only_mentions)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v3}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v3
 
@@ -894,7 +828,7 @@
 .end method
 
 .method private final createSwipeableItemTouchHelper()Landroidx/recyclerview/widget/ItemTouchHelper;
-    .locals 5
+    .locals 4
 
     new-instance v0, Lcom/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration;
 
@@ -908,24 +842,18 @@
 
     move-result-object v2
 
-    const v3, 0x7f08029c
+    const v3, 0x7f08029d
 
     invoke-static {v2, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
+    const/16 v3, 0x8
 
-    move-result-object v3
-
-    const v4, 0x7f0701ed
-
-    invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getDimension(I)F
+    invoke-static {v3}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v3
 
-    float-to-int v3, v3
-
     invoke-direct {v0, v1, v2, v3}, Lcom/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration;-><init>(ILandroid/graphics/drawable/Drawable;I)V
 
     new-instance v1, Landroidx/recyclerview/widget/ItemTouchHelper;
@@ -1170,57 +1098,57 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     new-instance p1, Lcom/discord/views/RadioManager;
 
-    const/4 v1, 0x3
+    const/4 v0, 0x3
 
-    new-array v1, v1, [Lcom/discord/views/CheckedSetting;
+    new-array v0, v0, [Lcom/discord/views/CheckedSetting;
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getFrequencyRadioAll()Lcom/discord/views/CheckedSetting;
 
-    move-result-object v2
+    move-result-object v1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    aput-object v2, v1, v3
-
-    const/4 v2, 0x1
+    aput-object v1, v0, v2
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getFrequencyRadioMentions()Lcom/discord/views/CheckedSetting;
 
-    move-result-object v4
+    move-result-object v1
 
-    aput-object v4, v1, v2
+    const/4 v3, 0x1
 
-    const/4 v2, 0x2
+    aput-object v1, v0, v3
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getFrequencyRadioNothing()Lcom/discord/views/CheckedSetting;
 
-    move-result-object v4
-
-    aput-object v4, v1, v2
-
-    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
     move-result-object v1
 
-    invoke-direct {p1, v1}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
+    const/4 v3, 0x2
+
+    aput-object v1, v0, v3
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->notificationSettingsRadioManager:Lcom/discord/views/RadioManager;
 
     new-instance p1, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;
 
-    sget-object v1, Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$1;
+    sget-object v0, Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerNotifications$onViewBound$1;
 
-    invoke-direct {p1, v1}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;-><init>(Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {p1, v0}, Lcom/discord/widgets/servers/NotificationsOverridesAdapter;-><init>(Lkotlin/jvm/functions/Function2;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->overrideAdapter:Lcom/discord/widgets/servers/NotificationsOverridesAdapter;
 
@@ -1228,17 +1156,17 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v3}, Landroidx/recyclerview/widget/RecyclerView;->setNestedScrollingEnabled(Z)V
+    invoke-virtual {p1, v2}, Landroidx/recyclerview/widget/RecyclerView;->setNestedScrollingEnabled(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getOverrideList()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->overrideAdapter:Lcom/discord/widgets/servers/NotificationsOverridesAdapter;
+    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications;->overrideAdapter:Lcom/discord/widgets/servers/NotificationsOverridesAdapter;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->createSwipeableItemTouchHelper()Landroidx/recyclerview/widget/ItemTouchHelper;
 
@@ -1277,16 +1205,11 @@
     :cond_0
     const-string p1, "overrideAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1348,7 +1271,7 @@
 
     const-string v1, "getNotificationOverrides(guildId)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali
index 8311473b7b..c9fc8da00c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.smali
@@ -29,7 +29,17 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Lcom/discord/utilities/channel/GuildChannelsInfo;",
+        "Ljava/lang/String;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/utilities/mg_recycler/CategoricalDragAndDropAdapter$Payload;",
+        ">;>;"
     }
 .end annotation
 
@@ -98,7 +108,7 @@
 
     const-string v0, "channels"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getSortedVisibleChannels(Ljava/util/Map;)Ljava/util/List;
 
@@ -149,13 +159,13 @@
 
     const-string v2, "it.name"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "filter"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, p3, v3}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v1, p3, v3}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali
index 43ffdd0c98..800fd7a3fd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion.smali
@@ -96,7 +96,7 @@
 
     const-string p2, "Observable.combineLatest\u2026              }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -114,7 +114,9 @@
 .method public final launch(Landroid/content/Context;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -128,20 +130,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026.EXTRA_GUILD_ID, guildId)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1.smali
index 8f9e6cdb0e..2d49f8e5ac 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotificationsOverrideSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1;->this$0:Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2.smali
index 95d35d6dd8..9b1201e5a8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotificationsOverrideSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     const-string v0, "it"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
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 0d4e84c336..631611f5c0 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
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerNotificationsOverrideSelector.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,9 +81,9 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->toMutableList(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 7e456bb1b3..f1acae861e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
@@ -43,41 +43,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
+    const-string v2, "searchInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "searchInput"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
 
-    const/4 v2, 0x0
+    const-string v2, "channelList"
 
-    aput-object v1, v0, v2
+    const-string v3, "getChannelList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "channelList"
-
-    const-string v4, "getChannelList()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -101,7 +89,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a044e
+    const v0, 0x7f0a0454
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -109,7 +97,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a044d
+    const v0, 0x7f0a0453
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -140,7 +128,7 @@
     :cond_0
     const-string p0, "channelsAdapter"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -216,37 +204,39 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const/4 p1, 0x1
+    const/4 p1, 0x0
+
+    const/4 v0, 0x1
 
     const/4 v1, 0x0
 
-    invoke-static {p0, v1, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120ffc
+    const v0, 0x7f121026
 
-    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12142c
+    const v0, 0x7f121456
 
-    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object p1
+    move-result-object v0
 
     new-instance v2, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1;
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$1;-><init>(Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;)V
 
-    invoke-static {p1, p0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
+    invoke-static {v0, p0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
-    sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
     new-instance v2, Lcom/discord/widgets/servers/SettingsChannelListAdapter;
 
@@ -254,45 +244,38 @@
 
     move-result-object v3
 
-    invoke-direct {v2, v3, v1}, Lcom/discord/widgets/servers/SettingsChannelListAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Z)V
+    invoke-direct {v2, v3, p1}, Lcom/discord/widgets/servers/SettingsChannelListAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Z)V
 
-    invoke-virtual {p1, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    move-result-object p1
+    move-result-object v0
 
-    check-cast p1, Lcom/discord/widgets/servers/SettingsChannelListAdapter;
+    check-cast v0, Lcom/discord/widgets/servers/SettingsChannelListAdapter;
 
-    iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->channelsAdapter:Lcom/discord/widgets/servers/SettingsChannelListAdapter;
+    iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->channelsAdapter:Lcom/discord/widgets/servers/SettingsChannelListAdapter;
 
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
 
-    new-instance v0, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;
+    new-instance v1, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;-><init>(Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBound$2;-><init>(Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/servers/SettingsChannelListAdapter;->setOnClickListener(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/SettingsChannelListAdapter;->setOnClickListener(Lkotlin/jvm/functions/Function1;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->getChannelList()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setNestedScrollingEnabled(Z)V
+    invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->setNestedScrollingEnabled(Z)V
 
     return-void
 
     :cond_0
     const-string p1, "channelsAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -318,7 +301,7 @@
 
     const-string v4, "filterPublisher"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, v0, v1, v3}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion;->access$get(Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion;JLrx/subjects/BehaviorSubject;)Lrx/Observable;
 
@@ -326,7 +309,7 @@
 
     const-string v1, "get(guildId, filterPublisher)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali
index 0999b71786..3125222b3d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;JLjava/lang/String;)Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
 
@@ -65,13 +67,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali
index 334edecbaf..efbba12d35 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelVoiceRegion;",
+        ">;",
+        "Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;",
+        ">;"
     }
 .end annotation
 
@@ -74,7 +79,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;-><init>(Ljava/util/List;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion.smali
index 1f7dab53a0..f69458a986 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion.smali
@@ -66,13 +66,13 @@
 
     sget-object p2, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion$get$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "RestAPI\n              .a\u2026       .map { Model(it) }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali
index 9e3d79e935..c833739282 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model.smali
@@ -52,7 +52,7 @@
 .end method
 
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -63,15 +63,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "regions"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance v0, Ljava/util/ArrayList;
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -81,49 +81,42 @@
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    check-cast v2, Lcom/discord/models/domain/ModelVoiceRegion;
+    check-cast v1, Lcom/discord/models/domain/ModelVoiceRegion;
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoiceRegion;->isDeprecated()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoiceRegion;->isDeprecated()Z
 
-    move-result v3
+    move-result v2
 
-    if-nez v3, :cond_1
+    if-nez v2, :cond_1
 
-    new-instance v3, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;
+    new-instance v2, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;
 
-    invoke-direct {v3, v2}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;-><init>(Lcom/discord/models/domain/ModelVoiceRegion;)V
+    invoke-direct {v2, v1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;-><init>(Lcom/discord/models/domain/ModelVoiceRegion;)V
 
     goto :goto_1
 
     :cond_1
-    move-object v3, v0
+    const/4 v2, 0x0
 
     :goto_1
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
-    invoke-interface {v1, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_2
-    iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;->voiceRegions:Ljava/util/List;
+    iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;->voiceRegions:Ljava/util/List;
 
     return-void
-
-    :cond_3
-    const-string p1, "regions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali
index 7bdd1886c3..d00019bdcb 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion$1.smali
@@ -63,7 +63,7 @@
 
     const-string p2, "data"
 
-    invoke-static {p3, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, p3}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion.smali
index a6ee509191..f64b9d3640 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion.smali
@@ -41,25 +41,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;
+    const-string v2, "name"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "name"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getName()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,7 +61,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;ILcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
@@ -80,13 +74,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;->this$0:Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;
 
     invoke-direct {p0, p2, p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0814
+    const p1, 0x7f0a081a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -105,15 +101,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getName()Landroid/widget/TextView;
@@ -141,7 +128,9 @@
 .method public onConfigure(ILcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;)V
     .locals 7
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -165,15 +154,15 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080276
+    const p1, 0x7f080277
 
-    const v3, 0x7f080276
+    const v3, 0x7f080277
 
     goto :goto_0
 
@@ -208,15 +197,6 @@
     invoke-static/range {v0 .. v6}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali
index c4e27779d7..ffcb6caa5d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter.smali
@@ -59,11 +59,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "recycler"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "callbackRegionSelected"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -72,20 +74,6 @@
     iput-object p3, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;->callbackRegionSelected:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "callbackRegionSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getCallbackRegionSelected$p(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;)Lkotlin/jvm/functions/Function1;
@@ -119,7 +107,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;
 
@@ -128,15 +118,6 @@
     invoke-direct {p1, p0, p2, p0}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter$ItemRegion;-><init>(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;ILcom/discord/widgets/servers/WidgetServerRegionSelectDialog$RegionAdapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setSelectedRegion$app_productionDiscordExternalRelease(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali
index 4f65a07fb7..4598690db2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion.smali
@@ -27,7 +27,9 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelVoiceRegion;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "model"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoiceRegion;->getId()Ljava/lang/String;
 
@@ -35,7 +37,7 @@
 
     const-string v1, "model.id"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoiceRegion;->getName()Ljava/lang/String;
 
@@ -43,30 +45,23 @@
 
     const-string v1, "model.name"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -75,20 +70,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;
@@ -136,31 +117,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -178,7 +147,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -188,7 +157,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;->name:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2.smali
index 3e215228a1..c11fb61c97 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "voiceRegion"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
 
@@ -83,13 +85,4 @@
     invoke-virtual {p1}, Lcom/discord/app/AppDialog;->dismiss()V
 
     return-void
-
-    :cond_1
-    const-string p1, "voiceRegion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3.smali
index 13049df919..d505dc4d58 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerRegionSelectDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3;->this$0:Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;->access$configureUI(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
index f77f01f73d..983d4e96f7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog.smali
@@ -52,41 +52,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
+    const-string v2, "list"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "list"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getList()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "cancelBtn"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCancelBtn()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "cancelBtn"
-
-    const-string v4, "getCancelBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -110,7 +98,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0815
+    const v0, 0x7f0a081b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -118,7 +106,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog;->list$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a013d
+    const v0, 0x7f0a0140
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -170,7 +158,7 @@
     :cond_1
     const-string p1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
index 01c1632bd4..23c27c1ef7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Landroid/content/Context;J)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/servers/WidgetServerSettings;
 
@@ -50,16 +52,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, v0, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali
index f7c8ad19c7..a64b8e0d7d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali
@@ -33,7 +33,20 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Long;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lcom/discord/widgets/servers/WidgetServerSettings$Model;",
+        ">;"
     }
 .end annotation
 
@@ -96,7 +109,7 @@
 
     const-string v1, "categories"
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getOwnerId()J
 
@@ -104,7 +117,7 @@
 
     const-string v3, "me"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -128,7 +141,7 @@
     :goto_0
     const-string v1, "channelPermissions"
 
-    invoke-static {p5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion.smali
index 262f7ed205..1a19922d46 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion.smali
@@ -102,7 +102,7 @@
 
     const-string p2, "Observable\n          .co\u2026GuildContext)\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -114,7 +114,7 @@
 
     const-string p2, "Observable\n          .co\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali
index 7fed35cd1f..ad77966cb1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model.smali
@@ -48,11 +48,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/utilities/permissions/ManageGuildContext;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "manageGuildContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,20 +63,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettings$Model;->manageGuildContext:Lcom/discord/utilities/permissions/ManageGuildContext;
 
     return-void
-
-    :cond_0
-    const-string p1, "manageGuildContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerSettings$Model;Lcom/discord/models/domain/ModelGuild;Lcom/discord/utilities/permissions/ManageGuildContext;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerSettings$Model;
@@ -122,31 +110,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Lcom/discord/utilities/permissions/ManageGuildContext;)Lcom/discord/widgets/servers/WidgetServerSettings$Model;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "manageGuildContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettings$Model;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettings$Model;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/utilities/permissions/ManageGuildContext;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "manageGuildContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -164,7 +140,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettings$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -174,7 +150,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettings$Model;->manageGuildContext:Lcom/discord/utilities/permissions/ManageGuildContext;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.smali
index 51da875da3..252df20ecc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.smali
@@ -58,13 +58,13 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const p2, 0x7f0a05cf
+    const p2, 0x7f0a05d5
 
     if-eq p1, p2, :cond_0
 
@@ -81,7 +81,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings$configureToolbar$1;->$guild:Lcom/discord/models/domain/ModelGuild;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali
index ecc6d25270..02a908a9e9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$1.smali
@@ -39,11 +39,11 @@
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Companion;
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali
index 74605744c0..b3ed1e431c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$10.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali
index 89b6976dda..d3f4b0eea9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$11.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$12.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$12.smali
index 44a05c75af..6817e9385d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$12.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$12.smali
@@ -39,11 +39,11 @@
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsBans$Companion;
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$13.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$13.smali
index 3ee5e99762..6747d75df6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$13.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$13.smali
@@ -39,11 +39,11 @@
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Companion;
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali
index 73475a4656..889077f44c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$2.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali
index 3123418469..741460a2f5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$3.smali
@@ -39,11 +39,11 @@
 
     sget-object v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->Companion:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion;
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
@@ -69,7 +69,7 @@
 
     const-string v4, "model.guild.name"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1, v1, v2, v3}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion;->create(Landroid/content/Context;JLjava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali
index d7b211ad13..cf0531894b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$4.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali
index 011cce838f..b134544ea5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$5.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali
index b88c00ab1c..2384dd856f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$6.smali
@@ -39,11 +39,11 @@
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion;
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali
index 45b1ef458c..e22b494b7e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$7.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali
index 0a369b56e1..db50208181 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$8.smali
@@ -39,11 +39,11 @@
 
     sget-object v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;->Companion:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$Companion;
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali
index 7ca2d7ebbc..b4beb7b905 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$9.smali
@@ -37,9 +37,9 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    const-string v0, "v"
+    const-string/jumbo v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1.smali
index 8f6dee7e1d..684394e496 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/WidgetServerSettings$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerSettings$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettings;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/WidgetServerSettings$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettings;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/WidgetServerSettings$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/widgets/servers/WidgetServerSettings$Model;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/WidgetServerSettings;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
index bf0f3aaa4f..9719a3a2d5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
@@ -72,401 +72,281 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "serverIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getServerIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "serverIcon"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getServerIcon()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const/4 v2, 0x0
+    const-string v2, "iconText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getIconText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "iconText"
-
-    const-string v4, "getIconText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "serverName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getServerName()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "serverName"
-
-    const-string v4, "getServerName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "generalSettingsSection"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGeneralSettingsSection()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "generalSettingsSection"
-
-    const-string v4, "getGeneralSettingsSection()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "overviewOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOverviewOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "overviewOption"
-
-    const-string v4, "getOverviewOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "moderationOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getModerationOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "moderationOption"
-
-    const-string v4, "getModerationOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "auditLogOptions"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAuditLogOptions()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "auditLogOptions"
-
-    const-string v4, "getAuditLogOptions()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "channelsOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelsOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelsOption"
-
-    const-string v4, "getChannelsOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "integrationsOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntegrationsOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "integrationsOption"
-
-    const-string v4, "getIntegrationsOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "securityOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSecurityOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "securityOption"
-
-    const-string v4, "getSecurityOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string/jumbo v2, "vanityUrlOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVanityUrlOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "vanityUrlOption"
-
-    const-string v4, "getVanityUrlOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "communitySettingsSection"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCommunitySettingsSection()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "communitySettingsSection"
-
-    const-string v4, "getCommunitySettingsSection()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "communityOverviewOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCommunityOverviewOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "communityOverviewOption"
-
-    const-string v4, "getCommunityOverviewOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string/jumbo v2, "userManagementSection"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserManagementSection()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userManagementSection"
-
-    const-string v4, "getUserManagementSection()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string/jumbo v2, "userManagementDivider"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserManagementDivider()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userManagementDivider"
-
-    const-string v4, "getUserManagementDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "membersOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMembersOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "membersOption"
-
-    const-string v4, "getMembersOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "rolesOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRolesOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "rolesOption"
-
-    const-string v4, "getRolesOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "instantInvitesOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInstantInvitesOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "instantInvitesOption"
-
-    const-string v4, "getInstantInvitesOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "bansOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBansOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bansOption"
-
-    const-string v4, "getBansOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettings;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettings;
+    const-string v2, "emojisOption"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojisOption()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emojisOption"
-
-    const-string v4, "getEmojisOption()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
@@ -490,7 +370,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a083d
+    const v0, 0x7f0a0843
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -498,7 +378,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->serverIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a083e
+    const v0, 0x7f0a0844
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -506,7 +386,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->iconText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a083f
+    const v0, 0x7f0a0845
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -514,7 +394,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->serverName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0835
+    const v0, 0x7f0a083b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -522,7 +402,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->generalSettingsSection$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fe
+    const v0, 0x7f0a0804
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -530,7 +410,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->overviewOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fd
+    const v0, 0x7f0a0803
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -538,7 +418,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->moderationOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fa
+    const v0, 0x7f0a0800
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -546,7 +426,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->auditLogOptions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fb
+    const v0, 0x7f0a0801
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -554,7 +434,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->channelsOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fc
+    const v0, 0x7f0a0802
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -562,7 +442,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->integrationsOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ff
+    const v0, 0x7f0a0805
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -570,7 +450,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->securityOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0800
+    const v0, 0x7f0a0806
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -578,7 +458,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->vanityUrlOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0833
+    const v0, 0x7f0a0839
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -586,7 +466,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->communitySettingsSection$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ce
+    const v0, 0x7f0a07d4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -594,7 +474,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->communityOverviewOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0836
+    const v0, 0x7f0a083c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -602,7 +482,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->userManagementSection$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0837
+    const v0, 0x7f0a083d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -610,7 +490,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->userManagementDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ee
+    const v0, 0x7f0a07f4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -618,7 +498,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->membersOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0831
+    const v0, 0x7f0a0837
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -626,7 +506,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->rolesOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e9
+    const v0, 0x7f0a07ef
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -634,7 +514,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->instantInvitesOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c4
+    const v0, 0x7f0a07ca
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -642,7 +522,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettings;->bansOption$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e4
+    const v0, 0x7f0a07ea
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1925,30 +1805,25 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    const p1, 0x7f121457
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f121481
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem.smali
index c4393a8235..1a7dbd3321 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem.smali
@@ -39,7 +39,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;
 
@@ -47,59 +47,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "containerView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainerView()Landroid/view/View;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "containerView"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getContainerView()Landroid/view/View;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string/jumbo v2, "userName"
 
-    const/4 v3, 0x0
+    const-string v3, "getUserName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "userName"
-
-    const-string v5, "getUserName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "avatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Landroid/widget/ImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "avatar"
+    const/4 v2, 0x2
 
-    const-string v4, "getAvatar()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -107,7 +89,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter;Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -116,7 +98,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter;
 
@@ -149,15 +133,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;)Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter;
@@ -235,9 +210,9 @@
 .method public onConfigure(ILcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -247,27 +222,29 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;->getBan()Lcom/discord/models/domain/ModelBan;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelBan;->getUser()Lcom/discord/models/domain/ModelUser;
+    if-eqz v0, :cond_0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelBan;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    if-eqz v1, :cond_0
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+    if-eqz v0, :cond_0
 
-    move-result-object v1
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;->getAvatar()Landroid/widget/ImageView;
 
@@ -281,10 +258,10 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelBan;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_1
-    move-object v3, v0
+    move-object v3, v1
 
     const v4, 0x7f07005c
 
@@ -309,13 +286,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali
index 037890cae0..c743e1b304 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Adapter.smali
@@ -44,22 +44,15 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -92,9 +85,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/WidgetServerSettingsBans$Adapter$BanListItem;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -112,15 +107,6 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnBanSelectedListener(Lkotlin/jvm/functions/Function1;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
index 9602d326cd..fb397c11b7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Landroid/content/Context;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -60,20 +62,11 @@
 
     const-string p3, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali
index d0fc1fa3f1..8bf00e9ee3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem.smali
@@ -99,26 +99,21 @@
 .method public final create(Lcom/discord/models/domain/ModelBan;)Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "ban"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;
+    new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x1
 
-    invoke-direct {v1, v0, v2, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;-><init>(Lcom/discord/models/domain/ModelBan;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v0, v1, v2, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;-><init>(Lcom/discord/models/domain/ModelBan;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object p1, v1, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;->ban:Lcom/discord/models/domain/ModelBan;
+    iput-object p1, v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;->ban:Lcom/discord/models/domain/ModelBan;
 
-    return-object v1
-
-    :cond_0
-    const-string p1, "ban"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +131,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;->ban:Lcom/discord/models/domain/ModelBan;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali
index 184978d823..046f8b916b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,7 +83,7 @@
 
     const-string v0, "canManage"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -104,9 +106,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali
index a2bb9ec5d3..6271500ecf 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali
index 7e8bccd012..e6180b310e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelBan;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -49,12 +49,38 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelBan;)Ljava/lang/Boolean;
+    .locals 2
 
-    check-cast p1, Lcom/discord/models/domain/ModelBan;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1;->call(Lcom/discord/models/domain/ModelBan;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelBan;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    const-string v0, "it.user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsernameLower()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "it.user.usernameLower"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1;->$filter:Ljava/lang/String;
+
+    const-string v1, "filter"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x1
+
+    invoke-static {p1, v0, v1}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result p1
 
@@ -65,40 +91,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelBan;)Z
-    .locals 2
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "it"
+    check-cast p1, Lcom/discord/models/domain/ModelBan;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelBan;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1;->call(Lcom/discord/models/domain/ModelBan;)Ljava/lang/Boolean;
 
     move-result-object p1
 
-    const-string v0, "it.user"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsernameLower()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "it.user.usernameLower"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1;->$filter:Ljava/lang/String;
-
-    const-string v1, "filter"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v1, 0x1
-
-    invoke-static {p1, v0, v1}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
-
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali
index 1438cde35b..3b76e4ba5b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelBan;",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali
index 86da83501b..1b4fed1709 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3.smali
@@ -109,7 +109,7 @@
     :goto_0
     const/4 v0, 0x1
 
-    invoke-static {p1, p2, v0}, Lj0/t/k;->compareTo(Ljava/lang/String;Ljava/lang/String;Z)I
+    invoke-static {p1, p2, v0}, Lk0/u/k;->compareTo(Ljava/lang/String;Ljava/lang/String;Z)I
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali
index 0e860f279b..79d6da9a2a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -69,6 +72,7 @@
             "Ljava/lang/String;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;",
             ">;>;"
@@ -89,29 +93,29 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$1;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2$3;
 
-    new-instance v1, Lr0/l/a/r2;
+    new-instance v1, Ls0/l/a/r2;
 
     const/16 v2, 0xa
 
-    invoke-direct {v1, v0, v2}, Lr0/l/a/r2;-><init>(Lrx/functions/Func2;I)V
+    invoke-direct {v1, v0, v2}, Ls0/l/a/r2;-><init>(Lrx/functions/Func2;I)V
 
-    new-instance v0, Lr0/l/a/u;
+    new-instance v0, Ls0/l/a/u;
 
     iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v0, p1, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v0, p1, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali
index e875cd6f6e..a0f8f69a4c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$3.smali
@@ -29,7 +29,13 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Integer;",
+        "Ljava/util/List<",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$BanItem;",
+        ">;",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali
index 849a6bfb4a..607d6e6d94 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelBan;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -76,6 +82,7 @@
             "Lcom/discord/models/domain/ModelBan;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;",
             ">;"
         }
@@ -97,7 +104,7 @@
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -124,9 +131,9 @@
 
     move-result-object v1
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1;->$filterPublisher:Lrx/Observable;
 
@@ -134,7 +141,7 @@
 
     invoke-direct {v3, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1$2;-><init>(Ljava/util/Map;)V
 
-    invoke-virtual {v1, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali
index 3c84f7c11f..e64a87ac0a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -61,27 +65,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    check-cast p2, Lcom/discord/models/domain/ModelGuild;
-
-    check-cast p3, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1;->call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;)Z
+.method public final call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
     .locals 2
 
     if-eqz p2, :cond_1
@@ -114,5 +98,25 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Long;
+
+    check-cast p2, Lcom/discord/models/domain/ModelGuild;
+
+    check-cast p3, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getCanManageBans$1;->call(Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion.smali
index 24ebcd5c4c..01065fbea5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion.smali
@@ -117,13 +117,13 @@
 
     invoke-direct {v1, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1;-><init>(JLrx/Observable;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n            \u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -135,7 +135,7 @@
 
     const-string p2, "StoreStream\n            \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -189,7 +189,7 @@
 
     const-string p2, "Observable\n             \u2026        }\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -201,7 +201,7 @@
 
     const-string p2, "Observable\n             \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -277,7 +277,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "filterPublisher"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion;->getCanManageBans(J)Lrx/Observable;
 
@@ -287,22 +289,13 @@
 
     invoke-direct {v1, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$get$1;-><init>(JLrx/Observable;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "getCanManageBans(guildId\u2026.just(null)\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "filterPublisher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
index 8966cd111b..5cc302713c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$Model.smali
@@ -283,7 +283,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;->filteredBannedUsers:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -301,7 +301,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;->guildName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1.smali
index 4c8e6999dc..2a56c18c25 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelBan;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelBan;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "ban"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$configureUI$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
@@ -78,13 +80,4 @@
     invoke-static {v0, v1, v2, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->access$showConfirmUnbanDialog(Lcom/discord/widgets/servers/WidgetServerSettingsBans;JLcom/discord/models/domain/ModelBan;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "ban"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$1.smali
index 48df78ca35..87de16e25b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$onResume$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$2.smali
index 89d5994de2..97f7c9a6ca 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$onResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$onResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1.smali
index 92813bbe07..f231bdb0e2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1.smali
index 6f1d5cbc1a..e46227dc58 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsBans.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,9 +69,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -79,39 +79,41 @@
 
     move-result-object p1
 
-    iget-wide v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->$guildId:J
+    iget-wide v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->$guildId:J
 
-    iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->$ban:Lcom/discord/models/domain/ModelBan;
+    iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->$ban:Lcom/discord/models/domain/ModelBan;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelBan;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelBan;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v4, "ban.user"
+    const-string v3, "ban.user"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    invoke-virtual {p1, v1, v2, v3, v4}, Lcom/discord/utilities/rest/RestAPI;->unbanUser(JJ)Lrx/Observable;
+    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/utilities/rest/RestAPI;->unbanUser(JJ)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsBans;
+    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    invoke-static {p1, v1, v0, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, v0, v2, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
@@ -121,6 +123,8 @@
 
     move-result-object v4
 
+    sget-object v9, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1;
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -129,8 +133,6 @@
 
     const/4 v8, 0x0
 
-    sget-object v9, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1$1;
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -138,11 +140,4 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
index bc4131f7a4..2f44e986e1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
@@ -61,61 +61,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
+    const-string v2, "searchBox"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchBox()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "searchBox"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSearchBox()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "viewFlipper"
 
-    aput-object v1, v0, v2
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "viewFlipper"
-
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
+    const-string v2, "recycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "recycler"
-
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -139,7 +121,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07c6
+    const v0, 0x7f0a07cc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -147,7 +129,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->searchBox$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c7
+    const v0, 0x7f0a07cd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,7 +137,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c5
+    const v0, 0x7f0a07cb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -416,7 +398,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120f79
+    const v0, 0x7f120fa3
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -424,7 +406,7 @@
 
     const-string v1, "getString(R.string.no_ban_reason)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     new-instance v1, Ljava/lang/StringBuilder;
@@ -439,7 +421,7 @@
 
     const-string v3, "getString(R.string.ban_reason)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Lcom/discord/utilities/locale/LocaleManager;
 
@@ -459,7 +441,7 @@
 
     const-string v3, "(this as java.lang.String).toUpperCase(locale)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -481,7 +463,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
@@ -489,7 +471,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f121651
+    const v3, 0x7f12167b
 
     const/4 v4, 0x1
 
@@ -503,7 +485,7 @@
 
     const-string v7, "ban.user"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
@@ -517,7 +499,7 @@
 
     const-string v3, "requireContext().getStri\u2026title, ban.user.username)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(Ljava/lang/String;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -527,7 +509,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1203b7
+    const v1, 0x7f1203b8
 
     const/4 v2, 0x2
 
@@ -537,7 +519,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12164f
+    const v1, 0x7f121679
 
     new-instance v2, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;
 
@@ -559,7 +541,7 @@
 
     const-string p3, "parentFragmentManager"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -646,7 +628,7 @@
 
     const-string v4, "filterPublisher"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion;->get(JLrx/Observable;)Lrx/Observable;
 
@@ -686,7 +668,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -712,24 +696,15 @@
 
     move-result-object p1
 
-    const-wide/16 v0, -0x1
+    const-string v0, "GUILD_ID"
 
-    const-string v2, "GUILD_ID"
+    const-wide/16 v1, -0x1
 
-    invoke-virtual {p1, v2, v0, v1}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
     move-result-wide v0
 
     iput-wide v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->guildId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
index 74dc39c8dc..a64bb0d04c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
@@ -116,7 +116,7 @@
 
     invoke-direct {p1, p2}, Lf/a/o/e/l;-><init>(Ljava/lang/Integer;)V
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -918,7 +918,7 @@
 
     invoke-direct {v0, p0}, Lf/a/o/e/n;-><init>(Ljava/lang/Integer;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -934,7 +934,7 @@
 
     sget-object p1, Lf/a/o/e/m;->d:Lf/a/o/e/m;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -983,11 +983,11 @@
 
     invoke-direct {v0, p0, p1}, Lf/a/o/e/o;-><init>(J)V
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v4, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v4, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v4}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -1017,7 +1017,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
index cc29db69bc..8dfddf3389 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
@@ -65,12 +65,12 @@
 
     if-nez p2, :cond_0
 
-    const v0, 0x7f120418
+    const v0, 0x7f120419
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1214a4
+    const v0, 0x7f1214ce
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -186,7 +186,7 @@
 .method public static synthetic g(ZLandroid/view/Menu;)V
     .locals 2
 
-    const v0, 0x7f0a05d7
+    const v0, 0x7f0a05dd
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -196,7 +196,7 @@
 
     invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a05d8
+    const v0, 0x7f0a05de
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -337,7 +337,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -347,7 +347,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->dimmer:Lcom/discord/utilities/dimmer/DimmerView;
 
-    invoke-static {v0}, Lf/a/b/q;->t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
+    invoke-static {v0}, Lf/a/b/s;->t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -355,7 +355,7 @@
 
     move-result-object p2
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -375,7 +375,7 @@
 
     invoke-direct {v2, p0, p1}, Lf/a/o/e/i;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsChannels;Lcom/discord/widgets/servers/WidgetServerSettingsChannels$Model;)V
 
-    invoke-static {v0, v1, v2}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {v0, v1, v2}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -446,7 +446,7 @@
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -498,7 +498,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05d7
+    .packed-switch 0x7f0a05dd
         :pswitch_1
         :pswitch_0
     .end packed-switch
@@ -633,9 +633,9 @@
 .method public synthetic n(Ljava/lang/Void;)V
     .locals 0
 
-    const p1, 0x7f120408
+    const p1, 0x7f120409
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     return-void
 .end method
@@ -657,7 +657,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07cc
+    const v0, 0x7f0a07d2
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -667,7 +667,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->textChannelsRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a07c8
+    const v0, 0x7f0a07ce
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -677,7 +677,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->createFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -729,7 +729,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -743,7 +743,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
index 5a84607d5c..62c8109de2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.smali
@@ -95,7 +95,7 @@
 
     move-result-object p0
 
-    const p1, 0x7f0a0aa5
+    const p1, 0x7f0a0aaa
 
     const-string p2, "fab menu"
 
@@ -161,7 +161,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    const v1, 0x7f0a0381
+    const v1, 0x7f0a0387
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -177,7 +177,7 @@
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const v1, 0x7f0a0383
+    const v1, 0x7f0a0389
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -193,7 +193,7 @@
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const v1, 0x7f0a0382
+    const v1, 0x7f0a0388
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -209,7 +209,7 @@
 
     invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    const v1, 0x7f0a0384
+    const v1, 0x7f0a038a
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -336,7 +336,7 @@
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p3, 0x7f0a0386
+    const p3, 0x7f0a038c
 
     invoke-virtual {p1, p3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1.smali
index 4f53cf79f8..21ba70e9f2 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion$show$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsChannelsSortActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali
index 8ea1d36ea5..5dc01bef44 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$Companion.smali
@@ -60,7 +60,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
 
@@ -81,13 +83,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
index ff29ea059a..0e76910ca6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.smali
@@ -45,61 +45,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
+    const-string v2, "categories"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCategories()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "categories"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCategories()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "voiceChannel"
 
-    aput-object v1, v0, v2
+    const-string v3, "getVoiceChannel()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "voiceChannel"
-
-    const-string v4, "getVoiceChannel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;
+    const-string v2, "textChannel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTextChannel()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "textChannel"
-
-    const-string v4, "getTextChannel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -123,7 +105,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a07c9
+    const v0, 0x7f0a07cf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -131,7 +113,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;->categories$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cb
+    const v0, 0x7f0a07d1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -139,7 +121,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;->voiceChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ca
+    const v0, 0x7f0a07d0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -303,24 +285,17 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsChannelsSortActions;->configureUI()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setSortTypeSelectedListener(Lkotlin/jvm/functions/Function1;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali
index 69e7962cae..92575f1475 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model.smali
@@ -184,7 +184,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
index 969536f026..cf4487080a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
@@ -16,11 +16,11 @@
 
 .field public static final INTENT_EXTRA_INTEGRATION_ID:Ljava/lang/String; = "INTENT_EXTRA_INTEGRATION_ID"
 
-.field public static final STATE_KEY_ENABLE_TWITCH_EMOTES:I = 0x7f0a0301
+.field public static final STATE_KEY_ENABLE_TWITCH_EMOTES:I = 0x7f0a0307
 
-.field public static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a0304
+.field public static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a030a
 
-.field public static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a0305
+.field public static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a030b
 
 .field public static final gracePeriodDays:[I
 
@@ -126,9 +126,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0301
-        0x7f0a0304
-        0x7f0a0305
+        0x7f0a0307
+        0x7f0a030a
+        0x7f0a030b
     .end array-data
 .end method
 
@@ -144,7 +144,7 @@
     goto/16 :goto_4
 
     :cond_0
-    const v0, 0x7f120caa
+    const v0, 0x7f120cd0
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -341,7 +341,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    const v2, 0x7f0a0304
+    const v2, 0x7f0a030a
 
     iget-object v3, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
 
@@ -388,7 +388,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    const v3, 0x7f0a0305
+    const v3, 0x7f0a030b
 
     invoke-direct {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->getGracePeriodPosition(I)I
 
@@ -556,12 +556,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f1000bb
+    const p1, 0x7f1000bd
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1000ba
+    const p1, 0x7f1000bc
 
     :goto_0
     iget-object p2, p2, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
@@ -594,7 +594,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -632,7 +632,7 @@
 
     const-class p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;
 
-    invoke-static {p4, p0, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p4, p0, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -665,7 +665,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f1000b4
+    const v5, 0x7f1000b6
 
     const/4 v6, 0x1
 
@@ -785,7 +785,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -793,7 +793,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -805,7 +805,7 @@
 
     invoke-direct {p2, p0}, Lf/a/o/e/g0;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;)V
 
-    invoke-static {p2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -895,7 +895,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -903,7 +903,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -913,7 +913,7 @@
 
     sget-object p2, Lf/a/o/e/i0;->d:Lf/a/o/e/i0;
 
-    invoke-static {p2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -953,7 +953,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0301
+    const v1, 0x7f0a0307
 
     invoke-virtual {p1, v1, v0}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
@@ -1039,7 +1039,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1053,7 +1053,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1071,7 +1071,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a030d
+    const v0, 0x7f0a0313
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1081,7 +1081,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a030f
+    const v0, 0x7f0a0315
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1091,7 +1091,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationOwnerName:Landroid/widget/TextView;
 
-    const v0, 0x7f0a030b
+    const v0, 0x7f0a0311
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1101,7 +1101,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->integrationIcon:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0313
+    const v0, 0x7f0a0319
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1109,7 +1109,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0312
+    const v0, 0x7f0a0318
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1119,7 +1119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->subscriberCount:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0315
+    const v0, 0x7f0a031b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1127,7 +1127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncedRoleContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0314
+    const v0, 0x7f0a031a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1137,7 +1137,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->syncedRole:Landroid/widget/TextView;
 
-    const v0, 0x7f0a030c
+    const v0, 0x7f0a0312
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1147,7 +1147,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->lastSyncTime:Landroid/widget/TextView;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1157,7 +1157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->dimmer:Lcom/discord/utilities/dimmer/DimmerView;
 
-    const v0, 0x7f0a0310
+    const v0, 0x7f0a0316
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1171,7 +1171,7 @@
 
     new-array v1, v0, [Lcom/discord/views/CheckedSetting;
 
-    const v2, 0x7f0a0303
+    const v2, 0x7f0a0309
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1183,7 +1183,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0302
+    const v2, 0x7f0a0308
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1205,7 +1205,7 @@
 
     new-array v1, v1, [Lcom/discord/views/CheckedSetting;
 
-    const v2, 0x7f0a0307
+    const v2, 0x7f0a030d
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1215,7 +1215,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0309
+    const v2, 0x7f0a030f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1225,7 +1225,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a030a
+    const v2, 0x7f0a0310
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1235,7 +1235,7 @@
 
     aput-object v2, v1, v0
 
-    const v0, 0x7f0a0306
+    const v0, 0x7f0a030c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1247,7 +1247,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f0a0308
+    const v0, 0x7f0a030e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1265,7 +1265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->gracePeriodRadios:Ljava/util/List;
 
-    const v0, 0x7f0a0300
+    const v0, 0x7f0a0306
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1273,7 +1273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->customEmotesContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0301
+    const v0, 0x7f0a0307
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1295,7 +1295,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->expiryBehaviorRadios:Ljava/util/List;
 
-    const v0, 0x7f0a0304
+    const v0, 0x7f0a030a
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->setupRadioManager(Ljava/util/List;I)Lcom/discord/views/RadioManager;
 
@@ -1305,7 +1305,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->gracePeriodRadios:Ljava/util/List;
 
-    const v0, 0x7f0a0305
+    const v0, 0x7f0a030b
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->setupRadioManager(Ljava/util/List;I)Lcom/discord/views/RadioManager;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali
index 637ed3feca..9cea53d037 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember$Model.smali
@@ -114,7 +114,7 @@
 
     invoke-direct {v0, p0, p1}, Lf/a/o/e/s0;-><init>(J)V
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -122,7 +122,7 @@
 
     sget-object p2, Lf/a/o/e/e;->d:Lf/a/o/e/e;
 
-    invoke-virtual {p0, p1, p2}, Lrx/Observable;->c0(Lr0/k/b;Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1, p2}, Lrx/Observable;->c0(Ls0/k/b;Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -523,7 +523,7 @@
 
     invoke-direct {p3, p0, p1}, Lf/a/o/e/q0;-><init>(J)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -545,7 +545,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
index ea987ade16..0441f0de06 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
@@ -53,7 +53,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f0a0319
+    const v3, 0x7f0a031f
 
     aput v3, v1, v2
 
@@ -97,7 +97,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -105,7 +105,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -117,7 +117,7 @@
 
     invoke-direct {v0, p0, p2}, Lf/a/o/e/x0;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;Ljava/lang/String;)V
 
-    invoke-static {v0, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v0, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -150,7 +150,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -158,7 +158,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -170,7 +170,7 @@
 
     invoke-direct {v0, p0, p2}, Lf/a/o/e/n0;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;Ljava/lang/String;)V
 
-    invoke-static {v0, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v0, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -239,7 +239,7 @@
 
     if-eqz v6, :cond_2
 
-    const v6, 0x7f120df3
+    const v6, 0x7f120e19
 
     new-array v7, v2, [Ljava/lang/Object;
 
@@ -414,7 +414,7 @@
 
     const-class p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;
 
-    invoke-static {p4, p0, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p4, p0, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -436,7 +436,7 @@
 
     if-nez v0, :cond_0
 
-    const v0, 0x7f120f72
+    const v0, 0x7f120f9c
 
     const/4 v1, 0x1
 
@@ -453,14 +453,14 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120f73
+    const p1, 0x7f120f9d
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object p1
 
     :goto_0
-    invoke-static {p0, p1}, Lf/a/b/n;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
+    invoke-static {p0, p1}, Lf/a/b/p;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
 
     return-void
 .end method
@@ -492,7 +492,7 @@
 
     aput-object p1, v1, v2
 
-    const p1, 0x7f12093d
+    const p1, 0x7f12093f
 
     invoke-virtual {p0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -850,7 +850,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -858,7 +858,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -868,7 +868,7 @@
 
     sget-object p2, Lf/a/o/e/v0;->d:Lf/a/o/e/v0;
 
-    invoke-static {p2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -892,7 +892,7 @@
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a0319
+    const v1, 0x7f0a031f
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -902,7 +902,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->nicknameText:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v1, 0x7f0a031c
+    const v1, 0x7f0a0322
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -912,7 +912,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->saveFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    const v1, 0x7f0a031b
+    const v1, 0x7f0a0321
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -922,7 +922,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v1, 0x7f0a031a
+    const v1, 0x7f0a0320
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -930,7 +930,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->rolesContainer:Landroid/view/View;
 
-    const v1, 0x7f0a0316
+    const v1, 0x7f0a031c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -938,7 +938,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->administrativeContainer:Landroid/view/View;
 
-    const v1, 0x7f0a0318
+    const v1, 0x7f0a031e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -948,7 +948,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView;
 
-    const v1, 0x7f0a0317
+    const v1, 0x7f0a031d
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -958,7 +958,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->banButton:Landroid/widget/TextView;
 
-    const v1, 0x7f0a031d
+    const v1, 0x7f0a0323
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1052,7 +1052,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -1066,7 +1066,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem.smali
index 03ebecb617..cd2b059f3f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem.smali
@@ -55,7 +55,9 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuildRole;ZLcom/discord/models/domain/ModelGuildRole;ZZ)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "role"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildRole;->isManaged()Z
 
@@ -85,21 +87,14 @@
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;-><init>(Lcom/discord/models/domain/ModelGuildRole;ZZ)V
 
     return-void
-
-    :cond_2
-    const-string p1, "role"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuildRole;ZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "role"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -110,15 +105,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;->isManageable:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "role"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;Lcom/discord/models/domain/ModelGuildRole;ZZILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;
@@ -181,22 +167,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuildRole;ZZ)Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "role"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;-><init>(Lcom/discord/models/domain/ModelGuildRole;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "role"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -214,7 +193,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;->role:Lcom/discord/models/domain/ModelGuildRole;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
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 c6c329576e..e7f0a80c6d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;
+    const-string v2, "roleCheckedSetting"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRoleCheckedSetting()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "roleCheckedSetting"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRoleCheckedSetting()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,13 +61,15 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0101
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a075f
+    const p1, 0x7f0a0765
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -82,15 +78,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->roleCheckedSetting$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;)Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter;
@@ -128,9 +115,9 @@
 .method public onConfigure(ILcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -140,13 +127,13 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;->getRole()Lcom/discord/models/domain/ModelGuildRole;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuildRole;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->getRoleCheckedSetting()Lcom/discord/views/CheckedSetting;
 
@@ -154,29 +141,31 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;->getRole()Lcom/discord/models/domain/ModelGuildRole;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->getRoleCheckedSetting()Lcom/discord/views/CheckedSetting;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Landroid/widget/RelativeLayout;->getContext()Landroid/content/Context;
+    invoke-virtual {v1}, Landroid/widget/RelativeLayout;->getContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "roleCheckedSetting.context"
+    const-string v2, "roleCheckedSetting.context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x2
+    const/4 v3, 0x2
 
-    invoke-static {v1, v2, v3, v4, v0}, Lcom/discord/utilities/guilds/RoleUtils;->getRoleColor$default(Lcom/discord/models/domain/ModelGuildRole;Landroid/content/Context;IILjava/lang/Object;)I
+    const/4 v4, 0x0
 
-    move-result v1
+    invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/utilities/guilds/RoleUtils;->getRoleColor$default(Lcom/discord/models/domain/ModelGuildRole;Landroid/content/Context;IILjava/lang/Object;)I
 
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setTextColor(I)V
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setTextColor(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->getRoleCheckedSetting()Lcom/discord/views/CheckedSetting;
 
@@ -184,9 +173,9 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;->isUserHasRole()Z
 
-    move-result v1
+    move-result v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleItem;->isManageable()Z
 
@@ -217,7 +206,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120e8a
+    const p2, 0x7f120eb0
 
     invoke-virtual {p1, p2}, Lcom/discord/views/CheckedSetting;->b(I)V
 
@@ -230,17 +219,10 @@
 
     const/4 p2, 0x1
 
-    invoke-static {p1, v0, p2}, Lcom/discord/views/CheckedSetting;->d(Lcom/discord/views/CheckedSetting;Ljava/lang/String;I)V
+    invoke-static {p1, v4, p2}, Lcom/discord/views/CheckedSetting;->d(Lcom/discord/views/CheckedSetting;Ljava/lang/String;I)V
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali
index 5054441f81..520cdaf4a7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.smali
@@ -36,22 +36,15 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getRoleClickListener$p(Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter;)Lkotlin/jvm/functions/Function1;
@@ -88,31 +81,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "roleItems"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "roleClickListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter;->roleClickListener:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "roleClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "roleItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -126,9 +107,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -146,13 +129,4 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali
index 76c63256a3..51522d43ed 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole$Model.smali
@@ -97,7 +97,7 @@
 
     invoke-direct {v2, p4}, Lf/a/o/e/e1;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -184,7 +184,7 @@
 .method public static synthetic b(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Lcom/discord/models/domain/ModelGuildMember$Computed;
     .locals 0
 
-    invoke-static {p0, p1}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p0, p1}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -582,7 +582,7 @@
 
     invoke-direct {v1, p0, p1, p2, p3}, Lf/a/o/e/f1;-><init>(JJ)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
index e8ab9a68bc..fc679fd787 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
@@ -63,7 +63,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f0a031f
+    const v3, 0x7f0a0325
 
     aput v3, v1, v2
 
@@ -315,7 +315,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f12071e
+    const p1, 0x7f120720
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -351,7 +351,7 @@
     return-object p1
 
     :cond_1
-    const p1, 0x7f121631
+    const p1, 0x7f12165b
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -360,7 +360,7 @@
     return-object p1
 
     :cond_2
-    const p1, 0x7f120bd6
+    const p1, 0x7f120bfc
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -369,7 +369,7 @@
     return-object p1
 
     :cond_3
-    const p1, 0x7f120bd5
+    const p1, 0x7f120bfb
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -378,7 +378,7 @@
     return-object p1
 
     :cond_4
-    const p1, 0x7f120bd3
+    const p1, 0x7f120bf9
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -540,7 +540,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0760
+    .packed-switch 0x7f0a0766
         :pswitch_1c
         :pswitch_1b
         :pswitch_1a
@@ -602,7 +602,7 @@
 
     const-class p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;
 
-    invoke-static {p4, p0, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p4, p0, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -650,7 +650,7 @@
 
     iput-object v0, v1, Lf/i/a/a/e$k;->g:[I
 
-    const v0, 0x7f121362
+    const v0, 0x7f12138c
 
     iput v0, v1, Lf/i/a/a/e$k;->a:I
 
@@ -682,7 +682,7 @@
 
     iput v0, v1, Lf/i/a/a/e$k;->p:I
 
-    const v0, 0x7f120451
+    const v0, 0x7f120452
 
     iput v0, v1, Lf/i/a/a/e$k;->c:I
 
@@ -698,7 +698,7 @@
 
     iput v0, v1, Lf/i/a/a/e$k;->w:I
 
-    const v0, 0x7f120452
+    const v0, 0x7f120453
 
     iput v0, v1, Lf/i/a/a/e$k;->b:I
 
@@ -714,7 +714,7 @@
 
     iput v0, v1, Lf/i/a/a/e$k;->q:I
 
-    const v0, 0x7f12142b
+    const v0, 0x7f121455
 
     iput v0, v1, Lf/i/a/a/e$k;->d:I
 
@@ -722,7 +722,7 @@
 
     iput-boolean v0, v1, Lf/i/a/a/e$k;->m:Z
 
-    const v0, 0x7f121352
+    const v0, 0x7f12137c
 
     iput v0, v1, Lf/i/a/a/e$k;->e:I
 
@@ -814,7 +814,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -822,7 +822,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -836,7 +836,7 @@
 
     move-result-object p3
 
-    invoke-static {p2, p3}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {p2, p3}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -938,7 +938,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v2, 0x7f120772
+    const v2, 0x7f120774
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1308,7 +1308,7 @@
 
     const/4 v7, 0x4
 
-    const v8, 0x7f120bd8
+    const v8, 0x7f120bfe
 
     if-eq v6, v7, :cond_2
 
@@ -1373,7 +1373,7 @@
     :cond_4
     if-nez v5, :cond_5
 
-    const v2, 0x7f120bd4
+    const v2, 0x7f120bfa
 
     invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->b(I)V
 
@@ -1508,9 +1508,9 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120770
+    const p1, 0x7f120772
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     :goto_0
     return-void
@@ -1600,7 +1600,7 @@
 
     move-result-object p1
 
-    invoke-static {p0, p1}, Lf/a/b/n;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
+    invoke-static {p0, p1}, Lf/a/b/p;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
 
     return-void
 .end method
@@ -1688,7 +1688,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a05c0
+    const p3, 0x7f0a05c6
 
     if-eq p2, p3, :cond_0
 
@@ -1715,7 +1715,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -1723,7 +1723,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -1739,7 +1739,7 @@
 
     move-result-object p3
 
-    invoke-static {p2, p3}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {p2, p3}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -1762,7 +1762,7 @@
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a0769
+    const v1, 0x7f0a076f
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1770,7 +1770,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->editNameDisabledOverlay:Landroid/view/View;
 
-    const v1, 0x7f0a0765
+    const v1, 0x7f0a076b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1778,7 +1778,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->changeColorDisabledOverlay:Landroid/view/View;
 
-    const v1, 0x7f0a031f
+    const v1, 0x7f0a0325
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1788,7 +1788,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->roleName:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v1, 0x7f0a0766
+    const v1, 0x7f0a076c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1796,7 +1796,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->pickColorButton:Landroid/view/View;
 
-    const v1, 0x7f0a0768
+    const v1, 0x7f0a076e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1804,7 +1804,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->currentColorDisplay:Landroid/view/View;
 
-    const v1, 0x7f0a0320
+    const v1, 0x7f0a0326
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1812,7 +1812,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->saveFab:Landroid/view/View;
 
-    const v1, 0x7f0a076b
+    const v1, 0x7f0a0771
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1822,7 +1822,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->hoistCheckedSetting:Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a0775
+    const v1, 0x7f0a077b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1836,7 +1836,7 @@
 
     new-array v1, v1, [Lcom/discord/views/CheckedSetting;
 
-    const v2, 0x7f0a0761
+    const v2, 0x7f0a0767
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1848,7 +1848,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0762
+    const v2, 0x7f0a0768
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1858,7 +1858,7 @@
 
     aput-object v2, v1, v0
 
-    const v2, 0x7f0a0763
+    const v2, 0x7f0a0769
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1870,7 +1870,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0764
+    const v2, 0x7f0a076a
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1882,7 +1882,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0767
+    const v2, 0x7f0a076d
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1894,7 +1894,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a076a
+    const v2, 0x7f0a0770
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1906,7 +1906,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a076c
+    const v2, 0x7f0a0772
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1918,7 +1918,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a076d
+    const v2, 0x7f0a0773
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1930,7 +1930,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a076f
+    const v2, 0x7f0a0775
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1942,7 +1942,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0770
+    const v2, 0x7f0a0776
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1954,7 +1954,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a076e
+    const v2, 0x7f0a0774
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1966,7 +1966,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0771
+    const v2, 0x7f0a0777
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1978,7 +1978,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0772
+    const v2, 0x7f0a0778
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1990,7 +1990,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0773
+    const v2, 0x7f0a0779
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2002,7 +2002,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0774
+    const v2, 0x7f0a077a
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2014,7 +2014,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0777
+    const v2, 0x7f0a077d
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2026,7 +2026,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0778
+    const v2, 0x7f0a077e
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2038,7 +2038,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0779
+    const v2, 0x7f0a077f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2050,7 +2050,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a077a
+    const v2, 0x7f0a0780
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2062,7 +2062,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a077b
+    const v2, 0x7f0a0781
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2074,7 +2074,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0760
+    const v2, 0x7f0a0766
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2086,7 +2086,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a077c
+    const v2, 0x7f0a0782
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2098,7 +2098,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a077d
+    const v2, 0x7f0a0783
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2110,7 +2110,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0781
+    const v2, 0x7f0a0787
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2122,7 +2122,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0780
+    const v2, 0x7f0a0786
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2134,7 +2134,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a077e
+    const v2, 0x7f0a0784
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2146,7 +2146,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a077f
+    const v2, 0x7f0a0785
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2158,7 +2158,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0782
+    const v2, 0x7f0a0788
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2230,7 +2230,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -2244,7 +2244,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -2285,7 +2285,7 @@
 
     move-result-object p1
 
-    invoke-static {p0, p1}, Lf/a/b/n;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
+    invoke-static {p0, p1}, Lf/a/b/p;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiEmptyViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiEmptyViewHolder.smali
index ab911afcbb..eff8ea7867 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiEmptyViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiEmptyViewHolder.smali
@@ -27,22 +27,15 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d023e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -50,18 +43,11 @@
 .method public onConfigure(ILcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item;)V
     .locals 0
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "data"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali
index 31a1097e5a..6f0009364a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali
@@ -35,7 +35,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder;
 
@@ -43,41 +43,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string/jumbo v2, "uploadDescription"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadDescription()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "uploadDescription"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getUploadDescription()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string/jumbo v2, "uploadButton"
 
-    const/4 v3, 0x0
+    const-string v3, "getUploadButton()Landroid/widget/Button;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "uploadButton"
+    const/4 v2, 0x1
 
-    const-string v4, "getUploadButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -87,13 +75,15 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d023f
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0aa9
+    const p1, 0x7f0a0aae
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +91,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder;->uploadDescription$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0aa8
+    const p1, 0x7f0a0aad
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -110,15 +100,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder;->uploadButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder;)Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;
@@ -174,9 +155,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item;)V
-    .locals 4
+    .locals 3
 
-    if-eqz p2, :cond_0
+    const-string p1, "data"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiHeader;
 
@@ -192,13 +175,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120a99
+    const/4 v1, 0x2
 
-    const/4 v2, 0x2
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
+    new-array v1, v1, [Ljava/lang/Object;
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiHeader;->getEmojiMax()I
 
@@ -208,19 +187,23 @@
 
     move-result-object p2
 
-    aput-object p2, v2, v3
+    const/4 v2, 0x0
 
-    const/4 p2, 0x1
+    aput-object p2, v1, v2
 
-    const/16 v3, 0x100
+    const/16 p2, 0x100
 
-    invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {p2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object p2
 
-    aput-object v3, v2, p2
+    const/4 v2, 0x1
 
-    invoke-virtual {v0, v1, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object p2, v1, v2
+
+    const p2, 0x7f120a9e
+
+    invoke-virtual {v0, p2, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -237,15 +220,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1.smali
index ee5b8f96b0..c6aa4340d7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1;->$data:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder.smali
index 638704fbdd..dc812be9b8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder.smali
@@ -41,7 +41,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;
 
@@ -49,95 +49,65 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "containerView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainerView()Landroid/view/View;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "containerView"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getContainerView()Landroid/view/View;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string/jumbo v2, "userName"
 
-    const/4 v3, 0x0
+    const-string v3, "getUserName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "userName"
-
-    const-string v5, "getUserName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "emojiName"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "emojiName"
-
-    const-string v5, "getEmojiName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "emojiAvatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "emojiAvatar"
-
-    const-string v5, "getEmojiAvatar()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "avatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Landroid/widget/ImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "avatar"
+    const/4 v2, 0x4
 
-    const-string v4, "getAvatar()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x4
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -147,29 +117,31 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0240
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a07e0
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->containerView$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a07e6
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->containerView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a07ec
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->userName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a07e3
+    const p1, 0x7f0a07e9
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -177,7 +149,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->emojiName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a07df
+    const p1, 0x7f0a07e5
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +157,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->emojiAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a07e7
+    const p1, 0x7f0a07ed
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -194,15 +166,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder;)Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;
@@ -322,7 +285,9 @@
 
     move-object/from16 v0, p2
 
-    if-eqz v0, :cond_1
+    const-string v1, "data"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -467,17 +432,6 @@
     invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    move-object/from16 v3, p0
-
-    const-string v0, "data"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
index 78e688c2d2..5a17c32508 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder;
+    const-string v2, "section"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSection()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "section"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSection()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,13 +61,15 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0241
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0aa7
+    const p1, 0x7f0a0aac
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -82,15 +78,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder;->section$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getSection()Landroid/widget/TextView;
@@ -116,9 +103,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item;)V
-    .locals 7
+    .locals 6
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -144,7 +133,7 @@
 
     const-string v1, "context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -152,49 +141,47 @@
 
     const-string v2, "context.resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f100038
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
-
-    new-array v4, v3, [Ljava/lang/Object;
+    new-array v3, v2, [Ljava/lang/Object;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v5
+    move-result-object v4
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    aput-object v5, v4, v6
+    aput-object v4, v3, v5
 
-    invoke-static {v1, p1, v2, v0, v4}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
+    const v4, 0x7f100038
+
+    invoke-static {v1, p1, v4, v0, v3}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
-    const v1, 0x7f120618
+    new-array v1, v2, [Ljava/lang/Object;
 
-    new-array v2, v3, [Ljava/lang/Object;
+    aput-object v0, v1, v5
 
-    aput-object v0, v2, v6
+    const v0, 0x7f12061a
 
-    invoke-virtual {p1, v1, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     const-string v1, "context.getString(R.stri\u2026 slotsLeftQuantityString)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder;->getSection()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const v2, 0x7f120617
+    const/4 v3, 0x2
 
-    const/4 v4, 0x2
-
-    new-array v4, v4, [Ljava/lang/Object;
+    new-array v3, v3, [Ljava/lang/Object;
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->getTitleId()I
 
@@ -204,26 +191,19 @@
 
     move-result-object p2
 
-    aput-object p2, v4, v6
+    aput-object p2, v3, v5
 
-    aput-object v0, v4, v3
+    aput-object v0, v3, v2
 
-    invoke-virtual {p1, v2, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const p2, 0x7f120619
+
+    invoke-virtual {p1, p2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1.smali
index 2526543cb5..8374ef93d7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onEmojiItemClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsEmojis.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/models/domain/emoji/ModelEmojiGuild;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,25 +74,13 @@
 .method public final invoke(Landroid/view/View;Lcom/discord/models/domain/emoji/ModelEmojiGuild;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onUploadEmoji$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onUploadEmoji$1.smali
index 0321270b47..c35e3b5598 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onUploadEmoji$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onUploadEmoji$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$onUploadEmoji$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsEmojis.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter.smali
index 15aaa99221..1159d64f00 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter.smali
@@ -59,9 +59,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -74,15 +76,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;->onEmojiItemClicked:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -132,7 +125,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -145,7 +138,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_4
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_3
 
@@ -195,19 +190,10 @@
 
     :goto_0
     return-object p1
-
-    :cond_4
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnEmojiItemClicked(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -221,24 +207,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;->onEmojiItemClicked:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnUploadEmoji(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -248,18 +227,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;->onUploadEmoji:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Companion.smali
index 68c7c7c40e..72825b3fab 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Landroid/content/Context;J)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -60,16 +62,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, v0, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem.smali
index 742e9ad580..d30025f09e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/emoji/ModelEmojiGuild;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "emoji"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem;->emoji:Lcom/discord/models/domain/emoji/ModelEmojiGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem;Lcom/discord/models/domain/emoji/ModelEmojiGuild;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/emoji/ModelEmojiGuild;)Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem;-><init>(Lcom/discord/models/domain/emoji/ModelEmojiGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiItem;->emoji:Lcom/discord/models/domain/emoji/ModelEmojiGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojis$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojis$1.smali
index 0f2c35bb3b..40680959d0 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojis$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojis$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$get$1.smali
index 0128190e8a..d1b3ce768d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsEmojis.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -110,9 +112,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1.smali
index 7140470605..c9873cf549 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsEmojis.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/emoji/ModelEmojiGuild;",
+        ">;",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
index 8f60182220..9323cee20a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
@@ -100,7 +100,7 @@
 
     const-string p2, "Observable.combineLatest\u2026ld)\n          }\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -214,7 +214,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v3}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v3}, Lk0/j/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v2
 
@@ -287,7 +287,7 @@
     goto :goto_3
 
     :cond_6
-    invoke-static {v5}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v5}, Lk0/j/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v3
 
@@ -297,7 +297,7 @@
 
     move-result v5
 
-    const v6, 0x7f1205f2
+    const v6, 0x7f1205f4
 
     invoke-direct {v4, v0, v5, v6}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;-><init>(III)V
 
@@ -331,7 +331,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v2}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
@@ -350,7 +350,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v3}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v1, v3}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v1
 
@@ -434,13 +434,13 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "StoreStream\n            \u2026p() { create(guild, it) }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -468,13 +468,13 @@
 
     sget-object p2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$get$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "canManageEmojis(guildId)\u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission.smali
index f50b5d64ef..6ee810bf6c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(ZLcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;ZLcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;
@@ -89,22 +82,15 @@
 .method public final copy(ZLcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;-><init>(ZLcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -128,7 +114,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Permission;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model.smali
index 025f002cbf..979d0b857a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model.smali
@@ -57,7 +57,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -71,7 +71,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -82,15 +84,6 @@
     iput-object p3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;->defaultName:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;
@@ -174,22 +167,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -207,7 +193,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -217,7 +203,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;->items:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -227,7 +213,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;->defaultName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$1.smali
index faccfa4431..fb1d0b9067 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$1.smali
@@ -73,7 +73,7 @@
 
     const-string v2, "dataUrl"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->access$uploadEmoji(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$2.smali
index 5171047e59..020703d9df 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsEmojis.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3.smali
index dd1d12f29b..baf731637a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsEmojis.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Lcom/discord/models/domain/emoji/ModelEmojiGuild;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,29 +64,17 @@
 .method public final invoke(Landroid/view/View;Lcom/discord/models/domain/emoji/ModelEmojiGuild;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$configureUI$3;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
 
     invoke-static {v0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->access$launchEditScreen(Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;Landroid/view/View;Lcom/discord/models/domain/emoji/ModelEmojiGuild;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$onViewBoundOrOnResume$1.smali
index ca8b0c8715..8b6bad3790 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsEmojis.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
index b6e045aaab..208e1fb430 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
@@ -39,9 +39,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
 
-    const v1, 0x7f12042a
+    const v1, 0x7f12042b
 
-    const v2, 0x7f12164e    # 1.941831E38f
+    const v2, 0x7f121678
 
     invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
index 075c75391e..02eff272d9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
@@ -54,41 +54,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
+    const-string/jumbo v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
 
-    const/4 v2, 0x0
+    const-string v2, "recycler"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "recycler"
-
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -112,7 +100,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0aaa
+    const v0, 0x7f0a0aaf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -120,7 +108,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0aa6
+    const v0, 0x7f0a0aab
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -170,7 +158,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f1205f2
+    const v0, 0x7f1205f4
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -206,7 +194,7 @@
 
     const-string v1, "model.guild.name"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->configureToolbar(Ljava/lang/String;)V
 
@@ -246,7 +234,7 @@
 
     if-eqz v0, :cond_4
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -307,17 +295,17 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_7
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_8
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -385,9 +373,9 @@
 
     move-result-object v1
 
-    const-string p1, "v.context"
+    const-string/jumbo p1, "v.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->guildId:J
 
@@ -453,7 +441,7 @@
 
     sget-object p2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$uploadEmoji$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$uploadEmoji$1;
 
-    invoke-static {p2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -491,11 +479,13 @@
 .method public onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -505,7 +495,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->uploadEmojiAction:Lrx/functions/Action1;
 
@@ -520,30 +510,18 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/images/MGImages;->prepareImageUpload(Landroid/net/Uri;Ljava/lang/String;Landroidx/fragment/app/FragmentManager;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Lrx/functions/Action1;Lcom/discord/dialogs/ImageUploadDialog$PreviewType;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -556,20 +534,6 @@
     invoke-static {v0, p1, p2, v1}, Lcom/discord/utilities/images/MGImages;->requestDataUrl(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onPause()V
@@ -591,7 +555,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -599,11 +565,11 @@
 
     move-result-object p1
 
-    const-wide/16 v0, -0x1
+    const-string v0, "INTENT_EXTRA_GUILD_ID"
 
-    const-string v2, "INTENT_EXTRA_GUILD_ID"
+    const-wide/16 v1, -0x1
 
-    invoke-virtual {p1, v2, v0, v1}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
     move-result-wide v0
 
@@ -628,15 +594,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->adapter:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$Companion.smali
index 38b72744e9..72fceaa8f1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$Companion.smali
@@ -36,11 +36,13 @@
 .method public final create(Landroid/content/Context;JJLjava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "alias"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -66,25 +68,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026EXTRA_EMOJI_ALIAS, alias)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "alias"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.smali
index b0bd2a5946..4390158188 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.smali
@@ -54,13 +54,13 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const p2, 0x7f0a05d0
+    const p2, 0x7f0a05d6
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
index 7a885e29f3..25b0448b76 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
@@ -47,41 +47,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
+    const-string v2, "editAlias"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEditAlias()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "editAlias"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEditAlias()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
 
-    const/4 v2, 0x0
+    const-string v2, "saveAlias"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSaveAlias()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "saveAlias"
-
-    const-string v4, "getSaveAlias()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -113,7 +101,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07e1
+    const v0, 0x7f0a07e7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +109,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->editAlias$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a07e2
+    const v1, 0x7f0a07e8
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -237,7 +225,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f1205f2
+    const v0, 0x7f1205f4
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -307,7 +295,7 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit$deleteEmoji$1;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;)V
 
-    invoke-static {v1, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v1, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -409,7 +397,7 @@
 
     invoke-direct {v2, p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit$handleSaveAlias$1;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;Ljava/lang/String;)V
 
-    invoke-static {v2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -473,7 +461,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setText(Lcom/google/android/material/textfield/TextInputLayout;Ljava/lang/CharSequence;)Lkotlin/Unit;
 
-    const p1, 0x7f1213a2
+    const p1, 0x7f1213cc
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -483,7 +471,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
 
     return-void
 .end method
@@ -557,7 +545,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 5
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -693,13 +683,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali
index 8d68555f46..addfa27912 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites$Model.smali
@@ -67,9 +67,9 @@
 
     const/4 p0, 0x0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object p1
 
@@ -86,29 +86,29 @@
 
     invoke-direct {v0, p0, p1}, Lf/a/o/e/m1;-><init>(J)V
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    new-instance p1, Lr0/l/a/r2;
+    new-instance p1, Ls0/l/a/r2;
 
     const/16 p2, 0xa
 
-    invoke-direct {p1, p2}, Lr0/l/a/r2;-><init>(I)V
+    invoke-direct {p1, p2}, Ls0/l/a/r2;-><init>(I)V
 
-    new-instance p2, Lr0/l/a/u;
+    new-instance p2, Ls0/l/a/u;
 
     iget-object p0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p2, p0, p1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p2, p0, p1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lr0/l/e/l;->d:Lr0/l/e/l;
+    sget-object p1, Ls0/l/e/l;->d:Ls0/l/e/l;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->y(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->y(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -199,7 +199,7 @@
 
     invoke-direct {v2, p0, p1}, Lf/a/o/e/n1;-><init>(J)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
index 54c721adf8..b6fb29b6f9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
@@ -42,7 +42,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120ca4
+    const v0, 0x7f120cca
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -152,7 +152,7 @@
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -220,7 +220,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -234,7 +234,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -252,7 +252,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07eb
+    const v0, 0x7f0a07f1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -262,7 +262,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;->viewFlipper:Landroid/widget/ViewFlipper;
 
-    const v0, 0x7f0a07ea
+    const v0, 0x7f0a07f0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali
index 2897f8ee15..35abf32f84 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$Companion.smali
@@ -36,11 +36,13 @@
 .method public final create(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "inviteCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
@@ -65,18 +67,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "inviteCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1.smali
index 9c3cdc8334..8a1354fd0f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettingsInstantInvitesActions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleInviteRevoked"
+
+    const-string v5, "handleInviteRevoked(Lcom/discord/models/domain/ModelInvite;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleInviteRevoked"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleInviteRevoked(Lcom/discord/models/domain/ModelInvite;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelInvite;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->access$handleInviteRevoked(Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;Lcom/discord/models/domain/ModelInvite;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali
index 6d13ca747d..e99f3d733d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$1.smali
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    invoke-static {v1, v0, v2}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {v1, v0, v2}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali
index ceb19b9c09..998cc23f1c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2.smali
@@ -45,7 +45,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
@@ -55,7 +55,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$2;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
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 3f966ac62c..52c21a17a9 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
@@ -45,7 +45,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v1}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
@@ -61,7 +61,7 @@
 
     aput-object v0, v2, v3
 
-    const v3, 0x7f121489
+    const v3, 0x7f1214b3
 
     invoke-virtual {v1, v3, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -69,7 +69,7 @@
 
     const-string v2, "getString(R.string.share_invite_mobile, inviteUrl)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0, v1}, Lcom/discord/utilities/intent/IntentUtils;->performChooserSendIntent(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali
index 893b53397b..059f4b7cbd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$sam$rx_functions_Action1$0.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
index fd5bd797e6..ae344688e1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.smali
@@ -37,81 +37,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
+    const-string v2, "title"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "title"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitle()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
-    const/4 v2, 0x0
+    const-string v2, "revoke"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRevoke()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "revoke"
-
-    const-string v4, "getRevoke()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
+    const-string v2, "copy"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCopy()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "copy"
-
-    const-string v4, "getCopy()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;
+    const-string v2, "share"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getShare()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "share"
-
-    const-string v4, "getShare()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -135,7 +111,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0515
+    const v0, 0x7f0a051b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -143,7 +119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0513
+    const v0, 0x7f0a0519
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -151,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->revoke$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0512
+    const v0, 0x7f0a0518
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0514
+    const v0, 0x7f0a051a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -283,7 +259,7 @@
 
     const-string v1, "invite.code"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreInstantInvites;->onInviteRemoved(Ljava/lang/String;)V
 
@@ -323,7 +299,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
index bc2a46a98f..9fa0b64d51 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
@@ -44,7 +44,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a051d
+    const v0, 0x7f0a0523
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -54,7 +54,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a051c
+    const v0, 0x7f0a0522
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -66,7 +66,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a051b
+    const v0, 0x7f0a0521
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -78,7 +78,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a052e
+    const v0, 0x7f0a0534
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -90,7 +90,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0523
+    const v0, 0x7f0a0529
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -102,7 +102,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a052f
+    const v0, 0x7f0a0535
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -114,7 +114,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0520
+    const v0, 0x7f0a0526
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -303,7 +303,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
 
-    const v0, 0x7f120eb0
+    const v0, 0x7f120ed6
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
@@ -482,7 +482,7 @@
     goto :goto_0
 
     :cond_3
-    const v1, 0x7f120c92
+    const v1, 0x7f120cb8
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali
index 726015a527..36be84b4e0 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter.smali
@@ -38,28 +38,21 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public final configure(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -74,22 +67,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter;->onIntegrationSelectedListener:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -103,9 +89,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -121,15 +109,6 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onIntegrationSelected(J)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
index 6f76b4bbbe..8fe3f2a5ca 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Landroid/content/Context;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -60,20 +62,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026_EXTRA_GUILD_ID, guildId)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali
index f7037107b2..617773a522 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -61,16 +65,16 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
+    .locals 2
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
+    sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;
 
-    check-cast p2, Ljava/lang/Long;
+    const-string v1, "meUser"
 
-    check-cast p3, Lcom/discord/models/domain/ModelGuild;
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1;->call(Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Z
+    invoke-static {v0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;->access$canManage(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Z
 
     move-result p1
 
@@ -81,18 +85,18 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Z
-    .locals 2
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
 
-    const-string v1, "meUser"
+    check-cast p2, Ljava/lang/Long;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    check-cast p3, Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;->access$canManage(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Z
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$canManageIntegrations$1;->call(Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali
index aa0f5c18b5..1f7bb1d8ca 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -77,7 +79,7 @@
 
     const-string v0, "canManage"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -98,9 +100,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali
index 87e9b02a8d..9251d8451b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$getIntegrations$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -39,45 +39,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x3
+    const-class v3, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x3
+
+    const-string v4, "create"
+
+    const-string v5, "create(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -99,7 +83,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali
index 0ee46dade4..1be0a40e5f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali
@@ -156,7 +156,7 @@
 
     const-string p2, "Observable\n             \u2026s, guild)\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -168,7 +168,7 @@
 
     const-string p2, "Observable\n             \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -196,13 +196,13 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
-    if-eqz p2, :cond_5
+    if-eqz p2, :cond_6
 
     if-nez p3, :cond_0
 
-    goto :goto_3
+    goto/16 :goto_4
 
     :cond_0
     new-instance p2, Ljava/util/ArrayList;
@@ -242,7 +242,7 @@
 
     invoke-direct {v2, v1, v3, v4}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;-><init>(Lcom/discord/models/domain/ModelGuildIntegration;J)V
 
-    invoke-interface {p2, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p2, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
@@ -251,7 +251,7 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-virtual {p2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
     move-result-object p2
 
@@ -261,7 +261,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_5
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -275,7 +275,7 @@
 
     const-string v4, "ModelGuildIntegration.SUPPORTED_TYPES"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;->getIntegration()Lcom/discord/models/domain/ModelGuildIntegration;
 
@@ -293,17 +293,31 @@
     move-object v2, v0
 
     :goto_2
-    invoke-static {v3, v2}, Lf/n/a/k/a;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
+    const-string v4, "$this$contains"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v3, v2}, Lf/n/a/k/a;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
 
     move-result v2
 
+    if-ltz v2, :cond_4
+
+    const/4 v2, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_3
     if-eqz v2, :cond_2
 
-    invoke-interface {p1, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
-    :cond_4
+    :cond_5
     new-instance p2, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelGuild;->getId()J
@@ -316,14 +330,14 @@
 
     const-string v2, "guild.name"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, v0, v1, p3, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;-><init>(JLjava/lang/String;Ljava/util/List;)V
 
     return-object p2
 
-    :cond_5
-    :goto_3
+    :cond_6
+    :goto_4
     return-object v0
 .end method
 
@@ -382,7 +396,7 @@
 
     const-string p2, "Observable\n             \u2026 ::create\n              )"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -394,7 +408,7 @@
 
     const-string p2, "Observable\n             \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -420,13 +434,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "canManageIntegrations(gu\u2026ust(null)\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali
index d39946c1a3..0d81e0678a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem.smali
@@ -129,7 +129,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
index 0a74a11bc5..a1b2e445dc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model.smali
@@ -68,11 +68,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildName"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "integrations"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -83,20 +85,6 @@
     iput-object p4, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->integrations:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "integrations"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;JLjava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
@@ -177,31 +165,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guildName"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "integrations"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;-><init>(JLjava/lang/String;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "integrations"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -227,7 +203,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->guildName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -237,7 +213,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->integrations:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1.smali
index b4c76f6cdf..ed64e1dc16 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1.smali
index 2423b1840b..0e4587c7b3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$onResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettingsIntegrations.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
index c3f9bb3c90..8e539caed9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
@@ -41,41 +41,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
+    const-string/jumbo v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
 
-    const/4 v2, 0x0
+    const-string v2, "recycler"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "recycler"
-
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -99,7 +87,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a050b
+    const v0, 0x7f0a0511
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -107,7 +95,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a050a
+    const v0, 0x7f0a0510
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +117,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120cab
+    const v0, 0x7f120cd1
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -338,7 +326,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -361,13 +351,4 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->adapter:Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali
index 10fdf7dd3c..d7b3b455f3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$onConfigure$2.smali
@@ -63,7 +63,7 @@
 
     const-string v0, "checked"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -95,7 +95,7 @@
 
     const-string p1, "integrationEnabledSwitch.context"
 
-    invoke-static {v6, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {v0 .. v6}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->access$showDisableSyncDialog(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;JJZLandroid/content/Context;)V
 
@@ -176,7 +176,7 @@
 
     const/4 v3, 0x4
 
-    invoke-static {v0, v2, v1, v3}, Lf/a/b/q;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
+    invoke-static {v0, v2, v1, v3}, Lf/a/b/s;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali
index 932a08b5e9..c81d442b2d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2.smali
@@ -85,7 +85,7 @@
 
     const/4 v3, 0x4
 
-    invoke-static {v0, v1, v2, v3}, Lf/a/b/q;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
+    invoke-static {v0, v1, v2, v3}, Lf/a/b/s;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
index 2ae48d5a81..7bc99e2071 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
@@ -38,7 +38,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;
 
@@ -46,149 +46,101 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "headerDisabledOverlay"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderDisabledOverlay()Landroid/view/View;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "headerDisabledOverlay"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getHeaderDisabledOverlay()Landroid/view/View;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "headerContainer"
 
-    const/4 v3, 0x0
+    const-string v3, "getHeaderContainer()Landroid/view/View;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "headerContainer"
-
-    const-string v5, "getHeaderContainer()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "ownerName"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOwnerName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "ownerName"
-
-    const-string v5, "getOwnerName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "integrationName"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntegrationName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "integrationName"
-
-    const-string v5, "getIntegrationName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "integrationIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntegrationIcon()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "integrationIcon"
-
-    const-string v5, "getIntegrationIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "settingsIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsIcon()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "settingsIcon"
-
-    const-string v5, "getSettingsIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "syncingProgressIndicator"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSyncingProgressIndicator()Landroid/widget/ProgressBar;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "syncingProgressIndicator"
-
-    const-string v5, "getSyncingProgressIndicator()Landroid/widget/ProgressBar;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "integrationEnabledSwitch"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntegrationEnabledSwitch()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "integrationEnabledSwitch"
+    const/4 v2, 0x7
 
-    const-string v4, "getIntegrationEnabledSwitch()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x7
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -198,13 +150,15 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0246
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0500
+    const p1, 0x7f0a0506
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -212,7 +166,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->headerDisabledOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04ff
+    const p1, 0x7f0a0505
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -220,7 +174,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->headerContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0504
+    const p1, 0x7f0a050a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -228,7 +182,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->ownerName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0502
+    const p1, 0x7f0a0508
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -236,7 +190,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->integrationName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0501
+    const p1, 0x7f0a0507
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -244,7 +198,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->integrationIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0505
+    const p1, 0x7f0a050b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -252,7 +206,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->settingsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0507
+    const p1, 0x7f0a050d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -260,7 +214,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->syncingProgressIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0506
+    const p1, 0x7f0a050c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,15 +223,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;->integrationEnabledSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem;)Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Adapter;
@@ -489,19 +434,19 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a07d7
+    const v1, 0x7f0a07dd
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v7
 
-    const v1, 0x7f0a07d6
+    const v1, 0x7f0a07dc
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
 
-    const v2, 0x7f0a07d5
+    const v2, 0x7f0a07db
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -525,7 +470,7 @@
 
     const-string v0, "AlertDialog.Builder(cont\u2026t).setView(view).create()"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v1, :cond_0
 
@@ -559,12 +504,12 @@
 
     if-eqz p5, :cond_2
 
-    const v0, 0x7f12059b
+    const v0, 0x7f12059d
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f12059c
+    const v0, 0x7f12059e
 
     :goto_0
     invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
@@ -649,9 +594,9 @@
 .method public onConfigure(ILcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_c
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -659,6 +604,8 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildIntegration;->getType()Ljava/lang/String;
@@ -673,7 +620,7 @@
     :goto_0
     const-string v1, "twitch"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -892,13 +839,6 @@
 
     :goto_b
     return-void
-
-    :cond_c
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali
index c291bc14b1..2fe4d8c80a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$1.smali
@@ -66,7 +66,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter$RoleSpinnerItem;->roleId:Ljava/lang/Long;
 
-    invoke-interface {p2, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p2, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
index b21e7c1be1..eda8be9fa7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$Model.smali
@@ -321,7 +321,7 @@
     :cond_0
     move-object/from16 v11, p3
 
-    invoke-static {v11, v0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v11, v0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -381,7 +381,7 @@
 
     check-cast v7, Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v7, v0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v7, v0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -638,11 +638,11 @@
 
     invoke-direct {v1, p0, p1, p2, p3}, Lf/a/o/e/w1;-><init>(JLrx/Observable;Lrx/Observable;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter.smali
index 964f29dfc6..2f7d05bed3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter.smali
@@ -61,7 +61,7 @@
     move-result-object p3
 
     :cond_0
-    const p2, 0x7f0a0783
+    const p2, 0x7f0a0789
 
     invoke-virtual {p3, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
index d01172c75d..b80045d003 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
@@ -141,7 +141,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120eba
+    const v0, 0x7f120ee0
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -274,7 +274,7 @@
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -443,7 +443,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a05d1
+    const p3, 0x7f0a05d7
 
     if-eq p2, p3, :cond_0
 
@@ -515,9 +515,9 @@
 
     if-nez v0, :cond_1
 
-    const p1, 0x7f1203be
+    const p1, 0x7f1203bf
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     goto :goto_2
 
@@ -555,16 +555,16 @@
 
     if-eqz p1, :cond_3
 
-    const p1, 0x7f1203bf
+    const p1, 0x7f1203c0
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f1203bd
+    const p1, 0x7f1203be
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     goto :goto_2
 
@@ -665,7 +665,7 @@
 
     move-result-object v1
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->nameFilterPublisher:Lrx/subjects/Subject;
 
@@ -679,7 +679,7 @@
 
     sget-object v1, Lf/a/o/e/s1;->d:Lf/a/o/e/s1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -689,7 +689,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -705,7 +705,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -719,7 +719,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -737,7 +737,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07ed
+    const v0, 0x7f0a07f3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -747,7 +747,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->searchBox:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a07ef
+    const v0, 0x7f0a07f5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -757,7 +757,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a07f0
+    const v0, 0x7f0a07f6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -767,7 +767,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->rolesSpinner:Landroid/widget/Spinner;
 
-    const v0, 0x7f0a07f1
+    const v0, 0x7f0a07f7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -821,7 +821,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali
index 75c8d740e7..bf49600b8a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembersAdapter$MemberListItem.smali
@@ -47,7 +47,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a3
+    const v0, 0x7f0a05a9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -57,7 +57,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a5
+    const v0, 0x7f0a05ab
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -69,7 +69,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a2
+    const v0, 0x7f0a05a8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -81,7 +81,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a7
+    const v0, 0x7f0a05ad
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -93,7 +93,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a4
+    const v0, 0x7f0a05aa
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -105,7 +105,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05a6
+    const v0, 0x7f0a05ac
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali
index eae507f20b..4f4f406551 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration$Model.smali
@@ -124,7 +124,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index e383c6e32d..94a8f91c0f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -71,7 +71,7 @@
 
     if-ge p2, v0, :cond_0
 
-    const v0, 0x7f1215fd
+    const v0, 0x7f121627
 
     invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->b(I)V
 
@@ -244,7 +244,7 @@
 
     if-nez p2, :cond_0
 
-    const v0, 0x7f1215fd
+    const v0, 0x7f121627
 
     invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->b(I)V
 
@@ -309,7 +309,7 @@
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -325,7 +325,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -333,7 +333,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -345,7 +345,7 @@
 
     invoke-direct {p2, p0}, Lf/a/o/e/d2;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsModeration;)V
 
-    invoke-static {p2, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -403,9 +403,9 @@
 .method public synthetic i(Lcom/discord/models/domain/ModelGuild;)V
     .locals 0
 
-    const p1, 0x7f121458
+    const p1, 0x7f121482
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     return-void
 .end method
@@ -421,7 +421,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f120f07
+    const v0, 0x7f120f31
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -429,7 +429,7 @@
 
     new-array v0, v0, [Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a07f5
+    const v1, 0x7f0a07fb
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -441,7 +441,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a07f6
+    const v1, 0x7f0a07fc
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -453,7 +453,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a07f7
+    const v1, 0x7f0a07fd
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -465,7 +465,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f0a07f8
+    const v1, 0x7f0a07fe
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -477,7 +477,7 @@
 
     aput-object v1, v0, v5
 
-    const v1, 0x7f0a07f9
+    const v1, 0x7f0a07ff
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -497,7 +497,7 @@
 
     new-array v0, v5, [Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a07f2
+    const v1, 0x7f0a07f8
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -507,7 +507,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a07f3
+    const v1, 0x7f0a07f9
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -517,7 +517,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a07f4
+    const v1, 0x7f0a07fa
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -563,7 +563,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f12177d
+    const v1, 0x7f1217a7
 
     invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -585,7 +585,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f121779
+    const v1, 0x7f1217a3
 
     invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -617,7 +617,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -631,7 +631,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali
index 0864ba9dd4..68b3977ef5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1.smali
@@ -43,7 +43,7 @@
 
     const-string v0, "item"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getTag()Ljava/lang/Object;
 
@@ -65,7 +65,7 @@
 
     const-string v2, "item.context"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, p1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion;->getAfkTimeout(Landroid/content/Context;I)Ljava/lang/String;
 
@@ -124,11 +124,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.String"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
index 99260f9654..a0b43766a6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet.smali
@@ -30,25 +30,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;
+    const-string v2, "timeouts"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTimeouts()Ljava/util/List;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "timeouts"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTimeouts()Ljava/util/List;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -56,7 +50,7 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 2
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
@@ -66,7 +60,17 @@
 
     fill-array-data v0, :array_0
 
-    invoke-static {p0, v0}, Lf/n/a/k/a;->m(Landroidx/fragment/app/DialogFragment;[I)Lkotlin/properties/ReadOnlyProperty;
+    const-string v1, "$this$bindViews"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "ids"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lm0/e;->d:Lm0/e;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->R([ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object v0
 
@@ -76,11 +80,11 @@
 
     :array_0
     .array-data 4
-        0x7f0a0804
-        0x7f0a0805
-        0x7f0a0806
-        0x7f0a0807
-        0x7f0a0808
+        0x7f0a080a
+        0x7f0a080b
+        0x7f0a080c
+        0x7f0a080d
+        0x7f0a080e
     .end array-data
 .end method
 
@@ -125,9 +129,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -139,15 +143,12 @@
 
     if-nez p2, :cond_0
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_0
-    move-object v0, p1
+    check-cast p1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    :goto_0
-    check-cast v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
-
-    if-nez v0, :cond_1
+    if-nez p1, :cond_1
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
 
@@ -156,40 +157,33 @@
     :cond_1
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;->getTimeouts()Ljava/util/List;
 
-    move-result-object p1
+    move-result-object p2
 
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :goto_1
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p2
 
-    check-cast p2, Landroid/view/View;
+    :goto_0
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
 
     new-instance v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1;
 
-    invoke-direct {v1, p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;Lcom/discord/widgets/servers/WidgetServerSettingsOverview;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$onViewCreated$$inlined$forEach$lambda$1;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;Lcom/discord/widgets/servers/WidgetServerSettingsOverview;)V
 
-    invoke-virtual {p2, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
index c6d732f22b..0d7e72cdfe 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Companion.smali
@@ -51,7 +51,9 @@
 .method public final create(Landroid/content/Context;JZ)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -81,20 +83,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026PICKER, openAvatarPicker)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali
index b748291b6e..1481ca978f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1$1.smali
@@ -35,7 +35,17 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelVoiceRegion;",
+        ">;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;",
+        ">;"
     }
 .end annotation
 
@@ -82,11 +92,11 @@
 
     const-string v0, "me"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "regions"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v8
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali
index 784b8bcde0..507d7eaae5 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +81,9 @@
 
     if-nez p1, :cond_0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion.smali
index 1763a0391b..bebaf4fd44 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion.smali
@@ -58,13 +58,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n            \u2026        }\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -76,7 +76,7 @@
 
     const-string p2, "StoreStream\n            \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -84,7 +84,9 @@
 .method public final getAfkTimeout(Landroid/content/Context;I)Ljava/lang/String;
     .locals 5
 
-    if-eqz p1, :cond_5
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x3c
 
@@ -123,7 +125,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f100031
 
@@ -146,7 +148,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -169,7 +171,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -192,7 +194,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -215,7 +217,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v4, [Ljava/lang/Object;
 
@@ -231,13 +233,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_5
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali
index 5511e6fe96..80a1ec974f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion.smali
@@ -27,11 +27,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,20 +42,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;->name:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;
@@ -101,31 +89,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "id"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "id"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -143,7 +119,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;->id:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -153,7 +129,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;->name:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali
index 414b10d793..afde6b8802 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$Model.smali
@@ -69,7 +69,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;)V
-    .locals 3
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -87,13 +87,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_b
+    const-string v0, "me"
 
-    if-eqz p3, :cond_a
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "regions"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -113,82 +117,84 @@
 
     iput-boolean p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->isOwner:Z
 
+    const/4 p1, 0x0
+
     if-eqz p7, :cond_0
 
     invoke-virtual {p7}, Lcom/discord/stores/StoreGuildProfiles$GuildProfileData;->getData()Lcom/discord/models/domain/ModelGuildPreview;
 
-    move-result-object p1
+    move-result-object p4
 
-    if-eqz p1, :cond_0
+    if-eqz p4, :cond_0
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildPreview;->getApproximateMemberCount()Ljava/lang/Integer;
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelGuildPreview;->getApproximateMemberCount()Ljava/lang/Integer;
 
-    move-result-object p1
+    move-result-object p4
 
     goto :goto_0
 
     :cond_0
-    move-object p1, v0
+    move-object p4, p1
 
     :goto_0
-    iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->approximateMemberCount:Ljava/lang/Integer;
+    iput-object p4, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->approximateMemberCount:Ljava/lang/Integer;
 
-    iget-boolean p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->isOwner:Z
+    iget-boolean p4, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->isOwner:Z
 
-    const/4 p4, 0x0
+    const/4 p5, 0x0
 
-    const/4 p5, 0x1
+    const/4 p7, 0x1
 
-    if-nez p1, :cond_2
+    if-nez p4, :cond_2
 
-    const-wide/16 v1, 0x20
+    const-wide/16 v0, 0x20
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
-    move-result p1
+    move-result p2
 
-    iget-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+    iget-object p4, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I
+
+    move-result p4
+
+    invoke-static {v0, v1, p6, p2, p4}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
 
     move-result p2
 
-    invoke-static {v1, v2, p6, p1, p2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(JLjava/lang/Long;ZI)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
+    if-eqz p2, :cond_1
 
     goto :goto_1
 
     :cond_1
-    const/4 p1, 0x0
+    const/4 p2, 0x0
 
     goto :goto_2
 
     :cond_2
     :goto_1
-    const/4 p1, 0x1
+    const/4 p2, 0x1
 
     :goto_2
-    iput-boolean p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->canManage:Z
+    iput-boolean p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->canManage:Z
 
     invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object p1
-
-    :cond_3
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_4
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
     move-result-object p2
 
-    move-object p6, p2
+    :cond_3
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p4
+
+    if-eqz p4, :cond_4
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p4
+
+    move-object p6, p4
 
     check-cast p6, Lcom/discord/models/domain/ModelVoiceRegion;
 
@@ -196,13 +202,13 @@
 
     move-result-object p6
 
-    iget-object p7, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+    iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-virtual {p7}, Lcom/discord/models/domain/ModelGuild;->getRegion()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getRegion()Ljava/lang/String;
 
-    move-result-object p7
+    move-result-object v0
 
-    invoke-static {p6, p7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p6, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p6
 
@@ -211,48 +217,48 @@
     goto :goto_3
 
     :cond_4
-    move-object p2, v0
+    move-object p4, p1
 
     :goto_3
-    check-cast p2, Lcom/discord/models/domain/ModelVoiceRegion;
+    check-cast p4, Lcom/discord/models/domain/ModelVoiceRegion;
 
-    if-eqz p2, :cond_5
+    if-eqz p4, :cond_5
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelVoiceRegion;->getName()Ljava/lang/String;
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelVoiceRegion;->getName()Ljava/lang/String;
 
-    move-result-object p1
+    move-result-object p2
 
     goto :goto_4
 
     :cond_5
-    move-object p1, v0
+    move-object p2, p1
 
     :goto_4
-    iput-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->selectedVoiceRegionName:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->selectedVoiceRegionName:Ljava/lang/String;
 
-    new-instance p1, Ljava/util/ArrayList;
+    new-instance p2, Ljava/util/ArrayList;
 
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object p2
+    move-result-object p3
 
     :cond_6
     :goto_5
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result p3
+    move-result p4
 
-    if-eqz p3, :cond_8
+    if-eqz p4, :cond_8
 
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object p3
+    move-result-object p4
 
-    check-cast p3, Lcom/discord/models/domain/ModelVoiceRegion;
+    check-cast p4, Lcom/discord/models/domain/ModelVoiceRegion;
 
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelVoiceRegion;->isDeprecated()Z
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelVoiceRegion;->isDeprecated()Z
 
     move-result p6
 
@@ -260,48 +266,48 @@
 
     new-instance p6, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;
 
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelVoiceRegion;->getId()Ljava/lang/String;
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelVoiceRegion;->getId()Ljava/lang/String;
 
-    move-result-object p7
+    move-result-object v0
 
     const-string v1, "it.id"
 
-    invoke-static {p7, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelVoiceRegion;->getName()Ljava/lang/String;
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelVoiceRegion;->getName()Ljava/lang/String;
 
-    move-result-object p3
+    move-result-object p4
 
     const-string v1, "it.name"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p6, p7, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {p6, v0, p4}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$VoiceRegion;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_6
 
     :cond_7
-    move-object p6, v0
+    move-object p6, p1
 
     :goto_6
     if-eqz p6, :cond_6
 
-    invoke-interface {p1, p6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {p2, p6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_5
 
     :cond_8
-    sget-object p2, Ljava/lang/String;->CASE_INSENSITIVE_ORDER:Ljava/util/Comparator;
+    sget-object p1, Ljava/lang/String;->CASE_INSENSITIVE_ORDER:Ljava/util/Comparator;
 
     const-string p3, "java.lang.String.CASE_INSENSITIVE_ORDER"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1;
 
-    invoke-direct {p3, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1;-><init>(Ljava/util/Comparator;)V
+    invoke-direct {p3, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$$special$$inlined$compareBy$1;-><init>(Ljava/util/Comparator;)V
 
-    invoke-static {p1, p3}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p2, p3}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -319,33 +325,12 @@
 
     if-le p1, p2, :cond_9
 
-    const/4 p4, 0x1
+    const/4 p5, 0x1
 
     :cond_9
-    iput-boolean p4, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->isAboveNotifyAllSize:Z
+    iput-boolean p5, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->isAboveNotifyAllSize:Z
 
     return-void
-
-    :cond_a
-    const-string p1, "regions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali
index 951b6908af..529bdeedaf 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali
@@ -41,9 +41,9 @@
 
     iget-object v0, v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const v1, 0x7f12042a
+    const v1, 0x7f12042b
 
-    const v2, 0x7f12164e    # 1.941831E38f
+    const v2, 0x7f121678
 
     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$configureBannerSection$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$1.smali
index b6c1517755..3dd0eed39f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,11 +67,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 p3, 0x0
+    const-string p3, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p3, "<anonymous parameter 1>"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
@@ -84,18 +86,4 @@
     invoke-virtual {p2, p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$2.smali
index ac5bbf1ed2..77ae524c2c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$2.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali
index 67a8a52527..1b82d4f2fc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali
@@ -41,9 +41,9 @@
 
     iget-object v0, v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const v1, 0x7f12042a
+    const v1, 0x7f12042b
 
-    const v2, 0x7f12164e    # 1.941831E38f
+    const v2, 0x7f121678
 
     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$configureSplashSection$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$1.smali
index e3aa0995f0..83591b17f7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,11 +67,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 p3, 0x0
+    const-string p3, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p3, "<anonymous parameter 1>"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;
 
@@ -84,18 +86,4 @@
     invoke-virtual {p2, p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion;->create(Landroid/content/Context;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$2.smali
index 39f201fe13..2259a49adc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$2.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
index 4606d081f9..9a4d78ffb8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
@@ -59,7 +59,7 @@
 
     const/4 v5, 0x1
 
-    const v6, 0x7f120f76
+    const v6, 0x7f120fa0
 
     invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launchForVoice(Landroidx/fragment/app/Fragment;JIZI)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali
index 8d7d0ea8f7..00b7be8dbc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$3.smali
@@ -49,11 +49,11 @@
 
     const-string v1, "childFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet;
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
index ba62776865..a34f3c6502 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
@@ -59,7 +59,7 @@
 
     const/4 v5, 0x1
 
-    const v6, 0x7f120fa3
+    const v6, 0x7f120fcd
 
     invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launchForText(Landroidx/fragment/app/Fragment;JIZI)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$1.smali
index 5cbe003a3e..b4dfc7992f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/models/domain/ModelGuild;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/models/domain/ModelGuild;",
             ">;"
         }
@@ -90,9 +93,9 @@
 
     move-result-object v0
 
-    const-string v1, "updatedGuild"
+    const-string/jumbo v1, "updatedGuild"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -104,19 +107,19 @@
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "filter { it != null }.map { it!! }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$2.smali
index 2b1798602a..9d412147d3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/models/domain/ModelGuild;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;",
             ">;"
         }
@@ -86,9 +89,9 @@
 
     sget-object v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->Companion:Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model$Companion;
 
-    const-string v1, "updatedGuild"
+    const-string/jumbo v1, "updatedGuild"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.smali
index cfc7d7c55d..19b75f798e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.smali
@@ -550,7 +550,7 @@
 
     const/4 v4, 0x0
 
-    invoke-static {v4, v3}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
+    invoke-static {v4, v3}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
 
     move-result-object v3
 
@@ -560,19 +560,19 @@
 
     sget-object v3, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$1;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$1;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
     sget-object v3, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$2;->INSTANCE:Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7$2;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
     const-string v2, "RestAPI\n          .apiSe\u2026atedGuild.id)\n          }"
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v5, 0x0
 
@@ -600,7 +600,7 @@
 
     iget-object v3, v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    invoke-static {v2, v3}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v2, v3}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1.smali
index f68d1693d5..3901d4a27c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0819
+    const v1, 0x7f0a081f
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0801
+    const v1, 0x7f0a0807
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1.smali
index a09c0df3a7..96167ab541 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Long;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,9 +75,9 @@
 .method public final invoke(JLjava/lang/String;I)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 1>"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -87,17 +87,17 @@
 
     invoke-virtual {p3, p1, p2}, Lcom/discord/stores/StoreChannels;->get(J)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v1, 0x0
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    const/4 v5, 0x3
+    const/4 v4, 0x3
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
@@ -111,13 +111,15 @@
 
     const-string p2, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const/4 p3, 0x2
+    const/4 p3, 0x0
 
-    invoke-static {p1, p2, v0, p3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p1, p2, p3, v0, p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
@@ -127,15 +129,15 @@
 
     move-result-object v2
 
+    new-instance v7, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1;
+
+    invoke-direct {v7, p0, p4}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1;I)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x0
-
-    new-instance v7, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1;
-
-    invoke-direct {v7, p0, p4}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1$1;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$initChannelSelectedHandler$1;I)V
+    const/4 v6, 0x0
 
     const/16 v8, 0x1e
 
@@ -144,11 +146,4 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1.smali
index 7c64eee66f..ca7cba75a1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$openAvatarPicker$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$openAvatarPicker$2.smali
index 12ca994e78..41aad9ede7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$openAvatarPicker$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$openAvatarPicker$2.smali
@@ -39,9 +39,9 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$openAvatarPicker$2;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const v1, 0x7f12042a
+    const v1, 0x7f12042b
 
-    const v2, 0x7f12164e    # 1.941831E38f
+    const v2, 0x7f121678
 
     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$showRegionDialog$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.smali
index 9a06c11aec..8a9f919f53 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "voiceRegion"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
@@ -79,13 +81,13 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0812
-
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;->getName()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
+    const v3, 0x7f0a0818
+
+    invoke-virtual {v1, v3, v2}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
@@ -93,13 +95,13 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0813
-
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
+    const v3, 0x7f0a0819
+
+    invoke-virtual {v1, v3, v2}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
@@ -107,13 +109,13 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0816
-
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerRegionSelectDialog$VoiceRegion;->getId()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
+    const v3, 0x7f0a081c
+
+    invoke-virtual {v1, v3, v2}, Lcom/discord/utilities/stateful/StatefulViews;->put(ILjava/lang/Object;)V
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
@@ -148,13 +150,4 @@
     invoke-virtual {v0, p1}, Landroid/view/View;->setTag(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceRegion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
index 578c127a3e..9150611918 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
@@ -137,681 +137,477 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "scroll"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getScroll()Landroid/widget/ScrollView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "scroll"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getScroll()Landroid/widget/ScrollView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const/4 v2, 0x0
+    const-string v2, "iconAndNameContainer"
 
-    aput-object v1, v0, v2
+    const-string v3, "getIconAndNameContainer()Landroid/view/ViewGroup;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "iconAndNameContainer"
-
-    const-string v4, "getIconAndNameContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "iconRemove"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconRemove()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "iconRemove"
-
-    const-string v4, "getIconRemove()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "iconLabel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconLabel()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "iconLabel"
-
-    const-string v4, "getIconLabel()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "iconText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "iconText"
-
-    const-string v4, "getIconText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "icon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "icon"
-
-    const-string v4, "getIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "name"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getName()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "name"
-
-    const-string v4, "getName()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "region"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRegion()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "region"
-
-    const-string v4, "getRegion()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "regionFlag"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRegionFlag()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "regionFlag"
-
-    const-string v4, "getRegionFlag()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "regionWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRegionWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "regionWrap"
-
-    const-string v4, "getRegionWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "afkChannelWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAfkChannelWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "afkChannelWrap"
-
-    const-string v4, "getAfkChannelWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "afkChannel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAfkChannel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "afkChannel"
-
-    const-string v4, "getAfkChannel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "afkTimeoutWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAfkTimeoutWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "afkTimeoutWrap"
-
-    const-string v4, "getAfkTimeoutWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "afkTimeout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAfkTimeout()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "afkTimeout"
-
-    const-string v4, "getAfkTimeout()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "systemChannelWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSystemChannelWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "systemChannelWrap"
-
-    const-string v4, "getSystemChannelWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "systemChannel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSystemChannel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "systemChannel"
-
-    const-string v4, "getSystemChannel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "systemChannelJoinMessage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSystemChannelJoinMessage()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "systemChannelJoinMessage"
-
-    const-string v4, "getSystemChannelJoinMessage()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "systemChannelBoostMessage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSystemChannelBoostMessage()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "systemChannelBoostMessage"
-
-    const-string v4, "getSystemChannelBoostMessage()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadSplashContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadSplashContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadSplashContainer"
-
-    const-string v4, "getUploadSplashContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadSplash"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadSplash()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadSplash"
-
-    const-string v4, "getUploadSplash()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadSplashRemove"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadSplashRemove()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadSplashRemove"
-
-    const-string v4, "getUploadSplashRemove()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadSplashLearnMore"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadSplashLearnMore()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadSplashLearnMore"
-
-    const-string v4, "getUploadSplashLearnMore()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadSplashTierInfo"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadSplashTierInfo()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadSplashTierInfo"
-
-    const-string v4, "getUploadSplashTierInfo()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadSplashFAB"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadSplashFAB()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadSplashFAB"
-
-    const-string v4, "getUploadSplashFAB()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadSplashUnlock"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadSplashUnlock()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadSplashUnlock"
-
-    const-string v4, "getUploadSplashUnlock()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x18
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadBannerContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadBannerContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadBannerContainer"
-
-    const-string v4, "getUploadBannerContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x19
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadBanner"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadBanner()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadBanner"
-
-    const-string v4, "getUploadBanner()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1a
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadBannerRemove"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadBannerRemove()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadBannerRemove"
-
-    const-string v4, "getUploadBannerRemove()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1b
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadBannerLearnMore"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadBannerLearnMore()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadBannerLearnMore"
-
-    const-string v4, "getUploadBannerLearnMore()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1c
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadBannerTierInfo"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadBannerTierInfo()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadBannerTierInfo"
-
-    const-string v4, "getUploadBannerTierInfo()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1d
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadBannerFAB"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadBannerFAB()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadBannerFAB"
-
-    const-string v4, "getUploadBannerFAB()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1e
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string/jumbo v2, "uploadBannerUnlock"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadBannerUnlock()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "uploadBannerUnlock"
-
-    const-string v4, "getUploadBannerUnlock()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1f
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "notificationsCs"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsCs()Ljava/util/List;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationsCs"
-
-    const-string v4, "getNotificationsCs()Ljava/util/List;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x20
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+    const-string v2, "save"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "save"
-
-    const-string v4, "getSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x21
 
@@ -835,7 +631,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0818
+    const v0, 0x7f0a081e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -843,7 +639,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->scroll$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080c
+    const v0, 0x7f0a0812
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -851,7 +647,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconAndNameContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080d
+    const v0, 0x7f0a0813
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -859,7 +655,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconRemove$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080b
+    const v0, 0x7f0a0811
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -867,7 +663,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080e
+    const v0, 0x7f0a0814
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -875,7 +671,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->iconText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080a
+    const v0, 0x7f0a0810
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -883,7 +679,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080f
+    const v0, 0x7f0a0815
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -891,7 +687,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0812
+    const v0, 0x7f0a0818
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -899,7 +695,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->region$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0813
+    const v0, 0x7f0a0819
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -907,7 +703,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->regionFlag$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0816
+    const v0, 0x7f0a081c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -915,7 +711,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->regionWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0802
+    const v0, 0x7f0a0808
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -923,7 +719,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkChannelWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0801
+    const v0, 0x7f0a0807
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -931,7 +727,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0809
+    const v0, 0x7f0a080f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -939,7 +735,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkTimeoutWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0803
+    const v0, 0x7f0a0809
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -947,7 +743,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->afkTimeout$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a081c
+    const v0, 0x7f0a0822
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -955,7 +751,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannelWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0819
+    const v0, 0x7f0a081f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -963,7 +759,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a081b
+    const v0, 0x7f0a0821
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -971,7 +767,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannelJoinMessage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a081a
+    const v0, 0x7f0a0820
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -979,7 +775,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->systemChannelBoostMessage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0825
+    const v0, 0x7f0a082b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -987,7 +783,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0824
+    const v0, 0x7f0a082a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -995,7 +791,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplash$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0829
+    const v0, 0x7f0a082f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1003,7 +799,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashRemove$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0827
+    const v0, 0x7f0a082d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1011,7 +807,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0828
+    const v0, 0x7f0a082e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1019,7 +815,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashTierInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0826
+    const v0, 0x7f0a082c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1027,7 +823,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashFAB$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a082a
+    const v0, 0x7f0a0830
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1035,7 +831,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadSplashUnlock$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a081e
+    const v0, 0x7f0a0824
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1043,7 +839,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a081d
+    const v0, 0x7f0a0823
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1051,7 +847,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0822
+    const v0, 0x7f0a0828
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1059,7 +855,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerRemove$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0820
+    const v0, 0x7f0a0826
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1067,7 +863,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0821
+    const v0, 0x7f0a0827
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1075,7 +871,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerTierInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a081f
+    const v0, 0x7f0a0825
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1083,7 +879,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->uploadBannerFAB$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0823
+    const v0, 0x7f0a0829
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1097,13 +893,13 @@
 
     fill-array-data v0, :array_0
 
-    invoke-static {p0, v0}, Lf/n/a/k/a;->n(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->l(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->notificationsCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0817
+    const v0, 0x7f0a081d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1129,25 +925,25 @@
 
     :array_0
     .array-data 4
-        0x7f0a0810
-        0x7f0a0811
+        0x7f0a0816
+        0x7f0a0817
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f0a080a
-        0x7f0a080f
-        0x7f0a0812
-        0x7f0a0813
-        0x7f0a0816
-        0x7f0a0801
-        0x7f0a0803
-        0x7f0a0809
+        0x7f0a0810
+        0x7f0a0815
+        0x7f0a0818
         0x7f0a0819
-        0x7f0a0824
-        0x7f0a081d
-        0x7f0a081b
-        0x7f0a081a
+        0x7f0a081c
+        0x7f0a0807
+        0x7f0a0809
+        0x7f0a080f
+        0x7f0a081f
+        0x7f0a082a
+        0x7f0a0823
+        0x7f0a0821
+        0x7f0a0820
         0x15f91
     .end array-data
 .end method
@@ -1403,9 +1199,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120f76
+    const v1, 0x7f120fa0
 
-    const v2, 0x7f08026b
+    const v2, 0x7f08026c
 
     invoke-direct {p0, v0, p1, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->configureChannel(Landroid/widget/TextView;Lcom/discord/models/domain/ModelChannel;II)V
 
@@ -1497,7 +1293,7 @@
 
     if-eqz p2, :cond_3
 
-    invoke-static {p2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p2
 
@@ -1585,7 +1381,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f120ad9
+    const v6, 0x7f120ade
 
     new-array v7, v3, [Ljava/lang/Object;
 
@@ -1603,7 +1399,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f08037e
+    const v8, 0x7f080381
 
     const/4 v9, 0x0
 
@@ -1698,7 +1494,7 @@
     goto/16 :goto_3
 
     :cond_4
-    const v0, 0x7f120ada
+    const v0, 0x7f120adf
 
     const/4 v5, 0x2
 
@@ -1716,7 +1512,7 @@
 
     const-string v0, "getString(R.string.guild\u2026\", \"https://discord.com\")"
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getUploadBannerTierInfo()Landroid/widget/TextView;
 
@@ -1728,7 +1524,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v7, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v9, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerSection$1;
 
@@ -1776,6 +1572,10 @@
     move-result-object v0
 
     :goto_2
+    const-string v2, "guild.premiumSubscriptionCount ?: 0"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -1788,13 +1588,13 @@
 
     const-string v5, "resources"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v5
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f100085
 
@@ -1814,7 +1614,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120ad8
+    const v2, 0x7f120add
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -1832,7 +1632,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f08037d
+    const v4, 0x7f080380
 
     const/4 v5, 0x0
 
@@ -2062,7 +1862,7 @@
 
     if-eqz p3, :cond_5
 
-    invoke-static {p3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p3
 
@@ -2217,11 +2017,11 @@
 
     move-result v1
 
-    const v4, 0x7f0a0810
+    const v4, 0x7f0a0816
 
     if-ne v1, v4, :cond_2
 
-    const v1, 0x7f120a47
+    const v1, 0x7f120a4c
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2357,7 +2157,7 @@
 
     if-eqz p2, :cond_3
 
-    invoke-static {p2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p2
 
@@ -2445,7 +2245,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f120ad9
+    const v6, 0x7f120ade
 
     new-array v7, v3, [Ljava/lang/Object;
 
@@ -2463,7 +2263,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f08037e
+    const v8, 0x7f080381
 
     const/4 v9, 0x0
 
@@ -2558,7 +2358,7 @@
     goto/16 :goto_3
 
     :cond_4
-    const v0, 0x7f120ada
+    const v0, 0x7f120adf
 
     const/4 v5, 0x2
 
@@ -2576,7 +2376,7 @@
 
     const-string v0, "getString(R.string.guild\u2026\", \"https://discord.com\")"
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getUploadSplashTierInfo()Landroid/widget/TextView;
 
@@ -2588,7 +2388,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v7, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v9, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashSection$1;
 
@@ -2636,6 +2436,10 @@
     move-result-object v0
 
     :goto_2
+    const-string v2, "guild.premiumSubscriptionCount ?: 0"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
@@ -2648,13 +2452,13 @@
 
     const-string v2, "resources"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f100085
 
@@ -2674,7 +2478,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120ad8
+    const v2, 0x7f120add
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -2692,7 +2496,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f08037d
+    const v4, 0x7f080380
 
     const/4 v5, 0x0
 
@@ -2757,9 +2561,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120fa3
+    const v1, 0x7f120fcd
 
-    const v2, 0x7f080261
+    const v2, 0x7f080262
 
     invoke-direct {p0, v0, p1, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->configureChannel(Landroid/widget/TextView;Lcom/discord/models/domain/ModelChannel;II)V
 
@@ -2792,7 +2596,7 @@
 
     const-string v2, "guild.shortName"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -2915,7 +2719,7 @@
     goto :goto_0
 
     :cond_1
-    const v2, 0x7f121456
+    const v2, 0x7f121480
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -3026,7 +2830,7 @@
 
     const-string v8, "afkTimeout.context"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -3402,11 +3206,11 @@
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->configureUI(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;)V
 
-    const p1, 0x7f121458
+    const p1, 0x7f121482
 
     const/4 v0, 0x4
 
-    invoke-static {p0, p1, v1, v0}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v1, v0}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     return-void
 .end method
@@ -4178,7 +3982,7 @@
 
     const-string v3, "childFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -4246,11 +4050,13 @@
 .method public onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -4260,7 +4066,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->imageSelectedResult:Lrx/functions/Action1;
 
@@ -4275,30 +4081,18 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/images/MGImages;->prepareImageUpload(Landroid/net/Uri;Ljava/lang/String;Landroidx/fragment/app/FragmentManager;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Lrx/functions/Action1;Lcom/discord/dialogs/ImageUploadDialog$PreviewType;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -4311,36 +4105,24 @@
     invoke-static {v0, p1, p2, v1}, Lcom/discord/utilities/images/MGImages;->requestDataUrl(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 17
+    .locals 18
 
     move-object/from16 v0, p0
 
-    const/4 v1, 0x0
+    const-string/jumbo v1, "view"
 
-    if-eqz p1, :cond_0
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
+    invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
 
     iget-object v3, v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
@@ -4368,7 +4150,7 @@
 
     move-result-object v6
 
-    aput-object v6, v5, v2
+    aput-object v6, v5, v1
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getAfkTimeout()Landroid/widget/TextView;
 
@@ -4394,7 +4176,7 @@
 
     move-result-object v5
 
-    aput-object v5, v4, v2
+    aput-object v5, v4, v1
 
     invoke-virtual {v3, v4}, Lcom/discord/utilities/stateful/StatefulViews;->addOptionalFields([Landroid/view/View;)V
 
@@ -4416,31 +4198,33 @@
 
     aput-object v6, v5, v7
 
-    aput-object v6, v5, v2
+    aput-object v6, v5, v1
 
     invoke-virtual {v3, v4, v5}, Lcom/discord/app/AppTextView;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
-    const v3, 0x7f120b19
+    new-array v3, v1, [Ljava/lang/Object;
 
-    new-array v4, v2, [Ljava/lang/Object;
+    sget-object v4, Lf/a/b/g;->a:Lf/a/b/g;
 
-    sget-object v5, Lf/a/b/g;->a:Lf/a/b/g;
+    const-wide v5, 0x53d3623db8L
 
-    const-wide v8, 0x53d3623db8L
+    const/4 v8, 0x0
 
-    invoke-virtual {v5, v8, v9, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v4, v5, v6, v8}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    aput-object v5, v4, v7
+    aput-object v4, v3, v7
 
-    invoke-virtual {v0, v3, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const v4, 0x7f120b3f
 
-    move-result-object v11
+    invoke-virtual {v0, v4, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v10
 
     const-string v3, "getString(\n        R.str\u2026UILD_BANNER_SPLASH)\n    )"
 
-    invoke-static {v11, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getUploadSplashLearnMore()Landroid/widget/TextView;
 
@@ -4448,45 +4232,49 @@
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v10
+    move-result-object v9
 
-    const-string v5, "view.context"
+    const-string/jumbo v15, "view.context"
 
-    invoke-static {v10, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v11, 0x0
 
     const/4 v12, 0x0
 
     const/4 v13, 0x0
 
-    const/4 v14, 0x0
-
-    const/16 v15, 0x14
+    const/16 v14, 0x14
 
     const/16 v16, 0x0
 
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    move-object/from16 v17, v15
 
-    move-result-object v6
+    move-object/from16 v15, v16
 
-    invoke-virtual {v4, v6}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    const v4, 0x7f120a25
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    sget-object v6, Lf/a/b/g;->a:Lf/a/b/g;
-
-    invoke-virtual {v6, v8, v9, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    aput-object v1, v2, v7
-
-    invoke-virtual {v0, v4, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static/range {v9 .. v15}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
     move-result-object v9
 
-    invoke-static {v9, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v4, v9}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    const v4, 0x7f120a2a
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    sget-object v9, Lf/a/b/g;->a:Lf/a/b/g;
+
+    invoke-virtual {v9, v5, v6, v8}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v5
+
+    aput-object v5, v1, v7
+
+    invoke-virtual {v0, v4, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getUploadBannerLearnMore()Landroid/widget/TextView;
 
@@ -4496,7 +4284,9 @@
 
     move-result-object v8
 
-    invoke-static {v8, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v2, v17
+
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v10, 0x0
 
@@ -4521,13 +4311,6 @@
     invoke-virtual {v1}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->hide()V
 
     return-void
-
-    :cond_0
-    const-string v2, "view"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -4537,7 +4320,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->initChannelSelectedHandler()V
 
-    const v0, 0x7f1210c6
+    const v0, 0x7f1210f0
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali
index 9699ebd27a..e16e9f91a3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model.smali
@@ -98,7 +98,7 @@
 
     invoke-direct {v2, p2}, Lf/a/o/e/i2;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -142,7 +142,7 @@
 .method public static synthetic b(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Lcom/discord/models/domain/ModelGuildMember$Computed;
     .locals 0
 
-    invoke-static {p0, p1}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p0, p1}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object p0
 
@@ -383,7 +383,7 @@
 
     invoke-direct {v1, p0, p1}, Lf/a/o/e/j2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
index f91694a060..d154f96587 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
@@ -84,7 +84,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f121368
+    const v0, 0x7f121392
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -209,7 +209,7 @@
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -225,7 +225,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -237,7 +237,7 @@
 
     invoke-direct {v1, p1, p2}, Lf/a/o/e/h2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -245,7 +245,7 @@
 
     const-string v0, "observable"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -257,7 +257,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -273,7 +273,7 @@
 
     move-result-object p1
 
-    invoke-static {v1, p1}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    invoke-static {v1, p1}, Lf/a/b/s;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -309,13 +309,13 @@
 
     invoke-direct {p1, p2}, Lf/a/o/e/f2;-><init>(Lcom/discord/models/domain/ModelGuildRole;)V
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     sget-object p1, Lf/a/o/e/n2;->d:Lf/a/o/e/n2;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -447,7 +447,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -457,7 +457,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->dimmer:Lcom/discord/utilities/dimmer/DimmerView;
 
-    invoke-static {v0}, Lf/a/b/q;->t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
+    invoke-static {v0}, Lf/a/b/s;->t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -465,7 +465,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -485,7 +485,7 @@
 
     invoke-direct {v2, p0, p2}, Lf/a/o/e/m2;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;Lcom/discord/widgets/servers/WidgetServerSettingsRolesList$Model;)V
 
-    invoke-static {v0, v1, v2}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {v0, v1, v2}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -559,9 +559,9 @@
 .method public synthetic m(Ljava/lang/Void;)V
     .locals 0
 
-    const p1, 0x7f121364
+    const p1, 0x7f12138e
 
-    invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
+    invoke-static {p0, p1}, Lf/a/b/p;->g(Landroidx/fragment/app/Fragment;I)V
 
     return-void
 .end method
@@ -595,7 +595,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -609,7 +609,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -627,7 +627,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0784
+    const v0, 0x7f0a078a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -637,7 +637,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->addRoleFab:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    const v0, 0x7f0a0832
+    const v0, 0x7f0a0838
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -647,7 +647,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListHelpItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListHelpItem.smali
index 123ba59b21..b0b98e6c70 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListHelpItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListHelpItem.smali
@@ -43,7 +43,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07e8
+    const v0, 0x7f0a07ee
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -93,7 +93,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120bd7
+    const v0, 0x7f120bfd
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 5c34476ae7..8f72e2259f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0830
+    const v0, 0x7f0a0836
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -61,7 +61,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a082e
+    const v0, 0x7f0a0834
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,7 +71,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a082f
+    const v0, 0x7f0a0835
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -89,9 +89,9 @@
 
     move-result-object p0
 
-    const v0, 0x7f12071e
+    const v0, 0x7f120720
 
-    invoke-static {p0, v0}, Lf/a/b/n;->d(Landroid/content/Context;I)V
+    invoke-static {p0, v0}, Lf/a/b/p;->d(Landroid/content/Context;I)V
 
     const/4 p0, 0x1
 
@@ -105,9 +105,9 @@
 
     move-result-object p0
 
-    const v0, 0x7f120bd3
+    const v0, 0x7f120bf9
 
-    invoke-static {p0, v0}, Lf/a/b/n;->d(Landroid/content/Context;I)V
+    invoke-static {p0, v0}, Lf/a/b/p;->d(Landroid/content/Context;I)V
 
     const/4 p0, 0x1
 
@@ -121,9 +121,9 @@
 
     move-result-object p0
 
-    const v0, 0x7f121631
+    const v0, 0x7f12165b
 
-    invoke-static {p0, v0}, Lf/a/b/n;->d(Landroid/content/Context;I)V
+    invoke-static {p0, v0}, Lf/a/b/p;->d(Landroid/content/Context;I)V
 
     const/4 p0, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
index 657a16a761..9672a6bb75 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$Model.smali
@@ -56,7 +56,7 @@
 
     invoke-direct {p1, p2}, Lf/a/o/e/z2;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -167,11 +167,11 @@
 
     invoke-direct {v1, p0, p1}, Lf/a/o/e/y2;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
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 5e8bf8b437..52f52347bd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
@@ -61,12 +61,12 @@
 
     if-eqz p3, :cond_1
 
-    const v1, 0x7f120596
+    const v1, 0x7f120598
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f12061f
+    const v1, 0x7f120621
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
@@ -167,7 +167,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -175,7 +175,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -187,7 +187,7 @@
 
     invoke-direct {p2, p0}, Lf/a/o/e/c3;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog;)V
 
-    invoke-static {p2, p0}, Lf/a/b/q;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -243,7 +243,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a083b
+    const v0, 0x7f0a0841
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -253,7 +253,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog;->codeEditText:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a0838
+    const v0, 0x7f0a083e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -263,7 +263,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog;->cancelButton:Lcom/google/android/material/button/MaterialButton;
 
-    const v0, 0x7f0a0839
+    const v0, 0x7f0a083f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
index 8d0919c884..c9eeab2ab1 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
@@ -41,7 +41,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f12142a
+    const v0, 0x7f121454
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -72,7 +72,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Lcom/google/android/material/button/MaterialButton;
 
-    const v1, 0x7f120978
+    const v1, 0x7f12097c
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
 
@@ -99,7 +99,7 @@
     :cond_1
     iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Lcom/google/android/material/button/MaterialButton;
 
-    const v1, 0x7f120979
+    const v1, 0x7f12097d
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
 
@@ -194,7 +194,7 @@
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -287,7 +287,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -301,7 +301,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -319,7 +319,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a083c
+    const v0, 0x7f0a0842
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -329,7 +329,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Lcom/google/android/material/button/MaterialButton;
 
-    const v0, 0x7f0a05db
+    const v0, 0x7f0a05e1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali
index a652c5b6e3..4515c56410 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$Model.smali
@@ -161,7 +161,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
index 1253244337..fafeff0977 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
@@ -114,7 +114,7 @@
 
     move-result-object v0
 
-    const v2, 0x7f121604
+    const v2, 0x7f12162e
 
     const/4 v3, 0x1
 
@@ -317,7 +317,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -325,7 +325,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -337,7 +337,7 @@
 
     invoke-direct {p2, p0}, Lf/a/o/e/i3;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;)V
 
-    invoke-static {p2, p0}, Lf/a/b/q;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -363,7 +363,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0490
+    const v0, 0x7f0a0496
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -371,7 +371,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->confirm:Landroid/view/View;
 
-    const v0, 0x7f0a048f
+    const v0, 0x7f0a0495
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -379,7 +379,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->cancel:Landroid/view/View;
 
-    const v0, 0x7f0a0492
+    const v0, 0x7f0a0498
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -387,7 +387,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->mfaWrap:Landroid/view/View;
 
-    const v0, 0x7f0a0491
+    const v0, 0x7f0a0497
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -397,7 +397,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;->mfaInput:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a048e
+    const v0, 0x7f0a0494
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -441,7 +441,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -455,7 +455,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsTransferOwnership;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
index ac92d7adf2..19e116115d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
@@ -51,7 +51,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f0a0840
+    const v3, 0x7f0a0846
 
     aput v3, v1, v2
 
@@ -110,7 +110,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
 
-    const v4, 0x7f12176a
+    const v4, 0x7f121794
 
     const/4 v5, 0x1
 
@@ -158,7 +158,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f121485
+    const v0, 0x7f1214af
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -251,7 +251,7 @@
 
     const-class p2, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;
 
-    invoke-static {p0, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -440,7 +440,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -448,7 +448,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -468,7 +468,7 @@
 
     invoke-direct {v0, p0}, Lf/a/o/e/o3;-><init>(Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;)V
 
-    invoke-static {p2, p3, v0}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {p2, p3, v0}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -611,7 +611,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -625,7 +625,7 @@
 
     const-class v2, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -643,7 +643,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0840
+    const v0, 0x7f0a0846
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -653,7 +653,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->vanityInput:Lcom/google/android/material/textfield/TextInputLayout;
 
-    const v0, 0x7f0a0843
+    const v0, 0x7f0a0849
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -661,7 +661,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->vanityInputContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0844
+    const v0, 0x7f0a084a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -671,7 +671,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->loadingIndicator:Landroid/widget/ProgressBar;
 
-    const v0, 0x7f0a0845
+    const v0, 0x7f0a084b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -681,7 +681,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->urlPrefix:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0842
+    const v0, 0x7f0a0848
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -691,7 +691,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->errorText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0841
+    const v0, 0x7f0a0847
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -701,7 +701,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
 
-    const v0, 0x7f0a0846
+    const v0, 0x7f0a084c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -711,7 +711,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->remove:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0847
+    const v0, 0x7f0a084d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali
index 64047364f1..7a0519a40f 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Companion.smali
@@ -36,11 +36,13 @@
 .method public final create(Landroid/content/Context;JLjava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "guildName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -70,25 +72,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026RA_GUILD_NAME, guildName)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "guildName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
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 b5680392b0..ce40cc75ba 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
@@ -33,7 +33,25 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lcom/discord/stores/StoreAuditLog$AuditLogState;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;",
+        "Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;",
+        ">;"
     }
 .end annotation
 
@@ -160,7 +178,7 @@
 
     const-string v7, "entry.targetType"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v7, Ljava/util/HashMap;
 
@@ -339,7 +357,7 @@
     :cond_7
     const-string v3, "channels"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface/range {p3 .. p3}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1009,7 +1027,7 @@
     :cond_1e
     iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
-    const v2, 0x7f120a9e
+    const v2, 0x7f120aa3
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1017,7 +1035,7 @@
 
     const-string v2, "context.getString(R.stri\u2026ettings_filter_all_users)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_f
     iget-object v2, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
@@ -1042,7 +1060,7 @@
 
     const-string v4, "context.getString(AuditL\u2026ate.filter.actionFilter))"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v4, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion.smali
index f1a250ea26..5dcab64c15 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion.smali
@@ -46,7 +46,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -96,11 +98,11 @@
 
     move-result-object v0
 
-    const-wide/16 v4, 0x3
+    sget-object v4, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v6, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v5, 0x3
 
-    invoke-static {v0, v4, v5, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v0, v5, v6, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v4
 
@@ -124,7 +126,7 @@
 
     const-string p2, "Observable.combineLatest\u2026, actionFilter)\n        }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -136,16 +138,7 @@
 
     const-string p2, "Observable.combineLatest\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali
index b5de80bb51..e36de9b0d1 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded.smali
@@ -46,14 +46,20 @@
         }
     .end annotation
 
+    const-string v0, "auditLogEntryItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "usernameFilterText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "actionFilterText"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded;->auditLogEntryItems:Ljava/util/List;
@@ -63,27 +69,6 @@
     iput-object p3, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Loaded;->actionFilterText:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "actionFilterText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "usernameFilterText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "auditLogEntryItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1.smali
index 9d124d1d3b..a18056e352 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1.smali
@@ -43,7 +43,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -62,7 +62,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1;->$context:Landroid/content/Context;
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1;->this$0:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1;
 
@@ -83,7 +83,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1;->$context:Landroid/content/Context;
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1$1;->this$0:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1;
 
@@ -101,7 +101,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05a9
+    .packed-switch 0x7f0a05af
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.smali
index 2dfae32751..325308b4b7 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.smali
@@ -58,13 +58,13 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const v0, 0x7f0a05c1
+    const v0, 0x7f0a05c7
 
     if-eq p1, v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali
index 98dfa74d70..a565125ec7 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$2.smali
@@ -39,7 +39,9 @@
 .method public onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
 
@@ -67,13 +69,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali
index 1c82252d6b..e2297fb65c 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$3.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali
index 3a09391e75..00e516859f 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$4.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1.smali
index 6093d41277..234273c9cb 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettingsAuditLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->access$configureUI(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 bd3f51f3b1..991f476f8c 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
@@ -58,101 +58,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
-    const-class v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "flipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
-    const/4 v2, 0x0
+    const-string v2, "resultsFlipper"
 
-    aput-object v1, v0, v2
+    const-string v3, "getResultsFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "resultsFlipper"
-
-    const-string v4, "getResultsFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
-    const-class v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
+    const-string v2, "recycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "recycler"
-
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
-    const-class v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
+    const-string/jumbo v2, "userFilter"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserFilter()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userFilter"
-
-    const-string v4, "getUserFilter()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
 
-    const-class v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;
+    const-string v2, "actionFilter"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getActionFilter()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "actionFilter"
-
-    const-string v4, "getActionFilter()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -176,7 +146,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07c2
+    const v0, 0x7f0a07c8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -184,7 +154,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c3
+    const v0, 0x7f0a07c9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -192,7 +162,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->resultsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bf
+    const v0, 0x7f0a07c5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -200,7 +170,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c0
+    const v0, 0x7f0a07c6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -208,7 +178,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->userFilter$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bd
+    const v0, 0x7f0a07c3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -514,74 +484,76 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "GUILD_ID"
+    const-string v1, "GUILD_ID"
 
-    const-wide/16 v3, -0x1
+    const-wide/16 v2, -0x1
 
-    invoke-virtual {v1, v2, v3, v4}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    iput-wide v1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->guildId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->guildId:J
 
-    cmp-long v5, v1, v3
+    const/4 v4, 0x0
+
+    cmp-long v5, v0, v2
 
     if-nez v5, :cond_0
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
-    const v2, 0x7f1204f1
+    const v1, 0x7f1204f3
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/16 v4, 0xc
+    const/16 v3, 0xc
 
-    invoke-static {v1, v2, v3, v0, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v1, v2, v4, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Landroid/app/Activity;->finish()V
+    invoke-virtual {v0}, Landroid/app/Activity;->finish()V
 
     :cond_0
-    const v1, 0x7f120acf
+    const v0, 0x7f120ad4
 
-    invoke-virtual {p0, v1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "GUILD_NAME"
+    const-string v1, "GUILD_NAME"
 
-    invoke-virtual {v1, v2}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p0, v1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
+    invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
-    const v1, 0x7f0e000e
+    const v0, 0x7f0e000e
 
-    new-instance v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1;
+    new-instance v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;Landroid/view/View;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;Landroid/view/View;)V
 
-    invoke-virtual {p0, v1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
+    invoke-virtual {p0, v0, v1, v4}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -632,13 +604,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -656,7 +621,7 @@
 
     const-string v4, "requireContext()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion;->get(JLandroid/content/Context;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali
index d820e76fd5..6bcae9611c 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem.smali
@@ -37,11 +37,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelAuditLogEntry;ZLcom/discord/models/domain/ModelUser;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZLjava/lang/CharSequence;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "auditLogEntry"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_0
+    const-string v0, "timeStampText"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,20 +62,6 @@
     iput-object p7, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;->timeStampText:Ljava/lang/CharSequence;
 
     return-void
-
-    :cond_0
-    const-string p1, "timeStampText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "auditLogEntry"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder.smali
index 85de5c35f1..49a8cb9666 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder.smali
@@ -47,7 +47,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;
 
@@ -55,149 +55,101 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "actionTypeImage"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getActionTypeImage()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "actionTypeImage"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getActionTypeImage()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "targetTypeImage"
 
-    const/4 v3, 0x0
+    const-string v3, "getTargetTypeImage()Landroid/widget/ImageView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "targetTypeImage"
-
-    const-string v5, "getTargetTypeImage()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "avatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "avatar"
-
-    const-string v5, "getAvatar()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "headerText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderText()Lcom/discord/app/AppTextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "headerText"
-
-    const-string v5, "getHeaderText()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "dateText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDateText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "dateText"
-
-    const-string v5, "getDateText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "arrow"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getArrow()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "arrow"
-
-    const-string v5, "getArrow()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "topContainer"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTopContainer()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "topContainer"
-
-    const-string v5, "getTopContainer()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "changeText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChangeText()Landroid/widget/TextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "changeText"
+    const/4 v2, 0x7
 
-    const-string v4, "getChangeText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x7
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -207,7 +159,9 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0231
 
@@ -278,15 +232,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->changeText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getActionTypeImage()Landroid/widget/ImageView;
@@ -452,11 +397,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -466,92 +411,97 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;->getAuditLogEntry()Lcom/discord/models/domain/ModelAuditLogEntry;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getActionTypeImage()Landroid/widget/ImageView;
 
-    move-result-object v2
+    move-result-object v1
 
-    sget-object v4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
-
-    move-result v5
-
-    invoke-virtual {v4, v5}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getActionTypeImage(I)I
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
     move-result v4
 
-    invoke-virtual {v2, v4}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v3, v4}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getActionTypeImage(I)I
+
+    move-result v3
+
+    invoke-virtual {v1, v3}, Landroid/widget/ImageView;->setImageResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getTargetTypeImage()Landroid/widget/ImageView;
 
-    move-result-object v2
+    move-result-object v1
 
-    sget-object v4, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
+    sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogUtils;
 
-    iget-object v5, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v9, "itemView"
+    const-string v8, "itemView"
 
-    invoke-static {v5, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelAuditLogEntry;->getActionTypeId()I
 
-    move-result v1
+    move-result v0
 
-    invoke-virtual {v4, v5, v1}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetTypeImage(Landroid/view/View;I)I
+    invoke-virtual {v3, v4, v0}, Lcom/discord/utilities/auditlogs/AuditLogUtils;->getTargetTypeImage(Landroid/view/View;I)I
 
-    move-result v1
+    move-result v0
 
-    invoke-virtual {v2, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getAvatar()Landroid/widget/ImageView;
 
-    move-result-object v2
+    move-result-object v1
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x1c
 
-    const/16 v7, 0x1c
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getDateText()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;->getTimeStampText()Ljava/lang/CharSequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getHeaderText()Lcom/discord/app/AppTextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;->getHeaderText()Ljava/lang/CharSequence;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-static {v2}, Lcom/discord/utilities/textprocessing/Parsers;->parseHookedLinks(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v1}, Lcom/discord/utilities/textprocessing/Parsers;->parseHookedLinks(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object v1
+
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getChangeText()Landroid/widget/TextView;
 
@@ -573,22 +523,22 @@
 
     const/4 v1, 0x1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     const/4 v1, 0x0
 
-    :goto_0
+    :goto_1
     if-eqz v1, :cond_2
 
     const/4 v1, 0x0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     const/16 v1, 0x8
 
-    :goto_1
+    :goto_2
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getArrow()Landroid/widget/ImageView;
@@ -601,12 +551,12 @@
 
     if-eqz v1, :cond_3
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     const/4 v2, 0x4
 
-    :goto_2
+    :goto_3
     invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryItem;->isSelected()Z
@@ -635,7 +585,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f080279
+    const v0, 0x7f08027a
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -645,7 +595,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f040424
 
@@ -655,14 +605,14 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundColor(I)V
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_4
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->getArrow()Landroid/widget/ImageView;
 
     move-result-object p1
 
-    const v0, 0x7f08027d
+    const v0, 0x7f08027e
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -672,7 +622,7 @@
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v1, 0x7f04041d
 
@@ -682,7 +632,7 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundColor(I)V
 
-    :goto_3
+    :goto_4
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     new-instance v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$2;
@@ -692,13 +642,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingViewHolder.smali
index 32b0df0002..c8270da6b1 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogLoadingViewHolder.smali
@@ -27,20 +27,13 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0232
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali
index 7920fac495..5ea6ea5727 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.smali
@@ -47,22 +47,15 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -95,7 +88,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -108,7 +101,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -136,13 +131,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali
index e7bda8d19d..3af6b99742 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem.smali
@@ -27,9 +27,11 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,15 +42,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem;->isChecked:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder.smali
index 130b7894aa..6d0c5183c2 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder.smali
@@ -37,7 +37,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;
 
@@ -45,59 +45,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "targetImage"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTargetImage()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "targetImage"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getTargetImage()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "actionImage"
 
-    const/4 v3, 0x0
+    const-string v3, "getActionImage()Landroid/widget/ImageView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "actionImage"
-
-    const-string v5, "getActionImage()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "cs"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCs()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "cs"
+    const/4 v2, 0x2
 
-    const-string v4, "getCs()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -107,7 +89,9 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d022f
 
@@ -138,15 +122,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;->cs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterActionViewHolder;)Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;
@@ -224,7 +199,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 3
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -240,7 +217,7 @@
 
     const-string v2, "itemView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem;->getActionId()I
 
@@ -299,15 +276,6 @@
     invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder.smali
index a99ceeefb8..6fe3df0358 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder.smali
@@ -37,7 +37,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;
 
@@ -45,59 +45,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "avatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "avatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "image"
 
-    const/4 v3, 0x0
+    const-string v3, "getImage()Landroid/widget/ImageView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "image"
-
-    const-string v5, "getImage()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "cs"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCs()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "cs"
+    const/4 v2, 0x2
 
-    const-string v4, "getCs()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -107,7 +89,9 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0230
 
@@ -138,15 +122,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->cs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;)Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;
@@ -222,11 +197,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 11
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -238,39 +213,39 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;->getId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    const-wide/16 v4, 0x0
+    const-wide/16 v3, 0x0
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    cmp-long v7, v1, v4
+    cmp-long v6, v0, v3
 
-    if-eqz v7, :cond_0
+    if-eqz v6, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     goto :goto_1
 
     :cond_1
-    const/16 v1, 0x8
+    const/16 v0, 0x8
 
     :goto_1
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->getImage()Landroid/widget/ImageView;
 
@@ -278,81 +253,81 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;->getId()J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    cmp-long v1, v7, v4
+    cmp-long v0, v6, v3
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
     goto :goto_2
 
     :cond_2
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :goto_2
-    if-eqz v3, :cond_3
+    if-eqz v2, :cond_3
 
     goto :goto_3
 
     :cond_3
-    const/16 v6, 0x8
+    const/16 v5, 0x8
 
     :goto_3
-    invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v5}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;->getId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    cmp-long p1, v1, v4
+    cmp-long p1, v0, v3
 
     if-eqz p1, :cond_4
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;->getId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;->getAvatarUrl()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
     invoke-virtual {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;->getDiscriminator()Ljava/lang/Integer;
 
-    move-result-object v6
+    move-result-object v5
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0x18
 
-    const/16 v9, 0x18
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
-    invoke-static/range {v4 .. v10}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    move-result-object v1
 
-    move-result-object v2
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/16 v5, 0x1c
 
-    const/16 v6, 0x1c
+    const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
-
-    goto :goto_4
+    goto :goto_5
 
     :cond_4
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->getImage()Landroid/widget/ImageView;
@@ -361,42 +336,45 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->getImage()Landroid/widget/ImageView;
 
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    const v2, 0x7f080335
-
-    invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_5
-
-    invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->getImage()Landroid/widget/ImageView;
-
     move-result-object v0
 
     invoke-virtual {v0}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
+    const v1, 0x7f080336
+
+    invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->getImage()Landroid/widget/ImageView;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
     const v2, 0x7f040147
 
-    invoke-static {v0, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
-    move-result v0
+    move-result v1
 
-    invoke-virtual {v1, v0}, Landroid/graphics/drawable/Drawable;->setTint(I)V
+    invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setTint(I)V
 
-    move-object v0, v1
+    goto :goto_4
 
     :cond_5
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+    const/4 v0, 0x0
 
     :goto_4
+    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+
+    :goto_5
     invoke-direct {p0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder;->getCs()Lcom/discord/views/CheckedSetting;
 
     move-result-object p1
@@ -428,13 +406,6 @@
     invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali
index 10ba428c5b..f23ae862b1 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem.smali
@@ -31,9 +31,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/Integer;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p4, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,15 +50,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;->isChecked:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali
index dc7ecf14d0..3940e79c27 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.smali
@@ -59,22 +59,15 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getOnFilterSelectedCallback$p(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;)Lkotlin/jvm/functions/Function0;
@@ -110,31 +103,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "listItems"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onFilterSelectedCallback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;->onFilterSelectedCallback:Lkotlin/jvm/functions/Function0;
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onFilterSelectedCallback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -148,7 +129,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -161,7 +142,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -189,13 +172,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali
index ab7d31bf3c..23a84e6dc0 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroid/content/Context;JI)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -56,20 +58,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026_FILTER_TYPE, filterType)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali
index 2c5d21a08d..c40d339366 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,18 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -80,6 +88,7 @@
             "Ljava/lang/Long;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelUser;",
@@ -95,7 +104,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->observeUsers(Ljava/util/Collection;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali
index a3ba7891c1..efcd26dbca 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     const-string v2, "filterText"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
@@ -87,7 +87,7 @@
 
     const-string v2, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1;->this$0:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;
 
@@ -105,13 +105,13 @@
 
     const-string v3, "context.getString(AuditLogUtils.getActionName(it))"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali
index 9475823fe3..4c74a04090 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogActionFilterItem;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     const-string v2, "context.getString(AuditLogUtils.getActionName(it))"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2;->$auditLogState:Lcom/discord/stores/StoreAuditLog$AuditLogState;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali
index 3ace76c750..c191ada232 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)Z
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/search/SearchUtils;->INSTANCE:Lcom/discord/utilities/search/SearchUtils;
 
@@ -73,7 +75,7 @@
 
     const-string v2, "filterText"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
@@ -81,7 +83,7 @@
 
     const-string v2, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
@@ -89,26 +91,17 @@
 
     const-string v3, "it.username"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali
index cb4d861b65..7024eeadd3 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,80 +47,73 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;
-    .locals 12
+    .locals 11
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
 
-    new-instance v7, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v2
+    move-result-wide v3
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUserNameWithDiscriminator()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v5
 
-    const-string v0, "it.userNameWithDiscriminator"
+    const-string v1, "it.userNameWithDiscriminator"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminator()I
 
-    move-result v0
+    move-result v1
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v5
+    move-result-object v6
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2;->$auditLogState:Lcom/discord/stores/StoreAuditLog$AuditLogState;
+    iget-object v1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$listItems$2;->$auditLogState:Lcom/discord/stores/StoreAuditLog$AuditLogState;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getFilter()Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreAuditLog$AuditLogState;->getFilter()Lcom/discord/stores/StoreAuditLog$AuditLogFilter;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->getUserFilter()J
+    invoke-virtual {v1}, Lcom/discord/stores/StoreAuditLog$AuditLogFilter;->getUserFilter()J
 
-    move-result-wide v8
+    move-result-wide v7
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v10
+    move-result-wide v9
 
-    cmp-long p1, v8, v10
+    cmp-long p1, v7, v9
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x1
 
-    const/4 v6, 0x1
+    const/4 v7, 0x1
 
     goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
     :goto_0
-    move-object v0, v7
+    move-object v1, v0
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;-><init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/Integer;Z)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter$AuditLogUserFilterItem;-><init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/Integer;Z)V
 
-    return-object v7
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
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 ea115eda66..e59204b125 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
@@ -31,7 +31,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/stores/StoreAuditLog$AuditLogState;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/String;",
+        "Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;",
+        ">;"
     }
 .end annotation
 
@@ -83,9 +95,9 @@
 
     const-string p3, "filterText"
 
-    invoke-static {p4, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p4}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p4}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p3
 
@@ -97,7 +109,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;->$context:Landroid/content/Context;
 
-    const v1, 0x7f120a9e
+    const v1, 0x7f120aa3
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -105,7 +117,7 @@
 
     const-string v0, "context.getString(R.stri\u2026ettings_filter_all_users)"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -145,21 +157,21 @@
 
     move-result-object p3
 
-    invoke-static {p3}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p3}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p3
 
     goto :goto_1
 
     :cond_1
-    sget-object p3, Lj0/s/f;->a:Lj0/s/f;
+    sget-object p3, Lk0/t/f;->a:Lk0/t/f;
 
     :goto_1
     invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
     move-result-object p2
 
-    invoke-static {p2}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p2}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p2
 
@@ -206,35 +218,37 @@
     goto :goto_2
 
     :cond_2
-    const-string p2, "actions"
+    new-instance p2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;
 
-    invoke-static {p3, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v0, "actions"
 
-    invoke-static {p3}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object p2
+    invoke-static {p3}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
-    new-instance p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1;
+    move-result-object p3
 
-    invoke-direct {p3, p0, p4}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;Ljava/lang/String;)V
+    new-instance v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1;
 
-    invoke-static {p2, p3}, Lf/n/a/k/a;->filter(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-direct {v0, p0, p4}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$1;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;Ljava/lang/String;)V
 
-    move-result-object p2
+    invoke-static {p3, v0}, Lf/n/a/k/a;->filter(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
-    new-instance p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2;
+    move-result-object p3
 
-    invoke-direct {p3, p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;Lcom/discord/stores/StoreAuditLog$AuditLogState;)V
+    new-instance p4, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2;
 
-    invoke-static {p2, p3}, Lf/n/a/k/a;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-direct {p4, p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$2;-><init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;Lcom/discord/stores/StoreAuditLog$AuditLogState;)V
+
+    invoke-static {p3, p4}, Lf/n/a/k/a;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2;
+    new-instance p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2;
 
-    invoke-direct {p2}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2;-><init>()V
+    invoke-direct {p3}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2$$special$$inlined$sortedBy$2;-><init>()V
 
-    invoke-static {p1, p2}, Lf/n/a/k/a;->sortedWith(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
+    invoke-static {p1, p3}, Lf/n/a/k/a;->sortedWith(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -242,8 +256,6 @@
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;
-
     invoke-direct {p2, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;-><init>(Ljava/util/List;)V
 
     :goto_2
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion.smali
index 7dbf34b7b4..c253bfa798 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion.smali
@@ -55,11 +55,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "filterPublisher"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -83,7 +85,7 @@
 
     sget-object p3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1;
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -93,9 +95,9 @@
 
     move-result-object p3
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, p3}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, p3}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-wide/16 v2, 0x64
 
@@ -119,7 +121,7 @@
 
     const-string p2, "Observable\n             \u2026        }\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -131,21 +133,7 @@
 
     const-string p2, "Observable\n             \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "filterPublisher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali
index ceac2a6eb7..1ecdd80186 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model.smali
@@ -52,7 +52,7 @@
 .end method
 
 .method public constructor <init>(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -63,22 +63,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "listItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;->listItems:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "listItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1.smali
index 062303a853..c1c1013bc2 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali
index 63b6c48207..8b4f921828 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,9 +59,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
@@ -75,13 +77,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2.smali
index 9995fdba02..fa8bc90cef 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->access$configureUI(Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1.smali
index 26a9368a90..9bb4b03bac 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsAuditLogFilterSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1;->this$0:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 91ea191c0e..f72bbd3697 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
@@ -62,41 +62,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
-    const-class v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
+    const-string v2, "input"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "input"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getInput()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "recycler"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "recycler"
-
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -333,7 +321,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->guildId:Ljava/lang/Long;
 
@@ -358,7 +346,7 @@
 
     const-string v0, "filterPublisher"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {v4 .. v9}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion;->get(Landroid/content/Context;JILrx/Observable;)Lrx/Observable;
 
@@ -401,7 +389,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 1
 
-    if-eqz p1, :cond_4
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -423,7 +413,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->adapter:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;
 
-    const p1, 0x7f120acf
+    const p1, 0x7f120ad4
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -440,13 +430,13 @@
 
     if-nez p1, :cond_1
 
-    const p1, 0x7f120a9f
+    const p1, 0x7f120aa4
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const p1, 0x7f120a9b
+    const p1, 0x7f120aa0
 
     :goto_1
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
@@ -468,13 +458,13 @@
 
     if-nez p2, :cond_3
 
-    const p2, 0x7f121413
+    const p2, 0x7f12143d
 
     goto :goto_3
 
     :cond_3
     :goto_2
-    const p2, 0x7f1213df
+    const p2, 0x7f121409
 
     :goto_3
     invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setSingleLineHint(Lcom/google/android/material/textfield/TextInputLayout;I)V
@@ -490,13 +480,4 @@
     invoke-static {p1, p0, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     return-void
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView.smali
index c2b63c98c4..ea887f742e 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView.smali
@@ -53,9 +53,11 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -63,7 +65,7 @@
 
     invoke-static {p1, p3, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a07d3
+    const p1, 0x7f0a07d9
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -71,13 +73,13 @@
 
     const-string p3, "findViewById(R.id.server\u2026y_setting_selector_title)"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;->titleTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a07d2
+    const p1, 0x7f0a07d8
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -85,13 +87,13 @@
 
     const-string p3, "findViewById(R.id.server\u2026etting_selector_subtitle)"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;->subtitleTv:Landroid/widget/TextView;
 
-    const p1, 0x7f0a07d1
+    const p1, 0x7f0a07d7
 
     invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
 
@@ -99,7 +101,7 @@
 
     const-string p3, "findViewById(R.id.server\u2026ing_selector_description)"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -111,15 +113,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -187,20 +180,13 @@
 .method public final setSubtitle(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subtitle"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;->subtitleTv:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subtitle"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$Companion.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$Companion.smali
index 5f61671c37..22c5a4c418 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Landroid/content/Context;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -60,20 +62,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026_EXTRA_GUILD_ID, guildId)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$1.smali
index 7b7c1d8c67..ce47d44e37 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsCommunityOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Long;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(JLjava/lang/String;I)V
     .locals 0
 
-    if-eqz p3, :cond_0
+    const-string p4, "<anonymous parameter 1>"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p3, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$1;->this$0:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p3, p1, p2}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->saveRulesChannel(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$2.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$2.smali
index 7bd54c7560..95e3bbe6a9 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsCommunityOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Long;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(JLjava/lang/String;I)V
     .locals 0
 
-    if-eqz p3, :cond_0
+    const-string p4, "<anonymous parameter 1>"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p3, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$2;->this$0:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p3, p1, p2}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->saveCommunityUpdatesChannel(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$3.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$3.smali
index 36fbfdf482..8fcdffe681 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsCommunityOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/String;",
         "Ljava/lang/Integer;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(Ljava/lang/String;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "locale"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onActivityResult$3;->this$0:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
@@ -79,13 +81,4 @@
     invoke-virtual {p2, p1}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->saveLocale(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$1.smali
index 29dfcbf311..3dcd06a972 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettingsCommunityOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;->access$configureUI(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$2.smali
index 9ec93e4352..a4d337a836 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsCommunityOverview.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,11 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Event;)V
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Event$SaveSuccess;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Event$SaveSuccess;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -77,16 +79,16 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$2;->this$0:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
-    const v0, 0x7f121458
+    const v0, 0x7f121482
 
-    invoke-static {p1, v0, v2, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v2, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     goto :goto_0
 
     :cond_0
     sget-object v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Event$Error;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Event$Error;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -94,20 +96,11 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview$onViewBound$2;->this$0:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
-    const v0, 0x7f120af2
+    const v0, 0x7f120b18
 
-    invoke-static {p1, v0, v2, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v2, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview.smali
index 64fa9938a5..51ef5c733d 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview.smali
@@ -43,61 +43,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
+    const-string v2, "rulesChannelContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRulesChannelContainer()Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "rulesChannelContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRulesChannelContainer()Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "updatesChannelContainer"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUpdatesChannelContainer()Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "updatesChannelContainer"
-
-    const-string v4, "getUpdatesChannelContainer()Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
 
-    const-class v2, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;
+    const-string v2, "localeContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLocaleContainer()Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "localeContainer"
-
-    const-string v4, "getLocaleContainer()Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -121,7 +103,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a07d0
+    const v0, 0x7f0a07d6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +111,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;->rulesChannelContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d4
+    const v0, 0x7f0a07da
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -137,7 +119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;->updatesChannelContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cd
+    const v0, 0x7f0a07d3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -166,9 +148,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -188,7 +170,7 @@
 
     sget-object v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Uninitialized;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -199,7 +181,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Invalid;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -246,7 +228,7 @@
 
     const-string v2, "requireContext().getStri\u2026ublic_no_option_selected)"
 
-    const v3, 0x7f120af1
+    const v3, 0x7f120b17
 
     if-eqz v1, :cond_0
 
@@ -267,7 +249,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;->setSubtitle(Ljava/lang/String;)V
@@ -299,7 +281,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
     invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;->setSubtitle(Ljava/lang/String;)V
@@ -322,7 +304,7 @@
 
     const-string v2, "WidgetSettingsLanguage.g\u2026te.guild.preferredLocale)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/communityguild/CommunityServerSettingSelectorView;->setSubtitle(Ljava/lang/String;)V
 
@@ -543,11 +525,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 13
+    .locals 12
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -555,21 +537,23 @@
 
     move-result-object p1
 
+    const-string v0, "INTENT_EXTRA_GUILD_ID"
+
     const-wide/16 v1, -0x1
 
-    const-string v3, "INTENT_EXTRA_GUILD_ID"
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
-    invoke-virtual {p1, v3, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v5
+    move-result-wide v4
 
     new-instance p1, Landroidx/lifecycle/ViewModelProvider;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory;
+    new-instance v1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory;
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
@@ -577,37 +561,37 @@
 
     const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    const/16 v10, 0x1e
 
-    const/16 v11, 0x1e
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
+    move-object v3, v1
 
-    move-object v4, v2
+    invoke-direct/range {v3 .. v11}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory;-><init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-direct/range {v4 .. v12}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory;-><init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p1, v0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    invoke-direct {p1, v1, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    const-class v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
-    const-class v1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
-
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(requir\u2026iewViewModel::class.java)"
+    const-string v0, "ViewModelProvider(requir\u2026iewViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverview;->viewModel:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
-    const-string v1, "viewModel"
+    const-string/jumbo v0, "viewModel"
+
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -615,13 +599,13 @@
 
     move-result-object p1
 
-    const-string v2, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v2, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
-    invoke-static {p1, p0, v0, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
@@ -653,7 +637,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, p0, v0, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
@@ -680,21 +664,14 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -702,7 +679,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
 
-    const v0, 0x7f120a26
+    const v0, 0x7f120a2b
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1.smali
index 96f902bae2..348e62b411 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetServerSettingsCommunityOverviewViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStoreState"
+
+    const-string v5, "handleStoreState(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->access$handleStoreState(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1$1.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1$1.smali
index b9e89a8c57..65102a8c45 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1$1.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;",
+        ">;"
     }
 .end annotation
 
@@ -62,7 +67,7 @@
 
     const-string v0, "me"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v6
 
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1.smali
index 1653b8830c..0951f7d5e4 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetServerSettingsCommunityOverviewViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelGuild;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,9 +81,9 @@
 
     sget-object p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Invalid;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Invalid;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_2
 
@@ -134,6 +136,10 @@
     move-result-object v3
 
     :goto_0
+    const-string v6, "guild.rulesChannelId ?: 0L"
+
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v6
@@ -162,6 +168,10 @@
     move-result-object v6
 
     :goto_1
+    const-string v4, "guild.publicUpdatesChannelId ?: 0L"
+
+    invoke-static {v6, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v4
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory.smali
index 4084aea112..6dbd15c482 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory.smali
@@ -33,15 +33,21 @@
 .method public constructor <init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeGuilds"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "storeChannels"
 
-    if-eqz p5, :cond_1
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "storePermissions"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUsers"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,34 +62,6 @@
     iput-object p6, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory;->storeUsers:Lcom/discord/stores/StoreUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeUsers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storePermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -205,13 +183,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory$observeStoreState$1;-><init>(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$Factory;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "storeGuilds.observeGuild\u2026      }\n        }\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -230,7 +208,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
@@ -243,13 +223,4 @@
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;-><init>(JLrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid.smali
index 44efa7a1dd..69e5c7182d 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid.smali
@@ -30,12 +30,16 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "me"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;->guild:Lcom/discord/models/domain/ModelGuild;
@@ -49,20 +53,6 @@
     iput-object p5, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;->updatesChannel:Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;
@@ -175,11 +165,13 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "me"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;
 
@@ -198,20 +190,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelUser;Ljava/lang/Long;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -229,7 +207,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -239,7 +217,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -249,7 +227,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;->permissions:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -259,7 +237,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;->rulesChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -269,7 +247,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$StoreState$Valid;->updatesChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded.smali
index 5979fe9324..203f385dd1 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "guild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-object p3, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;->updatesChannel:Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;
@@ -108,22 +103,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +129,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -151,7 +139,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;->rulesChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -161,7 +149,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;->updatesChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$1.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$1.smali
index 96fcde0a22..be9aef6976 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsCommunityOverviewViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$1;->this$0:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->access$handleGuildUpdateError(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$2.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$2.smali
index 015882b2ff..48ea858af3 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetServerSettingsCommunityOverviewViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$saveCommunityGuildSettings$2;->this$0:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
 
@@ -76,13 +78,4 @@
     invoke-virtual {p1, v0}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel.smali b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel.smali
index 0c117fa3cf..5772ebfd27 100644
--- a/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetServerSettingsCommunityOverviewViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState;",
         ">;",
         "Lcom/discord/app/AppComponent;"
@@ -52,7 +52,7 @@
 
 # direct methods
 .method public constructor <init>(JLrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -62,13 +62,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeStateObservable"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Uninitialized;
+    sget-object v0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Uninitialized;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->guildId:J
 
@@ -86,13 +86,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;
+
+    new-instance v6, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1;-><init>(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -100,26 +108,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$1;-><init>(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getEventSubject$p(Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;)Lrx/subjects/PublishSubject;
@@ -169,7 +164,7 @@
 
     sget-object p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Invalid;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -238,7 +233,7 @@
 
     sget-object p1, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Invalid;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -247,7 +242,7 @@
 
     invoke-direct {v1, v0, v3, p1}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {p0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -325,7 +320,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -359,36 +354,29 @@
 .method public final saveLocale(Ljava/lang/String;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "locale"
 
-    new-instance v6, Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;
 
     const/4 v2, 0x0
 
-    const/4 v4, 0x3
+    const/4 v3, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x3
 
-    move-object v0, v6
+    const/4 v6, 0x0
 
-    move-object v3, p1
+    move-object v1, v0
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;-><init>(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v4, p1
 
-    invoke-direct {p0, v6}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->saveCommunityGuildSettings(Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;-><init>(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-direct {p0, v0}, Lcom/discord/widgets/servers/communityguild/WidgetServerSettingsCommunityOverviewViewModel;->saveCommunityGuildSettings(Lcom/discord/restapi/RestAPIParams$UpdatePublicGuild;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final saveRulesChannel(J)V
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1.smali
index 9d3beb86bc..8b203639bf 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionInProgressViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->access$handleStoreState(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory$create$1.smali
index 3184b03b33..44229a942d 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory$create$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -66,7 +69,7 @@
 
     const-string v1, "premiumGuildState"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory.smali
index 2536083267..2c28004650 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory.smali
@@ -46,60 +46,55 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "modelClass"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
+
+    move-result-object v0
+
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v1
+
+    iget-wide v2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory;->guildId:J
+
+    invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
 
     move-result-object v1
 
     sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
     move-result-object v2
 
-    iget-wide v3, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory;->guildId:J
-
-    invoke-virtual {v2, v3, v4}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
-
-    move-result-object v2
-
-    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    move-result-object v3
+    const/4 v3, 0x0
 
     const/4 v4, 0x1
 
-    invoke-static {v3, v0, v4, v0}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v2, v3, v4, v3}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v2
 
     sget-object v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory$create$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$Factory$create$1;
 
-    invoke-static {v2, v0, v3}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-static {v1, v2, v3}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "Observable.combineLatest\u2026ild, premiumGuildState) }"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p1, v1, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription;Lrx/Observable;)V
+    invoke-direct {p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState.smali
index e16d2d9e26..53ad6470ff 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
     return-void
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;
@@ -89,22 +82,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -132,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$StoreState;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded.smali
index 18bd788474..50338807d2 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput p3, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;->subscriptionCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;IILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;
@@ -112,22 +107,15 @@
 .method public final copy(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;I)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -149,7 +137,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -159,7 +147,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized.smali
index 7b79f66488..f874d692b8 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;->premiumGuildSubscriptionState:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
 
     return-void
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;
@@ -74,22 +69,15 @@
 .method public final copy(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -111,7 +99,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1.smali
index 28b89fd48f..31d7b4561f 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionInProgressViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->access$setPremiumGuildSubscribingSubscription$p(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali
index 6e7c4e4e8b..03780c3624 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionInProgressViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->access$handlePremiumGuildSubscriptionError(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
index 130cb935ff..13bea13e39 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionInProgressViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 .end method
 
 .method public final invoke(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -72,20 +72,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->access$handlePremiumGuildSubscriptionCompleted(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
index fdd48d1a52..0197b9ae71 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "PremiumGuildSubscriptionInProgressViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;",
         ">;"
     }
@@ -41,19 +41,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storePremiumGuildSubscription"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeObservable"
 
-    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;->NOT_IN_PROGRESS:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Uninitialized;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;)V
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->storePremiumGuildSubscription:Lcom/discord/stores/StorePremiumGuildSubscription;
 
@@ -61,14 +63,20 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p1, p0, p2, v0, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
+    new-instance v7, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -77,10 +85,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -88,20 +92,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storePremiumGuildSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getPremiumGuildSubscribingSubscription$p(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)Lrx/Subscription;
@@ -153,7 +143,7 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription;->fetchUserGuildPremiumState()V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -195,7 +185,7 @@
     move-object v0, v1
 
     :goto_0
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -212,7 +202,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -254,7 +244,7 @@
     move-object v0, v1
 
     :goto_0
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -271,7 +261,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -313,7 +303,7 @@
     move-object v0, v1
 
     :goto_0
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -413,7 +403,7 @@
     move-result-object v4
 
     :cond_2
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -436,7 +426,7 @@
     :goto_2
     new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -452,7 +442,7 @@
 
     invoke-direct {v1, v2, p1, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;Lcom/discord/models/domain/ModelGuild;I)V
 
-    invoke-virtual {p0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -470,7 +460,7 @@
 .method public onCleared()V
     .locals 1
 
-    invoke-super {p0}, Lf/a/b/o0;->onCleared()V
+    invoke-super {p0}, Lf/a/b/q0;->onCleared()V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->premiumGuildSubscribingSubscription:Lrx/Subscription;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
index 48af96930c..6596f94d15 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionPerkView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f080275
+    const p1, 0x7f080276
 
     :cond_0
     return p1
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.smali
index 391c19645d..c4f8704b3c 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.smali
@@ -31,11 +31,13 @@
 .method public onInterceptTouchEvent(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/MotionEvent;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "rv"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "e"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
 
@@ -54,20 +56,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "rv"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onRequestDisallowInterceptTouchEvent(Z)V
@@ -79,25 +67,13 @@
 .method public onTouchEvent(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/MotionEvent;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "rv"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "e"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "rv"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
index 1f0d8ab524..dc6126685d 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
@@ -41,24 +41,17 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->initialize()V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -109,7 +102,7 @@
 
     invoke-static {v0, v1, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const v0, 0x7f0a06ae
+    const v0, 0x7f0a06b4
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -117,11 +110,11 @@
 
     const-string v1, "findViewById(R.id.perks_level_header)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->header:Landroid/view/View;
 
-    const v0, 0x7f0a06b1
+    const v0, 0x7f0a06b7
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -129,13 +122,13 @@
 
     const-string v1, "findViewById(R.id.perks_level_header_text)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a06af
+    const v0, 0x7f0a06b5
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -143,13 +136,13 @@
 
     const-string v1, "findViewById(R.id.perks_level_header_boosts)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerBoostText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a06b2
+    const v0, 0x7f0a06b8
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -157,11 +150,11 @@
 
     const-string v1, "findViewById(R.id.perks_level_header_unlocked)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerUnlocked:Landroid/view/View;
 
-    const v0, 0x7f0a06ac
+    const v0, 0x7f0a06b2
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -169,13 +162,13 @@
 
     const-string v1, "findViewById(R.id.perks_level_contents_header)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a06ad
+    const v0, 0x7f0a06b3
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -183,13 +176,13 @@
 
     const-string v1, "findViewById(R.id.perks_level_contents_recycler)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a0289
+    const v0, 0x7f0a028c
 
     invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
@@ -197,7 +190,7 @@
 
     const-string v1, "findViewById(R.id.container)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/LinearLayout;
 
@@ -238,12 +231,12 @@
     return-void
 
     :cond_0
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_1
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
@@ -292,7 +285,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 
@@ -355,17 +348,17 @@
     goto :goto_3
 
     :cond_6
-    const v12, 0x7f120acd
+    const v12, 0x7f120ad2
 
     goto :goto_3
 
     :cond_7
-    const v12, 0x7f120acc
+    const v12, 0x7f120ad1
 
     goto :goto_3
 
     :cond_8
-    const v12, 0x7f120acb
+    const v12, 0x7f120ad0
 
     :goto_3
     invoke-static {v0, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -387,48 +380,48 @@
     :cond_9
     if-eqz v5, :cond_a
 
-    const v10, 0x7f080382
+    const v10, 0x7f080385
 
-    const v13, 0x7f080382
+    const v13, 0x7f080385
 
     goto :goto_4
 
     :cond_a
-    const v10, 0x7f080383
+    const v10, 0x7f080386
 
-    const v13, 0x7f080383
+    const v13, 0x7f080386
 
     goto :goto_4
 
     :cond_b
     if-eqz v5, :cond_c
 
-    const v10, 0x7f080380
+    const v10, 0x7f080383
 
-    const v13, 0x7f080380
+    const v13, 0x7f080383
 
     goto :goto_4
 
     :cond_c
-    const v10, 0x7f080381
+    const v10, 0x7f080384
 
-    const v13, 0x7f080381
+    const v13, 0x7f080384
 
     goto :goto_4
 
     :cond_d
     if-eqz v5, :cond_e
 
-    const v10, 0x7f08037e
+    const v10, 0x7f080381
 
-    const v13, 0x7f08037e
+    const v13, 0x7f080381
 
     goto :goto_4
 
     :cond_e
-    const v10, 0x7f08037f
+    const v10, 0x7f080382
 
-    const v13, 0x7f08037f
+    const v13, 0x7f080382
 
     :goto_4
     iget-object v12, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
@@ -491,7 +484,7 @@
 
     const-string v13, "resources"
 
-    invoke-static {v12, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v12, v13}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroid/widget/RelativeLayout;->getContext()Landroid/content/Context;
 
@@ -499,9 +492,9 @@
 
     const-string v14, "context"
 
-    invoke-static {v13, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v14, 0x7f100088
+    const v14, 0x7f10008a
 
     new-array v15, v3, [Ljava/lang/Object;
 
@@ -554,7 +547,7 @@
 
     if-eq v1, v3, :cond_12
 
-    const v10, 0x7f120ac9
+    const v10, 0x7f120ace
 
     invoke-static {v0, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -563,7 +556,7 @@
     goto :goto_7
 
     :cond_12
-    const v10, 0x7f120ac7
+    const v10, 0x7f120acc
 
     invoke-static {v0, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -574,25 +567,25 @@
 
     const/4 v13, 0x4
 
-    const v14, 0x7f120ac4
+    const v14, 0x7f120ac9
 
-    const v15, 0x7f080308
+    const v15, 0x7f080309
 
-    const v7, 0x7f120ac5
+    const v7, 0x7f120aca
 
-    const v9, 0x7f0803d6
+    const v9, 0x7f0803d9
 
     if-eq v1, v3, :cond_15
 
-    const v10, 0x7f1206a4
+    const v10, 0x7f1206a6
 
-    const v12, 0x7f08040b
+    const v12, 0x7f08040e
 
     if-eq v1, v8, :cond_14
 
     if-eq v1, v6, :cond_13
 
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     goto/16 :goto_8
 
@@ -695,7 +688,7 @@
 
     aput-object v3, v11, v4
 
-    const v3, 0x7f120ac6
+    const v3, 0x7f120acb
 
     invoke-static {v0, v3, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -707,13 +700,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0803e0
+    const v4, 0x7f0803e3
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f120ac3
+    const v4, 0x7f120ac8
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -830,7 +823,7 @@
 
     aput-object v3, v11, v4
 
-    const v3, 0x7f120ac6
+    const v3, 0x7f120acb
 
     invoke-static {v0, v3, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -842,13 +835,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f080321
+    const v4, 0x7f080322
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v7, 0x7f120ac1
+    const v7, 0x7f120ac6
 
     invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -860,13 +853,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802fe
+    const v4, 0x7f0802ff
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f120ac2
+    const v4, 0x7f120ac7
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -957,13 +950,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f08035c
+    const v4, 0x7f08035f
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v7, 0x7f120abe
+    const v7, 0x7f120ac3
 
     invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -975,13 +968,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f080321
+    const v4, 0x7f080322
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v7, 0x7f120abf
+    const v7, 0x7f120ac4
 
     invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -993,13 +986,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802fe
+    const v4, 0x7f0802ff
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f120ac0
+    const v4, 0x7f120ac5
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1027,7 +1020,7 @@
     :cond_16
     const-string v1, "adapter"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -1038,7 +1031,7 @@
 
     const-string v2, "contentText"
 
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1047,49 +1040,49 @@
 
     const-string v2, "headerUnlocked"
 
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_19
     move-object v1, v7
 
-    invoke-static {v11}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v11}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1a
     move-object v1, v7
 
-    invoke-static {v11}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v11}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1b
     move-object v1, v7
 
-    invoke-static {v11}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v11}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1c
     move-object v1, v7
 
-    invoke-static {v11}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v11}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1d
     move-object v1, v7
 
-    invoke-static {v11}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v11}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1e
     move-object v1, v7
 
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
index 3e6317888d..16db439314 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
+    const-string v2, "textViewListItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTextViewListItem()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "textViewListItem"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTextViewListItem()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,13 +61,15 @@
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0116
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a06ab
+    const p1, 0x7f0a06b1
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -82,15 +78,6 @@
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;->textViewListItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getTextViewListItem()Landroid/widget/TextView;
@@ -118,7 +105,9 @@
 .method public onConfigure(ILcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;)V
     .locals 8
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -153,15 +142,6 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem.smali
index b0f9eac956..8cf1a493d7 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem.smali
@@ -51,13 +51,15 @@
 .end method
 
 .method public constructor <init>(ILjava/lang/String;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/DrawableRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,15 +68,6 @@
     iput-object p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;ILjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
@@ -126,22 +119,15 @@
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;-><init>(ILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -165,7 +151,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;->text:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.smali
index da8ae5d0aa..7f824df440 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.smali
@@ -22,28 +22,21 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public final configure(Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -53,20 +46,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "perkItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "perkItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -80,9 +66,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -100,13 +88,4 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1.smali
index c01688f6d3..8437131e9d 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildTransferInProgressViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->access$handleStoreState(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory$create$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory$create$1.smali
index 8c71a0faee..221fd3ceb2 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory$create$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory$create$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
+        "Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -68,7 +72,7 @@
 
     const-string v1, "premiumGuildSubscriptionState"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory.smali
index 150d545071..6f7f900d9c 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "config"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory;->config:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;
 
     return-void
-
-    :cond_0
-    const-string p1, "config"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -57,12 +50,28 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "modelClass"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;
 
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory;->config:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;->getPreviousGuildId()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
+
+    move-result-object v0
+
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
@@ -71,7 +80,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory;->config:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;->getPreviousGuildId()J
+    invoke-virtual {v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;->getTargetGuildId()J
 
     move-result-wide v2
 
@@ -81,41 +90,27 @@
 
     sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory;->config:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;
-
-    invoke-virtual {v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;->getTargetGuildId()J
-
-    move-result-wide v3
-
-    invoke-virtual {v2, v3, v4}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
-
-    move-result-object v2
-
-    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    move-result-object v3
+    const/4 v3, 0x0
 
     const/4 v4, 0x1
 
-    invoke-static {v3, v0, v4, v0}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v2, v3, v4, v3}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v2
 
     sget-object v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory$create$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory$create$1;
 
-    invoke-static {v1, v2, v0, v3}, Lrx/Observable;->i(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+    invoke-static {v0, v1, v2, v3}, Lrx/Observable;->i(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
 
     move-result-object v2
 
     const-string v0, "Observable.combineLatest\u2026            )\n          }"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Factory;->config:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$Config;
 
@@ -158,11 +153,4 @@
     invoke-direct/range {v1 .. v12}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;-><init>(Lrx/Observable;JJJJLcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/StorePremiumGuildSubscription;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState.smali
index 33d4d9f222..1bd6d48421 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput-object p3, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
     return-void
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;
@@ -108,22 +101,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;->previousGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -151,7 +137,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;->targetGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -161,7 +147,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$StoreState;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer.smali
index 6858d093b6..b24e6c2682 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "targetGuild"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;->targetGuildSubscriptionCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "targetGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;Lcom/discord/models/domain/ModelGuild;IILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;
@@ -89,22 +84,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;I)Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "targetGuild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;-><init>(Lcom/discord/models/domain/ModelGuild;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "targetGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;->targetGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer.smali
index a0d1d9d7b1..7d195c6d7f 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer.smali
@@ -28,12 +28,16 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;IZ)V
     .locals 1
 
+    const-string v0, "previousGuild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "targetGuild"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;->previousGuild:Lcom/discord/models/domain/ModelGuild;
@@ -45,20 +49,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;->isTransferInProgress:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "targetGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "previousGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;IZILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;
@@ -136,31 +126,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;IZ)Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "previousGuild"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "targetGuild"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;IZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "targetGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "previousGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -178,7 +156,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;->previousGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -188,7 +166,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;->targetGuild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1.smali
index 6619a93336..c0702a730e 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1.smali
@@ -3,7 +3,7 @@
 .source "PremiumGuildTransferInProgressViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Void;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -69,6 +73,7 @@
             "Ljava/lang/Void;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
             ">;>;"
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2.smali
index 572eb1d2eb..04f1d0b33a 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildTransferInProgressViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->access$handlePremiumGuildSubscriptionError(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3.smali
index c69f60cb84..89c5b15fdf 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildTransferInProgressViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.smali
index fa66849289..201cdae60b 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "PremiumGuildTransferInProgressViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;",
         ">;"
     }
@@ -40,7 +40,7 @@
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;JJJJLcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/StorePremiumGuildSubscription;)V
-    .locals 2
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -53,82 +53,101 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    move-object v0, p0
 
-    if-eqz p1, :cond_2
+    move-object/from16 v1, p10
 
-    if-eqz p10, :cond_1
+    move-object/from16 v2, p11
 
-    if-eqz p11, :cond_0
+    const-string v3, "storeObservable"
 
-    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$Loading;
+    move-object v4, p1
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-wide p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->slotId:J
+    const-string v3, "restAPI"
 
-    iput-wide p4, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->subscriptionId:J
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-wide p6, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->previousGuildId:J
+    const-string v3, "storePremiumGuildSubscription"
 
-    iput-wide p8, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->targetGuildId:J
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p10, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    sget-object v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$Loading;
 
-    iput-object p11, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->storePremiumGuildSubscription:Lcom/discord/stores/StorePremiumGuildSubscription;
+    invoke-direct {p0, v3}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
+
+    move-wide v5, p2
+
+    iput-wide v5, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->slotId:J
+
+    move-wide v5, p4
+
+    iput-wide v5, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->subscriptionId:J
+
+    move-wide/from16 v5, p6
+
+    iput-wide v5, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->previousGuildId:J
+
+    move-wide/from16 v5, p8
+
+    iput-wide v5, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->targetGuildId:J
+
+    iput-object v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+    iput-object v2, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;->storePremiumGuildSubscription:Lcom/discord/stores/StorePremiumGuildSubscription;
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object p1
+    move-result-object v1
 
-    const/4 p2, 0x2
+    const/4 v2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v3, 0x2
 
-    move-result-object p3
+    invoke-static {v1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class p4, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;
+    move-result-object v1
 
-    const/4 p5, 0x0
+    const-class v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;
 
-    const/4 p6, 0x0
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1;
 
-    const/4 p7, 0x0
+    invoke-direct {v3, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;)V
 
-    const/4 p8, 0x0
+    const/4 v4, 0x0
 
-    new-instance p9, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1;
+    const/4 v5, 0x0
 
-    invoke-direct {p9, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;)V
+    const/4 v6, 0x0
 
-    const/16 p10, 0x1e
+    const/4 v7, 0x0
 
-    const/4 p11, 0x0
+    const/16 v8, 0x1e
 
-    invoke-static/range {p3 .. p11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    const/4 v9, 0x0
+
+    move-object p1, v1
+
+    move-object p2, v2
+
+    move-object p3, v4
+
+    move-object p4, v5
+
+    move-object p5, v6
+
+    move-object/from16 p6, v7
+
+    move-object/from16 p7, v3
+
+    move/from16 p8, v8
+
+    move-object/from16 p9, v9
+
+    invoke-static/range {p1 .. p9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storePremiumGuildSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handlePremiumGuildSubscriptionCompleted(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;)V
@@ -164,7 +183,7 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription;->fetchUserGuildPremiumState()V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -191,7 +210,7 @@
     move-object v0, v1
 
     :cond_0
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -203,7 +222,7 @@
 
     sget-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$ErrorTransfer;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$ErrorTransfer;
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -213,7 +232,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -244,7 +263,7 @@
     move-result-object v0
 
     :cond_0
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -370,7 +389,7 @@
 
     invoke-direct {v2, v3, p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PreTransfer;-><init>(Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelGuild;IZ)V
 
-    invoke-virtual {p0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -378,7 +397,7 @@
     :goto_3
     sget-object p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$ErrorLoading;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$ErrorLoading;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -443,7 +462,7 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    invoke-super {p0}, Lf/a/b/o0;->onCleared()V
+    invoke-super {p0}, Lf/a/b/q0;->onCleared()V
 
     return-void
 .end method
@@ -469,13 +488,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "restAPI\n        .unsubsc\u2026              )\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1.smali
index ffab125cdb..b3b751eaeb 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;->access$handleStoreState(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift.smali
index 17d0ee8a6b..db99507797 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Ljava/lang/String;J)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "section"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-wide p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift;->guildId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "section"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift;Ljava/lang/String;JILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift;
@@ -89,22 +84,15 @@
 .method public final copy(Ljava/lang/String;J)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "section"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift;-><init>(Ljava/lang/String;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "section"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchasePremiumGift;->section:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription.smali
index 17a7ea3bd4..babafd9bf7 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Ljava/lang/String;J)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "section"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-wide p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;->guildId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "section"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;Ljava/lang/String;JILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;
@@ -89,22 +84,15 @@
 .method public final copy(Ljava/lang/String;J)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "section"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;-><init>(Ljava/lang/String;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "section"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;->section:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory$observeStores$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory$observeStores$1.smali
index 3e757866cf..e57d60e696 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory$observeStores$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory$observeStores$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "PremiumGuildViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function4<",
         "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
         "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
@@ -48,82 +48,47 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x4
+    const-class v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x4
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "p2"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p3"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory.smali
index e382179460..37c9dfc29b 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Factory.smali
@@ -108,7 +108,7 @@
 
     const-string v1, "Observable.combineLatest\u2026     ::StoreState\n      )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -127,7 +127,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;
 
@@ -154,15 +156,6 @@
     invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/utilities/time/Clock;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getGuildId()J
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState.smali
index 2b0f211d1b..a143a7936a 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState.smali
@@ -28,13 +28,17 @@
 .method public constructor <init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "subscriptionState"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "meUser"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,27 +51,6 @@
     iput-object p4, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;
@@ -145,40 +128,23 @@
 .method public final copy(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "subscriptionState"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "meUser"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -196,7 +162,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -206,7 +172,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;->subscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -216,7 +182,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -226,7 +192,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded.smali
index ac5d3732d3..de9eee41d0 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded.smali
@@ -60,16 +60,24 @@
         }
     .end annotation
 
+    const-string v0, "premiumGuildSubscriptionSlotMap"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "subscriptions"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "meUser"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guild"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->premiumGuildSubscriptionSlotMap:Ljava/util/Map;
@@ -81,34 +89,6 @@
     iput-object p4, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "subscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "premiumGuildSubscriptionSlotMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;Ljava/util/Map;Ljava/util/List;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
@@ -219,49 +199,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionSlotMap"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "subscriptions"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guild"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;-><init>(Ljava/util/Map;Ljava/util/List;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "subscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "premiumGuildSubscriptionSlotMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -279,7 +237,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->premiumGuildSubscriptionSlotMap:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -289,7 +247,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->subscriptions:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -299,7 +257,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -309,7 +267,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.smali
index a906939da1..d13edfdea5 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "PremiumGuildViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState;",
         ">;"
     }
@@ -42,7 +42,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/utilities/time/Clock;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -55,19 +55,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storePremiumGuildSubscription"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "storeSubscriptions"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "clock"
 
-    sget-object v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loading;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    const-string v0, "storeObservable"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loading;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;->storePremiumGuildSubscription:Lcom/discord/stores/StorePremiumGuildSubscription;
 
@@ -87,13 +93,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;
+
+    new-instance v6, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -101,47 +115,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$1;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeSubscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storePremiumGuildSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$StoreState;)V
@@ -262,7 +242,7 @@
     sget-object v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loading;
 
     :goto_2
-    invoke-virtual {p0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -298,24 +278,21 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
+    const-string v0, "section"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_1
@@ -340,13 +317,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "section"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final observeEvents()Lrx/Observable;
@@ -364,7 +334,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -384,44 +354,46 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "section"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
 
-    if-nez v2, :cond_0
+    const/4 v2, 0x0
 
-    move-object v1, v0
+    if-nez v1, :cond_0
+
+    move-object v0, v2
 
     :cond_0
-    check-cast v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->getPremiumGuildSubscriptionSlotMap()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->getPremiumGuildSubscriptionSlotMap()Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v1
 
     new-instance v3, Ljava/util/LinkedHashMap;
 
     invoke-direct {v3}, Ljava/util/LinkedHashMap;-><init>()V
 
-    invoke-interface {v2}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+    invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
-    move-result-object v2
+    move-result-object v1
 
     :cond_1
     :goto_0
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
@@ -429,7 +401,7 @@
 
     if-eqz v4, :cond_4
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v4
 
@@ -472,7 +444,7 @@
     goto :goto_1
 
     :cond_2
-    move-object v6, v0
+    move-object v6, v2
 
     :goto_1
     if-nez v6, :cond_3
@@ -500,73 +472,66 @@
     :cond_4
     invoke-interface {v3}, Ljava/util/Map;->isEmpty()Z
 
-    move-result v0
+    move-result v1
 
-    xor-int/2addr v0, v5
+    xor-int/2addr v1, v5
 
-    if-eqz v0, :cond_5
+    if-eqz v1, :cond_5
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
-    new-instance v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchSubscriptionConfirmation;
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchSubscriptionConfirmation;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v1
+    move-result-wide v4
 
     invoke-interface {v3}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v3
+    move-result-object v0
 
-    invoke-static {v3}, Lj0/i/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v0
 
-    check-cast v3, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+    check-cast v0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchSubscriptionConfirmation;-><init>(JJ)V
+    invoke-direct {v1, v4, v5, v2, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchSubscriptionConfirmation;-><init>(JJ)V
 
     iget-object p1, p1, Lrx/subjects/PublishSubject;->e:Lrx/subjects/PublishSubject$b;
 
-    invoke-virtual {p1, v0}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v1}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     goto :goto_3
 
     :cond_5
-    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
     new-instance v2, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
+    invoke-virtual {v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
     move-result-wide v3
 
     invoke-direct {v2, p1, v3, v4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchWebPurchaseSubscription;-><init>(Ljava/lang/String;J)V
 
-    iget-object p1, v0, Lrx/subjects/PublishSubject;->e:Lrx/subjects/PublishSubject$b;
+    iget-object p1, v1, Lrx/subjects/PublishSubject;->e:Lrx/subjects/PublishSubject$b;
 
     invoke-virtual {p1, v2}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     :cond_6
     :goto_3
     return-void
-
-    :cond_7
-    const-string p1, "section"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion.smali
index cb6931b0eb..f7dc658aac 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Landroid/content/Context;J)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -50,20 +52,11 @@
 
     const-string p3, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
index bc52ad621c..3f8f162ac5 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
@@ -34,24 +34,26 @@
 .method public final configureViews(Landroidx/viewpager/widget/ViewPager;)V
     .locals 5
 
-    if-eqz p1, :cond_2
+    const-string/jumbo v0, "viewPager"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getChildCount()I
 
-    move-result v1
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v0, v1, :cond_1
+    if-ge v1, v0, :cond_1
 
-    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+    invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
 
     move-result-object v2
 
     const-string v3, "getChildAt(index)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getTag()Ljava/lang/Object;
 
@@ -71,60 +73,39 @@
 
     invoke-virtual {v2, v3, v4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Int"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "viewPager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V
     .locals 0
 
-    const/4 p2, 0x0
+    const-string p2, "container"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string/jumbo p2, "view"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p3, Landroid/view/View;
 
     invoke-virtual {p1, p3}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_1
-    const-string p1, "container"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public getCount()I
@@ -154,7 +135,9 @@
 .method public instantiateItem(Landroid/view/ViewGroup;I)Landroid/view/View;
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "container"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     add-int/lit8 p2, p2, 0x1
 
@@ -166,7 +149,7 @@
 
     const-string v0, "container.context"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -193,15 +176,6 @@
     invoke-virtual {p1, v6}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
 
     return-object v6
-
-    :cond_0
-    const-string p1, "container"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic instantiateItem(Landroid/view/ViewGroup;I)Ljava/lang/Object;
@@ -217,31 +191,19 @@
 .method public isViewFromObject(Landroid/view/View;Ljava/lang/Object;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "any"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "any"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setPremiumTier(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
index c4d3168666..df3c688f0e 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2.smali
index bbf498ecd1..1c0f6907d6 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$guildId$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Long;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$1.smali
index a1d5ae64a1..5049b81098 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$1.smali
@@ -64,13 +64,13 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const v0, 0x7f0a05c9
+    const v0, 0x7f0a05cf
 
     if-eq p1, v0, :cond_0
 
@@ -81,7 +81,7 @@
 
     const-string v0, "context"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.smali
index cb9eccdad4..eee158f7eb 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,29 +77,17 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    const/4 p3, 0x0
+    const-string p3, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p3, "<anonymous parameter 1>"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->Companion:Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion;
 
     invoke-virtual {p2, p1}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion;->launch(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3.smali
index ca1e192584..eab0e93b2f 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,31 +77,21 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 p3, 0x0
+    const-string p3, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p3, "<anonymous parameter 1>"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
+    const/4 p3, 0x0
+
     const/4 v0, 0x2
 
     invoke-static {p2, p1, p3, v0, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;Landroid/content/Context;Ljava/lang/Integer;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
index 6400c35109..e8b09c4210 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$2.smali
index b73d2084db..f6ec9784b9 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$handleEvent(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
index 38f0db37c2..947e6bda1b 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
@@ -106,401 +106,281 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostNumber"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostNumber()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "boostNumber"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getBoostNumber()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const/4 v2, 0x0
+    const-string v2, "boostStatusLearnMore"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBoostStatusLearnMore()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "boostStatusLearnMore"
-
-    const-string v4, "getBoostStatusLearnMore()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostProtipTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostProtipTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostProtipTv"
-
-    const-string v4, "getBoostProtipTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostProgressBar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostProgressBar()Landroid/widget/ProgressBar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostProgressBar"
-
-    const-string v4, "getBoostProgressBar()Landroid/widget/ProgressBar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostTier0Iv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostTier0Iv()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostTier0Iv"
-
-    const-string v4, "getBoostTier0Iv()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostTier1Iv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostTier1Iv()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostTier1Iv"
-
-    const-string v4, "getBoostTier1Iv()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostTier1Tv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostTier1Tv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostTier1Tv"
-
-    const-string v4, "getBoostTier1Tv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostTier2Iv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostTier2Iv()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostTier2Iv"
-
-    const-string v4, "getBoostTier2Iv()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostTier2Tv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostTier2Tv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostTier2Tv"
-
-    const-string v4, "getBoostTier2Tv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostTier3Iv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostTier3Iv()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostTier3Iv"
-
-    const-string v4, "getBoostTier3Iv()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostTier3Tv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostTier3Tv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostTier3Tv"
-
-    const-string v4, "getBoostTier3Tv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostSubscribeButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostSubscribeButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostSubscribeButton"
-
-    const-string v4, "getBoostSubscribeButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostSubscribeButton2"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostSubscribeButton2()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostSubscribeButton2"
-
-    const-string v4, "getBoostSubscribeButton2()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostGiftButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostGiftButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostGiftButton"
-
-    const-string v4, "getBoostGiftButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "boostGiftButton2"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostGiftButton2()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostGiftButton2"
-
-    const-string v4, "getBoostGiftButton2()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "premiumGuildSubscriptionUpsellView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPremiumGuildSubscriptionUpsellView()Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "premiumGuildSubscriptionUpsellView"
-
-    const-string v4, "getPremiumGuildSubscriptionUpsellView()Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "premiumSubscriptionMarketingView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPremiumSubscriptionMarketingView()Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "premiumSubscriptionMarketingView"
-
-    const-string v4, "getPremiumSubscriptionMarketingView()Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "flipper"
-
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string v2, "retry"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRetry()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "retry"
-
-    const-string v4, "getRetry()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const-string/jumbo v2, "viewPager"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "viewPager"
-
-    const-string v4, "getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
@@ -733,9 +613,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -860,14 +740,14 @@
     :cond_4
     const-string p1, "levelText"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_5
     const-string p1, "levelBackgrounds"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -915,22 +795,22 @@
     goto :goto_0
 
     :cond_0
-    const v5, 0x7f121217
+    const v5, 0x7f121242
 
     goto :goto_0
 
     :cond_1
-    const v5, 0x7f121216
+    const v5, 0x7f121241
 
     goto :goto_0
 
     :cond_2
-    const v5, 0x7f121215
+    const v5, 0x7f121240
 
     goto :goto_0
 
     :cond_3
-    const v5, 0x7f121194
+    const v5, 0x7f1211bf
 
     :goto_0
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1004,7 +884,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f1211a2
+    const v0, 0x7f1211cd
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1097,9 +977,9 @@
     move-result-object v3
 
     :goto_0
-    const-string v4, "viewState.guild.premiumSubscriptionCount ?: 0"
+    const-string/jumbo v4, "viewState.guild.premiumSubscriptionCount ?: 0"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
 
@@ -1139,11 +1019,15 @@
     sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->NONE:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
     :goto_1
-    new-instance v5, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
+    const-string/jumbo v5, "viewState.meUser.premium\u2026tionPlan.PremiumTier.NONE"
 
-    invoke-direct {v5, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v4, v5}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->a(Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;Lkotlin/jvm/functions/Function0;)V
+    new-instance v6, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+
+    invoke-virtual {v0, v4, v6}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->a(Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;Lkotlin/jvm/functions/Function0;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getPremiumGuildSubscriptionUpsellView()Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;
 
@@ -1165,6 +1049,8 @@
     sget-object p1, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->NONE:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
     :goto_2
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0, p1, v1}, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->a(Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostNumber()Landroid/widget/TextView;
@@ -1177,7 +1063,7 @@
 
     const-string v4, "resources"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1185,9 +1071,9 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f1000c6
+    const v5, 0x7f1000c8
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -1267,17 +1153,17 @@
     return-void
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1747,7 +1633,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel$Event$LaunchSubscriptionConfirmation;
 
@@ -1914,26 +1800,28 @@
     :cond_0
     const-string p1, "pagerAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 17
+    .locals 16
 
     move-object/from16 v6, p0
 
-    const/4 v7, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    move-object/from16 v7, p1
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v1, 0x7f0e0012
-
     sget-object v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$1;
 
+    const v1, 0x7f0e0012
+
     const/4 v3, 0x0
 
     const/4 v4, 0x4
@@ -1954,27 +1842,27 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v8, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f12119b
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    new-array v2, v1, [Ljava/lang/Object;
 
-    new-array v3, v2, [Ljava/lang/Object;
+    const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const-string v4, "https://www.discord.com"
 
-    const-string v5, "https://www.discord.com"
+    aput-object v4, v2, v3
 
-    aput-object v5, v3, v4
+    const v5, 0x7f1211c6
 
-    invoke-virtual {v6, v1, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v6, v5, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v9
 
-    const-string v1, "getString(\n            R\u2026ww.discord.com\"\n        )"
+    const-string v2, "getString(\n            R\u2026ww.discord.com\"\n        )"
 
-    invoke-static {v9, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v10, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2;
 
@@ -1988,47 +1876,47 @@
 
     invoke-static/range {v8 .. v14}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    move-result-object v3
+    move-result-object v5
 
-    invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    const v3, 0x7f1000c8
+    new-array v5, v1, [Ljava/lang/Object;
 
-    new-array v8, v2, [Ljava/lang/Object;
+    const/4 v8, 0x2
 
-    const/4 v9, 0x2
+    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v9
 
-    move-result-object v10
+    aput-object v9, v5, v3
 
-    aput-object v10, v8, v4
+    const v9, 0x7f1000ca
 
-    invoke-virtual {v0, v3, v9, v8}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v9, v8, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
-    const-string v3, "resources.getQuantityStr\u2026PTIONS_WITH_PREMIUM\n    )"
+    const-string v5, "resources.getQuantityStr\u2026PTIONS_WITH_PREMIUM\n    )"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f1211a9
+    new-array v5, v8, [Ljava/lang/Object;
 
-    new-array v8, v9, [Ljava/lang/Object;
+    aput-object v0, v5, v3
 
-    aput-object v0, v8, v4
+    aput-object v4, v5, v1
 
-    aput-object v5, v8, v2
+    const v0, 0x7f1211d4
 
-    invoke-virtual {v6, v3, v8}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v6, v0, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v11
+    move-result-object v10
 
-    invoke-static {v11, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostProtipTv()Landroid/widget/TextView;
 
@@ -2036,87 +1924,87 @@
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v10
+    move-result-object v9
 
-    const-string v1, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {v10, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v12, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3;
+    sget-object v11, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$3;
 
-    const/4 v13, 0x0
+    const v2, 0x7f0601fb
 
-    const v1, 0x7f0601fb
+    invoke-static {v6, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
 
-    invoke-static {v6, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
+    move-result v2
 
-    move-result v1
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v13
 
-    move-result-object v14
+    const/16 v14, 0x8
 
-    const/16 v15, 0x8
+    const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    invoke-static/range {v9 .. v15}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    move-result-object v2
 
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     const/4 v0, 0x4
 
-    new-array v1, v0, [Landroid/widget/ImageView;
+    new-array v2, v0, [Landroid/widget/ImageView;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier0Iv()Landroid/widget/ImageView;
 
-    move-result-object v3
+    move-result-object v4
 
-    aput-object v3, v1, v4
+    aput-object v4, v2, v3
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier1Iv()Landroid/widget/ImageView;
 
-    move-result-object v3
+    move-result-object v4
 
-    aput-object v3, v1, v2
+    aput-object v4, v2, v1
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier2Iv()Landroid/widget/ImageView;
 
-    move-result-object v3
+    move-result-object v4
 
-    aput-object v3, v1, v9
+    aput-object v4, v2, v8
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier3Iv()Landroid/widget/ImageView;
 
-    move-result-object v3
+    move-result-object v4
 
     const/4 v5, 0x3
 
-    aput-object v3, v1, v5
+    aput-object v4, v2, v5
 
-    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v2}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v2
 
-    iput-object v1, v6, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->levelBackgrounds:Ljava/util/List;
+    iput-object v2, v6, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->levelBackgrounds:Ljava/util/List;
 
     new-array v0, v0, [Landroid/widget/TextView;
 
-    aput-object v7, v0, v4
+    const/4 v2, 0x0
+
+    aput-object v2, v0, v3
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier1Tv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v2
 
-    aput-object v1, v0, v2
+    aput-object v2, v0, v1
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier2Tv()Landroid/widget/TextView;
 
     move-result-object v1
 
-    aput-object v1, v0, v9
+    aput-object v1, v0, v8
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier3Tv()Landroid/widget/TextView;
 
@@ -2179,13 +2067,6 @@
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->fetchData()V
 
     return-void
-
-    :cond_0
-    const-string v0, "view"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2247,7 +2128,7 @@
 
     const-string v1, "ViewModelProvider(requir\u2026ildViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildViewModel;
 
@@ -2255,11 +2136,11 @@
 
     const/4 v1, 0x0
 
-    const-string v2, "viewModel"
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -2267,9 +2148,9 @@
 
     move-result-object v0
 
-    const-string v3, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v3, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -2330,12 +2211,12 @@
     return-void
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
index b7a9f20597..869a90a913 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
@@ -36,7 +36,9 @@
 .method public final create(Landroid/content/Context;JJ)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -56,20 +58,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026NT_EXTRA_SLOT_ID, slotId)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$configureUI$1.smali
index 6e13cf5778..2b05755fab 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPremiumGuildSubscriptionConfirmation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali
index 6cc1bcec03..f25f965e41 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetPremiumGuildSubscriptionConfirmation.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->access$configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
index f9026cfd16..5f66db70cb 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
@@ -47,101 +47,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+    const-string v2, "confirmationView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmationView()Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "confirmationView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getConfirmationView()Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    const/4 v2, 0x0
+    const-string v2, "select"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSelect()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "select"
-
-    const-string v4, "getSelect()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+    const-string v2, "error"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getError()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "error"
-
-    const-string v4, "getError()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+    const-string/jumbo v2, "warning"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getWarning()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "warning"
-
-    const-string v4, "getWarning()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -197,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->warning$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -248,9 +218,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -284,7 +254,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f1211a2
+    const v0, 0x7f1211cd
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -332,7 +302,7 @@
 
     const-string v1, "state.guild.name"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->configureToolbar(Ljava/lang/String;)V
 
@@ -400,7 +370,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
@@ -408,7 +378,7 @@
 
     const-string v0, "resources"
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -418,7 +388,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$ViewState$Loaded;->getSubscriptionCount()I
 
@@ -468,11 +438,11 @@
     return-void
 
     :cond_6
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.servers.premiumguild.PremiumGuildSubscriptionInProgressViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -704,7 +674,7 @@
 
     const-string v1, "ViewModelProvider(\n     \u2026essViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
@@ -712,7 +682,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -724,9 +694,9 @@
 
     move-result-object v1
 
-    const-string v0, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v0, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
@@ -751,9 +721,9 @@
     return-void
 
     :cond_2
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -761,9 +731,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 9
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -781,11 +753,13 @@
 
     move-result-object p1
 
-    const v0, 0x7f1211b2
+    const/4 v0, 0x1
 
-    const/4 v1, 0x1
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    new-array v2, v1, [Ljava/lang/Object;
+    move-result-object v1
+
+    new-array v2, v0, [Ljava/lang/Object;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -793,49 +767,45 @@
 
     const-string v4, "requireContext()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v3
 
-    const v5, 0x7f1000ce
+    new-array v5, v0, [Ljava/lang/Object;
 
-    new-array v6, v1, [Ljava/lang/Object;
+    const/4 v6, 0x0
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    aput-object v1, v5, v6
 
-    move-result-object v7
+    const v7, 0x7f1000d0
 
-    const/4 v8, 0x0
-
-    aput-object v7, v6, v8
-
-    invoke-virtual {v3, v5, v1, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v7, v0, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
-    aput-object v3, v2, v8
+    aput-object v3, v2, v6
 
-    invoke-virtual {p0, v0, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const v3, 0x7f1211dd
 
-    move-result-object v0
+    invoke-virtual {p0, v3, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v2
+
+    invoke-virtual {p1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object p1
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object p1
 
-    const v0, 0x7f1000cf
-
-    new-array v2, v1, [Ljava/lang/Object;
+    new-array v2, v0, [Ljava/lang/Object;
 
     const/4 v3, 0x7
 
@@ -843,72 +813,61 @@
 
     move-result-object v5
 
-    aput-object v5, v2, v8
+    aput-object v5, v2, v6
 
-    invoke-virtual {p1, v0, v3, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    const v5, 0x7f1000d1
+
+    invoke-virtual {p1, v5, v3, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    const-string v0, "requireContext().resourc\u2026PTION_COOLDOWN_DAYS\n    )"
+    const-string v2, "requireContext().resourc\u2026PTION_COOLDOWN_DAYS\n    )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v0
+    move-result-object v2
 
-    const v2, 0x7f1000d0
+    new-array v3, v0, [Ljava/lang/Object;
 
-    new-array v3, v1, [Ljava/lang/Object;
+    aput-object v1, v3, v6
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v1, 0x7f1000d2
 
-    move-result-object v4
+    invoke-virtual {v2, v1, v0, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    aput-object v4, v3, v8
-
-    invoke-virtual {v0, v2, v1, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "requireContext().resourc\u2026CRIPTION_SLOT_COUNT\n    )"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getWarning()Landroid/widget/TextView;
 
     move-result-object v2
 
-    const v3, 0x7f1211b4
+    const/4 v3, 0x2
 
-    const/4 v4, 0x2
+    new-array v3, v3, [Ljava/lang/Object;
 
-    new-array v4, v4, [Ljava/lang/Object;
+    aput-object v1, v3, v6
 
-    aput-object v0, v4, v8
+    aput-object p1, v3, v0
 
-    aput-object p1, v4, v1
+    const p1, 0x7f1211df
 
-    invoke-virtual {p0, v3, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$Companion.smali
index 9cf0db456a..723d79820c 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$Companion.smali
@@ -59,19 +59,19 @@
 
 # virtual methods
 .method public final create(Landroid/content/Context;JJLcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Landroid/content/Intent;
+    new-instance v0, Landroid/content/Intent;
 
-    invoke-direct {v1}, Landroid/content/Intent;-><init>()V
+    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
 
-    const-string v2, "PREVIOUS_GUILD_ID"
+    const-string v1, "PREVIOUS_GUILD_ID"
 
-    invoke-virtual {v1, v2, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+    invoke-virtual {v0, v1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
 
     move-result-object p2
 
@@ -81,25 +81,27 @@
 
     move-result-object p2
 
+    const/4 p3, 0x0
+
     if-eqz p6, :cond_0
 
     invoke-virtual {p6}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getId()J
 
-    move-result-wide p3
+    move-result-wide p4
 
-    invoke-static {p3, p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {p4, p5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object p3
+    move-result-object p4
 
     goto :goto_0
 
     :cond_0
-    move-object p3, v0
+    move-object p4, p3
 
     :goto_0
-    const-string p4, "SLOT_ID"
+    const-string p5, "SLOT_ID"
 
-    invoke-virtual {p2, p4, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
+    invoke-virtual {p2, p5, p4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
 
     move-result-object p2
 
@@ -107,39 +109,32 @@
 
     invoke-virtual {p6}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    move-result-object p3
+    move-result-object p4
 
-    if-eqz p3, :cond_1
+    if-eqz p4, :cond_1
 
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
+    invoke-virtual {p4}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
 
     move-result-wide p3
 
     invoke-static {p3, p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p3
 
     :cond_1
-    const-string p3, "SUBSCRIPTION_ID"
+    const-string p4, "SUBSCRIPTION_ID"
 
-    invoke-virtual {p2, p3, v0}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
+    invoke-virtual {p2, p4, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
 
     move-result-object p2
 
     const-string p3, "Intent()\n          .putE\u2026iumGuildSubscription?.id)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$configureUI$1.smali
index 8bf6f75e4e..b6035a406e 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPremiumGuildSubscriptionTransfer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$onViewBoundOrOnResume$1.smali
index 2153d9726f..c737a04419 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetPremiumGuildSubscriptionTransfer.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->access$configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.smali
index c03c68fe01..0a015d8a0a 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.smali
@@ -53,161 +53,113 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
+    const-string v2, "transferConfirmationTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTransferConfirmationTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "transferConfirmationTextView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTransferConfirmationTextView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const/4 v2, 0x0
+    const-string v2, "previousGuildHeaderTextView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getPreviousGuildHeaderTextView()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "previousGuildHeaderTextView"
-
-    const-string v4, "getPreviousGuildHeaderTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
+    const-string v2, "previousGuildConfirmationView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPreviousGuildConfirmationView()Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "previousGuildConfirmationView"
-
-    const-string v4, "getPreviousGuildConfirmationView()Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
+    const-string v2, "targetGuildHeaderTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTargetGuildHeaderTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "targetGuildHeaderTextView"
-
-    const-string v4, "getTargetGuildHeaderTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
+    const-string v2, "targetGuildConfirmationView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTargetGuildConfirmationView()Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "targetGuildConfirmationView"
-
-    const-string v4, "getTargetGuildConfirmationView()Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
+    const-string v2, "transferButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTransferButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "transferButton"
-
-    const-string v4, "getTransferButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
+    const-string v2, "errorTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getErrorTextView()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "errorTextView"
-
-    const-string v4, "getErrorTextView()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
-    const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
@@ -231,7 +183,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06d8
+    const v0, 0x7f0a06de
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -239,7 +191,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->transferConfirmationTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06db
+    const v0, 0x7f0a06e1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -247,7 +199,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->previousGuildHeaderTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06da
+    const v0, 0x7f0a06e0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -255,7 +207,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->previousGuildConfirmationView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06de
+    const v0, 0x7f0a06e4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -263,7 +215,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->targetGuildHeaderTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06dd
+    const v0, 0x7f0a06e3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -271,7 +223,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->targetGuildConfirmationView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06dc
+    const v0, 0x7f0a06e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -279,7 +231,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->transferButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d9
+    const v0, 0x7f0a06df
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -287,7 +239,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;->errorTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -316,9 +268,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -459,7 +411,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
@@ -467,7 +419,7 @@
 
     const-string v0, "resources"
 
-    invoke-static {v7, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;
 
@@ -481,7 +433,7 @@
 
     const-string v0, "state.targetGuild.name"
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel$ViewState$PostTransfer;->getTargetGuildSubscriptionCount()I
 
@@ -707,9 +659,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 9
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -717,71 +671,67 @@
 
     move-result-object p1
 
-    const v0, 0x7f1211b5
+    const/4 v0, 0x2
 
-    const/4 v1, 0x2
-
-    new-array v1, v1, [Ljava/lang/Object;
+    new-array v0, v0, [Ljava/lang/Object;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "requireContext()"
+    const-string v2, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
-    const v4, 0x7f1000d2
+    const/4 v3, 0x1
 
-    const/4 v5, 0x1
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    new-array v6, v5, [Ljava/lang/Object;
+    move-result-object v4
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    new-array v5, v3, [Ljava/lang/Object;
 
-    move-result-object v7
+    const/4 v6, 0x0
 
-    const/4 v8, 0x0
+    aput-object v4, v5, v6
 
-    aput-object v7, v6, v8
+    const v7, 0x7f1000d4
 
-    invoke-virtual {v2, v4, v5, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v1, v7, v3, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    aput-object v2, v1, v8
+    aput-object v1, v0, v6
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
-    const v4, 0x7f1000d1
+    new-array v5, v3, [Ljava/lang/Object;
 
-    new-array v6, v5, [Ljava/lang/Object;
+    aput-object v4, v5, v6
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v7, 0x7f1000d3
 
-    move-result-object v7
+    invoke-virtual {v1, v7, v3, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    aput-object v7, v6, v8
+    move-result-object v1
 
-    invoke-virtual {v2, v4, v5, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v1, v0, v3
 
-    move-result-object v2
+    const v1, 0x7f1211e0
 
-    aput-object v2, v1, v5
-
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -791,37 +741,33 @@
 
     move-result-object p1
 
-    const v0, 0x7f1211b6
-
-    new-array v1, v5, [Ljava/lang/Object;
+    new-array v0, v3, [Ljava/lang/Object;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
-    const v4, 0x7f1000d3
+    new-array v5, v3, [Ljava/lang/Object;
 
-    new-array v6, v5, [Ljava/lang/Object;
+    aput-object v4, v5, v6
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v7, 0x7f1000d5
 
-    move-result-object v7
+    invoke-virtual {v1, v7, v3, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    aput-object v7, v6, v8
+    move-result-object v1
 
-    invoke-virtual {v2, v4, v5, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v1, v0, v6
 
-    move-result-object v2
+    const v1, 0x7f1211e1
 
-    aput-object v2, v1, v8
-
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -831,37 +777,33 @@
 
     move-result-object p1
 
-    const v0, 0x7f1211b8
-
-    new-array v1, v5, [Ljava/lang/Object;
+    new-array v0, v3, [Ljava/lang/Object;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
-    const v4, 0x7f1000d4
+    new-array v5, v3, [Ljava/lang/Object;
 
-    new-array v6, v5, [Ljava/lang/Object;
+    aput-object v4, v5, v6
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v7, 0x7f1000d6
 
-    move-result-object v7
+    invoke-virtual {v1, v7, v3, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    aput-object v7, v6, v8
+    move-result-object v1
 
-    invoke-virtual {v2, v4, v5, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v1, v0, v6
 
-    move-result-object v2
+    const v1, 0x7f1211e3
 
-    aput-object v2, v1, v8
-
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -881,52 +823,39 @@
 
     move-result-object p1
 
-    const v0, 0x7f1211be
-
-    new-array v1, v5, [Ljava/lang/Object;
+    new-array v0, v3, [Ljava/lang/Object;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v2
+    move-result-object v1
 
-    const v3, 0x7f1000d6
+    new-array v2, v3, [Ljava/lang/Object;
 
-    new-array v4, v5, [Ljava/lang/Object;
+    aput-object v4, v2, v6
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v4, 0x7f1000d8
 
-    move-result-object v6
+    invoke-virtual {v1, v4, v3, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
-    aput-object v6, v4, v8
+    move-result-object v1
 
-    invoke-virtual {v2, v3, v5, v4}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    aput-object v1, v0, v6
 
-    move-result-object v2
+    const v1, 0x7f1211e9
 
-    aput-object v2, v1, v8
-
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -998,7 +927,7 @@
 
     const-string v1, "ViewModelProvider(\n     \u2026essViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel;
 
@@ -1006,7 +935,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1018,9 +947,9 @@
 
     move-result-object v1
 
-    const-string v0, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v0, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer;
 
@@ -1045,9 +974,9 @@
     return-void
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$1.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$1.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$1.smali
index 91e374dcc7..bc1114e4e0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MuteSettingsSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$1;->this$0:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;->access$handleStoreState(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Channel.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Channel.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Channel.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Channel.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Guild.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Guild.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Guild.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config$Guild.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Config.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$Dismiss.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$Dismiss.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$Dismiss.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$Dismiss.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$NavigateToChannelSettings.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$NavigateToChannelSettings.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$NavigateToChannelSettings.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event$NavigateToChannelSettings.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Event.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory$observeStoreState$1.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory$observeStoreState$1.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory$observeStoreState$1.smali
index 39ae62990b..d647d77124 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory$observeStoreState$1.smali
@@ -29,7 +29,15 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;",
+        "Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory.smali
index ec79178a29..7c3c622574 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory.smali
+++ b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$Factory.smali
@@ -75,7 +75,7 @@
 
     const-string p2, "Observable.combineLatest\u2026uildId]\n        )\n      }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -94,7 +94,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Factory;->guildId:J
 
@@ -155,15 +157,6 @@
     invoke-direct {v0, p1, v1, v2, v3}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;-><init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Config;Lrx/Observable;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/utilities/time/Clock;)V
 
     return-object v0
-
-    :cond_1
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getChannelId()J
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState.smali
index 06d112d3c6..9c4f9bbbbb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState.smali
@@ -134,7 +134,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -144,7 +144,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -154,7 +154,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Failure.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Failure.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Failure.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Failure.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded.smali
index bcecc7291c..8b83b02d1a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded.smali
@@ -32,12 +32,16 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType;Ljava/lang/String;ZZLjava/lang/String;I)V
     .locals 1
 
+    const-string v0, "settingsType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "subtitle"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;->settingsType:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType;
@@ -53,20 +57,6 @@
     iput p6, p0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;->notificationOverride:I
 
     return-void
-
-    :cond_0
-    const-string p1, "subtitle"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "settingsType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType;Ljava/lang/String;ZZLjava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -266,11 +256,13 @@
 .method public final copy(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType;Ljava/lang/String;ZZLjava/lang/String;I)Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "settingsType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "subtitle"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;
 
@@ -291,20 +283,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType;Ljava/lang/String;ZZLjava/lang/String;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subtitle"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "settingsType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -322,7 +300,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;->settingsType:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -332,7 +310,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;->subtitle:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -354,7 +332,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;->muteEndTime:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$WhenMappings.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$WhenMappings.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel$WhenMappings.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel$WhenMappings.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel.smali b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel.smali
similarity index 85%
rename from com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel.smali
rename to com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel.smali
index 5a7b09260d..a62cde63b4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/MuteSettingsSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/settings/MuteSettingsSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "MuteSettingsSheetViewModel.kt"
 
 
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;",
         ">;"
     }
@@ -75,7 +75,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Config;Lrx/Observable;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/utilities/time/Clock;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -89,19 +89,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "config"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "storeStateObservable"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "storeUserGuildSettings"
 
-    sget-object v1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    const-string v0, "clock"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;->config:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Config;
 
@@ -123,13 +129,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;
+
+    new-instance v6, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$1;-><init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -137,47 +151,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$1;-><init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeUserGuildSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "config"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;)V
@@ -278,7 +258,7 @@
 
     sget-object p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Failure;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -287,17 +267,15 @@
 
     move-result v2
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v5, 0x1
+    if-eqz v2, :cond_8
 
-    if-eqz v2, :cond_a
-
-    if-eq v2, v5, :cond_8
+    if-eq v2, v3, :cond_7
 
     const/4 v0, 0x2
 
-    if-eq v2, v0, :cond_8
+    if-eq v2, v0, :cond_7
 
     const/4 v0, 0x3
 
@@ -305,20 +283,22 @@
 
     const/4 v0, 0x4
 
-    if-eq v2, v0, :cond_8
+    if-eq v2, v0, :cond_7
 
     const-string v0, ""
 
     goto :goto_2
 
     :cond_6
-    const/16 v0, 0x23
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-static {v0}, Lf/e/b/a/a;->B(C)Ljava/lang/StringBuilder;
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    move-result-object v0
+    const/16 v2, 0x23
 
-    if-eqz v1, :cond_7
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -333,12 +313,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_8
-    if-eqz v1, :cond_9
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -346,45 +321,44 @@
 
     goto :goto_2
 
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_a
-    if-eqz v0, :cond_13
+    :cond_8
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
     move-result-object v0
 
     :goto_2
+    move-object v5, v0
+
     invoke-virtual {p1}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;->getGuildNotificationSettings()Lcom/discord/models/domain/ModelNotificationSettings;
 
-    move-result-object v2
+    move-result-object v0
+
+    const/4 v2, 0x0
 
     const/4 v6, 0x0
 
-    if-eqz v2, :cond_e
+    if-eqz v0, :cond_c
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelNotificationSettings;->getChannelOverrides()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelNotificationSettings;->getChannelOverrides()Ljava/util/List;
 
-    move-result-object v2
+    move-result-object v0
 
-    if-eqz v2, :cond_e
+    if-eqz v0, :cond_c
 
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v2
+    move-result-object v0
 
-    :cond_b
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    :cond_9
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v7
 
-    if-eqz v7, :cond_d
+    if-eqz v7, :cond_b
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -396,7 +370,7 @@
 
     move-result-object v9
 
-    if-eqz v9, :cond_c
+    if-eqz v9, :cond_a
 
     invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
@@ -404,7 +378,7 @@
 
     const-string v11, "channelOverride"
 
-    invoke-static {v8, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getChannelId()J
 
@@ -412,80 +386,78 @@
 
     cmp-long v8, v9, v11
 
-    if-nez v8, :cond_c
+    if-nez v8, :cond_a
 
     const/4 v8, 0x1
 
     goto :goto_3
 
-    :cond_c
+    :cond_a
     const/4 v8, 0x0
 
     :goto_3
-    if-eqz v8, :cond_b
+    if-eqz v8, :cond_9
 
     goto :goto_4
 
-    :cond_d
-    move-object v7, v3
+    :cond_b
+    move-object v7, v6
 
     :goto_4
     check-cast v7, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
 
     goto :goto_5
 
-    :cond_e
-    move-object v7, v3
+    :cond_c
+    move-object v7, v6
 
     :goto_5
-    new-instance v2, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;
+    new-instance v0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;
 
     const-string v8, "subtitle"
 
-    invoke-static {v0, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_f
+    if-eqz v1, :cond_d
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
     move-result v1
 
-    if-nez v1, :cond_f
+    if-nez v1, :cond_d
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$StoreState;->getGuildNotificationSettings()Lcom/discord/models/domain/ModelNotificationSettings;
 
     move-result-object p1
 
-    if-eqz p1, :cond_f
+    if-eqz p1, :cond_d
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings;->isMuted()Z
 
     move-result p1
 
-    if-ne p1, v5, :cond_f
+    if-ne p1, v3, :cond_d
 
     const/4 p1, 0x1
 
     goto :goto_6
 
-    :cond_f
+    :cond_d
     const/4 p1, 0x0
 
     :goto_6
-    if-eqz v7, :cond_10
+    if-eqz v7, :cond_e
 
     invoke-virtual {v7}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->isMuted()Z
 
     move-result v1
 
-    if-ne v1, v5, :cond_10
+    if-ne v1, v3, :cond_e
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v6, 0x1
-
-    :cond_10
-    if-eqz v7, :cond_11
+    :cond_e
+    if-eqz v7, :cond_f
 
     invoke-virtual {v7}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getMuteEndTime()Ljava/lang/String;
 
@@ -495,11 +467,11 @@
 
     goto :goto_7
 
-    :cond_11
-    move-object v8, v3
+    :cond_f
+    move-object v8, v6
 
     :goto_7
-    if-eqz v7, :cond_12
+    if-eqz v7, :cond_10
 
     invoke-virtual {v7}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->getMessageNotifications()I
 
@@ -507,28 +479,23 @@
 
     goto :goto_8
 
-    :cond_12
+    :cond_10
     sget v1, Lcom/discord/models/domain/ModelNotificationSettings;->FREQUENCY_UNSET:I
 
     :goto_8
     move v9, v1
 
-    move-object v3, v2
+    move-object v3, v0
 
-    move-object v5, v0
+    move v6, v2
 
     move v7, p1
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$SettingsType;Ljava/lang/String;ZZLjava/lang/String;I)V
 
-    invoke-virtual {p0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_13
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
 .end method
 
 
@@ -606,7 +573,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -639,9 +606,11 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "appContext"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const-wide/16 v1, 0x0
 
@@ -723,13 +692,6 @@
     invoke-direct {p0}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;->emitDismissEvent()V
 
     return-void
-
-    :cond_3
-    const-string p1, "appContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final unmute(Landroid/content/Context;)V
@@ -737,7 +699,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "appContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;->config:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Config;
 
@@ -765,13 +729,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "appContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$Companion.smali
new file mode 100644
index 0000000000..68434abd42
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$Companion.smali
@@ -0,0 +1,92 @@
+.class public final Lcom/discord/widgets/settings/WidgetChangeLog$Companion;
+.super Ljava/lang/Object;
+.source "WidgetChangeLog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/WidgetChangeLog;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetChangeLog$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final launch(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "version"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "revision"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v0, "video"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "body"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroid/os/Bundle;
+
+    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
+
+    const-string v1, "INTENT_EXTRA_VERSION"
+
+    invoke-virtual {v0, v1, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p2, "INTENT_EXTRA_REVISION"
+
+    invoke-virtual {v0, p2, p3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p2, "INTENT_EXTRA_VIDEO"
+
+    invoke-virtual {v0, p2, p4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p2, "INTENT_EXTRA_BODY"
+
+    invoke-virtual {v0, p2, p5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-class p2, Lcom/discord/widgets/settings/WidgetChangeLog;
+
+    new-instance p3, Landroid/content/Intent;
+
+    invoke-direct {p3}, Landroid/content/Intent;-><init>()V
+
+    invoke-virtual {p3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
+
+    move-result-object p3
+
+    invoke-static {p1, p2, p3}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
index ace7da55ee..e9285789d3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1.smali
@@ -47,11 +47,11 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const v2, 0x7f12160f
+    const v2, 0x7f121639
 
     invoke-virtual {p1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
index 37c6f69cc2..a5c601b18d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$2.smali
@@ -47,7 +47,7 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "https://www.facebook.com/discordapp"
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
index 452aff3967..edd8ee8a3c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureFooter$$inlined$apply$lambda$3.smali
@@ -47,7 +47,7 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "https://www.instagram.com/discord"
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
index 9f10cb87e9..2902f0e724 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$2.smali
@@ -96,7 +96,7 @@
     :cond_1
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetChangeLog$configureMedia$2;->this$0:Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const v0, 0x7f1203df
+    const v0, 0x7f1203e0
 
     invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -104,7 +104,7 @@
 
     const-string v0, "getString(R.string.change_log_md_date)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
     iget-object v1, p0, Lcom/discord/widgets/settings/WidgetChangeLog$configureMedia$2;->this$0:Lcom/discord/widgets/settings/WidgetChangeLog;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
index 7da2de438b..e9ae197903 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$configureMedia$3.smali
@@ -37,7 +37,9 @@
 .method public final onPrepared(Landroid/media/MediaPlayer;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "mp"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/media/MediaPlayer;->start()V
 
@@ -66,13 +68,4 @@
     invoke-virtual {p1}, Landroid/widget/VideoView;->requestLayout()V
 
     return-void
-
-    :cond_0
-    const-string p1, "mp"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
index d0ef189a32..2bb17f1834 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetChangeLog$hideVideoOverlay$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChangeLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/high16 v0, 0x40000000    # 2.0f
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->scaleY(F)Landroid/view/ViewPropertyAnimator;
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$onViewBound$1.smali
similarity index 87%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$onViewBound$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$onViewBound$1.smali
index 81d6dc55ff..4acf059990 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetChangeLog$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChangeLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,11 +67,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 6
 
-    const/4 p3, 0x0
+    const-string p3, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog$onViewBound$1;->this$0:Lcom/discord/widgets/settings/WidgetChangeLog;
 
@@ -98,18 +100,4 @@
     invoke-static/range {v0 .. v5}, Lcom/discord/widgets/settings/WidgetChangeLog;->track$default(Lcom/discord/widgets/settings/WidgetChangeLog;Ljava/lang/String;Ljava/util/Map;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$onViewBound$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$onViewBound$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$onViewBound$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
index b5d8fefe4d..b0170cdca3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChangeLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/high16 v0, 0x40000000    # 2.0f
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setScaleY(F)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
index 57a58a3f49..4a6c79b6eb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetChangeLog$showVideoOverlay$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetChangeLog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/ViewPropertyAnimator;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Landroid/view/ViewPropertyAnimator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -80,13 +82,4 @@
     invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->scaleY(F)Landroid/view/ViewPropertyAnimator;
 
     return-void
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1$onFinalImageSet$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog$thumbnailControllerListener$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
similarity index 87%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
index 19c3c96a66..5d352197c5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -64,121 +64,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetChangeLog;
+    const-string v2, "bodyTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBodyTv()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "bodyTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getBodyTv()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const/4 v2, 0x0
+    const-string v2, "thumbnailIv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getThumbnailIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetChangeLog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "thumbnailIv"
-
-    const-string v4, "getThumbnailIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetChangeLog;
+    const-string/jumbo v2, "videoVw"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVideoVw()Landroid/widget/VideoView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "videoVw"
-
-    const-string v4, "getVideoVw()Landroid/widget/VideoView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetChangeLog;
+    const-string/jumbo v2, "videoOverlay"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVideoOverlay()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "videoOverlay"
-
-    const-string v4, "getVideoOverlay()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetChangeLog;
+    const-string v2, "scrollView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getScrollView()Landroidx/core/widget/NestedScrollView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "scrollView"
-
-    const-string v4, "getScrollView()Landroidx/core/widget/NestedScrollView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetChangeLog;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetChangeLog;
+    const-string v2, "contents"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContents()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "contents"
-
-    const-string v4, "getContents()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -202,7 +166,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0147
+    const v0, 0x7f0a014a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -210,7 +174,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a014c
+    const v0, 0x7f0a014f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -218,7 +182,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->thumbnailIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a014e
+    const v0, 0x7f0a0151
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -226,7 +190,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->videoVw$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a014f
+    const v0, 0x7f0a0152
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -234,7 +198,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->videoOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a014b
+    const v0, 0x7f0a014e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -242,7 +206,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0148
+    const v0, 0x7f0a014b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -350,7 +314,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f0a014d
+    const v1, 0x7f0a0150
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -364,7 +328,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f0a0149
+    const v1, 0x7f0a014c
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -378,7 +342,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f0a014a
+    const v1, 0x7f0a014d
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -405,7 +369,7 @@
 
     const/4 v2, 0x2
 
-    invoke-static {p1, v0, v1, v2}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v0
 
@@ -635,7 +599,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203df
+    const v0, 0x7f1203e0
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -643,13 +607,13 @@
 
     const-string v1, "getString(R.string.change_log_md_date)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     :try_start_0
     new-instance v1, Ljava/text/SimpleDateFormat;
 
-    const-string v2, "yyyy-MM-dd"
+    const-string/jumbo v2, "yyyy-MM-dd"
 
     invoke-direct {v1, v2}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;)V
 
@@ -677,7 +641,7 @@
 
     const-string v1, "DateFormat.getMediumDate\u2026mat(context).format(date)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/text/ParseException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -850,7 +814,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203df
+    const v0, 0x7f1203e0
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -858,7 +822,7 @@
 
     const-string v1, "getString(R.string.change_log_md_date)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
@@ -876,7 +840,7 @@
     goto :goto_1
 
     :cond_1
-    const v1, 0x7f1203e1
+    const v1, 0x7f1203e2
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -884,7 +848,7 @@
 
     const-string v2, "getString(R.string.change_log_md_revision)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
     new-instance v2, Ljava/util/HashMap;
@@ -993,7 +957,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203df
+    const v0, 0x7f1203e0
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1001,7 +965,7 @@
 
     const-string v1, "getString(R.string.change_log_md_date)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -1076,9 +1040,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1088,31 +1052,33 @@
 
     invoke-interface {p1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    iput-wide v1, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->openedTimestamp:J
+    iput-wide v0, p0, Lcom/discord/widgets/settings/WidgetChangeLog;->openedTimestamp:J
+
+    const-string v3, "change_log_opened"
+
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x2
 
-    const/4 v7, 0x2
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    move-object v2, p0
 
-    const-string v4, "change_log_opened"
-
-    move-object v3, p0
-
-    invoke-static/range {v3 .. v8}, Lcom/discord/widgets/settings/WidgetChangeLog;->track$default(Lcom/discord/widgets/settings/WidgetChangeLog;Ljava/lang/String;Ljava/util/Map;ZILjava/lang/Object;)V
+    invoke-static/range {v2 .. v7}, Lcom/discord/widgets/settings/WidgetChangeLog;->track$default(Lcom/discord/widgets/settings/WidgetChangeLog;Ljava/lang/String;Ljava/util/Map;ZILjava/lang/Object;)V
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    const p1, 0x7f121816
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f121842
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1122,7 +1088,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->getDateString(Landroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -1145,7 +1111,7 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1203de
+    const p1, 0x7f1203df
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1153,7 +1119,7 @@
 
     const-string v1, "getString(R.string.change_log_md_body)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     move-object v4, p1
@@ -1168,7 +1134,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -1213,7 +1179,7 @@
     goto :goto_1
 
     :cond_1
-    const p1, 0x7f1203e2
+    const p1, 0x7f1203e3
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1221,7 +1187,7 @@
 
     const-string v0, "getString(R.string.change_log_md_video)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
     invoke-direct {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->configureMedia(Ljava/lang/String;)V
@@ -1239,11 +1205,4 @@
     invoke-virtual {p1, v0}, Landroidx/core/widget/NestedScrollView;->setOnScrollChangeListener(Landroidx/core/widget/NestedScrollView$OnScrollChangeListener;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$Companion.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$Companion.smali
index c9eebcfff8..2b6140e6f0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final showForChannel(JLandroidx/fragment/app/FragmentManager;)V
     .locals 3
 
-    if-eqz p3, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
@@ -61,21 +63,14 @@
     invoke-virtual {v0, p3, p1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final showForGuild(JLandroidx/fragment/app/FragmentManager;)V
     .locals 3
 
-    if-eqz p3, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
@@ -100,13 +95,4 @@
     invoke-virtual {v0, p3, p1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$WhenMappings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$WhenMappings.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$WhenMappings.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$WhenMappings.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1.smali
index 0d1c69f52f..d0d9544b45 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1.smali
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0}, Lcom/discord/app/AppActivity;->e()Landroid/content/Context;
 
@@ -58,11 +58,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;->unmute(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2.smali
new file mode 100644
index 0000000000..f4aef7c270
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2.smali
@@ -0,0 +1,81 @@
+.class public final synthetic Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2;
+.super Lk0/o/c/h;
+.source "WidgetMuteSettingsSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;)V
+    .locals 7
+
+    const-class v3, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+
+    const/4 v1, 0x1
+
+    const-string/jumbo v4, "updateViews"
+
+    const-string/jumbo v5, "updateViews(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2;->invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->access$updateViews(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3.smali
new file mode 100644
index 0000000000..ede6f6f093
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3.smali
@@ -0,0 +1,81 @@
+.class public final synthetic Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3;
+.super Lk0/o/c/h;
+.source "WidgetMuteSettingsSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;)V
+    .locals 7
+
+    const-class v3, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3;->invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->access$handleEvent(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$3.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$3.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$4.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$4.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$5.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$5.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet$onViewCreated$5.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
similarity index 81%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
index 46f679b192..b9cf619e44 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
@@ -69,321 +69,225 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "title"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "title"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitle()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "subtitle"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSubtitle()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "subtitle"
-
-    const-string v4, "getSubtitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "optionFifteenMinutes"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOptionFifteenMinutes()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "optionFifteenMinutes"
-
-    const-string v4, "getOptionFifteenMinutes()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "optionOneHour"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOptionOneHour()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "optionOneHour"
-
-    const-string v4, "getOptionOneHour()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "optionEightHours"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOptionEightHours()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "optionEightHours"
-
-    const-string v4, "getOptionEightHours()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "optionTwentyFourHours"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOptionTwentyFourHours()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "optionTwentyFourHours"
-
-    const-string v4, "getOptionTwentyFourHours()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "optionAlways"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOptionAlways()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "optionAlways"
-
-    const-string v4, "getOptionAlways()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string/jumbo v2, "unmute"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnmute()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "unmute"
-
-    const-string v4, "getUnmute()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string/jumbo v2, "unmuteLabel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnmuteLabel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "unmuteLabel"
-
-    const-string v4, "getUnmuteLabel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string/jumbo v2, "unmuteDetails"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnmuteDetails()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "unmuteDetails"
-
-    const-string v4, "getUnmuteDetails()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "muteOptions"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteOptions()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "muteOptions"
-
-    const-string v4, "getMuteOptions()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "notificationSettingsButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationSettingsButton()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationSettingsButton"
-
-    const-string v4, "getNotificationSettingsButton()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "notificationSettingsLabel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationSettingsLabel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationSettingsLabel"
-
-    const-string v4, "getNotificationSettingsLabel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "notificationSettingsButtonContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationSettingsButtonContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationSettingsButtonContainer"
-
-    const-string v4, "getNotificationSettingsButtonContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "notificationSettingsButtonOverridesLabel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationSettingsButtonOverridesLabel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationSettingsButtonOverridesLabel"
-
-    const-string v4, "getNotificationSettingsButtonOverridesLabel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
+    const-string v2, "notificationSettingsChannelMuteDetails"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationSettingsChannelMuteDetails()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationSettingsChannelMuteDetails"
-
-    const-string v4, "getNotificationSettingsChannelMuteDetails()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
@@ -407,7 +311,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0609
+    const v0, 0x7f0a060f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -415,7 +319,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0608
+    const v0, 0x7f0a060e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -423,7 +327,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->subtitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0605
+    const v0, 0x7f0a060b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -431,7 +335,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->optionFifteenMinutes$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0606
+    const v0, 0x7f0a060c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -439,7 +343,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->optionOneHour$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0604
+    const v0, 0x7f0a060a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -447,7 +351,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->optionEightHours$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0607
+    const v0, 0x7f0a060d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -455,7 +359,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->optionTwentyFourHours$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0603
+    const v0, 0x7f0a0609
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -463,7 +367,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->optionAlways$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a060a
+    const v0, 0x7f0a0610
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -471,7 +375,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->unmute$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a060c
+    const v0, 0x7f0a0612
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -479,7 +383,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->unmuteLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a060b
+    const v0, 0x7f0a0611
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -487,7 +391,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->unmuteDetails$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05fe
+    const v0, 0x7f0a0604
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -495,7 +399,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->muteOptions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05ff
+    const v0, 0x7f0a0605
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -503,7 +407,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->notificationSettingsButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0601
+    const v0, 0x7f0a0607
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -511,7 +415,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->notificationSettingsLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0600
+    const v0, 0x7f0a0606
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -519,7 +423,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->notificationSettingsButtonContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0602
+    const v0, 0x7f0a0608
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -527,7 +431,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->notificationSettingsButtonOverridesLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05fd
+    const v0, 0x7f0a0603
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -548,9 +452,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -596,7 +500,7 @@
 
     if-ne v1, v2, :cond_0
 
-    const v1, 0x7f120700
+    const v1, 0x7f120702
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -609,7 +513,7 @@
 
     if-ne v1, v2, :cond_1
 
-    const v1, 0x7f120761
+    const v1, 0x7f120763
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -622,7 +526,7 @@
 
     if-ne v1, v2, :cond_2
 
-    const v1, 0x7f12075b
+    const v1, 0x7f12075d
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -715,7 +619,7 @@
 
     if-eqz p1, :cond_5
 
-    const p1, 0x7f1206d7
+    const p1, 0x7f1206d9
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -732,9 +636,9 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p1, 0x7f12073d
+    const p1, 0x7f12073f
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -742,7 +646,7 @@
 
     const-string p1, "getString(R.string.form_\u2026nel_override_guild_muted)"
 
-    invoke-static {v6, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p1, 0x7f060235
 
@@ -849,9 +753,9 @@
 
     const-string v12, "requireContext()"
 
-    invoke-static {v5, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f121661
+    const v6, 0x7f12168b
 
     const/4 v13, 0x1
 
@@ -869,7 +773,7 @@
 
     const-string v7, "getString(R.string.unmut\u2026nnel, viewState.subtitle)"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v7, 0x7f040142
 
@@ -921,7 +825,7 @@
 
     move-result-object v15
 
-    invoke-static {v15, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;->getMuteEndTime()Ljava/lang/String;
 
@@ -929,7 +833,7 @@
 
     if-nez v4, :cond_0
 
-    const v4, 0x7f12073a
+    const v4, 0x7f12073c
 
     invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -938,7 +842,7 @@
     goto :goto_0
 
     :cond_0
-    const v6, 0x7f12073b
+    const v6, 0x7f12073d
 
     new-array v7, v13, [Ljava/lang/Object;
 
@@ -953,9 +857,9 @@
     move-result-object v4
 
     :goto_0
-    const-string v6, "when (val muteEndTime = \u2026EndTime))\n              }"
+    const-string/jumbo v6, "when (val muteEndTime = \u2026EndTime))\n              }"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v5}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
 
@@ -988,7 +892,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState$Loaded;->getMuteEndTime()Ljava/lang/String;
 
@@ -996,7 +900,7 @@
 
     if-nez v7, :cond_2
 
-    const v7, 0x7f12073f
+    const v7, 0x7f120741
 
     invoke-virtual {v0, v7}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1005,7 +909,7 @@
     goto :goto_1
 
     :cond_2
-    const v8, 0x7f120740
+    const v8, 0x7f120742
 
     new-array v9, v13, [Ljava/lang/Object;
 
@@ -1020,9 +924,9 @@
     move-result-object v7
 
     :goto_1
-    const-string v8, "when (val muteEndTime = \u2026dTime))\n                }"
+    const-string/jumbo v8, "when (val muteEndTime = \u2026dTime))\n                }"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v5}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
 
@@ -1424,7 +1328,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event$NavigateToChannelSettings;
 
@@ -1456,7 +1360,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -1527,7 +1431,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120f42
+    const v0, 0x7f120f6c
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1536,7 +1440,7 @@
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f120f43
+    const v0, 0x7f120f6d
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1545,7 +1449,7 @@
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f120f45
+    const v0, 0x7f120f6f
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1554,7 +1458,7 @@
     goto :goto_0
 
     :cond_3
-    const v0, 0x7f120f44
+    const v0, 0x7f120f6e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1604,11 +1508,11 @@
 
     if-eqz p1, :cond_6
 
-    const p1, 0x7f120560
+    const p1, 0x7f120562
 
     const/4 v0, 0x0
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
 
@@ -1622,9 +1526,9 @@
 .method public bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "compositeSubscription"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppBottomSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
 
@@ -1632,19 +1536,21 @@
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1;
+    new-instance v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1;-><init>(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$1;-><init>(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;)V
 
-    invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->viewModel:Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;
 
-    const-string v1, "viewModel"
+    const/4 v0, 0x0
+
+    const-string/jumbo v1, "viewModel"
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -1707,19 +1613,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "compositeSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -1775,7 +1674,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel;
 
@@ -1787,9 +1686,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -1797,7 +1696,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->e()Landroid/content/Context;
 
@@ -1854,16 +1753,4 @@
     invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.smali
similarity index 75%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.smali
index 5aa6efaa86..ab207490f7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/WidgetSettings$Model$Companion$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Boolean;",
@@ -47,64 +47,39 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x3
+    const-class v2, Lcom/discord/widgets/settings/WidgetSettings$Model;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x3
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettings$Model;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;)Lcom/discord/widgets/settings/WidgetSettings$Model;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "p3"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$Model;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/settings/WidgetSettings$Model;-><init>(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model$Companion.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model$Companion.smali
index a46a8b180f..48d5abb2df 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model$Companion.smali
@@ -95,7 +95,7 @@
 
     const-string v1, "Observable\n            .\u2026    ::Model\n            )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model.smali
index 8f532d7cfd..b4927a00ef 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$Model.smali
@@ -48,9 +48,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,15 +63,6 @@
     iput-object p3, p0, Lcom/discord/widgets/settings/WidgetSettings$Model;->presence:Lcom/discord/models/domain/ModelPresence;
 
     return-void
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/WidgetSettings$Model;Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;ILjava/lang/Object;)Lcom/discord/widgets/settings/WidgetSettings$Model;
@@ -132,22 +125,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;)Lcom/discord/widgets/settings/WidgetSettings$Model;
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$Model;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/settings/WidgetSettings$Model;-><init>(Lcom/discord/models/domain/ModelUser;ZLcom/discord/models/domain/ModelPresence;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -165,7 +151,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/WidgetSettings$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -181,7 +167,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettings$Model;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.smali
index 708f098e03..99b913af44 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.smali
@@ -54,7 +54,7 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -69,7 +69,7 @@
     :pswitch_0
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$configureToolbar$1;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Lcom/discord/widgets/settings/WidgetSettings;->access$showLogoutDialog(Lcom/discord/widgets/settings/WidgetSettings;Landroid/content/Context;)V
 
@@ -78,7 +78,7 @@
     :pswitch_1
     sget-object p1, Lcom/discord/widgets/debugging/WidgetDebugging;->Companion:Lcom/discord/widgets/debugging/WidgetDebugging$Companion;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/debugging/WidgetDebugging$Companion;->launch(Landroid/content/Context;)V
 
@@ -88,7 +88,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05d2
+    .packed-switch 0x7f0a05d8
         :pswitch_1
         :pswitch_0
     .end packed-switch
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
index 69eb4170e2..97fa285bb8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$configureUI$1.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
index 8986bd3418..2345e42060 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$10.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
index 871cfc0f62..b0cb44a5c3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$11.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
index c81b50cde5..12a6222a8b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$12.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
index bd7a750820..ac41af5cc1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$13.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
index 8145a19866..c4bccb6379 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$14.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
index fb75a7ebd2..45b65aeb99 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$15.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -66,7 +66,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -74,7 +74,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
index 5465ab84d1..ccebd298c8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$16.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$17.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$17.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$17.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$17.smali
index 7b0af0418e..df8da6f48d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$17.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$17.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
index 3628ea8fbd..09c375e3e1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string p1, "it.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
index 08dea409d6..b7e4a221e9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string p1, "it.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "https://support.discord.com"
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$1.smali
new file mode 100644
index 0000000000..8d77b1b0e3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$1.smali
@@ -0,0 +1,111 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+.super Lk0/o/c/j;
+.source "WidgetSettings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Boolean;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->invoke(Z)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Z)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    iget-object v0, v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    invoke-static {v0}, Lcom/discord/widgets/settings/WidgetSettings;->access$getSettingsUploadDebugLogs$p(Lcom/discord/widgets/settings/WidgetSettings;)Landroid/widget/TextView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setEnabled(Z)V
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    iget-object v0, v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    invoke-static {v0}, Lcom/discord/widgets/settings/WidgetSettings;->access$getSettingsUploadDebugLogs$p(Lcom/discord/widgets/settings/WidgetSettings;)Landroid/widget/TextView;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    const v1, 0x7f1216c4
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    const v1, 0x7f121849
+
+    :goto_0
+    invoke-virtual {p1, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$2.smali
new file mode 100644
index 0000000000..e9fad1034d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$2.smali
@@ -0,0 +1,87 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;
+.super Lk0/o/c/j;
+.source "WidgetSettings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Void;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $updateUploadDebugLogsUI$1:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+
+.field public final synthetic this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;->this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    iput-object p2, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;->$updateUploadDebugLogsUI$1:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Void;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;->invoke(Ljava/lang/Void;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Void;)V
+    .locals 3
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;->this$0:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    const v0, 0x7f1216c2
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x4
+
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;->$updateUploadDebugLogsUI$1:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->invoke(Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$3.smali
new file mode 100644
index 0000000000..b5b5e041b6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20$3.smali
@@ -0,0 +1,75 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$3;
+.super Lk0/o/c/j;
+.source "WidgetSettings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $updateUploadDebugLogsUI$1:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$3;->$updateUploadDebugLogsUI$1:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$3;->invoke(Lcom/discord/utilities/error/Error;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/error/Error;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$3;->$updateUploadDebugLogsUI$1:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->invoke(Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20.smali
new file mode 100644
index 0000000000..f4a2ef632c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$20.smali
@@ -0,0 +1,103 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+.super Ljava/lang/Object;
+.source "WidgetSettings.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettings;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 13
+
+    new-instance p1, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;
+
+    invoke-direct {p1, p0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;-><init>(Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;)V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;->invoke(Z)V
+
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->uploadSystemLog()Lrx/Observable;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+
+    move-result-object v5
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->this$0:Lcom/discord/widgets/settings/WidgetSettings;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v0, "javaClass.name"
+
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;
+
+    invoke-direct {v8, p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$2;-><init>(Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;)V
+
+    new-instance v9, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$3;
+
+    invoke-direct {v9, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$3;-><init>(Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20$1;)V
+
+    const/4 v7, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0x24
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$21.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$21.smali
new file mode 100644
index 0000000000..955edcfa04
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$21.smali
@@ -0,0 +1,75 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
+.super Ljava/lang/Object;
+.source "WidgetSettings.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 6
+
+    sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    const-string p1, "it.context"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "https://discord.com/acknowledgements"
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Lcom/discord/utilities/uri/UriHandler;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$22.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$22.smali
new file mode 100644
index 0000000000..2db5797548
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$22.smali
@@ -0,0 +1,71 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;
+.super Ljava/lang/Object;
+.source "WidgetSettings.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChangeLog()Lcom/discord/stores/StoreChangeLog;
+
+    move-result-object v0
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const-string v1, "it.context"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreChangeLog;->openChangeLog(Landroid/content/Context;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$23.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$23.smali
new file mode 100644
index 0000000000..5fd1df0e9f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$23.smali
@@ -0,0 +1,46 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$23;
+.super Landroidx/core/view/AccessibilityDelegateCompat;
+.source "WidgetSettings.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBound(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Landroidx/core/view/AccessibilityDelegateCompat;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+    .locals 1
+
+    const-string v0, "host"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "info"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+
+    const/4 p1, 0x1
+
+    invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setHeading(Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$3$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3$1.smali
index d4d558fe49..89ba249484 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3$1.smali
@@ -49,7 +49,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$3.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
index 17e6823015..776871c73a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$4.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
index 413975b411..98c764957c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$5.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
index 27f0b93b4a..88adca97ff 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$6.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
index 4b43a4ffa2..5213e7b21d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$7.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
index eff4e027ad..a65bc026f1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$8.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string p1, "it.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
index 92e495c815..a98808f72d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$9.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali
new file mode 100644
index 0000000000..1582f18e28
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,81 @@
+.class public final synthetic Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;
+.super Lk0/o/c/h;
+.source "WidgetSettings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/WidgetSettings$Model;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettings;)V
+    .locals 7
+
+    const-class v3, Lcom/discord/widgets/settings/WidgetSettings;
+
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/settings/WidgetSettings$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/WidgetSettings$Model;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettings$Model;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/WidgetSettings$Model;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/settings/WidgetSettings;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettings;Lcom/discord/widgets/settings/WidgetSettings$Model;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func3$0.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func3$0.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func3$0.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func3$0.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
index 64c24c1866..91936739e9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings$showLogoutDialog$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettings$showLogoutDialog$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,9 +69,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -82,13 +84,4 @@
     invoke-virtual {p1}, Lcom/discord/stores/StoreAuthentication;->logout()V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
similarity index 76%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index c87129ec75..96fe9a8664 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -73,6 +73,8 @@
 
 .field public final settingsTextImages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field public final settingsUploadDebugLogs$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field public final settingsVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field public final statusView$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -88,650 +90,472 @@
 .method public static constructor <clinit>()V
     .locals 5
 
-    const/16 v0, 0x20
+    const/16 v0, 0x21
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "appInfoTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAppInfoTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "appInfoTextView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getAppInfoTextView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const/4 v2, 0x0
+    const-string v2, "toolbarTitle"
 
-    aput-object v1, v0, v2
+    const-string v3, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "toolbarTitle"
-
-    const-string v4, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string/jumbo v2, "userProfileHeaderView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userProfileHeaderView"
-
-    const-string v4, "getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "setStatusContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSetStatusContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "setStatusContainer"
-
-    const-string v4, "getSetStatusContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "statusView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusView()Lcom/discord/views/StatusView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusView"
-
-    const-string v4, "getStatusView()Lcom/discord/views/StatusView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "presenceText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPresenceText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "presenceText"
-
-    const-string v4, "getPresenceText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string/jumbo v2, "userSettingsHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserSettingsHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userSettingsHeader"
-
-    const-string v4, "getUserSettingsHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsQRScanner"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsQRScanner()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsQRScanner"
-
-    const-string v4, "getSettingsQRScanner()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsNitro"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsNitro()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsNitro"
-
-    const-string v4, "getSettingsNitro()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsNitroHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsNitroHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsNitroHeader"
-
-    const-string v4, "getSettingsNitroHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsNitroBoosting"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsNitroBoosting()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsNitroBoosting"
-
-    const-string v4, "getSettingsNitroBoosting()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsNitroGifting"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsNitroGifting()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsNitroGifting"
-
-    const-string v4, "getSettingsNitroGifting()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsAppSettingsHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsAppSettingsHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsAppSettingsHeader"
-
-    const-string v4, "getSettingsAppSettingsHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsBilling"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsBilling()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsBilling"
-
-    const-string v4, "getSettingsBilling()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsAccount"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsAccount()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsAccount"
-
-    const-string v4, "getSettingsAccount()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsPrivacy"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsPrivacy()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsPrivacy"
-
-    const-string v4, "getSettingsPrivacy()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsAuthorizedApp"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsAuthorizedApp()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsAuthorizedApp"
-
-    const-string v4, "getSettingsAuthorizedApp()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsConnections"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsConnections()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsConnections"
-
-    const-string v4, "getSettingsConnections()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsAppearance"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsAppearance()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsAppearance"
-
-    const-string v4, "getSettingsAppearance()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsBehavior"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsBehavior()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsBehavior"
-
-    const-string v4, "getSettingsBehavior()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsLanguage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsLanguage()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsLanguage"
-
-    const-string v4, "getSettingsLanguage()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsNotifications"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsNotifications()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsNotifications"
-
-    const-string v4, "getSettingsNotifications()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsGameActivity"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsGameActivity()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsGameActivity"
-
-    const-string v4, "getSettingsGameActivity()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsTextImages"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsTextImages()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsTextImages"
-
-    const-string v4, "getSettingsTextImages()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsVoice"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsVoice()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsVoice"
-
-    const-string v4, "getSettingsVoice()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x18
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsDeveloperDivider"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsDeveloperDivider()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsDeveloperDivider"
-
-    const-string v4, "getSettingsDeveloperDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x19
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsDeveloperHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsDeveloperHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsDeveloperHeader"
-
-    const-string v4, "getSettingsDeveloperHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1a
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsDeveloper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsDeveloper()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsDeveloper"
-
-    const-string v4, "getSettingsDeveloper()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1b
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsSupport"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsSupport()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsSupport"
-
-    const-string v4, "getSettingsSupport()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1c
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsUploadDebugLogs"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsUploadDebugLogs()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsAcknowledgements"
-
-    const-string v4, "getSettingsAcknowledgements()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1d
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsAcknowledgements"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsAcknowledgements()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsChangelog"
-
-    const-string v4, "getSettingsChangelog()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1e
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettings;
+    const-string v2, "settingsChangelog"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsChangelog()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsNitroContainer"
-
-    const-string v4, "getSettingsNitroContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1f
 
     aput-object v1, v0, v2
 
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettings;
+
+    const-string v2, "settingsNitroContainer"
+
+    const-string v3, "getSettingsNitroContainer()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x20
+
+    aput-object v1, v0, v2
+
     sput-object v0, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
@@ -742,7 +566,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0875
+    const v0, 0x7f0a087b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -750,7 +574,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->appInfoTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0997
+    const v0, 0x7f0a099b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -758,7 +582,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->toolbarTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09f9
+    const v0, 0x7f0a09fd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -766,7 +590,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e5
+    const v0, 0x7f0a08eb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -774,7 +598,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->setStatusContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e6
+    const v0, 0x7f0a08ec
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -782,7 +606,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->statusView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08d2
+    const v0, 0x7f0a08d8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -790,7 +614,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->presenceText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08ef
+    const v0, 0x7f0a08f6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -798,7 +622,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->userSettingsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e4
+    const v0, 0x7f0a08ea
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -806,7 +630,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsQRScanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08c4
+    const v0, 0x7f0a08ca
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -814,7 +638,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08c7
+    const v0, 0x7f0a08cd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -822,7 +646,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitroHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08c5
+    const v0, 0x7f0a08cb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -830,7 +654,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitroBoosting$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08c6
+    const v0, 0x7f0a08cc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -838,7 +662,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitroGifting$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0876
+    const v0, 0x7f0a087c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -846,7 +670,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAppSettingsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a088b
+    const v0, 0x7f0a0891
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -854,7 +678,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsBilling$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0857
+    const v0, 0x7f0a085d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -862,7 +686,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAccount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08d3
+    const v0, 0x7f0a08d9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -870,7 +694,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsPrivacy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0883
+    const v0, 0x7f0a0889
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -878,7 +702,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAuthorizedApp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a1
+    const v0, 0x7f0a08a7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -886,7 +710,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsConnections$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0877
+    const v0, 0x7f0a087d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -894,7 +718,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAppearance$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0887
+    const v0, 0x7f0a088d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -902,7 +726,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsBehavior$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08bc
+    const v0, 0x7f0a08c2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -910,7 +734,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsLanguage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08cc
+    const v0, 0x7f0a08d2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -918,7 +742,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNotifications$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a5
+    const v0, 0x7f0a08ab
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -926,7 +750,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsGameActivity$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e8
+    const v0, 0x7f0a08ee
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -934,7 +758,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsTextImages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08f0
+    const v0, 0x7f0a08f7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -942,7 +766,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a3
+    const v0, 0x7f0a08a9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -950,7 +774,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloperDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a4
+    const v0, 0x7f0a08aa
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -958,7 +782,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloperHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a2
+    const v0, 0x7f0a08a8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -966,7 +790,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e7
+    const v0, 0x7f0a08ed
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -974,7 +798,15 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsSupport$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0874
+    const v0, 0x7f0a08f4
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsUploadDebugLogs$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a087a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -982,7 +814,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAcknowledgements$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a089a
+    const v0, 0x7f0a08a0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -990,7 +822,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsChangelog$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08c8
+    const v0, 0x7f0a08ce
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1009,6 +841,16 @@
     return-void
 .end method
 
+.method public static final synthetic access$getSettingsUploadDebugLogs$p(Lcom/discord/widgets/settings/WidgetSettings;)Landroid/widget/TextView;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettings;->getSettingsUploadDebugLogs()Landroid/widget/TextView;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static final synthetic access$showLogoutDialog(Lcom/discord/widgets/settings/WidgetSettings;Landroid/content/Context;)V
     .locals 0
 
@@ -1022,7 +864,7 @@
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->bindToolbar()Lkotlin/Unit;
 
-    const v0, 0x7f121700
+    const v0, 0x7f12172a
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1194,12 +1036,12 @@
 
     if-ne v0, v1, :cond_8
 
-    const v0, 0x7f12124a
+    const v0, 0x7f121275
 
     goto :goto_8
 
     :cond_8
-    const v0, 0x7f121249
+    const v0, 0x7f121274
 
     :goto_8
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1324,7 +1166,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x1d
+    const/16 v2, 0x1e
 
     aget-object v1, v1, v2
 
@@ -1444,7 +1286,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x1e
+    const/16 v2, 0x1f
 
     aget-object v1, v1, v2
 
@@ -1624,7 +1466,7 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x1f
+    const/16 v2, 0x20
 
     aget-object v1, v1, v2
 
@@ -1777,6 +1619,26 @@
     return-object v0
 .end method
 
+.method private final getSettingsUploadDebugLogs()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsUploadDebugLogs$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettings;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x1d
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
 .method private final getSettingsVoice()Landroid/view/View;
     .locals 3
 
@@ -1886,19 +1748,19 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f120e62
+    const p1, 0x7f120e88
 
     invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f121712
+    const v2, 0x7f12173c
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -1916,7 +1778,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f1203b7
+    const v1, 0x7f1203b8
 
     const/4 v2, 0x0
 
@@ -1960,9 +1822,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1970,23 +1832,20 @@
 
     move-result-object p1
 
-    instance-of v1, p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    instance-of v0, p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_0
-    move-object v0, p1
+    check-cast p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    :goto_0
-    check-cast v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    if-eqz p1, :cond_1
 
-    if-eqz v0, :cond_1
+    sget-object v0, Lcom/discord/widgets/tabs/NavigationTab;->SETTINGS:Lcom/discord/widgets/tabs/NavigationTab;
 
-    sget-object p1, Lcom/discord/widgets/tabs/NavigationTab;->SETTINGS:Lcom/discord/widgets/tabs/NavigationTab;
-
-    invoke-virtual {v0, p1, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
+    invoke-virtual {p1, v0, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
 
     :cond_1
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettings;->getSetStatusContainer()Landroid/view/View;
@@ -2011,7 +1870,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -2019,7 +1878,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/Badge$Companion;->onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
 
@@ -2043,7 +1902,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, " - 38.0 (1249)"
+    const-string v0, " - 38.1 (1251)"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -2193,11 +2052,21 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettings;->getSettingsUploadDebugLogs()Landroid/widget/TextView;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;-><init>(Lcom/discord/widgets/settings/WidgetSettings;)V
+
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettings;->getSettingsAcknowledgements()Landroid/view/View;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -2205,7 +2074,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -2261,7 +2130,7 @@
 
     move-result-object p1
 
-    :goto_1
+    :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v0
@@ -2274,23 +2143,16 @@
 
     check-cast v0, Landroid/view/View;
 
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$23;
 
-    invoke-direct {v1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;-><init>()V
+    invoke-direct {v1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$23;-><init>()V
 
     invoke-static {v0, v1}, Landroidx/core/view/ViewCompat;->setAccessibilityDelegate(Landroid/view/View;Landroidx/core/view/AccessibilityDelegateCompat;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
index e69118167f..828d06def9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
similarity index 81%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
index 03a7f64e55..5140a55ae9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/String;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;",
+        ">;"
     }
 .end annotation
 
@@ -70,11 +75,11 @@
 
     const-string v1, "settingsTheme"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "isPureEvilVisible"
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -84,7 +89,7 @@
 
     if-nez p4, :cond_1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
 
@@ -106,13 +111,13 @@
     :goto_1
     const-string v2, "fontScale"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I
 
     move-result p3
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p2, p4, p3, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;-><init>(Ljava/lang/String;ZILcom/discord/models/domain/ModelUser;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion.smali
similarity index 91%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion.smali
index aee4855c61..c0581b4e0f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion.smali
@@ -47,7 +47,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "easterEggPureEvil"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -87,16 +89,7 @@
 
     const-string v0, "Observable\n            .\u2026          )\n            }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "easterEggPureEvil"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
index b4b8f35f40..0e13b6791e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model.smali
@@ -52,11 +52,13 @@
 .method public constructor <init>(Ljava/lang/String;ZILcom/discord/models/domain/ModelUser;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "currentTheme"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,20 +71,6 @@
     iput-object p4, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "currentTheme"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;Ljava/lang/String;ZILcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;
@@ -160,31 +148,19 @@
 .method public final copy(Ljava/lang/String;ZILcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "currentTheme"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "meUser"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;-><init>(Ljava/lang/String;ZILcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "currentTheme"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -202,7 +178,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;->currentTheme:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -224,7 +200,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
index a8b53c78df..b4ec308d46 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureThemeOption$1.smali
@@ -55,7 +55,7 @@
 
     const-string v0, "checked"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
index 4e33814592..21a9a1288e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
@@ -102,7 +102,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -110,7 +110,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const v2, 0x7f1215b9
+    const v2, 0x7f1215e3
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -132,7 +132,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v3, v1, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v3, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     goto :goto_1
 
@@ -146,7 +146,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1215ba
+    const v0, 0x7f1215e4    # 1.9418095E38f
 
     iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
@@ -154,7 +154,7 @@
 
     move-result-object v1
 
-    invoke-static {p1, v0, v3, v1}, Lf/a/b/n;->e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
+    invoke-static {p1, v0, v3, v1}, Lf/a/b/p;->e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.smali
index 6b9d15c755..e74f8fbd7e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.smali
@@ -55,7 +55,7 @@
 
     const-string v0, "isChecked"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -73,7 +73,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -108,7 +108,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$4.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$4.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$5.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$5.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$5.smali
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
new file mode 100644
index 0000000000..5fc1cdbe16
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,81 @@
+.class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1;
+.super Lk0/o/c/h;
+.source "WidgetSettingsAppearance.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsAppearance;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettingsAppearance;)V
+    .locals 7
+
+    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsAppearance;Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
index e21d0f3c77..e3ea626db5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAppearance.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
index c85cce2cd1..51bb71a4e6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$3.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$showHolyLight$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$showHolyLight$1.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$showHolyLight$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$showHolyLight$1.smali
index 68afa15a4b..67a7f3106e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$showHolyLight$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$showHolyLight$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAppearance$showHolyLight$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAppearance.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
similarity index 84%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
index 3c3bf6f3aa..1d51bc1f6e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
@@ -88,261 +88,183 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "themeLightCs"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getThemeLightCs()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "themeLightCs"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getThemeLightCs()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const/4 v2, 0x0
+    const-string v2, "themeDarkCs"
 
-    aput-object v1, v0, v2
+    const-string v3, "getThemeDarkCs()Lcom/discord/views/CheckedSetting;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "themeDarkCs"
-
-    const-string v4, "getThemeDarkCs()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "themePureEvilSwitch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getThemePureEvilSwitch()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "themePureEvilSwitch"
-
-    const-string v4, "getThemePureEvilSwitch()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "syncSwitch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSyncSwitch()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "syncSwitch"
-
-    const-string v4, "getSyncSwitch()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "themeHolyLightView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getThemeHolyLightView()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "themeHolyLightView"
-
-    const-string v4, "getThemeHolyLightView()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "fontScalingSeekbar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFontScalingSeekbar()Landroid/widget/SeekBar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "fontScalingSeekbar"
-
-    const-string v4, "getFontScalingSeekbar()Landroid/widget/SeekBar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "fontScalingReset"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFontScalingReset()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "fontScalingReset"
-
-    const-string v4, "getFontScalingReset()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "fontScalingText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFontScalingText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "fontScalingText"
-
-    const-string v4, "getFontScalingText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "messageAvatar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMessageAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "messageAvatar"
-
-    const-string v4, "getMessageAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "messageUsername"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMessageUsername()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "messageUsername"
-
-    const-string v4, "getMessageUsername()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "messageTag"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMessageTag()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "messageTag"
-
-    const-string v4, "getMessageTag()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "messageTimestamp"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMessageTimestamp()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "messageTimestamp"
-
-    const-string v4, "getMessageTimestamp()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+    const-string v2, "messageText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMessageText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "messageText"
-
-    const-string v4, "getMessageText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
@@ -366,7 +288,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0881
+    const v0, 0x7f0a0887
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -374,7 +296,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->themeLightCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0880
+    const v0, 0x7f0a0886
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -382,7 +304,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->themeDarkCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0882
+    const v0, 0x7f0a0888
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -390,7 +312,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->themePureEvilSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a087f
+    const v0, 0x7f0a0885
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -398,7 +320,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->syncSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a087e
+    const v0, 0x7f0a0884
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -406,7 +328,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->themeHolyLightView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a087b
+    const v0, 0x7f0a0881
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -414,7 +336,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->fontScalingSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a087a
+    const v0, 0x7f0a0880
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -422,7 +344,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->fontScalingReset$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0878
+    const v0, 0x7f0a087e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -430,7 +352,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->fontScalingText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0223
+    const v0, 0x7f0a0226
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -438,7 +360,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0225
+    const v0, 0x7f0a0228
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -446,7 +368,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageUsername$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0226
+    const v0, 0x7f0a0229
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -454,7 +376,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageTag$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0227
+    const v0, 0x7f0a022a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -462,7 +384,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->messageTimestamp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0222
+    const v0, 0x7f0a0225
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -724,7 +646,7 @@
 
     const-string v1, "light"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -790,7 +712,7 @@
 
     const-string v2, "pureEvil"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1255,7 +1177,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
@@ -1275,7 +1197,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121705
+    const v0, 0x7f12172f
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1295,11 +1217,11 @@
 
     iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->toastManager:Lcom/discord/utilities/view/ToastManager;
 
-    const v2, 0x7f1215b7
+    const v2, 0x7f1215e1
 
     const/4 v3, 0x0
 
-    invoke-static {v0, v2, v3, v1}, Lf/a/b/n;->e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
+    invoke-static {v0, v2, v3, v1}, Lf/a/b/p;->e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
 
     const/4 v0, 0x1
 
@@ -1321,7 +1243,7 @@
 
     const-string v1, "Observable\n        .timer(3, TimeUnit.SECONDS)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -1355,7 +1277,7 @@
 .end method
 
 .method private final tryEnableTorchMode(Z)V
-    .locals 4
+    .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -1367,20 +1289,18 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
-
     if-eqz v0, :cond_0
 
-    const-string v2, "camera"
+    const-string v1, "camera"
 
-    invoke-virtual {v0, v2}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v0, v1
+    const/4 v0, 0x0
 
     :goto_0
     check-cast v0, Landroid/hardware/camera2/CameraManager;
@@ -1390,17 +1310,17 @@
     :try_start_0
     invoke-virtual {v0}, Landroid/hardware/camera2/CameraManager;->getCameraIdList()[Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    aget-object v2, v2, v3
+    aget-object v1, v1, v2
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v0, v2, p1}, Landroid/hardware/camera2/CameraManager;->setTorchMode(Ljava/lang/String;Z)V
+    invoke-virtual {v0, v1, p1}, Landroid/hardware/camera2/CameraManager;->setTorchMode(Ljava/lang/String;Z)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1411,11 +1331,9 @@
 
     sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v2, 0x5
+    const-string v1, "Unable to turn on flashlight"
 
-    const-string v3, "Unable to turn on flashlight"
-
-    invoke-virtual {v0, v3, v2, p1, v1}, Lcom/discord/app/AppLog;->c(Ljava/lang/String;ILjava/lang/Throwable;Ljava/util/Map;)V
+    invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :cond_1
     :goto_1
@@ -1441,7 +1359,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
@@ -1471,7 +1389,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1484,15 +1404,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/SeekBar;->setMax(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1510,7 +1421,7 @@
 
     const-string v2, "pureEvilEasterEggSubject.distinctUntilChanged()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion;->get(Lrx/Observable;)Lrx/Observable;
 
@@ -1556,7 +1467,7 @@
 
     const-string v3, "newFontScaleSubject\n    \u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder$bind$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder$bind$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder$bind$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder$bind$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
index 68154fbac6..dc2112e742 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder.smali
@@ -64,7 +64,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;
 
@@ -72,113 +72,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "nameTv"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNameTv()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "nameTv"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getNameTv()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "iconIv"
 
-    const/4 v3, 0x0
+    const-string v3, "getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "iconIv"
-
-    const-string v5, "getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "descriptionLabelTv"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDescriptionLabelTv()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "descriptionLabelTv"
-
-    const-string v5, "getDescriptionLabelTv()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "descriptionTv"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDescriptionTv()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "descriptionTv"
-
-    const-string v5, "getDescriptionTv()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "permissionsRv"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPermissionsRv()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "permissionsRv"
-
-    const-string v5, "getPermissionsRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "deauthorizeBtn"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeauthorizeBtn()Landroid/widget/ImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "deauthorizeBtn"
+    const/4 v2, 0x5
 
-    const-string v4, "getDeauthorizeBtn()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -199,17 +163,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "itemView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onDeauthorizeClick"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
     iput-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->onDeauthorizeClick:Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f0a064c
+    const p1, 0x7f0a0652
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +183,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a064b
+    const p1, 0x7f0a0651
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +191,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0649
+    const p1, 0x7f0a064f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +199,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->descriptionLabelTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a064a
+    const p1, 0x7f0a0650
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +207,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->descriptionTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a064d
+    const p1, 0x7f0a0653
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +215,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->permissionsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0648
+    const p1, 0x7f0a064e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -261,6 +227,8 @@
 
     sget-object p2, Lf/a/n/f;->d:Lf/a/n/f;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x1
 
     invoke-direct {p1, v0, p2, v1, v0}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -276,20 +244,6 @@
     invoke-virtual {p1, p2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onDeauthorizeClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getOnDeauthorizeClick$p(Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;)Lkotlin/jvm/functions/Function1;
@@ -425,38 +379,43 @@
 .method public bind(Lcom/discord/models/domain/ModelOAuth2Token;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelOAuth2Token;->getApplication()Lcom/discord/models/domain/ModelApplication;
 
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_0
-
-    sget-object v2, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getId()J
-
-    move-result-wide v3
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x4
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
-
     move-result-object v0
 
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_0
+
+    sget-object v1, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getId()J
+
+    move-result-wide v2
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x4
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_0
+
     :cond_0
-    move-object v3, v0
+    const/4 v1, 0x0
+
+    :goto_0
+    move-object v3, v1
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -482,19 +441,19 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->getNameTv()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->getDescriptionLabelTv()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getDescription()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getDescription()Ljava/lang/String;
 
     move-result-object v2
 
@@ -504,45 +463,45 @@
 
     if-eqz v2, :cond_2
 
-    invoke-static {v2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v2
 
     if-eqz v2, :cond_1
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     const/4 v2, 0x0
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
-    :goto_0
+    :goto_1
     const/4 v2, 0x1
 
-    :goto_1
+    :goto_2
     xor-int/2addr v2, v4
 
     if-eqz v2, :cond_3
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
     const/16 v3, 0x8
 
-    :goto_2
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+    :goto_3
+    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->getDescriptionTv()Landroid/widget/TextView;
 
-    move-result-object v0
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getDescription()Ljava/lang/String;
-
     move-result-object v1
 
-    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getDescription()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;->permissionsAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
@@ -563,13 +522,6 @@
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic bind(Ljava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$Companion.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$Companion.smali
index cad2ee29be..b9a8aca228 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
index 60c4107e8d..23a744d0a3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAuthorizedApps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelOAuth2Token;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelOAuth2Token;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "oath2Token"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1;
 
@@ -74,13 +76,4 @@
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;->deauthorizeApp(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "oath2Token"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
similarity index 84%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
index 06ce69d48e..1196bd0c54 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAuthorizedApps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -50,11 +50,13 @@
 .method public final invoke(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "layoutInflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d025c
 
@@ -68,7 +70,7 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1$1;
 
@@ -77,20 +79,6 @@
     invoke-direct {p2, p1, v0}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$AuthorizedAppViewHolder;-><init>(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "layoutInflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
index 9a04b2f62a..81fe576502 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAuthorizedApps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
index 35fd7a7094..f5fd9a5a3a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAuthorizedApps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -75,17 +75,19 @@
 
     move-result-object p1
 
-    iget-wide v1, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1;->$oauthId:J
+    iget-wide v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1;->$oauthId:J
 
-    invoke-virtual {p1, v1, v2}, Lcom/discord/utilities/rest/RestAPI;->deleteOAuthToken(J)Lrx/Observable;
+    invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/rest/RestAPI;->deleteOAuthToken(J)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
@@ -95,12 +97,14 @@
 
     move-result-object v4
 
-    const/4 v6, 0x0
-
     new-instance v7, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1;
 
     invoke-direct {v7, p0}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1;)V
 
+    const-string v5, "REST: deauthorize app"
+
+    const/4 v6, 0x0
+
     const/4 v8, 0x0
 
     const/4 v9, 0x0
@@ -109,16 +113,7 @@
 
     const/4 v11, 0x0
 
-    const-string v5, "REST: deauthorize app"
-
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
index 5817cca34e..4f954f145b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAuthorizedApps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "authedTokens"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$loadAuthorizedApps$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;
 
@@ -83,13 +85,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "authedTokens"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
index fa4c9a5cd8..857fc54a22 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
@@ -41,25 +41,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;
+    const-string v2, "recyclerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "recyclerView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -207,23 +201,23 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f12055b
+    const v1, 0x7f12055d
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f120569
+    const v1, 0x7f12056b
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1203b7
+    const v1, 0x7f1203b8
 
     const/4 v2, 0x0
 
@@ -237,7 +231,7 @@
 
     invoke-direct {v1, p0, p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;J)V
 
-    const p1, 0x7f12055a
+    const p1, 0x7f12055c
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -249,7 +243,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -267,7 +261,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -280,15 +276,6 @@
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
similarity index 77%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
index 6c6ea6902b..eec0ed86c1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
index 1a91662a27..9d79a2a18b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$1.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
index d98537058a..5caa06d71e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2.smali
@@ -63,7 +63,7 @@
 
     const-string v2, "isChecked"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
index 6ae082cd6d..da93f6e8da 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$2$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$2$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$2$1.smali
index 34272b730e..aa88364642 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior$onViewBound$2$1.smali
@@ -47,7 +47,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "https://discord.com/developers/docs/intro"
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
similarity index 81%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
index d53aedf29d..b091ff34f3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsBehavior.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
@@ -35,61 +35,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
+    const-string v2, "shiftSendCS"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getShiftSendCS()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "shiftSendCS"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getShiftSendCS()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
 
-    const/4 v2, 0x0
+    const-string v2, "devModeCS"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDevModeCS()Lcom/discord/views/CheckedSetting;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "devModeCS"
-
-    const-string v4, "getDevModeCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
+    const-string v2, "customTabsCS"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCustomTabsCS()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "customTabsCS"
-
-    const-string v4, "getCustomTabsCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -113,7 +95,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a088a
+    const v0, 0x7f0a0890
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +103,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->shiftSendCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0889
+    const v0, 0x7f0a088f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +111,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->devModeCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0888
+    const v0, 0x7f0a088e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,11 +207,11 @@
 
     invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120741
+    const p1, 0x7f120743
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -247,7 +229,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 10
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -289,27 +273,27 @@
 
     const-string v1, "context"
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f12058f
+    const/4 v1, 0x1
 
-    const/4 v3, 0x1
+    new-array v1, v1, [Ljava/lang/Object;
 
-    new-array v3, v3, [Ljava/lang/Object;
-
-    const-string v4, "https://discord.com/developers/docs/intro"
+    const-string v3, "https://discord.com/developers/docs/intro"
 
     const/4 v9, 0x0
 
-    aput-object v4, v3, v9
+    aput-object v3, v1, v9
 
-    invoke-virtual {p0, v1, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const v3, 0x7f120591
+
+    invoke-virtual {p0, v3, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
     const-string v1, "getString(R.string.devel\u2026mode_help_text, API_LINK)"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -356,13 +340,4 @@
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$Companion.smali
similarity index 86%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$Companion.smali
index ababd65557..1138b2d369 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$Companion.smali
@@ -77,22 +77,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1.smali
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder.smali
new file mode 100644
index 0000000000..5aeeca0bf2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder.smali
@@ -0,0 +1,349 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;
+.super Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;
+.source "WidgetSettingsDeveloper.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ExperimentViewHolder"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder<",
+        "Ljava/util/Map$Entry<",
+        "+",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field public final nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final spinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    const-string v2, "nameTv"
+
+    const-string v3, "getNameTv()Landroid/widget/TextView;"
+
+    const/4 v4, 0x0
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v2
+
+    aput-object v2, v1, v4
+
+    const-string v2, "spinner"
+
+    const-string v3, "getSpinner()Landroid/widget/Spinner;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v0
+
+    const/4 v2, 0x1
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/view/View;)V
+    .locals 3
+
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
+
+    const p1, 0x7f0a02cc
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a02cb
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->spinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    new-instance p1, Landroid/widget/ArrayAdapter;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/widget/Spinner;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-static {}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->access$getBUCKET_LIST$cp()Ljava/util/List;
+
+    move-result-object v1
+
+    const v2, 0x7f0d013c
+
+    invoke-direct {p1, v0, v2, v1}, Landroid/widget/ArrayAdapter;-><init>(Landroid/content/Context;ILjava/util/List;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Landroid/widget/Spinner;->setAdapter(Landroid/widget/SpinnerAdapter;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getSpinner$p(Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;)Landroid/widget/Spinner;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final getNameTv()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
+.method private final getSpinner()Landroid/widget/Spinner;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->spinner$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x1
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/Spinner;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public bridge synthetic bind(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/util/Map$Entry;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->bind(Ljava/util/Map$Entry;)V
+
+    return-void
+.end method
+
+.method public bind(Ljava/util/Map$Entry;)V
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map$Entry<",
+            "Ljava/lang/String;",
+            "Lcom/discord/stores/StoreExperiments$Experiment;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getNameTv()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getNameTv()Landroid/widget/TextView;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getRawExperiment()Lcom/discord/models/domain/ModelExperiment;
+
+    move-result-object v1
+
+    const/4 v9, 0x0
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelExperiment;->getType()Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_0
+    move-object v1, v9
+
+    :goto_0
+    if-nez v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v3
+
+    const v4, 0x36ebcb
+
+    if-eq v3, v4, :cond_3
+
+    const v4, 0x5e23bf3
+
+    if-eq v3, v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const-string v3, "guild"
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_4
+
+    const v1, 0x7f080271
+
+    const v3, 0x7f080271
+
+    goto :goto_2
+
+    :cond_3
+    const-string/jumbo v3, "user"
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_4
+
+    const v1, 0x7f08038c
+
+    const v3, 0x7f08038c
+
+    goto :goto_2
+
+    :cond_4
+    :goto_1
+    const v1, 0x7f080319
+
+    const v3, 0x7f080319
+
+    :goto_2
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0xe
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
+
+    move-result v2
+
+    invoke-static {v1, v2}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;->access$getBucketSelectionPosition(Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;I)I
+
+    move-result v1
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v9}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v1}, Landroid/widget/Spinner;->setSelection(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1;
+
+    invoke-direct {v3, p0, v1, v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;ILjava/lang/String;Lcom/discord/stores/StoreExperiments$Experiment;)V
+
+    invoke-virtual {v2, v3}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder.smali
similarity index 81%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder.smali
index 0c9d3c8f85..f85364f691 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder.smali
@@ -32,22 +32,15 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -80,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
@@ -106,7 +101,7 @@
 
     const-string v3, "itemView"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -116,7 +111,7 @@
 
     const-string v4, "itemView.context"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v1, v2}, Lcom/discord/utilities/time/TimeUtils;->toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence;
 
@@ -124,7 +119,7 @@
 
     iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Landroid/widget/TextView;
 
@@ -149,20 +144,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.widget.TextView"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -179,7 +165,7 @@
     :cond_0
     const-string v0, "noticeName"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -187,20 +173,13 @@
 .end method
 
 .method public final setNoticeName(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder;->noticeName:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1.smali
new file mode 100644
index 0000000000..31ad84fd5f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1.smali
@@ -0,0 +1,57 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;
+.super Ljava/lang/Object;
+.source "WidgetSettingsDeveloper.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupCrashes()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 1
+
+    new-instance p1, Ljava/lang/RuntimeException;
+
+    const-string v0, "This is a developer triggered crash."
+
+    invoke-direct {p1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2.smali
new file mode 100644
index 0000000000..5308970da5
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2.smali
@@ -0,0 +1,79 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2;
+.super Ljava/lang/Object;
+.source "WidgetSettingsDeveloper.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupCrashes()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 6
+
+    :try_start_0
+    new-instance p1, Ljava/lang/RuntimeException;
+
+    const-string v0, "This is a developer triggered crash (caught)."
+
+    invoke-direct {p1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    move-exception p1
+
+    move-object v2, p1
+
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    const-string v1, "setupCrashes"
+
+    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
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x4
+
+    const-string v2, "Done."
+
+    invoke-static {p1, v2, v0, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3.smali
new file mode 100644
index 0000000000..9efd9c07a8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3.smali
@@ -0,0 +1,64 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3;
+.super Ljava/lang/Object;
+.source "WidgetSettingsDeveloper.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupCrashes()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3;->this$0:Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 1
+
+    new-instance p1, Lcom/hammerandchisel/libdiscord/Discord;
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3;->this$0:Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-direct {p1, v0}, Lcom/hammerandchisel/libdiscord/Discord;-><init>(Landroid/content/Context;)V
+
+    invoke-virtual {p1}, Lcom/hammerandchisel/libdiscord/Discord;->crash()V
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "null cannot be cast to non-null type android.content.Context"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1$$special$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1$$special$$inlined$sortedBy$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1$$special$$inlined$sortedBy$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1$$special$$inlined$sortedBy$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1.smali
similarity index 86%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1.smali
index e1bf331e74..ab67337d75 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsDeveloper.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,20 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/util/Map$Entry<",
+        "+",
+        "Ljava/lang/String;",
+        "+",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -88,7 +100,7 @@
 
     const-string v0, "nameToExp"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -128,7 +140,7 @@
 
     invoke-direct {p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1$$special$$inlined$sortedBy$1;-><init>()V
 
-    invoke-static {v0, p1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v0, p1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2.smali
index 8a6a6db548..d529179e85 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsDeveloper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     const-string v1, "nameSortedExperiments"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1.smali
similarity index 85%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1.smali
index 236ccb1de8..63d784ada5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsDeveloper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -60,11 +60,13 @@
 .method public final invoke(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "layoutInflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0106
 
@@ -78,25 +80,11 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "layoutInflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1$1.smali
index 8846bf8af0..398bb0a28a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1$1.smali
@@ -48,7 +48,9 @@
 .method public onSwiped(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
     .locals 0
 
-    if-eqz p1, :cond_1
+    const-string/jumbo p2, "viewHolder"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of p2, p1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder;
 
@@ -72,13 +74,4 @@
     invoke-virtual {p2, p1}, Lcom/discord/stores/StoreNotices;->clearSeen(Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "viewHolder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1.smali
similarity index 85%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1.smali
index befdf3b907..2ce2ebb14d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsDeveloper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/recyclerview/widget/ItemTouchHelper;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,7 @@
 
 # virtual methods
 .method public final invoke()Landroidx/recyclerview/widget/ItemTouchHelper;
-    .locals 5
+    .locals 4
 
     new-instance v0, Lcom/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration;
 
@@ -64,26 +64,18 @@
 
     move-result-object v2
 
-    const v3, 0x7f08029c
+    const v3, 0x7f08029d
 
     invoke-static {v2, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+    const/16 v3, 0x8
 
-    invoke-virtual {v3}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v3
-
-    const v4, 0x7f0701ed
-
-    invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getDimension(I)F
+    invoke-static {v3}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
     move-result v3
 
-    float-to-int v3, v3
-
     invoke-direct {v0, v1, v2, v3}, Lcom/discord/utilities/views/SwipeableItemTouchHelper$SwipeRevealConfiguration;-><init>(ILandroid/graphics/drawable/Drawable;I)V
 
     new-instance v1, Landroidx/recyclerview/widget/ItemTouchHelper;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2.smali
index 098d96a789..85301665dc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsDeveloper.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,19 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/HashMap<",
+        "Ljava/lang/String;",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/String;",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -88,19 +99,23 @@
 
     const-string v0, "noticesSeenMap"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->toSortedMap(Ljava/util/Map;)Ljava/util/SortedMap;
 
     move-result-object p1
 
+    const-string v0, "$this$toList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p1}, Ljava/util/Map;->size()I
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     goto :goto_0
 
@@ -119,7 +134,7 @@
 
     if-nez v1, :cond_1
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3.smali
index e3584964e9..7b9364be6b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsDeveloper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -82,7 +82,7 @@
 
     const-string v1, "noticesSeenMap"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.smali
similarity index 84%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.smali
index 06b294e577..972668d01f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsDeveloper.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -60,11 +60,13 @@
 .method public final invoke(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "layoutInflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0064
 
@@ -78,25 +80,11 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "layoutInflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
new file mode 100644
index 0000000000..471c5b0e5f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
@@ -0,0 +1,596 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsDeveloper.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder;,
+        Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;,
+        Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final BUCKET_LIST:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final CLEAR_BUCKET_OVERRIDE:I = 0xa
+
+.field public static final Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
+
+.field public static final UNSET_BUCKET_OVERRIDE:I = 0x9
+
+
+# instance fields
+.field public final crashDiscordJniBridge$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final crashDiscordNonfatal$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final crashKotlin$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final experimentsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final noticesRv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x5
+
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    const-string v2, "experimentsRv"
+
+    const-string v3, "getExperimentsRv()Landroidx/recyclerview/widget/RecyclerView;"
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    aput-object v1, v0, v4
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    const-string v2, "noticesRv"
+
+    const-string v3, "getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    const-string v2, "crashKotlin"
+
+    const-string v3, "getCrashKotlin()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x2
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    const-string v2, "crashDiscordJniBridge"
+
+    const-string v3, "getCrashDiscordJniBridge()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x3
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    const-string v2, "crashDiscordNonfatal"
+
+    const-string v3, "getCrashDiscordNonfatal()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x4
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
+
+    new-instance v0, Lkotlin/ranges/IntRange;
+
+    const/16 v1, 0xa
+
+    invoke-direct {v0, v4, v1}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v3
+
+    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    move-object v3, v0
+
+    check-cast v3, Lk0/j/q;
+
+    invoke-virtual {v3}, Lk0/j/q;->nextInt()I
+
+    move-result v3
+
+    const/16 v4, 0x9
+
+    if-eq v3, v4, :cond_1
+
+    if-eq v3, v1, :cond_0
+
+    invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    goto :goto_1
+
+    :cond_0
+    const-string v3, "Reset"
+
+    goto :goto_1
+
+    :cond_1
+    const-string v3, "Unset"
+
+    :goto_1
+    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    sput-object v2, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->BUCKET_LIST:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    const v0, 0x7f0a02d0
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->experimentsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a02d1
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->noticesRv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a02cf
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->crashKotlin$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a02cd
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->crashDiscordJniBridge$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a02ce
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->crashDiscordNonfatal$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getBUCKET_LIST$cp()Ljava/util/List;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->BUCKET_LIST:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method private final getCrashDiscordJniBridge()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->crashDiscordJniBridge$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x3
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getCrashDiscordNonfatal()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->crashDiscordNonfatal$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x4
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getCrashKotlin()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->crashKotlin$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x2
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getExperimentsRv()Landroidx/recyclerview/widget/RecyclerView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->experimentsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
+
+    return-object v0
+.end method
+
+.method private final getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->noticesRv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x1
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
+
+    return-object v0
+.end method
+
+.method public static final launch(Landroid/content/Context;)V
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
+
+    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;->launch(Landroid/content/Context;)V
+
+    return-void
+.end method
+
+.method private final setupCrashes()V
+    .locals 2
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getCrashKotlin()Landroid/view/View;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$1;
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getCrashDiscordNonfatal()Landroid/view/View;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$2;-><init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper;)V
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getCrashDiscordJniBridge()Landroid/view/View;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupCrashes$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper;)V
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method private final setupExperimentSection()V
+    .locals 13
+
+    new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    invoke-direct {v0, v2, v1, v3, v2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getExperimentsRv()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreExperiments;->getNameToExperimentMap$app_productionDiscordExternalRelease()Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v3, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1;
+
+    invoke-virtual {v1, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v3, "StoreStream\n        .get\u2026e, _) -> name }\n        }"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x2
+
+    invoke-static {v1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-class v5, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    new-instance v10, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2;
+
+    invoke-direct {v10, v0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2;-><init>(Lcom/discord/utilities/views/SimpleRecyclerAdapter;)V
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v11, 0x1e
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final setupNoticesSection()V
+    .locals 13
+
+    new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    invoke-direct {v0, v2, v1, v3, v2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper;)V
+
+    invoke-virtual {v1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;->invoke()Landroidx/recyclerview/widget/ItemTouchHelper;
+
+    move-result-object v1
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Landroidx/recyclerview/widget/ItemTouchHelper;->attachToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices;->observeNoticesSeen()Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v3, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2;
+
+    invoke-virtual {v1, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v3, "StoreStream\n        .get\u2026      .toList()\n        }"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v1
+
+    const/4 v3, 0x2
+
+    invoke-static {v1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-class v5, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    new-instance v10, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3;
+
+    invoke-direct {v10, v0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3;-><init>(Lcom/discord/utilities/views/SimpleRecyclerAdapter;)V
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v11, 0x1e
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d0263
+
+    return v0
+.end method
+
+.method public onViewBound(Landroid/view/View;)V
+    .locals 1
+
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+
+    const/4 p1, 0x1
+
+    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled(Z)Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f120592
+
+    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupCrashes()V
+
+    return-void
+.end method
+
+.method public onViewBoundOrOnResume()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupExperimentSection()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupNoticesSection()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion$get$1.smali
similarity index 80%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion$get$1.smali
index d99156860a..16f00c278c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsGameActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Lcom/discord/stores/StoreRunningGame$RunningGame;",
         "Ljava/lang/Boolean;",
@@ -47,45 +47,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x3
+    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x3
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/stores/StoreRunningGame$RunningGame;ZZ)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/stores/StoreRunningGame$RunningGame;ZZ)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/stores/StoreRunningGame$RunningGame;ZZ)Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;
     .locals 1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
index 80a1720f28..b41ea000cc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion.smali
@@ -46,7 +46,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -66,9 +68,9 @@
 
     move-result-object p1
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -99,7 +101,7 @@
 
     const-string v0, "Observable\n             \u2026::Model\n                )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -111,16 +113,7 @@
 
     const-string v0, "Observable\n             \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model.smali
similarity index 99%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model.smali
index faab7b3307..a5c75be762 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model.smali
@@ -143,7 +143,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;->runningGame:Lcom/discord/stores/StoreRunningGame$RunningGame;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion.smali
similarity index 80%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion.smali
index 23c2eb959a..395a8ba2d2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$Companion.smali
@@ -42,22 +42,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1.smali
index c338d6a90b..1046f985d1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGameActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,9 +59,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;
 
@@ -70,13 +72,4 @@
     invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->access$openUsageSettings(Lcom/discord/widgets/settings/WidgetSettingsGameActivity;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
index cb391eddfd..b86572180f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
@@ -59,7 +59,7 @@
 
     move-object/from16 v2, p1
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -77,11 +77,11 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v4, 0x7f1216a7
+    const v4, 0x7f1216d1
 
     invoke-virtual {v1, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -89,7 +89,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v5, 0x7f1207fb
+    const v5, 0x7f1207fd
 
     invoke-virtual {v1, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -97,11 +97,11 @@
 
     const-string v1, "getString(R.string.game_\u2026ction_modal_info_android)"
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v6, 0x7f1207fc
+    const v6, 0x7f1207fe
 
     invoke-virtual {v1, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -109,7 +109,7 @@
 
     const/4 v7, 0x0
 
-    const v1, 0x7f0a062c
+    const v1, 0x7f0a0632
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
index efcf4c9264..0136223bd7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGameActivity.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsGameActivity;Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$sam$rx_functions_Func3$0.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$sam$rx_functions_Func3$0.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity$sam$rx_functions_Func3$0.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$sam$rx_functions_Func3$0.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
similarity index 83%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
index d922b3112d..737a9dfad1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
@@ -41,141 +41,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+    const-string v2, "statusCS"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusCS()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "statusCS"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getStatusCS()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const/4 v2, 0x0
+    const-string v2, "trackCS"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTrackCS()Lcom/discord/views/CheckedSetting;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "trackCS"
-
-    const-string v4, "getTrackCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+    const-string v2, "playingTitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlayingTitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "playingTitle"
-
-    const-string v4, "getPlayingTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+    const-string v2, "playingSubtitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlayingSubtitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "playingSubtitle"
-
-    const-string v4, "getPlayingSubtitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+    const-string v2, "playingContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlayingContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "playingContainer"
-
-    const-string v4, "getPlayingContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+    const-string v2, "playingIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlayingIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "playingIcon"
-
-    const-string v4, "getPlayingIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
+    const-string v2, "detectionSection"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDetectionSection()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "detectionSection"
-
-    const-string v4, "getDetectionSection()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -199,7 +157,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a08ab
+    const v0, 0x7f0a08b1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -207,7 +165,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->statusCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08ac
+    const v0, 0x7f0a08b2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -215,7 +173,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->trackCS$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08aa
+    const v0, 0x7f0a08b0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -223,7 +181,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a9
+    const v0, 0x7f0a08af
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -231,7 +189,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingSubtitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a7
+    const v0, 0x7f0a08ad
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -239,7 +197,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a8
+    const v0, 0x7f0a08ae
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -247,7 +205,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->playingIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08a6
+    const v0, 0x7f0a08ac
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -319,7 +277,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121472
+    const v1, 0x7f12149c
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -352,7 +310,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12146e
+    const v1, 0x7f121498
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -360,7 +318,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121470
+    const v1, 0x7f12149a
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -643,7 +601,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121129
+    const v1, 0x7f121154
 
     const/4 v2, 0x1
 
@@ -651,7 +609,7 @@
 
     const/16 v4, 0x8
 
-    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_1
     return-void
@@ -708,7 +666,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$Companion$Model$Companion;->get(Landroid/content/Context;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguage.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
index 0d92f7ba98..faa3ec73be 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguage.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
@@ -78,7 +78,7 @@
     goto/16 :goto_0
 
     :sswitch_0
-    const-string v0, "zh-TW"
+    const-string/jumbo v0, "zh-TW"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -91,7 +91,7 @@
     goto/16 :goto_1
 
     :sswitch_1
-    const-string v0, "zh-CN"
+    const-string/jumbo v0, "zh-CN"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -169,7 +169,7 @@
     goto/16 :goto_1
 
     :sswitch_7
-    const-string v0, "vi"
+    const-string/jumbo v0, "vi"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -467,7 +467,7 @@
     return-object p0
 
     :pswitch_1
-    const-string p0, "\u0e44\u0e17\u0e22"
+    const-string/jumbo p0, "\u0e44\u0e17\u0e22"
 
     return-object p0
 
@@ -477,7 +477,7 @@
     return-object p0
 
     :pswitch_3
-    const-string p0, "\u4e2d\u6587"
+    const-string/jumbo p0, "\u4e2d\u6587"
 
     return-object p0
 
@@ -497,7 +497,7 @@
     return-object p0
 
     :pswitch_7
-    const-string p0, "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"
+    const-string/jumbo p0, "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"
 
     return-object p0
 
@@ -517,37 +517,37 @@
     return-object p0
 
     :pswitch_b
-    const-string p0, "\ud55c\uad6d\uc5b4"
+    const-string/jumbo p0, "\ud55c\uad6d\uc5b4"
 
     return-object p0
 
     :pswitch_c
-    const-string p0, "\u7e41\u9ad4\u4e2d\u6587"
+    const-string/jumbo p0, "\u7e41\u9ad4\u4e2d\u6587"
 
     return-object p0
 
     :pswitch_d
-    const-string p0, "\u65e5\u672c\u8a9e"
+    const-string/jumbo p0, "\u65e5\u672c\u8a9e"
 
     return-object p0
 
     :pswitch_e
-    const-string p0, "\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0438\u0439"
+    const-string/jumbo p0, "\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0438\u0439"
 
     return-object p0
 
     :pswitch_f
-    const-string p0, "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"
+    const-string/jumbo p0, "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"
 
     return-object p0
 
     :pswitch_10
-    const-string p0, "\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"
+    const-string/jumbo p0, "\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"
 
     return-object p0
 
     :pswitch_11
-    const-string p0, "\u010ce\u0161tina"
+    const-string/jumbo p0, "\u010ce\u0161tina"
 
     return-object p0
 
@@ -606,6 +606,8 @@
 
     return-object p0
 
+    nop
+
     :sswitch_data_0
     .sparse-switch
         0xc45 -> :sswitch_1c
@@ -687,7 +689,7 @@
     goto/16 :goto_0
 
     :sswitch_0
-    const-string v0, "zh-TW"
+    const-string/jumbo v0, "zh-TW"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -700,7 +702,7 @@
     goto/16 :goto_1
 
     :sswitch_1
-    const-string v0, "zh-CN"
+    const-string/jumbo v0, "zh-CN"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -778,7 +780,7 @@
     goto/16 :goto_1
 
     :sswitch_7
-    const-string v0, "vi"
+    const-string/jumbo v0, "vi"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1071,151 +1073,149 @@
     packed-switch p0, :pswitch_data_0
 
     :pswitch_0
-    const p0, 0x7f08044b
-
-    return p0
-
-    :pswitch_1
-    const p0, 0x7f080452
-
-    return p0
-
-    :pswitch_2
-    const p0, 0x7f080460
-
-    return p0
-
-    :pswitch_3
-    const p0, 0x7f080464
-
-    return p0
-
-    :pswitch_4
-    const p0, 0x7f080465
-
-    return p0
-
-    :pswitch_5
-    const p0, 0x7f08045c
-
-    return p0
-
-    :pswitch_6
-    const p0, 0x7f080453
-
-    return p0
-
-    :pswitch_7
-    const p0, 0x7f080457
-
-    return p0
-
-    :pswitch_8
-    const p0, 0x7f080449
-
-    return p0
-
-    :pswitch_9
-    const p0, 0x7f080459
-
-    return p0
-
-    :pswitch_a
     const p0, 0x7f08044e
 
     return p0
 
-    :pswitch_b
-    const p0, 0x7f080456
-
-    return p0
-
-    :pswitch_c
-    const p0, 0x7f080466
-
-    return p0
-
-    :pswitch_d
+    :pswitch_1
     const p0, 0x7f080455
 
     return p0
 
-    :pswitch_e
-    const p0, 0x7f080462
+    :pswitch_2
+    const p0, 0x7f080463
 
     return p0
 
-    :pswitch_f
-    const p0, 0x7f08045d
+    :pswitch_3
+    const p0, 0x7f080467
 
     return p0
 
-    :pswitch_10
-    const p0, 0x7f080445
+    :pswitch_4
+    const p0, 0x7f080468
 
     return p0
 
-    :pswitch_11
-    const p0, 0x7f080446
-
-    return p0
-
-    :pswitch_12
-    const p0, 0x7f080461
-
-    return p0
-
-    :pswitch_13
+    :pswitch_5
     const p0, 0x7f08045f
 
     return p0
 
-    :pswitch_14
-    const p0, 0x7f08045b
+    :pswitch_6
+    const p0, 0x7f080456
 
     return p0
 
-    :pswitch_15
+    :pswitch_7
     const p0, 0x7f08045a
 
     return p0
 
-    :pswitch_16
-    const p0, 0x7f080458
-
-    return p0
-
-    :pswitch_17
-    const p0, 0x7f080454
-
-    return p0
-
-    :pswitch_18
-    const p0, 0x7f08044f
-
-    return p0
-
-    :pswitch_19
+    :pswitch_8
     const p0, 0x7f08044c
 
     return p0
 
-    :pswitch_1a
-    const p0, 0x7f08044a
+    :pswitch_9
+    const p0, 0x7f08045c
 
     return p0
 
-    :pswitch_1b
+    :pswitch_a
+    const p0, 0x7f080451
+
+    return p0
+
+    :pswitch_b
+    const p0, 0x7f080459
+
+    return p0
+
+    :pswitch_c
+    const p0, 0x7f080469
+
+    return p0
+
+    :pswitch_d
+    const p0, 0x7f080458
+
+    return p0
+
+    :pswitch_e
+    const p0, 0x7f080465
+
+    return p0
+
+    :pswitch_f
+    const p0, 0x7f080460
+
+    return p0
+
+    :pswitch_10
     const p0, 0x7f080448
 
     return p0
 
-    :pswitch_1c
-    const p0, 0x7f080447
+    :pswitch_11
+    const p0, 0x7f080449
 
     return p0
 
-    nop
+    :pswitch_12
+    const p0, 0x7f080464
+
+    return p0
+
+    :pswitch_13
+    const p0, 0x7f080462
+
+    return p0
+
+    :pswitch_14
+    const p0, 0x7f08045e
+
+    return p0
+
+    :pswitch_15
+    const p0, 0x7f08045d
+
+    return p0
+
+    :pswitch_16
+    const p0, 0x7f08045b
+
+    return p0
+
+    :pswitch_17
+    const p0, 0x7f080457
+
+    return p0
+
+    :pswitch_18
+    const p0, 0x7f080452
+
+    return p0
+
+    :pswitch_19
+    const p0, 0x7f08044f
+
+    return p0
+
+    :pswitch_1a
+    const p0, 0x7f08044d
+
+    return p0
+
+    :pswitch_1b
+    const p0, 0x7f08044b
+
+    return p0
+
+    :pswitch_1c
+    const p0, 0x7f08044a
+
+    return p0
 
     :sswitch_data_0
     .sparse-switch
@@ -1298,7 +1298,7 @@
     goto/16 :goto_0
 
     :sswitch_0
-    const-string v0, "zh-TW"
+    const-string/jumbo v0, "zh-TW"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1311,7 +1311,7 @@
     goto/16 :goto_1
 
     :sswitch_1
-    const-string v0, "zh-CN"
+    const-string/jumbo v0, "zh-CN"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1389,7 +1389,7 @@
     goto/16 :goto_1
 
     :sswitch_7
-    const-string v0, "vi"
+    const-string/jumbo v0, "vi"
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1682,82 +1682,82 @@
     packed-switch p0, :pswitch_data_0
 
     :pswitch_0
-    const p0, 0x7f12061e
+    const p0, 0x7f120620
 
     return p0
 
     :pswitch_1
-    const p0, 0x7f1215b4
+    const p0, 0x7f1215de
 
     return p0
 
     :pswitch_2
-    const p0, 0x7f121797
+    const p0, 0x7f1217c1
 
     return p0
 
     :pswitch_3
-    const p0, 0x7f121845
+    const p0, 0x7f121871
 
     return p0
 
     :pswitch_4
-    const p0, 0x7f121361
+    const p0, 0x7f12138b
 
     return p0
 
     :pswitch_5
-    const p0, 0x7f120be6
+    const p0, 0x7f120c0c
 
     return p0
 
     :pswitch_6
-    const p0, 0x7f120e65
+    const p0, 0x7f120e8b
 
     return p0
 
     :pswitch_7
-    const p0, 0x7f1205e7
+    const p0, 0x7f1205e9
 
     return p0
 
     :pswitch_8
-    const p0, 0x7f120f75
+    const p0, 0x7f120f9f
 
     return p0
 
     :pswitch_9
-    const p0, 0x7f1206a0
+    const p0, 0x7f1206a2
 
     return p0
 
     :pswitch_a
-    const p0, 0x7f120be5
+    const p0, 0x7f120c0b
 
     return p0
 
     :pswitch_b
-    const p0, 0x7f120df4
+    const p0, 0x7f120e1a
 
     return p0
 
     :pswitch_c
-    const p0, 0x7f121846
+    const p0, 0x7f121872
 
     return p0
 
     :pswitch_d
-    const p0, 0x7f120d88
+    const p0, 0x7f120dae
 
     return p0
 
     :pswitch_e
-    const p0, 0x7f12164a
+    const p0, 0x7f121674
 
     return p0
 
     :pswitch_f
-    const p0, 0x7f12137a
+    const p0, 0x7f1213a4
 
     return p0
 
@@ -1767,67 +1767,65 @@
     return p0
 
     :pswitch_11
-    const p0, 0x7f120523
+    const p0, 0x7f120525
 
     return p0
 
     :pswitch_12
-    const p0, 0x7f121601
+    const p0, 0x7f12162b
 
     return p0
 
     :pswitch_13
-    const p0, 0x7f121545
+    const p0, 0x7f12156f
 
     return p0
 
     :pswitch_14
-    const p0, 0x7f1212bb
+    const p0, 0x7f1212e6
 
     return p0
 
     :pswitch_15
-    const p0, 0x7f121141
+    const p0, 0x7f12116c
 
     return p0
 
     :pswitch_16
-    const p0, 0x7f120f74
+    const p0, 0x7f120f9e
 
     return p0
 
     :pswitch_17
-    const p0, 0x7f120d86
+    const p0, 0x7f120dac
 
     return p0
 
     :pswitch_18
-    const p0, 0x7f1207a1
+    const p0, 0x7f1207a3
 
     return p0
 
     :pswitch_19
-    const p0, 0x7f120651
+    const p0, 0x7f120653
 
     return p0
 
     :pswitch_1a
-    const p0, 0x7f12061d
+    const p0, 0x7f12061f
 
     return p0
 
     :pswitch_1b
-    const p0, 0x7f120557
+    const p0, 0x7f120559
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f120538
+    const p0, 0x7f12053a
 
     return p0
 
-    nop
-
     :sswitch_data_0
     .sparse-switch
         0xc45 -> :sswitch_1c
@@ -1904,7 +1902,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p0, v0, v1, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p0, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
 .end method
@@ -1970,17 +1968,17 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f121700
+    const v0, 0x7f12172a
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v0, 0x7f120df7
+    const v0, 0x7f120e1d
 
     invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f0a08bd
+    const v0, 0x7f0a08c3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1988,7 +1986,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->language:Landroid/view/View;
 
-    const v0, 0x7f0a08bf
+    const v0, 0x7f0a08c5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1998,7 +1996,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->languageText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a08be
+    const v0, 0x7f0a08c4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2008,7 +2006,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->languageFlag:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a08c3
+    const v0, 0x7f0a08c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2034,7 +2032,7 @@
 
     move-result-object v1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -2048,7 +2046,7 @@
 
     const-class v3, Lcom/discord/widgets/settings/WidgetSettingsLanguage;
 
-    invoke-static {v2, v3}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v2, v3}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
similarity index 84%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
index 34cfed810f..947b1942d4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale.smali
@@ -35,7 +35,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;
 
@@ -43,41 +43,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "name"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "name"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getName()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "nameLocalized"
 
-    const/4 v3, 0x0
+    const-string v3, "getNameLocalized()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "nameLocalized"
+    const/4 v2, 0x1
 
-    const-string v4, "getNameLocalized()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -85,17 +73,19 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a08c0
+    const p1, 0x7f0a08c6
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -103,7 +93,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a08c1
+    const p1, 0x7f0a08c7
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -122,15 +112,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getName()Landroid/widget/TextView;
@@ -178,7 +159,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;)V
     .locals 8
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -247,15 +230,6 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
similarity index 86%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
index ae22f139df..f47482d644 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter.smali
@@ -36,31 +36,19 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recycler"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dialog"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     iput-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter;->dialog:Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;
 
     return-void
-
-    :cond_0
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getDialog$p(Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter;)Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;
@@ -86,7 +74,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;
 
@@ -95,13 +85,4 @@
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale;-><init>(ILcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Adapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
index 0ef9b5f594..efc308901d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Companion.smali
@@ -84,7 +84,9 @@
 .method public final show(Landroidx/fragment/app/Fragment;I)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;
 
@@ -108,7 +110,7 @@
 
     const-string p2, "fragment.parentFragmentManager"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;
 
@@ -119,13 +121,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
similarity index 91%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
index cecf861a23..f4a369bf27 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "locale"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;->locale:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;
@@ -73,22 +66,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "locale"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "locale"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -106,7 +92,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect$Model$Item;->locale:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
index 20971cdcef..81fb962aba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect$Model.smali
@@ -92,7 +92,7 @@
 
     const-string v16, "sv-SE"
 
-    const-string v17, "vi"
+    const-string/jumbo v17, "vi"
 
     const-string v18, "tr"
 
@@ -108,11 +108,11 @@
 
     const-string v24, "ja"
 
-    const-string v25, "zh-TW"
+    const-string/jumbo v25, "zh-TW"
 
     const-string v26, "th"
 
-    const-string v27, "zh-CN"
+    const-string/jumbo v27, "zh-CN"
 
     const-string v28, "ko"
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
index 575e4ec33e..ecb36e5a18 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;
+    const-string v2, "list"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "list"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getList()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsLanguageSelect;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -77,7 +71,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a08c2
+    const v0, 0x7f0a08c8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -238,7 +232,7 @@
     :cond_0
     const-string v0, "adapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
similarity index 77%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
index 3b5cb4de6b..925534ca6f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
index d575448894..86840d628d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1.smali
@@ -63,7 +63,7 @@
 
     const-string v2, "checked"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
index d9a1b84312..ecaf250e1c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1.smali
@@ -63,7 +63,7 @@
 
     const-string v2, "checked"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
index 7108204f6e..333837b347 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2.smali
@@ -63,7 +63,7 @@
 
     const-string v2, "checked"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
index 1be61e5e20..bdbff47a96 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.smali
@@ -63,7 +63,7 @@
 
     const-string v2, "checked"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
index 7b1972e8ba..25eb765ab8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4.smali
@@ -57,7 +57,7 @@
 
     const-string v1, "checked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
similarity index 91%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
index 2b786aa1f8..dcab96e1c6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsMedia.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
new file mode 100644
index 0000000000..f0d7261681
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
@@ -0,0 +1,583 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsMedia;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsMedia.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final Companion:Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
+
+
+# instance fields
+.field public final allowAnimatedEmojiCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final attachmentsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final embedsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final linksCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final syncCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public userSettings:Lcom/discord/stores/StoreUserSettings;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x5
+
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    const-string v2, "attachmentsCS"
+
+    const-string v3, "getAttachmentsCS()Lcom/discord/views/CheckedSetting;"
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    aput-object v1, v0, v4
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    const-string v2, "embedsCS"
+
+    const-string v3, "getEmbedsCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    const-string v2, "linksCS"
+
+    const-string v3, "getLinksCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x2
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    const-string v2, "syncCS"
+
+    const-string v3, "getSyncCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x3
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    const-string v2, "allowAnimatedEmojiCS"
+
+    const-string v3, "getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x4
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->Companion:Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    const v0, 0x7f0a08f0
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->attachmentsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08f1
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->embedsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08f2
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->linksCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08f3
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->syncCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08ef
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->allowAnimatedEmojiCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getAllowAnimatedEmojiCS$p(Lcom/discord/widgets/settings/WidgetSettingsMedia;)Lcom/discord/views/CheckedSetting;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getUserSettings$p(Lcom/discord/widgets/settings/WidgetSettingsMedia;)Lcom/discord/stores/StoreUserSettings;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    if-eqz p0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const-string/jumbo p0, "userSettings"
+
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static final synthetic access$setUserSettings$p(Lcom/discord/widgets/settings/WidgetSettingsMedia;Lcom/discord/stores/StoreUserSettings;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    return-void
+.end method
+
+.method private final getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->allowAnimatedEmojiCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x4
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getAttachmentsCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->attachmentsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getEmbedsCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->embedsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x1
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getLinksCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->linksCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x2
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getSyncCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->syncCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x3
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method public static final launch(Landroid/content/Context;)V
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->Companion:Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
+
+    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;->launch(Landroid/content/Context;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d0272
+
+    return v0
+.end method
+
+.method public onActivityCreated(Landroid/os/Bundle;)V
+    .locals 2
+
+    invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
+
+    const p1, 0x7f12172a
+
+    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
+
+    const p1, 0x7f1215d7
+
+    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+
+    const/4 p1, 0x0
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    return-void
+.end method
+
+.method public onViewBound(Landroid/view/View;)V
+    .locals 13
+
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAttachmentsCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    const-string/jumbo v1, "userSettings"
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getShowAttachmentMediaInline()Z
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAttachmentsCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    const v0, 0x7f120ca2
+
+    invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v3, "getString(R.string.inline_attachment_media_help)"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    new-array v4, v3, [Ljava/lang/Object;
+
+    const-string v5, "8"
+
+    const/4 v6, 0x0
+
+    aput-object v5, v4, v6
+
+    invoke-static {v4, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-static {v0, v3}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v3, "java.lang.String.format(format, *args)"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x2
+
+    invoke-static {p1, v0, v6, v3}, Lcom/discord/views/CheckedSetting;->i(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;ZI)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAttachmentsCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getEmbedsCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getInlineEmbedMedia()Z
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getEmbedsCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getLinksCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getRenderEmbeds()Z
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getLinksCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getSyncCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getSyncTextAndImages()Z
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getSyncCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreUserSettings;->getAllowAnimatedEmojisObservable()Lrx/Observable;
+
+    move-result-object p1
+
+    const-string/jumbo v0, "userSettings\n        .al\u2026wAnimatedEmojisObservable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-class v5, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    new-instance v10, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
+
+    const/16 v11, 0x1e
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    return-void
+
+    :cond_0
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_1
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_2
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_3
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_4
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
index 417a9526d5..17977e8f94 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
index 8952aed77c..6a69cfc79f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$1.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
index 89daf7836d..838b709eff 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$2.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
index 6d7ab82c31..02e2dbda5e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$3.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
index 665c4d8f19..64436a9594 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$4.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
index c881459401..25814a6c4d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBound$1$5.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
index d76440977f..5b51315c85 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsNotifications.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
similarity index 81%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
index e4c717379e..f50fe8029b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
@@ -41,121 +41,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+    const-string v2, "enabledToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEnabledToggle()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "enabledToggle"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEnabledToggle()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
 
-    const/4 v2, 0x0
+    const-string v2, "enabledInAppToggle"
 
-    aput-object v1, v0, v2
+    const-string v3, "getEnabledInAppToggle()Lcom/discord/views/CheckedSetting;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "enabledInAppToggle"
-
-    const-string v4, "getEnabledInAppToggle()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+    const-string v2, "blinkToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBlinkToggle()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "blinkToggle"
-
-    const-string v4, "getBlinkToggle()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+    const-string/jumbo v2, "vibrateToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVibrateToggle()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "vibrateToggle"
-
-    const-string v4, "getVibrateToggle()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+    const-string v2, "soundsToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSoundsToggle()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "soundsToggle"
-
-    const-string v4, "getSoundsToggle()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+    const-string v2, "settingsWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSettingsWrap()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "settingsWrap"
-
-    const-string v4, "getSettingsWrap()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -179,7 +143,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a08ce
+    const v0, 0x7f0a08d4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -187,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->enabledToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08bb
+    const v0, 0x7f0a08c1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -195,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->enabledInAppToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08cd
+    const v0, 0x7f0a08d3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -203,7 +167,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->blinkToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08d0
+    const v0, 0x7f0a08d6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->vibrateToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08cf
+    const v0, 0x7f0a08d5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->soundsToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08d1
+    const v0, 0x7f0a08d7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -441,25 +405,27 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121004
+    const p1, 0x7f12102e
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
+
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->notificationStore:Lcom/discord/stores/StoreNotifications;
 
@@ -514,13 +480,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -562,7 +521,15 @@
 
     and-int/lit8 v1, v1, 0x20
 
-    new-instance v8, Lf/a/b/a0;
+    const-string v1, "onNext"
+
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "errorClass"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lf/a/b/c0;
 
     move-object v1, v8
 
@@ -572,7 +539,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
index 1ca7b47ea6..82c47a5404 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
 
@@ -47,13 +49,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
index 0de4d579e5..f55cb9ef3e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsNotificationsOs.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
index 1d5c0b7008..644a47748a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$1.smali
@@ -67,7 +67,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
index 5c5e481f2b..c40c9ef8d5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$2.smali
@@ -67,7 +67,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onViewCreated$3.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
similarity index 83%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
index 966d9bc47a..9df25d8e97 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs.smali
@@ -37,61 +37,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
+    const-string v2, "notificationsSwitch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationsSwitch()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "notificationsSwitch"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getNotificationsSwitch()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
 
-    const/4 v2, 0x0
+    const-string v2, "notificationsInAppSwitch"
 
-    aput-object v1, v0, v2
+    const-string v3, "getNotificationsInAppSwitch()Lcom/discord/views/CheckedSetting;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "notificationsInAppSwitch"
-
-    const-string v4, "getNotificationsInAppSwitch()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;
+    const-string v2, "notificationSettings"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNotificationSettings()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "notificationSettings"
-
-    const-string v4, "getNotificationSettings()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -115,7 +97,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a08cb
+    const v0, 0x7f0a08d1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -123,7 +105,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;->notificationsSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08bb
+    const v0, 0x7f0a08c1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -131,7 +113,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs;->notificationsInAppSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08c9
+    const v0, 0x7f0a08cf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -281,7 +263,15 @@
 
     and-int/lit8 v1, v1, 0x20
 
-    new-instance v8, Lf/a/b/a0;
+    const-string v1, "onNext"
+
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "errorClass"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lf/a/b/c0;
 
     move-object v1, v8
 
@@ -291,7 +281,7 @@
 
     move-object v6, v7
 
-    invoke-direct/range {v1 .. v7}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {v0, v8}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -299,9 +289,11 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -332,13 +324,4 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
similarity index 77%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
index 314f5d24bc..44f6a63d93 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
index 3984b7dd4d..0fa99641d7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$LocalState.smali
@@ -26,9 +26,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "me"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +43,6 @@
     iput-object p4, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;->friendSourceFlags:Lcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;
 
     return-void
-
-    :cond_0
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;ILjava/lang/Object;)Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;
@@ -127,22 +120,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;)Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "me"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;-><init>(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -160,7 +146,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -182,7 +168,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;->friendSourceFlags:Lcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
index ceac8537bc..c064eac9c8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function4<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Integer;",
@@ -48,64 +48,39 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x4
+    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x4
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;)Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;-><init>(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
index e91de642d6..0093cac0bb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,14 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
+    const-string v0, "it"
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1;->call(Lcom/discord/models/domain/ModelUser;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
 
     move-result p1
 
@@ -75,16 +77,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/models/domain/ModelUser;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    const-string v0, "it"
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1;->call(Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
+    move-result-object p1
 
-    move-result p1
-
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1.smali
index ebbb877cfc..f120c0e8b2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Throwable;",
         "Lcom/discord/utilities/rest/RestAPI$HarvestState;",
         ">;"
@@ -59,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Throwable;)Lcom/discord/utilities/rest/RestAPI$HarvestState$NeverRequested;
+.method public final call(Ljava/lang/Throwable;)Lcom/discord/utilities/rest/RestAPI$HarvestState;
     .locals 0
 
     new-instance p1, Lcom/discord/utilities/rest/RestAPI$HarvestState$NeverRequested;
@@ -74,7 +74,7 @@
 
     check-cast p1, Ljava/lang/Throwable;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1;->call(Ljava/lang/Throwable;)Lcom/discord/utilities/rest/RestAPI$HarvestState$NeverRequested;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1;->call(Ljava/lang/Throwable;)Lcom/discord/utilities/rest/RestAPI$HarvestState;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2.smali
index 44e50d8829..2979fac8a9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/utilities/rest/RestAPI$HarvestState;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/utilities/rest/RestAPI$HarvestState;",
             ">;"
         }
@@ -96,7 +99,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lr0/p/a;->d()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->d()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -106,7 +109,7 @@
 
     const-string p1, "RestAPI\n                \u2026bserveOn(Schedulers.io())"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v2, 0x0
 
@@ -132,7 +135,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$3.smali
similarity index 91%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$3.smali
index 5ed51b2f13..1bab9cf9f8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$3.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;",
+        "Lcom/discord/models/domain/Consents;",
+        "Lcom/discord/utilities/rest/RestAPI$HarvestState;",
+        "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;",
+        ">;"
     }
 .end annotation
 
@@ -84,7 +88,7 @@
 
     const-string p1, "consent"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v7
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
index 7c32076d21..34f51144b8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,14 +81,15 @@
             "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$LocalState;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;",
             ">;"
         }
     .end annotation
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -100,9 +103,9 @@
 
     const/4 v1, 0x0
 
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -116,13 +119,13 @@
 
     sget-object v3, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$1;
 
-    invoke-virtual {v1, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     sget-object v3, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2;
 
-    invoke-virtual {v1, v3}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v3}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
index 2f50971ce0..edc1264f3a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion.smali
@@ -103,13 +103,13 @@
 
     sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable\n          .co\u2026            }\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -121,7 +121,7 @@
 
     const-string v1, "Observable\n          .co\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
index d2626d0cb2..9e72aff9d2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model.smali
@@ -56,11 +56,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;Lcom/discord/models/domain/Consents;Lcom/discord/utilities/rest/RestAPI$HarvestState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "me"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "consents"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -77,20 +79,6 @@
     iput-object p6, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;->harvestState:Lcom/discord/utilities/rest/RestAPI$HarvestState;
 
     return-void
-
-    :cond_0
-    const-string p1, "consents"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;Lcom/discord/models/domain/Consents;Lcom/discord/utilities/rest/RestAPI$HarvestState;ILjava/lang/Object;)Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;
@@ -222,11 +210,13 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;Lcom/discord/models/domain/Consents;Lcom/discord/utilities/rest/RestAPI$HarvestState;)Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "me"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "consents"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;
 
@@ -247,20 +237,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;-><init>(Lcom/discord/models/domain/ModelUser;IZLcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;Lcom/discord/models/domain/Consents;Lcom/discord/utilities/rest/RestAPI$HarvestState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "consents"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -278,7 +254,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -300,7 +276,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;->friendSourceFlags:Lcom/discord/models/domain/ModelUserSettings$FriendSourceFlags;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -310,7 +286,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;->consents:Lcom/discord/models/domain/Consents;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -320,7 +296,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;->harvestState:Lcom/discord/utilities/rest/RestAPI$HarvestState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureDefaultGuildsRestricted$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureExplicitContentRadio$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
index fdafca5b69..db8ac81929 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$1.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "checked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
index 0bd591c086..ab41f19287 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$2.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "checked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
index 273a6d2e99..4711013332 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureFriendSourceRadio$3.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "checked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
index ce9c6c13fa..ca81c93a65 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1$2.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "consented"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -71,7 +71,7 @@
 
     move-result-object v1
 
-    const-string v2, "usage_statistics"
+    const-string/jumbo v2, "usage_statistics"
 
     invoke-static {v0, p1, v2, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$toggleConsent(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;ZLjava/lang/String;Lcom/discord/views/CheckedSetting;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
similarity index 81%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
index 6bb1b1d1e1..9dc595c5f7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function5<",
         "Landroidx/appcompat/app/AlertDialog;",
         "Landroid/widget/TextView;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x5
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -89,27 +89,35 @@
 .method public final invoke(Landroidx/appcompat/app/AlertDialog;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dialog"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "dialogHeader"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "dialogBody"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1216ab
+    const-string v0, "dialogCancel"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dialogConfirm"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f1216d5
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f1216a8
+    const p2, 0x7f1216d2
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f1216a9
+    const p2, 0x7f1216d3
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V
 
@@ -119,7 +127,7 @@
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p2, 0x7f1216aa
+    const p2, 0x7f1216d4
 
     invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V
 
@@ -130,39 +138,4 @@
     invoke-virtual {p5, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "dialogConfirm"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dialogCancel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "dialogBody"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dialogHeader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
index 77d5144fb6..697a79dbb5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.smali
@@ -65,7 +65,7 @@
 
     const-string v0, "consented"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -85,7 +85,7 @@
 
     move-result-object v1
 
-    const-string v2, "usage_statistics"
+    const-string/jumbo v2, "usage_statistics"
 
     invoke-static {v0, p1, v2, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$toggleConsent(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;ZLjava/lang/String;Lcom/discord/views/CheckedSetting;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
index 2095a4747c..b03a0b1123 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1$2.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "consented"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
similarity index 81%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
index 695d56a76a..da8f110365 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function5<",
         "Landroidx/appcompat/app/AlertDialog;",
         "Landroid/widget/TextView;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x5
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -89,27 +89,35 @@
 .method public final invoke(Landroidx/appcompat/app/AlertDialog;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;Landroid/widget/TextView;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "dialog"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "dialogHeader"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "dialogBody"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f12112d
+    const-string v0, "dialogCancel"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dialogConfirm"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f121158
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f12112a
+    const p2, 0x7f121155
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f12112b
+    const p2, 0x7f121156
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V
 
@@ -119,7 +127,7 @@
 
     invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p2, 0x7f12112c
+    const p2, 0x7f121157
 
     invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V
 
@@ -130,39 +138,4 @@
     invoke-virtual {p5, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "dialogConfirm"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dialogCancel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "dialogBody"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "dialogHeader"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
index caffd52a28..0ec2edd41d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.smali
@@ -65,7 +65,7 @@
 
     const-string v0, "consented"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
index 4d58bf392a..6e85b61cc4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
@@ -55,7 +55,7 @@
 
     const-string v0, "context ?: return@setOnClickListener"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1;->$isMeVerified:Z
 
@@ -74,13 +74,13 @@
     :cond_0
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const v0, 0x7f120551
+    const v0, 0x7f120553
 
     const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     :cond_1
     :goto_0
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
index 66f2e31303..c8d316a1f6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$explicitContentRadios$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
index b45a7313cb..b8bb4293c4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
similarity index 76%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
index 6140df544a..b8888cfb8c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/Harvest;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,33 +65,35 @@
 .method public final invoke(Lcom/discord/models/domain/Harvest;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "requestedHarvest"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
+    new-instance v0, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1;->$context:Landroid/content/Context;
+    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1;->$context:Landroid/content/Context;
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v2, 0x7f120550
+    const v1, 0x7f120552
 
-    invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
-    move-result-object v1
+    move-result-object v0
 
-    const v2, 0x7f12054f
+    const v1, 0x7f120551
 
-    invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
-    move-result-object v1
+    move-result-object v0
 
-    const v2, 0x7f12107e
+    const v1, 0x7f1210a8
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
-    invoke-static {v1, v2, v0, v3, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
+    invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
@@ -103,26 +105,19 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const/4 v1, 0x1
+    new-instance v1, Lcom/discord/utilities/rest/RestAPI$HarvestState$LastRequested;
 
-    new-instance v2, Lcom/discord/utilities/rest/RestAPI$HarvestState$LastRequested;
+    invoke-direct {v1, p1}, Lcom/discord/utilities/rest/RestAPI$HarvestState$LastRequested;-><init>(Lcom/discord/models/domain/Harvest;)V
 
-    invoke-direct {v2, p1}, Lcom/discord/utilities/rest/RestAPI$HarvestState$LastRequested;-><init>(Lcom/discord/models/domain/Harvest;)V
+    const/4 p1, 0x1
 
-    invoke-static {v0, v1, v2}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$configureRequestDataButton(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;ZLcom/discord/utilities/rest/RestAPI$HarvestState;)V
+    invoke-static {v0, p1, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$configureRequestDataButton(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;ZLcom/discord/utilities/rest/RestAPI$HarvestState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "requestedHarvest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
similarity index 91%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
index e21e222214..a6141de007 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f120548
+    const v1, 0x7f12054a
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -99,7 +99,7 @@
     :cond_0
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->$context:Landroid/content/Context;
 
-    const v1, 0x7f120547
+    const v1, 0x7f120549
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -107,14 +107,14 @@
 
     const-string v1, "context.getString(R.stri\u2026equest_data_failure_body)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     invoke-virtual {v0, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(Ljava/lang/String;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const v0, 0x7f12107e
+    const v0, 0x7f1210a8
 
     const/4 v1, 0x2
 
@@ -132,7 +132,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
index b54afe920e..77c8cf0790 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3;
 
@@ -73,7 +75,7 @@
 
     const-string v2, "it.response"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
index 5c4f8c7b0d..45b23b0b58 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/Harvest;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
index 0b3405e4a8..56fd9c6c81 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -96,11 +96,11 @@
 
     move-result-object v1
 
-    new-instance v2, Lf/a/b/m0;
+    new-instance v2, Lf/a/b/o0;
 
     const-wide/16 v3, 0x64
 
-    invoke-direct {v2, v1, v3, v4}, Lf/a/b/m0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
+    invoke-direct {v2, v1, v3, v4}, Lf/a/b/o0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
 
     invoke-virtual {v0, v2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -108,7 +108,7 @@
 
     const-string v0, "RestAPI\n          .api\n \u2026mer(dimmer, delay = 100))"
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
index 5c3cd23c8b..190c8e5698 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,9 +59,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4;
 
@@ -70,13 +72,4 @@
     invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$3;->invoke()V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
index f42328bd68..8224928d23 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,13 +72,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f120546
+    const v1, 0x7f120548
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f12054b
+    const v1, 0x7f12054d
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -88,13 +88,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4;)V
 
-    const v2, 0x7f12107e
+    const v2, 0x7f1210a8
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1203b7
+    const v1, 0x7f1203b8
 
     const/4 v2, 0x0
 
@@ -112,7 +112,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1.smali
index c8bd5c26a0..fa4dc5e57b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1.smali
@@ -61,7 +61,7 @@
 
     const-string v1, "checked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -71,9 +71,9 @@
 
     move-result-object p1
 
-    const-string v0, "userSettings\n           \u2026ibilityDetection(checked)"
+    const-string/jumbo v0, "userSettings\n           \u2026ibilityDetection(checked)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1$1$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1$1$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1$1$1.smali
index f0b7ba9240..45b8d053ae 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserSettings;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
index 4cd0088b7c..e2d17febbd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string p1, "it.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3.smali
index 25995a2879..2a272f8b9c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali
new file mode 100644
index 0000000000..918dc38229
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali
@@ -0,0 +1,81 @@
+.class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1;
+.super Lk0/o/c/h;
+.source "WidgetSettingsPrivacy.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;)V
+    .locals 7
+
+    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V
+    .locals 1
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.smali
similarity index 91%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.smali
index 0266ff0d6a..43e5607733 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func4$0.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func4$0.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$sam$rx_functions_Func4$0.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
index 8d2ed3fc56..8b0e6211b1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
index 1ee6ba6199..fabf8f36d4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
index 2047e9be94..62947b9455 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPrivacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Set<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
similarity index 80%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
index 114fd2709e..27eeb422e2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
@@ -69,301 +69,211 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "explicitContentRadio0"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExplicitContentRadio0()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "explicitContentRadio0"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getExplicitContentRadio0()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const/4 v2, 0x0
+    const-string v2, "explicitContentRadio1"
 
-    aput-object v1, v0, v2
+    const-string v3, "getExplicitContentRadio1()Lcom/discord/views/CheckedSetting;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "explicitContentRadio1"
-
-    const-string v4, "getExplicitContentRadio1()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "explicitContentRadio2"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExplicitContentRadio2()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "explicitContentRadio2"
-
-    const-string v4, "getExplicitContentRadio2()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "privacyFriendSource0"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivacyFriendSource0()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privacyFriendSource0"
-
-    const-string v4, "getPrivacyFriendSource0()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "privacyFriendSource1"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivacyFriendSource1()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privacyFriendSource1"
-
-    const-string v4, "getPrivacyFriendSource1()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "privacyFriendSource2"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivacyFriendSource2()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privacyFriendSource2"
-
-    const-string v4, "getPrivacyFriendSource2()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "defaultGuildsRestrictedView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDefaultGuildsRestrictedView()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "defaultGuildsRestrictedView"
-
-    const-string v4, "getDefaultGuildsRestrictedView()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dataPrivacyControls"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDataPrivacyControls()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dataPrivacyControls"
-
-    const-string v4, "getDataPrivacyControls()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dataStatistics"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDataStatistics()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dataStatistics"
-
-    const-string v4, "getDataStatistics()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dataPersonalization"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDataPersonalization()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dataPersonalization"
-
-    const-string v4, "getDataPersonalization()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dataBasicService"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDataBasicService()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dataBasicService"
-
-    const-string v4, "getDataBasicService()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dataAllowScreenreaderDetection"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDataAllowScreenreaderDetection()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dataAllowScreenreaderDetection"
-
-    const-string v4, "getDataAllowScreenreaderDetection()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dataRequest"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDataRequest()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dataRequest"
-
-    const-string v4, "getDataRequest()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dataRequestLink"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDataRequestLink()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dataRequestLink"
-
-    const-string v4, "getDataRequestLink()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
@@ -387,7 +297,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a08d9
+    const v0, 0x7f0a08df
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -395,7 +305,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->explicitContentRadio0$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08da
+    const v0, 0x7f0a08e0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -403,7 +313,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->explicitContentRadio1$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08db
+    const v0, 0x7f0a08e1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -421,7 +331,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->explicitContentRadios$delegate:Lkotlin/Lazy;
 
-    const v0, 0x7f0a08dc
+    const v0, 0x7f0a08e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -429,7 +339,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->privacyFriendSource0$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08dd
+    const v0, 0x7f0a08e3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -437,7 +347,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->privacyFriendSource1$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08de
+    const v0, 0x7f0a08e4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -455,7 +365,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->friendSourceRadios$delegate:Lkotlin/Lazy;
 
-    const v0, 0x7f0a08d6
+    const v0, 0x7f0a08dc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -463,7 +373,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->defaultGuildsRestrictedView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08d5
+    const v0, 0x7f0a08db
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -471,7 +381,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataPrivacyControls$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e3
+    const v0, 0x7f0a08e9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -479,7 +389,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataStatistics$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08df
+    const v0, 0x7f0a08e5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -487,7 +397,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataPersonalization$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08d4
+    const v0, 0x7f0a08da
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -495,7 +405,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataBasicService$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e2
+    const v0, 0x7f0a08e8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -503,7 +413,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataAllowScreenreaderDetection$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e0
+    const v0, 0x7f0a08e6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -511,7 +421,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataRequest$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08e1
+    const v0, 0x7f0a08e7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -519,7 +429,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->dataRequestLink$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -946,7 +856,7 @@
 
     const-string v1, "context ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataPrivacyControls()Landroid/view/View;
 
@@ -1150,9 +1060,9 @@
 
     const-string v1, "AlertDialog.Builder(this\u2026(false)\n        .create()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a0a35
+    const v1, 0x7f0a0a39
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1160,9 +1070,9 @@
 
     const-string v1, "dialogView.findViewById(\u2026alog_confirmation_header)"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a0a36
+    const v1, 0x7f0a0a3a
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1170,9 +1080,9 @@
 
     const-string v1, "dialogView.findViewById(\u2026dialog_confirmation_text)"
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a0a33
+    const v1, 0x7f0a0a37
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1180,9 +1090,9 @@
 
     const-string v1, "dialogView.findViewById(\u2026alog_confirmation_cancel)"
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a0a34
+    const v1, 0x7f0a0a38
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1190,7 +1100,7 @@
 
     const-string v0, "dialogView.findViewById(\u2026log_confirmation_confirm)"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v1, p2
 
@@ -1638,7 +1548,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a08d7
+    const v1, 0x7f0a08dd
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1652,7 +1562,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f0a08d8
+    const v1, 0x7f0a08de
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1675,9 +1585,9 @@
     :cond_0
     new-instance p1, Landroidx/appcompat/app/AlertDialog$Builder;
 
-    const-string v1, "view"
+    const-string/jumbo v1, "view"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -1714,7 +1624,7 @@
 
     const-string v0, "context ?: return"
 
-    invoke-static {v7, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
 
@@ -1732,7 +1642,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f12053d
+    const p2, 0x7f12053f
 
     const/4 v0, 0x1
 
@@ -1748,13 +1658,13 @@
 
     const-string p2, "context.getString(R.stri\u2026ted_status_note, dateStr)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     invoke-direct {p2, v7}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v0, 0x7f120554
+    const v0, 0x7f120556
 
     invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -1764,7 +1674,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f12107e
+    const p2, 0x7f1210a8
 
     const/4 v0, 0x2
 
@@ -1780,7 +1690,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -1813,17 +1723,17 @@
 
     move-result-object v0
 
-    new-instance v1, Lf/a/b/m0;
+    new-instance v1, Lf/a/b/o0;
 
     const-wide/16 v2, 0x64
 
-    invoke-direct {v1, v0, v2, v3}, Lf/a/b/m0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
+    invoke-direct {v1, v0, v2, v3}, Lf/a/b/o0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
 
     invoke-virtual {p2, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     move-result-object p2
 
-    sget-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -1837,7 +1747,7 @@
 
     invoke-direct {v3, p3, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$toggleConsent$2;-><init>(Lcom/discord/views/CheckedSetting;Z)V
 
-    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -1853,20 +1763,20 @@
 
     if-nez p2, :cond_0
 
-    new-instance p2, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {p2, v6}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, v6}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
     if-nez p1, :cond_1
 
-    sget-object p2, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p2, Lk0/j/p;->d:Lk0/j/p;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p2, v0
 
@@ -1885,7 +1795,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1;
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -1896,9 +1806,9 @@
 
     move-result-object p2
 
-    const-string v0, "when {\n      !applyToExi\u2026 }\n    }\n        .take(1)"
+    const-string/jumbo v0, "when {\n      !applyToExi\u2026 }\n    }\n        .take(1)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -1922,7 +1832,15 @@
 
     and-int/lit8 p1, p1, 0x20
 
-    new-instance p1, Lf/a/b/a0;
+    const-string p1, "onNext"
+
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "errorClass"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/b/c0;
 
     move-object v0, p1
 
@@ -1932,7 +1850,7 @@
 
     move-object v5, v6
 
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
 
     invoke-virtual {p2, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -2065,121 +1983,77 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 19
+    .locals 20
 
     move-object/from16 v0, p0
 
-    const/4 v1, 0x0
+    const-string/jumbo v1, "view"
 
-    if-eqz p1, :cond_1
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     const/4 v3, 0x1
 
-    invoke-static {v0, v2, v3, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v4, 0x0
 
-    const v4, 0x7f121700
+    invoke-static {v0, v1, v3, v4}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-virtual {v0, v4}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
+    const v5, 0x7f12172a
 
-    const v4, 0x7f1212a2
+    invoke-virtual {v0, v5}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    invoke-virtual {v0, v4}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+    const v5, 0x7f1212cd
 
-    new-instance v4, Lcom/discord/views/RadioManager;
+    invoke-virtual {v0, v5}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+
+    new-instance v5, Lcom/discord/views/RadioManager;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getExplicitContentRadios()Ljava/util/List;
 
+    move-result-object v6
+
+    invoke-direct {v5, v6}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
+
+    iput-object v5, v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->radioManagerExplicit:Lcom/discord/views/RadioManager;
+
+    sget-object v5, Lf/a/b/g;->a:Lf/a/b/g;
+
+    const-wide v6, 0x53d1eac657L
+
+    invoke-virtual {v5, v6, v7, v4}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+
     move-result-object v5
 
-    invoke-direct {v4, v5}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
-
-    iput-object v4, v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->radioManagerExplicit:Lcom/discord/views/RadioManager;
-
-    sget-object v4, Lf/a/b/g;->a:Lf/a/b/g;
-
-    const-wide v5, 0x53d1eac657L
-
-    invoke-virtual {v4, v5, v6, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v4
-
-    const v7, 0x7f120544
-
-    new-array v8, v3, [Ljava/lang/Object;
-
-    aput-object v4, v8, v2
-
-    invoke-virtual {v0, v7, v8}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v10
-
-    const-string v4, "getString(\n        R.str\u2026yControlsArticleUrl\n    )"
-
-    invoke-static {v10, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataPersonalization()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v4
-
-    invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v9
-
-    const-string v7, "view.context"
-
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/16 v14, 0x1c
-
-    const/4 v15, 0x0
-
-    invoke-static/range {v9 .. v15}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
-
-    move-result-object v8
-
-    invoke-virtual {v4, v8, v3}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
-
-    sget-object v4, Lf/a/b/g;->a:Lf/a/b/g;
-
-    const-wide v8, 0x53d3d0de1cL
-
-    invoke-virtual {v4, v8, v9, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v4
-
-    const v8, 0x7f12053f
+    const v8, 0x7f120546
 
     new-array v9, v3, [Ljava/lang/Object;
 
-    aput-object v4, v9, v2
+    aput-object v5, v9, v1
 
     invoke-virtual {v0, v8, v9}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v11
 
-    const-string v4, "getString(\n        R.str\u2026yTrackingArticleUrl\n    )"
+    const-string v5, "getString(\n        R.str\u2026yControlsArticleUrl\n    )"
 
-    invoke-static {v11, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataAllowScreenreaderDetection()Lcom/discord/views/CheckedSetting;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataPersonalization()Lcom/discord/views/CheckedSetting;
 
-    move-result-object v4
+    move-result-object v5
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v10
 
-    invoke-static {v10, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string/jumbo v8, "view.context"
+
+    invoke-static {v10, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
@@ -2193,206 +2067,254 @@
 
     invoke-static/range {v10 .. v16}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    move-result-object v8
-
-    invoke-virtual {v4, v8, v3}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataAllowScreenreaderDetection()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v4
-
-    new-instance v8, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1;
-
-    invoke-direct {v8, v4, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1;-><init>(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/settings/WidgetSettingsPrivacy;)V
-
-    invoke-virtual {v4, v8}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    sget-object v4, Lf/a/b/g;->a:Lf/a/b/g;
-
-    const-wide v8, 0x53d1ea1c57L
-
-    invoke-virtual {v4, v8, v9, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v4
-
-    const v8, 0x7f120541
-
-    invoke-virtual {v0, v8}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    const-string v9, "getString(R.string.data_\u2026trols_basic_service_note)"
-
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v9, Ljava/lang/StringBuilder;
-
-    invoke-direct {v9}, Ljava/lang/StringBuilder;-><init>()V
-
-    const/16 v10, 0x28
-
-    invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v4, 0x29
-
-    invoke-virtual {v9, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
     move-result-object v9
 
-    const/4 v10, 0x4
+    invoke-virtual {v5, v9, v3}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
 
-    const-string v11, "(onClick)"
+    sget-object v5, Lf/a/b/g;->a:Lf/a/b/g;
 
-    invoke-static {v8, v11, v9, v2, v10}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    const-wide v9, 0x53d3d0de1cL
 
-    move-result-object v13
+    invoke-virtual {v5, v9, v10, v4}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataBasicService()Lcom/discord/views/CheckedSetting;
+    move-result-object v5
 
-    move-result-object v8
+    const v9, 0x7f120541
 
-    const v9, 0x7f0a0852
+    new-array v10, v3, [Ljava/lang/Object;
 
-    invoke-virtual {v8, v9}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
+    aput-object v5, v10, v1
 
-    move-result-object v8
-
-    if-eqz v8, :cond_0
-
-    const/16 v9, 0x8
-
-    invoke-virtual {v8, v9}, Landroid/view/View;->setVisibility(I)V
-
-    :cond_0
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataBasicService()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v8
-
-    invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v0, v9, v10}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v12
 
-    invoke-static {v12, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "getString(\n        R.str\u2026yTrackingArticleUrl\n    )"
+
+    invoke-static {v12, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataAllowScreenreaderDetection()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v5
+
+    invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v11
+
+    invoke-static {v11, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v13, 0x0
 
     const/4 v14, 0x0
 
     const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    const/16 v16, 0x1c
 
-    const/16 v17, 0x1c
+    const/16 v17, 0x0
 
-    const/16 v18, 0x0
-
-    invoke-static/range {v12 .. v18}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    invoke-static/range {v11 .. v17}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
     move-result-object v9
 
-    invoke-virtual {v8, v9, v3}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
+    invoke-virtual {v5, v9, v3}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataAllowScreenreaderDetection()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v5
+
+    new-instance v9, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1;
+
+    invoke-direct {v9, v5, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1;-><init>(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/settings/WidgetSettingsPrivacy;)V
+
+    invoke-virtual {v5, v9}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    sget-object v5, Lf/a/b/g;->a:Lf/a/b/g;
+
+    const-wide v9, 0x53d1ea1c57L
+
+    invoke-virtual {v5, v9, v10, v4}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v5
+
+    const v9, 0x7f120543
+
+    invoke-virtual {v0, v9}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, "getString(R.string.data_\u2026trols_basic_service_note)"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v10, Ljava/lang/StringBuilder;
+
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
+
+    const/16 v11, 0x28
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v5, 0x29
+
+    invoke-virtual {v10, v5}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v10
+
+    const/4 v11, 0x4
+
+    const-string v12, "(onClick)"
+
+    invoke-static {v9, v12, v10, v1, v11}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v14
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataBasicService()Lcom/discord/views/CheckedSetting;
 
-    move-result-object v8
+    move-result-object v9
 
-    sget-object v9, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2;
+    const v10, 0x7f0a0858
 
-    invoke-virtual {v8, v9}, Lcom/discord/views/CheckedSetting;->e(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v9, v10}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
 
-    sget-object v8, Lf/a/b/g;->a:Lf/a/b/g;
+    move-result-object v9
 
-    const-wide v9, 0x53d1e9852cL
+    if-eqz v9, :cond_0
 
-    invoke-virtual {v8, v9, v10, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+    const/16 v10, 0x8
 
-    move-result-object v8
+    invoke-virtual {v9, v10}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataRequestLink()Landroid/widget/TextView;
+    :cond_0
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataBasicService()Lcom/discord/views/CheckedSetting;
 
     move-result-object v9
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
+    move-result-object v13
+
+    invoke-static {v13, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0x0
+
+    const/16 v18, 0x1c
+
+    const/16 v19, 0x0
+
+    invoke-static/range {v13 .. v19}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+
     move-result-object v10
 
-    invoke-static {v10, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v9, v10, v3}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
 
-    new-instance v11, Ljava/lang/StringBuilder;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataBasicService()Lcom/discord/views/CheckedSetting;
 
-    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
+    move-result-object v9
 
-    const/16 v12, 0x5b
+    sget-object v10, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$2;
 
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v9, v10}, Lcom/discord/views/CheckedSetting;->e(Landroid/view/View$OnClickListener;)V
 
-    const v12, 0x7f120fef
+    sget-object v9, Lf/a/b/g;->a:Lf/a/b/g;
 
-    invoke-virtual {v0, v12}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    const-wide v10, 0x53d1e9852cL
 
-    move-result-object v12
+    invoke-virtual {v9, v10, v11, v4}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    move-result-object v9
 
-    const-string v12, "]("
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataRequestLink()Landroid/widget/TextView;
 
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    move-result-object v10
 
-    invoke-virtual {v11, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v11
 
-    const/4 v12, 0x0
+    invoke-static {v11, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v12, Ljava/lang/StringBuilder;
+
+    invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
+
+    const/16 v13, 0x5b
+
+    invoke-virtual {v12, v13}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const v13, 0x7f121019
+
+    invoke-virtual {v0, v13}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+    move-result-object v13
+
+    invoke-virtual {v12, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v13, "]("
+
+    invoke-virtual {v12, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v12, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v12, v5}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v12
 
     const/4 v13, 0x0
 
     const/4 v14, 0x0
 
-    const/16 v15, 0x1c
+    const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    const/16 v16, 0x1c
 
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    const/16 v17, 0x0
 
-    move-result-object v4
+    invoke-static/range {v11 .. v17}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    invoke-virtual {v9, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v5
+
+    invoke-virtual {v10, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataRequestLink()Landroid/widget/TextView;
 
+    move-result-object v5
+
+    new-instance v10, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3;
+
+    invoke-direct {v10, v9}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v5, v10}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    const v5, 0x7f120554
+
+    new-array v9, v3, [Ljava/lang/Object;
+
+    sget-object v10, Lf/a/b/g;->a:Lf/a/b/g;
+
+    invoke-virtual {v10, v6, v7, v4}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+
     move-result-object v4
 
-    new-instance v9, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3;
+    aput-object v4, v9, v1
 
-    invoke-direct {v9, v8}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBound$3;-><init>(Ljava/lang/String;)V
+    invoke-virtual {v0, v5, v9}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    invoke-virtual {v4, v9}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    const v4, 0x7f120552
-
-    new-array v8, v3, [Ljava/lang/Object;
-
-    sget-object v9, Lf/a/b/g;->a:Lf/a/b/g;
-
-    invoke-virtual {v9, v5, v6, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    aput-object v1, v8, v2
-
-    invoke-virtual {v0, v4, v8}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v10
+    move-result-object v11
 
     const-string v1, "getString(\n        R.str\u2026A_PRIVACY_CONTROLS)\n    )"
 
-    invoke-static {v10, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getDataStatistics()Lcom/discord/views/CheckedSetting;
 
@@ -2400,34 +2322,27 @@
 
     invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v9
+    move-result-object v10
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v11, 0x0
+    invoke-static {v10, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
     const/4 v13, 0x0
 
-    const/16 v14, 0x1c
+    const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v15, 0x1c
 
-    invoke-static/range {v9 .. v15}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    const/16 v16, 0x0
+
+    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
     move-result-object v2
 
     invoke-virtual {v1, v2, v3}, Lcom/discord/views/CheckedSetting;->h(Ljava/lang/CharSequence;Z)V
 
     return-void
-
-    :cond_1
-    const-string v2, "view"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2475,9 +2390,9 @@
 
     move-result-object v0
 
-    const-string v3, "userSettings\n        .ob\u2026wAccessibilityDetection()"
+    const-string/jumbo v3, "userSettings\n        .ob\u2026wAccessibilityDetection()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
index 6f09be2a61..6c485f3986 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$1.smali
@@ -77,11 +77,11 @@
 
     sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
 
-    const-string v1, "view"
+    const-string/jumbo v1, "view"
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
index 46176ef300..e14ad9e1a9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1.smali
@@ -55,11 +55,11 @@
 
     sget-object v0, Lcom/discord/utilities/notices/NoticeBuilders;->INSTANCE:Lcom/discord/utilities/notices/NoticeBuilders;
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$4.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$5.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
similarity index 77%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
index 7862d49a0d..45f23795f8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
@@ -47,7 +47,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;
 
@@ -55,131 +55,89 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "platformImage"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPlatformImage()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "platformImage"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getPlatformImage()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "platformUserName"
 
-    const/4 v3, 0x0
+    const-string v3, "getPlatformUserName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "platformUserName"
-
-    const-string v5, "getPlatformUserName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "disconnect"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDisconnect()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "disconnect"
-
-    const-string v5, "getDisconnect()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "displaySwitch"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDisplaySwitch()Landroidx/appcompat/widget/SwitchCompat;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "displaySwitch"
-
-    const-string v5, "getDisplaySwitch()Landroidx/appcompat/widget/SwitchCompat;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "syncFriendsSwitch"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSyncFriendsSwitch()Landroidx/appcompat/widget/SwitchCompat;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "syncFriendsSwitch"
-
-    const-string v5, "getSyncFriendsSwitch()Landroidx/appcompat/widget/SwitchCompat;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "showActivitySwitch"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getShowActivitySwitch()Landroidx/appcompat/widget/SwitchCompat;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "showActivitySwitch"
-
-    const-string v5, "getShowActivitySwitch()Landroidx/appcompat/widget/SwitchCompat;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "extraInfo"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExtraInfo()Lcom/discord/app/AppTextView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "extraInfo"
+    const/4 v2, 0x6
 
-    const-string v4, "getExtraInfo()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x6
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -187,7 +145,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;ILcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;)V
-    .locals 0
+    .locals 1
     .param p1    # Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
@@ -200,13 +158,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->this$0:Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;
 
     invoke-direct {p0, p2, p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0281
+    const p1, 0x7f0a0284
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -214,7 +174,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->platformImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0282
+    const p1, 0x7f0a0285
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -222,7 +182,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->platformUserName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a027c
+    const p1, 0x7f0a027f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -230,7 +190,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->disconnect$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a027e
+    const p1, 0x7f0a0281
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -238,7 +198,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->displaySwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0283
+    const p1, 0x7f0a0286
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -246,7 +206,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->syncFriendsSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a027d
+    const p1, 0x7f0a0280
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -254,7 +214,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->showActivitySwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0280
+    const p1, 0x7f0a0283
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -271,15 +231,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$updateUserConnection(Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;Lcom/discord/models/domain/ModelConnectedAccount;)V
@@ -475,7 +426,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -516,16 +467,16 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;)V
-    .locals 12
+    .locals 13
     .annotation build Landroid/annotation/SuppressLint;
         value = {
             "DefaultLocale"
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_a
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -533,87 +484,99 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/platform/Platform$Companion;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/platform/Platform$Companion;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
 
     move-result-object p1
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getPlatformImage()Landroid/widget/ImageView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getWhitePlatformImage()Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v1
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    move-result v2
+    move-result v1
 
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getPlatformImage()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Ljava/lang/Enum;->name()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getPlatformUserName()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getDisconnect()Landroid/widget/ImageView;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v9, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1;
+    new-instance v8, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1;
 
-    move-object v2, v9
+    move-object v1, v8
 
-    move-object v3, p2
+    move-object v2, p2
 
-    move-object v4, p1
+    move-object v3, p1
 
-    move-object v6, p0
+    move-object v5, p0
 
-    move-object v7, p2
+    move-object v6, p2
 
-    invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;Lcom/discord/utilities/platform/Platform;Ljava/lang/String;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;Lcom/discord/utilities/platform/Platform;Ljava/lang/String;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;)V
 
-    invoke-virtual {v1, v9}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v8}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getDisplaySwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v0}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getDisplaySwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
 
@@ -635,27 +598,27 @@
     const/4 v2, 0x0
 
     :goto_1
-    invoke-virtual {v1, v2}, Landroidx/appcompat/widget/SwitchCompat;->setChecked(Z)V
+    invoke-virtual {v0, v2}, Landroidx/appcompat/widget/SwitchCompat;->setChecked(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getDisplaySwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
     new-instance v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2;
 
     invoke-direct {v2, p2, p0, p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2;-><init>(Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;)V
 
-    invoke-virtual {v1, v2}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
+    invoke-virtual {v0, v2}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getSyncFriendsSwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v0}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getSyncFriendsSwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getCanSyncFriends()Z
 
@@ -673,11 +636,11 @@
     const/16 v2, 0x8
 
     :goto_2
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getSyncFriendsSwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
 
@@ -687,138 +650,174 @@
 
     move-result v2
 
-    invoke-virtual {v1, v2}, Landroidx/appcompat/widget/SwitchCompat;->setChecked(Z)V
+    invoke-virtual {v0, v2}, Landroidx/appcompat/widget/SwitchCompat;->setChecked(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getSyncFriendsSwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
     new-instance v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3;
 
     invoke-direct {v2, p2, p0, p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;)V
 
-    invoke-virtual {v1, v2}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
+    invoke-virtual {v0, v2}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getShowActivitySwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v0}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getShowActivitySwitch()Landroidx/appcompat/widget/SwitchCompat;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getCanShowActivity()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_3
 
     :cond_3
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_3
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getShowActivitySwitch()Landroidx/appcompat/widget/SwitchCompat;
 
+    move-result-object v0
+
+    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const-string v2, "itemView"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
     move-result-object v1
 
-    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    const v5, 0x7f1205be
 
-    const-string v5, "itemView"
-
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    const v6, 0x7f1205bc
-
-    new-array v7, v3, [Ljava/lang/Object;
+    new-array v6, v3, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v8
 
-    if-eqz v9, :cond_9
+    const-string v9, "$this$capitalize"
 
-    invoke-virtual {v9}, Ljava/lang/String;->length()I
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result v0
+    invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
 
-    if-lez v0, :cond_4
+    move-result-object v10
 
-    const/4 v0, 0x1
+    const-string v11, "Locale.getDefault()"
+
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "locale"
+
+    invoke-static {v10, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8}, Ljava/lang/String;->length()I
+
+    move-result v9
+
+    if-lez v9, :cond_4
+
+    const/4 v9, 0x1
 
     goto :goto_4
 
     :cond_4
-    const/4 v0, 0x0
+    const/4 v9, 0x0
 
     :goto_4
-    if-eqz v0, :cond_5
+    if-eqz v9, :cond_6
 
-    invoke-virtual {v9, v8}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v8, v7}, Ljava/lang/String;->charAt(I)C
 
-    move-result v0
+    move-result v9
 
-    invoke-static {v0}, Ljava/lang/Character;->isLowerCase(C)Z
+    invoke-static {v9}, Ljava/lang/Character;->isLowerCase(C)Z
 
-    move-result v0
+    move-result v11
 
-    if-eqz v0, :cond_5
+    if-eqz v11, :cond_6
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v11, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v9, v8, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-static {v9}, Ljava/lang/Character;->toTitleCase(C)C
 
-    move-result-object v10
+    move-result v12
 
-    const-string v11, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+    invoke-static {v9}, Ljava/lang/Character;->toUpperCase(C)C
 
-    invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result v9
 
-    invoke-virtual {v10}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
+    if-eq v12, v9, :cond_5
 
-    move-result-object v10
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    const-string v11, "(this as java.lang.String).toUpperCase()"
+    goto :goto_5
 
-    invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    const-string v9, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {v3, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    :cond_5
+    invoke-virtual {v8, v7, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v9
 
-    :cond_5
-    aput-object v9, v7, v8
+    const-string v12, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
 
-    invoke-virtual {v2, v6, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v9, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
+    invoke-virtual {v9, v10}, Ljava/lang/String;->toUpperCase(Ljava/util/Locale;)Ljava/lang/String;
 
-    invoke-virtual {v1, v0}, Landroid/widget/CompoundButton;->setText(Ljava/lang/CharSequence;)V
+    move-result-object v9
+
+    const-string v10, "(this as java.lang.String).toUpperCase(locale)"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v11, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :goto_5
+    invoke-virtual {v8, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v8, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {v3, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v11, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v3, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {v8, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_6
+    aput-object v8, v6, v7
+
+    invoke-virtual {v1, v5, v6}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Landroid/widget/CompoundButton;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getShowActivitySwitch()Landroidx/appcompat/widget/SwitchCompat;
 
@@ -848,27 +847,27 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_7
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
     move-result p1
 
-    goto :goto_5
+    goto :goto_6
 
-    :cond_6
+    :cond_7
     const p1, 0x7f060260
 
-    :goto_5
+    :goto_6
     iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_9
 
     move-object v1, v0
 
     check-cast v1, Landroidx/cardview/widget/CardView;
 
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -890,17 +889,17 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_8
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getExtraInfo()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
-    invoke-virtual {p1, v8}, Landroid/widget/TextView;->setVisibility(I)V
+    invoke-virtual {p1, v7}, Landroid/widget/TextView;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getExtraInfo()Lcom/discord/app/AppTextView;
 
@@ -912,13 +911,13 @@
 
     move-result-object v0
 
-    const v1, 0x7f1214c0
+    const v1, 0x7f1214ea
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
-    new-array v1, v8, [Ljava/lang/Object;
+    new-array v1, v7, [Ljava/lang/Object;
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/app/AppTextView;->b(Ljava/lang/String;[Ljava/lang/Object;)V
 
@@ -932,40 +931,26 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    goto :goto_6
+    goto :goto_7
 
-    :cond_7
+    :cond_8
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->getExtraInfo()Lcom/discord/app/AppTextView;
 
     move-result-object p1
 
     invoke-virtual {p1, v4}, Landroid/widget/TextView;->setVisibility(I)V
 
-    :goto_6
+    :goto_7
     return-void
 
-    :cond_8
-    new-instance p1, Lkotlin/TypeCastException;
+    :cond_9
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type androidx.cardview.widget.CardView"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_9
-    const-string p1, "$this$capitalize"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
similarity index 87%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
index 02da339bd8..16064be5ba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter.smali
@@ -36,31 +36,19 @@
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Landroidx/fragment/app/FragmentManager;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "recyclerView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     iput-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;->fragmentManager:Landroidx/fragment/app/FragmentManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -97,7 +85,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;
 
@@ -106,13 +96,4 @@
     invoke-direct {p1, p0, p2, p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;-><init>(Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;ILcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
index 99a7b7e6d5..d1a32aa6c3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
index 859fec0cfa..a42bda70cf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "connectedAccount"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     return-void
-
-    :cond_0
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
index 06132e2009..87cb5ae672 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBound$2.smali
@@ -54,13 +54,13 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const p2, 0x7f0a05a8
+    const p2, 0x7f0a05ae
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
index 13a15ed232..eaef5211ef 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsUserConnections.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/List<",
         "+",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,20 +72,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsUserConnections;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
similarity index 86%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
index 154c6f1e99..56725d91ca 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
@@ -41,41 +41,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
+    const-string v2, "emptyView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptyView()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "emptyView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEmptyView()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
 
-    const/4 v2, 0x0
+    const-string v2, "recyclerView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "recyclerView"
-
-    const-string v4, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -99,7 +87,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0284
+    const v0, 0x7f0a0287
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -107,7 +95,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->emptyView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0285
+    const v0, 0x7f0a0288
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -319,9 +307,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -331,29 +319,29 @@
 
     if-eqz p1, :cond_0
 
-    sget-object v1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v4, "it"
+    const-string v3, "it"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
     move-result-object p1
 
-    const-string v4, "it.supportFragmentManager"
+    const-string v3, "it.supportFragmentManager"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v3, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Landroidx/fragment/app/FragmentManager;)V
+    invoke-direct {v1, v2, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Landroidx/fragment/app/FragmentManager;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -364,15 +352,17 @@
     :cond_0
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    const p1, 0x7f121700
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1204b3
+    const p1, 0x7f1204b5
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -393,13 +383,6 @@
     invoke-static/range {v0 .. v5}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu$default(Lcom/discord/app/AppFragment;ILrx/functions/Action2;Lrx/functions/Action1;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
index 498e2439bd..d548a585c0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.smali
@@ -57,21 +57,21 @@
 
     sget-object v1, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    const-string v3, "v"
+    const-string/jumbo v3, "v"
 
     if-ne v0, v1, :cond_0
 
     sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->Companion:Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion;
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion;->launch(Landroid/content/Context;)V
 
@@ -94,13 +94,13 @@
 
     move-result-object v1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/stores/StoreUserConnections;->authorizeConnection(Ljava/lang/String;Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
similarity index 84%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
index 831bb61aaf..b63d3f50c2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder.smali
@@ -45,7 +45,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder;
 
@@ -53,41 +53,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "image"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImage()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "image"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getImage()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "text"
 
-    const/4 v3, 0x0
+    const-string v3, "getText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "text"
+    const/4 v2, 0x1
 
-    const-string v4, "getText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -110,11 +98,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "adapter"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "dialogDismissCallback"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -137,20 +127,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "dialogDismissCallback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getImage()Landroid/widget/ImageView;
@@ -214,7 +190,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;)V
     .locals 1
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -267,15 +245,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
similarity index 85%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
index e198dd9e3f..d4feae34e6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter.smali
@@ -53,31 +53,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "recyclerView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dialogDismissCallback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     iput-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;->dialogDismissCallback:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "dialogDismissCallback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -122,24 +110,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder;
 
-    const p2, 0x7f0d026a
+    iget-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;->dialogDismissCallback:Lkotlin/jvm/functions/Function0;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;->dialogDismissCallback:Lkotlin/jvm/functions/Function0;
+    const v0, 0x7f0d026a
 
-    invoke-direct {p1, p2, p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder;-><init>(ILcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {p1, v0, p0, p2}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder;-><init>(ILcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Adapter;Lkotlin/jvm/functions/Function0;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
similarity index 84%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
index 3664d9cadd..e728674676 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/Fragment;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd;
 
@@ -48,20 +50,11 @@
 
     const-string v1, "fragment.parentFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "javaClass"
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
index 256f900d60..cad77b8832 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/platform/Platform;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "platform"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;->platform:Lcom/discord/utilities/platform/Platform;
 
     return-void
-
-    :cond_0
-    const-string p1, "platform"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;Lcom/discord/utilities/platform/Platform;ILjava/lang/Object;)Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;
@@ -73,22 +66,15 @@
 .method public final copy(Lcom/discord/utilities/platform/Platform;)Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "platform"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;-><init>(Lcom/discord/utilities/platform/Platform;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "platform"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -106,7 +92,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$PlatformItem;->platform:Lcom/discord/utilities/platform/Platform;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
index b976d0b885..a9eec6db77 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd$onViewCreated$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsUserConnectionsAdd.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
index 45bafe438b..96a13af936 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAdd.smali
@@ -33,25 +33,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd;
+    const-string v2, "recyclerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "recyclerView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAdd;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -71,7 +65,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0285
+    const v0, 0x7f0a0288
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -148,7 +142,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 4
 
-    if-eqz p1, :cond_4
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -247,13 +243,4 @@
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
index db0288e7cc..373342413a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
index d8bac19c57..4d26852982 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$1.smali
@@ -59,17 +59,17 @@
 
     move-result-object v1
 
-    const-string v2, "v"
+    const-string/jumbo v2, "v"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const-string v2, "v.context"
+    const-string/jumbo v2, "v.context"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/stores/StoreUserConnections;->authorizeConnection(Ljava/lang/String;Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$1.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$1.smali
index ceff6bb256..cd642cbdd3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "error"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->access$trackXboxLinkFailed(Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;Lcom/discord/utilities/error/Error;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
index 13856edf9f..8c548d0b53 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsUserConnectionsAddXbox.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 8
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "verificationCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
@@ -101,13 +103,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "verificationCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
similarity index 83%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
index 6f68c80630..af4bba5199 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
@@ -33,61 +33,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
+    const-string v2, "codeVerificationView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCodeVerificationView()Lcom/discord/views/CodeVerificationView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "codeVerificationView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCodeVerificationView()Lcom/discord/views/CodeVerificationView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
 
-    const/4 v2, 0x0
+    const-string v2, "login"
 
-    aput-object v1, v0, v2
+    const-string v3, "getLogin()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "login"
-
-    const-string v4, "getLogin()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -111,7 +93,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0286
+    const v0, 0x7f0a0289
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -119,7 +101,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->codeVerificationView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0287
+    const v0, 0x7f0a028a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +109,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->login$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +223,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1204a3
+    const v1, 0x7f1204a4
 
     const/4 v2, 0x0
 
@@ -249,7 +231,7 @@
 
     const/16 v4, 0xc
 
-    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->getCodeVerificationView()Lcom/discord/views/CodeVerificationView;
 
@@ -275,7 +257,7 @@
 
     const-string v2, "error.response"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -339,23 +321,25 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    const p1, 0x7f121700
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1204b3
+    const p1, 0x7f1204b5
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -380,11 +364,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/views/CodeVerificationView;->setOnCodeEntered(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
index 9dc02276ac..755cb16e8f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Companion.smali
@@ -102,7 +102,9 @@
         .end annotation
     .end param
 
-    if-eqz p1, :cond_2
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -128,7 +130,7 @@
     :cond_1
     const-class p2, Lcom/discord/widgets/settings/WidgetSettingsVoice;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -141,13 +143,4 @@
     invoke-virtual {p1, p2}, Lcom/discord/stores/StoreAnalytics;->onUserSettingsPaneViewed(Ljava/lang/String;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$onViewCreated$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector.smali
similarity index 78%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector.smali
index 88a1f215f2..b7f9916dec 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector.smali
@@ -32,41 +32,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;
+    const-string v2, "optionPTT"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOptionPTT()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "optionPTT"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getOptionPTT()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;
 
-    const/4 v2, 0x0
+    const-string v2, "optionVAD"
 
-    aput-object v1, v0, v2
+    const-string v3, "getOptionVAD()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "optionVAD"
-
-    const-string v4, "getOptionVAD()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -82,7 +70,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a08f8
+    const v0, 0x7f0a08fc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -90,7 +78,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;->optionPTT$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08f9
+    const v0, 0x7f0a08fd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -152,9 +140,11 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -179,13 +169,4 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
index 3679e84373..6feba80685 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsVoice.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/Boolean;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     const-string v0, "isListeningForSensitivity"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -111,9 +114,9 @@
 
     move-result-object p1
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
similarity index 86%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
index 5963b3d637..1f4afb0176 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsVoice.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 1
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
@@ -90,5 +76,21 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3.smali
new file mode 100644
index 0000000000..bc27d72ebe
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3.smali
@@ -0,0 +1,152 @@
+.class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
+.super Lk0/o/c/h;
+.source "WidgetSettingsVoice.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function6;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;->get(Lrx/Observable;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function6<",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;",
+        "Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 6
+
+    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
+
+    const/4 v1, 0x6
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;Z)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;Z)Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
+    .locals 9
+
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p4"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p5"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
+
+    const/4 v8, 0x0
+
+    move-object v1, v0
+
+    move-object v2, p1
+
+    move v3, p2
+
+    move v4, p3
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    move v7, p6
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;-><init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v0
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 7
+
+    move-object v1, p1
+
+    check-cast v1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v2
+
+    check-cast p3, Ljava/lang/Boolean;
+
+    invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v3
+
+    move-object v4, p4
+
+    check-cast v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+    move-object v5, p5
+
+    check-cast v5, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    check-cast p6, Ljava/lang/Boolean;
+
+    invoke-virtual {p6}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v6
+
+    move-object v0, p0
+
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;->invoke(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;Z)Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
similarity index 83%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
index 26ba7b99cb..21edffe89a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,30 +62,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
+.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
     .locals 1
 
-    const-string v0, "userRequestedListenForSensitivity"
+    const-string/jumbo v0, "userRequestedListenForSensitivity"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -92,7 +77,7 @@
 
     const-string p1, "isNativeEngineInitialized"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -112,5 +97,23 @@
     const/4 p1, 0x1
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali
new file mode 100644
index 0000000000..c83f6260f7
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali
@@ -0,0 +1,174 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;
+.super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get(Lrx/Observable;)Lrx/Observable;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "Ljava/lang/Boolean;",
+            ">;)",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "requestListenForSensitivity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaEngine;->getIsNativeEngineInitialized()Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1;
+
+    invoke-static {p1, v0, v1}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfig()Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getEnableVideoHardwareScaling()Lrx/Observable;
+
+    move-result-object v2
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreVideoSupport;->get()Lrx/Observable;
+
+    move-result-object v3
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaEngine;->getOpenSLESConfig()Lrx/Observable;
+
+    move-result-object v4
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v5
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object p1
+
+    const-string v0, "2020-04_noise_cancellation_android"
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x2
+
+    invoke-static {p1, v0, v6, v7, v6}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v6
+
+    sget-object p1, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
+
+    if-eqz p1, :cond_0
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0;
+
+    invoke-direct {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0;-><init>(Lkotlin/jvm/functions/Function6;)V
+
+    move-object p1, v0
+
+    :cond_0
+    move-object v7, p1
+
+    check-cast v7, Lrx/functions/Func6;
+
+    invoke-static/range {v1 .. v7}, Lrx/Observable;->f(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v0, "Observable\n            .\u2026    ::Model\n            )"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v0, "Observable\n            .\u2026  .distinctUntilChanged()"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
similarity index 80%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
index 32107e4a2b..5e3c180232 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$Model.smali
@@ -25,10 +25,6 @@
 
 
 # instance fields
-.field public final audioMode:I
-
-.field public final audioModeFixEnabled:Z
-
 .field public final hardwareScaling:Z
 
 .field public final isVideoSupported:Z
@@ -61,26 +57,22 @@
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;IZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZZ)V
+.method public constructor <init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;Z)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->voiceConfig:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    iput p2, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->audioMode:I
+    iput-boolean p2, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->hardwareScaling:Z
 
-    iput-boolean p3, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->hardwareScaling:Z
+    iput-boolean p3, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->isVideoSupported:Z
 
-    iput-boolean p4, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->isVideoSupported:Z
+    iput-object p4, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-    iput-object p5, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    iput-object p5, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->localVoiceStatus:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
 
-    iput-object p6, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->localVoiceStatus:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    iput-boolean p7, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->noiseCancellationExperimentEnabled:Z
-
-    iput-boolean p8, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->audioModeFixEnabled:Z
+    iput-boolean p6, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->noiseCancellationExperimentEnabled:Z
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
@@ -125,32 +117,16 @@
     return-void
 .end method
 
-.method public synthetic constructor <init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;IZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public synthetic constructor <init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct/range {p0 .. p8}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;-><init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;IZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZZ)V
+    invoke-direct/range {p0 .. p6}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;-><init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;Z)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getAudioMode()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->audioMode:I
-
-    return v0
-.end method
-
-.method public final getAudioModeFixEnabled()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->audioModeFixEnabled:Z
-
-    return v0
-.end method
-
 .method public final getHardwareScaling()Z
     .locals 1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$WhenMappings.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
index 47cd0a3e5c..62ca1eed2e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1.smali
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsVoice;
 
-    invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->access$getAudioModeRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/RadioManager;
+    invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->access$getOpenSLESConfigRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/RadioManager;
 
     move-result-object p1
 
@@ -65,7 +65,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsVoice;
 
-    invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->access$onAudioModeChanged(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+    invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->access$onOpenSLESConfigChanged(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
similarity index 91%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
index 7d9d6d8167..41e3b69518 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$1.smali
@@ -49,11 +49,11 @@
 
     const-string v1, "childFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$3.smali
new file mode 100644
index 0000000000..234e9c78a4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$3.smali
@@ -0,0 +1,81 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;
+.super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Boolean;)V
+    .locals 0
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleAutomaticGainControl()V
+
+    return-void
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;->call(Ljava/lang/Boolean;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$4.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$4.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$4.smali
index 6fffd96e04..846239ece4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$4.smali
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleAutomaticGainControl()V
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleNoiseCancellation()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali
new file mode 100644
index 0000000000..c5b494713f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali
@@ -0,0 +1,59 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
+.super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 0
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleNoiseSuppression()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali
new file mode 100644
index 0000000000..2c2b64f6fa
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali
@@ -0,0 +1,81 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
+.super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
+
+    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Boolean;)V
+    .locals 0
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleEchoCancellation()V
+
+    return-void
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;->call(Ljava/lang/Boolean;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
index 16b782d612..3ba39bc9f4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$7.smali
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleEchoCancellation()V
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleAutomaticVAD()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
index f86be5049b..6897133759 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$8.smali
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleAutomaticVAD()V
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleEnableVideoHardwareScaling()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
index a1fe398ba0..e024a79d01 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsVoice.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/rtcconnection/RtcConnection$State;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/rtcconnection/RtcConnection$State;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1;->call(Lcom/discord/rtcconnection/RtcConnection$State;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -75,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Lcom/discord/rtcconnection/RtcConnection$State;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1;->call(Lcom/discord/rtcconnection/RtcConnection$State;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2.smali
index 48acca3e2a..6e8dec3688 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
index 2788b5d12d..8667d55368 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsVoice.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -87,7 +87,7 @@
 
     const-string v1, "requireActivity()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchOverlayForVoice(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
similarity index 94%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
index feb2506a1e..a3dfb86dbd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1.smali
@@ -65,7 +65,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->access$hasOverlayPermission(Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;Landroid/content/Context;)Z
 
@@ -114,7 +114,7 @@
 
     const-string v3, "overlayCS.context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -150,7 +150,7 @@
 
     const-string v1, "isChecked"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.smali
index aca3b60202..2a75e57bfe 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.smali
@@ -41,7 +41,7 @@
 
     const-string v1, "target"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
index 32d8d3c123..878d7847c7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1.smali
@@ -26,9 +26,11 @@
 
 # virtual methods
 .method public onProgressChanged(Landroid/widget/SeekBar;IZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "seekBar"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p3, :cond_0
 
@@ -50,13 +52,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "seekBar"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali
new file mode 100644
index 0000000000..4ae07deb0f
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali
@@ -0,0 +1,53 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
+.super Lf/a/n/g;
+.source "WidgetSettingsVoice.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->onViewBoundOrOnResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lf/a/n/g;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onProgressChanged(Landroid/widget/SeekBar;IZ)V
+    .locals 1
+
+    const-string v0, "seekBar"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p3, :cond_0
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object p1
+
+    int-to-float p2, p2
+
+    const/high16 p3, 0x42c80000    # 100.0f
+
+    sub-float/2addr p2, p3
+
+    invoke-virtual {p1, p2}, Lcom/discord/stores/StoreMediaSettings;->setSensitivity(F)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
rename to com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
index 11c865dfcc..9b931b8028 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsVoice.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;->this$0:Lcom/discord/widgets/settings/WidgetSettingsVoice;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice;Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0.smali
new file mode 100644
index 0000000000..8a1a35a689
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0.smali
@@ -0,0 +1,48 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0;
+.super Ljava/lang/Object;
+.source "WidgetSettingsVoice.kt"
+
+# interfaces
+.implements Lrx/functions/Func6;
+
+
+# instance fields
+.field public final synthetic function:Lkotlin/jvm/functions/Function6;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function6;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0;->function:Lkotlin/jvm/functions/Function6;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 7
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func6$0;->function:Lkotlin/jvm/functions/Function6;
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    move-object v5, p5
+
+    move-object v6, p6
+
+    invoke-interface/range {v0 .. v6}, Lkotlin/jvm/functions/Function6;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
new file mode 100644
index 0000000000..db288408a8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
@@ -0,0 +1,2466 @@
+.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice;
+.super Lcom/discord/app/AppFragment;
+.source "WidgetSettingsVoice.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;,
+        Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;,
+        Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final ARG_TARGET_AUTO_TOGGLE:Ljava/lang/String; = "ARG_TARGET_AUTO_TOGGLE"
+
+.field public static final ARG_TARGET_RES_ID:Ljava/lang/String; = "ARG_TARGET_RES_ID"
+
+.field public static final Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+
+.field public static final LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+.field public static final OVERLAY_PERMISSION_REQUEST_CODE:I = 0x9f8
+
+
+# instance fields
+.field public final autoVADCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final echoCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final gainControlCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final hardwareScalingCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final inputModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final inputModelValue$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final noiseCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final noiseCancellationInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final noiseSuppressionCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public openSLESConfigRadioButtons:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/views/CheckedSetting;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
+
+.field public final openSLESDefault$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final openSLESForceDisabled$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final openSLESForceEnabled$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final overlayCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final videoSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceOutputVolume$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceSensitivityAutomatic$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceSensitivityLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceSensitivityManual$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceSensitivityTestingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceSensitivityTestingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceSensitivityWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final voiceVideoGuide$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    const/16 v0, 0x16
+
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "overlayCS"
+
+    const-string v3, "getOverlayCS()Lcom/discord/views/CheckedSetting;"
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    aput-object v1, v0, v4
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "inputModelValue"
+
+    const-string v3, "getInputModelValue()Landroid/widget/TextView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "inputModeContainer"
+
+    const-string v3, "getInputModeContainer()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x2
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceVideoGuide"
+
+    const-string v3, "getVoiceVideoGuide()Landroid/widget/TextView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x3
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "openSLESDefault"
+
+    const-string v3, "getOpenSLESDefault()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x4
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "openSLESForceEnabled"
+
+    const-string v3, "getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x5
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "openSLESForceDisabled"
+
+    const-string v3, "getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x6
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "autoVADCS"
+
+    const-string v3, "getAutoVADCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x7
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "echoCancellationCS"
+
+    const-string v3, "getEchoCancellationCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x8
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "noiseSuppressionCS"
+
+    const-string v3, "getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x9
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "gainControlCS"
+
+    const-string v3, "getGainControlCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xa
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "noiseCancellationCS"
+
+    const-string v3, "getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xb
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "noiseCancellationInfo"
+
+    const-string v3, "getNoiseCancellationInfo()Landroid/widget/TextView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xc
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceOutputVolume"
+
+    const-string v3, "getVoiceOutputVolume()Landroid/widget/SeekBar;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xd
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceSensitivityManual"
+
+    const-string v3, "getVoiceSensitivityManual()Landroid/widget/SeekBar;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xe
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceSensitivityAutomatic"
+
+    const-string v3, "getVoiceSensitivityAutomatic()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xf
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceSensitivityWrap"
+
+    const-string v3, "getVoiceSensitivityWrap()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x10
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceSensitivityLabel"
+
+    const-string v3, "getVoiceSensitivityLabel()Landroid/widget/TextView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x11
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceSensitivityTestingContainer"
+
+    const-string v3, "getVoiceSensitivityTestingContainer()Landroid/view/ViewGroup;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x12
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "voiceSensitivityTestingButton"
+
+    const-string v3, "getVoiceSensitivityTestingButton()Landroid/widget/Button;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x13
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string/jumbo v2, "videoSettingsContainer"
+
+    const-string v3, "getVideoSettingsContainer()Landroid/view/View;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x14
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const-string v2, "hardwareScalingCS"
+
+    const-string v3, "getHardwareScalingCS()Lcom/discord/views/CheckedSetting;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0x15
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    const/high16 v1, -0x40800000    # -1.0f
+
+    invoke-direct {v0, v1, v4}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;-><init>(FZ)V
+
+    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
+
+    const v0, 0x7f0a0909
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->overlayCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0901
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModelValue$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08ff
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0912
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceVideoGuide$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0904
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESDefault$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0906
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceEnabled$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0905
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceDisabled$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08f8
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->autoVADCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08f9
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->echoCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0903
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseSuppressionCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08fb
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->gainControlCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0902
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08fe
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0907
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceOutputVolume$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a090d
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityManual$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a090a
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityAutomatic$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0910
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a090c
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a090f
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a090e
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0911
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->videoSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a08fa
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->hardwareScalingCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice;Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+
+    return-void
+.end method
+
+.method public static final synthetic access$getLOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED$cp()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    return-object v0
+.end method
+
+.method public static final synthetic access$getOpenSLESConfigRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/RadioManager;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
+
+    if-eqz p0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const-string p0, "openSLESConfigRadioManager"
+
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static final synthetic access$getOverlayCS$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/CheckedSetting;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$getRequestListenForSensitivitySubject$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lrx/subjects/BehaviorSubject;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$onOpenSLESConfigChanged(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->onOpenSLESConfigChanged()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$onOverlayToggled(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->onOverlayToggled()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$setOpenSLESConfigRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;Lcom/discord/views/RadioManager;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
+
+    return-void
+.end method
+
+.method private final configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+    .locals 16
+
+    move-object/from16 v0, p0
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceOutputVolume()Landroid/widget/SeekBar;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/utilities/voice/PerceptualSoundUtils;->INSTANCE:Lcom/discord/utilities/voice/PerceptualSoundUtils;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputVolume()F
+
+    move-result v3
+
+    invoke-virtual {v2, v3}, Lcom/discord/utilities/voice/PerceptualSoundUtils;->amplitudeToPerceptual(F)F
+
+    move-result v2
+
+    invoke-static {v2}, Lf/n/a/k/a;->roundToInt(F)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Landroid/widget/SeekBar;->setProgress(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getInputModeContainer()Landroid/view/View;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$1;
+
+    invoke-direct {v2, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+
+    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getInputModelValue()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModePTT()Z
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_0
+
+    const v2, 0x7f120ca6
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModeVAD()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    const v2, 0x7f120ca9
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    sget-object v2, Lf/a/b/g;->a:Lf/a/b/g;
+
+    const-wide v4, 0x53d45cd227L
+
+    const/4 v6, 0x0
+
+    invoke-virtual {v2, v4, v5, v6}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v4, "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-voice-video&utm_content=--t%3Apm"
+
+    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const v2, 0x7f1206fc
+
+    const/4 v4, 0x1
+
+    new-array v5, v4, [Ljava/lang/Object;
+
+    aput-object v1, v5, v3
+
+    invoke-virtual {v0, v2, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v1, "getString(R.string.form_\u2026shooting_guide, guideUrl)"
+
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceVideoGuide()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+    move-result-object v7
+
+    const-string v2, "requireContext()"
+
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/16 v12, 0x1c
+
+    const/4 v13, 0x0
+
+    invoke-static/range {v7 .. v13}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+
+    move-result-object v5
+
+    invoke-virtual {v1, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
+
+    if-eqz v1, :cond_e
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getOpenSLESConfig()Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v5
+
+    const/4 v7, 0x2
+
+    if-eqz v5, :cond_4
+
+    if-eq v5, v4, :cond_3
+
+    if-ne v5, v7, :cond_2
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v5
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v1, Lkotlin/NoWhenBranchMatchedException;
+
+    invoke-direct {v1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
+
+    throw v1
+
+    :cond_3
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v5
+
+    goto :goto_1
+
+    :cond_4
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v5
+
+    :goto_1
+    invoke-virtual {v1, v5}, Lcom/discord/views/RadioManager;->a(Landroid/widget/Checkable;)V
+
+    iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioButtons:Ljava/util/List;
+
+    if-eqz v1, :cond_d
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_2
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_5
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lcom/discord/views/CheckedSetting;
+
+    new-instance v8, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1;
+
+    invoke-direct {v8, v5, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1;-><init>(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+
+    invoke-virtual {v5, v8}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    goto :goto_2
+
+    :cond_5
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getGainControlCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
+
+    move-result v5
+
+    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getGainControlCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    sget-object v5, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$3;
+
+    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    move-result-object v5
+
+    sget-object v8, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    if-ne v5, v8, :cond_6
+
+    const/4 v5, 0x1
+
+    goto :goto_3
+
+    :cond_6
+    const/4 v5, 0x0
+
+    :goto_3
+    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getNoiseCancellationExperimentEnabled()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_7
+
+    const/4 v5, 0x0
+
+    goto :goto_4
+
+    :cond_7
+    const/16 v5, 0x8
+
+    :goto_4
+    invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    sget-object v5, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$4;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$4;
+
+    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationInfo()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getNoiseCancellationExperimentEnabled()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_8
+
+    const/4 v5, 0x0
+
+    goto :goto_5
+
+    :cond_8
+    const/16 v5, 0x8
+
+    :goto_5
+    invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
+
+    const v1, 0x7f120e2a
+
+    new-array v5, v4, [Ljava/lang/Object;
+
+    sget-object v8, Lf/a/b/g;->a:Lf/a/b/g;
+
+    const-wide v9, 0x53d41b4ab0L
+
+    invoke-virtual {v8, v9, v10, v6}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v8
+
+    aput-object v8, v5, v3
+
+    invoke-virtual {v0, v1, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v10
+
+    const-string v1, "getString(\n        R.str\u2026.NOISE_SUPPRESSION)\n    )"
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationInfo()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+    move-result-object v9
+
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/16 v14, 0x1c
+
+    const/4 v15, 0x0
+
+    invoke-static/range {v9 .. v15}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationInfo()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-static {}, Landroid/text/method/LinkMovementMethod;->getInstance()Landroid/text/method/MovementMethod;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    move-result-object v2
+
+    sget-object v5, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Suppression:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    if-ne v2, v5, :cond_9
+
+    goto :goto_6
+
+    :cond_9
+    const/4 v4, 0x0
+
+    :goto_6
+    invoke-virtual {v1, v4}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    if-ne v1, v2, :cond_a
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    const v2, 0x7f12173e
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->b(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v1, v2, v3, v7}, Lcom/discord/views/CheckedSetting;->i(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;ZI)V
+
+    goto :goto_7
+
+    :cond_a
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->e(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-static {v1, v6, v3, v7}, Lcom/discord/views/CheckedSetting;->i(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;ZI)V
+
+    :goto_7
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getEchoCancellationCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getEchoCancellation()Z
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getEchoCancellationCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAutoVADCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAutoVADCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModeVAD()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_b
+
+    const/4 v2, 0x0
+
+    goto :goto_8
+
+    :cond_b
+    const/16 v2, 0x8
+
+    :goto_8
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAutoVADCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$7;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$7;
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getHardwareScalingCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getHardwareScaling()Z
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getHardwareScalingCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$8;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$8;
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureVoiceSensitivity(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVideoSettingsContainer()Landroid/view/View;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->isVideoSupported()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_c
+
+    goto :goto_9
+
+    :cond_c
+    const/16 v3, 0x8
+
+    :goto_9
+    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
+
+    :cond_d
+    const-string v1, "openSLESConfigRadioButtons"
+
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v6
+
+    :cond_e
+    const-string v1, "openSLESConfigRadioManager"
+
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v6
+.end method
+
+.method private final configureVoiceSensitivity(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
+    .locals 5
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityWrap()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModeVAD()Z
+
+    move-result v1
+
+    const/16 v2, 0x8
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v1, 0x8
+
+    :goto_0
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityLabel()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    const/4 v1, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    const/16 v1, 0x8
+
+    :goto_1
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getLocalVoiceStatus()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityTestingContainer()Landroid/view/ViewGroup;
+
+    move-result-object v1
+
+    if-eqz v0, :cond_2
+
+    const/4 v4, 0x0
+
+    goto :goto_2
+
+    :cond_2
+    const/16 v4, 0x8
+
+    :goto_2
+    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityTestingButton()Landroid/widget/Button;
+
+    move-result-object v1
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_3
+
+    const/4 v2, 0x0
+
+    :cond_3
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityTestingButton()Landroid/widget/Button;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
+
+    move-result v0
+
+    const/4 v1, 0x4
+
+    if-eqz v0, :cond_5
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityAutomatic()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Landroid/widget/SeekBar;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Landroid/widget/SeekBar;->setVisibility(I)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getLocalVoiceStatus()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    move-result-object p1
+
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->b:Z
+
+    if-eqz p1, :cond_4
+
+    const p1, 0x7f0801c8
+
+    goto :goto_3
+
+    :cond_4
+    const p1, 0x7f0801c7
+
+    :goto_3
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityAutomatic()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    invoke-static {v1, p1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroid/view/View;->setBackground(Landroid/graphics/drawable/Drawable;)V
+
+    goto :goto_4
+
+    :cond_5
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityAutomatic()Landroid/view/View;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Landroid/widget/SeekBar;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v3}, Landroid/widget/SeekBar;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Landroid/widget/SeekBar;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getLocalVoiceStatus()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
+
+    move-result-object v1
+
+    iget v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->a:F
+
+    float-to-int v1, v1
+
+    add-int/lit8 v1, v1, 0x64
+
+    invoke-virtual {v0, v1}, Landroid/widget/SeekBar;->setSecondaryProgress(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Landroid/widget/SeekBar;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getSensitivity()F
+
+    move-result p1
+
+    float-to-int p1, p1
+
+    add-int/lit8 p1, p1, 0x64
+
+    invoke-virtual {v0, p1}, Landroid/widget/SeekBar;->setProgress(I)V
+
+    :goto_4
+    return-void
+.end method
+
+.method private final getAutoVADCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->autoVADCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x7
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getEchoCancellationCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->echoCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x8
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getGainControlCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->gainControlCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xa
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getHardwareScalingCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->hardwareScalingCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x15
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getInputModeContainer()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x2
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getInputModelValue()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModelValue$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x1
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
+.method private final getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xb
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getNoiseCancellationInfo()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xc
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
+.method private final getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseSuppressionCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x9
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESDefault$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x4
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceDisabled$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x6
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceEnabled$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x5
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getOverlayCS()Lcom/discord/views/CheckedSetting;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->overlayCS$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/views/CheckedSetting;
+
+    return-object v0
+.end method
+
+.method private final getVideoSettingsContainer()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->videoSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x14
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getVoiceOutputVolume()Landroid/widget/SeekBar;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceOutputVolume$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xd
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/SeekBar;
+
+    return-object v0
+.end method
+
+.method private final getVoiceSensitivityAutomatic()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityAutomatic$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xf
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getVoiceSensitivityLabel()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x11
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
+.method private final getVoiceSensitivityManual()Landroid/widget/SeekBar;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityManual$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xe
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/SeekBar;
+
+    return-object v0
+.end method
+
+.method private final getVoiceSensitivityTestingButton()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x13
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/Button;
+
+    return-object v0
+.end method
+
+.method private final getVoiceSensitivityTestingContainer()Landroid/view/ViewGroup;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x12
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    return-object v0
+.end method
+
+.method private final getVoiceSensitivityWrap()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x10
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getVoiceVideoGuide()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceVideoGuide$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x3
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
+.method public static final launch(Landroid/content/Context;Ljava/lang/Integer;Z)V
+    .locals 1
+    .param p1    # Ljava/lang/Integer;
+        .annotation build Landroidx/annotation/IdRes;
+        .end annotation
+    .end param
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+
+    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;Z)V
+
+    return-void
+.end method
+
+.method private final onOpenSLESConfigChanged()V
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_4
+
+    iget-object v2, v0, Lcom/discord/views/RadioManager;->a:Ljava/util/List;
+
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->b()I
+
+    move-result v0
+
+    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/Checkable;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v2
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->DEFAULT:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+    goto :goto_0
+
+    :cond_0
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v2
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->FORCE_ENABLED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+    goto :goto_0
+
+    :cond_1
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v2
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->FORCE_DISABLED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+    :cond_2
+    :goto_0
+    if-eqz v1, :cond_3
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreMediaEngine;->setOpenSLESConfig(Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;)V
+
+    :cond_3
+    const v0, 0x7f12176a
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x4
+
+    invoke-static {p0, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
+
+    return-void
+
+    :cond_4
+    const-string v0, "openSLESConfigRadioManager"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method private final onOverlayToggled()V
+    .locals 12
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getMobileOverlay()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getRtcConnection()Lcom/discord/stores/StoreRtcConnection;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceChannelSelected;->get()Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v2, "filter { it != null }.map { it!! }"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2;
+
+    invoke-static {v0, v1, v2}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable\n          .co\u2026 -> rtcState to channel }"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v1, 0xc8
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout(Lrx/Observable;JZ)Lrx/Observable;
+
+    move-result-object v0
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-static {v0, p0, v2, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v3
+
+    const-class v4, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    new-instance v9, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3;
+
+    invoke-direct {v9, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+
+    const/16 v10, 0x1e
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, 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
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion;
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object v1
+
+    const-string v2, "requireActivity()"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->requestOverlayClose(Landroid/content/Context;)V
+
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d027a
+
+    return v0
+.end method
+
+.method public onActivityResult(IILandroid/content/Intent;)V
+    .locals 1
+
+    const/16 v0, 0x9f8
+
+    if-ne p1, v0, :cond_0
+
+    sget-object p1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+    move-result-object p2
+
+    const-string p3, "requireContext()"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->access$hasOverlayPermission(Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;Landroid/content/Context;)Z
+
+    move-result p1
+
+    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+    move-result-object p2
+
+    invoke-virtual {p2, p1}, Lcom/discord/stores/StoreUserSettings;->setMobileOverlay(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object p2
+
+    invoke-virtual {p2, p1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->onOverlayToggled()V
+
+    return-void
+
+    :cond_0
+    invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppFragment;->onActivityResult(IILandroid/content/Intent;)V
+
+    return-void
+.end method
+
+.method public onViewBound(Landroid/view/View;)V
+    .locals 7
+
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [Lcom/discord/views/CheckedSetting;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    const/4 v3, 0x1
+
+    aput-object v1, v0, v3
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    const/4 v4, 0x2
+
+    aput-object v1, v0, v4
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioButtons:Ljava/util/List;
+
+    new-instance v1, Lcom/discord/views/RadioManager;
+
+    const/4 v4, 0x0
+
+    if-eqz v0, :cond_4
+
+    invoke-direct {v1, v0}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
+
+    iput-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getMobileOverlay()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+    move-result-object v5
+
+    const-string v6, "requireContext()"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->access$hasOverlayPermission(Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;Landroid/content/Context;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
+
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v0
+
+    const-string v1, "ARG_TARGET_RES_ID"
+
+    invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :goto_1
+    if-nez v3, :cond_2
+
+    move-object v4, v0
+
+    :cond_2
+    if-eqz v4, :cond_3
+
+    invoke-virtual {v4}, Ljava/lang/Number;->intValue()I
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1;
+
+    invoke-direct {v1, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1;-><init>(Landroid/view/View;)V
+
+    const-wide/16 v3, 0x3e8
+
+    invoke-virtual {v0, v1, v3, v4}, Landroid/view/View;->postDelayed(Ljava/lang/Runnable;J)Z
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/views/CheckedSetting;->isChecked()Z
+
+    move-result v1
+
+    if-nez v1, :cond_3
+
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v1
+
+    const-string v3, "ARG_TARGET_AUTO_TOGGLE"
+
+    invoke-virtual {v1, v3, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;Landroid/view/View;)V
+
+    invoke-virtual {v0, v1}, Landroid/view/View;->post(Ljava/lang/Runnable;)Z
+
+    :cond_3
+    return-void
+
+    :cond_4
+    const-string p1, "openSLESConfigRadioButtons"
+
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v4
+.end method
+
+.method public onViewBoundOrOnResume()V
+    .locals 12
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceOutputVolume()Landroid/widget/SeekBar;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1;
+
+    invoke-direct {v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1;-><init>()V
+
+    invoke-virtual {v0, v1}, Landroid/widget/SeekBar;->setOnSeekBarChangeListener(Landroid/widget/SeekBar$OnSeekBarChangeListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Landroid/widget/SeekBar;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
+
+    invoke-direct {v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;-><init>()V
+
+    invoke-virtual {v0, v1}, Landroid/widget/SeekBar;->setOnSeekBarChangeListener(Landroid/widget/SeekBar$OnSeekBarChangeListener;)V
+
+    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
+
+    const-string v2, "requestListenForSensitivitySubject"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;->get(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {v0, p0, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v3
+
+    const-class v4, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    new-instance v9, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;
+
+    invoke-direct {v9, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/16 v10, 0x1e
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, 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/lytefast/flexinput/fragment/CameraFragment$a.smali b/com.discord/smali/com/lytefast/flexinput/fragment/CameraFragment$a.smali
index 5ad7a93f03..1061a72861 100644
--- a/com.discord/smali/com/lytefast/flexinput/fragment/CameraFragment$a.smali
+++ b/com.discord/smali/com/lytefast/flexinput/fragment/CameraFragment$a.smali
@@ -83,14 +83,14 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     invoke-interface {v0}, Ljava/util/List;->size()I
@@ -112,7 +112,7 @@
 
     const-string v6, "cameraView.facing"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lf/n/a/k/a;->getIndices(Ljava/util/Collection;)Lkotlin/ranges/IntRange;
 
@@ -125,17 +125,17 @@
     :cond_2
     move-object v7, v6
 
-    check-cast v7, Lj0/q/b;
+    check-cast v7, Lk0/r/b;
 
-    iget-boolean v7, v7, Lj0/q/b;->e:Z
+    iget-boolean v7, v7, Lk0/r/b;->e:Z
 
     if-eqz v7, :cond_4
 
     move-object v7, v6
 
-    check-cast v7, Lj0/i/q;
+    check-cast v7, Lk0/j/q;
 
-    invoke-virtual {v7}, Lj0/i/q;->next()Ljava/lang/Object;
+    invoke-virtual {v7}, Lk0/j/q;->next()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -188,7 +188,7 @@
 
     rem-int/2addr v4, v3
 
-    invoke-static {v0, v4}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v0, v4}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -207,7 +207,7 @@
     goto :goto_3
 
     :cond_6
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -216,12 +216,12 @@
     return-void
 
     :cond_8
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_9
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -251,14 +251,14 @@
 
     if-eqz p1, :cond_c
 
-    invoke-static {p1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object p1
 
     goto :goto_4
 
     :cond_c
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_4
     invoke-interface {p1}, Ljava/util/List;->size()I
@@ -280,7 +280,7 @@
 
     const-string v6, "cameraView.flash"
 
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lf/n/a/k/a;->getIndices(Ljava/util/Collection;)Lkotlin/ranges/IntRange;
 
@@ -293,17 +293,17 @@
     :cond_e
     move-object v7, v6
 
-    check-cast v7, Lj0/q/b;
+    check-cast v7, Lk0/r/b;
 
-    iget-boolean v7, v7, Lj0/q/b;->e:Z
+    iget-boolean v7, v7, Lk0/r/b;->e:Z
 
     if-eqz v7, :cond_10
 
     move-object v7, v6
 
-    check-cast v7, Lj0/i/q;
+    check-cast v7, Lk0/j/q;
 
-    invoke-virtual {v7}, Lj0/i/q;->next()Ljava/lang/Object;
+    invoke-virtual {v7}, Lk0/j/q;->next()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -356,7 +356,7 @@
 
     rem-int/2addr v4, v0
 
-    invoke-static {p1, v4}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {p1, v4}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -376,7 +376,7 @@
     goto :goto_7
 
     :cond_12
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -395,7 +395,7 @@
 
     const-string p1, "getString(R.string.camera_unknown_error)"
 
-    invoke-static {v6, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x1
 
@@ -412,12 +412,12 @@
     return-void
 
     :cond_14
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_15
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -428,7 +428,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -436,7 +436,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/lytefast/flexinput/fragment/CameraFragment;->h(Lcom/lytefast/flexinput/fragment/CameraFragment;Landroid/content/Context;)V
 
@@ -456,7 +456,7 @@
     return-void
 
     :cond_18
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/com/lytefast/flexinput/fragment/FlexInputFragment$a.smali b/com.discord/smali/com/lytefast/flexinput/fragment/FlexInputFragment$a.smali
index 3bca8ffef6..daa6887fe6 100644
--- a/com.discord/smali/com/lytefast/flexinput/fragment/FlexInputFragment$a.smali
+++ b/com.discord/smali/com/lytefast/flexinput/fragment/FlexInputFragment$a.smali
@@ -73,7 +73,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-interface {p1, v0}, Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;->onAttachmentsUpdated(Ljava/util/List;)V
 
@@ -83,7 +83,7 @@
     :cond_1
     const-string p1, "attachmentPreviewAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
diff --git a/com.discord/smali/d0.smali b/com.discord/smali/d0.smali
new file mode 100644
index 0000000000..b2ddcdc44e
--- /dev/null
+++ b/com.discord/smali/d0.smali
@@ -0,0 +1,58 @@
+.class public final Ld0;
+.super Lk0/o/c/j;
+.source "WidgetRemoteAuthViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:LWidgetRemoteAuthViewModel;
+
+
+# direct methods
+.method public constructor <init>(LWidgetRemoteAuthViewModel;)V
+    .locals 0
+
+    iput-object p1, p0, Ld0;->this$0:LWidgetRemoteAuthViewModel;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lcom/discord/utilities/error/Error;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Ld0;->this$0:LWidgetRemoteAuthViewModel;
+
+    sget-object v0, LWidgetRemoteAuthViewModel$ViewState$a;->a:LWidgetRemoteAuthViewModel$ViewState$a;
+
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/d0/a/a/a$a$a.smali b/com.discord/smali/d0/a/a/a$a$a.smali
deleted file mode 100644
index 839d991f5e..0000000000
--- a/com.discord/smali/d0/a/a/a$a$a.smali
+++ /dev/null
@@ -1,475 +0,0 @@
-.class public Ld0/a/a/a$a$a;
-.super Ljava/lang/Object;
-.source "ICustomTabsCallback.java"
-
-# interfaces
-.implements Ld0/a/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/a$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Landroid/os/IBinder;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/IBinder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    return-object v0
-.end method
-
-.method public extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p2, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x3
-
-    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p2, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x7
-
-    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/os/Bundle;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public onMessageChannelReady(Landroid/os/Bundle;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p1, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x4
-
-    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public onNavigationEvent(ILandroid/os/Bundle;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p2, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x2
-
-    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p2, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x5
-
-    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    const/4 p1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    if-eqz p3, :cond_1
-
-    const/4 p2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p2, 0x0
-
-    :goto_1
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    if-eqz p4, :cond_2
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p4, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_2
-    iget-object p1, p0, Ld0/a/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 p2, 0x6
-
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/d0/a/a/a$a.smali b/com.discord/smali/d0/a/a/a$a.smali
deleted file mode 100644
index 4701d405ea..0000000000
--- a/com.discord/smali/d0/a/a/a$a.smali
+++ /dev/null
@@ -1,358 +0,0 @@
-.class public abstract Ld0/a/a/a$a;
-.super Landroid/os/Binder;
-.source "ICustomTabsCallback.java"
-
-# interfaces
-.implements Ld0/a/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/a$a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.ICustomTabsCallback"
-
-.field public static final TRANSACTION_extraCallback:I = 0x3
-
-.field public static final TRANSACTION_extraCallbackWithResult:I = 0x7
-
-.field public static final TRANSACTION_onMessageChannelReady:I = 0x4
-
-.field public static final TRANSACTION_onNavigationEvent:I = 0x2
-
-.field public static final TRANSACTION_onPostMessage:I = 0x5
-
-.field public static final TRANSACTION_onRelationshipValidationResult:I = 0x6
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
-
-    const-string v0, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public static asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    const-string v0, "android.support.customtabs.ICustomTabsCallback"
-
-    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    instance-of v1, v0, Ld0/a/a/a;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Ld0/a/a/a;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ld0/a/a/a$a$a;
-
-    invoke-direct {v0, p0}, Ld0/a/a/a$a$a;-><init>(Landroid/os/IBinder;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    const v0, 0x5f4e5446
-
-    const/4 v1, 0x1
-
-    const-string v2, "android.support.customtabs.ICustomTabsCallback"
-
-    if-eq p1, v0, :cond_9
-
-    const/4 v0, 0x0
-
-    const/4 v3, 0x0
-
-    packed-switch p1, :pswitch_data_0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result p1
-
-    return p1
-
-    :pswitch_0
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_0
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v3, p2
-
-    check-cast v3, Landroid/os/Bundle;
-
-    :cond_0
-    invoke-interface {p0, p1, v3}, Ld0/a/a/a;->extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
-
-    move-result-object p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p3, v0}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    return v1
-
-    :pswitch_1
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_2
-
-    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p4
-
-    check-cast p4, Landroid/net/Uri;
-
-    goto :goto_1
-
-    :cond_2
-    move-object p4, v3
-
-    :goto_1
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    const/4 v0, 0x1
-
-    :cond_3
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v2, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v3, p2
-
-    check-cast v3, Landroid/os/Bundle;
-
-    :cond_4
-    invoke-interface {p0, p1, p4, v0, v3}, Ld0/a/a/a;->onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v1
-
-    :pswitch_2
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_5
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v3, p2
-
-    check-cast v3, Landroid/os/Bundle;
-
-    :cond_5
-    invoke-interface {p0, p1, v3}, Ld0/a/a/a;->onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v1
-
-    :pswitch_3
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_6
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v3, p1
-
-    check-cast v3, Landroid/os/Bundle;
-
-    :cond_6
-    invoke-interface {p0, v3}, Ld0/a/a/a;->onMessageChannelReady(Landroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v1
-
-    :pswitch_4
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_7
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v3, p2
-
-    check-cast v3, Landroid/os/Bundle;
-
-    :cond_7
-    invoke-interface {p0, p1, v3}, Ld0/a/a/a;->extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v1
-
-    :pswitch_5
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_8
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v3, p2
-
-    check-cast v3, Landroid/os/Bundle;
-
-    :cond_8
-    invoke-interface {p0, p1, v3}, Ld0/a/a/a;->onNavigationEvent(ILandroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v1
-
-    :cond_9
-    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    return v1
-
-    :pswitch_data_0
-    .packed-switch 0x2
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali/d0/a/a/a.smali b/com.discord/smali/d0/a/a/a.smali
deleted file mode 100644
index 871a583911..0000000000
--- a/com.discord/smali/d0/a/a/a.smali
+++ /dev/null
@@ -1,64 +0,0 @@
-.class public interface abstract Ld0/a/a/a;
-.super Ljava/lang/Object;
-.source "ICustomTabsCallback.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/a$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract onMessageChannelReady(Landroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract onNavigationEvent(ILandroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/d0/a/a/b$a$a.smali b/com.discord/smali/d0/a/a/b$a$a.smali
deleted file mode 100644
index 5bf1b8f777..0000000000
--- a/com.discord/smali/d0/a/a/b$a$a.smali
+++ /dev/null
@@ -1,1016 +0,0 @@
-.class public Ld0/a/a/b$a$a;
-.super Ljava/lang/Object;
-.source "ICustomTabsService.java"
-
-# interfaces
-.implements Ld0/a/a/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/b$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Landroid/os/IBinder;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/IBinder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    return-object v0
-.end method
-
-.method public extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x5
-
-    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/os/Bundle;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public mayLaunchUrl(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ld0/a/a/a;",
-            "Landroid/net/Uri;",
-            "Landroid/os/Bundle;",
-            "Ljava/util/List<",
-            "Landroid/os/Bundle;",
-            ">;)Z"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    const/4 p1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    if-eqz p3, :cond_2
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_2
-    invoke-virtual {v0, p4}, Landroid/os/Parcel;->writeTypedList(Ljava/util/List;)V
-
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/4 p3, 0x4
-
-    invoke-interface {p2, p3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p2, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_3
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public newSession(Ld0/a/a/a;)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    iget-object p1, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x0
-
-    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p1, :cond_1
-
-    const/4 v3, 0x1
-
-    :cond_1
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return v3
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public newSessionWithExtras(Ld0/a/a/a;Landroid/os/Bundle;)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    const/4 p1, 0x1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p2, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/16 v3, 0xa
-
-    invoke-interface {p2, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public postMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    if-eqz p3, :cond_1
-
-    const/4 p2, 0x1
-
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p3, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/16 p3, 0x8
-
-    invoke-interface {p2, p3, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public receiveFile(Ld0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    const/4 p1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    invoke-virtual {v0, p3}, Landroid/os/Parcel;->writeInt(I)V
-
-    if-eqz p4, :cond_2
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p4, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_2
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/16 p3, 0xc
-
-    invoke-interface {p2, p3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p2, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_3
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public requestPostMessageChannel(Ld0/a/a/a;Landroid/net/Uri;)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    const/4 p1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x7
-
-    invoke-interface {p2, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p2, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    const/4 p1, 0x0
-
-    :goto_2
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public requestPostMessageChannelWithExtras(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    const/4 p1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    if-eqz p3, :cond_2
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_2
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/16 p3, 0xb
-
-    invoke-interface {p2, p3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p2, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_3
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    const/4 p1, 0x1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p2, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    iget-object p2, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x6
-
-    invoke-interface {p2, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public validateRelationship(Ld0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    const/4 p1, 0x1
-
-    const/4 p2, 0x0
-
-    if-eqz p3, :cond_1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p3, v0, p2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    if-eqz p4, :cond_2
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p4, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_2
-    iget-object p3, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/16 p4, 0x9
-
-    invoke-interface {p3, p4, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p3
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p3, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_3
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public warmup(J)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1, p2}, Landroid/os/Parcel;->writeLong(J)V
-
-    iget-object p1, p0, Ld0/a/a/b$a$a;->a:Landroid/os/IBinder;
-
-    const/4 p2, 0x2
-
-    const/4 v2, 0x0
-
-    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p1, :cond_0
-
-    const/4 v2, 0x1
-
-    :cond_0
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return v2
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/d0/a/a/b$a.smali b/com.discord/smali/d0/a/a/b$a.smali
deleted file mode 100644
index 31bdc154db..0000000000
--- a/com.discord/smali/d0/a/a/b$a.smali
+++ /dev/null
@@ -1,638 +0,0 @@
-.class public abstract Ld0/a/a/b$a;
-.super Landroid/os/Binder;
-.source "ICustomTabsService.java"
-
-# interfaces
-.implements Ld0/a/a/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/b$a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.ICustomTabsService"
-
-.field public static final TRANSACTION_extraCommand:I = 0x5
-
-.field public static final TRANSACTION_mayLaunchUrl:I = 0x4
-
-.field public static final TRANSACTION_newSession:I = 0x3
-
-.field public static final TRANSACTION_newSessionWithExtras:I = 0xa
-
-.field public static final TRANSACTION_postMessage:I = 0x8
-
-.field public static final TRANSACTION_receiveFile:I = 0xc
-
-.field public static final TRANSACTION_requestPostMessageChannel:I = 0x7
-
-.field public static final TRANSACTION_requestPostMessageChannelWithExtras:I = 0xb
-
-.field public static final TRANSACTION_updateVisuals:I = 0x6
-
-.field public static final TRANSACTION_validateRelationship:I = 0x9
-
-.field public static final TRANSACTION_warmup:I = 0x2
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
-
-    const-string v0, "android.support.customtabs.ICustomTabsService"
-
-    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public static asInterface(Landroid/os/IBinder;)Ld0/a/a/b;
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    const-string v0, "android.support.customtabs.ICustomTabsService"
-
-    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    instance-of v1, v0, Ld0/a/a/b;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Ld0/a/a/b;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ld0/a/a/b$a$a;
-
-    invoke-direct {v0, p0}, Ld0/a/a/b$a$a;-><init>(Landroid/os/IBinder;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    const v0, 0x5f4e5446
-
-    const/4 v1, 0x1
-
-    const-string v2, "android.support.customtabs.ICustomTabsService"
-
-    if-eq p1, v0, :cond_e
-
-    const/4 v0, 0x0
-
-    packed-switch p1, :pswitch_data_0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result p1
-
-    return p1
-
-    :pswitch_0
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_0
-
-    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p4
-
-    check-cast p4, Landroid/net/Uri;
-
-    goto :goto_0
-
-    :cond_0
-    move-object p4, v0
-
-    :goto_0
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_1
-    invoke-interface {p0, p1, p4, v2, v0}, Ld0/a/a/b;->receiveFile(Ld0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_1
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_2
-
-    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p4
-
-    check-cast p4, Landroid/net/Uri;
-
-    goto :goto_1
-
-    :cond_2
-    move-object p4, v0
-
-    :goto_1
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_3
-    invoke-interface {p0, p1, p4, v0}, Ld0/a/a/b;->requestPostMessageChannelWithExtras(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_2
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_4
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_4
-    invoke-interface {p0, p1, v0}, Ld0/a/a/b;->newSessionWithExtras(Ld0/a/a/a;Landroid/os/Bundle;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_3
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_5
-
-    sget-object v2, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v2, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/net/Uri;
-
-    goto :goto_2
-
-    :cond_5
-    move-object v2, v0
-
-    :goto_2
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v3
-
-    if-eqz v3, :cond_6
-
-    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_6
-    invoke-interface {p0, p1, p4, v2, v0}, Ld0/a/a/b;->validateRelationship(Ld0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_4
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p4
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_7
-
-    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_7
-    invoke-interface {p0, p1, p4, v0}, Ld0/a/a/b;->postMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_5
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_8
-
-    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/net/Uri;
-
-    :cond_8
-    invoke-interface {p0, p1, v0}, Ld0/a/a/b;->requestPostMessageChannel(Ld0/a/a/a;Landroid/net/Uri;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_6
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_9
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_9
-    invoke-interface {p0, p1, v0}, Ld0/a/a/b;->updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_7
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_a
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v0, p2
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_a
-    invoke-interface {p0, p1, v0}, Ld0/a/a/b;->extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
-
-    move-result-object p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    if-eqz p1, :cond_b
-
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_3
-
-    :cond_b
-    const/4 p1, 0x0
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_3
-    return v1
-
-    :pswitch_8
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_c
-
-    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p4
-
-    check-cast p4, Landroid/net/Uri;
-
-    goto :goto_4
-
-    :cond_c
-    move-object p4, v0
-
-    :goto_4
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_d
-
-    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_d
-    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->createTypedArrayList(Landroid/os/Parcelable$Creator;)Ljava/util/ArrayList;
-
-    move-result-object p2
-
-    invoke-interface {p0, p1, p4, v0, p2}, Ld0/a/a/b;->mayLaunchUrl(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_9
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Ld0/a/a/b;->newSession(Ld0/a/a/a;)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_a
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readLong()J
-
-    move-result-wide p1
-
-    invoke-interface {p0, p1, p2}, Ld0/a/a/b;->warmup(J)Z
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :cond_e
-    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    return v1
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x2
-        :pswitch_a
-        :pswitch_9
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali/d0/a/a/b.smali b/com.discord/smali/d0/a/a/b.smali
deleted file mode 100644
index 22efa717bc..0000000000
--- a/com.discord/smali/d0/a/a/b.smali
+++ /dev/null
@@ -1,116 +0,0 @@
-.class public interface abstract Ld0/a/a/b;
-.super Ljava/lang/Object;
-.source "ICustomTabsService.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/b$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract mayLaunchUrl(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ld0/a/a/a;",
-            "Landroid/net/Uri;",
-            "Landroid/os/Bundle;",
-            "Ljava/util/List<",
-            "Landroid/os/Bundle;",
-            ">;)Z"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract newSession(Ld0/a/a/a;)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract newSessionWithExtras(Ld0/a/a/a;Landroid/os/Bundle;)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract postMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract receiveFile(Ld0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract requestPostMessageChannel(Ld0/a/a/a;Landroid/net/Uri;)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract requestPostMessageChannelWithExtras(Ld0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract updateVisuals(Ld0/a/a/a;Landroid/os/Bundle;)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract validateRelationship(Ld0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract warmup(J)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/d0/a/a/c$a$a.smali b/com.discord/smali/d0/a/a/c$a$a.smali
deleted file mode 100644
index 98b4e6fb66..0000000000
--- a/com.discord/smali/d0/a/a/c$a$a.smali
+++ /dev/null
@@ -1,199 +0,0 @@
-.class public Ld0/a/a/c$a$a;
-.super Ljava/lang/Object;
-.source "IPostMessageService.java"
-
-# interfaces
-.implements Ld0/a/a/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/c$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Landroid/os/IBinder;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/IBinder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ld0/a/a/c$a$a;->a:Landroid/os/IBinder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/a/c$a$a;->a:Landroid/os/IBinder;
-
-    return-object v0
-.end method
-
-.method public onMessageChannelReady(Ld0/a/a/a;Landroid/os/Bundle;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.IPostMessageService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_1
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    iget-object p2, p0, Ld0/a/a/c$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x2
-
-    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public onPostMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.IPostMessageService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    if-eqz p3, :cond_1
-
-    const/4 p2, 0x1
-
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p3, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    iget-object p2, p0, Ld0/a/a/c$a$a;->a:Landroid/os/IBinder;
-
-    const/4 p3, 0x3
-
-    invoke-interface {p2, p3, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/d0/a/a/c$a.smali b/com.discord/smali/d0/a/a/c$a.smali
deleted file mode 100644
index cae47bdeab..0000000000
--- a/com.discord/smali/d0/a/a/c$a.smali
+++ /dev/null
@@ -1,197 +0,0 @@
-.class public abstract Ld0/a/a/c$a;
-.super Landroid/os/Binder;
-.source "IPostMessageService.java"
-
-# interfaces
-.implements Ld0/a/a/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/c$a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.IPostMessageService"
-
-.field public static final TRANSACTION_onMessageChannelReady:I = 0x2
-
-.field public static final TRANSACTION_onPostMessage:I = 0x3
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
-
-    const-string v0, "android.support.customtabs.IPostMessageService"
-
-    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public static asInterface(Landroid/os/IBinder;)Ld0/a/a/c;
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    const-string v0, "android.support.customtabs.IPostMessageService"
-
-    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    instance-of v1, v0, Ld0/a/a/c;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Ld0/a/a/c;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ld0/a/a/c$a$a;
-
-    invoke-direct {v0, p0}, Ld0/a/a/c$a$a;-><init>(Landroid/os/IBinder;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    const/4 v0, 0x2
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    const-string v3, "android.support.customtabs.IPostMessageService"
-
-    if-eq p1, v0, :cond_3
-
-    const/4 v0, 0x3
-
-    if-eq p1, v0, :cond_1
-
-    const v0, 0x5f4e5446
-
-    if-eq p1, v0, :cond_0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    return v2
-
-    :cond_1
-    invoke-virtual {p2, v3}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p4
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v1, p2
-
-    check-cast v1, Landroid/os/Bundle;
-
-    :cond_2
-    invoke-interface {p0, p1, p4, v1}, Ld0/a/a/c;->onPostMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v2
-
-    :cond_3
-    invoke-virtual {p2, v3}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ld0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Ld0/a/a/a;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p4
-
-    if-eqz p4, :cond_4
-
-    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    move-object v1, p2
-
-    check-cast v1, Landroid/os/Bundle;
-
-    :cond_4
-    invoke-interface {p0, p1, v1}, Ld0/a/a/c;->onMessageChannelReady(Ld0/a/a/a;Landroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v2
-.end method
diff --git a/com.discord/smali/d0/a/a/c.smali b/com.discord/smali/d0/a/a/c.smali
deleted file mode 100644
index 79d1c8654c..0000000000
--- a/com.discord/smali/d0/a/a/c.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract Ld0/a/a/c;
-.super Ljava/lang/Object;
-.source "IPostMessageService.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/c$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract onMessageChannelReady(Ld0/a/a/a;Landroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract onPostMessage(Ld0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/d0/a/a/d/a$a$a.smali b/com.discord/smali/d0/a/a/d/a$a$a.smali
deleted file mode 100644
index c4f25825e5..0000000000
--- a/com.discord/smali/d0/a/a/d/a$a$a.smali
+++ /dev/null
@@ -1,463 +0,0 @@
-.class public Ld0/a/a/d/a$a$a;
-.super Ljava/lang/Object;
-.source "ITrustedWebActivityService.java"
-
-# interfaces
-.implements Ld0/a/a/d/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/d/a$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Landroid/os/IBinder;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/IBinder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p1, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x6
-
-    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/os/Bundle;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public asBinder()Landroid/os/IBinder;
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    return-object v0
-.end method
-
-.method public cancelNotification(Landroid/os/Bundle;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p1, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x3
-
-    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public getActiveNotifications()Landroid/os/Bundle;
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    iget-object v2, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x5
-
-    const/4 v4, 0x0
-
-    invoke-interface {v2, v3, v0, v1, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v2, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/os/Bundle;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-object v2
-
-    :catchall_0
-    move-exception v2
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw v2
-.end method
-
-.method public getSmallIconBitmap()Landroid/os/Bundle;
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    iget-object v2, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x7
-
-    const/4 v4, 0x0
-
-    invoke-interface {v2, v3, v0, v1, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v2, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/os/Bundle;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-object v2
-
-    :catchall_0
-    move-exception v2
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw v2
-.end method
-
-.method public getSmallIconId()I
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    iget-object v2, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x4
-
-    const/4 v4, 0x0
-
-    invoke-interface {v2, v3, v0, v1, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result v2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return v2
-
-    :catchall_0
-    move-exception v2
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw v2
-.end method
-
-.method public notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p1, p0, Ld0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x2
-
-    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/os/Bundle;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/d0/a/a/d/a$a.smali b/com.discord/smali/d0/a/a/d/a$a.smali
deleted file mode 100644
index 191e7d3cb1..0000000000
--- a/com.discord/smali/d0/a/a/d/a$a.smali
+++ /dev/null
@@ -1,306 +0,0 @@
-.class public abstract Ld0/a/a/d/a$a;
-.super Landroid/os/Binder;
-.source "ITrustedWebActivityService.java"
-
-# interfaces
-.implements Ld0/a/a/d/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/a/d/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/d/a$a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-.field public static final TRANSACTION_areNotificationsEnabled:I = 0x6
-
-.field public static final TRANSACTION_cancelNotification:I = 0x3
-
-.field public static final TRANSACTION_getActiveNotifications:I = 0x5
-
-.field public static final TRANSACTION_getSmallIconBitmap:I = 0x7
-
-.field public static final TRANSACTION_getSmallIconId:I = 0x4
-
-.field public static final TRANSACTION_notifyNotificationWithChannel:I = 0x2
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
-
-    const-string v0, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public static asInterface(Landroid/os/IBinder;)Ld0/a/a/d/a;
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    const-string v0, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    instance-of v1, v0, Ld0/a/a/d/a;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Ld0/a/a/d/a;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ld0/a/a/d/a$a$a;
-
-    invoke-direct {v0, p0}, Ld0/a/a/d/a$a$a;-><init>(Landroid/os/IBinder;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    const v0, 0x5f4e5446
-
-    const/4 v1, 0x1
-
-    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
-
-    if-eq p1, v0, :cond_7
-
-    const/4 v0, 0x0
-
-    const/4 v3, 0x0
-
-    packed-switch p1, :pswitch_data_0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result p1
-
-    return p1
-
-    :pswitch_0
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-interface {p0}, Ld0/a/a/d/a;->getSmallIconBitmap()Landroid/os/Bundle;
-
-    move-result-object p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    return v1
-
-    :pswitch_1
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_1
-    invoke-interface {p0, v0}, Ld0/a/a/d/a;->areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
-
-    move-result-object p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_1
-
-    :cond_2
-    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_1
-    return v1
-
-    :pswitch_2
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-interface {p0}, Ld0/a/a/d/a;->getActiveNotifications()Landroid/os/Bundle;
-
-    move-result-object p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    if-eqz p1, :cond_3
-
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_2
-
-    :cond_3
-    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_2
-    return v1
-
-    :pswitch_3
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-interface {p0}, Ld0/a/a/d/a;->getSmallIconId()I
-
-    move-result p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    return v1
-
-    :pswitch_4
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_4
-    invoke-interface {p0, v0}, Ld0/a/a/d/a;->cancelNotification(Landroid/os/Bundle;)V
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    return v1
-
-    :pswitch_5
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_5
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_5
-    invoke-interface {p0, v0}, Ld0/a/a/d/a;->notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
-
-    move-result-object p1
-
-    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
-
-    if-eqz p1, :cond_6
-
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_3
-
-    :cond_6
-    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_3
-    return v1
-
-    :cond_7
-    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    return v1
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x2
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali/d0/a/a/d/a.smali b/com.discord/smali/d0/a/a/d/a.smali
deleted file mode 100644
index de62de5e13..0000000000
--- a/com.discord/smali/d0/a/a/d/a.smali
+++ /dev/null
@@ -1,64 +0,0 @@
-.class public interface abstract Ld0/a/a/d/a;
-.super Ljava/lang/Object;
-.source "ITrustedWebActivityService.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/a/d/a$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract cancelNotification(Landroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract getActiveNotifications()Landroid/os/Bundle;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract getSmallIconBitmap()Landroid/os/Bundle;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract getSmallIconId()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/d0/a/b/a/a$a$a.smali b/com.discord/smali/d0/a/b/a/a$a$a.smali
deleted file mode 100644
index 87bc9651a1..0000000000
--- a/com.discord/smali/d0/a/b/a/a$a$a.smali
+++ /dev/null
@@ -1,259 +0,0 @@
-.class public Ld0/a/b/a/a$a$a;
-.super Ljava/lang/Object;
-.source "INotificationSideChannel.java"
-
-# interfaces
-.implements Ld0/a/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/a/a$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static b:Ld0/a/b/a/a;
-
-
-# instance fields
-.field public a:Landroid/os/IBinder;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/IBinder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ld0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
-
-    return-object v0
-.end method
-
-.method public cancel(Ljava/lang/String;ILjava/lang/String;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    :try_start_0
-    const-string v1, "android.support.v4.app.INotificationSideChannel"
-
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {v0, p3}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    iget-object v1, p0, Ld0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x2
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    invoke-interface {v1, v2, v0, v3, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    invoke-static {}, Ld0/a/b/a/a$a;->getDefaultImpl()Ld0/a/b/a/a;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-static {}, Ld0/a/b/a/a$a;->getDefaultImpl()Ld0/a/b/a/a;
-
-    move-result-object v1
-
-    invoke-interface {v1, p1, p2, p3}, Ld0/a/b/a/a;->cancel(Ljava/lang/String;ILjava/lang/String;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :cond_0
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public cancelAll(Ljava/lang/String;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    :try_start_0
-    const-string v1, "android.support.v4.app.INotificationSideChannel"
-
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    iget-object v1, p0, Ld0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    invoke-interface {v1, v2, v0, v3, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    invoke-static {}, Ld0/a/b/a/a$a;->getDefaultImpl()Ld0/a/b/a/a;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-static {}, Ld0/a/b/a/a$a;->getDefaultImpl()Ld0/a/b/a/a;
-
-    move-result-object v1
-
-    invoke-interface {v1, p1}, Ld0/a/b/a/a;->cancelAll(Ljava/lang/String;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :cond_0
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
-
-.method public notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    :try_start_0
-    const-string v1, "android.support.v4.app.INotificationSideChannel"
-
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {v0, p3}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz p4, :cond_0
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p4, v0, v1}, Landroid/app/Notification;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object v1, p0, Ld0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v3, 0x0
-
-    invoke-interface {v1, v2, v0, v3, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    invoke-static {}, Ld0/a/b/a/a$a;->getDefaultImpl()Ld0/a/b/a/a;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    invoke-static {}, Ld0/a/b/a/a$a;->getDefaultImpl()Ld0/a/b/a/a;
-
-    move-result-object v1
-
-    invoke-interface {v1, p1, p2, p3, p4}, Ld0/a/b/a/a;->notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :cond_1
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/d0/a/b/a/a$a.smali b/com.discord/smali/d0/a/b/a/a$a.smali
deleted file mode 100644
index 0ee6c3186b..0000000000
--- a/com.discord/smali/d0/a/b/a/a$a.smali
+++ /dev/null
@@ -1,225 +0,0 @@
-.class public abstract Ld0/a/b/a/a$a;
-.super Landroid/os/Binder;
-.source "INotificationSideChannel.java"
-
-# interfaces
-.implements Ld0/a/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/a/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/a/a$a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.v4.app.INotificationSideChannel"
-
-.field public static final TRANSACTION_cancel:I = 0x2
-
-.field public static final TRANSACTION_cancelAll:I = 0x3
-
-.field public static final TRANSACTION_notify:I = 0x1
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
-
-    const-string v0, "android.support.v4.app.INotificationSideChannel"
-
-    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public static asInterface(Landroid/os/IBinder;)Ld0/a/b/a/a;
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    const-string v0, "android.support.v4.app.INotificationSideChannel"
-
-    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    instance-of v1, v0, Ld0/a/b/a/a;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Ld0/a/b/a/a;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ld0/a/b/a/a$a$a;
-
-    invoke-direct {v0, p0}, Ld0/a/b/a/a$a$a;-><init>(Landroid/os/IBinder;)V
-
-    return-object v0
-.end method
-
-.method public static getDefaultImpl()Ld0/a/b/a/a;
-    .locals 1
-
-    sget-object v0, Ld0/a/b/a/a$a$a;->b:Ld0/a/b/a/a;
-
-    return-object v0
-.end method
-
-.method public static setDefaultImpl(Ld0/a/b/a/a;)Z
-    .locals 1
-
-    sget-object v0, Ld0/a/b/a/a$a$a;->b:Ld0/a/b/a/a;
-
-    if-nez v0, :cond_0
-
-    if-eqz p0, :cond_0
-
-    sput-object p0, Ld0/a/b/a/a$a$a;->b:Ld0/a/b/a/a;
-
-    const/4 p0, 0x1
-
-    return p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    return p0
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    const-string v1, "android.support.v4.app.INotificationSideChannel"
-
-    if-eq p1, v0, :cond_3
-
-    const/4 v2, 0x2
-
-    if-eq p1, v2, :cond_2
-
-    const/4 v2, 0x3
-
-    if-eq p1, v2, :cond_1
-
-    const v2, 0x5f4e5446
-
-    if-eq p1, v2, :cond_0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    return v0
-
-    :cond_1
-    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Ld0/a/b/a/a;->cancelAll(Ljava/lang/String;)V
-
-    return v0
-
-    :cond_2
-    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p3
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-interface {p0, p1, p3, p2}, Ld0/a/b/a/a;->cancel(Ljava/lang/String;ILjava/lang/String;)V
-
-    return v0
-
-    :cond_3
-    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p3
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    move-result-object p4
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    sget-object v1, Landroid/app/Notification;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Landroid/app/Notification;
-
-    goto :goto_0
-
-    :cond_4
-    const/4 p2, 0x0
-
-    :goto_0
-    invoke-interface {p0, p1, p3, p4, p2}, Ld0/a/b/a/a;->notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
-
-    return v0
-.end method
diff --git a/com.discord/smali/d0/a/b/a/a.smali b/com.discord/smali/d0/a/b/a/a.smali
deleted file mode 100644
index 5a3e830fb7..0000000000
--- a/com.discord/smali/d0/a/b/a/a.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public interface abstract Ld0/a/b/a/a;
-.super Ljava/lang/Object;
-.source "INotificationSideChannel.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/a/a$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract cancel(Ljava/lang/String;ILjava/lang/String;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract cancelAll(Ljava/lang/String;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/d0/a/b/b/a.smali b/com.discord/smali/d0/a/b/b/a.smali
deleted file mode 100644
index 08d9576191..0000000000
--- a/com.discord/smali/d0/a/b/b/a.smali
+++ /dev/null
@@ -1,8905 +0,0 @@
-.class public Ld0/a/b/b/a;
-.super Ljava/lang/Object;
-.source "MediaDescriptionCompatApi21.java"
-
-
-# static fields
-.field public static a:Lf/c/a/d0;
-
-.field public static b:Ljava/lang/String;
-
-.field public static c:Ljava/util/concurrent/ScheduledExecutorService;
-
-
-# direct methods
-.method public static A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
-    .locals 11
-
-    invoke-static {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->i(Lcom/facebook/imagepipeline/image/EncodedImage;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    invoke-static {p0, p1, p2}, Ld0/a/b/b/a;->z(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;)F
-
-    move-result p0
-
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget-object v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->f:Lf/g/i/c;
-
-    sget-object v2, Lf/g/i/b;->a:Lf/g/i/c;
-
-    const-wide v3, 0x3fd5555560000000L    # 0.3333333432674408
-
-    const-wide/high16 v5, 0x3ff0000000000000L    # 1.0
-
-    const v7, 0x3f2aaaab
-
-    const/4 v8, 0x2
-
-    if-ne v0, v2, :cond_3
-
-    cmpl-float v0, p0, v7
-
-    if-lez v0, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    const/4 v1, 0x2
-
-    :goto_0
-    mul-int/lit8 v0, v1, 0x2
-
-    int-to-double v7, v0
-
-    div-double v7, v5, v7
-
-    mul-double v9, v7, v3
-
-    add-double/2addr v9, v7
-
-    float-to-double v7, p0
-
-    cmpg-double v2, v9, v7
-
-    if-gtz v2, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    move v1, v0
-
-    goto :goto_0
-
-    :cond_3
-    cmpl-float v0, p0, v7
-
-    if-lez v0, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    :goto_1
-    int-to-double v0, v8
-
-    const-wide/high16 v9, 0x4000000000000000L    # 2.0
-
-    invoke-static {v0, v1, v9, v10}, Ljava/lang/Math;->pow(DD)D
-
-    move-result-wide v9
-
-    sub-double/2addr v9, v0
-
-    div-double v9, v5, v9
-
-    div-double v0, v5, v0
-
-    mul-double v9, v9, v3
-
-    add-double/2addr v9, v0
-
-    float-to-double v0, p0
-
-    cmpg-double v2, v9, v0
-
-    if-gtz v2, :cond_8
-
-    add-int/lit8 v1, v8, -0x1
-
-    :goto_2
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
-
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
-
-    invoke-static {p0, v0}, Ljava/lang/Math;->max(II)I
-
-    move-result p0
-
-    if-eqz p1, :cond_5
-
-    iget p1, p1, Lf/g/j/d/d;->c:F
-
-    goto :goto_3
-
-    :cond_5
-    int-to-float p1, p3
-
-    :goto_3
-    div-int p3, p0, v1
-
-    int-to-float p3, p3
-
-    cmpl-float p3, p3, p1
-
-    if-lez p3, :cond_7
-
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget-object p3, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->f:Lf/g/i/c;
-
-    sget-object v0, Lf/g/i/b;->a:Lf/g/i/c;
-
-    if-ne p3, v0, :cond_6
-
-    mul-int/lit8 v1, v1, 0x2
-
-    goto :goto_3
-
-    :cond_6
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_3
-
-    :cond_7
-    return v1
-
-    :cond_8
-    add-int/lit8 v8, v8, 0x1
-
-    goto :goto_1
-.end method
-
-.method public static A0(Lf/h/a/c/a1/e;[BII)I
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;,
-            Ljava/lang/InterruptedException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :goto_0
-    if-ge v0, p3, :cond_3
-
-    add-int v1, p2, v0
-
-    sub-int v5, p3, v0
-
-    invoke-virtual {p0, v5}, Lf/h/a/c/a1/e;->c(I)V
-
-    iget v2, p0, Lf/h/a/c/a1/e;->g:I
-
-    iget v4, p0, Lf/h/a/c/a1/e;->f:I
-
-    sub-int/2addr v2, v4
-
-    const/4 v8, -0x1
-
-    if-nez v2, :cond_1
-
-    iget-object v3, p0, Lf/h/a/c/a1/e;->e:[B
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
-
-    move-object v2, p0
-
-    invoke-virtual/range {v2 .. v7}, Lf/h/a/c/a1/e;->g([BIIIZ)I
-
-    move-result v2
-
-    if-ne v2, v8, :cond_0
-
-    const/4 v2, -0x1
-
-    goto :goto_2
-
-    :cond_0
-    iget v3, p0, Lf/h/a/c/a1/e;->g:I
-
-    add-int/2addr v3, v2
-
-    iput v3, p0, Lf/h/a/c/a1/e;->g:I
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {v5, v2}, Ljava/lang/Math;->min(II)I
-
-    move-result v2
-
-    :goto_1
-    iget-object v3, p0, Lf/h/a/c/a1/e;->e:[B
-
-    iget v4, p0, Lf/h/a/c/a1/e;->f:I
-
-    invoke-static {v3, v4, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget v1, p0, Lf/h/a/c/a1/e;->f:I
-
-    add-int/2addr v1, v2
-
-    iput v1, p0, Lf/h/a/c/a1/e;->f:I
-
-    :goto_2
-    if-ne v2, v8, :cond_2
-
-    goto :goto_3
-
-    :cond_2
-    add-int/2addr v0, v2
-
-    goto :goto_0
-
-    :cond_3
-    :goto_3
-    return v0
-.end method
-
-.method public static B(Ljava/io/File;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    aget-object v3, v0, v2
-
-    invoke-static {v3}, Ld0/a/b/b/a;->B(Ljava/io/File;)V
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Ljava/io/File;->delete()Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    invoke-virtual {p0}, Ljava/io/File;->exists()Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v0, Ljava/io/IOException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "could not delete: "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    :goto_1
-    return-void
-.end method
-
-.method public static B0(Ljava/lang/Throwable;)V
-    .locals 2
-
-    const-class v0, Ljava/lang/Error;
-
-    invoke-virtual {v0, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    const-class v0, Ljava/lang/RuntimeException;
-
-    invoke-virtual {v0, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {v0, p0}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Ljava/lang/Throwable;
-
-    throw p0
-
-    :cond_1
-    invoke-virtual {v0, p0}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Ljava/lang/Throwable;
-
-    throw p0
-.end method
-
-.method public static C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-    .locals 0
-
-    invoke-static {p0}, Ld0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-static {p0, p1, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
-    return-void
-.end method
-
-.method public static C0(Ljava/util/List;Lf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/n1;
-    .locals 11
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Landroid/net/UrlQuerySanitizer$ParameterValuePair;",
-            ">;",
-            "Lf/c/a/v;",
-            "Lf/c/a/w;",
-            "Lf/c/a/p0;",
-            "Lf/c/a/x1;",
-            ")",
-            "Lf/c/a/n1;"
-        }
-    .end annotation
-
-    if-nez p0, :cond_0
-
-    const/4 v0, 0x0
-
-    return-object v0
-
-    :cond_0
-    new-instance v7, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v7}, Ljava/util/LinkedHashMap;-><init>()V
-
-    new-instance v8, Lcom/adjust/sdk/AdjustAttribution;
-
-    invoke-direct {v8}, Lcom/adjust/sdk/AdjustAttribution;-><init>()V
-
-    invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_1
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_a
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Landroid/net/UrlQuerySanitizer$ParameterValuePair;
-
-    iget-object v2, v1, Landroid/net/UrlQuerySanitizer$ParameterValuePair;->mParameter:Ljava/lang/String;
-
-    iget-object v1, v1, Landroid/net/UrlQuerySanitizer$ParameterValuePair;->mValue:Ljava/lang/String;
-
-    const/4 v4, 0x0
-
-    if-eqz v2, :cond_1
-
-    if-nez v1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const-string v5, "adjust_"
-
-    invoke-virtual {v2, v5}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v5, 0x7
-
-    invoke-virtual {v2, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    if-nez v5, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    if-nez v5, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    const-string v5, "tracker"
-
-    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_6
-
-    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->trackerName:Ljava/lang/String;
-
-    goto :goto_1
-
-    :cond_6
-    const-string v5, "campaign"
-
-    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_7
-
-    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->campaign:Ljava/lang/String;
-
-    goto :goto_1
-
-    :cond_7
-    const-string v5, "adgroup"
-
-    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_8
-
-    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->adgroup:Ljava/lang/String;
-
-    goto :goto_1
-
-    :cond_8
-    const-string v5, "creative"
-
-    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_9
-
-    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->creative:Ljava/lang/String;
-
-    :goto_1
-    const/4 v4, 0x1
-
-    :cond_9
-    if-nez v4, :cond_1
-
-    invoke-virtual {v7, v2, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_a
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v5
-
-    const-string v0, "reftag"
-
-    invoke-virtual {v7, v0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v9, v0
-
-    check-cast v9, Ljava/lang/String;
-
-    if-eqz p1, :cond_b
-
-    iget-wide v0, p1, Lf/c/a/v;->lastActivity:J
-
-    sub-long v0, v5, v0
-
-    iput-wide v0, p1, Lf/c/a/v;->lastInterval:J
-
-    :cond_b
-    new-instance v10, Lf/c/a/n1;
-
-    move-object v0, v10
-
-    move-object v1, p2
-
-    move-object v2, p3
-
-    move-object v3, p1
-
-    move-object v4, p4
-
-    invoke-direct/range {v0 .. v6}, Lf/c/a/n1;-><init>(Lf/c/a/w;Lf/c/a/p0;Lf/c/a/v;Lf/c/a/x1;J)V
-
-    iput-object v7, v10, Lf/c/a/n1;->o:Ljava/util/Map;
-
-    iput-object v8, v10, Lf/c/a/n1;->n:Lcom/adjust/sdk/AdjustAttribution;
-
-    iput-object v9, v10, Lf/c/a/n1;->i:Ljava/lang/String;
-
-    return-object v10
-.end method
-
-.method public static D(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .locals 0
-
-    if-eq p0, p1, :cond_1
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 p0, 0x1
-
-    :goto_1
-    return p0
-.end method
-
-.method public static D0(Ljava/io/InputStream;[BII)I
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-ltz p3, :cond_2
-
-    const/4 v0, 0x0
-
-    :goto_0
-    if-ge v0, p3, :cond_1
-
-    add-int v1, p2, v0
-
-    sub-int v2, p3, v0
-
-    invoke-virtual {p0, p1, v1, v2}, Ljava/io/InputStream;->read([BII)I
-
-    move-result v1
-
-    const/4 v2, -0x1
-
-    if-ne v1, v2, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    add-int/2addr v0, v1
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    return v0
-
-    :cond_2
-    new-instance p0, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string p1, "len is negative"
-
-    invoke-direct {p0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static E(FII)I
-    .locals 7
-
-    shr-int/lit8 v0, p1, 0x18
-
-    and-int/lit16 v0, v0, 0xff
-
-    int-to-float v0, v0
-
-    const/high16 v1, 0x437f0000    # 255.0f
-
-    div-float/2addr v0, v1
-
-    shr-int/lit8 v2, p1, 0x10
-
-    and-int/lit16 v2, v2, 0xff
-
-    int-to-float v2, v2
-
-    div-float/2addr v2, v1
-
-    shr-int/lit8 v3, p1, 0x8
-
-    and-int/lit16 v3, v3, 0xff
-
-    int-to-float v3, v3
-
-    div-float/2addr v3, v1
-
-    and-int/lit16 p1, p1, 0xff
-
-    int-to-float p1, p1
-
-    div-float/2addr p1, v1
-
-    shr-int/lit8 v4, p2, 0x18
-
-    and-int/lit16 v4, v4, 0xff
-
-    int-to-float v4, v4
-
-    div-float/2addr v4, v1
-
-    shr-int/lit8 v5, p2, 0x10
-
-    and-int/lit16 v5, v5, 0xff
-
-    int-to-float v5, v5
-
-    div-float/2addr v5, v1
-
-    shr-int/lit8 v6, p2, 0x8
-
-    and-int/lit16 v6, v6, 0xff
-
-    int-to-float v6, v6
-
-    div-float/2addr v6, v1
-
-    and-int/lit16 p2, p2, 0xff
-
-    int-to-float p2, p2
-
-    div-float/2addr p2, v1
-
-    invoke-static {v2}, Ld0/a/b/b/a;->a(F)F
-
-    move-result v2
-
-    invoke-static {v3}, Ld0/a/b/b/a;->a(F)F
-
-    move-result v3
-
-    invoke-static {p1}, Ld0/a/b/b/a;->a(F)F
-
-    move-result p1
-
-    invoke-static {v5}, Ld0/a/b/b/a;->a(F)F
-
-    move-result v5
-
-    invoke-static {v6}, Ld0/a/b/b/a;->a(F)F
-
-    move-result v6
-
-    invoke-static {p2}, Ld0/a/b/b/a;->a(F)F
-
-    move-result p2
-
-    invoke-static {v4, v0, p0, v0}, Lf/e/b/a/a;->a(FFFF)F
-
-    move-result v0
-
-    invoke-static {v5, v2, p0, v2}, Lf/e/b/a/a;->a(FFFF)F
-
-    move-result v2
-
-    invoke-static {v6, v3, p0, v3}, Lf/e/b/a/a;->a(FFFF)F
-
-    move-result v3
-
-    invoke-static {p2, p1, p0, p1}, Lf/e/b/a/a;->a(FFFF)F
-
-    move-result p0
-
-    mul-float v0, v0, v1
-
-    invoke-static {v2}, Ld0/a/b/b/a;->b(F)F
-
-    move-result p1
-
-    mul-float p1, p1, v1
-
-    invoke-static {v3}, Ld0/a/b/b/a;->b(F)F
-
-    move-result p2
-
-    mul-float p2, p2, v1
-
-    invoke-static {p0}, Ld0/a/b/b/a;->b(F)F
-
-    move-result p0
-
-    mul-float p0, p0, v1
-
-    invoke-static {v0}, Ljava/lang/Math;->round(F)I
-
-    move-result v0
-
-    shl-int/lit8 v0, v0, 0x18
-
-    invoke-static {p1}, Ljava/lang/Math;->round(F)I
-
-    move-result p1
-
-    shl-int/lit8 p1, p1, 0x10
-
-    or-int/2addr p1, v0
-
-    invoke-static {p2}, Ljava/lang/Math;->round(F)I
-
-    move-result p2
-
-    shl-int/lit8 p2, p2, 0x8
-
-    or-int/2addr p1, p2
-
-    invoke-static {p0}, Ljava/lang/Math;->round(F)I
-
-    move-result p0
-
-    or-int/2addr p0, p1
-
-    return p0
-.end method
-
-.method public static E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
-
-    invoke-virtual {p1, p2}, Ljava/nio/ByteBuffer;->limit(I)Ljava/nio/Buffer;
-
-    :goto_0
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
-
-    move-result p2
-
-    if-lez p2, :cond_1
-
-    invoke-virtual {p0, p1, p3, p4}, Ljava/nio/channels/FileChannel;->read(Ljava/nio/ByteBuffer;J)I
-
-    move-result p2
-
-    const/4 v1, -0x1
-
-    if-ne p2, v1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    int-to-long v1, p2
-
-    add-long/2addr p3, v1
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
-
-    move-result p0
-
-    if-gtz p0, :cond_2
-
-    invoke-virtual {p1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
-
-    return-void
-
-    :cond_2
-    new-instance p0, Lf/g/m/h;
-
-    const-string p1, "ELF file truncated"
-
-    invoke-direct {p0, p1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static F(Ljava/nio/channels/FileChannel;)[Ljava/lang/String;
-    .locals 35
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    const/16 v1, 0x8
-
-    invoke-static {v1}, Ljava/nio/ByteBuffer;->allocate(I)Ljava/nio/ByteBuffer;
-
-    move-result-object v1
-
-    sget-object v2, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
-
-    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
-
-    const-wide/16 v2, 0x0
-
-    invoke-static {v0, v1, v2, v3}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v4
-
-    const-wide/32 v6, 0x464c457f
-
-    cmp-long v8, v4, v6
-
-    if-nez v8, :cond_25
-
-    const-wide/16 v4, 0x4
-
-    invoke-static {v0, v1, v4, v5}, Ld0/a/b/b/a;->c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
-
-    move-result v6
-
-    const/4 v8, 0x1
-
-    if-ne v6, v8, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v8, 0x0
-
-    :goto_0
-    const-wide/16 v9, 0x5
-
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
-
-    move-result v6
-
-    const/4 v11, 0x2
-
-    if-ne v6, v11, :cond_1
-
-    sget-object v6, Ljava/nio/ByteOrder;->BIG_ENDIAN:Ljava/nio/ByteOrder;
-
-    invoke-virtual {v1, v6}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
-
-    :cond_1
-    const-wide/16 v11, 0x1c
-
-    const-wide/16 v13, 0x20
-
-    if-eqz v8, :cond_2
-
-    invoke-static {v0, v1, v11, v12}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v15
-
-    goto :goto_1
-
-    :cond_2
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v15
-
-    :goto_1
-    const-wide/16 v9, 0x2c
-
-    if-eqz v8, :cond_3
-
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
-
-    move-result v6
-
-    int-to-long v4, v6
-
-    goto :goto_2
-
-    :cond_3
-    const-wide/16 v4, 0x38
-
-    invoke-static {v0, v1, v4, v5}, Ld0/a/b/b/a;->a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
-
-    move-result v4
-
-    int-to-long v4, v4
-
-    :goto_2
-    if-eqz v8, :cond_4
-
-    const-wide/16 v2, 0x2a
-
-    goto :goto_3
-
-    :cond_4
-    const-wide/16 v2, 0x36
-
-    :goto_3
-    invoke-static {v0, v1, v2, v3}, Ld0/a/b/b/a;->a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
-
-    move-result v2
-
-    const-wide/32 v23, 0xffff
-
-    const-wide/16 v9, 0x28
-
-    cmp-long v3, v4, v23
-
-    if-nez v3, :cond_7
-
-    if-eqz v8, :cond_5
-
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v3
-
-    goto :goto_4
-
-    :cond_5
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v3
-
-    :goto_4
-    if-eqz v8, :cond_6
-
-    add-long/2addr v3, v11
-
-    invoke-static {v0, v1, v3, v4}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v3
-
-    goto :goto_5
-
-    :cond_6
-    const-wide/16 v5, 0x2c
-
-    add-long/2addr v3, v5
-
-    invoke-static {v0, v1, v3, v4}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v3
-
-    :goto_5
-    move-wide v4, v3
-
-    :cond_7
-    move-wide v13, v15
-
-    const-wide/16 v11, 0x0
-
-    :goto_6
-    const-wide/16 v23, 0x1
-
-    const-wide/16 v25, 0x8
-
-    cmp-long v3, v11, v4
-
-    if-gez v3, :cond_b
-
-    if-eqz v8, :cond_8
-
-    const-wide/16 v21, 0x0
-
-    add-long v9, v13, v21
-
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v9
-
-    goto :goto_7
-
-    :cond_8
-    const-wide/16 v21, 0x0
-
-    add-long v9, v13, v21
-
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v9
-
-    :goto_7
-    const-wide/16 v29, 0x2
-
-    cmp-long v3, v9, v29
-
-    if-nez v3, :cond_a
-
-    if-eqz v8, :cond_9
-
-    const-wide/16 v9, 0x4
-
-    add-long/2addr v13, v9
-
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v9
-
-    goto :goto_8
-
-    :cond_9
-    add-long v13, v13, v25
-
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v9
-
-    goto :goto_8
-
-    :cond_a
-    int-to-long v9, v2
-
-    add-long/2addr v13, v9
-
-    add-long v11, v11, v23
-
-    const-wide/16 v9, 0x28
-
-    goto :goto_6
-
-    :cond_b
-    const-wide/16 v9, 0x0
-
-    :goto_8
-    const-wide/16 v21, 0x0
-
-    cmp-long v3, v9, v21
-
-    if-eqz v3, :cond_24
-
-    move-wide v13, v9
-
-    move-wide/from16 v11, v21
-
-    const/4 v3, 0x0
-
-    :goto_9
-    move/from16 v29, v8
-
-    if-eqz v8, :cond_c
-
-    add-long v7, v13, v21
-
-    invoke-static {v0, v1, v7, v8}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v7
-
-    goto :goto_a
-
-    :cond_c
-    add-long v7, v13, v21
-
-    invoke-static {v0, v1, v7, v8}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v7
-
-    :goto_a
-    const-string v6, "malformed DT_NEEDED section"
-
-    cmp-long v31, v7, v23
-
-    if-nez v31, :cond_e
-
-    move-wide/from16 v31, v9
-
-    const v9, 0x7fffffff
-
-    if-eq v3, v9, :cond_d
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_c
-
-    :cond_d
-    new-instance v0, Lf/g/m/h;
-
-    invoke-direct {v0, v6}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
-    move-wide/from16 v31, v9
-
-    const-wide/16 v9, 0x5
-
-    cmp-long v17, v7, v9
-
-    if-nez v17, :cond_10
-
-    if-eqz v29, :cond_f
-
-    const-wide/16 v11, 0x4
-
-    add-long v9, v13, v11
-
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v9
-
-    goto :goto_b
-
-    :cond_f
-    add-long v9, v13, v25
-
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v9
-
-    :goto_b
-    move-wide v11, v9
-
-    :cond_10
-    :goto_c
-    const-wide/16 v9, 0x10
-
-    if-eqz v29, :cond_11
-
-    move-wide/from16 v33, v25
-
-    goto :goto_d
-
-    :cond_11
-    move-wide/from16 v33, v9
-
-    :goto_d
-    add-long v13, v13, v33
-
-    const-wide/16 v21, 0x0
-
-    cmp-long v33, v7, v21
-
-    if-nez v33, :cond_23
-
-    cmp-long v7, v11, v21
-
-    if-eqz v7, :cond_22
-
-    const/4 v7, 0x0
-
-    :goto_e
-    int-to-long v13, v7
-
-    cmp-long v8, v13, v4
-
-    if-gez v8, :cond_18
-
-    if-eqz v29, :cond_12
-
-    add-long v13, v15, v21
-
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v13
-
-    goto :goto_f
-
-    :cond_12
-    add-long v13, v15, v21
-
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v13
-
-    :goto_f
-    cmp-long v8, v13, v23
-
-    if-nez v8, :cond_16
-
-    if-eqz v29, :cond_13
-
-    add-long v13, v15, v25
-
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v13
-
-    goto :goto_10
-
-    :cond_13
-    add-long v13, v15, v9
-
-    invoke-static {v0, v1, v13, v14}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v13
-
-    :goto_10
-    if-eqz v29, :cond_14
-
-    const-wide/16 v17, 0x14
-
-    add-long v9, v15, v17
-
-    invoke-static {v0, v1, v9, v10}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v8
-
-    move-wide/from16 v27, v4
-
-    move-wide v4, v8
-
-    const-wide/16 v8, 0x28
-
-    goto :goto_11
-
-    :cond_14
-    move-wide/from16 v27, v4
-
-    const-wide/16 v8, 0x28
-
-    add-long v4, v15, v8
-
-    invoke-static {v0, v1, v4, v5}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v4
-
-    :goto_11
-    cmp-long v10, v13, v11
-
-    if-gtz v10, :cond_17
-
-    add-long/2addr v4, v13
-
-    cmp-long v10, v11, v4
-
-    if-gez v10, :cond_17
-
-    if-eqz v29, :cond_15
-
-    const-wide/16 v4, 0x4
-
-    add-long v7, v15, v4
-
-    invoke-static {v0, v1, v7, v8}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v4
-
-    goto :goto_12
-
-    :cond_15
-    add-long v4, v15, v25
-
-    invoke-static {v0, v1, v4, v5}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v4
-
-    :goto_12
-    sub-long/2addr v11, v13
-
-    add-long/2addr v4, v11
-
-    goto :goto_13
-
-    :cond_16
-    move-wide/from16 v27, v4
-
-    const-wide/16 v8, 0x28
-
-    :cond_17
-    int-to-long v4, v2
-
-    add-long/2addr v15, v4
-
-    add-int/lit8 v7, v7, 0x1
-
-    move-wide/from16 v4, v27
-
-    const-wide/16 v9, 0x10
-
-    const-wide/16 v21, 0x0
-
-    goto :goto_e
-
-    :cond_18
-    const-wide/16 v4, 0x0
-
-    :goto_13
-    const-wide/16 v7, 0x0
-
-    cmp-long v2, v4, v7
-
-    if-eqz v2, :cond_21
-
-    new-array v2, v3, [Ljava/lang/String;
-
-    const/4 v9, 0x0
-
-    :goto_14
-    add-long v10, v31, v7
-
-    if-eqz v29, :cond_19
-
-    invoke-static {v0, v1, v10, v11}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v10
-
-    goto :goto_15
-
-    :cond_19
-    invoke-static {v0, v1, v10, v11}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v10
-
-    :goto_15
-    cmp-long v7, v10, v23
-
-    if-nez v7, :cond_1d
-
-    if-eqz v29, :cond_1a
-
-    const-wide/16 v19, 0x4
-
-    add-long v7, v31, v19
-
-    invoke-static {v0, v1, v7, v8}, Ld0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v7
-
-    goto :goto_16
-
-    :cond_1a
-    const-wide/16 v19, 0x4
-
-    add-long v7, v31, v25
-
-    invoke-static {v0, v1, v7, v8}, Ld0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-
-    move-result-wide v7
-
-    :goto_16
-    add-long/2addr v7, v4
-
-    new-instance v12, Ljava/lang/StringBuilder;
-
-    invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
-
-    :goto_17
-    add-long v13, v7, v23
-
-    invoke-static {v0, v1, v7, v8}, Ld0/a/b/b/a;->c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
-
-    move-result v7
-
-    if-eqz v7, :cond_1b
-
-    int-to-char v7, v7
-
-    invoke-virtual {v12, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    move-wide v7, v13
-
-    goto :goto_17
-
-    :cond_1b
-    invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v7
-
-    aput-object v7, v2, v9
-
-    const v7, 0x7fffffff
-
-    if-eq v9, v7, :cond_1c
-
-    add-int/lit8 v9, v9, 0x1
-
-    goto :goto_18
-
-    :cond_1c
-    new-instance v0, Lf/g/m/h;
-
-    invoke-direct {v0, v6}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1d
-    const v7, 0x7fffffff
-
-    const-wide/16 v19, 0x4
-
-    :goto_18
-    if-eqz v29, :cond_1e
-
-    move-wide/from16 v12, v25
-
-    goto :goto_19
-
-    :cond_1e
-    const-wide/16 v12, 0x10
-
-    :goto_19
-    add-long v31, v31, v12
-
-    const-wide/16 v21, 0x0
-
-    cmp-long v8, v10, v21
-
-    if-nez v8, :cond_20
-
-    if-ne v9, v3, :cond_1f
-
-    return-object v2
-
-    :cond_1f
-    new-instance v0, Lf/g/m/h;
-
-    invoke-direct {v0, v6}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_20
-    move-wide/from16 v7, v21
-
-    goto :goto_14
-
-    :cond_21
-    new-instance v0, Lf/g/m/h;
-
-    const-string v1, "did not find file offset of DT_STRTAB table"
-
-    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_22
-    new-instance v0, Lf/g/m/h;
-
-    const-string v1, "Dynamic section string-table not found"
-
-    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_23
-    const-wide/16 v8, 0x28
-
-    const-wide/16 v19, 0x4
-
-    move/from16 v8, v29
-
-    move-wide/from16 v9, v31
-
-    goto/16 :goto_9
-
-    :cond_24
-    new-instance v0, Lf/g/m/h;
-
-    const-string v1, "ELF file does not contain dynamic linking information"
-
-    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_25
-    new-instance v0, Lf/g/m/h;
-
-    const-string v1, "file is not ELF"
-
-    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static F0(Ljava/io/InputStream;)I
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    int-to-byte v0, v0
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    int-to-byte v1, v1
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result p0
-
-    and-int/lit16 p0, p0, 0xff
-
-    int-to-byte p0, p0
-
-    shl-int/lit8 p0, p0, 0x10
-
-    const/high16 v2, 0xff0000
-
-    and-int/2addr p0, v2
-
-    shl-int/lit8 v1, v1, 0x8
-
-    const v2, 0xff00
-
-    and-int/2addr v1, v2
-
-    or-int/2addr p0, v1
-
-    and-int/lit16 v0, v0, 0xff
-
-    or-int/2addr p0, v0
-
-    return p0
-.end method
-
-.method public static varargs G(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-    .locals 6
-
-    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    array-length v2, p1
-
-    mul-int/lit8 v2, v2, 0x10
-
-    add-int/2addr v2, v1
-
-    invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    array-length v3, p1
-
-    if-ge v1, v3, :cond_1
-
-    const-string v3, "%s"
-
-    invoke-virtual {p0, v3, v2}, Ljava/lang/String;->indexOf(Ljava/lang/String;I)I
-
-    move-result v3
-
-    const/4 v4, -0x1
-
-    if-ne v3, v4, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-virtual {p0, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v2, v1, 0x1
-
-    aget-object v1, p1, v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v1, v3, 0x2
-
-    move v5, v2
-
-    move v2, v1
-
-    move v1, v5
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    invoke-virtual {p0, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    array-length p0, p1
-
-    if-ge v1, p0, :cond_3
-
-    const-string p0, " ["
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 p0, v1, 0x1
-
-    aget-object v1, p1, v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    :goto_2
-    array-length v1, p1
-
-    if-ge p0, v1, :cond_2
-
-    const-string v1, ", "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v1, p0, 0x1
-
-    aget-object p0, p1, p0
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    move p0, v1
-
-    goto :goto_2
-
-    :cond_2
-    const/16 p0, 0x5d
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :cond_3
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static G0(Ljavax/net/ssl/HttpsURLConnection;Lf/c/a/u;)Lf/c/a/r1;
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/StringBuffer;
-
-    invoke-direct {v0}, Ljava/lang/StringBuffer;-><init>()V
-
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v1
-
-    invoke-static {p1}, Lf/c/a/r1;->a(Lf/c/a/u;)Lf/c/a/r1;
-
-    move-result-object p1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    :try_start_0
-    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->connect()V
-
-    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getResponseCode()I
-
-    move-result v4
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
-
-    move-result v5
-
-    const/16 v6, 0x190
-
-    if-lt v5, v6, :cond_0
-
-    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getErrorStream()Ljava/io/InputStream;
-
-    move-result-object v5
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getInputStream()Ljava/io/InputStream;
-
-    move-result-object v5
-
-    :goto_0
-    new-instance v6, Ljava/io/InputStreamReader;
-
-    invoke-direct {v6, v5}, Ljava/io/InputStreamReader;-><init>(Ljava/io/InputStream;)V
-
-    new-instance v5, Ljava/io/BufferedReader;
-
-    invoke-direct {v5, v6}, Ljava/io/BufferedReader;-><init>(Ljava/io/Reader;)V
-
-    :goto_1
-    invoke-virtual {v5}, Ljava/io/BufferedReader;->readLine()Ljava/lang/String;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_1
-
-    invoke-virtual {v0, v6}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->disconnect()V
-
-    invoke-virtual {v0}, Ljava/lang/StringBuffer;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    new-array v0, v2, [Ljava/lang/Object;
-
-    aput-object p0, v0, v3
-
-    const-string v5, "Response: %s"
-
-    invoke-interface {v1, v5, v0}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    const/16 v5, 0x1ad
-
-    if-ne v0, v5, :cond_2
-
-    new-array p0, v3, [Ljava/lang/Object;
-
-    const-string v0, "Too frequent requests to the endpoint (429)"
-
-    invoke-interface {v1, v0, p0}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    return-object p1
-
-    :cond_2
-    if-eqz p0, :cond_8
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v0, 0x0
-
-    :try_start_1
-    new-instance v5, Lorg/json/JSONObject;
-
-    invoke-direct {v5, p0}, Lorg/json/JSONObject;-><init>(Ljava/lang/String;)V
-    :try_end_1
-    .catch Lorg/json/JSONException; {:try_start_1 .. :try_end_1} :catch_0
-
-    goto :goto_2
-
-    :catch_0
-    move-exception p0
-
-    new-array v5, v2, [Ljava/lang/Object;
-
-    invoke-virtual {p0}, Lorg/json/JSONException;->getMessage()Ljava/lang/String;
-
-    move-result-object p0
-
-    aput-object p0, v5, v3
-
-    const-string p0, "Failed to parse json response. (%s)"
-
-    invoke-static {p0, v5}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-array v5, v3, [Ljava/lang/Object;
-
-    invoke-interface {v1, p0, v5}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    iput-object p0, p1, Lf/c/a/r1;->d:Ljava/lang/String;
-
-    move-object v5, v0
-
-    :goto_2
-    if-nez v5, :cond_4
-
-    return-object p1
-
-    :cond_4
-    iput-object v5, p1, Lf/c/a/r1;->f:Lorg/json/JSONObject;
-
-    const-string p0, "message"
-
-    invoke-virtual {v5, p0, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    iput-object p0, p1, Lf/c/a/r1;->d:Ljava/lang/String;
-
-    const-string v6, "timestamp"
-
-    invoke-virtual {v5, v6, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v6
-
-    iput-object v6, p1, Lf/c/a/r1;->e:Ljava/lang/String;
-
-    const-string v6, "adid"
-
-    invoke-virtual {v5, v6, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v6
-
-    iput-object v6, p1, Lf/c/a/r1;->c:Ljava/lang/String;
-
-    const-string v6, "tracking_state"
-
-    invoke-virtual {v5, v6, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_5
-
-    const-string v5, "opted_out"
-
-    invoke-virtual {v0, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    sget-object v0, Lf/c/a/a2;->d:Lf/c/a/a2;
-
-    iput-object v0, p1, Lf/c/a/r1;->g:Lf/c/a/a2;
-
-    :cond_5
-    if-nez p0, :cond_6
-
-    const-string p0, "No message found"
-
-    :cond_6
-    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    const/16 v4, 0xc8
-
-    const-string v5, "%s"
-
-    if-ne v0, v4, :cond_7
-
-    new-array v0, v2, [Ljava/lang/Object;
-
-    aput-object p0, v0, v3
-
-    invoke-interface {v1, v5, v0}, Lf/c/a/w0;->h(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    iput-boolean v2, p1, Lf/c/a/r1;->a:Z
-
-    goto :goto_3
-
-    :cond_7
-    new-array v0, v2, [Ljava/lang/Object;
-
-    aput-object p0, v0, v3
-
-    invoke-interface {v1, v5, v0}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    :cond_8
-    :goto_3
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_4
-
-    :catch_1
-    move-exception p1
-
-    :try_start_2
-    const-string v0, "Failed to read response. (%s)"
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v2, v3
-
-    invoke-interface {v1, v0, v2}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    throw p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :goto_4
-    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->disconnect()V
-
-    throw p1
-.end method
-
-.method public static H(Ljava/io/File;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const/4 p0, 0x0
-
-    :goto_0
-    array-length v1, v0
-
-    if-ge p0, v1, :cond_3
-
-    aget-object v1, v0, p0
-
-    invoke-static {v1}, Ld0/a/b/b/a;->H(Ljava/io/File;)V
-
-    add-int/lit8 p0, p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/io/IOException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "cannot list directory "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    invoke-virtual {p0}, Ljava/io/File;->getPath()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "_lock"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v0, Ljava/io/RandomAccessFile;
-
-    const-string v1, "r"
-
-    invoke-direct {v0, p0, v1}, Ljava/io/RandomAccessFile;-><init>(Ljava/io/File;Ljava/lang/String;)V
-
-    :try_start_0
-    invoke-virtual {v0}, Ljava/io/RandomAccessFile;->getFD()Ljava/io/FileDescriptor;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/io/FileDescriptor;->sync()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Ljava/io/RandomAccessFile;->close()V
-
-    :cond_3
-    :goto_1
-    return-void
-
-    :catchall_0
-    move-exception p0
-
-    :try_start_1
-    throw p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :catchall_1
-    move-exception v1
-
-    :try_start_2
-    invoke-virtual {v0}, Ljava/io/RandomAccessFile;->close()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    goto :goto_2
-
-    :catchall_2
-    move-exception v0
-
-    invoke-virtual {p0, v0}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
-
-    :goto_2
-    throw v1
-.end method
-
-.method public static H0(Lf/h/a/c/i1/t;)I
-    .locals 3
-
-    const/4 v0, 0x0
-
-    :cond_0
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->a()I
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    const/4 p0, -0x1
-
-    return p0
-
-    :cond_1
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
-
-    move-result v1
-
-    add-int/2addr v0, v1
-
-    const/16 v2, 0xff
-
-    if-eq v1, v2, :cond_0
-
-    return v0
-.end method
-
-.method public static I(Ljava/io/InputStream;)I
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v0
-
-    int-to-byte v0, v0
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result p0
-
-    int-to-byte p0, p0
-
-    shl-int/lit8 p0, p0, 0x8
-
-    const v1, 0xff00
-
-    and-int/2addr p0, v1
-
-    and-int/lit16 v0, v0, 0xff
-
-    or-int/2addr p0, v0
-
-    return p0
-.end method
-
-.method public static I0(Ljava/io/InputStream;IZ)I
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    :goto_0
-    if-ge v0, p1, :cond_2
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v2
-
-    const/4 v3, -0x1
-
-    if-eq v2, v3, :cond_1
-
-    if-eqz p2, :cond_0
-
-    and-int/lit16 v2, v2, 0xff
-
-    mul-int/lit8 v3, v0, 0x8
-
-    shl-int/2addr v2, v3
-
-    goto :goto_1
-
-    :cond_0
-    shl-int/lit8 v1, v1, 0x8
-
-    and-int/lit16 v2, v2, 0xff
-
-    :goto_1
-    or-int/2addr v1, v2
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p0, Ljava/io/IOException;
-
-    const-string p1, "no more bytes"
-
-    invoke-direct {p0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_2
-    return v1
-.end method
-
-.method public static J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/16 v0, 0x8
-
-    invoke-static {p0, p1, v0, p2, p3}, Ld0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
-
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->getLong()J
-
-    move-result-wide p0
-
-    return-wide p0
-.end method
-
-.method public static J0(Lf/h/a/c/i1/t;II)J
-    .locals 8
-
-    invoke-virtual {p0, p1}, Lf/h/a/c/i1/t;->C(I)V
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->a()I
-
-    move-result p1
-
-    const-wide v0, -0x7fffffffffffffffL    # -4.9E-324
-
-    const/4 v2, 0x5
-
-    if-ge p1, v2, :cond_0
-
-    return-wide v0
-
-    :cond_0
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->e()I
-
-    move-result p1
-
-    const/high16 v2, 0x800000
-
-    and-int/2addr v2, p1
-
-    if-eqz v2, :cond_1
-
-    return-wide v0
-
-    :cond_1
-    const v2, 0x1fff00
-
-    and-int/2addr v2, p1
-
-    shr-int/lit8 v2, v2, 0x8
-
-    if-eq v2, p2, :cond_2
-
-    return-wide v0
-
-    :cond_2
-    and-int/lit8 p1, p1, 0x20
-
-    const/4 p2, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz p1, :cond_3
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_0
-    if-nez p1, :cond_4
-
-    return-wide v0
-
-    :cond_4
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p1
-
-    const/4 v3, 0x7
-
-    if-lt p1, v3, :cond_6
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->a()I
-
-    move-result p1
-
-    if-lt p1, v3, :cond_6
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p1
-
-    const/16 v4, 0x10
-
-    and-int/2addr p1, v4
-
-    if-ne p1, v4, :cond_5
-
-    const/4 p1, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    const/4 p1, 0x0
-
-    :goto_1
-    if-eqz p1, :cond_6
-
-    const/4 p1, 0x6
-
-    new-array v0, p1, [B
-
-    iget-object v1, p0, Lf/h/a/c/i1/t;->a:[B
-
-    iget v4, p0, Lf/h/a/c/i1/t;->b:I
-
-    invoke-static {v1, v4, v0, p2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget v1, p0, Lf/h/a/c/i1/t;->b:I
-
-    add-int/2addr v1, p1
-
-    iput v1, p0, Lf/h/a/c/i1/t;->b:I
-
-    aget-byte p0, v0, p2
-
-    int-to-long p0, p0
-
-    const-wide/16 v4, 0xff
-
-    and-long/2addr p0, v4
-
-    const/16 p2, 0x19
-
-    shl-long/2addr p0, p2
-
-    aget-byte p2, v0, v2
-
-    int-to-long v6, p2
-
-    and-long/2addr v6, v4
-
-    const/16 p2, 0x11
-
-    shl-long/2addr v6, p2
-
-    or-long/2addr p0, v6
-
-    const/4 p2, 0x2
-
-    aget-byte p2, v0, p2
-
-    int-to-long v6, p2
-
-    and-long/2addr v6, v4
-
-    const/16 p2, 0x9
-
-    shl-long/2addr v6, p2
-
-    or-long/2addr p0, v6
-
-    const/4 p2, 0x3
-
-    aget-byte p2, v0, p2
-
-    int-to-long v6, p2
-
-    and-long/2addr v6, v4
-
-    shl-long v1, v6, v2
-
-    or-long/2addr p0, v1
-
-    const/4 p2, 0x4
-
-    aget-byte p2, v0, p2
-
-    int-to-long v0, p2
-
-    and-long/2addr v0, v4
-
-    shr-long/2addr v0, v3
-
-    or-long/2addr p0, v0
-
-    return-wide p0
-
-    :cond_6
-    return-wide v0
-.end method
-
-.method public static K(I)I
-    .locals 1
-
-    int-to-float p0, p0
-
-    const v0, 0x3faaaaab
-
-    mul-float p0, p0, v0
-
-    float-to-int p0, p0
-
-    return p0
-.end method
-
-.method public static K0(Lf/h/a/c/i1/t;)Lf/h/a/c/i1/m$a;
-    .locals 11
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p0, v0}, Lf/h/a/c/i1/t;->D(I)V
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->s()I
-
-    move-result v0
-
-    iget v1, p0, Lf/h/a/c/i1/t;->b:I
-
-    add-int/2addr v1, v0
-
-    int-to-long v1, v1
-
-    div-int/lit8 v0, v0, 0x12
-
-    new-array v3, v0, [J
-
-    new-array v4, v0, [J
-
-    const/4 v5, 0x0
-
-    :goto_0
-    if-ge v5, v0, :cond_1
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->k()J
-
-    move-result-wide v6
-
-    const-wide/16 v8, -0x1
-
-    cmp-long v10, v6, v8
-
-    if-nez v10, :cond_0
-
-    invoke-static {v3, v5}, Ljava/util/Arrays;->copyOf([JI)[J
-
-    move-result-object v3
-
-    invoke-static {v4, v5}, Ljava/util/Arrays;->copyOf([JI)[J
-
-    move-result-object v4
-
-    goto :goto_1
-
-    :cond_0
-    aput-wide v6, v3, v5
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->k()J
-
-    move-result-wide v6
-
-    aput-wide v6, v4, v5
-
-    const/4 v6, 0x2
-
-    invoke-virtual {p0, v6}, Lf/h/a/c/i1/t;->D(I)V
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    iget v0, p0, Lf/h/a/c/i1/t;->b:I
-
-    int-to-long v5, v0
-
-    sub-long/2addr v1, v5
-
-    long-to-int v0, v1
-
-    invoke-virtual {p0, v0}, Lf/h/a/c/i1/t;->D(I)V
-
-    new-instance p0, Lf/h/a/c/i1/m$a;
-
-    invoke-direct {p0, v3, v4}, Lf/h/a/c/i1/m$a;-><init>([J[J)V
-
-    return-object p0
-.end method
-
-.method public static L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-nez p0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    instance-of v1, p0, Lf/g/g/e/p;
-
-    if-eqz v1, :cond_1
-
-    check-cast p0, Lf/g/g/e/p;
-
-    return-object p0
-
-    :cond_1
-    instance-of v1, p0, Lf/g/g/e/d;
-
-    if-eqz v1, :cond_2
-
-    check-cast p0, Lf/g/g/e/d;
-
-    invoke-interface {p0}, Lf/g/g/e/d;->l()Landroid/graphics/drawable/Drawable;
-
-    move-result-object p0
-
-    invoke-static {p0}, Ld0/a/b/b/a;->L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    instance-of v1, p0, Lf/g/g/e/b;
-
-    if-eqz v1, :cond_4
-
-    check-cast p0, Lf/g/g/e/b;
-
-    iget-object v1, p0, Lf/g/g/e/b;->f:[Landroid/graphics/drawable/Drawable;
-
-    array-length v1, v1
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_4
-
-    invoke-virtual {p0, v2}, Lf/g/g/e/b;->a(I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    invoke-static {v3}, Ld0/a/b/b/a;->L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_3
-
-    return-object v3
-
-    :cond_3
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_4
-    return-object v0
-.end method
-
-.method public static L0(Lf/h/a/c/i1/t;ZZ)Lf/h/a/c/a1/u;
-    .locals 8
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/google/android/exoplayer2/ParserException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x3
-
-    invoke-static {p1, p0, v0}, Ld0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
-
-    :cond_0
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->h()J
-
-    move-result-wide v1
-
-    long-to-int p1, v1
-
-    invoke-virtual {p0, p1}, Lf/h/a/c/i1/t;->n(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0xb
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->h()J
-
-    move-result-wide v2
-
-    long-to-int v4, v2
-
-    new-array v4, v4, [Ljava/lang/String;
-
-    add-int/lit8 v1, v1, 0x4
-
-    :goto_0
-    int-to-long v5, v0
-
-    cmp-long v7, v5, v2
-
-    if-gez v7, :cond_1
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->h()J
-
-    move-result-wide v5
-
-    long-to-int v6, v5
-
-    add-int/lit8 v1, v1, 0x4
-
-    invoke-virtual {p0, v6}, Lf/h/a/c/i1/t;->n(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    aput-object v5, v4, v0
-
-    aget-object v5, v4, v0
-
-    invoke-virtual {v5}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    add-int/2addr v1, v5
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    if-eqz p2, :cond_3
-
-    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p0
-
-    and-int/lit8 p0, p0, 0x1
-
-    if-eqz p0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p0, Lcom/google/android/exoplayer2/ParserException;
-
-    const-string p1, "framing bit expected to be set"
-
-    invoke-direct {p0, p1}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_3
-    :goto_1
-    add-int/lit8 v1, v1, 0x1
-
-    new-instance p0, Lf/h/a/c/a1/u;
-
-    invoke-direct {p0, p1, v4, v1}, Lf/h/a/c/a1/u;-><init>(Ljava/lang/String;[Ljava/lang/String;I)V
-
-    return-object p0
-.end method
-
-.method public static M(I)I
-    .locals 1
-
-    const/4 v0, 0x3
-
-    if-eq p0, v0, :cond_2
-
-    const/4 v0, 0x6
-
-    if-eq p0, v0, :cond_1
-
-    const/16 v0, 0x8
-
-    if-eq p0, v0, :cond_0
-
-    const/4 p0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    const/16 p0, 0x10e
-
-    goto :goto_0
-
-    :cond_1
-    const/16 p0, 0x5a
-
-    goto :goto_0
-
-    :cond_2
-    const/16 p0, 0xb4
-
-    :goto_0
-    return p0
-.end method
-
-.method public static M0(Ljava/io/File;Ljava/io/File;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/facebook/common/file/FileUtils$RenameException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_4
-
-    invoke-virtual {p1}, Ljava/io/File;->delete()Z
-
-    invoke-virtual {p0, p1}, Ljava/io/File;->renameTo(Ljava/io/File;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p1}, Ljava/io/File;->exists()Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    invoke-virtual {p0}, Ljava/io/File;->getParentFile()Ljava/io/File;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/io/File;->exists()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0}, Ljava/io/File;->exists()Z
-
-    move-result v1
-
-    if-nez v1, :cond_3
-
-    new-instance v0, Ljava/io/FileNotFoundException;
-
-    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/io/FileNotFoundException;-><init>(Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Lcom/facebook/common/file/FileUtils$ParentDirNotFoundException;
-
-    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lcom/facebook/common/file/FileUtils$ParentDirNotFoundException;-><init>(Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v0, Lcom/facebook/common/file/FileUtils$FileDeleteException;
-
-    invoke-virtual {p1}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lcom/facebook/common/file/FileUtils$FileDeleteException;-><init>(Ljava/lang/String;)V
-
-    :cond_3
-    :goto_0
-    new-instance v1, Lcom/facebook/common/file/FileUtils$RenameException;
-
-    const-string v2, "Unknown error renaming "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p0, " to "
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v1, p0, v0}, Lcom/facebook/common/file/FileUtils$RenameException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :cond_4
-    throw v0
-.end method
-
-.method public static declared-synchronized N()Lf/c/a/d0;
-    .locals 2
-
-    const-class v0, Ld0/a/b/b/a;
-
-    monitor-enter v0
-
-    :try_start_0
-    sget-object v1, Ld0/a/b/b/a;->a:Lf/c/a/d0;
-
-    if-nez v1, :cond_0
-
-    new-instance v1, Lf/c/a/d0;
-
-    invoke-direct {v1}, Lf/c/a/d0;-><init>()V
-
-    sput-object v1, Ld0/a/b/b/a;->a:Lf/c/a/d0;
-
-    :cond_0
-    sget-object v1, Ld0/a/b/b/a;->a:Lf/c/a/d0;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return-object v1
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public static N0(ILjava/lang/Object;Lf/h/a/b/i/c;Lf/h/a/b/j/r/a;)Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<TInput:",
-            "Ljava/lang/Object;",
-            "TResult:",
-            "Ljava/lang/Object;",
-            "TException:",
-            "Ljava/lang/Throwable;",
-            ">(ITTInput;",
-            "Lf/h/a/b/i/c<",
-            "TTInput;TTResult;TTException;>;",
-            "Lf/h/a/b/j/r/a<",
-            "TTInput;TTResult;>;)TTResult;^TTException;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Throwable;
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    if-ge p0, v0, :cond_0
-
-    invoke-virtual {p2, p1}, Lf/h/a/b/i/c;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    invoke-virtual {p2, p1}, Lf/h/a/b/i/c;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v2, p3
-
-    check-cast v2, Lf/h/a/b/i/d;
-
-    const/4 v2, 0x0
-
-    check-cast p1, Lf/h/a/b/i/e$a;
-
-    move-object v3, v1
-
-    check-cast v3, Lf/h/a/b/i/e$b;
-
-    iget-object v4, v3, Lf/h/a/b/i/e$b;->b:Ljava/net/URL;
-
-    if-eqz v4, :cond_1
-
-    const-string v2, "CctTransportBackend"
-
-    const-string v5, "Following redirect to: %s"
-
-    invoke-static {v2, v5, v4}, Ld0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
-
-    iget-object v2, v3, Lf/h/a/b/i/e$b;->b:Ljava/net/URL;
-
-    new-instance v3, Lf/h/a/b/i/e$a;
-
-    iget-object v4, p1, Lf/h/a/b/i/e$a;->b:Lf/h/a/b/i/b/j;
-
-    iget-object p1, p1, Lf/h/a/b/i/e$a;->c:Ljava/lang/String;
-
-    invoke-direct {v3, v2, v4, p1}, Lf/h/a/b/i/e$a;-><init>(Ljava/net/URL;Lf/h/a/b/i/b/j;Ljava/lang/String;)V
-
-    move-object p1, v3
-
-    goto :goto_0
-
-    :cond_1
-    move-object p1, v2
-
-    :goto_0
-    if-eqz p1, :cond_2
-
-    add-int/lit8 p0, p0, -0x1
-
-    if-ge p0, v0, :cond_0
-
-    :cond_2
-    return-object v1
-.end method
-
-.method public static O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getResourceId(II)I
-
-    move-result p1
-
-    if-nez p1, :cond_0
-
-    const/4 p0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p0
-
-    invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p0
-
-    :goto_0
-    return-object p0
-.end method
-
-.method public static O0(Lcom/facebook/cache/common/CacheKey;)Ljava/lang/String;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/UnsupportedEncodingException;
-        }
-    .end annotation
-
-    invoke-interface {p0}, Lcom/facebook/cache/common/CacheKey;->a()Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v0, "UTF-8"
-
-    invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/lang/String;)[B
-
-    move-result-object p0
-
-    :try_start_0
-    const-string v0, "SHA-1"
-
-    invoke-static {v0}, Ljava/security/MessageDigest;->getInstance(Ljava/lang/String;)Ljava/security/MessageDigest;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    array-length v2, p0
-
-    invoke-virtual {v0, p0, v1, v2}, Ljava/security/MessageDigest;->update([BII)V
-
-    invoke-virtual {v0}, Ljava/security/MessageDigest;->digest()[B
-
-    move-result-object p0
-
-    const/16 v0, 0xb
-
-    invoke-static {p0, v0}, Landroid/util/Base64;->encodeToString([BI)Ljava/lang/String;
-
-    move-result-object p0
-    :try_end_0
-    .catch Ljava/security/NoSuchAlgorithmException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    move-exception p0
-
-    new-instance v0, Ljava/lang/RuntimeException;
-
-    invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-.method public static P(Landroid/content/Context;J)Lf/c/a/s0;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
-
-    move-result-object v1
-
-    if-eq v0, v1, :cond_1
-
-    :try_start_0
-    invoke-virtual {p0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
-
-    move-result-object v0
-
-    const-string v1, "com.android.vending"
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, v1, v2}, Landroid/content/pm/PackageManager;->getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo;
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
-
-    new-instance v0, Lf/c/a/r0;
-
-    invoke-direct {v0, p1, p2}, Lf/c/a/r0;-><init>(J)V
-
-    new-instance p1, Landroid/content/Intent;
-
-    const-string p2, "com.google.android.gms.ads.identifier.service.START"
-
-    invoke-direct {p1, p2}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
-
-    const-string p2, "com.google.android.gms"
-
-    invoke-virtual {p1, p2}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
-
-    const/4 p2, 0x1
-
-    invoke-virtual {p0, p1, v0, p2}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    :try_start_1
-    new-instance p1, Lf/c/a/t0;
-
-    invoke-virtual {v0}, Lf/c/a/r0;->a()Landroid/os/IBinder;
-
-    move-result-object v1
-
-    invoke-direct {p1, v1}, Lf/c/a/t0;-><init>(Landroid/os/IBinder;)V
-
-    new-instance v1, Lf/c/a/s0;
-
-    invoke-virtual {p1}, Lf/c/a/t0;->g()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {p1, p2}, Lf/c/a/t0;->h(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    invoke-direct {v1, v2, p1}, Lf/c/a/s0;-><init>(Ljava/lang/String;Ljava/lang/Boolean;)V
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-
-    return-object v1
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    :try_start_2
-    throw p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :goto_0
-    invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-
-    throw p1
-
-    :cond_0
-    new-instance p0, Ljava/io/IOException;
-
-    const-string p1, "Google Play connection failed"
-
-    invoke-direct {p0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :catch_1
-    move-exception p0
-
-    throw p0
-
-    :cond_1
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    const-string p1, "Google Play Services info can\'t be accessed from the main thread"
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p0, p1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
-
-    instance-of p1, p0, Lf/g/g/e/b0;
-
-    if-eqz p1, :cond_0
-
-    check-cast p0, Lf/g/g/e/b0;
-
-    invoke-interface {p0, p2}, Lf/g/g/e/b0;->b(Lf/g/g/e/c0;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public static Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/content/Context;",
-            "Lf/c/a/w0;",
-            ")",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    :try_start_0
-    const-string v0, "com.adjust.sdk.imei.Util"
-
-    const-string v1, "getImeiParameters"
-
-    const/4 v2, 0x2
-
-    new-array v3, v2, [Ljava/lang/Class;
-
-    const-class v4, Landroid/content/Context;
-
-    const/4 v5, 0x0
-
-    aput-object v4, v3, v5
-
-    const-class v4, Lf/c/a/w0;
-
-    const/4 v6, 0x1
-
-    aput-object v4, v3, v6
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    aput-object p0, v2, v5
-
-    aput-object p1, v2, v6
-
-    invoke-static {v0, v1, v3, v2}, Ld0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    const-class p1, Ljava/util/Map;
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p1, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p0, Ljava/util/Map;
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    :cond_0
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
-.method public static Q0(Landroid/media/MediaFormat;Ljava/util/List;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/media/MediaFormat;",
-            "Ljava/util/List<",
-            "[B>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    if-ge v0, v1, :cond_0
-
-    const-string v1, "csd-"
-
-    invoke-static {v1, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, [B
-
-    invoke-static {v2}, Ljava/nio/ByteBuffer;->wrap([B)Ljava/nio/ByteBuffer;
-
-    move-result-object v2
-
-    invoke-virtual {p0, v1, v2}, Landroid/media/MediaFormat;->setByteBuffer(Ljava/lang/String;Ljava/nio/ByteBuffer;)V
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public static R(Ljava/io/InputStream;)I
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v0
-
-    int-to-byte v0, v0
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v1
-
-    int-to-byte v1, v1
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v2
-
-    int-to-byte v2, v2
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result p0
-
-    int-to-byte p0, p0
-
-    shl-int/lit8 p0, p0, 0x18
-
-    const/high16 v3, -0x1000000
-
-    and-int/2addr p0, v3
-
-    shl-int/lit8 v2, v2, 0x10
-
-    const/high16 v3, 0xff0000
-
-    and-int/2addr v2, v3
-
-    or-int/2addr p0, v2
-
-    shl-int/lit8 v1, v1, 0x8
-
-    const v2, 0xff00
-
-    and-int/2addr v1, v2
-
-    or-int/2addr p0, v1
-
-    and-int/lit16 v0, v0, 0xff
-
-    or-int/2addr p0, v0
-
-    return p0
-.end method
-
-.method public static R0(Landroid/graphics/drawable/Drawable;Lf/g/g/e/e;)V
-    .locals 4
-
-    if-eqz p0, :cond_6
-
-    if-nez p1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    iget v0, p1, Lf/g/g/e/e;->a:I
-
-    const/4 v1, -0x1
-
-    if-eq v0, v1, :cond_1
-
-    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
-
-    :cond_1
-    iget-boolean v0, p1, Lf/g/g/e/e;->b:Z
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p1, Lf/g/g/e/e;->c:Landroid/graphics/ColorFilter;
-
-    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
-
-    :cond_2
-    iget v0, p1, Lf/g/g/e/e;->d:I
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-eq v0, v1, :cond_4
-
-    if-eqz v0, :cond_3
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setDither(Z)V
-
-    :cond_4
-    iget p1, p1, Lf/g/g/e/e;->e:I
-
-    if-eq p1, v1, :cond_6
-
-    if-eqz p1, :cond_5
-
-    const/4 v2, 0x1
-
-    :cond_5
-    invoke-virtual {p0, v2}, Landroid/graphics/drawable/Drawable;->setFilterBitmap(Z)V
-
-    :cond_6
-    :goto_1
-    return-void
-.end method
-
-.method public static S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/content/Context;",
-            "Lf/c/a/w0;",
-            ")",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    :try_start_0
-    const-string v0, "com.adjust.sdk.oaid.Util"
-
-    const-string v1, "getOaidParameters"
-
-    const/4 v2, 0x2
-
-    new-array v3, v2, [Ljava/lang/Class;
-
-    const-class v4, Landroid/content/Context;
-
-    const/4 v5, 0x0
-
-    aput-object v4, v3, v5
-
-    const-class v4, Lf/c/a/w0;
-
-    const/4 v6, 0x1
-
-    aput-object v4, v3, v6
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    aput-object p0, v2, v5
-
-    aput-object p1, v2, v6
-
-    invoke-static {v0, v1, v3, v2}, Ld0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    const-class p1, Ljava/util/Map;
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p1, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p0, Ljava/util/Map;
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    :cond_0
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
-.method public static S0(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;I)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/google/android/exoplayer2/database/DatabaseIOException;
-        }
-    .end annotation
-
-    :try_start_0
-    const-string v0, "CREATE TABLE IF NOT EXISTS ExoPlayerVersions (feature INTEGER NOT NULL,instance_uid TEXT NOT NULL,version INTEGER NOT NULL,PRIMARY KEY (feature, instance_uid))"
-
-    invoke-virtual {p0, v0}, Landroid/database/sqlite/SQLiteDatabase;->execSQL(Ljava/lang/String;)V
-
-    new-instance v0, Landroid/content/ContentValues;
-
-    invoke-direct {v0}, Landroid/content/ContentValues;-><init>()V
-
-    const-string v1, "feature"
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    invoke-virtual {v0, v1, p1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
-
-    const-string p1, "instance_uid"
-
-    invoke-virtual {v0, p1, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-string p1, "version"
-
-    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p2
-
-    invoke-virtual {v0, p1, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
-
-    const-string p1, "ExoPlayerVersions"
-
-    const/4 p2, 0x0
-
-    invoke-virtual {p0, p1, p2, v0}, Landroid/database/sqlite/SQLiteDatabase;->replaceOrThrow(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)J
-    :try_end_0
-    .catch Landroid/database/SQLException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p0
-
-    new-instance p1, Lcom/google/android/exoplayer2/database/DatabaseIOException;
-
-    invoke-direct {p1, p0}, Lcom/google/android/exoplayer2/database/DatabaseIOException;-><init>(Landroid/database/SQLException;)V
-
-    throw p1
-.end method
-
-.method public static T(Ljava/util/Map;I)Ljava/lang/String;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;I)",
-            "Ljava/lang/String;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/UnsupportedEncodingException;
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()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
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    const-string v2, ""
-
-    const-string v3, "="
-
-    const-string v4, "&"
-
-    const-string v5, "UTF-8"
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/util/Map$Entry;
-
-    invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/String;
-
-    invoke-static {v6, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/String;
-
-    if-eqz v1, :cond_0
-
-    invoke-static {v1, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->length()I
-
-    move-result v1
-
-    if-lez v1, :cond_1
-
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_1
-    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v6
-
-    sget-object p0, Lf/c/a/e2;->b:Ljava/text/SimpleDateFormat;
-
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-virtual {p0, v1}, Ljava/text/SimpleDateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "sent_at"
-
-    invoke-static {v1, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-static {p0, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    if-lez p1, :cond_3
-
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p0, "queue_size"
-
-    invoke-static {p0, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    new-instance p0, Ljava/lang/StringBuilder;
-
-    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-static {p0, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_3
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static T0(Ljava/io/InputStream;J)J
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
-
-    move-wide v2, p1
-
-    :goto_1
-    cmp-long v4, v2, v0
-
-    if-lez v4, :cond_3
-
-    invoke-virtual {p0, v2, v3}, Ljava/io/InputStream;->skip(J)J
-
-    move-result-wide v4
-
-    cmp-long v6, v4, v0
-
-    if-lez v6, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v4
-
-    const/4 v5, -0x1
-
-    if-eq v4, v5, :cond_2
-
-    const-wide/16 v4, 0x1
-
-    :goto_2
-    sub-long/2addr v2, v4
-
-    goto :goto_1
-
-    :cond_2
-    sub-long/2addr p1, v2
-
-    :cond_3
-    return-wide p1
-.end method
-
-.method public static U(Lcom/facebook/cache/common/CacheKey;)Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/facebook/cache/common/CacheKey;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    :try_start_0
-    instance-of v0, p0, Lf/g/b/a/c;
-
-    if-eqz v0, :cond_1
-
-    check-cast p0, Lf/g/b/a/c;
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_0
-
-    new-instance p0, Ljava/util/ArrayList;
-    :try_end_0
-    .catch Ljava/io/UnsupportedEncodingException; {:try_start_0 .. :try_end_0} :catch_0
-
-    throw v0
-
-    :cond_0
-    :try_start_1
-    throw v0
-
-    :cond_1
-    new-instance v0, Ljava/util/ArrayList;
-
-    const/4 v1, 0x1
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-static {p0}, Ld0/a/b/b/a;->O0(Lcom/facebook/cache/common/CacheKey;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-    :try_end_1
-    .catch Ljava/io/UnsupportedEncodingException; {:try_start_1 .. :try_end_1} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception p0
-
-    new-instance v0, Ljava/lang/RuntimeException;
-
-    invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-.method public static U0([B[B)Z
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_4
-
-    if-eqz p1, :cond_3
-
-    array-length v0, p1
-
-    array-length v1, p0
-
-    const/4 v2, 0x0
-
-    if-le v0, v1, :cond_0
-
-    return v2
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    array-length v1, p1
-
-    if-ge v0, v1, :cond_2
-
-    aget-byte v1, p0, v0
-
-    aget-byte v3, p1, v0
-
-    if-eq v1, v3, :cond_1
-
-    return v2
-
-    :cond_1
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 p0, 0x1
-
-    return p0
-
-    :cond_3
-    throw v0
-
-    :cond_4
-    throw v0
-.end method
-
-.method public static V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-    .locals 1
-
-    const/4 v0, -0x2
-
-    invoke-virtual {p0, p1, v0}, Landroid/content/res/TypedArray;->getInt(II)I
-
-    move-result p0
-
-    packed-switch p0, :pswitch_data_0
-
-    new-instance p0, Ljava/lang/RuntimeException;
-
-    const-string p1, "XML attribute not specified!"
-
-    invoke-direct {p0, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :pswitch_0
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->i:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_1
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->h:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_2
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->g:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_3
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->f:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_4
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->e:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_5
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->d:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_6
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->c:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_7
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->b:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_8
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->a:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_9
-    const/4 p0, 0x0
-
-    return-object p0
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch -0x1
-        :pswitch_9
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public static V0(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
-    .locals 5
-    .annotation build Landroidx/annotation/VisibleForTesting;
-    .end annotation
-
-    const/4 v0, 0x1
-
-    new-array v1, v0, [Ljava/lang/String;
-
-    const/4 v2, 0x0
-
-    aput-object p1, v1, v2
-
-    const-string p1, "sqlite_master"
-
-    const-string v3, "tbl_name = ?"
-
-    invoke-static {p0, p1, v3, v1}, Landroid/database/DatabaseUtils;->queryNumEntries(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)J
-
-    move-result-wide p0
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v1, p0, v3
-
-    if-lez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public static W(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "TransportRuntime."
-
-    invoke-static {v0, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static W0(Ljava/lang/Object;)Lf/g/d/d/g;
-    .locals 3
-
-    new-instance v0, Lf/g/d/d/g;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v1, "\\$[0-9]+"
-
-    const-string v2, "\\$"
-
-    invoke-virtual {p0, v1, v2}, Ljava/lang/String;->replaceAll(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const/16 v1, 0x24
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->lastIndexOf(I)I
-
-    move-result v1
-
-    const/4 v2, -0x1
-
-    if-ne v1, v2, :cond_0
-
-    const/16 v1, 0x2e
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->lastIndexOf(I)I
-
-    move-result v1
-
-    :cond_0
-    add-int/lit8 v1, v1, 0x1
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, p0, v1}, Lf/g/d/d/g;-><init>(Ljava/lang/String;Lf/g/d/d/f;)V
-
-    return-object v0
-.end method
-
-.method public static X(Ljava/io/InputStream;)Landroid/util/Pair;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/io/InputStream;",
-            ")",
-            "Landroid/util/Pair<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const-wide/16 v0, 0x7
-
-    invoke-virtual {p0, v0, v1}, Ljava/io/InputStream;->skip(J)J
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    int-to-short v0, v0
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    int-to-short v1, v1
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v2
-
-    and-int/lit16 v2, v2, 0xff
-
-    int-to-short v2, v2
-
-    const/16 v3, 0x9d
-
-    if-ne v0, v3, :cond_1
-
-    const/4 v0, 0x1
-
-    if-ne v1, v0, :cond_1
-
-    const/16 v0, 0x2a
-
-    if-eq v2, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Landroid/util/Pair;
-
-    invoke-static {p0}, Ld0/a/b/b/a;->I(Ljava/io/InputStream;)I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-static {p0}, Ld0/a/b/b/a;->I(Ljava/io/InputStream;)I
-
-    move-result p0
-
-    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    invoke-direct {v0, v1, p0}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    return-object v0
-
-    :cond_1
-    :goto_0
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
-.method public static X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Lcom/discord/simpleast/core/node/Node;",
-            ">;",
-            "Lf/a/j/a/c/a;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/simpleast/core/node/Node;
-
-    invoke-static {v0, p1}, Ld0/a/b/b/a;->Y0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public static Y(Ljava/io/InputStream;)Landroid/util/Pair;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/io/InputStream;",
-            ")",
-            "Landroid/util/Pair<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-static {p0}, Ld0/a/b/b/a;->R(Ljava/io/InputStream;)I
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    int-to-byte v0, v0
-
-    const/16 v1, 0x2f
-
-    if-eq v0, v1, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v0
-
-    int-to-byte v0, v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v1
-
-    int-to-byte v1, v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result v2
-
-    int-to-byte v2, v2
-
-    and-int/lit16 v2, v2, 0xff
-
-    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
-
-    move-result p0
-
-    int-to-byte p0, p0
-
-    and-int/lit16 p0, p0, 0xff
-
-    and-int/lit8 v3, v1, 0x3f
-
-    shl-int/lit8 v3, v3, 0x8
-
-    or-int/2addr v0, v3
-
-    add-int/lit8 v0, v0, 0x1
-
-    and-int/lit8 p0, p0, 0xf
-
-    shl-int/lit8 p0, p0, 0xa
-
-    shl-int/lit8 v2, v2, 0x2
-
-    or-int/2addr p0, v2
-
-    and-int/lit16 v1, v1, 0xc0
-
-    shr-int/lit8 v1, v1, 0x6
-
-    or-int/2addr p0, v1
-
-    add-int/lit8 p0, p0, 0x1
-
-    new-instance v1, Landroid/util/Pair;
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    invoke-direct {v1, v0, p0}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    return-object v1
-.end method
-
-.method public static Y0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->hasChildren()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->getChildren()Ljava/util/Collection;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/simpleast/core/node/Node;
-
-    invoke-static {v1, p1}, Ld0/a/b/b/a;->Y0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p1, p0}, Lf/a/j/a/c/a;->processNode(Lcom/discord/simpleast/core/node/Node;)V
-
-    return-void
-.end method
-
-.method public static Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
-    .locals 10
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/google/android/exoplayer2/database/DatabaseIOException;
-        }
-    .end annotation
-
-    :try_start_0
-    const-string v0, "ExoPlayerVersions"
-
-    invoke-static {p0, v0}, Ld0/a/b/b/a;->V0(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
-
-    move-result v0
-
-    const/4 v1, -0x1
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    const-string v3, "ExoPlayerVersions"
-
-    const-string v0, "version"
-
-    filled-new-array {v0}, [Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "feature = ? AND instance_uid = ?"
-
-    const/4 v0, 0x2
-
-    new-array v6, v0, [Ljava/lang/String;
-
-    invoke-static {p1}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    aput-object p1, v6, v0
-
-    const/4 p1, 0x1
-
-    aput-object p2, v6, p1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    move-object v2, p0
-
-    invoke-virtual/range {v2 .. v9}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-
-    move-result-object p0
-    :try_end_0
-    .catch Landroid/database/SQLException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :try_start_1
-    invoke-interface {p0}, Landroid/database/Cursor;->getCount()I
-
-    move-result p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-nez p1, :cond_1
-
-    :try_start_2
-    invoke-interface {p0}, Landroid/database/Cursor;->close()V
-    :try_end_2
-    .catch Landroid/database/SQLException; {:try_start_2 .. :try_end_2} :catch_0
-
-    return v1
-
-    :cond_1
-    :try_start_3
-    invoke-interface {p0}, Landroid/database/Cursor;->moveToNext()Z
-
-    invoke-interface {p0, v0}, Landroid/database/Cursor;->getInt(I)I
-
-    move-result p1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :try_start_4
-    invoke-interface {p0}, Landroid/database/Cursor;->close()V
-    :try_end_4
-    .catch Landroid/database/SQLException; {:try_start_4 .. :try_end_4} :catch_0
-
-    return p1
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_5
-    throw p1
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    :catchall_1
-    move-exception p2
-
-    if-eqz p0, :cond_2
-
-    :try_start_6
-    invoke-interface {p0}, Landroid/database/Cursor;->close()V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_2
-
-    goto :goto_0
-
-    :catchall_2
-    move-exception p0
-
-    :try_start_7
-    invoke-virtual {p1, p0}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
-
-    :cond_2
-    :goto_0
-    throw p2
-    :try_end_7
-    .catch Landroid/database/SQLException; {:try_start_7 .. :try_end_7} :catch_0
-
-    :catch_0
-    move-exception p0
-
-    new-instance p1, Lcom/google/android/exoplayer2/database/DatabaseIOException;
-
-    invoke-direct {p1, p0}, Lcom/google/android/exoplayer2/database/DatabaseIOException;-><init>(Landroid/database/SQLException;)V
-
-    throw p1
-.end method
-
-.method public static Z0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
-    .locals 1
-
-    invoke-interface {p1, p0}, Lf/a/j/a/c/a;->processNode(Lcom/discord/simpleast/core/node/Node;)V
-
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->hasChildren()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->getChildren()Ljava/util/Collection;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/simpleast/core/node/Node;
-
-    invoke-static {v0, p1}, Ld0/a/b/b/a;->Z0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public static a(F)F
-    .locals 4
-
-    const v0, 0x3d25aee6    # 0.04045f
-
-    cmpg-float v0, p0, v0
-
-    if-gtz v0, :cond_0
-
-    const v0, 0x414eb852    # 12.92f
-
-    div-float/2addr p0, v0
-
-    goto :goto_0
-
-    :cond_0
-    const v0, 0x3d6147ae    # 0.055f
-
-    add-float/2addr p0, v0
-
-    const v0, 0x3f870a3d    # 1.055f
-
-    div-float/2addr p0, v0
-
-    float-to-double v0, p0
-
-    const-wide v2, 0x4003333340000000L    # 2.4000000953674316
-
-    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->pow(DD)D
-
-    move-result-wide v0
-
-    double-to-float p0, v0
-
-    :goto_0
-    return p0
-.end method
-
-.method public static a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x2
-
-    invoke-static {p0, p1, v0, p2, p3}, Ld0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
-
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->getShort()S
-
-    move-result p0
-
-    const p1, 0xffff
-
-    and-int/2addr p0, p1
-
-    return p0
-.end method
-
-.method public static a1(Lf/g/g/f/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lf/g/g/f/a;
-    .locals 19
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-object/from16 v2, p2
-
-    if-eqz v2, :cond_30
-
-    sget-object v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy:[I
-
-    invoke-virtual {v1, v2, v6}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
-
-    move-result-object v2
-
-    :try_start_0
-    invoke-virtual {v2}, Landroid/content/res/TypedArray;->getIndexCount()I
-
-    move-result v6
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x1
-
-    const/4 v11, 0x1
-
-    const/4 v12, 0x1
-
-    const/4 v13, 0x1
-
-    const/4 v14, 0x1
-
-    const/4 v15, 0x1
-
-    const/16 v16, 0x1
-
-    const/16 v17, 0x1
-
-    :goto_0
-    if-ge v7, v6, :cond_27
-
-    invoke-virtual {v2, v7}, Landroid/content/res/TypedArray;->getIndex(I)I
-
-    move-result v3
-
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_actualImageScaleType:I
-
-    if-ne v3, v4, :cond_0
-
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->l:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    goto :goto_1
-
-    :cond_0
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_placeholderImage:I
-
-    if-ne v3, v4, :cond_1
-
-    invoke-static {v1, v2, v3}, Ld0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->d:Landroid/graphics/drawable/Drawable;
-
-    goto :goto_1
-
-    :cond_1
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_pressedStateOverlayImage:I
-
-    const/4 v5, 0x0
-
-    if-ne v3, v4, :cond_3
-
-    invoke-static {v1, v2, v3}, Ld0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    if-nez v3, :cond_2
-
-    iput-object v5, v0, Lf/g/g/f/a;->q:Landroid/graphics/drawable/Drawable;
-
-    :goto_1
-    move/from16 p2, v6
-
-    goto/16 :goto_2
-
-    :cond_2
-    new-instance v4, Landroid/graphics/drawable/StateListDrawable;
-
-    invoke-direct {v4}, Landroid/graphics/drawable/StateListDrawable;-><init>()V
-
-    move/from16 p2, v6
-
-    const/4 v5, 0x1
-
-    new-array v6, v5, [I
-
-    const v5, 0x10100a7
-
-    const/16 v18, 0x0
-
-    aput v5, v6, v18
-
-    invoke-virtual {v4, v6, v3}, Landroid/graphics/drawable/StateListDrawable;->addState([ILandroid/graphics/drawable/Drawable;)V
-
-    iput-object v4, v0, Lf/g/g/f/a;->q:Landroid/graphics/drawable/Drawable;
-
-    goto/16 :goto_2
-
-    :cond_3
-    move/from16 p2, v6
-
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarImage:I
-
-    if-ne v3, v4, :cond_4
-
-    invoke-static {v1, v2, v3}, Ld0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
-
-    goto :goto_2
-
-    :cond_4
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_fadeDuration:I
-
-    if-ne v3, v4, :cond_5
-
-    const/4 v4, 0x0
-
-    invoke-virtual {v2, v3, v4}, Landroid/content/res/TypedArray;->getInt(II)I
-
-    move-result v3
-
-    iput v3, v0, Lf/g/g/f/a;->b:I
-
-    goto :goto_2
-
-    :cond_5
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_viewAspectRatio:I
-
-    if-ne v3, v4, :cond_6
-
-    const/4 v4, 0x0
-
-    invoke-virtual {v2, v3, v4}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v3
-
-    iput v3, v0, Lf/g/g/f/a;->c:F
-
-    goto :goto_2
-
-    :cond_6
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_placeholderImageScaleType:I
-
-    if-ne v3, v4, :cond_7
-
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->e:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    goto :goto_2
-
-    :cond_7
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_retryImage:I
-
-    if-ne v3, v4, :cond_8
-
-    invoke-static {v1, v2, v3}, Ld0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->f:Landroid/graphics/drawable/Drawable;
-
-    goto :goto_2
-
-    :cond_8
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_retryImageScaleType:I
-
-    if-ne v3, v4, :cond_9
-
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->g:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    goto :goto_2
-
-    :cond_9
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_failureImage:I
-
-    if-ne v3, v4, :cond_a
-
-    invoke-static {v1, v2, v3}, Ld0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->h:Landroid/graphics/drawable/Drawable;
-
-    goto :goto_2
-
-    :cond_a
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_failureImageScaleType:I
-
-    if-ne v3, v4, :cond_b
-
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->i:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    goto :goto_2
-
-    :cond_b
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarImageScaleType:I
-
-    if-ne v3, v4, :cond_c
-
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->k:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    :goto_2
-    move/from16 v6, v16
-
-    move/from16 v4, v17
-
-    :goto_3
-    move/from16 v17, v8
-
-    goto/16 :goto_8
-
-    :cond_c
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarAutoRotateInterval:I
-
-    if-ne v3, v4, :cond_d
-
-    invoke-virtual {v2, v3, v9}, Landroid/content/res/TypedArray;->getInteger(II)I
-
-    move-result v9
-
-    goto/16 :goto_a
-
-    :cond_d
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_backgroundImage:I
-
-    if-ne v3, v4, :cond_e
-
-    invoke-static {v1, v2, v3}, Ld0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    iput-object v3, v0, Lf/g/g/f/a;->o:Landroid/graphics/drawable/Drawable;
-
-    goto :goto_2
-
-    :cond_e
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_overlayImage:I
-
-    if-ne v3, v4, :cond_f
-
-    invoke-static {v1, v2, v3}, Ld0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Lf/g/g/f/a;->b(Landroid/graphics/drawable/Drawable;)Lf/g/g/f/a;
-
-    goto :goto_2
-
-    :cond_f
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundAsCircle:I
-
-    if-ne v3, v4, :cond_11
-
-    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    if-nez v4, :cond_10
-
-    new-instance v4, Lf/g/g/f/c;
-
-    invoke-direct {v4}, Lf/g/g/f/c;-><init>()V
-
-    iput-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    :cond_10
-    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v3
-
-    iput-boolean v3, v4, Lf/g/g/f/c;->b:Z
-
-    goto :goto_2
-
-    :cond_11
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundedCornerRadius:I
-
-    if-ne v3, v4, :cond_12
-
-    invoke-virtual {v2, v3, v8}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result v8
-
-    goto/16 :goto_a
-
-    :cond_12
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopLeft:I
-
-    if-ne v3, v4, :cond_13
-
-    invoke-virtual {v2, v3, v10}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v10
-
-    goto :goto_5
-
-    :cond_13
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopRight:I
-
-    if-ne v3, v4, :cond_14
-
-    invoke-virtual {v2, v3, v13}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v13
-
-    goto :goto_5
-
-    :cond_14
-    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomLeft:I
-
-    if-ne v3, v4, :cond_15
-
-    move/from16 v4, v17
-
-    invoke-virtual {v2, v3, v4}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v17
-
-    goto :goto_5
-
-    :cond_15
-    move/from16 v4, v17
-
-    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomRight:I
-
-    if-ne v3, v6, :cond_16
-
-    invoke-virtual {v2, v3, v14}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v14
-
-    :goto_4
-    move/from16 v17, v4
-
-    goto :goto_5
-
-    :cond_16
-    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopStart:I
-
-    if-ne v3, v6, :cond_17
-
-    invoke-virtual {v2, v3, v11}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v11
-
-    goto :goto_4
-
-    :cond_17
-    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopEnd:I
-
-    if-ne v3, v6, :cond_18
-
-    invoke-virtual {v2, v3, v12}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v12
-
-    goto :goto_4
-
-    :cond_18
-    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomStart:I
-
-    if-ne v3, v6, :cond_19
-
-    move/from16 v6, v16
-
-    invoke-virtual {v2, v3, v6}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v16
-
-    goto :goto_4
-
-    :cond_19
-    move/from16 v6, v16
-
-    sget v5, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomEnd:I
-
-    if-ne v3, v5, :cond_1a
-
-    invoke-virtual {v2, v3, v15}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v15
-
-    move/from16 v17, v4
-
-    move/from16 v16, v6
-
-    :goto_5
-    move/from16 v4, v17
-
-    move/from16 v17, v8
-
-    goto/16 :goto_9
-
-    :cond_1a
-    sget v5, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundWithOverlayColor:I
-
-    if-ne v3, v5, :cond_1c
-
-    iget-object v5, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    if-nez v5, :cond_1b
-
-    new-instance v5, Lf/g/g/f/c;
-
-    invoke-direct {v5}, Lf/g/g/f/c;-><init>()V
-
-    iput-object v5, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    :cond_1b
-    iget-object v5, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v2, v3, v1}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v3
-
-    iput v3, v5, Lf/g/g/f/c;->d:I
-
-    sget-object v1, Lf/g/g/f/c$a;->d:Lf/g/g/f/c$a;
-
-    iput-object v1, v5, Lf/g/g/f/c;->a:Lf/g/g/f/c$a;
-
-    goto/16 :goto_3
-
-    :cond_1c
-    sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderWidth:I
-
-    if-ne v3, v1, :cond_20
-
-    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    if-nez v1, :cond_1d
-
-    new-instance v1, Lf/g/g/f/c;
-
-    invoke-direct {v1}, Lf/g/g/f/c;-><init>()V
-
-    iput-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    :cond_1d
-    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result v3
-
-    int-to-float v3, v3
-
-    if-eqz v1, :cond_1f
-
-    const/4 v5, 0x0
-
-    cmpl-float v16, v3, v5
-
-    move/from16 v17, v8
-
-    if-ltz v16, :cond_1e
-
-    const/4 v5, 0x1
-
-    goto :goto_6
-
-    :cond_1e
-    const/4 v5, 0x0
-
-    :goto_6
-    const-string v8, "the border width cannot be < 0"
-
-    invoke-static {v5, v8}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
-
-    iput v3, v1, Lf/g/g/f/c;->e:F
-
-    goto :goto_8
-
-    :cond_1f
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_20
-    move/from16 v17, v8
-
-    sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderColor:I
-
-    if-ne v3, v1, :cond_22
-
-    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    if-nez v1, :cond_21
-
-    new-instance v1, Lf/g/g/f/c;
-
-    invoke-direct {v1}, Lf/g/g/f/c;-><init>()V
-
-    iput-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    :cond_21
-    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v3
-
-    iput v3, v1, Lf/g/g/f/c;->f:I
-
-    goto :goto_8
-
-    :cond_22
-    sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderPadding:I
-
-    if-ne v3, v1, :cond_26
-
-    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    if-nez v1, :cond_23
-
-    new-instance v1, Lf/g/g/f/c;
-
-    invoke-direct {v1}, Lf/g/g/f/c;-><init>()V
-
-    iput-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    :cond_23
-    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result v3
-
-    int-to-float v3, v3
-
-    if-eqz v1, :cond_25
-
-    const/4 v5, 0x0
-
-    cmpl-float v8, v3, v5
-
-    if-ltz v8, :cond_24
-
-    const/4 v8, 0x1
-
-    goto :goto_7
-
-    :cond_24
-    const/4 v8, 0x0
-
-    :goto_7
-    const-string v5, "the padding cannot be < 0"
-
-    invoke-static {v8, v5}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
-
-    iput v3, v1, Lf/g/g/f/c;->g:F
-
-    goto :goto_8
-
-    :cond_25
-    const/4 v0, 0x0
-
-    throw v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_26
-    :goto_8
-    move/from16 v16, v6
-
-    :goto_9
-    move/from16 v8, v17
-
-    move/from16 v17, v4
-
-    :goto_a
-    add-int/lit8 v7, v7, 0x1
-
-    move-object/from16 v1, p1
-
-    move/from16 v6, p2
-
-    goto/16 :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_13
-
-    :cond_27
-    move/from16 v6, v16
-
-    move/from16 v4, v17
-
-    move/from16 v17, v8
-
-    invoke-virtual {v2}, Landroid/content/res/TypedArray;->recycle()V
-
-    invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroid/content/res/Configuration;->getLayoutDirection()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-ne v1, v2, :cond_2b
-
-    if-eqz v10, :cond_28
-
-    if-eqz v12, :cond_28
-
-    const/4 v5, 0x1
-
-    goto :goto_b
-
-    :cond_28
-    const/4 v5, 0x0
-
-    :goto_b
-    if-eqz v13, :cond_29
-
-    if-eqz v11, :cond_29
-
-    const/4 v1, 0x1
-
-    goto :goto_c
-
-    :cond_29
-    const/4 v1, 0x0
-
-    :goto_c
-    if-eqz v14, :cond_2a
-
-    if-eqz v6, :cond_2a
-
-    const/4 v2, 0x1
-
-    goto :goto_d
-
-    :cond_2a
-    const/4 v2, 0x0
-
-    :goto_d
-    if-eqz v4, :cond_2f
-
-    if-eqz v15, :cond_2f
-
-    goto :goto_11
-
-    :cond_2b
-    if-eqz v10, :cond_2c
-
-    if-eqz v11, :cond_2c
-
-    const/4 v5, 0x1
-
-    goto :goto_e
-
-    :cond_2c
-    const/4 v5, 0x0
-
-    :goto_e
-    if-eqz v13, :cond_2d
-
-    if-eqz v12, :cond_2d
-
-    const/4 v1, 0x1
-
-    goto :goto_f
-
-    :cond_2d
-    const/4 v1, 0x0
-
-    :goto_f
-    if-eqz v14, :cond_2e
-
-    if-eqz v15, :cond_2e
-
-    const/4 v2, 0x1
-
-    goto :goto_10
-
-    :cond_2e
-    const/4 v2, 0x0
-
-    :goto_10
-    if-eqz v4, :cond_2f
-
-    if-eqz v6, :cond_2f
-
-    :goto_11
-    const/4 v3, 0x1
-
-    goto :goto_12
-
-    :cond_2f
-    const/4 v3, 0x0
-
-    :goto_12
-    move/from16 v8, v17
-
-    goto :goto_14
-
-    :goto_13
-    invoke-virtual {v2}, Landroid/content/res/TypedArray;->recycle()V
-
-    invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroid/content/res/Configuration;->getLayoutDirection()I
-
-    throw v0
-
-    :cond_30
-    const/4 v1, 0x1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x1
-
-    const/4 v5, 0x1
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    :goto_14
-    iget-object v4, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
-
-    if-eqz v4, :cond_31
-
-    if-lez v9, :cond_31
-
-    new-instance v4, Lf/g/g/e/c;
-
-    iget-object v6, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
-
-    invoke-direct {v4, v6, v9}, Lf/g/g/e/c;-><init>(Landroid/graphics/drawable/Drawable;I)V
-
-    iput-object v4, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
-
-    :cond_31
-    if-lez v8, :cond_38
-
-    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    if-nez v4, :cond_32
-
-    new-instance v4, Lf/g/g/f/c;
-
-    invoke-direct {v4}, Lf/g/g/f/c;-><init>()V
-
-    iput-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    :cond_32
-    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
-
-    if-eqz v5, :cond_33
-
-    int-to-float v5, v8
-
-    goto :goto_15
-
-    :cond_33
-    const/4 v5, 0x0
-
-    :goto_15
-    if-eqz v1, :cond_34
-
-    int-to-float v1, v8
-
-    goto :goto_16
-
-    :cond_34
-    const/4 v1, 0x0
-
-    :goto_16
-    if-eqz v2, :cond_35
-
-    int-to-float v2, v8
-
-    goto :goto_17
-
-    :cond_35
-    const/4 v2, 0x0
-
-    :goto_17
-    if-eqz v3, :cond_36
-
-    int-to-float v3, v8
-
-    goto :goto_18
-
-    :cond_36
-    const/4 v3, 0x0
-
-    :goto_18
-    iget-object v6, v4, Lf/g/g/f/c;->c:[F
-
-    if-nez v6, :cond_37
-
-    const/16 v6, 0x8
-
-    new-array v6, v6, [F
-
-    iput-object v6, v4, Lf/g/g/f/c;->c:[F
-
-    :cond_37
-    iget-object v4, v4, Lf/g/g/f/c;->c:[F
-
-    const/4 v6, 0x1
-
-    aput v5, v4, v6
-
-    const/4 v6, 0x0
-
-    aput v5, v4, v6
-
-    const/4 v5, 0x2
-
-    const/4 v6, 0x3
-
-    aput v1, v4, v6
-
-    aput v1, v4, v5
-
-    const/4 v1, 0x4
-
-    const/4 v5, 0x5
-
-    aput v2, v4, v5
-
-    aput v2, v4, v1
-
-    const/4 v1, 0x6
-
-    const/4 v2, 0x7
-
-    aput v3, v4, v2
-
-    aput v3, v4, v1
-
-    :cond_38
-    return-object v0
-.end method
-
-.method public static b(F)F
-    .locals 4
-
-    const v0, 0x3b4d2e1c    # 0.0031308f
-
-    cmpg-float v0, p0, v0
-
-    if-gtz v0, :cond_0
-
-    const v0, 0x414eb852    # 12.92f
-
-    mul-float p0, p0, v0
-
-    goto :goto_0
-
-    :cond_0
-    float-to-double v0, p0
-
-    const-wide v2, 0x3fdaaaaaa0000000L    # 0.4166666567325592
-
-    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->pow(DD)D
-
-    move-result-wide v0
-
-    const-wide v2, 0x3ff0e147a0000000L    # 1.0549999475479126
-
-    mul-double v0, v0, v2
-
-    const-wide v2, 0x3fac28f5c0000000L    # 0.054999999701976776
-
-    sub-double/2addr v0, v2
-
-    double-to-float p0, v0
-
-    :goto_0
-    return p0
-.end method
-
-.method public static b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x4
-
-    invoke-static {p0, p1, v0, p2, p3}, Ld0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
-
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->getInt()I
-
-    move-result p0
-
-    int-to-long p0, p0
-
-    const-wide p2, 0xffffffffL
-
-    and-long/2addr p0, p2
-
-    return-wide p0
-.end method
-
-.method public static b1(ILf/h/a/c/i1/t;Z)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/google/android/exoplayer2/ParserException;
-        }
-    .end annotation
-
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->a()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x7
-
-    if-ge v0, v2, :cond_1
-
-    if-eqz p2, :cond_0
-
-    return v1
-
-    :cond_0
-    new-instance p0, Lcom/google/android/exoplayer2/ParserException;
-
-    const-string p2, "too short header: "
-
-    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->a()I
-
-    move-result p1
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
-
-    move-result v0
-
-    if-eq v0, p0, :cond_3
-
-    if-eqz p2, :cond_2
-
-    return v1
-
-    :cond_2
-    new-instance p1, Lcom/google/android/exoplayer2/ParserException;
-
-    const-string p2, "expected header type "
-
-    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {p2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p0
-
-    const/16 v0, 0x76
-
-    if-ne p0, v0, :cond_5
-
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p0
-
-    const/16 v0, 0x6f
-
-    if-ne p0, v0, :cond_5
-
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p0
-
-    const/16 v0, 0x72
-
-    if-ne p0, v0, :cond_5
-
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p0
-
-    const/16 v0, 0x62
-
-    if-ne p0, v0, :cond_5
-
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p0
-
-    const/16 v0, 0x69
-
-    if-ne p0, v0, :cond_5
-
-    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
-
-    move-result p0
-
-    const/16 p1, 0x73
-
-    if-eq p0, p1, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    const/4 p0, 0x1
-
-    return p0
-
-    :cond_5
-    :goto_0
-    if-eqz p2, :cond_6
-
-    return v1
-
-    :cond_6
-    new-instance p0, Lcom/google/android/exoplayer2/ParserException;
-
-    const-string p1, "expected characters \'vorbis\'"
-
-    invoke-direct {p0, p1}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static c(III)I
-    .locals 0
-
-    sub-int/2addr p2, p0
-
-    const/4 p0, 0x0
-
-    invoke-static {p0, p2}, Ljava/lang/Math;->max(II)I
-
-    move-result p0
-
-    invoke-static {p0, p1}, Ljava/lang/Math;->min(II)I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    invoke-static {p0, p1, v0, p2, p3}, Ld0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
-
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->get()B
-
-    move-result p0
-
-    and-int/lit16 p0, p0, 0xff
-
-    int-to-short p0, p0
-
-    return p0
-.end method
-
-.method public static c1(Ljava/io/File;Lf/g/d/c/a;)V
-    .locals 5
-
-    invoke-interface {p1, p0}, Lf/g/d/c/a;->b(Ljava/io/File;)V
-
-    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    aget-object v3, v0, v2
-
-    invoke-virtual {v3}, Ljava/io/File;->isDirectory()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-static {v3, p1}, Ld0/a/b/b/a;->c1(Ljava/io/File;Lf/g/d/c/a;)V
-
-    goto :goto_1
-
-    :cond_0
-    invoke-interface {p1, v3}, Lf/g/d/c/a;->a(Ljava/io/File;)V
-
-    :goto_1
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {p1, p0}, Lf/g/d/c/a;->c(Ljava/io/File;)V
-
-    return-void
-.end method
-
-.method public static d(Ljava/lang/String;)[B
-    .locals 2
-
-    if-eqz p0, :cond_0
-
-    :try_start_0
-    const-string v0, "ASCII"
-
-    invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/lang/String;)[B
-
-    move-result-object p0
-    :try_end_0
-    .catch Ljava/io/UnsupportedEncodingException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    move-exception p0
-
-    new-instance v0, Ljava/lang/RuntimeException;
-
-    const-string v1, "ASCII not found!"
-
-    invoke-direct {v0, v1, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static d0(II)I
-    .locals 0
-
-    add-int/lit8 p0, p0, 0x1f
-
-    mul-int/lit8 p0, p0, 0x1f
-
-    add-int/2addr p0, p1
-
-    return p0
-.end method
-
-.method public static d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-    .locals 3
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    sub-int/2addr v0, v1
-
-    if-ltz v0, :cond_2
-
-    const/4 v1, 0x1
-
-    if-gt v0, v1, :cond_2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    add-int/2addr v2, v1
-
-    invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const/4 v1, 0x0
-
-    :goto_0
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    if-ge v1, v2, :cond_1
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    if-le v2, v1, :cond_0
-
-    invoke-virtual {p1, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :cond_0
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string p1, "Invalid input received"
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static e(Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
-    .locals 17
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;",
-            "Ljava/lang/String;",
-            ")",
-            "Ljava/lang/String;"
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    const-string v1, "secret_id"
-
-    invoke-interface {v0, v1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/String;
-
-    const-string v2, "headers_id"
-
-    invoke-interface {v0, v2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/String;
-
-    const-string v3, "signature"
-
-    invoke-interface {v0, v3}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/String;
-
-    const-string v4, "algorithm"
-
-    invoke-interface {v0, v4}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/String;
-
-    const-string v5, "native_version"
-
-    invoke-interface {v0, v5}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/String;
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x2
-
-    const/4 v8, 0x0
-
-    const-string v9, "authorizationHeader: %s"
-
-    const-string v10, ""
-
-    const-string v11, "algorithm=\"%s\""
-
-    const-string v12, "secret_id=\"%s\""
-
-    const-string v13, "signature=\"%s\""
-
-    if-eqz v1, :cond_3
-
-    if-eqz v3, :cond_3
-
-    if-nez v2, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    new-array v15, v6, [Ljava/lang/Object;
-
-    aput-object v3, v15, v8
-
-    invoke-static {v13, v15}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    new-array v15, v6, [Ljava/lang/Object;
-
-    aput-object v1, v15, v8
-
-    invoke-static {v12, v15}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v15
-
-    new-array v14, v6, [Ljava/lang/Object;
-
-    aput-object v2, v14, v8
-
-    const-string v2, "headers_id=\"%s\""
-
-    invoke-static {v2, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    new-array v14, v6, [Ljava/lang/Object;
-
-    if-eqz v4, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const-string v4, "adj1"
-
-    :goto_0
-    aput-object v4, v14, v8
-
-    invoke-static {v11, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v4
-
-    new-array v14, v6, [Ljava/lang/Object;
-
-    if-eqz v5, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    move-object v5, v10
-
-    :goto_1
-    aput-object v5, v14, v8
-
-    const-string v5, "native_version=\"%s\""
-
-    invoke-static {v5, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v5
-
-    const/4 v14, 0x5
-
-    new-array v14, v14, [Ljava/lang/Object;
-
-    aput-object v3, v14, v8
-
-    aput-object v15, v14, v6
-
-    aput-object v4, v14, v7
-
-    const/4 v3, 0x3
-
-    aput-object v2, v14, v3
-
-    const/4 v2, 0x4
-
-    aput-object v5, v14, v2
-
-    const-string v2, "Signature %s,%s,%s,%s,%s"
-
-    invoke-static {v2, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v3
-
-    new-array v4, v6, [Ljava/lang/Object;
-
-    aput-object v2, v4, v8
-
-    invoke-interface {v3, v9, v4}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    goto :goto_3
-
-    :cond_3
-    :goto_2
-    const/4 v2, 0x0
-
-    :goto_3
-    if-eqz v2, :cond_4
-
-    return-object v2
-
-    :cond_4
-    const-string v2, "app_secret"
-
-    invoke-interface {v0, v2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/String;
-
-    if-eqz v3, :cond_10
-
-    invoke-virtual {v3}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    if-nez v4, :cond_5
-
-    goto/16 :goto_7
-
-    :cond_5
-    const-string v4, "created_at"
-
-    invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/String;
-
-    const-string v6, "gps_adid"
-
-    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_6
-
-    :goto_4
-    move-object v14, v6
-
-    goto :goto_5
-
-    :cond_6
-    const-string v6, "fire_adid"
-
-    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_7
-
-    goto :goto_4
-
-    :cond_7
-    const-string v6, "android_id"
-
-    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    const-string v6, "mac_sha1"
-
-    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_9
-
-    goto :goto_4
-
-    :cond_9
-    const-string v6, "mac_md5"
-
-    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_a
-
-    goto :goto_4
-
-    :cond_a
-    const-string v6, "android_uuid"
-
-    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_b
-
-    goto :goto_4
-
-    :cond_b
-    const/4 v14, 0x0
-
-    :goto_5
-    invoke-interface {v0, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/String;
-
-    const-string v7, "source"
-
-    invoke-interface {v0, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v8
-
-    check-cast v8, Ljava/lang/String;
-
-    const-string v15, "payload"
-
-    invoke-interface {v0, v15}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    move-object/from16 v16, v10
-
-    new-instance v10, Ljava/util/HashMap;
-
-    invoke-direct {v10}, Ljava/util/HashMap;-><init>()V
-
-    invoke-virtual {v10, v2, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-virtual {v10, v4, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v2, "activity_kind"
-
-    move-object/from16 v3, p1
-
-    invoke-virtual {v10, v2, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-virtual {v10, v14, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    if-eqz v8, :cond_c
-
-    invoke-virtual {v10, v7, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_c
-    if-eqz v0, :cond_d
-
-    invoke-virtual {v10, v15, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_d
-    invoke-virtual {v10}, Ljava/util/HashMap;->entrySet()Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    move-object/from16 v2, v16
-
-    move-object v10, v2
-
-    :cond_e
-    :goto_6
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_f
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/Map$Entry;
-
-    invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_e
-
-    invoke-static {v10}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v4
-
-    invoke-interface {v3}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/String;
-
-    const-string v6, " "
-
-    invoke-static {v4, v5, v6}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    goto :goto_6
-
-    :cond_f
-    invoke-virtual {v10}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, -0x1
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v10, v3, v0}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v3, Ljava/util/HashMap;
-
-    invoke-direct {v3}, Ljava/util/HashMap;-><init>()V
-
-    const-string v4, "clear_signature"
-
-    invoke-virtual {v3, v4, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v2, "fields"
-
-    invoke-virtual {v3, v2, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-virtual {v3, v4}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    const-string v4, "SHA-256"
-
-    invoke-static {v0, v4}, Lf/c/a/e2;->s(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v3, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/String;
-
-    const/4 v3, 0x1
-
-    new-array v4, v3, [Ljava/lang/Object;
-
-    const/4 v5, 0x0
-
-    aput-object v1, v4, v5
-
-    invoke-static {v12, v4}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    new-array v4, v3, [Ljava/lang/Object;
-
-    aput-object v0, v4, v5
-
-    invoke-static {v13, v4}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-array v4, v3, [Ljava/lang/Object;
-
-    const-string v6, "sha256"
-
-    aput-object v6, v4, v5
-
-    invoke-static {v11, v4}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v4
-
-    new-array v6, v3, [Ljava/lang/Object;
-
-    aput-object v2, v6, v5
-
-    const-string v2, "headers=\"%s\""
-
-    invoke-static {v2, v6}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    const/4 v6, 0x4
-
-    new-array v6, v6, [Ljava/lang/Object;
-
-    aput-object v1, v6, v5
-
-    aput-object v0, v6, v3
-
-    const/4 v0, 0x2
-
-    aput-object v4, v6, v0
-
-    const/4 v0, 0x3
-
-    aput-object v2, v6, v0
-
-    const-string v0, "Signature %s,%s,%s,%s"
-
-    invoke-static {v0, v6}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v14
-
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v0
-
-    new-array v1, v3, [Ljava/lang/Object;
-
-    aput-object v14, v1, v5
-
-    invoke-interface {v0, v9, v1}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    goto :goto_8
-
-    :cond_10
-    :goto_7
-    const/4 v14, 0x0
-
-    :goto_8
-    return-object v14
-.end method
-
-.method public static e0(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/lang/Object;->hashCode()I
-
-    move-result p0
-
-    :goto_0
-    if-nez p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    :goto_1
-    invoke-static {p0, v0}, Ld0/a/b/b/a;->d0(II)I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static f(Ljava/lang/String;JLf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/u;
-    .locals 7
-
-    const-string v0, "malformed"
-
-    const/4 v1, 0x0
-
-    if-eqz p0, :cond_2
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    if-nez v2, :cond_0
-
-    goto/16 :goto_1
-
-    :cond_0
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    :try_start_0
-    const-string v4, "UTF-8"
-
-    invoke-static {p0, v4}, Ljava/net/URLDecoder;->decode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/io/UnsupportedEncodingException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v4
-
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v5
-
-    new-array v6, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v4}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v6, v2
-
-    const-string v4, "Referrer decoding failed. Message: (%s)"
-
-    invoke-interface {v5, v4, v6}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :catch_1
-    move-exception v4
-
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v5
-
-    new-array v6, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v4}, Ljava/lang/IllegalArgumentException;->getMessage()Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v6, v2
-
-    const-string v4, "Referrer decoding failed due to IllegalArgumentException. Message: (%s)"
-
-    invoke-interface {v5, v4, v6}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :catch_2
-    move-exception v4
-
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v5
-
-    new-array v6, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v4}, Ljava/io/UnsupportedEncodingException;->getMessage()Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v6, v2
-
-    const-string v4, "Referrer decoding failed due to UnsupportedEncodingException. Message: (%s)"
-
-    invoke-interface {v5, v4, v6}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    :goto_0
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v4
-
-    new-array v5, v3, [Ljava/lang/Object;
-
-    aput-object v0, v5, v2
-
-    const-string v2, "Referrer to parse (%s)"
-
-    invoke-interface {v4, v2, v5}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    new-instance v2, Landroid/net/UrlQuerySanitizer;
-
-    invoke-direct {v2}, Landroid/net/UrlQuerySanitizer;-><init>()V
-
-    invoke-static {}, Landroid/net/UrlQuerySanitizer;->getAllButNulLegal()Landroid/net/UrlQuerySanitizer$ValueSanitizer;
-
-    move-result-object v4
-
-    invoke-virtual {v2, v4}, Landroid/net/UrlQuerySanitizer;->setUnregisteredParameterValueSanitizer(Landroid/net/UrlQuerySanitizer$ValueSanitizer;)V
-
-    invoke-virtual {v2, v3}, Landroid/net/UrlQuerySanitizer;->setAllowUnregisteredParamaters(Z)V
-
-    invoke-virtual {v2, v0}, Landroid/net/UrlQuerySanitizer;->parseQuery(Ljava/lang/String;)V
-
-    invoke-virtual {v2}, Landroid/net/UrlQuerySanitizer;->getParameterList()Ljava/util/List;
-
-    move-result-object v2
-
-    invoke-static {v2, p3, p4, p5, p6}, Ld0/a/b/b/a;->C0(Ljava/util/List;Lf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/n1;
-
-    move-result-object p3
-
-    if-nez p3, :cond_1
-
-    return-object v1
-
-    :cond_1
-    iput-object v0, p3, Lf/c/a/n1;->k:Ljava/lang/String;
-
-    iput-wide p1, p3, Lf/c/a/n1;->g:J
-
-    iput-object p0, p3, Lf/c/a/n1;->l:Ljava/lang/String;
-
-    const-string p0, "reftag"
-
-    invoke-virtual {p3, p0}, Lf/c/a/n1;->h(Ljava/lang/String;)Lf/c/a/u;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    :goto_1
-    return-object v1
-.end method
-
-.method public static f0(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
-
-    invoke-static {p0}, Ld0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-static {p0, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
-
-    return-void
-.end method
-
-.method public static g(Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Landroid/net/Uri;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;",
-            "Ljava/lang/String;",
-            ")",
-            "Landroid/net/Uri;"
-        }
-    .end annotation
-
-    new-instance v0, Landroid/net/Uri$Builder;
-
-    invoke-direct {v0}, Landroid/net/Uri$Builder;-><init>()V
-
-    const-string v1, "https://app.adjust.com"
-
-    const-string v2, "https"
-
-    const-string v3, "app.adjust.com"
-
-    if-eqz p2, :cond_0
-
-    :try_start_0
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    :cond_0
-    new-instance p2, Ljava/net/URL;
-
-    invoke-direct {p2, v1}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Ljava/net/URL;->getProtocol()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {p2}, Ljava/net/URL;->getAuthority()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {p2}, Ljava/net/URL;->getPath()Ljava/lang/String;
-
-    move-result-object p2
-    :try_end_0
-    .catch Ljava/net/MalformedURLException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p2
-
-    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
-
-    move-result-object v1
-
-    const/4 v4, 0x1
-
-    new-array v4, v4, [Ljava/lang/Object;
-
-    const/4 v5, 0x0
-
-    invoke-virtual {p2}, Ljava/net/MalformedURLException;->getMessage()Ljava/lang/String;
-
-    move-result-object p2
-
-    aput-object p2, v4, v5
-
-    const-string p2, "Unable to parse endpoint (%s)"
-
-    invoke-interface {v1, p2, v4}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    const-string p2, ""
-
-    :goto_0
-    invoke-virtual {v0, v2}, Landroid/net/Uri$Builder;->scheme(Ljava/lang/String;)Landroid/net/Uri$Builder;
-
-    invoke-virtual {v0, v3}, Landroid/net/Uri$Builder;->encodedAuthority(Ljava/lang/String;)Landroid/net/Uri$Builder;
-
-    invoke-virtual {v0, p2}, Landroid/net/Uri$Builder;->path(Ljava/lang/String;)Landroid/net/Uri$Builder;
-
-    invoke-virtual {v0, p0}, Landroid/net/Uri$Builder;->appendPath(Ljava/lang/String;)Landroid/net/Uri$Builder;
-
-    invoke-interface {p1}, 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
-
-    :goto_1
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/util/Map$Entry;
-
-    invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/String;
-
-    invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {v0, p2, p1}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide p0
-
-    sget-object p2, Lf/c/a/e2;->b:Ljava/text/SimpleDateFormat;
-
-    invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p0
-
-    invoke-virtual {p2, p0}, Ljava/text/SimpleDateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "sent_at"
-
-    invoke-virtual {v0, p1, p0}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
-
-    invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static g0(I)I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    :goto_0
-    if-lez p0, :cond_0
-
-    add-int/lit8 v0, v0, 0x1
-
-    ushr-int/lit8 p0, p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return v0
-.end method
-
-.method public static h(Z)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p0
-.end method
-
-.method public static h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Throwable;",
-            ")",
-            "Lcom/facebook/datasource/DataSource<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lf/g/e/i;
-
-    invoke-direct {v0}, Lf/g/e/i;-><init>()V
-
-    invoke-virtual {v0, p0}, Lf/g/e/i;->k(Ljava/lang/Throwable;)Z
-
-    return-object v0
-.end method
-
-.method public static i(ZLjava/lang/Object;)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static varargs i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1, p2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    if-nez p1, :cond_0
-
-    const/4 p0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1, p0, p3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    :goto_0
-    return-object p0
-.end method
-
-.method public static j(IIIII)V
-    .locals 3
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-ltz p3, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
-
-    if-ltz p0, :cond_1
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
-
-    if-ltz p2, :cond_2
-
-    const/4 v2, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v2, 0x0
-
-    :goto_2
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
-
-    add-int/2addr p0, p3
-
-    if-gt p0, p4, :cond_3
-
-    const/4 p0, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    const/4 p0, 0x0
-
-    :goto_3
-    invoke-static {p0}, Ld0/a/b/b/a;->h(Z)V
-
-    add-int/2addr p2, p3
-
-    if-gt p2, p1, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    const/4 v0, 0x0
-
-    :goto_4
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
-
-    return-void
-.end method
-
-.method public static varargs j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-
-    invoke-static {p0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object p0
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p0
-
-    const/4 p1, 0x0
-
-    if-nez p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0, p1, p3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public static k(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(TT;)TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static k0(IILf/g/j/d/d;)Z
-    .locals 3
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-nez p2, :cond_1
-
-    invoke-static {p0}, Ld0/a/b/b/a;->K(I)I
-
-    move-result p0
-
-    int-to-float p0, p0
-
-    const/high16 p2, 0x45000000    # 2048.0f
-
-    cmpl-float p0, p0, p2
-
-    if-ltz p0, :cond_0
-
-    invoke-static {p1}, Ld0/a/b/b/a;->K(I)I
-
-    move-result p0
-
-    const/16 p1, 0x800
-
-    if-lt p0, p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-
-    :cond_1
-    invoke-static {p0}, Ld0/a/b/b/a;->K(I)I
-
-    move-result p0
-
-    iget v2, p2, Lf/g/j/d/d;->a:I
-
-    if-lt p0, v2, :cond_2
-
-    invoke-static {p1}, Ld0/a/b/b/a;->K(I)I
-
-    move-result p0
-
-    iget p1, p2, Lf/g/j/d/d;->b:I
-
-    if-lt p0, p1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    return v0
-.end method
-
-.method public static l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(TT;",
-            "Ljava/lang/Object;",
-            ")TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Ljava/lang/NullPointerException;
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static l0(Lcom/facebook/imagepipeline/image/EncodedImage;Lf/g/j/d/d;)Z
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return p0
-
-    :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->f()I
-
-    move-result v0
-
-    const/16 v1, 0x5a
-
-    if-eq v0, v1, :cond_1
-
-    const/16 v1, 0x10e
-
-    if-eq v0, v1, :cond_1
-
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget v0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
-
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget p0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
-
-    invoke-static {v0, p0, p1}, Ld0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_1
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget v0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
-
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget p0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
-
-    invoke-static {v0, p0, p1}, Ld0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static m(Z)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    invoke-direct {p0}, Ljava/lang/IllegalStateException;-><init>()V
-
-    throw p0
-.end method
-
-.method public static m0(Ljava/lang/String;)Ljava/lang/String;
-    .locals 4
-
-    :try_start_0
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "/sys/class/net/"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p0, "/address"
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x3e8
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    new-instance v1, Ljava/io/BufferedReader;
-
-    new-instance v2, Ljava/io/FileReader;
-
-    invoke-direct {v2, p0}, Ljava/io/FileReader;-><init>(Ljava/lang/String;)V
-
-    const/16 p0, 0x400
-
-    invoke-direct {v1, v2, p0}, Ljava/io/BufferedReader;-><init>(Ljava/io/Reader;I)V
-
-    new-array p0, p0, [C
-
-    :goto_0
-    invoke-virtual {v1, p0}, Ljava/io/BufferedReader;->read([C)I
-
-    move-result v2
-
-    const/4 v3, -0x1
-
-    if-eq v2, v3, :cond_0
-
-    const/4 v3, 0x0
-
-    invoke-static {p0, v3, v2}, Ljava/lang/String;->valueOf([CII)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v1}, Ljava/io/BufferedReader;->close()V
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
-.method public static n(ZLjava/lang/Object;)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static n0(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-static {p0, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
-
-    :cond_0
-    return-void
-.end method
-
-.method public static o([BLjava/lang/String;)Z
-    .locals 4
-
-    array-length v0, p0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-eq v0, v1, :cond_0
-
-    return v2
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    array-length v1, p0
-
-    if-ge v0, v1, :cond_2
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    aget-byte v3, p0, v0
-
-    if-eq v1, v3, :cond_1
-
-    return v2
-
-    :cond_1
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 p0, 0x1
-
-    return p0
-.end method
-
-.method public static o0(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 1
-
-    const/4 v0, 0x5
-
-    invoke-static {p0, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-
-    :cond_0
-    return-void
-.end method
-
-.method public static p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
-    .locals 10
-
-    :goto_0
-    invoke-virtual {p2}, Lf/h/a/c/i1/t;->a()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-le v0, v1, :cond_9
-
-    invoke-static {p2}, Ld0/a/b/b/a;->H0(Lf/h/a/c/i1/t;)I
-
-    move-result v0
-
-    invoke-static {p2}, Ld0/a/b/b/a;->H0(Lf/h/a/c/i1/t;)I
-
-    move-result v2
-
-    iget v3, p2, Lf/h/a/c/i1/t;->b:I
-
-    add-int/2addr v3, v2
-
-    const/4 v4, -0x1
-
-    if-eq v2, v4, :cond_7
-
-    invoke-virtual {p2}, Lf/h/a/c/i1/t;->a()I
-
-    move-result v4
-
-    if-le v2, v4, :cond_0
-
-    goto :goto_4
-
-    :cond_0
-    const/4 v4, 0x4
-
-    if-ne v0, v4, :cond_8
-
-    const/16 v0, 0x8
-
-    if-lt v2, v0, :cond_8
-
-    invoke-virtual {p2}, Lf/h/a/c/i1/t;->q()I
-
-    move-result v0
-
-    invoke-virtual {p2}, Lf/h/a/c/i1/t;->v()I
-
-    move-result v2
-
-    const/16 v4, 0x31
-
-    const/4 v5, 0x0
-
-    if-ne v2, v4, :cond_1
-
-    invoke-virtual {p2}, Lf/h/a/c/i1/t;->e()I
-
-    move-result v6
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v6, 0x0
-
-    :goto_1
-    invoke-virtual {p2}, Lf/h/a/c/i1/t;->q()I
-
-    move-result v7
-
-    const/16 v8, 0x2f
-
-    if-ne v2, v8, :cond_2
-
-    invoke-virtual {p2, v1}, Lf/h/a/c/i1/t;->D(I)V
-
-    :cond_2
-    const/16 v9, 0xb5
-
-    if-ne v0, v9, :cond_4
-
-    if-eq v2, v4, :cond_3
-
-    if-ne v2, v8, :cond_4
-
-    :cond_3
-    const/4 v0, 0x3
-
-    if-ne v7, v0, :cond_4
-
-    const/4 v0, 0x1
-
-    goto :goto_2
-
-    :cond_4
-    const/4 v0, 0x0
-
-    :goto_2
-    if-ne v2, v4, :cond_6
-
-    const v2, 0x47413934
-
-    if-ne v6, v2, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v1, 0x0
-
-    :goto_3
-    and-int/2addr v0, v1
-
-    :cond_6
-    if-eqz v0, :cond_8
-
-    invoke-static {p0, p1, p2, p3}, Ld0/a/b/b/a;->q(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
-
-    goto :goto_5
-
-    :cond_7
-    :goto_4
-    const-string v0, "CeaUtil"
-
-    const-string v1, "Skipping remainder of malformed SEI NAL unit."
-
-    invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
-
-    iget v3, p2, Lf/h/a/c/i1/t;->c:I
-
-    :cond_8
-    :goto_5
-    invoke-virtual {p2, v3}, Lf/h/a/c/i1/t;->C(I)V
-
-    goto :goto_0
-
-    :cond_9
-    return-void
-.end method
-
-.method public static p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
-    .locals 1
-
-    const/4 v0, -0x1
-
-    if-eq p2, v0, :cond_0
-
-    invoke-virtual {p0, p1, p2}, Landroid/media/MediaFormat;->setInteger(Ljava/lang/String;I)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public static q(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
-    .locals 11
-
-    invoke-virtual {p2}, Lf/h/a/c/i1/t;->q()I
-
-    move-result v0
-
-    and-int/lit8 v1, v0, 0x40
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-nez v1, :cond_1
-
-    return-void
-
-    :cond_1
-    and-int/lit8 v0, v0, 0x1f
-
-    invoke-virtual {p2, v3}, Lf/h/a/c/i1/t;->D(I)V
-
-    mul-int/lit8 v0, v0, 0x3
-
-    iget v1, p2, Lf/h/a/c/i1/t;->b:I
-
-    array-length v3, p3
-
-    :goto_1
-    if-ge v2, v3, :cond_2
-
-    aget-object v4, p3, v2
-
-    invoke-virtual {p2, v1}, Lf/h/a/c/i1/t;->C(I)V
-
-    invoke-interface {v4, p2, v0}, Lf/h/a/c/a1/s;->b(Lf/h/a/c/i1/t;I)V
-
-    const/4 v7, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    move-wide v5, p0
-
-    move v8, v0
-
-    invoke-interface/range {v4 .. v10}, Lf/h/a/c/a1/s;->c(JIIILf/h/a/c/a1/s$a;)V
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    return-void
-.end method
-
-.method public static q0(Ljava/io/File;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/facebook/common/file/FileUtils$CreateDirectoryException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/io/File;->exists()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/io/File;->delete()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;
-
-    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Lcom/facebook/common/file/FileUtils$FileDeleteException;
-
-    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v2, p0}, Lcom/facebook/common/file/FileUtils$FileDeleteException;-><init>(Ljava/lang/String;)V
-
-    invoke-direct {v0, v1, v2}, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_2
-    :goto_0
-    invoke-virtual {p0}, Ljava/io/File;->mkdirs()Z
-
-    move-result v0
-
-    if-nez v0, :cond_4
-
-    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    new-instance v0, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;
-
-    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    :goto_1
-    return-void
-.end method
-
-.method public static r(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
-    .locals 2
-
-    if-eqz p0, :cond_1
-
-    if-ne p0, p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
-
-    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getChangingConfigurations()I
-
-    move-result v0
-
-    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setChangingConfigurations(I)V
-
-    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getLevel()I
-
-    move-result v0
-
-    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setLevel(I)Z
-
-    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->isVisible()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, v0, v1}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
-
-    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getState()[I
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public static r0(II)I
-    .locals 2
-
-    const/16 v0, 0xff
-
-    if-ne p1, v0, :cond_0
-
-    return p0
-
-    :cond_0
-    const v0, 0xffffff
-
-    if-nez p1, :cond_1
-
-    and-int/2addr p0, v0
-
-    return p0
-
-    :cond_1
-    shr-int/lit8 v1, p1, 0x7
-
-    add-int/2addr p1, v1
-
-    ushr-int/lit8 v1, p0, 0x18
-
-    mul-int v1, v1, p1
-
-    shr-int/lit8 p1, v1, 0x8
-
-    shl-int/lit8 p1, p1, 0x18
-
-    and-int/2addr p0, v0
-
-    or-int/2addr p0, p1
-
-    return p0
-.end method
-
-.method public static s(Lf/c/a/u;Ljava/lang/String;)Lf/c/a/r1;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-
-    :try_start_0
-    new-instance v0, Ljava/util/HashMap;
-
-    iget-object v1, p0, Lf/c/a/u;->parameters:Ljava/util/Map;
-
-    invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
-
-    const-string v1, "event_callback_id"
-
-    invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    iget-object v1, p0, Lf/c/a/u;->path:Ljava/lang/String;
-
-    invoke-static {v1, v0, p1}, Ld0/a/b/b/a;->g(Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Landroid/net/Uri;
-
-    move-result-object p1
-
-    new-instance v1, Ljava/net/URL;
-
-    invoke-virtual {p1}, Landroid/net/Uri;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v1, p1}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
-
-    move-result-object p1
-
-    check-cast p1, Ljavax/net/ssl/HttpsURLConnection;
-
-    iget-object v1, p0, Lf/c/a/u;->clientSdk:Ljava/lang/String;
-
-    const-string v2, "Client-SDK"
-
-    invoke-virtual {p1, v2, v1}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
-
-    const v1, 0xea60
-
-    invoke-virtual {p1, v1}, Ljavax/net/ssl/HttpsURLConnection;->setConnectTimeout(I)V
-
-    invoke-virtual {p1, v1}, Ljavax/net/ssl/HttpsURLConnection;->setReadTimeout(I)V
-
-    sget-object v1, Ld0/a/b/b/a;->b:Ljava/lang/String;
-
-    if-eqz v1, :cond_0
-
-    const-string v2, "User-Agent"
-
-    invoke-virtual {p1, v2, v1}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_0
-    iget-object v1, p0, Lf/c/a/u;->activityKind:Lf/c/a/t;
-
-    invoke-virtual {v1}, Lf/c/a/t;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->e(Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    const-string v1, "Authorization"
-
-    invoke-virtual {p1, v1, v0}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_1
-    const-string v0, "GET"
-
-    invoke-virtual {p1, v0}, Ljavax/net/ssl/HttpsURLConnection;->setRequestMethod(Ljava/lang/String;)V
-
-    invoke-static {p1, p0}, Ld0/a/b/b/a;->G0(Ljavax/net/ssl/HttpsURLConnection;Lf/c/a/u;)Lf/c/a/r1;
-
-    move-result-object p0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    move-exception p0
-
-    throw p0
-.end method
-
-.method public static s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
-    .locals 1
-    .annotation build Landroidx/annotation/Nullable;
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lf/d/a/x/h0/c;",
-            "Lf/d/a/d;",
-            "Lf/d/a/x/g0<",
-            "TT;>;)",
-            "Ljava/util/List<",
-            "Lf/d/a/z/a<",
-            "TT;>;>;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/high16 v0, 0x3f800000    # 1.0f
-
-    invoke-static {p0, p1, v0, p2}, Lf/d/a/x/q;->a(Lf/d/a/x/h0/c;Lf/d/a/d;FLf/d/a/x/g0;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final t(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/player/MediaSource;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessageEmbed;->isGifv()Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    sget-object p0, Lcom/discord/player/MediaType;->GIFV:Lcom/discord/player/MediaType;
-
-    goto :goto_0
-
-    :cond_0
-    sget-object p0, Lcom/discord/player/MediaType;->VIDEO:Lcom/discord/player/MediaType;
-
-    :goto_0
-    new-instance v0, Lcom/discord/player/MediaSource;
-
-    invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-
-    move-result-object p1
-
-    const-string v1, "Uri.parse(progressiveMediaUri)"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v0, p1, p2, p0}, Lcom/discord/player/MediaSource;-><init>(Landroid/net/Uri;Ljava/lang/String;Lcom/discord/player/MediaType;)V
-
-    return-object v0
-
-    :cond_1
-    const-string p0, "featureTag"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "progressiveMediaUri"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Lf/d/a/v/j/a;
-
-    sget-object v1, Lf/d/a/x/e;->a:Lf/d/a/x/e;
-
-    invoke-static {p0, p1, v1}, Ld0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Lf/d/a/v/j/a;-><init>(Ljava/util/List;)V
-
-    return-object v0
-.end method
-
-.method public static u(Ljava/lang/String;Lf/c/a/u;I)Lf/c/a/r1;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    new-instance v1, Ljava/net/URL;
-
-    invoke-direct {v1, p0}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
-
-    move-result-object p0
-
-    check-cast p0, Ljavax/net/ssl/HttpsURLConnection;
-
-    new-instance v1, Ljava/util/HashMap;
-
-    iget-object v2, p1, Lf/c/a/u;->parameters:Ljava/util/Map;
-
-    invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
-
-    iget-object v2, p1, Lf/c/a/u;->clientSdk:Ljava/lang/String;
-
-    const-string v3, "Client-SDK"
-
-    invoke-virtual {p0, v3, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
-
-    const v2, 0xea60
-
-    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setConnectTimeout(I)V
-
-    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setReadTimeout(I)V
-
-    sget-object v2, Ld0/a/b/b/a;->b:Ljava/lang/String;
-
-    if-eqz v2, :cond_0
-
-    const-string v3, "User-Agent"
-
-    invoke-virtual {p0, v3, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_0
-    const-string v2, "event_callback_id"
-
-    invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    iget-object v2, p1, Lf/c/a/u;->activityKind:Lf/c/a/t;
-
-    invoke-virtual {v2}, Lf/c/a/t;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Ld0/a/b/b/a;->e(Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_1
-
-    const-string v3, "Authorization"
-
-    invoke-virtual {p0, v3, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_1
-    const-string v2, "POST"
-
-    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestMethod(Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setUseCaches(Z)V
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setDoInput(Z)V
-
-    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setDoOutput(Z)V
-
-    new-instance v2, Ljava/io/DataOutputStream;
-
-    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getOutputStream()Ljava/io/OutputStream;
-
-    move-result-object v3
-
-    invoke-direct {v2, v3}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-static {v1, p2}, Ld0/a/b/b/a;->T(Ljava/util/Map;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {v2, p2}, Ljava/io/DataOutputStream;->writeBytes(Ljava/lang/String;)V
-
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->G0(Ljavax/net/ssl/HttpsURLConnection;Lf/c/a/u;)Lf/c/a/r1;
-
-    move-result-object p0
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    invoke-virtual {v2}, Ljava/io/DataOutputStream;->flush()V
-
-    invoke-virtual {v2}, Ljava/io/DataOutputStream;->close()V
-    :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
-
-    :catch_0
-    return-object p0
-
-    :catchall_0
-    move-exception p0
-
-    goto :goto_2
-
-    :catch_1
-    move-exception p0
-
-    move-object v0, v2
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p0
-
-    goto :goto_1
-
-    :catch_2
-    move-exception p0
-
-    :goto_0
-    :try_start_3
-    throw p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :goto_1
-    move-object v2, v0
-
-    :goto_2
-    if-eqz v2, :cond_2
-
-    :try_start_4
-    invoke-virtual {v2}, Ljava/io/DataOutputStream;->flush()V
-
-    invoke-virtual {v2}, Ljava/io/DataOutputStream;->close()V
-    :try_end_4
-    .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_3
-
-    :catch_3
-    :cond_2
-    throw p0
-.end method
-
-.method public static u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    invoke-static {p0, p1, v0}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
-    .locals 2
-
-    invoke-static {p0}, Ld0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const/4 v0, 0x1
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const/4 v1, 0x0
-
-    aput-object p2, v0, v1
-
-    invoke-static {p1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
-
-    return-void
-.end method
-
-.method public static v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Lf/d/a/v/j/b;
-
-    if-eqz p2, :cond_0
-
-    invoke-static {}, Lf/d/a/y/g;->e()F
-
-    move-result p2
-
-    goto :goto_0
-
-    :cond_0
-    const/high16 p2, 0x3f800000    # 1.0f
-
-    :goto_0
-    sget-object v1, Lf/d/a/x/h;->a:Lf/d/a/x/h;
-
-    invoke-static {p0, p1, p2, v1}, Lf/d/a/x/q;->a(Lf/d/a/x/h0/c;Lf/d/a/d;FLf/d/a/x/g0;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Lf/d/a/v/j/b;-><init>(Ljava/util/List;)V
-
-    return-object v0
-.end method
-
-.method public static varargs w(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
-    .locals 0
-
-    invoke-static {p0}, Ld0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-static {p1, p2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
-
-    return-void
-.end method
-
-.method public static w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Lf/d/a/v/j/d;
-
-    sget-object v1, Lf/d/a/x/n;->a:Lf/d/a/x/n;
-
-    invoke-static {p0, p1, v1}, Ld0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Lf/d/a/v/j/d;-><init>(Ljava/util/List;)V
-
-    return-object v0
-.end method
-
-.method public static x(Ljava/io/File;)Z
-    .locals 4
-
-    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
-
-    move-result-object p0
-
-    const/4 v0, 0x1
-
-    if-eqz p0, :cond_0
-
-    array-length v1, p0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_0
-
-    aget-object v3, p0, v2
-
-    invoke-static {v3}, Ld0/a/b/b/a;->y(Ljava/io/File;)Z
-
-    move-result v3
-
-    and-int/2addr v0, v3
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return v0
-.end method
-
-.method public static x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Lf/d/a/v/j/f;
-
-    invoke-static {}, Lf/d/a/y/g;->e()F
-
-    move-result v1
-
-    sget-object v2, Lf/d/a/x/v;->a:Lf/d/a/x/v;
-
-    invoke-static {p0, p1, v1, v2}, Lf/d/a/x/q;->a(Lf/d/a/x/h0/c;Lf/d/a/d;FLf/d/a/x/g0;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Lf/d/a/v/j/f;-><init>(Ljava/util/List;)V
-
-    return-object v0
-.end method
-
-.method public static y(Ljava/io/File;)Z
-    .locals 1
-
-    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0}, Ld0/a/b/b/a;->x(Ljava/io/File;)Z
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/io/File;->delete()Z
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static y0(Lf/h/a/c/a1/e;)Lf/h/a/c/a1/f0/b;
-    .locals 14
-    .annotation build Landroidx/annotation/Nullable;
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;,
-            Ljava/lang/InterruptedException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_5
-
-    new-instance v1, Lf/h/a/c/i1/t;
-
-    const/16 v2, 0x10
-
-    invoke-direct {v1, v2}, Lf/h/a/c/i1/t;-><init>(I)V
-
-    invoke-static {p0, v1}, Lf/h/a/c/a1/f0/c;->a(Lf/h/a/c/a1/e;Lf/h/a/c/i1/t;)Lf/h/a/c/a1/f0/c;
-
-    move-result-object v3
-
-    iget v3, v3, Lf/h/a/c/a1/f0/c;->a:I
-
-    const v4, 0x52494646
-
-    if-eq v3, v4, :cond_0
-
-    return-object v0
-
-    :cond_0
-    iget-object v3, v1, Lf/h/a/c/i1/t;->a:[B
-
-    const/4 v4, 0x4
-
-    const/4 v5, 0x0
-
-    invoke-virtual {p0, v3, v5, v4, v5}, Lf/h/a/c/a1/e;->e([BIIZ)Z
-
-    invoke-virtual {v1, v5}, Lf/h/a/c/i1/t;->C(I)V
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->e()I
-
-    move-result v3
-
-    const v4, 0x57415645
-
-    if-eq v3, v4, :cond_1
-
-    new-instance p0, Ljava/lang/StringBuilder;
-
-    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Unsupported RIFF format: "
-
-    invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v1, "WavHeaderReader"
-
-    invoke-static {v1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
-
-    return-object v0
-
-    :cond_1
-    invoke-static {p0, v1}, Lf/h/a/c/a1/f0/c;->a(Lf/h/a/c/a1/e;Lf/h/a/c/i1/t;)Lf/h/a/c/a1/f0/c;
-
-    move-result-object v0
-
-    :goto_0
-    iget v3, v0, Lf/h/a/c/a1/f0/c;->a:I
-
-    const v4, 0x666d7420
-
-    if-eq v3, v4, :cond_2
-
-    iget-wide v3, v0, Lf/h/a/c/a1/f0/c;->b:J
-
-    long-to-int v0, v3
-
-    invoke-virtual {p0, v0, v5}, Lf/h/a/c/a1/e;->a(IZ)Z
-
-    invoke-static {p0, v1}, Lf/h/a/c/a1/f0/c;->a(Lf/h/a/c/a1/e;Lf/h/a/c/i1/t;)Lf/h/a/c/a1/f0/c;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_2
-    iget-wide v3, v0, Lf/h/a/c/a1/f0/c;->b:J
-
-    const-wide/16 v6, 0x10
-
-    cmp-long v8, v3, v6
-
-    if-ltz v8, :cond_3
-
-    const/4 v3, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v3, 0x0
-
-    :goto_1
-    invoke-static {v3}, Lf/h/a/c/i1/e;->F(Z)V
-
-    iget-object v3, v1, Lf/h/a/c/i1/t;->a:[B
-
-    invoke-virtual {p0, v3, v5, v2, v5}, Lf/h/a/c/a1/e;->e([BIIZ)Z
-
-    invoke-virtual {v1, v5}, Lf/h/a/c/i1/t;->C(I)V
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
-
-    move-result v7
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
-
-    move-result v8
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->i()I
-
-    move-result v9
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->i()I
-
-    move-result v10
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
-
-    move-result v11
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
-
-    move-result v12
-
-    iget-wide v0, v0, Lf/h/a/c/a1/f0/c;->b:J
-
-    long-to-int v1, v0
-
-    sub-int/2addr v1, v2
-
-    if-lez v1, :cond_4
-
-    new-array v0, v1, [B
-
-    invoke-virtual {p0, v0, v5, v1, v5}, Lf/h/a/c/a1/e;->e([BIIZ)Z
-
-    move-object v13, v0
-
-    goto :goto_2
-
-    :cond_4
-    sget-object p0, Lf/h/a/c/i1/c0;->f:[B
-
-    move-object v13, p0
-
-    :goto_2
-    new-instance p0, Lf/h/a/c/a1/f0/b;
-
-    move-object v6, p0
-
-    invoke-direct/range {v6 .. v13}, Lf/h/a/c/a1/f0/b;-><init>(IIIIII[B)V
-
-    return-object p0
-
-    :cond_5
-    throw v0
-.end method
-
-.method public static z(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;)F
-    .locals 7
-
-    invoke-static {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->i(Lcom/facebook/imagepipeline/image/EncodedImage;)Z
-
-    move-result v0
-
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
-
-    if-eqz p1, :cond_9
-
-    iget v0, p1, Lf/g/j/d/d;->b:I
-
-    if-lez v0, :cond_9
-
-    iget v0, p1, Lf/g/j/d/d;->a:I
-
-    if-lez v0, :cond_9
-
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
-
-    if-eqz v0, :cond_9
-
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
-
-    if-nez v0, :cond_0
-
-    goto/16 :goto_7
-
-    :cond_0
-    invoke-virtual {p0}, Lf/g/j/d/e;->c()Z
-
-    move-result p0
-
-    const/16 v0, 0x10e
-
-    const/16 v1, 0x5a
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-nez p0, :cond_1
-
-    const/4 p0, 0x0
-
-    goto :goto_2
-
-    :cond_1
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->g:I
-
-    if-eqz p0, :cond_3
-
-    if-eq p0, v1, :cond_3
-
-    const/16 v4, 0xb4
-
-    if-eq p0, v4, :cond_3
-
-    if-ne p0, v0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v4, 0x0
-
-    goto :goto_1
-
-    :cond_3
-    :goto_0
-    const/4 v4, 0x1
-
-    :goto_1
-    invoke-static {v4}, Ld0/a/b/b/a;->h(Z)V
-
-    :goto_2
-    if-eq p0, v1, :cond_5
-
-    if-ne p0, v0, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    const/4 p0, 0x0
-
-    goto :goto_4
-
-    :cond_5
-    :goto_3
-    const/4 p0, 0x1
-
-    :goto_4
-    if-eqz p0, :cond_6
-
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
-
-    goto :goto_5
-
-    :cond_6
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
-
-    :goto_5
-    if-eqz p0, :cond_7
-
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
-
-    goto :goto_6
-
-    :cond_7
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
-
-    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
-
-    :goto_6
-    iget p2, p1, Lf/g/j/d/d;->a:I
-
-    int-to-float p2, p2
-
-    int-to-float v1, v0
-
-    div-float/2addr p2, v1
-
-    iget v1, p1, Lf/g/j/d/d;->b:I
-
-    int-to-float v1, v1
-
-    int-to-float v4, p0
-
-    div-float/2addr v1, v4
-
-    invoke-static {p2, v1}, Ljava/lang/Math;->max(FF)F
-
-    move-result v4
-
-    const/4 v5, 0x7
-
-    new-array v5, v5, [Ljava/lang/Object;
-
-    iget v6, p1, Lf/g/j/d/d;->a:I
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    aput-object v6, v5, v3
-
-    iget p1, p1, Lf/g/j/d/d;->b:I
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    aput-object p1, v5, v2
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    const/4 v0, 0x2
-
-    aput-object p1, v5, v0
-
-    const/4 p1, 0x3
-
-    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    aput-object p0, v5, p1
-
-    const/4 p0, 0x4
-
-    invoke-static {p2}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object p1
-
-    aput-object p1, v5, p0
-
-    const/4 p0, 0x5
-
-    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object p1
-
-    aput-object p1, v5, p0
-
-    const/4 p0, 0x6
-
-    invoke-static {v4}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object p1
-
-    aput-object p1, v5, p0
-
-    sget-object p0, Lf/g/d/e/a;->a:Lf/g/d/e/c;
-
-    check-cast p0, Lf/g/d/e/b;
-
-    invoke-virtual {p0, v0}, Lf/g/d/e/b;->a(I)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_8
-
-    sget-object p0, Lf/g/d/e/a;->a:Lf/g/d/e/c;
-
-    const-string p1, "Downsample - Specified size: %dx%d, image size: %dx%d ratio: %.1f x %.1f, ratio: %.3f"
-
-    invoke-static {p1, v5}, Lf/g/d/e/a;->f(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    check-cast p0, Lf/g/d/e/b;
-
-    const-string p2, "DownsampleUtil"
-
-    invoke-virtual {p0, v0, p2, p1}, Lf/g/d/e/b;->c(ILjava/lang/String;Ljava/lang/String;)V
-
-    :cond_8
-    return v4
-
-    :cond_9
-    :goto_7
-    const/high16 p0, 0x3f800000    # 1.0f
-
-    return p0
-.end method
-
-.method public static z0(Lf/h/a/c/a1/e;Z)Lcom/google/android/exoplayer2/metadata/Metadata;
-    .locals 9
-    .annotation build Landroidx/annotation/Nullable;
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;,
-            Ljava/lang/InterruptedException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    move-object p1, v0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object p1, Lf/h/a/c/c1/i/b;->b:Lf/h/a/c/c1/i/b$a;
-
-    :goto_0
-    new-instance v1, Lf/h/a/c/i1/t;
-
-    const/16 v2, 0xa
-
-    invoke-direct {v1, v2}, Lf/h/a/c/i1/t;-><init>(I)V
-
-    const/4 v3, 0x0
-
-    move-object v4, v0
-
-    const/4 v5, 0x0
-
-    :goto_1
-    :try_start_0
-    iget-object v6, v1, Lf/h/a/c/i1/t;->a:[B
-
-    invoke-virtual {p0, v6, v3, v2, v3}, Lf/h/a/c/a1/e;->e([BIIZ)Z
-    :try_end_0
-    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
-
-    invoke-virtual {v1, v3}, Lf/h/a/c/i1/t;->C(I)V
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->s()I
-
-    move-result v6
-
-    const v7, 0x494433
-
-    if-eq v6, v7, :cond_1
-
-    goto :goto_3
-
-    :cond_1
-    const/4 v6, 0x3
-
-    invoke-virtual {v1, v6}, Lf/h/a/c/i1/t;->D(I)V
-
-    invoke-virtual {v1}, Lf/h/a/c/i1/t;->p()I
-
-    move-result v6
-
-    add-int/lit8 v7, v6, 0xa
-
-    if-nez v4, :cond_2
-
-    new-array v4, v7, [B
-
-    iget-object v8, v1, Lf/h/a/c/i1/t;->a:[B
-
-    invoke-static {v8, v3, v4, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    invoke-virtual {p0, v4, v2, v6, v3}, Lf/h/a/c/a1/e;->e([BIIZ)Z
-
-    new-instance v6, Lf/h/a/c/c1/i/b;
-
-    invoke-direct {v6, p1}, Lf/h/a/c/c1/i/b;-><init>(Lf/h/a/c/c1/i/b$a;)V
-
-    invoke-virtual {v6, v4, v7}, Lf/h/a/c/c1/i/b;->c([BI)Lcom/google/android/exoplayer2/metadata/Metadata;
-
-    move-result-object v4
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {p0, v6, v3}, Lf/h/a/c/a1/e;->a(IZ)Z
-
-    :goto_2
-    add-int/2addr v5, v7
-
-    goto :goto_1
-
-    :catch_0
-    nop
-
-    :goto_3
-    iput v3, p0, Lf/h/a/c/a1/e;->f:I
-
-    invoke-virtual {p0, v5, v3}, Lf/h/a/c/a1/e;->a(IZ)Z
-
-    if-eqz v4, :cond_4
-
-    iget-object p0, v4, Lcom/google/android/exoplayer2/metadata/Metadata;->d:[Lcom/google/android/exoplayer2/metadata/Metadata$Entry;
-
-    array-length p0, p0
-
-    if-nez p0, :cond_3
-
-    goto :goto_4
-
-    :cond_3
-    move-object v0, v4
-
-    :cond_4
-    :goto_4
-    return-object v0
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/a$a.smali b/com.discord/smali/d0/a/b/b/b/a$a.smali
deleted file mode 100644
index 83a1839665..0000000000
--- a/com.discord/smali/d0/a/b/b/b/a$a.smali
+++ /dev/null
@@ -1,355 +0,0 @@
-.class public abstract Ld0/a/b/b/b/a$a;
-.super Landroid/os/Binder;
-.source "IMediaControllerCallback.java"
-
-# interfaces
-.implements Ld0/a/b/b/b/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/b/b/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
-
-    const-string v0, "android.support.v4.media.session.IMediaControllerCallback"
-
-    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    const v0, 0x5f4e5446
-
-    const/4 v1, 0x1
-
-    const-string v2, "android.support.v4.media.session.IMediaControllerCallback"
-
-    if-eq p1, v0, :cond_6
-
-    const/4 v0, 0x0
-
-    packed-switch p1, :pswitch_data_0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result p1
-
-    return p1
-
-    :pswitch_0
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    move-object p1, p0
-
-    check-cast p1, Ld0/a/b/b/b/c$b;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return v1
-
-    :pswitch_1
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-object p1, p0
-
-    check-cast p1, Ld0/a/b/b/b/c$b;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return v1
-
-    :pswitch_2
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    move-object p1, p0
-
-    check-cast p1, Ld0/a/b/b/b/c$b;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return v1
-
-    :pswitch_3
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    return v1
-
-    :pswitch_4
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-object p1, p0
-
-    check-cast p1, Ld0/a/b/b/b/c$b;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return v1
-
-    :pswitch_5
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    sget-object p1, Landroid/support/v4/media/session/ParcelableVolumeInfo;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Landroid/support/v4/media/session/ParcelableVolumeInfo;
-
-    :cond_0
-    invoke-interface {p0, v0}, Ld0/a/b/b/b/a;->u0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
-
-    return v1
-
-    :pswitch_6
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Landroid/os/Bundle;
-
-    :cond_1
-    invoke-interface {p0, v0}, Ld0/a/b/b/b/a;->v(Landroid/os/Bundle;)V
-
-    return v1
-
-    :pswitch_7
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    sget-object p1, Landroid/text/TextUtils;->CHAR_SEQUENCE_CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    :cond_2
-    invoke-interface {p0, v0}, Ld0/a/b/b/b/a;->R(Ljava/lang/CharSequence;)V
-
-    return v1
-
-    :pswitch_8
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    sget-object p1, Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-virtual {p2, p1}, Landroid/os/Parcel;->createTypedArrayList(Landroid/os/Parcelable$Creator;)Ljava/util/ArrayList;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Ld0/a/b/b/b/a;->y(Ljava/util/List;)V
-
-    return v1
-
-    :pswitch_9
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    sget-object p1, Landroid/support/v4/media/MediaMetadataCompat;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    move-object v0, p1
-
-    check-cast v0, Landroid/support/v4/media/MediaMetadataCompat;
-
-    :cond_3
-    invoke-interface {p0, v0}, Ld0/a/b/b/b/a;->V(Landroid/support/v4/media/MediaMetadataCompat;)V
-
-    return v1
-
-    :pswitch_a
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
-    sget-object p1, Landroid/support/v4/media/session/PlaybackStateCompat;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/support/v4/media/session/PlaybackStateCompat;
-
-    :cond_4
-    move-object p1, p0
-
-    check-cast p1, Ld0/a/b/b/b/c$b;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return v1
-
-    :pswitch_b
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-interface {p0}, Ld0/a/b/b/b/a;->U()V
-
-    return v1
-
-    :pswitch_c
-    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    if-eqz p1, :cond_5
-
-    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/os/Bundle;
-
-    :cond_5
-    move-object p1, p0
-
-    check-cast p1, Ld0/a/b/b/b/c$b;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return v1
-
-    :cond_6
-    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    return v1
-
-    :pswitch_data_0
-    .packed-switch 0x1
-        :pswitch_c
-        :pswitch_b
-        :pswitch_a
-        :pswitch_9
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/a.smali b/com.discord/smali/d0/a/b/b/b/a.smali
deleted file mode 100644
index 1eba550edf..0000000000
--- a/com.discord/smali/d0/a/b/b/b/a.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class public interface abstract Ld0/a/b/b/b/a;
-.super Ljava/lang/Object;
-.source "IMediaControllerCallback.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/b/b/a$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract R(Ljava/lang/CharSequence;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract U()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract V(Landroid/support/v4/media/MediaMetadataCompat;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract u0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract v(Landroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract y(Ljava/util/List;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;",
-            ">;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/b$a$a.smali b/com.discord/smali/d0/a/b/b/b/b$a$a.smali
deleted file mode 100644
index 916e8ac3fd..0000000000
--- a/com.discord/smali/d0/a/b/b/b/b$a$a.smali
+++ /dev/null
@@ -1,98 +0,0 @@
-.class public Ld0/a/b/b/b/b$a$a;
-.super Ljava/lang/Object;
-.source "IMediaSession.java"
-
-# interfaces
-.implements Ld0/a/b/b/b/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/b/b/b$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Landroid/os/IBinder;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/IBinder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ld0/a/b/b/b/b$a$a;->a:Landroid/os/IBinder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/b/b/b/b$a$a;->a:Landroid/os/IBinder;
-
-    return-object v0
-.end method
-
-.method public k(Ld0/a/b/b/b/a;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v1
-
-    :try_start_0
-    const-string v2, "android.support.v4.media.session.IMediaSession"
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
-
-    iget-object p1, p0, Ld0/a/b/b/b/b$a$a;->a:Landroid/os/IBinder;
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x0
-
-    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/b$a.smali b/com.discord/smali/d0/a/b/b/b/b$a.smali
deleted file mode 100644
index 03809ef1b5..0000000000
--- a/com.discord/smali/d0/a/b/b/b/b$a.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public abstract Ld0/a/b/b/b/b$a;
-.super Landroid/os/Binder;
-.source "IMediaSession.java"
-
-# interfaces
-.implements Ld0/a/b/b/b/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/b/b/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/b/b/b$a$a;
-    }
-.end annotation
-
-
-# direct methods
-.method public static g(Landroid/os/IBinder;)Ld0/a/b/b/b/b;
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    const-string v0, "android.support.v4.media.session.IMediaSession"
-
-    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    instance-of v1, v0, Ld0/a/b/b/b/b;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Ld0/a/b/b/b/b;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ld0/a/b/b/b/b$a$a;
-
-    invoke-direct {v0, p0}, Ld0/a/b/b/b/b$a$a;-><init>(Landroid/os/IBinder;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/b.smali b/com.discord/smali/d0/a/b/b/b/b.smali
deleted file mode 100644
index 00db9c1fef..0000000000
--- a/com.discord/smali/d0/a/b/b/b/b.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public interface abstract Ld0/a/b/b/b/b;
-.super Ljava/lang/Object;
-.source "IMediaSession.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/b/b/b$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract k(Ld0/a/b/b/b/a;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/c$a.smali b/com.discord/smali/d0/a/b/b/b/c$a.smali
deleted file mode 100644
index 60cac06d84..0000000000
--- a/com.discord/smali/d0/a/b/b/b/c$a.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.class public Ld0/a/b/b/b/c$a;
-.super Ljava/lang/Object;
-.source "MediaControllerCompat.java"
-
-# interfaces
-.implements Ld0/a/b/b/b/f;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/b/b/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/ref/WeakReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/ref/WeakReference<",
-            "Ld0/a/b/b/b/c;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ld0/a/b/b/b/c;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/lang/ref/WeakReference;
-
-    invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    return-void
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/c$b.smali b/com.discord/smali/d0/a/b/b/b/c$b.smali
deleted file mode 100644
index 0f22f51863..0000000000
--- a/com.discord/smali/d0/a/b/b/b/c$b.smali
+++ /dev/null
@@ -1,167 +0,0 @@
-.class public Ld0/a/b/b/b/c$b;
-.super Ld0/a/b/b/b/a$a;
-.source "MediaControllerCompat.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/b/b/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/ref/WeakReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/ref/WeakReference<",
-            "Ld0/a/b/b/b/c;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ld0/a/b/b/b/c;)V
-    .locals 1
-
-    invoke-direct {p0}, Ld0/a/b/b/b/a$a;-><init>()V
-
-    new-instance v0, Ljava/lang/ref/WeakReference;
-
-    invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public R(Ljava/lang/CharSequence;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    iget-object p1, p0, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public U()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public V(Landroid/support/v4/media/MediaMetadataCompat;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    iget-object p1, p0, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public u0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    iget-object p1, p0, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public v(Landroid/os/Bundle;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    iget-object p1, p0, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public y(Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;",
-            ">;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    iget-object p1, p0, Ld0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/c.smali b/com.discord/smali/d0/a/b/b/b/c.smali
deleted file mode 100644
index 5fe0e8208d..0000000000
--- a/com.discord/smali/d0/a/b/b/b/c.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.class public abstract Ld0/a/b/b/b/c;
-.super Ljava/lang/Object;
-.source "MediaControllerCompat.java"
-
-# interfaces
-.implements Landroid/os/IBinder$DeathRecipient;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/b/b/c$b;,
-        Ld0/a/b/b/b/c$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Ld0/a/b/b/b/a;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ld0/a/b/b/b/c$a;
-
-    invoke-direct {v0, p0}, Ld0/a/b/b/b/c$a;-><init>(Ld0/a/b/b/b/c;)V
-
-    new-instance v1, Ld0/a/b/b/b/g;
-
-    invoke-direct {v1, v0}, Ld0/a/b/b/b/g;-><init>(Ld0/a/b/b/b/f;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public binderDied()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/d.smali b/com.discord/smali/d0/a/b/b/b/d.smali
deleted file mode 100644
index 4342ab369b..0000000000
--- a/com.discord/smali/d0/a/b/b/b/d.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public Ld0/a/b/b/b/d;
-.super Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;
-.source "MediaControllerCompat.java"
-
-
-# annotations
-.annotation build Landroidx/annotation/RequiresApi;
-    value = 0x17
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/e.smali b/com.discord/smali/d0/a/b/b/b/e.smali
deleted file mode 100644
index b26f642547..0000000000
--- a/com.discord/smali/d0/a/b/b/b/e.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public Ld0/a/b/b/b/e;
-.super Ld0/a/b/b/b/d;
-.source "MediaControllerCompat.java"
-
-
-# annotations
-.annotation build Landroidx/annotation/RequiresApi;
-    value = 0x18
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ld0/a/b/b/b/d;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/d0/a/b/b/b/f.smali b/com.discord/smali/d0/a/b/b/b/f.smali
deleted file mode 100644
index 1762b5d0b2..0000000000
--- a/com.discord/smali/d0/a/b/b/b/f.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public interface abstract Ld0/a/b/b/b/f;
-.super Ljava/lang/Object;
-.source "MediaControllerCompatApi21.java"
diff --git a/com.discord/smali/d0/a/b/b/b/g.smali b/com.discord/smali/d0/a/b/b/b/g.smali
deleted file mode 100644
index 857504bee9..0000000000
--- a/com.discord/smali/d0/a/b/b/b/g.smali
+++ /dev/null
@@ -1,481 +0,0 @@
-.class public Ld0/a/b/b/b/g;
-.super Landroid/media/session/MediaController$Callback;
-.source "MediaControllerCompatApi21.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T::",
-        "Ld0/a/b/b/b/f;",
-        ">",
-        "Landroid/media/session/MediaController$Callback;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ld0/a/b/b/b/f;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ld0/a/b/b/b/f;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Landroid/media/session/MediaController$Callback;-><init>()V
-
-    iput-object p1, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onAudioInfoChanged(Landroid/media/session/MediaController$PlaybackInfo;)V
-    .locals 4
-
-    iget-object v0, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getPlaybackType()I
-
-    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getAudioAttributes()Landroid/media/AudioAttributes;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroid/media/AudioAttributes;->getFlags()I
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    and-int/2addr v2, v3
-
-    if-ne v2, v3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v1}, Landroid/media/AudioAttributes;->getFlags()I
-
-    move-result v2
-
-    const/4 v3, 0x4
-
-    and-int/2addr v2, v3
-
-    if-ne v2, v3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {v1}, Landroid/media/AudioAttributes;->getUsage()I
-
-    move-result v1
-
-    const/16 v2, 0xd
-
-    if-eq v1, v2, :cond_2
-
-    packed-switch v1, :pswitch_data_0
-
-    :cond_2
-    :goto_0
-    :pswitch_0
-    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getVolumeControl()I
-
-    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getMaxVolume()I
-
-    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getCurrentVolume()I
-
-    check-cast v0, Ld0/a/b/b/b/c$a;
-
-    iget-object p1, v0, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-
-    :pswitch_data_0
-    .packed-switch 0x2
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public onExtrasChanged(Landroid/os/Bundle;)V
-    .locals 0
-
-    invoke-static {p1}, Landroid/support/v4/media/session/MediaSessionCompat;->a(Landroid/os/Bundle;)V
-
-    iget-object p1, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    check-cast p1, Ld0/a/b/b/b/c$a;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public onMetadataChanged(Landroid/media/MediaMetadata;)V
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    check-cast v0, Ld0/a/b/b/b/c$a;
-
-    iget-object v0, v0, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ld0/a/b/b/b/c;
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Landroid/support/v4/media/MediaMetadataCompat;->a(Ljava/lang/Object;)Landroid/support/v4/media/MediaMetadataCompat;
-
-    :cond_0
-    return-void
-.end method
-
-.method public onPlaybackStateChanged(Landroid/media/session/PlaybackState;)V
-    .locals 24
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    iget-object v2, v0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    check-cast v2, Ld0/a/b/b/b/c$a;
-
-    iget-object v2, v2, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {v2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ld0/a/b/b/b/c;
-
-    if-eqz v2, :cond_5
-
-    iget-object v2, v2, Ld0/a/b/b/b/c;->a:Ld0/a/b/b/b/a;
-
-    if-eqz v2, :cond_0
-
-    goto/16 :goto_3
-
-    :cond_0
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_5
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getCustomActions()Ljava/util/List;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_3
-
-    new-instance v4, Ljava/util/ArrayList;
-
-    invoke-interface {v3}, Ljava/util/List;->size()I
-
-    move-result v5
-
-    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :goto_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_1
-
-    new-instance v6, Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction;
-
-    move-object v7, v5
-
-    check-cast v7, Landroid/media/session/PlaybackState$CustomAction;
-
-    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getAction()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getName()Ljava/lang/CharSequence;
-
-    move-result-object v9
-
-    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getIcon()I
-
-    move-result v10
-
-    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getExtras()Landroid/os/Bundle;
-
-    move-result-object v7
-
-    invoke-direct {v6, v8, v9, v10, v7}, Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;ILandroid/os/Bundle;)V
-
-    iput-object v5, v6, Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction;->h:Ljava/lang/Object;
-
-    goto :goto_1
-
-    :cond_1
-    move-object v6, v2
-
-    :goto_1
-    invoke-virtual {v4, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    move-object/from16 v20, v4
-
-    goto :goto_2
-
-    :cond_3
-    move-object/from16 v20, v2
-
-    :goto_2
-    sget v3, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 v4, 0x16
-
-    if-lt v3, v4, :cond_4
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getExtras()Landroid/os/Bundle;
-
-    move-result-object v2
-
-    :cond_4
-    move-object/from16 v23, v2
-
-    new-instance v2, Landroid/support/v4/media/session/PlaybackStateCompat;
-
-    move-object v7, v2
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getState()I
-
-    move-result v8
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getPosition()J
-
-    move-result-wide v9
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getBufferedPosition()J
-
-    move-result-wide v11
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getPlaybackSpeed()F
-
-    move-result v13
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getActions()J
-
-    move-result-wide v14
-
-    const/16 v16, 0x0
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getErrorMessage()Ljava/lang/CharSequence;
-
-    move-result-object v17
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getLastPositionUpdateTime()J
-
-    move-result-wide v18
-
-    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getActiveQueueItemId()J
-
-    move-result-wide v21
-
-    invoke-direct/range {v7 .. v23}, Landroid/support/v4/media/session/PlaybackStateCompat;-><init>(IJJFJILjava/lang/CharSequence;JLjava/util/List;JLandroid/os/Bundle;)V
-
-    iput-object v1, v2, Landroid/support/v4/media/session/PlaybackStateCompat;->o:Ljava/lang/Object;
-
-    :cond_5
-    :goto_3
-    return-void
-.end method
-
-.method public onQueueChanged(Ljava/util/List;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Landroid/media/session/MediaSession$QueueItem;",
-            ">;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    check-cast v0, Ld0/a/b/b/b/c$a;
-
-    iget-object v0, v0, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ld0/a/b/b/b/c;
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :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
-
-    if-eqz v2, :cond_0
-
-    move-object v3, v2
-
-    check-cast v3, Landroid/media/session/MediaSession$QueueItem;
-
-    invoke-virtual {v3}, Landroid/media/session/MediaSession$QueueItem;->getDescription()Landroid/media/MediaDescription;
-
-    move-result-object v4
-
-    invoke-static {v4}, Landroid/support/v4/media/MediaDescriptionCompat;->a(Ljava/lang/Object;)Landroid/support/v4/media/MediaDescriptionCompat;
-
-    move-result-object v4
-
-    invoke-virtual {v3}, Landroid/media/session/MediaSession$QueueItem;->getQueueId()J
-
-    move-result-wide v5
-
-    new-instance v3, Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;
-
-    invoke-direct {v3, v2, v4, v5, v6}, Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;-><init>(Ljava/lang/Object;Landroid/support/v4/media/MediaDescriptionCompat;J)V
-
-    goto :goto_1
-
-    :cond_0
-    move-object v3, v0
-
-    :goto_1
-    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public onQueueTitleChanged(Ljava/lang/CharSequence;)V
-    .locals 0
-
-    iget-object p1, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    check-cast p1, Ld0/a/b/b/b/c$a;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public onSessionDestroyed()V
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    check-cast v0, Ld0/a/b/b/b/c$a;
-
-    iget-object v0, v0, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ld0/a/b/b/b/c;
-
-    return-void
-.end method
-
-.method public onSessionEvent(Ljava/lang/String;Landroid/os/Bundle;)V
-    .locals 0
-
-    invoke-static {p2}, Landroid/support/v4/media/session/MediaSessionCompat;->a(Landroid/os/Bundle;)V
-
-    iget-object p1, p0, Ld0/a/b/b/b/g;->a:Ld0/a/b/b/b/f;
-
-    check-cast p1, Ld0/a/b/b/b/c$a;
-
-    iget-object p1, p1, Ld0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
-
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ld0/a/b/b/b/c;
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p1, Ld0/a/b/b/b/c;->a:Ld0/a/b/b/b/a;
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali/d0/a/b/c/a$a$a.smali b/com.discord/smali/d0/a/b/c/a$a$a.smali
deleted file mode 100644
index 8b5dde5c3e..0000000000
--- a/com.discord/smali/d0/a/b/c/a$a$a.smali
+++ /dev/null
@@ -1,98 +0,0 @@
-.class public Ld0/a/b/c/a$a$a;
-.super Ljava/lang/Object;
-.source "IResultReceiver.java"
-
-# interfaces
-.implements Ld0/a/b/c/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/c/a$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Landroid/os/IBinder;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/IBinder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ld0/a/b/c/a$a$a;->a:Landroid/os/IBinder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 1
-
-    iget-object v0, p0, Ld0/a/b/c/a$a$a;->a:Landroid/os/IBinder;
-
-    return-object v0
-.end method
-
-.method public t0(ILandroid/os/Bundle;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    :try_start_0
-    const-string v1, "android.support.v4.os.IResultReceiver"
-
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    const/4 p1, 0x0
-
-    const/4 v1, 0x1
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
-
-    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
-
-    :goto_0
-    iget-object p1, p0, Ld0/a/b/c/a$a$a;->a:Landroid/os/IBinder;
-
-    const/4 p2, 0x0
-
-    invoke-interface {p1, v1, v0, p2, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/d0/a/b/c/a$a.smali b/com.discord/smali/d0/a/b/c/a$a.smali
deleted file mode 100644
index 42f93a46e5..0000000000
--- a/com.discord/smali/d0/a/b/c/a$a.smali
+++ /dev/null
@@ -1,140 +0,0 @@
-.class public abstract Ld0/a/b/c/a$a;
-.super Landroid/os/Binder;
-.source "IResultReceiver.java"
-
-# interfaces
-.implements Ld0/a/b/c/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ld0/a/b/c/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/c/a$a$a;
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
-
-    const-string v0, "android.support.v4.os.IResultReceiver"
-
-    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public static g(Landroid/os/IBinder;)Ld0/a/b/c/a;
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    const-string v0, "android.support.v4.os.IResultReceiver"
-
-    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    instance-of v1, v0, Ld0/a/b/c/a;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Ld0/a/b/c/a;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ld0/a/b/c/a$a$a;
-
-    invoke-direct {v0, p0}, Ld0/a/b/c/a$a$a;-><init>(Landroid/os/IBinder;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public asBinder()Landroid/os/IBinder;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    const-string v1, "android.support.v4.os.IResultReceiver"
-
-    if-eq p1, v0, :cond_1
-
-    const v2, 0x5f4e5446
-
-    if-eq p1, v2, :cond_0
-
-    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
-
-    return v0
-
-    :cond_1
-    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p1
-
-    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
-
-    move-result p3
-
-    if-eqz p3, :cond_2
-
-    sget-object p3, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {p3, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Landroid/os/Bundle;
-
-    goto :goto_0
-
-    :cond_2
-    const/4 p2, 0x0
-
-    :goto_0
-    invoke-interface {p0, p1, p2}, Ld0/a/b/c/a;->t0(ILandroid/os/Bundle;)V
-
-    return v0
-.end method
diff --git a/com.discord/smali/d0/a/b/c/a.smali b/com.discord/smali/d0/a/b/c/a.smali
deleted file mode 100644
index d7275c92b4..0000000000
--- a/com.discord/smali/d0/a/b/c/a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public interface abstract Ld0/a/b/c/a;
-.super Ljava/lang/Object;
-.source "IResultReceiver.java"
-
-# interfaces
-.implements Landroid/os/IInterface;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ld0/a/b/c/a$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract t0(ILandroid/os/Bundle;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/e0/a/a/a$a$a.smali b/com.discord/smali/e0/a/a/a$a$a.smali
new file mode 100644
index 0000000000..cdd4ec9c8c
--- /dev/null
+++ b/com.discord/smali/e0/a/a/a$a$a.smali
@@ -0,0 +1,475 @@
+.class public Le0/a/a/a$a$a;
+.super Ljava/lang/Object;
+.source "ICustomTabsCallback.java"
+
+# interfaces
+.implements Le0/a/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/a$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Landroid/os/IBinder;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/IBinder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 1
+
+    iget-object v0, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    return-object v0
+.end method
+
+.method public extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p2, :cond_0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p2, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x3
+
+    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p2, :cond_0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p2, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x7
+
+    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/os/Bundle;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public onMessageChannelReady(Landroid/os/Bundle;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p1, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x4
+
+    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public onNavigationEvent(ILandroid/os/Bundle;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    const/4 p1, 0x0
+
+    if-eqz p2, :cond_0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p2, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x2
+
+    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p2, :cond_0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p2, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x5
+
+    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    const/4 p1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    if-eqz p3, :cond_1
+
+    const/4 p2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_1
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    if-eqz p4, :cond_2
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p4, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_2
+
+    :cond_2
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_2
+    iget-object p1, p0, Le0/a/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 p2, 0x6
+
+    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/e0/a/a/a$a.smali b/com.discord/smali/e0/a/a/a$a.smali
new file mode 100644
index 0000000000..15a03acbae
--- /dev/null
+++ b/com.discord/smali/e0/a/a/a$a.smali
@@ -0,0 +1,358 @@
+.class public abstract Le0/a/a/a$a;
+.super Landroid/os/Binder;
+.source "ICustomTabsCallback.java"
+
+# interfaces
+.implements Le0/a/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/a$a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.ICustomTabsCallback"
+
+.field public static final TRANSACTION_extraCallback:I = 0x3
+
+.field public static final TRANSACTION_extraCallbackWithResult:I = 0x7
+
+.field public static final TRANSACTION_onMessageChannelReady:I = 0x4
+
+.field public static final TRANSACTION_onNavigationEvent:I = 0x2
+
+.field public static final TRANSACTION_onPostMessage:I = 0x5
+
+.field public static final TRANSACTION_onRelationshipValidationResult:I = 0x6
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
+
+    const-string v0, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    const-string v0, "android.support.customtabs.ICustomTabsCallback"
+
+    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Le0/a/a/a;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Le0/a/a/a;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Le0/a/a/a$a$a;
+
+    invoke-direct {v0, p0}, Le0/a/a/a$a$a;-><init>(Landroid/os/IBinder;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    const v0, 0x5f4e5446
+
+    const/4 v1, 0x1
+
+    const-string v2, "android.support.customtabs.ICustomTabsCallback"
+
+    if-eq p1, v0, :cond_9
+
+    const/4 v0, 0x0
+
+    const/4 v3, 0x0
+
+    packed-switch p1, :pswitch_data_0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result p1
+
+    return p1
+
+    :pswitch_0
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_0
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v3, p2
+
+    check-cast v3, Landroid/os/Bundle;
+
+    :cond_0
+    invoke-interface {p0, p1, v3}, Le0/a/a/a;->extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+
+    move-result-object p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p3, v0}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    return v1
+
+    :pswitch_1
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_2
+
+    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p4
+
+    check-cast p4, Landroid/net/Uri;
+
+    goto :goto_1
+
+    :cond_2
+    move-object p4, v3
+
+    :goto_1
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    const/4 v0, 0x1
+
+    :cond_3
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_4
+
+    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v2, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v3, p2
+
+    check-cast v3, Landroid/os/Bundle;
+
+    :cond_4
+    invoke-interface {p0, p1, p4, v0, v3}, Le0/a/a/a;->onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v1
+
+    :pswitch_2
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_5
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v3, p2
+
+    check-cast v3, Landroid/os/Bundle;
+
+    :cond_5
+    invoke-interface {p0, p1, v3}, Le0/a/a/a;->onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v1
+
+    :pswitch_3
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_6
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v3, p1
+
+    check-cast v3, Landroid/os/Bundle;
+
+    :cond_6
+    invoke-interface {p0, v3}, Le0/a/a/a;->onMessageChannelReady(Landroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v1
+
+    :pswitch_4
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_7
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v3, p2
+
+    check-cast v3, Landroid/os/Bundle;
+
+    :cond_7
+    invoke-interface {p0, p1, v3}, Le0/a/a/a;->extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v1
+
+    :pswitch_5
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_8
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v3, p2
+
+    check-cast v3, Landroid/os/Bundle;
+
+    :cond_8
+    invoke-interface {p0, p1, v3}, Le0/a/a/a;->onNavigationEvent(ILandroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v1
+
+    :cond_9
+    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    return v1
+
+    :pswitch_data_0
+    .packed-switch 0x2
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali/e0/a/a/a.smali b/com.discord/smali/e0/a/a/a.smali
index 971d10425f..dc9164ff88 100644
--- a/com.discord/smali/e0/a/a/a.smali
+++ b/com.discord/smali/e0/a/a/a.smali
@@ -1,40 +1,64 @@
-.class public final synthetic Le0/a/a/a;
+.class public interface abstract Le0/a/a/a;
 .super Ljava/lang/Object;
-.source "lambda"
+.source "ICustomTabsCallback.java"
 
 # interfaces
-.implements Landroid/os/IBinder$DeathRecipient;
+.implements Landroid/os/IInterface;
 
 
-# instance fields
-.field public final synthetic a:Landroidx/browser/customtabs/CustomTabsService$1;
-
-.field public final synthetic b:Landroidx/browser/customtabs/CustomTabsSessionToken;
-
-
-# direct methods
-.method public synthetic constructor <init>(Landroidx/browser/customtabs/CustomTabsService$1;Landroidx/browser/customtabs/CustomTabsSessionToken;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Le0/a/a/a;->a:Landroidx/browser/customtabs/CustomTabsService$1;
-
-    iput-object p2, p0, Le0/a/a/a;->b:Landroidx/browser/customtabs/CustomTabsSessionToken;
-
-    return-void
-.end method
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/a$a;
+    }
+.end annotation
 
 
 # virtual methods
-.method public final binderDied()V
-    .locals 2
-
-    iget-object v0, p0, Le0/a/a/a;->a:Landroidx/browser/customtabs/CustomTabsService$1;
-
-    iget-object v1, p0, Le0/a/a/a;->b:Landroidx/browser/customtabs/CustomTabsSessionToken;
-
-    invoke-virtual {v0, v1}, Landroidx/browser/customtabs/CustomTabsService$1;->g(Landroidx/browser/customtabs/CustomTabsSessionToken;)V
-
-    return-void
+.method public abstract extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract extraCallbackWithResult(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract onMessageChannelReady(Landroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract onNavigationEvent(ILandroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract onPostMessage(Ljava/lang/String;Landroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract onRelationshipValidationResult(ILandroid/net/Uri;ZLandroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali/e0/a/a/b$a$a.smali b/com.discord/smali/e0/a/a/b$a$a.smali
new file mode 100644
index 0000000000..d2e9a82f77
--- /dev/null
+++ b/com.discord/smali/e0/a/a/b$a$a.smali
@@ -0,0 +1,1016 @@
+.class public Le0/a/a/b$a$a;
+.super Ljava/lang/Object;
+.source "ICustomTabsService.java"
+
+# interfaces
+.implements Le0/a/a/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/b$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Landroid/os/IBinder;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/IBinder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 1
+
+    iget-object v0, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    return-object v0
+.end method
+
+.method public extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p2, :cond_0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x5
+
+    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/os/Bundle;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public mayLaunchUrl(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Le0/a/a/a;",
+            "Landroid/net/Uri;",
+            "Landroid/os/Bundle;",
+            "Ljava/util/List<",
+            "Landroid/os/Bundle;",
+            ">;)Z"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    const/4 p1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    if-eqz p3, :cond_2
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_2
+
+    :cond_2
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_2
+    invoke-virtual {v0, p4}, Landroid/os/Parcel;->writeTypedList(Ljava/util/List;)V
+
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/4 p3, 0x4
+
+    invoke-interface {p2, p3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p2, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_3
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public newSession(Le0/a/a/a;)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    iget-object p1, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x3
+
+    const/4 v3, 0x0
+
+    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p1, :cond_1
+
+    const/4 v3, 0x1
+
+    :cond_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return v3
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public newSessionWithExtras(Le0/a/a/a;Landroid/os/Bundle;)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    const/4 p1, 0x1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p2, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/16 v3, 0xa
+
+    invoke-interface {p2, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public postMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p3, :cond_1
+
+    const/4 p2, 0x1
+
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p3, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/16 p3, 0x8
+
+    invoke-interface {p2, p3, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public receiveFile(Le0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    const/4 p1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    invoke-virtual {v0, p3}, Landroid/os/Parcel;->writeInt(I)V
+
+    if-eqz p4, :cond_2
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p4, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_2
+
+    :cond_2
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_2
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/16 p3, 0xc
+
+    invoke-interface {p2, p3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p2, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_3
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public requestPostMessageChannel(Le0/a/a/a;Landroid/net/Uri;)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    const/4 p1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x7
+
+    invoke-interface {p2, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p2, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    :goto_2
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public requestPostMessageChannelWithExtras(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    const/4 p1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, v2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    if-eqz p3, :cond_2
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p3, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_2
+
+    :cond_2
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_2
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/16 p3, 0xb
+
+    invoke-interface {p2, p3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p2, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_3
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    const/4 p1, 0x1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p2, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    iget-object p2, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x6
+
+    invoke-interface {p2, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public validateRelationship(Le0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    const/4 p1, 0x1
+
+    const/4 p2, 0x0
+
+    if-eqz p3, :cond_1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p3, v0, p2}, Landroid/net/Uri;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    if-eqz p4, :cond_2
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p4, v0, p2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_2
+
+    :cond_2
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_2
+    iget-object p3, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/16 p4, 0x9
+
+    invoke-interface {p3, p4, v0, v1, p2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p3
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p3, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_3
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public warmup(J)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1, p2}, Landroid/os/Parcel;->writeLong(J)V
+
+    iget-object p1, p0, Le0/a/a/b$a$a;->a:Landroid/os/IBinder;
+
+    const/4 p2, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-interface {p1, p2, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p1, :cond_0
+
+    const/4 v2, 0x1
+
+    :cond_0
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return v2
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/e0/a/a/b$a.smali b/com.discord/smali/e0/a/a/b$a.smali
new file mode 100644
index 0000000000..c1cae22a8c
--- /dev/null
+++ b/com.discord/smali/e0/a/a/b$a.smali
@@ -0,0 +1,638 @@
+.class public abstract Le0/a/a/b$a;
+.super Landroid/os/Binder;
+.source "ICustomTabsService.java"
+
+# interfaces
+.implements Le0/a/a/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/b$a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.ICustomTabsService"
+
+.field public static final TRANSACTION_extraCommand:I = 0x5
+
+.field public static final TRANSACTION_mayLaunchUrl:I = 0x4
+
+.field public static final TRANSACTION_newSession:I = 0x3
+
+.field public static final TRANSACTION_newSessionWithExtras:I = 0xa
+
+.field public static final TRANSACTION_postMessage:I = 0x8
+
+.field public static final TRANSACTION_receiveFile:I = 0xc
+
+.field public static final TRANSACTION_requestPostMessageChannel:I = 0x7
+
+.field public static final TRANSACTION_requestPostMessageChannelWithExtras:I = 0xb
+
+.field public static final TRANSACTION_updateVisuals:I = 0x6
+
+.field public static final TRANSACTION_validateRelationship:I = 0x9
+
+.field public static final TRANSACTION_warmup:I = 0x2
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
+
+    const-string v0, "android.support.customtabs.ICustomTabsService"
+
+    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static asInterface(Landroid/os/IBinder;)Le0/a/a/b;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    const-string v0, "android.support.customtabs.ICustomTabsService"
+
+    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Le0/a/a/b;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Le0/a/a/b;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Le0/a/a/b$a$a;
+
+    invoke-direct {v0, p0}, Le0/a/a/b$a$a;-><init>(Landroid/os/IBinder;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    const v0, 0x5f4e5446
+
+    const/4 v1, 0x1
+
+    const-string v2, "android.support.customtabs.ICustomTabsService"
+
+    if-eq p1, v0, :cond_e
+
+    const/4 v0, 0x0
+
+    packed-switch p1, :pswitch_data_0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result p1
+
+    return p1
+
+    :pswitch_0
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_0
+
+    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p4
+
+    check-cast p4, Landroid/net/Uri;
+
+    goto :goto_0
+
+    :cond_0
+    move-object p4, v0
+
+    :goto_0
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_1
+    invoke-interface {p0, p1, p4, v2, v0}, Le0/a/a/b;->receiveFile(Le0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_1
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_2
+
+    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p4
+
+    check-cast p4, Landroid/net/Uri;
+
+    goto :goto_1
+
+    :cond_2
+    move-object p4, v0
+
+    :goto_1
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_3
+    invoke-interface {p0, p1, p4, v0}, Le0/a/a/b;->requestPostMessageChannelWithExtras(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_2
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_4
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_4
+    invoke-interface {p0, p1, v0}, Le0/a/a/b;->newSessionWithExtras(Le0/a/a/a;Landroid/os/Bundle;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_3
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_5
+
+    sget-object v2, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v2, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Landroid/net/Uri;
+
+    goto :goto_2
+
+    :cond_5
+    move-object v2, v0
+
+    :goto_2
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v3
+
+    if-eqz v3, :cond_6
+
+    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_6
+    invoke-interface {p0, p1, p4, v2, v0}, Le0/a/a/b;->validateRelationship(Le0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_4
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p4
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_7
+
+    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_7
+    invoke-interface {p0, p1, p4, v0}, Le0/a/a/b;->postMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_5
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_8
+
+    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/net/Uri;
+
+    :cond_8
+    invoke-interface {p0, p1, v0}, Le0/a/a/b;->requestPostMessageChannel(Le0/a/a/a;Landroid/net/Uri;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_6
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_9
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_9
+    invoke-interface {p0, p1, v0}, Le0/a/a/b;->updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_7
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_a
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v0, p2
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_a
+    invoke-interface {p0, p1, v0}, Le0/a/a/b;->extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+
+    move-result-object p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    if-eqz p1, :cond_b
+
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_3
+
+    :cond_b
+    const/4 p1, 0x0
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_3
+    return v1
+
+    :pswitch_8
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_c
+
+    sget-object p4, Landroid/net/Uri;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p4
+
+    check-cast p4, Landroid/net/Uri;
+
+    goto :goto_4
+
+    :cond_c
+    move-object p4, v0
+
+    :goto_4
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_d
+
+    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_d
+    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->createTypedArrayList(Landroid/os/Parcelable$Creator;)Ljava/util/ArrayList;
+
+    move-result-object p2
+
+    invoke-interface {p0, p1, p4, v0, p2}, Le0/a/a/b;->mayLaunchUrl(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_9
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Le0/a/a/b;->newSession(Le0/a/a/a;)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_a
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readLong()J
+
+    move-result-wide p1
+
+    invoke-interface {p0, p1, p2}, Le0/a/a/b;->warmup(J)Z
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :cond_e
+    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    return v1
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x2
+        :pswitch_a
+        :pswitch_9
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali/e0/a/a/b.smali b/com.discord/smali/e0/a/a/b.smali
new file mode 100644
index 0000000000..6e1477910b
--- /dev/null
+++ b/com.discord/smali/e0/a/a/b.smali
@@ -0,0 +1,116 @@
+.class public interface abstract Le0/a/a/b;
+.super Ljava/lang/Object;
+.source "ICustomTabsService.java"
+
+# interfaces
+.implements Landroid/os/IInterface;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/b$a;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract extraCommand(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract mayLaunchUrl(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;Ljava/util/List;)Z
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Le0/a/a/a;",
+            "Landroid/net/Uri;",
+            "Landroid/os/Bundle;",
+            "Ljava/util/List<",
+            "Landroid/os/Bundle;",
+            ">;)Z"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract newSession(Le0/a/a/a;)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract newSessionWithExtras(Le0/a/a/a;Landroid/os/Bundle;)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract postMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract receiveFile(Le0/a/a/a;Landroid/net/Uri;ILandroid/os/Bundle;)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract requestPostMessageChannel(Le0/a/a/a;Landroid/net/Uri;)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract requestPostMessageChannelWithExtras(Le0/a/a/a;Landroid/net/Uri;Landroid/os/Bundle;)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract updateVisuals(Le0/a/a/a;Landroid/os/Bundle;)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract validateRelationship(Le0/a/a/a;ILandroid/net/Uri;Landroid/os/Bundle;)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract warmup(J)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/e0/a/a/c$a$a.smali b/com.discord/smali/e0/a/a/c$a$a.smali
new file mode 100644
index 0000000000..f9dee351d3
--- /dev/null
+++ b/com.discord/smali/e0/a/a/c$a$a.smali
@@ -0,0 +1,199 @@
+.class public Le0/a/a/c$a$a;
+.super Ljava/lang/Object;
+.source "IPostMessageService.java"
+
+# interfaces
+.implements Le0/a/a/c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/c$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Landroid/os/IBinder;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/IBinder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Le0/a/a/c$a$a;->a:Landroid/os/IBinder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 1
+
+    iget-object v0, p0, Le0/a/a/c$a$a;->a:Landroid/os/IBinder;
+
+    return-object v0
+.end method
+
+.method public onMessageChannelReady(Le0/a/a/a;Landroid/os/Bundle;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.IPostMessageService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p2, :cond_1
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    iget-object p2, p0, Le0/a/a/c$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x2
+
+    invoke-interface {p2, v2, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public onPostMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.IPostMessageService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p3, :cond_1
+
+    const/4 p2, 0x1
+
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p3, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    iget-object p2, p0, Le0/a/a/c$a$a;->a:Landroid/os/IBinder;
+
+    const/4 p3, 0x3
+
+    invoke-interface {p2, p3, v0, v1, p1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/e0/a/a/c$a.smali b/com.discord/smali/e0/a/a/c$a.smali
new file mode 100644
index 0000000000..6bdbf3b09a
--- /dev/null
+++ b/com.discord/smali/e0/a/a/c$a.smali
@@ -0,0 +1,197 @@
+.class public abstract Le0/a/a/c$a;
+.super Landroid/os/Binder;
+.source "IPostMessageService.java"
+
+# interfaces
+.implements Le0/a/a/c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/c$a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.IPostMessageService"
+
+.field public static final TRANSACTION_onMessageChannelReady:I = 0x2
+
+.field public static final TRANSACTION_onPostMessage:I = 0x3
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
+
+    const-string v0, "android.support.customtabs.IPostMessageService"
+
+    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static asInterface(Landroid/os/IBinder;)Le0/a/a/c;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    const-string v0, "android.support.customtabs.IPostMessageService"
+
+    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Le0/a/a/c;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Le0/a/a/c;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Le0/a/a/c$a$a;
+
+    invoke-direct {v0, p0}, Le0/a/a/c$a$a;-><init>(Landroid/os/IBinder;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    const/4 v0, 0x2
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    const-string v3, "android.support.customtabs.IPostMessageService"
+
+    if-eq p1, v0, :cond_3
+
+    const/4 v0, 0x3
+
+    if-eq p1, v0, :cond_1
+
+    const v0, 0x5f4e5446
+
+    if-eq p1, v0, :cond_0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    return v2
+
+    :cond_1
+    invoke-virtual {p2, v3}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p4
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    sget-object v0, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v0, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v1, p2
+
+    check-cast v1, Landroid/os/Bundle;
+
+    :cond_2
+    invoke-interface {p0, p1, p4, v1}, Le0/a/a/c;->onPostMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v2
+
+    :cond_3
+    invoke-virtual {p2, v3}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-static {p1}, Le0/a/a/a$a;->asInterface(Landroid/os/IBinder;)Le0/a/a/a;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p4
+
+    if-eqz p4, :cond_4
+
+    sget-object p4, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p4, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    move-object v1, p2
+
+    check-cast v1, Landroid/os/Bundle;
+
+    :cond_4
+    invoke-interface {p0, p1, v1}, Le0/a/a/c;->onMessageChannelReady(Le0/a/a/a;Landroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v2
+.end method
diff --git a/com.discord/smali/e0/a/a/c.smali b/com.discord/smali/e0/a/a/c.smali
new file mode 100644
index 0000000000..039817ab72
--- /dev/null
+++ b/com.discord/smali/e0/a/a/c.smali
@@ -0,0 +1,32 @@
+.class public interface abstract Le0/a/a/c;
+.super Ljava/lang/Object;
+.source "IPostMessageService.java"
+
+# interfaces
+.implements Landroid/os/IInterface;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/c$a;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract onMessageChannelReady(Le0/a/a/a;Landroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract onPostMessage(Le0/a/a/a;Ljava/lang/String;Landroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/e0/a/a/d/a$a$a.smali b/com.discord/smali/e0/a/a/d/a$a$a.smali
new file mode 100644
index 0000000000..f92aaacea0
--- /dev/null
+++ b/com.discord/smali/e0/a/a/d/a$a$a.smali
@@ -0,0 +1,463 @@
+.class public Le0/a/a/d/a$a$a;
+.super Ljava/lang/Object;
+.source "ITrustedWebActivityService.java"
+
+# interfaces
+.implements Le0/a/a/d/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/d/a$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Landroid/os/IBinder;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/IBinder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p1, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x6
+
+    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/os/Bundle;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public asBinder()Landroid/os/IBinder;
+    .locals 1
+
+    iget-object v0, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    return-object v0
+.end method
+
+.method public cancelNotification(Landroid/os/Bundle;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p1, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x3
+
+    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public getActiveNotifications()Landroid/os/Bundle;
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    iget-object v2, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x5
+
+    const/4 v4, 0x0
+
+    invoke-interface {v2, v3, v0, v1, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v2, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Landroid/os/Bundle;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-object v2
+
+    :catchall_0
+    move-exception v2
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw v2
+.end method
+
+.method public getSmallIconBitmap()Landroid/os/Bundle;
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    iget-object v2, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x7
+
+    const/4 v4, 0x0
+
+    invoke-interface {v2, v3, v0, v1, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    sget-object v2, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v2, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Landroid/os/Bundle;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-object v2
+
+    :catchall_0
+    move-exception v2
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw v2
+.end method
+
+.method public getSmallIconId()I
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    iget-object v2, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x4
+
+    const/4 v4, 0x0
+
+    invoke-interface {v2, v3, v0, v1, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result v2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return v2
+
+    :catchall_0
+    move-exception v2
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw v2
+.end method
+
+.method public notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v0, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, v0, v2}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p1, p0, Le0/a/a/d/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x2
+
+    invoke-interface {p1, v3, v0, v1, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, v1}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/os/Bundle;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/e0/a/a/d/a$a.smali b/com.discord/smali/e0/a/a/d/a$a.smali
new file mode 100644
index 0000000000..39982dec17
--- /dev/null
+++ b/com.discord/smali/e0/a/a/d/a$a.smali
@@ -0,0 +1,306 @@
+.class public abstract Le0/a/a/d/a$a;
+.super Landroid/os/Binder;
+.source "ITrustedWebActivityService.java"
+
+# interfaces
+.implements Le0/a/a/d/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/a/d/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/d/a$a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+.field public static final TRANSACTION_areNotificationsEnabled:I = 0x6
+
+.field public static final TRANSACTION_cancelNotification:I = 0x3
+
+.field public static final TRANSACTION_getActiveNotifications:I = 0x5
+
+.field public static final TRANSACTION_getSmallIconBitmap:I = 0x7
+
+.field public static final TRANSACTION_getSmallIconId:I = 0x4
+
+.field public static final TRANSACTION_notifyNotificationWithChannel:I = 0x2
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
+
+    const-string v0, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static asInterface(Landroid/os/IBinder;)Le0/a/a/d/a;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    const-string v0, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Le0/a/a/d/a;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Le0/a/a/d/a;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Le0/a/a/d/a$a$a;
+
+    invoke-direct {v0, p0}, Le0/a/a/d/a$a$a;-><init>(Landroid/os/IBinder;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    const v0, 0x5f4e5446
+
+    const/4 v1, 0x1
+
+    const-string v2, "android.support.customtabs.trusted.ITrustedWebActivityService"
+
+    if-eq p1, v0, :cond_7
+
+    const/4 v0, 0x0
+
+    const/4 v3, 0x0
+
+    packed-switch p1, :pswitch_data_0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result p1
+
+    return p1
+
+    :pswitch_0
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-interface {p0}, Le0/a/a/d/a;->getSmallIconBitmap()Landroid/os/Bundle;
+
+    move-result-object p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    return v1
+
+    :pswitch_1
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_1
+    invoke-interface {p0, v0}, Le0/a/a/d/a;->areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
+
+    move-result-object p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_1
+    return v1
+
+    :pswitch_2
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-interface {p0}, Le0/a/a/d/a;->getActiveNotifications()Landroid/os/Bundle;
+
+    move-result-object p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    if-eqz p1, :cond_3
+
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_2
+
+    :cond_3
+    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_2
+    return v1
+
+    :pswitch_3
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-interface {p0}, Le0/a/a/d/a;->getSmallIconId()I
+
+    move-result p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    invoke-virtual {p3, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    return v1
+
+    :pswitch_4
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_4
+    invoke-interface {p0, v0}, Le0/a/a/d/a;->cancelNotification(Landroid/os/Bundle;)V
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    return v1
+
+    :pswitch_5
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_5
+    invoke-interface {p0, v0}, Le0/a/a/d/a;->notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
+
+    move-result-object p1
+
+    invoke-virtual {p3}, Landroid/os/Parcel;->writeNoException()V
+
+    if-eqz p1, :cond_6
+
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p1, p3, v1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_3
+
+    :cond_6
+    invoke-virtual {p3, v3}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_3
+    return v1
+
+    :cond_7
+    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    return v1
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x2
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali/e0/a/a/d/a.smali b/com.discord/smali/e0/a/a/d/a.smali
new file mode 100644
index 0000000000..619115a6a6
--- /dev/null
+++ b/com.discord/smali/e0/a/a/d/a.smali
@@ -0,0 +1,64 @@
+.class public interface abstract Le0/a/a/d/a;
+.super Ljava/lang/Object;
+.source "ITrustedWebActivityService.java"
+
+# interfaces
+.implements Landroid/os/IInterface;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/a/d/a$a;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract areNotificationsEnabled(Landroid/os/Bundle;)Landroid/os/Bundle;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract cancelNotification(Landroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract getActiveNotifications()Landroid/os/Bundle;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract getSmallIconBitmap()Landroid/os/Bundle;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract getSmallIconId()I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract notifyNotificationWithChannel(Landroid/os/Bundle;)Landroid/os/Bundle;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/e0/a/b/a.smali b/com.discord/smali/e0/a/b/a.smali
deleted file mode 100644
index c5f358d306..0000000000
--- a/com.discord/smali/e0/a/b/a.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Le0/a/b/a;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroidx/concurrent/futures/CallbackToFutureAdapter$Resolver;
-
-
-# instance fields
-.field public final synthetic a:Landroidx/browser/trusted/ConnectionHolder;
-
-
-# direct methods
-.method public synthetic constructor <init>(Landroidx/browser/trusted/ConnectionHolder;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Le0/a/b/a;->a:Landroidx/browser/trusted/ConnectionHolder;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final attachCompleter(Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Le0/a/b/a;->a:Landroidx/browser/trusted/ConnectionHolder;
-
-    invoke-virtual {v0, p1}, Landroidx/browser/trusted/ConnectionHolder;->a(Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/e0/a/b/a/a$a$a.smali b/com.discord/smali/e0/a/b/a/a$a$a.smali
new file mode 100644
index 0000000000..f7bf435dd7
--- /dev/null
+++ b/com.discord/smali/e0/a/b/a/a$a$a.smali
@@ -0,0 +1,259 @@
+.class public Le0/a/b/a/a$a$a;
+.super Ljava/lang/Object;
+.source "INotificationSideChannel.java"
+
+# interfaces
+.implements Le0/a/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/a/a$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static b:Le0/a/b/a/a;
+
+
+# instance fields
+.field public a:Landroid/os/IBinder;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/IBinder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Le0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 1
+
+    iget-object v0, p0, Le0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
+
+    return-object v0
+.end method
+
+.method public cancel(Ljava/lang/String;ILjava/lang/String;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    :try_start_0
+    const-string v1, "android.support.v4.app.INotificationSideChannel"
+
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {v0, p3}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    iget-object v1, p0, Le0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    invoke-interface {v1, v2, v0, v3, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    invoke-static {}, Le0/a/b/a/a$a;->getDefaultImpl()Le0/a/b/a/a;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {}, Le0/a/b/a/a$a;->getDefaultImpl()Le0/a/b/a/a;
+
+    move-result-object v1
+
+    invoke-interface {v1, p1, p2, p3}, Le0/a/b/a/a;->cancel(Ljava/lang/String;ILjava/lang/String;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :cond_0
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public cancelAll(Ljava/lang/String;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    :try_start_0
+    const-string v1, "android.support.v4.app.INotificationSideChannel"
+
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    iget-object v1, p0, Le0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x3
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    invoke-interface {v1, v2, v0, v3, v4}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    invoke-static {}, Le0/a/b/a/a$a;->getDefaultImpl()Le0/a/b/a/a;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {}, Le0/a/b/a/a$a;->getDefaultImpl()Le0/a/b/a/a;
+
+    move-result-object v1
+
+    invoke-interface {v1, p1}, Le0/a/b/a/a;->cancelAll(Ljava/lang/String;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :cond_0
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
+
+.method public notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    :try_start_0
+    const-string v1, "android.support.v4.app.INotificationSideChannel"
+
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {v0, p3}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz p4, :cond_0
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p4, v0, v1}, Landroid/app/Notification;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object v1, p0, Le0/a/b/a/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v3, 0x0
+
+    invoke-interface {v1, v2, v0, v3, v2}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    invoke-static {}, Le0/a/b/a/a$a;->getDefaultImpl()Le0/a/b/a/a;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    invoke-static {}, Le0/a/b/a/a$a;->getDefaultImpl()Le0/a/b/a/a;
+
+    move-result-object v1
+
+    invoke-interface {v1, p1, p2, p3, p4}, Le0/a/b/a/a;->notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/e0/a/b/a/a$a.smali b/com.discord/smali/e0/a/b/a/a$a.smali
new file mode 100644
index 0000000000..90c45b58be
--- /dev/null
+++ b/com.discord/smali/e0/a/b/a/a$a.smali
@@ -0,0 +1,225 @@
+.class public abstract Le0/a/b/a/a$a;
+.super Landroid/os/Binder;
+.source "INotificationSideChannel.java"
+
+# interfaces
+.implements Le0/a/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/a/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/a/a$a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final DESCRIPTOR:Ljava/lang/String; = "android.support.v4.app.INotificationSideChannel"
+
+.field public static final TRANSACTION_cancel:I = 0x2
+
+.field public static final TRANSACTION_cancelAll:I = 0x3
+
+.field public static final TRANSACTION_notify:I = 0x1
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
+
+    const-string v0, "android.support.v4.app.INotificationSideChannel"
+
+    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static asInterface(Landroid/os/IBinder;)Le0/a/b/a/a;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    const-string v0, "android.support.v4.app.INotificationSideChannel"
+
+    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Le0/a/b/a/a;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Le0/a/b/a/a;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Le0/a/b/a/a$a$a;
+
+    invoke-direct {v0, p0}, Le0/a/b/a/a$a$a;-><init>(Landroid/os/IBinder;)V
+
+    return-object v0
+.end method
+
+.method public static getDefaultImpl()Le0/a/b/a/a;
+    .locals 1
+
+    sget-object v0, Le0/a/b/a/a$a$a;->b:Le0/a/b/a/a;
+
+    return-object v0
+.end method
+
+.method public static setDefaultImpl(Le0/a/b/a/a;)Z
+    .locals 1
+
+    sget-object v0, Le0/a/b/a/a$a$a;->b:Le0/a/b/a/a;
+
+    if-nez v0, :cond_0
+
+    if-eqz p0, :cond_0
+
+    sput-object p0, Le0/a/b/a/a$a$a;->b:Le0/a/b/a/a;
+
+    const/4 p0, 0x1
+
+    return p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return p0
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    const-string v1, "android.support.v4.app.INotificationSideChannel"
+
+    if-eq p1, v0, :cond_3
+
+    const/4 v2, 0x2
+
+    if-eq p1, v2, :cond_2
+
+    const/4 v2, 0x3
+
+    if-eq p1, v2, :cond_1
+
+    const v2, 0x5f4e5446
+
+    if-eq p1, v2, :cond_0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    return v0
+
+    :cond_1
+    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Le0/a/b/a/a;->cancelAll(Ljava/lang/String;)V
+
+    return v0
+
+    :cond_2
+    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p3
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-interface {p0, p1, p3, p2}, Le0/a/b/a/a;->cancel(Ljava/lang/String;ILjava/lang/String;)V
+
+    return v0
+
+    :cond_3
+    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p3
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    move-result-object p4
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result v1
+
+    if-eqz v1, :cond_4
+
+    sget-object v1, Landroid/app/Notification;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {v1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Landroid/app/Notification;
+
+    goto :goto_0
+
+    :cond_4
+    const/4 p2, 0x0
+
+    :goto_0
+    invoke-interface {p0, p1, p3, p4, p2}, Le0/a/b/a/a;->notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
+
+    return v0
+.end method
diff --git a/com.discord/smali/e0/a/b/a/a.smali b/com.discord/smali/e0/a/b/a/a.smali
new file mode 100644
index 0000000000..b943cdd031
--- /dev/null
+++ b/com.discord/smali/e0/a/b/a/a.smali
@@ -0,0 +1,40 @@
+.class public interface abstract Le0/a/b/a/a;
+.super Ljava/lang/Object;
+.source "INotificationSideChannel.java"
+
+# interfaces
+.implements Landroid/os/IInterface;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/a/a$a;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract cancel(Ljava/lang/String;ILjava/lang/String;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract cancelAll(Ljava/lang/String;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/e0/a/b/b.smali b/com.discord/smali/e0/a/b/b.smali
deleted file mode 100644
index 5d79bfc4b1..0000000000
--- a/com.discord/smali/e0/a/b/b.smali
+++ /dev/null
@@ -1,48 +0,0 @@
-.class public final synthetic Le0/a/b/b;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/util/Comparator;
-
-
-# static fields
-.field public static final synthetic d:Le0/a/b/b;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Le0/a/b/b;
-
-    invoke-direct {v0}, Le0/a/b/b;-><init>()V
-
-    sput-object v0, Le0/a/b/b;->d:Le0/a/b/b;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 0
-
-    check-cast p1, [B
-
-    check-cast p2, [B
-
-    invoke-static {p1, p2}, Landroidx/browser/trusted/TokenContents;->compareByteArrays([B[B)I
-
-    move-result p1
-
-    return p1
-.end method
diff --git a/com.discord/smali/e0/a/b/b/a.smali b/com.discord/smali/e0/a/b/b/a.smali
new file mode 100644
index 0000000000..53e7f13fd0
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/a.smali
@@ -0,0 +1,8897 @@
+.class public Le0/a/b/b/a;
+.super Ljava/lang/Object;
+.source "MediaDescriptionCompatApi21.java"
+
+
+# static fields
+.field public static a:Lf/c/a/d0;
+
+.field public static b:Ljava/lang/String;
+
+.field public static c:Ljava/util/concurrent/ScheduledExecutorService;
+
+
+# direct methods
+.method public static A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
+    .locals 11
+
+    invoke-static {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->i(Lcom/facebook/imagepipeline/image/EncodedImage;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    invoke-static {p0, p1, p2}, Le0/a/b/b/a;->z(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;)F
+
+    move-result p0
+
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget-object v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->f:Lf/g/i/c;
+
+    sget-object v2, Lf/g/i/b;->a:Lf/g/i/c;
+
+    const-wide v3, 0x3fd5555560000000L    # 0.3333333432674408
+
+    const-wide/high16 v5, 0x3ff0000000000000L    # 1.0
+
+    const v7, 0x3f2aaaab
+
+    const/4 v8, 0x2
+
+    if-ne v0, v2, :cond_3
+
+    cmpl-float v0, p0, v7
+
+    if-lez v0, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    const/4 v1, 0x2
+
+    :goto_0
+    mul-int/lit8 v0, v1, 0x2
+
+    int-to-double v7, v0
+
+    div-double v7, v5, v7
+
+    mul-double v9, v7, v3
+
+    add-double/2addr v9, v7
+
+    float-to-double v7, p0
+
+    cmpg-double v2, v9, v7
+
+    if-gtz v2, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    move v1, v0
+
+    goto :goto_0
+
+    :cond_3
+    cmpl-float v0, p0, v7
+
+    if-lez v0, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    :goto_1
+    int-to-double v0, v8
+
+    const-wide/high16 v9, 0x4000000000000000L    # 2.0
+
+    invoke-static {v0, v1, v9, v10}, Ljava/lang/Math;->pow(DD)D
+
+    move-result-wide v9
+
+    sub-double/2addr v9, v0
+
+    div-double v9, v5, v9
+
+    div-double v0, v5, v0
+
+    mul-double v9, v9, v3
+
+    add-double/2addr v9, v0
+
+    float-to-double v0, p0
+
+    cmpg-double v2, v9, v0
+
+    if-gtz v2, :cond_8
+
+    add-int/lit8 v1, v8, -0x1
+
+    :goto_2
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
+
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
+
+    invoke-static {p0, v0}, Ljava/lang/Math;->max(II)I
+
+    move-result p0
+
+    if-eqz p1, :cond_5
+
+    iget p1, p1, Lf/g/j/d/d;->c:F
+
+    goto :goto_3
+
+    :cond_5
+    int-to-float p1, p3
+
+    :goto_3
+    div-int p3, p0, v1
+
+    int-to-float p3, p3
+
+    cmpl-float p3, p3, p1
+
+    if-lez p3, :cond_7
+
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget-object p3, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->f:Lf/g/i/c;
+
+    sget-object v0, Lf/g/i/b;->a:Lf/g/i/c;
+
+    if-ne p3, v0, :cond_6
+
+    mul-int/lit8 v1, v1, 0x2
+
+    goto :goto_3
+
+    :cond_6
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_3
+
+    :cond_7
+    return v1
+
+    :cond_8
+    add-int/lit8 v8, v8, 0x1
+
+    goto :goto_1
+.end method
+
+.method public static A0(Lf/h/a/c/a1/e;[BII)I
+    .locals 9
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;,
+            Ljava/lang/InterruptedException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :goto_0
+    if-ge v0, p3, :cond_3
+
+    add-int v1, p2, v0
+
+    sub-int v5, p3, v0
+
+    invoke-virtual {p0, v5}, Lf/h/a/c/a1/e;->c(I)V
+
+    iget v2, p0, Lf/h/a/c/a1/e;->g:I
+
+    iget v4, p0, Lf/h/a/c/a1/e;->f:I
+
+    sub-int/2addr v2, v4
+
+    const/4 v8, -0x1
+
+    if-nez v2, :cond_1
+
+    iget-object v3, p0, Lf/h/a/c/a1/e;->e:[B
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x1
+
+    move-object v2, p0
+
+    invoke-virtual/range {v2 .. v7}, Lf/h/a/c/a1/e;->g([BIIIZ)I
+
+    move-result v2
+
+    if-ne v2, v8, :cond_0
+
+    const/4 v2, -0x1
+
+    goto :goto_2
+
+    :cond_0
+    iget v3, p0, Lf/h/a/c/a1/e;->g:I
+
+    add-int/2addr v3, v2
+
+    iput v3, p0, Lf/h/a/c/a1/e;->g:I
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {v5, v2}, Ljava/lang/Math;->min(II)I
+
+    move-result v2
+
+    :goto_1
+    iget-object v3, p0, Lf/h/a/c/a1/e;->e:[B
+
+    iget v4, p0, Lf/h/a/c/a1/e;->f:I
+
+    invoke-static {v3, v4, p1, v1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget v1, p0, Lf/h/a/c/a1/e;->f:I
+
+    add-int/2addr v1, v2
+
+    iput v1, p0, Lf/h/a/c/a1/e;->f:I
+
+    :goto_2
+    if-ne v2, v8, :cond_2
+
+    goto :goto_3
+
+    :cond_2
+    add-int/2addr v0, v2
+
+    goto :goto_0
+
+    :cond_3
+    :goto_3
+    return v0
+.end method
+
+.method public static B(Ljava/io/File;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    aget-object v3, v0, v2
+
+    invoke-static {v3}, Le0/a/b/b/a;->B(Ljava/io/File;)V
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ljava/io/File;->delete()Z
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    invoke-virtual {p0}, Ljava/io/File;->exists()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v0, Ljava/io/IOException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "could not delete: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    :goto_1
+    return-void
+.end method
+
+.method public static B0(Ljava/lang/Throwable;)V
+    .locals 2
+
+    const-class v0, Ljava/lang/Error;
+
+    invoke-virtual {v0, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    const-class v0, Ljava/lang/RuntimeException;
+
+    invoke-virtual {v0, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {v0, p0}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/lang/Throwable;
+
+    throw p0
+
+    :cond_1
+    invoke-virtual {v0, p0}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    .locals 0
+
+    invoke-static {p0}, Le0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {p0, p1, p2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    return-void
+.end method
+
+.method public static C0(Ljava/util/List;Lf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/n1;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Landroid/net/UrlQuerySanitizer$ParameterValuePair;",
+            ">;",
+            "Lf/c/a/v;",
+            "Lf/c/a/w;",
+            "Lf/c/a/p0;",
+            "Lf/c/a/x1;",
+            ")",
+            "Lf/c/a/n1;"
+        }
+    .end annotation
+
+    if-nez p0, :cond_0
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_0
+    new-instance v7, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v7}, Ljava/util/LinkedHashMap;-><init>()V
+
+    new-instance v8, Lcom/adjust/sdk/AdjustAttribution;
+
+    invoke-direct {v8}, Lcom/adjust/sdk/AdjustAttribution;-><init>()V
+
+    invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_1
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_a
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/net/UrlQuerySanitizer$ParameterValuePair;
+
+    iget-object v2, v1, Landroid/net/UrlQuerySanitizer$ParameterValuePair;->mParameter:Ljava/lang/String;
+
+    iget-object v1, v1, Landroid/net/UrlQuerySanitizer$ParameterValuePair;->mValue:Ljava/lang/String;
+
+    const/4 v4, 0x0
+
+    if-eqz v2, :cond_1
+
+    if-nez v1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const-string v5, "adjust_"
+
+    invoke-virtual {v2, v5}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result v5
+
+    if-nez v5, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v5, 0x7
+
+    invoke-virtual {v2, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    if-nez v5, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    if-nez v5, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    const-string v5, "tracker"
+
+    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->trackerName:Ljava/lang/String;
+
+    goto :goto_1
+
+    :cond_6
+    const-string v5, "campaign"
+
+    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_7
+
+    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->campaign:Ljava/lang/String;
+
+    goto :goto_1
+
+    :cond_7
+    const-string v5, "adgroup"
+
+    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_8
+
+    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->adgroup:Ljava/lang/String;
+
+    goto :goto_1
+
+    :cond_8
+    const-string v5, "creative"
+
+    invoke-virtual {v2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_9
+
+    iput-object v1, v8, Lcom/adjust/sdk/AdjustAttribution;->creative:Ljava/lang/String;
+
+    :goto_1
+    const/4 v4, 0x1
+
+    :cond_9
+    if-nez v4, :cond_1
+
+    invoke-virtual {v7, v2, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_a
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v5
+
+    const-string v0, "reftag"
+
+    invoke-virtual {v7, v0}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v9, v0
+
+    check-cast v9, Ljava/lang/String;
+
+    if-eqz p1, :cond_b
+
+    iget-wide v0, p1, Lf/c/a/v;->lastActivity:J
+
+    sub-long v0, v5, v0
+
+    iput-wide v0, p1, Lf/c/a/v;->lastInterval:J
+
+    :cond_b
+    new-instance v10, Lf/c/a/n1;
+
+    move-object v0, v10
+
+    move-object v1, p2
+
+    move-object v2, p3
+
+    move-object v3, p1
+
+    move-object v4, p4
+
+    invoke-direct/range {v0 .. v6}, Lf/c/a/n1;-><init>(Lf/c/a/w;Lf/c/a/p0;Lf/c/a/v;Lf/c/a/x1;J)V
+
+    iput-object v7, v10, Lf/c/a/n1;->o:Ljava/util/Map;
+
+    iput-object v8, v10, Lf/c/a/n1;->n:Lcom/adjust/sdk/AdjustAttribution;
+
+    iput-object v9, v10, Lf/c/a/n1;->i:Ljava/lang/String;
+
+    return-object v10
+.end method
+
+.method public static D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    .locals 0
+
+    if-eq p0, p1, :cond_1
+
+    if-eqz p0, :cond_0
+
+    invoke-virtual {p0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 p0, 0x1
+
+    :goto_1
+    return p0
+.end method
+
+.method public static D0(Ljava/io/InputStream;[BII)I
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    if-ltz p3, :cond_2
+
+    const/4 v0, 0x0
+
+    :goto_0
+    if-ge v0, p3, :cond_1
+
+    add-int v1, p2, v0
+
+    sub-int v2, p3, v0
+
+    invoke-virtual {p0, p1, v1, v2}, Ljava/io/InputStream;->read([BII)I
+
+    move-result v1
+
+    const/4 v2, -0x1
+
+    if-ne v1, v2, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    add-int/2addr v0, v1
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    return v0
+
+    :cond_2
+    new-instance p0, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string p1, "len is negative"
+
+    invoke-direct {p0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static E(FII)I
+    .locals 7
+
+    shr-int/lit8 v0, p1, 0x18
+
+    and-int/lit16 v0, v0, 0xff
+
+    int-to-float v0, v0
+
+    const/high16 v1, 0x437f0000    # 255.0f
+
+    div-float/2addr v0, v1
+
+    shr-int/lit8 v2, p1, 0x10
+
+    and-int/lit16 v2, v2, 0xff
+
+    int-to-float v2, v2
+
+    div-float/2addr v2, v1
+
+    shr-int/lit8 v3, p1, 0x8
+
+    and-int/lit16 v3, v3, 0xff
+
+    int-to-float v3, v3
+
+    div-float/2addr v3, v1
+
+    and-int/lit16 p1, p1, 0xff
+
+    int-to-float p1, p1
+
+    div-float/2addr p1, v1
+
+    shr-int/lit8 v4, p2, 0x18
+
+    and-int/lit16 v4, v4, 0xff
+
+    int-to-float v4, v4
+
+    div-float/2addr v4, v1
+
+    shr-int/lit8 v5, p2, 0x10
+
+    and-int/lit16 v5, v5, 0xff
+
+    int-to-float v5, v5
+
+    div-float/2addr v5, v1
+
+    shr-int/lit8 v6, p2, 0x8
+
+    and-int/lit16 v6, v6, 0xff
+
+    int-to-float v6, v6
+
+    div-float/2addr v6, v1
+
+    and-int/lit16 p2, p2, 0xff
+
+    int-to-float p2, p2
+
+    div-float/2addr p2, v1
+
+    invoke-static {v2}, Le0/a/b/b/a;->a(F)F
+
+    move-result v2
+
+    invoke-static {v3}, Le0/a/b/b/a;->a(F)F
+
+    move-result v3
+
+    invoke-static {p1}, Le0/a/b/b/a;->a(F)F
+
+    move-result p1
+
+    invoke-static {v5}, Le0/a/b/b/a;->a(F)F
+
+    move-result v5
+
+    invoke-static {v6}, Le0/a/b/b/a;->a(F)F
+
+    move-result v6
+
+    invoke-static {p2}, Le0/a/b/b/a;->a(F)F
+
+    move-result p2
+
+    invoke-static {v4, v0, p0, v0}, Lf/e/b/a/a;->a(FFFF)F
+
+    move-result v0
+
+    invoke-static {v5, v2, p0, v2}, Lf/e/b/a/a;->a(FFFF)F
+
+    move-result v2
+
+    invoke-static {v6, v3, p0, v3}, Lf/e/b/a/a;->a(FFFF)F
+
+    move-result v3
+
+    invoke-static {p2, p1, p0, p1}, Lf/e/b/a/a;->a(FFFF)F
+
+    move-result p0
+
+    mul-float v0, v0, v1
+
+    invoke-static {v2}, Le0/a/b/b/a;->b(F)F
+
+    move-result p1
+
+    mul-float p1, p1, v1
+
+    invoke-static {v3}, Le0/a/b/b/a;->b(F)F
+
+    move-result p2
+
+    mul-float p2, p2, v1
+
+    invoke-static {p0}, Le0/a/b/b/a;->b(F)F
+
+    move-result p0
+
+    mul-float p0, p0, v1
+
+    invoke-static {v0}, Ljava/lang/Math;->round(F)I
+
+    move-result v0
+
+    shl-int/lit8 v0, v0, 0x18
+
+    invoke-static {p1}, Ljava/lang/Math;->round(F)I
+
+    move-result p1
+
+    shl-int/lit8 p1, p1, 0x10
+
+    or-int/2addr p1, v0
+
+    invoke-static {p2}, Ljava/lang/Math;->round(F)I
+
+    move-result p2
+
+    shl-int/lit8 p2, p2, 0x8
+
+    or-int/2addr p1, p2
+
+    invoke-static {p0}, Ljava/lang/Math;->round(F)I
+
+    move-result p0
+
+    or-int/2addr p0, p1
+
+    return p0
+.end method
+
+.method public static E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    invoke-virtual {p1, p2}, Ljava/nio/ByteBuffer;->limit(I)Ljava/nio/Buffer;
+
+    :goto_0
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
+
+    move-result p2
+
+    if-lez p2, :cond_1
+
+    invoke-virtual {p0, p1, p3, p4}, Ljava/nio/channels/FileChannel;->read(Ljava/nio/ByteBuffer;J)I
+
+    move-result p2
+
+    const/4 v1, -0x1
+
+    if-ne p2, v1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    int-to-long v1, p2
+
+    add-long/2addr p3, v1
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
+
+    move-result p0
+
+    if-gtz p0, :cond_2
+
+    invoke-virtual {p1, v0}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
+
+    return-void
+
+    :cond_2
+    new-instance p0, Lf/g/m/h;
+
+    const-string p1, "ELF file truncated"
+
+    invoke-direct {p0, p1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static F(Ljava/nio/channels/FileChannel;)[Ljava/lang/String;
+    .locals 35
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p0
+
+    const/16 v1, 0x8
+
+    invoke-static {v1}, Ljava/nio/ByteBuffer;->allocate(I)Ljava/nio/ByteBuffer;
+
+    move-result-object v1
+
+    sget-object v2, Ljava/nio/ByteOrder;->LITTLE_ENDIAN:Ljava/nio/ByteOrder;
+
+    invoke-virtual {v1, v2}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
+
+    const-wide/16 v2, 0x0
+
+    invoke-static {v0, v1, v2, v3}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v4
+
+    const-wide/32 v6, 0x464c457f
+
+    cmp-long v8, v4, v6
+
+    if-nez v8, :cond_25
+
+    const-wide/16 v4, 0x4
+
+    invoke-static {v0, v1, v4, v5}, Le0/a/b/b/a;->c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
+
+    move-result v6
+
+    const/4 v8, 0x1
+
+    if-ne v6, v8, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v8, 0x0
+
+    :goto_0
+    const-wide/16 v9, 0x5
+
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
+
+    move-result v6
+
+    const/4 v11, 0x2
+
+    if-ne v6, v11, :cond_1
+
+    sget-object v6, Ljava/nio/ByteOrder;->BIG_ENDIAN:Ljava/nio/ByteOrder;
+
+    invoke-virtual {v1, v6}, Ljava/nio/ByteBuffer;->order(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;
+
+    :cond_1
+    const-wide/16 v11, 0x1c
+
+    const-wide/16 v13, 0x20
+
+    if-eqz v8, :cond_2
+
+    invoke-static {v0, v1, v11, v12}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v15
+
+    goto :goto_1
+
+    :cond_2
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v15
+
+    :goto_1
+    const-wide/16 v9, 0x2c
+
+    if-eqz v8, :cond_3
+
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
+
+    move-result v6
+
+    int-to-long v4, v6
+
+    goto :goto_2
+
+    :cond_3
+    const-wide/16 v4, 0x38
+
+    invoke-static {v0, v1, v4, v5}, Le0/a/b/b/a;->a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
+
+    move-result v4
+
+    int-to-long v4, v4
+
+    :goto_2
+    if-eqz v8, :cond_4
+
+    const-wide/16 v2, 0x2a
+
+    goto :goto_3
+
+    :cond_4
+    const-wide/16 v2, 0x36
+
+    :goto_3
+    invoke-static {v0, v1, v2, v3}, Le0/a/b/b/a;->a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
+
+    move-result v2
+
+    const-wide/32 v23, 0xffff
+
+    const-wide/16 v9, 0x28
+
+    cmp-long v3, v4, v23
+
+    if-nez v3, :cond_7
+
+    if-eqz v8, :cond_5
+
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v3
+
+    goto :goto_4
+
+    :cond_5
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v3
+
+    :goto_4
+    if-eqz v8, :cond_6
+
+    add-long/2addr v3, v11
+
+    invoke-static {v0, v1, v3, v4}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v3
+
+    goto :goto_5
+
+    :cond_6
+    const-wide/16 v5, 0x2c
+
+    add-long/2addr v3, v5
+
+    invoke-static {v0, v1, v3, v4}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v3
+
+    :goto_5
+    move-wide v4, v3
+
+    :cond_7
+    move-wide v13, v15
+
+    const-wide/16 v11, 0x0
+
+    :goto_6
+    const-wide/16 v23, 0x1
+
+    const-wide/16 v25, 0x8
+
+    cmp-long v3, v11, v4
+
+    if-gez v3, :cond_b
+
+    if-eqz v8, :cond_8
+
+    const-wide/16 v21, 0x0
+
+    add-long v9, v13, v21
+
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v9
+
+    goto :goto_7
+
+    :cond_8
+    const-wide/16 v21, 0x0
+
+    add-long v9, v13, v21
+
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v9
+
+    :goto_7
+    const-wide/16 v29, 0x2
+
+    cmp-long v3, v9, v29
+
+    if-nez v3, :cond_a
+
+    if-eqz v8, :cond_9
+
+    const-wide/16 v9, 0x4
+
+    add-long/2addr v13, v9
+
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v9
+
+    goto :goto_8
+
+    :cond_9
+    add-long v13, v13, v25
+
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v9
+
+    goto :goto_8
+
+    :cond_a
+    int-to-long v9, v2
+
+    add-long/2addr v13, v9
+
+    add-long v11, v11, v23
+
+    const-wide/16 v9, 0x28
+
+    goto :goto_6
+
+    :cond_b
+    const-wide/16 v9, 0x0
+
+    :goto_8
+    const-wide/16 v21, 0x0
+
+    cmp-long v3, v9, v21
+
+    if-eqz v3, :cond_24
+
+    move-wide v13, v9
+
+    move-wide/from16 v11, v21
+
+    const/4 v3, 0x0
+
+    :goto_9
+    move/from16 v29, v8
+
+    if-eqz v8, :cond_c
+
+    add-long v7, v13, v21
+
+    invoke-static {v0, v1, v7, v8}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v7
+
+    goto :goto_a
+
+    :cond_c
+    add-long v7, v13, v21
+
+    invoke-static {v0, v1, v7, v8}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v7
+
+    :goto_a
+    const-string v6, "malformed DT_NEEDED section"
+
+    cmp-long v31, v7, v23
+
+    if-nez v31, :cond_e
+
+    move-wide/from16 v31, v9
+
+    const v9, 0x7fffffff
+
+    if-eq v3, v9, :cond_d
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_c
+
+    :cond_d
+    new-instance v0, Lf/g/m/h;
+
+    invoke-direct {v0, v6}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_e
+    move-wide/from16 v31, v9
+
+    const-wide/16 v9, 0x5
+
+    cmp-long v17, v7, v9
+
+    if-nez v17, :cond_10
+
+    if-eqz v29, :cond_f
+
+    const-wide/16 v11, 0x4
+
+    add-long v9, v13, v11
+
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v9
+
+    goto :goto_b
+
+    :cond_f
+    add-long v9, v13, v25
+
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v9
+
+    :goto_b
+    move-wide v11, v9
+
+    :cond_10
+    :goto_c
+    const-wide/16 v9, 0x10
+
+    if-eqz v29, :cond_11
+
+    move-wide/from16 v33, v25
+
+    goto :goto_d
+
+    :cond_11
+    move-wide/from16 v33, v9
+
+    :goto_d
+    add-long v13, v13, v33
+
+    const-wide/16 v21, 0x0
+
+    cmp-long v33, v7, v21
+
+    if-nez v33, :cond_23
+
+    cmp-long v7, v11, v21
+
+    if-eqz v7, :cond_22
+
+    const/4 v7, 0x0
+
+    :goto_e
+    int-to-long v13, v7
+
+    cmp-long v8, v13, v4
+
+    if-gez v8, :cond_18
+
+    if-eqz v29, :cond_12
+
+    add-long v13, v15, v21
+
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v13
+
+    goto :goto_f
+
+    :cond_12
+    add-long v13, v15, v21
+
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v13
+
+    :goto_f
+    cmp-long v8, v13, v23
+
+    if-nez v8, :cond_16
+
+    if-eqz v29, :cond_13
+
+    add-long v13, v15, v25
+
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v13
+
+    goto :goto_10
+
+    :cond_13
+    add-long v13, v15, v9
+
+    invoke-static {v0, v1, v13, v14}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v13
+
+    :goto_10
+    if-eqz v29, :cond_14
+
+    const-wide/16 v17, 0x14
+
+    add-long v9, v15, v17
+
+    invoke-static {v0, v1, v9, v10}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v8
+
+    move-wide/from16 v27, v4
+
+    move-wide v4, v8
+
+    const-wide/16 v8, 0x28
+
+    goto :goto_11
+
+    :cond_14
+    move-wide/from16 v27, v4
+
+    const-wide/16 v8, 0x28
+
+    add-long v4, v15, v8
+
+    invoke-static {v0, v1, v4, v5}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v4
+
+    :goto_11
+    cmp-long v10, v13, v11
+
+    if-gtz v10, :cond_17
+
+    add-long/2addr v4, v13
+
+    cmp-long v10, v11, v4
+
+    if-gez v10, :cond_17
+
+    if-eqz v29, :cond_15
+
+    const-wide/16 v4, 0x4
+
+    add-long v7, v15, v4
+
+    invoke-static {v0, v1, v7, v8}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v4
+
+    goto :goto_12
+
+    :cond_15
+    add-long v4, v15, v25
+
+    invoke-static {v0, v1, v4, v5}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v4
+
+    :goto_12
+    sub-long/2addr v11, v13
+
+    add-long/2addr v4, v11
+
+    goto :goto_13
+
+    :cond_16
+    move-wide/from16 v27, v4
+
+    const-wide/16 v8, 0x28
+
+    :cond_17
+    int-to-long v4, v2
+
+    add-long/2addr v15, v4
+
+    add-int/lit8 v7, v7, 0x1
+
+    move-wide/from16 v4, v27
+
+    const-wide/16 v9, 0x10
+
+    const-wide/16 v21, 0x0
+
+    goto :goto_e
+
+    :cond_18
+    const-wide/16 v4, 0x0
+
+    :goto_13
+    const-wide/16 v7, 0x0
+
+    cmp-long v2, v4, v7
+
+    if-eqz v2, :cond_21
+
+    new-array v2, v3, [Ljava/lang/String;
+
+    const/4 v9, 0x0
+
+    :goto_14
+    add-long v10, v31, v7
+
+    if-eqz v29, :cond_19
+
+    invoke-static {v0, v1, v10, v11}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v10
+
+    goto :goto_15
+
+    :cond_19
+    invoke-static {v0, v1, v10, v11}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v10
+
+    :goto_15
+    cmp-long v7, v10, v23
+
+    if-nez v7, :cond_1d
+
+    if-eqz v29, :cond_1a
+
+    const-wide/16 v19, 0x4
+
+    add-long v7, v31, v19
+
+    invoke-static {v0, v1, v7, v8}, Le0/a/b/b/a;->b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v7
+
+    goto :goto_16
+
+    :cond_1a
+    const-wide/16 v19, 0x4
+
+    add-long v7, v31, v25
+
+    invoke-static {v0, v1, v7, v8}, Le0/a/b/b/a;->J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+
+    move-result-wide v7
+
+    :goto_16
+    add-long/2addr v7, v4
+
+    new-instance v12, Ljava/lang/StringBuilder;
+
+    invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
+
+    :goto_17
+    add-long v13, v7, v23
+
+    invoke-static {v0, v1, v7, v8}, Le0/a/b/b/a;->c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
+
+    move-result v7
+
+    if-eqz v7, :cond_1b
+
+    int-to-char v7, v7
+
+    invoke-virtual {v12, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    move-wide v7, v13
+
+    goto :goto_17
+
+    :cond_1b
+    invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v7
+
+    aput-object v7, v2, v9
+
+    const v7, 0x7fffffff
+
+    if-eq v9, v7, :cond_1c
+
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_18
+
+    :cond_1c
+    new-instance v0, Lf/g/m/h;
+
+    invoke-direct {v0, v6}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1d
+    const v7, 0x7fffffff
+
+    const-wide/16 v19, 0x4
+
+    :goto_18
+    if-eqz v29, :cond_1e
+
+    move-wide/from16 v12, v25
+
+    goto :goto_19
+
+    :cond_1e
+    const-wide/16 v12, 0x10
+
+    :goto_19
+    add-long v31, v31, v12
+
+    const-wide/16 v21, 0x0
+
+    cmp-long v8, v10, v21
+
+    if-nez v8, :cond_20
+
+    if-ne v9, v3, :cond_1f
+
+    return-object v2
+
+    :cond_1f
+    new-instance v0, Lf/g/m/h;
+
+    invoke-direct {v0, v6}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_20
+    move-wide/from16 v7, v21
+
+    goto :goto_14
+
+    :cond_21
+    new-instance v0, Lf/g/m/h;
+
+    const-string v1, "did not find file offset of DT_STRTAB table"
+
+    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_22
+    new-instance v0, Lf/g/m/h;
+
+    const-string v1, "Dynamic section string-table not found"
+
+    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_23
+    const-wide/16 v8, 0x28
+
+    const-wide/16 v19, 0x4
+
+    move/from16 v8, v29
+
+    move-wide/from16 v9, v31
+
+    goto/16 :goto_9
+
+    :cond_24
+    new-instance v0, Lf/g/m/h;
+
+    const-string v1, "ELF file does not contain dynamic linking information"
+
+    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_25
+    new-instance v0, Lf/g/m/h;
+
+    const-string v1, "file is not ELF"
+
+    invoke-direct {v0, v1}, Lf/g/m/h;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static F0(Ljava/io/InputStream;)I
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    int-to-byte v0, v0
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    int-to-byte v1, v1
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result p0
+
+    and-int/lit16 p0, p0, 0xff
+
+    int-to-byte p0, p0
+
+    shl-int/lit8 p0, p0, 0x10
+
+    const/high16 v2, 0xff0000
+
+    and-int/2addr p0, v2
+
+    shl-int/lit8 v1, v1, 0x8
+
+    const v2, 0xff00
+
+    and-int/2addr v1, v2
+
+    or-int/2addr p0, v1
+
+    and-int/lit16 v0, v0, 0xff
+
+    or-int/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static varargs G(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    .locals 6
+
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    array-length v2, p1
+
+    mul-int/lit8 v2, v2, 0x10
+
+    add-int/2addr v2, v1
+
+    invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    array-length v3, p1
+
+    if-ge v1, v3, :cond_1
+
+    const-string v3, "%s"
+
+    invoke-virtual {p0, v3, v2}, Ljava/lang/String;->indexOf(Ljava/lang/String;I)I
+
+    move-result v3
+
+    const/4 v4, -0x1
+
+    if-ne v3, v4, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {p0, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v2, v1, 0x1
+
+    aget-object v1, p1, v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v1, v3, 0x2
+
+    move v5, v2
+
+    move v2, v1
+
+    move v1, v5
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    invoke-virtual {p0, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    array-length p0, p1
+
+    if-ge v1, p0, :cond_3
+
+    const-string p0, " ["
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 p0, v1, 0x1
+
+    aget-object v1, p1, v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    :goto_2
+    array-length v1, p1
+
+    if-ge p0, v1, :cond_2
+
+    const-string v1, ", "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v1, p0, 0x1
+
+    aget-object p0, p1, p0
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    move p0, v1
+
+    goto :goto_2
+
+    :cond_2
+    const/16 p0, 0x5d
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :cond_3
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static G0(Ljavax/net/ssl/HttpsURLConnection;Lf/c/a/u;)Lf/c/a/r1;
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/StringBuffer;
+
+    invoke-direct {v0}, Ljava/lang/StringBuffer;-><init>()V
+
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v1
+
+    invoke-static {p1}, Lf/c/a/r1;->a(Lf/c/a/u;)Lf/c/a/r1;
+
+    move-result-object p1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    :try_start_0
+    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->connect()V
+
+    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getResponseCode()I
+
+    move-result v4
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+
+    move-result v5
+
+    const/16 v6, 0x190
+
+    if-lt v5, v6, :cond_0
+
+    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getErrorStream()Ljava/io/InputStream;
+
+    move-result-object v5
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getInputStream()Ljava/io/InputStream;
+
+    move-result-object v5
+
+    :goto_0
+    new-instance v6, Ljava/io/InputStreamReader;
+
+    invoke-direct {v6, v5}, Ljava/io/InputStreamReader;-><init>(Ljava/io/InputStream;)V
+
+    new-instance v5, Ljava/io/BufferedReader;
+
+    invoke-direct {v5, v6}, Ljava/io/BufferedReader;-><init>(Ljava/io/Reader;)V
+
+    :goto_1
+    invoke-virtual {v5}, Ljava/io/BufferedReader;->readLine()Ljava/lang/String;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_1
+
+    invoke-virtual {v0, v6}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->disconnect()V
+
+    invoke-virtual {v0}, Ljava/lang/StringBuffer;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    new-array v0, v2, [Ljava/lang/Object;
+
+    aput-object p0, v0, v3
+
+    const-string v5, "Response: %s"
+
+    invoke-interface {v1, v5, v0}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    const/16 v5, 0x1ad
+
+    if-ne v0, v5, :cond_2
+
+    new-array p0, v3, [Ljava/lang/Object;
+
+    const-string v0, "Too frequent requests to the endpoint (429)"
+
+    invoke-interface {v1, v0, p0}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    return-object p1
+
+    :cond_2
+    if-eqz p0, :cond_8
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :try_start_1
+    new-instance v5, Lorg/json/JSONObject;
+
+    invoke-direct {v5, p0}, Lorg/json/JSONObject;-><init>(Ljava/lang/String;)V
+    :try_end_1
+    .catch Lorg/json/JSONException; {:try_start_1 .. :try_end_1} :catch_0
+
+    goto :goto_2
+
+    :catch_0
+    move-exception p0
+
+    new-array v5, v2, [Ljava/lang/Object;
+
+    invoke-virtual {p0}, Lorg/json/JSONException;->getMessage()Ljava/lang/String;
+
+    move-result-object p0
+
+    aput-object p0, v5, v3
+
+    const-string p0, "Failed to parse json response. (%s)"
+
+    invoke-static {p0, v5}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-array v5, v3, [Ljava/lang/Object;
+
+    invoke-interface {v1, p0, v5}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    iput-object p0, p1, Lf/c/a/r1;->d:Ljava/lang/String;
+
+    move-object v5, v0
+
+    :goto_2
+    if-nez v5, :cond_4
+
+    return-object p1
+
+    :cond_4
+    iput-object v5, p1, Lf/c/a/r1;->f:Lorg/json/JSONObject;
+
+    const-string p0, "message"
+
+    invoke-virtual {v5, p0, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    iput-object p0, p1, Lf/c/a/r1;->d:Ljava/lang/String;
+
+    const-string v6, "timestamp"
+
+    invoke-virtual {v5, v6, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v6
+
+    iput-object v6, p1, Lf/c/a/r1;->e:Ljava/lang/String;
+
+    const-string v6, "adid"
+
+    invoke-virtual {v5, v6, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v6
+
+    iput-object v6, p1, Lf/c/a/r1;->c:Ljava/lang/String;
+
+    const-string v6, "tracking_state"
+
+    invoke-virtual {v5, v6, v0}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    const-string v5, "opted_out"
+
+    invoke-virtual {v0, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    sget-object v0, Lf/c/a/a2;->d:Lf/c/a/a2;
+
+    iput-object v0, p1, Lf/c/a/r1;->g:Lf/c/a/a2;
+
+    :cond_5
+    if-nez p0, :cond_6
+
+    const-string p0, "No message found"
+
+    :cond_6
+    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    const/16 v4, 0xc8
+
+    const-string v5, "%s"
+
+    if-ne v0, v4, :cond_7
+
+    new-array v0, v2, [Ljava/lang/Object;
+
+    aput-object p0, v0, v3
+
+    invoke-interface {v1, v5, v0}, Lf/c/a/w0;->h(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    iput-boolean v2, p1, Lf/c/a/r1;->a:Z
+
+    goto :goto_3
+
+    :cond_7
+    new-array v0, v2, [Ljava/lang/Object;
+
+    aput-object p0, v0, v3
+
+    invoke-interface {v1, v5, v0}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    :cond_8
+    :goto_3
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    goto :goto_4
+
+    :catch_1
+    move-exception p1
+
+    :try_start_2
+    const-string v0, "Failed to read response. (%s)"
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
+
+    move-result-object v4
+
+    aput-object v4, v2, v3
+
+    invoke-interface {v1, v0, v2}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    throw p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :goto_4
+    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->disconnect()V
+
+    throw p1
+.end method
+
+.method public static H(Ljava/io/File;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
+
+    :goto_0
+    array-length v1, v0
+
+    if-ge p0, v1, :cond_3
+
+    aget-object v1, v0, p0
+
+    invoke-static {v1}, Le0/a/b/b/a;->H(Ljava/io/File;)V
+
+    add-int/lit8 p0, p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/io/IOException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "cannot list directory "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1
+    invoke-virtual {p0}, Ljava/io/File;->getPath()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "_lock"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v0, Ljava/io/RandomAccessFile;
+
+    const-string v1, "r"
+
+    invoke-direct {v0, p0, v1}, Ljava/io/RandomAccessFile;-><init>(Ljava/io/File;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-virtual {v0}, Ljava/io/RandomAccessFile;->getFD()Ljava/io/FileDescriptor;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/io/FileDescriptor;->sync()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Ljava/io/RandomAccessFile;->close()V
+
+    :cond_3
+    :goto_1
+    return-void
+
+    :catchall_0
+    move-exception p0
+
+    :try_start_1
+    throw p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :catchall_1
+    move-exception v1
+
+    :try_start_2
+    invoke-virtual {v0}, Ljava/io/RandomAccessFile;->close()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    goto :goto_2
+
+    :catchall_2
+    move-exception v0
+
+    invoke-virtual {p0, v0}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
+
+    :goto_2
+    throw v1
+.end method
+
+.method public static H0(Lf/h/a/c/i1/t;)I
+    .locals 3
+
+    const/4 v0, 0x0
+
+    :cond_0
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->a()I
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    const/4 p0, -0x1
+
+    return p0
+
+    :cond_1
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    const/16 v2, 0xff
+
+    if-eq v1, v2, :cond_0
+
+    return v0
+.end method
+
+.method public static I(Ljava/io/InputStream;)I
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v0
+
+    int-to-byte v0, v0
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result p0
+
+    int-to-byte p0, p0
+
+    shl-int/lit8 p0, p0, 0x8
+
+    const v1, 0xff00
+
+    and-int/2addr p0, v1
+
+    and-int/lit16 v0, v0, 0xff
+
+    or-int/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static I0(Ljava/io/InputStream;IZ)I
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v0, p1, :cond_2
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v2
+
+    const/4 v3, -0x1
+
+    if-eq v2, v3, :cond_1
+
+    if-eqz p2, :cond_0
+
+    and-int/lit16 v2, v2, 0xff
+
+    mul-int/lit8 v3, v0, 0x8
+
+    shl-int/2addr v2, v3
+
+    goto :goto_1
+
+    :cond_0
+    shl-int/lit8 v1, v1, 0x8
+
+    and-int/lit16 v2, v2, 0xff
+
+    :goto_1
+    or-int/2addr v1, v2
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p0, Ljava/io/IOException;
+
+    const-string p1, "no more bytes"
+
+    invoke-direct {p0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_2
+    return v1
+.end method
+
+.method public static J(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/16 v0, 0x8
+
+    invoke-static {p0, p1, v0, p2, p3}, Le0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
+
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->getLong()J
+
+    move-result-wide p0
+
+    return-wide p0
+.end method
+
+.method public static J0(Lf/h/a/c/i1/t;II)J
+    .locals 8
+
+    invoke-virtual {p0, p1}, Lf/h/a/c/i1/t;->C(I)V
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->a()I
+
+    move-result p1
+
+    const-wide v0, -0x7fffffffffffffffL    # -4.9E-324
+
+    const/4 v2, 0x5
+
+    if-ge p1, v2, :cond_0
+
+    return-wide v0
+
+    :cond_0
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->e()I
+
+    move-result p1
+
+    const/high16 v2, 0x800000
+
+    and-int/2addr v2, p1
+
+    if-eqz v2, :cond_1
+
+    return-wide v0
+
+    :cond_1
+    const v2, 0x1fff00
+
+    and-int/2addr v2, p1
+
+    shr-int/lit8 v2, v2, 0x8
+
+    if-eq v2, p2, :cond_2
+
+    return-wide v0
+
+    :cond_2
+    and-int/lit8 p1, p1, 0x20
+
+    const/4 p2, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz p1, :cond_3
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_0
+    if-nez p1, :cond_4
+
+    return-wide v0
+
+    :cond_4
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p1
+
+    const/4 v3, 0x7
+
+    if-lt p1, v3, :cond_6
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->a()I
+
+    move-result p1
+
+    if-lt p1, v3, :cond_6
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p1
+
+    const/16 v4, 0x10
+
+    and-int/2addr p1, v4
+
+    if-ne p1, v4, :cond_5
+
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_5
+    const/4 p1, 0x0
+
+    :goto_1
+    if-eqz p1, :cond_6
+
+    const/4 p1, 0x6
+
+    new-array v0, p1, [B
+
+    iget-object v1, p0, Lf/h/a/c/i1/t;->a:[B
+
+    iget v4, p0, Lf/h/a/c/i1/t;->b:I
+
+    invoke-static {v1, v4, v0, p2, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget v1, p0, Lf/h/a/c/i1/t;->b:I
+
+    add-int/2addr v1, p1
+
+    iput v1, p0, Lf/h/a/c/i1/t;->b:I
+
+    aget-byte p0, v0, p2
+
+    int-to-long p0, p0
+
+    const-wide/16 v4, 0xff
+
+    and-long/2addr p0, v4
+
+    const/16 p2, 0x19
+
+    shl-long/2addr p0, p2
+
+    aget-byte p2, v0, v2
+
+    int-to-long v6, p2
+
+    and-long/2addr v6, v4
+
+    const/16 p2, 0x11
+
+    shl-long/2addr v6, p2
+
+    or-long/2addr p0, v6
+
+    const/4 p2, 0x2
+
+    aget-byte p2, v0, p2
+
+    int-to-long v6, p2
+
+    and-long/2addr v6, v4
+
+    const/16 p2, 0x9
+
+    shl-long/2addr v6, p2
+
+    or-long/2addr p0, v6
+
+    const/4 p2, 0x3
+
+    aget-byte p2, v0, p2
+
+    int-to-long v6, p2
+
+    and-long/2addr v6, v4
+
+    shl-long v1, v6, v2
+
+    or-long/2addr p0, v1
+
+    const/4 p2, 0x4
+
+    aget-byte p2, v0, p2
+
+    int-to-long v0, p2
+
+    and-long/2addr v0, v4
+
+    shr-long/2addr v0, v3
+
+    or-long/2addr p0, v0
+
+    return-wide p0
+
+    :cond_6
+    return-wide v0
+.end method
+
+.method public static K(I)I
+    .locals 1
+
+    int-to-float p0, p0
+
+    const v0, 0x3faaaaab
+
+    mul-float p0, p0, v0
+
+    float-to-int p0, p0
+
+    return p0
+.end method
+
+.method public static K0(Lf/h/a/c/i1/t;)Lf/h/a/c/i1/m$a;
+    .locals 11
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0}, Lf/h/a/c/i1/t;->D(I)V
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->s()I
+
+    move-result v0
+
+    iget v1, p0, Lf/h/a/c/i1/t;->b:I
+
+    add-int/2addr v1, v0
+
+    int-to-long v1, v1
+
+    div-int/lit8 v0, v0, 0x12
+
+    new-array v3, v0, [J
+
+    new-array v4, v0, [J
+
+    const/4 v5, 0x0
+
+    :goto_0
+    if-ge v5, v0, :cond_1
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->k()J
+
+    move-result-wide v6
+
+    const-wide/16 v8, -0x1
+
+    cmp-long v10, v6, v8
+
+    if-nez v10, :cond_0
+
+    invoke-static {v3, v5}, Ljava/util/Arrays;->copyOf([JI)[J
+
+    move-result-object v3
+
+    invoke-static {v4, v5}, Ljava/util/Arrays;->copyOf([JI)[J
+
+    move-result-object v4
+
+    goto :goto_1
+
+    :cond_0
+    aput-wide v6, v3, v5
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->k()J
+
+    move-result-wide v6
+
+    aput-wide v6, v4, v5
+
+    const/4 v6, 0x2
+
+    invoke-virtual {p0, v6}, Lf/h/a/c/i1/t;->D(I)V
+
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    iget v0, p0, Lf/h/a/c/i1/t;->b:I
+
+    int-to-long v5, v0
+
+    sub-long/2addr v1, v5
+
+    long-to-int v0, v1
+
+    invoke-virtual {p0, v0}, Lf/h/a/c/i1/t;->D(I)V
+
+    new-instance p0, Lf/h/a/c/i1/m$a;
+
+    invoke-direct {p0, v3, v4}, Lf/h/a/c/i1/m$a;-><init>([J[J)V
+
+    return-object p0
+.end method
+
+.method public static L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
+    .locals 4
+
+    const/4 v0, 0x0
+
+    if-nez p0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    instance-of v1, p0, Lf/g/g/e/p;
+
+    if-eqz v1, :cond_1
+
+    check-cast p0, Lf/g/g/e/p;
+
+    return-object p0
+
+    :cond_1
+    instance-of v1, p0, Lf/g/g/e/d;
+
+    if-eqz v1, :cond_2
+
+    check-cast p0, Lf/g/g/e/d;
+
+    invoke-interface {p0}, Lf/g/g/e/d;->l()Landroid/graphics/drawable/Drawable;
+
+    move-result-object p0
+
+    invoke-static {p0}, Le0/a/b/b/a;->L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    instance-of v1, p0, Lf/g/g/e/b;
+
+    if-eqz v1, :cond_4
+
+    check-cast p0, Lf/g/g/e/b;
+
+    iget-object v1, p0, Lf/g/g/e/b;->f:[Landroid/graphics/drawable/Drawable;
+
+    array-length v1, v1
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_4
+
+    invoke-virtual {p0, v2}, Lf/g/g/e/b;->a(I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    invoke-static {v3}, Le0/a/b/b/a;->L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_3
+
+    return-object v3
+
+    :cond_3
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_4
+    return-object v0
+.end method
+
+.method public static L0(Lf/h/a/c/i1/t;ZZ)Lf/h/a/c/a1/u;
+    .locals 8
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/google/android/exoplayer2/ParserException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x3
+
+    invoke-static {p1, p0, v0}, Le0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
+
+    :cond_0
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->h()J
+
+    move-result-wide v1
+
+    long-to-int p1, v1
+
+    invoke-virtual {p0, p1}, Lf/h/a/c/i1/t;->n(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0xb
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->h()J
+
+    move-result-wide v2
+
+    long-to-int v4, v2
+
+    new-array v4, v4, [Ljava/lang/String;
+
+    add-int/lit8 v1, v1, 0x4
+
+    :goto_0
+    int-to-long v5, v0
+
+    cmp-long v7, v5, v2
+
+    if-gez v7, :cond_1
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->h()J
+
+    move-result-wide v5
+
+    long-to-int v6, v5
+
+    add-int/lit8 v1, v1, 0x4
+
+    invoke-virtual {p0, v6}, Lf/h/a/c/i1/t;->n(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    aput-object v5, v4, v0
+
+    aget-object v5, v4, v0
+
+    invoke-virtual {v5}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    add-int/2addr v1, v5
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    if-eqz p2, :cond_3
+
+    invoke-virtual {p0}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p0
+
+    and-int/lit8 p0, p0, 0x1
+
+    if-eqz p0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p0, Lcom/google/android/exoplayer2/ParserException;
+
+    const-string p1, "framing bit expected to be set"
+
+    invoke-direct {p0, p1}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_3
+    :goto_1
+    add-int/lit8 v1, v1, 0x1
+
+    new-instance p0, Lf/h/a/c/a1/u;
+
+    invoke-direct {p0, p1, v4, v1}, Lf/h/a/c/a1/u;-><init>(Ljava/lang/String;[Ljava/lang/String;I)V
+
+    return-object p0
+.end method
+
+.method public static M(I)I
+    .locals 1
+
+    const/4 v0, 0x3
+
+    if-eq p0, v0, :cond_2
+
+    const/4 v0, 0x6
+
+    if-eq p0, v0, :cond_1
+
+    const/16 v0, 0x8
+
+    if-eq p0, v0, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 p0, 0x10e
+
+    goto :goto_0
+
+    :cond_1
+    const/16 p0, 0x5a
+
+    goto :goto_0
+
+    :cond_2
+    const/16 p0, 0xb4
+
+    :goto_0
+    return p0
+.end method
+
+.method public static M0(Ljava/io/File;Ljava/io/File;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/facebook/common/file/FileUtils$RenameException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_4
+
+    invoke-virtual {p1}, Ljava/io/File;->delete()Z
+
+    invoke-virtual {p0, p1}, Ljava/io/File;->renameTo(Ljava/io/File;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p1}, Ljava/io/File;->exists()Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    invoke-virtual {p0}, Ljava/io/File;->getParentFile()Ljava/io/File;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/io/File;->exists()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Ljava/io/File;->exists()Z
+
+    move-result v1
+
+    if-nez v1, :cond_3
+
+    new-instance v0, Ljava/io/FileNotFoundException;
+
+    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/io/FileNotFoundException;-><init>(Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Lcom/facebook/common/file/FileUtils$ParentDirNotFoundException;
+
+    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lcom/facebook/common/file/FileUtils$ParentDirNotFoundException;-><init>(Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Lcom/facebook/common/file/FileUtils$FileDeleteException;
+
+    invoke-virtual {p1}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lcom/facebook/common/file/FileUtils$FileDeleteException;-><init>(Ljava/lang/String;)V
+
+    :cond_3
+    :goto_0
+    new-instance v1, Lcom/facebook/common/file/FileUtils$RenameException;
+
+    const-string v2, "Unknown error renaming "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p0, " to "
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v1, p0, v0}, Lcom/facebook/common/file/FileUtils$RenameException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :cond_4
+    throw v0
+.end method
+
+.method public static declared-synchronized N()Lf/c/a/d0;
+    .locals 2
+
+    const-class v0, Le0/a/b/b/a;
+
+    monitor-enter v0
+
+    :try_start_0
+    sget-object v1, Le0/a/b/b/a;->a:Lf/c/a/d0;
+
+    if-nez v1, :cond_0
+
+    new-instance v1, Lf/c/a/d0;
+
+    invoke-direct {v1}, Lf/c/a/d0;-><init>()V
+
+    sput-object v1, Le0/a/b/b/a;->a:Lf/c/a/d0;
+
+    :cond_0
+    sget-object v1, Le0/a/b/b/a;->a:Lf/c/a/d0;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-object v1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public static N0(ILjava/lang/Object;Lf/h/a/b/i/c;Lf/h/a/b/j/r/a;)Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<TInput:",
+            "Ljava/lang/Object;",
+            "TResult:",
+            "Ljava/lang/Object;",
+            "TException:",
+            "Ljava/lang/Throwable;",
+            ">(ITTInput;",
+            "Lf/h/a/b/i/c<",
+            "TTInput;TTResult;TTException;>;",
+            "Lf/h/a/b/j/r/a<",
+            "TTInput;TTResult;>;)TTResult;^TTException;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Throwable;
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    if-ge p0, v0, :cond_0
+
+    invoke-virtual {p2, p1}, Lf/h/a/b/i/c;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    invoke-virtual {p2, p1}, Lf/h/a/b/i/c;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v2, p3
+
+    check-cast v2, Lf/h/a/b/i/d;
+
+    const/4 v2, 0x0
+
+    check-cast p1, Lf/h/a/b/i/e$a;
+
+    move-object v3, v1
+
+    check-cast v3, Lf/h/a/b/i/e$b;
+
+    iget-object v4, v3, Lf/h/a/b/i/e$b;->b:Ljava/net/URL;
+
+    if-eqz v4, :cond_1
+
+    const-string v2, "CctTransportBackend"
+
+    const-string v5, "Following redirect to: %s"
+
+    invoke-static {v2, v5, v4}, Le0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
+
+    iget-object v2, v3, Lf/h/a/b/i/e$b;->b:Ljava/net/URL;
+
+    new-instance v3, Lf/h/a/b/i/e$a;
+
+    iget-object v4, p1, Lf/h/a/b/i/e$a;->b:Lf/h/a/b/i/b/j;
+
+    iget-object p1, p1, Lf/h/a/b/i/e$a;->c:Ljava/lang/String;
+
+    invoke-direct {v3, v2, v4, p1}, Lf/h/a/b/i/e$a;-><init>(Ljava/net/URL;Lf/h/a/b/i/b/j;Ljava/lang/String;)V
+
+    move-object p1, v3
+
+    goto :goto_0
+
+    :cond_1
+    move-object p1, v2
+
+    :goto_0
+    if-eqz p1, :cond_2
+
+    add-int/lit8 p0, p0, -0x1
+
+    if-ge p0, v0, :cond_0
+
+    :cond_2
+    return-object v1
+.end method
+
+.method public static O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getResourceId(II)I
+
+    move-result p1
+
+    if-nez p1, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p0
+
+    invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p0
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static O0(Lcom/facebook/cache/common/CacheKey;)Ljava/lang/String;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/UnsupportedEncodingException;
+        }
+    .end annotation
+
+    invoke-interface {p0}, Lcom/facebook/cache/common/CacheKey;->a()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "UTF-8"
+
+    invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/lang/String;)[B
+
+    move-result-object p0
+
+    :try_start_0
+    const-string v0, "SHA-1"
+
+    invoke-static {v0}, Ljava/security/MessageDigest;->getInstance(Ljava/lang/String;)Ljava/security/MessageDigest;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    array-length v2, p0
+
+    invoke-virtual {v0, p0, v1, v2}, Ljava/security/MessageDigest;->update([BII)V
+
+    invoke-virtual {v0}, Ljava/security/MessageDigest;->digest()[B
+
+    move-result-object p0
+
+    const/16 v0, 0xb
+
+    invoke-static {p0, v0}, Landroid/util/Base64;->encodeToString([BI)Ljava/lang/String;
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/security/NoSuchAlgorithmException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    move-exception p0
+
+    new-instance v0, Ljava/lang/RuntimeException;
+
+    invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+.method public static P(Landroid/content/Context;J)Lf/c/a/s0;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    if-eq v0, v1, :cond_1
+
+    :try_start_0
+    invoke-virtual {p0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+
+    move-result-object v0
+
+    const-string v1, "com.android.vending"
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, v1, v2}, Landroid/content/pm/PackageManager;->getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+
+    new-instance v0, Lf/c/a/r0;
+
+    invoke-direct {v0, p1, p2}, Lf/c/a/r0;-><init>(J)V
+
+    new-instance p1, Landroid/content/Intent;
+
+    const-string p2, "com.google.android.gms.ads.identifier.service.START"
+
+    invoke-direct {p1, p2}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
+
+    const-string p2, "com.google.android.gms"
+
+    invoke-virtual {p1, p2}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
+
+    const/4 p2, 0x1
+
+    invoke-virtual {p0, p1, v0, p2}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    :try_start_1
+    new-instance p1, Lf/c/a/t0;
+
+    invoke-virtual {v0}, Lf/c/a/r0;->a()Landroid/os/IBinder;
+
+    move-result-object v1
+
+    invoke-direct {p1, v1}, Lf/c/a/t0;-><init>(Landroid/os/IBinder;)V
+
+    new-instance v1, Lf/c/a/s0;
+
+    invoke-virtual {p1}, Lf/c/a/t0;->g()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {p1, p2}, Lf/c/a/t0;->h(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    invoke-direct {v1, v2, p1}, Lf/c/a/s0;-><init>(Ljava/lang/String;Ljava/lang/Boolean;)V
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
+
+    return-object v1
+
+    :catchall_0
+    move-exception p1
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    :try_start_2
+    throw p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :goto_0
+    invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
+
+    throw p1
+
+    :cond_0
+    new-instance p0, Ljava/io/IOException;
+
+    const-string p1, "Google Play connection failed"
+
+    invoke-direct {p0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :catch_1
+    move-exception p0
+
+    throw p0
+
+    :cond_1
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    const-string p1, "Google Play Services info can\'t be accessed from the main thread"
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    invoke-virtual {p0, p1}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
+
+    instance-of p1, p0, Lf/g/g/e/b0;
+
+    if-eqz p1, :cond_0
+
+    check-cast p0, Lf/g/g/e/b0;
+
+    invoke-interface {p0, p2}, Lf/g/g/e/b0;->b(Lf/g/g/e/c0;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public static Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            "Lf/c/a/w0;",
+            ")",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    :try_start_0
+    const-string v0, "com.adjust.sdk.imei.Util"
+
+    const-string v1, "getImeiParameters"
+
+    const/4 v2, 0x2
+
+    new-array v3, v2, [Ljava/lang/Class;
+
+    const-class v4, Landroid/content/Context;
+
+    const/4 v5, 0x0
+
+    aput-object v4, v3, v5
+
+    const-class v4, Lf/c/a/w0;
+
+    const/4 v6, 0x1
+
+    aput-object v4, v3, v6
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    aput-object p0, v2, v5
+
+    aput-object p1, v2, v6
+
+    invoke-static {v0, v1, v3, v2}, Le0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    const-class p1, Ljava/util/Map;
+
+    if-eqz p0, :cond_0
+
+    invoke-virtual {p1, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p0, Ljava/util/Map;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    :cond_0
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method public static Q0(Landroid/media/MediaFormat;Ljava/util/List;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/media/MediaFormat;",
+            "Ljava/util/List<",
+            "[B>;)V"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    if-ge v0, v1, :cond_0
+
+    const-string v1, "csd-"
+
+    invoke-static {v1, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, [B
+
+    invoke-static {v2}, Ljava/nio/ByteBuffer;->wrap([B)Ljava/nio/ByteBuffer;
+
+    move-result-object v2
+
+    invoke-virtual {p0, v1, v2}, Landroid/media/MediaFormat;->setByteBuffer(Ljava/lang/String;Ljava/nio/ByteBuffer;)V
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public static R(Ljava/io/InputStream;)I
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v0
+
+    int-to-byte v0, v0
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v1
+
+    int-to-byte v1, v1
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v2
+
+    int-to-byte v2, v2
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result p0
+
+    int-to-byte p0, p0
+
+    shl-int/lit8 p0, p0, 0x18
+
+    const/high16 v3, -0x1000000
+
+    and-int/2addr p0, v3
+
+    shl-int/lit8 v2, v2, 0x10
+
+    const/high16 v3, 0xff0000
+
+    and-int/2addr v2, v3
+
+    or-int/2addr p0, v2
+
+    shl-int/lit8 v1, v1, 0x8
+
+    const v2, 0xff00
+
+    and-int/2addr v1, v2
+
+    or-int/2addr p0, v1
+
+    and-int/lit16 v0, v0, 0xff
+
+    or-int/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static R0(Landroid/graphics/drawable/Drawable;Lf/g/g/e/e;)V
+    .locals 4
+
+    if-eqz p0, :cond_6
+
+    if-nez p1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    iget v0, p1, Lf/g/g/e/e;->a:I
+
+    const/4 v1, -0x1
+
+    if-eq v0, v1, :cond_1
+
+    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
+
+    :cond_1
+    iget-boolean v0, p1, Lf/g/g/e/e;->b:Z
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p1, Lf/g/g/e/e;->c:Landroid/graphics/ColorFilter;
+
+    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
+
+    :cond_2
+    iget v0, p1, Lf/g/g/e/e;->d:I
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eq v0, v1, :cond_4
+
+    if-eqz v0, :cond_3
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setDither(Z)V
+
+    :cond_4
+    iget p1, p1, Lf/g/g/e/e;->e:I
+
+    if-eq p1, v1, :cond_6
+
+    if-eqz p1, :cond_5
+
+    const/4 v2, 0x1
+
+    :cond_5
+    invoke-virtual {p0, v2}, Landroid/graphics/drawable/Drawable;->setFilterBitmap(Z)V
+
+    :cond_6
+    :goto_1
+    return-void
+.end method
+
+.method public static S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            "Lf/c/a/w0;",
+            ")",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    :try_start_0
+    const-string v0, "com.adjust.sdk.oaid.Util"
+
+    const-string v1, "getOaidParameters"
+
+    const/4 v2, 0x2
+
+    new-array v3, v2, [Ljava/lang/Class;
+
+    const-class v4, Landroid/content/Context;
+
+    const/4 v5, 0x0
+
+    aput-object v4, v3, v5
+
+    const-class v4, Lf/c/a/w0;
+
+    const/4 v6, 0x1
+
+    aput-object v4, v3, v6
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    aput-object p0, v2, v5
+
+    aput-object p1, v2, v6
+
+    invoke-static {v0, v1, v3, v2}, Le0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    const-class p1, Ljava/util/Map;
+
+    if-eqz p0, :cond_0
+
+    invoke-virtual {p1, p0}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p0, Ljava/util/Map;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    :cond_0
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method public static S0(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;I)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/google/android/exoplayer2/database/DatabaseIOException;
+        }
+    .end annotation
+
+    :try_start_0
+    const-string v0, "CREATE TABLE IF NOT EXISTS ExoPlayerVersions (feature INTEGER NOT NULL,instance_uid TEXT NOT NULL,version INTEGER NOT NULL,PRIMARY KEY (feature, instance_uid))"
+
+    invoke-virtual {p0, v0}, Landroid/database/sqlite/SQLiteDatabase;->execSQL(Ljava/lang/String;)V
+
+    new-instance v0, Landroid/content/ContentValues;
+
+    invoke-direct {v0}, Landroid/content/ContentValues;-><init>()V
+
+    const-string v1, "feature"
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    invoke-virtual {v0, v1, p1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
+
+    const-string p1, "instance_uid"
+
+    invoke-virtual {v0, p1, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string/jumbo p1, "version"
+
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    invoke-virtual {v0, p1, p2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
+
+    const-string p1, "ExoPlayerVersions"
+
+    const/4 p2, 0x0
+
+    invoke-virtual {p0, p1, p2, v0}, Landroid/database/sqlite/SQLiteDatabase;->replaceOrThrow(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)J
+    :try_end_0
+    .catch Landroid/database/SQLException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p0
+
+    new-instance p1, Lcom/google/android/exoplayer2/database/DatabaseIOException;
+
+    invoke-direct {p1, p0}, Lcom/google/android/exoplayer2/database/DatabaseIOException;-><init>(Landroid/database/SQLException;)V
+
+    throw p1
+.end method
+
+.method public static T(Ljava/util/Map;I)Ljava/lang/String;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;I)",
+            "Ljava/lang/String;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/UnsupportedEncodingException;
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()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
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const-string v2, ""
+
+    const-string v3, "="
+
+    const-string v4, "&"
+
+    const-string v5, "UTF-8"
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/util/Map$Entry;
+
+    invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Ljava/lang/String;
+
+    invoke-static {v6, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    invoke-static {v1, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->length()I
+
+    move-result v1
+
+    if-lez v1, :cond_1
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_1
+    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_0
+
+    :cond_2
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v6
+
+    sget-object p0, Lf/c/a/e2;->b:Ljava/text/SimpleDateFormat;
+
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-virtual {p0, v1}, Ljava/text/SimpleDateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "sent_at"
+
+    invoke-static {v1, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-static {p0, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    if-lez p1, :cond_3
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p0, "queue_size"
+
+    invoke-static {p0, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {p0, v5}, Ljava/net/URLEncoder;->encode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_3
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static T0(Ljava/io/InputStream;J)J
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
+
+    move-wide v2, p1
+
+    :goto_1
+    cmp-long v4, v2, v0
+
+    if-lez v4, :cond_3
+
+    invoke-virtual {p0, v2, v3}, Ljava/io/InputStream;->skip(J)J
+
+    move-result-wide v4
+
+    cmp-long v6, v4, v0
+
+    if-lez v6, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v4
+
+    const/4 v5, -0x1
+
+    if-eq v4, v5, :cond_2
+
+    const-wide/16 v4, 0x1
+
+    :goto_2
+    sub-long/2addr v2, v4
+
+    goto :goto_1
+
+    :cond_2
+    sub-long/2addr p1, v2
+
+    :cond_3
+    return-wide p1
+.end method
+
+.method public static U(Lcom/facebook/cache/common/CacheKey;)Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/facebook/cache/common/CacheKey;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    :try_start_0
+    instance-of v0, p0, Lf/g/b/a/c;
+
+    if-eqz v0, :cond_1
+
+    check-cast p0, Lf/g/b/a/c;
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_0
+
+    new-instance p0, Ljava/util/ArrayList;
+    :try_end_0
+    .catch Ljava/io/UnsupportedEncodingException; {:try_start_0 .. :try_end_0} :catch_0
+
+    throw v0
+
+    :cond_0
+    :try_start_1
+    throw v0
+
+    :cond_1
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/4 v1, 0x1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-static {p0}, Le0/a/b/b/a;->O0(Lcom/facebook/cache/common/CacheKey;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    :try_end_1
+    .catch Ljava/io/UnsupportedEncodingException; {:try_start_1 .. :try_end_1} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception p0
+
+    new-instance v0, Ljava/lang/RuntimeException;
+
+    invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+.method public static U0([B[B)Z
+    .locals 4
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_4
+
+    if-eqz p1, :cond_3
+
+    array-length v0, p1
+
+    array-length v1, p0
+
+    const/4 v2, 0x0
+
+    if-le v0, v1, :cond_0
+
+    return v2
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    array-length v1, p1
+
+    if-ge v0, v1, :cond_2
+
+    aget-byte v1, p0, v0
+
+    aget-byte v3, p1, v0
+
+    if-eq v1, v3, :cond_1
+
+    return v2
+
+    :cond_1
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p0, 0x1
+
+    return p0
+
+    :cond_3
+    throw v0
+
+    :cond_4
+    throw v0
+.end method
+
+.method public static V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    .locals 1
+
+    const/4 v0, -0x2
+
+    invoke-virtual {p0, p1, v0}, Landroid/content/res/TypedArray;->getInt(II)I
+
+    move-result p0
+
+    packed-switch p0, :pswitch_data_0
+
+    new-instance p0, Ljava/lang/RuntimeException;
+
+    const-string p1, "XML attribute not specified!"
+
+    invoke-direct {p0, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :pswitch_0
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->i:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_1
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->h:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_2
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->g:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_3
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->f:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_4
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->e:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_5
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->d:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_6
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->c:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_7
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->b:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_8
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->a:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_9
+    const/4 p0, 0x0
+
+    return-object p0
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch -0x1
+        :pswitch_9
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public static V0(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
+    .locals 5
+    .annotation build Landroidx/annotation/VisibleForTesting;
+    .end annotation
+
+    const/4 v0, 0x1
+
+    new-array v1, v0, [Ljava/lang/String;
+
+    const/4 v2, 0x0
+
+    aput-object p1, v1, v2
+
+    const-string p1, "sqlite_master"
+
+    const-string v3, "tbl_name = ?"
+
+    invoke-static {p0, p1, v3, v1}, Landroid/database/DatabaseUtils;->queryNumEntries(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)J
+
+    move-result-wide p0
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v1, p0, v3
+
+    if-lez v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public static W(Ljava/lang/String;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "TransportRuntime."
+
+    invoke-static {v0, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    .locals 3
+
+    new-instance v0, Lf/g/d/d/g;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v1, "\\$[0-9]+"
+
+    const-string v2, "\\$"
+
+    invoke-virtual {p0, v1, v2}, Ljava/lang/String;->replaceAll(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const/16 v1, 0x24
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->lastIndexOf(I)I
+
+    move-result v1
+
+    const/4 v2, -0x1
+
+    if-ne v1, v2, :cond_0
+
+    const/16 v1, 0x2e
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->lastIndexOf(I)I
+
+    move-result v1
+
+    :cond_0
+    add-int/lit8 v1, v1, 0x1
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, p0, v1}, Lf/g/d/d/g;-><init>(Ljava/lang/String;Lf/g/d/d/f;)V
+
+    return-object v0
+.end method
+
+.method public static X(Ljava/io/InputStream;)Landroid/util/Pair;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/io/InputStream;",
+            ")",
+            "Landroid/util/Pair<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-wide/16 v0, 0x7
+
+    invoke-virtual {p0, v0, v1}, Ljava/io/InputStream;->skip(J)J
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    int-to-short v0, v0
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    int-to-short v1, v1
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v2
+
+    and-int/lit16 v2, v2, 0xff
+
+    int-to-short v2, v2
+
+    const/16 v3, 0x9d
+
+    if-ne v0, v3, :cond_1
+
+    const/4 v0, 0x1
+
+    if-ne v1, v0, :cond_1
+
+    const/16 v0, 0x2a
+
+    if-eq v2, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Landroid/util/Pair;
+
+    invoke-static {p0}, Le0/a/b/b/a;->I(Ljava/io/InputStream;)I
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-static {p0}, Le0/a/b/b/a;->I(Ljava/io/InputStream;)I
+
+    move-result p0
+
+    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    invoke-direct {v0, v1, p0}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return-object v0
+
+    :cond_1
+    :goto_0
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method public static X0(Ljava/util/Collection;Lf/a/j/a/c/a;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+",
+            "Lcom/discord/simpleast/core/node/Node;",
+            ">;",
+            "Lf/a/j/a/c/a;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/simpleast/core/node/Node;
+
+    invoke-static {v0, p1}, Le0/a/b/b/a;->Y0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public static Y(Ljava/io/InputStream;)Landroid/util/Pair;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/io/InputStream;",
+            ")",
+            "Landroid/util/Pair<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-static {p0}, Le0/a/b/b/a;->R(Ljava/io/InputStream;)I
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    int-to-byte v0, v0
+
+    const/16 v1, 0x2f
+
+    if-eq v0, v1, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v0
+
+    int-to-byte v0, v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v1
+
+    int-to-byte v1, v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result v2
+
+    int-to-byte v2, v2
+
+    and-int/lit16 v2, v2, 0xff
+
+    invoke-virtual {p0}, Ljava/io/InputStream;->read()I
+
+    move-result p0
+
+    int-to-byte p0, p0
+
+    and-int/lit16 p0, p0, 0xff
+
+    and-int/lit8 v3, v1, 0x3f
+
+    shl-int/lit8 v3, v3, 0x8
+
+    or-int/2addr v0, v3
+
+    add-int/lit8 v0, v0, 0x1
+
+    and-int/lit8 p0, p0, 0xf
+
+    shl-int/lit8 p0, p0, 0xa
+
+    shl-int/lit8 v2, v2, 0x2
+
+    or-int/2addr p0, v2
+
+    and-int/lit16 v1, v1, 0xc0
+
+    shr-int/lit8 v1, v1, 0x6
+
+    or-int/2addr p0, v1
+
+    add-int/lit8 p0, p0, 0x1
+
+    new-instance v1, Landroid/util/Pair;
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    invoke-direct {v1, v0, p0}, Landroid/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return-object v1
+.end method
+
+.method public static Y0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->hasChildren()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->getChildren()Ljava/util/Collection;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/simpleast/core/node/Node;
+
+    invoke-static {v1, p1}, Le0/a/b/b/a;->Y0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p1, p0}, Lf/a/j/a/c/a;->processNode(Lcom/discord/simpleast/core/node/Node;)V
+
+    return-void
+.end method
+
+.method public static Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
+    .locals 10
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/google/android/exoplayer2/database/DatabaseIOException;
+        }
+    .end annotation
+
+    :try_start_0
+    const-string v0, "ExoPlayerVersions"
+
+    invoke-static {p0, v0}, Le0/a/b/b/a;->V0(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
+
+    move-result v0
+
+    const/4 v1, -0x1
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    const-string v3, "ExoPlayerVersions"
+
+    const-string/jumbo v0, "version"
+
+    filled-new-array {v0}, [Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "feature = ? AND instance_uid = ?"
+
+    const/4 v0, 0x2
+
+    new-array v6, v0, [Ljava/lang/String;
+
+    invoke-static {p1}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    aput-object p1, v6, v0
+
+    const/4 p1, 0x1
+
+    aput-object p2, v6, p1
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    move-object v2, p0
+
+    invoke-virtual/range {v2 .. v9}, Landroid/database/sqlite/SQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
+
+    move-result-object p0
+    :try_end_0
+    .catch Landroid/database/SQLException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :try_start_1
+    invoke-interface {p0}, Landroid/database/Cursor;->getCount()I
+
+    move-result p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-nez p1, :cond_1
+
+    :try_start_2
+    invoke-interface {p0}, Landroid/database/Cursor;->close()V
+    :try_end_2
+    .catch Landroid/database/SQLException; {:try_start_2 .. :try_end_2} :catch_0
+
+    return v1
+
+    :cond_1
+    :try_start_3
+    invoke-interface {p0}, Landroid/database/Cursor;->moveToNext()Z
+
+    invoke-interface {p0, v0}, Landroid/database/Cursor;->getInt(I)I
+
+    move-result p1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :try_start_4
+    invoke-interface {p0}, Landroid/database/Cursor;->close()V
+    :try_end_4
+    .catch Landroid/database/SQLException; {:try_start_4 .. :try_end_4} :catch_0
+
+    return p1
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_5
+    throw p1
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    :catchall_1
+    move-exception p2
+
+    if-eqz p0, :cond_2
+
+    :try_start_6
+    invoke-interface {p0}, Landroid/database/Cursor;->close()V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_2
+
+    goto :goto_0
+
+    :catchall_2
+    move-exception p0
+
+    :try_start_7
+    invoke-virtual {p1, p0}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
+
+    :cond_2
+    :goto_0
+    throw p2
+    :try_end_7
+    .catch Landroid/database/SQLException; {:try_start_7 .. :try_end_7} :catch_0
+
+    :catch_0
+    move-exception p0
+
+    new-instance p1, Lcom/google/android/exoplayer2/database/DatabaseIOException;
+
+    invoke-direct {p1, p0}, Lcom/google/android/exoplayer2/database/DatabaseIOException;-><init>(Landroid/database/SQLException;)V
+
+    throw p1
+.end method
+
+.method public static Z0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
+    .locals 1
+
+    invoke-interface {p1, p0}, Lf/a/j/a/c/a;->processNode(Lcom/discord/simpleast/core/node/Node;)V
+
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->hasChildren()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/node/Node;->getChildren()Ljava/util/Collection;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/simpleast/core/node/Node;
+
+    invoke-static {v0, p1}, Le0/a/b/b/a;->Z0(Lcom/discord/simpleast/core/node/Node;Lf/a/j/a/c/a;)V
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public static a(F)F
+    .locals 4
+
+    const v0, 0x3d25aee6    # 0.04045f
+
+    cmpg-float v0, p0, v0
+
+    if-gtz v0, :cond_0
+
+    const v0, 0x414eb852    # 12.92f
+
+    div-float/2addr p0, v0
+
+    goto :goto_0
+
+    :cond_0
+    const v0, 0x3d6147ae    # 0.055f
+
+    add-float/2addr p0, v0
+
+    const v0, 0x3f870a3d    # 1.055f
+
+    div-float/2addr p0, v0
+
+    float-to-double v0, p0
+
+    const-wide v2, 0x4003333340000000L    # 2.4000000953674316
+
+    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->pow(DD)D
+
+    move-result-wide v0
+
+    double-to-float p0, v0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static a0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x2
+
+    invoke-static {p0, p1, v0, p2, p3}, Le0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
+
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->getShort()S
+
+    move-result p0
+
+    const p1, 0xffff
+
+    and-int/2addr p0, p1
+
+    return p0
+.end method
+
+.method public static a1(Lf/g/g/f/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lf/g/g/f/a;
+    .locals 19
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    move-object/from16 v2, p2
+
+    if-eqz v2, :cond_30
+
+    sget-object v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy:[I
+
+    invoke-virtual {v1, v2, v6}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
+
+    move-result-object v2
+
+    :try_start_0
+    invoke-virtual {v2}, Landroid/content/res/TypedArray;->getIndexCount()I
+
+    move-result v6
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x1
+
+    const/4 v11, 0x1
+
+    const/4 v12, 0x1
+
+    const/4 v13, 0x1
+
+    const/4 v14, 0x1
+
+    const/4 v15, 0x1
+
+    const/16 v16, 0x1
+
+    const/16 v17, 0x1
+
+    :goto_0
+    if-ge v7, v6, :cond_27
+
+    invoke-virtual {v2, v7}, Landroid/content/res/TypedArray;->getIndex(I)I
+
+    move-result v3
+
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_actualImageScaleType:I
+
+    if-ne v3, v4, :cond_0
+
+    invoke-static {v2, v3}, Le0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->l:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    goto :goto_1
+
+    :cond_0
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_placeholderImage:I
+
+    if-ne v3, v4, :cond_1
+
+    invoke-static {v1, v2, v3}, Le0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->d:Landroid/graphics/drawable/Drawable;
+
+    goto :goto_1
+
+    :cond_1
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_pressedStateOverlayImage:I
+
+    const/4 v5, 0x0
+
+    if-ne v3, v4, :cond_3
+
+    invoke-static {v1, v2, v3}, Le0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    if-nez v3, :cond_2
+
+    iput-object v5, v0, Lf/g/g/f/a;->q:Landroid/graphics/drawable/Drawable;
+
+    :goto_1
+    move/from16 p2, v6
+
+    goto/16 :goto_2
+
+    :cond_2
+    new-instance v4, Landroid/graphics/drawable/StateListDrawable;
+
+    invoke-direct {v4}, Landroid/graphics/drawable/StateListDrawable;-><init>()V
+
+    move/from16 p2, v6
+
+    const/4 v5, 0x1
+
+    new-array v6, v5, [I
+
+    const v5, 0x10100a7
+
+    const/16 v18, 0x0
+
+    aput v5, v6, v18
+
+    invoke-virtual {v4, v6, v3}, Landroid/graphics/drawable/StateListDrawable;->addState([ILandroid/graphics/drawable/Drawable;)V
+
+    iput-object v4, v0, Lf/g/g/f/a;->q:Landroid/graphics/drawable/Drawable;
+
+    goto/16 :goto_2
+
+    :cond_3
+    move/from16 p2, v6
+
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarImage:I
+
+    if-ne v3, v4, :cond_4
+
+    invoke-static {v1, v2, v3}, Le0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
+
+    goto :goto_2
+
+    :cond_4
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_fadeDuration:I
+
+    if-ne v3, v4, :cond_5
+
+    const/4 v4, 0x0
+
+    invoke-virtual {v2, v3, v4}, Landroid/content/res/TypedArray;->getInt(II)I
+
+    move-result v3
+
+    iput v3, v0, Lf/g/g/f/a;->b:I
+
+    goto :goto_2
+
+    :cond_5
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_viewAspectRatio:I
+
+    if-ne v3, v4, :cond_6
+
+    const/4 v4, 0x0
+
+    invoke-virtual {v2, v3, v4}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result v3
+
+    iput v3, v0, Lf/g/g/f/a;->c:F
+
+    goto :goto_2
+
+    :cond_6
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_placeholderImageScaleType:I
+
+    if-ne v3, v4, :cond_7
+
+    invoke-static {v2, v3}, Le0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->e:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    goto :goto_2
+
+    :cond_7
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_retryImage:I
+
+    if-ne v3, v4, :cond_8
+
+    invoke-static {v1, v2, v3}, Le0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->f:Landroid/graphics/drawable/Drawable;
+
+    goto :goto_2
+
+    :cond_8
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_retryImageScaleType:I
+
+    if-ne v3, v4, :cond_9
+
+    invoke-static {v2, v3}, Le0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->g:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    goto :goto_2
+
+    :cond_9
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_failureImage:I
+
+    if-ne v3, v4, :cond_a
+
+    invoke-static {v1, v2, v3}, Le0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->h:Landroid/graphics/drawable/Drawable;
+
+    goto :goto_2
+
+    :cond_a
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_failureImageScaleType:I
+
+    if-ne v3, v4, :cond_b
+
+    invoke-static {v2, v3}, Le0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->i:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    goto :goto_2
+
+    :cond_b
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarImageScaleType:I
+
+    if-ne v3, v4, :cond_c
+
+    invoke-static {v2, v3}, Le0/a/b/b/a;->V(Landroid/content/res/TypedArray;I)Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->k:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    :goto_2
+    move/from16 v6, v16
+
+    move/from16 v4, v17
+
+    :goto_3
+    move/from16 v17, v8
+
+    goto/16 :goto_8
+
+    :cond_c
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_progressBarAutoRotateInterval:I
+
+    if-ne v3, v4, :cond_d
+
+    invoke-virtual {v2, v3, v9}, Landroid/content/res/TypedArray;->getInteger(II)I
+
+    move-result v9
+
+    goto/16 :goto_a
+
+    :cond_d
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_backgroundImage:I
+
+    if-ne v3, v4, :cond_e
+
+    invoke-static {v1, v2, v3}, Le0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    iput-object v3, v0, Lf/g/g/f/a;->o:Landroid/graphics/drawable/Drawable;
+
+    goto :goto_2
+
+    :cond_e
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_overlayImage:I
+
+    if-ne v3, v4, :cond_f
+
+    invoke-static {v1, v2, v3}, Le0/a/b/b/a;->O(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Lf/g/g/f/a;->b(Landroid/graphics/drawable/Drawable;)Lf/g/g/f/a;
+
+    goto :goto_2
+
+    :cond_f
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundAsCircle:I
+
+    if-ne v3, v4, :cond_11
+
+    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    if-nez v4, :cond_10
+
+    new-instance v4, Lf/g/g/f/c;
+
+    invoke-direct {v4}, Lf/g/g/f/c;-><init>()V
+
+    iput-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    :cond_10
+    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v3
+
+    iput-boolean v3, v4, Lf/g/g/f/c;->b:Z
+
+    goto :goto_2
+
+    :cond_11
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundedCornerRadius:I
+
+    if-ne v3, v4, :cond_12
+
+    invoke-virtual {v2, v3, v8}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
+
+    move-result v8
+
+    goto/16 :goto_a
+
+    :cond_12
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopLeft:I
+
+    if-ne v3, v4, :cond_13
+
+    invoke-virtual {v2, v3, v10}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v10
+
+    goto :goto_5
+
+    :cond_13
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopRight:I
+
+    if-ne v3, v4, :cond_14
+
+    invoke-virtual {v2, v3, v13}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v13
+
+    goto :goto_5
+
+    :cond_14
+    sget v4, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomLeft:I
+
+    if-ne v3, v4, :cond_15
+
+    move/from16 v4, v17
+
+    invoke-virtual {v2, v3, v4}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v17
+
+    goto :goto_5
+
+    :cond_15
+    move/from16 v4, v17
+
+    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomRight:I
+
+    if-ne v3, v6, :cond_16
+
+    invoke-virtual {v2, v3, v14}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v14
+
+    :goto_4
+    move/from16 v17, v4
+
+    goto :goto_5
+
+    :cond_16
+    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopStart:I
+
+    if-ne v3, v6, :cond_17
+
+    invoke-virtual {v2, v3, v11}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v11
+
+    goto :goto_4
+
+    :cond_17
+    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundTopEnd:I
+
+    if-ne v3, v6, :cond_18
+
+    invoke-virtual {v2, v3, v12}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v12
+
+    goto :goto_4
+
+    :cond_18
+    sget v6, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomStart:I
+
+    if-ne v3, v6, :cond_19
+
+    move/from16 v6, v16
+
+    invoke-virtual {v2, v3, v6}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v16
+
+    goto :goto_4
+
+    :cond_19
+    move/from16 v6, v16
+
+    sget v5, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundBottomEnd:I
+
+    if-ne v3, v5, :cond_1a
+
+    invoke-virtual {v2, v3, v15}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result v15
+
+    move/from16 v17, v4
+
+    move/from16 v16, v6
+
+    :goto_5
+    move/from16 v4, v17
+
+    move/from16 v17, v8
+
+    goto/16 :goto_9
+
+    :cond_1a
+    sget v5, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundWithOverlayColor:I
+
+    if-ne v3, v5, :cond_1c
+
+    iget-object v5, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    if-nez v5, :cond_1b
+
+    new-instance v5, Lf/g/g/f/c;
+
+    invoke-direct {v5}, Lf/g/g/f/c;-><init>()V
+
+    iput-object v5, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    :cond_1b
+    iget-object v5, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v2, v3, v1}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result v3
+
+    iput v3, v5, Lf/g/g/f/c;->d:I
+
+    sget-object v1, Lf/g/g/f/c$a;->d:Lf/g/g/f/c$a;
+
+    iput-object v1, v5, Lf/g/g/f/c;->a:Lf/g/g/f/c$a;
+
+    goto/16 :goto_3
+
+    :cond_1c
+    sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderWidth:I
+
+    if-ne v3, v1, :cond_20
+
+    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    if-nez v1, :cond_1d
+
+    new-instance v1, Lf/g/g/f/c;
+
+    invoke-direct {v1}, Lf/g/g/f/c;-><init>()V
+
+    iput-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    :cond_1d
+    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
+
+    move-result v3
+
+    int-to-float v3, v3
+
+    if-eqz v1, :cond_1f
+
+    const/4 v5, 0x0
+
+    cmpl-float v16, v3, v5
+
+    move/from16 v17, v8
+
+    if-ltz v16, :cond_1e
+
+    const/4 v5, 0x1
+
+    goto :goto_6
+
+    :cond_1e
+    const/4 v5, 0x0
+
+    :goto_6
+    const-string v8, "the border width cannot be < 0"
+
+    invoke-static {v5, v8}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
+
+    iput v3, v1, Lf/g/g/f/c;->e:F
+
+    goto :goto_8
+
+    :cond_1f
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_20
+    move/from16 v17, v8
+
+    sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderColor:I
+
+    if-ne v3, v1, :cond_22
+
+    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    if-nez v1, :cond_21
+
+    new-instance v1, Lf/g/g/f/c;
+
+    invoke-direct {v1}, Lf/g/g/f/c;-><init>()V
+
+    iput-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    :cond_21
+    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result v3
+
+    iput v3, v1, Lf/g/g/f/c;->f:I
+
+    goto :goto_8
+
+    :cond_22
+    sget v1, Lcom/facebook/drawee/R$a;->GenericDraweeHierarchy_roundingBorderPadding:I
+
+    if-ne v3, v1, :cond_26
+
+    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    if-nez v1, :cond_23
+
+    new-instance v1, Lf/g/g/f/c;
+
+    invoke-direct {v1}, Lf/g/g/f/c;-><init>()V
+
+    iput-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    :cond_23
+    iget-object v1, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v2, v3, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
+
+    move-result v3
+
+    int-to-float v3, v3
+
+    if-eqz v1, :cond_25
+
+    const/4 v5, 0x0
+
+    cmpl-float v8, v3, v5
+
+    if-ltz v8, :cond_24
+
+    const/4 v8, 0x1
+
+    goto :goto_7
+
+    :cond_24
+    const/4 v8, 0x0
+
+    :goto_7
+    const-string v5, "the padding cannot be < 0"
+
+    invoke-static {v8, v5}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
+
+    iput v3, v1, Lf/g/g/f/c;->g:F
+
+    goto :goto_8
+
+    :cond_25
+    const/4 v0, 0x0
+
+    throw v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_26
+    :goto_8
+    move/from16 v16, v6
+
+    :goto_9
+    move/from16 v8, v17
+
+    move/from16 v17, v4
+
+    :goto_a
+    add-int/lit8 v7, v7, 0x1
+
+    move-object/from16 v1, p1
+
+    move/from16 v6, p2
+
+    goto/16 :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_13
+
+    :cond_27
+    move/from16 v6, v16
+
+    move/from16 v4, v17
+
+    move/from16 v17, v8
+
+    invoke-virtual {v2}, Landroid/content/res/TypedArray;->recycle()V
+
+    invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/content/res/Configuration;->getLayoutDirection()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-ne v1, v2, :cond_2b
+
+    if-eqz v10, :cond_28
+
+    if-eqz v12, :cond_28
+
+    const/4 v5, 0x1
+
+    goto :goto_b
+
+    :cond_28
+    const/4 v5, 0x0
+
+    :goto_b
+    if-eqz v13, :cond_29
+
+    if-eqz v11, :cond_29
+
+    const/4 v1, 0x1
+
+    goto :goto_c
+
+    :cond_29
+    const/4 v1, 0x0
+
+    :goto_c
+    if-eqz v14, :cond_2a
+
+    if-eqz v6, :cond_2a
+
+    const/4 v2, 0x1
+
+    goto :goto_d
+
+    :cond_2a
+    const/4 v2, 0x0
+
+    :goto_d
+    if-eqz v4, :cond_2f
+
+    if-eqz v15, :cond_2f
+
+    goto :goto_11
+
+    :cond_2b
+    if-eqz v10, :cond_2c
+
+    if-eqz v11, :cond_2c
+
+    const/4 v5, 0x1
+
+    goto :goto_e
+
+    :cond_2c
+    const/4 v5, 0x0
+
+    :goto_e
+    if-eqz v13, :cond_2d
+
+    if-eqz v12, :cond_2d
+
+    const/4 v1, 0x1
+
+    goto :goto_f
+
+    :cond_2d
+    const/4 v1, 0x0
+
+    :goto_f
+    if-eqz v14, :cond_2e
+
+    if-eqz v15, :cond_2e
+
+    const/4 v2, 0x1
+
+    goto :goto_10
+
+    :cond_2e
+    const/4 v2, 0x0
+
+    :goto_10
+    if-eqz v4, :cond_2f
+
+    if-eqz v6, :cond_2f
+
+    :goto_11
+    const/4 v3, 0x1
+
+    goto :goto_12
+
+    :cond_2f
+    const/4 v3, 0x0
+
+    :goto_12
+    move/from16 v8, v17
+
+    goto :goto_14
+
+    :goto_13
+    invoke-virtual {v2}, Landroid/content/res/TypedArray;->recycle()V
+
+    invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/content/res/Configuration;->getLayoutDirection()I
+
+    throw v0
+
+    :cond_30
+    const/4 v1, 0x1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x1
+
+    const/4 v5, 0x1
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    :goto_14
+    iget-object v4, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
+
+    if-eqz v4, :cond_31
+
+    if-lez v9, :cond_31
+
+    new-instance v4, Lf/g/g/e/c;
+
+    iget-object v6, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
+
+    invoke-direct {v4, v6, v9}, Lf/g/g/e/c;-><init>(Landroid/graphics/drawable/Drawable;I)V
+
+    iput-object v4, v0, Lf/g/g/f/a;->j:Landroid/graphics/drawable/Drawable;
+
+    :cond_31
+    if-lez v8, :cond_38
+
+    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    if-nez v4, :cond_32
+
+    new-instance v4, Lf/g/g/f/c;
+
+    invoke-direct {v4}, Lf/g/g/f/c;-><init>()V
+
+    iput-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    :cond_32
+    iget-object v4, v0, Lf/g/g/f/a;->r:Lf/g/g/f/c;
+
+    if-eqz v5, :cond_33
+
+    int-to-float v5, v8
+
+    goto :goto_15
+
+    :cond_33
+    const/4 v5, 0x0
+
+    :goto_15
+    if-eqz v1, :cond_34
+
+    int-to-float v1, v8
+
+    goto :goto_16
+
+    :cond_34
+    const/4 v1, 0x0
+
+    :goto_16
+    if-eqz v2, :cond_35
+
+    int-to-float v2, v8
+
+    goto :goto_17
+
+    :cond_35
+    const/4 v2, 0x0
+
+    :goto_17
+    if-eqz v3, :cond_36
+
+    int-to-float v3, v8
+
+    goto :goto_18
+
+    :cond_36
+    const/4 v3, 0x0
+
+    :goto_18
+    iget-object v6, v4, Lf/g/g/f/c;->c:[F
+
+    if-nez v6, :cond_37
+
+    const/16 v6, 0x8
+
+    new-array v6, v6, [F
+
+    iput-object v6, v4, Lf/g/g/f/c;->c:[F
+
+    :cond_37
+    iget-object v4, v4, Lf/g/g/f/c;->c:[F
+
+    const/4 v6, 0x1
+
+    aput v5, v4, v6
+
+    const/4 v6, 0x0
+
+    aput v5, v4, v6
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x3
+
+    aput v1, v4, v6
+
+    aput v1, v4, v5
+
+    const/4 v1, 0x4
+
+    const/4 v5, 0x5
+
+    aput v2, v4, v5
+
+    aput v2, v4, v1
+
+    const/4 v1, 0x6
+
+    const/4 v2, 0x7
+
+    aput v3, v4, v2
+
+    aput v3, v4, v1
+
+    :cond_38
+    return-object v0
+.end method
+
+.method public static b(F)F
+    .locals 4
+
+    const v0, 0x3b4d2e1c    # 0.0031308f
+
+    cmpg-float v0, p0, v0
+
+    if-gtz v0, :cond_0
+
+    const v0, 0x414eb852    # 12.92f
+
+    mul-float p0, p0, v0
+
+    goto :goto_0
+
+    :cond_0
+    float-to-double v0, p0
+
+    const-wide v2, 0x3fdaaaaaa0000000L    # 0.4166666567325592
+
+    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->pow(DD)D
+
+    move-result-wide v0
+
+    const-wide v2, 0x3ff0e147a0000000L    # 1.0549999475479126
+
+    mul-double v0, v0, v2
+
+    const-wide v2, 0x3fac28f5c0000000L    # 0.054999999701976776
+
+    sub-double/2addr v0, v2
+
+    double-to-float p0, v0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static b0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)J
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x4
+
+    invoke-static {p0, p1, v0, p2, p3}, Le0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
+
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->getInt()I
+
+    move-result p0
+
+    int-to-long p0, p0
+
+    const-wide p2, 0xffffffffL
+
+    and-long/2addr p0, p2
+
+    return-wide p0
+.end method
+
+.method public static b1(ILf/h/a/c/i1/t;Z)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/google/android/exoplayer2/ParserException;
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->a()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x7
+
+    if-ge v0, v2, :cond_1
+
+    if-eqz p2, :cond_0
+
+    return v1
+
+    :cond_0
+    new-instance p0, Lcom/google/android/exoplayer2/ParserException;
+
+    const-string p2, "too short header: "
+
+    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->a()I
+
+    move-result p1
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_1
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
+
+    move-result v0
+
+    if-eq v0, p0, :cond_3
+
+    if-eqz p2, :cond_2
+
+    return v1
+
+    :cond_2
+    new-instance p1, Lcom/google/android/exoplayer2/ParserException;
+
+    const-string p2, "expected header type "
+
+    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {p2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p0
+
+    const/16 v0, 0x76
+
+    if-ne p0, v0, :cond_5
+
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p0
+
+    const/16 v0, 0x6f
+
+    if-ne p0, v0, :cond_5
+
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p0
+
+    const/16 v0, 0x72
+
+    if-ne p0, v0, :cond_5
+
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p0
+
+    const/16 v0, 0x62
+
+    if-ne p0, v0, :cond_5
+
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p0
+
+    const/16 v0, 0x69
+
+    if-ne p0, v0, :cond_5
+
+    invoke-virtual {p1}, Lf/h/a/c/i1/t;->q()I
+
+    move-result p0
+
+    const/16 p1, 0x73
+
+    if-eq p0, p1, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    const/4 p0, 0x1
+
+    return p0
+
+    :cond_5
+    :goto_0
+    if-eqz p2, :cond_6
+
+    return v1
+
+    :cond_6
+    new-instance p0, Lcom/google/android/exoplayer2/ParserException;
+
+    const-string p1, "expected characters \'vorbis\'"
+
+    invoke-direct {p0, p1}, Lcom/google/android/exoplayer2/ParserException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static c(III)I
+    .locals 0
+
+    sub-int/2addr p2, p0
+
+    const/4 p0, 0x0
+
+    invoke-static {p0, p2}, Ljava/lang/Math;->max(II)I
+
+    move-result p0
+
+    invoke-static {p0, p1}, Ljava/lang/Math;->min(II)I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static c0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;J)S
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    invoke-static {p0, p1, v0, p2, p3}, Le0/a/b/b/a;->E0(Ljava/nio/channels/FileChannel;Ljava/nio/ByteBuffer;IJ)V
+
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->get()B
+
+    move-result p0
+
+    and-int/lit16 p0, p0, 0xff
+
+    int-to-short p0, p0
+
+    return p0
+.end method
+
+.method public static c1(Ljava/io/File;Lf/g/d/c/a;)V
+    .locals 5
+
+    invoke-interface {p1, p0}, Lf/g/d/c/a;->b(Ljava/io/File;)V
+
+    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    aget-object v3, v0, v2
+
+    invoke-virtual {v3}, Ljava/io/File;->isDirectory()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    invoke-static {v3, p1}, Le0/a/b/b/a;->c1(Ljava/io/File;Lf/g/d/c/a;)V
+
+    goto :goto_1
+
+    :cond_0
+    invoke-interface {p1, v3}, Lf/g/d/c/a;->a(Ljava/io/File;)V
+
+    :goto_1
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {p1, p0}, Lf/g/d/c/a;->c(Ljava/io/File;)V
+
+    return-void
+.end method
+
+.method public static d(Ljava/lang/String;)[B
+    .locals 2
+
+    if-eqz p0, :cond_0
+
+    :try_start_0
+    const-string v0, "ASCII"
+
+    invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/lang/String;)[B
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/io/UnsupportedEncodingException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    move-exception p0
+
+    new-instance v0, Ljava/lang/RuntimeException;
+
+    const-string v1, "ASCII not found!"
+
+    invoke-direct {v0, v1, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static d0(II)I
+    .locals 0
+
+    add-int/lit8 p0, p0, 0x1f
+
+    mul-int/lit8 p0, p0, 0x1f
+
+    add-int/2addr p0, p1
+
+    return p0
+.end method
+
+.method public static d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    .locals 3
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    sub-int/2addr v0, v1
+
+    if-ltz v0, :cond_2
+
+    const/4 v1, 0x1
+
+    if-gt v0, v1, :cond_2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    add-int/2addr v2, v1
+
+    invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    if-ge v1, v2, :cond_1
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    if-le v2, v1, :cond_0
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :cond_0
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string p1, "Invalid input received"
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static e(Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+    .locals 17
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/lang/String;",
+            ")",
+            "Ljava/lang/String;"
+        }
+    .end annotation
+
+    move-object/from16 v0, p0
+
+    const-string v1, "secret_id"
+
+    invoke-interface {v0, v1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/String;
+
+    const-string v2, "headers_id"
+
+    invoke-interface {v0, v2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    const-string v3, "signature"
+
+    invoke-interface {v0, v3}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    const-string v4, "algorithm"
+
+    invoke-interface {v0, v4}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/String;
+
+    const-string v5, "native_version"
+
+    invoke-interface {v0, v5}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/String;
+
+    const/4 v6, 0x1
+
+    const/4 v7, 0x2
+
+    const/4 v8, 0x0
+
+    const-string v9, "authorizationHeader: %s"
+
+    const-string v10, ""
+
+    const-string v11, "algorithm=\"%s\""
+
+    const-string v12, "secret_id=\"%s\""
+
+    const-string v13, "signature=\"%s\""
+
+    if-eqz v1, :cond_3
+
+    if-eqz v3, :cond_3
+
+    if-nez v2, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    new-array v15, v6, [Ljava/lang/Object;
+
+    aput-object v3, v15, v8
+
+    invoke-static {v13, v15}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    new-array v15, v6, [Ljava/lang/Object;
+
+    aput-object v1, v15, v8
+
+    invoke-static {v12, v15}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v15
+
+    new-array v14, v6, [Ljava/lang/Object;
+
+    aput-object v2, v14, v8
+
+    const-string v2, "headers_id=\"%s\""
+
+    invoke-static {v2, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    new-array v14, v6, [Ljava/lang/Object;
+
+    if-eqz v4, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const-string v4, "adj1"
+
+    :goto_0
+    aput-object v4, v14, v8
+
+    invoke-static {v11, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v4
+
+    new-array v14, v6, [Ljava/lang/Object;
+
+    if-eqz v5, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    move-object v5, v10
+
+    :goto_1
+    aput-object v5, v14, v8
+
+    const-string v5, "native_version=\"%s\""
+
+    invoke-static {v5, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v5
+
+    const/4 v14, 0x5
+
+    new-array v14, v14, [Ljava/lang/Object;
+
+    aput-object v3, v14, v8
+
+    aput-object v15, v14, v6
+
+    aput-object v4, v14, v7
+
+    const/4 v3, 0x3
+
+    aput-object v2, v14, v3
+
+    const/4 v2, 0x4
+
+    aput-object v5, v14, v2
+
+    const-string v2, "Signature %s,%s,%s,%s,%s"
+
+    invoke-static {v2, v14}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v3
+
+    new-array v4, v6, [Ljava/lang/Object;
+
+    aput-object v2, v4, v8
+
+    invoke-interface {v3, v9, v4}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    goto :goto_3
+
+    :cond_3
+    :goto_2
+    const/4 v2, 0x0
+
+    :goto_3
+    if-eqz v2, :cond_4
+
+    return-object v2
+
+    :cond_4
+    const-string v2, "app_secret"
+
+    invoke-interface {v0, v2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    if-eqz v3, :cond_10
+
+    invoke-virtual {v3}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    if-nez v4, :cond_5
+
+    goto/16 :goto_7
+
+    :cond_5
+    const-string v4, "created_at"
+
+    invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/String;
+
+    const-string v6, "gps_adid"
+
+    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_6
+
+    :goto_4
+    move-object v14, v6
+
+    goto :goto_5
+
+    :cond_6
+    const-string v6, "fire_adid"
+
+    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_7
+
+    goto :goto_4
+
+    :cond_7
+    const-string v6, "android_id"
+
+    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    const-string v6, "mac_sha1"
+
+    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_9
+
+    goto :goto_4
+
+    :cond_9
+    const-string v6, "mac_md5"
+
+    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_a
+
+    goto :goto_4
+
+    :cond_a
+    const-string v6, "android_uuid"
+
+    invoke-interface {v0, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_b
+
+    goto :goto_4
+
+    :cond_b
+    const/4 v14, 0x0
+
+    :goto_5
+    invoke-interface {v0, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Ljava/lang/String;
+
+    const-string v7, "source"
+
+    invoke-interface {v0, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Ljava/lang/String;
+
+    const-string v15, "payload"
+
+    invoke-interface {v0, v15}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    move-object/from16 v16, v10
+
+    new-instance v10, Ljava/util/HashMap;
+
+    invoke-direct {v10}, Ljava/util/HashMap;-><init>()V
+
+    invoke-virtual {v10, v2, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {v10, v4, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v2, "activity_kind"
+
+    move-object/from16 v3, p1
+
+    invoke-virtual {v10, v2, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {v10, v14, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    if-eqz v8, :cond_c
+
+    invoke-virtual {v10, v7, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_c
+    if-eqz v0, :cond_d
+
+    invoke-virtual {v10, v15, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_d
+    invoke-virtual {v10}, Ljava/util/HashMap;->entrySet()Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    move-object/from16 v2, v16
+
+    move-object v10, v2
+
+    :cond_e
+    :goto_6
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_f
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/Map$Entry;
+
+    invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_e
+
+    invoke-static {v10}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v4
+
+    invoke-interface {v3}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/String;
+
+    const-string v6, " "
+
+    invoke-static {v4, v5, v6}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_6
+
+    :cond_f
+    invoke-virtual {v10}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, -0x1
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v10, v3, v0}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v3, Ljava/util/HashMap;
+
+    invoke-direct {v3}, Ljava/util/HashMap;-><init>()V
+
+    const-string v4, "clear_signature"
+
+    invoke-virtual {v3, v4, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v2, "fields"
+
+    invoke-virtual {v3, v2, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {v3, v4}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    const-string v4, "SHA-256"
+
+    invoke-static {v0, v4}, Lf/c/a/e2;->s(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v3, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    const/4 v3, 0x1
+
+    new-array v4, v3, [Ljava/lang/Object;
+
+    const/4 v5, 0x0
+
+    aput-object v1, v4, v5
+
+    invoke-static {v12, v4}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    new-array v4, v3, [Ljava/lang/Object;
+
+    aput-object v0, v4, v5
+
+    invoke-static {v13, v4}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-array v4, v3, [Ljava/lang/Object;
+
+    const-string v6, "sha256"
+
+    aput-object v6, v4, v5
+
+    invoke-static {v11, v4}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v4
+
+    new-array v6, v3, [Ljava/lang/Object;
+
+    aput-object v2, v6, v5
+
+    const-string v2, "headers=\"%s\""
+
+    invoke-static {v2, v6}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const/4 v6, 0x4
+
+    new-array v6, v6, [Ljava/lang/Object;
+
+    aput-object v1, v6, v5
+
+    aput-object v0, v6, v3
+
+    const/4 v0, 0x2
+
+    aput-object v4, v6, v0
+
+    const/4 v0, 0x3
+
+    aput-object v2, v6, v0
+
+    const-string v0, "Signature %s,%s,%s,%s"
+
+    invoke-static {v0, v6}, Lf/c/a/e2;->d(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v14
+
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v0
+
+    new-array v1, v3, [Ljava/lang/Object;
+
+    aput-object v14, v1, v5
+
+    invoke-interface {v0, v9, v1}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    goto :goto_8
+
+    :cond_10
+    :goto_7
+    const/4 v14, 0x0
+
+    :goto_8
+    return-object v14
+.end method
+
+.method public static e0(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/lang/Object;->hashCode()I
+
+    move-result p0
+
+    :goto_0
+    if-nez p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    :goto_1
+    invoke-static {p0, v0}, Le0/a/b/b/a;->d0(II)I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static f(Ljava/lang/String;JLf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/u;
+    .locals 7
+
+    const-string v0, "malformed"
+
+    const/4 v1, 0x0
+
+    if-eqz p0, :cond_2
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    if-nez v2, :cond_0
+
+    goto/16 :goto_1
+
+    :cond_0
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    :try_start_0
+    const-string v4, "UTF-8"
+
+    invoke-static {p0, v4}, Ljava/net/URLDecoder;->decode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/io/UnsupportedEncodingException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v4
+
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v5
+
+    new-array v6, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v4}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
+
+    move-result-object v4
+
+    aput-object v4, v6, v2
+
+    const-string v4, "Referrer decoding failed. Message: (%s)"
+
+    invoke-interface {v5, v4, v6}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :catch_1
+    move-exception v4
+
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v5
+
+    new-array v6, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v4}, Ljava/lang/IllegalArgumentException;->getMessage()Ljava/lang/String;
+
+    move-result-object v4
+
+    aput-object v4, v6, v2
+
+    const-string v4, "Referrer decoding failed due to IllegalArgumentException. Message: (%s)"
+
+    invoke-interface {v5, v4, v6}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :catch_2
+    move-exception v4
+
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v5
+
+    new-array v6, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v4}, Ljava/io/UnsupportedEncodingException;->getMessage()Ljava/lang/String;
+
+    move-result-object v4
+
+    aput-object v4, v6, v2
+
+    const-string v4, "Referrer decoding failed due to UnsupportedEncodingException. Message: (%s)"
+
+    invoke-interface {v5, v4, v6}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    :goto_0
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v4
+
+    new-array v5, v3, [Ljava/lang/Object;
+
+    aput-object v0, v5, v2
+
+    const-string v2, "Referrer to parse (%s)"
+
+    invoke-interface {v4, v2, v5}, Lf/c/a/w0;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    new-instance v2, Landroid/net/UrlQuerySanitizer;
+
+    invoke-direct {v2}, Landroid/net/UrlQuerySanitizer;-><init>()V
+
+    invoke-static {}, Landroid/net/UrlQuerySanitizer;->getAllButNulLegal()Landroid/net/UrlQuerySanitizer$ValueSanitizer;
+
+    move-result-object v4
+
+    invoke-virtual {v2, v4}, Landroid/net/UrlQuerySanitizer;->setUnregisteredParameterValueSanitizer(Landroid/net/UrlQuerySanitizer$ValueSanitizer;)V
+
+    invoke-virtual {v2, v3}, Landroid/net/UrlQuerySanitizer;->setAllowUnregisteredParamaters(Z)V
+
+    invoke-virtual {v2, v0}, Landroid/net/UrlQuerySanitizer;->parseQuery(Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Landroid/net/UrlQuerySanitizer;->getParameterList()Ljava/util/List;
+
+    move-result-object v2
+
+    invoke-static {v2, p3, p4, p5, p6}, Le0/a/b/b/a;->C0(Ljava/util/List;Lf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/n1;
+
+    move-result-object p3
+
+    if-nez p3, :cond_1
+
+    return-object v1
+
+    :cond_1
+    iput-object v0, p3, Lf/c/a/n1;->k:Ljava/lang/String;
+
+    iput-wide p1, p3, Lf/c/a/n1;->g:J
+
+    iput-object p0, p3, Lf/c/a/n1;->l:Ljava/lang/String;
+
+    const-string p0, "reftag"
+
+    invoke-virtual {p3, p0}, Lf/c/a/n1;->h(Ljava/lang/String;)Lf/c/a/u;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    :goto_1
+    return-object v1
+.end method
+
+.method public static f0(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 0
+
+    invoke-static {p0}, Le0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {p0, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public static g(Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Landroid/net/Uri;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/lang/String;",
+            ")",
+            "Landroid/net/Uri;"
+        }
+    .end annotation
+
+    new-instance v0, Landroid/net/Uri$Builder;
+
+    invoke-direct {v0}, Landroid/net/Uri$Builder;-><init>()V
+
+    const-string v1, "https://app.adjust.com"
+
+    const-string v2, "https"
+
+    const-string v3, "app.adjust.com"
+
+    if-eqz p2, :cond_0
+
+    :try_start_0
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    :cond_0
+    new-instance p2, Ljava/net/URL;
+
+    invoke-direct {p2, v1}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Ljava/net/URL;->getProtocol()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {p2}, Ljava/net/URL;->getAuthority()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {p2}, Ljava/net/URL;->getPath()Ljava/lang/String;
+
+    move-result-object p2
+    :try_end_0
+    .catch Ljava/net/MalformedURLException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p2
+
+    invoke-static {}, Lf/c/a/a0;->a()Lf/c/a/w0;
+
+    move-result-object v1
+
+    const/4 v4, 0x1
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {p2}, Ljava/net/MalformedURLException;->getMessage()Ljava/lang/String;
+
+    move-result-object p2
+
+    aput-object p2, v4, v5
+
+    const-string p2, "Unable to parse endpoint (%s)"
+
+    invoke-interface {v1, p2, v4}, Lf/c/a/w0;->e(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    const-string p2, ""
+
+    :goto_0
+    invoke-virtual {v0, v2}, Landroid/net/Uri$Builder;->scheme(Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    invoke-virtual {v0, v3}, Landroid/net/Uri$Builder;->encodedAuthority(Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    invoke-virtual {v0, p2}, Landroid/net/Uri$Builder;->path(Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    invoke-virtual {v0, p0}, Landroid/net/Uri$Builder;->appendPath(Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    invoke-interface {p1}, 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
+
+    :goto_1
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/util/Map$Entry;
+
+    invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/String;
+
+    invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {v0, p2, p1}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide p0
+
+    sget-object p2, Lf/c/a/e2;->b:Ljava/text/SimpleDateFormat;
+
+    invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p0
+
+    invoke-virtual {p2, p0}, Ljava/text/SimpleDateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "sent_at"
+
+    invoke-virtual {v0, p1, p0}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+    invoke-virtual {v0}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static g0(I)I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    :goto_0
+    if-lez p0, :cond_0
+
+    add-int/lit8 v0, v0, 0x1
+
+    ushr-int/lit8 p0, p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return v0
+.end method
+
+.method public static h(Z)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p0
+.end method
+
+.method public static h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Throwable;",
+            ")",
+            "Lcom/facebook/datasource/DataSource<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lf/g/e/i;
+
+    invoke-direct {v0}, Lf/g/e/i;-><init>()V
+
+    invoke-virtual {v0, p0}, Lf/g/e/i;->k(Ljava/lang/Throwable;)Z
+
+    return-object v0
+.end method
+
+.method public static i(ZLjava/lang/Object;)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static varargs i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1, p2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    if-nez p1, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1, p0, p3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static j(IIIII)V
+    .locals 3
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-ltz p3, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
+
+    if-ltz p0, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
+
+    if-ltz p2, :cond_2
+
+    const/4 v2, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v2, 0x0
+
+    :goto_2
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
+
+    add-int/2addr p0, p3
+
+    if-gt p0, p4, :cond_3
+
+    const/4 p0, 0x1
+
+    goto :goto_3
+
+    :cond_3
+    const/4 p0, 0x0
+
+    :goto_3
+    invoke-static {p0}, Le0/a/b/b/a;->h(Z)V
+
+    add-int/2addr p2, p3
+
+    if-gt p2, p1, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    const/4 v0, 0x0
+
+    :goto_4
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
+
+    return-void
+.end method
+
+.method public static varargs j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+
+    invoke-static {p0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p0
+
+    const/4 p1, 0x0
+
+    if-nez p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0, p1, p3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public static k(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(TT;)TT;"
+        }
+    .end annotation
+
+    if-eqz p0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static k0(IILf/g/j/d/d;)Z
+    .locals 3
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-nez p2, :cond_1
+
+    invoke-static {p0}, Le0/a/b/b/a;->K(I)I
+
+    move-result p0
+
+    int-to-float p0, p0
+
+    const/high16 p2, 0x45000000    # 2048.0f
+
+    cmpl-float p0, p0, p2
+
+    if-ltz p0, :cond_0
+
+    invoke-static {p1}, Le0/a/b/b/a;->K(I)I
+
+    move-result p0
+
+    const/16 p1, 0x800
+
+    if-lt p0, p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+
+    :cond_1
+    invoke-static {p0}, Le0/a/b/b/a;->K(I)I
+
+    move-result p0
+
+    iget v2, p2, Lf/g/j/d/d;->a:I
+
+    if-lt p0, v2, :cond_2
+
+    invoke-static {p1}, Le0/a/b/b/a;->K(I)I
+
+    move-result p0
+
+    iget p1, p2, Lf/g/j/d/d;->b:I
+
+    if-lt p0, p1, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
+    return v0
+.end method
+
+.method public static l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(TT;",
+            "Ljava/lang/Object;",
+            ")TT;"
+        }
+    .end annotation
+
+    if-eqz p0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static l0(Lcom/facebook/imagepipeline/image/EncodedImage;Lf/g/j/d/d;)Z
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return p0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->f()I
+
+    move-result v0
+
+    const/16 v1, 0x5a
+
+    if-eq v0, v1, :cond_1
+
+    const/16 v1, 0x10e
+
+    if-eq v0, v1, :cond_1
+
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget v0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
+
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget p0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
+
+    invoke-static {v0, p0, p1}, Le0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_1
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget v0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
+
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget p0, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
+
+    invoke-static {v0, p0, p1}, Le0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static m(Z)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    invoke-direct {p0}, Ljava/lang/IllegalStateException;-><init>()V
+
+    throw p0
+.end method
+
+.method public static m0(Ljava/lang/String;)Ljava/lang/String;
+    .locals 4
+
+    :try_start_0
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "/sys/class/net/"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p0, "/address"
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x3e8
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    new-instance v1, Ljava/io/BufferedReader;
+
+    new-instance v2, Ljava/io/FileReader;
+
+    invoke-direct {v2, p0}, Ljava/io/FileReader;-><init>(Ljava/lang/String;)V
+
+    const/16 p0, 0x400
+
+    invoke-direct {v1, v2, p0}, Ljava/io/BufferedReader;-><init>(Ljava/io/Reader;I)V
+
+    new-array p0, p0, [C
+
+    :goto_0
+    invoke-virtual {v1, p0}, Ljava/io/BufferedReader;->read([C)I
+
+    move-result v2
+
+    const/4 v3, -0x1
+
+    if-eq v2, v3, :cond_0
+
+    const/4 v3, 0x0
+
+    invoke-static {p0, v3, v2}, Ljava/lang/String;->valueOf([CII)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v1}, Ljava/io/BufferedReader;->close()V
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method public static n(ZLjava/lang/Object;)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static n0(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-static {p0, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_0
+    return-void
+.end method
+
+.method public static o([BLjava/lang/String;)Z
+    .locals 4
+
+    array-length v0, p0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eq v0, v1, :cond_0
+
+    return v2
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    array-length v1, p0
+
+    if-ge v0, v1, :cond_2
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    aget-byte v3, p0, v0
+
+    if-eq v1, v3, :cond_1
+
+    return v2
+
+    :cond_1
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p0, 0x1
+
+    return p0
+.end method
+
+.method public static o0(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 1
+
+    const/4 v0, 0x5
+
+    invoke-static {p0, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_0
+    return-void
+.end method
+
+.method public static p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+    .locals 10
+
+    :goto_0
+    invoke-virtual {p2}, Lf/h/a/c/i1/t;->a()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-le v0, v1, :cond_9
+
+    invoke-static {p2}, Le0/a/b/b/a;->H0(Lf/h/a/c/i1/t;)I
+
+    move-result v0
+
+    invoke-static {p2}, Le0/a/b/b/a;->H0(Lf/h/a/c/i1/t;)I
+
+    move-result v2
+
+    iget v3, p2, Lf/h/a/c/i1/t;->b:I
+
+    add-int/2addr v3, v2
+
+    const/4 v4, -0x1
+
+    if-eq v2, v4, :cond_7
+
+    invoke-virtual {p2}, Lf/h/a/c/i1/t;->a()I
+
+    move-result v4
+
+    if-le v2, v4, :cond_0
+
+    goto :goto_4
+
+    :cond_0
+    const/4 v4, 0x4
+
+    if-ne v0, v4, :cond_8
+
+    const/16 v0, 0x8
+
+    if-lt v2, v0, :cond_8
+
+    invoke-virtual {p2}, Lf/h/a/c/i1/t;->q()I
+
+    move-result v0
+
+    invoke-virtual {p2}, Lf/h/a/c/i1/t;->v()I
+
+    move-result v2
+
+    const/16 v4, 0x31
+
+    const/4 v5, 0x0
+
+    if-ne v2, v4, :cond_1
+
+    invoke-virtual {p2}, Lf/h/a/c/i1/t;->e()I
+
+    move-result v6
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v6, 0x0
+
+    :goto_1
+    invoke-virtual {p2}, Lf/h/a/c/i1/t;->q()I
+
+    move-result v7
+
+    const/16 v8, 0x2f
+
+    if-ne v2, v8, :cond_2
+
+    invoke-virtual {p2, v1}, Lf/h/a/c/i1/t;->D(I)V
+
+    :cond_2
+    const/16 v9, 0xb5
+
+    if-ne v0, v9, :cond_4
+
+    if-eq v2, v4, :cond_3
+
+    if-ne v2, v8, :cond_4
+
+    :cond_3
+    const/4 v0, 0x3
+
+    if-ne v7, v0, :cond_4
+
+    const/4 v0, 0x1
+
+    goto :goto_2
+
+    :cond_4
+    const/4 v0, 0x0
+
+    :goto_2
+    if-ne v2, v4, :cond_6
+
+    const v2, 0x47413934
+
+    if-ne v6, v2, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    const/4 v1, 0x0
+
+    :goto_3
+    and-int/2addr v0, v1
+
+    :cond_6
+    if-eqz v0, :cond_8
+
+    invoke-static {p0, p1, p2, p3}, Le0/a/b/b/a;->q(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+
+    goto :goto_5
+
+    :cond_7
+    :goto_4
+    const-string v0, "CeaUtil"
+
+    const-string v1, "Skipping remainder of malformed SEI NAL unit."
+
+    invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget v3, p2, Lf/h/a/c/i1/t;->c:I
+
+    :cond_8
+    :goto_5
+    invoke-virtual {p2, v3}, Lf/h/a/c/i1/t;->C(I)V
+
+    goto :goto_0
+
+    :cond_9
+    return-void
+.end method
+
+.method public static p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    .locals 1
+
+    const/4 v0, -0x1
+
+    if-eq p2, v0, :cond_0
+
+    invoke-virtual {p0, p1, p2}, Landroid/media/MediaFormat;->setInteger(Ljava/lang/String;I)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public static q(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+    .locals 11
+
+    invoke-virtual {p2}, Lf/h/a/c/i1/t;->q()I
+
+    move-result v0
+
+    and-int/lit8 v1, v0, 0x40
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-nez v1, :cond_1
+
+    return-void
+
+    :cond_1
+    and-int/lit8 v0, v0, 0x1f
+
+    invoke-virtual {p2, v3}, Lf/h/a/c/i1/t;->D(I)V
+
+    mul-int/lit8 v0, v0, 0x3
+
+    iget v1, p2, Lf/h/a/c/i1/t;->b:I
+
+    array-length v3, p3
+
+    :goto_1
+    if-ge v2, v3, :cond_2
+
+    aget-object v4, p3, v2
+
+    invoke-virtual {p2, v1}, Lf/h/a/c/i1/t;->C(I)V
+
+    invoke-interface {v4, p2, v0}, Lf/h/a/c/a1/s;->b(Lf/h/a/c/i1/t;I)V
+
+    const/4 v7, 0x1
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    move-wide v5, p0
+
+    move v8, v0
+
+    invoke-interface/range {v4 .. v10}, Lf/h/a/c/a1/s;->c(JIIILf/h/a/c/a1/s$a;)V
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    return-void
+.end method
+
+.method public static q0(Ljava/io/File;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/facebook/common/file/FileUtils$CreateDirectoryException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/io/File;->exists()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/io/File;->delete()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;
+
+    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/facebook/common/file/FileUtils$FileDeleteException;
+
+    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v2, p0}, Lcom/facebook/common/file/FileUtils$FileDeleteException;-><init>(Ljava/lang/String;)V
+
+    invoke-direct {v0, v1, v2}, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_2
+    :goto_0
+    invoke-virtual {p0}, Ljava/io/File;->mkdirs()Z
+
+    move-result v0
+
+    if-nez v0, :cond_4
+
+    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    new-instance v0, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;
+
+    invoke-virtual {p0}, Ljava/io/File;->getAbsolutePath()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Lcom/facebook/common/file/FileUtils$CreateDirectoryException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    :goto_1
+    return-void
+.end method
+
+.method public static r(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+    .locals 2
+
+    if-eqz p0, :cond_1
+
+    if-ne p0, p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
+
+    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getChangingConfigurations()I
+
+    move-result v0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setChangingConfigurations(I)V
+
+    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getLevel()I
+
+    move-result v0
+
+    invoke-virtual {p0, v0}, Landroid/graphics/drawable/Drawable;->setLevel(I)Z
+
+    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->isVisible()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, v0, v1}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z
+
+    invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getState()[I
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Landroid/graphics/drawable/Drawable;->setState([I)Z
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public static r0(II)I
+    .locals 2
+
+    const/16 v0, 0xff
+
+    if-ne p1, v0, :cond_0
+
+    return p0
+
+    :cond_0
+    const v0, 0xffffff
+
+    if-nez p1, :cond_1
+
+    and-int/2addr p0, v0
+
+    return p0
+
+    :cond_1
+    shr-int/lit8 v1, p1, 0x7
+
+    add-int/2addr p1, v1
+
+    ushr-int/lit8 v1, p0, 0x18
+
+    mul-int v1, v1, p1
+
+    shr-int/lit8 p1, v1, 0x8
+
+    shl-int/lit8 p1, p1, 0x18
+
+    and-int/2addr p0, v0
+
+    or-int/2addr p0, p1
+
+    return p0
+.end method
+
+.method public static s(Lf/c/a/u;Ljava/lang/String;)Lf/c/a/r1;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+
+    :try_start_0
+    new-instance v0, Ljava/util/HashMap;
+
+    iget-object v1, p0, Lf/c/a/u;->parameters:Ljava/util/Map;
+
+    invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+
+    const-string v1, "event_callback_id"
+
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    iget-object v1, p0, Lf/c/a/u;->path:Ljava/lang/String;
+
+    invoke-static {v1, v0, p1}, Le0/a/b/b/a;->g(Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Landroid/net/Uri;
+
+    move-result-object p1
+
+    new-instance v1, Ljava/net/URL;
+
+    invoke-virtual {p1}, Landroid/net/Uri;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v1, p1}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
+
+    move-result-object p1
+
+    check-cast p1, Ljavax/net/ssl/HttpsURLConnection;
+
+    iget-object v1, p0, Lf/c/a/u;->clientSdk:Ljava/lang/String;
+
+    const-string v2, "Client-SDK"
+
+    invoke-virtual {p1, v2, v1}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
+
+    const v1, 0xea60
+
+    invoke-virtual {p1, v1}, Ljavax/net/ssl/HttpsURLConnection;->setConnectTimeout(I)V
+
+    invoke-virtual {p1, v1}, Ljavax/net/ssl/HttpsURLConnection;->setReadTimeout(I)V
+
+    sget-object v1, Le0/a/b/b/a;->b:Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    const-string v2, "User-Agent"
+
+    invoke-virtual {p1, v2, v1}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_0
+    iget-object v1, p0, Lf/c/a/u;->activityKind:Lf/c/a/t;
+
+    invoke-virtual {v1}, Lf/c/a/t;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Le0/a/b/b/a;->e(Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    const-string v1, "Authorization"
+
+    invoke-virtual {p1, v1, v0}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_1
+    const-string v0, "GET"
+
+    invoke-virtual {p1, v0}, Ljavax/net/ssl/HttpsURLConnection;->setRequestMethod(Ljava/lang/String;)V
+
+    invoke-static {p1, p0}, Le0/a/b/b/a;->G0(Ljavax/net/ssl/HttpsURLConnection;Lf/c/a/u;)Lf/c/a/r1;
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    move-exception p0
+
+    throw p0
+.end method
+
+.method public static s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
+    .locals 1
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lf/d/a/x/h0/c;",
+            "Lf/d/a/d;",
+            "Lf/d/a/x/g0<",
+            "TT;>;)",
+            "Ljava/util/List<",
+            "Lf/d/a/z/a<",
+            "TT;>;>;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/high16 v0, 0x3f800000    # 1.0f
+
+    invoke-static {p0, p1, v0, p2}, Lf/d/a/x/q;->a(Lf/d/a/x/h0/c;Lf/d/a/d;FLf/d/a/x/g0;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final t(Lcom/discord/models/domain/ModelMessageEmbed;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/player/MediaSource;
+    .locals 2
+
+    const-string v0, "embed"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "progressiveMediaUri"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "featureTag"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessageEmbed;->isGifv()Z
+
+    move-result p0
+
+    if-eqz p0, :cond_0
+
+    sget-object p0, Lcom/discord/player/MediaType;->GIFV:Lcom/discord/player/MediaType;
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p0, Lcom/discord/player/MediaType;->VIDEO:Lcom/discord/player/MediaType;
+
+    :goto_0
+    new-instance v0, Lcom/discord/player/MediaSource;
+
+    invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+
+    move-result-object p1
+
+    const-string v1, "Uri.parse(progressiveMediaUri)"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, p1, p2, p0}, Lcom/discord/player/MediaSource;-><init>(Landroid/net/Uri;Ljava/lang/String;Lcom/discord/player/MediaType;)V
+
+    return-object v0
+.end method
+
+.method public static t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lf/d/a/v/j/a;
+
+    sget-object v1, Lf/d/a/x/e;->a:Lf/d/a/x/e;
+
+    invoke-static {p0, p1, v1}, Le0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Lf/d/a/v/j/a;-><init>(Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public static u(Ljava/lang/String;Lf/c/a/u;I)Lf/c/a/r1;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    new-instance v1, Ljava/net/URL;
+
+    invoke-direct {v1, p0}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
+
+    move-result-object p0
+
+    check-cast p0, Ljavax/net/ssl/HttpsURLConnection;
+
+    new-instance v1, Ljava/util/HashMap;
+
+    iget-object v2, p1, Lf/c/a/u;->parameters:Ljava/util/Map;
+
+    invoke-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
+
+    iget-object v2, p1, Lf/c/a/u;->clientSdk:Ljava/lang/String;
+
+    const-string v3, "Client-SDK"
+
+    invoke-virtual {p0, v3, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
+
+    const v2, 0xea60
+
+    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setConnectTimeout(I)V
+
+    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setReadTimeout(I)V
+
+    sget-object v2, Le0/a/b/b/a;->b:Ljava/lang/String;
+
+    if-eqz v2, :cond_0
+
+    const-string v3, "User-Agent"
+
+    invoke-virtual {p0, v3, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_0
+    const-string v2, "event_callback_id"
+
+    invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    iget-object v2, p1, Lf/c/a/u;->activityKind:Lf/c/a/t;
+
+    invoke-virtual {v2}, Lf/c/a/t;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Le0/a/b/b/a;->e(Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_1
+
+    const-string v3, "Authorization"
+
+    invoke-virtual {p0, v3, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestProperty(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_1
+    const-string v2, "POST"
+
+    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setRequestMethod(Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setUseCaches(Z)V
+
+    const/4 v2, 0x1
+
+    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setDoInput(Z)V
+
+    invoke-virtual {p0, v2}, Ljavax/net/ssl/HttpsURLConnection;->setDoOutput(Z)V
+
+    new-instance v2, Ljava/io/DataOutputStream;
+
+    invoke-virtual {p0}, Ljavax/net/ssl/HttpsURLConnection;->getOutputStream()Ljava/io/OutputStream;
+
+    move-result-object v3
+
+    invoke-direct {v2, v3}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    invoke-static {v1, p2}, Le0/a/b/b/a;->T(Ljava/util/Map;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {v2, p2}, Ljava/io/DataOutputStream;->writeBytes(Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Le0/a/b/b/a;->G0(Ljavax/net/ssl/HttpsURLConnection;Lf/c/a/u;)Lf/c/a/r1;
+
+    move-result-object p0
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    invoke-virtual {v2}, Ljava/io/DataOutputStream;->flush()V
+
+    invoke-virtual {v2}, Ljava/io/DataOutputStream;->close()V
+    :try_end_2
+    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
+
+    :catch_0
+    return-object p0
+
+    :catchall_0
+    move-exception p0
+
+    goto :goto_2
+
+    :catch_1
+    move-exception p0
+
+    move-object v0, v2
+
+    goto :goto_0
+
+    :catchall_1
+    move-exception p0
+
+    goto :goto_1
+
+    :catch_2
+    move-exception p0
+
+    :goto_0
+    :try_start_3
+    throw p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :goto_1
+    move-object v2, v0
+
+    :goto_2
+    if-eqz v2, :cond_2
+
+    :try_start_4
+    invoke-virtual {v2}, Ljava/io/DataOutputStream;->flush()V
+
+    invoke-virtual {v2}, Ljava/io/DataOutputStream;->close()V
+    :try_end_4
+    .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_3
+
+    :catch_3
+    :cond_2
+    throw p0
+.end method
+
+.method public static u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    invoke-static {p0, p1, v0}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
+    .locals 2
+
+    invoke-static {p0}, Le0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const/4 v0, 0x1
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const/4 v1, 0x0
+
+    aput-object p2, v0, v1
+
+    invoke-static {p1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public static v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lf/d/a/v/j/b;
+
+    if-eqz p2, :cond_0
+
+    invoke-static {}, Lf/d/a/y/g;->e()F
+
+    move-result p2
+
+    goto :goto_0
+
+    :cond_0
+    const/high16 p2, 0x3f800000    # 1.0f
+
+    :goto_0
+    sget-object v1, Lf/d/a/x/h;->a:Lf/d/a/x/h;
+
+    invoke-static {p0, p1, p2, v1}, Lf/d/a/x/q;->a(Lf/d/a/x/h0/c;Lf/d/a/d;FLf/d/a/x/g0;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Lf/d/a/v/j/b;-><init>(Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public static varargs w(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
+    .locals 0
+
+    invoke-static {p0}, Le0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {p1, p2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-void
+.end method
+
+.method public static w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lf/d/a/v/j/d;
+
+    sget-object v1, Lf/d/a/x/n;->a:Lf/d/a/x/n;
+
+    invoke-static {p0, p1, v1}, Le0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Lf/d/a/v/j/d;-><init>(Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public static x(Ljava/io/File;)Z
+    .locals 4
+
+    invoke-virtual {p0}, Ljava/io/File;->listFiles()[Ljava/io/File;
+
+    move-result-object p0
+
+    const/4 v0, 0x1
+
+    if-eqz p0, :cond_0
+
+    array-length v1, p0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_0
+
+    aget-object v3, p0, v2
+
+    invoke-static {v3}, Le0/a/b/b/a;->y(Ljava/io/File;)Z
+
+    move-result v3
+
+    and-int/2addr v0, v3
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return v0
+.end method
+
+.method public static x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lf/d/a/v/j/f;
+
+    invoke-static {}, Lf/d/a/y/g;->e()F
+
+    move-result v1
+
+    sget-object v2, Lf/d/a/x/v;->a:Lf/d/a/x/v;
+
+    invoke-static {p0, p1, v1, v2}, Lf/d/a/x/q;->a(Lf/d/a/x/h0/c;Lf/d/a/d;FLf/d/a/x/g0;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Lf/d/a/v/j/f;-><init>(Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public static y(Ljava/io/File;)Z
+    .locals 1
+
+    invoke-virtual {p0}, Ljava/io/File;->isDirectory()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0}, Le0/a/b/b/a;->x(Ljava/io/File;)Z
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/io/File;->delete()Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static y0(Lf/h/a/c/a1/e;)Lf/h/a/c/a1/f0/b;
+    .locals 14
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;,
+            Ljava/lang/InterruptedException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_5
+
+    new-instance v1, Lf/h/a/c/i1/t;
+
+    const/16 v2, 0x10
+
+    invoke-direct {v1, v2}, Lf/h/a/c/i1/t;-><init>(I)V
+
+    invoke-static {p0, v1}, Lf/h/a/c/a1/f0/c;->a(Lf/h/a/c/a1/e;Lf/h/a/c/i1/t;)Lf/h/a/c/a1/f0/c;
+
+    move-result-object v3
+
+    iget v3, v3, Lf/h/a/c/a1/f0/c;->a:I
+
+    const v4, 0x52494646
+
+    if-eq v3, v4, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v3, v1, Lf/h/a/c/i1/t;->a:[B
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x0
+
+    invoke-virtual {p0, v3, v5, v4, v5}, Lf/h/a/c/a1/e;->e([BIIZ)Z
+
+    invoke-virtual {v1, v5}, Lf/h/a/c/i1/t;->C(I)V
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->e()I
+
+    move-result v3
+
+    const v4, 0x57415645
+
+    if-eq v3, v4, :cond_1
+
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Unsupported RIFF format: "
+
+    invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v1, "WavHeaderReader"
+
+    invoke-static {v1, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
+
+    return-object v0
+
+    :cond_1
+    invoke-static {p0, v1}, Lf/h/a/c/a1/f0/c;->a(Lf/h/a/c/a1/e;Lf/h/a/c/i1/t;)Lf/h/a/c/a1/f0/c;
+
+    move-result-object v0
+
+    :goto_0
+    iget v3, v0, Lf/h/a/c/a1/f0/c;->a:I
+
+    const v4, 0x666d7420
+
+    if-eq v3, v4, :cond_2
+
+    iget-wide v3, v0, Lf/h/a/c/a1/f0/c;->b:J
+
+    long-to-int v0, v3
+
+    invoke-virtual {p0, v0, v5}, Lf/h/a/c/a1/e;->a(IZ)Z
+
+    invoke-static {p0, v1}, Lf/h/a/c/a1/f0/c;->a(Lf/h/a/c/a1/e;Lf/h/a/c/i1/t;)Lf/h/a/c/a1/f0/c;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_2
+    iget-wide v3, v0, Lf/h/a/c/a1/f0/c;->b:J
+
+    const-wide/16 v6, 0x10
+
+    cmp-long v8, v3, v6
+
+    if-ltz v8, :cond_3
+
+    const/4 v3, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v3, 0x0
+
+    :goto_1
+    invoke-static {v3}, Lf/h/a/c/i1/e;->F(Z)V
+
+    iget-object v3, v1, Lf/h/a/c/i1/t;->a:[B
+
+    invoke-virtual {p0, v3, v5, v2, v5}, Lf/h/a/c/a1/e;->e([BIIZ)Z
+
+    invoke-virtual {v1, v5}, Lf/h/a/c/i1/t;->C(I)V
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
+
+    move-result v7
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
+
+    move-result v8
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->i()I
+
+    move-result v9
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->i()I
+
+    move-result v10
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
+
+    move-result v11
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->j()I
+
+    move-result v12
+
+    iget-wide v0, v0, Lf/h/a/c/a1/f0/c;->b:J
+
+    long-to-int v1, v0
+
+    sub-int/2addr v1, v2
+
+    if-lez v1, :cond_4
+
+    new-array v0, v1, [B
+
+    invoke-virtual {p0, v0, v5, v1, v5}, Lf/h/a/c/a1/e;->e([BIIZ)Z
+
+    move-object v13, v0
+
+    goto :goto_2
+
+    :cond_4
+    sget-object p0, Lf/h/a/c/i1/c0;->f:[B
+
+    move-object v13, p0
+
+    :goto_2
+    new-instance p0, Lf/h/a/c/a1/f0/b;
+
+    move-object v6, p0
+
+    invoke-direct/range {v6 .. v13}, Lf/h/a/c/a1/f0/b;-><init>(IIIIII[B)V
+
+    return-object p0
+
+    :cond_5
+    throw v0
+.end method
+
+.method public static z(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;)F
+    .locals 7
+
+    invoke-static {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->i(Lcom/facebook/imagepipeline/image/EncodedImage;)Z
+
+    move-result v0
+
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
+
+    if-eqz p1, :cond_9
+
+    iget v0, p1, Lf/g/j/d/d;->b:I
+
+    if-lez v0, :cond_9
+
+    iget v0, p1, Lf/g/j/d/d;->a:I
+
+    if-lez v0, :cond_9
+
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
+
+    if-eqz v0, :cond_9
+
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
+
+    if-nez v0, :cond_0
+
+    goto/16 :goto_7
+
+    :cond_0
+    invoke-virtual {p0}, Lf/g/j/d/e;->c()Z
+
+    move-result p0
+
+    const/16 v0, 0x10e
+
+    const/16 v1, 0x5a
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-nez p0, :cond_1
+
+    const/4 p0, 0x0
+
+    goto :goto_2
+
+    :cond_1
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->g:I
+
+    if-eqz p0, :cond_3
+
+    if-eq p0, v1, :cond_3
+
+    const/16 v4, 0xb4
+
+    if-eq p0, v4, :cond_3
+
+    if-ne p0, v0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v4, 0x0
+
+    goto :goto_1
+
+    :cond_3
+    :goto_0
+    const/4 v4, 0x1
+
+    :goto_1
+    invoke-static {v4}, Le0/a/b/b/a;->h(Z)V
+
+    :goto_2
+    if-eq p0, v1, :cond_5
+
+    if-ne p0, v0, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    const/4 p0, 0x0
+
+    goto :goto_4
+
+    :cond_5
+    :goto_3
+    const/4 p0, 0x1
+
+    :goto_4
+    if-eqz p0, :cond_6
+
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
+
+    goto :goto_5
+
+    :cond_6
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget v0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
+
+    :goto_5
+    if-eqz p0, :cond_7
+
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->i:I
+
+    goto :goto_6
+
+    :cond_7
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/image/EncodedImage;->r()V
+
+    iget p0, p2, Lcom/facebook/imagepipeline/image/EncodedImage;->j:I
+
+    :goto_6
+    iget p2, p1, Lf/g/j/d/d;->a:I
+
+    int-to-float p2, p2
+
+    int-to-float v1, v0
+
+    div-float/2addr p2, v1
+
+    iget v1, p1, Lf/g/j/d/d;->b:I
+
+    int-to-float v1, v1
+
+    int-to-float v4, p0
+
+    div-float/2addr v1, v4
+
+    invoke-static {p2, v1}, Ljava/lang/Math;->max(FF)F
+
+    move-result v4
+
+    const/4 v5, 0x7
+
+    new-array v5, v5, [Ljava/lang/Object;
+
+    iget v6, p1, Lf/g/j/d/d;->a:I
+
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v6
+
+    aput-object v6, v5, v3
+
+    iget p1, p1, Lf/g/j/d/d;->b:I
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, v5, v2
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    const/4 v0, 0x2
+
+    aput-object p1, v5, v0
+
+    const/4 p1, 0x3
+
+    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    aput-object p0, v5, p1
+
+    const/4 p0, 0x4
+
+    invoke-static {p2}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object p1
+
+    aput-object p1, v5, p0
+
+    const/4 p0, 0x5
+
+    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object p1
+
+    aput-object p1, v5, p0
+
+    const/4 p0, 0x6
+
+    invoke-static {v4}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object p1
+
+    aput-object p1, v5, p0
+
+    sget-object p0, Lf/g/d/e/a;->a:Lf/g/d/e/c;
+
+    check-cast p0, Lf/g/d/e/b;
+
+    invoke-virtual {p0, v0}, Lf/g/d/e/b;->a(I)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_8
+
+    sget-object p0, Lf/g/d/e/a;->a:Lf/g/d/e/c;
+
+    const-string p1, "Downsample - Specified size: %dx%d, image size: %dx%d ratio: %.1f x %.1f, ratio: %.3f"
+
+    invoke-static {p1, v5}, Lf/g/d/e/a;->f(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    check-cast p0, Lf/g/d/e/b;
+
+    const-string p2, "DownsampleUtil"
+
+    invoke-virtual {p0, v0, p2, p1}, Lf/g/d/e/b;->c(ILjava/lang/String;Ljava/lang/String;)V
+
+    :cond_8
+    return v4
+
+    :cond_9
+    :goto_7
+    const/high16 p0, 0x3f800000    # 1.0f
+
+    return p0
+.end method
+
+.method public static z0(Lf/h/a/c/a1/e;Z)Lcom/google/android/exoplayer2/metadata/Metadata;
+    .locals 9
+    .annotation build Landroidx/annotation/Nullable;
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;,
+            Ljava/lang/InterruptedException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_0
+
+    move-object p1, v0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p1, Lf/h/a/c/c1/i/b;->b:Lf/h/a/c/c1/i/b$a;
+
+    :goto_0
+    new-instance v1, Lf/h/a/c/i1/t;
+
+    const/16 v2, 0xa
+
+    invoke-direct {v1, v2}, Lf/h/a/c/i1/t;-><init>(I)V
+
+    const/4 v3, 0x0
+
+    move-object v4, v0
+
+    const/4 v5, 0x0
+
+    :goto_1
+    :try_start_0
+    iget-object v6, v1, Lf/h/a/c/i1/t;->a:[B
+
+    invoke-virtual {p0, v6, v3, v2, v3}, Lf/h/a/c/a1/e;->e([BIIZ)Z
+    :try_end_0
+    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
+
+    invoke-virtual {v1, v3}, Lf/h/a/c/i1/t;->C(I)V
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->s()I
+
+    move-result v6
+
+    const v7, 0x494433
+
+    if-eq v6, v7, :cond_1
+
+    goto :goto_3
+
+    :cond_1
+    const/4 v6, 0x3
+
+    invoke-virtual {v1, v6}, Lf/h/a/c/i1/t;->D(I)V
+
+    invoke-virtual {v1}, Lf/h/a/c/i1/t;->p()I
+
+    move-result v6
+
+    add-int/lit8 v7, v6, 0xa
+
+    if-nez v4, :cond_2
+
+    new-array v4, v7, [B
+
+    iget-object v8, v1, Lf/h/a/c/i1/t;->a:[B
+
+    invoke-static {v8, v3, v4, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    invoke-virtual {p0, v4, v2, v6, v3}, Lf/h/a/c/a1/e;->e([BIIZ)Z
+
+    new-instance v6, Lf/h/a/c/c1/i/b;
+
+    invoke-direct {v6, p1}, Lf/h/a/c/c1/i/b;-><init>(Lf/h/a/c/c1/i/b$a;)V
+
+    invoke-virtual {v6, v4, v7}, Lf/h/a/c/c1/i/b;->c([BI)Lcom/google/android/exoplayer2/metadata/Metadata;
+
+    move-result-object v4
+
+    goto :goto_2
+
+    :cond_2
+    invoke-virtual {p0, v6, v3}, Lf/h/a/c/a1/e;->a(IZ)Z
+
+    :goto_2
+    add-int/2addr v5, v7
+
+    goto :goto_1
+
+    :catch_0
+    nop
+
+    :goto_3
+    iput v3, p0, Lf/h/a/c/a1/e;->f:I
+
+    invoke-virtual {p0, v5, v3}, Lf/h/a/c/a1/e;->a(IZ)Z
+
+    if-eqz v4, :cond_4
+
+    iget-object p0, v4, Lcom/google/android/exoplayer2/metadata/Metadata;->d:[Lcom/google/android/exoplayer2/metadata/Metadata$Entry;
+
+    array-length p0, p0
+
+    if-nez p0, :cond_3
+
+    goto :goto_4
+
+    :cond_3
+    move-object v0, v4
+
+    :cond_4
+    :goto_4
+    return-object v0
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/a$a.smali b/com.discord/smali/e0/a/b/b/b/a$a.smali
new file mode 100644
index 0000000000..32b7a14231
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/a$a.smali
@@ -0,0 +1,355 @@
+.class public abstract Le0/a/b/b/b/a$a;
+.super Landroid/os/Binder;
+.source "IMediaControllerCallback.java"
+
+# interfaces
+.implements Le0/a/b/b/b/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/b/b/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
+
+    const-string v0, "android.support.v4.media.session.IMediaControllerCallback"
+
+    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    const v0, 0x5f4e5446
+
+    const/4 v1, 0x1
+
+    const-string v2, "android.support.v4.media.session.IMediaControllerCallback"
+
+    if-eq p1, v0, :cond_6
+
+    const/4 v0, 0x0
+
+    packed-switch p1, :pswitch_data_0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result p1
+
+    return p1
+
+    :pswitch_0
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    move-object p1, p0
+
+    check-cast p1, Le0/a/b/b/b/c$b;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return v1
+
+    :pswitch_1
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-object p1, p0
+
+    check-cast p1, Le0/a/b/b/b/c$b;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return v1
+
+    :pswitch_2
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    move-object p1, p0
+
+    check-cast p1, Le0/a/b/b/b/c$b;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return v1
+
+    :pswitch_3
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    return v1
+
+    :pswitch_4
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-object p1, p0
+
+    check-cast p1, Le0/a/b/b/b/c$b;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return v1
+
+    :pswitch_5
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    sget-object p1, Landroid/support/v4/media/session/ParcelableVolumeInfo;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Landroid/support/v4/media/session/ParcelableVolumeInfo;
+
+    :cond_0
+    invoke-interface {p0, v0}, Le0/a/b/b/b/a;->u0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
+
+    return v1
+
+    :pswitch_6
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Landroid/os/Bundle;
+
+    :cond_1
+    invoke-interface {p0, v0}, Le0/a/b/b/b/a;->v(Landroid/os/Bundle;)V
+
+    return v1
+
+    :pswitch_7
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    sget-object p1, Landroid/text/TextUtils;->CHAR_SEQUENCE_CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    :cond_2
+    invoke-interface {p0, v0}, Le0/a/b/b/b/a;->R(Ljava/lang/CharSequence;)V
+
+    return v1
+
+    :pswitch_8
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    sget-object p1, Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-virtual {p2, p1}, Landroid/os/Parcel;->createTypedArrayList(Landroid/os/Parcelable$Creator;)Ljava/util/ArrayList;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Le0/a/b/b/b/a;->y(Ljava/util/List;)V
+
+    return v1
+
+    :pswitch_9
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    sget-object p1, Landroid/support/v4/media/MediaMetadataCompat;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Landroid/support/v4/media/MediaMetadataCompat;
+
+    :cond_3
+    invoke-interface {p0, v0}, Le0/a/b/b/b/a;->V(Landroid/support/v4/media/MediaMetadataCompat;)V
+
+    return v1
+
+    :pswitch_a
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    sget-object p1, Landroid/support/v4/media/session/PlaybackStateCompat;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/support/v4/media/session/PlaybackStateCompat;
+
+    :cond_4
+    move-object p1, p0
+
+    check-cast p1, Le0/a/b/b/b/c$b;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return v1
+
+    :pswitch_b
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-interface {p0}, Le0/a/b/b/b/a;->U()V
+
+    return v1
+
+    :pswitch_c
+    invoke-virtual {p2, v2}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readString()Ljava/lang/String;
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    sget-object p1, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p1, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/os/Bundle;
+
+    :cond_5
+    move-object p1, p0
+
+    check-cast p1, Le0/a/b/b/b/c$b;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return v1
+
+    :cond_6
+    invoke-virtual {p3, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    return v1
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_c
+        :pswitch_b
+        :pswitch_a
+        :pswitch_9
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/a.smali b/com.discord/smali/e0/a/b/b/b/a.smali
new file mode 100644
index 0000000000..770c592b67
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/a.smali
@@ -0,0 +1,73 @@
+.class public interface abstract Le0/a/b/b/b/a;
+.super Ljava/lang/Object;
+.source "IMediaControllerCallback.java"
+
+# interfaces
+.implements Landroid/os/IInterface;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/b/b/a$a;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract R(Ljava/lang/CharSequence;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract U()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract V(Landroid/support/v4/media/MediaMetadataCompat;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract u0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract v(Landroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract y(Ljava/util/List;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;",
+            ">;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/b$a$a.smali b/com.discord/smali/e0/a/b/b/b/b$a$a.smali
new file mode 100644
index 0000000000..29286f8580
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/b$a$a.smali
@@ -0,0 +1,98 @@
+.class public Le0/a/b/b/b/b$a$a;
+.super Ljava/lang/Object;
+.source "IMediaSession.java"
+
+# interfaces
+.implements Le0/a/b/b/b/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/b/b/b$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Landroid/os/IBinder;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/IBinder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Le0/a/b/b/b/b$a$a;->a:Landroid/os/IBinder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 1
+
+    iget-object v0, p0, Le0/a/b/b/b/b$a$a;->a:Landroid/os/IBinder;
+
+    return-object v0
+.end method
+
+.method public k(Le0/a/b/b/b/a;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    :try_start_0
+    const-string v2, "android.support.v4.media.session.IMediaSession"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-interface {p1}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeStrongBinder(Landroid/os/IBinder;)V
+
+    iget-object p1, p0, Le0/a/b/b/b/b$a$a;->a:Landroid/os/IBinder;
+
+    const/4 v2, 0x3
+
+    const/4 v3, 0x0
+
+    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/b$a.smali b/com.discord/smali/e0/a/b/b/b/b$a.smali
new file mode 100644
index 0000000000..425ebaa633
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/b$a.smali
@@ -0,0 +1,59 @@
+.class public abstract Le0/a/b/b/b/b$a;
+.super Landroid/os/Binder;
+.source "IMediaSession.java"
+
+# interfaces
+.implements Le0/a/b/b/b/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/b/b/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/b/b/b$a$a;
+    }
+.end annotation
+
+
+# direct methods
+.method public static g(Landroid/os/IBinder;)Le0/a/b/b/b/b;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    const-string v0, "android.support.v4.media.session.IMediaSession"
+
+    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Le0/a/b/b/b/b;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Le0/a/b/b/b/b;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Le0/a/b/b/b/b$a$a;
+
+    invoke-direct {v0, p0}, Le0/a/b/b/b/b$a$a;-><init>(Landroid/os/IBinder;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/b.smali b/com.discord/smali/e0/a/b/b/b/b.smali
new file mode 100644
index 0000000000..4e5076255a
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/b.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Le0/a/b/b/b/b;
+.super Ljava/lang/Object;
+.source "IMediaSession.java"
+
+# interfaces
+.implements Landroid/os/IInterface;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/b/b/b$a;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract k(Le0/a/b/b/b/a;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/c$a.smali b/com.discord/smali/e0/a/b/b/b/c$a.smali
new file mode 100644
index 0000000000..d5bca820f8
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/c$a.smali
@@ -0,0 +1,45 @@
+.class public Le0/a/b/b/b/c$a;
+.super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
+
+# interfaces
+.implements Le0/a/b/b/b/f;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/b/b/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/ref/WeakReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/ref/WeakReference<",
+            "Le0/a/b/b/b/c;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Le0/a/b/b/b/c;)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/lang/ref/WeakReference;
+
+    invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    return-void
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/c$b.smali b/com.discord/smali/e0/a/b/b/b/c$b.smali
new file mode 100644
index 0000000000..43c3fb1f55
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/c$b.smali
@@ -0,0 +1,167 @@
+.class public Le0/a/b/b/b/c$b;
+.super Le0/a/b/b/b/a$a;
+.source "MediaControllerCompat.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/b/b/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/ref/WeakReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/ref/WeakReference<",
+            "Le0/a/b/b/b/c;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Le0/a/b/b/b/c;)V
+    .locals 1
+
+    invoke-direct {p0}, Le0/a/b/b/b/a$a;-><init>()V
+
+    new-instance v0, Ljava/lang/ref/WeakReference;
+
+    invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public R(Ljava/lang/CharSequence;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    iget-object p1, p0, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public U()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public V(Landroid/support/v4/media/MediaMetadataCompat;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    iget-object p1, p0, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public u0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    iget-object p1, p0, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public v(Landroid/os/Bundle;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    iget-object p1, p0, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public y(Ljava/util/List;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;",
+            ">;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    iget-object p1, p0, Le0/a/b/b/b/c$b;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/c.smali b/com.discord/smali/e0/a/b/b/b/c.smali
new file mode 100644
index 0000000000..d4d97deba2
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/c.smali
@@ -0,0 +1,45 @@
+.class public abstract Le0/a/b/b/b/c;
+.super Ljava/lang/Object;
+.source "MediaControllerCompat.java"
+
+# interfaces
+.implements Landroid/os/IBinder$DeathRecipient;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/b/b/c$b;,
+        Le0/a/b/b/b/c$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Le0/a/b/b/b/a;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Le0/a/b/b/b/c$a;
+
+    invoke-direct {v0, p0}, Le0/a/b/b/b/c$a;-><init>(Le0/a/b/b/b/c;)V
+
+    new-instance v1, Le0/a/b/b/b/g;
+
+    invoke-direct {v1, v0}, Le0/a/b/b/b/g;-><init>(Le0/a/b/b/b/f;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public binderDied()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/d.smali b/com.discord/smali/e0/a/b/b/b/d.smali
new file mode 100644
index 0000000000..ce060ea76e
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/d.smali
@@ -0,0 +1,24 @@
+.class public Le0/a/b/b/b/d;
+.super Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;
+.source "MediaControllerCompat.java"
+
+
+# annotations
+.annotation build Landroidx/annotation/RequiresApi;
+    value = 0x17
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/e.smali b/com.discord/smali/e0/a/b/b/b/e.smali
new file mode 100644
index 0000000000..60d1cbc6d8
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/e.smali
@@ -0,0 +1,24 @@
+.class public Le0/a/b/b/b/e;
+.super Le0/a/b/b/b/d;
+.source "MediaControllerCompat.java"
+
+
+# annotations
+.annotation build Landroidx/annotation/RequiresApi;
+    value = 0x18
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Le0/a/b/b/b/d;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/e0/a/b/b/b/f.smali b/com.discord/smali/e0/a/b/b/b/f.smali
new file mode 100644
index 0000000000..b12245ec3d
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/f.smali
@@ -0,0 +1,3 @@
+.class public interface abstract Le0/a/b/b/b/f;
+.super Ljava/lang/Object;
+.source "MediaControllerCompatApi21.java"
diff --git a/com.discord/smali/e0/a/b/b/b/g.smali b/com.discord/smali/e0/a/b/b/b/g.smali
new file mode 100644
index 0000000000..2e07eaff9a
--- /dev/null
+++ b/com.discord/smali/e0/a/b/b/b/g.smali
@@ -0,0 +1,481 @@
+.class public Le0/a/b/b/b/g;
+.super Landroid/media/session/MediaController$Callback;
+.source "MediaControllerCompatApi21.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T::",
+        "Le0/a/b/b/b/f;",
+        ">",
+        "Landroid/media/session/MediaController$Callback;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Le0/a/b/b/b/f;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Le0/a/b/b/b/f;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Landroid/media/session/MediaController$Callback;-><init>()V
+
+    iput-object p1, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onAudioInfoChanged(Landroid/media/session/MediaController$PlaybackInfo;)V
+    .locals 4
+
+    iget-object v0, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getPlaybackType()I
+
+    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getAudioAttributes()Landroid/media/AudioAttributes;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/media/AudioAttributes;->getFlags()I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    and-int/2addr v2, v3
+
+    if-ne v2, v3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v1}, Landroid/media/AudioAttributes;->getFlags()I
+
+    move-result v2
+
+    const/4 v3, 0x4
+
+    and-int/2addr v2, v3
+
+    if-ne v2, v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {v1}, Landroid/media/AudioAttributes;->getUsage()I
+
+    move-result v1
+
+    const/16 v2, 0xd
+
+    if-eq v1, v2, :cond_2
+
+    packed-switch v1, :pswitch_data_0
+
+    :cond_2
+    :goto_0
+    :pswitch_0
+    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getVolumeControl()I
+
+    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getMaxVolume()I
+
+    invoke-virtual {p1}, Landroid/media/session/MediaController$PlaybackInfo;->getCurrentVolume()I
+
+    check-cast v0, Le0/a/b/b/b/c$a;
+
+    iget-object p1, v0, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+
+    :pswitch_data_0
+    .packed-switch 0x2
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public onExtrasChanged(Landroid/os/Bundle;)V
+    .locals 0
+
+    invoke-static {p1}, Landroid/support/v4/media/session/MediaSessionCompat;->a(Landroid/os/Bundle;)V
+
+    iget-object p1, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    check-cast p1, Le0/a/b/b/b/c$a;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public onMetadataChanged(Landroid/media/MediaMetadata;)V
+    .locals 1
+
+    iget-object v0, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    check-cast v0, Le0/a/b/b/b/c$a;
+
+    iget-object v0, v0, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Le0/a/b/b/b/c;
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Landroid/support/v4/media/MediaMetadataCompat;->a(Ljava/lang/Object;)Landroid/support/v4/media/MediaMetadataCompat;
+
+    :cond_0
+    return-void
+.end method
+
+.method public onPlaybackStateChanged(Landroid/media/session/PlaybackState;)V
+    .locals 24
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    iget-object v2, v0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    check-cast v2, Le0/a/b/b/b/c$a;
+
+    iget-object v2, v2, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {v2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Le0/a/b/b/b/c;
+
+    if-eqz v2, :cond_5
+
+    iget-object v2, v2, Le0/a/b/b/b/c;->a:Le0/a/b/b/b/a;
+
+    if-eqz v2, :cond_0
+
+    goto/16 :goto_3
+
+    :cond_0
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_5
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getCustomActions()Ljava/util/List;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_3
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    invoke-interface {v3}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :goto_0
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_1
+
+    new-instance v6, Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction;
+
+    move-object v7, v5
+
+    check-cast v7, Landroid/media/session/PlaybackState$CustomAction;
+
+    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getAction()Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getName()Ljava/lang/CharSequence;
+
+    move-result-object v9
+
+    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getIcon()I
+
+    move-result v10
+
+    invoke-virtual {v7}, Landroid/media/session/PlaybackState$CustomAction;->getExtras()Landroid/os/Bundle;
+
+    move-result-object v7
+
+    invoke-direct {v6, v8, v9, v10, v7}, Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;ILandroid/os/Bundle;)V
+
+    iput-object v5, v6, Landroid/support/v4/media/session/PlaybackStateCompat$CustomAction;->h:Ljava/lang/Object;
+
+    goto :goto_1
+
+    :cond_1
+    move-object v6, v2
+
+    :goto_1
+    invoke-virtual {v4, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    move-object/from16 v20, v4
+
+    goto :goto_2
+
+    :cond_3
+    move-object/from16 v20, v2
+
+    :goto_2
+    sget v3, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v4, 0x16
+
+    if-lt v3, v4, :cond_4
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getExtras()Landroid/os/Bundle;
+
+    move-result-object v2
+
+    :cond_4
+    move-object/from16 v23, v2
+
+    new-instance v2, Landroid/support/v4/media/session/PlaybackStateCompat;
+
+    move-object v7, v2
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getState()I
+
+    move-result v8
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getPosition()J
+
+    move-result-wide v9
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getBufferedPosition()J
+
+    move-result-wide v11
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getPlaybackSpeed()F
+
+    move-result v13
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getActions()J
+
+    move-result-wide v14
+
+    const/16 v16, 0x0
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getErrorMessage()Ljava/lang/CharSequence;
+
+    move-result-object v17
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getLastPositionUpdateTime()J
+
+    move-result-wide v18
+
+    invoke-virtual/range {p1 .. p1}, Landroid/media/session/PlaybackState;->getActiveQueueItemId()J
+
+    move-result-wide v21
+
+    invoke-direct/range {v7 .. v23}, Landroid/support/v4/media/session/PlaybackStateCompat;-><init>(IJJFJILjava/lang/CharSequence;JLjava/util/List;JLandroid/os/Bundle;)V
+
+    iput-object v1, v2, Landroid/support/v4/media/session/PlaybackStateCompat;->o:Ljava/lang/Object;
+
+    :cond_5
+    :goto_3
+    return-void
+.end method
+
+.method public onQueueChanged(Ljava/util/List;)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Landroid/media/session/MediaSession$QueueItem;",
+            ">;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    check-cast v0, Le0/a/b/b/b/c$a;
+
+    iget-object v0, v0, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Le0/a/b/b/b/c;
+
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_1
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :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
+
+    if-eqz v2, :cond_0
+
+    move-object v3, v2
+
+    check-cast v3, Landroid/media/session/MediaSession$QueueItem;
+
+    invoke-virtual {v3}, Landroid/media/session/MediaSession$QueueItem;->getDescription()Landroid/media/MediaDescription;
+
+    move-result-object v4
+
+    invoke-static {v4}, Landroid/support/v4/media/MediaDescriptionCompat;->a(Ljava/lang/Object;)Landroid/support/v4/media/MediaDescriptionCompat;
+
+    move-result-object v4
+
+    invoke-virtual {v3}, Landroid/media/session/MediaSession$QueueItem;->getQueueId()J
+
+    move-result-wide v5
+
+    new-instance v3, Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;
+
+    invoke-direct {v3, v2, v4, v5, v6}, Landroid/support/v4/media/session/MediaSessionCompat$QueueItem;-><init>(Ljava/lang/Object;Landroid/support/v4/media/MediaDescriptionCompat;J)V
+
+    goto :goto_1
+
+    :cond_0
+    move-object v3, v0
+
+    :goto_1
+    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
+
+.method public onQueueTitleChanged(Ljava/lang/CharSequence;)V
+    .locals 0
+
+    iget-object p1, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    check-cast p1, Le0/a/b/b/b/c$a;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public onSessionDestroyed()V
+    .locals 1
+
+    iget-object v0, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    check-cast v0, Le0/a/b/b/b/c$a;
+
+    iget-object v0, v0, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Le0/a/b/b/b/c;
+
+    return-void
+.end method
+
+.method public onSessionEvent(Ljava/lang/String;Landroid/os/Bundle;)V
+    .locals 0
+
+    invoke-static {p2}, Landroid/support/v4/media/session/MediaSessionCompat;->a(Landroid/os/Bundle;)V
+
+    iget-object p1, p0, Le0/a/b/b/b/g;->a:Le0/a/b/b/b/f;
+
+    check-cast p1, Le0/a/b/b/b/c$a;
+
+    iget-object p1, p1, Le0/a/b/b/b/c$a;->a:Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Le0/a/b/b/b/c;
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p1, Le0/a/b/b/b/c;->a:Le0/a/b/b/b/a;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/e0/a/b/c.smali b/com.discord/smali/e0/a/b/c.smali
deleted file mode 100644
index c4ed627778..0000000000
--- a/com.discord/smali/e0/a/b/c.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Le0/a/b/c;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;
-
-.field public final synthetic e:Landroid/net/Uri;
-
-
-# direct methods
-.method public synthetic constructor <init>(Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;Landroid/net/Uri;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Le0/a/b/c;->d:Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;
-
-    iput-object p2, p0, Le0/a/b/c;->e:Landroid/net/Uri;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Le0/a/b/c;->d:Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;
-
-    iget-object v1, p0, Le0/a/b/c;->e:Landroid/net/Uri;
-
-    invoke-virtual {v0, v1}, Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;->a(Landroid/net/Uri;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/e0/a/b/c/a$a$a.smali b/com.discord/smali/e0/a/b/c/a$a$a.smali
new file mode 100644
index 0000000000..9d29b7bfd0
--- /dev/null
+++ b/com.discord/smali/e0/a/b/c/a$a$a.smali
@@ -0,0 +1,98 @@
+.class public Le0/a/b/c/a$a$a;
+.super Ljava/lang/Object;
+.source "IResultReceiver.java"
+
+# interfaces
+.implements Le0/a/b/c/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/c/a$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Landroid/os/IBinder;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/IBinder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Le0/a/b/c/a$a$a;->a:Landroid/os/IBinder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 1
+
+    iget-object v0, p0, Le0/a/b/c/a$a$a;->a:Landroid/os/IBinder;
+
+    return-object v0
+.end method
+
+.method public t0(ILandroid/os/Bundle;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    :try_start_0
+    const-string v1, "android.support.v4.os.IResultReceiver"
+
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    const/4 p1, 0x0
+
+    const/4 v1, 0x1
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {v0, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-virtual {p2, v0, p1}, Landroid/os/Bundle;->writeToParcel(Landroid/os/Parcel;I)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, p1}, Landroid/os/Parcel;->writeInt(I)V
+
+    :goto_0
+    iget-object p1, p0, Le0/a/b/c/a$a$a;->a:Landroid/os/IBinder;
+
+    const/4 p2, 0x0
+
+    invoke-interface {p1, v1, v0, p2, v1}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/e0/a/b/c/a$a.smali b/com.discord/smali/e0/a/b/c/a$a.smali
new file mode 100644
index 0000000000..09a97b51e5
--- /dev/null
+++ b/com.discord/smali/e0/a/b/c/a$a.smali
@@ -0,0 +1,140 @@
+.class public abstract Le0/a/b/c/a$a;
+.super Landroid/os/Binder;
+.source "IResultReceiver.java"
+
+# interfaces
+.implements Le0/a/b/c/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Le0/a/b/c/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/c/a$a$a;
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Landroid/os/Binder;-><init>()V
+
+    const-string v0, "android.support.v4.os.IResultReceiver"
+
+    invoke-virtual {p0, p0, v0}, Landroid/os/Binder;->attachInterface(Landroid/os/IInterface;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static g(Landroid/os/IBinder;)Le0/a/b/c/a;
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    const-string v0, "android.support.v4.os.IResultReceiver"
+
+    invoke-interface {p0, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Le0/a/b/c/a;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Le0/a/b/c/a;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Le0/a/b/c/a$a$a;
+
+    invoke-direct {v0, p0}, Le0/a/b/c/a$a$a;-><init>(Landroid/os/IBinder;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public asBinder()Landroid/os/IBinder;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    const-string v1, "android.support.v4.os.IResultReceiver"
+
+    if-eq p1, v0, :cond_1
+
+    const v2, 0x5f4e5446
+
+    if-eq p1, v2, :cond_0
+
+    invoke-super {p0, p1, p2, p3, p4}, Landroid/os/Binder;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    invoke-virtual {p3, v1}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    return v0
+
+    :cond_1
+    invoke-virtual {p2, v1}, Landroid/os/Parcel;->enforceInterface(Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Landroid/os/Parcel;->readInt()I
+
+    move-result p3
+
+    if-eqz p3, :cond_2
+
+    sget-object p3, Landroid/os/Bundle;->CREATOR:Landroid/os/Parcelable$Creator;
+
+    invoke-interface {p3, p2}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Landroid/os/Bundle;
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p2, 0x0
+
+    :goto_0
+    invoke-interface {p0, p1, p2}, Le0/a/b/c/a;->t0(ILandroid/os/Bundle;)V
+
+    return v0
+.end method
diff --git a/com.discord/smali/e0/a/b/c/a.smali b/com.discord/smali/e0/a/b/c/a.smali
new file mode 100644
index 0000000000..dd4675ef86
--- /dev/null
+++ b/com.discord/smali/e0/a/b/c/a.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Le0/a/b/c/a;
+.super Ljava/lang/Object;
+.source "IResultReceiver.java"
+
+# interfaces
+.implements Landroid/os/IInterface;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Le0/a/b/c/a$a;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract t0(ILandroid/os/Bundle;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/f/a/a/a/a$a.smali b/com.discord/smali/f/a/a/a/a$a.smali
index b0fecf7763..e1812c5d72 100644
--- a/com.discord/smali/f/a/a/a/a$a.smali
+++ b/com.discord/smali/f/a/a/a/a$a.smali
@@ -167,7 +167,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -175,7 +175,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali/f/a/a/a/a$b.smali b/com.discord/smali/f/a/a/a/a$b.smali
index 494f1e79c8..67841952a0 100644
--- a/com.discord/smali/f/a/a/a/a$b.smali
+++ b/com.discord/smali/f/a/a/a/a$b.smali
@@ -110,7 +110,9 @@
 .method public final a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_2
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/a/a/a;
 
@@ -165,13 +167,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/a/a$c.smali b/com.discord/smali/f/a/a/a/a$c.smali
index 1f18b585f4..6d42ea23f2 100644
--- a/com.discord/smali/f/a/a/a/a$c.smali
+++ b/com.discord/smali/f/a/a/a/a$c.smali
@@ -24,12 +24,20 @@
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/DrawableRes;
         .end annotation
     .end param
 
+    const-string v0, "headerText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "bodyText"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput p1, p0, Lf/a/a/a/a$c;->a:I
@@ -64,7 +72,7 @@
 
     iget-object v1, p1, Lf/a/a/a/a$c;->b:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -74,7 +82,7 @@
 
     iget-object p1, p1, Lf/a/a/a/a$c;->c:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/a/a$d.smali b/com.discord/smali/f/a/a/a/a$d.smali
index 27ae48a925..f4091f2f8c 100644
--- a/com.discord/smali/f/a/a/a/a$d.smali
+++ b/com.discord/smali/f/a/a/a/a$d.smali
@@ -42,61 +42,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/a/a$d;
 
-    const-class v2, Lf/a/a/a/a$d;
+    const-string v2, "image"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImage()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "image"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getImage()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/a/a$d;
 
-    const/4 v2, 0x0
+    const-string v2, "header"
 
-    aput-object v1, v0, v2
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/a/a$d;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "header"
-
-    const-string v4, "getHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/a/a$d;
 
-    const-class v2, Lf/a/a/a/a$d;
+    const-string v2, "body"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBody()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "body"
-
-    const-string v4, "getBody()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -120,7 +102,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0713
+    const v0, 0x7f0a0719
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -128,7 +110,7 @@
 
     iput-object v0, p0, Lf/a/a/a/a$d;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0712
+    const v0, 0x7f0a0718
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -136,7 +118,7 @@
 
     iput-object v0, p0, Lf/a/a/a/a$d;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a070f
+    const v0, 0x7f0a0715
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -277,7 +259,7 @@
     const-string v2, ""
 
     :goto_3
-    invoke-static {v2}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v2}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v1
 
diff --git a/com.discord/smali/f/a/a/a/a$e.smali b/com.discord/smali/f/a/a/a/a$e.smali
index 616f74e44f..d9fac1a8eb 100644
--- a/com.discord/smali/f/a/a/a/a$e.smali
+++ b/com.discord/smali/f/a/a/a/a$e.smali
@@ -28,7 +28,7 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/fragment/app/FragmentManager;Ljava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -39,6 +39,14 @@
         }
     .end annotation
 
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "pages"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Landroidx/fragment/app/FragmentStatePagerAdapter;-><init>(Landroidx/fragment/app/FragmentManager;)V
 
     iput-object p2, p0, Lf/a/a/a/a$e;->a:Ljava/util/List;
diff --git a/com.discord/smali/f/a/a/a/a.smali b/com.discord/smali/f/a/a/a/a.smali
index 2ed2ebbde3..fcb300080a 100644
--- a/com.discord/smali/f/a/a/a/a.smali
+++ b/com.discord/smali/f/a/a/a/a.smali
@@ -40,81 +40,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/a/a;
 
-    const-class v2, Lf/a/a/a/a;
+    const-string/jumbo v2, "viewPager"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewPager()Landroidx/viewpager/widget/ViewPager;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewPager"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewPager()Landroidx/viewpager/widget/ViewPager;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/a/a;
 
-    const/4 v2, 0x0
+    const-string v2, "tabDots"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTabDots()Lcom/google/android/material/tabs/TabLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/a/a;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "tabDots"
-
-    const-string v4, "getTabDots()Lcom/google/android/material/tabs/TabLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/a/a;
 
-    const-class v2, Lf/a/a/a/a;
+    const-string v2, "close"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getClose()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "close"
-
-    const-string v4, "getClose()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/a/a;
 
-    const-class v2, Lf/a/a/a/a;
+    const-string v2, "learnMore"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLearnMore()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "learnMore"
-
-    const-string v4, "getLearnMore()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -138,7 +114,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0715
+    const v0, 0x7f0a071b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -146,7 +122,7 @@
 
     iput-object v0, p0, Lf/a/a/a/a;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0711
+    const v0, 0x7f0a0717
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -154,7 +130,7 @@
 
     iput-object v0, p0, Lf/a/a/a/a;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0710
+    const v0, 0x7f0a0716
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -162,7 +138,7 @@
 
     iput-object v0, p0, Lf/a/a/a/a;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0714
+    const v0, 0x7f0a071a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -200,7 +176,7 @@
 
     new-instance v2, Lf/a/a/a/a$c;
 
-    const v3, 0x7f121299
+    const v3, 0x7f1212c4
 
     invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -208,9 +184,9 @@
 
     const-string v4, "getString(R.string.premi\u2026psell_tag_passive_mobile)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f121298
+    const v4, 0x7f1212c3
 
     invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -218,9 +194,9 @@
 
     const-string v5, "getString(R.string.premi\u2026l_tag_description_mobile)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f0804d7
+    const v5, 0x7f0804da
 
     invoke-direct {v2, v5, v3, v4}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -230,7 +206,7 @@
 
     new-instance v2, Lf/a/a/a/a$c;
 
-    const v4, 0x7f12128f
+    const v4, 0x7f1212ba
 
     invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -238,9 +214,9 @@
 
     const-string v5, "getString(R.string.premi\u2026ell_emoji_passive_mobile)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12128e
+    const v5, 0x7f1212b9
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -248,9 +224,9 @@
 
     const-string v6, "getString(R.string.premi\u2026emoji_description_mobile)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f08049c
+    const v6, 0x7f08049f
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -258,7 +234,7 @@
 
     new-instance v2, Lf/a/a/a/a$c;
 
-    const v4, 0x7f121288
+    const v4, 0x7f1212b3
 
     invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -266,9 +242,9 @@
 
     const-string v5, "getString(R.string.premi\u2026ed_emojis_passive_mobile)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f121287
+    const v5, 0x7f1212b2
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -276,9 +252,9 @@
 
     const-string v6, "getString(R.string.premi\u2026mojis_description_mobile)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f080470
+    const v6, 0x7f080473
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -288,7 +264,7 @@
 
     new-instance v2, Lf/a/a/a/a$c;
 
-    const v5, 0x7f12129d
+    const v5, 0x7f1212c8
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -296,11 +272,11 @@
 
     const-string v6, "getString(R.string.premi\u2026ll_upload_passive_mobile)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v4, v4, [Ljava/lang/Object;
 
-    const v6, 0x7f1206a7
+    const v6, 0x7f1206a9
 
     invoke-virtual {p0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -308,7 +284,7 @@
 
     aput-object v6, v4, v3
 
-    const v6, 0x7f1206a6
+    const v6, 0x7f1206a8
 
     invoke-virtual {p0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -316,7 +292,7 @@
 
     aput-object v6, v4, v0
 
-    const v6, 0x7f12129c
+    const v6, 0x7f1212c7
 
     invoke-virtual {p0, v6, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -324,9 +300,9 @@
 
     const-string v6, "getString(\n             \u2026ium_tier_2)\n            )"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0804d8
+    const v6, 0x7f0804db
 
     invoke-direct {v2, v6, v5, v4}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -336,7 +312,7 @@
 
     new-instance v2, Lf/a/a/a/a$c;
 
-    const v4, 0x7f121285
+    const v4, 0x7f1212b0
 
     invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -344,9 +320,9 @@
 
     const-string v5, "getString(R.string.premi\u2026ed_avatar_passive_mobile)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f121284
+    const v5, 0x7f1212af
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -354,9 +330,9 @@
 
     const-string v6, "getString(R.string.premi\u2026vatar_description_mobile)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f080475
+    const v6, 0x7f080478
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -366,7 +342,7 @@
 
     new-instance v2, Lf/a/a/a/a$c;
 
-    const v4, 0x7f12128b
+    const v4, 0x7f1212b6
 
     invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -374,9 +350,9 @@
 
     const-string v5, "getString(R.string.premi\u2026ell_badge_passive_mobile)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12128a
+    const v5, 0x7f1212b5
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -384,9 +360,9 @@
 
     const-string v6, "getString(R.string.premi\u2026badge_description_mobile)"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f080478
+    const v6, 0x7f08047b
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -420,58 +396,19 @@
 
     move-result-object v4
 
-    const-string v5, ""
+    const-string v5, "<set-?>"
 
-    const-string v6, "extra_header_string"
+    const-string v6, ""
 
-    if-eqz v4, :cond_2
+    const-string v7, "extra_header_string"
 
-    invoke-virtual {v4, v6}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
-
-    move-result v4
-
-    if-ne v4, v0, :cond_2
-
-    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Lf/a/a/a/a$c;
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_1
-
-    invoke-virtual {v7, v6}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v7, v5
-
-    :goto_1
-    iput-object v7, v4, Lf/a/a/a/a$c;->b:Ljava/lang/String;
-
-    :cond_2
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v4
-
-    const-string v7, "extra_body_text"
-
-    if-eqz v4, :cond_4
+    if-eqz v4, :cond_3
 
     invoke-virtual {v4, v7}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
     move-result v4
 
-    if-ne v4, v0, :cond_4
+    if-ne v4, v0, :cond_3
 
     invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -483,20 +420,81 @@
 
     move-result-object v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_1
 
     invoke-virtual {v8, v7}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v8
 
-    if-eqz v8, :cond_3
+    if-eqz v8, :cond_1
 
-    move-object v5, v8
+    goto :goto_1
+
+    :cond_1
+    move-object v8, v6
+
+    :goto_1
+    if-eqz v4, :cond_2
+
+    invoke-static {v8, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v8, v4, Lf/a/a/a/a$c;->b:Ljava/lang/String;
+
+    goto :goto_2
+
+    :cond_2
+    throw p1
 
     :cond_3
-    iput-object v5, v4, Lf/a/a/a/a$c;->c:Ljava/lang/String;
+    :goto_2
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v4
+
+    const-string v8, "extra_body_text"
+
+    if-eqz v4, :cond_6
+
+    invoke-virtual {v4, v8}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+
+    move-result v4
+
+    if-ne v4, v0, :cond_6
+
+    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lf/a/a/a/a$c;
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v9
+
+    if-eqz v9, :cond_4
+
+    invoke-virtual {v9, v8}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v9
+
+    if-eqz v9, :cond_4
+
+    move-object v6, v9
 
     :cond_4
+    if-eqz v4, :cond_5
+
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v6, v4, Lf/a/a/a/a$c;->c:Ljava/lang/String;
+
+    goto :goto_3
+
+    :cond_5
+    throw p1
+
+    :cond_6
+    :goto_3
     invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object v4
@@ -515,53 +513,53 @@
 
     move-result-object v1
 
-    const/4 v8, 0x0
+    const/4 v6, 0x0
 
-    :goto_2
+    :goto_4
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v9
 
-    if-eqz v9, :cond_8
+    if-eqz v9, :cond_a
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v9
 
-    add-int/lit8 v10, v8, 0x1
+    add-int/lit8 v10, v6, 0x1
 
-    if-ltz v8, :cond_7
+    if-ltz v6, :cond_9
 
     move-object v11, v9
 
     check-cast v11, Lf/a/a/a/a$c;
 
-    if-eq v8, v2, :cond_5
+    if-eq v6, v2, :cond_7
 
-    const/4 v8, 0x1
+    const/4 v6, 0x1
 
-    goto :goto_3
+    goto :goto_5
 
-    :cond_5
-    const/4 v8, 0x0
+    :cond_7
+    const/4 v6, 0x0
 
-    :goto_3
-    if-eqz v8, :cond_6
+    :goto_5
+    if-eqz v6, :cond_8
 
     invoke-interface {v5, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    :cond_6
-    move v8, v10
+    :cond_8
+    move v6, v10
 
-    goto :goto_2
+    goto :goto_4
 
-    :cond_7
+    :cond_9
     invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
 
     throw p1
 
-    :cond_8
-    invoke-static {v4, v5}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    :cond_a
+    invoke-static {v4, v5}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
@@ -579,7 +577,7 @@
 
     move-result-object v0
 
-    :goto_4
+    :goto_6
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
@@ -602,21 +600,25 @@
 
     if-eqz v3, :cond_b
 
-    if-eqz v5, :cond_a
+    const-string v3, "headerText"
 
-    if-eqz v2, :cond_9
+    invoke-static {v5, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "bodyText"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Landroid/os/Bundle;
 
     invoke-direct {v3}, Landroid/os/Bundle;-><init>()V
 
-    const-string v8, "extra_image_id"
+    const-string v6, "extra_image_id"
 
-    invoke-virtual {v3, v8, v4}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+    invoke-virtual {v3, v6, v4}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    invoke-virtual {v3, v6, v5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v3, v7, v5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v3, v7, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v3, v8, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     new-instance v2, Lf/a/a/a/a$d;
 
@@ -626,21 +628,7 @@
 
     invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_4
-
-    :cond_9
-    const-string v0, "bodyText"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_a
-    const-string v0, "headerText"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    goto :goto_6
 
     :cond_b
     throw p1
@@ -654,7 +642,7 @@
 
     const-string v2, "childFragmentManager"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0, v1}, Lf/a/a/a/a$e;-><init>(Landroidx/fragment/app/FragmentManager;Ljava/util/List;)V
 
@@ -666,6 +654,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     iget-object p1, p0, Lf/a/a/a/a;->d:Lkotlin/properties/ReadOnlyProperty;
@@ -761,7 +753,7 @@
     :cond_0
     const-string p1, "pagerAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali/f/a/a/b/a$a.smali b/com.discord/smali/f/a/a/b/a$a.smali
index 9dd190cd2a..e2b5c47bb5 100644
--- a/com.discord/smali/f/a/a/b/a$a.smali
+++ b/com.discord/smali/f/a/a/b/a$a.smali
@@ -63,7 +63,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1207a2
+    const v0, 0x7f1207a4
 
     invoke-virtual {p1, v0}, Lf/a/a/b/b;->removeRelationship(I)V
 
@@ -81,7 +81,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1216ed
+    const v0, 0x7f121717
 
     invoke-virtual {p1, v0}, Lf/a/a/b/b;->removeRelationship(I)V
 
diff --git a/com.discord/smali/f/a/a/b/a$c.smali b/com.discord/smali/f/a/a/b/a$c.smali
index b541a1dbf6..192ff0931d 100644
--- a/com.discord/smali/f/a/a/b/a$c.smali
+++ b/com.discord/smali/f/a/a/b/a$c.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/f/a/a/b/a$d.smali b/com.discord/smali/f/a/a/b/a$d.smali
index 3107f74d51..b5bb9d13ce 100644
--- a/com.discord/smali/f/a/a/b/a$d.smali
+++ b/com.discord/smali/f/a/a/b/a$d.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.dialogs.useractions.UserActionsDialogViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/b/a$e.smali b/com.discord/smali/f/a/a/b/a$e.smali
index 03020c8baf..964011fdc9 100644
--- a/com.discord/smali/f/a/a/b/a$e.smali
+++ b/com.discord/smali/f/a/a/b/a$e.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lf/a/a/b/a$e;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "UserActionsDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/b/b$e$a;",
         "Lkotlin/Unit;",
@@ -29,163 +29,147 @@
 
 # direct methods
 .method public constructor <init>(Lf/a/a/b/a;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lf/a/a/b/a;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string/jumbo v4, "updateView"
+
+    const-string/jumbo v5, "updateView(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$ViewState$Loaded;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lf/a/a/b/a;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$ViewState$Loaded;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 24
+    .locals 23
 
     move-object/from16 v0, p1
 
     check-cast v0, Lf/a/a/b/b$e$a;
 
-    const/4 v1, 0x0
+    const-string v1, "p1"
 
-    if-eqz v0, :cond_3
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v2, p0
+    move-object/from16 v1, p0
 
-    iget-object v3, v2, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v2, v1, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
-    check-cast v3, Lf/a/a/b/a;
+    check-cast v2, Lf/a/a/b/a;
 
-    iget-object v4, v3, Lf/a/a/b/a;->d:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v3, v2, Lf/a/a/b/a;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v5, Lf/a/a/b/a;->k:[Lkotlin/reflect/KProperty;
+    sget-object v4, Lf/a/a/b/a;->k:[Lkotlin/reflect/KProperty;
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    aget-object v5, v5, v6
+    aget-object v4, v4, v5
 
-    invoke-interface {v4, v3, v5}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-interface {v3, v2, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v3
 
-    move-object v7, v4
+    move-object v6, v3
 
-    check-cast v7, Landroid/widget/ImageView;
+    check-cast v6, Landroid/widget/ImageView;
 
-    iget-object v4, v0, Lf/a/a/b/b$e$a;->a:Lcom/discord/models/domain/ModelUser;
+    iget-object v3, v0, Lf/a/a/b/b$e$a;->a:Lcom/discord/models/domain/ModelUser;
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
-    const/4 v14, 0x4
+    const/4 v7, 0x0
 
-    invoke-static {v4, v5, v1, v14, v1}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    const/4 v13, 0x4
 
-    move-result-object v8
+    invoke-static {v3, v4, v7, v13, v7}, Lcom/discord/utilities/icon/IconUtils;->getForUser$default(Lcom/discord/models/domain/ModelUser;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v7
+
+    const/4 v8, 0x0
 
     const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    iget-object v10, v2, Lf/a/a/b/a;->i:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
 
-    iget-object v11, v3, Lf/a/a/b/a;->i:Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
+    const/16 v11, 0xc
 
-    const/16 v12, 0xc
+    const/4 v12, 0x0
 
-    const/4 v13, 0x0
+    invoke-static/range {v6 .. v12}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
-    invoke-static/range {v7 .. v13}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Ljava/lang/String;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    iget-object v3, v2, Lf/a/a/b/a;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    iget-object v1, v3, Lf/a/a/b/a;->e:Lkotlin/properties/ReadOnlyProperty;
+    sget-object v6, Lf/a/a/b/a;->k:[Lkotlin/reflect/KProperty;
 
-    sget-object v4, Lf/a/a/b/a;->k:[Lkotlin/reflect/KProperty;
+    aget-object v4, v6, v4
 
-    aget-object v4, v4, v5
+    invoke-interface {v3, v2, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    invoke-interface {v1, v3, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    move-result-object v3
 
-    move-result-object v1
+    check-cast v3, Landroid/widget/TextView;
 
-    check-cast v1, Landroid/widget/TextView;
+    iget-object v14, v0, Lf/a/a/b/b$e$a;->a:Lcom/discord/models/domain/ModelUser;
 
-    iget-object v15, v0, Lf/a/a/b/b$e$a;->a:Lcom/discord/models/domain/ModelUser;
+    iget-object v15, v0, Lf/a/a/b/b$e$a;->b:Ljava/lang/String;
 
-    iget-object v4, v0, Lf/a/a/b/b$e$a;->b:Ljava/lang/String;
-
-    invoke-virtual {v3}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
-
-    move-result-object v5
-
-    const-string v7, "requireContext()"
-
-    invoke-static {v5, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v18, 0x7f040142
-
-    const v19, 0x7f090003
-
-    const v20, 0x7f0b001e
-
-    const v21, 0x7f040166
-
-    const v22, 0x7f090002
-
-    const v23, 0x7f0b001e
-
-    move-object/from16 v16, v4
-
-    move-object/from16 v17, v5
-
-    invoke-static/range {v15 .. v23}, Lcom/discord/widgets/user/UserNameFormatterKt;->getSpannableForUserNameWithDiscrim(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Landroid/content/Context;IIIIII)Landroid/text/SpannableStringBuilder;
+    invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v4
 
-    invoke-virtual {v1, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    const-string v6, "requireContext()"
 
-    iget-object v1, v3, Lf/a/a/b/a;->f:Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v17, 0x7f040142
+
+    const v18, 0x7f090003
+
+    const v19, 0x7f0b001e
+
+    const v20, 0x7f040166
+
+    const v21, 0x7f090002
+
+    const v22, 0x7f0b001e
+
+    move-object/from16 v16, v4
+
+    invoke-static/range {v14 .. v22}, Lcom/discord/widgets/user/UserNameFormatterKt;->getSpannableForUserNameWithDiscrim(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Landroid/content/Context;IIIIII)Landroid/text/SpannableStringBuilder;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object v3, v2, Lf/a/a/b/a;->f:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v4, Lf/a/a/b/a;->k:[Lkotlin/reflect/KProperty;
 
-    const/4 v5, 0x2
+    const/4 v6, 0x2
 
-    aget-object v4, v4, v5
+    aget-object v4, v4, v6
 
-    invoke-interface {v1, v3, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-interface {v3, v2, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v3
 
-    check-cast v1, Landroid/widget/TextView;
+    check-cast v3, Landroid/widget/TextView;
 
     iget-boolean v4, v0, Lf/a/a/b/b$e$a;->c:Z
 
-    const/16 v5, 0x8
+    const/16 v6, 0x8
 
     if-eqz v4, :cond_0
 
@@ -197,9 +181,9 @@
     const/16 v4, 0x8
 
     :goto_0
-    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v3, v4}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v1, v3, Lf/a/a/b/a;->g:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v3, v2, Lf/a/a/b/a;->g:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v4, Lf/a/a/b/a;->k:[Lkotlin/reflect/KProperty;
 
@@ -207,11 +191,11 @@
 
     aget-object v4, v4, v7
 
-    invoke-interface {v1, v3, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-interface {v3, v2, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v3
 
-    check-cast v1, Landroid/widget/TextView;
+    check-cast v3, Landroid/widget/TextView;
 
     iget-boolean v4, v0, Lf/a/a/b/b$e$a;->d:Z
 
@@ -225,19 +209,19 @@
     const/16 v4, 0x8
 
     :goto_1
-    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v3, v4}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v1, v3, Lf/a/a/b/a;->h:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v3, v2, Lf/a/a/b/a;->h:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v4, Lf/a/a/b/a;->k:[Lkotlin/reflect/KProperty;
 
-    aget-object v4, v4, v14
+    aget-object v4, v4, v13
 
-    invoke-interface {v1, v3, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    invoke-interface {v3, v2, v4}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v2
 
-    check-cast v1, Landroid/widget/TextView;
+    check-cast v2, Landroid/widget/TextView;
 
     iget-boolean v0, v0, Lf/a/a/b/b$e$a;->e:Z
 
@@ -246,21 +230,12 @@
     goto :goto_2
 
     :cond_2
-    const/16 v6, 0x8
+    const/16 v5, 0x8
 
     :goto_2
-    invoke-virtual {v1, v6}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v2, v5}, Landroid/view/View;->setVisibility(I)V
 
     sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object v0
-
-    :cond_3
-    move-object/from16 v2, p0
-
-    const-string v0, "p1"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
diff --git a/com.discord/smali/f/a/a/b/a$f.smali b/com.discord/smali/f/a/a/b/a$f.smali
index 00e3e49d2c..bc3ce14844 100644
--- a/com.discord/smali/f/a/a/b/a$f.smali
+++ b/com.discord/smali/f/a/a/b/a$f.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lf/a/a/b/a$f;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "UserActionsDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/b/b$b;",
         "Lkotlin/Unit;",
@@ -29,53 +29,39 @@
 
 # direct methods
 .method public constructor <init>(Lf/a/a/b/a;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lf/a/a/b/a;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lf/a/a/b/a;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
     check-cast p1, Lf/a/a/b/b$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lf/a/a/b/a;
 
@@ -84,13 +70,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/b/a.smali b/com.discord/smali/f/a/a/b/a.smali
index 444806d74a..8cc0b775e7 100644
--- a/com.discord/smali/f/a/a/b/a.smali
+++ b/com.discord/smali/f/a/a/b/a.smali
@@ -41,101 +41,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/b/a;
 
-    const-class v2, Lf/a/a/b/a;
+    const-string v2, "avatar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "avatar"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getAvatar()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/b/a;
 
-    const/4 v2, 0x0
+    const-string/jumbo v2, "userName"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUserName()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/b/a;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "userName"
-
-    const-string v4, "getUserName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/b/a;
 
-    const-class v2, Lf/a/a/b/a;
+    const-string v2, "blockItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBlockItem()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "blockItem"
-
-    const-string v4, "getBlockItem()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/b/a;
 
-    const-class v2, Lf/a/a/b/a;
+    const-string/jumbo v2, "unblockItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnblockItem()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "unblockItem"
-
-    const-string v4, "getUnblockItem()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/b/a;
 
-    const-class v2, Lf/a/a/b/a;
+    const-string v2, "removeFriendItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRemoveFriendItem()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "removeFriendItem"
-
-    const-string v4, "getRemoveFriendItem()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -159,7 +129,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a09bb
+    const v0, 0x7f0a09bf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +137,7 @@
 
     iput-object v0, p0, Lf/a/a/b/a;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09bf
+    const v0, 0x7f0a09c3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -175,7 +145,7 @@
 
     iput-object v0, p0, Lf/a/a/b/a;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09bc
+    const v0, 0x7f0a09c0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -183,7 +153,7 @@
 
     iput-object v0, p0, Lf/a/a/b/a;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09be
+    const v0, 0x7f0a09c2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -191,7 +161,7 @@
 
     iput-object v0, p0, Lf/a/a/b/a;->g:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09bd
+    const v0, 0x7f0a09c1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -218,9 +188,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -244,7 +214,7 @@
 
     iget p1, p1, Lf/a/a/b/b$b$b;->a:I
 
-    invoke-static {p0, p1, v2, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v2, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppDialog;->dismiss()V
 
@@ -259,7 +229,7 @@
 
     iget p1, p1, Lf/a/a/b/b$b$a;->a:I
 
-    invoke-static {p0, p1, v2, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v2, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppDialog;->dismiss()V
 
@@ -326,7 +296,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026logViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lf/a/a/b/b;
 
@@ -338,6 +308,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     iget-object p1, p0, Lf/a/a/b/a;->f:Lkotlin/properties/ReadOnlyProperty;
@@ -414,31 +388,31 @@
 
     iget-object v0, p0, Lf/a/a/b/a;->j:Lf/a/a/b/b;
 
-    const-string v1, "viewModel"
+    const-string/jumbo v1, "viewModel"
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
     sget-object v3, Lf/a/a/b/a$c;->d:Lf/a/a/b/a$c;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v3, Lf/a/a/b/a$d;->d:Lf/a/a/b/a$d;
 
-    invoke-virtual {v0, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v3, "filter { it is T }.map { it as T }"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -472,7 +446,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -503,12 +477,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/f/a/a/b/b$a.smali b/com.discord/smali/f/a/a/b/b$a.smali
index c54e3f9a17..1772815953 100644
--- a/com.discord/smali/f/a/a/b/b$a.smali
+++ b/com.discord/smali/f/a/a/b/b$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/b/b$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserActionsDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/b/b$d;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,23 +51,25 @@
 
     check-cast p1, Lf/a/a/b/b$d;
 
-    const/4 v0, 0x0
+    const-string v0, "storeState"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/a/b/b$a;->this$0:Lf/a/a/b/b;
+    iget-object v0, p0, Lf/a/a/b/b$a;->this$0:Lf/a/a/b/b;
 
-    if-eqz v1, :cond_5
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_5
 
     iget-object v3, p1, Lf/a/a/b/b$d;->a:Lcom/discord/models/domain/ModelUser;
 
     if-nez v3, :cond_0
 
-    iget-object p1, v1, Lf/a/a/b/b;->d:Lrx/subjects/PublishSubject;
+    iget-object p1, v0, Lf/a/a/b/b;->d:Lrx/subjects/PublishSubject;
 
     new-instance v0, Lf/a/a/b/b$b$a;
 
-    const v1, 0x7f120560
+    const v1, 0x7f120562
 
     invoke-direct {v0, v1}, Lf/a/a/b/b$b$a;-><init>(I)V
 
@@ -126,10 +128,10 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_4
-    move-object v4, v0
+    move-object v4, v1
 
     new-instance p1, Lf/a/a/b/b$e$a;
 
@@ -143,7 +145,7 @@
 
     invoke-direct/range {v2 .. v7}, Lf/a/a/b/b$e$a;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;ZZZ)V
 
-    invoke-virtual {v1, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_3
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -151,12 +153,5 @@
     return-object p1
 
     :cond_5
-    throw v0
-
-    :cond_6
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
diff --git a/com.discord/smali/f/a/a/b/b$c.smali b/com.discord/smali/f/a/a/b/b$c.smali
index 1d0f546a92..d8dafe3dd0 100644
--- a/com.discord/smali/f/a/a/b/b$c.smali
+++ b/com.discord/smali/f/a/a/b/b$c.smali
@@ -50,6 +50,10 @@
         }
     .end annotation
 
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/a/b/b;
 
     iget-wide v0, p0, Lf/a/a/b/b$c;->a:J
@@ -104,7 +108,7 @@
 
     invoke-direct {v5, p0, v9}, Lf/a/a/b/d;-><init>(Lf/a/a/b/b$c;Lcom/discord/stores/StoreGuilds;)V
 
-    invoke-virtual {v4, v5}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v4, v5}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v4
 
@@ -114,7 +118,7 @@
 
     const-string v5, "storeChannels\n          \u2026  .distinctUntilChanged()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v5, Lf/a/a/b/e;->a:Lf/a/a/b/e;
 
@@ -128,7 +132,7 @@
 
     const-string v4, "Observable.combineLatest\u2026  .distinctUntilChanged()"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0, v1, v2, v3}, Lf/a/a/b/b;-><init>(JLcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
diff --git a/com.discord/smali/f/a/a/b/b$e$a.smali b/com.discord/smali/f/a/a/b/b$e$a.smali
index b0114954c0..b798ab93a4 100644
--- a/com.discord/smali/f/a/a/b/b$e$a.smali
+++ b/com.discord/smali/f/a/a/b/b$e$a.smali
@@ -30,6 +30,10 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;ZZZ)V
     .locals 1
 
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lf/a/a/b/b$e;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -64,7 +68,7 @@
 
     iget-object v1, p1, Lf/a/a/b/b$e$a;->a:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -74,7 +78,7 @@
 
     iget-object v1, p1, Lf/a/a/b/b$e$a;->b:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/a/b/b$f.smali b/com.discord/smali/f/a/a/b/b$f.smali
index 28932299f5..094d78a7e7 100644
--- a/com.discord/smali/f/a/a/b/b$f.smali
+++ b/com.discord/smali/f/a/a/b/b$f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/b/b$f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserActionsDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/a/b/b$g.smali b/com.discord/smali/f/a/a/b/b$g.smali
index bcd50c954a..bf9d89025d 100644
--- a/com.discord/smali/f/a/a/b/b$g.smali
+++ b/com.discord/smali/f/a/a/b/b$g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/b/b$g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserActionsDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/utilities/error/Error;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/a/b/b$g;->this$0:Lf/a/a/b/b;
 
@@ -59,7 +61,7 @@
 
     new-instance v0, Lf/a/a/b/b$b$a;
 
-    const v1, 0x7f120560
+    const v1, 0x7f120562
 
     invoke-direct {v0, v1}, Lf/a/a/b/b$b$a;-><init>(I)V
 
@@ -70,13 +72,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/b/b.smali b/com.discord/smali/f/a/a/b/b.smali
index 6397b01f7f..b6797a0d7d 100644
--- a/com.discord/smali/f/a/a/b/b.smali
+++ b/com.discord/smali/f/a/a/b/b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/b/b;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "UserActionsDialogViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lf/a/a/b/b$e;",
         ">;"
     }
@@ -40,7 +40,7 @@
 
 # direct methods
 .method public constructor <init>(JLcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -51,13 +51,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "restAPI"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lf/a/a/b/b$e$b;->a:Lf/a/a/b/b$e$b;
+    const-string v0, "storeObservable"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/a/b/b$e$b;->a:Lf/a/a/b/b$e$b;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-wide p1, p0, Lf/a/a/b/b;->e:J
 
@@ -73,13 +77,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lf/a/a/b/b;
+    move-result-object v0
+
+    const-class v1, Lf/a/a/b/b;
+
+    new-instance v6, Lf/a/a/b/b$a;
+
+    invoke-direct {v6, p0}, Lf/a/a/b/b$a;-><init>(Lf/a/a/b/b;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -87,26 +99,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lf/a/a/b/b$a;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lf/a/a/b/b$a;-><init>(Lf/a/a/b/b;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/f/a/a/b/c.smali b/com.discord/smali/f/a/a/b/c.smali
index 3760a14544..bd447fa0e3 100644
--- a/com.discord/smali/f/a/a/b/c.smali
+++ b/com.discord/smali/f/a/a/b/c.smali
@@ -3,7 +3,7 @@
 .source "UserActionsDialogViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/f/a/a/b/d.smali b/com.discord/smali/f/a/a/b/d.smali
index aaed53dd31..64ad42cb67 100644
--- a/com.discord/smali/f/a/a/b/d.smali
+++ b/com.discord/smali/f/a/a/b/d.smali
@@ -3,7 +3,7 @@
 .source "UserActionsDialogViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,10 +15,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;"
     }
 .end annotation
 
@@ -59,7 +61,7 @@
 
     const-string v2, "channel.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -85,7 +87,7 @@
 
     invoke-direct {v1, p0, p1}, Lf/a/a/b/c;-><init>(Lf/a/a/b/d;Lcom/discord/models/domain/ModelChannel;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -94,9 +96,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali/f/a/a/b/e.smali b/com.discord/smali/f/a/a/b/e.smali
index 5fd24b2935..c5a480b1a2 100644
--- a/com.discord/smali/f/a/a/b/e.smali
+++ b/com.discord/smali/f/a/a/b/e.smali
@@ -20,7 +20,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        "Lf/a/a/b/b$d;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/f/a/a/b/f.smali b/com.discord/smali/f/a/a/b/f.smali
index 210c50a9b7..38ff8c8bd9 100644
--- a/com.discord/smali/f/a/a/b/f.smali
+++ b/com.discord/smali/f/a/a/b/f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/b/f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserActionsDialogViewModel.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,7 +48,7 @@
 
     new-instance v0, Lf/a/a/b/b$b$b;
 
-    const v1, 0x7f1216ec
+    const v1, 0x7f121716
 
     invoke-direct {v0, v1}, Lf/a/a/b/b$b$b;-><init>(I)V
 
diff --git a/com.discord/smali/f/a/a/b/g.smali b/com.discord/smali/f/a/a/b/g.smali
index 9ea9c09f76..3c54adb80f 100644
--- a/com.discord/smali/f/a/a/b/g.smali
+++ b/com.discord/smali/f/a/a/b/g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/b/g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserActionsDialogViewModel.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lcom/discord/utilities/error/Error;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/a/b/g;->this$0:Lf/a/a/b/b;
 
@@ -50,7 +52,7 @@
 
     new-instance v0, Lf/a/a/b/b$b$a;
 
-    const v1, 0x7f120560
+    const v1, 0x7f120562
 
     invoke-direct {v0, v1}, Lf/a/a/b/b$b$a;-><init>(I)V
 
@@ -61,13 +63,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/c/a$a.smali b/com.discord/smali/f/a/a/c/a$a.smali
index cd1c8ff019..5ba9c7ed02 100644
--- a/com.discord/smali/f/a/a/c/a$a.smali
+++ b/com.discord/smali/f/a/a/c/a$a.smali
@@ -43,7 +43,7 @@
 
     iget p1, p0, Lf/a/a/c/a$a;->d:I
 
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
     const/4 v1, 0x1
 
@@ -61,7 +61,7 @@
 
     if-eqz p1, :cond_7
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -93,7 +93,7 @@
     if-eqz v3, :cond_5
 
     :goto_0
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -130,7 +130,7 @@
 
     invoke-direct {v1, v0}, Lf/a/a/c/d$d$a;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
 
-    invoke-virtual {p1, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     sget-object v3, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
@@ -183,14 +183,14 @@
 
     invoke-direct {v0, v2, v1}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;I)V
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_6
     :goto_2
     return-void
 
     :cond_7
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -206,7 +206,7 @@
 
     if-eqz p1, :cond_f
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -249,14 +249,14 @@
 
     invoke-direct {v0, v2, v1}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;I)V
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_e
     :goto_4
     return-void
 
     :cond_f
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/f/a/a/c/a$c.smali b/com.discord/smali/f/a/a/c/a$c.smali
index 8c6021c93e..221147de2c 100644
--- a/com.discord/smali/f/a/a/c/a$c.smali
+++ b/com.discord/smali/f/a/a/c/a$c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/a$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionCancelDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/c/d$d;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     const-string v3, "it"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, v2, Lf/a/a/c/a;->f:Lkotlin/properties/ReadOnlyProperty;
 
@@ -166,12 +166,12 @@
 
     if-eqz v3, :cond_2
 
-    const v3, 0x7f1211ce
+    const v3, 0x7f1211f9
 
     goto :goto_1
 
     :cond_2
-    const v3, 0x7f1211cd
+    const v3, 0x7f1211f8
 
     :goto_1
     iget-object v8, v2, Lf/a/a/c/a;->e:Lkotlin/properties/ReadOnlyProperty;
@@ -192,7 +192,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v5, v5, [Ljava/lang/Object;
 
@@ -208,7 +208,7 @@
 
     move-result-object v13
 
-    invoke-static {v13, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -232,7 +232,7 @@
 
     move-result-object v11
 
-    invoke-static {v11, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
@@ -281,7 +281,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v8, 0x7f1211d8
+    const v8, 0x7f121203
 
     invoke-virtual {v2, v8}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -307,9 +307,9 @@
 
     move-result-object v9
 
-    invoke-static {v9, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v10, 0x7f1211d9
+    const v10, 0x7f121204
 
     new-array v5, v5, [Ljava/lang/Object;
 
@@ -327,7 +327,7 @@
 
     move-result-object v13
 
-    invoke-static {v13, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v14, 0x0
 
@@ -351,7 +351,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v11, 0x0
 
@@ -373,7 +373,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f12107e
+    const v3, 0x7f1210a8
 
     invoke-virtual {v2, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -416,7 +416,7 @@
 
     const/16 v4, 0xc
 
-    invoke-static {v3, v0, v7, v8, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v3, v0, v7, v8, v4}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_5
     invoke-virtual {v2}, Lcom/discord/app/AppDialog;->dismiss()V
diff --git a/com.discord/smali/f/a/a/c/a.smali b/com.discord/smali/f/a/a/c/a.smali
index 9d39d55ec9..1e20950a1d 100644
--- a/com.discord/smali/f/a/a/c/a.smali
+++ b/com.discord/smali/f/a/a/c/a.smali
@@ -41,121 +41,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/a;
 
-    const-class v2, Lf/a/a/c/a;
+    const-string v2, "headerTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "headerTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeaderTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/c/a;
 
-    const/4 v2, 0x0
+    const-string v2, "bodyTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBodyTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/c/a;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "bodyTv"
-
-    const-string v4, "getBodyTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/a;
 
-    const-class v2, Lf/a/a/c/a;
+    const-string v2, "errorTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getErrorTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "errorTv"
-
-    const-string v4, "getErrorTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/a;
 
-    const-class v2, Lf/a/a/c/a;
+    const-string v2, "nevermindBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNevermindBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nevermindBtn"
-
-    const-string v4, "getNevermindBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/a;
 
-    const-class v2, Lf/a/a/c/a;
+    const-string v2, "confirmBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmBtn"
-
-    const-string v4, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/a;
 
-    const-class v2, Lf/a/a/c/a;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "flipper"
-
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -179,7 +143,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a06cf
+    const v0, 0x7f0a06d5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -187,7 +151,7 @@
 
     iput-object v0, p0, Lf/a/a/c/a;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06cb
+    const v0, 0x7f0a06d1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -195,7 +159,7 @@
 
     iput-object v0, p0, Lf/a/a/c/a;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06cd
+    const v0, 0x7f0a06d3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -203,7 +167,7 @@
 
     iput-object v0, p0, Lf/a/a/c/a;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d0
+    const v0, 0x7f0a06d6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +175,7 @@
 
     iput-object v0, p0, Lf/a/a/c/a;->g:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06cc
+    const v0, 0x7f0a06d2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +183,7 @@
 
     iput-object v0, p0, Lf/a/a/c/a;->h:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ce
+    const v0, 0x7f0a06d4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -283,6 +247,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Lf/a/a/c/a;->f()Landroid/view/View;
@@ -363,7 +331,7 @@
 
     const-string v2, "ViewModelProvider(\n     \u2026celViewModel::class.java)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lf/a/a/c/d;
 
@@ -371,7 +339,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -379,9 +347,9 @@
 
     move-result-object v0
 
-    const-string v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -410,18 +378,18 @@
     return-void
 
     :cond_1
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.models.domain.PremiumGuildSubscriptionSlotId /* = kotlin.Long */"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/c/b$a.smali b/com.discord/smali/f/a/a/c/b$a.smali
index 68c40b75eb..26e270a357 100644
--- a/com.discord/smali/f/a/a/c/b$a.smali
+++ b/com.discord/smali/f/a/a/c/b$a.smali
@@ -43,7 +43,7 @@
 
     iget p1, p0, Lf/a/a/c/b$a;->d:I
 
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
     const/4 v1, 0x1
 
@@ -61,7 +61,7 @@
 
     if-eqz p1, :cond_6
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -69,7 +69,7 @@
 
     sget-object v3, Lf/a/a/c/h$d$c;->a:Lf/a/a/c/h$d$c;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -82,7 +82,7 @@
 
     if-eqz v3, :cond_3
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -94,7 +94,7 @@
 
     if-nez v0, :cond_5
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -117,7 +117,7 @@
 
     move-result-object v1
 
-    invoke-virtual {p1, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     iget-object v7, v0, Lf/a/a/c/h$d$b;->a:Lcom/discord/models/domain/ModelSubscription;
 
@@ -162,11 +162,11 @@
     goto :goto_1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.dialogs.premiumguild.PremiumGuildSubscriptionUncancelViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -187,14 +187,14 @@
 
     invoke-direct {v0, v2, v1}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;I)V
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_5
     :goto_1
     return-void
 
     :cond_6
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -210,7 +210,7 @@
 
     if-eqz p1, :cond_c
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -218,7 +218,7 @@
 
     sget-object v3, Lf/a/a/c/h$d$c;->a:Lf/a/a/c/h$d$c;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -243,14 +243,14 @@
 
     invoke-direct {v0, v2, v1}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;I)V
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_b
     :goto_3
     return-void
 
     :cond_c
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali/f/a/a/c/b$c.smali b/com.discord/smali/f/a/a/c/b$c.smali
index 47303b51ae..22ffd90ae2 100644
--- a/com.discord/smali/f/a/a/c/b$c.smali
+++ b/com.discord/smali/f/a/a/c/b$c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/b$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionUncancelDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/c/h$d;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lf/a/a/c/b;->j:Lkotlin/properties/ReadOnlyProperty;
 
@@ -194,7 +194,7 @@
 
     sget-object v1, Lf/a/a/c/h$d$c;->a:Lf/a/a/c/h$d$c;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -224,7 +224,7 @@
 
     sget-object v1, Lf/a/a/c/h$d$c;->a:Lf/a/a/c/h$d$c;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -247,7 +247,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    const v1, 0x7f1211f0
+    const v1, 0x7f12121b
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -267,7 +267,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    const v1, 0x7f1211ed
+    const v1, 0x7f121218
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -280,7 +280,7 @@
     :cond_7
     sget-object v1, Lf/a/a/c/h$d$d;->a:Lf/a/a/c/h$d$d;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -298,7 +298,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    const v1, 0x7f1211ec
+    const v1, 0x7f121217
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -334,7 +334,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    const v1, 0x7f1211eb
+    const v1, 0x7f121216
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -346,7 +346,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f12107e
+    const v1, 0x7f1210a8
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -373,7 +373,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {v0, p1, v5, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {v0, p1, v5, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     :cond_9
     invoke-virtual {v0}, Lcom/discord/app/AppDialog;->dismiss()V
diff --git a/com.discord/smali/f/a/a/c/b.smali b/com.discord/smali/f/a/a/c/b.smali
index 78180c3e1a..5996fcce41 100644
--- a/com.discord/smali/f/a/a/c/b.smali
+++ b/com.discord/smali/f/a/a/c/b.smali
@@ -43,141 +43,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/b;
 
-    const-class v2, Lf/a/a/c/b;
+    const-string v2, "headerTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "headerTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeaderTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/c/b;
 
-    const/4 v2, 0x0
+    const-string v2, "bodyTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBodyTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/c/b;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "bodyTv"
-
-    const-string v4, "getBodyTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/b;
 
-    const-class v2, Lf/a/a/c/b;
+    const-string v2, "errorTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getErrorTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "errorTv"
-
-    const-string v4, "getErrorTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/b;
 
-    const-class v2, Lf/a/a/c/b;
+    const-string v2, "nevermindBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNevermindBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nevermindBtn"
-
-    const-string v4, "getNevermindBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/b;
 
-    const-class v2, Lf/a/a/c/b;
+    const-string v2, "confirmBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmBtn"
-
-    const-string v4, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/b;
 
-    const-class v2, Lf/a/a/c/b;
+    const-string v2, "successIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSuccessIv()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "successIv"
-
-    const-string v4, "getSuccessIv()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/b;
 
-    const-class v2, Lf/a/a/c/b;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "flipper"
-
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -201,7 +159,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a06d5
+    const v0, 0x7f0a06db
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +167,7 @@
 
     iput-object v0, p0, Lf/a/a/c/b;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d1
+    const v0, 0x7f0a06d7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +175,7 @@
 
     iput-object v0, p0, Lf/a/a/c/b;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d3
+    const v0, 0x7f0a06d9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +183,7 @@
 
     iput-object v0, p0, Lf/a/a/c/b;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d7
+    const v0, 0x7f0a06dd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +191,7 @@
 
     iput-object v0, p0, Lf/a/a/c/b;->g:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d2
+    const v0, 0x7f0a06d8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +199,7 @@
 
     iput-object v0, p0, Lf/a/a/c/b;->h:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d6
+    const v0, 0x7f0a06dc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +207,7 @@
 
     iput-object v0, p0, Lf/a/a/c/b;->i:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d4
+    const v0, 0x7f0a06da
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -313,6 +271,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Lf/a/a/c/b;->f()Landroid/view/View;
@@ -393,7 +355,7 @@
 
     const-string v2, "ViewModelProvider(\n     \u2026celViewModel::class.java)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lf/a/a/c/h;
 
@@ -401,7 +363,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -409,9 +371,9 @@
 
     move-result-object v0
 
-    const-string v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+    const-string/jumbo v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -440,18 +402,18 @@
     return-void
 
     :cond_1
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.discord.models.domain.PremiumGuildSubscriptionSlotId /* = kotlin.Long */"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/c/c$a.smali b/com.discord/smali/f/a/a/c/c$a.smali
index e704ccd94d..55bd1fdc9a 100644
--- a/com.discord/smali/f/a/a/c/c$a.smali
+++ b/com.discord/smali/f/a/a/c/c$a.smali
@@ -40,9 +40,25 @@
         }
     .end annotation
 
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "resources"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildName"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dismissListener"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     if-eqz p5, :cond_0
 
-    const v0, 0x7f120b3a
+    const v0, 0x7f120b60
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -51,7 +67,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120b2b
+    const v0, 0x7f120b51
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -60,7 +76,7 @@
     :goto_0
     const-string v1, "if (isTransfer) {\n      \u2026e max-line-length\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -70,9 +86,9 @@
 
     if-eqz p5, :cond_1
 
-    const p5, 0x7f100092
+    const p5, 0x7f100094
 
-    const v4, 0x7f120b3b
+    const v4, 0x7f120b61
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -99,9 +115,9 @@
     goto :goto_1
 
     :cond_1
-    const p5, 0x7f100090
+    const p5, 0x7f100092
 
-    const v4, 0x7f120b2c
+    const v4, 0x7f120b52
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -128,7 +144,7 @@
     :goto_1
     const-string p3, "if (isTransfer) {\n      \u2026      )\n        )\n      }"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Lf/a/a/c/c;
 
diff --git a/com.discord/smali/f/a/a/c/c.smali b/com.discord/smali/f/a/a/c/c.smali
index 18ea6b24aa..9cdcfed550 100644
--- a/com.discord/smali/f/a/a/c/c.smali
+++ b/com.discord/smali/f/a/a/c/c.smali
@@ -47,81 +47,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/c;
 
-    const-class v2, Lf/a/a/c/c;
+    const-string v2, "gemLottie"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGemLottie()Lcom/airbnb/lottie/LottieAnimationView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "gemLottie"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getGemLottie()Lcom/airbnb/lottie/LottieAnimationView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/c/c;
 
-    const/4 v2, 0x0
+    const-string v2, "body1Text"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBody1Text()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/c/c;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "body1Text"
-
-    const-string v4, "getBody1Text()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/c;
 
-    const-class v2, Lf/a/a/c/c;
+    const-string v2, "body2Text"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBody2Text()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "body2Text"
-
-    const-string v4, "getBody2Text()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/c/c;
 
-    const-class v2, Lf/a/a/c/c;
+    const-string v2, "okButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOkButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "okButton"
-
-    const-string v4, "getOkButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -155,7 +131,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a06c9
+    const v0, 0x7f0a06cf
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +139,7 @@
 
     iput-object v0, p0, Lf/a/a/c/c;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c7
+    const v0, 0x7f0a06cd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -171,7 +147,7 @@
 
     iput-object v0, p0, Lf/a/a/c/c;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c8
+    const v0, 0x7f0a06ce
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +155,7 @@
 
     iput-object v0, p0, Lf/a/a/c/c;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ca
+    const v0, 0x7f0a06d0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -203,7 +179,9 @@
 .method public onDismiss(Landroid/content/DialogInterface;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "dialog"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/c/c;->h:Lkotlin/jvm/functions/Function0;
 
@@ -219,15 +197,6 @@
     invoke-super {p0, p1}, Landroidx/fragment/app/DialogFragment;->onDismiss(Landroid/content/DialogInterface;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -257,7 +226,7 @@
 
     const-string v9, "requireContext()"
 
-    invoke-static {v2, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
@@ -281,6 +250,10 @@
     move-object v3, v10
 
     :goto_0
+    const-string v4, "arguments?.getString(EXTRA_BODY1_TEXT) ?: \"\""
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -317,7 +290,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
@@ -339,6 +312,10 @@
     move-object v3, v10
 
     :goto_1
+    const-string v4, "arguments?.getString(EXTRA_BODY2_TEXT) ?: \"\""
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
diff --git a/com.discord/smali/f/a/a/c/d$a.smali b/com.discord/smali/f/a/a/c/d$a.smali
index 1f183c5b4f..214d4aa477 100644
--- a/com.discord/smali/f/a/a/c/d$a.smali
+++ b/com.discord/smali/f/a/a/c/d$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/d$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionCancelViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/c/d$c;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,19 +51,21 @@
 
     check-cast p1, Lf/a/a/c/d$c;
 
-    const/4 v0, 0x0
+    const-string v0, "storeState"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/a/c/d$a;->this$0:Lf/a/a/c/d;
+    iget-object v0, p0, Lf/a/a/c/d$a;->this$0:Lf/a/a/c/d;
 
-    if-eqz v1, :cond_b
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_b
 
     iget-object v2, p1, Lf/a/a/c/d$c;->a:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
     iget-object p1, p1, Lf/a/a/c/d$c;->b:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-virtual {v1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {v0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -71,7 +73,7 @@
 
     if-nez v3, :cond_a
 
-    invoke-virtual {v1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {v0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -95,7 +97,7 @@
     :cond_1
     instance-of v3, v2, Lcom/discord/stores/StorePremiumGuildSubscription$State$Failure;
 
-    const v4, 0x7f1211d2
+    const v4, 0x7f1211fd
 
     if-nez v3, :cond_8
 
@@ -120,7 +122,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -132,14 +134,14 @@
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-direct {p1, v0}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;)V
+    invoke-direct {p1, v1}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;)V
 
     goto :goto_3
 
     :cond_3
-    invoke-virtual {v1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {v0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -147,11 +149,11 @@
 
     if-eqz v3, :cond_4
 
-    new-instance v0, Lf/a/a/c/d$d$b;
+    new-instance v1, Lf/a/a/c/d$d$b;
 
-    invoke-direct {v0, p1}, Lf/a/a/c/d$d$b;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {v1, p1}, Lf/a/a/c/d$d$b;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
 
-    move-object p1, v0
+    move-object p1, v1
 
     goto :goto_3
 
@@ -164,7 +166,7 @@
 
     move-result-object v2
 
-    iget-wide v4, v1, Lf/a/a/c/d;->d:J
+    iget-wide v4, v0, Lf/a/a/c/d;->d:J
 
     invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -186,24 +188,24 @@
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
-    move-result-wide v4
+    move-result-wide v1
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_5
-    if-eqz v0, :cond_6
+    if-eqz v1, :cond_6
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :cond_6
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    invoke-direct {v3, p1, v0}, Lf/a/a/c/d$d$e;-><init>(Lcom/discord/models/domain/ModelSubscription;Z)V
+    invoke-direct {v3, p1, v1}, Lf/a/a/c/d$d$e;-><init>(Lcom/discord/models/domain/ModelSubscription;Z)V
 
     move-object p1, v3
 
@@ -214,9 +216,9 @@
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-direct {p1, v0}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;)V
+    invoke-direct {p1, v1}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;)V
 
     goto :goto_3
 
@@ -226,9 +228,9 @@
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-direct {p1, v0}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;)V
+    invoke-direct {p1, v1}, Lf/a/a/c/d$d$c;-><init>(Ljava/lang/Integer;)V
 
     goto :goto_3
 
@@ -237,7 +239,7 @@
     sget-object p1, Lf/a/a/c/d$d$f;->f:Lf/a/a/c/d$d$f;
 
     :goto_3
-    invoke-virtual {v1, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_a
     :goto_4
@@ -246,12 +248,5 @@
     return-object p1
 
     :cond_b
-    throw v0
-
-    :cond_c
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
diff --git a/com.discord/smali/f/a/a/c/d$b.smali b/com.discord/smali/f/a/a/c/d$b.smali
index a29d933df9..935ccd3d29 100644
--- a/com.discord/smali/f/a/a/c/d$b.smali
+++ b/com.discord/smali/f/a/a/c/d$b.smali
@@ -35,7 +35,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 7
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -46,9 +46,13 @@
         }
     .end annotation
 
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/a/c/d;
 
-    iget-wide v1, p0, Lf/a/a/c/d$b;->a:J
+    iget-wide v2, p0, Lf/a/a/c/d$b;->a:J
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -56,23 +60,23 @@
 
     move-result-object v0
 
-    const/4 v3, 0x1
+    const/4 v1, 0x0
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    invoke-static {v0, v4, v3, v4}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v1, v4, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
 
-    move-result-object v3
+    move-result-object v1
 
-    invoke-virtual {v3}, Lcom/discord/stores/StoreSubscriptions;->getSubscriptions()Lrx/Observable;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreSubscriptions;->getSubscriptions()Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v1
 
     sget-object v4, Lf/a/a/c/e;->d:Lf/a/a/c/e;
 
@@ -87,35 +91,35 @@
     :cond_0
     check-cast v4, Lrx/functions/Func2;
 
-    invoke-static {v0, v3, v4}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-static {v0, v1, v4}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
-    move-result-object v6
+    move-result-object v7
 
     const-string v0, "Observable.combineLatest\u2026     ::StoreState\n      )"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
-    move-result-object v3
+    move-result-object v4
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v5
+    move-result-object v6
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v6}, Lf/a/a/c/d;-><init>(JLcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/a/c/d;-><init>(JLcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/a/c/d$c.smali b/com.discord/smali/f/a/a/c/d$c.smali
index accf308c9e..2996c2a024 100644
--- a/com.discord/smali/f/a/a/c/d$c.smali
+++ b/com.discord/smali/f/a/a/c/d$c.smali
@@ -22,7 +22,15 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "premiumGuildSubscriptionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "subscriptionState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +58,7 @@
 
     iget-object v1, p1, Lf/a/a/c/d$c;->a:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -60,7 +68,7 @@
 
     iget-object p1, p1, Lf/a/a/c/d$c;->b:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/c/d$d$a.smali b/com.discord/smali/f/a/a/c/d$d$a.smali
index 9e57c8db20..68588afc6d 100644
--- a/com.discord/smali/f/a/a/c/d$d$a.smali
+++ b/com.discord/smali/f/a/a/c/d$d$a.smali
@@ -20,38 +20,31 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
-    const/4 v4, 0x1
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x1
 
     const/4 v6, 0x0
 
-    move-object v0, p0
+    const/4 v7, 0x0
 
-    invoke-direct/range {v0 .. v6}, Lf/a/a/c/d$d;-><init>(ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v7}, Lf/a/a/c/d$d;-><init>(ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lf/a/a/c/d$d$a;->f:Lcom/discord/models/domain/ModelSubscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -71,7 +64,7 @@
 
     iget-object p1, p1, Lf/a/a/c/d$d$a;->f:Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/c/d$d$b.smali b/com.discord/smali/f/a/a/c/d$d$b.smali
index 2f8cd33be1..fddc735830 100644
--- a/com.discord/smali/f/a/a/c/d$d$b.smali
+++ b/com.discord/smali/f/a/a/c/d$d$b.smali
@@ -20,11 +20,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;)V
-    .locals 7
+    .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -32,26 +32,19 @@
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x1
 
-    move-object v0, p0
+    const/4 v7, 0x0
 
-    invoke-direct/range {v0 .. v6}, Lf/a/a/c/d$d;-><init>(ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v7}, Lf/a/a/c/d$d;-><init>(ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lf/a/a/c/d$d$b;->f:Lcom/discord/models/domain/ModelSubscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -71,7 +64,7 @@
 
     iget-object p1, p1, Lf/a/a/c/d$d$b;->f:Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/c/d$d$c.smali b/com.discord/smali/f/a/a/c/d$d$c.smali
index 732f47a54c..ed7e7ef5f4 100644
--- a/com.discord/smali/f/a/a/c/d$d$c.smali
+++ b/com.discord/smali/f/a/a/c/d$d$c.smali
@@ -88,7 +88,7 @@
 
     iget-object p1, p1, Lf/a/a/c/d$d$c;->f:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/c/d$d$d.smali b/com.discord/smali/f/a/a/c/d$d$d.smali
index db047303f0..de69a6d339 100644
--- a/com.discord/smali/f/a/a/c/d$d$d.smali
+++ b/com.discord/smali/f/a/a/c/d$d$d.smali
@@ -60,7 +60,7 @@
 
     iget-object p1, p1, Lf/a/a/c/d$d$d;->f:Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/c/d$d$e.smali b/com.discord/smali/f/a/a/c/d$d$e.smali
index 85365df6a2..03cb251d7b 100644
--- a/com.discord/smali/f/a/a/c/d$d$e.smali
+++ b/com.discord/smali/f/a/a/c/d$d$e.smali
@@ -22,23 +22,27 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;Z)V
-    .locals 7
+    .locals 8
 
-    const/4 v1, 0x0
+    const-string v0, "subscription"
 
-    const/4 v2, 0x1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x1
 
-    const/4 v4, 0x0
+    const/4 v4, 0x1
 
-    const/4 v5, 0x1
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x1
 
-    move-object v0, p0
+    const/4 v7, 0x0
 
-    invoke-direct/range {v0 .. v6}, Lf/a/a/c/d$d;-><init>(ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v7}, Lf/a/a/c/d$d;-><init>(ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lf/a/a/c/d$d$e;->f:Lcom/discord/models/domain/ModelSubscription;
 
@@ -64,7 +68,7 @@
 
     iget-object v1, p1, Lf/a/a/c/d$d$e;->f:Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/a/c/d.smali b/com.discord/smali/f/a/a/c/d.smali
index d7790d9353..a75c46362c 100644
--- a/com.discord/smali/f/a/a/c/d.smali
+++ b/com.discord/smali/f/a/a/c/d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/d;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "PremiumGuildSubscriptionCancelViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lf/a/a/c/d$d;",
         ">;"
     }
@@ -33,7 +33,7 @@
 
 # direct methods
 .method public constructor <init>(JLcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
-    .locals 14
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -46,92 +46,71 @@
         }
     .end annotation
 
-    move-object v0, p0
+    const-string v0, "storePremiumGuildSubscription"
 
-    move-object/from16 v1, p3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v2, p4
+    const-string v0, "storeSubscriptions"
 
-    move-object/from16 v3, p5
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "api"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeObservable"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/a/c/d$d$f;->f:Lf/a/a/c/d$d$f;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
+
+    iput-wide p1, p0, Lf/a/a/c/d;->d:J
+
+    iput-object p3, p0, Lf/a/a/c/d;->e:Lcom/discord/stores/StorePremiumGuildSubscription;
+
+    iput-object p4, p0, Lf/a/a/c/d;->f:Lcom/discord/stores/StoreSubscriptions;
+
+    iput-object p5, p0, Lf/a/a/c/d;->g:Lcom/discord/utilities/rest/RestAPI;
+
+    invoke-virtual {p3}, Lcom/discord/stores/StorePremiumGuildSubscription;->fetchUserGuildPremiumState()V
+
+    iget-object p1, p0, Lf/a/a/c/d;->f:Lcom/discord/stores/StoreSubscriptions;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreSubscriptions;->fetchSubscriptions()V
+
+    invoke-static {p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 p2, 0x0
+
+    const/4 p3, 0x2
+
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-class v1, Lf/a/a/c/d;
+
+    new-instance v6, Lf/a/a/c/d$a;
+
+    invoke-direct {v6, p0}, Lf/a/a/c/d$a;-><init>(Lf/a/a/c/d;)V
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    if-eqz v1, :cond_2
+    const/4 v5, 0x0
 
-    if-eqz v2, :cond_1
-
-    if-eqz v3, :cond_0
-
-    sget-object v5, Lf/a/a/c/d$d$f;->f:Lf/a/a/c/d$d$f;
-
-    invoke-direct {p0, v5}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
-
-    move-wide v5, p1
-
-    iput-wide v5, v0, Lf/a/a/c/d;->d:J
-
-    iput-object v1, v0, Lf/a/a/c/d;->e:Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    iput-object v2, v0, Lf/a/a/c/d;->f:Lcom/discord/stores/StoreSubscriptions;
-
-    iput-object v3, v0, Lf/a/a/c/d;->g:Lcom/discord/utilities/rest/RestAPI;
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/stores/StorePremiumGuildSubscription;->fetchUserGuildPremiumState()V
-
-    iget-object v1, v0, Lf/a/a/c/d;->f:Lcom/discord/stores/StoreSubscriptions;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreSubscriptions;->fetchSubscriptions()V
-
-    invoke-static/range {p6 .. p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object v1
-
-    const/4 v2, 0x2
-
-    invoke-static {v1, p0, v4, v2, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v5
-
-    const-class v6, Lf/a/a/c/d;
-
-    const/4 v7, 0x0
+    const/16 v7, 0x1e
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    new-instance v11, Lf/a/a/c/d$a;
-
-    invoke-direct {v11, p0}, Lf/a/a/c/d$a;-><init>(Lf/a/a/c/d;)V
-
-    const/16 v12, 0x1e
-
-    const/4 v13, 0x0
-
-    invoke-static/range {v5 .. v13}, 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
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "api"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1
-    const-string v1, "storeSubscriptions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_2
-    const-string v1, "storePremiumGuildSubscription"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
diff --git a/com.discord/smali/f/a/a/c/e.smali b/com.discord/smali/f/a/a/c/e.smali
index b26085d947..04af2bbbb5 100644
--- a/com.discord/smali/f/a/a/c/e.smali
+++ b/com.discord/smali/f/a/a/c/e.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lf/a/a/c/e;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "PremiumGuildSubscriptionCancelViewModel.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
         "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
@@ -37,45 +37,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Lf/a/a/c/d$c;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lf/a/a/c/d$c;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
@@ -83,29 +65,17 @@
 
     check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/a/c/d$c;
 
     invoke-direct {v0, p1, p2}, Lf/a/a/c/d$c;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/c/f.smali b/com.discord/smali/f/a/a/c/f.smali
index 729bdd276a..8da7b06bd5 100644
--- a/com.discord/smali/f/a/a/c/f.smali
+++ b/com.discord/smali/f/a/a/c/f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionCancelViewModel.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,9 @@
 
     check-cast p1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;
 
-    if-eqz p1, :cond_2
+    const-string v0, "result"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
@@ -73,7 +75,7 @@
 
     invoke-direct {v0, v1}, Lf/a/a/c/d$d$d;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -86,19 +88,10 @@
 
     invoke-direct {v0, v1}, Lf/a/a/c/d$d$b;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_2
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/c/h$a.smali b/com.discord/smali/f/a/a/c/h$a.smali
index 2e2c28048c..e399f42be1 100644
--- a/com.discord/smali/f/a/a/c/h$a.smali
+++ b/com.discord/smali/f/a/a/c/h$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/h$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionUncancelViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/c/h$c;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,66 +47,66 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
+    .locals 3
 
     check-cast p1, Lf/a/a/c/h$c;
 
-    const/4 v0, 0x0
+    const-string v0, "storeState"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/a/c/h$a;->this$0:Lf/a/a/c/h;
+    iget-object v0, p0, Lf/a/a/c/h$a;->this$0:Lf/a/a/c/h;
 
-    invoke-virtual {v1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {v0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    instance-of v2, v2, Lf/a/a/c/h$d$d;
+    instance-of v1, v1, Lf/a/a/c/h$d$d;
 
-    if-nez v2, :cond_5
+    if-nez v1, :cond_5
 
-    invoke-virtual {v1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {v0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    instance-of v2, v2, Lf/a/a/c/h$d$a;
+    instance-of v1, v1, Lf/a/a/c/h$d$a;
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
     goto :goto_1
 
     :cond_0
     iget-object p1, p1, Lf/a/a/c/h$c;->a:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    instance-of v2, p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;
+    instance-of v1, p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
     sget-object p1, Lf/a/a/c/h$d$c;->a:Lf/a/a/c/h$d$c;
 
     goto :goto_0
 
     :cond_1
-    instance-of v2, p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
+    instance-of v1, p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
 
-    const v3, 0x7f1211d2
+    const v2, 0x7f1211fd
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     new-instance p1, Lf/a/a/c/h$d$a;
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-direct {p1, v0}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;)V
+    invoke-direct {p1, v1}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;)V
 
     goto :goto_0
 
     :cond_2
-    instance-of v2, p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
+    instance-of v1, p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_4
 
     check-cast p1, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
@@ -114,7 +114,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -124,45 +124,40 @@
 
     new-instance p1, Lf/a/a/c/h$d$a;
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-direct {p1, v0}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;)V
+    invoke-direct {p1, v1}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;)V
 
     goto :goto_0
 
     :cond_3
-    new-instance v0, Lf/a/a/c/h$d$b;
+    new-instance v1, Lf/a/a/c/h$d$b;
 
     const/4 v2, 0x0
 
-    invoke-direct {v0, p1, v2, v2}, Lf/a/a/c/h$d$b;-><init>(Lcom/discord/models/domain/ModelSubscription;ZZ)V
+    invoke-direct {v1, p1, v2, v2}, Lf/a/a/c/h$d$b;-><init>(Lcom/discord/models/domain/ModelSubscription;ZZ)V
 
-    move-object p1, v0
+    move-object p1, v1
 
     goto :goto_0
 
     :cond_4
     new-instance p1, Lf/a/a/c/h$d$a;
 
+    const/4 v1, 0x0
+
     const/4 v2, 0x1
 
-    invoke-direct {p1, v0, v2}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;I)V
+    invoke-direct {p1, v1, v2}, Lf/a/a/c/h$d$a;-><init>(Ljava/lang/Integer;I)V
 
     :goto_0
-    invoke-virtual {v1, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_5
     :goto_1
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_6
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/c/h$b.smali b/com.discord/smali/f/a/a/c/h$b.smali
index 971e6bfcac..6da18c8d26 100644
--- a/com.discord/smali/f/a/a/c/h$b.smali
+++ b/com.discord/smali/f/a/a/c/h$b.smali
@@ -35,7 +35,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 7
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -46,27 +46,31 @@
         }
     .end annotation
 
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/a/c/h;
 
-    iget-wide v1, p0, Lf/a/a/c/h$b;->a:J
+    iget-wide v2, p0, Lf/a/a/c/h$b;->a:J
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
 
-    move-result-object v3
+    move-result-object v4
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v5
+    move-result-object v6
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -78,19 +82,19 @@
 
     move-result-object v0
 
-    sget-object v6, Lf/a/a/c/i;->d:Lf/a/a/c/i;
+    sget-object v1, Lf/a/a/c/i;->d:Lf/a/a/c/i;
 
-    invoke-virtual {v0, v6}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
-    move-result-object v6
+    move-result-object v7
 
     const-string v0, "StoreStream\n          .g\u2026().map { StoreState(it) }"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v6}, Lf/a/a/c/h;-><init>(JLcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
+    invoke-direct/range {v1 .. v7}, Lf/a/a/c/h;-><init>(JLcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/a/c/h$c.smali b/com.discord/smali/f/a/a/c/h$c.smali
index 363812e857..6035c5de41 100644
--- a/com.discord/smali/f/a/a/c/h$c.smali
+++ b/com.discord/smali/f/a/a/c/h$c.smali
@@ -20,7 +20,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "subscriptionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +50,7 @@
 
     iget-object p1, p1, Lf/a/a/c/h$c;->a:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/c/h$d$a.smali b/com.discord/smali/f/a/a/c/h$d$a.smali
index f91e6b9ddd..650f222a6c 100644
--- a/com.discord/smali/f/a/a/c/h$d$a.smali
+++ b/com.discord/smali/f/a/a/c/h$d$a.smali
@@ -72,7 +72,7 @@
 
     iget-object p1, p1, Lf/a/a/c/h$d$a;->a:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/c/h$d$b.smali b/com.discord/smali/f/a/a/c/h$d$b.smali
index 72355009fd..33092ed900 100644
--- a/com.discord/smali/f/a/a/c/h$d$b.smali
+++ b/com.discord/smali/f/a/a/c/h$d$b.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "subscription"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lf/a/a/c/h$d;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-boolean p3, p0, Lf/a/a/c/h$d$b;->c:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static a(Lf/a/a/c/h$d$b;Lcom/discord/models/domain/ModelSubscription;ZZI)Lf/a/a/c/h$d$b;
@@ -79,9 +74,11 @@
     iget-boolean p3, p0, Lf/a/a/c/h$d$b;->c:Z
 
     :cond_2
-    if-eqz p0, :cond_4
+    if-eqz p0, :cond_3
 
-    if-eqz p1, :cond_3
+    const-string p0, "subscription"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p0, Lf/a/a/c/h$d$b;
 
@@ -90,13 +87,6 @@
     return-object p0
 
     :cond_3
-    const-string p0, "subscription"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
     throw v0
 .end method
 
@@ -117,7 +107,7 @@
 
     iget-object v1, p1, Lf/a/a/c/h$d$b;->a:Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/a/c/h.smali b/com.discord/smali/f/a/a/c/h.smali
index f969c3dd10..248196d2d6 100644
--- a/com.discord/smali/f/a/a/c/h.smali
+++ b/com.discord/smali/f/a/a/c/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/h;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "PremiumGuildSubscriptionUncancelViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lf/a/a/c/h$d;",
         ">;"
     }
@@ -33,7 +33,7 @@
 
 # direct methods
 .method public constructor <init>(JLcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
-    .locals 14
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -46,88 +46,67 @@
         }
     .end annotation
 
-    move-object v0, p0
+    const-string v0, "storeSubscriptions"
 
-    move-object/from16 v1, p3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v2, p4
+    const-string v0, "storePremiumGuildSubscription"
 
-    move-object/from16 v3, p5
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "restAPI"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeObservable"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/a/c/h$d$c;->a:Lf/a/a/c/h$d$c;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
+
+    iput-wide p1, p0, Lf/a/a/c/h;->d:J
+
+    iput-object p3, p0, Lf/a/a/c/h;->e:Lcom/discord/stores/StoreSubscriptions;
+
+    iput-object p4, p0, Lf/a/a/c/h;->f:Lcom/discord/stores/StorePremiumGuildSubscription;
+
+    iput-object p5, p0, Lf/a/a/c/h;->g:Lcom/discord/utilities/rest/RestAPI;
+
+    invoke-virtual {p3}, Lcom/discord/stores/StoreSubscriptions;->fetchSubscriptions()V
+
+    invoke-static {p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 p2, 0x0
+
+    const/4 p3, 0x2
+
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-class v1, Lf/a/a/c/h;
+
+    new-instance v6, Lf/a/a/c/h$a;
+
+    invoke-direct {v6, p0}, Lf/a/a/c/h$a;-><init>(Lf/a/a/c/h;)V
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    if-eqz v1, :cond_2
+    const/4 v5, 0x0
 
-    if-eqz v2, :cond_1
-
-    if-eqz v3, :cond_0
-
-    sget-object v5, Lf/a/a/c/h$d$c;->a:Lf/a/a/c/h$d$c;
-
-    invoke-direct {p0, v5}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
-
-    move-wide v5, p1
-
-    iput-wide v5, v0, Lf/a/a/c/h;->d:J
-
-    iput-object v1, v0, Lf/a/a/c/h;->e:Lcom/discord/stores/StoreSubscriptions;
-
-    iput-object v2, v0, Lf/a/a/c/h;->f:Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    iput-object v3, v0, Lf/a/a/c/h;->g:Lcom/discord/utilities/rest/RestAPI;
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/stores/StoreSubscriptions;->fetchSubscriptions()V
-
-    invoke-static/range {p6 .. p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object v1
-
-    const/4 v2, 0x2
-
-    invoke-static {v1, p0, v4, v2, v4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v5
-
-    const-class v6, Lf/a/a/c/h;
-
-    const/4 v7, 0x0
+    const/16 v7, 0x1e
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    new-instance v11, Lf/a/a/c/h$a;
-
-    invoke-direct {v11, p0}, Lf/a/a/c/h$a;-><init>(Lf/a/a/c/h;)V
-
-    const/16 v12, 0x1e
-
-    const/4 v13, 0x0
-
-    invoke-static/range {v5 .. v13}, 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
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "restAPI"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1
-    const-string v1, "storePremiumGuildSubscription"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_2
-    const-string v1, "storeSubscriptions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
diff --git a/com.discord/smali/f/a/a/c/i.smali b/com.discord/smali/f/a/a/c/i.smali
index e960999faa..d64cb6346b 100644
--- a/com.discord/smali/f/a/a/c/i.smali
+++ b/com.discord/smali/f/a/a/c/i.smali
@@ -3,7 +3,7 @@
 .source "PremiumGuildSubscriptionUncancelViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
+        "Lf/a/a/c/h$c;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lf/a/a/c/h$c;-><init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
diff --git a/com.discord/smali/f/a/a/c/j.smali b/com.discord/smali/f/a/a/c/j.smali
index cac0a402db..c23287b429 100644
--- a/com.discord/smali/f/a/a/c/j.smali
+++ b/com.discord/smali/f/a/a/c/j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/c/j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumGuildSubscriptionUncancelViewModel.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,9 +46,9 @@
 
     check-cast p1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils$ModifySubscriptionSlotResult;
 
-    const/4 v0, 0x0
+    const-string v0, "result"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
@@ -56,9 +56,9 @@
 
     if-eqz p1, :cond_1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    if-eq p1, v1, :cond_0
+    if-eq p1, v0, :cond_0
 
     const/4 v0, 0x2
 
@@ -69,17 +69,19 @@
     :cond_0
     iget-object p1, p0, Lf/a/a/c/j;->this$0:Lf/a/a/c/h;
 
-    iget-object v2, p0, Lf/a/a/c/j;->$loadedViewState:Lf/a/a/c/h$d$b;
+    iget-object v1, p0, Lf/a/a/c/j;->$loadedViewState:Lf/a/a/c/h$d$b;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
     const/4 v4, 0x3
 
-    invoke-static {v2, v0, v3, v1, v4}, Lf/a/a/c/h$d$b;->a(Lf/a/a/c/h$d$b;Lcom/discord/models/domain/ModelSubscription;ZZI)Lf/a/a/c/h$d$b;
+    invoke-static {v1, v2, v3, v0, v4}, Lf/a/a/c/h$d$b;->a(Lf/a/a/c/h$d$b;Lcom/discord/models/domain/ModelSubscription;ZZI)Lf/a/a/c/h$d$b;
 
     move-result-object v0
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -88,17 +90,10 @@
 
     sget-object v0, Lf/a/a/c/h$d$d;->a:Lf/a/a/c/h$d$d;
 
-    invoke-virtual {p1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_2
-    const-string p1, "result"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/d/a/a$a.smali b/com.discord/smali/f/a/a/d/a/a$a.smali
index 002dc30b5f..c24d65e6ae 100644
--- a/com.discord/smali/f/a/a/d/a/a$a.smali
+++ b/com.discord/smali/f/a/a/d/a/a$a.smali
@@ -139,7 +139,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v1
 
diff --git a/com.discord/smali/f/a/a/d/a/a$b.smali b/com.discord/smali/f/a/a/d/a/a$b.smali
index a49505b26e..f3680423cd 100644
--- a/com.discord/smali/f/a/a/d/a/a$b.smali
+++ b/com.discord/smali/f/a/a/d/a/a$b.smali
@@ -28,6 +28,10 @@
 .method public final a(Landroidx/fragment/app/FragmentManager;)V
     .locals 2
 
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lf/a/a/d/a/a;
 
     invoke-direct {v0}, Lf/a/a/d/a/a;-><init>()V
diff --git a/com.discord/smali/f/a/a/d/a/a$c.smali b/com.discord/smali/f/a/a/d/a/a$c.smali
index 1e48957839..ae273d0632 100644
--- a/com.discord/smali/f/a/a/d/a/a$c.smali
+++ b/com.discord/smali/f/a/a/d/a/a$c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/d/a/a$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AudioOutputSelectionDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/d/a/c$d;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,14 +51,16 @@
 
     check-cast p1, Lf/a/a/d/a/c$d;
 
-    const/4 v0, 0x0
+    const-string/jumbo v0, "viewState"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lf/a/a/d/a/a$c;->this$0:Lf/a/a/d/a/a;
 
     if-eqz v1, :cond_b
 
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     instance-of v0, p1, Lf/a/a/d/a/c$d$b;
 
     if-eqz v0, :cond_0
@@ -264,12 +266,7 @@
     return-object p1
 
     :cond_b
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_c
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/d/a/a.smali b/com.discord/smali/f/a/a/d/a/a.smali
index c661d31262..96a0d09a93 100644
--- a/com.discord/smali/f/a/a/d/a/a.smali
+++ b/com.discord/smali/f/a/a/d/a/a.smali
@@ -39,101 +39,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/d/a/a;
 
-    const-class v2, Lf/a/a/d/a/a;
+    const-string v2, "bluetoothRadioButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBluetoothRadioButton()Landroid/widget/RadioButton;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "bluetoothRadioButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getBluetoothRadioButton()Landroid/widget/RadioButton;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/d/a/a;
 
-    const/4 v2, 0x0
+    const-string v2, "speakerRadioButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSpeakerRadioButton()Landroid/widget/RadioButton;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/d/a/a;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "speakerRadioButton"
-
-    const-string v4, "getSpeakerRadioButton()Landroid/widget/RadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/d/a/a;
 
-    const-class v2, Lf/a/a/d/a/a;
+    const-string/jumbo v2, "wiredRadioButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getWiredRadioButton()Landroid/widget/RadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "wiredRadioButton"
-
-    const-string v4, "getWiredRadioButton()Landroid/widget/RadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/d/a/a;
 
-    const-class v2, Lf/a/a/d/a/a;
+    const-string v2, "earpieceRadioButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEarpieceRadioButton()Landroid/widget/RadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "earpieceRadioButton"
-
-    const-string v4, "getEarpieceRadioButton()Landroid/widget/RadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/d/a/a;
 
-    const-class v2, Lf/a/a/d/a/a;
+    const-string v2, "radioGroup"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRadioGroup()Landroid/widget/RadioGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "radioGroup"
-
-    const-string v4, "getRadioGroup()Landroid/widget/RadioGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -217,7 +187,7 @@
 
     const-string v2, "Observable\n        .time\u2026S, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
@@ -261,9 +231,9 @@
     return-object p0
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -385,7 +355,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026logViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lf/a/a/d/a/c;
 
@@ -397,6 +367,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     const v0, 0x7f040147
@@ -489,7 +463,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -520,9 +494,9 @@
     return-void
 
     :cond_0
-    const-string v0, "viewModel"
+    const-string/jumbo v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/f/a/a/d/a/b.smali b/com.discord/smali/f/a/a/d/a/b.smali
index a5b2afa968..418e66a5fc 100644
--- a/com.discord/smali/f/a/a/d/a/b.smali
+++ b/com.discord/smali/f/a/a/d/a/b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/d/a/b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AudioOutputSelectionDialog.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/a/d/a/c$a.smali b/com.discord/smali/f/a/a/d/a/c$a.smali
index f0dae3b951..4e78d2ba72 100644
--- a/com.discord/smali/f/a/a/d/a/c$a.smali
+++ b/com.discord/smali/f/a/a/d/a/c$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/d/a/c$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AudioOutputSelectionDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/d/a/c$c;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,13 +51,15 @@
 
     check-cast p1, Lf/a/a/d/a/c$c;
 
-    const/4 v0, 0x0
+    const-string v0, "storeState"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/a/d/a/c$a;->this$0:Lf/a/a/d/a/c;
+    iget-object v0, p0, Lf/a/a/d/a/c$a;->this$0:Lf/a/a/d/a/c;
 
-    if-eqz v1, :cond_3
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
 
     iget-object p1, p1, Lf/a/a/d/a/c$c;->a:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
@@ -102,18 +104,18 @@
 
     if-eqz v7, :cond_2
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {v3, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
-    check-cast v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+    check-cast v1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
 
     :cond_2
-    move-object v8, v0
+    move-object v8, v1
 
-    new-instance v0, Lf/a/a/d/a/c$d$a;
+    new-instance v1, Lf/a/a/d/a/c$d$a;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
@@ -137,23 +139,16 @@
 
     move-result v11
 
-    move-object v5, v0
+    move-object v5, v1
 
     invoke-direct/range {v5 .. v11}, Lf/a/a/d/a/c$d$a;-><init>(Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZLcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;ZZZ)V
 
-    invoke-virtual {v1, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 
     :cond_3
-    throw v0
-
-    :cond_4
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
diff --git a/com.discord/smali/f/a/a/d/a/c$b.smali b/com.discord/smali/f/a/a/d/a/c$b.smali
index efd8fb6017..b1b3abaa07 100644
--- a/com.discord/smali/f/a/a/d/a/c$b.smali
+++ b/com.discord/smali/f/a/a/d/a/c$b.smali
@@ -27,8 +27,6 @@
 
     and-int/lit8 p1, p2, 0x1
 
-    const/4 p2, 0x0
-
     if-eqz p1, :cond_0
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -40,23 +38,18 @@
     goto :goto_0
 
     :cond_0
-    move-object p1, p2
+    const/4 p1, 0x0
 
     :goto_0
-    if-eqz p1, :cond_1
+    const-string p2, "storeAudioDevices"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lf/a/a/d/a/c$b;->a:Lcom/discord/stores/StoreAudioDevices;
 
     return-void
-
-    :cond_1
-    const-string p1, "storeAudioDevices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 
@@ -73,6 +66,10 @@
         }
     .end annotation
 
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/a/d/a/c;
 
     iget-object v0, p0, Lf/a/a/d/a/c$b;->a:Lcom/discord/stores/StoreAudioDevices;
@@ -83,13 +80,13 @@
 
     sget-object v2, Lf/a/a/d/a/d;->d:Lf/a/a/d/a/d;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "storeAudioDevices.getAud\u2026tate(audioDevicesState) }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0, v1}, Lf/a/a/d/a/c;-><init>(Lcom/discord/stores/StoreAudioDevices;Lrx/Observable;)V
 
diff --git a/com.discord/smali/f/a/a/d/a/c$c.smali b/com.discord/smali/f/a/a/d/a/c$c.smali
index 5851c52878..74dc0f407a 100644
--- a/com.discord/smali/f/a/a/d/a/c$c.smali
+++ b/com.discord/smali/f/a/a/d/a/c$c.smali
@@ -20,7 +20,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "audioDevicesState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +50,7 @@
 
     iget-object p1, p1, Lf/a/a/d/a/c$c;->a:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/d/a/c$d$a.smali b/com.discord/smali/f/a/a/d/a/c$d$a.smali
index 619858ef69..51a25255ff 100644
--- a/com.discord/smali/f/a/a/d/a/c$d$a.smali
+++ b/com.discord/smali/f/a/a/d/a/c$d$a.smali
@@ -32,9 +32,11 @@
 .method public constructor <init>(Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZLcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;ZZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "selectedAudioOutput"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lf/a/a/d/a/c$d;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -51,13 +53,6 @@
     iput-boolean p6, p0, Lf/a/a/d/a/c$d$a;->f:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "selectedAudioOutput"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -77,7 +72,7 @@
 
     iget-object v1, p1, Lf/a/a/d/a/c$d$a;->a:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -93,7 +88,7 @@
 
     iget-object v1, p1, Lf/a/a/d/a/c$d$a;->c:Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/a/d/a/c.smali b/com.discord/smali/f/a/a/d/a/c.smali
index 42b6ef8847..975a2a5309 100644
--- a/com.discord/smali/f/a/a/d/a/c.smali
+++ b/com.discord/smali/f/a/a/d/a/c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/d/a/c;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "AudioOutputSelectionDialogViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lf/a/a/d/a/c$d;",
         ">;"
     }
@@ -38,24 +38,34 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeAudioDevices"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lf/a/a/d/a/c$d$b;->a:Lf/a/a/d/a/c$d$b;
+    const-string v0, "storeStateObservable"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/a/d/a/c$d$b;->a:Lf/a/a/d/a/c$d$b;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lf/a/a/d/a/c;->d:Lcom/discord/stores/StoreAudioDevices;
 
-    const/4 p1, 0x2
+    const/4 p1, 0x0
 
-    invoke-static {p2, p0, v0, p1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p2, p0, p1, v0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lf/a/a/d/a/c;
 
+    new-instance v7, Lf/a/a/d/a/c$a;
+
+    invoke-direct {v7, p0}, Lf/a/a/d/a/c$a;-><init>(Lf/a/a/d/a/c;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -64,10 +74,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lf/a/a/d/a/c$a;
-
-    invoke-direct {v7, p0}, Lf/a/a/d/a/c$a;-><init>(Lf/a/a/d/a/c;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -75,11 +81,4 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAudioDevices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/d/a/d.smali b/com.discord/smali/f/a/a/d/a/d.smali
index 65ca920431..3995f0813b 100644
--- a/com.discord/smali/f/a/a/d/a/d.smali
+++ b/com.discord/smali/f/a/a/d/a/d.smali
@@ -3,7 +3,7 @@
 .source "AudioOutputSelectionDialogViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+        "Lf/a/a/d/a/c$c;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
     const-string v1, "audioDevicesState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lf/a/a/d/a/c$c;-><init>(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
 
diff --git a/com.discord/smali/f/a/a/e/a$a.smali b/com.discord/smali/f/a/a/e/a$a.smali
index dbab366f12..21ac6b4f51 100644
--- a/com.discord/smali/f/a/a/e/a$a.smali
+++ b/com.discord/smali/f/a/a/e/a$a.smali
@@ -47,9 +47,9 @@
 
     iget v0, p0, Lf/a/a/e/a$a;->d:I
 
-    const-string v1, "v.context"
+    const-string/jumbo v1, "v.context"
 
-    const-string v2, "v"
+    const-string/jumbo v2, "v"
 
     if-eqz v0, :cond_1
 
@@ -61,13 +61,13 @@
 
     check-cast v0, Lf/a/a/e/a;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lf/a/a/e/a$a;->f:Ljava/lang/Object;
 
@@ -87,13 +87,13 @@
 
     check-cast v0, Lf/a/a/e/a;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lf/a/a/e/a$a;->f:Ljava/lang/Object;
 
diff --git a/com.discord/smali/f/a/a/e/a.smali b/com.discord/smali/f/a/a/e/a.smali
index b3ef420408..553614bad1 100644
--- a/com.discord/smali/f/a/a/e/a.smali
+++ b/com.discord/smali/f/a/a/e/a.smali
@@ -35,81 +35,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/e/a;
 
-    const-class v2, Lf/a/a/e/a;
+    const-string v2, "dialogText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogText()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dialogText"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDialogText()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/e/a;
 
-    const/4 v2, 0x0
+    const-string v2, "dialogTrustDomain"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDialogTrustDomain()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/e/a;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dialogTrustDomain"
-
-    const-string v4, "getDialogTrustDomain()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/e/a;
 
-    const-class v2, Lf/a/a/e/a;
+    const-string v2, "dialogConfirm"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogConfirm()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dialogConfirm"
-
-    const-string v4, "getDialogConfirm()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/e/a;
 
-    const-class v2, Lf/a/a/e/a;
+    const-string v2, "dialogCancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogCancel()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dialogCancel"
-
-    const-string v4, "getDialogCancel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -133,7 +109,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a059c
+    const v0, 0x7f0a05a2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +117,7 @@
 
     iput-object v0, p0, Lf/a/a/e/a;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a059f
+    const v0, 0x7f0a05a5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -149,7 +125,7 @@
 
     iput-object v0, p0, Lf/a/a/e/a;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a059e
+    const v0, 0x7f0a05a4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +133,7 @@
 
     iput-object v0, p0, Lf/a/a/e/a;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a059d
+    const v0, 0x7f0a05a3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -280,6 +256,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 5
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
@@ -304,7 +284,7 @@
     :goto_0
     const-string v0, "arguments?.getString(DIALOG_URL) ?: \"\""
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/e/a;->d:Lkotlin/properties/ReadOnlyProperty;
 
@@ -320,7 +300,7 @@
 
     check-cast v0, Lcom/discord/app/AppTextView;
 
-    const v1, 0x7f120ea6
+    const v1, 0x7f120ecc
 
     const/4 v3, 0x1
 
diff --git a/com.discord/smali/f/a/a/f.smali b/com.discord/smali/f/a/a/f.smali
index 5fe5a2b5f6..408d1b6f4b 100644
--- a/com.discord/smali/f/a/a/f.smali
+++ b/com.discord/smali/f/a/a/f.smali
@@ -35,61 +35,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/f;
 
-    const-class v2, Lf/a/a/f;
+    const-string v2, "dialogText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogText()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dialogText"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDialogText()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/f;
 
-    const/4 v2, 0x0
+    const-string v2, "dialogConfirm"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDialogConfirm()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/f;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dialogConfirm"
-
-    const-string v4, "getDialogConfirm()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/f;
 
-    const-class v2, Lf/a/a/f;
+    const-string v2, "dialogCancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogCancel()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dialogCancel"
-
-    const-string v4, "getDialogCancel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -157,7 +139,7 @@
 
     const-string v0, "storeUserSettings\n      \u2026ibilityDetection(allowed)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -190,9 +172,9 @@
     return-void
 
     :cond_0
-    const-string p0, "viewModel"
+    const-string/jumbo p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -228,7 +210,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026logViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lf/a/a/p;
 
@@ -240,6 +222,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 10
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     iget-object p1, p0, Lf/a/a/f;->f:Lkotlin/properties/ReadOnlyProperty;
@@ -302,7 +288,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-array v0, v2, [Ljava/lang/Object;
 
@@ -326,7 +312,7 @@
 
     const-string v0, "getString(\n            R\u2026TY_TRACKING_ID)\n        )"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
diff --git a/com.discord/smali/f/a/a/g$a.smali b/com.discord/smali/f/a/a/g$a.smali
index 47df50d9ad..caf47c1c5c 100644
--- a/com.discord/smali/f/a/a/g$a.smali
+++ b/com.discord/smali/f/a/a/g$a.smali
@@ -63,19 +63,19 @@
 
     move-result-object p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/g$a;->f:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
-    const-string v1, "username"
+    const-string/jumbo v1, "username"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f1204d2
+    const v1, 0x7f1204d4
 
-    invoke-static {p1, v0, v1}, Lf/a/b/n;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+    invoke-static {p1, v0, v1}, Lf/a/b/p;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
     iget-object p1, p0, Lf/a/a/g$a;->e:Ljava/lang/Object;
 
@@ -101,7 +101,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/g$a;->f:Ljava/lang/Object;
 
diff --git a/com.discord/smali/f/a/a/g.smali b/com.discord/smali/f/a/a/g.smali
index 53c13f674a..8e9856870f 100644
--- a/com.discord/smali/f/a/a/g.smali
+++ b/com.discord/smali/f/a/a/g.smali
@@ -33,61 +33,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/g;
 
-    const-class v2, Lf/a/a/g;
+    const-string v2, "dialogHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dialogHeader"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDialogHeader()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/g;
 
-    const/4 v2, 0x0
+    const-string v2, "openInBrowserItem"
 
-    aput-object v1, v0, v2
+    const-string v3, "getOpenInBrowserItem()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/g;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "openInBrowserItem"
-
-    const-string v4, "getOpenInBrowserItem()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/g;
 
-    const-class v2, Lf/a/a/g;
+    const-string v2, "copyUsernameItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCopyUsernameItem()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "copyUsernameItem"
-
-    const-string v4, "getCopyUsernameItem()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -111,7 +93,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a027a
+    const v0, 0x7f0a027d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -119,7 +101,7 @@
 
     iput-object v0, p0, Lf/a/a/g;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a027b
+    const v0, 0x7f0a027e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +109,7 @@
 
     iput-object v0, p0, Lf/a/a/g;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0279
+    const v0, 0x7f0a027c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -151,6 +133,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 11
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppDialog;->getArgumentsOrDefault()Landroid/os/Bundle;
diff --git a/com.discord/smali/f/a/a/h$a.smali b/com.discord/smali/f/a/a/h$a.smali
index 88ec80deff..b97928a7f2 100644
--- a/com.discord/smali/f/a/a/h$a.smali
+++ b/com.discord/smali/f/a/a/h$a.smali
@@ -28,6 +28,10 @@
 .method public final a(Landroidx/fragment/app/FragmentManager;I)V
     .locals 2
 
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Landroid/os/Bundle;
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
diff --git a/com.discord/smali/f/a/a/h.smali b/com.discord/smali/f/a/a/h.smali
index b27ac0898b..83b0e42720 100644
--- a/com.discord/smali/f/a/a/h.smali
+++ b/com.discord/smali/f/a/a/h.smali
@@ -31,41 +31,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/h;
 
-    const-class v2, Lf/a/a/h;
+    const-string v2, "body"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBody()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "body"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getBody()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/h;
 
-    const/4 v2, 0x0
+    const-string v2, "confirmBtn"
 
-    aput-object v1, v0, v2
+    const-string v3, "getConfirmBtn()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/h;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "confirmBtn"
-
-    const-string v4, "getConfirmBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -89,7 +77,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0136
+    const v0, 0x7f0a0139
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -97,7 +85,7 @@
 
     iput-object v0, p0, Lf/a/a/h;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0137
+    const v0, 0x7f0a013a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,7 +173,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f12179e
+    const v3, 0x7f1217c8
 
     new-array v1, v1, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/f/a/a/i$a.smali b/com.discord/smali/f/a/a/i$a.smali
index 1ac5e522ba..3257a88d49 100644
--- a/com.discord/smali/f/a/a/i$a.smali
+++ b/com.discord/smali/f/a/a/i$a.smali
@@ -28,27 +28,33 @@
 .method public final a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;JJ)Lf/a/a/i;
     .locals 3
 
-    new-instance v0, Lf/a/a/i;
+    const-string v0, "fragmentManager"
 
-    invoke-direct {v0}, Lf/a/a/i;-><init>()V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Landroid/os/Bundle;
+    const-string v0, "label"
 
-    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v2, "label"
+    new-instance v1, Lf/a/a/i;
 
-    invoke-virtual {v1, v2, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v1}, Lf/a/a/i;-><init>()V
+
+    new-instance v2, Landroid/os/Bundle;
+
+    invoke-direct {v2}, Landroid/os/Bundle;-><init>()V
+
+    invoke-virtual {v2, v0, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     const-string p2, "initial_date"
 
-    invoke-virtual {v1, p2, p3, p4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v2, p2, p3, p4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     const-string p2, "max_date"
 
-    invoke-virtual {v1, p2, p5, p6}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v2, p2, p5, p6}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v1, v2}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
     const-class p2, Lf/a/a/i;
 
@@ -56,7 +62,7 @@
 
     move-result-object p2
 
-    invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {v1, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
-    return-object v0
+    return-object v1
 .end method
diff --git a/com.discord/smali/f/a/a/i$b.smali b/com.discord/smali/f/a/a/i$b.smali
index 445bb4ae28..75b0043174 100644
--- a/com.discord/smali/f/a/a/i$b.smali
+++ b/com.discord/smali/f/a/a/i$b.smali
@@ -47,7 +47,7 @@
 
     const-string p3, "cal"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/util/Calendar;->getTimeInMillis()J
 
diff --git a/com.discord/smali/f/a/a/i.smali b/com.discord/smali/f/a/a/i.smali
index 50754e12e4..8b4c78bd87 100644
--- a/com.discord/smali/f/a/a/i.smali
+++ b/com.discord/smali/f/a/a/i.smali
@@ -47,61 +47,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/i;
 
-    const-class v2, Lf/a/a/i;
+    const-string v2, "picker"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPicker()Landroid/widget/DatePicker;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "picker"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getPicker()Landroid/widget/DatePicker;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/i;
 
-    const/4 v2, 0x0
+    const-string v2, "title"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/i;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "title"
-
-    const-string v4, "getTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/i;
 
-    const-class v2, Lf/a/a/i;
+    const-string v2, "dismissButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDismissButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dismissButton"
-
-    const-string v4, "getDismissButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -125,7 +107,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a02df
+    const v0, 0x7f0a02e5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -133,7 +115,7 @@
 
     iput-object v0, p0, Lf/a/a/i;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02e0
+    const v0, 0x7f0a02e6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +123,7 @@
 
     iput-object v0, p0, Lf/a/a/i;->g:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02de
+    const v0, 0x7f0a02e4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -291,7 +273,7 @@
 
     const-string v1, "calendar"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v3, p0, Lf/a/a/i;->e:J
 
diff --git a/com.discord/smali/f/a/a/j.smali b/com.discord/smali/f/a/a/j.smali
index cc30ba61d2..23be5dceed 100644
--- a/com.discord/smali/f/a/a/j.smali
+++ b/com.discord/smali/f/a/a/j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendRequestDialogs.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -38,11 +38,13 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/a/j;->$onAccept:Lkotlin/jvm/functions/Function0;
 
@@ -51,13 +53,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/k.smali b/com.discord/smali/f/a/a/k.smali
index b77547232b..5ec5c28f9e 100644
--- a/com.discord/smali/f/a/a/k.smali
+++ b/com.discord/smali/f/a/a/k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendRequestDialogs.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -38,11 +38,13 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/a/k;->$onIgnore:Lkotlin/jvm/functions/Function0;
 
@@ -51,13 +53,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/l.smali b/com.discord/smali/f/a/a/l.smali
index d7894cf34e..947545058d 100644
--- a/com.discord/smali/f/a/a/l.smali
+++ b/com.discord/smali/f/a/a/l.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/l;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FriendRequestDialogs.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,11 +42,13 @@
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/a/l;->$onConfirm:Lkotlin/jvm/functions/Function1;
 
-    const v0, 0x7f1207a9
+    const v0, 0x7f1207ab
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -57,13 +59,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/m$a.smali b/com.discord/smali/f/a/a/m$a.smali
index 5ba556f9b0..166d5eb89a 100644
--- a/com.discord/smali/f/a/a/m$a.smali
+++ b/com.discord/smali/f/a/a/m$a.smali
@@ -28,6 +28,10 @@
 .method public final a(Landroidx/fragment/app/FragmentManager;)V
     .locals 2
 
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lf/a/a/m;
 
     invoke-direct {v0}, Lf/a/a/m;-><init>()V
diff --git a/com.discord/smali/f/a/a/m.smali b/com.discord/smali/f/a/a/m.smali
index 2c4d3aecae..b19e55ad14 100644
--- a/com.discord/smali/f/a/a/m.smali
+++ b/com.discord/smali/f/a/a/m.smali
@@ -29,25 +29,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/m;
 
-    const-class v2, Lf/a/a/m;
+    const-string v2, "confirmBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "confirmBtn"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getConfirmBtn()Landroid/widget/Button;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lf/a/a/m;->e:[Lkotlin/reflect/KProperty;
 
@@ -67,7 +61,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0493
+    const v0, 0x7f0a0499
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
diff --git a/com.discord/smali/f/a/a/n$a.smali b/com.discord/smali/f/a/a/n$a.smali
index a26aeb5ad2..7fd41f016c 100644
--- a/com.discord/smali/f/a/a/n$a.smali
+++ b/com.discord/smali/f/a/a/n$a.smali
@@ -43,6 +43,22 @@
         }
     .end annotation
 
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "title"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "options"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onSelectedListener"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lf/a/a/n;
 
     invoke-direct {v0}, Lf/a/a/n;-><init>()V
@@ -65,7 +81,7 @@
 
     const-class p2, Lf/a/a/n;
 
-    invoke-static {p2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {p2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object p2
 
diff --git a/com.discord/smali/f/a/a/n$b.smali b/com.discord/smali/f/a/a/n$b.smali
index 7994e89151..e4211cc3a9 100644
--- a/com.discord/smali/f/a/a/n$b.smali
+++ b/com.discord/smali/f/a/a/n$b.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public constructor <init>(Lf/a/a/n;Landroid/view/View;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -39,6 +39,10 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p1, p0, Lf/a/a/n$b;->b:Lf/a/a/n;
 
     invoke-direct {p0, p2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
@@ -57,7 +61,9 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/n$b;->a:Landroid/widget/TextView;
 
@@ -72,13 +78,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/n$d.smali b/com.discord/smali/f/a/a/n$d.smali
index 954e72004b..1dc7b4dddf 100644
--- a/com.discord/smali/f/a/a/n$d.smali
+++ b/com.discord/smali/f/a/a/n$d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/n$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SelectorDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,11 +54,13 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const/4 v0, 0x0
+    const-string v0, "inflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0047
 
@@ -74,23 +76,9 @@
 
     const-string v1, "itemView"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, v0, p1}, Lf/a/a/n$b;-><init>(Lf/a/a/n;Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/n.smali b/com.discord/smali/f/a/a/n.smali
index 89776a90c1..3c08ac3966 100644
--- a/com.discord/smali/f/a/a/n.smali
+++ b/com.discord/smali/f/a/a/n.smali
@@ -46,61 +46,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/n;
 
-    const-class v2, Lf/a/a/n;
+    const-string v2, "titleTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "titleTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitleTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/n;
 
-    const/4 v2, 0x0
+    const-string v2, "listRv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getListRv()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/n;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "listRv"
-
-    const-string v4, "getListRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/n;
 
-    const-class v2, Lf/a/a/n;
+    const-string v2, "cancelBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancelBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancelBtn"
-
-    const-string v4, "getCancelBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -124,7 +106,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a02e4
+    const v0, 0x7f0a02ea
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -132,7 +114,7 @@
 
     iput-object v0, p0, Lf/a/a/n;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02e3
+    const v0, 0x7f0a02e9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -140,7 +122,7 @@
 
     iput-object v0, p0, Lf/a/a/n;->f:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ce
+    const v0, 0x7f0a02d4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -194,6 +176,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     iget-object p1, p0, Lf/a/a/n;->e:Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/f/a/a/p$a.smali b/com.discord/smali/f/a/a/p$a.smali
index 0592b78844..198169bbda 100644
--- a/com.discord/smali/f/a/a/p$a.smali
+++ b/com.discord/smali/f/a/a/p$a.smali
@@ -40,6 +40,10 @@
         }
     .end annotation
 
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/a/p;
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
diff --git a/com.discord/smali/f/a/a/p.smali b/com.discord/smali/f/a/a/p.smali
index a491410d00..b98ddd9f33 100644
--- a/com.discord/smali/f/a/a/p.smali
+++ b/com.discord/smali/f/a/a/p.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/p;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetAccessibilityDetectionDialogViewModel.kt"
 
 
@@ -13,7 +13,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lf/a/a/p$b;",
         ">;"
     }
@@ -30,35 +30,23 @@
 .method public constructor <init>(Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreNotices;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeUserSettings"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeNotices"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lf/a/a/p$b$a;->a:Lf/a/a/p$b$a;
 
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lf/a/a/p;->d:Lcom/discord/stores/StoreUserSettings;
 
     iput-object p2, p0, Lf/a/a/p;->e:Lcom/discord/stores/StoreNotices;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeNotices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeUserSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali/f/a/a/q.smali b/com.discord/smali/f/a/a/q.smali
index c40d5e98e6..6ac5ca9e5f 100644
--- a/com.discord/smali/f/a/a/q.smali
+++ b/com.discord/smali/f/a/a/q.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/q;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetAccessibilityDetectionDialogViewModel.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserSettings;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/a/r.smali b/com.discord/smali/f/a/a/r.smali
index e8f6687614..86f0d5856e 100644
--- a/com.discord/smali/f/a/a/r.smali
+++ b/com.discord/smali/f/a/a/r.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/r;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableTwoFactorPasswordDialog.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/r;->$onValidPasswordEntered:Lkotlin/jvm/functions/Function2;
 
@@ -50,19 +52,19 @@
 
     move-result-object v1
 
-    const-string v2, "view.context"
+    const-string/jumbo v2, "view.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0a034a
+    const v2, 0x7f0a0350
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string v2, "view.findViewById<TextIn\u2026ctor_password_view_input)"
+    const-string/jumbo v2, "view.findViewById<TextIn\u2026ctor_password_view_input)"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -75,13 +77,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/s$b.smali b/com.discord/smali/f/a/a/s$b.smali
index af751451f5..e9eff8f0e3 100644
--- a/com.discord/smali/f/a/a/s$b.smali
+++ b/com.discord/smali/f/a/a/s$b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/s$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableTwoFactorPasswordDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,22 +57,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/s$c$a.smali b/com.discord/smali/f/a/a/s$c$a.smali
index 86bb5d85c2..64899ba4b5 100644
--- a/com.discord/smali/f/a/a/s$c$a.smali
+++ b/com.discord/smali/f/a/a/s$c$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/s$c$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableTwoFactorPasswordDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Token;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,22 +57,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/discord/models/domain/ModelUser$Token;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/s$c$b.smali b/com.discord/smali/f/a/a/s$c$b.smali
index 4c5f28051a..8ed4be98bf 100644
--- a/com.discord/smali/f/a/a/s$c$b.smali
+++ b/com.discord/smali/f/a/a/s$c$b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/s$c$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableTwoFactorPasswordDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/utilities/error/Error;
 
-    if-eqz p1, :cond_1
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/s$c$b;->this$0:Lf/a/a/s$c;
 
@@ -71,7 +73,7 @@
 
     const-string v2, "error.response"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -103,13 +105,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/s.smali b/com.discord/smali/f/a/a/s.smali
index ac0aa8cd52..aa229551ad 100644
--- a/com.discord/smali/f/a/a/s.smali
+++ b/com.discord/smali/f/a/a/s.smali
@@ -45,61 +45,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/s;
 
-    const-class v2, Lf/a/a/s;
+    const-string v2, "ok"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOk()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "ok"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getOk()Lcom/discord/views/LoadingButton;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/s;
 
-    const/4 v2, 0x0
+    const-string v2, "cancel"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCancel()Landroid/widget/Button;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/s;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "cancel"
-
-    const-string v4, "getCancel()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/s;
 
-    const-class v2, Lf/a/a/s;
+    const-string v2, "textInputLayout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTextInputLayout()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "textInputLayout"
-
-    const-string v4, "getTextInputLayout()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -123,7 +105,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0349
+    const v0, 0x7f0a034f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -131,7 +113,7 @@
 
     iput-object v0, p0, Lf/a/a/s;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0346
+    const v0, 0x7f0a034c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -139,7 +121,7 @@
 
     iput-object v0, p0, Lf/a/a/s;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a034a
+    const v0, 0x7f0a0350
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,6 +179,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     const/4 v0, 0x0
diff --git a/com.discord/smali/f/a/a/t$b.smali b/com.discord/smali/f/a/a/t$b.smali
index b358a6a5e3..171d89a267 100644
--- a/com.discord/smali/f/a/a/t$b.smali
+++ b/com.discord/smali/f/a/a/t$b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/t$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUrgentMessageDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/v$e;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lf/a/a/v$e;
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/t$b;->this$0:Lf/a/a/t;
 
@@ -69,7 +71,7 @@
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f121561
+    const v2, 0x7f12158b
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -91,7 +93,7 @@
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f121560
+    const v2, 0x7f12158a
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -103,7 +105,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f12107e
+    const v2, 0x7f1210a8
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -132,13 +134,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/t$c.smali b/com.discord/smali/f/a/a/t$c.smali
index 04fe4104d6..17fe35968e 100644
--- a/com.discord/smali/f/a/a/t$c.smali
+++ b/com.discord/smali/f/a/a/t$c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/t$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUrgentMessageDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/v$b;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lf/a/a/v$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/a/t$c;->this$0:Lf/a/a/t;
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/t.smali b/com.discord/smali/f/a/a/t.smali
index 9c6277aeef..b0e7d0899f 100644
--- a/com.discord/smali/f/a/a/t.smali
+++ b/com.discord/smali/f/a/a/t.smali
@@ -35,61 +35,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/t;
 
-    const-class v2, Lf/a/a/t;
+    const-string v2, "dialogHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dialogHeader"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDialogHeader()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/t;
 
-    const/4 v2, 0x0
+    const-string v2, "dialogText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDialogText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/t;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dialogText"
-
-    const-string v4, "getDialogText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/t;
 
-    const-class v2, Lf/a/a/t;
+    const-string v2, "buttonConfirm"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getButtonConfirm()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buttonConfirm"
-
-    const-string v4, "getButtonConfirm()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -113,7 +95,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0a35
+    const v0, 0x7f0a0a39
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +103,7 @@
 
     iput-object v0, p0, Lf/a/a/t;->d:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a36
+    const v0, 0x7f0a0a3a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +111,7 @@
 
     iput-object v0, p0, Lf/a/a/t;->e:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a34
+    const v0, 0x7f0a0a38
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -149,7 +131,7 @@
 
     sget-object v1, Lf/a/a/v$b$a;->a:Lf/a/a/v$b$a;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -162,7 +144,7 @@
     :cond_0
     sget-object v1, Lf/a/a/v$b$b;->a:Lf/a/a/v$b$b;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -172,13 +154,13 @@
 
     move-result-object p0
 
-    const p1, 0x7f120cf1
+    const p1, 0x7f120d17
 
     const/4 v1, 0x0
 
     const/16 v2, 0xc
 
-    invoke-static {p0, p1, v1, v0, v2}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p0, p1, v1, v0, v2}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :goto_0
     return-void
@@ -249,7 +231,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026logViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lf/a/a/v;
 
@@ -279,17 +261,21 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 11
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     iget-object p1, p0, Lf/a/a/t;->g:Lf/a/a/v;
 
-    const-string v0, "viewModel"
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
+    const-string/jumbo v1, "viewModel"
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
@@ -325,7 +311,7 @@
 
     const-string v0, "eventSubject"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -354,12 +340,12 @@
     return-void
 
     :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v1
+    throw v0
 
     :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v1
+    throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/u.smali b/com.discord/smali/f/a/a/u.smali
index cf58672e71..f74d8cb634 100644
--- a/com.discord/smali/f/a/a/u.smali
+++ b/com.discord/smali/f/a/a/u.smali
@@ -36,14 +36,22 @@
 
     const-string v2, "button"
 
-    const-string v3, "button.context"
+    move-object/from16 v3, p1
 
-    move-object/from16 v4, p1
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v4, v2, v3}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v2
 
+    const-string v3, "button.context"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "context"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
@@ -54,7 +62,7 @@
 
     invoke-virtual {v3, v2, v4, v5}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
 
-    invoke-virtual {v1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {v1}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -116,7 +124,7 @@
 
     invoke-direct {v3, v2, v4}, Lf/a/a/v$e;-><init>(Ljava/lang/Integer;Z)V
 
-    invoke-virtual {v1, v3}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v1, v3}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     iget-object v2, v1, Lf/a/a/v;->e:Lcom/discord/utilities/rest/RestAPI;
 
@@ -152,9 +160,9 @@
     return-void
 
     :cond_1
-    const-string v1, "viewModel"
+    const-string/jumbo v1, "viewModel"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/f/a/a/v$a.smali b/com.discord/smali/f/a/a/v$a.smali
index ed19321020..3f6df333ae 100644
--- a/com.discord/smali/f/a/a/v$a.smali
+++ b/com.discord/smali/f/a/a/v$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/v$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUrgentMessageDialogViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/a/v$d;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,30 +51,30 @@
 
     check-cast p1, Lf/a/a/v$d;
 
-    const/4 v0, 0x0
+    const-string v0, "storeState"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/a/v$a;->this$0:Lf/a/a/v;
+    iget-object v0, p0, Lf/a/a/v$a;->this$0:Lf/a/a/v;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     iget-object p1, p1, Lf/a/a/v$d;->a:Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v1}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {v0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object v1
 
-    check-cast v0, Lf/a/a/v$e;
+    check-cast v1, Lf/a/a/v$e;
 
-    if-nez v0, :cond_0
+    if-nez v1, :cond_0
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     goto :goto_0
 
     :cond_0
-    iget-boolean v0, v0, Lf/a/a/v$e;->b:Z
+    iget-boolean v1, v1, Lf/a/a/v$e;->b:Z
 
     :goto_0
     new-instance v2, Lf/a/a/v$e;
@@ -83,21 +83,16 @@
 
     move-result-object p1
 
-    invoke-direct {v2, p1, v0}, Lf/a/a/v$e;-><init>(Ljava/lang/Integer;Z)V
+    invoke-direct {v2, p1, v1}, Lf/a/a/v$e;-><init>(Ljava/lang/Integer;Z)V
 
-    invoke-virtual {v1, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 
     :cond_1
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_2
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/v$c.smali b/com.discord/smali/f/a/a/v$c.smali
index 13e1e3166a..562301b10d 100644
--- a/com.discord/smali/f/a/a/v$c.smali
+++ b/com.discord/smali/f/a/a/v$c.smali
@@ -40,6 +40,10 @@
         }
     .end annotation
 
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/a/v;
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
@@ -60,13 +64,13 @@
 
     sget-object v2, Lf/a/a/w;->d:Lf/a/a/w;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "storeUser.observeMe().ma\u2026oreState(user = meUser) }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0, v1}, Lf/a/a/v;-><init>(Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
diff --git a/com.discord/smali/f/a/a/v$d.smali b/com.discord/smali/f/a/a/v$d.smali
index 8545610299..236c5f1213 100644
--- a/com.discord/smali/f/a/a/v$d.smali
+++ b/com.discord/smali/f/a/a/v$d.smali
@@ -20,7 +20,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
+
+    const-string/jumbo v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +50,7 @@
 
     iget-object p1, p1, Lf/a/a/v$d;->a:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/a/v$e.smali b/com.discord/smali/f/a/a/v$e.smali
index 39708e1214..fe1e7b8204 100644
--- a/com.discord/smali/f/a/a/v$e.smali
+++ b/com.discord/smali/f/a/a/v$e.smali
@@ -50,7 +50,7 @@
 
     iget-object v1, p1, Lf/a/a/v$e;->a:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/a/v.smali b/com.discord/smali/f/a/a/v.smali
index fddf80224c..0dfabf528e 100644
--- a/com.discord/smali/f/a/a/v.smali
+++ b/com.discord/smali/f/a/a/v.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/v;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetUrgentMessageDialogViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lf/a/a/v$e;",
         ">;"
     }
@@ -49,13 +49,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "restAPI"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeObservable"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x1
 
-    invoke-direct {p0, v0, v1, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lf/a/a/v;->e:Lcom/discord/utilities/rest/RestAPI;
 
@@ -71,6 +77,10 @@
 
     const-class v2, Lf/a/a/v;
 
+    new-instance v7, Lf/a/a/v$a;
+
+    invoke-direct {v7, p0}, Lf/a/a/v$a;-><init>(Lf/a/a/v;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -79,10 +89,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lf/a/a/v$a;
-
-    invoke-direct {v7, p0}, Lf/a/a/v$a;-><init>(Lf/a/a/v;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -96,11 +102,4 @@
     iput-object p1, p0, Lf/a/a/v;->d:Lrx/subjects/PublishSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/a/w.smali b/com.discord/smali/f/a/a/w.smali
index 4fa8f24a28..21d4564ce4 100644
--- a/com.discord/smali/f/a/a/w.smali
+++ b/com.discord/smali/f/a/a/w.smali
@@ -3,7 +3,7 @@
 .source "WidgetUrgentMessageDialogViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lf/a/a/v$d;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
     const-string v1, "meUser"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lf/a/a/v$d;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
diff --git a/com.discord/smali/f/a/a/z/a$a$a.smali b/com.discord/smali/f/a/a/z/a$a$a.smali
index 77ae0018ac..3d81b15b7a 100644
--- a/com.discord/smali/f/a/a/z/a$a$a.smali
+++ b/com.discord/smali/f/a/a/z/a$a$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/z/a$a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,9 @@
 
     check-cast p1, Landroidx/fragment/app/FragmentActivity;
 
-    if-eqz p1, :cond_0
+    const-string v0, "appActivity"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -97,11 +99,11 @@
 
     const-string v1, "appActivity.supportFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lf/a/a/z/a;
 
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v1
 
@@ -114,13 +116,4 @@
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "appActivity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/z/a$a.smali b/com.discord/smali/f/a/a/z/a$a.smali
index 25bc91c2be..e6c00eafc6 100644
--- a/com.discord/smali/f/a/a/z/a$a.smali
+++ b/com.discord/smali/f/a/a/z/a$a.smali
@@ -26,85 +26,95 @@
 
 # virtual methods
 .method public final a(Ljava/lang/String;Ljava/lang/String;J)V
-    .locals 19
+    .locals 20
 
     move-object/from16 v0, p1
 
     move-object/from16 v1, p2
 
-    const/4 v2, 0x0
+    const-string v2, "giftCode"
 
-    if-eqz v0, :cond_1
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    const-string v3, "source"
 
-    new-instance v2, Lcom/discord/stores/StoreNotices$Notice;
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual/range {p0 .. p1}, Lf/a/a/z/a$a;->b(Ljava/lang/String;)Ljava/lang/String;
+    new-instance v3, Lcom/discord/stores/StoreNotices$Notice;
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "gift:"
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    const/4 v2, 0x2
+
+    new-array v2, v2, [Lk0/s/b;
+
+    const-class v4, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v4
 
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
-    const-wide/16 v6, 0x0
+    aput-object v4, v2, v6
 
-    const/4 v8, 0x0
+    const-class v4, Lcom/discord/widgets/home/WidgetHome;
+
+    invoke-static {v4}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v4
+
+    const/4 v6, 0x1
+
+    aput-object v4, v2, v6
+
+    invoke-static {v2}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v12
+
+    new-instance v2, Lf/a/a/z/a$a$a;
+
+    move-wide/from16 v6, p3
+
+    invoke-direct {v2, v0, v1, v6, v7}, Lf/a/a/z/a$a$a;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
+
+    const/4 v6, 0x0
+
+    const-wide/16 v7, 0x0
 
     const/4 v9, 0x0
 
     const/4 v10, 0x0
 
-    const-wide/16 v12, 0x0
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Lj0/r/b;
-
     const/4 v11, 0x0
 
-    const-class v16, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-wide/16 v13, 0x0
 
-    invoke-static/range {v16 .. v16}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-wide/16 v15, 0x0
 
-    move-result-object v16
+    const/16 v18, 0x36
 
-    aput-object v16, v3, v11
+    const/16 v19, 0x0
 
-    const/4 v11, 0x1
+    move-object v4, v3
 
-    const-class v16, Lcom/discord/widgets/home/WidgetHome;
+    move-object/from16 v17, v2
 
-    invoke-static/range {v16 .. v16}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v16
-
-    aput-object v16, v3, v11
-
-    invoke-static {v3}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v11
-
-    new-instance v3, Lf/a/a/z/a$a$a;
-
-    move-wide/from16 v14, p3
-
-    invoke-direct {v3, v0, v1, v14, v15}, Lf/a/a/z/a$a$a;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
-
-    const/16 v0, 0x36
-
-    const/16 v18, 0x0
-
-    move-object v1, v3
-
-    move-object v3, v2
-
-    const-wide/16 v14, 0x0
-
-    move-object/from16 v16, v1
-
-    move/from16 v17, v0
-
-    invoke-direct/range {v3 .. v18}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;Lcom/discord/utilities/time/Clock;JIZZLjava/util/List;JJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v4 .. v19}, Lcom/discord/stores/StoreNotices$Notice;-><init>(Ljava/lang/String;Lcom/discord/utilities/time/Clock;JIZZLjava/util/List;JJLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -112,33 +122,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, v2}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
+    invoke-virtual {v0, v3}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
 
     return-void
-
-    :cond_0
-    const-string v0, "source"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    const-string v0, "giftCode"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-.end method
-
-.method public final b(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "gift:"
-
-    invoke-static {v0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/a/z/a$b.smali b/com.discord/smali/f/a/a/z/a$b.smali
index 0ca19f3d0e..4054f19bf0 100644
--- a/com.discord/smali/f/a/a/z/a$b.smali
+++ b/com.discord/smali/f/a/a/z/a$b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/z/a$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,11 +47,13 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/discord/utilities/error/Error;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/a/z/a$b;->this$0:Lf/a/a/z/a;
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/z/a$c.smali b/com.discord/smali/f/a/a/z/a$c.smali
index 325e87d207..a15a74d7d6 100644
--- a/com.discord/smali/f/a/a/z/a$c.smali
+++ b/com.discord/smali/f/a/a/z/a$c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/a/z/a$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGiftAcceptDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreGifting$GiftState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/stores/StoreGifting$GiftState;
 
-    if-eqz p1, :cond_9
+    const-string v0, "giftState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/stores/StoreGifting$GiftState$Loading;
 
@@ -205,13 +207,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_9
-    const-string p1, "giftState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/a/z/a.smali b/com.discord/smali/f/a/a/z/a.smali
index 9ccec85e7c..ee8e65f615 100644
--- a/com.discord/smali/f/a/a/z/a.smali
+++ b/com.discord/smali/f/a/a/z/a.smali
@@ -39,121 +39,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/z/a;
 
-    const-class v2, Lf/a/a/z/a;
+    const-string v2, "dialogHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogHeader()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dialogHeader"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDialogHeader()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/a/z/a;
 
-    const/4 v2, 0x0
+    const-string v2, "dialogText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDialogText()Lcom/discord/app/AppTextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/a/z/a;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dialogText"
-
-    const-string v4, "getDialogText()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/z/a;
 
-    const-class v2, Lf/a/a/z/a;
+    const-string v2, "dialogImage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dialogImage"
-
-    const-string v4, "getDialogImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/z/a;
 
-    const-class v2, Lf/a/a/z/a;
+    const-string v2, "button"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "button"
-
-    const-string v4, "getButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/z/a;
 
-    const-class v2, Lf/a/a/z/a;
+    const-string v2, "progress"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getProgress()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "progress"
-
-    const-string v4, "getProgress()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/a/z/a;
 
-    const-class v2, Lf/a/a/z/a;
+    const-string/jumbo v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "viewFlipper"
-
-    const-string v4, "getViewFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -271,7 +235,7 @@
 
     if-eqz v2, :cond_1
 
-    const v2, 0x7f12088b
+    const v2, 0x7f12088d
 
     new-array v5, v3, [Ljava/lang/Object;
 
@@ -284,16 +248,16 @@
     goto :goto_1
 
     :cond_1
-    const v2, 0x7f12088a
+    const v2, 0x7f12088c
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
     :goto_1
-    const-string v5, "when {\n      gift.isAnyN\u2026ion_header_success)\n    }"
+    const-string/jumbo v5, "when {\n      gift.isAnyN\u2026ion_header_success)\n    }"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isNitroClassicGift()Z
 
@@ -301,7 +265,7 @@
 
     if-eqz v5, :cond_2
 
-    const p1, 0x7f120878
+    const p1, 0x7f12087a
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -320,7 +284,7 @@
 
     if-eqz p1, :cond_3
 
-    const p1, 0x7f120879
+    const p1, 0x7f12087b
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -333,7 +297,7 @@
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f120877
+    const p1, 0x7f120879
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -344,9 +308,9 @@
     move-result-object p1
 
     :goto_2
-    const-string v0, "when {\n      gift.isNitr\u2026ccess_mobile, name)\n    }"
+    const-string/jumbo v0, "when {\n      gift.isNitr\u2026ccess_mobile, name)\n    }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lf/a/a/z/a;->m()Lcom/discord/app/AppTextView;
 
@@ -372,7 +336,7 @@
 
     if-eqz v0, :cond_4
 
-    const v1, 0x7f120886
+    const v1, 0x7f120888
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -408,7 +372,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120889
+    const v0, 0x7f12088b
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -420,7 +384,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120869
+    const v0, 0x7f12086b
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -442,7 +406,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f120882
+    const v1, 0x7f120884
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -486,7 +450,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120889
+    const v2, 0x7f12088b
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -498,7 +462,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f12087e
+    const v2, 0x7f120880
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -538,7 +502,7 @@
 
     if-eqz v2, :cond_0
 
-    const v0, 0x7f12135b
+    const v0, 0x7f121385
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -581,7 +545,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120871
+    const v1, 0x7f120873
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -606,7 +570,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f12086d
+    const v1, 0x7f12086f
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -631,7 +595,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f12086e
+    const v1, 0x7f120870
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -656,7 +620,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f12086c
+    const v1, 0x7f12086e
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -672,7 +636,7 @@
 
     if-eqz v1, :cond_a
 
-    const v0, 0x7f120882
+    const v0, 0x7f120884
 
     invoke-virtual {v1, v0}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -761,7 +725,7 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f120888
+    const v1, 0x7f12088a
 
     new-array v4, v3, [Ljava/lang/Object;
 
@@ -774,16 +738,16 @@
     goto :goto_1
 
     :cond_1
-    const v1, 0x7f120887
+    const v1, 0x7f120889
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v1
 
     :goto_1
-    const-string v4, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
+    const-string/jumbo v4, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
 
@@ -791,7 +755,7 @@
 
     if-eqz v4, :cond_2
 
-    const v4, 0x7f12086b
+    const v4, 0x7f12086d
 
     const/4 v5, 0x2
 
@@ -812,7 +776,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f12086a
+    const p1, 0x7f12086c
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -823,9 +787,9 @@
     move-result-object p1
 
     :goto_2
-    const-string v0, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
+    const-string/jumbo v0, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lf/a/a/z/a;->m()Lcom/discord/app/AppTextView;
 
@@ -883,7 +847,7 @@
 
     if-eqz v2, :cond_1
 
-    const v2, 0x7f120888
+    const v2, 0x7f12088a
 
     new-array v5, v3, [Ljava/lang/Object;
 
@@ -896,16 +860,16 @@
     goto :goto_1
 
     :cond_1
-    const v2, 0x7f120887
+    const v2, 0x7f120889
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v2
 
     :goto_1
-    const-string v5, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
+    const-string/jumbo v5, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
 
@@ -913,7 +877,7 @@
 
     if-eqz v5, :cond_2
 
-    const v5, 0x7f12086b
+    const v5, 0x7f12086d
 
     const/4 v6, 0x2
 
@@ -934,7 +898,7 @@
     goto :goto_2
 
     :cond_2
-    const v5, 0x7f12086a
+    const v5, 0x7f12086c
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -945,9 +909,9 @@
     move-result-object v0
 
     :goto_2
-    const-string v3, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
+    const-string/jumbo v3, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lf/a/a/z/a;->m()Lcom/discord/app/AppTextView;
 
@@ -973,7 +937,7 @@
 
     if-eqz v2, :cond_3
 
-    const v1, 0x7f120880
+    const v1, 0x7f120882
 
     invoke-virtual {v2, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -1266,7 +1230,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -1296,7 +1260,7 @@
 
     const-string v2, "requireContext().resourc\u2026bPlan.intervalCount\n    )"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getInterval()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
@@ -1312,7 +1276,7 @@
 
     if-ne p1, v1, :cond_2
 
-    const p1, 0x7f12088d
+    const p1, 0x7f12088f
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -1322,7 +1286,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_1
 
@@ -1334,7 +1298,7 @@
     throw p1
 
     :cond_3
-    const p1, 0x7f12088c
+    const p1, 0x7f12088e
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -1344,7 +1308,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
     return-object p1
@@ -1362,7 +1326,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     const-string v1, "ARG_GIFT_CODE"
 
@@ -1370,19 +1334,35 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     sget-object v1, Lf/a/a/z/a;->k:Lf/a/a/z/a$a;
 
     const-string v2, "it"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1, v0}, Lf/a/a/z/a$a;->b(Ljava/lang/String;)Ljava/lang/String;
+    if-eqz v1, :cond_0
+
+    const-string v1, "giftCode"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "gift:"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -1392,7 +1372,15 @@
 
     invoke-virtual {v1, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_1
+    :goto_0
     invoke-super {p0}, Landroidx/fragment/app/Fragment;->onDestroy()V
 
     return-void
@@ -1401,6 +1389,10 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 11
 
+    const-string/jumbo v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
diff --git a/com.discord/smali/f/a/b/a.smali b/com.discord/smali/f/a/b/a.smali
index 4a6fddb5e7..6793741f3f 100644
--- a/com.discord/smali/f/a/b/a.smali
+++ b/com.discord/smali/f/a/b/a.smali
@@ -34,7 +34,7 @@
 
     const-string p2, "invoke(...)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/b/a0.smali b/com.discord/smali/f/a/b/a0.smali
index f8fed0e2e3..83eaff6518 100644
--- a/com.discord/smali/f/a/b/a0.smali
+++ b/com.discord/smali/f/a/b/a0.smali
@@ -1,119 +1,58 @@
-.class public final Lf/a/b/a0;
-.super Ljava/lang/Object;
+.class public final synthetic Lf/a/b/a0;
+.super Lk0/o/c/h;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lrx/Observable$c;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TT;>;"
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic d:Landroid/content/Context;
-
-.field public final synthetic e:Ljava/lang/Class;
-
-.field public final synthetic f:Lkotlin/jvm/functions/Function1;
-
-.field public final synthetic g:Lkotlin/jvm/functions/Function1;
-
-.field public final synthetic h:Lrx/functions/Action1;
-
-.field public final synthetic i:Lkotlin/jvm/functions/Function0;
-
-
 # direct methods
-.method public constructor <init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
-    .locals 0
+.method public constructor <init>(Lrx/functions/Action1;)V
+    .locals 7
 
-    iput-object p1, p0, Lf/a/b/a0;->d:Landroid/content/Context;
+    const-class v3, Lrx/functions/Action1;
 
-    iput-object p2, p0, Lf/a/b/a0;->e:Ljava/lang/Class;
+    const/4 v1, 0x1
 
-    iput-object p3, p0, Lf/a/b/a0;->f:Lkotlin/jvm/functions/Function1;
+    const-string v4, "call"
 
-    iput-object p4, p0, Lf/a/b/a0;->g:Lkotlin/jvm/functions/Function1;
+    const-string v5, "call(Ljava/lang/Object;)V"
 
-    iput-object p5, p0, Lf/a/b/a0;->h:Lrx/functions/Action1;
+    const/4 v6, 0x0
 
-    iput-object p6, p0, Lf/a/b/a0;->i:Lkotlin/jvm/functions/Function0;
+    move-object v0, p0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 8
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
 
-    move-object v0, p1
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
-    check-cast v0, Lrx/Observable;
+    check-cast v0, Lrx/functions/Action1;
 
-    const-string p1, "observable"
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    iget-object v1, p0, Lf/a/b/a0;->d:Landroid/content/Context;
-
-    iget-object p1, p0, Lf/a/b/a0;->e:Ljava/lang/Class;
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string p1, "errorClass.simpleName"
-
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v3, p0, Lf/a/b/a0;->f:Lkotlin/jvm/functions/Function1;
-
-    iget-object v4, p0, Lf/a/b/a0;->g:Lkotlin/jvm/functions/Function1;
-
-    iget-object p1, p0, Lf/a/b/a0;->h:Lrx/functions/Action1;
-
-    const/4 v7, 0x0
-
-    if-eqz p1, :cond_0
-
-    new-instance v5, Lf/a/b/n0;
-
-    invoke-direct {v5, p1}, Lf/a/b/n0;-><init>(Lrx/functions/Action1;)V
-
-    goto :goto_0
-
-    :cond_0
-    move-object v5, v7
-
-    :goto_0
-    iget-object p1, p0, Lf/a/b/a0;->i:Lkotlin/jvm/functions/Function0;
-
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    sget-object p1, Lf/a/b/z;->d:Lf/a/b/z;
-
-    :goto_1
-    move-object v6, p1
-
-    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
-
-    return-object v7
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/b.smali b/com.discord/smali/f/a/b/b.smali
index b4b6217c6b..feed4aca0c 100644
--- a/com.discord/smali/f/a/b/b.smali
+++ b/com.discord/smali/f/a/b/b.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lf/a/b/b;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "AppActivity.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/String;",
         "Ljava/lang/String;",
@@ -38,45 +38,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x3
+    const-class v2, Lcom/discord/app/AppActivity$a;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x3
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Ljava/lang/String;Ljava/lang/String;I)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/app/AppActivity$a;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Ljava/lang/String;Ljava/lang/String;I)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
@@ -90,29 +72,17 @@
 
     move-result p3
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/app/AppActivity$a;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/app/AppActivity$a;-><init>(Ljava/lang/String;Ljava/lang/String;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/b/b0.smali b/com.discord/smali/f/a/b/b0.smali
index 110fc7dff0..83a3935885 100644
--- a/com.discord/smali/f/a/b/b0.smali
+++ b/com.discord/smali/f/a/b/b0.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/b/b0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppTransformers.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/b/c0.smali b/com.discord/smali/f/a/b/c0.smali
index 97ceb43e68..b7b26b2c4b 100644
--- a/com.discord/smali/f/a/b/c0.smali
+++ b/com.discord/smali/f/a/b/c0.smali
@@ -24,30 +24,30 @@
 # instance fields
 .field public final synthetic d:Landroid/content/Context;
 
-.field public final synthetic e:Ljava/lang/String;
+.field public final synthetic e:Ljava/lang/Class;
 
 .field public final synthetic f:Lkotlin/jvm/functions/Function1;
 
 .field public final synthetic g:Lkotlin/jvm/functions/Function1;
 
-.field public final synthetic h:Lkotlin/jvm/functions/Function1;
+.field public final synthetic h:Lrx/functions/Action1;
 
 .field public final synthetic i:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
-.method public constructor <init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+.method public constructor <init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
     iput-object p1, p0, Lf/a/b/c0;->d:Landroid/content/Context;
 
-    iput-object p2, p0, Lf/a/b/c0;->e:Ljava/lang/String;
+    iput-object p2, p0, Lf/a/b/c0;->e:Ljava/lang/Class;
 
     iput-object p3, p0, Lf/a/b/c0;->f:Lkotlin/jvm/functions/Function1;
 
     iput-object p4, p0, Lf/a/b/c0;->g:Lkotlin/jvm/functions/Function1;
 
-    iput-object p5, p0, Lf/a/b/c0;->h:Lkotlin/jvm/functions/Function1;
+    iput-object p5, p0, Lf/a/b/c0;->h:Lrx/functions/Action1;
 
     iput-object p6, p0, Lf/a/b/c0;->i:Lkotlin/jvm/functions/Function0;
 
@@ -59,7 +59,7 @@
 
 # virtual methods
 .method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 7
+    .locals 8
 
     move-object v0, p1
 
@@ -67,33 +67,53 @@
 
     const-string p1, "observable"
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lf/a/b/c0;->d:Landroid/content/Context;
 
-    iget-object v2, p0, Lf/a/b/c0;->e:Ljava/lang/String;
+    iget-object p1, p0, Lf/a/b/c0;->e:Ljava/lang/Class;
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string p1, "errorClass.simpleName"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lf/a/b/c0;->f:Lkotlin/jvm/functions/Function1;
 
     iget-object v4, p0, Lf/a/b/c0;->g:Lkotlin/jvm/functions/Function1;
 
-    iget-object v5, p0, Lf/a/b/c0;->h:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lf/a/b/c0;->h:Lrx/functions/Action1;
 
-    iget-object p1, p0, Lf/a/b/c0;->i:Lkotlin/jvm/functions/Function0;
+    const/4 v7, 0x0
 
     if-eqz p1, :cond_0
 
+    new-instance v5, Lf/a/b/p0;
+
+    invoke-direct {v5, p1}, Lf/a/b/p0;-><init>(Lrx/functions/Action1;)V
+
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lf/a/b/b0;->d:Lf/a/b/b0;
+    move-object v5, v7
 
     :goto_0
+    iget-object p1, p0, Lf/a/b/c0;->i:Lkotlin/jvm/functions/Function0;
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    sget-object p1, Lf/a/b/b0;->d:Lf/a/b/b0;
+
+    :goto_1
     move-object v6, p1
 
     invoke-static/range {v0 .. v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
 
-    const/4 p1, 0x0
-
-    return-object p1
+    return-object v7
 .end method
diff --git a/com.discord/smali/f/a/b/d0.smali b/com.discord/smali/f/a/b/d0.smali
index 3a1a2466bf..224801db0c 100644
--- a/com.discord/smali/f/a/b/d0.smali
+++ b/com.discord/smali/f/a/b/d0.smali
@@ -1,17 +1,16 @@
 .class public final Lf/a/b/d0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lkotlin/jvm/functions/Function0;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -38,19 +37,19 @@
 .method public constructor <init>()V
     .locals 1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public invoke()Ljava/lang/Object;
+    .locals 1
 
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    return-object p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/b/e.smali b/com.discord/smali/f/a/b/e.smali
index ad30face1c..ecbce6da10 100644
--- a/com.discord/smali/f/a/b/e.smali
+++ b/com.discord/smali/f/a/b/e.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/b/e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppActivity.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -31,7 +31,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/b/e0.smali b/com.discord/smali/f/a/b/e0.smali
index b9ca020b6d..d2ac7cdd04 100644
--- a/com.discord/smali/f/a/b/e0.smali
+++ b/com.discord/smali/f/a/b/e0.smali
@@ -1,56 +1,99 @@
 .class public final Lf/a/b/e0;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/Observable$c;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
-        "Lkotlin/Unit;",
-        ">;"
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "TT;TT;>;"
     }
 .end annotation
 
 
-# static fields
-.field public static final d:Lf/a/b/e0;
+# instance fields
+.field public final synthetic d:Landroid/content/Context;
+
+.field public final synthetic e:Ljava/lang/String;
+
+.field public final synthetic f:Lkotlin/jvm/functions/Function1;
+
+.field public final synthetic g:Lkotlin/jvm/functions/Function1;
+
+.field public final synthetic h:Lkotlin/jvm/functions/Function1;
+
+.field public final synthetic i:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+    .locals 0
 
-    new-instance v0, Lf/a/b/e0;
+    iput-object p1, p0, Lf/a/b/e0;->d:Landroid/content/Context;
 
-    invoke-direct {v0}, Lf/a/b/e0;-><init>()V
+    iput-object p2, p0, Lf/a/b/e0;->e:Ljava/lang/String;
 
-    sput-object v0, Lf/a/b/e0;->d:Lf/a/b/e0;
+    iput-object p3, p0, Lf/a/b/e0;->f:Lkotlin/jvm/functions/Function1;
 
-    return-void
-.end method
+    iput-object p4, p0, Lf/a/b/e0;->g:Lkotlin/jvm/functions/Function1;
 
-.method public constructor <init>()V
-    .locals 1
+    iput-object p5, p0, Lf/a/b/e0;->h:Lkotlin/jvm/functions/Function1;
 
-    const/4 v0, 0x1
+    iput-object p6, p0, Lf/a/b/e0;->i:Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 7
 
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+    move-object v0, p1
+
+    check-cast v0, Lrx/Observable;
+
+    const-string p1, "observable"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lf/a/b/e0;->d:Landroid/content/Context;
+
+    iget-object v2, p0, Lf/a/b/e0;->e:Ljava/lang/String;
+
+    iget-object v3, p0, Lf/a/b/e0;->f:Lkotlin/jvm/functions/Function1;
+
+    iget-object v4, p0, Lf/a/b/e0;->g:Lkotlin/jvm/functions/Function1;
+
+    iget-object v5, p0, Lf/a/b/e0;->h:Lkotlin/jvm/functions/Function1;
+
+    iget-object p1, p0, Lf/a/b/e0;->i:Lkotlin/jvm/functions/Function0;
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p1, Lf/a/b/d0;->d:Lf/a/b/d0;
+
+    :goto_0
+    move-object v6, p1
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+
+    const/4 p1, 0x0
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/f.smali b/com.discord/smali/f/a/b/f.smali
index 7c75adabc8..8d60e7e741 100644
--- a/com.discord/smali/f/a/b/f.smali
+++ b/com.discord/smali/f/a/b/f.smali
@@ -47,7 +47,7 @@
 
     const-string v1, "backPressHandlers\n        .values"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -72,7 +72,7 @@
 
     const-string v2, "handlers\n              .values"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/f/a/b/f0.smali b/com.discord/smali/f/a/b/f0.smali
index 64ab0ed5cf..cc537826e2 100644
--- a/com.discord/smali/f/a/b/f0.smali
+++ b/com.discord/smali/f/a/b/f0.smali
@@ -1,87 +1,56 @@
 .class public final Lf/a/b/f0;
-.super Ljava/lang/Object;
+.super Lk0/o/c/j;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
         "TT;",
-        "Lrx/Observable<",
-        "+TR;>;>;"
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic d:Lf/a/b/g0;
+# static fields
+.field public static final d:Lf/a/b/f0;
 
 
 # direct methods
-.method public constructor <init>(Lf/a/b/g0;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lf/a/b/f0;->d:Lf/a/b/g0;
+    new-instance v0, Lf/a/b/f0;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {v0}, Lf/a/b/f0;-><init>()V
+
+    sput-object v0, Lf/a/b/f0;->d:Lf/a/b/f0;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    iget-object v0, p0, Lf/a/b/f0;->d:Lf/a/b/g0;
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    iget-object v0, v0, Lf/a/b/g0;->d:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lf/a/b/f0;->d:Lf/a/b/g0;
-
-    iget-object v0, v0, Lf/a/b/g0;->e:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lrx/Observable;
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lf/a/b/f0;->d:Lf/a/b/g0;
-
-    iget-object v0, v0, Lf/a/b/g0;->f:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lrx/Observable;
-
-    :goto_0
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/g.smali b/com.discord/smali/f/a/b/g.smali
index 792a101b7d..bb6f635533 100644
--- a/com.discord/smali/f/a/b/g.smali
+++ b/com.discord/smali/f/a/b/g.smali
@@ -110,7 +110,7 @@
 
     const-string v1, "StoreStream.getUserSettings().locale"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
@@ -118,7 +118,7 @@
 
     const-string v1, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/f/a/b/g0.smali b/com.discord/smali/f/a/b/g0.smali
index 7fdf67bb7a..a74474106d 100644
--- a/com.discord/smali/f/a/b/g0.smali
+++ b/com.discord/smali/f/a/b/g0.smali
@@ -1,63 +1,56 @@
 .class public final Lf/a/b/g0;
-.super Ljava/lang/Object;
+.super Lk0/o/c/j;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lrx/Observable$c;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TR;>;"
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic d:Lkotlin/jvm/functions/Function1;
-
-.field public final synthetic e:Lkotlin/jvm/functions/Function1;
-
-.field public final synthetic f:Lkotlin/jvm/functions/Function1;
+# static fields
+.field public static final d:Lf/a/b/g0;
 
 
 # direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lf/a/b/g0;->d:Lkotlin/jvm/functions/Function1;
+    new-instance v0, Lf/a/b/g0;
 
-    iput-object p2, p0, Lf/a/b/g0;->e:Lkotlin/jvm/functions/Function1;
+    invoke-direct {v0}, Lf/a/b/g0;-><init>()V
 
-    iput-object p3, p0, Lf/a/b/g0;->f:Lkotlin/jvm/functions/Function1;
+    sput-object v0, Lf/a/b/g0;->d:Lf/a/b/g0;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    check-cast p1, Lrx/Observable;
-
-    new-instance v0, Lf/a/b/f0;
-
-    invoke-direct {v0, p0}, Lf/a/b/f0;-><init>(Lf/a/b/g0;)V
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/h.smali b/com.discord/smali/f/a/b/h.smali
index f64e1ea9ff..f86581e589 100644
--- a/com.discord/smali/f/a/b/h.smali
+++ b/com.discord/smali/f/a/b/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/b/h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppLog.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Integer;",
         "Ljava/lang/String;",
@@ -32,7 +32,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,7 +54,9 @@
 
     check-cast v2, Ljava/lang/Exception;
 
-    if-eqz p2, :cond_3
+    const-string p3, "message"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x4
 
@@ -155,13 +157,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_3
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/b/h0.smali b/com.discord/smali/f/a/b/h0.smali
index a68ac6fd1e..ce1c9b5ae6 100644
--- a/com.discord/smali/f/a/b/h0.smali
+++ b/com.discord/smali/f/a/b/h0.smali
@@ -1,64 +1,87 @@
 .class public final Lf/a/b/h0;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Ls0/k/b;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Boolean;",
-        "Ljava/lang/Boolean;",
-        ">;"
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
     }
 .end annotation
 
 
-# static fields
-.field public static final d:Lf/a/b/h0;
+# instance fields
+.field public final synthetic d:Lf/a/b/i0;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>(Lf/a/b/i0;)V
+    .locals 0
 
-    new-instance v0, Lf/a/b/h0;
+    iput-object p1, p0, Lf/a/b/h0;->d:Lf/a/b/i0;
 
-    invoke-direct {v0}, Lf/a/b/h0;-><init>()V
-
-    sput-object v0, Lf/a/b/h0;->d:Lf/a/b/h0;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Ljava/lang/Boolean;
+    iget-object v0, p0, Lf/a/b/h0;->d:Lf/a/b/i0;
 
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+    iget-object v0, v0, Lf/a/b/i0;->d:Lkotlin/jvm/functions/Function1;
 
-    move-result p1
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lf/a/b/h0;->d:Lf/a/b/i0;
+
+    iget-object v0, v0, Lf/a/b/i0;->e:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
+    check-cast p1, Lrx/Observable;
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lf/a/b/h0;->d:Lf/a/b/i0;
+
+    iget-object v0, v0, Lf/a/b/i0;->f:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lrx/Observable;
+
+    :goto_0
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/i.smali b/com.discord/smali/f/a/b/i.smali
index 1ecb213922..e1ea7c6464 100644
--- a/com.discord/smali/f/a/b/i.smali
+++ b/com.discord/smali/f/a/b/i.smali
@@ -1,69 +1,78 @@
 .class public final Lf/a/b/i;
-.super Lj0/n/c/i;
-.source "AppPermissions.kt"
+.super Lk0/o/c/j;
+.source "AppLog.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function0;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic $failureToastResId:I
-
-.field public final synthetic this$0:Lcom/discord/app/AppPermissions$a;
+# static fields
+.field public static final d:Lf/a/b/i;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/app/AppPermissions$a;I)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lf/a/b/i;->this$0:Lcom/discord/app/AppPermissions$a;
+    new-instance v0, Lf/a/b/i;
 
-    iput p2, p0, Lf/a/b/i;->$failureToastResId:I
+    invoke-direct {v0}, Lf/a/b/i;-><init>()V
 
-    const/4 p1, 0x0
+    sput-object v0, Lf/a/b/i;->d:Lf/a/b/i;
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 5
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
 
-    iget-object v0, p0, Lf/a/b/i;->this$0:Lcom/discord/app/AppPermissions$a;
+    check-cast p1, Lcom/discord/utilities/error/Error;
 
-    iget-object v0, v0, Lcom/discord/app/AppPermissions$a;->this$0:Lcom/discord/app/AppPermissions;
+    const-string v0, "error"
 
-    iget-object v0, v0, Lcom/discord/app/AppPermissions;->b:Landroidx/fragment/app/Fragment;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+    const/4 v0, 0x0
 
-    move-result-object v0
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/error/Error;->setShouldLog(Z)V
 
-    iget v1, p0, Lf/a/b/i;->$failureToastResId:I
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V
 
-    const/4 v2, 0x0
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    const/4 v3, 0x0
+    invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getThrowable()Ljava/lang/Throwable;
 
-    const/16 v4, 0xc
+    move-result-object p1
 
-    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    const-string v1, "Checking tombstone error"
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    return-object v0
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/i0.smali b/com.discord/smali/f/a/b/i0.smali
index f1c8771501..94bb4d59f1 100644
--- a/com.discord/smali/f/a/b/i0.smali
+++ b/com.discord/smali/f/a/b/i0.smali
@@ -1,50 +1,63 @@
 .class public final Lf/a/b/i0;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/Observable$c;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Boolean;",
-        "Lrx/Observable<",
-        "TR;>;>;"
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "TT;TR;>;"
     }
 .end annotation
 
 
 # instance fields
-.field public final synthetic $defaultValue:Lrx/Observable;
+.field public final synthetic d:Lkotlin/jvm/functions/Function1;
+
+.field public final synthetic e:Lkotlin/jvm/functions/Function1;
+
+.field public final synthetic f:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
-.method public constructor <init>(Lrx/Observable;)V
+.method public constructor <init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/b/i0;->$defaultValue:Lrx/Observable;
+    iput-object p1, p0, Lf/a/b/i0;->d:Lkotlin/jvm/functions/Function1;
 
-    const/4 p1, 0x1
+    iput-object p2, p0, Lf/a/b/i0;->e:Lkotlin/jvm/functions/Function1;
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    iput-object p3, p0, Lf/a/b/i0;->f:Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Ljava/lang/Boolean;
+    check-cast p1, Lrx/Observable;
 
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+    new-instance v0, Lf/a/b/h0;
 
-    iget-object p1, p0, Lf/a/b/i0;->$defaultValue:Lrx/Observable;
+    invoke-direct {v0, p0}, Lf/a/b/h0;-><init>(Lf/a/b/i0;)V
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object p1
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/j.smali b/com.discord/smali/f/a/b/j.smali
index a923d4ae02..b2c0d0850d 100644
--- a/com.discord/smali/f/a/b/j.smali
+++ b/com.discord/smali/f/a/b/j.smali
@@ -1,34 +1,130 @@
 .class public final Lf/a/b/j;
-.super Ljava/lang/Object;
-.source "AppScreen.kt"
+.super Lk0/o/c/j;
+.source "AppLog.kt"
 
 # interfaces
-.implements Ljava/lang/Runnable;
+.implements Lkotlin/jvm/functions/Function1;
 
 
-# instance fields
-.field public final synthetic d:Lcom/discord/app/AppActivity;
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/SystemLogUtils$Tombstone;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lf/a/b/j;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/app/AppActivity;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lf/a/b/j;->d:Lcom/discord/app/AppActivity;
+    new-instance v0, Lf/a/b/j;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {v0}, Lf/a/b/j;-><init>()V
+
+    sput-object v0, Lf/a/b/j;->d:Lf/a/b/j;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final run()V
-    .locals 1
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 9
 
-    iget-object v0, p0, Lf/a/b/j;->d:Lcom/discord/app/AppActivity;
+    check-cast p1, Lcom/discord/utilities/SystemLogUtils$Tombstone;
 
-    invoke-virtual {v0}, Landroid/app/Activity;->recreate()V
+    const-string v0, "crash"
 
-    return-void
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/utilities/SystemLogUtils$Tombstone;->getText()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "\n"
+
+    filled-new-array {v0}, [Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
+    invoke-static {p1, v0, v1, v1, v2}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->asReversed(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    check-cast p1, Lk0/j/c;
+
+    invoke-virtual {p1}, Lk0/j/c;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_0
+    move-object v0, p1
+
+    check-cast v0, Lk0/j/c$a;
+
+    invoke-virtual {v0}, Lk0/j/c$a;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    const-string v2, "Tombstone"
+
+    invoke-virtual {v1, v0, v2}, Lcom/discord/app/AppLog;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x6
+
+    const/4 v8, 0x0
+
+    const-string v4, "Tombstone"
+
+    invoke-static/range {v3 .. v8}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/j0.smali b/com.discord/smali/f/a/b/j0.smali
index 11515e84f8..6f3c869023 100644
--- a/com.discord/smali/f/a/b/j0.smali
+++ b/com.discord/smali/f/a/b/j0.smali
@@ -1,22 +1,19 @@
 .class public final Lf/a/b/j0;
-.super Ljava/lang/Object;
+.super Lk0/o/c/j;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lrx/Observable$c;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TT;>;"
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -39,25 +36,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 0
+    .locals 1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    check-cast p1, Lrx/Observable;
+    check-cast p1, Ljava/lang/Boolean;
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result-object v0
+    move-result p1
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->H(Lrx/Scheduler;)Lrx/Observable;
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/b/k.smali b/com.discord/smali/f/a/b/k.smali
index fd5dbee8ff..e0f59fb4e9 100644
--- a/com.discord/smali/f/a/b/k.smali
+++ b/com.discord/smali/f/a/b/k.smali
@@ -1,1000 +1,69 @@
 .class public final Lf/a/b/k;
-.super Ljava/lang/Object;
-.source "AppScreen.kt"
+.super Lk0/o/c/j;
+.source "AppPermissions.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
 
 
-# static fields
-.field public static final a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lj0/r/b<",
-            "+",
-            "Lcom/discord/app/AppFragment;",
-            ">;>;"
-        }
-    .end annotation
-.end field
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
 
-.field public static final b:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lj0/r/b<",
-            "+",
-            "Lcom/discord/widgets/auth/WidgetOauth2Authorize;",
-            ">;>;"
-        }
-    .end annotation
-.end field
 
-.field public static final c:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lj0/r/b<",
-            "+",
-            "Lcom/discord/app/AppFragment;",
-            ">;>;"
-        }
-    .end annotation
-.end field
+# instance fields
+.field public final synthetic $failureToastResId:I
 
-.field public static final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lj0/r/b<",
-            "+",
-            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field public static final e:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lj0/r/b<",
-            "+",
-            "Lcom/discord/app/AppFragment;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field public static final f:Lf/a/b/k;
+.field public final synthetic this$0:Lcom/discord/app/AppPermissions$a;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 11
-
-    new-instance v0, Lf/a/b/k;
-
-    invoke-direct {v0}, Lf/a/b/k;-><init>()V
-
-    sput-object v0, Lf/a/b/k;->f:Lf/a/b/k;
-
-    const/16 v0, 0x8
-
-    new-array v1, v0, [Lj0/r/b;
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLanding;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v4, 0x1
-
-    aput-object v2, v1, v4
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v5, 0x2
-
-    aput-object v2, v1, v5
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v6, 0x3
-
-    aput-object v2, v1, v6
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v7, 0x4
-
-    aput-object v2, v1, v7
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthMfa;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v8, 0x5
-
-    aput-object v2, v1, v8
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthBirthday;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v9, 0x6
-
-    aput-object v2, v1, v9
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetAuthAgeGated;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const/4 v10, 0x7
-
-    aput-object v2, v1, v10
-
-    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    sput-object v1, Lf/a/b/k;->a:Ljava/util/List;
-
-    new-array v1, v5, [Lj0/r/b;
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v3
-
-    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v4
-
-    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    sput-object v1, Lf/a/b/k;->b:Ljava/util/List;
-
-    const/16 v1, 0x29
-
-    new-array v1, v1, [Lj0/r/b;
-
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v3
-
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v4
-
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v5
-
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v6
-
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v7
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v8
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v9
-
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v10
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsLanguage;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    aput-object v2, v1, v0
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x9
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0xa
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0xb
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0xc
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0xd
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0xe
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0xf
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x10
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerNotifications;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x11
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x12
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x13
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x14
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x15
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x16
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x17
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x18
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x19
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x1a
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x1b
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x1c
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x1d
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x1e
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x1f
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x20
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x21
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/auth/WidgetAuthRegister;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x22
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/auth/WidgetAuthBirthday;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x23
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/auth/WidgetAuthAgeGated;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x24
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/auth/WidgetAuthLogin;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x25
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x26
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x27
-
-    aput-object v0, v1, v2
-
-    const-class v0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const/16 v2, 0x28
-
-    aput-object v0, v1, v2
-
-    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/k;->c:Ljava/util/List;
-
-    new-array v0, v9, [Lj0/r/b;
-
-    const-class v1, Lcom/discord/widgets/user/account/WidgetUserAccountVerify;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v3
-
-    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v4
-
-    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v5
-
-    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v6
-
-    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v7
-
-    const-class v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v8
-
-    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/k;->d:Ljava/util/List;
-
-    new-array v0, v5, [Lj0/r/b;
-
-    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v3
-
-    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
-
-    invoke-static {v1}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v1
-
-    aput-object v1, v0, v4
-
-    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/k;->e:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
+.method public constructor <init>(Lcom/discord/app/AppPermissions$a;I)V
     .locals 0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    iput-object p1, p0, Lf/a/b/k;->this$0:Lcom/discord/app/AppPermissions$a;
 
-    return-void
-.end method
-
-.method public static final a(Landroid/content/Context;)V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x6
-
-    invoke-static {p0, v0, v1, v2}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
-
-    return-void
-.end method
-
-.method public static final b(Landroid/content/Context;ZLandroid/content/Intent;)V
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_3
-
-    if-eqz p1, :cond_2
+    iput p2, p0, Lf/a/b/k;->$failureToastResId:I
 
     const/4 p1, 0x0
 
-    if-eqz p2, :cond_0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_OPEN_PANEL"
-
-    invoke-virtual {p2, v1, p1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    sget-object v1, Lcom/discord/stores/StoreNavigation$PanelAction;->OPEN:Lcom/discord/stores/StoreNavigation$PanelAction;
-
-    goto :goto_1
-
-    :cond_1
-    sget-object v1, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
-
-    :goto_1
-    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getTabsNavigation()Lcom/discord/stores/StoreTabsNavigation;
-
-    move-result-object v2
-
-    const/4 v3, 0x2
-
-    invoke-static {v2, v1, p1, v3, v0}, Lcom/discord/stores/StoreTabsNavigation;->selectHomeTab$default(Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;ZILjava/lang/Object;)V
-
-    const-class p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
-
-    goto :goto_2
-
-    :cond_2
-    const-class p1, Lcom/discord/widgets/auth/WidgetAuthLanding;
-
-    :goto_2
-    invoke-static {p0, p1, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
-
-    return-void
-
-    :cond_3
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic c(Landroid/content/Context;ZLandroid/content/Intent;I)V
-    .locals 1
-
-    and-int/lit8 v0, p3, 0x2
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x1
-
-    :cond_0
-    and-int/lit8 p3, p3, 0x4
-
-    if-eqz p3, :cond_1
-
-    const/4 p2, 0x0
-
-    :cond_1
-    invoke-static {p0, p1, p2}, Lf/a/b/k;->b(Landroid/content/Context;ZLandroid/content/Intent;)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
-.method public static final d(Landroid/content/Context;)V
-    .locals 3
 
-    if-eqz p0, :cond_0
-
-    new-instance v0, Landroid/content/Intent;
-
-    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
-
-    const/high16 v1, 0x4000000
-
-    invoke-virtual {v0, v1}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p0, v1, v0, v2}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
-
-    return-void
-
-    :cond_0
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/content/Context;",
-            "Ljava/lang/Class<",
-            "+",
-            "Lcom/discord/app/AppComponent;",
-            ">;",
-            "Landroid/content/Intent;",
-            ")V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v2, "javaClass.simpleName"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v3, "screen.simpleName"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1, v2}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
-
-    new-instance v0, Landroid/content/Intent;
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {v0, p2}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
-
-    :goto_0
-    const-class p2, Lcom/discord/app/AppActivity;
-
-    invoke-virtual {v0, p0, p2}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
-
-    move-result-object p2
-
-    const-string v0, "com.discord.intent.extra.EXTRA_SCREEN"
-
-    invoke-virtual {p2, v0, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
-
-    move-result-object p1
-
-    const-string p2, "if (extras != null) { In\u2026nts.EXTRA_SCREEN, screen)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0, p1}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
-
-    return-void
-
-    :cond_1
-    const-string p0, "screen"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
-    .locals 0
-
-    and-int/lit8 p2, p3, 0x4
-
-    const/4 p2, 0x0
-
-    invoke-static {p0, p1, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
-
-    return-void
-.end method
-
-.method public static final g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
+# virtual methods
+.method public invoke()Ljava/lang/Object;
     .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroidx/fragment/app/Fragment;",
-            "Ljava/lang/Class<",
-            "+",
-            "Lcom/discord/app/AppComponent;",
-            ">;",
-            "Landroid/content/Intent;",
-            "I)V"
-        }
-    .end annotation
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+    iget-object v0, p0, Lf/a/b/k;->this$0:Lcom/discord/app/AppPermissions$a;
+
+    iget-object v0, v0, Lcom/discord/app/AppPermissions$a;->this$0:Lcom/discord/app/AppPermissions;
+
+    iget-object v0, v0, Lcom/discord/app/AppPermissions;->b:Landroidx/fragment/app/Fragment;
+
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    iget v1, p0, Lf/a/b/k;->$failureToastResId:I
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    const/4 v2, 0x0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    const/4 v3, 0x0
 
-    move-result-object v2
+    const/16 v4, 0xc
 
-    invoke-virtual {v2}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
-    move-result-object v2
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    const-string v3, "javaClass.simpleName"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    const-string v4, "screen.simpleName"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v2, v3}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
-
-    new-instance v1, Landroid/content/Intent;
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {v1, p2}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-direct {v1}, Landroid/content/Intent;-><init>()V
-
-    :goto_0
-    const-class p2, Lcom/discord/app/AppActivity;
-
-    invoke-virtual {v1, v0, p2}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
-
-    move-result-object p2
-
-    const-string v0, "com.discord.intent.extra.EXTRA_SCREEN"
-
-    invoke-virtual {p2, v0, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
-
-    move-result-object p1
-
-    const-string p2, "if (extras != null) { In\u2026nts.EXTRA_SCREEN, screen)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0, p1, p3}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
-
-    :cond_1
-    return-void
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/b/k0.smali b/com.discord/smali/f/a/b/k0.smali
index 9df8d7cb17..98d1810820 100644
--- a/com.discord/smali/f/a/b/k0.smali
+++ b/com.discord/smali/f/a/b/k0.smali
@@ -1,63 +1,50 @@
 .class public final Lf/a/b/k0;
-.super Ljava/lang/Object;
+.super Lk0/o/c/j;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lrx/Observable$c;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TT;>;"
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Boolean;",
+        "Lrx/Observable<",
+        "TR;>;>;"
     }
 .end annotation
 
 
 # instance fields
-.field public final synthetic d:Lcom/discord/app/AppComponent;
-
-.field public final synthetic e:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.field public final synthetic $defaultValue:Lrx/Observable;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
+.method public constructor <init>(Lrx/Observable;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/b/k0;->d:Lcom/discord/app/AppComponent;
+    iput-object p1, p0, Lf/a/b/k0;->$defaultValue:Lrx/Observable;
 
-    iput-object p2, p0, Lf/a/b/k0;->e:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+    const/4 p1, 0x1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    check-cast p1, Lrx/Observable;
+    check-cast p1, Ljava/lang/Boolean;
 
-    const-string v0, "it"
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lf/a/b/k0;->d:Lcom/discord/app/AppComponent;
-
-    iget-object v1, p0, Lf/a/b/k0;->e:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
-
-    invoke-static {p1, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
-
-    move-result-object p1
+    iget-object p1, p0, Lf/a/b/k0;->$defaultValue:Lrx/Observable;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/l.smali b/com.discord/smali/f/a/b/l.smali
index 2cb05396d0..d42562883d 100644
--- a/com.discord/smali/f/a/b/l.smali
+++ b/com.discord/smali/f/a/b/l.smali
@@ -1,46 +1,21 @@
 .class public final Lf/a/b/l;
 .super Ljava/lang/Object;
-.source "AppState.kt"
+.source "AppScreen.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ljava/lang/Runnable;
 
 
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lf/a/b/l;
+# instance fields
+.field public final synthetic d:Lcom/discord/app/AppActivity;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/b/l;
-
-    invoke-direct {v0}, Lf/a/b/l;-><init>()V
-
-    sput-object v0, Lf/a/b/l;->d:Lf/a/b/l;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
+.method public constructor <init>(Lcom/discord/app/AppActivity;)V
     .locals 0
 
+    iput-object p1, p0, Lf/a/b/l;->d:Lcom/discord/app/AppActivity;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -48,29 +23,12 @@
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final run()V
     .locals 1
 
-    check-cast p1, Ljava/lang/Integer;
+    iget-object v0, p0, Lf/a/b/l;->d:Lcom/discord/app/AppActivity;
 
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Landroid/app/Activity;->recreate()V
 
-    move-result p1
-
-    const/4 v0, 0x0
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->compare(II)I
-
-    move-result p1
-
-    if-lez p1, :cond_0
-
-    const/4 v0, 0x1
-
-    :cond_0
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
+    return-void
 .end method
diff --git a/com.discord/smali/f/a/b/l0.smali b/com.discord/smali/f/a/b/l0.smali
index e664949184..00ab537ec7 100644
--- a/com.discord/smali/f/a/b/l0.smali
+++ b/com.discord/smali/f/a/b/l0.smali
@@ -1,67 +1,65 @@
 .class public final Lf/a/b/l0;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/Observable$c;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Boolean;",
-        "Lkotlin/Unit;",
-        ">;"
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "TT;TT;>;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic this$0:Lf/a/b/m0;
+# static fields
+.field public static final d:Lf/a/b/l0;
 
 
 # direct methods
-.method public constructor <init>(Lf/a/b/m0;)V
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/b/l0;
+
+    invoke-direct {v0}, Lf/a/b/l0;-><init>()V
+
+    sput-object v0, Lf/a/b/l0;->d:Lf/a/b/l0;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
     .locals 0
 
-    iput-object p1, p0, Lf/a/b/l0;->this$0:Lf/a/b/m0;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Ljava/lang/Boolean;
+    check-cast p1, Lrx/Observable;
 
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
-    move-result p1
+    move-result-object v0
 
-    iget-object v0, p0, Lf/a/b/l0;->this$0:Lf/a/b/m0;
+    invoke-virtual {p1, v0}, Lrx/Observable;->H(Lrx/Scheduler;)Lrx/Observable;
 
-    iget-object v0, v0, Lf/a/b/m0;->d:Lcom/discord/utilities/dimmer/DimmerView;
-
-    if-eqz v0, :cond_0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    const/4 v3, 0x0
-
-    invoke-static {v0, p1, v1, v2, v3}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
-
-    :cond_0
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+    move-result-object p1
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/m.smali b/com.discord/smali/f/a/b/m.smali
index c3bc426db3..ce06e51371 100644
--- a/com.discord/smali/f/a/b/m.smali
+++ b/com.discord/smali/f/a/b/m.smali
@@ -1,61 +1,677 @@
 .class public final Lf/a/b/m;
 .super Ljava/lang/Object;
-.source "AppState.kt"
+.source "AppScreen.kt"
 
 
 # static fields
-.field public static final a:Ljava/util/ArrayList;
+.field public static final a:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Ljava/util/ArrayList<",
-            "Ljava/lang/Object;",
-            ">;"
+            "Ljava/util/List<",
+            "Lk0/s/b<",
+            "+",
+            "Lcom/discord/app/AppFragment;",
+            ">;>;"
         }
     .end annotation
 .end field
 
-.field public static final b:Lrx/subjects/BehaviorSubject;
+.field public static final b:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Ljava/lang/Integer;",
-            ">;"
+            "Ljava/util/List<",
+            "Lk0/s/b<",
+            "+",
+            "Lcom/discord/widgets/auth/WidgetOauth2Authorize;",
+            ">;>;"
         }
     .end annotation
 .end field
 
-.field public static final c:Lf/a/b/m;
+.field public static final c:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lk0/s/b<",
+            "+",
+            "Lcom/discord/app/AppFragment;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field public static final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lk0/s/b<",
+            "+",
+            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field public static final e:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lk0/s/b<",
+            "+",
+            "Lcom/discord/app/AppFragment;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field public static final f:Lf/a/b/m;
 
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 2
+    .locals 11
 
     new-instance v0, Lf/a/b/m;
 
     invoke-direct {v0}, Lf/a/b/m;-><init>()V
 
-    sput-object v0, Lf/a/b/m;->c:Lf/a/b/m;
+    sput-object v0, Lf/a/b/m;->f:Lf/a/b/m;
 
-    new-instance v0, Ljava/util/ArrayList;
+    const/16 v0, 0x8
 
-    const/4 v1, 0x4
+    new-array v1, v0, [Lk0/s/b;
 
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLanding;
 
-    sput-object v0, Lf/a/b/m;->a:Ljava/util/ArrayList;
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
-    const/4 v0, 0x0
+    move-result-object v2
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthLogin;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v4, 0x1
+
+    aput-object v2, v1, v4
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthRegister;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v5, 0x2
+
+    aput-object v2, v1, v5
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthUndeleteAccount;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v6, 0x3
+
+    aput-object v2, v1, v6
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthCaptcha;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v7, 0x4
+
+    aput-object v2, v1, v7
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthMfa;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v8, 0x5
+
+    aput-object v2, v1, v8
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthBirthday;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v9, 0x6
+
+    aput-object v2, v1, v9
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetAuthAgeGated;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const/4 v10, 0x7
+
+    aput-object v2, v1, v10
+
+    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    sput-object v1, Lf/a/b/m;->a:Ljava/util/List;
+
+    new-array v1, v5, [Lk0/s/b;
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v3
+
+    const-class v2, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v4
+
+    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    sput-object v1, Lf/a/b/m;->b:Ljava/util/List;
+
+    const/16 v1, 0x29
+
+    new-array v1, v1, [Lk0/s/b;
+
+    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v3
+
+    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v4
+
+    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v5
+
+    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v6
+
+    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v7
+
+    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v8
+
+    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsBehavior;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v9
+
+    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v10
+
+    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsLanguage;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    aput-object v2, v1, v0
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v0
 
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+    const/16 v2, 0x9
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v0
 
-    sput-object v0, Lf/a/b/m;->b:Lrx/subjects/BehaviorSubject;
+    const/16 v2, 0xa
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0xb
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsNotifications;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0xc
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0xd
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0xe
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0xf
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x10
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerNotifications;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x11
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x12
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x13
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x14
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x15
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x16
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x17
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x18
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x19
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x1a
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x1b
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x1c
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x1d
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x1e
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x1f
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x20
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x21
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/auth/WidgetAuthRegister;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x22
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/auth/WidgetAuthBirthday;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x23
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/auth/WidgetAuthAgeGated;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x24
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/auth/WidgetAuthLogin;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x25
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x26
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x27
+
+    aput-object v0, v1, v2
+
+    const-class v0, Lcom/discord/widgets/nux/WidgetNuxChannelPrompt;
+
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v0
+
+    const/16 v2, 0x28
+
+    aput-object v0, v1, v2
+
+    invoke-static {v1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/m;->c:Ljava/util/List;
+
+    new-array v0, v9, [Lk0/s/b;
+
+    const-class v1, Lcom/discord/widgets/user/account/WidgetUserAccountVerify;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v3
+
+    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v4
+
+    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v5
+
+    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v6
+
+    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v7
+
+    const-class v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v8
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/m;->d:Ljava/util/List;
+
+    new-array v0, v5, [Lk0/s/b;
+
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v3
+
+    const-class v1, Lcom/discord/widgets/media/WidgetMedia;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    aput-object v1, v0, v4
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/m;->e:Ljava/util/List;
 
     return-void
 .end method
@@ -68,124 +684,301 @@
     return-void
 .end method
 
-
-# virtual methods
-.method public final declared-synchronized a(Ljava/lang/Object;)V
-    .locals 4
-
-    monitor-enter p0
+.method public static final a(Landroid/content/Context;)V
+    .locals 3
 
     const/4 v0, 0x0
 
-    :try_start_0
-    sget-object v1, Lf/a/b/m;->a:Ljava/util/ArrayList;
+    const/4 v1, 0x0
 
-    invoke-interface {v1, p1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    const/4 v2, 0x6
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v3, "Gateway Connection consumer add "
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    const/4 v2, 0x2
-
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
-
-    sget-object p1, Lf/a/b/m;->b:Lrx/subjects/BehaviorSubject;
-
-    sget-object v0, Lf/a/b/m;->a:Ljava/util/ArrayList;
-
-    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
+    invoke-static {p0, v0, v1, v2}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
 .end method
 
-.method public final declared-synchronized b(Ljava/lang/Object;)V
+.method public static final b(Landroid/content/Context;ZLandroid/content/Intent;)V
     .locals 4
 
-    monitor-enter p0
+    const-string v0, "context"
 
-    const/4 v0, 0x0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :try_start_0
-    sget-object v1, Lf/a/b/m;->a:Ljava/util/ArrayList;
+    if-eqz p1, :cond_2
 
-    invoke-interface {v1, p1}, Ljava/util/Collection;->remove(Ljava/lang/Object;)Z
+    const/4 p1, 0x0
 
-    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    if-eqz p2, :cond_0
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    const-string v0, "com.discord.intent.extra.EXTRA_OPEN_PANEL"
 
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v3, "Gateway Connection consumer rm "
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    const/4 v2, 0x2
-
-    invoke-static {v1, p1, v0, v2, v0}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
-
-    sget-object p1, Lf/a/b/m;->b:Lrx/subjects/BehaviorSubject;
-
-    sget-object v0, Lf/a/b/m;->a:Ljava/util/ArrayList;
-
-    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+    invoke-virtual {p2, v0, p1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
 
     move-result v0
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    sget-object v0, Lcom/discord/stores/StoreNavigation$PanelAction;->OPEN:Lcom/discord/stores/StoreNavigation$PanelAction;
+
+    goto :goto_1
+
+    :cond_1
+    sget-object v0, Lcom/discord/stores/StoreNavigation$PanelAction;->CLOSE:Lcom/discord/stores/StoreNavigation$PanelAction;
+
+    :goto_1
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getTabsNavigation()Lcom/discord/stores/StoreTabsNavigation;
+
+    move-result-object v1
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    invoke-static {v1, v0, p1, v2, v3}, Lcom/discord/stores/StoreTabsNavigation;->selectHomeTab$default(Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;ZILjava/lang/Object;)V
+
+    const-class p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    goto :goto_2
+
+    :cond_2
+    const-class p1, Lcom/discord/widgets/auth/WidgetAuthLanding;
+
+    :goto_2
+    invoke-static {p0, p1, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+
+    return-void
+.end method
+
+.method public static synthetic c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    .locals 1
+
+    and-int/lit8 v0, p3, 0x2
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x1
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x4
+
+    if-eqz p3, :cond_1
+
+    const/4 p2, 0x0
+
+    :cond_1
+    invoke-static {p0, p1, p2}, Lf/a/b/m;->b(Landroid/content/Context;ZLandroid/content/Intent;)V
+
+    return-void
+.end method
+
+.method public static final d(Landroid/content/Context;)V
+    .locals 3
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Landroid/content/Intent;
+
+    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
+
+    const/high16 v1, 0x4000000
+
+    invoke-virtual {v0, v1}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p0, v1, v0, v2}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+
+    return-void
+.end method
+
+.method public static final e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            "Ljava/lang/Class<",
+            "+",
+            "Lcom/discord/app/AppComponent;",
+            ">;",
+            "Landroid/content/Intent;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "screen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "javaClass.simpleName"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "screen.simpleName"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
+
+    new-instance v0, Landroid/content/Intent;
+
+    if-eqz p2, :cond_0
+
+    invoke-direct {v0, p2}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
+
+    :goto_0
+    const-class p2, Lcom/discord/app/AppActivity;
+
+    invoke-virtual {v0, p0, p2}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
+
+    move-result-object p2
+
+    const-string v0, "com.discord.intent.extra.EXTRA_SCREEN"
+
+    invoke-virtual {p2, v0, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
+
+    move-result-object p1
+
+    const-string p2, "if (extras != null) { In\u2026nts.EXTRA_SCREEN, screen)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
+
+    return-void
+.end method
+
+.method public static synthetic f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    .locals 0
+
+    and-int/lit8 p2, p3, 0x4
+
+    const/4 p2, 0x0
+
+    invoke-static {p0, p1, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+
+    return-void
+.end method
+
+.method public static final g(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroidx/fragment/app/Fragment;",
+            "Ljava/lang/Class<",
+            "+",
+            "Lcom/discord/app/AppComponent;",
+            ">;",
+            "Landroid/content/Intent;",
+            "I)V"
+        }
+    .end annotation
+
+    const-string v0, "fragment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "screen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
-    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+    if-eqz v0, :cond_1
 
-    monitor-exit p0
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "javaClass.simpleName"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "screen.simpleName"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v2, v3}, Lcom/discord/app/AppLog;->g(Ljava/lang/String;Ljava/lang/String;)V
+
+    new-instance v1, Landroid/content/Intent;
+
+    if-eqz p2, :cond_0
+
+    invoke-direct {v1, p2}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-direct {v1}, Landroid/content/Intent;-><init>()V
+
+    :goto_0
+    const-class p2, Lcom/discord/app/AppActivity;
+
+    invoke-virtual {v1, v0, p2}, Landroid/content/Intent;->setClass(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;
+
+    move-result-object p2
+
+    const-string v0, "com.discord.intent.extra.EXTRA_SCREEN"
+
+    invoke-virtual {p2, v0, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
+
+    move-result-object p1
+
+    const-string p2, "if (extras != null) { In\u2026nts.EXTRA_SCREEN, screen)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1, p3}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
+
+    :cond_1
     return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/b/m0.smali b/com.discord/smali/f/a/b/m0.smali
index 1e15b79532..723594a6b1 100644
--- a/com.discord/smali/f/a/b/m0.smali
+++ b/com.discord/smali/f/a/b/m0.smali
@@ -22,18 +22,18 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/discord/utilities/dimmer/DimmerView;
+.field public final synthetic d:Lcom/discord/app/AppComponent;
 
-.field public final synthetic e:J
+.field public final synthetic e:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
+.method public constructor <init>(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/b/m0;->d:Lcom/discord/utilities/dimmer/DimmerView;
+    iput-object p1, p0, Lf/a/b/m0;->d:Lcom/discord/app/AppComponent;
 
-    iput-wide p2, p0, Lf/a/b/m0;->e:J
+    iput-object p2, p0, Lf/a/b/m0;->e:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,37 +43,19 @@
 
 # virtual methods
 .method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 9
+    .locals 2
 
     check-cast p1, Lrx/Observable;
 
-    new-instance v8, Lcom/discord/utilities/rx/OnDelayedEmissionHandler;
+    const-string v0, "it"
 
-    new-instance v1, Lf/a/b/l0;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p0}, Lf/a/b/l0;-><init>(Lf/a/b/m0;)V
+    iget-object v0, p0, Lf/a/b/m0;->d:Lcom/discord/app/AppComponent;
 
-    iget-wide v2, p0, Lf/a/b/m0;->e:J
+    iget-object v1, p0, Lf/a/b/m0;->e:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
 
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const/4 v5, 0x0
-
-    const/16 v6, 0x8
-
-    const/4 v7, 0x0
-
-    move-object v0, v8
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/utilities/rx/OnDelayedEmissionHandler;-><init>(Lkotlin/jvm/functions/Function1;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    new-instance v0, Lr0/l/a/u;
-
-    iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
-
-    invoke-direct {v0, p1, v8}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
-
-    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+    invoke-static {p1, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/b/n.smali b/com.discord/smali/f/a/b/n.smali
index 2fe1d68b6a..eb76fb51d6 100644
--- a/com.discord/smali/f/a/b/n.smali
+++ b/com.discord/smali/f/a/b/n.smali
@@ -1,148 +1,67 @@
 .class public final Lf/a/b/n;
 .super Ljava/lang/Object;
-.source "AppToast.kt"
+.source "AppState.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lf/a/b/n;
 
 
 # direct methods
-.method public static final a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+.method public static constructor <clinit>()V
     .locals 1
 
-    const/4 v0, 0x0
+    new-instance v0, Lf/a/b/n;
 
-    if-eqz p0, :cond_1
+    invoke-direct {v0}, Lf/a/b/n;-><init>()V
 
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string v0, "context.getString(toastResId)"
-
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p0, p1, p2}, Lf/a/b/n;->b(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/String;)V
+    sput-object v0, Lf/a/b/n;->d:Lf/a/b/n;
 
     return-void
-
-    :cond_0
-    const-string p0, "text"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static final b(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/String;)V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    const-string v1, "clipboard"
-
-    invoke-virtual {p0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Landroid/content/ClipboardManager;
-
-    if-nez v2, :cond_0
-
-    move-object v1, v0
-
-    :cond_0
-    check-cast v1, Landroid/content/ClipboardManager;
-
-    const-string v2, ""
-
-    invoke-static {v2, p1}, Landroid/content/ClipData;->newPlainText(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Landroid/content/ClipData;
-
-    move-result-object p1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1, p1}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
-
-    :cond_1
-    const/4 p1, 0x0
-
-    const/16 v1, 0xc
-
-    invoke-static {p0, p2, p1, v0, v1}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
-
-    return-void
-
-    :cond_2
-    const-string p0, "toastText"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "text"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+.method public constructor <init>()V
     .locals 0
 
-    and-int/lit8 p3, p3, 0x4
-
-    if-eqz p3, :cond_0
-
-    const p2, 0x7f1204d2
-
-    :cond_0
-    invoke-static {p0, p1, p2}, Lf/a/b/n;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method public static final d(Landroid/content/Context;I)V
-    .locals 3
-    .param p1    # I
-        .annotation build Landroidx/annotation/StringRes;
-        .end annotation
-    .end param
 
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    const/16 v2, 0xc
-
-    invoke-static {p0, p1, v0, v1, v2}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
-
-    return-void
-.end method
-
-.method public static final e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
-    .param p1    # I
-        .annotation build Landroidx/annotation/StringRes;
-        .end annotation
-    .end param
 
-    if-eqz p0, :cond_0
+    check-cast p1, Ljava/lang/Integer;
 
-    invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    move-result-object p1
+    move-result p1
+
+    if-lez p1, :cond_0
+
+    const/4 p1, 0x1
 
     goto :goto_0
 
@@ -150,223 +69,9 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-static {p0, p1, p2, p3}, Lf/a/b/n;->f(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;)V
-
-    return-void
-.end method
-
-.method public static final f(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;)V
-    .locals 3
-
-    if-eqz p0, :cond_2
-
-    new-instance v0, Landroid/widget/Toast;
-
-    invoke-direct {v0, p0}, Landroid/widget/Toast;-><init>(Landroid/content/Context;)V
-
-    new-instance v1, Landroid/view/ContextThemeWrapper;
-
-    const v2, 0x7f130372
-
-    invoke-direct {v1, p0, v2}, Landroid/view/ContextThemeWrapper;-><init>(Landroid/content/Context;I)V
-
-    instance-of p0, p1, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
-    if-eqz p0, :cond_0
-
-    new-instance p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
-
-    invoke-direct {p0, v1}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;-><init>(Landroid/content/Context;)V
-
-    check-cast p1, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
-
-    invoke-virtual {p0, p1}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->setDraweeSpanStringBuilder(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p0, Landroid/widget/TextView;
-
-    invoke-direct {p0, v1}, Landroid/widget/TextView;-><init>(Landroid/content/Context;)V
-
-    invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    :goto_0
-    invoke-virtual {v0, p0}, Landroid/widget/Toast;->setView(Landroid/view/View;)V
-
-    invoke-virtual {v0, p2}, Landroid/widget/Toast;->setDuration(I)V
-
-    if-eqz p3, :cond_1
-
-    invoke-virtual {p3, v0}, Lcom/discord/utilities/view/ToastManager;->show(Landroid/widget/Toast;)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0}, Landroid/widget/Toast;->show()V
-
-    :cond_2
-    :goto_1
-    return-void
-.end method
-
-.method public static final g(Landroidx/fragment/app/Fragment;I)V
-    .locals 2
-    .param p1    # I
-        .annotation build Landroidx/annotation/StringRes;
-        .end annotation
-    .end param
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x4
-
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
-
-    return-void
-.end method
-
-.method public static final h(Landroidx/fragment/app/Fragment;II)V
-    .locals 2
-    .param p1    # I
-        .annotation build Landroidx/annotation/StringRes;
-        .end annotation
-    .end param
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
-    goto :goto_0
-
-    :cond_0
-    move-object p1, v0
-
-    :goto_0
-    if-eqz p0, :cond_1
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
-
-    move-result-object p0
-
-    goto :goto_1
-
-    :cond_1
-    move-object p0, v0
-
-    :goto_1
-    const/16 v1, 0x8
-
-    invoke-static {p0, p1, p2, v0, v1}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
-
-    return-void
-.end method
-
-.method public static final i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x4
-
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
-
-    return-void
-.end method
-
-.method public static synthetic j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
-    .locals 0
-
-    and-int/lit8 p3, p4, 0x4
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 p3, p4, 0x8
-
-    const/4 p3, 0x0
-
-    invoke-static {p0, p1, p2, p3}, Lf/a/b/n;->e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
-
-    return-void
-.end method
-
-.method public static synthetic k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
-    .locals 1
-
-    and-int/lit8 v0, p4, 0x4
-
-    if-eqz v0, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 p4, p4, 0x8
-
-    if-eqz p4, :cond_1
-
-    const/4 p3, 0x0
-
-    :cond_1
-    invoke-static {p0, p1, p2, p3}, Lf/a/b/n;->f(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;)V
-
-    return-void
-.end method
-
-.method public static synthetic l(Landroidx/fragment/app/Fragment;III)V
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x4
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    invoke-static {p0, p1, p2}, Lf/a/b/n;->h(Landroidx/fragment/app/Fragment;II)V
-
-    return-void
-.end method
-
-.method public static m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
-    .locals 1
-
-    and-int/lit8 p3, p3, 0x4
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    const/4 p3, 0x0
-
-    if-eqz p0, :cond_1
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_1
-    move-object p0, p3
-
-    :goto_0
-    const/16 v0, 0x8
-
-    invoke-static {p0, p1, p2, p3, v0}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
-
-    return-void
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/n0.smali b/com.discord/smali/f/a/b/n0.smali
index 63499c3b18..f244d2d2ee 100644
--- a/com.discord/smali/f/a/b/n0.smali
+++ b/com.discord/smali/f/a/b/n0.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/b/n0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppTransformers.kt"
 
 # interfaces
@@ -9,9 +9,9 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
-        "TT;",
+        "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -19,18 +19,18 @@
 
 
 # instance fields
-.field public final synthetic $action:Lrx/functions/Action1;
+.field public final synthetic this$0:Lf/a/b/o0;
 
 
 # direct methods
-.method public constructor <init>(Lrx/functions/Action1;)V
+.method public constructor <init>(Lf/a/b/o0;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/b/n0;->$action:Lrx/functions/Action1;
+    iput-object p1, p0, Lf/a/b/n0;->this$0:Lf/a/b/o0;
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -38,12 +38,29 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    .locals 4
 
-    iget-object v0, p0, Lf/a/b/n0;->$action:Lrx/functions/Action1;
+    check-cast p1, Ljava/lang/Boolean;
 
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
+    move-result p1
+
+    iget-object v0, p0, Lf/a/b/n0;->this$0:Lf/a/b/o0;
+
+    iget-object v0, v0, Lf/a/b/o0;->d:Lcom/discord/utilities/dimmer/DimmerView;
+
+    if-eqz v0, :cond_0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, p1, v1, v2, v3}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
+
+    :cond_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
diff --git a/com.discord/smali/f/a/b/o.smali b/com.discord/smali/f/a/b/o.smali
index e8681b41e2..1c4259cd80 100644
--- a/com.discord/smali/f/a/b/o.smali
+++ b/com.discord/smali/f/a/b/o.smali
@@ -1,39 +1,61 @@
 .class public final Lf/a/b/o;
 .super Ljava/lang/Object;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lrx/Observable$c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TT;>;"
-    }
-.end annotation
+.source "AppState.kt"
 
 
 # static fields
-.field public static final d:Lf/a/b/o;
+.field public static final a:Ljava/util/ArrayList;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayList<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final b:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final c:Lf/a/b/o;
 
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 1
+    .locals 2
 
     new-instance v0, Lf/a/b/o;
 
     invoke-direct {v0}, Lf/a/b/o;-><init>()V
 
-    sput-object v0, Lf/a/b/o;->d:Lf/a/b/o;
+    sput-object v0, Lf/a/b/o;->c:Lf/a/b/o;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/4 v1, 0x4
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    sput-object v0, Lf/a/b/o;->a:Ljava/util/ArrayList;
+
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/o;->b:Lrx/subjects/BehaviorSubject;
 
     return-void
 .end method
@@ -48,18 +70,130 @@
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+.method public final declared-synchronized a(Ljava/lang/Object;)V
+    .locals 3
 
-    check-cast p1, Lrx/Observable;
+    monitor-enter p0
 
-    const-string v0, "observable"
+    :try_start_0
+    const-string v0, "consumer"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+    sget-object v0, Lf/a/b/o;->a:Ljava/util/ArrayList;
+
+    invoke-interface {v0, p1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Gateway Connection consumer add "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
-    return-object p1
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-static {v0, p1, v2, v1, v2}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+
+    sget-object p1, Lf/a/b/o;->b:Lrx/subjects/BehaviorSubject;
+
+    sget-object v0, Lf/a/b/o;->a:Ljava/util/ArrayList;
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized b(Ljava/lang/Object;)V
+    .locals 3
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "consumer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/b/o;->a:Ljava/util/ArrayList;
+
+    invoke-interface {v0, p1}, Ljava/util/Collection;->remove(Ljava/lang/Object;)Z
+
+    sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Gateway Connection consumer rm "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-static {v0, p1, v2, v1, v2}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+
+    sget-object p1, Lf/a/b/o;->b:Lrx/subjects/BehaviorSubject;
+
+    sget-object v0, Lf/a/b/o;->a:Ljava/util/ArrayList;
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
 .end method
diff --git a/com.discord/smali/f/a/b/o0.smali b/com.discord/smali/f/a/b/o0.smali
index 83ef27501f..23c61f28d5 100644
--- a/com.discord/smali/f/a/b/o0.smali
+++ b/com.discord/smali/f/a/b/o0.smali
@@ -1,241 +1,81 @@
-.class public abstract Lf/a/b/o0;
-.super Landroidx/lifecycle/ViewModel;
-.source "AppViewModel.kt"
+.class public final Lf/a/b/o0;
+.super Ljava/lang/Object;
+.source "AppTransformers.kt"
 
 # interfaces
-.implements Lcom/discord/app/AppComponent;
+.implements Lrx/Observable$c;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<V:",
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
         "Ljava/lang/Object;",
         ">",
-        "Landroidx/lifecycle/ViewModel;",
-        "Lcom/discord/app/AppComponent;"
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "TT;TT;>;"
     }
 .end annotation
 
 
 # instance fields
-.field public final paused:Lrx/subjects/Subject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/Subject<",
-            "Ljava/lang/Void;",
-            "Ljava/lang/Void;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field public final synthetic d:Lcom/discord/utilities/dimmer/DimmerView;
 
-.field public final viewStateSubject:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "TV;>;"
-        }
-    .end annotation
-.end field
+.field public final synthetic e:J
 
 
 # direct methods
-.method public constructor <init>()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-direct {p0, v0, v1, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TV;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
-
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->g0()Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lf/a/b/o0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
-
-    invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
-
-    move-result-object v0
-
-    const-string v1, "PublishSubject.create()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v0, p0, Lf/a/b/o0;->paused:Lrx/subjects/Subject;
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lf/a/b/o0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
-
-    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public constructor <init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
     .locals 0
 
-    and-int/lit8 p2, p2, 0x1
+    iput-object p1, p0, Lf/a/b/o0;->d:Lcom/discord/utilities/dimmer/DimmerView;
 
-    if-eqz p2, :cond_0
+    iput-wide p2, p0, Lf/a/b/o0;->e:J
 
-    const/4 p1, 0x0
-
-    :cond_0
-    invoke-direct {p0, p1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public getPaused()Lrx/subjects/Subject;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/subjects/Subject<",
-            "Ljava/lang/Void;",
-            "Ljava/lang/Void;",
-            ">;"
-        }
-    .end annotation
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 9
 
-    iget-object v0, p0, Lf/a/b/o0;->paused:Lrx/subjects/Subject;
+    check-cast p1, Lrx/Observable;
 
-    return-object v0
-.end method
+    new-instance v8, Lcom/discord/utilities/rx/OnDelayedEmissionHandler;
 
-.method public final getViewState()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TV;"
-        }
-    .end annotation
+    new-instance v1, Lf/a/b/n0;
 
-    iget-object v0, p0, Lf/a/b/o0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+    invoke-direct {v1, p0}, Lf/a/b/n0;-><init>(Lf/a/b/o0;)V
 
-    const-string v1, "viewStateSubject"
+    iget-wide v2, p0, Lf/a/b/o0;->e:J
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
+    const/4 v5, 0x0
 
-    move-result-object v0
+    const/16 v6, 0x8
 
-    return-object v0
-.end method
+    const/4 v7, 0x0
 
-.method public modifyPendingViewState(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TV;TV;)TV;"
-        }
-    .end annotation
+    move-object v0, v8
 
-    return-object p2
-.end method
+    invoke-direct/range {v0 .. v7}, Lcom/discord/utilities/rx/OnDelayedEmissionHandler;-><init>(Lkotlin/jvm/functions/Function1;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-.method public final observeViewState()Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "TV;>;"
-        }
-    .end annotation
+    new-instance v0, Ls0/l/a/u;
 
-    iget-object v0, p0, Lf/a/b/o0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+    iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    const-string v1, "viewStateSubject"
+    invoke-direct {v0, p1, v8}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public onCleared()V
-    .locals 2
-
-    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getPaused()Lrx/subjects/Subject;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public final requireViewState()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TV;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public updateViewState(Ljava/lang/Object;)V
-    .locals 1
-    .annotation build Landroidx/annotation/MainThread;
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TV;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0, p1}, Lf/a/b/o0;->modifyPendingViewState(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object p1
 
-    iget-object v0, p0, Lf/a/b/o0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
-
-    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
-    return-void
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/p.smali b/com.discord/smali/f/a/b/p.smali
index 9e624525ae..243e269e49 100644
--- a/com.discord/smali/f/a/b/p.smali
+++ b/com.discord/smali/f/a/b/p.smali
@@ -1,69 +1,354 @@
 .class public final Lf/a/b/p;
 .super Ljava/lang/Object;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lrx/Observable$c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lf/a/b/p;
+.source "AppToast.kt"
 
 
 # direct methods
-.method public static constructor <clinit>()V
+.method public static final a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
     .locals 1
 
-    new-instance v0, Lf/a/b/p;
+    const-string v0, "context"
 
-    invoke-direct {v0}, Lf/a/b/p;-><init>()V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lf/a/b/p;->d:Lf/a/b/p;
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string v0, "context.getString(toastResId)"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2}, Lf/a/b/p;->b(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method public constructor <init>()V
+.method public static final b(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/String;)V
+    .locals 3
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "toastText"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clipboard"
+
+    invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Landroid/content/ClipboardManager;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object v0, v2
+
+    :cond_0
+    check-cast v0, Landroid/content/ClipboardManager;
+
+    const-string v1, ""
+
+    invoke-static {v1, p1}, Landroid/content/ClipData;->newPlainText(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Landroid/content/ClipData;
+
+    move-result-object p1
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0, p1}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
+
+    :cond_1
+    const/4 p1, 0x0
+
+    const/16 v0, 0xc
+
+    invoke-static {p0, p2, p1, v2, v0}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+
+    return-void
+.end method
+
+.method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
     .locals 0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    and-int/lit8 p3, p3, 0x4
+
+    if-eqz p3, :cond_0
+
+    const p2, 0x7f1204d4
+
+    :cond_0
+    invoke-static {p0, p1, p2}, Lf/a/b/p;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
     return-void
 .end method
 
+.method public static final d(Landroid/content/Context;I)V
+    .locals 3
+    .param p1    # I
+        .annotation build Landroidx/annotation/StringRes;
+        .end annotation
+    .end param
 
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    const/16 v2, 0xc
+
+    invoke-static {p0, p1, v0, v1, v2}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+
+    return-void
+.end method
+
+.method public static final e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
+    .locals 0
+    .param p1    # I
+        .annotation build Landroidx/annotation/StringRes;
+        .end annotation
+    .end param
+
+    if-eqz p0, :cond_0
+
+    invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-static {p0, p1, p2, p3}, Lf/a/b/p;->f(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;)V
+
+    return-void
+.end method
+
+.method public static final f(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;)V
+    .locals 3
+
+    if-eqz p0, :cond_2
+
+    new-instance v0, Landroid/widget/Toast;
+
+    invoke-direct {v0, p0}, Landroid/widget/Toast;-><init>(Landroid/content/Context;)V
+
+    new-instance v1, Landroid/view/ContextThemeWrapper;
+
+    const v2, 0x7f130371
+
+    invoke-direct {v1, p0, v2}, Landroid/view/ContextThemeWrapper;-><init>(Landroid/content/Context;I)V
+
+    instance-of p0, p1, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+
+    if-eqz p0, :cond_0
+
+    new-instance p0, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
+
+    invoke-direct {p0, v1}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;-><init>(Landroid/content/Context;)V
+
+    check-cast p1, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->setDraweeSpanStringBuilder(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p0, Landroid/widget/TextView;
+
+    invoke-direct {p0, v1}, Landroid/widget/TextView;-><init>(Landroid/content/Context;)V
+
+    invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    :goto_0
+    invoke-virtual {v0, p0}, Landroid/widget/Toast;->setView(Landroid/view/View;)V
+
+    invoke-virtual {v0, p2}, Landroid/widget/Toast;->setDuration(I)V
+
+    if-eqz p3, :cond_1
+
+    invoke-virtual {p3, v0}, Lcom/discord/utilities/view/ToastManager;->show(Landroid/widget/Toast;)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0}, Landroid/widget/Toast;->show()V
+
+    :cond_2
+    :goto_1
+    return-void
+.end method
+
+.method public static final g(Landroidx/fragment/app/Fragment;I)V
+    .locals 2
+    .param p1    # I
+        .annotation build Landroidx/annotation/StringRes;
+        .end annotation
+    .end param
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x4
+
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
+
+    return-void
+.end method
+
+.method public static final h(Landroidx/fragment/app/Fragment;II)V
+    .locals 2
+    .param p1    # I
+        .annotation build Landroidx/annotation/StringRes;
+        .end annotation
+    .end param
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_0
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, v0
+
+    :goto_0
+    if-eqz p0, :cond_1
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+
+    move-result-object p0
+
+    goto :goto_1
+
+    :cond_1
+    move-object p0, v0
+
+    :goto_1
+    const/16 v1, 0x8
+
+    invoke-static {p0, p1, p2, v0, v1}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+
+    return-void
+.end method
+
+.method public static final i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x4
+
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+
+    return-void
+.end method
+
+.method public static synthetic j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    .locals 0
+
+    and-int/lit8 p3, p4, 0x4
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    and-int/lit8 p3, p4, 0x8
+
+    const/4 p3, 0x0
+
+    invoke-static {p0, p1, p2, p3}, Lf/a/b/p;->e(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
+
+    return-void
+.end method
+
+.method public static synthetic k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
     .locals 1
 
-    check-cast p1, Lrx/Observable;
+    and-int/lit8 v0, p4, 0x4
 
-    const-string v0, "observable"
+    if-eqz v0, :cond_0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 p2, 0x0
 
-    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+    :cond_0
+    and-int/lit8 p4, p4, 0x8
 
-    move-result-object p1
+    if-eqz p4, :cond_1
 
-    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
+    const/4 p3, 0x0
 
-    move-result-object p1
+    :cond_1
+    invoke-static {p0, p1, p2, p3}, Lf/a/b/p;->f(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;)V
 
-    return-object p1
+    return-void
+.end method
+
+.method public static synthetic l(Landroidx/fragment/app/Fragment;III)V
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x4
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    invoke-static {p0, p1, p2}, Lf/a/b/p;->h(Landroidx/fragment/app/Fragment;II)V
+
+    return-void
+.end method
+
+.method public static m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    .locals 1
+
+    and-int/lit8 p3, p3, 0x4
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    const/4 p3, 0x0
+
+    if-eqz p0, :cond_1
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_1
+    move-object p0, p3
+
+    :goto_0
+    const/16 v0, 0x8
+
+    invoke-static {p0, p1, p2, p3, v0}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/f/a/b/p0.smali b/com.discord/smali/f/a/b/p0.smali
index 5471be84ba..8f9671fef3 100644
--- a/com.discord/smali/f/a/b/p0.smali
+++ b/com.discord/smali/f/a/b/p0.smali
@@ -1,59 +1,50 @@
 .class public final Lf/a/b/p0;
-.super Ljava/lang/Object;
-.source "DiscordConnectService.kt"
+.super Lk0/o/c/j;
+.source "AppTransformers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Ljava/lang/Boolean;",
-        "Ljava/lang/Boolean;",
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# static fields
-.field public static final d:Lf/a/b/p0;
+# instance fields
+.field public final synthetic $action:Lrx/functions/Action1;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/b/p0;
-
-    invoke-direct {v0}, Lf/a/b/p0;-><init>()V
-
-    sput-object v0, Lf/a/b/p0;->d:Lf/a/b/p0;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
+.method public constructor <init>(Lrx/functions/Action1;)V
     .locals 0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    iput-object p1, p0, Lf/a/b/p0;->$action:Lrx/functions/Action1;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Ljava/lang/Boolean;
+    iget-object v0, p0, Lf/a/b/p0;->$action:Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/q$a.smali b/com.discord/smali/f/a/b/q$a.smali
deleted file mode 100644
index e0eb77acd4..0000000000
--- a/com.discord/smali/f/a/b/q$a.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lf/a/b/q$a;
-.super Lj0/n/c/i;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->a(Ljava/util/Collection;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lf/a/b/q$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/b/q$a;
-
-    invoke-direct {v0}, Lf/a/b/q$a;-><init>()V
-
-    sput-object v0, Lf/a/b/q$a;->d:Lf/a/b/q$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)TT;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali/f/a/b/q$b.smali b/com.discord/smali/f/a/b/q$b.smali
deleted file mode 100644
index be63cd9c38..0000000000
--- a/com.discord/smali/f/a/b/q$b.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lf/a/b/q$b;
-.super Ljava/lang/Object;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lrx/Observable$c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "Ljava/util/Map<",
-        "TK;+TV;>;",
-        "Ljava/util/Map<",
-        "TK;+TV1;>;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lf/a/b/q$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/b/q$b;
-
-    invoke-direct {v0}, Lf/a/b/q$b;-><init>()V
-
-    sput-object v0, Lf/a/b/q$b;->d:Lf/a/b/q$b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Observable;
-
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
-
-    new-instance v0, Lr0/l/e/j;
-
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/b/q$c.smali b/com.discord/smali/f/a/b/q$c.smali
deleted file mode 100644
index 88332188f9..0000000000
--- a/com.discord/smali/f/a/b/q$c.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lf/a/b/q$c;
-.super Ljava/lang/Object;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lrx/Observable$c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "Ljava/util/Map<",
-        "TK;+TV;>;",
-        "Ljava/util/Map<",
-        "TK;+TV1;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/Collection;
-
-.field public final synthetic e:Lkotlin/jvm/functions/Function1;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-
-    iput-object p1, p0, Lf/a/b/q$c;->d:Ljava/util/Collection;
-
-    iput-object p2, p0, Lf/a/b/q$c;->e:Lkotlin/jvm/functions/Function1;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Observable;
-
-    new-instance v0, Lf/a/b/u;
-
-    invoke-direct {v0, p0}, Lf/a/b/u;-><init>(Lf/a/b/q$c;)V
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/b/q$d.smali b/com.discord/smali/f/a/b/q$d.smali
deleted file mode 100644
index 18cfb187a2..0000000000
--- a/com.discord/smali/f/a/b/q$d.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lf/a/b/q$d;
-.super Ljava/lang/Object;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lrx/Observable$c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lkotlin/jvm/functions/Function1;
-
-.field public final synthetic e:Ljava/lang/Object;
-
-.field public final synthetic f:J
-
-.field public final synthetic g:Ljava/util/concurrent/TimeUnit;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)V
-    .locals 0
-
-    iput-object p1, p0, Lf/a/b/q$d;->d:Lkotlin/jvm/functions/Function1;
-
-    iput-object p2, p0, Lf/a/b/q$d;->e:Ljava/lang/Object;
-
-    iput-wide p3, p0, Lf/a/b/q$d;->f:J
-
-    iput-object p5, p0, Lf/a/b/q$d;->g:Ljava/util/concurrent/TimeUnit;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Observable;
-
-    new-instance v0, Lf/a/b/v;
-
-    invoke-direct {v0, p0}, Lf/a/b/v;-><init>(Lf/a/b/q$d;)V
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/b/q$e.smali b/com.discord/smali/f/a/b/q$e.smali
deleted file mode 100644
index a0eae41e8e..0000000000
--- a/com.discord/smali/f/a/b/q$e.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public final synthetic Lf/a/b/q$e;
-.super Lj0/n/c/g;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action1;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/functions/Action1;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/b/q$f.smali b/com.discord/smali/f/a/b/q$f.smali
deleted file mode 100644
index 6354bc3e07..0000000000
--- a/com.discord/smali/f/a/b/q$f.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public final synthetic Lf/a/b/q$f;
-.super Lj0/n/c/g;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action1;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/functions/Action1;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/b/q$g.smali b/com.discord/smali/f/a/b/q$g.smali
deleted file mode 100644
index b413dae7c9..0000000000
--- a/com.discord/smali/f/a/b/q$g.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public final synthetic Lf/a/b/q$g;
-.super Lj0/n/c/g;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action1;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/functions/Action1;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/b/q$h.smali b/com.discord/smali/f/a/b/q$h.smali
deleted file mode 100644
index 45284de99b..0000000000
--- a/com.discord/smali/f/a/b/q$h.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lf/a/b/q$h;
-.super Lj0/n/c/i;
-.source "AppTransformers.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/b/q;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
-        "Lrx/Observable<",
-        "TR;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $switchedValue:Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-
-    iput-object p1, p0, Lf/a/b/q$h;->$switchedValue:Ljava/lang/Object;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object p1, p0, Lf/a/b/q$h;->$switchedValue:Ljava/lang/Object;
-
-    new-instance v0, Lr0/l/e/j;
-
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    const-string p1, "Observable.just(switchedValue)"
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/b/q.smali b/com.discord/smali/f/a/b/q.smali
index 0c39b89deb..58143ea16a 100644
--- a/com.discord/smali/f/a/b/q.smali
+++ b/com.discord/smali/f/a/b/q.smali
@@ -2,9 +2,27 @@
 .super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
+# interfaces
+.implements Lrx/Observable$c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "TT;TT;>;"
+    }
+.end annotation
+
 
 # static fields
-.field public static final a:Lf/a/b/q;
+.field public static final d:Lf/a/b/q;
 
 
 # direct methods
@@ -15,7 +33,7 @@
 
     invoke-direct {v0}, Lf/a/b/q;-><init>()V
 
-    sput-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sput-object v0, Lf/a/b/q;->d:Lf/a/b/q;
 
     return-void
 .end method
@@ -28,843 +46,20 @@
     return-void
 .end method
 
-.method public static final a(Ljava/util/Collection;)Lrx/Observable$c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "+TK;>;)",
-            "Lrx/Observable$c<",
-            "Ljava/util/Map<",
-            "TK;TT;>;",
-            "Ljava/util/Map<",
-            "TK;TT;>;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lf/a/b/q$a;->d:Lf/a/b/q$a;
-
-    invoke-static {p0, v0}, Lf/a/b/q;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            "V1:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "+TK;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TV;+TV1;>;)",
-            "Lrx/Observable$c<",
-            "Ljava/util/Map<",
-            "TK;TV;>;",
-            "Ljava/util/Map<",
-            "TK;TV1;>;>;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object p0, Lf/a/b/q$b;->d:Lf/a/b/q$b;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lf/a/b/q$c;
-
-    invoke-direct {v0, p0, p1}, Lf/a/b/q$c;-><init>(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)V
-
-    move-object p0, v0
-
-    :goto_0
-    return-object p0
-
-    :cond_1
-    const-string p0, "valueMapper"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;TT;J",
-            "Ljava/util/concurrent/TimeUnit;",
-            ")",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p4, :cond_0
-
-    new-instance v0, Lf/a/b/q$d;
-
-    move-object v1, v0
-
-    move-object v2, p0
-
-    move-object v3, p1
-
-    move-wide v4, p2
-
-    move-object v6, p4
-
-    invoke-direct/range {v1 .. v6}, Lf/a/b/q$d;-><init>(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "timeUnit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "predicate"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
-    .locals 0
-
-    and-int/lit8 p4, p5, 0x4
-
-    if-eqz p4, :cond_0
-
-    const-wide/16 p2, 0x1388
-
-    :cond_0
-    and-int/lit8 p4, p5, 0x8
-
-    if-eqz p4, :cond_1
-
-    sget-object p4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p4, 0x0
-
-    :goto_0
-    invoke-static {p0, p1, p2, p3, p4}, Lf/a/b/q;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final e()Lrx/Observable$c;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">()",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, v1}, Lf/a/b/q;->f(ZI)Lrx/Observable$c;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public static f(ZI)Lrx/Observable$c;
-    .locals 1
-
-    const/4 v0, 0x1
-
-    and-int/2addr p1, v0
-
-    if-eqz p1, :cond_0
-
-    const/4 p0, 0x1
-
-    :cond_0
-    new-instance p1, Lf/a/b/w;
-
-    invoke-direct {p1, p0}, Lf/a/b/w;-><init>(Z)V
-
-    return-object p1
-.end method
-
-.method public static final g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lrx/functions/Action1<",
-            "-TT;>;",
-            "Ljava/lang/Class<",
-            "*>;)",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/16 v5, 0x1c
-
-    move-object v0, p0
-
-    move-object v1, p1
-
-    invoke-static/range {v0 .. v5}, Lf/a/b/q;->i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static h(Lf/a/b/q;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function0;I)Lrx/Observable$c;
-    .locals 7
-
-    and-int/lit8 p0, p7, 0x4
-
-    const/4 p4, 0x0
-
-    if-eqz p0, :cond_0
-
-    move-object v5, p4
-
-    goto :goto_0
-
-    :cond_0
-    move-object v5, p3
-
-    :goto_0
-    and-int/lit8 p0, p7, 0x8
-
-    const/4 v3, 0x0
-
-    and-int/lit8 p0, p7, 0x10
-
-    if-eqz p0, :cond_1
-
-    move-object v1, p4
-
-    goto :goto_1
-
-    :cond_1
-    move-object v1, p5
-
-    :goto_1
-    and-int/lit8 p0, p7, 0x20
-
-    const/4 v6, 0x0
-
-    new-instance p0, Lf/a/b/c0;
-
-    move-object v0, p0
-
-    move-object v2, p2
-
-    move-object v4, p1
-
-    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
-
-    return-object p0
-.end method
-
-.method public static i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
-    .locals 7
-
-    and-int/lit8 p2, p5, 0x4
-
-    const/4 v5, 0x0
-
-    and-int/lit8 p2, p5, 0x8
-
-    const/4 p4, 0x0
-
-    if-eqz p2, :cond_0
-
-    move-object p3, p4
-
-    :cond_0
-    and-int/lit8 p2, p5, 0x10
-
-    const/4 v1, 0x0
-
-    if-eqz p0, :cond_3
-
-    if-eqz p1, :cond_2
-
-    new-instance v4, Lf/a/b/y;
-
-    invoke-direct {v4, p0}, Lf/a/b/y;-><init>(Lrx/functions/Action1;)V
-
-    if-eqz p3, :cond_1
-
-    new-instance p0, Lf/a/b/n0;
-
-    invoke-direct {p0, p3}, Lf/a/b/n0;-><init>(Lrx/functions/Action1;)V
-
-    move-object v3, p0
-
-    goto :goto_0
-
-    :cond_1
-    move-object v3, p4
-
-    :goto_0
-    new-instance p0, Lf/a/b/a0;
-
-    const/4 v6, 0x0
-
-    move-object v0, p0
-
-    move-object v2, p1
-
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
-
-    return-object p0
-
-    :cond_2
-    const-string p0, "errorClass"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_3
-    const-string p0, "onNext"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-.end method
-
-.method public static j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
-    .locals 7
-
-    and-int/lit8 p1, p2, 0x2
-
-    const/4 v5, 0x0
-
-    const/4 p1, 0x0
-
-    if-eqz p0, :cond_1
-
-    sget-object v4, Lf/a/b/e0;->d:Lf/a/b/e0;
-
-    if-eqz v4, :cond_0
-
-    new-instance p1, Lf/a/b/a0;
-
-    const/4 v6, 0x0
-
-    move-object v0, p1
-
-    move-object v1, v6
-
-    move-object v2, p0
-
-    move-object v3, v6
-
-    invoke-direct/range {v0 .. v6}, Lf/a/b/a0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
-
-    return-object p1
-
-    :cond_0
-    const-string p0, "onNext"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p0, "err"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lrx/functions/Action1<",
-            "-TT;>;",
-            "Landroid/content/Context;",
-            ")",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x4
-
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/q;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lrx/functions/Action1<",
-            "-TT;>;",
-            "Landroid/content/Context;",
-            "Lrx/functions/Action1<",
-            "Lcom/discord/utilities/error/Error;",
-            ">;)",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v6, 0x0
-
-    if-eqz p0, :cond_3
-
-    new-instance v4, Lf/a/b/q$e;
-
-    invoke-direct {v4, p0}, Lf/a/b/q$e;-><init>(Lrx/functions/Action1;)V
-
-    if-eqz p2, :cond_0
-
-    new-instance p0, Lf/a/b/n0;
-
-    invoke-direct {p0, p2}, Lf/a/b/n0;-><init>(Lrx/functions/Action1;)V
-
-    goto :goto_0
-
-    :cond_0
-    move-object p0, v6
-
-    :goto_0
-    const/16 p2, 0x28
-
-    and-int/lit8 v0, p2, 0x4
-
-    if-eqz v0, :cond_1
-
-    move-object v5, v6
-
-    goto :goto_1
-
-    :cond_1
-    move-object v5, p0
-
-    :goto_1
-    and-int/lit8 p0, p2, 0x8
-
-    and-int/lit8 p0, p2, 0x10
-
-    if-eqz p0, :cond_2
-
-    move-object v1, v6
-
-    goto :goto_2
-
-    :cond_2
-    move-object v1, p1
-
-    :goto_2
-    and-int/lit8 p0, p2, 0x20
-
-    new-instance p0, Lf/a/b/c0;
-
-    const-string v2, "restClient"
-
-    move-object v0, p0
-
-    move-object v3, v6
-
-    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
-
-    return-object p0
-
-    :cond_3
-    const-string p0, "onNext"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-.end method
-
-.method public static final n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lrx/functions/Action1<",
-            "-TT;>;",
-            "Lcom/discord/app/AppDialog;",
-            ")",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    sget-object v1, Lf/a/b/q;->a:Lf/a/b/q;
-
-    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    new-instance v2, Lf/a/b/q$g;
-
-    invoke-direct {v2, p0}, Lf/a/b/q$g;-><init>(Lrx/functions/Action1;)V
-
-    invoke-virtual {v1, p1, v2, v0}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "dialog"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lrx/functions/Action1<",
-            "-TT;>;",
-            "Lcom/discord/app/AppFragment;",
-            ")",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    sget-object v1, Lf/a/b/q;->a:Lf/a/b/q;
-
-    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    new-instance v2, Lf/a/b/q$f;
-
-    invoke-direct {v2, p0}, Lf/a/b/q$f;-><init>(Lrx/functions/Action1;)V
-
-    invoke-virtual {v1, p1, v2, v0}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "fragment"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "onNext"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
-    .locals 0
-
-    and-int/lit8 p2, p3, 0x4
-
-    const/4 p2, 0x0
-
-    invoke-static {p0, p1, p2}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            "R:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;TR;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+",
-            "Lrx/Observable<",
-            "TR;>;>;)",
-            "Lrx/Observable$c<",
-            "TT;TR;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p2, :cond_0
-
-    new-instance v0, Lf/a/b/q$h;
-
-    invoke-direct {v0, p1}, Lf/a/b/q$h;-><init>(Ljava/lang/Object;)V
-
-    new-instance p1, Lf/a/b/g0;
-
-    invoke-direct {p1, p0, v0, p2}, Lf/a/b/g0;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-
-    return-object p1
-
-    :cond_0
-    const-string p0, "defaultObservableFunc"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "observableCondition"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lcom/discord/app/AppComponent;",
-            ")",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x2
-
-    invoke-static {p0, v0, v1}, Lf/a/b/q;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
-    .locals 0
-
-    and-int/lit8 p1, p2, 0x2
-
-    const/4 p1, 0x0
-
-    if-eqz p0, :cond_0
-
-    new-instance p2, Lf/a/b/k0;
-
-    invoke-direct {p2, p0, p1}, Lf/a/b/k0;-><init>(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
-
-    return-object p2
-
-    :cond_0
-    const-string p0, "appComponent"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lcom/discord/utilities/dimmer/DimmerView;",
-            ")",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
-
-    const-wide/16 v0, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p0, v0, v1, v2}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const-wide/16 p1, 0x1c2
-
-    :cond_0
-    new-instance p3, Lf/a/b/m0;
-
-    invoke-direct {p3, p0, p1, p2}, Lf/a/b/m0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
-
-    return-object p3
-.end method
-
 
 # virtual methods
-.method public final k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Landroid/content/Context;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;",
-            "Lkotlin/Unit;",
-            ">;",
-            "Lrx/functions/Action1<",
-            "Lcom/discord/utilities/error/Error;",
-            ">;)",
-            "Lrx/Observable$c<",
-            "TT;TT;>;"
-        }
-    .end annotation
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
 
-    const/4 v0, 0x0
+    check-cast p1, Lrx/Observable;
 
-    if-eqz p2, :cond_1
+    const-string v0, "observable"
 
-    if-eqz p3, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lf/a/b/n0;
-
-    invoke-direct {v0, p3}, Lf/a/b/n0;-><init>(Lrx/functions/Action1;)V
-
-    :cond_0
-    move-object v4, v0
-
-    const/4 v5, 0x0
-
-    const/4 v7, 0x0
-
-    const/16 v8, 0x28
-
-    const-string v3, "restClient"
-
-    move-object v1, p0
-
-    move-object v2, p2
-
-    move-object v6, p1
-
-    invoke-static/range {v1 .. v8}, Lf/a/b/q;->h(Lf/a/b/q;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function0;I)Lrx/Observable$c;
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "onNext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/b/q0.smali b/com.discord/smali/f/a/b/q0.smali
index a28000f9e2..b502870185 100644
--- a/com.discord/smali/f/a/b/q0.smali
+++ b/com.discord/smali/f/a/b/q0.smali
@@ -1,79 +1,234 @@
-.class public final Lf/a/b/q0;
-.super Ljava/lang/Object;
-.source "DiscordConnectService.kt"
+.class public abstract Lf/a/b/q0;
+.super Landroidx/lifecycle/ViewModel;
+.source "AppViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Lcom/discord/app/AppComponent;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lcom/discord/rtcconnection/RtcConnection$State;",
-        "Ljava/lang/Boolean;",
-        ">;"
+        "Landroidx/lifecycle/ViewModel;",
+        "Lcom/discord/app/AppComponent;"
     }
 .end annotation
 
 
-# static fields
-.field public static final d:Lf/a/b/q0;
+# instance fields
+.field public final unsubscribeSignal:Lrx/subjects/Subject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/Subject<",
+            "Ljava/lang/Void;",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final viewStateSubject:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "TV;>;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>()V
+    .locals 2
 
-    new-instance v0, Lf/a/b/q0;
+    const/4 v0, 0x0
 
-    invoke-direct {v0}, Lf/a/b/q0;-><init>()V
+    const/4 v1, 0x1
 
-    sput-object v0, Lf/a/b/q0;->d:Lf/a/b/q0;
+    invoke-direct {p0, v0, v1, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-void
 .end method
 
-.method public constructor <init>()V
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TV;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->g0()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lf/a/b/q0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
+
+    move-result-object v0
+
+    const-string v1, "PublishSubject.create()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p0, Lf/a/b/q0;->unsubscribeSignal:Lrx/subjects/Subject;
+
+    if-eqz p1, :cond_0
+
+    iget-object v0, p0, Lf/a/b/q0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    const/4 p1, 0x0
+
+    :cond_0
+    invoke-direct {p0, p1}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/subjects/Subject<",
+            "Ljava/lang/Void;",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
 
-    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+    iget-object v0, p0, Lf/a/b/q0;->unsubscribeSignal:Lrx/subjects/Subject;
 
-    instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
+    return-object v0
+.end method
 
-    if-nez v0, :cond_0
+.method public final getViewState()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TV;"
+        }
+    .end annotation
 
-    instance-of p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$h;
+    iget-object v0, p0, Lf/a/b/q0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    if-nez p1, :cond_0
+    const-string/jumbo v1, "viewStateSubject"
 
-    const/4 p1, 0x1
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_0
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
 
-    :cond_0
-    const/4 p1, 0x0
+    move-result-object v0
 
-    :goto_0
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    return-object v0
+.end method
+
+.method public modifyPendingViewState(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TV;TV;)TV;"
+        }
+    .end annotation
+
+    return-object p2
+.end method
+
+.method public final observeViewState()Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "TV;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lf/a/b/q0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    const-string/jumbo v1, "viewStateSubject"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public onCleared()V
+    .locals 2
+
+    invoke-super {p0}, Landroidx/lifecycle/ViewModel;->onCleared()V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getUnsubscribeSignal()Lrx/subjects/Subject;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final requireViewState()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TV;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+.method public updateViewState(Ljava/lang/Object;)V
+    .locals 1
+    .annotation build Landroidx/annotation/MainThread;
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TV;)V"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0, p1}, Lf/a/b/q0;->modifyPendingViewState(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
-    return-object p1
+    iget-object v0, p0, Lf/a/b/q0;->viewStateSubject:Lrx/subjects/BehaviorSubject;
+
+    invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/f/a/b/r.smali b/com.discord/smali/f/a/b/r.smali
index 7a9ee3cf0b..2f23c0f23d 100644
--- a/com.discord/smali/f/a/b/r.smali
+++ b/com.discord/smali/f/a/b/r.smali
@@ -3,7 +3,7 @@
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Lrx/Observable$c;
 
 
 # annotations
@@ -15,23 +15,31 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TK;",
-        "Ljava/lang/Boolean;",
-        ">;"
+        "Lrx/Observable$c<",
+        "TT;TT;>;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic d:Ljava/util/Map;
+# static fields
+.field public static final d:Lf/a/b/r;
 
 
 # direct methods
-.method public constructor <init>(Ljava/util/Map;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lf/a/b/r;->d:Ljava/util/Map;
+    new-instance v0, Lf/a/b/r;
+
+    invoke-direct {v0}, Lf/a/b/r;-><init>()V
+
+    sput-object v0, Lf/a/b/r;->d:Lf/a/b/r;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,13 +51,17 @@
 .method public call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lf/a/b/r;->d:Ljava/util/Map;
+    check-cast p1, Lrx/Observable;
 
-    invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    const-string v0, "observable"
 
-    move-result p1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/b/r0.smali b/com.discord/smali/f/a/b/r0.smali
index 19448b857c..c14f9ff9a2 100644
--- a/com.discord/smali/f/a/b/r0.smali
+++ b/com.discord/smali/f/a/b/r0.smali
@@ -3,7 +3,7 @@
 .source "DiscordConnectService.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,10 +15,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TR;>;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -51,25 +51,9 @@
 
 # virtual methods
 .method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    .locals 0
 
     check-cast p1, Ljava/lang/Boolean;
 
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getRtcConnection()Lcom/discord/stores/StoreRtcConnection;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object v0, Lf/a/b/q0;->d:Lf/a/b/q0;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/s$a.smali b/com.discord/smali/f/a/b/s$a.smali
new file mode 100644
index 0000000000..9564eff55f
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$a.smali
@@ -0,0 +1,68 @@
+.class public final Lf/a/b/s$a;
+.super Lk0/o/c/j;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->a(Ljava/util/Collection;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lf/a/b/s$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/b/s$a;
+
+    invoke-direct {v0}, Lf/a/b/s$a;-><init>()V
+
+    sput-object v0, Lf/a/b/s$a;->d:Lf/a/b/s$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)TT;"
+        }
+    .end annotation
+
+    invoke-static {p1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/s$b.smali b/com.discord/smali/f/a/b/s$b.smali
new file mode 100644
index 0000000000..8091e647ca
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$b.smali
@@ -0,0 +1,75 @@
+.class public final Lf/a/b/s$b;
+.super Ljava/lang/Object;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lrx/Observable$c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "Ljava/util/Map<",
+        "TK;+TV;>;",
+        "Ljava/util/Map<",
+        "TK;+TV1;>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lf/a/b/s$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/b/s$b;
+
+    invoke-direct {v0}, Lf/a/b/s$b;-><init>()V
+
+    sput-object v0, Lf/a/b/s$b;->d:Lf/a/b/s$b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Observable;
+
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
+
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/b/s$c.smali b/com.discord/smali/f/a/b/s$c.smali
new file mode 100644
index 0000000000..cdd42da9a6
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$c.smali
@@ -0,0 +1,75 @@
+.class public final Lf/a/b/s$c;
+.super Ljava/lang/Object;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lrx/Observable$c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "Ljava/util/Map<",
+        "TK;+TV;>;",
+        "Ljava/util/Map<",
+        "TK;+TV1;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/Collection;
+
+.field public final synthetic e:Lkotlin/jvm/functions/Function1;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    iput-object p1, p0, Lf/a/b/s$c;->d:Ljava/util/Collection;
+
+    iput-object p2, p0, Lf/a/b/s$c;->e:Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Observable;
+
+    new-instance v0, Lf/a/b/w;
+
+    invoke-direct {v0, p0}, Lf/a/b/w;-><init>(Lf/a/b/s$c;)V
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/s$d.smali b/com.discord/smali/f/a/b/s$d.smali
new file mode 100644
index 0000000000..96a80d58cd
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$d.smali
@@ -0,0 +1,76 @@
+.class public final Lf/a/b/s$d;
+.super Ljava/lang/Object;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lrx/Observable$c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lkotlin/jvm/functions/Function1;
+
+.field public final synthetic e:Ljava/lang/Object;
+
+.field public final synthetic f:J
+
+.field public final synthetic g:Ljava/util/concurrent/TimeUnit;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)V
+    .locals 0
+
+    iput-object p1, p0, Lf/a/b/s$d;->d:Lkotlin/jvm/functions/Function1;
+
+    iput-object p2, p0, Lf/a/b/s$d;->e:Ljava/lang/Object;
+
+    iput-wide p3, p0, Lf/a/b/s$d;->f:J
+
+    iput-object p5, p0, Lf/a/b/s$d;->g:Ljava/util/concurrent/TimeUnit;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Observable;
+
+    new-instance v0, Lf/a/b/x;
+
+    invoke-direct {v0, p0}, Lf/a/b/x;-><init>(Lf/a/b/s$d;)V
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/s$e.smali b/com.discord/smali/f/a/b/s$e.smali
new file mode 100644
index 0000000000..9c899ea207
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$e.smali
@@ -0,0 +1,67 @@
+.class public final synthetic Lf/a/b/s$e;
+.super Lk0/o/c/h;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action1;)V
+    .locals 7
+
+    const-class v3, Lrx/functions/Action1;
+
+    const/4 v1, 0x1
+
+    const-string v4, "call"
+
+    const-string v5, "call(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/s$f.smali b/com.discord/smali/f/a/b/s$f.smali
new file mode 100644
index 0000000000..6f7643cb7b
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$f.smali
@@ -0,0 +1,67 @@
+.class public final synthetic Lf/a/b/s$f;
+.super Lk0/o/c/h;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action1;)V
+    .locals 7
+
+    const-class v3, Lrx/functions/Action1;
+
+    const/4 v1, 0x1
+
+    const-string v4, "call"
+
+    const-string v5, "call(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/s$g.smali b/com.discord/smali/f/a/b/s$g.smali
new file mode 100644
index 0000000000..b2e5342e2a
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$g.smali
@@ -0,0 +1,67 @@
+.class public final synthetic Lf/a/b/s$g;
+.super Lk0/o/c/h;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1019
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action1;)V
+    .locals 7
+
+    const-class v3, Lrx/functions/Action1;
+
+    const/4 v1, 0x1
+
+    const-string v4, "call"
+
+    const-string v5, "call(Ljava/lang/Object;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/s$h.smali b/com.discord/smali/f/a/b/s$h.smali
new file mode 100644
index 0000000000..5958311a39
--- /dev/null
+++ b/com.discord/smali/f/a/b/s$h.smali
@@ -0,0 +1,63 @@
+.class public final Lf/a/b/s$h;
+.super Lk0/o/c/j;
+.source "AppTransformers.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/a/b/s;->q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Lrx/Observable<",
+        "TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $switchedValue:Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+
+    iput-object p1, p0, Lf/a/b/s$h;->$switchedValue:Ljava/lang/Object;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object p1, p0, Lf/a/b/s$h;->$switchedValue:Ljava/lang/Object;
+
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    const-string p1, "Observable.just(switchedValue)"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/b/s.smali b/com.discord/smali/f/a/b/s.smali
index 29c2d5f9d3..ff6fdb0de3 100644
--- a/com.discord/smali/f/a/b/s.smali
+++ b/com.discord/smali/f/a/b/s.smali
@@ -2,27 +2,9 @@
 .super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TK;>;"
-    }
-.end annotation
-
 
 # static fields
-.field public static final d:Lf/a/b/s;
+.field public static final a:Lf/a/b/s;
 
 
 # direct methods
@@ -33,7 +15,7 @@
 
     invoke-direct {v0}, Lf/a/b/s;-><init>()V
 
-    sput-object v0, Lf/a/b/s;->d:Lf/a/b/s;
+    sput-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     return-void
 .end method
@@ -46,15 +28,799 @@
     return-void
 .end method
 
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public static final a(Ljava/util/Collection;)Lrx/Observable$c;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(TK;)TK;"
+            "<K:",
+            "Ljava/lang/Object;",
+            "T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Collection<",
+            "+TK;>;)",
+            "Lrx/Observable$c<",
+            "Ljava/util/Map<",
+            "TK;TT;>;",
+            "Ljava/util/Map<",
+            "TK;TT;>;>;"
         }
     .end annotation
 
+    const-string v0, "filterKeys"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/b/s$a;->d:Lf/a/b/s$a;
+
+    invoke-static {p0, v0}, Lf/a/b/s;->b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final b(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K:",
+            "Ljava/lang/Object;",
+            "V:",
+            "Ljava/lang/Object;",
+            "V1:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Collection<",
+            "+TK;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TV;+TV1;>;)",
+            "Lrx/Observable$c<",
+            "Ljava/util/Map<",
+            "TK;TV;>;",
+            "Ljava/util/Map<",
+            "TK;TV1;>;>;"
+        }
+    .end annotation
+
+    const-string/jumbo v0, "valueMapper"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object p0, Lf/a/b/s$b;->d:Lf/a/b/s$b;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lf/a/b/s$c;
+
+    invoke-direct {v0, p0, p1}, Lf/a/b/s$c;-><init>(Ljava/util/Collection;Lkotlin/jvm/functions/Function1;)V
+
+    move-object p0, v0
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;TT;J",
+            "Ljava/util/concurrent/TimeUnit;",
+            ")",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "predicate"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "timeUnit"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lf/a/b/s$d;
+
+    move-object v1, v0
+
+    move-object v2, p0
+
+    move-object v3, p1
+
+    move-wide v4, p2
+
+    move-object v6, p4
+
+    invoke-direct/range {v1 .. v6}, Lf/a/b/s$d;-><init>(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)V
+
+    return-object v0
+.end method
+
+.method public static synthetic d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
+    .locals 0
+
+    and-int/lit8 p4, p5, 0x4
+
+    if-eqz p4, :cond_0
+
+    const-wide/16 p2, 0x1388
+
+    :cond_0
+    and-int/lit8 p4, p5, 0x8
+
+    if-eqz p4, :cond_1
+
+    sget-object p4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p4, 0x0
+
+    :goto_0
+    invoke-static {p0, p1, p2, p3, p4}, Lf/a/b/s;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final e()Lrx/Observable$c;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">()",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-static {v0, v1}, Lf/a/b/s;->f(ZI)Lrx/Observable$c;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static f(ZI)Lrx/Observable$c;
+    .locals 1
+
+    const/4 v0, 0x1
+
+    and-int/2addr p1, v0
+
+    if-eqz p1, :cond_0
+
+    const/4 p0, 0x1
+
+    :cond_0
+    new-instance p1, Lf/a/b/y;
+
+    invoke-direct {p1, p0}, Lf/a/b/y;-><init>(Z)V
+
+    return-object p1
+.end method
+
+.method public static final g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/functions/Action1<",
+            "-TT;>;",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v5, 0x1c
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-static/range {v0 .. v5}, Lf/a/b/s;->i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static h(Lf/a/b/s;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function0;I)Lrx/Observable$c;
+    .locals 7
+
+    and-int/lit8 p0, p7, 0x4
+
+    const/4 p4, 0x0
+
+    if-eqz p0, :cond_0
+
+    move-object v5, p4
+
+    goto :goto_0
+
+    :cond_0
+    move-object v5, p3
+
+    :goto_0
+    and-int/lit8 p0, p7, 0x8
+
+    const/4 v3, 0x0
+
+    and-int/lit8 p0, p7, 0x10
+
+    if-eqz p0, :cond_1
+
+    move-object v1, p4
+
+    goto :goto_1
+
+    :cond_1
+    move-object v1, p5
+
+    :goto_1
+    and-int/lit8 p0, p7, 0x20
+
+    const/4 v6, 0x0
+
+    const-string p0, "onNext"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "errorTag"
+
+    invoke-static {p2, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Lf/a/b/e0;
+
+    move-object v0, p0
+
+    move-object v2, p2
+
+    move-object v4, p1
+
+    invoke-direct/range {v0 .. v6}, Lf/a/b/e0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+
+    return-object p0
+.end method
+
+.method public static i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
+    .locals 7
+
+    and-int/lit8 p2, p5, 0x4
+
+    const/4 v5, 0x0
+
+    and-int/lit8 p2, p5, 0x8
+
+    if-eqz p2, :cond_0
+
+    const/4 p3, 0x0
+
+    :cond_0
+    and-int/lit8 p2, p5, 0x10
+
+    const/4 v1, 0x0
+
+    const-string p2, "onNext"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "errorClass"
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Lf/a/b/a0;
+
+    invoke-direct {v4, p0}, Lf/a/b/a0;-><init>(Lrx/functions/Action1;)V
+
+    const/4 v6, 0x0
+
+    if-eqz p3, :cond_1
+
+    new-instance p0, Lf/a/b/p0;
+
+    invoke-direct {p0, p3}, Lf/a/b/p0;-><init>(Lrx/functions/Action1;)V
+
+    move-object v3, p0
+
+    goto :goto_0
+
+    :cond_1
+    move-object v3, v6
+
+    :goto_0
+    invoke-static {v4, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Lf/a/b/c0;
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+
+    return-object p0
+.end method
+
+.method public static j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
+    .locals 7
+
+    and-int/lit8 p1, p2, 0x2
+
+    const/4 v5, 0x0
+
+    const-string p1, "err"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Lf/a/b/g0;->d:Lf/a/b/g0;
+
+    const/4 v6, 0x0
+
+    const-string p1, "onNext"
+
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "errorClass"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/b/c0;
+
+    move-object v0, p1
+
+    move-object v1, v6
+
+    move-object v2, p0
+
+    move-object v3, v6
+
+    invoke-direct/range {v0 .. v6}, Lf/a/b/c0;-><init>(Landroid/content/Context;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;Lkotlin/jvm/functions/Function0;)V
+
+    return-object p1
+.end method
+
+.method public static final l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/functions/Action1<",
+            "-TT;>;",
+            "Landroid/content/Context;",
+            ")",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x4
+
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/s;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/functions/Action1<",
+            "-TT;>;",
+            "Landroid/content/Context;",
+            "Lrx/functions/Action1<",
+            "Lcom/discord/utilities/error/Error;",
+            ">;)",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "onNext"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Lf/a/b/s$e;
+
+    invoke-direct {v5, p0}, Lf/a/b/s$e;-><init>(Lrx/functions/Action1;)V
+
+    const/4 v7, 0x0
+
+    if-eqz p2, :cond_0
+
+    new-instance p0, Lf/a/b/p0;
+
+    invoke-direct {p0, p2}, Lf/a/b/p0;-><init>(Lrx/functions/Action1;)V
+
+    goto :goto_0
+
+    :cond_0
+    move-object p0, v7
+
+    :goto_0
+    const/16 p2, 0x28
+
+    and-int/lit8 v1, p2, 0x4
+
+    if-eqz v1, :cond_1
+
+    move-object v6, v7
+
+    goto :goto_1
+
+    :cond_1
+    move-object v6, p0
+
+    :goto_1
+    and-int/lit8 p0, p2, 0x8
+
+    and-int/lit8 p0, p2, 0x10
+
+    if-eqz p0, :cond_2
+
+    move-object v2, v7
+
+    goto :goto_2
+
+    :cond_2
+    move-object v2, p1
+
+    :goto_2
+    and-int/lit8 p0, p2, 0x20
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "restClient"
+
+    const-string p0, "errorTag"
+
+    invoke-static {v3, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Lf/a/b/e0;
+
+    move-object v1, p0
+
+    move-object v4, v7
+
+    invoke-direct/range {v1 .. v7}, Lf/a/b/e0;-><init>(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+
+    return-object p0
+.end method
+
+.method public static final n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/functions/Action1<",
+            "-TT;>;",
+            "Lcom/discord/app/AppDialog;",
+            ")",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "onNext"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "dialog"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
+
+    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    new-instance v1, Lf/a/b/s$g;
+
+    invoke-direct {v1, p0}, Lf/a/b/s$g;-><init>(Lrx/functions/Action1;)V
+
+    const/4 p0, 0x0
+
+    invoke-virtual {v0, p1, v1, p0}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/functions/Action1<",
+            "-TT;>;",
+            "Lcom/discord/app/AppFragment;",
+            ")",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "onNext"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
+
+    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    new-instance v1, Lf/a/b/s$f;
+
+    invoke-direct {v1, p0}, Lf/a/b/s$f;-><init>(Lrx/functions/Action1;)V
+
+    const/4 p0, 0x0
+
+    invoke-virtual {v0, p1, v1, p0}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static synthetic p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
+    .locals 0
+
+    and-int/lit8 p2, p3, 0x4
+
+    const/4 p2, 0x0
+
+    invoke-static {p0, p1, p2}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final q(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lrx/Observable$c;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            "R:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;TR;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+",
+            "Lrx/Observable<",
+            "TR;>;>;)",
+            "Lrx/Observable$c<",
+            "TT;TR;>;"
+        }
+    .end annotation
+
+    const-string v0, "observableCondition"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "defaultObservableFunc"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lf/a/b/s$h;
+
+    invoke-direct {v2, p1}, Lf/a/b/s$h;-><init>(Ljava/lang/Object;)V
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "switchedObservableFunc"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/a/b/i0;
+
+    invoke-direct {p1, p0, v2, p2}, Lf/a/b/i0;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+
+    return-object p1
+.end method
+
+.method public static final r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lcom/discord/app/AppComponent;",
+            ")",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    invoke-static {p0, v0, v1}, Lf/a/b/s;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
+    .locals 0
+
+    and-int/lit8 p1, p2, 0x2
+
+    const/4 p1, 0x0
+
+    const-string p2, "appComponent"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lf/a/b/m0;
+
+    invoke-direct {p2, p0, p1}, Lf/a/b/m0;-><init>(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
+
+    return-object p2
+.end method
+
+.method public static final t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lcom/discord/utilities/dimmer/DimmerView;",
+            ")",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const-wide/16 v0, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p0, v0, v1, v2}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const-wide/16 p1, 0x1c2
+
+    :cond_0
+    new-instance p3, Lf/a/b/o0;
+
+    invoke-direct {p3, p0, p1, p2}, Lf/a/b/o0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
+
+    return-object p3
+.end method
+
+
+# virtual methods
+.method public final k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Landroid/content/Context;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;",
+            "Lkotlin/Unit;",
+            ">;",
+            "Lrx/functions/Action1<",
+            "Lcom/discord/utilities/error/Error;",
+            ">;)",
+            "Lrx/Observable$c<",
+            "TT;TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "onNext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p3, :cond_0
+
+    new-instance v0, Lf/a/b/p0;
+
+    invoke-direct {v0, p3}, Lf/a/b/p0;-><init>(Lrx/functions/Action1;)V
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    move-object v4, v0
+
+    const/4 v5, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x28
+
+    const-string v3, "restClient"
+
+    move-object v1, p0
+
+    move-object v2, p2
+
+    move-object v6, p1
+
+    invoke-static/range {v1 .. v8}, Lf/a/b/s;->h(Lf/a/b/s;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function0;I)Lrx/Observable$c;
+
+    move-result-object p1
+
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/s0.smali b/com.discord/smali/f/a/b/s0.smali
index a71ccfd8c7..5f32453bda 100644
--- a/com.discord/smali/f/a/b/s0.smali
+++ b/com.discord/smali/f/a/b/s0.smali
@@ -1,31 +1,29 @@
 .class public final Lf/a/b/s0;
 .super Ljava/lang/Object;
-.source "NativeLoader.kt"
+.source "DiscordConnectService.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
 
 
 # static fields
-.field public static final a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final b:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static c:Z
-
 .field public static final d:Lf/a/b/s0;
 
 
@@ -39,20 +37,6 @@
 
     sput-object v0, Lf/a/b/s0;->d:Lf/a/b/s0;
 
-    const-string v0, "dsti"
-
-    invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/s0;->a:Ljava/util/List;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    sput-object v0, Lf/a/b/s0;->b:Ljava/util/List;
-
     return-void
 .end method
 
@@ -63,3 +47,33 @@
 
     return-void
 .end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+
+    instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
+
+    if-nez v0, :cond_0
+
+    instance-of p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$h;
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/t.smali b/com.discord/smali/f/a/b/t.smali
index fc124db4d8..50a0a344f2 100644
--- a/com.discord/smali/f/a/b/t.smali
+++ b/com.discord/smali/f/a/b/t.smali
@@ -3,7 +3,7 @@
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,25 +15,23 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TV;>;"
+        "Ls0/k/b<",
+        "TK;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
 
 # instance fields
-.field public final synthetic d:Lf/a/b/u;
-
-.field public final synthetic e:Ljava/util/Map;
+.field public final synthetic d:Ljava/util/Map;
 
 
 # direct methods
-.method public constructor <init>(Lf/a/b/u;Ljava/util/Map;)V
+.method public constructor <init>(Ljava/util/Map;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/b/t;->d:Lf/a/b/u;
-
-    iput-object p2, p0, Lf/a/b/t;->e:Ljava/util/Map;
+    iput-object p1, p0, Lf/a/b/t;->d:Ljava/util/Map;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,27 +40,16 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TK;)TV1;"
-        }
-    .end annotation
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
 
-    iget-object v0, p0, Lf/a/b/t;->d:Lf/a/b/u;
+    iget-object v0, p0, Lf/a/b/t;->d:Ljava/util/Map;
 
-    iget-object v0, v0, Lf/a/b/u;->d:Lf/a/b/q$c;
+    invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    iget-object v0, v0, Lf/a/b/q$c;->e:Lkotlin/jvm/functions/Function1;
+    move-result p1
 
-    iget-object v1, p0, Lf/a/b/t;->e:Ljava/util/Map;
-
-    invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/b/t0.smali b/com.discord/smali/f/a/b/t0.smali
new file mode 100644
index 0000000000..67460c016c
--- /dev/null
+++ b/com.discord/smali/f/a/b/t0.smali
@@ -0,0 +1,77 @@
+.class public final Lf/a/b/t0;
+.super Ljava/lang/Object;
+.source "DiscordConnectService.kt"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/Boolean;",
+        "Lrx/Observable<",
+        "+",
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lf/a/b/t0;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/b/t0;
+
+    invoke-direct {v0}, Lf/a/b/t0;-><init>()V
+
+    sput-object v0, Lf/a/b/t0;->d:Lf/a/b/t0;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getRtcConnection()Lcom/discord/stores/StoreRtcConnection;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
+
+    move-result-object p1
+
+    sget-object v0, Lf/a/b/s0;->d:Lf/a/b/s0;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/t0/a.smali b/com.discord/smali/f/a/b/t0/a.smali
deleted file mode 100644
index abe26c4bbd..0000000000
--- a/com.discord/smali/f/a/b/t0/a.smali
+++ /dev/null
@@ -1,33 +0,0 @@
-.class public final Lf/a/b/t0/a;
-.super Ljava/lang/Object;
-.source "Intents.kt"
-
-
-# static fields
-.field public static final a:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final b:Lf/a/b/t0/a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const-string v0, "com.discord.intent.category.DIRECT_SHARE_TARGET"
-
-    invoke-static {v0}, Lf/n/a/k/a;->setOf(Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/t0/a;->a:Ljava/util/Set;
-
-    return-void
-.end method
diff --git a/com.discord/smali/f/a/b/t0/b.smali b/com.discord/smali/f/a/b/t0/b.smali
deleted file mode 100644
index 90960936e6..0000000000
--- a/com.discord/smali/f/a/b/t0/b.smali
+++ /dev/null
@@ -1,695 +0,0 @@
-.class public final Lf/a/b/t0/b;
-.super Ljava/lang/Object;
-.source "RoutingPatterns.kt"
-
-
-# static fields
-.field public static final A:Lkotlin/text/Regex;
-
-.field public static final B:Lkotlin/text/Regex;
-
-.field public static final C:Lkotlin/text/Regex;
-
-.field public static final D:Lkotlin/text/Regex;
-
-.field public static final E:Lf/a/b/t0/b;
-
-.field public static final a:Ljava/lang/String;
-
-.field public static final b:Ljava/lang/String;
-
-.field public static final c:Ljava/lang/String;
-
-.field public static final d:Ljava/lang/String;
-
-.field public static final e:Ljava/lang/String;
-
-.field public static final f:Ljava/lang/String;
-
-.field public static final g:Ljava/lang/String;
-
-.field public static final h:Ljava/lang/String;
-
-.field public static final i:Ljava/lang/String;
-
-.field public static final j:Ljava/lang/String;
-
-.field public static final k:Ljava/lang/String;
-
-.field public static final l:Lkotlin/text/Regex;
-
-.field public static final m:Lkotlin/text/Regex;
-
-.field public static final n:Lkotlin/text/Regex;
-
-.field public static final o:Lkotlin/text/Regex;
-
-.field public static final p:Lkotlin/text/Regex;
-
-.field public static final q:Lkotlin/text/Regex;
-
-.field public static final r:Lkotlin/text/Regex;
-
-.field public static final s:Lkotlin/text/Regex;
-
-.field public static final t:Lkotlin/text/Regex;
-
-.field public static final u:Lkotlin/text/Regex;
-
-.field public static final v:Lkotlin/text/Regex;
-
-.field public static final w:Lkotlin/text/Regex;
-
-.field public static final x:Lkotlin/text/Regex;
-
-.field public static final y:Lkotlin/text/Regex;
-
-.field public static final z:Lkotlin/text/Regex;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 8
-
-    new-instance v0, Lf/a/b/t0/b;
-
-    invoke-direct {v0}, Lf/a/b/t0/b;-><init>()V
-
-    sput-object v0, Lf/a/b/t0/b;->E:Lf/a/b/t0/b;
-
-    const-string v1, "https://discord.com"
-
-    invoke-virtual {v0, v1}, Lf/a/b/t0/b;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    sput-object v1, Lf/a/b/t0/b;->a:Ljava/lang/String;
-
-    const-string v1, "https://discordapp.com"
-
-    invoke-virtual {v0, v1}, Lf/a/b/t0/b;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    sput-object v1, Lf/a/b/t0/b;->b:Ljava/lang/String;
-
-    const-string v1, "https://discord.gift"
-
-    invoke-virtual {v0, v1}, Lf/a/b/t0/b;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    sput-object v1, Lf/a/b/t0/b;->c:Ljava/lang/String;
-
-    const-string v1, "https://discord.gg"
-
-    invoke-virtual {v0, v1}, Lf/a/b/t0/b;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    sput-object v1, Lf/a/b/t0/b;->d:Ljava/lang/String;
-
-    const-string v1, "https://discord.new"
-
-    invoke-virtual {v0, v1}, Lf/a/b/t0/b;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/t0/b;->e:Ljava/lang/String;
-
-    sget-object v0, Lf/a/b/t0/b;->a:Ljava/lang/String;
-
-    const-string v1, "."
-
-    const-string v2, "\\."
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x4
-
-    invoke-static {v0, v1, v2, v3, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/t0/b;->f:Ljava/lang/String;
-
-    sget-object v0, Lf/a/b/t0/b;->b:Ljava/lang/String;
-
-    invoke-static {v0, v1, v2, v3, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Lf/a/b/t0/b;->g:Ljava/lang/String;
-
-    const-string v0, "(?:"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v5
-
-    sget-object v6, Lf/a/b/t0/b;->f:Ljava/lang/String;
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v6, 0x7c
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    sget-object v6, Lf/a/b/t0/b;->g:Ljava/lang/String;
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v6, 0x29
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    sput-object v5, Lf/a/b/t0/b;->h:Ljava/lang/String;
-
-    sget-object v5, Lf/a/b/t0/b;->c:Ljava/lang/String;
-
-    invoke-static {v5, v1, v2, v3, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v5
-
-    sput-object v5, Lf/a/b/t0/b;->i:Ljava/lang/String;
-
-    sget-object v5, Lf/a/b/t0/b;->d:Ljava/lang/String;
-
-    invoke-static {v5, v1, v2, v3, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v5
-
-    sput-object v5, Lf/a/b/t0/b;->j:Ljava/lang/String;
-
-    sget-object v5, Lf/a/b/t0/b;->e:Ljava/lang/String;
-
-    invoke-static {v5, v1, v2, v3, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v1
-
-    sput-object v1, Lf/a/b/t0/b;->k:Ljava/lang/String;
-
-    const-string v1, "^(?:ptb|canary|www)."
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    sget-object v2, Lf/a/b/t0/b;->h:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x24
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    sget-object v2, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v3, Lkotlin/text/Regex;
-
-    invoke-direct {v3, v1, v2}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v3, Lf/a/b/t0/b;->l:Lkotlin/text/Regex;
-
-    sget-object v1, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v2, Lkotlin/text/Regex;
-
-    const-string v3, "^/(?:(invite|gift|template)/)?([\\w-]+)/?$"
-
-    invoke-direct {v2, v3, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v2, Lf/a/b/t0/b;->m:Lkotlin/text/Regex;
-
-    sget-object v1, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v2, Lkotlin/text/Regex;
-
-    const-string v3, "^/(?:invite/)?([\\w-]+)/?$"
-
-    invoke-direct {v2, v3, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v2, Lf/a/b/t0/b;->n:Lkotlin/text/Regex;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "(?:https?://(?:(?:"
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    sget-object v4, Lf/a/b/t0/b;->h:Ljava/lang/String;
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v4, "/invite)|"
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v4, Lf/a/b/t0/b;->j:Ljava/lang/String;
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v4, "))|"
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v5, "(?:^"
-
-    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v5, Lf/a/b/t0/b;->j:Ljava/lang/String;
-
-    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v5, "))/([\\w-]+)/?"
-
-    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v3, "StringBuilder()\n        \u2026?\")\n          .toString()"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v6, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v7, Lkotlin/text/Regex;
-
-    invoke-direct {v7, v1, v6}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v7, Lf/a/b/t0/b;->o:Lkotlin/text/Regex;
-
-    sget-object v1, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v6, Lkotlin/text/Regex;
-
-    const-string v7, "^/(?:template/)?([\\w-]+)/?$"
-
-    invoke-direct {v6, v7, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v6, Lf/a/b/t0/b;->p:Lkotlin/text/Regex;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    sget-object v6, Lf/a/b/t0/b;->h:Ljava/lang/String;
-
-    invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v6, "/template)|"
-
-    invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v6, Lf/a/b/t0/b;->k:Ljava/lang/String;
-
-    invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v4, Lf/a/b/t0/b;->k:Ljava/lang/String;
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v2, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v4, Lkotlin/text/Regex;
-
-    invoke-direct {v4, v1, v2}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v4, Lf/a/b/t0/b;->q:Lkotlin/text/Regex;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "(?:https?://)?(?:(?:"
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    sget-object v4, Lf/a/b/t0/b;->h:Ljava/lang/String;
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v4, "/gifts)|"
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v0, Lf/a/b/t0/b;->i:Ljava/lang/String;
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v1, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v2, Lkotlin/text/Regex;
-
-    invoke-direct {v2, v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v2, Lf/a/b/t0/b;->r:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/connect(?:/(\\d+))?/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->s:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/channels/((?:@me)|(?:\\d+))/(\\d+)(?:/(\\d+))?/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->t:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/channels/@me/-1?/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->u:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/lurk/(\\d+)(?:/(\\d+))?/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->v:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/channels/@me/user/(\\d+)/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->w:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/users/(\\d+)/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->x:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/settings(/\\w+)*/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->y:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/feature(/\\w+)*/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->z:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/query(/\\w+)*/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->A:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/(?:oauth2|connect)/authorize/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->B:Lkotlin/text/Regex;
-
-    new-instance v0, Lkotlin/text/Regex;
-
-    const-string v1, "^/ra/([\\w-]+)$"
-
-    invoke-direct {v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lf/a/b/t0/b;->C:Lkotlin/text/Regex;
-
-    sget-object v0, Lj0/t/d;->d:Lj0/t/d;
-
-    new-instance v1, Lkotlin/text/Regex;
-
-    const-string v2, "^/guild/((?:@me)|(?:\\d+))/premiumguild/?$"
-
-    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lj0/t/d;)V
-
-    sput-object v1, Lf/a/b/t0/b;->D:Lkotlin/text/Regex;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/String;)Z
-    .locals 1
-
-    if-nez p1, :cond_0
-
-    const/4 p1, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    sget-object v0, Lf/a/b/t0/b;->a:Ljava/lang/String;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v0, Lf/a/b/t0/b;->b:Ljava/lang/String;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    sget-object v0, Lf/a/b/t0/b;->c:Ljava/lang/String;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    sget-object v0, Lf/a/b/t0/b;->e:Ljava/lang/String;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    sget-object v0, Lf/a/b/t0/b;->d:Ljava/lang/String;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    :goto_0
-    const/4 p1, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    sget-object v0, Lf/a/b/t0/b;->l:Lkotlin/text/Regex;
-
-    invoke-virtual {v0, p1}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
-
-    move-result p1
-
-    :goto_1
-    return p1
-.end method
-
-.method public final b(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-
-    move-result-object p1
-
-    const-string v0, "Uri.parse(this)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, ""
-
-    :goto_0
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/b/u.smali b/com.discord/smali/f/a/b/u.smali
index 8bdde989fe..af5d2b91fb 100644
--- a/com.discord/smali/f/a/b/u.smali
+++ b/com.discord/smali/f/a/b/u.smali
@@ -3,7 +3,7 @@
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,23 +15,31 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TR;>;>;"
+        "Ls0/k/b<",
+        "TK;TK;>;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic d:Lf/a/b/q$c;
+# static fields
+.field public static final d:Lf/a/b/u;
 
 
 # direct methods
-.method public constructor <init>(Lf/a/b/q$c;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lf/a/b/u;->d:Lf/a/b/q$c;
+    new-instance v0, Lf/a/b/u;
+
+    invoke-direct {v0}, Lf/a/b/u;-><init>()V
+
+    sput-object v0, Lf/a/b/u;->d:Lf/a/b/u;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,36 +48,13 @@
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Ljava/util/Map;
-
-    iget-object v0, p0, Lf/a/b/u;->d:Lf/a/b/q$c;
-
-    iget-object v0, v0, Lf/a/b/q$c;->d:Ljava/util/Collection;
-
-    invoke-static {v0}, Lrx/Observable;->z(Ljava/lang/Iterable;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lf/a/b/r;
-
-    invoke-direct {v1, p1}, Lf/a/b/r;-><init>(Ljava/util/Map;)V
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v1, Lf/a/b/s;->d:Lf/a/b/s;
-
-    new-instance v2, Lf/a/b/t;
-
-    invoke-direct {v2, p0, p1}, Lf/a/b/t;-><init>(Lf/a/b/u;Ljava/util/Map;)V
-
-    invoke-virtual {v0, v1, v2}, Lrx/Observable;->c0(Lr0/k/b;Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
+.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TK;)TK;"
+        }
+    .end annotation
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/u0.smali b/com.discord/smali/f/a/b/u0.smali
new file mode 100644
index 0000000000..f0113896ed
--- /dev/null
+++ b/com.discord/smali/f/a/b/u0.smali
@@ -0,0 +1,65 @@
+.class public final Lf/a/b/u0;
+.super Ljava/lang/Object;
+.source "NativeLoader.kt"
+
+
+# static fields
+.field public static final a:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final b:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static c:Z
+
+.field public static final d:Lf/a/b/u0;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/b/u0;
+
+    invoke-direct {v0}, Lf/a/b/u0;-><init>()V
+
+    sput-object v0, Lf/a/b/u0;->d:Lf/a/b/u0;
+
+    const-string v0, "dsti"
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/u0;->a:Ljava/util/List;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    sput-object v0, Lf/a/b/u0;->b:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/f/a/b/v.smali b/com.discord/smali/f/a/b/v.smali
index f41846fd1a..bd41811200 100644
--- a/com.discord/smali/f/a/b/v.smali
+++ b/com.discord/smali/f/a/b/v.smali
@@ -3,7 +3,7 @@
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,23 +15,25 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TR;>;>;"
+        "Ls0/k/b<",
+        "TK;TV1;>;"
     }
 .end annotation
 
 
 # instance fields
-.field public final synthetic d:Lf/a/b/q$d;
+.field public final synthetic d:Lf/a/b/w;
+
+.field public final synthetic e:Ljava/util/Map;
 
 
 # direct methods
-.method public constructor <init>(Lf/a/b/q$d;)V
+.method public constructor <init>(Lf/a/b/w;Ljava/util/Map;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/b/v;->d:Lf/a/b/q$d;
+    iput-object p1, p0, Lf/a/b/v;->d:Lf/a/b/w;
+
+    iput-object p2, p0, Lf/a/b/v;->e:Ljava/util/Map;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,50 +42,29 @@
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
+.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TK;)TV1;"
+        }
+    .end annotation
 
-    iget-object v0, p0, Lf/a/b/v;->d:Lf/a/b/q$d;
+    iget-object v0, p0, Lf/a/b/v;->d:Lf/a/b/w;
 
-    iget-object v0, v0, Lf/a/b/q$d;->d:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lf/a/b/w;->d:Lf/a/b/s$c;
+
+    iget-object v0, v0, Lf/a/b/s$c;->e:Lkotlin/jvm/functions/Function1;
+
+    iget-object v1, p0, Lf/a/b/v;->e:Ljava/util/Map;
+
+    invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p1
 
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lr0/l/e/j;
-
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p0, Lf/a/b/v;->d:Lf/a/b/q$d;
-
-    iget-object p1, p1, Lf/a/b/q$d;->e:Ljava/lang/Object;
-
-    new-instance v0, Lr0/l/e/j;
-
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lf/a/b/v;->d:Lf/a/b/q$d;
-
-    iget-wide v1, p1, Lf/a/b/q$d;->f:J
-
-    iget-object p1, p1, Lf/a/b/q$d;->g:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v1, v2, p1}, Lrx/Observable;->p(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
-
-    move-result-object v0
-
-    :goto_0
-    return-object v0
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/v0/a.smali b/com.discord/smali/f/a/b/v0/a.smali
new file mode 100644
index 0000000000..da3942a68e
--- /dev/null
+++ b/com.discord/smali/f/a/b/v0/a.smali
@@ -0,0 +1,33 @@
+.class public final Lf/a/b/v0/a;
+.super Ljava/lang/Object;
+.source "Intents.kt"
+
+
+# static fields
+.field public static final a:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final b:Lf/a/b/v0/a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const-string v0, "com.discord.intent.category.DIRECT_SHARE_TARGET"
+
+    invoke-static {v0}, Lf/n/a/k/a;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/v0/a;->a:Ljava/util/Set;
+
+    return-void
+.end method
diff --git a/com.discord/smali/f/a/b/v0/b.smali b/com.discord/smali/f/a/b/v0/b.smali
new file mode 100644
index 0000000000..01bf4ad9e2
--- /dev/null
+++ b/com.discord/smali/f/a/b/v0/b.smali
@@ -0,0 +1,695 @@
+.class public final Lf/a/b/v0/b;
+.super Ljava/lang/Object;
+.source "RoutingPatterns.kt"
+
+
+# static fields
+.field public static final A:Lkotlin/text/Regex;
+
+.field public static final B:Lkotlin/text/Regex;
+
+.field public static final C:Lkotlin/text/Regex;
+
+.field public static final D:Lkotlin/text/Regex;
+
+.field public static final E:Lf/a/b/v0/b;
+
+.field public static final a:Ljava/lang/String;
+
+.field public static final b:Ljava/lang/String;
+
+.field public static final c:Ljava/lang/String;
+
+.field public static final d:Ljava/lang/String;
+
+.field public static final e:Ljava/lang/String;
+
+.field public static final f:Ljava/lang/String;
+
+.field public static final g:Ljava/lang/String;
+
+.field public static final h:Ljava/lang/String;
+
+.field public static final i:Ljava/lang/String;
+
+.field public static final j:Ljava/lang/String;
+
+.field public static final k:Ljava/lang/String;
+
+.field public static final l:Lkotlin/text/Regex;
+
+.field public static final m:Lkotlin/text/Regex;
+
+.field public static final n:Lkotlin/text/Regex;
+
+.field public static final o:Lkotlin/text/Regex;
+
+.field public static final p:Lkotlin/text/Regex;
+
+.field public static final q:Lkotlin/text/Regex;
+
+.field public static final r:Lkotlin/text/Regex;
+
+.field public static final s:Lkotlin/text/Regex;
+
+.field public static final t:Lkotlin/text/Regex;
+
+.field public static final u:Lkotlin/text/Regex;
+
+.field public static final v:Lkotlin/text/Regex;
+
+.field public static final w:Lkotlin/text/Regex;
+
+.field public static final x:Lkotlin/text/Regex;
+
+.field public static final y:Lkotlin/text/Regex;
+
+.field public static final z:Lkotlin/text/Regex;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 8
+
+    new-instance v0, Lf/a/b/v0/b;
+
+    invoke-direct {v0}, Lf/a/b/v0/b;-><init>()V
+
+    sput-object v0, Lf/a/b/v0/b;->E:Lf/a/b/v0/b;
+
+    const-string v1, "https://discord.com"
+
+    invoke-virtual {v0, v1}, Lf/a/b/v0/b;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    sput-object v1, Lf/a/b/v0/b;->a:Ljava/lang/String;
+
+    const-string v1, "https://discordapp.com"
+
+    invoke-virtual {v0, v1}, Lf/a/b/v0/b;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    sput-object v1, Lf/a/b/v0/b;->b:Ljava/lang/String;
+
+    const-string v1, "https://discord.gift"
+
+    invoke-virtual {v0, v1}, Lf/a/b/v0/b;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    sput-object v1, Lf/a/b/v0/b;->c:Ljava/lang/String;
+
+    const-string v1, "https://discord.gg"
+
+    invoke-virtual {v0, v1}, Lf/a/b/v0/b;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    sput-object v1, Lf/a/b/v0/b;->d:Ljava/lang/String;
+
+    const-string v1, "https://discord.new"
+
+    invoke-virtual {v0, v1}, Lf/a/b/v0/b;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/v0/b;->e:Ljava/lang/String;
+
+    sget-object v0, Lf/a/b/v0/b;->a:Ljava/lang/String;
+
+    const-string v1, "."
+
+    const-string v2, "\\."
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    invoke-static {v0, v1, v2, v3, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/v0/b;->f:Ljava/lang/String;
+
+    sget-object v0, Lf/a/b/v0/b;->b:Ljava/lang/String;
+
+    invoke-static {v0, v1, v2, v3, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v0
+
+    sput-object v0, Lf/a/b/v0/b;->g:Ljava/lang/String;
+
+    const-string v0, "(?:"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v5
+
+    sget-object v6, Lf/a/b/v0/b;->f:Ljava/lang/String;
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v6, 0x7c
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    sget-object v6, Lf/a/b/v0/b;->g:Ljava/lang/String;
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v6, 0x29
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    sput-object v5, Lf/a/b/v0/b;->h:Ljava/lang/String;
+
+    sget-object v5, Lf/a/b/v0/b;->c:Ljava/lang/String;
+
+    invoke-static {v5, v1, v2, v3, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v5
+
+    sput-object v5, Lf/a/b/v0/b;->i:Ljava/lang/String;
+
+    sget-object v5, Lf/a/b/v0/b;->d:Ljava/lang/String;
+
+    invoke-static {v5, v1, v2, v3, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v5
+
+    sput-object v5, Lf/a/b/v0/b;->j:Ljava/lang/String;
+
+    sget-object v5, Lf/a/b/v0/b;->e:Ljava/lang/String;
+
+    invoke-static {v5, v1, v2, v3, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v1
+
+    sput-object v1, Lf/a/b/v0/b;->k:Ljava/lang/String;
+
+    const-string v1, "^(?:ptb|canary|www)."
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    sget-object v2, Lf/a/b/v0/b;->h:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x24
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    sget-object v2, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v3, Lkotlin/text/Regex;
+
+    invoke-direct {v3, v1, v2}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v3, Lf/a/b/v0/b;->l:Lkotlin/text/Regex;
+
+    sget-object v1, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v2, Lkotlin/text/Regex;
+
+    const-string v3, "^/(?:(invite|gift|template)/)?([\\w-]+)/?$"
+
+    invoke-direct {v2, v3, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v2, Lf/a/b/v0/b;->m:Lkotlin/text/Regex;
+
+    sget-object v1, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v2, Lkotlin/text/Regex;
+
+    const-string v3, "^/(?:invite/)?([\\w-]+)/?$"
+
+    invoke-direct {v2, v3, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v2, Lf/a/b/v0/b;->n:Lkotlin/text/Regex;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "(?:https?://(?:(?:"
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    sget-object v4, Lf/a/b/v0/b;->h:Ljava/lang/String;
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, "/invite)|"
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v4, Lf/a/b/v0/b;->j:Ljava/lang/String;
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, "))|"
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v5, "(?:^"
+
+    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v5, Lf/a/b/v0/b;->j:Ljava/lang/String;
+
+    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v5, "))/([\\w-]+)/?"
+
+    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v3, "StringBuilder()\n        \u2026?\")\n          .toString()"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v6, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v7, Lkotlin/text/Regex;
+
+    invoke-direct {v7, v1, v6}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v7, Lf/a/b/v0/b;->o:Lkotlin/text/Regex;
+
+    sget-object v1, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v6, Lkotlin/text/Regex;
+
+    const-string v7, "^/(?:template/)?([\\w-]+)/?$"
+
+    invoke-direct {v6, v7, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v6, Lf/a/b/v0/b;->p:Lkotlin/text/Regex;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    sget-object v6, Lf/a/b/v0/b;->h:Ljava/lang/String;
+
+    invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v6, "/template)|"
+
+    invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v6, Lf/a/b/v0/b;->k:Ljava/lang/String;
+
+    invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v4, Lf/a/b/v0/b;->k:Ljava/lang/String;
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v4, Lkotlin/text/Regex;
+
+    invoke-direct {v4, v1, v2}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v4, Lf/a/b/v0/b;->q:Lkotlin/text/Regex;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "(?:https?://)?(?:(?:"
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    sget-object v4, Lf/a/b/v0/b;->h:Ljava/lang/String;
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, "/gifts)|"
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v0, Lf/a/b/v0/b;->i:Ljava/lang/String;
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v2, Lkotlin/text/Regex;
+
+    invoke-direct {v2, v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v2, Lf/a/b/v0/b;->r:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/connect(?:/(\\d+))?/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->s:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/channels/((?:@me)|(?:\\d+))/(\\d+)(?:/(\\d+))?/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->t:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/channels/@me/-1?/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->u:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/lurk/(\\d+)(?:/(\\d+))?/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->v:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/channels/@me/user/(\\d+)/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->w:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/users/(\\d+)/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->x:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/settings(/\\w+)*/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->y:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/feature(/\\w+)*/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->z:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/query(/\\w+)*/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->A:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/(?:oauth2|connect)/authorize/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->B:Lkotlin/text/Regex;
+
+    new-instance v0, Lkotlin/text/Regex;
+
+    const-string v1, "^/ra/([\\w-]+)$"
+
+    invoke-direct {v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Lf/a/b/v0/b;->C:Lkotlin/text/Regex;
+
+    sget-object v0, Lk0/u/d;->d:Lk0/u/d;
+
+    new-instance v1, Lkotlin/text/Regex;
+
+    const-string v2, "^/guild/((?:@me)|(?:\\d+))/premiumguild/?$"
+
+    invoke-direct {v1, v2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;Lk0/u/d;)V
+
+    sput-object v1, Lf/a/b/v0/b;->D:Lkotlin/text/Regex;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/lang/String;)Z
+    .locals 1
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    sget-object v0, Lf/a/b/v0/b;->a:Ljava/lang/String;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v0, Lf/a/b/v0/b;->b:Ljava/lang/String;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    sget-object v0, Lf/a/b/v0/b;->c:Ljava/lang/String;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    sget-object v0, Lf/a/b/v0/b;->e:Ljava/lang/String;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    sget-object v0, Lf/a/b/v0/b;->d:Ljava/lang/String;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    :goto_0
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_5
+    sget-object v0, Lf/a/b/v0/b;->l:Lkotlin/text/Regex;
+
+    invoke-virtual {v0, p1}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
+
+    move-result p1
+
+    :goto_1
+    return p1
+.end method
+
+.method public final b(Ljava/lang/String;)Ljava/lang/String;
+    .locals 1
+
+    invoke-static {p1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+
+    move-result-object p1
+
+    const-string v0, "Uri.parse(this)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p1, ""
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/b/w.smali b/com.discord/smali/f/a/b/w.smali
index c6f52ea716..5aee9e24b7 100644
--- a/com.discord/smali/f/a/b/w.smali
+++ b/com.discord/smali/f/a/b/w.smali
@@ -3,7 +3,7 @@
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lrx/Observable$c;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,21 +15,26 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/Observable$c<",
-        "TT;TT;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "TK;+TV;>;",
+        "Lrx/Observable<",
+        "+",
+        "Ljava/util/Map<",
+        "TK;TV1;>;>;>;"
     }
 .end annotation
 
 
 # instance fields
-.field public final synthetic d:Z
+.field public final synthetic d:Lf/a/b/s$c;
 
 
 # direct methods
-.method public constructor <init>(Z)V
+.method public constructor <init>(Lf/a/b/s$c;)V
     .locals 0
 
-    iput-boolean p1, p0, Lf/a/b/w;->d:Z
+    iput-object p1, p0, Lf/a/b/w;->d:Lf/a/b/s$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,17 +44,33 @@
 
 # virtual methods
 .method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    .locals 3
 
-    check-cast p1, Lrx/Observable;
+    check-cast p1, Ljava/util/Map;
 
-    const-string v0, "it"
+    iget-object v0, p0, Lf/a/b/w;->d:Lf/a/b/s$c;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object v0, v0, Lf/a/b/s$c;->d:Ljava/util/Collection;
 
-    iget-boolean v0, p0, Lf/a/b/w;->d:Z
+    invoke-static {v0}, Lrx/Observable;->z(Ljava/lang/Iterable;)Lrx/Observable;
 
-    invoke-static {p1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
+    move-result-object v0
+
+    new-instance v1, Lf/a/b/t;
+
+    invoke-direct {v1, p1}, Lf/a/b/t;-><init>(Ljava/util/Map;)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lf/a/b/u;->d:Lf/a/b/u;
+
+    new-instance v2, Lf/a/b/v;
+
+    invoke-direct {v2, p0, p1}, Lf/a/b/v;-><init>(Lf/a/b/w;Ljava/util/Map;)V
+
+    invoke-virtual {v0, v1, v2}, Lrx/Observable;->c0(Ls0/k/b;Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/b/x.smali b/com.discord/smali/f/a/b/x.smali
index 607c29527e..8a9b1b490a 100644
--- a/com.discord/smali/f/a/b/x.smali
+++ b/com.discord/smali/f/a/b/x.smali
@@ -1,74 +1,89 @@
-.class public final synthetic Lf/a/b/x;
-.super Lj0/n/c/g;
+.class public final Lf/a/b/x;
+.super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Ls0/k/b;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
         "TT;",
-        "Lkotlin/Unit;",
-        ">;"
+        "Lrx/Observable<",
+        "+TT;>;>;"
     }
 .end annotation
 
 
+# instance fields
+.field public final synthetic d:Lf/a/b/s$d;
+
+
 # direct methods
-.method public constructor <init>(Lrx/functions/Action1;)V
-    .locals 1
+.method public constructor <init>(Lf/a/b/s$d;)V
+    .locals 0
 
-    const/4 v0, 0x1
+    iput-object p1, p0, Lf/a/b/x;->d:Lf/a/b/s$d;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
 
-    const-string v0, "call"
+    iget-object v0, p0, Lf/a/b/x;->d:Lf/a/b/s$d;
 
-    return-object v0
-.end method
+    iget-object v0, v0, Lf/a/b/s$d;->d:Lkotlin/jvm/functions/Function1;
 
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/functions/Action1;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Lf/a/b/x;->d:Lf/a/b/s$d;
+
+    iget-object p1, p1, Lf/a/b/s$d;->e:Ljava/lang/Object;
+
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Lf/a/b/x;->d:Lf/a/b/s$d;
+
+    iget-wide v1, p1, Lf/a/b/s$d;->f:J
+
+    iget-object p1, p1, Lf/a/b/s$d;->g:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v1, v2, p1}, Lrx/Observable;->p(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+    move-result-object v0
+
+    :goto_0
     return-object v0
 .end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/b/y.smali b/com.discord/smali/f/a/b/y.smali
index 71096109fa..e838919011 100644
--- a/com.discord/smali/f/a/b/y.smali
+++ b/com.discord/smali/f/a/b/y.smali
@@ -1,74 +1,57 @@
-.class public final synthetic Lf/a/b/y;
-.super Lj0/n/c/g;
+.class public final Lf/a/b/y;
+.super Ljava/lang/Object;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/Observable$c;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
-        "Lkotlin/Unit;",
-        ">;"
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$c<",
+        "TT;TT;>;"
     }
 .end annotation
 
 
+# instance fields
+.field public final synthetic d:Z
+
+
 # direct methods
-.method public constructor <init>(Lrx/functions/Action1;)V
-    .locals 1
+.method public constructor <init>(Z)V
+    .locals 0
 
-    const/4 v0, 0x1
+    iput-boolean p1, p0, Lf/a/b/y;->d:Z
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    const-string v0, "call"
+    check-cast p1, Lrx/Observable;
 
-    return-object v0
-.end method
+    const-string v0, "it"
 
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v0, Lrx/functions/Action1;
+    iget-boolean v0, p0, Lf/a/b/y;->d:Z
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {p1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
 
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "call(Ljava/lang/Object;)V"
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+    move-result-object p1
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/b/z.smali b/com.discord/smali/f/a/b/z.smali
index 46918df1fe..b5ac298b99 100644
--- a/com.discord/smali/f/a/b/z.smali
+++ b/com.discord/smali/f/a/b/z.smali
@@ -1,55 +1,58 @@
-.class public final Lf/a/b/z;
-.super Lj0/n/c/i;
+.class public final synthetic Lf/a/b/z;
+.super Lk0/o/c/h;
 .source "AppTransformers.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function0;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
         "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
 
 
-# static fields
-.field public static final d:Lf/a/b/z;
-
-
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>(Lrx/functions/Action1;)V
+    .locals 7
 
-    new-instance v0, Lf/a/b/z;
+    const-class v3, Lrx/functions/Action1;
 
-    invoke-direct {v0}, Lf/a/b/z;-><init>()V
+    const/4 v1, 0x1
 
-    sput-object v0, Lf/a/b/z;->d:Lf/a/b/z;
+    const-string v4, "call"
 
-    return-void
-.end method
+    const-string v5, "call(Ljava/lang/Object;)V"
 
-.method public constructor <init>()V
-    .locals 1
+    const/4 v6, 0x0
 
-    const/4 v0, 0x0
+    move-object v0, p0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke()Ljava/lang/Object;
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
-    return-object v0
+    check-cast v0, Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/c/a$a.smali b/com.discord/smali/f/a/c/a$a.smali
index e023d5b1f5..f9d24ef883 100644
--- a/com.discord/smali/f/a/c/a$a.smali
+++ b/com.discord/smali/f/a/c/a$a.smali
@@ -24,7 +24,19 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;Landroid/view/ViewGroup;Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "floatingView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ancestorViewGroup"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ancestorPreDrawListener"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/f/a/c/a.smali b/com.discord/smali/f/a/c/a.smali
index 59c858f7f5..a3fcbdc9c1 100644
--- a/com.discord/smali/f/a/c/a.smali
+++ b/com.discord/smali/f/a/c/a.smali
@@ -29,9 +29,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/logging/Logger;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "logger"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,15 +46,6 @@
     iput-object p1, p0, Lf/a/c/a;->a:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final a(Lf/a/c/a;Landroid/view/View;Landroid/view/View;Lcom/discord/floating_view_manager/FloatingViewGravity;II)V
diff --git a/com.discord/smali/f/a/c/b$a.smali b/com.discord/smali/f/a/c/b$a.smali
index 75c66e1d5d..fa12e3878a 100644
--- a/com.discord/smali/f/a/c/b$a.smali
+++ b/com.discord/smali/f/a/c/b$a.smali
@@ -37,7 +37,9 @@
 .method public onLayoutChange(Landroid/view/View;IIIIIIII)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p2, "view"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
@@ -66,13 +68,4 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/c/b.smali b/com.discord/smali/f/a/c/b.smali
index 061c4ecd4d..08c58d0b39 100644
--- a/com.discord/smali/f/a/c/b.smali
+++ b/com.discord/smali/f/a/c/b.smali
@@ -46,7 +46,9 @@
 .method public onLayoutChange(Landroid/view/View;IIIIIIII)V
     .locals 0
 
-    if-eqz p1, :cond_1
+    const-string/jumbo p2, "view"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
@@ -95,13 +97,4 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/c/c.smali b/com.discord/smali/f/a/c/c.smali
index 8c6beb1bec..b958b32618 100644
--- a/com.discord/smali/f/a/c/c.smali
+++ b/com.discord/smali/f/a/c/c.smali
@@ -46,23 +46,25 @@
 .method public onLayoutChange(Landroid/view/View;IIIIIIII)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p2, "view"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
-    iget-object p1, p0, Lf/a/c/c;->d:Lf/a/c/a;
+    iget-object p3, p0, Lf/a/c/c;->d:Lf/a/c/a;
 
-    iget-object p2, p0, Lf/a/c/c;->f:Landroid/view/View;
+    iget-object p4, p0, Lf/a/c/c;->f:Landroid/view/View;
 
-    iget-object p3, p0, Lf/a/c/c;->e:Landroid/view/View;
+    iget-object p5, p0, Lf/a/c/c;->e:Landroid/view/View;
 
-    iget-object p4, p0, Lf/a/c/c;->g:Lcom/discord/floating_view_manager/FloatingViewGravity;
+    iget-object p6, p0, Lf/a/c/c;->g:Lcom/discord/floating_view_manager/FloatingViewGravity;
 
-    iget p5, p0, Lf/a/c/c;->h:I
+    iget p7, p0, Lf/a/c/c;->h:I
 
-    iget p6, p0, Lf/a/c/c;->i:I
+    iget p8, p0, Lf/a/c/c;->i:I
 
-    invoke-static/range {p1 .. p6}, Lf/a/c/a;->a(Lf/a/c/a;Landroid/view/View;Landroid/view/View;Lcom/discord/floating_view_manager/FloatingViewGravity;II)V
+    invoke-static/range {p3 .. p8}, Lf/a/c/a;->a(Lf/a/c/a;Landroid/view/View;Landroid/view/View;Lcom/discord/floating_view_manager/FloatingViewGravity;II)V
 
     iget-object p1, p0, Lf/a/c/c;->f:Landroid/view/View;
 
@@ -71,13 +73,4 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/d/a/a0.smali b/com.discord/smali/f/a/d/a/a0.smali
index 330c22200e..2ca4cac19a 100644
--- a/com.discord/smali/f/a/d/a/a0.smali
+++ b/com.discord/smali/f/a/d/a/a0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/a0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiCustom;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/a1.smali b/com.discord/smali/f/a/d/a/a1.smali
index 619c81dba3..f268cfd9b5 100644
--- a/com.discord/smali/f/a/d/a/a1.smali
+++ b/com.discord/smali/f/a/d/a/a1.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/a1;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelUserProfile;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUserProfile$GuildReference;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuild;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/b0.smali b/com.discord/smali/f/a/d/a/b0.smali
index f7e4b0d58b..8c98836320 100644
--- a/com.discord/smali/f/a/d/a/b0.smali
+++ b/com.discord/smali/f/a/d/a/b0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/b0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->i(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiCustom;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/b1.smali b/com.discord/smali/f/a/d/a/b1.smali
index 9df834808f..a4c8056f47 100644
--- a/com.discord/smali/f/a/d/a/b1.smali
+++ b/com.discord/smali/f/a/d/a/b1.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/b1;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelUserProfile;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelConnectedAccount;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->f(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelConnectedAccount;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/c0.smali b/com.discord/smali/f/a/d/a/c0.smali
index 6a1f9a8ed1..fc2a590927 100644
--- a/com.discord/smali/f/a/d/a/c0.smali
+++ b/com.discord/smali/f/a/d/a/c0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/c0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->h(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Integer;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->i(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/c1.smali b/com.discord/smali/f/a/d/a/c1.smali
index 87f19ecdae..80b6c5b56a 100644
--- a/com.discord/smali/f/a/d/a/c1.smali
+++ b/com.discord/smali/f/a/d/a/c1.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/c1;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelUserSettings;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildFolder;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->h(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/d0.smali b/com.discord/smali/f/a/d/a/d0.smali
index 9a44510601..6499925fd2 100644
--- a/com.discord/smali/f/a/d/a/d0.smali
+++ b/com.discord/smali/f/a/d/a/d0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/d0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->e(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMember;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->h(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Integer;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/d1.smali b/com.discord/smali/f/a/d/a/d1.smali
index a559a37280..ea1c79a2ed 100644
--- a/com.discord/smali/f/a/d/a/d1.smali
+++ b/com.discord/smali/f/a/d/a/d1.smali
@@ -3,48 +3,40 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 
 
-# static fields
-.field public static final synthetic a:Lf/a/d/a/d1;
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/ModelPayload$VersionedModel;
+
+.field public final synthetic b:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/d/a/d1;
-
-    invoke-direct {v0}, Lf/a/d/a/d1;-><init>()V
-
-    sput-object v0, Lf/a/d/a/d1;->a:Lf/a/d/a/d1;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelPayload$VersionedModel;Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-object p1, p0, Lf/a/d/a/d1;->a:Lcom/discord/models/domain/ModelPayload$VersionedModel;
+
+    iput-object p2, p0, Lf/a/d/a/d1;->b:Lcom/discord/models/domain/Model$JsonReader;
+
     return-void
 .end method
 
 
 # virtual methods
-.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final get()Ljava/lang/Object;
     .locals 2
 
-    check-cast p1, Lcom/discord/models/domain/ModelPermissionOverwrite;
+    iget-object v0, p0, Lf/a/d/a/d1;->a:Lcom/discord/models/domain/ModelPayload$VersionedModel;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPermissionOverwrite;->getId()J
+    iget-object v1, p0, Lf/a/d/a/d1;->b:Lcom/discord/models/domain/Model$JsonReader;
 
-    move-result-wide v0
+    invoke-virtual {v0, v1}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
 
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v0
 
-    move-result-object p1
-
-    return-object p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/d/a/e0.smali b/com.discord/smali/f/a/d/a/e0.smali
index 3e1a6e0aeb..8d74fe69e6 100644
--- a/com.discord/smali/f/a/d/a/e0.smali
+++ b/com.discord/smali/f/a/d/a/e0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/e0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->e(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMember;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/e1.smali b/com.discord/smali/f/a/d/a/e1.smali
index f228248e65..3f3a4f001e 100644
--- a/com.discord/smali/f/a/d/a/e1.smali
+++ b/com.discord/smali/f/a/d/a/e1.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/e1;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->g(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelSession;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/f0.smali b/com.discord/smali/f/a/d/a/f0.smali
index 46d1ab852a..be30d4a70c 100644
--- a/com.discord/smali/f/a/d/a/f0.smali
+++ b/com.discord/smali/f/a/d/a/f0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/f0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMember;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/f1.smali b/com.discord/smali/f/a/d/a/f1.smali
index 30e7f423bb..a06cc9c99f 100644
--- a/com.discord/smali/f/a/d/a/f1.smali
+++ b/com.discord/smali/f/a/d/a/f1.smali
@@ -3,44 +3,34 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 
 
-# static fields
-.field public static final synthetic a:Lf/a/d/a/f1;
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/d/a/f1;
-
-    invoke-direct {v0}, Lf/a/d/a/f1;-><init>()V
-
-    sput-object v0, Lf/a/d/a/f1;->a:Lf/a/d/a/f1;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-object p1, p0, Lf/a/d/a/f1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
     return-void
 .end method
 
 
 # virtual methods
-.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final get()Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+    iget-object v0, p0, Lf/a/d/a/f1;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getId()Ljava/lang/Long;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUserRelationship;
 
-    move-result-object p1
+    move-result-object v0
 
-    return-object p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/d/a/g0.smali b/com.discord/smali/f/a/d/a/g0.smali
index 64b5cdbfb3..ac98ec20e1 100644
--- a/com.discord/smali/f/a/d/a/g0.smali
+++ b/com.discord/smali/f/a/d/a/g0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/g0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->c(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMember;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/g1.smali b/com.discord/smali/f/a/d/a/g1.smali
index d8a5690257..06f9cef10f 100644
--- a/com.discord/smali/f/a/d/a/g1.smali
+++ b/com.discord/smali/f/a/d/a/g1.smali
@@ -3,42 +3,34 @@
 .source "lambda"
 
 # interfaces
-.implements Lrx/functions/Func0;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 
 
-# static fields
-.field public static final synthetic d:Lf/a/d/a/g1;
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/d/a/g1;
-
-    invoke-direct {v0}, Lf/a/d/a/g1;-><init>()V
-
-    sput-object v0, Lf/a/d/a/g1;->d:Lf/a/d/a/g1;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-object p1, p0, Lf/a/d/a/g1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
     return-void
 .end method
 
 
 # virtual methods
-.method public final call()Ljava/lang/Object;
+.method public final get()Ljava/lang/Object;
     .locals 1
 
-    new-instance v0, Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lf/a/d/a/g1;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+    invoke-static {v0}, Lcom/discord/models/domain/ModelSession;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/activity/ModelActivity;
+
+    move-result-object v0
 
     return-object v0
 .end method
diff --git a/com.discord/smali/f/a/d/a/h0.smali b/com.discord/smali/f/a/d/a/h0.smali
index 9c75f5bb1f..a3aaea5578 100644
--- a/com.discord/smali/f/a/d/a/h0.smali
+++ b/com.discord/smali/f/a/d/a/h0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/h0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage$Content;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuildMember$Chunk;->c(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/h1.smali b/com.discord/smali/f/a/d/a/h1.smali
index cf9e856c17..552ddbce70 100644
--- a/com.discord/smali/f/a/d/a/h1.smali
+++ b/com.discord/smali/f/a/d/a/h1.smali
@@ -3,46 +3,34 @@
 .source "lambda"
 
 # interfaces
-.implements Ljava/util/Comparator;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 
 
-# static fields
-.field public static final synthetic d:Lf/a/d/a/h1;
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/d/a/h1;
-
-    invoke-direct {v0}, Lf/a/d/a/h1;-><init>()V
-
-    sput-object v0, Lf/a/d/a/h1;->d:Lf/a/d/a/h1;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-object p1, p0, Lf/a/d/a/h1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
     return-void
 .end method
 
 
 # virtual methods
-.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 0
+.method public final get()Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelUser;
+    iget-object v0, p0, Lf/a/d/a/h1;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    check-cast p2, Lcom/discord/models/domain/ModelUser;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelUserProfile;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUserProfile$GuildReference;
 
-    invoke-static {p1, p2}, Lcom/discord/models/domain/ModelUser;->compareUserNames(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)I
+    move-result-object v0
 
-    move-result p1
-
-    return p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/d/a/i0.smali b/com.discord/smali/f/a/d/a/i0.smali
index e5e6c0feab..325da90ecd 100644
--- a/com.discord/smali/f/a/d/a/i0.smali
+++ b/com.discord/smali/f/a/d/a/i0.smali
@@ -3,44 +3,34 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 
 
-# static fields
-.field public static final synthetic a:Lf/a/d/a/i0;
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/d/a/i0;
-
-    invoke-direct {v0}, Lf/a/d/a/i0;-><init>()V
-
-    sput-object v0, Lf/a/d/a/i0;->a:Lf/a/d/a/i0;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-object p1, p0, Lf/a/d/a/i0;->a:Lcom/discord/models/domain/Model$JsonReader;
+
     return-void
 .end method
 
 
 # virtual methods
-.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final get()Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelMessageReaction;
+    iget-object v0, p0, Lf/a/d/a/i0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {p1}, Lcom/discord/models/domain/ModelMessage;->e(Lcom/discord/models/domain/ModelMessageReaction;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage$Content;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
 
-    move-result-object p1
+    move-result-object v0
 
-    return-object p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/d/a/i1.smali b/com.discord/smali/f/a/d/a/i1.smali
new file mode 100644
index 0000000000..4fe06424d0
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/i1.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/i1;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/i1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/i1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/ModelUserProfile;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/i1/a.smali b/com.discord/smali/f/a/d/a/i1/a.smali
deleted file mode 100644
index 31870232fe..0000000000
--- a/com.discord/smali/f/a/d/a/i1/a.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/d/a/i1/a;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lf/a/d/a/i1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lf/a/d/a/i1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/d/a/i1/b.smali b/com.discord/smali/f/a/d/a/i1/b.smali
deleted file mode 100644
index efd0e372bc..0000000000
--- a/com.discord/smali/f/a/d/a/i1/b.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/d/a/i1/b;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lf/a/d/a/i1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lf/a/d/a/i1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-static {v0}, Lcom/discord/models/domain/activity/ModelActivityParty;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/d/a/j0.smali b/com.discord/smali/f/a/d/a/j0.smali
index 9c4de7b8cd..d4b06b834f 100644
--- a/com.discord/smali/f/a/d/a/j0.smali
+++ b/com.discord/smali/f/a/d/a/j0.smali
@@ -3,34 +3,44 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
 
 
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+# static fields
+.field public static final synthetic a:Lf/a/d/a/j0;
 
 
 # direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/d/a/j0;
+
+    invoke-direct {v0}, Lf/a/d/a/j0;-><init>()V
+
+    sput-object v0, Lf/a/d/a/j0;->a:Lf/a/d/a/j0;
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>()V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/a/d/a/j0;->a:Lcom/discord/models/domain/Model$JsonReader;
-
     return-void
 .end method
 
 
 # virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
+.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    iget-object v0, p0, Lf/a/d/a/j0;->a:Lcom/discord/models/domain/Model$JsonReader;
+    check-cast p1, Lcom/discord/models/domain/ModelMessageReaction;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageEmbed;
+    invoke-static {p1}, Lcom/discord/models/domain/ModelMessage;->e(Lcom/discord/models/domain/ModelMessageReaction;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
-    return-object v0
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/d/a/j1.smali b/com.discord/smali/f/a/d/a/j1.smali
new file mode 100644
index 0000000000..de9e31a90f
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/j1.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/j1;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/j1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/j1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/ModelUserSettings;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildFolder;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/j1/a.smali b/com.discord/smali/f/a/d/a/j1/a.smali
deleted file mode 100644
index dc06e2d13d..0000000000
--- a/com.discord/smali/f/a/d/a/j1/a.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/d/a/j1/a;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lf/a/d/a/j1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lf/a/d/a/j1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiCustom;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/d/a/j1/b.smali b/com.discord/smali/f/a/d/a/j1/b.smali
deleted file mode 100644
index f47b48b89e..0000000000
--- a/com.discord/smali/f/a/d/a/j1/b.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/d/a/j1/b;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lf/a/d/a/j1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lf/a/d/a/j1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode$Bundle;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/d/a/j1/c.smali b/com.discord/smali/f/a/d/a/j1/c.smali
deleted file mode 100644
index dc67267116..0000000000
--- a/com.discord/smali/f/a/d/a/j1/c.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/d/a/j1/c;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lf/a/d/a/j1/c;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lf/a/d/a/j1/c;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/d/a/j1/d.smali b/com.discord/smali/f/a/d/a/j1/d.smali
deleted file mode 100644
index 5ab4ce26be..0000000000
--- a/com.discord/smali/f/a/d/a/j1/d.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/d/a/j1/d;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lf/a/d/a/j1/d;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lf/a/d/a/j1/d;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/d/a/j1/e.smali b/com.discord/smali/f/a/d/a/j1/e.smali
deleted file mode 100644
index 0f16fc9c27..0000000000
--- a/com.discord/smali/f/a/d/a/j1/e.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/d/a/j1/e;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lf/a/d/a/j1/e;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lf/a/d/a/j1/e;->a:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/f/a/d/a/k0.smali b/com.discord/smali/f/a/d/a/k0.smali
index 9de1485133..27139612bf 100644
--- a/com.discord/smali/f/a/d/a/k0.smali
+++ b/com.discord/smali/f/a/d/a/k0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/k0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageAttachment;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageEmbed;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/k1.smali b/com.discord/smali/f/a/d/a/k1.smali
new file mode 100644
index 0000000000..4533209a85
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/k1.smali
@@ -0,0 +1,50 @@
+.class public final synthetic Lf/a/d/a/k1;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
+
+
+# static fields
+.field public static final synthetic a:Lf/a/d/a/k1;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/d/a/k1;
+
+    invoke-direct {v0}, Lf/a/d/a/k1;-><init>()V
+
+    sput-object v0, Lf/a/d/a/k1;->a:Lf/a/d/a/k1;
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lcom/discord/models/domain/ModelPermissionOverwrite;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPermissionOverwrite;->getId()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/d/a/l0.smali b/com.discord/smali/f/a/d/a/l0.smali
index efc56501c9..b184eedb64 100644
--- a/com.discord/smali/f/a/d/a/l0.smali
+++ b/com.discord/smali/f/a/d/a/l0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/l0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageAttachment;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/l1.smali b/com.discord/smali/f/a/d/a/l1.smali
new file mode 100644
index 0000000000..bbb4e1a436
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/l1.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/l1;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/l1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/l1;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/m0.smali b/com.discord/smali/f/a/d/a/m0.smali
index 47ce6f26c3..81c7e11212 100644
--- a/com.discord/smali/f/a/d/a/m0.smali
+++ b/com.discord/smali/f/a/d/a/m0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/m0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->f(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/dsti/dto/ModelDsti;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/m1.smali b/com.discord/smali/f/a/d/a/m1.smali
new file mode 100644
index 0000000000..fdb163c8cc
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/m1.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lf/a/d/a/m1;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
+
+
+# static fields
+.field public static final synthetic a:Lf/a/d/a/m1;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/d/a/m1;
+
+    invoke-direct {v0}, Lf/a/d/a/m1;-><init>()V
+
+    sput-object v0, Lf/a/d/a/m1;->a:Lf/a/d/a/m1;
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel$RecipientNick;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel$RecipientNick;->getId()Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f/a/d/a/n0.smali b/com.discord/smali/f/a/d/a/n0.smali
index 96af1f87ca..1716f1516d 100644
--- a/com.discord/smali/f/a/d/a/n0.smali
+++ b/com.discord/smali/f/a/d/a/n0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/n0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageReaction;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->f(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/dsti/dto/ModelDsti;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/n1.smali b/com.discord/smali/f/a/d/a/n1.smali
new file mode 100644
index 0000000000..7d7480623a
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/n1.smali
@@ -0,0 +1,44 @@
+.class public final synthetic Lf/a/d/a/n1;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Func0;
+
+
+# static fields
+.field public static final synthetic d:Lf/a/d/a/n1;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/d/a/n1;
+
+    invoke-direct {v0}, Lf/a/d/a/n1;-><init>()V
+
+    sput-object v0, Lf/a/d/a/n1;->d:Lf/a/d/a/n1;
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call()Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/o0.smali b/com.discord/smali/f/a/d/a/o0.smali
index cc38ee4fef..dc105250cf 100644
--- a/com.discord/smali/f/a/d/a/o0.smali
+++ b/com.discord/smali/f/a/d/a/o0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/o0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageEmbed$Field;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelMessage;->d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageReaction;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/o1.smali b/com.discord/smali/f/a/d/a/o1.smali
new file mode 100644
index 0000000000..5e93623de8
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/o1.smali
@@ -0,0 +1,48 @@
+.class public final synthetic Lf/a/d/a/o1;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# static fields
+.field public static final synthetic d:Lf/a/d/a/o1;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/d/a/o1;
+
+    invoke-direct {v0}, Lf/a/d/a/o1;-><init>()V
+
+    sput-object v0, Lf/a/d/a/o1;->d:Lf/a/d/a/o1;
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser;
+
+    check-cast p2, Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {p1, p2}, Lcom/discord/models/domain/ModelUser;->compareUserNames(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)I
+
+    move-result p1
+
+    return p1
+.end method
diff --git a/com.discord/smali/f/a/d/a/p.smali b/com.discord/smali/f/a/d/a/p.smali
index 07ff20ee5b..20fdbab7b3 100644
--- a/com.discord/smali/f/a/d/a/p.smali
+++ b/com.discord/smali/f/a/d/a/p.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/p;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel$RecipientNick;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel$RecipientNick;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/p0.smali b/com.discord/smali/f/a/d/a/p0.smali
index 2861b33266..dfb6c59815 100644
--- a/com.discord/smali/f/a/d/a/p0.smali
+++ b/com.discord/smali/f/a/d/a/p0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/p0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelNotificationSettings;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMessageEmbed$Field;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/p1/a.smali b/com.discord/smali/f/a/d/a/p1/a.smali
new file mode 100644
index 0000000000..ed71219100
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/p1/a.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/p1/a;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/p1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/p1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/p1/b.smali b/com.discord/smali/f/a/d/a/p1/b.smali
new file mode 100644
index 0000000000..c2607e9efe
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/p1/b.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/p1/b;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/p1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/p1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/activity/ModelActivityParty;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/q.smali b/com.discord/smali/f/a/d/a/q.smali
index 57e8843059..21d7cc6cf9 100644
--- a/com.discord/smali/f/a/d/a/q.smali
+++ b/com.discord/smali/f/a/d/a/q.smali
@@ -40,7 +40,7 @@
 
     check-cast p2, Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {p1, p2}, Lcom/discord/models/domain/ModelChannel;->d(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)I
+    invoke-static {p1, p2}, Lcom/discord/models/domain/ModelChannel;->e(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)I
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/d/a/q0.smali b/com.discord/smali/f/a/d/a/q0.smali
index 5e74e33d0a..482431982b 100644
--- a/com.discord/smali/f/a/d/a/q0.smali
+++ b/com.discord/smali/f/a/d/a/q0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/q0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->f(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelSession;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelNotificationSettings;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/q1/a.smali b/com.discord/smali/f/a/d/a/q1/a.smali
new file mode 100644
index 0000000000..72e4c12c03
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/q1/a.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/q1/a;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/q1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/q1/a;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiCustom;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/q1/b.smali b/com.discord/smali/f/a/d/a/q1/b.smali
new file mode 100644
index 0000000000..9b4c119682
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/q1/b.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/q1/b;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/q1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/q1/b;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode$Bundle;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/q1/c.smali b/com.discord/smali/f/a/d/a/q1/c.smali
new file mode 100644
index 0000000000..1a9878f9b6
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/q1/c.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/q1/c;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/q1/c;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/q1/c;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/q1/d.smali b/com.discord/smali/f/a/d/a/q1/d.smali
new file mode 100644
index 0000000000..b514c7453c
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/q1/d.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/q1/d;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/q1/d;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/q1/d;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/q1/e.smali b/com.discord/smali/f/a/d/a/q1/e.smali
new file mode 100644
index 0000000000..a23443beaa
--- /dev/null
+++ b/com.discord/smali/f/a/d/a/q1/e.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf/a/d/a/q1/e;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf/a/d/a/q1/e;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/d/a/q1/e;->a:Lcom/discord/models/domain/Model$JsonReader;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/f/a/d/a/r.smali b/com.discord/smali/f/a/d/a/r.smali
index 31b4182435..bd71d7630b 100644
--- a/com.discord/smali/f/a/d/a/r.smali
+++ b/com.discord/smali/f/a/d/a/r.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/r;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPermissionOverwrite;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/r0.smali b/com.discord/smali/f/a/d/a/r0.smali
index 972b88db60..deb2746512 100644
--- a/com.discord/smali/f/a/d/a/r0.smali
+++ b/com.discord/smali/f/a/d/a/r0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/r0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/s.smali b/com.discord/smali/f/a/d/a/s.smali
index b89c9cae7b..48d631eb5c 100644
--- a/com.discord/smali/f/a/d/a/s.smali
+++ b/com.discord/smali/f/a/d/a/s.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/s;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUser;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->b(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/s0.smali b/com.discord/smali/f/a/d/a/s0.smali
index e08bb4174e..f3d7b8f2d2 100644
--- a/com.discord/smali/f/a/d/a/s0.smali
+++ b/com.discord/smali/f/a/d/a/s0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/s0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->i(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildMember;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/t.smali b/com.discord/smali/f/a/d/a/t.smali
index dcb0f4b5ce..e4dc35c0b2 100644
--- a/com.discord/smali/f/a/d/a/t.smali
+++ b/com.discord/smali/f/a/d/a/t.smali
@@ -9,32 +9,26 @@
 # instance fields
 .field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
-.field public final synthetic b:Ljava/lang/String;
-
 
 # direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lf/a/d/a/t;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    iput-object p2, p0, Lf/a/d/a/t;->b:Ljava/lang/String;
-
     return-void
 .end method
 
 
 # virtual methods
 .method public final get()Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
     iget-object v0, p0, Lf/a/d/a/t;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    iget-object v1, p0, Lf/a/d/a/t;->b:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lcom/discord/models/domain/ModelExperiment$Experiments;->a(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lcom/discord/models/domain/ModelExperiment;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelChannel;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPermissionOverwrite;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/t0.smali b/com.discord/smali/f/a/d/a/t0.smali
index 693bf3e792..4eeb4e8062 100644
--- a/com.discord/smali/f/a/d/a/t0.smali
+++ b/com.discord/smali/f/a/d/a/t0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/t0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload$Hello;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/String;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->b(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/u.smali b/com.discord/smali/f/a/d/a/u.smali
index a8474f3458..ae0e4f975b 100644
--- a/com.discord/smali/f/a/d/a/u.smali
+++ b/com.discord/smali/f/a/d/a/u.smali
@@ -3,44 +3,40 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemRunnable;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 
 
 # instance fields
-.field public final synthetic a:Lcom/discord/models/domain/ModelExperiment;
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
 .field public final synthetic b:Ljava/lang/String;
 
-.field public final synthetic c:Lcom/discord/models/domain/Model$JsonReader;
-
 
 # direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelExperiment;Ljava/lang/String;Lcom/discord/models/domain/Model$JsonReader;)V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/a/d/a/u;->a:Lcom/discord/models/domain/ModelExperiment;
+    iput-object p1, p0, Lf/a/d/a/u;->a:Lcom/discord/models/domain/Model$JsonReader;
 
     iput-object p2, p0, Lf/a/d/a/u;->b:Ljava/lang/String;
 
-    iput-object p3, p0, Lf/a/d/a/u;->c:Lcom/discord/models/domain/Model$JsonReader;
-
     return-void
 .end method
 
 
 # virtual methods
-.method public final run(I)V
-    .locals 3
+.method public final get()Ljava/lang/Object;
+    .locals 2
 
-    iget-object v0, p0, Lf/a/d/a/u;->a:Lcom/discord/models/domain/ModelExperiment;
+    iget-object v0, p0, Lf/a/d/a/u;->a:Lcom/discord/models/domain/Model$JsonReader;
 
     iget-object v1, p0, Lf/a/d/a/u;->b:Ljava/lang/String;
 
-    iget-object v2, p0, Lf/a/d/a/u;->c:Lcom/discord/models/domain/Model$JsonReader;
+    invoke-static {v0, v1}, Lcom/discord/models/domain/ModelExperiment$Experiments;->a(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lcom/discord/models/domain/ModelExperiment;
 
-    invoke-virtual {v0, v1, v2, p1}, Lcom/discord/models/domain/ModelExperiment;->a(Ljava/lang/String;Lcom/discord/models/domain/Model$JsonReader;I)V
+    move-result-object v0
 
-    return-void
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/d/a/u0.smali b/com.discord/smali/f/a/d/a/u0.smali
index b8d5b81aa2..f0eb0a252c 100644
--- a/com.discord/smali/f/a/d/a/u0.smali
+++ b/com.discord/smali/f/a/d/a/u0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/u0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload$Hello;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/v.smali b/com.discord/smali/f/a/d/a/v.smali
index 652a8a3322..766f2d233a 100644
--- a/com.discord/smali/f/a/d/a/v.smali
+++ b/com.discord/smali/f/a/d/a/v.smali
@@ -3,34 +3,44 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemRunnable;
 
 
 # instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+.field public final synthetic a:Lcom/discord/models/domain/ModelExperiment;
+
+.field public final synthetic b:Ljava/lang/String;
+
+.field public final synthetic c:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelExperiment;Ljava/lang/String;Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/a/d/a/v;->a:Lcom/discord/models/domain/Model$JsonReader;
+    iput-object p1, p0, Lf/a/d/a/v;->a:Lcom/discord/models/domain/ModelExperiment;
+
+    iput-object p2, p0, Lf/a/d/a/v;->b:Ljava/lang/String;
+
+    iput-object p3, p0, Lf/a/d/a/v;->c:Lcom/discord/models/domain/Model$JsonReader;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
+.method public final run(I)V
+    .locals 3
 
-    iget-object v0, p0, Lf/a/d/a/v;->a:Lcom/discord/models/domain/Model$JsonReader;
+    iget-object v0, p0, Lf/a/d/a/v;->a:Lcom/discord/models/domain/ModelExperiment;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildRole;
+    iget-object v1, p0, Lf/a/d/a/v;->b:Ljava/lang/String;
 
-    move-result-object v0
+    iget-object v2, p0, Lf/a/d/a/v;->c:Lcom/discord/models/domain/Model$JsonReader;
 
-    return-object v0
+    invoke-virtual {v0, v1, v2, p1}, Lcom/discord/models/domain/ModelExperiment;->a(Ljava/lang/String;Lcom/discord/models/domain/Model$JsonReader;I)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/f/a/d/a/v0.smali b/com.discord/smali/f/a/d/a/v0.smali
index 640e4cdb61..6845ef2c37 100644
--- a/com.discord/smali/f/a/d/a/v0.smali
+++ b/com.discord/smali/f/a/d/a/v0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/v0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuild;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->e(Lcom/discord/models/domain/Model$JsonReader;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/w.smali b/com.discord/smali/f/a/d/a/w.smali
index 9b00b14ecc..78110b41be 100644
--- a/com.discord/smali/f/a/d/a/w.smali
+++ b/com.discord/smali/f/a/d/a/w.smali
@@ -3,44 +3,34 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
 
 
-# static fields
-.field public static final synthetic a:Lf/a/d/a/w;
+# instance fields
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf/a/d/a/w;
-
-    invoke-direct {v0}, Lf/a/d/a/w;-><init>()V
-
-    sput-object v0, Lf/a/d/a/w;->a:Lf/a/d/a/w;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-object p1, p0, Lf/a/d/a/w;->a:Lcom/discord/models/domain/Model$JsonReader;
+
     return-void
 .end method
 
 
 # virtual methods
-.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final get()Ljava/lang/Object;
+    .locals 1
 
-    check-cast p1, Lcom/discord/models/domain/ModelGuildMember;
+    iget-object v0, p0, Lf/a/d/a/w;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {p1}, Lcom/discord/models/domain/ModelGuild;->f(Lcom/discord/models/domain/ModelGuildMember;)Ljava/lang/Long;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelGuildRole;
 
-    move-result-object p1
+    move-result-object v0
 
-    return-object p1
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/d/a/w0.smali b/com.discord/smali/f/a/d/a/w0.smali
index ea6a2e280f..a28d859357 100644
--- a/com.discord/smali/f/a/d/a/w0.smali
+++ b/com.discord/smali/f/a/d/a/w0.smali
@@ -7,20 +7,16 @@
 
 
 # instance fields
-.field public final synthetic a:Lcom/discord/models/domain/ModelPayload$VersionedModel;
-
-.field public final synthetic b:Lcom/discord/models/domain/Model$JsonReader;
+.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
 
 
 # direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/ModelPayload$VersionedModel;Lcom/discord/models/domain/Model$JsonReader;)V
+.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/a/d/a/w0;->a:Lcom/discord/models/domain/ModelPayload$VersionedModel;
-
-    iput-object p2, p0, Lf/a/d/a/w0;->b:Lcom/discord/models/domain/Model$JsonReader;
+    iput-object p1, p0, Lf/a/d/a/w0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
     return-void
 .end method
@@ -28,13 +24,11 @@
 
 # virtual methods
 .method public final get()Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
-    iget-object v0, p0, Lf/a/d/a/w0;->a:Lcom/discord/models/domain/ModelPayload$VersionedModel;
+    iget-object v0, p0, Lf/a/d/a/w0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    iget-object v1, p0, Lf/a/d/a/w0;->b:Lcom/discord/models/domain/Model$JsonReader;
-
-    invoke-virtual {v0, v1}, Lcom/discord/models/domain/ModelPayload$VersionedModel;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->b(Lcom/discord/models/domain/Model$JsonReader;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/x.smali b/com.discord/smali/f/a/d/a/x.smali
index be1d3ba2f9..ce59f16f65 100644
--- a/com.discord/smali/f/a/d/a/x.smali
+++ b/com.discord/smali/f/a/d/a/x.smali
@@ -3,34 +3,44 @@
 .source "lambda"
 
 # interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+.implements Lcom/discord/models/domain/Model$JsonReader$KeySelector;
 
 
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
+# static fields
+.field public static final synthetic a:Lf/a/d/a/x;
 
 
 # direct methods
-.method public synthetic constructor <init>(Lcom/discord/models/domain/Model$JsonReader;)V
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf/a/d/a/x;
+
+    invoke-direct {v0}, Lf/a/d/a/x;-><init>()V
+
+    sput-object v0, Lf/a/d/a/x;->a:Lf/a/d/a/x;
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>()V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/a/d/a/x;->a:Lcom/discord/models/domain/Model$JsonReader;
-
     return-void
 .end method
 
 
 # virtual methods
-.method public final get()Ljava/lang/Object;
-    .locals 1
+.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    iget-object v0, p0, Lf/a/d/a/x;->a:Lcom/discord/models/domain/Model$JsonReader;
+    check-cast p1, Lcom/discord/models/domain/ModelGuildMember;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->g(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelVoice$State;
+    invoke-static {p1}, Lcom/discord/models/domain/ModelGuild;->f(Lcom/discord/models/domain/ModelGuildMember;)Ljava/lang/Long;
 
-    move-result-object v0
+    move-result-object p1
 
-    return-object v0
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/d/a/x0.smali b/com.discord/smali/f/a/d/a/x0.smali
index 6416d108d2..b212a1324b 100644
--- a/com.discord/smali/f/a/d/a/x0.smali
+++ b/com.discord/smali/f/a/d/a/x0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/x0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->e(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelConnectedAccount;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/y.smali b/com.discord/smali/f/a/d/a/y.smali
index d438983ddc..902c1602c0 100644
--- a/com.discord/smali/f/a/d/a/y.smali
+++ b/com.discord/smali/f/a/d/a/y.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/y;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->g(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelVoice$State;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/y0.smali b/com.discord/smali/f/a/d/a/y0.smali
index 55c5b5f64e..2f0f31eb12 100644
--- a/com.discord/smali/f/a/d/a/y0.smali
+++ b/com.discord/smali/f/a/d/a/y0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/y0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUserRelationship;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload$MergedPresences;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/z.smali b/com.discord/smali/f/a/d/a/z.smali
index 1506bc0540..dfca91bec6 100644
--- a/com.discord/smali/f/a/d/a/z.smali
+++ b/com.discord/smali/f/a/d/a/z.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/z;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelChannel;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelGuild;->c(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/d/a/z0.smali b/com.discord/smali/f/a/d/a/z0.smali
index d9e348e99e..f9f083ded1 100644
--- a/com.discord/smali/f/a/d/a/z0.smali
+++ b/com.discord/smali/f/a/d/a/z0.smali
@@ -28,7 +28,7 @@
 
     iget-object v0, p0, Lf/a/d/a/z0;->a:Lcom/discord/models/domain/Model$JsonReader;
 
-    invoke-static {v0}, Lcom/discord/models/domain/ModelSession;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/activity/ModelActivity;
+    invoke-static {v0}, Lcom/discord/models/domain/ModelPayload;->d(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/e/a.smali b/com.discord/smali/f/a/e/a.smali
index b70e483925..b9eadee6e8 100644
--- a/com.discord/smali/f/a/e/a.smali
+++ b/com.discord/smali/f/a/e/a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/e/a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayManager.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/overlay/views/OverlayBubbleWrap;",
         "Ljava/lang/Boolean;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    if-eqz p1, :cond_0
+    const-string v0, "bubbleWrap"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     iget-object v0, p0, Lf/a/e/a;->this$0:Lcom/discord/overlay/OverlayManager;
@@ -72,13 +74,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "bubbleWrap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/e/b.smali b/com.discord/smali/f/a/e/b.smali
index aceed22509..99b02dee84 100644
--- a/com.discord/smali/f/a/e/b.smali
+++ b/com.discord/smali/f/a/e/b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/e/b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayManager.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/e/c$a$a.smali b/com.discord/smali/f/a/e/c$a$a.smali
index b21f077f61..ddf5563061 100644
--- a/com.discord/smali/f/a/e/c$a$a.smali
+++ b/com.discord/smali/f/a/e/c$a$a.smali
@@ -41,7 +41,9 @@
 .method public onLayoutChange(Landroid/view/View;IIIIIIII)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string/jumbo p2, "view"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p0}, Landroid/view/View;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
 
@@ -57,9 +59,9 @@
 
     move-result-object p1
 
-    const-string p2, "v.findViewWithTag(anchorViewTag)"
+    const-string/jumbo p2, "v.findViewWithTag(anchorViewTag)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lf/a/e/c$a$a;->d:Lf/a/e/c$a;
 
@@ -70,13 +72,4 @@
     invoke-virtual {p2, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->d(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/e/c$a.smali b/com.discord/smali/f/a/e/c$a.smali
index ae58abba1e..35154f56e5 100644
--- a/com.discord/smali/f/a/e/c$a.smali
+++ b/com.discord/smali/f/a/e/c$a.smali
@@ -42,7 +42,9 @@
 .method public onViewAttachedToWindow(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string/jumbo v0, "v"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
@@ -64,9 +66,9 @@
 
     move-result-object p1
 
-    const-string v0, "v.findViewWithTag(anchorViewTag)"
+    const-string/jumbo v0, "v.findViewWithTag(anchorViewTag)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/e/c$a;->d:Lf/a/e/c;
 
@@ -85,15 +87,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewDetachedFromWindow(Landroid/view/View;)V
diff --git a/com.discord/smali/f/a/e/d.smali b/com.discord/smali/f/a/e/d.smali
index 720a9426c0..ac109f5643 100644
--- a/com.discord/smali/f/a/e/d.smali
+++ b/com.discord/smali/f/a/e/d.smali
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/discord/overlay/OverlayManager;
+.field public final synthetic a:Lcom/discord/overlay/OverlayManager;
 
-.field public final synthetic e:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field public final synthetic b:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
 
 # direct methods
 .method public constructor <init>(Lcom/discord/overlay/OverlayManager;Lcom/discord/overlay/views/OverlayBubbleWrap;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/e/d;->d:Lcom/discord/overlay/OverlayManager;
+    iput-object p1, p0, Lf/a/e/d;->a:Lcom/discord/overlay/OverlayManager;
 
-    iput-object p2, p0, Lf/a/e/d;->e:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p2, p0, Lf/a/e/d;->b:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -28,101 +28,67 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "animator"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lf/a/e/d;->d:Lcom/discord/overlay/OverlayManager;
+    iget-object p1, p0, Lf/a/e/d;->a:Lcom/discord/overlay/OverlayManager;
 
     iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->i:Lf/a/e/f/a;
 
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lf/a/e/d;->e:Lcom/discord/overlay/views/OverlayBubbleWrap;
-
     if-eqz p1, :cond_0
 
-    goto :goto_0
+    iget-object p1, p0, Lf/a/e/d;->b:Lcom/discord/overlay/views/OverlayBubbleWrap;
+
+    const-string v0, "bubble"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
-    const-string p1, "bubble"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    iget-object p1, p0, Lf/a/e/d;->d:Lcom/discord/overlay/OverlayManager;
+    iget-object p1, p0, Lf/a/e/d;->a:Lcom/discord/overlay/OverlayManager;
 
     iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->j:Lf/a/e/e;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lf/a/e/d;->e:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lf/a/e/d;->b:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-interface {p1, v0}, Lf/a/e/e;->b(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
-    :cond_2
+    :cond_1
     return-void
-
-    :cond_3
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/e/f/a$a.smali b/com.discord/smali/f/a/e/f/a$a.smali
index e01d85b3e6..58fc967782 100644
--- a/com.discord/smali/f/a/e/f/a$a.smali
+++ b/com.discord/smali/f/a/e/f/a$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/a/e/f/a;
+.field public final synthetic a:Lf/a/e/f/a;
 
 
 # direct methods
 .method public constructor <init>(Lf/a/e/f/a;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/e/f/a$a;->d:Lf/a/e/f/a;
+    iput-object p1, p0, Lf/a/e/f/a$a;->a:Lf/a/e/f/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,75 +35,47 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
 
-    iget-object p1, p0, Lf/a/e/f/a$a;->d:Lf/a/e/f/a;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lf/a/e/f/a$a;->a:Lf/a/e/f/a;
 
     const/4 v0, 0x0
 
     invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->setVisibility(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/e/f/a$b.smali b/com.discord/smali/f/a/e/f/a$b.smali
index f97bc242b4..428040190c 100644
--- a/com.discord/smali/f/a/e/f/a$b.smali
+++ b/com.discord/smali/f/a/e/f/a$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/a/e/f/a;
+.field public final synthetic a:Lf/a/e/f/a;
 
 
 # direct methods
 .method public constructor <init>(Lf/a/e/f/a;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/e/f/a$b;->d:Lf/a/e/f/a;
+    iput-object p1, p0, Lf/a/e/f/a$b;->a:Lf/a/e/f/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,75 +35,47 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
 
-    iget-object p1, p0, Lf/a/e/f/a$b;->d:Lf/a/e/f/a;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lf/a/e/f/a$b;->a:Lf/a/e/f/a;
 
     const/4 v0, 0x4
 
     invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->setVisibility(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/e/f/a.smali b/com.discord/smali/f/a/e/f/a.smali
index 6626cc9478..0b962fc522 100644
--- a/com.discord/smali/f/a/e/f/a.smali
+++ b/com.discord/smali/f/a/e/f/a.smali
@@ -30,6 +30,10 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 6
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
     sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -72,6 +76,10 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->gravity:I
 
+    const-string v0, "$this$addFlag"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget v0, p1, Landroid/view/WindowManager$LayoutParams;->flags:I
 
     or-int/lit8 v0, v0, 0x10
@@ -104,7 +112,7 @@
 
     const-string v0, "findViewById(R.id.trash_wrap_target_zone)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lf/a/e/f/a;->e:Landroid/view/View;
 
@@ -116,7 +124,7 @@
 
     const-string v0, "findViewById(R.id.trash_wrap_target_container)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lf/a/e/f/a;->f:Landroid/view/View;
 
@@ -128,7 +136,7 @@
 
     const-string v0, "findViewById(R.id.trash_wrap_icon)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -402,7 +410,7 @@
     :goto_0
     iget-object v0, p0, Lf/a/e/f/a;->l:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -449,20 +457,15 @@
 .end method
 
 .method public b(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "bubble"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "bubble"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getHideAnimator()Landroid/animation/Animator;
@@ -537,20 +540,13 @@
 .end method
 
 .method public final setWindowLayoutParams(Landroid/view/WindowManager$LayoutParams;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lf/a/e/f/a;->d:Landroid/view/WindowManager$LayoutParams;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/f/a$a.smali b/com.discord/smali/f/a/f/a$a.smali
index fad989aeec..660e0b9d31 100644
--- a/com.discord/smali/f/a/f/a$a.smali
+++ b/com.discord/smali/f/a/f/a$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/f/a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "LocaleProvider.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Context;",
         "Ljava/util/Locale;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 
     check-cast p1, Landroid/content/Context;
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -69,7 +71,7 @@
 
     const-string v0, "context.resources"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -87,16 +89,7 @@
 
     const-string v0, "ConfigurationCompat.getL\u2026sources.configuration)[0]"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/f/b.smali b/com.discord/smali/f/a/f/b.smali
index 3e9320be4c..402484e601 100644
--- a/com.discord/smali/f/a/f/b.smali
+++ b/com.discord/smali/f/a/f/b.smali
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/a/g/c.smali b/com.discord/smali/f/a/g/c.smali
index ec24e6c351..f075e97b2c 100644
--- a/com.discord/smali/f/a/g/c.smali
+++ b/com.discord/smali/f/a/g/c.smali
@@ -58,7 +58,7 @@
 
     const-string v0, "javaClass.simpleName"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/f/a/g/e.smali b/com.discord/smali/f/a/g/e.smali
index 65922c788f..1c57c4b2a9 100644
--- a/com.discord/smali/f/a/g/e.smali
+++ b/com.discord/smali/f/a/g/e.smali
@@ -130,7 +130,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
diff --git a/com.discord/smali/f/a/g/i.smali b/com.discord/smali/f/a/g/i.smali
index 907f78b663..f4dcbc9f68 100644
--- a/com.discord/smali/f/a/g/i.smali
+++ b/com.discord/smali/f/a/g/i.smali
@@ -5,139 +5,153 @@
 
 # direct methods
 .method public static final a(Landroid/content/Context;)Lcom/discord/player/AppMediaPlayer;
-    .locals 34
+    .locals 28
 
     move-object/from16 v1, p0
 
+    const-string v0, "context"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object v9, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    if-eqz v9, :cond_1
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lf/h/a/c/h1/o;
+    const-string v0, "com.discord"
 
-    const-string v2, "com.discord"
+    const-string v2, "applicationId"
 
-    invoke-static {v1, v2}, Lf/h/a/c/i1/c0;->G(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v2
+    const-string v2, "logger"
 
-    invoke-direct {v0, v1, v2}, Lf/h/a/c/h1/o;-><init>(Landroid/content/Context;Ljava/lang/String;)V
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lf/h/a/c/h1/o;
+
+    invoke-static {v1, v0}, Lf/h/a/c/i1/c0;->G(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v2, v1, v0}, Lf/h/a/c/h1/o;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
     new-instance v10, Lf/a/g/j;
 
-    const-wide/32 v2, 0x6400000
+    const-wide/32 v3, 0x6400000
 
-    invoke-direct {v10, v0, v2, v3}, Lf/a/g/j;-><init>(Lf/h/a/c/h1/o;J)V
+    invoke-direct {v10, v2, v3, v4}, Lf/a/g/j;-><init>(Lf/h/a/c/h1/o;J)V
 
     new-instance v11, Lf/a/g/k;
 
     invoke-direct {v11}, Lf/a/g/k;-><init>()V
 
-    const/16 v19, -0x1
+    const/4 v0, 0x1
 
-    const/16 v20, 0x1
+    invoke-static {v0}, Lf/h/a/c/i1/e;->F(Z)V
 
-    const/16 v22, 0x0
+    const/16 v2, 0x9c4
 
-    const/16 v0, 0x2710
+    const/4 v3, 0x0
+
+    const-string v4, "bufferForPlaybackMs"
+
+    const-string v5, "0"
+
+    invoke-static {v2, v3, v4, v5}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
+
+    const/16 v6, 0x1388
+
+    const-string v7, "bufferForPlaybackAfterRebufferMs"
+
+    invoke-static {v6, v3, v7, v5}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
+
+    const/16 v3, 0x2710
+
+    const-string v5, "minBufferMs"
+
+    invoke-static {v3, v2, v5, v4}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v3, v6, v5, v7}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
 
     const/16 v2, 0x7530
 
-    const/16 v3, 0x9c4
+    const-string v4, "maxBufferMs"
 
-    const/16 v4, 0x1388
+    invoke-static {v2, v3, v4, v5}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
 
-    const/4 v5, 0x1
+    invoke-static {v0}, Lf/h/a/c/i1/e;->F(Z)V
 
-    invoke-static {v5}, Lf/h/a/c/i1/e;->F(Z)V
-
-    const-string v6, "bufferForPlaybackMs"
-
-    const-string v7, "0"
-
-    const/4 v8, 0x0
-
-    invoke-static {v3, v8, v6, v7}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
-
-    const-string v12, "bufferForPlaybackAfterRebufferMs"
-
-    invoke-static {v4, v8, v12, v7}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
-
-    const-string v7, "minBufferMs"
-
-    invoke-static {v0, v3, v7, v6}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v0, v4, v7, v12}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
-
-    const-string v3, "maxBufferMs"
-
-    invoke-static {v2, v0, v3, v7}, Lf/h/a/c/x;->j(IILjava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v5}, Lf/h/a/c/i1/e;->F(Z)V
-
-    new-instance v0, Lf/h/a/c/h1/l;
+    new-instance v13, Lf/h/a/c/h1/l;
 
     const/high16 v2, 0x10000
 
-    invoke-direct {v0, v5, v2}, Lf/h/a/c/h1/l;-><init>(ZI)V
+    invoke-direct {v13, v0, v2}, Lf/h/a/c/h1/l;-><init>(ZI)V
 
     new-instance v4, Lf/h/a/c/x;
 
-    const/16 v26, 0x2710
+    const/16 v15, 0x2710
 
-    const/16 v27, 0x7530
+    const/16 v16, 0x7530
 
-    const/16 v17, 0x9c4
+    const/16 v3, 0x9c4
 
-    const/16 v18, 0x1388
+    const/16 v23, 0x1388
 
-    const/16 v28, 0x9c4
+    const/16 v24, -0x1
 
-    const/16 v29, 0x1388
+    const/16 v25, 0x1
 
-    const/16 v30, -0x1
+    const/16 v27, 0x0
 
-    const/16 v31, 0x1
+    move-object v12, v4
 
-    const/16 v33, 0x0
+    move v14, v15
 
-    move-object/from16 v23, v4
+    move/from16 v17, v3
 
-    move-object/from16 v24, v0
+    move/from16 v18, v23
 
-    move/from16 v25, v26
+    move/from16 v19, v24
 
-    move/from16 v32, v33
+    move/from16 v20, v25
 
-    invoke-direct/range {v23 .. v33}, Lf/h/a/c/x;-><init>(Lf/h/a/c/h1/l;IIIIIIZIZ)V
+    move/from16 v21, v27
 
-    const-string v0, "DefaultLoadControl.Build\u2026reateDefaultLoadControl()"
+    move/from16 v22, v27
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct/range {v12 .. v22}, Lf/h/a/c/x;-><init>(Lf/h/a/c/h1/l;IIIIIIZIZ)V
 
-    new-instance v3, Lf/h/a/c/z;
+    const-string v5, "DefaultLoadControl.Build\u2026reateDefaultLoadControl()"
 
-    invoke-direct {v3, v1}, Lf/h/a/c/z;-><init>(Landroid/content/Context;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Lf/h/a/c/z;
+
+    invoke-direct {v5, v1}, Lf/h/a/c/z;-><init>(Landroid/content/Context;)V
 
     new-instance v6, Lcom/google/android/exoplayer2/trackselection/DefaultTrackSelector;
 
     invoke-direct {v6, v1}, Lcom/google/android/exoplayer2/trackselection/DefaultTrackSelector;-><init>(Landroid/content/Context;)V
 
-    new-instance v12, Lf/h/a/c/x;
+    new-instance v17, Lf/h/a/c/x;
 
-    new-instance v13, Lf/h/a/c/h1/l;
+    new-instance v7, Lf/h/a/c/h1/l;
 
-    invoke-direct {v13, v5, v2}, Lf/h/a/c/h1/l;-><init>(ZI)V
+    invoke-direct {v7, v0, v2}, Lf/h/a/c/h1/l;-><init>(ZI)V
 
-    const/16 v14, 0x3a98
+    const/16 v19, 0x3a98
 
-    const v15, 0xc350
+    const v20, 0xc350
 
-    const v16, 0xc350
+    const v21, 0xc350
 
-    const/16 v21, 0x0
+    const/16 v26, 0x0
 
-    invoke-direct/range {v12 .. v22}, Lf/h/a/c/x;-><init>(Lf/h/a/c/h1/l;IIIIIIZIZ)V
+    move-object/from16 v18, v7
+
+    move/from16 v22, v3
+
+    invoke-direct/range {v17 .. v27}, Lf/h/a/c/x;-><init>(Lf/h/a/c/h1/l;IIIIIIZIZ)V
 
     invoke-static/range {p0 .. p0}, Lf/h/a/c/h1/m;->j(Landroid/content/Context;)Lf/h/a/c/h1/m;
 
@@ -145,31 +159,31 @@
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
 
-    move-result-object v0
+    move-result-object v2
 
-    if-eqz v0, :cond_0
+    if-eqz v2, :cond_0
 
     goto :goto_0
 
     :cond_0
     invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
 
-    move-result-object v0
+    move-result-object v2
 
     :goto_0
-    move-object v8, v0
+    move-object v8, v2
 
     new-instance v12, Lf/h/a/c/v0/a;
 
-    sget-object v0, Lf/h/a/c/i1/g;->a:Lf/h/a/c/i1/g;
+    sget-object v2, Lf/h/a/c/i1/g;->a:Lf/h/a/c/i1/g;
 
-    invoke-direct {v12, v0}, Lf/h/a/c/v0/a;-><init>(Lf/h/a/c/i1/g;)V
+    invoke-direct {v12, v2}, Lf/h/a/c/v0/a;-><init>(Lf/h/a/c/i1/g;)V
 
     sget-object v13, Lf/h/a/c/i1/g;->a:Lf/h/a/c/i1/g;
 
-    invoke-static {v5}, Lf/h/a/c/i1/e;->F(Z)V
+    invoke-static {v0}, Lf/h/a/c/i1/e;->F(Z)V
 
-    invoke-static {v5}, Lf/h/a/c/i1/e;->F(Z)V
+    invoke-static {v0}, Lf/h/a/c/i1/e;->F(Z)V
 
     new-instance v14, Lf/h/a/c/s0;
 
@@ -177,7 +191,7 @@
 
     move-object/from16 v1, p0
 
-    move-object v2, v3
+    move-object v2, v5
 
     move-object v3, v6
 
@@ -191,7 +205,7 @@
 
     const-string v0, "SimpleExoPlayer\n        \u2026ntrol)\n          .build()"
 
-    invoke-static {v14, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v14}, Lf/h/a/c/s0;->S()V
 
@@ -205,36 +219,27 @@
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/CopyOnWriteArrayList;->addIfAbsent(Ljava/lang/Object;)Z
 
-    new-instance v6, Lcom/discord/player/AppMediaPlayer;
+    new-instance v0, Lcom/discord/player/AppMediaPlayer;
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
-    move-result-object v4
+    move-result-object v5
 
-    const-string v0, "Schedulers.computation()"
+    const-string v1, "Schedulers.computation()"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    move-object v1, v0
 
-    move-object v1, v14
+    move-object v2, v14
 
-    move-object v2, v11
+    move-object v3, v11
 
-    move-object v3, v10
+    move-object v4, v10
 
-    move-object v5, v9
+    move-object v6, v9
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/player/AppMediaPlayer;-><init>(Lf/h/a/c/s0;Lf/a/g/k;Lf/h/a/c/h1/j$a;Lrx/Scheduler;Lcom/discord/utilities/logging/Logger;)V
+    invoke-direct/range {v1 .. v6}, Lcom/discord/player/AppMediaPlayer;-><init>(Lf/h/a/c/s0;Lf/a/g/k;Lf/h/a/c/h1/j$a;Lrx/Scheduler;Lcom/discord/utilities/logging/Logger;)V
 
-    return-object v6
-
-    :cond_1
-    const-string v0, "logger"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/g/j.smali b/com.discord/smali/f/a/g/j.smali
index eb489ff298..a4bae07118 100644
--- a/com.discord/smali/f/a/g/j.smali
+++ b/com.discord/smali/f/a/g/j.smali
@@ -14,7 +14,11 @@
 
 # direct methods
 .method public constructor <init>(Lf/h/a/c/h1/o;J)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "defaultDatasourceFactory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/f/a/g/k$b.smali b/com.discord/smali/f/a/g/k$b.smali
index 1c9839b943..303259deb5 100644
--- a/com.discord/smali/f/a/g/k$b.smali
+++ b/com.discord/smali/f/a/g/k$b.smali
@@ -20,7 +20,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/exoplayer2/ExoPlaybackException;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "exoPlaybackException"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +50,7 @@
 
     iget-object p1, p1, Lf/a/g/k$b;->a:Lcom/google/android/exoplayer2/ExoPlaybackException;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/g/k.smali b/com.discord/smali/f/a/g/k.smali
index be355833f2..d05ee43a06 100644
--- a/com.discord/smali/f/a/g/k.smali
+++ b/com.discord/smali/f/a/g/k.smali
@@ -136,7 +136,9 @@
 .method public k(Lcom/google/android/exoplayer2/ExoPlaybackException;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/g/k;->f:Lrx/subjects/PublishSubject;
 
@@ -149,15 +151,6 @@
     invoke-virtual {p1, v1}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic l(Lf/h/a/c/t0;I)V
diff --git a/com.discord/smali/f/a/g/l$a.smali b/com.discord/smali/f/a/g/l$a.smali
index 7bbacf2d79..1b87d61287 100644
--- a/com.discord/smali/f/a/g/l$a.smali
+++ b/com.discord/smali/f/a/g/l$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/g/l$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SimpleCacheProvider.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lf/h/a/c/h1/y/r;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/Context;->getCacheDir()Ljava/io/File;
 
diff --git a/com.discord/smali/f/a/h/a.smali b/com.discord/smali/f/a/h/a.smali
index 0bb3b44be8..a2ce8d8b11 100644
--- a/com.discord/smali/f/a/h/a.smali
+++ b/com.discord/smali/f/a/h/a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -33,7 +33,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     const-string v2, "isConnected"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/f/a/h/c.smali b/com.discord/smali/f/a/h/c.smali
index 6b451a1d10..b75207dd4f 100644
--- a/com.discord/smali/f/a/h/c.smali
+++ b/com.discord/smali/f/a/h/c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 
 # virtual methods
 .method public invoke()Ljava/lang/Object;
-    .locals 18
+    .locals 17
 
     move-object/from16 v1, p0
 
@@ -59,12 +59,12 @@
 
     if-eqz v7, :cond_0
 
-    const-string v0, "wss"
+    const-string/jumbo v0, "wss"
 
     goto :goto_0
 
     :cond_0
-    const-string v0, "ws"
+    const-string/jumbo v0, "ws"
 
     :goto_0
     const/4 v4, 0x0
@@ -75,7 +75,7 @@
 
     const-string v9, ".media"
 
-    invoke-static {v3, v8, v9, v4, v5}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v3, v8, v9, v4, v5}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v8
 
@@ -89,13 +89,13 @@
 
     const-string v10, ":443"
 
-    invoke-static {v0, v9, v10, v4, v5}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v0, v9, v10, v4, v5}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v5
 
     iget-object v9, v2, Lcom/discord/rtcconnection/RtcConnection;->j:Lf/a/h/s/a;
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
     if-eqz v9, :cond_1
 
@@ -104,10 +104,10 @@
     goto :goto_1
 
     :cond_1
-    move-object v9, v11
+    move-object v9, v10
 
     :goto_1
-    invoke-static {v9, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v9, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v9
 
@@ -122,10 +122,10 @@
     goto :goto_2
 
     :cond_2
-    move-object v9, v11
+    move-object v9, v10
 
     :goto_2
-    invoke-static {v9, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v9, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v9
 
@@ -137,26 +137,26 @@
 
     if-nez v9, :cond_3
 
-    iget-object v12, v2, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
+    iget-object v11, v2, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v13, v2, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
+    iget-object v12, v2, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
 
-    const/4 v15, 0x0
+    const/4 v14, 0x0
 
-    const/16 v16, 0x4
+    const/4 v15, 0x4
 
-    const/16 v17, 0x0
+    const/16 v16, 0x0
 
-    const-string v14, "Already connecting, no need to continue."
+    const-string v13, "Already connecting, no need to continue."
 
-    invoke-static/range {v12 .. v17}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static/range {v11 .. v16}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     goto/16 :goto_4
 
     :cond_3
     iget-object v9, v2, Lcom/discord/rtcconnection/RtcConnection;->j:Lf/a/h/s/a;
 
-    const/4 v10, 0x1
+    const/4 v11, 0x1
 
     if-eqz v9, :cond_4
 
@@ -168,7 +168,7 @@
 
     invoke-virtual {v9, v12}, Lf/a/h/s/a;->b(Lkotlin/jvm/functions/Function1;)V
 
-    iput-boolean v10, v9, Lf/a/h/s/a;->q:Z
+    iput-boolean v11, v9, Lf/a/h/s/a;->q:Z
 
     :cond_4
     iget-boolean v9, v2, Lcom/discord/rtcconnection/RtcConnection;->h:Z
@@ -177,7 +177,7 @@
 
     const-string v0, "Connect called on destroyed instance."
 
-    invoke-virtual {v2, v4, v0, v11}, Lcom/discord/rtcconnection/RtcConnection;->c(ZLjava/lang/String;Ljava/lang/Throwable;)V
+    invoke-virtual {v2, v4, v0, v10}, Lcom/discord/rtcconnection/RtcConnection;->c(ZLjava/lang/String;Ljava/lang/Throwable;)V
 
     goto/16 :goto_4
 
@@ -186,7 +186,7 @@
 
     const-string v0, "Connect called with no token."
 
-    invoke-virtual {v2, v4, v0, v11}, Lcom/discord/rtcconnection/RtcConnection;->c(ZLjava/lang/String;Ljava/lang/Throwable;)V
+    invoke-virtual {v2, v4, v0, v10}, Lcom/discord/rtcconnection/RtcConnection;->c(ZLjava/lang/String;Ljava/lang/Throwable;)V
 
     goto/16 :goto_4
 
@@ -197,15 +197,15 @@
 
     invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v12, "connecting via endpoint: "
+    const-string v11, "connecting via endpoint: "
 
-    invoke-virtual {v10, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v10, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v12, " token: "
+    const-string v11, " token: "
 
-    invoke-virtual {v10, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v10, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -213,9 +213,9 @@
 
     move-result-object v10
 
-    iget-object v12, v2, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
+    iget-object v11, v2, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
 
-    invoke-virtual {v9, v10, v12}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v9, v10, v11}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/lang/String;->length()I
 
@@ -230,7 +230,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->a:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
-    invoke-virtual {v2, v0}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {v2, v0}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     goto :goto_4
 
@@ -286,7 +286,7 @@
 
     iget-object v3, v2, Lcom/discord/rtcconnection/RtcConnection;->B:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    invoke-interface {v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->k()Ljava/util/concurrent/ExecutorService;
+    invoke-interface {v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->l()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v9
 
@@ -298,7 +298,9 @@
 
     iget-object v3, v2, Lcom/discord/rtcconnection/RtcConnection;->t:Lf/a/h/p;
 
-    if-eqz v3, :cond_9
+    const-string v4, "listener"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, v0, Lf/a/h/s/a;->p:Ljava/util/List;
 
@@ -312,11 +314,4 @@
     sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object v0
-
-    :cond_9
-    const-string v0, "listener"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v11
 .end method
diff --git a/com.discord/smali/f/a/h/e.smali b/com.discord/smali/f/a/h/e.smali
index 21c65a5d36..4a3ed66541 100644
--- a/com.discord/smali/f/a/h/e.smali
+++ b/com.discord/smali/f/a/h/e.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -33,7 +33,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 
     const-string v2, "throwable"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/f/a/h/g.smali b/com.discord/smali/f/a/h/g.smali
index 5d85e193b5..45301e29a5 100644
--- a/com.discord/smali/f/a/h/g.smali
+++ b/com.discord/smali/f/a/h/g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/h.smali b/com.discord/smali/f/a/h/h.smali
index 6b3af121b4..4eb5db62ee 100644
--- a/com.discord/smali/f/a/h/h.smali
+++ b/com.discord/smali/f/a/h/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/i.smali b/com.discord/smali/f/a/h/i.smali
index 8b469e3077..be6fb30151 100644
--- a/com.discord/smali/f/a/h/i.smali
+++ b/com.discord/smali/f/a/h/i.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/i;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -33,7 +33,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/j.smali b/com.discord/smali/f/a/h/j.smali
index 44e1bdc995..3da18f6a85 100644
--- a/com.discord/smali/f/a/h/j.smali
+++ b/com.discord/smali/f/a/h/j.smali
@@ -29,7 +29,7 @@
 
 # virtual methods
 .method public onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
-    .locals 10
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,13 +41,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string p1, "transportInfo"
 
-    if-eqz p3, :cond_6
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "supportedVideoCodecs"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/h/j;->a:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -59,65 +63,77 @@
 
     iget-object v1, p1, Lcom/discord/rtcconnection/RtcConnection;->k:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    if-eqz v1, :cond_1
+    const/4 v2, 0x0
 
-    iget-object v2, p1, Lcom/discord/rtcconnection/RtcConnection;->d:Lf/a/h/t/d;
+    if-eqz v1, :cond_2
 
-    iput-object v0, v2, Lf/a/h/t/d;->a:Lco/discord/media_engine/Stats;
+    iget-object v3, p1, Lcom/discord/rtcconnection/RtcConnection;->d:Lf/a/h/t/d;
 
-    new-instance v3, Lco/discord/media_engine/VoiceQuality;
+    if-eqz v3, :cond_1
 
-    invoke-direct {v3}, Lco/discord/media_engine/VoiceQuality;-><init>()V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v3, v2, Lf/a/h/t/d;->b:Lco/discord/media_engine/VoiceQuality;
+    iput-object v2, v3, Lf/a/h/t/d;->a:Lco/discord/media_engine/Stats;
 
-    iget-object v3, v2, Lf/a/h/t/d;->c:Lrx/Subscription;
+    new-instance v0, Lco/discord/media_engine/VoiceQuality;
 
-    if-eqz v3, :cond_0
+    invoke-direct {v0}, Lco/discord/media_engine/VoiceQuality;-><init>()V
 
-    invoke-interface {v3}, Lrx/Subscription;->isUnsubscribed()Z
+    iput-object v0, v3, Lf/a/h/t/d;->b:Lco/discord/media_engine/VoiceQuality;
 
-    move-result v3
+    iget-object v0, v3, Lf/a/h/t/d;->c:Lrx/Subscription;
 
-    if-nez v3, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v2}, Lf/a/h/t/d;->a()V
+    invoke-interface {v0}, Lrx/Subscription;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {v3}, Lf/a/h/t/d;->a()V
 
     :cond_0
-    const-wide/16 v3, 0x0
+    const-wide/16 v4, 0x0
 
-    iget-wide v5, v2, Lf/a/h/t/d;->d:J
+    iget-wide v6, v3, Lf/a/h/t/d;->d:J
 
-    sget-object v7, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {v3, v4, v5, v6, v7}, Lrx/Observable;->B(JJLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v4, v5, v6, v7, v0}, Lrx/Observable;->B(JJLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v0
 
     new-instance v4, Lf/a/h/t/b;
 
-    invoke-direct {v4, v2, v1}, Lf/a/h/t/b;-><init>(Lf/a/h/t/d;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+    invoke-direct {v4, v3, v1}, Lf/a/h/t/b;-><init>(Lf/a/h/t/d;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     new-instance v1, Lf/a/h/t/c;
 
-    invoke-direct {v1, v2}, Lf/a/h/t/c;-><init>(Lf/a/h/t/d;)V
+    invoke-direct {v1, v3}, Lf/a/h/t/c;-><init>(Lf/a/h/t/d;)V
 
-    invoke-virtual {v3, v4, v1}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+    invoke-virtual {v0, v4, v1}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
 
-    move-result-object v1
+    move-result-object v0
 
-    iput-object v1, v2, Lf/a/h/t/d;->c:Lrx/Subscription;
+    iput-object v0, v3, Lf/a/h/t/d;->c:Lrx/Subscription;
+
+    goto :goto_0
 
     :cond_1
-    iget-object v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->c:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;
+    throw v2
 
-    invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+    :cond_2
+    :goto_0
+    iget-object v0, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->c:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;
 
-    move-result v1
+    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
 
-    const/4 v2, 0x1
+    move-result v0
 
-    if-eqz v1, :cond_2
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_3
 
     const-string p3, "Unsupported protocol: "
 
@@ -137,176 +153,162 @@
 
     move-result-object p2
 
-    invoke-virtual {p1, v2, p2, v0}, Lcom/discord/rtcconnection/RtcConnection;->c(ZLjava/lang/String;Ljava/lang/Throwable;)V
+    invoke-virtual {p1, v1, p2, v2}, Lcom/discord/rtcconnection/RtcConnection;->c(ZLjava/lang/String;Ljava/lang/Throwable;)V
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_2
-    iget-object v1, p1, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
+    :cond_3
+    iget-object v0, p1, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p1, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
+    iget-object v2, p1, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
 
-    const-string v4, "Sending UDP info to RTC server."
+    const-string v3, "Sending UDP info to RTC server."
 
-    invoke-virtual {v1, v4, v3}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v3, v2}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     iget-object p1, p1, Lcom/discord/rtcconnection/RtcConnection;->j:Lf/a/h/s/a;
 
     if-eqz p1, :cond_5
 
-    iget-object v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->a:Ljava/lang/String;
+    const-string v0, "udp"
+
+    iget-object v2, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->a:Ljava/lang/String;
 
     iget p2, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->b:I
 
-    if-eqz v1, :cond_4
+    const-string/jumbo v3, "xsalsa20_poly1305"
 
-    new-instance v0, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;
+    const-string v4, "protocol"
 
-    const-string v3, "xsalsa20_poly1305"
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, v1, p2, v3}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+    const-string v4, "address"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "mode"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "codecs"
+
+    invoke-static {p3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;
+
+    invoke-direct {v4, v2, p2, v3}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 
     new-instance p2, Ljava/util/ArrayList;
 
-    const/16 v1, 0xa
+    const/16 v2, 0xa
 
-    invoke-static {p3, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {p3, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    move-result v1
+    move-result v2
 
-    invoke-direct {p2, v1}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {p2, v2}, Ljava/util/ArrayList;-><init>(I)V
 
     invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p3
 
-    :goto_0
+    :goto_1
     invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_3
+    if-eqz v2, :cond_4
 
     invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v2
 
-    check-cast v1, Lf/a/h/r/a;
+    check-cast v2, Lf/a/h/r/a;
 
-    new-instance v9, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;
+    new-instance v3, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;
 
-    iget-object v4, v1, Lf/a/h/r/a;->a:Ljava/lang/String;
+    iget-object v6, v2, Lf/a/h/r/a;->a:Ljava/lang/String;
 
-    iget v5, v1, Lf/a/h/r/a;->b:I
+    iget v7, v2, Lf/a/h/r/a;->b:I
 
-    iget-object v6, v1, Lf/a/h/r/a;->c:Ljava/lang/String;
+    iget-object v8, v2, Lf/a/h/r/a;->c:Ljava/lang/String;
 
-    iget v7, v1, Lf/a/h/r/a;->d:I
+    iget v9, v2, Lf/a/h/r/a;->d:I
 
-    iget-object v8, v1, Lf/a/h/r/a;->e:Ljava/lang/Integer;
+    iget-object v10, v2, Lf/a/h/r/a;->e:Ljava/lang/Integer;
 
-    move-object v3, v9
+    move-object v5, v3
 
-    invoke-direct/range {v3 .. v8}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;-><init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
+    invoke-direct/range {v5 .. v10}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$CodecInfo;-><init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
 
-    invoke-virtual {p2, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_3
-    new-instance p3, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;
-
-    const-string v1, "udp"
-
-    invoke-direct {p3, v1, v0, p2}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;Ljava/util/List;)V
-
-    invoke-virtual {p1, v2, p3}, Lf/a/h/s/a;->m(ILjava/lang/Object;)V
+    invoke-virtual {p2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
     :cond_4
-    const-string p1, "address"
+    new-instance p3, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct {p3, v0, v4, p2}, Lcom/discord/rtcconnection/socket/io/Payloads$Protocol;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/socket/io/Payloads$Protocol$ProtocolInfo;Ljava/util/List;)V
 
-    throw v0
+    invoke-virtual {p1, v1, p3}, Lf/a/h/s/a;->m(ILjava/lang/Object;)V
 
     :cond_5
-    :goto_1
+    :goto_2
     return-void
-
-    :cond_6
-    const-string p1, "supportedVideoCodecs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "transportInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_9
+    const-string p1, "connectionState"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/h/j;->a:Lcom/discord/rtcconnection/RtcConnection;
 
-    iget-object v1, p1, Lcom/discord/rtcconnection/RtcConnection;->g:Lcom/discord/rtcconnection/RtcConnection$State;
+    iget-object v0, p1, Lcom/discord/rtcconnection/RtcConnection;->g:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    iget-object v2, p1, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
+    iget-object v1, p1, Lcom/discord/rtcconnection/RtcConnection;->C:Lcom/discord/utilities/logging/Logger;
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    new-instance v2, Ljava/lang/StringBuilder;
 
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v4, "Connection state change: "
+    const-string v3, "Connection state change: "
 
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    iget-object v4, p1, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/rtcconnection/RtcConnection;->b:Ljava/lang/String;
 
-    invoke-virtual {v2, v3, v4}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/logging/Logger;->recordBreadcrumb(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Enum;->ordinal()I
 
     move-result p2
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     if-eqz p2, :cond_3
 
-    if-eq p2, v2, :cond_2
+    if-eq p2, v1, :cond_2
 
-    const/4 v3, 0x2
+    const/4 v2, 0x2
 
-    if-eq p2, v3, :cond_1
+    if-eq p2, v2, :cond_1
 
-    const/4 v3, 0x3
+    const/4 v2, 0x3
 
-    if-ne p2, v3, :cond_0
+    if-ne p2, v2, :cond_0
 
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->a:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
@@ -333,90 +335,95 @@
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     :goto_0
-    invoke-virtual {p1, p2}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {p1, p2}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->a:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
-    if-ne v1, p2, :cond_4
+    if-ne v0, p2, :cond_4
 
     iget-object p2, p1, Lcom/discord/rtcconnection/RtcConnection;->g:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->a:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
-    if-ne p2, v1, :cond_4
+    if-ne p2, v0, :cond_4
 
     invoke-virtual {p1}, Lcom/discord/rtcconnection/RtcConnection;->j()V
 
     :cond_4
     iget-object p2, p1, Lcom/discord/rtcconnection/RtcConnection;->g:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    if-ne p2, v1, :cond_8
+    if-ne p2, v0, :cond_8
 
     iget-object p2, p1, Lcom/discord/rtcconnection/RtcConnection;->D:Lcom/discord/utilities/time/Clock;
 
     invoke-interface {p2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p2
 
     iput-object p2, p1, Lcom/discord/rtcconnection/RtcConnection;->p:Ljava/lang/Long;
 
-    iput-boolean v2, p1, Lcom/discord/rtcconnection/RtcConnection;->r:Z
+    iput-boolean v1, p1, Lcom/discord/rtcconnection/RtcConnection;->r:Z
 
-    new-array p2, v2, [Lkotlin/Pair;
+    new-array p2, v1, [Lkotlin/Pair;
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    iget v2, p1, Lcom/discord/rtcconnection/RtcConnection;->q:I
+    iget v1, p1, Lcom/discord/rtcconnection/RtcConnection;->q:I
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v2
+    move-result-object v1
 
-    new-instance v3, Lkotlin/Pair;
+    new-instance v2, Lkotlin/Pair;
 
-    const-string v4, "connect_count"
+    const-string v3, "connect_count"
 
-    invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v2, v3, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v3, p2, v1
+    aput-object v2, p2, v0
 
     invoke-static {p2}, Lf/n/a/k/a;->mutableMapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object p2
 
-    iget-object v1, p1, Lcom/discord/rtcconnection/RtcConnection;->o:Ljava/lang/Long;
+    iget-object v0, p1, Lcom/discord/rtcconnection/RtcConnection;->o:Ljava/lang/Long;
 
-    iget-object v2, p1, Lcom/discord/rtcconnection/RtcConnection;->p:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/discord/rtcconnection/RtcConnection;->p:Ljava/lang/Long;
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
 
-    if-nez v1, :cond_5
+    if-nez v0, :cond_5
 
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v2
-
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v0
+    move-result-wide v1
 
-    sub-long/2addr v2, v0
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-wide v3
+
+    sub-long/2addr v1, v3
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
+    goto :goto_2
+
     :cond_6
     :goto_1
+    const/4 v0, 0x0
+
+    :goto_2
     if-eqz v0, :cond_7
 
     invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
@@ -444,47 +451,28 @@
 
     :cond_8
     return-void
-
-    :cond_9
-    const-string p1, "connectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string p1, "exception"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/h/j;->a:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -589,21 +577,9 @@
     return-void
 
     :cond_2
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_3
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public onSpeaking(JIZ)V
diff --git a/com.discord/smali/f/a/h/k.smali b/com.discord/smali/f/a/h/k.smali
index 90caac73be..cf1ea8478c 100644
--- a/com.discord/smali/f/a/h/k.smali
+++ b/com.discord/smali/f/a/h/k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/RtcConnection$b;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lf/a/h/k;->$userId:J
 
@@ -57,13 +59,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/l.smali b/com.discord/smali/f/a/h/l.smali
index f14c3718be..1c11471d07 100644
--- a/com.discord/smali/f/a/h/l.smali
+++ b/com.discord/smali/f/a/h/l.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/l;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/RtcConnection$b;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lf/a/h/l;->$userId:J
 
@@ -57,13 +59,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/m.smali b/com.discord/smali/f/a/h/m.smali
index 2eea7b238f..bdeef12664 100644
--- a/com.discord/smali/f/a/h/m.smali
+++ b/com.discord/smali/f/a/h/m.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/m;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/n.smali b/com.discord/smali/f/a/h/n.smali
index ef1a64a5ef..7d88e121d1 100644
--- a/com.discord/smali/f/a/h/n.smali
+++ b/com.discord/smali/f/a/h/n.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/n;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Exception;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,46 +42,41 @@
 
     check-cast p1, Ljava/lang/Exception;
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/h/n;->this$0:Lcom/discord/rtcconnection/RtcConnection;
+    iget-object v0, p0, Lf/a/h/n;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    const/4 v2, 0x1
+    const-string v1, "Error occurred while connecting to RTC server: "
 
-    const-string v3, "Error occurred while connecting to RTC server: "
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
+    move-result-object v1
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     const/16 p1, 0x2e
 
-    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p1
 
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
     const/4 v3, 0x4
 
-    invoke-static {v1, v2, p1, v0, v3}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;ZLjava/lang/String;Ljava/lang/Throwable;I)V
+    invoke-static {v0, v1, p1, v2, v3}, Lcom/discord/rtcconnection/RtcConnection;->d(Lcom/discord/rtcconnection/RtcConnection;ZLjava/lang/String;Ljava/lang/Throwable;I)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/h/o.smali b/com.discord/smali/f/a/h/o.smali
index 50a688240b..2ff8d2a027 100644
--- a/com.discord/smali/f/a/h/o.smali
+++ b/com.discord/smali/f/a/h/o.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/o;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcConnection.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/RtcConnection$b;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/o;->$quality:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
@@ -51,13 +53,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/p.smali b/com.discord/smali/f/a/h/p.smali
index b0540c2abb..9f8052cf75 100644
--- a/com.discord/smali/f/a/h/p.smali
+++ b/com.discord/smali/f/a/h/p.smali
@@ -31,11 +31,13 @@
 .method public a(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "audioCodec"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string/jumbo v0, "videoCodec"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/p;->a:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -47,20 +49,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "videoCodec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "audioCodec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public b(ZLjava/lang/Integer;Ljava/lang/String;)V
@@ -163,7 +151,7 @@
 
     invoke-direct {v1, v2}, Lcom/discord/rtcconnection/RtcConnection$State$d;-><init>(Z)V
 
-    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     if-eqz v2, :cond_5
 
@@ -296,11 +284,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "mode"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "secretKey"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/p;->a:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -308,7 +298,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {p2}, Lj0/i/l;->toIntArray(Ljava/util/Collection;)[I
+    invoke-static {p2}, Lk0/j/l;->toIntArray(Ljava/util/Collection;)[I
 
     move-result-object p2
 
@@ -316,25 +306,15 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "secretKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public e(Ljava/lang/String;)V
     .locals 1
 
+    const-string v0, "mediaSessionId"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lf/a/h/p;->a:Lcom/discord/rtcconnection/RtcConnection;
 
     iput-object p1, v0, Lcom/discord/rtcconnection/RtcConnection;->s:Ljava/lang/String;
@@ -514,7 +494,7 @@
 
     sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$c;->a:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
-    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     return-void
 .end method
@@ -538,7 +518,7 @@
 
     iget-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->j:Lf/a/h/s/a;
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_1
 
     iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->z:Ljava/lang/String;
 
@@ -548,11 +528,13 @@
 
     iget-boolean v8, v0, Lcom/discord/rtcconnection/RtcConnection;->y:Z
 
-    const/4 v2, 0x0
+    const-string v2, "serverId"
 
-    if-eqz v3, :cond_2
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_1
+    const-string v2, "sessionId"
+
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v2, v1, Lf/a/h/s/a;->q:Z
 
@@ -595,27 +577,11 @@
 
     invoke-virtual {v1, v9, v10}, Lf/a/h/s/a;->m(ILjava/lang/Object;)V
 
-    goto :goto_0
-
     :cond_1
-    const-string v0, "sessionId"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_2
-    const-string v0, "serverId"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_3
     :goto_0
     sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$a;->a:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
-    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     return-void
 .end method
@@ -670,7 +636,9 @@
 .method public k(IILjava/lang/String;)V
     .locals 8
 
-    if-eqz p3, :cond_3
+    const-string v0, "ip"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/p;->a:Lcom/discord/rtcconnection/RtcConnection;
 
@@ -688,7 +656,7 @@
 
     sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$g;->a:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
-    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->l(Lcom/discord/rtcconnection/RtcConnection$State;)V
+    invoke-virtual {v0, v1}, Lcom/discord/rtcconnection/RtcConnection;->m(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
     iget-object v2, v0, Lcom/discord/rtcconnection/RtcConnection;->B:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
@@ -702,7 +670,7 @@
 
     sget-object p2, Lcom/discord/rtcconnection/RtcConnection$c$a;->a:Lcom/discord/rtcconnection/RtcConnection$c$a;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -729,7 +697,7 @@
 
     invoke-direct {v7, v0}, Lf/a/h/n;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    invoke-interface/range {v2 .. v7}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->f(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    invoke-interface/range {v2 .. v7}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->g(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     move-result-object p1
 
@@ -750,15 +718,6 @@
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p1
-
-    :cond_3
-    const-string p1, "ip"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onSpeaking(JIZ)V
diff --git a/com.discord/smali/f/a/h/q.smali b/com.discord/smali/f/a/h/q.smali
index 5a0fc29bc2..02fe59b451 100644
--- a/com.discord/smali/f/a/h/q.smali
+++ b/com.discord/smali/f/a/h/q.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/r/a.smali b/com.discord/smali/f/a/h/r/a.smali
index 67b8795c4a..084faf22f2 100644
--- a/com.discord/smali/f/a/h/r/a.smali
+++ b/com.discord/smali/f/a/h/r/a.smali
@@ -17,9 +17,15 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "type"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,15 +40,6 @@
     iput-object p5, p0, Lf/a/h/r/a;->e:Ljava/lang/Integer;
 
     return-void
-
-    :cond_0
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -62,7 +59,7 @@
 
     iget-object v1, p1, Lf/a/h/r/a;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -78,7 +75,7 @@
 
     iget-object v1, p1, Lf/a/h/r/a;->c:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -94,7 +91,7 @@
 
     iget-object p1, p1, Lf/a/h/r/a;->e:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali/f/a/h/r/b/a.smali b/com.discord/smali/f/a/h/r/b/a.smali
index bb9c75c75e..e637d360cd 100644
--- a/com.discord/smali/f/a/h/r/b/a.smali
+++ b/com.discord/smali/f/a/h/r/b/a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/a;->this$0:Lf/a/h/r/b/e;
 
@@ -57,13 +59,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/b$a.smali b/com.discord/smali/f/a/h/r/b/b$a.smali
index f65d9091df..847a5a0b2e 100644
--- a/com.discord/smali/f/a/h/r/b/b$a.smali
+++ b/com.discord/smali/f/a/h/r/b/b$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/b$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/b.smali b/com.discord/smali/f/a/h/r/b/b.smali
index 3cb08c57de..94aa8cd77e 100644
--- a/com.discord/smali/f/a/h/r/b/b.smali
+++ b/com.discord/smali/f/a/h/r/b/b.smali
@@ -31,7 +31,9 @@
 .method public onVideo(JILjava/lang/String;)V
     .locals 8
 
-    if-eqz p4, :cond_0
+    const-string v0, "streamIdentifier"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/b;->a:Lf/a/h/r/b/e;
 
@@ -52,13 +54,4 @@
     invoke-static {v0, v7}, Lf/a/h/r/b/e;->p(Lf/a/h/r/b/e;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "streamIdentifier"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/c$a.smali b/com.discord/smali/f/a/h/r/b/c$a.smali
index 0c70e32e8d..2824d75d89 100644
--- a/com.discord/smali/f/a/h/r/b/c$a.smali
+++ b/com.discord/smali/f/a/h/r/b/c$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/c$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -90,7 +90,7 @@
     :goto_0
     const-string v5, "audioSsrcs[userId] ?: 0"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
 
diff --git a/com.discord/smali/f/a/h/r/b/d$a.smali b/com.discord/smali/f/a/h/r/b/d$a.smali
index 0a88c7995d..9940e6c393 100644
--- a/com.discord/smali/f/a/h/r/b/d$a.smali
+++ b/com.discord/smali/f/a/h/r/b/d$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/d$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 
 # virtual methods
 .method public invoke()Ljava/lang/Object;
-    .locals 11
+    .locals 10
 
     iget-object v0, p0, Lf/a/h/r/b/d$a;->this$0:Lf/a/h/r/b/d;
 
@@ -106,79 +106,79 @@
     :goto_1
     if-eqz v3, :cond_2
 
-    iget-object v2, v1, Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;->localAddress:Ljava/lang/String;
+    new-instance v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-    const-string v3, "connectionInfo.localAddress"
+    iget-object v3, v1, Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;->localAddress:Ljava/lang/String;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v4, "connectionInfo.localAddress"
 
-    iget v3, v1, Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;->localPort:I
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v4, v1, Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;->localPort:I
 
     iget-object v1, v1, Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;->protocol:Ljava/lang/String;
 
-    const-string v4, "connectionInfo.protocol"
+    const-string v5, "connectionInfo.protocol"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
 
     move-result-object v1
 
-    const-string v4, "(this as java.lang.String).toUpperCase()"
+    const-string v5, "(this as java.lang.String).toUpperCase()"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;->valueOf(Ljava/lang/String;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;
 
     move-result-object v1
 
-    new-instance v4, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
-
-    invoke-direct {v4, v2, v3, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;-><init>(Ljava/lang/String;ILcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;)V
+    invoke-direct {v2, v3, v4, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;-><init>(Ljava/lang/String;ILcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$Protocol;)V
 
     sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->CONNECTED:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     iput-object v1, v0, Lf/a/h/r/b/e;->b:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    new-instance v2, Lf/a/h/r/b/a;
+    new-instance v3, Lf/a/h/r/b/a;
 
-    invoke-direct {v2, v0, v1}, Lf/a/h/r/b/a;-><init>(Lf/a/h/r/b/e;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    invoke-direct {v3, v0, v1}, Lf/a/h/r/b/a;-><init>(Lf/a/h/r/b/e;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
-    invoke-virtual {v0, v2}, Lf/a/h/r/b/e;->q(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v3}, Lf/a/h/r/b/e;->q(Lkotlin/jvm/functions/Function1;)V
 
     new-instance v1, Lf/a/h/r/a;
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
-    const/16 v9, 0x78
+    const/16 v8, 0x78
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
-    const-string v6, "opus"
+    const-string v5, "opus"
 
-    const-string v8, "audio"
+    const-string v7, "audio"
 
-    move-object v5, v1
+    move-object v4, v1
 
-    invoke-direct/range {v5 .. v10}, Lf/a/h/r/a;-><init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
+    invoke-direct/range {v4 .. v9}, Lf/a/h/r/a;-><init>(Ljava/lang/String;ILjava/lang/String;ILjava/lang/Integer;)V
 
-    iget-object v2, v0, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
+    iget-object v3, v0, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
 
-    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
+    invoke-virtual {v3}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v2, v0, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
+    iget-object v3, v0, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
 
-    invoke-virtual {v2, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     iget-object v1, v0, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
 
-    iget-object v2, v0, Lf/a/h/r/b/e;->j:Ljava/util/List;
+    iget-object v3, v0, Lf/a/h/r/b/e;->j:Ljava/util/List;
 
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
     new-instance v1, Lf/a/h/r/b/g;
 
-    invoke-direct {v1, v0, v4}, Lf/a/h/r/b/g;-><init>(Lf/a/h/r/b/e;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;)V
+    invoke-direct {v1, v0, v2}, Lf/a/h/r/b/g;-><init>(Lf/a/h/r/b/e;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;)V
 
     invoke-virtual {v0, v1}, Lf/a/h/r/b/e;->q(Lkotlin/jvm/functions/Function1;)V
 
diff --git a/com.discord/smali/f/a/h/r/b/d.smali b/com.discord/smali/f/a/h/r/b/d.smali
index 03e77b45af..0c807fab93 100644
--- a/com.discord/smali/f/a/h/r/b/d.smali
+++ b/com.discord/smali/f/a/h/r/b/d.smali
@@ -26,11 +26,13 @@
 .method public final onConnectToServer(Lcom/hammerandchisel/libdiscord/Discord$ConnectionInfo;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "connectionInfo"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "errorMessage"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/d;->a:Lf/a/h/r/b/e;
 
@@ -41,18 +43,4 @@
     invoke-static {v0, v1}, Lf/a/h/r/b/e;->p(Lf/a/h/r/b/e;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "errorMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$a.smali b/com.discord/smali/f/a/h/r/b/e$a.smali
index 32ec8cff09..17d539743c 100644
--- a/com.discord/smali/f/a/h/r/b/e$a.smali
+++ b/com.discord/smali/f/a/h/r/b/e$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 
     check-cast v0, Lco/discord/media_engine/Connection;
 
-    if-eqz v0, :cond_0
+    const-string p1, "$receiver"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v1, p0, Lf/a/h/r/b/e$a;->$userId:J
 
@@ -92,13 +94,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$b.smali b/com.discord/smali/f/a/h/r/b/e$b.smali
index 81c78f159e..3f931f029f 100644
--- a/com.discord/smali/f/a/h/r/b/e$b.smali
+++ b/com.discord/smali/f/a/h/r/b/e$b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,24 +57,17 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lco/discord/media_engine/Connection;->dispose()V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$c.smali b/com.discord/smali/f/a/h/r/b/e$c.smali
index 5c2c327bc2..edf0d8e7fb 100644
--- a/com.discord/smali/f/a/h/r/b/e$c.smali
+++ b/com.discord/smali/f/a/h/r/b/e$c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/e$c;->this$0:Lf/a/h/r/b/e;
 
@@ -66,13 +68,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$d.smali b/com.discord/smali/f/a/h/r/b/e$d.smali
index 6fe5b7c8f9..7f6c7625bc 100644
--- a/com.discord/smali/f/a/h/r/b/e$d.smali
+++ b/com.discord/smali/f/a/h/r/b/e$d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/h/r/b/f;
 
@@ -66,13 +68,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$e.smali b/com.discord/smali/f/a/h/r/b/e$e.smali
index dff18ee43b..99d572c04e 100644
--- a/com.discord/smali/f/a/h/r/b/e$e.smali
+++ b/com.discord/smali/f/a/h/r/b/e$e.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/e$e;->this$0:Lf/a/h/r/b/e;
 
@@ -66,13 +68,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$f.smali b/com.discord/smali/f/a/h/r/b/e$f.smali
index 05a891018f..906b483dcb 100644
--- a/com.discord/smali/f/a/h/r/b/e$f.smali
+++ b/com.discord/smali/f/a/h/r/b/e$f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,7 +63,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/e$f;->$audioEncoder:Lco/discord/media_engine/AudioEncoder;
 
@@ -90,13 +92,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$g.smali b/com.discord/smali/f/a/h/r/b/e$g.smali
index daa87ff84e..ad02a1f696 100644
--- a/com.discord/smali/f/a/h/r/b/e$g.smali
+++ b/com.discord/smali/f/a/h/r/b/e$g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/e$g;->$encryptionSettings:Lco/discord/media_engine/EncryptionSettings;
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$h.smali b/com.discord/smali/f/a/h/r/b/e$h.smali
index 6bcea9d7ba..3c9146f2d6 100644
--- a/com.discord/smali/f/a/h/r/b/e$h.smali
+++ b/com.discord/smali/f/a/h/r/b/e$h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_1
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/e$h;->$inputModeOptions:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;
 
@@ -112,13 +114,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$i.smali b/com.discord/smali/f/a/h/r/b/e$i.smali
index 1fa34bac66..06e188e181 100644
--- a/com.discord/smali/f/a/h/r/b/e$i.smali
+++ b/com.discord/smali/f/a/h/r/b/e$i.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$i;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lf/a/h/r/b/e$i;->$userId:J
 
@@ -66,13 +68,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$j.smali b/com.discord/smali/f/a/h/r/b/e$j.smali
index f16eecbc07..1d23c853ee 100644
--- a/com.discord/smali/f/a/h/r/b/e$j.smali
+++ b/com.discord/smali/f/a/h/r/b/e$j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lf/a/h/r/b/e$j;->$userId:J
 
@@ -70,13 +72,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$k.smali b/com.discord/smali/f/a/h/r/b/e$k.smali
index 3bb4af8099..b6a7971086 100644
--- a/com.discord/smali/f/a/h/r/b/e$k.smali
+++ b/com.discord/smali/f/a/h/r/b/e$k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lf/a/h/r/b/e$k;->$active:Z
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$l.smali b/com.discord/smali/f/a/h/r/b/e$l.smali
index 05e73276f1..5149fda089 100644
--- a/com.discord/smali/f/a/h/r/b/e$l.smali
+++ b/com.discord/smali/f/a/h/r/b/e$l.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$l;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lf/a/h/r/b/e$l;->$selfDeaf:Z
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$m.smali b/com.discord/smali/f/a/h/r/b/e$m.smali
index 661ef13a89..fb691081f7 100644
--- a/com.discord/smali/f/a/h/r/b/e$m.smali
+++ b/com.discord/smali/f/a/h/r/b/e$m.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$m;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lf/a/h/r/b/e$m;->$selfMute:Z
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e$n.smali b/com.discord/smali/f/a/h/r/b/e$n.smali
index 617663a735..46659f5754 100644
--- a/com.discord/smali/f/a/h/r/b/e$n.smali
+++ b/com.discord/smali/f/a/h/r/b/e$n.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/e$n;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Connection;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lco/discord/media_engine/Connection;
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lf/a/h/r/b/e$n;->$isBroadcastVideo:Z
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/e.smali b/com.discord/smali/f/a/h/r/b/e.smali
index 0b73e401ca..5358a1a532 100644
--- a/com.discord/smali/f/a/h/r/b/e.smali
+++ b/com.discord/smali/f/a/h/r/b/e.smali
@@ -88,7 +88,7 @@
 
     const-string v1, "MediaEngineConnectionLegacy::class.java.simpleName"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lf/a/h/r/b/e;->l:Ljava/lang/String;
 
@@ -96,7 +96,7 @@
 .end method
 
 .method public constructor <init>(Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/logging/Logger;Lcom/hammerandchisel/libdiscord/Discord;Ljava/util/List;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
-    .locals 14
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -116,39 +116,61 @@
         }
     .end annotation
 
-    move-object v0, p0
+    move-object/from16 v0, p0
 
-    move-object v1, p1
+    move-object/from16 v1, p1
 
     move-object/from16 v2, p2
 
-    move-object/from16 v3, p4
+    move-object/from16 v3, p3
 
-    move-object/from16 v4, p8
+    move-object/from16 v4, p4
 
-    const/4 v5, 0x0
+    move-object/from16 v5, p5
 
-    if-eqz v1, :cond_3
+    move-object/from16 v6, p8
 
-    if-eqz v2, :cond_2
+    move-object/from16 v7, p9
 
-    if-eqz v3, :cond_1
+    const-string v8, "executorService"
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "logger"
+
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string/jumbo v8, "voiceEngineLegacy"
+
+    invoke-static {v3, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "supportedVideoCodecs"
+
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "type"
+
+    invoke-static {v5, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "connectionOptions"
+
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "listeners"
+
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
 
     iput-object v1, v0, Lf/a/h/r/b/e;->g:Ljava/util/concurrent/ExecutorService;
 
     iput-object v2, v0, Lf/a/h/r/b/e;->h:Lcom/discord/utilities/logging/Logger;
 
-    move-object/from16 v1, p3
+    iput-object v3, v0, Lf/a/h/r/b/e;->i:Lcom/hammerandchisel/libdiscord/Discord;
 
-    iput-object v1, v0, Lf/a/h/r/b/e;->i:Lcom/hammerandchisel/libdiscord/Discord;
+    iput-object v4, v0, Lf/a/h/r/b/e;->j:Ljava/util/List;
 
-    iput-object v3, v0, Lf/a/h/r/b/e;->j:Ljava/util/List;
-
-    move-object/from16 v1, p5
-
-    iput-object v1, v0, Lf/a/h/r/b/e;->k:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+    iput-object v5, v0, Lf/a/h/r/b/e;->k:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
 
     sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->CONNECTING:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
@@ -162,25 +184,35 @@
 
     move-result-object v3
 
-    iget v5, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->a:I
+    iget v4, v6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->a:I
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v5
+    move-result-object v4
 
-    new-instance v6, Lkotlin/Pair;
+    new-instance v5, Lkotlin/Pair;
 
-    invoke-direct {v6, v3, v5}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v5, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
     const/4 v3, 0x0
 
-    aput-object v6, v2, v3
+    aput-object v5, v2, v3
 
-    invoke-static {v2}, Lf/n/a/k/a;->hashMapOf([Lkotlin/Pair;)Ljava/util/HashMap;
+    const-string v4, "pairs"
 
-    move-result-object v2
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v2, v0, Lf/a/h/r/b/e;->c:Ljava/util/HashMap;
+    new-instance v4, Ljava/util/HashMap;
+
+    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v5
+
+    invoke-direct {v4, v5}, Ljava/util/HashMap;-><init>(I)V
+
+    invoke-static {v4, v2}, Lf/n/a/k/a;->putAll(Ljava/util/Map;[Lkotlin/Pair;)V
+
+    iput-object v4, v0, Lf/a/h/r/b/e;->c:Ljava/util/HashMap;
 
     new-instance v2, Ljava/util/HashMap;
 
@@ -196,49 +228,49 @@
 
     iget-object v2, v0, Lf/a/h/r/b/e;->k:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
 
-    sget-object v5, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;->STREAM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+    sget-object v4, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;->STREAM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
 
-    if-ne v2, v5, :cond_0
+    if-ne v2, v4, :cond_0
 
-    const/4 v12, 0x1
+    const/4 v14, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v12, 0x0
+    const/4 v14, 0x0
 
     :goto_0
-    iget-object v6, v0, Lf/a/h/r/b/e;->i:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v8, v0, Lf/a/h/r/b/e;->i:Lcom/hammerandchisel/libdiscord/Discord;
 
-    iget v7, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->a:I
+    iget v9, v6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->a:I
 
-    iget-object v10, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->b:Ljava/lang/String;
+    iget-object v12, v6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->b:Ljava/lang/String;
 
-    iget v11, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->c:I
+    iget v13, v6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->c:I
 
-    new-instance v13, Lf/a/h/r/b/d;
+    new-instance v15, Lf/a/h/r/b/d;
 
-    invoke-direct {v13, p0}, Lf/a/h/r/b/d;-><init>(Lf/a/h/r/b/e;)V
+    invoke-direct {v15, v0}, Lf/a/h/r/b/d;-><init>(Lf/a/h/r/b/e;)V
 
-    move-wide/from16 v8, p6
+    move-wide/from16 v10, p6
 
-    invoke-virtual/range {v6 .. v13}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
+    invoke-virtual/range {v8 .. v15}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
 
     move-result-object v1
 
-    const-string v2, "voiceEngineLegacy.connec\u2026fo, errorMessage) }\n    }"
+    const-string/jumbo v2, "voiceEngineLegacy.connec\u2026fo, errorMessage) }\n    }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lf/a/h/r/b/b;
 
-    invoke-direct {v2, p0}, Lf/a/h/r/b/b;-><init>(Lf/a/h/r/b/e;)V
+    invoke-direct {v2, v0}, Lf/a/h/r/b/b;-><init>(Lf/a/h/r/b/e;)V
 
     invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setOnVideoCallback(Lco/discord/media_engine/Connection$OnVideoCallback;)V
 
     new-instance v2, Lf/a/h/r/b/c;
 
-    invoke-direct {v2, p0}, Lf/a/h/r/b/c;-><init>(Lf/a/h/r/b/e;)V
+    invoke-direct {v2, v0}, Lf/a/h/r/b/c;-><init>(Lf/a/h/r/b/e;)V
 
     invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
 
@@ -246,9 +278,7 @@
 
     new-instance v1, Ljava/util/ArrayList;
 
-    move-object/from16 v2, p9
-
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    invoke-direct {v1, v7}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
     iput-object v1, v0, Lf/a/h/r/b/e;->a:Ljava/util/List;
 
@@ -258,32 +288,11 @@
 
     new-instance v2, Lf/a/h/r/b/a;
 
-    invoke-direct {v2, p0, v1}, Lf/a/h/r/b/a;-><init>(Lf/a/h/r/b/e;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    invoke-direct {v2, v0, v1}, Lf/a/h/r/b/a;-><init>(Lf/a/h/r/b/e;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
-    invoke-virtual {p0, v2}, Lf/a/h/r/b/e;->q(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v2}, Lf/a/h/r/b/e;->q(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_1
-    const-string v1, "supportedVideoCodecs"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_2
-    const-string v1, "logger"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_3
-    const-string v1, "executorService"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
 .end method
 
 .method public static final o(Lf/a/h/r/b/e;I)I
@@ -366,7 +375,13 @@
 .method public d(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "inputMode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inputModeOptions"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/h/r/b/e$h;
 
@@ -375,15 +390,6 @@
     invoke-virtual {p0, v0}, Lf/a/h/r/b/e;->r(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public e()V
@@ -419,7 +425,9 @@
 .method public f(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "listener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/e;->a:Ljava/util/List;
 
@@ -430,15 +438,6 @@
     invoke-interface {p1, p0, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public g(Lkotlin/jvm/functions/Function1;)V
@@ -454,6 +453,10 @@
         }
     .end annotation
 
+    const-string v0, "onStats"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lf/a/h/r/b/e$d;
 
     invoke-direct {v0, p0, p1}, Lf/a/h/r/b/e$d;-><init>(Lf/a/h/r/b/e;Lkotlin/jvm/functions/Function1;)V
@@ -463,25 +466,26 @@
     return-void
 .end method
 
+.method public getType()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+    .locals 1
+
+    iget-object v0, p0, Lf/a/h/r/b/e;->k:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+
+    return-object v0
+.end method
+
 .method public h(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "listener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/e;->a:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public i(JILjava/lang/Integer;Z)V
@@ -652,36 +656,40 @@
 
     move-object/from16 v9, p2
 
-    const/4 v2, 0x0
+    const-string v2, "audioCodec"
 
-    if-eqz v0, :cond_8
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v9, :cond_7
+    const-string/jumbo v2, "videoCodec"
 
-    iget-object v3, v1, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    iget-object v2, v1, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
+
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :cond_0
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    const/4 v4, 0x0
+
+    if-eqz v3, :cond_1
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v3
 
-    :cond_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    move-object v5, v4
+    move-object v5, v3
 
     check-cast v5, Lf/a/h/r/a;
 
     iget-object v5, v5, Lf/a/h/r/a;->a:Ljava/lang/String;
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -690,46 +698,46 @@
     goto :goto_0
 
     :cond_1
-    move-object v4, v2
+    move-object v3, v4
 
     :goto_0
-    move-object v10, v4
+    move-object v10, v3
 
     check-cast v10, Lf/a/h/r/a;
 
-    iget-object v3, v1, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
+    iget-object v2, v1, Lf/a/h/r/b/e;->e:Ljava/util/ArrayList;
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :cond_2
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_3
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v3
 
-    :cond_2
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_3
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    move-object v5, v4
+    move-object v5, v3
 
     check-cast v5, Lf/a/h/r/a;
 
     iget-object v5, v5, Lf/a/h/r/a;->a:Ljava/lang/String;
 
-    invoke-static {v5, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
     if-eqz v5, :cond_2
 
-    move-object v2, v4
+    move-object v4, v3
 
     :cond_3
-    move-object v11, v2
+    move-object v11, v4
 
     check-cast v11, Lf/a/h/r/a;
 
@@ -956,26 +964,18 @@
     invoke-virtual {p0, v2}, Lf/a/h/r/b/e;->q(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_7
-    const-string v0, "videoCodec"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_8
-    const-string v0, "audioCodec"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public l(Ljava/lang/String;[I)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "mode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "secretKey"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lco/discord/media_engine/EncryptionSettings;
 
@@ -988,15 +988,6 @@
     invoke-virtual {p0, p1}, Lf/a/h/r/b/e;->r(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public m(Z)V
diff --git a/com.discord/smali/f/a/h/r/b/f.smali b/com.discord/smali/f/a/h/r/b/f.smali
index d220e214e1..37c8ed9dc4 100644
--- a/com.discord/smali/f/a/h/r/b/f.smali
+++ b/com.discord/smali/f/a/h/r/b/f.smali
@@ -31,7 +31,9 @@
 .method public onStats(Lco/discord/media_engine/Stats;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "stats"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/f;->a:Lf/a/h/r/b/e$d;
 
@@ -40,15 +42,6 @@
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "stats"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onStatsError(Ljava/lang/Throwable;)V
diff --git a/com.discord/smali/f/a/h/r/b/g.smali b/com.discord/smali/f/a/h/r/b/g.smali
index df0a55b816..376fe091ce 100644
--- a/com.discord/smali/f/a/h/r/b/g.smali
+++ b/com.discord/smali/f/a/h/r/b/g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/g;->this$0:Lf/a/h/r/b/e;
 
@@ -59,13 +61,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/h.smali b/com.discord/smali/f/a/h/r/b/h.smali
index 1f2aefea56..394502786a 100644
--- a/com.discord/smali/f/a/h/r/b/h.smali
+++ b/com.discord/smali/f/a/h/r/b/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/r/b/h;->this$0:Lf/a/h/r/b/e;
 
@@ -75,13 +77,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/i.smali b/com.discord/smali/f/a/h/r/b/i.smali
index 225120b1fb..f876cf1afe 100644
--- a/com.discord/smali/f/a/h/r/b/i.smali
+++ b/com.discord/smali/f/a/h/r/b/i.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/i;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,29 +46,29 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/h/r/b/i;->this$0:Lf/a/h/r/b/e;
+    iget-object v0, p0, Lf/a/h/r/b/i;->this$0:Lf/a/h/r/b/e;
 
-    new-instance v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    iget-object v3, p0, Lf/a/h/r/b/i;->$errorMessage:Ljava/lang/String;
+    iget-object v2, p0, Lf/a/h/r/b/i;->$errorMessage:Ljava/lang/String;
 
-    sget-object v4, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->Companion:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType$a;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->Companion:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType$a;
 
-    if-eqz v4, :cond_6
+    if-eqz v3, :cond_6
 
-    const/4 v0, 0x1
+    const/4 v3, 0x1
 
     const/4 v4, 0x0
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
     const-string v5, "Disconnected before we managed to connect"
 
-    invoke-static {v3, v5, v0}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v2, v5, v3}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v5
 
@@ -80,16 +80,16 @@
     :goto_0
     if-eqz v5, :cond_1
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->DISCONNECTED_BEFORE_CONNECTION_ESTABLISHED:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->DISCONNECTED_BEFORE_CONNECTION_ESTABLISHED:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
 
     goto :goto_2
 
     :cond_1
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
     const-string v5, "OnConnectAttemptTimedOut"
 
-    invoke-static {v3, v5, v0}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v2, v5, v3}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v5
 
@@ -101,45 +101,40 @@
     :goto_1
     if-eqz v5, :cond_3
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->TIMEOUT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->TIMEOUT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
 
     goto :goto_2
 
     :cond_3
-    if-eqz v3, :cond_4
+    if-eqz v2, :cond_4
 
     const-string v4, "OnAddressIPResolved"
 
-    invoke-static {v3, v4, v0}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    invoke-static {v2, v4, v3}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 
     move-result v4
 
     :cond_4
     if-eqz v4, :cond_5
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->ADDRESS_IP_RESOLVED:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->ADDRESS_IP_RESOLVED:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
 
     goto :goto_2
 
     :cond_5
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->UNKNOWN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;->UNKNOWN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;
 
     :goto_2
-    invoke-direct {v2, v3, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;)V
+    invoke-direct {v1, v2, v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$FailureType;)V
 
-    invoke-interface {p1, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
 
     :cond_6
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_7
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/j.smali b/com.discord/smali/f/a/h/r/b/j.smali
index 227071ce78..82940205f1 100644
--- a/com.discord/smali/f/a/h/r/b/j.smali
+++ b/com.discord/smali/f/a/h/r/b/j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -50,7 +50,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lf/a/h/r/b/j;->$userId:J
 
@@ -63,13 +65,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/k.smali b/com.discord/smali/f/a/h/r/b/k.smali
index 041505821e..1a30a25592 100644
--- a/com.discord/smali/f/a/h/r/b/k.smali
+++ b/com.discord/smali/f/a/h/r/b/k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/r/b/k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineConnectionLegacy.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;",
         "Lkotlin/Unit;",
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,24 +56,26 @@
 
     check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
-    const/4 p1, 0x0
+    const-string p1, "it"
 
-    if-eqz v0, :cond_4
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v1, p0, Lf/a/h/r/b/k;->$userId:J
 
-    iget-object v3, p0, Lf/a/h/r/b/k;->$streamId:Ljava/lang/String;
+    iget-object p1, p0, Lf/a/h/r/b/k;->$streamId:Ljava/lang/String;
 
-    if-eqz v3, :cond_0
+    const/4 v3, 0x0
 
-    invoke-static {v3}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    if-eqz p1, :cond_0
 
-    move-result-object v3
+    invoke-static {p1}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+
+    move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    move-object v3, p1
+    move-object p1, v3
 
     :goto_0
     iget-object v4, p0, Lf/a/h/r/b/k;->this$0:Lf/a/h/r/b/e;
@@ -104,6 +106,10 @@
     move-result-object v4
 
     :goto_1
+    const-string v6, "audioSsrcs[userId] ?: 0"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
 
     move-result v4
@@ -116,17 +122,21 @@
 
     if-lez v6, :cond_2
 
-    add-int/lit8 p1, v6, 0x1
+    add-int/lit8 v3, v6, 0x1
+
+    move v7, v3
 
     goto :goto_2
 
     :cond_2
-    const/4 p1, 0x0
+    const/4 v7, 0x0
 
     :goto_2
+    move-object v3, p1
+
     move v5, v6
 
-    move v6, p1
+    move v6, v7
 
     invoke-interface/range {v0 .. v6}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onVideo(JLjava/lang/Integer;III)V
 
@@ -135,12 +145,5 @@
     return-object p1
 
     :cond_3
-    throw p1
-
-    :cond_4
-    const-string v0, "it"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
+    throw v3
 .end method
diff --git a/com.discord/smali/f/a/h/r/b/l.smali b/com.discord/smali/f/a/h/r/b/l.smali
index 4a0ec1679d..7643d93172 100644
--- a/com.discord/smali/f/a/h/r/b/l.smali
+++ b/com.discord/smali/f/a/h/r/b/l.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/s/a$d.smali b/com.discord/smali/f/a/h/s/a$d.smali
index 6e11b3678f..fbecade723 100644
--- a/com.discord/smali/f/a/h/s/a$d.smali
+++ b/com.discord/smali/f/a/h/s/a$d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lokhttp3/WebSocket;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 
     check-cast p1, Lokhttp3/WebSocket;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x3e8
 
@@ -72,13 +74,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/a$e.smali b/com.discord/smali/f/a/h/s/a$e.smali
index bf421bbe2c..ad19798dfb 100644
--- a/com.discord/smali/f/a/h/s/a$e.smali
+++ b/com.discord/smali/f/a/h/s/a$e.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,30 +61,23 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/16 v1, 0x3e8
+    const/16 v0, 0x3e8
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const-string v2, "Force Close"
 
-    invoke-interface {p1, v0, v1, v2}, Lf/a/h/s/a$c;->b(ZLjava/lang/Integer;Ljava/lang/String;)V
+    invoke-interface {p1, v1, v0, v2}, Lf/a/h/s/a$c;->b(ZLjava/lang/Integer;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/a$f.smali b/com.discord/smali/f/a/h/s/a$f.smali
index 368eb8fcd6..f148f8e092 100644
--- a/com.discord/smali/f/a/h/s/a$f.smali
+++ b/com.discord/smali/f/a/h/s/a$f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lokhttp3/WebSocket;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 
     check-cast p1, Lokhttp3/WebSocket;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0xfa0
 
@@ -72,13 +74,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/a$g$a.smali b/com.discord/smali/f/a/h/s/a$g$a.smali
index 699b043a47..e38bc46a85 100644
--- a/com.discord/smali/f/a/h/s/a$g$a.smali
+++ b/com.discord/smali/f/a/h/s/a$g$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$g$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/s/a$h.smali b/com.discord/smali/f/a/h/s/a$h.smali
index 83c2c15a86..4c1544651c 100644
--- a/com.discord/smali/f/a/h/s/a$h.smali
+++ b/com.discord/smali/f/a/h/s/a$h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,24 +57,17 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lf/a/h/s/a$c;->h()V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/a$i.smali b/com.discord/smali/f/a/h/s/a$i.smali
index 9dafce622d..40af39a066 100644
--- a/com.discord/smali/f/a/h/s/a$i.smali
+++ b/com.discord/smali/f/a/h/s/a$i.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$i;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lf/a/h/s/a$i;->$wasFatal:Z
 
@@ -72,13 +74,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/a$j.smali b/com.discord/smali/f/a/h/s/a$j.smali
index 9c108cc0d8..bffd56c05c 100644
--- a/com.discord/smali/f/a/h/s/a$j.smali
+++ b/com.discord/smali/f/a/h/s/a$j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     iget-object v1, v1, Lf/a/h/s/a;->e:Lokhttp3/WebSocket;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/h/s/a$k.smali b/com.discord/smali/f/a/h/s/a$k.smali
index 13da878478..1d3627f854 100644
--- a/com.discord/smali/f/a/h/s/a$k.smali
+++ b/com.discord/smali/f/a/h/s/a$k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     iget-object v1, v1, Lf/a/h/s/a;->e:Lokhttp3/WebSocket;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/h/s/a$l.smali b/com.discord/smali/f/a/h/s/a$l.smali
index 6e2d36189f..bc3824010d 100644
--- a/com.discord/smali/f/a/h/s/a$l.smali
+++ b/com.discord/smali/f/a/h/s/a$l.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$l;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     iget-object v1, v1, Lf/a/h/s/a;->e:Lokhttp3/WebSocket;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -109,7 +109,7 @@
 
     const-string v2, "Gson.fromJson(message.da\u2026essionUpdate::class.java)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
 
@@ -140,7 +140,7 @@
 
     const-string v2, "Gson.fromJson(message.da\u2026ntDisconnect::class.java)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$ClientDisconnect;
 
@@ -171,7 +171,7 @@
 
     const-string v2, "Gson.fromJson(message.da\u2026yloads.Video::class.java)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Video;
 
@@ -217,7 +217,7 @@
 
     const-string v3, "Gson.fromJson(message.da\u2026yloads.Hello::class.java)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
 
@@ -314,7 +314,7 @@
 
     const-string v4, "Gson.fromJson(message.data, Long::class.java)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v3, Ljava/lang/Number;
 
@@ -404,7 +404,7 @@
 
     const-string v3, "Gson.fromJson(message.da\u2026ads.Speaking::class.java)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
@@ -469,7 +469,7 @@
 
     const-string v3, "Gson.fromJson(message.da\u2026.Description::class.java)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 
@@ -521,7 +521,7 @@
 
     const-string v3, "Gson.fromJson(message.da\u2026yloads.Ready::class.java)"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 
@@ -582,7 +582,7 @@
 
     iget-object v2, v0, Lf/a/h/s/a;->a:Ljava/lang/String;
 
-    const-string v0, "unknown opcode: "
+    const-string/jumbo v0, "unknown opcode: "
 
     invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -614,8 +614,6 @@
 
     return-object v0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x2
         :pswitch_a
diff --git a/com.discord/smali/f/a/h/s/a$m.smali b/com.discord/smali/f/a/h/s/a$m.smali
index ee122ddd91..3ec9c90ed8 100644
--- a/com.discord/smali/f/a/h/s/a$m.smali
+++ b/com.discord/smali/f/a/h/s/a$m.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$m;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     iget-object v1, v1, Lf/a/h/s/a;->e:Lokhttp3/WebSocket;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali/f/a/h/s/a$n.smali b/com.discord/smali/f/a/h/s/a$n.smali
index 76e6fd3c07..6ea1b89656 100644
--- a/com.discord/smali/f/a/h/s/a$n.smali
+++ b/com.discord/smali/f/a/h/s/a$n.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/a$n;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lokhttp3/WebSocket;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 
     check-cast p1, Lokhttp3/WebSocket;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0xfa0
 
@@ -72,13 +74,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/a.smali b/com.discord/smali/f/a/h/s/a.smali
index 0a2042ea05..62e56ad011 100644
--- a/com.discord/smali/f/a/h/s/a.smali
+++ b/com.discord/smali/f/a/h/s/a.smali
@@ -91,43 +91,55 @@
 .end method
 
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;Lcom/discord/utilities/logging/Logger;Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/time/Clock;)V
-    .locals 22
+    .locals 20
 
     move-object/from16 v0, p0
 
-    move-object/from16 v1, p4
+    move-object/from16 v1, p1
 
-    move-object/from16 v2, p5
+    move-object/from16 v2, p2
 
-    move-object/from16 v3, p6
+    move-object/from16 v3, p4
 
-    const/4 v4, 0x0
+    move-object/from16 v4, p5
 
-    if-eqz v1, :cond_2
+    move-object/from16 v5, p6
 
-    if-eqz v2, :cond_1
+    const-string v6, "endpoint"
 
-    if-eqz v3, :cond_0
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "token"
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "logger"
+
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "singleThreadExecutorService"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "clock"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lokhttp3/WebSocketListener;-><init>()V
 
-    move-object/from16 v4, p1
+    iput-object v1, v0, Lf/a/h/s/a;->r:Ljava/lang/String;
 
-    iput-object v4, v0, Lf/a/h/s/a;->r:Ljava/lang/String;
+    iput-object v2, v0, Lf/a/h/s/a;->s:Ljava/lang/String;
 
-    move-object/from16 v4, p2
+    move-object/from16 v1, p3
 
-    iput-object v4, v0, Lf/a/h/s/a;->s:Ljava/lang/String;
+    iput-object v1, v0, Lf/a/h/s/a;->t:Ljavax/net/ssl/SSLSocketFactory;
 
-    move-object/from16 v4, p3
+    iput-object v3, v0, Lf/a/h/s/a;->u:Lcom/discord/utilities/logging/Logger;
 
-    iput-object v4, v0, Lf/a/h/s/a;->t:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object v4, v0, Lf/a/h/s/a;->v:Ljava/util/concurrent/ExecutorService;
 
-    iput-object v1, v0, Lf/a/h/s/a;->u:Lcom/discord/utilities/logging/Logger;
-
-    iput-object v2, v0, Lf/a/h/s/a;->v:Ljava/util/concurrent/ExecutorService;
-
-    iput-object v3, v0, Lf/a/h/s/a;->w:Lcom/discord/utilities/time/Clock;
+    iput-object v5, v0, Lf/a/h/s/a;->w:Lcom/discord/utilities/time/Clock;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -183,45 +195,27 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    const/4 v8, 0x0
+    new-instance v6, Ljava/util/ArrayList;
 
-    move v6, v8
-
-    move v11, v8
-
-    move v12, v8
-
-    move v10, v8
-
-    move v7, v8
-
-    const/4 v15, 0x2
-
-    move/from16 v16, v15
-
-    const/4 v9, 0x1
-
-    new-instance v14, Ljava/util/ArrayList;
-
-    move-object/from16 v19, v14
+    move-object/from16 v19, v6
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
-    move-result v20
+    move-result v7
 
     invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
 
-    move-result v21
+    move-result v8
 
-    add-int v21, v21, v20
+    add-int/2addr v8, v7
 
-    add-int/lit8 v6, v21, 0x3
+    add-int/lit8 v8, v8, 0x3
 
-    invoke-direct {v14, v6}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v6, v8}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-virtual {v14, v1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+    invoke-virtual {v6, v1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
-    invoke-static {v14}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
+    invoke-static {v6}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -229,15 +223,31 @@
 
     invoke-static {v1}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
 
-    invoke-virtual {v14, v1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+    invoke-virtual {v6, v1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
     new-instance v1, Lcom/google/gson/Gson;
 
     move-object v2, v1
 
+    const/4 v10, 0x0
+
+    move v12, v10
+
+    move v6, v10
+
+    move v11, v10
+
+    move v7, v10
+
+    move v8, v10
+
+    const/4 v9, 0x1
+
     const/4 v14, 0x0
 
-    const/4 v6, 0x0
+    const/16 v16, 0x2
+
+    move/from16 v15, v16
 
     invoke-direct/range {v2 .. v19}, Lcom/google/gson/Gson;-><init>(Lf/h/d/u/o;Lf/h/d/d;Ljava/util/Map;ZZZZZZZLf/h/d/r;Ljava/lang/String;IILjava/util/List;Ljava/util/List;Ljava/util/List;)V
 
@@ -257,6 +267,8 @@
 
     const/4 v7, 0x3
 
+    const/4 v8, 0x0
+
     const/4 v9, 0x0
 
     const/16 v10, 0x18
@@ -286,27 +298,6 @@
     iput-object v1, v0, Lf/a/h/s/a;->p:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string v1, "clock"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_1
-    const-string v1, "singleThreadExecutorService"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_2
-    const-string v1, "logger"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
 .end method
 
 .method public static final a(Lf/a/h/s/a;ZLjava/lang/Integer;Ljava/lang/String;)V
@@ -814,29 +805,29 @@
 
     invoke-virtual {v1, v0, v2, v3}, Ljava/util/Timer;->schedule(Ljava/util/TimerTask;J)V
 
-    new-instance v0, Ln0/x$a;
+    new-instance v0, Lo0/x$a;
 
-    invoke-direct {v0}, Ln0/x$a;-><init>()V
+    invoke-direct {v0}, Lo0/x$a;-><init>()V
 
     const-wide/16 v1, 0x1
 
     sget-object v3, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
 
-    invoke-virtual {v0, v1, v2, v3}, Ln0/x$a;->a(JLjava/util/concurrent/TimeUnit;)Ln0/x$a;
+    invoke-virtual {v0, v1, v2, v3}, Lo0/x$a;->a(JLjava/util/concurrent/TimeUnit;)Lo0/x$a;
 
     iget-object v1, p0, Lf/a/h/s/a;->t:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v1, :cond_3
 
-    sget-object v2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
+    sget-object v2, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
 
-    sget-object v2, Ln0/g0/h/f;->a:Ln0/g0/h/f;
+    sget-object v2, Lo0/g0/h/f;->a:Lo0/g0/h/f;
 
-    invoke-virtual {v2}, Ln0/g0/h/f;->n()Ljavax/net/ssl/X509TrustManager;
+    invoke-virtual {v2}, Lo0/g0/h/f;->n()Ljavax/net/ssl/X509TrustManager;
 
     move-result-object v2
 
-    invoke-virtual {v0, v1, v2}, Ln0/x$a;->b(Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/X509TrustManager;)Ln0/x$a;
+    invoke-virtual {v0, v1, v2}, Lo0/x$a;->b(Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/X509TrustManager;)Lo0/x$a;
 
     :cond_3
     new-instance v1, Ljava/lang/StringBuilder;
@@ -869,21 +860,21 @@
 
     invoke-static/range {v2 .. v7}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    new-instance v2, Ln0/x;
+    new-instance v2, Lo0/x;
 
-    invoke-direct {v2, v0}, Ln0/x;-><init>(Ln0/x$a;)V
+    invoke-direct {v2, v0}, Lo0/x;-><init>(Lo0/x$a;)V
 
-    new-instance v0, Ln0/a0$a;
+    new-instance v0, Lo0/a0$a;
 
-    invoke-direct {v0}, Ln0/a0$a;-><init>()V
+    invoke-direct {v0}, Lo0/a0$a;-><init>()V
 
-    invoke-virtual {v0, v1}, Ln0/a0$a;->f(Ljava/lang/String;)Ln0/a0$a;
+    invoke-virtual {v0, v1}, Lo0/a0$a;->f(Ljava/lang/String;)Lo0/a0$a;
 
-    invoke-virtual {v0}, Ln0/a0$a;->b()Ln0/a0;
+    invoke-virtual {v0}, Lo0/a0$a;->b()Lo0/a0;
 
     move-result-object v0
 
-    invoke-virtual {v2, v0, p0}, Ln0/x;->d(Ln0/a0;Lokhttp3/WebSocketListener;)Lokhttp3/WebSocket;
+    invoke-virtual {v2, v0, p0}, Lo0/x;->d(Lo0/a0;Lokhttp3/WebSocketListener;)Lokhttp3/WebSocket;
 
     move-result-object v0
 
@@ -996,6 +987,10 @@
 .method public final h(JLjava/lang/String;Z)V
     .locals 7
 
+    const-string v0, "reason"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-boolean v0, p0, Lf/a/h/s/a;->q:Z
 
     if-eqz v0, :cond_0
@@ -1501,7 +1496,7 @@
 
     const-string v2, "json"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, v1}, Lokhttp3/WebSocket;->a(Ljava/lang/String;)Z
     :try_end_0
@@ -1550,7 +1545,13 @@
 .method public onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     .locals 1
 
-    if-eqz p3, :cond_0
+    const-string/jumbo v0, "webSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "reason"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
 
@@ -1561,19 +1562,18 @@
     invoke-virtual {p0, v0}, Lf/a/h/s/a;->l(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "reason"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
-    .locals 0
+    .locals 1
+
+    const-string/jumbo v0, "webSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "throwable"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3}, Lokhttp3/WebSocketListener;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
 
@@ -1589,6 +1589,14 @@
 .method public onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
     .locals 2
 
+    const-string/jumbo v0, "webSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "text"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lf/a/h/s/a;->b:Lcom/google/gson/Gson;
 
     const-class v1, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
@@ -1619,9 +1627,15 @@
 .end method
 
 .method public onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "webSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "response"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lokhttp3/WebSocketListener;->onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
 
@@ -1632,13 +1646,4 @@
     invoke-virtual {p0, p2}, Lf/a/h/s/a;->l(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/b.smali b/com.discord/smali/f/a/h/s/b.smali
index ad09638f1f..d9a4a6214e 100644
--- a/com.discord/smali/f/a/h/s/b.smali
+++ b/com.discord/smali/f/a/h/s/b.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lf/a/h/s/b;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lokhttp3/WebSocket;",
         "Lkotlin/Unit;",
@@ -36,64 +36,39 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x1
+    const-class v2, Lokhttp3/WebSocket;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x1
+
+    const-string v3, "cancel"
+
+    const-string v4, "cancel()V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "cancel"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lokhttp3/WebSocket;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "cancel()V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lokhttp3/WebSocket;
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lokhttp3/WebSocket;->cancel()V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/c$a.smali b/com.discord/smali/f/a/h/s/c$a.smali
index 56c8ea3b46..9b83f2428c 100644
--- a/com.discord/smali/f/a/h/s/c$a.smali
+++ b/com.discord/smali/f/a/h/s/c$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/c$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/s/d.smali b/com.discord/smali/f/a/h/s/d.smali
index 04419768ab..f367a046ee 100644
--- a/com.discord/smali/f/a/h/s/d.smali
+++ b/com.discord/smali/f/a/h/s/d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/s/d;->$clientDisconnect:Lcom/discord/rtcconnection/socket/io/Payloads$ClientDisconnect;
 
@@ -55,13 +57,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/e.smali b/com.discord/smali/f/a/h/s/e.smali
index b310f29e22..ce6b9b960f 100644
--- a/com.discord/smali/f/a/h/s/e.smali
+++ b/com.discord/smali/f/a/h/s/e.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/e;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/s/f.smali b/com.discord/smali/f/a/h/s/f.smali
index e2be682fc9..b851dfff95 100644
--- a/com.discord/smali/f/a/h/s/f.smali
+++ b/com.discord/smali/f/a/h/s/f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lf/a/h/s/f;->$delayMs:J
 
@@ -51,13 +53,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/g.smali b/com.discord/smali/f/a/h/s/g.smali
index 252b5e40ff..ab1acdafa9 100644
--- a/com.discord/smali/f/a/h/s/g.smali
+++ b/com.discord/smali/f/a/h/s/g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lokhttp3/WebSocket;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -52,7 +52,9 @@
 
     check-cast p1, Lokhttp3/WebSocket;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v0, 0x12c0
 
@@ -63,13 +65,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/h.smali b/com.discord/smali/f/a/h/s/h.smali
index 3853b2632c..1f0f2fd5da 100644
--- a/com.discord/smali/f/a/h/s/h.smali
+++ b/com.discord/smali/f/a/h/s/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/s/i.smali b/com.discord/smali/f/a/h/s/i.smali
index 834caf9f9e..160493f700 100644
--- a/com.discord/smali/f/a/h/s/i.smali
+++ b/com.discord/smali/f/a/h/s/i.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/i;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/s/i;->$ready:Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 
@@ -67,13 +69,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/j.smali b/com.discord/smali/f/a/h/s/j.smali
index f3ae8ef203..590c2c5d94 100644
--- a/com.discord/smali/f/a/h/s/j.smali
+++ b/com.discord/smali/f/a/h/s/j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/s/j;->$sessionDescription:Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 
@@ -86,13 +88,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/k.smali b/com.discord/smali/f/a/h/s/k.smali
index bffc4db80d..5e3b185af1 100644
--- a/com.discord/smali/f/a/h/s/k.smali
+++ b/com.discord/smali/f/a/h/s/k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/s/k;->$sessionUpdate:Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
 
@@ -58,13 +60,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/l.smali b/com.discord/smali/f/a/h/s/l.smali
index f7336ba487..7d5b243084 100644
--- a/com.discord/smali/f/a/h/s/l.smali
+++ b/com.discord/smali/f/a/h/s/l.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/l;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -46,7 +46,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/s/l;->$speaking:Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
@@ -71,13 +73,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/m.smali b/com.discord/smali/f/a/h/s/m.smali
index e853656b6f..350c4a5506 100644
--- a/com.discord/smali/f/a/h/s/m.smali
+++ b/com.discord/smali/f/a/h/s/m.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/m;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/h/s/m;->$video:Lcom/discord/rtcconnection/socket/io/Payloads$Video;
 
@@ -71,13 +73,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/n.smali b/com.discord/smali/f/a/h/s/n.smali
index 840afd8bc7..5df1a6cb45 100644
--- a/com.discord/smali/f/a/h/s/n.smali
+++ b/com.discord/smali/f/a/h/s/n.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/n;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -52,28 +52,23 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v0, 0x3e9
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
 
     const/4 v1, 0x0
 
-    const/16 v2, 0x3e9
+    const/4 v2, 0x0
 
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-interface {p1, v1, v2, v0}, Lf/a/h/s/a$c;->b(ZLjava/lang/Integer;Ljava/lang/String;)V
+    invoke-interface {p1, v1, v0, v2}, Lf/a/h/s/a$c;->b(ZLjava/lang/Integer;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/h/s/o.smali b/com.discord/smali/f/a/h/s/o.smali
index 2ecf0747b9..c0bcdd69ff 100644
--- a/com.discord/smali/f/a/h/s/o.smali
+++ b/com.discord/smali/f/a/h/s/o.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/o;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,24 +48,17 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lf/a/h/s/a$c;->i()V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/p.smali b/com.discord/smali/f/a/h/s/p.smali
index b9bea5b0b2..dd9413b588 100644
--- a/com.discord/smali/f/a/h/s/p.smali
+++ b/com.discord/smali/f/a/h/s/p.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/p;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lf/a/h/s/p;->$delay:J
 
@@ -57,13 +59,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/q.smali b/com.discord/smali/f/a/h/s/q.smali
index b69fe6a0b5..ca47347dfe 100644
--- a/com.discord/smali/f/a/h/s/q.smali
+++ b/com.discord/smali/f/a/h/s/q.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/h/s/q;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "RtcControlSocket.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/a/h/s/a$c;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,24 +48,17 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lf/a/h/s/a$c;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lf/a/h/s/a$c;->g()V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/s/r.smali b/com.discord/smali/f/a/h/s/r.smali
index 77f456c830..a0a0d4466a 100644
--- a/com.discord/smali/f/a/h/s/r.smali
+++ b/com.discord/smali/f/a/h/s/r.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/h/t/a.smali b/com.discord/smali/f/a/h/t/a.smali
index 6d71f82f37..2d718e961a 100644
--- a/com.discord/smali/f/a/h/t/a.smali
+++ b/com.discord/smali/f/a/h/t/a.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lf/a/h/t/a;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "RtcStatsCollector.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lco/discord/media_engine/Stats;",
         "Lkotlin/Unit;",
@@ -20,53 +20,39 @@
 
 # direct methods
 .method public constructor <init>(Lf/a/h/t/d;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lf/a/h/t/d;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onStatsReceived"
+
+    const-string v5, "onStatsReceived(Lco/discord/media_engine/Stats;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onStatsReceived"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lf/a/h/t/d;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onStatsReceived(Lco/discord/media_engine/Stats;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
     check-cast p1, Lco/discord/media_engine/Stats;
 
-    if-eqz p1, :cond_1
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lf/a/h/t/d;
 
@@ -82,13 +68,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/h/t/d.smali b/com.discord/smali/f/a/h/t/d.smali
index dc2ddd3154..e889905bac 100644
--- a/com.discord/smali/f/a/h/t/d.smali
+++ b/com.discord/smali/f/a/h/t/d.smali
@@ -17,9 +17,11 @@
 
 # direct methods
 .method public constructor <init>(JLcom/discord/utilities/logging/Logger;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "logger"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -28,15 +30,6 @@
     iput-object p3, p0, Lf/a/h/t/d;->e:Lcom/discord/utilities/logging/Logger;
 
     return-void
-
-    :cond_0
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali/f/a/i/a.smali b/com.discord/smali/f/a/i/a.smali
index 7f648b3438..7ea27ae95e 100644
--- a/com.discord/smali/f/a/i/a.smali
+++ b/com.discord/smali/f/a/i/a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/i/a;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "SamsungConnect.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -21,7 +21,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.samsung.SamsungConnect$getSamsungAuthorizeCallback$2"
     f = "SamsungConnect.kt"
     l = {}
@@ -30,7 +30,7 @@
 
 
 # instance fields
-.field public final synthetic $okHttpClient:Ln0/x;
+.field public final synthetic $okHttpClient:Lo0/x;
 
 .field public final synthetic $url:Ljava/lang/String;
 
@@ -40,16 +40,16 @@
 
 
 # direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/x;Lkotlin/coroutines/Continuation;)V
+.method public constructor <init>(Ljava/lang/String;Lo0/x;Lkotlin/coroutines/Continuation;)V
     .locals 0
 
     iput-object p1, p0, Lf/a/i/a;->$url:Ljava/lang/String;
 
-    iput-object p2, p0, Lf/a/i/a;->$okHttpClient:Ln0/x;
+    iput-object p2, p0, Lf/a/i/a;->$okHttpClient:Lo0/x;
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p3}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p3}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -70,46 +70,49 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/a/i/a;
 
     iget-object v1, p0, Lf/a/i/a;->$url:Ljava/lang/String;
 
-    iget-object v2, p0, Lf/a/i/a;->$okHttpClient:Ln0/x;
+    iget-object v2, p0, Lf/a/i/a;->$okHttpClient:Lo0/x;
 
-    invoke-direct {v0, v1, v2, p2}, Lf/a/i/a;-><init>(Ljava/lang/String;Ln0/x;Lkotlin/coroutines/Continuation;)V
+    invoke-direct {v0, v1, v2, p2}, Lf/a/i/a;-><init>(Ljava/lang/String;Lo0/x;Lkotlin/coroutines/Continuation;)V
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
     iput-object p1, v0, Lf/a/i/a;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 3
 
     check-cast p2, Lkotlin/coroutines/Continuation;
 
-    invoke-virtual {p0, p1, p2}, Lf/a/i/a;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    const-string v0, "completion"
 
-    move-result-object p1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p1, Lf/a/i/a;
+    new-instance v0, Lf/a/i/a;
 
-    sget-object p2, Lkotlin/Unit;->a:Lkotlin/Unit;
+    iget-object v1, p0, Lf/a/i/a;->$url:Ljava/lang/String;
 
-    invoke-virtual {p1, p2}, Lf/a/i/a;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+    iget-object v2, p0, Lf/a/i/a;->$okHttpClient:Lo0/x;
+
+    invoke-direct {v0, v1, v2, p2}, Lf/a/i/a;-><init>(Ljava/lang/String;Lo0/x;Lkotlin/coroutines/Continuation;)V
+
+    check-cast p1, Lkotlinx/coroutines/CoroutineScope;
+
+    iput-object p1, v0, Lf/a/i/a;->p$:Lkotlinx/coroutines/CoroutineScope;
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    invoke-virtual {v0, p1}, Lf/a/i/a;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -125,33 +128,33 @@
 
     invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
 
-    new-instance p1, Ln0/a0$a;
+    new-instance p1, Lo0/a0$a;
 
-    invoke-direct {p1}, Ln0/a0$a;-><init>()V
+    invoke-direct {p1}, Lo0/a0$a;-><init>()V
 
     const/4 v0, 0x0
 
     const-string v1, "GET"
 
-    invoke-virtual {p1, v1, v0}, Ln0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
+    invoke-virtual {p1, v1, v0}, Lo0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
 
     iget-object v0, p0, Lf/a/i/a;->$url:Ljava/lang/String;
 
-    invoke-virtual {p1, v0}, Ln0/a0$a;->f(Ljava/lang/String;)Ln0/a0$a;
+    invoke-virtual {p1, v0}, Lo0/a0$a;->f(Ljava/lang/String;)Lo0/a0$a;
 
-    invoke-virtual {p1}, Ln0/a0$a;->b()Ln0/a0;
+    invoke-virtual {p1}, Lo0/a0$a;->b()Lo0/a0;
 
     move-result-object p1
 
-    iget-object v0, p0, Lf/a/i/a;->$okHttpClient:Ln0/x;
+    iget-object v0, p0, Lf/a/i/a;->$okHttpClient:Lo0/x;
 
-    invoke-virtual {v0, p1}, Ln0/x;->b(Ln0/a0;)Ln0/f;
+    invoke-virtual {v0, p1}, Lo0/x;->b(Lo0/a0;)Lo0/f;
 
     move-result-object p1
 
-    check-cast p1, Ln0/z;
+    check-cast p1, Lo0/z;
 
-    invoke-virtual {p1}, Ln0/z;->execute()Lokhttp3/Response;
+    invoke-virtual {p1}, Lo0/z;->execute()Lokhttp3/Response;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/i/b.smali b/com.discord/smali/f/a/i/b.smali
index d4067627dd..e72703338d 100644
--- a/com.discord/smali/f/a/i/b.smali
+++ b/com.discord/smali/f/a/i/b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/i/b;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "SamsungConnect.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -21,7 +21,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.samsung.SamsungConnect$postSamsungAuthorizeCallback$2"
     f = "SamsungConnect.kt"
     l = {}
@@ -30,7 +30,7 @@
 
 
 # instance fields
-.field public final synthetic $okHttpClient:Ln0/x;
+.field public final synthetic $okHttpClient:Lo0/x;
 
 .field public final synthetic $samsungAuthCode:Ljava/lang/String;
 
@@ -44,7 +44,7 @@
 
 
 # direct methods
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ln0/x;Lkotlin/coroutines/Continuation;)V
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lo0/x;Lkotlin/coroutines/Continuation;)V
     .locals 0
 
     iput-object p1, p0, Lf/a/i/b;->$state:Ljava/lang/String;
@@ -53,11 +53,11 @@
 
     iput-object p3, p0, Lf/a/i/b;->$url:Ljava/lang/String;
 
-    iput-object p4, p0, Lf/a/i/b;->$okHttpClient:Ln0/x;
+    iput-object p4, p0, Lf/a/i/b;->$okHttpClient:Lo0/x;
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p5}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p5}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -78,38 +78,31 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
 
-    new-instance v6, Lf/a/i/b;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lf/a/i/b;->$state:Ljava/lang/String;
+    new-instance v0, Lf/a/i/b;
 
-    iget-object v2, p0, Lf/a/i/b;->$samsungAuthCode:Ljava/lang/String;
+    iget-object v2, p0, Lf/a/i/b;->$state:Ljava/lang/String;
 
-    iget-object v3, p0, Lf/a/i/b;->$url:Ljava/lang/String;
+    iget-object v3, p0, Lf/a/i/b;->$samsungAuthCode:Ljava/lang/String;
 
-    iget-object v4, p0, Lf/a/i/b;->$okHttpClient:Ln0/x;
+    iget-object v4, p0, Lf/a/i/b;->$url:Ljava/lang/String;
 
-    move-object v0, v6
+    iget-object v5, p0, Lf/a/i/b;->$okHttpClient:Lo0/x;
 
-    move-object v5, p2
+    move-object v1, v0
 
-    invoke-direct/range {v0 .. v5}, Lf/a/i/b;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ln0/x;Lkotlin/coroutines/Continuation;)V
+    move-object v6, p2
+
+    invoke-direct/range {v1 .. v6}, Lf/a/i/b;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lo0/x;Lkotlin/coroutines/Continuation;)V
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
-    iput-object p1, v6, Lf/a/i/b;->p$:Lkotlinx/coroutines/CoroutineScope;
+    iput-object p1, v0, Lf/a/i/b;->p$:Lkotlinx/coroutines/CoroutineScope;
 
-    return-object v6
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -261,7 +254,7 @@
 
     const-string v1, "&"
 
-    invoke-static/range {v0 .. v7}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v0 .. v7}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -279,31 +272,35 @@
 
     move-result-object p1
 
-    new-instance v0, Ln0/a0$a;
+    new-instance v0, Lo0/a0$a;
 
-    invoke-direct {v0}, Ln0/a0$a;-><init>()V
+    invoke-direct {v0}, Lo0/a0$a;-><init>()V
+
+    const-string v1, "body"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "POST"
 
-    invoke-virtual {v0, v1, p1}, Ln0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
+    invoke-virtual {v0, v1, p1}, Lo0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
 
     iget-object p1, p0, Lf/a/i/b;->$url:Ljava/lang/String;
 
-    invoke-virtual {v0, p1}, Ln0/a0$a;->f(Ljava/lang/String;)Ln0/a0$a;
+    invoke-virtual {v0, p1}, Lo0/a0$a;->f(Ljava/lang/String;)Lo0/a0$a;
 
-    invoke-virtual {v0}, Ln0/a0$a;->b()Ln0/a0;
+    invoke-virtual {v0}, Lo0/a0$a;->b()Lo0/a0;
 
     move-result-object p1
 
-    iget-object v0, p0, Lf/a/i/b;->$okHttpClient:Ln0/x;
+    iget-object v0, p0, Lf/a/i/b;->$okHttpClient:Lo0/x;
 
-    invoke-virtual {v0, p1}, Ln0/x;->b(Ln0/a0;)Ln0/f;
+    invoke-virtual {v0, p1}, Lo0/x;->b(Lo0/a0;)Lo0/f;
 
     move-result-object p1
 
-    check-cast p1, Ln0/z;
+    check-cast p1, Lo0/z;
 
-    invoke-virtual {p1}, Ln0/z;->execute()Lokhttp3/Response;
+    invoke-virtual {p1}, Lo0/z;->execute()Lokhttp3/Response;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/i/c.smali b/com.discord/smali/f/a/i/c.smali
index cab7d4e2c2..558c843944 100644
--- a/com.discord/smali/f/a/i/c.smali
+++ b/com.discord/smali/f/a/i/c.smali
@@ -150,7 +150,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p2
 
@@ -223,6 +223,10 @@
 
     const/4 p2, 0x4
 
+    const-string v4, "$this$takeLast"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
     move-result v4
@@ -240,7 +244,7 @@
 
     const-string v4, "(this as java.lang.String).substring(startIndex)"
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_6
 
@@ -268,7 +272,7 @@
 
     const-string p3, "StringBuilder()\n        \u2026              .toString()"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
diff --git a/com.discord/smali/f/a/j/a/a/a.smali b/com.discord/smali/f/a/j/a/a/a.smali
index feda32845a..ade9d56144 100644
--- a/com.discord/smali/f/a/j/a/a/a.smali
+++ b/com.discord/smali/f/a/j/a/a/a.smali
@@ -21,24 +21,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "content"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/simpleast/core/node/Node;-><init>()V
 
     iput-object p1, p0, Lf/a/j/a/a/a;->content:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "content"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -61,22 +54,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "builder"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Lf/a/j/a/a/a;->content:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     return-void
-
-    :cond_0
-    const-string p1, "builder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public toString()Ljava/lang/String;
diff --git a/com.discord/smali/f/a/j/a/b/a$a.smali b/com.discord/smali/f/a/j/a/b/a$a.smali
index b685bfca34..ac091403e9 100644
--- a/com.discord/smali/f/a/j/a/b/a$a.smali
+++ b/com.discord/smali/f/a/j/a/b/a$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/j/a/b/a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SimpleMarkdownRules.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/j/a/b/a$b.smali b/com.discord/smali/f/a/j/a/b/a$b.smali
index 32ecd1b56f..cd024ad900 100644
--- a/com.discord/smali/f/a/j/a/b/a$b.smali
+++ b/com.discord/smali/f/a/j/a/b/a$b.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+    value = Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,17 +23,18 @@
 .end annotation
 
 
-# instance fields
-.field public final synthetic a:Lkotlin/jvm/functions/Function0;
-
-
 # direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
+.method public constructor <init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
     .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/regex/Pattern;",
+            ")V"
+        }
+    .end annotation
 
-    iput-object p1, p0, Lf/a/j/a/b/a$b;->a:Lkotlin/jvm/functions/Function0;
-
-    invoke-direct {p0, p3}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
+    invoke-direct {p0, p2}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
 
     return-void
 .end method
@@ -41,7 +42,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -57,31 +58,29 @@
         }
     .end annotation
 
-    new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
+    const-string v0, "matcher"
 
-    iget-object v0, p0, Lf/a/j/a/b/a$b;->a:Lkotlin/jvm/functions/Function0;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+    const-string v0, "parser"
 
-    move-result-object v0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v0, Ljava/util/List;
+    new-instance p2, Lf/a/j/a/a/a;
 
-    invoke-direct {p2, v0}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
+    invoke-virtual {p1}, Ljava/util/regex/Matcher;->group()Ljava/lang/String;
 
-    const/4 v0, 0x1
+    move-result-object p1
 
-    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->start(I)I
+    const-string v0, "matcher.group()"
 
-    move-result v1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->end(I)I
+    invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
-    move-result p1
+    new-instance p1, Lcom/discord/simpleast/core/parser/ParseSpec;
 
-    new-instance v0, Lcom/discord/simpleast/core/parser/ParseSpec;
+    invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
-    invoke-direct {v0, p2, p3, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
-
-    return-object v0
+    return-object p1
 .end method
diff --git a/com.discord/smali/f/a/j/a/b/a$c.smali b/com.discord/smali/f/a/j/a/b/a$c.smali
deleted file mode 100644
index e67006d5a7..0000000000
--- a/com.discord/smali/f/a/j/a/b/a$c.smali
+++ /dev/null
@@ -1,78 +0,0 @@
-.class public final Lf/a/j/a/b/a$c;
-.super Lcom/discord/simpleast/core/parser/Rule;
-.source "SimpleMarkdownRules.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lf/a/j/a/b/a;->e()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<",
-        "TR;",
-        "Lcom/discord/simpleast/core/node/Node<",
-        "TR;>;TS;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/regex/Pattern;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p2}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/regex/Matcher;",
-            "Lcom/discord/simpleast/core/parser/Parser<",
-            "TR;-",
-            "Lcom/discord/simpleast/core/node/Node<",
-            "TR;>;TS;>;TS;)",
-            "Lcom/discord/simpleast/core/parser/ParseSpec<",
-            "TR;",
-            "Lcom/discord/simpleast/core/node/Node<",
-            "TR;>;TS;>;"
-        }
-    .end annotation
-
-    new-instance p2, Lf/a/j/a/a/a;
-
-    invoke-virtual {p1}, Ljava/util/regex/Matcher;->group()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "matcher.group()"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
-
-    new-instance p1, Lcom/discord/simpleast/core/parser/ParseSpec;
-
-    invoke-direct {p1, p2, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f/a/j/a/b/a.smali b/com.discord/smali/f/a/j/a/b/a.smali
index 1cf2e372aa..00c2f7ba14 100644
--- a/com.discord/smali/f/a/j/a/b/a.smali
+++ b/com.discord/smali/f/a/j/a/b/a.smali
@@ -99,7 +99,7 @@
 .end method
 
 .method public static final b(Z)Ljava/util/List;
-    .locals 5
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
@@ -127,7 +127,7 @@
 
     const-string v4, "PATTERN_ESCAPE"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, v1, v3}, Lf/a/j/a/b/b;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
 
@@ -141,7 +141,7 @@
 
     const-string v4, "PATTERN_NEWLINE"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, v1, v3}, Lf/a/j/a/b/d;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
 
@@ -151,41 +151,53 @@
 
     const-string v2, "PATTERN_BOLD"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lf/a/j/a/b/a$a;->d:Lf/a/j/a/b/a$a;
 
-    invoke-static {v1, v2}, Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+    const-string v3, "pattern"
 
-    move-result-object v1
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    const-string v4, "styleFactory"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Lf/a/j/a/b/e;
+
+    invoke-direct {v5, v2, v1, v1}, Lf/a/j/a/b/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
+
+    invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     sget-object v1, Lf/a/j/a/b/a;->b:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_UNDERLINE"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lf/a/j/a/b/f;->d:Lf/a/j/a/b/f;
+    sget-object v2, Lf/a/j/a/b/g;->d:Lf/a/j/a/b/g;
 
-    invoke-static {v1, v2}, Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v1
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    new-instance v5, Lf/a/j/a/b/e;
+
+    invoke-direct {v5, v2, v1, v1}, Lf/a/j/a/b/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
+
+    invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
     new-instance v2, Lf/a/j/a/b/c;
 
-    sget-object v3, Lf/a/j/a/b/a;->g:Ljava/util/regex/Pattern;
+    sget-object v5, Lf/a/j/a/b/a;->g:Ljava/util/regex/Pattern;
 
-    const-string v4, "PATTERN_ITALICS"
+    const-string v6, "PATTERN_ITALICS"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v2, v1, v3}, Lf/a/j/a/b/c;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
+    invoke-direct {v2, v1, v5}, Lf/a/j/a/b/c;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
 
     invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -193,21 +205,25 @@
 
     const-string v2, "PATTERN_STRIKETHRU"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lf/a/j/a/b/e;->d:Lf/a/j/a/b/e;
+    sget-object v2, Lf/a/j/a/b/f;->d:Lf/a/j/a/b/f;
 
-    invoke-static {v1, v2}, Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v1
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    new-instance v3, Lf/a/j/a/b/e;
+
+    invoke-direct {v3, v2, v1, v1}, Lf/a/j/a/b/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     if-eqz p0, :cond_0
 
     sget-object p0, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {p0}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p0}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p0
 
@@ -236,60 +252,10 @@
     return-object p0
 .end method
 
-.method public static final d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            "S:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/regex/Pattern;",
-            "Lkotlin/jvm/functions/Function0<",
-            "+",
-            "Ljava/util/List<",
-            "+",
-            "Landroid/text/style/CharacterStyle;",
-            ">;>;)",
-            "Lcom/discord/simpleast/core/parser/Rule<",
-            "TR;",
-            "Lcom/discord/simpleast/core/node/Node<",
-            "TR;>;TS;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Lf/a/j/a/b/a$b;
-
-    invoke-direct {v0, p1, p0, p0}, Lf/a/j/a/b/a$b;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "styleFactory"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "pattern"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
 
 # virtual methods
 .method public final a()Lcom/discord/simpleast/core/parser/Rule;
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
@@ -308,18 +274,26 @@
 
     const-string v1, "PATTERN_BOLD"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lf/a/j/a/b/a$a;->d:Lf/a/j/a/b/a$a;
 
-    invoke-static {v0, v1}, Lf/a/j/a/b/a;->d(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+    const-string v2, "pattern"
 
-    move-result-object v0
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    const-string v2, "styleFactory"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lf/a/j/a/b/e;
+
+    invoke-direct {v2, v1, v0, v0}, Lf/a/j/a/b/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
+
+    return-object v2
 .end method
 
-.method public final e()Lcom/discord/simpleast/core/parser/Rule;
+.method public final d()Lcom/discord/simpleast/core/parser/Rule;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -335,15 +309,15 @@
         }
     .end annotation
 
-    new-instance v0, Lf/a/j/a/b/a$c;
+    new-instance v0, Lf/a/j/a/b/a$b;
 
     sget-object v1, Lf/a/j/a/b/a;->e:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_TEXT"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p0, v1}, Lf/a/j/a/b/a$c;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
+    invoke-direct {v0, p0, v1}, Lf/a/j/a/b/a$b;-><init>(Lf/a/j/a/b/a;Ljava/util/regex/Pattern;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/f/a/j/a/b/b.smali b/com.discord/smali/f/a/j/a/b/b.smali
index b5bf65d9a7..9647b05042 100644
--- a/com.discord/smali/f/a/j/a/b/b.smali
+++ b/com.discord/smali/f/a/j/a/b/b.smali
@@ -49,6 +49,14 @@
         }
     .end annotation
 
+    const-string v0, "matcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p2, Lf/a/j/a/a/a;
 
     const/4 v0, 0x1
@@ -59,7 +67,7 @@
 
     const-string v0, "matcher.group(1)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lf/a/j/a/a/a;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali/f/a/j/a/b/c.smali b/com.discord/smali/f/a/j/a/b/c.smali
index 7186a9d249..8a1259d066 100644
--- a/com.discord/smali/f/a/j/a/b/c.smali
+++ b/com.discord/smali/f/a/j/a/b/c.smali
@@ -49,6 +49,14 @@
         }
     .end annotation
 
+    const-string v0, "matcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 p2, 0x2
 
     invoke-virtual {p1, p2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
diff --git a/com.discord/smali/f/a/j/a/b/d.smali b/com.discord/smali/f/a/j/a/b/d.smali
index 2e3ef48284..a80f5f9572 100644
--- a/com.discord/smali/f/a/j/a/b/d.smali
+++ b/com.discord/smali/f/a/j/a/b/d.smali
@@ -33,7 +33,7 @@
 
 # virtual methods
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -49,6 +49,14 @@
         }
     .end annotation
 
+    const-string v0, "matcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "parser"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/j/a/a/a;
 
     const-string p2, "\n"
diff --git a/com.discord/smali/f/a/j/a/b/e.smali b/com.discord/smali/f/a/j/a/b/e.smali
index abf6a1d884..ca7e8122df 100644
--- a/com.discord/smali/f/a/j/a/b/e.smali
+++ b/com.discord/smali/f/a/j/a/b/e.smali
@@ -1,63 +1,86 @@
 .class public final Lf/a/j/a/b/e;
-.super Lj0/n/c/i;
+.super Lcom/discord/simpleast/core/parser/Rule;
 .source "SimpleMarkdownRules.kt"
 
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Ljava/util/List<",
-        "+",
-        "Landroid/text/style/StrikethroughSpan;",
-        ">;>;"
+        "Lcom/discord/simpleast/core/parser/Rule<",
+        "TR;",
+        "Lcom/discord/simpleast/core/node/Node<",
+        "TR;>;TS;>;"
     }
 .end annotation
 
 
-# static fields
-.field public static final d:Lf/a/j/a/b/e;
+# instance fields
+.field public final synthetic a:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>(Lkotlin/jvm/functions/Function0;Ljava/util/regex/Pattern;Ljava/util/regex/Pattern;)V
+    .locals 0
 
-    new-instance v0, Lf/a/j/a/b/e;
+    iput-object p1, p0, Lf/a/j/a/b/e;->a:Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {v0}, Lf/a/j/a/b/e;-><init>()V
-
-    sput-object v0, Lf/a/j/a/b/e;->d:Lf/a/j/a/b/e;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p3}, Lcom/discord/simpleast/core/parser/Rule;-><init>(Ljava/util/regex/Pattern;)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 1
+.method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/regex/Matcher;",
+            "Lcom/discord/simpleast/core/parser/Parser<",
+            "TR;-",
+            "Lcom/discord/simpleast/core/node/Node<",
+            "TR;>;TS;>;TS;)",
+            "Lcom/discord/simpleast/core/parser/ParseSpec<",
+            "TR;",
+            "Lcom/discord/simpleast/core/node/Node<",
+            "TR;>;TS;>;"
+        }
+    .end annotation
 
-    new-instance v0, Landroid/text/style/StrikethroughSpan;
+    const-string v0, "matcher"
 
-    invoke-direct {v0}, Landroid/text/style/StrikethroughSpan;-><init>()V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
+
+    iget-object v0, p0, Lf/a/j/a/b/e;->a:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     move-result-object v0
 
+    check-cast v0, Ljava/util/List;
+
+    invoke-direct {p2, v0}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
+
+    const/4 v0, 0x1
+
+    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
+
+    new-instance v0, Lcom/discord/simpleast/core/parser/ParseSpec;
+
+    invoke-direct {v0, p2, p3, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
+
     return-object v0
 .end method
diff --git a/com.discord/smali/f/a/j/a/b/f.smali b/com.discord/smali/f/a/j/a/b/f.smali
index fb27f4610c..49e7899822 100644
--- a/com.discord/smali/f/a/j/a/b/f.smali
+++ b/com.discord/smali/f/a/j/a/b/f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/j/a/b/f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SimpleMarkdownRules.kt"
 
 # interfaces
@@ -9,11 +9,11 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/List<",
         "+",
-        "Landroid/text/style/UnderlineSpan;",
+        "Landroid/text/style/StrikethroughSpan;",
         ">;>;"
     }
 .end annotation
@@ -41,7 +41,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,9 +51,9 @@
 .method public invoke()Ljava/lang/Object;
     .locals 1
 
-    new-instance v0, Landroid/text/style/UnderlineSpan;
+    new-instance v0, Landroid/text/style/StrikethroughSpan;
 
-    invoke-direct {v0}, Landroid/text/style/UnderlineSpan;-><init>()V
+    invoke-direct {v0}, Landroid/text/style/StrikethroughSpan;-><init>()V
 
     invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
 
diff --git a/com.discord/smali/f/a/j/a/b/g.smali b/com.discord/smali/f/a/j/a/b/g.smali
index a50f855016..8fa8b94c6b 100644
--- a/com.discord/smali/f/a/j/a/b/g.smali
+++ b/com.discord/smali/f/a/j/a/b/g.smali
@@ -1,128 +1,63 @@
 .class public final Lf/a/j/a/b/g;
-.super Ljava/lang/Object;
-.source "SimpleRenderer.kt"
+.super Lk0/o/c/j;
+.source "SimpleMarkdownRules.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Ljava/util/List<",
+        "+",
+        "Landroid/text/style/UnderlineSpan;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lf/a/j/a/b/g;
 
 
 # direct methods
-.method public static final a(Landroid/text/SpannableStringBuilder;Ljava/util/Collection;Ljava/lang/Object;)Landroid/text/SpannableStringBuilder;
+.method public static constructor <clinit>()V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Landroid/text/SpannableStringBuilder;",
-            "R:",
-            "Ljava/lang/Object;",
-            ">(TT;",
-            "Ljava/util/Collection<",
-            "+",
-            "Lcom/discord/simpleast/core/node/Node<",
-            "TR;>;>;TR;)TT;"
-        }
-    .end annotation
 
-    if-eqz p1, :cond_1
+    new-instance v0, Lf/a/j/a/b/g;
 
-    invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+    invoke-direct {v0}, Lf/a/j/a/b/g;-><init>()V
 
-    move-result-object p1
+    sput-object v0, Lf/a/j/a/b/g;->d:Lf/a/j/a/b/g;
 
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/simpleast/core/node/Node;
-
-    invoke-virtual {v0, p0, p2}, Lcom/discord/simpleast/core/node/Node;->render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    return-object p0
-
-    :cond_1
-    const-string p0, "ast"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
+    return-void
 .end method
 
-.method public static final b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
-    .locals 10
+.method public constructor <init>()V
+    .locals 1
 
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_1
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    invoke-static {v1, v2}, Lf/a/j/a/b/a;->c(ZI)Ljava/util/List;
-
-    move-result-object v3
-
-    const/4 v6, 0x0
-
-    new-instance v4, Lcom/discord/simpleast/core/parser/Parser;
-
-    invoke-direct {v4, v1, v2, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-interface {v3}, Ljava/util/Collection;->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/parser/Rule;
-
-    invoke-virtual {v4, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Landroid/text/SpannableStringBuilder;
-
-    invoke-direct {v1}, Landroid/text/SpannableStringBuilder;-><init>()V
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x4
-
-    const/4 v9, 0x0
-
-    move-object v5, p0
-
-    invoke-static/range {v4 .. v9}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {v1, p0, v0}, Lf/a/j/a/b/g;->a(Landroid/text/SpannableStringBuilder;Ljava/util/Collection;Ljava/lang/Object;)Landroid/text/SpannableStringBuilder;
-
-    return-object v1
-
-    :cond_1
-    const-string p0, "source"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke()Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Landroid/text/style/UnderlineSpan;
+
+    invoke-direct {v0}, Landroid/text/style/UnderlineSpan;-><init>()V
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/j/a/b/h.smali b/com.discord/smali/f/a/j/a/b/h.smali
new file mode 100644
index 0000000000..c314a821ba
--- /dev/null
+++ b/com.discord/smali/f/a/j/a/b/h.smali
@@ -0,0 +1,126 @@
+.class public final Lf/a/j/a/b/h;
+.super Ljava/lang/Object;
+.source "SimpleRenderer.kt"
+
+
+# direct methods
+.method public static final a(Landroid/text/SpannableStringBuilder;Ljava/util/Collection;Ljava/lang/Object;)Landroid/text/SpannableStringBuilder;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Landroid/text/SpannableStringBuilder;",
+            "R:",
+            "Ljava/lang/Object;",
+            ">(TT;",
+            "Ljava/util/Collection<",
+            "+",
+            "Lcom/discord/simpleast/core/node/Node<",
+            "TR;>;>;TR;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "builder"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ast"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/simpleast/core/node/Node;
+
+    invoke-virtual {v0, p0, p2}, Lcom/discord/simpleast/core/node/Node;->render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    .locals 10
+
+    const-string v0, "source"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    invoke-static {v1, v2}, Lf/a/j/a/b/a;->c(ZI)Ljava/util/List;
+
+    move-result-object v3
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rules"
+
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Lcom/discord/simpleast/core/parser/Parser;
+
+    const/4 v0, 0x0
+
+    invoke-direct {v4, v1, v2, v0}, Lcom/discord/simpleast/core/parser/Parser;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-interface {v3}, Ljava/util/Collection;->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/parser/Rule;
+
+    invoke-virtual {v4, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Landroid/text/SpannableStringBuilder;
+
+    invoke-direct {v1}, Landroid/text/SpannableStringBuilder;-><init>()V
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x4
+
+    const/4 v9, 0x0
+
+    const/4 v6, 0x0
+
+    move-object v5, p0
+
+    invoke-static/range {v4 .. v9}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {v1, p0, v0}, Lf/a/j/a/b/h;->a(Landroid/text/SpannableStringBuilder;Ljava/util/Collection;Ljava/lang/Object;)Landroid/text/SpannableStringBuilder;
+
+    return-object v1
+.end method
diff --git a/com.discord/smali/f/a/j/b/a$a.smali b/com.discord/smali/f/a/j/b/a$a.smali
index 1506b173e3..3854c9d17b 100644
--- a/com.discord/smali/f/a/j/b/a$a.smali
+++ b/com.discord/smali/f/a/j/b/a$a.smali
@@ -71,11 +71,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "styleSpanProvider"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "classSpanProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -85,31 +87,17 @@
 
     sget-object v1, Lf/a/j/a/b/a;->h:Lf/a/j/a/b/a;
 
-    invoke-virtual {v1}, Lf/a/j/a/b/a;->e()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lf/a/j/a/b/a;->d()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
     invoke-direct {p0, p1, p2, v0}, Lf/a/j/b/a$a;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "classSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "styleSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;)V
@@ -136,13 +124,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "styleSpanProvider"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "classSpanProvider"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "innerRules"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lf/a/j/b/a;->e:Lf/a/j/b/a;
 
@@ -155,27 +147,6 @@
     iput-object p3, p0, Lf/a/j/b/a$a;->innerRules:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "innerRules"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "classSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "styleSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -215,7 +186,7 @@
 .end method
 
 .method public parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
-    .locals 5
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -231,47 +202,49 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_8
+    const-string v0, "parser"
 
-    const/4 v1, 0x4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x4
+
+    invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "matcher.group(4)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, v0}, Lf/a/j/b/a$b;->createHeaderStyleNode(Ljava/lang/String;)Lcom/discord/simpleast/core/node/StyleNode;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
 
     invoke-virtual {p1, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-string v2, "matcher.group(4)"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0, v1}, Lf/a/j/b/a$b;->createHeaderStyleNode(Ljava/lang/String;)Lcom/discord/simpleast/core/node/StyleNode;
-
-    move-result-object v1
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p1, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const/4 v3, 0x3
+    const/4 v2, 0x3
 
-    invoke-virtual {p1, v3}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {p1, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
     :goto_0
-    iget-object v4, p0, Lf/a/j/b/a$a;->innerRules:Ljava/util/List;
+    iget-object v3, p0, Lf/a/j/b/a$a;->innerRules:Ljava/util/List;
 
-    invoke-virtual {p2, v3, p3, v4}, Lcom/discord/simpleast/core/parser/Parser;->parse(Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;)Ljava/util/List;
+    invoke-virtual {p2, v2, p3, v3}, Lcom/discord/simpleast/core/parser/Parser;->parse(Ljava/lang/CharSequence;Ljava/lang/Object;Ljava/util/List;)Ljava/util/List;
 
     move-result-object p2
 
@@ -282,19 +255,19 @@
     :goto_1
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    check-cast v3, Lcom/discord/simpleast/core/node/Node;
+    check-cast v2, Lcom/discord/simpleast/core/node/Node;
 
-    invoke-virtual {v1, v3}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
+    invoke-virtual {v0, v2}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
 
     goto :goto_1
 
@@ -316,7 +289,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -326,95 +299,86 @@
 
     if-eqz p1, :cond_3
 
-    new-array p2, v2, [C
+    new-array p2, v1, [C
 
-    const/16 v0, 0x20
+    const/16 v2, 0x20
 
     const/4 v3, 0x0
 
-    aput-char v0, p2, v3
+    aput-char v2, p2, v3
 
-    const/4 v0, 0x6
+    const/4 v2, 0x6
 
-    invoke-static {p1, p2, v3, v3, v0}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {p1, p2, v3, v3, v2}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
-    move-result-object v0
-
-    :cond_3
-    if-eqz v0, :cond_5
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :cond_4
-    :goto_2
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    iget-object v3, p0, Lf/a/j/b/a$a;->classSpanProvider:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_4
-
-    invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    move-result-object p1
 
     goto :goto_2
 
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_2
+    if-eqz p1, :cond_5
+
+    new-instance p2, Ljava/util/ArrayList;
+
+    invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_4
+    :goto_3
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_6
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    iget-object v3, p0, Lf/a/j/b/a$a;->classSpanProvider:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v3, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_4
+
+    invoke-interface {p2, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_3
+
     :cond_5
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p2, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_6
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result p2
+    move-result p1
 
-    xor-int/2addr p2, v2
+    xor-int/2addr p1, v1
 
-    if-eqz p2, :cond_7
+    if-eqz p1, :cond_7
 
-    new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
+    new-instance p1, Lcom/discord/simpleast/core/node/StyleNode;
 
-    invoke-direct {p2, p1}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
+    invoke-direct {p1, p2}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
-    invoke-virtual {p2, v1}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
+    invoke-virtual {p1, v0}, Lcom/discord/simpleast/core/node/Node;->addChild(Lcom/discord/simpleast/core/node/Node;)V
 
-    move-object v1, p2
+    move-object v0, p1
 
     :cond_7
     new-instance p1, Lcom/discord/simpleast/core/parser/ParseSpec;
 
-    invoke-direct {p1, v1, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
+    invoke-direct {p1, v0, p3}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;)V
 
     return-object p1
-
-    :cond_8
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/j/b/a$b.smali b/com.discord/smali/f/a/j/b/a$b.smali
index eee096c477..6783b67113 100644
--- a/com.discord/smali/f/a/j/b/a$b.smali
+++ b/com.discord/smali/f/a/j/b/a$b.smali
@@ -42,29 +42,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "pattern"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "styleSpanProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lf/a/j/b/a$c;-><init>(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "styleSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "pattern"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -100,7 +88,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "headerStyleGroup"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
@@ -151,15 +141,6 @@
     invoke-direct {v0, p1}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_2
-    const-string p1, "headerStyleGroup"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public abstract parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
diff --git a/com.discord/smali/f/a/j/b/a$c.smali b/com.discord/smali/f/a/j/b/a$c.smali
index 677453f4f8..8e785d8120 100644
--- a/com.discord/smali/f/a/j/b/a$c.smali
+++ b/com.discord/smali/f/a/j/b/a$c.smali
@@ -57,31 +57,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "pattern"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "styleSpanProvider"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/simpleast/core/parser/Rule$BlockRule;-><init>(Ljava/util/regex/Pattern;)V
 
     iput-object p2, p0, Lf/a/j/b/a$c;->styleSpanProvider:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "styleSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "pattern"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
@@ -98,7 +86,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "styleSpanProvider"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lf/a/j/b/a;->e:Lf/a/j/b/a;
 
@@ -107,15 +97,6 @@
     invoke-direct {p0, v0, p1}, Lf/a/j/b/a$c;-><init>(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "styleSpanProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -134,7 +115,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "headerStyleGroup"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
@@ -159,15 +142,6 @@
     invoke-direct {v0, p1}, Lcom/discord/simpleast/core/node/StyleNode;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "headerStyleGroup"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getStyleSpanProvider()Lkotlin/jvm/functions/Function1;
@@ -204,11 +178,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matcher"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parser"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x1
 
@@ -218,7 +194,7 @@
 
     const-string v0, "matcher.group(1)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p2}, Lf/a/j/b/a$c;->createHeaderStyleNode(Ljava/lang/String;)Lcom/discord/simpleast/core/node/StyleNode;
 
@@ -239,18 +215,4 @@
     invoke-direct {v0, p2, p3, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec;-><init>(Lcom/discord/simpleast/core/node/Node;Ljava/lang/Object;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "parser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matcher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/j/b/a.smali b/com.discord/smali/f/a/j/b/a.smali
index 5a7336fffe..25d0293e73 100644
--- a/com.discord/smali/f/a/j/b/a.smali
+++ b/com.discord/smali/f/a/j/b/a.smali
@@ -45,7 +45,7 @@
 
     const-string v2, "java.util.regex.Pattern.compile(this, flags)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lf/a/j/b/a;->a:Ljava/util/regex/Pattern;
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lf/a/j/b/a;->b:Ljava/util/regex/Pattern;
 
@@ -65,7 +65,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lf/a/j/b/a;->c:Ljava/util/regex/Pattern;
 
diff --git a/com.discord/smali/f/a/k/a.smali b/com.discord/smali/f/a/k/a.smali
index 6642cb642a..f66ae2c917 100644
--- a/com.discord/smali/f/a/k/a.smali
+++ b/com.discord/smali/f/a/k/a.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/k/d.smali b/com.discord/smali/f/a/k/d.smali
index cb2f80bdb5..4500f234e8 100644
--- a/com.discord/smali/f/a/k/d.smali
+++ b/com.discord/smali/f/a/k/d.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/k/e.smali b/com.discord/smali/f/a/k/e.smali
index 50809ed059..2c58fac199 100644
--- a/com.discord/smali/f/a/k/e.smali
+++ b/com.discord/smali/f/a/k/e.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/k/g.smali b/com.discord/smali/f/a/k/g.smali
index ba428a1598..1a2837c52a 100644
--- a/com.discord/smali/f/a/k/g.smali
+++ b/com.discord/smali/f/a/k/g.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/k/h.smali b/com.discord/smali/f/a/k/h.smali
index 07bdf14674..70f4244748 100644
--- a/com.discord/smali/f/a/k/h.smali
+++ b/com.discord/smali/f/a/k/h.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/k/k.smali b/com.discord/smali/f/a/k/k.smali
index 7896a248c9..40085b71a0 100644
--- a/com.discord/smali/f/a/k/k.smali
+++ b/com.discord/smali/f/a/k/k.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/k/o.smali b/com.discord/smali/f/a/k/o.smali
index c729897375..b4f2a62374 100644
--- a/com.discord/smali/f/a/k/o.smali
+++ b/com.discord/smali/f/a/k/o.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/k/q.smali b/com.discord/smali/f/a/k/q.smali
index d7806303bc..0db92b6a94 100644
--- a/com.discord/smali/f/a/k/q.smali
+++ b/com.discord/smali/f/a/k/q.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/k/r.smali b/com.discord/smali/f/a/k/r.smali
index 7690eee5d3..98bdd88153 100644
--- a/com.discord/smali/f/a/k/r.smali
+++ b/com.discord/smali/f/a/k/r.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/l/a.smali b/com.discord/smali/f/a/l/a.smali
index 2e11be9ecd..cfd88138ed 100644
--- a/com.discord/smali/f/a/l/a.smali
+++ b/com.discord/smali/f/a/l/a.smali
@@ -11,11 +11,19 @@
 .method public constructor <init>()V
     .locals 2
 
-    const/4 v0, 0x0
+    sget-object v0, Lcom/discord/utilities/cache/SharedPreferencesProvider;->INSTANCE:Lcom/discord/utilities/cache/SharedPreferencesProvider;
 
-    const/4 v1, 0x1
+    invoke-virtual {v0}, Lcom/discord/utilities/cache/SharedPreferencesProvider;->get()Landroid/content/SharedPreferences;
 
-    invoke-direct {p0, v0, v1}, Lf/a/l/a;-><init>(Landroid/content/SharedPreferences;I)V
+    move-result-object v0
+
+    const-string v1, "sharedPreferences"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v0, p0, Lf/a/l/a;->a:Landroid/content/SharedPreferences;
 
     return-void
 .end method
@@ -25,8 +33,6 @@
 
     and-int/lit8 p1, p2, 0x1
 
-    const/4 p2, 0x0
-
     if-eqz p1, :cond_0
 
     sget-object p1, Lcom/discord/utilities/cache/SharedPreferencesProvider;->INSTANCE:Lcom/discord/utilities/cache/SharedPreferencesProvider;
@@ -38,21 +44,16 @@
     goto :goto_0
 
     :cond_0
-    move-object p1, p2
+    const/4 p1, 0x0
 
     :goto_0
-    if-eqz p1, :cond_1
+    const-string p2, "sharedPreferences"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lf/a/l/a;->a:Landroid/content/SharedPreferences;
 
     return-void
-
-    :cond_1
-    const-string p1, "sharedPreferences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
diff --git a/com.discord/smali/f/a/l/c.smali b/com.discord/smali/f/a/l/c.smali
index 38df000620..74c0881999 100644
--- a/com.discord/smali/f/a/l/c.smali
+++ b/com.discord/smali/f/a/l/c.smali
@@ -34,7 +34,9 @@
 .method public onAnimationEnd(Landroid/graphics/drawable/Drawable;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "drawable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/l/c;->a:Lf/a/l/d;
 
@@ -47,13 +49,4 @@
     invoke-virtual {p1, v0, v1, v2}, Landroid/widget/FrameLayout;->postDelayed(Ljava/lang/Runnable;J)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "drawable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/l/d.smali b/com.discord/smali/f/a/l/d.smali
index 85a9e565c0..1eaede1fb2 100644
--- a/com.discord/smali/f/a/l/d.smali
+++ b/com.discord/smali/f/a/l/d.smali
@@ -19,25 +19,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/l/d;
 
-    const-class v2, Lf/a/l/d;
+    const-string v2, "sparkleImage"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSparkleImage()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "sparkleImage"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSparkleImage()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lf/a/l/d;->e:[Lkotlin/reflect/KProperty;
 
@@ -47,9 +41,13 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a0921
+    const p1, 0x7f0a0925
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -77,7 +75,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f080512
+    const v0, 0x7f080516
 
     invoke-static {p1, v0}, Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;->create(Landroid/content/Context;I)Landroidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat;
 
@@ -87,7 +85,7 @@
 
     const-string v0, "AnimatedVectorDrawableCo\u2026ed_vector\n    ) ?: return"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lf/a/l/d;->getSparkleImage()Landroid/widget/ImageView;
 
diff --git a/com.discord/smali/f/a/n/a0.smali b/com.discord/smali/f/a/n/a0.smali
index 0b97c773ab..28499edded 100644
--- a/com.discord/smali/f/a/n/a0.smali
+++ b/com.discord/smali/f/a/n/a0.smali
@@ -3,7 +3,7 @@
 .source "OverlayVoiceBubble.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/f/a/n/b0$a.smali b/com.discord/smali/f/a/n/b0$a.smali
index 4b0408a628..d3d9288f22 100644
--- a/com.discord/smali/f/a/n/b0$a.smali
+++ b/com.discord/smali/f/a/n/b0$a.smali
@@ -3,7 +3,7 @@
 .source "OverlayVoiceBubble.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,9 +83,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -97,7 +99,7 @@
 
     const-string v1, "channelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -109,7 +111,7 @@
 
     sget-object v0, Lf/a/n/a0;->d:Lf/a/n/a0;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/n/b0$b.smali b/com.discord/smali/f/a/n/b0$b.smali
index 0c2abde873..17978395cb 100644
--- a/com.discord/smali/f/a/n/b0$b.smali
+++ b/com.discord/smali/f/a/n/b0$b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/b0$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayVoiceBubble.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/b0.smali b/com.discord/smali/f/a/n/b0.smali
index 773e0578a5..6499462776 100644
--- a/com.discord/smali/f/a/n/b0.smali
+++ b/com.discord/smali/f/a/n/b0.smali
@@ -33,25 +33,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/n/b0;
 
-    const-class v2, Lf/a/n/b0;
+    const-string v2, "imageView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "imageView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lf/a/n/b0;->u:[Lkotlin/reflect/KProperty;
 
@@ -61,6 +55,10 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;-><init>(Landroid/content/Context;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
@@ -77,11 +75,11 @@
 
     const-string v0, "PublishSubject.create()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lf/a/n/b0;->s:Lrx/subjects/Subject;
 
-    const p1, 0x7f0a066c
+    const p1, 0x7f0a0672
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,24 +139,17 @@
 .end method
 
 .method public d(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "targetView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->d(Landroid/view/View;)V
 
     invoke-virtual {p0}, Lf/a/n/b0;->k()V
 
     return-void
-
-    :cond_0
-    const-string p1, "targetView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getImageView$app_productionDiscordExternalRelease()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -181,7 +172,7 @@
     return-object v0
 .end method
 
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -271,13 +262,13 @@
 
     sget-object v1, Lf/a/n/b0$a;->d:Lf/a/n/b0$a;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n        .get\u2026d()\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -383,13 +374,13 @@
 .method public onDetachedFromWindow()V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/n/b0;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lf/a/n/b0;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-super {p0}, Landroid/widget/FrameLayout;->onDetachedFromWindow()V
 
diff --git a/com.discord/smali/f/a/n/c.smali b/com.discord/smali/f/a/n/c.smali
index 965d3c46f1..7fb8860040 100644
--- a/com.discord/smali/f/a/n/c.smali
+++ b/com.discord/smali/f/a/n/c.smali
@@ -28,7 +28,7 @@
 
     const-string p1, "event"
 
-    invoke-static {p3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Landroid/view/KeyEvent;->getAction()I
 
diff --git a/com.discord/smali/f/a/n/c0.smali b/com.discord/smali/f/a/n/c0.smali
index 2e5aea6dc9..4142210e94 100644
--- a/com.discord/smali/f/a/n/c0.smali
+++ b/com.discord/smali/f/a/n/c0.smali
@@ -55,11 +55,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/n/c0;->a:Lf/a/n/e0;
 
@@ -71,7 +73,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -101,18 +103,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/n/d.smali b/com.discord/smali/f/a/n/d.smali
index 77debc15c1..d9d56b3950 100644
--- a/com.discord/smali/f/a/n/d.smali
+++ b/com.discord/smali/f/a/n/d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CodeVerificationView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Ljava/lang/String;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/d0.smali b/com.discord/smali/f/a/n/d0.smali
index 90b25565f6..686cb39f04 100644
--- a/com.discord/smali/f/a/n/d0.smali
+++ b/com.discord/smali/f/a/n/d0.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/d0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayVoiceSelectorBubbleDialog.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Landroid/view/View;",
         "Ljava/lang/Integer;",
@@ -37,7 +37,7 @@
 
     const/4 p1, 0x4
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,11 +59,13 @@
 
     invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
 
-    const/4 p2, 0x0
+    const-string/jumbo p2, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string p2, "data"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of p2, p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
@@ -75,9 +77,9 @@
 
     move-result-object p1
 
-    const-string p4, "view.context"
+    const-string/jumbo p4, "view.context"
 
-    invoke-static {p1, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
@@ -99,18 +101,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
diff --git a/com.discord/smali/f/a/n/e0$b.smali b/com.discord/smali/f/a/n/e0$b.smali
index 0841711ae9..1c77e9e83b 100644
--- a/com.discord/smali/f/a/n/e0$b.smali
+++ b/com.discord/smali/f/a/n/e0$b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/e0$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayVoiceSelectorBubbleDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Landroid/text/Editable;
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/n/e0$b;->this$0:Lf/a/n/e0;
 
@@ -66,13 +68,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/e0$c.smali b/com.discord/smali/f/a/n/e0$c.smali
index 2d2b6b9a3e..5dee4580db 100644
--- a/com.discord/smali/f/a/n/e0$c.smali
+++ b/com.discord/smali/f/a/n/e0$c.smali
@@ -3,7 +3,7 @@
 .source "OverlayVoiceSelectorBubbleDialog.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/f/a/n/e0$d.smali b/com.discord/smali/f/a/n/e0$d.smali
index 34935c8677..228e83b015 100644
--- a/com.discord/smali/f/a/n/e0$d.smali
+++ b/com.discord/smali/f/a/n/e0$d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/e0$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayVoiceSelectorBubbleDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/n/e0$d;->this$0:Lf/a/n/e0;
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/e0.smali b/com.discord/smali/f/a/n/e0.smali
index f30dfd342d..7df152761c 100644
--- a/com.discord/smali/f/a/n/e0.smali
+++ b/com.discord/smali/f/a/n/e0.smali
@@ -42,81 +42,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/n/e0;
 
-    const-class v2, Lf/a/n/e0;
+    const-string v2, "closeBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCloseBtn()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "closeBtn"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCloseBtn()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/n/e0;
 
-    const/4 v2, 0x0
+    const-string v2, "filterEt"
 
-    aput-object v1, v0, v2
+    const-string v3, "getFilterEt()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/n/e0;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "filterEt"
-
-    const-string v4, "getFilterEt()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/n/e0;
 
-    const-class v2, Lf/a/n/e0;
+    const-string v2, "emptyResults"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptyResults()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptyResults"
-
-    const-string v4, "getEmptyResults()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/n/e0;
 
-    const-class v2, Lf/a/n/e0;
+    const-string v2, "resultsRv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getResultsRv()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "resultsRv"
-
-    const-string v4, "getResultsRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -130,6 +106,10 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Lf/a/n/i;-><init>(Landroid/content/Context;)V
 
     invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getWindowLayoutParams()Landroid/view/WindowManager$LayoutParams;
@@ -154,7 +134,7 @@
 
     invoke-static {p1, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0272
+    const p1, 0x7f0a0275
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -162,7 +142,7 @@
 
     iput-object p1, p0, Lf/a/n/e0;->u:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a066e
+    const p1, 0x7f0a0674
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -170,7 +150,7 @@
 
     iput-object p1, p0, Lf/a/n/e0;->v:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0339
+    const p1, 0x7f0a033f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -178,7 +158,7 @@
 
     iput-object p1, p0, Lf/a/n/e0;->w:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0749
+    const p1, 0x7f0a074f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -442,7 +422,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a02cf
+    const v1, 0x7f0a02d5
 
     invoke-virtual {p0, v1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -452,7 +432,7 @@
 
     const-string v1, "AnimatorInflater.loadAni\u2026(R.id.dialog_card))\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -529,13 +509,13 @@
 
     sget-object v2, Lf/a/n/e0$c;->d:Lf/a/n/e0$c;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "filterPublisher.map { \"!$it\" }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getForNav(Lrx/Observable;)Lrx/Observable;
 
@@ -587,7 +567,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a02cf
+    const v1, 0x7f0a02d5
 
     invoke-virtual {p0, v1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
 
@@ -605,17 +585,23 @@
 
     invoke-super {p0, p1}, Lcom/discord/overlay/views/OverlayDialog;->onConfigurationChanged(Landroid/content/res/Configuration;)V
 
-    invoke-virtual {p0}, Lf/a/n/i;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lf/a/n/i;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object p1
 
     const/4 v0, 0x0
 
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
-    sget-object p1, Ll0/i;->b:Ll0/i;
+    const-string p1, "target"
 
-    sget-object p1, Ll0/i;->a:Ljava/util/WeakHashMap;
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lm0/i;->b:Lm0/i;
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p1, Lm0/i;->a:Ljava/util/WeakHashMap;
 
     invoke-virtual {p1, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -640,16 +626,16 @@
 
     move-result-object v0
 
-    check-cast v0, Ll0/h;
+    check-cast v0, Lm0/h;
 
-    sget-object v1, Ll0/h$a;->a:Ll0/h$a;
+    sget-object v1, Lm0/h$a;->a:Lm0/h$a;
 
-    iput-object v1, v0, Ll0/h;->a:Ljava/lang/Object;
+    iput-object v1, v0, Lm0/h;->a:Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_0
-    sget-object p1, Ll0/i;->a:Ljava/util/WeakHashMap;
+    sget-object p1, Lm0/i;->a:Ljava/util/WeakHashMap;
 
     invoke-virtual {p1, p0}, Ljava/util/WeakHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/f/a/n/f.smali b/com.discord/smali/f/a/n/f.smali
index 607f600c93..3132fbdace 100644
--- a/com.discord/smali/f/a/n/f.smali
+++ b/com.discord/smali/f/a/n/f.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/f;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OAuthPermissionViews.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -41,7 +41,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,11 +55,13 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const/4 v0, 0x0
+    const-string v0, "inflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00a5
 
@@ -73,23 +75,9 @@
 
     const-string v0, "holderView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/views/OAuthPermissionViews$a;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/n/f0.smali b/com.discord/smali/f/a/n/f0.smali
index e1c00439d9..d5a0153740 100644
--- a/com.discord/smali/f/a/n/f0.smali
+++ b/com.discord/smali/f/a/n/f0.smali
@@ -35,7 +35,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0a073d
+    const v0, 0x7f0a0743
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -45,7 +45,7 @@
 
     iput-object v0, p0, Lf/a/n/f0;->d:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
-    const v0, 0x7f0a073c
+    const v0, 0x7f0a0742
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +55,7 @@
 
     iput-object v0, p0, Lf/a/n/f0;->e:Landroid/widget/TextSwitcher;
 
-    const v0, 0x7f0a073a
+    const v0, 0x7f0a0740
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,7 +65,7 @@
 
     iput-object v0, p0, Lf/a/n/f0;->f:Landroid/widget/TextView;
 
-    const v0, 0x7f0a073b
+    const v0, 0x7f0a0741
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/f/a/n/g0.smali b/com.discord/smali/f/a/n/g0.smali
index 83fc4abcf9..fb273a0065 100644
--- a/com.discord/smali/f/a/n/g0.smali
+++ b/com.discord/smali/f/a/n/g0.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/g0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceUserLimitView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroid/graphics/drawable/Drawable;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -53,13 +53,13 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
 
     move-result-object v1
 
-    const v2, 0x7f08042e
+    const v2, 0x7f080431
 
     invoke-virtual {v0, v2, v1}, Landroid/content/res/Resources;->getDrawable(ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
 
diff --git a/com.discord/smali/f/a/n/h0.smali b/com.discord/smali/f/a/n/h0.smali
index 2fc735ac01..2996a23d44 100644
--- a/com.discord/smali/f/a/n/h0.smali
+++ b/com.discord/smali/f/a/n/h0.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/h0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceUserView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/graphics/Bitmap;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/graphics/Bitmap;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/i$a.smali b/com.discord/smali/f/a/n/i$a.smali
index 37d3f3579e..ee7a00139d 100644
--- a/com.discord/smali/f/a/n/i$a.smali
+++ b/com.discord/smali/f/a/n/i$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/a/n/i;
+.field public final synthetic a:Lf/a/n/i;
 
 
 # direct methods
 .method public constructor <init>(Lf/a/n/i;)V
     .locals 0
 
-    iput-object p1, p0, Lf/a/n/i$a;->d:Lf/a/n/i;
+    iput-object p1, p0, Lf/a/n/i$a;->a:Lf/a/n/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,79 +35,51 @@
 
 # virtual methods
 .method public onAnimationCancel(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
 
-    iget-object p1, p0, Lf/a/n/i$a;->d:Lf/a/n/i;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lf/a/n/i$a;->a:Lf/a/n/i;
 
     invoke-virtual {p1}, Lf/a/n/i;->getOnDialogClosed()Lkotlin/jvm/functions/Function1;
 
     move-result-object p1
 
-    iget-object v0, p0, Lf/a/n/i$a;->d:Lf/a/n/i;
+    iget-object v0, p0, Lf/a/n/i$a;->a:Lf/a/n/i;
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/animation/Animator;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/i.smali b/com.discord/smali/f/a/n/i.smali
index 205c5dad4b..83ac98dc98 100644
--- a/com.discord/smali/f/a/n/i.smali
+++ b/com.discord/smali/f/a/n/i.smali
@@ -35,6 +35,10 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Lcom/discord/overlay/views/OverlayDialog;-><init>(Landroid/content/Context;)V
 
     invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
@@ -43,7 +47,7 @@
 
     const-string v0, "PublishSubject.create()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lf/a/n/i;->s:Lrx/subjects/Subject;
 
@@ -82,7 +86,7 @@
     return-object v0
 .end method
 
-.method public getPaused()Lrx/subjects/Subject;
+.method public getUnsubscribeSignal()Lrx/subjects/Subject;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -102,13 +106,13 @@
 .method public final j()V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/n/i;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lf/a/n/i;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -159,13 +163,13 @@
 .method public onDetachedFromWindow()V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/n/i;->getPaused()Lrx/subjects/Subject;
+    invoke-virtual {p0}, Lf/a/n/i;->getUnsubscribeSignal()Lrx/subjects/Subject;
 
     move-result-object v0
 
     const/4 v1, 0x0
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-super {p0}, Landroid/widget/FrameLayout;->onDetachedFromWindow()V
 
@@ -173,7 +177,7 @@
 .end method
 
 .method public final setOnDialogClosed(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -185,18 +189,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lf/a/n/i;->t:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/i0.smali b/com.discord/smali/f/a/n/i0.smali
index 4c9d635828..0b985da523 100644
--- a/com.discord/smali/f/a/n/i0.smali
+++ b/com.discord/smali/f/a/n/i0.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/i0;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VoiceUserView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/j.smali b/com.discord/smali/f/a/n/j.smali
index 9e8b546619..a4788b5e1e 100644
--- a/com.discord/smali/f/a/n/j.smali
+++ b/com.discord/smali/f/a/n/j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayAppDialog.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/overlay/views/OverlayDialog;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/discord/overlay/views/OverlayDialog;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/j0.smali b/com.discord/smali/f/a/n/j0.smali
index 28a3ddebe4..a9959ce717 100644
--- a/com.discord/smali/f/a/n/j0.smali
+++ b/com.discord/smali/f/a/n/j0.smali
@@ -46,7 +46,7 @@
 
     const-string v1, "bitmap.copy(Bitmap.Config.ARGB_8888, false)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/f/a/n/k.smali b/com.discord/smali/f/a/n/k.smali
index 5544852ea0..e0303069af 100644
--- a/com.discord/smali/f/a/n/k.smali
+++ b/com.discord/smali/f/a/n/k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuBubbleDialog.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/k0/a.smali b/com.discord/smali/f/a/n/k0/a.smali
index a2b75581e2..d340468c27 100644
--- a/com.discord/smali/f/a/n/k0/a.smali
+++ b/com.discord/smali/f/a/n/k0/a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/b.smali b/com.discord/smali/f/a/n/k0/b.smali
index 64006d12f2..1f399bc1ec 100644
--- a/com.discord/smali/f/a/n/k0/b.smali
+++ b/com.discord/smali/f/a/n/k0/b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/c.smali b/com.discord/smali/f/a/n/k0/c.smali
index bab1d55f16..782d17e855 100644
--- a/com.discord/smali/f/a/n/k0/c.smali
+++ b/com.discord/smali/f/a/n/k0/c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/d.smali b/com.discord/smali/f/a/n/k0/d.smali
index 6d1e888435..4e72b3ea67 100644
--- a/com.discord/smali/f/a/n/k0/d.smali
+++ b/com.discord/smali/f/a/n/k0/d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "GuildChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/e.smali b/com.discord/smali/f/a/n/k0/e.smali
index 0a73fffb3b..04e33972d6 100644
--- a/com.discord/smali/f/a/n/k0/e.smali
+++ b/com.discord/smali/f/a/n/k0/e.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/k0/f.smali b/com.discord/smali/f/a/n/k0/f.smali
index e1157744f5..51337b8efb 100644
--- a/com.discord/smali/f/a/n/k0/f.smali
+++ b/com.discord/smali/f/a/n/k0/f.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/k0/g.smali b/com.discord/smali/f/a/n/k0/g.smali
index 278650c5d5..abdae8de28 100644
--- a/com.discord/smali/f/a/n/k0/g.smali
+++ b/com.discord/smali/f/a/n/k0/g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/h.smali b/com.discord/smali/f/a/n/k0/h.smali
index 41244ab6ac..7c298cad60 100644
--- a/com.discord/smali/f/a/n/k0/h.smali
+++ b/com.discord/smali/f/a/n/k0/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/i.smali b/com.discord/smali/f/a/n/k0/i.smali
index 498b1d03a0..8d618ac1c1 100644
--- a/com.discord/smali/f/a/n/k0/i.smali
+++ b/com.discord/smali/f/a/n/k0/i.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/i;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/j.smali b/com.discord/smali/f/a/n/k0/j.smali
index a6310c485c..f4c1330dba 100644
--- a/com.discord/smali/f/a/n/k0/j.smali
+++ b/com.discord/smali/f/a/n/k0/j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/k0/j;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateChannelSideBarActionsView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/k0/k.smali b/com.discord/smali/f/a/n/k0/k.smali
index 8416b86576..c04b3dba36 100644
--- a/com.discord/smali/f/a/n/k0/k.smali
+++ b/com.discord/smali/f/a/n/k0/k.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/k0/l.smali b/com.discord/smali/f/a/n/k0/l.smali
index a02bb71d09..804a413de5 100644
--- a/com.discord/smali/f/a/n/k0/l.smali
+++ b/com.discord/smali/f/a/n/k0/l.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/l$a.smali b/com.discord/smali/f/a/n/l$a.smali
index 24335ea2af..2b9d691f58 100644
--- a/com.discord/smali/f/a/n/l$a.smali
+++ b/com.discord/smali/f/a/n/l$a.smali
@@ -28,7 +28,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
@@ -46,7 +50,9 @@
 
     check-cast p1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/n/l$a;->a:Lcom/discord/views/VoiceUserView;
 
@@ -55,13 +61,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/l$b.smali b/com.discord/smali/f/a/n/l$b.smali
index 3c544890ea..fb293d0701 100644
--- a/com.discord/smali/f/a/n/l$b.smali
+++ b/com.discord/smali/f/a/n/l$b.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuBubbleDialog.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -79,11 +83,11 @@
 
     if-nez v4, :cond_1
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -97,7 +101,7 @@
 
     const-string v1, "channelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -109,7 +113,7 @@
 
     sget-object v0, Lf/a/n/n;->d:Lf/a/n/n;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/n/l$c.smali b/com.discord/smali/f/a/n/l$c.smali
index 0066cf96a4..3e20b4725d 100644
--- a/com.discord/smali/f/a/n/l$c.smali
+++ b/com.discord/smali/f/a/n/l$c.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuBubbleDialog.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,19 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;+",
+        "Ljava/lang/Integer;",
+        ">;>;"
     }
 .end annotation
 
@@ -62,9 +73,9 @@
 
     check-cast p1, Ljava/util/List;
 
-    const-string v0, "voiceUsers"
+    const-string/jumbo v0, "voiceUsers"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -128,7 +139,7 @@
 
     :cond_3
     :goto_1
-    invoke-static {v0, v1}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
diff --git a/com.discord/smali/f/a/n/l$d.smali b/com.discord/smali/f/a/n/l$d.smali
index 89ab9e08de..4db2ecef5d 100644
--- a/com.discord/smali/f/a/n/l$d.smali
+++ b/com.discord/smali/f/a/n/l$d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/l$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuBubbleDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/l.smali b/com.discord/smali/f/a/n/l.smali
index 8e38b3c32e..18418dd278 100644
--- a/com.discord/smali/f/a/n/l.smali
+++ b/com.discord/smali/f/a/n/l.smali
@@ -47,81 +47,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/n/l;
 
-    const-class v2, Lf/a/n/l;
+    const-string v2, "overlayMenu"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOverlayMenu()Lcom/discord/views/OverlayMenuView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "overlayMenu"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getOverlayMenu()Lcom/discord/views/OverlayMenuView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lf/a/n/l;
 
-    const/4 v2, 0x0
+    const-string v2, "header"
 
-    aput-object v1, v0, v2
+    const-string v3, "getHeader()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lf/a/n/l;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "header"
-
-    const-string v4, "getHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/n/l;
 
-    const-class v2, Lf/a/n/l;
+    const-string v2, "overflowTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOverflowTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "overflowTv"
-
-    const-string v4, "getOverflowTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lf/a/n/l;
 
-    const-class v2, Lf/a/n/l;
+    const-string v2, "membersRv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMembersRv()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "membersRv"
-
-    const-string v4, "getMembersRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -135,6 +111,10 @@
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 3
 
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Lf/a/n/i;-><init>(Landroid/content/Context;)V
 
     invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
@@ -149,7 +129,7 @@
 
     invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->setClipChildren(Z)V
 
-    const p1, 0x7f0a0675
+    const p1, 0x7f0a067b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +137,7 @@
 
     iput-object p1, p0, Lf/a/n/l;->u:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0670
+    const p1, 0x7f0a0676
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +145,7 @@
 
     iput-object p1, p0, Lf/a/n/l;->v:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0673
+    const p1, 0x7f0a0679
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -173,7 +153,7 @@
 
     iput-object p1, p0, Lf/a/n/l;->w:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0674
+    const p1, 0x7f0a067a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,11 +165,11 @@
 
     sget-object v0, Lf/a/n/m;->d:Lf/a/n/m;
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    invoke-direct {p1, v2, v0, v1, v2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p1, v1, v0, v2, v1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lf/a/n/l;->y:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
@@ -509,19 +489,19 @@
 
     sget-object v2, Lf/a/n/l$b;->d:Lf/a/n/l$b;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     sget-object v2, Lf/a/n/l$c;->d:Lf/a/n/l$c;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v2, "StoreStream\n        .get\u2026- 3\n          }\n        }"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali/f/a/n/m.smali b/com.discord/smali/f/a/n/m.smali
index 6ed0265d4c..72011aecef 100644
--- a/com.discord/smali/f/a/n/m.smali
+++ b/com.discord/smali/f/a/n/m.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/m;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuBubbleDialog.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -41,7 +41,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,11 +55,13 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const/4 v0, 0x0
+    const-string v0, "layoutInflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00a7
 
@@ -73,23 +75,9 @@
 
     const-string v0, "itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lf/a/n/l$a;-><init>(Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "layoutInflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/n/m0/a.smali b/com.discord/smali/f/a/n/m0/a.smali
index 2d836ff718..47d7ce354c 100644
--- a/com.discord/smali/f/a/n/m0/a.smali
+++ b/com.discord/smali/f/a/n/m0/a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/m0/a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TypingDots.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/n.smali b/com.discord/smali/f/a/n/n.smali
index c60cff9411..f81761353e 100644
--- a/com.discord/smali/f/a/n/n.smali
+++ b/com.discord/smali/f/a/n/n.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuBubbleDialog.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/f/a/n/n0/a.smali b/com.discord/smali/f/a/n/n0/a.smali
index 829cb7c765..4c29224b8c 100644
--- a/com.discord/smali/f/a/n/n0/a.smali
+++ b/com.discord/smali/f/a/n/n0/a.smali
@@ -3,7 +3,7 @@
 .source "AppVideoStreamRenderer.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,10 +15,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Unit;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Landroid/graphics/Point;",
+        ">;>;"
     }
 .end annotation
 
@@ -59,7 +61,7 @@
 
     sget-object v0, Lf/a/n/n0/f;->d:Lf/a/n/n0/f;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -69,7 +71,7 @@
 
     const-string v0, "frameResolutionSubject\n \u2026  .onBackpressureLatest()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/f/a/n/n0/b.smali b/com.discord/smali/f/a/n/n0/b.smali
index 2cef8f391c..c442aa5824 100644
--- a/com.discord/smali/f/a/n/n0/b.smali
+++ b/com.discord/smali/f/a/n/n0/b.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/n0/b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppVideoStreamRenderer.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/graphics/Point;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Landroid/graphics/Point;
 
-    if-eqz p1, :cond_0
+    const-string v0, "resolution"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/n/n0/b;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
 
@@ -53,13 +55,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "resolution"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/n0/c.smali b/com.discord/smali/f/a/n/n0/c.smali
index e97727a829..becb272255 100644
--- a/com.discord/smali/f/a/n/n0/c.smali
+++ b/com.discord/smali/f/a/n/n0/c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/n0/c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AppVideoStreamRenderer.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Lrx/Subscription;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/n/n0/c;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
 
@@ -51,13 +53,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/n0/f.smali b/com.discord/smali/f/a/n/n0/f.smali
index f244194721..077cf257f3 100644
--- a/com.discord/smali/f/a/n/n0/f.smali
+++ b/com.discord/smali/f/a/n/n0/f.smali
@@ -3,7 +3,7 @@
 .source "RxRendererEvents.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lf/a/n/n0/e$a;",
+        "Landroid/graphics/Point;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/f/a/n/n0/g.smali b/com.discord/smali/f/a/n/n0/g.smali
index 071626bce2..847d4ff5c2 100644
--- a/com.discord/smali/f/a/n/n0/g.smali
+++ b/com.discord/smali/f/a/n/n0/g.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/n0/g;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VideoCallParticipantView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -40,7 +40,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -48,22 +48,15 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Ljava/lang/String;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/n0/h.smali b/com.discord/smali/f/a/n/n0/h.smali
index 4ca7d226e1..e140d551c7 100644
--- a/com.discord/smali/f/a/n/n0/h.smali
+++ b/com.discord/smali/f/a/n/n0/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/n0/h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "VideoCallParticipantView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/graphics/Bitmap;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Landroid/graphics/Bitmap;
 
-    if-eqz p1, :cond_0
+    const-string v0, "bitmap"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors;
 
@@ -61,13 +63,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "bitmap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/n0/i.smali b/com.discord/smali/f/a/n/n0/i.smali
index 04a512e7ba..3e0dcfcca3 100644
--- a/com.discord/smali/f/a/n/n0/i.smali
+++ b/com.discord/smali/f/a/n/n0/i.smali
@@ -3,7 +3,7 @@
 .source "VideoCallParticipantView.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,7 +15,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/f/a/n/n0/l.smali b/com.discord/smali/f/a/n/n0/l.smali
index 456608a51f..5b8f4fb656 100644
--- a/com.discord/smali/f/a/n/n0/l.smali
+++ b/com.discord/smali/f/a/n/n0/l.smali
@@ -46,7 +46,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/views/video/VideoCallParticipantView;->b(Lcom/discord/views/video/VideoCallParticipantView;Landroid/graphics/Point;)V
 
diff --git a/com.discord/smali/f/a/n/o$a.smali b/com.discord/smali/f/a/n/o$a.smali
index 9e6ef73d7f..5101f98cd9 100644
--- a/com.discord/smali/f/a/n/o$a.smali
+++ b/com.discord/smali/f/a/n/o$a.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuView.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
         ">;"
diff --git a/com.discord/smali/f/a/n/o$b.smali b/com.discord/smali/f/a/n/o$b.smali
index 7efaffc99d..ff8e80101c 100644
--- a/com.discord/smali/f/a/n/o$b.smali
+++ b/com.discord/smali/f/a/n/o$b.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuView.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/models/domain/ModelInvite;",
+        ">;>;"
     }
 .end annotation
 
@@ -72,7 +74,7 @@
 
     const-string v0, "channelId"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/f/a/n/o$c.smali b/com.discord/smali/f/a/n/o$c.smali
index 220405f007..867c1d4350 100644
--- a/com.discord/smali/f/a/n/o$c.smali
+++ b/com.discord/smali/f/a/n/o$c.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/o$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,9 +51,9 @@
 
     check-cast p1, Lcom/discord/utilities/error/Error;
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/a/n/o$c;->this$0:Lf/a/n/o;
 
@@ -63,22 +63,17 @@
 
     move-result-object p1
 
-    const v1, 0x7f120c8f
+    const v0, 0x7f120cb5
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v1, v2, v0, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/f/a/n/o$d.smali b/com.discord/smali/f/a/n/o$d.smali
index 2d2f1d3309..4f9f13122a 100644
--- a/com.discord/smali/f/a/n/o$d.smali
+++ b/com.discord/smali/f/a/n/o$d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/o$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelInvite;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lf/a/n/o$d;->this$0:Lf/a/n/o;
 
@@ -83,11 +83,11 @@
 
     const-string v1, "invite.toLink(resources, BuildConfig.HOST_INVITE)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f120d3c
+    const v1, 0x7f120d62
 
-    invoke-static {v0, p1, v1}, Lf/a/b/n;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+    invoke-static {v0, p1, v1}, Lf/a/b/p;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
     iget-object p1, p0, Lf/a/n/o$d;->this$0:Lf/a/n/o;
 
diff --git a/com.discord/smali/f/a/n/o.smali b/com.discord/smali/f/a/n/o.smali
index 9e88e17a0a..3d82aa00b0 100644
--- a/com.discord/smali/f/a/n/o.smali
+++ b/com.discord/smali/f/a/n/o.smali
@@ -38,13 +38,13 @@
 
     sget-object v0, Lf/a/n/o$a;->d:Lf/a/n/o$a;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string p1, "StoreStream\n          .g\u2026       .filter { it > 0 }"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v2, 0x3e8
 
@@ -60,13 +60,13 @@
 
     sget-object v0, Lf/a/n/o$b;->d:Lf/a/n/o$b;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "StoreStream\n          .g\u2026te(channelId)\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/a/n/o;->d:Lcom/discord/views/OverlayMenuView;
 
diff --git a/com.discord/smali/f/a/n/p.smali b/com.discord/smali/f/a/n/p.smali
index 5d54d2ce9d..08782493bb 100644
--- a/com.discord/smali/f/a/n/p.smali
+++ b/com.discord/smali/f/a/n/p.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuView.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,10 +15,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
@@ -63,7 +65,7 @@
 
     const-string v1, "channelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/f/a/n/q.smali b/com.discord/smali/f/a/n/q.smali
index bad68233bf..2c348bb055 100644
--- a/com.discord/smali/f/a/n/q.smali
+++ b/com.discord/smali/f/a/n/q.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuView.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/f/a/n/r.smali b/com.discord/smali/f/a/n/r.smali
index b699a309dd..132c754170 100644
--- a/com.discord/smali/f/a/n/r.smali
+++ b/com.discord/smali/f/a/n/r.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/r;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     const-string v1, "canSendInvites"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali/f/a/n/s.smali b/com.discord/smali/f/a/n/s.smali
index c4763abaf9..56b4232e2c 100644
--- a/com.discord/smali/f/a/n/s.smali
+++ b/com.discord/smali/f/a/n/s.smali
@@ -18,7 +18,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/rtcconnection/RtcConnection$Quality;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/views/OverlayMenuView$b;",
+        ">;"
     }
 .end annotation
 
@@ -41,15 +44,17 @@
 
 # virtual methods
 .method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 3
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     check-cast p2, Lcom/discord/models/domain/ModelGuild;
 
-    sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils;->INSTANCE:Lcom/discord/utilities/voice/VoiceViewUtils;
+    new-instance v0, Lcom/discord/views/OverlayMenuView$b;
 
-    invoke-virtual {v0, p1}, Lcom/discord/utilities/voice/VoiceViewUtils;->getQualityIndicator(Lcom/discord/rtcconnection/RtcConnection$Quality;)I
+    sget-object v1, Lcom/discord/utilities/voice/VoiceViewUtils;->INSTANCE:Lcom/discord/utilities/voice/VoiceViewUtils;
+
+    invoke-virtual {v1, p1}, Lcom/discord/utilities/voice/VoiceViewUtils;->getQualityIndicator(Lcom/discord/rtcconnection/RtcConnection$Quality;)I
 
     move-result p1
 
@@ -73,19 +78,17 @@
     const-string p2, ""
 
     :goto_1
-    iget-object v0, p0, Lf/a/n/s;->d:Lcom/discord/models/domain/ModelChannel;
+    iget-object v1, p0, Lf/a/n/s;->d:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    const-string v1, "channel.name"
+    const-string v2, "channel.name"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/discord/views/OverlayMenuView$b;
+    invoke-direct {v0, p1, p2, v1}, Lcom/discord/views/OverlayMenuView$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
-    invoke-direct {v1, p1, p2, v0}, Lcom/discord/views/OverlayMenuView$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
-
-    return-object v1
+    return-object v0
 .end method
diff --git a/com.discord/smali/f/a/n/t.smali b/com.discord/smali/f/a/n/t.smali
index d4e1e060f8..a6385130fe 100644
--- a/com.discord/smali/f/a/n/t.smali
+++ b/com.discord/smali/f/a/n/t.smali
@@ -3,7 +3,7 @@
 .source "OverlayMenuView.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,10 +15,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/views/OverlayMenuView$b;",
+        ">;>;"
     }
 .end annotation
 
@@ -59,9 +61,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -88,7 +90,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali/f/a/n/u.smali b/com.discord/smali/f/a/n/u.smali
index 293f21d8d2..e252cb7276 100644
--- a/com.discord/smali/f/a/n/u.smali
+++ b/com.discord/smali/f/a/n/u.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/u;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/views/OverlayMenuView$b;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -55,7 +55,7 @@
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f080437
+    const v1, 0x7f08043a
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
diff --git a/com.discord/smali/f/a/n/w.smali b/com.discord/smali/f/a/n/w.smali
index ffadfda706..51019b19ff 100644
--- a/com.discord/smali/f/a/n/w.smali
+++ b/com.discord/smali/f/a/n/w.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lf/a/n/w;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "OverlayMenuView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Boolean;",
         "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
@@ -37,45 +37,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x2
+    const-class v2, Lcom/discord/views/OverlayMenuView$a;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(ZLcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/views/OverlayMenuView$a;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(ZLcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
@@ -87,20 +69,13 @@
 
     check-cast p2, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/views/OverlayMenuView$a;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/views/OverlayMenuView$a;-><init>(ZLcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/f/a/n/x.smali b/com.discord/smali/f/a/n/x.smali
index e1aa59f791..aa2b00bff0 100644
--- a/com.discord/smali/f/a/n/x.smali
+++ b/com.discord/smali/f/a/n/x.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/x;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/views/OverlayMenuView$a;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/n/y.smali b/com.discord/smali/f/a/n/y.smali
index 04642c5a32..6954c7d5c1 100644
--- a/com.discord/smali/f/a/n/y.smali
+++ b/com.discord/smali/f/a/n/y.smali
@@ -1,5 +1,5 @@
 .class public final Lf/a/n/y;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "OverlayMenuView.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/o/a/b1.smali b/com.discord/smali/f/a/o/a/b1.smali
index 41296ad2fc..b0a58571d9 100644
--- a/com.discord/smali/f/a/o/a/b1.smali
+++ b/com.discord/smali/f/a/o/a/b1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/e0.smali b/com.discord/smali/f/a/o/a/e0.smali
index 98963a35bc..710344e337 100644
--- a/com.discord/smali/f/a/o/a/e0.smali
+++ b/com.discord/smali/f/a/o/a/e0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/f0.smali b/com.discord/smali/f/a/o/a/f0.smali
index c3bdc39eb8..b4a897e336 100644
--- a/com.discord/smali/f/a/o/a/f0.smali
+++ b/com.discord/smali/f/a/o/a/f0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/g0.smali b/com.discord/smali/f/a/o/a/g0.smali
index 2460fe2597..e186090825 100644
--- a/com.discord/smali/f/a/o/a/g0.smali
+++ b/com.discord/smali/f/a/o/a/g0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/h0.smali b/com.discord/smali/f/a/o/a/h0.smali
index ca01b523c8..e5fa512e17 100644
--- a/com.discord/smali/f/a/o/a/h0.smali
+++ b/com.discord/smali/f/a/o/a/h0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/i0.smali b/com.discord/smali/f/a/o/a/i0.smali
index 37839a8ef4..3b7a845191 100644
--- a/com.discord/smali/f/a/o/a/i0.smali
+++ b/com.discord/smali/f/a/o/a/i0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/j0.smali b/com.discord/smali/f/a/o/a/j0.smali
index 50bce87689..b75887b195 100644
--- a/com.discord/smali/f/a/o/a/j0.smali
+++ b/com.discord/smali/f/a/o/a/j0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/l0.smali b/com.discord/smali/f/a/o/a/l0.smali
index 3c19cde878..0b2e6ab34d 100644
--- a/com.discord/smali/f/a/o/a/l0.smali
+++ b/com.discord/smali/f/a/o/a/l0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/o0.smali b/com.discord/smali/f/a/o/a/o0.smali
index cd7c75df84..61fe1fcf84 100644
--- a/com.discord/smali/f/a/o/a/o0.smali
+++ b/com.discord/smali/f/a/o/a/o0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/a/o1.smali b/com.discord/smali/f/a/o/a/o1.smali
index 37264ac0e9..c9aa1edb7d 100644
--- a/com.discord/smali/f/a/o/a/o1.smali
+++ b/com.discord/smali/f/a/o/a/o1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/a/q1.smali b/com.discord/smali/f/a/o/a/q1.smali
index ae6d80c496..5c67ac47e3 100644
--- a/com.discord/smali/f/a/o/a/q1.smali
+++ b/com.discord/smali/f/a/o/a/q1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/a/s0.smali b/com.discord/smali/f/a/o/a/s0.smali
index 6c0e4a1cb5..21da96b891 100644
--- a/com.discord/smali/f/a/o/a/s0.smali
+++ b/com.discord/smali/f/a/o/a/s0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/t0.smali b/com.discord/smali/f/a/o/a/t0.smali
index 7e8cbdd798..7483bcdb2e 100644
--- a/com.discord/smali/f/a/o/a/t0.smali
+++ b/com.discord/smali/f/a/o/a/t0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/v.smali b/com.discord/smali/f/a/o/a/v.smali
index c518722db4..020e28d987 100644
--- a/com.discord/smali/f/a/o/a/v.smali
+++ b/com.discord/smali/f/a/o/a/v.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/v0.smali b/com.discord/smali/f/a/o/a/v0.smali
index ab0098bad8..ea23ed6c7d 100644
--- a/com.discord/smali/f/a/o/a/v0.smali
+++ b/com.discord/smali/f/a/o/a/v0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/w.smali b/com.discord/smali/f/a/o/a/w.smali
index 6941f0d425..840d7c61b0 100644
--- a/com.discord/smali/f/a/o/a/w.smali
+++ b/com.discord/smali/f/a/o/a/w.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/a/z0.smali b/com.discord/smali/f/a/o/a/z0.smali
index 7ec47f94f8..e689acdd0b 100644
--- a/com.discord/smali/f/a/o/a/z0.smali
+++ b/com.discord/smali/f/a/o/a/z0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/a/a.smali b/com.discord/smali/f/a/o/b/a/a.smali
index da5e5acdb5..3c3107975b 100644
--- a/com.discord/smali/f/a/o/b/a/a.smali
+++ b/com.discord/smali/f/a/o/b/a/a.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/a/b.smali b/com.discord/smali/f/a/o/b/a/b.smali
index 9c1d9a251d..237a51efab 100644
--- a/com.discord/smali/f/a/o/b/a/b.smali
+++ b/com.discord/smali/f/a/o/b/a/b.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/a/c0.smali b/com.discord/smali/f/a/o/b/a/c0.smali
index 4c95d4a7a1..b410284fb1 100644
--- a/com.discord/smali/f/a/o/b/a/c0.smali
+++ b/com.discord/smali/f/a/o/b/a/c0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/a/f.smali b/com.discord/smali/f/a/o/b/a/f.smali
index 4ae952c79e..1dee0d57f9 100644
--- a/com.discord/smali/f/a/o/b/a/f.smali
+++ b/com.discord/smali/f/a/o/b/a/f.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/b/a/f0.smali b/com.discord/smali/f/a/o/b/a/f0.smali
index 7cb37c9683..6fe914c0fd 100644
--- a/com.discord/smali/f/a/o/b/a/f0.smali
+++ b/com.discord/smali/f/a/o/b/a/f0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/a/j.smali b/com.discord/smali/f/a/o/b/a/j.smali
index c05fcdf7fd..02ab91d1fd 100644
--- a/com.discord/smali/f/a/o/b/a/j.smali
+++ b/com.discord/smali/f/a/o/b/a/j.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/b/a/k.smali b/com.discord/smali/f/a/o/b/a/k.smali
index f194d35e18..fdf2aa9649 100644
--- a/com.discord/smali/f/a/o/b/a/k.smali
+++ b/com.discord/smali/f/a/o/b/a/k.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/a/m.smali b/com.discord/smali/f/a/o/b/a/m.smali
index 7e9d8923a6..4913977ae0 100644
--- a/com.discord/smali/f/a/o/b/a/m.smali
+++ b/com.discord/smali/f/a/o/b/a/m.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/a/x.smali b/com.discord/smali/f/a/o/b/a/x.smali
index 92e706e198..b69f5e2a1f 100644
--- a/com.discord/smali/f/a/o/b/a/x.smali
+++ b/com.discord/smali/f/a/o/b/a/x.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/b/b/b0/b.smali b/com.discord/smali/f/a/o/b/b/b0/b.smali
index 656d405de5..a81945ec1a 100644
--- a/com.discord/smali/f/a/o/b/b/b0/b.smali
+++ b/com.discord/smali/f/a/o/b/b/b0/b.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/b/b0/c.smali b/com.discord/smali/f/a/o/b/b/b0/c.smali
index 6e8ee307e2..1800f26be4 100644
--- a/com.discord/smali/f/a/o/b/b/b0/c.smali
+++ b/com.discord/smali/f/a/o/b/b/b0/c.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/b/b0/d.smali b/com.discord/smali/f/a/o/b/b/b0/d.smali
index 2e59eb3136..2dd3954fac 100644
--- a/com.discord/smali/f/a/o/b/b/b0/d.smali
+++ b/com.discord/smali/f/a/o/b/b/b0/d.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/b/b/b0/f.smali b/com.discord/smali/f/a/o/b/b/b0/f.smali
index 384a24a6d6..674dfd60ce 100644
--- a/com.discord/smali/f/a/o/b/b/b0/f.smali
+++ b/com.discord/smali/f/a/o/b/b/b0/f.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/b/b0/h.smali b/com.discord/smali/f/a/o/b/b/b0/h.smali
index b213ac1eef..8ad5f664d4 100644
--- a/com.discord/smali/f/a/o/b/b/b0/h.smali
+++ b/com.discord/smali/f/a/o/b/b/b0/h.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/b/b/b0/i.smali b/com.discord/smali/f/a/o/b/b/b0/i.smali
index b98c0696bf..fe675de346 100644
--- a/com.discord/smali/f/a/o/b/b/b0/i.smali
+++ b/com.discord/smali/f/a/o/b/b/b0/i.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/b/c/b.smali b/com.discord/smali/f/a/o/b/c/b.smali
index bf54172c62..4287395835 100644
--- a/com.discord/smali/f/a/o/b/c/b.smali
+++ b/com.discord/smali/f/a/o/b/c/b.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/d/a.smali b/com.discord/smali/f/a/o/d/a.smali
index fcf9742e96..d561abc31e 100644
--- a/com.discord/smali/f/a/o/d/a.smali
+++ b/com.discord/smali/f/a/o/d/a.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/d/g.smali b/com.discord/smali/f/a/o/d/g.smali
index dc1c52bc91..16dc9a97db 100644
--- a/com.discord/smali/f/a/o/d/g.smali
+++ b/com.discord/smali/f/a/o/d/g.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/d/h.smali b/com.discord/smali/f/a/o/d/h.smali
index 54bd52efb5..9f95137f9e 100644
--- a/com.discord/smali/f/a/o/d/h.smali
+++ b/com.discord/smali/f/a/o/d/h.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/d/i.smali b/com.discord/smali/f/a/o/d/i.smali
index fb7711e510..181a847350 100644
--- a/com.discord/smali/f/a/o/d/i.smali
+++ b/com.discord/smali/f/a/o/d/i.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/d/j.smali b/com.discord/smali/f/a/o/d/j.smali
index ead44bd7ff..f31d6540ec 100644
--- a/com.discord/smali/f/a/o/d/j.smali
+++ b/com.discord/smali/f/a/o/d/j.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/a.smali b/com.discord/smali/f/a/o/e/a.smali
index e13b8ee2a9..5f5856ef1a 100644
--- a/com.discord/smali/f/a/o/e/a.smali
+++ b/com.discord/smali/f/a/o/e/a.smali
@@ -30,7 +30,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/f/a/o/e/c.smali b/com.discord/smali/f/a/o/e/c.smali
index b79b3838fb..9994d26e78 100644
--- a/com.discord/smali/f/a/o/e/c.smali
+++ b/com.discord/smali/f/a/o/e/c.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/e/e.smali b/com.discord/smali/f/a/o/e/e.smali
index bd52bbba41..55935471d4 100644
--- a/com.discord/smali/f/a/o/e/e.smali
+++ b/com.discord/smali/f/a/o/e/e.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/e/e1.smali b/com.discord/smali/f/a/o/e/e1.smali
index 37ca815658..442325a161 100644
--- a/com.discord/smali/f/a/o/e/e1.smali
+++ b/com.discord/smali/f/a/o/e/e1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/f1.smali b/com.discord/smali/f/a/o/e/f1.smali
index 4723cfc7f4..b73d3cda8b 100644
--- a/com.discord/smali/f/a/o/e/f1.smali
+++ b/com.discord/smali/f/a/o/e/f1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/f2.smali b/com.discord/smali/f/a/o/e/f2.smali
index 1d09424a91..37aefa6587 100644
--- a/com.discord/smali/f/a/o/e/f2.smali
+++ b/com.discord/smali/f/a/o/e/f2.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/h2.smali b/com.discord/smali/f/a/o/e/h2.smali
index d5711d5e37..ca837280ad 100644
--- a/com.discord/smali/f/a/o/e/h2.smali
+++ b/com.discord/smali/f/a/o/e/h2.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/i2.smali b/com.discord/smali/f/a/o/e/i2.smali
index 4f6f7beb19..4536771b06 100644
--- a/com.discord/smali/f/a/o/e/i2.smali
+++ b/com.discord/smali/f/a/o/e/i2.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/j2.smali b/com.discord/smali/f/a/o/e/j2.smali
index 0f85116d07..2339fce683 100644
--- a/com.discord/smali/f/a/o/e/j2.smali
+++ b/com.discord/smali/f/a/o/e/j2.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/l.smali b/com.discord/smali/f/a/o/e/l.smali
index 771c203fee..675cf78111 100644
--- a/com.discord/smali/f/a/o/e/l.smali
+++ b/com.discord/smali/f/a/o/e/l.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/m.smali b/com.discord/smali/f/a/o/e/m.smali
index bc6f717426..12b4bd4abd 100644
--- a/com.discord/smali/f/a/o/e/m.smali
+++ b/com.discord/smali/f/a/o/e/m.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/e/m1.smali b/com.discord/smali/f/a/o/e/m1.smali
index 2f377874e5..5cb9f361a2 100644
--- a/com.discord/smali/f/a/o/e/m1.smali
+++ b/com.discord/smali/f/a/o/e/m1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/n.smali b/com.discord/smali/f/a/o/e/n.smali
index e7929da87d..aa709623c8 100644
--- a/com.discord/smali/f/a/o/e/n.smali
+++ b/com.discord/smali/f/a/o/e/n.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/n1.smali b/com.discord/smali/f/a/o/e/n1.smali
index da6234ddf5..5cb28c1a89 100644
--- a/com.discord/smali/f/a/o/e/n1.smali
+++ b/com.discord/smali/f/a/o/e/n1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/n2.smali b/com.discord/smali/f/a/o/e/n2.smali
index 1a7bbbd2a0..4466580e14 100644
--- a/com.discord/smali/f/a/o/e/n2.smali
+++ b/com.discord/smali/f/a/o/e/n2.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/e/o.smali b/com.discord/smali/f/a/o/e/o.smali
index 0256463fe5..842df008b1 100644
--- a/com.discord/smali/f/a/o/e/o.smali
+++ b/com.discord/smali/f/a/o/e/o.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/q0.smali b/com.discord/smali/f/a/o/e/q0.smali
index 00b19b8a03..01e582494f 100644
--- a/com.discord/smali/f/a/o/e/q0.smali
+++ b/com.discord/smali/f/a/o/e/q0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/s0.smali b/com.discord/smali/f/a/o/e/s0.smali
index 9c0e3dedf1..048f8dc6de 100644
--- a/com.discord/smali/f/a/o/e/s0.smali
+++ b/com.discord/smali/f/a/o/e/s0.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/s1.smali b/com.discord/smali/f/a/o/e/s1.smali
index 1b7859187f..793074941e 100644
--- a/com.discord/smali/f/a/o/e/s1.smali
+++ b/com.discord/smali/f/a/o/e/s1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali/f/a/o/e/w1.smali b/com.discord/smali/f/a/o/e/w1.smali
index c396258e53..8d9a39251d 100644
--- a/com.discord/smali/f/a/o/e/w1.smali
+++ b/com.discord/smali/f/a/o/e/w1.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/y2.smali b/com.discord/smali/f/a/o/e/y2.smali
index 45c8755b7a..a0220dba45 100644
--- a/com.discord/smali/f/a/o/e/y2.smali
+++ b/com.discord/smali/f/a/o/e/y2.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali/f/a/o/e/z2.smali b/com.discord/smali/f/a/o/e/z2.smali
index 71d4b09493..c5259cb220 100644
--- a/com.discord/smali/f/a/o/e/z2.smali
+++ b/com.discord/smali/f/a/o/e/z2.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/f/a/o/f/a.smali b/com.discord/smali/f/a/o/f/a.smali
similarity index 100%
rename from com.discord/smali_classes2/f/a/o/f/a.smali
rename to com.discord/smali/f/a/o/f/a.smali
diff --git a/com.discord/smali_classes2/f/a/o/f/b.smali b/com.discord/smali/f/a/o/f/b.smali
similarity index 100%
rename from com.discord/smali_classes2/f/a/o/f/b.smali
rename to com.discord/smali/f/a/o/f/b.smali
diff --git a/com.discord/smali_classes2/f/a/o/f/c.smali b/com.discord/smali/f/a/o/f/c.smali
similarity index 100%
rename from com.discord/smali_classes2/f/a/o/f/c.smali
rename to com.discord/smali/f/a/o/f/c.smali
diff --git a/com.discord/smali_classes2/f/a/o/f/d.smali b/com.discord/smali/f/a/o/f/d.smali
similarity index 100%
rename from com.discord/smali_classes2/f/a/o/f/d.smali
rename to com.discord/smali/f/a/o/f/d.smali
diff --git a/com.discord/smali/f/b/a/a/a$a.smali b/com.discord/smali/f/b/a/a/a$a.smali
index ce427ae5cc..6b9b81b5ee 100644
--- a/com.discord/smali/f/b/a/a/a$a.smali
+++ b/com.discord/smali/f/b/a/a/a$a.smali
@@ -97,7 +97,7 @@
 
     const-string v8, "Intent(Intent.ACTION_PIC\u2026TRA_ALLOW_MULTIPLE, true)"
 
-    invoke-static {v4, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v8, Landroid/util/TypedValue;
 
@@ -147,7 +147,7 @@
 
     if-eqz v8, :cond_5
 
-    invoke-static {v8}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v8}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v10
 
@@ -175,7 +175,7 @@
 
     const-string v10, "getString(R.string.choose_an_application)"
 
-    invoke-static {v8, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_6
     invoke-static {v4, v8}, Landroid/content/Intent;->createChooser(Landroid/content/Intent;Ljava/lang/CharSequence;)Landroid/content/Intent;
@@ -196,7 +196,7 @@
 
     const-string v10, "text/*"
 
-    const-string v11, "video/*"
+    const-string/jumbo v11, "video/*"
 
     filled-new-array {v10, v6, v11}, [Ljava/lang/String;
 
@@ -242,7 +242,7 @@
 
     const-string v8, "resolveInfos"
 
-    invoke-static {v6, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v8, Ljava/util/ArrayList;
 
@@ -344,7 +344,7 @@
 
     const-string v10, "it"
 
-    invoke-static {v6, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Landroid/content/Intent;->getPackage()Ljava/lang/String;
 
@@ -352,7 +352,7 @@
 
     const-string v10, "com.google.android.apps.docs"
 
-    invoke-static {v6, v10}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -377,7 +377,7 @@
 
     const-string v6, "context ?: return null"
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -428,7 +428,7 @@
 
     const-string v10, "com.google.android.apps.docs.app.PickActivity"
 
-    invoke-static {v7, v10}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -463,7 +463,7 @@
     goto :goto_8
 
     :cond_d
-    sget-object v8, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v8, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_e
     :goto_8
@@ -485,7 +485,7 @@
 
     const-string v3, "Intent.createChooser(ima\u2026llIntents.toTypedArray())"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v3, 0x1750
 
@@ -494,11 +494,11 @@
     return-void
 
     :cond_f
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 
diff --git a/com.discord/smali/f/c/a/a$e.smali b/com.discord/smali/f/c/a/a$e.smali
index f1e5f0256c..ff03875c1c 100644
--- a/com.discord/smali/f/c/a/a$e.smali
+++ b/com.discord/smali/f/c/a/a$e.smali
@@ -716,7 +716,7 @@
 
     iget-object v2, v1, Lf/c/a/w;->w:Ljava/lang/String;
 
-    sput-object v2, Ld0/a/b/b/a;->b:Ljava/lang/String;
+    sput-object v2, Le0/a/b/b/a;->b:Ljava/lang/String;
 
     iget-object v2, v1, Lf/c/a/w;->a:Ljava/lang/String;
 
diff --git a/com.discord/smali/f/c/a/a$f.smali b/com.discord/smali/f/c/a/a$f.smali
index 0674a124a1..6509615c6e 100644
--- a/com.discord/smali/f/c/a/a$f.smali
+++ b/com.discord/smali/f/c/a/a$f.smali
@@ -191,7 +191,7 @@
 
     sget-object v8, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v7, v8}, Ld0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v7, v8}, Le0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v7
 
@@ -206,7 +206,7 @@
 
     sget-object v8, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v7, v8}, Ld0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v7, v8}, Le0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v7
 
@@ -392,7 +392,7 @@
 
     move-object/from16 v15, v16
 
-    invoke-static/range {v7 .. v15}, Lf/e/b/a/a;->S(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
+    invoke-static/range {v7 .. v15}, Lf/e/b/a/a;->V(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
 
     sget-object v7, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
diff --git a/com.discord/smali/f/c/a/a$k.smali b/com.discord/smali/f/c/a/a$k.smali
index 24fbef3f2f..713d2ea5b9 100644
--- a/com.discord/smali/f/c/a/a$k.smali
+++ b/com.discord/smali/f/c/a/a$k.smali
@@ -300,7 +300,7 @@
 
     sget-object v10, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v9, v10}, Ld0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v9, v10}, Le0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v9
 
@@ -315,7 +315,7 @@
 
     sget-object v10, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v9, v10}, Ld0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v9, v10}, Le0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v9
 
@@ -652,7 +652,7 @@
 
     move-object/from16 v16, v8
 
-    invoke-static/range {v9 .. v17}, Lf/e/b/a/a;->S(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
+    invoke-static/range {v9 .. v17}, Lf/e/b/a/a;->V(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
 
     iget-object v9, v5, Lf/c/a/n1;->b:Lf/c/a/p0;
 
diff --git a/com.discord/smali/f/c/a/a.smali b/com.discord/smali/f/c/a/a.smali
index bc352daa15..d4b028e58e 100644
--- a/com.discord/smali/f/c/a/a.smali
+++ b/com.discord/smali/f/c/a/a.smali
@@ -1014,7 +1014,7 @@
 
     sget-object v5, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v4, v5}, Ld0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v4, v5}, Le0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v4
 
@@ -1029,7 +1029,7 @@
 
     sget-object v5, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v4, v5}, Ld0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v4, v5}, Le0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v4
 
@@ -1332,7 +1332,7 @@
 
     move-object/from16 v16, v3
 
-    invoke-static/range {v9 .. v17}, Lf/e/b/a/a;->S(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
+    invoke-static/range {v9 .. v17}, Lf/e/b/a/a;->V(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
 
     iget-object v1, v8, Lf/c/a/n1;->b:Lf/c/a/p0;
 
@@ -1522,7 +1522,7 @@
 
     iget-object v1, v1, Lf/c/a/p0;->D:Ljava/lang/String;
 
-    const-string v4, "updated_at"
+    const-string/jumbo v4, "updated_at"
 
     invoke-static {v3, v4, v1}, Lf/c/a/n1;->g(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -2481,7 +2481,7 @@
 
     sget-object v6, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v5, v6}, Ld0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v5, v6}, Le0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v5
 
@@ -2496,7 +2496,7 @@
 
     sget-object v6, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v5, v6}, Ld0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v5, v6}, Le0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v5
 
@@ -2710,7 +2710,7 @@
 
     move-object v12, v4
 
-    invoke-static/range {v5 .. v13}, Lf/e/b/a/a;->S(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
+    invoke-static/range {v5 .. v13}, Lf/e/b/a/a;->V(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
 
     sget-object v5, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
@@ -2920,7 +2920,7 @@
 
     sget-object v5, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v4, v5}, Ld0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v4, v5}, Le0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v4
 
@@ -2935,7 +2935,7 @@
 
     sget-object v5, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v4, v5}, Ld0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v4, v5}, Le0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v4
 
@@ -3149,7 +3149,7 @@
 
     move-object v11, v3
 
-    invoke-static/range {v4 .. v12}, Lf/e/b/a/a;->S(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
+    invoke-static/range {v4 .. v12}, Lf/e/b/a/a;->V(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
 
     sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
diff --git a/com.discord/smali/f/c/a/b1.smali b/com.discord/smali/f/c/a/b1.smali
index 0e5e20b95e..2d03edb15c 100644
--- a/com.discord/smali/f/c/a/b1.smali
+++ b/com.discord/smali/f/c/a/b1.smali
@@ -145,7 +145,7 @@
 
     new-array v4, v2, [Ljava/lang/Object;
 
-    invoke-static {v0, v3, v1, v4}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v3, v1, v4}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p0, Lf/c/a/b1;->d:Lf/c/a/w0;
 
@@ -327,7 +327,7 @@
     :try_start_0
     new-array v5, v4, [Ljava/lang/Object;
 
-    invoke-static {v0, v1, v2, v5}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1, v2, v5}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -396,7 +396,7 @@
 
     aput-object v0, v9, v4
 
-    invoke-static {v6, v7, v8, v9}, Ld0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v6, v7, v8, v9}, Le0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -404,7 +404,7 @@
 
     new-array v7, v4, [Ljava/lang/Object;
 
-    invoke-static {v0, v6, v2, v7}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v6, v2, v7}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
     :try_end_1
@@ -584,7 +584,7 @@
 
     aput-object v6, v0, v4
 
-    invoke-static {v7, v1, v8, v0}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v7, v1, v8, v0}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_4
     .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_4 .. :try_end_4} :catch_7
     .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_6
@@ -923,7 +923,7 @@
     :try_start_1
     new-array v4, v0, [Ljava/lang/Object;
 
-    invoke-static {p2, v3, p1, v4}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2, v3, p1, v4}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
     :try_end_1
@@ -973,7 +973,7 @@
     :try_start_3
     new-array v4, v0, [Ljava/lang/Object;
 
-    invoke-static {p2, v3, p1, v4}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2, v3, p1, v4}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1031,7 +1031,7 @@
 
     new-array v6, v0, [Ljava/lang/Object;
 
-    invoke-static {p2, v5, p1, v6}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2, v5, p1, v6}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -1091,7 +1091,7 @@
 
     new-array v6, v0, [Ljava/lang/Object;
 
-    invoke-static {p2, v5, p1, v6}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2, v5, p1, v6}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
diff --git a/com.discord/smali/f/c/a/b2.smali b/com.discord/smali/f/c/a/b2.smali
index 27128e182b..1ea0c6034c 100644
--- a/com.discord/smali/f/c/a/b2.smali
+++ b/com.discord/smali/f/c/a/b2.smali
@@ -58,7 +58,7 @@
 
     const-string v3, "getAdvertisingIdInfo"
 
-    invoke-static {v0, v3, v2, v1}, Ld0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v3, v2, v1}, Le0/a/b/b/a;->j0(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
     :try_end_0
diff --git a/com.discord/smali/f/c/a/c2.smali b/com.discord/smali/f/c/a/c2.smali
index 39f763f78c..2909f5198a 100644
--- a/com.discord/smali/f/c/a/c2.smali
+++ b/com.discord/smali/f/c/a/c2.smali
@@ -57,7 +57,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    invoke-static {v0, v2, v1, v3}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v2, v1, v3}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/c/a/d2.smali b/com.discord/smali/f/c/a/d2.smali
index 72d6aebed2..4bca633f60 100644
--- a/com.discord/smali/f/c/a/d2.smali
+++ b/com.discord/smali/f/c/a/d2.smali
@@ -57,7 +57,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    invoke-static {v0, v2, v1, v3}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v2, v1, v3}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/f/c/a/e2.smali b/com.discord/smali/f/c/a/e2.smali
index 1a22147ce0..2cd1eff8f8 100644
--- a/com.discord/smali/f/c/a/e2.smali
+++ b/com.discord/smali/f/c/a/e2.smali
@@ -1110,7 +1110,7 @@
     const-wide/16 v0, 0x2af8
 
     :try_start_0
-    invoke-static {p0, v0, v1}, Ld0/a/b/b/a;->P(Landroid/content/Context;J)Lf/c/a/s0;
+    invoke-static {p0, v0, v1}, Le0/a/b/b/a;->P(Landroid/content/Context;J)Lf/c/a/s0;
 
     move-result-object v2
 
@@ -1691,7 +1691,7 @@
 
     invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    const-string p0, "x"
+    const-string/jumbo p0, "x"
 
     invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/f/c/a/g0.smali b/com.discord/smali/f/c/a/g0.smali
index 61b7fe6a3e..6fa7264112 100644
--- a/com.discord/smali/f/c/a/g0.smali
+++ b/com.discord/smali/f/c/a/g0.smali
@@ -110,7 +110,7 @@
 
     new-array v4, v0, [Ljava/lang/Object;
 
-    invoke-static {v1, v2, v3, v4}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1, v2, v3, v4}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -204,7 +204,7 @@
 
     aput-object p2, v0, v8
 
-    invoke-static {v4, v5, v7, v0}, Ld0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v4, v5, v7, v0}, Le0/a/b/b/a;->i0(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali/f/c/a/m0.smali b/com.discord/smali/f/c/a/m0.smali
index 997fa18bd3..e98f69ab11 100644
--- a/com.discord/smali/f/c/a/m0.smali
+++ b/com.discord/smali/f/c/a/m0.smali
@@ -120,7 +120,7 @@
 
     sget-object v7, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v6, v7}, Ld0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v6, v7}, Le0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v6
 
@@ -135,7 +135,7 @@
 
     sget-object v7, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v6, v7}, Ld0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v6, v7}, Le0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v6
 
@@ -456,7 +456,7 @@
     :try_start_0
     iget-object v3, v0, Lf/c/a/h0;->b:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Ld0/a/b/b/a;->s(Lf/c/a/u;Ljava/lang/String;)Lf/c/a/r1;
+    invoke-static {v1, v3}, Le0/a/b/b/a;->s(Lf/c/a/u;Ljava/lang/String;)Lf/c/a/r1;
 
     move-result-object v1
 
diff --git a/com.discord/smali/f/c/a/n.smali b/com.discord/smali/f/c/a/n.smali
index f115725df3..8247d8789a 100644
--- a/com.discord/smali/f/c/a/n.smali
+++ b/com.discord/smali/f/c/a/n.smali
@@ -63,7 +63,7 @@
 
     iget-object v3, v1, Lf/c/a/q0;->k:Ljava/lang/String;
 
-    const-string v4, "unity"
+    const-string/jumbo v4, "unity"
 
     invoke-virtual {v4, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/f/c/a/n1.smali b/com.discord/smali/f/c/a/n1.smali
index 6f81c7abde..b0dff4bd05 100644
--- a/com.discord/smali/f/c/a/n1.smali
+++ b/com.discord/smali/f/c/a/n1.smali
@@ -376,7 +376,7 @@
 
     sget-object v3, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v2, v3}, Le0/a/b/b/a;->Q(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v2
 
@@ -391,7 +391,7 @@
 
     sget-object v3, Lf/c/a/n1;->p:Lf/c/a/w0;
 
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
+    invoke-static {v2, v3}, Le0/a/b/b/a;->S(Landroid/content/Context;Lf/c/a/w0;)Ljava/util/Map;
 
     move-result-object v2
 
@@ -726,7 +726,7 @@
 
     move-object v9, v1
 
-    invoke-static/range {v2 .. v10}, Lf/e/b/a/a;->S(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
+    invoke-static/range {v2 .. v10}, Lf/e/b/a/a;->V(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
 
     iget-object v2, p0, Lf/c/a/n1;->b:Lf/c/a/p0;
 
@@ -964,7 +964,7 @@
 
     iget-object p1, p1, Lf/c/a/p0;->D:Ljava/lang/String;
 
-    const-string v2, "updated_at"
+    const-string/jumbo v2, "updated_at"
 
     invoke-static {v1, v2, p1}, Lf/c/a/n1;->g(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/f/c/a/o.smali b/com.discord/smali/f/c/a/o.smali
index 1564aae48a..5bbd8b3344 100644
--- a/com.discord/smali/f/c/a/o.smali
+++ b/com.discord/smali/f/c/a/o.smali
@@ -63,7 +63,7 @@
 
     iget-object v3, v1, Lf/c/a/q0;->k:Ljava/lang/String;
 
-    const-string v4, "unity"
+    const-string/jumbo v4, "unity"
 
     invoke-virtual {v4, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/f/c/a/p.smali b/com.discord/smali/f/c/a/p.smali
index c1a079604c..aa356d059b 100644
--- a/com.discord/smali/f/c/a/p.smali
+++ b/com.discord/smali/f/c/a/p.smali
@@ -63,7 +63,7 @@
 
     iget-object v3, v1, Lf/c/a/y1;->i:Ljava/lang/String;
 
-    const-string v4, "unity"
+    const-string/jumbo v4, "unity"
 
     invoke-virtual {v4, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/f/c/a/p0.smali b/com.discord/smali/f/c/a/p0.smali
index ce2cddcfa1..4b70bade18 100644
--- a/com.discord/smali/f/c/a/p0.smali
+++ b/com.discord/smali/f/c/a/p0.smali
@@ -220,7 +220,7 @@
     goto :goto_2
 
     :cond_2
-    const-string v5, "xlarge"
+    const-string/jumbo v5, "xlarge"
 
     goto :goto_2
 
@@ -571,9 +571,9 @@
     invoke-interface {v0, v2, v1}, Lf/c/a/w0;->d(Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_1
-    const-string v0, "wlan0"
+    const-string/jumbo v0, "wlan0"
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m0(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Le0/a/b/b/a;->m0(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -586,7 +586,7 @@
     :cond_2
     const-string v0, "eth0"
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m0(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0}, Le0/a/b/b/a;->m0(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -596,7 +596,7 @@
 
     :cond_3
     :try_start_0
-    const-string v0, "wifi"
+    const-string/jumbo v0, "wifi"
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -745,7 +745,7 @@
     int-to-long v4, v4
 
     :try_start_0
-    invoke-static {p1, v4, v5}, Ld0/a/b/b/a;->P(Landroid/content/Context;J)Lf/c/a/s0;
+    invoke-static {p1, v4, v5}, Le0/a/b/b/a;->P(Landroid/content/Context;J)Lf/c/a/s0;
 
     move-result-object v4
 
diff --git a/com.discord/smali/f/c/a/p1.smali b/com.discord/smali/f/c/a/p1.smali
index 5ea2e22795..03d263786e 100644
--- a/com.discord/smali/f/c/a/p1.smali
+++ b/com.discord/smali/f/c/a/p1.smali
@@ -127,7 +127,7 @@
     move-result-object v3
 
     :try_start_0
-    invoke-static {v3, v1, v2}, Ld0/a/b/b/a;->u(Ljava/lang/String;Lf/c/a/u;I)Lf/c/a/r1;
+    invoke-static {v3, v1, v2}, Le0/a/b/b/a;->u(Ljava/lang/String;Lf/c/a/u;I)Lf/c/a/r1;
 
     move-result-object v2
 
diff --git a/com.discord/smali/f/c/a/q.smali b/com.discord/smali/f/c/a/q.smali
index 379feeda53..da00f7234a 100644
--- a/com.discord/smali/f/c/a/q.smali
+++ b/com.discord/smali/f/c/a/q.smali
@@ -63,7 +63,7 @@
 
     iget-object v3, v1, Lf/c/a/y1;->i:Ljava/lang/String;
 
-    const-string v4, "unity"
+    const-string/jumbo v4, "unity"
 
     invoke-virtual {v4, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/f/c/a/s.smali b/com.discord/smali/f/c/a/s.smali
index 738f173ba8..c0a83fc7e8 100644
--- a/com.discord/smali/f/c/a/s.smali
+++ b/com.discord/smali/f/c/a/s.smali
@@ -148,7 +148,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v4, v6, v7, v8}, Ld0/a/b/b/a;->C0(Ljava/util/List;Lf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/n1;
+    invoke-static {v5, v4, v6, v7, v8}, Le0/a/b/b/a;->C0(Ljava/util/List;Lf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/n1;
 
     move-result-object v4
 
diff --git a/com.discord/smali/f/c/a/t.smali b/com.discord/smali/f/c/a/t.smali
index 7ae1d122d9..916694747d 100644
--- a/com.discord/smali/f/c/a/t.smali
+++ b/com.discord/smali/f/c/a/t.smali
@@ -273,7 +273,7 @@
     packed-switch v0, :pswitch_data_0
 
     :pswitch_0
-    const-string v0, "unknown"
+    const-string/jumbo v0, "unknown"
 
     return-object v0
 
@@ -322,8 +322,6 @@
 
     return-object v0
 
-    nop
-
     :pswitch_data_0
     .packed-switch 0x1
         :pswitch_9
diff --git a/com.discord/smali/f/c/a/t1.smali b/com.discord/smali/f/c/a/t1.smali
index 9b263ada64..a243ae8265 100644
--- a/com.discord/smali/f/c/a/t1.smali
+++ b/com.discord/smali/f/c/a/t1.smali
@@ -113,7 +113,7 @@
 
     move-result-object v17
 
-    invoke-static/range {v11 .. v17}, Ld0/a/b/b/a;->f(Ljava/lang/String;JLf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/u;
+    invoke-static/range {v11 .. v17}, Le0/a/b/b/a;->f(Ljava/lang/String;JLf/c/a/v;Lf/c/a/w;Lf/c/a/p0;Lf/c/a/x1;)Lf/c/a/u;
 
     move-result-object v7
 
diff --git a/com.discord/smali/f/c/a/v.smali b/com.discord/smali/f/c/a/v.smali
index 90e65586cb..f671623177 100644
--- a/com.discord/smali/f/c/a/v.smali
+++ b/com.discord/smali/f/c/a/v.smali
@@ -79,7 +79,7 @@
 
     new-instance v2, Ljava/io/ObjectStreamField;
 
-    const-string v3, "uuid"
+    const-string/jumbo v3, "uuid"
 
     invoke-direct {v2, v3, v0}, Ljava/io/ObjectStreamField;-><init>(Ljava/lang/String;Ljava/lang/Class;)V
 
@@ -223,7 +223,7 @@
 
     sget-object v3, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
 
-    const-string v4, "updatePackages"
+    const-string/jumbo v4, "updatePackages"
 
     invoke-direct {v2, v4, v3}, Ljava/io/ObjectStreamField;-><init>(Ljava/lang/String;Ljava/lang/Class;)V
 
@@ -481,7 +481,7 @@
 
     iput-wide v4, p0, Lf/c/a/v;->lastInterval:J
 
-    const-string v0, "uuid"
+    const-string/jumbo v0, "uuid"
 
     const/4 v4, 0x0
 
@@ -525,7 +525,7 @@
 
     iput-boolean v0, p0, Lf/c/a/v;->askingAttribution:Z
 
-    const-string v0, "updatePackages"
+    const-string/jumbo v0, "updatePackages"
 
     invoke-static {p1, v0, v1}, Lf/c/a/e2;->z(Ljava/io/ObjectInputStream$GetField;Ljava/lang/String;Z)Z
 
diff --git a/com.discord/smali/f/c/a/v1.smali b/com.discord/smali/f/c/a/v1.smali
index 9863d88ff0..863c570a3f 100644
--- a/com.discord/smali/f/c/a/v1.smali
+++ b/com.discord/smali/f/c/a/v1.smali
@@ -194,7 +194,7 @@
 
     add-int/lit8 v13, v13, -0x1
 
-    invoke-static {v12, v1, v13}, Ld0/a/b/b/a;->u(Ljava/lang/String;Lf/c/a/u;I)Lf/c/a/r1;
+    invoke-static {v12, v1, v13}, Le0/a/b/b/a;->u(Ljava/lang/String;Lf/c/a/u;I)Lf/c/a/r1;
 
     move-result-object v12
 
diff --git a/com.discord/smali/f/d/a/e.smali b/com.discord/smali/f/d/a/e.smali
index e655f2b478..a9acfc90f8 100644
--- a/com.discord/smali/f/d/a/e.smali
+++ b/com.discord/smali/f/d/a/e.smali
@@ -160,7 +160,7 @@
 .end method
 
 .method public static c(Ljava/io/InputStream;Ljava/lang/String;)Lf/d/a/m;
-    .locals 2
+    .locals 3
     .param p1    # Ljava/lang/String;
         .annotation build Landroidx/annotation/Nullable;
         .end annotation
@@ -180,16 +180,26 @@
         }
     .end annotation
 
+    const-string v0, "$receiver"
+
     :try_start_0
-    invoke-static {p0}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
+    new-instance v1, Lp0/m;
 
-    invoke-static {v0}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
+    new-instance v2, Lp0/x;
 
-    move-result-object v0
+    invoke-direct {v2}, Lp0/x;-><init>()V
 
-    invoke-static {v0}, Lf/d/a/x/h0/c;->p(Lo0/g;)Lf/d/a/x/h0/c;
+    invoke-direct {v1, p0, v2}, Lp0/m;-><init>(Ljava/io/InputStream;Lp0/x;)V
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lp0/q;
+
+    invoke-direct {v0, v1}, Lp0/q;-><init>(Lp0/w;)V
+
+    invoke-static {v0}, Lf/d/a/x/h0/c;->p(Lp0/g;)Lf/d/a/x/h0/c;
 
     move-result-object v0
 
@@ -337,7 +347,7 @@
         }
     .end annotation
 
-    const-string v0, "url_"
+    const-string/jumbo v0, "url_"
 
     invoke-static {v0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -415,93 +425,103 @@
         }
     .end annotation
 
-    new-instance v0, Ljava/util/HashMap;
+    const-string v0, "$receiver"
 
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+    new-instance v1, Ljava/util/HashMap;
+
+    invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
     :try_start_0
     invoke-virtual {p0}, Ljava/util/zip/ZipInputStream;->getNextEntry()Ljava/util/zip/ZipEntry;
 
-    move-result-object v1
+    move-result-object v2
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    move-object v3, v2
+    move-object v4, v3
 
     :goto_0
-    if-eqz v1, :cond_4
+    if-eqz v2, :cond_4
 
-    invoke-virtual {v1}, Ljava/util/zip/ZipEntry;->getName()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/util/zip/ZipEntry;->getName()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v5
 
-    const-string v5, "__MACOSX"
+    const-string v6, "__MACOSX"
 
-    invoke-virtual {v4, v5}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
+    invoke-virtual {v5, v6}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_0
+    if-eqz v6, :cond_0
 
     invoke-virtual {p0}, Ljava/util/zip/ZipInputStream;->closeEntry()V
 
     goto :goto_2
 
     :cond_0
-    invoke-virtual {v1}, Ljava/util/zip/ZipEntry;->getName()Ljava/lang/String;
+    invoke-virtual {v2}, Ljava/util/zip/ZipEntry;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    const-string v5, ".json"
+    const-string v6, ".json"
 
-    invoke-virtual {v1, v5}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
+    invoke-virtual {v2, v6}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_1
+    if-eqz v2, :cond_1
 
-    invoke-static {p0}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v1
+    new-instance v2, Lp0/m;
 
-    invoke-static {v1}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
+    new-instance v4, Lp0/x;
 
-    move-result-object v1
+    invoke-direct {v4}, Lp0/x;-><init>()V
 
-    invoke-static {v1}, Lf/d/a/x/h0/c;->p(Lo0/g;)Lf/d/a/x/h0/c;
+    invoke-direct {v2, p0, v4}, Lp0/m;-><init>(Ljava/io/InputStream;Lp0/x;)V
 
-    move-result-object v1
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v3, 0x0
+    new-instance v4, Lp0/q;
 
-    invoke-static {v1, v2, v3}, Lf/d/a/e;->d(Lf/d/a/x/h0/c;Ljava/lang/String;Z)Lf/d/a/m;
+    invoke-direct {v4, v2}, Lp0/q;-><init>(Lp0/w;)V
 
-    move-result-object v1
+    invoke-static {v4}, Lf/d/a/x/h0/c;->p(Lp0/g;)Lf/d/a/x/h0/c;
 
-    iget-object v1, v1, Lf/d/a/m;->a:Ljava/lang/Object;
+    move-result-object v2
 
-    move-object v3, v1
+    const/4 v4, 0x0
 
-    check-cast v3, Lf/d/a/d;
+    invoke-static {v2, v3, v4}, Lf/d/a/e;->d(Lf/d/a/x/h0/c;Ljava/lang/String;Z)Lf/d/a/m;
+
+    move-result-object v2
+
+    iget-object v2, v2, Lf/d/a/m;->a:Ljava/lang/Object;
+
+    move-object v4, v2
+
+    check-cast v4, Lf/d/a/d;
 
     goto :goto_2
 
     :cond_1
-    const-string v1, ".png"
+    const-string v2, ".png"
 
-    invoke-virtual {v4, v1}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 
-    move-result v1
+    move-result v2
 
-    if-nez v1, :cond_3
+    if-nez v2, :cond_3
 
-    const-string v1, ".webp"
+    const-string v2, ".webp"
 
-    invoke-virtual {v4, v1}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
+    invoke-virtual {v5, v2}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_2
+    if-eqz v2, :cond_2
 
     goto :goto_1
 
@@ -512,35 +532,35 @@
 
     :cond_3
     :goto_1
-    const-string v1, "/"
+    const-string v2, "/"
 
-    invoke-virtual {v4, v1}, Ljava/lang/String;->split(Ljava/lang/String;)[Ljava/lang/String;
+    invoke-virtual {v5, v2}, Ljava/lang/String;->split(Ljava/lang/String;)[Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v2
 
-    array-length v4, v1
+    array-length v5, v2
 
-    add-int/lit8 v4, v4, -0x1
+    add-int/lit8 v5, v5, -0x1
 
-    aget-object v1, v1, v4
+    aget-object v2, v2, v5
 
     invoke-static {p0}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;)Landroid/graphics/Bitmap;
 
-    move-result-object v4
+    move-result-object v5
 
-    invoke-virtual {v0, v1, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v1, v2, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :goto_2
     invoke-virtual {p0}, Ljava/util/zip/ZipInputStream;->getNextEntry()Ljava/util/zip/ZipEntry;
 
-    move-result-object v1
+    move-result-object v2
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     goto :goto_0
 
     :cond_4
-    if-nez v3, :cond_5
+    if-nez v4, :cond_5
 
     new-instance p0, Lf/d/a/m;
 
@@ -555,7 +575,7 @@
     return-object p0
 
     :cond_5
-    invoke-virtual {v0}, Ljava/util/HashMap;->entrySet()Ljava/util/Set;
+    invoke-virtual {v1}, Ljava/util/HashMap;->entrySet()Ljava/util/Set;
 
     move-result-object p0
 
@@ -583,24 +603,24 @@
 
     check-cast v1, Ljava/lang/String;
 
-    iget-object v4, v3, Lf/d/a/d;->d:Ljava/util/Map;
+    iget-object v2, v4, Lf/d/a/d;->d:Ljava/util/Map;
 
-    invoke-interface {v4}, Ljava/util/Map;->values()Ljava/util/Collection;
+    invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    move-result-object v4
+    move-result-object v2
 
-    invoke-interface {v4}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+    invoke-interface {v2}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
-    move-result-object v4
+    move-result-object v2
 
     :cond_7
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
 
     if-eqz v5, :cond_8
 
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v5
 
@@ -617,7 +637,7 @@
     goto :goto_4
 
     :cond_8
-    move-object v5, v2
+    move-object v5, v3
 
     :goto_4
     if-eqz v5, :cond_6
@@ -630,9 +650,9 @@
 
     iget v1, v5, Lf/d/a/h;->a:I
 
-    iget v4, v5, Lf/d/a/h;->b:I
+    iget v2, v5, Lf/d/a/h;->b:I
 
-    invoke-static {v0, v1, v4}, Lf/d/a/y/g;->i(Landroid/graphics/Bitmap;II)Landroid/graphics/Bitmap;
+    invoke-static {v0, v1, v2}, Lf/d/a/y/g;->i(Landroid/graphics/Bitmap;II)Landroid/graphics/Bitmap;
 
     move-result-object v0
 
@@ -641,7 +661,7 @@
     goto :goto_3
 
     :cond_9
-    iget-object p0, v3, Lf/d/a/d;->d:Ljava/util/Map;
+    iget-object p0, v4, Lf/d/a/d;->d:Ljava/util/Map;
 
     invoke-interface {p0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -707,11 +727,11 @@
     :cond_b
     sget-object p0, Lf/d/a/v/g;->b:Lf/d/a/v/g;
 
-    invoke-virtual {p0, p1, v3}, Lf/d/a/v/g;->a(Ljava/lang/String;Lf/d/a/d;)V
+    invoke-virtual {p0, p1, v4}, Lf/d/a/v/g;->a(Ljava/lang/String;Lf/d/a/d;)V
 
     new-instance p0, Lf/d/a/m;
 
-    invoke-direct {p0, v3}, Lf/d/a/m;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v4}, Lf/d/a/m;-><init>(Ljava/lang/Object;)V
 
     return-object p0
 
diff --git a/com.discord/smali/f/d/a/g$f.smali b/com.discord/smali/f/d/a/g$f.smali
index 927839d343..cacab7e5c8 100644
--- a/com.discord/smali/f/d/a/g$f.smali
+++ b/com.discord/smali/f/d/a/g$f.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/d/a/g;
+.field public final synthetic a:Lf/d/a/g;
 
 
 # direct methods
 .method public constructor <init>(Lf/d/a/g;)V
     .locals 0
 
-    iput-object p1, p0, Lf/d/a/g$f;->d:Lf/d/a/g;
+    iput-object p1, p0, Lf/d/a/g$f;->a:Lf/d/a/g;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/d/a/g$f;->d:Lf/d/a/g;
+    iget-object p1, p0, Lf/d/a/g$f;->a:Lf/d/a/g;
 
     iget-object v0, p1, Lf/d/a/g;->o:Lf/d/a/v/l/c;
 
diff --git a/com.discord/smali/f/d/a/t/c/b.smali b/com.discord/smali/f/d/a/t/c/b.smali
index 6d7169cb6d..7cccfe5d6b 100644
--- a/com.discord/smali/f/d/a/t/c/b.smali
+++ b/com.discord/smali/f/d/a/t/c/b.smali
@@ -131,7 +131,7 @@
 
     move-result p1
 
-    invoke-static {p1, v0, v1}, Ld0/a/b/b/a;->E(FII)I
+    invoke-static {p1, v0, v1}, Le0/a/b/b/a;->E(FII)I
 
     move-result p1
 
diff --git a/com.discord/smali/f/d/a/t/c/d.smali b/com.discord/smali/f/d/a/t/c/d.smali
index cba2c62e69..718f4dfe61 100644
--- a/com.discord/smali/f/d/a/t/c/d.smali
+++ b/com.discord/smali/f/d/a/t/c/d.smali
@@ -129,7 +129,7 @@
 
     aget v5, v5, v2
 
-    invoke-static {p2, v4, v5}, Ld0/a/b/b/a;->E(FII)I
+    invoke-static {p2, v4, v5}, Le0/a/b/b/a;->E(FII)I
 
     move-result v4
 
diff --git a/com.discord/smali/f/d/a/v/j/n.smali b/com.discord/smali/f/d/a/v/j/n.smali
index 4242ff5ce5..7205217eac 100644
--- a/com.discord/smali/f/d/a/v/j/n.smali
+++ b/com.discord/smali/f/d/a/v/j/n.smali
@@ -152,7 +152,7 @@
 
     if-nez v1, :cond_0
 
-    const-string v1, "values="
+    const-string/jumbo v1, "values="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/f/d/a/x/a.smali b/com.discord/smali/f/d/a/x/a.smali
index 1a370f3597..d5a7c38a31 100644
--- a/com.discord/smali/f/d/a/x/a.smali
+++ b/com.discord/smali/f/d/a/x/a.smali
@@ -13,9 +13,9 @@
 
     const-string v0, "k"
 
-    const-string v1, "x"
+    const-string/jumbo v1, "x"
 
-    const-string v2, "y"
+    const-string/jumbo v2, "y"
 
     filled-new-array {v0, v1, v2}, [Ljava/lang/String;
 
@@ -201,7 +201,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v4
 
@@ -222,7 +222,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v3
 
diff --git a/com.discord/smali/f/d/a/x/a0.smali b/com.discord/smali/f/d/a/x/a0.smali
index 0d3f8218dd..89497c277c 100644
--- a/com.discord/smali/f/d/a/x/a0.smali
+++ b/com.discord/smali/f/d/a/x/a0.smali
@@ -35,7 +35,7 @@
 
     const-string v0, "c"
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
     const-string v2, "i"
 
diff --git a/com.discord/smali/f/d/a/x/b.smali b/com.discord/smali/f/d/a/x/b.smali
index 466f1d01ec..a30c73c902 100644
--- a/com.discord/smali/f/d/a/x/b.smali
+++ b/com.discord/smali/f/d/a/x/b.smali
@@ -126,28 +126,28 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v4
 
     goto :goto_1
 
     :cond_2
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v3
 
     goto :goto_1
 
     :cond_3
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
 
     move-result-object v2
 
     goto :goto_1
 
     :cond_4
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
 
     move-result-object v1
 
diff --git a/com.discord/smali/f/d/a/x/b0.smali b/com.discord/smali/f/d/a/x/b0.smali
index 7d8b36209d..9cd59a485d 100644
--- a/com.discord/smali/f/d/a/x/b0.smali
+++ b/com.discord/smali/f/d/a/x/b0.smali
@@ -123,14 +123,14 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
 
     move-result-object v8
 
     goto :goto_0
 
     :cond_4
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
 
     move-result-object v7
 
diff --git a/com.discord/smali/f/d/a/x/c.smali b/com.discord/smali/f/d/a/x/c.smali
index d40d9a535f..54a7168882 100644
--- a/com.discord/smali/f/d/a/x/c.smali
+++ b/com.discord/smali/f/d/a/x/c.smali
@@ -141,35 +141,35 @@
     goto/16 :goto_6
 
     :pswitch_0
-    invoke-static {v0, v8, v10}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v8, v10}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v13
 
     goto :goto_1
 
     :pswitch_1
-    invoke-static {v0, v8, v10}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v8, v10}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v14
 
     goto :goto_1
 
     :pswitch_2
-    invoke-static {v0, v8, v10}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v8, v10}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v23
 
     goto :goto_1
 
     :pswitch_3
-    invoke-static {v0, v8, v10}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v8, v10}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v22
 
     goto :goto_1
 
     :pswitch_4
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
 
     move-result-object v21
 
@@ -181,7 +181,7 @@
     invoke-virtual {v8, v1}, Lf/d/a/d;->a(Ljava/lang/String;)V
 
     :pswitch_6
-    invoke-static {v0, v8, v10}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v8, v10}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v5
 
@@ -332,7 +332,7 @@
 
     sget-object v2, Lf/d/a/x/z;->a:Lf/d/a/x/z;
 
-    invoke-static {v0, v8, v2}, Ld0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
+    invoke-static {v0, v8, v2}, Le0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
 
     move-result-object v2
 
diff --git a/com.discord/smali/f/d/a/x/d.smali b/com.discord/smali/f/d/a/x/d.smali
index fc91893c01..31bfaafa1f 100644
--- a/com.discord/smali/f/d/a/x/d.smali
+++ b/com.discord/smali/f/d/a/x/d.smali
@@ -127,7 +127,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
 
     move-result-object v7
 
diff --git a/com.discord/smali/f/d/a/x/e0.smali b/com.discord/smali/f/d/a/x/e0.smali
index 61c8cec2a9..6b51344dd4 100644
--- a/com.discord/smali/f/d/a/x/e0.smali
+++ b/com.discord/smali/f/d/a/x/e0.smali
@@ -17,7 +17,7 @@
 
     const-string v1, "c"
 
-    const-string v2, "w"
+    const-string/jumbo v2, "w"
 
     const-string v3, "o"
 
@@ -43,7 +43,7 @@
 
     const-string v0, "n"
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
     filled-new-array {v0, v1}, [Ljava/lang/String;
 
@@ -157,7 +157,7 @@
     goto :goto_2
 
     :cond_0
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v15
 
@@ -367,7 +367,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
 
     move-result-object v7
 
@@ -378,7 +378,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v8
 
@@ -389,7 +389,7 @@
 
     const/4 v2, 0x0
 
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->t0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/a;
 
     move-result-object v6
 
diff --git a/com.discord/smali/f/d/a/x/f0.smali b/com.discord/smali/f/d/a/x/f0.smali
index 1ec709dcc3..ba93c9e54a 100644
--- a/com.discord/smali/f/d/a/x/f0.smali
+++ b/com.discord/smali/f/d/a/x/f0.smali
@@ -150,21 +150,21 @@
     goto :goto_0
 
     :cond_5
-    invoke-static {p0, p1, v0}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {p0, p1, v0}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v8
 
     goto :goto_0
 
     :cond_6
-    invoke-static {p0, p1, v0}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {p0, p1, v0}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v7
 
     goto :goto_0
 
     :cond_7
-    invoke-static {p0, p1, v0}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {p0, p1, v0}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v6
 
diff --git a/com.discord/smali/f/d/a/x/h0/c$a.smali b/com.discord/smali/f/d/a/x/h0/c$a.smali
index e0a23658b8..d3c5c0cff6 100644
--- a/com.discord/smali/f/d/a/x/h0/c$a.smali
+++ b/com.discord/smali/f/d/a/x/h0/c$a.smali
@@ -17,18 +17,18 @@
 # instance fields
 .field public final a:[Ljava/lang/String;
 
-.field public final b:Lo0/n;
+.field public final b:Lp0/n;
 
 
 # direct methods
-.method public constructor <init>([Ljava/lang/String;Lo0/n;)V
+.method public constructor <init>([Ljava/lang/String;Lp0/n;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lf/d/a/x/h0/c$a;->a:[Ljava/lang/String;
 
-    iput-object p2, p0, Lf/d/a/x/h0/c$a;->b:Lo0/n;
+    iput-object p2, p0, Lf/d/a/x/h0/c$a;->b:Lp0/n;
 
     return-void
 .end method
@@ -41,9 +41,9 @@
 
     new-array v0, v0, [Lokio/ByteString;
 
-    new-instance v1, Lo0/e;
+    new-instance v1, Lp0/e;
 
-    invoke-direct {v1}, Lo0/e;-><init>()V
+    invoke-direct {v1}, Lp0/e;-><init>()V
 
     const/4 v2, 0x0
 
@@ -60,7 +60,7 @@
 
     const/16 v6, 0x22
 
-    invoke-virtual {v1, v6}, Lo0/e;->I(I)Lo0/e;
+    invoke-virtual {v1, v6}, Lp0/e;->I(I)Lp0/e;
 
     invoke-virtual {v4}, Ljava/lang/String;->length()I
 
@@ -107,10 +107,10 @@
     :goto_2
     if-ge v9, v8, :cond_3
 
-    invoke-virtual {v1, v4, v9, v8}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
+    invoke-virtual {v1, v4, v9, v8}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
 
     :cond_3
-    invoke-virtual {v1, v10}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
+    invoke-virtual {v1, v10}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
 
     add-int/lit8 v9, v8, 0x1
 
@@ -123,14 +123,14 @@
     :cond_5
     if-ge v9, v7, :cond_6
 
-    invoke-virtual {v1, v4, v9, v7}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
+    invoke-virtual {v1, v4, v9, v7}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
 
     :cond_6
-    invoke-virtual {v1, v6}, Lo0/e;->I(I)Lo0/e;
+    invoke-virtual {v1, v6}, Lp0/e;->I(I)Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
-    invoke-virtual {v1}, Lo0/e;->n()Lokio/ByteString;
+    invoke-virtual {v1}, Lp0/e;->n()Lokio/ByteString;
 
     move-result-object v4
 
@@ -149,13 +149,13 @@
 
     check-cast p0, [Ljava/lang/String;
 
-    sget-object v2, Lo0/n;->f:Lo0/n$a;
+    sget-object v2, Lp0/n;->f:Lp0/n$a;
 
-    invoke-virtual {v2, v0}, Lo0/n$a;->c([Lokio/ByteString;)Lo0/n;
+    invoke-virtual {v2, v0}, Lp0/n$a;->c([Lokio/ByteString;)Lp0/n;
 
     move-result-object v0
 
-    invoke-direct {v1, p0, v0}, Lf/d/a/x/h0/c$a;-><init>([Ljava/lang/String;Lo0/n;)V
+    invoke-direct {v1, p0, v0}, Lf/d/a/x/h0/c$a;-><init>([Ljava/lang/String;Lp0/n;)V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali/f/d/a/x/h0/c.smali b/com.discord/smali/f/d/a/x/h0/c.smali
index 4c6bcf540e..f3a3173e47 100644
--- a/com.discord/smali/f/d/a/x/h0/c.smali
+++ b/com.discord/smali/f/d/a/x/h0/c.smali
@@ -142,12 +142,12 @@
     return-void
 .end method
 
-.method public static p(Lo0/g;)Lf/d/a/x/h0/c;
+.method public static p(Lp0/g;)Lf/d/a/x/h0/c;
     .locals 1
 
     new-instance v0, Lf/d/a/x/h0/d;
 
-    invoke-direct {v0, p0}, Lf/d/a/x/h0/d;-><init>(Lo0/g;)V
+    invoke-direct {v0, p0}, Lf/d/a/x/h0/d;-><init>(Lp0/g;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/f/d/a/x/h0/d.smali b/com.discord/smali/f/d/a/x/h0/d.smali
index d691ff181f..38436ae849 100644
--- a/com.discord/smali/f/d/a/x/h0/d.smali
+++ b/com.discord/smali/f/d/a/x/h0/d.smali
@@ -16,9 +16,9 @@
 
 
 # instance fields
-.field public final i:Lo0/g;
+.field public final i:Lp0/g;
 
-.field public final j:Lo0/e;
+.field public final j:Lp0/e;
 
 .field public k:I
 
@@ -34,7 +34,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 1
+    .locals 2
 
     const-string v0, "\'\\"
 
@@ -46,7 +46,11 @@
 
     const-string v0, "\"\\"
 
-    invoke-static {v0}, Lokio/ByteString;->g(Ljava/lang/String;)Lokio/ByteString;
+    const-string v1, "$receiver"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lp0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
@@ -54,7 +58,9 @@
 
     const-string/jumbo v0, "{}[]:, \n\t\r\u000c/\\;#="
 
-    invoke-static {v0}, Lokio/ByteString;->g(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lp0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
@@ -62,7 +68,9 @@
 
     const-string v0, "\n\r"
 
-    invoke-static {v0}, Lokio/ByteString;->g(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lp0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
@@ -70,7 +78,9 @@
 
     const-string v0, "*/"
 
-    invoke-static {v0}, Lokio/ByteString;->g(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lp0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object v0
 
@@ -79,7 +89,7 @@
     return-void
 .end method
 
-.method public constructor <init>(Lo0/g;)V
+.method public constructor <init>(Lp0/g;)V
     .locals 1
 
     invoke-direct {p0}, Lf/d/a/x/h0/c;-><init>()V
@@ -90,13 +100,13 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iput-object p1, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
-    invoke-interface {p1}, Lo0/g;->h()Lo0/e;
+    invoke-interface {p1}, Lp0/g;->h()Lp0/e;
 
     move-result-object p1
 
-    iput-object p1, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iput-object p1, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     const/4 p1, 0x6
 
@@ -192,9 +202,9 @@
 
     move-result v1
 
-    iget-object v2, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v2}, Lo0/e;->readByte()B
+    invoke-virtual {v2}, Lp0/e;->readByte()B
 
     if-eq v1, v8, :cond_a
 
@@ -236,9 +246,9 @@
 
     move-result v1
 
-    iget-object v2, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v2}, Lo0/e;->readByte()B
+    invoke-virtual {v2}, Lp0/e;->readByte()B
 
     const/16 v2, 0x3a
 
@@ -321,11 +331,11 @@
 
     if-eq v1, v2, :cond_31
 
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     const-wide/16 v2, 0x0
 
-    invoke-virtual {v1, v2, v3}, Lo0/e;->e(J)B
+    invoke-virtual {v1, v2, v3}, Lp0/e;->e(J)B
 
     move-result v1
 
@@ -396,13 +406,13 @@
     :goto_4
     if-ge v8, v7, :cond_13
 
-    iget-object v15, v0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v15, v0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     add-int/lit8 v11, v8, 0x1
 
     int-to-long v12, v11
 
-    invoke-interface {v15, v12, v13}, Lo0/g;->m(J)Z
+    invoke-interface {v15, v12, v13}, Lp0/g;->m(J)Z
 
     move-result v12
 
@@ -415,11 +425,11 @@
     goto :goto_6
 
     :cond_11
-    iget-object v12, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v12, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     int-to-long v9, v8
 
-    invoke-virtual {v12, v9, v10}, Lo0/e;->e(J)B
+    invoke-virtual {v12, v9, v10}, Lp0/e;->e(J)B
 
     move-result v9
 
@@ -455,23 +465,23 @@
     goto :goto_4
 
     :cond_13
-    iget-object v1, v0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     add-int/lit8 v5, v7, 0x1
 
     int-to-long v8, v5
 
-    invoke-interface {v1, v8, v9}, Lo0/g;->m(J)Z
+    invoke-interface {v1, v8, v9}, Lp0/g;->m(J)Z
 
     move-result v1
 
     if-eqz v1, :cond_14
 
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     int-to-long v8, v7
 
-    invoke-virtual {v1, v8, v9}, Lo0/e;->e(J)B
+    invoke-virtual {v1, v8, v9}, Lp0/e;->e(J)B
 
     move-result v1
 
@@ -484,11 +494,11 @@
     goto :goto_5
 
     :cond_14
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     int-to-long v7, v7
 
-    invoke-virtual {v1, v7, v8}, Lo0/e;->skip(J)V
+    invoke-virtual {v1, v7, v8}, Lp0/e;->skip(J)V
 
     iput v6, v0, Lf/d/a/x/h0/d;->k:I
 
@@ -509,13 +519,13 @@
     const/4 v9, 0x0
 
     :goto_7
-    iget-object v10, v0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v10, v0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     add-int/lit8 v11, v5, 0x1
 
     int-to-long v2, v11
 
-    invoke-interface {v10, v2, v3}, Lo0/g;->m(J)Z
+    invoke-interface {v10, v2, v3}, Lp0/g;->m(J)Z
 
     move-result v2
 
@@ -527,11 +537,11 @@
     goto/16 :goto_e
 
     :cond_16
-    iget-object v2, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     int-to-long v13, v5
 
-    invoke-virtual {v2, v13, v14}, Lo0/e;->e(J)B
+    invoke-virtual {v2, v13, v14}, Lp0/e;->e(J)B
 
     move-result v2
 
@@ -724,11 +734,11 @@
     :goto_f
     iput-wide v7, v0, Lf/d/a/x/h0/d;->l:J
 
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     int-to-long v2, v5
 
-    invoke-virtual {v1, v2, v3}, Lo0/e;->skip(J)V
+    invoke-virtual {v1, v2, v3}, Lp0/e;->skip(J)V
 
     const/16 v15, 0x10
 
@@ -853,11 +863,11 @@
     return v15
 
     :cond_2f
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     const-wide/16 v2, 0x0
 
-    invoke-virtual {v1, v2, v3}, Lo0/e;->e(J)B
+    invoke-virtual {v1, v2, v3}, Lp0/e;->e(J)B
 
     move-result v1
 
@@ -879,9 +889,9 @@
     throw v16
 
     :cond_31
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
     iput v4, v0, Lf/d/a/x/h0/d;->k:I
 
@@ -890,9 +900,9 @@
     :cond_32
     if-ne v3, v4, :cond_34
 
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
     const/4 v1, 0x4
 
@@ -901,9 +911,9 @@
     return v1
 
     :cond_33
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
     const/4 v1, 0x3
 
@@ -939,9 +949,9 @@
     throw v16
 
     :cond_38
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
     const/16 v1, 0x9
 
@@ -980,9 +990,9 @@
 
     move-result v2
 
-    iget-object v6, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v6, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v6}, Lo0/e;->readByte()B
+    invoke-virtual {v6}, Lp0/e;->readByte()B
 
     if-eq v2, v8, :cond_3d
 
@@ -1025,9 +1035,9 @@
 
     if-eq v3, v1, :cond_3e
 
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
     const/4 v1, 0x2
 
@@ -1048,18 +1058,18 @@
     throw v16
 
     :cond_40
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
     invoke-virtual/range {p0 .. p0}, Lf/d/a/x/h0/d;->A()V
 
     throw v16
 
     :cond_41
-    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, v0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v1}, Lo0/e;->readByte()B
+    invoke-virtual {v1}, Lp0/e;->readByte()B
 
     const/16 v1, 0xd
 
@@ -1214,23 +1224,23 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v1, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     add-int/lit8 v2, v0, 0x1
 
     int-to-long v3, v2
 
-    invoke-interface {v1, v3, v4}, Lo0/g;->m(J)Z
+    invoke-interface {v1, v3, v4}, Lp0/g;->m(J)Z
 
     move-result v1
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v1, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     int-to-long v3, v0
 
-    invoke-virtual {v1, v3, v4}, Lo0/e;->e(J)B
+    invoke-virtual {v1, v3, v4}, Lp0/e;->e(J)B
 
     move-result v0
 
@@ -1253,13 +1263,13 @@
     goto :goto_1
 
     :cond_0
-    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     add-int/lit8 v2, v2, -0x1
 
     int-to-long v1, v2
 
-    invoke-virtual {p1, v1, v2}, Lo0/e;->skip(J)V
+    invoke-virtual {p1, v1, v2}, Lp0/e;->skip(J)V
 
     const/16 p1, 0x2f
 
@@ -1267,11 +1277,11 @@
 
     if-ne v0, p1, :cond_2
 
-    iget-object p1, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object p1, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     const-wide/16 v2, 0x2
 
-    invoke-interface {p1, v2, v3}, Lo0/g;->m(J)Z
+    invoke-interface {p1, v2, v3}, Lp0/g;->m(J)Z
 
     move-result p1
 
@@ -1332,9 +1342,9 @@
     move-object v1, v0
 
     :goto_0
-    iget-object v2, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
-    invoke-interface {v2, p1}, Lo0/g;->S(Lokio/ByteString;)J
+    invoke-interface {v2, p1}, Lp0/g;->S(Lokio/ByteString;)J
 
     move-result-wide v2
 
@@ -1344,9 +1354,9 @@
 
     if-eqz v6, :cond_3
 
-    iget-object v4, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v4, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v4, v2, v3}, Lo0/e;->e(J)B
+    invoke-virtual {v4, v2, v3}, Lp0/e;->e(J)B
 
     move-result v4
 
@@ -1361,17 +1371,17 @@
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
     :cond_0
-    iget-object v4, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v4, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v4, v2, v3}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {v4, v2, v3}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v2}, Lo0/e;->readByte()B
+    invoke-virtual {v2}, Lp0/e;->readByte()B
 
     invoke-virtual {p0}, Lf/d/a/x/h0/d;->K()C
 
@@ -1384,30 +1394,30 @@
     :cond_1
     if-nez v1, :cond_2
 
-    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {p1, v2, v3}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {p1, v2, v3}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v0}, Lo0/e;->readByte()B
+    invoke-virtual {v0}, Lp0/e;->readByte()B
 
     return-object p1
 
     :cond_2
-    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {p1, v2, v3}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {p1, v2, v3}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object p1
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {p1}, Lo0/e;->readByte()B
+    invoke-virtual {p1}, Lp0/e;->readByte()B
 
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -1431,11 +1441,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     sget-object v1, Lf/d/a/x/h0/d;->q:Lokio/ByteString;
 
-    invoke-interface {v0, v1}, Lo0/g;->S(Lokio/ByteString;)J
+    invoke-interface {v0, v1}, Lp0/g;->S(Lokio/ByteString;)J
 
     move-result-wide v0
 
@@ -1445,18 +1455,18 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v2, v0, v1}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {v2, v0, v1}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v0}, Lo0/e;->v()Ljava/lang/String;
+    invoke-virtual {v0}, Lp0/e;->v()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1472,11 +1482,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     const-wide/16 v1, 0x1
 
-    invoke-interface {v0, v1, v2}, Lo0/g;->m(J)Z
+    invoke-interface {v0, v1, v2}, Lp0/g;->m(J)Z
 
     move-result v0
 
@@ -1484,9 +1494,9 @@
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v0}, Lo0/e;->readByte()B
+    invoke-virtual {v0}, Lp0/e;->readByte()B
 
     move-result v0
 
@@ -1553,11 +1563,11 @@
     throw v1
 
     :cond_0
-    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     const-wide/16 v4, 0x4
 
-    invoke-interface {v0, v4, v5}, Lo0/g;->m(J)Z
+    invoke-interface {v0, v4, v5}, Lp0/g;->m(J)Z
 
     move-result v0
 
@@ -1572,11 +1582,11 @@
 
     if-ge v0, v7, :cond_4
 
-    iget-object v7, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v7, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     int-to-long v8, v0
 
-    invoke-virtual {v7, v8, v9}, Lo0/e;->e(J)B
+    invoke-virtual {v7, v8, v9}, Lp0/e;->e(J)B
 
     move-result v7
 
@@ -1637,9 +1647,9 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v2, v4, v5}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {v2, v4, v5}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object v2
 
@@ -1654,9 +1664,9 @@
     throw v1
 
     :cond_4
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v0, v4, v5}, Lo0/e;->skip(J)V
+    invoke-virtual {v0, v4, v5}, Lp0/e;->skip(J)V
 
     return v6
 
@@ -1728,9 +1738,9 @@
     .end annotation
 
     :goto_0
-    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
-    invoke-interface {v0, p1}, Lo0/g;->S(Lokio/ByteString;)J
+    invoke-interface {v0, p1}, Lp0/g;->S(Lokio/ByteString;)J
 
     move-result-wide v0
 
@@ -1740,9 +1750,9 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    invoke-virtual {v2, v0, v1}, Lo0/e;->e(J)B
+    invoke-virtual {v2, v0, v1}, Lp0/e;->e(J)B
 
     move-result v2
 
@@ -1752,22 +1762,22 @@
 
     if-ne v2, v3, :cond_0
 
-    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     add-long/2addr v0, v4
 
-    invoke-virtual {v2, v0, v1}, Lo0/e;->skip(J)V
+    invoke-virtual {v2, v0, v1}, Lp0/e;->skip(J)V
 
     invoke-virtual {p0}, Lf/d/a/x/h0/d;->K()C
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object p1, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     add-long/2addr v0, v4
 
-    invoke-virtual {p1, v0, v1}, Lo0/e;->skip(J)V
+    invoke-virtual {p1, v0, v1}, Lp0/e;->skip(J)V
 
     return-void
 
@@ -1789,15 +1799,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     sget-object v1, Lf/d/a/x/h0/d;->q:Lokio/ByteString;
 
-    invoke-interface {v0, v1}, Lo0/g;->S(Lokio/ByteString;)J
+    invoke-interface {v0, v1}, Lp0/g;->S(Lokio/ByteString;)J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     const-wide/16 v3, -0x1
 
@@ -1808,10 +1818,10 @@
     goto :goto_0
 
     :cond_0
-    iget-wide v0, v2, Lo0/e;->e:J
+    iget-wide v0, v2, Lp0/e;->e:J
 
     :goto_0
-    invoke-virtual {v2, v0, v1}, Lo0/e;->skip(J)V
+    invoke-virtual {v2, v0, v1}, Lp0/e;->skip(J)V
 
     return-void
 .end method
@@ -2053,15 +2063,15 @@
 
     iput v0, p0, Lf/d/a/x/h0/c;->d:I
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
-    iget-wide v1, v0, Lo0/e;->e:J
+    iget-wide v1, v0, Lp0/e;->e:J
 
-    invoke-virtual {v0, v1, v2}, Lo0/e;->skip(J)V
+    invoke-virtual {v0, v1, v2}, Lp0/e;->skip(J)V
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
-    invoke-interface {v0}, Lo0/w;->close()V
+    invoke-interface {v0}, Lp0/w;->close()V
 
     return-void
 .end method
@@ -2339,13 +2349,13 @@
 
     if-ne v0, v1, :cond_2
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     iget v1, p0, Lf/d/a/x/h0/d;->m:I
 
     int-to-long v6, v1
 
-    invoke-virtual {v0, v6, v7}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {v0, v6, v7}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object v0
 
@@ -2616,13 +2626,13 @@
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     iget v1, p0, Lf/d/a/x/h0/d;->m:I
 
     int-to-long v6, v1
 
-    invoke-virtual {v0, v6, v7}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {v0, v6, v7}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object v0
 
@@ -3009,13 +3019,13 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     iget v1, p0, Lf/d/a/x/h0/d;->m:I
 
     int-to-long v1, v1
 
-    invoke-virtual {v0, v1, v2}, Lo0/e;->w(J)Ljava/lang/String;
+    invoke-virtual {v0, v1, v2}, Lp0/e;->w(J)Ljava/lang/String;
 
     move-result-object v0
 
@@ -3181,7 +3191,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v1, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -3237,11 +3247,11 @@
     return p1
 
     :cond_2
-    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lo0/g;
+    iget-object v0, p0, Lf/d/a/x/h0/d;->i:Lp0/g;
 
-    iget-object v3, p1, Lf/d/a/x/h0/c$a;->b:Lo0/n;
+    iget-object v3, p1, Lf/d/a/x/h0/c$a;->b:Lp0/n;
 
-    invoke-interface {v0, v3}, Lo0/g;->X0(Lo0/n;)I
+    invoke-interface {v0, v3}, Lp0/g;->X0(Lp0/n;)I
 
     move-result v0
 
@@ -3583,13 +3593,13 @@
 
     if-ne v2, v3, :cond_b
 
-    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lo0/e;
+    iget-object v2, p0, Lf/d/a/x/h0/d;->j:Lp0/e;
 
     iget v3, p0, Lf/d/a/x/h0/d;->m:I
 
     int-to-long v5, v3
 
-    invoke-virtual {v2, v5, v6}, Lo0/e;->skip(J)V
+    invoke-virtual {v2, v5, v6}, Lp0/e;->skip(J)V
 
     goto :goto_4
 
diff --git a/com.discord/smali/f/d/a/x/i.smali b/com.discord/smali/f/d/a/x/i.smali
index b57c75b111..dc0cf1c516 100644
--- a/com.discord/smali/f/d/a/x/i.smali
+++ b/com.discord/smali/f/d/a/x/i.smali
@@ -17,7 +17,7 @@
 
     const-string v1, "size"
 
-    const-string v2, "w"
+    const-string/jumbo v2, "w"
 
     const-string v3, "style"
 
diff --git a/com.discord/smali/f/d/a/x/l.smali b/com.discord/smali/f/d/a/x/l.smali
index 4aad96d476..d7e56c74b5 100644
--- a/com.discord/smali/f/d/a/x/l.smali
+++ b/com.discord/smali/f/d/a/x/l.smali
@@ -136,14 +136,14 @@
     goto :goto_0
 
     :pswitch_2
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
 
     move-result-object v10
 
     goto :goto_0
 
     :pswitch_3
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
 
     move-result-object v9
 
@@ -169,7 +169,7 @@
     goto :goto_0
 
     :pswitch_5
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
 
     move-result-object v8
 
@@ -210,7 +210,7 @@
 
     invoke-direct {v2, v0}, Lf/d/a/x/k;-><init>(I)V
 
-    invoke-static {p0, p1, v2}, Ld0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
+    invoke-static {p0, p1, v2}, Le0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
 
     move-result-object v2
 
diff --git a/com.discord/smali/f/d/a/x/m.smali b/com.discord/smali/f/d/a/x/m.smali
index e54794073a..7fbe115c2d 100644
--- a/com.discord/smali/f/d/a/x/m.smali
+++ b/com.discord/smali/f/d/a/x/m.smali
@@ -27,7 +27,7 @@
 
     const-string v5, "e"
 
-    const-string v6, "w"
+    const-string/jumbo v6, "w"
 
     const-string v7, "lc"
 
@@ -65,7 +65,7 @@
 
     const-string v0, "n"
 
-    const-string v1, "v"
+    const-string/jumbo v1, "v"
 
     filled-new-array {v0, v1}, [Ljava/lang/String;
 
@@ -187,7 +187,7 @@
     goto :goto_3
 
     :cond_0
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v3
 
@@ -345,21 +345,21 @@
     goto/16 :goto_0
 
     :pswitch_5
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v10
 
     goto/16 :goto_0
 
     :pswitch_6
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
 
     move-result-object v9
 
     goto/16 :goto_0
 
     :pswitch_7
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
 
     move-result-object v8
 
@@ -387,7 +387,7 @@
     goto/16 :goto_0
 
     :pswitch_9
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
 
     move-result-object v7
 
@@ -434,7 +434,7 @@
 
     invoke-direct {v6, v2}, Lf/d/a/x/k;-><init>(I)V
 
-    invoke-static {v0, v1, v6}, Ld0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
+    invoke-static {v0, v1, v6}, Le0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
 
     move-result-object v6
 
diff --git a/com.discord/smali/f/d/a/x/o.smali b/com.discord/smali/f/d/a/x/o.smali
index 099e95f114..790240abb6 100644
--- a/com.discord/smali/f/d/a/x/o.smali
+++ b/com.discord/smali/f/d/a/x/o.smali
@@ -11,9 +11,9 @@
 .method public static constructor <clinit>()V
     .locals 2
 
-    const-string v0, "x"
+    const-string/jumbo v0, "x"
 
-    const-string v1, "y"
+    const-string/jumbo v1, "y"
 
     filled-new-array {v0, v1}, [Ljava/lang/String;
 
diff --git a/com.discord/smali/f/d/a/x/r.smali b/com.discord/smali/f/d/a/x/r.smali
index 7ac7c0f8aa..a4314fa5b1 100644
--- a/com.discord/smali/f/d/a/x/r.smali
+++ b/com.discord/smali/f/d/a/x/r.smali
@@ -47,7 +47,7 @@
 
     const-string v15, "st"
 
-    const-string v16, "w"
+    const-string/jumbo v16, "w"
 
     const-string v17, "h"
 
@@ -322,7 +322,7 @@
     goto :goto_0
 
     :pswitch_2
-    invoke-static {v0, v7, v3}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v7, v3}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v31
 
@@ -539,7 +539,7 @@
 
     sget-object v5, Lf/d/a/x/g;->a:Lf/d/a/x/g;
 
-    invoke-static {v0, v7, v5}, Ld0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
+    invoke-static {v0, v7, v5}, Le0/a/b/b/a;->s0(Lf/d/a/x/h0/c;Lf/d/a/d;Lf/d/a/x/g0;)Ljava/util/List;
 
     move-result-object v5
 
@@ -734,7 +734,7 @@
     goto/16 :goto_f
 
     :cond_10
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->w0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/d;
 
     move-result-object v5
 
diff --git a/com.discord/smali/f/d/a/x/s.smali b/com.discord/smali/f/d/a/x/s.smali
index 7681e95d1a..ac0b4a55c7 100644
--- a/com.discord/smali/f/d/a/x/s.smali
+++ b/com.discord/smali/f/d/a/x/s.smali
@@ -17,7 +17,7 @@
 .method public static constructor <clinit>()V
     .locals 11
 
-    const-string v0, "w"
+    const-string/jumbo v0, "w"
 
     const-string v1, "h"
 
@@ -27,7 +27,7 @@
 
     const-string v4, "fr"
 
-    const-string v5, "v"
+    const-string/jumbo v5, "v"
 
     const-string v6, "layers"
 
@@ -53,7 +53,7 @@
 
     const-string v2, "layers"
 
-    const-string v3, "w"
+    const-string/jumbo v3, "w"
 
     const-string v4, "h"
 
diff --git a/com.discord/smali/f/d/a/x/w.smali b/com.discord/smali/f/d/a/x/w.smali
index d4ff74e497..e5f1ae3e65 100644
--- a/com.discord/smali/f/d/a/x/w.smali
+++ b/com.discord/smali/f/d/a/x/w.smali
@@ -107,35 +107,35 @@
     goto :goto_0
 
     :pswitch_1
-    invoke-static {v0, v1, v2}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v1, v2}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v12
 
     goto :goto_0
 
     :pswitch_2
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v10
 
     goto :goto_0
 
     :pswitch_3
-    invoke-static {v0, v1, v2}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v1, v2}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v13
 
     goto :goto_0
 
     :pswitch_4
-    invoke-static/range {p0 .. p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static/range {p0 .. p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v11
 
     goto :goto_0
 
     :pswitch_5
-    invoke-static {v0, v1, v2}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v1, v2}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v9
 
@@ -149,7 +149,7 @@
     goto :goto_0
 
     :pswitch_7
-    invoke-static {v0, v1, v2}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {v0, v1, v2}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v7
 
diff --git a/com.discord/smali/f/d/a/x/x.smali b/com.discord/smali/f/d/a/x/x.smali
index 4309fa094b..ecec6dec04 100644
--- a/com.discord/smali/f/d/a/x/x.smali
+++ b/com.discord/smali/f/d/a/x/x.smali
@@ -99,14 +99,14 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->u0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/b;
 
     move-result-object v6
 
     goto :goto_0
 
     :cond_2
-    invoke-static {p0, p1}, Ld0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
+    invoke-static {p0, p1}, Le0/a/b/b/a;->x0(Lf/d/a/x/h0/c;Lf/d/a/d;)Lf/d/a/v/j/f;
 
     move-result-object v5
 
diff --git a/com.discord/smali/f/d/a/x/y.smali b/com.discord/smali/f/d/a/x/y.smali
index 5392a3cbbe..91ef82c3d4 100644
--- a/com.discord/smali/f/d/a/x/y.smali
+++ b/com.discord/smali/f/d/a/x/y.smali
@@ -106,14 +106,14 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {p0, p1, v0}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {p0, p1, v0}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v5
 
     goto :goto_0
 
     :cond_3
-    invoke-static {p0, p1, v0}, Ld0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
+    invoke-static {p0, p1, v0}, Le0/a/b/b/a;->v0(Lf/d/a/x/h0/c;Lf/d/a/d;Z)Lf/d/a/v/j/b;
 
     move-result-object v4
 
diff --git a/com.discord/smali/f/d/a/z/d.smali b/com.discord/smali/f/d/a/z/d.smali
index c91c88c3c6..3eff3eafa0 100644
--- a/com.discord/smali/f/d/a/z/d.smali
+++ b/com.discord/smali/f/d/a/z/d.smali
@@ -49,7 +49,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder;
 
-    const-string v1, "x"
+    const-string/jumbo v1, "x"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/f/e/a/a/a$b.smali b/com.discord/smali/f/e/a/a/a$b.smali
index 5396fa56cc..8d6ecb6543 100644
--- a/com.discord/smali/f/e/a/a/a$b.smali
+++ b/com.discord/smali/f/e/a/a/a$b.smali
@@ -56,7 +56,7 @@
 
     const-string v0, "Install Referrer service connected."
 
-    invoke-static {p1, v0}, Ld0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Le0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/e/a/a/a$b;->e:Lf/e/a/a/a;
 
@@ -88,7 +88,7 @@
 
     const-string v0, "Install Referrer service disconnected."
 
-    invoke-static {p1, v0}, Ld0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Le0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/e/a/a/a$b;->e:Lf/e/a/a/a;
 
diff --git a/com.discord/smali/f/e/a/a/a.smali b/com.discord/smali/f/e/a/a/a.smali
index 1859a080a1..73de9a861c 100644
--- a/com.discord/smali/f/e/a/a/a.smali
+++ b/com.discord/smali/f/e/a/a/a.smali
@@ -92,7 +92,7 @@
 
     const-string v2, "RemoteException getting install referrer information"
 
-    invoke-static {v1, v2}, Ld0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Le0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -125,7 +125,7 @@
 
     const-string v0, "Service connection is valid. No need to re-initialize."
 
-    invoke-static {v2, v0}, Ld0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Le0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-interface {p1, v1}, Lf/e/a/a/b;->onInstallReferrerSetupFinished(I)V
 
@@ -142,7 +142,7 @@
 
     const-string v0, "Client is already in the process of connecting to the service."
 
-    invoke-static {v2, v0}, Ld0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Le0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-interface {p1, v3}, Lf/e/a/a/b;->onInstallReferrerSetupFinished(I)V
 
@@ -153,7 +153,7 @@
 
     const-string v0, "Client was already closed and can\'t be reused. Please create another instance."
 
-    invoke-static {v2, v0}, Ld0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Le0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-interface {p1, v3}, Lf/e/a/a/b;->onInstallReferrerSetupFinished(I)V
 
@@ -162,7 +162,7 @@
     :cond_2
     const-string v0, "Starting install referrer service setup."
 
-    invoke-static {v2, v0}, Ld0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Le0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -276,14 +276,14 @@
 
     const-string p1, "Service was bonded successfully."
 
-    invoke-static {v2, p1}, Ld0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Le0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 
     :cond_4
     const-string v0, "Connection to service is blocked."
 
-    invoke-static {v2, v0}, Ld0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Le0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
 
     iput v1, p0, Lf/e/a/a/a;->a:I
 
@@ -294,7 +294,7 @@
     :cond_5
     const-string v0, "Play Store missing or incompatible. Version 8.3.73 or later required."
 
-    invoke-static {v2, v0}, Ld0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Le0/a/b/b/a;->o0(Ljava/lang/String;Ljava/lang/String;)V
 
     iput v1, p0, Lf/e/a/a/a;->a:I
 
@@ -307,7 +307,7 @@
 
     const-string v0, "Install Referrer service unavailable on device."
 
-    invoke-static {v2, v0}, Ld0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Le0/a/b/b/a;->n0(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-interface {p1, v6}, Lf/e/a/a/b;->onInstallReferrerSetupFinished(I)V
 
diff --git a/com.discord/smali/f/e/b/a/a.smali b/com.discord/smali/f/e/b/a/a.smali
index aab7e582f8..7960f671c9 100644
--- a/com.discord/smali/f/e/b/a/a.smali
+++ b/com.discord/smali/f/e/b/a/a.smali
@@ -15,7 +15,7 @@
 
     move-result-object p0
 
-    invoke-static {p0, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -160,7 +160,31 @@
     return-object v0
 .end method
 
-.method public static K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+.method public static K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+    .locals 1
+
+    new-instance v0, Lk0/o/c/r;
+
+    invoke-direct {v0, p0, p1, p2, p3}, Lk0/o/c/r;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    invoke-static {v0}, Lk0/o/c/t;->property1(Lk0/o/c/q;)Lk0/s/d;
+
+    return-object v0
+.end method
+
+.method public static L(Lcom/discord/models/domain/Model$JsonReader;Ljava/lang/String;)Lkotlin/jvm/internal/Ref$ObjectRef;
+    .locals 0
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {p0}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    return-object p0
+.end method
+
+.method public static M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -180,7 +204,7 @@
     return-void
 .end method
 
-.method public static L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+.method public static N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -202,7 +226,7 @@
     return-void
 .end method
 
-.method public static M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+.method public static O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
     .locals 0
 
     invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
@@ -222,7 +246,7 @@
     return-void
 .end method
 
-.method public static N(Ljava/lang/String;ILjava/lang/String;)V
+.method public static P(Ljava/lang/String;ILjava/lang/String;)V
     .locals 1
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -242,7 +266,7 @@
     return-void
 .end method
 
-.method public static O(Ljava/lang/String;ILjava/lang/String;)V
+.method public static Q(Ljava/lang/String;ILjava/lang/String;)V
     .locals 1
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -262,7 +286,7 @@
     return-void
 .end method
 
-.method public static P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+.method public static R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
     .locals 1
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -282,7 +306,7 @@
     return-void
 .end method
 
-.method public static Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+.method public static S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
     new-instance v0, Ljava/lang/StringBuilder;
@@ -302,7 +326,21 @@
     return-void
 .end method
 
-.method public static R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+.method public static T(Ljava/lang/String;II)I
+    .locals 0
+
+    invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
+
+    move-result p0
+
+    add-int/2addr p0, p1
+
+    mul-int p0, p0, p2
+
+    return p0
+.end method
+
+.method public static U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
     invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -316,7 +354,7 @@
     return-void
 .end method
 
-.method public static S(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
+.method public static V(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;Landroid/content/ContentResolver;Ljava/util/HashMap;Ljava/lang/String;)V
     .locals 0
 
     invoke-static {p0, p1, p2}, Lf/c/a/n1;->g(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
@@ -336,49 +374,35 @@
     return-void
 .end method
 
-.method public static T(Ljava/lang/String;II)I
+.method public static W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
     .locals 0
 
-    invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
 
     move-result p0
 
-    add-int/2addr p0, p1
+    invoke-virtual {p2, p0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
 
-    mul-int p0, p0, p2
-
-    return p0
-.end method
-
-.method public static U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p0
-
-    invoke-virtual {p2, p0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {p2, p3}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
+    invoke-virtual {p2, p3}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
 
     return-void
 .end method
 
-.method public static V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+.method public static X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
     .locals 0
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p0
 
-    invoke-static {p0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
 
-.method public static W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+.method public static Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
     .locals 2
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -396,7 +420,7 @@
     return-object p0
 .end method
 
-.method public static X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+.method public static Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
     .locals 2
 
     invoke-virtual {p0}, Ljava/lang/Long;->longValue()J
@@ -412,24 +436,6 @@
     return-object p0
 .end method
 
-.method public static Y(ILjava/lang/String;I)Ljava/lang/String;
-    .locals 1
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0, p0}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
 .method public static a(FFFF)F
     .locals 0
 
@@ -442,6 +448,24 @@
     return p0
 .end method
 
+.method public static a0(ILjava/lang/String;I)Ljava/lang/String;
+    .locals 1
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0, p0}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static b(FFF)I
     .locals 0
 
diff --git a/com.discord/smali/f0/a$a.smali b/com.discord/smali/f0/a$a.smali
deleted file mode 100644
index e716b297b4..0000000000
--- a/com.discord/smali/f0/a$a.smali
+++ /dev/null
@@ -1,14 +0,0 @@
-.class public synthetic Lf0/a$a;
-.super Ljava/lang/Object;
-.source "AndroidExecutors.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lf0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1009
-    name = null
-.end annotation
diff --git a/com.discord/smali/f0/a$b.smali b/com.discord/smali/f0/a$b.smali
deleted file mode 100644
index e2738b0948..0000000000
--- a/com.discord/smali/f0/a$b.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.class public Lf0/a$b;
-.super Ljava/lang/Object;
-.source "AndroidExecutors.java"
-
-# interfaces
-.implements Ljava/util/concurrent/Executor;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lf0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "b"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lf0/a$a;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public execute(Ljava/lang/Runnable;)V
-    .locals 2
-
-    new-instance v0, Landroid/os/Handler;
-
-    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
-
-    invoke-virtual {v0, p1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
-
-    return-void
-.end method
diff --git a/com.discord/smali/f0/a.smali b/com.discord/smali/f0/a.smali
deleted file mode 100644
index e44348f28a..0000000000
--- a/com.discord/smali/f0/a.smali
+++ /dev/null
@@ -1,103 +0,0 @@
-.class public final Lf0/a;
-.super Ljava/lang/Object;
-.source "AndroidExecutors.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lf0/a$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final b:Lf0/a;
-
-.field public static final c:I
-
-.field public static final d:I
-
-.field public static final e:I
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/Executor;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lf0/a;
-
-    invoke-direct {v0}, Lf0/a;-><init>()V
-
-    sput-object v0, Lf0/a;->b:Lf0/a;
-
-    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
-
-    move-result v0
-
-    sput v0, Lf0/a;->c:I
-
-    add-int/lit8 v1, v0, 0x1
-
-    sput v1, Lf0/a;->d:I
-
-    mul-int/lit8 v0, v0, 0x2
-
-    add-int/lit8 v0, v0, 0x1
-
-    sput v0, Lf0/a;->e:I
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lf0/a$b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lf0/a$b;-><init>(Lf0/a$a;)V
-
-    iput-object v0, p0, Lf0/a;->a:Ljava/util/concurrent/Executor;
-
-    return-void
-.end method
-
-.method public static a()Ljava/util/concurrent/ExecutorService;
-    .locals 8
-
-    new-instance v7, Ljava/util/concurrent/ThreadPoolExecutor;
-
-    sget v1, Lf0/a;->d:I
-
-    sget v2, Lf0/a;->e:I
-
-    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    new-instance v6, Ljava/util/concurrent/LinkedBlockingQueue;
-
-    invoke-direct {v6}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
-
-    const-wide/16 v3, 0x1
-
-    move-object v0, v7
-
-    invoke-direct/range {v0 .. v6}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;)V
-
-    const/4 v0, 0x1
-
-    invoke-virtual {v7, v0}, Ljava/util/concurrent/ThreadPoolExecutor;->allowCoreThreadTimeOut(Z)V
-
-    return-object v7
-.end method
diff --git a/com.discord/smali/f0/a/a/a.smali b/com.discord/smali/f0/a/a/a.smali
new file mode 100644
index 0000000000..0c5175055d
--- /dev/null
+++ b/com.discord/smali/f0/a/a/a.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lf0/a/a/a;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/os/IBinder$DeathRecipient;
+
+
+# instance fields
+.field public final synthetic a:Landroidx/browser/customtabs/CustomTabsService$1;
+
+.field public final synthetic b:Landroidx/browser/customtabs/CustomTabsSessionToken;
+
+
+# direct methods
+.method public synthetic constructor <init>(Landroidx/browser/customtabs/CustomTabsService$1;Landroidx/browser/customtabs/CustomTabsSessionToken;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf0/a/a/a;->a:Landroidx/browser/customtabs/CustomTabsService$1;
+
+    iput-object p2, p0, Lf0/a/a/a;->b:Landroidx/browser/customtabs/CustomTabsSessionToken;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final binderDied()V
+    .locals 2
+
+    iget-object v0, p0, Lf0/a/a/a;->a:Landroidx/browser/customtabs/CustomTabsService$1;
+
+    iget-object v1, p0, Lf0/a/a/a;->b:Landroidx/browser/customtabs/CustomTabsSessionToken;
+
+    invoke-virtual {v0, v1}, Landroidx/browser/customtabs/CustomTabsService$1;->g(Landroidx/browser/customtabs/CustomTabsSessionToken;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/f0/a/b/a.smali b/com.discord/smali/f0/a/b/a.smali
new file mode 100644
index 0000000000..a4080c786e
--- /dev/null
+++ b/com.discord/smali/f0/a/b/a.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lf0/a/b/a;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroidx/concurrent/futures/CallbackToFutureAdapter$Resolver;
+
+
+# instance fields
+.field public final synthetic a:Landroidx/browser/trusted/ConnectionHolder;
+
+
+# direct methods
+.method public synthetic constructor <init>(Landroidx/browser/trusted/ConnectionHolder;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf0/a/b/a;->a:Landroidx/browser/trusted/ConnectionHolder;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final attachCompleter(Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lf0/a/b/a;->a:Landroidx/browser/trusted/ConnectionHolder;
+
+    invoke-virtual {v0, p1}, Landroidx/browser/trusted/ConnectionHolder;->a(Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/f0/a/b/b.smali b/com.discord/smali/f0/a/b/b.smali
new file mode 100644
index 0000000000..10f7b6a8a2
--- /dev/null
+++ b/com.discord/smali/f0/a/b/b.smali
@@ -0,0 +1,48 @@
+.class public final synthetic Lf0/a/b/b;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# static fields
+.field public static final synthetic d:Lf0/a/b/b;
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lf0/a/b/b;
+
+    invoke-direct {v0}, Lf0/a/b/b;-><init>()V
+
+    sput-object v0, Lf0/a/b/b;->d:Lf0/a/b/b;
+
+    return-void
+.end method
+
+.method private synthetic constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 0
+
+    check-cast p1, [B
+
+    check-cast p2, [B
+
+    invoke-static {p1, p2}, Landroidx/browser/trusted/TokenContents;->compareByteArrays([B[B)I
+
+    move-result p1
+
+    return p1
+.end method
diff --git a/com.discord/smali/f0/a/b/c.smali b/com.discord/smali/f0/a/b/c.smali
new file mode 100644
index 0000000000..2ff59ad737
--- /dev/null
+++ b/com.discord/smali/f0/a/b/c.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lf0/a/b/c;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;
+
+.field public final synthetic e:Landroid/net/Uri;
+
+
+# direct methods
+.method public synthetic constructor <init>(Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;Landroid/net/Uri;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lf0/a/b/c;->d:Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;
+
+    iput-object p2, p0, Lf0/a/b/c;->e:Landroid/net/Uri;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lf0/a/b/c;->d:Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;
+
+    iget-object v1, p0, Lf0/a/b/c;->e:Landroid/net/Uri;
+
+    invoke-virtual {v0, v1}, Landroidx/browser/trusted/TrustedWebActivityServiceConnectionPool;->a(Landroid/net/Uri;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/f0/b$a.smali b/com.discord/smali/f0/b$a.smali
deleted file mode 100644
index 2c07380bf9..0000000000
--- a/com.discord/smali/f0/b$a.smali
+++ /dev/null
@@ -1,14 +0,0 @@
-.class public synthetic Lf0/b$a;
-.super Ljava/lang/Object;
-.source "BoltsExecutors.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lf0/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1009
-    name = null
-.end annotation
diff --git a/com.discord/smali/f0/b$b.smali b/com.discord/smali/f0/b$b.smali
deleted file mode 100644
index d5375274ae..0000000000
--- a/com.discord/smali/f0/b$b.smali
+++ /dev/null
@@ -1,159 +0,0 @@
-.class public Lf0/b$b;
-.super Ljava/lang/Object;
-.source "BoltsExecutors.java"
-
-# interfaces
-.implements Ljava/util/concurrent/Executor;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lf0/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public d:Ljava/lang/ThreadLocal;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/ThreadLocal<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lf0/b$a;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance p1, Ljava/lang/ThreadLocal;
-
-    invoke-direct {p1}, Ljava/lang/ThreadLocal;-><init>()V
-
-    iput-object p1, p0, Lf0/b$b;->d:Ljava/lang/ThreadLocal;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()I
-    .locals 3
-
-    iget-object v0, p0, Lf0/b$b;->d:Ljava/lang/ThreadLocal;
-
-    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Integer;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, -0x1
-
-    if-nez v0, :cond_1
-
-    iget-object v1, p0, Lf0/b$b;->d:Ljava/lang/ThreadLocal;
-
-    invoke-virtual {v1}, Ljava/lang/ThreadLocal;->remove()V
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v1, p0, Lf0/b$b;->d:Ljava/lang/ThreadLocal;
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
-
-    :goto_0
-    return v0
-.end method
-
-.method public execute(Ljava/lang/Runnable;)V
-    .locals 3
-
-    iget-object v0, p0, Lf0/b$b;->d:Ljava/lang/ThreadLocal;
-
-    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Integer;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iget-object v1, p0, Lf0/b$b;->d:Ljava/lang/ThreadLocal;
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
-
-    const/16 v1, 0xf
-
-    if-gt v0, v1, :cond_1
-
-    :try_start_0
-    invoke-interface {p1}, Ljava/lang/Runnable;->run()V
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v0, Lf0/b;->c:Lf0/b;
-
-    iget-object v0, v0, Lf0/b;->a:Ljava/util/concurrent/ExecutorService;
-
-    invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :goto_0
-    invoke-virtual {p0}, Lf0/b$b;->a()I
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {p0}, Lf0/b$b;->a()I
-
-    throw p1
-.end method
diff --git a/com.discord/smali/f0/b.smali b/com.discord/smali/f0/b.smali
deleted file mode 100644
index ec21ad4fbf..0000000000
--- a/com.discord/smali/f0/b.smali
+++ /dev/null
@@ -1,95 +0,0 @@
-.class public final Lf0/b;
-.super Ljava/lang/Object;
-.source "BoltsExecutors.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lf0/b$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:Lf0/b;
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/ExecutorService;
-
-.field public final b:Ljava/util/concurrent/Executor;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lf0/b;
-
-    invoke-direct {v0}, Lf0/b;-><init>()V
-
-    sput-object v0, Lf0/b;->c:Lf0/b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const-string v0, "java.runtime.name"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "android"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    :goto_0
-    if-nez v0, :cond_1
-
-    invoke-static {}, Ljava/util/concurrent/Executors;->newCachedThreadPool()Ljava/util/concurrent/ExecutorService;
-
-    move-result-object v0
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Lf0/a;->a()Ljava/util/concurrent/ExecutorService;
-
-    move-result-object v0
-
-    :goto_1
-    iput-object v0, p0, Lf0/b;->a:Ljava/util/concurrent/ExecutorService;
-
-    invoke-static {}, Ljava/util/concurrent/Executors;->newSingleThreadScheduledExecutor()Ljava/util/concurrent/ScheduledExecutorService;
-
-    new-instance v0, Lf0/b$b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lf0/b$b;-><init>(Lf0/b$a;)V
-
-    iput-object v0, p0, Lf0/b;->b:Ljava/util/concurrent/Executor;
-
-    return-void
-.end method
diff --git a/com.discord/smali/f0/c.smali b/com.discord/smali/f0/c.smali
deleted file mode 100644
index 3600f9beaa..0000000000
--- a/com.discord/smali/f0/c.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public Lf0/c;
-.super Ljava/lang/Object;
-.source "CancellationToken.java"
diff --git a/com.discord/smali/f0/d.smali b/com.discord/smali/f0/d.smali
deleted file mode 100644
index 8b970213c5..0000000000
--- a/com.discord/smali/f0/d.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public interface abstract Lf0/d;
-.super Ljava/lang/Object;
-.source "Continuation.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<TTaskResult:",
-        "Ljava/lang/Object;",
-        "TContinuationResult:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract a(Lf0/h;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lf0/h<",
-            "TTTaskResult;>;)TTContinuationResult;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali/f0/e.smali b/com.discord/smali/f0/e.smali
deleted file mode 100644
index 7491d2dd52..0000000000
--- a/com.discord/smali/f0/e.smali
+++ /dev/null
@@ -1,90 +0,0 @@
-.class public Lf0/e;
-.super Ljava/lang/Object;
-.source "Task.java"
-
-# interfaces
-.implements Lf0/d;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lf0/d<",
-        "TTResult;",
-        "Ljava/lang/Void;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lf0/i;
-
-.field public final synthetic b:Lf0/d;
-
-.field public final synthetic c:Ljava/util/concurrent/Executor;
-
-.field public final synthetic d:Lf0/c;
-
-
-# direct methods
-.method public constructor <init>(Lf0/h;Lf0/i;Lf0/d;Ljava/util/concurrent/Executor;)V
-    .locals 0
-
-    iput-object p2, p0, Lf0/e;->a:Lf0/i;
-
-    iput-object p3, p0, Lf0/e;->b:Lf0/d;
-
-    iput-object p4, p0, Lf0/e;->c:Ljava/util/concurrent/Executor;
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lf0/e;->d:Lf0/c;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lf0/h;)Ljava/lang/Object;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Exception;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lf0/e;->a:Lf0/i;
-
-    iget-object v1, p0, Lf0/e;->b:Lf0/d;
-
-    iget-object v2, p0, Lf0/e;->c:Ljava/util/concurrent/Executor;
-
-    :try_start_0
-    new-instance v3, Lf0/f;
-
-    invoke-direct {v3, v0, v1, p1}, Lf0/f;-><init>(Lf0/i;Lf0/d;Lf0/h;)V
-
-    invoke-interface {v2, v3}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance v1, Lbolts/ExecutorException;
-
-    invoke-direct {v1, p1}, Lbolts/ExecutorException;-><init>(Ljava/lang/Exception;)V
-
-    invoke-virtual {v0, v1}, Lf0/i;->b(Ljava/lang/Exception;)V
-
-    :goto_0
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/f0/f.smali b/com.discord/smali/f0/f.smali
deleted file mode 100644
index 765867bd7f..0000000000
--- a/com.discord/smali/f0/f.smali
+++ /dev/null
@@ -1,77 +0,0 @@
-.class public final Lf0/f;
-.super Ljava/lang/Object;
-.source "Task.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lf0/c;
-
-.field public final synthetic e:Lf0/i;
-
-.field public final synthetic f:Lf0/d;
-
-.field public final synthetic g:Lf0/h;
-
-
-# direct methods
-.method public constructor <init>(Lf0/i;Lf0/d;Lf0/h;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lf0/f;->d:Lf0/c;
-
-    iput-object p1, p0, Lf0/f;->e:Lf0/i;
-
-    iput-object p2, p0, Lf0/f;->f:Lf0/d;
-
-    iput-object p3, p0, Lf0/f;->g:Lf0/h;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lf0/f;->f:Lf0/d;
-
-    iget-object v1, p0, Lf0/f;->g:Lf0/h;
-
-    invoke-interface {v0, v1}, Lf0/d;->a(Lf0/h;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lf0/f;->e:Lf0/i;
-
-    invoke-virtual {v1, v0}, Lf0/i;->c(Ljava/lang/Object;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/CancellationException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    iget-object v1, p0, Lf0/f;->e:Lf0/i;
-
-    invoke-virtual {v1, v0}, Lf0/i;->b(Ljava/lang/Exception;)V
-
-    goto :goto_0
-
-    :catch_1
-    iget-object v0, p0, Lf0/f;->e:Lf0/i;
-
-    invoke-virtual {v0}, Lf0/i;->a()V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali/f0/g.smali b/com.discord/smali/f0/g.smali
deleted file mode 100644
index 32b2dc45b3..0000000000
--- a/com.discord/smali/f0/g.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public final Lf0/g;
-.super Ljava/lang/Object;
-.source "Task.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lf0/c;
-
-.field public final synthetic e:Lf0/i;
-
-.field public final synthetic f:Ljava/util/concurrent/Callable;
-
-
-# direct methods
-.method public constructor <init>(Lf0/i;Ljava/util/concurrent/Callable;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lf0/g;->d:Lf0/c;
-
-    iput-object p1, p0, Lf0/g;->e:Lf0/i;
-
-    iput-object p2, p0, Lf0/g;->f:Ljava/util/concurrent/Callable;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lf0/g;->e:Lf0/i;
-
-    iget-object v1, p0, Lf0/g;->f:Ljava/util/concurrent/Callable;
-
-    invoke-interface {v1}, Ljava/util/concurrent/Callable;->call()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lf0/i;->c(Ljava/lang/Object;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/CancellationException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    iget-object v1, p0, Lf0/g;->e:Lf0/i;
-
-    invoke-virtual {v1, v0}, Lf0/i;->b(Ljava/lang/Exception;)V
-
-    goto :goto_0
-
-    :catch_1
-    iget-object v0, p0, Lf0/g;->e:Lf0/i;
-
-    invoke-virtual {v0}, Lf0/i;->a()V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali/f0/h.smali b/com.discord/smali/f0/h.smali
deleted file mode 100644
index 329f0bf18e..0000000000
--- a/com.discord/smali/f0/h.smali
+++ /dev/null
@@ -1,752 +0,0 @@
-.class public Lf0/h;
-.super Ljava/lang/Object;
-.source "Task.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<TResult:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final i:Ljava/util/concurrent/Executor;
-
-.field public static j:Lf0/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lf0/h<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field public static k:Lf0/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lf0/h<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static l:Lf0/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lf0/h<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public final a:Ljava/lang/Object;
-
-.field public b:Z
-
-.field public c:Z
-
-.field public d:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TTResult;"
-        }
-    .end annotation
-.end field
-
-.field public e:Ljava/lang/Exception;
-
-.field public f:Z
-
-.field public g:Lf0/j;
-
-.field public h:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lf0/d<",
-            "TTResult;",
-            "Ljava/lang/Void;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    sget-object v0, Lf0/b;->c:Lf0/b;
-
-    iget-object v1, v0, Lf0/b;->a:Ljava/util/concurrent/ExecutorService;
-
-    iget-object v0, v0, Lf0/b;->b:Ljava/util/concurrent/Executor;
-
-    sput-object v0, Lf0/h;->i:Ljava/util/concurrent/Executor;
-
-    sget-object v0, Lf0/a;->b:Lf0/a;
-
-    iget-object v0, v0, Lf0/a;->a:Ljava/util/concurrent/Executor;
-
-    new-instance v0, Lf0/h;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lf0/h;-><init>(Ljava/lang/Object;)V
-
-    sput-object v0, Lf0/h;->j:Lf0/h;
-
-    new-instance v0, Lf0/h;
-
-    sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    invoke-direct {v0, v1}, Lf0/h;-><init>(Ljava/lang/Object;)V
-
-    sput-object v0, Lf0/h;->k:Lf0/h;
-
-    new-instance v0, Lf0/h;
-
-    sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    invoke-direct {v0, v1}, Lf0/h;-><init>(Ljava/lang/Object;)V
-
-    sput-object v0, Lf0/h;->l:Lf0/h;
-
-    new-instance v0, Lf0/h;
-
-    const/4 v1, 0x1
-
-    invoke-direct {v0, v1}, Lf0/h;-><init>(Z)V
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    iput-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Lf0/h;->h:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TTResult;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    iput-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Lf0/h;->h:Ljava/util/List;
-
-    invoke-virtual {p0, p1}, Lf0/h;->i(Ljava/lang/Object;)Z
-
-    return-void
-.end method
-
-.method public constructor <init>(Z)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    iput-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Lf0/h;->h:Ljava/util/List;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lf0/h;->h()Z
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p1}, Lf0/h;->i(Ljava/lang/Object;)Z
-
-    :goto_0
-    return-void
-.end method
-
-.method public static a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)Lf0/h;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<TResult:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/concurrent/Callable<",
-            "TTResult;>;",
-            "Ljava/util/concurrent/Executor;",
-            ")",
-            "Lf0/h<",
-            "TTResult;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lf0/i;
-
-    invoke-direct {v0}, Lf0/i;-><init>()V
-
-    :try_start_0
-    new-instance v1, Lf0/g;
-
-    invoke-direct {v1, v0, p0}, Lf0/g;-><init>(Lf0/i;Ljava/util/concurrent/Callable;)V
-
-    invoke-interface {p1, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p0
-
-    new-instance p1, Lbolts/ExecutorException;
-
-    invoke-direct {p1, p0}, Lbolts/ExecutorException;-><init>(Ljava/lang/Exception;)V
-
-    invoke-virtual {v0, p1}, Lf0/i;->b(Ljava/lang/Exception;)V
-
-    :goto_0
-    iget-object p0, v0, Lf0/i;->a:Lf0/h;
-
-    return-object p0
-.end method
-
-.method public static c(Ljava/lang/Exception;)Lf0/h;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<TResult:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Exception;",
-            ")",
-            "Lf0/h<",
-            "TTResult;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lf0/h;
-
-    invoke-direct {v0}, Lf0/h;-><init>()V
-
-    iget-object v1, v0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget-boolean v2, v0, Lf0/h;->b:Z
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-eqz v2, :cond_0
-
-    monitor-exit v1
-
-    goto :goto_0
-
-    :cond_0
-    iput-boolean v4, v0, Lf0/h;->b:Z
-
-    iput-object p0, v0, Lf0/h;->e:Ljava/lang/Exception;
-
-    iput-boolean v3, v0, Lf0/h;->f:Z
-
-    iget-object p0, v0, Lf0/h;->a:Ljava/lang/Object;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-
-    invoke-virtual {v0}, Lf0/h;->g()V
-
-    monitor-exit v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v3, 0x1
-
-    :goto_0
-    if-eqz v3, :cond_1
-
-    return-object v0
-
-    :cond_1
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Cannot set the error on a completed task."
-
-    invoke-direct {p0, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :catchall_0
-    move-exception p0
-
-    :try_start_1
-    monitor-exit v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p0
-.end method
-
-.method public static d(Ljava/lang/Object;)Lf0/h;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<TResult:",
-            "Ljava/lang/Object;",
-            ">(TTResult;)",
-            "Lf0/h<",
-            "TTResult;>;"
-        }
-    .end annotation
-
-    if-nez p0, :cond_0
-
-    sget-object p0, Lf0/h;->j:Lf0/h;
-
-    return-object p0
-
-    :cond_0
-    instance-of v0, p0, Ljava/lang/Boolean;
-
-    if-eqz v0, :cond_2
-
-    check-cast p0, Ljava/lang/Boolean;
-
-    invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p0
-
-    if-eqz p0, :cond_1
-
-    sget-object p0, Lf0/h;->k:Lf0/h;
-
-    goto :goto_0
-
-    :cond_1
-    sget-object p0, Lf0/h;->l:Lf0/h;
-
-    :goto_0
-    return-object p0
-
-    :cond_2
-    new-instance v0, Lf0/h;
-
-    invoke-direct {v0}, Lf0/h;-><init>()V
-
-    invoke-virtual {v0, p0}, Lf0/h;->i(Ljava/lang/Object;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_3
-
-    return-object v0
-
-    :cond_3
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Cannot set the result of a completed task."
-
-    invoke-direct {p0, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-
-# virtual methods
-.method public b(Lf0/d;)Lf0/h;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<TContinuationResult:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lf0/d<",
-            "TTResult;TTContinuationResult;>;)",
-            "Lf0/h<",
-            "TTContinuationResult;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lf0/h;->i:Ljava/util/concurrent/Executor;
-
-    new-instance v1, Lf0/i;
-
-    invoke-direct {v1}, Lf0/i;-><init>()V
-
-    iget-object v2, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v2
-
-    :try_start_0
-    iget-object v3, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v3
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-boolean v4, p0, Lf0/h;->b:Z
-
-    monitor-exit v3
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-nez v4, :cond_0
-
-    :try_start_2
-    iget-object v3, p0, Lf0/h;->h:Ljava/util/List;
-
-    new-instance v5, Lf0/e;
-
-    invoke-direct {v5, p0, v1, p1, v0}, Lf0/e;-><init>(Lf0/h;Lf0/i;Lf0/d;Ljava/util/concurrent/Executor;)V
-
-    invoke-interface {v3, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_0
-    monitor-exit v2
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-eqz v4, :cond_1
-
-    :try_start_3
-    new-instance v2, Lf0/f;
-
-    invoke-direct {v2, v1, p1, p0}, Lf0/f;-><init>(Lf0/i;Lf0/d;Lf0/h;)V
-
-    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_3
-    .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lbolts/ExecutorException;
-
-    invoke-direct {v0, p1}, Lbolts/ExecutorException;-><init>(Ljava/lang/Exception;)V
-
-    invoke-virtual {v1, v0}, Lf0/i;->b(Ljava/lang/Exception;)V
-
-    :cond_1
-    :goto_0
-    iget-object p1, v1, Lf0/i;->a:Lf0/h;
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_4
-    monitor-exit v3
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    :try_start_5
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit v2
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    throw p1
-.end method
-
-.method public e()Ljava/lang/Exception;
-    .locals 3
-
-    iget-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Lf0/h;->e:Ljava/lang/Exception;
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x1
-
-    iput-boolean v1, p0, Lf0/h;->f:Z
-
-    iget-object v1, p0, Lf0/h;->g:Lf0/j;
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lf0/h;->g:Lf0/j;
-
-    const/4 v2, 0x0
-
-    iput-object v2, v1, Lf0/j;->a:Lf0/h;
-
-    iput-object v2, p0, Lf0/h;->g:Lf0/j;
-
-    :cond_0
-    iget-object v1, p0, Lf0/h;->e:Ljava/lang/Exception;
-
-    monitor-exit v0
-
-    return-object v1
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v1
-.end method
-
-.method public f()Z
-    .locals 2
-
-    iget-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v0
-
-    :try_start_0
-    invoke-virtual {p0}, Lf0/h;->e()Ljava/lang/Exception;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    monitor-exit v0
-
-    return v1
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v1
-.end method
-
-.method public final g()V
-    .locals 3
-
-    iget-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Lf0/h;->h:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->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, Lf0/d;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :try_start_1
-    invoke-interface {v2, p0}, Lf0/d;->a(Lf0/h;)Ljava/lang/Object;
-    :try_end_1
-    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v1
-
-    :try_start_2
-    new-instance v2, Ljava/lang/RuntimeException;
-
-    invoke-direct {v2, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v2
-
-    :catch_1
-    move-exception v1
-
-    throw v1
-
-    :cond_0
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lf0/h;->h:Ljava/util/List;
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw v1
-.end method
-
-.method public h()Z
-    .locals 3
-
-    iget-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v1, p0, Lf0/h;->b:Z
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x0
-
-    monitor-exit v0
-
-    return v1
-
-    :cond_0
-    const/4 v1, 0x1
-
-    iput-boolean v1, p0, Lf0/h;->b:Z
-
-    iput-boolean v1, p0, Lf0/h;->c:Z
-
-    iget-object v2, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    invoke-virtual {v2}, Ljava/lang/Object;->notifyAll()V
-
-    invoke-virtual {p0}, Lf0/h;->g()V
-
-    monitor-exit v0
-
-    return v1
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v1
-.end method
-
-.method public i(Ljava/lang/Object;)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TTResult;)Z"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v1, p0, Lf0/h;->b:Z
-
-    if-eqz v1, :cond_0
-
-    const/4 p1, 0x0
-
-    monitor-exit v0
-
-    return p1
-
-    :cond_0
-    const/4 v1, 0x1
-
-    iput-boolean v1, p0, Lf0/h;->b:Z
-
-    iput-object p1, p0, Lf0/h;->d:Ljava/lang/Object;
-
-    iget-object p1, p0, Lf0/h;->a:Ljava/lang/Object;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
-
-    invoke-virtual {p0}, Lf0/h;->g()V
-
-    monitor-exit v0
-
-    return v1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-.end method
diff --git a/com.discord/smali/f0/i.smali b/com.discord/smali/f0/i.smali
deleted file mode 100644
index ae495cbc40..0000000000
--- a/com.discord/smali/f0/i.smali
+++ /dev/null
@@ -1,160 +0,0 @@
-.class public Lf0/i;
-.super Ljava/lang/Object;
-.source "TaskCompletionSource.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<TResult:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lf0/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lf0/h<",
-            "TTResult;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lf0/h;
-
-    invoke-direct {v0}, Lf0/h;-><init>()V
-
-    iput-object v0, p0, Lf0/i;->a:Lf0/h;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 2
-
-    iget-object v0, p0, Lf0/i;->a:Lf0/h;
-
-    invoke-virtual {v0}, Lf0/h;->h()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Cannot cancel a completed task."
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public b(Ljava/lang/Exception;)V
-    .locals 5
-
-    iget-object v0, p0, Lf0/i;->a:Lf0/h;
-
-    iget-object v1, v0, Lf0/h;->a:Ljava/lang/Object;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget-boolean v2, v0, Lf0/h;->b:Z
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-eqz v2, :cond_0
-
-    monitor-exit v1
-
-    goto :goto_0
-
-    :cond_0
-    iput-boolean v4, v0, Lf0/h;->b:Z
-
-    iput-object p1, v0, Lf0/h;->e:Ljava/lang/Exception;
-
-    iput-boolean v3, v0, Lf0/h;->f:Z
-
-    iget-object p1, v0, Lf0/h;->a:Ljava/lang/Object;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
-
-    invoke-virtual {v0}, Lf0/h;->g()V
-
-    monitor-exit v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v3, 0x1
-
-    :goto_0
-    if-eqz v3, :cond_1
-
-    return-void
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Cannot set the error on a completed task."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public c(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TTResult;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lf0/i;->a:Lf0/h;
-
-    invoke-virtual {v0, p1}, Lf0/h;->i(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Cannot set the result of a completed task."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali/f0/j.smali b/com.discord/smali/f0/j.smali
deleted file mode 100644
index 7f5cd83812..0000000000
--- a/com.discord/smali/f0/j.smali
+++ /dev/null
@@ -1,14 +0,0 @@
-.class public Lf0/j;
-.super Ljava/lang/Object;
-.source "UnobservedErrorNotifier.java"
-
-
-# instance fields
-.field public a:Lf0/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lf0/h<",
-            "*>;"
-        }
-    .end annotation
-.end field
diff --git a/com.discord/smali/g0/a$a.smali b/com.discord/smali/g0/a$a.smali
new file mode 100644
index 0000000000..ef28dcdeb4
--- /dev/null
+++ b/com.discord/smali/g0/a$a.smali
@@ -0,0 +1,14 @@
+.class public synthetic Lg0/a$a;
+.super Ljava/lang/Object;
+.source "AndroidExecutors.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lg0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1009
+    name = null
+.end annotation
diff --git a/com.discord/smali/g0/a$b.smali b/com.discord/smali/g0/a$b.smali
new file mode 100644
index 0000000000..b7a1c0ab47
--- /dev/null
+++ b/com.discord/smali/g0/a$b.smali
@@ -0,0 +1,45 @@
+.class public Lg0/a$b;
+.super Ljava/lang/Object;
+.source "AndroidExecutors.java"
+
+# interfaces
+.implements Ljava/util/concurrent/Executor;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lg0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "b"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lg0/a$a;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public execute(Ljava/lang/Runnable;)V
+    .locals 2
+
+    new-instance v0, Landroid/os/Handler;
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    invoke-virtual {v0, p1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
diff --git a/com.discord/smali/g0/a.smali b/com.discord/smali/g0/a.smali
new file mode 100644
index 0000000000..ab9b883e4f
--- /dev/null
+++ b/com.discord/smali/g0/a.smali
@@ -0,0 +1,103 @@
+.class public final Lg0/a;
+.super Ljava/lang/Object;
+.source "AndroidExecutors.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lg0/a$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final b:Lg0/a;
+
+.field public static final c:I
+
+.field public static final d:I
+
+.field public static final e:I
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/Executor;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lg0/a;
+
+    invoke-direct {v0}, Lg0/a;-><init>()V
+
+    sput-object v0, Lg0/a;->b:Lg0/a;
+
+    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
+
+    move-result v0
+
+    sput v0, Lg0/a;->c:I
+
+    add-int/lit8 v1, v0, 0x1
+
+    sput v1, Lg0/a;->d:I
+
+    mul-int/lit8 v0, v0, 0x2
+
+    add-int/lit8 v0, v0, 0x1
+
+    sput v0, Lg0/a;->e:I
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lg0/a$b;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lg0/a$b;-><init>(Lg0/a$a;)V
+
+    iput-object v0, p0, Lg0/a;->a:Ljava/util/concurrent/Executor;
+
+    return-void
+.end method
+
+.method public static a()Ljava/util/concurrent/ExecutorService;
+    .locals 8
+
+    new-instance v7, Ljava/util/concurrent/ThreadPoolExecutor;
+
+    sget v1, Lg0/a;->d:I
+
+    sget v2, Lg0/a;->e:I
+
+    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    new-instance v6, Ljava/util/concurrent/LinkedBlockingQueue;
+
+    invoke-direct {v6}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
+
+    const-wide/16 v3, 0x1
+
+    move-object v0, v7
+
+    invoke-direct/range {v0 .. v6}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;)V
+
+    const/4 v0, 0x1
+
+    invoke-virtual {v7, v0}, Ljava/util/concurrent/ThreadPoolExecutor;->allowCoreThreadTimeOut(Z)V
+
+    return-object v7
+.end method
diff --git a/com.discord/smali/g0/b$a.smali b/com.discord/smali/g0/b$a.smali
new file mode 100644
index 0000000000..cb7732290d
--- /dev/null
+++ b/com.discord/smali/g0/b$a.smali
@@ -0,0 +1,14 @@
+.class public synthetic Lg0/b$a;
+.super Ljava/lang/Object;
+.source "BoltsExecutors.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lg0/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1009
+    name = null
+.end annotation
diff --git a/com.discord/smali/g0/b$b.smali b/com.discord/smali/g0/b$b.smali
new file mode 100644
index 0000000000..05f755deb5
--- /dev/null
+++ b/com.discord/smali/g0/b$b.smali
@@ -0,0 +1,159 @@
+.class public Lg0/b$b;
+.super Ljava/lang/Object;
+.source "BoltsExecutors.java"
+
+# interfaces
+.implements Ljava/util/concurrent/Executor;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lg0/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public d:Ljava/lang/ThreadLocal;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/ThreadLocal<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lg0/b$a;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance p1, Ljava/lang/ThreadLocal;
+
+    invoke-direct {p1}, Ljava/lang/ThreadLocal;-><init>()V
+
+    iput-object p1, p0, Lg0/b$b;->d:Ljava/lang/ThreadLocal;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()I
+    .locals 3
+
+    iget-object v0, p0, Lg0/b$b;->d:Ljava/lang/ThreadLocal;
+
+    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Integer;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, -0x1
+
+    if-nez v0, :cond_1
+
+    iget-object v1, p0, Lg0/b$b;->d:Ljava/lang/ThreadLocal;
+
+    invoke-virtual {v1}, Ljava/lang/ThreadLocal;->remove()V
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v1, p0, Lg0/b$b;->d:Ljava/lang/ThreadLocal;
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
+
+    :goto_0
+    return v0
+.end method
+
+.method public execute(Ljava/lang/Runnable;)V
+    .locals 3
+
+    iget-object v0, p0, Lg0/b$b;->d:Ljava/lang/ThreadLocal;
+
+    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Integer;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iget-object v1, p0, Lg0/b$b;->d:Ljava/lang/ThreadLocal;
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
+
+    const/16 v1, 0xf
+
+    if-gt v0, v1, :cond_1
+
+    :try_start_0
+    invoke-interface {p1}, Ljava/lang/Runnable;->run()V
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v0, Lg0/b;->c:Lg0/b;
+
+    iget-object v0, v0, Lg0/b;->a:Ljava/util/concurrent/ExecutorService;
+
+    invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_0
+    invoke-virtual {p0}, Lg0/b$b;->a()I
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0}, Lg0/b$b;->a()I
+
+    throw p1
+.end method
diff --git a/com.discord/smali/g0/b.smali b/com.discord/smali/g0/b.smali
new file mode 100644
index 0000000000..0abf1fc2fd
--- /dev/null
+++ b/com.discord/smali/g0/b.smali
@@ -0,0 +1,95 @@
+.class public final Lg0/b;
+.super Ljava/lang/Object;
+.source "BoltsExecutors.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lg0/b$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:Lg0/b;
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/ExecutorService;
+
+.field public final b:Ljava/util/concurrent/Executor;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lg0/b;
+
+    invoke-direct {v0}, Lg0/b;-><init>()V
+
+    sput-object v0, Lg0/b;->c:Lg0/b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const-string v0, "java.runtime.name"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "android"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    :goto_0
+    if-nez v0, :cond_1
+
+    invoke-static {}, Ljava/util/concurrent/Executors;->newCachedThreadPool()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Lg0/a;->a()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    :goto_1
+    iput-object v0, p0, Lg0/b;->a:Ljava/util/concurrent/ExecutorService;
+
+    invoke-static {}, Ljava/util/concurrent/Executors;->newSingleThreadScheduledExecutor()Ljava/util/concurrent/ScheduledExecutorService;
+
+    new-instance v0, Lg0/b$b;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lg0/b$b;-><init>(Lg0/b$a;)V
+
+    iput-object v0, p0, Lg0/b;->b:Ljava/util/concurrent/Executor;
+
+    return-void
+.end method
diff --git a/com.discord/smali/g0/c.smali b/com.discord/smali/g0/c.smali
new file mode 100644
index 0000000000..249e948daf
--- /dev/null
+++ b/com.discord/smali/g0/c.smali
@@ -0,0 +1,3 @@
+.class public Lg0/c;
+.super Ljava/lang/Object;
+.source "CancellationToken.java"
diff --git a/com.discord/smali/g0/d.smali b/com.discord/smali/g0/d.smali
new file mode 100644
index 0000000000..c4a6338acc
--- /dev/null
+++ b/com.discord/smali/g0/d.smali
@@ -0,0 +1,34 @@
+.class public interface abstract Lg0/d;
+.super Ljava/lang/Object;
+.source "Continuation.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<TTaskResult:",
+        "Ljava/lang/Object;",
+        "TContinuationResult:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract a(Lg0/h;)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lg0/h<",
+            "TTTaskResult;>;)TTContinuationResult;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali/g0/e.smali b/com.discord/smali/g0/e.smali
new file mode 100644
index 0000000000..21fae61cdf
--- /dev/null
+++ b/com.discord/smali/g0/e.smali
@@ -0,0 +1,90 @@
+.class public Lg0/e;
+.super Ljava/lang/Object;
+.source "Task.java"
+
+# interfaces
+.implements Lg0/d;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lg0/d<",
+        "TTResult;",
+        "Ljava/lang/Void;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lg0/i;
+
+.field public final synthetic b:Lg0/d;
+
+.field public final synthetic c:Ljava/util/concurrent/Executor;
+
+.field public final synthetic d:Lg0/c;
+
+
+# direct methods
+.method public constructor <init>(Lg0/h;Lg0/i;Lg0/d;Ljava/util/concurrent/Executor;)V
+    .locals 0
+
+    iput-object p2, p0, Lg0/e;->a:Lg0/i;
+
+    iput-object p3, p0, Lg0/e;->b:Lg0/d;
+
+    iput-object p4, p0, Lg0/e;->c:Ljava/util/concurrent/Executor;
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lg0/e;->d:Lg0/c;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lg0/h;)Ljava/lang/Object;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Exception;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lg0/e;->a:Lg0/i;
+
+    iget-object v1, p0, Lg0/e;->b:Lg0/d;
+
+    iget-object v2, p0, Lg0/e;->c:Ljava/util/concurrent/Executor;
+
+    :try_start_0
+    new-instance v3, Lg0/f;
+
+    invoke-direct {v3, v0, v1, p1}, Lg0/f;-><init>(Lg0/i;Lg0/d;Lg0/h;)V
+
+    invoke-interface {v2, v3}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance v1, Lbolts/ExecutorException;
+
+    invoke-direct {v1, p1}, Lbolts/ExecutorException;-><init>(Ljava/lang/Exception;)V
+
+    invoke-virtual {v0, v1}, Lg0/i;->b(Ljava/lang/Exception;)V
+
+    :goto_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/g0/f.smali b/com.discord/smali/g0/f.smali
new file mode 100644
index 0000000000..a5406747f5
--- /dev/null
+++ b/com.discord/smali/g0/f.smali
@@ -0,0 +1,77 @@
+.class public final Lg0/f;
+.super Ljava/lang/Object;
+.source "Task.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lg0/c;
+
+.field public final synthetic e:Lg0/i;
+
+.field public final synthetic f:Lg0/d;
+
+.field public final synthetic g:Lg0/h;
+
+
+# direct methods
+.method public constructor <init>(Lg0/i;Lg0/d;Lg0/h;)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lg0/f;->d:Lg0/c;
+
+    iput-object p1, p0, Lg0/f;->e:Lg0/i;
+
+    iput-object p2, p0, Lg0/f;->f:Lg0/d;
+
+    iput-object p3, p0, Lg0/f;->g:Lg0/h;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Lg0/f;->f:Lg0/d;
+
+    iget-object v1, p0, Lg0/f;->g:Lg0/h;
+
+    invoke-interface {v0, v1}, Lg0/d;->a(Lg0/h;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lg0/f;->e:Lg0/i;
+
+    invoke-virtual {v1, v0}, Lg0/i;->c(Ljava/lang/Object;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/CancellationException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    iget-object v1, p0, Lg0/f;->e:Lg0/i;
+
+    invoke-virtual {v1, v0}, Lg0/i;->b(Ljava/lang/Exception;)V
+
+    goto :goto_0
+
+    :catch_1
+    iget-object v0, p0, Lg0/f;->e:Lg0/i;
+
+    invoke-virtual {v0}, Lg0/i;->a()V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali/g0/g.smali b/com.discord/smali/g0/g.smali
new file mode 100644
index 0000000000..9662c8db92
--- /dev/null
+++ b/com.discord/smali/g0/g.smali
@@ -0,0 +1,71 @@
+.class public final Lg0/g;
+.super Ljava/lang/Object;
+.source "Task.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lg0/c;
+
+.field public final synthetic e:Lg0/i;
+
+.field public final synthetic f:Ljava/util/concurrent/Callable;
+
+
+# direct methods
+.method public constructor <init>(Lg0/i;Ljava/util/concurrent/Callable;)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lg0/g;->d:Lg0/c;
+
+    iput-object p1, p0, Lg0/g;->e:Lg0/i;
+
+    iput-object p2, p0, Lg0/g;->f:Ljava/util/concurrent/Callable;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Lg0/g;->e:Lg0/i;
+
+    iget-object v1, p0, Lg0/g;->f:Ljava/util/concurrent/Callable;
+
+    invoke-interface {v1}, Ljava/util/concurrent/Callable;->call()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lg0/i;->c(Ljava/lang/Object;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/CancellationException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    iget-object v1, p0, Lg0/g;->e:Lg0/i;
+
+    invoke-virtual {v1, v0}, Lg0/i;->b(Ljava/lang/Exception;)V
+
+    goto :goto_0
+
+    :catch_1
+    iget-object v0, p0, Lg0/g;->e:Lg0/i;
+
+    invoke-virtual {v0}, Lg0/i;->a()V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali/g0/h.smali b/com.discord/smali/g0/h.smali
new file mode 100644
index 0000000000..dd5482b80b
--- /dev/null
+++ b/com.discord/smali/g0/h.smali
@@ -0,0 +1,752 @@
+.class public Lg0/h;
+.super Ljava/lang/Object;
+.source "Task.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<TResult:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final i:Ljava/util/concurrent/Executor;
+
+.field public static j:Lg0/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lg0/h<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field public static k:Lg0/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lg0/h<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static l:Lg0/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lg0/h<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public final a:Ljava/lang/Object;
+
+.field public b:Z
+
+.field public c:Z
+
+.field public d:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TTResult;"
+        }
+    .end annotation
+.end field
+
+.field public e:Ljava/lang/Exception;
+
+.field public f:Z
+
+.field public g:Lg0/j;
+
+.field public h:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lg0/d<",
+            "TTResult;",
+            "Ljava/lang/Void;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    sget-object v0, Lg0/b;->c:Lg0/b;
+
+    iget-object v1, v0, Lg0/b;->a:Ljava/util/concurrent/ExecutorService;
+
+    iget-object v0, v0, Lg0/b;->b:Ljava/util/concurrent/Executor;
+
+    sput-object v0, Lg0/h;->i:Ljava/util/concurrent/Executor;
+
+    sget-object v0, Lg0/a;->b:Lg0/a;
+
+    iget-object v0, v0, Lg0/a;->a:Ljava/util/concurrent/Executor;
+
+    new-instance v0, Lg0/h;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lg0/h;-><init>(Ljava/lang/Object;)V
+
+    sput-object v0, Lg0/h;->j:Lg0/h;
+
+    new-instance v0, Lg0/h;
+
+    sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    invoke-direct {v0, v1}, Lg0/h;-><init>(Ljava/lang/Object;)V
+
+    sput-object v0, Lg0/h;->k:Lg0/h;
+
+    new-instance v0, Lg0/h;
+
+    sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    invoke-direct {v0, v1}, Lg0/h;-><init>(Ljava/lang/Object;)V
+
+    sput-object v0, Lg0/h;->l:Lg0/h;
+
+    new-instance v0, Lg0/h;
+
+    const/4 v1, 0x1
+
+    invoke-direct {v0, v1}, Lg0/h;-><init>(Z)V
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lg0/h;->h:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TTResult;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lg0/h;->h:Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lg0/h;->i(Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public constructor <init>(Z)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lg0/h;->h:Ljava/util/List;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p0}, Lg0/h;->h()Z
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Lg0/h;->i(Ljava/lang/Object;)Z
+
+    :goto_0
+    return-void
+.end method
+
+.method public static a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)Lg0/h;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<TResult:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/concurrent/Callable<",
+            "TTResult;>;",
+            "Ljava/util/concurrent/Executor;",
+            ")",
+            "Lg0/h<",
+            "TTResult;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lg0/i;
+
+    invoke-direct {v0}, Lg0/i;-><init>()V
+
+    :try_start_0
+    new-instance v1, Lg0/g;
+
+    invoke-direct {v1, v0, p0}, Lg0/g;-><init>(Lg0/i;Ljava/util/concurrent/Callable;)V
+
+    invoke-interface {p1, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p0
+
+    new-instance p1, Lbolts/ExecutorException;
+
+    invoke-direct {p1, p0}, Lbolts/ExecutorException;-><init>(Ljava/lang/Exception;)V
+
+    invoke-virtual {v0, p1}, Lg0/i;->b(Ljava/lang/Exception;)V
+
+    :goto_0
+    iget-object p0, v0, Lg0/i;->a:Lg0/h;
+
+    return-object p0
+.end method
+
+.method public static c(Ljava/lang/Exception;)Lg0/h;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<TResult:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Exception;",
+            ")",
+            "Lg0/h<",
+            "TTResult;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lg0/h;
+
+    invoke-direct {v0}, Lg0/h;-><init>()V
+
+    iget-object v1, v0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-boolean v2, v0, Lg0/h;->b:Z
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-eqz v2, :cond_0
+
+    monitor-exit v1
+
+    goto :goto_0
+
+    :cond_0
+    iput-boolean v4, v0, Lg0/h;->b:Z
+
+    iput-object p0, v0, Lg0/h;->e:Ljava/lang/Exception;
+
+    iput-boolean v3, v0, Lg0/h;->f:Z
+
+    iget-object p0, v0, Lg0/h;->a:Ljava/lang/Object;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+
+    invoke-virtual {v0}, Lg0/h;->g()V
+
+    monitor-exit v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v3, 0x1
+
+    :goto_0
+    if-eqz v3, :cond_1
+
+    return-object v0
+
+    :cond_1
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Cannot set the error on a completed task."
+
+    invoke-direct {p0, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :catchall_0
+    move-exception p0
+
+    :try_start_1
+    monitor-exit v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p0
+.end method
+
+.method public static d(Ljava/lang/Object;)Lg0/h;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<TResult:",
+            "Ljava/lang/Object;",
+            ">(TTResult;)",
+            "Lg0/h<",
+            "TTResult;>;"
+        }
+    .end annotation
+
+    if-nez p0, :cond_0
+
+    sget-object p0, Lg0/h;->j:Lg0/h;
+
+    return-object p0
+
+    :cond_0
+    instance-of v0, p0, Ljava/lang/Boolean;
+
+    if-eqz v0, :cond_2
+
+    check-cast p0, Ljava/lang/Boolean;
+
+    invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p0
+
+    if-eqz p0, :cond_1
+
+    sget-object p0, Lg0/h;->k:Lg0/h;
+
+    goto :goto_0
+
+    :cond_1
+    sget-object p0, Lg0/h;->l:Lg0/h;
+
+    :goto_0
+    return-object p0
+
+    :cond_2
+    new-instance v0, Lg0/h;
+
+    invoke-direct {v0}, Lg0/h;-><init>()V
+
+    invoke-virtual {v0, p0}, Lg0/h;->i(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_3
+
+    return-object v0
+
+    :cond_3
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Cannot set the result of a completed task."
+
+    invoke-direct {p0, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+
+# virtual methods
+.method public b(Lg0/d;)Lg0/h;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<TContinuationResult:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lg0/d<",
+            "TTResult;TTContinuationResult;>;)",
+            "Lg0/h<",
+            "TTContinuationResult;>;"
+        }
+    .end annotation
+
+    sget-object v0, Lg0/h;->i:Ljava/util/concurrent/Executor;
+
+    new-instance v1, Lg0/i;
+
+    invoke-direct {v1}, Lg0/i;-><init>()V
+
+    iget-object v2, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v2
+
+    :try_start_0
+    iget-object v3, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v3
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-boolean v4, p0, Lg0/h;->b:Z
+
+    monitor-exit v3
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-nez v4, :cond_0
+
+    :try_start_2
+    iget-object v3, p0, Lg0/h;->h:Ljava/util/List;
+
+    new-instance v5, Lg0/e;
+
+    invoke-direct {v5, p0, v1, p1, v0}, Lg0/e;-><init>(Lg0/h;Lg0/i;Lg0/d;Ljava/util/concurrent/Executor;)V
+
+    invoke-interface {v3, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_0
+    monitor-exit v2
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-eqz v4, :cond_1
+
+    :try_start_3
+    new-instance v2, Lg0/f;
+
+    invoke-direct {v2, v1, p1, p0}, Lg0/f;-><init>(Lg0/i;Lg0/d;Lg0/h;)V
+
+    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_3
+    .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lbolts/ExecutorException;
+
+    invoke-direct {v0, p1}, Lbolts/ExecutorException;-><init>(Ljava/lang/Exception;)V
+
+    invoke-virtual {v1, v0}, Lg0/i;->b(Ljava/lang/Exception;)V
+
+    :cond_1
+    :goto_0
+    iget-object p1, v1, Lg0/i;->a:Lg0/h;
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_4
+    monitor-exit v3
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+
+    :try_start_5
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit v2
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    throw p1
+.end method
+
+.method public e()Ljava/lang/Exception;
+    .locals 3
+
+    iget-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lg0/h;->e:Ljava/lang/Exception;
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x1
+
+    iput-boolean v1, p0, Lg0/h;->f:Z
+
+    iget-object v1, p0, Lg0/h;->g:Lg0/j;
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, p0, Lg0/h;->g:Lg0/j;
+
+    const/4 v2, 0x0
+
+    iput-object v2, v1, Lg0/j;->a:Lg0/h;
+
+    iput-object v2, p0, Lg0/h;->g:Lg0/j;
+
+    :cond_0
+    iget-object v1, p0, Lg0/h;->e:Ljava/lang/Exception;
+
+    monitor-exit v0
+
+    return-object v1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v1
+.end method
+
+.method public f()Z
+    .locals 2
+
+    iget-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v0
+
+    :try_start_0
+    invoke-virtual {p0}, Lg0/h;->e()Ljava/lang/Exception;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    monitor-exit v0
+
+    return v1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v1
+.end method
+
+.method public final g()V
+    .locals 3
+
+    iget-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lg0/h;->h:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->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, Lg0/d;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :try_start_1
+    invoke-interface {v2, p0}, Lg0/d;->a(Lg0/h;)Ljava/lang/Object;
+    :try_end_1
+    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v1
+
+    :try_start_2
+    new-instance v2, Ljava/lang/RuntimeException;
+
+    invoke-direct {v2, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v2
+
+    :catch_1
+    move-exception v1
+
+    throw v1
+
+    :cond_0
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Lg0/h;->h:Ljava/util/List;
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    throw v1
+.end method
+
+.method public h()Z
+    .locals 3
+
+    iget-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v1, p0, Lg0/h;->b:Z
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x0
+
+    monitor-exit v0
+
+    return v1
+
+    :cond_0
+    const/4 v1, 0x1
+
+    iput-boolean v1, p0, Lg0/h;->b:Z
+
+    iput-boolean v1, p0, Lg0/h;->c:Z
+
+    iget-object v2, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    invoke-virtual {v2}, Ljava/lang/Object;->notifyAll()V
+
+    invoke-virtual {p0}, Lg0/h;->g()V
+
+    monitor-exit v0
+
+    return v1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v1
+.end method
+
+.method public i(Ljava/lang/Object;)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TTResult;)Z"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v1, p0, Lg0/h;->b:Z
+
+    if-eqz v1, :cond_0
+
+    const/4 p1, 0x0
+
+    monitor-exit v0
+
+    return p1
+
+    :cond_0
+    const/4 v1, 0x1
+
+    iput-boolean v1, p0, Lg0/h;->b:Z
+
+    iput-object p1, p0, Lg0/h;->d:Ljava/lang/Object;
+
+    iget-object p1, p0, Lg0/h;->a:Ljava/lang/Object;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
+
+    invoke-virtual {p0}, Lg0/h;->g()V
+
+    monitor-exit v0
+
+    return v1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+.end method
diff --git a/com.discord/smali/g0/i.smali b/com.discord/smali/g0/i.smali
new file mode 100644
index 0000000000..e34da8f0bd
--- /dev/null
+++ b/com.discord/smali/g0/i.smali
@@ -0,0 +1,160 @@
+.class public Lg0/i;
+.super Ljava/lang/Object;
+.source "TaskCompletionSource.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<TResult:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lg0/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lg0/h<",
+            "TTResult;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lg0/h;
+
+    invoke-direct {v0}, Lg0/h;-><init>()V
+
+    iput-object v0, p0, Lg0/i;->a:Lg0/h;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 2
+
+    iget-object v0, p0, Lg0/i;->a:Lg0/h;
+
+    invoke-virtual {v0}, Lg0/h;->h()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Cannot cancel a completed task."
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public b(Ljava/lang/Exception;)V
+    .locals 5
+
+    iget-object v0, p0, Lg0/i;->a:Lg0/h;
+
+    iget-object v1, v0, Lg0/h;->a:Ljava/lang/Object;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-boolean v2, v0, Lg0/h;->b:Z
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-eqz v2, :cond_0
+
+    monitor-exit v1
+
+    goto :goto_0
+
+    :cond_0
+    iput-boolean v4, v0, Lg0/h;->b:Z
+
+    iput-object p1, v0, Lg0/h;->e:Ljava/lang/Exception;
+
+    iput-boolean v3, v0, Lg0/h;->f:Z
+
+    iget-object p1, v0, Lg0/h;->a:Ljava/lang/Object;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
+
+    invoke-virtual {v0}, Lg0/h;->g()V
+
+    monitor-exit v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v3, 0x1
+
+    :goto_0
+    if-eqz v3, :cond_1
+
+    return-void
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Cannot set the error on a completed task."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public c(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TTResult;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lg0/i;->a:Lg0/h;
+
+    invoke-virtual {v0, p1}, Lg0/h;->i(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Cannot set the result of a completed task."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/g0/j.smali b/com.discord/smali/g0/j.smali
new file mode 100644
index 0000000000..74eb039f8c
--- /dev/null
+++ b/com.discord/smali/g0/j.smali
@@ -0,0 +1,14 @@
+.class public Lg0/j;
+.super Ljava/lang/Object;
+.source "UnobservedErrorNotifier.java"
+
+
+# instance fields
+.field public a:Lg0/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lg0/h<",
+            "*>;"
+        }
+    .end annotation
+.end field
diff --git a/com.discord/smali/i.smali b/com.discord/smali/i.smali
index 2ff7444163..8ac28f427a 100644
--- a/com.discord/smali/i.smali
+++ b/com.discord/smali/i.smali
@@ -106,7 +106,7 @@
 
     const-string v1, "context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchForVoiceChannelSelect(Landroid/content/Context;)V
 
diff --git a/com.discord/smali/l.smali b/com.discord/smali/l.smali
index 320be62d5c..dab6d350db 100644
--- a/com.discord/smali/l.smali
+++ b/com.discord/smali/l.smali
@@ -3,7 +3,7 @@
 .source "java-style lambda group"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -15,8 +15,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/m.smali b/com.discord/smali/m.smali
index 3525e17220..18efb8a09c 100644
--- a/com.discord/smali/m.smali
+++ b/com.discord/smali/m.smali
@@ -27,11 +27,21 @@
 .method public getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "outRect"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string/jumbo v0, "view"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2, p3, p4}, Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 
@@ -82,25 +92,11 @@
     return-void
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type androidx.recyclerview.widget.StaggeredGridLayoutManager.LayoutParams"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_3
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "outRect"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/n$a$a.smali b/com.discord/smali/n$a$a.smali
index c0c2e5110d..acd4e88161 100644
--- a/com.discord/smali/n$a$a.smali
+++ b/com.discord/smali/n$a$a.smali
@@ -1,5 +1,5 @@
 .class public final Ln$a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     iget-object v1, p0, Ln$a$a;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    invoke-static {v0, v1}, Ln;->o(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+    invoke-static {v0, v1}, Ln;->p(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
diff --git a/com.discord/smali/n$a$b.smali b/com.discord/smali/n$a$b.smali
index c680505f80..ac93cf7a98 100644
--- a/com.discord/smali/n$a$b.smali
+++ b/com.discord/smali/n$a$b.smali
@@ -1,5 +1,5 @@
 .class public final Ln$a$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     iget-object v1, p0, Ln$a$b;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    invoke-static {v0, v1}, Ln;->o(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+    invoke-static {v0, v1}, Ln;->p(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
diff --git a/com.discord/smali/n$a$c.smali b/com.discord/smali/n$a$c.smali
index 8b2fc7f79b..b44bbc620b 100644
--- a/com.discord/smali/n$a$c.smali
+++ b/com.discord/smali/n$a$c.smali
@@ -1,5 +1,5 @@
 .class public final Ln$a$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineLegacy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     iget-object v1, p0, Ln$a$c;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    invoke-static {v0, v1}, Ln;->o(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+    invoke-static {v0, v1}, Ln;->p(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
     sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
diff --git a/com.discord/smali/n$a.smali b/com.discord/smali/n$a.smali
index a134cf71ae..892bf63a3f 100644
--- a/com.discord/smali/n$a.smali
+++ b/com.discord/smali/n$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln;->f(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    value = Ln;->g(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -47,46 +47,31 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "supportedVideoCodecs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
     const-string p1, "transportInfo"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string p1, "supportedVideoCodecs"
 
-    :cond_2
-    const-string p1, "connection"
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "connectionState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->DISCONNECTED:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
@@ -98,30 +83,18 @@
 
     invoke-direct {v0, p0, p1}, Ln$a$b;-><init>(Ln$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
-    invoke-static {p2, v0}, Ln;->p(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-static {p2, v0}, Ln;->q(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "connectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Ln$a;->a:Ln;
 
@@ -129,28 +102,21 @@
 
     invoke-direct {v1, p0, p1}, Ln$a$a;-><init>(Ln$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
-    invoke-static {v0, v1}, Ln;->p(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-static {v0, v1}, Ln;->q(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "connection"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "exception"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Ln$a;->a:Ln;
 
@@ -158,23 +124,9 @@
 
     invoke-direct {v0, p0, p1}, Ln$a$c;-><init>(Ln$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
 
-    invoke-static {p2, v0}, Ln;->p(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-static {p2, v0}, Ln;->q(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
 
     return-void
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onSpeaking(JIZ)V
diff --git a/com.discord/smali/n$b.smali b/com.discord/smali/n$b.smali
index 1f2dd96f7d..fcf77c9e4b 100644
--- a/com.discord/smali/n$b.smali
+++ b/com.discord/smali/n$b.smali
@@ -1,5 +1,5 @@
 .class public final Ln$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MediaEngineLegacy.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln;->f(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    value = Ln;->g(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,7 +51,9 @@
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Ln$b;->$connection:Lf/a/h/r/b/e;
 
@@ -60,13 +62,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/n$c.smali b/com.discord/smali/n$c.smali
index d46b58e9fe..9b082e690a 100644
--- a/com.discord/smali/n$c.smali
+++ b/com.discord/smali/n$c.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln;->d()Lrx/Observable;
+    value = Ln;->e()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -24,7 +24,8 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/n$d.smali b/com.discord/smali/n$d.smali
index 228deaf946..55ba6df690 100644
--- a/com.discord/smali/n$d.smali
+++ b/com.discord/smali/n$d.smali
@@ -57,7 +57,7 @@
 
     const-string v1, "codecs"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, v0, Ln;->d:Ljava/util/List;
 
diff --git a/com.discord/smali/n$e.smali b/com.discord/smali/n$e.smali
index bedce5e6c2..12f847596a 100644
--- a/com.discord/smali/n$e.smali
+++ b/com.discord/smali/n$e.smali
@@ -3,7 +3,7 @@
 .source "MediaEngineLegacy.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lf/a/h/r/a;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali/n$f.smali b/com.discord/smali/n$f.smali
index 8386fcf8ec..5d2304a38a 100644
--- a/com.discord/smali/n$f.smali
+++ b/com.discord/smali/n$f.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln;->m(Lkotlin/jvm/functions/Function1;)V
+    value = Ln;->n(Lkotlin/jvm/functions/Function1;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/n$g.smali b/com.discord/smali/n$g.smali
index 4371803552..5f1718e783 100644
--- a/com.discord/smali/n$g.smali
+++ b/com.discord/smali/n$g.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln;->r()V
+    value = Ln;->s()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -43,11 +43,11 @@
 
     const-string v0, "tag"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "message"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
diff --git a/com.discord/smali/n$h.smali b/com.discord/smali/n$h.smali
index 21ba19ba4a..a734c706ab 100644
--- a/com.discord/smali/n$h.smali
+++ b/com.discord/smali/n$h.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Ln$h;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "MediaEngineLegacy.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln;->r()V
+    value = Ln;->s()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;",
         "Lkotlin/Unit;",
@@ -45,64 +45,39 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x1
+    const-class v2, Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x1
+
+    const-string v3, "onNativeEngineInitialized"
+
+    const-string v4, "onNativeEngineInitialized()V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNativeEngineInitialized"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onNativeEngineInitialized()V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;->onNativeEngineInitialized()V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/n.smali b/com.discord/smali/n.smali
index 6b9cc435d8..443869009e 100644
--- a/com.discord/smali/n.smali
+++ b/com.discord/smali/n.smali
@@ -74,7 +74,7 @@
 
     const-string v1, "MediaEngineLegacy::class.java.simpleName"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Ln;->j:Ljava/lang/String;
 
@@ -86,8 +86,6 @@
 
     and-int/lit8 p5, p6, 0x10
 
-    const/4 p6, 0x0
-
     if-eqz p5, :cond_0
 
     const-string v0, "Pixel"
@@ -113,10 +111,28 @@
     goto :goto_0
 
     :cond_0
-    move-object p5, p6
+    const/4 p5, 0x0
 
     :goto_0
-    if-eqz p5, :cond_1
+    const-string p6, "context"
+
+    invoke-static {p1, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "singleThreadExecutorService"
+
+    invoke-static {p2, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "openSLESConfig"
+
+    invoke-static {p3, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "logger"
+
+    invoke-static {p4, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p6, "defaultUseOpenSL"
+
+    invoke-static {p5, p6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -143,16 +159,9 @@
     iput-object p1, p0, Ln;->c:Ljava/util/ArrayList;
 
     return-void
-
-    :cond_1
-    const-string p1, "defaultUseOpenSL"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p6
 .end method
 
-.method public static final n(Ln;[Ljava/lang/String;)Ljava/util/List;
+.method public static final o(Ln;[Ljava/lang/String;)Ljava/util/List;
     .locals 10
 
     const/4 v0, 0x0
@@ -180,7 +189,7 @@
 
     const-string v6, "Locale.ROOT"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v4, :cond_0
 
@@ -190,7 +199,7 @@
 
     const-string v5, "(this as java.lang.String).toUpperCase(locale)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -199,11 +208,11 @@
     goto :goto_0
 
     :cond_0
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string p1, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 
@@ -212,7 +221,7 @@
 
     invoke-direct {p1}, Lo;-><init>()V
 
-    invoke-static {p0, p1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p0, p1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p0
 
@@ -261,7 +270,7 @@
 
     move-result-object v8
 
-    const-string v6, "video"
+    const-string/jumbo v6, "video"
 
     move-object v3, v1
 
@@ -287,7 +296,7 @@
     throw v0
 .end method
 
-.method public static final o(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method public static final p(Ln;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
     .locals 2
 
     monitor-enter p0
@@ -320,14 +329,14 @@
     throw p1
 .end method
 
-.method public static final p(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+.method public static final q(Ln;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
     .locals 1
 
     iget-object p0, p0, Ln;->f:Ljava/util/concurrent/ExecutorService;
 
-    new-instance v0, Lt;
+    new-instance v0, Lu;
 
-    invoke-direct {v0, p1}, Lt;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v0, p1}, Lu;-><init>(Lkotlin/jvm/functions/Function0;)V
 
     invoke-interface {p0, v0}, Ljava/util/concurrent/ExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
 
@@ -365,18 +374,18 @@
 
     sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string v0, "Observable.just(Unit)"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 
     :cond_1
-    invoke-virtual {p0}, Ln;->r()V
+    invoke-virtual {p0}, Ln;->s()V
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
 
@@ -394,7 +403,7 @@
 
     const-string v1, "Observable.error(Illegal\u2026ze native media engine\"))"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -411,7 +420,7 @@
 
     const-string v1, "Observable.create({ emit\u2026er.BackpressureMode.NONE)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ln$d;
 
@@ -423,25 +432,50 @@
 
     sget-object v1, Ln$e;->d:Ln$e;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "getSupportedVideoCodecs(\u2026s }\n        .map { Unit }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
-.method public b(Z)V
-    .locals 1
+.method public b([Lco/discord/media_engine/RtcRegion;Lkotlin/jvm/functions/Function1;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Lco/discord/media_engine/RtcRegion;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-[",
+            "Ljava/lang/String;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "regionsWithIps"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "callback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ln;->s()V
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setEchoCancellation(Z)V
+    new-instance v1, Ls;
+
+    invoke-direct {v1, p2}, Ls;-><init>(Lkotlin/jvm/functions/Function1;)V
+
+    invoke-virtual {v0, p1, v1}, Lcom/hammerandchisel/libdiscord/Discord;->getRankedRtcRegions([Lco/discord/media_engine/RtcRegion;Lcom/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback;)V
 
     :cond_0
     return-void
@@ -454,13 +488,26 @@
 
     if-eqz v0, :cond_0
 
+    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setEchoCancellation(Z)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public d(Z)V
+    .locals 1
+
+    iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
+
+    if-eqz v0, :cond_0
+
     invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setNoiseCancellation(Z)V
 
     :cond_0
     return-void
 .end method
 
-.method public d()Lrx/Observable;
+.method public e()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -483,12 +530,12 @@
 
     const-string v1, "Observable.create({ emit\u2026.BackpressureMode.LATEST)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
-.method public e(I)V
+.method public f(I)V
     .locals 1
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
@@ -501,8 +548,8 @@
     return-void
 .end method
 
-.method public declared-synchronized f(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
-    .locals 19
+.method public declared-synchronized g(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -519,36 +566,48 @@
 
     move-object/from16 v7, p0
 
+    move-object/from16 v0, p3
+
+    move-object/from16 v1, p5
+
     monitor-enter p0
 
     :try_start_0
-    const-string v0, "connectionType"
+    const-string v2, "options"
 
-    const/4 v8, 0x0
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_5
+    const-string v2, "connectionType"
 
-    iget-object v0, v7, Ln;->d:Ljava/util/List;
+    move-object/from16 v13, p4
 
-    if-eqz v0, :cond_0
+    invoke-static {v13, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v0, 0x1
+    const-string v2, "onFailure"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v7, Ln;->d:Ljava/util/List;
+
+    if-eqz v2, :cond_0
+
+    const/4 v2, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
     :goto_0
-    if-nez v0, :cond_1
+    const/4 v8, 0x0
+
+    if-nez v2, :cond_1
 
     new-instance v0, Ljava/lang/IllegalStateException;
 
-    const-string v1, "connect called on unprepared media engine."
+    const-string v2, "connect called on unprepared media engine."
 
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    move-object/from16 v1, p5
+    invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     invoke-interface {v1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -560,41 +619,39 @@
 
     :cond_1
     :try_start_1
-    iget-object v12, v7, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v11, v7, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
 
-    if-eqz v12, :cond_3
+    if-eqz v11, :cond_3
 
-    iget-object v0, v7, Ln;->h:Lcom/discord/utilities/logging/Logger;
+    iget-object v1, v7, Ln;->h:Lcom/discord/utilities/logging/Logger;
 
-    sget-object v1, Ln;->j:Ljava/lang/String;
+    sget-object v2, Ln;->j:Ljava/lang/String;
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    new-instance v3, Ljava/lang/StringBuilder;
 
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v3, "Connecting with options: "
+    const-string v4, "Connecting with options: "
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    move-object/from16 v15, p3
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v2, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    move-result-object v3
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const/4 v3, 0x0
+    const/4 v5, 0x4
 
-    const/4 v4, 0x4
+    const/4 v6, 0x0
 
-    const/4 v5, 0x0
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    new-instance v9, Ln$a;
 
-    new-instance v0, Ln$a;
-
-    move-object v1, v0
+    move-object v1, v9
 
     move-object/from16 v2, p0
 
@@ -608,27 +665,29 @@
 
     new-instance v1, Lf/a/h/r/b/e;
 
-    iget-object v10, v7, Ln;->f:Ljava/util/concurrent/ExecutorService;
+    iget-object v2, v7, Ln;->f:Ljava/util/concurrent/ExecutorService;
 
-    iget-object v11, v7, Ln;->h:Lcom/discord/utilities/logging/Logger;
+    iget-object v10, v7, Ln;->h:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v13, v7, Ln;->d:Ljava/util/List;
+    iget-object v12, v7, Ln;->d:Ljava/util/List;
 
-    if-eqz v13, :cond_2
+    if-eqz v12, :cond_2
 
-    invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v9}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v18
+    move-result-object v17
 
-    move-object v9, v1
+    move-object v8, v1
 
-    move-object/from16 v14, p4
+    move-object v9, v2
 
-    move-wide/from16 v15, p1
+    move-object/from16 v13, p4
 
-    move-object/from16 v17, p3
+    move-wide/from16 v14, p1
 
-    invoke-direct/range {v9 .. v18}, Lf/a/h/r/b/e;-><init>(Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/logging/Logger;Lcom/hammerandchisel/libdiscord/Discord;Ljava/util/List;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
+    move-object/from16 v16, p3
+
+    invoke-direct/range {v8 .. v17}, Lf/a/h/r/b/e;-><init>(Ljava/util/concurrent/ExecutorService;Lcom/discord/utilities/logging/Logger;Lcom/hammerandchisel/libdiscord/Discord;Ljava/util/List;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
 
     move-object v8, v1
 
@@ -637,7 +696,7 @@
     :cond_2
     const-string v0, "supportedVideoCodecs"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -656,7 +715,7 @@
 
     invoke-direct {v0, v8}, Ln$b;-><init>(Lf/a/h/r/b/e;)V
 
-    invoke-virtual {v7, v0}, Ln;->q(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v7, v0}, Ln;->r(Lkotlin/jvm/functions/Function1;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -665,14 +724,6 @@
 
     return-object v8
 
-    :cond_5
-    :try_start_3
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw v8
-
     :catchall_0
     move-exception v0
 
@@ -681,35 +732,6 @@
     throw v0
 .end method
 
-.method public g(F)V
-    .locals 3
-
-    iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
-
-    if-eqz v0, :cond_0
-
-    const/high16 v1, 0x43960000    # 300.0f
-
-    const/4 v2, 0x0
-
-    invoke-static {v2, p1}, Ljava/lang/Math;->max(FF)F
-
-    move-result p1
-
-    invoke-static {v1, p1}, Ljava/lang/Math;->min(FF)F
-
-    move-result p1
-
-    const/high16 v1, 0x42c80000    # 100.0f
-
-    div-float/2addr p1, v1
-
-    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setSpeakerVolume(F)V
-
-    :cond_0
-    return-void
-.end method
-
 .method public declared-synchronized getConnections()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -744,7 +766,36 @@
     throw v0
 .end method
 
-.method public h(Z)V
+.method public h(F)V
+    .locals 3
+
+    iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
+
+    if-eqz v0, :cond_0
+
+    const/high16 v1, 0x43960000    # 300.0f
+
+    const/4 v2, 0x0
+
+    invoke-static {v2, p1}, Ljava/lang/Math;->max(FF)F
+
+    move-result p1
+
+    invoke-static {v1, p1}, Ljava/lang/Math;->min(FF)F
+
+    move-result p1
+
+    const/high16 v1, 0x42c80000    # 100.0f
+
+    div-float/2addr p1, v1
+
+    invoke-virtual {v0, p1}, Lcom/hammerandchisel/libdiscord/Discord;->setSpeakerVolume(F)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public i(Z)V
     .locals 1
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
@@ -757,7 +808,7 @@
     return-void
 .end method
 
-.method public i()Lcom/hammerandchisel/libdiscord/Discord;
+.method public j()Lcom/hammerandchisel/libdiscord/Discord;
     .locals 1
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
@@ -765,7 +816,7 @@
     return-object v0
 .end method
 
-.method public j(Lkotlin/jvm/functions/Function1;)V
+.method public k(Lkotlin/jvm/functions/Function1;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -778,15 +829,19 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Ln;->r()V
+    const-string v0, "devicesCallback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ln;->s()V
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
-    new-instance v1, Ls;
+    new-instance v1, Lt;
 
-    invoke-direct {v1, p1}, Ls;-><init>(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v1, p1}, Lt;-><init>(Lkotlin/jvm/functions/Function1;)V
 
     invoke-virtual {v0, v1}, Lcom/hammerandchisel/libdiscord/Discord;->getVideoInputDevices(Lcom/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback;)V
 
@@ -794,7 +849,7 @@
     return-void
 .end method
 
-.method public k()Ljava/util/concurrent/ExecutorService;
+.method public l()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
     iget-object v0, p0, Ln;->f:Ljava/util/concurrent/ExecutorService;
@@ -802,7 +857,7 @@
     return-object v0
 .end method
 
-.method public l(Z)V
+.method public m(Z)V
     .locals 1
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
@@ -815,7 +870,7 @@
     return-void
 .end method
 
-.method public m(Lkotlin/jvm/functions/Function1;)V
+.method public n(Lkotlin/jvm/functions/Function1;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -830,7 +885,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Ln;->r()V
+    invoke-virtual {p0}, Ln;->s()V
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
 
@@ -858,7 +913,7 @@
     return-void
 .end method
 
-.method public final q(Lkotlin/jvm/functions/Function1;)V
+.method public final r(Lkotlin/jvm/functions/Function1;)V
     .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -920,7 +975,7 @@
     return-void
 .end method
 
-.method public final r()V
+.method public final s()V
     .locals 9
 
     iget-object v0, p0, Ln;->b:Lcom/hammerandchisel/libdiscord/Discord;
@@ -1134,7 +1189,7 @@
 
     sget-object v0, Ln$h;->d:Ln$h;
 
-    invoke-virtual {p0, v0}, Ln;->q(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p0, v0}, Ln;->r(Lkotlin/jvm/functions/Function1;)V
 
     :cond_5
     return-void
diff --git a/com.discord/smali/o.smali b/com.discord/smali/o.smali
index 5dcb511c6c..25ccf4d8e9 100644
--- a/com.discord/smali/o.smali
+++ b/com.discord/smali/o.smali
@@ -42,7 +42,7 @@
 
     const-string v0, "H264"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -54,7 +54,7 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
diff --git a/com.discord/smali/p.smali b/com.discord/smali/p.smali
index c76c19c6fc..d32ba574f1 100644
--- a/com.discord/smali/p.smali
+++ b/com.discord/smali/p.smali
@@ -26,11 +26,13 @@
 .method public final onAudioSubsystem(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "audioSubsystem"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "audioLayer"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lp;->a:Lrx/Emitter;
 
@@ -38,25 +40,11 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$AudioInfo;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lp;->a:Lrx/Emitter;
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
-
-    :cond_0
-    const-string p1, "audioLayer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "audioSubsystem"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali/q.smali b/com.discord/smali/q.smali
index a1c69a9b13..cfda50e79e 100644
--- a/com.discord/smali/q.smali
+++ b/com.discord/smali/q.smali
@@ -30,32 +30,25 @@
 .method public final onSupportedVideoCodecs([Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string/jumbo v0, "videoCodecsStringArray"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lq;->a:Lr;
 
     iget-object v0, v0, Lr;->d:Ln;
 
-    invoke-static {v0, p1}, Ln;->n(Ln;[Ljava/lang/String;)Ljava/util/List;
+    invoke-static {v0, p1}, Ln;->o(Ln;[Ljava/lang/String;)Ljava/util/List;
 
     move-result-object p1
 
     iget-object v0, p0, Lq;->b:Lrx/Emitter;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     iget-object p1, p0, Lq;->b:Lrx/Emitter;
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
-
-    :cond_0
-    const-string p1, "videoCodecsStringArray"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/r.smali b/com.discord/smali/r.smali
index 57e74b6010..7cd4944136 100644
--- a/com.discord/smali/r.smali
+++ b/com.discord/smali/r.smali
@@ -15,7 +15,10 @@
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
         "Lrx/Emitter<",
-        "TT;>;>;"
+        "Ljava/util/List<",
+        "+",
+        "Lf/a/h/r/a;",
+        ">;>;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali/s.smali b/com.discord/smali/s.smali
index 6b7ca52dad..9de1214b38 100644
--- a/com.discord/smali/s.smali
+++ b/com.discord/smali/s.smali
@@ -3,7 +3,7 @@
 .source "MediaEngineLegacy.kt"
 
 # interfaces
-.implements Lcom/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback;
+.implements Lcom/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback;
 
 
 # instance fields
@@ -23,14 +23,16 @@
 
 
 # virtual methods
-.method public final onDevices([Lco/discord/media_engine/VideoInputDeviceDescription;)V
+.method public final synthetic onRankedRtcRegions([Ljava/lang/String;)V
     .locals 1
-    .param p1    # [Lco/discord/media_engine/VideoInputDeviceDescription;
+    .param p1    # [Ljava/lang/String;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "p0"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Ls;->a:Lkotlin/jvm/functions/Function1;
 
@@ -40,16 +42,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p0"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali/t.smali b/com.discord/smali/t.smali
index 635af32179..a92af61718 100644
--- a/com.discord/smali/t.smali
+++ b/com.discord/smali/t.smali
@@ -3,38 +3,46 @@
 .source "MediaEngineLegacy.kt"
 
 # interfaces
-.implements Ljava/lang/Runnable;
+.implements Lcom/hammerandchisel/libdiscord/Discord$GetVideoInputDevicesCallback;
 
 
 # instance fields
-.field public final synthetic d:Lkotlin/jvm/functions/Function0;
+.field public final synthetic a:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
+.method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lt;->d:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lt;->a:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final synthetic run()V
-    .locals 2
+.method public final synthetic onDevices([Lco/discord/media_engine/VideoInputDeviceDescription;)V
+    .locals 1
+    .param p1    # [Lco/discord/media_engine/VideoInputDeviceDescription;
+        .annotation build Landroidx/annotation/NonNull;
+        .end annotation
+    .end param
 
-    iget-object v0, p0, Lt;->d:Lkotlin/jvm/functions/Function0;
+    const-string v0, "p0"
 
-    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
+    iget-object v0, p0, Lt;->a:Lkotlin/jvm/functions/Function1;
 
-    const-string v1, "invoke(...)"
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object p1
+
+    const-string v0, "invoke(...)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/u.smali b/com.discord/smali/u.smali
index 8a4e302cdc..65757de4fe 100644
--- a/com.discord/smali/u.smali
+++ b/com.discord/smali/u.smali
@@ -1,117 +1,40 @@
-.class public final synthetic Lu;
-.super Lj0/n/c/g;
-.source "WidgetFriendsAddUserRequestsModel.kt"
+.class public final Lu;
+.super Ljava/lang/Object;
+.source "MediaEngineLegacy.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function2;
+.implements Ljava/lang/Runnable;
 
 
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Ljava/util/Set<",
-        "+",
-        "Ljava/lang/Long;",
-        ">;",
-        "Ljava/util/Set<",
-        "+",
-        "Ljava/lang/Long;",
-        ">;",
-        "LWidgetFriendsAddUserRequestsModel;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lu;
+# instance fields
+.field public final synthetic d:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
+    .locals 0
 
-    new-instance v0, Lu;
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-direct {v0}, Lu;-><init>()V
-
-    sput-object v0, Lu;->d:Lu;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    iput-object p1, p0, Lu;->d:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
+.method public final synthetic run()V
+    .locals 2
 
-    const-string v0, "<init>"
+    iget-object v0, p0, Lu;->d:Lkotlin/jvm/functions/Function0;
 
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, LWidgetFriendsAddUserRequestsModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
     move-result-object v0
 
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Ljava/util/Set;Ljava/util/Set;)V"
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/util/Set;
-
-    check-cast p2, Ljava/util/Set;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    new-instance v0, LWidgetFriendsAddUserRequestsModel;
-
-    invoke-direct {v0, p1, p2}, LWidgetFriendsAddUserRequestsModel;-><init>(Ljava/util/Set;Ljava/util/Set;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    const-string v1, "invoke(...)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali/v.smali b/com.discord/smali/v.smali
index f7bc66e03d..5cf257c2fb 100644
--- a/com.discord/smali/v.smali
+++ b/com.discord/smali/v.smali
@@ -1,36 +1,87 @@
-.class public final Lv;
-.super Ljava/lang/Object;
+.class public final synthetic Lv;
+.super Lk0/o/c/h;
 .source "WidgetFriendsAddUserRequestsModel.kt"
 
 # interfaces
-.implements Lrx/functions/Func2;
+.implements Lkotlin/jvm/functions/Function2;
 
 
-# instance fields
-.field public final synthetic d:Lkotlin/jvm/functions/Function2;
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "Ljava/util/Set<",
+        "+",
+        "Ljava/lang/Long;",
+        ">;",
+        "LWidgetFriendsAddUserRequestsModel;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lv;
 
 
 # direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    new-instance v0, Lv;
 
-    iput-object p1, p0, Lv;->d:Lkotlin/jvm/functions/Function2;
+    invoke-direct {v0}, Lv;-><init>()V
+
+    sput-object v0, Lv;->d:Lv;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 6
+
+    const-class v2, LWidgetFriendsAddUserRequestsModel;
+
+    const/4 v1, 0x2
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Ljava/util/Set;Ljava/util/Set;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lv;->d:Lkotlin/jvm/functions/Function2;
+    check-cast p1, Ljava/util/Set;
 
-    invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast p2, Ljava/util/Set;
 
-    move-result-object p1
+    const-string v0, "p1"
 
-    return-object p1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, LWidgetFriendsAddUserRequestsModel;
+
+    invoke-direct {v0, p1, p2}, LWidgetFriendsAddUserRequestsModel;-><init>(Ljava/util/Set;Ljava/util/Set;)V
+
+    return-object v0
 .end method
diff --git a/com.discord/smali/w$a.smali b/com.discord/smali/w$a.smali
deleted file mode 100644
index 67b82001cd..0000000000
--- a/com.discord/smali/w$a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Lw$a;
-.super Ljava/lang/Object;
-.source "WidgetGuildCallOnboardingSheet.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lw;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali/w$b.smali b/com.discord/smali/w$b.smali
deleted file mode 100644
index d85fedf167..0000000000
--- a/com.discord/smali/w$b.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public final Lw$b;
-.super Lj0/n/c/i;
-.source "WidgetGuildCallOnboardingSheet.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lw;->onResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lw;
-
-
-# direct methods
-.method public constructor <init>(Lw;)V
-    .locals 0
-
-    iput-object p1, p0, Lw$b;->this$0:Lw;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lw$b;->this$0:Lw;
-
-    invoke-static {v0, p1}, Lw;->f(Lw;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali/w$c.smali b/com.discord/smali/w$c.smali
deleted file mode 100644
index f4599311f6..0000000000
--- a/com.discord/smali/w$c.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public final Lw$c;
-.super Lj0/n/c/i;
-.source "WidgetGuildCallOnboardingSheet.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lw;->onResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lw;
-
-
-# direct methods
-.method public constructor <init>(Lw;)V
-    .locals 0
-
-    iput-object p1, p0, Lw$c;->this$0:Lw;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lw$c;->this$0:Lw;
-
-    invoke-static {v0, p1}, Lw;->g(Lw;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali/w.smali b/com.discord/smali/w.smali
index 8db5662884..77d77b15b7 100644
--- a/com.discord/smali/w.smali
+++ b/com.discord/smali/w.smali
@@ -1,412 +1,36 @@
 .class public final Lw;
-.super Lcom/discord/app/AppBottomSheet;
-.source "WidgetGuildCallOnboardingSheet.kt"
+.super Ljava/lang/Object;
+.source "WidgetFriendsAddUserRequestsModel.kt"
 
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lw$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic f:[Lkotlin/reflect/KProperty;
-
-.field public static final g:Lw$a;
+# interfaces
+.implements Lrx/functions/Func2;
 
 
 # instance fields
-.field public final d:Lkotlin/properties/ReadOnlyProperty;
-
-.field public e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+.field public final synthetic d:Lkotlin/jvm/functions/Function2;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 5
+.method public constructor <init>(Lkotlin/jvm/functions/Function2;)V
+    .locals 0
 
-    const/4 v0, 0x1
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    new-array v0, v0, [Lkotlin/reflect/KProperty;
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lw;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "connectButton"
-
-    const-string v4, "getConnectButton()Lcom/discord/views/JoinVoiceChannelButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    sput-object v0, Lw;->f:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Lw$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lw$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lw;->g:Lw$a;
+    iput-object p1, p0, Lw;->d:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
 
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
-
-    const v0, 0x7f0a0420
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lw;->d:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-.end method
-
-.method public static final f(Lw;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;)V
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_7
-
-    instance-of v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;
-
-    if-nez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, p0, Lw;->d:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v2, Lw;->f:[Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x0
-
-    aget-object v2, v2, v3
-
-    invoke-interface {v1, p0, v2}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/views/JoinVoiceChannelButton;
-
-    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;->getJoinability()Lcom/discord/utilities/voice/VoiceChannelJoinability;
-
-    move-result-object p1
-
-    new-instance v2, Ly;
-
-    invoke-direct {v2, p0}, Ly;-><init>(Lw;)V
-
-    if-eqz v1, :cond_6
-
-    if-eqz p1, :cond_5
-
-    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
-
-    move-result p0
-
-    const p1, 0x7f12048d
-
-    if-eqz p0, :cond_4
-
-    const/4 v0, 0x1
-
-    if-eq p0, v0, :cond_3
-
-    const/4 v0, 0x2
-
-    if-eq p0, v0, :cond_4
-
-    const/4 v0, 0x3
-
-    if-eq p0, v0, :cond_2
-
-    const/4 v0, 0x4
-
-    if-eq p0, v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {v1, p1}, Landroid/widget/Button;->setText(I)V
-
-    const p0, 0x7f120b08
-
-    invoke-virtual {v1, v1, p0}, Lcom/discord/views/JoinVoiceChannelButton;->a(Lcom/google/android/material/button/MaterialButton;I)V
-
-    goto :goto_0
-
-    :cond_2
-    const p0, 0x7f12164b
-
-    invoke-virtual {v1, p0}, Landroid/widget/Button;->setText(I)V
-
-    invoke-virtual {v1, v1, p0}, Lcom/discord/views/JoinVoiceChannelButton;->a(Lcom/google/android/material/button/MaterialButton;I)V
-
-    goto :goto_0
-
-    :cond_3
-    const p0, 0x7f1203fc
-
-    invoke-virtual {v1, p0}, Landroid/widget/Button;->setText(I)V
-
-    const p0, 0x7f1203fb
-
-    invoke-virtual {v1, v1, p0}, Lcom/discord/views/JoinVoiceChannelButton;->a(Lcom/google/android/material/button/MaterialButton;I)V
-
-    goto :goto_0
-
-    :cond_4
-    invoke-virtual {v1, p1}, Landroid/widget/Button;->setText(I)V
-
-    new-instance p0, Lf/a/n/e;
-
-    invoke-direct {p0, v2}, Lf/a/n/e;-><init>(Lkotlin/jvm/functions/Function0;)V
-
-    invoke-virtual {v1, p0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    :goto_0
-    return-void
-
-    :cond_5
-    const-string p0, "joinability"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    throw v0
-
-    :cond_7
-    throw v0
-.end method
-
-.method public static final g(Lw;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;)V
-    .locals 8
-
-    if-eqz p0, :cond_2
-
-    sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$ShowGuildVideoCapacityDialog;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$ShowGuildVideoCapacityDialog;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const-string v1, "parentFragmentManager"
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lf/a/a/m;->f:Lf/a/a/m$a;
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v0
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, v0}, Lf/a/a/m$a;->a(Landroidx/fragment/app/FragmentManager;)V
-
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v0, p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$LaunchGuildCallScreen;
-
-    if-eqz v0, :cond_1
-
-    sget-object v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->Companion:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v3
-
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$LaunchGuildCallScreen;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$LaunchGuildCallScreen;->getChannelId()J
-
-    move-result-wide v4
-
-    const/4 v6, 0x1
-
-    sget-object v7, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;->HOME:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;
-
-    invoke-virtual/range {v2 .. v7}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;->show(Landroidx/fragment/app/FragmentManager;JZLcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
-
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
-
-    :cond_1
-    :goto_0
-    return-void
-
-    :cond_2
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
 
 # virtual methods
-.method public getContentViewResId()I
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
-    const v0, 0x7f0d01d1
+    iget-object v0, p0, Lw;->d:Lkotlin/jvm/functions/Function2;
 
-    return v0
-.end method
-
-.method public onResume()V
-    .locals 12
-
-    invoke-super {p0}, Lcom/discord/app/AppBottomSheet;->onResume()V
-
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
-
-    move-result-wide v3
-
-    new-instance v0, Landroidx/lifecycle/ViewModelProvider;
-
-    new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v10, 0x3e
-
-    const/4 v11, 0x0
-
-    move-object v2, v1
-
-    invoke-direct/range {v2 .. v11}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-direct {v0, p0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
-
-    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
-
-    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-
-    move-result-object v0
-
-    const-string v1, "ViewModelProvider(this, \u2026eetViewModel::class.java)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
-
-    iput-object v0, p0, Lw;->e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
-
-    const/4 v1, 0x0
-
-    const-string v2, "viewModel"
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
-
-    move-result-object v3
-
-    const-class v4, Lw;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    new-instance v9, Lw$b;
-
-    invoke-direct {v9, p0}, Lw$b;-><init>(Lw;)V
-
-    const/16 v10, 0x1e
-
-    const/4 v11, 0x0
-
-    invoke-static/range {v3 .. v11}, 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
-
-    iget-object v0, p0, Lw;->e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;->observeEvents()Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
-
-    move-result-object v1
-
-    const-class v2, Lw;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    new-instance v7, Lw$c;
-
-    invoke-direct {v7, p0}, Lw$c;-><init>(Lw;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
-    return-void
-
-    :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
+    invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali/x$a.smali b/com.discord/smali/x$a.smali
new file mode 100644
index 0000000000..149b88a4fd
--- /dev/null
+++ b/com.discord/smali/x$a.smali
@@ -0,0 +1,24 @@
+.class public final Lx$a;
+.super Ljava/lang/Object;
+.source "WidgetGuildCallOnboardingSheet.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lx;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/x$b.smali b/com.discord/smali/x$b.smali
new file mode 100644
index 0000000000..bc874ac0df
--- /dev/null
+++ b/com.discord/smali/x$b.smali
@@ -0,0 +1,65 @@
+.class public final Lx$b;
+.super Lk0/o/c/j;
+.source "WidgetGuildCallOnboardingSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lx;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lx;
+
+
+# direct methods
+.method public constructor <init>(Lx;)V
+    .locals 0
+
+    iput-object p1, p0, Lx$b;->this$0:Lx;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;
+
+    const-string/jumbo v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lx$b;->this$0:Lx;
+
+    invoke-static {v0, p1}, Lx;->f(Lx;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/x$c.smali b/com.discord/smali/x$c.smali
new file mode 100644
index 0000000000..b0455e0b2e
--- /dev/null
+++ b/com.discord/smali/x$c.smali
@@ -0,0 +1,65 @@
+.class public final Lx$c;
+.super Lk0/o/c/j;
+.source "WidgetGuildCallOnboardingSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lx;->onResume()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lx;
+
+
+# direct methods
+.method public constructor <init>(Lx;)V
+    .locals 0
+
+    iput-object p1, p0, Lx$c;->this$0:Lx;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;
+
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lx$c;->this$0:Lx;
+
+    invoke-static {v0, p1}, Lx;->g(Lx;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/x.smali b/com.discord/smali/x.smali
index 4463cd502a..a8f0fc6bf7 100644
--- a/com.discord/smali/x.smali
+++ b/com.discord/smali/x.smali
@@ -1,86 +1,405 @@
 .class public final Lx;
-.super Ljava/lang/Object;
+.super Lcom/discord/app/AppBottomSheet;
 .source "WidgetGuildCallOnboardingSheet.kt"
 
-# interfaces
-.implements Lrx/functions/Action0;
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lx$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic f:[Lkotlin/reflect/KProperty;
+
+.field public static final g:Lx$a;
 
 
 # instance fields
-.field public final synthetic d:Ly;
+.field public final d:Lkotlin/properties/ReadOnlyProperty;
+
+.field public e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
 
 
 # direct methods
-.method public constructor <init>(Ly;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 5
 
-    iput-object p1, p0, Lx;->d:Ly;
+    const/4 v0, 0x1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+    const-class v1, Lx;
+
+    const-string v2, "connectButton"
+
+    const-string v3, "getConnectButton()Lcom/discord/views/JoinVoiceChannelButton;"
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    aput-object v1, v0, v4
+
+    sput-object v0, Lx;->f:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lx$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lx$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lx;->g:Lx$a;
 
     return-void
 .end method
 
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
+
+    const v0, 0x7f0a0426
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lx;->d:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final f(Lx;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;)V
+    .locals 4
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_6
+
+    instance-of v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, p0, Lx;->d:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v2, Lx;->f:[Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x0
+
+    aget-object v2, v2, v3
+
+    invoke-interface {v1, p0, v2}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/views/JoinVoiceChannelButton;
+
+    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;->getJoinability()Lcom/discord/utilities/voice/VoiceChannelJoinability;
+
+    move-result-object p1
+
+    new-instance v2, Lz;
+
+    invoke-direct {v2, p0}, Lz;-><init>(Lx;)V
+
+    if-eqz v1, :cond_5
+
+    const-string p0, "joinability"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "joinVoiceClickListener"
+
+    invoke-static {v2, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
+
+    move-result p0
+
+    const p1, 0x7f12048e
+
+    if-eqz p0, :cond_4
+
+    const/4 v0, 0x1
+
+    if-eq p0, v0, :cond_3
+
+    const/4 v0, 0x2
+
+    if-eq p0, v0, :cond_4
+
+    const/4 v0, 0x3
+
+    if-eq p0, v0, :cond_2
+
+    const/4 v0, 0x4
+
+    if-eq p0, v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {v1, p1}, Landroid/widget/Button;->setText(I)V
+
+    const p0, 0x7f120b2e
+
+    invoke-virtual {v1, v1, p0}, Lcom/discord/views/JoinVoiceChannelButton;->a(Lcom/google/android/material/button/MaterialButton;I)V
+
+    goto :goto_0
+
+    :cond_2
+    const p0, 0x7f121675
+
+    invoke-virtual {v1, p0}, Landroid/widget/Button;->setText(I)V
+
+    invoke-virtual {v1, v1, p0}, Lcom/discord/views/JoinVoiceChannelButton;->a(Lcom/google/android/material/button/MaterialButton;I)V
+
+    goto :goto_0
+
+    :cond_3
+    const p0, 0x7f1203fd
+
+    invoke-virtual {v1, p0}, Landroid/widget/Button;->setText(I)V
+
+    const p0, 0x7f1203fc
+
+    invoke-virtual {v1, v1, p0}, Lcom/discord/views/JoinVoiceChannelButton;->a(Lcom/google/android/material/button/MaterialButton;I)V
+
+    goto :goto_0
+
+    :cond_4
+    invoke-virtual {v1, p1}, Landroid/widget/Button;->setText(I)V
+
+    new-instance p0, Lf/a/n/e;
+
+    invoke-direct {p0, v2}, Lf/a/n/e;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    invoke-virtual {v1, p0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    :goto_0
+    return-void
+
+    :cond_5
+    throw v0
+
+    :cond_6
+    throw v0
+.end method
+
+.method public static final g(Lx;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event;)V
+    .locals 8
+
+    if-eqz p0, :cond_2
+
+    sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$ShowGuildVideoCapacityDialog;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$ShowGuildVideoCapacityDialog;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const-string v1, "parentFragmentManager"
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Lf/a/a/m;->f:Lf/a/a/m$a;
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v0
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, v0}, Lf/a/a/m$a;->a(Landroidx/fragment/app/FragmentManager;)V
+
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v0, p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$LaunchGuildCallScreen;
+
+    if-eqz v0, :cond_1
+
+    sget-object v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->Companion:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v3
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$LaunchGuildCallScreen;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Event$LaunchGuildCallScreen;->getChannelId()J
+
+    move-result-wide v4
+
+    const/4 v6, 0x1
+
+    sget-object v7, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;->HOME:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;
+
+    invoke-virtual/range {v2 .. v7}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion;->show(Landroidx/fragment/app/FragmentManager;JZLcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V
+
+    :cond_1
+    :goto_0
+    return-void
+
+    :cond_2
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
 
 # virtual methods
-.method public final call()V
-    .locals 4
+.method public getContentViewResId()I
+    .locals 1
 
-    sget-object v0, Lw;->g:Lw$a;
+    const v0, 0x7f0d01d1
 
-    iget-object v1, p0, Lx;->d:Ly;
+    return v0
+.end method
 
-    iget-object v1, v1, Ly;->this$0:Lw;
+.method public onResume()V
+    .locals 12
 
-    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+    invoke-super {p0}, Lcom/discord/app/AppBottomSheet;->onResume()V
 
-    move-result-object v1
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    const-string v2, "requireContext()"
+    move-result-object v0
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    const/4 v2, 0x0
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+
+    move-result-wide v3
+
+    new-instance v0, Landroidx/lifecycle/ViewModelProvider;
+
+    new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x3e
+
+    const/4 v11, 0x0
+
+    move-object v2, v1
+
+    invoke-direct/range {v2 .. v11}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-direct {v0, p0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+
+    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object v0
+
+    const-string v1, "ViewModelProvider(this, \u2026eetViewModel::class.java)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+
+    iput-object v0, p0, Lx;->e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+
+    const/4 v1, 0x0
+
+    const-string/jumbo v2, "viewModel"
 
     if-eqz v0, :cond_1
 
-    invoke-static {v1}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+    invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v3
 
-    const/4 v1, 0x1
+    const-class v4, Lx;
 
-    const-string v3, "CACHE_KEY_VOICE_CHANNEL_ONBOARDED"
+    const/4 v5, 0x0
 
-    invoke-interface {v0, v3, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+    const/4 v6, 0x0
 
-    move-result-object v0
+    const/4 v7, 0x0
 
-    invoke-interface {v0}, Landroid/content/SharedPreferences$Editor;->apply()V
+    const/4 v8, 0x0
 
-    iget-object v0, p0, Lx;->d:Ly;
+    new-instance v9, Lx$b;
 
-    iget-object v0, v0, Ly;->this$0:Lw;
+    invoke-direct {v9, p0}, Lx$b;-><init>(Lx;)V
 
-    iget-object v0, v0, Lw;->e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+    const/16 v10, 0x1e
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, 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
+
+    iget-object v0, p0, Lx;->e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;->onConnectPressed()V
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;->observeEvents()Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-class v2, Lx;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    new-instance v7, Lx$c;
+
+    invoke-direct {v7, p0}, Lx$c;-><init>(Lx;)V
+
+    const/16 v8, 0x1e
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
 
     :cond_0
-    const-string v0, "viewModel"
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v2
+    throw v1
 
     :cond_1
-    throw v2
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
 .end method
diff --git a/com.discord/smali/y.smali b/com.discord/smali/y.smali
index 7deadabe75..e42b85f77e 100644
--- a/com.discord/smali/y.smali
+++ b/com.discord/smali/y.smali
@@ -1,53 +1,90 @@
 .class public final Ly;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "WidgetGuildCallOnboardingSheet.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
+.implements Lrx/functions/Action0;
 
 
 # instance fields
-.field public final synthetic this$0:Lw;
+.field public final synthetic d:Lz;
 
 
 # direct methods
-.method public constructor <init>(Lw;)V
+.method public constructor <init>(Lz;)V
     .locals 0
 
-    iput-object p1, p0, Ly;->this$0:Lw;
+    iput-object p1, p0, Ly;->d:Lz;
 
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 2
+.method public final call()V
+    .locals 4
 
-    iget-object v0, p0, Ly;->this$0:Lw;
+    sget-object v0, Lx;->g:Lx$a;
 
-    new-instance v1, Lx;
+    iget-object v1, p0, Ly;->d:Lz;
 
-    invoke-direct {v1, p0}, Lx;-><init>(Ly;)V
+    iget-object v1, v1, Lz;->this$0:Lx;
 
-    invoke-virtual {v0, v1}, Lcom/discord/app/AppBottomSheet;->requestMicrophone(Lrx/functions/Action0;)V
+    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    move-result-object v1
 
-    return-object v0
+    const-string v2, "requireContext()"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
+
+    const-string v0, "context"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1}, Landroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    const-string v3, "CACHE_KEY_VOICE_CHANNEL_ONBOARDED"
+
+    invoke-interface {v0, v3, v1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+    iget-object v0, p0, Ly;->d:Lz;
+
+    iget-object v0, v0, Lz;->this$0:Lx;
+
+    iget-object v0, v0, Lx;->e:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;->onConnectPressed()V
+
+    return-void
+
+    :cond_0
+    const-string/jumbo v0, "viewModel"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_1
+    throw v2
 .end method
diff --git a/com.discord/smali/z.smali b/com.discord/smali/z.smali
index b6c2e633c3..28c1cedb81 100644
--- a/com.discord/smali/z.smali
+++ b/com.discord/smali/z.smali
@@ -1,76 +1,53 @@
 .class public final Lz;
-.super Ljava/lang/Object;
-.source "WidgetRemoteAuthViewModel.kt"
+.super Lk0/o/c/j;
+.source "WidgetGuildCallOnboardingSheet.kt"
 
 # interfaces
-.implements Ljava/lang/Runnable;
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
 
 
 # instance fields
-.field public final synthetic d:LWidgetRemoteAuthViewModel$a;
-
-.field public final synthetic e:Lcom/discord/models/domain/ModelRemoteAuthHandshake;
+.field public final synthetic this$0:Lx;
 
 
 # direct methods
-.method public constructor <init>(LWidgetRemoteAuthViewModel$a;Lcom/discord/models/domain/ModelRemoteAuthHandshake;)V
+.method public constructor <init>(Lx;)V
     .locals 0
 
-    iput-object p1, p0, Lz;->d:LWidgetRemoteAuthViewModel$a;
+    iput-object p1, p0, Lz;->this$0:Lx;
 
-    iput-object p2, p0, Lz;->e:Lcom/discord/models/domain/ModelRemoteAuthHandshake;
+    const/4 p1, 0x0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final run()V
-    .locals 5
+.method public invoke()Ljava/lang/Object;
+    .locals 2
 
-    iget-object v0, p0, Lz;->d:LWidgetRemoteAuthViewModel$a;
+    iget-object v0, p0, Lz;->this$0:Lx;
 
-    iget-object v0, v0, LWidgetRemoteAuthViewModel$a;->this$0:LWidgetRemoteAuthViewModel;
+    new-instance v1, Ly;
 
-    new-instance v1, LWidgetRemoteAuthViewModel$ViewState$b;
+    invoke-direct {v1, p0}, Ly;-><init>(Lz;)V
 
-    iget-object v2, p0, Lz;->e:Lcom/discord/models/domain/ModelRemoteAuthHandshake;
+    invoke-virtual {v0, v1}, Lcom/discord/app/AppBottomSheet;->requestMicrophone(Lrx/functions/Action0;)V
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelRemoteAuthHandshake;->getHandshakeToken()Ljava/lang/String;
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    move-result-object v2
-
-    iget-object v3, p0, Lz;->d:LWidgetRemoteAuthViewModel$a;
-
-    iget-object v3, v3, LWidgetRemoteAuthViewModel$a;->this$0:LWidgetRemoteAuthViewModel;
-
-    iget-object v3, v3, LWidgetRemoteAuthViewModel;->d:Lrx/subjects/BehaviorSubject;
-
-    const-string v4, "temporaryBehaviorSubject"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Lrx/subjects/BehaviorSubject;->j0()Ljava/lang/Object;
-
-    move-result-object v3
-
-    const-string v4, "temporaryBehaviorSubject.value"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v3, Ljava/lang/Boolean;
-
-    invoke-virtual {v3}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    invoke-direct {v1, v2, v3, v4}, LWidgetRemoteAuthViewModel$ViewState$b;-><init>(Ljava/lang/String;ZZ)V
-
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
-
-    return-void
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$Companion.smali
deleted file mode 100644
index 3ccb3474fa..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetChangeLog$Companion.smali
+++ /dev/null
@@ -1,119 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetChangeLog$Companion;
-.super Ljava/lang/Object;
-.source "WidgetChangeLog.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/WidgetChangeLog;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetChangeLog$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final launch(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    if-eqz p2, :cond_3
-
-    if-eqz p3, :cond_2
-
-    if-eqz p4, :cond_1
-
-    if-eqz p5, :cond_0
-
-    new-instance v0, Landroid/os/Bundle;
-
-    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
-
-    const-string v1, "INTENT_EXTRA_VERSION"
-
-    invoke-virtual {v0, v1, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-string p2, "INTENT_EXTRA_REVISION"
-
-    invoke-virtual {v0, p2, p3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-string p2, "INTENT_EXTRA_VIDEO"
-
-    invoke-virtual {v0, p2, p4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-string p2, "INTENT_EXTRA_BODY"
-
-    invoke-virtual {v0, p2, p5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-class p2, Lcom/discord/widgets/settings/WidgetChangeLog;
-
-    new-instance p3, Landroid/content/Intent;
-
-    invoke-direct {p3}, Landroid/content/Intent;-><init>()V
-
-    invoke-virtual {p3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
-
-    move-result-object p3
-
-    invoke-static {p1, p2, p3}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "video"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "revision"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "version"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2.smali
deleted file mode 100644
index 9d2df0bc35..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2;
-.super Lj0/n/c/g;
-.source "WidgetMuteSettingsSheet.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateViews"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateViews(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$2;->invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->access$updateViews(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$ViewState;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3.smali
deleted file mode 100644
index da10f4da77..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3;
-.super Lj0/n/c/g;
-.source "WidgetMuteSettingsSheet.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->bindSubscriptions(Lrx/subscriptions/CompositeSubscription;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V"
-
-    return-object v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet$bindSubscriptions$3;->invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;->access$handleEvent(Lcom/discord/widgets/settings/WidgetMuteSettingsSheet;Lcom/discord/widgets/settings/MuteSettingsSheetViewModel$Event;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$20.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$20.smali
deleted file mode 100644
index 0c2e24cbe9..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$20.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
-.super Ljava/lang/Object;
-.source "WidgetSettings.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$20;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 6
-
-    sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    const-string p1, "it.context"
-
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v2, "https://discord.com/acknowledgements"
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x4
-
-    const/4 v5, 0x0
-
-    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Lcom/discord/utilities/uri/UriHandler;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$21.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$21.smali
deleted file mode 100644
index e6b283b5d7..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$21.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
-.super Ljava/lang/Object;
-.source "WidgetSettings.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettings$onViewBound$21;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChangeLog()Lcom/discord/stores/StoreChangeLog;
-
-    move-result-object v0
-
-    const-string v1, "it"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    const-string v1, "it.context"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Lcom/discord/stores/StoreChangeLog;->openChangeLog(Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$22.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$22.smali
deleted file mode 100644
index 714c976a97..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$22.smali
+++ /dev/null
@@ -1,58 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettings$onViewBound$22;
-.super Landroidx/core/view/AccessibilityDelegateCompat;
-.source "WidgetSettings.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Landroidx/core/view/AccessibilityDelegateCompat;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
-
-    const/4 p1, 0x1
-
-    invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setHeading(Z)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali
deleted file mode 100644
index 88c04872d6..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
-.source "WidgetSettings.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettings;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/WidgetSettings$Model;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettings;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettings;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/settings/WidgetSettings$Model;)V"
-
-    return-object v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/WidgetSettings$Model;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettings$Model;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/WidgetSettings$Model;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/settings/WidgetSettings;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettings;Lcom/discord/widgets/settings/WidgetSettings$Model;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
deleted file mode 100644
index 453de93ff6..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
-.source "WidgetSettingsAppearance.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsAppearance;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettingsAppearance;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V"
-
-    return-object v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/settings/WidgetSettingsAppearance;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsAppearance;Lcom/discord/widgets/settings/WidgetSettingsAppearance$Model;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder.smali
deleted file mode 100644
index 81eef84176..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder.smali
+++ /dev/null
@@ -1,373 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;
-.super Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;
-.source "WidgetSettingsDeveloper.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "ExperimentViewHolder"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder<",
-        "Ljava/util/Map$Entry<",
-        "+",
-        "Ljava/lang/String;",
-        "+",
-        "Lcom/discord/stores/StoreExperiments$Experiment;",
-        ">;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-
-# instance fields
-.field public final nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final spinner$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 6
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;
-
-    const/4 v1, 0x2
-
-    new-array v1, v1, [Lkotlin/reflect/KProperty;
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "nameTv"
-
-    const-string v5, "getNameTv()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    const-string v3, "spinner"
-
-    const-string v4, "getSpinner()Landroid/widget/Spinner;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
-
-    sput-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/view/View;)V
-    .locals 3
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
-
-    const p1, 0x7f0a02c9
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a02c8
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->spinner$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    new-instance p1, Landroid/widget/ArrayAdapter;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Landroid/widget/Spinner;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const v1, 0x7f0d013c
-
-    invoke-static {}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->access$getBUCKET_LIST$cp()Ljava/util/List;
-
-    move-result-object v2
-
-    invoke-direct {p1, v0, v1, v2}, Landroid/widget/ArrayAdapter;-><init>(Landroid/content/Context;ILjava/util/List;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1}, Landroid/widget/Spinner;->setAdapter(Landroid/widget/SpinnerAdapter;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public static final synthetic access$getSpinner$p(Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;)Landroid/widget/Spinner;
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method private final getNameTv()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x0
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method private final getSpinner()Landroid/widget/Spinner;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->spinner$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x1
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/Spinner;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public bridge synthetic bind(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/util/Map$Entry;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->bind(Ljava/util/Map$Entry;)V
-
-    return-void
-.end method
-
-.method public bind(Ljava/util/Map$Entry;)V
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Map$Entry<",
-            "Ljava/lang/String;",
-            "Lcom/discord/stores/StoreExperiments$Experiment;",
-            ">;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/String;
-
-    invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getNameTv()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getNameTv()Landroid/widget/TextView;
-
-    move-result-object v3
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getRawExperiment()Lcom/discord/models/domain/ModelExperiment;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelExperiment;->getType()Ljava/lang/String;
-
-    move-result-object v2
-
-    goto :goto_0
-
-    :cond_0
-    move-object v2, v0
-
-    :goto_0
-    if-nez v2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
-
-    move-result v4
-
-    const v5, 0x36ebcb
-
-    if-eq v4, v5, :cond_3
-
-    const v5, 0x5e23bf3
-
-    if-eq v4, v5, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const-string v4, "guild"
-
-    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    const v2, 0x7f080270
-
-    const v4, 0x7f080270
-
-    goto :goto_2
-
-    :cond_3
-    const-string v4, "user"
-
-    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    const v2, 0x7f080389
-
-    const v4, 0x7f080389
-
-    goto :goto_2
-
-    :cond_4
-    :goto_1
-    const v2, 0x7f080318
-
-    const v4, 0x7f080318
-
-    :goto_2
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/16 v8, 0xe
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
-
-    move-result v3
-
-    invoke-static {v2, v3}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;->access$getBucketSelectionPosition(Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;I)I
-
-    move-result v2
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
-
-    move-result-object v3
-
-    invoke-virtual {v3, v0}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v2}, Landroid/widget/Spinner;->setSelection(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;->getSpinner()Landroid/widget/Spinner;
-
-    move-result-object v0
-
-    new-instance v3, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1;
-
-    invoke-direct {v3, p0, v2, v1, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder$bind$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;ILjava/lang/String;Lcom/discord/stores/StoreExperiments$Experiment;)V
-
-    invoke-virtual {v0, v3}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
-
-    return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
deleted file mode 100644
index 20ea852523..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
+++ /dev/null
@@ -1,447 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetSettingsDeveloper.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/settings/WidgetSettingsDeveloper$NoticeViewHolder;,
-        Lcom/discord/widgets/settings/WidgetSettingsDeveloper$ExperimentViewHolder;,
-        Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-.field public static final BUCKET_LIST:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final CLEAR_BUCKET_OVERRIDE:I = 0xa
-
-.field public static final Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
-
-.field public static final UNSET_BUCKET_OVERRIDE:I = 0x9
-
-
-# instance fields
-.field public final experimentsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final noticesRv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 6
-
-    const/4 v0, 0x2
-
-    new-array v0, v0, [Lkotlin/reflect/KProperty;
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "experimentsRv"
-
-    const-string v4, "getExperimentsRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "noticesRv"
-
-    const-string v5, "getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x1
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
-
-    new-instance v0, Lkotlin/ranges/IntRange;
-
-    const/16 v1, 0xa
-
-    invoke-direct {v0, v2, v1}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v3
-
-    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    move-object v3, v0
-
-    check-cast v3, Lj0/i/q;
-
-    invoke-virtual {v3}, Lj0/i/q;->nextInt()I
-
-    move-result v3
-
-    const/16 v4, 0x9
-
-    if-eq v3, v4, :cond_1
-
-    if-eq v3, v1, :cond_0
-
-    invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    goto :goto_1
-
-    :cond_0
-    const-string v3, "Reset"
-
-    goto :goto_1
-
-    :cond_1
-    const-string v3, "Unset"
-
-    :goto_1
-    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    sput-object v2, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->BUCKET_LIST:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    const v0, 0x7f0a02ca
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->experimentsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a02cb
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->noticesRv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-.end method
-
-.method public static final synthetic access$getBUCKET_LIST$cp()Ljava/util/List;
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->BUCKET_LIST:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method private final getExperimentsRv()Landroidx/recyclerview/widget/RecyclerView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->experimentsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x0
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
-
-    return-object v0
-.end method
-
-.method private final getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->noticesRv$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x1
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
-
-    return-object v0
-.end method
-
-.method public static final launch(Landroid/content/Context;)V
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->Companion:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;
-
-    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$Companion;->launch(Landroid/content/Context;)V
-
-    return-void
-.end method
-
-.method private final setupExperimentSection()V
-    .locals 13
-
-    new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$experimentsAdapter$1;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-direct {v0, v2, v1, v3, v2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getExperimentsRv()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreExperiments;->getNameToExperimentMap$app_productionDiscordExternalRelease()Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v3, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$1;
-
-    invoke-virtual {v1, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v1
-
-    const-string v3, "StoreStream\n        .get\u2026e, _) -> name }\n        }"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v3, 0x2
-
-    invoke-static {v1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v4
-
-    const-class v5, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
-
-    new-instance v10, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2;
-
-    invoke-direct {v10, v0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupExperimentSection$2;-><init>(Lcom/discord/utilities/views/SimpleRecyclerAdapter;)V
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v11, 0x1e
-
-    const/4 v12, 0x0
-
-    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-.method private final setupNoticesSection()V
-    .locals 13
-
-    new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-direct {v0, v2, v1, v3, v2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsDeveloper;)V
-
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$1;->invoke()Landroidx/recyclerview/widget/ItemTouchHelper;
-
-    move-result-object v1
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->getNoticesRv()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Landroidx/recyclerview/widget/ItemTouchHelper;->attachToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreNotices;->observeNoticesSeen()Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v3, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$2;
-
-    invoke-virtual {v1, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v1
-
-    const-string v3, "StoreStream\n        .get\u2026      .toList()\n        }"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object v1
-
-    const/4 v3, 0x2
-
-    invoke-static {v1, p0, v2, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v4
-
-    const-class v5, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;
-
-    new-instance v10, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3;
-
-    invoke-direct {v10, v0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper$setupNoticesSection$3;-><init>(Lcom/discord/utilities/views/SimpleRecyclerAdapter;)V
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v11, 0x1e
-
-    const/4 v12, 0x0
-
-    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d0263
-
-    return v0
-.end method
-
-.method public onViewBound(Landroid/view/View;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
-
-    const/4 p1, 0x1
-
-    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled(Z)Landroidx/appcompat/widget/Toolbar;
-
-    const p1, 0x7f120590
-
-    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
-
-    return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public onViewBoundOrOnResume()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupExperimentSection()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setupNoticesSection()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia.smali
deleted file mode 100644
index d28b2ffbb5..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsMedia.smali
+++ /dev/null
@@ -1,618 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsMedia;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetSettingsMedia.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-.field public static final Companion:Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
-
-
-# instance fields
-.field public final allowAnimatedEmojiCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final attachmentsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final embedsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final linksCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final syncCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public userSettings:Lcom/discord/stores/StoreUserSettings;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    const/4 v0, 0x5
-
-    new-array v0, v0, [Lkotlin/reflect/KProperty;
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsMedia;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "attachmentsCS"
-
-    const-string v4, "getAttachmentsCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsMedia;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "embedsCS"
-
-    const-string v4, "getEmbedsCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x1
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsMedia;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "linksCS"
-
-    const-string v4, "getLinksCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x2
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsMedia;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "syncCS"
-
-    const-string v4, "getSyncCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x3
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsMedia;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "allowAnimatedEmojiCS"
-
-    const-string v4, "getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x4
-
-    aput-object v1, v0, v2
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->Companion:Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    const v0, 0x7f0a08ea
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->attachmentsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08eb
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->embedsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08ec
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->linksCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08ed
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->syncCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08e9
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->allowAnimatedEmojiCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-.end method
-
-.method public static final synthetic access$getAllowAnimatedEmojiCS$p(Lcom/discord/widgets/settings/WidgetSettingsMedia;)Lcom/discord/views/CheckedSetting;
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getUserSettings$p(Lcom/discord/widgets/settings/WidgetSettingsMedia;)Lcom/discord/stores/StoreUserSettings;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "userSettings"
-
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final synthetic access$setUserSettings$p(Lcom/discord/widgets/settings/WidgetSettingsMedia;Lcom/discord/stores/StoreUserSettings;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    return-void
-.end method
-
-.method private final getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->allowAnimatedEmojiCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x4
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getAttachmentsCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->attachmentsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x0
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getEmbedsCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->embedsCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x1
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getLinksCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->linksCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x2
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getSyncCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->syncCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsMedia;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x3
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method public static final launch(Landroid/content/Context;)V
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->Companion:Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;
-
-    invoke-virtual {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$Companion;->launch(Landroid/content/Context;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d0272
-
-    return v0
-.end method
-
-.method public onActivityCreated(Landroid/os/Bundle;)V
-    .locals 2
-
-    invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
-
-    const p1, 0x7f121700
-
-    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
-
-    const p1, 0x7f1215ad
-
-    invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
-
-    const/4 p1, 0x0
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
-
-    return-void
-.end method
-
-.method public onViewBound(Landroid/view/View;)V
-    .locals 13
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
-
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAttachmentsCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    const-string v2, "userSettings"
-
-    if-eqz v1, :cond_4
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getShowAttachmentMediaInline()Z
-
-    move-result v1
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAttachmentsCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    const v1, 0x7f120c7c
-
-    invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v3, "getString(R.string.inline_attachment_media_help)"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v3, 0x1
-
-    new-array v4, v3, [Ljava/lang/Object;
-
-    const-string v5, "8"
-
-    const/4 v6, 0x0
-
-    aput-object v5, v4, v6
-
-    invoke-static {v4, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-static {v1, v3}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v3, "java.lang.String.format(format, *args)"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v3, 0x2
-
-    invoke-static {p1, v1, v6, v3}, Lcom/discord/views/CheckedSetting;->i(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;ZI)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAttachmentsCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getEmbedsCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    if-eqz v1, :cond_3
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getInlineEmbedMedia()Z
-
-    move-result v1
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getEmbedsCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$2;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getLinksCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getRenderEmbeds()Z
-
-    move-result v1
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getLinksCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getSyncCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getSyncTextAndImages()Z
-
-    move-result v1
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getSyncCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$4;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
-
-    invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsMedia;->userSettings:Lcom/discord/stores/StoreUserSettings;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreUserSettings;->getAllowAnimatedEmojisObservable()Lrx/Observable;
-
-    move-result-object p1
-
-    const-string v1, "userSettings\n        .al\u2026wAnimatedEmojisObservable"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1, p0, v0, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v4
-
-    const-class v5, Lcom/discord/widgets/settings/WidgetSettingsMedia;
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    new-instance v10, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5;
-
-    invoke-direct {v10, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$5;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
-
-    const/16 v11, 0x1e
-
-    const/4 v12, 0x0
-
-    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getAllowAnimatedEmojiCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/WidgetSettingsMedia$onViewBound$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsMedia;)V
-
-    invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    return-void
-
-    :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali
deleted file mode 100644
index c464a76a97..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
-.source "WidgetSettingsPrivacy.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V"
-
-    return-object v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    check-cast v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsPrivacy;Lcom/discord/widgets/settings/WidgetSettingsPrivacy$Model;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3.smali
deleted file mode 100644
index afa7f5a9ef..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3.smali
+++ /dev/null
@@ -1,86 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;->get(Lrx/Observable;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreExperiments$Experiment;->isEnabled(I)Z
-
-    move-result p1
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4.smali
deleted file mode 100644
index 867688966e..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4.smali
+++ /dev/null
@@ -1,215 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;
-.super Lj0/n/c/g;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function8;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;->get(Lrx/Observable;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/g;",
-        "Lkotlin/jvm/functions/Function8<",
-        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
-        "Ljava/lang/Integer;",
-        "Ljava/lang/Boolean;",
-        "Ljava/lang/Boolean;",
-        "Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;",
-        "Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;",
-        "Ljava/lang/Boolean;",
-        "Ljava/lang/Boolean;",
-        "Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/16 v0, 0x8
-
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;IZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZZ)V"
-
-    return-object v0
-.end method
-
-.method public final invoke(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;IZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZZ)Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
-    .locals 11
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p5, :cond_1
-
-    if-eqz p6, :cond_0
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
-
-    const/4 v10, 0x0
-
-    move-object v1, v0
-
-    move-object v2, p1
-
-    move v3, p2
-
-    move v4, p3
-
-    move v5, p4
-
-    move-object/from16 v6, p5
-
-    move-object/from16 v7, p6
-
-    move/from16 v8, p7
-
-    move/from16 v9, p8
-
-    invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;-><init>(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;IZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v0
-
-    :cond_0
-    const-string v1, "p6"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "p5"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "p1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 9
-
-    move-object v1, p1
-
-    check-cast v1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-object v0, p2
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v2
-
-    move-object v0, p3
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v3
-
-    move-object v0, p4
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v4
-
-    move-object v5, p5
-
-    check-cast v5, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
-    move-object v6, p6
-
-    check-cast v6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    move-object/from16 v0, p7
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v7
-
-    move-object/from16 v0, p8
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v8
-
-    move-object v0, p0
-
-    invoke-virtual/range {v0 .. v8}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;->invoke(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;IZZLcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;ZZ)Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali
deleted file mode 100644
index ce80ca6138..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$Model$Companion.smali
+++ /dev/null
@@ -1,209 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final get(Lrx/Observable;)Lrx/Observable;
-    .locals 11
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "Ljava/lang/Boolean;",
-            ">;)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;",
-            ">;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaEngine;->getIsNativeEngineInitialized()Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1;
-
-    invoke-static {p1, v1, v2}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfig()Lrx/Observable;
-
-    move-result-object v2
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
-
-    move-result-object v3
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getEnableVideoHardwareScaling()Lrx/Observable;
-
-    move-result-object v4
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreVideoSupport;->get()Lrx/Observable;
-
-    move-result-object v5
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaEngine;->getOpenSLESConfig()Lrx/Observable;
-
-    move-result-object v6
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$1;
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v7
-
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
-
-    move-result-object p1
-
-    const-string v1, "2020-04_noise_cancellation_android"
-
-    const/4 v8, 0x2
-
-    invoke-static {p1, v1, v0, v8, v0}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$2;
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
-
-    move-result-object v1
-
-    const-string v9, "2020-08_android_fix_audio_mode"
-
-    invoke-static {v1, v9, v0, v8, v0}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$3;
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v9
-
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion$get$4;
-
-    if-eqz v0, :cond_0
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0;
-
-    invoke-direct {v1, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0;-><init>(Lkotlin/jvm/functions/Function8;)V
-
-    move-object v0, v1
-
-    :cond_0
-    move-object v10, v0
-
-    check-cast v10, Lrx/functions/Func8;
-
-    move-object v8, p1
-
-    invoke-static/range {v2 .. v10}, Lrx/Observable;->d(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func8;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string v0, "Observable\n            .\u2026    ::Model\n            )"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
-
-    move-result-object p1
-
-    const-string v0, "Observable\n            .\u2026  .distinctUntilChanged()"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-
-    :cond_1
-    const-string p1, "requestListenForSensitivity"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2.smali
deleted file mode 100644
index fdac2c6239..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $button:Lcom/discord/views/CheckedSetting;
-
-.field public final synthetic this$0:Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;->$button:Lcom/discord/views/CheckedSetting;
-
-    iput-object p2, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Boolean;)V
-    .locals 1
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->access$getOpenSLESConfigRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/RadioManager;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;->$button:Lcom/discord/views/CheckedSetting;
-
-    invoke-virtual {p1, v0}, Lcom/discord/views/RadioManager;->a(Landroid/widget/Checkable;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->access$onOpenSLESConfigChanged(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    return-void
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;->call(Ljava/lang/Boolean;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali
deleted file mode 100644
index 275e23874b..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$5.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Boolean;)V
-    .locals 0
-
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleNoiseCancellation()V
-
-    return-void
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;->call(Ljava/lang/Boolean;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali
deleted file mode 100644
index b01f3ba2bd..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$6.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 0
-
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleNoiseSuppression()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$9.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$9.smali
deleted file mode 100644
index a0775e119e..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$9.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Boolean;)V
-    .locals 0
-
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleEnableVideoHardwareScaling()V
-
-    return-void
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;->call(Ljava/lang/Boolean;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali
deleted file mode 100644
index fcab0ccf42..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/settings/WidgetSettingsVoice;->onViewBoundOrOnResume()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
-
-    invoke-direct {v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onSelectionChanged(FFFLcom/miguelgaeta/super_bar/SuperBar;)V
-    .locals 0
-
-    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object p2
-
-    const/high16 p3, 0x42c80000    # 100.0f
-
-    sub-float/2addr p1, p3
-
-    invoke-virtual {p2, p1}, Lcom/discord/stores/StoreMediaSettings;->setSensitivity(F)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0.smali
deleted file mode 100644
index f843dd132c..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0;
-.super Ljava/lang/Object;
-.source "WidgetSettingsVoice.kt"
-
-# interfaces
-.implements Lrx/functions/Func8;
-
-
-# instance fields
-.field public final synthetic function:Lkotlin/jvm/functions/Function8;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function8;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0;->function:Lkotlin/jvm/functions/Function8;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 10
-
-    move-object v0, p0
-
-    iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$sam$rx_functions_Func8$0;->function:Lkotlin/jvm/functions/Function8;
-
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
-    move-object/from16 v9, p8
-
-    invoke-interface/range {v1 .. v9}, Lkotlin/jvm/functions/Function8;->invoke(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;
-
-    move-result-object v1
-
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice.smali
deleted file mode 100644
index 2590ab75ab..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettingsVoice.smali
+++ /dev/null
@@ -1,3035 +0,0 @@
-.class public final Lcom/discord/widgets/settings/WidgetSettingsVoice;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetSettingsVoice.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector;,
-        Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;,
-        Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-.field public static final ARG_TARGET_AUTO_TOGGLE:Ljava/lang/String; = "ARG_TARGET_AUTO_TOGGLE"
-
-.field public static final ARG_TARGET_RES_ID:Ljava/lang/String; = "ARG_TARGET_RES_ID"
-
-.field public static final Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
-
-.field public static final LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-.field public static final OVERLAY_PERMISSION_REQUEST_CODE:I = 0x9f8
-
-
-# instance fields
-.field public final audioModeCall$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final audioModeCommunication$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public audioModeRadioButtons:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/discord/views/CheckedSetting;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public audioModeRadioManager:Lcom/discord/views/RadioManager;
-
-.field public final audioModeSection$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final autoVADCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final echoCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final gainControlCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final hardwareScalingCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final inputModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final inputModelValue$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final noiseCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final noiseCancellationInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final noiseSuppressionCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public openSLESConfigRadioButtons:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/discord/views/CheckedSetting;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
-
-.field public final openSLESDefault$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final openSLESForceDisabled$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final openSLESForceEnabled$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final overlayCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final videoSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceOutputVolume$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceSensitivityAutomatic$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceSensitivityLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceSensitivityManual$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceSensitivityTestingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceSensitivityTestingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceSensitivityWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final voiceVideoGuide$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 6
-
-    const/16 v0, 0x19
-
-    new-array v0, v0, [Lkotlin/reflect/KProperty;
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "overlayCS"
-
-    const-string v4, "getOverlayCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "inputModelValue"
-
-    const-string v5, "getInputModelValue()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x1
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "inputModeContainer"
-
-    const-string v5, "getInputModeContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x2
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceVideoGuide"
-
-    const-string v5, "getVoiceVideoGuide()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x3
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "audioModeCommunication"
-
-    const-string v5, "getAudioModeCommunication()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x4
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "audioModeCall"
-
-    const-string v5, "getAudioModeCall()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x5
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "openSLESDefault"
-
-    const-string v5, "getOpenSLESDefault()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x6
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "openSLESForceEnabled"
-
-    const-string v5, "getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v3, 0x7
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "openSLESForceDisabled"
-
-    const-string v5, "getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x8
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "autoVADCS"
-
-    const-string v5, "getAutoVADCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x9
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "echoCancellationCS"
-
-    const-string v5, "getEchoCancellationCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0xa
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "noiseSuppressionCS"
-
-    const-string v5, "getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0xb
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "gainControlCS"
-
-    const-string v5, "getGainControlCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0xc
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "noiseCancellationCS"
-
-    const-string v5, "getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0xd
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "noiseCancellationInfo"
-
-    const-string v5, "getNoiseCancellationInfo()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0xe
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceOutputVolume"
-
-    const-string v5, "getVoiceOutputVolume()Landroid/widget/SeekBar;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0xf
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceSensitivityManual"
-
-    const-string v5, "getVoiceSensitivityManual()Lcom/miguelgaeta/super_bar/SuperBar;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x10
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceSensitivityAutomatic"
-
-    const-string v5, "getVoiceSensitivityAutomatic()Landroid/view/View;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x11
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceSensitivityWrap"
-
-    const-string v5, "getVoiceSensitivityWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x12
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceSensitivityLabel"
-
-    const-string v5, "getVoiceSensitivityLabel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x13
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceSensitivityTestingContainer"
-
-    const-string v5, "getVoiceSensitivityTestingContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x14
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "voiceSensitivityTestingButton"
-
-    const-string v5, "getVoiceSensitivityTestingButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x15
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "videoSettingsContainer"
-
-    const-string v5, "getVideoSettingsContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x16
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "hardwareScalingCS"
-
-    const-string v5, "getHardwareScalingCS()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x17
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v3, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    invoke-static {v3}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "audioModeSection"
-
-    const-string v5, "getAudioModeSection()Landroid/view/View;"
-
-    invoke-direct {v1, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/16 v3, 0x18
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
-
-    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    const/high16 v1, -0x40800000    # -1.0f
-
-    invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;-><init>(FZ)V
-
-    sput-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
-
-    const v0, 0x7f0a0905
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->overlayCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08fd
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModelValue$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08fb
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a090e
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceVideoGuide$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08f2
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeCommunication$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08f1
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeCall$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0900
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESDefault$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0902
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceEnabled$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0901
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceDisabled$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08f4
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->autoVADCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08f5
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->echoCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08ff
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseSuppressionCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08f7
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->gainControlCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08fe
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08fa
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0903
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceOutputVolume$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0909
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityManual$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0906
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityAutomatic$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a090c
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0908
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a090b
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a090a
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a090d
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->videoSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08f6
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->hardwareScalingCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a08f3
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeSection$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-.end method
-
-.method public static final synthetic access$configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice;Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-
-    return-void
-.end method
-
-.method public static final synthetic access$getAudioModeRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/RadioManager;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeRadioManager:Lcom/discord/views/RadioManager;
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "audioModeRadioManager"
-
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final synthetic access$getLOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED$cp()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    return-object v0
-.end method
-
-.method public static final synthetic access$getOpenSLESConfigRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/RadioManager;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "openSLESConfigRadioManager"
-
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final synthetic access$getOverlayCS$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lcom/discord/views/CheckedSetting;
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$getRequestListenForSensitivitySubject$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;)Lrx/subjects/BehaviorSubject;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
-
-    return-object p0
-.end method
-
-.method public static final synthetic access$onAudioModeChanged(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->onAudioModeChanged()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$onOpenSLESConfigChanged(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->onOpenSLESConfigChanged()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$onOverlayToggled(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->onOverlayToggled()V
-
-    return-void
-.end method
-
-.method public static final synthetic access$setAudioModeRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;Lcom/discord/views/RadioManager;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeRadioManager:Lcom/discord/views/RadioManager;
-
-    return-void
-.end method
-
-.method public static final synthetic access$setOpenSLESConfigRadioManager$p(Lcom/discord/widgets/settings/WidgetSettingsVoice;Lcom/discord/views/RadioManager;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
-
-    return-void
-.end method
-
-.method private final configureUI(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-    .locals 16
-
-    move-object/from16 v0, p0
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceOutputVolume()Landroid/widget/SeekBar;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/utilities/voice/PerceptualSoundUtils;->INSTANCE:Lcom/discord/utilities/voice/PerceptualSoundUtils;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputVolume()F
-
-    move-result v3
-
-    invoke-virtual {v2, v3}, Lcom/discord/utilities/voice/PerceptualSoundUtils;->amplitudeToPerceptual(F)F
-
-    move-result v2
-
-    invoke-static {v2}, Lf/n/a/k/a;->roundToInt(F)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/SeekBar;->setProgress(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getInputModeContainer()Landroid/view/View;
-
-    move-result-object v1
-
-    new-instance v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$1;
-
-    invoke-direct {v2, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getInputModelValue()Landroid/widget/TextView;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModePTT()Z
-
-    move-result v2
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_0
-
-    const v2, 0x7f120c80
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModeVAD()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    const v2, 0x7f120c83
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    sget-object v2, Lf/a/b/g;->a:Lf/a/b/g;
-
-    const-wide v4, 0x53d45cd227L
-
-    const/4 v6, 0x0
-
-    invoke-virtual {v2, v4, v5, v6}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v4, "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-voice-video&utm_content=--t%3Apm"
-
-    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    const v2, 0x7f1206fa
-
-    const/4 v4, 0x1
-
-    new-array v5, v4, [Ljava/lang/Object;
-
-    aput-object v1, v5, v3
-
-    invoke-virtual {v0, v2, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v8
-
-    const-string v1, "getString(R.string.form_\u2026shooting_guide, guideUrl)"
-
-    invoke-static {v8, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceVideoGuide()Landroid/widget/TextView;
-
-    move-result-object v1
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
-
-    move-result-object v7
-
-    const-string v2, "requireContext()"
-
-    invoke-static {v7, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/16 v12, 0x1c
-
-    const/4 v13, 0x0
-
-    invoke-static/range {v7 .. v13}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
-
-    move-result-object v5
-
-    invoke-virtual {v1, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeSection()Landroid/view/View;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getAudioModeFixEnabled()Z
-
-    move-result v5
-
-    xor-int/2addr v5, v4
-
-    if-eqz v5, :cond_2
-
-    const/4 v5, 0x0
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v5, 0x8
-
-    :goto_1
-    invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeRadioManager:Lcom/discord/views/RadioManager;
-
-    if-eqz v1, :cond_14
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getAudioMode()I
-
-    move-result v5
-
-    const/4 v7, 0x2
-
-    if-eq v5, v7, :cond_4
-
-    const/4 v8, 0x3
-
-    if-eq v5, v8, :cond_3
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCommunication()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v5
-
-    goto :goto_2
-
-    :cond_3
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCommunication()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v5
-
-    goto :goto_2
-
-    :cond_4
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCall()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v5
-
-    :goto_2
-    invoke-virtual {v1, v5}, Lcom/discord/views/RadioManager;->a(Landroid/widget/Checkable;)V
-
-    iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeRadioButtons:Ljava/util/List;
-
-    if-eqz v1, :cond_13
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_3
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_5
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lcom/discord/views/CheckedSetting;
-
-    new-instance v8, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1;
-
-    invoke-direct {v8, v5, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$1;-><init>(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    invoke-virtual {v5, v8}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    goto :goto_3
-
-    :cond_5
-    iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
-
-    if-eqz v1, :cond_12
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getOpenSLESConfig()Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Ljava/lang/Enum;->ordinal()I
-
-    move-result v5
-
-    if-eqz v5, :cond_8
-
-    if-eq v5, v4, :cond_7
-
-    if-ne v5, v7, :cond_6
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v5
-
-    goto :goto_4
-
-    :cond_6
-    new-instance v1, Lkotlin/NoWhenBranchMatchedException;
-
-    invoke-direct {v1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
-
-    throw v1
-
-    :cond_7
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v5
-
-    goto :goto_4
-
-    :cond_8
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v5
-
-    :goto_4
-    invoke-virtual {v1, v5}, Lcom/discord/views/RadioManager;->a(Landroid/widget/Checkable;)V
-
-    iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioButtons:Ljava/util/List;
-
-    if-eqz v1, :cond_11
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_5
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_9
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lcom/discord/views/CheckedSetting;
-
-    new-instance v8, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;
-
-    invoke-direct {v8, v5, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$$inlined$forEach$lambda$2;-><init>(Lcom/discord/views/CheckedSetting;Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    invoke-virtual {v5, v8}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    goto :goto_5
-
-    :cond_9
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getGainControlCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
-
-    move-result v5
-
-    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getGainControlCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    sget-object v5, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$4;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$4;
-
-    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    move-result-object v5
-
-    sget-object v8, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    if-ne v5, v8, :cond_a
-
-    const/4 v5, 0x1
-
-    goto :goto_6
-
-    :cond_a
-    const/4 v5, 0x0
-
-    :goto_6
-    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getNoiseCancellationExperimentEnabled()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_b
-
-    const/4 v5, 0x0
-
-    goto :goto_7
-
-    :cond_b
-    const/16 v5, 0x8
-
-    :goto_7
-    invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    sget-object v5, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$5;
-
-    invoke-virtual {v1, v5}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationInfo()Landroid/widget/TextView;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getNoiseCancellationExperimentEnabled()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_c
-
-    const/4 v5, 0x0
-
-    goto :goto_8
-
-    :cond_c
-    const/16 v5, 0x8
-
-    :goto_8
-    invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
-
-    const v1, 0x7f120e04
-
-    new-array v5, v4, [Ljava/lang/Object;
-
-    sget-object v8, Lf/a/b/g;->a:Lf/a/b/g;
-
-    const-wide v9, 0x53d41b4ab0L
-
-    invoke-virtual {v8, v9, v10, v6}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v8
-
-    aput-object v8, v5, v3
-
-    invoke-virtual {v0, v1, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v10
-
-    const-string v1, "getString(\n        R.str\u2026.NOISE_SUPPRESSION)\n    )"
-
-    invoke-static {v10, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationInfo()Landroid/widget/TextView;
-
-    move-result-object v1
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
-
-    move-result-object v9
-
-    invoke-static {v9, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/16 v14, 0x1c
-
-    const/4 v15, 0x0
-
-    invoke-static/range {v9 .. v15}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseCancellationInfo()Landroid/widget/TextView;
-
-    move-result-object v1
-
-    invoke-static {}, Landroid/text/method/LinkMovementMethod;->getInstance()Landroid/text/method/MovementMethod;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    move-result-object v2
-
-    sget-object v5, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Suppression:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    if-ne v2, v5, :cond_d
-
-    goto :goto_9
-
-    :cond_d
-    const/4 v4, 0x0
-
-    :goto_9
-    invoke-virtual {v1, v4}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    if-ne v1, v2, :cond_e
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    const v2, 0x7f121714
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->b(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v1, v2, v3, v7}, Lcom/discord/views/CheckedSetting;->i(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;ZI)V
-
-    goto :goto_a
-
-    :cond_e
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$6;
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->e(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-static {v1, v6, v3, v7}, Lcom/discord/views/CheckedSetting;->i(Lcom/discord/views/CheckedSetting;Ljava/lang/CharSequence;ZI)V
-
-    :goto_a
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getEchoCancellationCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getEchoCancellation()Z
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getEchoCancellationCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$7;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$7;
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAutoVADCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAutoVADCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModeVAD()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_f
-
-    const/4 v2, 0x0
-
-    goto :goto_b
-
-    :cond_f
-    const/16 v2, 0x8
-
-    :goto_b
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAutoVADCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$8;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$8;
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getHardwareScalingCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getHardwareScaling()Z
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getHardwareScalingCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$configureUI$9;
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->configureVoiceSensitivity(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVideoSettingsContainer()Landroid/view/View;
-
-    move-result-object v1
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->isVideoSupported()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_10
-
-    goto :goto_c
-
-    :cond_10
-    const/16 v3, 0x8
-
-    :goto_c
-    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
-
-    return-void
-
-    :cond_11
-    const-string v1, "openSLESConfigRadioButtons"
-
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_12
-    const-string v1, "openSLESConfigRadioManager"
-
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_13
-    const-string v1, "audioModeRadioButtons"
-
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_14
-    const-string v1, "audioModeRadioManager"
-
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v6
-.end method
-
-.method private final configureVoiceSensitivity(Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;)V
-    .locals 5
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityWrap()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getModeVAD()Z
-
-    move-result v1
-
-    const/16 v2, 0x8
-
-    const/4 v3, 0x0
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v1, 0x8
-
-    :goto_0
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityLabel()Landroid/widget/TextView;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    const/4 v1, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    const/16 v1, 0x8
-
-    :goto_1
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getLocalVoiceStatus()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/lit8 v0, v0, 0x1
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityTestingContainer()Landroid/view/ViewGroup;
-
-    move-result-object v1
-
-    if-eqz v0, :cond_2
-
-    const/4 v4, 0x0
-
-    goto :goto_2
-
-    :cond_2
-    const/16 v4, 0x8
-
-    :goto_2
-    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityTestingButton()Landroid/widget/Button;
-
-    move-result-object v1
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_3
-
-    const/4 v2, 0x0
-
-    :cond_3
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityTestingButton()Landroid/widget/Button;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticVad()Z
-
-    move-result v0
-
-    const/4 v1, 0x4
-
-    if-eqz v0, :cond_5
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityAutomatic()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Lcom/miguelgaeta/super_bar/SuperBar;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getLocalVoiceStatus()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    move-result-object p1
-
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->b:Z
-
-    if-eqz p1, :cond_4
-
-    const p1, 0x7f0801c8
-
-    goto :goto_3
-
-    :cond_4
-    const p1, 0x7f0801c7
-
-    :goto_3
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityAutomatic()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-static {v1, p1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Landroid/view/View;->setBackground(Landroid/graphics/drawable/Drawable;)V
-
-    goto :goto_4
-
-    :cond_5
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityAutomatic()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Lcom/miguelgaeta/super_bar/SuperBar;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Lcom/miguelgaeta/super_bar/SuperBar;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBar;->getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    move-result-object v0
-
-    const-string v1, "voiceSensitivityManual.config"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getLocalVoiceStatus()Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;
-
-    move-result-object v1
-
-    iget v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->a:F
-
-    const/high16 v2, 0x42c80000    # 100.0f
-
-    add-float/2addr v1, v2
-
-    invoke-virtual {v0, v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setOverlayBarValue(F)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Lcom/miguelgaeta/super_bar/SuperBar;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBar;->getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->getVoiceConfig()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getSensitivity()F
-
-    move-result p1
-
-    add-float/2addr p1, v2
-
-    invoke-virtual {v0, v1, p1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarValue(Ljava/lang/Integer;F)V
-
-    :goto_4
-    return-void
-.end method
-
-.method private final getAudioModeCall()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeCall$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x5
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getAudioModeCommunication()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeCommunication$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x4
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getAudioModeSection()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeSection$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x18
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/View;
-
-    return-object v0
-.end method
-
-.method private final getAutoVADCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->autoVADCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x9
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getEchoCancellationCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->echoCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0xa
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getGainControlCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->gainControlCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0xc
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getHardwareScalingCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->hardwareScalingCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x17
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getInputModeContainer()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x2
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/View;
-
-    return-object v0
-.end method
-
-.method private final getInputModelValue()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->inputModelValue$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x1
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method private final getNoiseCancellationCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0xd
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getNoiseCancellationInfo()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseCancellationInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0xe
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method private final getNoiseSuppressionCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->noiseSuppressionCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0xb
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESDefault$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x6
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceDisabled$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x8
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESForceEnabled$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x7
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getOverlayCS()Lcom/discord/views/CheckedSetting;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->overlayCS$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x0
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/views/CheckedSetting;
-
-    return-object v0
-.end method
-
-.method private final getVideoSettingsContainer()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->videoSettingsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x16
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/View;
-
-    return-object v0
-.end method
-
-.method private final getVoiceOutputVolume()Landroid/widget/SeekBar;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceOutputVolume$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0xf
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/SeekBar;
-
-    return-object v0
-.end method
-
-.method private final getVoiceSensitivityAutomatic()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityAutomatic$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x11
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/View;
-
-    return-object v0
-.end method
-
-.method private final getVoiceSensitivityLabel()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x13
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method private final getVoiceSensitivityManual()Lcom/miguelgaeta/super_bar/SuperBar;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityManual$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x10
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/miguelgaeta/super_bar/SuperBar;
-
-    return-object v0
-.end method
-
-.method private final getVoiceSensitivityTestingButton()Landroid/widget/Button;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x15
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/Button;
-
-    return-object v0
-.end method
-
-.method private final getVoiceSensitivityTestingContainer()Landroid/view/ViewGroup;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityTestingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x14
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/ViewGroup;
-
-    return-object v0
-.end method
-
-.method private final getVoiceSensitivityWrap()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceSensitivityWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x12
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/View;
-
-    return-object v0
-.end method
-
-.method private final getVoiceVideoGuide()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->voiceVideoGuide$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x3
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method public static final launch(Landroid/content/Context;Ljava/lang/Integer;Z)V
-    .locals 1
-    .param p1    # Ljava/lang/Integer;
-        .annotation build Landroidx/annotation/IdRes;
-        .end annotation
-    .end param
-
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
-
-    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;Z)V
-
-    return-void
-.end method
-
-.method private final onAudioModeChanged()V
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeRadioManager:Lcom/discord/views/RadioManager;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_3
-
-    iget-object v2, v0, Lcom/discord/views/RadioManager;->a:Ljava/util/List;
-
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->b()I
-
-    move-result v0
-
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/Checkable;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCommunication()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v2
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    const/4 v0, 0x3
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCall()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v2
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x2
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    :cond_1
-    :goto_0
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
-
-    move-result-object v0
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreMediaSettings;->updateAudioMode(I)V
-
-    :cond_2
-    return-void
-
-    :cond_3
-    const-string v0, "audioModeRadioManager"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method private final onOpenSLESConfigChanged()V
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_4
-
-    iget-object v2, v0, Lcom/discord/views/RadioManager;->a:Ljava/util/List;
-
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->b()I
-
-    move-result v0
-
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/Checkable;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v2
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->DEFAULT:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
-    goto :goto_0
-
-    :cond_0
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v2
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->FORCE_ENABLED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
-    goto :goto_0
-
-    :cond_1
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v2
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->FORCE_DISABLED:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
-    :cond_2
-    :goto_0
-    if-eqz v1, :cond_3
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StoreMediaEngine;->setOpenSLESConfig(Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;)V
-
-    :cond_3
-    const v0, 0x7f121740
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x4
-
-    invoke-static {p0, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
-
-    return-void
-
-    :cond_4
-    const-string v0, "openSLESConfigRadioManager"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method private final onOverlayToggled()V
-    .locals 12
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getMobileOverlay()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getRtcConnection()Lcom/discord/stores/StoreRtcConnection;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$1;
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceChannelSelected;->get()Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
-
-    invoke-virtual {v1, v2}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
-
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object v1
-
-    const-string v2, "filter { it != null }.map { it!! }"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$2;
-
-    invoke-static {v0, v1, v2}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string v1, "Observable\n          .co\u2026 -> rtcState to channel }"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-wide/16 v1, 0xc8
-
-    const/4 v3, 0x0
-
-    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout(Lrx/Observable;JZ)Lrx/Observable;
-
-    move-result-object v0
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x0
-
-    invoke-static {v0, p0, v2, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v3
-
-    const-class v4, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    new-instance v9, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3;
-
-    invoke-direct {v9, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onOverlayToggled$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    const/16 v10, 0x1e
-
-    const/4 v11, 0x0
-
-    invoke-static/range {v3 .. v11}, 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
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion;
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
-
-    move-result-object v1
-
-    const-string v2, "requireActivity()"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->requestOverlayClose(Landroid/content/Context;)V
-
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d027a
-
-    return v0
-.end method
-
-.method public onActivityResult(IILandroid/content/Intent;)V
-    .locals 1
-
-    const/16 v0, 0x9f8
-
-    if-ne p1, v0, :cond_0
-
-    sget-object p1, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    const-string p3, "requireContext()"
-
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->access$hasOverlayPermission(Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;Landroid/content/Context;)Z
-
-    move-result p1
-
-    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
-
-    move-result-object p2
-
-    invoke-virtual {p2, p1}, Lcom/discord/stores/StoreUserSettings;->setMobileOverlay(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object p2
-
-    invoke-virtual {p2, p1}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->onOverlayToggled()V
-
-    return-void
-
-    :cond_0
-    invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppFragment;->onActivityResult(IILandroid/content/Intent;)V
-
-    return-void
-.end method
-
-.method public onViewBound(Landroid/view/View;)V
-    .locals 7
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_6
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
-
-    const/4 v1, 0x2
-
-    new-array v2, v1, [Lcom/discord/views/CheckedSetting;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCommunication()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    aput-object v3, v2, v4
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getAudioModeCall()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    const/4 v5, 0x1
-
-    aput-object v3, v2, v5
-
-    invoke-static {v2}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeRadioButtons:Ljava/util/List;
-
-    new-instance v3, Lcom/discord/views/RadioManager;
-
-    if-eqz v2, :cond_5
-
-    invoke-direct {v3, v2}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
-
-    iput-object v3, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->audioModeRadioManager:Lcom/discord/views/RadioManager;
-
-    const/4 v2, 0x3
-
-    new-array v2, v2, [Lcom/discord/views/CheckedSetting;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESDefault()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    aput-object v3, v2, v4
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceEnabled()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    aput-object v3, v2, v5
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOpenSLESForceDisabled()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v3
-
-    aput-object v3, v2, v1
-
-    invoke-static {v2}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioButtons:Ljava/util/List;
-
-    new-instance v2, Lcom/discord/views/RadioManager;
-
-    if-eqz v1, :cond_4
-
-    invoke-direct {v2, v1}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
-
-    iput-object v2, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/stores/StoreUserSettings;->getMobileOverlay()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    sget-object v2, Lcom/discord/widgets/settings/WidgetSettingsVoice;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
-
-    move-result-object v3
-
-    const-string v6, "requireContext()"
-
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v2, v3}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;->access$hasOverlayPermission(Lcom/discord/widgets/settings/WidgetSettingsVoice$Companion;Landroid/content/Context;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    new-instance v2, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1;
-
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->setOnCheckedListener(Lrx/functions/Action1;)V
-
-    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v1
-
-    const-string v2, "ARG_TARGET_RES_ID"
-
-    invoke-virtual {v1, v2, v4}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v5, 0x0
-
-    :goto_1
-    if-nez v5, :cond_2
-
-    move-object v0, v1
-
-    :cond_2
-    if-eqz v0, :cond_3
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1;
-
-    invoke-direct {v1, v0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1;-><init>(Landroid/view/View;)V
-
-    const-wide/16 v2, 0x3e8
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/view/View;->postDelayed(Ljava/lang/Runnable;J)Z
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getOverlayCS()Lcom/discord/views/CheckedSetting;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/views/CheckedSetting;->isChecked()Z
-
-    move-result v1
-
-    if-nez v1, :cond_3
-
-    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v1
-
-    const-string v2, "ARG_TARGET_AUTO_TOGGLE"
-
-    invoke-virtual {v1, v2, v4}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;Landroid/view/View;)V
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->post(Ljava/lang/Runnable;)Z
-
-    :cond_3
-    return-void
-
-    :cond_4
-    const-string p1, "openSLESConfigRadioButtons"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "audioModeRadioButtons"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public onViewBoundOrOnResume()V
-    .locals 12
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceOutputVolume()Landroid/widget/SeekBar;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1;
-
-    invoke-direct {v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$1;-><init>()V
-
-    invoke-virtual {v0, v1}, Landroid/widget/SeekBar;->setOnSeekBarChangeListener(Landroid/widget/SeekBar$OnSeekBarChangeListener;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->getVoiceSensitivityManual()Lcom/miguelgaeta/super_bar/SuperBar;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBar;->getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;->INSTANCE:Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$2;
-
-    invoke-virtual {v0, v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setOnSelectedChanged(Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;)V
-
-    sget-object v0, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model;->Companion:Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->requestListenForSensitivitySubject:Lrx/subjects/BehaviorSubject;
-
-    const-string v2, "requestListenForSensitivitySubject"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice$Model$Companion;->get(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {v0, p0, v1, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v3
-
-    const-class v4, Lcom/discord/widgets/settings/WidgetSettingsVoice;
-
-    new-instance v9, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;
-
-    invoke-direct {v9, p0}, Lcom/discord/widgets/settings/WidgetSettingsVoice$onViewBoundOrOnResume$3;-><init>(Lcom/discord/widgets/settings/WidgetSettingsVoice;)V
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/16 v10, 0x1e
-
-    const/4 v11, 0x0
-
-    invoke-static/range {v3 .. v11}, 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_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Companion.smali
index 3f24bf3a14..51c3042009 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Companion.smali
@@ -36,11 +36,13 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "mode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
@@ -75,18 +77,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
index 992214946f..b8d1166d92 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
@@ -52,11 +52,11 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f120597
+    const v4, 0x7f120599
 
-    const v5, 0x7f120598
+    const v5, 0x7f12059a
 
-    const v6, 0x7f120596
+    const v6, 0x7f120598
 
     move-object v1, v7
 
@@ -74,11 +74,11 @@
 
     const/4 v10, 0x1
 
-    const v11, 0x7f120564
+    const v11, 0x7f120566
 
-    const v12, 0x7f120565
+    const v12, 0x7f120567
 
-    const v13, 0x7f120563
+    const v13, 0x7f120565
 
     move-object v8, v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali
index bd06f652db..6cc451f890 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetDisableDeleteAccountDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,61 +59,63 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1;->this$0:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1;->this$0:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    invoke-static {v1}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->access$getConfirmBtn$p(Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;)Lcom/discord/views/LoadingButton;
+    invoke-static {v0}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->access$getConfirmBtn$p(Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;)Lcom/discord/views/LoadingButton;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1, v2}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
+    invoke-virtual {v0, v1}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v3, "it.response"
+    const-string v2, "it.response"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
+    invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
-    move-result v1
+    move-result v0
 
-    const v4, 0xc362
+    const v3, 0xc362
 
-    if-eq v1, v4, :cond_1
+    if-eq v0, v3, :cond_1
 
-    const v4, 0xea68
+    const v3, 0xea68
 
-    if-eq v1, v4, :cond_0
+    if-eq v0, v3, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1;->this$0:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$1;->this$0:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
     move-result-object p1
 
+    const/4 v2, 0x0
+
     const/16 v3, 0xc
 
-    invoke-static {v1, p1, v2, v0, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     goto :goto_0
 
@@ -128,7 +130,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
@@ -149,7 +151,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
@@ -159,11 +161,4 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali
index 987acdc1a3..76e685c163 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onDisableClicked$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetDisableDeleteAccountDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali
index 180857b9cc..cf1396ba47 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetDisableDeleteAccountDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/models/domain/ModelUser;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/models/domain/ModelUser;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->access$configureUI(Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;Lcom/discord/models/domain/ModelUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali
index 344b25d977..3d445529d7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetDisableDeleteAccountDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$2;->this$0:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
@@ -71,14 +71,9 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali
index a83a55b130..0b2889a466 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetDisableDeleteAccountDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$onViewBound$3;->this$0:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
@@ -71,14 +71,9 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali
index f5555b47c9..108629a44f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.smali
@@ -42,121 +42,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
+    const-string v2, "headerTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "headerTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeaderTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "bodyTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBodyTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "bodyTv"
-
-    const-string v4, "getBodyTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
+    const-string v2, "cancelBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancelBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancelBtn"
-
-    const-string v4, "getCancelBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
+    const-string v2, "confirmBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmBtn"
-
-    const-string v4, "getConfirmBtn()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
+    const-string v2, "passwordWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "passwordWrap"
-
-    const-string v4, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;
+    const-string v2, "codeWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCodeWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "codeWrap"
-
-    const-string v4, "getCodeWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -180,7 +144,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a02f1
+    const v0, 0x7f0a02f7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -188,7 +152,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ed
+    const v0, 0x7f0a02f3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,7 +160,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ee
+    const v0, 0x7f0a02f4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -204,7 +168,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02f0
+    const v0, 0x7f0a02f6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -212,7 +176,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02f2
+    const v0, 0x7f0a02f8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -220,7 +184,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ef
+    const v0, 0x7f0a02f5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -605,9 +569,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -617,13 +581,13 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getArguments()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    const-string v0, "extra_mode"
+    const-string v1, "extra_mode"
 
-    invoke-virtual {v1, v0}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
 
     move-result v0
 
@@ -633,7 +597,12 @@
 
     aget-object v0, v1, v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     if-nez v0, :cond_1
 
     sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
@@ -744,11 +713,4 @@
     invoke-virtual {p1, v1}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion.smali
index 762ffc397c..f6dea095da 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;Z)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
 
@@ -67,13 +69,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali
index 169dba8161..b6071afa3d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableSMSBackupDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$1;->this$0:Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
 
@@ -85,7 +87,7 @@
 
     const-string v1, "it.response"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
@@ -94,13 +96,4 @@
     invoke-virtual {v0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali
index 4aedb9370c..2117f27bba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$enableSMSBackup$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableSMSBackupDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
index f7d703a68d..27b33972c4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
@@ -39,101 +39,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
+    const-string v2, "header"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "header"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeader()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "body"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBody()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "body"
-
-    const-string v4, "getBody()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
+    const-string v2, "passwordWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "passwordWrap"
-
-    const-string v4, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
+    const-string v2, "cancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancel()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancel"
-
-    const-string v4, "getCancel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;
+    const-string v2, "confirm"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirm()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirm"
-
-    const-string v4, "getConfirm()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -157,7 +127,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0342
+    const v0, 0x7f0a0348
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033f
+    const v0, 0x7f0a0345
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -173,7 +143,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0343
+    const v0, 0x7f0a0349
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -181,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0340
+    const v0, 0x7f0a0346
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0341
+    const v0, 0x7f0a0347
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -492,7 +462,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ef1
+    const v3, 0x7f120f17
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -508,7 +478,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120eed
+    const v3, 0x7f120f13
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -524,7 +494,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12061f
+    const v3, 0x7f120621
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -543,7 +513,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ef7
+    const v3, 0x7f120f1d
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -559,7 +529,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120eef
+    const v3, 0x7f120f15
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -575,7 +545,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120596
+    const v3, 0x7f120598
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Companion.smali
index cd256ab678..829ca34383 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Companion.smali
@@ -98,7 +98,9 @@
 .method public final launch(Landroid/content/Context;ZLcom/discord/widgets/settings/account/WidgetSettingsAccount$Redirect;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -125,16 +127,7 @@
     :cond_0
     const-class p2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.smali
index 818ef8653f..e71be5f5b0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.smali
@@ -29,7 +29,15 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/stores/StoreMFA$State;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;",
+        ">;"
     }
 .end annotation
 
@@ -79,11 +87,11 @@
 
     const-string v0, "meUser"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "pendingMFAState"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3}, Ljava/util/Map;->values()Ljava/util/Collection;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion.smali
index 910f224219..98c658dfca 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion.smali
@@ -82,7 +82,7 @@
 
     const-string v1, "Observable.combineLatest\u2026            )\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model.smali
index 713b2394e2..02eff6f2ae 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$Model.smali
@@ -50,11 +50,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreMFA$State;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "meUser"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "pendingMFAState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -65,20 +67,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;->ownsAnyGuilds:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "pendingMFAState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreMFA$State;ZILjava/lang/Object;)Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;
@@ -141,31 +129,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreMFA$State;Z)Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "meUser"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "pendingMFAState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/stores/StoreMFA$State;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "pendingMFAState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "meUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -183,7 +159,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -193,7 +169,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;->pendingMFAState:Lcom/discord/stores/StoreMFA$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.smali
index 5f8aa57498..ea147b9a7e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "v"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11.smali
index 64bf00ca8b..74eaf7b283 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$11.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "view"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "view.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12.smali
index a594ddc6e3..dfa30457be 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$12.smali
@@ -66,7 +66,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode;->DISABLE:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13.smali
index c4fedca196..94e8497200 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$13.smali
@@ -66,7 +66,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode;->DELETE:Lcom/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$14.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$14.smali
index 4891f9b0b7..089838e04f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$14.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$14.smali
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion;->show(Landroidx/fragment/app/FragmentManager;Z)V
 
@@ -106,7 +106,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v3}, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion;->show(Landroidx/fragment/app/FragmentManager;Z)V
 
@@ -119,7 +119,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.smali
index 4f26cbac3f..fc2c74619c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "accountChangePassword.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
index 208e08fc31..b2720f56ee 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
@@ -73,7 +73,7 @@
 
     const-string v0, "dataUrl"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -81,7 +81,7 @@
 
     const-string v2, "data:image/gif"
 
-    invoke-static {p1, v2, v0, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, v2, v0, v1}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v0
 
@@ -97,13 +97,13 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x4
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const v0, 0x7f121283
+    const v0, 0x7f1212ae
 
     invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
index 1921466dd6..efbe1057ce 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
@@ -41,9 +41,9 @@
 
     iget-object v0, v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const v1, 0x7f12042a
+    const v1, 0x7f12042b
 
-    const v2, 0x7f12164e    # 1.941831E38f
+    const v2, 0x7f121678
 
     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_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6.smali
index 8741605fc1..f9a9f905a7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7$1.smali
index 5853ce473e..735ad32bf6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->access$configureUpdatedUser(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/models/domain/ModelUser;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7.smali
index c47fd2506e..2bfde1faf4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7.smali
@@ -187,7 +187,7 @@
 
     const-wide/16 v5, 0x0
 
-    invoke-static {v2, v5, v6, v4}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v2, v5, v6, v4}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -201,7 +201,7 @@
 
     iget-object v3, v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$7;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    invoke-static {v2, v3}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v2, v3}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8.smali
index 891a9db023..14916f13b4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.smali
index ced9c570c6..683e11e33a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
index f18613ffd1..935859bf40 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccount$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccount.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->access$configureUI(Lcom/discord/widgets/settings/account/WidgetSettingsAccount;Lcom/discord/widgets/settings/account/WidgetSettingsAccount$Model;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
index 14216f3883..0ab1ef6482 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccount.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Token;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121732
+    const v2, 0x7f12175c
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -89,7 +89,7 @@
 
     const/16 v4, 0xc
 
-    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v1, v2, v3, v4}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -99,7 +99,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Token;->getToken()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali
index 5c531d36d9..4df1219091 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccount.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,11 +64,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "code"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
@@ -76,16 +78,18 @@
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/restapi/RestAPIParams$AuthCode;
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$AuthCode;
 
-    invoke-direct {v1, p2}, Lcom/discord/restapi/RestAPIParams$AuthCode;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, p2}, Lcom/discord/restapi/RestAPIParams$AuthCode;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/rest/RestAPI;->disableMFA(Lcom/discord/restapi/RestAPIParams$AuthCode;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/rest/RestAPI;->disableMFA(Lcom/discord/restapi/RestAPIParams$AuthCode;)Lrx/Observable;
 
     move-result-object p1
 
     iget-object p2, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-static {p1, p2, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -100,7 +104,7 @@
 
     const-wide/16 v2, 0x0
 
-    invoke-static {p2, v2, v3, v1}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {p2, v2, v3, v1}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -110,7 +114,7 @@
 
     const-string p2, "RestAPI.api\n            \u2026rmers.withDimmer(dimmer))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x0
 
@@ -128,16 +132,16 @@
 
     const-class v3, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
+    new-instance v8, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1;)V
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1;)V
-
     const/16 v9, 0x1c
 
     const/4 v10, 0x0
@@ -145,18 +149,4 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "code"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
index f2099be637..93f642c73b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
@@ -107,541 +107,379 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountScrollView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountScrollView()Landroidx/core/widget/NestedScrollView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "accountScrollView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getAccountScrollView()Landroidx/core/widget/NestedScrollView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const/4 v2, 0x0
+    const-string v2, "accountSave"
 
-    aput-object v1, v0, v2
+    const-string v3, "getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "accountSave"
-
-    const-string v4, "getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountChangePassword"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountChangePassword()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountChangePassword"
-
-    const-string v4, "getAccountChangePassword()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountTag"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountTag()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountTag"
-
-    const-string v4, "getAccountTag()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountEmail"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountEmail()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountEmail"
-
-    const-string v4, "getAccountEmail()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountEdit"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountEdit()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountEdit"
-
-    const-string v4, "getAccountEdit()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountAvatar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountAvatar()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountAvatar"
-
-    const-string v4, "getAccountAvatar()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountVerification"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountVerification()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountVerification"
-
-    const-string v4, "getAccountVerification()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountVerificationResend"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountVerificationResend()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountVerificationResend"
-
-    const-string v4, "getAccountVerificationResend()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountAvatarContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountAvatarContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountAvatarContainer"
-
-    const-string v4, "getAccountAvatarContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "removeAvatar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRemoveAvatar()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "removeAvatar"
-
-    const-string v4, "getRemoveAvatar()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountMFAHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountMFAHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountMFAHeader"
-
-    const-string v4, "getAccountMFAHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountBackupCodes"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountBackupCodes()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountBackupCodes"
-
-    const-string v4, "getAccountBackupCodes()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountRemove2fa"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountRemove2fa()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountRemove2fa"
-
-    const-string v4, "getAccountRemove2fa()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountSMSBackup"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountSMSBackup()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountSMSBackup"
-
-    const-string v4, "getAccountSMSBackup()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountSMSPhone"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountSMSPhone()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountSMSPhone"
-
-    const-string v4, "getAccountSMSPhone()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountMFAFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountMFAFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountMFAFlipper"
-
-    const-string v4, "getAccountMFAFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountMFALottie"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountMFALottie()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountMFALottie"
-
-    const-string v4, "getAccountMFALottie()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountMFASalesPitch"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountMFASalesPitch()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountMFASalesPitch"
-
-    const-string v4, "getAccountMFASalesPitch()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountMFAEnable"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountMFAEnable()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountMFAEnable"
-
-    const-string v4, "getAccountMFAEnable()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountMFAEnabledContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountMFAEnabledContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountMFAEnabledContainer"
-
-    const-string v4, "getAccountMFAEnabledContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountMFADisabledContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountMFADisabledContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountMFADisabledContainer"
-
-    const-string v4, "getAccountMFADisabledContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "blockedUsers"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBlockedUsers()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "blockedUsers"
-
-    const-string v4, "getBlockedUsers()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountDataWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountDataWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountDataWrap"
-
-    const-string v4, "getAccountDataWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountDataDisable"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountDataDisable()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountDataDisable"
-
-    const-string v4, "getAccountDataDisable()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x18
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "accountDataDelete"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountDataDelete()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountDataDelete"
-
-    const-string v4, "getAccountDataDelete()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x19
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1a
 
@@ -665,7 +503,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a086d
+    const v0, 0x7f0a0873
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -673,7 +511,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountScrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a086c
+    const v0, 0x7f0a0872
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -681,7 +519,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a085c
+    const v0, 0x7f0a0862
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -689,7 +527,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountChangePassword$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0870
+    const v0, 0x7f0a0876
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -697,7 +535,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountTag$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a085e
+    const v0, 0x7f0a0864
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -705,7 +543,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountEmail$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a085d
+    const v0, 0x7f0a0863
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -713,7 +551,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountEdit$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0858
+    const v0, 0x7f0a085e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -721,7 +559,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0871
+    const v1, 0x7f0a0877
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -729,7 +567,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountVerification$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0872
+    const v1, 0x7f0a0878
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -737,7 +575,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountVerificationResend$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0859
+    const v1, 0x7f0a085f
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -745,7 +583,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a086a
+    const v1, 0x7f0a0870
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -753,7 +591,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->removeAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0863
+    const v1, 0x7f0a0869
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -761,7 +599,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0873
+    const v1, 0x7f0a0879
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -769,7 +607,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountBackupCodes$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a086b
+    const v1, 0x7f0a0871
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -777,7 +615,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountRemove2fa$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a086e
+    const v1, 0x7f0a0874
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -785,7 +623,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountSMSBackup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a086f
+    const v1, 0x7f0a0875
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -793,7 +631,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountSMSPhone$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0864
+    const v1, 0x7f0a086a
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -801,7 +639,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0865
+    const v1, 0x7f0a086b
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -809,7 +647,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFALottie$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0866
+    const v1, 0x7f0a086c
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -817,7 +655,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFASalesPitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0861
+    const v1, 0x7f0a0867
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -825,7 +663,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAEnable$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0862
+    const v1, 0x7f0a0868
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -833,7 +671,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFAEnabledContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0860
+    const v1, 0x7f0a0866
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -841,7 +679,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountMFADisabledContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a088e
+    const v1, 0x7f0a0894
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -849,7 +687,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->blockedUsers$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0869
+    const v1, 0x7f0a086f
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -857,7 +695,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountDataWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0868
+    const v1, 0x7f0a086e
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -865,7 +703,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountDataDisable$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0867
+    const v1, 0x7f0a086d
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -873,7 +711,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountDataDelete$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a02ea
+    const v1, 0x7f0a02f0
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1633,7 +1471,7 @@
     :goto_d
     if-nez v2, :cond_10
 
-    const v2, 0x7f120eec
+    const v2, 0x7f120f12
 
     new-array v5, v4, [Ljava/lang/Object;
 
@@ -1666,7 +1504,7 @@
 
     if-eqz p1, :cond_11
 
-    const p1, 0x7f120ef0
+    const p1, 0x7f120f16
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1675,7 +1513,7 @@
     goto :goto_e
 
     :cond_11
-    const p1, 0x7f120eed
+    const p1, 0x7f120f13
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1712,7 +1550,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0, v4}, Lcom/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$Companion;->show(Landroidx/fragment/app/FragmentManager;Z)V
 
@@ -1723,13 +1561,13 @@
 .method private final configureUpdatedUser(Lcom/discord/models/domain/ModelUser;)V
     .locals 4
 
-    const v0, 0x7f1213a3
+    const v0, 0x7f1213cd
 
     const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p0, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
@@ -2407,7 +2245,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->lastIconUrl:Ljava/lang/String;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2448,7 +2286,7 @@
 
     const-string v3, "asset://asset/images/default_avatar"
 
-    invoke-static {p1, v3, v1, v2}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p1, v3, v1, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p1
 
@@ -2485,23 +2323,23 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f120567
+    const v1, 0x7f120569
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f120568
+    const v1, 0x7f12056a
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f12107e
+    const v1, 0x7f1210a8
 
     const/4 v2, 0x0
 
@@ -2517,7 +2355,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->show(Landroidx/fragment/app/FragmentManager;)V
 
@@ -2539,7 +2377,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12163c
+    const v3, 0x7f121666
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2547,13 +2385,13 @@
 
     const-string v3, "requireContext().getString(R.string.two_fa_remove)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v3
 
-    const v4, 0x7f12172f
+    const v4, 0x7f121759
 
     invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2561,13 +2399,13 @@
 
     const-string v4, "requireContext().getStri\u2026ngs_mfa_enable_code_body)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v4
 
-    const v5, 0x7f121614
+    const v5, 0x7f12163e
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2575,7 +2413,7 @@
 
     const-string v5, "requireContext().getStri\u2026.string.two_fa_auth_code)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1;
 
@@ -2608,11 +2446,13 @@
 .method public onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageChosen(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -2622,7 +2462,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarSelectedResult:Lrx/functions/Action1;
 
@@ -2637,30 +2477,18 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/images/MGImages;->prepareImageUpload(Landroid/net/Uri;Ljava/lang/String;Landroidx/fragment/app/FragmentManager;Lcom/miguelgaeta/media_picker/MediaPicker$Provider;Lrx/functions/Action1;Lcom/discord/dialogs/ImageUploadDialog$PreviewType;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mimeType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onImageCropped(Landroid/net/Uri;Ljava/lang/String;)V
 
@@ -2673,66 +2501,54 @@
     invoke-static {v0, p1, p2, v1}, Lcom/discord/utilities/images/MGImages;->requestDataUrl(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Lrx/functions/Action1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mimeType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121735
+    const p1, 0x7f12175f
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
 
-    invoke-virtual {v0, p0}, Lcom/discord/utilities/stateful/StatefulViews;->setupUnsavedChangesConfirmation(Lcom/discord/app/AppFragment;)V
+    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    invoke-virtual {v1, p0}, Lcom/discord/utilities/stateful/StatefulViews;->setupUnsavedChangesConfirmation(Lcom/discord/app/AppFragment;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     move-result-object v2
 
-    new-array v1, v1, [Landroid/view/View;
+    new-array v0, v0, [Landroid/view/View;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getAccountEmail()Landroid/widget/TextView;
 
     move-result-object v3
 
-    aput-object v3, v1, p1
+    aput-object v3, v0, p1
 
-    invoke-virtual {v0, p0, v2, v1}, Lcom/discord/utilities/stateful/StatefulViews;->setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
+    invoke-virtual {v1, p0, v2, v0}, Lcom/discord/utilities/stateful/StatefulViews;->setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -2760,13 +2576,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2786,7 +2595,7 @@
 
     const-string v1, "Model.get()\n        .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali
index daa95d2236..fcae36ae42 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder;
+    const-string v2, "text"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "text"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getText()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -65,17 +59,19 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0552
+    const p1, 0x7f0a0558
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -84,15 +80,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeHeaderViewHolder;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getText()Landroid/widget/TextView;
@@ -118,9 +105,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -137,15 +126,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
index 4531298328..e1d61834c7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -80,7 +80,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1204d2
+    const v0, 0x7f1204d4
 
     const/4 v1, 0x0
 
@@ -88,7 +88,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
index 9a12bb4f95..246c417f79 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;
+    const-string v2, "text"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "text"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getText()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -65,17 +59,19 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0532
+    const p1, 0x7f0a0538
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -84,15 +80,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;->text$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getText()Landroid/widget/TextView;
@@ -118,11 +105,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 10
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -132,75 +119,75 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;->getText()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;->getText()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v1}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
+
+    const/4 v2, 0x2
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;->getBackupCode()Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;->getCode()Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "null cannot be cast to non-null type java.lang.String"
+
+    if-eqz v3, :cond_2
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x4
+
+    invoke-virtual {v3, v5, v6}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v7, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    aput-object v3, v2, v5
+
+    const/4 v3, 0x1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;->getBackupCode()Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
+
+    move-result-object v7
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;->getCode()Ljava/lang/String;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_1
+
+    invoke-virtual {v7, v6}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v6, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    aput-object v4, v2, v3
 
     const v3, 0x7f120280
 
-    const/4 v4, 0x2
+    invoke-virtual {v1, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    new-array v4, v4, [Ljava/lang/Object;
+    move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;->getBackupCode()Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;->getCode()Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v6, "null cannot be cast to non-null type java.lang.String"
-
-    if-eqz v5, :cond_2
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x4
-
-    invoke-virtual {v5, v7, v8}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v9, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v5, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    aput-object v5, v4, v7
-
-    const/4 v5, 0x1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;->getBackupCode()Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
-
-    move-result-object v9
-
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelBackupCodes$BackupCode;->getCode()Ljava/lang/String;
-
-    move-result-object v9
-
-    if-eqz v9, :cond_1
-
-    invoke-virtual {v9, v8}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v6
-
-    const-string v8, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {v6, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    aput-object v6, v4, v5
-
-    invoke-virtual {v2, v3, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;->getBackupCode()Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
 
@@ -216,15 +203,17 @@
 
     move-result-object p1
 
-    const p2, 0x7f080272
+    const p2, 0x7f080273
 
-    invoke-virtual {p1, v7, v7, p2, v7}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
+    invoke-virtual {p1, v5, v5, p2, v5}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;->getText()Landroid/widget/TextView;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    const/4 p2, 0x0
+
+    invoke-virtual {p1, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     goto :goto_0
 
@@ -233,7 +222,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v7, v7, v7, v7}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
+    invoke-virtual {p1, v5, v5, v5, v5}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder;->getText()Landroid/widget/TextView;
 
@@ -249,25 +238,18 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v6}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v4}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v6}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v4}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali
index 1c26846e59..0286f61d25 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter.smali
@@ -31,22 +31,15 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -62,7 +55,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -75,7 +68,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_1
 
@@ -109,13 +104,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem.smali
index c1b5e20f27..dc05644c6d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelBackupCodes$BackupCode;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "backupCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;->backupCode:Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
 
     return-void
-
-    :cond_0
-    const-string p1, "backupCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;Lcom/discord/models/domain/ModelBackupCodes$BackupCode;ILjava/lang/Object;)Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;
@@ -73,22 +66,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelBackupCodes$BackupCode;)Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "backupCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;-><init>(Lcom/discord/models/domain/ModelBackupCodes$BackupCode;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "backupCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -106,7 +92,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItem;->backupCode:Lcom/discord/models/domain/ModelBackupCodes$BackupCode;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader.smali
index 6024fb6086..bb5c348eaf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "headerText"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;->headerText:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "headerText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;
@@ -73,22 +66,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "headerText"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "headerText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -106,7 +92,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;->headerText:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Companion.smali
index bd49bd14b4..bca8922a02 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Companion.smali
@@ -36,7 +36,9 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
 
@@ -44,16 +46,7 @@
 
     invoke-direct {v1}, Landroid/content/Intent;-><init>()V
 
-    invoke-static {p1, v0, v1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, v1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
index 1dcbe3e6d3..5a7aaf7b54 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountBackupCodes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelBackupCodes;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -163,7 +163,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f12170c
+    const v5, 0x7f121736
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -171,7 +171,7 @@
 
     const-string v5, "requireContext().getStri\u2026settings_available_codes)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, v4}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;-><init>(Ljava/lang/String;)V
 
@@ -230,7 +230,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f12174b
+    const v4, 0x7f121775
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -238,7 +238,7 @@
 
     const-string v4, "requireContext().getStri\u2026ttings_used_backup_codes)"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$BackupCodeItemHeader;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali
index a36d9f46bd..7847a23590 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountBackupCodes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -64,11 +64,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "newPassword"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
 
@@ -82,23 +84,11 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
 
-    const/4 p2, 0x1
+    const/4 p2, 0x0
 
-    invoke-static {p1, v0, p2, v0}, Lcom/discord/app/AppFragment;->hideKeyboard$default(Lcom/discord/app/AppFragment;Landroid/view/View;ILjava/lang/Object;)V
+    const/4 v0, 0x1
+
+    invoke-static {p1, p2, v0, p2}, Lcom/discord/app/AppFragment;->hideKeyboard$default(Lcom/discord/app/AppFragment;Landroid/view/View;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newPassword"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali
index f599a54e04..43c1db0c64 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountBackupCodes.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
index fdbb932bf9..9cc30abf5c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
@@ -42,81 +42,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
+    const-string v2, "infoTV"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInfoTV()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "infoTV"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getInfoTV()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
 
-    const/4 v2, 0x0
+    const-string v2, "backupCodesRV"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBackupCodesRV()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "backupCodesRV"
-
-    const-string v4, "getBackupCodesRV()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
+    const-string v2, "generateCodes"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGenerateCodes()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "generateCodes"
-
-    const-string v4, "getGenerateCodes()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -140,7 +116,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0885
+    const v0, 0x7f0a088b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -148,7 +124,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->infoTV$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0886
+    const v0, 0x7f0a088c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -156,7 +132,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->backupCodesRV$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0884
+    const v0, 0x7f0a088a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -164,7 +140,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->generateCodes$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -242,7 +218,7 @@
     :cond_0
     const-string p1, "backupCodesAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -280,11 +256,11 @@
 
     move-result-object v1
 
-    new-instance v2, Lf/a/b/m0;
+    new-instance v2, Lf/a/b/o0;
 
     const-wide/16 v3, 0x64
 
-    invoke-direct {v2, v1, v3, v4}, Lf/a/b/m0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
+    invoke-direct {v2, v1, v3, v4}, Lf/a/b/o0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
 
     invoke-virtual {p1, v2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -292,7 +268,7 @@
 
     const-string v1, "RestAPI\n        .api\n   \u2026mer(dimmer, delay = 100))"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -302,7 +278,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -316,7 +292,7 @@
 
     invoke-direct {v3, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$2;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;)V
 
-    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v0, v1, v2, v3}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -428,7 +404,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f121718
+    const v3, 0x7f121742
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -436,13 +412,13 @@
 
     const-string v2, "requireContext().getStri\u2026nter_password_view_codes)"
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
-    const v4, 0x7f120767
+    const v4, 0x7f120769
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -450,13 +426,13 @@
 
     const-string v2, "requireContext().getStri\u2026ring.form_label_password)"
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
-    const v5, 0x7f12161a
+    const v5, 0x7f121644
 
     invoke-virtual {v2, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -464,7 +440,7 @@
 
     const-string v5, "requireContext().getStri\u2026wo_fa_backup_codes_label)"
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v5, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1;
 
@@ -497,11 +473,11 @@
 
     invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12161a
+    const p1, 0x7f121644
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -519,7 +495,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -527,13 +505,13 @@
 
     move-result-object p1
 
-    const p2, 0x7f121619
+    const/4 p2, 0x0
 
-    const/4 v0, 0x0
+    new-array p2, p2, [Ljava/lang/Object;
 
-    new-array v0, v0, [Ljava/lang/Object;
+    const v0, 0x7f121643
 
-    invoke-virtual {p1, p2, v0}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
+    invoke-virtual {p1, v0, p2}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
     new-instance p1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter;
 
@@ -583,13 +561,4 @@
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->showPasswordModal()V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$Companion.smali
index 8fe8dec756..d3ebf2fc82 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
+    const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali
index 2b4028d907..722c08c93a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountChangePassword.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
@@ -71,14 +71,9 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali
index c1acca4cdd..a2a819edf4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountChangePassword.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
@@ -71,14 +71,9 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali
index 9741efb7e9..ab17515cbb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountChangePassword.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
@@ -71,14 +71,9 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali
index 04de462c7c..bcad6c1a91 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountChangePassword.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->access$configureUI(Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;Lcom/discord/models/domain/ModelUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
index 15fede6cab..94eb5b7b5a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
@@ -51,13 +51,13 @@
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
-    const v1, 0x7f1213a3
+    const v1, 0x7f1213cd
 
     const/4 v2, 0x0
 
     const/4 v3, 0x4
 
-    invoke-static {v0, v1, v2, v3}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {v0, v1, v2, v3}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -67,7 +67,7 @@
 
     const-string v1, "updatedUser"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getToken()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
index fcce234add..661d76f7b6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
@@ -39,101 +39,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
+    const-string v2, "currentPassword"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCurrentPassword()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "currentPassword"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCurrentPassword()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
-    const/4 v2, 0x0
+    const-string v2, "newPassword"
 
-    aput-object v1, v0, v2
+    const-string v3, "getNewPassword()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "newPassword"
-
-    const-string v4, "getNewPassword()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
+    const-string v2, "twoFA"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTwoFA()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "twoFA"
-
-    const-string v4, "getTwoFA()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
+    const-string v2, "dimmerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmerView()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmerView"
-
-    const-string v4, "getDimmerView()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
+    const-string v2, "saveButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSaveButton()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "saveButton"
-
-    const-string v4, "getSaveButton()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -157,7 +127,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0150
+    const v0, 0x7f0a0153
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->currentPassword$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0151
+    const v0, 0x7f0a0154
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -173,7 +143,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->newPassword$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0153
+    const v1, 0x7f0a0156
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -181,7 +151,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->twoFA$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a02ea
+    const v1, 0x7f0a02f0
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +159,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->dimmerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0152
+    const v1, 0x7f0a0155
 
     invoke-static {p0, v1}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -477,7 +447,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f1210da
+    const v3, 0x7f121105
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -514,7 +484,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f1210d4
+    const v3, 0x7f1210ff
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -571,7 +541,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f121640
+    const v3, 0x7f12166a
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -652,7 +622,7 @@
 
     const-wide/16 v4, 0x0
 
-    invoke-static {v3, v4, v5, v2}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v3, v4, v5, v2}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -664,7 +634,7 @@
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;)V
 
-    invoke-static {v2, v0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v2, v0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -686,45 +656,47 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1203e6
+    const p1, 0x7f1203e7
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-virtual {v0, p0}, Lcom/discord/utilities/stateful/StatefulViews;->setupUnsavedChangesConfirmation(Lcom/discord/app/AppFragment;)V
+    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    invoke-virtual {v1, p0}, Lcom/discord/utilities/stateful/StatefulViews;->setupUnsavedChangesConfirmation(Lcom/discord/app/AppFragment;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->getSaveButton()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     move-result-object v2
 
-    new-array v1, v1, [Landroid/view/View;
+    new-array v0, v0, [Landroid/view/View;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->getNewPassword()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object v3
 
-    aput-object v3, v1, p1
+    aput-object v3, v0, p1
 
-    invoke-virtual {v0, p0, v2, v1}, Lcom/discord/utilities/stateful/StatefulViews;->setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
+    invoke-virtual {v1, p0, v2, v0}, Lcom/discord/utilities/stateful/StatefulViews;->setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->getCurrentPassword()Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -757,13 +729,6 @@
     invoke-static {p1, p0, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$Companion.smali
index 800cc403ed..1fe77b13df 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+    const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
index a02be201f4..037b87139a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountEdit.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(Landroid/view/View;Z)V
     .locals 10
 
-    if-eqz p1, :cond_1
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -94,13 +96,13 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const p2, 0x7f121297
+    const p2, 0x7f1212c2
 
     invoke-virtual {p1, p2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -122,13 +124,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali
index c36f45776e..d2d1c947b0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountEdit.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1;->$inputLayout:Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -70,13 +72,4 @@
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setErrorEnabled(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali
index d3d39f2684..0262446c10 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountEdit.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/google/android/material/textfield/TextInputLayout;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "inputLayout"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
@@ -72,13 +74,4 @@
     invoke-static {p1, v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     return-void
-
-    :cond_0
-    const-string p1, "inputLayout"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali
index 1f857f802c..d99eca67fe 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountEdit.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
@@ -71,14 +71,9 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lcom/google/android/material/textfield/TextInputLayout;->setError(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali
index 89995883ce..9491f3f1fa 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountEdit.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->access$configureUI(Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;Lcom/discord/models/domain/ModelUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
index 1efa828f18..4993bd7a68 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
@@ -65,11 +65,11 @@
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const v2, 0x7f1213a3
+    const v2, 0x7f1213cd
 
     const/4 v3, 0x4
 
-    invoke-static {v0, v2, v1, v3}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {v0, v2, v1, v3}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -79,7 +79,7 @@
 
     const-string v1, "updatedUser"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getToken()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$2.smali
index 6f34d7b71d..7409960b7b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$2.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->access$handleApiError(Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;Lcom/discord/utilities/error/Error;)Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
index 9ce48450f8..05611f9b42 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsAccountEdit.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/utilities/view/validators/ValidationManager;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v7, 0x7f121760
+    const v7, 0x7f12178a
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -96,9 +96,9 @@
 
     sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v8, 0x7f121160
+    const v8, 0x7f12118b
 
-    const v9, 0x7f121165
+    const v9, 0x7f121190
 
     invoke-virtual {v6, v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createDiscriminatorInputValidator(II)Lcom/discord/utilities/view/validators/InputValidator;
 
@@ -126,7 +126,7 @@
 
     sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v9, 0x7f1205ee
+    const v9, 0x7f1205f0
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -136,7 +136,7 @@
 
     sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v9, 0x7f1205ed
+    const v9, 0x7f1205ef
 
     invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -162,7 +162,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v8, 0x7f1210da
+    const v8, 0x7f121105
 
     invoke-virtual {v6, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
@@ -172,7 +172,7 @@
 
     sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const v7, 0x7f1210d4
+    const v7, 0x7f1210ff
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/auth/AuthUtils;->createPasswordInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
index e42c9e0e94..bf08d948a0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
@@ -43,121 +43,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+    const-string v2, "usernameWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUsernameWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "usernameWrap"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUsernameWrap()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const/4 v2, 0x0
+    const-string v2, "discriminator"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDiscriminator()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "discriminator"
-
-    const-string v4, "getDiscriminator()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+    const-string v2, "emailWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emailWrap"
-
-    const-string v4, "getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+    const-string v2, "passwordWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "passwordWrap"
-
-    const-string v4, "getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+    const-string v2, "accountSave"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "accountSave"
-
-    const-string v4, "getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
+    const-string v2, "dimmerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmerView()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmerView"
-
-    const-string v4, "getDimmerView()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -181,7 +145,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a02ff
+    const v0, 0x7f0a0305
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +153,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->usernameWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02fb
+    const v0, 0x7f0a0301
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +161,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->discriminator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02fc
+    const v0, 0x7f0a0302
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +169,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->emailWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02fd
+    const v0, 0x7f0a0303
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +177,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->passwordWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a086c
+    const v0, 0x7f0a0872
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->accountSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -255,9 +219,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a02ff
-        0x7f0a02fb
-        0x7f0a02fc
+        0x7f0a0305
+        0x7f0a0301
+        0x7f0a0302
     .end array-data
 .end method
 
@@ -412,7 +376,7 @@
 
     const-string v2, "java.lang.String.format(format, *args)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4, v5, v1}, Lcom/discord/utilities/stateful/StatefulViews;->get(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -662,7 +626,7 @@
 
     const-string v1, "error.response"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
@@ -670,7 +634,7 @@
 
     const-string v1, "error.response.messages"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/view/validators/ValidationManager;->setErrors(Ljava/util/Map;)Ljava/util/Collection;
 
@@ -815,7 +779,7 @@
 
     const-wide/16 v4, 0x0
 
-    invoke-static {v2, v4, v5, v3}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v2, v4, v5, v3}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -835,7 +799,7 @@
 
     invoke-direct {v4, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$2;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;)V
 
-    invoke-static {v2, v3, v4}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {v2, v3, v4}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -857,73 +821,75 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121715
+    const p1, 0x7f12173f
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;)V
+    new-instance v1, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getUsernameWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
+    invoke-virtual {v1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
+    invoke-virtual {v1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getPasswordWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
+    invoke-virtual {v1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1;->invoke(Lcom/google/android/material/textfield/TextInputLayout;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getDiscriminator()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v0
+    move-result-object v1
 
     new-instance v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2;
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$2;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;)V
 
-    invoke-static {v0, p0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
+    invoke-static {v1, p0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    move-result-object v0
+    move-result-object v1
 
     new-instance v2, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$3;
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$3;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;)V
 
-    invoke-virtual {v0, v2}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
-    invoke-virtual {v0, p0}, Lcom/discord/utilities/stateful/StatefulViews;->setupUnsavedChangesConfirmation(Lcom/discord/app/AppFragment;)V
+    invoke-virtual {v1, p0}, Lcom/discord/utilities/stateful/StatefulViews;->setupUnsavedChangesConfirmation(Lcom/discord/app/AppFragment;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->state:Lcom/discord/utilities/stateful/StatefulViews;
+    iget-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getAccountSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
@@ -943,26 +909,19 @@
 
     move-result-object p1
 
-    aput-object p1, v3, v1
-
-    const/4 p1, 0x2
+    aput-object p1, v3, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getEmailWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v1
+    move-result-object p1
 
-    aput-object v1, v3, p1
+    const/4 v0, 0x2
 
-    invoke-virtual {v0, p0, v2, v3}, Lcom/discord/utilities/stateful/StatefulViews;->setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
+    aput-object p1, v3, v0
+
+    invoke-virtual {v1, p0, v2, v3}, Lcom/discord/utilities/stateful/StatefulViews;->setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$Companion.smali
index 901b95ee5a..d7a4365651 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
+    const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$1.smali
index 113a886ce0..071d9db675 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsBlockedUsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;->access$configureUI(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$2.smali
index 14128b6b91..e4b2cacf76 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsBlockedUsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;->access$handleEvent(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$2.smali
index b04cb5e3ed..db12a6ebf3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$2;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;->onClickUnblock(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$3.smali
index 7b9ab9154d..daf24554f0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsers.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,29 +59,29 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 11
+    .locals 12
 
-    if-eqz p1, :cond_0
+    const-string v0, "user"
 
-    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v1
-
-    const/4 v3, 0x0
+    move-result-wide v2
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers$onViewCreated$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v4
+    move-result-object v5
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     const/4 v6, 0x0
 
@@ -89,20 +89,13 @@
 
     const/4 v8, 0x0
 
-    const/16 v9, 0x7a
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    const/16 v10, 0x7a
 
-    invoke-static/range {v0 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
+    const/4 v11, 0x0
+
+    invoke-static/range {v1 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.smali
index f68d7178ee..8fe1f809ee 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.smali
@@ -39,41 +39,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "flipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
 
-    const/4 v2, 0x0
+    const-string v2, "blockedUsersRecycler"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBlockedUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "blockedUsersRecycler"
-
-    const-string v4, "getBlockedUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -136,7 +124,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -164,7 +152,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Uninitialized;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -175,7 +163,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Empty;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -277,7 +265,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     return-void
 .end method
@@ -308,7 +296,7 @@
     :cond_0
     const-string p1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -360,7 +348,7 @@
 
     const-string v0, "ViewModelProvider(this, \u2026ewModel::class.java\n    )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;
 
@@ -382,7 +370,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -447,12 +435,12 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -460,13 +448,13 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
-    const p1, 0x7f12170d
+    const p1, 0x7f121737
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -474,6 +462,8 @@
 
     const/4 p2, 0x1
 
+    const/4 v0, 0x0
+
     invoke-static {p0, p1, p2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsers;->getBlockedUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;
@@ -517,19 +507,12 @@
     return-void
 
     :cond_0
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder.smali
index 9a3669e114..07b481a4f0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder.smali
@@ -37,7 +37,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder;
 
@@ -45,59 +45,41 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "avatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "avatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "name"
 
-    const/4 v3, 0x0
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "name"
-
-    const-string v5, "getName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "unblockButton"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnblockButton()Landroid/widget/Button;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "unblockButton"
+    const/4 v2, 0x2
 
-    const-string v4, "getUnblockButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x2
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -105,13 +87,15 @@
 .end method
 
 .method public constructor <init>(ILcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -131,7 +115,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a09af
+    const p1, 0x7f0a09b3
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -140,15 +124,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder;->unblockButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder;)Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter;
@@ -226,7 +201,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;)V
     .locals 8
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -283,15 +260,6 @@
     invoke-virtual {p2, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUnblock$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUnblock$1.smali
index bd78ae4bb3..1d7af0a026 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUnblock$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUnblock$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUnblock$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsersAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUserProfile$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUserProfile$1.smali
index 97d1642881..843b466cac 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUserProfile$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUserProfile$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter$onClickUserProfile$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsersAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.smali
index e3a4d784d5..a2ee160948 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.smali
@@ -47,9 +47,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -62,15 +64,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter;->onClickUserProfile:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -120,7 +113,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -133,7 +126,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -151,19 +146,10 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickUnblock(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -175,24 +161,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter;->onClickUnblock:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickUserProfile(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -204,18 +183,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter;->onClickUserProfile:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1.smali
index 1124a98b0a..b47f849eff 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsersViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;->access$handleStoreState(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1$1.smali
index befa41d9d0..1e909f6d2f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsBlockedUsersViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -75,7 +81,7 @@
 
     const-string v1, "users"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;-><init>(Ljava/util/Map;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1.smali
index 8ac4b25177..a1645f8d3b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsBlockedUsersViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -81,6 +87,7 @@
             "Ljava/lang/Integer;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;",
             ">;"
         }
@@ -88,7 +95,7 @@
 
     const-string v0, "relationships"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -169,7 +176,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1$1;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory.smali
index bd476f551a..8285346762 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory.smali
@@ -40,7 +40,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;
 
@@ -57,15 +59,6 @@
     invoke-direct {p1, v0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;-><init>(Lrx/Observable;Lcom/discord/utilities/rest/RestAPI;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final observeStores()Lrx/Observable;
@@ -91,13 +84,13 @@
 
     sget-object v1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Factory$observeStores$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n            \u2026          }\n            }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item.smali
index e58bafb220..7da68348d9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;->user:Lcom/discord/models/domain/ModelUser;
 
     return-void
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;
@@ -73,22 +66,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -106,7 +92,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState.smali
index e0eef8017b..a69b9ef6f3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState.smali
@@ -29,7 +29,7 @@
 
 # direct methods
 .method public constructor <init>(Ljava/util/Map;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,22 +41,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "users"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;->users:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;
@@ -109,22 +102,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "users"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;-><init>(Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -142,7 +128,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$StoreState;->users:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded.smali
index 5eed9ce3b1..b9f5777231 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded.smali
@@ -38,22 +38,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "items"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded;
@@ -103,22 +98,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -136,7 +124,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded;->items:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$getItems$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$getItems$1.smali
index fbcb20c775..d998a3c9a6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$getItems$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$getItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$getItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsersViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map$Entry<",
         "+",
@@ -54,7 +54,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "userEntry"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;
 
@@ -88,15 +90,6 @@
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Item;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "userEntry"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.smali
index e2caf39fc3..b44855a2e9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsersViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;
 
-    const v0, 0x7f1216ed
+    const v0, 0x7f121717
 
     invoke-static {p1, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.smali
index c742bb0d38..18a4207ef2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBlockedUsersViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.smali
index 3adddb3a30..ab13f6150b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetSettingsBlockedUsersViewModel.kt"
 
 
@@ -17,7 +17,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState;",
         ">;"
     }
@@ -84,15 +84,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "restAPI"
 
-    sget-object v1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Uninitialized;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    sget-object v0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;->storeObservable:Lrx/Observable;
 
@@ -106,14 +108,20 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;->storeObservable:Lrx/Observable;
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p1, p0, p2, v0, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;
 
+    new-instance v7, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -122,10 +130,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$1;-><init>(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -133,20 +137,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$emitShowToastEvent(Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel;I)V
@@ -243,7 +233,7 @@
 
     sget-object p1, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Empty;->INSTANCE:Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Empty;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -252,7 +242,7 @@
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$ViewState$Loaded;-><init>(Ljava/util/List;)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_0
     return-void
@@ -299,7 +289,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
index 70ba65b0eb..e8c387e34b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
@@ -19,25 +19,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;
+    const-string v2, "bodyText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBodyText()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "bodyText"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getBodyText()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -49,7 +43,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05dc
+    const v0, 0x7f0a05e2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -91,37 +85,39 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 11
+    .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f121623
+    const/4 v0, 0x2
 
-    const/4 v1, 0x2
+    new-array v0, v0, [Ljava/lang/Object;
 
-    new-array v1, v1, [Ljava/lang/Object;
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const-string v2, "https://play.google.com/store/apps/details?id=com.authy.authy"
 
-    const-string v3, "https://play.google.com/store/apps/details?id=com.authy.authy"
+    aput-object v2, v0, v1
 
-    aput-object v3, v1, v2
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const-string v2, "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"
 
-    const-string v3, "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"
+    aput-object v2, v0, v1
 
-    aput-object v3, v1, v2
+    const v1, 0x7f12164d
 
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v3
 
     const-string v0, "getString(\n        R.str\u2026OOGLE_AUTHENTICATOR\n    )"
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;->getBodyText()Lcom/discord/app/AppTextView;
 
@@ -129,23 +125,23 @@
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v4
+    move-result-object v2
 
     const-string p1, "view.context"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/16 v7, 0x1c
 
     const/4 v8, 0x0
 
-    const/16 v9, 0x1c
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v4 .. v10}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -162,13 +158,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$onViewBound$1.smali
index c035c23a70..9323f0c594 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableMFAInput.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "verificationCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/ViewModelProvider;
 
@@ -85,7 +87,7 @@
 
     const-string v1, "ViewModelProvider(requir\u2026MFAViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
@@ -97,18 +99,9 @@
 
     const-string v2, "view.context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;->enableMFA(Landroid/content/Context;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "verificationCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali
index 978dc192d5..964e24ffee 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.smali
@@ -19,25 +19,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAInput;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAInput;
+    const-string v2, "codeVerificationView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCodeVerificationView()Lcom/discord/views/CodeVerificationView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "codeVerificationView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCodeVerificationView()Lcom/discord/views/CodeVerificationView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAInput;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -49,7 +43,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a09f8
+    const v0, 0x7f0a09fc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -93,7 +87,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -108,15 +104,6 @@
     invoke-virtual {v0, v1}, Lcom/discord/views/CodeVerificationView;->setOnCodeEntered(Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setMenuVisibility(Z)V
@@ -134,7 +121,7 @@
 
     const-string v0, "context ?: return"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "clipboard"
 
@@ -161,7 +148,7 @@
 
     const-string v0, "clipboard.primaryClip ?: return"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/ClipData;->getItemCount()I
 
@@ -177,7 +164,7 @@
 
     const-string v0, "clipData.getItemAt(0)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/ClipData$Item;->getText()Ljava/lang/CharSequence;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$onViewBound$1.smali
index 25a7185dd2..77d6d586f1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$onViewBound$1.smali
@@ -41,7 +41,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -49,7 +49,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->access$copyCodeToClipboard(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.smali
index 9611c36e22..c53657a7e6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.smali
index 7d46bb95d6..7da0d63afe 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.smali
@@ -39,7 +39,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
index d9cd1bf5fa..ecc10faf35 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
@@ -33,61 +33,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
+    const-string v2, "key"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getKey()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "key"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getKey()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
 
-    const/4 v2, 0x0
+    const-string v2, "launchAuthy"
 
-    aput-object v1, v0, v2
+    const-string v3, "getLaunchAuthy()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "launchAuthy"
-
-    const-string v4, "getLaunchAuthy()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
+    const-string v2, "launchGoogleAuth"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLaunchGoogleAuth()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "launchGoogleAuth"
-
-    const-string v4, "getLaunchGoogleAuth()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -111,7 +93,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a033b
+    const v0, 0x7f0a0341
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -119,7 +101,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->key$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033c
+    const v0, 0x7f0a0342
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +109,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->launchAuthy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a033d
+    const v0, 0x7f0a0343
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -186,7 +168,7 @@
     invoke-virtual {v1, v0}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
 
     :cond_0
-    const v0, 0x7f1204d2
+    const v0, 0x7f1204d4
 
     const/4 v1, 0x0
 
@@ -194,7 +176,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
@@ -284,7 +266,7 @@
 
     const/4 v2, 0x1
 
-    const v3, 0x7f120e02
+    const v3, 0x7f120e28
 
     const/4 v4, 0x0
 
@@ -296,7 +278,7 @@
 
     new-array v5, v2, [Ljava/lang/Object;
 
-    const v6, 0x7f121612
+    const v6, 0x7f12163c
 
     invoke-virtual {p0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -343,7 +325,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    const v5, 0x7f121613
+    const v5, 0x7f12163d
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -390,7 +372,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -410,7 +394,7 @@
 
     const-string v0, "ViewModelProvider(requir\u2026MFAViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
@@ -437,13 +421,4 @@
     invoke-direct {p0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->showLaunchTexts()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$Companion.smali
index 94ff3103dd..f169fd8608 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$Companion.smali
@@ -36,7 +36,9 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
 
@@ -44,16 +46,7 @@
 
     invoke-direct {v1}, Landroid/content/Intent;-><init>()V
 
-    invoke-static {p1, v0, v1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, v1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali
index 7d3ea6efa8..4ccfa67094 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableMFASteps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali
index f6557d3753..b1852075f6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableMFASteps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,25 +61,27 @@
 .method public final invoke(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;)V
     .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
 
-    invoke-static {v1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->access$getDimmer$p(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;)Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-static {v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->access$getDimmer$p(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;)Lcom/discord/utilities/dimmer/DimmerView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;->isLoading()Z
 
-    move-result v2
+    move-result v1
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x2
 
     const/4 v4, 0x0
 
-    invoke-static {v1, v2, v4, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
+    invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;->getScreenIndex()Ljava/lang/Integer;
 
@@ -91,44 +93,37 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
 
-    invoke-static {v1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->access$getStepsView$p(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;)Lcom/discord/views/steps/StepsView;
+    invoke-static {v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->access$getStepsView$p(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;)Lcom/discord/views/steps/StepsView;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     if-ltz p1, :cond_2
 
-    iget-object v0, v1, Lcom/discord/views/steps/StepsView;->i:Lcom/discord/views/steps/StepsView$d;
+    iget-object v1, v0, Lcom/discord/views/steps/StepsView;->i:Lcom/discord/views/steps/StepsView$d;
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/views/steps/StepsView$d;->getCount()I
+    invoke-virtual {v1}, Lcom/discord/views/steps/StepsView$d;->getCount()I
 
-    move-result v4
+    move-result v2
 
     :cond_0
-    if-ge p1, v4, :cond_2
+    if-ge p1, v2, :cond_2
 
-    iget-object v0, v1, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
 
     invoke-virtual {v0, p1}, Landroidx/viewpager/widget/ViewPager;->setCurrentItem(I)V
 
     goto :goto_0
 
     :cond_1
-    throw v0
+    throw v4
 
     :cond_2
     :goto_0
     return-void
-
-    :cond_3
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1.smali
index 66343a5b1a..3420cdb7c8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableMFASteps.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -62,33 +62,35 @@
 .end method
 
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;)V
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "newPassword"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Landroidx/lifecycle/ViewModelProvider;
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
+    iget-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
 
-    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-direct {p1, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;)V
+    invoke-direct {p1, v0}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;)V
 
-    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
+    const-class v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(requir\u2026MFAViewModel::class.java)"
+    const-string v0, "ViewModelProvider(requir\u2026MFAViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
@@ -96,23 +98,11 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
 
-    const/4 p2, 0x1
+    const/4 p2, 0x0
 
-    invoke-static {p1, v0, p2, v0}, Lcom/discord/app/AppFragment;->hideKeyboard$default(Lcom/discord/app/AppFragment;Landroid/view/View;ILjava/lang/Object;)V
+    const/4 v0, 0x1
+
+    invoke-static {p1, p2, v0, p2}, Lcom/discord/app/AppFragment;->hideKeyboard$default(Lcom/discord/app/AppFragment;Landroid/view/View;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "newPassword"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
index 18b33dd662..57bfdecd33 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
@@ -39,41 +39,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
+    const-string v2, "stepsView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStepsView()Lcom/discord/views/steps/StepsView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "stepsView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getStepsView()Lcom/discord/views/steps/StepsView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
 
-    const/4 v2, 0x0
+    const-string v2, "dimmer"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -97,7 +85,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a033e
+    const v0, 0x7f0a0344
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -105,7 +93,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->stepsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,7 +181,7 @@
 
     const-string v2, "appActivity.supportFragmentManager"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$showPasswordModal$$inlined$let$lambda$1;
 
@@ -201,6 +189,14 @@
 
     if-eqz v1, :cond_0
 
+    const-string v1, "supportFragmentManager"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "onValidPasswordEntered"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v1, Lf/a/a/s;
 
     invoke-direct {v1}, Lf/a/a/s;-><init>()V
@@ -244,7 +240,9 @@
 .method public onSaveInstanceState(Landroid/os/Bundle;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "outState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onSaveInstanceState(Landroid/os/Bundle;)V
 
@@ -264,7 +262,7 @@
 
     const-string v1, "ViewModelProvider(requir\u2026MFAViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
@@ -285,37 +283,30 @@
     invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "outState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 14
+    .locals 24
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
 
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
+    move-object/from16 v1, p1
 
-    const/4 p1, 0x4
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array p1, p1, [Lcom/discord/views/steps/StepsView$b$a;
+    invoke-super/range {p0 .. p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    new-instance v11, Lcom/discord/views/steps/StepsView$b$a;
+    const/4 v0, 0x4
 
-    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;
+    new-array v0, v0, [Lcom/discord/views/steps/StepsView$b$a;
 
-    const/4 v2, 0x0
+    new-instance v12, Lcom/discord/views/steps/StepsView$b$a;
 
-    const v3, 0x7f1203b7
+    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
+
+    const v4, 0x7f1203b8
 
     const/4 v5, 0x0
 
@@ -327,26 +318,56 @@
 
     const/4 v9, 0x0
 
-    const/16 v10, 0x1fa
+    const/4 v10, 0x0
 
-    move-object v0, v11
+    const/16 v11, 0x1fa
 
-    invoke-direct/range {v0 .. v10}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
+    move-object v1, v12
 
-    const/4 v0, 0x0
+    invoke-direct/range {v1 .. v11}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
 
-    aput-object v11, p1, v0
+    const/4 v1, 0x0
 
-    const/4 v1, 0x1
+    aput-object v12, v0, v1
 
-    new-instance v13, Lcom/discord/views/steps/StepsView$b$a;
+    new-instance v2, Lcom/discord/views/steps/StepsView$b$a;
 
-    const-class v3, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
+    const-class v14, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;
 
-    const/4 v5, 0x0
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0x0
+
+    const/16 v18, 0x0
+
+    const/16 v19, 0x0
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    const/16 v22, 0x0
+
+    const/16 v23, 0x1fe
+
+    move-object v13, v2
+
+    invoke-direct/range {v13 .. v23}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
+
+    const/4 v3, 0x1
+
+    aput-object v2, v0, v3
+
+    new-instance v2, Lcom/discord/views/steps/StepsView$b$a;
+
+    const-class v5, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAInput;
 
     const/4 v6, 0x0
 
+    const/4 v7, 0x0
+
     const/4 v8, 0x0
 
     const/4 v9, 0x0
@@ -355,100 +376,100 @@
 
     const/4 v11, 0x0
 
-    const/16 v12, 0x1fe
+    const/4 v12, 0x0
 
-    move-object v2, v13
+    const/4 v13, 0x0
 
-    invoke-direct/range {v2 .. v12}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
+    const/16 v14, 0x7e
 
-    aput-object v13, p1, v1
+    move-object v4, v2
 
-    const/4 v1, 0x2
+    invoke-direct/range {v4 .. v14}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
 
-    new-instance v13, Lcom/discord/views/steps/StepsView$b$a;
+    const/4 v3, 0x2
 
-    const-class v3, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAInput;
+    aput-object v2, v0, v3
 
-    const/16 v12, 0x7e
+    new-instance v2, Lcom/discord/views/steps/StepsView$b$a;
 
-    move-object v2, v13
+    const-class v5, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess;
 
-    invoke-direct/range {v2 .. v12}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
+    const/16 v14, 0xfe
 
-    aput-object v13, p1, v1
+    move-object v4, v2
 
-    const/4 v1, 0x3
+    invoke-direct/range {v4 .. v14}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
 
-    new-instance v13, Lcom/discord/views/steps/StepsView$b$a;
+    const/4 v3, 0x3
 
-    const-class v3, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess;
+    aput-object v2, v0, v3
 
-    const/16 v12, 0xfe
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
-    move-object v2, v13
+    move-result-object v0
 
-    invoke-direct/range {v2 .. v12}, Lcom/discord/views/steps/StepsView$b$a;-><init>(Ljava/lang/Class;IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZI)V
+    new-instance v2, Lcom/discord/views/steps/StepsView$d;
 
-    aput-object v13, p1, v1
+    invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    invoke-static {p1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    move-result-object v3
 
-    move-result-object p1
+    const-string v4, "parentFragmentManager"
 
-    new-instance v1, Lcom/discord/views/steps/StepsView$d;
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-direct {v2, v3}, Lcom/discord/views/steps/StepsView$d;-><init>(Landroidx/fragment/app/FragmentManager;)V
 
-    move-result-object v2
+    iput-object v0, v2, Lcom/discord/views/steps/StepsView$d;->a:Ljava/util/List;
 
-    const-string v3, "parentFragmentManager"
+    invoke-virtual {v2}, Landroidx/viewpager/widget/PagerAdapter;->notifyDataSetChanged()V
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->getStepsView()Lcom/discord/views/steps/StepsView;
 
-    invoke-direct {v1, v2}, Lcom/discord/views/steps/StepsView$d;-><init>(Landroidx/fragment/app/FragmentManager;)V
+    move-result-object v0
 
-    iput-object p1, v1, Lcom/discord/views/steps/StepsView$d;->a:Ljava/util/List;
+    new-instance v3, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1;
 
-    invoke-virtual {v1}, Landroidx/viewpager/widget/PagerAdapter;->notifyDataSetChanged()V
+    move-object/from16 v4, p0
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;->getStepsView()Lcom/discord/views/steps/StepsView;
+    invoke-direct {v3, v4}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1;-><init>(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;)V
 
-    move-result-object p1
+    if-eqz v0, :cond_0
 
-    new-instance v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1;
+    const-string v5, "adapter"
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBound$1;-><init>(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASteps;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, p1, Lcom/discord/views/steps/StepsView;->i:Lcom/discord/views/steps/StepsView$d;
+    const-string v5, "onClose"
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3, v1}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
+    iput-object v2, v0, Lcom/discord/views/steps/StepsView;->i:Lcom/discord/views/steps/StepsView$d;
 
-    iget-object v1, p1, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v5, v0, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
 
-    invoke-virtual {v1}, Landroidx/viewpager/widget/ViewPager;->clearOnPageChangeListeners()V
+    invoke-virtual {v5, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
-    iget-object v1, p1, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
 
-    new-instance v3, Lf/a/n/l0/a;
+    invoke-virtual {v2}, Landroidx/viewpager/widget/ViewPager;->clearOnPageChangeListeners()V
 
-    invoke-direct {v3, p1, v2}, Lf/a/n/l0/a;-><init>(Lcom/discord/views/steps/StepsView;Lkotlin/jvm/functions/Function0;)V
+    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->h:Lcom/discord/utilities/simple_pager/SimplePager;
 
-    invoke-virtual {v1, v3}, Landroidx/viewpager/widget/ViewPager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
+    new-instance v5, Lf/a/n/l0/a;
 
-    invoke-virtual {p1, v0, v2}, Lcom/discord/views/steps/StepsView;->b(ILkotlin/jvm/functions/Function0;)V
+    invoke-direct {v5, v0, v3}, Lf/a/n/l0/a;-><init>(Lcom/discord/views/steps/StepsView;Lkotlin/jvm/functions/Function0;)V
+
+    invoke-virtual {v2, v5}, Landroidx/viewpager/widget/ViewPager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
+
+    invoke-virtual {v0, v1, v3}, Lcom/discord/views/steps/StepsView;->b(ILkotlin/jvm/functions/Function0;)V
 
     return-void
 
     :cond_0
-    const-string p1, "view"
+    const/4 v0, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -476,11 +497,11 @@
 
     const-string v1, "ViewModelProvider(requir\u2026MFAViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -532,7 +553,7 @@
 
     const-string v1, "ViewModelProvider(requir\u2026MFAViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$onViewBound$1.smali
index d7d8d81c6f..04b177c91b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$onViewBound$1.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali
index ba2d3839f6..103c4f2e70 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.smali
@@ -19,25 +19,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess;
 
-    const-class v2, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess;
+    const-string v2, "enableSMS"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEnableSMS()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "enableSMS"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEnableSMS()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -49,7 +43,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05dd
+    const v0, 0x7f0a05e3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -93,7 +87,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -108,13 +104,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$Factory.smali
index 3101e8ffdb..1774e7e309 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$Factory.smali
@@ -29,7 +29,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -40,20 +40,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
     invoke-direct {p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;-><init>()V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState.smali
index 687b69e044..1561eade58 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState.smali
@@ -142,7 +142,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;->screenIndex:Ljava/lang/Integer;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali
index b1593fe32f..7c131a8986 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableMFAViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$Token;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Token;->getToken()Ljava/lang/String;
 
@@ -73,7 +73,7 @@
 
     const-string v1, "it.token"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;->access$handleMFASuccess(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali
index 38b55610a0..460143cddb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableMFAViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$2;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;->access$handleMFAFailure(Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali
index 601aa3eee2..c7956d0e8f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetEnableMFAViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$3;->this$0:Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali
index d6900a5535..4fcb8ee5c7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetEnableMFAViewModel.kt"
 
 
@@ -13,7 +13,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;",
         ">;"
     }
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;-><init>(ZLjava/lang/Integer;)V
 
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     new-instance v0, Lrx/subscriptions/CompositeSubscription;
 
@@ -104,7 +104,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;-><init>(ZLjava/lang/Integer;)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -134,7 +134,7 @@
 
     invoke-direct {p1, v1, v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;-><init>(ZLjava/lang/Integer;)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -156,25 +156,29 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "mfaCode"
 
-    new-instance v1, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x1
+    new-instance v0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;
 
-    invoke-direct {v1, v2, v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;-><init>(ZLjava/lang/Integer;)V
+    const/4 v1, 0x1
 
-    invoke-virtual {p0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    const/4 v2, 0x0
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$ViewState;-><init>(ZLjava/lang/Integer;)V
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
-    move-result-object v1
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v0
 
     new-instance v3, Lcom/discord/restapi/RestAPIParams$EnableMFA;
 
@@ -188,29 +192,29 @@
 
     invoke-direct {v3, p2, v4, v5}, Lcom/discord/restapi/RestAPIParams$EnableMFA;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v1, v3}, Lcom/discord/utilities/rest/RestAPI;->enableMFA(Lcom/discord/restapi/RestAPIParams$EnableMFA;)Lrx/Observable;
+    invoke-virtual {v0, v3}, Lcom/discord/utilities/rest/RestAPI;->enableMFA(Lcom/discord/restapi/RestAPIParams$EnableMFA;)Lrx/Observable;
 
     move-result-object p2
 
     const-wide/16 v3, 0x7d0
 
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-virtual {p2, v3, v4, v1}, Lrx/Observable;->p(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-virtual {p2, v3, v4, v0}, Lrx/Observable;->p(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p2
 
-    const-string v1, "RestAPI\n        .api\n   \u20260, TimeUnit.MILLISECONDS)"
+    const-string v0, "RestAPI\n        .api\n   \u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-static {p2, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p2, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p2
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -220,7 +224,7 @@
 
     const-string p2, "RestAPI\n        .api\n   \u2026dSchedulers.mainThread())"
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v7, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel$enableMFA$1;
 
@@ -248,20 +252,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "mfaCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getPassword()Ljava/lang/String;
@@ -287,7 +277,7 @@
 .method public onCleared()V
     .locals 1
 
-    invoke-super {p0}, Lf/a/b/o0;->onCleared()V
+    invoke-super {p0}, Lf/a/b/q0;->onCleared()V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;->subs:Lrx/subscriptions/CompositeSubscription;
 
@@ -297,24 +287,17 @@
 .end method
 
 .method public final setPassword(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "password"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;->password:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "password"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setTotpSecret(Ljava/lang/String;)V
@@ -322,7 +305,9 @@
     .annotation build Landroidx/annotation/MainThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "secret"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAViewModel;->totpSecret:Ljava/lang/String;
 
@@ -338,13 +323,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "secret"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali
index a80f218a41..428fb5c11f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder.smali
@@ -27,22 +27,15 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00aa
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceAddViewHolder;)Lcom/discord/widgets/settings/billing/PaymentSourceAdapter;
@@ -60,7 +53,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/billing/PaymentSourceAdapter$Item;)V
     .locals 0
 
-    if-eqz p2, :cond_0
+    const-string p1, "data"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
@@ -71,15 +66,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader.smali
index 1327cd7e70..3531102a3a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader.smali
@@ -29,24 +29,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader$Type;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "headerType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;->headerType:Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader$Type;
 
     return-void
-
-    :cond_0
-    const-string p1, "headerType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader$Type;ILjava/lang/Object;)Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;
@@ -79,22 +72,15 @@
 .method public final copy(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader$Type;)Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "headerType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;-><init>(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader$Type;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "headerType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -112,7 +98,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;->headerType:Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader$Type;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
index 75f1e8c243..85b14bb754 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
@@ -27,22 +27,15 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00ab
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -50,7 +43,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/billing/PaymentSourceAdapter$Item;)V
     .locals 1
 
-    if-eqz p2, :cond_3
+    const-string p1, "data"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeader;
 
@@ -74,7 +69,7 @@
 
     if-ne p2, v0, :cond_0
 
-    const p2, 0x7f121090
+    const p2, 0x7f1210ba
 
     goto :goto_0
 
@@ -94,20 +89,11 @@
     return-void
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.TextView"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem.smali
index 47f55d3a05..45bf4beaae 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem.smali
@@ -25,9 +25,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelPaymentSource;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "paymentSource"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,15 +38,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;->isPremium:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "paymentSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;Lcom/discord/models/domain/ModelPaymentSource;ZILjava/lang/Object;)Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;
@@ -92,22 +85,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelPaymentSource;Z)Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "paymentSource"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;-><init>(Lcom/discord/models/domain/ModelPaymentSource;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "paymentSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -125,7 +111,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;->paymentSource:Lcom/discord/models/domain/ModelPaymentSource;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali
index 2e7b721ed6..28b2441968 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder.smali
@@ -33,7 +33,9 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00ac
 
@@ -41,7 +43,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a068f
+    const v0, 0x7f0a0695
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -49,7 +51,7 @@
 
     const-string v0, "itemView.findViewById(R.id.payment_method_summary)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/settings/billing/PaymentSourceView;
 
@@ -57,7 +59,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a068d
+    const v0, 0x7f0a0693
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,22 +67,13 @@
 
     const-string v0, "itemView.findViewById(R.id.payment_method_edit)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/Button;
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder;->paymentSourceEdit:Landroid/widget/Button;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder;)Lcom/discord/widgets/settings/billing/PaymentSourceAdapter;
@@ -98,7 +91,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/billing/PaymentSourceAdapter$Item;)V
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string p1, "data"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;
 
@@ -123,15 +118,6 @@
     invoke-virtual {p2, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter.smali
index 2b61b4e842..816c138e83 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceAdapter.smali
@@ -91,13 +91,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "recycler"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "onAddClick"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onEditPaymentSource"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -106,27 +110,6 @@
     iput-object p3, p0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter;->onEditPaymentSource:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onEditPaymentSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onAddClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getOnAddClick$p(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter;)Lkotlin/jvm/functions/Function0;
@@ -171,7 +154,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_2
 
@@ -216,13 +201,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceView.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceView.smali
index 9711dea0f3..ca08e784d7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/PaymentSourceView.smali
@@ -57,13 +57,15 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
     .param p3    # I
         .annotation build Landroidx/annotation/StyleRes;
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
@@ -71,7 +73,7 @@
 
     invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a06a3
+    const p1, 0x7f0a06a9
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -79,13 +81,13 @@
 
     const-string p2, "findViewById(R.id.payment_source_view_icon)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->icon:Landroid/widget/ImageView;
 
-    const p1, 0x7f0a06a8
+    const p1, 0x7f0a06ae
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -93,13 +95,13 @@
 
     const-string p2, "findViewById(R.id.payment_source_view_title)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->title:Landroid/widget/TextView;
 
-    const p1, 0x7f0a06a7
+    const p1, 0x7f0a06ad
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -107,13 +109,13 @@
 
     const-string p2, "findViewById(R.id.payment_source_view_subtext)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->subtext:Landroid/widget/TextView;
 
-    const p1, 0x7f0a06a6
+    const p1, 0x7f0a06ac
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -121,11 +123,11 @@
 
     const-string p2, "findViewById(R.id.payment_source_view_premium)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->premiumIndicator:Landroid/view/View;
 
-    const p1, 0x7f0a06a5
+    const p1, 0x7f0a06ab
 
     invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -133,20 +135,11 @@
 
     const-string p2, "findViewById(R.id.payment_source_view_invalid)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->invalidIndicator:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -194,7 +187,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f1210f3
+    const v2, 0x7f12111e
 
     invoke-static {p0, v2, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -202,7 +195,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->title:Landroid/widget/TextView;
 
-    invoke-static {v1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v1
 
@@ -222,7 +215,7 @@
 
     const-string v6, "subtext.context"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v2, v5}, Lcom/discord/utilities/time/TimeUtils;->getLocalizedMonthName(ILandroid/content/Context;)Ljava/lang/String;
 
@@ -244,7 +237,7 @@
 
     aput-object p1, v0, v4
 
-    const p1, 0x7f1210f5
+    const p1, 0x7f121120
 
     invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -260,7 +253,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->title:Landroid/widget/TextView;
 
-    const v1, 0x7f12110e
+    const v1, 0x7f121139
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -280,7 +273,9 @@
 .method public final bind(Lcom/discord/models/domain/ModelPaymentSource;Z)V
     .locals 4
 
-    if-eqz p1, :cond_4
+    const-string v0, "paymentSource"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->icon:Landroid/widget/ImageView;
 
@@ -346,13 +341,4 @@
     :cond_3
     :goto_2
     return-void
-
-    :cond_4
-    const-string p1, "paymentSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$1.smali
index c813a4e90b..3fcbaf1997 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SettingsBillingViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$1;->this$0:Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;->access$handleStoreState(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory$create$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory$create$1.smali
index 5e7c399f94..508bd208bb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory$create$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory$create$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;",
+        "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
+        "Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -66,11 +69,11 @@
 
     const-string v1, "paymentSourcesState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "subscriptionsState"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;-><init>(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory.smali
index 1cca5c9aa6..70e30dee4d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$Factory.smali
@@ -40,7 +40,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
 
@@ -84,18 +86,9 @@
 
     const-string v3, "Observable\n             \u2026        )\n              }"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;-><init>(Lcom/discord/stores/StorePaymentSources;Lcom/discord/stores/StoreSubscriptions;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState.smali
index 6188cb458d..43040a473b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSourceState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "subscriptionsState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;->subscriptionsState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptionsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "paymentSourceState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;ILjava/lang/Object;)Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;
@@ -98,31 +86,19 @@
 .method public final copy(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSourceState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "subscriptionsState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;-><init>(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subscriptionsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "paymentSourceState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;->paymentSourceState:Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;->subscriptionsState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded.smali
index 1580c54138..ac4adcbb86 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded.smali
@@ -39,22 +39,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSourceItems"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;->paymentSourceItems:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "paymentSourceItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;
@@ -105,22 +100,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "paymentSourceItems"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "paymentSourceItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -138,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;->paymentSourceItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali
index 64cee2ae13..e404670479 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/SettingsBillingViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "SettingsBillingViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState;",
         ">;"
     }
@@ -29,7 +29,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StorePaymentSources;Lcom/discord/stores/StoreSubscriptions;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -41,17 +41,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storePaymentSources"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeSubscriptions"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loading;
+    const-string v0, "storeObservable"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loading;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;->storePaymentSources:Lcom/discord/stores/StorePaymentSources;
 
@@ -63,13 +67,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
+
+    new-instance v6, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$1;-><init>(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -77,40 +89,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$1;-><init>(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeSubscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storePaymentSources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$StoreState;)V
@@ -240,7 +225,7 @@
     move-result-object v6
 
     :cond_4
-    invoke-static {v7, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -370,7 +355,7 @@
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;-><init>(Ljava/util/List;)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -388,7 +373,7 @@
     :cond_4
     sget-object p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loading;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -396,7 +381,7 @@
     :goto_2
     sget-object p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Failure;->INSTANCE:Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Failure;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$Companion.smali
index 0142f268bc..3a7e07b91c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$Companion.smali
@@ -82,11 +82,13 @@
 .method public final launch(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "paymentSourceId"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
@@ -107,18 +109,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "paymentSourceId"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry.smali
index 1b7f95cefe..e9aac7375a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "label"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;->value:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "label"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;
@@ -98,31 +86,19 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "label"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "label"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;->label:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;->value:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.smali
index 9bc2ac2198..e5f81d6261 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "[",
         "Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
index 2a84bccdad..90ce13b824 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,13 +63,13 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v0, 0x7f1210fb
+    const v0, 0x7f121126
 
     const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali
index dfa286e5a3..0ffef43742 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
@@ -74,13 +76,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali
index 531911bdab..905e3ec2ce 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
index 3bce3693c8..61b1481e9b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
@@ -49,11 +49,11 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v4, 0x7f1210f9
+    const v4, 0x7f121124
 
     invoke-virtual {v3, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -61,7 +61,7 @@
 
     iget-object v4, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v5, 0x7f1210fa
+    const v5, 0x7f121125
 
     invoke-virtual {v4, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -69,11 +69,11 @@
 
     const-string v5, "getString(R.string.payme\u2026_delete_disabled_tooltip)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v5, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v6, 0x7f12107e
+    const v6, 0x7f1210a8
 
     invoke-virtual {v5, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$5.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$5.smali
index 770798f70b..52fbcd05b7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$5;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
@@ -73,18 +75,9 @@
 
     const-string v1, "states"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->access$selectState(Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;[Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$6.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$6.smali
index 3c14546ef2..ace4df930a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/widget/TextView;",
         "Ljava/lang/Integer;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,9 @@
 .method public final invoke(Landroid/widget/TextView;ILandroid/view/KeyEvent;)Z
     .locals 0
 
-    if-eqz p1, :cond_1
+    const-string p3, "<anonymous parameter 0>"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x2
 
@@ -100,7 +102,7 @@
 
     const-string p3, "states"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->access$selectState(Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;[Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;)V
 
@@ -108,13 +110,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.smali
index b33719f618..9cbbb53334 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -73,10 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.smali
index 3684580271..53f0f17319 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.settings.billing.SettingsBillingViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$1.smali
index c02da9bc36..9449584ffd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$ViewState$Loaded;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$2.smali
index 66f4264b63..00e6292245 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;",
+        ">;",
+        "Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;",
+        ">;"
     }
 .end annotation
 
@@ -61,7 +66,7 @@
 
     const-string v0, "paymentSources"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -96,7 +101,7 @@
 
     move-result-object v2
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali
index f107f9e8b1..71dd2c1665 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$paymentSourceId$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -80,5 +80,9 @@
     const-string v0, ""
 
     :goto_0
+    const-string v1, "arguments?.getString(ARG_PAYMENT_SOURCE_ID) ?: \"\""
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali
index 9669486f76..c35f5b1551 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
index a364723f60..c2cf185686 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,13 +63,13 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v0, 0x7f1210fe
+    const v0, 0x7f121129
 
     const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali
index 7f7a774498..54744c1040 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
@@ -78,13 +80,4 @@
     invoke-virtual {p1, v0}, Lcom/discord/views/LoadingButton;->setIsLoading(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali
index d1c9d11ef5..10a68613b0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.smali
index e58c64c0f4..ed5636317f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetPaymentSourceEditDialog.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "[",
         "Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
index c2cc4012bf..880534b959 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
@@ -68,281 +68,197 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "paymentSourceView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPaymentSourceView()Lcom/discord/widgets/settings/billing/PaymentSourceView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "paymentSourceView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getPaymentSourceView()Lcom/discord/widgets/settings/billing/PaymentSourceView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const/4 v2, 0x0
+    const-string v2, "helpText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getHelpText()Lcom/discord/app/AppTextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "helpText"
-
-    const-string v4, "getHelpText()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "errorText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getErrorText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "errorText"
-
-    const-string v4, "getErrorText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "nameInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNameInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nameInput"
-
-    const-string v4, "getNameInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "addressInput1"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAddressInput1()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "addressInput1"
-
-    const-string v4, "getAddressInput1()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "addressInput2"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAddressInput2()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "addressInput2"
-
-    const-string v4, "getAddressInput2()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "cityInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCityInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cityInput"
-
-    const-string v4, "getCityInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "stateInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStateInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "stateInput"
-
-    const-string v4, "getStateInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "postalCodeInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPostalCodeInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "postalCodeInput"
-
-    const-string v4, "getPostalCodeInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "countryInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCountryInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "countryInput"
-
-    const-string v4, "getCountryInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "defaultCheckbox"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDefaultCheckbox()Landroid/widget/CheckBox;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "defaultCheckbox"
-
-    const-string v4, "getDefaultCheckbox()Landroid/widget/CheckBox;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "toolbar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getToolbar()Landroidx/appcompat/widget/Toolbar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "toolbar"
-
-    const-string v4, "getToolbar()Landroidx/appcompat/widget/Toolbar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "saveBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSaveBtn()Lcom/discord/views/LoadingButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "saveBtn"
-
-    const-string v4, "getSaveBtn()Lcom/discord/views/LoadingButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
+    const-string v2, "deleteBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeleteBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "deleteBtn"
-
-    const-string v4, "getDeleteBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
@@ -366,7 +282,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a06a2
+    const v0, 0x7f0a06a8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -374,7 +290,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->paymentSourceView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069e
+    const v0, 0x7f0a06a4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -382,7 +298,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->helpText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069d
+    const v0, 0x7f0a06a3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -390,7 +306,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069f
+    const v0, 0x7f0a06a5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -398,7 +314,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->nameInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0698
+    const v0, 0x7f0a069e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -406,7 +322,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->addressInput1$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0699
+    const v0, 0x7f0a069f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -414,7 +330,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->addressInput2$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069a
+    const v0, 0x7f0a06a0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -422,7 +338,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->cityInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a1
+    const v0, 0x7f0a06a7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -430,7 +346,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->stateInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a0
+    const v0, 0x7f0a06a6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -438,7 +354,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->postalCodeInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069b
+    const v0, 0x7f0a06a1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -446,7 +362,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->countryInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a069c
+    const v0, 0x7f0a06a2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -462,7 +378,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->toolbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02e2
+    const v0, 0x7f0a02e8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -470,7 +386,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->saveBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02e1
+    const v0, 0x7f0a02e7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -573,12 +489,6 @@
     return-void
 .end method
 
-.method public static synthetic caProvinces$annotations()V
-    .locals 0
-
-    return-void
-.end method
-
 .method private final deletePaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V
     .locals 12
 
@@ -701,6 +611,12 @@
     return-object v0
 .end method
 
+.method public static synthetic getCaProvinces$annotations()V
+    .locals 0
+
+    return-void
+.end method
+
 .method private final getCityInput()Lcom/google/android/material/textfield/TextInputLayout;
     .locals 3
 
@@ -1034,6 +950,12 @@
     return-object v0
 .end method
 
+.method public static synthetic getUsStates$annotations()V
+    .locals 0
+
+    return-void
+.end method
+
 .method private final initPaymentSourceInfo(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;)V
     .locals 11
 
@@ -1063,7 +985,7 @@
 
     const-string v3, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v3, v0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
 
@@ -1073,7 +995,7 @@
 
     if-eqz v3, :cond_0
 
-    const v3, 0x7f1210fd
+    const v3, 0x7f121128
 
     new-array v4, v10, [Ljava/lang/Object;
 
@@ -1088,7 +1010,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f1210fc
+    const v3, 0x7f121127
 
     invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1097,7 +1019,7 @@
     :goto_0
     const-string v4, "when (paymentSource) {\n \u2026edit_help_card)\n        }"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -1179,7 +1101,7 @@
 
     const-string v4, "states"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v4, v1
 
@@ -1198,7 +1120,7 @@
 
     move-result-object v8
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -1313,7 +1235,7 @@
 
     const-string v0, "CA"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1517,7 +1439,7 @@
 
     const-string v8, "CA"
 
-    invoke-static {p1, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1589,9 +1511,9 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f1210ff
+    const v2, 0x7f12112a
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1599,7 +1521,7 @@
 
     const-string v3, "getString(R.string.payme\u2026source_edit_select_state)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Ljava/util/ArrayList;
 
@@ -1654,11 +1576,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -1684,7 +1606,7 @@
 
     const-string v3, "getStatesFor(paymentSource)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v3, v2
 
@@ -1705,7 +1627,7 @@
 
     move-result-object v9
 
-    invoke-static {v9, v1, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v9, v1, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v9
 
@@ -1896,17 +1818,11 @@
     :cond_4
     const-string v1, "validationManager"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v7
 .end method
 
-.method public static synthetic usStates$annotations()V
-    .locals 0
-
-    return-void
-.end method
-
 
 # virtual methods
 .method public getContentViewResId()I
@@ -1922,53 +1838,55 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "error"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getErrorText()Landroid/widget/TextView;
 
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
+
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
+    const-string v2, "error.response"
 
-    move-result-object v2
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v3, "error.response"
+    invoke-virtual {v1}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v1
 
-    invoke-virtual {v2}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
+    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    move-result-object v2
+    iget-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->validationManager:Lcom/discord/utilities/view/validators/ValidationManager;
 
-    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    const/4 v1, 0x0
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->validationManager:Lcom/discord/utilities/view/validators/ValidationManager;
-
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
-    move-result-object v2
+    move-result-object v3
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
+    invoke-virtual {v3}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
 
-    move-result-object v2
+    move-result-object v3
 
     const-string v4, "error.response.messages"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/view/validators/ValidationManager;->setErrors(Ljava/util/Map;)Ljava/util/Collection;
+    invoke-virtual {v0, v3}, Lcom/discord/utilities/view/validators/ValidationManager;->setErrors(Ljava/util/Map;)Ljava/util/Collection;
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
 
@@ -1978,31 +1896,31 @@
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
-    move-result v1
+    move-result v0
 
     const/4 v2, 0x1
 
     const/4 v3, 0x0
 
-    if-lez v1, :cond_0
+    if-lez v0, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    if-ne v1, v2, :cond_1
+    if-ne v0, v2, :cond_1
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
     const/16 v2, 0x8
 
-    invoke-static {v1, p1, v3, v0, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v3, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_1
     return-void
@@ -2010,16 +1928,9 @@
     :cond_2
     const-string p1, "validationManager"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_3
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
 
 .method public onStart()V
@@ -2068,11 +1979,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -2080,53 +1991,55 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$Factory;
+    new-instance v1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$Factory;
 
-    invoke-direct {v2}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$Factory;-><init>()V
+    invoke-direct {v1}, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel$Factory;-><init>()V
 
-    invoke-direct {p1, v1, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct {p1, v0, v1}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    const-class v1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
+    const-class v0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(\n     \u2026ingViewModel::class.java)"
+    const-string v0, "ViewModelProvider(\n     \u2026ingViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
 
     iput-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->viewModel:Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p1}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p1
 
     sget-object v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1;
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2;
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v1, "filter { it is T }.map { it as T }"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$1;
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2134,13 +2047,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$onViewBound$2;-><init>(Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;)V
 
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v1, "viewModel\n        .obser\u2026ymentSourceId }\n        }"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -2154,7 +2067,7 @@
 
     const-string v1, "viewModel\n        .obser\u2026ffered()\n        .take(1)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -2193,14 +2106,7 @@
     :cond_0
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$Companion.smali
index dff0707fba..e6eec544f0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
+    const-class v0, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1.smali
index 9b4c794f4c..c2f2d5664e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBilling.kt"
 
 # interfaces
@@ -18,9 +18,9 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
-        "Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;",
+        "Landroidx/fragment/app/Fragment;",
         ">;"
     }
 .end annotation
@@ -48,14 +48,14 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke()Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
+.method public final invoke()Landroidx/fragment/app/Fragment;
     .locals 1
 
     new-instance v0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
@@ -68,7 +68,7 @@
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1;->invoke()Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1;->invoke()Landroidx/fragment/app/Fragment;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2.smali
index cb06aa27b5..e4c43e0777 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsBilling.kt"
 
 # interfaces
@@ -18,9 +18,9 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
-        "Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;",
+        "Landroidx/fragment/app/Fragment;",
         ">;"
     }
 .end annotation
@@ -48,14 +48,14 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke()Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;
+.method public final invoke()Landroidx/fragment/app/Fragment;
     .locals 1
 
     new-instance v0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;
@@ -68,7 +68,7 @@
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2;->invoke()Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;
+    invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2;->invoke()Landroidx/fragment/app/Fragment;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
index 0876eb3bfc..84d249bbf6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
@@ -29,25 +29,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;
+    const-string v2, "viewPager"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewPager"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,7 +61,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a088c
+    const v0, 0x7f0a0892
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -117,7 +111,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
@@ -133,9 +127,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 7
+    .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -151,64 +147,55 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
     new-array v2, v2, [Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const/4 v3, 0x0
+    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    new-instance v4, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
+    const v4, 0x7f1202ea
 
-    const v5, 0x7f1202ea
+    invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    move-result-object v4
 
-    move-result-object v5
+    const-string v5, "getString(R.string.billing_payment_sources)"
 
-    const-string v6, "getString(R.string.billing_payment_sources)"
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object v5, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1;
 
-    sget-object v6, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1;->INSTANCE:Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$1;
+    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 
-    invoke-direct {v4, v5, v6}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+    const/4 v4, 0x0
 
-    aput-object v4, v2, v3
+    aput-object v3, v2, v4
 
-    const/4 v3, 0x1
+    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    new-instance v4, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
+    const v4, 0x7f1202e4
 
-    const v5, 0x7f1202e4
+    invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    move-result-object v4
 
-    move-result-object v5
+    const-string v5, "getString(R.string.billing_payment_history)"
 
-    const-string v6, "getString(R.string.billing_payment_history)"
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object v5, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2;->INSTANCE:Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2;
 
-    sget-object v6, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2;->INSTANCE:Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$onViewBound$2;
+    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 
-    invoke-direct {v4, v5, v6}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+    const/4 v4, 0x1
 
-    aput-object v4, v2, v3
+    aput-object v3, v2, v4
 
     invoke-direct {v0, v1, v2}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;-><init>(Landroidx/fragment/app/FragmentManager;[Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali
index 935abfd92e..a989821dc6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPaymentHistory.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/net/Uri;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
index f093971f65..604863693f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
@@ -31,25 +31,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;
+    const-string v2, "webView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getWebView()Landroid/webkit/WebView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "webView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getWebView()Landroid/webkit/WebView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -69,7 +63,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0a7b
+    const v0, 0x7f0a0a80
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -123,9 +117,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -137,47 +131,49 @@
 
     move-result-object p1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p1, v1}, Landroid/webkit/WebSettings;->setJavaScriptEnabled(Z)V
+    invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setJavaScriptEnabled(Z)V
 
-    invoke-virtual {p1, v1}, Landroid/webkit/WebSettings;->setDomStorageEnabled(Z)V
+    invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setDomStorageEnabled(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;->getWebView()Landroid/webkit/WebView;
 
     move-result-object p1
 
-    new-instance v2, Landroid/webkit/WebViewClient;
+    new-instance v1, Landroid/webkit/WebViewClient;
 
-    invoke-direct {v2}, Landroid/webkit/WebViewClient;-><init>()V
+    invoke-direct {v1}, Landroid/webkit/WebViewClient;-><init>()V
 
-    invoke-virtual {p1, v2}, Landroid/webkit/WebView;->setWebViewClient(Landroid/webkit/WebViewClient;)V
+    invoke-virtual {p1, v1}, Landroid/webkit/WebView;->setWebViewClient(Landroid/webkit/WebViewClient;)V
 
     sget-object p1, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
 
-    const-string v2, "/billing/payments"
+    const-string v1, "/billing/payments"
 
-    invoke-static {v2}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
+    invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "Uri.parse(URL_ROUTE_PAYMENTS)"
+    const-string v2, "Uri.parse(URL_ROUTE_PAYMENTS)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1, v2}, Lcom/discord/utilities/auth/AuthUtils;->getBillingWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
+    invoke-virtual {p1, v1}, Lcom/discord/utilities/auth/AuthUtils;->getBillingWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
 
     move-result-object p1
 
+    const/4 v1, 0x0
+
     const/4 v2, 0x0
 
-    invoke-static {p1, v2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, v1, v0, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p0, v0, v1}, Lf/a/b/q;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
+    invoke-static {p0, v2, v0}, Lf/a/b/s;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -187,10 +183,14 @@
 
     const-string p1, "AuthUtils\n        .getBi\u2026AppTransformers.ui(this))"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;
 
+    new-instance v7, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2;-><init>(Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -199,10 +199,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory$onViewBound$2;-><init>(Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentHistory;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -210,11 +206,4 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali
index 9a6d2cdc4b..593ec8593a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPaymentMethods.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onAddClick"
+
+    const-string v5, "onAddClick()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onAddClick"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onAddClick()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali
index 1dfe78523c..3d72b04d8b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods$onViewBound$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPaymentMethods.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelPaymentSource;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onEditPaymentSource"
+
+    const-string v5, "onEditPaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onEditPaymentSource"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onEditPaymentSource(Lcom/discord/models/domain/ModelPaymentSource;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelPaymentSource;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;->access$onEditPaymentSource(Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;Lcom/discord/models/domain/ModelPaymentSource;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali
index 3296f9ef9b..c5b4bc13a7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/billing/WidgetSettingsPaymentMethods.smali
@@ -47,81 +47,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
+    const-string v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "viewFlipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
-    const/4 v2, 0x0
+    const-string v2, "recycler"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "recycler"
-
-    const-string v4, "getRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
+    const-string v2, "retryButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRetryButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "retryButton"
-
-    const-string v4, "getRetryButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
 
-    const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;
+    const-string v2, "emptyAddPaymentSourceBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptyAddPaymentSourceBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptyAddPaymentSourceBtn"
-
-    const-string v4, "getEmptyAddPaymentSourceBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -145,7 +121,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0697
+    const v0, 0x7f0a069d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +129,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0695
+    const v0, 0x7f0a069b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -161,7 +137,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0696
+    const v0, 0x7f0a069c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -169,7 +145,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/billing/WidgetSettingsPaymentMethods;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0690
+    const v0, 0x7f0a0696
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -192,7 +168,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -354,7 +330,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPaymentSource;->getId()Ljava/lang/String;
 
@@ -441,7 +417,7 @@
     :cond_0
     const-string p1, "recyclerAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -495,7 +471,7 @@
 
     const-string v1, "ViewModelProvider(\n     \u2026ingViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/billing/SettingsBillingViewModel;
 
@@ -503,7 +479,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -522,7 +498,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -532,7 +508,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -573,13 +551,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource.smali
index 4651b99dd2..513dec2103 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelPaymentSource;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSource"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;->paymentSource:Lcom/discord/models/domain/ModelPaymentSource;
 
     return-void
-
-    :cond_0
-    const-string p1, "paymentSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;Lcom/discord/models/domain/ModelPaymentSource;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelPaymentSource;)Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "paymentSource"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;-><init>(Lcom/discord/models/domain/ModelPaymentSource;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "paymentSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;->paymentSource:Lcom/discord/models/domain/ModelPaymentSource;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter.smali
index 22cda3b498..be325a088b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter.smali
@@ -52,11 +52,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,20 +73,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter;->observers:Ljava/util/HashSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final configurePaymentSourceItem(Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;Landroid/view/View;)Landroid/view/View;
@@ -98,7 +86,7 @@
 
     const-string v1, "view.findViewById(R.id.a\u2026method_spinner_item_text)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
@@ -130,7 +118,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter;->context:Landroid/content/Context;
 
-    const v2, 0x7f1210f4
+    const v2, 0x7f12111f
 
     const/4 v3, 0x1
 
@@ -187,7 +175,7 @@
 
     const-string v1, "view.findViewById(R.id.a\u2026method_spinner_item_text)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
@@ -247,7 +235,7 @@
 
     check-cast p1, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter;->configurePaymentSourceItem(Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$PaymentSource;Landroid/view/View;)Landroid/view/View;
 
@@ -258,13 +246,13 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AddPaymentSourceItem;->INSTANCE:Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AddPaymentSourceItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p1, 0x7f1202a3
 
@@ -281,13 +269,13 @@
     :cond_2
     sget-object v0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AttachPaymentSourceItem;->INSTANCE:Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AttachPaymentSourceItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p1, 0x7f120249
 
@@ -325,24 +313,17 @@
 .end method
 
 .method public getDropDownView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter;->getItemView(ILandroid/view/View;)Landroid/view/View;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getItem(I)Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem;
@@ -402,24 +383,17 @@
 .end method
 
 .method public getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
-    .locals 0
+    .locals 1
 
-    if-eqz p3, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter;->getItemView(ILandroid/view/View;)Landroid/view/View;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getViewTypeCount()I
@@ -470,7 +444,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/n/c/u;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
+    invoke-static {v0}, Lk0/o/c/v;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
 
     move-result-object v0
 
@@ -479,11 +453,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.collections.MutableCollection<T>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali
index 384f53dfc3..1fdff20335 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali
@@ -15,7 +15,7 @@
 .method private final configureView(Landroid/view/View;I)V
     .locals 13
 
-    const v0, 0x7f0a0707
+    const v0, 0x7f0a070d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -23,11 +23,11 @@
 
     const-string v1, "view.findViewById(R.id.premium_switch_page_logo)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/ImageView;
 
-    const v1, 0x7f0a0706
+    const v1, 0x7f0a070c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -35,11 +35,11 @@
 
     const-string v2, "view.findViewById(R.id.premium_switch_page_info)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f0a0709
+    const v2, 0x7f0a070f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,11 +47,11 @@
 
     const-string v3, "view.findViewById(R.id.premium_switch_page_wumpus)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Landroid/widget/ImageView;
 
-    const v3, 0x7f0a0708
+    const v3, 0x7f0a070e
 
     invoke-virtual {p1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -59,11 +59,11 @@
 
     const-string v4, "view.findViewById(R.id.p\u2026witch_page_monthly_price)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a0705
+    const v4, 0x7f0a070b
 
     invoke-virtual {p1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,7 +71,7 @@
 
     const-string v5, "view.findViewById(R.id.p\u2026m_switch_page_background)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -106,7 +106,7 @@
     goto/16 :goto_1
 
     :cond_1
-    const p2, 0x7f0804a8
+    const p2, 0x7f0804ab
 
     invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -130,7 +130,7 @@
 
     const-string v0, "view.resources.getQuanti\u2026NS_WITH_PREMIUM\n        )"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f120339
 
@@ -144,7 +144,7 @@
 
     invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0804b1
+    const p2, 0x7f0804b4
 
     invoke-virtual {v2, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -158,7 +158,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, v0}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -176,7 +176,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
@@ -195,7 +195,7 @@
     goto :goto_1
 
     :cond_2
-    const p2, 0x7f0804ab
+    const p2, 0x7f0804ae
 
     invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -207,7 +207,7 @@
 
     invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0804b2
+    const p2, 0x7f0804b5
 
     invoke-virtual {v2, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -221,7 +221,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, v0}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -239,7 +239,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
@@ -272,17 +272,17 @@
 
     const/4 v3, 0x4
 
-    invoke-static {p1, p3, v1, v2, v3}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {p1, p3, v1, v2, v3}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object p3
 
     const/4 v1, 0x6
 
-    invoke-static {p3, v0, v2, v2, v1}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+    invoke-static {p3, v0, v2, v2, v1}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
 
     move-result v3
 
-    invoke-static {p3, v0, v2, v2, v1}, Lj0/t/p;->lastIndexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+    invoke-static {p3, v0, v2, v2, v1}, Lk0/u/p;->lastIndexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
 
     move-result p3
 
@@ -323,31 +323,19 @@
 .method public destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V
     .locals 0
 
-    const/4 p2, 0x0
+    const-string p2, "container"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string p2, "view"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p3, Landroid/view/View;
 
     invoke-virtual {p1, p3}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_1
-    const-string p1, "container"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public getCount()I
@@ -361,7 +349,9 @@
 .method public instantiateItem(Landroid/view/ViewGroup;I)Landroid/view/View;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "container"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -381,22 +371,13 @@
 
     const-string v1, "view"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0, p2}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter;->configureView(Landroid/view/View;I)V
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "container"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic instantiateItem(Landroid/view/ViewGroup;I)Ljava/lang/Object;
@@ -412,11 +393,13 @@
 .method public isViewFromObject(Landroid/view/View;Ljava/lang/Object;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "any"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-ne p1, p2, :cond_0
 
@@ -429,18 +412,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "any"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1.smali
index a64a16455b..4d2f4f1e1d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PremiumSwitchPlanViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1;->this$0:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;->access$handleStoreState(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory$create$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory$create$1.smali
index 322dcf9b8e..1ece46d2a8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory$create$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory$create$1.smali
@@ -3,7 +3,7 @@
 .source "PremiumSwitchPlanViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
+        "Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -64,7 +66,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;-><init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory.smali
index 8326d31a14..f38c7b755f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory.smali
@@ -40,7 +40,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;
 
@@ -56,13 +58,13 @@
 
     sget-object v1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory$create$1;->INSTANCE:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Factory$create$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n            \u2026State(it)\n              }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -73,13 +75,4 @@
     invoke-direct {p1, v0, v1}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;-><init>(Lrx/Observable;Lcom/discord/stores/StoreSubscriptions;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState.smali
index 82a8520b68..80939629f5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState.smali
@@ -20,24 +20,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;->subscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;
@@ -70,22 +63,15 @@
 .method public final copy(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;-><init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +89,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;->subscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded.smali
index 2acf1d7684..054222f50d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded.smali
@@ -30,12 +30,16 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelSubscription;ILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
     .locals 1
 
+    const-string v0, "currentPremiumSubscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "currentIntervalSelected"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p3, :cond_1
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;->currentPremiumSubscription:Lcom/discord/models/domain/ModelSubscription;
@@ -59,20 +63,6 @@
     iput-boolean p1, p0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;->hasNoSelection:Z
 
     return-void
-
-    :cond_1
-    const-string p1, "currentIntervalSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "currentPremiumSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelSubscription;ILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -165,31 +155,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelSubscription;ILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "currentPremiumSubscription"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "currentIntervalSelected"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelSubscription;ILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "currentIntervalSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "currentPremiumSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -207,7 +185,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;->currentPremiumSubscription:Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -223,7 +201,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;->currentIntervalSelected:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -233,7 +211,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;->selectedPremiumTier:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel.smali
index a5b2aaaf4f..d4e38b50c5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/PremiumSwitchPlanViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "PremiumSwitchPlanViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState;",
         ">;"
     }
@@ -50,15 +50,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeSubscriptions"
 
-    sget-object v1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loading;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    sget-object v0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loading;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p2, p0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;->storeSubscriptions:Lcom/discord/stores/StoreSubscriptions;
 
@@ -74,14 +76,20 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p1, p0, p2, v0, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;
 
+    new-instance v7, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -90,10 +98,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -101,20 +105,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeSubscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$StoreState;)V
@@ -156,7 +146,7 @@
 
     sget-object p1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loading;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -167,7 +157,7 @@
 
     sget-object p1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Error;->INSTANCE:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Error;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -246,7 +236,7 @@
 
     invoke-direct {p1, v0, v2, v3, v1}, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelSubscription;ILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_5
     return-void
@@ -292,7 +282,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -302,7 +292,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -352,7 +342,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2
     return-void
@@ -363,24 +353,21 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
+    const-string v0, "interval"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     move-object v1, v0
 
     check-cast v1, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState$Loaded;
@@ -403,17 +390,10 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "interval"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onSelectClicked()V
@@ -421,7 +401,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -466,7 +446,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_1
 
@@ -589,7 +569,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -622,7 +602,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1.smali
index 6e793c7d2a..be350cf31a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SettingsPremiumViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;->this$0:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->access$handleStoreState(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange.smali
index 2458d148aa..066b4c52b6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange.smali
@@ -24,12 +24,16 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
     .locals 1
 
+    const-string v0, "targetPlanType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "currentPlanType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
@@ -37,20 +41,6 @@
     iput-object p2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;->currentPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     return-void
-
-    :cond_0
-    const-string p1, "currentPlanType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "targetPlanType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;
@@ -98,31 +88,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "targetPlanType"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "currentPlanType"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;-><init>(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "currentPlanType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "targetPlanType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +118,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +128,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$CancelPlanChange;->currentPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$UpgradePremium.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$UpgradePremium.smali
index bac9b39419..3f7ba4e2cb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$UpgradePremium.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$UpgradePremium.smali
@@ -117,7 +117,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$UpgradePremium;->targetPlanType:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$1.smali
index 1f12ff5e50..39159cbb35 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$1.smali
@@ -3,7 +3,7 @@
 .source "SettingsPremiumViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/billing/ModelInvoicePreview;",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$2.smali
index dbbdb05137..98f2f72c28 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$2.smali
@@ -3,7 +3,7 @@
 .source "SettingsPremiumViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Throwable;",
         "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;",
         ">;"
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$1.smali
index f6c20a32da..efe4de0592 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "SettingsPremiumViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;",
+        ">;>;"
     }
 .end annotation
 
@@ -73,6 +75,7 @@
             "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;",
             ">;"
         }
@@ -84,7 +87,7 @@
 
     const-string v2, "state"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, v1, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory;->access$getSubscriptionsAndInvoicePreview(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$2.smali
index e14c18907b..0cbcdda078 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$2.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;",
+        "Lcom/discord/stores/StoreEntitlements$State;",
+        "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
+        "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -70,7 +75,7 @@
 
     const-string v0, "paymentSourcesState"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;->getSubscriptionsState()Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
@@ -78,11 +83,11 @@
 
     const-string v0, "entitlementsState"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "guildSubscriptionState"
 
-    invoke-static {p4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;->getInvoicePreviewFetch()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory.smali
index f24af3c742..3d75b2881e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory.smali
@@ -62,7 +62,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v0}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -98,7 +98,7 @@
 
     invoke-direct {v0, p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$1;-><init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -106,13 +106,13 @@
 
     invoke-direct {v0, p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$getSubscriptionsAndInvoicePreview$2;-><init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->K(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "restAPI\n              .g\u2026ch.Error)\n              }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -125,22 +125,22 @@
 
     invoke-direct {p1, p2, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;-><init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;)V
 
-    new-instance p2, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {p2, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(\n       \u2026ce(null))\n              )"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p2
 
     :cond_1
-    sget-object p1, Lr0/l/a/g;->e:Lrx/Observable;
+    sget-object p1, Ls0/l/a/g;->e:Lrx/Observable;
 
     const-string p2, "Observable.never()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -174,7 +174,7 @@
 
     invoke-direct {v0, p0, p5}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory$observeStores$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory;Lcom/discord/utilities/rest/RestAPI;)V
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -198,7 +198,7 @@
 
     const-string p2, "Observable\n          .co\u2026            )\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -206,7 +206,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 11
+    .locals 12
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -217,7 +217,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
@@ -225,80 +227,71 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPaymentSources()Lcom/discord/stores/StorePaymentSources;
 
-    move-result-object v1
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
-
     move-result-object v2
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getEntitlements()Lcom/discord/stores/StoreEntitlements;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
 
     move-result-object v3
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getEntitlements()Lcom/discord/stores/StoreEntitlements;
 
     move-result-object v4
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPaymentSources()Lcom/discord/stores/StorePaymentSources;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
-    move-result-object v6
+    move-result-object v5
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPaymentSources()Lcom/discord/stores/StorePaymentSources;
 
     move-result-object v7
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getEntitlements()Lcom/discord/stores/StoreEntitlements;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
 
     move-result-object v8
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getEntitlements()Lcom/discord/stores/StoreEntitlements;
 
     move-result-object v9
 
-    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
     move-result-object v10
 
-    move-object v5, p0
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-direct/range {v5 .. v10}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory;->observeStores(Lcom/discord/stores/StorePaymentSources;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StoreEntitlements;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;)Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v6
+    move-result-object v11
+
+    move-object v6, p0
+
+    invoke-direct/range {v6 .. v11}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Factory;->observeStores(Lcom/discord/stores/StorePaymentSources;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StoreEntitlements;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;)Lrx/Observable;
+
+    move-result-object v7
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v5
+    move-result-object v6
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;-><init>(Lcom/discord/stores/StorePaymentSources;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StoreEntitlements;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;-><init>(Lcom/discord/stores/StorePaymentSources;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StoreEntitlements;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch$Invoice.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch$Invoice.smali
index 851efbf88b..242ec27841 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch$Invoice.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch$Invoice.smali
@@ -83,7 +83,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch$Invoice;->modelInvoicePreview:Lcom/discord/models/domain/billing/ModelInvoicePreview;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState.smali
index 099a27934d..619d094a8d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState.smali
@@ -30,17 +30,25 @@
 .method public constructor <init>(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSourcesState"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "subscriptionsState"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "entitlementState"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildSubscriptionState"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "invoicePreviewFetch"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,41 +63,6 @@
     iput-object p5, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;->invoicePreviewFetch:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;
 
     return-void
-
-    :cond_0
-    const-string p1, "invoicePreviewFetch"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "entitlementState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "subscriptionsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "paymentSourcesState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;
@@ -202,17 +175,25 @@
 .method public final copy(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSourcesState"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "subscriptionsState"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "entitlementState"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildSubscriptionState"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "invoicePreviewFetch"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;
 
@@ -231,41 +212,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;-><init>(Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "invoicePreviewFetch"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "entitlementState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "subscriptionsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "paymentSourcesState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -283,7 +229,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;->paymentSourcesState:Lcom/discord/stores/StorePaymentSources$PaymentSourcesState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -293,7 +239,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;->subscriptionsState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -303,7 +249,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -313,7 +259,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;->guildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -323,7 +269,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$StoreState;->invoicePreviewFetch:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice.smali
index da3accbeeb..e37028ab28 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "subscriptionsState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "invoicePreviewFetch"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;->invoicePreviewFetch:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;
 
     return-void
-
-    :cond_0
-    const-string p1, "invoicePreviewFetch"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscriptionsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;
@@ -98,31 +86,19 @@
 .method public final copy(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "subscriptionsState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "invoicePreviewFetch"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;-><init>(Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "invoicePreviewFetch"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "subscriptionsState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;->subscriptionsState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionAndInvoice;->invoicePreviewFetch:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$InvoicePreviewFetch;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded.smali
index 944762ff0f..75693825ad 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded.smali
@@ -81,14 +81,20 @@
         }
     .end annotation
 
+    const-string v0, "paymentSources"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "entitlements"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildSubscriptions"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p2, :cond_2
-
-    if-eqz p5, :cond_1
-
-    if-eqz p6, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
@@ -108,27 +114,6 @@
     iput-object p8, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->invoicePreview:Lcom/discord/models/domain/billing/ModelInvoicePreview;
 
     return-void
-
-    :cond_0
-    const-string p1, "guildSubscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "entitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "paymentSources"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;Ljava/util/List;Ljava/util/Map;ZLcom/discord/models/domain/billing/ModelInvoicePreview;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
@@ -372,13 +357,23 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSources"
 
-    if-eqz p2, :cond_2
+    move-object v3, p2
 
-    if-eqz p5, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "entitlements"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildSubscriptions"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
@@ -386,16 +381,10 @@
 
     move-object v2, p1
 
-    move-object v3, p2
-
     move v4, p3
 
     move-object v5, p4
 
-    move-object v6, p5
-
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
     move-object/from16 v9, p8
@@ -403,27 +392,6 @@
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelSubscription;Ljava/util/List;ZLcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;Ljava/util/List;Ljava/util/Map;ZLcom/discord/models/domain/billing/ModelInvoicePreview;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "guildSubscriptions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "entitlements"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "paymentSources"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -441,7 +409,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->premiumSubscription:Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -451,7 +419,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->paymentSources:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -467,7 +435,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->subscriptionError:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -477,7 +445,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->entitlements:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -487,7 +455,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->guildSubscriptions:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -503,7 +471,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->invoicePreview:Lcom/discord/models/domain/billing/ModelInvoicePreview;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali
index 25ab552f8d..5888c3756d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "SettingsPremiumViewModel.kt"
 
 
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
         ">;"
     }
@@ -61,7 +61,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StorePaymentSources;Lcom/discord/stores/StoreSubscriptions;Lcom/discord/stores/StoreEntitlements;Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
-    .locals 16
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -76,133 +76,91 @@
         }
     .end annotation
 
-    move-object/from16 v0, p0
+    const-string v0, "storePaymentsSources"
 
-    move-object/from16 v1, p1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v2, p2
+    const-string v0, "storeSubscriptions"
 
-    move-object/from16 v3, p3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v4, p4
+    const-string v0, "storeEntitlements"
 
-    move-object/from16 v5, p5
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v6, 0x0
+    const-string v0, "storePremiumGuildSubscription"
 
-    if-eqz v1, :cond_5
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_4
+    const-string v0, "restAPI"
 
-    if-eqz v3, :cond_3
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_2
+    const-string v0, "storeObservable"
 
-    if-eqz v5, :cond_1
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    sget-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
 
-    sget-object v7, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loading;
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
-    invoke-direct {v0, v7}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storePaymentsSources:Lcom/discord/stores/StorePaymentSources;
 
-    iput-object v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storePaymentsSources:Lcom/discord/stores/StorePaymentSources;
+    iput-object p2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storeSubscriptions:Lcom/discord/stores/StoreSubscriptions;
 
-    iput-object v2, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storeSubscriptions:Lcom/discord/stores/StoreSubscriptions;
+    iput-object p3, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storeEntitlements:Lcom/discord/stores/StoreEntitlements;
 
-    iput-object v3, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storeEntitlements:Lcom/discord/stores/StoreEntitlements;
+    iput-object p4, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storePremiumGuildSubscription:Lcom/discord/stores/StorePremiumGuildSubscription;
 
-    iput-object v4, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->storePremiumGuildSubscription:Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    iput-object v5, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    iput-object p5, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
     invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
 
-    move-result-object v1
+    move-result-object p1
 
-    iput-object v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
 
     invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
 
-    move-result-object v1
+    move-result-object p1
 
-    iput-object v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->fetchData()V
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->fetchData()V
 
-    invoke-static/range {p6 .. p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+    invoke-static {p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object p1
 
-    const/4 v2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {v1, v0, v6, v2, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v7
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v8, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
+    move-result-object v0
 
-    const/4 v9, 0x0
+    const-class v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
-    const/4 v10, 0x0
+    new-instance v6, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
 
-    const/4 v11, 0x0
+    invoke-direct {v6, p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
 
-    const/4 v12, 0x0
+    const/4 v2, 0x0
 
-    new-instance v13, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;
+    const/4 v3, 0x0
 
-    invoke-direct {v13, v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
+    const/4 v4, 0x0
 
-    const/16 v14, 0x1e
+    const/4 v5, 0x0
 
-    const/4 v15, 0x0
+    const/16 v7, 0x1e
 
-    invoke-static/range {v7 .. v15}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "storeObservable"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string v1, "restAPI"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string v1, "storePremiumGuildSubscription"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string v1, "storeEntitlements"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_4
-    const-string v1, "storeSubscriptions"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_5
-    const-string v1, "storePaymentsSources"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public static final synthetic access$fetchData(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;)V
@@ -458,7 +416,7 @@
     goto :goto_3
 
     :cond_4
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_3
     move-object v13, v0
@@ -512,7 +470,7 @@
     :goto_5
     move-object/from16 v0, p0
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -520,7 +478,7 @@
 .method private final markBusy()V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -561,7 +519,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -570,7 +528,7 @@
 .method private final onCancelError()V
     .locals 3
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -585,7 +543,7 @@
 
     new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$ErrorToast;
 
-    const v2, 0x7f121153
+    const v2, 0x7f12117e
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$ErrorToast;-><init>(I)V
 
@@ -599,7 +557,7 @@
 .method private final onChangePaymentSourceError()V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -640,7 +598,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -649,7 +607,7 @@
 .method private final onChangePlanError()V
     .locals 3
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -664,7 +622,7 @@
 
     new-instance v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$ErrorToast;
 
-    const v2, 0x7f121153
+    const v2, 0x7f12117e
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$ErrorToast;-><init>(I)V
 
@@ -680,7 +638,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -705,7 +663,7 @@
 .method private final onResubscribeError()V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -746,7 +704,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -757,7 +715,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -794,7 +752,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -888,7 +846,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -956,38 +914,40 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "paymentSource"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    instance-of v2, v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
-    if-nez v2, :cond_0
+    const/4 v2, 0x0
 
-    move-object v1, v0
+    if-nez v1, :cond_0
+
+    move-object v0, v2
 
     :cond_0
-    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->markBusy()V
 
-    iget-object v2, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    iget-object v1, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getId()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     new-instance v10, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;
 
@@ -1009,21 +969,21 @@
 
     invoke-direct/range {v3 .. v9}, Lcom/discord/restapi/RestAPIParams$UpdateSubscription;-><init>(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-virtual {v2, v1, v10}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
+    invoke-virtual {v1, v0, v10}, Lcom/discord/utilities/rest/RestAPI;->updateSubscription(Ljava/lang/String;Lcom/discord/restapi/RestAPIParams$UpdateSubscription;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v2, v0, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1039,13 +999,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "paymentSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getEventSubject()Lrx/Observable;
@@ -1066,7 +1019,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1097,7 +1050,7 @@
 
     const-string v1, "requestBuyPlanSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1147,37 +1100,39 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "requestedPlanType"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    move-object v1, v0
-
-    :cond_0
-    check-cast v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-eqz v1, :cond_5
-
-    invoke-virtual {v1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object v0, v2
+
+    :cond_0
+    check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-eqz v0, :cond_5
+
+    invoke-virtual {v0}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    move-result-object v2
+
     :cond_1
-    if-nez v0, :cond_2
+    if-nez v2, :cond_2
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->requestBuyPlanSubject:Lrx/subjects/PublishSubject;
 
@@ -1188,16 +1143,16 @@
     goto :goto_0
 
     :cond_2
-    if-ne p1, v0, :cond_3
+    if-ne p1, v2, :cond_3
 
     goto :goto_0
 
     :cond_3
     invoke-static {}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getUPGRADE_ELIGIBILITY()Ljava/util/Map;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1223,13 +1178,6 @@
     :cond_5
     :goto_0
     return-void
-
-    :cond_6
-    const-string p1, "requestedPlanType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onRetryClicked()V
@@ -1247,7 +1195,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1360,24 +1308,21 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
+    const-string v0, "targetPlanType"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_1
@@ -1404,11 +1349,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "targetPlanType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$Companion.smali
index 791ee3d407..fb27e2e893 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
index 5b83cfd785..2b93b2fec2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
index de38e855a6..94696acff4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,57 +61,59 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "giftCode"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
 
     const-string v2, "clipboard"
 
-    invoke-virtual {v1, v2}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {v0, v2}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
-    instance-of v2, v1, Landroid/content/ClipboardManager;
+    instance-of v2, v0, Landroid/content/ClipboardManager;
 
     if-nez v2, :cond_1
 
     goto :goto_1
 
     :cond_1
-    move-object v0, v1
+    move-object v1, v0
 
     :goto_1
-    check-cast v0, Landroid/content/ClipboardManager;
+    check-cast v1, Landroid/content/ClipboardManager;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    sget-object v1, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
+    sget-object v0, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
 
-    invoke-virtual {v1, p1}, Lcom/discord/utilities/gifting/GiftingUtils;->generateGiftUrl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/gifting/GiftingUtils;->generateGiftUrl(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, ""
 
-    invoke-static {v2, v1}, Landroid/content/ClipData;->newPlainText(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Landroid/content/ClipData;
+    invoke-static {v2, v0}, Landroid/content/ClipData;->newPlainText(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Landroid/content/ClipData;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v0, v1}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
+    invoke-virtual {v1, v0}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
 
     :cond_2
     iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
@@ -123,11 +125,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->handleCopyClicked(Ljava/lang/String;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
index 8faa4e2465..c3e506f1bb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGift;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGift;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "gift"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -82,13 +84,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreGifting;->revokeGiftCode(Lcom/discord/models/domain/ModelGift;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "gift"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
index b65a00884a..f5659fbe14 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
index 5290331992..7f0c486cf0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/widget/TextView;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
@@ -73,15 +75,15 @@
 
     move-result-object p1
 
-    const/4 v0, 0x0
+    const-string v0, "https://discord.gift/"
 
-    const/4 v1, 0x4
+    const-string v1, ""
 
-    const-string v2, "https://discord.gift/"
+    const/4 v2, 0x0
 
-    const-string v3, ""
+    const/4 v3, 0x4
 
-    invoke-static {p1, v2, v3, v0, v1}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {p1, v0, v1, v2, v3}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object p1
 
@@ -94,13 +96,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->redeemGiftCode(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
index 3295d242a8..1a66c4b6a6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,11 +77,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    const/4 p3, 0x0
+    const-string p3, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p3, "<anonymous parameter 1>"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
@@ -94,18 +96,4 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
index 18e17df1c1..29f3cebd77 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,11 +77,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    const/4 p3, 0x0
+    const-string p3, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p3, "<anonymous parameter 1>"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
@@ -94,18 +96,4 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali
index 659ae29f09..18ee2d0801 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->access$configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
index 0ee921e16f..0aaea3358c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGifting.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,24 +71,17 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "giftCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lf/a/a/z/a;->k:Lf/a/a/z/a$a;
 
-    const-wide/16 v1, 0x0
+    const-string v1, "Settings - Gifting"
 
-    const-string v3, "Settings - Gifting"
+    const-wide/16 v2, 0x0
 
-    invoke-virtual {v0, p1, v3, v1, v2}, Lf/a/a/z/a$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-virtual {v0, p1, v1, v2, v3}, Lf/a/a/z/a$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
index fbe7e1b860..cc06ff0e7f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
@@ -61,221 +61,155 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "retry"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRetry()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "retry"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRetry()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const/4 v2, 0x0
+    const-string v2, "flipper"
 
-    aput-object v1, v0, v2
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "flipper"
-
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "recyclerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "recyclerView"
-
-    const-string v4, "getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "codeInputWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "codeInputWrap"
-
-    const-string v4, "getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "codeInputProgress"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCodeInputProgress()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "codeInputProgress"
-
-    const-string v4, "getCodeInputProgress()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "buyNitroYearly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyNitroYearly()Lcom/discord/views/BoxedButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyNitroYearly"
-
-    const-string v4, "getBuyNitroYearly()Lcom/discord/views/BoxedButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "buyNitroMonthly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyNitroMonthly()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyNitroMonthly"
-
-    const-string v4, "getBuyNitroMonthly()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "nitroLearnMore"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNitroLearnMore()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nitroLearnMore"
-
-    const-string v4, "getNitroLearnMore()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "buyNitroClassicYearly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyNitroClassicYearly()Lcom/discord/views/BoxedButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyNitroClassicYearly"
-
-    const-string v4, "getBuyNitroClassicYearly()Lcom/discord/views/BoxedButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "buyNitroClassicMonthly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyNitroClassicMonthly()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyNitroClassicMonthly"
-
-    const-string v4, "getBuyNitroClassicMonthly()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+    const-string v2, "nitroClassicLearnMore"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNitroClassicLearnMore()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nitroClassicLearnMore"
-
-    const-string v4, "getNitroClassicLearnMore()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
@@ -299,7 +233,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a08b6
+    const v0, 0x7f0a08bc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -307,7 +241,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08ad
+    const v0, 0x7f0a08b3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -315,7 +249,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08b7
+    const v0, 0x7f0a08bd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -323,7 +257,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08af
+    const v0, 0x7f0a08b5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -331,7 +265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08ae
+    const v0, 0x7f0a08b4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -339,7 +273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08b5
+    const v0, 0x7f0a08bb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -347,7 +281,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08b4
+    const v0, 0x7f0a08ba
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -355,7 +289,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08b3
+    const v0, 0x7f0a08b9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -363,7 +297,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->nitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08b2
+    const v0, 0x7f0a08b8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -371,7 +305,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08b1
+    const v0, 0x7f0a08b7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -379,7 +313,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08b0
+    const v0, 0x7f0a08b6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -420,7 +354,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -599,7 +533,7 @@
     :cond_7
     const-string p1, "adapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 .end method
@@ -709,7 +643,7 @@
 
     if-eqz v2, :cond_2
 
-    invoke-static {v2}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v2}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -749,7 +683,7 @@
     const/4 v5, 0x0
 
     :goto_1
-    invoke-static {v4, v5}, Lj0/i/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    invoke-static {v4, v5}, Lk0/j/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -769,19 +703,15 @@
 
     move-result v5
 
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
-
     goto :goto_2
 
     :cond_4
-    invoke-static/range {v17 .. v17}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
+    const/4 v5, 0x0
 
     :goto_2
-    move-object v11, v5
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v11
 
     invoke-static {v4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -966,7 +896,7 @@
 
     move-result-object v10
 
-    invoke-static {v5, v10}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -1320,7 +1250,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/premium/PremiumUtils;->warmupBillingTabs(Landroid/content/Context;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
 
@@ -1336,17 +1266,21 @@
 
     move-object/from16 v0, p0
 
-    const/4 v1, 0x0
+    const-string v1, "view"
 
-    if-eqz p1, :cond_0
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    invoke-static {v0, v2, v3, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getRetry()Landroid/view/View;
 
@@ -1364,7 +1298,7 @@
 
     invoke-direct {v5, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
-    invoke-static {v4, v2, v5, v3, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
+    invoke-static {v4, v1, v5, v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getCodeInputWrap()Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -1390,7 +1324,7 @@
 
     move-result-object v4
 
-    new-array v5, v3, [Ljava/lang/Object;
+    new-array v5, v2, [Ljava/lang/Object;
 
     sget-object v6, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -1404,13 +1338,13 @@
 
     const-string v8, "requireContext()"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v6, v7}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
     move-result-object v6
 
-    aput-object v6, v5, v2
+    aput-object v6, v5, v1
 
     const v6, 0x7f1202f2
 
@@ -1434,7 +1368,7 @@
 
     move-result-object v4
 
-    new-array v5, v3, [Ljava/lang/Object;
+    new-array v5, v2, [Ljava/lang/Object;
 
     sget-object v7, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -1446,13 +1380,13 @@
 
     move-result-object v9
 
-    invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v7, v9}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
     move-result-object v7
 
-    aput-object v7, v5, v2
+    aput-object v7, v5, v1
 
     const v7, 0x7f1202f1
 
@@ -1476,7 +1410,7 @@
 
     move-result-object v4
 
-    new-array v5, v3, [Ljava/lang/Object;
+    new-array v5, v2, [Ljava/lang/Object;
 
     sget-object v9, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -1488,13 +1422,13 @@
 
     move-result-object v10
 
-    invoke-static {v10, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v9, v10}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
     move-result-object v9
 
-    aput-object v9, v5, v2
+    aput-object v9, v5, v1
 
     invoke-virtual {v0, v6, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1516,7 +1450,7 @@
 
     move-result-object v4
 
-    new-array v3, v3, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
     sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -1528,41 +1462,41 @@
 
     move-result-object v6
 
-    invoke-static {v6, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v5, v6}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
     move-result-object v5
 
-    aput-object v5, v3, v2
+    aput-object v5, v2, v1
 
-    invoke-virtual {v0, v7, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v7, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v4, v3}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v4, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getBuyNitroClassicMonthly()Landroid/widget/Button;
 
-    move-result-object v3
+    move-result-object v2
 
     new-instance v4, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6;
 
     invoke-direct {v4, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$6;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;)V
 
-    invoke-virtual {v3, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v2, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getNitroLearnMore()Landroid/widget/TextView;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v9
 
-    invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f12122d
+    const v4, 0x7f121258
 
     invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1570,7 +1504,7 @@
 
     const-string v5, "getString(R.string.premi\u2026ayment_gift_blurb_mobile)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v6, "onClick"
 
@@ -1578,7 +1512,7 @@
 
     const/4 v15, 0x4
 
-    invoke-static {v4, v6, v7, v2, v15}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v4, v6, v7, v1, v15}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v10
 
@@ -1600,29 +1534,29 @@
 
     move-result-object v4
 
-    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getNitroClassicLearnMore()Landroid/widget/TextView;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v9
 
-    invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f121171
+    const v4, 0x7f12119c
 
     invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v5, "https://discordapp.com"
 
-    invoke-static {v4, v6, v5, v2, v7}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {v4, v6, v5, v1, v7}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v10
 
@@ -1634,9 +1568,9 @@
 
     move-result-object v4
 
-    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object v3, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+    sget-object v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
     new-instance v4, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
@@ -1646,34 +1580,27 @@
 
     invoke-direct {v4, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
-    invoke-virtual {v3, v4}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {v2, v4}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
+    check-cast v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
-    iput-object v3, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
+    iput-object v2, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->adapter:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3, v1}, Landroidx/recyclerview/widget/RecyclerView;->setItemAnimator(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;)V
+    invoke-virtual {v2, v3}, Landroidx/recyclerview/widget/RecyclerView;->setItemAnimator(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getRecyclerView()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1, v2}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+    invoke-virtual {v2, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     return-void
-
-    :cond_0
-    const-string v2, "view"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1701,7 +1628,7 @@
 
     const-string v1, "ViewModelProvider(requir\u2026ingViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
@@ -1713,7 +1640,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1723,7 +1650,7 @@
 
     const-string v3, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -1760,12 +1687,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali
index a44810c4a9..b357d126d3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/content/Context;",
         "Ljava/lang/String;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,11 +71,13 @@
 .method public final invoke(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    const/4 p3, 0x0
+    const-string p3, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
 
@@ -96,18 +98,4 @@
     invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
index 6e853bdc9e..bfab8af41c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
@@ -59,7 +59,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;
 
@@ -67,149 +67,101 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "flipper"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "flipper"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "container"
 
-    const/4 v3, 0x0
+    const-string v3, "getContainer()Landroid/view/View;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "container"
-
-    const-string v5, "getContainer()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "code"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCode()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "code"
-
-    const-string v5, "getCode()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "codeContainer"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCodeContainer()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "codeContainer"
-
-    const-string v5, "getCodeContainer()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "copy"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCopy()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "copy"
-
-    const-string v5, "getCopy()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "revokeText"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRevokeText()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "revokeText"
-
-    const-string v5, "getRevokeText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "generate"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGenerate()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "generate"
-
-    const-string v5, "getGenerate()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "divider"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDivider()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "divider"
+    const/4 v2, 0x7
 
-    const-string v4, "getDivider()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x7
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -227,13 +179,15 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d010a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0401
+    const p1, 0x7f0a0407
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +195,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fe
+    const p1, 0x7f0a0404
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +203,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fc
+    const p1, 0x7f0a0402
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +211,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->code$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fd
+    const p1, 0x7f0a0403
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -265,7 +219,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->codeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ff
+    const p1, 0x7f0a0405
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -273,7 +227,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0403
+    const p1, 0x7f0a0409
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -281,7 +235,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->revokeText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0402
+    const p1, 0x7f0a0408
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -289,7 +243,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->generate$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0400
+    const p1, 0x7f0a0406
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -298,15 +252,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->divider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
@@ -484,9 +429,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_9
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -494,31 +439,31 @@
 
     move-result-object p1
 
-    sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const-string v2, "itemView"
+    const-string v1, "itemView"
 
     if-eqz p1, :cond_0
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object p2
 
-    iput v1, p2, Landroid/view/ViewGroup$LayoutParams;->height:I
+    iput v0, p2, Landroid/view/ViewGroup$LayoutParams;->height:I
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
@@ -527,29 +472,29 @@
     :cond_0
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v3
+    move-result-object v2
 
-    const/4 v4, -0x2
+    const/4 v3, -0x2
 
-    iput v4, v3, Landroid/view/ViewGroup$LayoutParams;->height:I
+    iput v3, v2, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    invoke-virtual {p1, v3}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getEntitlement()Lcom/discord/models/domain/ModelEntitlement;
 
@@ -570,6 +515,8 @@
 
     move-result-object p1
 
+    const/4 v9, 0x0
+
     const/4 v10, 0x2
 
     const/4 v11, 0x1
@@ -580,213 +527,213 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getWasCopied()Ljava/lang/Boolean;
 
     move-result-object p1
 
-    sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v3, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
 
-    move-result-object v4
+    move-result-object v3
 
     if-eqz p1, :cond_2
 
-    const v5, 0x7f0800ca
+    const v4, 0x7f0800ca
 
     goto :goto_0
 
     :cond_2
-    const v5, 0x7f0800c9
+    const v4, 0x7f0800c9
 
     :goto_0
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setBackgroundResource(I)V
+    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
 
+    move-result-object v3
+
+    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v4}, Landroid/view/View;->getContext()Landroid/content/Context;
+
     move-result-object v4
 
-    iget-object v5, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {v5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v5
-
     if-eqz p1, :cond_3
 
-    const v6, 0x7f1204d1
+    const v5, 0x7f1204d3
 
     goto :goto_1
 
     :cond_3
-    const v6, 0x7f1204d3
+    const v5, 0x7f1204d5
 
     :goto_1
-    invoke-virtual {v5, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCodeContainer()Landroid/view/View;
+    invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v4
 
-    const-string v5, "context"
+    invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCodeContainer()Landroid/view/View;
+
+    move-result-object v3
+
+    const-string v4, "context"
 
     if-eqz p1, :cond_4
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p1, 0x7f040252
 
-    invoke-static {v3, p1, v1, v10, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v2, p1, v0, v10, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result p1
 
     goto :goto_2
 
     :cond_4
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const p1, 0x7f040422
 
-    invoke-static {v3, p1, v1, v10, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v2, p1, v0, v10, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result p1
 
     :goto_2
-    invoke-virtual {v4, p1}, Landroid/view/View;->setBackgroundResource(I)V
+    invoke-virtual {v3, p1}, Landroid/view/View;->setBackgroundResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCopy()Landroid/widget/TextView;
 
     move-result-object p1
 
-    new-instance v4, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;
+    new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;
 
-    invoke-direct {v4, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+    invoke-direct {v3, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
 
-    invoke-virtual {p1, v4}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     sget-object p1, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
-    move-result-object v5
+    move-result-object v4
 
-    invoke-interface {v5}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
-
-    move-result-wide v5
-
-    invoke-virtual {v4, v5, v6}, Lcom/discord/models/domain/ModelGift;->getExpiresDiff(J)J
+    invoke-interface {v4}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
     move-result-wide v4
 
-    invoke-virtual {v3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+    invoke-virtual {v3, v4, v5}, Lcom/discord/models/domain/ModelGift;->getExpiresDiff(J)J
 
-    move-result-object v6
+    move-result-wide v3
 
-    const-string v7, "context.resources"
+    invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v5
 
-    invoke-virtual {p1, v4, v5, v6}, Lcom/discord/utilities/gifting/GiftingUtils;->getTimeString(JLandroid/content/res/Resources;)Ljava/lang/String;
+    const-string v6, "context.resources"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, v3, v4, v5}, Lcom/discord/utilities/gifting/GiftingUtils;->getTimeString(JLandroid/content/res/Resources;)Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v4}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v3}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v4
+    move-result-object v3
 
-    const v5, 0x7f1208bb
+    const v4, 0x7f1208bd
 
-    new-array v6, v11, [Ljava/lang/Object;
+    new-array v5, v11, [Ljava/lang/Object;
 
-    aput-object p1, v6, v1
+    aput-object p1, v5, v0
 
-    invoke-virtual {v4, v5, v6}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v4, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    const-string v4, "itemView.context\n       \u2026_mobile, expiresInString)"
+    const-string v3, "itemView.context\n       \u2026_mobile, expiresInString)"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v4, "revokeHook"
+    const-string v3, "revokeHook"
 
-    const-string v5, "https://www.discord.com"
+    const-string v4, "https://www.discord.com"
 
-    const/4 v6, 0x4
+    const/4 v5, 0x4
 
-    invoke-static {p1, v4, v5, v1, v6}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {p1, v3, v4, v0, v5}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object p1
 
-    const-string v4, "$["
+    const-string v3, "$["
 
-    const-string v5, "["
+    const-string v4, "["
 
-    invoke-static {p1, v4, v5, v1, v6}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {p1, v3, v4, v0, v5}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getRevokeText()Landroid/widget/TextView;
 
     move-result-object p1
 
-    new-instance v5, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;
+    new-instance v4, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;
 
-    invoke-direct {v5, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+    invoke-direct {v4, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+
+    const/4 v5, 0x0
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/16 v7, 0x18
 
-    const/16 v8, 0x18
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
+    move-result-object v2
 
-    move-result-object v3
-
-    invoke-virtual {p1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getCode()Landroid/widget/TextView;
 
     move-result-object p1
 
-    sget-object v3, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
+    sget-object v2, Lcom/discord/utilities/gifting/GiftingUtils;->INSTANCE:Lcom/discord/utilities/gifting/GiftingUtils;
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getGift()Lcom/discord/models/domain/ModelGift;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {v3, v4}, Lcom/discord/utilities/gifting/GiftingUtils;->generateGiftUrl(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelGift;->getCode()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {p1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v3}, Lcom/discord/utilities/gifting/GiftingUtils;->generateGiftUrl(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     goto :goto_3
 
@@ -801,11 +748,11 @@
 
     move-result-object p1
 
-    new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;
 
-    invoke-direct {v3, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
+    invoke-direct {v2, p0, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$5;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
 
-    invoke-virtual {p1, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :goto_3
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->getDivider()Landroid/view/View;
@@ -814,25 +761,25 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v3}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v3
+    move-result v2
 
-    xor-int/2addr v3, v11
+    xor-int/2addr v2, v11
 
-    if-eqz v3, :cond_6
+    if-eqz v2, :cond_6
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     goto :goto_4
 
     :cond_6
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
     :goto_4
-    invoke-virtual {p1, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem()Ljava/lang/Boolean;
 
@@ -850,19 +797,19 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p2
 
-    const-string v2, "itemView.context"
+    const-string v1, "itemView.context"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f04041f
+    const v1, 0x7f04041f
 
-    invoke-static {p2, v2, v1, v10, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {p2, v1, v0, v10, v9}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result p2
 
@@ -877,7 +824,7 @@
 
     iget-object p2, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -894,13 +841,6 @@
     :cond_8
     :goto_5
     return-void
-
-    :cond_9
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem.smali
index cb1fc5b9a4..98d38874b7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem.smali
@@ -485,7 +485,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->gift:Lcom/discord/models/domain/ModelGift;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -495,7 +495,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->entitlement:Lcom/discord/models/domain/ModelEntitlement;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -505,7 +505,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->expanded:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -515,7 +515,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->sku:Lcom/discord/models/domain/ModelSku;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -525,7 +525,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->copies:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -535,7 +535,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->planId:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -545,7 +545,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->isLastItem:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -555,7 +555,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->wasCopied:Ljava/lang/Boolean;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
index d72d983af6..49d4790dd4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
@@ -27,20 +27,13 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0117
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
index 10bd3e28bd..ac365b1ef0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
@@ -39,7 +39,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;
 
@@ -47,77 +47,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "icon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "icon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "name"
 
-    const/4 v3, 0x0
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "name"
-
-    const-string v5, "getName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "copies"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCopies()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "copies"
-
-    const-string v5, "getCopies()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "arrow"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getArrow()Landroid/widget/ImageView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "arrow"
+    const/4 v2, 0x3
 
-    const-string v4, "getArrow()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -127,13 +103,15 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d010b
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0406
+    const p1, 0x7f0a040c
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +119,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0407
+    const p1, 0x7f0a040d
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -149,7 +127,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0405
+    const p1, 0x7f0a040b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +135,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0404
+    const p1, 0x7f0a040a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -166,15 +144,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;
@@ -270,11 +239,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -296,7 +265,7 @@
 
     if-nez p1, :cond_0
 
-    goto/16 :goto_2
+    goto/16 :goto_3
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getName()Landroid/widget/TextView;
@@ -305,73 +274,73 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getCopies()Landroid/widget/TextView;
 
     move-result-object p1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v2, "itemView"
+    const-string v1, "itemView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const-string v2, "itemView.context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    const-string v3, "itemView.context.resources"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v3, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {v3, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
-    const-string v3, "itemView.context"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    const-string v4, "itemView.context.resources"
-
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v4, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {v4, v2, v3}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
-
-    move-result-object v2
-
-    const v3, 0x7f100067
+    const v2, 0x7f100067
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v3
 
-    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
 
-    move-result v4
+    move-result v3
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
-    new-array v5, v5, [Ljava/lang/Object;
+    new-array v4, v4, [Ljava/lang/Object;
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
 
-    move-result-object v7
+    move-result-object v6
 
-    aput-object v7, v5, v6
+    aput-object v6, v4, v5
 
-    invoke-static {v1, v2, v3, v4, v5}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v0, v1, v2, v3, v4}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getArrow()Landroid/widget/ImageView;
 
@@ -379,31 +348,31 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getExpanded()Ljava/lang/Boolean;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const v1, 0x7f08027a
+    const v0, 0x7f08027b
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f08027e
+    const v0, 0x7f08027f
 
     :goto_0
-    invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
     sget-object p1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/premium/PremiumUtils;->isNitroSku(Lcom/discord/models/domain/ModelSku;)Z
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/premium/PremiumUtils;->isNitroSku(Lcom/discord/models/domain/ModelSku;)Z
 
     move-result p1
 
@@ -425,7 +394,7 @@
 
     invoke-virtual {p1, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageResource(I)V
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_2
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
@@ -440,11 +409,11 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    if-eqz v4, :cond_3
+    if-eqz v3, :cond_3
 
-    sget-object v1, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+    sget-object v0, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getSku()Lcom/discord/models/domain/ModelSku;
 
@@ -452,26 +421,31 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSku;->getApplicationId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/4 v6, 0x4
+    const/4 v5, 0x4
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    :cond_3
-    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
+    goto :goto_1
+
+    :cond_3
+    const/4 p1, 0x0
 
     :goto_1
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
+
+    :goto_2
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
     new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem$onConfigure$1;
@@ -481,15 +455,8 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_4
-    :goto_2
+    :goto_3
     return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
index e1b39d7a31..8e082dbeb9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
index db5aa26c9b..de647193ce 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
index dc606dbbd9..b487675057 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
index 7aa1e11f0a..a5e202467a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGift;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelGift;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.smali
index 6b18a8398d..e6e3073287 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.smali
@@ -78,9 +78,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -101,15 +103,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getOnClickCopyListener$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;)Lkotlin/jvm/functions/Function1;
@@ -213,17 +206,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "giftItems"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "onClickSkuListener"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "onClickCopyListener"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onRevokeClickListener"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onGenerateClickListener"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
@@ -236,41 +237,6 @@
     iput-object p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter;->onGenerateClickListener:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "onGenerateClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onRevokeClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onClickCopyListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "onClickSkuListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "giftItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -284,7 +250,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -297,7 +263,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_2
 
@@ -336,13 +304,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
index c633f54d0a..038e070b03 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->access$handleStoreState(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$1.smali
index 952ef045e4..606e260d2d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsGiftingViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelGift;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -79,6 +83,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelGift;",
             ">;>;"
@@ -93,7 +98,7 @@
 
     const-string v1, "meId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$2.smali
index 3b1f6eb215..86ed2f9f50 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$2.smali
@@ -27,7 +27,13 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/stores/StoreEntitlements$State;",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelGift;",
+        ">;",
+        "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -76,11 +82,11 @@
 
     const-string v1, "entitlementState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "myResolvedGifts"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;-><init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory.smali
index e130e5d528..d9cfbfd717 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory.smali
@@ -59,7 +59,7 @@
 
     sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Factory$observeStores$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -71,7 +71,7 @@
 
     const-string v1, "Observable\n          .co\u2026State, myResolvedGifts) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -90,7 +90,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
@@ -101,13 +103,4 @@
     invoke-direct {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;-><init>(Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState.smali
index f8e2170993..a85e6b6442 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState.smali
@@ -41,11 +41,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "entitlementState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "myResolvedGifts"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,20 +56,6 @@
     iput-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;->myResolvedGifts:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "myResolvedGifts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "entitlementState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;
@@ -133,31 +121,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "entitlementState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "myResolvedGifts"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;-><init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "myResolvedGifts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "entitlementState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -175,7 +151,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;->entitlementState:Lcom/discord/stores/StoreEntitlements$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -185,7 +161,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;->myResolvedGifts:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
index b367726baa..80c6d70240 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded.smali
@@ -81,16 +81,24 @@
         }
     .end annotation
 
+    const-string v0, "myEntitlements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "resolvingGiftState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "expandedSkuIds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "myGifts"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
@@ -104,34 +112,6 @@
     iput-object p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "myGifts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "expandedSkuIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "resolvingGiftState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "myEntitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;Ljava/util/Map;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
@@ -296,15 +276,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "myEntitlements"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "resolvingGiftState"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "expandedSkuIds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "myGifts"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
 
@@ -323,34 +309,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;-><init>(Ljava/util/Map;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Set;Ljava/util/Map;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "myGifts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "expandedSkuIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "resolvingGiftState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "myEntitlements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -368,7 +326,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myEntitlements:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -378,7 +336,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->resolvingGiftState:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -388,7 +346,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->expandedSkuIds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -398,7 +356,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->myGifts:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -408,7 +366,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;->lastCopiedCode:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
index f319a5be71..9f825bb584 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
index 5f78b2eabd..3826e1be69 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
index 0d87bac029..4f69fbbd7b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreGifting$GiftState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onHandleGiftCode"
+
+    const-string v5, "onHandleGiftCode(Lcom/discord/stores/StoreGifting$GiftState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onHandleGiftCode"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onHandleGiftCode(Lcom/discord/stores/StoreGifting$GiftState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/stores/StoreGifting$GiftState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->access$onHandleGiftCode(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;Lcom/discord/stores/StoreGifting$GiftState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
index 196449d0d8..7c22e8b28e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetSettingsGiftingViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;",
         ">;"
     }
@@ -50,36 +50,38 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loading;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
-    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;
 
-    iput-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
 
-    new-instance v1, Lrx/subscriptions/CompositeSubscription;
+    new-instance v0, Lrx/subscriptions/CompositeSubscription;
 
-    invoke-direct {v1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getEntitlements()Lcom/discord/stores/StoreEntitlements;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getEntitlements()Lcom/discord/stores/StoreEntitlements;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreEntitlements;->fetchMyGiftEntitlements()V
+    invoke-virtual {v0}, Lcom/discord/stores/StoreEntitlements;->fetchMyGiftEntitlements()V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -88,6 +90,10 @@
 
     const-class v3, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
+    new-instance v8, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -96,10 +102,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -107,13 +109,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getSubscriptions$p(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;)Lrx/subscriptions/CompositeSubscription;
@@ -182,7 +177,7 @@
 
     if-eqz v0, :cond_6
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -208,12 +203,12 @@
     goto :goto_0
 
     :cond_3
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     move-object v6, v0
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -269,7 +264,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -314,7 +309,7 @@
     if-eqz v3, :cond_3
 
     :goto_1
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-direct {p0, v1, v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->buildViewState(Lcom/discord/stores/StoreEntitlements$State;Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ResolvingGiftState;Ljava/util/Map;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState;
 
@@ -491,7 +486,7 @@
     move-result-object p1
 
     :goto_5
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -508,7 +503,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -531,7 +526,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v4, Lk0/j/o;->d:Lk0/j/o;
 
     invoke-direct {v1, v3, v4}, Lcom/discord/stores/StoreEntitlements$State$Loaded;-><init>(Ljava/util/Map;Ljava/util/Map;)V
 
@@ -686,7 +681,7 @@
     move-result-object p1
 
     :goto_5
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_c
     return-void
@@ -709,24 +704,21 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
+    const-string v0, "giftCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     move-object v1, v0
 
     check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$ViewState$Loaded;
@@ -751,17 +743,10 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final handleSkuClicked(JLjava/lang/Long;)V
@@ -769,7 +754,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -790,7 +775,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v0}, Lk0/j/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v4
 
@@ -844,7 +829,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2
     return-void
@@ -853,7 +838,7 @@
 .method public onCleared()V
     .locals 1
 
-    invoke-super {p0}, Lf/a/b/o0;->onCleared()V
+    invoke-super {p0}, Lf/a/b/q0;->onCleared()V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->subscriptions:Lrx/subscriptions/CompositeSubscription;
 
@@ -867,9 +852,11 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "giftCode"
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -887,7 +874,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -897,7 +884,7 @@
 
     const-string p1, "StoreStream\n          .g\u2026dSchedulers.mainThread())"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;
 
@@ -923,19 +910,10 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "giftCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnGiftCodeResolved(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -947,18 +925,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onGiftCodeResolved"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel;->onGiftCodeResolved:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onGiftCodeResolved"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
index c1405c6292..13f9ef1432 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
@@ -51,7 +51,9 @@
 .method public final launch(Landroid/content/Context;Ljava/lang/Integer;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -75,16 +77,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, v0, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
index 7a24a6044f..ab33fc00d2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$2.smali
index a9b024d041..65a4142d0d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$3.smali
index 49cc32436a..fe59b0b587 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$4.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$4.smali
index ff539ee763..d91fceaaf9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion;->launch(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali
index 1063a10f04..a404df9d8d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1.smali
@@ -47,7 +47,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/premium/PremiumUtils;->openAppleBilling(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$1.smali
index ff5dffa6be..7cffb61291 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onDropdownItemSelected"
+
+    const-string v5, "onDropdownItemSelected(Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onDropdownItemSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onDropdownItemSelected(Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$onDropdownItemSelected(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$2.smali
index c27871169b..6e21a87a35 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$2.smali
@@ -53,7 +53,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -61,7 +61,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/premium/PremiumUtils;->openAppleBilling(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
index fe3c2cc951..b637727214 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1.smali
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -87,7 +87,7 @@
 
     move-result-object p2
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$1.smali
index 4c02c480e5..b5ecc8683f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2.smali
index 959a421628..d0ebab837b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,41 +61,43 @@
 .method public final invoke(Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;)V
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "planType"
 
-    new-instance v8, Lcom/discord/utilities/analytics/Traits$Location;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/utilities/analytics/Traits$Location;
+
+    const-string v2, "User Settings"
+
+    const-string v3, "Discord Nitro"
+
+    const-string v4, "Button CTA"
+
+    const-string v5, "buy"
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x10
+
+    const/4 v8, 0x0
+
+    move-object v1, v0
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/utilities/analytics/Traits$Location;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sget-object v1, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
+
+    iget-object v2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     const/4 v5, 0x0
 
-    const/16 v6, 0x10
+    const/16 v7, 0x18
 
-    const/4 v7, 0x0
+    move-object v3, p1
 
-    const-string v1, "User Settings"
+    move-object v4, v0
 
-    const-string v2, "Discord Nitro"
-
-    const-string v3, "Button CTA"
-
-    const-string v4, "buy"
-
-    move-object v0, v8
-
-    invoke-direct/range {v0 .. v7}, Lcom/discord/utilities/analytics/Traits$Location;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sget-object v0, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
-
-    iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
-
-    const/4 v4, 0x0
-
-    const/16 v6, 0x18
-
-    move-object v2, p1
-
-    move-object v3, v8
-
-    invoke-static/range {v0 .. v7}, Lcom/discord/utilities/premium/PremiumUtils;->openWebPurchasePremium$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZLandroid/net/Uri;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v8}, Lcom/discord/utilities/premium/PremiumUtils;->openWebPurchasePremium$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZLandroid/net/Uri;ILjava/lang/Object;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
@@ -114,13 +116,4 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->setLaunchPremiumTabStartTimeMs(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "planType"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$3.smali
index 96e6baeb24..797ad33396 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBoundOrOnResume$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->access$handleEvent(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$showCancelPlanChangeDialog$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$showCancelPlanChangeDialog$1.smali
index ec557875f8..51e50cbf87 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$showCancelPlanChangeDialog$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium$showCancelPlanChangeDialog$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showCancelPlanChangeDialog$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremium.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,9 +59,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showCancelPlanChangeDialog$1;->this$0:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
@@ -72,13 +74,4 @@
     invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->cancelPlanChange()V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
index 091b10a133..d6221b7fe0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
@@ -111,681 +111,477 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "uploadPerks"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUploadPerks()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "uploadPerks"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUploadPerks()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const/4 v2, 0x0
+    const-string v2, "boostDiscountText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBoostDiscountText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "boostDiscountText"
-
-    const-string v4, "getBoostDiscountText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "boostCountText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostCountText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "boostCountText"
-
-    const-string v4, "getBoostCountText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier2Yearly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier2Yearly()Lcom/discord/views/BoxedButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier2Yearly"
-
-    const-string v4, "getBuyTier2Yearly()Lcom/discord/views/BoxedButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier2Monthly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier2Monthly()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier2Monthly"
-
-    const-string v4, "getBuyTier2Monthly()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier2Gift"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier2Gift()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier2Gift"
-
-    const-string v4, "getBuyTier2Gift()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier1Yearly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier1Yearly()Lcom/discord/views/BoxedButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier1Yearly"
-
-    const-string v4, "getBuyTier1Yearly()Lcom/discord/views/BoxedButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier1Monthly"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier1Monthly()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier1Monthly"
-
-    const-string v4, "getBuyTier1Monthly()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier1Gift"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier1Gift()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier1Gift"
-
-    const-string v4, "getBuyTier1Gift()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier1Container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier1Container()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier1Container"
-
-    const-string v4, "getBuyTier1Container()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "buyTier2Container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBuyTier2Container()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "buyTier2Container"
-
-    const-string v4, "getBuyTier2Container()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "viewFlipper"
-
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "subscriptionContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubscriptionContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "subscriptionContainer"
-
-    const-string v4, "getSubscriptionContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "activeSubscriptionView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "activeSubscriptionView"
-
-    const-string v4, "getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "activeGuildSubscriptionView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getActiveGuildSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "activeGuildSubscriptionView"
-
-    const-string v4, "getActiveGuildSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "paymentContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPaymentContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "paymentContainer"
-
-    const-string v4, "getPaymentContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "billingInfoTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBillingInfoTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "billingInfoTv"
-
-    const-string v4, "getBillingInfoTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "billingError"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBillingError()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "billingError"
-
-    const-string v4, "getBillingError()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "billingBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBillingBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "billingBtn"
-
-    const-string v4, "getBillingBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "billingDivider"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBillingDivider()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "billingDivider"
-
-    const-string v4, "getBillingDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "spinnerTitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSpinnerTitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "spinnerTitle"
-
-    const-string v4, "getSpinnerTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "spinner"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSpinner()Landroid/widget/Spinner;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "spinner"
-
-    const-string v4, "getSpinner()Landroid/widget/Spinner;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "spinnerContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSpinnerContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "spinnerContainer"
-
-    const-string v4, "getSpinnerContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "retryButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRetryButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "retryButton"
-
-    const-string v4, "getRetryButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "legalese"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLegalese()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "legalese"
-
-    const-string v4, "getLegalese()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x18
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "grandfathered"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGrandfathered()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "grandfathered"
-
-    const-string v4, "getGrandfathered()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x19
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "scrollView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getScrollView()Landroid/widget/ScrollView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "scrollView"
-
-    const-string v4, "getScrollView()Landroid/widget/ScrollView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1a
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "creditContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreditContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "creditContainer"
-
-    const-string v4, "getCreditContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1b
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "creditNitro"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreditNitro()Lcom/discord/views/premium/AccountCreditView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "creditNitro"
-
-    const-string v4, "getCreditNitro()Lcom/discord/views/premium/AccountCreditView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1c
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "creditNitroClassic"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreditNitroClassic()Lcom/discord/views/premium/AccountCreditView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "creditNitroClassic"
-
-    const-string v4, "getCreditNitroClassic()Lcom/discord/views/premium/AccountCreditView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1d
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "creditDivider"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCreditDivider()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "creditDivider"
-
-    const-string v4, "getCreditDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1e
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "renewalMutationContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRenewalMutationContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "renewalMutationContainer"
-
-    const-string v4, "getRenewalMutationContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1f
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "renewalMutationTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRenewalMutationTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "renewalMutationTv"
-
-    const-string v4, "getRenewalMutationTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x20
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    const-string v2, "renewalMutationBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRenewalMutationBtn()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "renewalMutationBtn"
-
-    const-string v4, "getRenewalMutationBtn()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x21
 
@@ -809,7 +605,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06df
+    const v0, 0x7f0a06e5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -817,7 +613,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->uploadPerks$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ea
+    const v0, 0x7f0a06f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -825,7 +621,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->boostDiscountText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e9
+    const v0, 0x7f0a06ef
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -833,7 +629,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->boostCountText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f3
+    const v0, 0x7f0a06f9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -841,7 +637,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f2
+    const v0, 0x7f0a06f8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -849,7 +645,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f1
+    const v0, 0x7f0a06f7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -857,7 +653,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f0
+    const v0, 0x7f0a06f6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -865,7 +661,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ef
+    const v0, 0x7f0a06f5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -873,7 +669,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ee
+    const v0, 0x7f0a06f4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -881,7 +677,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06fa
+    const v0, 0x7f0a0700
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -889,7 +685,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier1Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06fb
+    const v0, 0x7f0a0701
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -897,7 +693,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->buyTier2Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06fc
+    const v0, 0x7f0a0702
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -905,7 +701,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f9
+    const v0, 0x7f0a06ff
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -913,7 +709,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->subscriptionContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e1
+    const v0, 0x7f0a06e7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -921,7 +717,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->activeSubscriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e0
+    const v0, 0x7f0a06e6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -929,7 +725,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->activeGuildSubscriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ed
+    const v0, 0x7f0a06f3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -937,7 +733,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->paymentContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e3
+    const v0, 0x7f0a06e9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -961,7 +757,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->billingBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e2
+    const v0, 0x7f0a06e8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -993,7 +789,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->spinnerContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f7
+    const v0, 0x7f0a06fd
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1001,7 +797,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e6
+    const v0, 0x7f0a06ec
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1009,7 +805,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->legalese$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e5
+    const v0, 0x7f0a06eb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1017,7 +813,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->grandfathered$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f8
+    const v0, 0x7f0a06fe
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1025,7 +821,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e4
+    const v0, 0x7f0a06ea
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1033,7 +829,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02af
+    const v0, 0x7f0a02b2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1041,7 +837,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b0
+    const v0, 0x7f0a02b3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1049,7 +845,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditNitroClassic$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b1
+    const v0, 0x7f0a02b4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1057,7 +853,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f5
+    const v0, 0x7f0a06fb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1065,7 +861,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->renewalMutationContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f6
+    const v0, 0x7f0a06fc
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1073,7 +869,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->renewalMutationTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06f4
+    const v0, 0x7f0a06fa
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1096,7 +892,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -1465,11 +1261,11 @@
 
     const/4 v7, 0x0
 
-    if-eqz v5, :cond_11
+    if-eqz v5, :cond_10
 
-    if-eqz v2, :cond_11
+    if-eqz v2, :cond_10
 
-    if-eqz v1, :cond_10
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/billing/ModelInvoicePreview;->getInvoiceItems()Ljava/util/List;
 
@@ -1546,7 +1342,7 @@
     :goto_7
     check-cast v5, Lcom/discord/models/domain/billing/ModelInvoiceItem;
 
-    if-eqz v5, :cond_11
+    if-eqz v5, :cond_10
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -1578,7 +1374,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v5, v10}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -1592,7 +1388,7 @@
 
     const-string v2, "getString(\n            i\u2026quireContext())\n        )"
 
-    invoke-static {v15, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/views/ActiveSubscriptionView;->b(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
 
@@ -1736,15 +1532,7 @@
 
     invoke-static/range {v10 .. v21}, Lcom/discord/views/ActiveSubscriptionView;->a(Lcom/discord/views/ActiveSubscriptionView;Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;Lcom/discord/models/domain/ModelSubscription$Status;ZZLjava/lang/CharSequence;ZILkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ZI)V
 
-    goto :goto_d
-
     :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v7
-
-    :cond_11
-    :goto_d
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveGuildSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
 
     move-result-object v2
@@ -1753,41 +1541,41 @@
 
     move-result v5
 
-    if-eqz v5, :cond_12
+    if-eqz v5, :cond_11
 
     const/4 v8, 0x0
 
-    :cond_12
+    :cond_11
     invoke-virtual {v2, v8}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getHasAnyPremiumGuildSubscriptions()Z
 
     move-result v2
 
-    if-eqz v2, :cond_1d
+    if-eqz v2, :cond_1c
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getInvoicePreview()Lcom/discord/models/domain/billing/ModelInvoicePreview;
 
     move-result-object v2
 
-    if-eqz v2, :cond_1d
+    if-eqz v2, :cond_1c
 
     invoke-virtual {v2}, Lcom/discord/models/domain/billing/ModelInvoicePreview;->getInvoiceItems()Ljava/util/List;
 
     move-result-object v2
 
-    if-eqz v2, :cond_1d
+    if-eqz v2, :cond_1c
 
     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v2
 
-    :cond_13
+    :cond_12
     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
 
-    if-eqz v5, :cond_15
+    if-eqz v5, :cond_14
 
     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -1797,7 +1585,7 @@
 
     check-cast v8, Lcom/discord/models/domain/billing/ModelInvoiceItem;
 
-    if-eqz v1, :cond_14
+    if-eqz v1, :cond_13
 
     invoke-virtual {v8}, Lcom/discord/models/domain/billing/ModelInvoiceItem;->getSubscriptionPlanId()J
 
@@ -1815,20 +1603,20 @@
 
     move-result v8
 
-    if-eqz v8, :cond_13
+    if-eqz v8, :cond_12
 
     move-object v7, v5
 
-    goto :goto_e
+    goto :goto_d
 
-    :cond_14
+    :cond_13
     return-void
 
-    :cond_15
-    :goto_e
+    :cond_14
+    :goto_d
     check-cast v7, Lcom/discord/models/domain/billing/ModelInvoiceItem;
 
-    if-eqz v7, :cond_1d
+    if-eqz v7, :cond_1c
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getGuildSubscriptions()Ljava/util/Map;
 
@@ -1840,27 +1628,27 @@
 
     instance-of v8, v5, Ljava/util/Collection;
 
-    if-eqz v8, :cond_16
+    if-eqz v8, :cond_15
 
     invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z
 
     move-result v8
 
-    if-eqz v8, :cond_16
+    if-eqz v8, :cond_15
 
-    goto :goto_f
+    goto :goto_e
 
-    :cond_16
+    :cond_15
     invoke-interface {v5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v5
 
-    :cond_17
+    :cond_16
     invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v8
 
-    if-eqz v8, :cond_18
+    if-eqz v8, :cond_17
 
     invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -1872,17 +1660,17 @@
 
     move-result v8
 
-    if-eqz v8, :cond_17
+    if-eqz v8, :cond_16
 
     const/4 v5, 0x1
 
-    goto :goto_10
+    goto :goto_f
 
-    :cond_18
-    :goto_f
+    :cond_17
+    :goto_e
     const/4 v5, 0x0
 
-    :goto_10
+    :goto_f
     invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
     move-result-object v2
@@ -1891,7 +1679,7 @@
 
     move-result v2
 
-    if-eqz v1, :cond_19
+    if-eqz v1, :cond_18
 
     sget-object v8, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
 
@@ -1899,15 +1687,15 @@
 
     move-result v8
 
-    goto :goto_11
+    goto :goto_10
 
-    :cond_19
+    :cond_18
     const/4 v8, 0x0
 
-    :goto_11
+    :goto_10
     sub-int v16, v2, v8
 
-    if-eqz v1, :cond_1a
+    if-eqz v1, :cond_19
 
     sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -1927,38 +1715,38 @@
 
     move-result v1
 
-    goto :goto_12
+    goto :goto_11
 
-    :cond_1a
+    :cond_19
     const/4 v1, 0x0
 
-    :goto_12
-    if-eqz v1, :cond_1b
+    :goto_11
+    if-eqz v1, :cond_1a
 
     const v1, 0x7f1202f6
 
-    goto :goto_13
+    goto :goto_12
 
-    :cond_1b
+    :cond_1a
     const v1, 0x7f1202fc
 
-    :goto_13
+    :goto_12
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveGuildSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
 
     move-result-object v9
 
     sget-object v10, Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;->PREMIUM_GUILD:Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
 
-    if-eqz v5, :cond_1c
+    if-eqz v5, :cond_1b
 
     sget-object v2, Lcom/discord/models/domain/ModelSubscription$Status;->CANCELED:Lcom/discord/models/domain/ModelSubscription$Status;
 
-    goto :goto_14
+    goto :goto_13
 
-    :cond_1c
+    :cond_1b
     sget-object v2, Lcom/discord/models/domain/ModelSubscription$Status;->ACTIVE:Lcom/discord/models/domain/ModelSubscription$Status;
 
-    :goto_14
+    :goto_13
     move-object v11, v2
 
     const/4 v12, 0x0
@@ -1975,7 +1763,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3, v5}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -1989,7 +1777,7 @@
 
     const-string v1, "getString(\n             \u2026            )\n          )"
 
-    invoke-static {v14, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
 
@@ -2009,7 +1797,7 @@
 
     invoke-static/range {v9 .. v20}, Lcom/discord/views/ActiveSubscriptionView;->a(Lcom/discord/views/ActiveSubscriptionView;Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;Lcom/discord/models/domain/ModelSubscription$Status;ZZLjava/lang/CharSequence;ZILkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ZI)V
 
-    :cond_1d
+    :cond_1c
     return-void
 .end method
 
@@ -2319,7 +2107,7 @@
     goto :goto_2
 
     :cond_3
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_2
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBuyTier1Monthly()Landroid/widget/Button;
@@ -2500,7 +2288,7 @@
     goto :goto_1
 
     :cond_2
-    const p1, 0x7f121182
+    const p1, 0x7f1211ad
 
     new-array v0, v1, [Ljava/lang/Object;
 
@@ -2529,7 +2317,7 @@
     goto :goto_1
 
     :cond_3
-    const p1, 0x7f12117d
+    const p1, 0x7f1211a8
 
     new-array v0, v1, [Ljava/lang/Object;
 
@@ -2562,7 +2350,7 @@
 
     move-result-object p1
 
-    invoke-static {v0}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v0}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v3
 
@@ -2674,7 +2462,7 @@
     goto :goto_2
 
     :cond_4
-    const v2, 0x7f121273
+    const v2, 0x7f12129e
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2683,7 +2471,7 @@
     goto :goto_2
 
     :cond_5
-    const v2, 0x7f121272
+    const v2, 0x7f12129d
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2692,7 +2480,7 @@
     :goto_2
     const-string v4, "when (premiumSubscriptio\u20262)\n      else -> \"\"\n    }"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -2708,7 +2496,7 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v4}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -2730,7 +2518,7 @@
 
     move-result-object v7
 
-    invoke-static {v7, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x3
 
@@ -2738,7 +2526,7 @@
 
     aput-object v2, v5, v6
 
-    const v2, 0x7f1215a4
+    const v2, 0x7f1215ce
 
     invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2754,7 +2542,7 @@
 
     const-string p1, "getString(\n            l\u2026    priceString\n        )"
 
-    invoke-static {v8, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v9, 0x0
 
@@ -2812,52 +2600,52 @@
 
     const/4 v3, 0x1
 
+    const/4 v4, 0x0
+
     if-eqz v1, :cond_0
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     :goto_0
     if-eqz v1, :cond_1
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
 
-    move-result v5
+    move-result v6
 
     goto :goto_1
 
     :cond_1
-    const/4 v5, 0x0
+    const/4 v6, 0x0
 
     :goto_1
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPaymentSources()Ljava/util/List;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-interface {v6}, Ljava/util/List;->isEmpty()Z
+    invoke-interface {v7}, Ljava/util/List;->isEmpty()Z
 
-    move-result v6
+    move-result v7
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getSubscriptionError()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
 
-    move-result-object v7
+    move-result-object v8
 
-    if-eqz v7, :cond_2
+    if-eqz v8, :cond_2
 
-    const/4 v7, 0x1
+    const/4 v8, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 v7, 0x0
-
-    :goto_2
     const/4 v8, 0x0
 
+    :goto_2
     if-eqz v1, :cond_3
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getStatus()Lcom/discord/models/domain/ModelSubscription$Status;
@@ -2867,7 +2655,7 @@
     goto :goto_3
 
     :cond_3
-    move-object v9, v8
+    const/4 v9, 0x0
 
     :goto_3
     sget-object v10, Lcom/discord/models/domain/ModelSubscription$Status;->PAST_DUE:Lcom/discord/models/domain/ModelSubscription$Status;
@@ -2910,7 +2698,7 @@
 
     move-result-object v15
 
-    invoke-static {v15, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v16, 0x0
 
@@ -2950,7 +2738,7 @@
 
     move-result-object v13
 
-    if-eqz v4, :cond_8
+    if-eqz v5, :cond_8
 
     const/4 v14, 0x0
 
@@ -2962,9 +2750,9 @@
     :goto_8
     invoke-virtual {v13, v14}, Landroid/view/View;->setVisibility(I)V
 
-    if-eqz v4, :cond_a
+    if-eqz v5, :cond_9
 
-    if-eqz v1, :cond_9
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPaymentSources()Ljava/util/List;
 
@@ -2986,20 +2774,30 @@
 
     invoke-direct {v0, v13, v14, v15}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureSpinner(Ljava/util/List;Lkotlin/jvm/functions/Function1;Z)V
 
-    goto :goto_9
-
     :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v8
-
-    :cond_a
-    :goto_9
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingDivider()Landroid/view/View;
 
     move-result-object v13
 
-    xor-int/lit8 v14, v5, 0x1
+    xor-int/lit8 v14, v6, 0x1
+
+    if-eqz v14, :cond_a
+
+    const/4 v14, 0x0
+
+    goto :goto_9
+
+    :cond_a
+    const/16 v14, 0x8
+
+    :goto_9
+    invoke-virtual {v13, v14}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getSpinnerContainer()Landroid/view/View;
+
+    move-result-object v13
+
+    xor-int/lit8 v14, v6, 0x1
 
     if-eqz v14, :cond_b
 
@@ -3013,41 +2811,23 @@
     :goto_a
     invoke-virtual {v13, v14}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getSpinnerContainer()Landroid/view/View;
-
-    move-result-object v13
-
-    xor-int/lit8 v14, v5, 0x1
-
-    if-eqz v14, :cond_c
-
-    const/4 v14, 0x0
-
-    goto :goto_b
-
-    :cond_c
-    const/16 v14, 0x8
-
-    :goto_b
-    invoke-virtual {v13, v14}, Landroid/view/View;->setVisibility(I)V
-
-    if-eqz v2, :cond_d
+    if-eqz v2, :cond_c
 
     invoke-virtual {v2}, Lcom/discord/models/domain/billing/ModelInvoicePreview;->getTotal()I
 
     move-result v2
 
-    goto :goto_c
+    goto :goto_b
 
-    :cond_d
+    :cond_c
     const/4 v2, 0x0
 
-    :goto_c
+    :goto_b
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v13
 
-    invoke-static {v13, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, v13}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -3055,7 +2835,7 @@
 
     const/4 v13, 0x2
 
-    if-eqz v1, :cond_11
+    if-eqz v1, :cond_10
 
     invoke-static {v1}, Lcom/discord/views/ActiveSubscriptionView;->b(Lcom/discord/models/domain/ModelSubscription;)Lcom/discord/views/ActiveSubscriptionView$ActiveSubscriptionType;
 
@@ -3065,54 +2845,54 @@
 
     move-result v14
 
-    if-eqz v14, :cond_10
+    if-eqz v14, :cond_f
 
-    if-eq v14, v3, :cond_f
+    if-eq v14, v3, :cond_e
 
-    if-ne v14, v13, :cond_e
+    if-ne v14, v13, :cond_d
 
-    const v14, 0x7f12120b
+    const v14, 0x7f121236
 
     invoke-virtual {v0, v14}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v14
 
-    goto :goto_d
+    goto :goto_c
 
-    :cond_e
+    :cond_d
     new-instance v1, Lkotlin/NoWhenBranchMatchedException;
 
     invoke-direct {v1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw v1
 
+    :cond_e
+    const v14, 0x7f12129e
+
+    invoke-virtual {v0, v14}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+
+    move-result-object v14
+
+    goto :goto_c
+
     :cond_f
-    const v14, 0x7f121273
+    const v14, 0x7f12129d
 
     invoke-virtual {v0, v14}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v14
 
-    goto :goto_d
-
-    :cond_10
-    const v14, 0x7f121272
-
-    invoke-virtual {v0, v14}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
-
-    move-result-object v14
-
-    :goto_d
-    if-eqz v14, :cond_11
+    :goto_c
+    if-eqz v14, :cond_10
 
     move-object v11, v14
 
-    :cond_11
+    :cond_10
     const-string v14, "subscription?.let { sub \u2026itle)\n      }\n    } ?: \"\""
 
-    invoke-static {v11, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v5, :cond_12
+    if-eqz v6, :cond_11
 
     const v1, 0x7f1202de
 
@@ -3120,124 +2900,115 @@
 
     move-result-object v1
 
-    goto :goto_10
+    goto :goto_f
 
-    :cond_12
-    if-eqz v4, :cond_18
+    :cond_11
+    if-eqz v5, :cond_17
 
-    if-eqz v1, :cond_13
+    if-eqz v1, :cond_12
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getStatus()Lcom/discord/models/domain/ModelSubscription$Status;
 
     move-result-object v1
 
+    goto :goto_d
+
+    :cond_12
+    const/4 v1, 0x0
+
+    :goto_d
+    if-nez v1, :cond_13
+
     goto :goto_e
 
     :cond_13
-    move-object v1, v8
-
-    :goto_e
-    if-nez v1, :cond_14
-
-    goto :goto_f
-
-    :cond_14
     invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
 
     move-result v1
 
-    if-eq v1, v3, :cond_17
+    if-eq v1, v3, :cond_16
 
-    if-eq v1, v13, :cond_16
+    if-eq v1, v13, :cond_15
 
-    if-eq v1, v10, :cond_15
+    if-eq v1, v10, :cond_14
 
-    :goto_f
-    move-object v1, v8
+    goto :goto_e
 
-    :goto_10
-    move-object v15, v1
-
-    goto :goto_11
-
-    :cond_15
-    const v1, 0x7f121248
+    :cond_14
+    const v1, 0x7f121273
 
     new-array v2, v3, [Ljava/lang/Object;
 
-    const/4 v4, 0x0
-
     aput-object v9, v2, v4
 
     invoke-virtual {v0, v1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    goto :goto_10
+    goto :goto_f
+
+    :cond_15
+    const v1, 0x7f121276
+
+    new-array v2, v13, [Ljava/lang/Object;
+
+    aput-object v11, v2, v4
+
+    aput-object v9, v2, v3
+
+    invoke-virtual {v0, v1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_f
 
     :cond_16
-    const/4 v1, 0x0
+    const v1, 0x7f121277
 
-    const v2, 0x7f12124b
+    new-array v5, v13, [Ljava/lang/Object;
 
-    new-array v4, v13, [Ljava/lang/Object;
+    aput-object v9, v5, v4
 
-    aput-object v11, v4, v1
+    aput-object v2, v5, v3
 
-    aput-object v9, v4, v3
-
-    invoke-virtual {v0, v2, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, v1, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v1
 
-    goto :goto_10
+    goto :goto_f
 
     :cond_17
+    :goto_e
     const/4 v1, 0x0
 
-    const v4, 0x7f12124c
+    :goto_f
+    move-object v15, v1
 
-    new-array v10, v13, [Ljava/lang/Object;
-
-    aput-object v9, v10, v1
-
-    aput-object v2, v10, v3
-
-    invoke-virtual {v0, v4, v10}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_10
-
-    :cond_18
-    move-object v15, v8
-
-    :goto_11
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingInfoTv()Landroid/widget/TextView;
 
     move-result-object v1
 
-    if-eqz v15, :cond_19
+    if-eqz v15, :cond_18
 
-    goto :goto_12
+    goto :goto_10
 
-    :cond_19
+    :cond_18
     const/4 v3, 0x0
 
-    :goto_12
-    if-eqz v3, :cond_1a
+    :goto_10
+    if-eqz v3, :cond_19
 
     const/4 v2, 0x0
 
-    goto :goto_13
+    goto :goto_11
 
-    :cond_1a
+    :cond_19
     const/16 v2, 0x8
 
-    :goto_13
+    :goto_11
     invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
-    if-eqz v15, :cond_1b
+    if-eqz v15, :cond_1a
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingInfoTv()Landroid/widget/TextView;
 
@@ -3249,7 +3020,7 @@
 
     move-result-object v14
 
-    invoke-static {v14, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v16, 0x0
 
@@ -3267,33 +3038,37 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    :cond_1b
+    :cond_1a
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingBtn()Landroid/widget/Button;
 
     move-result-object v1
 
-    if-eqz v5, :cond_1c
+    if-eqz v6, :cond_1b
 
     const v2, 0x7f1202dd
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v2
 
-    goto :goto_14
+    goto :goto_12
 
-    :cond_1c
-    if-eqz v6, :cond_1d
+    :cond_1b
+    if-eqz v7, :cond_1c
 
     const v2, 0x7f1202a3
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v2
 
-    :cond_1d
-    :goto_14
-    invoke-static {v1, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    goto :goto_12
+
+    :cond_1c
+    const/4 v2, 0x0
+
+    :goto_12
+    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBillingBtn()Landroid/widget/Button;
 
@@ -3301,7 +3076,7 @@
 
     new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$2;
 
-    invoke-direct {v2, v0, v5, v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;ZZ)V
+    invoke-direct {v2, v0, v6, v7}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configurePaymentInfo$2;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;ZZ)V
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -3309,17 +3084,15 @@
 
     move-result-object v1
 
-    if-eqz v7, :cond_1e
+    if-eqz v8, :cond_1d
 
-    const/4 v2, 0x0
+    goto :goto_13
 
-    goto :goto_15
+    :cond_1d
+    const/16 v4, 0x8
 
-    :cond_1e
-    const/16 v2, 0x8
-
-    :goto_15
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    :goto_13
+    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 .end method
@@ -3452,7 +3225,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v9, 0x0
 
@@ -3476,7 +3249,7 @@
     const-string v6, ""
 
     :goto_6
-    const v7, 0x7f121235
+    const v7, 0x7f121260
 
     const/4 v8, 0x2
 
@@ -3492,7 +3265,7 @@
 
     const-string v2, "getString(\n        R.str\u2026subscriptionEndDate\n    )"
 
-    invoke-static {v11, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getRenewalMutationTv()Landroid/widget/TextView;
 
@@ -3504,7 +3277,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
@@ -3570,7 +3343,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1, p1}, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter;-><init>(Landroid/content/Context;Ljava/util/List;)V
 
@@ -4061,7 +3834,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     return-object p1
 
@@ -4103,7 +3876,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$getDropdownItems$$inlined$sortedBy$1;-><init>(Lcom/discord/models/domain/ModelSubscription;)V
 
-    invoke-static {p2, v1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p2, v1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -4269,7 +4042,7 @@
     goto :goto_1
 
     :cond_1
-    const p1, 0x7f12123c
+    const p1, 0x7f121267
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -4278,7 +4051,7 @@
     goto :goto_1
 
     :cond_2
-    const p1, 0x7f121238
+    const p1, 0x7f121263
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -4287,7 +4060,7 @@
     goto :goto_1
 
     :cond_3
-    const p1, 0x7f12123b
+    const p1, 0x7f121266
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -4296,7 +4069,7 @@
     goto :goto_1
 
     :cond_4
-    const p1, 0x7f121237
+    const p1, 0x7f121262
 
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -4305,7 +4078,7 @@
     :goto_1
     const-string v0, "when (planType) {\n      \u2026       else -> \"\"\n      }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -4394,7 +4167,7 @@
 
     const-string p2, "context.getString(timeSt\u2026planType.price, context))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -4641,7 +4414,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$DowngradePremium;->INSTANCE:Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Event$DowngradePremium;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -4693,7 +4466,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     :cond_3
     :goto_1
@@ -4727,7 +4500,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$Companion;->create(Landroid/content/Context;)V
 
@@ -4758,7 +4531,7 @@
     :cond_0
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -4767,7 +4540,7 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AddPaymentSourceItem;->INSTANCE:Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AddPaymentSourceItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -4780,7 +4553,7 @@
     :cond_2
     sget-object v0, Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AttachPaymentSourceItem;->INSTANCE:Lcom/discord/widgets/settings/premium/PaymentSourcesSpinnerAdapter$DropdownItem$AttachPaymentSourceItem;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -4911,7 +4684,7 @@
 
     const-string v6, "requireContext()"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v4, v5}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -4966,7 +4739,7 @@
     :goto_0
     const-string v4, "when (currentPlanType.in\u2026ntPlanPrice\n      )\n    }"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v7, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
@@ -4976,15 +4749,15 @@
 
     const-string v4, "parentFragmentManager"
 
-    invoke-static {v8, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f121234
+    const v4, 0x7f12125f
 
     invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v9
 
-    const v4, 0x7f121232
+    const v4, 0x7f12125d
 
     const/4 v10, 0x3
 
@@ -5004,15 +4777,15 @@
 
     const-string v1, "getString(\n            R\u2026PlanPriceString\n        )"
 
-    invoke-static {v10, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f121233
+    const v1, 0x7f12125e
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
     move-result-object v11
 
-    const v1, 0x7f0a062c
+    const v1, 0x7f0a0632
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -5030,7 +4803,7 @@
 
     move-result-object v13
 
-    const v1, 0x7f120f59
+    const v1, 0x7f120f83
 
     invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -5124,7 +4897,7 @@
     :goto_1
     sget-object v3, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -5132,7 +4905,7 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -5172,7 +4945,7 @@
 
     const-string p1, "StringBuilder()\n        \u2026}\")\n          .toString()"
 
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -5287,7 +5060,7 @@
 
     const-string v3, "Observable\n            .\u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x2
 
@@ -5431,7 +5204,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {p3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p2
 
@@ -5446,7 +5219,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {p3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p2
 
@@ -5491,7 +5264,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/premium/PremiumUtils;->warmupBillingTabs(Landroid/content/Context;)Landroidx/browser/customtabs/CustomTabsServiceConnection;
 
@@ -5503,65 +5276,67 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f121700
+    const p1, 0x7f12172a
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121279
+    const p1, 0x7f1212a4
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
+
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getUploadPerks()Landroid/widget/TextView;
 
     move-result-object v2
 
-    const v3, 0x7f12116a
+    const/4 v3, 0x3
 
-    const/4 v4, 0x3
+    new-array v3, v3, [Ljava/lang/Object;
 
-    new-array v4, v4, [Ljava/lang/Object;
+    const v4, 0x7f1206a9
 
-    const v5, 0x7f1206a7
+    invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    move-result-object v4
 
-    move-result-object v5
+    aput-object v4, v3, p1
 
-    aput-object v5, v4, p1
+    const v4, 0x7f1206a8
 
-    const v5, 0x7f1206a6
+    invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    move-result-object v4
 
-    move-result-object v5
+    aput-object v4, v3, v0
 
-    aput-object v5, v4, v1
+    const v4, 0x7f1206a7
 
-    const v5, 0x7f1206a5
+    invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
-    invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
+    move-result-object v4
 
-    move-result-object v5
+    const/4 v5, 0x2
 
-    const/4 v6, 0x2
+    aput-object v4, v3, v5
 
-    aput-object v5, v4, v6
+    const v4, 0x7f121195
 
-    invoke-virtual {p0, v3, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v4, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -5571,27 +5346,27 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ae1
-
-    new-array v4, v1, [Ljava/lang/Object;
+    new-array v3, v0, [Ljava/lang/Object;
 
     invoke-static {}, Ljava/text/NumberFormat;->getPercentInstance()Ljava/text/NumberFormat;
 
-    move-result-object v5
+    move-result-object v4
 
-    const v7, 0x3e99999a    # 0.3f
+    const v6, 0x3e99999a    # 0.3f
 
-    invoke-static {v7}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+    invoke-static {v6}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
-    move-result-object v7
+    move-result-object v6
 
-    invoke-virtual {v5, v7}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v4, v6}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    aput-object v5, v4, p1
+    aput-object v4, v3, p1
 
-    invoke-virtual {p0, v3, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const v4, 0x7f120b07
+
+    invoke-virtual {p0, v4, v3}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -5601,52 +5376,45 @@
 
     move-result-object v2
 
-    const v3, 0x7f100089
+    new-array v3, v0, [Ljava/lang/Object;
 
-    new-array v4, v1, [Ljava/lang/Object;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v4
 
-    move-result-object v5
+    aput-object v4, v3, p1
 
-    aput-object v5, v4, p1
+    const v4, 0x7f10008b
 
-    invoke-virtual {v2, v3, v6, v4}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v2, v4, v5, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
 
     const-string v3, "resources.getQuantityStr\u2026PTIONS_WITH_PREMIUM\n    )"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getBoostCountText()Landroid/widget/TextView;
 
     move-result-object v3
 
-    const v4, 0x7f120ae2
+    new-array v4, v0, [Ljava/lang/Object;
 
-    new-array v5, v1, [Ljava/lang/Object;
+    aput-object v2, v4, p1
 
-    aput-object v2, v5, p1
+    const p1, 0x7f120b08
 
-    invoke-virtual {p0, v4, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
     invoke-static {v3, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    invoke-static {p0, v0, v1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtonText$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/models/domain/ModelSubscription;ILjava/lang/Object;)V
+    invoke-static {p0, v1, v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureButtonText$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/models/domain/ModelSubscription;ILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureGiftingButtons()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -5674,7 +5442,7 @@
 
     const-string v1, "ViewModelProvider(requir\u2026iumViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;
 
@@ -5686,7 +5454,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -5704,7 +5472,7 @@
 
     const-string v3, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x2
 
@@ -5799,17 +5567,17 @@
     return-void
 
     :cond_0
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$Companion.smali
index 841f1b1604..3f8544387f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$Companion.smali
@@ -36,22 +36,17 @@
 .method public final create(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$1.smali
index ff1f268a37..89122d8f6d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPremiumSwitchPlan.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->access$configureUI(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$2.smali
index 5254526638..4ba51d040b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPremiumSwitchPlan.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->access$handleEvent(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
index 61ab3bafc8..0150d7969b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
@@ -63,241 +63,169 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "flipper"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const/4 v2, 0x0
+    const-string v2, "retryButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getRetryButton()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "retryButton"
-
-    const-string v4, "getRetryButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "viewpager"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewpager()Landroidx/viewpager/widget/ViewPager;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "viewpager"
-
-    const-string v4, "getViewpager()Landroidx/viewpager/widget/ViewPager;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "viewPagerTabs"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewPagerTabs()Lcom/google/android/material/tabs/TabLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "viewPagerTabs"
-
-    const-string v4, "getViewPagerTabs()Lcom/google/android/material/tabs/TabLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "selectBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSelectBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "selectBtn"
-
-    const-string v4, "getSelectBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "cancelBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancelBtn()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancelBtn"
-
-    const-string v4, "getCancelBtn()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "intervalLogo"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntervalLogo()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "intervalLogo"
-
-    const-string v4, "getIntervalLogo()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "intervalHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntervalHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "intervalHeader"
-
-    const-string v4, "getIntervalHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "intervalInfo"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntervalInfo()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "intervalInfo"
-
-    const-string v4, "getIntervalInfo()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "intervalRadioGroup"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntervalRadioGroup()Landroid/widget/RadioGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "intervalRadioGroup"
-
-    const-string v4, "getIntervalRadioGroup()Landroid/widget/RadioGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "intervalRadioYear"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntervalRadioYear()Landroid/widget/RadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "intervalRadioYear"
-
-    const-string v4, "getIntervalRadioYear()Landroid/widget/RadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
-    const-class v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
+    const-string v2, "intervalRadioMonth"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIntervalRadioMonth()Landroid/widget/RadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "intervalRadioMonth"
-
-    const-string v4, "getIntervalRadioMonth()Landroid/widget/RadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
@@ -321,7 +249,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06fe
+    const v0, 0x7f0a0704
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -329,7 +257,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a070d
+    const v0, 0x7f0a0713
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -337,7 +265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a070a
+    const v0, 0x7f0a0710
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -345,7 +273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->viewpager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a070c
+    const v0, 0x7f0a0712
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -353,7 +281,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->viewPagerTabs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a070e
+    const v0, 0x7f0a0714
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -361,7 +289,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->selectBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06fd
+    const v0, 0x7f0a0703
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -369,7 +297,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0701
+    const v0, 0x7f0a0707
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -377,7 +305,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->intervalLogo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ff
+    const v0, 0x7f0a0705
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -385,7 +313,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->intervalHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0700
+    const v0, 0x7f0a0706
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -393,7 +321,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->intervalInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0702
+    const v0, 0x7f0a0708
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -401,7 +329,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->intervalRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0704
+    const v0, 0x7f0a070a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -409,7 +337,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->intervalRadioYear$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0703
+    const v0, 0x7f0a0709
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -450,7 +378,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -480,12 +408,12 @@
 
     if-ne p1, v0, :cond_0
 
-    const v0, 0x7f121273
+    const v0, 0x7f12129e
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f121272
+    const v0, 0x7f12129d
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->getIntervalRadioGroup()Landroid/widget/RadioGroup;
@@ -724,7 +652,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0804e4
+    const p2, 0x7f0804e7
 
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -743,7 +671,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0804e6
+    const p2, 0x7f0804e9
 
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -788,12 +716,12 @@
 
     if-nez p1, :cond_0
 
-    const p1, 0x7f121273
+    const p1, 0x7f12129e
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f121272
+    const p1, 0x7f12129d
 
     :goto_0
     invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -802,7 +730,7 @@
 
     const-string v0, "getString(\n          if \u2026ier_1\n          }\n      )"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->getSelectBtn()Landroid/widget/Button;
 
@@ -822,7 +750,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120f59
+    const v0, 0x7f120f83
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -864,7 +792,7 @@
 
     if-ne v0, v4, :cond_3
 
-    const v0, 0x7f12123c
+    const v0, 0x7f121267
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -887,7 +815,7 @@
 
     if-ne v0, v4, :cond_4
 
-    const v0, 0x7f121238
+    const v0, 0x7f121263
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -910,7 +838,7 @@
 
     if-ne v0, v4, :cond_5
 
-    const v0, 0x7f12123b
+    const v0, 0x7f121266
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -933,7 +861,7 @@
 
     if-ne v0, v4, :cond_6
 
-    const v0, 0x7f121237
+    const v0, 0x7f121262
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -947,7 +875,7 @@
     :goto_1
     const-string v4, "when {\n        state.cur\u2026       else -> \"\"\n      }"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->getSelectBtn()Landroid/widget/Button;
 
@@ -1174,7 +1102,7 @@
 
     const-string v2, "resources.getQuantityStr\u2026PTIONS_WITH_PREMIUM\n    )"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;->getTierInt()I
 
@@ -1194,7 +1122,7 @@
 
     const-string p2, "getString(R.string.billi\u2026plan_upgrade_body_tier_2)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -1217,7 +1145,7 @@
 
     const-string p2, "getString(R.string.billi\u2026an_downgrade_body_tier_1)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -1250,7 +1178,7 @@
 
     const-string p2, "getString(R.string.billi\u2026ear, numPremiumGuildSubs)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -1267,7 +1195,7 @@
 
     const-string p2, "getString(R.string.billi\u2026upgrade_body_tier_1_year)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -1280,7 +1208,7 @@
 
     const-string p2, "getString(R.string.billi\u2026lan_downgrade_body_month)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1394,7 +1322,7 @@
 
     const-string v2, "resources.getQuantityStr\u2026S_WITH_PREMIUM_YEAR\n    )"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -1446,7 +1374,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p3, v2}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -1473,7 +1401,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p3, v2}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -1500,7 +1428,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p3, v2}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -1527,7 +1455,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p3, v2}, Lcom/discord/utilities/billing/PremiumUtilsKt;->getFormattedPrice(ILandroid/content/Context;)Ljava/lang/CharSequence;
 
@@ -1557,7 +1485,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -1582,7 +1510,7 @@
 
     const-string p1, "getString(R.string.billi\u2026 price, freeMonthsString)"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -1603,7 +1531,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -1626,7 +1554,7 @@
 
     const-string p1, "getString(R.string.billing_price_per_month, price)"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_8
     :goto_2
@@ -1718,7 +1646,7 @@
 
     sget-object v0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Event$Dismiss;->INSTANCE:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel$Event$Dismiss;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1779,7 +1707,7 @@
 
     const-string v0, "requireActivity()"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -1832,7 +1760,7 @@
     :cond_0
     const-string p1, "pagerAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1842,17 +1770,19 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
+
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->getRetryButton()Landroid/view/View;
 
@@ -1891,13 +1821,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;->pagerAdapter:Lcom/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1921,7 +1844,7 @@
 
     const-string v1, "ViewModelProvider(\n     \u2026lanViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/premium/PremiumSwitchPlanViewModel;
 
@@ -1933,7 +1856,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1947,7 +1870,7 @@
 
     const-string v0, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v4, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan;
 
@@ -2004,12 +1927,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem.smali
index dd6f7700fe..ddb17ac363 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem.smali
@@ -39,7 +39,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem;
 
@@ -47,77 +47,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "icon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "icon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "name"
 
-    const/4 v3, 0x0
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "name"
-
-    const-string v5, "getName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "count"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCount()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "count"
-
-    const-string v5, "getCount()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "progress"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getProgress()Lcom/discord/views/premiumguild/PremiumGuildProgressView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "progress"
+    const/4 v2, 0x3
 
-    const-string v4, "getProgress()Lcom/discord/views/premiumguild/PremiumGuildProgressView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -127,7 +103,9 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0137
 
@@ -166,15 +144,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem;)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter;
@@ -272,7 +241,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;)V
     .locals 8
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -298,7 +269,7 @@
     :goto_0
     const-string v1, "data.guild.premiumSubscriptionCount ?: 0"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
@@ -346,7 +317,7 @@
 
     const-string v3, "itemView"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -354,13 +325,13 @@
 
     const-string v3, "itemView.context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v2
 
-    const v3, 0x7f1000d7
+    const v3, 0x7f1000d9
 
     const/4 v4, 0x1
 
@@ -401,15 +372,6 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item.smali
index 18c799b7b9..9974b4919b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item.smali
@@ -49,24 +49,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelGuild;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;->guild:Lcom/discord/models/domain/ModelGuild;
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;Lcom/discord/models/domain/ModelGuild;ILjava/lang/Object;)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;
@@ -99,22 +92,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;-><init>(Lcom/discord/models/domain/ModelGuild;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -132,7 +118,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$Item;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.smali
index 95a74ada00..b315962b51 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.smali
@@ -36,22 +36,15 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getOnGuildClickedListener$p(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter;)Lkotlin/jvm/functions/Function1;
@@ -88,31 +81,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionItems"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onGuildClickedListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     iput-object p2, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter;->onGuildClickedListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onGuildClickedListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "premiumGuildSubscriptionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -126,9 +107,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -146,13 +129,4 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1.smali
index b0c32f8dce..25d93ebc70 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "SettingsPremiumGuildViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1;->this$0:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;->access$handleStoreState(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$1.smali
index 2bd3da733a..1ffdf1c9a4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$1.smali
@@ -3,7 +3,7 @@
 .source "SettingsPremiumGuildViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;",
+        ">;"
     }
 .end annotation
 
@@ -62,7 +64,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getPremiumTier()Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$2.smali
index 79ced28a81..cf25e42770 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "SettingsPremiumGuildViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function4<",
         "Lcom/discord/stores/StorePremiumGuildSubscription$State;",
         "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
@@ -52,45 +52,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x4
+    const-class v2, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x4
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Ljava/util/Map;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Ljava/util/Map;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Ljava/util/Map;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -109,49 +91,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "p2"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "p3"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p4"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Ljava/util/Map;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p4"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory.smali
index 2a1beed92d..12238d9683 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory.smali
@@ -83,7 +83,7 @@
 
     sget-object v4, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$1;->INSTANCE:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$Factory$observeStores$1;
 
-    invoke-virtual {v3, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v3, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
@@ -110,7 +110,7 @@
 
     const-string v1, "Observable.combineLatest\u2026     ::StoreState\n      )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -129,7 +129,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
 
@@ -152,13 +154,4 @@
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/stores/StoreSubscriptions;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Subscribe.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Subscribe.smali
index b908f3ba82..153760e398 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Subscribe.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Subscribe.smali
@@ -125,7 +125,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Subscribe;->targetGuildId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer.smali
index 7aef5021e2..f036adde73 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;JLjava/lang/Long;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "slot"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-object p4, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer;->targetGuildId:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "slot"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;JLjava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -123,22 +118,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;JLjava/lang/Long;)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "slot"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer;-><init>(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;JLjava/lang/Long;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "slot"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -156,7 +144,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer;->slot:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -174,7 +162,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer;->targetGuildId:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState.smali
index 225d9192f3..dabbe9c2ac 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState.smali
@@ -51,15 +51,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionState"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "subscriptionState"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "guilds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userPremiumTier"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -72,34 +78,6 @@
     iput-object p4, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;->userPremiumTier:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
     return-void
-
-    :cond_0
-    const-string p1, "userPremiumTier"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "subscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Ljava/util/Map;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;ILjava/lang/Object;)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;
@@ -201,49 +179,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionState"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "subscriptionState"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "guilds"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userPremiumTier"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;-><init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Ljava/util/Map;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "userPremiumTier"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "subscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "premiumGuildSubscriptionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -261,7 +217,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -271,7 +227,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;->subscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -281,7 +237,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;->guilds:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -291,7 +247,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;->userPremiumTier:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded.smali
index 47801b9889..e7fc9270fd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded.smali
@@ -61,14 +61,20 @@
         }
     .end annotation
 
+    const-string v0, "premiumGuildSubscriptionItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sampleGuildItems"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userPremiumTier"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p5, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-boolean p1, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;->canCancelBoosts:Z
@@ -82,27 +88,6 @@
     iput-object p5, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;->userPremiumTier:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
     return-void
-
-    :cond_0
-    const-string p1, "userPremiumTier"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sampleGuildItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "premiumGuildSubscriptionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;ZLjava/util/List;Ljava/util/List;Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;ILjava/lang/Object;)Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;
@@ -247,13 +232,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionItems"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "sampleGuildItems"
 
-    if-eqz p5, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userPremiumTier"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;
 
@@ -272,27 +261,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;-><init>(ZLjava/util/List;Ljava/util/List;Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction;Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "userPremiumTier"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sampleGuildItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "premiumGuildSubscriptionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -316,7 +284,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;->premiumGuildSubscriptionItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -326,7 +294,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;->sampleGuildItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -336,7 +304,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;->pendingAction:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -346,7 +314,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;->userPremiumTier:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali
index 3ae5e27d58..dd2fdb78db 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "SettingsPremiumGuildViewModel.kt"
 
 
@@ -16,7 +16,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState;",
         ">;"
     }
@@ -53,7 +53,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StorePremiumGuildSubscription;Lcom/discord/stores/StoreSubscriptions;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -65,17 +65,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storePremiumGuildSubscription"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "storeSubscriptions"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loading;
+    const-string v0, "storeObservable"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loading;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;->storePremiumGuildSubscription:Lcom/discord/stores/StorePremiumGuildSubscription;
 
@@ -87,13 +91,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
+
+    new-instance v6, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1;-><init>(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -101,40 +113,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$1;-><init>(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeSubscriptions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storePremiumGuildSubscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$StoreState;)V
@@ -297,7 +282,7 @@
 
     new-instance p1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$HeaderItem;
 
-    const v2, 0x7f1211cb
+    const v2, 0x7f1211f6
 
     invoke-direct {p1, v2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$HeaderItem;-><init>(I)V
 
@@ -461,7 +446,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v2}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -591,7 +576,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -611,7 +596,7 @@
 
     const/4 v0, 0x4
 
-    invoke-static {p1, v0}, Lj0/i/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->take(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object p1
 
@@ -699,7 +684,7 @@
     sget-object p1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loading;->INSTANCE:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loading;
 
     :goto_8
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -711,7 +696,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -760,7 +745,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2
     return-void
@@ -771,7 +756,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -806,7 +791,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -833,7 +818,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -940,7 +925,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_3
     return-void
@@ -961,7 +946,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1006,7 +991,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -1017,24 +1002,21 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
+    const-string v0, "slot"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     move-object v1, v0
 
     check-cast v1, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState$Loaded;
@@ -1073,15 +1055,8 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "slot"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion.smali
index 5ca3fbd068..2bd7f5730e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-class v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
index 793417b78d..75b2b8d438 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
index 9d9624f4f4..fd6181bc25 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.smali
index 02cac40e56..3fe0d5f8ab 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
         "Ljava/lang/Long;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;J)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "slot"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1;->this$0:Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
@@ -93,13 +95,4 @@
     invoke-virtual {p1, v0, p2}, Lcom/discord/widgets/guilds/list/WidgetGuildSelector$Companion;->createForResult(Landroidx/fragment/app/Fragment;Ljava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "slot"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$2.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$2.smali
index e9b405a7a9..fd40676f7e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$3.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$3.smali
index c91f03bc39..9260b1c830 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$4.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$4.smali
index 8173346735..f7ea5bc571 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleSampleGuildSelected"
+
+    const-string v5, "handleSampleGuildSelected(J)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSampleGuildSelected"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleSampleGuildSelected(J)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 2
 
@@ -87,7 +71,7 @@
 .method public final invoke(J)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$7.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$7.smali
index c6faa865c3..e7654c8114 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali
index 7d94b30efd..1fa76dc783 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali
@@ -61,221 +61,155 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "subtextContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubtextContainer()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "subtextContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSubtextContainer()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const/4 v2, 0x0
+    const-string v2, "subtextTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSubtextTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "subtextTv"
-
-    const-string v4, "getSubtextTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "retry"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRetry()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "retry"
-
-    const-string v4, "getRetry()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "premiumGuildRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPremiumGuildRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "premiumGuildRecycler"
-
-    const-string v4, "getPremiumGuildRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "sampleGuildsRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSampleGuildsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "sampleGuildsRecycler"
-
-    const-string v4, "getSampleGuildsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "flipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "flipper"
-
-    const-string v4, "getFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "guildSubscriptionUpsellView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildSubscriptionUpsellView()Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildSubscriptionUpsellView"
-
-    const-string v4, "getGuildSubscriptionUpsellView()Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "subscriptionMarketingView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubscriptionMarketingView()Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "subscriptionMarketingView"
-
-    const-string v4, "getSubscriptionMarketingView()Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "noGuildsIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNoGuildsIv()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "noGuildsIv"
-
-    const-string v4, "getNoGuildsIv()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "noGuildsTitleTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNoGuildsTitleTv()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "noGuildsTitleTv"
-
-    const-string v4, "getNoGuildsTitleTv()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;
+    const-string v2, "noGuildsSubtitleTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNoGuildsSubtitleTv()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "noGuildsSubtitleTv"
-
-    const-string v4, "getNoGuildsSubtitleTv()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
@@ -299,7 +233,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0898
+    const v0, 0x7f0a089e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -307,7 +241,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->subtextContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0897
+    const v0, 0x7f0a089d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -315,7 +249,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->subtextTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0895
+    const v0, 0x7f0a089b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -323,7 +257,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0894
+    const v0, 0x7f0a089a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -331,7 +265,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->premiumGuildRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0896
+    const v0, 0x7f0a089c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -339,7 +273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->sampleGuildsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a088f
+    const v0, 0x7f0a0895
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -347,7 +281,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0899
+    const v0, 0x7f0a089f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -355,7 +289,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->guildSubscriptionUpsellView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0890
+    const v0, 0x7f0a0896
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -363,7 +297,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->subscriptionMarketingView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0891
+    const v0, 0x7f0a0897
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -371,7 +305,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->noGuildsIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0893
+    const v0, 0x7f0a0899
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -379,7 +313,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->noGuildsTitleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0892
+    const v0, 0x7f0a0898
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -402,7 +336,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -756,13 +690,13 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     const/4 v1, 0x2
 
-    invoke-static {p2, v0, p1, v1}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {p2, v0, p1, v1}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     return-void
 .end method
@@ -849,7 +783,7 @@
     :cond_1
     const-string p1, "premiumGuildSubscriptionsAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -897,7 +831,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Subscribe;->getTargetGuildId()Ljava/lang/Long;
 
@@ -922,7 +856,7 @@
     goto/16 :goto_2
 
     :cond_3
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -947,7 +881,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Transfer;->getPreviousGuildId()J
 
@@ -976,7 +910,7 @@
     goto/16 :goto_2
 
     :cond_5
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -985,7 +919,9 @@
 
     const-string v3, "extra_slot_id"
 
-    const-string v5, "parentFragmentManager"
+    const-string v5, "fragmentManager"
+
+    const-string v6, "parentFragmentManager"
 
     if-eqz v2, :cond_9
 
@@ -993,18 +929,20 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Cancel;
 
     invoke-virtual {v0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Cancel;->getSlotId()J
 
-    move-result-wide v7
+    move-result-wide v8
 
     if-eqz v2, :cond_8
 
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lf/a/a/c/a;
 
     invoke-direct {v0}, Lf/a/a/c/a;-><init>()V
@@ -1013,7 +951,7 @@
 
     invoke-direct {v2}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {v2, v3, v7, v8}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v2, v3, v8, v9}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
@@ -1023,7 +961,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v0, v6, v2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {v0, v7, v2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->viewModel:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
 
@@ -1034,7 +972,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1050,18 +988,20 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-static {v6, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Uncancel;
 
     invoke-virtual {v0}, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel$PendingAction$Uncancel;->getSlotId()J
 
-    move-result-wide v7
+    move-result-wide v8
 
     if-eqz v2, :cond_b
 
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lf/a/a/c/b;
 
     invoke-direct {v0}, Lf/a/a/c/b;-><init>()V
@@ -1070,7 +1010,7 @@
 
     invoke-direct {v2}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {v2, v3, v7, v8}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+    invoke-virtual {v2, v3, v8, v9}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->setArguments(Landroid/os/Bundle;)V
 
@@ -1080,7 +1020,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v0, v6, v2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {v0, v7, v2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->viewModel:Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
 
@@ -1091,7 +1031,7 @@
     goto :goto_2
 
     :cond_a
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -1149,7 +1089,7 @@
     :cond_d
     const-string p1, "sampleGuildsAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1244,16 +1184,16 @@
     :cond_1
     const-string p2, "viewModel"
 
-    invoke-static {p2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.models.domain.GuildId /* = kotlin.Long */"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -1265,23 +1205,25 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p0, v1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v2, 0x0
 
-    const v3, 0x7f121700
+    invoke-static {p0, v0, v1, v2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+    const v3, 0x7f12172a
 
     invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v3, 0x7f12120b
+    const v3, 0x7f121236
 
     invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1325,9 +1267,9 @@
 
     const-wide v4, 0x53d357e4d0L
 
-    invoke-virtual {v3, v4, v5, v0}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v4, v5, v2}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->getSubtextTv()Landroid/widget/TextView;
 
@@ -1339,21 +1281,21 @@
 
     const-string p1, "view.context"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p1, 0x7f12120a
+    const p1, 0x7f121235
 
-    new-array v2, v2, [Ljava/lang/Object;
+    new-array v1, v1, [Ljava/lang/Object;
 
-    aput-object v0, v2, v1
+    aput-object v2, v1, v0
 
-    invoke-virtual {p0, p1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v5
 
     const-string p1, "getString(\n            R\u2026pdeskArticleUrl\n        )"
 
-    invoke-static {v5, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x0
 
@@ -1375,36 +1317,29 @@
 
     move-result-object p1
 
-    new-instance v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1;
+    new-instance v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1;
 
-    invoke-direct {v2, v0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$1;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->getRetry()Landroid/view/View;
 
     move-result-object p1
 
-    new-instance v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$2;
+    new-instance v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$2;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$2;-><init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$onViewBound$2;-><init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;)V
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription;->getPremiumGuildRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1432,7 +1367,7 @@
 
     const-string v1, "ViewModelProvider(\n     \u2026ildViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel;
 
@@ -1440,7 +1375,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1450,7 +1385,7 @@
 
     const-string v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -1481,7 +1416,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali
index ad148e0ae8..ef9bdd740f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali
@@ -43,7 +43,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;
 
@@ -51,113 +51,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "banner"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "banner"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "gradient"
 
-    const/4 v3, 0x0
+    const-string v3, "getGradient()Landroid/view/View;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "gradient"
-
-    const-string v5, "getGradient()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "name"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getName()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "name"
-
-    const-string v5, "getName()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "icon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "icon"
-
-    const-string v5, "getIcon()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "boostedCount"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBoostedCount()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "boostedCount"
-
-    const-string v5, "getBoostedCount()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "progressView"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getProgressView()Lcom/discord/views/premiumguild/PremiumGuildProgressView;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "progressView"
+    const/4 v2, 0x5
 
-    const-string v4, "getProgressView()Lcom/discord/views/premiumguild/PremiumGuildProgressView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -167,7 +131,9 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0135
 
@@ -222,15 +188,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;->progressView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -358,9 +315,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
     .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -378,9 +335,9 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v1, "itemView"
+    const-string v0, "itemView"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -388,23 +345,25 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getBanner()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getBanner()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    const-string v3, "context"
+    const-string v2, "context"
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;->getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v0
 
     sget-object v5, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
@@ -412,11 +371,11 @@
 
     move-result-object v6
 
-    invoke-static {v5, v6, v0, v2, v0}, Lcom/discord/utilities/icon/IconUtils;->getBannerForGuild$default(Lcom/discord/utilities/icon/IconUtils;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
+    invoke-static {v5, v6, v3, v1, v3}, Lcom/discord/utilities/icon/IconUtils;->getBannerForGuild$default(Lcom/discord/utilities/icon/IconUtils;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v1, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
+    invoke-virtual {v0, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;->getGradient()Landroid/view/View;
 
@@ -429,17 +388,17 @@
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;->getBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v5, 0x7f04007a
 
-    invoke-static {p1, v5, v4, v2, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {p1, v5, v4, v1, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
-    move-result v0
+    move-result v1
 
-    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setBackgroundResource(I)V
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setBackgroundResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;->getGradient()Landroid/view/View;
 
@@ -494,13 +453,13 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v0
 
-    const v1, 0x7f1000df
+    const v1, 0x7f1000e1
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$GuildItem;->getSubscriptionCount()I
 
@@ -526,13 +485,13 @@
 
     const-string v1, "context.resources.getQua\u2026subscriptionCount\n      )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem;->getBoostedCount()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const v2, 0x7f1211e5
+    const v2, 0x7f121210
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -574,6 +533,10 @@
     move-result-object p2
 
     :goto_1
+    const-string v1, "data.guild.premiumSubscriptionCount ?: 0"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
 
     move-result p2
@@ -590,13 +553,6 @@
     invoke-direct {p1, p2}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem.smali
index a77da069a1..59cbaf6469 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem.smali
@@ -39,25 +39,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem;
 
-    const-class v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem;
+    const-string v2, "header"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "header"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeader()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -67,7 +61,9 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0136
 
@@ -82,15 +78,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$HeaderListItem;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getHeader()Landroid/widget/TextView;
@@ -118,7 +105,9 @@
 .method public onConfigure(ILcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
     .locals 2
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -134,7 +123,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -162,15 +151,6 @@
     invoke-direct {p1, p2}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$GuildItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$GuildItem.smali
index 181841a651..04998429f1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$GuildItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$GuildItem.smali
@@ -102,7 +102,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$GuildItem;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem.smali
index f1598e19dc..1a01cbcd3f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "subscriptionSlot"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-object p2, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->subscriptionEndsAt:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "subscriptionSlot"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
@@ -89,22 +84,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;Ljava/lang/String;)Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscriptionSlot"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;-><init>(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "subscriptionSlot"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +110,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->subscriptionSlot:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -132,7 +120,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->subscriptionEndsAt:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1.smali
index f47ed8c1c3..d5e43e6fd7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1.smali
@@ -96,7 +96,7 @@
 
     const-string v1, "view"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v1, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;->$hasCooldown:Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
index eb4587c408..e8392d1240 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
@@ -39,7 +39,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;
 
@@ -47,77 +47,53 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "date"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDate()Landroid/widget/TextView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "date"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getDate()Landroid/widget/TextView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "cooldown"
 
-    const/4 v3, 0x0
+    const-string v3, "getCooldown()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "cooldown"
-
-    const-string v5, "getCooldown()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "action"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAction()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "action"
-
-    const-string v5, "getAction()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "cancelled"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancelled()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "cancelled"
+    const/4 v2, 0x3
 
-    const-string v4, "getCancelled()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x3
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -127,7 +103,9 @@
 .method public constructor <init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0134
 
@@ -166,15 +144,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->cancelled$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;)Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;
@@ -308,7 +277,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0a05d5
+    const v0, 0x7f0a05db
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -318,7 +287,7 @@
 
     move-result-object v0
 
-    const v2, 0x7f0a05d4
+    const v2, 0x7f0a05da
 
     invoke-interface {v0, v2}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -328,7 +297,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0a05d6
+    const v3, 0x7f0a05dc
 
     invoke-interface {v2, v3}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -344,7 +313,7 @@
 
     const-string v4, "transfer"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x1
 
@@ -354,7 +323,7 @@
 
     const-string p2, "cancel"
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez v3, :cond_0
 
@@ -370,7 +339,7 @@
 
     const-string p2, "uncancel"
 
-    invoke-static {v2, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v2, v3}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
@@ -400,269 +369,83 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
-    .locals 30
+    .locals 29
 
     move-object/from16 v0, p0
 
     move-object/from16 v1, p2
 
-    if-eqz v1, :cond_12
+    const-string v2, "data"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    instance-of v3, v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
+    instance-of v2, v1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
 
-    if-eqz v3, :cond_11
+    if-eqz v2, :cond_11
 
-    iget-object v3, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v2, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const-string v4, "itemView"
+    const-string v3, "itemView"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
+    move-result-object v3
+
+    invoke-interface {v3}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+
+    move-result-wide v12
+
+    move-object v3, v1
+
+    check-cast v3, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
+
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
     move-result-object v4
 
-    invoke-interface {v4}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    move-result-wide v13
+    move-result-object v4
 
-    move-object v4, v1
+    if-eqz v4, :cond_0
 
-    check-cast v4, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
-    invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+    move-result-wide v4
 
-    move-result-object v5
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_0
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
-
-    move-result-wide v5
-
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v5
+    move-result-object v4
 
     goto :goto_0
 
     :cond_0
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_0
     const/4 v15, 0x1
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
-    if-eqz v5, :cond_1
+    if-eqz v4, :cond_1
 
-    const/4 v11, 0x1
+    const/4 v10, 0x1
 
     goto :goto_1
 
     :cond_1
-    const/4 v11, 0x0
-
-    :goto_1
-    invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
-
-    move-result-wide v5
-
-    cmp-long v7, v5, v13
-
-    if-lez v7, :cond_2
-
-    const/4 v10, 0x1
-
-    goto :goto_2
-
-    :cond_2
     const/4 v10, 0x0
 
-    :goto_2
-    invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_3
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
-
-    move-result-wide v5
-
-    goto :goto_3
-
-    :cond_3
-    const-wide/16 v5, 0x0
-
-    :goto_3
-    const/16 v7, 0x16
-
-    ushr-long/2addr v5, v7
-
-    const-wide v16, 0x14aa2cab000L
-
-    add-long v5, v5, v16
-
-    invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
-
-    move-result-object v7
-
-    invoke-virtual {v7}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCanceled()Z
-
-    move-result v16
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getCancelled()Landroid/view/View;
-
-    move-result-object v7
-
-    if-eqz v16, :cond_4
-
-    const/4 v8, 0x0
-
-    goto :goto_4
-
-    :cond_4
-    const/16 v8, 0x8
-
-    :goto_4
-    invoke-virtual {v7, v8}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getDate()Landroid/widget/TextView;
-
-    move-result-object v7
-
-    const-string v8, "MMMM dd, yyy"
-
-    invoke-static {v8, v5, v6}, Landroid/text/format/DateFormat;->format(Ljava/lang/CharSequence;J)Ljava/lang/CharSequence;
-
-    move-result-object v5
-
-    invoke-virtual {v7, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    const-string v9, ""
-
-    const-string v8, "context"
-
-    if-eqz v16, :cond_5
-
-    invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionEndsAt()Ljava/lang/String;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_5
-
-    const v7, 0x7f1211fe
-
-    new-array v5, v15, [Ljava/lang/Object;
-
-    sget-object v20, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
-
-    invoke-static {v3, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/16 v21, 0x0
-
-    const/16 v22, 0x0
-
-    const/16 v23, 0x0
-
-    const/16 v24, 0x1c
-
-    const/16 v25, 0x0
-
-    move-object v2, v5
-
-    move-object/from16 v5, v20
-
-    const v15, 0x7f1211fe
-
-    move-object v7, v3
-
-    move-object/from16 v26, v8
-
-    move-object/from16 v8, v21
-
-    move-object/from16 v27, v9
-
-    move-object/from16 v9, v22
-
-    move/from16 v28, v10
-
-    move/from16 v10, v23
-
-    move/from16 v29, v11
-
-    move/from16 v11, v24
-
-    const/4 v15, 0x0
-
-    move-object/from16 v12, v25
-
-    invoke-static/range {v5 .. v12}, Lcom/discord/utilities/time/TimeUtils;->renderUtcDate$default(Lcom/discord/utilities/time/TimeUtils;Ljava/lang/String;Landroid/content/Context;Ljava/lang/String;Ljava/text/DateFormat;IILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v5
-
-    aput-object v5, v2, v15
-
-    const v5, 0x7f1211fe
-
-    invoke-virtual {v3, v5, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v5, "context.getString(\n     \u2026(it, context)\n          )"
-
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v5, 0x4
-
-    const-string v6, "*"
-
-    move-object/from16 v12, v27
-
-    invoke-static {v2, v6, v12, v15, v5}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v2
-
-    goto :goto_5
-
-    :cond_5
-    move-object/from16 v26, v8
-
-    move-object v12, v9
-
-    move/from16 v28, v10
-
-    move/from16 v29, v11
-
-    const/4 v15, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_5
-    move/from16 v10, v28
-
-    if-eqz v10, :cond_6
-
-    invoke-virtual {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+    :goto_1
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
 
     move-result-object v4
 
@@ -670,232 +453,420 @@
 
     move-result-wide v4
 
-    sub-long/2addr v4, v13
+    cmp-long v6, v4, v12
 
-    const-wide/16 v6, 0x0
+    if-lez v6, :cond_2
 
-    invoke-static {v4, v5, v6, v7}, Ljava/lang/Math;->max(JJ)J
+    const/4 v9, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v9, 0x0
+
+    :goto_2
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_3
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
 
     move-result-wide v4
 
-    const-wide/32 v6, 0x5265c00
+    goto :goto_3
 
-    div-long v8, v4, v6
+    :cond_3
+    const-wide/16 v4, 0x0
 
-    mul-long v6, v6, v8
+    :goto_3
+    const/16 v6, 0x16
 
-    sub-long/2addr v4, v6
+    ushr-long/2addr v4, v6
 
-    const-wide/32 v6, 0x36ee80
+    const-wide v16, 0x14aa2cab000L
 
-    div-long v13, v4, v6
+    add-long v4, v4, v16
 
-    mul-long v6, v6, v13
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
 
-    sub-long/2addr v4, v6
+    move-result-object v6
 
-    const-wide/32 v6, 0xea60
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCanceled()Z
 
-    div-long/2addr v4, v6
+    move-result v16
 
-    sget-object v6, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getCancelled()Landroid/view/View;
 
-    move-object/from16 v7, v26
+    move-result-object v6
 
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    if-eqz v16, :cond_4
 
-    const/4 v11, 0x3
+    const/4 v7, 0x0
 
-    new-array v11, v11, [Ljava/lang/Object;
+    goto :goto_4
 
-    invoke-static {v8, v9}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    :cond_4
+    const/16 v7, 0x8
 
-    move-result-object v8
+    :goto_4
+    invoke-virtual {v6, v7}, Landroid/view/View;->setVisibility(I)V
 
-    aput-object v8, v11, v15
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getDate()Landroid/widget/TextView;
 
-    invoke-static {v13, v14}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    move-result-object v6
 
-    move-result-object v8
+    const-string v7, "MMMM dd, yyy"
 
-    const/4 v13, 0x1
-
-    aput-object v8, v11, v13
-
-    invoke-static {v4, v5}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+    invoke-static {v7, v4, v5}, Landroid/text/format/DateFormat;->format(Ljava/lang/CharSequence;J)Ljava/lang/CharSequence;
 
     move-result-object v4
 
-    const/4 v14, 0x2
+    invoke-virtual {v6, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    aput-object v4, v11, v14
+    const-string v8, ""
 
-    const v4, 0x7f121183
+    const-string v7, "context"
 
-    invoke-virtual {v3, v4, v11}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    if-eqz v16, :cond_5
+
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionEndsAt()Ljava/lang/String;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_5
+
+    const v6, 0x7f121229
+
+    new-array v4, v15, [Ljava/lang/Object;
+
+    sget-object v19, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
+
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    const/16 v22, 0x0
+
+    const/16 v23, 0x1c
+
+    const/16 v24, 0x0
+
+    move-object v14, v4
+
+    move-object/from16 v4, v19
+
+    const v15, 0x7f121229
+
+    move-object v6, v2
+
+    move-object/from16 v25, v7
+
+    move-object/from16 v7, v20
+
+    move-object/from16 v26, v8
+
+    move-object/from16 v8, v21
+
+    move/from16 v27, v9
+
+    move/from16 v9, v22
+
+    move/from16 v28, v10
+
+    move/from16 v10, v23
+
+    const/4 v15, 0x0
+
+    move-object/from16 v11, v24
+
+    invoke-static/range {v4 .. v11}, Lcom/discord/utilities/time/TimeUtils;->renderUtcDate$default(Lcom/discord/utilities/time/TimeUtils;Ljava/lang/String;Landroid/content/Context;Ljava/lang/String;Ljava/text/DateFormat;IILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object v4
 
-    const-string v5, "context.getString(\n     \u2026.toString()\n            )"
+    aput-object v4, v14, v15
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const v4, 0x7f121229
 
-    const/4 v8, 0x0
+    invoke-virtual {v2, v4, v14}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    const/4 v9, 0x0
+    move-result-object v4
+
+    const-string v5, "context.getString(\n     \u2026(it, context)\n          )"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x4
+
+    const-string v6, "*"
+
+    move-object/from16 v14, v26
+
+    invoke-static {v4, v6, v14, v15, v5}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v4
+
+    move-object v11, v4
+
+    goto :goto_5
+
+    :cond_5
+    move-object/from16 v25, v7
+
+    move-object v14, v8
+
+    move/from16 v27, v9
+
+    move/from16 v28, v10
+
+    const/4 v15, 0x0
 
     const/4 v11, 0x0
 
-    const/16 v18, 0x1c
+    :goto_5
+    move/from16 v9, v27
 
-    const/16 v19, 0x0
+    if-eqz v9, :cond_6
 
-    move-object v5, v6
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$PremiumGuildSubscriptionItem;->getSubscriptionSlot()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
+
+    move-result-wide v3
+
+    sub-long/2addr v3, v12
+
+    const-wide/16 v5, 0x0
+
+    invoke-static {v3, v4, v5, v6}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v3
+
+    const-wide/32 v5, 0x5265c00
+
+    div-long v7, v3, v5
+
+    mul-long v5, v5, v7
+
+    sub-long/2addr v3, v5
+
+    const-wide/32 v5, 0x36ee80
+
+    div-long v12, v3, v5
+
+    mul-long v5, v5, v12
+
+    sub-long/2addr v3, v5
+
+    const-wide/32 v5, 0xea60
+
+    div-long/2addr v3, v5
+
+    sget-object v5, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
+
+    move-object/from16 v6, v25
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v10, 0x3
+
+    new-array v10, v10, [Ljava/lang/Object;
+
+    invoke-static {v7, v8}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v7
+
+    aput-object v7, v10, v15
+
+    invoke-static {v12, v13}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v7
+
+    const/4 v12, 0x1
+
+    aput-object v7, v10, v12
+
+    invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v13, 0x2
+
+    aput-object v3, v10, v13
+
+    const v3, 0x7f1211ae
+
+    invoke-virtual {v2, v3, v10}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "context.getString(\n     \u2026.toString()\n            )"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v17, 0x1c
+
+    const/16 v18, 0x0
+
+    move-object v4, v5
+
+    move-object v5, v2
+
+    move-object v12, v6
 
     move-object v6, v3
 
-    move-object v13, v7
+    move v3, v9
 
-    move-object v7, v4
+    move-object v9, v10
 
-    move v4, v10
+    move/from16 v10, v17
 
-    move-object v10, v11
+    move-object v13, v11
 
-    move/from16 v11, v18
+    move-object/from16 v11, v18
 
-    move-object/from16 v18, v12
+    invoke-static/range {v4 .. v11}, Lcom/discord/utilities/textprocessing/Parsers;->parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Ljava/lang/CharSequence;
 
-    move-object/from16 v12, v19
-
-    invoke-static/range {v5 .. v12}, Lcom/discord/utilities/textprocessing/Parsers;->parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;Ljava/lang/Integer;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Ljava/lang/CharSequence;
-
-    move-result-object v5
+    move-result-object v4
 
     goto :goto_6
 
     :cond_6
-    move v4, v10
+    move v3, v9
 
-    move-object/from16 v18, v12
+    move-object v13, v11
 
-    move-object/from16 v13, v26
+    move-object/from16 v12, v25
 
-    const/4 v14, 0x2
-
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_6
-    if-nez v2, :cond_7
+    if-nez v13, :cond_7
 
-    if-nez v5, :cond_7
+    if-nez v4, :cond_7
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getCooldown()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v4
 
     const/16 v5, 0x8
 
-    invoke-virtual {v2, v5}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v4, v5}, Landroid/view/View;->setVisibility(I)V
 
     goto :goto_7
 
     :cond_7
-    if-eqz v2, :cond_8
+    if-eqz v13, :cond_8
 
-    if-eqz v5, :cond_8
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getCooldown()Landroid/widget/TextView;
-
-    move-result-object v6
-
-    new-instance v7, Ljava/lang/StringBuilder;
-
-    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/StringBuilder;
-
-    const-string v5, " - "
-
-    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
-
-    goto :goto_7
-
-    :cond_8
-    if-eqz v2, :cond_9
-
-    if-nez v5, :cond_9
+    if-eqz v4, :cond_8
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getCooldown()Landroid/widget/TextView;
 
     move-result-object v5
 
-    invoke-static {v5, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    new-instance v6, Ljava/lang/StringBuilder;
+
+    invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/StringBuilder;
+
+    const-string v4, " - "
+
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-static {v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+
+    goto :goto_7
+
+    :cond_8
+    if-eqz v13, :cond_9
+
+    if-nez v4, :cond_9
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getCooldown()Landroid/widget/TextView;
+
+    move-result-object v4
+
+    invoke-static {v4, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     goto :goto_7
 
     :cond_9
-    if-nez v2, :cond_a
+    if-nez v13, :cond_a
 
-    if-eqz v5, :cond_a
+    if-eqz v4, :cond_a
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getCooldown()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v5
 
-    invoke-static {v2, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     :cond_a
     :goto_7
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getAction()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v4
 
-    move/from16 v12, v29
+    move/from16 v11, v28
 
-    if-nez v12, :cond_c
+    if-nez v11, :cond_c
 
-    if-eqz v4, :cond_b
+    if-eqz v3, :cond_b
 
     goto :goto_8
 
     :cond_b
-    const v5, 0x7f121202
+    const v5, 0x7f12122d
 
-    invoke-virtual {v3, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v2, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v9
+    move-result-object v8
 
     goto :goto_9
 
     :cond_c
     :goto_8
-    move-object/from16 v9, v18
+    move-object v8, v14
 
     :goto_9
-    invoke-virtual {v2, v9}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v4, v8}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    if-eqz v4, :cond_f
+    if-eqz v3, :cond_f
 
     if-nez v16, :cond_d
 
-    iget-object v2, v0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    iget-object v4, v0, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    check-cast v2, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;
+    check-cast v4, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;
 
-    invoke-static {v2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;->access$getCanCancelBoosts$p(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;)Z
+    invoke-static {v4}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;->access$getCanCancelBoosts$p(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;)Z
 
-    move-result v2
+    move-result v4
 
-    if-nez v2, :cond_f
+    if-nez v4, :cond_f
 
     :cond_d
     if-eqz v16, :cond_e
@@ -903,24 +874,26 @@
     goto :goto_a
 
     :cond_e
-    const/16 v20, 0x0
+    const/16 v19, 0x0
 
     goto :goto_b
 
     :cond_f
     :goto_a
-    const/16 v20, 0x1
+    const/16 v19, 0x1
 
     :goto_b
-    if-eqz v20, :cond_10
+    if-eqz v19, :cond_10
 
-    invoke-static {v3, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0402ac
+    const v4, 0x7f0402ac
 
-    const/4 v5, 0x0
+    const/4 v5, 0x2
 
-    invoke-static {v3, v2, v15, v14, v5}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    const/4 v6, 0x0
+
+    invoke-static {v2, v4, v15, v5, v6}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result v2
 
@@ -932,19 +905,19 @@
     :goto_c
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getAction()Landroid/widget/TextView;
 
-    move-result-object v3
+    move-result-object v4
 
-    invoke-virtual {v3, v15, v15, v2, v15}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
+    invoke-virtual {v4, v15, v15, v2, v15}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;->getAction()Landroid/widget/TextView;
 
     move-result-object v2
 
-    new-instance v3, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;
+    new-instance v4, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;
 
-    invoke-direct {v3, v0, v12, v4, v1}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;ZZLcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
+    invoke-direct {v4, v0, v11, v3, v1}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem$onConfigure$1;-><init>(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem;ZZLcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item;)V
 
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v2, v4}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
 
@@ -956,15 +929,6 @@
     invoke-direct {v1, v2}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
     throw v1
-
-    :cond_12
-    const-string v1, "data"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$cancelListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$cancelListener$1.smali
index 2a79203b70..1daa17102d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$cancelListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$cancelListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$cancelListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$subscribeListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$subscribeListener$1.smali
index 1f4200b185..3882c21649 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$subscribeListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$subscribeListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$subscribeListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$transferListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$transferListener$1.smali
index 3dc0c22708..29be009dba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$transferListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$transferListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$transferListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetSettingsPremiumGuildSubscriptionAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
         "Ljava/lang/Long;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -78,16 +78,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;J)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.smali
index 31111ffe1e..85874a575c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.smali
@@ -68,9 +68,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -87,15 +89,6 @@
     iput-object p1, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;->cancelListener:Lkotlin/jvm/functions/Function2;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getCanCancelBoosts$p(Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;)Z
@@ -195,15 +188,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "premiumGuildSubscriptionItems"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "subscribeListener"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "transferListener"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cancelListener"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
@@ -216,34 +215,6 @@
     iput-boolean p5, p0, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter;->canCancelBoosts:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "cancelListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "transferListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "subscribeListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "premiumGuildSubscriptionItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -257,7 +228,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -270,7 +241,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_2
 
@@ -309,13 +282,4 @@
 
     :goto_0
     return-object p1
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali
index 68272fe704..fe1f26f01f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/net/Uri;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali
index 9bed5fc082..5f890843ab 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder.smali
@@ -22,7 +22,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;Landroid/view/View;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -31,7 +31,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;
 
@@ -42,15 +44,6 @@
     iput-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;->draweeView:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
index b47735bfaa..c7a2111484 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Adapter.smali
@@ -61,11 +61,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "inputModel"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "onItemClickListener"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -76,20 +78,6 @@
     iput-object p3, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;->onItemClickListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onItemClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inputModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -160,39 +148,35 @@
 .end method
 
 .method public onBindViewHolder(Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;I)V
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "holder"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;->inputModel:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;->inputModel:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-interface {v1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object p2
 
-    move-object v0, p2
+    check-cast p2, Landroid/net/Uri;
 
-    check-cast v0, Landroid/net/Uri;
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;->bind(Landroid/net/Uri;)V
+    const/4 p2, 0x0
+
+    :goto_0
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;->bind(Landroid/net/Uri;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -208,7 +192,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -230,20 +216,11 @@
 
     const-string v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter$ViewHolder;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setData(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lkotlin/jvm/functions/Function1;)V
@@ -260,29 +237,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "inputModel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onItemClickListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;->inputModel:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
     iput-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;->onItemClickListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "onItemClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inputModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Companion.smali
index 6d795943ec..856982d0d0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Companion.smali
@@ -60,7 +60,9 @@
 .method public final launch(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -80,20 +82,11 @@
 
     const-string p3, "Intent()\n          .putE\u2026TRA_RECIPIENT, recipient)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p3, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    invoke-static {p1, p3, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p3, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
index cfd8302e9b..cdd8e47b1e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion.smali
@@ -34,42 +34,44 @@
 
 # virtual methods
 .method public final get(Landroid/content/Intent;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "recentIntent"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/ShareUtils;->INSTANCE:Lcom/discord/utilities/ShareUtils;
+    sget-object v0, Lcom/discord/utilities/ShareUtils;->INSTANCE:Lcom/discord/utilities/ShareUtils;
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {v1, p1, v2}, Lcom/discord/utilities/ShareUtils;->getSharedContent(Landroid/content/Intent;Z)Lcom/discord/utilities/ShareUtils$SharedContent;
+    invoke-virtual {v0, p1, v1}, Lcom/discord/utilities/ShareUtils;->getSharedContent(Landroid/content/Intent;Z)Lcom/discord/utilities/ShareUtils$SharedContent;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
+    sget-object v1, Lcom/discord/utilities/intent/IntentUtils;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils;
 
-    invoke-virtual {v2, p1}, Lcom/discord/utilities/intent/IntentUtils;->getDirectShareId(Landroid/content/Intent;)Ljava/lang/Long;
+    invoke-virtual {v1, p1}, Lcom/discord/utilities/intent/IntentUtils;->getDirectShareId(Landroid/content/Intent;)Ljava/lang/Long;
+
+    move-result-object v5
+
+    const-string v1, "EXTRA_RECIPIENT"
+
+    invoke-virtual {p1, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v6
 
-    const-string v2, "EXTRA_RECIPIENT"
-
-    invoke-virtual {p1, v2}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v7
-
     invoke-virtual {p1}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-nez v2, :cond_0
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
 
     move-result v3
 
@@ -82,76 +84,72 @@
     :cond_1
     const-string v3, "com.discord.intent.action.SDK"
 
-    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     invoke-virtual {p1}, Landroid/content/Intent;->getData()Landroid/net/Uri;
 
-    move-result-object v2
+    move-result-object v1
 
-    move-object v8, v2
+    move-object v7, v1
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    move-object v8, v0
+    move-object v7, v2
 
     :goto_1
-    const-string v2, "com.discord.intent.extra.EXTRA_ACTIVITY"
+    const-string v1, "com.discord.intent.extra.EXTRA_ACTIVITY"
 
-    invoke-virtual {p1, v2}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p1, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     if-eqz p1, :cond_3
 
-    new-instance v0, Lcom/discord/models/domain/Model$JsonReader;
+    new-instance v1, Lcom/discord/models/domain/Model$JsonReader;
 
     new-instance v2, Ljava/io/StringReader;
 
     invoke-direct {v2, p1}, Ljava/io/StringReader;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {v0, v2}, Lcom/discord/models/domain/Model$JsonReader;-><init>(Ljava/io/Reader;)V
+    invoke-direct {v1, v2}, Lcom/discord/models/domain/Model$JsonReader;-><init>(Ljava/io/Reader;)V
 
     new-instance p1, Lcom/discord/models/domain/activity/ModelActivity;
 
     invoke-direct {p1}, Lcom/discord/models/domain/activity/ModelActivity;-><init>()V
 
-    invoke-virtual {v0, p1}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+    invoke-virtual {v1, p1}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
 
     move-result-object p1
 
-    move-object v0, p1
+    check-cast p1, Lcom/discord/models/domain/activity/ModelActivity;
 
-    check-cast v0, Lcom/discord/models/domain/activity/ModelActivity;
+    move-object v8, p1
+
+    goto :goto_2
 
     :cond_3
-    move-object v9, v0
+    move-object v8, v2
 
+    :goto_2
     new-instance p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/ShareUtils$SharedContent;->getText()Ljava/lang/CharSequence;
+    invoke-virtual {v0}, Lcom/discord/utilities/ShareUtils$SharedContent;->getText()Ljava/lang/CharSequence;
+
+    move-result-object v3
+
+    invoke-virtual {v0}, Lcom/discord/utilities/ShareUtils$SharedContent;->getUris()Ljava/util/List;
 
     move-result-object v4
 
-    invoke-virtual {v1}, Lcom/discord/utilities/ShareUtils$SharedContent;->getUris()Ljava/util/List;
+    move-object v2, p1
 
-    move-result-object v5
-
-    move-object v3, p1
-
-    invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Landroid/net/Uri;Lcom/discord/models/domain/activity/ModelActivity;)V
+    invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Landroid/net/Uri;Lcom/discord/models/domain/activity/ModelActivity;)V
 
     return-object p1
-
-    :cond_4
-    const-string p1, "recentIntent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
index 0e3793362c..118b29800a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
@@ -400,7 +400,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->sharedText:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -410,7 +410,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->uris:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -420,7 +420,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->preselectedRecipientChannel:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -430,7 +430,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->recipient:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -440,7 +440,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -450,7 +450,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/activity/ModelActivity;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Model.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Model.smali
index 41b92d7e54..45600c7884 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$Model.smali
@@ -36,11 +36,13 @@
 .method public constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;ZIZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "contentModel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "searchModel"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -61,20 +63,6 @@
     iput-boolean p8, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isUserPremium:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "searchModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "contentModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali
index 4f9a4541cc..403e103c4b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -86,7 +88,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -120,18 +122,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali
index 5a3b3dc74c..159f2ad617 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Landroid/view/View;",
         "Ljava/lang/Integer;",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x4
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -82,11 +82,13 @@
 .method public final invoke(Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
     .locals 11
 
-    const/4 p2, 0x0
+    const-string p2, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p1, "data"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of p1, p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
@@ -118,7 +120,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -163,18 +165,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_3
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
index d1d8720b3d..518646e104 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Landroid/widget/TextView;",
         "Ljava/lang/Integer;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,24 +79,26 @@
 .method public final invoke(Landroid/widget/TextView;ILandroid/view/KeyEvent;)Z
     .locals 8
 
-    if-eqz p1, :cond_2
+    const-string p3, "<anonymous parameter 0>"
 
-    const/4 p1, 0x4
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p3, 0x0
+    const/4 p1, 0x0
 
-    if-eq p2, p1, :cond_0
+    const/4 p3, 0x4
+
+    if-eq p2, p3, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
+    iget-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    invoke-virtual {p2}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    move-result-object p1
+    move-result-object p2
 
-    if-eqz p1, :cond_1
+    if-eqz p2, :cond_1
 
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -110,7 +112,7 @@
 
     const-string p1, "commentInput.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
@@ -150,18 +152,9 @@
 
     invoke-static/range {v0 .. v7}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$onSendClicked(Lcom/discord/widgets/share/WidgetIncomingShare;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 
-    const/4 p3, 0x1
+    const/4 p1, 0x1
 
     :cond_1
     :goto_0
-    return p3
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
index 54f718c5c6..af0c855ec7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
@@ -58,13 +58,13 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const v0, 0x7f0a05ce
+    const v0, 0x7f0a05d4
 
     if-eq p1, v0, :cond_0
 
@@ -75,7 +75,7 @@
 
     const-string p1, "ctx"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
index b9bc222171..d92577b431 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/net/Uri;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -97,7 +97,7 @@
 
     check-cast v4, Landroid/net/Uri;
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
index 18d87734b6..a5f41a7d4c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali
index 038891b7b6..c0107a8dbb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetIncomingShare.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/messagesend/MessageResult;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Lcom/discord/utilities/messagesend/MessageResult;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali
index b5ff2f243f..34bf1ef684 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetIncomingShare.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,21 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Lcom/discord/utilities/messagesend/MessageResult;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -85,6 +96,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lkotlin/Pair<",
             "Lcom/discord/models/domain/ModelUser;",
             "Lcom/discord/utilities/messagesend/MessageResult;",
@@ -118,7 +130,7 @@
 
     const-string v1, "meUser"
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -173,7 +185,7 @@
 
     const-string v12, "context.contentResolver"
 
-    invoke-static {v11, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v10, v9, v11}, Lcom/lytefast/flexinput/model/Attachment$Companion;->a(Landroid/net/Uri;Landroid/content/ContentResolver;)Lcom/lytefast/flexinput/model/Attachment;
 
@@ -189,7 +201,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     move-object v9, v1
 
@@ -264,18 +276,14 @@
 
     invoke-direct {v3, v0, v2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v1, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     goto :goto_5
 
     :cond_5
-    sget-object v1, Lr0/l/a/f;->e:Lrx/Observable;
-
-    const-string v2, "Observable.empty()"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object v1, Ls0/l/a/f;->e:Lrx/Observable;
 
     :goto_5
     return-object v1
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
index 131ca786ec..86788a5000 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
     const-string v3, "me"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
 
@@ -135,11 +135,11 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2;->$me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
index 9492a58a4c..c1e8422994 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Pair<",
         "+",
@@ -64,7 +64,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-static {p1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -163,7 +163,7 @@
 
     const-string v2, "context.resources"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->$context:Landroid/content/Context;
 
@@ -189,7 +189,7 @@
 
     const/16 v2, 0xc
 
-    invoke-static {v0, p1, v5, v1, v2}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v5, v1, v2}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
index 7013bc22e5..2585c332b4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
index 490cd1b3aa..77bfd67581 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
index f3fb2f8af3..5719c455fa 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali
index 48be5e580c..b47b3fd0fd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali
index ed554cfc07..c4c9e139b4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali
index dd6dca572e..3436131636 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,9 @@
 .method public final invoke(Landroid/view/View;Z)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -94,13 +96,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali
index 842e610c7d..2acadb507a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBound$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/Intent;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,21 +59,21 @@
 .end method
 
 .method public final invoke(Landroid/content/Intent;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$5;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$5;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    sget-object v2, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->Companion:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion;
+    sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->Companion:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion;
 
-    invoke-virtual {v2, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion;->get(Landroid/content/Intent;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+    invoke-virtual {v1, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel$Companion;->get(Landroid/content/Intent;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
     move-result-object p1
 
-    invoke-static {v1, p1}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$initialize(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;)V
+    invoke-static {v0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$initialize(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;)V
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$5;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -81,14 +81,9 @@
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
index be9202cfb7..3d439aaf5d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetIncomingShare.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
             ">;"
         }
@@ -86,7 +89,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
index 8174c4d911..c08761c854 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetIncomingShare.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,15 +59,23 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Integer;)Ljava/lang/Boolean;
     .locals 0
 
-    check-cast p1, Ljava/lang/Integer;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->call(Ljava/lang/Integer;)Z
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
     move-result p1
 
+    if-lez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
@@ -73,23 +83,14 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Integer;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+    check-cast p1, Ljava/lang/Integer;
 
-    move-result p1
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->call(Ljava/lang/Integer;)Ljava/lang/Boolean;
 
-    const/4 v0, 0x0
+    move-result-object p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->compare(II)I
-
-    move-result p1
-
-    if-lez p1, :cond_0
-
-    const/4 v0, 0x1
-
-    :cond_0
-    return v0
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3.smali
index 83d3f1f542..9af989370b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3.smali
@@ -35,7 +35,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;",
+        "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+        "Ljava/lang/String;",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lcom/discord/widgets/share/WidgetIncomingShare$Model;",
+        ">;"
     }
 .end annotation
 
@@ -101,41 +108,43 @@
 
     :cond_1
     :goto_0
-    const-string v1, "contentModel"
+    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    move-object v2, p1
+    const-string v2, "contentModel"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v5, p1
 
-    const-string v1, "searchModel"
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "searchModel"
 
     move-object/from16 v8, p4
 
-    invoke-static {v8, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v9, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    const-string v1, "isOnCooldown"
+    const-string v2, "isOnCooldown"
 
     move-object/from16 v4, p5
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p5 .. p5}, Ljava/lang/Boolean;->booleanValue()Z
 
     move-result v10
 
-    const-string v1, "meUser"
+    const-string v2, "meUser"
 
     move-object/from16 v4, p6
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p6 .. p6}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
 
-    move-result v1
+    move-result v2
 
-    invoke-static {v3, v1}, Ljava/lang/Math;->max(II)I
+    invoke-static {v3, v2}, Ljava/lang/Math;->max(II)I
 
     move-result v11
 
@@ -143,12 +152,8 @@
 
     move-result v12
 
-    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$Model;
-
     move-object v4, v1
 
-    move-object v5, p1
-
     move-object v6, p2
 
     move-object/from16 v7, p3
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali
index 4d27721ec1..3be4a356fd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetIncomingShare.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/share/WidgetIncomingShare$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/share/WidgetIncomingShare$Model;",
             ">;"
         }
@@ -90,7 +93,7 @@
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;)V
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -102,7 +105,7 @@
 
     const-string v3, "commentPublisher"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -122,7 +125,7 @@
 
     const-string v5, "searchQueryPublisher"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -161,7 +164,7 @@
 
     sget-object v5, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;
 
-    invoke-virtual {v0, v5}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v5}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali
index a737a14f0a..21487e07b0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetIncomingShare.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/share/WidgetIncomingShare$Model;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$2;->$clock:Lcom/discord/utilities/time/Clock;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare.smali
index 62c9d3b4d4..d1d9afb35d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/share/WidgetIncomingShare.smali
@@ -110,241 +110,169 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dimmer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const/4 v2, 0x0
+    const-string v2, "commentInput"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCommentInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "commentInput"
-
-    const-string v4, "getCommentInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "previewListWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPreviewListWrap()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "previewListWrap"
-
-    const-string v4, "getPreviewListWrap()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "previewList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPreviewList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "previewList"
-
-    const-string v4, "getPreviewList()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "activityActionPreview"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getActivityActionPreview()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "activityActionPreview"
-
-    const-string v4, "getActivityActionPreview()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "scrollView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getScrollView()Landroidx/core/widget/NestedScrollView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "scrollView"
-
-    const-string v4, "getScrollView()Landroidx/core/widget/NestedScrollView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "resultsFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getResultsFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "resultsFlipper"
-
-    const-string v4, "getResultsFlipper()Landroid/widget/ViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "searchFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchFlipper()Lcom/discord/app/AppViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchFlipper"
-
-    const-string v4, "getSearchFlipper()Lcom/discord/app/AppViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "searchEt"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchEt()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchEt"
-
-    const-string v4, "getSearchEt()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "searchResultsRv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchResultsRv()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchResultsRv"
-
-    const-string v4, "getSearchResultsRv()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "selectedReceiver"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSelectedReceiver()Lcom/discord/widgets/user/search/ViewGlobalSearchItem;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "selectedReceiver"
-
-    const-string v4, "getSelectedReceiver()Lcom/discord/widgets/user/search/ViewGlobalSearchItem;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const-class v2, Lcom/discord/widgets/share/WidgetIncomingShare;
+    const-string v2, "selectedReceiverRemoveIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSelectedReceiverRemoveIv()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "selectedReceiverRemoveIv"
-
-    const-string v4, "getSelectedReceiverRemoveIv()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
@@ -368,7 +296,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -376,7 +304,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a037c
+    const v0, 0x7f0a0382
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -384,7 +312,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->commentInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a037e
+    const v0, 0x7f0a0384
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -392,7 +320,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->previewListWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a037d
+    const v0, 0x7f0a0383
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -400,7 +328,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->previewList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a037b
+    const v0, 0x7f0a0381
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -408,7 +336,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->activityActionPreview$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0795
+    const v0, 0x7f0a079b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -416,7 +344,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04f5
+    const v0, 0x7f0a04fb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -424,7 +352,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a079c
+    const v0, 0x7f0a07a2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -432,7 +360,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a037f
+    const v0, 0x7f0a0385
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -440,7 +368,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchEt$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0380
+    const v0, 0x7f0a0386
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -448,7 +376,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchResultsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a87
+    const v0, 0x7f0a0a8c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -456,7 +384,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiver$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a88
+    const v0, 0x7f0a0a8d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -613,50 +541,58 @@
     return-void
 .end method
 
-.method private final configure(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;)V
-    .locals 3
+.method private final configureAdapter(Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;)V
+    .locals 8
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getPreviewList()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v0
 
-    invoke-virtual {v0, p2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+    invoke-virtual {v0, p1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getPreviewList()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object p2
-
-    const/4 v0, 0x0
-
-    invoke-static {p2, v0}, Landroidx/core/view/ViewCompat;->setNestedScrollingEnabled(Landroid/view/View;Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getPreviewList()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object p2
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p2, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getPreviewList()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object p2
-
-    new-instance v1, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;
-
-    invoke-virtual {p1}, Landroid/view/ViewGroup;->getResources()Landroid/content/res/Resources;
-
     move-result-object p1
 
-    const-string v2, "resources"
+    const/4 v0, 0x0
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Landroidx/core/view/ViewCompat;->setNestedScrollingEnabled(Landroid/view/View;Z)V
 
-    const v2, 0x7f0701ed
+    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getPreviewList()Landroidx/recyclerview/widget/RecyclerView;
 
-    invoke-direct {v1, v0, p1, v2, v2}, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;-><init>(ILandroid/content/res/Resources;II)V
+    move-result-object p1
 
-    invoke-virtual {p2, v1}, Landroidx/recyclerview/widget/RecyclerView;->addItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+
+    const/16 p1, 0x8
+
+    invoke-static {p1}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
+
+    move-result v3
+
+    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getPreviewList()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object p1
+
+    new-instance v7, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;
+
+    const/4 v1, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v5, 0x8
+
+    const/4 v6, 0x0
+
+    move-object v0, v7
+
+    move v2, v3
+
+    invoke-direct/range {v0 .. v6}, Lcom/discord/utilities/view/recycler/PaddedItemDecorator;-><init>(IIIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {p1, v7}, Landroidx/recyclerview/widget/RecyclerView;->addItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V
 
     return-void
 .end method
@@ -731,7 +667,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f121689
+    const p1, 0x7f1216b3
 
     :goto_2
     invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setHint(Lcom/google/android/material/textfield/TextInputLayout;I)V
@@ -739,12 +675,12 @@
     return-void
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_4
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -813,7 +749,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -1074,7 +1010,7 @@
     move-object v8, v1
 
     :goto_7
-    invoke-static {v7, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v7, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -1137,7 +1073,7 @@
     :cond_12
     const-string p1, "resultsAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1422,7 +1358,7 @@
 
     const-string v3, "context"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getPreselectedRecipientChannel()Ljava/lang/Long;
 
@@ -1446,7 +1382,7 @@
 
     const/4 v3, 0x2
 
-    invoke-static {v0, v1, v2, v3}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {v0, v1, v2, v3}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->finish()V
 
@@ -1564,11 +1500,11 @@
 
     if-eqz p5, :cond_0
 
-    const v2, 0x7f120412
+    const v2, 0x7f120413
 
     const/16 v4, 0xc
 
-    invoke-static {v3, v2, v1, v0, v4}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v3, v2, v1, v0, v4}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 
@@ -1607,7 +1543,7 @@
 
     const/16 v13, 0xc
 
-    invoke-static/range {v8 .. v13}, Lf/a/b/q;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
+    invoke-static/range {v8 .. v13}, Lf/a/b/s;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -1652,7 +1588,7 @@
 
     const/16 v13, 0xc
 
-    invoke-static/range {v8 .. v13}, Lf/a/b/q;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
+    invoke-static/range {v8 .. v13}, Lf/a/b/s;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -1703,7 +1639,7 @@
 
     const/16 v19, 0xc
 
-    invoke-static/range {v14 .. v19}, Lf/a/b/q;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
+    invoke-static/range {v14 .. v19}, Lf/a/b/s;->d(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;I)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -1747,7 +1683,7 @@
 
     const-string v11, "context.contentResolver"
 
-    invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v9, v10}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeMegabytes(Landroid/net/Uri;Landroid/content/ContentResolver;)F
 
@@ -1769,7 +1705,7 @@
 
     if-eqz v6, :cond_5
 
-    invoke-static {v6}, Lj0/i/l;->max(Ljava/lang/Iterable;)Ljava/lang/Float;
+    invoke-static {v6}, Lk0/j/l;->max(Ljava/lang/Iterable;)Ljava/lang/Float;
 
     move-result-object v9
 
@@ -1789,7 +1725,7 @@
     :goto_2
     if-eqz v6, :cond_6
 
-    invoke-static {v6}, Lj0/i/l;->sumOfFloat(Ljava/lang/Iterable;)F
+    invoke-static {v6}, Lk0/j/l;->sumOfFloat(Ljava/lang/Iterable;)F
 
     move-result v6
 
@@ -1921,7 +1857,7 @@
 
     const-string v9, "parentFragmentManager"
 
-    invoke-static {v10, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v5, :cond_f
 
@@ -1979,7 +1915,7 @@
 
     const-string v2, "StoreStream\n            \u2026         .compose(filter)"
 
-    invoke-static {v9, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v10, 0x3e8
 
@@ -2009,13 +1945,13 @@
 
     invoke-direct {v1, v7, v5, v3, v2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Ljava/util/List;Landroid/content/Context;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable\n        .comb\u2026ervable.empty()\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v7, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsAdapter:Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
 
@@ -2031,9 +1967,9 @@
 
     const-wide/16 v8, 0x0
 
-    new-instance v2, Lf/a/b/m0;
+    new-instance v2, Lf/a/b/o0;
 
-    invoke-direct {v2, v1, v8, v9}, Lf/a/b/m0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
+    invoke-direct {v2, v1, v8, v9}, Lf/a/b/o0;-><init>(Lcom/discord/utilities/dimmer/DimmerView;J)V
 
     invoke-virtual {v0, v2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
@@ -2041,7 +1977,7 @@
 
     const-string v0, "Observable\n        .comb\u2026rs.withDimmer(dimmer, 0))"
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v20, Lcom/discord/widgets/share/WidgetIncomingShare;
 
@@ -2082,7 +2018,7 @@
     :cond_11
     const-string v0, "resultsAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -2103,7 +2039,7 @@
 
     const-string v1, "this.context ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -2115,7 +2051,7 @@
 
     const-string v2, "com.discord.intent.action.SDK"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -2149,7 +2085,7 @@
 
     const/4 v3, 0x2
 
-    invoke-static {v0, v1, v2, v3}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {v0, v1, v2, v3}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->finish()V
@@ -2169,31 +2105,35 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 19
+    .locals 18
 
     move-object/from16 v6, p0
 
-    const/4 v7, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_2
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v8
+    move-result-object v7
 
-    if-nez v8, :cond_0
+    if-nez v7, :cond_0
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->finish()V
 
     return-void
 
     :cond_0
-    new-instance v9, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;
+    new-instance v8, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;
 
     new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
+    const/4 v10, 0x0
+
     const/4 v11, 0x0
 
     const/4 v12, 0x0
@@ -2204,15 +2144,13 @@
 
     const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    const/16 v16, 0x3f
 
-    const/16 v17, 0x3f
+    const/16 v17, 0x0
 
-    const/16 v18, 0x0
+    move-object v9, v2
 
-    move-object v10, v2
-
-    invoke-direct/range {v10 .. v18}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Landroid/net/Uri;Lcom/discord/models/domain/activity/ModelActivity;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Landroid/net/Uri;Lcom/discord/models/domain/activity/ModelActivity;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     const/4 v3, 0x0
 
@@ -2220,99 +2158,95 @@
 
     const/4 v5, 0x0
 
-    move-object v0, v9
+    move-object v0, v8
 
     move-object/from16 v1, p0
 
     invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object v9, v6, Lcom/discord/widgets/share/WidgetIncomingShare;->previewAdapter:Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;
+    iput-object v8, v6, Lcom/discord/widgets/share/WidgetIncomingShare;->previewAdapter:Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getPreviewList()Landroidx/recyclerview/widget/RecyclerView;
+    const/4 v0, 0x0
 
-    move-result-object v0
+    if-eqz v8, :cond_1
 
-    iget-object v1, v6, Lcom/discord/widgets/share/WidgetIncomingShare;->previewAdapter:Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;
-
-    if-eqz v1, :cond_1
-
-    invoke-direct {v6, v0, v1}, Lcom/discord/widgets/share/WidgetIncomingShare;->configure(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;)V
+    invoke-direct {v6, v8}, Lcom/discord/widgets/share/WidgetIncomingShare;->configureAdapter(Lcom/discord/widgets/share/WidgetIncomingShare$Adapter;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getCommentInput()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;
+    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;
 
-    invoke-direct {v1, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
+    invoke-direct {v2, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
 
-    invoke-static {v0, v6, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
+    invoke-static {v1, v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
-    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
+    new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchResultsRv()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    sget-object v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+
+    invoke-virtual {v2, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
+
+    iput-object v1, v6, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsAdapter:Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchResultsRv()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v1
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    const/4 v2, 0x0
 
-    sget-object v1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
-
-    invoke-virtual {v1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
-
-    iput-object v0, v6, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsAdapter:Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
+    invoke-static {v1, v2}, Landroidx/core/view/ViewCompat;->setNestedScrollingEnabled(Landroid/view/View;Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchResultsRv()Landroidx/recyclerview/widget/RecyclerView;
 
-    move-result-object v0
+    move-result-object v1
 
-    const/4 v1, 0x0
-
-    invoke-static {v0, v1}, Landroidx/core/view/ViewCompat;->setNestedScrollingEnabled(Landroid/view/View;Z)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchResultsRv()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+    invoke-virtual {v1, v2}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchEt()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;
+    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;
 
-    invoke-direct {v1, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
+    invoke-direct {v2, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
 
-    invoke-static {v0, v6, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
+    invoke-static {v1, v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchEt()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$3;
+    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$3;
 
-    invoke-direct {v1, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$3;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
+    invoke-direct {v2, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$3;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
 
-    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnEditTextFocusChangeListener(Lcom/google/android/material/textfield/TextInputLayout;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnEditTextFocusChangeListener(Lcom/google/android/material/textfield/TextInputLayout;Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSelectedReceiverRemoveIv()Landroid/widget/ImageView;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$4;
+    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$4;
 
-    invoke-direct {v1, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$4;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
+    invoke-direct {v2, v6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBound$4;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
 
-    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v0, v6, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverPublisher:Lrx/subjects/BehaviorSubject;
+    iget-object v1, v6, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0, v7}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchFlipper()Lcom/discord/app/AppViewFlipper;
 
@@ -2320,7 +2254,7 @@
 
     const v1, 0x7f010002
 
-    invoke-static {v8, v1}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
+    invoke-static {v7, v1}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
 
     move-result-object v1
 
@@ -2332,7 +2266,7 @@
 
     const v1, 0x7f010005
 
-    invoke-static {v8, v1}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
+    invoke-static {v7, v1}, Landroid/view/animation/AnimationUtils;->loadAnimation(Landroid/content/Context;I)Landroid/view/animation/Animation;
 
     move-result-object v1
 
@@ -2359,18 +2293,11 @@
     return-void
 
     :cond_1
-    const-string v0, "previewAdapter"
+    const-string v1, "previewAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v7
-
-    :cond_2
-    const-string v0, "view"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
+    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2382,7 +2309,7 @@
 
     const-string v1, "searchQueryPublisher"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -2402,13 +2329,13 @@
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
     const-string v2, "selectedReceiverPublishe\u2026  )\n          }\n        }"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -2447,7 +2374,7 @@
     :cond_0
     const-string v0, "resultsAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali
index dac18fa0be..f5f80b9f34 100644
--- a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetStatus.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Boolean;",
@@ -35,45 +35,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x4
+    const-class v3, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x4
+
+    const-string v4, "createModel"
+
+    const-string v5, "createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "createModel"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;"
-
-    return-object v0
-.end method
-
 .method public final invoke(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -88,13 +72,15 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p3"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "p4"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;
 
@@ -103,20 +89,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p4"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.smali b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.smali
index ed7095d053..5250aec04c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/stores/StoreMessageAck$Ack;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -59,25 +62,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreMessageAck$Ack;
-
-    check-cast p2, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1;->call(Lcom/discord/stores/StoreMessageAck$Ack;Ljava/lang/Long;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreMessageAck$Ack;Ljava/lang/Long;)Z
+.method public final call(Lcom/discord/stores/StoreMessageAck$Ack;Ljava/lang/Long;)Ljava/lang/Boolean;
     .locals 3
 
     if-eqz p1, :cond_0
@@ -94,7 +79,7 @@
     :goto_0
     const-string p1, "mostRecentIdSnapshot"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
@@ -112,5 +97,23 @@
     const/4 p1, 0x0
 
     :goto_1
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreMessageAck$Ack;
+
+    check-cast p2, Ljava/lang/Long;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1;->call(Lcom/discord/stores/StoreMessageAck$Ack;Ljava/lang/Long;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.smali b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.smali
index b4d43f85fc..96cb97e768 100644
--- a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetStatus.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,12 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Ljava/lang/Boolean;)Ljava/lang/Boolean;
+    .locals 1
 
-    check-cast p1, Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2;->call(Ljava/lang/Boolean;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -75,14 +75,14 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Boolean;)Z
-    .locals 1
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+    check-cast p1, Ljava/lang/Boolean;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2;->call(Ljava/lang/Boolean;)Ljava/lang/Boolean;
 
-    move-result p1
+    move-result-object p1
 
-    return p1
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali
index 7da0563061..62452f2eb2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetStatus.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/Long;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Boolean;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/Long;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Boolean;",
             ">;"
         }
@@ -92,7 +95,7 @@
 
     const-string v1, "selectedChannelId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -144,15 +147,15 @@
 
     sget-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->X(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->X(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     invoke-static {v1, p1}, Lrx/Observable;->m(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
index 63b712795f..f3f9528b0c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
@@ -225,7 +225,7 @@
 
     sget-object v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$isUnreadValidObs$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -281,7 +281,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026ILLISECONDS\n            )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -293,7 +293,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali
index 8ac690dfef..bb5ac8de95 100644
--- a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetStatus.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/status/WidgetStatus$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/status/WidgetStatus$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/status/WidgetStatus;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/status/WidgetStatus;->access$configureUI(Lcom/discord/widgets/status/WidgetStatus;Lcom/discord/widgets/status/WidgetStatus$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus.smali
index 59156db731..ef862b5769 100644
--- a/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/status/WidgetStatus.smali
@@ -39,141 +39,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/status/WidgetStatus;
 
-    const-class v2, Lcom/discord/widgets/status/WidgetStatus;
+    const-string v2, "statusConnectivity"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusConnectivity()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "statusConnectivity"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getStatusConnectivity()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/status/WidgetStatus;
 
-    const/4 v2, 0x0
+    const-string v2, "statusConnectivityText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getStatusConnectivityText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/status/WidgetStatus;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "statusConnectivityText"
-
-    const-string v4, "getStatusConnectivityText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/status/WidgetStatus;
 
-    const-class v2, Lcom/discord/widgets/status/WidgetStatus;
+    const-string v2, "statusConnectivitySpinner"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusConnectivitySpinner()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusConnectivitySpinner"
-
-    const-string v4, "getStatusConnectivitySpinner()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/status/WidgetStatus;
 
-    const-class v2, Lcom/discord/widgets/status/WidgetStatus;
+    const-string v2, "statusConnectivityLimited"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusConnectivityLimited()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusConnectivityLimited"
-
-    const-string v4, "getStatusConnectivityLimited()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/status/WidgetStatus;
 
-    const-class v2, Lcom/discord/widgets/status/WidgetStatus;
+    const-string v2, "statusUnreadMessages"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusUnreadMessages()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusUnreadMessages"
-
-    const-string v4, "getStatusUnreadMessages()Landroid/widget/LinearLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/status/WidgetStatus;
 
-    const-class v2, Lcom/discord/widgets/status/WidgetStatus;
+    const-string v2, "statusUnreadMessagesText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusUnreadMessagesText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusUnreadMessagesText"
-
-    const-string v4, "getStatusUnreadMessagesText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/status/WidgetStatus;
 
-    const-class v2, Lcom/discord/widgets/status/WidgetStatus;
+    const-string v2, "statusUnreadMessagesMark"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusUnreadMessagesMark()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusUnreadMessagesMark"
-
-    const-string v4, "getStatusUnreadMessagesMark()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -189,7 +147,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0934
+    const v0, 0x7f0a0938
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +155,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivity$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0938
+    const v0, 0x7f0a093c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +163,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivityText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0937
+    const v0, 0x7f0a093b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +171,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivitySpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0936
+    const v0, 0x7f0a093a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +179,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusConnectivityLimited$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0939
+    const v0, 0x7f0a093d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -229,7 +187,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusUnreadMessages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a093b
+    const v0, 0x7f0a093f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -237,7 +195,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusUnreadMessagesText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a093a
+    const v0, 0x7f0a093e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +227,7 @@
 
     const-string v1, "this.view ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -302,7 +260,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v1, p1}, Lcom/discord/widgets/status/WidgetStatus;->getConnectivityText(Landroid/content/Context;Lcom/discord/widgets/status/WidgetStatus$Model;)Ljava/lang/String;
 
@@ -484,7 +442,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    const v0, 0x7f1204a0
+    const v0, 0x7f1204a1
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -509,7 +467,7 @@
 
     if-eqz p2, :cond_1
 
-    const p2, 0x7f120f57
+    const p2, 0x7f120f81
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -683,7 +641,7 @@
 
     const-string p3, "requireContext()"
 
-    invoke-static {v3, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -707,7 +665,7 @@
 
     move-result-object p1
 
-    const p3, 0x7f120f61
+    const p3, 0x7f120f8b
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -725,7 +683,7 @@
 
     const-string p2, "resources.getString(R.st\u2026ring(count), utcDateTime)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -736,15 +694,15 @@
 
     const-string v3, "resources"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v3
 
-    invoke-static {v3, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p3, 0x7f1000b5
+    const p3, 0x7f1000b7
 
     new-array v4, v2, [Ljava/lang/Object;
 
@@ -762,7 +720,7 @@
 
     move-result-object p2
 
-    const p3, 0x7f120f5f
+    const p3, 0x7f120f89
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -776,7 +734,7 @@
 
     const-string p2, "resources.getString(R.st\u2026countPlural, utcDateTime)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver$Companion$INSTANCE$2.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver$Companion$INSTANCE$2.smali
index 8fb9bdc342..d9b7fc9de5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver$Companion$INSTANCE$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver$Companion$INSTANCE$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tabs/BottomNavViewObserver$Companion$INSTANCE$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "BottomNavViewObserver.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/tabs/BottomNavViewObserver;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver.smali
index c6a08a129c..2da1c7bc9e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/BottomNavViewObserver.smali
@@ -100,7 +100,7 @@
 
     const-string v1, "heightSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali
index 7134d70092..e3c9398068 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali
@@ -99,261 +99,183 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "tabsContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTabsContainer()Landroid/widget/LinearLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "tabsContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTabsContainer()Landroid/widget/LinearLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const/4 v2, 0x0
+    const-string v2, "homeItem"
 
-    aput-object v1, v0, v2
+    const-string v3, "getHomeItem()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "homeItem"
-
-    const-string v4, "getHomeItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "homeIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHomeIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "homeIcon"
-
-    const-string v4, "getHomeIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "homeNotificationsBadge"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHomeNotificationsBadge()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "homeNotificationsBadge"
-
-    const-string v4, "getHomeNotificationsBadge()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "friendsItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFriendsItem()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "friendsItem"
-
-    const-string v4, "getFriendsItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "friendsIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFriendsIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "friendsIcon"
-
-    const-string v4, "getFriendsIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "friendsNotificationsBadge"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFriendsNotificationsBadge()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "friendsNotificationsBadge"
-
-    const-string v4, "getFriendsNotificationsBadge()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "searchItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchItem()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchItem"
-
-    const-string v4, "getSearchItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "searchIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchIcon"
-
-    const-string v4, "getSearchIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "mentionsItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMentionsItem()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mentionsItem"
-
-    const-string v4, "getMentionsItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "mentionsIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMentionsIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mentionsIcon"
-
-    const-string v4, "getMentionsIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "userSettingsItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserSettingsItem()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userSettingsItem"
-
-    const-string v4, "getUserSettingsItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    const-string v2, "userAvatarPresenceView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserAvatarPresenceView()Lcom/discord/views/user/UserAvatarPresenceView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userAvatarPresenceView"
-
-    const-string v4, "getUserAvatarPresenceView()Lcom/discord/views/user/UserAvatarPresenceView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
@@ -365,13 +287,15 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a0965
+    const p1, 0x7f0a0969
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -379,7 +303,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->tabsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a095f
+    const p1, 0x7f0a0963
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -387,7 +311,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a095e
+    const p1, 0x7f0a0962
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -395,7 +319,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0960
+    const p1, 0x7f0a0964
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -403,7 +327,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeNotificationsBadge$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a095c
+    const p1, 0x7f0a0960
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -411,7 +335,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a095b
+    const p1, 0x7f0a095f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -419,7 +343,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a095d
+    const p1, 0x7f0a0961
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -427,7 +351,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsNotificationsBadge$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0964
+    const p1, 0x7f0a0968
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -435,7 +359,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->searchItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0963
+    const p1, 0x7f0a0967
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -443,7 +367,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->searchIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0962
+    const p1, 0x7f0a0966
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -451,7 +375,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->mentionsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0961
+    const p1, 0x7f0a0965
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -459,7 +383,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->mentionsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0967
+    const p1, 0x7f0a096b
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -467,7 +391,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->userSettingsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0966
+    const p1, 0x7f0a096a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -482,25 +406,18 @@
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->heightChangedListeners:Ljava/util/Set;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a0965
+    const p2, 0x7f0a0969
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -508,7 +425,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->tabsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095f
+    const p2, 0x7f0a0963
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -516,7 +433,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095e
+    const p2, 0x7f0a0962
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -524,7 +441,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0960
+    const p2, 0x7f0a0964
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -532,7 +449,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeNotificationsBadge$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095c
+    const p2, 0x7f0a0960
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -540,7 +457,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095b
+    const p2, 0x7f0a095f
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -548,7 +465,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095d
+    const p2, 0x7f0a0961
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -556,7 +473,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsNotificationsBadge$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0964
+    const p2, 0x7f0a0968
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -564,7 +481,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->searchItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0963
+    const p2, 0x7f0a0967
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -572,7 +489,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->searchIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0962
+    const p2, 0x7f0a0966
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -580,7 +497,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->mentionsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0961
+    const p2, 0x7f0a0965
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -588,7 +505,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->mentionsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0967
+    const p2, 0x7f0a096b
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -596,7 +513,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->userSettingsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0966
+    const p2, 0x7f0a096a
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -613,25 +530,18 @@
     invoke-direct {p0, p1}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->initialize(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p2, 0x7f0a0965
+    const p2, 0x7f0a0969
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -639,7 +549,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->tabsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095f
+    const p2, 0x7f0a0963
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -647,7 +557,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095e
+    const p2, 0x7f0a0962
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -655,7 +565,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0960
+    const p2, 0x7f0a0964
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -663,7 +573,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->homeNotificationsBadge$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095c
+    const p2, 0x7f0a0960
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -671,7 +581,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095b
+    const p2, 0x7f0a095f
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -679,7 +589,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a095d
+    const p2, 0x7f0a0961
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -687,7 +597,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->friendsNotificationsBadge$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0964
+    const p2, 0x7f0a0968
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -695,7 +605,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->searchItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0963
+    const p2, 0x7f0a0967
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -703,7 +613,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->searchIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0962
+    const p2, 0x7f0a0966
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -711,7 +621,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->mentionsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0961
+    const p2, 0x7f0a0965
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -719,7 +629,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->mentionsIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0967
+    const p2, 0x7f0a096b
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -727,7 +637,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->userSettingsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0966
+    const p2, 0x7f0a096a
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -744,15 +654,6 @@
     invoke-direct {p0, p1}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->initialize(Landroid/content/Context;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -1065,7 +966,7 @@
 
     const-string v0, "resources"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -1081,7 +982,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -1096,7 +997,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
 
@@ -1399,7 +1300,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f120ece
+    const v5, 0x7f120ef4
 
     new-array v6, v1, [Ljava/lang/Object;
 
@@ -1454,7 +1355,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f120c76
+    const v3, 0x7f120c9c
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -1478,22 +1379,15 @@
 .method public final addHeightChangedListener(Lcom/discord/widgets/tabs/TabsHostBottomNavigationView$HeightChangedListener;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "heightChangedListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->heightChangedListeners:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "heightChangedListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onSizeChanged(IIII)V
@@ -1552,141 +1446,151 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedTab"
 
-    if-eqz p1, :cond_15
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_14
+    const-string v0, "onTabSelected"
 
-    if-eqz p6, :cond_13
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_12
+    const-string v0, "visibleTabs"
 
-    if-eqz p10, :cond_11
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onSearchClick"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onSettingsLongPress"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->getTabsContainer()Landroid/widget/LinearLayout;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-interface {p6}, Ljava/util/Set;->size()I
 
-    move-result v2
+    move-result v1
 
-    int-to-float v2, v2
+    int-to-float v1, v1
 
-    invoke-virtual {v1, v2}, Landroid/widget/LinearLayout;->setWeightSum(F)V
+    invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setWeightSum(F)V
 
     invoke-direct {p0}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->getHomeItem()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
+    sget-object v1, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-interface {p6, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {p6, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_0
 
     :cond_0
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_0
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->getFriendsItem()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/widgets/tabs/NavigationTab;->FRIENDS:Lcom/discord/widgets/tabs/NavigationTab;
+    sget-object v1, Lcom/discord/widgets/tabs/NavigationTab;->FRIENDS:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-interface {p6, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {p6, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_1
 
     :cond_1
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_1
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->getSearchItem()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/widgets/tabs/NavigationTab;->SEARCH:Lcom/discord/widgets/tabs/NavigationTab;
+    sget-object v1, Lcom/discord/widgets/tabs/NavigationTab;->SEARCH:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-interface {p6, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {p6, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_2
 
     :cond_2
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_2
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->getMentionsItem()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
+    sget-object v1, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-interface {p6, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {p6, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_3
 
     :cond_3
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_3
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->getUserSettingsItem()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    sget-object v2, Lcom/discord/widgets/tabs/NavigationTab;->SETTINGS:Lcom/discord/widgets/tabs/NavigationTab;
+    sget-object v1, Lcom/discord/widgets/tabs/NavigationTab;->SETTINGS:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-interface {p6, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {p6, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
     move-result p6
 
     if-eqz p6, :cond_4
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :cond_4
-    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     iget-object p6, p0, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->tintableIconToNavigationTabMap:Ljava/util/Map;
 
+    const/4 v0, 0x0
+
     if-eqz p6, :cond_10
 
     invoke-interface {p6}, Ljava/util/Map;->entrySet()Ljava/util/Set;
@@ -1734,9 +1638,9 @@
     :goto_5
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v4
 
-    invoke-static {v3, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v4, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v1
 
@@ -1985,63 +1889,28 @@
     :cond_d
     const-string p1, "userAvatarPresenceViewController"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_e
     const-string p1, "navigationTabToViewMap"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_f
     const-string p1, "iconToNavigationTabMap"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_10
     const-string p1, "tintableIconToNavigationTabMap"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_11
-    const-string p1, "onSettingsLongPress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_12
-    const-string p1, "onSearchClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_13
-    const-string p1, "visibleTabs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_14
-    const-string p1, "onTabSelected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_15
-    const-string p1, "selectedTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$1.smali
index 6e77a1b809..46267ea123 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tabs/TabsHostViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TabsHostViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/tabs/TabsHostViewModel$1;->this$0:Lcom/discord/widgets/tabs/TabsHostViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/tabs/TabsHostViewModel;->access$handleStoreState(Lcom/discord/widgets/tabs/TabsHostViewModel;Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$2.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$2.smali
index 2f5f217a8e..e217cf8e8e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tabs/TabsHostViewModel$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TabsHostViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$3.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$3.smali
index 28b0fa71bc..e7a6117020 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tabs/TabsHostViewModel$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "TabsHostViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/Unit;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lkotlin/Unit;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel$3;->this$0:Lcom/discord/widgets/tabs/TabsHostViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/tabs/TabsHostViewModel;->access$dismissSearchDialog(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory$observeStoreState$1.smali
index 37a92eeb45..cef13144ab 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory$observeStoreState$1.smali
@@ -35,7 +35,22 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Lcom/discord/panels/PanelState;",
+        "Lcom/discord/widgets/tabs/NavigationTab;",
+        "Ljava/lang/Long;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/lang/Integer;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -93,15 +108,15 @@
 
     const-string v0, "leftPanelState"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "selectedTab"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "myUserId"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Ljava/lang/Long;->longValue()J
 
@@ -109,11 +124,11 @@
 
     const-string p3, "guildIdToGuildMap"
 
-    invoke-static {p4, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p3, "numTotalMentions"
 
-    invoke-static {p5, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p5}, Ljava/lang/Integer;->intValue()I
 
@@ -121,7 +136,7 @@
 
     const-string p3, "userRelationships"
 
-    invoke-static {p6, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p6, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v8
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory.smali
index dd286bec6d..c6a9858503 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$Factory.smali
@@ -61,19 +61,29 @@
 .method public constructor <init>(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMentions;Lcom/discord/stores/StoreUserRelationships;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeNavigation"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "storeTabsNavigation"
 
-    if-eqz p3, :cond_3
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string v0, "storeUser"
 
-    if-eqz p5, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "storeGuilds"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeMentions"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeUserRelationships"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -90,48 +100,6 @@
     iput-object p6, p0, Lcom/discord/widgets/tabs/TabsHostViewModel$Factory;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeUserRelationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeMentions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeGuilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "storeUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeTabsNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "storeNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMentions;Lcom/discord/stores/StoreUserRelationships;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -287,7 +255,7 @@
 
     const-string v1, "Observable.combineLatest\u2026onships\n        )\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -306,7 +274,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/tabs/TabsHostViewModel;
 
@@ -327,13 +297,4 @@
     invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/widgets/tabs/TabsHostViewModel;-><init>(Lcom/discord/widgets/tabs/BottomNavViewObserver;Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreNavigation;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$StoreState.smali
index 8e6a448840..79c015851c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$StoreState.smali
@@ -67,15 +67,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "selectedTab"
 
-    if-eqz p5, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_0
+    const-string v0, "guildIdToGuildMap"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userRelationships"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -92,34 +98,6 @@
     iput-object p7, p0, Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;->userRelationships:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "userRelationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildIdToGuildMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "selectedTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "leftPanelState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;Lcom/discord/panels/PanelState;Lcom/discord/widgets/tabs/NavigationTab;JLjava/util/Map;ILjava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;
@@ -287,63 +265,41 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "leftPanelState"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p2, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_1
+    const-string v0, "selectedTab"
 
-    if-eqz p7, :cond_0
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildIdToGuildMap"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userRelationships"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move-wide v4, p3
 
-    move-object v6, p5
-
     move v7, p6
 
-    move-object/from16 v8, p7
-
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;-><init>(Lcom/discord/panels/PanelState;Lcom/discord/widgets/tabs/NavigationTab;JLjava/util/Map;ILjava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "userRelationships"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "guildIdToGuildMap"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "selectedTab"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "leftPanelState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -361,7 +317,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;->leftPanelState:Lcom/discord/panels/PanelState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -371,7 +327,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -389,7 +345,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;->guildIdToGuildMap:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -405,7 +361,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;->userRelationships:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$ViewState.smali
index 8f0d98c6bc..994460217d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$ViewState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel$ViewState.smali
@@ -53,11 +53,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedTab"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "visibleTabs"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -76,20 +78,6 @@
     iput p8, p0, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;->numFriendsNotifications:I
 
     return-void
-
-    :cond_0
-    const-string p1, "visibleTabs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;Lcom/discord/widgets/tabs/NavigationTab;ZIJLjava/util/Set;IIILjava/lang/Object;)Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;
@@ -283,26 +271,28 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedTab"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p6, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "visibleTabs"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move v3, p2
 
     move v4, p3
 
     move-wide v5, p4
 
-    move-object/from16 v7, p6
-
     move/from16 v8, p7
 
     move/from16 v9, p8
@@ -310,20 +300,6 @@
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;-><init>(Lcom/discord/widgets/tabs/NavigationTab;ZIJLjava/util/Set;II)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "visibleTabs"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "selectedTab"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -341,7 +317,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -371,7 +347,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;->visibleTabs:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel.smali
index 224c07ab75..813d1ec962 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/TabsHostViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tabs/TabsHostViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "TabsHostViewModel.kt"
 
 
@@ -16,7 +16,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;",
         ">;"
     }
@@ -121,7 +121,7 @@
 
     sget-object v1, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-static {v0, v1}, Lj0/i/l;->minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
 
@@ -191,7 +191,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/tabs/BottomNavViewObserver;Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/stores/StoreNavigation;Lrx/Observable;)V
-    .locals 11
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -204,37 +204,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "bottomNavViewObserver"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "storeTabsNavigation"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "storeNavigation"
 
-    new-instance v10, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;
 
     sget-object v2, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
 
+    sget-object v7, Lcom/discord/widgets/tabs/TabsHostViewModel;->NO_GUILD_TABS:Ljava/util/Set;
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
     const-wide/16 v5, 0x0
 
-    sget-object v7, Lcom/discord/widgets/tabs/TabsHostViewModel;->NO_GUILD_TABS:Ljava/util/Set;
-
     const/4 v8, 0x0
 
     const/4 v9, 0x0
 
-    move-object v1, v10
+    move-object v1, v0
 
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;-><init>(Lcom/discord/widgets/tabs/NavigationTab;ZIJLjava/util/Set;II)V
 
-    invoke-direct {p0, v10}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->bottomNavViewObserver:Lcom/discord/widgets/tabs/BottomNavViewObserver;
 
@@ -252,13 +258,21 @@
 
     iget-object p1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->storeStateObservable:Lrx/Observable;
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostViewModel;
+
+    new-instance v6, Lcom/discord/widgets/tabs/TabsHostViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/tabs/TabsHostViewModel$1;-><init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -266,17 +280,11 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/tabs/TabsHostViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/tabs/TabsHostViewModel$1;-><init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, 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
 
     iget-object p1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->bottomNavViewObserver:Lcom/discord/widgets/tabs/BottomNavViewObserver;
 
@@ -284,17 +292,17 @@
 
     move-result-object p1
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostViewModel;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostViewModel;
 
-    new-instance v7, Lcom/discord/widgets/tabs/TabsHostViewModel$2;
+    new-instance v6, Lcom/discord/widgets/tabs/TabsHostViewModel$2;
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/tabs/TabsHostViewModel$2;-><init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
+    invoke-direct {v6, p0}, Lcom/discord/widgets/tabs/TabsHostViewModel$2;-><init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
 
-    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
+    invoke-static/range {v0 .. v8}, 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
 
     iget-object p1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->storeTabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
 
@@ -302,47 +310,19 @@
 
     move-result-object p1
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-class v2, Lcom/discord/widgets/tabs/TabsHostViewModel;
+    const-class v1, Lcom/discord/widgets/tabs/TabsHostViewModel;
 
-    new-instance v7, Lcom/discord/widgets/tabs/TabsHostViewModel$3;
+    new-instance v6, Lcom/discord/widgets/tabs/TabsHostViewModel$3;
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/tabs/TabsHostViewModel$3;-><init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
+    invoke-direct {v6, p0}, Lcom/discord/widgets/tabs/TabsHostViewModel$3;-><init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
 
-    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
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeTabsNavigation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "bottomNavViewObserver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$dismissSearchDialog(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
@@ -434,7 +414,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -464,7 +444,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -490,7 +470,7 @@
 
     sget-object v3, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -502,7 +482,7 @@
 
     sget-object v2, Lcom/discord/panels/PanelState$d;->a:Lcom/discord/panels/PanelState$d;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -643,7 +623,7 @@
 
     move-result v8
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -667,7 +647,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -679,7 +659,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -728,7 +708,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -738,27 +718,29 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "tab"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;
+    check-cast v0, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;->getSelectedTab()Lcom/discord/widgets/tabs/NavigationTab;
+    invoke-virtual {v0}, Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;->getSelectedTab()Lcom/discord/widgets/tabs/NavigationTab;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-object v2, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->storeTabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
+    iget-object v1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->storeTabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x2
+    const/4 v3, 0x2
 
-    invoke-static {v2, p1, v3, v4, v0}, Lcom/discord/stores/StoreTabsNavigation;->selectTab$default(Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/widgets/tabs/NavigationTab;ZILjava/lang/Object;)V
+    const/4 v4, 0x0
+
+    invoke-static {v1, p1, v2, v3, v4}, Lcom/discord/stores/StoreTabsNavigation;->selectTab$default(Lcom/discord/stores/StoreTabsNavigation;Lcom/discord/widgets/tabs/NavigationTab;ZILjava/lang/Object;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
@@ -780,7 +762,7 @@
     :cond_1
     sget-object p1, Lcom/discord/widgets/tabs/NavigationTab;->HOME:Lcom/discord/widgets/tabs/NavigationTab;
 
-    if-ne v1, p1, :cond_3
+    if-ne v0, p1, :cond_3
 
     iget-object p1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->storeState:Lcom/discord/widgets/tabs/TabsHostViewModel$StoreState;
 
@@ -793,12 +775,12 @@
     goto :goto_0
 
     :cond_2
-    move-object p1, v0
+    move-object p1, v4
 
     :goto_0
-    sget-object v1, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
+    sget-object v0, Lcom/discord/panels/PanelState$c;->a:Lcom/discord/panels/PanelState$c;
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -812,17 +794,10 @@
     sget-object p1, Lcom/discord/stores/StoreNavigation$PanelAction;->OPEN:Lcom/discord/stores/StoreNavigation$PanelAction;
 
     :goto_1
-    iget-object v1, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->storeNavigation:Lcom/discord/stores/StoreNavigation;
+    iget-object v0, p0, Lcom/discord/widgets/tabs/TabsHostViewModel;->storeNavigation:Lcom/discord/stores/StoreNavigation;
 
-    invoke-static {v1, p1, v0, v4, v0}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
+    invoke-static {v0, p1, v4, v3, v4}, Lcom/discord/stores/StoreNavigation;->setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
 
     :goto_2
     return-void
-
-    :cond_4
-    const-string p1, "tab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
index c5bbcf1354..27f45a7e04 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetTabsHost.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBound$1.smali
index b20bd8d96f..9a94103b7a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBound$1.smali
@@ -46,21 +46,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBound$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBound$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
@@ -73,5 +59,19 @@
 
     move-result v0
 
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBound$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$1.smali
index a36c706973..698bb1c05d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetTabsHost.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     const-string v1, "viewState"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/tabs/WidgetTabsHost;->access$updateViews(Lcom/discord/widgets/tabs/WidgetTabsHost;Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$2.smali
index 71fa1bbef0..2e83b03987 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetTabsHost.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/tabs/TabsHostViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/tabs/TabsHostViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/tabs/TabsHostViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/tabs/TabsHostViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/tabs/WidgetTabsHost;->access$handleEvent(Lcom/discord/widgets/tabs/WidgetTabsHost;Lcom/discord/widgets/tabs/TabsHostViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$1.smali
index ced9eadd3a..80a9fe5052 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$1.smali
@@ -45,51 +45,53 @@
 
 # virtual methods
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
-    .locals 5
+    .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "v"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetLeft()I
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetRight()I
 
-    move-result v2
+    move-result v1
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingTop()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingBottom()I
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {p1, v1, v3, v2, v4}, Landroid/view/View;->setPadding(IIII)V
+    invoke-virtual {p1, v0, v2, v1, v3}, Landroid/view/View;->setPadding(IIII)V
 
-    new-instance v1, Landroidx/core/view/WindowInsetsCompat$Builder;
+    new-instance v0, Landroidx/core/view/WindowInsetsCompat$Builder;
 
-    invoke-direct {v1}, Landroidx/core/view/WindowInsetsCompat$Builder;-><init>()V
+    invoke-direct {v0}, Landroidx/core/view/WindowInsetsCompat$Builder;-><init>()V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
-    move-result v2
+    move-result v1
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
     move-result p2
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    invoke-static {v3, v2, v3, p2}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
+    invoke-static {v2, v1, v2, p2}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
 
     move-result-object p2
 
-    invoke-virtual {v1, p2}, Landroidx/core/view/WindowInsetsCompat$Builder;->setSystemWindowInsets(Landroidx/core/graphics/Insets;)Landroidx/core/view/WindowInsetsCompat$Builder;
+    invoke-virtual {v0, p2}, Landroidx/core/view/WindowInsetsCompat$Builder;->setSystemWindowInsets(Landroidx/core/graphics/Insets;)Landroidx/core/view/WindowInsetsCompat$Builder;
 
     move-result-object p2
 
@@ -97,15 +99,15 @@
 
     move-result-object p2
 
-    const-string v1, "WindowInsetsCompat.Build\u2026        )\n      ).build()"
+    const-string v0, "WindowInsetsCompat.Build\u2026        )\n      ).build()"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v1, p1, Landroid/view/ViewGroup;
+    instance-of v0, p1, Landroid/view/ViewGroup;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    move-object p1, v0
+    const/4 p1, 0x0
 
     :cond_0
     check-cast p1, Landroid/view/ViewGroup;
@@ -141,18 +143,4 @@
 
     :cond_1
     return-object p2
-
-    :cond_2
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$2.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$2.smali
index 71d06d7fb0..b9f1745330 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$2.smali
@@ -35,76 +35,78 @@
 
 # virtual methods
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
-    .locals 6
+    .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "insets"
 
-    iget-boolean v1, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$2;->$isCallStatusVisible:Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    iget-boolean v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$2;->$isCallStatusVisible:Z
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingLeft()I
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingRight()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingBottom()I
 
-    move-result v4
+    move-result v3
 
-    invoke-virtual {p1, v1, v2, v3, v4}, Landroid/view/View;->setPadding(IIII)V
+    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/view/View;->setPadding(IIII)V
 
     goto :goto_0
 
     :cond_0
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingLeft()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingRight()I
 
-    move-result v4
+    move-result v3
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingBottom()I
 
-    move-result v5
+    move-result v4
 
-    invoke-virtual {p1, v3, v1, v4, v5}, Landroid/view/View;->setPadding(IIII)V
+    invoke-virtual {p1, v2, v0, v3, v4}, Landroid/view/View;->setPadding(IIII)V
 
-    new-instance v1, Landroidx/core/view/WindowInsetsCompat$Builder;
+    new-instance v0, Landroidx/core/view/WindowInsetsCompat$Builder;
 
-    invoke-direct {v1}, Landroidx/core/view/WindowInsetsCompat$Builder;-><init>()V
+    invoke-direct {v0}, Landroidx/core/view/WindowInsetsCompat$Builder;-><init>()V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetLeft()I
 
-    move-result v3
+    move-result v2
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetRight()I
 
-    move-result v4
+    move-result v3
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
     move-result p2
 
-    invoke-static {v3, v2, v4, p2}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
+    invoke-static {v2, v1, v3, p2}, Landroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
 
     move-result-object p2
 
-    invoke-virtual {v1, p2}, Landroidx/core/view/WindowInsetsCompat$Builder;->setSystemWindowInsets(Landroidx/core/graphics/Insets;)Landroidx/core/view/WindowInsetsCompat$Builder;
+    invoke-virtual {v0, p2}, Landroidx/core/view/WindowInsetsCompat$Builder;->setSystemWindowInsets(Landroidx/core/graphics/Insets;)Landroidx/core/view/WindowInsetsCompat$Builder;
 
     move-result-object p2
 
@@ -112,16 +114,16 @@
 
     move-result-object p2
 
-    const-string v1, "WindowInsetsCompat.Build\u2026      )\n        ).build()"
+    const-string v0, "WindowInsetsCompat.Build\u2026      )\n        ).build()"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
-    instance-of v1, p1, Landroid/view/ViewGroup;
+    instance-of v0, p1, Landroid/view/ViewGroup;
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
-    move-object p1, v0
+    const/4 p1, 0x0
 
     :cond_1
     check-cast p1, Landroid/view/ViewGroup;
@@ -157,18 +159,4 @@
 
     :cond_2
     return-object p2
-
-    :cond_3
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$3.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$3.smali
index d59d67172f..0aa89a0c08 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$3.smali
@@ -37,11 +37,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "v"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$3;->$isCallStatusVisible:Z
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$4.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$4.smali
index f359f8ee46..afcb393307 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$setPanelWindowInsetsListeners$4.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "v"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1.smali
index f8a7d8a48b..9dcb7c9c79 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1.smali
@@ -45,7 +45,7 @@
 
     const-string v1, "animator"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
@@ -64,11 +64,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Float"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2.smali
index ec283f36c3..1f5879868b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2.smali
@@ -45,7 +45,7 @@
 
     const-string v1, "animator"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
@@ -64,11 +64,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.Float"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$1.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$1.smali
index 253cb9bb5e..b7d912a6e3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetTabsHost.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/tabs/NavigationTab;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/tabs/TabsHostViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "selectTab"
+
+    const-string v5, "selectTab(Lcom/discord/widgets/tabs/NavigationTab;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectTab"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/tabs/TabsHostViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "selectTab(Lcom/discord/widgets/tabs/NavigationTab;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/tabs/NavigationTab;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/tabs/TabsHostViewModel;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/tabs/TabsHostViewModel;->selectTab(Lcom/discord/widgets/tabs/NavigationTab;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$2.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$2.smali
index e76e55640a..509f743591 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetTabsHost.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onSearchClick"
+
+    const-string v5, "onSearchClick()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onSearchClick"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onSearchClick()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$3.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$3.smali
index 557eba6f15..a8b69aba52 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$updateViews$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetTabsHost.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onSettingsLongPress"
+
+    const-string v5, "onSettingsLongPress()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onSettingsLongPress"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onSettingsLongPress()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost.smali b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost.smali
index 053d1d7398..2016ef05f2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost.smali
@@ -68,161 +68,113 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const/4 v2, 0x0
+    const-string v2, "bottomNavigationView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "bottomNavigationView"
-
-    const-string v4, "getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    const-string v2, "navHost"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNavHost()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "navHost"
-
-    const-string v4, "getNavHost()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    const-string v2, "nonFullscreenNavHost"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNonFullscreenNavHost()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "nonFullscreenNavHost"
-
-    const-string v4, "getNonFullscreenNavHost()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    const-string v2, "homeContent"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHomeContent()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "homeContent"
-
-    const-string v4, "getHomeContent()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    const-string v2, "friendsContent"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFriendsContent()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "friendsContent"
-
-    const-string v4, "getFriendsContent()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    const-string v2, "mentionsContent"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMentionsContent()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mentionsContent"
-
-    const-string v4, "getMentionsContent()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    const-class v2, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    const-string v2, "userSettingsContent"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserSettingsContent()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userSettingsContent"
-
-    const-string v4, "getUserSettingsContent()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
@@ -246,7 +198,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0aae
+    const v0, 0x7f0a0ab3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -254,7 +206,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0aac
+    const v0, 0x7f0a0ab1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -262,7 +214,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->bottomNavigationView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0ab2
+    const v0, 0x7f0a0ab7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -270,7 +222,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->navHost$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0ab3
+    const v0, 0x7f0a0ab8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -278,7 +230,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->nonFullscreenNavHost$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0ab0
+    const v0, 0x7f0a0ab5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -286,7 +238,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->homeContent$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0aaf
+    const v0, 0x7f0a0ab4
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -294,7 +246,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->friendsContent$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0ab1
+    const v0, 0x7f0a0ab6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -302,7 +254,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->mentionsContent$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0ab4
+    const v0, 0x7f0a0ab9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -351,7 +303,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -621,7 +573,7 @@
 
     sget-object v0, Lcom/discord/widgets/tabs/TabsHostViewModel$Event$TrackFriendsListShown;->INSTANCE:Lcom/discord/widgets/tabs/TabsHostViewModel$Event$TrackFriendsListShown;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -634,7 +586,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/tabs/TabsHostViewModel$Event$DismissSearchDialog;->INSTANCE:Lcom/discord/widgets/tabs/TabsHostViewModel$Event$DismissSearchDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -648,7 +600,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;->dismiss(Landroidx/fragment/app/FragmentManager;)V
 
@@ -811,7 +763,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -951,11 +903,11 @@
     return-void
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -1025,7 +977,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->previousShowBottomNav:Ljava/lang/Boolean;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1172,7 +1124,7 @@
     :cond_6
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1232,7 +1184,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026ostViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/tabs/TabsHostViewModel;
 
@@ -1259,9 +1211,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1269,36 +1221,31 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/widgets/tabs/BottomNavViewObserver;->Companion:Lcom/discord/widgets/tabs/BottomNavViewObserver$Companion;
+    sget-object v0, Lcom/discord/widgets/tabs/BottomNavViewObserver;->Companion:Lcom/discord/widgets/tabs/BottomNavViewObserver$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/tabs/BottomNavViewObserver$Companion;->getINSTANCE()Lcom/discord/widgets/tabs/BottomNavViewObserver;
+    invoke-virtual {v0}, Lcom/discord/widgets/tabs/BottomNavViewObserver$Companion;->getINSTANCE()Lcom/discord/widgets/tabs/BottomNavViewObserver;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->addHeightChangedListener(Lcom/discord/widgets/tabs/TabsHostBottomNavigationView$HeightChangedListener;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;->addHeightChangedListener(Lcom/discord/widgets/tabs/TabsHostBottomNavigationView$HeightChangedListener;)V
 
-    const/4 p1, 0x1
+    const/4 p1, 0x0
+
+    const/4 v0, 0x1
 
     const/4 v1, 0x0
 
-    invoke-static {p0, v1, p1, v0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->setPanelWindowInsetsListeners$default(Lcom/discord/widgets/tabs/WidgetTabsHost;ZILjava/lang/Object;)V
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/widgets/tabs/WidgetTabsHost;->setPanelWindowInsetsListeners$default(Lcom/discord/widgets/tabs/WidgetTabsHost;ZILjava/lang/Object;)V
 
-    new-instance p1, Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBound$1;
+    new-instance v0, Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBound$1;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBound$1;-><init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
+    invoke-direct {v0, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost$onViewBound$1;-><init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
 
     const/4 v2, 0x2
 
-    invoke-static {p0, p1, v1, v2, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    invoke-static {p0, v0, p1, v2, v1}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1314,7 +1261,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1324,7 +1271,7 @@
 
     const-string v3, "viewModel.observeViewSta\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -1387,12 +1334,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1400,29 +1347,17 @@
 .method public final registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "navigationTab"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "onTabSelectedListener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->tabToTabSelectionListenerMap:Ljava/util/Map;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "onTabSelectedListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "navigationTab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$Companion.smali
index ebf79f1be0..8cb8c25d1c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$Companion.smali
@@ -36,22 +36,17 @@
 .method public final show(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/tos/WidgetTosAccept;
+    const-class v0, Lcom/discord/widgets/tos/WidgetTosAccept;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali
index 30bf3addb1..c993f1bdd5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetTosAccept.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali
index aa7cd5ce5d..f8c1343c56 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$configureUI$2.smali
@@ -69,7 +69,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v0, Lf/a/b/s;->a:Lf/a/b/s;
 
     iget-object v1, p0, Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2;->this$0:Lcom/discord/widgets/tos/WidgetTosAccept;
 
@@ -79,7 +79,7 @@
 
     sget-object v3, Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2$1;->INSTANCE:Lcom/discord/widgets/tos/WidgetTosAccept$configureUI$2$1;
 
-    invoke-virtual {v0, v1, v3, v2}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v0, v1, v3, v2}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali
index 2878c0b818..23dc63cfcb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.smali
@@ -56,24 +56,20 @@
 
 
 # virtual methods
+.method public final call()Ljava/lang/Boolean;
+    .locals 1
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    return-object v0
+.end method
+
 .method public bridge synthetic call()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p0}, Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$1;->call()Ljava/lang/Boolean;
 
     move-result-object v0
 
     return-object v0
 .end method
-
-.method public final call()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali
index 39fdb6febe..fb49de18b2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.smali
@@ -64,13 +64,13 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const p2, 0x7f0a05d3
+    const p2, 0x7f0a05d9
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali
index 728cd03b23..bbf1408bab 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetTosAccept.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser$RequiredAction;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/tos/WidgetTosAccept;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/tos/WidgetTosAccept;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/models/domain/ModelUser$RequiredAction;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/tos/WidgetTosAccept;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/models/domain/ModelUser$RequiredAction;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/models/domain/ModelUser$RequiredAction;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/tos/WidgetTosAccept;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/tos/WidgetTosAccept;->access$configureUI(Lcom/discord/widgets/tos/WidgetTosAccept;Lcom/discord/models/domain/ModelUser$RequiredAction;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept.smali
index 30c48847ae..da964f7bd3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/tos/WidgetTosAccept.smali
@@ -35,81 +35,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tos/WidgetTosAccept;
 
-    const-class v2, Lcom/discord/widgets/tos/WidgetTosAccept;
+    const-string v2, "linkedTermsOfServiceTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getLinkedTermsOfServiceTextView()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "linkedTermsOfServiceTextView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getLinkedTermsOfServiceTextView()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/tos/WidgetTosAccept;
 
-    const/4 v2, 0x0
+    const-string v2, "linkedPrivacyPolicyTextView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getLinkedPrivacyPolicyTextView()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/tos/WidgetTosAccept;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "linkedPrivacyPolicyTextView"
-
-    const-string v4, "getLinkedPrivacyPolicyTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tos/WidgetTosAccept;
 
-    const-class v2, Lcom/discord/widgets/tos/WidgetTosAccept;
+    const-string v2, "ackCheckBox"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAckCheckBox()Landroid/widget/CheckBox;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "ackCheckBox"
-
-    const-string v4, "getAckCheckBox()Landroid/widget/CheckBox;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/tos/WidgetTosAccept;
 
-    const-class v2, Lcom/discord/widgets/tos/WidgetTosAccept;
+    const-string v2, "ackContinueView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAckContinueView()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "ackContinueView"
-
-    const-string v4, "getAckContinueView()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -208,7 +184,7 @@
 
     if-eqz v0, :cond_1
 
-    const v2, 0x7f1215a4
+    const v2, 0x7f1215ce
 
     invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
 
@@ -232,7 +208,7 @@
 
     if-eqz v0, :cond_2
 
-    const v1, 0x7f1212a4
+    const v1, 0x7f1212cf
 
     invoke-direct {p0, v0, v1}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
 
@@ -327,7 +303,7 @@
 
     const-string p2, "getString(urlResId)"
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -401,24 +377,26 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     sget-object p1, Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$1;->INSTANCE:Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$1;
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    invoke-static {p0, p1, v1, v2, v0}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
+    const/4 v2, 0x0
 
-    const v4, 0x7f0e0018
+    invoke-static {p0, p1, v0, v1, v2}, Lcom/discord/app/AppFragment;->setOnBackPressed$default(Lcom/discord/app/AppFragment;Lrx/functions/Func0;IILjava/lang/Object;)V
 
     sget-object v5, Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$2;->INSTANCE:Lcom/discord/widgets/tos/WidgetTosAccept$onViewBound$2;
 
+    const v4, 0x7f0e0018
+
     const/4 v6, 0x0
 
     const/4 v7, 0x4
@@ -430,13 +408,6 @@
     invoke-static/range {v3 .. v8}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu$default(Lcom/discord/app/AppFragment;ILrx/functions/Action2;Lrx/functions/Action1;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
index 6d03d2d16b..40c6acc47e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Badge.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/Badge;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,80 +63,75 @@
 .end method
 
 .method public final invoke(Lcom/discord/widgets/user/Badge;)V
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "badge"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getShowPremiumUpSell()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    sget-object v2, Lf/a/a/a/a;->j:Lf/a/a/a/a$b;
+    sget-object v1, Lf/a/a/a/a;->j:Lf/a/a/a/a$b;
 
-    iget-object v3, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
+    iget-object v2, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
 
-    const/4 v4, 0x5
+    const/4 v3, 0x5
 
     iget-object v0, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$context:Landroid/content/Context;
 
-    const v1, 0x7f121289
+    const v4, 0x7f1212b4
 
-    invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
+
+    const/4 v5, 0x0
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
-
     invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getObjectType()Ljava/lang/String;
 
-    move-result-object v10
+    move-result-object v9
 
-    const/16 v11, 0x18
+    const/16 v10, 0x18
 
-    const-string v8, "Profile Modal"
+    const-string v7, "Profile Modal"
 
-    const-string v9, "Badge"
+    const-string v8, "Badge"
 
-    invoke-static/range {v2 .. v11}, Lf/a/a/a/a$b;->b(Lf/a/a/a/a$b;Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+    invoke-static/range {v1 .. v10}, Lf/a/a/a/a$b;->b(Lf/a/a/a/a$b;Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
 
     goto :goto_1
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$context:Landroid/content/Context;
+    iget-object v0, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$context:Landroid/content/Context;
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getTooltip()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
     goto :goto_0
 
     :cond_1
     invoke-virtual {p1}, Lcom/discord/widgets/user/Badge;->getText()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
     :goto_0
     const/4 p1, 0x0
 
+    const/4 v2, 0x0
+
     const/16 v3, 0xc
 
-    invoke-static {v1, v2, p1, v0, v3}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, v1, p1, v2, v3}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     :goto_1
     return-void
-
-    :cond_2
-    const-string p1, "badge"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali
index ccbea62325..4effdbf3cf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali
@@ -54,11 +54,13 @@
 
     move-object/from16 v2, p4
 
-    const/4 v3, 0x0
+    const-string v3, "profile"
 
-    if-eqz v0, :cond_1b
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_1a
+    const-string v3, "context"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v3, Ljava/util/ArrayList;
 
@@ -72,7 +74,7 @@
 
     const-string v5, "profile.user"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
 
@@ -82,9 +84,9 @@
 
     new-instance v4, Lcom/discord/widgets/user/Badge;
 
-    const v7, 0x7f0803a7
+    const v7, 0x7f0803aa
 
-    const v6, 0x7f1214cd
+    const v6, 0x7f1214f7
 
     invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -111,7 +113,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isPartner()Z
 
@@ -121,9 +123,9 @@
 
     new-instance v4, Lcom/discord/widgets/user/Badge;
 
-    const v7, 0x7f08039c
+    const v7, 0x7f08039f
 
-    const v6, 0x7f1210d3
+    const v6, 0x7f1210fd
 
     invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -150,7 +152,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypeSquad()Z
 
@@ -160,9 +162,9 @@
 
     new-instance v4, Lcom/discord/widgets/user/Badge;
 
-    const v7, 0x7f08039a
+    const v7, 0x7f08039d
 
-    const v6, 0x7f120bed
+    const v6, 0x7f120c13
 
     invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -189,13 +191,13 @@
 
     move-result-object v4
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse1()Z
 
     move-result v4
 
-    const v6, 0x7f120bfe
+    const v6, 0x7f120c24
 
     const/4 v7, 0x0
 
@@ -217,19 +219,19 @@
 
     if-eqz v4, :cond_4
 
-    const v4, 0x7f08031b
+    const v4, 0x7f08031c
 
-    const v10, 0x7f08031b
+    const v10, 0x7f08031c
 
     goto :goto_1
 
     :cond_4
-    const v4, 0x7f08031a
+    const v4, 0x7f08031b
 
-    const v10, 0x7f08031a
+    const v10, 0x7f08031b
 
     :goto_1
-    const v4, 0x7f120bf5
+    const v4, 0x7f120c1b
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -270,7 +272,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse2()Z
 
@@ -294,19 +296,19 @@
 
     if-eqz v4, :cond_7
 
-    const v4, 0x7f08031d
+    const v4, 0x7f08031e
 
-    const v10, 0x7f08031d
+    const v10, 0x7f08031e
 
     goto :goto_3
 
     :cond_7
-    const v4, 0x7f08031c
+    const v4, 0x7f08031d
 
-    const v10, 0x7f08031c
+    const v10, 0x7f08031d
 
     :goto_3
-    const v4, 0x7f120bf6
+    const v4, 0x7f120c1c
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -320,7 +322,7 @@
 
     aput-object v4, v9, v7
 
-    const v4, 0x7f120bfe
+    const v4, 0x7f120c24
 
     invoke-virtual {v2, v4, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -349,7 +351,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->isHypesquadHouse3()Z
 
@@ -373,19 +375,19 @@
 
     if-eqz v1, :cond_a
 
-    const v1, 0x7f08031f
+    const v1, 0x7f080320
 
-    const v10, 0x7f08031f
+    const v10, 0x7f080320
 
     goto :goto_5
 
     :cond_a
-    const v1, 0x7f08031e
+    const v1, 0x7f08031f
 
-    const v10, 0x7f08031e
+    const v10, 0x7f08031f
 
     :goto_5
-    const v1, 0x7f120bf7
+    const v1, 0x7f120c1d
 
     invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -399,7 +401,7 @@
 
     aput-object v1, v9, v7
 
-    const v1, 0x7f120bfe
+    const v1, 0x7f120c24
 
     invoke-virtual {v2, v1, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -424,7 +426,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBugHunterLevel1()Z
 
@@ -436,7 +438,7 @@
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f080398
+    const v10, 0x7f08039b
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -463,7 +465,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBugHunterLevel2()Z
 
@@ -473,7 +475,7 @@
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f080399
+    const v10, 0x7f08039c
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -500,7 +502,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isVerifiedDeveloper()Z
 
@@ -510,9 +512,9 @@
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f0803a8
+    const v10, 0x7f0803ab
 
-    const v4, 0x7f121789
+    const v4, 0x7f1217b3
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -539,7 +541,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isPremiumEarlySupporter()Z
 
@@ -549,9 +551,9 @@
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f08039d
+    const v10, 0x7f0803a0
 
-    const v4, 0x7f1205d9
+    const v4, 0x7f1205db
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -578,19 +580,19 @@
 
     move-result v1
 
-    const v4, 0x7f121279
+    const v4, 0x7f1212a4
 
     if-eqz v1, :cond_10
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f08039b
+    const v10, 0x7f08039e
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v11
 
-    const v5, 0x7f121154
+    const v5, 0x7f12117f
 
     new-array v9, v8, [Ljava/lang/Object;
 
@@ -631,17 +633,13 @@
 
     const/16 v9, 0x18
 
-    invoke-static {v5, v9}, Lj0/n/c/h;->compare(II)I
+    const v10, 0x7f0803a1
 
-    move-result v5
+    if-lt v5, v9, :cond_11
 
-    const v9, 0x7f08039e
+    const v10, 0x7f0803a9
 
-    if-ltz v5, :cond_11
-
-    const v9, 0x7f0803a6
-
-    const v11, 0x7f0803a6
+    const v12, 0x7f0803a9
 
     goto/16 :goto_6
 
@@ -650,36 +648,28 @@
 
     move-result v5
 
-    const/16 v10, 0x12
+    const/16 v9, 0x12
 
-    invoke-static {v5, v10}, Lj0/n/c/h;->compare(II)I
+    if-lt v5, v9, :cond_12
 
-    move-result v5
+    const v10, 0x7f0803a8
 
-    if-ltz v5, :cond_12
+    const v12, 0x7f0803a8
 
-    const v9, 0x7f0803a5
-
-    const v11, 0x7f0803a5
-
-    goto/16 :goto_6
+    goto :goto_6
 
     :cond_12
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
     move-result v5
 
-    const/16 v10, 0xf
+    const/16 v9, 0xf
 
-    invoke-static {v5, v10}, Lj0/n/c/h;->compare(II)I
+    if-lt v5, v9, :cond_13
 
-    move-result v5
+    const v10, 0x7f0803a7
 
-    if-ltz v5, :cond_13
-
-    const v9, 0x7f0803a4
-
-    const v11, 0x7f0803a4
+    const v12, 0x7f0803a7
 
     goto :goto_6
 
@@ -688,17 +678,13 @@
 
     move-result v5
 
-    const/16 v10, 0xc
+    const/16 v9, 0xc
 
-    invoke-static {v5, v10}, Lj0/n/c/h;->compare(II)I
+    if-lt v5, v9, :cond_14
 
-    move-result v5
+    const v10, 0x7f0803a6
 
-    if-ltz v5, :cond_14
-
-    const v9, 0x7f0803a3
-
-    const v11, 0x7f0803a3
+    const v12, 0x7f0803a6
 
     goto :goto_6
 
@@ -707,17 +693,13 @@
 
     move-result v5
 
-    const/16 v10, 0x9
+    const/16 v9, 0x9
 
-    invoke-static {v5, v10}, Lj0/n/c/h;->compare(II)I
+    if-lt v5, v9, :cond_15
 
-    move-result v5
+    const v10, 0x7f0803a5
 
-    if-ltz v5, :cond_15
-
-    const v9, 0x7f0803a2
-
-    const v11, 0x7f0803a2
+    const v12, 0x7f0803a5
 
     goto :goto_6
 
@@ -726,17 +708,13 @@
 
     move-result v5
 
-    const/4 v10, 0x6
+    const/4 v9, 0x6
 
-    invoke-static {v5, v10}, Lj0/n/c/h;->compare(II)I
+    if-lt v5, v9, :cond_16
 
-    move-result v5
+    const v10, 0x7f0803a4
 
-    if-ltz v5, :cond_16
-
-    const v9, 0x7f0803a1
-
-    const v11, 0x7f0803a1
+    const v12, 0x7f0803a4
 
     goto :goto_6
 
@@ -745,15 +723,11 @@
 
     move-result v5
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->compare(II)I
+    if-lt v5, v6, :cond_17
 
-    move-result v5
+    const v10, 0x7f0803a3
 
-    if-ltz v5, :cond_17
-
-    const v9, 0x7f0803a0
-
-    const v11, 0x7f0803a0
+    const v12, 0x7f0803a3
 
     goto :goto_6
 
@@ -764,15 +738,11 @@
 
     const/4 v6, 0x2
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->compare(II)I
+    if-lt v5, v6, :cond_18
 
-    move-result v5
+    const v10, 0x7f0803a2
 
-    if-ltz v5, :cond_18
-
-    const v9, 0x7f08039f
-
-    const v11, 0x7f08039f
+    const v12, 0x7f0803a2
 
     goto :goto_6
 
@@ -781,20 +751,16 @@
 
     move-result v1
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->compare(II)I
-
-    move-result v1
-
-    const v11, 0x7f08039e
+    const v12, 0x7f0803a1
 
     :goto_6
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v12
+    move-result-object v13
 
-    const v4, 0x7f12120c
+    const v4, 0x7f121237
 
     new-array v5, v8, [Ljava/lang/Object;
 
@@ -806,34 +772,20 @@
 
     invoke-virtual {v2, v4, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v13
+    move-result-object v14
 
-    xor-int/lit8 v14, p3, 0x1
+    xor-int/lit8 v15, p3, 0x1
 
-    const-string v15, "PREMIUM_GUILD"
+    const-string v16, "PREMIUM_GUILD"
 
-    move-object v10, v1
+    move-object v11, v1
 
-    invoke-direct/range {v10 .. v15}, Lcom/discord/widgets/user/Badge;-><init>(ILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
+    invoke-direct/range {v11 .. v16}, Lcom/discord/widgets/user/Badge;-><init>(ILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)V
 
     invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_19
     return-object v3
-
-    :cond_1a
-    const-string v0, "context"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_1b
-    const-string v0, "profile"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public final onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
@@ -851,29 +803,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;-><init>(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/Badge.smali b/com.discord/smali_classes2/com/discord/widgets/user/Badge.smali
index c7a7caac81..8fa2053ef3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/Badge.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/Badge.smali
@@ -346,7 +346,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/Badge;->text:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -356,7 +356,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/Badge;->tooltip:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -372,7 +372,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/Badge;->objectType:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/UserNameFormatterKt.smali b/com.discord/smali_classes2/com/discord/widgets/user/UserNameFormatterKt.smali
index 4fb6ed0b1f..7c04545f04 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/UserNameFormatterKt.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/UserNameFormatterKt.smali
@@ -31,16 +31,20 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "user"
 
-    if-eqz p0, :cond_7
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p4}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface;
 
     move-result-object p4
 
+    const/4 v0, 0x0
+
     if-eqz p4, :cond_0
 
     new-instance v1, Lcom/discord/utilities/spans/TypefaceSpanCompat;
@@ -240,18 +244,4 @@
 
     :cond_5
     return-object v4
-
-    :cond_6
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "user"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$Companion.smali
index a6d54dc2f6..0f02600e49 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$Companion.smali
@@ -36,7 +36,9 @@
 .method public final launch(Ljava/lang/String;JJLandroidx/fragment/app/FragmentManager;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "userName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p6, :cond_0
 
@@ -74,13 +76,4 @@
     invoke-virtual {v0, p6, p1}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "userName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
index d2b314c70a..c6080490ad 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
@@ -81,7 +81,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {v0, p1, v2, v1}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    invoke-static {v0, p1, v2, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetBanUser$onViewBound$3$1;->this$0:Lcom/discord/widgets/user/WidgetBanUser$onViewBound$3;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali
index 706fab6633..285ca7e02a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser$onViewBound$3.smali
@@ -113,7 +113,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
@@ -169,7 +169,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/user/WidgetBanUser$onViewBound$3;->this$0:Lcom/discord/widgets/user/WidgetBanUser;
 
-    invoke-static {v0, v1}, Lf/a/b/q;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+    invoke-static {v0, v1}, Lf/a/b/s;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser.smali
index cc66872418..fe3aac2177 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetBanUser.smali
@@ -41,121 +41,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetBanUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetBanUser;
+    const-string v2, "titleTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleTextView()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "titleTextView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitleTextView()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/WidgetBanUser;
 
-    const/4 v2, 0x0
+    const-string v2, "bodyTextView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBodyTextView()Lcom/discord/app/AppTextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetBanUser;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "bodyTextView"
-
-    const-string v4, "getBodyTextView()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetBanUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetBanUser;
+    const-string v2, "confirmButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmButton"
-
-    const-string v4, "getConfirmButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetBanUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetBanUser;
+    const-string v2, "cancelButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancelButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancelButton"
-
-    const-string v4, "getCancelButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetBanUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetBanUser;
+    const-string v2, "reasonEditText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getReasonEditText()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "reasonEditText"
-
-    const-string v4, "getReasonEditText()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetBanUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetBanUser;
+    const-string v2, "historyRadios"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHistoryRadios()Ljava/util/List;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "historyRadios"
-
-    const-string v4, "getHistoryRadios()Ljava/util/List;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -175,7 +139,7 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 2
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
@@ -225,7 +189,17 @@
 
     fill-array-data v0, :array_0
 
-    invoke-static {p0, v0}, Lf/n/a/k/a;->m(Landroidx/fragment/app/DialogFragment;[I)Lkotlin/properties/ReadOnlyProperty;
+    const-string v1, "$this$bindViews"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "ids"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lm0/e;->d:Lm0/e;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->R([ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object v0
 
@@ -438,7 +412,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 9
 
-    if-eqz p1, :cond_1
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -526,7 +502,7 @@
 
     const-string v2, "userName"
 
-    invoke-static {v8, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -569,13 +545,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$Companion.smali
index 7728bbd87a..fff22e6a16 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$Companion.smali
@@ -36,11 +36,13 @@
 .method public final launch(Ljava/lang/String;JJLandroidx/fragment/app/FragmentManager;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "userName"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetKickUser;
 
@@ -73,18 +75,4 @@
     invoke-virtual {v0, p6, p1}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "userName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
index db29038573..4ad538d5b8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
@@ -73,7 +73,7 @@
 
     aput-object p1, v1, v2
 
-    const p1, 0x7f120df1
+    const p1, 0x7f120e17
 
     invoke-virtual {v0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -81,7 +81,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {v0, p1, v2, v1}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    invoke-static {v0, p1, v2, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1;->this$0:Lcom/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali
index 046d819aaf..cd7dce8c3f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.smali
@@ -59,7 +59,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -113,7 +113,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2;->this$0:Lcom/discord/widgets/user/WidgetKickUser;
 
-    invoke-static {v0, v1}, Lf/a/b/q;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+    invoke-static {v0, v1}, Lf/a/b/s;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser.smali
index 59b1225a24..20c7df9aba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetKickUser.smali
@@ -37,101 +37,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetKickUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetKickUser;
+    const-string v2, "titleTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getTitleTextView()Lcom/discord/app/AppTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "titleTextView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getTitleTextView()Lcom/discord/app/AppTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/WidgetKickUser;
 
-    const/4 v2, 0x0
+    const-string v2, "bodyTextView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getBodyTextView()Lcom/discord/app/AppTextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetKickUser;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "bodyTextView"
-
-    const-string v4, "getBodyTextView()Lcom/discord/app/AppTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetKickUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetKickUser;
+    const-string v2, "confirmButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConfirmButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "confirmButton"
-
-    const-string v4, "getConfirmButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetKickUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetKickUser;
+    const-string v2, "cancelButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCancelButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "cancelButton"
-
-    const-string v4, "getCancelButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetKickUser;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetKickUser;
+    const-string v2, "reasonEditText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getReasonEditText()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "reasonEditText"
-
-    const-string v4, "getReasonEditText()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -155,7 +125,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0576
+    const v0, 0x7f0a057c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +133,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->titleTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0572
+    const v0, 0x7f0a0578
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -171,7 +141,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->bodyTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0574
+    const v0, 0x7f0a057a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +149,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->confirmButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0573
+    const v0, 0x7f0a0579
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -187,7 +157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetKickUser;->cancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0575
+    const v0, 0x7f0a057b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -385,7 +355,7 @@
 
     const-string v3, "userName"
 
-    invoke-static {v9, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers$Model.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers$Model.smali
index ff3398c6c4..c210b15b24 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers$Model.smali
@@ -150,7 +150,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers.smali
index fdabe65657..516ccef028 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetPruneUsers.smali
@@ -135,7 +135,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const v1, 0x7f1212b9
+    const v1, 0x7f1212e4
 
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -279,7 +279,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView;
 
-    const v4, 0x7f1206ea
+    const v4, 0x7f1206ec
 
     const/4 v6, 0x2
 
@@ -388,7 +388,7 @@
 
     move-result-object v2
 
-    invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v1, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
@@ -400,11 +400,11 @@
 
     sget-object p2, Lf/a/o/g/o;->d:Lf/a/o/g/o;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -412,7 +412,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -436,7 +436,7 @@
 
     invoke-direct {v0, p2}, Lf/a/o/g/b;-><init>(Lrx/subjects/Subject;)V
 
-    invoke-static {v0, p0}, Lf/a/b/q;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+    invoke-static {v0, p0}, Lf/a/b/s;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -504,7 +504,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object p2
 
@@ -512,7 +512,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -524,7 +524,7 @@
 
     invoke-direct {p2, p0}, Lf/a/o/g/e;-><init>(Lcom/discord/widgets/user/WidgetPruneUsers;)V
 
-    invoke-static {p2, p0}, Lf/a/b/q;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
+    invoke-static {p2, p0}, Lf/a/b/s;->n(Lrx/functions/Action1;Lcom/discord/app/AppDialog;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -558,7 +558,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0731
+    const v0, 0x7f0a0737
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -568,7 +568,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->header:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0733
+    const v0, 0x7f0a0739
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -578,7 +578,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView;
 
-    const v0, 0x7f0a0736
+    const v0, 0x7f0a073c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -588,7 +588,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->progressBar:Landroid/widget/ProgressBar;
 
-    const v0, 0x7f0a0732
+    const v0, 0x7f0a0738
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -596,7 +596,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->prune:Landroid/view/View;
 
-    const v0, 0x7f0a0730
+    const v0, 0x7f0a0736
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -608,7 +608,7 @@
 
     new-array v0, v0, [Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a0734
+    const v1, 0x7f0a073a
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -620,7 +620,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0735
+    const v1, 0x7f0a073b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -696,7 +696,7 @@
 
     aput-object v9, v7, v3
 
-    const v9, 0x7f1000a9
+    const v9, 0x7f1000ab
 
     invoke-static {v4, v5, v9, v8, v7}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -756,7 +756,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -770,7 +770,7 @@
 
     const-class v2, Lcom/discord/widgets/user/WidgetPruneUsers;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
index 5740e5f6ac..34a03468cf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
@@ -41,7 +41,43 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func9<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+        "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelChannel;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/String;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildRole;",
+        ">;>;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/user/WidgetUserMentions$Model;",
+        ">;"
     }
 .end annotation
 
@@ -159,7 +195,7 @@
 
     invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
 
-    sget-object v18, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v18, Lk0/j/p;->d:Lk0/j/p;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List;
 
@@ -205,7 +241,7 @@
 
     const-string v11, "members"
 
-    invoke-static {v2, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
@@ -224,7 +260,7 @@
     goto :goto_3
 
     :cond_3
-    sget-object v11, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v11, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_3
     move-object/from16 v25, v11
@@ -233,7 +269,7 @@
 
     const-string v11, "roles"
 
-    invoke-static {v1, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -241,7 +277,7 @@
 
     const-string v15, "channel.guildId"
 
-    invoke-static {v11, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -252,7 +288,7 @@
     goto :goto_4
 
     :cond_4
-    sget-object v11, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v11, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_4
     move-object/from16 v26, v11
@@ -289,7 +325,7 @@
 
     const/16 v31, 0x0
 
-    invoke-static {v3, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -299,13 +335,13 @@
 
     move-result-object v7
 
-    invoke-static {v7, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v33
 
-    sget-object v35, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v35, Lk0/j/o;->d:Lk0/j/o;
 
     move-object/from16 v27, v6
 
@@ -355,7 +391,7 @@
 
     move-object/from16 v5, p8
 
-    invoke-static {v5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p8 .. p8}, Ljava/lang/Long;->longValue()J
 
@@ -377,11 +413,11 @@
 
     move-object/from16 v2, p4
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v21, 0x0
 
-    invoke-static {v3, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v14}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali
index d0806dad7a..6a0f66fa15 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali
@@ -49,11 +49,15 @@
 
     move-object/from16 v0, p2
 
-    const/4 v1, 0x0
+    const-string v1, "messageLoader"
 
-    if-eqz p1, :cond_1
+    move-object/from16 v2, p1
 
-    if-eqz v0, :cond_0
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "selectedTab"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->getMentionsLoadingStateSubject()Lrx/subjects/BehaviorSubject;
 
@@ -143,17 +147,17 @@
 
     invoke-direct {v11, v0}, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;-><init>(Lcom/discord/widgets/tabs/NavigationTab;)V
 
-    const-wide/16 v12, 0x12c
-
     sget-object v14, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
+    const-wide/16 v12, 0x12c
+
     invoke-static/range {v2 .. v14}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "ObservableWithLeadingEdg\u2026LISECONDS\n              )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -165,21 +169,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string v0, "selectedTab"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const-string v0, "messageLoader"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
index 12cd8af72c..2ef5344e89 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState.smali
@@ -52,7 +52,7 @@
 .end method
 
 .method public constructor <init>(ZZLjava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ZZ",
@@ -63,7 +63,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "mentions"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -74,15 +76,6 @@
     iput-object p3, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->mentions:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "mentions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(ZZLjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -108,7 +101,7 @@
 
     if-eqz p4, :cond_2
 
-    sget-object p3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p3, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_2
     invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;-><init>(ZZLjava/util/List;)V
@@ -194,22 +187,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "mentions"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;-><init>(ZZLjava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "mentions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -239,7 +225,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->mentions:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali
index af6ebf0eb3..bf5ed6efb7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$filters$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,36 +57,29 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
-    const/4 v1, 0x0
-
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x7
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x7
 
-    move-object v0, p1
+    const/4 v6, 0x0
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;-><init>(ZZLjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;-><init>(ZZLjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali
index 32a3c43210..72ef0a2d81 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoadError$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,36 +57,29 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x6
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x6
 
-    move-object v0, p1
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali
index 988d60c522..86ea1a2337 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -47,38 +47,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1;
 
-    iget-boolean v2, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1;->$isAllLoaded:Z
+    iget-boolean v3, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$handleLoaded$1;->$isAllLoaded:Z
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x4
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x4
 
-    move-object v0, p1
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
+    move-object v1, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali
index b5b9850e90..d05fafe049 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -57,20 +57,13 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali
index aab8a3aa9a..f5a5b58224 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.smali
@@ -74,7 +74,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->access$handleLoaded(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Ljava/util/List;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali
index 5fd02b3562..ebe3c30496 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader.smali
@@ -71,7 +71,9 @@
 
     move-object/from16 v1, p1
 
-    if-eqz v1, :cond_0
+    const-string v2, "retryHandler"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
 
@@ -137,20 +139,11 @@
 
     const-string v2, "BehaviorSubject.create(mentionsLoadingState)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionsLoadingStateSubject:Lrx/subjects/BehaviorSubject;
 
     return-void
-
-    :cond_0
-    const-string v1, "retryHandler"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
 
 .method public static final synthetic access$handleLoadError(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;)V
@@ -224,7 +217,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    invoke-static {p1}, Lj0/i/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -311,7 +304,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionsLoadingState:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -371,23 +364,23 @@
 .end method
 
 .method public final setFilters(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;)V
-    .locals 2
+    .locals 1
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "value"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->filters:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
+    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->filters:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/lit8 v1, v1, 0x1
+    xor-int/lit8 v0, v0, 0x1
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->filters:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
@@ -398,7 +391,9 @@
     invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->loadBeforeMessageId:Ljava/lang/Long;
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->loadBeforeMessageId:Ljava/lang/Long;
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentions:Ljava/util/ArrayList;
 
@@ -410,13 +405,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setInteractionState(Lcom/discord/stores/StoreChat$InteractionState;)V
@@ -424,24 +412,19 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "interactionState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->interactionState:Lcom/discord/stores/StoreChat$InteractionState;
 
-    const/4 p1, 0x1
+    const/4 p1, 0x0
 
-    invoke-static {p0, v0, p1, v0}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->tryLoad$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    const/4 v0, 0x1
+
+    invoke-static {p0, p1, v0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->tryLoad$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "interactionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setIsFocused(Z)V
@@ -461,7 +444,7 @@
 .end method
 
 .method public final tryLoad(Lkotlin/jvm/functions/Function1;)V
-    .locals 10
+    .locals 9
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -476,13 +459,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "loadingStateUpdater"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionsLoadingState:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
+    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionsLoadingState:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
-    invoke-interface {p1, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -514,9 +497,9 @@
 
     move-result p1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    if-ne p1, v1, :cond_2
+    if-ne p1, v0, :cond_2
 
     iget-boolean p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->isFocused:Z
 
@@ -525,19 +508,19 @@
     goto :goto_1
 
     :cond_0
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionsLoadingState:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionsLoadingState:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x6
 
-    const/4 v6, 0x6
+    const/4 v6, 0x0
 
-    const/4 v7, 0x0
-
-    invoke-static/range {v2 .. v7}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
+    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;
 
     move-result-object p1
 
@@ -551,7 +534,7 @@
 
     if-eqz p1, :cond_1
 
-    const-wide/16 v2, 0x0
+    const-wide/16 v1, 0x0
 
     goto :goto_0
 
@@ -560,42 +543,44 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->getGuildId()J
 
-    move-result-wide v2
+    move-result-wide v1
 
     :goto_0
     sget-object p1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
     invoke-virtual {p1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v4
+    move-result-object v3
 
-    iget v5, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionLimit:I
+    iget v4, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->mentionLimit:I
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->filters:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->getIncludeRoles()Z
 
-    move-result v6
+    move-result v5
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->filters:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->getIncludeEveryone()Z
 
-    move-result v7
+    move-result v6
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v8
+    move-result-object v7
 
-    iget-object v9, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->loadBeforeMessageId:Ljava/lang/Long;
+    iget-object v8, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->loadBeforeMessageId:Ljava/lang/Long;
 
-    invoke-virtual/range {v4 .. v9}, Lcom/discord/utilities/rest/RestAPI;->getMentions(IZZLjava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
+    invoke-virtual/range {v3 .. v8}, Lcom/discord/utilities/rest/RestAPI;->getMentions(IZZLjava/lang/Long;Ljava/lang/Long;)Lrx/Observable;
 
     move-result-object p1
 
+    const/4 v1, 0x0
+
     const/4 v2, 0x0
 
-    invoke-static {p1, v2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, v1, v0, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
@@ -620,11 +605,4 @@
     :cond_2
     :goto_1
     return-void
-
-    :cond_3
-    const-string p1, "loadingStateUpdater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model.smali
index 31efbead7b..7be823edbc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$Model.smali
@@ -129,15 +129,21 @@
 
     move-object/from16 v4, p18
 
-    const/4 v5, 0x0
+    const-string v5, "channelNames"
 
-    if-eqz v1, :cond_3
+    invoke-static {p8, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_2
+    const-string v5, "list"
 
-    if-eqz v3, :cond_1
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_0
+    const-string v5, "myRoleIds"
+
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "selectedTab"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -186,34 +192,6 @@
     iput-object v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
 
     return-void
-
-    :cond_0
-    const-string v1, "selectedTab"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_1
-    const-string v1, "myRoleIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_2
-    const-string v1, "list"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_3
-    const-string v1, "channelNames"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
 .end method
 
 .method public synthetic constructor <init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -657,77 +635,65 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    move-wide/from16 v1, p1
 
-    if-eqz p8, :cond_3
+    move-wide/from16 v3, p3
 
-    if-eqz p11, :cond_2
+    move-object/from16 v5, p5
 
-    if-eqz p12, :cond_1
+    move-wide/from16 v6, p6
 
-    if-eqz p18, :cond_0
+    move-object/from16 v8, p8
 
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;
+    move-wide/from16 v9, p9
 
-    move-object v1, v0
+    move-object/from16 v11, p11
 
-    move-wide/from16 v2, p1
+    move-object/from16 v12, p12
 
-    move-wide/from16 v4, p3
+    move-wide/from16 v13, p13
 
-    move-object/from16 v6, p5
+    move/from16 v15, p15
 
-    move-wide/from16 v7, p6
+    move/from16 v16, p16
 
-    move-object/from16 v9, p8
+    move-object/from16 v17, p17
 
-    move-wide/from16 v10, p9
+    move-object/from16 v18, p18
 
-    move-object/from16 v12, p11
+    const-string v0, "channelNames"
 
-    move-object/from16 v13, p12
+    move-object/from16 v1, p8
 
-    move-wide/from16 v14, p13
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v16, p15
+    const-string v0, "list"
 
-    move/from16 v17, p16
+    move-object/from16 v1, p11
 
-    move-object/from16 v18, p17
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v19, p18
+    const-string v0, "myRoleIds"
 
-    invoke-direct/range {v1 .. v19}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;)V
+    move-object/from16 v1, p12
 
-    return-object v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_0
-    const-string v1, "selectedTab"
+    const-string v0, "selectedTab"
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, p18
 
-    throw v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_1
-    const-string v1, "myRoleIds"
+    new-instance v19, Lcom/discord/widgets/user/WidgetUserMentions$Model;
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v0, v19
 
-    throw v0
+    move-wide/from16 v1, p1
 
-    :cond_2
-    const-string v1, "list"
+    invoke-direct/range {v0 .. v18}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;)V
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "channelNames"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v19
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -773,7 +739,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -799,7 +765,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -825,7 +791,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -839,7 +805,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -877,7 +843,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -887,7 +853,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali
index 87fe47d3d3..8833f4ca39 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$Companion.smali
@@ -50,13 +50,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "filters"
 
-    if-eqz p4, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onFiltersUpdated"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
@@ -77,25 +81,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "onFiltersUpdated"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "filters"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali
index 1d7f18c5a2..5b56eb68d7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "dismiss"
+
+    const-string v5, "dismiss()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "dismiss"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "dismiss()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
index b689d50eb3..160e26a7a3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
@@ -58,61 +58,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
+    const-string v2, "filterSelectedGuildCs"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFilterSelectedGuildCs()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "filterSelectedGuildCs"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFilterSelectedGuildCs()Lcom/discord/views/CheckedSetting;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    const/4 v2, 0x0
+    const-string v2, "filterIncludeEveryoneCs"
 
-    aput-object v1, v0, v2
+    const-string v3, "getFilterIncludeEveryoneCs()Lcom/discord/views/CheckedSetting;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "filterIncludeEveryoneCs"
-
-    const-string v4, "getFilterIncludeEveryoneCs()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;
+    const-string v2, "filterIncludeRolesCs"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFilterIncludeRolesCs()Lcom/discord/views/CheckedSetting;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "filterIncludeRolesCs"
-
-    const-string v4, "getFilterIncludeRolesCs()Lcom/discord/views/CheckedSetting;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -136,7 +118,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a09ce
+    const v0, 0x7f0a09d2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -144,7 +126,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->filterSelectedGuildCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09cc
+    const v0, 0x7f0a09d0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -152,7 +134,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter;->filterIncludeEveryoneCs$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09cd
+    const v0, 0x7f0a09d1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +195,7 @@
     :cond_0
     const-string p0, "filters"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -240,7 +222,7 @@
     :cond_0
     const-string p0, "onFiltersUpdated"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -377,7 +359,7 @@
     :cond_0
     const-string p1, "onFiltersUpdated"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -437,7 +419,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {v0}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v0}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -467,7 +449,7 @@
 
     move-result-object v0
 
-    const v5, 0x7f1215bf
+    const v5, 0x7f1215e9
 
     new-array v4, v4, [Ljava/lang/Object;
 
@@ -554,17 +536,17 @@
     return-void
 
     :cond_3
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_4
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_5
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1$1.smali
index 5aa0327609..2ca01f6856 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$configureToolbar$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "filters"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$configureToolbar$1$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions$configureToolbar$1;
 
@@ -74,13 +76,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->setFilters(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "filters"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.smali
index 1ca23ad44c..9bb4590182 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.smali
@@ -58,13 +58,13 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const p2, 0x7f0a05d9
+    const p2, 0x7f0a05df
 
     if-ne p1, p2, :cond_0
 
@@ -78,7 +78,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$configureToolbar$1;->$guildName:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali
index ae7c3052f8..3532801803 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.smali
@@ -75,39 +75,25 @@
 .method public onCallMessageClicked(JLcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage$CallStatus;)V
     .locals 0
 
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "callStatus"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
 
 .method public onInteractionStateUpdated(Lcom/discord/stores/StoreChat$InteractionState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "interactionState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;->$onInteractionStateUpdated:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "interactionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onListClicked()V
@@ -119,124 +105,77 @@
 .method public onMessageAuthorAvatarClicked(Lcom/discord/models/domain/ModelMessage;J)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "message"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;->jumpToMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onMessageAuthorLongClicked(Lcom/discord/models/domain/ModelMessage;Ljava/lang/Long;)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "message"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;->jumpToMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onMessageAuthorNameClicked(Lcom/discord/models/domain/ModelMessage;J)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "message"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;->jumpToMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onMessageBlockedGroupClicked(Lcom/discord/models/domain/ModelMessage;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;->jumpToMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onMessageClicked(Lcom/discord/models/domain/ModelMessage;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;->jumpToMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onMessageLongClicked(Lcom/discord/models/domain/ModelMessage;Ljava/lang/CharSequence;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "formattedMessage"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$createAdapter$1;->jumpToMessage(Lcom/discord/models/domain/ModelMessage;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "formattedMessage"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onOldestMessageId(JJ)V
@@ -246,20 +185,13 @@
 .end method
 
 .method public onOpenPinsClicked(Lcom/discord/models/domain/ModelMessage;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onQuickAddReactionClicked(JJJ)V
@@ -271,108 +203,63 @@
 .method public onQuickDownloadClicked(Landroid/net/Uri;Ljava/lang/String;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "uri"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "fileName"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
     return p1
-
-    :cond_0
-    const-string p1, "fileName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onReactionClicked(JJJLcom/discord/models/domain/ModelMessageReaction;)V
     .locals 0
 
-    if-eqz p7, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "reaction"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p7, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
 
 .method public onReactionLongClicked(JJLcom/discord/models/domain/ModelMessageReaction;)V
     .locals 0
 
-    if-eqz p5, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "reaction"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p5, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
 
 .method public onUrlLongClicked(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler$DefaultImpls;->onUrlLongClicked(Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EventHandler;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onUserActivityAction(JJJILcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelApplication;)V
     .locals 0
 
-    const/4 p1, 0x0
+    const-string p1, "activity"
 
-    if-eqz p8, :cond_1
+    invoke-static {p8, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string p1, "application"
+
+    invoke-static {p9, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p2, "application"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p2, "activity"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
 .end method
 
 .method public onUserMentionClicked(JJJ)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$observeModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$observeModel$1.smali
index c712afc459..112e803fa8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$observeModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$observeModel$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetUserMentions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/tabs/NavigationTab;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/user/WidgetUserMentions$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -69,6 +71,7 @@
             "Lcom/discord/widgets/tabs/NavigationTab;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/user/WidgetUserMentions$Model;",
             ">;"
         }
@@ -103,7 +106,7 @@
 
     const-string v2, "selectedTab"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;->get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lcom/discord/widgets/tabs/NavigationTab;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali
index d663405bdf..c1e101d928 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/WidgetUserMentions$onViewBound$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreChat$InteractionState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "setInteractionState"
+
+    const-string v5, "setInteractionState(Lcom/discord/stores/StoreChat$InteractionState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "setInteractionState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "setInteractionState(Lcom/discord/stores/StoreChat$InteractionState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/stores/StoreChat$InteractionState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->setInteractionState(Lcom/discord/stores/StoreChat$InteractionState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali
index c5e81ce378..d9c29574fe 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserMentions.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserMentions$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserMentions$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserMentions;->access$configureUI(Lcom/discord/widgets/user/WidgetUserMentions;Lcom/discord/widgets/user/WidgetUserMentions$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali
index e385737aa7..dbec99dfb4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions$sam$java_lang_Runnable$0.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions.smali
index 2ed0b3dee4..898c7bea4b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMentions.smali
@@ -41,41 +41,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserMentions;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserMentions;
+    const-string v2, "toolbarTitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "toolbarTitle"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getToolbarTitle()Landroidx/appcompat/widget/AppCompatTextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserMentions;
 
-    const/4 v2, 0x0
+    const-string v2, "mentionsList"
 
-    aput-object v1, v0, v2
+    const-string v3, "getMentionsList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserMentions;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "mentionsList"
-
-    const-string v4, "getMentionsList()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -91,7 +79,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0997
+    const v0, 0x7f0a099b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -99,7 +87,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->toolbarTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09cf
+    const v0, 0x7f0a09d3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -298,7 +286,7 @@
     :cond_4
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -431,13 +419,13 @@
 
     invoke-direct {v1, p0}, Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;-><init>(Lcom/discord/widgets/user/WidgetUserMentions;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream.getTabsNavig\u2026(1)\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -515,7 +503,7 @@
     :cond_1
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -523,31 +511,31 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f12130d
+    const p1, 0x7f121337
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
     sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
 
-    new-instance v1, Lcom/discord/widgets/user/WidgetUserMentions$onViewBound$1;
+    new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$onViewBound$1;
 
-    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsLoader:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsLoader:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/user/WidgetUserMentions$onViewBound$1;-><init>(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;)V
+    invoke-direct {v0, v1}, Lcom/discord/widgets/user/WidgetUserMentions$onViewBound$1;-><init>(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;)V
 
-    invoke-direct {p0, v1}, Lcom/discord/widgets/user/WidgetUserMentions;->createAdapter(Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
+    invoke-direct {p0, v0}, Lcom/discord/widgets/user/WidgetUserMentions;->createAdapter(Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
     move-result-object p1
 
@@ -563,33 +551,33 @@
 
     if-eqz p1, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->setSmoothScrollbarEnabled(Z)V
+    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->setSmoothScrollbarEnabled(Z)V
 
     :cond_0
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsAdapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
 
     if-eqz p1, :cond_1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p1, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setMentionMeMessageLevelHighlighting(Z)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->setMentionMeMessageLevelHighlighting(Z)V
 
     :cond_1
     new-instance p1, Landroidx/lifecycle/ViewModelProvider;
 
     invoke-direct {p1, p0}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;)V
 
-    const-class v1, Lcom/discord/widgets/user/WidgetUserMentionsViewModel;
+    const-class v0, Lcom/discord/widgets/user/WidgetUserMentionsViewModel;
 
-    invoke-virtual {p1, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object p1
 
-    const-string v1, "ViewModelProvider(this).\u2026onsViewModel::class.java)"
+    const-string v0, "ViewModelProvider(this).\u2026onsViewModel::class.java)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/user/WidgetUserMentionsViewModel;
 
@@ -599,33 +587,23 @@
 
     move-result-object p1
 
-    instance-of v1, p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    instance-of v0, p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_2
-    move-object v0, p1
+    check-cast p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
 
-    :goto_0
-    check-cast v0, Lcom/discord/widgets/tabs/WidgetTabsHost;
+    if-eqz p1, :cond_3
 
-    if-eqz v0, :cond_3
+    sget-object v0, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
 
-    sget-object p1, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
-
-    invoke-virtual {v0, p1, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
+    invoke-virtual {p1, v0, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->registerTabSelectionListener(Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/widgets/tabs/OnTabSelectedListener;)V
 
     :cond_3
     return-void
-
-    :cond_4
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
index 6f304f60f1..13961e9a52 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
@@ -247,7 +247,7 @@
 
     sget-object v0, Lf/a/o/g/r;->d:Lf/a/o/g/r;
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -365,7 +365,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v1
 
@@ -375,7 +375,7 @@
 
     sget-object v1, Lf/a/o/g/j;->d:Lf/a/o/g/j;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -383,11 +383,11 @@
 
     invoke-direct {v1, p0, p1}, Lf/a/o/g/k;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
index 9fea782933..b57b52e76b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
@@ -47,7 +47,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09db
+    const v0, 0x7f0a09df
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -59,7 +59,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09e1
+    const v0, 0x7f0a09e5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -71,7 +71,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09e0
+    const v0, 0x7f0a09e4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -83,7 +83,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09df
+    const v0, 0x7f0a09e3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -95,7 +95,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09dc
+    const v0, 0x7f0a09e0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -196,7 +196,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a09de
+    const v2, 0x7f0a09e2
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -204,7 +204,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a09dd
+    const v3, 0x7f0a09e1
 
     invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
index d40caa84c3..31ea6734f5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
@@ -118,7 +118,7 @@
 
     const v0, 0x7f0402f4
 
-    const v1, 0x7f120f97
+    const v1, 0x7f120fc1
 
     invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends.smali
index 326c270150..fd2976700a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualFriends.smali
@@ -62,7 +62,7 @@
 
     const-class p1, Lcom/discord/widgets/user/WidgetUserMutualFriends;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -92,9 +92,9 @@
 
     aput-object v3, v2, v4
 
-    const v3, 0x7f100107
+    const v3, 0x7f100109
 
-    const v4, 0x7f120f48
+    const v4, 0x7f120f72
 
     invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -140,7 +140,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a09d0
+    const v0, 0x7f0a09d4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -180,7 +180,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -194,7 +194,7 @@
 
     const-class v2, Lcom/discord/widgets/user/WidgetUserMutualFriends;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali
index 0f0dbc3e55..39c0e855ab 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder.smali
@@ -45,7 +45,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09e2
+    const v0, 0x7f0a09e6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -57,7 +57,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09e5
+    const v0, 0x7f0a09e9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -69,7 +69,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09e3
+    const v0, 0x7f0a09e7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -81,7 +81,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a09e4
+    const v0, 0x7f0a09e8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
index e56e4597c2..ea1806c39d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
@@ -118,7 +118,7 @@
 
     const v0, 0x7f0402f5
 
-    const v1, 0x7f120f98
+    const v1, 0x7f120fc2
 
     invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
index b3d3b83e52..8747c4818f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds$Model.smali
@@ -226,7 +226,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object p1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {p0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds.smali
index a501828b7f..59a8420b50 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserMutualGuilds.smali
@@ -58,7 +58,7 @@
 
     const-class p1, Lcom/discord/widgets/user/WidgetUserMutualGuilds;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -88,9 +88,9 @@
 
     aput-object v3, v2, v4
 
-    const v3, 0x7f100108
+    const v3, 0x7f10010a
 
-    const v4, 0x7f120f49
+    const v4, 0x7f120f73
 
     invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -126,7 +126,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lf/a/b/k;->d(Landroid/content/Context;)V
+    invoke-static {v0}, Lf/a/b/m;->d(Landroid/content/Context;)V
 
     return-void
 .end method
@@ -148,7 +148,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a09d1
+    const v0, 0x7f0a09d5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -192,7 +192,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -206,7 +206,7 @@
 
     const-class v2, Lcom/discord/widgets/user/WidgetUserMutualGuilds;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$Companion.smali
index 55a07179c1..a61ddb4c8c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$Companion.smali
@@ -36,22 +36,17 @@
 .method public final launch(Landroid/content/Context;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-class v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v1, v0, v2}, Lf/a/b/k;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->f(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3.smali
index da6a9bbef5..5d1cac3646 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSetCustomStatus.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3;->this$0:Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;->setStatusText(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$1.smali
index 9c333c6450..631a95b904 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserSetCustomStatus.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatus;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "updateView"
+
+    const-string v5, "updateView(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->access$updateView(Lcom/discord/widgets/user/WidgetUserSetCustomStatus;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$2.smali
index ff96852080..4950b472d4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserSetCustomStatus.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatus;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->access$handleEvent(Lcom/discord/widgets/user/WidgetUserSetCustomStatus;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$openEmojiPicker$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$openEmojiPicker$1.smali
index c1a1c096ad..8f46c28994 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$openEmojiPicker$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus$openEmojiPicker$1.smali
@@ -42,7 +42,9 @@
 .method public onEmojiPicked(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$openEmojiPicker$1;->this$0:Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
@@ -53,13 +55,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;->setStatusEmoji(Lcom/discord/models/domain/emoji/Emoji;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
index 1839189f80..1da9cd0636 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
@@ -51,181 +51,127 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "statusEmojiButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusEmojiButton()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "statusEmojiButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getStatusEmojiButton()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const/4 v2, 0x0
+    const-string v2, "statusEmoji"
 
-    aput-object v1, v0, v2
+    const-string v3, "getStatusEmoji()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "statusEmoji"
-
-    const-string v4, "getStatusEmoji()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "statusText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusText()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusText"
-
-    const-string v4, "getStatusText()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "expirationRadioNever"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExpirationRadioNever()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "expirationRadioNever"
-
-    const-string v4, "getExpirationRadioNever()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "expirationRadio30Minutes"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExpirationRadio30Minutes()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "expirationRadio30Minutes"
-
-    const-string v4, "getExpirationRadio30Minutes()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "expirationRadio1Hour"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExpirationRadio1Hour()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "expirationRadio1Hour"
-
-    const-string v4, "getExpirationRadio1Hour()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "expirationRadio4Hours"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExpirationRadio4Hours()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "expirationRadio4Hours"
-
-    const-string v4, "getExpirationRadio4Hours()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "expirationRadioTomorrow"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getExpirationRadioTomorrow()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "expirationRadioTomorrow"
-
-    const-string v4, "getExpirationRadioTomorrow()Lcom/google/android/material/radiobutton/MaterialRadioButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;
+    const-string v2, "save"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "save"
-
-    const-string v4, "getSave()Lcom/google/android/material/floatingactionbutton/FloatingActionButton;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
@@ -249,7 +195,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0849
+    const v0, 0x7f0a084f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +203,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->statusEmojiButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0848
+    const v0, 0x7f0a084e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -265,7 +211,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->statusEmoji$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0851
+    const v0, 0x7f0a0857
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -273,7 +219,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->statusText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a084e
+    const v0, 0x7f0a0854
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -281,7 +227,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->expirationRadioNever$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a084c
+    const v0, 0x7f0a0852
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -289,7 +235,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->expirationRadio30Minutes$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a084b
+    const v0, 0x7f0a0851
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -297,7 +243,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->expirationRadio1Hour$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a084d
+    const v0, 0x7f0a0853
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -305,7 +251,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->expirationRadio4Hours$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a084f
+    const v0, 0x7f0a0855
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -313,7 +259,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->expirationRadioTomorrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0850
+    const v0, 0x7f0a0856
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -336,7 +282,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -572,7 +518,7 @@
 
     move-result p1
 
-    invoke-static {p0, p1, v2, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v2, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     const/4 p1, 0x1
 
@@ -601,7 +547,7 @@
 
     move-result p1
 
-    invoke-static {p0, p1, v2, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v2, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     :cond_1
     :goto_0
@@ -617,7 +563,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$openEmojiPicker$1;
 
@@ -706,7 +652,7 @@
 
     iget-object v6, v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->currentEmojiUri:Ljava/lang/String;
 
-    invoke-static {v3, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -747,7 +693,7 @@
 
     move-result-object v3
 
-    const v6, 0x7f0803d7
+    const v6, 0x7f0803da
 
     invoke-virtual {v3, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
 
@@ -767,7 +713,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v6, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v6
 
@@ -921,7 +867,7 @@
     :cond_b
     const-string v1, "expirationRadioManager"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 .end method
@@ -957,7 +903,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026tusViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;
 
@@ -984,25 +930,27 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
     const/4 p1, 0x0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    invoke-static {p0, p1, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v1, 0x0
 
-    const v0, 0x7f120525
+    invoke-static {p0, p1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+    const v1, 0x7f120527
 
-    new-instance v0, Lcom/discord/views/RadioManager;
+    invoke-virtual {p0, v1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
+
+    new-instance v1, Lcom/discord/views/RadioManager;
 
     const/4 v2, 0x5
 
@@ -1018,23 +966,23 @@
 
     move-result-object v3
 
-    aput-object v3, v2, v1
-
-    const/4 v3, 0x2
+    aput-object v3, v2, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getExpirationRadio1Hour()Lcom/google/android/material/radiobutton/MaterialRadioButton;
 
-    move-result-object v4
+    move-result-object v3
 
-    aput-object v4, v2, v3
+    const/4 v4, 0x2
 
-    const/4 v3, 0x3
+    aput-object v3, v2, v4
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getExpirationRadio4Hours()Lcom/google/android/material/radiobutton/MaterialRadioButton;
 
-    move-result-object v4
+    move-result-object v3
 
-    aput-object v4, v2, v3
+    const/4 v4, 0x3
+
+    aput-object v3, v2, v4
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getExpirationRadioTomorrow()Lcom/google/android/material/radiobutton/MaterialRadioButton;
 
@@ -1048,55 +996,55 @@
 
     move-result-object v2
 
-    invoke-direct {v0, v2}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
+    invoke-direct {v1, v2}, Lcom/discord/views/RadioManager;-><init>(Ljava/util/List;)V
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->expirationRadioManager:Lcom/discord/views/RadioManager;
+    iput-object v1, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->expirationRadioManager:Lcom/discord/views/RadioManager;
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getStatusEmojiButton()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v1
 
     new-instance v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$1;
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$1;-><init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatus;)V
 
-    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getStatusText()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v0
+    move-result-object v1
 
     new-instance v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$2;
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$2;-><init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatus;)V
 
-    invoke-virtual {v0, v2}, Lcom/google/android/material/textfield/TextInputLayout;->setEndIconOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Lcom/google/android/material/textfield/TextInputLayout;->setEndIconOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getStatusText()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v0
+    move-result-object v1
 
     new-instance v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3;
 
     invoke-direct {v2, p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus$onViewBound$3;-><init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatus;)V
 
-    invoke-static {v0, p0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
+    invoke-static {v1, p0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->addBindedTextWatcher(Lcom/google/android/material/textfield/TextInputLayout;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getExpirationRadioNever()Lcom/google/android/material/radiobutton/MaterialRadioButton;
 
-    move-result-object v0
+    move-result-object v1
 
     sget-object v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;->NEVER:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;
 
-    invoke-direct {p0, v0, v2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->setExpirationOnCheck(Lcom/google/android/material/radiobutton/MaterialRadioButton;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)V
+    invoke-direct {p0, v1, v2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->setExpirationOnCheck(Lcom/google/android/material/radiobutton/MaterialRadioButton;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v0
+    move-result-object v1
 
     const-string v2, "resources"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1104,63 +1052,63 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f10002c
+    new-array v6, v0, [Ljava/lang/Object;
 
-    new-array v7, v1, [Ljava/lang/Object;
+    const/16 v7, 0x1e
 
-    const/16 v8, 0x1e
+    invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    move-result-object v8
 
-    move-result-object v9
+    aput-object v8, v6, p1
 
-    aput-object v9, v7, p1
+    const v8, 0x7f10002c
 
-    invoke-static {v0, v3, v6, v8, v7}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1, v3, v8, v7, v6}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getExpirationRadio30Minutes()Lcom/google/android/material/radiobutton/MaterialRadioButton;
 
     move-result-object v3
 
-    const v6, 0x7f120529
+    new-array v6, v0, [Ljava/lang/Object;
 
-    new-array v7, v1, [Ljava/lang/Object;
+    aput-object v1, v6, p1
 
-    aput-object v0, v7, p1
+    const v1, 0x7f12052b
 
-    invoke-virtual {p0, v6, v7}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v6}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-virtual {v3, v0}, Landroid/widget/RadioButton;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v3, v1}, Landroid/widget/RadioButton;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getExpirationRadio30Minutes()Lcom/google/android/material/radiobutton/MaterialRadioButton;
 
-    move-result-object v0
+    move-result-object v1
 
     sget-object v3, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;->IN_30_MINUTES:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;
 
-    invoke-direct {p0, v0, v3}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->setExpirationOnCheck(Lcom/google/android/material/radiobutton/MaterialRadioButton;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)V
+    invoke-direct {p0, v1, v3}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->setExpirationOnCheck(Lcom/google/android/material/radiobutton/MaterialRadioButton;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v0
+    move-result-object v1
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v3
 
-    invoke-static {v3, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v6, v1, [Ljava/lang/Object;
+    new-array v6, v0, [Ljava/lang/Object;
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v7
 
@@ -1168,21 +1116,21 @@
 
     const v7, 0x7f10002b
 
-    invoke-static {v0, v3, v7, v1, v6}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v1, v3, v7, v0, v6}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;Landroid/content/Context;II[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatus;->getExpirationRadio1Hour()Lcom/google/android/material/radiobutton/MaterialRadioButton;
 
     move-result-object v3
 
-    new-array v6, v1, [Ljava/lang/Object;
+    new-array v6, v0, [Ljava/lang/Object;
 
-    aput-object v0, v6, p1
+    aput-object v1, v6, p1
 
-    const v0, 0x7f120528
+    const v1, 0x7f12052a
 
-    invoke-virtual {p0, v0, v6}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v6}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v6
 
@@ -1200,15 +1148,15 @@
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
     move-result-object v2
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v5, v1, [Ljava/lang/Object;
+    new-array v5, v0, [Ljava/lang/Object;
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1224,11 +1172,11 @@
 
     move-result-object v3
 
-    new-array v1, v1, [Ljava/lang/Object;
+    new-array v0, v0, [Ljava/lang/Object;
 
-    aput-object v2, v1, p1
+    aput-object v2, v0, p1
 
-    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -1261,13 +1209,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1283,7 +1224,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -1346,12 +1287,12 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1.smali
index 45e17a394c..9f2c504bdb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSetCustomStatusViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1;->this$0:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;->access$handleStoreState(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory$observeStoreState$1.smali
index 78e542af57..6fa40879a0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory$observeStoreState$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelCustomStatusSetting;",
+        "Lcom/discord/models/domain/emoji/EmojiSet;",
+        "Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -66,11 +69,11 @@
 
     const-string v1, "customStatusSetting"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "emojiSet"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelCustomStatusSetting;Lcom/discord/models/domain/emoji/EmojiSet;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory.smali
index eed61183cf..d10d927bcb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Factory.smali
@@ -74,7 +74,7 @@
 
     const-string p2, "Observable.combineLatest\u2026        )\n      }.take(1)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -93,7 +93,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;
 
@@ -126,13 +128,4 @@
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;-><init>(Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/time/Clock;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState.smali
index 284c2d1718..99b41c74d9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState.smali
@@ -32,11 +32,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "text"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "expiration"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,20 +49,6 @@
     iput-object p3, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;->expiration:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;
 
     return-void
-
-    :cond_0
-    const-string p1, "expiration"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;
@@ -123,31 +111,19 @@
 .method public final copy(Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "text"
 
-    if-eqz p2, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "expiration"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;-><init>(Lcom/discord/models/domain/emoji/Emoji;Ljava/lang/String;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "expiration"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -165,7 +141,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;->emoji:Lcom/discord/models/domain/emoji/Emoji;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -175,7 +151,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;->text:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -185,7 +161,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;->expiration:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState.smali
index f9c7217a52..32605420d9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState.smali
@@ -24,11 +24,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelCustomStatusSetting;Lcom/discord/models/domain/emoji/EmojiSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "customStatusSetting"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "emojiSet"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,20 +39,6 @@
     iput-object p2, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;->emojiSet:Lcom/discord/models/domain/emoji/EmojiSet;
 
     return-void
-
-    :cond_0
-    const-string p1, "emojiSet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "customStatusSetting"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;Lcom/discord/models/domain/ModelCustomStatusSetting;Lcom/discord/models/domain/emoji/EmojiSet;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;
@@ -98,31 +86,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelCustomStatusSetting;Lcom/discord/models/domain/emoji/EmojiSet;)Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "customStatusSetting"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "emojiSet"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelCustomStatusSetting;Lcom/discord/models/domain/emoji/EmojiSet;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "emojiSet"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "customStatusSetting"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -140,7 +116,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;->customStatusSetting:Lcom/discord/models/domain/ModelCustomStatusSetting;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -150,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;->emojiSet:Lcom/discord/models/domain/emoji/EmojiSet;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded.smali
index f4e50779ff..2af0de9330 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "formState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;->formState:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;
 
     return-void
-
-    :cond_0
-    const-string p1, "formState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;)Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "formState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "formState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;->formState:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$1.smali
index e3c0ee1265..31509fadc6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSetCustomStatusViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserSettings;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$2.smali
index ad89697994..b1be09bdd4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSetCustomStatusViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$saveStatus$2;->this$0:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;
 
     invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;->access$emitSetStatusFailureEvent(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali
index 5ae4b9ec1c..bb998d67c8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetUserSetCustomStatusViewModel.kt"
 
 
@@ -17,7 +17,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState;",
         ">;"
     }
@@ -66,7 +66,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/time/Clock;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -78,17 +78,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeUserSettings"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "clock"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Uninitialized;
+    const-string v0, "storeObservable"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;->storeUserSettings:Lcom/discord/stores/StoreUserSettings;
 
@@ -98,13 +102,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;
+
+    new-instance v6, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1;-><init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -112,17 +124,11 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$1;-><init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, 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
 
     invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
 
@@ -131,27 +137,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUserSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$emitSetStatusFailureEvent(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel;)V
@@ -193,7 +178,7 @@
 
     new-instance v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusFailure;
 
-    const v2, 0x7f120560
+    const v2, 0x7f120562
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusFailure;-><init>(I)V
 
@@ -211,7 +196,7 @@
 
     new-instance v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusSuccess;
 
-    const v2, 0x7f120533
+    const v2, 0x7f120535
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusSuccess;-><init>(I)V
 
@@ -421,7 +406,7 @@
 .method private final handleStoreState(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$StoreState;)V
     .locals 3
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -470,7 +455,7 @@
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -478,7 +463,7 @@
 .method private final updateFormState(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState;)V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -497,7 +482,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -508,7 +493,7 @@
 .method public final clearStatusTextAndEmoji()V
     .locals 7
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -578,7 +563,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -588,7 +573,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -615,7 +600,7 @@
 
     if-eqz v2, :cond_c
 
-    invoke-static {v2}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v2}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object v2
 
@@ -761,7 +746,7 @@
 
     const-string v4, "storeUserSettings\n      \u2026dateCustomStatus(setting)"
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, v6, v5, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
@@ -825,11 +810,11 @@
     return-void
 
     :cond_c
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type kotlin.CharSequence"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 
@@ -840,24 +825,21 @@
 .method public final setExpiration(Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$FormState$Expiration;)V
     .locals 7
 
+    const-string v0, "expiration"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_1
@@ -884,36 +866,26 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "expiration"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setStatusEmoji(Lcom/discord/models/domain/emoji/Emoji;)V
     .locals 7
 
+    const-string v0, "emoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_1
@@ -940,36 +912,26 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "emoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final setStatusText(Ljava/lang/String;)V
     .locals 7
 
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$ViewState$Loaded;
 
     if-eqz v0, :cond_1
@@ -996,11 +958,4 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali
index 86333fb6aa..092811c7b0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/Fragment;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
@@ -48,20 +50,11 @@
 
     const-string v1, "fragment.parentFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "javaClass"
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onResume$1.smali
index 73f878e633..7ee37bb91e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/WidgetUserStatusSheet$onResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserStatusSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/WidgetUserStatusSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "updateView"
+
+    const-string v5, "updateView(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/WidgetUserStatusSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateView(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->access$updateView(Lcom/discord/widgets/user/WidgetUserStatusSheet;Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$5.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$5.smali
index 33572747e0..b0eb12be97 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$5.smali
@@ -41,7 +41,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -49,7 +49,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->access$openCustomStatusAndDismiss(Lcom/discord/widgets/user/WidgetUserStatusSheet;Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$6.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$6.smali
index 034506ddf3..7223b93e0c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserStatusSheet$onViewCreated$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserStatusSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali
index a98abfb156..7e66bf575b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali
@@ -39,101 +39,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserStatusSheet;
+    const-string v2, "online"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getOnline()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "online"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getOnline()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "idle"
 
-    aput-object v1, v0, v2
+    const-string v3, "getIdle()Landroid/view/ViewGroup;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserStatusSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "idle"
-
-    const-string v4, "getIdle()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserStatusSheet;
+    const-string v2, "dnd"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDnd()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dnd"
-
-    const-string v4, "getDnd()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserStatusSheet;
+    const-string v2, "invisible"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInvisible()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "invisible"
-
-    const-string v4, "getInvisible()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/WidgetUserStatusSheet;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserStatusSheet;
+    const-string v2, "custom"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCustom()Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "custom"
-
-    const-string v4, "getCustom()Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -157,7 +127,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0a27
+    const v0, 0x7f0a0a2b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -165,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->online$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a25
+    const v0, 0x7f0a0a29
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -173,7 +143,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->idle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a24
+    const v0, 0x7f0a0a28
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -181,7 +151,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->dnd$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a26
+    const v0, 0x7f0a0a2a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +159,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheet;->invisible$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a23
+    const v0, 0x7f0a0a27
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -248,7 +218,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -410,7 +380,7 @@
         .end annotation
     .end param
 
-    const v0, 0x7f0a0a20
+    const v0, 0x7f0a0a24
 
     invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -420,7 +390,7 @@
 
     invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    const p2, 0x7f0a0a22
+    const p2, 0x7f0a0a26
 
     invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
 
@@ -430,7 +400,7 @@
 
     invoke-virtual {p2, p3}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f0a0a21
+    const p2, 0x7f0a0a25
 
     if-eqz p4, :cond_0
 
@@ -455,7 +425,7 @@
 
     const-string p2, "findViewById<View>(R.id.\u2026status_presence_subtitle)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 p2, 0x8
 
@@ -498,7 +468,7 @@
     :cond_0
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -557,7 +527,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -590,7 +560,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -600,7 +570,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -620,7 +592,7 @@
 
     const-string p2, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;
 
@@ -630,9 +602,9 @@
 
     move-result-object v1
 
-    const v2, 0x7f0803e5
+    const v2, 0x7f0803e8
 
-    const v3, 0x7f1214de
+    const v3, 0x7f121508
 
     const/4 v4, 0x0
 
@@ -658,9 +630,9 @@
 
     move-result-object v1
 
-    const v2, 0x7f0803e3
+    const v2, 0x7f0803e6
 
-    const v3, 0x7f1214da
+    const v3, 0x7f121504
 
     invoke-static/range {v0 .. v6}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout$default(Lcom/discord/widgets/user/WidgetUserStatusSheet;Landroid/view/ViewGroup;IILjava/lang/Integer;ILjava/lang/Object;)V
 
@@ -678,17 +650,17 @@
 
     move-result-object p1
 
-    const p2, 0x7f0803e2
+    const p2, 0x7f121503
 
-    const v0, 0x7f1214d8
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const v1, 0x7f1214d9
+    move-result-object p2
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v0, 0x7f0803e5
 
-    move-result-object v1
+    const v1, 0x7f121502
 
-    invoke-direct {p0, p1, p2, v0, v1}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
+    invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->getDnd()Landroid/view/ViewGroup;
 
@@ -704,17 +676,17 @@
 
     move-result-object p1
 
-    const p2, 0x7f0803e4
+    const p2, 0x7f121506
 
-    const v0, 0x7f1214db
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const v1, 0x7f1214dc
+    move-result-object p2
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v0, 0x7f0803e7
 
-    move-result-object v1
+    const v1, 0x7f121505
 
-    invoke-direct {p0, p1, p2, v0, v1}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
+    invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->getInvisible()Landroid/view/ViewGroup;
 
@@ -747,13 +719,4 @@
     invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;->setOnClear(Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$1.smali
index eb65693e05..cbfbab5b74 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserStatusSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$1;->this$0:Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;->access$handleStoreState(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory$observeStoreState$1.smali
index 51a2e152d5..5203c19fcd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetUserStatusSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelPresence;",
+        "Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory.smali
index 6b57b90e53..8b66de8cd1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory.smali
@@ -45,13 +45,13 @@
 
     sget-object v0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "storePresences\n         \u2026          )\n            }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -70,7 +70,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;
 
@@ -99,13 +101,4 @@
     invoke-direct {p1, v0, v1, v2}, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;-><init>(Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState.smali
index 1078576c7e..7579f6acd1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState.smali
@@ -81,7 +81,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState;->customStatusActivity:Lcom/discord/models/domain/activity/ModelActivity;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded.smali
index 959f85ae63..152213ac53 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "customStatusViewState"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;->customStatusViewState:Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;
 
     return-void
-
-    :cond_0
-    const-string p1, "customStatusViewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;)Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "customStatusViewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "customStatusViewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;->customStatusViewState:Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$clearCustomStatus$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$clearCustomStatus$1.smali
index 9b3f1064bb..37feb99448 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$clearCustomStatus$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$clearCustomStatus$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$clearCustomStatus$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserStatusSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserSettings;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1.smali
index 10a5a83453..81f34c0723 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserStatusSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUserSettings;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUserSettings;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel.smali
index f128be9522..a60fd7ccff 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetUserStatusSheetViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState;",
         ">;"
     }
@@ -160,7 +160,7 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreUserSettings;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -172,17 +172,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeUserSettings"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "restAPI"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Uninitialized;
+    const-string v0, "storeObservable"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;->storeUserSettings:Lcom/discord/stores/StoreUserSettings;
 
@@ -192,13 +196,21 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;
+
+    new-instance v6, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$1;-><init>(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -206,40 +218,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$1;-><init>(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "storeUserSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState;)V
@@ -265,9 +250,9 @@
 
     sget-object v1, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;->CUSTOM_EMOJI_PLACEHOLDER_EMOJIS:[Ljava/lang/String;
 
-    sget-object v2, Lj0/p/c;->b:Lj0/p/c$a;
+    sget-object v2, Lk0/q/c;->b:Lk0/q/c$a;
 
-    invoke-static {v1, v2}, Lf/n/a/k/a;->random([Ljava/lang/Object;Lj0/p/c;)Ljava/lang/Object;
+    invoke-static {v1, v2}, Lf/n/a/k/a;->random([Ljava/lang/Object;Lk0/q/c;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -286,9 +271,15 @@
 
     move-result-object v0
 
-    sget-object v1, Lj0/p/c;->b:Lj0/p/c$a;
+    sget-object v1, Lk0/q/c;->b:Lk0/q/c$a;
 
-    if-eqz v0, :cond_2
+    const-string v2, "$this$random"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "random"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
 
@@ -300,11 +291,11 @@
 
     move-result v2
 
-    invoke-virtual {v1, v2}, Lj0/p/c;->nextInt(I)I
+    invoke-virtual {v1, v2}, Lk0/q/c;->nextInt(I)I
 
     move-result v1
 
-    invoke-static {v0, v1}, Lj0/i/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lk0/j/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -323,15 +314,6 @@
     invoke-direct {v0, v1}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_2
-    const-string v0, "$this$random"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method private final handleStoreState(Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$StoreState;)V
@@ -382,7 +364,7 @@
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;)V
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -446,7 +428,7 @@
 
     const-string v2, "storeUserSettings\n      \u2026(/* customStatus */ null)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
@@ -496,32 +478,36 @@
 .method public final setStatus(Lcom/discord/models/domain/ModelPresence$Status;)V
     .locals 12
 
+    const-string v0, "status"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+    sget-object v1, Lcom/discord/restapi/RestAPIParams$UserSettings;->Companion:Lcom/discord/restapi/RestAPIParams$UserSettings$Companion;
+
+    invoke-virtual {v1, p1}, Lcom/discord/restapi/RestAPIParams$UserSettings$Companion;->createWithStatus(Lcom/discord/models/domain/ModelPresence$Status;)Lcom/discord/restapi/RestAPIParams$UserSettings;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/rest/RestAPI;->updateUserSettings(Lcom/discord/restapi/RestAPIParams$UserSettings;)Lrx/Observable;
+
+    move-result-object p1
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_0
+    const/4 v1, 0x1
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    const/4 v2, 0x0
 
-    sget-object v2, Lcom/discord/restapi/RestAPIParams$UserSettings;->Companion:Lcom/discord/restapi/RestAPIParams$UserSettings$Companion;
-
-    invoke-virtual {v2, p1}, Lcom/discord/restapi/RestAPIParams$UserSettings$Companion;->createWithStatus(Lcom/discord/models/domain/ModelPresence$Status;)Lcom/discord/restapi/RestAPIParams$UserSettings;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Lcom/discord/utilities/rest/RestAPI;->updateUserSettings(Lcom/discord/restapi/RestAPIParams$UserSettings;)Lrx/Observable;
-
-    move-result-object p1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v3
 
     const-class v4, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel;
 
+    sget-object v9, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1;
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
@@ -530,8 +516,6 @@
 
     const/4 v8, 0x0
 
-    sget-object v9, Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserStatusSheetViewModel$setStatus$1;
-
     const/16 v10, 0x1e
 
     const/4 v11, 0x0
@@ -539,11 +523,4 @@
     invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "status"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
index f8ce12610b..57f30e8305 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
@@ -27,7 +27,7 @@
 .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 1
 
-    const v0, 0x7f12176f
+    const v0, 0x7f121799
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -67,7 +67,7 @@
 
     const-string v2, "StoreStream.getUserSettings().locale"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
 
@@ -75,7 +75,7 @@
 
     const-string v2, "(this as java.lang.String).toLowerCase()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -132,7 +132,7 @@
     move-object v0, v1
 
     :cond_0
-    const v1, 0x7f121777
+    const v1, 0x7f1217a1
 
     const/4 v2, 0x1
 
@@ -213,7 +213,7 @@
 
     const-class v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerify;
 
-    invoke-static {p0, v0, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, v0, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali
index 9e54b73bd6..194d939ad0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion.smali
@@ -36,7 +36,9 @@
 .method public final getLaunchIntent(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;ZZZ)Landroid/content/Intent;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "mode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -63,13 +65,4 @@
     invoke-virtual {v0, p2, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;I)Landroid/content/Intent;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali
index 6631f2852e..4f13386e53 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/models/domain/ModelUser$RequiredAction;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -49,25 +52,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/models/domain/ModelUser$RequiredAction;
-
-    check-cast p2, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1;->call(Lcom/discord/models/domain/ModelUser$RequiredAction;Lcom/discord/models/domain/ModelUser;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelUser$RequiredAction;Lcom/discord/models/domain/ModelUser;)Z
+.method public final call(Lcom/discord/models/domain/ModelUser$RequiredAction;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
     .locals 5
 
     iget-object v0, p0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1;->this$0:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
@@ -84,7 +69,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getPhone()Ljava/lang/String;
 
@@ -108,7 +93,7 @@
 
     if-eqz v4, :cond_1
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
 
@@ -126,11 +111,29 @@
 
     const-string v2, "requiredAction"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, v0, v1, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->access$computeShouldDismiss(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;ZZLcom/discord/models/domain/ModelUser$RequiredAction;)Z
 
     move-result p1
 
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelUser$RequiredAction;
+
+    check-cast p2, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$getShouldDismissObservable$1;->call(Lcom/discord/models/domain/ModelUser$RequiredAction;Lcom/discord/models/domain/ModelUser;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali
index c35863b080..03f829571c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserAccountVerifyBase.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleIsAuthorized"
+
+    const-string v5, "handleIsAuthorized(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleIsAuthorized"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleIsAuthorized(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali
index 7e604a08f4..c74e8aff98 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.smali
@@ -64,13 +64,13 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const p2, 0x7f0a05d3
+    const p2, 0x7f0a05d9
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
index 965a8db6c4..946b8b1044 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
@@ -142,7 +142,7 @@
     goto :goto_0
 
     :cond_5
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
@@ -151,7 +151,7 @@
     return v4
 
     :cond_7
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -209,7 +209,7 @@
 
     const-string v1, "Observable\n        .comb\u2026requiredAction)\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
 
@@ -221,7 +221,7 @@
 
     const-string v1, "Observable\n        .comb\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -237,7 +237,7 @@
 
     const-string v1, "context ?: return"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p1, :cond_0
 
@@ -247,7 +247,7 @@
 
     const/4 v2, 0x6
 
-    invoke-static {v0, p1, v1, v2}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {v0, p1, v1, v2}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     :cond_0
     return-void
@@ -293,7 +293,7 @@
     :cond_1
     const-string v0, "mode"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -314,7 +314,7 @@
     :cond_0
     const-string v0, "mode"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -361,7 +361,7 @@
     :cond_1
     const-string v0, "mode"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -389,7 +389,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 6
 
-    if-eqz p1, :cond_3
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -439,11 +441,11 @@
 
     move-result-object p1
 
-    const/4 v0, -0x1
+    const-string v0, "INTENT_MODE"
 
-    const-string v1, "INTENT_MODE"
+    const/4 v1, -0x1
 
-    invoke-virtual {p1, v1, v0}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
+    invoke-virtual {p1, v0, v1}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
 
     move-result p1
 
@@ -514,15 +516,6 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -584,22 +577,15 @@
 .end method
 
 .method public final setMode(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->mode:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setPhoneAllowed(Z)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/calls/PrivateCallLauncher.smali b/com.discord/smali_classes2/com/discord/widgets/user/calls/PrivateCallLauncher.smali
index 7da21666db..7454bce57e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/calls/PrivateCallLauncher.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/calls/PrivateCallLauncher.smali
@@ -17,15 +17,21 @@
 .method public constructor <init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "appPermissionsRequests"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "appComponent"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,34 +44,6 @@
     iput-object p4, p0, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->fragmentManager:Landroidx/fragment/app/FragmentManager;
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "appPermissionsRequests"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali
index 7a5a9576eb..f4408033ae 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$Companion.smali
@@ -36,19 +36,21 @@
 .method public final launch(Landroid/content/Context;Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->Companion:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    invoke-virtual {v0, p2, v2, v2, v1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;->getLaunchIntent(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;ZZZ)Landroid/content/Intent;
+    invoke-virtual {v0, p2, v1, v1, v2}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;->getLaunchIntent(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;ZZZ)Landroid/content/Intent;
 
     move-result-object p2
 
@@ -60,21 +62,7 @@
 
     const-class v0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 
-    invoke-static {p1, v0, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali
index af2f0e5322..fc31e636f3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/lang/String;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/lang/Void;",
+        ">;>;"
     }
 .end annotation
 
@@ -79,6 +81,7 @@
             "Ljava/lang/String;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/lang/Void;",
             ">;"
         }
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali
index 90a4bfb8a7..c82bcc220a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,46 +61,48 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;
+    iget-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;
 
-    iget-object v1, v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
+    iget-object v0, v0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 
-    invoke-static {v1}, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->access$getDimmerView$p(Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;)Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-static {v0}, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->access$getDimmerView$p(Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;)Lcom/discord/utilities/dimmer/DimmerView;
 
-    move-result-object v1
+    move-result-object v0
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
     const/4 v3, 0x0
 
-    invoke-static {v1, v3, v3, v2, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
+    invoke-static {v0, v1, v1, v2, v3}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getThrowable()Ljava/lang/Throwable;
 
     move-result-object p1
 
-    instance-of v1, p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
+    instance-of v0, p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    move-object p1, v0
+    move-object p1, v3
 
     :cond_0
     check-cast p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;
+    iget-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$2;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;
 
-    iget-object v1, v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
+    iget-object v0, v0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1;->this$0:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 
-    invoke-virtual {v1}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
+    invoke-virtual {v0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->getErrorStringId()I
 
@@ -108,15 +110,8 @@
 
     const/16 v2, 0xc
 
-    invoke-static {v1, p1, v3, v0, v2}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v3, v2}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali
index 1c495f0eae..29c91574f4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserCaptchaVerify.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     const/4 v2, 0x6
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/k;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/m;->c(Landroid/content/Context;ZLandroid/content/Intent;I)V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali
index f099a0540e..13b1dec252 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1.smali
@@ -71,13 +71,13 @@
 
     sget-object v0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1;->INSTANCE:Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify$onViewBound$1$1;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->x(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->x(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string v0, "CaptchaHelper\n          \u2026SubscribeOn()\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
index a8b45767ba..adca619961 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/captcha/WidgetUserCaptchaVerify.smali
@@ -35,81 +35,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 
-    const-class v2, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
+    const-string v2, "verifyButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVerifyButton()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "verifyButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getVerifyButton()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 
-    const/4 v2, 0x0
+    const-string v2, "cancelButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCancelButton()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "cancelButton"
-
-    const-string v4, "getCancelButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 
-    const-class v2, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
+    const-string v2, "help"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHelp()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "help"
-
-    const-string v4, "getHelp()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
 
-    const-class v2, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
+    const-string v2, "dimmerView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmerView()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmerView"
-
-    const-string v4, "getDimmerView()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -133,7 +109,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;-><init>()V
 
-    const v0, 0x7f0a09c4
+    const v0, 0x7f0a09c8
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,7 +117,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->verifyButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09c6
+    const v0, 0x7f0a09ca
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -149,7 +125,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->cancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09c3
+    const v0, 0x7f0a09c7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -157,7 +133,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;->help$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -281,7 +257,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->onViewBound(Landroid/view/View;)V
 
@@ -316,13 +294,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali
index 6cf3409019..426390b483 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$Companion.smali
@@ -36,39 +36,27 @@
 .method public final launch(Landroid/content/Context;Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "mode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->Companion:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    invoke-virtual {v0, p2, v2, v2, v1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;->getLaunchIntent(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;ZZZ)Landroid/content/Intent;
+    invoke-virtual {v0, p2, v1, v1, v2}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;->getLaunchIntent(Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;ZZZ)Landroid/content/Intent;
 
     move-result-object p2
 
     const-class v0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
-    invoke-static {p1, v0, p2}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, v0, p2}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali
index 7c35aea173..de7b08e855 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserEmailUpdate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Landroid/text/Editable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$1;->this$0:Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
     invoke-static {p1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->access$handleTextChanged(Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali
index 486b2bffd0..9a9b281977 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserEmailUpdate.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Landroid/text/Editable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$2;->this$0:Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
     invoke-static {p1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->access$handleTextChanged(Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali
index 43d35350f8..a49765446d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.smali
@@ -93,7 +93,7 @@
 
     const/4 v1, 0x2
 
-    invoke-static {v0, v3, v4, v1}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    invoke-static {v0, v3, v4, v1}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -103,7 +103,7 @@
 
     const-string v0, "RestAPI\n          .api\n \u2026rmers.withDimmer(dimmer))"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3;->this$0:Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
@@ -117,7 +117,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3;->this$0:Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
-    invoke-static {v0, v1}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v0, v1}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
index bbe7767a82..791a067f6d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
@@ -35,81 +35,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
-    const-class v2, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
+    const-string v2, "emailChangeEmailField"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmailChangeEmailField()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "emailChangeEmailField"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEmailChangeEmailField()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
-    const/4 v2, 0x0
+    const-string v2, "emailChangePasswordField"
 
-    aput-object v1, v0, v2
+    const-string v3, "getEmailChangePasswordField()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "emailChangePasswordField"
-
-    const-string v4, "getEmailChangePasswordField()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
-    const-class v2, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
+    const-string v2, "emailChangeButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmailChangeButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emailChangeButton"
-
-    const-string v4, "getEmailChangeButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
 
-    const-class v2, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -157,7 +133,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->emailChangeButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -413,7 +389,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->onViewBound(Landroid/view/View;)V
 
@@ -448,13 +426,4 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
index 5a3f4897f0..08c463a7ce 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify$Model.smali
@@ -102,11 +102,11 @@
 
     sget-object v1, Lf/a/o/g/u/a;->d:Lf/a/o/g/u/a;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lf/a/b/p;->d:Lf/a/b/p;
+    sget-object v1, Lf/a/b/r;->d:Lf/a/b/r;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
index 6cf9afd9ef..8e34851a6f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
@@ -108,7 +108,7 @@
 
     const-class v0, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;
 
-    invoke-static {p0, v0, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, v0, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -139,17 +139,17 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f121771
+    const p1, 0x7f12179b
 
     invoke-virtual {p0, p1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
-    invoke-static {p0, p1}, Lf/a/b/n;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
+    invoke-static {p0, p1}, Lf/a/b/p;->i(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;)V
 
     return-void
 .end method
@@ -187,7 +187,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -195,7 +195,7 @@
 
     move-result-object p2
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -207,7 +207,7 @@
 
     invoke-direct {v0, p0, p1}, Lf/a/o/g/u/c;-><init>(Lcom/discord/widgets/user/email/WidgetUserEmailVerify;Lcom/discord/widgets/user/email/WidgetUserEmailVerify$Model;)V
 
-    invoke-static {v0, p0}, Lf/a/b/q;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
+    invoke-static {v0, p0}, Lf/a/b/s;->o(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
 
     move-result-object p1
 
@@ -273,7 +273,7 @@
 
     move-result-object v0
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -287,7 +287,7 @@
 
     const-class v2, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;
 
-    invoke-static {v1, v2}, Lf/a/b/q;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lf/a/b/s;->g(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$Companion.smali
index c5bde47fa5..10d92299a1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$Companion.smali
@@ -62,7 +62,7 @@
 
     const/4 v3, 0x4
 
-    invoke-static {p1, v0, v1, v2, v3}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {p1, v0, v1, v2, v3}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v0
 
@@ -94,7 +94,7 @@
     move-result-object v0
 
     :cond_1
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -124,7 +124,7 @@
 
     const/4 v4, 0x4
 
-    invoke-static {p1, v1, v2, v3, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    invoke-static {p1, v1, v2, v3, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
 
     move-result-object v1
 
@@ -170,7 +170,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -196,11 +196,13 @@
 .method public final launch(Landroid/content/Context;Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "mode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->Companion:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Companion;
 
@@ -223,21 +225,7 @@
     :cond_0
     const-class p2, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
-    invoke-static {p1, p2, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p1, p2, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "mode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$1.smali
index 99a57c76bf..04ca32a562 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserPhoneAdd.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Landroid/text/Editable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$1;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
     invoke-static {p1}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->access$handleAreaCodeTextChanged(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$2.smali
index df4d21e66d..8f0f4a3ef3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserPhoneAdd.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .end method
 
 .method public final invoke(Landroid/text/Editable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$2;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
     invoke-static {p1}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->access$handlePhoneNumberTextChanged(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3.smali
index 02d53353c1..fd96c42172 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3.smali
@@ -37,69 +37,71 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "v"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v1
+    move-result-object v0
 
-    new-instance v2, Lcom/discord/restapi/RestAPIParams$Phone;
-
-    iget-object v3, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
-
-    invoke-static {v3}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->access$phoneNumberWithCountryCode(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-direct {v2, v3}, Lcom/discord/restapi/RestAPIParams$Phone;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v1, v2}, Lcom/discord/utilities/rest/RestAPI;->userAddPhone(Lcom/discord/restapi/RestAPIParams$Phone;)Lrx/Observable;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-static {v1, v2, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v1
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$Phone;
 
     iget-object v2, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
-    invoke-static {v2}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->access$getDimmer$p(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;)Lcom/discord/utilities/dimmer/DimmerView;
+    invoke-static {v2}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->access$phoneNumberWithCountryCode(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;)Ljava/lang/String;
 
     move-result-object v2
 
-    const-wide/16 v3, 0x0
+    invoke-direct {v1, v2}, Lcom/discord/restapi/RestAPIParams$Phone;-><init>(Ljava/lang/String;)V
 
-    const/4 v5, 0x2
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/rest/RestAPI;->userAddPhone(Lcom/discord/restapi/RestAPIParams$Phone;)Lrx/Observable;
 
-    invoke-static {v2, v3, v4, v5}, Lf/a/b/q;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
+    move-result-object v0
 
-    move-result-object v2
+    const/4 v1, 0x0
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
+
+    invoke-static {v1}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->access$getDimmer$p(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;)Lcom/discord/utilities/dimmer/DimmerView;
 
     move-result-object v1
 
-    const-string v2, "api\n          .userAddPh\u2026mpose(withDimmer(dimmer))"
+    const-wide/16 v4, 0x0
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 v2, 0x2
 
-    iget-object v2, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
-
-    invoke-static {v1, v2, v0, v5, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v1, v4, v5, v2}, Lf/a/b/s;->u(Lcom/discord/utilities/dimmer/DimmerView;JI)Lrx/Observable$c;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3$1;
+    invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3$1;-><init>(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;Landroid/view/View;)V
+    move-result-object v0
+
+    const-string v1, "api\n          .userAddPh\u2026mpose(withDimmer(dimmer))"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
+
+    invoke-static {v0, v1, v3, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3$1;
+
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3$1;-><init>(Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;Landroid/view/View;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd$onViewBound$3;->this$0:Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
@@ -107,20 +109,13 @@
 
     move-result-object p1
 
-    const/4 v3, 0x4
+    const/4 v2, 0x4
 
-    invoke-static {v2, p1, v0, v3}, Lf/a/b/q;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
+    invoke-static {v1, p1, v3, v2}, Lf/a/b/s;->p(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;I)Lrx/Observable$c;
 
     move-result-object p1
 
-    invoke-virtual {v1, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, p1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
     return-void
-
-    :cond_0
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
index 48473ee9fb..48b60a7572 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneAdd.smali
@@ -37,101 +37,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
-    const-class v2, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
+    const-string v2, "userPhoneAddDescriptionNote"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserPhoneAddDescriptionNote()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "userPhoneAddDescriptionNote"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUserPhoneAddDescriptionNote()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
-    const/4 v2, 0x0
+    const-string v2, "userPhoneAddCountryCode"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUserPhoneAddCountryCode()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "userPhoneAddCountryCode"
-
-    const-string v4, "getUserPhoneAddCountryCode()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
-    const-class v2, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
+    const-string v2, "userPhoneAddNumber"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserPhoneAddNumber()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userPhoneAddNumber"
-
-    const-string v4, "getUserPhoneAddNumber()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
-    const-class v2, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
+    const-string v2, "userPhoneNext"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserPhoneNext()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userPhoneNext"
-
-    const-string v4, "getUserPhoneNext()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
 
-    const-class v2, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;
+    const-string v2, "dimmer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dimmer"
-
-    const-string v4, "getDimmer()Lcom/discord/utilities/dimmer/DimmerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -155,7 +125,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;-><init>()V
 
-    const v0, 0x7f0a09d5
+    const v0, 0x7f0a09d9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +133,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneAddDescriptionNote$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09d3
+    const v0, 0x7f0a09d7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -171,7 +141,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneAddCountryCode$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09d7
+    const v0, 0x7f0a09db
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -179,7 +149,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneAddNumber$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09d6
+    const v0, 0x7f0a09da
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -187,7 +157,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->userPhoneNext$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -584,33 +554,35 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->onViewBound(Landroid/view/View;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->isForced()Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/lit8 v3, v1, 0x1
+    xor-int/lit8 v2, v0, 0x1
 
-    const v1, 0x7f040275
+    const v0, 0x7f040275
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
-    const/4 v4, 0x2
+    const/4 v3, 0x2
 
-    invoke-static {p1, v1, v2, v4, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    const/4 v4, 0x0
+
+    invoke-static {p1, v0, v1, v3, v4}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result p1
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v3
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->isForced()Z
 
@@ -618,30 +590,30 @@
 
     if-nez p1, :cond_0
 
-    const p1, 0x7f12043a
+    const p1, 0x7f12043b
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v0
+    move-result-object p1
+
+    move-object v4, p1
 
     :cond_0
-    move-object v5, v0
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v6, 0x8
 
-    const/16 v7, 0x8
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    move-object v1, p0
 
-    move-object v2, p0
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    invoke-static/range {v1 .. v7}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct {p0}, Lcom/discord/widgets/user/phone/WidgetUserPhoneAdd;->getUserPhoneAddDescriptionNote()Landroid/widget/TextView;
 
     move-result-object p1
 
-    const v0, 0x7f120646
+    const v0, 0x7f120648
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -649,9 +621,9 @@
 
     const-string v1, "getString(R.string.enter_phone_description_note)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v0}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v0
 
@@ -694,11 +666,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
index 58315680e6..5c6e7f3b91 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
@@ -35,7 +35,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lf/a/b/q;->e()Lrx/Observable$c;
+    invoke-static {}, Lf/a/b/s;->e()Lrx/Observable$c;
 
     move-result-object v0
 
@@ -45,7 +45,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->dimmerView:Lcom/discord/utilities/dimmer/DimmerView;
 
-    invoke-static {v0}, Lf/a/b/q;->t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
+    invoke-static {v0}, Lf/a/b/s;->t(Lcom/discord/utilities/dimmer/DimmerView;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -53,7 +53,7 @@
 
     move-result-object p1
 
-    invoke-static {p0}, Lf/a/b/q;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
+    invoke-static {p0}, Lf/a/b/s;->r(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -73,7 +73,7 @@
 
     invoke-direct {v2, p0}, Lf/a/o/g/v/a;-><init>(Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;)V
 
-    invoke-static {v0, v1, v2}, Lf/a/b/q;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-static {v0, v1, v2}, Lf/a/b/s;->m(Lrx/functions/Action1;Landroid/content/Context;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v0
 
@@ -118,7 +118,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Lf/a/b/k;->a(Landroid/content/Context;)V
+    invoke-static {v0}, Lf/a/b/m;->a(Landroid/content/Context;)V
 
     :cond_1
     :goto_0
@@ -157,7 +157,7 @@
     :cond_0
     const-class p1, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;
 
-    invoke-static {p0, p1, v0}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p0, p1, v0}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
 .end method
@@ -218,7 +218,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a09d8
+    const v0, 0x7f0a09dc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -228,7 +228,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->digitVerificationView:Lcom/discord/views/CodeVerificationView;
 
-    const v0, 0x7f0a02ea
+    const v0, 0x7f0a02f0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -238,7 +238,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->dimmerView:Lcom/discord/utilities/dimmer/DimmerView;
 
-    const v0, 0x7f0a0272
+    const v0, 0x7f0a0275
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
index caae6d966b..946d9bfe52 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -3,7 +3,7 @@
 .source "ModelRichPresence.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelApplication;",
+        "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.smali
index 499f459d65..06901a2eb9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "ModelRichPresence.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelPresence;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+        ">;>;"
     }
 .end annotation
 
@@ -89,9 +91,9 @@
 
     if-nez p1, :cond_0
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -120,7 +122,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/models/domain/ModelPresence;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -133,9 +135,9 @@
 
     invoke-direct {v1, p1, v0, v2, v0}, Lcom/discord/widgets/user/presence/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     :goto_0
     return-object p1
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion.smali
index 491f768c51..773b1ded0c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence$Companion.smali
@@ -55,7 +55,7 @@
 
 # virtual methods
 .method public final get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -67,7 +67,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "storeUserPresence"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3, p1, p2}, Lcom/discord/stores/StoreUserPresence;->getForUserId(J)Lrx/Observable;
 
@@ -75,22 +77,13 @@
 
     sget-object p2, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion$get$1;
 
-    invoke-virtual {p1, p2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, p2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "storeUserPresence\n      \u2026          }\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "storeUserPresence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence.smali
index 1f2aa12976..909e38fc8a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ModelRichPresence.smali
@@ -37,9 +37,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,15 +50,6 @@
     iput-object p2, p0, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
     return-void
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -141,22 +134,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)Lcom/discord/widgets/user/presence/ModelRichPresence;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "presence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/presence/ModelRichPresence;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/presence/ModelRichPresence;-><init>(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelApplication;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "presence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -174,7 +160,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/presence/ModelRichPresence;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -184,7 +170,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/presence/ModelRichPresence;->primaryApplication:Lcom/discord/models/domain/ModelApplication;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
index a9e9a1a1d4..b1deff050a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
@@ -11,7 +11,9 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "containerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -20,15 +22,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->containerView:Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "containerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -76,7 +69,7 @@
 
     if-eqz v2, :cond_0
 
-    const v3, 0x7f1216d8
+    const v3, 0x7f121702
 
     const/4 v4, 0x2
 
@@ -121,7 +114,7 @@
     :goto_1
     const-string v2, "model.party?.run {\n     \u2026)\n        }\n      } ?: \"\""
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -141,7 +134,7 @@
 
     if-eqz p2, :cond_3
 
-    invoke-static {p2}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p2}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p2
 
@@ -152,11 +145,11 @@
     goto :goto_2
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.CharSequence"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -170,13 +163,13 @@
 
     const-string v2, "headerTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
@@ -184,7 +177,7 @@
 
     const-string v3, "headerTv.context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
 
@@ -198,7 +191,7 @@
 
     const-string v2, "titleTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getName()Ljava/lang/String;
 
@@ -212,7 +205,7 @@
 
     const-string v2, "detailsTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getDetails()Ljava/lang/String;
 
@@ -226,7 +219,7 @@
 
     const-string v2, "stateTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
@@ -236,7 +229,7 @@
 
     const-string v1, "timeTv"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getTimestamps()Lcom/discord/models/domain/activity/ModelActivityTimestamps;
 
@@ -264,86 +257,97 @@
 .end method
 
 .method public configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;Landroid/content/Context;ZLcom/discord/models/domain/ModelUser;)V
-    .locals 13
+    .locals 10
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "applicationContext"
 
-    if-eqz p3, :cond_3
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super/range {p0 .. p5}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;Landroid/content/Context;ZLcom/discord/models/domain/ModelUser;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object p2
 
-    const-string v2, "largeIv"
+    const-string p3, "largeIv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Landroid/widget/ImageView;->getVisibility()I
+    invoke-virtual {p2}, Landroid/widget/ImageView;->getVisibility()I
 
-    move-result v1
+    move-result p2
 
-    if-eqz v1, :cond_2
+    if-eqz p2, :cond_2
 
     if-eqz p1, :cond_1
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryApplication()Lcom/discord/models/domain/ModelApplication;
 
-    move-result-object v1
+    move-result-object p1
 
-    if-eqz v1, :cond_1
+    if-eqz p1, :cond_1
 
-    sget-object v3, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+    sget-object v0, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getId()J
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getId()J
 
-    move-result-wide v4
+    move-result-wide v1
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
-    if-eqz v0, :cond_0
+    if-eqz p1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    const-string v0, ""
+    const-string p1, ""
 
     :goto_0
-    move-object v6, v0
+    move-object v3, p1
 
-    const/4 v7, 0x0
+    const/4 v4, 0x0
 
-    const/4 v8, 0x4
+    const/4 v5, 0x4
 
-    const/4 v9, 0x0
+    const/4 v6, 0x0
 
-    invoke-static/range {v3 .. v9}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
+    invoke-static/range {v0 .. v6}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_1
 
     :cond_1
-    move-object v4, v0
+    const/4 p1, 0x0
+
+    :goto_1
+    move-object v1, p1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object p1
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p2, 0x0
+
+    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
+    const/4 v3, 0x0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object v3
-
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
@@ -351,25 +355,12 @@
 
     const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0xfc
 
     const/4 v9, 0x0
 
-    const/4 v10, 0x0
-
-    const/16 v11, 0xfc
-
-    const/4 v12, 0x0
-
-    invoke-static/range {v3 .. v12}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v9}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string v1, "applicationContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
index 8207990639..b9c9bedbf0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
index ab7e85272b..df52e6a42d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
index 00d6841fe6..5077afb69f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
@@ -51,7 +51,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
index 3fb301e112..4390b50c43 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/integrations/SpotifyHelper;->openPlayStoreForSpotify(Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
index 1f9bd49e1d..135675f9a5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
@@ -12,7 +12,7 @@
 
 .field public final musicElapsed:Landroid/widget/TextView;
 
-.field public final musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
+.field public final musicSeekBar:Landroid/widget/SeekBar;
 
 .field public final playButton:Landroid/widget/Button;
 
@@ -21,7 +21,9 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "containerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -29,7 +31,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0756
+    const v0, 0x7f0a075c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -41,19 +43,19 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0759
+    const v0, 0x7f0a075e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    check-cast p1, Lcom/miguelgaeta/super_bar/SuperBar;
+    check-cast p1, Landroid/widget/SeekBar;
 
-    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
+    iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSeekBar:Landroid/widget/SeekBar;
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0754
+    const v0, 0x7f0a075a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -65,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0753
+    const v0, 0x7f0a0759
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -82,15 +84,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->clock:Lcom/discord/utilities/time/Clock;
 
     return-void
-
-    :cond_0
-    const-string p1, "containerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -106,7 +99,7 @@
 
     const-string p2, "smallIv"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x0
 
@@ -118,7 +111,7 @@
 
     const-string v0, "smallIvWrap"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
 
@@ -130,9 +123,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "applicationContext"
 
-    if-eqz p3, :cond_c
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
 
@@ -142,6 +135,8 @@
 
     move-result-object p3
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/activity/ModelActivity;
@@ -181,7 +176,7 @@
 
     const/4 v5, 0x1
 
-    invoke-static {v2, v4, v5}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v2, v4, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v2
 
@@ -197,7 +192,7 @@
 
     const/4 v8, 0x4
 
-    invoke-static {v4, v6, v7, v3, v8}, Lj0/t/k;->replace$default(Ljava/lang/String;CCZI)Ljava/lang/String;
+    invoke-static {v4, v6, v7, v3, v8}, Lk0/u/k;->replace$default(Ljava/lang/String;CCZI)Ljava/lang/String;
 
     move-result-object v4
 
@@ -213,13 +208,13 @@
 
     const-string v7, "headerTv"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v8
 
-    invoke-static {v8, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
@@ -227,7 +222,7 @@
 
     const-string v8, "headerTv.context"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v7, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
 
@@ -241,7 +236,7 @@
 
     const-string v7, "titleTv"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getDetails()Ljava/lang/String;
 
@@ -255,9 +250,9 @@
 
     const-string v7, "detailsTv"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v7, 0x7f1216d2
+    const v7, 0x7f1216fc
 
     new-array v8, v5, [Ljava/lang/Object;
 
@@ -275,9 +270,9 @@
 
     const-string v6, "timeTv"
 
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f1216d1
+    const v6, 0x7f1216fb
 
     new-array v7, v5, [Ljava/lang/Object;
 
@@ -306,7 +301,7 @@
 
     const-string v4, "textContainer"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v5}, Landroid/view/View;->setSelected(Z)V
 
@@ -316,7 +311,7 @@
 
     const-string v0, "playButton"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v2, :cond_4
 
@@ -330,11 +325,11 @@
     :goto_2
     invoke-virtual {p2, v4}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSeekBar:Landroid/widget/SeekBar;
 
-    const-string v4, "musicSuperBar"
+    const-string v4, "musicSeekBar"
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v2, :cond_5
 
@@ -352,7 +347,7 @@
 
     const-string v4, "musicDuration"
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v2, :cond_6
 
@@ -370,7 +365,7 @@
 
     const-string v4, "musicElapsed"
 
-    invoke-static {p2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v2, :cond_7
 
@@ -383,9 +378,9 @@
 
     iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/widget/Button;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f1216be
+    const v1, 0x7f1216e8
 
     invoke-virtual {p3, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -395,7 +390,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/widget/Button;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, v3}, Landroid/widget/Button;->setEnabled(Z)V
 
@@ -404,9 +399,9 @@
     :cond_8
     iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/widget/Button;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f1216d5
+    const v1, 0x7f1216ff
 
     new-array v2, v5, [Ljava/lang/Object;
 
@@ -436,7 +431,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/widget/Button;
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, v5}, Landroid/widget/Button;->setEnabled(Z)V
 
@@ -445,7 +440,7 @@
 
     const-string v0, "context"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p3}, Lcom/discord/utilities/integrations/SpotifyHelper;->isSpotifyInstalled(Landroid/content/Context;)Z
 
@@ -500,13 +495,6 @@
     invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_c
-    const-string p1, "applicationContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public setTimeTextViews(Lcom/discord/models/domain/activity/ModelActivityTimestamps;)V
@@ -562,31 +550,21 @@
 
     mul-double v4, v4, v6
 
-    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSuperBar:Lcom/miguelgaeta/super_bar/SuperBar;
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicSeekBar:Landroid/widget/SeekBar;
 
-    const-string v6, "musicSuperBar"
+    const-string v6, "musicSeekBar"
 
-    invoke-static {p1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/miguelgaeta/super_bar/SuperBar;->getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
+    double-to-int v4, v4
 
-    move-result-object p1
-
-    const/16 v6, 0x15e
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    double-to-float v4, v4
-
-    invoke-virtual {p1, v6, v4}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarValue(Ljava/lang/Integer;F)V
+    invoke-virtual {p1, v4}, Landroid/widget/SeekBar;->setProgress(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->musicElapsed:Landroid/widget/TextView;
 
     const-string v4, "musicElapsed"
 
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v4, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
 
@@ -602,7 +580,7 @@
 
     const-string v0, "musicDuration"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
index 4dd3bd3583..a47334641f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
@@ -3,7 +3,7 @@
 .source "ViewHolderPlatformRichPresence.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,13 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelConnectedAccount;",
+        ">;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -47,36 +52,21 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;->call(Ljava/util/List;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Ljava/util/List;)Z
+.method public final call(Ljava/util/List;)Ljava/lang/Boolean;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
             "Lcom/discord/models/domain/ModelConnectedAccount;",
-            ">;)Z"
+            ">;)",
+            "Ljava/lang/Boolean;"
         }
     .end annotation
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
@@ -120,7 +110,7 @@
 
     const-string v4, "Locale.ENGLISH"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v2, :cond_2
 
@@ -130,9 +120,9 @@
 
     const-string v3, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -143,15 +133,31 @@
     goto :goto_0
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_3
     :goto_0
-    return v1
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;->call(Ljava/util/List;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
index a18167f1fe..59443dcb3d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "ViewHolderPlatformRichPresence.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lrx/subscriptions/CompositeSubscription;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lrx/subscriptions/CompositeSubscription;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "add"
+
+    const-string v5, "add(Lrx/Subscription;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "add"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "add(Lrx/Subscription;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lrx/subscriptions/CompositeSubscription;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
index d9f7c4b9dc..bfe0905792 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewHolderPlatformRichPresence.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const-string v1, "connectButton"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
index a5f6f7c6cd..5bf766c133 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
@@ -51,7 +51,7 @@
 
     const-string v2, "it"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/stores/StoreUserConnections;->authorizeConnection(Ljava/lang/String;Landroid/content/Context;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
index 52f2291294..102fa64300 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
@@ -15,7 +15,9 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "containerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x3
 
@@ -23,7 +25,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0756
+    const v0, 0x7f0a075c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -40,15 +42,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->subscriptions:Lrx/subscriptions/CompositeSubscription;
 
     return-void
-
-    :cond_0
-    const-string p1, "containerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getConnectButton$p(Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;)Landroid/widget/Button;
@@ -92,7 +85,7 @@
 
     const-string v5, "smallIv"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v6, 0x1
 
@@ -132,13 +125,13 @@
 
     const-string v8, "smallIvWrap"
 
-    invoke-static {v4, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getSmallIv()Landroid/widget/ImageView;
 
     move-result-object v8
 
-    invoke-static {v8, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Landroid/view/View;->getVisibility()I
 
@@ -189,7 +182,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroid/widget/ImageView;->getResources()Landroid/content/res/Resources;
 
@@ -232,7 +225,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/platform/Platform;->getPlatformImage()Ljava/lang/Integer;
 
@@ -253,7 +246,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/widget/ImageView;->getVisibility()I
 
@@ -306,7 +299,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v7}, Landroid/widget/ImageView;->setVisibility(I)V
 
@@ -314,7 +307,7 @@
 
     move-result-object v8
 
-    invoke-static {v8, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v10, 0x0
 
@@ -345,12 +338,14 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 p2, 0x0
+    const-string p2, "applicationContext"
 
-    if-eqz p3, :cond_8
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->disposeSubscriptions()V
 
+    const/4 p2, 0x0
+
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/activity/ModelActivity;
@@ -418,13 +413,13 @@
 
     const-string v2, "headerTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
@@ -432,7 +427,7 @@
 
     const-string v3, "headerTv.context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, p3}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
 
@@ -446,7 +441,7 @@
 
     const-string v2, "titleTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/activity/ModelActivity;->getName()Ljava/lang/String;
 
@@ -460,7 +455,7 @@
 
     const-string v2, "timeTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/activity/ModelActivity;->getTimestamps()Lcom/discord/models/domain/activity/ModelActivityTimestamps;
 
@@ -481,7 +476,7 @@
 
     const-string p3, "textContainer"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p3, 0x1
 
@@ -491,7 +486,7 @@
 
     const-string v1, "connectButton"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
 
@@ -506,7 +501,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/widget/Button;
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
 
@@ -514,7 +509,7 @@
 
     move-result-object p4
 
-    const v1, 0x7f1216c1
+    const v1, 0x7f1216eb
 
     new-array p3, p3, [Ljava/lang/Object;
 
@@ -550,7 +545,7 @@
 
     invoke-direct {p3, p5}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
 
-    invoke-virtual {p2, p3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, p3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p2
 
@@ -560,7 +555,7 @@
 
     const-string p3, "StoreStream\n          .g\u2026  .distinctUntilChanged()"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
@@ -610,13 +605,6 @@
     invoke-virtual {p1, p4}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_8
-    const-string p1, "applicationContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 .method public disposeSubscriptions()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
index fb83b3b64e..04f4dfeb4b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
@@ -13,7 +13,9 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "containerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x4
 
@@ -21,7 +23,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0944
+    const v0, 0x7f0a0948
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -29,22 +31,13 @@
 
     const-string v0, "containerView.findViewById(R.id.stream_preview)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/StreamPreviewView;
 
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreview:Lcom/discord/views/StreamPreviewView;
 
     return-void
-
-    :cond_0
-    const-string p1, "containerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final configureStreamPreview(Lcom/discord/utilities/streams/StreamContext;)V
@@ -127,7 +120,7 @@
 
     if-eqz v1, :cond_2
 
-    const v0, 0x7f1216d8
+    const v0, 0x7f121702
 
     const/4 v2, 0x2
 
@@ -159,7 +152,9 @@
 
     invoke-virtual {v1, v0, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p2
+
+    move-object v0, p2
 
     :cond_2
     :goto_0
@@ -173,7 +168,7 @@
     :goto_1
     const-string p2, "party?.run {\n      when \u2026    )\n      }\n    } ?: \"\""
 
-    invoke-static {v0, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p2, Ljava/lang/StringBuilder;
 
@@ -193,7 +188,7 @@
 
     if-eqz p1, :cond_4
 
-    invoke-static {p1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
@@ -204,11 +199,11 @@
     return-object p1
 
     :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.CharSequence"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -226,7 +221,7 @@
 
     const-string p2, "largeIv"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 p2, 0x8
 
@@ -238,7 +233,7 @@
 
     const-string v0, "smallIv"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
 
@@ -248,7 +243,7 @@
 
     const-string v0, "smallIvWrap"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V
 
@@ -266,7 +261,7 @@
 
     const-string v1, "headerTv"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
@@ -282,7 +277,7 @@
 
     if-eqz v1, :cond_1
 
-    const v5, 0x7f1216c6
+    const v5, 0x7f1216f0
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -350,7 +345,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
@@ -360,7 +355,7 @@
 
     const-string v1, "titleTv"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getName()Ljava/lang/String;
 
@@ -374,7 +369,7 @@
 
     const-string v1, "detailsTv"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getDetails()Ljava/lang/String;
 
@@ -388,7 +383,7 @@
 
     const-string v1, "stateTv"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
@@ -398,7 +393,7 @@
 
     const-string v0, "timeTv"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getTimestamps()Lcom/discord/models/domain/activity/ModelActivityTimestamps;
 
@@ -420,7 +415,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 p2, 0x8
 
@@ -442,12 +437,14 @@
 .method public configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;Landroid/content/Context;ZLcom/discord/models/domain/ModelUser;)V
     .locals 0
 
-    const/4 p4, 0x0
+    const-string p4, "applicationContext"
 
-    if-eqz p3, :cond_6
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
 
+    const/4 p3, 0x0
+
     if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
@@ -463,21 +460,21 @@
     goto :goto_0
 
     :cond_0
-    move-object p1, p4
+    move-object p1, p3
 
     :goto_0
     if-eqz p2, :cond_1
 
     invoke-virtual {p2}, Lcom/discord/utilities/streams/StreamContext;->getJoinability()Lcom/discord/utilities/streams/StreamContext$Joinability;
 
-    move-result-object p4
+    move-result-object p3
 
     :cond_1
-    sget-object p3, Lcom/discord/utilities/streams/StreamContext$Joinability;->MISSING_PERMISSIONS:Lcom/discord/utilities/streams/StreamContext$Joinability;
+    sget-object p4, Lcom/discord/utilities/streams/StreamContext$Joinability;->MISSING_PERMISSIONS:Lcom/discord/utilities/streams/StreamContext$Joinability;
 
     const/4 p5, 0x0
 
-    if-ne p4, p3, :cond_2
+    if-ne p3, p4, :cond_2
 
     const/4 p3, 0x1
 
@@ -515,13 +512,6 @@
     invoke-direct {p0, p2}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->configureStreamPreview(Lcom/discord/utilities/streams/StreamContext;)V
 
     return-void
-
-    :cond_6
-    const-string p1, "applicationContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
 
 .method public final setOnStreamPreviewClicked(Lkotlin/jvm/functions/Function0;)V
@@ -535,7 +525,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onStreamPreviewClicked"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreview:Lcom/discord/views/StreamPreviewView;
 
@@ -546,13 +538,4 @@
     invoke-virtual {v0, v1}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onStreamPreviewClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
index e5ed177638..da99031ec0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
@@ -68,7 +68,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -87,7 +87,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;-><init>(Landroid/view/View;)V
 
@@ -102,7 +102,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;-><init>(Landroid/view/View;)V
 
@@ -117,7 +117,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;-><init>(Landroid/view/View;)V
 
@@ -130,7 +130,7 @@
 
     move-result-object p1
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p1}, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;-><init>(Landroid/view/View;)V
 
@@ -188,7 +188,7 @@
     :goto_0
     const-string p2, "spotify"
 
-    invoke-static {p1, p2, v0}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {p1, p2, v0}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result p1
 
@@ -208,9 +208,11 @@
 
 # virtual methods
 .method public final setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;->getRPViewHolderType(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)I
 
@@ -235,13 +237,4 @@
 
     :cond_1
     return-object p4
-
-    :cond_2
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
index ef03ba38e5..bdb7ed7798 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewHolderUserRichPresence.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->access$setPerSecondTimerSubscription$p(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
index 30a6f07c91..ea8986149b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewHolderUserRichPresence.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
index cc56aea906..81313d70ac 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
@@ -89,9 +89,11 @@
 .end method
 
 .method public constructor <init>(Landroid/view/View;I)V
-    .locals 2
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "containerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -99,7 +101,7 @@
 
     iput p2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->richPresenceType:I
 
-    const p2, 0x7f0a0750
+    const p2, 0x7f0a0756
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -111,7 +113,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0751
+    const p2, 0x7f0a0757
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -123,7 +125,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0752
+    const p2, 0x7f0a0758
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -133,7 +135,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a074f
+    const p2, 0x7f0a0755
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -145,7 +147,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a075b
+    const p2, 0x7f0a0761
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -157,7 +159,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a074e
+    const p2, 0x7f0a0754
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -169,7 +171,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a075a
+    const p2, 0x7f0a0760
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -181,7 +183,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0758
+    const p2, 0x7f0a075f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -193,7 +195,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a074d
+    const p2, 0x7f0a0753
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -205,46 +207,37 @@
 
     new-array p1, p1, [Landroid/widget/Button;
 
-    const/4 p2, 0x0
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    const v0, 0x7f0a075c
 
-    const v1, 0x7f0a0756
+    invoke-virtual {p2, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    move-result-object p2
 
-    move-result-object v0
+    check-cast p2, Landroid/widget/Button;
 
-    check-cast v0, Landroid/widget/Button;
+    const/4 v0, 0x0
 
-    aput-object v0, p1, p2
+    aput-object p2, p1, v0
 
-    const/4 p2, 0x1
+    iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    const v0, 0x7f0a075d
 
-    const v1, 0x7f0a0757
+    invoke-virtual {p2, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    move-result-object p2
 
-    move-result-object v0
+    check-cast p2, Landroid/widget/Button;
 
-    check-cast v0, Landroid/widget/Button;
+    const/4 v0, 0x1
 
-    aput-object v0, p1, p2
+    aput-object p2, p1, v0
 
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->buttons:[Landroid/widget/Button;
 
     return-void
-
-    :cond_0
-    const-string p1, "containerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/view/View;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -305,7 +298,7 @@
 
     const-string p2, "activity?.sessionId ?: return"
 
-    invoke-static {v5, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/models/domain/activity/ModelActivity;->getApplicationId()Ljava/lang/Long;
 
@@ -315,7 +308,7 @@
 
     const-string p3, "activity?.applicationId ?: return"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
 
@@ -424,19 +417,19 @@
 
     iget-object v0, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v11}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object v0, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
-    invoke-static {v0, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v11}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object v0, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIvWrap:Landroid/view/View;
 
-    invoke-static {v0, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v11}, Landroid/view/View;->setVisibility(I)V
 
@@ -457,7 +450,7 @@
 
     sget-object v12, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
-    invoke-static {v14, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v15, 0x0
 
@@ -487,7 +480,7 @@
 
     sget-object v12, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
 
-    invoke-static {v14, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v15, 0x0
 
@@ -506,7 +499,7 @@
 
     iget-object v1, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {v1, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -528,7 +521,7 @@
 
     iget-object v0, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->largeIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7}, Lcom/discord/models/domain/activity/ModelActivityAssets;->getLargeText()Ljava/lang/String;
 
@@ -538,7 +531,7 @@
 
     iget-object v0, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
-    invoke-static {v0, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
@@ -546,7 +539,7 @@
 
     iget-object v0, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
-    invoke-static {v0, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7}, Lcom/discord/models/domain/activity/ModelActivityAssets;->getSmallText()Ljava/lang/String;
 
@@ -556,11 +549,11 @@
 
     iget-object v0, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIvWrap:Landroid/view/View;
 
-    invoke-static {v0, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, v6, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->smallIv:Landroid/widget/ImageView;
 
-    invoke-static {v2, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/view/View;->getVisibility()I
 
@@ -587,13 +580,15 @@
 .end method
 
 .method public configureCustomButtonsUi(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/activity/ModelActivity;Landroid/content/Context;)V
-    .locals 16
+    .locals 17
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "applicationContext"
 
-    if-eqz p3, :cond_4
+    move-object/from16 v8, p3
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_0
 
@@ -601,38 +596,38 @@
 
     move-result-object v1
 
-    move-object/from16 v9, p0
+    move-object/from16 v10, p0
 
-    move-object v8, v1
+    move-object v9, v1
 
     goto :goto_0
 
     :cond_0
-    move-object/from16 v9, p0
+    const/4 v9, 0x0
 
-    move-object v8, v0
+    move-object/from16 v10, p0
 
     :goto_0
-    iget-object v10, v9, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->buttons:[Landroid/widget/Button;
+    iget-object v11, v10, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->buttons:[Landroid/widget/Button;
 
-    array-length v11, v10
-
-    const/4 v12, 0x0
-
-    const/4 v2, 0x0
+    array-length v12, v11
 
     const/4 v13, 0x0
 
+    const/4 v2, 0x0
+
+    const/4 v14, 0x0
+
     :goto_1
-    if-ge v13, v11, :cond_3
+    if-ge v14, v12, :cond_3
 
-    aget-object v14, v10, v13
+    aget-object v15, v11, v14
 
-    add-int/lit8 v15, v2, 0x1
+    add-int/lit8 v16, v2, 0x1
 
-    if-eqz v8, :cond_1
+    if-eqz v9, :cond_1
 
-    invoke-static {v8, v2}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {v9, v2}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -641,27 +636,27 @@
     goto :goto_2
 
     :cond_1
-    move-object v1, v0
+    const/4 v1, 0x0
 
     :goto_2
     const-string v3, "button"
 
     if-nez v1, :cond_2
 
-    invoke-static {v14, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v1, 0x8
 
-    invoke-virtual {v14, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v15, v1}, Landroid/view/View;->setVisibility(I)V
 
     goto :goto_3
 
     :cond_2
-    invoke-static {v14, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v15, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v14, v1}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v15, v1}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {v14, v12}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v15, v13}, Landroid/view/View;->setVisibility(I)V
 
     new-instance v7, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureCustomButtonsUi$$inlined$forEachIndexed$lambda$1;
 
@@ -669,40 +664,29 @@
 
     move-object/from16 v3, p0
 
-    move-object v4, v8
+    move-object v4, v9
 
     move-object/from16 v5, p3
 
     move-object/from16 v6, p1
 
-    move-object v12, v7
+    move-object v0, v7
 
     move-object/from16 v7, p2
 
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureCustomButtonsUi$$inlined$forEachIndexed$lambda$1;-><init>(ILcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Ljava/util/List;Landroid/content/Context;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/activity/ModelActivity;)V
 
-    invoke-virtual {v14, v12}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v15, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :goto_3
-    add-int/lit8 v13, v13, 0x1
+    add-int/lit8 v14, v14, 0x1
 
-    move v2, v15
-
-    const/4 v12, 0x0
+    move/from16 v2, v16
 
     goto :goto_1
 
     :cond_3
     return-void
-
-    :cond_4
-    move-object/from16 v9, p0
-
-    const-string v1, "applicationContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public configureTextUi(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)V
@@ -751,7 +735,7 @@
 
     if-eqz v2, :cond_1
 
-    const v3, 0x7f1216d8
+    const v3, 0x7f121702
 
     const/4 v4, 0x2
 
@@ -796,7 +780,7 @@
     :goto_1
     const-string v2, "model.party?.run {\n     \u2026)\n        }\n      } ?: \"\""
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -816,7 +800,7 @@
 
     if-eqz p2, :cond_4
 
-    invoke-static {p2}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p2}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p2
 
@@ -827,11 +811,11 @@
     goto :goto_2
 
     :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type kotlin.CharSequence"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -843,11 +827,11 @@
 
     const-string v2, "headerTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->headerTv:Landroid/widget/TextView;
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
@@ -855,7 +839,7 @@
 
     const-string v3, "headerTv.context"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/activity/ModelActivity;)Ljava/lang/CharSequence;
 
@@ -867,7 +851,7 @@
 
     const-string v2, "titleTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getDetails()Ljava/lang/String;
 
@@ -879,7 +863,7 @@
 
     const-string v2, "detailsTv"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
@@ -887,7 +871,7 @@
 
     const-string v1, "stateTv"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getAssets()Lcom/discord/models/domain/activity/ModelActivityAssets;
 
@@ -911,7 +895,7 @@
 
     const-string v1, "timeTv"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getTimestamps()Lcom/discord/models/domain/activity/ModelActivityTimestamps;
 
@@ -934,9 +918,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 p4, 0x0
+    const-string p4, "applicationContext"
 
-    if-eqz p3, :cond_2
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
 
@@ -944,12 +928,17 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/activity/ModelActivity;
 
-    move-result-object p4
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
     if-nez p2, :cond_1
 
-    if-nez p4, :cond_1
+    if-nez p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
@@ -960,129 +949,124 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
     const/4 v0, 0x0
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p4, v0}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-virtual {p0, p4, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureTextUi(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureTextUi(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
+    iget-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->textContainer:Landroid/view/View;
 
     const-string v0, "textContainer"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->setSelected(Z)V
+    invoke-virtual {p4, v0}, Landroid/view/View;->setSelected(Z)V
 
-    invoke-virtual {p0, p4, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureAssetUi(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)V
 
-    invoke-virtual {p0, p5, p4, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureCustomButtonsUi(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/activity/ModelActivity;Landroid/content/Context;)V
+    invoke-virtual {p0, p5, p1, p3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureCustomButtonsUi(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/activity/ModelActivity;Landroid/content/Context;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "applicationContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
 
 .method public configureUiTimestamp(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/app/AppComponent;)V
-    .locals 11
+    .locals 10
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "appComponent"
 
-    if-eqz p2, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    invoke-virtual {v1}, Landroid/view/View;->getVisibility()I
+    invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_3
+    if-nez v0, :cond_3
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getTimestamps()Lcom/discord/models/domain/activity/ModelActivityTimestamps;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const/4 v1, 0x0
 
-    invoke-virtual {p0, v1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/activity/ModelActivityTimestamps;)Ljava/lang/CharSequence;
+    if-eqz v0, :cond_0
 
-    move-result-object v1
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/activity/ModelActivityTimestamps;)Ljava/lang/CharSequence;
+
+    move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
-    if-nez v1, :cond_1
+    if-nez v0, :cond_1
 
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->perSecondTimerSubscription:Lrx/Subscription;
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
-    const-wide/16 v1, 0x0
+    const-wide/16 v2, 0x0
 
-    const-wide/16 v3, 0x1
+    const-wide/16 v4, 0x1
 
-    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {v1, v2, v3, v4, v5}, Lrx/Observable;->B(JJLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v2, v3, v4, v5, v0}, Lrx/Observable;->B(JJLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
     const/4 v2, 0x2
 
-    invoke-static {p2, v0, v2}, Lf/a/b/q;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
+    invoke-static {p2, v1, v2}, Lf/a/b/s;->s(Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;I)Lrx/Observable$c;
 
     move-result-object p2
 
-    invoke-virtual {v1, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, p2}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v1
 
     const-string p2, "Observable\n          .in\u2026formers.ui(appComponent))"
 
-    invoke-static {v2, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(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
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    new-instance v5, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;
+    new-instance v4, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;
 
-    invoke-direct {v5, p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;-><init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)V
+    invoke-direct {v4, p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;-><init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)V
+
+    const/4 v5, 0x0
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    new-instance v7, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;
 
-    new-instance v8, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;
+    invoke-direct {v7, p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;-><init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lcom/discord/models/domain/activity/ModelActivity;)V
 
-    invoke-direct {v8, p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;-><init>(Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;Lcom/discord/models/domain/activity/ModelActivity;)V
+    const/16 v8, 0x1a
 
-    const/16 v9, 0x1a
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
-
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    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
 
     :cond_2
     return-void
@@ -1092,13 +1076,6 @@
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
 
     return-void
-
-    :cond_4
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public disposeSubscriptions()V
@@ -1129,23 +1106,23 @@
 .end method
 
 .method public final friendlyTime(Lcom/discord/models/domain/activity/ModelActivityTimestamps;)Ljava/lang/CharSequence;
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "$this$friendlyTime"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityTimestamps;->getEndMs()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    const-wide/16 v3, 0x0
+    const-wide/16 v2, 0x0
 
-    cmp-long v5, v1, v3
+    cmp-long v4, v0, v2
 
-    if-lez v5, :cond_0
+    if-lez v4, :cond_0
 
-    sget-object v6, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
+    sget-object v5, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
@@ -1153,38 +1130,38 @@
 
     invoke-interface {v0}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v7
+    move-result-wide v6
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityTimestamps;->getEndMs()J
 
-    move-result-wide v9
+    move-result-wide v8
 
-    const p1, 0x7f1216da
+    const p1, 0x7f121704
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
-    move-result-object v11
+    move-result-object v10
 
-    invoke-virtual/range {v6 .. v11}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyString(JJLjava/lang/String;)Ljava/lang/CharSequence;
+    invoke-virtual/range {v5 .. v10}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyString(JJLjava/lang/String;)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object p1
 
     goto :goto_0
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityTimestamps;->getStartMs()J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    cmp-long v5, v1, v3
+    cmp-long v4, v0, v2
 
-    if-lez v5, :cond_1
+    if-lez v4, :cond_1
 
-    sget-object v6, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
+    sget-object v5, Lcom/discord/utilities/time/TimeUtils;->INSTANCE:Lcom/discord/utilities/time/TimeUtils;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityTimestamps;->getStartMs()J
 
-    move-result-wide v7
+    move-result-wide v6
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
@@ -1192,28 +1169,25 @@
 
     invoke-interface {p1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v9
+    move-result-wide v8
 
-    const p1, 0x7f1216dc
+    const p1, 0x7f121706
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
-    move-result-object v11
+    move-result-object v10
 
-    invoke-virtual/range {v6 .. v11}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyString(JJLjava/lang/String;)Ljava/lang/CharSequence;
+    invoke-virtual/range {v5 .. v10}, Lcom/discord/utilities/time/TimeUtils;->toFriendlyString(JJLjava/lang/String;)Ljava/lang/CharSequence;
 
-    move-result-object v0
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_1
+    const/4 p1, 0x0
+
     :goto_0
-    return-object v0
-
-    :cond_2
-    const-string p1, "$this$friendlyTime"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public final getDetailsTv()Landroid/widget/TextView;
@@ -1325,31 +1299,33 @@
 .end method
 
 .method public final setImageAndVisibilityBy(Landroid/widget/ImageView;Ljava/lang/String;Z)V
-    .locals 10
+    .locals 11
 
-    if-eqz p1, :cond_3
+    const-string v0, "$this$setImageAndVisibilityBy"
 
-    const/4 v2, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    const/16 v8, 0xec
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/16 v9, 0xec
 
-    move-object v0, p1
+    const/4 v10, 0x0
 
-    move-object v1, p2
+    move-object v1, p1
 
-    move v4, p3
+    move-object v2, p2
 
-    invoke-static/range {v0 .. v9}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
+    move v5, p3
+
+    invoke-static/range {v1 .. v10}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;Ljava/util/List;ILjava/lang/Object;)V
 
     const/4 p3, 0x0
 
@@ -1357,7 +1333,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-static {p2}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p2}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p2
 
@@ -1388,19 +1364,10 @@
     invoke-virtual {p1, p3}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_3
-    const-string p1, "$this$setImageAndVisibilityBy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnActivityCustomButtonClicked(Lkotlin/jvm/functions/Function5;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1420,20 +1387,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "newOnActivityCustomButtonClicked"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->onActivityCustomButtonClicked:Lkotlin/jvm/functions/Function5;
 
     return-void
-
-    :cond_0
-    const-string p1, "newOnActivityCustomButtonClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setTimeTextViews(Lcom/discord/models/domain/activity/ModelActivityTimestamps;)V
@@ -1443,7 +1403,7 @@
 
     const-string v1, "timeTv"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/RightToLeftGridLayoutManager.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/RightToLeftGridLayoutManager.smali
index b4f4d025a7..19d6f9197d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/RightToLeftGridLayoutManager.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/RightToLeftGridLayoutManager.smali
@@ -5,69 +5,43 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;IIZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3, p4}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;IIZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3, p4}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileAdminView.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileAdminView.smali
index 1249415a3f..ecb36613ad 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileAdminView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileAdminView.smali
@@ -39,141 +39,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileAdminView;
+    const-string v2, "editMemberButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEditMemberButton()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "editMemberButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEditMemberButton()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
-    const/4 v2, 0x0
+    const-string v2, "kickButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getKickButton()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileAdminView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "kickButton"
-
-    const-string v4, "getKickButton()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileAdminView;
+    const-string v2, "banButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBanButton()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "banButton"
-
-    const-string v4, "getBanButton()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileAdminView;
+    const-string v2, "serverMuteButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getServerMuteButton()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "serverMuteButton"
-
-    const-string v4, "getServerMuteButton()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileAdminView;
+    const-string v2, "serverDeafenButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getServerDeafenButton()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "serverDeafenButton"
-
-    const-string v4, "getServerDeafenButton()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileAdminView;
+    const-string v2, "serverMoveUserButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getServerMoveUserButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "serverMoveUserButton"
-
-    const-string v4, "getServerMoveUserButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileAdminView;
+    const-string v2, "disconnectButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDisconnectButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "disconnectButton"
-
-    const-string v4, "getDisconnectButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -187,61 +145,31 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a09e8
-
-    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p2
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->editMemberButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p2, 0x7f0a09e9
-
-    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p2
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->kickButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p2, 0x7f0a09e7
-
-    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p2
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->banButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p2, 0x7f0a09ed
-
-    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p2
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverMuteButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p2, 0x7f0a09ea
-
-    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p2
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverDeafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p2, 0x7f0a09ec
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverMoveUserButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->editMemberButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a09ed
+
+    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->kickButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p2, 0x7f0a09eb
 
@@ -249,6 +177,38 @@
 
     move-result-object p2
 
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->banButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a09f1
+
+    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverMuteButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a09ee
+
+    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverDeafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a09f0
+
+    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverMoveUserButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a09ef
+
+    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->disconnectButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p2, 0x7f0d00ec
@@ -256,20 +216,6 @@
     invoke-static {p1, p2, p0}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getBanButton()Landroid/widget/TextView;
@@ -425,7 +371,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onBan"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getBanButton()Landroid/widget/TextView;
 
@@ -438,15 +386,6 @@
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onBan"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnDisconnect(Lkotlin/jvm/functions/Function0;)V
@@ -460,7 +399,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onDisconnect"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getDisconnectButton()Landroid/view/View;
 
@@ -473,15 +414,6 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onDisconnect"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnEditMember(Lkotlin/jvm/functions/Function0;)V
@@ -495,7 +427,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onEditMember"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getEditMemberButton()Landroid/view/View;
 
@@ -508,15 +442,6 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onEditMember"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnKick(Lkotlin/jvm/functions/Function0;)V
@@ -530,7 +455,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onKick"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getKickButton()Landroid/widget/TextView;
 
@@ -543,15 +470,6 @@
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onKick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnServerDeafen(Lkotlin/jvm/functions/Function0;)V
@@ -565,7 +483,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onServerDeafen"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerDeafenButton()Landroid/widget/TextView;
 
@@ -578,15 +498,6 @@
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onServerDeafen"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnServerMove(Lkotlin/jvm/functions/Function0;)V
@@ -600,7 +511,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onServerMove"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerMoveUserButton()Landroid/view/View;
 
@@ -613,15 +526,6 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onServerMove"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnServerMute(Lkotlin/jvm/functions/Function0;)V
@@ -635,7 +539,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onServerMute"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerMuteButton()Landroid/widget/TextView;
 
@@ -648,139 +554,132 @@
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onServerMute"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateView(Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "viewState"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getEditMemberButton()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->getShowEditMemberButton()Z
 
-    move-result v2
+    move-result v1
 
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_0
 
     :cond_0
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_0
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->getShowKickButton()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_1
 
     :cond_1
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_1
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->isMultiUserDM()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    const v1, 0x7f12132c
+    const v0, 0x7f121356
 
     goto :goto_2
 
     :cond_2
-    const v1, 0x7f120dec
+    const v0, 0x7f120e12
 
     :goto_2
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getKickButton()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getBanButton()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->getShowBanButton()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_3
 
     :cond_3
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_3
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerMuteButton()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->getShowServerMuteButton()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_4
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_4
 
     :cond_4
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_4
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->isServerMuted()Z
 
-    move-result v1
+    move-result v0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x0
 
-    if-eqz v1, :cond_5
+    const/4 v4, 0x2
+
+    if-eqz v0, :cond_5
 
     const v5, 0x7f0402a3
 
-    invoke-static {p0, v5, v4, v2, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, v5, v3, v4, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result v5
 
@@ -789,21 +688,21 @@
     :cond_5
     const v5, 0x7f0402a1
 
-    invoke-static {p0, v5, v4, v2, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, v5, v3, v4, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result v5
 
     :goto_5
     move v7, v5
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
-    const v1, 0x7f12145b
+    const v0, 0x7f121485
 
     goto :goto_6
 
     :cond_6
-    const v1, 0x7f12144e
+    const v0, 0x7f121478
 
     :goto_6
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerMuteButton()Landroid/widget/TextView;
@@ -826,11 +725,11 @@
 
     move-result-object v5
 
-    invoke-virtual {v5, v1}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v5, v0}, Landroid/widget/TextView;->setText(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerDeafenButton()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->getShowServerDeafenButton()Z
 
@@ -846,55 +745,55 @@
     const/16 v5, 0x8
 
     :goto_7
-    invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v5}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->isServerDeafened()Z
 
-    move-result v1
+    move-result v0
 
     const v5, 0x7f040299
 
-    if-eqz v1, :cond_8
+    if-eqz v0, :cond_8
 
-    invoke-static {p0, v5, v4, v2, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, v5, v3, v4, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
-    move-result v0
+    move-result v1
 
     goto :goto_8
 
     :cond_8
-    invoke-static {p0, v5, v4, v2, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
+    invoke-static {p0, v5, v3, v4, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
-    move-result v0
+    move-result v1
 
     :goto_8
-    move v6, v0
+    move v5, v1
 
-    if-eqz v1, :cond_9
+    if-eqz v0, :cond_9
 
-    const v0, 0x7f12145a
+    const v0, 0x7f121484
 
     goto :goto_9
 
     :cond_9
-    const v0, 0x7f121444
+    const v0, 0x7f12146e
 
     :goto_9
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerDeafenButton()Landroid/widget/TextView;
 
-    move-result-object v5
+    move-result-object v4
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/16 v9, 0xe
 
-    const/16 v10, 0xe
+    const/4 v10, 0x0
 
-    const/4 v11, 0x0
-
-    invoke-static/range {v5 .. v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    invoke-static/range {v4 .. v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerDeafenButton()Landroid/widget/TextView;
 
@@ -932,17 +831,10 @@
 
     if-eqz p1, :cond_b
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     :cond_b
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_c
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem.smali
index 8efc46a4f0..a7a130bfe8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "connectedAccount"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
     return-void
-
-    :cond_0
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;Lcom/discord/models/domain/ModelConnectedAccount;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
@@ -73,22 +66,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "connectedAccount"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;-><init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "connectedAccount"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -106,7 +92,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -145,7 +131,7 @@
 
     const-string v1, "connectedAccount.id"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali
index 9b56c10345..356bfc69ee 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserProfileConnectionsView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/String;",
         "Ljava/lang/Integer;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,16 +81,9 @@
 .method public final invoke(Ljava/lang/String;ILjava/lang/String;)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter.smali
index e021f1ab7c..cc9ed4cd2f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter.smali
@@ -42,9 +42,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -53,15 +55,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -109,7 +102,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;
 
@@ -118,19 +113,10 @@
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;-><init>(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnConnectedAccountClick(Lkotlin/jvm/functions/Function3;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -146,18 +132,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.smali
index 4eafe306d4..7d75911c78 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.smali
@@ -75,7 +75,7 @@
 
     const-string v1, "username"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$platformImageRes:I
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder.smali
index 36ab3bf736..d0d62109bc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder.smali
@@ -29,13 +29,15 @@
 
 # direct methods
 .method public constructor <init>(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_1
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -50,20 +52,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.TextView"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -83,7 +76,9 @@
 .method public onConfigure(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;)V
     .locals 12
 
-    if-eqz p2, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -179,7 +174,7 @@
 
     const-string v0, "java.lang.String.format(format, *args)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, p1}, Landroid/widget/TextView;->setContentDescription(Ljava/lang/CharSequence;)V
 
@@ -200,15 +195,6 @@
     invoke-virtual {p1, v6}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali
index 093c34df6c..c6ccd2ca14 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali
@@ -32,7 +32,7 @@
 
 # direct methods
 .method public constructor <init>(ZZLjava/util/List;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ZZ",
@@ -42,7 +42,9 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "connectedAccountItems"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,15 +55,6 @@
     iput-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "connectedAccountItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
@@ -141,22 +134,15 @@
         }
     .end annotation
 
-    if-eqz p3, :cond_0
+    const-string v0, "connectedAccountItems"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;-><init>(ZZLjava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "connectedAccountItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -186,7 +172,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1.smali
index 626fe052c3..d0941e3d71 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserProfileConnectionsView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/String;",
         "Ljava/lang/Integer;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Ljava/lang/String;ILjava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "username"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;->$onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
 
@@ -82,13 +84,4 @@
     invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView.smali
index 1124c83917..2c107a38a2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileConnectionsView.smali
@@ -36,61 +36,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+    const-string v2, "connectedAccountsRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "connectedAccountsRecycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
 
-    const/4 v2, 0x0
+    const-string v2, "mutualGuildsItem"
 
-    aput-object v1, v0, v2
+    const-string v3, "getMutualGuildsItem()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "mutualGuildsItem"
-
-    const-string v4, "getMutualGuildsItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+    const-string v2, "mutualFriendsItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMutualFriendsItem()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mutualFriendsItem"
-
-    const-string v4, "getMutualFriendsItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -104,15 +86,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a09f1
+    const p2, 0x7f0a09f5
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -120,7 +104,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a09f0
+    const p2, 0x7f0a09f4
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -128,7 +112,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->mutualGuildsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a09ef
+    const p2, 0x7f0a09f3
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -141,20 +125,6 @@
     invoke-static {p1, p2, p0}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;
@@ -283,27 +253,35 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "viewState"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v0, "onConnectedAccountClick"
 
-    if-eqz p3, :cond_5
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_4
+    const-string v0, "onMutualGuildsItemClick"
 
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsAdapter:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onMutualFriendsItemClick"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsAdapter:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    const/4 v1, 0x0
 
     const-string v2, "connectedAccountsAdapter"
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
     new-instance v3, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;
 
     invoke-direct {v3, p2}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;-><init>(Lkotlin/jvm/functions/Function3;)V
 
-    invoke-virtual {v1, v3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->setOnConnectedAccountClick(Lkotlin/jvm/functions/Function3;)V
+    invoke-virtual {v0, v3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->setOnConnectedAccountClick(Lkotlin/jvm/functions/Function3;)V
 
     iget-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsAdapter:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
 
@@ -380,40 +358,12 @@
     return-void
 
     :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_3
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_4
-    const-string p1, "onMutualFriendsItemClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "onMutualGuildsItemClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "onConnectedAccountClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
index ed9c160454..c67ec5ccc2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserProfileHeaderView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/LayoutInflater;",
         "Landroid/view/ViewGroup;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -50,11 +50,13 @@
 .method public final invoke(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "inflater"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d00ee
 
@@ -70,25 +72,11 @@
 
     const-string v1, "itemView"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, v0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali
index 79b5161346..7692c0a61f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali
@@ -30,7 +30,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroid/view/View;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -39,13 +39,15 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_1
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
     invoke-direct {p0, p2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
-    const p1, 0x7f0a09fd
+    const p1, 0x7f0a0a01
 
     invoke-virtual {p2, p1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -60,20 +62,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.ImageView"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "itemView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -83,7 +76,9 @@
 .method public bind(Lcom/discord/widgets/user/Badge;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder;->badgeImage:Landroid/widget/ImageView;
 
@@ -120,15 +115,6 @@
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic bind(Ljava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.smali
index 3dd4c492ef..fd246a39e9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Object;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,12 +59,10 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;)Ljava/lang/Boolean;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1;->call(Ljava/lang/Object;)Z
-
-    move-result p1
+    instance-of p1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -73,10 +71,12 @@
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Object;)Z
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    instance-of p1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
-    return p1
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.smali
index 5eb0a4337d..4aa5d2fa28 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.smali
@@ -3,7 +3,7 @@
 .source "ObservableExtensions.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,9 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "TT;>;"
     }
 .end annotation
 
@@ -74,11 +75,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.user.profile.UserProfileHeaderViewModel.ViewState.Loaded"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1.smali
index a986c46a55..bf0c6cf17d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "UserProfileHeaderView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "updateViewState"
+
+    const-string v5, "updateViewState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateViewState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "updateViewState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->updateViewState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion.smali
index e3a24789ca..62d0ea1906 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$Companion.smali
@@ -36,13 +36,17 @@
 .method public final bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "$this$bind"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "host"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "appComponent"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/lifecycle/ViewModelProvider;
 
@@ -60,29 +64,29 @@
 
     const-string p5, "ViewModelProvider(\n     \u2026derViewModel::class.java)"
 
-    invoke-static {p4, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p4, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
 
-    invoke-virtual {p4}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {p4}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object p4
 
     sget-object p5, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$1;
 
-    invoke-virtual {p4, p5}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p4, p5}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p4
 
     sget-object p5, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$$inlined$filterIs$2;
 
-    invoke-virtual {p4, p5}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p4, p5}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p4
 
     const-string p5, "filter { it is T }.map { it as T }"
 
-    invoke-static {p4, p5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p4, p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
 
@@ -92,6 +96,10 @@
 
     move-result-object v1
 
+    new-instance v6, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;
+
+    invoke-direct {v6, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
+
     const/4 v2, 0x0
 
     const/4 v3, 0x0
@@ -100,10 +108,6 @@
 
     const/4 v5, 0x0
 
-    new-instance v6, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;
-
-    invoke-direct {v6, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion$bind$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
-
     const/16 v7, 0x1e
 
     const/4 v8, 0x0
@@ -111,25 +115,4 @@
     invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "appComponent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "$this$bind"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1.smali
index bc3d592556..74f87354a0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserProfileHeaderView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/Badge;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/widgets/user/Badge;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView.smali
index f6b8c17187..96b981a11d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderView.smali
@@ -63,101 +63,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+    const-string v2, "primaryName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrimaryName()Lcom/discord/views/UsernameView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "primaryName"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getPrimaryName()Lcom/discord/views/UsernameView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
-    const/4 v2, 0x0
+    const-string v2, "secondaryName"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSecondaryName()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "secondaryName"
-
-    const-string v4, "getSecondaryName()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+    const-string v2, "customStatusTextView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCustomStatusTextView()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "customStatusTextView"
-
-    const-string v4, "getCustomStatusTextView()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+    const-string v2, "userAvatarPresenceView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserAvatarPresenceView()Lcom/discord/views/user/UserAvatarPresenceView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userAvatarPresenceView"
-
-    const-string v4, "getUserAvatarPresenceView()Lcom/discord/views/user/UserAvatarPresenceView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
+    const-string v2, "badgesRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBadgesRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "badgesRecycler"
-
-    const-string v4, "getBadgesRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -179,85 +149,89 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const v1, 0x7f0a09f5
+    const v0, 0x7f0a09f9
 
-    invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object v1
+    move-result-object v0
 
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a09f6
+    const v0, 0x7f0a09fa
 
-    invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object v1
+    move-result-object v0
 
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a09f3
+    const v0, 0x7f0a09f7
 
-    invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object v1
+    move-result-object v0
 
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->customStatusTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->customStatusTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a09ee
+    const v0, 0x7f0a09f2
 
-    invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object v1
+    move-result-object v0
 
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userAvatarPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userAvatarPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a09f2
+    const v0, 0x7f0a09f6
 
-    invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+    invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
-    move-result-object v1
+    move-result-object v0
 
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
+    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;
 
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onBadgeClick:Lkotlin/jvm/functions/Function1;
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onBadgeClick:Lkotlin/jvm/functions/Function1;
 
-    const v1, 0x7f0d00ef
+    const v0, 0x7f0d00ef
 
-    invoke-static {p1, v1, p0}, Landroid/view/ViewGroup;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+    invoke-static {p1, v0, p0}, Landroid/view/ViewGroup;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    new-instance v0, Lcom/discord/widgets/user/profile/RightToLeftGridLayoutManager;
 
     const/4 v1, 0x3
 
-    new-instance v2, Lcom/discord/widgets/user/profile/RightToLeftGridLayoutManager;
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
-
-    invoke-direct {v2, p1, v1, v3, v3}, Lcom/discord/widgets/user/profile/RightToLeftGridLayoutManager;-><init>(Landroid/content/Context;IIZ)V
+    invoke-direct {v0, p1, v1, v2, v2}, Lcom/discord/widgets/user/profile/RightToLeftGridLayoutManager;-><init>(Landroid/content/Context;IIZ)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getBadgesRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+    invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
 
-    new-instance v1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    new-instance v2, Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;)V
 
-    invoke-direct {v1, v0, v2, v3, v0}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v3, 0x0
 
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    invoke-direct {v0, v3, v1, v2, v3}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getBadgesRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -273,15 +247,15 @@
 
     move-result-object p1
 
-    const/4 p2, 0x0
+    const p2, 0x7f040423
 
-    const v0, 0x7f040423
+    invoke-static {p0, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
-    invoke-static {p0, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+    move-result p2
 
-    move-result v0
+    const/4 v0, 0x0
 
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
+    invoke-virtual {p1, v0, p2}, Landroid/content/res/TypedArray;->getColor(II)I
 
     move-result p2
 
@@ -290,20 +264,6 @@
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
@@ -365,7 +325,7 @@
 
     const-string v4, "it"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -453,7 +413,7 @@
 
     const-string v0, "context"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v3, 0x7f040142
 
@@ -579,7 +539,7 @@
 .end method
 
 .method public final setOnBadgeClick(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -591,148 +551,146 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onBadgeClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateViewState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "viewState"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getUserNickname()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getUserAvatarPresenceView()Lcom/discord/views/user/UserAvatarPresenceView;
 
-    move-result-object v3
+    move-result-object v2
 
-    new-instance v4, Lcom/discord/views/user/UserAvatarPresenceView$a;
+    new-instance v3, Lcom/discord/views/user/UserAvatarPresenceView$a;
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v5
+    move-result-object v4
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
-    move-result-object v6
+    move-result-object v5
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
 
-    move-result-object v7
+    move-result-object v6
 
-    invoke-direct {v4, v5, v6, v7}, Lcom/discord/views/user/UserAvatarPresenceView$a;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)V
+    invoke-direct {v3, v4, v5, v6}, Lcom/discord/views/user/UserAvatarPresenceView$a;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;)V
 
-    invoke-virtual {v3, v4}, Lcom/discord/views/user/UserAvatarPresenceView;->a(Lcom/discord/views/user/UserAvatarPresenceView$a;)V
+    invoke-virtual {v2, v3}, Lcom/discord/views/user/UserAvatarPresenceView;->a(Lcom/discord/views/user/UserAvatarPresenceView$a;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getPrimaryName()Lcom/discord/views/UsernameView;
 
+    move-result-object v2
+
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getPrimaryNameTextForUser(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Landroid/text/SpannableStringBuilder;
+
     move-result-object v3
 
-    invoke-direct {p0, v1, v2}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getPrimaryNameTextForUser(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Landroid/text/SpannableStringBuilder;
-
-    move-result-object v4
-
-    invoke-virtual {v3, v4}, Lcom/discord/views/UsernameView;->setUsernameText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v3}, Lcom/discord/views/UsernameView;->setUsernameText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getPrimaryName()Lcom/discord/views/UsernameView;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBot()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isBot()Z
+
+    move-result v3
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isSystem()Z
 
     move-result v4
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isSystem()Z
+    if-eqz v4, :cond_0
 
-    move-result v5
-
-    if-eqz v5, :cond_0
-
-    const v5, 0x7f12155f
+    const v4, 0x7f121589
 
     goto :goto_0
 
     :cond_0
-    const v5, 0x7f120354
+    const v4, 0x7f120354
 
     :goto_0
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isVerifiedBot()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isVerifiedBot()Z
 
-    move-result v6
+    move-result v5
 
-    invoke-virtual {v3, v4, v5, v6}, Lcom/discord/views/UsernameView;->a(ZIZ)V
+    invoke-virtual {v2, v3, v4, v5}, Lcom/discord/views/UsernameView;->a(ZIZ)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getSecondaryName()Landroid/widget/TextView;
 
-    move-result-object v3
-
-    invoke-direct {p0, v1, v2}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getSecondaryNameTextForUser(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v3, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
-
-    sget-object v1, Lcom/discord/widgets/user/Badge;->Companion:Lcom/discord/widgets/user/Badge$Companion;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
-
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getSnowsGivingHypeSquadEventWinner()I
-
-    move-result v3
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->isMeUserPremium()Z
-
-    move-result v4
-
-    invoke-virtual {p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
-
-    move-result-object v5
-
-    const-string v6, "context"
-
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v2, v3, v4, v5}, Lcom/discord/widgets/user/Badge$Companion;->getBadgesForUser(Lcom/discord/models/domain/ModelUserProfile;IZLandroid/content/Context;)Ljava/util/List;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
-
-    invoke-virtual {v2, v1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getSecondaryNameTextForUser(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
+    invoke-static {v2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+
+    sget-object v0, Lcom/discord/widgets/user/Badge;->Companion:Lcom/discord/widgets/user/Badge$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getSnowsGivingHypeSquadEventWinner()I
+
+    move-result v2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->isMeUserPremium()Z
+
+    move-result v3
+
+    invoke-virtual {p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+
+    move-result-object v4
+
+    const-string v5, "context"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/widgets/user/Badge$Companion;->getBadgesForUser(Lcom/discord/models/domain/ModelUserProfile;IZLandroid/content/Context;)Ljava/util/List;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->badgesAdapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+
+    invoke-virtual {v1, v0}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->setData(Ljava/util/List;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getPresence()Lcom/discord/models/domain/ModelPresence;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
+
+    move-result-object v0
+
+    goto :goto_1
+
     :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
     if-eqz v0, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->getAllowAnimatedEmojis()Z
@@ -760,28 +718,21 @@
 
     const/4 v0, 0x1
 
-    goto :goto_1
+    goto :goto_2
 
     :cond_3
     const/4 v0, 0x0
 
-    :goto_1
+    :goto_2
     if-eqz v0, :cond_4
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     const/16 v1, 0x8
 
-    :goto_2
+    :goto_3
     invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_5
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali
index 54cdb8ed46..8430388a71 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserProfileHeaderViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->access$handleStoreState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeComputedMembers$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeComputedMembers$1.smali
index c6dee7fc6e..56802091f7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeComputedMembers$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeComputedMembers$1.smali
@@ -3,7 +3,7 @@
 .source "UserProfileHeaderViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,15 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -73,6 +78,7 @@
             "Lcom/discord/models/domain/ModelChannel;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelGuildMember$Computed;",
@@ -90,7 +96,7 @@
 
     const-string v1, "channel.guildId"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
@@ -107,15 +113,11 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    const-string p1, "Observable.just(emptyMap())"
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1$1.smali
index 5f81c330d7..df8f5cd407 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1$1.smali
@@ -3,7 +3,7 @@
 .source "UserProfileHeaderViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1.smali
index 35647fabb4..6847d300aa 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "UserProfileHeaderViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,16 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelUser;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;>;>;"
     }
 .end annotation
 
@@ -73,6 +79,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ")",
             "Lrx/Observable<",
+            "+",
             "Lkotlin/Pair<",
             "Lcom/discord/models/domain/ModelUser;",
             "Lcom/discord/models/domain/ModelUser;",
@@ -96,9 +103,9 @@
 
     invoke-direct {v0, p1, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    new-instance p1, Lr0/l/e/j;
+    new-instance p1, Ls0/l/e/j;
 
-    invoke-direct {p1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -119,7 +126,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1$1;-><init>(Lcom/discord/models/domain/ModelUser;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2$1.smali
index 398910565d..6602f35a0d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2$1.smali
@@ -35,7 +35,18 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func6<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+        ">;",
+        "Lcom/discord/widgets/user/presence/ModelRichPresence;",
+        "Lcom/discord/utilities/streams/StreamContext;",
+        "Lcom/discord/models/domain/ModelUserProfile;",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -93,25 +104,25 @@
 
     move-object v4, p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "userProfile"
 
     move-object v7, p4
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "winnerBadgeExperiment"
 
     move-object/from16 v8, p5
 
-    invoke-static {v8, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "allowAnimatedEmojis"
 
     move-object/from16 v5, p6
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p6 .. p6}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali
index 57cea8db31..a1e93605ca 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali
@@ -3,7 +3,7 @@
 .source "UserProfileHeaderViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,17 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -101,6 +108,7 @@
             "Lcom/discord/models/domain/ModelUser;",
             ">;)",
             "Lrx/Observable<",
+            "+",
             "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;",
             ">;"
         }
@@ -223,7 +231,7 @@
 
     :cond_1
     :goto_0
-    sget-object p1, Lr0/l/a/f;->e:Lrx/Observable;
+    sget-object p1, Ls0/l/a/f;->e:Lrx/Observable;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory.smali
index 822bf8b521..6b78ace552 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory.smali
@@ -81,26 +81,26 @@
 
     invoke-direct {v0, p3, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeComputedMembers$1;-><init>(Lcom/discord/stores/StoreGuilds;Ljava/util/Collection;)V
 
-    invoke-virtual {p2, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p2, v0}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "storeChannels\n          \u2026emptyMap())\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p1, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance p2, Lr0/l/e/j;
+    new-instance p2, Ls0/l/e/j;
 
-    invoke-direct {p2, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p2, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     const-string p1, "Observable.just(emptyMap())"
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object p1, p2
 
@@ -122,7 +122,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
 
@@ -201,15 +205,6 @@
     invoke-direct {v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;-><init>(Lrx/Observable;)V
 
     return-object v0
-
-    :cond_0
-    const-string v0, "modelClass"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final getChannelId()Ljava/lang/Long;
@@ -253,23 +248,51 @@
 
     move-object v0, p1
 
-    const/4 v1, 0x0
+    const-string v1, "storeUser"
 
-    if-eqz v0, :cond_7
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_6
+    const-string v1, "storeChannels"
 
-    if-eqz p3, :cond_5
+    move-object v4, p2
 
-    if-eqz p4, :cond_4
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_3
+    const-string v1, "storeGuilds"
 
-    if-eqz p6, :cond_2
+    move-object v5, p3
 
-    if-eqz p7, :cond_1
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_0
+    const-string v1, "storeUserPresence"
+
+    move-object/from16 v6, p4
+
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "storeUserProfile"
+
+    move-object/from16 v8, p5
+
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "storeUserSettings"
+
+    move-object/from16 v10, p6
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "storeExperiments"
+
+    move-object/from16 v9, p7
+
+    invoke-static {v9, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "streamContextService"
+
+    move-object/from16 v7, p8
+
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreUser;->observeMe()Lrx/Observable;
 
@@ -281,7 +304,7 @@
 
     invoke-direct {v2, p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;Lcom/discord/stores/StoreUser;)V
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -291,101 +314,15 @@
 
     move-object v3, p0
 
-    move-object v4, p2
-
-    move-object v5, p3
-
-    move-object/from16 v6, p4
-
-    move-object/from16 v7, p8
-
-    move-object/from16 v8, p5
-
-    move-object/from16 v9, p7
-
-    move-object/from16 v10, p6
-
     invoke-direct/range {v2 .. v10}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreUserPresence;Lcom/discord/utilities/streams/StreamContextService;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StoreUserSettings;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "storeUser.observeMe()\n  \u2026            }\n          }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    move-object v11, p0
-
-    const-string v0, "streamContextService"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    move-object v11, p0
-
-    const-string v0, "storeExperiments"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_2
-    move-object v11, p0
-
-    const-string v0, "storeUserSettings"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    move-object v11, p0
-
-    const-string v0, "storeUserProfile"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    move-object v11, p0
-
-    const-string v0, "storeUserPresence"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    move-object v11, p0
-
-    const-string v0, "storeGuilds"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    move-object v11, p0
-
-    const-string v0, "storeChannels"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_7
-    move-object v11, p0
-
-    const-string v0, "storeUser"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState.smali
index 8804cdaeae..ca0f4001dc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState.smali
@@ -62,17 +62,25 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "me"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "user"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "computedMembers"
 
-    if-eqz p7, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "winnerBadgeExperiment"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -93,41 +101,6 @@
     iput-boolean p8, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->allowAnimatedEmojis:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "winnerBadgeExperiment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "userProfile"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "computedMembers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/util/Map;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Lcom/discord/stores/StoreExperiments$Experiment;ZILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
@@ -352,76 +325,49 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "me"
 
-    if-eqz p1, :cond_4
+    move-object v2, p1
 
-    if-eqz p2, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string v0, "user"
 
-    if-eqz p6, :cond_1
+    move-object v3, p2
 
-    if-eqz p7, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "computedMembers"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "winnerBadgeExperiment"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
     move-object v5, p4
 
     move-object v6, p5
 
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
     move/from16 v9, p8
 
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Ljava/util/Map;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Lcom/discord/stores/StoreExperiments$Experiment;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "winnerBadgeExperiment"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "userProfile"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "computedMembers"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "me"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -439,7 +385,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -449,7 +395,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -459,7 +405,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->computedMembers:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -469,7 +415,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -479,7 +425,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -489,7 +435,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -499,7 +445,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;->winnerBadgeExperiment:Lcom/discord/stores/StoreExperiments$Experiment;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded.smali
index bb531872bc..f7293a8119 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded.smali
@@ -36,12 +36,16 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZIZ)V
     .locals 1
 
+    const-string v0, "user"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_1
-
-    if-eqz p5, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->user:Lcom/discord/models/domain/ModelUser;
@@ -61,20 +65,6 @@
     iput-boolean p8, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->allowAnimatedEmojis:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "userProfile"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZIZILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;
@@ -272,26 +262,28 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZIZ)Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "user"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p5, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userProfile"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-object v3, p2
 
     move-object v4, p3
 
     move-object v5, p4
 
-    move-object v6, p5
-
     move/from16 v7, p6
 
     move/from16 v8, p7
@@ -301,20 +293,6 @@
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZIZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "userProfile"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -332,7 +310,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -342,7 +320,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->userNickname:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -352,7 +330,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -362,7 +340,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -372,7 +350,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
index 4713d17afe..68831e0f52 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "UserProfileHeaderViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;",
         ">;"
     }
@@ -54,18 +54,20 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeObservable"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Uninitialized;
+    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Uninitialized;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -74,6 +76,10 @@
 
     const-class v3, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;
 
+    new-instance v8, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -82,10 +88,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -93,13 +95,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$StoreState;)V
@@ -202,7 +197,7 @@
 
     invoke-direct/range {v2 .. v10}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;ZIZ)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder.smali
index fd603054ff..1d5b66078f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "placeholderEmoji"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder;->placeholderEmoji:Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
 
     return-void
-
-    :cond_0
-    const-string p1, "placeholderEmoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder;Lcom/discord/models/domain/emoji/ModelEmojiUnicode;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;)Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "placeholderEmoji"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder;-><init>(Lcom/discord/models/domain/emoji/ModelEmojiUnicode;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "placeholderEmoji"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithPlaceholder;->placeholderEmoji:Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithStatus.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithStatus.smali
index fc10012c8f..107353408a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithStatus.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithStatus.smali
@@ -102,7 +102,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithStatus;->emoji:Lcom/discord/models/domain/ModelMessageReaction$Emoji;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -112,7 +112,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithStatus;->statusText:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$configurePlaceholderEmoji$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$configurePlaceholderEmoji$1.smali
index f068a6ce2f..9a1dc9e1ee 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$configurePlaceholderEmoji$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView$configurePlaceholderEmoji$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$configurePlaceholderEmoji$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "UserStatusPresenceCustomView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/facebook/imagepipeline/request/ImageRequestBuilder;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,7 +71,9 @@
 .method public final invoke(Lcom/facebook/imagepipeline/request/ImageRequestBuilder;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;->access$getCUSTOM_EMOJI_PLACEHOLDER_POSTPROCESSOR$cp()Lcom/discord/utilities/fresco/GrayscalePostprocessor;
 
@@ -80,13 +82,4 @@
     iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->j:Lf/g/j/q/b;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali
index 81517eac32..04906792f9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali
@@ -36,61 +36,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;
+    const-string v2, "emojiView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmojiView()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "emojiView"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getEmojiView()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;
 
-    const/4 v2, 0x0
+    const-string v2, "statusTextView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getStatusTextView()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "statusTextView"
-
-    const-string v4, "getStatusTextView()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;
 
-    const-class v2, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;
+    const-string v2, "clearButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getClearButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "clearButton"
-
-    const-string v4, "getClearButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -118,15 +100,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a0a1e
+    const p2, 0x7f0a0a22
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -134,7 +118,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;->emojiView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a1f
+    const p2, 0x7f0a0a23
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -142,7 +126,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;->statusTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a1d
+    const p2, 0x7f0a0a21
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -155,20 +139,6 @@
     invoke-static {p1, p2, p0}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getCUSTOM_EMOJI_PLACEHOLDER_POSTPROCESSOR$cp()Lcom/discord/utilities/fresco/GrayscalePostprocessor;
@@ -241,52 +211,47 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
 
     invoke-virtual {p0}, Landroid/widget/LinearLayout;->getResources()Landroid/content/res/Resources;
 
-    move-result-object v1
+    move-result-object v0
 
-    const v2, 0x7f070082
+    const v1, 0x7f070082
 
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
-    move-result v1
+    move-result v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->getId()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_1
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    const-string v0, "emoji.id!!"
+    const-string v2, "emoji.id!!"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+    invoke-static {v1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
 
-    move-result-wide v2
+    move-result-wide v1
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageReaction$Emoji;->isAnimated()Z
 
     move-result p1
 
-    invoke-static {v1}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
+    invoke-static {v0}, Lcom/discord/utilities/icon/IconUtils;->getMediaProxySize(I)I
 
     move-result v0
 
-    invoke-static {v2, v3, p1, v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->getImageUri(JZI)Ljava/lang/String;
+    invoke-static {v1, v2, p1, v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->getImageUri(JZI)Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getEmojis()Lcom/discord/stores/StoreEmoji;
@@ -307,7 +272,7 @@
 
     check-cast p1, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->getCodePoints()Ljava/lang/String;
 
@@ -321,7 +286,7 @@
 
     move-result-object v0
 
-    :cond_3
+    :cond_2
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;->getEmojiView()Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -353,21 +318,21 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_3
 
     const/4 v0, 0x1
 
     goto :goto_1
 
-    :cond_4
+    :cond_3
     const/4 v0, 0x0
 
     :goto_1
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_4
 
     goto :goto_2
 
-    :cond_5
+    :cond_4
     const/16 v1, 0x8
 
     :goto_2
@@ -449,7 +414,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onClear"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView;->getClearButton()Landroid/widget/ImageView;
 
@@ -462,21 +429,14 @@
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onClear"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateViewState(Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p1, Lcom/discord/widgets/user/profile/UserStatusPresenceCustomView$ViewState$WithStatus;
 
@@ -527,7 +487,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120531
+    const v0, 0x7f120533
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
@@ -542,13 +502,4 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
index 7d61543897..b325c2fd08 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
@@ -48,7 +48,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a09d9
+    const p2, 0x7f0a09dd
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -58,7 +58,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a09da
+    const p2, 0x7f0a09de
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/ChannelFrecencyTracker.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/ChannelFrecencyTracker.smali
index f43535ef2b..12c121271b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/ChannelFrecencyTracker.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/ChannelFrecencyTracker.smali
@@ -55,7 +55,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "$this$computeScore"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -118,13 +120,4 @@
 
     :cond_1
     return v1
-
-    :cond_2
-    const-string p1, "$this$computeScore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali
index 939067b7ea..b167917ff5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/ViewGlobalSearchItem$onConfigure$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ViewGlobalSearchItem.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/CharSequence;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     const-string v0, "it.getUserNameWithDiscri\u2026ator(discrimColor, 0.75f)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
index 6bef38ca93..e93164f548 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
@@ -29,121 +29,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
-    const-class v2, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
+    const-string v2, "iconIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "iconIv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
-    const/4 v2, 0x0
+    const-string v2, "nameTv"
 
-    aput-object v1, v0, v2
+    const-string v3, "getNameTv()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "nameTv"
-
-    const-string v4, "getNameTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
-    const-class v2, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
+    const-string v2, "descriptionTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDescriptionTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "descriptionTv"
-
-    const-string v4, "getDescriptionTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
-    const-class v2, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
+    const-string v2, "groupTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGroupTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "groupTv"
-
-    const-string v4, "getGroupTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
-    const-class v2, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
+    const-string v2, "mentionsTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMentionsTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mentionsTv"
-
-    const-string v4, "getMentionsTv()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
-    const-class v2, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
+    const-string v2, "unreadIv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUnreadIv()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "unreadIv"
-
-    const-string v4, "getUnreadIv()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -195,13 +159,15 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a0554
+    const p1, 0x7f0a055a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +175,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056d
+    const p1, 0x7f0a0573
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +183,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->nameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0534
+    const p1, 0x7f0a053a
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +191,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->descriptionTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a054a
+    const p1, 0x7f0a0550
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +199,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->groupTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a056c
+    const p1, 0x7f0a0572
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +207,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->mentionsTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0570
+    const p1, 0x7f0a0576
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -258,15 +224,6 @@
     invoke-static {p1, p2, p0}, Landroid/view/ViewGroup;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -464,58 +421,60 @@
 .method public final configure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$configure"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getMentions()I
 
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
     move-result v1
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const/4 v2, 0x0
 
-    move-result-object v1
+    if-lez v1, :cond_0
 
-    invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
-
-    move-result v2
-
-    const/4 v3, 0x0
-
-    if-lez v2, :cond_0
-
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :goto_0
-    if-eqz v2, :cond_1
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_1
 
     goto :goto_1
 
     :cond_1
-    move-object v1, v0
+    move-object v0, v3
 
     :goto_1
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v3
 
     :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getMentionsTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v0, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getUnreadIv()Landroid/widget/ImageView;
 
@@ -530,43 +489,38 @@
     goto :goto_2
 
     :cond_3
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
     :goto_2
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_4
-    const-string p1, "$this$configure"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;)V
     .locals 14
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->configure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v0}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/interfaces/DraweeController;)V
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/facebook/drawee/view/DraweeView;->setController(Lcom/facebook/drawee/interfaces/DraweeController;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
-    move-result v1
+    move-result v0
 
     const/4 v2, 0x3
 
@@ -574,32 +528,32 @@
 
     const/4 v4, 0x1
 
-    if-eq v1, v4, :cond_1
+    if-eq v0, v4, :cond_1
 
     const/4 v5, 0x4
 
-    if-eq v1, v3, :cond_0
+    if-eq v0, v3, :cond_0
 
-    if-eq v1, v2, :cond_1
+    if-eq v0, v2, :cond_1
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const v6, 0x7f080262
+    const v6, 0x7f080263
 
-    invoke-static {v1, v6, v0, v5, v0}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static {v0, v6, v1, v5, v1}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getIconIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v1
+    move-result-object v0
 
-    const v6, 0x7f08026c
+    const v6, 0x7f08026d
 
-    invoke-static {v1, v6, v0, v5, v0}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+    invoke-static {v0, v6, v1, v5, v1}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     goto :goto_0
 
@@ -625,7 +579,7 @@
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getGroupTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -640,14 +594,14 @@
     goto :goto_1
 
     :cond_2
-    move-object v5, v0
+    move-object v5, v1
 
     :goto_1
-    invoke-static {v1, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v0, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getNameTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getMatchedResult()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
@@ -663,35 +617,35 @@
 
     const-string v7, "data.channel.name"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v5, v6}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->toStyledText(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Ljava/lang/String;)Ljava/lang/CharSequence;
 
     move-result-object v5
 
-    invoke-virtual {v1, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_6
+    if-eqz v0, :cond_6
 
     const/16 v5, 0x8
 
-    if-eq v1, v4, :cond_4
+    if-eq v0, v4, :cond_4
 
-    if-eq v1, v3, :cond_6
+    if-eq v0, v3, :cond_6
 
-    if-eq v1, v2, :cond_3
+    if-eq v0, v2, :cond_3
 
     const/4 v2, 0x5
 
-    if-eq v1, v2, :cond_6
+    if-eq v0, v2, :cond_6
 
     goto/16 :goto_2
 
@@ -720,7 +674,7 @@
 
     const-string p1, "data.channel.recipients"
 
-    invoke-static {v6, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v7, 0x0
 
@@ -738,7 +692,7 @@
 
     const/16 v13, 0x1f
 
-    invoke-static/range {v6 .. v13}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v6 .. v13}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -763,13 +717,13 @@
     :cond_4
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getDescriptionTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v5}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v5}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getGroupTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -781,35 +735,35 @@
 
     if-eqz p1, :cond_5
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_5
-    invoke-static {v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     goto :goto_2
 
     :cond_6
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getDescriptionTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getParentChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -819,10 +773,10 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v1
 
     :cond_7
-    invoke-static {v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getDescriptionTv()Landroid/widget/TextView;
 
@@ -832,21 +786,14 @@
 
     :goto_2
     return-void
-
-    :cond_8
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->configure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
@@ -858,6 +805,8 @@
 
     move-result-object v2
 
+    const-string v3, "asset://asset/images/default_icon.jpg"
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -866,8 +815,6 @@
 
     const/4 v7, 0x0
 
-    const-string v3, "asset://asset/images/default_icon.jpg"
-
     invoke-static/range {v2 .. v7}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object v2
@@ -882,11 +829,11 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getNameTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getMatchedResult()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -896,20 +843,22 @@
 
     move-result-object p1
 
-    const-string v3, "data.guild.name"
+    const-string v2, "data.guild.name"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v2, p1}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->toStyledText(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Ljava/lang/String;)Ljava/lang/CharSequence;
+    invoke-direct {p0, v1, p1}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->toStyledText(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Ljava/lang/String;)Ljava/lang/CharSequence;
 
     move-result-object p1
 
-    invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getGroupTv()Landroid/widget/TextView;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     invoke-static {p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getDescriptionTv()Landroid/widget/TextView;
@@ -919,21 +868,14 @@
     invoke-static {p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;)V
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->configure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
@@ -959,15 +901,15 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->isFriend()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getGroupTv()Landroid/widget/TextView;
 
     move-result-object v0
 
-    const v1, 0x7f1207b4
+    const v1, 0x7f1207b6
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -976,9 +918,11 @@
     :cond_0
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getGroupTv()Landroid/widget/TextView;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->getNameTv()Landroid/widget/TextView;
@@ -1023,7 +967,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v1}, Lk0/j/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1049,7 +993,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2}, Lj0/i/l;->drop(Ljava/lang/Iterable;I)Ljava/util/List;
+    invoke-static {v1, v2}, Lk0/j/l;->drop(Ljava/lang/Iterable;I)Ljava/util/List;
 
     move-result-object v1
 
@@ -1085,7 +1029,7 @@
 
     move-result-object v6
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -1112,18 +1056,11 @@
 
     const/16 v10, 0x3f
 
-    invoke-static/range {v3 .. v10}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    invoke-static/range {v3 .. v10}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
 
     move-result-object p1
 
     invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
index ce34e6dd19..5d4bd2bd14 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
@@ -67,7 +67,7 @@
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    const v1, 0x7f121761
+    const v1, 0x7f12178b
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -89,7 +89,7 @@
 
     const/4 v1, 0x1
 
-    const v2, 0x7f1215af
+    const v2, 0x7f1215d9
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -109,7 +109,7 @@
 
     const/4 v1, 0x2
 
-    const v2, 0x7f1217c4
+    const v2, 0x7f1217f0
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -129,7 +129,7 @@
 
     const/4 v1, 0x3
 
-    const v2, 0x7f12145e
+    const v2, 0x7f121488
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -243,13 +243,13 @@
 
     const-string v0, "channel.dmRecipient"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object v8
 
-    sget-object v5, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v5, Lk0/j/n;->d:Lk0/j/n;
 
     const/4 v6, 0x0
 
@@ -324,7 +324,9 @@
 .method public final dismiss(Landroidx/fragment/app/FragmentManager;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "javaClass"
 
@@ -344,21 +346,14 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearch$Companion;->dismiss(Landroidx/fragment/app/FragmentManager;)V
 
@@ -385,13 +380,4 @@
     invoke-virtual {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->quickSwitcherOpen()V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali
index 704a94f00b..c73d54c7c4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1.smali
@@ -64,11 +64,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string p1, "<anonymous parameter 1>"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
@@ -82,7 +84,7 @@
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -112,18 +114,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali
index 859b0330f3..5473f3554d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Landroid/view/View;",
         "Ljava/lang/Integer;",
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x4
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -82,11 +82,13 @@
 .method public final invoke(Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
@@ -103,18 +105,4 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->access$handleOnSelected(Lcom/discord/widgets/user/search/WidgetGlobalSearch;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
index c5fc43edf9..3dc22091a3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Integer;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
     .locals 10
 
-    if-eqz p3, :cond_3
+    const-string p2, "data"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p2, 0x2
 
@@ -98,7 +100,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
@@ -139,7 +141,7 @@
 
     move-result-object p2
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->getId()J
 
@@ -149,13 +151,4 @@
 
     :goto_1
     return-void
-
-    :cond_3
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali
index 5fed05ed8b..b45588105b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Integer;",
@@ -45,7 +45,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -79,7 +79,9 @@
 .method public final invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
     .locals 8
 
-    if-eqz p3, :cond_3
+    const-string v0, "selected"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -158,13 +160,4 @@
     invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->access$onSelected(Lcom/discord/widgets/user/search/WidgetGlobalSearch;Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/stores/StoreNavigation$PanelAction;)V
 
     return-void
-
-    :cond_3
-    const-string p1, "selected"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali
index 2fb264e058..f51fc1346a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/text/Editable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "editable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$1;->this$0:Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
@@ -76,13 +78,4 @@
     invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "editable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali
index a9e497826d..cd1472b9ba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$5.smali
@@ -35,7 +35,7 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 10
+    .locals 9
 
     sget-object v0, Lcom/discord/widgets/friends/WidgetFriendsAdd;->Companion:Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;
 
@@ -43,7 +43,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
@@ -63,67 +63,79 @@
 
     fill-array-data v3, :array_0
 
-    const/4 v4, 0x0
+    const-string v4, "$this$trimStart"
 
-    if-eqz v1, :cond_5
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "chars"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
-    move-result v5
+    move-result v4
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     :goto_0
-    if-ge v6, v5, :cond_4
+    if-ge v5, v4, :cond_4
 
-    invoke-virtual {v1, v6}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v1, v5}, Ljava/lang/String;->charAt(I)C
 
-    move-result v7
+    move-result v6
 
-    const/4 v8, 0x0
+    const-string v7, "$this$contains"
+
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "$this$indexOf"
+
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v7, 0x0
 
     :goto_1
-    if-ge v8, v2, :cond_1
+    if-ge v7, v2, :cond_1
 
-    aget-char v9, v3, v8
+    aget-char v8, v3, v7
 
-    if-ne v7, v9, :cond_0
+    if-ne v6, v8, :cond_0
 
     goto :goto_2
 
     :cond_0
-    add-int/lit8 v8, v8, 0x1
+    add-int/lit8 v7, v7, 0x1
 
     goto :goto_1
 
     :cond_1
-    const/4 v8, -0x1
+    const/4 v7, -0x1
 
     :goto_2
-    if-ltz v8, :cond_2
+    if-ltz v7, :cond_2
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     goto :goto_3
 
     :cond_2
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     :goto_3
-    if-nez v7, :cond_3
+    if-nez v6, :cond_3
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
     move-result v2
 
-    invoke-virtual {v1, v6, v2}, Ljava/lang/String;->subSequence(II)Ljava/lang/CharSequence;
+    invoke-virtual {v1, v5, v2}, Ljava/lang/String;->subSequence(II)Ljava/lang/CharSequence;
 
     move-result-object v1
 
     goto :goto_4
 
     :cond_3
-    add-int/lit8 v6, v6, 0x1
+    add-int/lit8 v5, v5, 0x1
 
     goto :goto_0
 
@@ -145,17 +157,12 @@
 
     const/4 v1, 0x2
 
-    invoke-static {p1, v0, v4, v1, v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->onSelected$default(Lcom/discord/widgets/user/search/WidgetGlobalSearch;Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/stores/StoreNavigation$PanelAction;ILjava/lang/Object;)V
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v2, v1, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->onSelected$default(Lcom/discord/widgets/user/search/WidgetGlobalSearch;Lcom/discord/widgets/tabs/NavigationTab;Lcom/discord/stores/StoreNavigation$PanelAction;ILjava/lang/Object;)V
 
     return-void
 
-    :cond_5
-    const-string p1, "$this$trimStart"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
     nop
 
     :array_0
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali
index 8819081ffc..b0cba72b84 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.smali
@@ -41,7 +41,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -49,7 +49,7 @@
 
     const-string v1, "it.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "QuickSwitcher"
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali
index 304eced503..9ff651de4a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGlobalSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearch;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->access$configureUI(Lcom/discord/widgets/user/search/WidgetGlobalSearch;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali
index 18f9234d9d..2cc7f14fe6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch$onViewBoundOrOnResume$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali
index f0a95a229a..cf32e34bcc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearch.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch.smali
index 89c1c42da4..368867af5a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch.smali
@@ -65,121 +65,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
-    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
+    const-string v2, "resultsList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getResultsList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "resultsList"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getResultsList()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
-    const/4 v2, 0x0
+    const-string v2, "guildList"
 
-    aput-object v1, v0, v2
+    const-string v3, "getGuildList()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "guildList"
-
-    const-string v4, "getGuildList()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
-    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
+    const-string v2, "viewFlipper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getViewFlipper()Landroid/widget/ViewFlipper;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "viewFlipper"
-
-    const-string v4, "getViewFlipper()Landroid/widget/ViewFlipper;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
-    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
+    const-string v2, "addAFriendBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAddAFriendBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "addAFriendBtn"
-
-    const-string v4, "getAddAFriendBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
-    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
+    const-string v2, "joinGuildBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getJoinGuildBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "joinGuildBtn"
-
-    const-string v4, "getJoinGuildBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
 
-    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearch;
+    const-string v2, "searchInput"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "searchInput"
-
-    const-string v4, "getSearchInput()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -203,7 +167,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a040e
+    const v0, 0x7f0a0414
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -211,7 +175,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->resultsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a040c
+    const v0, 0x7f0a0412
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +183,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->guildList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a040f
+    const v0, 0x7f0a0415
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -227,7 +191,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a040a
+    const v0, 0x7f0a0410
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -235,7 +199,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->addAFriendBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a040d
+    const v0, 0x7f0a0413
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -243,7 +207,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->joinGuildBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a040b
+    const v0, 0x7f0a0411
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -376,7 +340,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v3, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     invoke-virtual {v0, v3}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
@@ -417,7 +381,9 @@
 
     move-result v1
 
-    xor-int/lit8 v1, v1, 0x1
+    if-nez v1, :cond_1
+
+    const/4 v1, 0x1
 
     goto :goto_1
 
@@ -472,22 +438,22 @@
     :cond_3
     const-string p1, "resultsAdapter"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_4
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_5
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_6
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -638,7 +604,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result p1
 
@@ -688,7 +654,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v7, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v8, 0x0
 
@@ -717,7 +683,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v2, v0
 
@@ -750,7 +716,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v2, v0
 
@@ -952,6 +918,10 @@
     goto :goto_2
 
     :cond_1
+    const-string v1, "$this$first"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
 
     move-result v1
@@ -1010,9 +980,9 @@
     :goto_2
     const-string v0, "newQuery"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -1106,9 +1076,9 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f1206ab
+    const v3, 0x7f1206ad
 
     invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -1116,7 +1086,7 @@
 
     const-string v4, "getString(R.string.filter_options)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v4, Lcom/discord/widgets/user/search/WidgetGlobalSearch$showFilterPickerDialog$1;
 
@@ -1127,11 +1097,11 @@
     return-void
 
     :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type kotlin.Array<T>"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -1224,7 +1194,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -1348,15 +1320,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -1370,7 +1333,7 @@
 
     const-string v2, "filterPublisher"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getForNav(Lrx/Observable;)Lrx/Observable;
 
@@ -1432,7 +1395,7 @@
 
     const-string v1, "StoreStream\n        .get\u2026hanged()\n        .skip(1)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x2
 
@@ -1450,7 +1413,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->filterPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -1461,7 +1424,7 @@
     :cond_0
     const-string v0, "resultsAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali
index e58bb8307a..a693951696 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$ChannelViewHolder.smali
@@ -16,30 +16,25 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -52,15 +47,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali
index aa45cab8e1..7cb4474ca9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$GuildViewHolder.smali
@@ -16,30 +16,25 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -52,15 +47,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali
index d8704f3156..8beca434dd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder.smali
@@ -30,25 +30,19 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder;
 
-    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder;
+    const-string v2, "headerTv"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderTv()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "headerTv"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getHeaderTv()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
+    aput-object v1, v0, v4
 
     sput-object v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -58,13 +52,15 @@
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d016e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    const p1, 0x7f0a0553
+    const p1, 0x7f0a0559
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -73,15 +69,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$HeaderViewHolder;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getHeaderTv()Landroid/widget/TextView;
@@ -107,9 +94,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -126,15 +115,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali
index 9fd2b06db1..3fef2f7631 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$1.smali
@@ -63,15 +63,15 @@
 
     const-string v1, "view"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "index"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "data"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali
index f5531a19eb..a2552ba962 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item$2.smali
@@ -63,15 +63,15 @@
 
     const-string v1, "view"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "index"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "data"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali
index a2fc14b419..999114253e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item.smali
@@ -31,7 +31,9 @@
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -54,13 +56,4 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali
index fd8ab63835..fdf2e1a3f9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder.smali
@@ -22,7 +22,9 @@
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d016d
 
@@ -43,20 +45,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type com.discord.widgets.user.search.ViewGlobalSearchItem"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali
index 81a1f2734b..095c177f6c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$UserViewHolder.smali
@@ -16,30 +16,25 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$SearchViewHolder;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -52,15 +47,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali
index a26a304253..ead16bfb1c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$onSelectedListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function4<",
         "Landroid/view/View;",
         "Ljava/lang/Integer;",
@@ -52,7 +52,7 @@
 
     const/4 v0, 0x4
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -88,25 +88,13 @@
 .method public final invoke(Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
     .locals 0
 
-    const/4 p2, 0x0
+    const-string p2, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 2>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p2
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali
index ff0af95359..08d452fd21 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.smali
@@ -46,9 +46,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -57,15 +59,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->onSelectedListener:Lkotlin/jvm/functions/Function4;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -101,9 +94,11 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_4
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, -0x1
 
@@ -153,19 +148,10 @@
 
     :goto_0
     return-object p1
-
-    :cond_4
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnSelectedListener(Lkotlin/jvm/functions/Function4;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -183,18 +169,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->onSelectedListener:Lkotlin/jvm/functions/Function4;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$1.smali
index 1ac88e4639..5eddbdc1dc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$1.smali
@@ -77,11 +77,11 @@
 
     const-string v1, "position"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "data"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v0, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$2.smali
index 9cb6621847..f0a58dbfe5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item$2.smali
@@ -77,11 +77,11 @@
 
     const-string v1, "position"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v1, "data"
 
-    invoke-static {p3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1, v0, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
index bf54981fc8..d8f41bd4fb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
@@ -31,7 +31,9 @@
         .end annotation
     .end param
 
-    if-eqz p2, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -54,15 +56,6 @@
     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->setOnLongClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -70,17 +63,19 @@
 .method public final configureMentionsCount(Landroid/widget/TextView;I)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "textView"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    if-ge p2, v1, :cond_0
+    const/4 v1, 0x0
 
-    invoke-static {p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    if-ge p2, v0, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-static {p1, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
 
@@ -101,40 +96,33 @@
 
     const-string v4, "context"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v4, 0x7f0403d8
 
     const/4 v5, 0x2
 
-    invoke-static {v3, v4, v2, v5, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {v3, v4, v2, v5, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
-    move-result v0
+    move-result v1
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setBackgroundResource(I)V
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
-    const v0, 0x7f120ece
+    const v1, 0x7f120ef4
 
-    new-array v1, v1, [Ljava/lang/Object;
+    new-array v0, v0, [Ljava/lang/Object;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
     move-result-object p2
 
-    aput-object p2, v1, v2
+    aput-object p2, v0, v2
 
-    invoke-virtual {v3, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v3, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p2
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "textView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali
index 5c01814946..cd0a71fe22 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage.smali
@@ -26,7 +26,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage;
 
@@ -34,41 +34,29 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemIcon"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemIcon()Landroid/widget/ImageView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemIcon"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemIcon()Landroid/widget/ImageView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemCount"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemCount()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
-
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemCount"
+    const/4 v2, 0x1
 
-    const-string v4, "getItemCount()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x1
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -76,13 +64,15 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;)V
 
-    const p1, 0x7f0a04af
+    const p1, 0x7f0a04b5
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -90,7 +80,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage;->itemIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b0
+    const p1, 0x7f0a04b6
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -99,15 +89,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDirectMessage;->itemCount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getItemCount()Landroid/widget/TextView;
@@ -155,7 +136,9 @@
 .method public onConfigure(ILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
     .locals 7
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -188,15 +171,6 @@
     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelChannel;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDivider.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDivider.smali
index 55f90a9408..9b71ecf082 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDivider.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemDivider.smali
@@ -16,20 +16,13 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali
index 971a408a1f..24f0e67d7c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali
@@ -36,7 +36,7 @@
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 6
+    .locals 5
 
     const-class v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;
 
@@ -44,113 +44,77 @@
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemAvatar"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
 
-    move-result-object v3
+    const/4 v4, 0x0
 
-    const-string v4, "itemAvatar"
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v5, "getItemAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
+    move-result-object v2
 
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v2, v1, v4
 
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-string v2, "itemAvatarText"
 
-    const/4 v3, 0x0
+    const-string v3, "getItemAvatarText()Landroid/widget/TextView;"
 
-    aput-object v2, v1, v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    new-instance v2, Lj0/n/c/q;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v3
-
-    const-string v4, "itemAvatarText"
-
-    const-string v5, "getItemAvatarText()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemMentions"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemMentions()Landroid/widget/TextView;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemMentions"
-
-    const-string v5, "getItemMentions()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemVoice"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemVoice()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemVoice"
-
-    const-string v5, "getItemVoice()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemUnread"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemUnread()Landroid/view/View;"
 
-    move-result-object v3
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "itemUnread"
-
-    const-string v5, "getItemUnread()Landroid/view/View;"
-
-    invoke-direct {v2, v3, v4, v5}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v2
 
     const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
-    new-instance v2, Lj0/n/c/q;
+    const-string v2, "itemSelected"
 
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getItemSelected()Landroid/view/View;"
+
+    invoke-static {v0, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
     move-result-object v0
 
-    const-string v3, "itemSelected"
+    const/4 v2, 0x5
 
-    const-string v4, "getItemSelected()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v0, 0x5
-
-    aput-object v2, v1, v0
+    aput-object v0, v1, v2
 
     sput-object v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -158,19 +122,21 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;II)V
-    .locals 0
+    .locals 1
     .param p3    # I
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;)V
 
     iput p3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->overlayColor:I
 
-    const p1, 0x7f0a04ac
+    const p1, 0x7f0a04b2
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -178,7 +144,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04ad
+    const p1, 0x7f0a04b3
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -186,7 +152,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemAvatarText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b4
+    const p1, 0x7f0a04ba
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -194,7 +160,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04ba
+    const p1, 0x7f0a04c0
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -202,7 +168,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b9
+    const p1, 0x7f0a04bf
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -210,7 +176,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemUnread$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04b8
+    const p1, 0x7f0a04be
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,15 +185,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->itemSelected$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getItemAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
@@ -353,11 +310,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_7
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -365,9 +322,9 @@
 
     move-result-object p1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_1
 
@@ -391,7 +348,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    if-ne p1, v1, :cond_1
+    if-ne p1, v0, :cond_1
 
     invoke-virtual {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -401,41 +358,41 @@
 
     move-result-object p1
 
-    const-string v3, "ICON_UNSET"
+    const-string v2, "ICON_UNSET"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
-    xor-int/2addr p1, v1
+    xor-int/2addr p1, v0
 
     if-eqz p1, :cond_1
 
     goto :goto_1
 
     :cond_1
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_1
     invoke-direct {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->getItemAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    move-result-object v3
+    move-result-object v2
 
     invoke-virtual {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->isSelected()Z
 
-    move-result v4
+    move-result v3
 
     invoke-virtual {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v5
+    move-result-object v4
 
     iget p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->overlayColor:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v8
+    move-result-object v7
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->getItemAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -445,44 +402,48 @@
 
     move-result-object p1
 
-    const v6, 0x7f0700d1
+    const v5, 0x7f0700d1
 
-    invoke-virtual {p1, v6}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+    invoke-virtual {p1, v5}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
 
     move-result p1
 
-    int-to-float v6, p1
+    int-to-float v5, p1
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    const/16 v10, 0x28
+    const/16 v9, 0x28
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
-    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/extensions/SimpleDraweeViewExtensionsKt;->configureAsGuildIcon$default(Lcom/facebook/drawee/view/SimpleDraweeView;ZLcom/discord/models/domain/ModelGuild;FLjava/lang/Integer;Ljava/lang/Integer;ZILjava/lang/Object;)V
+    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/extensions/SimpleDraweeViewExtensionsKt;->configureAsGuildIcon$default(Lcom/facebook/drawee/view/SimpleDraweeView;ZLcom/discord/models/domain/ModelGuild;FLjava/lang/Integer;Ljava/lang/Integer;ZILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->getItemAvatarText()Landroid/widget/TextView;
 
     move-result-object p1
 
-    if-eqz v1, :cond_2
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_2
 
     goto :goto_2
 
     :cond_2
     invoke-virtual {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
 
     move-result-object v0
 
+    move-object v2, v0
+
     :cond_3
     :goto_2
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild;->getItemMentions()Landroid/widget/TextView;
 
@@ -502,7 +463,7 @@
 
     move-result v0
 
-    const/16 v1, 0x8
+    const/16 v2, 0x8
 
     if-eqz v0, :cond_4
 
@@ -549,19 +510,12 @@
     goto :goto_5
 
     :cond_6
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_5
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
-
-    :cond_7
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali
index b77fd93604..22bf34343b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onClickListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchGuildsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Integer;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -85,16 +85,9 @@
 .method public final invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
     .locals 0
 
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 2>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali
index 385daab5e7..3ed4e2cc62 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$onLongClickListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchGuildsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Integer;",
         "Ljava/lang/Integer;",
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x3
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -85,16 +85,9 @@
 .method public final invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
     .locals 0
 
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "<anonymous parameter 2>"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali
index 5d3570a2f1..7706736073 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.smali
@@ -60,13 +60,15 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;I)V
-    .locals 0
+    .locals 1
     .param p2    # I
         .annotation build Landroidx/annotation/ColorInt;
         .end annotation
     .end param
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -81,15 +83,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;->onLongClickListener:Lkotlin/jvm/functions/Function3;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -156,7 +149,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_3
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 
@@ -205,19 +200,10 @@
 
     :goto_0
     return-object p1
-
-    :cond_3
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnClickListener(Lkotlin/jvm/functions/Function3;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -233,24 +219,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;->onClickListener:Lkotlin/jvm/functions/Function3;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnLongClickListener(Lkotlin/jvm/functions/Function3;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -266,18 +245,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter;->onLongClickListener:Lkotlin/jvm/functions/Function3;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.smali
index 94d3d13d44..e4b2cefbf8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchGuildsModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1;->$mentionCounts:Ljava/util/Map;
 
@@ -117,13 +119,4 @@
     :cond_1
     :goto_0
     return v1
-
-    :cond_2
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$2.smali
index 44a8c19446..01f7fb3540 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchGuildsModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -49,7 +49,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item$Companion;
 
@@ -86,15 +88,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asGuildItems$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asGuildItems$1.smali
index 9ba41a8ac2..92cfb3dbed 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asGuildItems$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asGuildItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asGuildItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchGuildsModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;",
@@ -59,7 +59,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,7 +69,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
     .locals 12
 
-    if-eqz p1, :cond_9
+    const-string v0, "guild"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
@@ -136,7 +138,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {v4}, Lj0/i/l;->sumOfInt(Ljava/lang/Iterable;)I
+    invoke-static {v4}, Lk0/j/l;->sumOfInt(Ljava/lang/Iterable;)I
 
     move-result v4
 
@@ -278,15 +280,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_9
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$create$guildItems$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$create$guildItems$1.smali
index c02e749a5c..db8d1d5e7e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$create$guildItems$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$create$guildItems$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$create$guildItems$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchGuildsModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lcom/discord/models/domain/ModelGuild;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali
index 6ae91dcde9..4825c8a143 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion.smali
@@ -57,7 +57,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -79,7 +79,7 @@
 
     const-string v0, "ModelChannel.getSortByNameAndType()"
 
-    invoke-static {p3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p3}, Lf/n/a/k/a;->sortedWith(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
 
@@ -208,21 +208,37 @@
 
     move-object/from16 v7, p9
 
-    const/4 v10, 0x0
+    const-string v3, "recentGuildIds"
 
-    if-eqz v0, :cond_8
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_7
+    const-string v3, "unreadGuildIds"
 
-    if-eqz v8, :cond_6
+    move-object/from16 v6, p4
 
-    if-eqz v1, :cond_5
+    invoke-static {v6, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_4
+    const-string v3, "mentionCounts"
 
-    if-eqz p8, :cond_3
+    invoke-static {v8, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v7, :cond_2
+    const-string v3, "privateChannels"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "guilds"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "channelIds"
+
+    move-object/from16 v10, p8
+
+    invoke-static {v10, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "guildSettings"
+
+    invoke-static {v7, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v3, 0x0
 
@@ -242,7 +258,7 @@
 
     move-result-object v12
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -256,21 +272,35 @@
 
     move-result-object v1
 
-    invoke-static {p1, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {p1, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v0}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v0
 
-    invoke-static {v0}, Lf/n/a/k/a;->distinct(Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
+    const-string v1, "$this$distinct"
 
-    move-result-object v0
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lk0/t/o;->d:Lk0/t/o;
+
+    const-string v5, "$this$distinctBy"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "selector"
+
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Lk0/t/c;
+
+    invoke-direct {v5, v0, v1}, Lk0/t/c;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
 
     const/4 v13, 0x1
 
-    invoke-static {v0, v13}, Lf/n/a/k/a;->drop(Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
+    invoke-static {v5, v13}, Lf/n/a/k/a;->drop(Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
 
     move-result-object v0
 
@@ -288,12 +318,6 @@
 
     move-wide/from16 v4, p2
 
-    move-object/from16 v6, p4
-
-    move-object/from16 v7, p9
-
-    move-object/from16 v8, p5
-
     move-object/from16 v9, p8
 
     invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion;->asGuildItems(Lkotlin/sequences/Sequence;JJLjava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lkotlin/sequences/Sequence;
@@ -308,7 +332,9 @@
 
     move-result-object v0
 
-    if-eqz v12, :cond_1
+    const-string v1, "$this$any"
+
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v12}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
 
@@ -339,7 +365,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lj0/s/f;->a:Lj0/s/f;
+    sget-object v1, Lk0/t/f;->a:Lk0/t/f;
 
     :goto_0
     invoke-static {v12, v1}, Lf/n/a/k/a;->plus(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
@@ -350,89 +376,19 @@
 
     move-result-object v0
 
+    new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;
+
     invoke-static {v0}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
 
     move-result-object v0
 
     invoke-interface/range {p8 .. p8}, Ljava/util/Map;->isEmpty()Z
 
-    move-result v1
+    move-result v2
 
-    xor-int/2addr v1, v13
+    xor-int/2addr v2, v13
 
-    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;
+    invoke-direct {v1, v0, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;-><init>(Ljava/util/List;Z)V
 
-    invoke-direct {v2, v0, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;-><init>(Ljava/util/List;Z)V
-
-    return-object v2
-
-    :cond_1
-    const-string v0, "$this$any"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_2
-    move-object v11, p0
-
-    const-string v0, "guildSettings"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_3
-    move-object v11, p0
-
-    const-string v0, "channelIds"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_4
-    move-object v11, p0
-
-    const-string v0, "guilds"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_5
-    move-object v11, p0
-
-    const-string v0, "privateChannels"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_6
-    move-object v11, p0
-
-    const-string v0, "mentionCounts"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_7
-    move-object v11, p0
-
-    const-string v0, "unreadGuildIds"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_8
-    move-object v11, p0
-
-    const-string v0, "recentGuildIds"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
+    return-object v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item$Companion.smali
index dea177d052..99d8a735aa 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item$Companion.smali
@@ -36,19 +36,21 @@
 .method public final createDirectMessage$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelChannel;I)Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
     .locals 14
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
 
-    new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
+    move-object v5, p1
 
-    const/4 v1, 0x2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v2
+    move-result-wide v3
 
-    const/4 v5, 0x0
+    const/4 v2, 0x2
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     const/4 v8, 0x0
 
@@ -56,28 +58,19 @@
 
     const/4 v10, 0x0
 
-    const/16 v11, 0x1e8
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
+    const/16 v12, 0x1e8
 
-    move-object v0, v13
+    const/4 v13, 0x0
 
-    move-object v4, p1
+    move-object v1, v0
 
-    move/from16 v6, p2
+    move/from16 v7, p2
 
-    invoke-direct/range {v0 .. v12}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;-><init>(IJLcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v13}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;-><init>(IJLcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v13
-
-    :cond_0
-    const-string v0, "channel"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
+    return-object v0
 .end method
 
 .method public final createDivider$app_productionDiscordExternalRelease()Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
@@ -117,46 +110,39 @@
 .method public final createGuild$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelGuild;IZZZ)Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
     .locals 14
 
-    if-eqz p1, :cond_0
+    const-string v0, "guild"
 
-    new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
+    move-object v6, p1
 
-    const/4 v1, 0x3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v2
+    move-result-wide v3
 
-    const/4 v4, 0x0
+    const/4 v2, 0x3
 
-    const/4 v10, 0x0
+    const/4 v5, 0x0
 
-    const/16 v11, 0x104
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
+    const/16 v12, 0x104
 
-    move-object v0, v13
+    const/4 v13, 0x0
 
-    move-object v5, p1
+    move-object v1, v0
 
-    move/from16 v6, p2
+    move/from16 v7, p2
 
-    move/from16 v7, p3
+    move/from16 v8, p3
 
-    move/from16 v8, p4
+    move/from16 v9, p4
 
-    move/from16 v9, p5
+    move/from16 v10, p5
 
-    invoke-direct/range {v0 .. v12}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;-><init>(IJLcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v13}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;-><init>(IJLcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v13
-
-    :cond_0
-    const-string v0, "guild"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali
index 7710bbeb6f..6c0a4197ca 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item.smali
@@ -537,7 +537,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -547,7 +547,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.smali
index 525d7d38c4..f3c7495507 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.smali
@@ -46,7 +46,7 @@
 .end method
 
 .method public constructor <init>(Ljava/util/List;Z)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -56,7 +56,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -65,15 +67,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;->hasChannels:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -153,22 +146,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;-><init>(Ljava/util/List;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -186,7 +172,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;->items:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali
index 22b1a074ca..a39c33ed56 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext.smali
@@ -142,21 +142,33 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guilds"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "channels"
 
-    if-eqz p3, :cond_6
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_5
+    const-string v0, "channelPerms"
 
-    if-eqz p5, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_3
+    const-string v0, "channelsPrivate"
 
-    if-eqz p7, :cond_2
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildToChannels"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "unreadChannelIds"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "unreadGuildIds"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -234,55 +246,6 @@
     iput-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->smallGuildIds:Ljava/util/Set;
 
     return-void
-
-    :cond_2
-    const-string p1, "unreadGuildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "unreadChannelIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "guildToChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "channelsPrivate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "channelPerms"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "channels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "guilds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
@@ -532,92 +495,55 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "guilds"
 
-    if-eqz p1, :cond_6
+    move-object v2, p1
 
-    if-eqz p2, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "channels"
 
-    if-eqz p4, :cond_3
+    move-object v3, p2
 
-    if-eqz p5, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "channelPerms"
 
-    if-eqz p7, :cond_0
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "channelsPrivate"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildToChannels"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "unreadChannelIds"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "unreadGuildIds"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
-    move-object v7, p6
-
-    move-object/from16 v8, p7
-
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "unreadGuildIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "unreadChannelIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "guildToChannels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "channelsPrivate"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "channelPerms"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "channels"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "guilds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -635,7 +561,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->guilds:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -645,7 +571,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->channels:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -655,7 +581,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->channelPerms:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -665,7 +591,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->channelsPrivate:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -675,7 +601,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->guildToChannels:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -685,7 +611,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->unreadChannelIds:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -695,7 +621,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->unreadGuildIds:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali
index c195a2d27b..7e4d2c42cd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/util/Map<",
@@ -54,7 +54,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -92,29 +92,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "permissions"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccess(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "permissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali
index a3cf8aa811..8bbeca2b43 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;",
         "Ljava/lang/Long;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,20 +59,13 @@
 .method public final invoke(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)J
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-wide/16 v0, 0x0
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali
index 44f3b78da9..510b005c1e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/String;",
@@ -49,7 +49,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -81,84 +81,83 @@
         }
     .end annotation
 
-    const/4 v1, 0x0
+    const-string v1, "$this$toItemUser"
 
-    if-eqz p1, :cond_14
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_13
+    const-string v1, "userFilter"
 
-    iget-object v3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$usersContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->getComputed()Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$usersContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
 
-    move-result-object v3
+    invoke-virtual {v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->getComputed()Ljava/util/Map;
 
-    invoke-interface {v3}, Ljava/util/Map;->values()Ljava/util/Collection;
+    move-result-object v1
 
-    move-result-object v3
+    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
-    new-instance v4, Ljava/util/ArrayList;
+    move-result-object v1
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+    new-instance v3, Ljava/util/ArrayList;
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    move-result-object v3
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
 
     :cond_0
     :goto_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_2
+    const/4 v5, 0x0
 
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    if-eqz v4, :cond_2
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/util/Map;
+
+    invoke-static {p1, v4}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/discord/models/domain/ModelGuildMember$Computed;
+
+    if-eqz v4, :cond_1
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
 
     move-result-object v5
 
-    check-cast v5, Ljava/util/Map;
-
-    invoke-static {p1, v5}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lcom/discord/models/domain/ModelGuildMember$Computed;
-
-    if-eqz v5, :cond_1
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getNick()Ljava/lang/String;
-
-    move-result-object v5
-
-    goto :goto_1
-
     :cond_1
-    move-object v5, v1
-
-    :goto_1
     if-eqz v5, :cond_0
 
-    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_2
-    invoke-static {v4}, Lj0/i/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v3}, Lk0/j/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
 
-    move-result-object v3
+    move-result-object v1
 
-    new-instance v4, Ljava/util/ArrayList;
+    new-instance v3, Ljava/util/ArrayList;
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v5
+    move-result-object v4
 
     :cond_3
-    :goto_2
-    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+    :goto_1
+    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v6
 
@@ -166,7 +165,7 @@
 
     if-eqz v6, :cond_4
 
-    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -174,7 +173,7 @@
 
     sget-object v8, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8, v6, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
@@ -182,28 +181,28 @@
 
     if-eqz v6, :cond_3
 
-    invoke-interface {v4, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v3, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_4
-    new-instance v5, Ljava/util/ArrayList;
+    new-instance v4, Ljava/util/ArrayList;
 
-    invoke-direct {v5}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v3
+    move-result-object v1
 
     :cond_5
-    :goto_3
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    :goto_2
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v6
 
     if-eqz v6, :cond_6
 
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -211,7 +210,7 @@
 
     sget-object v8, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8, v6, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toFuzzyMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
@@ -219,115 +218,115 @@
 
     if-eqz v6, :cond_5
 
-    invoke-interface {v5, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v4, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_3
+    goto :goto_2
 
     :cond_6
-    iget-object v3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$searchContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
+    iget-object v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$searchContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 
-    invoke-virtual {v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getHasDiscriminator()Z
+    invoke-virtual {v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getHasDiscriminator()Z
 
-    move-result v3
+    move-result v1
 
-    if-eqz v3, :cond_7
+    if-eqz v1, :cond_7
 
-    new-instance v3, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v3, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v3, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v1
 
-    goto :goto_4
+    goto :goto_3
 
     :cond_7
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v1
 
-    :goto_4
+    :goto_3
     sget-object v6, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
     const-string v7, "nameToMatch"
 
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v6, v3, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    invoke-virtual {v6, v1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     move-result-object v6
 
     sget-object v7, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    invoke-virtual {v7, v3, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toFuzzyMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    invoke-virtual {v7, v1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toFuzzyMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     move-result-object v0
 
-    const/4 v3, 0x1
+    const/4 v1, 0x1
 
     if-eqz v6, :cond_8
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_8
-    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
 
     move-result v6
 
-    xor-int/2addr v6, v3
+    xor-int/2addr v6, v1
 
     if-eqz v6, :cond_9
 
-    invoke-static {v4}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v3}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_9
     if-eqz v0, :cond_a
 
-    goto :goto_5
+    goto :goto_4
 
     :cond_a
-    invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
 
     move-result v0
 
-    xor-int/2addr v0, v3
+    xor-int/2addr v0, v1
 
     if-eqz v0, :cond_b
 
-    invoke-static {v5}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v4}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
-    :goto_5
+    :goto_4
     move-object v6, v0
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_b
-    move-object v6, v1
+    move-object v6, v5
 
-    :goto_6
+    :goto_5
     if-eqz v6, :cond_12
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$usersContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
@@ -336,7 +335,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p1, v0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -344,28 +343,28 @@
 
     if-nez v0, :cond_c
 
-    goto :goto_7
+    goto :goto_6
 
     :cond_c
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v0
 
-    if-ne v0, v3, :cond_d
+    if-ne v0, v1, :cond_d
 
     const/4 v0, 0x1
 
-    const/4 v7, 0x1
+    const/4 v5, 0x1
 
-    goto :goto_8
+    goto :goto_7
 
     :cond_d
-    :goto_7
+    :goto_6
     const/4 v0, 0x0
 
-    const/4 v7, 0x0
+    const/4 v5, 0x0
 
-    :goto_8
+    :goto_7
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
@@ -392,26 +391,26 @@
 
     new-instance v1, Ljava/util/ArrayList;
 
-    const/16 v3, 0xa
+    const/16 v7, 0xa
 
-    invoke-static {v4, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v3, v7}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
     move-result v8
 
     invoke-direct {v1, v8}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v4
+    move-result-object v3
 
-    :goto_9
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+    :goto_8
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v8
 
     if-eqz v8, :cond_e
 
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v8
 
@@ -423,26 +422,26 @@
 
     invoke-interface {v1, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_9
+    goto :goto_8
 
     :cond_e
-    invoke-static {v0, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
     new-instance v1, Ljava/util/ArrayList;
 
-    invoke-static {v5, v3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+    invoke-static {v4, v7}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
     move-result v3
 
     invoke-direct {v1, v3}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v5}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v3
 
-    :goto_a
+    :goto_9
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
@@ -461,14 +460,14 @@
 
     invoke-interface {v1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    goto :goto_a
+    goto :goto_9
 
     :cond_f
-    invoke-static {v0, v1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0, v1}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-static {v0}, Lj0/i/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v0}, Lk0/j/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v3
 
@@ -482,9 +481,9 @@
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v4
+    move-result-wide v7
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -500,16 +499,16 @@
 
     move-result v0
 
-    move v8, v0
+    move v7, v0
 
-    goto :goto_b
+    goto :goto_a
 
     :cond_10
     const/4 v0, 0x0
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
-    :goto_b
+    :goto_a
     if-eqz p3, :cond_11
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
@@ -520,9 +519,9 @@
 
     invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v4
+    move-result-wide v8
 
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v1
 
@@ -530,17 +529,17 @@
 
     move-result v0
 
-    move v9, v0
+    move v8, v0
 
-    goto :goto_c
+    goto :goto_b
 
     :cond_11
     const/4 v0, 0x0
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    :goto_c
-    new-instance v10, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    :goto_b
+    new-instance v9, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->$usersContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
 
@@ -548,48 +547,32 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {p1, v0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
-    move-object v5, v0
+    move-object v10, v0
 
-    check-cast v5, Lcom/discord/models/domain/ModelPresence;
+    check-cast v10, Lcom/discord/models/domain/ModelPresence;
 
-    move-object v0, v10
+    move-object v0, v9
 
     move-object v1, v6
 
     move-object v2, p1
 
-    move v4, v7
+    move v4, v5
+
+    move-object v5, v10
 
     move-object v6, p3
 
-    move v7, v8
-
-    move v8, v9
-
     invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ZLcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelChannel;IZ)V
 
-    move-object v1, v10
+    move-object v5, v9
 
     :cond_12
-    return-object v1
-
-    :cond_13
-    const-string v0, "userFilter"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_14
-    const-string v0, "$this$toItemUser"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
+    return-object v5
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali
index d7bd115eca..cc43e32012 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Ljava/lang/String;",
@@ -44,7 +44,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -52,29 +52,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
-    .locals 12
+    .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toItemGuild"
 
-    if-eqz p1, :cond_8
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_7
+    const-string v0, "guildFilter"
 
-    sget-object v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "name"
+    const-string v2, "name"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1, v2, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    invoke-virtual {v0, v1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
-    move-result-object v5
+    move-result-object v4
 
-    if-eqz v5, :cond_6
+    if-eqz v4, :cond_6
 
     iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
@@ -121,19 +123,19 @@
 
     invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v3
+    move-result-wide v5
 
-    iget-object v6, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;->$searchContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
+    iget-object v3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;->$searchContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 
-    invoke-virtual {v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getMentionCounts()Ljava/util/Map;
-
-    move-result-object v6
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-virtual {v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getMentionCounts()Ljava/util/Map;
 
     move-result-object v3
 
-    invoke-interface {v6, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v5
+
+    invoke-interface {v3, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -156,12 +158,12 @@
     goto :goto_0
 
     :cond_1
-    move v8, v2
+    move v7, v2
 
     goto :goto_2
 
     :cond_2
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
     :goto_2
     if-eqz p2, :cond_5
@@ -214,45 +216,36 @@
 
     const/4 p2, 0x1
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
     goto :goto_4
 
     :cond_5
     :goto_3
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     :goto_4
-    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    new-instance p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    const/4 v10, 0x4
+    const/4 v9, 0x4
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
-    move-object v4, v0
+    move-object v3, p2
 
-    move-object v6, p1
+    move-object v5, p1
 
-    invoke-direct/range {v4 .. v11}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v3 .. v10}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    goto :goto_5
 
     :cond_6
-    return-object v0
+    const/4 p2, 0x0
 
-    :cond_7
-    const-string p1, "guildFilter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "$this$toItemGuild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_5
+    return-object p2
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali
index cee0804d4f..7cd5130ad1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -140,7 +140,7 @@
 
     const-string v5, "Locale.ROOT"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v6, "null cannot be cast to non-null type java.lang.String"
 
@@ -152,7 +152,7 @@
 
     const-string v4, "(this as java.lang.String).toLowerCase(locale)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v7, Ljava/lang/StringBuilder;
 
@@ -182,7 +182,7 @@
 
     sget-object v1, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v0, :cond_3
 
@@ -190,7 +190,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2, v3, v0}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -208,7 +208,7 @@
 
     const-string v2, "name"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, -0x1
 
@@ -229,16 +229,16 @@
     return-object v0
 
     :cond_3
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
-    invoke-direct {v0, v6}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v6}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 
     :cond_4
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
-    invoke-direct {v0, v6}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v6}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali
index acaee9c0f2..01848a03bc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/String;",
@@ -48,7 +48,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,27 +56,31 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
-    .locals 9
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toItemChannel"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "channelFilter"
 
-    new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p0, p1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)V
+    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;
+
+    invoke-direct {v0, p0, p1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
-    move-result v2
+    move-result v1
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x1
 
-    if-eq v2, v3, :cond_2
+    if-eq v1, v3, :cond_2
 
-    sget-object v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
+    sget-object v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -84,9 +88,9 @@
 
     const-string v4, "name"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2, v3, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    invoke-virtual {v1, v3, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     move-result-object p2
 
@@ -95,16 +99,16 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;->invoke()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4$1;->invoke()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     move-result-object p2
 
     :goto_0
-    move-object v2, p2
+    move-object v4, p2
 
-    if-eqz v2, :cond_3
+    if-eqz v4, :cond_3
 
-    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
+    new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
     iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
@@ -114,19 +118,19 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
-    move-result-wide v3
+    move-result-wide v0
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
-    move-object v4, p2
+    move-object v6, p2
 
-    check-cast v4, Lcom/discord/models/domain/ModelChannel;
+    check-cast v6, Lcom/discord/models/domain/ModelChannel;
 
     iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
@@ -136,15 +140,15 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
-    move-object v5, p2
+    move-object v7, p2
 
-    check-cast v5, Lcom/discord/models/domain/ModelGuild;
+    check-cast v7, Lcom/discord/models/domain/ModelGuild;
 
     iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->$searchContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 
@@ -154,13 +158,13 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v6
+    move-result-wide v0
 
-    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -172,14 +176,14 @@
 
     move-result p2
 
-    move v6, p2
+    move v8, p2
 
     goto :goto_1
 
     :cond_1
     const/4 p2, 0x0
 
-    const/4 v6, 0x0
+    const/4 v8, 0x0
 
     :goto_1
     iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
@@ -190,54 +194,40 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v7
+    move-result-wide v0
 
-    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-interface {p2, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {p2, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    move-result v7
+    move-result v9
 
-    move-object v1, v0
+    move-object v3, v2
 
-    move-object v3, p1
+    move-object v5, p1
 
-    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZ)V
+    invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZ)V
 
     goto :goto_2
 
     :cond_2
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v1
-
-    if-eqz v1, :cond_3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->$toItemUser$2:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
-
-    invoke-virtual {v0, v1, p2, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->invoke(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
-
     move-result-object v0
 
+    if-eqz v0, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->$toItemUser$2:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
+
+    invoke-virtual {v1, v0, p2, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->invoke(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+
+    move-result-object v2
+
     :cond_3
     :goto_2
-    return-object v0
-
-    :cond_4
-    const-string p1, "channelFilter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "$this$toItemChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v2
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali
index 58eb2f493a..fd75282880 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,36 +51,29 @@
 
 # virtual methods
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
 
-    iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;->$toItemUser$2:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;->$sanitizedFilter:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;->$toItemUser$2:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
 
-    const/4 v3, 0x0
+    iget-object v3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$1;->$sanitizedFilter:Ljava/lang/String;
 
-    const/4 v4, 0x2
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x2
 
-    move-object v1, p1
+    const/4 v6, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->invoke$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;->invoke$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.smali
index e104fdf90f..6ef85b56ac 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,22 +73,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isTextChannel()Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$11.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$11.smali
index 2f1ba4e8a4..54c8148bf3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$11.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$11.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$11;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$11;->$toItemChannel$4:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;
 
@@ -64,15 +66,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali
index f07c4ad06c..7d0bef660d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelGuild;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$2;->$toItemGuild$3:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$3;
 
@@ -64,15 +66,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali
index 7bfd7055a6..b87cdccf6a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,22 +73,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isGuildTextyChannel()Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali
index 5d9ac78dc8..54d2b29a21 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$4;->$toItemChannel$4:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;
 
@@ -64,15 +66,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali
index db196b9969..53ad954044 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,22 +73,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isVoiceChannel()Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali
index 3e24c72aea..bbb8ce4687 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6;->$channelContext:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
@@ -136,13 +138,4 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali
index da17d19fa6..973e8ed7c0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$7;->$toItemChannel$4:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;
 
@@ -64,15 +66,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$9.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$9.smali
index 91b8d7a017..77c43effa6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$9.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$9.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$9;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lcom/discord/models/domain/ModelChannel;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali
index 375152ebe2..97a7835412 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,22 +73,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isTextChannel()Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali
index 4e7cd84b23..36c3077e5e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
     .locals 4
 
-    if-eqz p1, :cond_2
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
@@ -93,7 +95,7 @@
 
     move-result-object v2
 
-    invoke-static {v0, v2}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v0, v2}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v2
 
@@ -125,15 +127,6 @@
 
     :goto_0
     return-object v0
-
-    :cond_2
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali
index 6fff3f45cf..b231000830 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali
index a16362aa66..0127e67d3d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$selectedGuildUserResults$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali
index 44b5aabe41..1c3f9a9627 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)Z
     .locals 4
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1;->$lastChannel:Lcom/discord/models/domain/ModelChannel;
 
@@ -96,13 +98,4 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali
index 9a8e42eade..9c37035ed4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function6<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;",
@@ -44,45 +44,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x6
+    const-class v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x6
+
+    const-string v4, "create"
+
+    const-string v5, "create(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "create(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
@@ -106,19 +90,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_3
+    const-string v0, "p2"
 
-    if-eqz p3, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "p3"
 
-    if-eqz p6, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    const-string v0, "p4"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p6"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     move-object v1, v0
 
@@ -141,41 +133,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p6"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p4"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali
index 57e3a70605..009fca7c1f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function7<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -79,45 +79,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x7
+    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x7
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
     .locals 9
     .annotation system Ldalvik/annotation/Signature;
@@ -158,92 +140,55 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_6
+    move-object v2, p1
 
-    if-eqz p2, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "p2"
 
-    if-eqz p4, :cond_3
+    move-object v3, p2
 
-    if-eqz p5, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "p3"
 
-    if-eqz p7, :cond_0
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p4"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p5"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p6"
+
+    move-object v7, p6
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p7"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
-    move-object v7, p6
-
-    move-object/from16 v8, p7
-
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "p7"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "p6"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "p5"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "p4"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "p3"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "p2"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "p1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali
index 22523e415b..3e780e25f9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali
index 732c19cc6c..74b20290d9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali
@@ -31,7 +31,19 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelNotificationSettings;",
+        ">;",
+        "Ljava/util/LinkedHashMap<",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        ">;",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;",
+        ">;"
     }
 .end annotation
 
@@ -107,7 +119,7 @@
 
     const-string p1, "sortedGuilds"
 
-    invoke-static {p4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getGuildToChannels()Ljava/util/Map;
 
@@ -115,7 +127,7 @@
 
     const-string p1, "guildSettings"
 
-    invoke-static {p3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v7, p4
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali
index 87a21f79d0..5762ba4c0e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function7<",
         "Ljava/lang/String;",
         "Ljava/util/List<",
@@ -62,45 +62,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x7
+    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x7
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Ljava/lang/String;Ljava/util/List;JJJLjava/util/Map;Ljava/util/Map;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Ljava/lang/String;Ljava/util/List;JJJLjava/util/Map;Ljava/util/Map;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/lang/String;Ljava/util/List;JJJLjava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
     .locals 12
     .annotation system Ldalvik/annotation/Signature;
@@ -122,65 +104,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p2, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_1
+    const-string v0, "p2"
 
-    if-eqz p10, :cond_0
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p6"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p7"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move-wide v4, p3
 
     move-wide/from16 v6, p5
 
     move-wide/from16 v8, p7
 
-    move-object/from16 v10, p9
-
-    move-object/from16 v11, p10
-
     invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;-><init>(Ljava/lang/String;Ljava/util/List;JJJLjava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "p7"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "p6"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "p2"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "p1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali
index 85c491150f..b7038945d8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Ljava/lang/String;",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;",
+        "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;",
+        ">;"
     }
 .end annotation
 
@@ -66,7 +69,7 @@
 
     move-object v2, p1
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali
index ce7f46ca18..d1cbac6e66 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$usersContextObservable$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -67,45 +67,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x4
+    const-class v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x4
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -136,49 +118,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "p2"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "p3"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p4"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p4"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali
index 2c755f10bd..a3c624e88e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lcom/discord/models/domain/ModelUser;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali
index c29f3cf6b9..8a6ec57cb5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Ljava/lang/Boolean;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,22 +73,15 @@
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isBot()Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali
index 260b6909fa..6e445bb091 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$recentDmUserIds$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Long;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali
index 4e81b38acf..e9edab2e86 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$smallGuildUserIds$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/util/Set<",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali
index ba45f25704..9f498ac098 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;",
         "Ljava/lang/Long;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .method public final invoke(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)J
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getPrevSelectedChannelId()J
 
     move-result-wide v0
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali
index 01faf98fba..e9cc7ffa46 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Ljava/util/Map<",
@@ -54,7 +54,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -92,11 +92,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "permissions"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isTextChannel()Z
 
@@ -145,18 +147,4 @@
 
     :goto_1
     return p1
-
-    :cond_2
-    const-string p1, "permissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali
index 777e15b069..6d193cb35f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;",
         "Ljava/lang/Long;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,22 +59,15 @@
 .method public final invoke(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)J
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getSelectedChannelId()J
 
     move-result-wide v0
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali
index cfb19b961d..2053a9c2d7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1.smali
@@ -40,7 +40,7 @@
 
 # virtual methods
 .method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 2
+    .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(TT;TT;)I"
@@ -53,15 +53,7 @@
 
     move-result-object p1
 
-    check-cast p1, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p1
+    check-cast p1, Ljava/lang/Long;
 
     check-cast p2, Ljava/util/Map$Entry;
 
@@ -69,15 +61,7 @@
 
     move-result-object p2
 
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p2
+    check-cast p2, Ljava/lang/Long;
 
     invoke-static {p1, p2}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali
index 20b213f070..6b9fbde686 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetGlobalSearchModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/util/Map$Entry<",
         "+",
@@ -54,7 +54,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -86,15 +88,6 @@
     move-result-wide v0
 
     return-wide v0
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
index bab8d51bc5..c41c6766b6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
@@ -103,11 +103,11 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
     const-string v1, ""
 
-    invoke-direct {v0, v1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, v1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -220,7 +220,7 @@
 
     const-string v1, "ObservableWithLeadingEdg\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -293,7 +293,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -398,7 +398,7 @@
 
     invoke-direct {v3, v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$channelContextObservable$2;-><init>(Lkotlin/jvm/functions/Function2;)V
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v2
 
@@ -406,7 +406,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -450,23 +450,23 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v5
 
-    new-instance v6, Lr0/l/e/j;
+    new-instance v6, Ls0/l/e/j;
 
     move-object/from16 v2, p3
 
-    invoke-direct {v6, v2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v6, v2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    new-instance v7, Lr0/l/e/j;
+    new-instance v7, Ls0/l/e/j;
 
     move-object/from16 v2, p4
 
-    invoke-direct {v7, v2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v7, v2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$1;
 
@@ -500,7 +500,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -527,7 +527,7 @@
 .end method
 
 .method private final getDefaultUserSearch(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/util/Set;)Lkotlin/sequences/Sequence;
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -559,7 +559,7 @@
 
     move-result-object p2
 
-    invoke-static {p2}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p2}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p2
 
@@ -571,37 +571,49 @@
 
     move-result-object p2
 
-    sget-object v0, Lj0/s/l;->d:Lj0/s/l;
+    const-string v0, "$this$flatten"
 
-    invoke-static {p2, v0}, Lf/n/a/k/a;->w(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lk0/t/l;->d:Lk0/t/l;
+
+    invoke-static {p2, v1}, Lf/n/a/k/a;->t(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object p2
 
-    if-eqz p4, :cond_0
+    const-string v1, "$this$plus"
 
-    const/4 v0, 0x2
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-array v0, v0, [Lkotlin/sequences/Sequence;
+    const-string v1, "elements"
 
-    const/4 v1, 0x0
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    aput-object p1, v0, v1
+    const/4 v1, 0x2
 
-    const/4 p1, 0x1
+    new-array v1, v1, [Lkotlin/sequences/Sequence;
 
-    invoke-static {p4}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    const/4 v2, 0x0
 
-    move-result-object p4
+    aput-object p1, v1, v2
 
-    aput-object p4, v0, p1
-
-    invoke-static {v0}, Lf/n/a/k/a;->sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {p4}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
-    sget-object p4, Lj0/s/k;->d:Lj0/s/k;
+    const/4 p4, 0x1
 
-    invoke-static {p1, p4}, Lf/n/a/k/a;->w(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    aput-object p1, v1, p4
+
+    invoke-static {v1}, Lf/n/a/k/a;->sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+
+    move-result-object p1
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p4, Lk0/t/k;->d:Lk0/t/k;
+
+    invoke-static {p1, p4}, Lf/n/a/k/a;->t(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -609,15 +621,29 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lf/n/a/k/a;->distinct(Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
+    const-string p2, "$this$distinct"
 
-    move-result-object p1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1;
+    sget-object p2, Lk0/t/o;->d:Lk0/t/o;
 
-    invoke-direct {p2, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;)V
+    const-string p4, "$this$distinctBy"
 
-    invoke-static {p1, p2}, Lf/n/a/k/a;->mapNotNull(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "selector"
+
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p4, Lk0/t/c;
+
+    invoke-direct {p4, p1, p2}, Lk0/t/c;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
+
+    new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1;
+
+    invoke-direct {p1, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getDefaultUserSearch$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;)V
+
+    invoke-static {p4, p1}, Lf/n/a/k/a;->mapNotNull(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -634,15 +660,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic getForSend$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;Lrx/Observable;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
@@ -691,7 +708,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -710,11 +727,11 @@
 
     invoke-direct {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getRecentChannelIds$$inlined$sortedBy$1;-><init>()V
 
-    invoke-static {p1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {p1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
-    invoke-static {p1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {p1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object p1
 
@@ -737,7 +754,7 @@
 
 # virtual methods
 .method public final create(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
-    .locals 22
+    .locals 18
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -769,17 +786,27 @@
 
     move-object/from16 v10, p6
 
-    const/4 v11, 0x0
+    const-string v1, "searchContext"
 
-    if-eqz v0, :cond_12
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v7, :cond_11
+    const-string v1, "usersContext"
 
-    if-eqz v8, :cond_10
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_f
+    const-string v1, "channelContext"
 
-    if-eqz v10, :cond_e
+    invoke-static {v8, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "widgetGuildsListModel"
+
+    move-object/from16 v11, p4
+
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "lastChannelIdProvider"
+
+    invoke-static {v10, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2;
 
@@ -809,7 +836,7 @@
 
     move-result-object v3
 
-    invoke-static {v3}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v3}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -830,7 +857,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lj0/i/p;->d:Lj0/i/p;
+    sget-object v2, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     move-object v6, v2
@@ -839,23 +866,23 @@
 
     const/4 v4, 0x1
 
-    if-eq v14, v4, :cond_6
+    if-eq v14, v4, :cond_5
 
-    if-eq v14, v5, :cond_5
+    if-eq v14, v5, :cond_4
 
     const/4 v2, 0x3
 
-    if-eq v14, v2, :cond_4
+    if-eq v14, v2, :cond_3
 
     const/4 v1, 0x4
 
-    if-eq v14, v1, :cond_3
+    if-eq v14, v1, :cond_2
 
-    invoke-static {v15}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v15}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_1
 
     invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getRecentChannelIds(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)Lkotlin/sequences/Sequence;
 
@@ -873,15 +900,21 @@
 
     move-result-object v1
 
-    if-eqz v2, :cond_1
+    const-string v3, "$this$union"
 
-    invoke-static {v2}, Lj0/i/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "other"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lk0/j/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v2
 
     invoke-static {v2, v1}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
 
-    invoke-static {v2}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v2}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v1
 
@@ -910,13 +943,6 @@
     goto/16 :goto_1
 
     :cond_1
-    const-string v0, "$this$union"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v11
-
-    :cond_2
     new-instance v3, Ljava/util/HashSet;
 
     invoke-direct {v3}, Ljava/util/HashSet;-><init>()V
@@ -929,7 +955,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v1
 
@@ -955,7 +981,7 @@
 
     move-object v5, v15
 
-    move-object/from16 v20, v6
+    move-object/from16 v17, v6
 
     move-object v6, v13
 
@@ -965,7 +991,7 @@
 
     move-result-object v1
 
-    invoke-static/range {v20 .. v20}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static/range {v17 .. v17}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v2
 
@@ -991,7 +1017,7 @@
 
     goto :goto_1
 
-    :cond_3
+    :cond_2
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getChannels()Ljava/util/Map;
 
     move-result-object v1
@@ -1000,7 +1026,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v1
 
@@ -1036,7 +1062,7 @@
 
     goto :goto_1
 
-    :cond_4
+    :cond_3
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getGuilds()Ljava/util/Map;
 
     move-result-object v2
@@ -1045,7 +1071,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v2}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v2
 
@@ -1059,7 +1085,7 @@
 
     goto :goto_1
 
-    :cond_5
+    :cond_4
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getChannels()Ljava/util/Map;
 
     move-result-object v1
@@ -1068,7 +1094,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v1}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v1
 
@@ -1093,18 +1119,18 @@
 
     goto :goto_3
 
-    :cond_6
-    move-object/from16 v20, v6
+    :cond_5
+    move-object/from16 v17, v6
 
-    invoke-static {v15}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v15}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_7
+    if-eqz v1, :cond_6
 
     move-object/from16 v1, p0
 
-    move-object/from16 v2, v20
+    move-object/from16 v2, v17
 
     invoke-direct {v1, v0, v8, v7, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getDefaultUserSearch(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/util/Set;)Lkotlin/sequences/Sequence;
 
@@ -1112,7 +1138,7 @@
 
     goto :goto_2
 
-    :cond_7
+    :cond_6
     move-object/from16 v1, p0
 
     invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->getUsers()Ljava/util/Map;
@@ -1123,7 +1149,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v2}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v2
 
@@ -1137,13 +1163,13 @@
     move-result-object v2
 
     :goto_3
-    if-eqz v9, :cond_8
+    if-eqz v9, :cond_7
 
     invoke-static {v2, v9}, Lf/n/a/k/a;->filter(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object v2
 
-    :cond_8
+    :cond_7
     new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1;
 
     invoke-direct {v3, v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedByDescending$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;)V
@@ -1160,27 +1186,27 @@
 
     const/4 v4, 0x0
 
-    if-nez v14, :cond_9
+    if-nez v14, :cond_8
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getFilter()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-static {v3}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {v3}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v3
 
-    if-eqz v3, :cond_9
+    if-eqz v3, :cond_8
 
     const/4 v3, 0x1
 
     goto :goto_4
 
-    :cond_9
+    :cond_8
     const/4 v3, 0x0
 
     :goto_4
-    if-eqz v3, :cond_c
+    if-eqz v3, :cond_b
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;->getChannels()Ljava/util/Map;
 
@@ -1198,29 +1224,29 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelChannel;
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_9
 
     const-string v3, ""
 
     invoke-virtual {v13, v0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4;->invoke(Lcom/discord/models/domain/ModelChannel;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    move-result-object v11
+    move-result-object v3
 
     goto :goto_5
 
-    :cond_a
-    const/4 v11, 0x0
+    :cond_9
+    const/4 v3, 0x0
 
     :goto_5
-    if-nez v11, :cond_b
+    if-nez v3, :cond_a
 
-    const/4 v3, 0x1
+    const/4 v5, 0x1
 
-    new-array v0, v3, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
+    new-array v0, v5, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
     new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v6, 0x7f121539
+    const v6, 0x7f121563
 
     const/4 v7, 0x0
 
@@ -1246,47 +1272,45 @@
 
     goto :goto_6
 
-    :cond_b
-    const/4 v3, 0x1
+    :cond_a
+    const/4 v5, 0x1
 
-    const/4 v5, 0x2
+    const/4 v6, 0x2
 
-    new-array v5, v5, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    new-array v6, v6, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    new-instance v6, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
+    new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v17, 0x7f1212e3
+    const v8, 0x7f12130d
 
-    const/16 v18, 0x0
+    const/4 v9, 0x0
 
-    const/16 v19, 0x0
+    const/4 v10, 0x0
 
-    const/16 v20, 0x6
+    const/4 v11, 0x6
 
-    const/16 v21, 0x0
+    const/4 v12, 0x0
 
-    move-object/from16 v16, v6
+    move-object v7, v13
 
-    invoke-direct/range {v16 .. v21}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;-><init>(IIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v7 .. v12}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;-><init>(IIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    aput-object v6, v5, v4
+    aput-object v13, v6, v4
 
-    aput-object v11, v5, v3
+    aput-object v3, v6, v5
 
-    invoke-static {v5}, Lf/n/a/k/a;->sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v6}, Lf/n/a/k/a;->sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
-    move-result-object v5
+    move-result-object v3
 
-    new-array v3, v3, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
+    new-array v5, v5, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
     new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v7, 0x7f121539
+    const v7, 0x7f121563
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
     const/4 v10, 0x6
 
     const/4 v11, 0x0
@@ -1295,13 +1319,13 @@
 
     invoke-direct/range {v6 .. v11}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;-><init>(IIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    aput-object v12, v3, v4
+    aput-object v12, v5, v4
 
-    invoke-static {v3}, Lf/n/a/k/a;->sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    invoke-static {v5}, Lf/n/a/k/a;->sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
 
-    move-result-object v3
+    move-result-object v4
 
-    invoke-static {v5, v3}, Lf/n/a/k/a;->plus(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
+    invoke-static {v3, v4}, Lf/n/a/k/a;->plus(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
 
     move-result-object v3
 
@@ -1332,20 +1356,20 @@
 
     goto :goto_7
 
-    :cond_c
-    const/4 v3, 0x1
+    :cond_b
+    const/4 v5, 0x1
 
     invoke-static {v2}, Lf/n/a/k/a;->firstOrNull(Lkotlin/sequences/Sequence;)Ljava/lang/Object;
 
     move-result-object v0
 
-    if-eqz v0, :cond_d
+    if-eqz v0, :cond_c
 
-    new-array v0, v3, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
+    new-array v0, v5, [Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
     new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v5, 0x7f121539
+    const v5, 0x7f121563
 
     const/4 v6, 0x0
 
@@ -1379,7 +1403,7 @@
 
     move-result-object v2
 
-    :cond_d
+    :cond_c
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 
     invoke-static {v2}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
@@ -1402,61 +1426,6 @@
 
     :goto_7
     return-object v2
-
-    :cond_e
-    move-object/from16 v1, p0
-
-    const-string v0, "lastChannelIdProvider"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_f
-    move-object/from16 v1, p0
-
-    move-object v0, v11
-
-    const-string v2, "widgetGuildsListModel"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_10
-    move-object/from16 v1, p0
-
-    move-object v0, v11
-
-    const-string v2, "channelContext"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_11
-    move-object/from16 v1, p0
-
-    move-object v0, v11
-
-    const-string v2, "usersContext"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_12
-    move-object/from16 v1, p0
-
-    move-object v0, v11
-
-    const-string v2, "searchContext"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getEMPTY_MATCH_RESULT()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
@@ -1476,7 +1445,7 @@
 .end method
 
 .method public final getForNav(Lrx/Observable;)Lrx/Observable;
-    .locals 7
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1489,38 +1458,31 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "filterPublisher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->access$getDEFAULT_PERMISSIONS_PREDICATE$cp()Lkotlin/jvm/functions/Function2;
 
-    move-result-object v2
+    move-result-object v3
 
-    const/4 v3, 0x0
+    sget-object v5, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1;
 
-    sget-object v4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForNav$1;
+    const/4 v4, 0x0
 
-    const/4 v5, 0x4
+    const/4 v6, 0x4
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
-    move-object v0, p0
+    move-object v1, p0
 
-    move-object v1, p1
+    move-object v2, p1
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->get$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;Lrx/Observable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static/range {v1 .. v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->get$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;Lrx/Observable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "filterPublisher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getForSend(Lrx/Observable;Lkotlin/jvm/functions/Function1;)Lrx/Observable;
@@ -1542,7 +1504,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "filterPublisher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1;->INSTANCE:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1;
 
@@ -1553,61 +1517,54 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "filterPublisher"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final toFuzzyMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
-    .locals 6
+    .locals 5
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toFuzzyMatchedResult"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "filter"
 
-    sget-object v1, Lcom/discord/utilities/search/SearchUtils;->INSTANCE:Lcom/discord/utilities/search/SearchUtils;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
+    sget-object v0, Lcom/discord/utilities/search/SearchUtils;->INSTANCE:Lcom/discord/utilities/search/SearchUtils;
 
-    const-string v3, "Locale.ROOT"
+    sget-object v1, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v2, "Locale.ROOT"
 
-    invoke-virtual {p2, v2}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2, v1}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v3, "(this as java.lang.String).toLowerCase(locale)"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
+
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, v4}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
 
     move-result-object v2
 
-    const-string v4, "(this as java.lang.String).toLowerCase(locale)"
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2}, Lcom/discord/utilities/string/StringUtilsKt;->stripAccents(Ljava/lang/String;)Ljava/lang/String;
 
-    sget-object v5, Ljava/util/Locale;->ROOT:Ljava/util/Locale;
+    move-result-object v2
 
-    invoke-static {v5, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
 
-    invoke-virtual {p1, v5}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+    move-result v0
 
-    move-result-object v3
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v3}, Lcom/discord/utilities/string/StringUtilsKt;->stripAccents(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v2, v3}, Lcom/discord/utilities/search/SearchUtils;->fuzzyMatch(Ljava/lang/String;Ljava/lang/String;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
@@ -1619,72 +1576,53 @@
 
     invoke-direct {v0, p1, v1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;-><init>(Ljava/lang/CharSequence;II)V
 
-    :cond_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "$this$toFuzzyMatchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x2
-
-    invoke-static {p1, p2, v1, v2, v3}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
-
-    move-result v1
-
-    const/4 v2, -0x1
-
-    if-ne v1, v2, :cond_0
-
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public final toMatchedResult(Ljava/lang/String;Ljava/lang/String;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
+    .locals 3
+
+    const-string v0, "$this$toMatchedResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "filter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x2
+
+    invoke-static {p1, p2, v0, v1, v2}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+
+    move-result v0
+
+    const/4 v1, -0x1
+
+    if-eq v0, v1, :cond_0
+
+    new-instance v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
     move-result p2
 
-    invoke-direct {v0, p1, v1, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;-><init>(Ljava/lang/CharSequence;II)V
+    invoke-direct {v1, p1, v0, p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;-><init>(Ljava/lang/CharSequence;II)V
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "$this$toMatchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
index 3c1a2ac490..f2a172ada8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel.smali
@@ -35,11 +35,13 @@
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "matchedResult"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,20 +58,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->unread:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -261,11 +249,13 @@
 .method public final copy(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZ)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "matchedResult"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
@@ -286,20 +276,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;IZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -321,7 +297,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -335,7 +311,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -345,7 +321,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->parentChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -355,7 +331,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -578,7 +554,7 @@
 
     const-string v1, "channel.name"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
index b3ac6130e8..4fde094d0e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild.smali
@@ -33,11 +33,13 @@
 .method public constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;IZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "matchedResult"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,20 +54,6 @@
     iput-boolean p5, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->unread:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -243,11 +231,13 @@
 .method public final copy(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;IZ)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "matchedResult"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "guild"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
@@ -266,20 +256,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelGuild;Lcom/discord/models/domain/ModelChannel;IZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "guild"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "matchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -301,7 +277,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -311,7 +287,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -325,7 +301,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -518,7 +494,7 @@
 
     const-string v1, "guild.name"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
index 77c77501b1..b55630fd89 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser.smali
@@ -61,13 +61,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matchedResult"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "user"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "aliases"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -88,27 +92,6 @@
     iput-boolean p8, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->unread:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "aliases"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "user"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "matchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ZLcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelChannel;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -417,24 +400,28 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "matchedResult"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "user"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "aliases"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
     move v5, p4
 
     move-object v6, p5
@@ -448,27 +435,6 @@
     invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ZLcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelChannel;IZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "aliases"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "matchedResult"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -490,7 +456,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -500,7 +466,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -510,7 +476,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->aliases:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -526,7 +492,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->presence:Lcom/discord/models/domain/ModelPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -540,7 +506,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
index ec67553984..1a3b308db8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult.smali
@@ -24,9 +24,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/CharSequence;II)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +39,6 @@
     iput p3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->filterLength:I
 
     return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;Ljava/lang/CharSequence;IIILjava/lang/Object;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
@@ -108,22 +101,15 @@
 .method public final copy(Ljava/lang/CharSequence;II)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;-><init>(Ljava/lang/CharSequence;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +127,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->value:Ljava/lang/CharSequence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
index 8bb6f1d891..b2aeee34f0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext.smali
@@ -93,15 +93,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "filter"
 
-    if-eqz p1, :cond_11
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_10
+    const-string v0, "recentGuildIds"
 
-    if-eqz p9, :cond_f
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_e
+    const-string v0, "mostRecent"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mentionCounts"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -133,7 +139,9 @@
 
     const/4 p4, 0x1
 
-    invoke-static {p1, p2, p3, p4, v0}, Lcom/discord/utilities/frecency/FrecencyTracker;->getSortedKeys$default(Lcom/discord/utilities/frecency/FrecencyTracker;JILjava/lang/Object;)Ljava/util/Collection;
+    const/4 p5, 0x0
+
+    invoke-static {p1, p2, p3, p4, p5}, Lcom/discord/utilities/frecency/FrecencyTracker;->getSortedKeys$default(Lcom/discord/utilities/frecency/FrecencyTracker;JILjava/lang/Object;)Ljava/util/Collection;
 
     move-result-object p1
 
@@ -141,7 +149,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->filter:Ljava/lang/String;
 
-    if-eqz p1, :cond_d
+    const-string p2, "$this$firstOrNull"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
@@ -170,15 +180,15 @@
 
     invoke-static {p1}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
 
-    move-result-object v0
+    move-result-object p5
 
     :goto_1
-    if-nez v0, :cond_2
+    if-nez p5, :cond_2
 
     goto :goto_2
 
     :cond_2
-    invoke-virtual {v0}, Ljava/lang/Character;->charValue()C
+    invoke-virtual {p5}, Ljava/lang/Character;->charValue()C
 
     move-result p1
 
@@ -192,12 +202,12 @@
 
     :cond_3
     :goto_2
-    if-nez v0, :cond_4
+    if-nez p5, :cond_4
 
     goto :goto_3
 
     :cond_4
-    invoke-virtual {v0}, Ljava/lang/Character;->charValue()C
+    invoke-virtual {p5}, Ljava/lang/Character;->charValue()C
 
     move-result p1
 
@@ -211,12 +221,12 @@
 
     :cond_5
     :goto_3
-    if-nez v0, :cond_6
+    if-nez p5, :cond_6
 
     goto :goto_4
 
     :cond_6
-    invoke-virtual {v0}, Ljava/lang/Character;->charValue()C
+    invoke-virtual {p5}, Ljava/lang/Character;->charValue()C
 
     move-result p1
 
@@ -230,12 +240,12 @@
 
     :cond_7
     :goto_4
-    if-nez v0, :cond_8
+    if-nez p5, :cond_8
 
     goto :goto_5
 
     :cond_8
-    invoke-virtual {v0}, Ljava/lang/Character;->charValue()C
+    invoke-virtual {p5}, Ljava/lang/Character;->charValue()C
 
     move-result p1
 
@@ -266,16 +276,16 @@
 
     const-string p2, "(this as java.lang.String).substring(startIndex)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_7
 
     :cond_a
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type java.lang.String"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -312,41 +322,6 @@
     iput-boolean p3, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->hasDiscriminator:Z
 
     return-void
-
-    :cond_d
-    const-string p1, "$this$firstOrNull"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
-    const-string p1, "mentionCounts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_f
-    const-string p1, "mostRecent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_10
-    const-string p1, "recentGuildIds"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_11
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;Ljava/lang/String;Ljava/util/List;JJJLjava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
@@ -564,65 +539,43 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "filter"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p2, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_1
+    const-string v0, "recentGuildIds"
 
-    if-eqz p10, :cond_0
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mostRecent"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mentionCounts"
+
+    move-object/from16 v11, p10
+
+    invoke-static {v11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move-wide v4, p3
 
     move-wide/from16 v6, p5
 
     move-wide/from16 v8, p7
 
-    move-object/from16 v10, p9
-
-    move-object/from16 v11, p10
-
     invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;-><init>(Ljava/lang/String;Ljava/util/List;JJJLjava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "mentionCounts"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "mostRecent"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "recentGuildIds"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "filter"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -640,7 +593,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->filter:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -650,7 +603,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->recentGuildIds:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -684,7 +637,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->mostRecent:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -694,7 +647,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->mentionCounts:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali
index 1a8bfbc682..b89ac19eb6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext.smali
@@ -92,15 +92,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "users"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "presences"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "relationships"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "computed"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -113,34 +119,6 @@
     iput-object p4, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->computed:Ljava/util/Map;
 
     return-void
-
-    :cond_0
-    const-string p1, "computed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
@@ -283,49 +261,27 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "users"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "presences"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "relationships"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "computed"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "computed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "relationships"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "presences"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "users"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -343,7 +299,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->users:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -353,7 +309,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->presences:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -363,7 +319,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->relationships:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -373,7 +329,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$UsersContext;->computed:Ljava/util/Map;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
index bb49c4d883..1c8546c6f2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchModel.smali
@@ -109,7 +109,7 @@
 
     const-string v1, "java.util.regex.Pattern.compile(this, flags)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->DISCRIMINATOR_PATTERN:Ljava/util/regex/Pattern;
 
@@ -137,11 +137,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "filter"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -154,20 +156,6 @@
     iput-object p4, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->guildsList:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Ljava/lang/String;ILjava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -307,31 +295,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "filter"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "filter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -349,7 +325,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->filter:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -365,7 +341,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->data:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -375,7 +351,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->guildsList:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali
index f6c59e6d4f..6fc85e575e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.smali
@@ -61,11 +61,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$score"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "frecencyChannels"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -147,26 +149,14 @@
     add-int/2addr p1, p3
 
     return p1
-
-    :cond_4
-    const-string p1, "frecencyChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "$this$score"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final scoreChannel(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;)I
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "$this$scoreChannel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getGuild()Lcom/discord/models/domain/ModelGuild;
 
@@ -191,19 +181,10 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "$this$scoreChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final scoreFrecency(Ljava/util/Collection;J)I
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -213,13 +194,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_5
+    const-string v0, "$this$scoreFrecency"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p2
 
-    invoke-static {p1, p2}, Lj0/i/l;->indexOf(Ljava/lang/Iterable;Ljava/lang/Object;)I
+    invoke-static {p1, p2}, Lk0/j/l;->indexOf(Ljava/lang/Iterable;Ljava/lang/Object;)I
 
     move-result p1
 
@@ -266,31 +249,24 @@
 
     :goto_2
     return p1
-
-    :cond_5
-    const-string p1, "$this$scoreFrecency"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final scoreMatchedResult(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;)I
     .locals 4
 
-    if-eqz p1, :cond_5
+    const-string v0, "$this$scoreMatchedResult"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getFirstMatchIndex()I
 
     move-result v0
 
-    const/4 v1, -0x1
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, -0x1
 
-    if-ne v0, v1, :cond_0
+    if-ne v0, v2, :cond_0
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getValue()Ljava/lang/CharSequence;
 
@@ -300,9 +276,9 @@
 
     move-result v0
 
-    const/16 v1, 0x14
+    const/16 v2, 0x14
 
-    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
+    invoke-static {v0, v2}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
@@ -311,14 +287,14 @@
     goto :goto_1
 
     :cond_0
-    const/16 v1, 0xa
+    const/16 v2, 0xa
 
     if-gez v0, :cond_1
 
     goto :goto_0
 
     :cond_1
-    if-lt v1, v0, :cond_2
+    if-lt v2, v0, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getFirstMatchIndex()I
 
@@ -335,26 +311,26 @@
     :goto_1
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getFirstMatchIndex()I
 
-    move-result v1
+    move-result v2
 
     const/4 v3, 0x1
 
-    if-nez v1, :cond_3
+    if-nez v2, :cond_3
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
     goto :goto_2
 
     :cond_3
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getFirstMatchIndex()I
 
-    move-result v1
+    move-result v2
 
-    if-lez v1, :cond_4
+    if-lez v2, :cond_4
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getValue()Ljava/lang/CharSequence;
 
-    move-result-object v1
+    move-result-object v2
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;->getFirstMatchIndex()I
 
@@ -362,7 +338,7 @@
 
     sub-int/2addr p1, v3
 
-    invoke-interface {v1, p1}, Ljava/lang/CharSequence;->charAt(I)C
+    invoke-interface {v2, p1}, Ljava/lang/CharSequence;->charAt(I)C
 
     move-result p1
 
@@ -372,34 +348,25 @@
 
     if-nez p1, :cond_4
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :cond_4
     :goto_2
-    add-int/2addr v0, v2
+    add-int/2addr v0, v1
 
     return v0
-
-    :cond_5
-    const-string p1, "$this$scoreMatchedResult"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final scoreUser(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;I)I
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "$this$scoreUser"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    if-eq p2, v1, :cond_0
+    if-eq p2, v0, :cond_0
 
     sget-object p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy$SearchType;->NONE:Lcom/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy$SearchType;
 
@@ -411,53 +378,58 @@
     :goto_0
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
-    move-result-object v2
+    move-result-object v1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
 
-    move-result-object v0
+    move-result-object v1
+
+    goto :goto_1
 
     :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
     const/4 v2, 0x2
 
     const/4 v3, 0x0
 
-    if-nez v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    if-eq v0, v1, :cond_4
-
-    if-eq v0, v2, :cond_3
-
-    :goto_1
-    const/4 v0, 0x0
+    if-nez v1, :cond_2
 
     goto :goto_2
 
+    :cond_2
+    invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    if-eq v1, v0, :cond_4
+
+    if-eq v1, v2, :cond_3
+
+    :goto_2
+    const/4 v0, 0x0
+
+    goto :goto_3
+
     :cond_3
     const/4 v0, 0x2
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_4
     const/4 v0, 0x3
 
-    goto :goto_2
+    goto :goto_3
 
     :cond_5
     const/4 v0, 0x4
 
-    :goto_2
+    :goto_3
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->isFriend()Z
 
     move-result v1
@@ -468,12 +440,12 @@
 
     move-result v1
 
-    goto :goto_3
+    goto :goto_4
 
     :cond_6
     const/4 v1, 0x0
 
-    :goto_3
+    :goto_4
     add-int/2addr v0, v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getChannel()Lcom/discord/models/domain/ModelChannel;
@@ -486,12 +458,12 @@
 
     move-result p2
 
-    goto :goto_4
+    goto :goto_5
 
     :cond_7
     const/4 p2, 0x0
 
-    :goto_4
+    :goto_5
     add-int/2addr v0, p2
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getMatchedResult()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$MatchedResult;
@@ -510,26 +482,19 @@
 
     move-result-object p1
 
-    invoke-static {p2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_8
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_8
     const/4 v2, 0x0
 
-    :goto_5
+    :goto_6
     add-int/2addr v0, v2
 
     return v0
-
-    :cond_9
-    const-string p1, "$this$scoreUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
index fcab5a5e4e..b8d33cd15d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
@@ -125,7 +125,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;->isDeafened:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -135,7 +135,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;->outputVolume:Ljava/lang/Float;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
index d650e3114b..8f9351b725 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
@@ -32,9 +32,11 @@
 
 # virtual methods
 .method public onProgressChanged(Landroid/widget/SeekBar;IZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "seekBar"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1;->$onProgressChanged:Lkotlin/jvm/functions/Function2;
 
@@ -51,13 +53,4 @@
     invoke-interface {p1, p2, p3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "seekBar"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
index 039373be83..cc1c64483a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
@@ -35,101 +35,71 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
+    const-string v2, "userMutedCheck"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserMutedCheck()Landroidx/appcompat/widget/SwitchCompat;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "userMutedCheck"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getUserMutedCheck()Landroidx/appcompat/widget/SwitchCompat;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
 
-    const/4 v2, 0x0
+    const-string v2, "userDeafenedCheck"
 
-    aput-object v1, v0, v2
+    const-string v3, "getUserDeafenedCheck()Landroidx/appcompat/widget/SwitchCompat;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "userDeafenedCheck"
-
-    const-string v4, "getUserDeafenedCheck()Landroidx/appcompat/widget/SwitchCompat;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
+    const-string v2, "userVolumeWrapper"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserVolumeWrapper()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userVolumeWrapper"
-
-    const-string v4, "getUserVolumeWrapper()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
+    const-string v2, "userVolumeLabel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserVolumeLabel()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userVolumeLabel"
-
-    const-string v4, "getUserVolumeLabel()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;
+    const-string v2, "userVolumeSeekbar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserVolumeSeekbar()Landroid/widget/SeekBar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userVolumeSeekbar"
-
-    const-string v4, "getUserVolumeSeekbar()Landroid/widget/SeekBar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
@@ -143,15 +113,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a0a0f
+    const p2, 0x7f0a0a13
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +131,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->userMutedCheck$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a03
+    const p2, 0x7f0a0a07
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -167,7 +139,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->userDeafenedCheck$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a1c
+    const p2, 0x7f0a0a20
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -175,7 +147,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->userVolumeWrapper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a1b
+    const p2, 0x7f0a0a1f
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -183,7 +155,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->userVolumeLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a1a
+    const p2, 0x7f0a0a1e
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -196,20 +168,6 @@
     invoke-static {p1, p2, p0}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getUserDeafenedCheck()Landroidx/appcompat/widget/SwitchCompat;
@@ -327,7 +285,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onChecked"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->getUserDeafenedCheck()Landroidx/appcompat/widget/SwitchCompat;
 
@@ -340,15 +300,6 @@
     invoke-virtual {v0, v1}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onChecked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnMuteChecked(Lkotlin/jvm/functions/Function1;)V
@@ -364,7 +315,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onChecked"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->getUserMutedCheck()Landroidx/appcompat/widget/SwitchCompat;
 
@@ -377,15 +330,6 @@
     invoke-virtual {v0, v1}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onChecked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnVolumeChange(Lkotlin/jvm/functions/Function2;)V
@@ -403,7 +347,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onProgressChanged"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->getUserVolumeSeekbar()Landroid/widget/SeekBar;
 
@@ -416,21 +362,14 @@
     invoke-virtual {v0, v1}, Landroid/widget/SeekBar;->setOnSeekBarChangeListener(Landroid/widget/SeekBar$OnSeekBarChangeListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onProgressChanged"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final updateView(Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;)V
     .locals 5
 
-    if-eqz p1, :cond_8
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->getUserVolumeSeekbar()Landroid/widget/SeekBar;
 
@@ -575,13 +514,4 @@
     invoke-virtual {v0, v2}, Landroidx/appcompat/widget/SwitchCompat;->setChecked(Z)V
 
     return-void
-
-    :cond_8
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1.smali
index ed7d3e014f..98b0de0262 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -51,7 +51,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,62 +75,59 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
-    .locals 18
+    .locals 19
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_0
+    const-string v1, "fragmentActivity"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    iget-wide v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$userId:J
+    iget-wide v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$userId:J
 
-    const/4 v4, 0x0
+    iget-object v10, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$friendToken:Ljava/lang/String;
 
-    iget-object v9, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$friendToken:Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    const/4 v6, 0x0
+    move-result-object v6
+
+    const-string v2, "fragmentActivity.supportFragmentManager"
+
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x0
 
     const/4 v7, 0x0
 
     const/4 v8, 0x0
 
-    invoke-virtual/range {p1 .. p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
+    const/4 v9, 0x0
 
-    move-result-object v5
+    const/16 v11, 0x3a
 
-    const-string v10, "fragmentActivity.supportFragmentManager"
+    const/4 v12, 0x0
 
-    invoke-static {v5, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v2, v1
 
-    const/16 v10, 0x3a
+    invoke-static/range {v2 .. v12}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
 
-    const/4 v11, 0x0
+    iget-object v13, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$storeNotices:Lcom/discord/stores/StoreNotices;
 
-    invoke-static/range {v1 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
+    iget-object v14, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$noticeName:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$storeNotices:Lcom/discord/stores/StoreNotices;
+    const-wide/16 v15, 0x0
 
-    iget-object v13, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$noticeName:Ljava/lang/String;
+    const/16 v17, 0x2
 
-    const-wide/16 v14, 0x0
+    const/16 v18, 0x0
 
-    const/16 v16, 0x2
-
-    const/16 v17, 0x0
-
-    invoke-static/range {v12 .. v17}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
+    invoke-static/range {v13 .. v18}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
 
     const/4 v1, 0x1
 
     return v1
-
-    :cond_0
-    const-string v1, "fragmentActivity"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
index 867b02a745..6d92c9c413 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
@@ -63,7 +63,7 @@
 
     const-string p2, "StringBuilder(\"User Shee\u2026)\n            .toString()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -369,11 +369,13 @@
 .method public final show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p4, :cond_5
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_4
+    const-string v0, "streamPreviewClickBehavior"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
@@ -447,18 +449,4 @@
     invoke-virtual {v0, p4, p1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "streamPreviewClickBehavior"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
index 06bdf81e36..88978a16bf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
index 73b9e182ed..f80e0e4782 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$handleEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
index 0a927f84db..1f508fe258 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/String;",
         "Ljava/lang/Integer;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 .method public final invoke(Ljava/lang/String;ILjava/lang/String;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "username"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lf/a/a/g;->h:Lf/a/a/g$b;
 
@@ -85,10 +85,16 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz v1, :cond_0
 
+    const-string v1, "fragmentManager"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lf/a/a/g;
 
     invoke-direct {v0}, Lf/a/a/g;-><init>()V
@@ -122,12 +128,7 @@
     return-void
 
     :cond_0
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
index 82b19d491a..18b7a2ddf8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
index 6f3abd4250..a541396780 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
index c6cf83086a..bba21c57ef 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
@@ -53,7 +53,7 @@
 
     const-string v0, "context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->$viewState$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
@@ -73,7 +73,7 @@
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->c(Landroid/content/Context;Ljava/lang/CharSequence;II)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
index fccab3f27c..4a970680dc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "viewState.user.username"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$acceptFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
index 0799866ae3..3f52b91024 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "this@WidgetUserSheet.requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1;->$viewState:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
@@ -103,9 +103,31 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppActivity;->o(Landroid/content/Context;)V
+    if-eqz p1, :cond_1
 
+    const-string v1, "context"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v1, Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    invoke-static {v1}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    invoke-virtual {p1, v1}, Lcom/discord/app/AppActivity;->m(Lk0/s/b;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_0
+
+    invoke-static {v0}, Lf/a/b/m;->d(Landroid/content/Context;)V
+
+    :cond_0
     return-void
+
+    :cond_1
+    throw v3
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
index 21a5aa311d..f34c6a40be 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "viewState.user.username"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$addFriend(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
index aa82a0bcfc..38a1a52d54 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "removeRelationship"
+
+    const-string v5, "removeRelationship(I)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "removeRelationship"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "removeRelationship(I)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(I)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
index 71c126c9f6..a1c6602359 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     const-string v2, "viewState.user.username"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$acceptFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
index c34cdd3904..156c25f731 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
index a4a8a22b0f..ef693b2f9b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
@@ -43,7 +43,7 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 24
+    .locals 26
 
     move-object/from16 v0, p0
 
@@ -53,15 +53,19 @@
 
     const/4 v3, 0x1
 
-    const v4, 0x7f0a062c
+    const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const v5, 0x7f0a0632
 
-    const-string v6, "requireContext()"
+    const-string v6, "context"
 
-    const-string v7, "parentFragmentManager"
+    const-string v7, "fragmentManager"
 
-    if-eq v1, v2, :cond_2
+    const-string v8, "requireContext()"
+
+    const-string v9, "parentFragmentManager"
+
+    if-eq v1, v2, :cond_1
 
     const/4 v2, 0x4
 
@@ -82,37 +86,45 @@
 
     move-result-object v2
 
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    invoke-virtual {v6}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-virtual {v8}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v11
+
+    invoke-static {v11, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;
+
+    iget-object v9, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
     move-result-object v9
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {v8, v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
 
-    new-instance v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;
+    const-string v9, "user"
 
-    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    invoke-static {v1, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v7
+    invoke-static {v11, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    const-string v6, "onConfirm"
 
-    if-eqz v1, :cond_1
+    invoke-static {v8, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v8, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+    sget-object v10, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v7, 0x7f121096
+    const v6, 0x7f1210c0
 
-    invoke-virtual {v2, v7}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object v10
-
-    const v7, 0x7f121097
+    move-result-object v12
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -120,35 +132,37 @@
 
     move-result-object v1
 
-    aput-object v1, v3, v5
+    aput-object v1, v3, v4
 
-    invoke-virtual {v2, v7, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const v1, 0x7f1210c1
 
-    move-result-object v11
-
-    const-string v1, "context.getString(R.stri\u2026elete_msg, user.username)"
-
-    invoke-static {v11, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v1, 0x7f120563
-
-    invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v12
-
-    const v1, 0x7f1203b7
-
-    invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v2, v1, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v13
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const-string v1, "context.getString(R.stri\u2026elete_msg, user.username)"
+
+    invoke-static {v13, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v1, 0x7f120565
+
+    invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v14
+
+    const v1, 0x7f1203b8
+
+    invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v15
+
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
     new-instance v2, Lf/a/a/l;
 
-    invoke-direct {v2, v6}, Lf/a/a/l;-><init>(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v2, v8}, Lf/a/a/l;-><init>(Lkotlin/jvm/functions/Function1;)V
 
     new-instance v3, Lkotlin/Pair;
 
@@ -156,51 +170,42 @@
 
     invoke-static {v3}, Lf/n/a/k/a;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result-object v14
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
+    move-result-object v16
 
     const/16 v17, 0x0
 
+    const/16 v18, 0x0
+
+    const/16 v19, 0x0
+
     const v1, 0x7f0403d0
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v18
-
-    const/16 v19, 0x0
-
-    const/16 v20, 0x0
+    move-result-object v20
 
     const/16 v21, 0x0
 
-    const/16 v22, 0x1dc0
+    const/16 v22, 0x0
 
     const/16 v23, 0x0
 
-    invoke-static/range {v8 .. v23}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
+    const/16 v24, 0x1dc0
+
+    const/16 v25, 0x0
+
+    invoke-static/range {v10 .. v25}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
 
     goto/16 :goto_0
 
     :cond_1
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
-
-    :cond_2
     iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v9
+    move-result-object v11
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
@@ -208,65 +213,77 @@
 
     move-result-object v1
 
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;
 
     invoke-direct {v2, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;)V
 
-    new-instance v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;
+    new-instance v8, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;
 
-    invoke-direct {v6, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;)V
+    invoke-direct {v8, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;)V
 
-    sget-object v8, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+    invoke-static {v11, v7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v7, 0x7f120c75
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1, v7}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    const-string v6, "onAccept"
 
-    move-result-object v10
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v7, 0x7f1216f6
+    const-string v6, "onIgnore"
 
-    invoke-virtual {v1, v7}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-static {v8, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v11
+    sget-object v10, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const-string v7, "context.getString(R.stri\u2026iend_request_dialog_body)"
+    const v6, 0x7f120c9b
 
-    invoke-static {v11, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v7, 0x7f1207a7
-
-    invoke-virtual {v1, v7}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v1, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v12
 
-    const v7, 0x7f1207ab
+    const v6, 0x7f121720
 
-    invoke-virtual {v1, v7}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v1, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v13
 
+    const-string v6, "context.getString(R.stri\u2026iend_request_dialog_body)"
+
+    invoke-static {v13, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v6, 0x7f1207a9
+
+    invoke-virtual {v1, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v14
+
+    const v6, 0x7f1207ad
+
+    invoke-virtual {v1, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v15
+
     const/4 v1, 0x2
 
     new-array v1, v1, [Lkotlin/Pair;
 
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v5
 
-    new-instance v7, Lf/a/a/j;
+    new-instance v6, Lf/a/a/j;
 
-    invoke-direct {v7, v2}, Lf/a/a/j;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v6, v2}, Lf/a/a/j;-><init>(Lkotlin/jvm/functions/Function0;)V
 
     new-instance v2, Lkotlin/Pair;
 
-    invoke-direct {v2, v4, v7}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    invoke-direct {v2, v5, v6}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
-    aput-object v2, v1, v5
+    aput-object v2, v1, v4
 
-    const v2, 0x7f0a0627
+    const v2, 0x7f0a062d
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -274,7 +291,7 @@
 
     new-instance v4, Lf/a/a/k;
 
-    invoke-direct {v4, v6}, Lf/a/a/k;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v4, v8}, Lf/a/a/k;-><init>(Lkotlin/jvm/functions/Function0;)V
 
     new-instance v5, Lkotlin/Pair;
 
@@ -284,11 +301,7 @@
 
     invoke-static {v1}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
-    move-result-object v14
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
+    move-result-object v16
 
     const/16 v17, 0x0
 
@@ -300,11 +313,15 @@
 
     const/16 v21, 0x0
 
-    const/16 v22, 0x1fc0
+    const/16 v22, 0x0
 
     const/16 v23, 0x0
 
-    invoke-static/range {v8 .. v23}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
+    const/16 v24, 0x1fc0
+
+    const/16 v25, 0x0
+
+    invoke-static/range {v10 .. v25}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;->show$default(Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lcom/discord/stores/StoreNotices$Dialog$Type;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;IILjava/lang/Object;)V
 
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$2.smali
index 846144c6ab..b9561bfbce 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
index 2f44779a55..0fbea5cb8e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function5<",
         "Landroid/content/Context;",
         "Ljava/lang/Long;",
@@ -33,45 +33,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x5
+    const-class v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x5
+
+    const-string v4, "onActivityCustomButtonClicked"
+
+    const-string v5, "onActivityCustomButtonClicked(Landroid/content/Context;JLjava/lang/String;JI)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onActivityCustomButtonClicked"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onActivityCustomButtonClicked(Landroid/content/Context;JLjava/lang/String;JI)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 8
 
@@ -111,28 +95,28 @@
 .end method
 
 .method public final invoke(Landroid/content/Context;JLjava/lang/String;JI)V
-    .locals 10
+    .locals 9
 
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p4, :cond_0
-
-    move-object v9, p0
-
-    iget-object v0, v9, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    move-object v1, v0
-
-    check-cast v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    const-string v0, "p1"
 
     move-object v2, p1
 
-    move-wide v3, p2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p3"
 
     move-object v5, p4
 
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    move-wide v3, p2
+
     move-wide v6, p5
 
     move/from16 v8, p7
@@ -140,22 +124,4 @@
     invoke-virtual/range {v1 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->onActivityCustomButtonClicked(Landroid/content/Context;JLjava/lang/String;JI)V
 
     return-void
-
-    :cond_0
-    move-object v9, p0
-
-    const-string v1, "p3"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    move-object v9, p0
-
-    const-string v1, "p1"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
index 4c0ce19131..a8fb624945 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function3<",
         "Ljava/lang/Long;",
         "Ljava/lang/String;",
@@ -41,7 +41,7 @@
 
     const/4 p1, 0x3
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
 .method public final invoke(JLjava/lang/String;I)V
     .locals 0
 
-    if-eqz p3, :cond_0
+    const-string p4, "<anonymous parameter 1>"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
@@ -86,13 +88,4 @@
     invoke-virtual {p3, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->moveUserToChannel(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 1>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
index c93187a4ea..a889fca927 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
@@ -55,7 +55,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;->$userId:J
 
@@ -63,6 +63,10 @@
 
     if-eqz p1, :cond_0
 
+    const-string p1, "fragmentManager"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance p1, Lf/a/a/b/a;
 
     invoke-direct {p1}, Lf/a/a/b/a;-><init>()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
index b2903d3de3..ee17a023fc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali
index 98b2e052f7..954f2847d4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$12.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$12.smali
index 253df34b30..1ceea3303b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$12.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$12.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$12;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/View;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,9 +66,11 @@
 .end method
 
 .method public final invoke(Landroid/view/View;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -92,13 +94,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$13.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$13.smali
index 07199de74c..5bd292b58f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$13.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$13.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$13;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/widget/TextView;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/widget/TextView;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$13;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
@@ -90,13 +92,4 @@
     invoke-virtual {p1}, Landroid/widget/LinearLayout;->clearFocus()V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.smali
index 3a070f9177..60f4caeebc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.smali
@@ -39,11 +39,13 @@
 .method public onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "host"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "info"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 
@@ -56,18 +58,4 @@
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setTraversalAfter(Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.smali
index 965bba52c7..7831d0f46c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.smali
@@ -28,11 +28,13 @@
 .method public onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "host"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "info"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 
@@ -41,18 +43,4 @@
     invoke-virtual {p2, p1}, Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setHeading(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "info"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
index 585a40f7ea..a7a49f56a8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
index 1570449661..3139407b3b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
index 018da63b1c..26df268f30 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Ljava/lang/Float;",
         "Ljava/lang/Boolean;",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
index 905313a3eb..3d64b6c667 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
index d1bc814daa..fc5108839d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
index 37f99b5f0f..2f88d3830a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
index d77a043ee8..2d7e19851c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
index d32856f242..aa1582e8d7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
index c5b07b1d07..f3e7a9be18 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
@@ -104,561 +104,393 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "sheetLoadingContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSheetLoadingContainer()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "sheetLoadingContainer"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getSheetLoadingContainer()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "moreButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getMoreButton()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "moreButton"
-
-    const-string v4, "getMoreButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "userProfileHeaderView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userProfileHeaderView"
-
-    const-string v4, "getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "profileActionsDivider"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getProfileActionsDivider()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "profileActionsDivider"
-
-    const-string v4, "getProfileActionsDivider()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "profileActionsContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getProfileActionsContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "profileActionsContainer"
-
-    const-string v4, "getProfileActionsContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "messageActionButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMessageActionButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "messageActionButton"
-
-    const-string v4, "getMessageActionButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "callActionButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCallActionButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "callActionButton"
-
-    const-string v4, "getCallActionButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "videoActionButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVideoActionButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "videoActionButton"
-
-    const-string v4, "getVideoActionButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "addFriendActionButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAddFriendActionButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "addFriendActionButton"
-
-    const-string v4, "getAddFriendActionButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "pendingFriendRequestActionButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPendingFriendRequestActionButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "pendingFriendRequestActionButton"
-
-    const-string v4, "getPendingFriendRequestActionButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "incomingFriendRequestHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIncomingFriendRequestHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "incomingFriendRequestHeader"
-
-    const-string v4, "getIncomingFriendRequestHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "incomingFriendRequestContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIncomingFriendRequestContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "incomingFriendRequestContainer"
-
-    const-string v4, "getIncomingFriendRequestContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "friendRequestIgnoreButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFriendRequestIgnoreButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "friendRequestIgnoreButton"
-
-    const-string v4, "getFriendRequestIgnoreButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xc
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "friendRequestAcceptButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFriendRequestAcceptButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "friendRequestAcceptButton"
-
-    const-string v4, "getFriendRequestAcceptButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "richPresenceContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRichPresenceContainer()Landroid/widget/FrameLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "richPresenceContainer"
-
-    const-string v4, "getRichPresenceContainer()Landroid/widget/FrameLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "rolesList"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRolesList()Lcom/discord/widgets/roles/RolesListView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "rolesList"
-
-    const-string v4, "getRolesList()Lcom/discord/widgets/roles/RolesListView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "guildContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildContainer"
-
-    const-string v4, "getGuildContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "guildHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getGuildHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "guildHeader"
-
-    const-string v4, "getGuildHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "voiceSettingsHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceSettingsHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "voiceSettingsHeader"
-
-    const-string v4, "getVoiceSettingsHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "userProfileVoiceSettingsView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserProfileVoiceSettingsView()Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userProfileVoiceSettingsView"
-
-    const-string v4, "getUserProfileVoiceSettingsView()Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "connectionsHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectionsHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectionsHeader"
-
-    const-string v4, "getConnectionsHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "userProfileConnectionsView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userProfileConnectionsView"
-
-    const-string v4, "getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "noteTextFieldWrap"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNoteTextFieldWrap()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "noteTextFieldWrap"
-
-    const-string v4, "getNoteTextFieldWrap()Lcom/google/android/material/textfield/TextInputLayout;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "noteHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNoteHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "noteHeader"
-
-    const-string v4, "getNoteHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "userProfileAdminCard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserProfileAdminCard()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userProfileAdminCard"
-
-    const-string v4, "getUserProfileAdminCard()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x18
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "userProfileAdminView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userProfileAdminView"
-
-    const-string v4, "getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x19
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "developerHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeveloperHeader()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "developerHeader"
-
-    const-string v4, "getDeveloperHeader()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1a
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    const-string v2, "copyIdButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCopyIdButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "copyIdButton"
-
-    const-string v4, "getCopyIdButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x1b
 
@@ -682,7 +514,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0a0c
+    const v0, 0x7f0a0a10
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -690,7 +522,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->sheetLoadingContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a0e
+    const v0, 0x7f0a0a12
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -698,7 +530,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->moreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a15
+    const v0, 0x7f0a0a19
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -706,7 +538,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a14
+    const v0, 0x7f0a0a18
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -714,7 +546,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a13
+    const v0, 0x7f0a0a17
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -722,7 +554,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a0d
+    const v0, 0x7f0a0a11
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -730,7 +562,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->messageActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09fe
+    const v0, 0x7f0a0a02
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -738,7 +570,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->callActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a19
+    const v0, 0x7f0a0a1d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -746,7 +578,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->videoActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09fa
+    const v0, 0x7f0a09fe
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -754,7 +586,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->addFriendActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a12
+    const v0, 0x7f0a0a16
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -762,7 +594,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->pendingFriendRequestActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a0b
+    const v0, 0x7f0a0a0f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -770,7 +602,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a07
+    const v0, 0x7f0a0a0b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -778,7 +610,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a06
+    const v0, 0x7f0a0a0a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -786,7 +618,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestIgnoreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a05
+    const v0, 0x7f0a0a09
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -794,7 +626,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a074c
+    const v0, 0x7f0a0752
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -802,7 +634,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->richPresenceContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a18
+    const v0, 0x7f0a0a1c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -810,7 +642,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a08
+    const v0, 0x7f0a0a0c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -818,7 +650,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a09
+    const v0, 0x7f0a0a0d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -826,7 +658,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a16
+    const v0, 0x7f0a0a1a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -834,7 +666,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->voiceSettingsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a17
+    const v0, 0x7f0a0a1b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -842,7 +674,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileVoiceSettingsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09ff
+    const v0, 0x7f0a0a03
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -850,7 +682,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->connectionsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a00
+    const v0, 0x7f0a0a04
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -858,7 +690,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileConnectionsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a11
+    const v0, 0x7f0a0a15
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -866,7 +698,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->noteTextFieldWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a10
+    const v0, 0x7f0a0a14
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -874,7 +706,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->noteHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09fb
+    const v0, 0x7f0a09ff
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -882,7 +714,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileAdminCard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09fc
+    const v0, 0x7f0a0a00
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -890,7 +722,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileAdminView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a04
+    const v0, 0x7f0a0a08
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -898,7 +730,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->developerHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a02
+    const v0, 0x7f0a0a06
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -927,7 +759,7 @@
     :cond_0
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -988,7 +820,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -1036,7 +868,7 @@
 
     if-eqz v0, :cond_0
 
-    const v2, 0x7f1207b3
+    const v2, 0x7f1207b5
 
     invoke-virtual {v0, v1, p1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;Ljava/lang/String;I)V
 
@@ -1045,7 +877,7 @@
     :cond_0
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -1449,7 +1281,7 @@
 
     const-string v3, ""
 
-    const v4, 0x7f120fba
+    const v4, 0x7f120fe4
 
     if-eqz v1, :cond_0
 
@@ -1486,7 +1318,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120e3c
+    const v0, 0x7f120e62
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -2008,7 +1840,7 @@
     :cond_7
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
@@ -2827,13 +2659,13 @@
 
     if-eqz v0, :cond_a
 
-    const p1, 0x7f1216f4
+    const p1, 0x7f12171e
 
     const/4 v0, 0x0
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->handleDismissSheet()V
 
@@ -2880,7 +2712,7 @@
 
     const-string p1, "parentFragmentManager"
 
-    invoke-static {v6, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/user/WidgetKickUser$Companion;->launch(Ljava/lang/String;JJLandroidx/fragment/app/FragmentManager;)V
 
@@ -2918,7 +2750,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
 
@@ -2967,7 +2799,7 @@
     :cond_0
     const-string p1, "privateCallLauncher"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -2992,7 +2824,7 @@
     :cond_0
     const-string p1, "privateCallLauncher"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -3062,7 +2894,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->m(Landroidx/fragment/app/Fragment;Ljava/lang/CharSequence;II)V
 
     return-void
 .end method
@@ -3078,7 +2910,7 @@
 
     const/4 v1, 0x4
 
-    invoke-static {p0, p1, v0, v1}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p0, p1, v0, v1}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     return-void
 .end method
@@ -3090,7 +2922,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f1207ac
+    const v1, 0x7f1207ae
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
 
@@ -3099,7 +2931,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -3120,7 +2952,7 @@
     :cond_0
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -3298,43 +3130,47 @@
 
     move-object/from16 v7, p0
 
-    const/4 v0, 0x0
+    const-string v0, "compositeSubscription"
 
-    if-eqz p1, :cond_2
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "ARG_USER_ID"
+    const-string v1, "ARG_USER_ID"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
     move-result-wide v4
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "ARG_CHANNEL_ID"
+    const-string v1, "ARG_CHANNEL_ID"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v1
+    move-result-wide v0
 
-    iget-object v3, v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    iget-object v2, v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const-string v6, "viewModel"
+    const-string v3, "viewModel"
 
-    if-eqz v3, :cond_1
+    const/4 v6, 0x0
 
-    invoke-virtual {v3}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    if-eqz v2, :cond_1
 
-    move-result-object v3
+    invoke-virtual {v2}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
+
+    move-result-object v2
 
     const/4 v8, 0x2
 
-    invoke-static {v3, v7, v0, v8, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v2, v7, v6, v8, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v9
 
@@ -3358,15 +3194,15 @@
 
     invoke-static/range {v9 .. v17}, 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
 
-    iget-object v3, v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    iget-object v2, v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
-    invoke-virtual {v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeEvents()Lrx/Observable;
+    invoke-virtual {v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->observeEvents()Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-static {v3, v7, v0, v8, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v2, v7, v6, v8, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v9
 
@@ -3390,16 +3226,18 @@
 
     invoke-static/range {v9 .. v17}, 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
 
-    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
+    sget-object v2, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->Companion:Lcom/discord/widgets/user/profile/UserProfileHeaderView$Companion;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
     move-result-object v3
 
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v6
 
+    move-object v0, v2
+
     move-object v1, v3
 
     move-object/from16 v2, p0
@@ -3411,21 +3249,14 @@
     return-void
 
     :cond_0
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v6
 
     :cond_1
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_2
-    const-string v1, "compositeSubscription"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v6
 .end method
 
 .method public getContentViewResId()I
@@ -3473,7 +3304,9 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 11
 
-    if-eqz p1, :cond_1
+    const-string v0, "inflater"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
@@ -3553,7 +3386,7 @@
 
     const-string v1, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
@@ -3567,7 +3400,7 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -3575,7 +3408,7 @@
 
     const-string v3, "parentFragmentManager"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p0, p0, v1, v2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 
@@ -3588,20 +3421,11 @@
     return-object p1
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.widgets.user.usersheet.WidgetUserSheet.StreamPreviewClickBehavior"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -3682,7 +3506,7 @@
     :cond_2
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -3743,11 +3567,11 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 7
+    .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -3759,7 +3583,7 @@
 
     invoke-virtual {p1, p2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v3
+    move-result-wide v2
 
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
@@ -3769,7 +3593,7 @@
 
     invoke-virtual {p1, p2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v5
+    move-result-wide v4
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getMoreButton()Landroid/view/View;
 
@@ -3777,11 +3601,11 @@
 
     new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;
 
-    move-object v1, p2
+    move-object v0, p2
 
-    move-object v2, p0
+    move-object v1, p0
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;JJ)V
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;JJ)V
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -3793,21 +3617,21 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "parentFragmentManager"
+    const-string v1, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    const-string v3, "requireContext()"
+    const-string v2, "requireContext()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v1, v2}, Lcom/discord/widgets/user/Badge$Companion;->onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
+    invoke-virtual {p2, v0, v1}, Lcom/discord/widgets/user/Badge$Companion;->onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
 
     move-result-object p2
 
@@ -3931,11 +3755,13 @@
 
     invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$13;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, p2, v2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, p2, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnImeActionDone$default(Lcom/google/android/material/textfield/TextInputLayout;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/Unit;
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getMoreButton()Landroid/view/View;
 
@@ -3955,45 +3781,45 @@
 
     move-result-object p2
 
-    aput-object p2, p1, v1
+    aput-object p2, p1, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getGuildHeader()Landroid/widget/TextView;
 
     move-result-object p2
 
-    aput-object p2, p1, v2
-
-    const/4 p2, 0x2
+    aput-object p2, p1, v1
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getNoteHeader()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object p2
 
-    aput-object v0, p1, p2
+    const/4 v0, 0x2
 
-    const/4 p2, 0x3
+    aput-object p2, p1, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getDeveloperHeader()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object p2
 
-    aput-object v0, p1, p2
+    const/4 v0, 0x3
 
-    const/4 p2, 0x4
+    aput-object p2, p1, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getIncomingFriendRequestHeader()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object p2
 
-    aput-object v0, p1, p2
+    const/4 v0, 0x4
 
-    const/4 p2, 0x5
+    aput-object p2, p1, v0
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getVoiceSettingsHeader()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object p2
 
-    aput-object v0, p1, p2
+    const/4 v0, 0x5
+
+    aput-object p2, p1, v0
 
     invoke-static {p1}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
@@ -4026,11 +3852,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
index 551a8d8420..7dcf31a750 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
index b40e222ce8..45de9269cf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Ljava/lang/String;JJ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "username"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-wide p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;->userId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;Ljava/lang/String;JJILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;
@@ -118,30 +113,23 @@
 .method public final copy(Ljava/lang/String;JJ)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "username"
 
-    new-instance v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-wide v2, p2
+    move-object v2, p1
 
-    move-wide v4, p4
+    move-wide v3, p2
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;-><init>(Ljava/lang/String;JJ)V
+    move-wide v5, p4
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;-><init>(Ljava/lang/String;JJ)V
 
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -159,7 +147,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;->username:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
index 36d9a1845c..258b61f4ec 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Ljava/lang/String;JJ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "username"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-wide p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;->userId:J
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;Ljava/lang/String;JJILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;
@@ -118,30 +113,23 @@
 .method public final copy(Ljava/lang/String;JJ)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "username"
 
-    new-instance v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move-wide v2, p2
+    move-object v2, p1
 
-    move-wide v4, p4
+    move-wide v3, p2
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;-><init>(Ljava/lang/String;JJ)V
+    move-wide v5, p4
 
-    return-object v6
+    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;-><init>(Ljava/lang/String;JJ)V
 
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -159,7 +147,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;->username:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate.smali
index da8c80c180..44bea66554 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelApplicationStream;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;-><init>(Lcom/discord/models/domain/ModelApplicationStream;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchSpectate;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream.smali
index a2656ba0ef..2d2ffc1a36 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
     return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream;Lcom/discord/models/domain/ModelApplicationStream;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelApplicationStream;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream;-><init>(Lcom/discord/models/domain/ModelApplicationStream;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$RequestPermissionsForSpectateStream;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast.smali
index d054a2527c..b7ed637143 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast.smali
@@ -24,9 +24,11 @@
 .method public constructor <init>(ILjava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "username"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -35,13 +37,6 @@
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast;->username:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast;ILjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast;
@@ -89,22 +84,15 @@
 .method public final copy(ILjava/lang/String;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "username"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast;-><init>(ILjava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -128,7 +116,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowFriendRequestErrorToast;->username:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
index 007267a506..9c4e1c36dd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
@@ -146,23 +146,37 @@
 
     move-object/from16 v8, p18
 
-    const/4 v9, 0x0
+    const-string v9, "user"
 
-    if-eqz v1, :cond_7
+    invoke-static {p1, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_6
+    const-string v9, "me"
 
-    if-eqz v3, :cond_5
+    invoke-static {p2, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_4
+    const-string v9, "computedMembers"
 
-    if-eqz v5, :cond_3
+    invoke-static {p4, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v6, :cond_2
+    const-string v9, "guildRoles"
 
-    if-eqz v7, :cond_1
+    invoke-static {p5, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v8, :cond_0
+    const-string v9, "mySelectedVoiceChannelVoiceStates"
+
+    invoke-static {v5, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "currentChannelVoiceStates"
+
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "userProfile"
+
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "userNote"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -223,62 +237,6 @@
     iput-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Lcom/discord/stores/StoreUserNotes$UserNoteState;
 
     return-void
-
-    :cond_0
-    const-string v1, "userNote"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_1
-    const-string v1, "userProfile"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_2
-    const-string v1, "currentChannelVoiceStates"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_3
-    const-string v1, "mySelectedVoiceChannelVoiceStates"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_4
-    const-string v1, "guildRoles"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_5
-    const-string v1, "computedMembers"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_6
-    const-string v1, "me"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_7
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZFLcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Lcom/discord/stores/StoreUserNotes$UserNoteState;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
@@ -736,7 +694,7 @@
 .end method
 
 .method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZFLcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Lcom/discord/stores/StoreUserNotes$UserNoteState;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
-    .locals 20
+    .locals 21
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -775,123 +733,99 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_7
+    move-object/from16 v2, p2
 
-    if-eqz p2, :cond_6
+    move-object/from16 v3, p3
 
-    if-eqz p4, :cond_5
+    move-object/from16 v4, p4
 
-    if-eqz p5, :cond_4
+    move-object/from16 v5, p5
 
-    if-eqz p6, :cond_3
+    move-object/from16 v6, p6
 
-    if-eqz p7, :cond_2
+    move-object/from16 v7, p7
 
-    if-eqz p16, :cond_1
+    move/from16 v8, p8
 
-    if-eqz p18, :cond_0
+    move/from16 v9, p9
 
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    move/from16 v10, p10
 
-    move-object v1, v0
+    move/from16 v11, p11
 
-    move-object/from16 v2, p1
+    move-object/from16 v12, p12
 
-    move-object/from16 v3, p2
+    move-object/from16 v13, p13
 
-    move-object/from16 v4, p3
+    move-object/from16 v14, p14
 
-    move-object/from16 v5, p4
+    move-object/from16 v15, p15
 
-    move-object/from16 v6, p5
+    move-object/from16 v16, p16
 
-    move-object/from16 v7, p6
+    move-object/from16 v17, p17
 
-    move-object/from16 v8, p7
+    move-object/from16 v18, p18
 
-    move/from16 v9, p8
+    const-string v0, "user"
 
-    move/from16 v10, p9
+    move-object/from16 v19, v1
 
-    move/from16 v11, p10
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v12, p11
+    const-string v0, "me"
 
-    move-object/from16 v13, p12
+    move-object/from16 v1, p2
 
-    move-object/from16 v14, p13
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v15, p14
+    const-string v0, "computedMembers"
 
-    move-object/from16 v16, p15
+    move-object/from16 v1, p4
 
-    move-object/from16 v17, p16
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v18, p17
+    const-string v0, "guildRoles"
 
-    move-object/from16 v19, p18
+    move-object/from16 v1, p5
 
-    invoke-direct/range {v1 .. v19}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZFLcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Lcom/discord/stores/StoreUserNotes$UserNoteState;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object v0
+    const-string v0, "mySelectedVoiceChannelVoiceStates"
 
-    :cond_0
-    const-string v1, "userNote"
+    move-object/from16 v1, p6
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "currentChannelVoiceStates"
 
-    :cond_1
-    const-string v1, "userProfile"
+    move-object/from16 v1, p7
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "userProfile"
 
-    :cond_2
-    const-string v1, "currentChannelVoiceStates"
+    move-object/from16 v1, p16
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    const-string v0, "userNote"
 
-    :cond_3
-    const-string v1, "mySelectedVoiceChannelVoiceStates"
+    move-object/from16 v1, p18
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
+    new-instance v20, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
 
-    :cond_4
-    const-string v1, "guildRoles"
+    move-object/from16 v0, v20
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, v19
 
-    throw v0
+    invoke-direct/range {v0 .. v18}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZFLcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Lcom/discord/stores/StoreUserNotes$UserNoteState;)V
 
-    :cond_5
-    const-string v1, "computedMembers"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "me"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v20
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -909,7 +843,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -919,7 +853,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -929,7 +863,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -939,7 +873,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -949,7 +883,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -959,7 +893,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->mySelectedVoiceChannelVoiceStates:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -969,7 +903,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->currentChannelVoiceStates:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1007,7 +941,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1017,7 +951,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1027,7 +961,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->permissions:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1037,7 +971,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1047,7 +981,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1057,7 +991,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1067,7 +1001,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Lcom/discord/stores/StoreUserNotes$UserNoteState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
index 97c48caba8..50f091f1dc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
@@ -93,18 +93,28 @@
 
     move-object/from16 v5, p15
 
+    const-string v6, "user"
+
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "voiceSettingsViewState"
+
+    invoke-static {p4, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "roleItems"
+
+    invoke-static {p8, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "connectionsViewState"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "userNote"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v6, 0x0
 
-    if-eqz v1, :cond_4
-
-    if-eqz v2, :cond_3
-
-    if-eqz v3, :cond_2
-
-    if-eqz v4, :cond_1
-
-    if-eqz v5, :cond_0
-
     invoke-direct {p0, v6}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->user:Lcom/discord/models/domain/ModelUser;
@@ -158,41 +168,6 @@
     iput-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Lcom/discord/stores/StoreUserNotes$UserNoteState;
 
     return-void
-
-    :cond_0
-    const-string v1, "userNote"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_1
-    const-string v1, "connectionsViewState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_2
-    const-string v1, "roleItems"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_3
-    const-string v1, "voiceSettingsViewState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_4
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lcom/discord/stores/StoreUserNotes$UserNoteState;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
@@ -576,38 +551,50 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "user"
 
-    if-eqz p1, :cond_4
+    move-object/from16 v2, p1
 
-    if-eqz p4, :cond_3
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_2
+    const-string v0, "voiceSettingsViewState"
 
-    if-eqz p14, :cond_1
+    move-object/from16 v5, p4
 
-    if-eqz p15, :cond_0
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "roleItems"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectionsViewState"
+
+    move-object/from16 v15, p14
+
+    invoke-static {v15, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userNote"
+
+    move-object/from16 v14, p15
+
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
     move-object v1, v0
 
-    move-object/from16 v2, p1
-
     move/from16 v3, p2
 
     move/from16 v4, p3
 
-    move-object/from16 v5, p4
-
     move-object/from16 v6, p5
 
     move-object/from16 v7, p6
 
     move-object/from16 v8, p7
 
-    move-object/from16 v9, p8
-
     move-object/from16 v10, p9
 
     move-object/from16 v11, p10
@@ -618,48 +605,11 @@
 
     move/from16 v14, p13
 
-    move-object/from16 v15, p14
-
     move-object/from16 v16, p15
 
     invoke-direct/range {v1 .. v16}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lcom/discord/stores/StoreUserNotes$UserNoteState;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "userNote"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "connectionsViewState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "roleItems"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "voiceSettingsViewState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "user"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -677,7 +627,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -699,7 +649,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->voiceSettingsViewState:Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -709,7 +659,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->channelVoiceState:Lcom/discord/models/domain/ModelVoice$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -719,7 +669,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -729,7 +679,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->guildSectionHeaderText:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -739,7 +689,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->roleItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -749,7 +699,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->adminViewState:Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -759,7 +709,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -769,7 +719,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -779,7 +729,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->guildName:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -795,7 +745,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -805,7 +755,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Lcom/discord/stores/StoreUserNotes$UserNoteState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
index 55bfbe5865..ff59d650f4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$1.smali
index f719beede2..453c93bfff 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     const-string v2, "error.response"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$2.smali
index 935651d5a8..26c70423ad 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     iget-object v0, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v1, 0x7f120560
+    const v1, 0x7f120562
 
     invoke-static {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
index 2a2dc33265..61078435b6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "error"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/rest/RestAPIAbortMessages;->INSTANCE:Lcom/discord/utilities/rest/RestAPIAbortMessages;
 
@@ -80,13 +82,4 @@
     invoke-virtual {v0, p1, v1, v2}, Lcom/discord/utilities/rest/RestAPIAbortMessages;->handleAbortCodeOrDefault(Lcom/discord/utilities/error/Error;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "error"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.smali
index fe40542c2b..f448891e8c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1205ac
+    const v0, 0x7f1205ae
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.smali
index 6f8b24cd1f..4e73a821c9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
index 1077b1e929..f0a93d7b1d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
index 56861b274b..f6884e14d4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
index 1707dded6a..0d9a8be00d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
index da33ccae57..a709972151 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
index a07a3bedc2..d3e89206e8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
index cfc8f97e8e..4b2179d7d0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
index a6e2c45e55..90271b8b5d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
index a2f1eba65c..4dfd4b0ab2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
index 8b03fb6ea3..7faaae8beb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
index b3e2e0e2cb..d3ee388a24 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120f10
+    const v0, 0x7f120f3a
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
index 9f710e7b06..d1097783a2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1.smali
index 2711d0af64..e7089605d1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelActivityMetaData;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     iget v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1;->$buttonIndex:I
 
-    invoke-static {p1, v0}, Lj0/i/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/j/l;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
index 4edf0796f1..dba539199a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
index c6ecd95eb6..f3a6ad512c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,22 +61,15 @@
 .method public final invoke(Lcom/discord/utilities/error/Error;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120560
+    const v0, 0x7f120562
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
index ab8f9d6b69..6e7cd645e6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
index ac3f03f8a4..740ce545e0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetUserSheetViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;",
         ">;"
     }
@@ -76,7 +76,7 @@
 .end method
 
 .method public constructor <init>(JLjava/lang/Long;Ljava/lang/String;ZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Lrx/Observable;)V
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -95,25 +95,37 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeMediaSettings"
 
-    if-eqz p6, :cond_6
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_5
+    const-string v0, "storeChannels"
 
-    if-eqz p8, :cond_4
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_3
+    const-string v0, "storeApplicationStreaming"
 
-    if-eqz p10, :cond_2
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p11, :cond_1
+    const-string v0, "restAPI"
 
-    if-eqz p12, :cond_0
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized;
+    const-string v0, "restAPISerializeNulls"
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "streamPreviewClickBehavior"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeObservable"
+
+    invoke-static {p12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userId:J
 
@@ -145,15 +157,19 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object p3
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class p4, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    move-result-object p4
 
-    const/4 p5, 0x0
+    const-class p5, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    new-instance p10, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;
+
+    invoke-direct {p10, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
 
     const/4 p6, 0x0
 
@@ -161,66 +177,15 @@
 
     const/4 p8, 0x0
 
-    new-instance p9, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;
+    const/4 p9, 0x0
 
-    invoke-direct {p9, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    const/16 p11, 0x1e
 
-    const/16 p10, 0x1e
+    const/4 p12, 0x0
 
-    const/4 p11, 0x0
-
-    invoke-static/range {p3 .. p11}, 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
+    invoke-static/range {p4 .. p12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "streamPreviewClickBehavior"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "restAPISerializeNulls"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "restAPI"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "storeApplicationStreaming"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "storeChannels"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "storeMediaSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$emitDismissSheetEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
@@ -553,7 +518,7 @@
 
     const-string v0, "userProfile.connectedAccounts"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -586,7 +551,7 @@
 
     const-string v3, "connectedAccount"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v2, v1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;-><init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
 
@@ -836,13 +801,13 @@
 
     move-result v4
 
-    invoke-static {v15, v1}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v15, v1}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Lcom/discord/models/domain/ModelGuildMember$Computed;
 
-    invoke-static {v0, v1}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -891,14 +856,14 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {v7}, Lj0/i/l;->sorted(Ljava/lang/Iterable;)Ljava/util/List;
+    invoke-static {v7}, Lk0/j/l;->sorted(Ljava/lang/Iterable;)Ljava/util/List;
 
     move-result-object v3
 
     goto :goto_2
 
     :cond_4
-    sget-object v3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v3, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_2
     move-object/from16 v18, v3
@@ -922,7 +887,7 @@
 
     const-string v1, "memberMe.roles"
 
-    invoke-static {v11, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
 
@@ -930,7 +895,7 @@
 
     const-string v1, "member.roles"
 
-    invoke-static {v12, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getPermissions()Ljava/lang/Long;
 
@@ -993,7 +958,7 @@
 
     move-result-object v1
 
-    invoke-static {v15, v1}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v15, v1}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1003,7 +968,7 @@
 
     move-result-object v3
 
-    invoke-static {v0, v3}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v0, v3}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1095,7 +1060,7 @@
 
     move-result-object v0
 
-    invoke-static {v15, v0}, Lf/e/b/a/a;->W(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
+    invoke-static {v15, v0}, Lf/e/b/a/a;->Y(Lcom/discord/models/domain/ModelUser;Ljava/util/Map;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1198,7 +1163,7 @@
 
     invoke-direct/range {v7 .. v22}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lcom/discord/stores/StoreUserNotes$UserNoteState;)V
 
-    invoke-virtual {v6, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v6, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1234,7 +1199,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {p2, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1251,15 +1216,15 @@
 
 # virtual methods
 .method public final addRelationship(Ljava/lang/Integer;Ljava/lang/String;I)V
-    .locals 11
+    .locals 12
     .param p3    # I
         .annotation build Landroidx/annotation/StringRes;
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "username"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
@@ -1275,56 +1240,51 @@
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    invoke-static {p1, v1, v2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v2, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x2
+    const/4 v0, 0x2
 
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p0, v2, v0, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
-    const-class v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    const-class v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const/4 v4, 0x0
+    new-instance v9, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;
+
+    invoke-direct {v9, p0, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+
+    new-instance v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;
+
+    invoke-direct {v7, p0, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
-    new-instance v8, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;
+    const/4 v6, 0x0
 
-    invoke-direct {v8, p0, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
+    const/4 v8, 0x0
 
-    const/4 v7, 0x0
+    const/16 v10, 0x16
 
-    new-instance v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;
+    const/4 v11, 0x0
 
-    invoke-direct {v6, p0, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;Ljava/lang/String;)V
-
-    const/16 v9, 0x16
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "username"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final banUser()V
     .locals 10
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1359,7 +1319,7 @@
 
     const-string v3, "user.username"
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -1367,7 +1327,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -1392,7 +1352,7 @@
 .method public final disconnectUser()V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1427,7 +1387,7 @@
 
     const-string v4, "channel.guildId"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -1488,7 +1448,7 @@
 .method public final editMember()V
     .locals 7
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1519,7 +1479,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -1604,7 +1564,7 @@
 .method public final guildDeafenUser()V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1649,7 +1609,7 @@
 
     const-string v5, "channel.guildId"
 
-    invoke-static {v1, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -1712,7 +1672,7 @@
 .method public final guildMoveForUser()V
     .locals 5
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1743,7 +1703,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -1762,7 +1722,7 @@
 .method public final guildMuteUser()V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1811,7 +1771,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -1882,7 +1842,7 @@
 .method public final kickUser()V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1978,7 +1938,7 @@
 
     const-string v3, "user.username"
 
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -1986,7 +1946,7 @@
 
     const-string v3, "channel.guildId"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -2112,7 +2072,7 @@
 .method public final moveUserToChannel(J)V
     .locals 12
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2147,7 +2107,7 @@
 
     const-string v4, "channel.guildId"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -2222,87 +2182,77 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
 
 .method public final onActivityCustomButtonClicked(Landroid/content/Context;JLjava/lang/String;JI)V
-    .locals 14
+    .locals 15
 
     move-object v0, p0
 
-    move-object v1, p1
+    move-object/from16 v1, p1
 
-    const/4 v2, 0x0
+    const-string v2, "applicationContext"
 
-    if-eqz v1, :cond_1
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v2, "sessionId"
+
+    move-object/from16 v6, p4
+
+    invoke-static {v6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
     move-wide/from16 v4, p2
 
-    move-object/from16 v6, p4
-
     move-wide/from16 v7, p5
 
     invoke-virtual/range {v3 .. v8}, Lcom/discord/utilities/rest/RestAPI;->getActivityMetadata(JLjava/lang/String;J)Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v2
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
-    invoke-static {v3, v4, v5, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    const/4 v5, 0x0
 
-    move-result-object v3
+    invoke-static {v2, v3, v4, v5}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
-    const/4 v4, 0x2
+    move-result-object v2
 
-    invoke-static {v3, p0, v2, v4, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v3, 0x2
 
-    move-result-object v5
+    invoke-static {v2, p0, v5, v3, v5}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const/4 v6, 0x0
+    move-result-object v6
 
-    const/4 v8, 0x0
-
-    new-instance v9, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1;
+    new-instance v10, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1;
 
     move/from16 v2, p7
 
-    invoke-direct {v9, v2, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1;-><init>(ILandroid/content/Context;)V
+    invoke-direct {v10, v2, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$onActivityCustomButtonClicked$1;-><init>(ILandroid/content/Context;)V
 
-    const/4 v10, 0x0
+    const/4 v7, 0x0
+
+    const-string v8, "REST: Custom Button GetActivityMetadata"
+
+    const/4 v9, 0x0
 
     const/4 v11, 0x0
 
-    const/16 v12, 0x35
+    const/4 v12, 0x0
 
-    const/4 v13, 0x0
+    const/16 v13, 0x35
 
-    const-string v7, "REST: Custom Button GetActivityMetadata"
+    const/4 v14, 0x0
 
-    invoke-static/range {v5 .. v13}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    invoke-static/range {v6 .. v14}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string v1, "sessionId"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    const-string v1, "applicationContext"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public final onSpectatePermissionsGranted(Lcom/discord/models/domain/ModelApplicationStream;)V
@@ -2310,7 +2260,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
 
@@ -2344,21 +2296,14 @@
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onStreamPreviewClicked(Lcom/discord/utilities/streams/StreamContext;)V
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "streamContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/streams/StreamContext;->getJoinability()Lcom/discord/utilities/streams/StreamContext$Joinability;
 
@@ -2368,7 +2313,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const p1, 0x7f1203fb
+    const p1, 0x7f1203fc
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->emitShowToastEvent(I)V
 
@@ -2383,15 +2328,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "streamContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final removeRelationship(I)V
@@ -2473,7 +2409,7 @@
 .method public final toggleDeafen(Z)V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2506,7 +2442,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -2525,7 +2461,7 @@
 .method public final toggleMute(Z)V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2577,73 +2513,75 @@
 .method public final updateUserNote(Ljava/lang/String;)V
     .locals 13
 
-    const/4 v0, 0x0
+    const-string v0, "noteText"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object v0, v2
+
+    :cond_0
+    check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUserNote()Lcom/discord/stores/StoreUserNotes$UserNoteState;
 
     move-result-object v1
 
-    instance-of v2, v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
-
-    if-nez v2, :cond_0
-
-    move-object v1, v0
-
-    :cond_0
-    check-cast v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUserNote()Lcom/discord/stores/StoreUserNotes$UserNoteState;
-
-    move-result-object v2
-
-    instance-of v2, v2, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;
+    instance-of v1, v1, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;
 
     const/4 v3, 0x1
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUserNote()Lcom/discord/stores/StoreUserNotes$UserNoteState;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUserNote()Lcom/discord/stores/StoreUserNotes$UserNoteState;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;
+    check-cast v0, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;->getNote()Lcom/discord/models/domain/ModelUserNote;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUserNotes$UserNoteState$Loaded;->getNote()Lcom/discord/models/domain/ModelUserNote;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUserNote;->getNote()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUserNote;->getNote()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/2addr v1, v3
+    xor-int/2addr v0, v3
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
     iget-wide v4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userId:J
 
-    new-instance v2, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
 
-    invoke-direct {v2, p1}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, p1}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v1, v4, v5, v2}, Lcom/discord/utilities/rest/RestAPI;->updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
+    invoke-virtual {v0, v4, v5, v1}, Lcom/discord/utilities/rest/RestAPI;->updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-static {p1, v1, v3, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, v0, v3, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
@@ -2667,11 +2605,4 @@
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string p1, "noteText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData.smali
index 08ce9cf55e..b1083cfad2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData.smali
@@ -26,9 +26,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "me"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +43,6 @@
     iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;
@@ -127,22 +120,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "me"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "me"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -160,7 +146,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;->user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -170,7 +156,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;->me:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -180,7 +166,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -190,7 +176,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$2.smali
index 2cb19b406f..47d4b80387 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetUserSheetViewModelFactory.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function4<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lcom/discord/models/domain/ModelUser;",
@@ -48,64 +48,39 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x4
+    const-class v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x4
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$1.smali
index f3a185a5b8..4e0570fd49 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetUserSheetViewModelFactory.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2.smali
index bef150ab33..5f6f481d4d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetUserSheetViewModelFactory.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function15<",
         "Ljava/util/Map<",
         "Ljava/lang/Long;",
@@ -77,7 +77,7 @@
 
     const/16 p1, 0xf
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -123,105 +123,85 @@
 
     move-object/from16 v0, p0
 
-    const/4 v1, 0x0
+    move-object/from16 v5, p1
 
-    if-eqz p1, :cond_5
+    move-object/from16 v6, p2
 
-    if-eqz p2, :cond_4
+    move-object/from16 v7, p3
 
-    if-eqz p3, :cond_3
+    move-object/from16 v8, p4
 
-    if-eqz p4, :cond_2
+    move/from16 v9, p5
 
-    if-eqz p13, :cond_1
+    move/from16 v10, p6
 
-    if-eqz p15, :cond_0
+    move/from16 v11, p7
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    move/from16 v12, p8
 
-    move-object v2, v1
+    move-object/from16 v13, p9
 
-    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;->$user:Lcom/discord/models/domain/ModelUser;
+    move-object/from16 v14, p10
 
-    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;->$me:Lcom/discord/models/domain/ModelUser;
+    move-object/from16 v15, p11
 
-    iget-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;->$channel:Lcom/discord/models/domain/ModelChannel;
+    move-object/from16 v16, p12
 
-    move-object/from16 v6, p1
+    move-object/from16 v17, p13
 
-    move-object/from16 v7, p2
+    move-object/from16 v18, p14
 
-    move-object/from16 v8, p3
+    move-object/from16 v19, p15
 
-    move-object/from16 v9, p4
+    const-string v1, "computedMembers"
 
-    move/from16 v10, p5
+    move-object/from16 v2, p1
 
-    move/from16 v11, p6
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v12, p7
+    const-string v1, "guildRoles"
 
-    move/from16 v13, p8
+    move-object/from16 v2, p2
 
-    move-object/from16 v14, p9
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v15, p10
+    const-string v1, "mySelectedVoiceChannelVoiceStates"
 
-    move-object/from16 v16, p11
+    move-object/from16 v2, p3
 
-    move-object/from16 v17, p12
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v18, p13
+    const-string v1, "currentChannelVoiceStates"
 
-    move-object/from16 v19, p14
+    move-object/from16 v2, p4
 
-    move-object/from16 v20, p15
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {v2 .. v20}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZFLcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Lcom/discord/stores/StoreUserNotes$UserNoteState;)V
+    const-string v1, "userProfile"
 
-    return-object v1
+    move-object/from16 v2, p13
 
-    :cond_0
-    const-string v2, "userNote"
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v1, "userNote"
 
-    throw v1
+    move-object/from16 v2, p15
 
-    :cond_1
-    const-string v2, "userProfile"
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    new-instance v20, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
 
-    throw v1
+    move-object/from16 v1, v20
 
-    :cond_2
-    const-string v2, "currentChannelVoiceStates"
+    iget-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;->$user:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    iget-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;->$me:Lcom/discord/models/domain/ModelUser;
 
-    throw v1
+    iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;->$channel:Lcom/discord/models/domain/ModelChannel;
 
-    :cond_3
-    const-string v2, "mySelectedVoiceChannelVoiceStates"
+    invoke-direct/range {v1 .. v19}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ZZZFLcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Long;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Lcom/discord/stores/StoreUserNotes$UserNoteState;)V
 
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    const-string v2, "guildRoles"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    const-string v2, "computedMembers"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
+    return-object v20
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3.smali
index f5e398afdc..0b395054d8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3.smali
@@ -3,7 +3,7 @@
 .source "WidgetUserSheetViewModelFactory.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -94,7 +96,7 @@
 .end method
 
 .method public final call(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$BootstrapData;)Lrx/Observable;
-    .locals 26
+    .locals 25
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -137,7 +139,7 @@
 
     sget-object v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -146,152 +148,144 @@
     :cond_0
     const/4 v5, 0x1
 
-    const-string v6, "Observable.just(emptyMap())"
-
-    const-string v7, "channel.guildId"
+    const-string v6, "channel.guildId"
 
     if-eqz v3, :cond_1
 
-    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeGuilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeGuilds:Lcom/discord/stores/StoreGuilds;
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v9
+    move-result-object v8
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v8}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v9
+    move-result-wide v8
 
-    const/4 v11, 0x2
+    const/4 v10, 0x2
 
-    new-array v11, v11, [Ljava/lang/Long;
+    new-array v10, v10, [Ljava/lang/Long;
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v13
-
-    invoke-static {v13, v14}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v13
-
-    aput-object v13, v11, v12
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
-
     move-result-wide v12
 
     invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v12
 
-    aput-object v12, v11, v5
+    aput-object v12, v10, v11
 
-    invoke-static {v11}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v11
+
+    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v11
 
-    invoke-virtual {v8, v9, v10, v11}, Lcom/discord/stores/StoreGuilds;->observeComputed(JLjava/util/Collection;)Lrx/Observable;
+    aput-object v11, v10, v5
 
-    move-result-object v8
+    invoke-static {v10}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
-    if-eqz v8, :cond_1
+    move-result-object v10
 
-    move-object v10, v8
+    invoke-virtual {v7, v8, v9, v10}, Lcom/discord/stores/StoreGuilds;->observeComputed(JLjava/util/Collection;)Lrx/Observable;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_1
+
+    move-object v9, v7
 
     goto :goto_0
 
     :cond_1
-    sget-object v8, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v7, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance v9, Lr0/l/e/j;
+    new-instance v8, Ls0/l/e/j;
 
-    invoke-direct {v9, v8}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v8, v7}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {v9, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v10, v9
+    move-object v9, v8
 
     :goto_0
     if-eqz v3, :cond_2
 
-    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeGuilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeGuilds:Lcom/discord/stores/StoreGuilds;
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v9
-
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v11
-
-    invoke-virtual {v8, v11, v12}, Lcom/discord/stores/StoreGuilds;->observeRoles(J)Lrx/Observable;
-
     move-result-object v8
 
-    if-eqz v8, :cond_2
+    invoke-static {v8, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v11, v8
+    invoke-virtual {v8}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v10
+
+    invoke-virtual {v7, v10, v11}, Lcom/discord/stores/StoreGuilds;->observeRoles(J)Lrx/Observable;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_2
+
+    move-object v10, v7
 
     goto :goto_1
 
     :cond_2
-    sget-object v8, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v7, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance v9, Lr0/l/e/j;
+    new-instance v8, Ls0/l/e/j;
 
-    invoke-direct {v9, v8}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v8, v7}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {v9, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v11, v9
+    move-object v10, v8
 
     :goto_1
     if-eqz v4, :cond_3
 
-    iget-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeVoiceStates:Lcom/discord/stores/StoreVoiceStates;
+    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeVoiceStates:Lcom/discord/stores/StoreVoiceStates;
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v9
+    move-result-object v8
 
-    const-string v12, "selectedVoiceChannel.guildId"
+    const-string v11, "selectedVoiceChannel.guildId"
 
-    invoke-static {v9, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v11}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v8}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v12
+    move-result-wide v11
 
     invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v14
+    move-result-wide v13
 
-    invoke-virtual {v8, v12, v13, v14, v15}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
+    invoke-virtual {v7, v11, v12, v13, v14}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
 
     move-result-object v4
 
     if-eqz v4, :cond_3
 
-    move-object v12, v4
+    move-object v11, v4
 
     goto :goto_2
 
     :cond_3
-    sget-object v4, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v4, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance v8, Lr0/l/e/j;
+    new-instance v7, Ls0/l/e/j;
 
-    invoke-direct {v8, v4}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v7, v4}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    invoke-static {v8, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v12, v8
+    move-object v11, v7
 
     :goto_2
     if-eqz v3, :cond_4
@@ -300,82 +294,78 @@
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v6
+    move-result-object v7
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v6}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v7}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v8
+    move-result-wide v7
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v13
+    move-result-wide v12
 
-    invoke-virtual {v4, v8, v9, v13, v14}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
+    invoke-virtual {v4, v7, v8, v12, v13}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
 
     move-result-object v4
 
     if-eqz v4, :cond_4
 
-    move-object v13, v4
+    move-object v12, v4
 
     goto :goto_3
 
     :cond_4
-    sget-object v4, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v4, Lk0/j/o;->d:Lk0/j/o;
 
-    new-instance v6, Lr0/l/e/j;
+    new-instance v7, Ls0/l/e/j;
 
-    invoke-direct {v6, v4}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v7, v4}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    const-string v4, "Observable.just(\n       \u2026)\n                      )"
-
-    invoke-static {v6, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v13, v6
+    move-object v12, v7
 
     :goto_3
     sget-object v4, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v7
 
-    iget-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeUserPresence:Lcom/discord/stores/StoreUserPresence;
+    iget-object v13, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeUserPresence:Lcom/discord/stores/StoreUserPresence;
 
-    invoke-virtual {v4, v8, v9, v6}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
+    invoke-virtual {v4, v7, v8, v13}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
 
-    move-result-object v18
+    move-result-object v17
 
     const/4 v4, 0x0
 
     if-eqz v3, :cond_5
 
-    iget-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeGuilds:Lcom/discord/stores/StoreGuilds;
+    iget-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeGuilds:Lcom/discord/stores/StoreGuilds;
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object v8
 
-    invoke-static {v8, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v8
+    move-result-wide v13
 
-    invoke-virtual {v6, v8, v9}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
+    invoke-virtual {v7, v13, v14}, Lcom/discord/stores/StoreGuilds;->observeGuild(J)Lrx/Observable;
 
-    move-result-object v6
+    move-result-object v7
 
-    if-eqz v6, :cond_5
+    if-eqz v7, :cond_5
 
     goto :goto_4
 
     :cond_5
-    new-instance v6, Lr0/l/e/j;
+    new-instance v7, Ls0/l/e/j;
 
-    invoke-direct {v6, v4}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v7, v4}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     :goto_4
     if-eqz v3, :cond_6
@@ -384,119 +374,143 @@
 
     invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v9
+    move-result-object v13
 
-    invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v13}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v14
+    move-result-wide v13
 
-    invoke-virtual {v8, v14, v15}, Lcom/discord/stores/StorePermissions;->getForGuild(J)Lrx/Observable;
+    invoke-virtual {v8, v13, v14}, Lcom/discord/stores/StorePermissions;->getForGuild(J)Lrx/Observable;
 
-    move-result-object v7
+    move-result-object v6
 
-    if-eqz v7, :cond_6
+    if-eqz v6, :cond_6
 
     goto :goto_5
 
     :cond_6
-    new-instance v7, Lr0/l/e/j;
+    new-instance v6, Ls0/l/e/j;
 
-    invoke-direct {v7, v4}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v6, v4}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     :goto_5
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$streamContextService:Lcom/discord/utilities/streams/StreamContextService;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v13
 
-    invoke-virtual {v4, v8, v9, v5}, Lcom/discord/utilities/streams/StreamContextService;->getForUser(JZ)Lrx/Observable;
+    invoke-virtual {v4, v13, v14, v5}, Lcom/discord/utilities/streams/StreamContextService;->getForUser(JZ)Lrx/Observable;
 
-    move-result-object v21
+    move-result-object v20
+
+    const-string v4, "computedMembersObservable"
+
+    invoke-static {v9, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "guildRolesObservable"
+
+    invoke-static {v10, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "mySelectedVoiceChannelVoiceStatesObservable"
+
+    invoke-static {v11, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "currentChannelVoiceStatesObservable"
+
+    invoke-static {v12, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v13
 
-    invoke-virtual {v4, v8, v9}, Lcom/discord/stores/StoreMediaSettings;->getUserMuted(J)Lrx/Observable;
+    invoke-virtual {v4, v13, v14}, Lcom/discord/stores/StoreMediaSettings;->getUserMuted(J)Lrx/Observable;
 
-    move-result-object v14
+    move-result-object v13
 
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
     invoke-virtual {v4}, Lcom/discord/stores/StoreMediaSettings;->isSelfMuted()Lrx/Observable;
 
-    move-result-object v15
+    move-result-object v14
 
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
     invoke-virtual {v4}, Lcom/discord/stores/StoreMediaSettings;->isSelfDeafened()Lrx/Observable;
 
-    move-result-object v16
+    move-result-object v15
 
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeMediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
+    move-object/from16 p1, v14
+
+    move-object v5, v15
+
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v14
 
-    invoke-virtual {v4, v8, v9}, Lcom/discord/stores/StoreMediaSettings;->getUserOutputVolume(J)Lrx/Observable;
+    invoke-virtual {v4, v14, v15}, Lcom/discord/stores/StoreMediaSettings;->getUserOutputVolume(J)Lrx/Observable;
 
-    move-result-object v17
+    move-result-object v16
 
     const-string v4, "guildsObservable"
 
-    invoke-static {v6, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v4, "permissionsObservable"
 
-    invoke-static {v7, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeUserProfile:Lcom/discord/stores/StoreUserProfile;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v14
 
-    invoke-virtual {v4, v8, v9}, Lcom/discord/stores/StoreUserProfile;->get(J)Lrx/Observable;
+    invoke-virtual {v4, v14, v15}, Lcom/discord/stores/StoreUserProfile;->get(J)Lrx/Observable;
 
-    move-result-object v22
+    move-result-object v21
 
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeUserRelationships:Lcom/discord/stores/StoreUserRelationships;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v14
 
-    invoke-virtual {v4, v8, v9}, Lcom/discord/stores/StoreUserRelationships;->observe(J)Lrx/Observable;
+    invoke-virtual {v4, v14, v15}, Lcom/discord/stores/StoreUserRelationships;->observe(J)Lrx/Observable;
 
-    move-result-object v23
+    move-result-object v22
 
     iget-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;->$storeUserNotes:Lcom/discord/stores/StoreUserNotes;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v14
 
-    invoke-virtual {v4, v8, v9}, Lcom/discord/stores/StoreUserNotes;->observeUserNote(J)Lrx/Observable;
+    invoke-virtual {v4, v14, v15}, Lcom/discord/stores/StoreUserNotes;->observeUserNote(J)Lrx/Observable;
 
-    move-result-object v24
+    move-result-object v23
 
     new-instance v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;
 
     invoke-direct {v4, v1, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3$2;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
 
+    move-object/from16 v14, p1
+
+    move-object v15, v5
+
+    move-object/from16 v18, v7
+
     move-object/from16 v19, v6
 
-    move-object/from16 v20, v7
+    move-object/from16 v24, v4
 
-    move-object/from16 v25, v4
-
-    invoke-static/range {v10 .. v25}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function15;)Lrx/Observable;
+    invoke-static/range {v9 .. v24}, Lcom/discord/utilities/rx/ObservableCombineLatestOverloadsKt;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lkotlin/jvm/functions/Function15;)Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory.smali
index fa4804e42f..6fd12be9de 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory.smali
@@ -28,9 +28,11 @@
 
 # direct methods
 .method public constructor <init>(JLjava/lang/Long;ZLcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p5, :cond_0
+    const-string v0, "streamPreviewClickBehavior"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,15 +47,6 @@
     iput-object p6, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory;->friendToken:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "streamPreviewClickBehavior"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUserNotes;Lcom/discord/utilities/streams/StreamContextService;Lrx/Scheduler;)Lrx/Observable;
@@ -116,9 +109,9 @@
     :cond_0
     const/4 v3, 0x0
 
-    new-instance v4, Lr0/l/e/j;
+    new-instance v4, Ls0/l/e/j;
 
-    invoke-direct {v4, v3}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v4, v3}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object v3, v4
 
@@ -168,7 +161,7 @@
 
     invoke-direct/range {v2 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory$observeStoreState$3;-><init>(Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/streams/StreamContextService;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreUserNotes;)V
 
-    invoke-virtual {v1, v12}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v12}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -182,11 +175,11 @@
 
     invoke-direct {v2, v3, v4, v5, v6}, Lcom/discord/utilities/rx/LeadingEdgeThrottle;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
-    new-instance v3, Lr0/l/a/u;
+    new-instance v3, Ls0/l/a/u;
 
     iget-object v1, v1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v3, v1, v2}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v3, v1, v2}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v3}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -194,7 +187,7 @@
 
     const-string v2, "Observable\n          .co\u2026, storeStateRxScheduler))"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -223,7 +216,11 @@
 
     move-object/from16 v14, p0
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    move-object/from16 v1, p1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v15, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
@@ -357,7 +354,7 @@
 
     invoke-direct/range {v25 .. v34}, Lcom/discord/utilities/streams/StreamContextService;-><init>(Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreamPreviews;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -365,7 +362,7 @@
 
     const-string v8, "Schedulers.computation()"
 
-    invoke-static {v0, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object/from16 v26, v0
 
@@ -393,46 +390,37 @@
 
     invoke-direct/range {v0 .. v13}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModelFactory;->observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreUserNotes;Lcom/discord/utilities/streams/StreamContextService;Lrx/Scheduler;)Lrx/Observable;
 
-    move-result-object v12
+    move-result-object v13
 
     const-string v0, "observeStoreState(\n     \u2026s.computation()\n        )"
 
-    invoke-static {v12, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v13, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v15
+    move-object v1, v15
 
-    move-wide/from16 v1, v27
+    move-wide/from16 v2, v27
 
-    move-object/from16 v3, v23
+    move-object/from16 v4, v23
 
-    move-object/from16 v4, v22
+    move-object/from16 v5, v22
 
-    move/from16 v5, v21
+    move/from16 v6, v21
 
-    move-object/from16 v6, v16
+    move-object/from16 v7, v16
 
-    move-object/from16 v7, v17
+    move-object/from16 v8, v17
 
-    move-object/from16 v8, v18
+    move-object/from16 v9, v18
 
-    move-object/from16 v9, v19
+    move-object/from16 v10, v19
 
-    move-object/from16 v10, v20
+    move-object/from16 v11, v20
 
-    move-object/from16 v11, v25
+    move-object/from16 v12, v25
 
-    invoke-direct/range {v0 .. v12}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(JLjava/lang/Long;Ljava/lang/String;ZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Lrx/Observable;)V
+    invoke-direct/range {v1 .. v13}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(JLjava/lang/Long;Ljava/lang/String;ZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/utilities/rest/RestAPI;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Lrx/Observable;)V
 
     return-object v15
-
-    :cond_0
-    const-string v0, "modelClass"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public final getChannelId()Ljava/lang/Long;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.smali
index 1f859cdada..5d6740a033 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/functions/Action0;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/app/AppPermissions$Requests;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/app/AppPermissions$Requests;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "requestVideoCallPermissions"
+
+    const-string v5, "requestVideoCallPermissions(Lrx/functions/Action0;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestVideoCallPermissions"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/app/AppPermissions$Requests;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestVideoCallPermissions(Lrx/functions/Action0;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/functions/Action0;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/app/AppPermissions$Requests;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$2.smali
index ff9a39e48d..1b65ee0388 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/functions/Action0;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/app/AppPermissions$Requests;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/app/AppPermissions$Requests;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "requestMicrophone"
+
+    const-string v5, "requestMicrophone(Lrx/functions/Action0;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestMicrophone"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/app/AppPermissions$Requests;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "requestMicrophone(Lrx/functions/Action0;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lrx/functions/Action0;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/app/AppPermissions$Requests;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1.smali
index 81e8e7a228..da8779f366 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1.smali
@@ -3,7 +3,7 @@
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lcom/discord/rtcconnection/RtcConnection$State;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -59,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1;->call(Lcom/discord/rtcconnection/RtcConnection$State;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/rtcconnection/RtcConnection$State;)Z
+.method public final call(Lcom/discord/rtcconnection/RtcConnection$State;)Ljava/lang/Boolean;
     .locals 1
 
     sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
@@ -90,5 +74,21 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1;->call(Lcom/discord/rtcconnection/RtcConnection$State;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2.smali
index ec76740494..f495cff147 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2.smali
@@ -3,7 +3,7 @@
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelChannel;)J
+.method public final call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
     .locals 2
 
     if-eqz p1, :cond_0
@@ -72,21 +74,21 @@
     const-wide/16 v0, -0x1
 
     :goto_0
-    return-wide v0
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2;->call(Lcom/discord/models/domain/ModelChannel;)J
-
-    move-result-wide v0
-
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2;->call(Lcom/discord/models/domain/ModelChannel;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$3.smali
index cd163c9e1e..1f5056d00c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$3.smali
@@ -27,7 +27,10 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$4.smali
index b260062364..4edbb152f4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$5.smali
index b024bceb80..06e1cfef95 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -89,11 +89,11 @@
 
     const-string v0, "it"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "voiceChannelId"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6$1.smali
index 9b6937bf1d..637d20b155 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6.smali
index de9155c805..17958ecde1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$7.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$7.smali
index b41078220e..4cca4d678e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$7.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$7;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "PrivateCallLaunchUtils.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -32,43 +32,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6;)V
-    .locals 0
+    .locals 6
 
     iput-object p1, p0, Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$7;->$doCall$6:Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$6;
 
-    const/4 p1, 0x0
+    const/4 v1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/g;-><init>(I)V
+    const/4 v2, 0x0
+
+    const-string v3, "doCall"
+
+    const-string v4, "invoke()V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "doCall"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "invoke()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3.smali
index 0e8e2e0e22..9add85771d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3.smali
@@ -79,7 +79,7 @@
 
     sget-object v1, Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1;->INSTANCE:Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -95,7 +95,7 @@
 
     sget-object v2, Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2;->INSTANCE:Lcom/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$3$2;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -119,7 +119,7 @@
 
     const-wide/16 v4, 0xfa
 
-    invoke-static {v1, v2, v4, v5, v3}, Lf/a/b/q;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
+    invoke-static {v1, v2, v4, v5, v3}, Lf/a/b/s;->c(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
 
     move-result-object v1
 
@@ -135,7 +135,7 @@
 
     const-string v1, "Observable\n        .comb\u2026       )\n        .take(1)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.smali
index e40504550c..15fad6e10f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.smali
@@ -7,15 +7,21 @@
 .method public static final callAndLaunch(JZLcom/discord/app/AppPermissions$Requests;Landroid/content/Context;Lcom/discord/app/AppComponent;Landroidx/fragment/app/FragmentManager;)V
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "appPermissionsRequests"
 
-    if-eqz p3, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "context"
 
-    if-eqz p5, :cond_2
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "appComponent"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v4, Ljava/lang/ref/WeakReference;
 
@@ -54,32 +60,4 @@
     invoke-interface {v0, p3}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_1
-    const-string p0, "fragmentManager"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "appComponent"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "appPermissionsRequests"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
index acc82b754c..617367feb2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;J)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/call/WidgetCallFailed;
 
@@ -61,13 +63,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
index fb17c2a553..c5b8d729c7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFailed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 4
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/voice/call/WidgetCallFailed;
 
@@ -83,18 +85,9 @@
 
     const-string v3, "username"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->access$sendFriendRequest(Lcom/discord/widgets/voice/call/WidgetCallFailed;JLjava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
index de8f0b5d39..501096bf13 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFailed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
index 5306a07156..af30aab0ae 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFailed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Void;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -63,13 +63,13 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1;->this$0:Lcom/discord/widgets/voice/call/WidgetCallFailed;
 
-    const v0, 0x7f1207b3
+    const v0, 0x7f1207b5
 
     const/4 v1, 0x0
 
     const/4 v2, 0x4
 
-    invoke-static {p1, v0, v1, v2}, Lf/a/b/n;->l(Landroidx/fragment/app/Fragment;III)V
+    invoke-static {p1, v0, v1, v2}, Lf/a/b/p;->l(Landroidx/fragment/app/Fragment;III)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2$1.smali
index 20e00f1f09..e5f9fe750c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFailed.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 
     const-string v3, "it"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
@@ -84,7 +84,7 @@
 
     const-string v3, "it.response"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -112,7 +112,7 @@
 
     const/16 v4, 0xc
 
-    invoke-static {v1, v0, v2, v3, v4}, Lf/a/b/n;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v1, v0, v2, v3, v4}, Lf/a/b/p;->k(Landroid/content/Context;Ljava/lang/CharSequence;ILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.smali
index 2f220949e8..08b81743fc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2.smali
@@ -57,7 +57,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2$1;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
index 200f890072..2a5831fd0f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
@@ -37,81 +37,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetCallFailed;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetCallFailed;
+    const-string v2, "dialogHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "dialogHeader"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getDialogHeader()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetCallFailed;
 
-    const/4 v2, 0x0
+    const-string v2, "dialogText"
 
-    aput-object v1, v0, v2
+    const-string v3, "getDialogText()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetCallFailed;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "dialogText"
-
-    const-string v4, "getDialogText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetCallFailed;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetCallFailed;
+    const-string v2, "dialogConfirm"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogConfirm()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dialogConfirm"
-
-    const-string v4, "getDialogConfirm()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetCallFailed;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetCallFailed;
+    const-string v2, "dialogCancel"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDialogCancel()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "dialogCancel"
-
-    const-string v4, "getDialogCancel()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -135,7 +111,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0a35
+    const v0, 0x7f0a0a39
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -143,7 +119,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a36
+    const v0, 0x7f0a0a3a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -151,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a34
+    const v0, 0x7f0a0a38
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -159,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed;->dialogConfirm$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a33
+    const v0, 0x7f0a0a37
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -215,9 +191,9 @@
 
     const-string v2, "getString(R.string.call_\u2026te_not_friends, username)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v1
 
@@ -355,7 +331,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object p2, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -369,7 +345,7 @@
 
     invoke-direct {v2, p0, p3}, Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$2;-><init>(Lcom/discord/widgets/voice/call/WidgetCallFailed;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v0, v1, v2}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {p2, v0, v1, v2}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object p2
 
@@ -391,7 +367,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
@@ -399,7 +377,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1214d0
+    const v0, 0x7f1214fa
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -423,7 +401,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12107e
+    const v0, 0x7f1210a8
 
     invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -442,15 +420,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBound$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBound$1.smali
index e49205cdbf..0600dee709 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBound$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBound$1.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "container"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "container"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$1.smali
index 4e4b81b254..b8128064a2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetCallIndicator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/call/WidgetCallIndicator;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUIVisibility"
+
+    const-string v5, "configureUIVisibility(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUIVisibility"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUIVisibility(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$2.smali
index 6a90be7616..b938d7e9bc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/WidgetCallIndicator$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetCallIndicator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/call/WidgetCallIndicator;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/call/WidgetCallIndicator;->access$configureUI(Lcom/discord/widgets/voice/call/WidgetCallIndicator;Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$setupContainerClicks$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$setupContainerClicks$1.smali
index 87755c23c5..54f489bb79 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$setupContainerClicks$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator$setupContainerClicks$1.smali
@@ -69,7 +69,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/voice/call/WidgetCallIndicator$setupContainerClicks$1;->$viewState:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;
 
@@ -130,7 +130,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/voice/call/WidgetCallIndicator$setupContainerClicks$1;->$viewState:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;
 
@@ -165,7 +165,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v12, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, v0, Lcom/discord/widgets/voice/call/WidgetCallIndicator$setupContainerClicks$1;->$viewState:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator.smali
index b8ad431d24..73c2d632d6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallIndicator.smali
@@ -27,61 +27,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
+    const-string v2, "indicatorRoot"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIndicatorRoot()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "indicatorRoot"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getIndicatorRoot()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
 
-    const/4 v2, 0x0
+    const-string v2, "indicatorStatus"
 
-    aput-object v1, v0, v2
+    const-string v3, "getIndicatorStatus()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "indicatorStatus"
-
-    const-string v4, "getIndicatorStatus()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetCallIndicator;
+    const-string v2, "indicatorIcon"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIndicatorIcon()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "indicatorIcon"
-
-    const-string v4, "getIndicatorIcon()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -314,7 +296,7 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1, v2, v3, v4}, Lcom/discord/utilities/voice/VoiceViewUtils;->getConnectionStatusColor(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Landroid/content/Context;)I
 
@@ -328,7 +310,7 @@
 
     move-result-object v7
 
-    invoke-static {v7, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->getSelectedVoiceChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -362,7 +344,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->getConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -474,7 +456,7 @@
 
     const-string v0, "ViewModelProvider(\n     \u2026torViewModel::class.java)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;
 
@@ -486,7 +468,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -495,15 +479,6 @@
     invoke-static {p1, v0}, Landroidx/core/view/ViewCompat;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -545,7 +520,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -578,7 +553,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1.smali
index dfad2c61d9..3c739e4227 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetHomeCallIndicatorViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStoreState"
+
+    const-string v5, "handleStoreState(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;->access$handleStoreState(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1$1.smali
index 2005ba787e..c055460a11 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetHomeCallIndicatorViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function6<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/rtcconnection/RtcConnection$State;",
@@ -54,45 +54,27 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x6
+    const-class v2, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x6
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Lcom/discord/utilities/streams/StreamContext;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Lcom/discord/utilities/streams/StreamContext;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
@@ -112,15 +94,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "p2"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "p3"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p5"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;
 
@@ -141,34 +129,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Lcom/discord/utilities/streams/StreamContext;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p5"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p3"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1.smali
index b6c6b4db06..193a2aa2dd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetHomeCallIndicatorViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;",
+        ">;>;"
     }
 .end annotation
 
@@ -91,16 +93,16 @@
 
     sget-object v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Unselected;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Unselected;
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
-    new-instance v2, Lr0/l/e/j;
+    new-instance v2, Ls0/l/e/j;
 
-    invoke-direct {v2, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -134,7 +136,7 @@
 
     const-string v6, "channel.guildId"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory.smali
index 19c725961f..286f884ab1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory.smali
@@ -49,7 +49,7 @@
 
     sget-object v1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -70,7 +70,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;
 
@@ -80,18 +82,9 @@
 
     const-string v1, "observeStoreState()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, v0}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;-><init>(Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected.smali
index 27f115cab8..d58319c2d9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected.smali
@@ -56,16 +56,24 @@
         }
     .end annotation
 
+    const-string v0, "selectedVoiceChannel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectionState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectionQuality"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "participants"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p5, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
@@ -81,34 +89,6 @@
     iput-object p6, p0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     return-void
-
-    :cond_0
-    const-string p1, "participants"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionQuality"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "connectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "selectedVoiceChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Lcom/discord/utilities/streams/StreamContext;ILjava/lang/Object;)Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;
@@ -265,15 +245,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedVoiceChannel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "connectionState"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "connectionQuality"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "participants"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;
 
@@ -294,34 +280,6 @@
     invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Lcom/discord/utilities/streams/StreamContext;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "participants"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionQuality"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "connectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "selectedVoiceChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -339,7 +297,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -349,7 +307,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -359,7 +317,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->connectionQuality:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -369,7 +327,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -379,7 +337,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->participants:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -389,7 +347,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState$Selected;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active.smali
index dc183dd585..6d76b9c25e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active.smali
@@ -34,14 +34,20 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;IZLcom/discord/utilities/streams/StreamContext;)V
     .locals 1
 
+    const-string v0, "selectedVoiceChannel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectionState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectionQuality"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
@@ -59,27 +65,6 @@
     iput-object p7, p0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     return-void
-
-    :cond_0
-    const-string p1, "connectionQuality"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "selectedVoiceChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;IZLcom/discord/utilities/streams/StreamContext;ILjava/lang/Object;)Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;
@@ -230,24 +215,28 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;IZLcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "selectedVoiceChannel"
 
-    if-eqz p1, :cond_2
+    move-object v2, p1
 
-    if-eqz p2, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "connectionState"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectionQuality"
+
+    move-object v4, p3
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
     move-object v5, p4
 
     move v6, p5
@@ -259,27 +248,6 @@
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;IZLcom/discord/utilities/streams/StreamContext;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "connectionQuality"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "connectionState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "selectedVoiceChannel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -297,7 +265,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -307,7 +275,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -317,7 +285,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->connectionQuality:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -327,7 +295,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -349,7 +317,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel.smali
index 76834e0a8e..59d8a81e76 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetHomeCallIndicatorViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState;",
         ">;"
     }
@@ -33,26 +33,28 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "storeStateObservable"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Inactive;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Inactive;
+    sget-object v0, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Inactive;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Inactive;
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
 
     move-result-object p1
 
-    const-string v1, "storeStateObservable\n   \u2026  .distinctUntilChanged()"
+    const-string v0, "storeStateObservable\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x2
 
     invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
@@ -61,6 +63,10 @@
 
     const-class v3, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;
 
+    new-instance v8, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1;
+
+    invoke-direct {v8, p0}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1;-><init>(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;)V
+
     const/4 v4, 0x0
 
     const/4 v5, 0x0
@@ -69,10 +75,6 @@
 
     const/4 v7, 0x0
 
-    new-instance v8, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$1;-><init>(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;)V
-
     const/16 v9, 0x1e
 
     const/4 v10, 0x0
@@ -80,13 +82,6 @@
     invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel;Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$StoreState;)V
@@ -108,7 +103,7 @@
 
     sget-object p1, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Inactive;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Inactive;
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_2
 
@@ -223,7 +218,7 @@
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/voice/call/WidgetHomeCallIndicatorViewModel$ViewState$Active;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Lcom/discord/models/domain/ModelGuild;IZLcom/discord/utilities/streams/StreamContext;)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_5
     :goto_2
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1.smali
index 2c89412aa4..23bcbd7969 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)Z
     .locals 3
 
-    if-eqz p1, :cond_3
+    const-string v0, "participant"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1;->$callModel:Lcom/discord/widgets/voice/model/CallModel;
 
@@ -112,13 +114,4 @@
     :cond_2
     :goto_0
     return v1
-
-    :cond_3
-    const-string p1, "participant"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
index cdf6eda9b7..a2472f3dd1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        "Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
index e88ddbfe64..69718cb671 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Ljava/util/Set<",
+        "Ljava/lang/Long;",
+        ">;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -94,9 +98,9 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 
@@ -105,15 +109,15 @@
 
     const-string v1, "incomingCalls"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lj0/i/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
+    invoke-static {p1}, Lk0/j/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
 
     move-result-object v1
 
     const-string v2, "incomingCalls.first()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Ljava/lang/Number;
 
@@ -129,7 +133,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1;-><init>(Ljava/util/Set;)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
index 3c61cea66a..99edc45504 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
@@ -56,13 +56,13 @@
 
     sget-object v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n            \u2026          }\n            }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -74,7 +74,7 @@
 
     const-string v1, "StoreStream\n            \u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
index 654b4399e7..abd8d458f1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali
@@ -67,11 +67,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "callModel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "privateCallUserListItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -82,20 +84,6 @@
     iput p3, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->numIncomingCalls:I
 
     return-void
-
-    :cond_0
-    const-string p1, "privateCallUserListItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;Lcom/discord/widgets/voice/model/CallModel;Ljava/util/List;IILjava/lang/Object;)Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;
@@ -176,31 +164,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "callModel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "privateCallUserListItems"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;-><init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/util/List;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "privateCallUserListItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -218,7 +194,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->callModel:Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -228,7 +204,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->privateCallUserListItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1.smali
index fe48b98cd0..af352bc22f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming.smali
index 565f871abd..35a19707f9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming.smali
@@ -75,7 +75,9 @@
 .method public onConnect(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;Z)V
     .locals 12
 
-    if-eqz p1, :cond_1
+    const-string p2, "model"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
@@ -103,7 +105,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->getChannelId()J
 
@@ -117,7 +119,7 @@
 
     move-result-object v5
 
-    invoke-static {v5, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->getChannelId()J
 
@@ -143,15 +145,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDecline(J)V
@@ -218,32 +211,38 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
-    const-wide/16 p1, 0xf
+    sget-object p1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    const-wide/16 v0, 0xf
 
-    invoke-static {p1, p2, v1}, Lrx/Observable;->Z(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v0, v1, p1}, Lrx/Observable;->Z(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "Observable.timer(15, TimeUnit.SECONDS)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 v0, 0x2
+
+    invoke-static {p1, p0, p2, v0, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
     const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming;
 
+    new-instance v7, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1;-><init>(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -252,10 +251,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1;-><init>(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -263,11 +258,4 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
index 793fcdfb03..f457effa36 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali
@@ -50,21 +50,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1;->call()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final call()Z
+.method public final call()Ljava/lang/Boolean;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1;->this$0:Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
@@ -77,7 +63,17 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->onDecline(J)V
 
-    const/4 v0, 0x1
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    return v0
+    return-object v0
+.end method
+
+.method public bridge synthetic call()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1;->call()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
index c1b9fee50e..d63d2cf053 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceCallIncoming.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,7 +67,7 @@
 .method public final invoke(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
index b2cbfa36f9..a815059a81 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -42,141 +42,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
+    const-string v2, "callUsersRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getCallUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "callUsersRecycler"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getCallUsersRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    const/4 v2, 0x0
+    const-string v2, "statusPrimary"
 
-    aput-object v1, v0, v2
+    const-string v3, "getStatusPrimary()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "statusPrimary"
-
-    const-string v4, "getStatusPrimary()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
+    const-string v2, "statusSecondary"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStatusSecondary()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "statusSecondary"
-
-    const-string v4, "getStatusSecondary()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
+    const-string v2, "connectButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectButton"
-
-    const-string v4, "getConnectButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
+    const-string v2, "connectText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectText"
-
-    const-string v4, "getConnectText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
+    const-string v2, "declineButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeclineButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "declineButton"
-
-    const-string v4, "getDeclineButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;
+    const-string v2, "connectVoiceOnlyText"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectVoiceOnlyText()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectVoiceOnlyText"
-
-    const-string v4, "getConnectVoiceOnlyText()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -192,7 +150,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a04f3
+    const v0, 0x7f0a04f9
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -200,7 +158,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->callUsersRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04f0
+    const v0, 0x7f0a04f6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -208,7 +166,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->statusPrimary$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04f1
+    const v0, 0x7f0a04f7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -216,7 +174,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->statusSecondary$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04e9
+    const v0, 0x7f0a04ef
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -224,7 +182,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->connectButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04eb
+    const v0, 0x7f0a04f1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -232,7 +190,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->connectText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04ed
+    const v0, 0x7f0a04f3
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -240,7 +198,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->declineButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04ec
+    const v0, 0x7f0a04f2
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -508,12 +466,12 @@
 
     if-eqz v4, :cond_4
 
-    const v4, 0x7f120c77
+    const v4, 0x7f120c9d
 
     goto :goto_2
 
     :cond_4
-    const v4, 0x7f120c72
+    const v4, 0x7f120c98
 
     :goto_2
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V
@@ -528,12 +486,12 @@
 
     if-eqz v4, :cond_5
 
-    const v4, 0x7f121798
+    const v4, 0x7f1217c2
 
     goto :goto_3
 
     :cond_5
-    const v4, 0x7f120d8b
+    const v4, 0x7f120db1
 
     :goto_3
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V
@@ -601,7 +559,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f08042f
+    const v3, 0x7f080432
 
     invoke-static {v0, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -618,7 +576,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f08024f
+    const v4, 0x7f080250
 
     invoke-static {v3, v4}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -654,12 +612,12 @@
 
     if-eqz v1, :cond_a
 
-    const v1, 0x7f12048c
+    const v1, 0x7f12048d
 
     goto :goto_6
 
     :cond_a
-    const v1, 0x7f12048d
+    const v1, 0x7f12048e
 
     :goto_6
     invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -692,9 +650,9 @@
 .method public onConnect(Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;Z)V
     .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "model"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model;->getChannelId()J
 
@@ -704,9 +662,9 @@
 
     move-result p1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    if-ne p1, v1, :cond_0
+    if-ne p1, v0, :cond_0
 
     new-instance p1, Lcom/discord/widgets/user/calls/PrivateCallLauncher;
 
@@ -716,7 +674,7 @@
 
     const-string v0, "requireContext()"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -724,7 +682,7 @@
 
     const-string v1, "parentFragmentManager"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, p0, p0, p2, v0}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 
@@ -741,7 +699,9 @@
 
     move-result-object p1
 
-    invoke-static {p1, v0, v1, v0}, Lcom/discord/stores/StoreMediaEngine;->selectDefaultVideoDevice$default(Lcom/discord/stores/StoreMediaEngine;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+    const/4 p2, 0x0
+
+    invoke-static {p1, p2, v0, p2}, Lcom/discord/stores/StoreMediaEngine;->selectDefaultVideoDevice$default(Lcom/discord/stores/StoreMediaEngine;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 
     :cond_1
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -768,13 +728,6 @@
     invoke-static/range {v1 .. v7}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onDecline(J)V
@@ -857,7 +810,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -880,15 +835,6 @@
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1.smali
index 5409c207f5..abbb8a9e28 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceCallInline.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;",
+        "Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali
index 4a800a8584..8da0bcd58e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali
@@ -52,13 +52,13 @@
 
     sget-object v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "VoiceConnected\n         \u2026eConnected)\n            }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1.smali
index b0c0c13ee0..33167366e6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceCallInline.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function3<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;",
@@ -47,73 +47,43 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x3
+    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x3
+
+    const-string v3, "<init>"
+
+    const-string v4, "<init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;)V"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "<init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;)V"
-
-    return-object v0
-.end method
-
 .method public final invoke(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "p1"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "p2"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "p2"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
index 5c94774c77..56b95aa10f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceCallInline.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;",
+        ">;>;"
     }
 .end annotation
 
@@ -89,16 +91,16 @@
 
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion.smali
index 51f14af9a8..af979c7ff5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion.smali
@@ -56,13 +56,13 @@
 
     sget-object v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1;->INSTANCE:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "StoreStream\n            \u2026        }\n              }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
index 5b3e158f50..a4992b71ee 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali
@@ -50,11 +50,13 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "selectedVoiceChannel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "inputMode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -65,20 +67,6 @@
     iput-object p3, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
     return-void
-
-    :cond_0
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedVoiceChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;ILjava/lang/Object;)Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
@@ -141,31 +129,19 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "selectedVoiceChannel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "inputMode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;-><init>(Lcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/utilities/streams/StreamContext;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedVoiceChannel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -183,7 +159,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->selectedVoiceChannel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -193,7 +169,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -203,7 +179,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
index c175af6c54..061bfee2ed 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali
@@ -106,7 +106,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;->voiceConnected:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
index 1e24141671..8eafa44450 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceCallInline.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
index 4e4264bac5..67caea72d9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceCallInline.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->access$configureUI(Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$Model;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$setWindowInsetsListeners$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$setWindowInsetsListeners$1.smali
index da910afa51..199ad48e08 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$setWindowInsetsListeners$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$setWindowInsetsListeners$1.smali
@@ -47,11 +47,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "v"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 
@@ -76,18 +78,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
index 431dd0e9e4..7586bb6c3a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
@@ -33,61 +33,43 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
+    const-string v2, "container"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getContainer()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "container"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getContainer()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
 
-    const/4 v2, 0x0
+    const-string v2, "voiceConnectedContainer"
 
-    aput-object v1, v0, v2
+    const-string v3, "getVoiceConnectedContainer()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "voiceConnectedContainer"
-
-    const-string v4, "getVoiceConnectedContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
 
-    const-class v2, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;
+    const-string v2, "voiceConnectedPTT"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceConnectedPTT()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "voiceConnectedPTT"
-
-    const-string v4, "getVoiceConnectedPTT()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
@@ -103,7 +85,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0a5d
+    const v0, 0x7f0a0a61
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -111,7 +93,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a5e
+    const v0, 0x7f0a0a62
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -119,7 +101,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceConnectedContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a5f
+    const v0, 0x7f0a0a63
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -371,7 +353,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -408,15 +392,6 @@
     invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->setWindowInsetsListeners()V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1.smali
index 4ef94fc809..43b26eaf72 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2.smali
index 2fd28959b9..eaa2e54e19 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3.smali
index b6b99e723a..bceebff11c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic $onMutePressed:Lkotlin/jvm/functions/Function0;
+.field public final synthetic $onDeafenPressed:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;->$onMutePressed:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;->$onDeafenPressed:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;->$onMutePressed:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;->$onDeafenPressed:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4.smali
index c2eba2dff4..96a48a90e3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic $onDeafenPressed:Lkotlin/jvm/functions/Function0;
+.field public final synthetic $onMutePressed:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;->$onDeafenPressed:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;->$onMutePressed:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;->$onDeafenPressed:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;->$onMutePressed:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5.smali
index 8963c1bb80..150a5ff56e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic $onDisconnectPressed:Lkotlin/jvm/functions/Function0;
+.field public final synthetic $onScreensharePressed:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;->$onDisconnectPressed:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;->$onScreensharePressed:Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;->$onDisconnectPressed:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;->$onScreensharePressed:Lkotlin/jvm/functions/Function0;
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6.smali
new file mode 100644
index 0000000000..3c8e09db06
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6.smali
@@ -0,0 +1,45 @@
+.class public final Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6;
+.super Ljava/lang/Object;
+.source "AnchoredVoiceControlsView.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic $onDisconnectPressed:Lkotlin/jvm/functions/Function0;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6;->$onDisconnectPressed:Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6;->$onDisconnectPressed:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$setOnPttPressedListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$setOnPttPressedListener$1.smali
index 3750bbab10..caf0efaa00 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$setOnPttPressedListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView$setOnPttPressedListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$setOnPttPressedListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "AnchoredVoiceControlsView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.smali
index d13e291d46..5773d88c0b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.smali
@@ -10,7 +10,7 @@
 # instance fields
 .field public final cameraStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field public final deafenStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field public final deafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field public final disconnectButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -18,6 +18,8 @@
 
 .field public final pttButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field public final screenshareButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field public final speakerButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 
@@ -25,130 +27,108 @@
 .method public static constructor <clinit>()V
     .locals 5
 
-    const/4 v0, 0x6
+    const/4 v0, 0x7
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+    const-string v2, "pttButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPttButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "pttButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getPttButton()Landroid/widget/Button;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
-    const/4 v2, 0x0
+    const-string v2, "cameraStateButton"
 
-    aput-object v1, v0, v2
+    const-string v3, "getCameraStateButton()Landroid/widget/ImageView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "cameraStateButton"
-
-    const-string v4, "getCameraStateButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+    const-string v2, "screenshareButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getScreenshareButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "deafenStateButton"
-
-    const-string v4, "getDeafenStateButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+    const-string v2, "deafenButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDeafenButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "speakerButton"
-
-    const-string v4, "getSpeakerButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+    const-string v2, "speakerButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSpeakerButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "muteStateButton"
-
-    const-string v4, "getMuteStateButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+    const-string v2, "muteStateButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMuteStateButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "disconnectButton"
-
-    const-string v4, "getDisconnectButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
+    const-class v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+
+    const-string v2, "disconnectButton"
+
+    const-string v3, "getDisconnectButton()Landroid/widget/ImageView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/4 v2, 0x6
+
+    aput-object v1, v0, v2
+
     sput-object v0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     return-void
@@ -195,13 +175,15 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p2, 0x7f0a0a65
+    const p2, 0x7f0a0a69
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +191,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->pttButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a60
+    const p2, 0x7f0a0a64
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,13 +199,13 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->cameraStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a62
+    const p2, 0x7f0a0a6a
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->deafenStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->screenshareButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p2, 0x7f0a0a66
 
@@ -231,9 +213,17 @@
 
     move-result-object p2
 
+    iput-object p2, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->deafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a0a6b
+
+    invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
     iput-object p2, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->speakerButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a64
+    const p2, 0x7f0a0a68
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +231,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->muteStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0a63
+    const p2, 0x7f0a0a67
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -254,15 +244,6 @@
     invoke-static {p1, p2, p0}, Landroid/widget/FrameLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -307,14 +288,14 @@
     return-object v0
 .end method
 
-.method private final getDeafenStateButton()Landroid/widget/ImageView;
+.method private final getDeafenButton()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->deafenStateButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->deafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x3
 
     aget-object v1, v1, v2
 
@@ -334,7 +315,7 @@
 
     sget-object v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x5
+    const/4 v2, 0x6
 
     aget-object v1, v1, v2
 
@@ -354,7 +335,7 @@
 
     sget-object v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x5
 
     aget-object v1, v1, v2
 
@@ -387,6 +368,26 @@
     return-object v0
 .end method
 
+.method private final getScreenshareButton()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->screenshareButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x2
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/ImageView;
+
+    return-object v0
+.end method
+
 .method private final getSpeakerButton()Landroid/widget/ImageView;
     .locals 3
 
@@ -394,7 +395,7 @@
 
     sget-object v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x3
+    const/4 v2, 0x4
 
     aget-object v1, v1, v2
 
@@ -409,14 +410,14 @@
 
 
 # virtual methods
-.method public final configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
-    .locals 5
+.method public final configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    .locals 16
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;",
             "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
-            "ZZ",
+            "ZZZZ",
             "Lcom/discord/widgets/voice/model/CameraState;",
             "Lkotlin/jvm/functions/Function0<",
             "Lkotlin/Unit;",
@@ -432,401 +433,517 @@
             ">;",
             "Lkotlin/jvm/functions/Function0<",
             "Lkotlin/Unit;",
+            ">;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
             ">;)V"
         }
     .end annotation
 
-    const/4 v0, 0x0
+    move/from16 v0, p3
 
-    if-eqz p1, :cond_11
+    move/from16 v1, p4
 
-    if-eqz p2, :cond_10
+    move/from16 v2, p5
 
-    if-eqz p5, :cond_f
+    move-object/from16 v3, p7
 
-    if-eqz p6, :cond_e
+    move-object/from16 v4, p8
 
-    if-eqz p7, :cond_d
+    move-object/from16 v5, p9
 
-    if-eqz p8, :cond_c
+    move-object/from16 v6, p10
 
-    if-eqz p9, :cond_b
+    move-object/from16 v7, p11
 
-    if-eqz p10, :cond_a
+    move-object/from16 v8, p12
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getPttButton()Landroid/widget/Button;
+    move-object/from16 v9, p13
 
-    move-result-object v1
+    const-string v10, "inputMode"
 
-    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
+    move-object/from16 v11, p1
 
-    move-result p1
+    invoke-static {v11, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/16 v2, 0x8
+    const-string v10, "audioDevicesState"
 
-    const/4 v3, 0x1
+    move-object/from16 v12, p2
 
-    const/4 v4, 0x0
+    invoke-static {v12, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eq p1, v3, :cond_0
+    const-string v10, "cameraState"
 
-    const/16 p1, 0x8
+    invoke-static {v3, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "onMutePressed"
+
+    invoke-static {v4, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "onScreensharePressed"
+
+    invoke-static {v5, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "onSpeakerButtonPressed"
+
+    invoke-static {v6, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "onCameraButtonPressed"
+
+    invoke-static {v7, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "onDisconnectPressed"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "onDeafenPressed"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getPttButton()Landroid/widget/Button;
+
+    move-result-object v10
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v11
+
+    const/4 v13, 0x1
+
+    const/16 v14, 0x8
+
+    const/4 v15, 0x0
+
+    if-eq v11, v13, :cond_0
+
+    const/16 v11, 0x8
 
     goto :goto_0
 
     :cond_0
-    const/4 p1, 0x0
+    const/4 v11, 0x0
 
     :goto_0
-    invoke-virtual {v1, p1}, Landroid/widget/Button;->setVisibility(I)V
+    invoke-virtual {v10, v11}, Landroid/widget/Button;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v10
 
-    new-instance v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1;
+    new-instance v11, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1;
 
-    invoke-direct {v1, p9}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v11, v7}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$1;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v10, v11}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v7
 
-    sget-object p9, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState;
+    sget-object v10, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState;
 
-    if-eq p5, p9, :cond_1
+    if-eq v3, v10, :cond_1
 
     goto :goto_1
 
     :cond_1
-    const/4 v3, 0x0
+    const/4 v13, 0x0
 
     :goto_1
-    if-eqz v3, :cond_2
+    if-eqz v13, :cond_2
 
-    const/4 v2, 0x0
-
-    :cond_2
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
-
-    sget-object p1, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_ON:Lcom/discord/widgets/voice/model/CameraState;
-
-    const p9, 0x7f040144
-
-    const v1, 0x7f040147
-
-    if-ne p5, p1, :cond_3
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
-
-    move-result-object p5
-
-    invoke-static {p5, p9}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
-    move-result p5
-
-    invoke-static {p5}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
-
-    move-result-object p5
-
-    invoke-virtual {p1, p5}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
+    const/4 v10, 0x0
 
     goto :goto_2
 
-    :cond_3
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
-
-    move-result-object p5
-
-    invoke-static {p5, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
-    move-result p5
-
-    invoke-static {p5}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
-
-    move-result-object p5
-
-    invoke-virtual {p1, p5}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
+    :cond_2
+    const/16 v10, 0x8
 
     :goto_2
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+    invoke-virtual {v7, v10}, Landroid/view/View;->setVisibility(I)V
 
-    move-result-object p1
+    sget-object v7, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_ON:Lcom/discord/widgets/voice/model/CameraState;
 
-    instance-of p1, p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+    const v10, 0x7f040144
 
-    if-eqz p1, :cond_4
+    const v11, 0x7f040147
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+    if-ne v3, v7, :cond_3
 
-    move-result-object p1
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
 
-    const p5, 0x7f080226
+    move-result-object v3
 
-    invoke-virtual {p1, p5}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v7
+
+    invoke-static {v7, v10}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+    move-result v7
+
+    invoke-static {v7}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+
+    move-result-object v7
+
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
+
+    move-result-object v3
+
+    invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v7
+
+    const v13, 0x7f120397
+
+    invoke-virtual {v7, v13}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     goto :goto_3
 
-    :cond_4
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+    :cond_3
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v3
 
-    const p5, 0x7f080227
+    invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
 
-    invoke-virtual {p1, p5}, Landroid/widget/ImageView;->setImageResource(I)V
+    move-result-object v7
+
+    invoke-static {v7, v11}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+    move-result v7
+
+    invoke-static {v7}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+
+    move-result-object v7
+
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getCameraStateButton()Landroid/widget/ImageView;
+
+    move-result-object v3
+
+    invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v7
+
+    const v13, 0x7f120396
+
+    invoke-virtual {v7, v13}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
     :goto_3
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    move-result-object p1
+    move-result-object v3
 
-    sget-object p5, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;
+    instance-of v3, v3, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
 
-    if-eq p1, p5, :cond_6
+    if-eqz v3, :cond_4
 
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v3
 
-    sget-object p5, Lcom/discord/stores/StoreAudioDevices$OutputDevice$WiredAudio;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$WiredAudio;
+    const v7, 0x7f080227
 
-    if-ne p1, p5, :cond_5
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setImageResource(I)V
 
     goto :goto_4
 
-    :cond_5
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+    :cond_4
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v3
 
-    invoke-virtual {p1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
+    const v7, 0x7f080228
 
-    move-result-object p1
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    invoke-static {p1, p9}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    :goto_4
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    move-result p1
+    move-result-object v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+    sget-object v7, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Earpiece;
 
-    move-result-object p5
+    if-eq v3, v7, :cond_6
 
-    invoke-static {p1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    move-result-object p1
+    move-result-object v3
 
-    invoke-virtual {p5, p1}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
+    sget-object v7, Lcom/discord/stores/StoreAudioDevices$OutputDevice$WiredAudio;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$WiredAudio;
+
+    if-ne v3, v7, :cond_5
 
     goto :goto_5
 
-    :cond_6
-    :goto_4
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+    :cond_5
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v3
 
-    invoke-virtual {p1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
+    invoke-virtual {v3}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
 
-    move-result-object p1
+    move-result-object v3
 
-    invoke-static {p1, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+    invoke-static {v3, v10}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
-    move-result p1
+    move-result v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
 
-    move-result-object p5
+    move-result-object v7
 
-    invoke-static {p1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+    invoke-static {v3}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
 
-    move-result-object p1
+    move-result-object v3
 
-    invoke-virtual {p5, p1}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
-
-    :goto_5
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
-
-    move-result-object p2
-
-    instance-of p2, p2, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
-
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setActivated(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
-
-    move-result-object p1
-
-    new-instance p2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2;
-
-    invoke-direct {p2, p8}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2;-><init>(Lkotlin/jvm/functions/Function0;)V
-
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getMuteStateButton()Landroid/widget/ImageView;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setActivated(Z)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getMuteStateButton()Landroid/widget/ImageView;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    if-eqz p3, :cond_7
-
-    const p3, 0x7f12165f
+    invoke-virtual {v7, v3}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
 
     goto :goto_6
 
-    :cond_7
-    const p3, 0x7f120f35
+    :cond_6
+    :goto_5
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    invoke-static {v3, v11}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+    move-result v3
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
+
+    move-result-object v7
+
+    invoke-static {v3}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+
+    move-result-object v3
+
+    invoke-virtual {v7, v3}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
 
     :goto_6
-    invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
 
-    move-result-object p2
+    move-result-object v3
 
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual/range {p2 .. p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getMuteStateButton()Landroid/widget/ImageView;
+    move-result-object v7
 
-    move-result-object p1
+    instance-of v7, v7, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
 
-    new-instance p2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setActivated(Z)V
 
-    invoke-direct {p2, p6}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getSpeakerButton()Landroid/widget/ImageView;
 
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    move-result-object v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDeafenStateButton()Landroid/widget/ImageView;
+    new-instance v7, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2;
 
-    move-result-object p1
+    invoke-direct {v7, v6}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$2;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {p1, p4}, Landroid/widget/ImageView;->setActivated(Z)V
+    invoke-virtual {v3, v7}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDeafenStateButton()Landroid/widget/ImageView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDeafenButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v3
 
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+    invoke-virtual {v3, v1}, Landroid/widget/ImageView;->setActivated(Z)V
 
-    move-result-object p2
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDeafenButton()Landroid/widget/ImageView;
 
-    if-eqz p2, :cond_9
+    move-result-object v3
 
-    if-eqz p4, :cond_8
+    xor-int/lit8 v6, p6, 0x1
 
-    const p3, 0x7f121658
+    if-eqz v6, :cond_7
+
+    const/4 v6, 0x0
 
     goto :goto_7
 
-    :cond_8
-    const p3, 0x7f120558
+    :cond_7
+    const/16 v6, 0x8
 
     :goto_7
-    invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v3, v6}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDeafenButton()Landroid/widget/ImageView;
+
+    move-result-object v3
+
+    invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v6
+
+    if-eqz v1, :cond_8
+
+    const v1, 0x7f121682
+
+    goto :goto_8
+
+    :cond_8
+    const v1, 0x7f12055a
+
+    :goto_8
+    invoke-virtual {v6, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v3, v1}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDeafenButton()Landroid/widget/ImageView;
+
+    move-result-object v1
+
+    new-instance v3, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;
+
+    invoke-direct {v3, v9}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$3;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    invoke-virtual {v1, v3}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getMuteStateButton()Landroid/widget/ImageView;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setActivated(Z)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getMuteStateButton()Landroid/widget/ImageView;
+
+    move-result-object v1
+
+    invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    if-eqz v0, :cond_9
+
+    const v0, 0x7f121689
+
+    goto :goto_9
+
+    :cond_9
+    const v0, 0x7f120f5f
+
+    :goto_9
+    invoke-virtual {v3, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v0
 
-    :cond_9
-    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDeafenStateButton()Landroid/widget/ImageView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getMuteStateButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v0
 
-    new-instance p2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;
+    new-instance v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;
 
-    invoke-direct {p2, p7}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v1, v4}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$4;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDisconnectButton()Landroid/widget/ImageView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getScreenshareButton()Landroid/widget/ImageView;
 
-    move-result-object p1
+    move-result-object v0
 
-    new-instance p2, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setActivated(Z)V
 
-    invoke-direct {p2, p10}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getScreenshareButton()Landroid/widget/ImageView;
 
-    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    move-result-object v0
 
-    return-void
+    if-eqz p6, :cond_a
+
+    const/4 v14, 0x0
 
     :cond_a
-    const-string p1, "onDisconnectPressed"
+    invoke-virtual {v0, v14}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getScreenshareButton()Landroid/widget/ImageView;
 
-    throw v0
+    move-result-object v0
+
+    if-eqz v2, :cond_b
+
+    const v1, 0x7f08034d
+
+    goto :goto_a
 
     :cond_b
-    const-string p1, "onCameraButtonPressed"
+    const v1, 0x7f08034c
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :goto_a
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    throw v0
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getScreenshareButton()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    invoke-virtual/range {p0 .. p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_d
+
+    if-eqz v2, :cond_c
+
+    const v2, 0x7f121512
+
+    goto :goto_b
 
     :cond_c
-    const-string p1, "onSpeakerButtonPressed"
+    const v2, 0x7f1213fe
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :goto_b
+    invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    throw v0
+    move-result-object v1
+
+    goto :goto_c
 
     :cond_d
-    const-string p1, "onDeafenPressed"
+    const/4 v1, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :goto_c
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V
 
-    throw v0
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getScreenshareButton()Landroid/widget/ImageView;
 
-    :cond_e
-    const-string p1, "onMutePressed"
+    move-result-object v0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    new-instance v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;
 
-    throw v0
+    invoke-direct {v1, v5}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$5;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    :cond_f
-    const-string p1, "cameraState"
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getDisconnectButton()Landroid/widget/ImageView;
 
-    throw v0
+    move-result-object v0
 
-    :cond_10
-    const-string p1, "audioDevicesState"
+    new-instance v1, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct {v1, v8}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView$configureUI$6;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    throw v0
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    :cond_11
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public final hidePtt()V
@@ -856,7 +973,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "onPttPressed"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->getPttButton()Landroid/widget/Button;
 
@@ -873,13 +992,4 @@
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onPttPressed"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali
index 71dde153c1..3283845e68 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali
@@ -58,7 +58,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f0803da
+    const v4, 0x7f0803dd
 
     const/4 v5, 0x1
 
@@ -80,7 +80,7 @@
 
     const/4 v10, 0x1
 
-    const v11, 0x7f0803da
+    const v11, 0x7f0803dd
 
     const/4 v12, 0x0
 
@@ -102,7 +102,7 @@
 
     const/4 v5, 0x2
 
-    const v6, 0x7f0803db
+    const v6, 0x7f0803de
 
     const/4 v7, 0x1
 
@@ -124,7 +124,7 @@
 
     const/4 v5, 0x3
 
-    const v6, 0x7f0803da
+    const v6, 0x7f0803dd
 
     move-object v3, v1
 
@@ -225,7 +225,9 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->isButtonActive:Z
 
@@ -254,15 +256,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getIconTint(Landroid/content/Context;)I
@@ -270,7 +263,9 @@
     .annotation build Landroidx/annotation/ColorRes;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->isButtonActive:Z
 
@@ -299,15 +294,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getShowMoreOptions()Z
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali
index 3f61e61151..f313a17e47 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView.smali
@@ -39,121 +39,85 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
+    const-string v2, "video"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVideo()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "video"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getVideo()Landroid/widget/ImageView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
 
-    const/4 v2, 0x0
+    const-string v2, "audioOutputSelector"
 
-    aput-object v1, v0, v2
+    const-string v3, "getAudioOutputSelector()Landroid/widget/ImageView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "audioOutputSelector"
-
-    const-string v4, "getAudioOutputSelector()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
+    const-string v2, "audioOutputSelectorMore"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getAudioOutputSelectorMore()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "audioOutputSelectorMore"
-
-    const-string v4, "getAudioOutputSelectorMore()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
+    const-string v2, "mute"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getMute()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "mute"
-
-    const-string v4, "getMute()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
+    const-string v2, "disconnect"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getDisconnect()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "disconnect"
-
-    const-string v4, "getDisconnect()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
 
-    const-class v2, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;
+    const-string v2, "stopWatching"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStopWatching()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "stopWatching"
-
-    const-string v4, "getStopWatching()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
@@ -205,13 +169,15 @@
 .end method
 
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "ctx"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a071d
+    const p1, 0x7f0a0723
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -219,7 +185,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->video$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0718
+    const p1, 0x7f0a071e
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -227,7 +193,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->audioOutputSelector$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0719
+    const p1, 0x7f0a071f
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -235,7 +201,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->audioOutputSelectorMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a071b
+    const p1, 0x7f0a0721
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -243,7 +209,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->mute$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a071a
+    const p1, 0x7f0a0720
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -251,7 +217,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->disconnect$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a071c
+    const p1, 0x7f0a0722
 
     invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -268,15 +234,6 @@
     invoke-static {p1, p2, p0}, Landroid/widget/FrameLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     return-void
-
-    :cond_0
-    const-string p1, "ctx"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -449,29 +406,41 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "model"
 
-    if-eqz p1, :cond_11
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_10
+    const-string v0, "outputSelectorState"
 
-    if-eqz p6, :cond_f
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_e
+    const-string v0, "onStopWatchingClick"
 
-    if-eqz p8, :cond_d
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_c
+    const-string v0, "onDisconnectClick"
 
-    if-eqz p10, :cond_b
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onAudioOutputClick"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onVideoClick"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onMuteClick"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->getStopWatching()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     if-eqz p4, :cond_0
 
@@ -483,17 +452,17 @@
     const/16 p4, 0x8
 
     :goto_0
-    invoke-virtual {v1, p4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, p4}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->getStopWatching()Landroid/view/View;
 
     move-result-object p4
 
-    new-instance v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$1;
+    new-instance v0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$1;
 
-    invoke-direct {v1, p6}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$1;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v0, p6}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$1;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {p4, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p4, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->getDisconnect()Landroid/view/View;
 
@@ -547,13 +516,13 @@
     :goto_2
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->getMute()Landroid/widget/ImageView;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-static {p7}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
 
     move-result-object p7
 
-    invoke-virtual {v1, p7}, Landroid/widget/ImageView;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v0, p7}, Landroid/widget/ImageView;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->getMute()Landroid/widget/ImageView;
 
@@ -561,25 +530,25 @@
 
     if-eqz p4, :cond_3
 
-    const v1, 0x7f080353
+    const v0, 0x7f080356
 
     goto :goto_3
 
     :cond_3
-    const v1, 0x7f080348
+    const v0, 0x7f080349
 
     :goto_3
-    invoke-virtual {p7, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {p7, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->getMute()Landroid/widget/ImageView;
 
     move-result-object p7
 
-    new-instance v1, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$3;
+    new-instance v0, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$3;
 
-    invoke-direct {v1, p10}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$3;-><init>(Lkotlin/jvm/functions/Function0;)V
+    invoke-direct {v0, p10}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$configureUI$3;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    invoke-virtual {p7, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p7, v0}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->getMute()Landroid/widget/ImageView;
 
@@ -591,12 +560,12 @@
 
     if-eqz p4, :cond_4
 
-    const p4, 0x7f12165f
+    const p4, 0x7f121689
 
     goto :goto_4
 
     :cond_4
-    const p4, 0x7f120f35
+    const p4, 0x7f120f5f
 
     :goto_4
     invoke-virtual {p10, p4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -617,6 +586,8 @@
 
     move-result p10
 
+    const/4 v0, 0x0
+
     invoke-virtual {p7, p10, v0}, Landroid/content/res/Resources;->getDrawable(ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
 
     move-result-object p7
@@ -635,9 +606,9 @@
 
     move-result-object p10
 
-    const-string v1, "context"
+    const-string v3, "context"
 
-    invoke-static {p10, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p10, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p10}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getBackgroundRes(Landroid/content/Context;)I
 
@@ -653,7 +624,7 @@
 
     move-result-object p4
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2, p4}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->getIconTint(Landroid/content/Context;)I
 
@@ -747,10 +718,10 @@
     :goto_7
     if-eqz p4, :cond_8
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     :cond_8
-    invoke-virtual {p7, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p7, v1}, Landroid/view/View;->setVisibility(I)V
 
     if-eqz p2, :cond_9
 
@@ -807,55 +778,6 @@
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_b
-    const-string p1, "onMuteClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p1, "onVideoClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    const-string p1, "onAudioOutputClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
-    const-string p1, "onDisconnectClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_f
-    const-string p1, "onStopWatchingClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_10
-    const-string p1, "outputSelectorState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_11
-    const-string p1, "model"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final getPermissionProvider()Lcom/discord/app/AppPermissions$Requests;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1.smali
index 2f10bda286..75626f4f4e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CallFeedbackSheetNavigator.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/fragment/app/FragmentActivity;",
         "Ljava/lang/Boolean;",
@@ -63,7 +63,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -87,11 +87,15 @@
 .end method
 
 .method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
-    .locals 19
+    .locals 15
 
-    move-object/from16 v0, p0
+    move-object v0, p0
 
-    if-eqz p1, :cond_1
+    const-string v1, "fragmentActivity"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v1, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;->INSTANCE:Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;
 
@@ -101,61 +105,54 @@
 
     invoke-interface {v1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v1
+    move-result-wide v3
 
-    iget-wide v3, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$requestedShowTimestamp:J
+    iget-wide v5, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$requestedShowTimestamp:J
 
-    sub-long/2addr v1, v3
+    sub-long/2addr v3, v5
 
-    const-wide/16 v3, 0xbb8
+    const-wide/16 v5, 0xbb8
 
-    cmp-long v5, v1, v3
+    cmp-long v1, v3, v5
 
-    if-gez v5, :cond_0
+    if-gez v1, :cond_0
 
-    sget-object v6, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;->INSTANCE:Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;
+    sget-object v1, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;->INSTANCE:Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;
 
     invoke-virtual/range {p1 .. p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v7
+    move-result-object v3
 
-    const-string v1, "fragmentActivity.supportFragmentManager"
+    const-string v2, "fragmentActivity.supportFragmentManager"
 
-    invoke-static {v7, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-wide v8, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$channelId:J
+    iget-wide v4, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$channelId:J
 
-    iget-object v10, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$rtcConnectionId:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$rtcConnectionId:Ljava/lang/String;
 
-    iget-object v11, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$mediaSessionId:Ljava/lang/String;
+    iget-object v7, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$mediaSessionId:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$callDuration:Ljava/lang/Long;
+    iget-object v8, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$callDuration:Ljava/lang/Long;
 
-    invoke-static/range {v6 .. v12}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;->access$show(Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;Landroidx/fragment/app/FragmentManager;JLjava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
+    move-object v2, v1
+
+    invoke-static/range {v2 .. v8}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;->access$show(Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator;Landroidx/fragment/app/FragmentManager;JLjava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
 
     :cond_0
-    iget-object v13, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$storeNotices:Lcom/discord/stores/StoreNotices;
+    iget-object v9, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$storeNotices:Lcom/discord/stores/StoreNotices;
 
-    iget-object v14, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$noticeName:Ljava/lang/String;
+    iget-object v10, v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1;->$noticeName:Ljava/lang/String;
 
-    const-wide/16 v15, 0x0
+    const-wide/16 v11, 0x0
 
-    const/16 v17, 0x2
+    const/4 v13, 0x2
 
-    const/16 v18, 0x0
+    const/4 v14, 0x0
 
-    invoke-static/range {v13 .. v18}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
+    invoke-static/range {v9 .. v14}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
 
     const/4 v1, 0x1
 
     return v1
-
-    :cond_1
-    const-string v1, "fragmentActivity"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator.smali
index 06ccdebf51..1d3a25549f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator.smali
@@ -101,7 +101,7 @@
 
     move-result-object p3
 
-    if-eqz p3, :cond_0
+    invoke-static {p3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string p4, "ARG_CONFIG"
 
@@ -116,13 +116,6 @@
     invoke-virtual {p2, p1, p3}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Companion.smali
index e0bbaee5ac..c33ce5bdbb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Companion.smali
@@ -31,7 +31,7 @@
     return-void
 .end method
 
-.method public static synthetic REASON_CODES$annotations()V
+.method public static synthetic getREASON_CODES$annotations()V
     .locals 0
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config$CREATOR.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config$CREATOR.smali
index fd777dd4c4..f98c9a299a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config$CREATOR.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config$CREATOR.smali
@@ -48,22 +48,15 @@
 .method public createFromParcel(Landroid/os/Parcel;)Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "parcel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;-><init>(Landroid/os/Parcel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config.smali
index 7d3c0ea4b0..d02a2a3907 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config.smali
@@ -71,9 +71,9 @@
 .method public constructor <init>(Landroid/os/Parcel;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "parcel"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readLong()J
 
@@ -87,27 +87,24 @@
 
     move-result-object v5
 
-    sget-object v1, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+    sget-object v0, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Landroid/os/Parcel;->readValue(Ljava/lang/ClassLoader;)Ljava/lang/Object;
+    invoke-virtual {p1, v0}, Landroid/os/Parcel;->readValue(Ljava/lang/ClassLoader;)Ljava/lang/Object;
 
     move-result-object p1
 
-    instance-of v1, p1, Ljava/lang/Long;
+    instance-of v0, p1, Ljava/lang/Long;
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    goto :goto_0
+    const/4 p1, 0x0
 
     :cond_0
-    move-object v0, p1
-
-    :goto_0
-    move-object v6, v0
+    move-object v6, p1
 
     check-cast v6, Ljava/lang/Long;
 
@@ -116,13 +113,6 @@
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;JLjava/lang/String;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;
@@ -258,7 +248,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;->rtcConnectionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -268,7 +258,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;->mediaSessionId:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -278,7 +268,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;->callDuration:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -444,7 +434,9 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parcel"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;->channelId:J
 
@@ -463,13 +455,4 @@
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeValue(Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Factory.smali
index 9b6fafba4a..7f224c66bb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Factory.smali
@@ -23,24 +23,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "config"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Factory;->config:Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;
 
     return-void
-
-    :cond_0
-    const-string p1, "config"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -57,7 +50,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;
 
@@ -72,15 +67,6 @@
     invoke-direct {p1, v0, v1}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;-><init>(Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;Lcom/discord/stores/StoreAnalytics;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getConfig()Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali
index a75a89411d..5d6813b9f9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "CallFeedbackSheetViewModel.kt"
 
 # interfaces
@@ -17,7 +17,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;",
         ">;",
         "Lcom/discord/widgets/feedback/FeedbackSheetViewModel;"
@@ -288,17 +288,19 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;Lcom/discord/stores/StoreAnalytics;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "config"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "storeAnalytics"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;
 
     sget-object v2, Lcom/discord/widgets/voice/feedback/FeedbackRating;->NO_RESPONSE:Lcom/discord/widgets/voice/feedback/FeedbackRating;
 
-    sget-object v3, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v3, Lk0/j/n;->d:Lk0/j/n;
 
     const v4, 0x7f12038d
 
@@ -310,7 +312,7 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;-><init>(Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/util/List;III)V
 
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;->config:Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config;
 
@@ -333,20 +335,6 @@
     invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreAnalytics;->trackShowCallFeedbackSheet(J)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeAnalytics"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "config"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getISSUES_UI_OPTIONS$cp()Ljava/util/List;
@@ -431,7 +419,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -439,7 +427,7 @@
 .method public onCleared()V
     .locals 0
 
-    invoke-super {p0}, Lf/a/b/o0;->onCleared()V
+    invoke-super {p0}, Lf/a/b/q0;->onCleared()V
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;->submitForm()V
 
@@ -453,7 +441,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;->reasonDescription:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -485,29 +473,29 @@
 .end method
 
 .method public selectRating(Lcom/discord/widgets/voice/feedback/FeedbackRating;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "feedbackRating"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
-    if-eq v1, v2, :cond_0
+    if-eq v0, v1, :cond_0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    if-eq v1, v2, :cond_0
+    if-eq v0, v1, :cond_0
 
-    const/4 v2, 0x3
+    const/4 v1, 0x3
 
-    if-eq v1, v2, :cond_1
+    if-eq v0, v1, :cond_1
 
     goto :goto_0
 
@@ -518,32 +506,27 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
     :cond_1
+    const/4 v0, 0x0
+
     invoke-virtual {p0, v0, v0}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;->selectIssue(Lcom/discord/widgets/voice/feedback/FeedbackIssue;Ljava/lang/String;)V
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;->createViewState(Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/util/List;)Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;->submitForm()V
 
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "feedbackRating"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public submitForm()V
@@ -560,7 +543,7 @@
 
     iput-boolean v0, p0, Lcom/discord/widgets/voice/feedback/CallFeedbackSheetViewModel;->submitted:Z
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackIssue.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackIssue.smali
index 8f6c065ca3..a89a57ee3e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackIssue.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackIssue.smali
@@ -223,7 +223,7 @@
 
     const/16 v3, 0xa
 
-    const v4, 0x7f12150e
+    const v4, 0x7f121538
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -237,7 +237,7 @@
 
     const/16 v3, 0xb
 
-    const v4, 0x7f12150f
+    const v4, 0x7f121539
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -251,7 +251,7 @@
 
     const/16 v3, 0xc
 
-    const v4, 0x7f121518
+    const v4, 0x7f121542
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -265,7 +265,7 @@
 
     const/16 v3, 0xd
 
-    const v4, 0x7f12151a
+    const v4, 0x7f121544
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -279,7 +279,7 @@
 
     const/16 v3, 0xe
 
-    const v4, 0x7f12150c
+    const v4, 0x7f121536
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -293,7 +293,7 @@
 
     const/16 v3, 0xf
 
-    const v4, 0x7f12150d
+    const v4, 0x7f121537
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -307,7 +307,7 @@
 
     const/16 v3, 0x10
 
-    const v4, 0x7f121512
+    const v4, 0x7f12153c
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -321,7 +321,7 @@
 
     const/16 v3, 0x11
 
-    const v4, 0x7f121513
+    const v4, 0x7f12153d
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -335,7 +335,7 @@
 
     const/16 v3, 0x12
 
-    const v4, 0x7f121514
+    const v4, 0x7f12153e
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -349,7 +349,7 @@
 
     const/16 v3, 0x13
 
-    const v4, 0x7f121515
+    const v4, 0x7f12153f
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -363,7 +363,7 @@
 
     const/16 v3, 0x14
 
-    const v4, 0x7f121510
+    const v4, 0x7f12153a
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
@@ -377,7 +377,7 @@
 
     const/16 v3, 0x15
 
-    const v4, 0x7f121511
+    const v4, 0x7f12153b
 
     invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;-><init>(Ljava/lang/String;II)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder.smali
index 3a5c8405c3..606ba08344 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder.smali
@@ -29,13 +29,15 @@
 
 # direct methods
 .method public constructor <init>(ILcom/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
     .end param
 
-    if-eqz p2, :cond_1
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -50,20 +52,11 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.TextView"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -83,7 +76,9 @@
 .method public onConfigure(ILcom/discord/widgets/voice/feedback/FeedbackIssue;)V
     .locals 2
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -112,15 +107,6 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter$onIssueClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter$onIssueClick$1.smali
index 068999aee8..ff8926e4de 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter$onIssueClick$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter$onIssueClick$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter$onIssueClick$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FeedbackView.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/feedback/FeedbackIssue;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/widgets/voice/feedback/FeedbackIssue;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter.smali
index ff6d4f9a86..78f9ecf960 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter.smali
@@ -38,9 +38,11 @@
 
 # direct methods
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -49,15 +51,6 @@
     iput-object p1, p0, Lcom/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter;->onIssueClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "recyclerView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -103,7 +96,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder;
 
@@ -112,19 +107,10 @@
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder;-><init>(ILcom/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnIssueClick(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -136,18 +122,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter;->onIssueClick:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView.smali
index f4da105e50..acd3957a55 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/feedback/FeedbackView.smali
@@ -53,141 +53,99 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/feedback/FeedbackView;
 
-    const-class v2, Lcom/discord/widgets/voice/feedback/FeedbackView;
+    const-string v2, "ratingSummaryPrompt"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRatingSummaryPrompt()Landroid/widget/TextView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "ratingSummaryPrompt"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRatingSummaryPrompt()Landroid/widget/TextView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/feedback/FeedbackView;
 
-    const/4 v2, 0x0
+    const-string v2, "sadRating"
 
-    aput-object v1, v0, v2
+    const-string v3, "getSadRating()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/feedback/FeedbackView;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "sadRating"
-
-    const-string v4, "getSadRating()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/feedback/FeedbackView;
 
-    const-class v2, Lcom/discord/widgets/voice/feedback/FeedbackView;
+    const-string v2, "neutralRating"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNeutralRating()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "neutralRating"
-
-    const-string v4, "getNeutralRating()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/feedback/FeedbackView;
 
-    const-class v2, Lcom/discord/widgets/voice/feedback/FeedbackView;
+    const-string v2, "happyRating"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHappyRating()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "happyRating"
-
-    const-string v4, "getHappyRating()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/feedback/FeedbackView;
 
-    const-class v2, Lcom/discord/widgets/voice/feedback/FeedbackView;
+    const-string v2, "issuesHeader"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIssuesHeader()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "issuesHeader"
-
-    const-string v4, "getIssuesHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/feedback/FeedbackView;
 
-    const-class v2, Lcom/discord/widgets/voice/feedback/FeedbackView;
+    const-string v2, "issuesCard"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIssuesCard()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "issuesCard"
-
-    const-string v4, "getIssuesCard()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/feedback/FeedbackView;
 
-    const-class v2, Lcom/discord/widgets/voice/feedback/FeedbackView;
+    const-string v2, "issuesRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getIssuesRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "issuesRecycler"
-
-    const-string v4, "getIssuesRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
@@ -201,15 +159,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a0395
+    const p2, 0x7f0a039b
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -217,7 +177,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/feedback/FeedbackView;->ratingSummaryPrompt$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0396
+    const p2, 0x7f0a039c
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -225,7 +185,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/feedback/FeedbackView;->sadRating$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0394
+    const p2, 0x7f0a039a
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -233,7 +193,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/feedback/FeedbackView;->neutralRating$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0390
+    const p2, 0x7f0a0396
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +201,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/feedback/FeedbackView;->happyRating$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0391
+    const p2, 0x7f0a0397
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -249,7 +209,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/feedback/FeedbackView;->issuesHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0392
+    const p2, 0x7f0a0398
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +217,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/voice/feedback/FeedbackView;->issuesCard$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0393
+    const p2, 0x7f0a0399
 
     invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -346,20 +306,6 @@
     invoke-virtual {p1, p2}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private final getHappyRating()Landroid/view/View;
@@ -533,23 +479,37 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "ratingSummaryPromptText"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_b
+    const-string v0, "selectedFeedbackRating"
 
-    if-eqz p3, :cond_a
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_9
+    const-string v0, "onSadRatingClick"
 
-    if-eqz p5, :cond_8
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_7
+    const-string v0, "onNeutralRatingClick"
 
-    if-eqz p7, :cond_6
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_5
+    const-string v0, "onHappyRatingClick"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "issuesHeaderText"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "feedbackIssues"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onIssueClick"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/feedback/FeedbackView;->getRatingSummaryPrompt()Landroid/widget/TextView;
 
@@ -708,60 +668,4 @@
     invoke-virtual {p1, p7}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
     return-void
-
-    :cond_5
-    const-string p1, "onIssueClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "feedbackIssues"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "issuesHeaderText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "onHappyRatingClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "onNeutralRatingClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "onSadRatingClick"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p1, "selectedFeedbackRating"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p1, "ratingSummaryPromptText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem.smali
index 88765a941c..e4fca7e0d6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem.smali
@@ -25,9 +25,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -36,15 +38,6 @@
     iput-boolean p2, p0, Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;->isTapped:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "callUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;ZILjava/lang/Object;)Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;
@@ -92,22 +85,15 @@
 .method public final copy(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;Z)Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;-><init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "callUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -125,7 +111,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;->callUser:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserViewHolder.smali
index de95076ca1..ea0e2ad10c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserViewHolder.smali
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0022
 
@@ -39,7 +41,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0132
+    const v0, 0x7f0a0135
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -50,15 +52,6 @@
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserViewHolder;->voiceUserView:Lcom/discord/views/VoiceUserView;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -66,7 +59,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 3
 
-    if-eqz p2, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -88,7 +83,7 @@
 
     const-string v0, "voiceUserView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter$CallUserItem;->isTapped()Z
 
@@ -97,15 +92,6 @@
     invoke-virtual {p1, p2}, Lcom/discord/views/VoiceUserView;->setSelected(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter.smali
index 6301d69c5d..4a6f7b35a0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/PrivateCallUsersAdapter.smali
@@ -43,22 +43,15 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -74,7 +67,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -87,7 +80,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p2, :cond_0
 
@@ -103,13 +98,4 @@
     move-result-object p1
 
     throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure.smali
index f2a96f6485..a4303b9514 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/Exception;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "exception"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure;->exception:Ljava/lang/Exception;
 
     return-void
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure;Ljava/lang/Exception;ILjava/lang/Object;)Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure;
@@ -70,22 +65,15 @@
 .method public final copy(Ljava/lang/Exception;)Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure;-><init>(Ljava/lang/Exception;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$RepresentativeColorResult$Failure;->exception:Ljava/lang/Exception;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2.smali
index ee58aefd05..0ca214c0dd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "UserRepresentativeColors.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.widgets.voice.fullscreen.UserRepresentativeColors$getRepresentativeColorAsync$2"
     f = "UserRepresentativeColors.kt"
     l = {}
@@ -54,7 +54,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p2}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p2}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -75,7 +75,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2;
 
@@ -88,15 +90,6 @@
     iput-object p1, v0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1.smali
index 8b3ab26ad0..7c3b3df0da 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "UserRepresentativeColors.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -30,7 +30,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.discord.widgets.voice.fullscreen.UserRepresentativeColors$handleBitmap$1"
     f = "UserRepresentativeColors.kt"
     l = {
@@ -64,7 +64,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p4}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p4}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -85,7 +85,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1;
 
@@ -100,15 +102,6 @@
     iput-object p1, v0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -134,7 +127,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 6
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1;->label:I
 
@@ -207,7 +200,7 @@
 
     const-string v4, "copiedBitmap"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1;->L$0:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$observeRepresentativeColorForUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$observeRepresentativeColorForUser$1.smali
index ac3438e049..813494e55c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$observeRepresentativeColorForUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors$observeRepresentativeColorForUser$1.smali
@@ -3,7 +3,7 @@
 .source "UserRepresentativeColors.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,14 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors.smali
index 6270b4847f..fecb4e6b9c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/UserRepresentativeColors.smali
@@ -182,7 +182,7 @@
 
     const-string v0, "quantizer"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/quantize/ColorCutQuantizer;->getQuantizedColors()Ljava/util/List;
 
@@ -198,7 +198,7 @@
 
     const-string v0, "firstSwatch"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/quantize/Palette$Swatch;->getRgb()I
 
@@ -326,7 +326,7 @@
         }
     .end annotation
 
-    sget-object v0, Lk0/a/j0;->a:Lk0/a/v;
+    sget-object v0, Ll0/a/j0;->a:Ll0/a/v;
 
     new-instance v1, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2;
 
@@ -334,7 +334,7 @@
 
     invoke-direct {v1, p1, v2}, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$getRepresentativeColorAsync$2;-><init>(Landroid/graphics/Bitmap;Lkotlin/coroutines/Continuation;)V
 
-    invoke-static {v0, v1, p2}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    invoke-static {v0, v1, p2}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -344,36 +344,31 @@
 .method public final handleBitmap(JLandroid/graphics/Bitmap;)V
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "bitmap"
 
-    if-eqz p3, :cond_0
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lk0/a/s0;->d:Lk0/a/s0;
+    sget-object v1, Ll0/a/s0;->d:Ll0/a/s0;
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
     move-result-object v2
 
-    const/4 v3, 0x0
-
     new-instance v4, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1;
 
+    const/4 v0, 0x0
+
     invoke-direct {v4, p1, p2, p3, v0}, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$handleBitmap$1;-><init>(JLandroid/graphics/Bitmap;Lkotlin/coroutines/Continuation;)V
 
+    const/4 v3, 0x0
+
     const/4 v5, 0x2
 
     const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     return-void
-
-    :cond_0
-    const-string p1, "bitmap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final observeRepresentativeColorForUser(J)Lrx/Observable;
@@ -393,7 +388,7 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors$observeRepresentativeColorForUser$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -403,7 +398,7 @@
 
     const-string p2, "representativeColorsSubj\u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$Companion.smali
index dd3e0cb6ed..e0766636b5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$Companion.smali
@@ -117,7 +117,9 @@
 .method public final launch(Landroid/content/Context;JZLjava/lang/String;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -140,13 +142,4 @@
     invoke-virtual {p1, v0}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$1.smali
index c712e32652..ed0b5c4760 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Long;",
         "Lkotlin/Unit;",
@@ -43,7 +43,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.smali
index c8783de1e4..3587e1bb17 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$setConnectedTimerSubscription$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$2.smali
index 88e0aee7f0..7d18fbd651 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$2.smali
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onShowParticipantsPressed()V
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onEmptyStateTapped()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3.smali
index 1fd8f6e3cf..eb2cf42235 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3.smali
@@ -1,9 +1,9 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function0;
+.implements Landroid/view/View$OnClickListener;
 
 
 # annotations
@@ -16,61 +16,34 @@
     name = null
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
 
 # instance fields
-.field public final synthetic $viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
-
 .field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
+.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
+.method public final onClick(Landroid/view/View;)V
+    .locals 0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;->invoke()V
+    iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    invoke-static {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
-    return-object v0
-.end method
+    move-result-object p1
 
-.method public final invoke()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
-
-    invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$onDisconnectClicked(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/model/CallModel;)V
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onStopStream()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4.smali
index d854f3d6d3..195f82b345 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4.smali
@@ -1,9 +1,9 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function0;
+.implements Landroid/view/View$OnClickListener;
 
 
 # annotations
@@ -16,15 +16,6 @@
     name = null
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
 
 # instance fields
 .field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
@@ -36,35 +27,23 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
+.method public final onClick(Landroid/view/View;)V
+    .locals 0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;->invoke()V
+    iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    invoke-static {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
-    return-object v0
-.end method
+    move-result-object p1
 
-.method public final invoke()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
-
-    invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->stopWatchingStream()V
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onShowParticipantsPressed()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.smali
index bac0be1478..45ab25af88 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -27,18 +27,22 @@
 
 
 # instance fields
+.field public final synthetic $viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
+
 .field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
+    iput-object p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
+
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,21 +60,17 @@
 .end method
 
 .method public final invoke()V
-    .locals 3
+    .locals 2
 
-    sget-object v0, Lf/a/a/d/a/a;->k:Lf/a/a/d/a/a$b;
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
-    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v1
 
-    const-string v2, "parentFragmentManager"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1}, Lf/a/a/d/a/a$b;->a(Landroidx/fragment/app/FragmentManager;)V
+    invoke-static {v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$onDisconnectClicked(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/model/CallModel;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1.smali
deleted file mode 100644
index dbf0a0b523..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1;
-.super Ljava/lang/Object;
-.source "WidgetCallFullscreen.kt"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;->invoke()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call()V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;
-
-    iget-object v0, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
-
-    invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->toggleCameraPressed()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6.smali
index 4c3af9edbe..608dfe617f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,15 +56,15 @@
 .end method
 
 .method public final invoke()V
-    .locals 2
+    .locals 1
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1;
+    invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;)V
+    move-result-object v0
 
-    invoke-virtual {v0, v1}, Lcom/discord/app/AppFragment;->requestVideoCallPermissions(Lrx/functions/Action0;)V
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->stopWatchingStream()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7.smali
index db4987f8fb..301d4bfda3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,15 +56,21 @@
 .end method
 
 .method public final invoke()V
-    .locals 1
+    .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    sget-object v0, Lf/a/a/d/a/a;->k:Lf/a/a/d/a/a$b;
 
-    invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    move-result-object v0
+    invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onMuteClicked()V
+    move-result-object v1
+
+    const-string v2, "parentFragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1}, Lf/a/a/d/a/a$b;->a(Landroidx/fragment/app/FragmentManager;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1.smali
new file mode 100644
index 0000000000..ac9bf6b1a2
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1.smali
@@ -0,0 +1,51 @@
+.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1;
+.super Ljava/lang/Object;
+.source "WidgetCallFullscreen.kt"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;->invoke()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;
+
+    iget-object v0, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->toggleCameraPressed()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8.smali
new file mode 100644
index 0000000000..59859eed66
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8.smali
@@ -0,0 +1,70 @@
+.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;
+.super Lk0/o/c/j;
+.source "WidgetCallFullscreen.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureGridUi(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/app/AppFragment;->requestVideoCallPermissions(Lrx/functions/Action0;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9.smali
new file mode 100644
index 0000000000..f0199e0079
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9.smali
@@ -0,0 +1,70 @@
+.class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9;
+.super Lk0/o/c/j;
+.source "WidgetCallFullscreen.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureGridUi(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    invoke-static {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$getViewModel$p(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onMuteClicked()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1$1.smali
index 5e1140e4da..d8790adcbc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/streams/StreamContext;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/utilities/streams/StreamContext;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1;
 
@@ -82,13 +84,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->targetAndFocusStream(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.smali
index f2ea331ec5..eca1f6fe84 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.smali
@@ -58,7 +58,7 @@
 
     const-string v0, "menuItem"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
@@ -97,7 +97,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$Companion;->show(Ljava/lang/Long;Landroidx/fragment/app/FragmentManager;)V
 
@@ -112,7 +112,7 @@
 
     move-result-object v3
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
@@ -160,7 +160,7 @@
 
     const-string v0, "context"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchForConnect(Landroid/content/Context;)V
 
@@ -168,7 +168,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a05ad
+    .packed-switch 0x7f0a05b3
         :pswitch_3
         :pswitch_2
         :pswitch_1
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.smali
index ac02e7f1fd..05aef51a13 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.smali
@@ -65,7 +65,7 @@
 
     move-result v0
 
-    const v1, 0x7f0a05ae
+    const v1, 0x7f0a05b4
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -73,7 +73,7 @@
 
     const-string v2, "switchCameraMenuItem"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
@@ -93,7 +93,7 @@
 
     invoke-static {v2, v1, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$tintMenuItem(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Landroid/view/MenuItem;I)V
 
-    const v1, 0x7f0a05b0
+    const v1, 0x7f0a05b6
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -101,7 +101,7 @@
 
     const-string v2, "voiceSettingsMenuItem"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
@@ -121,7 +121,7 @@
 
     invoke-static {v2, v1, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$tintMenuItem(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Landroid/view/MenuItem;I)V
 
-    const v1, 0x7f0a05ad
+    const v1, 0x7f0a05b3
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -129,7 +129,7 @@
 
     const-string v2, "overlayLauncherMenuItem"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
@@ -149,7 +149,7 @@
 
     invoke-static {v2, v1, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->access$tintMenuItem(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Landroid/view/MenuItem;I)V
 
-    const v1, 0x7f0a05af
+    const v1, 0x7f0a05b5
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -157,7 +157,7 @@
 
     const-string v1, "listMenuItem"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2;->$viewState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$1.smali
index 13938eccbf..b844c26e35 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$2.smali
index cbdfd3cdf6..3fe867fc7d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$3.smali
index d424138cf2..5584f4a6a9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lf/a/a/d/a/a$b;->a(Landroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$4.smali
index 9c0466b6f0..ffc26cdfae 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$4.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$4;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$5.smali
index 91eb903a76..e4b0de631f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$5.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configurePrivateCallParticipantsUi$5;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1$1.smali
index ebbe62078d..4221c941d9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Ljava/lang/Boolean;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -65,7 +65,9 @@
 .method public final invoke(Landroid/view/View;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1;
 
@@ -78,13 +80,4 @@
     xor-int/lit8 p1, p1, 0x1
 
     return p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.smali
index c717932bd4..af76fe7ce4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/jvm/functions/Function1<",
         "-",
@@ -48,7 +48,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -80,7 +80,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "action"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1;->$viewGroup:Landroid/view/ViewGroup;
 
@@ -96,20 +98,20 @@
 
     move-result-object v0
 
-    check-cast v0, Lj0/s/g;
+    check-cast v0, Lk0/t/g;
 
-    new-instance v1, Lj0/s/g$a;
+    new-instance v1, Lk0/t/g$a;
 
-    invoke-direct {v1, v0}, Lj0/s/g$a;-><init>(Lj0/s/g;)V
+    invoke-direct {v1, v0}, Lk0/t/g$a;-><init>(Lk0/t/g;)V
 
     :goto_0
-    invoke-virtual {v1}, Lj0/s/g$a;->hasNext()Z
+    invoke-virtual {v1}, Lk0/t/g$a;->hasNext()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Lj0/s/g$a;->next()Ljava/lang/Object;
+    invoke-virtual {v1}, Lk0/t/g$a;->next()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -121,13 +123,4 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "action"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2$1.smali
index 2b0d5a405f..8883bb9d13 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2$1.smali
@@ -49,7 +49,7 @@
 
     const-string v0, "insets"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Landroid/view/WindowInsets;->getSystemWindowInsetLeft()I
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2.smali
index 272ccfc726..08d224edcd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -71,20 +71,13 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2$1;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$2$1;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnApplyWindowInsetsListener(Landroid/view/View$OnApplyWindowInsetsListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$3$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$3$1.smali
index 7778c57749..e1b73b44d6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$3$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$3$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$3$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/view/View;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/view/WindowInsets;
 
@@ -72,13 +74,4 @@
     invoke-virtual {p1, v0}, Landroid/view/View;->dispatchApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$2.smali
index 1010b6c877..b18dd28429 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onPushToTalkPressed"
+
+    const-string v5, "onPushToTalkPressed(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onPushToTalkPressed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onPushToTalkPressed(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$3.smali
index dc58ef2bb9..0b8174cba0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$3.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$3;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureUI(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$4.smali
index 03a600c8f9..0cfb8d7981 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBoundOrOnResume$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->handleEvent(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$1.smali
index 4771220089..ddfad792f7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onGridParticipantTapped(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$2.smali
index b47bc2576c..b17eaaca79 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$2;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->onGridParticipantLongPressed(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$3.smali
index fa8c372f8e..2da3d28fba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/String;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Ljava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$3;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->targetAndFocusStream(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$layoutManager$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$layoutManager$1.smali
index d656e7b617..6a757b519f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$layoutManager$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$layoutManager$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$setUpGridRecycler$layoutManager$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreen.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Integer;",
         ">;"
@@ -42,7 +42,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali
index 4b86bfc3a1..4745cd0211 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.smali
@@ -46,6 +46,12 @@
 
 .field public final showParticipantsButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field public final stopStreamingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final streamingBodyText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field public final streamingView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field public final toolbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field public final videoCallGridView$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -57,250 +63,220 @@
 .method public static constructor <clinit>()V
     .locals 5
 
-    const/16 v0, 0xc
+    const/16 v0, 0xf
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "floatingControls"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "floatingControls"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getFloatingControls()Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const/4 v2, 0x0
+    const-string v2, "videoCallGridView"
 
-    aput-object v1, v0, v2
+    const-string v3, "getVideoCallGridView()Landroidx/recyclerview/widget/RecyclerView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "videoCallGridView"
-
-    const-string v4, "getVideoCallGridView()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "actionBarLayout"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getActionBarLayout()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "actionBarLayout"
-
-    const-string v4, "getActionBarLayout()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "toolbar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getToolbar()Landroidx/appcompat/widget/Toolbar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "toolbar"
-
-    const-string v4, "getToolbar()Landroidx/appcompat/widget/Toolbar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "pictureInPicture"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPictureInPicture()Lcom/discord/views/video/VideoCallParticipantView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "pictureInPicture"
-
-    const-string v4, "getPictureInPicture()Lcom/discord/views/video/VideoCallParticipantView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "pushToTalkButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPushToTalkButton()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "pushToTalkButton"
-
-    const-string v4, "getPushToTalkButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "privateCallParticipantsContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivateCallParticipantsContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privateCallParticipantsContainer"
-
-    const-string v4, "getPrivateCallParticipantsContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "privateCallParticipantsRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivateCallParticipantsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privateCallParticipantsRecycler"
-
-    const-string v4, "getPrivateCallParticipantsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "privateCallStatusPrimary"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivateCallStatusPrimary()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privateCallStatusPrimary"
-
-    const-string v4, "getPrivateCallStatusPrimary()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "privateCallStatusSecondary"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getPrivateCallStatusSecondary()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "privateCallStatusSecondary"
-
-    const-string v4, "getPrivateCallStatusSecondary()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "participantsHiddenView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getParticipantsHiddenView()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "participantsHiddenView"
-
-    const-string v4, "getParticipantsHiddenView()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+    const-string v2, "streamingView"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStreamingView()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "showParticipantsButton"
-
-    const-string v4, "getShowParticipantsButton()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    const-string v2, "stopStreamingButton"
+
+    const-string v3, "getStopStreamingButton()Landroid/widget/Button;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xc
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    const-string v2, "showParticipantsButton"
+
+    const-string v3, "getShowParticipantsButton()Landroid/widget/Button;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xd
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;
+
+    const-string v2, "streamingBodyText"
+
+    const-string v3, "getStreamingBodyText()Landroid/widget/TextView;"
+
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
+
+    move-result-object v1
+
+    const/16 v2, 0xe
+
+    aput-object v1, v0, v2
+
     sput-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$Companion;
@@ -327,7 +303,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->floatingControls$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0133
+    const v0, 0x7f0a0136
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -367,7 +343,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->pushToTalkButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0717
+    const v0, 0x7f0a071d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -375,7 +351,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->privateCallParticipantsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0720
+    const v0, 0x7f0a0726
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -383,7 +359,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->privateCallParticipantsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a071e
+    const v0, 0x7f0a0724
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -391,7 +367,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->privateCallStatusPrimary$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a071f
+    const v0, 0x7f0a0725
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -407,6 +383,22 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->participantsHiddenView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+    const v0, 0x7f0a0133
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->streamingView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0132
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->stopStreamingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
     const v0, 0x7f0a0130
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -415,6 +407,14 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->showParticipantsButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+    const v0, 0x7f0a0134
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->streamingBodyText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
     return-void
 .end method
 
@@ -468,7 +468,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -620,7 +620,7 @@
 
     const-string v2, "Observable\n            .\u20260L, 1L, TimeUnit.SECONDS)"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x2
 
@@ -666,7 +666,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1217cb
+    const v0, 0x7f1217f7
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
@@ -686,7 +686,7 @@
 
     const-string v2, "requireActivity()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, -0x1
 
@@ -732,7 +732,7 @@
     :goto_0
     invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getShowParticipantsButton()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getStreamingView()Landroid/view/View;
 
     move-result-object v1
 
@@ -740,24 +740,20 @@
 
     invoke-direct {v4, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$2;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
 
-    invoke-virtual {v1, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getVideoCallGridView()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getStreamingView()Landroid/view/View;
 
     move-result-object v1
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getVisibleVideoParticipants()Ljava/util/List;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v4
 
-    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
+    invoke-virtual {v4}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
 
     move-result v4
 
-    const/4 v6, 0x1
-
-    xor-int/2addr v4, v6
-
     if-eqz v4, :cond_1
 
     const/4 v4, 0x0
@@ -770,24 +766,56 @@
     :goto_1
     invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getPictureInPicture()Lcom/discord/views/video/VideoCallParticipantView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getStreamingBodyText()Landroid/widget/TextView;
 
     move-result-object v1
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getPipParticipant()Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
+    sget-object v4, Lcom/discord/utilities/voice/VoiceViewUtils;->INSTANCE:Lcom/discord/utilities/voice/VoiceViewUtils;
 
-    move-result-object v4
+    invoke-virtual {v4}, Lcom/discord/utilities/voice/VoiceViewUtils;->getIsSoundshareSupported()Z
+
+    move-result v4
 
     if-eqz v4, :cond_2
 
-    const/4 v4, 0x1
+    const v4, 0x7f120f2c
 
     goto :goto_2
 
     :cond_2
-    const/4 v4, 0x0
+    const v4, 0x7f120f2d
 
     :goto_2
+    invoke-virtual {v1, v4}, Landroid/widget/TextView;->setText(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getStopStreamingButton()Landroid/widget/Button;
+
+    move-result-object v1
+
+    new-instance v4, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;
+
+    invoke-direct {v4, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+
+    invoke-virtual {v1, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getShowParticipantsButton()Landroid/widget/Button;
+
+    move-result-object v1
+
+    new-instance v4, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;
+
+    invoke-direct {v4, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+
+    invoke-virtual {v1, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getVideoCallGridView()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isVideoCallGridVisible()Z
+
+    move-result v4
+
     if-eqz v4, :cond_3
 
     const/4 v4, 0x0
@@ -808,6 +836,38 @@
 
     move-result-object v4
 
+    const/4 v6, 0x1
+
+    if-eqz v4, :cond_4
+
+    const/4 v4, 0x1
+
+    goto :goto_4
+
+    :cond_4
+    const/4 v4, 0x0
+
+    :goto_4
+    if-eqz v4, :cond_5
+
+    const/4 v4, 0x0
+
+    goto :goto_5
+
+    :cond_5
+    const/16 v4, 0x8
+
+    :goto_5
+    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getPictureInPicture()Lcom/discord/views/video/VideoCallParticipantView;
+
+    move-result-object v1
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getPipParticipant()Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
+
+    move-result-object v4
+
     invoke-virtual {v1, v4}, Lcom/discord/views/video/VideoCallParticipantView;->set(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)V
 
     iget-object v1, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->gridAdapter:Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;
@@ -816,22 +876,22 @@
 
     const-string v7, "gridAdapter"
 
-    if-eqz v1, :cond_d
+    if-eqz v1, :cond_f
 
     invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->getItemCount()I
 
     move-result v1
 
-    if-ne v1, v6, :cond_4
+    if-ne v1, v6, :cond_6
 
     const/4 v1, 0x1
 
-    goto :goto_4
+    goto :goto_6
 
-    :cond_4
+    :cond_6
     const/4 v1, 0x0
 
-    :goto_4
+    :goto_6
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getVisibleVideoParticipants()Ljava/util/List;
 
     move-result-object v8
@@ -840,19 +900,19 @@
 
     move-result v8
 
-    if-ne v8, v6, :cond_5
+    if-ne v8, v6, :cond_7
 
     const/4 v8, 0x1
 
-    goto :goto_5
+    goto :goto_7
 
-    :cond_5
+    :cond_7
     const/4 v8, 0x0
 
-    :goto_5
+    :goto_7
     iget-object v9, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->gridAdapter:Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;
 
-    if-eqz v9, :cond_c
+    if-eqz v9, :cond_e
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getVisibleVideoParticipants()Ljava/util/List;
 
@@ -860,9 +920,9 @@
 
     invoke-virtual {v9, v4}, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->setData(Ljava/util/List;)V
 
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_8
 
-    if-nez v8, :cond_6
+    if-nez v8, :cond_8
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getVideoCallGridView()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -870,7 +930,7 @@
 
     invoke-virtual {v1, v5}, Landroidx/recyclerview/widget/RecyclerView;->scrollToPosition(I)V
 
-    :cond_6
+    :cond_8
     invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureMenu(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
 
     invoke-direct/range {p0 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->configureActionBar(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
@@ -895,33 +955,33 @@
 
     sget-object v4, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState;
 
-    if-eq v1, v4, :cond_7
+    if-eq v1, v4, :cond_9
 
     const/4 v10, 0x1
 
-    goto :goto_6
+    goto :goto_8
 
-    :cond_7
+    :cond_9
     const/4 v10, 0x0
 
-    :goto_6
-    new-instance v14, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;
+    :goto_8
+    new-instance v14, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;
 
     move-object/from16 v1, p1
 
-    invoke-direct {v14, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$3;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
+    invoke-direct {v14, v0, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)V
 
-    new-instance v13, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;
+    new-instance v13, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;
 
-    invoke-direct {v13, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$4;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+    invoke-direct {v13, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
 
-    new-instance v15, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;
+    new-instance v15, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7;
 
-    invoke-direct {v15, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$5;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+    invoke-direct {v15, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
 
-    new-instance v4, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;
+    new-instance v4, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;
 
-    invoke-direct {v4, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$6;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+    invoke-direct {v4, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$8;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused()Z
 
@@ -933,9 +993,9 @@
 
     move-result v11
 
-    new-instance v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7;
+    new-instance v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9;
 
-    invoke-direct {v3, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$7;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
+    invoke-direct {v3, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureGridUi$9;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;)V
 
     move-object/from16 v16, v4
 
@@ -969,29 +1029,29 @@
 
     sget-object v7, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->PUSH_TO_TALK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-    if-ne v4, v7, :cond_8
+    if-ne v4, v7, :cond_a
 
-    goto :goto_7
+    goto :goto_9
 
-    :cond_8
+    :cond_a
     const/4 v6, 0x0
 
-    :goto_7
-    if-eqz v6, :cond_9
+    :goto_9
+    if-eqz v6, :cond_b
 
-    goto :goto_8
+    goto :goto_a
 
-    :cond_9
+    :cond_b
     const/16 v5, 0x8
 
-    :goto_8
+    :goto_a
     invoke-virtual {v3, v5}, Landroid/view/View;->setVisibility(I)V
 
     sget v3, Landroid/os/Build$VERSION;->SDK_INT:I
 
     const/16 v4, 0x1c
 
-    if-lt v3, v4, :cond_b
+    if-lt v3, v4, :cond_d
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isShowingControls()Z
 
@@ -999,13 +1059,13 @@
 
     const/16 v3, 0x200
 
-    if-nez v1, :cond_a
+    if-nez v1, :cond_c
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/app/Activity;->getWindow()Landroid/view/Window;
 
@@ -1013,14 +1073,14 @@
 
     invoke-virtual {v1, v3, v3}, Landroid/view/Window;->setFlags(II)V
 
-    goto :goto_9
+    goto :goto_b
 
-    :cond_a
+    :cond_c
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/app/Activity;->getWindow()Landroid/view/Window;
 
@@ -1028,17 +1088,17 @@
 
     invoke-virtual {v1, v3}, Landroid/view/Window;->clearFlags(I)V
 
-    :cond_b
-    :goto_9
+    :cond_d
+    :goto_b
     return-void
 
-    :cond_c
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    :cond_e
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
-    :cond_d
-    invoke-static {v7}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    :cond_f
+    invoke-static {v7}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 .end method
@@ -1074,7 +1134,7 @@
 
     const-string v2, "requireActivity()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
@@ -1319,7 +1379,7 @@
     :cond_6
     const-string v1, "privateCallParticipantsAdapter"
 
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 .end method
@@ -1413,7 +1473,7 @@
 
     const-string v1, "requireActivity()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/app/Activity;->getWindow()Landroid/view/Window;
 
@@ -1687,7 +1747,7 @@
 
     sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0xb
+    const/16 v2, 0xd
 
     aget-object v1, v1, v2
 
@@ -1700,6 +1760,66 @@
     return-object v0
 .end method
 
+.method private final getStopStreamingButton()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->stopStreamingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xc
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/Button;
+
+    return-object v0
+.end method
+
+.method private final getStreamingBodyText()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->streamingBodyText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xe
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/TextView;
+
+    return-object v0
+.end method
+
+.method private final getStreamingView()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->streamingView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0xb
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    return-object v0
+.end method
+
 .method private final getTitle(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;)Ljava/lang/CharSequence;
     .locals 4
 
@@ -1795,7 +1915,7 @@
 .method private final initializeSystemUiListeners(Landroid/view/ViewGroup;)V
     .locals 3
 
-    const/4 v0, 0x2
+    const/4 v0, 0x3
 
     new-array v0, v0, [Landroid/view/View;
 
@@ -1815,6 +1935,14 @@
 
     aput-object v1, v0, v2
 
+    invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->getStreamingView()Landroid/view/View;
+
+    move-result-object v1
+
+    const/4 v2, 0x2
+
+    aput-object v1, v0, v2
+
     invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v0
@@ -1975,7 +2103,7 @@
     :cond_2
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2017,7 +2145,7 @@
 
     const-string v4, "resources"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration;
 
@@ -2051,7 +2179,7 @@
 
     const-string v7, "videoCallGridView.context"
 
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v5, v4, v3, v6}, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridLayoutManager;-><init>(Lkotlin/jvm/functions/Function0;IILandroid/content/Context;)V
 
@@ -2090,17 +2218,17 @@
     return-void
 
     :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -2114,7 +2242,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -2122,17 +2250,25 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f120fa9
+    const v3, 0x7f120fd3
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f120fa8
+    const v4, 0x7f120fd2
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2140,9 +2276,9 @@
 
     const-string v5, "context.getString(R.stri\u2026o_permission_dialog_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2214,7 +2350,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -2222,17 +2358,25 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f121451
+    const v3, 0x7f12147b
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f121450
+    const v4, 0x7f12147a
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2240,9 +2384,9 @@
 
     const-string v5, "context.getString(R.stri\u2026server_muted_dialog_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2314,7 +2458,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -2322,17 +2466,25 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f121541
+    const v3, 0x7f12156b
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f121544
+    const v4, 0x7f12156e
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2340,9 +2492,9 @@
 
     const-string v5, "context.getString(R.stri\u2026ppressed_permission_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2435,11 +2587,13 @@
 .method public final configureUI(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Invalid;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2465,15 +2619,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getContentViewResId()I
@@ -2487,11 +2632,13 @@
 .method public final handleEvent(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event;)V
     .locals 13
 
-    if-eqz p1, :cond_7
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowSuppressedDialog;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowSuppressedDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2504,7 +2651,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowServerMutedDialog;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowServerMutedDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2517,7 +2664,7 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowNoVideoPermissionDialog;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowNoVideoPermissionDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2530,7 +2677,7 @@
     :cond_2
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowGuildVideoAtCapacityDialog;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowGuildVideoAtCapacityDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -2544,7 +2691,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lf/a/a/m$a;->a(Landroidx/fragment/app/FragmentManager;)V
 
@@ -2561,7 +2708,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Event$ShowCameraCapacityDialog;
 
@@ -2592,7 +2739,7 @@
 
     move-result-object v6
 
-    invoke-static {v6, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v7, 0x0
 
@@ -2630,15 +2777,6 @@
     invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw p1
-
-    :cond_7
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDestroy()V
@@ -2667,11 +2805,11 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 8
+    .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -2679,45 +2817,47 @@
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->initializeSystemUiListeners(Landroid/view/ViewGroup;)V
 
-    const/4 v2, 0x1
-
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const-string v1, "view.context"
+    const-string v0, "view.context"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f040276
+    const v0, 0x7f040276
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x2
-
-    invoke-static {p1, v1, v3, v4, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+    invoke-static {p1, v0, v1, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
     move-result p1
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object v2
 
-    const p1, 0x7f1205b5
+    const p1, 0x7f1205b7
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v4
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v1, 0x1
 
-    const/16 v6, 0x8
+    const/4 v4, 0x0
 
-    const/4 v7, 0x0
+    const/16 v5, 0x8
 
-    move-object v1, p0
+    const/4 v6, 0x0
 
-    invoke-static/range {v1 .. v7}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    move-object v0, p0
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreen;->setUpGridRecycler()V
 
@@ -2728,13 +2868,6 @@
     invoke-virtual {p1, p0}, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView;->setPermissionProvider(Lcom/discord/app/AppPermissions$Requests;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onViewBoundOrOnResume()V
@@ -2780,7 +2913,7 @@
 
     const-string v3, "ViewModelProvider(\n     \u2026eenViewModel::class.java)"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
@@ -2863,7 +2996,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -2926,29 +3059,29 @@
     return-void
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
     :cond_2
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
     :cond_3
     const-string v0, "privateCallParticipantsAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
     :cond_4
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 
     :cond_5
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v4
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory.smali
index baa0904865..38c7ae992c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory.smali
@@ -39,7 +39,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 18
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -52,72 +52,71 @@
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_0
+    const-string v1, "modelClass"
 
-    new-instance v17, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
+    move-object/from16 v2, p1
 
-    iget-wide v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory;->channelId:J
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
+    move-object v2, v1
 
-    move-result-object v4
+    iget-wide v3, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory;->channelId:J
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
+    invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
 
     move-result-object v5
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v6, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+    invoke-virtual {v6}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
 
     move-result-object v6
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v7, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+    invoke-virtual {v7}, Lcom/discord/stores/StoreStream$Companion;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
 
     move-result-object v7
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v8, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+    invoke-virtual {v8}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
 
     move-result-object v8
 
-    const/4 v9, 0x0
+    sget-object v9, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    const/4 v10, 0x0
+    invoke-virtual {v9}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v9
 
     invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
 
-    move-result-object v11
+    move-result-object v12
 
-    const/4 v12, 0x0
+    iget-object v10, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory;->streamKey:Ljava/lang/String;
+
+    move-object/from16 v16, v10
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
 
     const/4 v13, 0x0
 
-    iget-object v14, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$Factory;->streamKey:Ljava/lang/String;
+    const/4 v14, 0x0
 
-    const/16 v15, 0x6c0
+    const/4 v15, 0x0
 
-    const/16 v16, 0x0
+    const/16 v17, 0xec0
 
-    move-object/from16 v1, v17
+    const/16 v18, 0x0
 
-    invoke-direct/range {v1 .. v16}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v2 .. v18}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Lcom/discord/utilities/voice/VoiceEngineServiceController;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v17
-
-    :cond_0
-    const-string v1, "modelClass"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
+    return-object v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap.smali
index 91fca0b498..1827447707 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap.smali
@@ -22,9 +22,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;J)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "participantFocusKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -33,15 +35,6 @@
     iput-wide p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;->timestamp:J
 
     return-void
-
-    :cond_0
-    const-string p1, "participantFocusKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;Ljava/lang/String;JILjava/lang/Object;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
@@ -89,22 +82,15 @@
 .method public final copy(Ljava/lang/String;J)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "participantFocusKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;-><init>(Ljava/lang/String;J)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "participantFocusKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -122,7 +108,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;->participantFocusKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid.smali
index a75c51d511..9779aa20b2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "callModel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -39,13 +41,6 @@
     iput-object p3, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->myPermissions:Ljava/lang/Long;
 
     return-void
-
-    :cond_0
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;
@@ -108,22 +103,15 @@
 .method public final copy(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callModel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;
 
     invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +129,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->callModel:Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -151,7 +139,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->noiseCancellation:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -161,7 +149,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->myPermissions:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.smali
index 4d8115aa6c..0efd7d0aff 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreenViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/util/Set<",
         "+",
@@ -40,7 +40,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.smali
index 80395e9047..a65e65ac29 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreenViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/String;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -56,21 +56,7 @@
 .end method
 
 .method public final invoke()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getVisibleVideoParticipants()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eq v0, v1, :cond_0
+    .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
@@ -86,9 +72,38 @@
 
     move-result-object v0
 
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
     goto :goto_0
 
     :cond_0
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getVisibleVideoParticipants()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-eq v1, v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
     invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->getVisibleVideoParticipants()Ljava/util/List;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid.smali
index 5ff0bf488f..425542fdc7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid.smali
@@ -31,6 +31,8 @@
 
 .field public final isSwitchCameraButtonVisible:Z
 
+.field public final isVideoCallGridVisible:Z
+
 .field public final menuItems$delegate:Lkotlin/Lazy;
 
 .field public final noiseCancellation:Ljava/lang/Boolean;
@@ -90,22 +92,36 @@
         }
     .end annotation
 
+    const-string v0, "callModel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "overlayStatus"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "visibleVideoParticipants"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cameraState"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "displayMode"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "outputSelectorState"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "privateCallUserListItems"
+
+    invoke-static {p13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_7
-
-    if-eqz p2, :cond_6
-
-    if-eqz p3, :cond_5
-
-    if-eqz p6, :cond_4
-
-    if-eqz p7, :cond_3
-
-    if-eqz p8, :cond_2
-
-    if-eqz p13, :cond_1
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->callModel:Lcom/discord/widgets/voice/model/CallModel;
@@ -158,9 +174,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->focusedParticipantKey:Ljava/lang/String;
 
-    const/4 p2, 0x1
+    const/4 p2, 0x0
 
-    const/4 p3, 0x0
+    const/4 p3, 0x1
 
     if-eqz p1, :cond_0
 
@@ -168,70 +184,46 @@
 
     const-string p5, "STREAM"
 
-    invoke-static {p1, p5, p3, p4}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {p1, p5, p2, p4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result p1
 
-    if-ne p1, p2, :cond_0
+    if-ne p1, p3, :cond_0
+
+    const/4 p1, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p2, 0x0
+    const/4 p1, 0x0
 
     :goto_0
-    iput-boolean p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused:Z
+    iput-boolean p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isStreamFocused:Z
 
-    return-void
+    iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->visibleVideoParticipants:Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p1
+
+    xor-int/2addr p1, p3
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->callModel:Lcom/discord/widgets/voice/model/CallModel;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    const/4 p2, 0x1
 
     :cond_1
-    const-string p1, "privateCallUserListItems"
+    iput-boolean p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isVideoCallGridVisible:Z
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "outputSelectorState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "displayMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "cameraState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "visibleVideoParticipants"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "overlayStatus"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public static final synthetic access$computeMenuItems(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;ZZZLco/discord/media_engine/VideoInputDeviceDescription;Ljava/util/List;)Ljava/util/Set;
@@ -690,42 +682,56 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "callModel"
 
-    if-eqz p1, :cond_6
+    move-object/from16 v2, p1
 
-    if-eqz p2, :cond_5
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_4
+    const-string v0, "overlayStatus"
 
-    if-eqz p6, :cond_3
+    move-object/from16 v3, p2
 
-    if-eqz p7, :cond_2
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_1
+    const-string v0, "visibleVideoParticipants"
 
-    if-eqz p13, :cond_0
+    move-object/from16 v4, p3
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cameraState"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "displayMode"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "outputSelectorState"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "privateCallUserListItems"
+
+    move-object/from16 v14, p13
+
+    invoke-static {v14, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
     move-object v1, v0
 
-    move-object/from16 v2, p1
-
-    move-object/from16 v3, p2
-
-    move-object/from16 v4, p3
-
     move/from16 v5, p4
 
     move/from16 v6, p5
 
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
-    move-object/from16 v9, p8
-
     move-object/from16 v10, p9
 
     move/from16 v11, p10
@@ -734,62 +740,11 @@
 
     move-object/from16 v13, p12
 
-    move-object/from16 v14, p13
-
     move/from16 v15, p14
 
     invoke-direct/range {v1 .. v15}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$OverlayStatus;Ljava/util/List;ZZLcom/discord/widgets/voice/model/CameraState;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;Ljava/lang/String;ZLcom/discord/views/video/VideoCallParticipantView$ParticipantData;Ljava/lang/Boolean;Ljava/util/List;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "privateCallUserListItems"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "outputSelectorState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "displayMode"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "cameraState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v1, "visibleVideoParticipants"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "overlayStatus"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "callModel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -807,7 +762,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->callModel:Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -817,7 +772,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->overlayStatus:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$OverlayStatus;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -827,7 +782,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->visibleVideoParticipants:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -849,7 +804,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->cameraState:Lcom/discord/widgets/voice/model/CameraState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -859,7 +814,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->displayMode:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -869,7 +824,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->outputSelectorState:Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -879,7 +834,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->focusedParticipantKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -895,7 +850,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->pipParticipant:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -905,7 +860,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->noiseCancellation:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -915,7 +870,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->privateCallUserListItems:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1341,6 +1296,14 @@
     return v0
 .end method
 
+.method public final isVideoCallGridVisible()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;->isVideoCallGridVisible:Z
+
+    return v0
+.end method
+
 .method public toString()Ljava/lang/String;
     .locals 3
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$WhenMappings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$WhenMappings.smali
index 1360f237dc..cc57b0bf6e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$WhenMappings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$WhenMappings.smali
@@ -70,33 +70,25 @@
 
     sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->PAUSED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
-    const/4 v1, 0x5
+    const/4 v1, 0x4
 
-    const/4 v3, 0x4
-
-    aput v3, v0, v1
+    aput v1, v0, v1
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v4, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->DENIED_FULL:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
-    const/4 v4, 0x6
+    const/4 v1, 0x5
 
-    aput v1, v0, v4
+    aput v1, v0, v1
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$WhenMappings;->$EnumSwitchMapping$1:[I
 
     sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
-    aput v4, v0, v2
+    const/4 v1, 0x6
 
-    sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$WhenMappings;->$EnumSwitchMapping$1:[I
-
-    sget-object v1, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->LEFT:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
-
-    const/4 v1, 0x7
-
-    aput v1, v0, v3
+    aput v1, v0, v2
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1.smali
index ec9967267f..c7ebfad720 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1.smali
@@ -162,7 +162,7 @@
 
     iget-object v9, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v3, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -180,7 +180,7 @@
 
     iget-object v9, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v4, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -237,7 +237,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -249,7 +249,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -272,7 +272,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -284,7 +284,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1.smali
index 4efe86069f..ade6fa4ece 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetCallFullscreenViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 1
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
@@ -90,5 +76,21 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$2.smali
index 893a74a268..85a3c0547f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$2.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -70,7 +75,7 @@
 
     const-string v0, "noiseCancellationExperimentEnabled"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.smali
index 6d9e0388ab..f3daa239cb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreenViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->handleStoreState(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1.smali
index 596c0eee0c..23bf634a8d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetCallFullscreenViewModel.kt"
 
 # interfaces
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Ljava/lang/String;)V
+    value = Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Lcom/discord/utilities/voice/VoiceEngineServiceController;Ljava/lang/String;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.smali
index fbdcf2519b..100c65a191 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetCallFullscreenViewModel.kt"
 
 
@@ -19,7 +19,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;",
         ">;"
     }
@@ -83,36 +83,60 @@
 
 .field public final videoPlayerIdleDetector:Lcom/discord/utilities/video/VideoPlayerIdleDetector;
 
+.field public final voiceEngineServiceController:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
 
 # direct methods
-.method public constructor <init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Ljava/lang/String;)V
+.method public constructor <init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Lcom/discord/utilities/voice/VoiceEngineServiceController;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "selectedVoiceChannelStore"
 
-    if-eqz p3, :cond_a
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_9
+    const-string v0, "userSettingsStore"
 
-    if-eqz p5, :cond_8
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_7
+    const-string v0, "applicationStreamingStore"
 
-    if-eqz p7, :cond_6
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_5
+    const-string v0, "mediaEngineStore"
 
-    if-eqz p9, :cond_4
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p10, :cond_3
+    const-string v0, "mediaSettingsStore"
 
-    if-eqz p11, :cond_2
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p12, :cond_1
+    const-string v0, "experimentStore"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "permissionsStore"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clock"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "backgroundThreadScheduler"
+
+    invoke-static {p11, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "videoPermissionsManager"
+
+    invoke-static {p12, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceEngineServiceController"
+
+    invoke-static {p13, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Uninitialized;
 
-    invoke-direct {p0, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->channelId:J
 
@@ -136,6 +160,8 @@
 
     iput-object p12, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->videoPermissionsManager:Lcom/discord/utilities/permissions/VideoPermissionsManager;
 
+    iput-object p13, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->voiceEngineServiceController:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
     invoke-static {}, Lrx/subjects/PublishSubject;->g0()Lrx/subjects/PublishSubject;
 
     move-result-object p1
@@ -144,16 +170,16 @@
 
     new-instance p1, Lcom/discord/utilities/video/VideoPlayerIdleDetector;
 
+    new-instance p7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1;
+
+    invoke-direct {p7, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V
+
     const-wide/16 p3, 0x0
 
     const/4 p5, 0x0
 
     const/4 p6, 0x0
 
-    new-instance p7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1;
-
-    invoke-direct {p7, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;)V
-
     const/4 p8, 0x7
 
     const/4 p9, 0x0
@@ -164,17 +190,17 @@
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->videoPlayerIdleDetector:Lcom/discord/utilities/video/VideoPlayerIdleDetector;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->allVideoParticipants:Ljava/util/List;
 
-    if-eqz p13, :cond_0
+    if-eqz p14, :cond_0
 
-    iput-object p13, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->autotargetStreamKey:Ljava/lang/String;
+    iput-object p14, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->autotargetStreamKey:Ljava/lang/String;
 
     sget-object p1, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
 
-    invoke-virtual {p1, p13}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
+    invoke-virtual {p1, p14}, Lcom/discord/models/domain/ModelApplicationStream$Companion;->decodeStreamKey(Ljava/lang/String;)Lcom/discord/models/domain/ModelApplicationStream;
 
     move-result-object p1
 
@@ -188,82 +214,12 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "videoPermissionsManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "backgroundThreadScheduler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "clock"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "permissionsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "experimentStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "mediaEngineStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "applicationStreamingStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "userSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "selectedVoiceChannelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public synthetic constructor <init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 16
+.method public synthetic constructor <init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Lcom/discord/utilities/voice/VoiceEngineServiceController;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 17
 
-    move/from16 v0, p14
+    move/from16 v0, p15
 
     and-int/lit8 v1, v0, 0x40
 
@@ -305,13 +261,13 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v1
 
     const-string v2, "Schedulers.computation()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v13, v1
 
@@ -321,19 +277,19 @@
     move-object/from16 v13, p11
 
     :goto_2
-    and-int/lit16 v0, v0, 0x400
+    and-int/lit16 v1, v0, 0x400
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    new-instance v0, Lcom/discord/utilities/permissions/VideoPermissionsManager;
+    new-instance v1, Lcom/discord/utilities/permissions/VideoPermissionsManager;
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    invoke-direct {v0, v2, v1, v2}, Lcom/discord/utilities/permissions/VideoPermissionsManager;-><init>(Lcom/discord/utilities/permissions/PermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {v1, v3, v2, v3}, Lcom/discord/utilities/permissions/VideoPermissionsManager;-><init>(Lcom/discord/utilities/permissions/PermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    move-object v14, v0
+    move-object v14, v1
 
     goto :goto_3
 
@@ -341,6 +297,24 @@
     move-object/from16 v14, p12
 
     :goto_3
+    and-int/lit16 v0, v0, 0x800
+
+    if-eqz v0, :cond_4
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->Companion:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;->getINSTANCE()Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    move-result-object v0
+
+    move-object v15, v0
+
+    goto :goto_4
+
+    :cond_4
+    move-object/from16 v15, p13
+
+    :goto_4
     move-object/from16 v2, p0
 
     move-wide/from16 v3, p1
@@ -357,9 +331,9 @@
 
     move-object/from16 v12, p10
 
-    move-object/from16 v15, p13
+    move-object/from16 v16, p14
 
-    invoke-direct/range {v2 .. v15}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Ljava/lang/String;)V
+    invoke-direct/range {v2 .. v16}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;Lcom/discord/stores/StorePermissions;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/permissions/VideoPermissionsManager;Lcom/discord/utilities/voice/VoiceEngineServiceController;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -406,7 +380,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -483,7 +457,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -515,7 +489,7 @@
 
     move-result-object v3
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -709,7 +683,7 @@
 
     iget-object v4, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -992,7 +966,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
 
     return-object v0
 
@@ -1071,19 +1045,19 @@
 
     move-result-object v2
 
-    if-eqz v2, :cond_7
+    if-eqz v2, :cond_c
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
 
     move-result-object v2
 
-    if-eqz v2, :cond_7
+    if-eqz v2, :cond_c
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$State;->isSelfStream()Z
 
     move-result v2
 
-    if-ne v2, v5, :cond_7
+    if-ne v2, v5, :cond_c
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getApplicationStream()Lcom/discord/models/domain/ModelApplicationStream;
 
@@ -1121,11 +1095,11 @@
 
     move-result-object v2
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
-    if-eqz v1, :cond_6
+    if-eqz v1, :cond_b
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getState()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
 
@@ -1135,43 +1109,56 @@
 
     move-result v1
 
-    packed-switch v1, :pswitch_data_0
+    if-eqz v1, :cond_a
 
+    if-eq v1, v5, :cond_9
+
+    const/4 v2, 0x2
+
+    if-eq v1, v2, :cond_a
+
+    const/4 v2, 0x3
+
+    if-eq v1, v2, :cond_8
+
+    const/4 v2, 0x4
+
+    if-eq v1, v2, :cond_7
+
+    const/4 v2, 0x5
+
+    if-ne v1, v2, :cond_6
+
+    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;->INACTIVE:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
+
+    goto :goto_3
+
+    :cond_6
     new-instance v0, Lkotlin/NoWhenBranchMatchedException;
 
     invoke-direct {v0}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
 
     throw v0
 
-    :pswitch_0
-    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;->INACTIVE:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
-
-    goto :goto_3
-
-    :pswitch_1
-    return-object v0
-
-    :pswitch_2
-    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;->INACTIVE:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
-
-    goto :goto_3
-
-    :pswitch_3
+    :cond_7
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;->PAUSED:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
 
     goto :goto_3
 
-    :pswitch_4
+    :cond_8
+    return-object v0
+
+    :cond_9
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;->ACTIVE:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
 
     goto :goto_3
 
-    :pswitch_5
+    :cond_a
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;->CONNECTING:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
 
     goto :goto_3
 
-    :cond_6
+    :cond_b
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;->INACTIVE:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
 
     :goto_3
@@ -1201,21 +1188,8 @@
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :cond_7
+    :cond_c
     return-object v0
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_5
-        :pswitch_4
-        :pswitch_5
-        :pswitch_1
-        :pswitch_0
-        :pswitch_3
-        :pswitch_2
-    .end packed-switch
 .end method
 
 .method private final emitServerMutedDialogEvent()V
@@ -1466,7 +1440,7 @@
 
     sget-object v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$observeStoreState$1;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v1
 
@@ -1492,7 +1466,7 @@
 
     const-string v1, "Observable.combineLatest\u2026ate.Invalid\n      }\n    }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1504,7 +1478,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -1565,7 +1539,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -1614,7 +1588,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2
     :goto_0
@@ -1742,7 +1716,7 @@
 
     const-string v1, "Observable\n        .time\u2026ackgroundThreadScheduler)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -1788,24 +1762,21 @@
 
     move-object/from16 v1, p1
 
+    const-string v2, "participantKey"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
+
+    move-result-object v2
+
+    instance-of v3, v2, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
+
+    if-nez v3, :cond_0
+
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_3
-
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
-
-    move-result-object v3
-
-    instance-of v4, v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
-
-    if-nez v4, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v2, v3
-
-    :goto_0
     move-object v3, v2
 
     check-cast v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
@@ -1879,21 +1850,14 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2
     return-void
-
-    :cond_3
-    const-string v1, "participantKey"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public final handleStoreState(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState;)V
-    .locals 25
+    .locals 24
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -1901,15 +1865,15 @@
 
     move-object/from16 v0, p1
 
-    const/4 v8, 0x0
+    const-string v1, "storeState"
 
-    if-eqz v0, :cond_2b
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v0, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->mostRecentStoreState:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState;
 
     sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Invalid;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Invalid;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -1917,20 +1881,20 @@
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Invalid;
 
-    invoke-virtual {v7, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v7, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
-    goto/16 :goto_16
+    goto/16 :goto_17
 
     :cond_0
     instance-of v1, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;
 
     if-eqz v1, :cond_2a
 
-    move-object v9, v0
+    move-object v8, v0
 
-    check-cast v9, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;
+    check-cast v8, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
@@ -1942,7 +1906,7 @@
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Invalid;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Invalid;
 
-    invoke-virtual {v7, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v7, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 
@@ -1963,17 +1927,17 @@
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$OverlayStatus;->DISABLED:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$OverlayStatus;
 
     :goto_0
-    move-object v12, v0
+    move-object v11, v0
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
     invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getSelectedVideoDevice()Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    move-result-object v10
+    move-result-object v9
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
@@ -1987,9 +1951,9 @@
 
     instance-of v1, v0, Ljava/util/Collection;
 
-    const/4 v11, 0x0
+    const/4 v10, 0x0
 
-    const/4 v13, 0x1
+    const/4 v12, 0x1
 
     if-eqz v1, :cond_4
 
@@ -2000,7 +1964,7 @@
     if-eqz v1, :cond_4
 
     :cond_3
-    const/16 v20, 0x0
+    const/16 v19, 0x0
 
     goto :goto_2
 
@@ -2038,7 +2002,7 @@
 
     move-result v2
 
-    if-eq v2, v13, :cond_7
+    if-eq v2, v12, :cond_7
 
     :cond_6
     invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
@@ -2051,7 +2015,7 @@
 
     move-result v1
 
-    if-ne v1, v13, :cond_8
+    if-ne v1, v12, :cond_8
 
     :cond_7
     const/4 v1, 0x1
@@ -2064,18 +2028,20 @@
     :goto_1
     if-eqz v1, :cond_5
 
-    const/16 v20, 0x1
+    const/16 v19, 0x1
 
     :goto_2
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
     instance-of v1, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
+    const/4 v13, 0x0
+
     if-nez v1, :cond_9
 
-    move-object v0, v8
+    move-object v0, v13
 
     :cond_9
     check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
@@ -2094,7 +2060,7 @@
     const/4 v14, 0x1
 
     :goto_3
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
@@ -2117,10 +2083,10 @@
     goto :goto_4
 
     :cond_b
-    move-object v0, v8
+    move-object v0, v13
 
     :goto_4
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v1
 
@@ -2130,7 +2096,7 @@
 
     if-eqz v1, :cond_13
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v1
 
@@ -2142,11 +2108,11 @@
 
     move-result-object v1
 
-    invoke-direct {v7, v11, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->createUserItemsComparator(ZLjava/lang/String;)Ljava/util/Comparator;
+    invoke-direct {v7, v10, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->createUserItemsComparator(ZLjava/lang/String;)Ljava/util/Comparator;
 
     move-result-object v0
 
-    invoke-static {v1, v0}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v1, v0}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object v0
 
@@ -2179,7 +2145,7 @@
 
     check-cast v1, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
@@ -2191,7 +2157,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
@@ -2199,7 +2165,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
@@ -2248,7 +2214,7 @@
 
     check-cast v3, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v4
 
@@ -2270,7 +2236,7 @@
 
     move-result v4
 
-    if-eq v4, v13, :cond_f
+    if-eq v4, v12, :cond_f
 
     :cond_e
     iget-object v3, v3, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->f:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$ApplicationStreamState;
@@ -2307,7 +2273,7 @@
     goto :goto_6
 
     :cond_13
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_14
     iput-object v1, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->allVideoParticipants:Ljava/util/List;
@@ -2318,14 +2284,14 @@
 
     if-eqz v0, :cond_15
 
-    iput-object v8, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
+    iput-object v13, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
 
     :cond_15
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->computeVisibleVideoParticipants()Ljava/util/List;
 
     move-result-object v0
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v2
 
@@ -2337,10 +2303,13 @@
 
     sget-object v2, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_DISABLED:Lcom/discord/widgets/voice/model/CameraState;
 
-    goto :goto_a
+    :goto_a
+    move-object v15, v2
+
+    goto :goto_b
 
     :cond_16
-    if-eqz v10, :cond_17
+    if-eqz v9, :cond_17
 
     sget-object v2, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_ON:Lcom/discord/widgets/voice/model/CameraState;
 
@@ -2349,46 +2318,48 @@
     :cond_17
     sget-object v2, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_OFF:Lcom/discord/widgets/voice/model/CameraState;
 
-    :goto_a
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Lcom/discord/widgets/voice/model/CallModel;->getVideoDevices()Ljava/util/List;
-
-    move-result-object v3
-
-    invoke-interface {v3}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    const/4 v4, 0x2
-
-    if-lt v3, v4, :cond_18
-
-    const/4 v3, 0x1
-
-    goto :goto_b
-
-    :cond_18
-    const/4 v3, 0x0
+    goto :goto_a
 
     :goto_b
-    if-eqz v3, :cond_19
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
-    sget-object v3, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_ON:Lcom/discord/widgets/voice/model/CameraState;
+    move-result-object v2
 
-    if-ne v2, v3, :cond_19
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/model/CallModel;->getVideoDevices()Ljava/util/List;
 
-    const/4 v15, 0x1
+    move-result-object v2
+
+    invoke-interface {v2}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    const/4 v3, 0x2
+
+    if-lt v2, v3, :cond_18
+
+    const/4 v2, 0x1
 
     goto :goto_c
 
-    :cond_19
-    const/4 v15, 0x0
+    :cond_18
+    const/4 v2, 0x0
 
     :goto_c
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    if-eqz v2, :cond_19
+
+    sget-object v2, Lcom/discord/widgets/voice/model/CameraState;->CAMERA_ON:Lcom/discord/widgets/voice/model/CameraState;
+
+    if-ne v15, v2, :cond_19
+
+    const/4 v2, 0x1
+
+    goto :goto_d
+
+    :cond_19
+    const/4 v2, 0x0
+
+    :goto_d
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v3
 
@@ -2402,17 +2373,17 @@
 
     if-eqz v3, :cond_1a
 
-    if-nez v20, :cond_1a
+    if-nez v19, :cond_1a
 
     sget-object v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;->PRIVATE_CALL_PARTICIPANTS:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;
 
-    goto :goto_d
+    goto :goto_e
 
     :cond_1a
     sget-object v3, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;->GRID:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;
 
-    :goto_d
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    :goto_e
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v4
 
@@ -2426,12 +2397,12 @@
 
     const/4 v4, 0x1
 
-    goto :goto_e
+    goto :goto_f
 
     :cond_1b
     const/4 v4, 0x0
 
-    :goto_e
+    :goto_f
     if-nez v14, :cond_1d
 
     if-nez v4, :cond_1d
@@ -2440,18 +2411,18 @@
 
     if-eq v3, v5, :cond_1c
 
-    goto :goto_f
-
-    :cond_1c
-    const/4 v14, 0x0
-
     goto :goto_10
 
-    :cond_1d
-    :goto_f
-    const/4 v14, 0x1
+    :cond_1c
+    const/4 v5, 0x0
 
+    goto :goto_11
+
+    :cond_1d
     :goto_10
+    const/4 v5, 0x1
+
+    :goto_11
     if-nez v4, :cond_1e
 
     sget-object v4, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;->GRID:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;
@@ -2462,15 +2433,15 @@
 
     invoke-virtual {v4}, Lcom/discord/utilities/video/VideoPlayerIdleDetector;->beginIdleDetection()V
 
-    goto :goto_11
+    goto :goto_12
 
     :cond_1e
     iget-object v4, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->videoPlayerIdleDetector:Lcom/discord/utilities/video/VideoPlayerIdleDetector;
 
     invoke-virtual {v4}, Lcom/discord/utilities/video/VideoPlayerIdleDetector;->endIdleDetection()V
 
-    :goto_11
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    :goto_12
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v4
 
@@ -2478,27 +2449,27 @@
 
     move-result-object v4
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
-    move-result-object v5
+    move-result-object v6
 
-    invoke-direct {v7, v5}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->shouldShowMoreAudioOutputs(Lcom/discord/widgets/voice/model/CallModel;)Z
+    invoke-direct {v7, v6}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->shouldShowMoreAudioOutputs(Lcom/discord/widgets/voice/model/CallModel;)Z
 
-    move-result v5
+    move-result v6
 
     invoke-virtual {v4}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
 
     move-result-object v4
 
-    if-eqz v5, :cond_21
+    if-eqz v6, :cond_21
 
-    instance-of v5, v4, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
+    instance-of v6, v4, Lcom/discord/stores/StoreAudioDevices$OutputDevice$BluetoothAudio;
 
-    if-eqz v5, :cond_1f
+    if-eqz v6, :cond_1f
 
     sget-object v4, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->BLUETOOTH_ON_AND_MORE:Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;
 
-    goto :goto_12
+    goto :goto_13
 
     :cond_1f
     instance-of v4, v4, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
@@ -2507,12 +2478,12 @@
 
     sget-object v4, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->SPEAKER_ON_AND_MORE:Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;
 
-    goto :goto_12
+    goto :goto_13
 
     :cond_20
     sget-object v4, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->SPEAKER_OFF_AND_MORE:Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;
 
-    goto :goto_12
+    goto :goto_13
 
     :cond_21
     instance-of v4, v4, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
@@ -2521,13 +2492,13 @@
 
     sget-object v4, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->SPEAKER_ON:Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;
 
-    goto :goto_12
+    goto :goto_13
 
     :cond_22
     sget-object v4, Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;->SPEAKER_OFF:Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;
 
-    :goto_12
-    move-object/from16 v18, v4
+    :goto_13
+    move-object/from16 v17, v4
 
     iget-object v4, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->autotargetStreamKey:Ljava/lang/String;
 
@@ -2535,22 +2506,22 @@
 
     invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v5
+    move-result v6
 
-    xor-int/2addr v5, v13
+    xor-int/2addr v6, v12
 
-    if-eqz v5, :cond_28
+    if-eqz v6, :cond_28
 
     invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_24
+    if-eqz v6, :cond_24
 
     :cond_23
     const/4 v1, 0x0
 
-    goto :goto_14
+    goto :goto_15
 
     :cond_24
     invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
@@ -2560,60 +2531,60 @@
     :cond_25
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_23
+    if-eqz v6, :cond_23
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v6
 
-    check-cast v5, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
+    check-cast v6, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
-    iget-object v5, v5, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->b:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
+    iget-object v6, v6, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->b:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-virtual {v5}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getApplicationStream()Lcom/discord/models/domain/ModelApplicationStream;
+    invoke-virtual {v6}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getApplicationStream()Lcom/discord/models/domain/ModelApplicationStream;
 
-    move-result-object v5
+    move-result-object v6
 
-    if-eqz v5, :cond_26
+    if-eqz v6, :cond_26
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelApplicationStream;->getEncodedStreamKey()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v6
 
-    goto :goto_13
+    goto :goto_14
 
     :cond_26
-    move-object v5, v8
+    move-object v6, v13
 
-    :goto_13
-    invoke-static {v5, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    :goto_14
+    invoke-static {v6, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v5
+    move-result v6
 
-    if-eqz v5, :cond_25
+    if-eqz v6, :cond_25
 
     const/4 v1, 0x1
 
-    :goto_14
+    :goto_15
     if-eqz v1, :cond_27
 
     invoke-virtual {v7, v4}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->targetAndFocusStream(Ljava/lang/String;)V
 
     :cond_27
-    iput-object v8, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->autotargetStreamKey:Ljava/lang/String;
+    iput-object v13, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->autotargetStreamKey:Ljava/lang/String;
 
     :cond_28
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getMyId()J
 
-    move-result-wide v4
+    move-result-wide v13
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v1
 
@@ -2621,84 +2592,89 @@
 
     move-result-object v1
 
-    invoke-direct {v7, v4, v5, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->computePipParticipant(JLco/discord/media_engine/VideoInputDeviceDescription;)Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
+    invoke-direct {v7, v13, v14, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->computePipParticipant(JLco/discord/media_engine/VideoInputDeviceDescription;)Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
-    move-result-object v21
+    move-result-object v20
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v1
 
     invoke-direct {v7, v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->createPrivateCallParticipantListItems(Lcom/discord/widgets/voice/model/CallModel;)Ljava/util/List;
 
-    move-result-object v23
+    move-result-object v22
 
     new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v4
 
-    iget-object v5, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
+    iget-object v6, v7, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getNoiseCancellation()Ljava/lang/Boolean;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getNoiseCancellation()Ljava/lang/Boolean;
 
-    move-result-object v22
+    move-result-object v21
 
-    invoke-virtual {v9}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
-    move-result-object v6
+    move-result-object v9
 
-    invoke-virtual {v6}, Lcom/discord/widgets/voice/model/CallModel;->getVoiceParticipantsHidden()Z
+    invoke-virtual {v9}, Lcom/discord/widgets/voice/model/CallModel;->getVoiceParticipantsHidden()Z
 
-    move-result v6
+    move-result v9
 
-    if-eqz v6, :cond_29
+    if-eqz v9, :cond_29
+
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object v8
+
+    invoke-virtual {v8}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
+
+    move-result v8
+
+    if-nez v8, :cond_29
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
-    move-result v6
+    move-result v8
 
-    if-eqz v6, :cond_29
+    if-eqz v8, :cond_29
 
-    sget-object v6, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;->GRID:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;
+    sget-object v8, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;->GRID:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;
 
-    if-ne v3, v6, :cond_29
+    if-ne v3, v8, :cond_29
 
-    const/16 v24, 0x1
+    const/16 v23, 0x1
 
-    goto :goto_15
+    goto :goto_16
 
     :cond_29
-    const/16 v24, 0x0
+    const/16 v23, 0x0
 
-    :goto_15
-    move-object v10, v1
+    :goto_16
+    move-object v9, v1
 
-    move-object v11, v4
+    move-object v10, v4
 
-    move-object v13, v0
+    move-object v12, v0
 
-    move-object/from16 v16, v2
+    move v13, v5
 
-    move-object/from16 v17, v3
+    move v14, v2
 
-    move-object/from16 v19, v5
+    move-object/from16 v16, v3
 
-    invoke-direct/range {v10 .. v24}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$OverlayStatus;Ljava/util/List;ZZLcom/discord/widgets/voice/model/CameraState;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;Ljava/lang/String;ZLcom/discord/views/video/VideoCallParticipantView$ParticipantData;Ljava/lang/Boolean;Ljava/util/List;Z)V
+    move-object/from16 v18, v6
 
-    invoke-virtual {v7, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-direct/range {v9 .. v23}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$OverlayStatus;Ljava/util/List;ZZLcom/discord/widgets/voice/model/CameraState;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$DisplayMode;Lcom/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState;Ljava/lang/String;ZLcom/discord/views/video/VideoCallParticipantView$ParticipantData;Ljava/lang/Boolean;Ljava/util/List;Z)V
+
+    invoke-virtual {v7, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_2a
-    :goto_16
+    :goto_17
     return-void
-
-    :cond_2b
-    const-string v0, "storeState"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
 .end method
 
 .method public modifyPendingViewState(Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;)Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState;
@@ -2706,7 +2682,9 @@
 
     move-object/from16 v0, p2
 
-    if-eqz v0, :cond_8
+    const-string v1, "pendingViewState"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object/from16 v1, p1
 
@@ -2890,15 +2868,6 @@
 
     :cond_7
     return-object v0
-
-    :cond_8
-    const-string v0, "pendingViewState"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public bridge synthetic modifyPendingViewState(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -2930,7 +2899,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -2956,7 +2925,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-super {p0}, Lf/a/b/o0;->onCleared()V
+    invoke-super {p0}, Lf/a/b/q0;->onCleared()V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->videoPlayerIdleDetector:Lcom/discord/utilities/video/VideoPlayerIdleDetector;
 
@@ -2980,7 +2949,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "participant"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->g:Lcom/discord/views/video/VideoCallParticipantView$ParticipantData$Type;
 
@@ -3010,98 +2981,89 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "participant"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onGridParticipantTapped(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)V
-    .locals 7
+    .locals 6
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->getParticipantFocusKey(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;)Ljava/lang/String;
 
     move-result-object p1
 
-    new-instance v1, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
+    new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
 
-    iget-object v2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->clock:Lcom/discord/utilities/time/Clock;
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->clock:Lcom/discord/utilities/time/Clock;
 
-    invoke-interface {v2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+    invoke-interface {v1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
 
-    move-result-wide v2
+    move-result-wide v1
 
-    invoke-direct {v1, p1, v2, v3}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;-><init>(Ljava/lang/String;J)V
+    invoke-direct {v0, p1, v1, v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;-><init>(Ljava/lang/String;J)V
 
-    iget-object v2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->lastParticipantTap:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
+    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->lastParticipantTap:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
 
-    iput-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->lastParticipantTap:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
+    iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->lastParticipantTap:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_4
 
-    invoke-virtual {v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;->getParticipantFocusKey()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;->getParticipantFocusKey()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    invoke-static {v3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v3
+    move-result v2
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    xor-int/2addr v3, v4
+    xor-int/2addr v2, v3
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
     goto :goto_3
 
     :cond_0
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;->getTimestamp()J
+
+    move-result-wide v4
+
     invoke-virtual {v1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;->getTimestamp()J
 
-    move-result-wide v5
+    move-result-wide v0
 
-    invoke-virtual {v2}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;->getTimestamp()J
+    sub-long/2addr v4, v0
 
-    move-result-wide v1
+    const-wide/16 v0, 0xff
 
-    sub-long/2addr v5, v1
+    cmp-long v2, v4, v0
 
-    const-wide/16 v1, 0xff
+    if-gtz v2, :cond_1
 
-    cmp-long v3, v5, v1
-
-    if-gtz v3, :cond_1
-
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_1
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    xor-int/2addr v1, v4
+    xor-int/2addr v0, v3
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusVideoParticipant(Ljava/lang/String;)V
 
@@ -3113,7 +3075,9 @@
     :goto_1
     invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->cancelTapForwardingJob()V
 
-    iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->lastParticipantTap:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->lastParticipantTap:Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ParticipantTap;
 
     goto :goto_2
 
@@ -3128,13 +3092,6 @@
     invoke-direct {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->startTapForwardingJob()V
 
     return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final onMuteClicked()V
@@ -3142,7 +3099,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3216,6 +3173,18 @@
     return-void
 .end method
 
+.method public final onStopStream()V
+    .locals 1
+    .annotation build Landroidx/annotation/UiThread;
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->voiceEngineServiceController:Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->stopStream()V
+
+    return-void
+.end method
+
 .method public final setTargetChannelId(J)V
     .locals 10
 
@@ -3272,7 +3241,7 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual/range {p0 .. p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -3313,7 +3282,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v2, v5}, Lcom/discord/stores/StoreApplicationStreaming;->stopWatchingStream(Ljava/lang/String;)V
+    invoke-virtual {v2, v5}, Lcom/discord/stores/StoreApplicationStreaming;->stopStream(Ljava/lang/String;)V
 
     iget-object v2, v0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusedVideoParticipantKey:Ljava/lang/String;
 
@@ -3335,7 +3304,7 @@
 
     move-result-object v1
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -3399,7 +3368,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     :cond_1
     return-void
@@ -3410,7 +3379,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3470,7 +3439,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->targetStream(Ljava/lang/String;)V
 
@@ -3501,15 +3472,6 @@
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->focusVideoParticipant(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final targetStream(Ljava/lang/String;)V
@@ -3517,22 +3479,15 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->applicationStreamingStore:Lcom/discord/stores/StoreApplicationStreaming;
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreApplicationStreaming;->targetStream(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "streamKey"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final toggleCameraPressed()V
@@ -3540,7 +3495,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3626,11 +3581,7 @@
 
     move-result v2
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->compare(II)I
-
-    move-result v1
-
-    if-lez v1, :cond_5
+    if-le v1, v2, :cond_5
 
     iget-object v1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1.smali
index b32474d972..11837a8faa 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetGuildCallOnboardingSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleStoreState"
+
+    const-string v5, "handleStoreState(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleStoreState(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;->access$handleStoreState(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory$observeStoreState$1.smali
index 557365788d..0f6deaf428 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetGuildCallOnboardingSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/utilities/voice/VoiceChannelJoinability;",
+        "Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -64,7 +66,7 @@
 
     const-string v1, "joinability"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;-><init>(Lcom/discord/utilities/voice/VoiceChannelJoinability;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory.smali
index 87cf831498..be89237827 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory.smali
@@ -35,17 +35,25 @@
 .method public constructor <init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "selectedVoiceChannelStore"
 
-    if-eqz p3, :cond_4
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_3
+    const-string v0, "permissionsStore"
 
-    if-eqz p5, :cond_2
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_1
+    const-string v0, "channelsStore"
 
-    if-eqz p7, :cond_0
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "guildsStore"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceStatesStore"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,41 +70,6 @@
     iput-object p7, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory;->voiceStatesStore:Lcom/discord/stores/StoreVoiceStates;
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceStatesStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "guildsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "channelsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "permissionsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "selectedVoiceChannelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreVoiceStates;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -230,13 +203,13 @@
 
     sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "VoiceChannelJoinabilityU\u2026StoreState(joinability) }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -255,7 +228,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
 
@@ -270,13 +245,4 @@
     invoke-direct {p1, v0, v1, v2, v3}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;-><init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lrx/Observable;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState.smali
index 76bdcfd693..89ab6ae1ca 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState.smali
@@ -20,24 +20,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/utilities/voice/VoiceChannelJoinability;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "voiceChannelJoinability"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;->voiceChannelJoinability:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceChannelJoinability"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;Lcom/discord/utilities/voice/VoiceChannelJoinability;ILjava/lang/Object;)Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;
@@ -70,22 +63,15 @@
 .method public final copy(Lcom/discord/utilities/voice/VoiceChannelJoinability;)Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "voiceChannelJoinability"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;-><init>(Lcom/discord/utilities/voice/VoiceChannelJoinability;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "voiceChannelJoinability"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +89,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;->voiceChannelJoinability:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded.smali
index 8db4940bc9..a6e3d11e68 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/utilities/voice/VoiceChannelJoinability;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "joinability"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;->joinability:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
     return-void
-
-    :cond_0
-    const-string p1, "joinability"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;Lcom/discord/utilities/voice/VoiceChannelJoinability;ILjava/lang/Object;)Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/utilities/voice/VoiceChannelJoinability;)Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "joinability"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/utilities/voice/VoiceChannelJoinability;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "joinability"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;->joinability:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.smali
index 677c375cc2..47ea54dbdc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetGuildCallOnboardingSheetViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState;",
         ">;"
     }
@@ -40,7 +40,7 @@
 
 # direct methods
 .method public constructor <init>(JLcom/discord/stores/StoreVoiceChannelSelected;Lrx/Observable;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
@@ -51,15 +51,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "selectedVoiceChannelStore"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "storeStateObservable"
 
-    sget-object v1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Uninitialized;
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v1}, Lf/a/b/o0;-><init>(Ljava/lang/Object;)V
+    sget-object v0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Uninitialized;
+
+    invoke-direct {p0, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;->channelId:J
 
@@ -77,19 +79,27 @@
 
     const-string p2, "storeStateObservable\n   \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 p2, 0x2
+    const/4 p2, 0x0
 
-    invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    const/4 p3, 0x2
 
-    move-result-object v1
+    invoke-static {p1, p0, p2, p3, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+    move-result-object v0
+
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;
+
+    new-instance v6, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1;
+
+    invoke-direct {v6, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;)V
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -97,33 +107,13 @@
 
     const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/16 v7, 0x1e
 
-    new-instance v7, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1;
+    const/4 v8, 0x0
 
-    invoke-direct {v7, p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$1;-><init>(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;)V
-
-    const/16 v8, 0x1e
-
-    const/4 v9, 0x0
-
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "selectedVoiceChannelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$handleStoreState(Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel;Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$StoreState;)V
@@ -147,7 +137,7 @@
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/utilities/voice/VoiceChannelJoinability;)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -169,7 +159,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -179,7 +169,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$Companion.smali
index 32777aba0a..ebe501ef5c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(JLandroidx/fragment/app/FragmentManager;)V
     .locals 3
 
-    if-eqz p3, :cond_0
+    const-string v0, "fragmentManager"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/fullscreen/WidgetStartCallSheet;
 
@@ -61,13 +63,4 @@
     invoke-virtual {v0, p3, p1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.smali
index d2a5f350d0..e91436c309 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.smali
@@ -35,41 +35,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetStartCallSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetStartCallSheet;
+    const-string v2, "startVoiceCallItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getStartVoiceCallItem()Landroid/view/View;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "startVoiceCallItem"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getStartVoiceCallItem()Landroid/view/View;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/fullscreen/WidgetStartCallSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "startVideoCallItem"
 
-    aput-object v1, v0, v2
+    const-string v3, "getStartVideoCallItem()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetStartCallSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "startVideoCallItem"
-
-    const-string v4, "getStartVideoCallItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -93,7 +81,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a092f
+    const v0, 0x7f0a0933
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +89,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/fullscreen/WidgetStartCallSheet;->startVoiceCallItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a092e
+    const v0, 0x7f0a0932
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -124,7 +112,7 @@
     :cond_0
     const-string p0, "privateCallLauncher"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -212,7 +200,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -220,7 +208,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p1, p0, p0, v0, v1}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;-><init>(Lcom/discord/app/AppPermissions$Requests;Lcom/discord/app/AppComponent;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 
@@ -232,7 +220,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -267,13 +257,4 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager.smali
index 7ccb9cc059..244f2fd561 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager.smali
@@ -7,22 +7,15 @@
 .method public constructor <init>(Landroid/content/Context;II)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     invoke-direct {p0, p1, p2, p3, v0}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;IIZ)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method private final getHorizontalSpace()I
@@ -267,7 +260,9 @@
 .method public checkLayoutParams(Landroidx/recyclerview/widget/RecyclerView$LayoutParams;)Z
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "lp"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager;->generateDefaultLayoutParams()Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
@@ -300,15 +295,6 @@
 
     :goto_0
     return p1
-
-    :cond_1
-    const-string p1, "lp"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public generateDefaultLayoutParams()Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
@@ -320,7 +306,7 @@
 
     const-string v1, "super.generateDefaultLayoutParams()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager;->spanLayoutSize(Landroidx/recyclerview/widget/RecyclerView$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
@@ -332,11 +318,13 @@
 .method public generateLayoutParams(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "c"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/recyclerview/widget/GridLayoutManager;->generateLayoutParams(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
@@ -344,33 +332,21 @@
 
     const-string p2, "super.generateLayoutParams(c, attrs)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager;->spanLayoutSize(Landroidx/recyclerview/widget/RecyclerView$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "attrs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "c"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "lp"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/GridLayoutManager;->generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
@@ -378,20 +354,11 @@
 
     const-string v0, "super.generateLayoutParams(lp)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager;->spanLayoutSize(Landroidx/recyclerview/widget/RecyclerView$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "lp"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter$getDiffUtilCallback$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter$getDiffUtilCallback$1.smali
index ced299e7e9..5f7bc18c8a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter$getDiffUtilCallback$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter$getDiffUtilCallback$1.smali
@@ -54,7 +54,7 @@
 
     check-cast p2, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -84,7 +84,7 @@
 
     iget-object p2, p2, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->a:Ljava/lang/String;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.smali
index a669a0c952..3a2a63ed3f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.smali
@@ -84,13 +84,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "onParticipantTapped"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "onParticipantLongClicked"
 
-    if-eqz p3, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onWatchStreamClicked"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -100,7 +104,7 @@
 
     iput-object p3, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->onWatchStreamClicked:Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->data:Ljava/util/List;
 
@@ -111,27 +115,6 @@
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->spanSizeLookup:Landroidx/recyclerview/widget/GridLayoutManager$SpanSizeLookup;
 
     return-void
-
-    :cond_0
-    const-string p1, "onWatchStreamClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onParticipantLongClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onParticipantTapped"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getData$p(Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;)Ljava/util/List;
@@ -268,7 +251,9 @@
 .method public onBindViewHolder(Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder;I)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->data:Ljava/util/List;
 
@@ -287,15 +272,6 @@
     invoke-virtual {p1, p2, v0, v1, v2}, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder;->bind(Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -311,7 +287,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -340,20 +318,11 @@
     return-object p2
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.discord.views.video.VideoCallParticipantView"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -369,7 +338,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->data:Ljava/util/List;
 
@@ -385,20 +356,11 @@
 
     const-string v1, "DiffUtil.calculateDiff(g\u2026a, newData = data), true)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter;->data:Ljava/util/List;
 
     invoke-virtual {v0, p0}, Landroidx/recyclerview/widget/DiffUtil$DiffResult;->dispatchUpdatesTo(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridLayoutManager.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridLayoutManager.smali
index 898d6eda7f..568805a106 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridLayoutManager.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridLayoutManager.smali
@@ -31,11 +31,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "recyclerviewSizeProvider"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p4, p2, p3}, Lcom/discord/widgets/voice/fullscreen/grid/ResizingGridLayoutManager;-><init>(Landroid/content/Context;II)V
 
@@ -44,20 +46,6 @@
     iput p2, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridLayoutManager;->spanCount:I
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "recyclerviewSizeProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -65,11 +53,13 @@
 .method public calculateExtraLayoutSpace(Landroidx/recyclerview/widget/RecyclerView$State;[I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "state"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "extraLayoutSpace"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridLayoutManager;->recyclerviewSizeProvider:Lkotlin/jvm/functions/Function0;
 
@@ -102,20 +92,6 @@
 
     :goto_0
     return-void
-
-    :cond_1
-    const-string p1, "extraLayoutSpace"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public getSpanCount()I
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.smali
index 020861d3a5..3acbad7385 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.smali
@@ -9,24 +9,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/views/video/VideoCallParticipantView;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "videoCallParticipantView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder;->videoCallParticipantView:Lcom/discord/views/video/VideoCallParticipantView;
 
     return-void
-
-    :cond_0
-    const-string p1, "videoCallParticipantView"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -55,15 +48,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "participantData"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "onTapped"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "onLongClicked"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onWatchStreamClicked"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder;->videoCallParticipantView:Lcom/discord/views/video/VideoCallParticipantView;
 
@@ -90,32 +89,4 @@
     invoke-virtual {p2, p4}, Landroid/view/ViewGroup;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "onWatchStreamClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "onLongClicked"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "onTapped"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "participantData"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$Chunk.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$Chunk.smali
index bea617b5d6..9bdc7a833a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$Chunk.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$Chunk.smali
@@ -87,15 +87,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_2
+    const-string v0, "mediaSettings"
 
-    if-eqz p7, :cond_1
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_0
+    const-string v0, "voiceParticipants"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "videoDevices"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -120,34 +126,6 @@
     iput-boolean p12, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;->voiceParticipantsHidden:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "videoDevices"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "voiceParticipants"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "mediaSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;Lcom/discord/models/domain/ModelChannel;JJLkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZZILjava/lang/Object;)Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;
@@ -437,34 +415,40 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_3
+    move-object v2, p1
 
-    if-eqz p6, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_1
+    const-string v0, "mediaSettings"
 
-    if-eqz p9, :cond_0
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "voiceParticipants"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "videoDevices"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-wide/from16 v3, p2
 
     move-wide/from16 v5, p4
 
-    move-object/from16 v7, p6
-
-    move-object/from16 v8, p7
-
     move-object/from16 v9, p8
 
-    move-object/from16 v10, p9
-
     move-object/from16 v11, p10
 
     move/from16 v12, p11
@@ -474,34 +458,6 @@
     invoke-direct/range {v1 .. v13}, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;-><init>(Lcom/discord/models/domain/ModelChannel;JJLkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "videoDevices"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "voiceParticipants"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "mediaSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "channel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -519,7 +475,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -545,7 +501,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;->mediaSettings:Lkotlin/Pair;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -555,7 +511,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;->voiceParticipants:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -565,7 +521,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;->channelPermissions:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -575,7 +531,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;->videoDevices:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -585,7 +541,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;->selectedVideoDevice:Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
index 976fe766a6..a6396ff548 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "CallModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Integer;",
+        ">;"
     }
 .end annotation
 
@@ -57,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)I
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Integer;
     .locals 0
 
     if-eqz p1, :cond_0
@@ -72,7 +74,11 @@
     const/4 p1, 0x0
 
     :goto_0
-    return p1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
 .end method
 
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
@@ -80,11 +86,7 @@
 
     check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Integer;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$2.smali
index ee6e8086b9..8fce3e76b3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$2.smali
@@ -41,7 +41,17 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func9<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+        "Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;",
+        "Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;",
+        "Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;",
+        "Ljava/lang/Integer;",
+        "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+        "Lcom/discord/utilities/voice/VoiceChannelJoinability;",
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        ">;"
     }
 .end annotation
 
@@ -140,7 +150,7 @@
 
     move-object/from16 v14, p4
 
-    invoke-static {v14, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p4 .. p4}, Ljava/lang/Integer;->intValue()I
 
@@ -150,19 +160,19 @@
 
     move-object/from16 v14, p5
 
-    invoke-static {v14, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "voiceChannelJoinability"
 
     move-object/from16 v0, p6
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v3, "voiceParticipantsHidden"
 
     move-object/from16 v0, p9
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
index 90e7677dc8..e4a9804854 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "CallModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        ">;>;"
     }
 .end annotation
 
@@ -83,9 +85,9 @@
 
     if-nez v1, :cond_0
 
-    new-instance v1, Lr0/l/e/j;
+    new-instance v1, Ls0/l/e/j;
 
-    invoke-direct {v1, v2}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v1, v2}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -132,7 +134,7 @@
 
     sget-object v3, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
 
-    invoke-virtual {v2, v3}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v7
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$1.smali
index bfed75f219..5c4ac7a594 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$1.smali
@@ -27,7 +27,14 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "+",
+        "Lcom/discord/utilities/media/AudioOutputState;",
+        ">;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$2.smali
index 7f07b96e40..290e0df6d8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$2.smali
@@ -41,7 +41,29 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func9<",
-        "TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;TT9;TR;>;"
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Lkotlin/Pair<",
+        "+",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "+",
+        "Lcom/discord/utilities/media/AudioOutputState;",
+        ">;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
+        ">;",
+        "Ljava/lang/Long;",
+        "Ljava/util/List<",
+        "+",
+        "Lco/discord/media_engine/VideoInputDeviceDescription;",
+        ">;",
+        "Lco/discord/media_engine/VideoInputDeviceDescription;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/voice/model/CallModel$Companion$Chunk;",
+        ">;"
     }
 .end annotation
 
@@ -100,7 +122,7 @@
 
     move-object/from16 v2, p1
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Ljava/lang/Long;->longValue()J
 
@@ -110,7 +132,7 @@
 
     move-object/from16 v4, p2
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/lang/Long;->longValue()J
 
@@ -120,25 +142,25 @@
 
     move-object/from16 v6, p3
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "voiceParticipants"
 
     move-object/from16 v7, p4
 
-    invoke-static {v7, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "videoDevices"
 
     move-object/from16 v9, p6
 
-    invoke-static {v9, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "isVideoSupported"
 
     move-object/from16 v8, p8
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p8 .. p8}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -148,7 +170,7 @@
 
     move-object/from16 v8, p9
 
-    invoke-static {v8, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
index a356cac482..782289be43 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
@@ -350,7 +350,7 @@
 
     const-string v0, "Observable\n          .co\u2026            )\n          }"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -382,13 +382,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n          .g\u2026            }\n          }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
index d9ba890bbc..3c4ad4c582 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
@@ -144,21 +144,33 @@
 
     move-object/from16 v8, p22
 
-    const/4 v9, 0x0
+    const-string v9, "participants"
 
-    if-eqz v1, :cond_c
+    invoke-static {p1, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_b
+    const-string v9, "videoDevices"
 
-    if-eqz v4, :cond_a
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v5, :cond_9
+    const-string v9, "voiceSettings"
 
-    if-eqz v6, :cond_8
+    invoke-static {v4, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v7, :cond_7
+    const-string v9, "voiceChannelJoinability"
 
-    if-eqz v8, :cond_6
+    invoke-static {v5, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "audioOutputState"
+
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "channel"
+
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "audioDevicesState"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -246,6 +258,12 @@
 
     if-eqz v1, :cond_5
 
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
+
+    move-result v1
+
+    if-nez v1, :cond_6
+
     iget-object v1, v0, Lcom/discord/widgets/voice/model/CallModel;->participants:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
@@ -315,6 +333,7 @@
     :cond_5
     const/4 v2, 0x0
 
+    :cond_6
     :goto_3
     iput-boolean v2, v0, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall:Z
 
@@ -329,55 +348,6 @@
     iput-boolean v1, v0, Lcom/discord/widgets/voice/model/CallModel;->canInvite:Z
 
     return-void
-
-    :cond_6
-    const-string v1, "audioDevicesState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_7
-    const-string v1, "channel"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_8
-    const-string v1, "audioOutputState"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_9
-    const-string v1, "voiceChannelJoinability"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_a
-    const-string v1, "voiceSettings"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_b
-    const-string v1, "videoDevices"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_c
-    const-string v1, "participants"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
 .end method
 
 .method private final component15()Lcom/discord/utilities/media/AudioOutputState;
@@ -864,7 +834,7 @@
 .end method
 
 .method public final copy(Ljava/util/Map;JJLjava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;ILcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/utilities/voice/VoiceChannelJoinability;Ljava/lang/Integer;Lcom/discord/models/domain/ModelGuild;ZZLcom/discord/utilities/media/AudioOutputState;ZLcom/discord/models/domain/ModelChannel;ILjava/lang/Long;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)Lcom/discord/widgets/voice/model/CallModel;
-    .locals 24
+    .locals 25
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -895,118 +865,97 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    move-object/from16 v1, p1
 
-    if-eqz p1, :cond_6
+    move-wide/from16 v2, p2
 
-    if-eqz p6, :cond_5
+    move-wide/from16 v4, p4
 
-    if-eqz p8, :cond_4
+    move-object/from16 v6, p6
 
-    if-eqz p12, :cond_3
+    move-object/from16 v7, p7
 
-    if-eqz p17, :cond_2
+    move-object/from16 v8, p8
 
-    if-eqz p19, :cond_1
+    move-object/from16 v9, p9
 
-    if-eqz p22, :cond_0
+    move/from16 v10, p10
 
-    new-instance v0, Lcom/discord/widgets/voice/model/CallModel;
+    move-object/from16 v11, p11
 
-    move-object v1, v0
+    move-object/from16 v12, p12
 
-    move-object/from16 v2, p1
+    move-object/from16 v13, p13
 
-    move-wide/from16 v3, p2
+    move-object/from16 v14, p14
 
-    move-wide/from16 v5, p4
+    move/from16 v15, p15
 
-    move-object/from16 v7, p6
+    move/from16 v16, p16
 
-    move-object/from16 v8, p7
+    move-object/from16 v17, p17
 
-    move-object/from16 v9, p8
+    move/from16 v18, p18
 
-    move-object/from16 v10, p9
+    move-object/from16 v19, p19
 
-    move/from16 v11, p10
+    move/from16 v20, p20
 
-    move-object/from16 v12, p11
+    move-object/from16 v21, p21
 
-    move-object/from16 v13, p12
+    move-object/from16 v22, p22
 
-    move-object/from16 v14, p13
+    const-string v0, "participants"
 
-    move-object/from16 v15, p14
+    move-object/from16 v23, v1
 
-    move/from16 v16, p15
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move/from16 v17, p16
+    const-string v0, "videoDevices"
 
-    move-object/from16 v18, p17
+    move-object/from16 v1, p6
 
-    move/from16 v19, p18
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v20, p19
+    const-string v0, "voiceSettings"
 
-    move/from16 v21, p20
+    move-object/from16 v1, p8
 
-    move-object/from16 v22, p21
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v23, p22
+    const-string v0, "voiceChannelJoinability"
 
-    invoke-direct/range {v1 .. v23}, Lcom/discord/widgets/voice/model/CallModel;-><init>(Ljava/util/Map;JJLjava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;ILcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/utilities/voice/VoiceChannelJoinability;Ljava/lang/Integer;Lcom/discord/models/domain/ModelGuild;ZZLcom/discord/utilities/media/AudioOutputState;ZLcom/discord/models/domain/ModelChannel;ILjava/lang/Long;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
+    move-object/from16 v1, p12
 
-    return-object v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_0
-    const-string v1, "audioDevicesState"
+    const-string v0, "audioOutputState"
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, p17
 
-    throw v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_1
-    const-string v1, "channel"
+    const-string v0, "channel"
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, p19
 
-    throw v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_2
-    const-string v1, "audioOutputState"
+    const-string v0, "audioDevicesState"
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v1, p22
 
-    throw v0
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_3
-    const-string v1, "voiceChannelJoinability"
+    new-instance v24, Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-object/from16 v0, v24
 
-    throw v0
+    move-object/from16 v1, v23
 
-    :cond_4
-    const-string v1, "voiceSettings"
+    invoke-direct/range {v0 .. v22}, Lcom/discord/widgets/voice/model/CallModel;-><init>(Ljava/util/Map;JJLjava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;ILcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;Lcom/discord/utilities/voice/VoiceChannelJoinability;Ljava/lang/Integer;Lcom/discord/models/domain/ModelGuild;ZZLcom/discord/utilities/media/AudioOutputState;ZLcom/discord/models/domain/ModelChannel;ILjava/lang/Long;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v1, "videoDevices"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v1, "participants"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v24
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -1024,7 +973,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->participants:Ljava/util/Map;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1050,7 +999,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->videoDevices:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1060,7 +1009,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->selectedVideoDevice:Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1070,7 +1019,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->voiceSettings:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1080,7 +1029,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->rtcConnectionAnalyticsInfo:Lcom/discord/stores/StoreRtcConnection$RtcConnectionAnalyticsInfo;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1096,7 +1045,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1106,7 +1055,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->voiceChannelJoinability:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1116,7 +1065,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->guildMaxVideoChannelMembers:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1126,7 +1075,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1148,7 +1097,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1164,7 +1113,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1180,7 +1129,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/model/CallModel;->channelPermissions:Ljava/lang/Long;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1190,7 +1139,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/model/CallModel;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -1936,6 +1885,40 @@
     return v0
 .end method
 
+.method public final isStreaming()Z
+    .locals 5
+
+    iget-wide v0, p0, Lcom/discord/widgets/voice/model/CallModel;->myId:J
+
+    iget-object v2, p0, Lcom/discord/widgets/voice/model/CallModel;->activeStream:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+
+    move-result-wide v2
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
 .method public final isSuppressed()Z
     .locals 3
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
index 53b3099116..c9829f2b89 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Companion.smali
@@ -36,7 +36,9 @@
 .method public final launch(JLandroid/content/Context;)V
     .locals 2
 
-    if-eqz p3, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -50,20 +52,11 @@
 
     const-string p2, "Intent().putExtra(INTENT\u2026RA_CHANNEL_ID, channelId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class p2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    invoke-static {p3, p2, p1}, Lf/a/b/k;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
+    invoke-static {p3, p2, p1}, Lf/a/b/m;->e(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
index a3ec6e16b3..9cd9a9138b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.smali
@@ -29,7 +29,11 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lcom/discord/models/domain/ModelGuild;",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;",
+        ">;"
     }
 .end annotation
 
@@ -64,7 +68,7 @@
 
     const-string v2, "me"
 
-    invoke-static {p2, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
index 6070b2e61a..e8fcf6131e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,10 +24,12 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;",
+        "Ls0/k/b<",
+        "Lcom/discord/models/domain/ModelChannel;",
         "Lrx/Observable<",
-        "+TR;>;>;"
+        "+",
+        "Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;",
+        ">;>;"
     }
 .end annotation
 
@@ -89,7 +91,7 @@
 
     const-string v2, "it.guildId"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -134,9 +136,9 @@
     :cond_0
     const/4 p1, 0x0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     move-object p1, v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
index 212a445fbb..a2d3507bdc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
@@ -58,13 +58,13 @@
 
     invoke-direct {v1, p1, p2}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1;-><init>(J)V
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->U(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     const-string p2, "StoreStream\n            \u2026.just(null)\n            }"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -76,7 +76,7 @@
 
     const-string p2, "StoreStream\n            \u2026  .distinctUntilChanged()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
index af30f9abfb..f702a65ddf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model.smali
@@ -52,9 +52,11 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZZI)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -67,15 +69,6 @@
     iput p4, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;->maxBitrate:I
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;Lcom/discord/models/domain/ModelChannel;ZZIILjava/lang/Object;)Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;
@@ -153,22 +146,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZZI)Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;-><init>(Lcom/discord/models/domain/ModelChannel;ZZI)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -186,7 +172,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
index e677e7b902..7fb9cdff3e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
@@ -58,13 +58,13 @@
 
     const-string p2, "menuItem"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Landroid/view/MenuItem;->getItemId()I
 
     move-result p1
 
-    const p2, 0x7f0a05b1
+    const p2, 0x7f0a05b7
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
index fdf639f016..6d156242ad 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2.smali
@@ -39,7 +39,9 @@
 .method public onProgressChanged(Landroid/widget/SeekBar;IZ)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p3, "seekBar"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$2;->this$0:Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
@@ -56,13 +58,4 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "seekBar"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
index 74d7b32ab1..c7834da0ec 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3.smali
@@ -39,7 +39,9 @@
 .method public onProgressChanged(Landroid/widget/SeekBar;IZ)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p3, "seekBar"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$3;->this$0:Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
@@ -58,13 +60,4 @@
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "seekBar"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
index f5dcb01335..c40ca2f7c1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.smali
@@ -85,7 +85,7 @@
 
     const-string v3, "state.get(channelSettingsName.id, channel.name)"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v3, p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
index 0480f1e292..6ea04110a8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.smali
@@ -47,7 +47,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v1, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
index ac52b15483..ec0646f32c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
index 292174e0b6..b46ace0d42 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceChannelSettings.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelChannel;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12040c
+    const v0, 0x7f12040d
 
     const/4 v1, 0x0
 
@@ -75,7 +75,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {p1, v0, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
index 9e1deb9f58..d600f18caa 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
@@ -52,201 +52,141 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "channelSettingsName"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelSettingsName()Lcom/google/android/material/textfield/TextInputLayout;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "channelSettingsName"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getChannelSettingsName()Lcom/google/android/material/textfield/TextInputLayout;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const/4 v2, 0x0
+    const-string v2, "channelSettingsSave"
 
-    aput-object v1, v0, v2
+    const-string v3, "getChannelSettingsSave()Landroid/view/View;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "channelSettingsSave"
-
-    const-string v4, "getChannelSettingsSave()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "userLimitSeekbar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserLimitSeekbar()Landroid/widget/SeekBar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userLimitSeekbar"
-
-    const-string v4, "getUserLimitSeekbar()Landroid/widget/SeekBar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "userLimitDisplay"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserLimitDisplay()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userLimitDisplay"
-
-    const-string v4, "getUserLimitDisplay()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "userLimitHelp"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getUserLimitHelp()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "userLimitHelp"
-
-    const-string v4, "getUserLimitHelp()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "bitrateSeekbar"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBitrateSeekbar()Landroid/widget/SeekBar;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bitrateSeekbar"
-
-    const-string v4, "getBitrateSeekbar()Landroid/widget/SeekBar;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "bitrateDisplay"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBitrateDisplay()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bitrateDisplay"
-
-    const-string v4, "getBitrateDisplay()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "bitrateHelp"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getBitrateHelp()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "bitrateHelp"
-
-    const-string v4, "getBitrateHelp()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "channelSettingsPermissionsContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelSettingsPermissionsContainer()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelSettingsPermissionsContainer"
-
-    const-string v4, "getChannelSettingsPermissionsContainer()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
 
-    const-class v2, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;
+    const-string v2, "channelSettingsPermissions"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getChannelSettingsPermissions()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "channelSettingsPermissions"
-
-    const-string v4, "getChannelSettingsPermissions()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
@@ -270,7 +210,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0196
+    const v0, 0x7f0a0199
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -278,7 +218,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->channelSettingsName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01aa
+    const v0, 0x7f0a01ad
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -286,7 +226,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->channelSettingsSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a09c7
+    const v0, 0x7f0a09cb
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -294,7 +234,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->userLimitSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b4
+    const v0, 0x7f0a02b7
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -302,7 +242,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->userLimitDisplay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a08ee
+    const v0, 0x7f0a08f5
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -318,7 +258,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->bitrateSeekbar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02b3
+    const v0, 0x7f0a02b6
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -326,7 +266,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->bitrateDisplay$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a088d
+    const v0, 0x7f0a0893
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -334,7 +274,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->bitrateHelp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a01ad
+    const v0, 0x7f0a01b0
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -342,7 +282,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->channelSettingsPermissionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a019e
+    const v0, 0x7f0a01a1
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -368,10 +308,10 @@
 
     :array_0
     .array-data 4
-        0x7f0a0196
-        0x7f0a0197
-        0x7f0a02b4
-        0x7f0a02b3
+        0x7f0a0199
+        0x7f0a019a
+        0x7f0a02b7
+        0x7f0a02b6
     .end array-data
 .end method
 
@@ -509,7 +449,7 @@
 
     invoke-static {p0, v0, v1, v2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v3, 0x7f12040b
+    const v3, 0x7f12040c
 
     invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -523,7 +463,7 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x2
 
@@ -587,7 +527,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f1206f8
+    const v3, 0x7f1206fa
 
     invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
@@ -595,7 +535,7 @@
 
     const-string v4, "getString(R.string.form_help_user_limit)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3}, Lcom/discord/utilities/textprocessing/Parsers;->parseBoldMarkdown(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
@@ -667,7 +607,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f1206df
+    const v4, 0x7f1206e1
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -681,7 +621,7 @@
 
     const-string v4, "getString(R.string.form_help_bitrate, \"64\")"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v1}, Lcom/discord/utilities/textprocessing/Parsers;->parseBoldMarkdown(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
@@ -832,7 +772,7 @@
 
     const-string v3, "view"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -850,9 +790,9 @@
 
     const-string v3, "AlertDialog.Builder(view\u2026t).setView(view).create()"
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f0a0192
+    const v3, 0x7f0a0195
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -860,7 +800,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a0193
+    const v4, 0x7f0a0196
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -868,7 +808,7 @@
 
     check-cast v4, Landroid/widget/TextView;
 
-    const v5, 0x7f0a0194
+    const v5, 0x7f0a0197
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -890,7 +830,7 @@
 
     const-string v0, "dialogBody"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -902,7 +842,7 @@
 
     const-string v5, "requireContext()"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x0
 
@@ -914,7 +854,7 @@
 
     aput-object p1, v0, v5
 
-    const p1, 0x7f12056c
+    const p1, 0x7f12056e
 
     invoke-virtual {p0, p1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -922,9 +862,9 @@
 
     const-string v0, "getString(R.string.delet\u2026ayName(requireContext()))"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {p1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object p1
 
@@ -1124,7 +1064,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120fa6
+    const v0, 0x7f120fd0
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1139,7 +1079,7 @@
 
     const-string v1, "resources"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1147,9 +1087,9 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f1000bc
+    const v2, 0x7f1000be
 
     const/4 v3, 0x1
 
@@ -1170,7 +1110,7 @@
     :goto_0
     const-string v0, "if (userLimit == 0)\n    \u2026um, userLimit, userLimit)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 .end method
@@ -1270,7 +1210,7 @@
 
     move-result-object v1
 
-    sget-object v3, Lf/a/b/q;->a:Lf/a/b/q;
+    sget-object v3, Lf/a/b/s;->a:Lf/a/b/s;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -1280,7 +1220,7 @@
 
     invoke-direct {v5, p0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1;-><init>(Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;)V
 
-    invoke-virtual {v3, v4, v5, v2}, Lf/a/b/q;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
+    invoke-virtual {v3, v4, v5, v2}, Lf/a/b/s;->k(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c;
 
     move-result-object v2
 
@@ -1302,7 +1242,9 @@
 .method public onViewBound(Landroid/view/View;)V
     .locals 5
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
@@ -1324,13 +1266,13 @@
 
     new-array v2, v2, [Landroid/view/View;
 
-    const/4 v3, 0x0
-
     invoke-direct {p0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getChannelSettingsName()Lcom/google/android/material/textfield/TextInputLayout;
 
-    move-result-object v4
+    move-result-object v3
 
-    aput-object v4, v2, v3
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getUserLimitDisplay()Landroid/widget/TextView;
 
@@ -1338,26 +1280,17 @@
 
     aput-object v3, v2, p1
 
-    const/4 p1, 0x2
-
     invoke-direct {p0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getBitrateDisplay()Landroid/widget/TextView;
 
-    move-result-object v3
+    move-result-object p1
 
-    aput-object v3, v2, p1
+    const/4 v3, 0x2
+
+    aput-object p1, v2, v3
 
     invoke-virtual {v0, p0, v1, v2}, Lcom/discord/utilities/stateful/StatefulViews;->setupTextWatcherWithSaveAction(Lcom/discord/app/AppFragment;Landroid/view/View;[Landroid/view/View;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewBoundOrOnResume()V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite.smali
index 1f44e43ecd..d39812f153 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "channel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;->channel:Lcom/discord/models/domain/ModelChannel;
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;Lcom/discord/models/domain/ModelChannel;ILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;
@@ -70,22 +65,15 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;)Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;-><init>(Lcom/discord/models/domain/ModelChannel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader.smali
index 9c01e84aa6..22b9bffed1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "streamerName"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader;->streamerName:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "streamerName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader;
@@ -70,22 +65,15 @@
 .method public final copy(Ljava/lang/String;)Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "streamerName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader;-><init>(Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "streamerName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -103,7 +91,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$SpectatorsHeader;->streamerName:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser.smali
index a3c8af9549..c1c89ec27d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser.smali
@@ -26,9 +26,11 @@
 .method public constructor <init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "participant"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -51,13 +53,6 @@
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;->key:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "participant"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;ZILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;
@@ -105,22 +100,15 @@
 .method public final copy(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;Z)Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "participant"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;
 
     invoke-direct {v0, p1, p2}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;-><init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "participant"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -138,7 +126,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;->participant:Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderDivider.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderDivider.smali
index 2e6ec4aec0..e48f5727e2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderDivider.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderDivider.smali
@@ -27,20 +27,13 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d0149
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderHeader.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderHeader.smali
index 5cf1da4da9..de2e7969ed 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderHeader.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderHeader.smali
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d014a
 
@@ -39,7 +41,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0a70
+    const v0, 0x7f0a0a75
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,22 +49,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026r_list_item_header_label)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderHeader;->headerLabel:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -70,7 +63,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 3
 
-    if-eqz p2, :cond_2
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -97,7 +92,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderHeader;->headerLabel:Landroid/widget/TextView;
 
-    const v0, 0x7f1208e8
+    const v0, 0x7f1208ea
 
     const/4 v1, 0x1
 
@@ -122,15 +117,6 @@
     :cond_1
     :goto_0
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite$onConfigure$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite$onConfigure$1.smali
index d36871b2a7..148c7a15b0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite$onConfigure$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite$onConfigure$1.smali
@@ -55,7 +55,7 @@
 
     const-string p1, "inviteTv.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite$onConfigure$1;->$itemInvite:Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite.smali
index 4c11c1b8f3..0a4f0c537d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite.smali
@@ -31,7 +31,9 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d014b
 
@@ -39,7 +41,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0a71
+    const v0, 0x7f0a0a76
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -47,22 +49,13 @@
 
     const-string v0, "itemView.findViewById(R.\u2026user_list_item_invite_tv)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite;->inviteTv:Landroid/widget/TextView;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getInviteTv$p(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderInvite;)Landroid/widget/TextView;
@@ -78,9 +71,9 @@
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -88,7 +81,7 @@
 
     if-nez p1, :cond_0
 
-    move-object p2, v0
+    const/4 p2, 0x0
 
     :cond_0
     check-cast p2, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$Invite;
@@ -105,13 +98,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1.smali
index 23348bf381..4317251416 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CallParticipantsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/graphics/Bitmap;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Landroid/graphics/Bitmap;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "bitmap"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors;->INSTANCE:Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors;
 
@@ -78,13 +80,4 @@
     invoke-virtual {v0, v1, v2, p1}, Lcom/discord/widgets/voice/fullscreen/UserRepresentativeColors;->handleBitmap(JLandroid/graphics/Bitmap;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "bitmap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser.smali
index db38a6370a..43d7998b16 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser.smali
@@ -49,7 +49,9 @@
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;Z)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v0, 0x7f0d014c
 
@@ -59,7 +61,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0a76
+    const p2, 0x7f0a0a7b
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +69,7 @@
 
     const-string p2, "itemView.findViewById(R.\u2026er_list_item_user_avatar)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/VoiceUserView;
 
@@ -75,31 +77,31 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
+    const p2, 0x7f0a0a7c
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "itemView.findViewById(R.\u2026user_list_item_user_name)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->name:Landroid/widget/TextView;
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
     const p2, 0x7f0a0a77
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string p2, "itemView.findViewById(R.\u2026user_list_item_user_name)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->name:Landroid/widget/TextView;
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a0a72
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
     const-string p2, "itemView.findViewById(R.\u2026list_item_live_indicator)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -107,67 +109,35 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0a74
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "itemView.findViewById(R.\u2026tem_spectating_indicator)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->spectatingIndicator:Landroid/widget/ImageView;
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a0a6f
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "itemView.findViewById(R.\u2026st_item_deafen_indicator)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a0a73
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string p2, "itemView.findViewById(R.\u2026list_item_mute_indicator)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
     const p2, 0x7f0a0a79
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
-    const-string p2, "itemView.findViewById(R.\u2026ist_item_video_indicator)"
+    const-string p2, "itemView.findViewById(R.\u2026tem_spectating_indicator)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->videoIndicator:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->spectatingIndicator:Landroid/widget/ImageView;
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const p2, 0x7f0a0a74
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "itemView.findViewById(R.\u2026st_item_deafen_indicator)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
@@ -177,9 +147,41 @@
 
     move-result-object p1
 
+    const-string p2, "itemView.findViewById(R.\u2026list_item_mute_indicator)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const p2, 0x7f0a0a7e
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "itemView.findViewById(R.\u2026ist_item_video_indicator)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/ImageView;
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->videoIndicator:Landroid/widget/ImageView;
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const p2, 0x7f0a0a7d
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
     const-string p2, "itemView.findViewById(R.\u2026item_user_stream_preview)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/views/StreamPreviewView;
 
@@ -187,7 +189,7 @@
 
     iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0a75
+    const p2, 0x7f0a0a7a
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -195,22 +197,13 @@
 
     const-string p2, "itemView.findViewById(R.\u2026r_list_item_stop_ringing)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/Button;
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->stopRingingButton:Landroid/widget/Button;
 
     return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;)Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;
@@ -226,11 +219,11 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 9
+    .locals 8
 
-    const/4 v0, 0x0
+    const-string v0, "data"
 
-    if-eqz p2, :cond_11
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -240,296 +233,301 @@
 
     move-result-object p1
 
-    iget-boolean v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->quantizeUserAvatar:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->quantizeUserAvatar:Z
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->avatar:Lcom/discord/views/VoiceUserView;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->avatar:Lcom/discord/views/VoiceUserView;
 
-    new-instance v2, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1;
+    new-instance v1, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1;
 
-    invoke-direct {v2, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1;-><init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
+    invoke-direct {v1, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$1;-><init>(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
 
-    invoke-virtual {v1, v2}, Lcom/discord/views/VoiceUserView;->setOnBitmapLoadedListener(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v1}, Lcom/discord/views/VoiceUserView;->setOnBitmapLoadedListener(Lkotlin/jvm/functions/Function1;)V
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->avatar:Lcom/discord/views/VoiceUserView;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->avatar:Lcom/discord/views/VoiceUserView;
 
-    const v2, 0x7f07005c
+    const v1, 0x7f07005c
 
-    invoke-virtual {v1, p1, v2}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;I)V
+    invoke-virtual {v0, p1, v1}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;I)V
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->name:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->name:Landroid/widget/TextView;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getDisplayName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    new-instance v2, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$2;
+    new-instance v1, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$2;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$2;-><init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$2;-><init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
 
-    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->stopRingingButton:Landroid/widget/Button;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->stopRingingButton:Landroid/widget/Button;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->isRinging()Z
 
-    move-result v2
+    move-result v1
 
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-eqz v2, :cond_1
+    if-eqz v1, :cond_1
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_0
 
     :cond_1
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_0
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->stopRingingButton:Landroid/widget/Button;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->stopRingingButton:Landroid/widget/Button;
 
-    new-instance v2, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$3;
+    new-instance v1, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$3;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$3;-><init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$3;-><init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
 
-    invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->stopRingingButton:Landroid/widget/Button;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->stopRingingButton:Landroid/widget/Button;
 
-    invoke-virtual {v1}, Landroid/widget/Button;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/widget/Button;->getContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v1
 
-    const v5, 0x7f1214e6
+    const v4, 0x7f121510
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
-    new-array v7, v6, [Ljava/lang/Object;
+    new-array v6, v5, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getDisplayName()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    aput-object v8, v7, v4
+    aput-object v7, v6, v3
 
-    invoke-virtual {v2, v5, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v1, v4, v6}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v1, v2}, Landroid/widget/Button;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->isConnected()Z
 
+    move-result v0
+
+    if-eqz v0, :cond_10
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_10
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
+
+    invoke-virtual {v0, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$State;->isSelfDeaf()Z
+
     move-result v1
 
-    if-eqz v1, :cond_10
+    if-nez v1, :cond_3
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$State;->isDeaf()Z
 
-    move-result-object v1
+    move-result v1
 
-    if-eqz v1, :cond_10
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
-
-    invoke-virtual {v1, v4}, Landroid/widget/ImageView;->setVisibility(I)V
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
-
-    invoke-virtual {v1, v4}, Landroid/widget/ImageView;->setVisibility(I)V
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfDeaf()Z
-
-    move-result v2
-
-    if-nez v2, :cond_3
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isDeaf()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     goto :goto_1
 
     :cond_2
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_2
 
     :cond_3
     :goto_1
-    const/4 v2, 0x1
+    const/4 v1, 0x1
 
     :goto_2
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
 
-    move-result v5
+    move-result v4
 
-    if-nez v5, :cond_5
+    if-nez v4, :cond_5
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isMute()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$State;->isMute()Z
 
-    move-result v5
+    move-result v4
 
-    if-nez v5, :cond_5
+    if-nez v4, :cond_5
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSuppress()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$State;->isSuppress()Z
 
-    move-result v5
+    move-result v4
 
-    if-eqz v5, :cond_4
+    if-eqz v4, :cond_4
 
     goto :goto_3
 
     :cond_4
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     goto :goto_4
 
     :cond_5
     :goto_3
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
     :goto_4
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
 
-    move-result v1
+    move-result v0
 
-    iget-object v7, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->spectatingIndicator:Landroid/widget/ImageView;
+    iget-object v6, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->spectatingIndicator:Landroid/widget/ImageView;
 
     invoke-virtual {p2}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;->isSpectatingSameStream()Z
 
-    move-result v8
+    move-result v7
 
-    if-eqz v8, :cond_6
+    if-eqz v7, :cond_6
 
-    const/4 v8, 0x0
+    const/4 v7, 0x0
 
     goto :goto_5
 
     :cond_6
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
     :goto_5
-    invoke-virtual {v7, v8}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v6, v7}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v7, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
+    iget-object v6, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
 
-    if-eqz v2, :cond_7
+    if-eqz v1, :cond_7
 
-    const/4 v2, 0x0
+    const/4 v1, 0x0
 
     goto :goto_6
 
     :cond_7
-    const/16 v2, 0x8
+    const/16 v1, 0x8
 
     :goto_6
-    invoke-virtual {v7, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v6, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v2, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
 
-    if-eqz v5, :cond_8
+    if-eqz v4, :cond_8
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     goto :goto_7
 
     :cond_8
-    const/16 v5, 0x8
+    const/16 v4, 0x8
 
     :goto_7
-    invoke-virtual {v2, v5}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v2, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->videoIndicator:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->videoIndicator:Landroid/widget/ImageView;
 
-    if-eqz v1, :cond_9
+    if-eqz v0, :cond_9
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     goto :goto_8
 
     :cond_9
-    const/16 v1, 0x8
+    const/16 v0, 0x8
 
     :goto_8
-    invoke-virtual {v2, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v0}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget-object v2, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->liveIndicator:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->liveIndicator:Landroid/widget/TextView;
 
-    if-eqz v1, :cond_a
+    if-eqz v0, :cond_a
 
-    const/4 v5, 0x1
+    const/4 v4, 0x1
 
     goto :goto_9
 
     :cond_a
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_9
-    if-eqz v5, :cond_b
+    if-eqz v4, :cond_b
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     goto :goto_a
 
     :cond_b
-    const/16 v5, 0x8
+    const/16 v4, 0x8
 
     :goto_a
-    invoke-virtual {v2, v5}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
 
-    if-eqz v1, :cond_c
+    if-eqz v0, :cond_c
 
-    invoke-virtual {v1}, Lcom/discord/utilities/streams/StreamContext;->getPreview()Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
-
-    move-result-object v0
-
-    :cond_c
-    if-eqz v0, :cond_f
-
-    invoke-virtual {v1}, Lcom/discord/utilities/streams/StreamContext;->getJoinability()Lcom/discord/utilities/streams/StreamContext$Joinability;
+    invoke-virtual {v0}, Lcom/discord/utilities/streams/StreamContext;->getPreview()Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/utilities/streams/StreamContext$Joinability;->CAN_CONNECT:Lcom/discord/utilities/streams/StreamContext$Joinability;
-
-    if-eq v1, v2, :cond_d
-
     goto :goto_b
 
+    :cond_c
+    const/4 v1, 0x0
+
+    :goto_b
+    if-eqz v1, :cond_f
+
+    invoke-virtual {v0}, Lcom/discord/utilities/streams/StreamContext;->getJoinability()Lcom/discord/utilities/streams/StreamContext$Joinability;
+
+    move-result-object v0
+
+    sget-object v4, Lcom/discord/utilities/streams/StreamContext$Joinability;->CAN_CONNECT:Lcom/discord/utilities/streams/StreamContext$Joinability;
+
+    if-eq v0, v4, :cond_d
+
+    goto :goto_c
+
     :cond_d
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->streamPreview:Lcom/discord/views/StreamPreviewView;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->streamPreview:Lcom/discord/views/StreamPreviewView;
 
-    invoke-virtual {v1, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->streamPreview:Lcom/discord/views/StreamPreviewView;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->streamPreview:Lcom/discord/views/StreamPreviewView;
 
     new-instance v2, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$4;
 
     invoke-direct {v2, p0, p1}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser$onConfigure$4;-><init>(Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
 
-    invoke-virtual {v1, v2}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v2}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p2}, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ListItem$VoiceUser;->getParticipant()Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;
 
@@ -545,61 +543,54 @@
 
     move-result p1
 
-    if-ne p1, v6, :cond_e
+    if-ne p1, v5, :cond_e
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     :cond_e
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->streamPreview:Lcom/discord/views/StreamPreviewView;
 
     sget-object p2, Lcom/discord/utilities/streams/StreamContext$Joinability;->CAN_CONNECT:Lcom/discord/utilities/streams/StreamContext$Joinability;
 
-    invoke-virtual {p1, v0, p2, v4}, Lcom/discord/views/StreamPreviewView;->a(Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Lcom/discord/utilities/streams/StreamContext$Joinability;Z)V
+    invoke-virtual {p1, v1, p2, v3}, Lcom/discord/views/StreamPreviewView;->a(Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Lcom/discord/utilities/streams/StreamContext$Joinability;Z)V
 
-    goto :goto_c
+    goto :goto_d
 
     :cond_f
-    :goto_b
+    :goto_c
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->streamPreview:Lcom/discord/views/StreamPreviewView;
 
-    invoke-virtual {p1, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
     :cond_10
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->streamPreview:Lcom/discord/views/StreamPreviewView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/FrameLayout;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/FrameLayout;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->videoIndicator:Landroid/widget/ImageView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->spectatingIndicator:Landroid/widget/ImageView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$ViewHolderUser;->liveIndicator:Landroid/widget/TextView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/TextView;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
-    :goto_c
+    :goto_d
     return-void
-
-    :cond_11
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic onConfigure(ILjava/lang/Object;)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStopRingingClicked$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStopRingingClicked$1.smali
index 148313f611..0ac7b663c8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStopRingingClicked$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStopRingingClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$onStopRingingClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CallParticipantsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStreamPreviewClicked$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStreamPreviewClicked$1.smali
index 52b77cecf9..a68815a513 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStreamPreviewClicked$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onStreamPreviewClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$onStreamPreviewClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CallParticipantsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/streams/StreamContext;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/streams/StreamContext;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onVoiceUserClicked$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onVoiceUserClicked$1.smali
index 511f992b03..8be996a1b7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onVoiceUserClicked$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter$onVoiceUserClicked$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter$onVoiceUserClicked$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "CallParticipantsAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter.smali
index 9adcbb6c29..aa0699e2cd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/CallParticipantsAdapter.smali
@@ -94,9 +94,11 @@
 .end method
 
 .method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Z)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "recycler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
@@ -115,15 +117,6 @@
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;->onStopRingingClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "recycler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Landroidx/recyclerview/widget/RecyclerView;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -205,7 +198,7 @@
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -218,7 +211,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_5
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p2, :cond_4
 
@@ -281,19 +276,10 @@
 
     :goto_0
     return-object p1
-
-    :cond_5
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnStopRingingClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -305,24 +291,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;->onStopRingingClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnStreamPreviewClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -334,24 +313,17 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;->onStreamPreviewClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setOnVoiceUserClicked(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -363,18 +335,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/CallParticipantsAdapter;->onVoiceUserClicked:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$Companion.smali
index a6ff9523da..c78054f16a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$Companion.smali
@@ -36,7 +36,9 @@
 .method public final show(Landroidx/fragment/app/Fragment;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "fragment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;
 
@@ -48,7 +50,7 @@
 
     const-string v1, "fragment.parentFragmentManager"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-class v1, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;
 
@@ -59,13 +61,4 @@
     invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "fragment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.smali
index 935a1ad29a..815419dd21 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetNoiseCancellationBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Event;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "event"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;->access$handleEvent(Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "event"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.smali
index 08251ecdfd..14175f47f7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.smali
@@ -33,41 +33,29 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;
+    const-string v2, "noiseCancellationEnableButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getNoiseCancellationEnableButton()Lcom/google/android/material/button/MaterialButton;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "noiseCancellationEnableButton"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getNoiseCancellationEnableButton()Lcom/google/android/material/button/MaterialButton;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "noiseCancellationLearnMore"
 
-    aput-object v1, v0, v2
+    const-string v3, "getNoiseCancellationLearnMore()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "noiseCancellationLearnMore"
-
-    const-string v4, "getNoiseCancellationLearnMore()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
@@ -91,7 +79,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0621
+    const v0, 0x7f0a0627
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -99,7 +87,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;->noiseCancellationEnableButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0622
+    const v0, 0x7f0a0628
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -122,7 +110,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -166,7 +154,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f120e04
+    const v1, 0x7f120e2a
 
     invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -174,7 +162,7 @@
 
     const-string v0, "getString(\n        R.str\u2026.NOISE_SUPPRESSION)\n    )"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet;->getNoiseCancellationLearnMore()Landroid/widget/TextView;
 
@@ -186,7 +174,7 @@
 
     const-string v1, "requireContext()"
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x0
 
@@ -290,7 +278,7 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     :cond_0
     return-void
@@ -331,7 +319,7 @@
 
     const-string v1, "ViewModelProvider(this, \u2026eetViewModel::class.java)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel;
 
@@ -374,7 +362,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Factory.smali
index 36a23bea74..e8f7088df0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Factory.smali
@@ -35,24 +35,17 @@
 .end method
 
 .method public constructor <init>(Lcom/discord/stores/StoreMediaSettings;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "mediaSettingsStore"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Factory;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
 
     return-void
-
-    :cond_0
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/discord/stores/StoreMediaSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -88,7 +81,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel;
 
@@ -97,13 +92,4 @@
     invoke-direct {p1, v0}, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel;-><init>(Lcom/discord/stores/StoreMediaSettings;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.smali
index d68d42d5dc..4b4bf353b3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetNoiseCancellationBottomSheetViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$ViewState;",
         ">;"
     }
@@ -39,13 +39,15 @@
 .method public constructor <init>(Lcom/discord/stores/StoreMediaSettings;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "mediaSettingsStore"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x1
 
-    invoke-direct {p0, v0, v1, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
 
@@ -56,13 +58,6 @@
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
     return-void
-
-    :cond_0
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -82,7 +77,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -102,7 +97,7 @@
 
     new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Event$ShowToast;
 
-    const v2, 0x7f120fab
+    const v2, 0x7f120fd5
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel$Event$ShowToast;-><init>(I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls.smali
index 7aff5d21bf..e7696ebf97 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls.smali
@@ -25,19 +25,29 @@
 
 .field public final isMuted:Z
 
+.field public final isScreensharing:Z
+
+.field public final showScreenshare:Z
+
 
 # direct methods
-.method public constructor <init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;)V
+.method public constructor <init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;ZZ)V
     .locals 1
 
+    const-string v0, "inputMode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "audioDevicesState"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cameraState"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p5, :cond_0
-
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
@@ -50,50 +60,33 @@
 
     iput-object p5, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->cameraState:Lcom/discord/widgets/voice/model/CameraState;
 
+    iput-boolean p6, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
+
+    iput-boolean p7, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
     return-void
-
-    :cond_0
-    const-string p1, "cameraState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "audioDevicesState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;ILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
-    .locals 3
+.method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;ZZILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
+    .locals 5
 
-    and-int/lit8 p7, p6, 0x1
+    and-int/lit8 p9, p8, 0x1
 
-    if-eqz p7, :cond_0
+    if-eqz p9, :cond_0
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     :cond_0
-    and-int/lit8 p7, p6, 0x2
+    and-int/lit8 p9, p8, 0x2
 
-    if-eqz p7, :cond_1
+    if-eqz p9, :cond_1
 
     iget-object p2, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
     :cond_1
-    move-object p7, p2
+    move-object p9, p2
 
-    and-int/lit8 p2, p6, 0x4
+    and-int/lit8 p2, p8, 0x4
 
     if-eqz p2, :cond_2
 
@@ -102,7 +95,7 @@
     :cond_2
     move v0, p3
 
-    and-int/lit8 p2, p6, 0x8
+    and-int/lit8 p2, p8, 0x8
 
     if-eqz p2, :cond_3
 
@@ -111,7 +104,7 @@
     :cond_3
     move v1, p4
 
-    and-int/lit8 p2, p6, 0x10
+    and-int/lit8 p2, p8, 0x10
 
     if-eqz p2, :cond_4
 
@@ -120,11 +113,29 @@
     :cond_4
     move-object v2, p5
 
+    and-int/lit8 p2, p8, 0x20
+
+    if-eqz p2, :cond_5
+
+    iget-boolean p6, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
+
+    :cond_5
+    move v3, p6
+
+    and-int/lit8 p2, p8, 0x40
+
+    if-eqz p2, :cond_6
+
+    iget-boolean p7, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
+    :cond_6
+    move v4, p7
+
     move-object p2, p0
 
     move-object p3, p1
 
-    move-object p4, p7
+    move-object p4, p9
 
     move p5, v0
 
@@ -132,7 +143,11 @@
 
     move-object p7, v2
 
-    invoke-virtual/range {p2 .. p7}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->copy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
+    move p8, v3
+
+    move p9, v4
+
+    invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->copy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;ZZ)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
 
     move-result-object p0
 
@@ -181,55 +196,58 @@
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
-    .locals 7
+.method public final component6()Z
+    .locals 1
 
-    const/4 v0, 0x0
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
 
-    if-eqz p1, :cond_2
+    return v0
+.end method
 
-    if-eqz p2, :cond_1
+.method public final component7()Z
+    .locals 1
 
-    if-eqz p5, :cond_0
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
+    return v0
+.end method
+
+.method public final copy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;ZZ)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
+    .locals 9
+
+    const-string v0, "inputMode"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "audioDevicesState"
+
+    move-object v3, p2
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cameraState"
+
+    move-object v6, p5
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
 
     move-object v1, v0
 
-    move-object v2, p1
-
-    move-object v3, p2
-
     move v4, p3
 
     move v5, p4
 
-    move-object v6, p5
+    move v7, p6
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;-><init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;)V
+    move/from16 v8, p7
+
+    invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;-><init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "cameraState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "audioDevicesState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "inputMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -247,7 +265,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -257,7 +275,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -277,13 +295,25 @@
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->cameraState:Lcom/discord/widgets/voice/model/CameraState;
 
-    iget-object p1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->cameraState:Lcom/discord/widgets/voice/model/CameraState;
+    iget-object v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->cameraState:Lcom/discord/widgets/voice/model/CameraState;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v0
 
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
+
+    iget-boolean v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
+    iget-boolean p1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
+    if-ne v0, p1, :cond_0
 
     goto :goto_0
 
@@ -323,6 +353,14 @@
     return-object v0
 .end method
 
+.method public final getShowScreenshare()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
+
+    return v0
+.end method
+
 .method public hashCode()I
     .locals 4
 
@@ -379,13 +417,10 @@
 
     if-eqz v2, :cond_3
 
-    goto :goto_2
+    const/4 v2, 0x1
 
     :cond_3
-    move v3, v2
-
-    :goto_2
-    add-int/2addr v0, v3
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
@@ -400,6 +435,31 @@
     :cond_4
     add-int/2addr v0, v1
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
+
+    if-eqz v1, :cond_5
+
+    const/4 v1, 0x1
+
+    :cond_5
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
+    if-eqz v1, :cond_6
+
+    goto :goto_2
+
+    :cond_6
+    move v3, v1
+
+    :goto_2
+    add-int/2addr v0, v3
+
     return v0
 .end method
 
@@ -419,8 +479,16 @@
     return v0
 .end method
 
+.method public final isScreensharing()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
+    return v0
+.end method
+
 .method public toString()Ljava/lang/String;
-    .locals 2
+    .locals 3
 
     const-string v0, "Controls(inputMode="
 
@@ -464,11 +532,23 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    const-string v1, ")"
+    const-string v1, ", showScreenshare="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    iget-boolean v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->showScreenshare:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isScreensharing="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing:Z
+
+    const-string v2, ")"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems.smali
index b68ca5f70b..a655e3eb9d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems.smali
@@ -39,22 +39,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "items"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems;->items:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems;
@@ -105,22 +100,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "items"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems;
 
     invoke-direct {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems;-><init>(Ljava/util/List;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "items"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -138,7 +126,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$ListItems;->items:Ljava/util/List;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion.smali
index 89bef24380..8f4358763b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$Companion.smali
@@ -36,11 +36,13 @@
 .method public final show(Landroidx/fragment/app/FragmentManager;JZLcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$FeatureContext;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "fragmentManager"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "featureContext"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
@@ -73,18 +75,4 @@
     invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "featureContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1.smali
index 25d3207863..eb7b462634 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onMutePressed"
+
+    const-string v5, "onMutePressed()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onMutePressed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onMutePressed()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2.smali
index b09d26a1c3..53a2acdc56 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2.smali
@@ -1,5 +1,5 @@
-.class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;
-.super Lj0/n/c/g;
+.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -12,13 +12,13 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1019
+    accessFlags = 0x19
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -26,47 +26,29 @@
 .end annotation
 
 
+# instance fields
+.field public final synthetic $bottomContent:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;
+
+.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+
 # direct methods
-.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-    .locals 1
+.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V
+    .locals 0
 
-    const/4 v0, 0x0
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    iput-object p2, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;->$bottomContent:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onDeafenPressed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onDeafenPressed()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,11 +62,31 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;->$bottomContent:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;
 
-    check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+    check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->onDeafenPressed()V
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing()Z
 
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    invoke-static {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$getViewModel$p(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->onClickStopStream()V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    invoke-static {v0}, Lcom/discord/widgets/voice/stream/StreamNavigator;->requestStartStream(Landroidx/fragment/app/Fragment;)V
+
+    :goto_0
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.smali
index 6851cc348a..e7d968ec7b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     const-string v2, "parentFragmentManager"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lf/a/a/d/a/a$b;->a(Landroidx/fragment/app/FragmentManager;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4.smali
index cf9fb8e82d..ecf8e9d257 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onCameraButtonPressed"
+
+    const-string v5, "onCameraButtonPressed()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onCameraButtonPressed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onCameraButtonPressed()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5.smali
index c52d77a4b1..6352e980de 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,45 +28,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "onDisconnectPressed"
+
+    const-string v5, "onDisconnectPressed()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onDisconnectPressed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onDisconnectPressed()V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
@@ -80,7 +64,7 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1.smali
deleted file mode 100644
index 85d674f256..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;
-.super Ljava/lang/Object;
-.source "WidgetVoiceBottomSheet.kt"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->onClick(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;
-
-    iget-object v0, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
-
-    invoke-static {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$getViewModel$p(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->tryConnectToVoice(Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali
index 9be6b53583..d5342038bf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6.smali
@@ -1,9 +1,9 @@
-.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;
-.super Ljava/lang/Object;
+.class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;
+.super Lk0/o/c/h;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
-.implements Landroid/view/View$OnClickListener;
+.implements Lkotlin/jvm/functions/Function0;
 
 
 # annotations
@@ -12,38 +12,63 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
+    accessFlags = 0x1019
     name = null
 .end annotation
 
-
-# instance fields
-.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/h;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
-    .locals 0
+.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
+    .locals 7
 
-    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 v1, 0x0
+
+    const-string v4, "onDeafenPressed"
+
+    const-string v5, "onDeafenPressed()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final onClick(Landroid/view/View;)V
+.method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    invoke-virtual {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;->invoke()V
 
-    new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;)V
+    return-object v0
+.end method
 
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppBottomSheet;->requestMicrophone(Lrx/functions/Action0;)V
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->onDeafenPressed()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali
index 487a81619b..f4704c2975 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7$1.smali
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    const/4 v1, 0x1
+    const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->tryConnectToVoice(Z)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1.smali
new file mode 100644
index 0000000000..67d9f51089
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1.smali
@@ -0,0 +1,53 @@
+.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;
+.super Ljava/lang/Object;
+.source "WidgetVoiceBottomSheet.kt"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->onClick(Landroid/view/View;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;
+
+    iget-object v0, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    invoke-static {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$getViewModel$p(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->tryConnectToVoice(Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8.smali
new file mode 100644
index 0000000000..4df62c00e7
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8.smali
@@ -0,0 +1,49 @@
+.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;
+.super Ljava/lang/Object;
+.source "WidgetVoiceBottomSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->configureBottomContent(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 1
+
+    iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;)V
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppBottomSheet;->requestMicrophone(Lrx/functions/Action0;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$1.smali
index 7e277abf28..e84f4b4f18 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/streams/StreamContext;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onStreamPreviewClicked"
+
+    const-string v5, "onStreamPreviewClicked(Lcom/discord/utilities/streams/StreamContext;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onStreamPreviewClicked"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onStreamPreviewClicked(Lcom/discord/utilities/streams/StreamContext;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/utilities/streams/StreamContext;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$onStreamPreviewClicked(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;Lcom/discord/utilities/streams/StreamContext;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.smali
index 86fc53a14c..3175de63d4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -67,11 +67,13 @@
 .end method
 
 .method public final invoke(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
-    .locals 11
+    .locals 12
 
-    if-eqz p1, :cond_0
+    const-string v0, "clickedUser"
 
-    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getUser()Lcom/discord/models/domain/ModelUser;
 
@@ -79,46 +81,37 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v1
+    move-result-wide v2
 
-    iget-wide v3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2;->$channelId:J
+    iget-wide v4, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2;->$channelId:J
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v3
+    move-result-object v4
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
     invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v4
+    move-result-object v5
 
     const-string p1, "childFragmentManager"
 
-    invoke-static {v4, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v5, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2;->$guildId:Ljava/lang/Long;
+    iget-object v6, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2;->$guildId:Ljava/lang/Long;
 
-    sget-object v6, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    const/4 v7, 0x0
+    sget-object v7, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
     const/4 v8, 0x0
 
-    const/16 v9, 0x60
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    const/16 v10, 0x60
 
-    invoke-static/range {v0 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
+    const/4 v11, 0x0
+
+    invoke-static/range {v1 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;Lcom/discord/widgets/user/usersheet/WidgetUserSheet$StreamPreviewClickBehavior;Ljava/lang/String;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "clickedUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$3.smali
index e6650fe946..281b3b2584 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,7 +61,9 @@
 .method public final invoke(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "voiceUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$3;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
@@ -72,13 +74,4 @@
     invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->onStopRingingPressed(Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$1.smali
index 5c8db9cc1a..225d73da99 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$1.smali
@@ -51,7 +51,7 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$1;->$viewState:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$2.smali
index 9f4b98cee2..2e107024cb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureUI$2.smali
@@ -47,7 +47,7 @@
 
     const-string p1, "requireContext()"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1.smali
new file mode 100644
index 0000000000..1d1c886a3c
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1.smali
@@ -0,0 +1,77 @@
+.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1;
+.super Lk0/o/c/j;
+.source "WidgetVoiceBottomSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->onActivityResult(IILandroid/content/Intent;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Landroid/content/Intent;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/content/Intent;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1;->invoke(Landroid/content/Intent;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Landroid/content/Intent;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+
+    invoke-static {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$getViewModel$p(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->startStream(Landroid/content/Intent;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$1.smali
index 6377c1916f..d3c75ff56a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$configureUI(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.smali
index bc9cf5c81b..79f8767990 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event;)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -83,22 +67,15 @@
 .method public final invoke(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$handleEvent(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.smali
index f711b55776..c308b87416 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lrx/Subscription;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lrx/Subscription;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "subscription"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->access$setViewModelEventSubscription$p(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;Lrx/Subscription;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "subscription"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onStreamPreviewClickedListener$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onStreamPreviewClickedListener$1.smali
index 00c3e25394..97888eb5cc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onStreamPreviewClickedListener$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onStreamPreviewClickedListener$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onStreamPreviewClickedListener$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/streams/StreamContext;",
         "Lkotlin/Unit;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -69,18 +69,11 @@
 .end method
 
 .method public final invoke(Lcom/discord/utilities/streams/StreamContext;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1.smali
index 7c9d37c758..5234ba7040 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "WidgetVoiceBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Boolean;",
         "Lkotlin/Unit;",
@@ -29,45 +29,29 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "onPttPressed"
+
+    const-string v5, "onPttPressed(Z)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onPttPressed"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "onPttPressed(Z)V"
-
-    return-object v0
-.end method
-
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
@@ -87,7 +71,7 @@
 .method public final invoke(Z)V
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali
index 9daa7bf13c..5b9370d03e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.smali
@@ -79,241 +79,169 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "root"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getRoot()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "root"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getRoot()Landroid/view/ViewGroup;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "title"
 
-    aput-object v1, v0, v2
+    const-string v3, "getTitle()Landroid/widget/TextView;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "title"
-
-    const-string v4, "getTitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "subtitle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getSubtitle()Landroid/widget/TextView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "subtitle"
-
-    const-string v4, "getSubtitle()Landroid/widget/TextView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "participantsRecycler"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getParticipantsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "participantsRecycler"
-
-    const-string v4, "getParticipantsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "emptyStateContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getEmptyStateContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "emptyStateContainer"
-
-    const-string v4, "getEmptyStateContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "connectContainer"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectContainer()Landroid/view/ViewGroup;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectContainer"
-
-    const-string v4, "getConnectContainer()Landroid/view/ViewGroup;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "connectBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectBtn"
-
-    const-string v4, "getConnectBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "connectVideoBtn"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getConnectVideoBtn()Landroid/widget/Button;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "connectVideoBtn"
-
-    const-string v4, "getConnectVideoBtn()Landroid/widget/Button;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "controls"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "controls"
-
-    const-string v4, "getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "headerInviteButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderInviteButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "headerInviteButton"
-
-    const-string v4, "getHeaderInviteButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "headerNoiseCancellationButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderNoiseCancellationButton()Landroid/widget/ImageView;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "headerNoiseCancellationButton"
-
-    const-string v4, "getHeaderNoiseCancellationButton()Landroid/widget/ImageView;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;
+    const-string v2, "headerSettingsButton"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getHeaderSettingsButton()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "headerSettingsButton"
-
-    const-string v4, "getHeaderSettingsButton()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/16 v2, 0xb
 
@@ -337,7 +265,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0a5c
+    const v0, 0x7f0a0a60
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -345,7 +273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->root$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a59
+    const v0, 0x7f0a0a5d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -353,7 +281,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a58
+    const v0, 0x7f0a0a5c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -361,7 +289,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->subtitle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a5b
+    const v0, 0x7f0a0a5f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -369,7 +297,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->participantsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a52
+    const v0, 0x7f0a0a56
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -377,7 +305,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->emptyStateContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a50
+    const v0, 0x7f0a0a54
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -385,7 +313,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->connectContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a4f
+    const v0, 0x7f0a0a53
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -393,7 +321,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->connectBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a5a
+    const v0, 0x7f0a0a5e
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -401,7 +329,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->connectVideoBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a51
+    const v0, 0x7f0a0a55
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -409,7 +337,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->controls$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a55
+    const v0, 0x7f0a0a59
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -417,7 +345,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->headerInviteButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a56
+    const v0, 0x7f0a0a5a
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -425,7 +353,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->headerNoiseCancellationButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a57
+    const v0, 0x7f0a0a5b
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -460,7 +388,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -508,292 +436,330 @@
 .end method
 
 .method private final configureBottomContent(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V
-    .locals 13
+    .locals 18
 
-    const v0, 0x7f040129
+    move-object/from16 v0, p0
 
-    const/16 v1, 0x8
+    move-object/from16 v1, p1
 
-    if-nez p1, :cond_0
+    const v2, 0x7f040129
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+    const/16 v3, 0x8
 
-    move-result-object p1
+    if-nez v1, :cond_0
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectContainer()Landroid/view/ViewGroup;
-
-    move-result-object p1
-
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
-
-    move-result-object p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
 
-    move-result v0
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectContainer()Landroid/view/ViewGroup;
 
-    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setBackgroundColor(I)V
+    move-result-object v1
+
+    invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+
+    move-result-object v1
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+
+    move-result-object v3
+
+    invoke-static {v3, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Landroid/view/ViewGroup;->setBackgroundColor(I)V
 
     goto/16 :goto_1
 
     :cond_0
-    instance-of v2, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
+    instance-of v4, v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
 
-    const/4 v3, 0x0
+    const/4 v5, 0x0
 
-    if-eqz v2, :cond_5
+    if-eqz v4, :cond_5
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectContainer()Landroid/view/ViewGroup;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
     move-result-object v2
 
-    check-cast p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
+    invoke-virtual {v2, v5}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
-
-    move-result-object v3
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->getAudioDevicesState()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
-
-    move-result-object v4
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isMuted()Z
-
-    move-result v5
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isDeafened()Z
-
-    move-result v6
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->getCameraState()Lcom/discord/widgets/voice/model/CameraState;
-
-    move-result-object v7
-
-    new-instance v8, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1;
-
-    iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    const/4 v0, 0x0
-
-    const-string v1, "viewModel"
-
-    if-eqz p1, :cond_4
-
-    invoke-direct {v8, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-
-    new-instance v9, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;
-
-    iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    if-eqz p1, :cond_3
-
-    invoke-direct {v9, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-
-    new-instance v10, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3;
-
-    invoke-direct {v10, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
-
-    new-instance v11, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4;
-
-    iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    if-eqz p1, :cond_2
-
-    invoke-direct {v11, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-
-    new-instance v12, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5;
-
-    iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-
-    if-eqz p1, :cond_1
-
-    invoke-direct {v12, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
-
-    invoke-virtual/range {v2 .. v12}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
-
-    move-result-object p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
-
-    move-result-object v0
-
-    const v1, 0x7f04012a
-
-    invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setBackgroundColor(I)V
-
-    goto/16 :goto_1
-
-    :cond_1
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    instance-of v2, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;
-
-    if-eqz v2, :cond_8
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
-
-    move-result-object v2
-
-    const/4 v4, 0x4
-
-    invoke-virtual {v2, v4}, Landroid/widget/FrameLayout;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->hidePtt()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectContainer()Landroid/view/ViewGroup;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectContainer()Landroid/view/ViewGroup;
 
     move-result-object v2
 
     invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
 
-    check-cast p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;->isConnectEnabled()Z
+    move-result-object v4
+
+    move-object v2, v1
+
+    check-cast v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    move-result-object v5
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->getAudioDevicesState()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+    move-result-object v6
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isMuted()Z
+
+    move-result v7
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isDeafened()Z
+
+    move-result v8
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->isScreensharing()Z
+
+    move-result v9
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->getCameraState()Lcom/discord/widgets/voice/model/CameraState;
+
+    move-result-object v11
+
+    new-instance v12, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1;
+
+    iget-object v3, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    const-string v13, "viewModel"
+
+    if-eqz v3, :cond_4
+
+    invoke-direct {v12, v3}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
+
+    new-instance v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;
+
+    invoke-direct {v3, v0, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$2;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V
+
+    new-instance v14, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3;
+
+    invoke-direct {v14, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
+
+    new-instance v15, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4;
+
+    iget-object v1, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    if-eqz v1, :cond_3
+
+    invoke-direct {v15, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$4;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
+
+    new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5;
+
+    iget-object v10, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    if-eqz v10, :cond_2
+
+    invoke-direct {v1, v10}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$5;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;->getShowScreenshare()Z
+
+    move-result v10
+
+    new-instance v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;
+
+    move-object/from16 v17, v13
+
+    iget-object v13, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    if-eqz v13, :cond_1
+
+    invoke-direct {v2, v13}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
+
+    move-object v13, v3
+
+    move-object/from16 v16, v1
+
+    move-object/from16 v17, v2
+
+    invoke-virtual/range {v4 .. v17}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->configureUI(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZZZLcom/discord/widgets/voice/model/CameraState;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+
+    move-result-object v1
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+
+    move-result-object v2
+
+    const v3, 0x7f04012a
+
+    invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
     move-result v2
 
-    if-eqz v2, :cond_6
+    invoke-virtual {v1, v2}, Landroid/view/ViewGroup;->setBackgroundColor(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
+    goto/16 :goto_1
 
-    move-result-object v2
+    :cond_1
+    invoke-static/range {v17 .. v17}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    const v4, 0x7f120da2
+    const/4 v1, 0x0
 
-    invoke-virtual {v2, v4}, Landroid/widget/Button;->setText(I)V
+    throw v1
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
+    :cond_2
+    move-object/from16 v17, v13
 
-    move-result-object v2
+    const/4 v1, 0x0
 
-    const/4 v4, 0x1
+    invoke-static/range {v17 .. v17}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    invoke-virtual {v2, v4}, Landroid/widget/Button;->setEnabled(Z)V
+    throw v1
+
+    :cond_3
+    move-object/from16 v17, v13
+
+    const/4 v1, 0x0
+
+    invoke-static/range {v17 .. v17}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_4
+    move-object/from16 v17, v13
+
+    const/4 v1, 0x0
+
+    invoke-static/range {v17 .. v17}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_5
+    instance-of v4, v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;
+
+    if-eqz v4, :cond_8
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+
+    move-result-object v4
+
+    const/4 v6, 0x4
+
+    invoke-virtual {v4, v6}, Landroid/widget/FrameLayout;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getControls()Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->hidePtt()V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectContainer()Landroid/view/ViewGroup;
+
+    move-result-object v4
+
+    invoke-virtual {v4, v5}, Landroid/view/View;->setVisibility(I)V
+
+    check-cast v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;->isConnectEnabled()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_6
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
+
+    move-result-object v4
+
+    const v6, 0x7f120dc8
+
+    invoke-virtual {v4, v6}, Landroid/widget/Button;->setText(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
+
+    move-result-object v4
+
+    const/4 v6, 0x1
+
+    invoke-virtual {v4, v6}, Landroid/widget/Button;->setEnabled(Z)V
 
     goto :goto_0
 
     :cond_6
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
 
-    move-result-object v2
+    move-result-object v4
 
-    const v4, 0x7f1203fc
+    const v6, 0x7f1203fd
 
-    invoke-virtual {v2, v4}, Landroid/widget/Button;->setText(I)V
+    invoke-virtual {v4, v6}, Landroid/widget/Button;->setText(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
 
-    move-result-object v2
+    move-result-object v4
 
-    invoke-virtual {v2, v3}, Landroid/widget/Button;->setEnabled(Z)V
+    invoke-virtual {v4, v5}, Landroid/widget/Button;->setEnabled(Z)V
 
     :goto_0
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectBtn()Landroid/widget/Button;
 
-    move-result-object v2
+    move-result-object v4
 
-    new-instance v4, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;
+    new-instance v6, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7;
 
-    invoke-direct {v4, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$6;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
+    invoke-direct {v6, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
 
-    invoke-virtual {v2, v4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v4, v6}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectVideoBtn()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectVideoBtn()Landroid/widget/Button;
 
-    move-result-object v2
+    move-result-object v4
 
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;->isConnectEnabled()Z
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;->isConnectEnabled()Z
 
-    move-result v4
+    move-result v6
 
-    invoke-virtual {v2, v4}, Landroid/widget/Button;->setEnabled(Z)V
+    invoke-virtual {v4, v6}, Landroid/widget/Button;->setEnabled(Z)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectVideoBtn()Landroid/widget/Button;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectVideoBtn()Landroid/widget/Button;
 
-    move-result-object v2
+    move-result-object v4
 
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;->isCameraButtonVisible()Z
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;->isCameraButtonVisible()Z
 
-    move-result p1
+    move-result v1
 
-    if-eqz p1, :cond_7
+    if-eqz v1, :cond_7
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
     :cond_7
-    invoke-virtual {v2, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v4, v3}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectVideoBtn()Landroid/widget/Button;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
-
-    invoke-virtual {p1, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
-
-    move-result-object p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getConnectVideoBtn()Landroid/widget/Button;
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+    new-instance v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;
 
-    move-result v0
+    invoke-direct {v3, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$8;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
 
-    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setBackgroundColor(I)V
+    invoke-virtual {v1, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+
+    move-result-object v1
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->getRoot()Landroid/view/ViewGroup;
+
+    move-result-object v3
+
+    invoke-static {v3, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Landroid/view/ViewGroup;->setBackgroundColor(I)V
 
     :cond_8
     :goto_1
@@ -872,29 +838,29 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_1
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_2
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_3
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_4
     sget-object p2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$Empty;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent$Empty;
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -918,7 +884,7 @@
 
     if-eqz p1, :cond_5
 
-    sget-object p2, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p2, Lk0/j/n;->d:Lk0/j/n;
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V
 
@@ -926,7 +892,7 @@
     return-void
 
     :cond_5
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
@@ -1027,7 +993,7 @@
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1037,7 +1003,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080363
+    const v1, 0x7f080366
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -1048,7 +1014,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080364
+    const v1, 0x7f080367
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -1337,7 +1303,7 @@
 
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowSuppressedDialog;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowSuppressedDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1350,7 +1316,7 @@
     :cond_0
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowServerMutedDialog;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowServerMutedDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1363,7 +1329,7 @@
     :cond_1
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowServerDeafenedDialog;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowServerDeafenedDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1376,7 +1342,7 @@
     :cond_2
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowNoVideoPermissionDialog;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowNoVideoPermissionDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1389,7 +1355,7 @@
     :cond_3
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowRequestCameraPermissionsDialog;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowRequestCameraPermissionsDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1416,7 +1382,7 @@
 
     move-result-object v2
 
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowCameraCapacityDialog;
 
@@ -1461,7 +1427,7 @@
 
     move-result-object v4
 
-    invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$LaunchVideoCall;
 
@@ -1486,7 +1452,7 @@
     :cond_8
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowGuildVideoAtCapacityDialog;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowGuildVideoAtCapacityDialog;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1498,7 +1464,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1, v0}, Lf/a/a/m$a;->a(Landroidx/fragment/app/FragmentManager;)V
 
@@ -1507,7 +1473,7 @@
     :cond_9
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowOverlayNux;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowOverlayNux;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1540,14 +1506,14 @@
 
     const/16 v3, 0xc
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/a/b/p;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
 
     goto :goto_0
 
     :cond_b
     sget-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$Dismiss;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$Dismiss;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -1568,7 +1534,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$AccessibilityAnnouncement;
 
@@ -1582,7 +1548,7 @@
 
     const-string v2, "getString(event.messageResId)"
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/accessibility/AccessibilityUtils;->sendAnnouncement(Landroid/content/Context;Ljava/lang/String;)V
 
@@ -1642,7 +1608,7 @@
     :cond_2
     const-string p1, "featureContext"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
@@ -1658,7 +1624,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1666,17 +1632,25 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f120fa9
+    const v3, 0x7f120fd3
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f120fa8
+    const v4, 0x7f120fd2
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1684,9 +1658,9 @@
 
     const-string v5, "context.getString(R.stri\u2026o_permission_dialog_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1758,7 +1732,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1766,17 +1740,25 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f121447
+    const v3, 0x7f121471
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f121446
+    const v4, 0x7f121470
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1784,9 +1766,9 @@
 
     const-string v5, "context.getString(R.stri\u2026ver_deafened_dialog_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1858,7 +1840,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1866,17 +1848,25 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f121451
+    const v3, 0x7f12147b
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f121450
+    const v4, 0x7f12147a
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1884,9 +1874,9 @@
 
     const-string v5, "context.getString(R.stri\u2026server_muted_dialog_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1958,7 +1948,7 @@
 
     const-string v0, "parentFragmentManager"
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
 
@@ -1966,17 +1956,25 @@
 
     const-string v2, "requireContext()"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f121541
+    const v3, 0x7f12156b
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v4, 0x7f121544
+    const v4, 0x7f12156e
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1984,9 +1982,9 @@
 
     const-string v5, "context.getString(R.stri\u2026ppressed_permission_body)"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f12107e
+    const v5, 0x7f1210a8
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2076,20 +2074,38 @@
     return-object v0
 .end method
 
+.method public onActivityResult(IILandroid/content/Intent;)V
+    .locals 1
+
+    invoke-super {p0, p1, p2, p3}, Landroidx/fragment/app/Fragment;->onActivityResult(IILandroid/content/Intent;)V
+
+    new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onActivityResult$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;)V
+
+    invoke-static {p1, p2, p3, v0}, Lcom/discord/widgets/voice/stream/StreamNavigator;->handleActivityResult(IILandroid/content/Intent;Lkotlin/jvm/functions/Function1;)V
+
+    return-void
+.end method
+
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
-    .locals 16
+    .locals 17
 
     move-object/from16 v0, p0
 
-    if-eqz p1, :cond_1
+    const-string v1, "inflater"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireArguments()Landroid/os/Bundle;
 
     move-result-object v1
 
-    const-string v2, "ARG_FEATURE_CONTEXT"
+    const-string v3, "ARG_FEATURE_CONTEXT"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
+    invoke-virtual {v1, v3}, Landroid/os/Bundle;->getSerializable(Ljava/lang/String;)Ljava/io/Serializable;
 
     move-result-object v1
 
@@ -2103,27 +2119,25 @@
 
     move-result-object v1
 
-    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v3, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    invoke-virtual {v1, v3}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v4
+    move-result-wide v5
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->requireArguments()Landroid/os/Bundle;
 
     move-result-object v1
 
-    const-string v2, "ARG_FORWARD_TO_FULLSCREEN_IF_VIDEO_ACTIVATED"
+    const-string v3, "ARG_FORWARD_TO_FULLSCREEN_IF_VIDEO_ACTIVATED"
 
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
+    invoke-virtual {v1, v3}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
 
-    move-result v6
+    move-result v7
 
     new-instance v1, Landroidx/lifecycle/ViewModelProvider;
 
-    new-instance v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;
-
-    const/4 v7, 0x0
+    new-instance v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;
 
     const/4 v8, 0x0
 
@@ -2137,25 +2151,27 @@
 
     const/4 v13, 0x0
 
-    const/16 v14, 0x1fc
+    const/4 v14, 0x0
 
-    const/4 v15, 0x0
+    const/16 v15, 0x1fc
 
-    move-object v3, v2
+    const/16 v16, 0x0
 
-    invoke-direct/range {v3 .. v15}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;-><init>(JZLcom/discord/stores/StoreExperiments;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreCalls;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object v4, v3
 
-    invoke-direct {v1, v0, v2}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    invoke-direct/range {v4 .. v16}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;-><init>(JZLcom/discord/stores/StoreExperiments;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreCalls;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+    invoke-direct {v1, v0, v3}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    invoke-virtual {v1, v2}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    const-class v3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+
+    invoke-virtual {v1, v3}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object v1
 
-    const-string v2, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
+    const-string v3, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
@@ -2168,20 +2184,11 @@
     return-object v1
 
     :cond_0
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type com.discord.widgets.voice.sheet.WidgetVoiceBottomSheet.FeatureContext"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const-string v1, "inflater"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -2227,7 +2234,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -2292,22 +2299,22 @@
     return-void
 
     :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_1
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 2
+    .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -2321,11 +2328,11 @@
 
     new-instance p2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1;
 
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->viewModel:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-direct {p2, v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
+    invoke-direct {p2, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onViewCreated$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;)V
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/voice/controls/AnchoredVoiceControlsView;->setOnPttPressedListener(Lkotlin/jvm/functions/Function1;)V
 
@@ -2334,20 +2341,15 @@
     :cond_0
     const-string p1, "viewModel"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public final setOnStreamPreviewClickedListener(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -2359,18 +2361,11 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet;->onStreamPreviewClickedListener:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$1.smali
index 08b9c2e1e0..bc428f111a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceBottomSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->access$handleStoreState(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$LaunchVideoCall.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$LaunchVideoCall.smali
index 1adf114fc9..468a1613f3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$LaunchVideoCall.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$LaunchVideoCall.smali
@@ -110,7 +110,7 @@
 
     iget-object p1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$LaunchVideoCall;->autoTargetStreamKey:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1.smali
index 81b97a3e1e..bc115a3906 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceBottomSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 1
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
@@ -90,5 +76,21 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2.smali
index c44c1bda6d..916581f376 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceBottomSheetViewModel.kt"
 
 # interfaces
-.implements Lrx/functions/Func4;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -18,20 +18,16 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T1:",
-        "Ljava/lang/Object;",
-        "T2:",
-        "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
-        "T4:",
+        "<T:",
         "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -63,113 +59,36 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;Ljava/lang/Long;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;
-    .locals 6
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+    .locals 1
 
-    if-eqz p1, :cond_2
+    invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
 
-    const/4 v0, 0x3
+    move-result p1
 
-    new-array v1, v0, [Ljava/lang/Integer;
+    const/4 v0, 0x1
 
-    const/4 v2, 0x2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    aput-object v3, v1, v4
-
-    const/4 v3, 0x1
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
-
-    aput-object v5, v1, v3
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    aput-object v0, v1, v2
-
-    invoke-static {v1}, Lf/n/a/k/a;->setOf([Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getType()I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    const-string v0, "noiseCancellationExperimentEnabled"
-
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_1
-
-    sget-object p2, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    if-ne p3, p2, :cond_0
-
-    const/4 v4, 0x1
-
-    :cond_0
-    invoke-static {v4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p2
+    if-ne p1, v0, :cond_0
 
     goto :goto_0
 
-    :cond_1
-    const/4 p2, 0x0
+    :cond_0
+    const/4 v0, 0x0
 
     :goto_0
-    new-instance p3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
-
-    invoke-direct {p3, p1, p2, p4}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)V
-
-    goto :goto_1
-
-    :cond_2
-    sget-object p3, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Invalid;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Invalid;
-
-    :goto_1
-    return-object p3
-.end method
-
-.method public 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/widgets/voice/model/CallModel;
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    check-cast p3, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
-    check-cast p4, Ljava/lang/Long;
-
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2;->call(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;Ljava/lang/Long;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3.smali
new file mode 100644
index 0000000000..f1e0255374
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3.smali
@@ -0,0 +1,212 @@
+.class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;
+.super Ljava/lang/Object;
+.source "WidgetVoiceBottomSheetViewModel.kt"
+
+# interfaces
+.implements Lrx/functions/Func5;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->observeStoreState()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        "T3:",
+        "Ljava/lang/Object;",
+        "T4:",
+        "Ljava/lang/Object;",
+        "T5:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func5<",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        "Ljava/lang/Boolean;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;
+
+    invoke-direct {v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;Ljava/lang/Long;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;
+    .locals 6
+
+    if-eqz p1, :cond_4
+
+    const/4 v0, 0x3
+
+    new-array v1, v0, [Ljava/lang/Integer;
+
+    const/4 v2, 0x2
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    aput-object v3, v1, v4
+
+    const/4 v3, 0x1
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v5
+
+    aput-object v5, v1, v3
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    aput-object v0, v1, v2
+
+    invoke-static {v1}, Lf/n/a/k/a;->setOf([Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    const-string v0, "noiseCancellationExperimentEnabled"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_1
+
+    sget-object p2, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    if-ne p4, p2, :cond_0
+
+    const/4 p2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p2, 0x0
+
+    :goto_0
+    invoke-static {p2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_1
+    new-instance p4, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
+
+    const-string v0, "mobileScreenshareExperimentEnabled"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p3
+
+    if-nez p3, :cond_2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
+
+    move-result p3
+
+    if-eqz p3, :cond_3
+
+    :cond_2
+    const/4 v4, 0x1
+
+    :cond_3
+    invoke-direct {p4, p1, p2, p5, v4}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;Z)V
+
+    goto :goto_2
+
+    :cond_4
+    sget-object p4, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Invalid;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Invalid;
+
+    :goto_2
+    return-object p4
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/voice/model/CallModel;
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    check-cast p3, Ljava/lang/Boolean;
+
+    check-cast p4, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
+
+    check-cast p5, Ljava/lang/Long;
+
+    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;->call(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;Ljava/lang/Long;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory.smali
index 8d4116ed85..ab6bd17068 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory.smali
@@ -41,21 +41,33 @@
 .method public constructor <init>(JZLcom/discord/stores/StoreExperiments;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreCalls;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "experimentStore"
 
-    if-eqz p4, :cond_6
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_5
+    const-string v0, "mediaSettingsStore"
 
-    if-eqz p6, :cond_4
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p7, :cond_3
+    const-string v0, "selectedVoiceChannelStore"
 
-    if-eqz p8, :cond_2
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p9, :cond_1
+    const-string v0, "mediaEngineStore"
 
-    if-eqz p10, :cond_0
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userSettingsStore"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "permissionsStore"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "callsStore"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -78,55 +90,6 @@
     iput-object p10, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->callsStore:Lcom/discord/stores/StoreCalls;
 
     return-void
-
-    :cond_0
-    const-string p1, "callsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "permissionsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "userSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "mediaEngineStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "selectedVoiceChannelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "experimentStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JZLcom/discord/stores/StoreExperiments;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreCalls;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -272,7 +235,7 @@
 .end method
 
 .method private final observeStoreState()Lrx/Observable;
-    .locals 6
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -288,49 +251,65 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
 
+    move-result-object v3
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->experimentStore:Lcom/discord/stores/StoreExperiments;
+
+    const-string v1, "2020-04_noise_cancellation_android"
+
+    const/4 v2, 0x0
+
+    const/4 v4, 0x2
+
+    invoke-static {v0, v1, v2, v4, v2}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
     move-result-object v0
 
     iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->experimentStore:Lcom/discord/stores/StoreExperiments;
 
-    const-string v2, "2020-04_noise_cancellation_android"
+    const-string v5, "2020-08_android_screenshare"
 
-    const/4 v3, 0x0
-
-    const/4 v4, 0x2
-
-    invoke-static {v1, v2, v3, v4, v3}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v1, v5, v2, v4, v2}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$1;
+    sget-object v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v1, v2}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v5
 
-    iget-object v2, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
+    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings;->getNoiseProcessing()Lrx/Observable;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getNoiseProcessing()Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v6
 
-    iget-object v3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->permissionsStore:Lcom/discord/stores/StorePermissions;
+    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->permissionsStore:Lcom/discord/stores/StorePermissions;
 
-    iget-wide v4, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->channelId:J
+    iget-wide v7, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->channelId:J
 
-    invoke-virtual {v3, v4, v5}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
+    invoke-virtual {v1, v7, v8}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v7
 
-    sget-object v4, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$2;
+    sget-object v8, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory$observeStoreState$3;
 
-    invoke-static {v0, v1, v2, v3, v4}, Lrx/Observable;->h(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
+    move-object v4, v0
+
+    invoke-static/range {v3 .. v8}, Lrx/Observable;->g(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
 
     move-result-object v0
 
     const-string v1, "Observable.combineLatest\u2026Invalid\n        }\n      }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -338,7 +317,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 13
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -349,46 +328,39 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
 
-    iget-wide v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->channelId:J
+    iget-wide v2, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->channelId:J
 
-    iget-boolean v3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->forwardToFullscreenIfVideoActivated:Z
+    iget-boolean v4, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->forwardToFullscreenIfVideoActivated:Z
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->observeStoreState()Lrx/Observable;
 
-    move-result-object v4
+    move-result-object v5
 
-    iget-object v5, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->selectedVoiceChannelStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+    iget-object v6, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->selectedVoiceChannelStore:Lcom/discord/stores/StoreVoiceChannelSelected;
 
-    iget-object v6, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
+    iget-object v7, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
 
-    iget-object v7, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->mediaEngineStore:Lcom/discord/stores/StoreMediaEngine;
+    iget-object v8, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->mediaEngineStore:Lcom/discord/stores/StoreMediaEngine;
 
-    iget-object v8, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->userSettingsStore:Lcom/discord/stores/StoreUserSettings;
+    iget-object v9, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->userSettingsStore:Lcom/discord/stores/StoreUserSettings;
 
-    iget-object v9, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->callsStore:Lcom/discord/stores/StoreCalls;
+    iget-object v10, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Factory;->callsStore:Lcom/discord/stores/StoreCalls;
 
-    const/4 v10, 0x0
+    const/4 v11, 0x0
 
-    const/16 v11, 0x100
+    const/16 v12, 0x100
 
-    const/4 v12, 0x0
+    const/4 v13, 0x0
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v12}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;-><init>(JZLrx/Observable;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreCalls;Lcom/discord/utilities/permissions/VideoPermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v13}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;-><init>(JZLrx/Observable;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreCalls;Lcom/discord/utilities/permissions/VideoPermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid.smali
index 93a1f47ad2..5ec103f443 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid.smali
@@ -17,18 +17,22 @@
 # instance fields
 .field public final callModel:Lcom/discord/widgets/voice/model/CallModel;
 
+.field public final mobileScreenshareExperimentEnabled:Z
+
 .field public final myPermissions:Ljava/lang/Long;
 
 .field public final noiseCancellation:Ljava/lang/Boolean;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)V
+.method public constructor <init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;Z)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "callModel"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -38,41 +42,43 @@
 
     iput-object p3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->myPermissions:Ljava/lang/Long;
 
+    iput-boolean p4, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
     return-void
-
-    :cond_0
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;ILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
+.method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;ZILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
     .locals 0
 
-    and-int/lit8 p5, p4, 0x1
+    and-int/lit8 p6, p5, 0x1
 
-    if-eqz p5, :cond_0
+    if-eqz p6, :cond_0
 
     iget-object p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->callModel:Lcom/discord/widgets/voice/model/CallModel;
 
     :cond_0
-    and-int/lit8 p5, p4, 0x2
+    and-int/lit8 p6, p5, 0x2
 
-    if-eqz p5, :cond_1
+    if-eqz p6, :cond_1
 
     iget-object p2, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->noiseCancellation:Ljava/lang/Boolean;
 
     :cond_1
-    and-int/lit8 p4, p4, 0x4
+    and-int/lit8 p6, p5, 0x4
 
-    if-eqz p4, :cond_2
+    if-eqz p6, :cond_2
 
     iget-object p3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->myPermissions:Ljava/lang/Long;
 
     :cond_2
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->copy(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_3
+
+    iget-boolean p4, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
+    :cond_3
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->copy(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;Z)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
 
     move-result-object p0
 
@@ -105,25 +111,26 @@
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
+.method public final component4()Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
+    return v0
+.end method
+
+.method public final copy(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;Z)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
+    .locals 1
+
+    const-string v0, "callModel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
 
-    invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;)V
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;-><init>(Lcom/discord/widgets/voice/model/CallModel;Ljava/lang/Boolean;Ljava/lang/Long;Z)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -141,7 +148,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->callModel:Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -151,7 +158,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->noiseCancellation:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -159,13 +166,19 @@
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->myPermissions:Ljava/lang/Long;
 
-    iget-object p1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->myPermissions:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->myPermissions:Ljava/lang/Long;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v0
 
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
+
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
+    iget-boolean p1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
+    if-ne v0, p1, :cond_0
 
     goto :goto_0
 
@@ -189,6 +202,14 @@
     return-object v0
 .end method
 
+.method public final getMobileScreenshareExperimentEnabled()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
+    return v0
+.end method
+
 .method public final getMyPermissions()Ljava/lang/Long;
     .locals 1
 
@@ -255,11 +276,22 @@
     :cond_2
     add-int/2addr v0, v1
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
+    if-eqz v1, :cond_3
+
+    const/4 v1, 0x1
+
+    :cond_3
+    add-int/2addr v0, v1
+
     return v0
 .end method
 
 .method public toString()Ljava/lang/String;
-    .locals 2
+    .locals 3
 
     const-string v0, "Valid(callModel="
 
@@ -287,11 +319,15 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    const-string v1, ")"
+    const-string v1, ", mobileScreenshareExperimentEnabled="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    iget-boolean v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->mobileScreenshareExperimentEnabled:Z
+
+    const-string v2, ")"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState.smali
index c14a96b57b..de6ca27a06 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState.smali
@@ -39,11 +39,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/Long;ZLjava/lang/Boolean;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "title"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p8, :cond_0
+    const-string v0, "centerContent"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -64,20 +66,6 @@
     iput-object p9, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;->bottomContent:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;
 
     return-void
-
-    :cond_0
-    const-string p1, "centerContent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "title"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Long;ZLjava/lang/Boolean;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;ILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;
@@ -305,18 +293,22 @@
 .method public final copy(Ljava/lang/String;Ljava/lang/String;JLjava/lang/Long;ZLjava/lang/Boolean;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;
     .locals 11
 
-    const/4 v0, 0x0
+    const-string v0, "title"
 
-    if-eqz p1, :cond_1
+    move-object v2, p1
 
-    if-eqz p8, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "centerContent"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;
 
     move-object v1, v0
 
-    move-object v2, p1
-
     move-object v3, p2
 
     move-wide v4, p3
@@ -327,27 +319,11 @@
 
     move-object/from16 v8, p7
 
-    move-object/from16 v9, p8
-
     move-object/from16 v10, p9
 
     invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/Long;ZLjava/lang/Boolean;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V
 
     return-object v0
-
-    :cond_0
-    const-string v1, "centerContent"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string v1, "title"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -369,7 +345,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -383,7 +359,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -409,7 +385,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -433,7 +409,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -447,7 +423,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -461,7 +437,7 @@
 
     move-result-object p1
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1.smali
index 069199033d..2ffc946cfe 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1.smali
@@ -158,7 +158,7 @@
 
     iget-object v9, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v3, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v3, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v3
 
@@ -176,7 +176,7 @@
 
     iget-object v9, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v4, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v4
 
@@ -221,7 +221,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -233,7 +233,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -252,7 +252,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -264,7 +264,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$createUserItemsComparator$1;->$mySpectatingStreamKey:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.smali
index e61adc6762..b31cf5e6f0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetVoiceBottomSheetViewModel.kt"
 
 
@@ -15,7 +15,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;",
         ">;"
     }
@@ -75,25 +75,39 @@
         }
     .end annotation
 
+    const-string v0, "storeStateObservable"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "selectedVoiceChannelStore"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaSettingsStore"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaEngineStore"
+
+    invoke-static {p7, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "userSettingsStore"
+
+    invoke-static {p8, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "callsStore"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "videoPermissionsManager"
+
+    invoke-static {p10, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p4, :cond_b
-
-    if-eqz p5, :cond_a
-
-    if-eqz p6, :cond_9
-
-    if-eqz p7, :cond_8
-
-    if-eqz p8, :cond_7
-
-    if-eqz p9, :cond_6
-
-    if-eqz p10, :cond_5
-
     const/4 v1, 0x1
 
-    invoke-direct {p0, v0, v1, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->channelId:J
 
@@ -119,7 +133,9 @@
 
     sget-object p1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    if-eqz p1, :cond_4
+    const-string p2, "logger"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object p2, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
 
@@ -154,6 +170,10 @@
 
     sget-object p1, Lcom/discord/tooltips/TooltipManager$a;->d:Lcom/discord/tooltips/TooltipManager$a;
 
+    const-string p1, "floatingViewManager"
+
+    invoke-static {p9, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget-object p1, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
 
     if-eqz p1, :cond_2
@@ -238,62 +258,6 @@
     invoke-static/range {p2 .. p10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_4
-    const-string p1, "logger"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "videoPermissionsManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "callsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "userSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "mediaEngineStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "selectedVoiceChannelStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p1, "storeStateObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JZLrx/Observable;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUserSettings;Lcom/discord/stores/StoreCalls;Lcom/discord/utilities/permissions/VideoPermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -454,7 +418,7 @@
 
     move-result-object p1
 
-    invoke-static {v1, p1}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    invoke-static {v1, p1}, Lk0/j/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 
     move-result-object p1
 
@@ -493,7 +457,7 @@
 
     move-result-object v7
 
-    invoke-static {p2, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p2, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v7
 
@@ -614,7 +578,7 @@
 .end method
 
 .method private final handleStoreState(Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;)V
-    .locals 21
+    .locals 23
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -833,45 +797,45 @@
 
     if-nez v2, :cond_8
 
+    new-instance v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;
+
     invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
-    move-result-object v2
+    move-result-object v6
 
-    invoke-virtual {v2}, Lcom/discord/widgets/voice/model/CallModel;->getVoiceChannelJoinability()Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    invoke-virtual {v6}, Lcom/discord/widgets/voice/model/CallModel;->getVoiceChannelJoinability()Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
-    move-result-object v2
+    move-result-object v6
 
-    sget-object v6, Lcom/discord/utilities/voice/VoiceChannelJoinability;->PERMISSIONS_MISSING:Lcom/discord/utilities/voice/VoiceChannelJoinability;
+    sget-object v9, Lcom/discord/utilities/voice/VoiceChannelJoinability;->PERMISSIONS_MISSING:Lcom/discord/utilities/voice/VoiceChannelJoinability;
 
-    if-eq v2, v6, :cond_7
+    if-eq v6, v9, :cond_7
 
-    const/4 v2, 0x1
+    const/4 v6, 0x1
 
     goto :goto_4
 
     :cond_7
-    const/4 v2, 0x0
+    const/4 v6, 0x0
 
     :goto_4
     invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
-    move-result-object v6
+    move-result-object v9
 
-    invoke-virtual {v6}, Lcom/discord/widgets/voice/model/CallModel;->getVideoDevices()Ljava/util/List;
+    invoke-virtual {v9}, Lcom/discord/widgets/voice/model/CallModel;->getVideoDevices()Ljava/util/List;
 
-    move-result-object v6
+    move-result-object v9
 
-    invoke-interface {v6}, Ljava/util/Collection;->isEmpty()Z
+    invoke-interface {v9}, Ljava/util/Collection;->isEmpty()Z
 
-    move-result v6
+    move-result v9
 
-    xor-int/2addr v6, v4
+    xor-int/2addr v9, v4
 
-    new-instance v9, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;
+    invoke-direct {v2, v6, v9}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;-><init>(ZZ)V
 
-    invoke-direct {v9, v2, v6}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Connect;-><init>(ZZ)V
-
-    move-object v15, v9
+    move-object v15, v2
 
     goto :goto_7
 
@@ -953,9 +917,21 @@
 
     move-result-object v20
 
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->getMobileScreenshareExperimentEnabled()Z
+
+    move-result v21
+
+    invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/widgets/voice/model/CallModel;->isStreaming()Z
+
+    move-result v22
+
     move-object v15, v6
 
-    invoke-direct/range {v15 .. v20}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;-><init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;)V
+    invoke-direct/range {v15 .. v22}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent$Controls;-><init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;ZZLcom/discord/widgets/voice/model/CameraState;ZZ)V
 
     :goto_7
     invoke-virtual {v1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
@@ -994,7 +970,7 @@
 
     const-string v5, "title"
 
-    invoke-static {v7, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v9, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->channelId:J
 
@@ -1026,7 +1002,7 @@
 
     invoke-direct/range {v6 .. v15}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$ViewState;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/Long;ZLjava/lang/Boolean;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$CenterContent;Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$BottomContent;)V
 
-    invoke-virtual {v0, v2}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -1090,7 +1066,7 @@
 
     const-string v1, "eventSubject"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -1111,7 +1087,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1210,11 +1186,7 @@
 
     move-result v2
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->compare(II)I
-
-    move-result v0
-
-    if-lez v0, :cond_7
+    if-le v0, v2, :cond_7
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
@@ -1262,6 +1234,20 @@
     return-void
 .end method
 
+.method public final onClickStopStream()V
+    .locals 1
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->Companion:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;->getINSTANCE()Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->stopStream()V
+
+    return-void
+.end method
+
 .method public final onDeafenPressed()V
     .locals 3
     .annotation build Landroidx/annotation/UiThread;
@@ -1299,7 +1285,7 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->toggleSelfDeafened()V
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1327,12 +1313,12 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f1217c2
+    const v0, 0x7f1217ee
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f1217bb
+    const v0, 0x7f1217e7
 
     :goto_0
     invoke-direct {v2, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$AccessibilityAnnouncement;-><init>(I)V
@@ -1425,7 +1411,7 @@
 
     new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowToast;
 
-    const v2, 0x7f121765
+    const v2, 0x7f12178f
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowToast;-><init>(I)V
 
@@ -1436,7 +1422,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1464,12 +1450,12 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f1217c3
+    const v0, 0x7f1217ef
 
     goto :goto_0
 
     :cond_4
-    const v0, 0x7f1217be
+    const v0, 0x7f1217ea
 
     :goto_0
     invoke-direct {v2, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$AccessibilityAnnouncement;-><init>(I)V
@@ -1488,7 +1474,7 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    invoke-virtual {p0}, Lf/a/b/o0;->requireViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->requireViewState()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1543,7 +1529,7 @@
 
     new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowToast;
 
-    const v2, 0x7f120faa
+    const v2, 0x7f120fd4
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowToast;-><init>(I)V
 
@@ -1558,7 +1544,7 @@
 
     new-instance v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowToast;
 
-    const v2, 0x7f120fab
+    const v2, 0x7f120fd5
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Event$ShowToast;-><init>(I)V
 
@@ -1588,7 +1574,9 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "voiceUser"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->callsStore:Lcom/discord/stores/StoreCalls;
 
@@ -1613,15 +1601,6 @@
     invoke-virtual {v0, v1, v2, p1}, Lcom/discord/stores/StoreCalls;->stopRinging(JLjava/util/List;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "voiceUser"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final onStreamPreviewClicked(Ljava/lang/String;)V
@@ -1629,22 +1608,19 @@
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
+    const-string v0, "streamKey"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->mostRecentStoreState:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;
+
+    instance-of v1, v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
+
+    if-nez v1, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_3
-
-    iget-object v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel;->mostRecentStoreState:Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState;
-
-    instance-of v2, v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
     :cond_0
-    move-object v0, v1
-
-    :goto_0
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$StoreState$Valid;
 
     if-eqz v0, :cond_2
@@ -1669,7 +1645,7 @@
 
     invoke-virtual {p1, v0}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_1
     sget-object v0, Lcom/discord/models/domain/ModelApplicationStream;->Companion:Lcom/discord/models/domain/ModelApplicationStream$Companion;
@@ -1693,15 +1669,26 @@
     invoke-virtual {p1, v2}, Lrx/subjects/PublishSubject$b;->onNext(Ljava/lang/Object;)V
 
     :cond_2
-    :goto_1
+    :goto_0
     return-void
+.end method
 
-    :cond_3
-    const-string p1, "streamKey"
+.method public final startStream(Landroid/content/Intent;)V
+    .locals 1
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v0, "intent"
 
-    throw v0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/utilities/voice/VoiceEngineServiceController;->Companion:Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/utilities/voice/VoiceEngineServiceController$Companion;->getINSTANCE()Lcom/discord/utilities/voice/VoiceEngineServiceController;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/voice/VoiceEngineServiceController;->startStream(Landroid/content/Intent;)V
+
+    return-void
 .end method
 
 .method public final tryConnectToVoice(Z)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$Companion.smali
index e81cda0583..178278c38c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$Companion.smali
@@ -51,7 +51,9 @@
 .method public final show(Ljava/lang/Long;Landroidx/fragment/app/FragmentManager;)V
     .locals 4
 
-    if-eqz p2, :cond_1
+    const-string v0, "fragmentManager"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
 
@@ -83,13 +85,4 @@
     invoke-virtual {v0, p2, p1}, Lcom/discord/app/AppBottomSheet;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "fragmentManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$1.smali
index 12de2f3c1f..fa0624b523 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$1.smali
@@ -51,7 +51,7 @@
 
     const-string v2, "it.context"
 
-    invoke-static {p1, v0, v2}, Lf/e/b/a/a;->V(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
+    invoke-static {p1, v0, v2}, Lf/e/b/a/a;->X(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$3.smali
index 51d0b091b9..230b2c5358 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$3.smali
@@ -55,7 +55,7 @@
 
     const-string p1, "voiceSettingsItem.context"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$onResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$onResume$1.smali
index 46bdff97b1..4adb9b9a72 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$onResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$onResume$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$onResume$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceSettingsBottomSheet.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$onResume$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;->access$configureUI(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$ViewState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "viewState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.smali
index 156befbe75..5cee11c18e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.smali
@@ -40,81 +40,57 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
+    const-string v2, "voiceParticipantsToggle"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceParticipantsToggle()Landroidx/appcompat/widget/SwitchCompat;"
 
-    move-result-object v2
+    const/4 v4, 0x0
 
-    const-string v3, "voiceParticipantsToggle"
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v4, "getVoiceParticipantsToggle()Landroidx/appcompat/widget/SwitchCompat;"
+    move-result-object v1
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    aput-object v1, v0, v4
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
 
-    const/4 v2, 0x0
+    const-string v2, "noiseSuppressionToggle"
 
-    aput-object v1, v0, v2
+    const-string v3, "getNoiseSuppressionToggle()Landroidx/appcompat/widget/SwitchCompat;"
 
-    new-instance v1, Lj0/n/c/q;
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "noiseSuppressionToggle"
-
-    const-string v4, "getNoiseSuppressionToggle()Landroidx/appcompat/widget/SwitchCompat;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
+    const-string v2, "inviteItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getInviteItem()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "inviteItem"
-
-    const-string v4, "getInviteItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    new-instance v1, Lj0/n/c/q;
+    const-class v1, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
 
-    const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;
+    const-string v2, "voiceSettingsItem"
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    const-string v3, "getVoiceSettingsItem()Landroid/view/View;"
 
-    move-result-object v2
+    invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->K(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/o/c/r;
 
-    const-string v3, "voiceSettingsItem"
-
-    const-string v4, "getVoiceSettingsItem()Landroid/view/View;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    move-result-object v1
 
     const/4 v2, 0x3
 
@@ -138,7 +114,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a0a6a
+    const v0, 0x7f0a0a6f
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -146,7 +122,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;->voiceParticipantsToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a68
+    const v0, 0x7f0a0a6d
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -154,7 +130,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;->noiseSuppressionToggle$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a67
+    const v0, 0x7f0a0a6c
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -162,7 +138,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet;->inviteItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0a6b
+    const v0, 0x7f0a0a70
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -193,7 +169,7 @@
     :cond_0
     const-string p0, "viewModel"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -439,7 +415,9 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 9
 
-    if-eqz p1, :cond_0
+    const-string v0, "inflater"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireArguments()Landroid/os/Bundle;
 
@@ -477,7 +455,7 @@
 
     const-string v1, "ViewModelProvider(this, \u2026ewModel::class.java\n    )"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;
 
@@ -488,15 +466,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onResume()V
@@ -508,7 +477,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lf/a/b/o0;->observeViewState()Lrx/Observable;
+    invoke-virtual {v0}, Lf/a/b/q0;->observeViewState()Lrx/Observable;
 
     move-result-object v0
 
@@ -541,7 +510,7 @@
     :cond_0
     const-string v0, "viewModel"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -549,9 +518,11 @@
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -560,13 +531,4 @@
     invoke-virtual {p0, p1}, Lcom/discord/app/AppBottomSheet;->setBottomSheetState(I)V
 
     return-void
-
-    :cond_0
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1.smali
index 5da0de874d..4f77a8af26 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "WidgetVoiceSettingsBottomSheetViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -61,20 +61,13 @@
 .method public final invoke(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "storeState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1;->this$0:Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;
 
     invoke-static {v0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;->access$handleStoreState(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "storeState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1.smali
index a187f4f88a..82688e8a79 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetVoiceSettingsBottomSheetViewModel.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,8 +24,10 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "TT;TR;>;"
+        "Ls0/k/b<",
+        "Lcom/discord/stores/StoreExperiments$Experiment;",
+        "Ljava/lang/Boolean;",
+        ">;"
     }
 .end annotation
 
@@ -57,23 +59,7 @@
 
 
 # virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
-
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
     .locals 1
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
@@ -90,5 +76,21 @@
     const/4 v0, 0x0
 
     :goto_0
-    return v0
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$2.smali
index 7c966143c2..77d01c9a4e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$2.smali
@@ -31,7 +31,12 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        "Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState;",
+        ">;"
     }
 .end annotation
 
@@ -72,7 +77,7 @@
 
     const-string v1, "voiceParticipantsHidden"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -80,7 +85,7 @@
 
     const-string v1, "inNoiseCancellationExperiment"
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory.smali
index 0d07fc78c4..310208eeea 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory.smali
@@ -29,11 +29,13 @@
 .method public constructor <init>(JLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "storeMediaSettings"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "storeExperiments"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,20 +46,6 @@
     iput-object p4, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory;->storeExperiments:Lcom/discord/stores/StoreExperiments;
 
     return-void
-
-    :cond_0
-    const-string p1, "storeExperiments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeMediaSettings"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreExperiments;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -135,7 +123,7 @@
 
     sget-object v4, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1;->INSTANCE:Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory$observeStoreState$1;
 
-    invoke-virtual {v3, v4}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v3, v4}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v3
 
@@ -147,7 +135,7 @@
 
     const-string v1, "Observable.combineLatest\u2026lid\n          }\n        }"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
@@ -159,7 +147,7 @@
 
     const-string v1, "Observable.combineLatest\u2026  .distinctUntilChanged()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
@@ -167,7 +155,7 @@
 
 # virtual methods
 .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 7
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -178,36 +166,29 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "modelClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;
 
-    iget-wide v1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory;->channelId:J
+    iget-wide v2, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory;->channelId:J
 
     invoke-direct {p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$Factory;->observeStoreState()Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v4
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
-    const/4 v5, 0x4
+    const/4 v6, 0x4
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
-    move-object v0, p1
+    move-object v1, p1
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;-><init>(JLrx/Observable;Lcom/discord/stores/StoreMediaSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;-><init>(JLrx/Observable;Lcom/discord/stores/StoreMediaSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "modelClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final getChannelId()J
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid.smali
index 5223df2ab1..440b5b037f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid.smali
@@ -28,9 +28,11 @@
 .method public constructor <init>(ZLcom/discord/widgets/voice/model/CallModel;ZZ)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "callModel"
 
-    if-eqz p2, :cond_0
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
@@ -43,13 +45,6 @@
     iput-boolean p4, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->noiseCancellationEnabled:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;ZLcom/discord/widgets/voice/model/CallModel;ZZILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;
@@ -127,22 +122,15 @@
 .method public final copy(ZLcom/discord/widgets/voice/model/CallModel;ZZ)Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "callModel"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;
 
     invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;-><init>(ZLcom/discord/widgets/voice/model/CallModel;ZZ)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "callModel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -166,7 +154,7 @@
 
     iget-object v1, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->callModel:Lcom/discord/widgets/voice/model/CallModel;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState.smali
index 17afe8cd1d..bca717fcad 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState.smali
@@ -33,9 +33,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,15 +54,6 @@
     iput-boolean p6, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;->noiseCancellationEnabled:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static synthetic copy$default(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;Lcom/discord/models/domain/ModelChannel;ZZZZZILjava/lang/Object;)Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;
@@ -216,36 +209,29 @@
 .method public final copy(Lcom/discord/models/domain/ModelChannel;ZZZZZ)Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;
     .locals 8
 
-    if-eqz p1, :cond_0
+    const-string v0, "channel"
 
-    new-instance v7, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v7
+    new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;
 
-    move-object v1, p1
+    move-object v1, v0
 
-    move v2, p2
+    move-object v2, p1
 
-    move v3, p3
+    move v3, p2
 
-    move v4, p4
+    move v4, p3
 
-    move v5, p5
+    move v5, p4
 
-    move v6, p6
+    move v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
+    move v7, p6
 
-    return-object v7
+    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
 
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-object v0
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -267,7 +253,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.smali
index 394aea0e9e..5c57907143 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;
-.super Lf/a/b/o0;
+.super Lf/a/b/q0;
 .source "WidgetVoiceSettingsBottomSheetViewModel.kt"
 
 
@@ -14,7 +14,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/o0<",
+        "Lf/a/b/q0<",
         "Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;",
         ">;"
     }
@@ -51,15 +51,19 @@
         }
     .end annotation
 
+    const-string v0, "storeObservable"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "mediaSettingsStore"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
     const/4 v1, 0x1
 
-    invoke-direct {p0, v0, v1, v0}, Lf/a/b/o0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v0, v1, v0}, Lf/a/b/q0;-><init>(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-wide p1, p0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;->channelId:J
 
@@ -75,6 +79,10 @@
 
     const-class v2, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;
 
+    new-instance v7, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1;
+
+    invoke-direct {v7, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;)V
+
     const/4 v3, 0x0
 
     const/4 v4, 0x0
@@ -83,10 +91,6 @@
 
     const/4 v6, 0x0
 
-    new-instance v7, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1;
-
-    invoke-direct {v7, p0}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$1;-><init>(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel;)V
-
     const/16 v8, 0x1e
 
     const/4 v9, 0x0
@@ -94,20 +98,6 @@
     invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "mediaSettingsStore"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "storeObservable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLrx/Observable;Lcom/discord/stores/StoreMediaSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -138,7 +128,7 @@
 .end method
 
 .method private final handleStoreState(Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState;)V
-    .locals 11
+    .locals 10
 
     instance-of v0, p1, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;
 
@@ -153,124 +143,73 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
     invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->isVideoCall()Z
 
     move-result v0
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    const/4 v1, 0x0
 
-    move-result-object v0
+    const/4 v2, 0x1
 
-    goto :goto_0
-
-    :cond_1
-    move-object v0, v1
-
-    :goto_0
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-nez v0, :cond_4
+    if-nez v0, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
-
     invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getActiveStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
 
     move-result-object v0
 
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v6, 0x0
+
     goto :goto_1
 
     :cond_2
-    move-object v0, v1
+    :goto_0
+    const/4 v6, 0x1
 
     :goto_1
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isVoiceChannel()Z
+
+    move-result v0
+
     if-eqz v0, :cond_3
 
+    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getCanInvite()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    const/4 v7, 0x1
+
     goto :goto_2
 
     :cond_3
     const/4 v7, 0x0
 
-    goto :goto_3
-
-    :cond_4
     :goto_2
-    const/4 v7, 0x1
-
-    :goto_3
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_5
-
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_5
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isVoiceChannel()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    goto :goto_4
-
-    :cond_5
-    move-object v0, v1
-
-    :goto_4
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_7
-
-    invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getCallModel()Lcom/discord/widgets/voice/model/CallModel;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_6
-
-    invoke-virtual {v0}, Lcom/discord/widgets/voice/model/CallModel;->getCanInvite()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v1
-
-    :cond_6
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_7
-
-    const/4 v8, 0x1
-
-    goto :goto_5
-
-    :cond_7
-    const/4 v8, 0x0
-
-    :goto_5
     invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getInNoiseCancellationExperiment()Z
 
-    move-result v9
+    move-result v8
 
     new-instance v0, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;
 
@@ -280,23 +219,23 @@
 
     invoke-virtual {v1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v5
+    move-result-object v4
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getVoiceParticipantsHidden()Z
 
     move-result v1
 
-    xor-int/lit8 v6, v1, 0x1
+    xor-int/lit8 v5, v1, 0x1
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$StoreState$Valid;->getNoiseCancellationEnabled()Z
 
-    move-result v10
+    move-result v9
 
-    move-object v4, v0
+    move-object v3, v0
 
-    invoke-direct/range {v4 .. v10}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
+    invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel$ViewState;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZZZ)V
 
-    invoke-virtual {p0, v0}, Lf/a/b/o0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -340,7 +279,7 @@
 .method public final onToggleVoiceParticipantsHidden()V
     .locals 2
 
-    invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
+    invoke-virtual {p0}, Lf/a/b/q0;->getViewState()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/stream/StreamNavigator.smali b/com.discord/smali_classes2/com/discord/widgets/voice/stream/StreamNavigator.smali
new file mode 100644
index 0000000000..b0abd4dbe3
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/stream/StreamNavigator.smali
@@ -0,0 +1,117 @@
+.class public final Lcom/discord/widgets/voice/stream/StreamNavigator;
+.super Ljava/lang/Object;
+.source "StreamNavigator.kt"
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/voice/stream/StreamNavigator;
+
+.field public static final START_SCREENSHARE_REQUEST_CODE:I = 0x1a4
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/voice/stream/StreamNavigator;
+
+    invoke-direct {v0}, Lcom/discord/widgets/voice/stream/StreamNavigator;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/voice/stream/StreamNavigator;->INSTANCE:Lcom/discord/widgets/voice/stream/StreamNavigator;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final handleActivityResult(IILandroid/content/Intent;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(II",
+            "Landroid/content/Intent;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Landroid/content/Intent;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "intentCallback"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, -0x1
+
+    if-ne p1, v0, :cond_1
+
+    const/16 p1, 0x1a4
+
+    if-ne p0, p1, :cond_1
+
+    if-nez p2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p3, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public static final requestStartStream(Landroidx/fragment/app/Fragment;)V
+    .locals 2
+
+    if-eqz p0, :cond_1
+
+    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    const-string v1, "fragment?.requireContext() ?: return"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "media_projection"
+
+    invoke-virtual {v0, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    check-cast v0, Landroid/media/projection/MediaProjectionManager;
+
+    invoke-virtual {v0}, Landroid/media/projection/MediaProjectionManager;->createScreenCaptureIntent()Landroid/content/Intent;
+
+    move-result-object v0
+
+    const/16 v1, 0x1a4
+
+    invoke-virtual {p0, v0, v1}, Landroidx/fragment/app/Fragment;->startActivityForResult(Landroid/content/Intent;I)V
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    const-string v0, "null cannot be cast to non-null type android.media.projection.MediaProjectionManager"
+
+    invoke-direct {p0, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker$a.smali b/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker$a.smali
index 1c5c1c9d1b..e627995313 100644
--- a/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker$a.smali
+++ b/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker$a.smali
@@ -3,7 +3,7 @@
 .source "BackgroundMessageSendWorker.kt"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Ljava/lang/Boolean;",
         "Ljava/lang/Boolean;",
         ">;"
@@ -66,7 +66,7 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker.smali b/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker.smali
index 2ed09cf994..57b7398543 100644
--- a/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker.smali
+++ b/com.discord/smali_classes2/com/discord/workers/BackgroundMessageSendWorker.smali
@@ -7,29 +7,17 @@
 .method public constructor <init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/work/Worker;-><init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -68,7 +56,7 @@
 
     sget-object v1, Lcom/discord/workers/BackgroundMessageSendWorker$a;->d:Lcom/discord/workers/BackgroundMessageSendWorker$a;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->w(Ls0/k/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -78,11 +66,11 @@
 
     move-result-object v0
 
-    new-instance v1, Lr0/m/b;
+    new-instance v1, Ls0/m/b;
 
-    invoke-direct {v1, v0}, Lr0/m/b;-><init>(Lrx/Observable;)V
+    invoke-direct {v1, v0}, Ls0/m/b;-><init>(Lrx/Observable;)V
 
-    invoke-virtual {v1}, Lr0/m/b;->a()Ljava/lang/Object;
+    invoke-virtual {v1}, Ls0/m/b;->a()Ljava/lang/Object;
 
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->success()Landroidx/work/ListenableWorker$Result;
 
@@ -90,7 +78,7 @@
 
     const-string v1, "Result.success()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -101,7 +89,7 @@
 
     const-string v1, "Result.failure()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/workers/CallActionWorker.smali b/com.discord/smali_classes2/com/discord/workers/CallActionWorker.smali
index 95c986f78e..074e17b5ac 100644
--- a/com.discord/smali_classes2/com/discord/workers/CallActionWorker.smali
+++ b/com.discord/smali_classes2/com/discord/workers/CallActionWorker.smali
@@ -7,103 +7,220 @@
 .method public constructor <init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/work/Worker;-><init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public doWork()Landroidx/work/ListenableWorker$Result;
-    .locals 16
+    .locals 15
 
-    const-class v1, Lcom/discord/workers/CallActionWorker;
+    const-class v0, Lcom/discord/workers/CallActionWorker;
 
-    sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v8, "javaClass.simpleName"
+    const-string v7, "javaClass.simpleName"
 
-    invoke-static {v3, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v3, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
 
     const-string v4, "Starting for ["
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
 
     move-result-object v4
 
     const-string v5, "inputData"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroidx/work/Data;->getKeyValueMap()Ljava/util/Map;
 
     move-result-object v4
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     const/16 v4, 0x5d
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/4 v6, 0x4
+    const/4 v5, 0x4
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+    sget-object v1, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
-    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->isAuthed()Z
+    invoke-virtual {v1}, Lcom/discord/utilities/fcm/NotificationClient;->isAuthed()Z
 
-    move-result v0
+    move-result v1
 
-    const-string v2, "Result.failure()"
+    if-nez v1, :cond_0
 
-    if-nez v0, :cond_0
+    sget-object v8, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-static {v9, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x4
+
+    const/4 v13, 0x0
+
+    const-string v10, "Not authenticated. Aborting job request."
+
+    invoke-static/range {v8 .. v13}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+
+    invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
+
+    move-result-object v0
+
+    const-string v1, "Result.failure()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_0
+    sget-object v1, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
+
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const-string v3, "applicationContext"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x2
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v4, v3, v4}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected$default(Lcom/discord/utilities/io/NetworkUtils;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    invoke-static {}, Landroidx/work/ListenableWorker$Result;->retry()Landroidx/work/ListenableWorker$Result;
+
+    move-result-object v0
+
+    const-string v1, "Result.retry()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_1
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
+
+    move-result-object v1
+
+    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+
+    const-wide/16 v5, -0x1
+
+    invoke-virtual {v1, v2, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+
+    move-result-wide v1
+
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
+
+    move-result-object v3
+
+    const-string v8, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
+
+    invoke-virtual {v3, v8, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+
+    move-result-wide v5
+
+    const/16 v3, 0x2d
+
+    :try_start_0
+    sget-object v8, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v8}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v8
+
+    const/4 v13, 0x0
+
+    move-wide v9, v1
+
+    move-wide v11, v5
+
+    invoke-virtual/range {v8 .. v13}, Lcom/discord/utilities/rest/RestAPI;->stopRinging(JJLjava/util/List;)Lrx/Observable;
+
+    move-result-object v8
+
+    if-eqz v8, :cond_2
+
+    new-instance v4, Ls0/m/b;
+
+    invoke-direct {v4, v8}, Ls0/m/b;-><init>(Lrx/Observable;)V
+
+    invoke-virtual {v4}, Ls0/m/b;->a()Ljava/lang/Object;
 
     sget-object v9, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
     move-result-object v10
 
-    invoke-static {v10, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v8, "Call declined: "
+
+    invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v5, v6}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v11
 
     const/4 v12, 0x0
 
@@ -111,199 +228,55 @@
 
     const/4 v14, 0x0
 
-    const-string v11, "Not authenticated. Aborting job request."
-
     invoke-static/range {v9 .. v14}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
-
-    move-result-object v0
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_0
-    sget-object v0, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
-
-    move-result-object v3
-
-    const-string v4, "applicationContext"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v3}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;)Z
-
-    move-result v0
-
-    const-string v3, "Result.retry()"
-
-    if-nez v0, :cond_1
-
-    invoke-static {}, Landroidx/work/ListenableWorker$Result;->retry()Landroidx/work/ListenableWorker$Result;
-
-    move-result-object v0
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_1
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
-
-    move-result-object v0
-
-    const-string v4, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
-
-    const-wide/16 v5, -0x1
-
-    invoke-virtual {v0, v4, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
-
-    move-result-wide v14
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
-
-    move-result-object v0
-
-    const-string v4, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
-
-    invoke-virtual {v0, v4, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
-
-    move-result-wide v4
-
-    :try_start_0
-    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v9
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    const/4 v0, 0x0
-
-    move-wide v10, v14
-
-    move-wide v12, v4
-
-    move-wide v6, v14
-
-    move-object v14, v0
-
-    :try_start_1
-    invoke-virtual/range {v9 .. v14}, Lcom/discord/utilities/rest/RestAPI;->stopRinging(JJLjava/util/List;)Lrx/Observable;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    new-instance v9, Lr0/m/b;
-
-    invoke-direct {v9, v0}, Lr0/m/b;-><init>(Lrx/Observable;)V
-
-    invoke-virtual {v9}, Lr0/m/b;->a()Ljava/lang/Object;
-
-    sget-object v10, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
-    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-static {v11, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v9, "Call declined: "
-
-    invoke-virtual {v0, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const/16 v9, 0x2d
-
-    invoke-virtual {v0, v9}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v12
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x4
-
-    const/4 v15, 0x0
-
-    invoke-static/range {v10 .. v15}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
-
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->success()Landroidx/work/ListenableWorker$Result;
 
-    move-result-object v0
+    move-result-object v4
 
-    const-string v9, "Result.success()"
+    const-string v8, "Result.success()"
 
-    invoke-static {v0, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_1
 
     :cond_2
-    const/4 v0, 0x0
-
-    throw v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+    throw v4
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :catchall_0
-    move-exception v0
+    move-exception v4
 
-    goto :goto_0
+    sget-object v8, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    :catchall_1
-    move-exception v0
+    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
-    move-wide v6, v14
+    move-result-object v0
 
-    :goto_0
-    sget-object v9, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    new-instance v7, Ljava/lang/StringBuilder;
+
+    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v9, "Call declined failure: "
+
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v5, v6}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v8, v0, v1, v4}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    new-instance v8, Ljava/lang/StringBuilder;
-
-    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v10, "Call declined failure: "
-
-    invoke-virtual {v8, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v8, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const/16 v6, 0x2d
-
-    invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v8, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {v9, v1, v4, v0}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getRunAttemptCount()I
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getRunAttemptCount()I
 
     move-result v0
 
@@ -315,17 +288,20 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :goto_0
+    move-object v4, v0
+
+    const-string v0, "if (runAttemptCount < MA\u2026y() else Result.failure()"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
-    return-object v0
+    return-object v4
 .end method
diff --git a/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali b/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali
index c201131aab..eb13d09270 100644
--- a/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali
+++ b/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali
@@ -7,103 +7,230 @@
 .method public constructor <init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/work/Worker;-><init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public doWork()Landroidx/work/ListenableWorker$Result;
-    .locals 22
+    .locals 15
 
-    const-class v1, Lcom/discord/workers/MessageAckWorker;
+    const-class v0, Lcom/discord/workers/MessageAckWorker;
 
-    sget-object v2, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
 
-    const-string v8, "javaClass.simpleName"
+    const-string v7, "javaClass.simpleName"
 
-    invoke-static {v3, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v3, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
 
     const-string v4, "Starting for ["
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
 
     move-result-object v4
 
     const-string v5, "inputData"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroidx/work/Data;->getKeyValueMap()Ljava/util/Map;
 
     move-result-object v4
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     const/16 v4, 0x5d
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v3
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/4 v6, 0x4
+    const/4 v5, 0x4
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
+    sget-object v1, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
-    invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->isAuthed()Z
+    invoke-virtual {v1}, Lcom/discord/utilities/fcm/NotificationClient;->isAuthed()Z
 
-    move-result v0
+    move-result v1
 
-    const-string v2, "Result.failure()"
+    if-nez v1, :cond_0
 
-    if-nez v0, :cond_0
+    sget-object v8, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-static {v9, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x4
+
+    const/4 v13, 0x0
+
+    const-string v10, "Not authenticated. Aborting job request."
+
+    invoke-static/range {v8 .. v13}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+
+    invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
+
+    move-result-object v0
+
+    const-string v1, "Result.failure()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_0
+    sget-object v1, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
+
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const-string v3, "applicationContext"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x2
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v4, v3, v4}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected$default(Lcom/discord/utilities/io/NetworkUtils;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    invoke-static {}, Landroidx/work/ListenableWorker$Result;->retry()Landroidx/work/ListenableWorker$Result;
+
+    move-result-object v0
+
+    const-string v1, "Result.retry()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_1
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
+
+    move-result-object v1
+
+    const-string v2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+
+    const-wide/16 v5, -0x1
+
+    invoke-virtual {v1, v2, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+
+    move-result-wide v1
+
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
+
+    move-result-object v3
+
+    const-string v8, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
+
+    invoke-virtual {v3, v8, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+
+    move-result-wide v5
+
+    const/16 v3, 0x2d
+
+    :try_start_0
+    sget-object v8, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v8}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v8
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v9
+
+    new-instance v10, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;
+
+    sget-object v11, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    const/4 v12, 0x0
+
+    invoke-static {v12}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v12
+
+    invoke-direct {v10, v11, v12}, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;-><init>(Ljava/lang/Boolean;Ljava/lang/Integer;)V
+
+    invoke-virtual {v8, v1, v2, v9, v10}, Lcom/discord/utilities/rest/RestAPI;->postChannelMessagesAck(JLjava/lang/Long;Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;)Lrx/Observable;
+
+    move-result-object v8
+
+    if-eqz v8, :cond_2
+
+    new-instance v4, Ls0/m/b;
+
+    invoke-direct {v4, v8}, Ls0/m/b;-><init>(Lrx/Observable;)V
+
+    invoke-virtual {v4}, Ls0/m/b;->a()Ljava/lang/Object;
 
     sget-object v9, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
     move-result-object v10
 
-    invoke-static {v10, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v8, "Marked as read: "
+
+    invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v5, v6}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v11
 
     const/4 v12, 0x0
 
@@ -111,249 +238,79 @@
 
     const/4 v14, 0x0
 
-    const-string v11, "Not authenticated. Aborting job request."
-
     invoke-static/range {v9 .. v14}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
+    sget-object v8, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
-    move-result-object v0
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_0
-    sget-object v0, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
-
-    move-result-object v3
-
-    const-string v4, "applicationContext"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v3}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;)Z
-
-    move-result v0
-
-    const-string v3, "Result.retry()"
-
-    if-nez v0, :cond_1
-
-    invoke-static {}, Landroidx/work/ListenableWorker$Result;->retry()Landroidx/work/ListenableWorker$Result;
-
-    move-result-object v0
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_1
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
-
-    move-result-object v0
-
-    const-string v4, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
-
-    const-wide/16 v5, -0x1
-
-    invoke-virtual {v0, v4, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
-
-    move-result-wide v14
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
-
-    move-result-object v0
-
-    const-string v4, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
-
-    invoke-virtual {v0, v4, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
-
-    move-result-wide v4
-
-    const/16 v6, 0x2d
-
-    :try_start_0
-    sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v0
-
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v7
-
-    new-instance v9, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;
-
-    sget-object v10, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    const/4 v11, 0x0
-
-    invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
 
     move-result-object v11
 
-    invoke-direct {v9, v10, v11}, Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;-><init>(Ljava/lang/Boolean;Ljava/lang/Integer;)V
+    const/4 v12, 0x0
 
-    invoke-virtual {v0, v14, v15, v7, v9}, Lcom/discord/utilities/rest/RestAPI;->postChannelMessagesAck(JLjava/lang/Long;Lcom/discord/restapi/RestAPIParams$ChannelMessagesAck;)Lrx/Observable;
+    const/4 v13, 0x4
 
-    move-result-object v0
+    const/4 v14, 0x0
 
-    if-eqz v0, :cond_2
+    move-wide v9, v1
 
-    new-instance v7, Lr0/m/b;
+    invoke-static/range {v8 .. v14}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
 
-    invoke-direct {v7, v0}, Lr0/m/b;-><init>(Lrx/Observable;)V
+    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v7}, Lr0/m/b;->a()Ljava/lang/Object;
+    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics;
 
-    sget-object v16, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v4, v1, v2}, Lcom/discord/stores/StoreAnalytics;->ackMessage(J)V
 
-    move-result-object v0
+    invoke-static {}, Landroidx/work/ListenableWorker$Result;->success()Landroidx/work/ListenableWorker$Result;
+
+    move-result-object v4
+
+    const-string v8, "Result.success()"
+
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_2
+    throw v4
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :catchall_0
+    move-exception v4
+
+    sget-object v8, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v0, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v7, Ljava/lang/StringBuilder;
 
     invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v9, "Marked as read: "
+    const-string v9, "Marked as read failure: "
 
     invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v7, v14, v15}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v7, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v5, v6}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v18
-
-    const/16 v19, 0x0
-
-    const/16 v20, 0x4
-
-    const/16 v21, 0x0
-
-    move-object/from16 v17, v0
-
-    invoke-static/range {v16 .. v21}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
-
-    sget-object v9, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
-
-    move-result-object v12
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    const/4 v13, 0x0
-
-    const/4 v0, 0x4
-
-    const/4 v7, 0x0
-
-    move-wide v10, v14
-
-    move-object/from16 v17, v2
-
-    move-object/from16 v16, v3
-
-    move-wide v2, v14
-
-    move v14, v0
-
-    move-object v15, v7
-
-    :try_start_1
-    invoke-static/range {v9 .. v15}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
-
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v2, v3}, Lcom/discord/stores/StoreAnalytics;->ackMessage(J)V
-
-    invoke-static {}, Landroidx/work/ListenableWorker$Result;->success()Landroidx/work/ListenableWorker$Result;
-
-    move-result-object v0
-
-    const-string v7, "Result.success()"
-
-    invoke-static {v0, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_0
-
-    :cond_2
-    move-object/from16 v17, v2
-
-    move-object/from16 v16, v3
-
-    move-wide v2, v14
-
-    const/4 v0, 0x0
-
-    throw v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_1
-    move-exception v0
-
-    move-object/from16 v17, v2
-
-    move-object/from16 v16, v3
-
-    move-wide v2, v14
-
-    :goto_0
-    sget-object v7, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
     move-result-object v1
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v8, v0, v1, v4}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    new-instance v8, Ljava/lang/StringBuilder;
-
-    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v9, "Marked as read failure: "
-
-    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v8, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v8, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v7, v1, v2, v0}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getRunAttemptCount()I
+    invoke-virtual {p0}, Landroidx/work/ListenableWorker;->getRunAttemptCount()I
 
     move-result v0
 
@@ -365,20 +322,20 @@
 
     move-result-object v0
 
-    move-object/from16 v1, v16
-
-    goto :goto_1
+    goto :goto_0
 
     :cond_3
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
 
     move-result-object v0
 
-    move-object/from16 v1, v17
+    :goto_0
+    move-object v4, v0
+
+    const-string v0, "if (runAttemptCount < MA\u2026y() else Result.failure()"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_1
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_2
-    return-object v0
+    return-object v4
 .end method
diff --git a/com.discord/smali_classes2/com/discord/workers/MessageSendWorker$b.smali b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker$b.smali
index ada74a6a86..71d862f611 100644
--- a/com.discord/smali_classes2/com/discord/workers/MessageSendWorker$b.smali
+++ b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/discord/workers/MessageSendWorker$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "MessageSendWorker.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -47,7 +47,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     const-string p1, "applicationContext"
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v2, p0, Lcom/discord/workers/MessageSendWorker$b;->$channelId:J
 
diff --git a/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali
index 5f9608958b..d343312335 100644
--- a/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali
+++ b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali
@@ -33,35 +33,23 @@
 .method public constructor <init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/work/Worker;-><init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public doWork()Landroidx/work/ListenableWorker$Result;
-    .locals 20
+    .locals 21
 
     const-class v1, Lcom/discord/workers/MessageSendWorker;
 
@@ -73,7 +61,7 @@
 
     const-string v8, "javaClass.simpleName"
 
-    invoke-static {v3, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -89,7 +77,7 @@
 
     const-string v5, "inputData"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Landroidx/work/Data;->getKeyValueMap()Ljava/util/Map;
 
@@ -129,7 +117,7 @@
 
     move-result-object v10
 
-    invoke-static {v10, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v12, 0x0
 
@@ -145,7 +133,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -158,9 +146,13 @@
 
     const-string v4, "applicationContext"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v3}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;)Z
+    const/4 v5, 0x2
+
+    const/4 v6, 0x0
+
+    invoke-static {v0, v3, v6, v5, v6}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected$default(Lcom/discord/utilities/io/NetworkUtils;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Z
 
     move-result v0
 
@@ -180,7 +172,7 @@
 
     const-string v1, "Result.retry()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -189,7 +181,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     return-object v0
@@ -201,11 +193,11 @@
 
     const-string v3, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    const-wide/16 v5, -0x1
+    const-wide/16 v9, -0x1
 
-    invoke-virtual {v0, v3, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+    invoke-virtual {v0, v3, v9, v10}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
 
-    move-result-wide v9
+    move-result-wide v11
 
     invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
 
@@ -231,41 +223,41 @@
 
     move-result-object v0
 
-    const-string v7, "MESSAGE_CONTENT"
+    const-string v5, "MESSAGE_CONTENT"
 
-    invoke-virtual {v0, v7}, Landroidx/work/Data;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v5}, Landroidx/work/Data;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v12
+    move-result-object v14
 
     const-string v0, "Result.success()"
 
-    if-eqz v12, :cond_8
+    if-eqz v14, :cond_8
 
     invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
 
-    move-result-object v7
+    move-result-object v5
 
-    const-string v11, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
+    const-string v7, "com.discord.intent.extra.EXTRA_MESSAGE_ID"
 
-    invoke-virtual {v7, v11}, Landroidx/work/Data;->getString(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v5, v7}, Landroidx/work/Data;->getString(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v13
+    move-result-object v15
 
     invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getInputData()Landroidx/work/Data;
 
-    move-result-object v7
+    move-result-object v5
 
-    const-string v11, "com.discord.intent.extra.EXTRA_DSTI_ID"
+    const-string v7, "com.discord.intent.extra.EXTRA_DSTI_ID"
 
-    invoke-virtual {v7, v11, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+    invoke-virtual {v5, v7, v9, v10}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
 
-    move-result-wide v14
+    move-result-wide v16
 
-    cmp-long v11, v14, v5
+    cmp-long v5, v16, v9
 
-    if-eqz v11, :cond_4
+    if-eqz v5, :cond_4
 
-    invoke-static {v14, v15}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static/range {v16 .. v17}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v5
 
@@ -273,72 +265,64 @@
 
     move-result-object v5
 
-    move-object/from16 v16, v5
+    move-object/from16 v18, v5
 
     goto :goto_2
 
     :cond_4
-    const/16 v16, 0x0
+    move-object/from16 v18, v6
 
     :goto_2
     const/4 v5, 0x0
 
     :try_start_0
-    sget-object v6, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+    sget-object v7, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
 
-    invoke-virtual {v6}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-virtual {v7}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
 
-    move-result-object v6
+    move-result-object v7
 
-    new-instance v15, Lcom/discord/restapi/RestAPIParams$Message;
-
-    const/4 v14, 0x0
-
-    const/16 v17, 0x0
-
-    const/16 v18, 0xc
-
-    const/16 v19, 0x0
-
-    move-object v11, v15
-
-    move-object v7, v15
-
-    move-object/from16 v15, v17
-
-    move/from16 v17, v18
-
-    move-object/from16 v18, v19
-
-    invoke-direct/range {v11 .. v18}, Lcom/discord/restapi/RestAPIParams$Message;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Lcom/discord/restapi/RestAPIParams$Message$Activity;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v6, v9, v10, v7}, Lcom/discord/utilities/rest/RestAPI;->sendMessage(JLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
-
-    move-result-object v6
-
-    invoke-static {v6, v5}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
-
-    move-result-object v11
-
-    const-wide/16 v12, 0x0
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x3
+    new-instance v9, Lcom/discord/restapi/RestAPIParams$Message;
 
     const/16 v16, 0x0
 
-    invoke-static/range {v11 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+    const/16 v17, 0x0
 
-    move-result-object v6
+    const/16 v19, 0xc
 
-    if-eqz v6, :cond_7
+    const/16 v20, 0x0
 
-    new-instance v7, Lr0/m/b;
+    move-object v13, v9
 
-    invoke-direct {v7, v6}, Lr0/m/b;-><init>(Lrx/Observable;)V
+    invoke-direct/range {v13 .. v20}, Lcom/discord/restapi/RestAPIParams$Message;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Lcom/discord/restapi/RestAPIParams$Message$Activity;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    invoke-virtual {v7}, Lr0/m/b;->a()Ljava/lang/Object;
+    invoke-virtual {v7, v11, v12, v9}, Lcom/discord/utilities/rest/RestAPI;->sendMessage(JLcom/discord/restapi/RestAPIParams$Message;)Lrx/Observable;
+
+    move-result-object v7
+
+    invoke-static {v7, v5}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn(Lrx/Observable;Z)Lrx/Observable;
+
+    move-result-object v13
+
+    const-wide/16 v14, 0x0
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0x3
+
+    const/16 v18, 0x0
+
+    invoke-static/range {v13 .. v18}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_7
+
+    new-instance v6, Ls0/m/b;
+
+    invoke-direct {v6, v7}, Ls0/m/b;-><init>(Lrx/Observable;)V
+
+    invoke-virtual {v6}, Ls0/m/b;->a()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -346,7 +330,7 @@
 
     sget-object v7, Lcom/discord/utilities/fcm/NotificationCache;->INSTANCE:Lcom/discord/utilities/fcm/NotificationCache;
 
-    invoke-virtual {v7, v9, v10}, Lcom/discord/utilities/fcm/NotificationCache;->get(J)Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;
+    invoke-virtual {v7, v11, v12}, Lcom/discord/utilities/fcm/NotificationCache;->get(J)Lcom/discord/utilities/fcm/NotificationData$DisplayPayload;
 
     move-result-object v7
 
@@ -356,7 +340,7 @@
 
     move-result-object v7
 
-    invoke-static {v7}, Lj0/i/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
+    invoke-static {v7}, Lk0/j/l;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
 
     move-result-object v7
 
@@ -364,21 +348,21 @@
 
     if-eqz v7, :cond_5
 
-    const-string v11, "message"
+    const-string v9, "message"
 
-    invoke-static {v6, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v7, v6}, Lcom/discord/utilities/fcm/NotificationData;->copyForDirectReply(Lcom/discord/models/domain/ModelMessage;)Lcom/discord/utilities/fcm/NotificationData;
 
     move-result-object v7
 
-    sget-object v11, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
+    sget-object v9, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer;
 
     invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
 
-    move-result-object v12
+    move-result-object v10
 
-    invoke-static {v12, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v4, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
@@ -386,7 +370,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v11, v12, v7, v4}, Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
+    invoke-virtual {v9, v10, v7, v4}, Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V
 
     sget-object v13, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
@@ -398,7 +382,7 @@
 
     move-result-object v14
 
-    invoke-static {v14, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -408,7 +392,7 @@
 
     invoke-virtual {v4, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v4, v9, v10}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v4, v11, v12}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     const/16 v7, 0x2d
 
@@ -438,13 +422,13 @@
 
     move-result-object v4
 
-    invoke-virtual {v4, v9, v10}, Lcom/discord/stores/StoreAnalytics;->ackMessage(J)V
+    invoke-virtual {v4, v11, v12}, Lcom/discord/stores/StoreAnalytics;->ackMessage(J)V
 
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->success()Landroidx/work/ListenableWorker$Result;
 
     move-result-object v4
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, v4
 
@@ -457,7 +441,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -466,14 +450,12 @@
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
     :cond_7
-    const/4 v0, 0x0
-
-    throw v0
+    throw v6
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -486,7 +468,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -496,7 +478,7 @@
 
     invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6, v9, v10}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v6, v11, v12}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
     invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -510,15 +492,15 @@
 
     move-object/from16 v4, p0
 
-    invoke-direct {v1, v4, v9, v10, v3}, Lcom/discord/workers/MessageSendWorker$b;-><init>(Lcom/discord/workers/MessageSendWorker;JLjava/lang/String;)V
+    invoke-direct {v1, v4, v11, v12, v3}, Lcom/discord/workers/MessageSendWorker$b;-><init>(Lcom/discord/workers/MessageSendWorker;JLjava/lang/String;)V
 
-    invoke-virtual {v0, v9, v10, v5, v1}, Lcom/discord/utilities/fcm/NotificationCache;->remove(JZLkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v0, v11, v12, v5, v1}, Lcom/discord/utilities/fcm/NotificationCache;->remove(JZLkotlin/jvm/functions/Function1;)V
 
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
 
     move-result-object v0
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_3
     return-object v0
@@ -530,7 +512,7 @@
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/workers/TimedMuteWorker.smali b/com.discord/smali_classes2/com/discord/workers/TimedMuteWorker.smali
index c1ff80814e..b42522070b 100644
--- a/com.discord/smali_classes2/com/discord/workers/TimedMuteWorker.smali
+++ b/com.discord/smali_classes2/com/discord/workers/TimedMuteWorker.smali
@@ -11,11 +11,13 @@
 .method public constructor <init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "params"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/work/Worker;-><init>(Landroid/content/Context;Landroidx/work/WorkerParameters;)V
 
@@ -26,26 +28,12 @@
     iput-object p1, p0, Lcom/discord/workers/TimedMuteWorker;->a:Lcom/discord/utilities/time/Clock;
 
     return-void
-
-    :cond_0
-    const-string p1, "params"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
 # virtual methods
 .method public doWork()Landroidx/work/ListenableWorker$Result;
-    .locals 22
+    .locals 21
 
     const-string v1, " until "
 
@@ -59,7 +47,7 @@
 
     const-string v9, "javaClass.simpleName"
 
-    invoke-static {v4, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -75,7 +63,7 @@
 
     const-string v6, "inputData"
 
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Landroidx/work/Data;->getKeyValueMap()Ljava/util/Map;
 
@@ -115,7 +103,7 @@
 
     move-result-object v11
 
-    invoke-static {v11, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v13, 0x0
 
@@ -131,7 +119,7 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -144,21 +132,25 @@
 
     const-string v5, "applicationContext"
 
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, v4}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;)Z
+    const/4 v5, 0x0
+
+    const/4 v6, 0x2
+
+    invoke-static {v0, v4, v5, v6, v5}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected$default(Lcom/discord/utilities/io/NetworkUtils;Landroid/content/Context;Landroid/content/Intent;ILjava/lang/Object;)Z
 
     move-result v0
 
-    const-string v4, "Result.retry()"
-
     if-nez v0, :cond_1
 
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->retry()Landroidx/work/ListenableWorker$Result;
 
     move-result-object v0
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "Result.retry()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -167,11 +159,11 @@
 
     move-result-object v0
 
-    const-string v5, "com.discord.intent.extra.EXTRA_GUILD_ID"
+    const-string v4, "com.discord.intent.extra.EXTRA_GUILD_ID"
 
-    const-wide/16 v6, -0x1
+    const-wide/16 v7, -0x1
 
-    invoke-virtual {v0, v5, v6, v7}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+    invoke-virtual {v0, v4, v7, v8}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
 
     move-result-wide v10
 
@@ -179,9 +171,9 @@
 
     move-result-object v0
 
-    const-string v5, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
+    const-string v4, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
-    invoke-virtual {v0, v5, v6, v7}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+    invoke-virtual {v0, v4, v7, v8}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
 
     move-result-wide v13
 
@@ -189,16 +181,14 @@
 
     move-result-object v0
 
-    const-wide/16 v6, 0x0
+    const-wide/16 v5, 0x0
 
-    const-string v5, "com.discord.intent.extra.EXTRA_UNTIL_TIMESTAMP_MS"
+    const-string v15, "com.discord.intent.extra.EXTRA_UNTIL_TIMESTAMP_MS"
 
-    invoke-virtual {v0, v5, v6, v7}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
+    invoke-virtual {v0, v15, v5, v6}, Landroidx/work/Data;->getLong(Ljava/lang/String;J)J
 
     move-result-wide v5
 
-    const-wide/16 v7, -0x1
-
     cmp-long v0, v10, v7
 
     if-eqz v0, :cond_6
@@ -220,40 +210,40 @@
 
     const-string v0, "Result.success()"
 
-    cmp-long v8, v15, v5
+    cmp-long v3, v15, v5
 
-    if-lez v8, :cond_3
+    if-lez v3, :cond_3
 
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->success()Landroidx/work/ListenableWorker$Result;
 
     move-result-object v1
 
-    invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v1
 
     :cond_3
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v5
+    move-result-object v3
 
-    const/4 v6, 0x2
+    const/4 v4, 0x2
 
-    const/4 v8, 0x0
+    const/4 v5, 0x0
 
-    invoke-static {v5, v8, v6, v8}, Lcom/discord/utilities/time/TimeUtils;->toUTCDateTime$default(Ljava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+    invoke-static {v3, v5, v4, v5}, Lcom/discord/utilities/time/TimeUtils;->toUTCDateTime$default(Ljava/lang/Long;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v3
 
-    new-instance v6, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
+    new-instance v5, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;
 
-    new-instance v12, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;
+    new-instance v6, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;
 
     sget-object v16, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v15, Lcom/discord/models/domain/ModelMuteConfig;
+    new-instance v8, Lcom/discord/models/domain/ModelMuteConfig;
 
-    invoke-direct {v15, v5}, Lcom/discord/models/domain/ModelMuteConfig;-><init>(Ljava/lang/String;)V
+    invoke-direct {v8, v3}, Lcom/discord/models/domain/ModelMuteConfig;-><init>(Ljava/lang/String;)V
 
     const/16 v18, 0x0
 
@@ -261,88 +251,88 @@
 
     const/16 v20, 0x0
 
-    move-object/from16 v17, v15
-
-    move-object v15, v12
-
-    invoke-direct/range {v15 .. v20}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;-><init>(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-direct {v6, v13, v14, v12}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
-
-    :try_start_0
-    sget-object v12, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
-
-    invoke-virtual {v12}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v12
-
-    invoke-virtual {v12, v10, v11, v6}, Lcom/discord/utilities/rest/RestAPI;->updateUserGuildSettings(JLcom/discord/restapi/RestAPIParams$UserGuildSettings;)Lrx/Observable;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_4
-
-    new-instance v8, Lr0/m/b;
-
-    invoke-direct {v8, v6}, Lr0/m/b;-><init>(Lrx/Observable;)V
-
-    invoke-virtual {v8}, Lr0/m/b;->a()Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Lcom/discord/models/domain/ModelNotificationSettings;
-
-    sget-object v16, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
-    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v8
-
-    invoke-virtual {v8}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v12, Ljava/lang/StringBuilder;
-
-    invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v15, "Muted: "
-
-    invoke-virtual {v12, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12, v10, v11}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const/16 v15, 0x2d
-
-    invoke-virtual {v12, v15}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v18
-
-    const/16 v19, 0x0
-
-    const/16 v20, 0x4
-
-    const/16 v21, 0x0
+    move-object v15, v6
 
     move-object/from16 v17, v8
 
-    invoke-static/range {v16 .. v21}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+    invoke-direct/range {v15 .. v20}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;-><init>(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-direct {v5, v13, v14, v6}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
+
+    const/16 v6, 0x2d
+
+    :try_start_0
+    sget-object v8, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+
+    invoke-virtual {v8}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+
+    move-result-object v8
+
+    invoke-virtual {v8, v10, v11, v5}, Lcom/discord/utilities/rest/RestAPI;->updateUserGuildSettings(JLcom/discord/restapi/RestAPIParams$UserGuildSettings;)Lrx/Observable;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_4
+
+    new-instance v4, Ls0/m/b;
+
+    invoke-direct {v4, v5}, Ls0/m/b;-><init>(Lrx/Observable;)V
+
+    invoke-virtual {v4}, Ls0/m/b;->a()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/discord/models/domain/ModelNotificationSettings;
+
+    sget-object v15, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-static {v5, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Ljava/lang/StringBuilder;
+
+    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v12, "Muted: "
+
+    invoke-virtual {v8, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v8, v10, v11}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v8, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v17
+
+    const/16 v18, 0x0
+
+    const/16 v19, 0x4
+
+    const/16 v20, 0x0
+
+    move-object/from16 v16, v5
+
+    invoke-static/range {v15 .. v20}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
     sget-object v12, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient;
 
     invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getApplicationContext()Landroid/content/Context;
 
-    move-result-object v8
+    move-result-object v15
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
@@ -354,34 +344,30 @@
 
     move-wide/from16 v19, v13
 
-    const/16 v7, 0x2d
-
-    move-object v15, v8
-
     :try_start_1
     invoke-static/range {v12 .. v18}, Lcom/discord/utilities/fcm/NotificationClient;->clear$default(Lcom/discord/utilities/fcm/NotificationClient;JLandroid/content/Context;ZILjava/lang/Object;)V
 
-    sget-object v8, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v8}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics;
+    invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics;
 
-    move-result-object v8
+    move-result-object v5
 
-    const-string v12, "notifSettings"
+    const-string v8, "notifSettings"
 
-    invoke-static {v6, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {v19 .. v20}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v12
+    move-result-object v8
 
-    invoke-virtual {v8, v6, v12}, Lcom/discord/stores/StoreAnalytics;->onNotificationSettingsUpdated(Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Long;)V
+    invoke-virtual {v5, v4, v8}, Lcom/discord/stores/StoreAnalytics;->onNotificationSettingsUpdated(Lcom/discord/models/domain/ModelNotificationSettings;Ljava/lang/Long;)V
 
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->success()Landroidx/work/ListenableWorker$Result;
 
-    move-result-object v6
+    move-result-object v4
 
-    invoke-static {v6, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -393,9 +379,9 @@
     :cond_4
     move-wide/from16 v19, v13
 
-    const/16 v7, 0x2d
+    const/4 v0, 0x0
 
-    throw v8
+    throw v0
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -404,42 +390,40 @@
 
     move-wide/from16 v19, v13
 
-    const/16 v7, 0x2d
-
     :goto_0
-    sget-object v6, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
 
     invoke-virtual {v2}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-static {v2, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v8, Ljava/lang/StringBuilder;
+    new-instance v5, Ljava/lang/StringBuilder;
 
-    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v9, "Mute failure: "
+    const-string v8, "Mute failure: "
 
-    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8, v10, v11}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v10, v11}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    move-wide/from16 v9, v19
+    move-wide/from16 v8, v19
 
-    invoke-virtual {v8, v9, v10}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v8, v9}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v5, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v6, v2, v1, v0}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    invoke-virtual {v4, v2, v1, v0}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/work/ListenableWorker;->getRunAttemptCount()I
 
@@ -453,8 +437,6 @@
 
     move-result-object v0
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     goto :goto_1
 
     :cond_5
@@ -462,21 +444,25 @@
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     :goto_1
-    move-object v6, v0
+    move-object v4, v0
+
+    const-string v0, "if (runAttemptCount < MA\u2026y() else Result.failure()"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_2
-    return-object v6
+    return-object v4
 
     :cond_6
     :goto_3
+    move-object/from16 v7, p0
+
     invoke-static {}, Landroidx/work/ListenableWorker$Result;->failure()Landroidx/work/ListenableWorker$Result;
 
     move-result-object v0
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
index 4e218ada3f..a84d76cbd0 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$1.smali
@@ -3,12 +3,12 @@
 .source "Kryo.java"
 
 # interfaces
-.implements Lp0/b/a/a;
+.implements Lq0/b/a/a;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->newInstantiatorOf(Ljava/lang/Class;)Lp0/b/a/a;
+    value = Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->newInstantiatorOf(Ljava/lang/Class;)Lq0/b/a/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
index c48c6f5679..28b34ffbf5 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy$2.smali
@@ -3,12 +3,12 @@
 .source "Kryo.java"
 
 # interfaces
-.implements Lp0/b/a/a;
+.implements Lq0/b/a/a;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->newInstantiatorOf(Ljava/lang/Class;)Lp0/b/a/a;
+    value = Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->newInstantiatorOf(Ljava/lang/Class;)Lq0/b/a/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
index ff4addeacd..376796ccbc 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy.smali
@@ -3,7 +3,7 @@
 .source "Kryo.java"
 
 # interfaces
-.implements Lp0/b/b/a;
+.implements Lq0/b/b/a;
 
 
 # annotations
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field public fallbackStrategy:Lp0/b/b/a;
+.field public fallbackStrategy:Lq0/b/b/a;
 
 
 # direct methods
@@ -30,27 +30,27 @@
     return-void
 .end method
 
-.method public constructor <init>(Lp0/b/b/a;)V
+.method public constructor <init>(Lq0/b/b/a;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lp0/b/b/a;
+    iput-object p1, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lq0/b/b/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public getFallbackInstantiatorStrategy()Lp0/b/b/a;
+.method public getFallbackInstantiatorStrategy()Lq0/b/b/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lp0/b/b/a;
+    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lq0/b/b/a;
 
     return-object v0
 .end method
 
-.method public newInstantiatorOf(Ljava/lang/Class;)Lp0/b/a/a;
+.method public newInstantiatorOf(Ljava/lang/Class;)Lq0/b/a/a;
     .locals 4
 
     sget-boolean v0, Lcom/esotericsoftware/kryo/util/Util;->IS_ANDROID:Z
@@ -137,7 +137,7 @@
     :catch_2
     nop
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lp0/b/b/a;
+    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lq0/b/b/a;
 
     if-nez v0, :cond_5
 
@@ -224,7 +224,7 @@
 
     const-string v3, "\n\t2. Register a FieldSerializer for the containing class and call "
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string p1, "FieldSerializer#setIgnoreSyntheticFields(false) on it. This is not safe but may be sufficient temporarily. "
 
@@ -246,17 +246,17 @@
     throw p1
 
     :cond_5
-    invoke-interface {v0, p1}, Lp0/b/b/a;->newInstantiatorOf(Ljava/lang/Class;)Lp0/b/a/a;
+    invoke-interface {v0, p1}, Lq0/b/b/a;->newInstantiatorOf(Ljava/lang/Class;)Lq0/b/a/a;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public setFallbackInstantiatorStrategy(Lp0/b/b/a;)V
+.method public setFallbackInstantiatorStrategy(Lq0/b/b/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lp0/b/b/a;
+    iput-object p1, p0, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;->fallbackStrategy:Lq0/b/b/a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo.smali
index d0e9e9d78e..1b4062140a 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/Kryo.smali
@@ -77,7 +77,7 @@
 
 .field public registrationRequired:Z
 
-.field public strategy:Lp0/b/b/a;
+.field public strategy:Lq0/b/b/a;
 
 .field public streamFactory:Lcom/esotericsoftware/kryo/StreamFactory;
 
@@ -154,7 +154,7 @@
 
     invoke-direct {v0}, Lcom/esotericsoftware/kryo/Kryo$DefaultInstantiatorStrategy;-><init>()V
 
-    iput-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lp0/b/b/a;
+    iput-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lq0/b/b/a;
 
     const v0, 0x7fffffff
 
@@ -1628,10 +1628,10 @@
     return-object v0
 .end method
 
-.method public getInstantiatorStrategy()Lp0/b/b/a;
+.method public getInstantiatorStrategy()Lq0/b/b/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lp0/b/b/a;
+    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lq0/b/b/a;
 
     return-object v0
 .end method
@@ -2018,32 +2018,32 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/esotericsoftware/kryo/Registration;->getInstantiator()Lp0/b/a/a;
+    invoke-virtual {v0}, Lcom/esotericsoftware/kryo/Registration;->getInstantiator()Lq0/b/a/a;
 
     move-result-object v1
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/Kryo;->newInstantiator(Ljava/lang/Class;)Lp0/b/a/a;
+    invoke-virtual {p0, p1}, Lcom/esotericsoftware/kryo/Kryo;->newInstantiator(Ljava/lang/Class;)Lq0/b/a/a;
 
     move-result-object v1
 
-    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/Registration;->setInstantiator(Lp0/b/a/a;)V
+    invoke-virtual {v0, v1}, Lcom/esotericsoftware/kryo/Registration;->setInstantiator(Lq0/b/a/a;)V
 
     :cond_0
-    invoke-interface {v1}, Lp0/b/a/a;->newInstance()Ljava/lang/Object;
+    invoke-interface {v1}, Lq0/b/a/a;->newInstance()Ljava/lang/Object;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public newInstantiator(Ljava/lang/Class;)Lp0/b/a/a;
+.method public newInstantiator(Ljava/lang/Class;)Lq0/b/a/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lp0/b/b/a;
+    iget-object v0, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lq0/b/b/a;
 
-    invoke-interface {v0, p1}, Lp0/b/b/a;->newInstantiatorOf(Ljava/lang/Class;)Lp0/b/a/a;
+    invoke-interface {v0, p1}, Lq0/b/b/a;->newInstantiatorOf(Ljava/lang/Class;)Lq0/b/a/a;
 
     move-result-object p1
 
@@ -3655,10 +3655,10 @@
     throw p1
 .end method
 
-.method public setInstantiatorStrategy(Lp0/b/b/a;)V
+.method public setInstantiatorStrategy(Lq0/b/b/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lp0/b/b/a;
+    iput-object p1, p0, Lcom/esotericsoftware/kryo/Kryo;->strategy:Lq0/b/b/a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali
index b99862553e..94c2096848 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali
@@ -6,7 +6,7 @@
 # instance fields
 .field public final id:I
 
-.field public instantiator:Lp0/b/a/a;
+.field public instantiator:Lq0/b/a/a;
 
 .field public serializer:Lcom/esotericsoftware/kryo/Serializer;
 
@@ -60,10 +60,10 @@
     return v0
 .end method
 
-.method public getInstantiator()Lp0/b/a/a;
+.method public getInstantiator()Lq0/b/a/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/esotericsoftware/kryo/Registration;->instantiator:Lp0/b/a/a;
+    iget-object v0, p0, Lcom/esotericsoftware/kryo/Registration;->instantiator:Lq0/b/a/a;
 
     return-object v0
 .end method
@@ -84,12 +84,12 @@
     return-object v0
 .end method
 
-.method public setInstantiator(Lp0/b/a/a;)V
+.method public setInstantiator(Lq0/b/a/a;)V
     .locals 1
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lcom/esotericsoftware/kryo/Registration;->instantiator:Lp0/b/a/a;
+    iput-object p1, p0, Lcom/esotericsoftware/kryo/Registration;->instantiator:Lq0/b/a/a;
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali
index b5cccf7833..072bf4a5da 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/AsmCacheFields$AsmObjectField.smali
@@ -90,7 +90,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->type:Ljava/lang/Class;
 
-    invoke-static {v1, p1, v0, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v1, p1, v0, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 
@@ -107,7 +107,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->type:Ljava/lang/Class;
 
-    invoke-static {v1, p2, v0, p1}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v1, p2, v0, p1}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
index 7ca159656e..4dba2892d3 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/BeanSerializer.smali
@@ -768,7 +768,7 @@
 
     invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {v2, p1, v0, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v2, p1, v0, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 
@@ -783,7 +783,7 @@
 
     invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {v2, p2, v0, p1}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v2, p2, v0, p1}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p1
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali
index 35a26aed21..d9a3ba8760 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectBooleanField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -128,7 +128,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -170,7 +170,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali
index 0ab478dc54..b5b61755a7 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectByteField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -128,7 +128,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -170,7 +170,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali
index 5508674f05..2d828999dd 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectCharField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -128,7 +128,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -170,7 +170,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali
index ad81ea13e1..022b42d9f1 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectDoubleField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -128,7 +128,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -170,7 +170,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali
index 6e7f485624..539ea468c3 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectFloatField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -128,7 +128,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -170,7 +170,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali
index 2f9a786a46..a6665b96d3 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectIntField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -146,7 +146,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -206,7 +206,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali
index 478976508f..ff3439e840 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectLongField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -146,7 +146,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -206,7 +206,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali
index fce78fca68..5df8e698ca 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField$ObjectShortField.smali
@@ -64,7 +64,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -128,7 +128,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
@@ -170,7 +170,7 @@
 
     const-string v1, ")"
 
-    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v0, p1, v1, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField.smali
index 944da5c21a..2ac4a378aa 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/ObjectField.smali
@@ -124,7 +124,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->type:Ljava/lang/Class;
 
-    invoke-static {v1, p1, v0, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v1, p1, v0, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 
@@ -141,7 +141,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->type:Ljava/lang/Class;
 
-    invoke-static {v1, p2, v0, p1}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v1, p2, v0, p1}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p1
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali
index 92624f059f..7e4186461b 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/kryo/serializers/UnsafeCacheFields$UnsafeObjectField.smali
@@ -96,7 +96,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->type:Ljava/lang/Class;
 
-    invoke-static {v1, p1, v0, p2}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v1, p1, v0, p2}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p2
 
@@ -113,7 +113,7 @@
 
     iget-object v1, p0, Lcom/esotericsoftware/kryo/serializers/ObjectField;->type:Ljava/lang/Class;
 
-    invoke-static {v1, p2, v0, p1}, Lf/e/b/a/a;->M(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
+    invoke-static {v1, p2, v0, p1}, Lf/e/b/a/a;->O(Ljava/lang/Class;Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/esotericsoftware/kryo/KryoException;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/animated/gif/GifImage.smali b/com.discord/smali_classes2/com/facebook/animated/gif/GifImage.smali
index 30bd97aa59..96100e167c 100644
--- a/com.discord/smali_classes2/com/facebook/animated/gif/GifImage.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/gif/GifImage.smali
@@ -210,7 +210,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     invoke-static {p1, p2, p3}, Lcom/facebook/animated/gif/GifImage;->nativeCreateFromNativeMemory(JI)Lcom/facebook/animated/gif/GifImage;
 
diff --git a/com.discord/smali_classes2/com/facebook/animated/webp/WebPImage.smali b/com.discord/smali_classes2/com/facebook/animated/webp/WebPImage.smali
index a1a7ba9403..19a66cd01f 100644
--- a/com.discord/smali_classes2/com/facebook/animated/webp/WebPImage.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/webp/WebPImage.smali
@@ -129,7 +129,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     invoke-static {p1, p2, p3}, Lcom/facebook/animated/webp/WebPImage;->nativeCreateFromNativeMemory(JI)Lcom/facebook/animated/webp/WebPImage;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$b.smali b/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$b.smali
index 7e8510a4f5..c343507b7b 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$b.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig$b.smali
@@ -104,7 +104,7 @@
     :goto_1
     const-string v1, "Either a non-null context or a base directory path or supplier must be provided."
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->n(ZLjava/lang/Object;)V
+    invoke-static {v0, v1}, Le0/a/b/b/a;->n(ZLjava/lang/Object;)V
 
     iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$b;->c:Lcom/facebook/common/internal/Supplier;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig.smali b/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig.smali
index 37ed516c85..9aa94c5fd0 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/DiskCacheConfig.smali
@@ -57,13 +57,13 @@
 
     iget-object p2, p1, Lcom/facebook/cache/disk/DiskCacheConfig$b;->b:Ljava/lang/String;
 
-    invoke-static {p2}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iput-object p2, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->b:Ljava/lang/String;
 
     iget-object p2, p1, Lcom/facebook/cache/disk/DiskCacheConfig$b;->c:Lcom/facebook/common/internal/Supplier;
 
-    invoke-static {p2}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iput-object p2, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->c:Lcom/facebook/common/internal/Supplier;
 
@@ -81,7 +81,7 @@
 
     iget-object p2, p1, Lcom/facebook/cache/disk/DiskCacheConfig$b;->g:Lf/g/b/b/h;
 
-    invoke-static {p2}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iput-object p2, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->g:Lf/g/b/b/h;
 
diff --git a/com.discord/smali_classes2/com/facebook/common/references/CloseableReference.smali b/com.discord/smali_classes2/com/facebook/common/references/CloseableReference.smali
index 3bf8ebda8a..30b9c8ad54 100644
--- a/com.discord/smali_classes2/com/facebook/common/references/CloseableReference.smali
+++ b/com.discord/smali_classes2/com/facebook/common/references/CloseableReference.smali
@@ -522,7 +522,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     new-instance v0, Lcom/facebook/common/references/CloseableReference;
 
@@ -651,7 +651,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     iget v2, v1, Lcom/facebook/common/references/SharedReference;->b:I
 
@@ -880,7 +880,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->e:Lcom/facebook/common/references/SharedReference;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/R$a.smali b/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
index 5e11aaefb9..906376d0e0 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
@@ -193,7 +193,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 
     :array_1
@@ -228,7 +228,7 @@
         0x7f040454
         0x7f040455
         0x7f040456
-        0x7f04059c
+        0x7f04058e
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController.smali b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController.smali
index 2a2dc80f25..fc1190ce65 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeController.smali
@@ -313,7 +313,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->g:Lf/g/g/h/a;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->b:Lf/g/g/b/a;
 
@@ -403,7 +403,7 @@
 
     instance-of v0, p1, Lf/g/g/h/a;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     check-cast p1, Lf/g/g/h/a;
 
@@ -1741,7 +1741,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.smali b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.smali
index 57661ca2c3..a351cb4180 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.smali
@@ -218,11 +218,11 @@
     :goto_1
     const-string v4, "Cannot specify both ImageRequest and FirstAvailableImageRequests!"
 
-    invoke-static {v0, v4}, Ld0/a/b/b/a;->n(ZLjava/lang/Object;)V
+    invoke-static {v0, v4}, Le0/a/b/b/a;->n(ZLjava/lang/Object;)V
 
     const-string v0, "Cannot specify DataSourceSupplier with other ImageRequests! Use one or the other."
 
-    invoke-static {v3, v0}, Ld0/a/b/b/a;->n(ZLjava/lang/Object;)V
+    invoke-static {v3, v0}, Le0/a/b/b/a;->n(ZLjava/lang/Object;)V
 
     iget-object v0, v1, Lcom/facebook/drawee/controller/AbstractDraweeControllerBuilder;->d:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/generic/GenericDraweeHierarchy.smali b/com.discord/smali_classes2/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
index 8e39ce652f..e863104de5 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
@@ -540,7 +540,7 @@
     const/4 v3, 0x0
 
     :goto_0
-    invoke-static {v3}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v3}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v3, v0, Lf/g/g/e/b;->g:[Lf/g/g/e/d;
 
@@ -551,7 +551,7 @@
     const/4 v1, 0x1
 
     :cond_1
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v1, v0, Lf/g/g/e/b;->g:[Lf/g/g/e/d;
 
@@ -642,7 +642,7 @@
 
     const-string p1, "Parent has no child drawable!"
 
-    invoke-static {v0, p1}, Ld0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, p1}, Le0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     check-cast v0, Lf/g/g/e/p;
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/view/DraweeHolder.smali b/com.discord/smali_classes2/com/facebook/drawee/view/DraweeHolder.smali
index 6f9a5a6224..a8faa10482 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/view/DraweeHolder.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/view/DraweeHolder.smali
@@ -415,7 +415,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/view/DraweeView.smali b/com.discord/smali_classes2/com/facebook/drawee/view/DraweeView.smali
index df2836f0f8..5dacb2f632 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/view/DraweeView.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/view/DraweeView.smali
@@ -346,7 +346,7 @@
 
     iget-object v0, v0, Lcom/facebook/drawee/view/DraweeHolder;->d:Lcom/facebook/drawee/interfaces/DraweeHierarchy;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -838,7 +838,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/drawee/view/SimpleDraweeView.smali b/com.discord/smali_classes2/com/facebook/drawee/view/SimpleDraweeView.smali
index 3f1cb7a4f2..99402fb05e 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/view/SimpleDraweeView.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/view/SimpleDraweeView.smali
@@ -113,7 +113,7 @@
 
     const-string v1, "SimpleDraweeView was not initialized!"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Le0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->sDraweecontrollerbuildersupplier:Lcom/facebook/common/internal/Supplier;
 
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$a.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$a.smali
index 682be343a1..efb9ea6e7f 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$a.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$a.smali
@@ -76,7 +76,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     :try_start_0
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->i()Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$b.smali b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$b.smali
index ecfff2f2bb..80672ea98f 100644
--- a/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$b.smali
+++ b/com.discord/smali_classes2/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$b.smali
@@ -76,7 +76,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     :try_start_0
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->i()Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/image/EncodedImage.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/image/EncodedImage.smali
index 73c1c3e2a4..5f3ca4f46b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/image/EncodedImage.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/image/EncodedImage.smali
@@ -137,7 +137,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->b()Lcom/facebook/common/references/CloseableReference;
 
@@ -644,7 +644,7 @@
 
     const-string v7, "RIFF"
 
-    invoke-static {v6, v7}, Ld0/a/b/b/a;->o([BLjava/lang/String;)Z
+    invoke-static {v6, v7}, Le0/a/b/b/a;->o([BLjava/lang/String;)Z
 
     move-result v7
 
@@ -653,13 +653,13 @@
     goto/16 :goto_4
 
     :cond_2
-    invoke-static {v1}, Ld0/a/b/b/a;->R(Ljava/io/InputStream;)I
+    invoke-static {v1}, Le0/a/b/b/a;->R(Ljava/io/InputStream;)I
 
     invoke-virtual {v1, v6}, Ljava/io/InputStream;->read([B)I
 
     const-string v7, "WEBP"
 
-    invoke-static {v6, v7}, Ld0/a/b/b/a;->o([BLjava/lang/String;)Z
+    invoke-static {v6, v7}, Le0/a/b/b/a;->o([BLjava/lang/String;)Z
 
     move-result v7
 
@@ -702,7 +702,7 @@
 
     if-eqz v7, :cond_5
 
-    invoke-static {v1}, Ld0/a/b/b/a;->X(Ljava/io/InputStream;)Landroid/util/Pair;
+    invoke-static {v1}, Le0/a/b/b/a;->X(Ljava/io/InputStream;)Landroid/util/Pair;
 
     move-result-object v6
 
@@ -717,7 +717,7 @@
 
     if-eqz v7, :cond_6
 
-    invoke-static {v1}, Ld0/a/b/b/a;->Y(Ljava/io/InputStream;)Landroid/util/Pair;
+    invoke-static {v1}, Le0/a/b/b/a;->Y(Ljava/io/InputStream;)Landroid/util/Pair;
 
     move-result-object v6
     :try_end_0
@@ -753,7 +753,7 @@
 
     new-instance v6, Landroid/util/Pair;
 
-    invoke-static {v1}, Ld0/a/b/b/a;->F0(Ljava/io/InputStream;)I
+    invoke-static {v1}, Le0/a/b/b/a;->F0(Ljava/io/InputStream;)I
 
     move-result v7
 
@@ -763,7 +763,7 @@
 
     move-result-object v7
 
-    invoke-static {v1}, Ld0/a/b/b/a;->F0(Ljava/io/InputStream;)I
+    invoke-static {v1}, Le0/a/b/b/a;->F0(Ljava/io/InputStream;)I
 
     move-result v8
 
@@ -937,7 +937,7 @@
     :cond_d
     :goto_b
     :try_start_9
-    invoke-static {v0, v2, v3}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {v0, v2, v3}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v1
 
@@ -952,7 +952,7 @@
     :goto_c
     if-ne v1, v6, :cond_e
 
-    invoke-static {v0, v2, v3}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {v0, v2, v3}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v1
 
@@ -986,7 +986,7 @@
     goto :goto_d
 
     :cond_11
-    invoke-static {v0, v5, v3}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {v0, v5, v3}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v1
 
@@ -1005,7 +1005,7 @@
     :goto_e
     if-eqz v2, :cond_13
 
-    invoke-static {v0, v5, v3}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {v0, v5, v3}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v1
 
@@ -1015,13 +1015,13 @@
 
     if-le v1, v2, :cond_13
 
-    invoke-static {v0, v4, v3}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {v0, v4, v3}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v2
 
     add-int/lit8 v1, v1, -0x4
 
-    invoke-static {v0, v5, v3}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {v0, v5, v3}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v4
 
@@ -1059,7 +1059,7 @@
     :goto_10
     iput v3, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->h:I
 
-    invoke-static {v3}, Ld0/a/b/b/a;->M(I)I
+    invoke-static {v3}, Le0/a/b/b/a;->M(I)I
 
     move-result v0
 
@@ -1151,7 +1151,7 @@
     :goto_11
     iput v3, p0, Lcom/facebook/imagepipeline/image/EncodedImage;->h:I
 
-    invoke-static {v3}, Ld0/a/b/b/a;->M(I)I
+    invoke-static {v3}, Le0/a/b/b/a;->M(I)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/BasePool.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/BasePool.smali
index 3c58d5934b..8ea11b3cd6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/BasePool.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/BasePool.smali
@@ -539,7 +539,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_5
 
@@ -572,7 +572,7 @@
 
     move-result p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {p1}, Le0/a/b/b/a;->m(Z)V
 
     invoke-virtual {p0, v3}, Lcom/facebook/imagepipeline/memory/BasePool;->f(Ljava/lang/Object;)I
 
@@ -687,7 +687,7 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_3
 
-    invoke-static {v1}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {v1}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     :goto_2
     monitor-enter p0
@@ -699,7 +699,7 @@
 
     move-result v1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->m(Z)V
 
     monitor-enter p0
     :try_end_4
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/MemoryPooledByteBufferOutputStream.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/MemoryPooledByteBufferOutputStream.smali
index 96f094aa37..409eec00e7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/MemoryPooledByteBufferOutputStream.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/MemoryPooledByteBufferOutputStream.smali
@@ -45,7 +45,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     if-eqz p1, :cond_1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
index 603be34010..c02495c309 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/NativeMemoryChunk.smali
@@ -66,7 +66,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     iput p1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->e:I
 
@@ -180,7 +180,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     :cond_0
     invoke-interface {p2}, Lf/g/j/l/r;->getUniqueId()J
@@ -302,11 +302,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->e:I
 
-    invoke-static {p1, p4, v0}, Ld0/a/b/b/a;->c(III)I
+    invoke-static {p1, p4, v0}, Le0/a/b/b/a;->c(III)I
 
     move-result p4
 
@@ -314,7 +314,7 @@
 
     iget v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->e:I
 
-    invoke-static {p1, v0, p3, p4, v1}, Ld0/a/b/b/a;->j(IIIII)V
+    invoke-static {p1, v0, p3, p4, v1}, Le0/a/b/b/a;->j(IIIII)V
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->d:J
 
@@ -351,7 +351,7 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-interface {p2}, Lf/g/j/l/r;->isClosed()Z
 
@@ -359,7 +359,7 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-interface {p2}, Lf/g/j/l/r;->getSize()I
 
@@ -367,7 +367,7 @@
 
     iget v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->e:I
 
-    invoke-static {p1, v0, p3, p4, v1}, Ld0/a/b/b/a;->j(IIIII)V
+    invoke-static {p1, v0, p3, p4, v1}, Le0/a/b/b/a;->j(IIIII)V
 
     invoke-interface {p2}, Lf/g/j/l/r;->o()J
 
@@ -562,7 +562,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     if-ltz p1, :cond_1
 
@@ -574,7 +574,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->e:I
 
@@ -586,7 +586,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->d:J
 
@@ -634,11 +634,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->e:I
 
-    invoke-static {p1, p4, v0}, Ld0/a/b/b/a;->c(III)I
+    invoke-static {p1, p4, v0}, Le0/a/b/b/a;->c(III)I
 
     move-result p4
 
@@ -646,7 +646,7 @@
 
     iget v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->e:I
 
-    invoke-static {p1, v0, p3, p4, v1}, Ld0/a/b/b/a;->j(IIIII)V
+    invoke-static {p1, v0, p3, p4, v1}, Le0/a/b/b/a;->j(IIIII)V
 
     iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->d:J
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/Bitmaps.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/Bitmaps.smali
index cdfff1752d..61267814c0 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/Bitmaps.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/Bitmaps.smali
@@ -50,13 +50,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p0}, Landroid/graphics/Bitmap;->isMutable()Z
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p0}, Landroid/graphics/Bitmap;->getWidth()I
 
@@ -76,7 +76,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p0}, Landroid/graphics/Bitmap;->getHeight()I
 
@@ -91,7 +91,7 @@
     const/4 v2, 0x1
 
     :cond_2
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p0}, Landroid/graphics/Bitmap;->getRowBytes()I
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
index e8c3062b6e..efa87a1eba 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
@@ -164,7 +164,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     :try_start_0
     invoke-virtual {p0, p1, v0}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->c(Lcom/facebook/common/references/CloseableReference;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
@@ -248,7 +248,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     :try_start_0
     invoke-virtual {p0, p1, p4, v0}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->d(Lcom/facebook/common/references/CloseableReference;ILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
@@ -529,7 +529,7 @@
 
     invoke-virtual {p1}, Landroid/graphics/Bitmap;->recycle()V
 
-    invoke-static {v0}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {v0}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     new-instance p1, Ljava/lang/RuntimeException;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
index 0cbc1d7edb..cbf893cf77 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.smali
@@ -127,7 +127,7 @@
     :cond_1
     iget p5, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->b:I
 
-    invoke-static {p3, p4, p1, p5}, Ld0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
+    invoke-static {p3, p4, p1, p5}, Le0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
 
     move-result p5
 
@@ -211,7 +211,7 @@
     const/4 p6, 0x0
 
     :goto_0
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-gt p4, v7, :cond_4
 
@@ -223,7 +223,7 @@
     const/4 p6, 0x0
 
     :goto_1
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-ltz p3, :cond_5
 
@@ -235,7 +235,7 @@
     const/4 p6, 0x0
 
     :goto_2
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-gt p3, v6, :cond_6
 
@@ -247,13 +247,13 @@
     const/4 p6, 0x0
 
     :goto_3
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     invoke-static {p1}, Lf/g/j/s/d;->d(I)Z
 
     move-result p6
 
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-ne p4, v1, :cond_8
 
@@ -271,7 +271,7 @@
     const/4 p6, 0x1
 
     :goto_5
-    invoke-static {p6, v5}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {p6, v5}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     if-eqz v2, :cond_a
 
@@ -308,7 +308,7 @@
     const/4 p6, 0x0
 
     :goto_6
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-gt p4, v7, :cond_d
 
@@ -320,7 +320,7 @@
     const/4 p6, 0x0
 
     :goto_7
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-ltz p3, :cond_e
 
@@ -332,7 +332,7 @@
     const/4 p6, 0x0
 
     :goto_8
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-gt p3, v6, :cond_f
 
@@ -344,13 +344,13 @@
     const/4 p6, 0x0
 
     :goto_9
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     invoke-static {p1}, Lf/g/j/s/d;->e(I)Z
 
     move-result p6
 
-    invoke-static {p6}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {p6}, Le0/a/b/b/a;->h(Z)V
 
     if-ne p4, v1, :cond_11
 
@@ -368,7 +368,7 @@
     const/4 p6, 0x1
 
     :goto_b
-    invoke-static {p6, v5}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {p6, v5}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     if-eqz v2, :cond_14
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/request/ImageRequest.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/request/ImageRequest.smali
index dbf753c531..0380ac64c1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/request/ImageRequest.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/request/ImageRequest.smali
@@ -352,7 +352,7 @@
 
     iget-object v2, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->b:Landroid/net/Uri;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -362,7 +362,7 @@
 
     iget-object v2, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->a:Lcom/facebook/imagepipeline/request/ImageRequest$a;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -372,7 +372,7 @@
 
     iget-object v2, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->d:Ljava/io/File;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -382,7 +382,7 @@
 
     iget-object v2, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->j:Lf/g/j/d/a;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -392,7 +392,7 @@
 
     iget-object v2, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->g:Lcom/facebook/imagepipeline/common/ImageDecodeOptions;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -402,7 +402,7 @@
 
     iget-object v2, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->h:Lf/g/j/d/d;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -412,7 +412,7 @@
 
     iget-object v2, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->i:Lf/g/j/d/e;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -446,7 +446,7 @@
     move-result-object v1
 
     :cond_3
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -540,7 +540,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView.smali b/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView.smali
index 3e1a645fb7..6bbda0d260 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/ZoomableDraweeView.smali
@@ -116,7 +116,7 @@
 
     iput-object v0, v1, Lf/g/g/f/a;->l:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    invoke-static {v1, p1, p2}, Ld0/a/b/b/a;->a1(Lf/g/g/f/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lf/g/g/f/a;
+    invoke-static {v1, p1, p2}, Le0/a/b/b/a;->a1(Lf/g/g/f/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lf/g/g/f/a;
 
     iget p1, v1, Lf/g/g/f/a;->c:F
 
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali
index 79b8b4dad3..b42f3a36a8 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/ClearableCookieJar.smali
@@ -3,4 +3,4 @@
 .source "ClearableCookieJar.java"
 
 # interfaces
-.implements Ln0/p;
+.implements Lo0/p;
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
index 3dc41b775a..466a0618de 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/PersistentCookieJar.smali
@@ -33,14 +33,14 @@
 
 
 # virtual methods
-.method public declared-synchronized a(Ln0/w;Ljava/util/List;)V
+.method public declared-synchronized a(Lo0/w;Ljava/util/List;)V
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Ln0/w;",
+            "Lo0/w;",
             "Ljava/util/List<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;)V"
         }
     .end annotation
@@ -74,9 +74,9 @@
 
     move-result-object v1
 
-    check-cast v1, Ln0/n;
+    check-cast v1, Lo0/n;
 
-    iget-boolean v2, v1, Ln0/n;->h:Z
+    iget-boolean v2, v1, Lo0/n;->h:Z
 
     if-eqz v2, :cond_0
 
@@ -101,15 +101,15 @@
     throw p1
 .end method
 
-.method public declared-synchronized b(Ln0/w;)Ljava/util/List;
+.method public declared-synchronized b(Lo0/w;)Ljava/util/List;
     .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Ln0/w;",
+            "Lo0/w;",
             ")",
             "Ljava/util/List<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;"
         }
     .end annotation
@@ -143,9 +143,9 @@
 
     move-result-object v3
 
-    check-cast v3, Ln0/n;
+    check-cast v3, Lo0/n;
 
-    iget-wide v4, v3, Ln0/n;->c:J
+    iget-wide v4, v3, Lo0/n;->c:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -172,7 +172,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {v3, p1}, Ln0/n;->a(Ln0/w;)Z
+    invoke-virtual {v3, p1}, Lo0/n;->a(Lo0/w;)Z
 
     move-result v4
 
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/CookieCache.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/CookieCache.smali
index a96abb58b5..5e2d3ebda0 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/CookieCache.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/CookieCache.smali
@@ -11,7 +11,7 @@
     value = {
         "Ljava/lang/Object;",
         "Ljava/lang/Iterable<",
-        "Ln0/n;",
+        "Lo0/n;",
         ">;"
     }
 .end annotation
@@ -23,7 +23,7 @@
         value = {
             "(",
             "Ljava/util/Collection<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;)V"
         }
     .end annotation
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
index 25040709be..77de772d00 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/IdentifiableCookie.smali
@@ -4,16 +4,16 @@
 
 
 # instance fields
-.field public a:Ln0/n;
+.field public a:Lo0/n;
 
 
 # direct methods
-.method public constructor <init>(Ln0/n;)V
+.method public constructor <init>(Lo0/n;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
     return-void
 .end method
@@ -34,13 +34,13 @@
     :cond_0
     check-cast p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;
 
-    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->a:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->a:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v2, v2, Ln0/n;->a:Ljava/lang/String;
+    iget-object v2, v2, Lo0/n;->a:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -48,13 +48,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->d:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->d:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v2, v2, Ln0/n;->d:Ljava/lang/String;
+    iget-object v2, v2, Lo0/n;->d:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -62,13 +62,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->e:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->e:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v2, v2, Ln0/n;->e:Ljava/lang/String;
+    iget-object v2, v2, Lo0/n;->e:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -76,19 +76,19 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-boolean v0, p1, Ln0/n;->f:Z
+    iget-boolean v0, p1, Lo0/n;->f:Z
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-boolean v3, v2, Ln0/n;->f:Z
+    iget-boolean v3, v2, Lo0/n;->f:Z
 
     if-ne v0, v3, :cond_1
 
-    iget-boolean p1, p1, Ln0/n;->i:Z
+    iget-boolean p1, p1, Lo0/n;->i:Z
 
-    iget-boolean v0, v2, Ln0/n;->i:Z
+    iget-boolean v0, v2, Lo0/n;->i:Z
 
     if-ne p1, v0, :cond_1
 
@@ -101,9 +101,9 @@
 .method public hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->a:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->a:Ljava/lang/String;
 
     const/16 v1, 0x20f
 
@@ -113,25 +113,25 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v1, v1, Ln0/n;->d:Ljava/lang/String;
+    iget-object v1, v1, Lo0/n;->d:Ljava/lang/String;
 
     invoke-static {v1, v0, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-object v1, v1, Ln0/n;->e:Ljava/lang/String;
+    iget-object v1, v1, Lo0/n;->e:Ljava/lang/String;
 
     invoke-static {v1, v0, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
-    iget-boolean v2, v1, Ln0/n;->f:Z
+    iget-boolean v2, v1, Lo0/n;->f:Z
 
     xor-int/lit8 v2, v2, 0x1
 
@@ -139,7 +139,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, v1, Ln0/n;->i:Z
+    iget-boolean v1, v1, Lo0/n;->i:Z
 
     xor-int/lit8 v1, v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali
index 26727d1857..15cdb5175d 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator.smali
@@ -20,7 +20,7 @@
     value = {
         "Ljava/lang/Object;",
         "Ljava/util/Iterator<",
-        "Ln0/n;",
+        "Lo0/n;",
         ">;"
     }
 .end annotation
@@ -80,7 +80,7 @@
 
     check-cast v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;
 
-    iget-object v0, v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Ln0/n;
+    iget-object v0, v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->a:Lo0/n;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
index 18d297461a..3c0a39c8b9 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/cache/SetCookieCache.smali
@@ -49,7 +49,7 @@
         value = {
             "(",
             "Ljava/util/Collection<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;)V"
         }
     .end annotation
@@ -77,11 +77,11 @@
 
     move-result-object v1
 
-    check-cast v1, Ln0/n;
+    check-cast v1, Lo0/n;
 
     new-instance v2, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;
 
-    invoke-direct {v2, v1}, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;-><init>(Ln0/n;)V
+    invoke-direct {v2, v1}, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;-><init>(Lo0/n;)V
 
     invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -125,7 +125,7 @@
         value = {
             "()",
             "Ljava/util/Iterator<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;"
         }
     .end annotation
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
index 72ffdd1e63..ef241c6aed 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/CookiePersistor.smali
@@ -9,7 +9,7 @@
         value = {
             "()",
             "Ljava/util/List<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;"
         }
     .end annotation
@@ -20,7 +20,7 @@
         value = {
             "(",
             "Ljava/util/Collection<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;)V"
         }
     .end annotation
@@ -31,7 +31,7 @@
         value = {
             "(",
             "Ljava/util/Collection<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;)V"
         }
     .end annotation
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
index 0a11beb2c5..d79077c601 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public transient d:Ln0/n;
+.field public transient d:Lo0/n;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 .end method
 
 .method private readObject(Ljava/io/ObjectInputStream;)V
-    .locals 14
+    .locals 13
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;,
@@ -62,112 +62,116 @@
 
     check-cast v2, Ljava/lang/String;
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz v2, :cond_f
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v2}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_e
+    if-eqz v0, :cond_b
 
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
-    move-object v3, v1
+    move-object v3, v0
 
     check-cast v3, Ljava/lang/String;
 
-    if-eqz v3, :cond_d
+    const-string v0, "value"
 
-    invoke-static {v3}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v1
+    invoke-static {v3}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    move-result-object v0
 
-    move-result-object v1
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    move-result-object v0
 
-    move-result v1
+    invoke-static {v0, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    if-eqz v1, :cond_c
+    move-result v0
+
+    if-eqz v0, :cond_a
 
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readLong()J
 
-    move-result-wide v4
+    move-result-wide v0
 
-    const-wide/16 v6, -0x1
+    const-wide/16 v4, -0x1
 
-    const-wide v8, 0xe677d21fdbffL
+    const-wide v6, 0xe677d21fdbffL
 
-    const/4 v1, 0x0
+    const/4 v8, 0x0
 
-    cmp-long v10, v4, v6
+    cmp-long v9, v0, v4
 
-    if-eqz v10, :cond_2
+    if-eqz v9, :cond_2
 
-    const-wide/16 v6, 0x0
+    const-wide/16 v4, 0x0
 
-    cmp-long v10, v4, v6
+    cmp-long v9, v0, v4
 
-    if-gtz v10, :cond_0
+    if-gtz v9, :cond_0
 
-    const-wide/high16 v4, -0x8000000000000000L
+    const-wide/high16 v0, -0x8000000000000000L
 
     :cond_0
-    cmp-long v6, v4, v8
+    cmp-long v4, v0, v6
 
-    if-lez v6, :cond_1
+    if-lez v4, :cond_1
 
     goto :goto_0
 
     :cond_1
-    move-wide v8, v4
+    move-wide v6, v0
 
     :goto_0
-    const/4 v4, 0x1
+    const/4 v0, 0x1
 
-    move-wide v4, v8
+    move-wide v4, v6
 
     const/4 v10, 0x1
 
     goto :goto_1
 
     :cond_2
-    const/4 v4, 0x0
+    const/4 v0, 0x0
 
-    move-wide v4, v8
+    move-wide v4, v6
 
     const/4 v10, 0x0
 
     :goto_1
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
 
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    const-string v1, "domain"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lf/n/a/k/a;->d0(Ljava/lang/String;)Ljava/lang/String;
+
     move-result-object v6
 
-    check-cast v6, Ljava/lang/String;
+    const-string v7, "unexpected domain: "
 
-    if-eqz v6, :cond_b
-
-    invoke-static {v6}, Lf/n/a/k/a;->i0(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "unexpected domain: "
-
-    if-eqz v7, :cond_a
+    if-eqz v6, :cond_9
 
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
 
@@ -175,47 +179,45 @@
 
     check-cast v9, Ljava/lang/String;
 
-    if-eqz v9, :cond_9
+    const-string v11, "path"
 
-    const/4 v0, 0x2
+    invoke-static {v9, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v11, "/"
+    const/4 v11, 0x2
 
-    invoke-static {v9, v11, v1, v0}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    const-string v12, "/"
 
-    move-result v0
+    invoke-static {v9, v12, v8, v11}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
-    if-eqz v0, :cond_8
+    move-result v8
+
+    if-eqz v8, :cond_8
 
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readBoolean()Z
 
-    move-result v0
+    move-result v8
 
-    if-eqz v0, :cond_3
+    if-eqz v8, :cond_3
 
-    const/4 v0, 0x1
+    const/4 v8, 0x1
 
     goto :goto_2
 
     :cond_3
-    const/4 v0, 0x0
+    const/4 v8, 0x0
 
     :goto_2
     invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readBoolean()Z
 
-    move-result v1
+    move-result v11
 
-    if-eqz v1, :cond_4
-
-    const/4 v1, 0x1
+    if-eqz v11, :cond_4
 
     const/4 v11, 0x1
 
     goto :goto_3
 
     :cond_4
-    const/4 v1, 0x0
-
     const/4 v11, 0x0
 
     :goto_3
@@ -225,13 +227,15 @@
 
     if-eqz p1, :cond_6
 
-    invoke-static {v6}, Lf/n/a/k/a;->i0(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lf/n/a/k/a;->d0(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
     if-eqz p1, :cond_5
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     move-object v6, p1
 
@@ -242,7 +246,7 @@
     :cond_5
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    invoke-static {v8, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v7, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -253,28 +257,24 @@
     :cond_6
     const/4 p1, 0x0
 
-    move-object v6, v7
-
     :goto_4
-    new-instance v13, Ln0/n;
+    new-instance v0, Lo0/n;
 
     if-eqz v6, :cond_7
 
     const/4 v12, 0x0
 
-    move-object v1, v13
+    move-object v1, v0
 
     move-object v7, v9
 
-    move v8, v0
-
     move v9, v11
 
     move v11, p1
 
-    invoke-direct/range {v1 .. v12}, Ln0/n;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v1 .. v12}, Lo0/n;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object v13, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iput-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
     return-void
 
@@ -301,16 +301,9 @@
     throw p1
 
     :cond_9
-    const-string p1, "path"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    invoke-static {v8, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v7, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -318,14 +311,7 @@
 
     throw p1
 
-    :cond_b
-    const-string p1, "domain"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
+    :cond_a
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const-string v0, "value is not trimmed"
@@ -338,14 +324,7 @@
 
     throw p1
 
-    :cond_d
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
+    :cond_b
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
     const-string v0, "name is not trimmed"
@@ -357,13 +336,6 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_f
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method private writeObject(Ljava/io/ObjectOutputStream;)V
@@ -374,25 +346,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->a:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->a:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->b:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->b:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-boolean v1, v0, Ln0/n;->h:Z
+    iget-boolean v1, v0, Lo0/n;->h:Z
 
     if-eqz v1, :cond_0
 
-    iget-wide v0, v0, Ln0/n;->c:J
+    iget-wide v0, v0, Lo0/n;->c:J
 
     goto :goto_0
 
@@ -402,33 +374,33 @@
     :goto_0
     invoke-virtual {p1, v0, v1}, Ljava/io/ObjectOutputStream;->writeLong(J)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->d:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->d:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-object v0, v0, Ln0/n;->e:Ljava/lang/String;
+    iget-object v0, v0, Lo0/n;->e:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-boolean v0, v0, Ln0/n;->f:Z
+    iget-boolean v0, v0, Lo0/n;->f:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-boolean v0, v0, Ln0/n;->g:Z
+    iget-boolean v0, v0, Lo0/n;->g:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
-    iget-boolean v0, v0, Ln0/n;->i:Z
+    iget-boolean v0, v0, Lo0/n;->i:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
diff --git a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
index 532f4ea4a3..5e55ce37ce 100644
--- a/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
+++ b/com.discord/smali_classes2/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.smali
@@ -37,14 +37,14 @@
     return-void
 .end method
 
-.method public static c(Ln0/n;)Ljava/lang/String;
+.method public static c(Lo0/n;)Ljava/lang/String;
     .locals 2
 
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-boolean v1, p0, Ln0/n;->f:Z
+    iget-boolean v1, p0, Lo0/n;->f:Z
 
     if-eqz v1, :cond_0
 
@@ -62,11 +62,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Ln0/n;->d:Ljava/lang/String;
+    iget-object v1, p0, Lo0/n;->d:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Ln0/n;->e:Ljava/lang/String;
+    iget-object v1, p0, Lo0/n;->e:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -74,7 +74,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p0, p0, Ln0/n;->a:Ljava/lang/String;
+    iget-object p0, p0, Lo0/n;->a:Ljava/lang/String;
 
     invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -93,7 +93,7 @@
         value = {
             "()",
             "Ljava/util/List<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;"
         }
     .end annotation
@@ -222,7 +222,7 @@
 
     check-cast v2, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;
 
-    iget-object v4, v2, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iget-object v4, v2, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_2
     .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
@@ -342,7 +342,7 @@
         value = {
             "(",
             "Ljava/util/Collection<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;)V"
         }
     .end annotation
@@ -368,9 +368,9 @@
 
     move-result-object v1
 
-    check-cast v1, Ln0/n;
+    check-cast v1, Lo0/n;
 
-    invoke-static {v1}, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;->c(Ln0/n;)Ljava/lang/String;
+    invoke-static {v1}, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;->c(Lo0/n;)Ljava/lang/String;
 
     move-result-object v2
 
@@ -380,7 +380,7 @@
 
     const-string v4, "Stream not closed in encodeCookie"
 
-    iput-object v1, v3, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Ln0/n;
+    iput-object v1, v3, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->d:Lo0/n;
 
     new-instance v1, Ljava/io/ByteArrayOutputStream;
 
@@ -553,7 +553,7 @@
         value = {
             "(",
             "Ljava/util/Collection<",
-            "Ln0/n;",
+            "Lo0/n;",
             ">;)V"
         }
     .end annotation
@@ -579,9 +579,9 @@
 
     move-result-object v1
 
-    check-cast v1, Ln0/n;
+    check-cast v1, Lo0/n;
 
-    invoke-static {v1}, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;->c(Ln0/n;)Ljava/lang/String;
+    invoke-static {v1}, Lcom/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor;->c(Lo0/n;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.smali
index a323f038cd..3ba29806a1 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.smali
@@ -2026,7 +2026,7 @@
 
     if-ge v2, v5, :cond_1
 
-    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -2045,7 +2045,7 @@
 
     if-nez v5, :cond_2
 
-    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -2066,7 +2066,7 @@
 
     const-string v0, "Unknown Dolby Vision profile string: "
 
-    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -2085,7 +2085,7 @@
 
     const-string v0, "Unknown Dolby Vision level string: "
 
-    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_0
 
@@ -2227,7 +2227,7 @@
 
     if-eq v7, v5, :cond_7
 
-    invoke-static {v9, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v9, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_3
 
@@ -2284,7 +2284,7 @@
     goto :goto_3
 
     :catch_0
-    invoke-static {v9, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v9, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_8
     :goto_3
@@ -2301,7 +2301,7 @@
 
     if-ge v8, v10, :cond_9
 
-    invoke-static {v12, v7, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v12, v7, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_5
 
@@ -2335,7 +2335,7 @@
 
     const-string p0, "Unknown AV1 profile: "
 
-    invoke-static {p0, v8, v3}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, v8, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_5
 
@@ -2350,7 +2350,7 @@
 
     const-string p0, "Unknown AV1 bit depth: "
 
-    invoke-static {p0, v0, v3}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, v0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_5
 
@@ -2393,7 +2393,7 @@
 
     const-string p0, "Unknown AV1 level: "
 
-    invoke-static {p0, v2, v3}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, v2, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_5
 
@@ -2413,7 +2413,7 @@
     goto :goto_5
 
     :catch_1
-    invoke-static {v12, v7, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v12, v7, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_5
     return-object v1
@@ -2427,7 +2427,7 @@
 
     if-ge v2, v10, :cond_10
 
-    invoke-static {v6, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_7
 
@@ -2446,7 +2446,7 @@
 
     if-nez v7, :cond_11
 
-    invoke-static {v6, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_7
 
@@ -2491,7 +2491,7 @@
 
     const-string v0, "Unknown HEVC level string: "
 
-    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_7
 
@@ -2509,7 +2509,7 @@
     :cond_14
     const-string v0, "Unknown HEVC profile string: "
 
-    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_7
     return-object v1
@@ -2523,7 +2523,7 @@
 
     if-ge v2, v5, :cond_15
 
-    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -2553,7 +2553,7 @@
 
     const-string p0, "Unknown VP9 profile: "
 
-    invoke-static {p0, v2, v3}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, v2, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_8
 
@@ -2568,7 +2568,7 @@
 
     const-string v0, "Unknown VP9 level: "
 
-    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_8
 
@@ -2588,7 +2588,7 @@
     goto :goto_8
 
     :catch_2
-    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v7, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_8
     return-object v1
@@ -2602,7 +2602,7 @@
 
     if-ge v7, v6, :cond_18
 
-    invoke-static {v12, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v12, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -2668,7 +2668,7 @@
 
     const-string p0, "Unknown AVC profile: "
 
-    invoke-static {p0, v2, v3}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, v2, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_a
 
@@ -2683,7 +2683,7 @@
 
     const-string v0, "Unknown AVC level: "
 
-    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v0, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_a
 
@@ -2723,7 +2723,7 @@
     goto :goto_a
 
     :catch_3
-    invoke-static {v12, p0, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v12, p0, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_a
     return-object v1
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/metadata/icy/IcyHeaders.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/metadata/icy/IcyHeaders.smali
index d3e6be7490..38b4f98c91 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/metadata/icy/IcyHeaders.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/metadata/icy/IcyHeaders.smali
@@ -240,7 +240,7 @@
     :catch_1
     const-string v7, "Invalid bitrate header: "
 
-    invoke-static {v7, v1, v2}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v7, v1, v2}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/4 v1, 0x0
 
@@ -437,7 +437,7 @@
     move v3, v5
 
     :catch_3
-    invoke-static {v0, p0, v2}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v2}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_7
     :goto_7
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali
index 18b890d187..9d37903344 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali
@@ -14,107 +14,107 @@
 
 
 # static fields
-.field public static final exo_controls_fastforward:I = 0x7f0801cc
+.field public static final exo_controls_fastforward:I = 0x7f0801cd
 
-.field public static final exo_controls_fullscreen_enter:I = 0x7f0801cd
+.field public static final exo_controls_fullscreen_enter:I = 0x7f0801ce
 
-.field public static final exo_controls_fullscreen_exit:I = 0x7f0801ce
+.field public static final exo_controls_fullscreen_exit:I = 0x7f0801cf
 
-.field public static final exo_controls_next:I = 0x7f0801cf
+.field public static final exo_controls_next:I = 0x7f0801d0
 
-.field public static final exo_controls_pause:I = 0x7f0801d0
+.field public static final exo_controls_pause:I = 0x7f0801d1
 
-.field public static final exo_controls_play:I = 0x7f0801d1
+.field public static final exo_controls_play:I = 0x7f0801d2
 
-.field public static final exo_controls_previous:I = 0x7f0801d2
+.field public static final exo_controls_previous:I = 0x7f0801d3
 
-.field public static final exo_controls_repeat_all:I = 0x7f0801d3
+.field public static final exo_controls_repeat_all:I = 0x7f0801d4
 
-.field public static final exo_controls_repeat_off:I = 0x7f0801d4
+.field public static final exo_controls_repeat_off:I = 0x7f0801d5
 
-.field public static final exo_controls_repeat_one:I = 0x7f0801d5
+.field public static final exo_controls_repeat_one:I = 0x7f0801d6
 
-.field public static final exo_controls_rewind:I = 0x7f0801d6
+.field public static final exo_controls_rewind:I = 0x7f0801d7
 
-.field public static final exo_controls_shuffle_off:I = 0x7f0801d7
+.field public static final exo_controls_shuffle_off:I = 0x7f0801d8
 
-.field public static final exo_controls_shuffle_on:I = 0x7f0801d8
+.field public static final exo_controls_shuffle_on:I = 0x7f0801d9
 
-.field public static final exo_controls_vr:I = 0x7f0801d9
+.field public static final exo_controls_vr:I = 0x7f0801da
 
-.field public static final exo_edit_mode_logo:I = 0x7f0801da
+.field public static final exo_edit_mode_logo:I = 0x7f0801db
 
-.field public static final exo_icon_circular_play:I = 0x7f0801db
+.field public static final exo_icon_circular_play:I = 0x7f0801dc
 
-.field public static final exo_icon_fastforward:I = 0x7f0801dc
+.field public static final exo_icon_fastforward:I = 0x7f0801dd
 
-.field public static final exo_icon_fullscreen_enter:I = 0x7f0801dd
+.field public static final exo_icon_fullscreen_enter:I = 0x7f0801de
 
-.field public static final exo_icon_fullscreen_exit:I = 0x7f0801de
+.field public static final exo_icon_fullscreen_exit:I = 0x7f0801df
 
-.field public static final exo_icon_next:I = 0x7f0801df
+.field public static final exo_icon_next:I = 0x7f0801e0
 
-.field public static final exo_icon_pause:I = 0x7f0801e0
+.field public static final exo_icon_pause:I = 0x7f0801e1
 
-.field public static final exo_icon_play:I = 0x7f0801e1
+.field public static final exo_icon_play:I = 0x7f0801e2
 
-.field public static final exo_icon_previous:I = 0x7f0801e2
+.field public static final exo_icon_previous:I = 0x7f0801e3
 
-.field public static final exo_icon_repeat_all:I = 0x7f0801e3
+.field public static final exo_icon_repeat_all:I = 0x7f0801e4
 
-.field public static final exo_icon_repeat_off:I = 0x7f0801e4
+.field public static final exo_icon_repeat_off:I = 0x7f0801e5
 
-.field public static final exo_icon_repeat_one:I = 0x7f0801e5
+.field public static final exo_icon_repeat_one:I = 0x7f0801e6
 
-.field public static final exo_icon_rewind:I = 0x7f0801e6
+.field public static final exo_icon_rewind:I = 0x7f0801e7
 
-.field public static final exo_icon_shuffle_off:I = 0x7f0801e7
+.field public static final exo_icon_shuffle_off:I = 0x7f0801e8
 
-.field public static final exo_icon_shuffle_on:I = 0x7f0801e8
+.field public static final exo_icon_shuffle_on:I = 0x7f0801e9
 
-.field public static final exo_icon_stop:I = 0x7f0801e9
+.field public static final exo_icon_stop:I = 0x7f0801ea
 
-.field public static final exo_icon_vr:I = 0x7f0801ea
+.field public static final exo_icon_vr:I = 0x7f0801eb
 
-.field public static final exo_notification_fastforward:I = 0x7f0801eb
+.field public static final exo_notification_fastforward:I = 0x7f0801ec
 
-.field public static final exo_notification_next:I = 0x7f0801ec
+.field public static final exo_notification_next:I = 0x7f0801ed
 
-.field public static final exo_notification_pause:I = 0x7f0801ed
+.field public static final exo_notification_pause:I = 0x7f0801ee
 
-.field public static final exo_notification_play:I = 0x7f0801ee
+.field public static final exo_notification_play:I = 0x7f0801ef
 
-.field public static final exo_notification_previous:I = 0x7f0801ef
+.field public static final exo_notification_previous:I = 0x7f0801f0
 
-.field public static final exo_notification_rewind:I = 0x7f0801f0
+.field public static final exo_notification_rewind:I = 0x7f0801f1
 
-.field public static final exo_notification_small_icon:I = 0x7f0801f1
+.field public static final exo_notification_small_icon:I = 0x7f0801f2
 
-.field public static final exo_notification_stop:I = 0x7f0801f2
+.field public static final exo_notification_stop:I = 0x7f0801f3
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$c.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$c.smali
index 7e403e1a86..a704e03873 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$c.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$c.smali
@@ -32,127 +32,127 @@
 
 .field public static final blocking:I = 0x7f0a00f4
 
-.field public static final cancel_action:I = 0x7f0a013c
+.field public static final cancel_action:I = 0x7f0a013f
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a0352
 
-.field public static final exo_ad_overlay:I = 0x7f0a0350
+.field public static final exo_ad_overlay:I = 0x7f0a0356
 
-.field public static final exo_artwork:I = 0x7f0a0351
+.field public static final exo_artwork:I = 0x7f0a0357
 
-.field public static final exo_buffering:I = 0x7f0a0352
+.field public static final exo_buffering:I = 0x7f0a0358
 
-.field public static final exo_content_frame:I = 0x7f0a0353
+.field public static final exo_content_frame:I = 0x7f0a0359
 
-.field public static final exo_controller:I = 0x7f0a0354
+.field public static final exo_controller:I = 0x7f0a035a
 
-.field public static final exo_controller_placeholder:I = 0x7f0a0355
+.field public static final exo_controller_placeholder:I = 0x7f0a035b
 
-.field public static final exo_duration:I = 0x7f0a0356
+.field public static final exo_duration:I = 0x7f0a035c
 
-.field public static final exo_error_message:I = 0x7f0a0357
+.field public static final exo_error_message:I = 0x7f0a035d
 
-.field public static final exo_ffwd:I = 0x7f0a0358
+.field public static final exo_ffwd:I = 0x7f0a035e
 
-.field public static final exo_next:I = 0x7f0a0359
+.field public static final exo_next:I = 0x7f0a035f
 
-.field public static final exo_overlay:I = 0x7f0a035a
+.field public static final exo_overlay:I = 0x7f0a0360
 
-.field public static final exo_pause:I = 0x7f0a035b
+.field public static final exo_pause:I = 0x7f0a0361
 
-.field public static final exo_play:I = 0x7f0a035c
+.field public static final exo_play:I = 0x7f0a0362
 
-.field public static final exo_position:I = 0x7f0a035d
+.field public static final exo_position:I = 0x7f0a0363
 
-.field public static final exo_prev:I = 0x7f0a035e
+.field public static final exo_prev:I = 0x7f0a0364
 
-.field public static final exo_progress:I = 0x7f0a035f
+.field public static final exo_progress:I = 0x7f0a0365
 
-.field public static final exo_progress_placeholder:I = 0x7f0a0360
+.field public static final exo_progress_placeholder:I = 0x7f0a0366
 
-.field public static final exo_repeat_toggle:I = 0x7f0a0361
+.field public static final exo_repeat_toggle:I = 0x7f0a0367
 
-.field public static final exo_rew:I = 0x7f0a0362
+.field public static final exo_rew:I = 0x7f0a0368
 
-.field public static final exo_shuffle:I = 0x7f0a0363
+.field public static final exo_shuffle:I = 0x7f0a0369
 
-.field public static final exo_shutter:I = 0x7f0a0364
+.field public static final exo_shutter:I = 0x7f0a036a
 
-.field public static final exo_subtitles:I = 0x7f0a0365
+.field public static final exo_subtitles:I = 0x7f0a036b
 
-.field public static final exo_track_selection_view:I = 0x7f0a0366
+.field public static final exo_track_selection_view:I = 0x7f0a036c
 
-.field public static final exo_vr:I = 0x7f0a0367
+.field public static final exo_vr:I = 0x7f0a036d
 
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a4
 
-.field public static final fit:I = 0x7f0a03a4
+.field public static final fit:I = 0x7f0a03aa
 
-.field public static final fixed_height:I = 0x7f0a03ac
+.field public static final fixed_height:I = 0x7f0a03b2
 
-.field public static final fixed_width:I = 0x7f0a03ad
+.field public static final fixed_width:I = 0x7f0a03b3
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a7
 
-.field public static final never:I = 0x7f0a0619
+.field public static final never:I = 0x7f0a061f
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final spherical_gl_surface_view:I = 0x7f0a0922
+.field public static final spherical_gl_surface_view:I = 0x7f0a0926
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0933
+.field public static final status_bar_latest_event_content:I = 0x7f0a0937
 
-.field public static final surface_view:I = 0x7f0a0955
+.field public static final surface_view:I = 0x7f0a0959
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final texture_view:I = 0x7f0a098c
+.field public static final texture_view:I = 0x7f0a0990
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final video_decoder_gl_surface_view:I = 0x7f0a0a32
+.field public static final video_decoder_gl_surface_view:I = 0x7f0a0a36
 
-.field public static final when_playing:I = 0x7f0a0a7e
+.field public static final when_playing:I = 0x7f0a0a83
 
-.field public static final zoom:I = 0x7f0a0abf
+.field public static final zoom:I = 0x7f0a0ac4
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$f.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$f.smali
index 10e81f986a..074718bd60 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$f.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$f.smali
@@ -14,87 +14,87 @@
 
 
 # static fields
-.field public static final exo_controls_fastforward_description:I = 0x7f120659
+.field public static final exo_controls_fastforward_description:I = 0x7f12065b
 
-.field public static final exo_controls_fullscreen_description:I = 0x7f12065a
+.field public static final exo_controls_fullscreen_description:I = 0x7f12065c
 
-.field public static final exo_controls_hide:I = 0x7f12065b
+.field public static final exo_controls_hide:I = 0x7f12065d
 
-.field public static final exo_controls_next_description:I = 0x7f12065c
+.field public static final exo_controls_next_description:I = 0x7f12065e
 
-.field public static final exo_controls_pause_description:I = 0x7f12065d
+.field public static final exo_controls_pause_description:I = 0x7f12065f
 
-.field public static final exo_controls_play_description:I = 0x7f12065e
+.field public static final exo_controls_play_description:I = 0x7f120660
 
-.field public static final exo_controls_previous_description:I = 0x7f12065f
+.field public static final exo_controls_previous_description:I = 0x7f120661
 
-.field public static final exo_controls_repeat_all_description:I = 0x7f120660
+.field public static final exo_controls_repeat_all_description:I = 0x7f120662
 
-.field public static final exo_controls_repeat_off_description:I = 0x7f120661
+.field public static final exo_controls_repeat_off_description:I = 0x7f120663
 
-.field public static final exo_controls_repeat_one_description:I = 0x7f120662
+.field public static final exo_controls_repeat_one_description:I = 0x7f120664
 
-.field public static final exo_controls_rewind_description:I = 0x7f120663
+.field public static final exo_controls_rewind_description:I = 0x7f120665
 
-.field public static final exo_controls_show:I = 0x7f120664
+.field public static final exo_controls_show:I = 0x7f120666
 
-.field public static final exo_controls_shuffle_off_description:I = 0x7f120665
+.field public static final exo_controls_shuffle_off_description:I = 0x7f120667
 
-.field public static final exo_controls_shuffle_on_description:I = 0x7f120666
+.field public static final exo_controls_shuffle_on_description:I = 0x7f120668
 
-.field public static final exo_controls_stop_description:I = 0x7f120667
+.field public static final exo_controls_stop_description:I = 0x7f120669
 
-.field public static final exo_controls_vr_description:I = 0x7f120668
+.field public static final exo_controls_vr_description:I = 0x7f12066a
 
-.field public static final exo_download_completed:I = 0x7f120669
+.field public static final exo_download_completed:I = 0x7f12066b
 
-.field public static final exo_download_description:I = 0x7f12066a
+.field public static final exo_download_description:I = 0x7f12066c
 
-.field public static final exo_download_downloading:I = 0x7f12066b
+.field public static final exo_download_downloading:I = 0x7f12066d
 
-.field public static final exo_download_failed:I = 0x7f12066c
+.field public static final exo_download_failed:I = 0x7f12066e
 
-.field public static final exo_download_notification_channel_name:I = 0x7f12066d
+.field public static final exo_download_notification_channel_name:I = 0x7f12066f
 
-.field public static final exo_download_removing:I = 0x7f12066e
+.field public static final exo_download_removing:I = 0x7f120670
 
-.field public static final exo_item_list:I = 0x7f12066f
+.field public static final exo_item_list:I = 0x7f120671
 
-.field public static final exo_track_bitrate:I = 0x7f120670
+.field public static final exo_track_bitrate:I = 0x7f120672
 
-.field public static final exo_track_mono:I = 0x7f120671
+.field public static final exo_track_mono:I = 0x7f120673
 
-.field public static final exo_track_resolution:I = 0x7f120672
+.field public static final exo_track_resolution:I = 0x7f120674
 
-.field public static final exo_track_role_alternate:I = 0x7f120673
+.field public static final exo_track_role_alternate:I = 0x7f120675
 
-.field public static final exo_track_role_closed_captions:I = 0x7f120674
+.field public static final exo_track_role_closed_captions:I = 0x7f120676
 
-.field public static final exo_track_role_commentary:I = 0x7f120675
+.field public static final exo_track_role_commentary:I = 0x7f120677
 
-.field public static final exo_track_role_supplementary:I = 0x7f120676
+.field public static final exo_track_role_supplementary:I = 0x7f120678
 
-.field public static final exo_track_selection_auto:I = 0x7f120677
+.field public static final exo_track_selection_auto:I = 0x7f120679
 
-.field public static final exo_track_selection_none:I = 0x7f120678
+.field public static final exo_track_selection_none:I = 0x7f12067a
 
-.field public static final exo_track_selection_title_audio:I = 0x7f120679
+.field public static final exo_track_selection_title_audio:I = 0x7f12067b
 
-.field public static final exo_track_selection_title_text:I = 0x7f12067a
+.field public static final exo_track_selection_title_text:I = 0x7f12067c
 
-.field public static final exo_track_selection_title_video:I = 0x7f12067b
+.field public static final exo_track_selection_title_video:I = 0x7f12067d
 
-.field public static final exo_track_stereo:I = 0x7f12067c
+.field public static final exo_track_stereo:I = 0x7f12067e
 
-.field public static final exo_track_surround:I = 0x7f12067d
+.field public static final exo_track_surround:I = 0x7f12067f
 
-.field public static final exo_track_surround_5_point_1:I = 0x7f12067e
+.field public static final exo_track_surround_5_point_1:I = 0x7f120680
 
-.field public static final exo_track_surround_7_point_1:I = 0x7f12067f
+.field public static final exo_track_surround_7_point_1:I = 0x7f120681
 
-.field public static final exo_track_unknown:I = 0x7f120680
+.field public static final exo_track_unknown:I = 0x7f120682
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$g.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$g.smali
index 9476ac858d..f9ff7447c3 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$g.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$g.smali
@@ -330,13 +330,13 @@
         0x7f040094
         0x7f0403f1
         0x7f0403f2
-        0x7f04046b
-        0x7f04046c
-        0x7f04046d
-        0x7f04046e
-        0x7f04046f
-        0x7f040569
-        0x7f040587
+        0x7f04045d
+        0x7f04045e
+        0x7f04045f
+        0x7f040460
+        0x7f040461
+        0x7f04055b
+        0x7f040579
     .end array-data
 
     :array_2
@@ -360,7 +360,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_4
@@ -397,16 +397,16 @@
         0x7f0403f2
         0x7f040441
         0x7f040446
-        0x7f04046b
-        0x7f04046c
-        0x7f04046d
-        0x7f04046e
-        0x7f04046f
-        0x7f040495
-        0x7f040496
-        0x7f040550
-        0x7f040569
-        0x7f040587
+        0x7f04045d
+        0x7f04045e
+        0x7f04045f
+        0x7f040460
+        0x7f040461
+        0x7f040487
+        0x7f040488
+        0x7f040542
+        0x7f04055b
+        0x7f040579
     .end array-data
 
     :array_7
@@ -428,21 +428,21 @@
         0x7f040441
         0x7f040442
         0x7f040446
-        0x7f04046b
-        0x7f04046c
-        0x7f04046d
-        0x7f04046e
-        0x7f04046f
-        0x7f040494
-        0x7f040495
-        0x7f040496
-        0x7f040498
-        0x7f0404cc
-        0x7f040550
-        0x7f040569
-        0x7f040587
-        0x7f04058c
-        0x7f04058d
+        0x7f04045d
+        0x7f04045e
+        0x7f04045f
+        0x7f040460
+        0x7f040461
+        0x7f040486
+        0x7f040487
+        0x7f040488
+        0x7f04048a
+        0x7f0404be
+        0x7f040542
+        0x7f04055b
+        0x7f040579
+        0x7f04057e
+        0x7f04057f
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.smali
index cc33be31e4..dde23fbbe6 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.smali
@@ -1846,7 +1846,7 @@
 
     iget-object v5, v3, Lcom/google/android/exoplayer2/Format;->n:Ljava/util/List;
 
-    invoke-static {v7, v5}, Ld0/a/b/b/a;->Q0(Landroid/media/MediaFormat;Ljava/util/List;)V
+    invoke-static {v7, v5}, Le0/a/b/b/a;->Q0(Landroid/media/MediaFormat;Ljava/util/List;)V
 
     iget v5, v3, Lcom/google/android/exoplayer2/Format;->s:F
 
@@ -1865,7 +1865,7 @@
 
     const-string v9, "rotation-degrees"
 
-    invoke-static {v7, v9, v5}, Ld0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    invoke-static {v7, v9, v5}, Le0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
 
     iget-object v5, v3, Lcom/google/android/exoplayer2/Format;->x:Lcom/google/android/exoplayer2/video/ColorInfo;
 
@@ -1875,19 +1875,19 @@
 
     const-string v10, "color-transfer"
 
-    invoke-static {v7, v10, v9}, Ld0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    invoke-static {v7, v10, v9}, Le0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
 
     iget v9, v5, Lcom/google/android/exoplayer2/video/ColorInfo;->d:I
 
     const-string v10, "color-standard"
 
-    invoke-static {v7, v10, v9}, Ld0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    invoke-static {v7, v10, v9}, Le0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
 
     iget v9, v5, Lcom/google/android/exoplayer2/video/ColorInfo;->e:I
 
     const-string v10, "color-range"
 
-    invoke-static {v7, v10, v9}, Ld0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    invoke-static {v7, v10, v9}, Le0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
 
     iget-object v5, v5, Lcom/google/android/exoplayer2/video/ColorInfo;->g:[B
 
@@ -1928,7 +1928,7 @@
 
     const-string v5, "profile"
 
-    invoke-static {v7, v5, v3}, Ld0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    invoke-static {v7, v5, v3}, Le0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
 
     :cond_16
     iget v3, v6, Lcom/google/android/exoplayer2/video/MediaCodecVideoRenderer$a;->a:I
@@ -1947,7 +1947,7 @@
 
     const-string v5, "max-input-size"
 
-    invoke-static {v7, v5, v3}, Ld0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    invoke-static {v7, v5, v3}, Le0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
 
     sget v3, Lf/h/a/c/i1/c0;->a:I
 
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/R$a.smali b/com.discord/smali_classes2/com/google/android/flexbox/R$a.smali
index d9142ed6b4..09e8def972 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/R$a.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/R$a.smali
@@ -98,9 +98,9 @@
         0x7f040241
         0x7f040323
         0x7f0403bf
-        0x7f04048c
-        0x7f04048d
-        0x7f04048e
+        0x7f04047e
+        0x7f04047f
+        0x7f040480
     .end array-data
 
     :array_1
diff --git a/com.discord/smali_classes2/com/google/android/gms/base/R$a.smali b/com.discord/smali_classes2/com/google/android/gms/base/R$a.smali
index eb23740f04..dca0b4bb03 100644
--- a/com.discord/smali_classes2/com/google/android/gms/base/R$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/base/R$a.smali
@@ -52,9 +52,9 @@
 
 .field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800e0
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801f4
+.field public static final googleg_disabled_color_18:I = 0x7f0801f5
 
-.field public static final googleg_standard_color_18:I = 0x7f0801f5
+.field public static final googleg_standard_color_18:I = 0x7f0801f6
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/base/R$b.smali b/com.discord/smali_classes2/com/google/android/gms/base/R$b.smali
index 173ec83dab..b8b4b98d7f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/base/R$b.smali
+++ b/com.discord/smali_classes2/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 = 0x7f120465
+.field public static final common_google_play_services_enable_button:I = 0x7f120466
 
-.field public static final common_google_play_services_enable_text:I = 0x7f120466
+.field public static final common_google_play_services_enable_text:I = 0x7f120467
 
-.field public static final common_google_play_services_enable_title:I = 0x7f120467
+.field public static final common_google_play_services_enable_title:I = 0x7f120468
 
-.field public static final common_google_play_services_install_button:I = 0x7f120468
+.field public static final common_google_play_services_install_button:I = 0x7f120469
 
-.field public static final common_google_play_services_install_text:I = 0x7f120469
+.field public static final common_google_play_services_install_text:I = 0x7f12046a
 
-.field public static final common_google_play_services_install_title:I = 0x7f12046a
+.field public static final common_google_play_services_install_title:I = 0x7f12046b
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046b
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046c
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f12046c
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12046d
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046e
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046f
 
-.field public static final common_google_play_services_update_button:I = 0x7f12046f
+.field public static final common_google_play_services_update_button:I = 0x7f120470
 
-.field public static final common_google_play_services_update_text:I = 0x7f120470
+.field public static final common_google_play_services_update_text:I = 0x7f120471
 
-.field public static final common_google_play_services_update_title:I = 0x7f120471
+.field public static final common_google_play_services_update_title:I = 0x7f120472
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120472
+.field public static final common_google_play_services_updating_text:I = 0x7f120473
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120473
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120474
 
-.field public static final common_open_on_phone:I = 0x7f120474
+.field public static final common_open_on_phone:I = 0x7f120475
 
-.field public static final common_signin_button_text:I = 0x7f120475
+.field public static final common_signin_button_text:I = 0x7f120476
 
-.field public static final common_signin_button_text_long:I = 0x7f120476
+.field public static final common_signin_button_text_long:I = 0x7f120477
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/R$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/R$a.smali
index f21c788761..4257c1c6a1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/R$a.smali
+++ b/com.discord/smali_classes2/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 = 0x7f12046d
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046e
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$a.smali
index 9f88377b60..dbe76652a3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/internal/BasePendingResult$a.smali
@@ -51,7 +51,7 @@
 
     const-string v1, "Don\'t know how to handle message: "
 
-    invoke-static {p1, v1, v0}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {p1, v1, v0}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/stats/StatsEvent.smali b/com.discord/smali_classes2/com/google/android/gms/common/stats/StatsEvent.smali
index 70a750bb4c..d35ca6e3c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/stats/StatsEvent.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/stats/StatsEvent.smali
@@ -132,7 +132,7 @@
 
     invoke-virtual {v14, v10}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    invoke-static {v14, v15, v11, v15, v12}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v14, v15, v11, v15, v12}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {v14, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule.smali b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule.smali
index 6665d70a68..ea0d803c87 100644
--- a/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/dynamite/DynamiteModule.smali
@@ -280,7 +280,7 @@
 
     const-string v3, " not found."
 
-    invoke-static {p0, v2, p1, v3, v0}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p0, v2, p1, v3, v0}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_1
     return v1
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/icing/zzk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/icing/zzk.smali
index af946d1ef4..de8df6d458 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/icing/zzk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/icing/zzk.smali
@@ -129,7 +129,7 @@
 
     iget p1, p0, Lcom/google/android/gms/internal/icing/zzk;->f:I
 
-    invoke-static {v2, v3, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v2, v3, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy.smali
index d7e4289c71..f3158be64b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/Strategy.smali
@@ -331,7 +331,7 @@
 
     if-eq v1, v4, :cond_0
 
-    invoke-static {v3, v2, v1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v3, v2, v1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v1
 
@@ -385,7 +385,7 @@
 
     if-eqz v8, :cond_5
 
-    invoke-static {v3, v2, v6}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v3, v2, v6}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v6
 
@@ -436,7 +436,7 @@
 
     if-eqz v9, :cond_9
 
-    invoke-static {v3, v2, v7}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v3, v2, v7}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v2
 
@@ -458,7 +458,7 @@
 
     const-string v5, "UNKNOWN: "
 
-    invoke-static {v4, v5, v3}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v4, v5, v3}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v5
 
@@ -507,7 +507,7 @@
 
     const-string v1, ", discoveryMode="
 
-    invoke-static {v4, v0, v6, v1, v2}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v4, v0, v6, v1, v2}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v0, ", backgroundScanMode="
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/SubscribeRequest.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/SubscribeRequest.smali
index 891aba2982..12d76f39f6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/SubscribeRequest.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/SubscribeRequest.smali
@@ -456,13 +456,13 @@
 
     const-string v2, ", filter="
 
-    invoke-static {v0, v1, v3, v2, v4}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v1, v3, v2, v4}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v1, ", pendingIntent="
 
     const-string v2, ", hint="
 
-    invoke-static {v0, v1, v5, v2, v6}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v1, v5, v2, v6}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v1, ", subscribeCallback="
 
@@ -492,7 +492,7 @@
 
     const-string v2, ", realClientPackageName="
 
-    invoke-static {v0, v1, v11, v2, v12}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v1, v11, v2, v12}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v1, ", isIgnoreNearbyPermission="
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/Update.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/Update.smali
index af0dfcd682..400eed5af3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/Update.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/internal/Update.smali
@@ -453,13 +453,13 @@
 
     const-string v6, ", bleSignal="
 
-    invoke-static {v0, v1, v2, v6, v3}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v1, v2, v6, v3}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v1, ", device="
 
     const-string v2, ", bleRecord="
 
-    invoke-static {v0, v1, v4, v2, v5}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v1, v4, v2, v5}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v1, "}"
 
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 1e2e5602ca..163c715e8c 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
@@ -974,373 +974,373 @@
 
 .field public static final rippleColor:I = 0x7f040447
 
-.field public static final scrimAnimationDuration:I = 0x7f040468
+.field public static final scrimAnimationDuration:I = 0x7f04045a
 
-.field public static final scrimBackground:I = 0x7f040469
+.field public static final scrimBackground:I = 0x7f04045b
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f04046a
+.field public static final scrimVisibleHeightTrigger:I = 0x7f04045c
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final selectionRequired:I = 0x7f040480
+.field public static final selectionRequired:I = 0x7f040472
 
-.field public static final shapeAppearance:I = 0x7f040484
+.field public static final shapeAppearance:I = 0x7f040476
 
-.field public static final shapeAppearanceLargeComponent:I = 0x7f040485
+.field public static final shapeAppearanceLargeComponent:I = 0x7f040477
 
-.field public static final shapeAppearanceMediumComponent:I = 0x7f040486
+.field public static final shapeAppearanceMediumComponent:I = 0x7f040478
 
-.field public static final shapeAppearanceOverlay:I = 0x7f040487
+.field public static final shapeAppearanceOverlay:I = 0x7f040479
 
-.field public static final shapeAppearanceSmallComponent:I = 0x7f040488
+.field public static final shapeAppearanceSmallComponent:I = 0x7f04047a
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final showMotionSpec:I = 0x7f040490
+.field public static final showMotionSpec:I = 0x7f040482
 
-.field public static final showText:I = 0x7f040492
+.field public static final showText:I = 0x7f040484
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final shrinkMotionSpec:I = 0x7f040497
+.field public static final shrinkMotionSpec:I = 0x7f040489
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final singleLine:I = 0x7f04049a
+.field public static final singleLine:I = 0x7f04048c
 
-.field public static final singleSelection:I = 0x7f04049c
+.field public static final singleSelection:I = 0x7f04048e
 
-.field public static final sliderStyle:I = 0x7f04049d
+.field public static final sliderStyle:I = 0x7f04048f
 
-.field public static final snackbarButtonStyle:I = 0x7f04049e
+.field public static final snackbarButtonStyle:I = 0x7f040490
 
-.field public static final snackbarStyle:I = 0x7f04049f
+.field public static final snackbarStyle:I = 0x7f040491
 
-.field public static final snackbarTextViewStyle:I = 0x7f0404a0
+.field public static final snackbarTextViewStyle:I = 0x7f040492
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final startIconCheckable:I = 0x7f0404aa
+.field public static final startIconCheckable:I = 0x7f04049c
 
-.field public static final startIconContentDescription:I = 0x7f0404ab
+.field public static final startIconContentDescription:I = 0x7f04049d
 
-.field public static final startIconDrawable:I = 0x7f0404ac
+.field public static final startIconDrawable:I = 0x7f04049e
 
-.field public static final startIconTint:I = 0x7f0404ad
+.field public static final startIconTint:I = 0x7f04049f
 
-.field public static final startIconTintMode:I = 0x7f0404ae
+.field public static final startIconTintMode:I = 0x7f0404a0
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final state_collapsed:I = 0x7f0404b0
+.field public static final state_collapsed:I = 0x7f0404a2
 
-.field public static final state_collapsible:I = 0x7f0404b1
+.field public static final state_collapsible:I = 0x7f0404a3
 
-.field public static final state_dragged:I = 0x7f0404b2
+.field public static final state_dragged:I = 0x7f0404a4
 
-.field public static final state_liftable:I = 0x7f0404b3
+.field public static final state_liftable:I = 0x7f0404a5
 
-.field public static final state_lifted:I = 0x7f0404b4
+.field public static final state_lifted:I = 0x7f0404a6
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final statusBarForeground:I = 0x7f0404b6
+.field public static final statusBarForeground:I = 0x7f0404a8
 
-.field public static final statusBarScrim:I = 0x7f0404b7
+.field public static final statusBarScrim:I = 0x7f0404a9
 
-.field public static final strokeColor:I = 0x7f0404ba
+.field public static final strokeColor:I = 0x7f0404ac
 
-.field public static final strokeWidth:I = 0x7f0404bb
+.field public static final strokeWidth:I = 0x7f0404ad
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final suffixText:I = 0x7f0404c5
+.field public static final suffixText:I = 0x7f0404b7
 
-.field public static final suffixTextAppearance:I = 0x7f0404c6
+.field public static final suffixTextAppearance:I = 0x7f0404b8
 
-.field public static final suffixTextColor:I = 0x7f0404c7
+.field public static final suffixTextColor:I = 0x7f0404b9
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final tabBackground:I = 0x7f0404da
+.field public static final tabBackground:I = 0x7f0404cc
 
-.field public static final tabContentStart:I = 0x7f0404db
+.field public static final tabContentStart:I = 0x7f0404cd
 
-.field public static final tabGravity:I = 0x7f0404dc
+.field public static final tabGravity:I = 0x7f0404ce
 
-.field public static final tabIconTint:I = 0x7f0404dd
+.field public static final tabIconTint:I = 0x7f0404cf
 
-.field public static final tabIconTintMode:I = 0x7f0404de
+.field public static final tabIconTintMode:I = 0x7f0404d0
 
-.field public static final tabIndicator:I = 0x7f0404df
+.field public static final tabIndicator:I = 0x7f0404d1
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f0404e0
+.field public static final tabIndicatorAnimationDuration:I = 0x7f0404d2
 
-.field public static final tabIndicatorColor:I = 0x7f0404e1
+.field public static final tabIndicatorColor:I = 0x7f0404d3
 
-.field public static final tabIndicatorFullWidth:I = 0x7f0404e2
+.field public static final tabIndicatorFullWidth:I = 0x7f0404d4
 
-.field public static final tabIndicatorGravity:I = 0x7f0404e3
+.field public static final tabIndicatorGravity:I = 0x7f0404d5
 
-.field public static final tabIndicatorHeight:I = 0x7f0404e4
+.field public static final tabIndicatorHeight:I = 0x7f0404d6
 
-.field public static final tabInlineLabel:I = 0x7f0404e5
+.field public static final tabInlineLabel:I = 0x7f0404d7
 
-.field public static final tabMaxWidth:I = 0x7f0404e6
+.field public static final tabMaxWidth:I = 0x7f0404d8
 
-.field public static final tabMinWidth:I = 0x7f0404e7
+.field public static final tabMinWidth:I = 0x7f0404d9
 
-.field public static final tabMode:I = 0x7f0404e8
+.field public static final tabMode:I = 0x7f0404da
 
-.field public static final tabPadding:I = 0x7f0404e9
+.field public static final tabPadding:I = 0x7f0404db
 
-.field public static final tabPaddingBottom:I = 0x7f0404ea
+.field public static final tabPaddingBottom:I = 0x7f0404dc
 
-.field public static final tabPaddingEnd:I = 0x7f0404eb
+.field public static final tabPaddingEnd:I = 0x7f0404dd
 
-.field public static final tabPaddingStart:I = 0x7f0404ec
+.field public static final tabPaddingStart:I = 0x7f0404de
 
-.field public static final tabPaddingTop:I = 0x7f0404ed
+.field public static final tabPaddingTop:I = 0x7f0404df
 
-.field public static final tabRippleColor:I = 0x7f0404ee
+.field public static final tabRippleColor:I = 0x7f0404e0
 
-.field public static final tabSelectedTextColor:I = 0x7f0404ef
+.field public static final tabSelectedTextColor:I = 0x7f0404e1
 
-.field public static final tabStyle:I = 0x7f0404f0
+.field public static final tabStyle:I = 0x7f0404e2
 
-.field public static final tabTextAppearance:I = 0x7f0404f1
+.field public static final tabTextAppearance:I = 0x7f0404e3
 
-.field public static final tabTextColor:I = 0x7f0404f2
+.field public static final tabTextColor:I = 0x7f0404e4
 
-.field public static final tabUnboundedRipple:I = 0x7f0404f3
+.field public static final tabUnboundedRipple:I = 0x7f0404e5
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final textAppearanceBody1:I = 0x7f0404f9
+.field public static final textAppearanceBody1:I = 0x7f0404eb
 
-.field public static final textAppearanceBody2:I = 0x7f0404fa
+.field public static final textAppearanceBody2:I = 0x7f0404ec
 
-.field public static final textAppearanceButton:I = 0x7f0404fb
+.field public static final textAppearanceButton:I = 0x7f0404ed
 
-.field public static final textAppearanceCaption:I = 0x7f0404fc
+.field public static final textAppearanceCaption:I = 0x7f0404ee
 
-.field public static final textAppearanceHeadline1:I = 0x7f0404fd
+.field public static final textAppearanceHeadline1:I = 0x7f0404ef
 
-.field public static final textAppearanceHeadline2:I = 0x7f0404fe
+.field public static final textAppearanceHeadline2:I = 0x7f0404f0
 
-.field public static final textAppearanceHeadline3:I = 0x7f0404ff
+.field public static final textAppearanceHeadline3:I = 0x7f0404f1
 
-.field public static final textAppearanceHeadline4:I = 0x7f040500
+.field public static final textAppearanceHeadline4:I = 0x7f0404f2
 
-.field public static final textAppearanceHeadline5:I = 0x7f040501
+.field public static final textAppearanceHeadline5:I = 0x7f0404f3
 
-.field public static final textAppearanceHeadline6:I = 0x7f040502
+.field public static final textAppearanceHeadline6:I = 0x7f0404f4
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final textAppearanceLineHeightEnabled:I = 0x7f040504
+.field public static final textAppearanceLineHeightEnabled:I = 0x7f0404f6
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearanceOverline:I = 0x7f040508
+.field public static final textAppearanceOverline:I = 0x7f0404fa
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04050d
+.field public static final textAppearanceSubtitle1:I = 0x7f0404ff
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04050e
+.field public static final textAppearanceSubtitle2:I = 0x7f040500
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final textEndPadding:I = 0x7f040511
+.field public static final textEndPadding:I = 0x7f040503
 
-.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040512
+.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040504
 
-.field public static final textInputStyle:I = 0x7f040513
+.field public static final textInputStyle:I = 0x7f040505
 
-.field public static final textLocale:I = 0x7f040514
+.field public static final textLocale:I = 0x7f040506
 
-.field public static final textStartPadding:I = 0x7f040515
+.field public static final textStartPadding:I = 0x7f040507
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme:I = 0x7f040509
 
-.field public static final themeLineHeight:I = 0x7f040518
+.field public static final themeLineHeight:I = 0x7f04050a
 
-.field public static final thickness:I = 0x7f040543
+.field public static final thickness:I = 0x7f040535
 
-.field public static final thumbColor:I = 0x7f040544
+.field public static final thumbColor:I = 0x7f040536
 
-.field public static final thumbElevation:I = 0x7f040545
+.field public static final thumbElevation:I = 0x7f040537
 
-.field public static final thumbRadius:I = 0x7f040546
+.field public static final thumbRadius:I = 0x7f040538
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final tickColor:I = 0x7f04054a
+.field public static final tickColor:I = 0x7f04053c
 
-.field public static final tickColorActive:I = 0x7f04054b
+.field public static final tickColorActive:I = 0x7f04053d
 
-.field public static final tickColorInactive:I = 0x7f04054c
+.field public static final tickColorInactive:I = 0x7f04053e
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final tint:I = 0x7f040551
+.field public static final tint:I = 0x7f040543
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final title:I = 0x7f040553
+.field public static final title:I = 0x7f040545
 
-.field public static final titleEnabled:I = 0x7f040554
+.field public static final titleEnabled:I = 0x7f040546
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final toolbarId:I = 0x7f040560
+.field public static final toolbarId:I = 0x7f040552
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final tooltipStyle:I = 0x7f040565
+.field public static final tooltipStyle:I = 0x7f040557
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final track:I = 0x7f04056a
+.field public static final track:I = 0x7f04055c
 
-.field public static final trackColor:I = 0x7f04056b
+.field public static final trackColor:I = 0x7f04055d
 
-.field public static final trackColorActive:I = 0x7f04056c
+.field public static final trackColorActive:I = 0x7f04055e
 
-.field public static final trackColorInactive:I = 0x7f04056d
+.field public static final trackColorInactive:I = 0x7f04055f
 
-.field public static final trackHeight:I = 0x7f04056e
+.field public static final trackHeight:I = 0x7f040560
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final transitionShapeAppearance:I = 0x7f040571
+.field public static final transitionShapeAppearance:I = 0x7f040563
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final useCompatPadding:I = 0x7f040589
+.field public static final useCompatPadding:I = 0x7f04057b
 
-.field public static final useMaterialThemeColors:I = 0x7f04058a
+.field public static final useMaterialThemeColors:I = 0x7f04057c
 
-.field public static final values:I = 0x7f040598
+.field public static final values:I = 0x7f04058a
 
-.field public static final verticalOffset:I = 0x7f04059b
+.field public static final verticalOffset:I = 0x7f04058d
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final windowActionBar:I = 0x7f0405a1
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final windowNoTitle:I = 0x7f0405aa
+.field public static final windowNoTitle:I = 0x7f04059c
 
-.field public static final yearSelectedStyle:I = 0x7f0405ab
+.field public static final yearSelectedStyle:I = 0x7f04059d
 
-.field public static final yearStyle:I = 0x7f0405ac
+.field public static final yearStyle:I = 0x7f04059e
 
-.field public static final yearTodayStyle:I = 0x7f0405ad
+.field public static final yearTodayStyle:I = 0x7f04059f
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali
index bf8c351a89..2f5911ca28 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali
@@ -218,77 +218,77 @@
 
 .field public static final design_snackbar_background:I = 0x7f0800eb
 
-.field public static final ic_mtrl_checked_circle:I = 0x7f08034f
+.field public static final ic_mtrl_checked_circle:I = 0x7f080352
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080350
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080353
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080351
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080354
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080352
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080355
 
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804e9
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ec
 
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804ea
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804ed
 
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804eb
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804ee
 
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ec
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ef
 
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804ed
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f0
 
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804ee
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f1
 
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f2
 
-.field public static final mtrl_dialog_background:I = 0x7f0804f0
+.field public static final mtrl_dialog_background:I = 0x7f0804f3
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f1
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f4
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f2
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f5
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f3
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f6
 
-.field public static final mtrl_ic_cancel:I = 0x7f0804f4
+.field public static final mtrl_ic_cancel:I = 0x7f0804f7
 
-.field public static final mtrl_ic_error:I = 0x7f0804f5
+.field public static final mtrl_ic_error:I = 0x7f0804f8
 
-.field public static final mtrl_popupmenu_background:I = 0x7f0804f6
+.field public static final mtrl_popupmenu_background:I = 0x7f0804f9
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f7
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fa
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f8
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fb
 
-.field public static final navigation_empty_icon:I = 0x7f0804f9
+.field public static final navigation_empty_icon:I = 0x7f0804fc
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final test_custom_background:I = 0x7f080518
+.field public static final test_custom_background:I = 0x7f08051c
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$id.smali b/com.discord/smali_classes2/com/google/android/material/R$id.smali
index 3e45cc1d21..dca4fa14da 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$id.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$id.smali
@@ -142,393 +142,393 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final cancel_button:I = 0x7f0a013d
+.field public static final cancel_button:I = 0x7f0a0140
 
-.field public static final center:I = 0x7f0a0141
+.field public static final center:I = 0x7f0a0144
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0266
 
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0267
 
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0268
 
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0269
 
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a026a
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026f
 
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a0270
 
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027b
 
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028c
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0292
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02ba
 
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bd
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c6
 
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c7
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c8
 
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c9
 
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02ca
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02ff
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a038d
 
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a4
 
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a7
 
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03b1
 
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c6
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e9
 
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03ea
 
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0416
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ee
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a057d
 
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057f
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058e
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a05a1
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final mini:I = 0x7f0a05df
+.field public static final mini:I = 0x7f0a05e5
 
-.field public static final month_grid:I = 0x7f0a05e1
+.field public static final month_grid:I = 0x7f0a05e7
 
-.field public static final month_navigation_bar:I = 0x7f0a05e2
+.field public static final month_navigation_bar:I = 0x7f0a05e8
 
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e3
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e9
 
-.field public static final month_navigation_next:I = 0x7f0a05e4
+.field public static final month_navigation_next:I = 0x7f0a05ea
 
-.field public static final month_navigation_previous:I = 0x7f0a05e5
+.field public static final month_navigation_previous:I = 0x7f0a05eb
 
-.field public static final month_title:I = 0x7f0a05e6
+.field public static final month_title:I = 0x7f0a05ec
 
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e7
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05ed
 
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e8
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ee
 
-.field public static final mtrl_calendar_frame:I = 0x7f0a05e9
+.field public static final mtrl_calendar_frame:I = 0x7f0a05ef
 
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ea
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05f0
 
-.field public static final mtrl_calendar_months:I = 0x7f0a05eb
+.field public static final mtrl_calendar_months:I = 0x7f0a05f1
 
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ec
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f2
 
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f3
 
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05ee
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f4
 
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05ef
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f5
 
-.field public static final mtrl_child_content_container:I = 0x7f0a05f0
+.field public static final mtrl_child_content_container:I = 0x7f0a05f6
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f1
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f7
 
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f2
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f8
 
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f3
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f9
 
-.field public static final mtrl_picker_header:I = 0x7f0a05f4
+.field public static final mtrl_picker_header:I = 0x7f0a05fa
 
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f5
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05fb
 
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f6
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fc
 
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f7
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fd
 
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f8
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fe
 
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f9
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05ff
 
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fa
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a0600
 
-.field public static final mtrl_picker_title_text:I = 0x7f0a05fb
+.field public static final mtrl_picker_title_text:I = 0x7f0a0601
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final navigation_header_container:I = 0x7f0a060e
+.field public static final navigation_header_container:I = 0x7f0a0614
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final outgoing:I = 0x7f0a066a
+.field public static final outgoing:I = 0x7f0a0670
 
-.field public static final outline:I = 0x7f0a066b
+.field public static final outline:I = 0x7f0a0671
 
-.field public static final parallax:I = 0x7f0a067b
+.field public static final parallax:I = 0x7f0a0681
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final parent_matrix:I = 0x7f0a067e
+.field public static final parent_matrix:I = 0x7f0a0684
 
-.field public static final password_toggle:I = 0x7f0a068c
+.field public static final password_toggle:I = 0x7f0a0692
 
-.field public static final pin:I = 0x7f0a06b9
+.field public static final pin:I = 0x7f0a06bf
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final rounded:I = 0x7f0a0786
+.field public static final rounded:I = 0x7f0a078c
 
-.field public static final row_index_key:I = 0x7f0a0788
+.field public static final row_index_key:I = 0x7f0a078e
 
-.field public static final save_non_transition_alpha:I = 0x7f0a078a
+.field public static final save_non_transition_alpha:I = 0x7f0a0790
 
-.field public static final save_overlay_view:I = 0x7f0a078b
+.field public static final save_overlay_view:I = 0x7f0a0791
 
-.field public static final scale:I = 0x7f0a078c
+.field public static final scale:I = 0x7f0a0792
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final scrollable:I = 0x7f0a0796
+.field public static final scrollable:I = 0x7f0a079c
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final selected:I = 0x7f0a07b2
+.field public static final selected:I = 0x7f0a07b8
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final slide:I = 0x7f0a0916
+.field public static final slide:I = 0x7f0a091a
 
-.field public static final smallLabel:I = 0x7f0a0917
+.field public static final smallLabel:I = 0x7f0a091b
 
-.field public static final snackbar_action:I = 0x7f0a0918
+.field public static final snackbar_action:I = 0x7f0a091c
 
-.field public static final snackbar_text:I = 0x7f0a0919
+.field public static final snackbar_text:I = 0x7f0a091d
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final stretch:I = 0x7f0a0948
+.field public static final stretch:I = 0x7f0a094c
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0976
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a097a
 
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a097b
 
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0978
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a097c
 
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097d
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final text_input_end_icon:I = 0x7f0a0981
+.field public static final text_input_end_icon:I = 0x7f0a0985
 
-.field public static final text_input_start_icon:I = 0x7f0a0982
+.field public static final text_input_start_icon:I = 0x7f0a0986
 
-.field public static final textinput_counter:I = 0x7f0a0985
+.field public static final textinput_counter:I = 0x7f0a0989
 
-.field public static final textinput_error:I = 0x7f0a0986
+.field public static final textinput_error:I = 0x7f0a098a
 
-.field public static final textinput_helper_text:I = 0x7f0a0987
+.field public static final textinput_helper_text:I = 0x7f0a098b
 
-.field public static final textinput_placeholder:I = 0x7f0a0988
+.field public static final textinput_placeholder:I = 0x7f0a098c
 
-.field public static final textinput_prefix_text:I = 0x7f0a0989
+.field public static final textinput_prefix_text:I = 0x7f0a098d
 
-.field public static final textinput_suffix_text:I = 0x7f0a098a
+.field public static final textinput_suffix_text:I = 0x7f0a098e
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final touch_outside:I = 0x7f0a099c
+.field public static final touch_outside:I = 0x7f0a09a0
 
-.field public static final transition_current_scene:I = 0x7f0a099d
+.field public static final transition_current_scene:I = 0x7f0a09a1
 
-.field public static final transition_layout_save:I = 0x7f0a099e
+.field public static final transition_layout_save:I = 0x7f0a09a2
 
-.field public static final transition_position:I = 0x7f0a099f
+.field public static final transition_position:I = 0x7f0a09a3
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a0
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a4
 
-.field public static final transition_transform:I = 0x7f0a09a1
+.field public static final transition_transform:I = 0x7f0a09a5
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final unlabeled:I = 0x7f0a09b4
+.field public static final unlabeled:I = 0x7f0a09b8
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final view_offset_helper:I = 0x7f0a0a38
+.field public static final view_offset_helper:I = 0x7f0a0a3c
 
-.field public static final visible:I = 0x7f0a0a4c
+.field public static final visible:I = 0x7f0a0a50
 
-.field public static final withinBounds:I = 0x7f0a0ab6
+.field public static final withinBounds:I = 0x7f0a0abb
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
-.field public static final zero_corner_chip:I = 0x7f0a0abe
+.field public static final zero_corner_chip:I = 0x7f0a0ac3
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$plurals.smali b/com.discord/smali_classes2/com/google/android/material/R$plurals.smali
index 4093f1ebe9..a440600046 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$plurals.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$plurals.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final mtrl_badge_content_description:I = 0x7f1000b3
+.field public static final mtrl_badge_content_description:I = 0x7f1000b5
 
 
 # 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 1b895d2fe4..cab20cb758 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
@@ -72,115 +72,115 @@
 
 .field public static final bottom_sheet_behavior:I = 0x7f120357
 
-.field public static final character_counter_content_description:I = 0x7f12041e
+.field public static final character_counter_content_description:I = 0x7f12041f
 
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041f
+.field public static final character_counter_overflowed_content_description:I = 0x7f120420
 
-.field public static final character_counter_pattern:I = 0x7f120420
+.field public static final character_counter_pattern:I = 0x7f120421
 
-.field public static final chip_text:I = 0x7f120429
+.field public static final chip_text:I = 0x7f12042a
 
-.field public static final clear_text_end_icon_content_description:I = 0x7f120436
+.field public static final clear_text_end_icon_content_description:I = 0x7f120437
 
-.field public static final error_icon_content_description:I = 0x7f12064a
+.field public static final error_icon_content_description:I = 0x7f12064c
 
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068f
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f120691
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120698
+.field public static final fab_transformation_scrim_behavior:I = 0x7f12069a
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120699
+.field public static final fab_transformation_sheet_behavior:I = 0x7f12069b
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bd9
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bff
 
-.field public static final icon_content_description:I = 0x7f120c66
+.field public static final icon_content_description:I = 0x7f120c8c
 
-.field public static final item_view_role_description:I = 0x7f120d87
+.field public static final item_view_role_description:I = 0x7f120dad
 
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f11
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f3b
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f12
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f3c
 
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f13
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f3d
 
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f14
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f3e
 
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f15
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f3f
 
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f16
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f40
 
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f17
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f41
 
-.field public static final mtrl_picker_cancel:I = 0x7f120f18
+.field public static final mtrl_picker_cancel:I = 0x7f120f42
 
-.field public static final mtrl_picker_confirm:I = 0x7f120f19
+.field public static final mtrl_picker_confirm:I = 0x7f120f43
 
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f1a
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f44
 
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f1b
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f45
 
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f1c
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f46
 
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f1d
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f47
 
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f1e
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f48
 
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f1f
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f49
 
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f20
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f4a
 
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f21
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f4b
 
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f22
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f4c
 
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f23
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f4d
 
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f24
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f4e
 
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f25
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f4f
 
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f26
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f50
 
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f27
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f51
 
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f28
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f52
 
-.field public static final mtrl_picker_save:I = 0x7f120f29
+.field public static final mtrl_picker_save:I = 0x7f120f53
 
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f2a
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f54
 
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f2b
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f55
 
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f2c
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f56
 
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f2d
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f57
 
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f2e
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f58
 
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f2f
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f59
 
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f30
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f5a
 
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f31
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f5b
 
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f32
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f5c
 
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f33
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f5d
 
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f34
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f5e
 
-.field public static final password_toggle_content_description:I = 0x7f1210db
+.field public static final password_toggle_content_description:I = 0x7f121106
 
-.field public static final path_password_eye:I = 0x7f1210dd
+.field public static final path_password_eye:I = 0x7f121108
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210de
+.field public static final path_password_eye_mask_strike_through:I = 0x7f121109
 
-.field public static final path_password_eye_mask_visible:I = 0x7f1210df
+.field public static final path_password_eye_mask_visible:I = 0x7f12110a
 
-.field public static final path_password_strike_through:I = 0x7f1210e0
+.field public static final path_password_strike_through:I = 0x7f12110b
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$style.smali b/com.discord/smali_classes2/com/google/android/material/R$style.smali
index b6981f5bde..e5ab683b31 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$style.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$style.smali
@@ -1036,379 +1036,379 @@
 
 .field public static final Theme_MaterialComponents_NoActionBar_Bridge:I = 0x7f13029b
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_TextView:I = 0x7f1303dd
+.field public static final Widget_AppCompat_TextView:I = 0x7f1303dc
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e3
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e2
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e4
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e3
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e5
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e4
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e6
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e5
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e7
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e6
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1303e8
+.field public static final Widget_Design_NavigationView:I = 0x7f1303e7
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e9
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e8
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1303ea
+.field public static final Widget_Design_Snackbar:I = 0x7f1303e9
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1303eb
+.field public static final Widget_Design_TabLayout:I = 0x7f1303ea
 
-.field public static final Widget_Design_TextInputEditText:I = 0x7f1303ec
+.field public static final Widget_Design_TextInputEditText:I = 0x7f1303eb
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ed
+.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ec
 
-.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ee
+.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ed
 
-.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ef
+.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ee
 
-.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303f0
+.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303ef
 
-.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f1
+.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f0
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f2
+.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f1
 
-.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f3
+.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f2
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f4
+.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f3
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f5
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f4
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f6
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f5
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f7
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f6
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f8
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f7
 
-.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f9
+.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f8
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303fa
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303f9
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fb
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fa
 
-.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fc
+.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fb
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fd
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fc
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fe
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fd
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303ff
+.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303fe
 
-.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f130400
+.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f1303ff
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130401
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130400
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130402
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130401
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130403
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130402
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130404
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130403
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130405
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130404
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130406
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130405
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130407
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130406
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130408
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130407
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130409
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130408
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13040a
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130409
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040b
+.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040a
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040c
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040b
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040d
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040c
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040e
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040d
 
-.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040f
+.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040e
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130414
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130413
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130410
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f13040f
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130411
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130410
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130412
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130411
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130413
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130412
 
-.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130415
+.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130414
 
-.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130416
+.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130415
 
-.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130417
+.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130416
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130418
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130417
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130419
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130418
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f13041a
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130419
 
-.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041b
+.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041a
 
-.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041c
+.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041b
 
-.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041d
+.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041e
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041d
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130422
+.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130421
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041f
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041e
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f130420
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f13041f
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130421
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130420
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130423
+.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130422
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130424
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130423
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130425
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130424
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130426
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130425
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130427
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130426
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130428
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130427
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130429
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130428
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f13042a
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f130429
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042b
+.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042a
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042c
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042b
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042d
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042e
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042d
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042f
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042e
 
-.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f130430
+.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f13042f
 
-.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130431
+.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130430
 
-.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130432
+.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130431
 
-.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130433
+.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130432
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130434
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130433
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130435
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130434
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130436
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130435
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130437
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130436
 
-.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130438
+.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130437
 
-.field public static final Widget_MaterialComponents_Slider:I = 0x7f130439
+.field public static final Widget_MaterialComponents_Slider:I = 0x7f130438
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13043a
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130439
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043b
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043a
 
-.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043c
+.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043b
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043d
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043c
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043e
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043d
 
-.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043f
+.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043e
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f130440
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13043f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130441
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130440
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130442
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130441
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130443
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130442
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130444
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130443
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130445
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130444
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130446
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130445
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130447
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130446
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130448
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130447
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130449
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130448
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f13044a
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f130449
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044b
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044a
 
-.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044c
+.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044b
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044d
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044c
 
-.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044e
+.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044d
 
-.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044f
+.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044e
 
-.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f130450
+.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f13044f
 
-.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130451
+.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130450
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # 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 f7472d21dc..f7fbe0641c 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
@@ -2395,7 +2395,7 @@
 
     new-array v7, v0, [I
 
-    const v14, 0x7f0404af
+    const v14, 0x7f0404a1
 
     aput v14, v7, v3
 
@@ -2409,7 +2409,7 @@
 
     new-array v7, v0, [I
 
-    const v8, 0x7f040598
+    const v8, 0x7f04058a
 
     aput v8, v7, v3
 
@@ -2511,7 +2511,7 @@
 
     new-array v1, v0, [I
 
-    const v2, 0x7f04058a
+    const v2, 0x7f04057c
 
     aput v2, v1, v3
 
@@ -2541,7 +2541,7 @@
 
     new-array v1, v0, [I
 
-    const v2, 0x7f040512
+    const v2, 0x7f040504
 
     aput v2, v1, v3
 
@@ -2632,10 +2632,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -2644,8 +2644,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -2662,8 +2662,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -2699,15 +2699,15 @@
         0x7f04021a
         0x7f040380
         0x7f040381
-        0x7f0404b6
+        0x7f0404a8
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f0404b0
-        0x7f0404b1
-        0x7f0404b3
-        0x7f0404b4
+        0x7f0404a2
+        0x7f0404a3
+        0x7f0404a5
+        0x7f0404a6
     .end array-data
 
     :array_9
@@ -2719,17 +2719,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_c
@@ -2764,8 +2764,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_e
@@ -2863,38 +2863,38 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_f
@@ -2905,7 +2905,7 @@
         0x7f040271
         0x7f0403bc
         0x7f0403d1
-        0x7f04059b
+        0x7f04058d
     .end array-data
 
     :array_10
@@ -2952,8 +2952,8 @@
         0x7f04006b
         0x7f04006c
         0x7f040251
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_13
@@ -3011,11 +3011,11 @@
         0x7f0402d6
         0x7f0402db
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040511
-        0x7f040515
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f040503
+        0x7f040507
     .end array-data
 
     :array_15
@@ -3024,9 +3024,9 @@
         0x7f040100
         0x7f040101
         0x7f040102
-        0x7f040480
-        0x7f04049a
-        0x7f04049c
+        0x7f040472
+        0x7f04048c
+        0x7f04048e
     .end array-data
 
     :array_16
@@ -3042,12 +3042,12 @@
         0x7f040220
         0x7f040221
         0x7f0403c0
-        0x7f040468
-        0x7f04046a
-        0x7f0404b7
-        0x7f040553
-        0x7f040554
-        0x7f040560
+        0x7f04045a
+        0x7f04045c
+        0x7f0404a9
+        0x7f040545
+        0x7f040546
+        0x7f040552
     .end array-data
 
     :array_17
@@ -3074,7 +3074,7 @@
     :array_1a
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_1b
@@ -3096,8 +3096,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_1d
@@ -3105,8 +3105,8 @@
         0x7f040201
         0x7f040222
         0x7f040266
-        0x7f040490
-        0x7f040497
+        0x7f040482
+        0x7f040489
     .end array-data
 
     :array_1e
@@ -3130,10 +3130,10 @@
         0x7f0403be
         0x7f040407
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f040490
-        0x7f040589
+        0x7f040476
+        0x7f040479
+        0x7f040482
+        0x7f04057b
     .end array-data
 
     :array_20
@@ -3165,7 +3165,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_23
@@ -3214,7 +3214,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_28
@@ -3267,17 +3267,17 @@
         0x7f0402dc
         0x7f0402dd
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_2d
     .array-data 4
         0x7f0400ee
-        0x7f040480
-        0x7f04049c
+        0x7f040472
+        0x7f04048e
     .end array-data
 
     :array_2e
@@ -3288,9 +3288,9 @@
         0x7f0401ca
         0x7f0401cb
         0x7f04043c
-        0x7f0405ab
-        0x7f0405ac
-        0x7f0405ad
+        0x7f04059d
+        0x7f04059e
+        0x7f04059f
     .end array-data
 
     :array_2f
@@ -3314,29 +3314,29 @@
         0x7f0400f0
         0x7f0400f2
         0x7f040447
-        0x7f040484
-        0x7f040487
-        0x7f0404b2
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404a4
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_31
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_32
     .array-data 4
         0x7f0400a1
-        0x7f04058a
+        0x7f04057c
     .end array-data
 
     :array_33
     .array-data 4
-        0x7f040484
-        0x7f040487
+        0x7f040476
+        0x7f040479
     .end array-data
 
     :array_34
@@ -3385,8 +3385,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_38
@@ -3399,7 +3399,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_39
@@ -3446,7 +3446,7 @@
         0x7f040302
         0x7f040307
         0x7f040384
-        0x7f04056b
+        0x7f04055d
     .end array-data
 
     :array_3c
@@ -3467,8 +3467,8 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_3e
@@ -3485,11 +3485,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_3f
@@ -3508,10 +3508,10 @@
 
     :array_40
     .array-data 4
-        0x7f040484
-        0x7f040487
-        0x7f0404ba
-        0x7f0404bb
+        0x7f040476
+        0x7f040479
+        0x7f0404ac
+        0x7f0404ad
     .end array-data
 
     :array_41
@@ -3524,23 +3524,23 @@
         0x7f04025f
         0x7f040327
         0x7f040328
-        0x7f040544
-        0x7f040545
-        0x7f040546
-        0x7f04054a
-        0x7f04054b
-        0x7f04054c
-        0x7f04056b
-        0x7f04056c
-        0x7f04056d
-        0x7f04056e
+        0x7f040536
+        0x7f040537
+        0x7f040538
+        0x7f04053c
+        0x7f04053d
+        0x7f04053e
+        0x7f04055d
+        0x7f04055e
+        0x7f04055f
+        0x7f040560
     .end array-data
 
     :array_42
     .array-data 4
-        0x7f04049e
-        0x7f04049f
-        0x7f0404a0
+        0x7f040490
+        0x7f040491
+        0x7f040492
     .end array-data
 
     :array_43
@@ -3579,17 +3579,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_47
@@ -3601,6 +3601,20 @@
 
     :array_48
     .array-data 4
+        0x7f0404cc
+        0x7f0404cd
+        0x7f0404ce
+        0x7f0404cf
+        0x7f0404d0
+        0x7f0404d1
+        0x7f0404d2
+        0x7f0404d3
+        0x7f0404d4
+        0x7f0404d5
+        0x7f0404d6
+        0x7f0404d7
+        0x7f0404d8
+        0x7f0404d9
         0x7f0404da
         0x7f0404db
         0x7f0404dc
@@ -3609,23 +3623,9 @@
         0x7f0404df
         0x7f0404e0
         0x7f0404e1
-        0x7f0404e2
         0x7f0404e3
         0x7f0404e4
         0x7f0404e5
-        0x7f0404e6
-        0x7f0404e7
-        0x7f0404e8
-        0x7f0404e9
-        0x7f0404ea
-        0x7f0404eb
-        0x7f0404ec
-        0x7f0404ed
-        0x7f0404ee
-        0x7f0404ef
-        0x7f0404f1
-        0x7f0404f2
-        0x7f0404f3
     .end array-data
 
     :array_49
@@ -3644,8 +3644,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_4a
@@ -3702,16 +3702,16 @@
         0x7f040402
         0x7f040403
         0x7f040404
-        0x7f040484
-        0x7f040487
-        0x7f0404aa
-        0x7f0404ab
-        0x7f0404ac
-        0x7f0404ad
-        0x7f0404ae
-        0x7f0404c5
-        0x7f0404c6
-        0x7f0404c7
+        0x7f040476
+        0x7f040479
+        0x7f04049c
+        0x7f04049d
+        0x7f04049e
+        0x7f04049f
+        0x7f0404a0
+        0x7f0404b7
+        0x7f0404b8
+        0x7f0404b9
     .end array-data
 
     :array_4b
@@ -3741,18 +3741,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_4d
@@ -3772,7 +3772,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_4f
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$a.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$a.smali
index 05bc4a007a..a95b63aefa 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$BaseBehavior$a.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field public final synthetic d:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.field public final synthetic a:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-.field public final synthetic e:Lcom/google/android/material/appbar/AppBarLayout;
+.field public final synthetic b:Lcom/google/android/material/appbar/AppBarLayout;
 
-.field public final synthetic f:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+.field public final synthetic c:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/google/android/material/appbar/AppBarLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->f:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->c:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->d:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->a:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->e:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->b:Lcom/google/android/material/appbar/AppBarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,11 +49,11 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->f:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->c:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->d:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->a:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->e:Lcom/google/android/material/appbar/AppBarLayout;
+    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$a;->b:Lcom/google/android/material/appbar/AppBarLayout;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$b.smali b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$b.smali
index 02ec90ad1a..6e17fe741e 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/AppBarLayout$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/shape/MaterialShapeDrawable;
+.field public final synthetic a:Lcom/google/android/material/shape/MaterialShapeDrawable;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/appbar/AppBarLayout;Lcom/google/android/material/shape/MaterialShapeDrawable;)V
     .locals 0
 
-    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$b;->d:Lcom/google/android/material/shape/MaterialShapeDrawable;
+    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$b;->a:Lcom/google/android/material/shape/MaterialShapeDrawable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$b;->d:Lcom/google/android/material/shape/MaterialShapeDrawable;
+    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$b;->a:Lcom/google/android/material/shape/MaterialShapeDrawable;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$b.smali b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$b.smali
index b28d74609e..7cebe0f3be 100644
--- a/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/appbar/CollapsingToolbarLayout$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field public final synthetic a:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/appbar/CollapsingToolbarLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$b;->d:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$b;->a:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$b;->d:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$b;->a:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$a.smali b/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$a.smali
index 8578d2d3cd..ac9f639645 100644
--- a/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/behavior/HideBottomViewOnScrollBehavior$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+.field public final synthetic a:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$a;->d:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$a;->a:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$a;->d:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iget-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$a;->a:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$a.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$a.smali
index 25e786e3cc..f8896fa7c0 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field public final synthetic a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$a;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$a;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,13 +34,13 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$a;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$a;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$000(Lcom/google/android/material/bottomappbar/BottomAppBar;)I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$a;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$a;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {v1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$100(Lcom/google/android/material/bottomappbar/BottomAppBar;)Z
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$d.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$d.smali
index 48455eb5f4..303cfdf7b3 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$d.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field public final synthetic a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$d;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$d;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$d;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$d;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$1500(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
 
@@ -44,7 +44,7 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$d;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$d;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$1400(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$f.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$f.smali
index cfa3698576..aaa15e3c40 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$f.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$f.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field public final synthetic a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,11 +34,11 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$1500(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     const/4 v0, 0x0
 
@@ -50,7 +50,7 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$f;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$1400(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$g.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$g.smali
index c3dd389586..c921936336 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$g.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$g.smali
@@ -15,28 +15,28 @@
 
 
 # instance fields
-.field public d:Z
+.field public a:Z
 
-.field public final synthetic e:Landroidx/appcompat/widget/ActionMenuView;
+.field public final synthetic b:Landroidx/appcompat/widget/ActionMenuView;
 
-.field public final synthetic f:I
+.field public final synthetic c:I
 
-.field public final synthetic g:Z
+.field public final synthetic d:Z
 
-.field public final synthetic h:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field public final synthetic e:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;Landroidx/appcompat/widget/ActionMenuView;IZ)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->h:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->e:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->e:Landroidx/appcompat/widget/ActionMenuView;
+    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->b:Landroidx/appcompat/widget/ActionMenuView;
 
-    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->f:I
+    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->c:I
 
-    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->g:Z
+    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->d:Z
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -50,7 +50,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->d:Z
+    iput-boolean p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->a:Z
 
     return-void
 .end method
@@ -58,17 +58,17 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 3
 
-    iget-boolean p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->d:Z
+    iget-boolean p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->a:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->h:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->e:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->e:Landroidx/appcompat/widget/ActionMenuView;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->b:Landroidx/appcompat/widget/ActionMenuView;
 
-    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->f:I
+    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->c:I
 
-    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->g:Z
+    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$g;->d:Z
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$1800(Lcom/google/android/material/bottomappbar/BottomAppBar;Landroidx/appcompat/widget/ActionMenuView;IZ)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$h.smali b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$h.smali
index a25c5f51a1..5fb4bc4110 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$h.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomappbar/BottomAppBar$h.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field public final synthetic a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/bottomappbar/BottomAppBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,13 +34,13 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     iget-object v0, v0, Lcom/google/android/material/bottomappbar/BottomAppBar;->fabAnimationListener:Landroid/animation/AnimatorListenerAdapter;
 
     invoke-virtual {v0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationStart(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {p1}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$1900(Lcom/google/android/material/bottomappbar/BottomAppBar;)Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
@@ -48,7 +48,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->d:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$h;->a:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
     invoke-static {v0}, Lcom/google/android/material/bottomappbar/BottomAppBar;->access$2000(Lcom/google/android/material/bottomappbar/BottomAppBar;)F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$b.smali b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$b.smali
index 6a0b74891e..22bb8d4c0d 100644
--- a/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/bottomsheet/BottomSheetBehavior$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field public final synthetic a:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$b;->d:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$b;->a:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$b;->d:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$b;->a:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-static {v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->access$000(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)Lcom/google/android/material/shape/MaterialShapeDrawable;
 
@@ -59,7 +59,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$b;->d:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$b;->a:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
     invoke-static {v0}, Lcom/google/android/material/bottomsheet/BottomSheetBehavior;->access$000(Lcom/google/android/material/bottomsheet/BottomSheetBehavior;)Lcom/google/android/material/shape/MaterialShapeDrawable;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$a.smali b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$a.smali
index 1cc522edd9..7d0a3227a1 100644
--- a/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/circularreveal/CircularRevealCompat$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field public final synthetic a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/circularreveal/CircularRevealWidget;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$a;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$a;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$a;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$a;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-interface {p1}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->destroyCircularRevealCache()V
 
@@ -44,7 +44,7 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$a;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$a;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-interface {p1}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->buildCircularRevealCache()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c.smali b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c.smali
index 66905cfd41..21cdfd81ad 100644
--- a/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c.smali
+++ b/com.discord/smali_classes2/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c.smali
@@ -15,20 +15,20 @@
 
 
 # instance fields
-.field public d:Z
+.field public a:Z
 
-.field public final synthetic e:Lf/h/a/g/e/j;
+.field public final synthetic b:Lf/h/a/g/e/j;
 
-.field public final synthetic f:Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;
+.field public final synthetic c:Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lf/h/a/g/e/j;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;)V
     .locals 0
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->e:Lf/h/a/g/e/j;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->b:Lf/h/a/g/e/j;
 
-    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->f:Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;
+    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->c:Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -42,9 +42,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->d:Z
+    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->a:Z
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->e:Lf/h/a/g/e/j;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->b:Lf/h/a/g/e/j;
 
     invoke-interface {p1}, Lf/h/a/g/e/j;->a()V
 
@@ -54,17 +54,17 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->e:Lf/h/a/g/e/j;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->b:Lf/h/a/g/e/j;
 
     invoke-interface {p1}, Lf/h/a/g/e/j;->e()V
 
-    iget-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->d:Z
+    iget-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->a:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->e:Lf/h/a/g/e/j;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->b:Lf/h/a/g/e/j;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->f:Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->c:Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;
 
     invoke-interface {p1, v0}, Lf/h/a/g/e/j;->g(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$OnChangedCallback;)V
 
@@ -75,13 +75,13 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->e:Lf/h/a/g/e/j;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->b:Lf/h/a/g/e/j;
 
     invoke-interface {v0, p1}, Lf/h/a/g/e/j;->onAnimationStart(Landroid/animation/Animator;)V
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->d:Z
+    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$c;->a:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$a.smali b/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$a.smali
index 8f28c3a4b0..f216ee7b49 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/StateListAnimator$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/internal/StateListAnimator;
+.field public final synthetic a:Lcom/google/android/material/internal/StateListAnimator;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/internal/StateListAnimator;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$a;->d:Lcom/google/android/material/internal/StateListAnimator;
+    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$a;->a:Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator$a;->d:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator$a;->a:Lcom/google/android/material/internal/StateListAnimator;
 
     iget-object v1, v0, Lcom/google/android/material/internal/StateListAnimator;->runningAnimator:Landroid/animation/ValueAnimator;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/internal/TextScale$a.smali b/com.discord/smali_classes2/com/google/android/material/internal/TextScale$a.smali
index 13e5914309..91a0708117 100644
--- a/com.discord/smali_classes2/com/google/android/material/internal/TextScale$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/internal/TextScale$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field public final synthetic d:Landroid/widget/TextView;
+.field public final synthetic a:Landroid/widget/TextView;
 
-.field public final synthetic e:Lcom/google/android/material/internal/TextScale;
+.field public final synthetic b:Lcom/google/android/material/internal/TextScale;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/internal/TextScale;Landroid/widget/TextView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/internal/TextScale$a;->e:Lcom/google/android/material/internal/TextScale;
+    iput-object p1, p0, Lcom/google/android/material/internal/TextScale$a;->b:Lcom/google/android/material/internal/TextScale;
 
-    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$a;->d:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$a;->a:Landroid/widget/TextView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,11 +55,11 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$a;->d:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$a;->a:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$a;->d:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$a;->a:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setScaleY(F)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$a.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$a.smali
index 1181febb61..9ee3583900 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$a;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$a;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$a;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$a;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-virtual {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->onViewShown()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$b.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$b.smali
index a22ff11f0b..24c22e2eee 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$b.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field public final synthetic d:I
+.field public final synthetic a:I
 
-.field public final synthetic e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->d:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->a:I
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,9 +38,9 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->d:I
+    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$b;->a:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->onViewHidden(I)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$c.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$c.smali
index 469de4ae66..ae4e452d6e 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$c.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$c.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$c;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$c;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$c;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$c;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$d.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$d.smali
index c498e2df53..671701602b 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$d;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$d;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,13 +51,13 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$d;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$d;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
     invoke-virtual {v0, p1}, Landroid/widget/FrameLayout;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$d;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$d;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$e.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$e.smali
index 75fe7693c4..e7d72c5c16 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$e.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$e.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$e;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$e;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$e;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$e;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-virtual {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->onViewShown()V
 
@@ -44,7 +44,7 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$e;->d:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$e;->a:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-static {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->access$1300(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)Lcom/google/android/material/snackbar/ContentViewCallback;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$f.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$f.smali
index 2af225b5d6..3fd20f263e 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$f.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$f.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field public d:I
+.field public a:I
 
-.field public final synthetic e:I
+.field public final synthetic b:I
 
-.field public final synthetic f:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic c:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->f:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->c:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->e:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->b:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->e:I
+    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->b:I
 
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->d:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->a:I
 
     return-void
 .end method
@@ -67,11 +67,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->f:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->c:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
-    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->d:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->a:I
 
     sub-int v1, p1, v1
 
@@ -80,7 +80,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->f:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->c:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
@@ -89,7 +89,7 @@
     invoke-virtual {v0, v1}, Landroid/widget/FrameLayout;->setTranslationY(F)V
 
     :goto_0
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->d:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$f;->a:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$g.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$g.smali
index b7a9a8eb78..c9ab26e9f6 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$g.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$g.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field public final synthetic d:I
+.field public final synthetic a:I
 
-.field public final synthetic e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->d:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->a:I
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,9 +38,9 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->d:I
+    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->a:I
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->onViewHidden(I)V
 
@@ -50,7 +50,7 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$g;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-static {p1}, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->access$1300(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)Lcom/google/android/material/snackbar/ContentViewCallback;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$h.smali b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$h.smali
index 0390b231a3..7a935df8ca 100644
--- a/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$h.smali
+++ b/com.discord/smali_classes2/com/google/android/material/snackbar/BaseTransientBottomBar$h.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field public d:I
+.field public a:I
 
-.field public final synthetic e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field public final synthetic b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/snackbar/BaseTransientBottomBar;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->d:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->a:I
 
     return-void
 .end method
@@ -63,11 +63,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
-    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->d:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->a:I
 
     sub-int v1, p1, v1
 
@@ -76,7 +76,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->e:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->b:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
     iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar;->view:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
 
@@ -85,7 +85,7 @@
     invoke-virtual {v0, v1}, Landroid/widget/FrameLayout;->setTranslationY(F)V
 
     :goto_0
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->d:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$h;->a:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$a.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$a.smali
index 4c33767aaf..891a4e5d60 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/tabs/TabLayout;
+.field public final synthetic a:Lcom/google/android/material/tabs/TabLayout;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/tabs/TabLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->d:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->a:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$a;->d:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$a;->a:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$a.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$a.smali
index eeda127197..b2ae753a2a 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$a.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field public final synthetic d:I
+.field public final synthetic a:I
 
-.field public final synthetic e:I
+.field public final synthetic b:I
 
-.field public final synthetic f:Lcom/google/android/material/tabs/TabLayout$d;
+.field public final synthetic c:Lcom/google/android/material/tabs/TabLayout$d;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/tabs/TabLayout$d;II)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->f:Lcom/google/android/material/tabs/TabLayout$d;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->c:Lcom/google/android/material/tabs/TabLayout$d;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->d:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->a:I
 
-    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->e:I
+    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->b:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,21 +53,21 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->f:Lcom/google/android/material/tabs/TabLayout$d;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->c:Lcom/google/android/material/tabs/TabLayout$d;
 
     iget v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->m:I
 
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->d:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->a:I
 
     invoke-static {v1, v2, p1}, Lcom/google/android/material/animation/AnimationUtils;->lerp(IIF)I
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->f:Lcom/google/android/material/tabs/TabLayout$d;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->c:Lcom/google/android/material/tabs/TabLayout$d;
 
     iget v2, v2, Lcom/google/android/material/tabs/TabLayout$d;->n:I
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->e:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$d$a;->b:I
 
     invoke-static {v2, v3, p1}, Lcom/google/android/material/animation/AnimationUtils;->lerp(IIF)I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$b.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$b.smali
index d7b4ae2d59..bb2ed64163 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d$b.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field public final synthetic d:I
+.field public final synthetic a:I
 
-.field public final synthetic e:Lcom/google/android/material/tabs/TabLayout$d;
+.field public final synthetic b:Lcom/google/android/material/tabs/TabLayout$d;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/tabs/TabLayout$d;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->e:Lcom/google/android/material/tabs/TabLayout$d;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->b:Lcom/google/android/material/tabs/TabLayout$d;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->d:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->a:I
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,9 +38,9 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->e:Lcom/google/android/material/tabs/TabLayout$d;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->b:Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->d:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->a:I
 
     iput v0, p1, Lcom/google/android/material/tabs/TabLayout$d;->g:I
 
@@ -54,9 +54,9 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->e:Lcom/google/android/material/tabs/TabLayout$d;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->b:Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->d:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$d$b;->a:I
 
     iput v0, p1, Lcom/google/android/material/tabs/TabLayout$d;->g:I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$d.smali b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$d.smali
index e7ce0dcd07..1f17e6f6d4 100644
--- a/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/textfield/TextInputLayout$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/textfield/TextInputLayout;
+.field public final synthetic a:Lcom/google/android/material/textfield/TextInputLayout;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/textfield/TextInputLayout;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$d;->d:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$d;->a:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$d;->d:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$d;->a:Lcom/google/android/material/textfield/TextInputLayout;
 
     iget-object v0, v0, Lcom/google/android/material/textfield/TextInputLayout;->collapsingTextHelper:Lcom/google/android/material/internal/CollapsingTextHelper;
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$a.smali b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$a.smali
index 8811f3d220..7ec30c066d 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/ExpandableTransformationBehavior$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+.field public final synthetic a:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transformation/ExpandableTransformationBehavior;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$a;->d:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$a;->a:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$a;->d:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iget-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$a;->a:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$a.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$a.smali
index 7df934f0ac..f830a292c5 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$a.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field public final synthetic d:Z
+.field public final synthetic a:Z
 
-.field public final synthetic e:Landroid/view/View;
+.field public final synthetic b:Landroid/view/View;
 
-.field public final synthetic f:Landroid/view/View;
+.field public final synthetic c:Landroid/view/View;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;ZLandroid/view/View;Landroid/view/View;)V
     .locals 0
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->d:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->a:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->e:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->b:Landroid/view/View;
 
-    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->f:Landroid/view/View;
+    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->c:Landroid/view/View;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -42,23 +42,23 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->d:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->a:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->e:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->b:Landroid/view/View;
 
     const/4 v0, 0x4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->f:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->c:Landroid/view/View;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setAlpha(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->f:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->c:Landroid/view/View;
 
     const/4 v0, 0x0
 
@@ -71,23 +71,23 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->d:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->a:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->e:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->b:Landroid/view/View;
 
     const/4 v0, 0x0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->f:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->c:Landroid/view/View;
 
     const/4 v0, 0x0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setAlpha(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->f:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$a;->c:Landroid/view/View;
 
     const/4 v0, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$b.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$b.smali
index 050b9954cb..f1b652d7b5 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field public final synthetic d:Landroid/view/View;
+.field public final synthetic a:Landroid/view/View;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;Landroid/view/View;)V
     .locals 0
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$b;->d:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$b;->a:Landroid/view/View;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$b;->d:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$b;->a:Landroid/view/View;
 
     invoke-virtual {p1}, Landroid/view/View;->invalidate()V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$c.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$c.smali
index d89e23aae0..26dfdb05e7 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$c.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$c.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field public final synthetic a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-.field public final synthetic e:Landroid/graphics/drawable/Drawable;
+.field public final synthetic b:Landroid/graphics/drawable/Drawable;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;Lcom/google/android/material/circularreveal/CircularRevealWidget;Landroid/graphics/drawable/Drawable;)V
     .locals 0
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->e:Landroid/graphics/drawable/Drawable;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->b:Landroid/graphics/drawable/Drawable;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,7 +38,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     const/4 v0, 0x0
 
@@ -50,9 +50,9 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->e:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$c;->b:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->setCircularRevealOverlayDrawable(Landroid/graphics/drawable/Drawable;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$d.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$d.smali
index 631ba753fe..6872ad9523 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationBehavior$d.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field public final synthetic a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transformation/FabTransformationBehavior;Lcom/google/android/material/circularreveal/CircularRevealWidget;)V
     .locals 0
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$d;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$d;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$d;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$d;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-interface {p1}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->getRevealInfo()Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;
 
@@ -44,7 +44,7 @@
 
     iput v0, p1, Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;->radius:F
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$d;->d:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$d;->a:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
     invoke-interface {v0, p1}, Lcom/google/android/material/circularreveal/CircularRevealWidget;->setRevealInfo(Lcom/google/android/material/circularreveal/CircularRevealWidget$RevealInfo;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior$a.smali b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior$a.smali
index a6fb39338e..1f463877c5 100644
--- a/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transformation/FabTransformationScrimBehavior$a.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field public final synthetic d:Z
+.field public final synthetic a:Z
 
-.field public final synthetic e:Landroid/view/View;
+.field public final synthetic b:Landroid/view/View;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transformation/FabTransformationScrimBehavior;ZLandroid/view/View;)V
     .locals 0
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->d:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->a:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->e:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->b:Landroid/view/View;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -38,11 +38,11 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->d:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->a:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->e:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->b:Landroid/view/View;
 
     const/4 v0, 0x4
 
@@ -55,11 +55,11 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->d:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->a:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->e:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$a;->b:Landroid/view/View;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transition/FadeProvider$a.smali b/com.discord/smali_classes2/com/google/android/material/transition/FadeProvider$a.smali
index 3ebbb60f32..5623e0c7a1 100644
--- a/com.discord/smali_classes2/com/google/android/material/transition/FadeProvider$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transition/FadeProvider$a.smali
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field public final synthetic d:Landroid/view/View;
+.field public final synthetic a:Landroid/view/View;
+
+.field public final synthetic b:F
+
+.field public final synthetic c:F
+
+.field public final synthetic d:F
 
 .field public final synthetic e:F
 
-.field public final synthetic f:F
-
-.field public final synthetic g:F
-
-.field public final synthetic h:F
-
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;FFFF)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transition/FadeProvider$a;->d:Landroid/view/View;
+    iput-object p1, p0, Lcom/google/android/material/transition/FadeProvider$a;->a:Landroid/view/View;
 
-    iput p2, p0, Lcom/google/android/material/transition/FadeProvider$a;->e:F
+    iput p2, p0, Lcom/google/android/material/transition/FadeProvider$a;->b:F
 
-    iput p3, p0, Lcom/google/android/material/transition/FadeProvider$a;->f:F
+    iput p3, p0, Lcom/google/android/material/transition/FadeProvider$a;->c:F
 
-    iput p4, p0, Lcom/google/android/material/transition/FadeProvider$a;->g:F
+    iput p4, p0, Lcom/google/android/material/transition/FadeProvider$a;->d:F
 
-    iput p5, p0, Lcom/google/android/material/transition/FadeProvider$a;->h:F
+    iput p5, p0, Lcom/google/android/material/transition/FadeProvider$a;->e:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,15 +63,15 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/transition/FadeProvider$a;->d:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/transition/FadeProvider$a;->a:Landroid/view/View;
 
-    iget v1, p0, Lcom/google/android/material/transition/FadeProvider$a;->e:F
+    iget v1, p0, Lcom/google/android/material/transition/FadeProvider$a;->b:F
 
-    iget v2, p0, Lcom/google/android/material/transition/FadeProvider$a;->f:F
+    iget v2, p0, Lcom/google/android/material/transition/FadeProvider$a;->c:F
 
-    iget v3, p0, Lcom/google/android/material/transition/FadeProvider$a;->g:F
+    iget v3, p0, Lcom/google/android/material/transition/FadeProvider$a;->d:F
 
-    iget v4, p0, Lcom/google/android/material/transition/FadeProvider$a;->h:F
+    iget v4, p0, Lcom/google/android/material/transition/FadeProvider$a;->e:F
 
     invoke-static {v1, v2, v3, v4, p1}, Lf/h/a/g/j/j;->j(FFFFF)F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transition/FadeThroughProvider$a.smali b/com.discord/smali_classes2/com/google/android/material/transition/FadeThroughProvider$a.smali
index 8ce18aa886..73ea196229 100644
--- a/com.discord/smali_classes2/com/google/android/material/transition/FadeThroughProvider$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transition/FadeThroughProvider$a.smali
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field public final synthetic d:Landroid/view/View;
+.field public final synthetic a:Landroid/view/View;
+
+.field public final synthetic b:F
+
+.field public final synthetic c:F
+
+.field public final synthetic d:F
 
 .field public final synthetic e:F
 
-.field public final synthetic f:F
-
-.field public final synthetic g:F
-
-.field public final synthetic h:F
-
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;FFFF)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->d:Landroid/view/View;
+    iput-object p1, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->a:Landroid/view/View;
 
-    iput p2, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->e:F
+    iput p2, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->b:F
 
-    iput p3, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->f:F
+    iput p3, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->c:F
 
-    iput p4, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->g:F
+    iput p4, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->d:F
 
-    iput p5, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->h:F
+    iput p5, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->e:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,15 +63,15 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->d:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->a:Landroid/view/View;
 
-    iget v1, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->e:F
+    iget v1, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->b:F
 
-    iget v2, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->f:F
+    iget v2, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->c:F
 
-    iget v3, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->g:F
+    iget v3, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->d:F
 
-    iget v4, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->h:F
+    iget v4, p0, Lcom/google/android/material/transition/FadeThroughProvider$a;->e:F
 
     invoke-static {v1, v2, v3, v4, p1}, Lf/h/a/g/j/j;->j(FFFFF)F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$a.smali b/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$a.smali
index c4f9bd4dbb..3f29352c4d 100644
--- a/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/transition/MaterialContainerTransform$d;
+.field public final synthetic a:Lcom/google/android/material/transition/MaterialContainerTransform$d;
 
-.field public final synthetic e:Lcom/google/android/material/transition/MaterialContainerTransform;
+.field public final synthetic b:Lcom/google/android/material/transition/MaterialContainerTransform;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transition/MaterialContainerTransform;Lcom/google/android/material/transition/MaterialContainerTransform$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$a;->e:Lcom/google/android/material/transition/MaterialContainerTransform;
+    iput-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$a;->b:Lcom/google/android/material/transition/MaterialContainerTransform;
 
-    iput-object p2, p0, Lcom/google/android/material/transition/MaterialContainerTransform$a;->d:Lcom/google/android/material/transition/MaterialContainerTransform$d;
+    iput-object p2, p0, Lcom/google/android/material/transition/MaterialContainerTransform$a;->a:Lcom/google/android/material/transition/MaterialContainerTransform$d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/transition/MaterialContainerTransform$a;->d:Lcom/google/android/material/transition/MaterialContainerTransform$d;
+    iget-object v0, p0, Lcom/google/android/material/transition/MaterialContainerTransform$a;->a:Lcom/google/android/material/transition/MaterialContainerTransform$d;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedFraction()F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$b.smali b/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$b.smali
index 6996645063..828154b5ff 100644
--- a/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$b.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transition/MaterialContainerTransform$b.smali
@@ -15,30 +15,30 @@
 
 
 # instance fields
+.field public final synthetic a:Landroid/view/View;
+
+.field public final synthetic b:Lcom/google/android/material/transition/MaterialContainerTransform$d;
+
+.field public final synthetic c:Landroid/view/View;
+
 .field public final synthetic d:Landroid/view/View;
 
-.field public final synthetic e:Lcom/google/android/material/transition/MaterialContainerTransform$d;
-
-.field public final synthetic f:Landroid/view/View;
-
-.field public final synthetic g:Landroid/view/View;
-
-.field public final synthetic h:Lcom/google/android/material/transition/MaterialContainerTransform;
+.field public final synthetic e:Lcom/google/android/material/transition/MaterialContainerTransform;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transition/MaterialContainerTransform;Landroid/view/View;Lcom/google/android/material/transition/MaterialContainerTransform$d;Landroid/view/View;Landroid/view/View;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->h:Lcom/google/android/material/transition/MaterialContainerTransform;
+    iput-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->e:Lcom/google/android/material/transition/MaterialContainerTransform;
 
-    iput-object p2, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->d:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->a:Landroid/view/View;
 
-    iput-object p3, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->e:Lcom/google/android/material/transition/MaterialContainerTransform$d;
+    iput-object p3, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->b:Lcom/google/android/material/transition/MaterialContainerTransform$d;
 
-    iput-object p4, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->f:Landroid/view/View;
+    iput-object p4, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->c:Landroid/view/View;
 
-    iput-object p5, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->g:Landroid/view/View;
+    iput-object p5, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->d:Landroid/view/View;
 
     invoke-direct {p0}, Lf/h/a/g/j/i;-><init>()V
 
@@ -54,7 +54,7 @@
         .end annotation
     .end param
 
-    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->h:Lcom/google/android/material/transition/MaterialContainerTransform;
+    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->e:Lcom/google/android/material/transition/MaterialContainerTransform;
 
     invoke-static {p1}, Lcom/google/android/material/transition/MaterialContainerTransform;->access$300(Lcom/google/android/material/transition/MaterialContainerTransform;)Z
 
@@ -65,23 +65,23 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->f:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->c:Landroid/view/View;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setAlpha(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->g:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->d:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setAlpha(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->d:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->a:Landroid/view/View;
 
     invoke-static {p1}, Lcom/google/android/material/internal/ViewUtils;->getOverlay(Landroid/view/View;)Lcom/google/android/material/internal/ViewOverlayImpl;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->e:Lcom/google/android/material/transition/MaterialContainerTransform$d;
+    iget-object v0, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->b:Lcom/google/android/material/transition/MaterialContainerTransform$d;
 
     invoke-interface {p1, v0}, Lcom/google/android/material/internal/ViewOverlayImpl;->remove(Landroid/graphics/drawable/Drawable;)V
 
@@ -95,23 +95,23 @@
         .end annotation
     .end param
 
-    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->d:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->a:Landroid/view/View;
 
     invoke-static {p1}, Lcom/google/android/material/internal/ViewUtils;->getOverlay(Landroid/view/View;)Lcom/google/android/material/internal/ViewOverlayImpl;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->e:Lcom/google/android/material/transition/MaterialContainerTransform$d;
+    iget-object v0, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->b:Lcom/google/android/material/transition/MaterialContainerTransform$d;
 
     invoke-interface {p1, v0}, Lcom/google/android/material/internal/ViewOverlayImpl;->add(Landroid/graphics/drawable/Drawable;)V
 
-    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->f:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->c:Landroid/view/View;
 
     const/4 v0, 0x0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setAlpha(F)V
 
-    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->g:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transition/MaterialContainerTransform$b;->d:Landroid/view/View;
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setAlpha(F)V
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeProvider$a.smali b/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeProvider$a.smali
index 80cdcf105a..35ee0699ca 100644
--- a/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeProvider$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeProvider$a.smali
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field public final synthetic d:Landroid/view/View;
+.field public final synthetic a:Landroid/view/View;
+
+.field public final synthetic b:F
+
+.field public final synthetic c:F
+
+.field public final synthetic d:F
 
 .field public final synthetic e:F
 
-.field public final synthetic f:F
-
-.field public final synthetic g:F
-
-.field public final synthetic h:F
-
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;FFFF)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->d:Landroid/view/View;
+    iput-object p1, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->a:Landroid/view/View;
 
-    iput p2, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->e:F
+    iput p2, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->b:F
 
-    iput p3, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->f:F
+    iput p3, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->c:F
 
-    iput p4, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->g:F
+    iput p4, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->d:F
 
-    iput p5, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->h:F
+    iput p5, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->e:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,15 +63,15 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->d:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->a:Landroid/view/View;
 
-    iget v1, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->e:F
+    iget v1, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->b:F
 
-    iget v2, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->f:F
+    iget v2, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->c:F
 
-    iget v3, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->g:F
+    iget v3, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->d:F
 
-    iget v4, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->h:F
+    iget v4, p0, Lcom/google/android/material/transition/platform/FadeProvider$a;->e:F
 
     invoke-static {v1, v2, v3, v4, p1}, Lf/h/a/g/j/k/j;->k(FFFFF)F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeThroughProvider$a.smali b/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeThroughProvider$a.smali
index e9fa5277b4..b676633707 100644
--- a/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeThroughProvider$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transition/platform/FadeThroughProvider$a.smali
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field public final synthetic d:Landroid/view/View;
+.field public final synthetic a:Landroid/view/View;
+
+.field public final synthetic b:F
+
+.field public final synthetic c:F
+
+.field public final synthetic d:F
 
 .field public final synthetic e:F
 
-.field public final synthetic f:F
-
-.field public final synthetic g:F
-
-.field public final synthetic h:F
-
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;FFFF)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->d:Landroid/view/View;
+    iput-object p1, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->a:Landroid/view/View;
 
-    iput p2, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->e:F
+    iput p2, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->b:F
 
-    iput p3, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->f:F
+    iput p3, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->c:F
 
-    iput p4, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->g:F
+    iput p4, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->d:F
 
-    iput p5, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->h:F
+    iput p5, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->e:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,15 +63,15 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->d:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->a:Landroid/view/View;
 
-    iget v1, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->e:F
+    iget v1, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->b:F
 
-    iget v2, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->f:F
+    iget v2, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->c:F
 
-    iget v3, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->g:F
+    iget v3, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->d:F
 
-    iget v4, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->h:F
+    iget v4, p0, Lcom/google/android/material/transition/platform/FadeThroughProvider$a;->e:F
 
     invoke-static {v1, v2, v3, v4, p1}, Lf/h/a/g/j/k/j;->k(FFFFF)F
 
diff --git a/com.discord/smali_classes2/com/google/android/material/transition/platform/MaterialContainerTransform$a.smali b/com.discord/smali_classes2/com/google/android/material/transition/platform/MaterialContainerTransform$a.smali
index 5efa8fface..6211eeefcc 100644
--- a/com.discord/smali_classes2/com/google/android/material/transition/platform/MaterialContainerTransform$a.smali
+++ b/com.discord/smali_classes2/com/google/android/material/transition/platform/MaterialContainerTransform$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field public final synthetic d:Lcom/google/android/material/transition/platform/MaterialContainerTransform$d;
+.field public final synthetic a:Lcom/google/android/material/transition/platform/MaterialContainerTransform$d;
 
-.field public final synthetic e:Lcom/google/android/material/transition/platform/MaterialContainerTransform;
+.field public final synthetic b:Lcom/google/android/material/transition/platform/MaterialContainerTransform;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/material/transition/platform/MaterialContainerTransform;Lcom/google/android/material/transition/platform/MaterialContainerTransform$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/transition/platform/MaterialContainerTransform$a;->e:Lcom/google/android/material/transition/platform/MaterialContainerTransform;
+    iput-object p1, p0, Lcom/google/android/material/transition/platform/MaterialContainerTransform$a;->b:Lcom/google/android/material/transition/platform/MaterialContainerTransform;
 
-    iput-object p2, p0, Lcom/google/android/material/transition/platform/MaterialContainerTransform$a;->d:Lcom/google/android/material/transition/platform/MaterialContainerTransform$d;
+    iput-object p2, p0, Lcom/google/android/material/transition/platform/MaterialContainerTransform$a;->a:Lcom/google/android/material/transition/platform/MaterialContainerTransform$d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/transition/platform/MaterialContainerTransform$a;->d:Lcom/google/android/material/transition/platform/MaterialContainerTransform$d;
+    iget-object v0, p0, Lcom/google/android/material/transition/platform/MaterialContainerTransform$a;->a:Lcom/google/android/material/transition/platform/MaterialContainerTransform$d;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedFraction()F
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali b/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali
index 5eb6d0c1e7..6a2c13dcd8 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/FirebaseMessagingService.smali
@@ -373,7 +373,7 @@
 
     const-string v2, "FirebaseMessaging"
 
-    invoke-static {v0, v1, p1, v2}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v1, p1, v2}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali
index f7f4822020..27751b47eb 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/GaugeManager.smali
@@ -542,7 +542,7 @@
 
     check-cast v13, Ljava/lang/Long;
 
-    invoke-static {v13, v4, v12, v11}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v13, v4, v12, v11}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -729,7 +729,7 @@
 
     check-cast v13, Ljava/lang/Long;
 
-    invoke-static {v13, v4, v12, v11}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v13, v4, v12, v11}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object v4
 
@@ -1033,7 +1033,7 @@
 
     check-cast v8, Ljava/lang/Long;
 
-    invoke-static {v8, v5, v7, v9}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v8, v5, v7, v9}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object v5
 
@@ -1220,7 +1220,7 @@
 
     check-cast v9, Ljava/lang/Long;
 
-    invoke-static {v9, v5, v8, v7}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v9, v5, v8, v7}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object v5
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali b/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali
index 8e1f5fb914..bdad1dbb96 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/internal/SessionManager.smali
@@ -424,7 +424,7 @@
 
     check-cast v5, Ljava/lang/Long;
 
-    invoke-static {v5, v0, v1, v4}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v5, v0, v1, v4}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali
index 88102539e0..e4f8177afd 100644
--- a/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali
+++ b/com.discord/smali_classes2/com/google/firebase/perf/network/FirebasePerfOkHttpClient.smali
@@ -20,16 +20,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Response;->d:Ln0/a0;
+    iget-object v0, p0, Lokhttp3/Response;->d:Lo0/a0;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, v0, Ln0/a0;->b:Ln0/w;
+    iget-object v1, v0, Lo0/a0;->b:Lo0/w;
 
-    invoke-virtual {v1}, Ln0/w;->l()Ljava/net/URL;
+    invoke-virtual {v1}, Lo0/w;->k()Ljava/net/URL;
 
     move-result-object v1
 
@@ -39,11 +39,11 @@
 
     invoke-virtual {p1, v1}, Lf/h/a/f/h/f/k0;->d(Ljava/lang/String;)Lf/h/a/f/h/f/k0;
 
-    iget-object v1, v0, Ln0/a0;->c:Ljava/lang/String;
+    iget-object v1, v0, Lo0/a0;->c:Ljava/lang/String;
 
     invoke-virtual {p1, v1}, Lf/h/a/f/h/f/k0;->e(Ljava/lang/String;)Lf/h/a/f/h/f/k0;
 
-    iget-object v0, v0, Ln0/a0;->e:Lokhttp3/RequestBody;
+    iget-object v0, v0, Lo0/a0;->e:Lokhttp3/RequestBody;
 
     const-wide/16 v1, -0x1
 
@@ -99,7 +99,7 @@
     return-void
 .end method
 
-.method public static enqueue(Ln0/f;Ln0/g;)V
+.method public static enqueue(Lo0/f;Lo0/g;)V
     .locals 7
     .annotation build Landroidx/annotation/Keep;
     .end annotation
@@ -120,14 +120,14 @@
 
     move-object v1, p1
 
-    invoke-direct/range {v0 .. v5}, Lf/h/c/u/d/g;-><init>(Ln0/g;Lf/h/c/u/b/e;Lcom/google/android/gms/internal/firebase-perf/zzcb;J)V
+    invoke-direct/range {v0 .. v5}, Lf/h/c/u/d/g;-><init>(Lo0/g;Lf/h/c/u/b/e;Lcom/google/android/gms/internal/firebase-perf/zzcb;J)V
 
-    invoke-interface {p0, v6}, Ln0/f;->F(Ln0/g;)V
+    invoke-interface {p0, v6}, Lo0/f;->F(Lo0/g;)V
 
     return-void
 .end method
 
-.method public static execute(Ln0/f;)Lokhttp3/Response;
+.method public static execute(Lo0/f;)Lokhttp3/Response;
     .locals 12
     .annotation build Landroidx/annotation/Keep;
     .end annotation
@@ -161,7 +161,7 @@
     move-result-wide v10
 
     :try_start_0
-    invoke-interface {p0}, Ln0/f;->execute()Lokhttp3/Response;
+    invoke-interface {p0}, Lo0/f;->execute()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -192,17 +192,17 @@
     :catch_0
     move-exception v0
 
-    invoke-interface {p0}, Ln0/f;->p()Ln0/a0;
+    invoke-interface {p0}, Lo0/f;->p()Lo0/a0;
 
     move-result-object p0
 
     if-eqz p0, :cond_1
 
-    iget-object v1, p0, Ln0/a0;->b:Ln0/w;
+    iget-object v1, p0, Lo0/a0;->b:Lo0/w;
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v1}, Ln0/w;->l()Ljava/net/URL;
+    invoke-virtual {v1}, Lo0/w;->k()Ljava/net/URL;
 
     move-result-object v1
 
@@ -213,7 +213,7 @@
     invoke-virtual {v7, v1}, Lf/h/a/f/h/f/k0;->d(Ljava/lang/String;)Lf/h/a/f/h/f/k0;
 
     :cond_0
-    iget-object p0, p0, Ln0/a0;->c:Ljava/lang/String;
+    iget-object p0, p0, Lo0/a0;->c:Ljava/lang/String;
 
     if-eqz p0, :cond_1
 
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
index 1141858867..9e75c501b2 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/BuildConfig.smali
@@ -17,9 +17,9 @@
 
 .field public static final LIBRARY_PACKAGE_NAME:Ljava/lang/String; = "com.hammerandchisel.libdiscord"
 
-.field public static final VERSION_CODE:I = 0x11b
+.field public static final VERSION_CODE:I = 0x11d
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "2.8.3"
+.field public static final VERSION_NAME:Ljava/lang/String; = "2.8.5"
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback.smali
new file mode 100644
index 0000000000..181afc4d6f
--- /dev/null
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback.smali
@@ -0,0 +1,23 @@
+.class public interface abstract Lcom/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback;
+.super Ljava/lang/Object;
+.source "Discord.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/hammerandchisel/libdiscord/Discord;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "GetRankedRtcRegionsCallback"
+.end annotation
+
+
+# virtual methods
+.method public abstract onRankedRtcRegions([Ljava/lang/String;)V
+    .param p1    # [Ljava/lang/String;
+        .annotation build Landroidx/annotation/NonNull;
+        .end annotation
+    .end param
+.end method
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
index f52fabd2de..d4c751fef8 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/Discord.smali
@@ -6,6 +6,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lcom/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback;,
         Lcom/hammerandchisel/libdiscord/Discord$NoAudioInputCallback;,
         Lcom/hammerandchisel/libdiscord/Discord$GetSupportedVideoCodecsCallback;,
         Lcom/hammerandchisel/libdiscord/Discord$GetAudioSubsystemCallback;,
@@ -168,6 +169,17 @@
     .end param
 .end method
 
+.method public native getRankedRtcRegions([Lco/discord/media_engine/RtcRegion;Lcom/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback;)V
+    .param p1    # [Lco/discord/media_engine/RtcRegion;
+        .annotation build Landroidx/annotation/NonNull;
+        .end annotation
+    .end param
+    .param p2    # Lcom/hammerandchisel/libdiscord/Discord$GetRankedRtcRegionsCallback;
+        .annotation build Landroidx/annotation/NonNull;
+        .end annotation
+    .end param
+.end method
+
 .method public native getSupportedVideoCodecs(Lcom/hammerandchisel/libdiscord/Discord$GetSupportedVideoCodecsCallback;)V
     .param p1    # Lcom/hammerandchisel/libdiscord/Discord$GetSupportedVideoCodecsCallback;
         .annotation build Landroidx/annotation/NonNull;
diff --git a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R$string.smali b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R$string.smali
index 64ec7fe2b0..fc3a9d32c9 100644
--- a/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R$string.smali
+++ b/com.discord/smali_classes2/com/hammerandchisel/libdiscord/R$string.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final krisp_model_version:I = 0x7f120df5
+.field public static final krisp_model_version:I = 0x7f120e1b
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$b.smali b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$b.smali
index 6e63a162c9..399d15e546 100644
--- a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$b.smali
+++ b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$b.smali
@@ -192,37 +192,37 @@
 
 .field public static final cpv_preset_checked:I = 0x7f0800e5
 
-.field public static final ic_arrow_down_24dp:I = 0x7f08021d
+.field public static final ic_arrow_down_24dp:I = 0x7f08021e
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final preference_list_divider_material:I = 0x7f080506
+.field public static final preference_list_divider_material:I = 0x7f080509
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$c.smali b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$c.smali
index 7934ac869c..74ab817a56 100644
--- a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$c.smali
+++ b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$c.smali
@@ -64,231 +64,231 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final circle:I = 0x7f0a026b
+.field public static final circle:I = 0x7f0a026e
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final cpv_color_image_view:I = 0x7f0a0290
+.field public static final cpv_color_image_view:I = 0x7f0a0293
 
-.field public static final cpv_color_panel_new:I = 0x7f0a0291
+.field public static final cpv_color_panel_new:I = 0x7f0a0294
 
-.field public static final cpv_color_panel_old:I = 0x7f0a0292
+.field public static final cpv_color_panel_old:I = 0x7f0a0295
 
-.field public static final cpv_color_panel_view:I = 0x7f0a0293
+.field public static final cpv_color_panel_view:I = 0x7f0a0296
 
-.field public static final cpv_color_picker_content:I = 0x7f0a0294
+.field public static final cpv_color_picker_content:I = 0x7f0a0297
 
-.field public static final cpv_color_picker_custom_button:I = 0x7f0a0295
+.field public static final cpv_color_picker_custom_button:I = 0x7f0a0298
 
-.field public static final cpv_color_picker_custom_reset:I = 0x7f0a0296
+.field public static final cpv_color_picker_custom_reset:I = 0x7f0a0299
 
-.field public static final cpv_color_picker_select_button:I = 0x7f0a0297
+.field public static final cpv_color_picker_select_button:I = 0x7f0a029a
 
-.field public static final cpv_color_picker_title:I = 0x7f0a0298
+.field public static final cpv_color_picker_title:I = 0x7f0a029b
 
-.field public static final cpv_color_picker_view:I = 0x7f0a0299
+.field public static final cpv_color_picker_view:I = 0x7f0a029c
 
-.field public static final cpv_hex:I = 0x7f0a029a
+.field public static final cpv_hex:I = 0x7f0a029d
 
-.field public static final cpv_hex_container:I = 0x7f0a029b
+.field public static final cpv_hex_container:I = 0x7f0a029e
 
-.field public static final cpv_hex_prefix:I = 0x7f0a029c
+.field public static final cpv_hex_prefix:I = 0x7f0a029f
 
-.field public static final cpv_preference_preview_color_panel:I = 0x7f0a029d
+.field public static final cpv_preference_preview_color_panel:I = 0x7f0a02a0
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final gridView:I = 0x7f0a0411
+.field public static final gridView:I = 0x7f0a0417
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04db
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final large:I = 0x7f0a0578
+.field public static final large:I = 0x7f0a057e
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final preset:I = 0x7f0a0716
+.field public static final preset:I = 0x7f0a071c
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final recycler_view:I = 0x7f0a073f
+.field public static final recycler_view:I = 0x7f0a0745
 
-.field public static final regular:I = 0x7f0a0740
+.field public static final regular:I = 0x7f0a0746
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final seekbar:I = 0x7f0a07af
+.field public static final seekbar:I = 0x7f0a07b5
 
-.field public static final seekbar_value:I = 0x7f0a07b0
+.field public static final seekbar_value:I = 0x7f0a07b6
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final shades_divider:I = 0x7f0a090f
+.field public static final shades_divider:I = 0x7f0a0913
 
-.field public static final shades_layout:I = 0x7f0a0910
+.field public static final shades_layout:I = 0x7f0a0914
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final spinner:I = 0x7f0a0923
+.field public static final spinner:I = 0x7f0a0927
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final square:I = 0x7f0a0927
+.field public static final square:I = 0x7f0a092b
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final switchWidget:I = 0x7f0a0958
+.field public static final switchWidget:I = 0x7f0a095c
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final transparency_layout:I = 0x7f0a09a2
+.field public static final transparency_layout:I = 0x7f0a09a6
 
-.field public static final transparency_seekbar:I = 0x7f0a09a3
+.field public static final transparency_seekbar:I = 0x7f0a09a7
 
-.field public static final transparency_text:I = 0x7f0a09a4
+.field public static final transparency_text:I = 0x7f0a09a8
 
-.field public static final transparency_title:I = 0x7f0a09a5
+.field public static final transparency_title:I = 0x7f0a09a9
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$e.smali b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$e.smali
index e4836124f7..ad6aa7f2b5 100644
--- a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$e.smali
+++ b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$e.smali
@@ -68,27 +68,27 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f120020
 
-.field public static final cpv_custom:I = 0x7f1204e4
+.field public static final cpv_custom:I = 0x7f1204e6
 
-.field public static final cpv_default_title:I = 0x7f1204e5
+.field public static final cpv_default_title:I = 0x7f1204e7
 
-.field public static final cpv_presets:I = 0x7f1204e6
+.field public static final cpv_presets:I = 0x7f1204e8
 
-.field public static final cpv_select:I = 0x7f1204e7
+.field public static final cpv_select:I = 0x7f1204e9
 
-.field public static final cpv_transparency:I = 0x7f1204e8
+.field public static final cpv_transparency:I = 0x7f1204ea
 
-.field public static final expand_button_title:I = 0x7f120681
+.field public static final expand_button_title:I = 0x7f120683
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final summary_collapsed_preference_list:I = 0x7f12153a
+.field public static final summary_collapsed_preference_list:I = 0x7f121564
 
-.field public static final v7_preference_off:I = 0x7f121762
+.field public static final v7_preference_off:I = 0x7f12178c
 
-.field public static final v7_preference_on:I = 0x7f121763
+.field public static final v7_preference_on:I = 0x7f12178d
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$f.smali b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$f.smali
index ab48be66a9..081045a830 100644
--- a/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$f.smali
+++ b/com.discord/smali_classes2/com/jaredrummler/android/colorpicker/R$f.smali
@@ -1593,7 +1593,7 @@
 
     new-array v4, v0, [I
 
-    const v11, 0x7f0404af
+    const v11, 0x7f0404a1
 
     aput v11, v4, v3
 
@@ -1766,10 +1766,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1778,8 +1778,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1796,8 +1796,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -1827,17 +1827,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_9
@@ -1872,8 +1872,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_b
@@ -1971,44 +1971,44 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_c
     .array-data 4
         0x101030e
-        0x7f04047e
+        0x7f040470
     .end array-data
 
     :array_d
@@ -2017,8 +2017,8 @@
         0x10101f0
         0x10101f1
         0x7f0401db
-        0x7f0404ca
-        0x7f0404cb
+        0x7f0404bc
+        0x7f0404bd
     .end array-data
 
     :array_e
@@ -2068,7 +2068,7 @@
     :array_13
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_14
@@ -2106,8 +2106,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_17
@@ -2131,7 +2131,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_19
@@ -2166,7 +2166,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_1c
@@ -2189,7 +2189,7 @@
         0x10101f8
         0x7f040210
         0x7f040211
-        0x7f04058b
+        0x7f04057d
     .end array-data
 
     :array_1f
@@ -2225,8 +2225,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_21
@@ -2239,7 +2239,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_22
@@ -2289,12 +2289,12 @@
         0x7f04032d
         0x7f0403d3
         0x7f0403eb
-        0x7f04047d
-        0x7f040489
-        0x7f04049b
-        0x7f0404c9
-        0x7f040553
-        0x7f0405a0
+        0x7f04046f
+        0x7f04047b
+        0x7f04048d
+        0x7f0404bb
+        0x7f040545
+        0x7f040592
     .end array-data
 
     :array_25
@@ -2343,9 +2343,9 @@
         0x7f0403ff
         0x7f040400
         0x7f040401
-        0x7f04047b
-        0x7f0404d4
-        0x7f0404d5
+        0x7f04046d
+        0x7f0404c6
+        0x7f0404c7
     .end array-data
 
     :array_2a
@@ -2366,8 +2366,8 @@
         0x7f040232
         0x7f04032e
         0x7f040445
-        0x7f0404a2
-        0x7f0404a9
+        0x7f040494
+        0x7f04049b
     .end array-data
 
     :array_2c
@@ -2384,11 +2384,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_2d
@@ -2397,9 +2397,9 @@
         0x1010136
         0x7f04002a
         0x7f0403c6
-        0x7f04047a
-        0x7f040491
-        0x7f040588
+        0x7f04046c
+        0x7f040483
+        0x7f04057a
     .end array-data
 
     :array_2e
@@ -2426,17 +2426,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_31
@@ -2447,10 +2447,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_32
@@ -2461,10 +2461,10 @@
         0x101036b
         0x101036c
         0x7f0401db
+        0x7f0404bc
+        0x7f0404bd
         0x7f0404ca
         0x7f0404cb
-        0x7f0404d8
-        0x7f0404d9
     .end array-data
 
     :array_33
@@ -2483,8 +2483,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_34
@@ -2507,18 +2507,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_35
@@ -2527,7 +2527,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_36
diff --git a/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$Companion.smali b/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$Companion.smali
index 588c103df2..91b0942ea6 100644
--- a/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$Companion.smali
+++ b/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$Companion.smali
@@ -34,6 +34,122 @@
 
 # virtual methods
 .method public final copy(Lcom/linecorp/apng/decoder/Apng;)Lcom/linecorp/apng/decoder/Apng;
+    .locals 10
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/linecorp/apng/decoder/ApngException;
+        }
+    .end annotation
+
+    const-string v0, "apng"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/linecorp/apng/decoder/Apng$DecodeResult;
+
+    invoke-direct {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;-><init>()V
+
+    const-string v1, "Apng#copy"
+
+    invoke-static {v1}, Landroid/os/Trace;->beginSection(Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-static {p1}, Lcom/linecorp/apng/decoder/Apng;->access$getId$p(Lcom/linecorp/apng/decoder/Apng;)I
+
+    move-result p1
+
+    invoke-static {p1, v0}, Lcom/linecorp/apng/decoder/ApngDecoderJni;->copy(ILcom/linecorp/apng/decoder/Apng$DecodeResult;)I
+
+    move-result v2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    invoke-static {}, Landroid/os/Trace;->endSection()V
+
+    if-ltz v2, :cond_0
+
+    :try_start_1
+    new-instance p1, Lcom/linecorp/apng/decoder/Apng;
+
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getWidth()I
+
+    move-result v3
+
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getHeight()I
+
+    move-result v4
+
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameCount()I
+
+    move-result v5
+
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameDurations()[I
+
+    move-result-object v6
+
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getLoopCount()I
+
+    move-result v7
+
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getAllFrameByteCount()J
+
+    move-result-wide v8
+
+    move-object v1, p1
+
+    invoke-direct/range {v1 .. v9}, Lcom/linecorp/apng/decoder/Apng;-><init>(IIII[IIJ)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    new-instance v0, Lcom/linecorp/apng/decoder/ApngException;
+
+    invoke-direct {v0, p1}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_0
+    new-instance p1, Lcom/linecorp/apng/decoder/ApngException;
+
+    sget-object v0, Lcom/linecorp/apng/decoder/ApngException$ErrorCode;->Companion:Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;
+
+    invoke-virtual {v0, v2}, Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;->fromErrorCode$apng_drawable_release(I)Lcom/linecorp/apng/decoder/ApngException$ErrorCode;
+
+    move-result-object v0
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-direct {p1, v0, v2, v1, v2}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Lcom/linecorp/apng/decoder/ApngException$ErrorCode;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_2
+    new-instance v0, Lcom/linecorp/apng/decoder/ApngException;
+
+    invoke-direct {v0, p1}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    :catchall_2
+    move-exception p1
+
+    invoke-static {}, Landroid/os/Trace;->endSection()V
+
+    throw p1
+.end method
+
+.method public final decode(Ljava/io/InputStream;)Lcom/linecorp/apng/decoder/Apng;
     .locals 11
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -41,24 +157,20 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "stream"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lcom/linecorp/apng/decoder/Apng$DecodeResult;
+    new-instance v0, Lcom/linecorp/apng/decoder/Apng$DecodeResult;
 
-    invoke-direct {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;-><init>()V
+    invoke-direct {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;-><init>()V
 
-    const-string v2, "Apng#copy"
+    const-string v1, "Apng#decode"
 
-    invoke-static {v2}, Landroid/os/Trace;->beginSection(Ljava/lang/String;)V
+    invoke-static {v1}, Landroid/os/Trace;->beginSection(Ljava/lang/String;)V
 
     :try_start_0
-    invoke-static {p1}, Lcom/linecorp/apng/decoder/Apng;->access$getId$p(Lcom/linecorp/apng/decoder/Apng;)I
-
-    move-result p1
-
-    invoke-static {p1, v1}, Lcom/linecorp/apng/decoder/ApngDecoderJni;->copy(ILcom/linecorp/apng/decoder/Apng$DecodeResult;)I
+    invoke-static {p1, v0}, Lcom/linecorp/apng/decoder/ApngDecoderJni;->decode(Ljava/io/InputStream;Lcom/linecorp/apng/decoder/Apng$DecodeResult;)I
 
     move-result v3
     :try_end_0
@@ -71,27 +183,27 @@
     :try_start_1
     new-instance p1, Lcom/linecorp/apng/decoder/Apng;
 
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getWidth()I
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getWidth()I
 
     move-result v4
 
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getHeight()I
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getHeight()I
 
     move-result v5
 
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameCount()I
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameCount()I
 
     move-result v6
 
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameDurations()[I
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameDurations()[I
 
     move-result-object v7
 
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getLoopCount()I
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getLoopCount()I
 
     move-result v8
 
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getAllFrameByteCount()J
+    invoke-virtual {v0}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getAllFrameByteCount()J
 
     move-result-wide v9
 
@@ -115,15 +227,17 @@
     :cond_0
     new-instance p1, Lcom/linecorp/apng/decoder/ApngException;
 
-    sget-object v1, Lcom/linecorp/apng/decoder/ApngException$ErrorCode;->Companion:Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;
+    sget-object v0, Lcom/linecorp/apng/decoder/ApngException$ErrorCode;->Companion:Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;
 
-    invoke-virtual {v1, v3}, Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;->fromErrorCode$apng_drawable_release(I)Lcom/linecorp/apng/decoder/ApngException$ErrorCode;
+    invoke-virtual {v0, v3}, Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;->fromErrorCode$apng_drawable_release(I)Lcom/linecorp/apng/decoder/ApngException$ErrorCode;
 
-    move-result-object v1
+    move-result-object v0
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    invoke-direct {p1, v1, v0, v2, v0}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Lcom/linecorp/apng/decoder/ApngException$ErrorCode;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v2, 0x0
+
+    invoke-direct {p1, v0, v2, v1, v2}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Lcom/linecorp/apng/decoder/ApngException$ErrorCode;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     throw p1
 
@@ -145,130 +259,6 @@
     invoke-static {}, Landroid/os/Trace;->endSection()V
 
     throw p1
-
-    :cond_1
-    const-string p1, "apng"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final decode(Ljava/io/InputStream;)Lcom/linecorp/apng/decoder/Apng;
-    .locals 12
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/linecorp/apng/decoder/ApngException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    new-instance v1, Lcom/linecorp/apng/decoder/Apng$DecodeResult;
-
-    invoke-direct {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;-><init>()V
-
-    const-string v2, "Apng#decode"
-
-    invoke-static {v2}, Landroid/os/Trace;->beginSection(Ljava/lang/String;)V
-
-    :try_start_0
-    invoke-static {p1, v1}, Lcom/linecorp/apng/decoder/ApngDecoderJni;->decode(Ljava/io/InputStream;Lcom/linecorp/apng/decoder/Apng$DecodeResult;)I
-
-    move-result v4
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    invoke-static {}, Landroid/os/Trace;->endSection()V
-
-    if-ltz v4, :cond_0
-
-    :try_start_1
-    new-instance p1, Lcom/linecorp/apng/decoder/Apng;
-
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getWidth()I
-
-    move-result v5
-
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getHeight()I
-
-    move-result v6
-
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameCount()I
-
-    move-result v7
-
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getFrameDurations()[I
-
-    move-result-object v8
-
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getLoopCount()I
-
-    move-result v9
-
-    invoke-virtual {v1}, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->getAllFrameByteCount()J
-
-    move-result-wide v10
-
-    move-object v3, p1
-
-    invoke-direct/range {v3 .. v11}, Lcom/linecorp/apng/decoder/Apng;-><init>(IIII[IIJ)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    new-instance v0, Lcom/linecorp/apng/decoder/ApngException;
-
-    invoke-direct {v0, p1}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_0
-    new-instance p1, Lcom/linecorp/apng/decoder/ApngException;
-
-    sget-object v1, Lcom/linecorp/apng/decoder/ApngException$ErrorCode;->Companion:Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;
-
-    invoke-virtual {v1, v4}, Lcom/linecorp/apng/decoder/ApngException$ErrorCode$Companion;->fromErrorCode$apng_drawable_release(I)Lcom/linecorp/apng/decoder/ApngException$ErrorCode;
-
-    move-result-object v1
-
-    const/4 v2, 0x2
-
-    invoke-direct {p1, v1, v0, v2, v0}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Lcom/linecorp/apng/decoder/ApngException$ErrorCode;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_2
-    new-instance v0, Lcom/linecorp/apng/decoder/ApngException;
-
-    invoke-direct {v0, p1}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    :catchall_2
-    move-exception p1
-
-    invoke-static {}, Landroid/os/Trace;->endSection()V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final isApng(Ljava/io/InputStream;)Z
@@ -279,7 +269,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-static {p1}, Lcom/linecorp/apng/decoder/ApngDecoderJni;->isApng(Ljava/io/InputStream;)Z
@@ -298,13 +290,4 @@
     invoke-direct {v0, p1}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Ljava/lang/Throwable;)V
 
     throw v0
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$DecodeResult.smali b/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$DecodeResult.smali
index fbb72e1ec4..1444055427 100644
--- a/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$DecodeResult.smali
+++ b/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng$DecodeResult.smali
@@ -110,22 +110,15 @@
 .end method
 
 .method public final setFrameDurations([I)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/linecorp/apng/decoder/Apng$DecodeResult;->frameDurations:[I
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final setHeight(I)V
diff --git a/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng.smali b/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng.smali
index ad976b3e4c..ef78f32b87 100644
--- a/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng.smali
+++ b/com.discord/smali_classes2/com/linecorp/apng/decoder/Apng.smali
@@ -77,9 +77,9 @@
         .end annotation
     .end param
 
-    const/4 v0, 0x0
+    const-string v0, "frameDurations"
 
-    if-eqz p5, :cond_2
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -105,7 +105,7 @@
 
     const-string p2, "Bitmap.createBitmap(widt\u2026 Bitmap.Config.ARGB_8888)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/linecorp/apng/decoder/Apng;->a:Landroid/graphics/Bitmap;
 
@@ -125,7 +125,9 @@
 
     iget-object p1, p0, Lcom/linecorp/apng/decoder/Apng;->g:[I
 
-    if-eqz p1, :cond_1
+    const-string p2, "$this$sum"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length p2, p1
 
@@ -146,20 +148,6 @@
     iput p4, p0, Lcom/linecorp/apng/decoder/Apng;->b:I
 
     return-void
-
-    :cond_1
-    const-string p1, "$this$sum"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "frameDurations"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final synthetic access$getId$p(Lcom/linecorp/apng/decoder/Apng;)I
@@ -187,13 +175,17 @@
 .method public final drawWithIndex(ILandroid/graphics/Canvas;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Paint;)V
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "canvas"
 
-    if-eqz p2, :cond_2
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_1
+    const-string v0, "dst"
 
-    if-eqz p5, :cond_0
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "paint"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "Apng#draw"
 
@@ -212,27 +204,6 @@
     invoke-virtual {p2, p1, p3, p4, p5}, Landroid/graphics/Canvas;->drawBitmap(Landroid/graphics/Bitmap;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Paint;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "paint"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "dst"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final finalize()V
@@ -274,7 +245,7 @@
 
     const-string v1, "bitmap.config"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/linecorp/apng/decoder/ApngException.smali b/com.discord/smali_classes2/com/linecorp/apng/decoder/ApngException.smali
index 55f10a3bd2..e065af1b74 100644
--- a/com.discord/smali_classes2/com/linecorp/apng/decoder/ApngException.smali
+++ b/com.discord/smali_classes2/com/linecorp/apng/decoder/ApngException.smali
@@ -17,24 +17,17 @@
 
 # direct methods
 .method public constructor <init>(Lcom/linecorp/apng/decoder/ApngException$ErrorCode;Ljava/lang/Throwable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "errorCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p2}, Ljava/lang/Exception;-><init>(Ljava/lang/Throwable;)V
 
     iput-object p1, p0, Lcom/linecorp/apng/decoder/ApngException;->errorCode:Lcom/linecorp/apng/decoder/ApngException$ErrorCode;
 
     return-void
-
-    :cond_0
-    const-string p1, "errorCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public synthetic constructor <init>(Lcom/linecorp/apng/decoder/ApngException$ErrorCode;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -55,22 +48,15 @@
 .method public constructor <init>(Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "throwable"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, Lcom/linecorp/apng/decoder/ApngException$ErrorCode;->ERR_WITH_CHILD_EXCEPTION:Lcom/linecorp/apng/decoder/ApngException$ErrorCode;
 
     invoke-direct {p0, v0, p1}, Lcom/linecorp/apng/decoder/ApngException;-><init>(Lcom/linecorp/apng/decoder/ApngException$ErrorCode;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "throwable"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali_classes2/com/lyft/kronos/internal/ntp/NTPSyncException.smali b/com.discord/smali_classes2/com/lyft/kronos/internal/ntp/NTPSyncException.smali
index 03f63364a6..e6bd9db15a 100644
--- a/com.discord/smali_classes2/com/lyft/kronos/internal/ntp/NTPSyncException.smali
+++ b/com.discord/smali_classes2/com/lyft/kronos/internal/ntp/NTPSyncException.smali
@@ -5,20 +5,13 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
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 476a21d812..041abc20cc 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
@@ -2124,589 +2124,561 @@
 
 .field public static final roundingBorderWidth:I = 0x7f040456
 
-.field public static final sb_barBackgroundColor:I = 0x7f040457
+.field public static final scopeUris:I = 0x7f040459
 
-.field public static final sb_barColor:I = 0x7f040458
+.field public static final scrimAnimationDuration:I = 0x7f04045a
 
-.field public static final sb_barControlColor:I = 0x7f040459
+.field public static final scrimBackground:I = 0x7f04045b
 
-.field public static final sb_barControlRadius:I = 0x7f04045a
+.field public static final scrimVisibleHeightTrigger:I = 0x7f04045c
 
-.field public static final sb_barControlShadowColor:I = 0x7f04045b
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final sb_barControlShadowRadius:I = 0x7f04045c
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final sb_barHeight:I = 0x7f04045d
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final sb_barInterval:I = 0x7f04045e
+.field public static final seekBarIncrement:I = 0x7f04046c
 
-.field public static final sb_barOverlayColor:I = 0x7f04045f
+.field public static final seekBarPreferenceStyle:I = 0x7f04046d
 
-.field public static final sb_barOverlayValue:I = 0x7f040460
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final sb_barTouchEnabled:I = 0x7f040461
+.field public static final selectable:I = 0x7f04046f
 
-.field public static final sb_barValue:I = 0x7f040462
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final sb_barValueMax:I = 0x7f040463
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final sb_barValueMin:I = 0x7f040464
+.field public static final selectionRequired:I = 0x7f040472
 
-.field public static final scopeUris:I = 0x7f040467
+.field public static final settings_text_color:I = 0x7f040475
 
-.field public static final scrimAnimationDuration:I = 0x7f040468
+.field public static final shapeAppearance:I = 0x7f040476
 
-.field public static final scrimBackground:I = 0x7f040469
+.field public static final shapeAppearanceLargeComponent:I = 0x7f040477
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f04046a
+.field public static final shapeAppearanceMediumComponent:I = 0x7f040478
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final shapeAppearanceOverlay:I = 0x7f040479
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final shapeAppearanceSmallComponent:I = 0x7f04047a
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final shouldDisableView:I = 0x7f04047b
 
-.field public static final seekBarIncrement:I = 0x7f04047a
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final seekBarPreferenceStyle:I = 0x7f04047b
+.field public static final showDivider:I = 0x7f04047e
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final showDividerHorizontal:I = 0x7f04047f
 
-.field public static final selectable:I = 0x7f04047d
+.field public static final showDividerVertical:I = 0x7f040480
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final showMotionSpec:I = 0x7f040482
 
-.field public static final selectionRequired:I = 0x7f040480
+.field public static final showSeekBarValue:I = 0x7f040483
 
-.field public static final settings_text_color:I = 0x7f040483
+.field public static final showText:I = 0x7f040484
 
-.field public static final shapeAppearance:I = 0x7f040484
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final shapeAppearanceLargeComponent:I = 0x7f040485
+.field public static final shrinkMotionSpec:I = 0x7f040489
 
-.field public static final shapeAppearanceMediumComponent:I = 0x7f040486
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final shapeAppearanceOverlay:I = 0x7f040487
+.field public static final singleLine:I = 0x7f04048c
 
-.field public static final shapeAppearanceSmallComponent:I = 0x7f040488
+.field public static final singleLineTitle:I = 0x7f04048d
 
-.field public static final shouldDisableView:I = 0x7f040489
+.field public static final singleSelection:I = 0x7f04048e
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final sliderStyle:I = 0x7f04048f
 
-.field public static final showDivider:I = 0x7f04048c
+.field public static final snackbarButtonStyle:I = 0x7f040490
 
-.field public static final showDividerHorizontal:I = 0x7f04048d
+.field public static final snackbarStyle:I = 0x7f040491
 
-.field public static final showDividerVertical:I = 0x7f04048e
+.field public static final snackbarTextViewStyle:I = 0x7f040492
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final spanCount:I = 0x7f040494
 
-.field public static final showMotionSpec:I = 0x7f040490
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final showSeekBarValue:I = 0x7f040491
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final showText:I = 0x7f040492
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final shrinkMotionSpec:I = 0x7f040497
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final stackFromEnd:I = 0x7f04049b
 
-.field public static final singleLine:I = 0x7f04049a
+.field public static final startIconCheckable:I = 0x7f04049c
 
-.field public static final singleLineTitle:I = 0x7f04049b
+.field public static final startIconContentDescription:I = 0x7f04049d
 
-.field public static final singleSelection:I = 0x7f04049c
+.field public static final startIconDrawable:I = 0x7f04049e
 
-.field public static final sliderStyle:I = 0x7f04049d
+.field public static final startIconTint:I = 0x7f04049f
 
-.field public static final snackbarButtonStyle:I = 0x7f04049e
+.field public static final startIconTintMode:I = 0x7f0404a0
 
-.field public static final snackbarStyle:I = 0x7f04049f
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final snackbarTextViewStyle:I = 0x7f0404a0
+.field public static final state_collapsed:I = 0x7f0404a2
 
-.field public static final spanCount:I = 0x7f0404a2
+.field public static final state_collapsible:I = 0x7f0404a3
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final state_dragged:I = 0x7f0404a4
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final state_liftable:I = 0x7f0404a5
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final state_lifted:I = 0x7f0404a6
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final statusBarForeground:I = 0x7f0404a8
 
-.field public static final stackFromEnd:I = 0x7f0404a9
+.field public static final statusBarScrim:I = 0x7f0404a9
 
-.field public static final startIconCheckable:I = 0x7f0404aa
+.field public static final stream_preview_bg:I = 0x7f0404aa
 
-.field public static final startIconContentDescription:I = 0x7f0404ab
+.field public static final stream_preview_placeholder_color:I = 0x7f0404ab
 
-.field public static final startIconDrawable:I = 0x7f0404ac
+.field public static final strokeColor:I = 0x7f0404ac
 
-.field public static final startIconTint:I = 0x7f0404ad
+.field public static final strokeWidth:I = 0x7f0404ad
 
-.field public static final startIconTintMode:I = 0x7f0404ae
+.field public static final stv_subtitle:I = 0x7f0404ae
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final stv_title:I = 0x7f0404af
 
-.field public static final state_collapsed:I = 0x7f0404b0
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final state_collapsible:I = 0x7f0404b1
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final state_dragged:I = 0x7f0404b2
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final state_liftable:I = 0x7f0404b3
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final state_lifted:I = 0x7f0404b4
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final statusBarForeground:I = 0x7f0404b6
+.field public static final suffixText:I = 0x7f0404b7
 
-.field public static final statusBarScrim:I = 0x7f0404b7
+.field public static final suffixTextAppearance:I = 0x7f0404b8
 
-.field public static final stream_preview_bg:I = 0x7f0404b8
+.field public static final suffixTextColor:I = 0x7f0404b9
 
-.field public static final stream_preview_placeholder_color:I = 0x7f0404b9
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final strokeColor:I = 0x7f0404ba
+.field public static final summary:I = 0x7f0404bb
 
-.field public static final strokeWidth:I = 0x7f0404bb
+.field public static final summaryOff:I = 0x7f0404bc
 
-.field public static final stv_subtitle:I = 0x7f0404bc
+.field public static final summaryOn:I = 0x7f0404bd
 
-.field public static final stv_title:I = 0x7f0404bd
+.field public static final sv_background_color:I = 0x7f0404bf
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final sv_border_width:I = 0x7f0404c0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final sv_corner_radius:I = 0x7f0404c1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final sv_show_mobile:I = 0x7f0404c2
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final swipeRefreshLayoutProgressSpinnerBackgroundColor:I = 0x7f0404c3
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final suffixText:I = 0x7f0404c5
+.field public static final switchPreferenceCompatStyle:I = 0x7f0404c6
 
-.field public static final suffixTextAppearance:I = 0x7f0404c6
+.field public static final switchPreferenceStyle:I = 0x7f0404c7
 
-.field public static final suffixTextColor:I = 0x7f0404c7
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final summary:I = 0x7f0404c9
+.field public static final switchTextOff:I = 0x7f0404ca
 
-.field public static final summaryOff:I = 0x7f0404ca
+.field public static final switchTextOn:I = 0x7f0404cb
 
-.field public static final summaryOn:I = 0x7f0404cb
+.field public static final tabBackground:I = 0x7f0404cc
 
-.field public static final sv_background_color:I = 0x7f0404cd
+.field public static final tabContentStart:I = 0x7f0404cd
 
-.field public static final sv_border_width:I = 0x7f0404ce
+.field public static final tabGravity:I = 0x7f0404ce
 
-.field public static final sv_corner_radius:I = 0x7f0404cf
+.field public static final tabIconTint:I = 0x7f0404cf
 
-.field public static final sv_show_mobile:I = 0x7f0404d0
+.field public static final tabIconTintMode:I = 0x7f0404d0
 
-.field public static final swipeRefreshLayoutProgressSpinnerBackgroundColor:I = 0x7f0404d1
+.field public static final tabIndicator:I = 0x7f0404d1
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final tabIndicatorAnimationDuration:I = 0x7f0404d2
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final tabIndicatorColor:I = 0x7f0404d3
 
-.field public static final switchPreferenceCompatStyle:I = 0x7f0404d4
+.field public static final tabIndicatorFullWidth:I = 0x7f0404d4
 
-.field public static final switchPreferenceStyle:I = 0x7f0404d5
+.field public static final tabIndicatorGravity:I = 0x7f0404d5
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final tabIndicatorHeight:I = 0x7f0404d6
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final tabInlineLabel:I = 0x7f0404d7
 
-.field public static final switchTextOff:I = 0x7f0404d8
+.field public static final tabMaxWidth:I = 0x7f0404d8
 
-.field public static final switchTextOn:I = 0x7f0404d9
+.field public static final tabMinWidth:I = 0x7f0404d9
 
-.field public static final tabBackground:I = 0x7f0404da
+.field public static final tabMode:I = 0x7f0404da
 
-.field public static final tabContentStart:I = 0x7f0404db
+.field public static final tabPadding:I = 0x7f0404db
 
-.field public static final tabGravity:I = 0x7f0404dc
+.field public static final tabPaddingBottom:I = 0x7f0404dc
 
-.field public static final tabIconTint:I = 0x7f0404dd
+.field public static final tabPaddingEnd:I = 0x7f0404dd
 
-.field public static final tabIconTintMode:I = 0x7f0404de
+.field public static final tabPaddingStart:I = 0x7f0404de
 
-.field public static final tabIndicator:I = 0x7f0404df
+.field public static final tabPaddingTop:I = 0x7f0404df
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f0404e0
+.field public static final tabRippleColor:I = 0x7f0404e0
 
-.field public static final tabIndicatorColor:I = 0x7f0404e1
+.field public static final tabSelectedTextColor:I = 0x7f0404e1
 
-.field public static final tabIndicatorFullWidth:I = 0x7f0404e2
+.field public static final tabStyle:I = 0x7f0404e2
 
-.field public static final tabIndicatorGravity:I = 0x7f0404e3
+.field public static final tabTextAppearance:I = 0x7f0404e3
 
-.field public static final tabIndicatorHeight:I = 0x7f0404e4
+.field public static final tabTextColor:I = 0x7f0404e4
 
-.field public static final tabInlineLabel:I = 0x7f0404e5
+.field public static final tabUnboundedRipple:I = 0x7f0404e5
 
-.field public static final tabMaxWidth:I = 0x7f0404e6
+.field public static final tag:I = 0x7f0404e6
 
-.field public static final tabMinWidth:I = 0x7f0404e7
+.field public static final tcs_subtext:I = 0x7f0404e7
 
-.field public static final tabMode:I = 0x7f0404e8
+.field public static final ternaryCheckboxDisabledColor:I = 0x7f0404e8
 
-.field public static final tabPadding:I = 0x7f0404e9
+.field public static final text:I = 0x7f0404e9
 
-.field public static final tabPaddingBottom:I = 0x7f0404ea
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final tabPaddingEnd:I = 0x7f0404eb
+.field public static final textAppearanceBody1:I = 0x7f0404eb
 
-.field public static final tabPaddingStart:I = 0x7f0404ec
+.field public static final textAppearanceBody2:I = 0x7f0404ec
 
-.field public static final tabPaddingTop:I = 0x7f0404ed
+.field public static final textAppearanceButton:I = 0x7f0404ed
 
-.field public static final tabRippleColor:I = 0x7f0404ee
+.field public static final textAppearanceCaption:I = 0x7f0404ee
 
-.field public static final tabSelectedTextColor:I = 0x7f0404ef
+.field public static final textAppearanceHeadline1:I = 0x7f0404ef
 
-.field public static final tabStyle:I = 0x7f0404f0
+.field public static final textAppearanceHeadline2:I = 0x7f0404f0
 
-.field public static final tabTextAppearance:I = 0x7f0404f1
+.field public static final textAppearanceHeadline3:I = 0x7f0404f1
 
-.field public static final tabTextColor:I = 0x7f0404f2
+.field public static final textAppearanceHeadline4:I = 0x7f0404f2
 
-.field public static final tabUnboundedRipple:I = 0x7f0404f3
+.field public static final textAppearanceHeadline5:I = 0x7f0404f3
 
-.field public static final tag:I = 0x7f0404f4
+.field public static final textAppearanceHeadline6:I = 0x7f0404f4
 
-.field public static final tcs_subtext:I = 0x7f0404f5
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final ternaryCheckboxDisabledColor:I = 0x7f0404f6
+.field public static final textAppearanceLineHeightEnabled:I = 0x7f0404f6
 
-.field public static final text:I = 0x7f0404f7
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceBody1:I = 0x7f0404f9
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearanceBody2:I = 0x7f0404fa
+.field public static final textAppearanceOverline:I = 0x7f0404fa
 
-.field public static final textAppearanceButton:I = 0x7f0404fb
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceCaption:I = 0x7f0404fc
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceHeadline1:I = 0x7f0404fd
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceHeadline2:I = 0x7f0404fe
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textAppearanceHeadline3:I = 0x7f0404ff
+.field public static final textAppearanceSubtitle1:I = 0x7f0404ff
 
-.field public static final textAppearanceHeadline4:I = 0x7f040500
+.field public static final textAppearanceSubtitle2:I = 0x7f040500
 
-.field public static final textAppearanceHeadline5:I = 0x7f040501
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textAppearanceHeadline6:I = 0x7f040502
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textEndPadding:I = 0x7f040503
 
-.field public static final textAppearanceLineHeightEnabled:I = 0x7f040504
+.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040504
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textInputStyle:I = 0x7f040505
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textLocale:I = 0x7f040506
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textStartPadding:I = 0x7f040507
 
-.field public static final textAppearanceOverline:I = 0x7f040508
+.field public static final text_color:I = 0x7f040508
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final theme:I = 0x7f040509
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final themeLineHeight:I = 0x7f04050a
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final theme_backspace_icon:I = 0x7f04050b
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final theme_chat_block_quote_divider:I = 0x7f04050c
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04050d
+.field public static final theme_chat_blocked_bg:I = 0x7f04050d
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04050e
+.field public static final theme_chat_blocked_text:I = 0x7f04050e
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final theme_chat_code:I = 0x7f04050f
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final theme_chat_codeblock_border:I = 0x7f040510
 
-.field public static final textEndPadding:I = 0x7f040511
+.field public static final theme_chat_empty_mentions_arm:I = 0x7f040511
 
-.field public static final textInputLayoutFocusedRectEnabled:I = 0x7f040512
+.field public static final theme_chat_empty_mentions_hand:I = 0x7f040512
 
-.field public static final textInputStyle:I = 0x7f040513
+.field public static final theme_chat_empty_pins:I = 0x7f040513
 
-.field public static final textLocale:I = 0x7f040514
+.field public static final theme_chat_input:I = 0x7f040514
 
-.field public static final textStartPadding:I = 0x7f040515
+.field public static final theme_chat_input_button_tint_colors:I = 0x7f040515
 
-.field public static final text_color:I = 0x7f040516
+.field public static final theme_chat_input_content_tab_bg:I = 0x7f040516
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme_chat_input_divider:I = 0x7f040517
 
-.field public static final themeLineHeight:I = 0x7f040518
+.field public static final theme_chat_input_edit:I = 0x7f040518
 
-.field public static final theme_backspace_icon:I = 0x7f040519
+.field public static final theme_chat_input_photo_selection_icon:I = 0x7f040519
 
-.field public static final theme_chat_block_quote_divider:I = 0x7f04051a
+.field public static final theme_chat_loading_spinner_color:I = 0x7f04051a
 
-.field public static final theme_chat_blocked_bg:I = 0x7f04051b
+.field public static final theme_chat_mentioned_me:I = 0x7f04051b
 
-.field public static final theme_chat_blocked_text:I = 0x7f04051c
+.field public static final theme_chat_reaction_background:I = 0x7f04051c
 
-.field public static final theme_chat_code:I = 0x7f04051d
+.field public static final theme_chat_reaction_text_color:I = 0x7f04051d
 
-.field public static final theme_chat_codeblock_border:I = 0x7f04051e
+.field public static final theme_chat_spoiler_bg:I = 0x7f04051e
 
-.field public static final theme_chat_empty_mentions_arm:I = 0x7f04051f
+.field public static final theme_chat_spoiler_bg_visible:I = 0x7f04051f
 
-.field public static final theme_chat_empty_mentions_hand:I = 0x7f040520
+.field public static final theme_chat_spoiler_inapp_bg:I = 0x7f040520
 
-.field public static final theme_chat_empty_pins:I = 0x7f040521
+.field public static final theme_emoji_placeholder:I = 0x7f040521
 
-.field public static final theme_chat_input:I = 0x7f040522
+.field public static final theme_emoji_settings_empty:I = 0x7f040522
 
-.field public static final theme_chat_input_button_tint_colors:I = 0x7f040523
+.field public static final theme_expression_tray_search_icon_empty:I = 0x7f040523
 
-.field public static final theme_chat_input_content_tab_bg:I = 0x7f040524
+.field public static final theme_friends_divider:I = 0x7f040524
 
-.field public static final theme_chat_input_divider:I = 0x7f040525
+.field public static final theme_friends_no_block:I = 0x7f040525
 
-.field public static final theme_chat_input_edit:I = 0x7f040526
+.field public static final theme_friends_no_friends:I = 0x7f040526
 
-.field public static final theme_chat_input_photo_selection_icon:I = 0x7f040527
+.field public static final theme_friends_no_online:I = 0x7f040527
 
-.field public static final theme_chat_loading_spinner_color:I = 0x7f040528
+.field public static final theme_friends_no_request:I = 0x7f040528
 
-.field public static final theme_chat_mentioned_me:I = 0x7f040529
+.field public static final theme_friends_no_suggestions:I = 0x7f040529
 
-.field public static final theme_chat_reaction_background:I = 0x7f04052a
+.field public static final theme_friends_pending_tab_text_color:I = 0x7f04052a
 
-.field public static final theme_chat_reaction_text_color:I = 0x7f04052b
+.field public static final theme_friends_profile_icon:I = 0x7f04052b
 
-.field public static final theme_chat_spoiler_bg:I = 0x7f04052c
+.field public static final theme_friends_tab_mentions:I = 0x7f04052c
 
-.field public static final theme_chat_spoiler_bg_visible:I = 0x7f04052d
+.field public static final theme_group_start_video_icon:I = 0x7f04052d
 
-.field public static final theme_chat_spoiler_inapp_bg:I = 0x7f04052e
+.field public static final theme_name:I = 0x7f04052e
 
-.field public static final theme_emoji_placeholder:I = 0x7f04052f
+.field public static final theme_overlay_mentions_oval:I = 0x7f04052f
 
-.field public static final theme_emoji_settings_empty:I = 0x7f040530
+.field public static final theme_search_broken_results:I = 0x7f040530
 
-.field public static final theme_expression_tray_search_icon_empty:I = 0x7f040531
+.field public static final theme_search_empty_asset:I = 0x7f040531
 
-.field public static final theme_friends_divider:I = 0x7f040532
+.field public static final theme_search_empty_asset_alternate:I = 0x7f040532
 
-.field public static final theme_friends_no_block:I = 0x7f040533
+.field public static final theme_search_indexing_animation:I = 0x7f040533
 
-.field public static final theme_friends_no_friends:I = 0x7f040534
+.field public static final theme_status_indicator_color:I = 0x7f040534
 
-.field public static final theme_friends_no_online:I = 0x7f040535
+.field public static final thickness:I = 0x7f040535
 
-.field public static final theme_friends_no_request:I = 0x7f040536
+.field public static final thumbColor:I = 0x7f040536
 
-.field public static final theme_friends_no_suggestions:I = 0x7f040537
+.field public static final thumbElevation:I = 0x7f040537
 
-.field public static final theme_friends_pending_tab_text_color:I = 0x7f040538
+.field public static final thumbRadius:I = 0x7f040538
 
-.field public static final theme_friends_profile_icon:I = 0x7f040539
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final theme_friends_tab_mentions:I = 0x7f04053a
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final theme_group_start_video_icon:I = 0x7f04053b
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final theme_name:I = 0x7f04053c
+.field public static final tickColor:I = 0x7f04053c
 
-.field public static final theme_overlay_mentions_oval:I = 0x7f04053d
+.field public static final tickColorActive:I = 0x7f04053d
 
-.field public static final theme_search_broken_results:I = 0x7f04053e
+.field public static final tickColorInactive:I = 0x7f04053e
 
-.field public static final theme_search_empty_asset:I = 0x7f04053f
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final theme_search_empty_asset_alternate:I = 0x7f040540
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final theme_search_indexing_animation:I = 0x7f040541
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final theme_status_indicator_color:I = 0x7f040542
+.field public static final tint:I = 0x7f040543
 
-.field public static final thickness:I = 0x7f040543
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final thumbColor:I = 0x7f040544
+.field public static final title:I = 0x7f040545
 
-.field public static final thumbElevation:I = 0x7f040545
+.field public static final titleEnabled:I = 0x7f040546
 
-.field public static final thumbRadius:I = 0x7f040546
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final tickColor:I = 0x7f04054a
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final tickColorActive:I = 0x7f04054b
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final tickColorInactive:I = 0x7f04054c
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final toolbarColor:I = 0x7f040551
 
-.field public static final tint:I = 0x7f040551
+.field public static final toolbarId:I = 0x7f040552
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final title:I = 0x7f040553
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final titleEnabled:I = 0x7f040554
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final tooltipStyle:I = 0x7f040557
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final topLeftRadius:I = 0x7f040559
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final topRightRadius:I = 0x7f04055a
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final track:I = 0x7f04055c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final trackColor:I = 0x7f04055d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final trackColorActive:I = 0x7f04055e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final trackColorInactive:I = 0x7f04055f
 
-.field public static final toolbarColor:I = 0x7f04055f
+.field public static final trackHeight:I = 0x7f040560
 
-.field public static final toolbarId:I = 0x7f040560
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final transitionShapeAppearance:I = 0x7f040563
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tv_markdown_enabled:I = 0x7f040566
 
-.field public static final tooltipStyle:I = 0x7f040565
+.field public static final tv_plural:I = 0x7f040567
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tv_plural_quantity:I = 0x7f040568
 
-.field public static final topLeftRadius:I = 0x7f040567
+.field public static final updatesContinuously:I = 0x7f04057a
 
-.field public static final topRightRadius:I = 0x7f040568
+.field public static final useCompatPadding:I = 0x7f04057b
 
-.field public static final track:I = 0x7f04056a
+.field public static final useMaterialThemeColors:I = 0x7f04057c
 
-.field public static final trackColor:I = 0x7f04056b
+.field public static final useSimpleSummaryProvider:I = 0x7f04057d
 
-.field public static final trackColorActive:I = 0x7f04056c
+.field public static final user_avatar_background_color:I = 0x7f040583
 
-.field public static final trackColorInactive:I = 0x7f04056d
+.field public static final user_avatar_size:I = 0x7f040584
 
-.field public static final trackHeight:I = 0x7f04056e
+.field public static final user_profile_header_background_color:I = 0x7f040585
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final username:I = 0x7f040586
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final username_singleline:I = 0x7f040587
 
-.field public static final transitionShapeAppearance:I = 0x7f040571
+.field public static final username_text_appearance:I = 0x7f040588
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final username_text_size:I = 0x7f040589
 
-.field public static final tv_markdown_enabled:I = 0x7f040574
+.field public static final values:I = 0x7f04058a
 
-.field public static final tv_plural:I = 0x7f040575
+.field public static final vcpv_is_overlay:I = 0x7f04058b
 
-.field public static final tv_plural_quantity:I = 0x7f040576
+.field public static final vcpv_match_video_orientation:I = 0x7f04058c
 
-.field public static final updatesContinuously:I = 0x7f040588
+.field public static final verticalOffset:I = 0x7f04058d
 
-.field public static final useCompatPadding:I = 0x7f040589
+.field public static final viewAspectRatio:I = 0x7f04058e
 
-.field public static final useMaterialThemeColors:I = 0x7f04058a
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final useSimpleSummaryProvider:I = 0x7f04058b
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final user_avatar_background_color:I = 0x7f040591
+.field public static final vuv_avatar_size:I = 0x7f040591
 
-.field public static final user_avatar_size:I = 0x7f040592
+.field public static final widgetLayout:I = 0x7f040592
 
-.field public static final user_profile_header_background_color:I = 0x7f040593
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final username:I = 0x7f040594
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final username_singleline:I = 0x7f040595
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final username_text_appearance:I = 0x7f040596
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final username_text_size:I = 0x7f040597
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final values:I = 0x7f040598
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final vcpv_is_overlay:I = 0x7f040599
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final vcpv_match_video_orientation:I = 0x7f04059a
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final verticalOffset:I = 0x7f04059b
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final viewAspectRatio:I = 0x7f04059c
+.field public static final windowNoTitle:I = 0x7f04059c
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final yearSelectedStyle:I = 0x7f04059d
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final yearStyle:I = 0x7f04059e
 
-.field public static final vuv_avatar_size:I = 0x7f04059f
-
-.field public static final widgetLayout:I = 0x7f0405a0
-
-.field public static final windowActionBar:I = 0x7f0405a1
-
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
-
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
-
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
-
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
-
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
-
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
-
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
-
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
-
-.field public static final windowNoTitle:I = 0x7f0405aa
-
-.field public static final yearSelectedStyle:I = 0x7f0405ab
-
-.field public static final yearStyle:I = 0x7f0405ac
-
-.field public static final yearTodayStyle:I = 0x7f0405ad
+.field public static final yearTodayStyle:I = 0x7f04059f
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
index 96eb036ded..c2786752d1 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
@@ -816,1621 +816,1621 @@
 
 .field public static final drawable_voice_indicator_speaking:I = 0x7f0801c8
 
-.field public static final drawable_voice_user_background_speaking:I = 0x7f0801c9
+.field public static final drawable_voice_user_background_speaking:I = 0x7f0801ca
 
-.field public static final empty_pins_dark:I = 0x7f0801ca
+.field public static final empty_pins_dark:I = 0x7f0801cb
 
-.field public static final empty_pins_light:I = 0x7f0801cb
+.field public static final empty_pins_light:I = 0x7f0801cc
 
-.field public static final file_item_selection_indicator_btn:I = 0x7f0801f3
+.field public static final file_item_selection_indicator_btn:I = 0x7f0801f4
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801f4
+.field public static final googleg_disabled_color_18:I = 0x7f0801f5
 
-.field public static final googleg_standard_color_18:I = 0x7f0801f5
+.field public static final googleg_standard_color_18:I = 0x7f0801f6
 
-.field public static final ic_account_bnet:I = 0x7f0801f6
+.field public static final ic_account_bnet:I = 0x7f0801f7
 
-.field public static final ic_account_circle_grey_24dp:I = 0x7f0801f7
+.field public static final ic_account_circle_grey_24dp:I = 0x7f0801f8
 
-.field public static final ic_account_circle_light_grey_24dp:I = 0x7f0801f8
+.field public static final ic_account_circle_light_grey_24dp:I = 0x7f0801f9
 
-.field public static final ic_account_circle_white_24dp:I = 0x7f0801f9
+.field public static final ic_account_circle_white_24dp:I = 0x7f0801fa
 
-.field public static final ic_account_circle_white_a60_24dp:I = 0x7f0801fa
+.field public static final ic_account_circle_white_a60_24dp:I = 0x7f0801fb
 
-.field public static final ic_account_facebook:I = 0x7f0801fb
+.field public static final ic_account_facebook:I = 0x7f0801fc
 
-.field public static final ic_account_github:I = 0x7f0801fc
+.field public static final ic_account_github:I = 0x7f0801fd
 
-.field public static final ic_account_google:I = 0x7f0801fd
+.field public static final ic_account_google:I = 0x7f0801fe
 
-.field public static final ic_account_lol:I = 0x7f0801fe
+.field public static final ic_account_lol:I = 0x7f0801ff
 
-.field public static final ic_account_microsoft:I = 0x7f0801ff
+.field public static final ic_account_microsoft:I = 0x7f080200
 
-.field public static final ic_account_obs:I = 0x7f080200
+.field public static final ic_account_obs:I = 0x7f080201
 
-.field public static final ic_account_patreon:I = 0x7f080201
+.field public static final ic_account_patreon:I = 0x7f080202
 
-.field public static final ic_account_reddit:I = 0x7f080202
+.field public static final ic_account_reddit:I = 0x7f080203
 
-.field public static final ic_account_skype:I = 0x7f080203
+.field public static final ic_account_skype:I = 0x7f080204
 
-.field public static final ic_account_spotify:I = 0x7f080204
+.field public static final ic_account_spotify:I = 0x7f080205
 
-.field public static final ic_account_steam:I = 0x7f080205
+.field public static final ic_account_steam:I = 0x7f080206
 
-.field public static final ic_account_twitch:I = 0x7f080206
+.field public static final ic_account_twitch:I = 0x7f080207
 
-.field public static final ic_account_twitter:I = 0x7f080207
+.field public static final ic_account_twitter:I = 0x7f080208
 
-.field public static final ic_account_xbox:I = 0x7f080208
+.field public static final ic_account_xbox:I = 0x7f080209
 
-.field public static final ic_account_xsplit:I = 0x7f080209
+.field public static final ic_account_xsplit:I = 0x7f08020a
 
-.field public static final ic_account_youtube:I = 0x7f08020a
+.field public static final ic_account_youtube:I = 0x7f08020b
 
-.field public static final ic_add_24dp:I = 0x7f08020b
+.field public static final ic_add_24dp:I = 0x7f08020c
 
-.field public static final ic_add_a_photo_24dp:I = 0x7f08020c
+.field public static final ic_add_a_photo_24dp:I = 0x7f08020d
 
-.field public static final ic_add_circle_outline_grey_a60_24dp:I = 0x7f08020d
+.field public static final ic_add_circle_outline_grey_a60_24dp:I = 0x7f08020e
 
-.field public static final ic_add_circle_outline_white_a60_24dp:I = 0x7f08020e
+.field public static final ic_add_circle_outline_white_a60_24dp:I = 0x7f08020f
 
-.field public static final ic_add_friend_green_check:I = 0x7f08020f
+.field public static final ic_add_friend_green_check:I = 0x7f080210
 
-.field public static final ic_add_friend_send:I = 0x7f080210
+.field public static final ic_add_friend_send:I = 0x7f080211
 
-.field public static final ic_add_person_16dp:I = 0x7f080211
+.field public static final ic_add_person_16dp:I = 0x7f080212
 
-.field public static final ic_add_reaction_grey_16dp:I = 0x7f080212
+.field public static final ic_add_reaction_grey_16dp:I = 0x7f080213
 
-.field public static final ic_add_reaction_grey_a60_24dp:I = 0x7f080213
+.field public static final ic_add_reaction_grey_a60_24dp:I = 0x7f080214
 
-.field public static final ic_add_reaction_white_a60_24dp:I = 0x7f080214
+.field public static final ic_add_reaction_white_a60_24dp:I = 0x7f080215
 
-.field public static final ic_add_white_24dp:I = 0x7f080215
+.field public static final ic_add_white_24dp:I = 0x7f080216
 
-.field public static final ic_alert_circle_16dp:I = 0x7f080216
+.field public static final ic_alert_circle_16dp:I = 0x7f080217
 
-.field public static final ic_analytics_16dp:I = 0x7f080217
+.field public static final ic_analytics_16dp:I = 0x7f080218
 
-.field public static final ic_arrow_back_dark_grey_24dp:I = 0x7f080218
+.field public static final ic_arrow_back_dark_grey_24dp:I = 0x7f080219
 
-.field public static final ic_arrow_back_grey_24dp:I = 0x7f080219
+.field public static final ic_arrow_back_grey_24dp:I = 0x7f08021a
 
-.field public static final ic_arrow_back_white_24dp:I = 0x7f08021a
+.field public static final ic_arrow_back_white_24dp:I = 0x7f08021b
 
-.field public static final ic_arrow_down:I = 0x7f08021b
+.field public static final ic_arrow_down:I = 0x7f08021c
 
-.field public static final ic_arrow_down_14dp:I = 0x7f08021c
+.field public static final ic_arrow_down_14dp:I = 0x7f08021d
 
-.field public static final ic_arrow_down_24dp:I = 0x7f08021d
+.field public static final ic_arrow_down_24dp:I = 0x7f08021e
 
-.field public static final ic_arrow_downward_white_16dp:I = 0x7f08021e
+.field public static final ic_arrow_downward_white_16dp:I = 0x7f08021f
 
-.field public static final ic_arrow_drop_down_white_18dp:I = 0x7f08021f
+.field public static final ic_arrow_drop_down_white_18dp:I = 0x7f080220
 
-.field public static final ic_arrow_right:I = 0x7f080220
+.field public static final ic_arrow_right:I = 0x7f080221
 
-.field public static final ic_arrow_right_24dp:I = 0x7f080221
+.field public static final ic_arrow_right_24dp:I = 0x7f080222
 
-.field public static final ic_arrow_up_24dp:I = 0x7f080222
+.field public static final ic_arrow_up_24dp:I = 0x7f080223
 
-.field public static final ic_arrow_upward_white_16dp:I = 0x7f080223
+.field public static final ic_arrow_upward_white_16dp:I = 0x7f080224
 
-.field public static final ic_attachment_white_24dp:I = 0x7f080224
+.field public static final ic_attachment_white_24dp:I = 0x7f080225
 
-.field public static final ic_audio_24dp:I = 0x7f080225
+.field public static final ic_audio_24dp:I = 0x7f080226
 
-.field public static final ic_audio_output_bluetooth_white_24dp:I = 0x7f080226
+.field public static final ic_audio_output_bluetooth_white_24dp:I = 0x7f080227
 
-.field public static final ic_audio_output_white_24dp:I = 0x7f080227
+.field public static final ic_audio_output_white_24dp:I = 0x7f080228
 
-.field public static final ic_audit_all_grey_24dp:I = 0x7f080228
+.field public static final ic_audit_all_grey_24dp:I = 0x7f080229
 
-.field public static final ic_audit_all_white_24dp:I = 0x7f080229
+.field public static final ic_audit_all_white_24dp:I = 0x7f08022a
 
-.field public static final ic_audit_audit_create_24dp:I = 0x7f08022a
+.field public static final ic_audit_audit_create_24dp:I = 0x7f08022b
 
-.field public static final ic_audit_audit_delete_24dp:I = 0x7f08022b
+.field public static final ic_audit_audit_delete_24dp:I = 0x7f08022c
 
-.field public static final ic_audit_audit_update_24dp:I = 0x7f08022c
+.field public static final ic_audit_audit_update_24dp:I = 0x7f08022d
 
-.field public static final ic_audit_channels_grey_24dp:I = 0x7f08022d
+.field public static final ic_audit_channels_grey_24dp:I = 0x7f08022e
 
-.field public static final ic_audit_channels_white_24dp:I = 0x7f08022e
+.field public static final ic_audit_channels_white_24dp:I = 0x7f08022f
 
-.field public static final ic_audit_chat_grey_24dp:I = 0x7f08022f
+.field public static final ic_audit_chat_grey_24dp:I = 0x7f080230
 
-.field public static final ic_audit_chat_white_24dp:I = 0x7f080230
+.field public static final ic_audit_chat_white_24dp:I = 0x7f080231
 
-.field public static final ic_audit_emoji_grey_24dp:I = 0x7f080231
+.field public static final ic_audit_emoji_grey_24dp:I = 0x7f080232
 
-.field public static final ic_audit_emoji_white_24dp:I = 0x7f080232
+.field public static final ic_audit_emoji_white_24dp:I = 0x7f080233
 
-.field public static final ic_audit_guild_grey_24dp:I = 0x7f080233
+.field public static final ic_audit_guild_grey_24dp:I = 0x7f080234
 
-.field public static final ic_audit_guild_white_24dp:I = 0x7f080234
+.field public static final ic_audit_guild_white_24dp:I = 0x7f080235
 
-.field public static final ic_audit_integrations_grey_24dp:I = 0x7f080235
+.field public static final ic_audit_integrations_grey_24dp:I = 0x7f080236
 
-.field public static final ic_audit_integrations_white_24dp:I = 0x7f080236
+.field public static final ic_audit_integrations_white_24dp:I = 0x7f080237
 
-.field public static final ic_audit_invites_grey_24dp:I = 0x7f080237
+.field public static final ic_audit_invites_grey_24dp:I = 0x7f080238
 
-.field public static final ic_audit_invites_white_24dp:I = 0x7f080238
+.field public static final ic_audit_invites_white_24dp:I = 0x7f080239
 
-.field public static final ic_audit_logs_24dp:I = 0x7f080239
+.field public static final ic_audit_logs_24dp:I = 0x7f08023a
 
-.field public static final ic_audit_members_grey_24dp:I = 0x7f08023a
+.field public static final ic_audit_members_grey_24dp:I = 0x7f08023b
 
-.field public static final ic_audit_members_white_24dp:I = 0x7f08023b
+.field public static final ic_audit_members_white_24dp:I = 0x7f08023c
 
-.field public static final ic_audit_roles_grey_24dp:I = 0x7f08023c
+.field public static final ic_audit_roles_grey_24dp:I = 0x7f08023d
 
-.field public static final ic_audit_roles_white_24dp:I = 0x7f08023d
+.field public static final ic_audit_roles_white_24dp:I = 0x7f08023e
 
-.field public static final ic_audit_webhook_grey_24dp:I = 0x7f08023e
+.field public static final ic_audit_webhook_grey_24dp:I = 0x7f08023f
 
-.field public static final ic_audit_webhook_white_24dp:I = 0x7f08023f
+.field public static final ic_audit_webhook_white_24dp:I = 0x7f080240
 
-.field public static final ic_authed_apps_24dp:I = 0x7f080240
+.field public static final ic_authed_apps_24dp:I = 0x7f080241
 
-.field public static final ic_backspace_grey_24dp:I = 0x7f080241
+.field public static final ic_backspace_grey_24dp:I = 0x7f080242
 
-.field public static final ic_backspace_white_24dp:I = 0x7f080242
+.field public static final ic_backspace_white_24dp:I = 0x7f080243
 
-.field public static final ic_ban_red_24dp:I = 0x7f080243
+.field public static final ic_ban_red_24dp:I = 0x7f080244
 
-.field public static final ic_behavior_24dp:I = 0x7f080244
+.field public static final ic_behavior_24dp:I = 0x7f080245
 
-.field public static final ic_billing_24dp:I = 0x7f080245
+.field public static final ic_billing_24dp:I = 0x7f080246
 
-.field public static final ic_bluetooth_24dp:I = 0x7f080246
+.field public static final ic_bluetooth_24dp:I = 0x7f080247
 
-.field public static final ic_bnet_white_24dp:I = 0x7f080247
+.field public static final ic_bnet_white_24dp:I = 0x7f080248
 
-.field public static final ic_boosted_badge_12dp:I = 0x7f080248
+.field public static final ic_boosted_badge_12dp:I = 0x7f080249
 
-.field public static final ic_boosted_badge_18dp:I = 0x7f080249
+.field public static final ic_boosted_badge_18dp:I = 0x7f08024a
 
-.field public static final ic_boosted_badge_24dp:I = 0x7f08024a
+.field public static final ic_boosted_badge_24dp:I = 0x7f08024b
 
-.field public static final ic_boosted_guild_tier_1:I = 0x7f08024b
+.field public static final ic_boosted_guild_tier_1:I = 0x7f08024c
 
-.field public static final ic_boosted_guild_tier_2:I = 0x7f08024c
+.field public static final ic_boosted_guild_tier_2:I = 0x7f08024d
 
-.field public static final ic_boosted_guild_tier_3:I = 0x7f08024d
+.field public static final ic_boosted_guild_tier_3:I = 0x7f08024e
 
-.field public static final ic_booster_profile_badge_24dp:I = 0x7f08024e
+.field public static final ic_booster_profile_badge_24dp:I = 0x7f08024f
 
-.field public static final ic_call_24dp:I = 0x7f08024f
+.field public static final ic_call_24dp:I = 0x7f080250
 
-.field public static final ic_call_disconnect_24dp:I = 0x7f080250
+.field public static final ic_call_disconnect_24dp:I = 0x7f080251
 
-.field public static final ic_call_indicator_streaming_16dp:I = 0x7f080251
+.field public static final ic_call_indicator_streaming_16dp:I = 0x7f080252
 
-.field public static final ic_call_indicator_video_16dp:I = 0x7f080252
+.field public static final ic_call_indicator_video_16dp:I = 0x7f080253
 
-.field public static final ic_call_indicator_voice_16dp:I = 0x7f080253
+.field public static final ic_call_indicator_voice_16dp:I = 0x7f080254
 
-.field public static final ic_camera_24dp:I = 0x7f080254
+.field public static final ic_camera_24dp:I = 0x7f080255
 
-.field public static final ic_camera_front_white_24dp:I = 0x7f080255
+.field public static final ic_camera_front_white_24dp:I = 0x7f080256
 
-.field public static final ic_camera_rear_white_24dp:I = 0x7f080256
+.field public static final ic_camera_rear_white_24dp:I = 0x7f080257
 
-.field public static final ic_carot_right_24dp:I = 0x7f080257
+.field public static final ic_carot_right_24dp:I = 0x7f080258
 
-.field public static final ic_category_16dp:I = 0x7f080258
+.field public static final ic_category_16dp:I = 0x7f080259
 
-.field public static final ic_category_grey_a60_24dp:I = 0x7f080259
+.field public static final ic_category_grey_a60_24dp:I = 0x7f08025a
 
-.field public static final ic_category_white_a60_24dp:I = 0x7f08025a
+.field public static final ic_category_white_a60_24dp:I = 0x7f08025b
 
-.field public static final ic_channel_announcements:I = 0x7f08025b
+.field public static final ic_channel_announcements:I = 0x7f08025c
 
-.field public static final ic_channel_announcements_locked:I = 0x7f08025c
+.field public static final ic_channel_announcements_locked:I = 0x7f08025d
 
-.field public static final ic_channel_announcements_nsfw:I = 0x7f08025d
+.field public static final ic_channel_announcements_nsfw:I = 0x7f08025e
 
-.field public static final ic_channel_lock_16dp:I = 0x7f08025e
+.field public static final ic_channel_lock_16dp:I = 0x7f08025f
 
-.field public static final ic_channel_pinned_message:I = 0x7f08025f
+.field public static final ic_channel_pinned_message:I = 0x7f080260
 
-.field public static final ic_channel_text:I = 0x7f080260
+.field public static final ic_channel_text:I = 0x7f080261
 
-.field public static final ic_channel_text_16dp:I = 0x7f080261
+.field public static final ic_channel_text_16dp:I = 0x7f080262
 
-.field public static final ic_channel_text_grey_18dp:I = 0x7f080262
+.field public static final ic_channel_text_grey_18dp:I = 0x7f080263
 
-.field public static final ic_channel_text_grey_a60_24dp:I = 0x7f080263
+.field public static final ic_channel_text_grey_a60_24dp:I = 0x7f080264
 
-.field public static final ic_channel_text_locked:I = 0x7f080264
+.field public static final ic_channel_text_locked:I = 0x7f080265
 
-.field public static final ic_channel_text_nsfw:I = 0x7f080265
+.field public static final ic_channel_text_nsfw:I = 0x7f080266
 
-.field public static final ic_channel_text_white_a60_24dp:I = 0x7f080266
+.field public static final ic_channel_text_white_a60_24dp:I = 0x7f080267
 
-.field public static final ic_channel_thread:I = 0x7f080267
+.field public static final ic_channel_thread:I = 0x7f080268
 
-.field public static final ic_channel_topic_ellipsis_dark:I = 0x7f080268
+.field public static final ic_channel_topic_ellipsis_dark:I = 0x7f080269
 
-.field public static final ic_channel_topic_ellipsis_light:I = 0x7f080269
+.field public static final ic_channel_topic_ellipsis_light:I = 0x7f08026a
 
-.field public static final ic_channel_voice:I = 0x7f08026a
+.field public static final ic_channel_voice:I = 0x7f08026b
 
-.field public static final ic_channel_voice_16dp:I = 0x7f08026b
+.field public static final ic_channel_voice_16dp:I = 0x7f08026c
 
-.field public static final ic_channel_voice_grey_18dp:I = 0x7f08026c
+.field public static final ic_channel_voice_grey_18dp:I = 0x7f08026d
 
-.field public static final ic_channel_voice_locked:I = 0x7f08026d
+.field public static final ic_channel_voice_locked:I = 0x7f08026e
 
-.field public static final ic_channels_24dp:I = 0x7f08026e
+.field public static final ic_channels_24dp:I = 0x7f08026f
 
-.field public static final ic_chat_bubble_light_grey_24dp:I = 0x7f08026f
+.field public static final ic_chat_bubble_light_grey_24dp:I = 0x7f080270
 
-.field public static final ic_chat_bubble_white_a60_24dp:I = 0x7f080270
+.field public static final ic_chat_bubble_white_a60_24dp:I = 0x7f080271
 
-.field public static final ic_chat_list_actions_add_reaction:I = 0x7f080271
+.field public static final ic_chat_list_actions_add_reaction:I = 0x7f080272
 
-.field public static final ic_check_brand_24dp:I = 0x7f080272
+.field public static final ic_check_brand_24dp:I = 0x7f080273
 
-.field public static final ic_check_circle_24dp:I = 0x7f080273
+.field public static final ic_check_circle_24dp:I = 0x7f080274
 
-.field public static final ic_check_circle_green_24dp:I = 0x7f080274
+.field public static final ic_check_circle_green_24dp:I = 0x7f080275
 
-.field public static final ic_check_green_24dp:I = 0x7f080275
+.field public static final ic_check_green_24dp:I = 0x7f080276
 
-.field public static final ic_check_grey_24dp:I = 0x7f080276
+.field public static final ic_check_grey_24dp:I = 0x7f080277
 
-.field public static final ic_check_white_24dp:I = 0x7f080277
+.field public static final ic_check_white_24dp:I = 0x7f080278
 
-.field public static final ic_chevron_down_dark_grey_12dp:I = 0x7f080278
+.field public static final ic_chevron_down_dark_grey_12dp:I = 0x7f080279
 
-.field public static final ic_chevron_down_grey_12dp:I = 0x7f080279
+.field public static final ic_chevron_down_grey_12dp:I = 0x7f08027a
 
-.field public static final ic_chevron_down_primary_300_12dp:I = 0x7f08027a
+.field public static final ic_chevron_down_primary_300_12dp:I = 0x7f08027b
 
-.field public static final ic_chevron_down_white_12dp:I = 0x7f08027b
+.field public static final ic_chevron_down_white_12dp:I = 0x7f08027c
 
-.field public static final ic_chevron_left_24dp:I = 0x7f08027c
+.field public static final ic_chevron_left_24dp:I = 0x7f08027d
 
-.field public static final ic_chevron_right_grey_12dp:I = 0x7f08027d
+.field public static final ic_chevron_right_grey_12dp:I = 0x7f08027e
 
-.field public static final ic_chevron_right_primary_300_12dp:I = 0x7f08027e
+.field public static final ic_chevron_right_primary_300_12dp:I = 0x7f08027f
 
-.field public static final ic_clear_24dp:I = 0x7f08027f
+.field public static final ic_clear_24dp:I = 0x7f080280
 
-.field public static final ic_clear_all_white_24dp:I = 0x7f080280
+.field public static final ic_clear_all_white_24dp:I = 0x7f080281
 
-.field public static final ic_clear_primary_300_24dp:I = 0x7f080281
+.field public static final ic_clear_primary_300_24dp:I = 0x7f080282
 
-.field public static final ic_clear_white_24dp:I = 0x7f080282
+.field public static final ic_clear_white_24dp:I = 0x7f080283
 
-.field public static final ic_close_circle_grey_24dp:I = 0x7f080284
+.field public static final ic_close_circle_grey_24dp:I = 0x7f080285
 
-.field public static final ic_close_grey_24dp:I = 0x7f080285
+.field public static final ic_close_grey_24dp:I = 0x7f080286
 
-.field public static final ic_close_primary_200_24dp:I = 0x7f080286
+.field public static final ic_close_primary_200_24dp:I = 0x7f080287
 
-.field public static final ic_close_white_18dp:I = 0x7f080287
+.field public static final ic_close_white_18dp:I = 0x7f080288
 
-.field public static final ic_close_white_24dp:I = 0x7f080288
+.field public static final ic_close_white_24dp:I = 0x7f080289
 
-.field public static final ic_community_24dp:I = 0x7f080289
+.field public static final ic_community_24dp:I = 0x7f08028a
 
-.field public static final ic_content_copy_grey_a60_24dp:I = 0x7f08028a
+.field public static final ic_content_copy_grey_a60_24dp:I = 0x7f08028b
 
-.field public static final ic_content_copy_white_a60_24dp:I = 0x7f08028b
+.field public static final ic_content_copy_white_a60_24dp:I = 0x7f08028c
 
-.field public static final ic_controller_24dp:I = 0x7f08028c
+.field public static final ic_controller_24dp:I = 0x7f08028d
 
-.field public static final ic_creditcard_amex:I = 0x7f08028d
+.field public static final ic_creditcard_amex:I = 0x7f08028e
 
-.field public static final ic_creditcard_discover:I = 0x7f08028e
+.field public static final ic_creditcard_discover:I = 0x7f08028f
 
-.field public static final ic_creditcard_generic:I = 0x7f08028f
+.field public static final ic_creditcard_generic:I = 0x7f080290
 
-.field public static final ic_creditcard_mastercard:I = 0x7f080290
+.field public static final ic_creditcard_mastercard:I = 0x7f080291
 
-.field public static final ic_creditcard_paypal:I = 0x7f080291
+.field public static final ic_creditcard_paypal:I = 0x7f080292
 
-.field public static final ic_creditcard_visa:I = 0x7f080292
+.field public static final ic_creditcard_visa:I = 0x7f080293
 
-.field public static final ic_crown_24dp:I = 0x7f080293
+.field public static final ic_crown_24dp:I = 0x7f080294
 
-.field public static final ic_deafen_state_dark:I = 0x7f080294
+.field public static final ic_deafen_state_dark:I = 0x7f080295
 
-.field public static final ic_deafen_state_light:I = 0x7f080295
+.field public static final ic_deafen_state_light:I = 0x7f080296
 
-.field public static final ic_deafen_v2_deafened:I = 0x7f080296
+.field public static final ic_deafen_v2_deafened:I = 0x7f080297
 
-.field public static final ic_deafen_v2_red_strike_primary_dark_300:I = 0x7f080297
+.field public static final ic_deafen_v2_red_strike_primary_dark_300:I = 0x7f080298
 
-.field public static final ic_deafen_v2_red_strike_primary_light_600:I = 0x7f080298
+.field public static final ic_deafen_v2_red_strike_primary_light_600:I = 0x7f080299
 
-.field public static final ic_delete_grey_a60_24dp:I = 0x7f080299
+.field public static final ic_delete_grey_a60_24dp:I = 0x7f08029a
 
-.field public static final ic_delete_sweep_primary_100_a60_24dp:I = 0x7f08029a
+.field public static final ic_delete_sweep_primary_100_a60_24dp:I = 0x7f08029b
 
-.field public static final ic_delete_sweep_primary_500_a60_24dp:I = 0x7f08029b
+.field public static final ic_delete_sweep_primary_500_a60_24dp:I = 0x7f08029c
 
-.field public static final ic_delete_white_24dp:I = 0x7f08029c
+.field public static final ic_delete_white_24dp:I = 0x7f08029d
 
-.field public static final ic_delete_white_a60_24dp:I = 0x7f08029d
+.field public static final ic_delete_white_a60_24dp:I = 0x7f08029e
 
-.field public static final ic_diag_link_24dp:I = 0x7f08029e
+.field public static final ic_diag_link_24dp:I = 0x7f08029f
 
-.field public static final ic_direct_message_header:I = 0x7f08029f
+.field public static final ic_direct_message_header:I = 0x7f0802a0
 
-.field public static final ic_done_activated_24dp:I = 0x7f0802a0
+.field public static final ic_done_activated_24dp:I = 0x7f0802a1
 
-.field public static final ic_done_green_24dp:I = 0x7f0802a1
+.field public static final ic_done_green_24dp:I = 0x7f0802a2
 
-.field public static final ic_double_carot_right_16dp:I = 0x7f0802a2
+.field public static final ic_double_carot_right_16dp:I = 0x7f0802a3
 
-.field public static final ic_drag_handle_grey_a60_24dp:I = 0x7f0802a3
+.field public static final ic_drag_handle_grey_a60_24dp:I = 0x7f0802a4
 
-.field public static final ic_drag_handle_white_a60_24dp:I = 0x7f0802a4
+.field public static final ic_drag_handle_white_a60_24dp:I = 0x7f0802a5
 
-.field public static final ic_dropdown_white_18dp:I = 0x7f0802a5
+.field public static final ic_dropdown_white_18dp:I = 0x7f0802a6
 
-.field public static final ic_edit_grey_a60_24dp:I = 0x7f0802a6
+.field public static final ic_edit_grey_a60_24dp:I = 0x7f0802a7
 
-.field public static final ic_edit_white_a60_24dp:I = 0x7f0802a7
+.field public static final ic_edit_white_a60_24dp:I = 0x7f0802a8
 
-.field public static final ic_embed_white_24dp:I = 0x7f0802a8
+.field public static final ic_embed_white_24dp:I = 0x7f0802a9
 
-.field public static final ic_emoji_24dp:I = 0x7f0802a9
+.field public static final ic_emoji_24dp:I = 0x7f0802aa
 
-.field public static final ic_emoji_blue_24dp:I = 0x7f0802aa
+.field public static final ic_emoji_blue_24dp:I = 0x7f0802ab
 
-.field public static final ic_emoji_picker_category_activity:I = 0x7f0802ab
+.field public static final ic_emoji_picker_category_activity:I = 0x7f0802ac
 
-.field public static final ic_emoji_picker_category_custom:I = 0x7f0802ac
+.field public static final ic_emoji_picker_category_custom:I = 0x7f0802ad
 
-.field public static final ic_emoji_picker_category_flags:I = 0x7f0802ad
+.field public static final ic_emoji_picker_category_flags:I = 0x7f0802ae
 
-.field public static final ic_emoji_picker_category_food:I = 0x7f0802ae
+.field public static final ic_emoji_picker_category_food:I = 0x7f0802af
 
-.field public static final ic_emoji_picker_category_nature:I = 0x7f0802af
+.field public static final ic_emoji_picker_category_nature:I = 0x7f0802b0
 
-.field public static final ic_emoji_picker_category_objects:I = 0x7f0802b0
+.field public static final ic_emoji_picker_category_objects:I = 0x7f0802b1
 
-.field public static final ic_emoji_picker_category_people:I = 0x7f0802b1
+.field public static final ic_emoji_picker_category_people:I = 0x7f0802b2
 
-.field public static final ic_emoji_picker_category_recent:I = 0x7f0802b2
+.field public static final ic_emoji_picker_category_recent:I = 0x7f0802b3
 
-.field public static final ic_emoji_picker_category_symbols:I = 0x7f0802b3
+.field public static final ic_emoji_picker_category_symbols:I = 0x7f0802b4
 
-.field public static final ic_emoji_picker_category_travel:I = 0x7f0802b4
+.field public static final ic_emoji_picker_category_travel:I = 0x7f0802b5
 
-.field public static final ic_emoji_placeholder_primary_100:I = 0x7f0802b5
+.field public static final ic_emoji_placeholder_primary_100:I = 0x7f0802b6
 
-.field public static final ic_emoji_placeholder_primary_500:I = 0x7f0802b6
+.field public static final ic_emoji_placeholder_primary_500:I = 0x7f0802b7
 
-.field public static final ic_emoji_recent_24dp:I = 0x7f0802b7
+.field public static final ic_emoji_recent_24dp:I = 0x7f0802b8
 
-.field public static final ic_empty_server_settings_integrations_dark:I = 0x7f0802b8
+.field public static final ic_empty_server_settings_integrations_dark:I = 0x7f0802b9
 
-.field public static final ic_empty_server_settings_integrations_light:I = 0x7f0802b9
+.field public static final ic_empty_server_settings_integrations_light:I = 0x7f0802ba
 
-.field public static final ic_exit_24dp:I = 0x7f0802ba
+.field public static final ic_exit_24dp:I = 0x7f0802bb
 
-.field public static final ic_exit_to_app_dark_24dp:I = 0x7f0802bb
+.field public static final ic_exit_to_app_dark_24dp:I = 0x7f0802bc
 
-.field public static final ic_exit_to_app_light_24dp:I = 0x7f0802bc
+.field public static final ic_exit_to_app_light_24dp:I = 0x7f0802bd
 
-.field public static final ic_expand_less_grey_24dp:I = 0x7f0802bd
+.field public static final ic_expand_less_grey_24dp:I = 0x7f0802be
 
-.field public static final ic_expand_less_white_24dp:I = 0x7f0802be
+.field public static final ic_expand_less_white_24dp:I = 0x7f0802bf
 
-.field public static final ic_expression_search_empty_dark:I = 0x7f0802bf
+.field public static final ic_expression_search_empty_dark:I = 0x7f0802c0
 
-.field public static final ic_expression_search_empty_light:I = 0x7f0802c0
+.field public static final ic_expression_search_empty_light:I = 0x7f0802c1
 
-.field public static final ic_facebook_white_18dp:I = 0x7f0802c1
+.field public static final ic_facebook_white_18dp:I = 0x7f0802c2
 
-.field public static final ic_facebook_white_24dp:I = 0x7f0802c2
+.field public static final ic_facebook_white_24dp:I = 0x7f0802c3
 
-.field public static final ic_feedback_happy:I = 0x7f0802c3
+.field public static final ic_feedback_happy:I = 0x7f0802c4
 
-.field public static final ic_feedback_happy_desaturated_dark:I = 0x7f0802c4
+.field public static final ic_feedback_happy_desaturated_dark:I = 0x7f0802c5
 
-.field public static final ic_feedback_happy_desaturated_light:I = 0x7f0802c5
+.field public static final ic_feedback_happy_desaturated_light:I = 0x7f0802c6
 
-.field public static final ic_feedback_neutral:I = 0x7f0802c6
+.field public static final ic_feedback_neutral:I = 0x7f0802c7
 
-.field public static final ic_feedback_neutral_desaturated_dark:I = 0x7f0802c7
+.field public static final ic_feedback_neutral_desaturated_dark:I = 0x7f0802c8
 
-.field public static final ic_feedback_neutral_desaturated_light:I = 0x7f0802c8
+.field public static final ic_feedback_neutral_desaturated_light:I = 0x7f0802c9
 
-.field public static final ic_feedback_sad:I = 0x7f0802c9
+.field public static final ic_feedback_sad:I = 0x7f0802ca
 
-.field public static final ic_feedback_sad_desaturated_dark:I = 0x7f0802ca
+.field public static final ic_feedback_sad_desaturated_dark:I = 0x7f0802cb
 
-.field public static final ic_feedback_sad_desaturated_light:I = 0x7f0802cb
+.field public static final ic_feedback_sad_desaturated_light:I = 0x7f0802cc
 
-.field public static final ic_file_24dp:I = 0x7f0802cc
+.field public static final ic_file_24dp:I = 0x7f0802cd
 
-.field public static final ic_file_acrobat:I = 0x7f0802cd
+.field public static final ic_file_acrobat:I = 0x7f0802ce
 
-.field public static final ic_file_ae:I = 0x7f0802ce
+.field public static final ic_file_ae:I = 0x7f0802cf
 
-.field public static final ic_file_ai:I = 0x7f0802cf
+.field public static final ic_file_ai:I = 0x7f0802d0
 
-.field public static final ic_file_archive:I = 0x7f0802d0
+.field public static final ic_file_archive:I = 0x7f0802d1
 
-.field public static final ic_file_code:I = 0x7f0802d1
+.field public static final ic_file_code:I = 0x7f0802d2
 
-.field public static final ic_file_document:I = 0x7f0802d2
+.field public static final ic_file_document:I = 0x7f0802d3
 
-.field public static final ic_file_download_grey_24dp:I = 0x7f0802d3
+.field public static final ic_file_download_grey_24dp:I = 0x7f0802d4
 
-.field public static final ic_file_download_white_24dp:I = 0x7f0802d4
+.field public static final ic_file_download_white_24dp:I = 0x7f0802d5
 
-.field public static final ic_file_large_code:I = 0x7f0802d5
+.field public static final ic_file_large_code:I = 0x7f0802d6
 
-.field public static final ic_file_large_document:I = 0x7f0802d6
+.field public static final ic_file_large_document:I = 0x7f0802d7
 
-.field public static final ic_file_large_video:I = 0x7f0802d7
+.field public static final ic_file_large_video:I = 0x7f0802d8
 
-.field public static final ic_file_sketch:I = 0x7f0802d8
+.field public static final ic_file_sketch:I = 0x7f0802d9
 
-.field public static final ic_file_spreadsheet:I = 0x7f0802d9
+.field public static final ic_file_spreadsheet:I = 0x7f0802da
 
-.field public static final ic_file_unknown:I = 0x7f0802da
+.field public static final ic_file_unknown:I = 0x7f0802db
 
-.field public static final ic_file_upload_24dp:I = 0x7f0802db
+.field public static final ic_file_upload_24dp:I = 0x7f0802dc
 
-.field public static final ic_file_video:I = 0x7f0802dc
+.field public static final ic_file_video:I = 0x7f0802dd
 
-.field public static final ic_file_webcode:I = 0x7f0802dd
+.field public static final ic_file_webcode:I = 0x7f0802de
 
-.field public static final ic_filter_list_grey_24dp:I = 0x7f0802de
+.field public static final ic_filter_list_grey_24dp:I = 0x7f0802df
 
-.field public static final ic_filter_list_white_24dp:I = 0x7f0802df
+.field public static final ic_filter_list_white_24dp:I = 0x7f0802e0
 
-.field public static final ic_flash_auto_24dp:I = 0x7f0802e1
+.field public static final ic_flash_auto_24dp:I = 0x7f0802e2
 
-.field public static final ic_flash_off_24dp:I = 0x7f0802e2
+.field public static final ic_flash_off_24dp:I = 0x7f0802e3
 
-.field public static final ic_flash_on_24dp:I = 0x7f0802e3
+.field public static final ic_flash_on_24dp:I = 0x7f0802e4
 
-.field public static final ic_flash_torch_24dp:I = 0x7f0802e4
+.field public static final ic_flash_torch_24dp:I = 0x7f0802e5
 
-.field public static final ic_gallery_24dp:I = 0x7f0802e5
+.field public static final ic_gallery_24dp:I = 0x7f0802e6
 
-.field public static final ic_games_24dp:I = 0x7f0802e6
+.field public static final ic_games_24dp:I = 0x7f0802e7
 
-.field public static final ic_gem_tier_1:I = 0x7f0802e7
+.field public static final ic_gem_tier_1:I = 0x7f0802e8
 
-.field public static final ic_gem_tier_2:I = 0x7f0802e8
+.field public static final ic_gem_tier_2:I = 0x7f0802e9
 
-.field public static final ic_gem_tier_3:I = 0x7f0802e9
+.field public static final ic_gem_tier_3:I = 0x7f0802ea
 
-.field public static final ic_gem_tier_3_boosted:I = 0x7f0802ea
+.field public static final ic_gem_tier_3_boosted:I = 0x7f0802eb
 
-.field public static final ic_gift_24dp:I = 0x7f0802eb
+.field public static final ic_gift_24dp:I = 0x7f0802ec
 
-.field public static final ic_gift_white_16dp:I = 0x7f0802ec
+.field public static final ic_gift_white_16dp:I = 0x7f0802ed
 
-.field public static final ic_github_white:I = 0x7f0802ed
+.field public static final ic_github_white:I = 0x7f0802ee
 
-.field public static final ic_google_auth_logo:I = 0x7f0802ee
+.field public static final ic_google_auth_logo:I = 0x7f0802ef
 
-.field public static final ic_google_white_24dp:I = 0x7f0802ef
+.field public static final ic_google_white_24dp:I = 0x7f0802f0
 
-.field public static final ic_group_add_white_24dp:I = 0x7f0802f0
+.field public static final ic_group_add_white_24dp:I = 0x7f0802f1
 
-.field public static final ic_group_edit:I = 0x7f0802f1
+.field public static final ic_group_edit:I = 0x7f0802f2
 
-.field public static final ic_group_join:I = 0x7f0802f2
+.field public static final ic_group_join:I = 0x7f0802f3
 
-.field public static final ic_group_leave:I = 0x7f0802f3
+.field public static final ic_group_leave:I = 0x7f0802f4
 
-.field public static final ic_group_message_header:I = 0x7f0802f4
+.field public static final ic_group_message_header:I = 0x7f0802f5
 
-.field public static final ic_guild_badge_premium_tier_1:I = 0x7f0802f5
+.field public static final ic_guild_badge_premium_tier_1:I = 0x7f0802f6
 
-.field public static final ic_guild_badge_premium_tier_1_banner:I = 0x7f0802f6
+.field public static final ic_guild_badge_premium_tier_1_banner:I = 0x7f0802f7
 
-.field public static final ic_guild_badge_premium_tier_2:I = 0x7f0802f7
+.field public static final ic_guild_badge_premium_tier_2:I = 0x7f0802f8
 
-.field public static final ic_guild_badge_premium_tier_2_banner:I = 0x7f0802f8
+.field public static final ic_guild_badge_premium_tier_2_banner:I = 0x7f0802f9
 
-.field public static final ic_guild_badge_premium_tier_3:I = 0x7f0802f9
+.field public static final ic_guild_badge_premium_tier_3:I = 0x7f0802fa
 
-.field public static final ic_guild_badge_premium_tier_3_banner:I = 0x7f0802fa
+.field public static final ic_guild_badge_premium_tier_3_banner:I = 0x7f0802fb
 
-.field public static final ic_guild_folder:I = 0x7f0802fb
+.field public static final ic_guild_folder:I = 0x7f0802fc
 
-.field public static final ic_guild_invite_24dp:I = 0x7f0802fc
+.field public static final ic_guild_invite_24dp:I = 0x7f0802fd
 
-.field public static final ic_guild_list_dms_24dp:I = 0x7f0802fd
+.field public static final ic_guild_list_dms_24dp:I = 0x7f0802fe
 
-.field public static final ic_guild_nitro_perk_stream_24dp:I = 0x7f0802fe
+.field public static final ic_guild_nitro_perk_stream_24dp:I = 0x7f0802ff
 
-.field public static final ic_guild_nitro_progress:I = 0x7f0802ff
+.field public static final ic_guild_nitro_progress:I = 0x7f080300
 
-.field public static final ic_guild_nitro_progress_banner:I = 0x7f080300
+.field public static final ic_guild_nitro_progress_banner:I = 0x7f080301
 
-.field public static final ic_guild_notifications_24dp:I = 0x7f080301
+.field public static final ic_guild_notifications_24dp:I = 0x7f080302
 
-.field public static final ic_guild_settings_24dp:I = 0x7f080302
+.field public static final ic_guild_settings_24dp:I = 0x7f080303
 
-.field public static final ic_guild_welcome_add_friend:I = 0x7f080303
+.field public static final ic_guild_welcome_add_friend:I = 0x7f080304
 
-.field public static final ic_guild_welcome_personalize:I = 0x7f080304
+.field public static final ic_guild_welcome_personalize:I = 0x7f080305
 
-.field public static final ic_hammer_24dp:I = 0x7f080305
+.field public static final ic_hammer_24dp:I = 0x7f080306
 
-.field public static final ic_header_members_add_white_24dp:I = 0x7f080306
+.field public static final ic_header_members_add_white_24dp:I = 0x7f080307
 
-.field public static final ic_headset_24dp:I = 0x7f080307
+.field public static final ic_headset_24dp:I = 0x7f080308
 
-.field public static final ic_headset_blue_24dp:I = 0x7f080308
+.field public static final ic_headset_blue_24dp:I = 0x7f080309
 
-.field public static final ic_headset_deafened_grey_24dp:I = 0x7f080309
+.field public static final ic_headset_deafened_grey_24dp:I = 0x7f08030a
 
-.field public static final ic_headset_deafened_grey_a60_24dp:I = 0x7f08030a
+.field public static final ic_headset_deafened_grey_a60_24dp:I = 0x7f08030b
 
-.field public static final ic_headset_deafened_interactiveactive_dark_24dp:I = 0x7f08030b
+.field public static final ic_headset_deafened_interactiveactive_dark_24dp:I = 0x7f08030c
 
-.field public static final ic_headset_deafened_interactiveactive_light_24dp:I = 0x7f08030c
+.field public static final ic_headset_deafened_interactiveactive_light_24dp:I = 0x7f08030d
 
-.field public static final ic_headset_deafened_white_24dp:I = 0x7f08030d
+.field public static final ic_headset_deafened_white_24dp:I = 0x7f08030e
 
-.field public static final ic_headset_deafened_white_a60_24dp:I = 0x7f08030e
+.field public static final ic_headset_deafened_white_a60_24dp:I = 0x7f08030f
 
-.field public static final ic_headset_grey_24dp:I = 0x7f08030f
+.field public static final ic_headset_grey_24dp:I = 0x7f080310
 
-.field public static final ic_headset_grey_a60_24dp:I = 0x7f080310
+.field public static final ic_headset_grey_a60_24dp:I = 0x7f080311
 
-.field public static final ic_headset_interactivenormal_dark_24dp:I = 0x7f080311
+.field public static final ic_headset_interactivenormal_dark_24dp:I = 0x7f080312
 
-.field public static final ic_headset_interactivenormal_light_24dp:I = 0x7f080312
+.field public static final ic_headset_interactivenormal_light_24dp:I = 0x7f080313
 
-.field public static final ic_headset_white_18dp:I = 0x7f080313
+.field public static final ic_headset_white_18dp:I = 0x7f080314
 
-.field public static final ic_headset_white_18dp_deafened:I = 0x7f080314
+.field public static final ic_headset_white_18dp_deafened:I = 0x7f080315
 
-.field public static final ic_headset_white_24dp:I = 0x7f080315
+.field public static final ic_headset_white_24dp:I = 0x7f080316
 
-.field public static final ic_headset_white_a60_24dp:I = 0x7f080316
+.field public static final ic_headset_white_a60_24dp:I = 0x7f080317
 
-.field public static final ic_help_24dp:I = 0x7f080317
+.field public static final ic_help_24dp:I = 0x7f080318
 
-.field public static final ic_help_outline_24dp:I = 0x7f080318
+.field public static final ic_help_outline_24dp:I = 0x7f080319
 
-.field public static final ic_history_white_24dp:I = 0x7f080319
+.field public static final ic_history_white_24dp:I = 0x7f08031a
 
-.field public static final ic_hypesquad_house1_32dp:I = 0x7f08031a
+.field public static final ic_hypesquad_house1_32dp:I = 0x7f08031b
 
-.field public static final ic_hypesquad_house1_winner_32dp:I = 0x7f08031b
+.field public static final ic_hypesquad_house1_winner_32dp:I = 0x7f08031c
 
-.field public static final ic_hypesquad_house2_32dp:I = 0x7f08031c
+.field public static final ic_hypesquad_house2_32dp:I = 0x7f08031d
 
-.field public static final ic_hypesquad_house2_winner_32dp:I = 0x7f08031d
+.field public static final ic_hypesquad_house2_winner_32dp:I = 0x7f08031e
 
-.field public static final ic_hypesquad_house3_32dp:I = 0x7f08031e
+.field public static final ic_hypesquad_house3_32dp:I = 0x7f08031f
 
-.field public static final ic_hypesquad_house3_winner_32dp:I = 0x7f08031f
+.field public static final ic_hypesquad_house3_winner_32dp:I = 0x7f080320
 
-.field public static final ic_image_24dp:I = 0x7f080320
+.field public static final ic_image_24dp:I = 0x7f080321
 
-.field public static final ic_image_library_24dp:I = 0x7f080321
+.field public static final ic_image_library_24dp:I = 0x7f080322
 
-.field public static final ic_img_selected_dark_theme:I = 0x7f080322
+.field public static final ic_img_selected_dark_theme:I = 0x7f080323
 
-.field public static final ic_img_selected_light_theme:I = 0x7f080323
+.field public static final ic_img_selected_light_theme:I = 0x7f080324
 
-.field public static final ic_info_24dp:I = 0x7f080324
+.field public static final ic_info_24dp:I = 0x7f080325
 
-.field public static final ic_info_outline_white_24dp:I = 0x7f080325
+.field public static final ic_info_outline_white_24dp:I = 0x7f080326
 
-.field public static final ic_insert_drive_file_grey_a60_24dp:I = 0x7f080326
+.field public static final ic_insert_drive_file_grey_a60_24dp:I = 0x7f080327
 
-.field public static final ic_insert_drive_file_white_a60_24dp:I = 0x7f080327
+.field public static final ic_insert_drive_file_white_a60_24dp:I = 0x7f080328
 
-.field public static final ic_instagram_white_18dp:I = 0x7f080328
+.field public static final ic_instagram_white_18dp:I = 0x7f080329
 
-.field public static final ic_keyboard_24dp:I = 0x7f080329
+.field public static final ic_keyboard_24dp:I = 0x7f08032a
 
-.field public static final ic_krisp_logo_dark:I = 0x7f08032a
+.field public static final ic_krisp_logo_dark:I = 0x7f08032b
 
-.field public static final ic_krisp_logo_light:I = 0x7f08032b
+.field public static final ic_krisp_logo_light:I = 0x7f08032c
 
-.field public static final ic_launch_24dp:I = 0x7f08032c
+.field public static final ic_launch_24dp:I = 0x7f08032d
 
-.field public static final ic_link_white_24dp:I = 0x7f08032d
+.field public static final ic_link_white_24dp:I = 0x7f08032e
 
-.field public static final ic_locale_24dp:I = 0x7f08032e
+.field public static final ic_locale_24dp:I = 0x7f08032f
 
-.field public static final ic_lock_dark_a60_24dp:I = 0x7f08032f
+.field public static final ic_lock_dark_a60_24dp:I = 0x7f080330
 
-.field public static final ic_lock_light_a60_24dp:I = 0x7f080330
+.field public static final ic_lock_light_a60_24dp:I = 0x7f080331
 
-.field public static final ic_lock_white_a60_16dp:I = 0x7f080331
+.field public static final ic_lock_white_a60_16dp:I = 0x7f080332
 
-.field public static final ic_lol_white_24dp:I = 0x7f080332
+.field public static final ic_lol_white_24dp:I = 0x7f080333
 
-.field public static final ic_mail_24dp:I = 0x7f080333
+.field public static final ic_mail_24dp:I = 0x7f080334
 
-.field public static final ic_member_list_boosted_badge_24dp:I = 0x7f080334
+.field public static final ic_member_list_boosted_badge_24dp:I = 0x7f080335
 
-.field public static final ic_mentions_white_24dp:I = 0x7f080336
+.field public static final ic_mentions_white_24dp:I = 0x7f080337
 
-.field public static final ic_menu_24dp:I = 0x7f080337
+.field public static final ic_menu_24dp:I = 0x7f080338
 
-.field public static final ic_menu_private_grey_a60_24dp:I = 0x7f080338
+.field public static final ic_menu_private_grey_a60_24dp:I = 0x7f080339
 
-.field public static final ic_menu_private_white_a60_24dp:I = 0x7f080339
+.field public static final ic_menu_private_white_a60_24dp:I = 0x7f08033a
 
-.field public static final ic_mic_grey_24dp:I = 0x7f08033a
+.field public static final ic_mic_grey_24dp:I = 0x7f08033b
 
-.field public static final ic_mic_grey_a60_24dp:I = 0x7f08033b
+.field public static final ic_mic_grey_a60_24dp:I = 0x7f08033c
 
-.field public static final ic_mic_interactivenormal_dark_24dp:I = 0x7f08033c
+.field public static final ic_mic_interactivenormal_dark_24dp:I = 0x7f08033d
 
-.field public static final ic_mic_interactivenormal_light_24dp:I = 0x7f08033d
+.field public static final ic_mic_interactivenormal_light_24dp:I = 0x7f08033e
 
-.field public static final ic_mic_muted_grey_24dp:I = 0x7f08033e
+.field public static final ic_mic_muted_grey_24dp:I = 0x7f08033f
 
-.field public static final ic_mic_muted_grey_a60_24dp:I = 0x7f08033f
+.field public static final ic_mic_muted_grey_a60_24dp:I = 0x7f080340
 
-.field public static final ic_mic_muted_interactiveactive_dark_24dp:I = 0x7f080340
+.field public static final ic_mic_muted_interactiveactive_dark_24dp:I = 0x7f080341
 
-.field public static final ic_mic_muted_interactiveactive_light_24dp:I = 0x7f080341
+.field public static final ic_mic_muted_interactiveactive_light_24dp:I = 0x7f080342
 
-.field public static final ic_mic_muted_white_24dp:I = 0x7f080342
+.field public static final ic_mic_muted_white_24dp:I = 0x7f080343
 
-.field public static final ic_mic_muted_white_a60_24dp:I = 0x7f080343
+.field public static final ic_mic_muted_white_a60_24dp:I = 0x7f080344
 
-.field public static final ic_mic_state_dark:I = 0x7f080344
+.field public static final ic_mic_state_dark:I = 0x7f080345
 
-.field public static final ic_mic_state_light:I = 0x7f080345
+.field public static final ic_mic_state_light:I = 0x7f080346
 
-.field public static final ic_mic_white_18dp:I = 0x7f080346
+.field public static final ic_mic_white_18dp:I = 0x7f080347
 
-.field public static final ic_mic_white_18dp_muted:I = 0x7f080347
+.field public static final ic_mic_white_18dp_muted:I = 0x7f080348
 
-.field public static final ic_mic_white_24dp:I = 0x7f080348
+.field public static final ic_mic_white_24dp:I = 0x7f080349
 
-.field public static final ic_mic_white_a60_24dp:I = 0x7f080349
+.field public static final ic_mic_white_a60_24dp:I = 0x7f08034a
 
-.field public static final ic_mobile:I = 0x7f08034a
+.field public static final ic_mobile:I = 0x7f08034b
 
-.field public static final ic_monitor_white_24dp:I = 0x7f08034b
+.field public static final ic_monitor_white_24dp:I = 0x7f08034e
 
-.field public static final ic_more_primary100_24dp:I = 0x7f08034c
+.field public static final ic_more_primary100_24dp:I = 0x7f08034f
 
-.field public static final ic_more_primary900_24dp:I = 0x7f08034d
+.field public static final ic_more_primary900_24dp:I = 0x7f080350
 
-.field public static final ic_movie_24dp:I = 0x7f08034e
+.field public static final ic_movie_24dp:I = 0x7f080351
 
-.field public static final ic_mtrl_checked_circle:I = 0x7f08034f
+.field public static final ic_mtrl_checked_circle:I = 0x7f080352
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080350
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080353
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080351
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080354
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080352
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080355
 
-.field public static final ic_mute_red_strike:I = 0x7f080353
+.field public static final ic_mute_red_strike:I = 0x7f080356
 
-.field public static final ic_mute_v2_muted:I = 0x7f080354
+.field public static final ic_mute_v2_muted:I = 0x7f080357
 
-.field public static final ic_mute_v2_muted_red_strike_primary_dark_300:I = 0x7f080355
+.field public static final ic_mute_v2_muted_red_strike_primary_dark_300:I = 0x7f080358
 
-.field public static final ic_mute_v2_muted_red_strike_primary_light_600:I = 0x7f080356
+.field public static final ic_mute_v2_muted_red_strike_primary_light_600:I = 0x7f080359
 
-.field public static final ic_my_account_24dp:I = 0x7f080357
+.field public static final ic_my_account_24dp:I = 0x7f08035a
 
-.field public static final ic_navigate_next_grey_a60_24dp:I = 0x7f080358
+.field public static final ic_navigate_next_grey_a60_24dp:I = 0x7f08035b
 
-.field public static final ic_navigate_next_white_a60_24dp:I = 0x7f080359
+.field public static final ic_navigate_next_white_a60_24dp:I = 0x7f08035c
 
-.field public static final ic_nitro_badge_nitro_gradient_16dp:I = 0x7f08035a
+.field public static final ic_nitro_badge_nitro_gradient_16dp:I = 0x7f08035d
 
-.field public static final ic_nitro_badge_white:I = 0x7f08035b
+.field public static final ic_nitro_badge_white:I = 0x7f08035e
 
-.field public static final ic_nitro_gifs_24dp:I = 0x7f08035c
+.field public static final ic_nitro_gifs_24dp:I = 0x7f08035f
 
-.field public static final ic_nitro_globalemojis_24dp:I = 0x7f08035d
+.field public static final ic_nitro_globalemojis_24dp:I = 0x7f080360
 
-.field public static final ic_nitro_highquality_24dp:I = 0x7f08035e
+.field public static final ic_nitro_highquality_24dp:I = 0x7f080361
 
-.field public static final ic_nitro_perk_stream_24dp:I = 0x7f08035f
+.field public static final ic_nitro_perk_stream_24dp:I = 0x7f080362
 
-.field public static final ic_nitro_rep:I = 0x7f080360
+.field public static final ic_nitro_rep:I = 0x7f080363
 
-.field public static final ic_nitro_rep_24dp:I = 0x7f080361
+.field public static final ic_nitro_rep_24dp:I = 0x7f080364
 
-.field public static final ic_nitro_tag_24dp:I = 0x7f080362
+.field public static final ic_nitro_tag_24dp:I = 0x7f080365
 
-.field public static final ic_noise_cancellation_active_24dp:I = 0x7f080363
+.field public static final ic_noise_cancellation_active_24dp:I = 0x7f080366
 
-.field public static final ic_noise_cancellation_disabled_24dp:I = 0x7f080364
+.field public static final ic_noise_cancellation_disabled_24dp:I = 0x7f080367
 
-.field public static final ic_notification_24dp:I = 0x7f080365
+.field public static final ic_notification_24dp:I = 0x7f080368
 
-.field public static final ic_notification_call_24dp:I = 0x7f080366
+.field public static final ic_notification_call_24dp:I = 0x7f080369
 
-.field public static final ic_notification_friends_24dp:I = 0x7f080367
+.field public static final ic_notification_friends_24dp:I = 0x7f08036a
 
-.field public static final ic_notification_message_24dp:I = 0x7f080368
+.field public static final ic_notification_message_24dp:I = 0x7f08036b
 
-.field public static final ic_notification_settings_24dp:I = 0x7f080369
+.field public static final ic_notification_settings_24dp:I = 0x7f08036c
 
-.field public static final ic_notifications_grey_a60_24dp:I = 0x7f08036a
+.field public static final ic_notifications_grey_a60_24dp:I = 0x7f08036d
 
-.field public static final ic_notifications_off_grey_24dp:I = 0x7f08036b
+.field public static final ic_notifications_off_grey_24dp:I = 0x7f08036e
 
-.field public static final ic_notifications_off_grey_a60_24dp:I = 0x7f08036c
+.field public static final ic_notifications_off_grey_a60_24dp:I = 0x7f08036f
 
-.field public static final ic_notifications_off_white_a60_24dp:I = 0x7f08036d
+.field public static final ic_notifications_off_white_a60_24dp:I = 0x7f080370
 
-.field public static final ic_notifications_settings_grey_a60_24dp:I = 0x7f08036e
+.field public static final ic_notifications_settings_grey_a60_24dp:I = 0x7f080371
 
-.field public static final ic_notifications_settings_white_a60_24dp:I = 0x7f08036f
+.field public static final ic_notifications_settings_white_a60_24dp:I = 0x7f080372
 
-.field public static final ic_notifications_white_a60_24dp:I = 0x7f080370
+.field public static final ic_notifications_white_a60_24dp:I = 0x7f080373
 
-.field public static final ic_open_in_browser_grey_24dp:I = 0x7f080371
+.field public static final ic_open_in_browser_grey_24dp:I = 0x7f080374
 
-.field public static final ic_open_in_browser_white_24dp:I = 0x7f080372
+.field public static final ic_open_in_browser_white_24dp:I = 0x7f080375
 
-.field public static final ic_open_in_new_grey_24dp:I = 0x7f080373
+.field public static final ic_open_in_new_grey_24dp:I = 0x7f080376
 
-.field public static final ic_open_in_new_grey_a60_24dp:I = 0x7f080374
+.field public static final ic_open_in_new_grey_a60_24dp:I = 0x7f080377
 
-.field public static final ic_open_in_new_white_24dp:I = 0x7f080375
+.field public static final ic_open_in_new_white_24dp:I = 0x7f080378
 
-.field public static final ic_open_in_new_white_a60_24dp:I = 0x7f080376
+.field public static final ic_open_in_new_white_a60_24dp:I = 0x7f080379
 
-.field public static final ic_overflow_dark_24dp:I = 0x7f080377
+.field public static final ic_overflow_dark_24dp:I = 0x7f08037a
 
-.field public static final ic_overflow_light_24dp:I = 0x7f080378
+.field public static final ic_overflow_light_24dp:I = 0x7f08037b
 
-.field public static final ic_overlay_white_24dp:I = 0x7f080379
+.field public static final ic_overlay_white_24dp:I = 0x7f08037c
 
-.field public static final ic_partnered_badge:I = 0x7f08037a
+.field public static final ic_partnered_badge:I = 0x7f08037d
 
-.field public static final ic_partnered_badge_banner:I = 0x7f08037b
+.field public static final ic_partnered_badge_banner:I = 0x7f08037e
 
-.field public static final ic_people_white_24dp:I = 0x7f08037c
+.field public static final ic_people_white_24dp:I = 0x7f08037f
 
-.field public static final ic_perk_lock:I = 0x7f08037d
+.field public static final ic_perk_lock:I = 0x7f080380
 
-.field public static final ic_perk_tier_1_boosted:I = 0x7f08037e
+.field public static final ic_perk_tier_1_boosted:I = 0x7f080381
 
-.field public static final ic_perk_tier_1_unboosted:I = 0x7f08037f
+.field public static final ic_perk_tier_1_unboosted:I = 0x7f080382
 
-.field public static final ic_perk_tier_2_boosted:I = 0x7f080380
+.field public static final ic_perk_tier_2_boosted:I = 0x7f080383
 
-.field public static final ic_perk_tier_2_unboosted:I = 0x7f080381
+.field public static final ic_perk_tier_2_unboosted:I = 0x7f080384
 
-.field public static final ic_perk_tier_3_boosted:I = 0x7f080382
+.field public static final ic_perk_tier_3_boosted:I = 0x7f080385
 
-.field public static final ic_perk_tier_3_unboosted:I = 0x7f080383
+.field public static final ic_perk_tier_3_unboosted:I = 0x7f080386
 
-.field public static final ic_person_add_grey_a60_24dp:I = 0x7f080384
+.field public static final ic_person_add_grey_a60_24dp:I = 0x7f080387
 
-.field public static final ic_person_add_new_primary_500_24dp:I = 0x7f080385
+.field public static final ic_person_add_new_primary_500_24dp:I = 0x7f080388
 
-.field public static final ic_person_add_new_white_24dp:I = 0x7f080386
+.field public static final ic_person_add_new_white_24dp:I = 0x7f080389
 
-.field public static final ic_person_add_white_a60_24dp:I = 0x7f080387
+.field public static final ic_person_add_white_a60_24dp:I = 0x7f08038a
 
-.field public static final ic_person_grey_a60_24dp:I = 0x7f080388
+.field public static final ic_person_grey_a60_24dp:I = 0x7f08038b
 
-.field public static final ic_person_white_a60_24dp:I = 0x7f080389
+.field public static final ic_person_white_a60_24dp:I = 0x7f08038c
 
-.field public static final ic_phone_24dp:I = 0x7f08038a
+.field public static final ic_phone_24dp:I = 0x7f08038d
 
-.field public static final ic_phonelink_24dp:I = 0x7f08038b
+.field public static final ic_phonelink_24dp:I = 0x7f08038e
 
-.field public static final ic_photo_grey_24dp:I = 0x7f08038c
+.field public static final ic_photo_grey_24dp:I = 0x7f08038f
 
-.field public static final ic_pin_24dp:I = 0x7f08038d
+.field public static final ic_pin_24dp:I = 0x7f080390
 
-.field public static final ic_play_arrow_24dp:I = 0x7f08038e
+.field public static final ic_play_arrow_24dp:I = 0x7f080391
 
-.field public static final ic_play_arrow_grey_24dp:I = 0x7f08038f
+.field public static final ic_play_arrow_grey_24dp:I = 0x7f080392
 
-.field public static final ic_play_circle_outline_white_24dp:I = 0x7f080390
+.field public static final ic_play_circle_outline_white_24dp:I = 0x7f080393
 
-.field public static final ic_plus_dark_a60_24dp:I = 0x7f080391
+.field public static final ic_plus_dark_a60_24dp:I = 0x7f080394
 
-.field public static final ic_plus_light_a60_24dp:I = 0x7f080392
+.field public static final ic_plus_light_a60_24dp:I = 0x7f080395
 
-.field public static final ic_popup_settings_grey_a60_24dp:I = 0x7f080393
+.field public static final ic_popup_settings_grey_a60_24dp:I = 0x7f080396
 
-.field public static final ic_popup_settings_white_a60_24dp:I = 0x7f080394
+.field public static final ic_popup_settings_white_a60_24dp:I = 0x7f080397
 
-.field public static final ic_privacy_24dp:I = 0x7f080395
+.field public static final ic_privacy_24dp:I = 0x7f080398
 
-.field public static final ic_privacy_dark_a60_24dp:I = 0x7f080396
+.field public static final ic_privacy_dark_a60_24dp:I = 0x7f080399
 
-.field public static final ic_privacy_light_a60_24dp:I = 0x7f080397
+.field public static final ic_privacy_light_a60_24dp:I = 0x7f08039a
 
-.field public static final ic_profile_badge_bughunter_level_1_32dp:I = 0x7f080398
+.field public static final ic_profile_badge_bughunter_level_1_32dp:I = 0x7f08039b
 
-.field public static final ic_profile_badge_bughunter_level_2_32dp:I = 0x7f080399
+.field public static final ic_profile_badge_bughunter_level_2_32dp:I = 0x7f08039c
 
-.field public static final ic_profile_badge_hypesquad_32dp:I = 0x7f08039a
+.field public static final ic_profile_badge_hypesquad_32dp:I = 0x7f08039d
 
-.field public static final ic_profile_badge_nitro_32dp:I = 0x7f08039b
+.field public static final ic_profile_badge_nitro_32dp:I = 0x7f08039e
 
-.field public static final ic_profile_badge_partner_32dp:I = 0x7f08039c
+.field public static final ic_profile_badge_partner_32dp:I = 0x7f08039f
 
-.field public static final ic_profile_badge_premium_early_supporter_32dp:I = 0x7f08039d
+.field public static final ic_profile_badge_premium_early_supporter_32dp:I = 0x7f0803a0
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl1_32dp:I = 0x7f08039e
+.field public static final ic_profile_badge_premium_guild_subscription_lvl1_32dp:I = 0x7f0803a1
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl2_32dp:I = 0x7f08039f
+.field public static final ic_profile_badge_premium_guild_subscription_lvl2_32dp:I = 0x7f0803a2
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl3_32dp:I = 0x7f0803a0
+.field public static final ic_profile_badge_premium_guild_subscription_lvl3_32dp:I = 0x7f0803a3
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl4_32dp:I = 0x7f0803a1
+.field public static final ic_profile_badge_premium_guild_subscription_lvl4_32dp:I = 0x7f0803a4
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl5_32dp:I = 0x7f0803a2
+.field public static final ic_profile_badge_premium_guild_subscription_lvl5_32dp:I = 0x7f0803a5
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl6_32dp:I = 0x7f0803a3
+.field public static final ic_profile_badge_premium_guild_subscription_lvl6_32dp:I = 0x7f0803a6
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl7_32dp:I = 0x7f0803a4
+.field public static final ic_profile_badge_premium_guild_subscription_lvl7_32dp:I = 0x7f0803a7
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl8_32dp:I = 0x7f0803a5
+.field public static final ic_profile_badge_premium_guild_subscription_lvl8_32dp:I = 0x7f0803a8
 
-.field public static final ic_profile_badge_premium_guild_subscription_lvl9_32dp:I = 0x7f0803a6
+.field public static final ic_profile_badge_premium_guild_subscription_lvl9_32dp:I = 0x7f0803a9
 
-.field public static final ic_profile_badge_staff_32dp:I = 0x7f0803a7
+.field public static final ic_profile_badge_staff_32dp:I = 0x7f0803aa
 
-.field public static final ic_profile_badge_verified_developer_32dp:I = 0x7f0803a8
+.field public static final ic_profile_badge_verified_developer_32dp:I = 0x7f0803ab
 
-.field public static final ic_qr_code_24dp:I = 0x7f0803a9
+.field public static final ic_qr_code_24dp:I = 0x7f0803ac
 
-.field public static final ic_quote_grey_a60_24dp:I = 0x7f0803aa
+.field public static final ic_quote_grey_a60_24dp:I = 0x7f0803ad
 
-.field public static final ic_quote_white_a60_24dp:I = 0x7f0803ab
+.field public static final ic_quote_white_a60_24dp:I = 0x7f0803ae
 
-.field public static final ic_reactions_grey_a60_24dp:I = 0x7f0803ac
+.field public static final ic_reactions_grey_a60_24dp:I = 0x7f0803af
 
-.field public static final ic_reactions_white_a60_24dp:I = 0x7f0803ad
+.field public static final ic_reactions_white_a60_24dp:I = 0x7f0803b0
 
-.field public static final ic_reddit_white_24dp:I = 0x7f0803ae
+.field public static final ic_reddit_white_24dp:I = 0x7f0803b1
 
-.field public static final ic_refresh_grey_a60_24dp:I = 0x7f0803af
+.field public static final ic_refresh_grey_a60_24dp:I = 0x7f0803b2
 
-.field public static final ic_refresh_white_a60_24dp:I = 0x7f0803b0
+.field public static final ic_refresh_white_a60_24dp:I = 0x7f0803b3
 
-.field public static final ic_remove_circle_outline_red_24dp:I = 0x7f0803b1
+.field public static final ic_remove_circle_outline_red_24dp:I = 0x7f0803b4
 
-.field public static final ic_remove_friend_red_24dp:I = 0x7f0803b2
+.field public static final ic_remove_friend_red_24dp:I = 0x7f0803b5
 
-.field public static final ic_rich_presence_grey_16dp:I = 0x7f0803b3
+.field public static final ic_rich_presence_grey_16dp:I = 0x7f0803b6
 
-.field public static final ic_role_24dp:I = 0x7f0803b4
+.field public static final ic_role_24dp:I = 0x7f0803b7
 
-.field public static final ic_role_lock:I = 0x7f0803b5
+.field public static final ic_role_lock:I = 0x7f0803b8
 
-.field public static final ic_role_pink_24dp:I = 0x7f0803b6
+.field public static final ic_role_pink_24dp:I = 0x7f0803b9
 
-.field public static final ic_screen_14dp:I = 0x7f0803b7
+.field public static final ic_screen_14dp:I = 0x7f0803ba
 
-.field public static final ic_search:I = 0x7f0803b8
+.field public static final ic_search:I = 0x7f0803bb
 
-.field public static final ic_search_16dp:I = 0x7f0803b9
+.field public static final ic_search_16dp:I = 0x7f0803bc
 
-.field public static final ic_search_grey_24dp:I = 0x7f0803ba
+.field public static final ic_search_grey_24dp:I = 0x7f0803bd
 
-.field public static final ic_search_white_24dp:I = 0x7f0803bb
+.field public static final ic_search_white_24dp:I = 0x7f0803be
 
-.field public static final ic_security_24dp:I = 0x7f0803bc
+.field public static final ic_security_24dp:I = 0x7f0803bf
 
-.field public static final ic_send_24dp:I = 0x7f0803bd
+.field public static final ic_send_24dp:I = 0x7f0803c0
 
-.field public static final ic_send_grey_a60_24dp:I = 0x7f0803be
+.field public static final ic_send_grey_a60_24dp:I = 0x7f0803c1
 
-.field public static final ic_send_white_24dp:I = 0x7f0803bf
+.field public static final ic_send_white_24dp:I = 0x7f0803c2
 
-.field public static final ic_send_white_a60_24dp:I = 0x7f0803c0
+.field public static final ic_send_white_a60_24dp:I = 0x7f0803c3
 
-.field public static final ic_settings_24dp:I = 0x7f0803c1
+.field public static final ic_settings_24dp:I = 0x7f0803c4
 
-.field public static final ic_settings_boost_24dp:I = 0x7f0803c2
+.field public static final ic_settings_boost_24dp:I = 0x7f0803c5
 
-.field public static final ic_settings_grey_a60_24dp:I = 0x7f0803c3
+.field public static final ic_settings_grey_a60_24dp:I = 0x7f0803c6
 
-.field public static final ic_settings_white_a60_24dp:I = 0x7f0803c4
+.field public static final ic_settings_white_a60_24dp:I = 0x7f0803c7
 
-.field public static final ic_share_grey_24dp:I = 0x7f0803c5
+.field public static final ic_share_grey_24dp:I = 0x7f0803c8
 
-.field public static final ic_share_grey_a60_24dp:I = 0x7f0803c6
+.field public static final ic_share_grey_a60_24dp:I = 0x7f0803c9
 
-.field public static final ic_share_white_24dp:I = 0x7f0803c7
+.field public static final ic_share_white_24dp:I = 0x7f0803ca
 
-.field public static final ic_share_white_a60_24dp:I = 0x7f0803c8
+.field public static final ic_share_white_a60_24dp:I = 0x7f0803cb
 
-.field public static final ic_shieldstar_24dp:I = 0x7f0803c9
+.field public static final ic_shieldstar_24dp:I = 0x7f0803cc
 
-.field public static final ic_sidebar_notifications_off_dark_24dp:I = 0x7f0803ca
+.field public static final ic_sidebar_notifications_off_dark_24dp:I = 0x7f0803cd
 
-.field public static final ic_sidebar_notifications_off_light_24dp:I = 0x7f0803cb
+.field public static final ic_sidebar_notifications_off_light_24dp:I = 0x7f0803ce
 
-.field public static final ic_sidebar_notifications_on_dark_24dp:I = 0x7f0803cc
+.field public static final ic_sidebar_notifications_on_dark_24dp:I = 0x7f0803cf
 
-.field public static final ic_sidebar_notifications_on_light_24dp:I = 0x7f0803cd
+.field public static final ic_sidebar_notifications_on_light_24dp:I = 0x7f0803d0
 
-.field public static final ic_sidebar_pins_off_dark_24dp:I = 0x7f0803ce
+.field public static final ic_sidebar_pins_off_dark_24dp:I = 0x7f0803d1
 
-.field public static final ic_sidebar_pins_off_light_24dp:I = 0x7f0803cf
+.field public static final ic_sidebar_pins_off_light_24dp:I = 0x7f0803d2
 
-.field public static final ic_sidebar_pins_on_dark_24dp:I = 0x7f0803d0
+.field public static final ic_sidebar_pins_on_dark_24dp:I = 0x7f0803d3
 
-.field public static final ic_sidebar_pins_on_light_24dp:I = 0x7f0803d1
+.field public static final ic_sidebar_pins_on_light_24dp:I = 0x7f0803d4
 
-.field public static final ic_sidebar_search_24dp:I = 0x7f0803d2
+.field public static final ic_sidebar_search_24dp:I = 0x7f0803d5
 
-.field public static final ic_signal_cellular_connected_no_internet_4_bar_white_18dp:I = 0x7f0803d3
+.field public static final ic_signal_cellular_connected_no_internet_4_bar_white_18dp:I = 0x7f0803d6
 
-.field public static final ic_skype_white_24dp:I = 0x7f0803d4
+.field public static final ic_skype_white_24dp:I = 0x7f0803d7
 
-.field public static final ic_small_lock_green_24dp:I = 0x7f0803d5
+.field public static final ic_small_lock_green_24dp:I = 0x7f0803d8
 
-.field public static final ic_smile_24dp:I = 0x7f0803d6
+.field public static final ic_smile_24dp:I = 0x7f0803d9
 
-.field public static final ic_smiley_desaturated:I = 0x7f0803d7
+.field public static final ic_smiley_desaturated:I = 0x7f0803da
 
-.field public static final ic_sort_grey_24dp:I = 0x7f0803d8
+.field public static final ic_sort_grey_24dp:I = 0x7f0803db
 
-.field public static final ic_sort_white_24dp:I = 0x7f0803d9
+.field public static final ic_sort_white_24dp:I = 0x7f0803dc
 
-.field public static final ic_sound_24dp:I = 0x7f0803da
+.field public static final ic_sound_24dp:I = 0x7f0803dd
 
-.field public static final ic_sound_bluetooth_24dp:I = 0x7f0803db
+.field public static final ic_sound_bluetooth_24dp:I = 0x7f0803de
 
-.field public static final ic_spectate:I = 0x7f0803dc
+.field public static final ic_spectate:I = 0x7f0803df
 
-.field public static final ic_spotify_green_24dp:I = 0x7f0803dd
+.field public static final ic_spotify_green_24dp:I = 0x7f0803e0
 
-.field public static final ic_spotify_white_24dp:I = 0x7f0803de
+.field public static final ic_spotify_white_24dp:I = 0x7f0803e1
 
-.field public static final ic_staff_badge_blurple_24dp:I = 0x7f0803df
+.field public static final ic_staff_badge_blurple_24dp:I = 0x7f0803e2
 
-.field public static final ic_star_24dp:I = 0x7f0803e0
+.field public static final ic_star_24dp:I = 0x7f0803e3
 
-.field public static final ic_status_24dp:I = 0x7f0803e1
+.field public static final ic_status_24dp:I = 0x7f0803e4
 
-.field public static final ic_status_dnd_16dp:I = 0x7f0803e2
+.field public static final ic_status_dnd_16dp:I = 0x7f0803e5
 
-.field public static final ic_status_idle_16dp:I = 0x7f0803e3
+.field public static final ic_status_idle_16dp:I = 0x7f0803e6
 
-.field public static final ic_status_invisible_16dp:I = 0x7f0803e4
+.field public static final ic_status_invisible_16dp:I = 0x7f0803e7
 
-.field public static final ic_status_online_16dp:I = 0x7f0803e5
+.field public static final ic_status_online_16dp:I = 0x7f0803e8
 
-.field public static final ic_status_streaming_16dp:I = 0x7f0803e6
+.field public static final ic_status_streaming_16dp:I = 0x7f0803e9
 
-.field public static final ic_steam_white_24dp:I = 0x7f0803e7
+.field public static final ic_steam_white_24dp:I = 0x7f0803ea
 
-.field public static final ic_stop_stream:I = 0x7f0803e8
+.field public static final ic_stop_stream:I = 0x7f0803eb
 
-.field public static final ic_swap_vertical_circle_grey_a60_24dp:I = 0x7f0803e9
+.field public static final ic_swap_vertical_circle_grey_a60_24dp:I = 0x7f0803ec
 
-.field public static final ic_swap_vertical_circle_white_a60_24dp:I = 0x7f0803ea
+.field public static final ic_swap_vertical_circle_white_a60_24dp:I = 0x7f0803ed
 
-.field public static final ic_switch_camera_grey_24dp:I = 0x7f0803eb
+.field public static final ic_switch_camera_grey_24dp:I = 0x7f0803ee
 
-.field public static final ic_switch_camera_white_24dp:I = 0x7f0803ec
+.field public static final ic_switch_camera_white_24dp:I = 0x7f0803ef
 
-.field public static final ic_tab_friends:I = 0x7f0803ed
+.field public static final ic_tab_friends:I = 0x7f0803f0
 
-.field public static final ic_tab_home:I = 0x7f0803ee
+.field public static final ic_tab_home:I = 0x7f0803f1
 
-.field public static final ic_tab_mentions:I = 0x7f0803ef
+.field public static final ic_tab_mentions:I = 0x7f0803f2
 
-.field public static final ic_tab_search:I = 0x7f0803f0
+.field public static final ic_tab_search:I = 0x7f0803f3
 
-.field public static final ic_take_photo:I = 0x7f0803f1
+.field public static final ic_take_photo:I = 0x7f0803f4
 
-.field public static final ic_template_32dp:I = 0x7f0803f2
+.field public static final ic_template_32dp:I = 0x7f0803f5
 
-.field public static final ic_ternary_neutral_checked:I = 0x7f0803f3
+.field public static final ic_ternary_neutral_checked:I = 0x7f0803f6
 
-.field public static final ic_ternary_neutral_unchecked:I = 0x7f0803f4
+.field public static final ic_ternary_neutral_unchecked:I = 0x7f0803f7
 
-.field public static final ic_ternary_off_checked:I = 0x7f0803f5
+.field public static final ic_ternary_off_checked:I = 0x7f0803f8
 
-.field public static final ic_ternary_off_disabled:I = 0x7f0803f6
+.field public static final ic_ternary_off_disabled:I = 0x7f0803f9
 
-.field public static final ic_ternary_off_unchecked:I = 0x7f0803f7
+.field public static final ic_ternary_off_unchecked:I = 0x7f0803fa
 
-.field public static final ic_ternary_on_checked:I = 0x7f0803f8
+.field public static final ic_ternary_on_checked:I = 0x7f0803fb
 
-.field public static final ic_ternary_on_unchecked:I = 0x7f0803f9
+.field public static final ic_ternary_on_unchecked:I = 0x7f0803fc
 
-.field public static final ic_text_channel_white_24dp:I = 0x7f0803fa
+.field public static final ic_text_channel_white_24dp:I = 0x7f0803fd
 
-.field public static final ic_text_image_24dp:I = 0x7f0803fb
+.field public static final ic_text_image_24dp:I = 0x7f0803fe
 
-.field public static final ic_theme_24dp:I = 0x7f0803fc
+.field public static final ic_theme_24dp:I = 0x7f0803ff
 
-.field public static final ic_timer_dark:I = 0x7f0803fd
+.field public static final ic_timer_dark:I = 0x7f080400
 
-.field public static final ic_timer_grey_a60_24dp:I = 0x7f0803fe
+.field public static final ic_timer_grey_a60_24dp:I = 0x7f080401
 
-.field public static final ic_timer_light:I = 0x7f0803ff
+.field public static final ic_timer_light:I = 0x7f080402
 
-.field public static final ic_timer_white_a60_24dp:I = 0x7f080400
+.field public static final ic_timer_white_a60_24dp:I = 0x7f080403
 
-.field public static final ic_tooltip_bottom_tail:I = 0x7f080401
+.field public static final ic_tooltip_bottom_tail:I = 0x7f080404
 
-.field public static final ic_transfer_red_24dp:I = 0x7f080402
+.field public static final ic_transfer_red_24dp:I = 0x7f080405
 
-.field public static final ic_twitch_white_24dp:I = 0x7f080404
+.field public static final ic_twitch_white_24dp:I = 0x7f080407
 
-.field public static final ic_twitter_white_18dp:I = 0x7f080405
+.field public static final ic_twitter_white_18dp:I = 0x7f080408
 
-.field public static final ic_twitter_white_24dp:I = 0x7f080406
+.field public static final ic_twitter_white_24dp:I = 0x7f080409
 
-.field public static final ic_unavailable_server_46dp:I = 0x7f080407
+.field public static final ic_unavailable_server_46dp:I = 0x7f08040a
 
-.field public static final ic_unban_grey:I = 0x7f080408
+.field public static final ic_unban_grey:I = 0x7f08040b
 
-.field public static final ic_unread_white_9dp:I = 0x7f080409
+.field public static final ic_unread_white_9dp:I = 0x7f08040c
 
-.field public static final ic_unread_white_9dp_horiz:I = 0x7f08040a
+.field public static final ic_unread_white_9dp_horiz:I = 0x7f08040d
 
-.field public static final ic_upload_24dp:I = 0x7f08040b
+.field public static final ic_upload_24dp:I = 0x7f08040e
 
-.field public static final ic_upload_image_34dp:I = 0x7f08040c
+.field public static final ic_upload_image_34dp:I = 0x7f08040f
 
-.field public static final ic_upload_image_40dp:I = 0x7f08040d
+.field public static final ic_upload_image_40dp:I = 0x7f080410
 
-.field public static final ic_upload_plus_32dp:I = 0x7f08040e
+.field public static final ic_upload_plus_32dp:I = 0x7f080411
 
-.field public static final ic_uploads_file_dark:I = 0x7f08040f
+.field public static final ic_uploads_file_dark:I = 0x7f080412
 
-.field public static final ic_uploads_file_light:I = 0x7f080410
+.field public static final ic_uploads_file_light:I = 0x7f080413
 
-.field public static final ic_uploads_generic_dark:I = 0x7f080411
+.field public static final ic_uploads_generic_dark:I = 0x7f080414
 
-.field public static final ic_uploads_generic_light:I = 0x7f080412
+.field public static final ic_uploads_generic_light:I = 0x7f080415
 
-.field public static final ic_uploads_image_dark:I = 0x7f080413
+.field public static final ic_uploads_image_dark:I = 0x7f080416
 
-.field public static final ic_uploads_image_light:I = 0x7f080414
+.field public static final ic_uploads_image_light:I = 0x7f080417
 
-.field public static final ic_uploads_video_dark:I = 0x7f080415
+.field public static final ic_uploads_video_dark:I = 0x7f080418
 
-.field public static final ic_uploads_video_light:I = 0x7f080416
+.field public static final ic_uploads_video_light:I = 0x7f080419
 
-.field public static final ic_user_actions_block_grey_a60_24dp:I = 0x7f080417
+.field public static final ic_user_actions_block_grey_a60_24dp:I = 0x7f08041a
 
-.field public static final ic_user_actions_block_white_a60_24dp:I = 0x7f080418
+.field public static final ic_user_actions_block_white_a60_24dp:I = 0x7f08041b
 
-.field public static final ic_user_actions_remove_friend_grey_a60_24dp:I = 0x7f080419
+.field public static final ic_user_actions_remove_friend_grey_a60_24dp:I = 0x7f08041c
 
-.field public static final ic_user_actions_remove_friend_white_a60_24dp:I = 0x7f08041a
+.field public static final ic_user_actions_remove_friend_white_a60_24dp:I = 0x7f08041d
 
-.field public static final ic_user_actions_unblock_grey_a60_24dp:I = 0x7f08041b
+.field public static final ic_user_actions_unblock_grey_a60_24dp:I = 0x7f08041e
 
-.field public static final ic_user_actions_unblock_white_a60_24dp:I = 0x7f08041c
+.field public static final ic_user_actions_unblock_white_a60_24dp:I = 0x7f08041f
 
-.field public static final ic_user_premium_guild_subscription:I = 0x7f08041d
+.field public static final ic_user_premium_guild_subscription:I = 0x7f080420
 
-.field public static final ic_user_profile_action_add_friend:I = 0x7f08041e
+.field public static final ic_user_profile_action_add_friend:I = 0x7f080421
 
-.field public static final ic_user_profile_action_call_grey_a60_24dp:I = 0x7f08041f
+.field public static final ic_user_profile_action_call_grey_a60_24dp:I = 0x7f080422
 
-.field public static final ic_user_profile_action_call_white_24dp:I = 0x7f080420
+.field public static final ic_user_profile_action_call_white_24dp:I = 0x7f080423
 
-.field public static final ic_user_profile_action_call_white_a60_24dp:I = 0x7f080421
+.field public static final ic_user_profile_action_call_white_a60_24dp:I = 0x7f080424
 
-.field public static final ic_user_profile_action_message_grey_a60_24dp:I = 0x7f080422
+.field public static final ic_user_profile_action_message_grey_a60_24dp:I = 0x7f080425
 
-.field public static final ic_user_profile_action_message_white_24dp:I = 0x7f080423
+.field public static final ic_user_profile_action_message_white_24dp:I = 0x7f080426
 
-.field public static final ic_user_profile_action_message_white_a60_24dp:I = 0x7f080424
+.field public static final ic_user_profile_action_message_white_a60_24dp:I = 0x7f080427
 
-.field public static final ic_user_profile_action_pending:I = 0x7f080425
+.field public static final ic_user_profile_action_pending:I = 0x7f080428
 
-.field public static final ic_user_profile_action_video_grey_a60_24dp:I = 0x7f080426
+.field public static final ic_user_profile_action_video_grey_a60_24dp:I = 0x7f080429
 
-.field public static final ic_user_profile_action_video_white_a60_24dp:I = 0x7f080427
+.field public static final ic_user_profile_action_video_white_a60_24dp:I = 0x7f08042a
 
-.field public static final ic_verified_10dp:I = 0x7f080428
+.field public static final ic_verified_10dp:I = 0x7f08042b
 
-.field public static final ic_verified_badge:I = 0x7f080429
+.field public static final ic_verified_badge:I = 0x7f08042c
 
-.field public static final ic_verified_badge_banner:I = 0x7f08042a
+.field public static final ic_verified_badge_banner:I = 0x7f08042d
 
-.field public static final ic_video_grid_view_grey:I = 0x7f08042b
+.field public static final ic_video_grid_view_grey:I = 0x7f08042e
 
-.field public static final ic_video_grid_view_white:I = 0x7f08042c
+.field public static final ic_video_grid_view_white:I = 0x7f08042f
 
-.field public static final ic_videocam_grey_24dp:I = 0x7f08042d
+.field public static final ic_videocam_grey_24dp:I = 0x7f080430
 
-.field public static final ic_videocam_white_12dp:I = 0x7f08042e
+.field public static final ic_videocam_white_12dp:I = 0x7f080431
 
-.field public static final ic_videocam_white_24dp:I = 0x7f08042f
+.field public static final ic_videocam_white_24dp:I = 0x7f080432
 
-.field public static final ic_visibility_grey_24dp:I = 0x7f080430
+.field public static final ic_visibility_grey_24dp:I = 0x7f080433
 
-.field public static final ic_visibility_off_grey_a60_24dp:I = 0x7f080431
+.field public static final ic_visibility_off_grey_a60_24dp:I = 0x7f080434
 
-.field public static final ic_visibility_off_white_a60_24dp:I = 0x7f080432
+.field public static final ic_visibility_off_white_a60_24dp:I = 0x7f080435
 
-.field public static final ic_visibility_white_24dp:I = 0x7f080433
+.field public static final ic_visibility_white_24dp:I = 0x7f080436
 
-.field public static final ic_voice_quality_average:I = 0x7f080434
+.field public static final ic_voice_quality_average:I = 0x7f080437
 
-.field public static final ic_voice_quality_bad:I = 0x7f080435
+.field public static final ic_voice_quality_bad:I = 0x7f080438
 
-.field public static final ic_voice_quality_fine:I = 0x7f080436
+.field public static final ic_voice_quality_fine:I = 0x7f080439
 
-.field public static final ic_voice_quality_unknown:I = 0x7f080437
+.field public static final ic_voice_quality_unknown:I = 0x7f08043a
 
-.field public static final ic_voice_settings_24dp:I = 0x7f080438
+.field public static final ic_voice_settings_24dp:I = 0x7f08043b
 
-.field public static final ic_volume_mute_grey_a60_24dp:I = 0x7f080439
+.field public static final ic_volume_mute_grey_a60_24dp:I = 0x7f08043c
 
-.field public static final ic_volume_mute_white_a60_24dp:I = 0x7f08043a
+.field public static final ic_volume_mute_white_a60_24dp:I = 0x7f08043d
 
-.field public static final ic_volume_off_24dp:I = 0x7f08043b
+.field public static final ic_volume_off_24dp:I = 0x7f08043e
 
-.field public static final ic_volume_up_grey_a60_24dp:I = 0x7f08043c
+.field public static final ic_volume_up_grey_a60_24dp:I = 0x7f08043f
 
-.field public static final ic_volume_up_white_24dp:I = 0x7f08043d
+.field public static final ic_volume_up_white_24dp:I = 0x7f080440
 
-.field public static final ic_volume_up_white_a60_24dp:I = 0x7f08043e
+.field public static final ic_volume_up_white_a60_24dp:I = 0x7f080441
 
-.field public static final ic_warning_circle_24dp:I = 0x7f08043f
+.field public static final ic_warning_circle_24dp:I = 0x7f080442
 
-.field public static final ic_x_red_24dp:I = 0x7f080440
+.field public static final ic_x_red_24dp:I = 0x7f080443
 
-.field public static final ic_xbox_white_24dp:I = 0x7f080441
+.field public static final ic_xbox_white_24dp:I = 0x7f080444
 
-.field public static final ic_youtube_gaming_white_24dp:I = 0x7f080442
+.field public static final ic_youtube_gaming_white_24dp:I = 0x7f080445
 
-.field public static final icon_carrot:I = 0x7f080443
+.field public static final icon_carrot:I = 0x7f080446
 
-.field public static final icon_flag_au:I = 0x7f080444
+.field public static final icon_flag_au:I = 0x7f080447
 
-.field public static final icon_flag_bg:I = 0x7f080445
+.field public static final icon_flag_bg:I = 0x7f080448
 
-.field public static final icon_flag_cs:I = 0x7f080446
+.field public static final icon_flag_cs:I = 0x7f080449
 
-.field public static final icon_flag_da:I = 0x7f080447
+.field public static final icon_flag_da:I = 0x7f08044a
 
-.field public static final icon_flag_de:I = 0x7f080448
+.field public static final icon_flag_de:I = 0x7f08044b
 
-.field public static final icon_flag_el:I = 0x7f080449
+.field public static final icon_flag_el:I = 0x7f08044c
 
-.field public static final icon_flag_en_gb:I = 0x7f08044a
+.field public static final icon_flag_en_gb:I = 0x7f08044d
 
-.field public static final icon_flag_en_us:I = 0x7f08044b
+.field public static final icon_flag_en_us:I = 0x7f08044e
 
-.field public static final icon_flag_es_es:I = 0x7f08044c
+.field public static final icon_flag_es_es:I = 0x7f08044f
 
-.field public static final icon_flag_eu:I = 0x7f08044d
+.field public static final icon_flag_eu:I = 0x7f080450
 
-.field public static final icon_flag_fi:I = 0x7f08044e
+.field public static final icon_flag_fi:I = 0x7f080451
 
-.field public static final icon_flag_fr:I = 0x7f08044f
+.field public static final icon_flag_fr:I = 0x7f080452
 
-.field public static final icon_flag_gb:I = 0x7f080450
+.field public static final icon_flag_gb:I = 0x7f080453
 
-.field public static final icon_flag_hk:I = 0x7f080451
+.field public static final icon_flag_hk:I = 0x7f080454
 
-.field public static final icon_flag_hr:I = 0x7f080452
+.field public static final icon_flag_hr:I = 0x7f080455
 
-.field public static final icon_flag_hu:I = 0x7f080453
+.field public static final icon_flag_hu:I = 0x7f080456
 
-.field public static final icon_flag_it:I = 0x7f080454
+.field public static final icon_flag_it:I = 0x7f080457
 
-.field public static final icon_flag_ja:I = 0x7f080455
+.field public static final icon_flag_ja:I = 0x7f080458
 
-.field public static final icon_flag_ko:I = 0x7f080456
+.field public static final icon_flag_ko:I = 0x7f080459
 
-.field public static final icon_flag_lt:I = 0x7f080457
+.field public static final icon_flag_lt:I = 0x7f08045a
 
-.field public static final icon_flag_nl:I = 0x7f080458
+.field public static final icon_flag_nl:I = 0x7f08045b
 
-.field public static final icon_flag_no:I = 0x7f080459
+.field public static final icon_flag_no:I = 0x7f08045c
 
-.field public static final icon_flag_pl:I = 0x7f08045a
+.field public static final icon_flag_pl:I = 0x7f08045d
 
-.field public static final icon_flag_pt_br:I = 0x7f08045b
+.field public static final icon_flag_pt_br:I = 0x7f08045e
 
-.field public static final icon_flag_ro:I = 0x7f08045c
+.field public static final icon_flag_ro:I = 0x7f08045f
 
-.field public static final icon_flag_ru:I = 0x7f08045d
+.field public static final icon_flag_ru:I = 0x7f080460
 
-.field public static final icon_flag_sg:I = 0x7f08045e
+.field public static final icon_flag_sg:I = 0x7f080461
 
-.field public static final icon_flag_sv_se:I = 0x7f08045f
+.field public static final icon_flag_sv_se:I = 0x7f080462
 
-.field public static final icon_flag_th:I = 0x7f080460
+.field public static final icon_flag_th:I = 0x7f080463
 
-.field public static final icon_flag_tr:I = 0x7f080461
+.field public static final icon_flag_tr:I = 0x7f080464
 
-.field public static final icon_flag_uk:I = 0x7f080462
+.field public static final icon_flag_uk:I = 0x7f080465
 
-.field public static final icon_flag_unknown:I = 0x7f080463
+.field public static final icon_flag_unknown:I = 0x7f080466
 
-.field public static final icon_flag_vi:I = 0x7f080464
+.field public static final icon_flag_vi:I = 0x7f080467
 
-.field public static final icon_flag_zh_cn:I = 0x7f080465
+.field public static final icon_flag_zh_cn:I = 0x7f080468
 
-.field public static final icon_flag_zh_tw:I = 0x7f080466
+.field public static final icon_flag_zh_tw:I = 0x7f080469
 
-.field public static final icon_menu_copy:I = 0x7f080467
+.field public static final icon_menu_copy:I = 0x7f08046a
 
-.field public static final icon_save:I = 0x7f080468
+.field public static final icon_save:I = 0x7f08046b
 
-.field public static final img_addfriends_empty_dark:I = 0x7f080469
+.field public static final img_addfriends_empty_dark:I = 0x7f08046c
 
-.field public static final img_addfriends_empty_light:I = 0x7f08046a
+.field public static final img_addfriends_empty_light:I = 0x7f08046d
 
-.field public static final img_addfriends_notconnected_dark:I = 0x7f08046b
+.field public static final img_addfriends_notconnected_dark:I = 0x7f08046e
 
-.field public static final img_addfriends_notconnected_light:I = 0x7f08046c
+.field public static final img_addfriends_notconnected_light:I = 0x7f08046f
 
-.field public static final img_age_gate_birthday:I = 0x7f08046d
+.field public static final img_age_gate_birthday:I = 0x7f080470
 
-.field public static final img_age_gate_failure:I = 0x7f08046e
+.field public static final img_age_gate_failure:I = 0x7f080471
 
-.field public static final img_age_gate_safety:I = 0x7f08046f
+.field public static final img_age_gate_safety:I = 0x7f080472
 
-.field public static final img_animated_emoji_upsell:I = 0x7f080470
+.field public static final img_animated_emoji_upsell:I = 0x7f080473
 
-.field public static final img_auth_bg_dark:I = 0x7f080471
+.field public static final img_auth_bg_dark:I = 0x7f080474
 
-.field public static final img_auth_bg_light:I = 0x7f080472
+.field public static final img_auth_bg_light:I = 0x7f080475
 
-.field public static final img_auth_logo:I = 0x7f080473
+.field public static final img_auth_logo:I = 0x7f080476
 
-.field public static final img_auth_logo_small:I = 0x7f080474
+.field public static final img_auth_logo_small:I = 0x7f080477
 
-.field public static final img_avatar_upsell:I = 0x7f080475
+.field public static final img_avatar_upsell:I = 0x7f080478
 
-.field public static final img_baddies_dark_theme:I = 0x7f080476
+.field public static final img_baddies_dark_theme:I = 0x7f080479
 
-.field public static final img_baddies_light_theme:I = 0x7f080477
+.field public static final img_baddies_light_theme:I = 0x7f08047a
 
-.field public static final img_badge_upsell:I = 0x7f080478
+.field public static final img_badge_upsell:I = 0x7f08047b
 
-.field public static final img_boost_activated:I = 0x7f080479
+.field public static final img_boost_activated:I = 0x7f08047c
 
-.field public static final img_boost_cancel:I = 0x7f08047a
+.field public static final img_boost_cancel:I = 0x7f08047d
 
-.field public static final img_boost_hands:I = 0x7f08047b
+.field public static final img_boost_hands:I = 0x7f08047e
 
-.field public static final img_channel_following_success_1_dark:I = 0x7f08047c
+.field public static final img_channel_following_success_1_dark:I = 0x7f08047f
 
-.field public static final img_channel_following_success_1_light:I = 0x7f08047d
+.field public static final img_channel_following_success_1_light:I = 0x7f080480
 
-.field public static final img_channel_following_success_2_dark:I = 0x7f08047e
+.field public static final img_channel_following_success_2_dark:I = 0x7f080481
 
-.field public static final img_channel_following_success_2_light:I = 0x7f08047f
+.field public static final img_channel_following_success_2_light:I = 0x7f080482
 
-.field public static final img_channel_following_success_3_dark:I = 0x7f080480
+.field public static final img_channel_following_success_3_dark:I = 0x7f080483
 
-.field public static final img_channel_following_success_3_light:I = 0x7f080481
+.field public static final img_channel_following_success_3_light:I = 0x7f080484
 
-.field public static final img_channels_onboarding_dark:I = 0x7f080482
+.field public static final img_channels_onboarding_dark:I = 0x7f080485
 
-.field public static final img_channels_onboarding_light:I = 0x7f080483
+.field public static final img_channels_onboarding_light:I = 0x7f080486
 
-.field public static final img_discord_nitro_logo_left:I = 0x7f080484
+.field public static final img_discord_nitro_logo_left:I = 0x7f080487
 
-.field public static final img_empty_friends_no_suggestions_dark:I = 0x7f080485
+.field public static final img_empty_friends_no_suggestions_dark:I = 0x7f080488
 
-.field public static final img_empty_friends_no_suggestions_light:I = 0x7f080486
+.field public static final img_empty_friends_no_suggestions_light:I = 0x7f080489
 
-.field public static final img_empty_friends_none_blocked_dark:I = 0x7f080487
+.field public static final img_empty_friends_none_blocked_dark:I = 0x7f08048a
 
-.field public static final img_empty_friends_none_blocked_light:I = 0x7f080488
+.field public static final img_empty_friends_none_blocked_light:I = 0x7f08048b
 
-.field public static final img_empty_friends_none_dark:I = 0x7f080489
+.field public static final img_empty_friends_none_dark:I = 0x7f08048c
 
-.field public static final img_empty_friends_none_light:I = 0x7f08048a
+.field public static final img_empty_friends_none_light:I = 0x7f08048d
 
-.field public static final img_empty_friends_none_online_dark:I = 0x7f08048b
+.field public static final img_empty_friends_none_online_dark:I = 0x7f08048e
 
-.field public static final img_empty_friends_none_online_light:I = 0x7f08048c
+.field public static final img_empty_friends_none_online_light:I = 0x7f08048f
 
-.field public static final img_empty_friends_none_pending_dark:I = 0x7f08048d
+.field public static final img_empty_friends_none_pending_dark:I = 0x7f080490
 
-.field public static final img_empty_friends_none_pending_light:I = 0x7f08048e
+.field public static final img_empty_friends_none_pending_light:I = 0x7f080491
 
-.field public static final img_empty_server_settings_emoji_dark:I = 0x7f08048f
+.field public static final img_empty_server_settings_emoji_dark:I = 0x7f080492
 
-.field public static final img_empty_server_settings_emoji_light:I = 0x7f080490
+.field public static final img_empty_server_settings_emoji_light:I = 0x7f080493
 
-.field public static final img_empty_server_settings_invites_dark:I = 0x7f080491
+.field public static final img_empty_server_settings_invites_dark:I = 0x7f080494
 
-.field public static final img_empty_server_settings_invites_light:I = 0x7f080492
+.field public static final img_empty_server_settings_invites_light:I = 0x7f080495
 
-.field public static final img_forced_update_dark:I = 0x7f080493
+.field public static final img_forced_update_dark:I = 0x7f080496
 
-.field public static final img_forced_update_light:I = 0x7f080494
+.field public static final img_forced_update_light:I = 0x7f080497
 
-.field public static final img_game_presence_nux:I = 0x7f080495
+.field public static final img_game_presence_nux:I = 0x7f080498
 
-.field public static final img_gem_hands_faded_dark:I = 0x7f080496
+.field public static final img_gem_hands_faded_dark:I = 0x7f080499
 
-.field public static final img_gem_hands_faded_light:I = 0x7f080497
+.field public static final img_gem_hands_faded_light:I = 0x7f08049a
 
-.field public static final img_gifting_pattern_bg_dark:I = 0x7f080498
+.field public static final img_gifting_pattern_bg_dark:I = 0x7f08049b
 
-.field public static final img_gifting_pattern_bg_light:I = 0x7f080499
+.field public static final img_gifting_pattern_bg_light:I = 0x7f08049c
 
-.field public static final img_gifting_pattern_dark:I = 0x7f08049a
+.field public static final img_gifting_pattern_dark:I = 0x7f08049d
 
-.field public static final img_gifting_pattern_light:I = 0x7f08049b
+.field public static final img_gifting_pattern_light:I = 0x7f08049e
 
-.field public static final img_global_emoji_upsell:I = 0x7f08049c
+.field public static final img_global_emoji_upsell:I = 0x7f08049f
 
-.field public static final img_guild_profile_placeholder_dark:I = 0x7f08049d
+.field public static final img_guild_profile_placeholder_dark:I = 0x7f0804a0
 
-.field public static final img_guild_profile_placeholder_light:I = 0x7f08049e
+.field public static final img_guild_profile_placeholder_light:I = 0x7f0804a1
 
-.field public static final img_item_shop_dark:I = 0x7f08049f
+.field public static final img_item_shop_dark:I = 0x7f0804a2
 
-.field public static final img_krisp_onboarding:I = 0x7f0804a0
+.field public static final img_krisp_onboarding:I = 0x7f0804a3
 
-.field public static final img_landing_bg_dark:I = 0x7f0804a1
+.field public static final img_landing_bg_dark:I = 0x7f0804a4
 
-.field public static final img_landing_bg_light:I = 0x7f0804a2
+.field public static final img_landing_bg_light:I = 0x7f0804a5
 
-.field public static final img_loading_logo:I = 0x7f0804a3
+.field public static final img_loading_logo:I = 0x7f0804a6
 
-.field public static final img_logo_discord:I = 0x7f0804a4
+.field public static final img_logo_discord:I = 0x7f0804a7
 
-.field public static final img_logo_discord_nitro:I = 0x7f0804a5
+.field public static final img_logo_discord_nitro:I = 0x7f0804a8
 
-.field public static final img_logo_discord_nitro_brand:I = 0x7f0804a6
+.field public static final img_logo_discord_nitro_brand:I = 0x7f0804a9
 
-.field public static final img_logo_discord_nitro_classic:I = 0x7f0804a7
+.field public static final img_logo_discord_nitro_classic:I = 0x7f0804aa
 
-.field public static final img_logo_nitro:I = 0x7f0804a8
+.field public static final img_logo_nitro:I = 0x7f0804ab
 
-.field public static final img_logo_nitro_classic:I = 0x7f0804a9
+.field public static final img_logo_nitro_classic:I = 0x7f0804ac
 
-.field public static final img_logo_nitro_classic_brand:I = 0x7f0804aa
+.field public static final img_logo_nitro_classic_brand:I = 0x7f0804ad
 
-.field public static final img_logo_nitro_classic_header:I = 0x7f0804ab
+.field public static final img_logo_nitro_classic_header:I = 0x7f0804ae
 
-.field public static final img_logo_square:I = 0x7f0804ac
+.field public static final img_logo_square:I = 0x7f0804af
 
-.field public static final img_mfa_dark:I = 0x7f0804ad
+.field public static final img_mfa_dark:I = 0x7f0804b0
 
-.field public static final img_mfa_light:I = 0x7f0804ae
+.field public static final img_mfa_light:I = 0x7f0804b1
 
-.field public static final img_new_tos_dark_theme:I = 0x7f0804af
+.field public static final img_new_tos_dark_theme:I = 0x7f0804b2
 
-.field public static final img_new_tos_light_theme:I = 0x7f0804b0
+.field public static final img_new_tos_light_theme:I = 0x7f0804b3
 
-.field public static final img_nitro_card:I = 0x7f0804b1
+.field public static final img_nitro_card:I = 0x7f0804b4
 
-.field public static final img_nitro_classic_card:I = 0x7f0804b2
+.field public static final img_nitro_classic_card:I = 0x7f0804b5
 
-.field public static final img_nitro_classic_pattern:I = 0x7f0804b3
+.field public static final img_nitro_classic_pattern:I = 0x7f0804b6
 
-.field public static final img_nitro_pattern:I = 0x7f0804b4
+.field public static final img_nitro_pattern:I = 0x7f0804b7
 
-.field public static final img_nitro_splash_dark:I = 0x7f0804b5
+.field public static final img_nitro_splash_dark:I = 0x7f0804b8
 
-.field public static final img_nitro_splash_light:I = 0x7f0804b6
+.field public static final img_nitro_splash_light:I = 0x7f0804b9
 
-.field public static final img_nitro_uncancel:I = 0x7f0804b7
+.field public static final img_nitro_uncancel:I = 0x7f0804ba
 
-.field public static final img_no_gifts:I = 0x7f0804b8
+.field public static final img_no_gifts:I = 0x7f0804bb
 
-.field public static final img_no_mutual_friends_dark:I = 0x7f0804b9
+.field public static final img_no_mutual_friends_dark:I = 0x7f0804bc
 
-.field public static final img_no_mutual_friends_light:I = 0x7f0804ba
+.field public static final img_no_mutual_friends_light:I = 0x7f0804bd
 
-.field public static final img_no_mutual_servers_dark:I = 0x7f0804bb
+.field public static final img_no_mutual_servers_dark:I = 0x7f0804be
 
-.field public static final img_no_mutual_servers_light:I = 0x7f0804bc
+.field public static final img_no_mutual_servers_light:I = 0x7f0804bf
 
-.field public static final img_no_text_channels_dark:I = 0x7f0804bd
+.field public static final img_no_text_channels_dark:I = 0x7f0804c0
 
-.field public static final img_no_text_channels_light:I = 0x7f0804be
+.field public static final img_no_text_channels_light:I = 0x7f0804c1
 
-.field public static final img_nsfw_dark_theme:I = 0x7f0804bf
+.field public static final img_nsfw_dark_theme:I = 0x7f0804c2
 
-.field public static final img_nsfw_light_theme:I = 0x7f0804c0
+.field public static final img_nsfw_light_theme:I = 0x7f0804c3
 
-.field public static final img_overlay_nux:I = 0x7f0804c1
+.field public static final img_overlay_nux:I = 0x7f0804c4
 
-.field public static final img_permission_prime:I = 0x7f0804c2
+.field public static final img_permission_prime:I = 0x7f0804c5
 
-.field public static final img_poop_dark:I = 0x7f0804c3
+.field public static final img_poop_dark:I = 0x7f0804c6
 
-.field public static final img_poop_light:I = 0x7f0804c4
+.field public static final img_poop_light:I = 0x7f0804c7
 
-.field public static final img_premium_classic_subscription_header:I = 0x7f0804c5
+.field public static final img_premium_classic_subscription_header:I = 0x7f0804c8
 
-.field public static final img_premium_classic_subscription_header_error:I = 0x7f0804c6
+.field public static final img_premium_classic_subscription_header_error:I = 0x7f0804c9
 
-.field public static final img_premium_classic_subscription_header_logo:I = 0x7f0804c7
+.field public static final img_premium_classic_subscription_header_logo:I = 0x7f0804ca
 
-.field public static final img_premium_classic_subscription_header_resub:I = 0x7f0804c8
+.field public static final img_premium_classic_subscription_header_resub:I = 0x7f0804cb
 
-.field public static final img_premium_guild_subscription_header:I = 0x7f0804c9
+.field public static final img_premium_guild_subscription_header:I = 0x7f0804cc
 
-.field public static final img_premium_guild_subscription_header_error:I = 0x7f0804ca
+.field public static final img_premium_guild_subscription_header_error:I = 0x7f0804cd
 
-.field public static final img_premium_guild_subscription_header_logo:I = 0x7f0804cb
+.field public static final img_premium_guild_subscription_header_logo:I = 0x7f0804ce
 
-.field public static final img_premium_guild_subscription_header_resub:I = 0x7f0804cc
+.field public static final img_premium_guild_subscription_header_resub:I = 0x7f0804cf
 
-.field public static final img_premium_subscription_header:I = 0x7f0804cd
+.field public static final img_premium_subscription_header:I = 0x7f0804d0
 
-.field public static final img_premium_subscription_header_error:I = 0x7f0804ce
+.field public static final img_premium_subscription_header_error:I = 0x7f0804d1
 
-.field public static final img_premium_subscription_header_logo:I = 0x7f0804cf
+.field public static final img_premium_subscription_header_logo:I = 0x7f0804d2
 
-.field public static final img_premium_subscription_header_resub:I = 0x7f0804d0
+.field public static final img_premium_subscription_header_resub:I = 0x7f0804d3
 
-.field public static final img_quick_switcher_empty:I = 0x7f0804d1
+.field public static final img_quick_switcher_empty:I = 0x7f0804d4
 
-.field public static final img_remote_auth_finished:I = 0x7f0804d2
+.field public static final img_remote_auth_finished:I = 0x7f0804d5
 
-.field public static final img_remote_auth_loaded:I = 0x7f0804d3
+.field public static final img_remote_auth_loaded:I = 0x7f0804d6
 
-.field public static final img_remote_auth_not_found:I = 0x7f0804d4
+.field public static final img_remote_auth_not_found:I = 0x7f0804d7
 
-.field public static final img_save_your_group:I = 0x7f0804d5
+.field public static final img_save_your_group:I = 0x7f0804d8
 
-.field public static final img_server_boost_long:I = 0x7f0804d6
+.field public static final img_server_boost_long:I = 0x7f0804d9
 
-.field public static final img_tag_upsell:I = 0x7f0804d7
+.field public static final img_tag_upsell:I = 0x7f0804da
 
-.field public static final img_upload_upsell:I = 0x7f0804d8
+.field public static final img_upload_upsell:I = 0x7f0804db
 
-.field public static final img_verify_email_dark_theme:I = 0x7f0804d9
+.field public static final img_verify_email_dark_theme:I = 0x7f0804dc
 
-.field public static final img_verify_email_light_theme:I = 0x7f0804da
+.field public static final img_verify_email_light_theme:I = 0x7f0804dd
 
-.field public static final img_verify_phone_dark_theme:I = 0x7f0804db
+.field public static final img_verify_phone_dark_theme:I = 0x7f0804de
 
-.field public static final img_verify_phone_light_theme:I = 0x7f0804dc
+.field public static final img_verify_phone_light_theme:I = 0x7f0804df
 
-.field public static final img_voice_no_connections_dark:I = 0x7f0804dd
+.field public static final img_voice_no_connections_dark:I = 0x7f0804e0
 
-.field public static final img_voice_no_connections_light:I = 0x7f0804de
+.field public static final img_voice_no_connections_light:I = 0x7f0804e1
 
-.field public static final img_voice_onboarding:I = 0x7f0804df
+.field public static final img_voice_onboarding:I = 0x7f0804e2
 
-.field public static final img_wump_trash_dark:I = 0x7f0804e0
+.field public static final img_wump_trash_dark:I = 0x7f0804e3
 
-.field public static final img_wumpus_ball_dark:I = 0x7f0804e1
+.field public static final img_wumpus_ball_dark:I = 0x7f0804e4
 
-.field public static final img_wumpus_ball_light:I = 0x7f0804e2
+.field public static final img_wumpus_ball_light:I = 0x7f0804e5
 
-.field public static final img_wumpus_custom_status:I = 0x7f0804e3
+.field public static final img_wumpus_custom_status:I = 0x7f0804e6
 
-.field public static final img_wumpus_jetpack:I = 0x7f0804e4
+.field public static final img_wumpus_jetpack:I = 0x7f0804e7
 
-.field public static final img_wumpus_playing_with_friends:I = 0x7f0804e5
+.field public static final img_wumpus_playing_with_friends:I = 0x7f0804e8
 
-.field public static final img_wumpus_riding_wheel:I = 0x7f0804e6
+.field public static final img_wumpus_riding_wheel:I = 0x7f0804e9
 
-.field public static final img_wumpus_tophat_dark:I = 0x7f0804e7
+.field public static final img_wumpus_tophat_dark:I = 0x7f0804ea
 
-.field public static final img_wumpus_tophat_light:I = 0x7f0804e8
+.field public static final img_wumpus_tophat_light:I = 0x7f0804eb
 
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804e9
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ec
 
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804ea
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804ed
 
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804eb
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804ee
 
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ec
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804ef
 
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804ed
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f0
 
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804ee
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f1
 
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f2
 
-.field public static final mtrl_dialog_background:I = 0x7f0804f0
+.field public static final mtrl_dialog_background:I = 0x7f0804f3
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f1
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f4
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f2
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f5
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f3
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f6
 
-.field public static final mtrl_ic_cancel:I = 0x7f0804f4
+.field public static final mtrl_ic_cancel:I = 0x7f0804f7
 
-.field public static final mtrl_ic_error:I = 0x7f0804f5
+.field public static final mtrl_ic_error:I = 0x7f0804f8
 
-.field public static final mtrl_popupmenu_background:I = 0x7f0804f6
+.field public static final mtrl_popupmenu_background:I = 0x7f0804f9
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f7
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fa
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f8
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fb
 
-.field public static final navigation_empty_icon:I = 0x7f0804f9
+.field public static final navigation_empty_icon:I = 0x7f0804fc
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final preference_list_divider_material:I = 0x7f080506
+.field public static final preference_list_divider_material:I = 0x7f080509
 
-.field public static final reactions_divider:I = 0x7f080507
+.field public static final reactions_divider:I = 0x7f08050a
 
-.field public static final ripple_brighten:I = 0x7f080508
+.field public static final ripple_brighten:I = 0x7f08050b
 
-.field public static final ripple_darken:I = 0x7f080509
+.field public static final ripple_darken:I = 0x7f08050c
 
-.field public static final rounded_rectangle_4dp_radius:I = 0x7f08050a
+.field public static final rounded_rectangle_4dp_radius:I = 0x7f08050d
 
-.field public static final rounded_rectangle_8dp_radius:I = 0x7f08050b
+.field public static final rounded_rectangle_8dp_radius:I = 0x7f08050e
 
-.field public static final selectable_feedback_happy_dark:I = 0x7f08050c
+.field public static final selectable_feedback_happy_dark:I = 0x7f080510
 
-.field public static final selectable_feedback_happy_light:I = 0x7f08050d
+.field public static final selectable_feedback_happy_light:I = 0x7f080511
 
-.field public static final selectable_feedback_neutral_dark:I = 0x7f08050e
+.field public static final selectable_feedback_neutral_dark:I = 0x7f080512
 
-.field public static final selectable_feedback_neutral_light:I = 0x7f08050f
+.field public static final selectable_feedback_neutral_light:I = 0x7f080513
 
-.field public static final selectable_feedback_sad_dark:I = 0x7f080510
+.field public static final selectable_feedback_sad_dark:I = 0x7f080514
 
-.field public static final selectable_feedback_sad_light:I = 0x7f080511
+.field public static final selectable_feedback_sad_light:I = 0x7f080515
 
-.field public static final tab_dot_selector:I = 0x7f080513
+.field public static final tab_dot_selector:I = 0x7f080517
 
-.field public static final tab_dot_selector_wide:I = 0x7f080514
+.field public static final tab_dot_selector_wide:I = 0x7f080518
 
-.field public static final tab_indicator_default:I = 0x7f080515
+.field public static final tab_indicator_default:I = 0x7f080519
 
-.field public static final tab_indicator_selected:I = 0x7f080516
+.field public static final tab_indicator_selected:I = 0x7f08051a
 
-.field public static final tab_indicator_selected_wide:I = 0x7f080517
+.field public static final tab_indicator_selected_wide:I = 0x7f08051b
 
-.field public static final test_custom_background:I = 0x7f080518
+.field public static final test_custom_background:I = 0x7f08051c
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
-.field public static final voice_user_limit_view_left_bg:I = 0x7f080529
+.field public static final voice_user_limit_view_left_bg:I = 0x7f08052d
 
-.field public static final voice_user_limit_view_right_bg:I = 0x7f08052a
+.field public static final voice_user_limit_view_right_bg:I = 0x7f08052e
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
index 80423497a3..a1700c4723 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
@@ -170,657 +170,657 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final camera1:I = 0x7f0a0134
+.field public static final camera1:I = 0x7f0a0137
 
-.field public static final camera2:I = 0x7f0a0135
+.field public static final camera2:I = 0x7f0a0138
 
-.field public static final camera_container:I = 0x7f0a0138
+.field public static final camera_container:I = 0x7f0a013b
 
-.field public static final camera_facing_btn:I = 0x7f0a0139
+.field public static final camera_facing_btn:I = 0x7f0a013c
 
-.field public static final camera_flash_btn:I = 0x7f0a013a
+.field public static final camera_flash_btn:I = 0x7f0a013d
 
-.field public static final camera_view:I = 0x7f0a013b
+.field public static final camera_view:I = 0x7f0a013e
 
-.field public static final cancel_action:I = 0x7f0a013c
+.field public static final cancel_action:I = 0x7f0a013f
 
-.field public static final cancel_button:I = 0x7f0a013d
+.field public static final cancel_button:I = 0x7f0a0140
 
-.field public static final center:I = 0x7f0a0141
+.field public static final center:I = 0x7f0a0144
 
-.field public static final centerCrop:I = 0x7f0a0142
+.field public static final centerCrop:I = 0x7f0a0145
 
-.field public static final centerInside:I = 0x7f0a0143
+.field public static final centerInside:I = 0x7f0a0146
 
-.field public static final check:I = 0x7f0a025e
+.field public static final check:I = 0x7f0a0261
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0265
 
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0266
 
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0267
 
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0268
 
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0269
 
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a026a
 
-.field public static final chip_image:I = 0x7f0a0268
+.field public static final chip_image:I = 0x7f0a026b
 
-.field public static final chip_text:I = 0x7f0a0269
+.field public static final chip_text:I = 0x7f0a026c
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026f
 
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a0270
 
-.field public static final cloudy:I = 0x7f0a0273
+.field public static final cloudy:I = 0x7f0a0276
 
-.field public static final column:I = 0x7f0a0276
+.field public static final column:I = 0x7f0a0279
 
-.field public static final column_reverse:I = 0x7f0a0277
+.field public static final column_reverse:I = 0x7f0a027a
 
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027b
 
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028c
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final content_iv:I = 0x7f0a028c
+.field public static final content_iv:I = 0x7f0a028f
 
-.field public static final content_pager:I = 0x7f0a028d
+.field public static final content_pager:I = 0x7f0a0290
 
-.field public static final content_tabs:I = 0x7f0a028e
+.field public static final content_tabs:I = 0x7f0a0291
 
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0292
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02ba
 
-.field public static final dark:I = 0x7f0a02b8
+.field public static final dark:I = 0x7f0a02bb
 
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bd
 
-.field public static final daylight:I = 0x7f0a02bb
+.field public static final daylight:I = 0x7f0a02be
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c6
 
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c7
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c8
 
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c9
 
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02ca
 
-.field public static final deviceDefault:I = 0x7f0a02cc
+.field public static final deviceDefault:I = 0x7f0a02d2
 
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02d3
 
-.field public static final dimmer_view:I = 0x7f0a02ea
+.field public static final dimmer_view:I = 0x7f0a02f0
 
-.field public static final dng:I = 0x7f0a02f5
+.field public static final dng:I = 0x7f0a02fb
 
-.field public static final draw3x3:I = 0x7f0a02f6
+.field public static final draw3x3:I = 0x7f0a02fc
 
-.field public static final draw4x4:I = 0x7f0a02f7
+.field public static final draw4x4:I = 0x7f0a02fd
 
-.field public static final drawPhi:I = 0x7f0a02f8
+.field public static final drawPhi:I = 0x7f0a02fe
 
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02ff
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a0352
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final exposureCorrection:I = 0x7f0a036a
+.field public static final exposureCorrection:I = 0x7f0a0370
 
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a038d
 
-.field public static final file_name_tv:I = 0x7f0a039c
+.field public static final file_name_tv:I = 0x7f0a03a2
 
-.field public static final file_subtitle_tv:I = 0x7f0a039d
+.field public static final file_subtitle_tv:I = 0x7f0a03a3
 
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a4
 
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a7
 
-.field public static final filterControl1:I = 0x7f0a03a2
+.field public static final filterControl1:I = 0x7f0a03a8
 
-.field public static final filterControl2:I = 0x7f0a03a3
+.field public static final filterControl2:I = 0x7f0a03a9
 
-.field public static final fitBottomStart:I = 0x7f0a03a5
+.field public static final fitBottomStart:I = 0x7f0a03ab
 
-.field public static final fitCenter:I = 0x7f0a03a6
+.field public static final fitCenter:I = 0x7f0a03ac
 
-.field public static final fitEnd:I = 0x7f0a03a7
+.field public static final fitEnd:I = 0x7f0a03ad
 
-.field public static final fitStart:I = 0x7f0a03a8
+.field public static final fitStart:I = 0x7f0a03ae
 
-.field public static final fitXY:I = 0x7f0a03aa
+.field public static final fitXY:I = 0x7f0a03b0
 
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03b1
 
-.field public static final flex_end:I = 0x7f0a03ae
+.field public static final flex_end:I = 0x7f0a03b4
 
-.field public static final flex_input_attachment_clear_btn:I = 0x7f0a03af
+.field public static final flex_input_attachment_clear_btn:I = 0x7f0a03b5
 
-.field public static final flex_input_attachment_preview_container:I = 0x7f0a03b0
+.field public static final flex_input_attachment_preview_container:I = 0x7f0a03b6
 
-.field public static final flex_input_attachment_preview_list:I = 0x7f0a03b1
+.field public static final flex_input_attachment_preview_list:I = 0x7f0a03b7
 
-.field public static final flex_input_camera_btn:I = 0x7f0a03b2
+.field public static final flex_input_camera_btn:I = 0x7f0a03b8
 
-.field public static final flex_input_cannot_send_text:I = 0x7f0a03b3
+.field public static final flex_input_cannot_send_text:I = 0x7f0a03b9
 
-.field public static final flex_input_container:I = 0x7f0a03b4
+.field public static final flex_input_container:I = 0x7f0a03ba
 
-.field public static final flex_input_default_window_insets_handler:I = 0x7f0a03b5
+.field public static final flex_input_default_window_insets_handler:I = 0x7f0a03bb
 
-.field public static final flex_input_emoji_btn:I = 0x7f0a03b6
+.field public static final flex_input_emoji_btn:I = 0x7f0a03bc
 
-.field public static final flex_input_expand_btn:I = 0x7f0a03b7
+.field public static final flex_input_expand_btn:I = 0x7f0a03bd
 
-.field public static final flex_input_expression_tray_container:I = 0x7f0a03b8
+.field public static final flex_input_expression_tray_container:I = 0x7f0a03be
 
-.field public static final flex_input_gallery_btn:I = 0x7f0a03b9
+.field public static final flex_input_gallery_btn:I = 0x7f0a03bf
 
-.field public static final flex_input_left_btns_container:I = 0x7f0a03ba
+.field public static final flex_input_left_btns_container:I = 0x7f0a03c0
 
-.field public static final flex_input_main_input_container:I = 0x7f0a03bb
+.field public static final flex_input_main_input_container:I = 0x7f0a03c1
 
-.field public static final flex_input_send_btn_container:I = 0x7f0a03bc
+.field public static final flex_input_send_btn_container:I = 0x7f0a03c2
 
-.field public static final flex_input_send_btn_image:I = 0x7f0a03bd
+.field public static final flex_input_send_btn_image:I = 0x7f0a03c3
 
-.field public static final flex_input_text_input:I = 0x7f0a03be
+.field public static final flex_input_text_input:I = 0x7f0a03c4
 
-.field public static final flex_start:I = 0x7f0a03bf
+.field public static final flex_start:I = 0x7f0a03c5
 
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c6
 
-.field public static final fluorescent:I = 0x7f0a03c1
+.field public static final fluorescent:I = 0x7f0a03c7
 
-.field public static final focusCrop:I = 0x7f0a03c2
+.field public static final focusCrop:I = 0x7f0a03c8
 
-.field public static final focusMarkerContainer:I = 0x7f0a03c3
+.field public static final focusMarkerContainer:I = 0x7f0a03c9
 
-.field public static final focusMarkerFill:I = 0x7f0a03c4
+.field public static final focusMarkerFill:I = 0x7f0a03ca
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ce
 
-.field public static final front:I = 0x7f0a03e2
+.field public static final front:I = 0x7f0a03e8
 
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e9
 
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03ea
 
-.field public static final glSurface:I = 0x7f0a0408
+.field public static final glSurface:I = 0x7f0a040e
 
-.field public static final gl_surface_view:I = 0x7f0a0409
+.field public static final gl_surface_view:I = 0x7f0a040f
 
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0416
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final h263:I = 0x7f0a04bb
+.field public static final h263:I = 0x7f0a04c1
 
-.field public static final h264:I = 0x7f0a04bc
+.field public static final h264:I = 0x7f0a04c2
 
-.field public static final hardware:I = 0x7f0a04bd
+.field public static final hardware:I = 0x7f0a04c3
 
-.field public static final heAac:I = 0x7f0a04be
+.field public static final heAac:I = 0x7f0a04c4
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04db
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final icon_only:I = 0x7f0a04d7
+.field public static final icon_only:I = 0x7f0a04dd
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final incandescent:I = 0x7f0a04e7
+.field public static final incandescent:I = 0x7f0a04ed
 
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ee
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final invisible:I = 0x7f0a0511
+.field public static final invisible:I = 0x7f0a0517
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final item_check_indicator:I = 0x7f0a0533
+.field public static final item_check_indicator:I = 0x7f0a0539
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0575
 
-.field public static final jpeg:I = 0x7f0a0571
+.field public static final jpeg:I = 0x7f0a0577
 
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a057d
 
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057f
 
-.field public static final launch_btn:I = 0x7f0a057b
+.field public static final launch_btn:I = 0x7f0a0581
 
-.field public static final launch_camera_btn:I = 0x7f0a057c
+.field public static final launch_camera_btn:I = 0x7f0a0582
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final light:I = 0x7f0a0585
+.field public static final light:I = 0x7f0a058b
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058e
 
-.field public static final list:I = 0x7f0a0589
+.field public static final list:I = 0x7f0a058f
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final lottie_layer_name:I = 0x7f0a058e
+.field public static final lottie_layer_name:I = 0x7f0a0594
 
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a05a1
 
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a7
 
-.field public static final menu_copy_id:I = 0x7f0a05bb
+.field public static final menu_copy_id:I = 0x7f0a05c1
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final mini:I = 0x7f0a05df
+.field public static final mini:I = 0x7f0a05e5
 
-.field public static final mono:I = 0x7f0a05e0
+.field public static final mono:I = 0x7f0a05e6
 
-.field public static final month_grid:I = 0x7f0a05e1
+.field public static final month_grid:I = 0x7f0a05e7
 
-.field public static final month_navigation_bar:I = 0x7f0a05e2
+.field public static final month_navigation_bar:I = 0x7f0a05e8
 
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e3
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e9
 
-.field public static final month_navigation_next:I = 0x7f0a05e4
+.field public static final month_navigation_next:I = 0x7f0a05ea
 
-.field public static final month_navigation_previous:I = 0x7f0a05e5
+.field public static final month_navigation_previous:I = 0x7f0a05eb
 
-.field public static final month_title:I = 0x7f0a05e6
+.field public static final month_title:I = 0x7f0a05ec
 
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e7
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05ed
 
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e8
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ee
 
-.field public static final mtrl_calendar_frame:I = 0x7f0a05e9
+.field public static final mtrl_calendar_frame:I = 0x7f0a05ef
 
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ea
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05f0
 
-.field public static final mtrl_calendar_months:I = 0x7f0a05eb
+.field public static final mtrl_calendar_months:I = 0x7f0a05f1
 
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ec
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f2
 
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f3
 
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05ee
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f4
 
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05ef
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f5
 
-.field public static final mtrl_child_content_container:I = 0x7f0a05f0
+.field public static final mtrl_child_content_container:I = 0x7f0a05f6
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f1
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f7
 
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f2
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f8
 
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f3
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f9
 
-.field public static final mtrl_picker_header:I = 0x7f0a05f4
+.field public static final mtrl_picker_header:I = 0x7f0a05fa
 
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f5
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05fb
 
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f6
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fc
 
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f7
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fd
 
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f8
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fe
 
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f9
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05ff
 
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fa
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a0600
 
-.field public static final mtrl_picker_title_text:I = 0x7f0a05fb
+.field public static final mtrl_picker_title_text:I = 0x7f0a0601
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final navigation_header_container:I = 0x7f0a060e
+.field public static final navigation_header_container:I = 0x7f0a0614
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final nowrap:I = 0x7f0a0634
+.field public static final nowrap:I = 0x7f0a063a
 
-.field public static final numeric:I = 0x7f0a063b
+.field public static final numeric:I = 0x7f0a0641
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final outgoing:I = 0x7f0a066a
+.field public static final outgoing:I = 0x7f0a0670
 
-.field public static final outline:I = 0x7f0a066b
+.field public static final outline:I = 0x7f0a0671
 
-.field public static final packed:I = 0x7f0a0679
+.field public static final packed:I = 0x7f0a067f
 
-.field public static final page_tabs:I = 0x7f0a067a
+.field public static final page_tabs:I = 0x7f0a0680
 
-.field public static final parallax:I = 0x7f0a067b
+.field public static final parallax:I = 0x7f0a0681
 
-.field public static final parent:I = 0x7f0a067c
+.field public static final parent:I = 0x7f0a0682
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final parent_matrix:I = 0x7f0a067e
+.field public static final parent_matrix:I = 0x7f0a0684
 
-.field public static final password_toggle:I = 0x7f0a068c
+.field public static final password_toggle:I = 0x7f0a0692
 
-.field public static final percent:I = 0x7f0a06aa
+.field public static final percent:I = 0x7f0a06b0
 
-.field public static final permissions_req_btn:I = 0x7f0a06b4
+.field public static final permissions_req_btn:I = 0x7f0a06ba
 
-.field public static final permissions_required_action_btn:I = 0x7f0a06b5
+.field public static final permissions_required_action_btn:I = 0x7f0a06bb
 
-.field public static final permissions_required_text:I = 0x7f0a06b6
+.field public static final permissions_required_text:I = 0x7f0a06bc
 
-.field public static final permissions_view_stub:I = 0x7f0a06b7
+.field public static final permissions_view_stub:I = 0x7f0a06bd
 
-.field public static final picture:I = 0x7f0a06b8
+.field public static final picture:I = 0x7f0a06be
 
-.field public static final pin:I = 0x7f0a06b9
+.field public static final pin:I = 0x7f0a06bf
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final recycler_view:I = 0x7f0a073f
+.field public static final recycler_view:I = 0x7f0a0745
 
-.field public static final restart:I = 0x7f0a0747
+.field public static final restart:I = 0x7f0a074d
 
-.field public static final reverse:I = 0x7f0a074a
+.field public static final reverse:I = 0x7f0a0750
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final rounded:I = 0x7f0a0786
+.field public static final rounded:I = 0x7f0a078c
 
-.field public static final row:I = 0x7f0a0787
+.field public static final row:I = 0x7f0a078d
 
-.field public static final row_index_key:I = 0x7f0a0788
+.field public static final row_index_key:I = 0x7f0a078e
 
-.field public static final row_reverse:I = 0x7f0a0789
+.field public static final row_reverse:I = 0x7f0a078f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a078a
+.field public static final save_non_transition_alpha:I = 0x7f0a0790
 
-.field public static final save_overlay_view:I = 0x7f0a078b
+.field public static final save_overlay_view:I = 0x7f0a0791
 
-.field public static final scale:I = 0x7f0a078c
+.field public static final scale:I = 0x7f0a0792
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final scrollable:I = 0x7f0a0796
+.field public static final scrollable:I = 0x7f0a079c
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final seekbar:I = 0x7f0a07af
+.field public static final seekbar:I = 0x7f0a07b5
 
-.field public static final seekbar_value:I = 0x7f0a07b0
+.field public static final seekbar_value:I = 0x7f0a07b6
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final selected:I = 0x7f0a07b2
+.field public static final selected:I = 0x7f0a07b8
 
-.field public static final selection_indicator:I = 0x7f0a07b3
+.field public static final selection_indicator:I = 0x7f0a07b9
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final slide:I = 0x7f0a0916
+.field public static final slide:I = 0x7f0a091a
 
-.field public static final smallLabel:I = 0x7f0a0917
+.field public static final smallLabel:I = 0x7f0a091b
 
-.field public static final snackbar_action:I = 0x7f0a0918
+.field public static final snackbar_action:I = 0x7f0a091c
 
-.field public static final snackbar_text:I = 0x7f0a0919
+.field public static final snackbar_text:I = 0x7f0a091d
 
-.field public static final software:I = 0x7f0a091c
+.field public static final software:I = 0x7f0a0920
 
-.field public static final space_around:I = 0x7f0a091d
+.field public static final space_around:I = 0x7f0a0921
 
-.field public static final space_between:I = 0x7f0a091e
+.field public static final space_between:I = 0x7f0a0922
 
-.field public static final space_evenly:I = 0x7f0a091f
+.field public static final space_evenly:I = 0x7f0a0923
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final spinner:I = 0x7f0a0923
+.field public static final spinner:I = 0x7f0a0927
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final spread:I = 0x7f0a0925
+.field public static final spread:I = 0x7f0a0929
 
-.field public static final spread_inside:I = 0x7f0a0926
+.field public static final spread_inside:I = 0x7f0a092a
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final standard:I = 0x7f0a092c
+.field public static final standard:I = 0x7f0a0930
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final status_bar_latest_event_content:I = 0x7f0a0933
+.field public static final status_bar_latest_event_content:I = 0x7f0a0937
 
-.field public static final stereo:I = 0x7f0a0943
+.field public static final stereo:I = 0x7f0a0947
 
-.field public static final stretch:I = 0x7f0a0948
+.field public static final stretch:I = 0x7f0a094c
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final surface:I = 0x7f0a0954
+.field public static final surface:I = 0x7f0a0958
 
-.field public static final surface_view:I = 0x7f0a0955
+.field public static final surface_view:I = 0x7f0a0959
 
-.field public static final surface_view_root:I = 0x7f0a0956
+.field public static final surface_view_root:I = 0x7f0a095a
 
-.field public static final swipeRefreshLayout:I = 0x7f0a0957
+.field public static final swipeRefreshLayout:I = 0x7f0a095b
 
-.field public static final switchWidget:I = 0x7f0a0958
+.field public static final switchWidget:I = 0x7f0a095c
 
-.field public static final switchview:I = 0x7f0a0959
+.field public static final switchview:I = 0x7f0a095d
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0968
+.field public static final tag_accessibility_actions:I = 0x7f0a096c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0969
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a096a
+.field public static final tag_accessibility_heading:I = 0x7f0a096e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096b
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096c
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0970
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final takePicture:I = 0x7f0a0970
+.field public static final takePicture:I = 0x7f0a0974
 
-.field public static final take_photo_btn:I = 0x7f0a0971
+.field public static final take_photo_btn:I = 0x7f0a0975
 
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0976
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a097a
 
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a097b
 
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0978
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a097c
 
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097d
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final text_input_end_icon:I = 0x7f0a0981
+.field public static final text_input_end_icon:I = 0x7f0a0985
 
-.field public static final text_input_start_icon:I = 0x7f0a0982
+.field public static final text_input_start_icon:I = 0x7f0a0986
 
-.field public static final textinput_counter:I = 0x7f0a0985
+.field public static final textinput_counter:I = 0x7f0a0989
 
-.field public static final textinput_error:I = 0x7f0a0986
+.field public static final textinput_error:I = 0x7f0a098a
 
-.field public static final textinput_helper_text:I = 0x7f0a0987
+.field public static final textinput_helper_text:I = 0x7f0a098b
 
-.field public static final textinput_placeholder:I = 0x7f0a0988
+.field public static final textinput_placeholder:I = 0x7f0a098c
 
-.field public static final textinput_prefix_text:I = 0x7f0a0989
+.field public static final textinput_prefix_text:I = 0x7f0a098d
 
-.field public static final textinput_suffix_text:I = 0x7f0a098a
+.field public static final textinput_suffix_text:I = 0x7f0a098e
 
-.field public static final texture:I = 0x7f0a098b
+.field public static final texture:I = 0x7f0a098f
 
-.field public static final texture_view:I = 0x7f0a098c
+.field public static final texture_view:I = 0x7f0a0990
 
-.field public static final thumb_iv:I = 0x7f0a098e
+.field public static final thumb_iv:I = 0x7f0a0992
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final torch:I = 0x7f0a099b
+.field public static final torch:I = 0x7f0a099f
 
-.field public static final touch_outside:I = 0x7f0a099c
+.field public static final touch_outside:I = 0x7f0a09a0
 
-.field public static final transition_current_scene:I = 0x7f0a099d
+.field public static final transition_current_scene:I = 0x7f0a09a1
 
-.field public static final transition_layout_save:I = 0x7f0a099e
+.field public static final transition_layout_save:I = 0x7f0a09a2
 
-.field public static final transition_position:I = 0x7f0a099f
+.field public static final transition_position:I = 0x7f0a09a3
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a0
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a4
 
-.field public static final transition_transform:I = 0x7f0a09a1
+.field public static final transition_transform:I = 0x7f0a09a5
 
-.field public static final type_iv:I = 0x7f0a09a9
+.field public static final type_iv:I = 0x7f0a09ad
 
-.field public static final uikit_chat_guideline:I = 0x7f0a09ad
+.field public static final uikit_chat_guideline:I = 0x7f0a09b1
 
-.field public static final uikit_sheet_header_guideline:I = 0x7f0a09ae
+.field public static final uikit_sheet_header_guideline:I = 0x7f0a09b2
 
-.field public static final unchecked:I = 0x7f0a09b0
+.field public static final unchecked:I = 0x7f0a09b4
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final unlabeled:I = 0x7f0a09b4
+.field public static final unlabeled:I = 0x7f0a09b8
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final video:I = 0x7f0a0a31
+.field public static final video:I = 0x7f0a0a35
 
-.field public static final view_offset_helper:I = 0x7f0a0a38
+.field public static final view_offset_helper:I = 0x7f0a0a3c
 
-.field public static final view_pager:I = 0x7f0a0a3a
+.field public static final view_pager:I = 0x7f0a0a3e
 
-.field public static final visible:I = 0x7f0a0a4c
+.field public static final visible:I = 0x7f0a0a50
 
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4d
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a51
 
-.field public static final wide:I = 0x7f0a0a7f
+.field public static final wide:I = 0x7f0a0a84
 
-.field public static final withinBounds:I = 0x7f0a0ab6
+.field public static final withinBounds:I = 0x7f0a0abb
 
-.field public static final wrap:I = 0x7f0a0ab7
+.field public static final wrap:I = 0x7f0a0abc
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
-.field public static final wrap_reverse:I = 0x7f0a0ab9
+.field public static final wrap_reverse:I = 0x7f0a0abe
 
-.field public static final zero_corner_chip:I = 0x7f0a0abe
+.field public static final zero_corner_chip:I = 0x7f0a0ac3
 
-.field public static final zoom:I = 0x7f0a0abf
+.field public static final zoom:I = 0x7f0a0ac4
 
 
 # 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 d30850d6c3..976d1796b9 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
@@ -1836,10483 +1836,10571 @@
 
 .field public static final call_invite_not_friends:I = 0x7f12038e
 
-.field public static final call_unavailable:I = 0x7f12038f
+.field public static final call_mobile_tap_to_return:I = 0x7f12038f
 
-.field public static final camera:I = 0x7f120390
+.field public static final call_unavailable:I = 0x7f120390
 
-.field public static final camera_disabled_limit_reached:I = 0x7f120391
+.field public static final camera:I = 0x7f120391
 
-.field public static final camera_intent_result_error:I = 0x7f120392
+.field public static final camera_disabled_limit_reached:I = 0x7f120392
 
-.field public static final camera_no_device:I = 0x7f120393
+.field public static final camera_intent_result_error:I = 0x7f120393
 
-.field public static final camera_not_enabled:I = 0x7f120394
+.field public static final camera_no_device:I = 0x7f120394
 
-.field public static final camera_off:I = 0x7f120395
+.field public static final camera_not_enabled:I = 0x7f120395
 
-.field public static final camera_on:I = 0x7f120396
+.field public static final camera_off:I = 0x7f120396
 
-.field public static final camera_permission_denied:I = 0x7f120397
+.field public static final camera_on:I = 0x7f120397
 
-.field public static final camera_preview_menu_item:I = 0x7f120398
+.field public static final camera_permission_denied:I = 0x7f120398
 
-.field public static final camera_preview_modal_cta:I = 0x7f120399
+.field public static final camera_preview_menu_item:I = 0x7f120399
 
-.field public static final camera_preview_modal_header:I = 0x7f12039a
+.field public static final camera_preview_modal_cta:I = 0x7f12039a
 
-.field public static final camera_preview_modal_subtitle:I = 0x7f12039b
+.field public static final camera_preview_modal_header:I = 0x7f12039b
 
-.field public static final camera_switch:I = 0x7f12039c
+.field public static final camera_preview_modal_subtitle:I = 0x7f12039c
 
-.field public static final camera_switched:I = 0x7f12039d
+.field public static final camera_switch:I = 0x7f12039d
 
-.field public static final camera_unavailable:I = 0x7f12039e
+.field public static final camera_switched:I = 0x7f12039e
 
-.field public static final camera_unknown_error:I = 0x7f12039f
+.field public static final camera_unavailable:I = 0x7f12039f
 
-.field public static final cameraview_default_autofocus_marker:I = 0x7f1203a0
+.field public static final camera_unknown_error:I = 0x7f1203a0
 
-.field public static final cameraview_filter_autofix:I = 0x7f1203a1
+.field public static final cameraview_default_autofocus_marker:I = 0x7f1203a1
 
-.field public static final cameraview_filter_black_and_white:I = 0x7f1203a2
+.field public static final cameraview_filter_autofix:I = 0x7f1203a2
 
-.field public static final cameraview_filter_brightness:I = 0x7f1203a3
+.field public static final cameraview_filter_black_and_white:I = 0x7f1203a3
 
-.field public static final cameraview_filter_contrast:I = 0x7f1203a4
+.field public static final cameraview_filter_brightness:I = 0x7f1203a4
 
-.field public static final cameraview_filter_cross_process:I = 0x7f1203a5
+.field public static final cameraview_filter_contrast:I = 0x7f1203a5
 
-.field public static final cameraview_filter_documentary:I = 0x7f1203a6
+.field public static final cameraview_filter_cross_process:I = 0x7f1203a6
 
-.field public static final cameraview_filter_duotone:I = 0x7f1203a7
+.field public static final cameraview_filter_documentary:I = 0x7f1203a7
 
-.field public static final cameraview_filter_fill_light:I = 0x7f1203a8
+.field public static final cameraview_filter_duotone:I = 0x7f1203a8
 
-.field public static final cameraview_filter_gamma:I = 0x7f1203a9
+.field public static final cameraview_filter_fill_light:I = 0x7f1203a9
 
-.field public static final cameraview_filter_grain:I = 0x7f1203aa
+.field public static final cameraview_filter_gamma:I = 0x7f1203aa
 
-.field public static final cameraview_filter_grayscale:I = 0x7f1203ab
+.field public static final cameraview_filter_grain:I = 0x7f1203ab
 
-.field public static final cameraview_filter_hue:I = 0x7f1203ac
+.field public static final cameraview_filter_grayscale:I = 0x7f1203ac
 
-.field public static final cameraview_filter_invert_colors:I = 0x7f1203ad
+.field public static final cameraview_filter_hue:I = 0x7f1203ad
 
-.field public static final cameraview_filter_lomoish:I = 0x7f1203ae
+.field public static final cameraview_filter_invert_colors:I = 0x7f1203ae
 
-.field public static final cameraview_filter_none:I = 0x7f1203af
+.field public static final cameraview_filter_lomoish:I = 0x7f1203af
 
-.field public static final cameraview_filter_posterize:I = 0x7f1203b0
+.field public static final cameraview_filter_none:I = 0x7f1203b0
 
-.field public static final cameraview_filter_saturation:I = 0x7f1203b1
+.field public static final cameraview_filter_posterize:I = 0x7f1203b1
 
-.field public static final cameraview_filter_sepia:I = 0x7f1203b2
+.field public static final cameraview_filter_saturation:I = 0x7f1203b2
 
-.field public static final cameraview_filter_sharpness:I = 0x7f1203b3
+.field public static final cameraview_filter_sepia:I = 0x7f1203b3
 
-.field public static final cameraview_filter_temperature:I = 0x7f1203b4
+.field public static final cameraview_filter_sharpness:I = 0x7f1203b4
 
-.field public static final cameraview_filter_tint:I = 0x7f1203b5
+.field public static final cameraview_filter_temperature:I = 0x7f1203b5
 
-.field public static final cameraview_filter_vignette:I = 0x7f1203b6
+.field public static final cameraview_filter_tint:I = 0x7f1203b6
 
-.field public static final cancel:I = 0x7f1203b7
+.field public static final cameraview_filter_vignette:I = 0x7f1203b7
 
-.field public static final cannot_attach_files:I = 0x7f1203b8
+.field public static final cancel:I = 0x7f1203b8
 
-.field public static final cannot_delete_channel:I = 0x7f1203b9
+.field public static final cannot_attach_files:I = 0x7f1203b9
 
-.field public static final cannot_deny_missing_permission:I = 0x7f1203ba
+.field public static final cannot_delete_channel:I = 0x7f1203ba
 
-.field public static final cannot_deny_self_simple:I = 0x7f1203bb
+.field public static final cannot_deny_missing_permission:I = 0x7f1203bb
 
-.field public static final cannot_deny_singular_permission:I = 0x7f1203bc
+.field public static final cannot_deny_self_simple:I = 0x7f1203bc
 
-.field public static final cannot_manage_higher_rank:I = 0x7f1203bd
+.field public static final cannot_deny_singular_permission:I = 0x7f1203bd
 
-.field public static final cannot_manage_is_owner:I = 0x7f1203be
+.field public static final cannot_manage_higher_rank:I = 0x7f1203be
 
-.field public static final cannot_manage_same_rank:I = 0x7f1203bf
+.field public static final cannot_manage_is_owner:I = 0x7f1203bf
 
-.field public static final captcha:I = 0x7f1203c0
+.field public static final cannot_manage_same_rank:I = 0x7f1203c0
 
-.field public static final captcha_failed:I = 0x7f1203c1
+.field public static final captcha:I = 0x7f1203c1
 
-.field public static final captcha_failed_play_services:I = 0x7f1203c2
+.field public static final captcha_failed:I = 0x7f1203c2
 
-.field public static final captcha_failed_unsupported:I = 0x7f1203c3
+.field public static final captcha_failed_play_services:I = 0x7f1203c3
 
-.field public static final captcha_issues:I = 0x7f1203c4
+.field public static final captcha_failed_unsupported:I = 0x7f1203c4
 
-.field public static final captcha_open_browser:I = 0x7f1203c5
+.field public static final captcha_issues:I = 0x7f1203c5
 
-.field public static final captcha_problems:I = 0x7f1203c6
+.field public static final captcha_open_browser:I = 0x7f1203c6
 
-.field public static final captcha_problems_info:I = 0x7f1203c7
+.field public static final captcha_problems:I = 0x7f1203c7
 
-.field public static final categories:I = 0x7f1203c8
+.field public static final captcha_problems_info:I = 0x7f1203c8
 
-.field public static final category:I = 0x7f1203c9
+.field public static final categories:I = 0x7f1203c9
 
-.field public static final category_a11y_label:I = 0x7f1203ca
+.field public static final category:I = 0x7f1203ca
 
-.field public static final category_a11y_label_with_expanded_state:I = 0x7f1203cb
+.field public static final category_a11y_label:I = 0x7f1203cb
 
-.field public static final category_has_been_deleted:I = 0x7f1203cc
+.field public static final category_a11y_label_with_expanded_state:I = 0x7f1203cc
 
-.field public static final category_name:I = 0x7f1203cd
+.field public static final category_has_been_deleted:I = 0x7f1203cd
 
-.field public static final category_settings:I = 0x7f1203ce
+.field public static final category_name:I = 0x7f1203ce
 
-.field public static final category_settings_have_been_updated:I = 0x7f1203cf
+.field public static final category_settings:I = 0x7f1203cf
 
-.field public static final certified:I = 0x7f1203d0
+.field public static final category_settings_have_been_updated:I = 0x7f1203d0
 
-.field public static final certified_device_recommendation_audio_input_and_output_body:I = 0x7f1203d1
+.field public static final certified:I = 0x7f1203d1
 
-.field public static final certified_device_recommendation_audio_input_body:I = 0x7f1203d2
+.field public static final certified_device_recommendation_audio_input_and_output_body:I = 0x7f1203d2
 
-.field public static final certified_device_recommendation_audio_output_body:I = 0x7f1203d3
+.field public static final certified_device_recommendation_audio_input_body:I = 0x7f1203d3
 
-.field public static final certified_device_recommendation_title:I = 0x7f1203d4
+.field public static final certified_device_recommendation_audio_output_body:I = 0x7f1203d4
 
-.field public static final change:I = 0x7f1203d5
+.field public static final certified_device_recommendation_title:I = 0x7f1203d5
 
-.field public static final change_avatar:I = 0x7f1203d6
+.field public static final change:I = 0x7f1203d6
 
-.field public static final change_banner:I = 0x7f1203d7
+.field public static final change_avatar:I = 0x7f1203d7
 
-.field public static final change_camera:I = 0x7f1203d8
+.field public static final change_banner:I = 0x7f1203d8
 
-.field public static final change_category:I = 0x7f1203d9
+.field public static final change_camera:I = 0x7f1203d9
 
-.field public static final change_email:I = 0x7f1203da
+.field public static final change_category:I = 0x7f1203da
 
-.field public static final change_email_short:I = 0x7f1203db
+.field public static final change_email:I = 0x7f1203db
 
-.field public static final change_icon:I = 0x7f1203dc
+.field public static final change_email_short:I = 0x7f1203dc
 
-.field public static final change_log:I = 0x7f1203dd
+.field public static final change_icon:I = 0x7f1203dd
 
-.field public static final change_log_md_body:I = 0x7f1203de
+.field public static final change_log:I = 0x7f1203de
 
-.field public static final change_log_md_date:I = 0x7f1203df
+.field public static final change_log_md_body:I = 0x7f1203df
 
-.field public static final change_log_md_locale:I = 0x7f1203e0
+.field public static final change_log_md_date:I = 0x7f1203e0
 
-.field public static final change_log_md_revision:I = 0x7f1203e1
+.field public static final change_log_md_locale:I = 0x7f1203e1
 
-.field public static final change_log_md_video:I = 0x7f1203e2
+.field public static final change_log_md_revision:I = 0x7f1203e2
 
-.field public static final change_nickname:I = 0x7f1203e3
+.field public static final change_log_md_video:I = 0x7f1203e3
 
-.field public static final change_nickname_description:I = 0x7f1203e4
+.field public static final change_nickname:I = 0x7f1203e4
 
-.field public static final change_nickname_warning:I = 0x7f1203e5
+.field public static final change_nickname_description:I = 0x7f1203e5
 
-.field public static final change_password:I = 0x7f1203e6
+.field public static final change_nickname_warning:I = 0x7f1203e6
 
-.field public static final change_password_link:I = 0x7f1203e7
+.field public static final change_password:I = 0x7f1203e7
 
-.field public static final change_phone_number:I = 0x7f1203e8
+.field public static final change_password_link:I = 0x7f1203e8
 
-.field public static final change_splash:I = 0x7f1203e9
+.field public static final change_phone_number:I = 0x7f1203e9
 
-.field public static final change_vanity_url_error:I = 0x7f1203ea
+.field public static final change_splash:I = 0x7f1203ea
 
-.field public static final changelog_special_cta:I = 0x7f1203eb
+.field public static final change_vanity_url_error:I = 0x7f1203eb
 
-.field public static final changelog_special_cta_body:I = 0x7f1203ec
+.field public static final changelog_special_cta:I = 0x7f1203ec
 
-.field public static final changelog_special_cta_desktop:I = 0x7f1203ed
+.field public static final changelog_special_cta_body:I = 0x7f1203ed
 
-.field public static final changelog_special_cta_desktop_fallback:I = 0x7f1203ee
+.field public static final changelog_special_cta_desktop:I = 0x7f1203ee
 
-.field public static final changelog_special_cta_title:I = 0x7f1203ef
+.field public static final changelog_special_cta_desktop_fallback:I = 0x7f1203ef
 
-.field public static final changelog_special_share_discord:I = 0x7f1203f0
+.field public static final changelog_special_cta_title:I = 0x7f1203f0
 
-.field public static final channel:I = 0x7f1203f1
+.field public static final changelog_special_share_discord:I = 0x7f1203f1
 
-.field public static final channel_a11y_label:I = 0x7f1203f2
+.field public static final channel:I = 0x7f1203f2
 
-.field public static final channel_actions_menu_label:I = 0x7f1203f3
+.field public static final channel_a11y_label:I = 0x7f1203f3
 
-.field public static final channel_call_current_speaker:I = 0x7f1203f4
+.field public static final channel_actions_menu_label:I = 0x7f1203f4
 
-.field public static final channel_call_members_popout_header:I = 0x7f1203f5
+.field public static final channel_call_current_speaker:I = 0x7f1203f5
 
-.field public static final channel_call_overflow_menu_label:I = 0x7f1203f6
+.field public static final channel_call_members_popout_header:I = 0x7f1203f6
 
-.field public static final channel_call_participants:I = 0x7f1203f7
+.field public static final channel_call_overflow_menu_label:I = 0x7f1203f7
 
-.field public static final channel_has_been_deleted:I = 0x7f1203f8
+.field public static final channel_call_participants:I = 0x7f1203f8
 
-.field public static final channel_header_bar_a11y_label:I = 0x7f1203f9
+.field public static final channel_has_been_deleted:I = 0x7f1203f9
 
-.field public static final channel_list_show_all_threads:I = 0x7f1203fa
+.field public static final channel_header_bar_a11y_label:I = 0x7f1203fa
 
-.field public static final channel_locked:I = 0x7f1203fb
+.field public static final channel_list_show_all_threads:I = 0x7f1203fb
 
-.field public static final channel_locked_short:I = 0x7f1203fc
+.field public static final channel_locked:I = 0x7f1203fc
 
-.field public static final channel_locked_to_category:I = 0x7f1203fd
+.field public static final channel_locked_short:I = 0x7f1203fd
 
-.field public static final channel_members_a11y_label:I = 0x7f1203fe
+.field public static final channel_locked_to_category:I = 0x7f1203fe
 
-.field public static final channel_mention_badge_a11y_label:I = 0x7f1203ff
+.field public static final channel_members_a11y_label:I = 0x7f1203ff
 
-.field public static final channel_message_a11y_label:I = 0x7f120400
+.field public static final channel_mention_badge_a11y_label:I = 0x7f120400
 
-.field public static final channel_message_a11y_role_description:I = 0x7f120401
+.field public static final channel_message_a11y_label:I = 0x7f120401
 
-.field public static final channel_messages_a11y_description:I = 0x7f120402
+.field public static final channel_message_a11y_role_description:I = 0x7f120402
 
-.field public static final channel_messages_a11y_label:I = 0x7f120403
+.field public static final channel_messages_a11y_description:I = 0x7f120403
 
-.field public static final channel_messages_a11y_role_description:I = 0x7f120404
+.field public static final channel_messages_a11y_label:I = 0x7f120404
 
-.field public static final channel_mute_label:I = 0x7f120405
+.field public static final channel_messages_a11y_role_description:I = 0x7f120405
 
-.field public static final channel_mute_tooltip:I = 0x7f120406
+.field public static final channel_mute_label:I = 0x7f120406
 
-.field public static final channel_or_category:I = 0x7f120407
+.field public static final channel_mute_tooltip:I = 0x7f120407
 
-.field public static final channel_order_updated:I = 0x7f120408
+.field public static final channel_or_category:I = 0x7f120408
 
-.field public static final channel_permissions:I = 0x7f120409
+.field public static final channel_order_updated:I = 0x7f120409
 
-.field public static final channel_select:I = 0x7f12040a
+.field public static final channel_permissions:I = 0x7f12040a
 
-.field public static final channel_settings:I = 0x7f12040b
+.field public static final channel_select:I = 0x7f12040b
 
-.field public static final channel_settings_have_been_updated:I = 0x7f12040c
+.field public static final channel_settings:I = 0x7f12040c
 
-.field public static final channel_slowmode_cooldown:I = 0x7f12040d
+.field public static final channel_settings_have_been_updated:I = 0x7f12040d
 
-.field public static final channel_slowmode_desc:I = 0x7f12040e
+.field public static final channel_slowmode_cooldown:I = 0x7f12040e
 
-.field public static final channel_slowmode_desc_hours:I = 0x7f12040f
+.field public static final channel_slowmode_desc:I = 0x7f12040f
 
-.field public static final channel_slowmode_desc_immune:I = 0x7f120410
+.field public static final channel_slowmode_desc_hours:I = 0x7f120410
 
-.field public static final channel_slowmode_desc_minutes:I = 0x7f120411
+.field public static final channel_slowmode_desc_immune:I = 0x7f120411
 
-.field public static final channel_slowmode_desc_short:I = 0x7f120412
+.field public static final channel_slowmode_desc_minutes:I = 0x7f120412
 
-.field public static final channel_step_subtitle:I = 0x7f120413
+.field public static final channel_slowmode_desc_short:I = 0x7f120413
 
-.field public static final channel_step_title:I = 0x7f120414
+.field public static final channel_step_subtitle:I = 0x7f120414
 
-.field public static final channel_topic_empty:I = 0x7f120415
+.field public static final channel_step_title:I = 0x7f120415
 
-.field public static final channel_type:I = 0x7f120416
+.field public static final channel_topic_empty:I = 0x7f120416
 
-.field public static final channel_unmute_tooltip:I = 0x7f120417
+.field public static final channel_type:I = 0x7f120417
 
-.field public static final channels:I = 0x7f120418
+.field public static final channel_unmute_tooltip:I = 0x7f120418
 
-.field public static final channels_unavailable_body:I = 0x7f120419
+.field public static final channels:I = 0x7f120419
 
-.field public static final channels_unavailable_title:I = 0x7f12041a
+.field public static final channels_unavailable_body:I = 0x7f12041a
 
-.field public static final character_count_at_limit:I = 0x7f12041b
+.field public static final channels_unavailable_title:I = 0x7f12041b
 
-.field public static final character_count_close_to_limit:I = 0x7f12041c
+.field public static final character_count_at_limit:I = 0x7f12041c
 
-.field public static final character_count_over_limit:I = 0x7f12041d
+.field public static final character_count_close_to_limit:I = 0x7f12041d
 
-.field public static final character_counter_content_description:I = 0x7f12041e
+.field public static final character_count_over_limit:I = 0x7f12041e
 
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041f
+.field public static final character_counter_content_description:I = 0x7f12041f
 
-.field public static final character_counter_pattern:I = 0x7f120420
+.field public static final character_counter_overflowed_content_description:I = 0x7f120420
 
-.field public static final chat:I = 0x7f120421
+.field public static final character_counter_pattern:I = 0x7f120421
 
-.field public static final chat_attach_invite_to_listen:I = 0x7f120422
+.field public static final chat:I = 0x7f120422
 
-.field public static final chat_attach_invite_to_play_game:I = 0x7f120423
+.field public static final chat_attach_invite_to_listen:I = 0x7f120423
 
-.field public static final chat_attach_invite_to_watch:I = 0x7f120424
+.field public static final chat_attach_invite_to_play_game:I = 0x7f120424
 
-.field public static final chat_attach_upload_a_file:I = 0x7f120425
+.field public static final chat_attach_invite_to_watch:I = 0x7f120425
 
-.field public static final chat_attach_upload_or_invite:I = 0x7f120426
+.field public static final chat_attach_upload_a_file:I = 0x7f120426
 
-.field public static final chat_behavior:I = 0x7f120427
+.field public static final chat_attach_upload_or_invite:I = 0x7f120427
 
-.field public static final checking_for_updates:I = 0x7f120428
+.field public static final chat_behavior:I = 0x7f120428
 
-.field public static final chip_text:I = 0x7f120429
+.field public static final checking_for_updates:I = 0x7f120429
 
-.field public static final choose_an_application:I = 0x7f12042a
+.field public static final chip_text:I = 0x7f12042a
 
-.field public static final claim_account:I = 0x7f12042b
+.field public static final choose_an_application:I = 0x7f12042b
 
-.field public static final claim_account_body:I = 0x7f12042c
+.field public static final claim_account:I = 0x7f12042c
 
-.field public static final claim_account_body_short:I = 0x7f12042d
+.field public static final claim_account_body:I = 0x7f12042d
 
-.field public static final claim_account_email_to:I = 0x7f12042e
+.field public static final claim_account_body_short:I = 0x7f12042e
 
-.field public static final claim_account_get_app:I = 0x7f12042f
+.field public static final claim_account_email_to:I = 0x7f12042f
 
-.field public static final claim_account_promote_app_2020_06:I = 0x7f120430
+.field public static final claim_account_get_app:I = 0x7f120430
 
-.field public static final claim_account_required_body:I = 0x7f120431
+.field public static final claim_account_promote_app_2020_06:I = 0x7f120431
 
-.field public static final claim_account_required_email_to:I = 0x7f120432
+.field public static final claim_account_required_body:I = 0x7f120432
 
-.field public static final claim_account_title:I = 0x7f120433
+.field public static final claim_account_required_email_to:I = 0x7f120433
 
-.field public static final clear_attachments:I = 0x7f120434
+.field public static final claim_account_title:I = 0x7f120434
 
-.field public static final clear_role_permissions:I = 0x7f120435
+.field public static final clear_attachments:I = 0x7f120435
 
-.field public static final clear_text_end_icon_content_description:I = 0x7f120436
+.field public static final clear_role_permissions:I = 0x7f120436
 
-.field public static final clone_channel:I = 0x7f120437
+.field public static final clear_text_end_icon_content_description:I = 0x7f120437
 
-.field public static final clone_channel_help:I = 0x7f120438
+.field public static final clone_channel:I = 0x7f120438
 
-.field public static final clone_server_button_cta:I = 0x7f120439
+.field public static final clone_channel_help:I = 0x7f120439
 
-.field public static final close:I = 0x7f12043a
+.field public static final clone_server_button_cta:I = 0x7f12043a
 
-.field public static final close_action_sheet:I = 0x7f12043b
+.field public static final close:I = 0x7f12043b
 
-.field public static final close_dm:I = 0x7f12043c
+.field public static final close_action_sheet:I = 0x7f12043c
 
-.field public static final close_drawer:I = 0x7f12043d
+.field public static final close_dm:I = 0x7f12043d
 
-.field public static final close_stream:I = 0x7f12043e
+.field public static final close_drawer:I = 0x7f12043e
 
-.field public static final close_window:I = 0x7f12043f
+.field public static final close_stream:I = 0x7f12043f
 
-.field public static final cloud_sync_icon_tooltip_done:I = 0x7f120440
+.field public static final close_window:I = 0x7f120440
 
-.field public static final cloud_sync_icon_tooltip_planning:I = 0x7f120441
+.field public static final cloud_sync_icon_tooltip_done:I = 0x7f120441
 
-.field public static final cloud_sync_icon_tooltip_preparing:I = 0x7f120442
+.field public static final cloud_sync_icon_tooltip_planning:I = 0x7f120442
 
-.field public static final cloud_sync_icon_tooltip_pulling:I = 0x7f120443
+.field public static final cloud_sync_icon_tooltip_preparing:I = 0x7f120443
 
-.field public static final cloud_sync_icon_tooltip_pushing:I = 0x7f120444
+.field public static final cloud_sync_icon_tooltip_pulling:I = 0x7f120444
 
-.field public static final cloud_sync_icon_tooltip_supported:I = 0x7f120445
+.field public static final cloud_sync_icon_tooltip_pushing:I = 0x7f120445
 
-.field public static final cloud_sync_modal_conflict_choice_download:I = 0x7f120446
+.field public static final cloud_sync_icon_tooltip_supported:I = 0x7f120446
 
-.field public static final cloud_sync_modal_conflict_choice_upload:I = 0x7f120447
+.field public static final cloud_sync_modal_conflict_choice_download:I = 0x7f120447
 
-.field public static final cloud_sync_modal_conflict_description:I = 0x7f120448
+.field public static final cloud_sync_modal_conflict_choice_upload:I = 0x7f120448
 
-.field public static final cloud_sync_modal_conflict_header:I = 0x7f120449
+.field public static final cloud_sync_modal_conflict_description:I = 0x7f120449
 
-.field public static final cloud_sync_modal_conflict_last_modified:I = 0x7f12044a
+.field public static final cloud_sync_modal_conflict_header:I = 0x7f12044a
 
-.field public static final cloud_sync_modal_error_description:I = 0x7f12044b
+.field public static final cloud_sync_modal_conflict_last_modified:I = 0x7f12044b
 
-.field public static final cloud_sync_modal_error_header:I = 0x7f12044c
+.field public static final cloud_sync_modal_error_description:I = 0x7f12044c
 
-.field public static final cloud_sync_modal_or:I = 0x7f12044d
+.field public static final cloud_sync_modal_error_header:I = 0x7f12044d
 
-.field public static final collapse:I = 0x7f12044e
+.field public static final cloud_sync_modal_or:I = 0x7f12044e
 
-.field public static final collapse_category:I = 0x7f12044f
+.field public static final collapse:I = 0x7f12044f
 
-.field public static final collapsed:I = 0x7f120450
+.field public static final collapse_category:I = 0x7f120450
 
-.field public static final color_picker_custom:I = 0x7f120451
+.field public static final collapsed:I = 0x7f120451
 
-.field public static final color_picker_presets:I = 0x7f120452
+.field public static final color_picker_custom:I = 0x7f120452
 
-.field public static final color_picker_title:I = 0x7f120453
+.field public static final color_picker_presets:I = 0x7f120453
 
-.field public static final color_picker_transparency:I = 0x7f120454
+.field public static final color_picker_title:I = 0x7f120454
 
-.field public static final coming_soon:I = 0x7f120456
+.field public static final color_picker_transparency:I = 0x7f120455
 
-.field public static final command_giphy_description:I = 0x7f120457
+.field public static final coming_soon:I = 0x7f120457
 
-.field public static final command_me_description:I = 0x7f120458
+.field public static final command_giphy_description:I = 0x7f120458
 
-.field public static final command_nick_description:I = 0x7f120459
+.field public static final command_me_description:I = 0x7f120459
 
-.field public static final command_nick_failure:I = 0x7f12045a
+.field public static final command_nick_description:I = 0x7f12045a
 
-.field public static final command_nick_failure_permission:I = 0x7f12045b
+.field public static final command_nick_failure:I = 0x7f12045b
 
-.field public static final command_nick_reset:I = 0x7f12045c
+.field public static final command_nick_failure_permission:I = 0x7f12045c
 
-.field public static final command_nick_success:I = 0x7f12045d
+.field public static final command_nick_reset:I = 0x7f12045d
 
-.field public static final command_shrug_description:I = 0x7f12045e
+.field public static final command_nick_success:I = 0x7f12045e
 
-.field public static final command_spoiler_description:I = 0x7f12045f
+.field public static final command_shrug_description:I = 0x7f12045f
 
-.field public static final command_tableflip_description:I = 0x7f120460
+.field public static final command_spoiler_description:I = 0x7f120460
 
-.field public static final command_tableunflip_description:I = 0x7f120461
+.field public static final command_tableflip_description:I = 0x7f120461
 
-.field public static final command_tts_description:I = 0x7f120462
+.field public static final command_tableunflip_description:I = 0x7f120462
 
-.field public static final commands:I = 0x7f120463
+.field public static final command_tts_description:I = 0x7f120463
 
-.field public static final commands_matching:I = 0x7f120464
+.field public static final commands:I = 0x7f120464
 
-.field public static final common_google_play_services_enable_button:I = 0x7f120465
+.field public static final commands_matching:I = 0x7f120465
 
-.field public static final common_google_play_services_enable_text:I = 0x7f120466
+.field public static final common_google_play_services_enable_button:I = 0x7f120466
 
-.field public static final common_google_play_services_enable_title:I = 0x7f120467
+.field public static final common_google_play_services_enable_text:I = 0x7f120467
 
-.field public static final common_google_play_services_install_button:I = 0x7f120468
+.field public static final common_google_play_services_enable_title:I = 0x7f120468
 
-.field public static final common_google_play_services_install_text:I = 0x7f120469
+.field public static final common_google_play_services_install_button:I = 0x7f120469
 
-.field public static final common_google_play_services_install_title:I = 0x7f12046a
+.field public static final common_google_play_services_install_text:I = 0x7f12046a
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046b
+.field public static final common_google_play_services_install_title:I = 0x7f12046b
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f12046c
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046c
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f12046d
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12046d
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046e
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046e
 
-.field public static final common_google_play_services_update_button:I = 0x7f12046f
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046f
 
-.field public static final common_google_play_services_update_text:I = 0x7f120470
+.field public static final common_google_play_services_update_button:I = 0x7f120470
 
-.field public static final common_google_play_services_update_title:I = 0x7f120471
+.field public static final common_google_play_services_update_text:I = 0x7f120471
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120472
+.field public static final common_google_play_services_update_title:I = 0x7f120472
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120473
+.field public static final common_google_play_services_updating_text:I = 0x7f120473
 
-.field public static final common_open_on_phone:I = 0x7f120474
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120474
 
-.field public static final common_signin_button_text:I = 0x7f120475
+.field public static final common_open_on_phone:I = 0x7f120475
 
-.field public static final common_signin_button_text_long:I = 0x7f120476
+.field public static final common_signin_button_text:I = 0x7f120476
 
-.field public static final communicators_info:I = 0x7f120477
+.field public static final common_signin_button_text_long:I = 0x7f120477
 
-.field public static final community:I = 0x7f120478
+.field public static final communicators_info:I = 0x7f120478
 
-.field public static final community_policy_help:I = 0x7f120479
+.field public static final community:I = 0x7f120479
 
-.field public static final community_policy_title:I = 0x7f12047a
+.field public static final community_policy_help:I = 0x7f12047a
 
-.field public static final compact_mode:I = 0x7f12047b
+.field public static final community_policy_title:I = 0x7f12047b
 
-.field public static final completed:I = 0x7f12047c
+.field public static final compact_mode:I = 0x7f12047c
 
-.field public static final configure:I = 0x7f12047d
+.field public static final completed:I = 0x7f12047d
 
-.field public static final confirm:I = 0x7f12047e
+.field public static final configure:I = 0x7f12047e
 
-.field public static final confirm_channel_drag_title:I = 0x7f12047f
+.field public static final confirm:I = 0x7f12047f
 
-.field public static final confirm_disable_silence_body:I = 0x7f120480
+.field public static final confirm_channel_drag_title:I = 0x7f120480
 
-.field public static final confirm_disable_silence_dont_show:I = 0x7f120481
+.field public static final confirm_disable_silence_body:I = 0x7f120481
 
-.field public static final confirm_disable_silence_title:I = 0x7f120482
+.field public static final confirm_disable_silence_dont_show:I = 0x7f120482
 
-.field public static final confirm_qr_check_your_phone:I = 0x7f120483
+.field public static final confirm_disable_silence_title:I = 0x7f120483
 
-.field public static final confirm_qr_description:I = 0x7f120484
+.field public static final confirm_qr_check_your_phone:I = 0x7f120484
 
-.field public static final confirm_qr_keep_me_signed_in:I = 0x7f120485
+.field public static final confirm_qr_description:I = 0x7f120485
 
-.field public static final confirm_qr_login_on_computer:I = 0x7f120486
+.field public static final confirm_qr_keep_me_signed_in:I = 0x7f120486
 
-.field public static final confirm_user_block_body:I = 0x7f120487
+.field public static final confirm_qr_login_on_computer:I = 0x7f120487
 
-.field public static final confirm_user_block_title:I = 0x7f120488
+.field public static final confirm_user_block_body:I = 0x7f120488
 
-.field public static final connect:I = 0x7f120489
+.field public static final confirm_user_block_title:I = 0x7f120489
 
-.field public static final connect_account_description:I = 0x7f12048a
+.field public static final connect:I = 0x7f12048a
 
-.field public static final connect_account_title:I = 0x7f12048b
+.field public static final connect_account_description:I = 0x7f12048b
 
-.field public static final connect_to_video:I = 0x7f12048c
+.field public static final connect_account_title:I = 0x7f12048c
 
-.field public static final connect_to_voice:I = 0x7f12048d
+.field public static final connect_to_video:I = 0x7f12048d
 
-.field public static final connect_voice_only:I = 0x7f12048e
+.field public static final connect_to_voice:I = 0x7f12048e
 
-.field public static final connected_account_revoked:I = 0x7f12048f
+.field public static final connect_voice_only:I = 0x7f12048f
 
-.field public static final connected_account_verify_failure:I = 0x7f120490
+.field public static final connected_account_revoked:I = 0x7f120490
 
-.field public static final connected_account_verify_success:I = 0x7f120491
+.field public static final connected_account_verify_failure:I = 0x7f120491
 
-.field public static final connected_account_verifying:I = 0x7f120492
+.field public static final connected_account_verify_success:I = 0x7f120492
 
-.field public static final connected_accounts:I = 0x7f120493
+.field public static final connected_account_verifying:I = 0x7f120493
 
-.field public static final connected_accounts_none:I = 0x7f120494
+.field public static final connected_accounts:I = 0x7f120494
 
-.field public static final connected_accounts_none_title:I = 0x7f120495
+.field public static final connected_accounts_none:I = 0x7f120495
 
-.field public static final connected_device_detected_cancel_button:I = 0x7f120496
+.field public static final connected_accounts_none_title:I = 0x7f120496
 
-.field public static final connected_device_detected_confirm_button:I = 0x7f120497
+.field public static final connected_device_detected_cancel_button:I = 0x7f120497
 
-.field public static final connected_device_detected_input_and_output_body:I = 0x7f120498
+.field public static final connected_device_detected_confirm_button:I = 0x7f120498
 
-.field public static final connected_device_detected_input_body:I = 0x7f120499
+.field public static final connected_device_detected_input_and_output_body:I = 0x7f120499
 
-.field public static final connected_device_detected_option_input:I = 0x7f12049a
+.field public static final connected_device_detected_input_body:I = 0x7f12049a
 
-.field public static final connected_device_detected_option_input_and_output:I = 0x7f12049b
+.field public static final connected_device_detected_option_input:I = 0x7f12049b
 
-.field public static final connected_device_detected_option_output:I = 0x7f12049c
+.field public static final connected_device_detected_option_input_and_output:I = 0x7f12049c
 
-.field public static final connected_device_detected_output_body:I = 0x7f12049d
+.field public static final connected_device_detected_option_output:I = 0x7f12049d
 
-.field public static final connected_device_detected_title:I = 0x7f12049e
+.field public static final connected_device_detected_output_body:I = 0x7f12049e
 
-.field public static final connected_on_another_client:I = 0x7f12049f
+.field public static final connected_device_detected_title:I = 0x7f12049f
 
-.field public static final connecting:I = 0x7f1204a0
+.field public static final connected_on_another_client:I = 0x7f1204a0
 
-.field public static final connecting_problems_cta:I = 0x7f1204a1
+.field public static final connecting:I = 0x7f1204a1
 
-.field public static final connection_enter_code:I = 0x7f1204a2
+.field public static final connecting_problems_cta:I = 0x7f1204a2
 
-.field public static final connection_invalid_pin:I = 0x7f1204a3
+.field public static final connection_enter_code:I = 0x7f1204a3
 
-.field public static final connection_login_with:I = 0x7f1204a4
+.field public static final connection_invalid_pin:I = 0x7f1204a4
 
-.field public static final connection_problems_body:I = 0x7f1204a5
+.field public static final connection_login_with:I = 0x7f1204a5
 
-.field public static final connection_status_authenticating:I = 0x7f1204a6
+.field public static final connection_problems_body:I = 0x7f1204a6
 
-.field public static final connection_status_awaiting_endpoint:I = 0x7f1204a7
+.field public static final connection_status_authenticating:I = 0x7f1204a7
 
-.field public static final connection_status_connected:I = 0x7f1204a8
+.field public static final connection_status_awaiting_endpoint:I = 0x7f1204a8
 
-.field public static final connection_status_connecting:I = 0x7f1204a9
+.field public static final connection_status_connected:I = 0x7f1204a9
 
-.field public static final connection_status_disconnected:I = 0x7f1204aa
+.field public static final connection_status_connecting:I = 0x7f1204aa
 
-.field public static final connection_status_ice_checking:I = 0x7f1204ab
+.field public static final connection_status_disconnected:I = 0x7f1204ab
 
-.field public static final connection_status_no_route:I = 0x7f1204ac
+.field public static final connection_status_ice_checking:I = 0x7f1204ac
 
-.field public static final connection_status_rtc_connecting:I = 0x7f1204ad
+.field public static final connection_status_no_route:I = 0x7f1204ad
 
-.field public static final connection_status_rtc_disconnected:I = 0x7f1204ae
+.field public static final connection_status_rtc_connecting:I = 0x7f1204ae
 
-.field public static final connection_status_stream_connected:I = 0x7f1204af
+.field public static final connection_status_rtc_disconnected:I = 0x7f1204af
 
-.field public static final connection_status_video_connected:I = 0x7f1204b0
+.field public static final connection_status_stream_connected:I = 0x7f1204b0
 
-.field public static final connection_status_voice_connected:I = 0x7f1204b1
+.field public static final connection_status_stream_self_connected:I = 0x7f1204b1
 
-.field public static final connection_verified:I = 0x7f1204b2
+.field public static final connection_status_video_connected:I = 0x7f1204b2
 
-.field public static final connections:I = 0x7f1204b3
+.field public static final connection_status_voice_connected:I = 0x7f1204b3
 
-.field public static final contact_sync_cta_button_subtitle:I = 0x7f1204b4
+.field public static final connection_verified:I = 0x7f1204b4
 
-.field public static final contact_sync_cta_button_title:I = 0x7f1204b5
+.field public static final connections:I = 0x7f1204b5
 
-.field public static final contact_sync_enter_phone_number_description:I = 0x7f1204b6
+.field public static final contact_sync_cta_button_subtitle:I = 0x7f1204b6
 
-.field public static final contact_sync_enter_phone_number_title:I = 0x7f1204b7
+.field public static final contact_sync_cta_button_title:I = 0x7f1204b7
 
-.field public static final contact_sync_failed_alert_message:I = 0x7f1204b8
+.field public static final contact_sync_enter_phone_number_description:I = 0x7f1204b8
 
-.field public static final contact_sync_failed_alert_title:I = 0x7f1204b9
+.field public static final contact_sync_enter_phone_number_title:I = 0x7f1204b9
 
-.field public static final contact_sync_failed_no_phone_alert_message:I = 0x7f1204ba
+.field public static final contact_sync_failed_alert_message:I = 0x7f1204ba
 
-.field public static final contact_sync_failed_no_phone_alert_title:I = 0x7f1204bb
+.field public static final contact_sync_failed_alert_title:I = 0x7f1204bb
 
-.field public static final contact_sync_landing_screen_button:I = 0x7f1204bc
+.field public static final contact_sync_failed_no_phone_alert_message:I = 0x7f1204bc
 
-.field public static final contact_sync_landing_screen_description:I = 0x7f1204bd
+.field public static final contact_sync_failed_no_phone_alert_title:I = 0x7f1204bd
 
-.field public static final contact_sync_landing_screen_title:I = 0x7f1204be
+.field public static final contact_sync_landing_screen_button:I = 0x7f1204be
 
-.field public static final contact_sync_no_results_description:I = 0x7f1204bf
+.field public static final contact_sync_landing_screen_description:I = 0x7f1204bf
 
-.field public static final contact_sync_no_results_got_it:I = 0x7f1204c0
+.field public static final contact_sync_landing_screen_title:I = 0x7f1204c0
 
-.field public static final contact_sync_no_results_title:I = 0x7f1204c1
+.field public static final contact_sync_no_results_description:I = 0x7f1204c1
 
-.field public static final contact_sync_permission_denied_alert_message:I = 0x7f1204c2
+.field public static final contact_sync_no_results_got_it:I = 0x7f1204c2
 
-.field public static final contact_sync_permission_denied_alert_title:I = 0x7f1204c3
+.field public static final contact_sync_no_results_title:I = 0x7f1204c3
 
-.field public static final contact_sync_submit_phone_number:I = 0x7f1204c4
+.field public static final contact_sync_permission_denied_alert_message:I = 0x7f1204c4
 
-.field public static final contact_sync_syncing_description:I = 0x7f1204c5
+.field public static final contact_sync_permission_denied_alert_title:I = 0x7f1204c5
 
-.field public static final contact_sync_syncing_title:I = 0x7f1204c6
+.field public static final contact_sync_submit_phone_number:I = 0x7f1204c6
 
-.field public static final contact_sync_toggle_label:I = 0x7f1204c7
+.field public static final contact_sync_syncing_description:I = 0x7f1204c7
 
-.field public static final contact_sync_toggle_sub_label:I = 0x7f1204c8
+.field public static final contact_sync_syncing_title:I = 0x7f1204c8
 
-.field public static final contact_sync_we_found_your_friends_body:I = 0x7f1204c9
+.field public static final contact_sync_toggle_label:I = 0x7f1204c9
 
-.field public static final contact_sync_we_found_your_friends_title:I = 0x7f1204ca
+.field public static final contact_sync_toggle_sub_label:I = 0x7f1204ca
 
-.field public static final content_matching:I = 0x7f1204cb
+.field public static final contact_sync_we_found_your_friends_body:I = 0x7f1204cb
 
-.field public static final context_menu_hint:I = 0x7f1204cc
+.field public static final contact_sync_we_found_your_friends_title:I = 0x7f1204cc
 
-.field public static final continue_to_webapp:I = 0x7f1204cd
+.field public static final content_matching:I = 0x7f1204cd
 
-.field public static final control_volume:I = 0x7f1204ce
+.field public static final context_menu_hint:I = 0x7f1204ce
 
-.field public static final convert_emoticons:I = 0x7f1204cf
+.field public static final continue_to_webapp:I = 0x7f1204cf
 
-.field public static final convert_emoticons_help:I = 0x7f1204d0
+.field public static final control_volume:I = 0x7f1204d0
 
-.field public static final copied:I = 0x7f1204d1
+.field public static final convert_emoticons:I = 0x7f1204d1
 
-.field public static final copied_text:I = 0x7f1204d2
+.field public static final convert_emoticons_help:I = 0x7f1204d2
 
-.field public static final copy:I = 0x7f1204d3
+.field public static final copied:I = 0x7f1204d3
 
-.field public static final copy_channel_topic:I = 0x7f1204d4
+.field public static final copied_text:I = 0x7f1204d4
 
-.field public static final copy_code:I = 0x7f1204d5
+.field public static final copy:I = 0x7f1204d5
 
-.field public static final copy_id:I = 0x7f1204d6
+.field public static final copy_channel_topic:I = 0x7f1204d6
 
-.field public static final copy_image_preview:I = 0x7f1204d7
+.field public static final copy_code:I = 0x7f1204d7
 
-.field public static final copy_link:I = 0x7f1204d8
+.field public static final copy_id:I = 0x7f1204d8
 
-.field public static final copy_media_link:I = 0x7f1204d9
+.field public static final copy_image_preview:I = 0x7f1204d9
 
-.field public static final copy_message_link:I = 0x7f1204da
+.field public static final copy_link:I = 0x7f1204da
 
-.field public static final copy_owner_id:I = 0x7f1204db
+.field public static final copy_media_link:I = 0x7f1204db
 
-.field public static final copy_text:I = 0x7f1204dc
+.field public static final copy_message_link:I = 0x7f1204dc
 
-.field public static final copy_username:I = 0x7f1204de
+.field public static final copy_owner_id:I = 0x7f1204dd
 
-.field public static final country_codes:I = 0x7f1204df
+.field public static final copy_text:I = 0x7f1204de
 
-.field public static final country_no_results:I = 0x7f1204e0
+.field public static final copy_username:I = 0x7f1204e0
 
-.field public static final covid_new_user_survey_button:I = 0x7f1204e1
+.field public static final country_codes:I = 0x7f1204e1
 
-.field public static final covid_new_user_survey_prompt:I = 0x7f1204e2
+.field public static final country_no_results:I = 0x7f1204e2
 
-.field public static final cozy_mode:I = 0x7f1204e3
+.field public static final covid_new_user_survey_button:I = 0x7f1204e3
 
-.field public static final crash_app_version:I = 0x7f1204e9
+.field public static final covid_new_user_survey_prompt:I = 0x7f1204e4
 
-.field public static final crash_details:I = 0x7f1204ea
+.field public static final cozy_mode:I = 0x7f1204e5
 
-.field public static final crash_device:I = 0x7f1204eb
+.field public static final crash_app_version:I = 0x7f1204eb
 
-.field public static final crash_device_version:I = 0x7f1204ec
+.field public static final crash_details:I = 0x7f1204ec
 
-.field public static final crash_disclaimer:I = 0x7f1204ed
+.field public static final crash_device:I = 0x7f1204ed
 
-.field public static final crash_source:I = 0x7f1204ee
+.field public static final crash_device_version:I = 0x7f1204ee
 
-.field public static final crash_testers_invite:I = 0x7f1204ef
+.field public static final crash_disclaimer:I = 0x7f1204ef
 
-.field public static final crash_timestamp:I = 0x7f1204f0
+.field public static final crash_source:I = 0x7f1204f0
 
-.field public static final crash_unexpected:I = 0x7f1204f1
+.field public static final crash_testers_invite:I = 0x7f1204f1
 
-.field public static final create:I = 0x7f1204f2
+.field public static final crash_timestamp:I = 0x7f1204f2
 
-.field public static final create_category:I = 0x7f1204f3
+.field public static final crash_unexpected:I = 0x7f1204f3
 
-.field public static final create_channel:I = 0x7f1204f4
+.field public static final create:I = 0x7f1204f4
 
-.field public static final create_channel_error:I = 0x7f1204f5
+.field public static final create_category:I = 0x7f1204f5
 
-.field public static final create_channel_in_category:I = 0x7f1204f6
+.field public static final create_channel:I = 0x7f1204f6
 
-.field public static final create_dm:I = 0x7f1204f7
+.field public static final create_channel_error:I = 0x7f1204f7
 
-.field public static final create_group_dm:I = 0x7f1204f8
+.field public static final create_channel_in_category:I = 0x7f1204f8
 
-.field public static final create_guild_description:I = 0x7f1204f9
+.field public static final create_dm:I = 0x7f1204f9
 
-.field public static final create_guild_with_templates_title:I = 0x7f1204fa
+.field public static final create_group_dm:I = 0x7f1204fa
 
-.field public static final create_instant_invite:I = 0x7f1204fb
+.field public static final create_guild_description:I = 0x7f1204fb
 
-.field public static final create_link:I = 0x7f1204fc
+.field public static final create_guild_with_templates_title:I = 0x7f1204fc
 
-.field public static final create_news_channel:I = 0x7f1204fd
+.field public static final create_instant_invite:I = 0x7f1204fd
 
-.field public static final create_or_join_modal_header:I = 0x7f1204fe
+.field public static final create_link:I = 0x7f1204fe
 
-.field public static final create_server_button_action:I = 0x7f1204ff
+.field public static final create_news_channel:I = 0x7f1204ff
 
-.field public static final create_server_button_body:I = 0x7f120500
+.field public static final create_or_join_modal_header:I = 0x7f120500
 
-.field public static final create_server_button_cta:I = 0x7f120501
+.field public static final create_server_button_action:I = 0x7f120501
 
-.field public static final create_server_button_cta_mobile:I = 0x7f120502
+.field public static final create_server_button_body:I = 0x7f120502
 
-.field public static final create_server_button_cta_mobile_desc:I = 0x7f120503
+.field public static final create_server_button_cta:I = 0x7f120503
 
-.field public static final create_server_default_server_name_format:I = 0x7f120504
+.field public static final create_server_button_cta_mobile:I = 0x7f120504
 
-.field public static final create_server_description_mobile:I = 0x7f120505
+.field public static final create_server_button_cta_mobile_desc:I = 0x7f120505
 
-.field public static final create_server_description_mobile_refresh:I = 0x7f120506
+.field public static final create_server_default_server_name_format:I = 0x7f120506
 
-.field public static final create_server_description_refresh:I = 0x7f120507
+.field public static final create_server_description_mobile:I = 0x7f120507
 
-.field public static final create_server_guidelines:I = 0x7f120508
+.field public static final create_server_description_mobile_refresh:I = 0x7f120508
 
-.field public static final create_server_title:I = 0x7f120509
+.field public static final create_server_description_refresh:I = 0x7f120509
 
-.field public static final create_server_title_mobile_refresh:I = 0x7f12050a
+.field public static final create_server_guidelines:I = 0x7f12050a
 
-.field public static final create_store_channel:I = 0x7f12050b
+.field public static final create_server_title:I = 0x7f12050b
 
-.field public static final create_store_channel_application:I = 0x7f12050c
+.field public static final create_server_title_mobile_refresh:I = 0x7f12050c
 
-.field public static final create_store_channel_beta_note:I = 0x7f12050d
+.field public static final create_store_channel:I = 0x7f12050d
 
-.field public static final create_store_channel_beta_title:I = 0x7f12050e
+.field public static final create_store_channel_application:I = 0x7f12050e
 
-.field public static final create_store_channel_branch:I = 0x7f12050f
+.field public static final create_store_channel_beta_note:I = 0x7f12050f
 
-.field public static final create_store_channel_no_skus:I = 0x7f120510
+.field public static final create_store_channel_beta_title:I = 0x7f120510
 
-.field public static final create_store_channel_no_skus_error:I = 0x7f120511
+.field public static final create_store_channel_branch:I = 0x7f120511
 
-.field public static final create_store_channel_select_application:I = 0x7f120512
+.field public static final create_store_channel_no_skus:I = 0x7f120512
 
-.field public static final create_store_channel_select_branch:I = 0x7f120513
+.field public static final create_store_channel_no_skus_error:I = 0x7f120513
 
-.field public static final create_store_channel_select_sku:I = 0x7f120514
+.field public static final create_store_channel_select_application:I = 0x7f120514
 
-.field public static final create_store_channel_sku:I = 0x7f120515
+.field public static final create_store_channel_select_branch:I = 0x7f120515
 
-.field public static final create_text_channel:I = 0x7f120516
+.field public static final create_store_channel_select_sku:I = 0x7f120516
 
-.field public static final create_voice_channel:I = 0x7f120517
+.field public static final create_store_channel_sku:I = 0x7f120517
 
-.field public static final credit_card_cvc:I = 0x7f120518
+.field public static final create_text_channel:I = 0x7f120518
 
-.field public static final credit_card_error_expiration:I = 0x7f120519
+.field public static final create_voice_channel:I = 0x7f120519
 
-.field public static final credit_card_error_number:I = 0x7f12051a
+.field public static final credit_card_cvc:I = 0x7f12051a
 
-.field public static final credit_card_error_required:I = 0x7f12051b
+.field public static final credit_card_error_expiration:I = 0x7f12051b
 
-.field public static final credit_card_error_security_code:I = 0x7f12051c
+.field public static final credit_card_error_number:I = 0x7f12051c
 
-.field public static final credit_card_expiration_date:I = 0x7f12051d
+.field public static final credit_card_error_required:I = 0x7f12051d
 
-.field public static final credit_card_name:I = 0x7f12051e
+.field public static final credit_card_error_security_code:I = 0x7f12051e
 
-.field public static final credit_card_name_on_card:I = 0x7f12051f
+.field public static final credit_card_expiration_date:I = 0x7f12051f
 
-.field public static final credit_card_number:I = 0x7f120520
+.field public static final credit_card_name:I = 0x7f120520
 
-.field public static final credit_card_security_code:I = 0x7f120521
+.field public static final credit_card_name_on_card:I = 0x7f120521
 
-.field public static final crop:I = 0x7f120522
+.field public static final credit_card_number:I = 0x7f120522
 
-.field public static final cs:I = 0x7f120523
+.field public static final credit_card_security_code:I = 0x7f120523
 
-.field public static final custom_color:I = 0x7f120524
+.field public static final crop:I = 0x7f120524
 
-.field public static final custom_status:I = 0x7f120525
+.field public static final cs:I = 0x7f120525
 
-.field public static final custom_status_clear_after:I = 0x7f120526
+.field public static final custom_color:I = 0x7f120526
 
-.field public static final custom_status_clear_custom_status:I = 0x7f120527
+.field public static final custom_status:I = 0x7f120527
 
-.field public static final custom_status_clear_in_hours:I = 0x7f120528
+.field public static final custom_status_clear_after:I = 0x7f120528
 
-.field public static final custom_status_clear_in_minutes:I = 0x7f120529
+.field public static final custom_status_clear_custom_status:I = 0x7f120529
 
-.field public static final custom_status_clear_tomorrow:I = 0x7f12052a
+.field public static final custom_status_clear_in_hours:I = 0x7f12052a
 
-.field public static final custom_status_dont_clear:I = 0x7f12052b
+.field public static final custom_status_clear_in_minutes:I = 0x7f12052b
 
-.field public static final custom_status_edit_custom_status_placeholder:I = 0x7f12052c
+.field public static final custom_status_clear_tomorrow:I = 0x7f12052c
 
-.field public static final custom_status_hours:I = 0x7f12052d
+.field public static final custom_status_dont_clear:I = 0x7f12052d
 
-.field public static final custom_status_minutes:I = 0x7f12052e
+.field public static final custom_status_edit_custom_status_placeholder:I = 0x7f12052e
 
-.field public static final custom_status_modal_body:I = 0x7f12052f
+.field public static final custom_status_hours:I = 0x7f12052f
 
-.field public static final custom_status_modal_placeholder:I = 0x7f120530
+.field public static final custom_status_minutes:I = 0x7f120530
 
-.field public static final custom_status_set_custom_status:I = 0x7f120531
+.field public static final custom_status_modal_body:I = 0x7f120531
 
-.field public static final custom_status_today:I = 0x7f120532
+.field public static final custom_status_modal_placeholder:I = 0x7f120532
 
-.field public static final custom_status_update_success:I = 0x7f120533
+.field public static final custom_status_set_custom_status:I = 0x7f120533
 
-.field public static final custom_tabs_mobile_body:I = 0x7f120534
+.field public static final custom_status_today:I = 0x7f120534
 
-.field public static final custom_tabs_mobile_header:I = 0x7f120535
+.field public static final custom_status_update_success:I = 0x7f120535
 
-.field public static final customize_group:I = 0x7f120536
+.field public static final custom_tabs_mobile_body:I = 0x7f120536
 
-.field public static final cut:I = 0x7f120537
+.field public static final custom_tabs_mobile_header:I = 0x7f120537
 
-.field public static final da:I = 0x7f120538
+.field public static final customize_group:I = 0x7f120538
 
-.field public static final dark_blue:I = 0x7f120539
+.field public static final cut:I = 0x7f120539
 
-.field public static final dark_grey:I = 0x7f12053a
+.field public static final da:I = 0x7f12053a
 
-.field public static final dark_purple:I = 0x7f12053b
+.field public static final dark_blue:I = 0x7f12053b
 
-.field public static final dark_teal:I = 0x7f12053c
+.field public static final dark_grey:I = 0x7f12053c
 
-.field public static final data_download_requested_status_note:I = 0x7f12053d
+.field public static final dark_purple:I = 0x7f12053d
 
-.field public static final data_privacy_controls:I = 0x7f12053e
+.field public static final dark_teal:I = 0x7f12053e
 
-.field public static final data_privacy_controls_allow_accessibility_detection_note:I = 0x7f12053f
+.field public static final data_download_requested_status_note:I = 0x7f12053f
 
-.field public static final data_privacy_controls_allow_accessibility_detection_title:I = 0x7f120540
+.field public static final data_privacy_controls:I = 0x7f120540
 
-.field public static final data_privacy_controls_basic_service_note:I = 0x7f120541
+.field public static final data_privacy_controls_allow_accessibility_detection_note:I = 0x7f120541
 
-.field public static final data_privacy_controls_basic_service_title:I = 0x7f120542
+.field public static final data_privacy_controls_allow_accessibility_detection_title:I = 0x7f120542
 
-.field public static final data_privacy_controls_personal_data_title:I = 0x7f120543
+.field public static final data_privacy_controls_basic_service_note:I = 0x7f120543
 
-.field public static final data_privacy_controls_personalization_note_learn_more:I = 0x7f120544
+.field public static final data_privacy_controls_basic_service_title:I = 0x7f120544
 
-.field public static final data_privacy_controls_personalization_title:I = 0x7f120545
+.field public static final data_privacy_controls_personal_data_title:I = 0x7f120545
 
-.field public static final data_privacy_controls_request_data_download:I = 0x7f120546
+.field public static final data_privacy_controls_personalization_note_learn_more:I = 0x7f120546
 
-.field public static final data_privacy_controls_request_data_failure_body:I = 0x7f120547
+.field public static final data_privacy_controls_personalization_title:I = 0x7f120547
 
-.field public static final data_privacy_controls_request_data_failure_title:I = 0x7f120548
+.field public static final data_privacy_controls_request_data_download:I = 0x7f120548
 
-.field public static final data_privacy_controls_request_data_modal_cancel:I = 0x7f120549
+.field public static final data_privacy_controls_request_data_failure_body:I = 0x7f120549
 
-.field public static final data_privacy_controls_request_data_modal_confirm:I = 0x7f12054a
+.field public static final data_privacy_controls_request_data_failure_title:I = 0x7f12054a
 
-.field public static final data_privacy_controls_request_data_modal_note:I = 0x7f12054b
+.field public static final data_privacy_controls_request_data_modal_cancel:I = 0x7f12054b
 
-.field public static final data_privacy_controls_request_data_modal_success:I = 0x7f12054c
+.field public static final data_privacy_controls_request_data_modal_confirm:I = 0x7f12054c
 
-.field public static final data_privacy_controls_request_data_modal_title:I = 0x7f12054d
+.field public static final data_privacy_controls_request_data_modal_note:I = 0x7f12054d
 
-.field public static final data_privacy_controls_request_data_note:I = 0x7f12054e
+.field public static final data_privacy_controls_request_data_modal_success:I = 0x7f12054e
 
-.field public static final data_privacy_controls_request_data_success_body:I = 0x7f12054f
+.field public static final data_privacy_controls_request_data_modal_title:I = 0x7f12054f
 
-.field public static final data_privacy_controls_request_data_success_title:I = 0x7f120550
+.field public static final data_privacy_controls_request_data_note:I = 0x7f120550
 
-.field public static final data_privacy_controls_request_data_tooltip:I = 0x7f120551
+.field public static final data_privacy_controls_request_data_success_body:I = 0x7f120551
 
-.field public static final data_privacy_controls_usage_statistics_note:I = 0x7f120552
+.field public static final data_privacy_controls_request_data_success_title:I = 0x7f120552
 
-.field public static final data_privacy_controls_usage_statistics_title:I = 0x7f120553
+.field public static final data_privacy_controls_request_data_tooltip:I = 0x7f120553
 
-.field public static final data_privacy_rate_limit_title:I = 0x7f120554
+.field public static final data_privacy_controls_usage_statistics_note:I = 0x7f120554
 
-.field public static final data_privacy_update_consents_failed:I = 0x7f120555
+.field public static final data_privacy_controls_usage_statistics_title:I = 0x7f120555
 
-.field public static final date:I = 0x7f120556
+.field public static final data_privacy_rate_limit_title:I = 0x7f120556
 
-.field public static final de:I = 0x7f120557
+.field public static final data_privacy_update_consents_failed:I = 0x7f120557
 
-.field public static final deafen:I = 0x7f120558
+.field public static final date:I = 0x7f120558
 
-.field public static final deafen_members:I = 0x7f120559
+.field public static final de:I = 0x7f120559
 
-.field public static final deauthorize:I = 0x7f12055a
+.field public static final deafen:I = 0x7f12055a
 
-.field public static final deauthorize_app:I = 0x7f12055b
+.field public static final deafen_members:I = 0x7f12055b
 
-.field public static final deb:I = 0x7f12055c
+.field public static final deauthorize:I = 0x7f12055c
 
-.field public static final debug:I = 0x7f12055d
+.field public static final deauthorize_app:I = 0x7f12055d
 
-.field public static final decline:I = 0x7f12055e
+.field public static final deb:I = 0x7f12055e
 
-.field public static final default_app_description:I = 0x7f12055f
+.field public static final debug:I = 0x7f12055f
 
-.field public static final default_failure_to_perform_action_message:I = 0x7f120560
+.field public static final decline:I = 0x7f120560
 
-.field public static final default_input_placeholder:I = 0x7f120561
+.field public static final default_app_description:I = 0x7f120561
 
-.field public static final delete:I = 0x7f120563
+.field public static final default_failure_to_perform_action_message:I = 0x7f120562
 
-.field public static final delete_account:I = 0x7f120564
+.field public static final default_input_placeholder:I = 0x7f120563
 
-.field public static final delete_account_body:I = 0x7f120565
+.field public static final delete:I = 0x7f120565
 
-.field public static final delete_account_error:I = 0x7f120566
+.field public static final delete_account:I = 0x7f120566
 
-.field public static final delete_account_transfer_ownership:I = 0x7f120567
+.field public static final delete_account_body:I = 0x7f120567
 
-.field public static final delete_account_transfer_ownership_body:I = 0x7f120568
+.field public static final delete_account_error:I = 0x7f120568
 
-.field public static final delete_app_confirm_msg:I = 0x7f120569
+.field public static final delete_account_transfer_ownership:I = 0x7f120569
 
-.field public static final delete_category:I = 0x7f12056a
+.field public static final delete_account_transfer_ownership_body:I = 0x7f12056a
 
-.field public static final delete_channel:I = 0x7f12056b
+.field public static final delete_app_confirm_msg:I = 0x7f12056b
 
-.field public static final delete_channel_body:I = 0x7f12056c
+.field public static final delete_category:I = 0x7f12056c
 
-.field public static final delete_followed_news_body:I = 0x7f12056d
+.field public static final delete_channel:I = 0x7f12056d
 
-.field public static final delete_message:I = 0x7f12056e
+.field public static final delete_channel_body:I = 0x7f12056e
 
-.field public static final delete_message_body:I = 0x7f12056f
+.field public static final delete_followed_news_body:I = 0x7f12056f
 
-.field public static final delete_message_context_menu_hint:I = 0x7f120570
+.field public static final delete_message:I = 0x7f120570
 
-.field public static final delete_message_history_option_24hr:I = 0x7f120571
+.field public static final delete_message_body:I = 0x7f120571
 
-.field public static final delete_message_history_option_7d:I = 0x7f120572
+.field public static final delete_message_context_menu_hint:I = 0x7f120572
 
-.field public static final delete_message_history_option_none:I = 0x7f120573
+.field public static final delete_message_history_option_24hr:I = 0x7f120573
 
-.field public static final delete_message_report:I = 0x7f120574
+.field public static final delete_message_history_option_7d:I = 0x7f120574
 
-.field public static final delete_message_title:I = 0x7f120575
+.field public static final delete_message_history_option_none:I = 0x7f120575
 
-.field public static final delete_role:I = 0x7f120576
+.field public static final delete_message_report:I = 0x7f120576
 
-.field public static final delete_role_mobile:I = 0x7f120577
+.field public static final delete_message_title:I = 0x7f120577
 
-.field public static final delete_rules_channel_body:I = 0x7f120578
+.field public static final delete_role:I = 0x7f120578
 
-.field public static final delete_server:I = 0x7f120579
+.field public static final delete_role_mobile:I = 0x7f120579
 
-.field public static final delete_server_body:I = 0x7f12057a
+.field public static final delete_rules_channel_body:I = 0x7f12057a
 
-.field public static final delete_server_enter_name:I = 0x7f12057b
+.field public static final delete_server:I = 0x7f12057b
 
-.field public static final delete_server_incorrect_name:I = 0x7f12057c
+.field public static final delete_server_body:I = 0x7f12057c
 
-.field public static final delete_server_title:I = 0x7f12057d
+.field public static final delete_server_enter_name:I = 0x7f12057d
 
-.field public static final delete_updates_channel_body:I = 0x7f12057e
+.field public static final delete_server_incorrect_name:I = 0x7f12057e
 
-.field public static final description:I = 0x7f12057f
+.field public static final delete_server_title:I = 0x7f12057f
 
-.field public static final designate_other_channel:I = 0x7f120580
+.field public static final delete_updates_channel_body:I = 0x7f120580
 
-.field public static final desktop_app:I = 0x7f120581
+.field public static final description:I = 0x7f120581
 
-.field public static final desktop_notifications_enable:I = 0x7f120582
+.field public static final designate_other_channel:I = 0x7f120582
 
-.field public static final desktop_notifications_enable_body:I = 0x7f120583
+.field public static final desktop_app:I = 0x7f120583
 
-.field public static final detect_platform_accounts:I = 0x7f120584
+.field public static final desktop_notifications_enable:I = 0x7f120584
 
-.field public static final developer_application_test_mode:I = 0x7f120585
+.field public static final desktop_notifications_enable_body:I = 0x7f120585
 
-.field public static final developer_application_test_mode_activate:I = 0x7f120586
+.field public static final detect_platform_accounts:I = 0x7f120586
 
-.field public static final developer_application_test_mode_authorization_error:I = 0x7f120587
+.field public static final developer_application_test_mode:I = 0x7f120587
 
-.field public static final developer_application_test_mode_clear:I = 0x7f120588
+.field public static final developer_application_test_mode_activate:I = 0x7f120588
 
-.field public static final developer_application_test_mode_invalid:I = 0x7f120589
+.field public static final developer_application_test_mode_authorization_error:I = 0x7f120589
 
-.field public static final developer_application_test_mode_modal_body:I = 0x7f12058a
+.field public static final developer_application_test_mode_clear:I = 0x7f12058a
 
-.field public static final developer_application_test_mode_modal_header:I = 0x7f12058b
+.field public static final developer_application_test_mode_invalid:I = 0x7f12058b
 
-.field public static final developer_application_test_mode_note:I = 0x7f12058c
+.field public static final developer_application_test_mode_modal_body:I = 0x7f12058c
 
-.field public static final developer_application_test_mode_placeholder:I = 0x7f12058d
+.field public static final developer_application_test_mode_modal_header:I = 0x7f12058d
 
-.field public static final developer_mode:I = 0x7f12058e
+.field public static final developer_application_test_mode_note:I = 0x7f12058e
 
-.field public static final developer_mode_help_text:I = 0x7f12058f
+.field public static final developer_application_test_mode_placeholder:I = 0x7f12058f
 
-.field public static final developer_options:I = 0x7f120590
+.field public static final developer_mode:I = 0x7f120590
 
-.field public static final device_settings:I = 0x7f120591
+.field public static final developer_mode_help_text:I = 0x7f120591
 
-.field public static final direct_message:I = 0x7f120592
+.field public static final developer_options:I = 0x7f120592
 
-.field public static final direct_message_a11y_label:I = 0x7f120593
+.field public static final device_settings:I = 0x7f120593
 
-.field public static final direct_message_a11y_label_with_unreads:I = 0x7f120594
+.field public static final direct_message:I = 0x7f120594
 
-.field public static final direct_messages:I = 0x7f120595
+.field public static final direct_message_a11y_label:I = 0x7f120595
 
-.field public static final disable:I = 0x7f120596
+.field public static final direct_message_a11y_label_with_unreads:I = 0x7f120596
 
-.field public static final disable_account:I = 0x7f120597
+.field public static final direct_messages:I = 0x7f120597
 
-.field public static final disable_account_body:I = 0x7f120598
+.field public static final disable:I = 0x7f120598
 
-.field public static final disable_email_notifications:I = 0x7f120599
+.field public static final disable_account:I = 0x7f120599
 
-.field public static final disable_integration_title:I = 0x7f12059a
+.field public static final disable_account_body:I = 0x7f12059a
 
-.field public static final disable_integration_twitch_body:I = 0x7f12059b
+.field public static final disable_email_notifications:I = 0x7f12059b
 
-.field public static final disable_integration_youtube_body:I = 0x7f12059c
+.field public static final disable_integration_title:I = 0x7f12059c
 
-.field public static final disable_noise_cancellation:I = 0x7f12059d
+.field public static final disable_integration_twitch_body:I = 0x7f12059d
 
-.field public static final disable_notifications_description:I = 0x7f12059e
+.field public static final disable_integration_youtube_body:I = 0x7f12059e
 
-.field public static final disable_notifications_label:I = 0x7f12059f
+.field public static final disable_noise_cancellation:I = 0x7f12059f
 
-.field public static final disable_sounds_description:I = 0x7f1205a0
+.field public static final disable_notifications_description:I = 0x7f1205a0
 
-.field public static final disable_sounds_label:I = 0x7f1205a1
+.field public static final disable_notifications_label:I = 0x7f1205a1
 
-.field public static final disable_video:I = 0x7f1205a2
+.field public static final disable_sounds_description:I = 0x7f1205a2
 
-.field public static final discard_changes:I = 0x7f1205a3
+.field public static final disable_sounds_label:I = 0x7f1205a3
 
-.field public static final discard_changes_description:I = 0x7f1205a4
+.field public static final disable_video:I = 0x7f1205a4
 
-.field public static final discodo_disabled:I = 0x7f1205a5
+.field public static final discard_changes:I = 0x7f1205a5
 
-.field public static final discodo_enabled:I = 0x7f1205a6
+.field public static final discard_changes_description:I = 0x7f1205a6
 
-.field public static final disconnect:I = 0x7f1205a7
+.field public static final discodo_disabled:I = 0x7f1205a7
 
-.field public static final disconnect_account:I = 0x7f1205a8
+.field public static final discodo_enabled:I = 0x7f1205a8
 
-.field public static final disconnect_account_body:I = 0x7f1205a9
+.field public static final disconnect:I = 0x7f1205a9
 
-.field public static final disconnect_account_title:I = 0x7f1205aa
+.field public static final disconnect_account:I = 0x7f1205aa
 
-.field public static final disconnect_from_voice:I = 0x7f1205ab
+.field public static final disconnect_account_body:I = 0x7f1205ab
 
-.field public static final disconnect_user_success:I = 0x7f1205ac
+.field public static final disconnect_account_title:I = 0x7f1205ac
 
-.field public static final discord:I = 0x7f1205ad
+.field public static final disconnect_from_voice:I = 0x7f1205ad
 
-.field public static final discord_desc_long:I = 0x7f1205ae
+.field public static final disconnect_user_success:I = 0x7f1205ae
 
-.field public static final discord_desc_short:I = 0x7f1205af
+.field public static final discord:I = 0x7f1205af
 
-.field public static final discord_gg:I = 0x7f1205b0
+.field public static final discord_desc_long:I = 0x7f1205b0
 
-.field public static final discord_name:I = 0x7f1205b1
+.field public static final discord_desc_short:I = 0x7f1205b1
 
-.field public static final discord_rich_presence:I = 0x7f1205b2
+.field public static final discord_gg:I = 0x7f1205b2
 
-.field public static final discover:I = 0x7f1205b3
+.field public static final discord_name:I = 0x7f1205b3
 
-.field public static final discovery:I = 0x7f1205b4
+.field public static final discord_rich_presence:I = 0x7f1205b4
 
-.field public static final dismiss:I = 0x7f1205b5
+.field public static final discover:I = 0x7f1205b5
 
-.field public static final dispatch_error_modal_body:I = 0x7f1205b6
+.field public static final discovery:I = 0x7f1205b6
 
-.field public static final dispatch_error_modal_description:I = 0x7f1205b7
+.field public static final dismiss:I = 0x7f1205b7
 
-.field public static final dispatch_error_modal_error_label:I = 0x7f1205b8
+.field public static final dispatch_error_modal_body:I = 0x7f1205b8
 
-.field public static final dispatch_error_modal_header:I = 0x7f1205b9
+.field public static final dispatch_error_modal_description:I = 0x7f1205b9
 
-.field public static final dispatch_error_modal_open_ticket:I = 0x7f1205ba
+.field public static final dispatch_error_modal_error_label:I = 0x7f1205ba
 
-.field public static final dispatch_game_launch_failed_launch_target_not_found:I = 0x7f1205bb
+.field public static final dispatch_error_modal_header:I = 0x7f1205bb
 
-.field public static final display_activity:I = 0x7f1205bc
+.field public static final dispatch_error_modal_open_ticket:I = 0x7f1205bc
 
-.field public static final display_on_profile:I = 0x7f1205bd
+.field public static final dispatch_game_launch_failed_launch_target_not_found:I = 0x7f1205bd
 
-.field public static final display_option_always:I = 0x7f1205be
+.field public static final display_activity:I = 0x7f1205be
 
-.field public static final display_option_never:I = 0x7f1205bf
+.field public static final display_on_profile:I = 0x7f1205bf
 
-.field public static final display_option_only_while_speaking:I = 0x7f1205c0
+.field public static final display_option_always:I = 0x7f1205c0
 
-.field public static final display_silence_warning:I = 0x7f1205c1
+.field public static final display_option_never:I = 0x7f1205c1
 
-.field public static final dm:I = 0x7f1205c2
+.field public static final display_option_only_while_speaking:I = 0x7f1205c2
 
-.field public static final dm_search_placeholder:I = 0x7f1205c3
+.field public static final display_silence_warning:I = 0x7f1205c3
 
-.field public static final dm_tooltip_a11y_label:I = 0x7f1205c4
+.field public static final dm:I = 0x7f1205c4
 
-.field public static final dm_verification_text_blocked:I = 0x7f1205c5
+.field public static final dm_search_placeholder:I = 0x7f1205c5
 
-.field public static final done:I = 0x7f1205c6
+.field public static final dm_tooltip_a11y_label:I = 0x7f1205c6
 
-.field public static final dont_show_again:I = 0x7f1205c7
+.field public static final dm_verification_text_blocked:I = 0x7f1205c7
 
-.field public static final download:I = 0x7f1205c8
+.field public static final done:I = 0x7f1205c8
 
-.field public static final download_app:I = 0x7f1205c9
+.field public static final dont_show_again:I = 0x7f1205c9
 
-.field public static final download_apps:I = 0x7f1205ca
+.field public static final download:I = 0x7f1205ca
 
-.field public static final download_desktop_ptb_footer:I = 0x7f1205cb
+.field public static final download_app:I = 0x7f1205cb
 
-.field public static final download_desktop_stable_footer:I = 0x7f1205cc
+.field public static final download_apps:I = 0x7f1205cc
 
-.field public static final download_desktop_title:I = 0x7f1205cd
+.field public static final download_desktop_ptb_footer:I = 0x7f1205cd
 
-.field public static final download_failed:I = 0x7f1205ce
+.field public static final download_desktop_stable_footer:I = 0x7f1205ce
 
-.field public static final download_file_complete:I = 0x7f1205cf
+.field public static final download_desktop_title:I = 0x7f1205cf
 
-.field public static final download_mobile_title:I = 0x7f1205d0
+.field public static final download_failed:I = 0x7f1205d0
 
-.field public static final duration_days:I = 0x7f1205d1
+.field public static final download_file_complete:I = 0x7f1205d1
 
-.field public static final duration_hours:I = 0x7f1205d2
+.field public static final download_mobile_title:I = 0x7f1205d2
 
-.field public static final duration_hours_short:I = 0x7f1205d3
+.field public static final duration_days:I = 0x7f1205d3
 
-.field public static final duration_mins:I = 0x7f1205d4
+.field public static final duration_hours:I = 0x7f1205d4
 
-.field public static final duration_minutes:I = 0x7f1205d5
+.field public static final duration_hours_short:I = 0x7f1205d5
 
-.field public static final duration_minutes_short:I = 0x7f1205d6
+.field public static final duration_mins:I = 0x7f1205d6
 
-.field public static final duration_seconds:I = 0x7f1205d7
+.field public static final duration_minutes:I = 0x7f1205d7
 
-.field public static final duration_seconds_short:I = 0x7f1205d8
+.field public static final duration_minutes_short:I = 0x7f1205d8
 
-.field public static final early_supporter_tooltip:I = 0x7f1205d9
+.field public static final duration_seconds:I = 0x7f1205d9
 
-.field public static final echo_cancellation:I = 0x7f1205da
+.field public static final duration_seconds_short:I = 0x7f1205da
 
-.field public static final edit:I = 0x7f1205db
+.field public static final early_supporter_tooltip:I = 0x7f1205db
 
-.field public static final edit_category:I = 0x7f1205dc
+.field public static final echo_cancellation:I = 0x7f1205dc
 
-.field public static final edit_channel:I = 0x7f1205dd
+.field public static final edit:I = 0x7f1205dd
 
-.field public static final edit_followed_news_body:I = 0x7f1205de
+.field public static final edit_category:I = 0x7f1205de
 
-.field public static final edit_message:I = 0x7f1205df
+.field public static final edit_channel:I = 0x7f1205df
 
-.field public static final edit_note:I = 0x7f1205e0
+.field public static final edit_followed_news_body:I = 0x7f1205e0
 
-.field public static final edit_overview:I = 0x7f1205e1
+.field public static final edit_message:I = 0x7f1205e1
 
-.field public static final edit_roles:I = 0x7f1205e2
+.field public static final edit_note:I = 0x7f1205e2
 
-.field public static final edit_textarea_help:I = 0x7f1205e3
+.field public static final edit_overview:I = 0x7f1205e3
 
-.field public static final edit_user:I = 0x7f1205e4
+.field public static final edit_roles:I = 0x7f1205e4
 
-.field public static final editing_message:I = 0x7f1205e5
+.field public static final edit_textarea_help:I = 0x7f1205e5
 
-.field public static final editing_with_attachment_error:I = 0x7f1205e6
+.field public static final edit_user:I = 0x7f1205e6
 
-.field public static final el:I = 0x7f1205e7
+.field public static final editing_message:I = 0x7f1205e7
 
-.field public static final elevated_permissions_sound_body:I = 0x7f1205e8
+.field public static final editing_with_attachment_error:I = 0x7f1205e8
 
-.field public static final elevated_permissions_sound_no_sound_button:I = 0x7f1205e9
+.field public static final el:I = 0x7f1205e9
 
-.field public static final elevated_permissions_sound_request_access_button:I = 0x7f1205ea
+.field public static final elevated_permissions_sound_body:I = 0x7f1205ea
 
-.field public static final elevated_permissions_sound_title:I = 0x7f1205eb
+.field public static final elevated_permissions_sound_no_sound_button:I = 0x7f1205eb
 
-.field public static final email:I = 0x7f1205ec
+.field public static final elevated_permissions_sound_request_access_button:I = 0x7f1205ec
 
-.field public static final email_invalid:I = 0x7f1205ed
+.field public static final elevated_permissions_sound_title:I = 0x7f1205ed
 
-.field public static final email_required:I = 0x7f1205ee
+.field public static final email:I = 0x7f1205ee
 
-.field public static final email_verification_instructions_body:I = 0x7f1205ef
+.field public static final email_invalid:I = 0x7f1205ef
 
-.field public static final email_verification_instructions_header:I = 0x7f1205f0
+.field public static final email_required:I = 0x7f1205f0
 
-.field public static final embed_links:I = 0x7f1205f1
+.field public static final email_verification_instructions_body:I = 0x7f1205f1
 
-.field public static final emoji:I = 0x7f1205f2
+.field public static final email_verification_instructions_header:I = 0x7f1205f2
 
-.field public static final emoji_category_activity:I = 0x7f1205f3
+.field public static final embed_links:I = 0x7f1205f3
 
-.field public static final emoji_category_custom:I = 0x7f1205f4
+.field public static final emoji:I = 0x7f1205f4
 
-.field public static final emoji_category_flags:I = 0x7f1205f5
+.field public static final emoji_category_activity:I = 0x7f1205f5
 
-.field public static final emoji_category_food:I = 0x7f1205f6
+.field public static final emoji_category_custom:I = 0x7f1205f6
 
-.field public static final emoji_category_nature:I = 0x7f1205f7
+.field public static final emoji_category_flags:I = 0x7f1205f7
 
-.field public static final emoji_category_objects:I = 0x7f1205f8
+.field public static final emoji_category_food:I = 0x7f1205f8
 
-.field public static final emoji_category_people:I = 0x7f1205f9
+.field public static final emoji_category_nature:I = 0x7f1205f9
 
-.field public static final emoji_category_recent:I = 0x7f1205fa
+.field public static final emoji_category_objects:I = 0x7f1205fa
 
-.field public static final emoji_category_symbols:I = 0x7f1205fb
+.field public static final emoji_category_people:I = 0x7f1205fb
 
-.field public static final emoji_category_travel:I = 0x7f1205fc
+.field public static final emoji_category_recent:I = 0x7f1205fc
 
-.field public static final emoji_disabled_premium_tier_lost:I = 0x7f1205fd
+.field public static final emoji_category_symbols:I = 0x7f1205fd
 
-.field public static final emoji_from_guild:I = 0x7f1205fe
+.field public static final emoji_category_travel:I = 0x7f1205fe
 
-.field public static final emoji_keyboard_toggle:I = 0x7f1205ff
+.field public static final emoji_disabled_premium_tier_lost:I = 0x7f1205ff
 
-.field public static final emoji_matching:I = 0x7f120600
+.field public static final emoji_from_guild:I = 0x7f120600
 
-.field public static final emoji_modifier_dark_skin_tone:I = 0x7f120601
+.field public static final emoji_keyboard_toggle:I = 0x7f120601
 
-.field public static final emoji_modifier_light_skin_tone:I = 0x7f120602
+.field public static final emoji_matching:I = 0x7f120602
 
-.field public static final emoji_modifier_medium_dark_skin_tone:I = 0x7f120603
+.field public static final emoji_modifier_dark_skin_tone:I = 0x7f120603
 
-.field public static final emoji_modifier_medium_light_skin_tone:I = 0x7f120604
+.field public static final emoji_modifier_light_skin_tone:I = 0x7f120604
 
-.field public static final emoji_modifier_medium_skin_tone:I = 0x7f120605
+.field public static final emoji_modifier_medium_dark_skin_tone:I = 0x7f120605
 
-.field public static final emoji_modifier_none:I = 0x7f120606
+.field public static final emoji_modifier_medium_light_skin_tone:I = 0x7f120606
 
-.field public static final emoji_popout_current_guild_description:I = 0x7f120607
+.field public static final emoji_modifier_medium_skin_tone:I = 0x7f120607
 
-.field public static final emoji_popout_joined_guild_description:I = 0x7f120608
+.field public static final emoji_modifier_none:I = 0x7f120608
 
-.field public static final emoji_popout_joined_guild_emoji_description:I = 0x7f120609
+.field public static final emoji_popout_current_guild_description:I = 0x7f120609
 
-.field public static final emoji_popout_premium_cta:I = 0x7f12060a
+.field public static final emoji_popout_joined_guild_description:I = 0x7f12060a
 
-.field public static final emoji_popout_premium_current_guild_description:I = 0x7f12060b
+.field public static final emoji_popout_joined_guild_emoji_description:I = 0x7f12060b
 
-.field public static final emoji_popout_premium_joined_guild_description:I = 0x7f12060c
+.field public static final emoji_popout_premium_cta:I = 0x7f12060c
 
-.field public static final emoji_popout_premium_unjoined_discoverable_guild_description:I = 0x7f12060d
+.field public static final emoji_popout_premium_current_guild_description:I = 0x7f12060d
 
-.field public static final emoji_popout_premium_unjoined_private_guild_description:I = 0x7f12060e
+.field public static final emoji_popout_premium_joined_guild_description:I = 0x7f12060e
 
-.field public static final emoji_popout_private_server:I = 0x7f12060f
+.field public static final emoji_popout_premium_unjoined_discoverable_guild_description:I = 0x7f12060f
 
-.field public static final emoji_popout_public_server:I = 0x7f120610
+.field public static final emoji_popout_premium_unjoined_private_guild_description:I = 0x7f120610
 
-.field public static final emoji_popout_show_fewer:I = 0x7f120611
+.field public static final emoji_popout_private_server:I = 0x7f120611
 
-.field public static final emoji_popout_show_more_emojis:I = 0x7f120612
+.field public static final emoji_popout_public_server:I = 0x7f120612
 
-.field public static final emoji_popout_standard_emoji_description:I = 0x7f120613
+.field public static final emoji_popout_show_fewer:I = 0x7f120613
 
-.field public static final emoji_popout_unjoined_discoverable_guild_description:I = 0x7f120614
+.field public static final emoji_popout_show_more_emojis:I = 0x7f120614
 
-.field public static final emoji_popout_unjoined_guild_emoji_description:I = 0x7f120615
+.field public static final emoji_popout_standard_emoji_description:I = 0x7f120615
 
-.field public static final emoji_popout_unjoined_private_guild_description:I = 0x7f120616
+.field public static final emoji_popout_unjoined_discoverable_guild_description:I = 0x7f120616
 
-.field public static final emoji_section:I = 0x7f120617
+.field public static final emoji_popout_unjoined_guild_emoji_description:I = 0x7f120617
 
-.field public static final emoji_slots_available:I = 0x7f120618
+.field public static final emoji_popout_unjoined_private_guild_description:I = 0x7f120618
 
-.field public static final emoji_too_big:I = 0x7f120619
+.field public static final emoji_section:I = 0x7f120619
 
-.field public static final emoji_tooltip_click_cta:I = 0x7f12061a
+.field public static final emoji_slots_available:I = 0x7f12061a
 
-.field public static final emojis_title:I = 0x7f12061b
+.field public static final emoji_too_big:I = 0x7f12061b
 
-.field public static final en:I = 0x7f12061c
+.field public static final emoji_tooltip_click_cta:I = 0x7f12061c
 
-.field public static final en_gb:I = 0x7f12061d
+.field public static final emojis_title:I = 0x7f12061d
 
-.field public static final en_us:I = 0x7f12061e
+.field public static final en:I = 0x7f12061e
 
-.field public static final enable:I = 0x7f12061f
+.field public static final en_gb:I = 0x7f12061f
 
-.field public static final enable_community_button_text:I = 0x7f120620
+.field public static final en_us:I = 0x7f120620
 
-.field public static final enable_community_modal_content_filter_label:I = 0x7f120621
+.field public static final enable:I = 0x7f120621
 
-.field public static final enable_community_modal_content_filter_met:I = 0x7f120622
+.field public static final enable_community_button_text:I = 0x7f120622
 
-.field public static final enable_community_modal_default_notifications_label:I = 0x7f120623
+.field public static final enable_community_modal_content_filter_label:I = 0x7f120623
 
-.field public static final enable_community_modal_default_notifications_tooltip:I = 0x7f120624
+.field public static final enable_community_modal_content_filter_met:I = 0x7f120624
 
-.field public static final enable_community_modal_everyone_role_permission_label:I = 0x7f120625
+.field public static final enable_community_modal_default_notifications_label:I = 0x7f120625
 
-.field public static final enable_community_modal_everyone_role_permission_tooltip:I = 0x7f120626
+.field public static final enable_community_modal_default_notifications_tooltip:I = 0x7f120626
 
-.field public static final enable_community_modal_requirement_satisfied_tooltip:I = 0x7f120627
+.field public static final enable_community_modal_everyone_role_permission_label:I = 0x7f120627
 
-.field public static final enable_community_modal_step_1_body:I = 0x7f120628
+.field public static final enable_community_modal_everyone_role_permission_tooltip:I = 0x7f120628
 
-.field public static final enable_community_modal_step_1_header:I = 0x7f120629
+.field public static final enable_community_modal_requirement_satisfied_tooltip:I = 0x7f120629
 
-.field public static final enable_community_modal_step_1_title:I = 0x7f12062a
+.field public static final enable_community_modal_step_1_body:I = 0x7f12062a
 
-.field public static final enable_community_modal_step_2_body:I = 0x7f12062b
+.field public static final enable_community_modal_step_1_header:I = 0x7f12062b
 
-.field public static final enable_community_modal_step_2_header:I = 0x7f12062c
+.field public static final enable_community_modal_step_1_title:I = 0x7f12062c
 
-.field public static final enable_community_modal_step_2_title:I = 0x7f12062d
+.field public static final enable_community_modal_step_2_body:I = 0x7f12062d
 
-.field public static final enable_community_modal_step_3_body:I = 0x7f12062e
+.field public static final enable_community_modal_step_2_header:I = 0x7f12062e
 
-.field public static final enable_community_modal_step_3_header:I = 0x7f12062f
+.field public static final enable_community_modal_step_2_title:I = 0x7f12062f
 
-.field public static final enable_community_modal_step_3_title:I = 0x7f120630
+.field public static final enable_community_modal_step_3_body:I = 0x7f120630
 
-.field public static final enable_community_modal_step_header:I = 0x7f120631
+.field public static final enable_community_modal_step_3_header:I = 0x7f120631
 
-.field public static final enable_community_modal_title:I = 0x7f120632
+.field public static final enable_community_modal_step_3_title:I = 0x7f120632
 
-.field public static final enable_community_modal_verification_level_help:I = 0x7f120633
+.field public static final enable_community_modal_step_header:I = 0x7f120633
 
-.field public static final enable_community_modal_verification_level_label:I = 0x7f120634
+.field public static final enable_community_modal_title:I = 0x7f120634
 
-.field public static final enable_community_modal_verification_level_met:I = 0x7f120635
+.field public static final enable_community_modal_verification_level_help:I = 0x7f120635
 
-.field public static final enable_ingame_overlay:I = 0x7f120636
+.field public static final enable_community_modal_verification_level_label:I = 0x7f120636
 
-.field public static final enable_noise_cancellation:I = 0x7f120637
+.field public static final enable_community_modal_verification_level_met:I = 0x7f120637
 
-.field public static final enable_notifications:I = 0x7f120638
+.field public static final enable_ingame_overlay:I = 0x7f120638
 
-.field public static final enable_permission:I = 0x7f120639
+.field public static final enable_noise_cancellation:I = 0x7f120639
 
-.field public static final enable_privacy_access:I = 0x7f12063a
+.field public static final enable_notifications:I = 0x7f12063a
 
-.field public static final enable_public_modal_content_filter_help:I = 0x7f12063b
+.field public static final enable_permission:I = 0x7f12063b
 
-.field public static final enable_public_modal_create_channel:I = 0x7f12063c
+.field public static final enable_privacy_access:I = 0x7f12063c
 
-.field public static final enable_public_modal_rules_channel_help:I = 0x7f12063d
+.field public static final enable_public_modal_content_filter_help:I = 0x7f12063d
 
-.field public static final enable_public_modal_rules_channel_title:I = 0x7f12063e
+.field public static final enable_public_modal_create_channel:I = 0x7f12063e
 
-.field public static final enable_public_modal_verification_level_description:I = 0x7f12063f
+.field public static final enable_public_modal_rules_channel_help:I = 0x7f12063f
 
-.field public static final enable_streamer_mode_description:I = 0x7f120640
+.field public static final enable_public_modal_rules_channel_title:I = 0x7f120640
 
-.field public static final enable_streamer_mode_label:I = 0x7f120641
+.field public static final enable_public_modal_verification_level_description:I = 0x7f120641
 
-.field public static final enable_twitch_emoji_sync:I = 0x7f120642
+.field public static final enable_streamer_mode_description:I = 0x7f120642
 
-.field public static final enter_email_body:I = 0x7f120643
+.field public static final enable_streamer_mode_label:I = 0x7f120643
 
-.field public static final enter_new_topic:I = 0x7f120644
+.field public static final enable_twitch_emoji_sync:I = 0x7f120644
 
-.field public static final enter_phone_description:I = 0x7f120645
+.field public static final enter_email_body:I = 0x7f120645
 
-.field public static final enter_phone_description_note:I = 0x7f120646
+.field public static final enter_new_topic:I = 0x7f120646
 
-.field public static final enter_phone_title:I = 0x7f120647
+.field public static final enter_phone_description:I = 0x7f120647
 
-.field public static final error:I = 0x7f120648
+.field public static final enter_phone_description_note:I = 0x7f120648
 
-.field public static final error_copying_image:I = 0x7f120649
+.field public static final enter_phone_title:I = 0x7f120649
 
-.field public static final error_icon_content_description:I = 0x7f12064a
+.field public static final error:I = 0x7f12064a
 
-.field public static final error_saving_image:I = 0x7f12064b
+.field public static final error_copying_image:I = 0x7f12064b
 
-.field public static final errors_action_to_take:I = 0x7f12064c
+.field public static final error_icon_content_description:I = 0x7f12064c
 
-.field public static final errors_reload:I = 0x7f12064d
+.field public static final error_saving_image:I = 0x7f12064d
 
-.field public static final errors_restart_app:I = 0x7f12064e
+.field public static final errors_action_to_take:I = 0x7f12064e
 
-.field public static final errors_store_crash:I = 0x7f12064f
+.field public static final errors_reload:I = 0x7f12064f
 
-.field public static final errors_unexpected_crash:I = 0x7f120650
+.field public static final errors_restart_app:I = 0x7f120650
 
-.field public static final es_es:I = 0x7f120651
+.field public static final errors_store_crash:I = 0x7f120651
 
-.field public static final everyone_popout_body:I = 0x7f120652
+.field public static final errors_unexpected_crash:I = 0x7f120652
 
-.field public static final everyone_popout_enter:I = 0x7f120653
+.field public static final es_es:I = 0x7f120653
 
-.field public static final everyone_popout_esc:I = 0x7f120654
+.field public static final everyone_popout_body:I = 0x7f120654
 
-.field public static final everyone_popout_footer:I = 0x7f120655
+.field public static final everyone_popout_enter:I = 0x7f120655
 
-.field public static final everyone_popout_send_now:I = 0x7f120656
+.field public static final everyone_popout_esc:I = 0x7f120656
 
-.field public static final examples:I = 0x7f120657
+.field public static final everyone_popout_footer:I = 0x7f120657
 
-.field public static final exit_full_screen:I = 0x7f120658
+.field public static final everyone_popout_send_now:I = 0x7f120658
 
-.field public static final expand_button_title:I = 0x7f120681
+.field public static final examples:I = 0x7f120659
 
-.field public static final expand_buttons:I = 0x7f120682
+.field public static final exit_full_screen:I = 0x7f12065a
 
-.field public static final expanded:I = 0x7f120683
+.field public static final expand_button_title:I = 0x7f120683
 
-.field public static final experiment_mobile_only_user_header:I = 0x7f120684
+.field public static final expand_buttons:I = 0x7f120684
 
-.field public static final experiment_mobile_only_user_text1:I = 0x7f120685
+.field public static final expanded:I = 0x7f120685
 
-.field public static final experimental_encoders:I = 0x7f120686
+.field public static final experiment_mobile_only_user_header:I = 0x7f120686
 
-.field public static final expire_after:I = 0x7f120687
+.field public static final experiment_mobile_only_user_text1:I = 0x7f120687
 
-.field public static final expires_in:I = 0x7f120688
+.field public static final experimental_encoders:I = 0x7f120688
 
-.field public static final explicit_content_filter_disabled:I = 0x7f120689
+.field public static final expire_after:I = 0x7f120689
 
-.field public static final explicit_content_filter_disabled_description:I = 0x7f12068a
+.field public static final expires_in:I = 0x7f12068a
 
-.field public static final explicit_content_filter_high:I = 0x7f12068b
+.field public static final explicit_content_filter_disabled:I = 0x7f12068b
 
-.field public static final explicit_content_filter_high_description:I = 0x7f12068c
+.field public static final explicit_content_filter_disabled_description:I = 0x7f12068c
 
-.field public static final explicit_content_filter_medium:I = 0x7f12068d
+.field public static final explicit_content_filter_high:I = 0x7f12068d
 
-.field public static final explicit_content_filter_medium_description:I = 0x7f12068e
+.field public static final explicit_content_filter_high_description:I = 0x7f12068e
 
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068f
+.field public static final explicit_content_filter_medium:I = 0x7f12068f
 
-.field public static final expression_picker_emoji:I = 0x7f120690
+.field public static final explicit_content_filter_medium_description:I = 0x7f120690
 
-.field public static final expression_picker_gif:I = 0x7f120691
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f120691
 
-.field public static final expression_picker_intro_tooltip_action:I = 0x7f120692
+.field public static final expression_picker_emoji:I = 0x7f120692
 
-.field public static final expression_picker_intro_tooltip_body:I = 0x7f120693
+.field public static final expression_picker_gif:I = 0x7f120693
 
-.field public static final expression_picker_intro_tooltip_header:I = 0x7f120694
+.field public static final expression_picker_intro_tooltip_action:I = 0x7f120694
 
-.field public static final expression_picker_open_emoji_picker_a11y_label:I = 0x7f120695
+.field public static final expression_picker_intro_tooltip_body:I = 0x7f120695
 
-.field public static final expression_picker_open_gif_picker_a11y_label:I = 0x7f120696
+.field public static final expression_picker_intro_tooltip_header:I = 0x7f120696
 
-.field public static final extra_emoji_count:I = 0x7f120697
+.field public static final expression_picker_open_emoji_picker_a11y_label:I = 0x7f120697
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120698
+.field public static final expression_picker_open_gif_picker_a11y_label:I = 0x7f120698
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120699
+.field public static final extra_emoji_count:I = 0x7f120699
 
-.field public static final facebook:I = 0x7f12069a
+.field public static final fab_transformation_scrim_behavior:I = 0x7f12069a
 
-.field public static final failed:I = 0x7f12069b
+.field public static final fab_transformation_sheet_behavior:I = 0x7f12069b
 
-.field public static final fi:I = 0x7f1206a0
+.field public static final facebook:I = 0x7f12069c
 
-.field public static final file_rate_kb:I = 0x7f1206a1
+.field public static final failed:I = 0x7f12069d
 
-.field public static final file_rate_mb:I = 0x7f1206a2
+.field public static final fi:I = 0x7f1206a2
 
-.field public static final file_size_gb:I = 0x7f1206a3
+.field public static final file_rate_kb:I = 0x7f1206a3
 
-.field public static final file_size_mb:I = 0x7f1206a4
+.field public static final file_rate_mb:I = 0x7f1206a4
 
-.field public static final file_upload_limit_premium_tier_1:I = 0x7f1206a5
+.field public static final file_size_gb:I = 0x7f1206a5
 
-.field public static final file_upload_limit_premium_tier_2:I = 0x7f1206a6
+.field public static final file_size_mb:I = 0x7f1206a6
 
-.field public static final file_upload_limit_standard:I = 0x7f1206a7
+.field public static final file_upload_limit_premium_tier_1:I = 0x7f1206a7
 
-.field public static final files_permission_reason:I = 0x7f1206a8
+.field public static final file_upload_limit_premium_tier_2:I = 0x7f1206a8
 
-.field public static final filter:I = 0x7f1206a9
+.field public static final file_upload_limit_standard:I = 0x7f1206a9
 
-.field public static final filter_mentions:I = 0x7f1206aa
+.field public static final files_permission_reason:I = 0x7f1206aa
 
-.field public static final filter_options:I = 0x7f1206ab
+.field public static final filter:I = 0x7f1206ab
 
-.field public static final first_week_survey_button:I = 0x7f1206ad
+.field public static final filter_mentions:I = 0x7f1206ac
 
-.field public static final first_week_survey_prompt:I = 0x7f1206ae
+.field public static final filter_options:I = 0x7f1206ad
 
-.field public static final flash_auto:I = 0x7f1206af
+.field public static final first_week_survey_button:I = 0x7f1206af
 
-.field public static final flash_off:I = 0x7f1206b0
+.field public static final first_week_survey_prompt:I = 0x7f1206b0
 
-.field public static final flash_on:I = 0x7f1206b1
+.field public static final flash_auto:I = 0x7f1206b1
 
-.field public static final flash_torch:I = 0x7f1206b2
+.field public static final flash_off:I = 0x7f1206b2
 
-.field public static final focus_participant:I = 0x7f1206b3
+.field public static final flash_on:I = 0x7f1206b3
 
-.field public static final follow:I = 0x7f1206b4
+.field public static final flash_torch:I = 0x7f1206b4
 
-.field public static final follow_modal_body:I = 0x7f1206b5
+.field public static final focus_participant:I = 0x7f1206b5
 
-.field public static final follow_modal_fail:I = 0x7f1206b6
+.field public static final follow:I = 0x7f1206b6
 
-.field public static final follow_modal_hint:I = 0x7f1206b7
+.field public static final follow_modal_body:I = 0x7f1206b7
 
-.field public static final follow_modal_hint_no_perms:I = 0x7f1206b8
+.field public static final follow_modal_fail:I = 0x7f1206b8
 
-.field public static final follow_modal_title:I = 0x7f1206b9
+.field public static final follow_modal_hint:I = 0x7f1206b9
 
-.field public static final follow_modal_too_many_webhooks:I = 0x7f1206ba
+.field public static final follow_modal_hint_no_perms:I = 0x7f1206ba
 
-.field public static final follow_modal_warning:I = 0x7f1206bb
+.field public static final follow_modal_title:I = 0x7f1206bb
 
-.field public static final follow_news_chat_input_message:I = 0x7f1206bc
+.field public static final follow_modal_too_many_webhooks:I = 0x7f1206bc
 
-.field public static final follow_news_chat_input_subtitle:I = 0x7f1206bd
+.field public static final follow_modal_warning:I = 0x7f1206bd
 
-.field public static final follow_success_modal_body:I = 0x7f1206be
+.field public static final follow_news_chat_input_message:I = 0x7f1206be
 
-.field public static final follow_success_modal_header_01:I = 0x7f1206bf
+.field public static final follow_news_chat_input_subtitle:I = 0x7f1206bf
 
-.field public static final follow_success_modal_header_02:I = 0x7f1206c0
+.field public static final follow_success_modal_body:I = 0x7f1206c0
 
-.field public static final follow_success_modal_header_03:I = 0x7f1206c1
+.field public static final follow_success_modal_header_01:I = 0x7f1206c1
 
-.field public static final follow_success_modal_header_04:I = 0x7f1206c2
+.field public static final follow_success_modal_header_02:I = 0x7f1206c2
 
-.field public static final follow_success_modal_header_05:I = 0x7f1206c3
+.field public static final follow_success_modal_header_03:I = 0x7f1206c3
 
-.field public static final follow_success_modal_header_06:I = 0x7f1206c4
+.field public static final follow_success_modal_header_04:I = 0x7f1206c4
 
-.field public static final follow_success_modal_header_07:I = 0x7f1206c5
+.field public static final follow_success_modal_header_05:I = 0x7f1206c5
 
-.field public static final follow_success_modal_header_08:I = 0x7f1206c6
+.field public static final follow_success_modal_header_06:I = 0x7f1206c6
 
-.field public static final follow_success_modal_header_09:I = 0x7f1206c7
+.field public static final follow_success_modal_header_07:I = 0x7f1206c7
 
-.field public static final follow_success_modal_header_10:I = 0x7f1206c8
+.field public static final follow_success_modal_header_08:I = 0x7f1206c8
 
-.field public static final follow_us_for_more_updates:I = 0x7f1206c9
+.field public static final follow_success_modal_header_09:I = 0x7f1206c9
 
-.field public static final follower_analytics:I = 0x7f1206ca
+.field public static final follow_success_modal_header_10:I = 0x7f1206ca
 
-.field public static final follower_analytics_header:I = 0x7f1206cb
+.field public static final follow_us_for_more_updates:I = 0x7f1206cb
 
-.field public static final force_sync:I = 0x7f1206cc
+.field public static final follower_analytics:I = 0x7f1206cc
 
-.field public static final forgot_password:I = 0x7f1206cd
+.field public static final follower_analytics_header:I = 0x7f1206cd
 
-.field public static final forgot_password_body:I = 0x7f1206ce
+.field public static final force_sync:I = 0x7f1206ce
 
-.field public static final form_checkbox_aec_dump:I = 0x7f1206cf
+.field public static final forgot_password:I = 0x7f1206cf
 
-.field public static final form_checkbox_connection_log:I = 0x7f1206d0
+.field public static final forgot_password_body:I = 0x7f1206d0
 
-.field public static final form_checkbox_debug_logging:I = 0x7f1206d1
+.field public static final form_checkbox_aec_dump:I = 0x7f1206d1
 
-.field public static final form_checkbox_qos:I = 0x7f1206d2
+.field public static final form_checkbox_connection_log:I = 0x7f1206d2
 
-.field public static final form_description_audio_mode_android_call:I = 0x7f1206d3
+.field public static final form_checkbox_debug_logging:I = 0x7f1206d3
 
-.field public static final form_description_audio_mode_android_communication:I = 0x7f1206d4
+.field public static final form_checkbox_qos:I = 0x7f1206d4
 
-.field public static final form_description_mobile_guild_notification_all_messages:I = 0x7f1206d5
+.field public static final form_description_audio_mode_android_call:I = 0x7f1206d5
 
-.field public static final form_description_mobile_guild_notification_only_mentions:I = 0x7f1206d6
+.field public static final form_description_audio_mode_android_communication:I = 0x7f1206d6
 
-.field public static final form_description_mobile_notification_muted:I = 0x7f1206d7
+.field public static final form_description_mobile_guild_notification_all_messages:I = 0x7f1206d7
 
-.field public static final form_description_push_afk_timeout:I = 0x7f1206d8
+.field public static final form_description_mobile_guild_notification_only_mentions:I = 0x7f1206d8
 
-.field public static final form_description_tts:I = 0x7f1206d9
+.field public static final form_description_mobile_notification_muted:I = 0x7f1206d9
 
-.field public static final form_error_generic:I = 0x7f1206da
+.field public static final form_description_push_afk_timeout:I = 0x7f1206da
 
-.field public static final form_help_aec_dump:I = 0x7f1206db
+.field public static final form_description_tts:I = 0x7f1206db
 
-.field public static final form_help_afk_channel:I = 0x7f1206dc
+.field public static final form_error_generic:I = 0x7f1206dc
 
-.field public static final form_help_attenuation:I = 0x7f1206dd
+.field public static final form_help_aec_dump:I = 0x7f1206dd
 
-.field public static final form_help_automatic_vad:I = 0x7f1206de
+.field public static final form_help_afk_channel:I = 0x7f1206de
 
-.field public static final form_help_bitrate:I = 0x7f1206df
+.field public static final form_help_attenuation:I = 0x7f1206df
 
-.field public static final form_help_certified_voice_processing:I = 0x7f1206e0
+.field public static final form_help_automatic_vad:I = 0x7f1206e0
 
-.field public static final form_help_connection_log:I = 0x7f1206e1
+.field public static final form_help_bitrate:I = 0x7f1206e1
 
-.field public static final form_help_debug_logging:I = 0x7f1206e2
+.field public static final form_help_certified_voice_processing:I = 0x7f1206e2
 
-.field public static final form_help_default_notification_settings_mobile:I = 0x7f1206e3
+.field public static final form_help_connection_log:I = 0x7f1206e3
 
-.field public static final form_help_discoverable_change_time:I = 0x7f1206e4
+.field public static final form_help_debug_logging:I = 0x7f1206e4
 
-.field public static final form_help_discovery_cover_image:I = 0x7f1206e5
+.field public static final form_help_default_notification_settings_mobile:I = 0x7f1206e5
 
-.field public static final form_help_enable_discoverable:I = 0x7f1206e6
+.field public static final form_help_discoverable_change_time:I = 0x7f1206e6
 
-.field public static final form_help_explicit_content_filter:I = 0x7f1206e7
+.field public static final form_help_discovery_cover_image:I = 0x7f1206e7
 
-.field public static final form_help_hardware_h264:I = 0x7f1206e8
+.field public static final form_help_enable_discoverable:I = 0x7f1206e8
 
-.field public static final form_help_instant_invite_channel:I = 0x7f1206e9
+.field public static final form_help_explicit_content_filter:I = 0x7f1206e9
 
-.field public static final form_help_last_seen:I = 0x7f1206ea
+.field public static final form_help_hardware_h264:I = 0x7f1206ea
 
-.field public static final form_help_last_seen_with_roles:I = 0x7f1206eb
+.field public static final form_help_instant_invite_channel:I = 0x7f1206eb
 
-.field public static final form_help_news:I = 0x7f1206ec
+.field public static final form_help_last_seen:I = 0x7f1206ec
 
-.field public static final form_help_nsfw:I = 0x7f1206ed
+.field public static final form_help_last_seen_with_roles:I = 0x7f1206ed
 
-.field public static final form_help_open_h264:I = 0x7f1206ee
+.field public static final form_help_news:I = 0x7f1206ee
 
-.field public static final form_help_qos:I = 0x7f1206ef
+.field public static final form_help_nsfw:I = 0x7f1206ef
 
-.field public static final form_help_server_banner:I = 0x7f1206f0
+.field public static final form_help_open_h264:I = 0x7f1206f0
 
-.field public static final form_help_server_description:I = 0x7f1206f1
+.field public static final form_help_qos:I = 0x7f1206f1
 
-.field public static final form_help_server_language:I = 0x7f1206f2
+.field public static final form_help_server_banner:I = 0x7f1206f2
 
-.field public static final form_help_slowmode:I = 0x7f1206f3
+.field public static final form_help_server_description:I = 0x7f1206f3
 
-.field public static final form_help_system_channel:I = 0x7f1206f4
+.field public static final form_help_server_language:I = 0x7f1206f4
 
-.field public static final form_help_system_channel_join_messages:I = 0x7f1206f5
+.field public static final form_help_slowmode:I = 0x7f1206f5
 
-.field public static final form_help_system_channel_premium_subscription_messages:I = 0x7f1206f6
+.field public static final form_help_system_channel:I = 0x7f1206f6
 
-.field public static final form_help_temporary:I = 0x7f1206f7
+.field public static final form_help_system_channel_join_messages:I = 0x7f1206f7
 
-.field public static final form_help_user_limit:I = 0x7f1206f8
+.field public static final form_help_system_channel_premium_subscription_messages:I = 0x7f1206f8
 
-.field public static final form_help_verification_level:I = 0x7f1206f9
+.field public static final form_help_temporary:I = 0x7f1206f9
 
-.field public static final form_help_voice_video_troubleshooting_guide:I = 0x7f1206fa
+.field public static final form_help_user_limit:I = 0x7f1206fa
 
-.field public static final form_label_account_information:I = 0x7f1206fb
+.field public static final form_help_verification_level:I = 0x7f1206fb
 
-.field public static final form_label_afk_channel:I = 0x7f1206fc
+.field public static final form_help_voice_video_troubleshooting_guide:I = 0x7f1206fc
 
-.field public static final form_label_afk_timeout:I = 0x7f1206fd
+.field public static final form_label_account_information:I = 0x7f1206fd
 
-.field public static final form_label_all:I = 0x7f1206fe
+.field public static final form_label_afk_channel:I = 0x7f1206fe
 
-.field public static final form_label_all_messages:I = 0x7f1206ff
+.field public static final form_label_afk_timeout:I = 0x7f1206ff
 
-.field public static final form_label_all_messages_short:I = 0x7f120700
+.field public static final form_label_all:I = 0x7f120700
 
-.field public static final form_label_android_opensl:I = 0x7f120701
+.field public static final form_label_all_messages:I = 0x7f120701
 
-.field public static final form_label_android_opensl_default:I = 0x7f120702
+.field public static final form_label_all_messages_short:I = 0x7f120702
 
-.field public static final form_label_android_opensl_default_desc:I = 0x7f120703
+.field public static final form_label_android_opensl:I = 0x7f120703
 
-.field public static final form_label_android_opensl_desc:I = 0x7f120704
+.field public static final form_label_android_opensl_default:I = 0x7f120704
 
-.field public static final form_label_android_opensl_force_disabled:I = 0x7f120705
+.field public static final form_label_android_opensl_default_desc:I = 0x7f120705
 
-.field public static final form_label_android_opensl_force_disabled_desc:I = 0x7f120706
+.field public static final form_label_android_opensl_desc:I = 0x7f120706
 
-.field public static final form_label_android_opensl_force_enabled:I = 0x7f120707
+.field public static final form_label_android_opensl_force_disabled:I = 0x7f120707
 
-.field public static final form_label_android_opensl_force_enabled_desc:I = 0x7f120708
+.field public static final form_label_android_opensl_force_disabled_desc:I = 0x7f120708
 
-.field public static final form_label_attenuation:I = 0x7f120709
+.field public static final form_label_android_opensl_force_enabled:I = 0x7f120709
 
-.field public static final form_label_audio_mode_android:I = 0x7f12070a
+.field public static final form_label_android_opensl_force_enabled_desc:I = 0x7f12070a
 
-.field public static final form_label_audio_mode_android_call:I = 0x7f12070b
+.field public static final form_label_attenuation:I = 0x7f12070b
 
-.field public static final form_label_audio_mode_android_communication:I = 0x7f12070c
+.field public static final form_label_audio_mode_android:I = 0x7f12070c
 
-.field public static final form_label_automatic_vad:I = 0x7f12070d
+.field public static final form_label_audio_mode_android_call:I = 0x7f12070d
 
-.field public static final form_label_automatic_vad_mobile:I = 0x7f12070e
+.field public static final form_label_audio_mode_android_communication:I = 0x7f12070e
 
-.field public static final form_label_avatar_size:I = 0x7f12070f
+.field public static final form_label_automatic_vad:I = 0x7f12070f
 
-.field public static final form_label_bitrate:I = 0x7f120710
+.field public static final form_label_automatic_vad_mobile:I = 0x7f120710
 
-.field public static final form_label_category_permissions:I = 0x7f120711
+.field public static final form_label_avatar_size:I = 0x7f120711
 
-.field public static final form_label_channel_name:I = 0x7f120712
+.field public static final form_label_bitrate:I = 0x7f120712
 
-.field public static final form_label_channel_notifcation_settings:I = 0x7f120713
+.field public static final form_label_category_permissions:I = 0x7f120713
 
-.field public static final form_label_channel_permissions:I = 0x7f120714
+.field public static final form_label_channel_name:I = 0x7f120714
 
-.field public static final form_label_channel_topic:I = 0x7f120715
+.field public static final form_label_channel_notifcation_settings:I = 0x7f120715
 
-.field public static final form_label_channel_voice_permissions:I = 0x7f120716
+.field public static final form_label_channel_permissions:I = 0x7f120716
 
-.field public static final form_label_current_password:I = 0x7f120717
+.field public static final form_label_channel_topic:I = 0x7f120717
 
-.field public static final form_label_custom_twitch_emoticon:I = 0x7f120718
+.field public static final form_label_channel_voice_permissions:I = 0x7f120718
 
-.field public static final form_label_debug:I = 0x7f120719
+.field public static final form_label_current_password:I = 0x7f120719
 
-.field public static final form_label_default:I = 0x7f12071a
+.field public static final form_label_custom_twitch_emoticon:I = 0x7f12071a
 
-.field public static final form_label_default_notification_settings:I = 0x7f12071b
+.field public static final form_label_debug:I = 0x7f12071b
 
-.field public static final form_label_delete_message_history:I = 0x7f12071c
+.field public static final form_label_default:I = 0x7f12071c
 
-.field public static final form_label_desktop_only:I = 0x7f12071d
+.field public static final form_label_default_notification_settings:I = 0x7f12071d
 
-.field public static final form_label_disabled_for_everyone:I = 0x7f12071e
+.field public static final form_label_delete_message_history:I = 0x7f12071e
 
-.field public static final form_label_discovery_cover_image:I = 0x7f12071f
+.field public static final form_label_desktop_only:I = 0x7f12071f
 
-.field public static final form_label_discovery_rules_channel:I = 0x7f120720
+.field public static final form_label_disabled_for_everyone:I = 0x7f120720
 
-.field public static final form_label_display_names:I = 0x7f120721
+.field public static final form_label_discovery_cover_image:I = 0x7f120721
 
-.field public static final form_label_display_users:I = 0x7f120722
+.field public static final form_label_discovery_rules_channel:I = 0x7f120722
 
-.field public static final form_label_email:I = 0x7f120723
+.field public static final form_label_display_names:I = 0x7f120723
 
-.field public static final form_label_expire_grace_period:I = 0x7f120724
+.field public static final form_label_display_users:I = 0x7f120724
 
-.field public static final form_label_explicit_content_filter:I = 0x7f120725
+.field public static final form_label_email:I = 0x7f120725
 
-.field public static final form_label_hoist_description:I = 0x7f120726
+.field public static final form_label_expire_grace_period:I = 0x7f120726
 
-.field public static final form_label_input:I = 0x7f120727
+.field public static final form_label_explicit_content_filter:I = 0x7f120727
 
-.field public static final form_label_input_device:I = 0x7f120728
+.field public static final form_label_hoist_description:I = 0x7f120728
 
-.field public static final form_label_input_mode:I = 0x7f120729
+.field public static final form_label_input:I = 0x7f120729
 
-.field public static final form_label_input_sensitivty:I = 0x7f12072a
+.field public static final form_label_input_device:I = 0x7f12072a
 
-.field public static final form_label_input_volume:I = 0x7f12072b
+.field public static final form_label_input_mode:I = 0x7f12072b
 
-.field public static final form_label_instant_invite:I = 0x7f12072c
+.field public static final form_label_input_sensitivty:I = 0x7f12072c
 
-.field public static final form_label_instant_invite_channel:I = 0x7f12072d
+.field public static final form_label_input_volume:I = 0x7f12072d
 
-.field public static final form_label_invite_link:I = 0x7f12072e
+.field public static final form_label_instant_invite:I = 0x7f12072e
 
-.field public static final form_label_json_api:I = 0x7f12072f
+.field public static final form_label_instant_invite_channel:I = 0x7f12072f
 
-.field public static final form_label_last_seen:I = 0x7f120730
+.field public static final form_label_invite_link:I = 0x7f120730
 
-.field public static final form_label_max_age:I = 0x7f120731
+.field public static final form_label_json_api:I = 0x7f120731
 
-.field public static final form_label_max_uses:I = 0x7f120732
+.field public static final form_label_last_seen:I = 0x7f120732
 
-.field public static final form_label_member_add:I = 0x7f120733
+.field public static final form_label_max_age:I = 0x7f120733
 
-.field public static final form_label_membership_expire_behavior:I = 0x7f120734
+.field public static final form_label_max_uses:I = 0x7f120734
 
-.field public static final form_label_mentionable:I = 0x7f120735
+.field public static final form_label_member_add:I = 0x7f120735
 
-.field public static final form_label_mentionable_description:I = 0x7f120736
+.field public static final form_label_membership_expire_behavior:I = 0x7f120736
 
-.field public static final form_label_mentions:I = 0x7f120737
+.field public static final form_label_mentionable:I = 0x7f120737
 
-.field public static final form_label_mobile_category_muted:I = 0x7f120738
+.field public static final form_label_mentionable_description:I = 0x7f120738
 
-.field public static final form_label_mobile_category_muted_until:I = 0x7f120739
+.field public static final form_label_mentions:I = 0x7f120739
 
-.field public static final form_label_mobile_channel_muted:I = 0x7f12073a
+.field public static final form_label_mobile_category_muted:I = 0x7f12073a
 
-.field public static final form_label_mobile_channel_muted_until:I = 0x7f12073b
+.field public static final form_label_mobile_category_muted_until:I = 0x7f12073b
 
-.field public static final form_label_mobile_channel_override_guild_message_notification:I = 0x7f12073c
+.field public static final form_label_mobile_channel_muted:I = 0x7f12073c
 
-.field public static final form_label_mobile_channel_override_guild_muted:I = 0x7f12073d
+.field public static final form_label_mobile_channel_muted_until:I = 0x7f12073d
 
-.field public static final form_label_mobile_channel_override_mute:I = 0x7f12073e
+.field public static final form_label_mobile_channel_override_guild_message_notification:I = 0x7f12073e
 
-.field public static final form_label_mobile_dm_muted:I = 0x7f12073f
+.field public static final form_label_mobile_channel_override_guild_muted:I = 0x7f12073f
 
-.field public static final form_label_mobile_dm_muted_until:I = 0x7f120740
+.field public static final form_label_mobile_channel_override_mute:I = 0x7f120740
 
-.field public static final form_label_mobile_notifications_behavior:I = 0x7f120741
+.field public static final form_label_mobile_dm_muted:I = 0x7f120741
 
-.field public static final form_label_mobile_notifications_blink:I = 0x7f120742
+.field public static final form_label_mobile_dm_muted_until:I = 0x7f120742
 
-.field public static final form_label_mobile_notifications_call_desc:I = 0x7f120743
+.field public static final form_label_mobile_notifications_behavior:I = 0x7f120743
 
-.field public static final form_label_mobile_notifications_inapp_desc:I = 0x7f120744
+.field public static final form_label_mobile_notifications_blink:I = 0x7f120744
 
-.field public static final form_label_mobile_notifications_inapp_label:I = 0x7f120745
+.field public static final form_label_mobile_notifications_call_desc:I = 0x7f120745
 
-.field public static final form_label_mobile_notifications_label:I = 0x7f120746
+.field public static final form_label_mobile_notifications_inapp_desc:I = 0x7f120746
 
-.field public static final form_label_mobile_notifications_os_control_jump:I = 0x7f120747
+.field public static final form_label_mobile_notifications_inapp_label:I = 0x7f120747
 
-.field public static final form_label_mobile_notifications_os_control_jump_help:I = 0x7f120748
+.field public static final form_label_mobile_notifications_label:I = 0x7f120748
 
-.field public static final form_label_mobile_notifications_sound_disable:I = 0x7f120749
+.field public static final form_label_mobile_notifications_os_control_jump:I = 0x7f120749
 
-.field public static final form_label_mobile_notifications_stream_desc:I = 0x7f12074a
+.field public static final form_label_mobile_notifications_os_control_jump_help:I = 0x7f12074a
 
-.field public static final form_label_mobile_notifications_system_desc:I = 0x7f12074b
+.field public static final form_label_mobile_notifications_sound_disable:I = 0x7f12074b
 
-.field public static final form_label_mobile_notifications_system_hint:I = 0x7f12074c
+.field public static final form_label_mobile_notifications_stream_desc:I = 0x7f12074c
 
-.field public static final form_label_mobile_notifications_system_label:I = 0x7f12074d
+.field public static final form_label_mobile_notifications_system_desc:I = 0x7f12074d
 
-.field public static final form_label_mobile_notifications_user_label:I = 0x7f12074e
+.field public static final form_label_mobile_notifications_system_hint:I = 0x7f12074e
 
-.field public static final form_label_mobile_notifications_vibrations:I = 0x7f12074f
+.field public static final form_label_mobile_notifications_system_label:I = 0x7f12074f
 
-.field public static final form_label_mobile_notifications_wake_device:I = 0x7f120750
+.field public static final form_label_mobile_notifications_user_label:I = 0x7f120750
 
-.field public static final form_label_mobile_push_notifications:I = 0x7f120751
+.field public static final form_label_mobile_notifications_vibrations:I = 0x7f120751
 
-.field public static final form_label_mobile_server_muted:I = 0x7f120752
+.field public static final form_label_mobile_notifications_wake_device:I = 0x7f120752
 
-.field public static final form_label_mobile_server_muted_until:I = 0x7f120753
+.field public static final form_label_mobile_push_notifications:I = 0x7f120753
 
-.field public static final form_label_mobile_user_notifications_hint:I = 0x7f120754
+.field public static final form_label_mobile_server_muted:I = 0x7f120754
 
-.field public static final form_label_mobile_user_notifications_label:I = 0x7f120755
+.field public static final form_label_mobile_server_muted_until:I = 0x7f120755
 
-.field public static final form_label_mute_server:I = 0x7f120756
+.field public static final form_label_mobile_user_notifications_hint:I = 0x7f120756
 
-.field public static final form_label_mute_server_description:I = 0x7f120757
+.field public static final form_label_mobile_user_notifications_label:I = 0x7f120757
 
-.field public static final form_label_muted:I = 0x7f120758
+.field public static final form_label_mute_server:I = 0x7f120758
 
-.field public static final form_label_new_password:I = 0x7f120759
+.field public static final form_label_mute_server_description:I = 0x7f120759
 
-.field public static final form_label_news_channel:I = 0x7f12075a
+.field public static final form_label_muted:I = 0x7f12075a
 
-.field public static final form_label_nothing:I = 0x7f12075b
+.field public static final form_label_new_password:I = 0x7f12075b
 
-.field public static final form_label_notification_frequency:I = 0x7f12075c
+.field public static final form_label_news_channel:I = 0x7f12075c
 
-.field public static final form_label_notification_position:I = 0x7f12075d
+.field public static final form_label_nothing:I = 0x7f12075d
 
-.field public static final form_label_nsfw_channel:I = 0x7f12075e
+.field public static final form_label_notification_frequency:I = 0x7f12075e
 
-.field public static final form_label_off:I = 0x7f12075f
+.field public static final form_label_notification_position:I = 0x7f12075f
 
-.field public static final form_label_only_mentions:I = 0x7f120760
+.field public static final form_label_nsfw_channel:I = 0x7f120760
 
-.field public static final form_label_only_mentions_short:I = 0x7f120761
+.field public static final form_label_off:I = 0x7f120761
 
-.field public static final form_label_output:I = 0x7f120762
+.field public static final form_label_only_mentions:I = 0x7f120762
 
-.field public static final form_label_output_device:I = 0x7f120763
+.field public static final form_label_only_mentions_short:I = 0x7f120763
 
-.field public static final form_label_output_volume:I = 0x7f120764
+.field public static final form_label_output:I = 0x7f120764
 
-.field public static final form_label_overlay_chat_opacity:I = 0x7f120765
+.field public static final form_label_output_device:I = 0x7f120765
 
-.field public static final form_label_overlay_text_chat_notifications:I = 0x7f120766
+.field public static final form_label_output_volume:I = 0x7f120766
 
-.field public static final form_label_password:I = 0x7f120767
+.field public static final form_label_overlay_chat_opacity:I = 0x7f120767
 
-.field public static final form_label_premade_widget:I = 0x7f120768
+.field public static final form_label_overlay_text_chat_notifications:I = 0x7f120768
 
-.field public static final form_label_push_afk_timeout:I = 0x7f120769
+.field public static final form_label_password:I = 0x7f120769
 
-.field public static final form_label_qos:I = 0x7f12076a
+.field public static final form_label_premade_widget:I = 0x7f12076a
 
-.field public static final form_label_reason_ban:I = 0x7f12076b
+.field public static final form_label_push_afk_timeout:I = 0x7f12076b
 
-.field public static final form_label_reason_kick:I = 0x7f12076c
+.field public static final form_label_qos:I = 0x7f12076c
 
-.field public static final form_label_report_reason:I = 0x7f12076d
+.field public static final form_label_reason_ban:I = 0x7f12076d
 
-.field public static final form_label_role_add:I = 0x7f12076e
+.field public static final form_label_reason_kick:I = 0x7f12076e
 
-.field public static final form_label_role_color:I = 0x7f12076f
+.field public static final form_label_report_reason:I = 0x7f12076f
 
-.field public static final form_label_role_enter_name:I = 0x7f120770
+.field public static final form_label_role_add:I = 0x7f120770
 
-.field public static final form_label_role_name:I = 0x7f120771
+.field public static final form_label_role_color:I = 0x7f120771
 
-.field public static final form_label_role_settings:I = 0x7f120772
+.field public static final form_label_role_enter_name:I = 0x7f120772
 
-.field public static final form_label_roles_pro_tip:I = 0x7f120773
+.field public static final form_label_role_name:I = 0x7f120773
 
-.field public static final form_label_roles_pro_tip_description:I = 0x7f120774
+.field public static final form_label_role_settings:I = 0x7f120774
 
-.field public static final form_label_select_channel:I = 0x7f120775
+.field public static final form_label_roles_pro_tip:I = 0x7f120775
 
-.field public static final form_label_send_to:I = 0x7f120776
+.field public static final form_label_roles_pro_tip_description:I = 0x7f120776
 
-.field public static final form_label_sensitivty:I = 0x7f120777
+.field public static final form_label_select_channel:I = 0x7f120777
 
-.field public static final form_label_server_banner:I = 0x7f120778
+.field public static final form_label_send_to:I = 0x7f120778
 
-.field public static final form_label_server_description:I = 0x7f120779
+.field public static final form_label_sensitivty:I = 0x7f120779
 
-.field public static final form_label_server_id:I = 0x7f12077a
+.field public static final form_label_server_banner:I = 0x7f12077a
 
-.field public static final form_label_server_language:I = 0x7f12077b
+.field public static final form_label_server_description:I = 0x7f12077b
 
-.field public static final form_label_server_name:I = 0x7f12077c
+.field public static final form_label_server_id:I = 0x7f12077c
 
-.field public static final form_label_server_notification_settings:I = 0x7f12077d
+.field public static final form_label_server_language:I = 0x7f12077d
 
-.field public static final form_label_server_region:I = 0x7f12077e
+.field public static final form_label_server_name:I = 0x7f12077e
 
-.field public static final form_label_shortcut:I = 0x7f12077f
+.field public static final form_label_server_notification_settings:I = 0x7f12077f
 
-.field public static final form_label_slowmode:I = 0x7f120780
+.field public static final form_label_server_region:I = 0x7f120780
 
-.field public static final form_label_slowmode_cooldown:I = 0x7f120781
+.field public static final form_label_shortcut:I = 0x7f120781
 
-.field public static final form_label_slowmode_off:I = 0x7f120782
+.field public static final form_label_slowmode:I = 0x7f120782
 
-.field public static final form_label_stream_volume:I = 0x7f120783
+.field public static final form_label_slowmode_cooldown:I = 0x7f120783
 
-.field public static final form_label_sub_expire_behavior:I = 0x7f120784
+.field public static final form_label_slowmode_off:I = 0x7f120784
 
-.field public static final form_label_subsystem:I = 0x7f120785
+.field public static final form_label_stream_volume:I = 0x7f120785
 
-.field public static final form_label_suppress_everyone:I = 0x7f120786
+.field public static final form_label_sub_expire_behavior:I = 0x7f120786
 
-.field public static final form_label_suppress_roles:I = 0x7f120787
+.field public static final form_label_subsystem:I = 0x7f120787
 
-.field public static final form_label_synced_members:I = 0x7f120788
+.field public static final form_label_suppress_everyone:I = 0x7f120788
 
-.field public static final form_label_synced_role:I = 0x7f120789
+.field public static final form_label_suppress_roles:I = 0x7f120789
 
-.field public static final form_label_synced_subs:I = 0x7f12078a
+.field public static final form_label_synced_members:I = 0x7f12078a
 
-.field public static final form_label_system_channel:I = 0x7f12078b
+.field public static final form_label_synced_role:I = 0x7f12078b
 
-.field public static final form_label_system_channel_settings:I = 0x7f12078c
+.field public static final form_label_synced_subs:I = 0x7f12078c
 
-.field public static final form_label_temporary:I = 0x7f12078d
+.field public static final form_label_system_channel:I = 0x7f12078d
 
-.field public static final form_label_test_microphone:I = 0x7f12078e
+.field public static final form_label_system_channel_settings:I = 0x7f12078e
 
-.field public static final form_label_tts:I = 0x7f12078f
+.field public static final form_label_temporary:I = 0x7f12078f
 
-.field public static final form_label_tts_notifications:I = 0x7f120790
+.field public static final form_label_test_microphone:I = 0x7f120790
 
-.field public static final form_label_unmute_server:I = 0x7f120791
+.field public static final form_label_tts:I = 0x7f120791
 
-.field public static final form_label_use_rich_chat_box:I = 0x7f120792
+.field public static final form_label_tts_notifications:I = 0x7f120792
 
-.field public static final form_label_user_limit:I = 0x7f120793
+.field public static final form_label_unmute_server:I = 0x7f120793
 
-.field public static final form_label_username:I = 0x7f120794
+.field public static final form_label_use_rich_chat_box:I = 0x7f120794
 
-.field public static final form_label_username_mobile:I = 0x7f120795
+.field public static final form_label_user_limit:I = 0x7f120795
 
-.field public static final form_label_verification_level:I = 0x7f120796
+.field public static final form_label_username:I = 0x7f120796
 
-.field public static final form_label_video_device:I = 0x7f120797
+.field public static final form_label_username_mobile:I = 0x7f120797
 
-.field public static final form_label_video_preview:I = 0x7f120798
+.field public static final form_label_verification_level:I = 0x7f120798
 
-.field public static final form_label_voice_diagnostics:I = 0x7f120799
+.field public static final form_label_video_device:I = 0x7f120799
 
-.field public static final form_label_voice_processing:I = 0x7f12079a
+.field public static final form_label_video_preview:I = 0x7f12079a
 
-.field public static final form_label_volume:I = 0x7f12079b
+.field public static final form_label_voice_diagnostics:I = 0x7f12079b
 
-.field public static final form_placeholder_server_name:I = 0x7f12079c
+.field public static final form_label_voice_processing:I = 0x7f12079c
 
-.field public static final form_placeholder_username:I = 0x7f12079d
+.field public static final form_label_volume:I = 0x7f12079d
 
-.field public static final form_report_help_text:I = 0x7f12079e
+.field public static final form_placeholder_server_name:I = 0x7f12079e
 
-.field public static final form_warning_input_sensitivty:I = 0x7f12079f
+.field public static final form_placeholder_username:I = 0x7f12079f
 
-.field public static final form_warning_video_preview:I = 0x7f1207a0
+.field public static final form_report_help_text:I = 0x7f1207a0
 
-.field public static final fr:I = 0x7f1207a1
+.field public static final form_warning_input_sensitivty:I = 0x7f1207a1
 
-.field public static final friend_has_been_deleted:I = 0x7f1207a2
+.field public static final form_warning_video_preview:I = 0x7f1207a2
 
-.field public static final friend_permitted_source:I = 0x7f1207a3
+.field public static final fr:I = 0x7f1207a3
 
-.field public static final friend_permitted_source_all:I = 0x7f1207a4
+.field public static final friend_has_been_deleted:I = 0x7f1207a4
 
-.field public static final friend_permitted_source_mutual_friends:I = 0x7f1207a5
+.field public static final friend_permitted_source:I = 0x7f1207a5
 
-.field public static final friend_permitted_source_mutual_guilds:I = 0x7f1207a6
+.field public static final friend_permitted_source_all:I = 0x7f1207a6
 
-.field public static final friend_request_accept:I = 0x7f1207a7
+.field public static final friend_permitted_source_mutual_friends:I = 0x7f1207a7
 
-.field public static final friend_request_cancel:I = 0x7f1207a8
+.field public static final friend_permitted_source_mutual_guilds:I = 0x7f1207a8
 
-.field public static final friend_request_cancelled:I = 0x7f1207a9
+.field public static final friend_request_accept:I = 0x7f1207a9
 
-.field public static final friend_request_failed_header:I = 0x7f1207aa
+.field public static final friend_request_cancel:I = 0x7f1207aa
 
-.field public static final friend_request_ignore:I = 0x7f1207ab
+.field public static final friend_request_cancelled:I = 0x7f1207ab
 
-.field public static final friend_request_ignored:I = 0x7f1207ac
+.field public static final friend_request_failed_header:I = 0x7f1207ac
 
-.field public static final friend_request_rate_limited_body:I = 0x7f1207ad
+.field public static final friend_request_ignore:I = 0x7f1207ad
 
-.field public static final friend_request_rate_limited_button:I = 0x7f1207ae
+.field public static final friend_request_ignored:I = 0x7f1207ae
 
-.field public static final friend_request_rate_limited_header:I = 0x7f1207af
+.field public static final friend_request_rate_limited_body:I = 0x7f1207af
 
-.field public static final friend_request_requires_email_validation_body:I = 0x7f1207b0
+.field public static final friend_request_rate_limited_button:I = 0x7f1207b0
 
-.field public static final friend_request_requires_email_validation_button:I = 0x7f1207b1
+.field public static final friend_request_rate_limited_header:I = 0x7f1207b1
 
-.field public static final friend_request_requires_email_validation_header:I = 0x7f1207b2
+.field public static final friend_request_requires_email_validation_body:I = 0x7f1207b2
 
-.field public static final friend_request_sent:I = 0x7f1207b3
+.field public static final friend_request_requires_email_validation_button:I = 0x7f1207b3
 
-.field public static final friends:I = 0x7f1207b4
+.field public static final friend_request_requires_email_validation_header:I = 0x7f1207b4
 
-.field public static final friends_all_header:I = 0x7f1207b5
+.field public static final friend_request_sent:I = 0x7f1207b5
 
-.field public static final friends_blocked_header:I = 0x7f1207b6
+.field public static final friends:I = 0x7f1207b6
 
-.field public static final friends_column_name:I = 0x7f1207b7
+.field public static final friends_all_header:I = 0x7f1207b7
 
-.field public static final friends_column_status:I = 0x7f1207b8
+.field public static final friends_blocked_header:I = 0x7f1207b8
 
-.field public static final friends_empty_state_all:I = 0x7f1207b9
+.field public static final friends_column_name:I = 0x7f1207b9
 
-.field public static final friends_empty_state_all_body:I = 0x7f1207ba
+.field public static final friends_column_status:I = 0x7f1207ba
 
-.field public static final friends_empty_state_all_cta:I = 0x7f1207bb
+.field public static final friends_empty_state_all:I = 0x7f1207bb
 
-.field public static final friends_empty_state_all_header:I = 0x7f1207bc
+.field public static final friends_empty_state_all_body:I = 0x7f1207bc
 
-.field public static final friends_empty_state_blocked:I = 0x7f1207bd
+.field public static final friends_empty_state_all_cta:I = 0x7f1207bd
 
-.field public static final friends_empty_state_copy:I = 0x7f1207be
+.field public static final friends_empty_state_all_header:I = 0x7f1207be
 
-.field public static final friends_empty_state_online:I = 0x7f1207bf
+.field public static final friends_empty_state_blocked:I = 0x7f1207bf
 
-.field public static final friends_empty_state_pending:I = 0x7f1207c0
+.field public static final friends_empty_state_copy:I = 0x7f1207c0
 
-.field public static final friends_empty_state_subtitle:I = 0x7f1207c1
+.field public static final friends_empty_state_online:I = 0x7f1207c1
 
-.field public static final friends_offline_header:I = 0x7f1207c2
+.field public static final friends_empty_state_pending:I = 0x7f1207c2
 
-.field public static final friends_online_header:I = 0x7f1207c3
+.field public static final friends_empty_state_subtitle:I = 0x7f1207c3
 
-.field public static final friends_pending_header:I = 0x7f1207c4
+.field public static final friends_offline_header:I = 0x7f1207c4
 
-.field public static final friends_pending_request_expand:I = 0x7f1207c5
+.field public static final friends_online_header:I = 0x7f1207c5
 
-.field public static final friends_pending_request_expand_collapse:I = 0x7f1207c6
+.field public static final friends_pending_header:I = 0x7f1207c6
 
-.field public static final friends_pending_request_header:I = 0x7f1207c7
+.field public static final friends_pending_request_expand:I = 0x7f1207c7
 
-.field public static final friends_request_status_incoming:I = 0x7f1207c8
+.field public static final friends_pending_request_expand_collapse:I = 0x7f1207c8
 
-.field public static final friends_request_status_outgoing:I = 0x7f1207c9
+.field public static final friends_pending_request_header:I = 0x7f1207c9
 
-.field public static final friends_row_action_button_accessibility_label_accept:I = 0x7f1207ca
+.field public static final friends_request_status_incoming:I = 0x7f1207ca
 
-.field public static final friends_row_action_button_accessibility_label_call:I = 0x7f1207cb
+.field public static final friends_request_status_outgoing:I = 0x7f1207cb
 
-.field public static final friends_row_action_button_accessibility_label_cancel:I = 0x7f1207cc
+.field public static final friends_row_action_button_accessibility_label_accept:I = 0x7f1207cc
 
-.field public static final friends_row_action_button_accessibility_label_decline:I = 0x7f1207cd
+.field public static final friends_row_action_button_accessibility_label_call:I = 0x7f1207cd
 
-.field public static final friends_row_action_button_accessibility_label_message:I = 0x7f1207ce
+.field public static final friends_row_action_button_accessibility_label_cancel:I = 0x7f1207ce
 
-.field public static final friends_section_add_friend:I = 0x7f1207cf
+.field public static final friends_row_action_button_accessibility_label_decline:I = 0x7f1207cf
 
-.field public static final friends_section_all:I = 0x7f1207d0
+.field public static final friends_row_action_button_accessibility_label_message:I = 0x7f1207d0
 
-.field public static final friends_section_online:I = 0x7f1207d1
+.field public static final friends_section_add_friend:I = 0x7f1207d1
 
-.field public static final friends_section_pending:I = 0x7f1207d2
+.field public static final friends_section_all:I = 0x7f1207d2
 
-.field public static final friends_share:I = 0x7f1207d3
+.field public static final friends_section_online:I = 0x7f1207d3
 
-.field public static final friends_share_sheet_scanning_text_bottom:I = 0x7f1207d4
+.field public static final friends_section_pending:I = 0x7f1207d4
 
-.field public static final friends_share_sheet_scanning_text_top:I = 0x7f1207d5
+.field public static final friends_share:I = 0x7f1207d5
 
-.field public static final friends_share_tabbar_title:I = 0x7f1207d6
+.field public static final friends_share_sheet_scanning_text_bottom:I = 0x7f1207d6
 
-.field public static final full:I = 0x7f1207d7
+.field public static final friends_share_sheet_scanning_text_top:I = 0x7f1207d7
 
-.field public static final full_screen:I = 0x7f1207d8
+.field public static final friends_share_tabbar_title:I = 0x7f1207d8
 
-.field public static final funimation_promotion_card_body_redeemed:I = 0x7f1207d9
+.field public static final full:I = 0x7f1207d9
 
-.field public static final funimation_promotion_card_body_unredeemed:I = 0x7f1207da
+.field public static final full_screen:I = 0x7f1207da
 
-.field public static final funimation_promotion_card_header:I = 0x7f1207db
+.field public static final funimation_promotion_card_body_redeemed:I = 0x7f1207db
 
-.field public static final game_action_button_add_to_library:I = 0x7f1207dc
+.field public static final funimation_promotion_card_body_unredeemed:I = 0x7f1207dc
 
-.field public static final game_action_button_cannot_install:I = 0x7f1207dd
+.field public static final funimation_promotion_card_header:I = 0x7f1207dd
 
-.field public static final game_action_button_downloading:I = 0x7f1207de
+.field public static final game_action_button_add_to_library:I = 0x7f1207de
 
-.field public static final game_action_button_game_not_detected:I = 0x7f1207df
+.field public static final game_action_button_cannot_install:I = 0x7f1207df
 
-.field public static final game_action_button_install:I = 0x7f1207e0
+.field public static final game_action_button_downloading:I = 0x7f1207e0
 
-.field public static final game_action_button_locate:I = 0x7f1207e1
+.field public static final game_action_button_game_not_detected:I = 0x7f1207e1
 
-.field public static final game_action_button_login_to_buy:I = 0x7f1207e2
+.field public static final game_action_button_install:I = 0x7f1207e2
 
-.field public static final game_action_button_now_playing:I = 0x7f1207e3
+.field public static final game_action_button_locate:I = 0x7f1207e3
 
-.field public static final game_action_button_paused:I = 0x7f1207e4
+.field public static final game_action_button_login_to_buy:I = 0x7f1207e4
 
-.field public static final game_action_button_play:I = 0x7f1207e5
+.field public static final game_action_button_now_playing:I = 0x7f1207e5
 
-.field public static final game_action_button_play_disabled_desktop_app:I = 0x7f1207e6
+.field public static final game_action_button_paused:I = 0x7f1207e6
 
-.field public static final game_action_button_preorder_wait:I = 0x7f1207e7
+.field public static final game_action_button_play:I = 0x7f1207e7
 
-.field public static final game_action_button_preorder_wait_tooltip:I = 0x7f1207e8
+.field public static final game_action_button_play_disabled_desktop_app:I = 0x7f1207e8
 
-.field public static final game_action_button_queued:I = 0x7f1207e9
+.field public static final game_action_button_preorder_wait:I = 0x7f1207e9
 
-.field public static final game_action_button_restricted_in_region:I = 0x7f1207ea
+.field public static final game_action_button_preorder_wait_tooltip:I = 0x7f1207ea
 
-.field public static final game_action_button_unavailable:I = 0x7f1207eb
+.field public static final game_action_button_queued:I = 0x7f1207eb
 
-.field public static final game_action_button_unavailable_tooltip:I = 0x7f1207ec
+.field public static final game_action_button_restricted_in_region:I = 0x7f1207ec
 
-.field public static final game_action_button_uninstalling_1:I = 0x7f1207ed
+.field public static final game_action_button_unavailable:I = 0x7f1207ed
 
-.field public static final game_action_button_uninstalling_10:I = 0x7f1207ee
+.field public static final game_action_button_unavailable_tooltip:I = 0x7f1207ee
 
-.field public static final game_action_button_uninstalling_2:I = 0x7f1207ef
+.field public static final game_action_button_uninstalling_1:I = 0x7f1207ef
 
-.field public static final game_action_button_uninstalling_3:I = 0x7f1207f0
+.field public static final game_action_button_uninstalling_10:I = 0x7f1207f0
 
-.field public static final game_action_button_uninstalling_4:I = 0x7f1207f1
+.field public static final game_action_button_uninstalling_2:I = 0x7f1207f1
 
-.field public static final game_action_button_uninstalling_5:I = 0x7f1207f2
+.field public static final game_action_button_uninstalling_3:I = 0x7f1207f2
 
-.field public static final game_action_button_uninstalling_6:I = 0x7f1207f3
+.field public static final game_action_button_uninstalling_4:I = 0x7f1207f3
 
-.field public static final game_action_button_uninstalling_7:I = 0x7f1207f4
+.field public static final game_action_button_uninstalling_5:I = 0x7f1207f4
 
-.field public static final game_action_button_uninstalling_8:I = 0x7f1207f5
+.field public static final game_action_button_uninstalling_6:I = 0x7f1207f5
 
-.field public static final game_action_button_uninstalling_9:I = 0x7f1207f6
+.field public static final game_action_button_uninstalling_7:I = 0x7f1207f6
 
-.field public static final game_action_button_update:I = 0x7f1207f7
+.field public static final game_action_button_uninstalling_8:I = 0x7f1207f7
 
-.field public static final game_action_button_view_in_store:I = 0x7f1207f8
+.field public static final game_action_button_uninstalling_9:I = 0x7f1207f8
 
-.field public static final game_activity:I = 0x7f1207f9
+.field public static final game_action_button_update:I = 0x7f1207f9
 
-.field public static final game_detected:I = 0x7f1207fa
+.field public static final game_action_button_view_in_store:I = 0x7f1207fa
 
-.field public static final game_detection_modal_info_android:I = 0x7f1207fb
+.field public static final game_activity:I = 0x7f1207fb
 
-.field public static final game_detection_open_settings:I = 0x7f1207fc
+.field public static final game_detected:I = 0x7f1207fc
 
-.field public static final game_detection_service:I = 0x7f1207fd
+.field public static final game_detection_modal_info_android:I = 0x7f1207fd
 
-.field public static final game_feed_activity_action_play:I = 0x7f1207fe
+.field public static final game_detection_open_settings:I = 0x7f1207fe
 
-.field public static final game_feed_activity_playing_xbox:I = 0x7f1207ff
+.field public static final game_detection_service:I = 0x7f1207ff
 
-.field public static final game_feed_activity_streaming_twitch:I = 0x7f120800
+.field public static final game_feed_activity_action_play:I = 0x7f120800
 
-.field public static final game_feed_current_header_title:I = 0x7f120801
+.field public static final game_feed_activity_playing_xbox:I = 0x7f120801
 
-.field public static final game_feed_unknown_player:I = 0x7f120802
+.field public static final game_feed_activity_streaming_twitch:I = 0x7f120802
 
-.field public static final game_feed_user_played_days_ago:I = 0x7f120803
+.field public static final game_feed_current_header_title:I = 0x7f120803
 
-.field public static final game_feed_user_played_hours_ago:I = 0x7f120804
+.field public static final game_feed_unknown_player:I = 0x7f120804
 
-.field public static final game_feed_user_played_minutes_ago:I = 0x7f120805
+.field public static final game_feed_user_played_days_ago:I = 0x7f120805
 
-.field public static final game_feed_user_played_months_ago:I = 0x7f120806
+.field public static final game_feed_user_played_hours_ago:I = 0x7f120806
 
-.field public static final game_feed_user_played_weeks_ago:I = 0x7f120807
+.field public static final game_feed_user_played_minutes_ago:I = 0x7f120807
 
-.field public static final game_feed_user_played_years_ago:I = 0x7f120808
+.field public static final game_feed_user_played_months_ago:I = 0x7f120808
 
-.field public static final game_feed_user_playing_for_days:I = 0x7f120809
+.field public static final game_feed_user_played_weeks_ago:I = 0x7f120809
 
-.field public static final game_feed_user_playing_for_hours:I = 0x7f12080a
+.field public static final game_feed_user_played_years_ago:I = 0x7f12080a
 
-.field public static final game_feed_user_playing_for_minutes:I = 0x7f12080b
+.field public static final game_feed_user_playing_for_days:I = 0x7f12080b
 
-.field public static final game_feed_user_playing_just_ended:I = 0x7f12080c
+.field public static final game_feed_user_playing_for_hours:I = 0x7f12080c
 
-.field public static final game_feed_user_playing_just_started:I = 0x7f12080d
+.field public static final game_feed_user_playing_for_minutes:I = 0x7f12080d
 
-.field public static final game_launch_failed_launch_target_not_found:I = 0x7f12080e
+.field public static final game_feed_user_playing_just_ended:I = 0x7f12080e
 
-.field public static final game_library_last_played_days:I = 0x7f12080f
+.field public static final game_feed_user_playing_just_started:I = 0x7f12080f
 
-.field public static final game_library_last_played_hours:I = 0x7f120810
+.field public static final game_launch_failed_launch_target_not_found:I = 0x7f120810
 
-.field public static final game_library_last_played_just_now:I = 0x7f120811
+.field public static final game_library_last_played_days:I = 0x7f120811
 
-.field public static final game_library_last_played_minutes:I = 0x7f120812
+.field public static final game_library_last_played_hours:I = 0x7f120812
 
-.field public static final game_library_last_played_months:I = 0x7f120813
+.field public static final game_library_last_played_just_now:I = 0x7f120813
 
-.field public static final game_library_last_played_none:I = 0x7f120814
+.field public static final game_library_last_played_minutes:I = 0x7f120814
 
-.field public static final game_library_last_played_playing_now:I = 0x7f120815
+.field public static final game_library_last_played_months:I = 0x7f120815
 
-.field public static final game_library_last_played_weeks:I = 0x7f120816
+.field public static final game_library_last_played_none:I = 0x7f120816
 
-.field public static final game_library_last_played_years:I = 0x7f120817
+.field public static final game_library_last_played_playing_now:I = 0x7f120817
 
-.field public static final game_library_list_header_last_played:I = 0x7f120818
+.field public static final game_library_last_played_weeks:I = 0x7f120818
 
-.field public static final game_library_list_header_name:I = 0x7f120819
+.field public static final game_library_last_played_years:I = 0x7f120819
 
-.field public static final game_library_list_header_platform:I = 0x7f12081a
+.field public static final game_library_list_header_last_played:I = 0x7f12081a
 
-.field public static final game_library_new:I = 0x7f12081b
+.field public static final game_library_list_header_name:I = 0x7f12081b
 
-.field public static final game_library_not_applicable:I = 0x7f12081c
+.field public static final game_library_list_header_platform:I = 0x7f12081c
 
-.field public static final game_library_notification_game_installed_body:I = 0x7f12081d
+.field public static final game_library_new:I = 0x7f12081d
 
-.field public static final game_library_notification_game_installed_title:I = 0x7f12081e
+.field public static final game_library_not_applicable:I = 0x7f12081e
 
-.field public static final game_library_overlay_disabled_tooltip:I = 0x7f12081f
+.field public static final game_library_notification_game_installed_body:I = 0x7f12081f
 
-.field public static final game_library_private_tooltip:I = 0x7f120820
+.field public static final game_library_notification_game_installed_title:I = 0x7f120820
 
-.field public static final game_library_time_played_hours:I = 0x7f120821
+.field public static final game_library_overlay_disabled_tooltip:I = 0x7f120821
 
-.field public static final game_library_time_played_minutes:I = 0x7f120822
+.field public static final game_library_private_tooltip:I = 0x7f120822
 
-.field public static final game_library_time_played_none:I = 0x7f120823
+.field public static final game_library_time_played_hours:I = 0x7f120823
 
-.field public static final game_library_time_played_seconds:I = 0x7f120824
+.field public static final game_library_time_played_minutes:I = 0x7f120824
 
-.field public static final game_library_updates_action_move_up:I = 0x7f120825
+.field public static final game_library_time_played_none:I = 0x7f120825
 
-.field public static final game_library_updates_action_pause:I = 0x7f120826
+.field public static final game_library_time_played_seconds:I = 0x7f120826
 
-.field public static final game_library_updates_action_remove:I = 0x7f120827
+.field public static final game_library_updates_action_move_up:I = 0x7f120827
 
-.field public static final game_library_updates_action_resume:I = 0x7f120828
+.field public static final game_library_updates_action_pause:I = 0x7f120828
 
-.field public static final game_library_updates_header_disk:I = 0x7f120829
+.field public static final game_library_updates_action_remove:I = 0x7f120829
 
-.field public static final game_library_updates_header_network:I = 0x7f12082a
+.field public static final game_library_updates_action_resume:I = 0x7f12082a
 
-.field public static final game_library_updates_installing:I = 0x7f12082b
+.field public static final game_library_updates_header_disk:I = 0x7f12082b
 
-.field public static final game_library_updates_installing_hours:I = 0x7f12082c
+.field public static final game_library_updates_header_network:I = 0x7f12082c
 
-.field public static final game_library_updates_installing_minutes:I = 0x7f12082d
+.field public static final game_library_updates_installing:I = 0x7f12082d
 
-.field public static final game_library_updates_installing_seconds:I = 0x7f12082e
+.field public static final game_library_updates_installing_hours:I = 0x7f12082e
 
-.field public static final game_library_updates_progress_allocating_disk:I = 0x7f12082f
+.field public static final game_library_updates_installing_minutes:I = 0x7f12082f
 
-.field public static final game_library_updates_progress_finalizing:I = 0x7f120830
+.field public static final game_library_updates_installing_seconds:I = 0x7f120830
 
-.field public static final game_library_updates_progress_finished:I = 0x7f120831
+.field public static final game_library_updates_progress_allocating_disk:I = 0x7f120831
 
-.field public static final game_library_updates_progress_paused:I = 0x7f120832
+.field public static final game_library_updates_progress_finalizing:I = 0x7f120832
 
-.field public static final game_library_updates_progress_paused_no_transition:I = 0x7f120833
+.field public static final game_library_updates_progress_finished:I = 0x7f120833
 
-.field public static final game_library_updates_progress_pausing:I = 0x7f120834
+.field public static final game_library_updates_progress_paused:I = 0x7f120834
 
-.field public static final game_library_updates_progress_planning:I = 0x7f120835
+.field public static final game_library_updates_progress_paused_no_transition:I = 0x7f120835
 
-.field public static final game_library_updates_progress_post_install_scripts:I = 0x7f120836
+.field public static final game_library_updates_progress_pausing:I = 0x7f120836
 
-.field public static final game_library_updates_progress_queued:I = 0x7f120837
+.field public static final game_library_updates_progress_planning:I = 0x7f120837
 
-.field public static final game_library_updates_progress_queued_no_transition:I = 0x7f120838
+.field public static final game_library_updates_progress_post_install_scripts:I = 0x7f120838
 
-.field public static final game_library_updates_progress_repairing:I = 0x7f120839
+.field public static final game_library_updates_progress_queued:I = 0x7f120839
 
-.field public static final game_library_updates_progress_verifying:I = 0x7f12083a
+.field public static final game_library_updates_progress_queued_no_transition:I = 0x7f12083a
 
-.field public static final game_library_updates_progress_waiting_for_another:I = 0x7f12083b
+.field public static final game_library_updates_progress_repairing:I = 0x7f12083b
 
-.field public static final game_library_updates_progress_waiting_for_another_no_transition:I = 0x7f12083c
+.field public static final game_library_updates_progress_verifying:I = 0x7f12083c
 
-.field public static final game_library_updates_updating:I = 0x7f12083d
+.field public static final game_library_updates_progress_waiting_for_another:I = 0x7f12083d
 
-.field public static final game_library_updates_updating_updating_hours:I = 0x7f12083e
+.field public static final game_library_updates_progress_waiting_for_another_no_transition:I = 0x7f12083e
 
-.field public static final game_library_updates_updating_updating_minutes:I = 0x7f12083f
+.field public static final game_library_updates_updating:I = 0x7f12083f
 
-.field public static final game_library_updates_updating_updating_seconds:I = 0x7f120840
+.field public static final game_library_updates_updating_updating_hours:I = 0x7f120840
 
-.field public static final game_popout_follow:I = 0x7f120841
+.field public static final game_library_updates_updating_updating_minutes:I = 0x7f120841
 
-.field public static final game_popout_nitro_upsell:I = 0x7f120842
+.field public static final game_library_updates_updating_updating_seconds:I = 0x7f120842
 
-.field public static final game_popout_view_server:I = 0x7f120843
+.field public static final game_popout_follow:I = 0x7f120843
 
-.field public static final general_permissions:I = 0x7f120845
+.field public static final game_popout_nitro_upsell:I = 0x7f120844
 
-.field public static final generate_a_new_link:I = 0x7f120846
+.field public static final game_popout_view_server:I = 0x7f120845
 
-.field public static final generic_actions_menu_label:I = 0x7f120847
+.field public static final general_permissions:I = 0x7f120847
 
-.field public static final get_started:I = 0x7f120848
+.field public static final generate_a_new_link:I = 0x7f120848
 
-.field public static final gif:I = 0x7f120849
+.field public static final generic_actions_menu_label:I = 0x7f120849
 
-.field public static final gif_auto_play_label:I = 0x7f12084a
+.field public static final get_started:I = 0x7f12084a
 
-.field public static final gif_auto_play_label_mobile:I = 0x7f12084b
+.field public static final gif:I = 0x7f12084b
 
-.field public static final gif_button_label:I = 0x7f12084c
+.field public static final gif_auto_play_label:I = 0x7f12084c
 
-.field public static final gif_picker_enter_search:I = 0x7f12084d
+.field public static final gif_auto_play_label_mobile:I = 0x7f12084d
 
-.field public static final gif_picker_favorites:I = 0x7f12084e
+.field public static final gif_button_label:I = 0x7f12084e
 
-.field public static final gif_picker_related_search:I = 0x7f12084f
+.field public static final gif_picker_enter_search:I = 0x7f12084f
 
-.field public static final gif_picker_result_type_trending_gifs:I = 0x7f120850
+.field public static final gif_picker_favorites:I = 0x7f120850
 
-.field public static final gif_tooltip_add_to_favorites:I = 0x7f120851
+.field public static final gif_picker_related_search:I = 0x7f120851
 
-.field public static final gif_tooltip_favorited_picker_button:I = 0x7f120852
+.field public static final gif_picker_result_type_trending_gifs:I = 0x7f120852
 
-.field public static final gif_tooltip_remove_from_favorites:I = 0x7f120853
+.field public static final gif_tooltip_add_to_favorites:I = 0x7f120853
 
-.field public static final gift_code_auth_accept:I = 0x7f120854
+.field public static final gif_tooltip_favorited_picker_button:I = 0x7f120854
 
-.field public static final gift_code_auth_accepting:I = 0x7f120855
+.field public static final gif_tooltip_remove_from_favorites:I = 0x7f120855
 
-.field public static final gift_code_auth_check_verification_again:I = 0x7f120856
+.field public static final gift_code_auth_accept:I = 0x7f120856
 
-.field public static final gift_code_auth_continue_in_browser:I = 0x7f120857
+.field public static final gift_code_auth_accepting:I = 0x7f120857
 
-.field public static final gift_code_auth_fetching_user:I = 0x7f120858
+.field public static final gift_code_auth_check_verification_again:I = 0x7f120858
 
-.field public static final gift_code_auth_gifted:I = 0x7f120859
+.field public static final gift_code_auth_continue_in_browser:I = 0x7f120859
 
-.field public static final gift_code_auth_gifted_by:I = 0x7f12085a
+.field public static final gift_code_auth_fetching_user:I = 0x7f12085a
 
-.field public static final gift_code_auth_gifted_subscription_monthly:I = 0x7f12085b
+.field public static final gift_code_auth_gifted:I = 0x7f12085b
 
-.field public static final gift_code_auth_gifted_subscription_yearly:I = 0x7f12085c
+.field public static final gift_code_auth_gifted_by:I = 0x7f12085c
 
-.field public static final gift_code_auth_help_text_claimed:I = 0x7f12085d
+.field public static final gift_code_auth_gifted_subscription_monthly:I = 0x7f12085d
 
-.field public static final gift_code_auth_help_text_owned:I = 0x7f12085e
+.field public static final gift_code_auth_gifted_subscription_yearly:I = 0x7f12085e
 
-.field public static final gift_code_auth_help_text_verification_required:I = 0x7f12085f
+.field public static final gift_code_auth_help_text_claimed:I = 0x7f12085f
 
-.field public static final gift_code_auth_invalid_body:I = 0x7f120860
+.field public static final gift_code_auth_help_text_owned:I = 0x7f120860
 
-.field public static final gift_code_auth_invalid_tip:I = 0x7f120861
+.field public static final gift_code_auth_help_text_verification_required:I = 0x7f120861
 
-.field public static final gift_code_auth_invalid_title:I = 0x7f120862
+.field public static final gift_code_auth_invalid_body:I = 0x7f120862
 
-.field public static final gift_code_auth_logged_in_as:I = 0x7f120863
+.field public static final gift_code_auth_invalid_tip:I = 0x7f120863
 
-.field public static final gift_code_auth_resolving:I = 0x7f120864
+.field public static final gift_code_auth_invalid_title:I = 0x7f120864
 
-.field public static final gift_code_auth_verification_sent:I = 0x7f120865
+.field public static final gift_code_auth_logged_in_as:I = 0x7f120865
 
-.field public static final gift_code_auth_verification_title:I = 0x7f120866
+.field public static final gift_code_auth_resolving:I = 0x7f120866
 
-.field public static final gift_code_cannot_accept_body_ios:I = 0x7f120867
+.field public static final gift_code_auth_verification_sent:I = 0x7f120867
 
-.field public static final gift_code_hint:I = 0x7f120868
+.field public static final gift_code_auth_verification_title:I = 0x7f120868
 
-.field public static final gift_confirmation_body_claimed:I = 0x7f120869
+.field public static final gift_code_cannot_accept_body_ios:I = 0x7f120869
 
-.field public static final gift_confirmation_body_confirm:I = 0x7f12086a
+.field public static final gift_code_hint:I = 0x7f12086a
 
-.field public static final gift_confirmation_body_confirm_nitro:I = 0x7f12086b
+.field public static final gift_confirmation_body_claimed:I = 0x7f12086b
 
-.field public static final gift_confirmation_body_error_invoice_open:I = 0x7f12086c
+.field public static final gift_confirmation_body_confirm:I = 0x7f12086c
 
-.field public static final gift_confirmation_body_error_nitro_upgrade_downgrade:I = 0x7f12086d
+.field public static final gift_confirmation_body_confirm_nitro:I = 0x7f12086d
 
-.field public static final gift_confirmation_body_error_subscription_managed:I = 0x7f12086e
+.field public static final gift_confirmation_body_error_invoice_open:I = 0x7f12086e
 
-.field public static final gift_confirmation_body_invalid:I = 0x7f12086f
+.field public static final gift_confirmation_body_error_nitro_upgrade_downgrade:I = 0x7f12086f
 
-.field public static final gift_confirmation_body_owned:I = 0x7f120870
+.field public static final gift_confirmation_body_error_subscription_managed:I = 0x7f120870
 
-.field public static final gift_confirmation_body_self_gift_no_payment:I = 0x7f120871
+.field public static final gift_confirmation_body_invalid:I = 0x7f120871
 
-.field public static final gift_confirmation_body_subscription_monthly_confirm:I = 0x7f120872
+.field public static final gift_confirmation_body_owned:I = 0x7f120872
 
-.field public static final gift_confirmation_body_subscription_yearly_confirm:I = 0x7f120873
+.field public static final gift_confirmation_body_self_gift_no_payment:I = 0x7f120873
 
-.field public static final gift_confirmation_body_success:I = 0x7f120874
+.field public static final gift_confirmation_body_subscription_monthly_confirm:I = 0x7f120874
 
-.field public static final gift_confirmation_body_success_generic_subscription_monthly:I = 0x7f120875
+.field public static final gift_confirmation_body_subscription_yearly_confirm:I = 0x7f120875
 
-.field public static final gift_confirmation_body_success_generic_subscription_yearly:I = 0x7f120876
+.field public static final gift_confirmation_body_success:I = 0x7f120876
 
-.field public static final gift_confirmation_body_success_mobile:I = 0x7f120877
+.field public static final gift_confirmation_body_success_generic_subscription_monthly:I = 0x7f120877
 
-.field public static final gift_confirmation_body_success_nitro_classic_mobile:I = 0x7f120878
+.field public static final gift_confirmation_body_success_generic_subscription_yearly:I = 0x7f120878
 
-.field public static final gift_confirmation_body_success_nitro_mobile:I = 0x7f120879
+.field public static final gift_confirmation_body_success_mobile:I = 0x7f120879
 
-.field public static final gift_confirmation_body_success_premium_tier_1_monthly:I = 0x7f12087a
+.field public static final gift_confirmation_body_success_nitro_classic_mobile:I = 0x7f12087a
 
-.field public static final gift_confirmation_body_success_premium_tier_1_yearly:I = 0x7f12087b
+.field public static final gift_confirmation_body_success_nitro_mobile:I = 0x7f12087b
 
-.field public static final gift_confirmation_body_success_premium_tier_2_monthly:I = 0x7f12087c
+.field public static final gift_confirmation_body_success_premium_tier_1_monthly:I = 0x7f12087c
 
-.field public static final gift_confirmation_body_success_premium_tier_2_yearly:I = 0x7f12087d
+.field public static final gift_confirmation_body_success_premium_tier_1_yearly:I = 0x7f12087d
 
-.field public static final gift_confirmation_body_unknown_error:I = 0x7f12087e
+.field public static final gift_confirmation_body_success_premium_tier_2_monthly:I = 0x7f12087e
 
-.field public static final gift_confirmation_button_confirm:I = 0x7f12087f
+.field public static final gift_confirmation_body_success_premium_tier_2_yearly:I = 0x7f12087f
 
-.field public static final gift_confirmation_button_confirm_mobile:I = 0x7f120880
+.field public static final gift_confirmation_body_unknown_error:I = 0x7f120880
 
-.field public static final gift_confirmation_button_confirm_subscription:I = 0x7f120881
+.field public static final gift_confirmation_button_confirm:I = 0x7f120881
 
-.field public static final gift_confirmation_button_fail:I = 0x7f120882
+.field public static final gift_confirmation_button_confirm_mobile:I = 0x7f120882
 
-.field public static final gift_confirmation_button_go_to_library:I = 0x7f120883
+.field public static final gift_confirmation_button_confirm_subscription:I = 0x7f120883
 
-.field public static final gift_confirmation_button_noice:I = 0x7f120884
+.field public static final gift_confirmation_button_fail:I = 0x7f120884
 
-.field public static final gift_confirmation_button_subscription_success:I = 0x7f120885
+.field public static final gift_confirmation_button_go_to_library:I = 0x7f120885
 
-.field public static final gift_confirmation_button_success_mobile:I = 0x7f120886
+.field public static final gift_confirmation_button_noice:I = 0x7f120886
 
-.field public static final gift_confirmation_header_confirm:I = 0x7f120887
+.field public static final gift_confirmation_button_subscription_success:I = 0x7f120887
 
-.field public static final gift_confirmation_header_confirm_nitro:I = 0x7f120888
+.field public static final gift_confirmation_button_success_mobile:I = 0x7f120888
 
-.field public static final gift_confirmation_header_fail:I = 0x7f120889
+.field public static final gift_confirmation_header_confirm:I = 0x7f120889
 
-.field public static final gift_confirmation_header_success:I = 0x7f12088a
+.field public static final gift_confirmation_header_confirm_nitro:I = 0x7f12088a
 
-.field public static final gift_confirmation_header_success_nitro:I = 0x7f12088b
+.field public static final gift_confirmation_header_fail:I = 0x7f12088b
 
-.field public static final gift_confirmation_nitro_time_frame_months:I = 0x7f12088c
+.field public static final gift_confirmation_header_success:I = 0x7f12088c
 
-.field public static final gift_confirmation_nitro_time_frame_years:I = 0x7f12088d
+.field public static final gift_confirmation_header_success_nitro:I = 0x7f12088d
 
-.field public static final gift_embed_body_claimed_other:I = 0x7f12088e
+.field public static final gift_confirmation_nitro_time_frame_months:I = 0x7f12088e
 
-.field public static final gift_embed_body_claimed_self:I = 0x7f12088f
+.field public static final gift_confirmation_nitro_time_frame_years:I = 0x7f12088f
 
-.field public static final gift_embed_body_claimed_self_mobile:I = 0x7f120890
+.field public static final gift_embed_body_claimed_other:I = 0x7f120890
 
-.field public static final gift_embed_body_claimed_self_subscription:I = 0x7f120891
+.field public static final gift_embed_body_claimed_self:I = 0x7f120891
 
-.field public static final gift_embed_body_default:I = 0x7f120892
+.field public static final gift_embed_body_claimed_self_mobile:I = 0x7f120892
 
-.field public static final gift_embed_body_giveaway:I = 0x7f120893
+.field public static final gift_embed_body_claimed_self_subscription:I = 0x7f120893
 
-.field public static final gift_embed_body_no_user_default:I = 0x7f120894
+.field public static final gift_embed_body_default:I = 0x7f120894
 
-.field public static final gift_embed_body_no_user_giveaway:I = 0x7f120895
+.field public static final gift_embed_body_giveaway:I = 0x7f120895
 
-.field public static final gift_embed_body_owned:I = 0x7f120896
+.field public static final gift_embed_body_no_user_default:I = 0x7f120896
 
-.field public static final gift_embed_body_owned_mobile:I = 0x7f120897
+.field public static final gift_embed_body_no_user_giveaway:I = 0x7f120897
 
-.field public static final gift_embed_body_requires_verification:I = 0x7f120898
+.field public static final gift_embed_body_owned:I = 0x7f120898
 
-.field public static final gift_embed_body_requires_verification_mobile:I = 0x7f120899
+.field public static final gift_embed_body_owned_mobile:I = 0x7f120899
 
-.field public static final gift_embed_body_self:I = 0x7f12089a
+.field public static final gift_embed_body_requires_verification:I = 0x7f12089a
 
-.field public static final gift_embed_body_subscription_default_months:I = 0x7f12089b
+.field public static final gift_embed_body_requires_verification_mobile:I = 0x7f12089b
 
-.field public static final gift_embed_body_subscription_default_years:I = 0x7f12089c
+.field public static final gift_embed_body_self:I = 0x7f12089c
 
-.field public static final gift_embed_body_subscription_giveaway:I = 0x7f12089d
+.field public static final gift_embed_body_subscription_default_months:I = 0x7f12089d
 
-.field public static final gift_embed_body_subscription_mismatch:I = 0x7f12089e
+.field public static final gift_embed_body_subscription_default_years:I = 0x7f12089e
 
-.field public static final gift_embed_body_subscription_no_user_default_months:I = 0x7f12089f
+.field public static final gift_embed_body_subscription_giveaway:I = 0x7f12089f
 
-.field public static final gift_embed_body_subscription_no_user_default_years:I = 0x7f1208a0
+.field public static final gift_embed_body_subscription_mismatch:I = 0x7f1208a0
 
-.field public static final gift_embed_body_subscription_no_user_giveaway:I = 0x7f1208a1
+.field public static final gift_embed_body_subscription_no_user_default_months:I = 0x7f1208a1
 
-.field public static final gift_embed_button_accept:I = 0x7f1208a2
+.field public static final gift_embed_body_subscription_no_user_default_years:I = 0x7f1208a2
 
-.field public static final gift_embed_button_cant_accept:I = 0x7f1208a3
+.field public static final gift_embed_body_subscription_no_user_giveaway:I = 0x7f1208a3
 
-.field public static final gift_embed_button_claimed:I = 0x7f1208a4
+.field public static final gift_embed_button_accept:I = 0x7f1208a4
 
-.field public static final gift_embed_button_claiming:I = 0x7f1208a5
+.field public static final gift_embed_button_cant_accept:I = 0x7f1208a5
 
-.field public static final gift_embed_button_owned:I = 0x7f1208a6
+.field public static final gift_embed_button_claimed:I = 0x7f1208a6
 
-.field public static final gift_embed_copies_left:I = 0x7f1208a7
+.field public static final gift_embed_button_claiming:I = 0x7f1208a7
 
-.field public static final gift_embed_expiration:I = 0x7f1208a8
+.field public static final gift_embed_button_owned:I = 0x7f1208a8
 
-.field public static final gift_embed_header_owner_invalid:I = 0x7f1208a9
+.field public static final gift_embed_copies_left:I = 0x7f1208a9
 
-.field public static final gift_embed_header_receiver_invalid:I = 0x7f1208aa
+.field public static final gift_embed_expiration:I = 0x7f1208aa
 
-.field public static final gift_embed_info_owner_invalid:I = 0x7f1208ab
+.field public static final gift_embed_header_owner_invalid:I = 0x7f1208ab
 
-.field public static final gift_embed_info_receiver_invalid:I = 0x7f1208ac
+.field public static final gift_embed_header_receiver_invalid:I = 0x7f1208ac
 
-.field public static final gift_embed_invalid:I = 0x7f1208ad
+.field public static final gift_embed_info_owner_invalid:I = 0x7f1208ad
 
-.field public static final gift_embed_invalid_tagline_other:I = 0x7f1208ae
+.field public static final gift_embed_info_receiver_invalid:I = 0x7f1208ae
 
-.field public static final gift_embed_invalid_tagline_self:I = 0x7f1208af
+.field public static final gift_embed_invalid:I = 0x7f1208af
 
-.field public static final gift_embed_invalid_title_other:I = 0x7f1208b0
+.field public static final gift_embed_invalid_tagline_other:I = 0x7f1208b0
 
-.field public static final gift_embed_invalid_title_self:I = 0x7f1208b1
+.field public static final gift_embed_invalid_tagline_self:I = 0x7f1208b1
 
-.field public static final gift_embed_resolving:I = 0x7f1208b2
+.field public static final gift_embed_invalid_title_other:I = 0x7f1208b2
 
-.field public static final gift_embed_subscriptions_left:I = 0x7f1208b3
+.field public static final gift_embed_invalid_title_self:I = 0x7f1208b3
 
-.field public static final gift_embed_title:I = 0x7f1208b4
+.field public static final gift_embed_resolving:I = 0x7f1208b4
 
-.field public static final gift_embed_title_self:I = 0x7f1208b5
+.field public static final gift_embed_subscriptions_left:I = 0x7f1208b5
 
-.field public static final gift_embed_title_subscription:I = 0x7f1208b6
+.field public static final gift_embed_title:I = 0x7f1208b6
 
-.field public static final gift_embed_title_subscription_self:I = 0x7f1208b7
+.field public static final gift_embed_title_self:I = 0x7f1208b7
 
-.field public static final gift_inventory:I = 0x7f1208b8
+.field public static final gift_embed_title_subscription:I = 0x7f1208b8
 
-.field public static final gift_inventory_copies:I = 0x7f1208b9
+.field public static final gift_embed_title_subscription_self:I = 0x7f1208b9
 
-.field public static final gift_inventory_expires_in:I = 0x7f1208ba
+.field public static final gift_inventory:I = 0x7f1208ba
 
-.field public static final gift_inventory_expires_in_mobile:I = 0x7f1208bb
+.field public static final gift_inventory_copies:I = 0x7f1208bb
 
-.field public static final gift_inventory_generate_help:I = 0x7f1208bc
+.field public static final gift_inventory_expires_in:I = 0x7f1208bc
 
-.field public static final gift_inventory_generate_link:I = 0x7f1208bd
+.field public static final gift_inventory_expires_in_mobile:I = 0x7f1208bd
 
-.field public static final gift_inventory_generate_link_ios:I = 0x7f1208be
+.field public static final gift_inventory_generate_help:I = 0x7f1208be
 
-.field public static final gift_inventory_gifts_you_purchased:I = 0x7f1208bf
+.field public static final gift_inventory_generate_link:I = 0x7f1208bf
 
-.field public static final gift_inventory_hidden:I = 0x7f1208c0
+.field public static final gift_inventory_generate_link_ios:I = 0x7f1208c0
 
-.field public static final gift_inventory_no_gifts:I = 0x7f1208c1
+.field public static final gift_inventory_gifts_you_purchased:I = 0x7f1208c1
 
-.field public static final gift_inventory_no_gifts_subtext:I = 0x7f1208c2
+.field public static final gift_inventory_hidden:I = 0x7f1208c2
 
-.field public static final gift_inventory_no_gifts_subtext_mobile:I = 0x7f1208c3
+.field public static final gift_inventory_no_gifts:I = 0x7f1208c3
 
-.field public static final gift_inventory_redeem_codes:I = 0x7f1208c4
+.field public static final gift_inventory_no_gifts_subtext:I = 0x7f1208c4
 
-.field public static final gift_inventory_select_nitro_gift:I = 0x7f1208c5
+.field public static final gift_inventory_no_gifts_subtext_mobile:I = 0x7f1208c5
 
-.field public static final gift_inventory_subscription_months:I = 0x7f1208c6
+.field public static final gift_inventory_redeem_codes:I = 0x7f1208c6
 
-.field public static final gift_inventory_subscription_years:I = 0x7f1208c7
+.field public static final gift_inventory_select_nitro_gift:I = 0x7f1208c7
 
-.field public static final gift_inventory_your_gifts:I = 0x7f1208c8
+.field public static final gift_inventory_subscription_months:I = 0x7f1208c8
 
-.field public static final go_live_hardware_acceleration_unavailable:I = 0x7f1208c9
+.field public static final gift_inventory_subscription_years:I = 0x7f1208c9
 
-.field public static final go_live_hey:I = 0x7f1208ca
+.field public static final gift_inventory_your_gifts:I = 0x7f1208ca
 
-.field public static final go_live_listen:I = 0x7f1208cb
+.field public static final go_live_hardware_acceleration_unavailable:I = 0x7f1208cb
 
-.field public static final go_live_look:I = 0x7f1208cc
+.field public static final go_live_hey:I = 0x7f1208cc
 
-.field public static final go_live_modal_application_form_title:I = 0x7f1208cd
+.field public static final go_live_listen:I = 0x7f1208cd
 
-.field public static final go_live_modal_applications:I = 0x7f1208ce
+.field public static final go_live_look:I = 0x7f1208ce
 
-.field public static final go_live_modal_cta:I = 0x7f1208cf
+.field public static final go_live_modal_application_form_title:I = 0x7f1208cf
 
-.field public static final go_live_modal_current_channel_form_title:I = 0x7f1208d0
+.field public static final go_live_modal_applications:I = 0x7f1208d0
 
-.field public static final go_live_modal_description:I = 0x7f1208d1
+.field public static final go_live_modal_cta:I = 0x7f1208d1
 
-.field public static final go_live_modal_description_generic:I = 0x7f1208d2
+.field public static final go_live_modal_current_channel_form_title:I = 0x7f1208d2
 
-.field public static final go_live_modal_description_select_source:I = 0x7f1208d3
+.field public static final go_live_modal_description:I = 0x7f1208d3
 
-.field public static final go_live_modal_guild_form_title:I = 0x7f1208d4
+.field public static final go_live_modal_description_generic:I = 0x7f1208d4
 
-.field public static final go_live_modal_overflow_four_or_more_users:I = 0x7f1208d5
+.field public static final go_live_modal_description_select_source:I = 0x7f1208d5
 
-.field public static final go_live_modal_overflow_three_users:I = 0x7f1208d6
+.field public static final go_live_modal_guild_form_title:I = 0x7f1208d6
 
-.field public static final go_live_modal_overflow_two_users:I = 0x7f1208d7
+.field public static final go_live_modal_overflow_four_or_more_users:I = 0x7f1208d7
 
-.field public static final go_live_modal_screens:I = 0x7f1208d8
+.field public static final go_live_modal_overflow_three_users:I = 0x7f1208d8
 
-.field public static final go_live_modal_select_channel_form_title:I = 0x7f1208d9
+.field public static final go_live_modal_overflow_two_users:I = 0x7f1208d9
 
-.field public static final go_live_modal_select_guild_form_title:I = 0x7f1208da
+.field public static final go_live_modal_screens:I = 0x7f1208da
 
-.field public static final go_live_modal_title:I = 0x7f1208db
+.field public static final go_live_modal_select_channel_form_title:I = 0x7f1208db
 
-.field public static final go_live_private_channels_tooltip_body:I = 0x7f1208dc
+.field public static final go_live_modal_select_guild_form_title:I = 0x7f1208dc
 
-.field public static final go_live_private_channels_tooltip_body_no_format:I = 0x7f1208dd
+.field public static final go_live_modal_title:I = 0x7f1208dd
 
-.field public static final go_live_private_channels_tooltip_cta:I = 0x7f1208de
+.field public static final go_live_private_channels_tooltip_body:I = 0x7f1208de
 
-.field public static final go_live_screenshare_no_sound:I = 0x7f1208df
+.field public static final go_live_private_channels_tooltip_body_no_format:I = 0x7f1208df
 
-.field public static final go_live_screenshare_update_for_soundshare:I = 0x7f1208e0
+.field public static final go_live_private_channels_tooltip_cta:I = 0x7f1208e0
 
-.field public static final go_live_share_screen:I = 0x7f1208e1
+.field public static final go_live_screenshare_no_sound:I = 0x7f1208e1
 
-.field public static final go_live_tile_screen:I = 0x7f1208e2
+.field public static final go_live_screenshare_update_for_soundshare:I = 0x7f1208e2
 
-.field public static final go_live_user_playing:I = 0x7f1208e3
+.field public static final go_live_share_screen:I = 0x7f1208e3
 
-.field public static final go_live_video_drivers_outdated:I = 0x7f1208e4
+.field public static final go_live_tile_screen:I = 0x7f1208e4
 
-.field public static final go_live_viewers_action_sheet_not_spectating:I = 0x7f1208e5
+.field public static final go_live_user_playing:I = 0x7f1208e5
 
-.field public static final go_live_viewers_action_sheet_spectating:I = 0x7f1208e6
+.field public static final go_live_video_drivers_outdated:I = 0x7f1208e6
 
-.field public static final go_live_viewers_action_sheet_streaming:I = 0x7f1208e7
+.field public static final go_live_viewers_action_sheet_not_spectating:I = 0x7f1208e7
 
-.field public static final go_live_watching_user:I = 0x7f1208e8
+.field public static final go_live_viewers_action_sheet_spectating:I = 0x7f1208e8
 
-.field public static final grant_temporary_membership:I = 0x7f1208ed
+.field public static final go_live_viewers_action_sheet_streaming:I = 0x7f1208e9
 
-.field public static final green:I = 0x7f1208ee
+.field public static final go_live_watching_user:I = 0x7f1208ea
 
-.field public static final grey:I = 0x7f1208ef
+.field public static final grant_temporary_membership:I = 0x7f1208ef
 
-.field public static final group_dm:I = 0x7f1208f0
+.field public static final green:I = 0x7f1208f0
 
-.field public static final group_dm_add_friends:I = 0x7f1208f1
+.field public static final grey:I = 0x7f1208f1
 
-.field public static final group_dm_header:I = 0x7f1208f2
+.field public static final group_dm:I = 0x7f1208f2
 
-.field public static final group_dm_invite_confirm:I = 0x7f1208f3
+.field public static final group_dm_add_friends:I = 0x7f1208f3
 
-.field public static final group_dm_invite_confirm_button:I = 0x7f1208f4
+.field public static final group_dm_header:I = 0x7f1208f4
 
-.field public static final group_dm_invite_confirm_description:I = 0x7f1208f5
+.field public static final group_dm_invite_confirm:I = 0x7f1208f5
 
-.field public static final group_dm_invite_empty:I = 0x7f1208f6
+.field public static final group_dm_invite_confirm_button:I = 0x7f1208f6
 
-.field public static final group_dm_invite_full_main:I = 0x7f1208f7
+.field public static final group_dm_invite_confirm_description:I = 0x7f1208f7
 
-.field public static final group_dm_invite_full_sub:I = 0x7f1208f8
+.field public static final group_dm_invite_empty:I = 0x7f1208f8
 
-.field public static final group_dm_invite_full_sub2:I = 0x7f1208f9
+.field public static final group_dm_invite_full_main:I = 0x7f1208f9
 
-.field public static final group_dm_invite_link_create:I = 0x7f1208fa
+.field public static final group_dm_invite_full_sub:I = 0x7f1208fa
 
-.field public static final group_dm_invite_link_example:I = 0x7f1208fb
+.field public static final group_dm_invite_full_sub2:I = 0x7f1208fb
 
-.field public static final group_dm_invite_link_title:I = 0x7f1208fc
+.field public static final group_dm_invite_link_create:I = 0x7f1208fc
 
-.field public static final group_dm_invite_no_friends:I = 0x7f1208fd
+.field public static final group_dm_invite_link_example:I = 0x7f1208fd
 
-.field public static final group_dm_invite_not_friends:I = 0x7f1208fe
+.field public static final group_dm_invite_link_title:I = 0x7f1208fe
 
-.field public static final group_dm_invite_remaining:I = 0x7f1208ff
+.field public static final group_dm_invite_no_friends:I = 0x7f1208ff
 
-.field public static final group_dm_invite_select_existing:I = 0x7f120900
+.field public static final group_dm_invite_not_friends:I = 0x7f120900
 
-.field public static final group_dm_invite_to:I = 0x7f120901
+.field public static final group_dm_invite_remaining:I = 0x7f120901
 
-.field public static final group_dm_invite_unselect_users:I = 0x7f120902
+.field public static final group_dm_invite_select_existing:I = 0x7f120902
 
-.field public static final group_dm_invite_will_fill_mobile:I = 0x7f120903
+.field public static final group_dm_invite_to:I = 0x7f120903
 
-.field public static final group_dm_invite_with_name:I = 0x7f120904
+.field public static final group_dm_invite_unselect_users:I = 0x7f120904
 
-.field public static final group_dm_search_placeholder:I = 0x7f120905
+.field public static final group_dm_invite_will_fill_mobile:I = 0x7f120905
 
-.field public static final group_dm_settings:I = 0x7f120906
+.field public static final group_dm_invite_with_name:I = 0x7f120906
 
-.field public static final group_message_a11y_label:I = 0x7f120907
+.field public static final group_dm_search_placeholder:I = 0x7f120907
 
-.field public static final group_message_a11y_label_with_unreads:I = 0x7f120908
+.field public static final group_dm_settings:I = 0x7f120908
 
-.field public static final group_name:I = 0x7f120909
+.field public static final group_message_a11y_label:I = 0x7f120909
 
-.field public static final group_owner:I = 0x7f12090a
+.field public static final group_message_a11y_label_with_unreads:I = 0x7f12090a
 
-.field public static final groups:I = 0x7f12090b
+.field public static final group_name:I = 0x7f12090b
 
-.field public static final guest_lurker_mode_chat_input_body:I = 0x7f12090c
+.field public static final group_owner:I = 0x7f12090c
 
-.field public static final guest_lurker_mode_chat_input_header:I = 0x7f12090d
+.field public static final groups:I = 0x7f12090d
 
-.field public static final guild_actions_menu_label:I = 0x7f12090e
+.field public static final guest_lurker_mode_chat_input_body:I = 0x7f12090e
 
-.field public static final guild_analyics_developers_button:I = 0x7f12090f
+.field public static final guest_lurker_mode_chat_input_header:I = 0x7f12090f
 
-.field public static final guild_analytics_description:I = 0x7f120910
+.field public static final guild_actions_menu_label:I = 0x7f120910
 
-.field public static final guild_analytics_developers_cta:I = 0x7f120911
+.field public static final guild_analyics_developers_button:I = 0x7f120911
 
-.field public static final guild_analytics_error_guild_size:I = 0x7f120912
+.field public static final guild_analytics_description:I = 0x7f120912
 
-.field public static final guild_analytics_error_message:I = 0x7f120913
+.field public static final guild_analytics_developers_cta:I = 0x7f120913
 
-.field public static final guild_analytics_metrics_last_week:I = 0x7f120914
+.field public static final guild_analytics_error_guild_size:I = 0x7f120914
 
-.field public static final guild_create_description:I = 0x7f120915
+.field public static final guild_analytics_error_message:I = 0x7f120915
 
-.field public static final guild_create_title:I = 0x7f120916
+.field public static final guild_analytics_metrics_last_week:I = 0x7f120916
 
-.field public static final guild_create_upload_icon_button_text:I = 0x7f120917
+.field public static final guild_create_description:I = 0x7f120917
 
-.field public static final guild_create_upload_icon_label:I = 0x7f120918
+.field public static final guild_create_title:I = 0x7f120918
 
-.field public static final guild_create_upload_icon_recommended_size_label:I = 0x7f120919
+.field public static final guild_create_upload_icon_button_text:I = 0x7f120919
 
-.field public static final guild_discovery_all_category_filter:I = 0x7f12091a
+.field public static final guild_create_upload_icon_label:I = 0x7f12091a
 
-.field public static final guild_discovery_category_footer_title:I = 0x7f12091b
+.field public static final guild_create_upload_icon_recommended_size_label:I = 0x7f12091b
 
-.field public static final guild_discovery_category_search_placeholder:I = 0x7f12091c
+.field public static final guild_discovery_all_category_filter:I = 0x7f12091c
 
-.field public static final guild_discovery_category_title:I = 0x7f12091d
+.field public static final guild_discovery_category_footer_title:I = 0x7f12091d
 
-.field public static final guild_discovery_covid_body:I = 0x7f12091e
+.field public static final guild_discovery_category_search_placeholder:I = 0x7f12091e
 
-.field public static final guild_discovery_covid_button:I = 0x7f12091f
+.field public static final guild_discovery_category_title:I = 0x7f12091f
 
-.field public static final guild_discovery_covid_title:I = 0x7f120920
+.field public static final guild_discovery_covid_body:I = 0x7f120920
 
-.field public static final guild_discovery_emojis_tooltip:I = 0x7f120921
+.field public static final guild_discovery_covid_button:I = 0x7f120921
 
-.field public static final guild_discovery_featured_header:I = 0x7f120922
+.field public static final guild_discovery_covid_title:I = 0x7f120922
 
-.field public static final guild_discovery_footer_body:I = 0x7f120923
+.field public static final guild_discovery_emojis_tooltip:I = 0x7f120923
 
-.field public static final guild_discovery_header_games_you_play:I = 0x7f120924
+.field public static final guild_discovery_featured_header:I = 0x7f120924
 
-.field public static final guild_discovery_header_popular_guilds:I = 0x7f120925
+.field public static final guild_discovery_footer_body:I = 0x7f120925
 
-.field public static final guild_discovery_header_search_results:I = 0x7f120926
+.field public static final guild_discovery_header_games_you_play:I = 0x7f120926
 
-.field public static final guild_discovery_home_subtitle:I = 0x7f120927
+.field public static final guild_discovery_header_popular_guilds:I = 0x7f120927
 
-.field public static final guild_discovery_home_title:I = 0x7f120928
+.field public static final guild_discovery_header_search_results:I = 0x7f120928
 
-.field public static final guild_discovery_popular_header:I = 0x7f120929
+.field public static final guild_discovery_home_subtitle:I = 0x7f120929
 
-.field public static final guild_discovery_search_empty_body:I = 0x7f12092a
+.field public static final guild_discovery_home_title:I = 0x7f12092a
 
-.field public static final guild_discovery_search_empty_category_body:I = 0x7f12092b
+.field public static final guild_discovery_popular_header:I = 0x7f12092b
 
-.field public static final guild_discovery_search_empty_category_header:I = 0x7f12092c
+.field public static final guild_discovery_search_empty_body:I = 0x7f12092c
 
-.field public static final guild_discovery_search_empty_description:I = 0x7f12092d
+.field public static final guild_discovery_search_empty_category_body:I = 0x7f12092d
 
-.field public static final guild_discovery_search_empty_header:I = 0x7f12092e
+.field public static final guild_discovery_search_empty_category_header:I = 0x7f12092e
 
-.field public static final guild_discovery_search_empty_title:I = 0x7f12092f
+.field public static final guild_discovery_search_empty_description:I = 0x7f12092f
 
-.field public static final guild_discovery_search_enter_cta:I = 0x7f120930
+.field public static final guild_discovery_search_empty_header:I = 0x7f120930
 
-.field public static final guild_discovery_search_error:I = 0x7f120931
+.field public static final guild_discovery_search_empty_title:I = 0x7f120931
 
-.field public static final guild_discovery_search_header:I = 0x7f120932
+.field public static final guild_discovery_search_enter_cta:I = 0x7f120932
 
-.field public static final guild_discovery_search_label:I = 0x7f120933
+.field public static final guild_discovery_search_error:I = 0x7f120933
 
-.field public static final guild_discovery_search_placeholder:I = 0x7f120934
+.field public static final guild_discovery_search_header:I = 0x7f120934
 
-.field public static final guild_discovery_search_press_enter:I = 0x7f120935
+.field public static final guild_discovery_search_label:I = 0x7f120935
 
-.field public static final guild_discovery_search_results_category_header:I = 0x7f120936
+.field public static final guild_discovery_search_placeholder:I = 0x7f120936
 
-.field public static final guild_discovery_search_results_header:I = 0x7f120937
+.field public static final guild_discovery_search_press_enter:I = 0x7f120937
 
-.field public static final guild_discovery_tooltip:I = 0x7f120938
+.field public static final guild_discovery_search_results_category_header:I = 0x7f120938
 
-.field public static final guild_discovery_view_button:I = 0x7f120939
+.field public static final guild_discovery_search_results_header:I = 0x7f120939
 
-.field public static final guild_folder_color:I = 0x7f12093a
+.field public static final guild_discovery_tooltip:I = 0x7f12093a
 
-.field public static final guild_folder_name:I = 0x7f12093b
+.field public static final guild_discovery_view_button:I = 0x7f12093b
 
-.field public static final guild_folder_tooltip_a11y_label:I = 0x7f12093c
+.field public static final guild_folder_color:I = 0x7f12093c
 
-.field public static final guild_members_header:I = 0x7f12093d
+.field public static final guild_folder_name:I = 0x7f12093d
 
-.field public static final guild_members_search_no_result:I = 0x7f12093e
+.field public static final guild_folder_tooltip_a11y_label:I = 0x7f12093e
 
-.field public static final guild_owner:I = 0x7f12093f
+.field public static final guild_members_header:I = 0x7f12093f
 
-.field public static final guild_partner_application_category_description:I = 0x7f120940
+.field public static final guild_members_search_no_result:I = 0x7f120940
 
-.field public static final guild_partner_application_category_label:I = 0x7f120941
+.field public static final guild_owner:I = 0x7f120941
 
-.field public static final guild_partner_application_connect:I = 0x7f120942
+.field public static final guild_partner_application_category_description:I = 0x7f120942
 
-.field public static final guild_partner_application_content_platform:I = 0x7f120943
+.field public static final guild_partner_application_category_label:I = 0x7f120943
 
-.field public static final guild_partner_application_country:I = 0x7f120944
+.field public static final guild_partner_application_connect:I = 0x7f120944
 
-.field public static final guild_partner_application_creator_connect:I = 0x7f120945
+.field public static final guild_partner_application_content_platform:I = 0x7f120945
 
-.field public static final guild_partner_application_description_description:I = 0x7f120946
+.field public static final guild_partner_application_country:I = 0x7f120946
 
-.field public static final guild_partner_application_description_title:I = 0x7f120947
+.field public static final guild_partner_application_creator_connect:I = 0x7f120947
 
-.field public static final guild_partner_application_first_name:I = 0x7f120948
+.field public static final guild_partner_application_creator_must_connect_primary:I = 0x7f120948
 
-.field public static final guild_partner_application_has_errors:I = 0x7f120949
+.field public static final guild_partner_application_description_description:I = 0x7f120949
 
-.field public static final guild_partner_application_language:I = 0x7f12094a
+.field public static final guild_partner_application_description_title:I = 0x7f12094a
 
-.field public static final guild_partner_application_last_name:I = 0x7f12094b
+.field public static final guild_partner_application_first_name:I = 0x7f12094b
 
-.field public static final guild_partner_application_other_platform:I = 0x7f12094c
+.field public static final guild_partner_application_has_errors:I = 0x7f12094c
 
-.field public static final guild_partner_application_other_platform_description:I = 0x7f12094d
+.field public static final guild_partner_application_language:I = 0x7f12094d
 
-.field public static final guild_partner_application_other_platform_optional:I = 0x7f12094e
+.field public static final guild_partner_application_last_name:I = 0x7f12094e
 
-.field public static final guild_partner_application_server_step:I = 0x7f12094f
+.field public static final guild_partner_application_other_platform:I = 0x7f12094f
 
-.field public static final guild_partner_application_server_step_description:I = 0x7f120950
+.field public static final guild_partner_application_other_platform_description:I = 0x7f120950
 
-.field public static final guild_partner_application_server_step_title:I = 0x7f120951
+.field public static final guild_partner_application_other_platform_optional:I = 0x7f120951
 
-.field public static final guild_partner_application_subcategory_description:I = 0x7f120952
+.field public static final guild_partner_application_server_step:I = 0x7f120952
 
-.field public static final guild_partner_application_submit_step:I = 0x7f120953
+.field public static final guild_partner_application_server_step_description:I = 0x7f120953
 
-.field public static final guild_partner_application_submit_step_description:I = 0x7f120954
+.field public static final guild_partner_application_server_step_title:I = 0x7f120954
 
-.field public static final guild_partner_application_submit_step_description_2:I = 0x7f120955
+.field public static final guild_partner_application_subcategory_description:I = 0x7f120955
 
-.field public static final guild_partner_application_submit_step_title:I = 0x7f120956
+.field public static final guild_partner_application_submit_step:I = 0x7f120956
 
-.field public static final guild_partner_application_survey_community_team_access:I = 0x7f120957
+.field public static final guild_partner_application_submit_step_description:I = 0x7f120957
 
-.field public static final guild_partner_application_survey_description:I = 0x7f120958
+.field public static final guild_partner_application_submit_step_description_2:I = 0x7f120958
 
-.field public static final guild_partner_application_survey_description_other:I = 0x7f120959
+.field public static final guild_partner_application_submit_step_title:I = 0x7f120959
 
-.field public static final guild_partner_application_survey_early_access_to_features:I = 0x7f12095a
+.field public static final guild_partner_application_survey_community_team_access:I = 0x7f12095a
 
-.field public static final guild_partner_application_survey_new_ideas_suggestions:I = 0x7f12095b
+.field public static final guild_partner_application_survey_description:I = 0x7f12095b
 
-.field public static final guild_partner_application_survey_other:I = 0x7f12095c
+.field public static final guild_partner_application_survey_description_other:I = 0x7f12095c
 
-.field public static final guild_partner_application_survey_talk_with_other_partners:I = 0x7f12095d
+.field public static final guild_partner_application_survey_early_access_to_features:I = 0x7f12095d
 
-.field public static final guild_partner_application_survey_title:I = 0x7f12095e
+.field public static final guild_partner_application_survey_new_ideas_suggestions:I = 0x7f12095e
 
-.field public static final guild_partner_application_title:I = 0x7f12095f
+.field public static final guild_partner_application_survey_other:I = 0x7f12095f
 
-.field public static final guild_partner_application_type:I = 0x7f120960
+.field public static final guild_partner_application_survey_talk_with_other_partners:I = 0x7f120960
 
-.field public static final guild_partner_application_type_brand:I = 0x7f120961
+.field public static final guild_partner_application_survey_title:I = 0x7f120961
 
-.field public static final guild_partner_application_type_content:I = 0x7f120962
+.field public static final guild_partner_application_title:I = 0x7f120962
 
-.field public static final guild_partner_application_type_fan:I = 0x7f120963
+.field public static final guild_partner_application_type:I = 0x7f120963
 
-.field public static final guild_partner_application_type_other:I = 0x7f120964
+.field public static final guild_partner_application_type_brand:I = 0x7f120964
 
-.field public static final guild_partner_application_type_software:I = 0x7f120965
+.field public static final guild_partner_application_type_content:I = 0x7f120965
 
-.field public static final guild_partner_application_user_step:I = 0x7f120966
+.field public static final guild_partner_application_type_fan:I = 0x7f120966
 
-.field public static final guild_partner_application_user_step_description:I = 0x7f120967
+.field public static final guild_partner_application_type_other:I = 0x7f120967
 
-.field public static final guild_partner_application_user_step_description_content_creator:I = 0x7f120968
+.field public static final guild_partner_application_type_software:I = 0x7f120968
 
-.field public static final guild_partner_application_user_step_title:I = 0x7f120969
+.field public static final guild_partner_application_user_step:I = 0x7f120969
 
-.field public static final guild_partner_application_website:I = 0x7f12096a
+.field public static final guild_partner_application_user_step_description:I = 0x7f12096a
 
-.field public static final guild_partner_application_why_you_description:I = 0x7f12096b
+.field public static final guild_partner_application_user_step_description_content_creator:I = 0x7f12096b
 
-.field public static final guild_partner_application_why_you_title:I = 0x7f12096c
+.field public static final guild_partner_application_user_step_title:I = 0x7f12096c
 
-.field public static final guild_partnered:I = 0x7f12096d
+.field public static final guild_partner_application_website:I = 0x7f12096d
 
-.field public static final guild_popout_unavailable_flavor:I = 0x7f12096e
+.field public static final guild_partner_application_why_you_description:I = 0x7f12096e
 
-.field public static final guild_popout_unavailable_header:I = 0x7f12096f
+.field public static final guild_partner_application_why_you_title:I = 0x7f12096f
 
-.field public static final guild_popout_view_server_button:I = 0x7f120970
+.field public static final guild_partnered:I = 0x7f120970
 
-.field public static final guild_premium:I = 0x7f120971
+.field public static final guild_popout_unavailable_flavor:I = 0x7f120971
 
-.field public static final guild_profile_join_server_button:I = 0x7f120972
+.field public static final guild_popout_unavailable_header:I = 0x7f120972
 
-.field public static final guild_security_req_mfa_body:I = 0x7f120973
+.field public static final guild_popout_view_server_button:I = 0x7f120973
 
-.field public static final guild_security_req_mfa_enable:I = 0x7f120974
+.field public static final guild_premium:I = 0x7f120974
 
-.field public static final guild_security_req_mfa_guild_disable:I = 0x7f120975
+.field public static final guild_profile_join_server_button:I = 0x7f120975
 
-.field public static final guild_security_req_mfa_guild_enable:I = 0x7f120976
+.field public static final guild_role_actions_menu_label:I = 0x7f120976
 
-.field public static final guild_security_req_mfa_label:I = 0x7f120977
+.field public static final guild_security_req_mfa_body:I = 0x7f120977
 
-.field public static final guild_security_req_mfa_turn_off:I = 0x7f120978
+.field public static final guild_security_req_mfa_enable:I = 0x7f120978
 
-.field public static final guild_security_req_mfa_turn_on:I = 0x7f120979
+.field public static final guild_security_req_mfa_guild_disable:I = 0x7f120979
 
-.field public static final guild_select:I = 0x7f12097a
+.field public static final guild_security_req_mfa_guild_enable:I = 0x7f12097a
 
-.field public static final guild_settings_action_filter_bot_add:I = 0x7f12097b
+.field public static final guild_security_req_mfa_label:I = 0x7f12097b
 
-.field public static final guild_settings_action_filter_channel_create:I = 0x7f12097c
+.field public static final guild_security_req_mfa_turn_off:I = 0x7f12097c
 
-.field public static final guild_settings_action_filter_channel_delete:I = 0x7f12097d
+.field public static final guild_security_req_mfa_turn_on:I = 0x7f12097d
 
-.field public static final guild_settings_action_filter_channel_overwrite_create:I = 0x7f12097e
+.field public static final guild_security_req_owner_only:I = 0x7f12097e
 
-.field public static final guild_settings_action_filter_channel_overwrite_delete:I = 0x7f12097f
+.field public static final guild_select:I = 0x7f12097f
 
-.field public static final guild_settings_action_filter_channel_overwrite_update:I = 0x7f120980
+.field public static final guild_settings_action_filter_bot_add:I = 0x7f120980
 
-.field public static final guild_settings_action_filter_channel_update:I = 0x7f120981
+.field public static final guild_settings_action_filter_channel_create:I = 0x7f120981
 
-.field public static final guild_settings_action_filter_emoji_create:I = 0x7f120982
+.field public static final guild_settings_action_filter_channel_delete:I = 0x7f120982
 
-.field public static final guild_settings_action_filter_emoji_delete:I = 0x7f120983
+.field public static final guild_settings_action_filter_channel_overwrite_create:I = 0x7f120983
 
-.field public static final guild_settings_action_filter_emoji_update:I = 0x7f120984
+.field public static final guild_settings_action_filter_channel_overwrite_delete:I = 0x7f120984
 
-.field public static final guild_settings_action_filter_guild_update:I = 0x7f120985
+.field public static final guild_settings_action_filter_channel_overwrite_update:I = 0x7f120985
 
-.field public static final guild_settings_action_filter_integration_create:I = 0x7f120986
+.field public static final guild_settings_action_filter_channel_update:I = 0x7f120986
 
-.field public static final guild_settings_action_filter_integration_delete:I = 0x7f120987
+.field public static final guild_settings_action_filter_emoji_create:I = 0x7f120987
 
-.field public static final guild_settings_action_filter_integration_update:I = 0x7f120988
+.field public static final guild_settings_action_filter_emoji_delete:I = 0x7f120988
 
-.field public static final guild_settings_action_filter_invite_create:I = 0x7f120989
+.field public static final guild_settings_action_filter_emoji_update:I = 0x7f120989
 
-.field public static final guild_settings_action_filter_invite_delete:I = 0x7f12098a
+.field public static final guild_settings_action_filter_guild_update:I = 0x7f12098a
 
-.field public static final guild_settings_action_filter_invite_update:I = 0x7f12098b
+.field public static final guild_settings_action_filter_integration_create:I = 0x7f12098b
 
-.field public static final guild_settings_action_filter_member_ban_add:I = 0x7f12098c
+.field public static final guild_settings_action_filter_integration_delete:I = 0x7f12098c
 
-.field public static final guild_settings_action_filter_member_ban_remove:I = 0x7f12098d
+.field public static final guild_settings_action_filter_integration_update:I = 0x7f12098d
 
-.field public static final guild_settings_action_filter_member_disconnect:I = 0x7f12098e
+.field public static final guild_settings_action_filter_invite_create:I = 0x7f12098e
 
-.field public static final guild_settings_action_filter_member_kick:I = 0x7f12098f
+.field public static final guild_settings_action_filter_invite_delete:I = 0x7f12098f
 
-.field public static final guild_settings_action_filter_member_move:I = 0x7f120990
+.field public static final guild_settings_action_filter_invite_update:I = 0x7f120990
 
-.field public static final guild_settings_action_filter_member_prune:I = 0x7f120991
+.field public static final guild_settings_action_filter_member_ban_add:I = 0x7f120991
 
-.field public static final guild_settings_action_filter_member_role_update:I = 0x7f120992
+.field public static final guild_settings_action_filter_member_ban_remove:I = 0x7f120992
 
-.field public static final guild_settings_action_filter_member_update:I = 0x7f120993
+.field public static final guild_settings_action_filter_member_disconnect:I = 0x7f120993
 
-.field public static final guild_settings_action_filter_message_bulk_delete:I = 0x7f120994
+.field public static final guild_settings_action_filter_member_kick:I = 0x7f120994
 
-.field public static final guild_settings_action_filter_message_delete:I = 0x7f120995
+.field public static final guild_settings_action_filter_member_move:I = 0x7f120995
 
-.field public static final guild_settings_action_filter_message_pin:I = 0x7f120996
+.field public static final guild_settings_action_filter_member_prune:I = 0x7f120996
 
-.field public static final guild_settings_action_filter_message_unpin:I = 0x7f120997
+.field public static final guild_settings_action_filter_member_role_update:I = 0x7f120997
 
-.field public static final guild_settings_action_filter_role_create:I = 0x7f120998
+.field public static final guild_settings_action_filter_member_update:I = 0x7f120998
 
-.field public static final guild_settings_action_filter_role_delete:I = 0x7f120999
+.field public static final guild_settings_action_filter_message_bulk_delete:I = 0x7f120999
 
-.field public static final guild_settings_action_filter_role_update:I = 0x7f12099a
+.field public static final guild_settings_action_filter_message_delete:I = 0x7f12099a
 
-.field public static final guild_settings_action_filter_webhook_create:I = 0x7f12099b
+.field public static final guild_settings_action_filter_message_pin:I = 0x7f12099b
 
-.field public static final guild_settings_action_filter_webhook_delete:I = 0x7f12099c
+.field public static final guild_settings_action_filter_message_unpin:I = 0x7f12099c
 
-.field public static final guild_settings_action_filter_webhook_update:I = 0x7f12099d
+.field public static final guild_settings_action_filter_role_create:I = 0x7f12099d
 
-.field public static final guild_settings_audit_log_bot_add:I = 0x7f12099e
+.field public static final guild_settings_action_filter_role_delete:I = 0x7f12099e
 
-.field public static final guild_settings_audit_log_channel_bitrate_change:I = 0x7f12099f
+.field public static final guild_settings_action_filter_role_update:I = 0x7f12099f
 
-.field public static final guild_settings_audit_log_channel_bitrate_create:I = 0x7f1209a0
+.field public static final guild_settings_action_filter_webhook_create:I = 0x7f1209a0
 
-.field public static final guild_settings_audit_log_channel_category_create:I = 0x7f1209a1
+.field public static final guild_settings_action_filter_webhook_delete:I = 0x7f1209a1
 
-.field public static final guild_settings_audit_log_channel_delete:I = 0x7f1209a2
+.field public static final guild_settings_action_filter_webhook_update:I = 0x7f1209a2
 
-.field public static final guild_settings_audit_log_channel_name_change:I = 0x7f1209a3
+.field public static final guild_settings_audit_log_bot_add:I = 0x7f1209a3
 
-.field public static final guild_settings_audit_log_channel_name_create:I = 0x7f1209a4
+.field public static final guild_settings_audit_log_channel_bitrate_change:I = 0x7f1209a4
 
-.field public static final guild_settings_audit_log_channel_nsfw_disabled:I = 0x7f1209a5
+.field public static final guild_settings_audit_log_channel_bitrate_create:I = 0x7f1209a5
 
-.field public static final guild_settings_audit_log_channel_nsfw_enabled:I = 0x7f1209a6
+.field public static final guild_settings_audit_log_channel_category_create:I = 0x7f1209a6
 
-.field public static final guild_settings_audit_log_channel_overwrite_create:I = 0x7f1209a7
+.field public static final guild_settings_audit_log_channel_delete:I = 0x7f1209a7
 
-.field public static final guild_settings_audit_log_channel_overwrite_delete:I = 0x7f1209a8
+.field public static final guild_settings_audit_log_channel_name_change:I = 0x7f1209a8
 
-.field public static final guild_settings_audit_log_channel_overwrite_update:I = 0x7f1209a9
+.field public static final guild_settings_audit_log_channel_name_create:I = 0x7f1209a9
 
-.field public static final guild_settings_audit_log_channel_permission_overrides_denied:I = 0x7f1209aa
+.field public static final guild_settings_audit_log_channel_nsfw_disabled:I = 0x7f1209aa
 
-.field public static final guild_settings_audit_log_channel_permission_overrides_granted:I = 0x7f1209ab
+.field public static final guild_settings_audit_log_channel_nsfw_enabled:I = 0x7f1209ab
 
-.field public static final guild_settings_audit_log_channel_position_change:I = 0x7f1209ac
+.field public static final guild_settings_audit_log_channel_overwrite_create:I = 0x7f1209ac
 
-.field public static final guild_settings_audit_log_channel_position_create:I = 0x7f1209ad
+.field public static final guild_settings_audit_log_channel_overwrite_delete:I = 0x7f1209ad
 
-.field public static final guild_settings_audit_log_channel_rate_limit_per_user_change:I = 0x7f1209ae
+.field public static final guild_settings_audit_log_channel_overwrite_update:I = 0x7f1209ae
 
-.field public static final guild_settings_audit_log_channel_rate_limit_per_user_create:I = 0x7f1209af
+.field public static final guild_settings_audit_log_channel_permission_overrides_denied:I = 0x7f1209af
 
-.field public static final guild_settings_audit_log_channel_text_create:I = 0x7f1209b0
+.field public static final guild_settings_audit_log_channel_permission_overrides_granted:I = 0x7f1209b0
 
-.field public static final guild_settings_audit_log_channel_topic_change:I = 0x7f1209b1
+.field public static final guild_settings_audit_log_channel_position_change:I = 0x7f1209b1
 
-.field public static final guild_settings_audit_log_channel_topic_create:I = 0x7f1209b2
+.field public static final guild_settings_audit_log_channel_position_create:I = 0x7f1209b2
 
-.field public static final guild_settings_audit_log_channel_type_change:I = 0x7f1209b3
+.field public static final guild_settings_audit_log_channel_rate_limit_per_user_change:I = 0x7f1209b3
 
-.field public static final guild_settings_audit_log_channel_type_create:I = 0x7f1209b4
+.field public static final guild_settings_audit_log_channel_rate_limit_per_user_create:I = 0x7f1209b4
 
-.field public static final guild_settings_audit_log_channel_update:I = 0x7f1209b5
+.field public static final guild_settings_audit_log_channel_text_create:I = 0x7f1209b5
 
-.field public static final guild_settings_audit_log_channel_voice_create:I = 0x7f1209b6
+.field public static final guild_settings_audit_log_channel_topic_change:I = 0x7f1209b6
 
-.field public static final guild_settings_audit_log_common_reason:I = 0x7f1209b7
+.field public static final guild_settings_audit_log_channel_topic_create:I = 0x7f1209b7
 
-.field public static final guild_settings_audit_log_emoji_create:I = 0x7f1209b8
+.field public static final guild_settings_audit_log_channel_type_change:I = 0x7f1209b8
 
-.field public static final guild_settings_audit_log_emoji_delete:I = 0x7f1209b9
+.field public static final guild_settings_audit_log_channel_type_create:I = 0x7f1209b9
 
-.field public static final guild_settings_audit_log_emoji_name_change:I = 0x7f1209ba
+.field public static final guild_settings_audit_log_channel_update:I = 0x7f1209ba
 
-.field public static final guild_settings_audit_log_emoji_name_create:I = 0x7f1209bb
+.field public static final guild_settings_audit_log_channel_voice_create:I = 0x7f1209bb
 
-.field public static final guild_settings_audit_log_emoji_update:I = 0x7f1209bc
+.field public static final guild_settings_audit_log_common_reason:I = 0x7f1209bc
 
-.field public static final guild_settings_audit_log_guild_afk_channel_id_change:I = 0x7f1209bd
+.field public static final guild_settings_audit_log_emoji_create:I = 0x7f1209bd
 
-.field public static final guild_settings_audit_log_guild_afk_channel_id_clear:I = 0x7f1209be
+.field public static final guild_settings_audit_log_emoji_delete:I = 0x7f1209be
 
-.field public static final guild_settings_audit_log_guild_afk_timeout_change:I = 0x7f1209bf
+.field public static final guild_settings_audit_log_emoji_name_change:I = 0x7f1209bf
 
-.field public static final guild_settings_audit_log_guild_banner_hash_change:I = 0x7f1209c0
+.field public static final guild_settings_audit_log_emoji_name_create:I = 0x7f1209c0
 
-.field public static final guild_settings_audit_log_guild_default_message_notifications_change_all_messages:I = 0x7f1209c1
+.field public static final guild_settings_audit_log_emoji_update:I = 0x7f1209c1
 
-.field public static final guild_settings_audit_log_guild_default_message_notifications_change_only_mentions:I = 0x7f1209c2
+.field public static final guild_settings_audit_log_guild_afk_channel_id_change:I = 0x7f1209c2
 
-.field public static final guild_settings_audit_log_guild_description_change:I = 0x7f1209c3
+.field public static final guild_settings_audit_log_guild_afk_channel_id_clear:I = 0x7f1209c3
 
-.field public static final guild_settings_audit_log_guild_description_clear:I = 0x7f1209c4
+.field public static final guild_settings_audit_log_guild_afk_timeout_change:I = 0x7f1209c4
 
-.field public static final guild_settings_audit_log_guild_discovery_splash_hash_change:I = 0x7f1209c5
+.field public static final guild_settings_audit_log_guild_banner_hash_change:I = 0x7f1209c5
 
-.field public static final guild_settings_audit_log_guild_explicit_content_filter_all_members:I = 0x7f1209c6
+.field public static final guild_settings_audit_log_guild_default_message_notifications_change_all_messages:I = 0x7f1209c6
 
-.field public static final guild_settings_audit_log_guild_explicit_content_filter_disable:I = 0x7f1209c7
+.field public static final guild_settings_audit_log_guild_default_message_notifications_change_only_mentions:I = 0x7f1209c7
 
-.field public static final guild_settings_audit_log_guild_explicit_content_filter_members_without_roles:I = 0x7f1209c8
+.field public static final guild_settings_audit_log_guild_description_change:I = 0x7f1209c8
 
-.field public static final guild_settings_audit_log_guild_icon_hash_change:I = 0x7f1209c9
+.field public static final guild_settings_audit_log_guild_description_clear:I = 0x7f1209c9
 
-.field public static final guild_settings_audit_log_guild_mfa_level_disabled:I = 0x7f1209ca
+.field public static final guild_settings_audit_log_guild_discovery_splash_hash_change:I = 0x7f1209ca
 
-.field public static final guild_settings_audit_log_guild_mfa_level_enabled:I = 0x7f1209cb
+.field public static final guild_settings_audit_log_guild_explicit_content_filter_all_members:I = 0x7f1209cb
 
-.field public static final guild_settings_audit_log_guild_name_change:I = 0x7f1209cc
+.field public static final guild_settings_audit_log_guild_explicit_content_filter_disable:I = 0x7f1209cc
 
-.field public static final guild_settings_audit_log_guild_owner_id_change:I = 0x7f1209cd
+.field public static final guild_settings_audit_log_guild_explicit_content_filter_members_without_roles:I = 0x7f1209cd
 
-.field public static final guild_settings_audit_log_guild_preferred_locale_change:I = 0x7f1209ce
+.field public static final guild_settings_audit_log_guild_icon_hash_change:I = 0x7f1209ce
 
-.field public static final guild_settings_audit_log_guild_region_change:I = 0x7f1209cf
+.field public static final guild_settings_audit_log_guild_mfa_level_disabled:I = 0x7f1209cf
 
-.field public static final guild_settings_audit_log_guild_rules_channel_id_change:I = 0x7f1209d0
+.field public static final guild_settings_audit_log_guild_mfa_level_enabled:I = 0x7f1209d0
 
-.field public static final guild_settings_audit_log_guild_rules_channel_id_clear:I = 0x7f1209d1
+.field public static final guild_settings_audit_log_guild_name_change:I = 0x7f1209d1
 
-.field public static final guild_settings_audit_log_guild_splash_hash_change:I = 0x7f1209d2
+.field public static final guild_settings_audit_log_guild_owner_id_change:I = 0x7f1209d2
 
-.field public static final guild_settings_audit_log_guild_system_channel_id_change:I = 0x7f1209d3
+.field public static final guild_settings_audit_log_guild_preferred_locale_change:I = 0x7f1209d3
 
-.field public static final guild_settings_audit_log_guild_system_channel_id_disable:I = 0x7f1209d4
+.field public static final guild_settings_audit_log_guild_region_change:I = 0x7f1209d4
 
-.field public static final guild_settings_audit_log_guild_update:I = 0x7f1209d5
+.field public static final guild_settings_audit_log_guild_rules_channel_id_change:I = 0x7f1209d5
 
-.field public static final guild_settings_audit_log_guild_updates_channel_id_change:I = 0x7f1209d6
+.field public static final guild_settings_audit_log_guild_rules_channel_id_clear:I = 0x7f1209d6
 
-.field public static final guild_settings_audit_log_guild_updates_channel_id_clear:I = 0x7f1209d7
+.field public static final guild_settings_audit_log_guild_splash_hash_change:I = 0x7f1209d7
 
-.field public static final guild_settings_audit_log_guild_vanity_url_code_change:I = 0x7f1209d8
+.field public static final guild_settings_audit_log_guild_system_channel_id_change:I = 0x7f1209d8
 
-.field public static final guild_settings_audit_log_guild_vanity_url_code_delete:I = 0x7f1209d9
+.field public static final guild_settings_audit_log_guild_system_channel_id_disable:I = 0x7f1209d9
 
-.field public static final guild_settings_audit_log_guild_verification_level_change_high:I = 0x7f1209da
+.field public static final guild_settings_audit_log_guild_update:I = 0x7f1209da
 
-.field public static final guild_settings_audit_log_guild_verification_level_change_low:I = 0x7f1209db
+.field public static final guild_settings_audit_log_guild_updates_channel_id_change:I = 0x7f1209db
 
-.field public static final guild_settings_audit_log_guild_verification_level_change_medium:I = 0x7f1209dc
+.field public static final guild_settings_audit_log_guild_updates_channel_id_clear:I = 0x7f1209dc
 
-.field public static final guild_settings_audit_log_guild_verification_level_change_none:I = 0x7f1209dd
+.field public static final guild_settings_audit_log_guild_vanity_url_code_change:I = 0x7f1209dd
 
-.field public static final guild_settings_audit_log_guild_verification_level_change_very_high:I = 0x7f1209de
+.field public static final guild_settings_audit_log_guild_vanity_url_code_delete:I = 0x7f1209de
 
-.field public static final guild_settings_audit_log_guild_widget_channel_id_change:I = 0x7f1209df
+.field public static final guild_settings_audit_log_guild_verification_level_change_high:I = 0x7f1209df
 
-.field public static final guild_settings_audit_log_guild_widget_channel_id_delete:I = 0x7f1209e0
+.field public static final guild_settings_audit_log_guild_verification_level_change_low:I = 0x7f1209e0
 
-.field public static final guild_settings_audit_log_guild_widget_disabled:I = 0x7f1209e1
+.field public static final guild_settings_audit_log_guild_verification_level_change_medium:I = 0x7f1209e1
 
-.field public static final guild_settings_audit_log_guild_widget_enabled:I = 0x7f1209e2
+.field public static final guild_settings_audit_log_guild_verification_level_change_none:I = 0x7f1209e2
 
-.field public static final guild_settings_audit_log_integration_create:I = 0x7f1209e3
+.field public static final guild_settings_audit_log_guild_verification_level_change_very_high:I = 0x7f1209e3
 
-.field public static final guild_settings_audit_log_integration_delete:I = 0x7f1209e4
+.field public static final guild_settings_audit_log_guild_widget_channel_id_change:I = 0x7f1209e4
 
-.field public static final guild_settings_audit_log_integration_enable_emoticons_off:I = 0x7f1209e5
+.field public static final guild_settings_audit_log_guild_widget_channel_id_delete:I = 0x7f1209e5
 
-.field public static final guild_settings_audit_log_integration_enable_emoticons_on:I = 0x7f1209e6
+.field public static final guild_settings_audit_log_guild_widget_disabled:I = 0x7f1209e6
 
-.field public static final guild_settings_audit_log_integration_expire_behavior_kick_from_server:I = 0x7f1209e7
+.field public static final guild_settings_audit_log_guild_widget_enabled:I = 0x7f1209e7
 
-.field public static final guild_settings_audit_log_integration_expire_behavior_remove_synced_role:I = 0x7f1209e8
+.field public static final guild_settings_audit_log_integration_create:I = 0x7f1209e8
 
-.field public static final guild_settings_audit_log_integration_expire_grace_period:I = 0x7f1209e9
+.field public static final guild_settings_audit_log_integration_delete:I = 0x7f1209e9
 
-.field public static final guild_settings_audit_log_integration_update:I = 0x7f1209ea
+.field public static final guild_settings_audit_log_integration_enable_emoticons_off:I = 0x7f1209ea
 
-.field public static final guild_settings_audit_log_invite_channel_create:I = 0x7f1209eb
+.field public static final guild_settings_audit_log_integration_enable_emoticons_on:I = 0x7f1209eb
 
-.field public static final guild_settings_audit_log_invite_code_create:I = 0x7f1209ec
+.field public static final guild_settings_audit_log_integration_expire_behavior_kick_from_server:I = 0x7f1209ec
 
-.field public static final guild_settings_audit_log_invite_create:I = 0x7f1209ed
+.field public static final guild_settings_audit_log_integration_expire_behavior_remove_synced_role:I = 0x7f1209ed
 
-.field public static final guild_settings_audit_log_invite_delete:I = 0x7f1209ee
+.field public static final guild_settings_audit_log_integration_expire_grace_period:I = 0x7f1209ee
 
-.field public static final guild_settings_audit_log_invite_max_age_create:I = 0x7f1209ef
+.field public static final guild_settings_audit_log_integration_update:I = 0x7f1209ef
 
-.field public static final guild_settings_audit_log_invite_max_age_create_infinite:I = 0x7f1209f0
+.field public static final guild_settings_audit_log_invite_channel_create:I = 0x7f1209f0
 
-.field public static final guild_settings_audit_log_invite_max_uses_create:I = 0x7f1209f1
+.field public static final guild_settings_audit_log_invite_code_create:I = 0x7f1209f1
 
-.field public static final guild_settings_audit_log_invite_max_uses_create_infinite:I = 0x7f1209f2
+.field public static final guild_settings_audit_log_invite_create:I = 0x7f1209f2
 
-.field public static final guild_settings_audit_log_invite_temporary_off:I = 0x7f1209f3
+.field public static final guild_settings_audit_log_invite_delete:I = 0x7f1209f3
 
-.field public static final guild_settings_audit_log_invite_temporary_on:I = 0x7f1209f4
+.field public static final guild_settings_audit_log_invite_max_age_create:I = 0x7f1209f4
 
-.field public static final guild_settings_audit_log_invite_update:I = 0x7f1209f5
+.field public static final guild_settings_audit_log_invite_max_age_create_infinite:I = 0x7f1209f5
 
-.field public static final guild_settings_audit_log_load_more:I = 0x7f1209f6
+.field public static final guild_settings_audit_log_invite_max_uses_create:I = 0x7f1209f6
 
-.field public static final guild_settings_audit_log_member_ban_add:I = 0x7f1209f7
+.field public static final guild_settings_audit_log_invite_max_uses_create_infinite:I = 0x7f1209f7
 
-.field public static final guild_settings_audit_log_member_ban_remove:I = 0x7f1209f8
+.field public static final guild_settings_audit_log_invite_temporary_off:I = 0x7f1209f8
 
-.field public static final guild_settings_audit_log_member_deaf_off:I = 0x7f1209f9
+.field public static final guild_settings_audit_log_invite_temporary_on:I = 0x7f1209f9
 
-.field public static final guild_settings_audit_log_member_deaf_on:I = 0x7f1209fa
+.field public static final guild_settings_audit_log_invite_update:I = 0x7f1209fa
 
-.field public static final guild_settings_audit_log_member_disconnect:I = 0x7f1209fb
+.field public static final guild_settings_audit_log_load_more:I = 0x7f1209fb
 
-.field public static final guild_settings_audit_log_member_kick:I = 0x7f1209fc
+.field public static final guild_settings_audit_log_member_ban_add:I = 0x7f1209fc
 
-.field public static final guild_settings_audit_log_member_move:I = 0x7f1209fd
+.field public static final guild_settings_audit_log_member_ban_remove:I = 0x7f1209fd
 
-.field public static final guild_settings_audit_log_member_mute_off:I = 0x7f1209fe
+.field public static final guild_settings_audit_log_member_deaf_off:I = 0x7f1209fe
 
-.field public static final guild_settings_audit_log_member_mute_on:I = 0x7f1209ff
+.field public static final guild_settings_audit_log_member_deaf_on:I = 0x7f1209ff
 
-.field public static final guild_settings_audit_log_member_nick_change:I = 0x7f120a00
+.field public static final guild_settings_audit_log_member_disconnect:I = 0x7f120a00
 
-.field public static final guild_settings_audit_log_member_nick_create:I = 0x7f120a01
+.field public static final guild_settings_audit_log_member_kick:I = 0x7f120a01
 
-.field public static final guild_settings_audit_log_member_nick_delete:I = 0x7f120a02
+.field public static final guild_settings_audit_log_member_move:I = 0x7f120a02
 
-.field public static final guild_settings_audit_log_member_prune:I = 0x7f120a03
+.field public static final guild_settings_audit_log_member_mute_off:I = 0x7f120a03
 
-.field public static final guild_settings_audit_log_member_prune_delete_days:I = 0x7f120a04
+.field public static final guild_settings_audit_log_member_mute_on:I = 0x7f120a04
 
-.field public static final guild_settings_audit_log_member_role_update:I = 0x7f120a05
+.field public static final guild_settings_audit_log_member_nick_change:I = 0x7f120a05
 
-.field public static final guild_settings_audit_log_member_roles_add:I = 0x7f120a06
+.field public static final guild_settings_audit_log_member_nick_create:I = 0x7f120a06
 
-.field public static final guild_settings_audit_log_member_roles_remove:I = 0x7f120a07
+.field public static final guild_settings_audit_log_member_nick_delete:I = 0x7f120a07
 
-.field public static final guild_settings_audit_log_member_update:I = 0x7f120a08
+.field public static final guild_settings_audit_log_member_prune:I = 0x7f120a08
 
-.field public static final guild_settings_audit_log_message_bulk_delete:I = 0x7f120a09
+.field public static final guild_settings_audit_log_member_prune_delete_days:I = 0x7f120a09
 
-.field public static final guild_settings_audit_log_message_delete:I = 0x7f120a0a
+.field public static final guild_settings_audit_log_member_role_update:I = 0x7f120a0a
 
-.field public static final guild_settings_audit_log_message_pin:I = 0x7f120a0b
+.field public static final guild_settings_audit_log_member_roles_add:I = 0x7f120a0b
 
-.field public static final guild_settings_audit_log_message_unpin:I = 0x7f120a0c
+.field public static final guild_settings_audit_log_member_roles_remove:I = 0x7f120a0c
 
-.field public static final guild_settings_audit_log_role_color:I = 0x7f120a0d
+.field public static final guild_settings_audit_log_member_update:I = 0x7f120a0d
 
-.field public static final guild_settings_audit_log_role_color_ios:I = 0x7f120a0e
+.field public static final guild_settings_audit_log_message_bulk_delete:I = 0x7f120a0e
 
-.field public static final guild_settings_audit_log_role_color_none:I = 0x7f120a0f
+.field public static final guild_settings_audit_log_message_delete:I = 0x7f120a0f
 
-.field public static final guild_settings_audit_log_role_create:I = 0x7f120a10
+.field public static final guild_settings_audit_log_message_pin:I = 0x7f120a10
 
-.field public static final guild_settings_audit_log_role_delete:I = 0x7f120a11
+.field public static final guild_settings_audit_log_message_unpin:I = 0x7f120a11
 
-.field public static final guild_settings_audit_log_role_hoist_off:I = 0x7f120a12
+.field public static final guild_settings_audit_log_role_color:I = 0x7f120a12
 
-.field public static final guild_settings_audit_log_role_hoist_on:I = 0x7f120a13
+.field public static final guild_settings_audit_log_role_color_ios:I = 0x7f120a13
 
-.field public static final guild_settings_audit_log_role_mentionable_off:I = 0x7f120a14
+.field public static final guild_settings_audit_log_role_color_none:I = 0x7f120a14
 
-.field public static final guild_settings_audit_log_role_mentionable_on:I = 0x7f120a15
+.field public static final guild_settings_audit_log_role_create:I = 0x7f120a15
 
-.field public static final guild_settings_audit_log_role_name_change:I = 0x7f120a16
+.field public static final guild_settings_audit_log_role_delete:I = 0x7f120a16
 
-.field public static final guild_settings_audit_log_role_name_create:I = 0x7f120a17
+.field public static final guild_settings_audit_log_role_hoist_off:I = 0x7f120a17
 
-.field public static final guild_settings_audit_log_role_permissions_denied:I = 0x7f120a18
+.field public static final guild_settings_audit_log_role_hoist_on:I = 0x7f120a18
 
-.field public static final guild_settings_audit_log_role_permissions_granted:I = 0x7f120a19
+.field public static final guild_settings_audit_log_role_mentionable_off:I = 0x7f120a19
 
-.field public static final guild_settings_audit_log_role_update:I = 0x7f120a1a
+.field public static final guild_settings_audit_log_role_mentionable_on:I = 0x7f120a1a
 
-.field public static final guild_settings_audit_log_time_at_android:I = 0x7f120a1b
+.field public static final guild_settings_audit_log_role_name_change:I = 0x7f120a1b
 
-.field public static final guild_settings_audit_log_unknown_action:I = 0x7f120a1c
+.field public static final guild_settings_audit_log_role_name_create:I = 0x7f120a1c
 
-.field public static final guild_settings_audit_log_webhook_avatar:I = 0x7f120a1d
+.field public static final guild_settings_audit_log_role_permissions_denied:I = 0x7f120a1d
 
-.field public static final guild_settings_audit_log_webhook_channel_change:I = 0x7f120a1e
+.field public static final guild_settings_audit_log_role_permissions_granted:I = 0x7f120a1e
 
-.field public static final guild_settings_audit_log_webhook_channel_create:I = 0x7f120a1f
+.field public static final guild_settings_audit_log_role_update:I = 0x7f120a1f
 
-.field public static final guild_settings_audit_log_webhook_create:I = 0x7f120a20
+.field public static final guild_settings_audit_log_time_at_android:I = 0x7f120a20
 
-.field public static final guild_settings_audit_log_webhook_delete:I = 0x7f120a21
+.field public static final guild_settings_audit_log_unknown_action:I = 0x7f120a21
 
-.field public static final guild_settings_audit_log_webhook_name_change:I = 0x7f120a22
+.field public static final guild_settings_audit_log_webhook_avatar:I = 0x7f120a22
 
-.field public static final guild_settings_audit_log_webhook_name_create:I = 0x7f120a23
+.field public static final guild_settings_audit_log_webhook_channel_change:I = 0x7f120a23
 
-.field public static final guild_settings_audit_log_webhook_update:I = 0x7f120a24
+.field public static final guild_settings_audit_log_webhook_channel_create:I = 0x7f120a24
 
-.field public static final guild_settings_banner_recommend:I = 0x7f120a25
+.field public static final guild_settings_audit_log_webhook_create:I = 0x7f120a25
 
-.field public static final guild_settings_community:I = 0x7f120a26
+.field public static final guild_settings_audit_log_webhook_delete:I = 0x7f120a26
 
-.field public static final guild_settings_community_administrator_only:I = 0x7f120a27
+.field public static final guild_settings_audit_log_webhook_name_change:I = 0x7f120a27
 
-.field public static final guild_settings_community_disable_community:I = 0x7f120a28
+.field public static final guild_settings_audit_log_webhook_name_create:I = 0x7f120a28
 
-.field public static final guild_settings_community_disable_community_description:I = 0x7f120a29
+.field public static final guild_settings_audit_log_webhook_update:I = 0x7f120a29
 
-.field public static final guild_settings_community_enable_community:I = 0x7f120a2a
+.field public static final guild_settings_banner_recommend:I = 0x7f120a2a
 
-.field public static final guild_settings_community_intro_body:I = 0x7f120a2b
+.field public static final guild_settings_community:I = 0x7f120a2b
 
-.field public static final guild_settings_community_intro_details:I = 0x7f120a2c
+.field public static final guild_settings_community_administrator_only:I = 0x7f120a2c
 
-.field public static final guild_settings_community_intro_details_mobile:I = 0x7f120a2d
+.field public static final guild_settings_community_disable_community:I = 0x7f120a2d
 
-.field public static final guild_settings_community_intro_header:I = 0x7f120a2e
+.field public static final guild_settings_community_disable_community_description:I = 0x7f120a2e
 
-.field public static final guild_settings_community_intro_learn_more:I = 0x7f120a2f
+.field public static final guild_settings_community_enable_community:I = 0x7f120a2f
 
-.field public static final guild_settings_community_intro_upsell_analytics_body:I = 0x7f120a30
+.field public static final guild_settings_community_intro_body:I = 0x7f120a30
 
-.field public static final guild_settings_community_intro_upsell_analytics_header:I = 0x7f120a31
+.field public static final guild_settings_community_intro_details:I = 0x7f120a31
 
-.field public static final guild_settings_community_intro_upsell_analytics_tooltip:I = 0x7f120a32
+.field public static final guild_settings_community_intro_details_mobile:I = 0x7f120a32
 
-.field public static final guild_settings_community_intro_upsell_discovery_body:I = 0x7f120a33
+.field public static final guild_settings_community_intro_header:I = 0x7f120a33
 
-.field public static final guild_settings_community_intro_upsell_discovery_header:I = 0x7f120a34
+.field public static final guild_settings_community_intro_learn_more:I = 0x7f120a34
 
-.field public static final guild_settings_community_intro_upsell_partner_body:I = 0x7f120a35
+.field public static final guild_settings_community_intro_upsell_analytics_body:I = 0x7f120a35
 
-.field public static final guild_settings_community_intro_upsell_partner_header:I = 0x7f120a36
+.field public static final guild_settings_community_intro_upsell_analytics_header:I = 0x7f120a36
 
-.field public static final guild_settings_community_intro_upsell_stay_informed_body:I = 0x7f120a37
+.field public static final guild_settings_community_intro_upsell_analytics_tooltip:I = 0x7f120a37
 
-.field public static final guild_settings_community_intro_upsell_stay_informed_header:I = 0x7f120a38
+.field public static final guild_settings_community_intro_upsell_discovery_body:I = 0x7f120a38
 
-.field public static final guild_settings_community_locale_help:I = 0x7f120a39
+.field public static final guild_settings_community_intro_upsell_discovery_header:I = 0x7f120a39
 
-.field public static final guild_settings_community_mod_channel_help:I = 0x7f120a3a
+.field public static final guild_settings_community_intro_upsell_partner_body:I = 0x7f120a3a
 
-.field public static final guild_settings_community_mod_channel_help_mobile:I = 0x7f120a3b
+.field public static final guild_settings_community_intro_upsell_partner_header:I = 0x7f120a3b
 
-.field public static final guild_settings_community_mod_channel_selector_title:I = 0x7f120a3c
+.field public static final guild_settings_community_intro_upsell_stay_informed_body:I = 0x7f120a3c
 
-.field public static final guild_settings_community_mod_channel_title:I = 0x7f120a3d
+.field public static final guild_settings_community_intro_upsell_stay_informed_header:I = 0x7f120a3d
 
-.field public static final guild_settings_community_rules_channel_help:I = 0x7f120a3e
+.field public static final guild_settings_community_locale_help:I = 0x7f120a3e
 
-.field public static final guild_settings_community_rules_channel_help_mobile:I = 0x7f120a3f
+.field public static final guild_settings_community_mod_channel_help:I = 0x7f120a3f
 
-.field public static final guild_settings_community_upsell_body:I = 0x7f120a40
+.field public static final guild_settings_community_mod_channel_help_mobile:I = 0x7f120a40
 
-.field public static final guild_settings_community_upsell_button_analytics:I = 0x7f120a41
+.field public static final guild_settings_community_mod_channel_selector_title:I = 0x7f120a41
 
-.field public static final guild_settings_community_upsell_button_discovery:I = 0x7f120a42
+.field public static final guild_settings_community_mod_channel_title:I = 0x7f120a42
 
-.field public static final guild_settings_community_upsell_button_welcome_screen:I = 0x7f120a43
+.field public static final guild_settings_community_rules_channel_help:I = 0x7f120a43
 
-.field public static final guild_settings_community_upsell_header:I = 0x7f120a44
+.field public static final guild_settings_community_rules_channel_help_mobile:I = 0x7f120a44
 
-.field public static final guild_settings_default_notification_settings_intro:I = 0x7f120a45
+.field public static final guild_settings_community_upsell_body:I = 0x7f120a45
 
-.field public static final guild_settings_default_notification_settings_protip:I = 0x7f120a46
+.field public static final guild_settings_community_upsell_button_analytics:I = 0x7f120a46
 
-.field public static final guild_settings_default_notifications_large_guild_notify_all:I = 0x7f120a47
+.field public static final guild_settings_community_upsell_button_discovery:I = 0x7f120a47
 
-.field public static final guild_settings_disable_discoverable:I = 0x7f120a48
+.field public static final guild_settings_community_upsell_button_welcome_screen:I = 0x7f120a48
 
-.field public static final guild_settings_discovery_admin_only:I = 0x7f120a49
+.field public static final guild_settings_community_upsell_header:I = 0x7f120a49
 
-.field public static final guild_settings_discovery_byline:I = 0x7f120a4a
+.field public static final guild_settings_default_notification_settings_intro:I = 0x7f120a4a
 
-.field public static final guild_settings_discovery_checklist_2fa:I = 0x7f120a4b
+.field public static final guild_settings_default_notification_settings_protip:I = 0x7f120a4b
 
-.field public static final guild_settings_discovery_checklist_2fa_description:I = 0x7f120a4c
+.field public static final guild_settings_default_notifications_large_guild_notify_all:I = 0x7f120a4c
 
-.field public static final guild_settings_discovery_checklist_2fa_description_failing:I = 0x7f120a4d
+.field public static final guild_settings_disable_discoverable:I = 0x7f120a4d
 
-.field public static final guild_settings_discovery_checklist_2fa_failing:I = 0x7f120a4e
+.field public static final guild_settings_discovery_admin_only:I = 0x7f120a4e
 
-.field public static final guild_settings_discovery_checklist_abide_by_guidelines:I = 0x7f120a4f
+.field public static final guild_settings_discovery_byline:I = 0x7f120a4f
 
-.field public static final guild_settings_discovery_checklist_age:I = 0x7f120a50
+.field public static final guild_settings_discovery_checklist_2fa:I = 0x7f120a50
 
-.field public static final guild_settings_discovery_checklist_age_description:I = 0x7f120a51
+.field public static final guild_settings_discovery_checklist_2fa_description:I = 0x7f120a51
 
-.field public static final guild_settings_discovery_checklist_age_description_failing:I = 0x7f120a52
+.field public static final guild_settings_discovery_checklist_2fa_description_failing:I = 0x7f120a52
 
-.field public static final guild_settings_discovery_checklist_age_failing:I = 0x7f120a53
+.field public static final guild_settings_discovery_checklist_2fa_failing:I = 0x7f120a53
 
-.field public static final guild_settings_discovery_checklist_bad_standing:I = 0x7f120a54
+.field public static final guild_settings_discovery_checklist_abide_by_guidelines:I = 0x7f120a54
 
-.field public static final guild_settings_discovery_checklist_change_channel_categories:I = 0x7f120a55
+.field public static final guild_settings_discovery_checklist_age:I = 0x7f120a55
 
-.field public static final guild_settings_discovery_checklist_change_channel_names:I = 0x7f120a56
+.field public static final guild_settings_discovery_checklist_age_description:I = 0x7f120a56
 
-.field public static final guild_settings_discovery_checklist_change_description:I = 0x7f120a57
+.field public static final guild_settings_discovery_checklist_age_description_failing:I = 0x7f120a57
 
-.field public static final guild_settings_discovery_checklist_change_name:I = 0x7f120a58
+.field public static final guild_settings_discovery_checklist_age_failing:I = 0x7f120a58
 
-.field public static final guild_settings_discovery_checklist_communicator_failing_action:I = 0x7f120a59
+.field public static final guild_settings_discovery_checklist_bad_standing:I = 0x7f120a59
 
-.field public static final guild_settings_discovery_checklist_communicator_failing_action_details:I = 0x7f120a5a
+.field public static final guild_settings_discovery_checklist_change_channel_categories:I = 0x7f120a5a
 
-.field public static final guild_settings_discovery_checklist_communicator_progress_label:I = 0x7f120a5b
+.field public static final guild_settings_discovery_checklist_change_channel_names:I = 0x7f120a5b
 
-.field public static final guild_settings_discovery_checklist_engagement_failing:I = 0x7f120a5c
+.field public static final guild_settings_discovery_checklist_change_description:I = 0x7f120a5c
 
-.field public static final guild_settings_discovery_checklist_good_standing:I = 0x7f120a5d
+.field public static final guild_settings_discovery_checklist_change_name:I = 0x7f120a5d
 
-.field public static final guild_settings_discovery_checklist_health_definitions_intro:I = 0x7f120a5e
+.field public static final guild_settings_discovery_checklist_communicator_failing_action:I = 0x7f120a5e
 
-.field public static final guild_settings_discovery_checklist_health_view_details:I = 0x7f120a5f
+.field public static final guild_settings_discovery_checklist_communicator_failing_action_details:I = 0x7f120a5f
 
-.field public static final guild_settings_discovery_checklist_healthy:I = 0x7f120a60
+.field public static final guild_settings_discovery_checklist_communicator_progress_label:I = 0x7f120a60
 
-.field public static final guild_settings_discovery_checklist_healthy_description:I = 0x7f120a61
+.field public static final guild_settings_discovery_checklist_engagement_failing:I = 0x7f120a61
 
-.field public static final guild_settings_discovery_checklist_healthy_description_failing:I = 0x7f120a62
+.field public static final guild_settings_discovery_checklist_good_standing:I = 0x7f120a62
 
-.field public static final guild_settings_discovery_checklist_healthy_description_pending:I = 0x7f120a63
+.field public static final guild_settings_discovery_checklist_health_definitions_intro:I = 0x7f120a63
 
-.field public static final guild_settings_discovery_checklist_healthy_description_pending_size:I = 0x7f120a64
+.field public static final guild_settings_discovery_checklist_health_view_details:I = 0x7f120a64
 
-.field public static final guild_settings_discovery_checklist_healthy_failing:I = 0x7f120a65
+.field public static final guild_settings_discovery_checklist_healthy:I = 0x7f120a65
 
-.field public static final guild_settings_discovery_checklist_healthy_pending:I = 0x7f120a66
+.field public static final guild_settings_discovery_checklist_healthy_description:I = 0x7f120a66
 
-.field public static final guild_settings_discovery_checklist_loading:I = 0x7f120a67
+.field public static final guild_settings_discovery_checklist_healthy_description_failing:I = 0x7f120a67
 
-.field public static final guild_settings_discovery_checklist_nsfw:I = 0x7f120a68
+.field public static final guild_settings_discovery_checklist_healthy_description_pending:I = 0x7f120a68
 
-.field public static final guild_settings_discovery_checklist_nsfw_description:I = 0x7f120a69
+.field public static final guild_settings_discovery_checklist_healthy_description_pending_size:I = 0x7f120a69
 
-.field public static final guild_settings_discovery_checklist_nsfw_failing:I = 0x7f120a6a
+.field public static final guild_settings_discovery_checklist_healthy_failing:I = 0x7f120a6a
 
-.field public static final guild_settings_discovery_checklist_progress_requirement_label:I = 0x7f120a6b
+.field public static final guild_settings_discovery_checklist_healthy_pending:I = 0x7f120a6b
 
-.field public static final guild_settings_discovery_checklist_retention_failing:I = 0x7f120a6c
+.field public static final guild_settings_discovery_checklist_loading:I = 0x7f120a6c
 
-.field public static final guild_settings_discovery_checklist_retention_failing_action:I = 0x7f120a6d
+.field public static final guild_settings_discovery_checklist_nsfw:I = 0x7f120a6d
 
-.field public static final guild_settings_discovery_checklist_retention_failing_action_details_updated:I = 0x7f120a6e
+.field public static final guild_settings_discovery_checklist_nsfw_description:I = 0x7f120a6e
 
-.field public static final guild_settings_discovery_checklist_retention_progress_label:I = 0x7f120a6f
+.field public static final guild_settings_discovery_checklist_nsfw_failing:I = 0x7f120a6f
 
-.field public static final guild_settings_discovery_checklist_safe:I = 0x7f120a70
+.field public static final guild_settings_discovery_checklist_progress_requirement_label:I = 0x7f120a70
 
-.field public static final guild_settings_discovery_checklist_safe_description:I = 0x7f120a71
+.field public static final guild_settings_discovery_checklist_retention_failing:I = 0x7f120a71
 
-.field public static final guild_settings_discovery_checklist_safe_description_failing:I = 0x7f120a72
+.field public static final guild_settings_discovery_checklist_retention_failing_action:I = 0x7f120a72
 
-.field public static final guild_settings_discovery_checklist_safe_description_failing_guidelines:I = 0x7f120a73
+.field public static final guild_settings_discovery_checklist_retention_failing_action_details_updated:I = 0x7f120a73
 
-.field public static final guild_settings_discovery_checklist_safe_failing:I = 0x7f120a74
+.field public static final guild_settings_discovery_checklist_retention_progress_label:I = 0x7f120a74
 
-.field public static final guild_settings_discovery_checklist_score_explain:I = 0x7f120a75
+.field public static final guild_settings_discovery_checklist_safe:I = 0x7f120a75
 
-.field public static final guild_settings_discovery_checklist_size:I = 0x7f120a76
+.field public static final guild_settings_discovery_checklist_safe_description:I = 0x7f120a76
 
-.field public static final guild_settings_discovery_checklist_size_description:I = 0x7f120a77
+.field public static final guild_settings_discovery_checklist_safe_description_failing:I = 0x7f120a77
 
-.field public static final guild_settings_discovery_checklist_size_description_failing:I = 0x7f120a78
+.field public static final guild_settings_discovery_checklist_safe_description_failing_guidelines:I = 0x7f120a78
 
-.field public static final guild_settings_discovery_checklist_size_description_failing_partners:I = 0x7f120a79
+.field public static final guild_settings_discovery_checklist_safe_failing:I = 0x7f120a79
 
-.field public static final guild_settings_discovery_checklist_size_failing:I = 0x7f120a7a
+.field public static final guild_settings_discovery_checklist_score_explain:I = 0x7f120a7a
 
-.field public static final guild_settings_discovery_checklist_visitor_failing_action:I = 0x7f120a7b
+.field public static final guild_settings_discovery_checklist_size:I = 0x7f120a7b
 
-.field public static final guild_settings_discovery_checklist_visitor_failing_action_details:I = 0x7f120a7c
+.field public static final guild_settings_discovery_checklist_size_description:I = 0x7f120a7c
 
-.field public static final guild_settings_discovery_checklist_visitor_progress_label:I = 0x7f120a7d
+.field public static final guild_settings_discovery_checklist_size_description_failing:I = 0x7f120a7d
 
-.field public static final guild_settings_discovery_disable_public_confirm_text:I = 0x7f120a7e
+.field public static final guild_settings_discovery_checklist_size_description_failing_partners:I = 0x7f120a7e
 
-.field public static final guild_settings_discovery_disable_public_confirm_title:I = 0x7f120a7f
+.field public static final guild_settings_discovery_checklist_size_failing:I = 0x7f120a7f
 
-.field public static final guild_settings_discovery_disqualified:I = 0x7f120a80
+.field public static final guild_settings_discovery_checklist_visitor_failing_action:I = 0x7f120a80
 
-.field public static final guild_settings_discovery_disqualified_description:I = 0x7f120a81
+.field public static final guild_settings_discovery_checklist_visitor_failing_action_details:I = 0x7f120a81
 
-.field public static final guild_settings_discovery_emoji_discoverability_description:I = 0x7f120a82
+.field public static final guild_settings_discovery_checklist_visitor_progress_label:I = 0x7f120a82
 
-.field public static final guild_settings_discovery_emoji_discoverability_disable:I = 0x7f120a83
+.field public static final guild_settings_discovery_disable_public_confirm_text:I = 0x7f120a83
 
-.field public static final guild_settings_discovery_emoji_discoverability_enable:I = 0x7f120a84
+.field public static final guild_settings_discovery_disable_public_confirm_title:I = 0x7f120a84
 
-.field public static final guild_settings_discovery_emoji_discoverability_title:I = 0x7f120a85
+.field public static final guild_settings_discovery_disqualified:I = 0x7f120a85
 
-.field public static final guild_settings_discovery_enabled_modal_body:I = 0x7f120a86
+.field public static final guild_settings_discovery_disqualified_description:I = 0x7f120a86
 
-.field public static final guild_settings_discovery_enabled_modal_dismiss:I = 0x7f120a87
+.field public static final guild_settings_discovery_emoji_discoverability_description:I = 0x7f120a87
 
-.field public static final guild_settings_discovery_enabled_modal_header:I = 0x7f120a88
+.field public static final guild_settings_discovery_emoji_discoverability_disable:I = 0x7f120a88
 
-.field public static final guild_settings_discovery_header:I = 0x7f120a89
+.field public static final guild_settings_discovery_emoji_discoverability_enable:I = 0x7f120a89
 
-.field public static final guild_settings_discovery_locale_help:I = 0x7f120a8a
+.field public static final guild_settings_discovery_emoji_discoverability_title:I = 0x7f120a8a
 
-.field public static final guild_settings_discovery_pending_healthy:I = 0x7f120a8b
+.field public static final guild_settings_discovery_enabled_modal_body:I = 0x7f120a8b
 
-.field public static final guild_settings_discovery_perk_customize:I = 0x7f120a8c
+.field public static final guild_settings_discovery_enabled_modal_dismiss:I = 0x7f120a8c
 
-.field public static final guild_settings_discovery_perk_featured:I = 0x7f120a8d
+.field public static final guild_settings_discovery_enabled_modal_header:I = 0x7f120a8d
 
-.field public static final guild_settings_discovery_perk_find:I = 0x7f120a8e
+.field public static final guild_settings_discovery_header:I = 0x7f120a8e
 
-.field public static final guild_settings_discovery_preview_description:I = 0x7f120a8f
+.field public static final guild_settings_discovery_locale_help:I = 0x7f120a8f
 
-.field public static final guild_settings_discovery_primary_category_description:I = 0x7f120a90
+.field public static final guild_settings_discovery_pending_healthy:I = 0x7f120a90
 
-.field public static final guild_settings_discovery_primary_category_title:I = 0x7f120a91
+.field public static final guild_settings_discovery_perk_customize:I = 0x7f120a91
 
-.field public static final guild_settings_discovery_put_guild_on_map:I = 0x7f120a92
+.field public static final guild_settings_discovery_perk_featured:I = 0x7f120a92
 
-.field public static final guild_settings_discovery_requirements_not_met:I = 0x7f120a93
+.field public static final guild_settings_discovery_perk_find:I = 0x7f120a93
 
-.field public static final guild_settings_discovery_search_keywords_description:I = 0x7f120a94
+.field public static final guild_settings_discovery_preview_description:I = 0x7f120a94
 
-.field public static final guild_settings_discovery_search_keywords_title:I = 0x7f120a95
+.field public static final guild_settings_discovery_primary_category_description:I = 0x7f120a95
 
-.field public static final guild_settings_discovery_subcategory_title:I = 0x7f120a96
+.field public static final guild_settings_discovery_primary_category_title:I = 0x7f120a96
 
-.field public static final guild_settings_emoji_alias:I = 0x7f120a97
+.field public static final guild_settings_discovery_put_guild_on_map:I = 0x7f120a97
 
-.field public static final guild_settings_emoji_alias_placeholder:I = 0x7f120a98
+.field public static final guild_settings_discovery_requirements_not_met:I = 0x7f120a98
 
-.field public static final guild_settings_emoji_upload_to_server_message:I = 0x7f120a99
+.field public static final guild_settings_discovery_search_keywords_description:I = 0x7f120a99
 
-.field public static final guild_settings_enable_discoverable:I = 0x7f120a9a
+.field public static final guild_settings_discovery_search_keywords_title:I = 0x7f120a9a
 
-.field public static final guild_settings_filter_action:I = 0x7f120a9b
+.field public static final guild_settings_discovery_subcategory_title:I = 0x7f120a9b
 
-.field public static final guild_settings_filter_all:I = 0x7f120a9c
+.field public static final guild_settings_emoji_alias:I = 0x7f120a9c
 
-.field public static final guild_settings_filter_all_actions:I = 0x7f120a9d
+.field public static final guild_settings_emoji_alias_placeholder:I = 0x7f120a9d
 
-.field public static final guild_settings_filter_all_users:I = 0x7f120a9e
+.field public static final guild_settings_emoji_upload_to_server_message:I = 0x7f120a9e
 
-.field public static final guild_settings_filter_user:I = 0x7f120a9f
+.field public static final guild_settings_enable_discoverable:I = 0x7f120a9f
 
-.field public static final guild_settings_filtered_action:I = 0x7f120aa0
+.field public static final guild_settings_filter_action:I = 0x7f120aa0
 
-.field public static final guild_settings_filtered_user:I = 0x7f120aa1
+.field public static final guild_settings_filter_all:I = 0x7f120aa1
 
-.field public static final guild_settings_follower_analytics:I = 0x7f120aa2
+.field public static final guild_settings_filter_all_actions:I = 0x7f120aa2
 
-.field public static final guild_settings_follower_analytics_description:I = 0x7f120aa3
+.field public static final guild_settings_filter_all_users:I = 0x7f120aa3
 
-.field public static final guild_settings_follower_analytics_empty_body:I = 0x7f120aa4
+.field public static final guild_settings_filter_user:I = 0x7f120aa4
 
-.field public static final guild_settings_follower_analytics_empty_header:I = 0x7f120aa5
+.field public static final guild_settings_filtered_action:I = 0x7f120aa5
 
-.field public static final guild_settings_follower_analytics_last_updated:I = 0x7f120aa6
+.field public static final guild_settings_filtered_user:I = 0x7f120aa6
 
-.field public static final guild_settings_follower_analytics_message_deleted:I = 0x7f120aa7
+.field public static final guild_settings_follower_analytics:I = 0x7f120aa7
 
-.field public static final guild_settings_follower_analytics_net_gain:I = 0x7f120aa8
+.field public static final guild_settings_follower_analytics_description:I = 0x7f120aa8
 
-.field public static final guild_settings_follower_analytics_net_gain_tooltip:I = 0x7f120aa9
+.field public static final guild_settings_follower_analytics_empty_body:I = 0x7f120aa9
 
-.field public static final guild_settings_follower_analytics_net_servers:I = 0x7f120aaa
+.field public static final guild_settings_follower_analytics_empty_header:I = 0x7f120aaa
 
-.field public static final guild_settings_follower_analytics_post:I = 0x7f120aab
+.field public static final guild_settings_follower_analytics_last_updated:I = 0x7f120aab
 
-.field public static final guild_settings_follower_analytics_reach:I = 0x7f120aac
+.field public static final guild_settings_follower_analytics_message_deleted:I = 0x7f120aac
 
-.field public static final guild_settings_follower_analytics_reach_tooltip:I = 0x7f120aad
+.field public static final guild_settings_follower_analytics_net_gain:I = 0x7f120aad
 
-.field public static final guild_settings_follower_analytics_servers_following:I = 0x7f120aae
+.field public static final guild_settings_follower_analytics_net_gain_tooltip:I = 0x7f120aae
 
-.field public static final guild_settings_follower_analytics_tooltip:I = 0x7f120aaf
+.field public static final guild_settings_follower_analytics_net_servers:I = 0x7f120aaf
 
-.field public static final guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon:I = 0x7f120ab0
+.field public static final guild_settings_follower_analytics_post:I = 0x7f120ab0
 
-.field public static final guild_settings_guild_premium_perk_description_tier_1_audio_quality:I = 0x7f120ab1
+.field public static final guild_settings_follower_analytics_reach:I = 0x7f120ab1
 
-.field public static final guild_settings_guild_premium_perk_description_tier_1_emoji:I = 0x7f120ab2
+.field public static final guild_settings_follower_analytics_reach_tooltip:I = 0x7f120ab2
 
-.field public static final guild_settings_guild_premium_perk_description_tier_1_splash:I = 0x7f120ab3
+.field public static final guild_settings_follower_analytics_servers_following:I = 0x7f120ab3
 
-.field public static final guild_settings_guild_premium_perk_description_tier_1_streaming:I = 0x7f120ab4
+.field public static final guild_settings_follower_analytics_tooltip:I = 0x7f120ab4
 
-.field public static final guild_settings_guild_premium_perk_description_tier_2_audio_quality:I = 0x7f120ab5
+.field public static final guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon:I = 0x7f120ab5
 
-.field public static final guild_settings_guild_premium_perk_description_tier_2_banner:I = 0x7f120ab6
+.field public static final guild_settings_guild_premium_perk_description_tier_1_audio_quality:I = 0x7f120ab6
 
-.field public static final guild_settings_guild_premium_perk_description_tier_2_emoji:I = 0x7f120ab7
+.field public static final guild_settings_guild_premium_perk_description_tier_1_emoji:I = 0x7f120ab7
 
-.field public static final guild_settings_guild_premium_perk_description_tier_2_streaming:I = 0x7f120ab8
+.field public static final guild_settings_guild_premium_perk_description_tier_1_splash:I = 0x7f120ab8
 
-.field public static final guild_settings_guild_premium_perk_description_tier_2_upload_limit:I = 0x7f120ab9
+.field public static final guild_settings_guild_premium_perk_description_tier_1_streaming:I = 0x7f120ab9
 
-.field public static final guild_settings_guild_premium_perk_description_tier_3_audio_quality:I = 0x7f120aba
+.field public static final guild_settings_guild_premium_perk_description_tier_2_audio_quality:I = 0x7f120aba
 
-.field public static final guild_settings_guild_premium_perk_description_tier_3_emoji:I = 0x7f120abb
+.field public static final guild_settings_guild_premium_perk_description_tier_2_banner:I = 0x7f120abb
 
-.field public static final guild_settings_guild_premium_perk_description_tier_3_upload_limit:I = 0x7f120abc
+.field public static final guild_settings_guild_premium_perk_description_tier_2_emoji:I = 0x7f120abc
 
-.field public static final guild_settings_guild_premium_perk_description_tier_3_vanity_url:I = 0x7f120abd
+.field public static final guild_settings_guild_premium_perk_description_tier_2_streaming:I = 0x7f120abd
 
-.field public static final guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon:I = 0x7f120abe
+.field public static final guild_settings_guild_premium_perk_description_tier_2_upload_limit:I = 0x7f120abe
 
-.field public static final guild_settings_guild_premium_perk_title_tier_1_splash:I = 0x7f120abf
+.field public static final guild_settings_guild_premium_perk_description_tier_3_audio_quality:I = 0x7f120abf
 
-.field public static final guild_settings_guild_premium_perk_title_tier_1_streaming:I = 0x7f120ac0
+.field public static final guild_settings_guild_premium_perk_description_tier_3_emoji:I = 0x7f120ac0
 
-.field public static final guild_settings_guild_premium_perk_title_tier_2_banner:I = 0x7f120ac1
+.field public static final guild_settings_guild_premium_perk_description_tier_3_upload_limit:I = 0x7f120ac1
 
-.field public static final guild_settings_guild_premium_perk_title_tier_2_streaming:I = 0x7f120ac2
+.field public static final guild_settings_guild_premium_perk_description_tier_3_vanity_url:I = 0x7f120ac2
 
-.field public static final guild_settings_guild_premium_perk_title_tier_3_vanity_url:I = 0x7f120ac3
+.field public static final guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon:I = 0x7f120ac3
 
-.field public static final guild_settings_guild_premium_perk_title_tier_any_audio_quality:I = 0x7f120ac4
+.field public static final guild_settings_guild_premium_perk_title_tier_1_splash:I = 0x7f120ac4
 
-.field public static final guild_settings_guild_premium_perk_title_tier_any_emoji:I = 0x7f120ac5
+.field public static final guild_settings_guild_premium_perk_title_tier_1_streaming:I = 0x7f120ac5
 
-.field public static final guild_settings_guild_premium_perk_title_tier_any_upload_limit:I = 0x7f120ac6
+.field public static final guild_settings_guild_premium_perk_title_tier_2_banner:I = 0x7f120ac6
 
-.field public static final guild_settings_guild_premium_perks_base_perks:I = 0x7f120ac7
+.field public static final guild_settings_guild_premium_perk_title_tier_2_streaming:I = 0x7f120ac7
 
-.field public static final guild_settings_guild_premium_perks_description_none:I = 0x7f120ac8
+.field public static final guild_settings_guild_premium_perk_title_tier_3_vanity_url:I = 0x7f120ac8
 
-.field public static final guild_settings_guild_premium_perks_previous_perks:I = 0x7f120ac9
+.field public static final guild_settings_guild_premium_perk_title_tier_any_audio_quality:I = 0x7f120ac9
 
-.field public static final guild_settings_guild_premium_perks_title_none:I = 0x7f120aca
+.field public static final guild_settings_guild_premium_perk_title_tier_any_emoji:I = 0x7f120aca
 
-.field public static final guild_settings_guild_premium_perks_title_tier_1:I = 0x7f120acb
+.field public static final guild_settings_guild_premium_perk_title_tier_any_upload_limit:I = 0x7f120acb
 
-.field public static final guild_settings_guild_premium_perks_title_tier_2:I = 0x7f120acc
+.field public static final guild_settings_guild_premium_perks_base_perks:I = 0x7f120acc
 
-.field public static final guild_settings_guild_premium_perks_title_tier_3:I = 0x7f120acd
+.field public static final guild_settings_guild_premium_perks_description_none:I = 0x7f120acd
 
-.field public static final guild_settings_icon_recommend:I = 0x7f120ace
+.field public static final guild_settings_guild_premium_perks_previous_perks:I = 0x7f120ace
 
-.field public static final guild_settings_label_audit_log:I = 0x7f120acf
+.field public static final guild_settings_guild_premium_perks_title_none:I = 0x7f120acf
 
-.field public static final guild_settings_label_audit_log_empty_body:I = 0x7f120ad0
+.field public static final guild_settings_guild_premium_perks_title_tier_1:I = 0x7f120ad0
 
-.field public static final guild_settings_label_audit_log_empty_title:I = 0x7f120ad1
+.field public static final guild_settings_guild_premium_perks_title_tier_2:I = 0x7f120ad1
 
-.field public static final guild_settings_label_audit_log_error_body:I = 0x7f120ad2
+.field public static final guild_settings_guild_premium_perks_title_tier_3:I = 0x7f120ad2
 
-.field public static final guild_settings_label_audit_log_error_title:I = 0x7f120ad3
+.field public static final guild_settings_icon_recommend:I = 0x7f120ad3
 
-.field public static final guild_settings_members_add_role:I = 0x7f120ad4
+.field public static final guild_settings_label_audit_log:I = 0x7f120ad4
 
-.field public static final guild_settings_members_display_role:I = 0x7f120ad5
+.field public static final guild_settings_label_audit_log_empty_body:I = 0x7f120ad5
 
-.field public static final guild_settings_members_remove_role:I = 0x7f120ad6
+.field public static final guild_settings_label_audit_log_empty_title:I = 0x7f120ad6
 
-.field public static final guild_settings_members_server_members:I = 0x7f120ad7
+.field public static final guild_settings_label_audit_log_error_body:I = 0x7f120ad7
 
-.field public static final guild_settings_overview_boost_unlock:I = 0x7f120ad8
+.field public static final guild_settings_label_audit_log_error_title:I = 0x7f120ad8
 
-.field public static final guild_settings_overview_boost_unlocked:I = 0x7f120ad9
+.field public static final guild_settings_members_add_role:I = 0x7f120ad9
 
-.field public static final guild_settings_overview_tier_info:I = 0x7f120ada
+.field public static final guild_settings_members_display_role:I = 0x7f120ada
 
-.field public static final guild_settings_premium_guild_blurb:I = 0x7f120adb
+.field public static final guild_settings_members_remove_role:I = 0x7f120adb
 
-.field public static final guild_settings_premium_guild_close_hint:I = 0x7f120adc
+.field public static final guild_settings_members_server_members:I = 0x7f120adc
 
-.field public static final guild_settings_premium_guild_count_subscribers:I = 0x7f120add
+.field public static final guild_settings_overview_boost_unlock:I = 0x7f120add
 
-.field public static final guild_settings_premium_guild_tier_requirement:I = 0x7f120ade
+.field public static final guild_settings_overview_boost_unlocked:I = 0x7f120ade
 
-.field public static final guild_settings_premium_guild_title:I = 0x7f120adf
+.field public static final guild_settings_overview_tier_info:I = 0x7f120adf
 
-.field public static final guild_settings_premium_guild_unlocked:I = 0x7f120ae0
+.field public static final guild_settings_partner_checklist_age_description:I = 0x7f120ae0
 
-.field public static final guild_settings_premium_upsell_body_perk_guild_subscription_discount:I = 0x7f120ae1
+.field public static final guild_settings_partner_checklist_age_description_failing:I = 0x7f120ae1
 
-.field public static final guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions:I = 0x7f120ae2
+.field public static final guild_settings_partner_checklist_failing_header:I = 0x7f120ae2
 
-.field public static final guild_settings_premium_upsell_body_perk_num_guild_subscriptions:I = 0x7f120ae3
+.field public static final guild_settings_partner_checklist_failing_subheader:I = 0x7f120ae3
 
-.field public static final guild_settings_premium_upsell_heading_primary:I = 0x7f120ae4
+.field public static final guild_settings_partner_checklist_health_view_details:I = 0x7f120ae4
 
-.field public static final guild_settings_premium_upsell_heading_secondary:I = 0x7f120ae5
+.field public static final guild_settings_partner_checklist_healthy_description:I = 0x7f120ae5
 
-.field public static final guild_settings_premium_upsell_heading_secondary_premium_user:I = 0x7f120ae6
+.field public static final guild_settings_partner_checklist_healthy_description_failing:I = 0x7f120ae6
 
-.field public static final guild_settings_premium_upsell_heading_tertiary_premium_user:I = 0x7f120ae7
+.field public static final guild_settings_partner_checklist_healthy_description_pending:I = 0x7f120ae7
 
-.field public static final guild_settings_premium_upsell_learn_more:I = 0x7f120ae8
+.field public static final guild_settings_partner_checklist_healthy_description_pending_size:I = 0x7f120ae8
 
-.field public static final guild_settings_premium_upsell_subheading:I = 0x7f120ae9
+.field public static final guild_settings_partner_checklist_passing_header:I = 0x7f120ae9
 
-.field public static final guild_settings_premium_upsell_subheading_extra_android:I = 0x7f120aea
+.field public static final guild_settings_partner_checklist_passing_subheader:I = 0x7f120aea
 
-.field public static final guild_settings_premium_upsell_subheading_extra_ios:I = 0x7f120aeb
+.field public static final guild_settings_partner_checklist_size:I = 0x7f120aeb
 
-.field public static final guild_settings_premium_upsell_subheading_tier_1:I = 0x7f120aec
+.field public static final guild_settings_partner_checklist_size_description:I = 0x7f120aec
 
-.field public static final guild_settings_premium_upsell_subheading_tier_1_mobile:I = 0x7f120aed
+.field public static final guild_settings_partner_checklist_size_description_failing:I = 0x7f120aed
 
-.field public static final guild_settings_premium_upsell_subheading_tier_2:I = 0x7f120aee
+.field public static final guild_settings_partner_checklist_size_failing:I = 0x7f120aee
 
-.field public static final guild_settings_premium_upsell_subheading_tier_2_mobile:I = 0x7f120aef
+.field public static final guild_settings_partner_intro_apply_button:I = 0x7f120aef
 
-.field public static final guild_settings_public_mod_channel_title:I = 0x7f120af0
+.field public static final guild_settings_partner_intro_apply_button_tooltip_only_owner:I = 0x7f120af0
 
-.field public static final guild_settings_public_no_option_selected:I = 0x7f120af1
+.field public static final guild_settings_partner_intro_apply_button_tooltip_pending:I = 0x7f120af1
 
-.field public static final guild_settings_public_update_failed:I = 0x7f120af2
+.field public static final guild_settings_partner_intro_apply_button_tooltip_rejected:I = 0x7f120af2
 
-.field public static final guild_settings_public_welcome:I = 0x7f120af3
+.field public static final guild_settings_partner_intro_apply_details:I = 0x7f120af3
 
-.field public static final guild_settings_public_welcome_add_recommended_channel:I = 0x7f120af4
+.field public static final guild_settings_partner_intro_body:I = 0x7f120af4
 
-.field public static final guild_settings_public_welcome_channel_delete:I = 0x7f120af5
+.field public static final guild_settings_partner_intro_cooldown:I = 0x7f120af5
 
-.field public static final guild_settings_public_welcome_channel_description_placeholder:I = 0x7f120af6
+.field public static final guild_settings_partner_intro_cooldown_counter:I = 0x7f120af6
 
-.field public static final guild_settings_public_welcome_channel_edit:I = 0x7f120af7
+.field public static final guild_settings_partner_intro_header:I = 0x7f120af7
 
-.field public static final guild_settings_public_welcome_channel_move_down:I = 0x7f120af8
+.field public static final guild_settings_partner_intro_pending:I = 0x7f120af8
 
-.field public static final guild_settings_public_welcome_channel_move_up:I = 0x7f120af9
+.field public static final guild_settings_partner_intro_rejected:I = 0x7f120af9
 
-.field public static final guild_settings_public_welcome_description_placeholder:I = 0x7f120afa
+.field public static final guild_settings_partner_intro_upsell_branding_body:I = 0x7f120afa
 
-.field public static final guild_settings_public_welcome_enable_reminder:I = 0x7f120afb
+.field public static final guild_settings_partner_intro_upsell_branding_header:I = 0x7f120afb
 
-.field public static final guild_settings_public_welcome_enabled:I = 0x7f120afc
+.field public static final guild_settings_partner_intro_upsell_perks_body:I = 0x7f120afc
 
-.field public static final guild_settings_public_welcome_enabled_second_line:I = 0x7f120afd
+.field public static final guild_settings_partner_intro_upsell_perks_header:I = 0x7f120afd
 
-.field public static final guild_settings_public_welcome_example_channel_description_1:I = 0x7f120afe
+.field public static final guild_settings_partner_intro_upsell_recognition_body:I = 0x7f120afe
 
-.field public static final guild_settings_public_welcome_example_channel_description_2:I = 0x7f120aff
+.field public static final guild_settings_partner_intro_upsell_recognition_header:I = 0x7f120aff
 
-.field public static final guild_settings_public_welcome_example_channel_description_3:I = 0x7f120b00
+.field public static final guild_settings_partner_not_verified:I = 0x7f120b00
 
-.field public static final guild_settings_public_welcome_example_channel_name_1:I = 0x7f120b01
+.field public static final guild_settings_premium_guild_blurb:I = 0x7f120b01
 
-.field public static final guild_settings_public_welcome_example_channel_name_2:I = 0x7f120b02
+.field public static final guild_settings_premium_guild_close_hint:I = 0x7f120b02
 
-.field public static final guild_settings_public_welcome_example_channel_name_3:I = 0x7f120b03
+.field public static final guild_settings_premium_guild_count_subscribers:I = 0x7f120b03
 
-.field public static final guild_settings_public_welcome_example_description:I = 0x7f120b04
+.field public static final guild_settings_premium_guild_tier_requirement:I = 0x7f120b04
 
-.field public static final guild_settings_public_welcome_example_title:I = 0x7f120b05
+.field public static final guild_settings_premium_guild_title:I = 0x7f120b05
 
-.field public static final guild_settings_public_welcome_intro_button:I = 0x7f120b06
+.field public static final guild_settings_premium_guild_unlocked:I = 0x7f120b06
 
-.field public static final guild_settings_public_welcome_intro_text:I = 0x7f120b07
+.field public static final guild_settings_premium_upsell_body_perk_guild_subscription_discount:I = 0x7f120b07
 
-.field public static final guild_settings_public_welcome_invalid_channel:I = 0x7f120b08
+.field public static final guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions:I = 0x7f120b08
 
-.field public static final guild_settings_public_welcome_only_viewable_channels:I = 0x7f120b09
+.field public static final guild_settings_premium_upsell_body_perk_num_guild_subscriptions:I = 0x7f120b09
 
-.field public static final guild_settings_public_welcome_pick_channel:I = 0x7f120b0a
+.field public static final guild_settings_premium_upsell_heading_primary:I = 0x7f120b0a
 
-.field public static final guild_settings_public_welcome_preview:I = 0x7f120b0b
+.field public static final guild_settings_premium_upsell_heading_secondary:I = 0x7f120b0b
 
-.field public static final guild_settings_public_welcome_progress_will_save:I = 0x7f120b0c
+.field public static final guild_settings_premium_upsell_heading_secondary_premium_user:I = 0x7f120b0c
 
-.field public static final guild_settings_public_welcome_recommended_channel_modal_add:I = 0x7f120b0d
+.field public static final guild_settings_premium_upsell_heading_tertiary_premium_user:I = 0x7f120b0d
 
-.field public static final guild_settings_public_welcome_recommended_channel_modal_edit:I = 0x7f120b0e
+.field public static final guild_settings_premium_upsell_learn_more:I = 0x7f120b0e
 
-.field public static final guild_settings_public_welcome_recommended_channels_description:I = 0x7f120b0f
+.field public static final guild_settings_premium_upsell_subheading:I = 0x7f120b0f
 
-.field public static final guild_settings_public_welcome_recommended_channels_title:I = 0x7f120b10
+.field public static final guild_settings_premium_upsell_subheading_extra_android:I = 0x7f120b10
 
-.field public static final guild_settings_public_welcome_select_a_channel:I = 0x7f120b11
+.field public static final guild_settings_premium_upsell_subheading_extra_ios:I = 0x7f120b11
 
-.field public static final guild_settings_public_welcome_set_description:I = 0x7f120b12
+.field public static final guild_settings_premium_upsell_subheading_tier_1:I = 0x7f120b12
 
-.field public static final guild_settings_public_welcome_settings_text:I = 0x7f120b13
+.field public static final guild_settings_premium_upsell_subheading_tier_1_mobile:I = 0x7f120b13
 
-.field public static final guild_settings_public_welcome_title:I = 0x7f120b14
+.field public static final guild_settings_premium_upsell_subheading_tier_2:I = 0x7f120b14
 
-.field public static final guild_settings_public_welcome_update_failure:I = 0x7f120b15
+.field public static final guild_settings_premium_upsell_subheading_tier_2_mobile:I = 0x7f120b15
 
-.field public static final guild_settings_server_banner:I = 0x7f120b16
+.field public static final guild_settings_public_mod_channel_title:I = 0x7f120b16
 
-.field public static final guild_settings_server_invite_background:I = 0x7f120b17
+.field public static final guild_settings_public_no_option_selected:I = 0x7f120b17
 
-.field public static final guild_settings_splash_info:I = 0x7f120b18
+.field public static final guild_settings_public_update_failed:I = 0x7f120b18
 
-.field public static final guild_settings_splash_recommend:I = 0x7f120b19
+.field public static final guild_settings_public_welcome:I = 0x7f120b19
 
-.field public static final guild_settings_title_server_widget:I = 0x7f120b1a
+.field public static final guild_settings_public_welcome_add_recommended_channel:I = 0x7f120b1a
 
-.field public static final guild_settings_widget_embed_help:I = 0x7f120b1b
+.field public static final guild_settings_public_welcome_channel_delete:I = 0x7f120b1b
 
-.field public static final guild_settings_widget_enable_widget:I = 0x7f120b1c
+.field public static final guild_settings_public_welcome_channel_description_placeholder:I = 0x7f120b1c
 
-.field public static final guild_sidebar_a11y_label:I = 0x7f120b1d
+.field public static final guild_settings_public_welcome_channel_edit:I = 0x7f120b1d
 
-.field public static final guild_sidebar_announcement_channel_a11y_label:I = 0x7f120b1e
+.field public static final guild_settings_public_welcome_channel_move_down:I = 0x7f120b1e
 
-.field public static final guild_sidebar_announcement_channel_a11y_label_with_mentions:I = 0x7f120b1f
+.field public static final guild_settings_public_welcome_channel_move_up:I = 0x7f120b1f
 
-.field public static final guild_sidebar_announcement_channel_a11y_label_with_unreads:I = 0x7f120b20
+.field public static final guild_settings_public_welcome_description_placeholder:I = 0x7f120b20
 
-.field public static final guild_sidebar_default_channel_a11y_label:I = 0x7f120b21
+.field public static final guild_settings_public_welcome_enable_reminder:I = 0x7f120b21
 
-.field public static final guild_sidebar_default_channel_a11y_label_with_mentions:I = 0x7f120b22
+.field public static final guild_settings_public_welcome_enabled:I = 0x7f120b22
 
-.field public static final guild_sidebar_default_channel_a11y_label_with_unreads:I = 0x7f120b23
+.field public static final guild_settings_public_welcome_enabled_second_line:I = 0x7f120b23
 
-.field public static final guild_sidebar_store_channel_a11y_label:I = 0x7f120b24
+.field public static final guild_settings_public_welcome_example_channel_description_1:I = 0x7f120b24
 
-.field public static final guild_sidebar_voice_channel_a11y_label:I = 0x7f120b25
+.field public static final guild_settings_public_welcome_example_channel_description_2:I = 0x7f120b25
 
-.field public static final guild_sidebar_voice_channel_a11y_label_with_limit:I = 0x7f120b26
+.field public static final guild_settings_public_welcome_example_channel_description_3:I = 0x7f120b26
 
-.field public static final guild_sidebar_voice_channel_a11y_label_with_users:I = 0x7f120b27
+.field public static final guild_settings_public_welcome_example_channel_name_1:I = 0x7f120b27
 
-.field public static final guild_subscription_purchase_modal_activated_close_button:I = 0x7f120b28
+.field public static final guild_settings_public_welcome_example_channel_name_2:I = 0x7f120b28
 
-.field public static final guild_subscription_purchase_modal_activated_description:I = 0x7f120b29
+.field public static final guild_settings_public_welcome_example_channel_name_3:I = 0x7f120b29
 
-.field public static final guild_subscription_purchase_modal_activated_description_generic_guild:I = 0x7f120b2a
+.field public static final guild_settings_public_welcome_example_description:I = 0x7f120b2a
 
-.field public static final guild_subscription_purchase_modal_activated_description_mobile1:I = 0x7f120b2b
+.field public static final guild_settings_public_welcome_example_title:I = 0x7f120b2b
 
-.field public static final guild_subscription_purchase_modal_activated_description_mobile2:I = 0x7f120b2c
+.field public static final guild_settings_public_welcome_intro_button:I = 0x7f120b2c
 
-.field public static final guild_subscription_purchase_modal_apple:I = 0x7f120b2d
+.field public static final guild_settings_public_welcome_intro_text:I = 0x7f120b2d
 
-.field public static final guild_subscription_purchase_modal_counter:I = 0x7f120b2e
+.field public static final guild_settings_public_welcome_invalid_channel:I = 0x7f120b2e
 
-.field public static final guild_subscription_purchase_modal_footer_discount:I = 0x7f120b2f
+.field public static final guild_settings_public_welcome_only_viewable_channels:I = 0x7f120b2f
 
-.field public static final guild_subscription_purchase_modal_footer_upsell:I = 0x7f120b30
+.field public static final guild_settings_public_welcome_pick_channel:I = 0x7f120b30
 
-.field public static final guild_subscription_purchase_modal_footer_upsell_trial:I = 0x7f120b31
+.field public static final guild_settings_public_welcome_preview:I = 0x7f120b31
 
-.field public static final guild_subscription_purchase_modal_invoice_row_content:I = 0x7f120b32
+.field public static final guild_settings_public_welcome_progress_will_save:I = 0x7f120b32
 
-.field public static final guild_subscription_purchase_modal_payment_source_tooltip:I = 0x7f120b33
+.field public static final guild_settings_public_welcome_recommended_channel_modal_add:I = 0x7f120b33
 
-.field public static final guild_subscription_purchase_modal_purchase_details_header:I = 0x7f120b34
+.field public static final guild_settings_public_welcome_recommended_channel_modal_edit:I = 0x7f120b34
 
-.field public static final guild_subscription_purchase_modal_step_select_description:I = 0x7f120b35
+.field public static final guild_settings_public_welcome_recommended_channels_description:I = 0x7f120b35
 
-.field public static final guild_subscription_purchase_modal_submit:I = 0x7f120b36
+.field public static final guild_settings_public_welcome_recommended_channels_title:I = 0x7f120b36
 
-.field public static final guild_subscription_purchase_modal_subtotal:I = 0x7f120b37
+.field public static final guild_settings_public_welcome_select_a_channel:I = 0x7f120b37
 
-.field public static final guild_subscription_purchase_modal_transferred_description:I = 0x7f120b38
+.field public static final guild_settings_public_welcome_set_description:I = 0x7f120b38
 
-.field public static final guild_subscription_purchase_modal_transferred_description_generic_guild:I = 0x7f120b39
+.field public static final guild_settings_public_welcome_settings_text:I = 0x7f120b39
 
-.field public static final guild_subscription_purchase_modal_transferred_description_mobile1:I = 0x7f120b3a
+.field public static final guild_settings_public_welcome_title:I = 0x7f120b3a
 
-.field public static final guild_subscription_purchase_modal_transferred_description_mobile2:I = 0x7f120b3b
+.field public static final guild_settings_public_welcome_update_failure:I = 0x7f120b3b
 
-.field public static final guild_subscription_purchase_modal_unused_slot_notice:I = 0x7f120b3c
+.field public static final guild_settings_server_banner:I = 0x7f120b3c
 
-.field public static final guild_template_based_on:I = 0x7f120b3d
+.field public static final guild_settings_server_invite_background:I = 0x7f120b3d
 
-.field public static final guild_template_create_discord:I = 0x7f120b3e
+.field public static final guild_settings_splash_info:I = 0x7f120b3e
 
-.field public static final guild_template_default_server_name_classroom:I = 0x7f120b3f
+.field public static final guild_settings_splash_recommend:I = 0x7f120b3f
 
-.field public static final guild_template_default_server_name_create_from_scratch:I = 0x7f120b40
+.field public static final guild_settings_title_server_widget:I = 0x7f120b40
 
-.field public static final guild_template_default_server_name_creators_hobbies:I = 0x7f120b41
+.field public static final guild_settings_widget_embed_help:I = 0x7f120b41
 
-.field public static final guild_template_default_server_name_friends_family:I = 0x7f120b42
+.field public static final guild_settings_widget_enable_widget:I = 0x7f120b42
 
-.field public static final guild_template_default_server_name_global_communities:I = 0x7f120b43
+.field public static final guild_sidebar_a11y_label:I = 0x7f120b43
 
-.field public static final guild_template_default_server_name_local_communities:I = 0x7f120b44
+.field public static final guild_sidebar_announcement_channel_a11y_label:I = 0x7f120b44
 
-.field public static final guild_template_default_server_name_study_groups:I = 0x7f120b45
+.field public static final guild_sidebar_announcement_channel_a11y_label_with_mentions:I = 0x7f120b45
 
-.field public static final guild_template_embed_view_in_app:I = 0x7f120b46
+.field public static final guild_sidebar_announcement_channel_a11y_label_with_unreads:I = 0x7f120b46
 
-.field public static final guild_template_header_clubs:I = 0x7f120b47
+.field public static final guild_sidebar_default_channel_a11y_label:I = 0x7f120b47
 
-.field public static final guild_template_header_community:I = 0x7f120b48
+.field public static final guild_sidebar_default_channel_a11y_label_with_mentions:I = 0x7f120b48
 
-.field public static final guild_template_header_create:I = 0x7f120b49
+.field public static final guild_sidebar_default_channel_a11y_label_with_unreads:I = 0x7f120b49
 
-.field public static final guild_template_header_creator:I = 0x7f120b4a
+.field public static final guild_sidebar_store_channel_a11y_label:I = 0x7f120b4a
 
-.field public static final guild_template_header_friend:I = 0x7f120b4b
+.field public static final guild_sidebar_voice_channel_a11y_label:I = 0x7f120b4b
 
-.field public static final guild_template_header_gaming:I = 0x7f120b4c
+.field public static final guild_sidebar_voice_channel_a11y_label_with_limit:I = 0x7f120b4c
 
-.field public static final guild_template_header_study:I = 0x7f120b4d
+.field public static final guild_sidebar_voice_channel_a11y_label_with_users:I = 0x7f120b4d
 
-.field public static final guild_template_invalid_subtitle:I = 0x7f120b4e
+.field public static final guild_subscription_purchase_modal_activated_close_button:I = 0x7f120b4e
 
-.field public static final guild_template_invalid_title:I = 0x7f120b4f
+.field public static final guild_subscription_purchase_modal_activated_description:I = 0x7f120b4f
 
-.field public static final guild_template_mobile_invalid_cta:I = 0x7f120b50
+.field public static final guild_subscription_purchase_modal_activated_description_generic_guild:I = 0x7f120b50
 
-.field public static final guild_template_mobile_invalid_error:I = 0x7f120b51
+.field public static final guild_subscription_purchase_modal_activated_description_mobile1:I = 0x7f120b51
 
-.field public static final guild_template_modal_channels_descriptions:I = 0x7f120b52
+.field public static final guild_subscription_purchase_modal_activated_description_mobile2:I = 0x7f120b52
 
-.field public static final guild_template_modal_channels_header:I = 0x7f120b53
+.field public static final guild_subscription_purchase_modal_apple:I = 0x7f120b53
 
-.field public static final guild_template_modal_channels_tip:I = 0x7f120b54
+.field public static final guild_subscription_purchase_modal_counter:I = 0x7f120b54
 
-.field public static final guild_template_modal_description_classroom:I = 0x7f120b55
+.field public static final guild_subscription_purchase_modal_footer_discount:I = 0x7f120b55
 
-.field public static final guild_template_modal_description_create_from_scratch:I = 0x7f120b56
+.field public static final guild_subscription_purchase_modal_footer_upsell:I = 0x7f120b56
 
-.field public static final guild_template_modal_description_creators_hobbies:I = 0x7f120b57
+.field public static final guild_subscription_purchase_modal_footer_upsell_trial:I = 0x7f120b57
 
-.field public static final guild_template_modal_description_friends_family:I = 0x7f120b58
+.field public static final guild_subscription_purchase_modal_invoice_row_content:I = 0x7f120b58
 
-.field public static final guild_template_modal_description_global_communities:I = 0x7f120b59
+.field public static final guild_subscription_purchase_modal_payment_source_tooltip:I = 0x7f120b59
 
-.field public static final guild_template_modal_description_local_communities:I = 0x7f120b5a
+.field public static final guild_subscription_purchase_modal_purchase_details_header:I = 0x7f120b5a
 
-.field public static final guild_template_modal_description_study_groups:I = 0x7f120b5b
+.field public static final guild_subscription_purchase_modal_step_select_description:I = 0x7f120b5b
 
-.field public static final guild_template_modal_error_title:I = 0x7f120b5c
+.field public static final guild_subscription_purchase_modal_submit:I = 0x7f120b5c
 
-.field public static final guild_template_modal_roles_description:I = 0x7f120b5d
+.field public static final guild_subscription_purchase_modal_subtotal:I = 0x7f120b5d
 
-.field public static final guild_template_modal_roles_header:I = 0x7f120b5e
+.field public static final guild_subscription_purchase_modal_transferred_description:I = 0x7f120b5e
 
-.field public static final guild_template_modal_roles_header2:I = 0x7f120b5f
+.field public static final guild_subscription_purchase_modal_transferred_description_generic_guild:I = 0x7f120b5f
 
-.field public static final guild_template_modal_title:I = 0x7f120b60
+.field public static final guild_subscription_purchase_modal_transferred_description_mobile1:I = 0x7f120b60
 
-.field public static final guild_template_modal_title_classroom:I = 0x7f120b61
+.field public static final guild_subscription_purchase_modal_transferred_description_mobile2:I = 0x7f120b61
 
-.field public static final guild_template_modal_title_create_from_scratch:I = 0x7f120b62
+.field public static final guild_subscription_purchase_modal_unused_slot_notice:I = 0x7f120b62
 
-.field public static final guild_template_modal_title_creators_hobbies:I = 0x7f120b63
+.field public static final guild_template_based_on:I = 0x7f120b63
 
-.field public static final guild_template_modal_title_friends_family:I = 0x7f120b64
+.field public static final guild_template_create_discord:I = 0x7f120b64
 
-.field public static final guild_template_modal_title_global_communities:I = 0x7f120b65
+.field public static final guild_template_default_server_name_classroom:I = 0x7f120b65
 
-.field public static final guild_template_modal_title_local_communities:I = 0x7f120b66
+.field public static final guild_template_default_server_name_create_from_scratch:I = 0x7f120b66
 
-.field public static final guild_template_modal_title_study_groups:I = 0x7f120b67
+.field public static final guild_template_default_server_name_creators_hobbies:I = 0x7f120b67
 
-.field public static final guild_template_name_announcements:I = 0x7f120b68
+.field public static final guild_template_default_server_name_friends_family:I = 0x7f120b68
 
-.field public static final guild_template_name_category_information:I = 0x7f120b69
+.field public static final guild_template_default_server_name_global_communities:I = 0x7f120b69
 
-.field public static final guild_template_name_category_text:I = 0x7f120b6a
+.field public static final guild_template_default_server_name_local_communities:I = 0x7f120b6a
 
-.field public static final guild_template_name_category_voice:I = 0x7f120b6b
+.field public static final guild_template_default_server_name_study_groups:I = 0x7f120b6b
 
-.field public static final guild_template_name_clips_and_highlights:I = 0x7f120b6c
+.field public static final guild_template_embed_view_in_app:I = 0x7f120b6c
 
-.field public static final guild_template_name_events:I = 0x7f120b6d
+.field public static final guild_template_header_clubs:I = 0x7f120b6d
 
-.field public static final guild_template_name_game:I = 0x7f120b6e
+.field public static final guild_template_header_community:I = 0x7f120b6e
 
-.field public static final guild_template_name_game_new:I = 0x7f120b6f
+.field public static final guild_template_header_create:I = 0x7f120b6f
 
-.field public static final guild_template_name_game_room:I = 0x7f120b70
+.field public static final guild_template_header_creator:I = 0x7f120b70
 
-.field public static final guild_template_name_general:I = 0x7f120b71
+.field public static final guild_template_header_friend:I = 0x7f120b71
 
-.field public static final guild_template_name_giveaways:I = 0x7f120b72
+.field public static final guild_template_header_gaming:I = 0x7f120b72
 
-.field public static final guild_template_name_homework:I = 0x7f120b73
+.field public static final guild_template_header_study:I = 0x7f120b73
 
-.field public static final guild_template_name_homework_help:I = 0x7f120b74
+.field public static final guild_template_invalid_subtitle:I = 0x7f120b74
 
-.field public static final guild_template_name_ideas_and_feedback:I = 0x7f120b75
+.field public static final guild_template_invalid_title:I = 0x7f120b75
 
-.field public static final guild_template_name_meeting_plans:I = 0x7f120b76
+.field public static final guild_template_mobile_invalid_cta:I = 0x7f120b76
 
-.field public static final guild_template_name_meetups:I = 0x7f120b77
+.field public static final guild_template_mobile_invalid_error:I = 0x7f120b77
 
-.field public static final guild_template_name_memes:I = 0x7f120b78
+.field public static final guild_template_modal_channels_descriptions:I = 0x7f120b78
 
-.field public static final guild_template_name_music:I = 0x7f120b79
+.field public static final guild_template_modal_channels_header:I = 0x7f120b79
 
-.field public static final guild_template_name_notes:I = 0x7f120b7a
+.field public static final guild_template_modal_channels_tip:I = 0x7f120b7a
 
-.field public static final guild_template_name_notes_resources:I = 0x7f120b7b
+.field public static final guild_template_modal_description_classroom:I = 0x7f120b7b
 
-.field public static final guild_template_name_off_topic:I = 0x7f120b7c
+.field public static final guild_template_modal_description_create_from_scratch:I = 0x7f120b7c
 
-.field public static final guild_template_name_random:I = 0x7f120b7d
+.field public static final guild_template_modal_description_creators_hobbies:I = 0x7f120b7d
 
-.field public static final guild_template_name_resources:I = 0x7f120b7e
+.field public static final guild_template_modal_description_friends_family:I = 0x7f120b7e
 
-.field public static final guild_template_name_session_planning:I = 0x7f120b7f
+.field public static final guild_template_modal_description_global_communities:I = 0x7f120b7f
 
-.field public static final guild_template_name_social:I = 0x7f120b80
+.field public static final guild_template_modal_description_local_communities:I = 0x7f120b80
 
-.field public static final guild_template_name_strategy:I = 0x7f120b81
+.field public static final guild_template_modal_description_study_groups:I = 0x7f120b81
 
-.field public static final guild_template_name_voice_community_hangout:I = 0x7f120b82
+.field public static final guild_template_modal_error_title:I = 0x7f120b82
 
-.field public static final guild_template_name_voice_gaming:I = 0x7f120b83
+.field public static final guild_template_modal_roles_description:I = 0x7f120b83
 
-.field public static final guild_template_name_voice_general:I = 0x7f120b84
+.field public static final guild_template_modal_roles_header:I = 0x7f120b84
 
-.field public static final guild_template_name_voice_lobby:I = 0x7f120b85
+.field public static final guild_template_modal_roles_header2:I = 0x7f120b85
 
-.field public static final guild_template_name_voice_lounge:I = 0x7f120b86
+.field public static final guild_template_modal_title:I = 0x7f120b86
 
-.field public static final guild_template_name_voice_meeting_room:I = 0x7f120b87
+.field public static final guild_template_modal_title_classroom:I = 0x7f120b87
 
-.field public static final guild_template_name_voice_stream_room:I = 0x7f120b88
+.field public static final guild_template_modal_title_create_from_scratch:I = 0x7f120b88
 
-.field public static final guild_template_name_voice_study_room:I = 0x7f120b89
+.field public static final guild_template_modal_title_creators_hobbies:I = 0x7f120b89
 
-.field public static final guild_template_name_welcome:I = 0x7f120b8a
+.field public static final guild_template_modal_title_friends_family:I = 0x7f120b8a
 
-.field public static final guild_template_name_welcome_and_rules:I = 0x7f120b8b
+.field public static final guild_template_modal_title_global_communities:I = 0x7f120b8b
 
-.field public static final guild_template_open:I = 0x7f120b8c
+.field public static final guild_template_modal_title_local_communities:I = 0x7f120b8c
 
-.field public static final guild_template_preview_description:I = 0x7f120b8d
+.field public static final guild_template_modal_title_study_groups:I = 0x7f120b8d
 
-.field public static final guild_template_preview_protip_body:I = 0x7f120b8e
+.field public static final guild_template_name_announcements:I = 0x7f120b8e
 
-.field public static final guild_template_preview_title:I = 0x7f120b8f
+.field public static final guild_template_name_category_information:I = 0x7f120b8f
 
-.field public static final guild_template_resolved_embed_title:I = 0x7f120b90
+.field public static final guild_template_name_category_text:I = 0x7f120b90
 
-.field public static final guild_template_resolving_title:I = 0x7f120b91
+.field public static final guild_template_name_category_voice:I = 0x7f120b91
 
-.field public static final guild_template_selector_description:I = 0x7f120b92
+.field public static final guild_template_name_clips_and_highlights:I = 0x7f120b92
 
-.field public static final guild_template_selector_option_header:I = 0x7f120b93
+.field public static final guild_template_name_events:I = 0x7f120b93
 
-.field public static final guild_template_selector_suggestion:I = 0x7f120b94
+.field public static final guild_template_name_game:I = 0x7f120b94
 
-.field public static final guild_template_selector_title:I = 0x7f120b95
+.field public static final guild_template_name_game_new:I = 0x7f120b95
 
-.field public static final guild_template_settings_description:I = 0x7f120b96
+.field public static final guild_template_name_game_room:I = 0x7f120b96
 
-.field public static final guild_template_setup_discord:I = 0x7f120b97
+.field public static final guild_template_name_general:I = 0x7f120b97
 
-.field public static final guild_template_usages:I = 0x7f120b98
+.field public static final guild_template_name_giveaways:I = 0x7f120b98
 
-.field public static final guild_template_usages_by_creator2:I = 0x7f120b99
+.field public static final guild_template_name_homework:I = 0x7f120b99
 
-.field public static final guild_template_usages_no_bold:I = 0x7f120b9a
+.field public static final guild_template_name_homework_help:I = 0x7f120b9a
 
-.field public static final guild_templates:I = 0x7f120b9b
+.field public static final guild_template_name_ideas_and_feedback:I = 0x7f120b9b
 
-.field public static final guild_templates_create_link:I = 0x7f120b9c
+.field public static final guild_template_name_meeting_plans:I = 0x7f120b9c
 
-.field public static final guild_templates_default_template_name:I = 0x7f120b9d
+.field public static final guild_template_name_meetups:I = 0x7f120b9d
 
-.field public static final guild_templates_delete_description:I = 0x7f120b9e
+.field public static final guild_template_name_memes:I = 0x7f120b9e
 
-.field public static final guild_templates_delete_template:I = 0x7f120b9f
+.field public static final guild_template_name_music:I = 0x7f120b9f
 
-.field public static final guild_templates_delete_template_link:I = 0x7f120ba0
+.field public static final guild_template_name_notes:I = 0x7f120ba0
 
-.field public static final guild_templates_form_description_channels:I = 0x7f120ba1
+.field public static final guild_template_name_notes_resources:I = 0x7f120ba1
 
-.field public static final guild_templates_form_description_members:I = 0x7f120ba2
+.field public static final guild_template_name_off_topic:I = 0x7f120ba2
 
-.field public static final guild_templates_form_description_messages:I = 0x7f120ba3
+.field public static final guild_template_name_random:I = 0x7f120ba3
 
-.field public static final guild_templates_form_description_perks:I = 0x7f120ba4
+.field public static final guild_template_name_resources:I = 0x7f120ba4
 
-.field public static final guild_templates_form_description_roles:I = 0x7f120ba5
+.field public static final guild_template_name_session_planning:I = 0x7f120ba5
 
-.field public static final guild_templates_form_description_settings:I = 0x7f120ba6
+.field public static final guild_template_name_social:I = 0x7f120ba6
 
-.field public static final guild_templates_form_description_will_copy:I = 0x7f120ba7
+.field public static final guild_template_name_strategy:I = 0x7f120ba7
 
-.field public static final guild_templates_form_description_wont_copy:I = 0x7f120ba8
+.field public static final guild_template_name_voice_community_hangout:I = 0x7f120ba8
 
-.field public static final guild_templates_form_error_name_required:I = 0x7f120ba9
+.field public static final guild_template_name_voice_gaming:I = 0x7f120ba9
 
-.field public static final guild_templates_form_label_description:I = 0x7f120baa
+.field public static final guild_template_name_voice_general:I = 0x7f120baa
 
-.field public static final guild_templates_form_label_icon:I = 0x7f120bab
+.field public static final guild_template_name_voice_lobby:I = 0x7f120bab
 
-.field public static final guild_templates_form_label_link:I = 0x7f120bac
+.field public static final guild_template_name_voice_lounge:I = 0x7f120bac
 
-.field public static final guild_templates_form_label_name:I = 0x7f120bad
+.field public static final guild_template_name_voice_meeting_room:I = 0x7f120bad
 
-.field public static final guild_templates_form_label_server_name_classroom:I = 0x7f120bae
+.field public static final guild_template_name_voice_stream_room:I = 0x7f120bae
 
-.field public static final guild_templates_form_label_server_name_create_from_scratch:I = 0x7f120baf
+.field public static final guild_template_name_voice_study_room:I = 0x7f120baf
 
-.field public static final guild_templates_form_label_server_name_creators_hobbies:I = 0x7f120bb0
+.field public static final guild_template_name_welcome:I = 0x7f120bb0
 
-.field public static final guild_templates_form_label_server_name_friends_family:I = 0x7f120bb1
+.field public static final guild_template_name_welcome_and_rules:I = 0x7f120bb1
 
-.field public static final guild_templates_form_label_server_name_global_communities:I = 0x7f120bb2
+.field public static final guild_template_open:I = 0x7f120bb2
 
-.field public static final guild_templates_form_label_server_name_local_communities:I = 0x7f120bb3
+.field public static final guild_template_preview_description:I = 0x7f120bb3
 
-.field public static final guild_templates_form_label_server_name_study_groups:I = 0x7f120bb4
+.field public static final guild_template_preview_protip_body:I = 0x7f120bb4
 
-.field public static final guild_templates_form_placeholder_description:I = 0x7f120bb5
+.field public static final guild_template_preview_title:I = 0x7f120bb5
 
-.field public static final guild_templates_form_placeholder_name:I = 0x7f120bb6
+.field public static final guild_template_resolved_embed_title:I = 0x7f120bb6
 
-.field public static final guild_templates_last_sync:I = 0x7f120bb7
+.field public static final guild_template_resolving_title:I = 0x7f120bb7
 
-.field public static final guild_templates_preview_template:I = 0x7f120bb8
+.field public static final guild_template_selector_description:I = 0x7f120bb8
 
-.field public static final guild_templates_promotion_tooltip:I = 0x7f120bb9
+.field public static final guild_template_selector_option_header:I = 0x7f120bb9
 
-.field public static final guild_templates_promotion_tooltip_aria_label:I = 0x7f120bba
+.field public static final guild_template_selector_suggestion:I = 0x7f120bba
 
-.field public static final guild_templates_sync_description:I = 0x7f120bbb
+.field public static final guild_template_selector_title:I = 0x7f120bbb
 
-.field public static final guild_templates_sync_template:I = 0x7f120bbc
+.field public static final guild_template_settings_description:I = 0x7f120bbc
 
-.field public static final guild_templates_template_sync:I = 0x7f120bbd
+.field public static final guild_template_setup_discord:I = 0x7f120bbd
 
-.field public static final guild_templates_unsynced_tooltip:I = 0x7f120bbe
+.field public static final guild_template_usages:I = 0x7f120bbe
 
-.field public static final guild_templates_unsynced_warning:I = 0x7f120bbf
+.field public static final guild_template_usages_by_creator2:I = 0x7f120bbf
 
-.field public static final guild_tooltip_a11y_label:I = 0x7f120bc0
+.field public static final guild_template_usages_no_bold:I = 0x7f120bc0
 
-.field public static final guild_unavailable_body:I = 0x7f120bc1
+.field public static final guild_templates:I = 0x7f120bc1
 
-.field public static final guild_unavailable_header:I = 0x7f120bc2
+.field public static final guild_templates_create_link:I = 0x7f120bc2
 
-.field public static final guild_unavailable_title:I = 0x7f120bc3
+.field public static final guild_templates_default_template_name:I = 0x7f120bc3
 
-.field public static final guild_verification_text_account_age:I = 0x7f120bc4
+.field public static final guild_templates_delete_description:I = 0x7f120bc4
 
-.field public static final guild_verification_text_member_age:I = 0x7f120bc5
+.field public static final guild_templates_delete_template:I = 0x7f120bc5
 
-.field public static final guild_verification_text_not_claimed:I = 0x7f120bc6
+.field public static final guild_templates_delete_template_link:I = 0x7f120bc6
 
-.field public static final guild_verification_text_not_phone_verified:I = 0x7f120bc7
+.field public static final guild_templates_form_description_channels:I = 0x7f120bc7
 
-.field public static final guild_verification_text_not_verified:I = 0x7f120bc8
+.field public static final guild_templates_form_description_members:I = 0x7f120bc8
 
-.field public static final guild_verified:I = 0x7f120bc9
+.field public static final guild_templates_form_description_messages:I = 0x7f120bc9
 
-.field public static final guild_video_call_marketing_popout_body:I = 0x7f120bca
+.field public static final guild_templates_form_description_perks:I = 0x7f120bca
 
-.field public static final guild_video_call_marketing_popout_header:I = 0x7f120bcb
+.field public static final guild_templates_form_description_roles:I = 0x7f120bcb
 
-.field public static final guild_voice_channel_empty_body_mobile:I = 0x7f120bcc
+.field public static final guild_templates_form_description_settings:I = 0x7f120bcc
 
-.field public static final guilds_bar_a11y_label:I = 0x7f120bcd
+.field public static final guild_templates_form_description_will_copy:I = 0x7f120bcd
 
-.field public static final hardware_acceleration:I = 0x7f120bce
+.field public static final guild_templates_form_description_wont_copy:I = 0x7f120bce
 
-.field public static final hardware_acceleration_help_text:I = 0x7f120bcf
+.field public static final guild_templates_form_error_name_required:I = 0x7f120bcf
 
-.field public static final help:I = 0x7f120bd0
+.field public static final guild_templates_form_label_description:I = 0x7f120bd0
 
-.field public static final help_clear_permissions:I = 0x7f120bd1
+.field public static final guild_templates_form_label_icon:I = 0x7f120bd1
 
-.field public static final help_desk:I = 0x7f120bd2
+.field public static final guild_templates_form_label_link:I = 0x7f120bd2
 
-.field public static final help_missing_manage_roles_permission:I = 0x7f120bd3
+.field public static final guild_templates_form_label_name:I = 0x7f120bd3
 
-.field public static final help_missing_permission:I = 0x7f120bd4
+.field public static final guild_templates_form_label_server_name_classroom:I = 0x7f120bd4
 
-.field public static final help_role_locked:I = 0x7f120bd5
+.field public static final guild_templates_form_label_server_name_create_from_scratch:I = 0x7f120bd5
 
-.field public static final help_role_locked_mine:I = 0x7f120bd6
+.field public static final guild_templates_form_label_server_name_creators_hobbies:I = 0x7f120bd6
 
-.field public static final help_roles_description:I = 0x7f120bd7
+.field public static final guild_templates_form_label_server_name_friends_family:I = 0x7f120bd7
 
-.field public static final help_singular_permission:I = 0x7f120bd8
+.field public static final guild_templates_form_label_server_name_global_communities:I = 0x7f120bd8
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bd9
+.field public static final guild_templates_form_label_server_name_local_communities:I = 0x7f120bd9
 
-.field public static final hide_chat:I = 0x7f120bda
+.field public static final guild_templates_form_label_server_name_study_groups:I = 0x7f120bda
 
-.field public static final hide_instant_invites_description:I = 0x7f120bdb
+.field public static final guild_templates_form_placeholder_description:I = 0x7f120bdb
 
-.field public static final hide_instant_invites_label:I = 0x7f120bdc
+.field public static final guild_templates_form_placeholder_name:I = 0x7f120bdc
 
-.field public static final hide_muted:I = 0x7f120bdd
+.field public static final guild_templates_last_sync:I = 0x7f120bdd
 
-.field public static final hide_muted_channels:I = 0x7f120bde
+.field public static final guild_templates_preview_template:I = 0x7f120bde
 
-.field public static final hide_navigation:I = 0x7f120bdf
+.field public static final guild_templates_promotion_tooltip:I = 0x7f120bdf
 
-.field public static final hide_personal_information_description:I = 0x7f120be0
+.field public static final guild_templates_promotion_tooltip_aria_label:I = 0x7f120be0
 
-.field public static final hide_personal_information_label:I = 0x7f120be1
+.field public static final guild_templates_sync_description:I = 0x7f120be1
 
-.field public static final hold_up:I = 0x7f120be2
+.field public static final guild_templates_sync_template:I = 0x7f120be2
 
-.field public static final home:I = 0x7f120be3
+.field public static final guild_templates_template_sync:I = 0x7f120be3
 
-.field public static final how_to_invite_others:I = 0x7f120be4
+.field public static final guild_templates_unsynced_tooltip:I = 0x7f120be4
 
-.field public static final hr:I = 0x7f120be5
+.field public static final guild_templates_unsynced_warning:I = 0x7f120be5
 
-.field public static final hu:I = 0x7f120be6
+.field public static final guild_tooltip_a11y_label:I = 0x7f120be6
 
-.field public static final humanize_duration_a_few_seconds:I = 0x7f120be7
+.field public static final guild_unavailable_body:I = 0x7f120be7
 
-.field public static final humanize_duration_days:I = 0x7f120be8
+.field public static final guild_unavailable_header:I = 0x7f120be8
 
-.field public static final humanize_duration_hours:I = 0x7f120be9
+.field public static final guild_unavailable_title:I = 0x7f120be9
 
-.field public static final humanize_duration_minutes:I = 0x7f120bea
+.field public static final guild_verification_text_account_age:I = 0x7f120bea
 
-.field public static final humanize_duration_seconds:I = 0x7f120beb
+.field public static final guild_verification_text_member_age:I = 0x7f120beb
 
-.field public static final hypesquad_attendee_cta:I = 0x7f120bec
+.field public static final guild_verification_text_not_claimed:I = 0x7f120bec
 
-.field public static final hypesquad_badge_tooltip:I = 0x7f120bed
+.field public static final guild_verification_text_not_phone_verified:I = 0x7f120bed
 
-.field public static final hypesquad_description_house_1:I = 0x7f120bee
+.field public static final guild_verification_text_not_verified:I = 0x7f120bee
 
-.field public static final hypesquad_description_house_2:I = 0x7f120bef
+.field public static final guild_verified:I = 0x7f120bef
 
-.field public static final hypesquad_description_house_3:I = 0x7f120bf0
+.field public static final guild_video_call_marketing_popout_body:I = 0x7f120bf0
 
-.field public static final hypesquad_error_body:I = 0x7f120bf1
+.field public static final guild_video_call_marketing_popout_header:I = 0x7f120bf1
 
-.field public static final hypesquad_error_heading:I = 0x7f120bf2
+.field public static final guild_voice_channel_empty_body_mobile:I = 0x7f120bf2
 
-.field public static final hypesquad_heading:I = 0x7f120bf3
+.field public static final guilds_bar_a11y_label:I = 0x7f120bf3
 
-.field public static final hypesquad_heading_existing_member:I = 0x7f120bf4
+.field public static final hardware_acceleration:I = 0x7f120bf4
 
-.field public static final hypesquad_house_1:I = 0x7f120bf5
+.field public static final hardware_acceleration_help_text:I = 0x7f120bf5
 
-.field public static final hypesquad_house_2:I = 0x7f120bf6
+.field public static final help:I = 0x7f120bf6
 
-.field public static final hypesquad_house_3:I = 0x7f120bf7
+.field public static final help_clear_permissions:I = 0x7f120bf7
 
-.field public static final hypesquad_join:I = 0x7f120bf8
+.field public static final help_desk:I = 0x7f120bf8
 
-.field public static final hypesquad_leave_action:I = 0x7f120bf9
+.field public static final help_missing_manage_roles_permission:I = 0x7f120bf9
 
-.field public static final hypesquad_leave_error:I = 0x7f120bfa
+.field public static final help_missing_permission:I = 0x7f120bfa
 
-.field public static final hypesquad_leave_prompt:I = 0x7f120bfb
+.field public static final help_role_locked:I = 0x7f120bfb
 
-.field public static final hypesquad_membership_heading:I = 0x7f120bfc
+.field public static final help_role_locked_mine:I = 0x7f120bfc
 
-.field public static final hypesquad_newsletter_warning:I = 0x7f120bfd
+.field public static final help_roles_description:I = 0x7f120bfd
 
-.field public static final hypesquad_online_badge_tooltip:I = 0x7f120bfe
+.field public static final help_singular_permission:I = 0x7f120bfe
 
-.field public static final hypesquad_perk_description_newsletter:I = 0x7f120bff
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bff
 
-.field public static final hypesquad_perk_description_profile_badge:I = 0x7f120c00
+.field public static final hide_chat:I = 0x7f120c00
 
-.field public static final hypesquad_perk_description_squad_challenges:I = 0x7f120c01
+.field public static final hide_instant_invites_description:I = 0x7f120c01
 
-.field public static final hypesquad_perk_title_newsletter:I = 0x7f120c02
+.field public static final hide_instant_invites_label:I = 0x7f120c02
 
-.field public static final hypesquad_perk_title_profile_badge:I = 0x7f120c03
+.field public static final hide_muted:I = 0x7f120c03
 
-.field public static final hypesquad_perk_title_squad_challenges:I = 0x7f120c04
+.field public static final hide_muted_channels:I = 0x7f120c04
 
-.field public static final hypesquad_perks_heading:I = 0x7f120c05
+.field public static final hide_navigation:I = 0x7f120c05
 
-.field public static final hypesquad_question_0_prompt:I = 0x7f120c06
+.field public static final hide_personal_information_description:I = 0x7f120c06
 
-.field public static final hypesquad_question_0_response_a:I = 0x7f120c07
+.field public static final hide_personal_information_label:I = 0x7f120c07
 
-.field public static final hypesquad_question_0_response_b:I = 0x7f120c08
+.field public static final hold_up:I = 0x7f120c08
 
-.field public static final hypesquad_question_0_response_c:I = 0x7f120c09
+.field public static final home:I = 0x7f120c09
 
-.field public static final hypesquad_question_0_response_d:I = 0x7f120c0a
+.field public static final how_to_invite_others:I = 0x7f120c0a
 
-.field public static final hypesquad_question_10_prompt:I = 0x7f120c0b
+.field public static final hr:I = 0x7f120c0b
 
-.field public static final hypesquad_question_10_response_a:I = 0x7f120c0c
+.field public static final hu:I = 0x7f120c0c
 
-.field public static final hypesquad_question_10_response_b:I = 0x7f120c0d
+.field public static final humanize_duration_a_few_seconds:I = 0x7f120c0d
 
-.field public static final hypesquad_question_10_response_c:I = 0x7f120c0e
+.field public static final humanize_duration_days:I = 0x7f120c0e
 
-.field public static final hypesquad_question_10_response_d:I = 0x7f120c0f
+.field public static final humanize_duration_hours:I = 0x7f120c0f
 
-.field public static final hypesquad_question_11_prompt:I = 0x7f120c10
+.field public static final humanize_duration_minutes:I = 0x7f120c10
 
-.field public static final hypesquad_question_11_response_a:I = 0x7f120c11
+.field public static final humanize_duration_seconds:I = 0x7f120c11
 
-.field public static final hypesquad_question_11_response_b:I = 0x7f120c12
+.field public static final hypesquad_attendee_cta:I = 0x7f120c12
 
-.field public static final hypesquad_question_11_response_c:I = 0x7f120c13
+.field public static final hypesquad_badge_tooltip:I = 0x7f120c13
 
-.field public static final hypesquad_question_11_response_d:I = 0x7f120c14
+.field public static final hypesquad_description_house_1:I = 0x7f120c14
 
-.field public static final hypesquad_question_12_prompt:I = 0x7f120c15
+.field public static final hypesquad_description_house_2:I = 0x7f120c15
 
-.field public static final hypesquad_question_12_response_a:I = 0x7f120c16
+.field public static final hypesquad_description_house_3:I = 0x7f120c16
 
-.field public static final hypesquad_question_12_response_b:I = 0x7f120c17
+.field public static final hypesquad_error_body:I = 0x7f120c17
 
-.field public static final hypesquad_question_12_response_c:I = 0x7f120c18
+.field public static final hypesquad_error_heading:I = 0x7f120c18
 
-.field public static final hypesquad_question_12_response_d:I = 0x7f120c19
+.field public static final hypesquad_heading:I = 0x7f120c19
 
-.field public static final hypesquad_question_13_prompt:I = 0x7f120c1a
+.field public static final hypesquad_heading_existing_member:I = 0x7f120c1a
 
-.field public static final hypesquad_question_13_response_a:I = 0x7f120c1b
+.field public static final hypesquad_house_1:I = 0x7f120c1b
 
-.field public static final hypesquad_question_13_response_b:I = 0x7f120c1c
+.field public static final hypesquad_house_2:I = 0x7f120c1c
 
-.field public static final hypesquad_question_13_response_c:I = 0x7f120c1d
+.field public static final hypesquad_house_3:I = 0x7f120c1d
 
-.field public static final hypesquad_question_13_response_d:I = 0x7f120c1e
+.field public static final hypesquad_join:I = 0x7f120c1e
 
-.field public static final hypesquad_question_14_prompt:I = 0x7f120c1f
+.field public static final hypesquad_leave_action:I = 0x7f120c1f
 
-.field public static final hypesquad_question_14_response_a:I = 0x7f120c20
+.field public static final hypesquad_leave_error:I = 0x7f120c20
 
-.field public static final hypesquad_question_14_response_b:I = 0x7f120c21
+.field public static final hypesquad_leave_prompt:I = 0x7f120c21
 
-.field public static final hypesquad_question_14_response_c:I = 0x7f120c22
+.field public static final hypesquad_membership_heading:I = 0x7f120c22
 
-.field public static final hypesquad_question_14_response_d:I = 0x7f120c23
+.field public static final hypesquad_newsletter_warning:I = 0x7f120c23
 
-.field public static final hypesquad_question_1_prompt:I = 0x7f120c24
+.field public static final hypesquad_online_badge_tooltip:I = 0x7f120c24
 
-.field public static final hypesquad_question_1_response_a:I = 0x7f120c25
+.field public static final hypesquad_perk_description_newsletter:I = 0x7f120c25
 
-.field public static final hypesquad_question_1_response_b:I = 0x7f120c26
+.field public static final hypesquad_perk_description_profile_badge:I = 0x7f120c26
 
-.field public static final hypesquad_question_1_response_c:I = 0x7f120c27
+.field public static final hypesquad_perk_description_squad_challenges:I = 0x7f120c27
 
-.field public static final hypesquad_question_1_response_d:I = 0x7f120c28
+.field public static final hypesquad_perk_title_newsletter:I = 0x7f120c28
 
-.field public static final hypesquad_question_2_prompt:I = 0x7f120c29
+.field public static final hypesquad_perk_title_profile_badge:I = 0x7f120c29
 
-.field public static final hypesquad_question_2_response_a:I = 0x7f120c2a
+.field public static final hypesquad_perk_title_squad_challenges:I = 0x7f120c2a
 
-.field public static final hypesquad_question_2_response_b:I = 0x7f120c2b
+.field public static final hypesquad_perks_heading:I = 0x7f120c2b
 
-.field public static final hypesquad_question_2_response_c:I = 0x7f120c2c
+.field public static final hypesquad_question_0_prompt:I = 0x7f120c2c
 
-.field public static final hypesquad_question_2_response_d:I = 0x7f120c2d
+.field public static final hypesquad_question_0_response_a:I = 0x7f120c2d
 
-.field public static final hypesquad_question_3_prompt:I = 0x7f120c2e
+.field public static final hypesquad_question_0_response_b:I = 0x7f120c2e
 
-.field public static final hypesquad_question_3_response_a:I = 0x7f120c2f
+.field public static final hypesquad_question_0_response_c:I = 0x7f120c2f
 
-.field public static final hypesquad_question_3_response_b:I = 0x7f120c30
+.field public static final hypesquad_question_0_response_d:I = 0x7f120c30
 
-.field public static final hypesquad_question_3_response_c:I = 0x7f120c31
+.field public static final hypesquad_question_10_prompt:I = 0x7f120c31
 
-.field public static final hypesquad_question_3_response_d:I = 0x7f120c32
+.field public static final hypesquad_question_10_response_a:I = 0x7f120c32
 
-.field public static final hypesquad_question_4_prompt:I = 0x7f120c33
+.field public static final hypesquad_question_10_response_b:I = 0x7f120c33
 
-.field public static final hypesquad_question_4_response_a:I = 0x7f120c34
+.field public static final hypesquad_question_10_response_c:I = 0x7f120c34
 
-.field public static final hypesquad_question_4_response_b:I = 0x7f120c35
+.field public static final hypesquad_question_10_response_d:I = 0x7f120c35
 
-.field public static final hypesquad_question_4_response_c:I = 0x7f120c36
+.field public static final hypesquad_question_11_prompt:I = 0x7f120c36
 
-.field public static final hypesquad_question_4_response_d:I = 0x7f120c37
+.field public static final hypesquad_question_11_response_a:I = 0x7f120c37
 
-.field public static final hypesquad_question_5_prompt:I = 0x7f120c38
+.field public static final hypesquad_question_11_response_b:I = 0x7f120c38
 
-.field public static final hypesquad_question_5_response_a:I = 0x7f120c39
+.field public static final hypesquad_question_11_response_c:I = 0x7f120c39
 
-.field public static final hypesquad_question_5_response_b:I = 0x7f120c3a
+.field public static final hypesquad_question_11_response_d:I = 0x7f120c3a
 
-.field public static final hypesquad_question_5_response_c:I = 0x7f120c3b
+.field public static final hypesquad_question_12_prompt:I = 0x7f120c3b
 
-.field public static final hypesquad_question_5_response_d:I = 0x7f120c3c
+.field public static final hypesquad_question_12_response_a:I = 0x7f120c3c
 
-.field public static final hypesquad_question_6_prompt:I = 0x7f120c3d
+.field public static final hypesquad_question_12_response_b:I = 0x7f120c3d
 
-.field public static final hypesquad_question_6_response_a:I = 0x7f120c3e
+.field public static final hypesquad_question_12_response_c:I = 0x7f120c3e
 
-.field public static final hypesquad_question_6_response_b:I = 0x7f120c3f
+.field public static final hypesquad_question_12_response_d:I = 0x7f120c3f
 
-.field public static final hypesquad_question_6_response_c:I = 0x7f120c40
+.field public static final hypesquad_question_13_prompt:I = 0x7f120c40
 
-.field public static final hypesquad_question_6_response_d:I = 0x7f120c41
+.field public static final hypesquad_question_13_response_a:I = 0x7f120c41
 
-.field public static final hypesquad_question_7_prompt:I = 0x7f120c42
+.field public static final hypesquad_question_13_response_b:I = 0x7f120c42
 
-.field public static final hypesquad_question_7_response_a:I = 0x7f120c43
+.field public static final hypesquad_question_13_response_c:I = 0x7f120c43
 
-.field public static final hypesquad_question_7_response_b:I = 0x7f120c44
+.field public static final hypesquad_question_13_response_d:I = 0x7f120c44
 
-.field public static final hypesquad_question_7_response_c:I = 0x7f120c45
+.field public static final hypesquad_question_14_prompt:I = 0x7f120c45
 
-.field public static final hypesquad_question_7_response_d:I = 0x7f120c46
+.field public static final hypesquad_question_14_response_a:I = 0x7f120c46
 
-.field public static final hypesquad_question_8_prompt:I = 0x7f120c47
+.field public static final hypesquad_question_14_response_b:I = 0x7f120c47
 
-.field public static final hypesquad_question_8_response_a:I = 0x7f120c48
+.field public static final hypesquad_question_14_response_c:I = 0x7f120c48
 
-.field public static final hypesquad_question_8_response_b:I = 0x7f120c49
+.field public static final hypesquad_question_14_response_d:I = 0x7f120c49
 
-.field public static final hypesquad_question_8_response_c:I = 0x7f120c4a
+.field public static final hypesquad_question_1_prompt:I = 0x7f120c4a
 
-.field public static final hypesquad_question_8_response_d:I = 0x7f120c4b
+.field public static final hypesquad_question_1_response_a:I = 0x7f120c4b
 
-.field public static final hypesquad_question_9_prompt:I = 0x7f120c4c
+.field public static final hypesquad_question_1_response_b:I = 0x7f120c4c
 
-.field public static final hypesquad_question_9_response_a:I = 0x7f120c4d
+.field public static final hypesquad_question_1_response_c:I = 0x7f120c4d
 
-.field public static final hypesquad_question_9_response_b:I = 0x7f120c4e
+.field public static final hypesquad_question_1_response_d:I = 0x7f120c4e
 
-.field public static final hypesquad_question_9_response_c:I = 0x7f120c4f
+.field public static final hypesquad_question_2_prompt:I = 0x7f120c4f
 
-.field public static final hypesquad_question_9_response_d:I = 0x7f120c50
+.field public static final hypesquad_question_2_response_a:I = 0x7f120c50
 
-.field public static final hypesquad_quiz_body_house_1:I = 0x7f120c51
+.field public static final hypesquad_question_2_response_b:I = 0x7f120c51
 
-.field public static final hypesquad_quiz_body_house_2:I = 0x7f120c52
+.field public static final hypesquad_question_2_response_c:I = 0x7f120c52
 
-.field public static final hypesquad_quiz_body_house_3:I = 0x7f120c53
+.field public static final hypesquad_question_2_response_d:I = 0x7f120c53
 
-.field public static final hypesquad_quiz_cancel:I = 0x7f120c54
+.field public static final hypesquad_question_3_prompt:I = 0x7f120c54
 
-.field public static final hypesquad_quiz_close:I = 0x7f120c55
+.field public static final hypesquad_question_3_response_a:I = 0x7f120c55
 
-.field public static final hypesquad_quiz_completed_modal_title:I = 0x7f120c56
+.field public static final hypesquad_question_3_response_b:I = 0x7f120c56
 
-.field public static final hypesquad_quiz_error_modal_title:I = 0x7f120c57
+.field public static final hypesquad_question_3_response_c:I = 0x7f120c57
 
-.field public static final hypesquad_quiz_next_question:I = 0x7f120c58
+.field public static final hypesquad_question_3_response_d:I = 0x7f120c58
 
-.field public static final hypesquad_quiz_ongoing_modal_title:I = 0x7f120c59
+.field public static final hypesquad_question_4_prompt:I = 0x7f120c59
 
-.field public static final hypesquad_quiz_retry:I = 0x7f120c5a
+.field public static final hypesquad_question_4_response_a:I = 0x7f120c5a
 
-.field public static final hypesquad_quiz_select_answer:I = 0x7f120c5b
+.field public static final hypesquad_question_4_response_b:I = 0x7f120c5b
 
-.field public static final hypesquad_quiz_show_my_house:I = 0x7f120c5c
+.field public static final hypesquad_question_4_response_c:I = 0x7f120c5c
 
-.field public static final hypesquad_quiz_title:I = 0x7f120c5d
+.field public static final hypesquad_question_4_response_d:I = 0x7f120c5d
 
-.field public static final hypesquad_ready_to_rep:I = 0x7f120c5e
+.field public static final hypesquad_question_5_prompt:I = 0x7f120c5e
 
-.field public static final hypesquad_subheading:I = 0x7f120c5f
+.field public static final hypesquad_question_5_response_a:I = 0x7f120c5f
 
-.field public static final hypesquad_switch_houses_action:I = 0x7f120c60
+.field public static final hypesquad_question_5_response_b:I = 0x7f120c60
 
-.field public static final hypesquad_switch_houses_prompt:I = 0x7f120c61
+.field public static final hypesquad_question_5_response_c:I = 0x7f120c61
 
-.field public static final hypesquad_unclaimed_account_notice:I = 0x7f120c62
+.field public static final hypesquad_question_5_response_d:I = 0x7f120c62
 
-.field public static final hypesquad_unverified_email_notice:I = 0x7f120c63
+.field public static final hypesquad_question_6_prompt:I = 0x7f120c63
 
-.field public static final hypesquad_your_house:I = 0x7f120c64
+.field public static final hypesquad_question_6_response_a:I = 0x7f120c64
 
-.field public static final i18n_locale_loading_error:I = 0x7f120c65
+.field public static final hypesquad_question_6_response_b:I = 0x7f120c65
 
-.field public static final icon_content_description:I = 0x7f120c66
+.field public static final hypesquad_question_6_response_c:I = 0x7f120c66
 
-.field public static final image:I = 0x7f120c67
+.field public static final hypesquad_question_6_response_d:I = 0x7f120c67
 
-.field public static final image_actions_menu_label:I = 0x7f120c68
+.field public static final hypesquad_question_7_prompt:I = 0x7f120c68
 
-.field public static final images:I = 0x7f120c69
+.field public static final hypesquad_question_7_response_a:I = 0x7f120c69
 
-.field public static final img_alt_attachment_file_type:I = 0x7f120c6a
+.field public static final hypesquad_question_7_response_b:I = 0x7f120c6a
 
-.field public static final img_alt_emoji:I = 0x7f120c6b
+.field public static final hypesquad_question_7_response_c:I = 0x7f120c6b
 
-.field public static final img_alt_icon:I = 0x7f120c6c
+.field public static final hypesquad_question_7_response_d:I = 0x7f120c6c
 
-.field public static final img_alt_logo:I = 0x7f120c6d
+.field public static final hypesquad_question_8_prompt:I = 0x7f120c6d
 
-.field public static final in_category:I = 0x7f120c6e
+.field public static final hypesquad_question_8_response_a:I = 0x7f120c6e
 
-.field public static final in_game_voice_settings:I = 0x7f120c6f
+.field public static final hypesquad_question_8_response_b:I = 0x7f120c6f
 
-.field public static final in_the_voice_channel:I = 0x7f120c70
+.field public static final hypesquad_question_8_response_c:I = 0x7f120c70
 
-.field public static final inbox:I = 0x7f120c71
+.field public static final hypesquad_question_8_response_d:I = 0x7f120c71
 
-.field public static final incoming_call:I = 0x7f120c72
+.field public static final hypesquad_question_9_prompt:I = 0x7f120c72
 
-.field public static final incoming_call_ellipsis:I = 0x7f120c73
+.field public static final hypesquad_question_9_response_a:I = 0x7f120c73
 
-.field public static final incoming_call_preview_camera:I = 0x7f120c74
+.field public static final hypesquad_question_9_response_b:I = 0x7f120c74
 
-.field public static final incoming_friend_request:I = 0x7f120c75
+.field public static final hypesquad_question_9_response_c:I = 0x7f120c75
 
-.field public static final incoming_friend_requests_count:I = 0x7f120c76
+.field public static final hypesquad_question_9_response_d:I = 0x7f120c76
 
-.field public static final incoming_video_call:I = 0x7f120c77
+.field public static final hypesquad_quiz_body_house_1:I = 0x7f120c77
 
-.field public static final incoming_video_call_ellipsis:I = 0x7f120c78
+.field public static final hypesquad_quiz_body_house_2:I = 0x7f120c78
 
-.field public static final incompatible_browser:I = 0x7f120c79
+.field public static final hypesquad_quiz_body_house_3:I = 0x7f120c79
 
-.field public static final inivte_modal_no_thanks:I = 0x7f120c7a
+.field public static final hypesquad_quiz_cancel:I = 0x7f120c7a
 
-.field public static final inline_attachment_media:I = 0x7f120c7b
+.field public static final hypesquad_quiz_close:I = 0x7f120c7b
 
-.field public static final inline_attachment_media_help:I = 0x7f120c7c
+.field public static final hypesquad_quiz_completed_modal_title:I = 0x7f120c7c
 
-.field public static final inline_embed_media:I = 0x7f120c7d
+.field public static final hypesquad_quiz_error_modal_title:I = 0x7f120c7d
 
-.field public static final inline_media_label:I = 0x7f120c7e
+.field public static final hypesquad_quiz_next_question:I = 0x7f120c7e
 
-.field public static final input_device:I = 0x7f120c7f
+.field public static final hypesquad_quiz_ongoing_modal_title:I = 0x7f120c7f
 
-.field public static final input_mode_ptt:I = 0x7f120c80
+.field public static final hypesquad_quiz_retry:I = 0x7f120c80
 
-.field public static final input_mode_ptt_limited:I = 0x7f120c81
+.field public static final hypesquad_quiz_select_answer:I = 0x7f120c81
 
-.field public static final input_mode_ptt_release_delay:I = 0x7f120c82
+.field public static final hypesquad_quiz_show_my_house:I = 0x7f120c82
 
-.field public static final input_mode_vad:I = 0x7f120c83
+.field public static final hypesquad_quiz_title:I = 0x7f120c83
 
-.field public static final instagram:I = 0x7f120c84
+.field public static final hypesquad_ready_to_rep:I = 0x7f120c84
 
-.field public static final install_location_main:I = 0x7f120c85
+.field public static final hypesquad_subheading:I = 0x7f120c85
 
-.field public static final instant_invite:I = 0x7f120c86
+.field public static final hypesquad_switch_houses_action:I = 0x7f120c86
 
-.field public static final instant_invite_accept:I = 0x7f120c87
+.field public static final hypesquad_switch_houses_prompt:I = 0x7f120c87
 
-.field public static final instant_invite_accepting:I = 0x7f120c88
+.field public static final hypesquad_unclaimed_account_notice:I = 0x7f120c88
 
-.field public static final instant_invite_ask_for_new_invite:I = 0x7f120c89
+.field public static final hypesquad_unverified_email_notice:I = 0x7f120c89
 
-.field public static final instant_invite_ask_user_for_new_invite:I = 0x7f120c8a
+.field public static final hypesquad_your_house:I = 0x7f120c8a
 
-.field public static final instant_invite_banned:I = 0x7f120c8b
+.field public static final i18n_locale_loading_error:I = 0x7f120c8b
 
-.field public static final instant_invite_banned_info:I = 0x7f120c8c
+.field public static final icon_content_description:I = 0x7f120c8c
 
-.field public static final instant_invite_expired:I = 0x7f120c8d
+.field public static final image:I = 0x7f120c8d
 
-.field public static final instant_invite_expires:I = 0x7f120c8e
+.field public static final image_actions_menu_label:I = 0x7f120c8e
 
-.field public static final instant_invite_failed_to_generate:I = 0x7f120c8f
+.field public static final images:I = 0x7f120c8f
 
-.field public static final instant_invite_friends:I = 0x7f120c90
+.field public static final img_alt_attachment_file_type:I = 0x7f120c90
 
-.field public static final instant_invite_friends_description:I = 0x7f120c91
+.field public static final img_alt_emoji:I = 0x7f120c91
 
-.field public static final instant_invite_generated_by_widget:I = 0x7f120c92
+.field public static final img_alt_icon:I = 0x7f120c92
 
-.field public static final instant_invite_guild_by_user:I = 0x7f120c93
+.field public static final img_alt_logo:I = 0x7f120c93
 
-.field public static final instant_invite_guild_members_online:I = 0x7f120c94
+.field public static final in_category:I = 0x7f120c94
 
-.field public static final instant_invite_guild_members_total:I = 0x7f120c95
+.field public static final in_game_voice_settings:I = 0x7f120c95
 
-.field public static final instant_invite_hidden:I = 0x7f120c96
+.field public static final in_the_voice_channel:I = 0x7f120c96
 
-.field public static final instant_invite_invalid_channel:I = 0x7f120c97
+.field public static final inbox:I = 0x7f120c97
 
-.field public static final instant_invite_invite_code:I = 0x7f120c98
+.field public static final incoming_call:I = 0x7f120c98
 
-.field public static final instant_invite_inviter:I = 0x7f120c99
+.field public static final incoming_call_ellipsis:I = 0x7f120c99
 
-.field public static final instant_invite_looks_like:I = 0x7f120c9a
+.field public static final incoming_call_preview_camera:I = 0x7f120c9a
 
-.field public static final instant_invite_not_allowed:I = 0x7f120c9b
+.field public static final incoming_friend_request:I = 0x7f120c9b
 
-.field public static final instant_invite_resolved_title:I = 0x7f120c9c
+.field public static final incoming_friend_requests_count:I = 0x7f120c9c
 
-.field public static final instant_invite_resolving:I = 0x7f120c9d
+.field public static final incoming_video_call:I = 0x7f120c9d
 
-.field public static final instant_invite_uses:I = 0x7f120c9e
+.field public static final incoming_video_call_ellipsis:I = 0x7f120c9e
 
-.field public static final instant_invite_you_are_already_a_member_of:I = 0x7f120c9f
+.field public static final incompatible_browser:I = 0x7f120c9f
 
-.field public static final instant_invite_you_have_been_invited_to_join:I = 0x7f120ca0
+.field public static final inivte_modal_no_thanks:I = 0x7f120ca0
 
-.field public static final instant_invite_you_have_been_invited_to_join_by_user:I = 0x7f120ca1
+.field public static final inline_attachment_media:I = 0x7f120ca1
 
-.field public static final instant_invite_you_have_been_invited_to_join_group_dm:I = 0x7f120ca2
+.field public static final inline_attachment_media_help:I = 0x7f120ca2
 
-.field public static final instant_invite_you_have_joined:I = 0x7f120ca3
+.field public static final inline_embed_media:I = 0x7f120ca3
 
-.field public static final instant_invites:I = 0x7f120ca4
+.field public static final inline_media_label:I = 0x7f120ca4
 
-.field public static final integration_added_date:I = 0x7f120ca5
+.field public static final input_device:I = 0x7f120ca5
 
-.field public static final integration_added_user:I = 0x7f120ca6
+.field public static final input_mode_ptt:I = 0x7f120ca6
 
-.field public static final integration_added_user_date:I = 0x7f120ca7
+.field public static final input_mode_ptt_limited:I = 0x7f120ca7
 
-.field public static final integration_created_date:I = 0x7f120ca8
+.field public static final input_mode_ptt_release_delay:I = 0x7f120ca8
 
-.field public static final integration_created_user_date:I = 0x7f120ca9
+.field public static final input_mode_vad:I = 0x7f120ca9
 
-.field public static final integration_settings:I = 0x7f120caa
+.field public static final instagram:I = 0x7f120caa
 
-.field public static final integrations:I = 0x7f120cab
+.field public static final install_location_main:I = 0x7f120cab
 
-.field public static final integrations_account_description:I = 0x7f120cac
+.field public static final instant_invite:I = 0x7f120cac
 
-.field public static final integrations_application_added_by:I = 0x7f120cad
+.field public static final instant_invite_accept:I = 0x7f120cad
 
-.field public static final integrations_application_bot:I = 0x7f120cae
+.field public static final instant_invite_accepting:I = 0x7f120cae
 
-.field public static final integrations_application_bot_name:I = 0x7f120caf
+.field public static final instant_invite_ask_for_new_invite:I = 0x7f120caf
 
-.field public static final integrations_application_button:I = 0x7f120cb0
+.field public static final instant_invite_ask_user_for_new_invite:I = 0x7f120cb0
 
-.field public static final integrations_application_denied_permissions:I = 0x7f120cb1
+.field public static final instant_invite_banned:I = 0x7f120cb1
 
-.field public static final integrations_application_granted_permissions:I = 0x7f120cb2
+.field public static final instant_invite_banned_info:I = 0x7f120cb2
 
-.field public static final integrations_application_no_bot:I = 0x7f120cb3
+.field public static final instant_invite_expired:I = 0x7f120cb3
 
-.field public static final integrations_application_no_webhooks:I = 0x7f120cb4
+.field public static final instant_invite_expires:I = 0x7f120cb4
 
-.field public static final integrations_application_remove:I = 0x7f120cb5
+.field public static final instant_invite_failed_to_generate:I = 0x7f120cb5
 
-.field public static final integrations_application_remove_body:I = 0x7f120cb6
+.field public static final instant_invite_friends:I = 0x7f120cb6
 
-.field public static final integrations_application_remove_error:I = 0x7f120cb7
+.field public static final instant_invite_friends_description:I = 0x7f120cb7
 
-.field public static final integrations_application_remove_error_title:I = 0x7f120cb8
+.field public static final instant_invite_generated_by_widget:I = 0x7f120cb8
 
-.field public static final integrations_application_remove_no_permissions:I = 0x7f120cb9
+.field public static final instant_invite_guild_by_user:I = 0x7f120cb9
 
-.field public static final integrations_application_remove_summary:I = 0x7f120cba
+.field public static final instant_invite_guild_members_online:I = 0x7f120cba
 
-.field public static final integrations_application_remove_title:I = 0x7f120cbb
+.field public static final instant_invite_guild_members_total:I = 0x7f120cbb
 
-.field public static final integrations_application_section:I = 0x7f120cbc
+.field public static final instant_invite_hidden:I = 0x7f120cbc
 
-.field public static final integrations_application_verified_bot:I = 0x7f120cbd
+.field public static final instant_invite_invalid_channel:I = 0x7f120cbd
 
-.field public static final integrations_application_webhooks:I = 0x7f120cbe
+.field public static final instant_invite_invite_code:I = 0x7f120cbe
 
-.field public static final integrations_channel_following:I = 0x7f120cbf
+.field public static final instant_invite_inviter:I = 0x7f120cbf
 
-.field public static final integrations_channel_following_button:I = 0x7f120cc0
+.field public static final instant_invite_looks_like:I = 0x7f120cc0
 
-.field public static final integrations_channel_following_description:I = 0x7f120cc1
+.field public static final instant_invite_not_allowed:I = 0x7f120cc1
 
-.field public static final integrations_channel_following_empty:I = 0x7f120cc2
+.field public static final instant_invite_resolved_title:I = 0x7f120cc2
 
-.field public static final integrations_channel_following_empty_button:I = 0x7f120cc3
+.field public static final instant_invite_resolving:I = 0x7f120cc3
 
-.field public static final integrations_channel_following_section:I = 0x7f120cc4
+.field public static final instant_invite_uses:I = 0x7f120cc4
 
-.field public static final integrations_channel_following_summary:I = 0x7f120cc5
+.field public static final instant_invite_you_are_already_a_member_of:I = 0x7f120cc5
 
-.field public static final integrations_channel_following_title:I = 0x7f120cc6
+.field public static final instant_invite_you_have_been_invited_to_join:I = 0x7f120cc6
 
-.field public static final integrations_disable:I = 0x7f120cc7
+.field public static final instant_invite_you_have_been_invited_to_join_by_user:I = 0x7f120cc7
 
-.field public static final integrations_enable:I = 0x7f120cc8
+.field public static final instant_invite_you_have_been_invited_to_join_group_dm:I = 0x7f120cc8
 
-.field public static final integrations_enabled:I = 0x7f120cc9
+.field public static final instant_invite_you_have_joined:I = 0x7f120cc9
 
-.field public static final integrations_followed_channel_delete:I = 0x7f120cca
+.field public static final instant_invites:I = 0x7f120cca
 
-.field public static final integrations_followed_channel_delete_body:I = 0x7f120ccb
+.field public static final integration_added_date:I = 0x7f120ccb
 
-.field public static final integrations_followed_channel_delete_title:I = 0x7f120ccc
+.field public static final integration_added_user:I = 0x7f120ccc
 
-.field public static final integrations_followed_channel_dest_channel:I = 0x7f120ccd
+.field public static final integration_added_user_date:I = 0x7f120ccd
 
-.field public static final integrations_followed_channel_error_deleting:I = 0x7f120cce
+.field public static final integration_created_date:I = 0x7f120cce
 
-.field public static final integrations_followed_channel_guild_source:I = 0x7f120ccf
+.field public static final integration_created_user_date:I = 0x7f120ccf
 
-.field public static final integrations_followed_channel_name:I = 0x7f120cd0
+.field public static final integration_settings:I = 0x7f120cd0
 
-.field public static final integrations_last_sync:I = 0x7f120cd1
+.field public static final integrations:I = 0x7f120cd1
 
-.field public static final integrations_overview:I = 0x7f120cd2
+.field public static final integrations_account_description:I = 0x7f120cd2
 
-.field public static final integrations_overview_description_channel:I = 0x7f120cd3
+.field public static final integrations_application_added_by:I = 0x7f120cd3
 
-.field public static final integrations_overview_description_guild:I = 0x7f120cd4
+.field public static final integrations_application_bot:I = 0x7f120cd4
 
-.field public static final integrations_overview_no_applications:I = 0x7f120cd5
+.field public static final integrations_application_bot_name:I = 0x7f120cd5
 
-.field public static final integrations_twitch:I = 0x7f120cd6
+.field public static final integrations_application_button:I = 0x7f120cd6
 
-.field public static final integrations_twitch_button:I = 0x7f120cd7
+.field public static final integrations_application_denied_permissions:I = 0x7f120cd7
 
-.field public static final integrations_twitch_description:I = 0x7f120cd8
+.field public static final integrations_application_granted_permissions:I = 0x7f120cd8
 
-.field public static final integrations_twitch_empty_button:I = 0x7f120cd9
+.field public static final integrations_application_no_bot:I = 0x7f120cd9
 
-.field public static final integrations_twitch_empty_summary:I = 0x7f120cda
+.field public static final integrations_application_no_webhooks:I = 0x7f120cda
 
-.field public static final integrations_twitch_help:I = 0x7f120cdb
+.field public static final integrations_application_remove:I = 0x7f120cdb
 
-.field public static final integrations_twitch_summary:I = 0x7f120cdc
+.field public static final integrations_application_remove_body:I = 0x7f120cdc
 
-.field public static final integrations_webhook_copied_url:I = 0x7f120cdd
+.field public static final integrations_application_remove_error:I = 0x7f120cdd
 
-.field public static final integrations_webhook_copy_url:I = 0x7f120cde
+.field public static final integrations_application_remove_error_title:I = 0x7f120cde
 
-.field public static final integrations_webhook_delete:I = 0x7f120cdf
+.field public static final integrations_application_remove_no_permissions:I = 0x7f120cdf
 
-.field public static final integrations_webhooks:I = 0x7f120ce0
+.field public static final integrations_application_remove_summary:I = 0x7f120ce0
 
-.field public static final integrations_webhooks_button:I = 0x7f120ce1
+.field public static final integrations_application_remove_title:I = 0x7f120ce1
 
-.field public static final integrations_webhooks_count:I = 0x7f120ce2
+.field public static final integrations_application_section:I = 0x7f120ce2
 
-.field public static final integrations_webhooks_create:I = 0x7f120ce3
+.field public static final integrations_application_verified_bot:I = 0x7f120ce3
 
-.field public static final integrations_webhooks_description:I = 0x7f120ce4
+.field public static final integrations_application_webhooks:I = 0x7f120ce4
 
-.field public static final integrations_webhooks_empty:I = 0x7f120ce5
+.field public static final integrations_channel_following:I = 0x7f120ce5
 
-.field public static final integrations_webhooks_empty_button:I = 0x7f120ce6
+.field public static final integrations_channel_following_button:I = 0x7f120ce6
 
-.field public static final integrations_webhooks_summary:I = 0x7f120ce7
+.field public static final integrations_channel_following_description:I = 0x7f120ce7
 
-.field public static final integrations_youtube:I = 0x7f120ce8
+.field public static final integrations_channel_following_empty:I = 0x7f120ce8
 
-.field public static final integrations_youtube_button:I = 0x7f120ce9
+.field public static final integrations_channel_following_empty_button:I = 0x7f120ce9
 
-.field public static final integrations_youtube_description:I = 0x7f120cea
+.field public static final integrations_channel_following_section:I = 0x7f120cea
 
-.field public static final integrations_youtube_empty_button:I = 0x7f120ceb
+.field public static final integrations_channel_following_summary:I = 0x7f120ceb
 
-.field public static final integrations_youtube_empty_summary:I = 0x7f120cec
+.field public static final integrations_channel_following_title:I = 0x7f120cec
 
-.field public static final integrations_youtube_help:I = 0x7f120ced
+.field public static final integrations_disable:I = 0x7f120ced
 
-.field public static final integrations_youtube_summary:I = 0x7f120cee
+.field public static final integrations_enable:I = 0x7f120cee
 
-.field public static final interaction_required_body:I = 0x7f120cef
+.field public static final integrations_enabled:I = 0x7f120cef
 
-.field public static final interaction_required_title:I = 0x7f120cf0
+.field public static final integrations_followed_channel_delete:I = 0x7f120cf0
 
-.field public static final internal_server_error:I = 0x7f120cf1
+.field public static final integrations_followed_channel_delete_body:I = 0x7f120cf1
 
-.field public static final invalid_animated_emoji_body:I = 0x7f120cf2
+.field public static final integrations_followed_channel_delete_title:I = 0x7f120cf2
 
-.field public static final invalid_animated_emoji_body_upgrade:I = 0x7f120cf3
+.field public static final integrations_followed_channel_dest_channel:I = 0x7f120cf3
 
-.field public static final invalid_attachments_failure:I = 0x7f120cf4
+.field public static final integrations_followed_channel_error_deleting:I = 0x7f120cf4
 
-.field public static final invalid_external_emoji_body:I = 0x7f120cf5
+.field public static final integrations_followed_channel_guild_source:I = 0x7f120cf5
 
-.field public static final invalid_external_emoji_body_upgrade:I = 0x7f120cf6
+.field public static final integrations_followed_channel_name:I = 0x7f120cf6
 
-.field public static final invalid_invite_link_error:I = 0x7f120cf7
+.field public static final integrations_last_sync:I = 0x7f120cf7
 
-.field public static final invalid_text_channel:I = 0x7f120cf8
+.field public static final integrations_overview:I = 0x7f120cf8
 
-.field public static final invalid_voice_channel:I = 0x7f120cf9
+.field public static final integrations_overview_description_channel:I = 0x7f120cf9
 
-.field public static final invite_button_body_in_guild:I = 0x7f120cfa
+.field public static final integrations_overview_description_guild:I = 0x7f120cfa
 
-.field public static final invite_button_expired:I = 0x7f120cfb
+.field public static final integrations_overview_no_applications:I = 0x7f120cfb
 
-.field public static final invite_button_invalid:I = 0x7f120cfc
+.field public static final integrations_twitch:I = 0x7f120cfc
 
-.field public static final invite_button_invalid_owner:I = 0x7f120cfd
+.field public static final integrations_twitch_button:I = 0x7f120cfd
 
-.field public static final invite_button_resolving:I = 0x7f120cfe
+.field public static final integrations_twitch_description:I = 0x7f120cfe
 
-.field public static final invite_button_stream_ended:I = 0x7f120cff
+.field public static final integrations_twitch_empty_button:I = 0x7f120cff
 
-.field public static final invite_button_stream_ended_streamer:I = 0x7f120d00
+.field public static final integrations_twitch_empty_summary:I = 0x7f120d00
 
-.field public static final invite_button_stream_watching:I = 0x7f120d01
+.field public static final integrations_twitch_help:I = 0x7f120d01
 
-.field public static final invite_button_streamer:I = 0x7f120d02
+.field public static final integrations_twitch_summary:I = 0x7f120d02
 
-.field public static final invite_button_streaming:I = 0x7f120d03
+.field public static final integrations_webhook_copied_url:I = 0x7f120d03
 
-.field public static final invite_button_streaming_subtext:I = 0x7f120d04
+.field public static final integrations_webhook_copy_url:I = 0x7f120d04
 
-.field public static final invite_button_title_invited:I = 0x7f120d05
+.field public static final integrations_webhook_delete:I = 0x7f120d05
 
-.field public static final invite_button_title_invited_group_dm:I = 0x7f120d06
+.field public static final integrations_webhooks:I = 0x7f120d06
 
-.field public static final invite_button_title_invited_invalid:I = 0x7f120d07
+.field public static final integrations_webhooks_button:I = 0x7f120d07
 
-.field public static final invite_button_title_invited_stream:I = 0x7f120d08
+.field public static final integrations_webhooks_count:I = 0x7f120d08
 
-.field public static final invite_button_title_invited_voice_channel:I = 0x7f120d09
+.field public static final integrations_webhooks_create:I = 0x7f120d09
 
-.field public static final invite_button_title_inviter:I = 0x7f120d0a
+.field public static final integrations_webhooks_description:I = 0x7f120d0a
 
-.field public static final invite_button_title_inviter_group_dm:I = 0x7f120d0b
+.field public static final integrations_webhooks_empty:I = 0x7f120d0b
 
-.field public static final invite_button_title_inviter_invalid:I = 0x7f120d0c
+.field public static final integrations_webhooks_empty_button:I = 0x7f120d0c
 
-.field public static final invite_button_title_inviter_stream:I = 0x7f120d0d
+.field public static final integrations_webhooks_summary:I = 0x7f120d0d
 
-.field public static final invite_button_title_inviter_voice_channel:I = 0x7f120d0e
+.field public static final integrations_youtube:I = 0x7f120d0e
 
-.field public static final invite_button_title_streaming:I = 0x7f120d0f
+.field public static final integrations_youtube_button:I = 0x7f120d0f
 
-.field public static final invite_copied:I = 0x7f120d10
+.field public static final integrations_youtube_description:I = 0x7f120d10
 
-.field public static final invite_copy_invite_link_header_mobile:I = 0x7f120d11
+.field public static final integrations_youtube_empty_button:I = 0x7f120d11
 
-.field public static final invite_copy_share_link_header_mobile:I = 0x7f120d12
+.field public static final integrations_youtube_empty_summary:I = 0x7f120d12
 
-.field public static final invite_edit_link:I = 0x7f120d13
+.field public static final integrations_youtube_help:I = 0x7f120d13
 
-.field public static final invite_embed_ask_to_join:I = 0x7f120d14
+.field public static final integrations_youtube_summary:I = 0x7f120d14
 
-.field public static final invite_embed_full_group:I = 0x7f120d15
+.field public static final interaction_required_body:I = 0x7f120d15
 
-.field public static final invite_embed_game_has_ended:I = 0x7f120d16
+.field public static final interaction_required_title:I = 0x7f120d16
 
-.field public static final invite_embed_game_invite:I = 0x7f120d17
+.field public static final internal_server_error:I = 0x7f120d17
 
-.field public static final invite_embed_in_group:I = 0x7f120d18
+.field public static final invalid_animated_emoji_body:I = 0x7f120d18
 
-.field public static final invite_embed_invite_to_join:I = 0x7f120d19
+.field public static final invalid_animated_emoji_body_upgrade:I = 0x7f120d19
 
-.field public static final invite_embed_invite_to_join_group:I = 0x7f120d1a
+.field public static final invalid_attachments_failure:I = 0x7f120d1a
 
-.field public static final invite_embed_invite_to_listen:I = 0x7f120d1b
+.field public static final invalid_external_emoji_body:I = 0x7f120d1b
 
-.field public static final invite_embed_invite_to_watch:I = 0x7f120d1c
+.field public static final invalid_external_emoji_body_upgrade:I = 0x7f120d1c
 
-.field public static final invite_embed_join_via_android:I = 0x7f120d1d
+.field public static final invalid_invite_link_error:I = 0x7f120d1d
 
-.field public static final invite_embed_join_via_desktop_app:I = 0x7f120d1e
+.field public static final invalid_text_channel:I = 0x7f120d1e
 
-.field public static final invite_embed_join_via_ios:I = 0x7f120d1f
+.field public static final invalid_voice_channel:I = 0x7f120d1f
 
-.field public static final invite_embed_join_via_xbox:I = 0x7f120d20
+.field public static final invite_button_body_in_guild:I = 0x7f120d20
 
-.field public static final invite_embed_joined:I = 0x7f120d21
+.field public static final invite_button_expired:I = 0x7f120d21
 
-.field public static final invite_embed_listen_has_ended:I = 0x7f120d22
+.field public static final invite_button_invalid:I = 0x7f120d22
 
-.field public static final invite_embed_listening_invite:I = 0x7f120d23
+.field public static final invite_button_invalid_owner:I = 0x7f120d23
 
-.field public static final invite_embed_num_open_slots:I = 0x7f120d24
+.field public static final invite_button_resolving:I = 0x7f120d24
 
-.field public static final invite_embed_send_invite:I = 0x7f120d25
+.field public static final invite_button_stream_ended:I = 0x7f120d25
 
-.field public static final invite_embed_watch_has_ended:I = 0x7f120d26
+.field public static final invite_button_stream_ended_streamer:I = 0x7f120d26
 
-.field public static final invite_empty_body:I = 0x7f120d27
+.field public static final invite_button_stream_watching:I = 0x7f120d27
 
-.field public static final invite_empty_title:I = 0x7f120d28
+.field public static final invite_button_streamer:I = 0x7f120d28
 
-.field public static final invite_expired_subtext_mobile:I = 0x7f120d29
+.field public static final invite_button_streaming:I = 0x7f120d29
 
-.field public static final invite_expires_days:I = 0x7f120d2a
+.field public static final invite_button_streaming_subtext:I = 0x7f120d2a
 
-.field public static final invite_expires_days_or_uses:I = 0x7f120d2b
+.field public static final invite_button_title_invited:I = 0x7f120d2b
 
-.field public static final invite_expires_hours:I = 0x7f120d2c
+.field public static final invite_button_title_invited_group_dm:I = 0x7f120d2c
 
-.field public static final invite_expires_hours_or_uses:I = 0x7f120d2d
+.field public static final invite_button_title_invited_invalid:I = 0x7f120d2d
 
-.field public static final invite_expires_minutes:I = 0x7f120d2e
+.field public static final invite_button_title_invited_stream:I = 0x7f120d2e
 
-.field public static final invite_expires_minutes_or_uses:I = 0x7f120d2f
+.field public static final invite_button_title_invited_voice_channel:I = 0x7f120d2f
 
-.field public static final invite_expires_never:I = 0x7f120d30
+.field public static final invite_button_title_inviter:I = 0x7f120d30
 
-.field public static final invite_expires_uses:I = 0x7f120d31
+.field public static final invite_button_title_inviter_group_dm:I = 0x7f120d31
 
-.field public static final invite_footer_link_header:I = 0x7f120d32
+.field public static final invite_button_title_inviter_invalid:I = 0x7f120d32
 
-.field public static final invite_friend_modal_invite:I = 0x7f120d33
+.field public static final invite_button_title_inviter_stream:I = 0x7f120d33
 
-.field public static final invite_friend_modal_loading:I = 0x7f120d34
+.field public static final invite_button_title_inviter_voice_channel:I = 0x7f120d34
 
-.field public static final invite_friend_modal_no_results:I = 0x7f120d35
+.field public static final invite_button_title_streaming:I = 0x7f120d35
 
-.field public static final invite_friend_modal_retry:I = 0x7f120d36
+.field public static final invite_copied:I = 0x7f120d36
 
-.field public static final invite_friend_modal_sent:I = 0x7f120d37
+.field public static final invite_copy_invite_link_header_mobile:I = 0x7f120d37
 
-.field public static final invite_friend_modal_title:I = 0x7f120d38
+.field public static final invite_copy_share_link_header_mobile:I = 0x7f120d38
 
-.field public static final invite_friends:I = 0x7f120d39
+.field public static final invite_edit_link:I = 0x7f120d39
 
-.field public static final invite_invalid_cta:I = 0x7f120d3a
+.field public static final invite_embed_ask_to_join:I = 0x7f120d3a
 
-.field public static final invite_invalid_error:I = 0x7f120d3b
+.field public static final invite_embed_full_group:I = 0x7f120d3b
 
-.field public static final invite_link_copied:I = 0x7f120d3c
+.field public static final invite_embed_game_has_ended:I = 0x7f120d3c
 
-.field public static final invite_link_example_full:I = 0x7f120d3d
+.field public static final invite_embed_game_invite:I = 0x7f120d3d
 
-.field public static final invite_link_example_simple:I = 0x7f120d3e
+.field public static final invite_embed_in_group:I = 0x7f120d3e
 
-.field public static final invite_link_example_verified:I = 0x7f120d3f
+.field public static final invite_embed_invite_to_join:I = 0x7f120d3f
 
-.field public static final invite_links_expire_after_1_day:I = 0x7f120d40
+.field public static final invite_embed_invite_to_join_group:I = 0x7f120d40
 
-.field public static final invite_members:I = 0x7f120d41
+.field public static final invite_embed_invite_to_listen:I = 0x7f120d41
 
-.field public static final invite_modal_button:I = 0x7f120d42
+.field public static final invite_embed_invite_to_watch:I = 0x7f120d42
 
-.field public static final invite_modal_error_default:I = 0x7f120d43
+.field public static final invite_embed_join_via_android:I = 0x7f120d43
 
-.field public static final invite_modal_error_title:I = 0x7f120d44
+.field public static final invite_embed_join_via_desktop_app:I = 0x7f120d44
 
-.field public static final invite_modal_open_button:I = 0x7f120d45
+.field public static final invite_embed_join_via_ios:I = 0x7f120d45
 
-.field public static final invite_never_expires_subtext_mobile:I = 0x7f120d46
+.field public static final invite_embed_join_via_xbox:I = 0x7f120d46
 
-.field public static final invite_no_thanks:I = 0x7f120d47
+.field public static final invite_embed_joined:I = 0x7f120d47
 
-.field public static final invite_notice_message:I = 0x7f120d48
+.field public static final invite_embed_listen_has_ended:I = 0x7f120d48
 
-.field public static final invite_notice_message_part_2:I = 0x7f120d49
+.field public static final invite_embed_listening_invite:I = 0x7f120d49
 
-.field public static final invite_people:I = 0x7f120d4a
+.field public static final invite_embed_num_open_slots:I = 0x7f120d4a
 
-.field public static final invite_pokemon_go_announcements_label_long:I = 0x7f120d4b
+.field public static final invite_embed_send_invite:I = 0x7f120d4b
 
-.field public static final invite_pokemon_go_announcements_label_short:I = 0x7f120d4c
+.field public static final invite_embed_watch_has_ended:I = 0x7f120d4c
 
-.field public static final invite_pokemon_go_friendship_label_long:I = 0x7f120d4d
+.field public static final invite_empty_body:I = 0x7f120d4d
 
-.field public static final invite_pokemon_go_friendship_label_short:I = 0x7f120d4e
+.field public static final invite_empty_title:I = 0x7f120d4e
 
-.field public static final invite_pokemon_go_strategy_label_long:I = 0x7f120d4f
+.field public static final invite_expired_subtext_mobile:I = 0x7f120d4f
 
-.field public static final invite_pokemon_go_strategy_label_short:I = 0x7f120d50
+.field public static final invite_expires_days:I = 0x7f120d50
 
-.field public static final invite_private_call_heads_up:I = 0x7f120d51
+.field public static final invite_expires_days_or_uses:I = 0x7f120d51
 
-.field public static final invite_search_for_friends:I = 0x7f120d52
+.field public static final invite_expires_hours:I = 0x7f120d52
 
-.field public static final invite_sent:I = 0x7f120d53
+.field public static final invite_expires_hours_or_uses:I = 0x7f120d53
 
-.field public static final invite_settings_description_no_expiration:I = 0x7f120d54
+.field public static final invite_expires_minutes:I = 0x7f120d54
 
-.field public static final invite_settings_expired_description:I = 0x7f120d55
+.field public static final invite_expires_minutes_or_uses:I = 0x7f120d55
 
-.field public static final invite_settings_title:I = 0x7f120d56
+.field public static final invite_expires_never:I = 0x7f120d56
 
-.field public static final invite_share_link_header_mobile:I = 0x7f120d57
+.field public static final invite_expires_uses:I = 0x7f120d57
 
-.field public static final invite_share_link_own_server:I = 0x7f120d58
+.field public static final invite_footer_link_header:I = 0x7f120d58
 
-.field public static final invite_share_link_to_stream:I = 0x7f120d59
+.field public static final invite_friend_modal_invite:I = 0x7f120d59
 
-.field public static final invite_step_subtitle:I = 0x7f120d5a
+.field public static final invite_friend_modal_loading:I = 0x7f120d5a
 
-.field public static final invite_step_title:I = 0x7f120d5b
+.field public static final invite_friend_modal_no_results:I = 0x7f120d5b
 
-.field public static final invite_stream_footer_link_header:I = 0x7f120d5c
+.field public static final invite_friend_modal_retry:I = 0x7f120d5c
 
-.field public static final invite_stream_header:I = 0x7f120d5d
+.field public static final invite_friend_modal_sent:I = 0x7f120d5d
 
-.field public static final invite_to_server:I = 0x7f120d5e
+.field public static final invite_friend_modal_title:I = 0x7f120d5e
 
-.field public static final invite_url:I = 0x7f120d5f
+.field public static final invite_friends:I = 0x7f120d5f
 
-.field public static final invite_voice_channel_join:I = 0x7f120d60
+.field public static final invite_invalid_cta:I = 0x7f120d60
 
-.field public static final invite_voice_empty_mobile:I = 0x7f120d61
+.field public static final invite_invalid_error:I = 0x7f120d61
 
-.field public static final invite_welcome_heading:I = 0x7f120d62
+.field public static final invite_link_copied:I = 0x7f120d62
 
-.field public static final invite_welcome_subheading:I = 0x7f120d63
+.field public static final invite_link_example_full:I = 0x7f120d63
 
-.field public static final invite_your_friends:I = 0x7f120d64
+.field public static final invite_link_example_simple:I = 0x7f120d64
 
-.field public static final invite_your_friends_channel_mobile:I = 0x7f120d65
+.field public static final invite_link_example_verified:I = 0x7f120d65
 
-.field public static final invite_your_friends_header_mobile:I = 0x7f120d66
+.field public static final invite_links_expire_after_1_day:I = 0x7f120d66
 
-.field public static final invites:I = 0x7f120d67
+.field public static final invite_members:I = 0x7f120d67
 
-.field public static final ios_app_preview_description:I = 0x7f120d68
+.field public static final invite_modal_button:I = 0x7f120d68
 
-.field public static final ios_automatic_theme:I = 0x7f120d69
+.field public static final invite_modal_error_default:I = 0x7f120d69
 
-.field public static final ios_automatic_theme_short:I = 0x7f120d6a
+.field public static final invite_modal_error_title:I = 0x7f120d6a
 
-.field public static final ios_call_disconnected:I = 0x7f120d6b
+.field public static final invite_modal_open_button:I = 0x7f120d6b
 
-.field public static final ios_call_ended:I = 0x7f120d6c
+.field public static final invite_never_expires_subtext_mobile:I = 0x7f120d6c
 
-.field public static final ios_iap_generic_billing_error:I = 0x7f120d6d
+.field public static final invite_no_thanks:I = 0x7f120d6d
 
-.field public static final ios_iap_itunes_error:I = 0x7f120d6e
+.field public static final invite_notice_message:I = 0x7f120d6e
 
-.field public static final ios_iap_manage_premium_guild_button:I = 0x7f120d6f
+.field public static final invite_notice_message_part_2:I = 0x7f120d6f
 
-.field public static final ios_iap_manage_subscription_button:I = 0x7f120d70
+.field public static final invite_people:I = 0x7f120d70
 
-.field public static final ios_iap_manage_subscription_desktop:I = 0x7f120d71
+.field public static final invite_pokemon_go_announcements_label_long:I = 0x7f120d71
 
-.field public static final ios_iap_restore_subscription_error:I = 0x7f120d72
+.field public static final invite_pokemon_go_announcements_label_short:I = 0x7f120d72
 
-.field public static final ios_iap_restore_subscription_none_description:I = 0x7f120d73
+.field public static final invite_pokemon_go_friendship_label_long:I = 0x7f120d73
 
-.field public static final ios_iap_restore_subscription_none_title:I = 0x7f120d74
+.field public static final invite_pokemon_go_friendship_label_short:I = 0x7f120d74
 
-.field public static final ios_iap_restore_subscription_success:I = 0x7f120d75
+.field public static final invite_pokemon_go_strategy_label_long:I = 0x7f120d75
 
-.field public static final ios_iap_testflight_error:I = 0x7f120d76
+.field public static final invite_pokemon_go_strategy_label_short:I = 0x7f120d76
 
-.field public static final ios_media_keyboard_browse_photo:I = 0x7f120d77
+.field public static final invite_private_call_heads_up:I = 0x7f120d77
 
-.field public static final ios_media_keyboard_enable_in_settings:I = 0x7f120d78
+.field public static final invite_search_for_friends:I = 0x7f120d78
 
-.field public static final ios_media_keyboard_more_photos:I = 0x7f120d79
+.field public static final invite_sent:I = 0x7f120d79
 
-.field public static final ios_media_keyboard_no_permission:I = 0x7f120d7a
+.field public static final invite_settings_description_no_expiration:I = 0x7f120d7a
 
-.field public static final ios_media_keyboard_no_photos:I = 0x7f120d7b
+.field public static final invite_settings_expired_description:I = 0x7f120d7b
 
-.field public static final ios_notification_see_full:I = 0x7f120d7c
+.field public static final invite_settings_title:I = 0x7f120d7c
 
-.field public static final ios_profile_in_voice_call:I = 0x7f120d7d
+.field public static final invite_share_link_header_mobile:I = 0x7f120d7d
 
-.field public static final ios_profile_open_voice_channel:I = 0x7f120d7e
+.field public static final invite_share_link_own_server:I = 0x7f120d7e
 
-.field public static final ios_share_suggestions_hint:I = 0x7f120d7f
+.field public static final invite_share_link_to_stream:I = 0x7f120d7f
 
-.field public static final ios_share_suggestions_toggle:I = 0x7f120d80
+.field public static final invite_step_subtitle:I = 0x7f120d80
 
-.field public static final ios_stream_participants_hidden:I = 0x7f120d81
+.field public static final invite_step_title:I = 0x7f120d81
 
-.field public static final ios_stream_show_non_video:I = 0x7f120d82
+.field public static final invite_stream_footer_link_header:I = 0x7f120d82
 
-.field public static final ios_view_all:I = 0x7f120d83
+.field public static final invite_stream_header:I = 0x7f120d83
 
-.field public static final ip_address_secured:I = 0x7f120d84
+.field public static final invite_to_server:I = 0x7f120d84
 
-.field public static final ip_authorization_succeeded:I = 0x7f120d85
+.field public static final invite_url:I = 0x7f120d85
 
-.field public static final it:I = 0x7f120d86
+.field public static final invite_voice_channel_join:I = 0x7f120d86
 
-.field public static final item_view_role_description:I = 0x7f120d87
+.field public static final invite_voice_empty_mobile:I = 0x7f120d87
 
-.field public static final ja:I = 0x7f120d88
+.field public static final invite_welcome_heading:I = 0x7f120d88
 
-.field public static final join:I = 0x7f120d89
+.field public static final invite_welcome_subheading:I = 0x7f120d89
 
-.field public static final join_afk_channel_body:I = 0x7f120d8a
+.field public static final invite_your_friends:I = 0x7f120d8a
 
-.field public static final join_call:I = 0x7f120d8b
+.field public static final invite_your_friends_channel_mobile:I = 0x7f120d8b
 
-.field public static final join_guild:I = 0x7f120d8c
+.field public static final invite_your_friends_header_mobile:I = 0x7f120d8c
 
-.field public static final join_guild_connect_cta:I = 0x7f120d8d
+.field public static final invites:I = 0x7f120d8d
 
-.field public static final join_guild_connect_text:I = 0x7f120d8e
+.field public static final ios_app_preview_description:I = 0x7f120d8e
 
-.field public static final join_guild_description:I = 0x7f120d8f
+.field public static final ios_automatic_theme:I = 0x7f120d8f
 
-.field public static final join_server_button_body:I = 0x7f120d90
+.field public static final ios_automatic_theme_short:I = 0x7f120d90
 
-.field public static final join_server_button_cta:I = 0x7f120d91
+.field public static final ios_call_disconnected:I = 0x7f120d91
 
-.field public static final join_server_button_cta_mobile:I = 0x7f120d92
+.field public static final ios_call_ended:I = 0x7f120d92
 
-.field public static final join_server_button_cta_mobile_desc:I = 0x7f120d93
+.field public static final ios_iap_generic_billing_error:I = 0x7f120d93
 
-.field public static final join_server_description:I = 0x7f120d94
+.field public static final ios_iap_itunes_error:I = 0x7f120d94
 
-.field public static final join_server_description_mobile:I = 0x7f120d95
+.field public static final ios_iap_manage_premium_guild_button:I = 0x7f120d95
 
-.field public static final join_server_description_mobile_refresh:I = 0x7f120d96
+.field public static final ios_iap_manage_subscription_button:I = 0x7f120d96
 
-.field public static final join_server_description_nuf:I = 0x7f120d97
+.field public static final ios_iap_manage_subscription_desktop:I = 0x7f120d97
 
-.field public static final join_server_invite_examples_header:I = 0x7f120d98
+.field public static final ios_iap_restore_subscription_error:I = 0x7f120d98
 
-.field public static final join_server_invite_examples_mobile_refresh:I = 0x7f120d99
+.field public static final ios_iap_restore_subscription_none_description:I = 0x7f120d99
 
-.field public static final join_server_title:I = 0x7f120d9a
+.field public static final ios_iap_restore_subscription_none_title:I = 0x7f120d9a
 
-.field public static final join_server_title_mobile_refresh:I = 0x7f120d9b
+.field public static final ios_iap_restore_subscription_success:I = 0x7f120d9b
 
-.field public static final join_stream:I = 0x7f120d9c
+.field public static final ios_iap_testflight_error:I = 0x7f120d9c
 
-.field public static final join_thread:I = 0x7f120d9d
+.field public static final ios_media_keyboard_browse_photo:I = 0x7f120d9d
 
-.field public static final join_video_call:I = 0x7f120d9e
+.field public static final ios_media_keyboard_enable_in_settings:I = 0x7f120d9e
 
-.field public static final join_video_channel:I = 0x7f120d9f
+.field public static final ios_media_keyboard_more_photos:I = 0x7f120d9f
 
-.field public static final join_voice_call:I = 0x7f120da0
+.field public static final ios_media_keyboard_no_permission:I = 0x7f120da0
 
-.field public static final join_voice_channel:I = 0x7f120da1
+.field public static final ios_media_keyboard_no_photos:I = 0x7f120da1
 
-.field public static final join_voice_channel_cta:I = 0x7f120da2
+.field public static final ios_notification_see_full:I = 0x7f120da2
 
-.field public static final joined_guild:I = 0x7f120da3
+.field public static final ios_profile_in_voice_call:I = 0x7f120da3
 
-.field public static final joining_guild:I = 0x7f120da4
+.field public static final ios_profile_open_voice_channel:I = 0x7f120da4
 
-.field public static final joining_voice_call_will_end_current_call_body:I = 0x7f120da5
+.field public static final ios_share_suggestions_hint:I = 0x7f120da5
 
-.field public static final joining_voice_channel_will_end_current_call_body:I = 0x7f120da6
+.field public static final ios_share_suggestions_toggle:I = 0x7f120da6
 
-.field public static final joining_will_end_current_call_title:I = 0x7f120da7
+.field public static final ios_stream_participants_hidden:I = 0x7f120da7
 
-.field public static final jump:I = 0x7f120da8
+.field public static final ios_stream_show_non_video:I = 0x7f120da8
 
-.field public static final jump_to_channel:I = 0x7f120da9
+.field public static final ios_view_all:I = 0x7f120da9
 
-.field public static final jump_to_last_unread_message:I = 0x7f120daa
+.field public static final ip_address_secured:I = 0x7f120daa
 
-.field public static final jump_to_message:I = 0x7f120dab
+.field public static final ip_authorization_succeeded:I = 0x7f120dab
 
-.field public static final jump_to_present:I = 0x7f120dac
+.field public static final it:I = 0x7f120dac
 
-.field public static final keep_permissions:I = 0x7f120dad
+.field public static final item_view_role_description:I = 0x7f120dad
 
-.field public static final keybind_activate_overlay_chat:I = 0x7f120dae
+.field public static final ja:I = 0x7f120dae
 
-.field public static final keybind_conflict:I = 0x7f120daf
+.field public static final join:I = 0x7f120daf
 
-.field public static final keybind_description_modal_call_accept:I = 0x7f120db0
+.field public static final join_afk_channel_body:I = 0x7f120db0
 
-.field public static final keybind_description_modal_call_decline:I = 0x7f120db1
+.field public static final join_call:I = 0x7f120db1
 
-.field public static final keybind_description_modal_call_start:I = 0x7f120db2
+.field public static final join_guild:I = 0x7f120db2
 
-.field public static final keybind_description_modal_create_dm_group:I = 0x7f120db3
+.field public static final join_guild_connect_cta:I = 0x7f120db3
 
-.field public static final keybind_description_modal_create_guild:I = 0x7f120db4
+.field public static final join_guild_connect_text:I = 0x7f120db4
 
-.field public static final keybind_description_modal_easter_egg:I = 0x7f120db5
+.field public static final join_guild_description:I = 0x7f120db5
 
-.field public static final keybind_description_modal_focus_text_area:I = 0x7f120db6
+.field public static final join_server_button_body:I = 0x7f120db6
 
-.field public static final keybind_description_modal_jump_to_first_unread:I = 0x7f120db7
+.field public static final join_server_button_cta:I = 0x7f120db7
 
-.field public static final keybind_description_modal_mark_channel_read:I = 0x7f120db8
+.field public static final join_server_button_cta_mobile:I = 0x7f120db8
 
-.field public static final keybind_description_modal_mark_server_read:I = 0x7f120db9
+.field public static final join_server_button_cta_mobile_desc:I = 0x7f120db9
 
-.field public static final keybind_description_modal_mark_top_inbox_channel_read:I = 0x7f120dba
+.field public static final join_server_description:I = 0x7f120dba
 
-.field public static final keybind_description_modal_navigate_channels:I = 0x7f120dbb
+.field public static final join_server_description_mobile:I = 0x7f120dbb
 
-.field public static final keybind_description_modal_navigate_servers:I = 0x7f120dbc
+.field public static final join_server_description_mobile_refresh:I = 0x7f120dbc
 
-.field public static final keybind_description_modal_quickswitcher:I = 0x7f120dbd
+.field public static final join_server_description_nuf:I = 0x7f120dbd
 
-.field public static final keybind_description_modal_scroll_chat:I = 0x7f120dbe
+.field public static final join_server_invite_examples_header:I = 0x7f120dbe
 
-.field public static final keybind_description_modal_search:I = 0x7f120dbf
+.field public static final join_server_invite_examples_mobile_refresh:I = 0x7f120dbf
 
-.field public static final keybind_description_modal_search_emojis:I = 0x7f120dc0
+.field public static final join_server_title:I = 0x7f120dc0
 
-.field public static final keybind_description_modal_search_gifs:I = 0x7f120dc1
+.field public static final join_server_title_mobile_refresh:I = 0x7f120dc1
 
-.field public static final keybind_description_modal_subtitle:I = 0x7f120dc2
+.field public static final join_stream:I = 0x7f120dc2
 
-.field public static final keybind_description_modal_title:I = 0x7f120dc3
+.field public static final join_thread:I = 0x7f120dc3
 
-.field public static final keybind_description_modal_toggle_deafen:I = 0x7f120dc4
+.field public static final join_video_call:I = 0x7f120dc4
 
-.field public static final keybind_description_modal_toggle_help:I = 0x7f120dc5
+.field public static final join_video_channel:I = 0x7f120dc5
 
-.field public static final keybind_description_modal_toggle_inbox:I = 0x7f120dc6
+.field public static final join_voice_call:I = 0x7f120dc6
 
-.field public static final keybind_description_modal_toggle_mute:I = 0x7f120dc7
+.field public static final join_voice_channel:I = 0x7f120dc7
 
-.field public static final keybind_description_modal_toggle_pins:I = 0x7f120dc8
+.field public static final join_voice_channel_cta:I = 0x7f120dc8
 
-.field public static final keybind_description_modal_toggle_previous_guild:I = 0x7f120dc9
+.field public static final joined_guild:I = 0x7f120dc9
 
-.field public static final keybind_description_modal_toggle_users:I = 0x7f120dca
+.field public static final joining_guild:I = 0x7f120dca
 
-.field public static final keybind_description_modal_unread_channels:I = 0x7f120dcb
+.field public static final joining_voice_call_will_end_current_call_body:I = 0x7f120dcb
 
-.field public static final keybind_description_modal_unread_mention_channels:I = 0x7f120dcc
+.field public static final joining_voice_channel_will_end_current_call_body:I = 0x7f120dcc
 
-.field public static final keybind_description_modal_upload_file:I = 0x7f120dcd
+.field public static final joining_will_end_current_call_title:I = 0x7f120dcd
 
-.field public static final keybind_description_navigate_back:I = 0x7f120dce
+.field public static final jump:I = 0x7f120dce
 
-.field public static final keybind_description_navigate_forward:I = 0x7f120dcf
+.field public static final jump_to_channel:I = 0x7f120dcf
 
-.field public static final keybind_description_push_to_mute:I = 0x7f120dd0
+.field public static final jump_to_last_unread_message:I = 0x7f120dd0
 
-.field public static final keybind_description_push_to_talk:I = 0x7f120dd1
+.field public static final jump_to_message:I = 0x7f120dd1
 
-.field public static final keybind_description_push_to_talk_priority:I = 0x7f120dd2
+.field public static final jump_to_present:I = 0x7f120dd2
 
-.field public static final keybind_description_toggle_deafen:I = 0x7f120dd3
+.field public static final keep_permissions:I = 0x7f120dd3
 
-.field public static final keybind_description_toggle_go_live_streaming:I = 0x7f120dd4
+.field public static final keybind_activate_overlay_chat:I = 0x7f120dd4
 
-.field public static final keybind_description_toggle_mute:I = 0x7f120dd5
+.field public static final keybind_conflict:I = 0x7f120dd5
 
-.field public static final keybind_description_toggle_overlay:I = 0x7f120dd6
+.field public static final keybind_description_modal_call_accept:I = 0x7f120dd6
 
-.field public static final keybind_description_toggle_overlay_input_lock:I = 0x7f120dd7
+.field public static final keybind_description_modal_call_decline:I = 0x7f120dd7
 
-.field public static final keybind_description_toggle_streamer_mode:I = 0x7f120dd8
+.field public static final keybind_description_modal_call_start:I = 0x7f120dd8
 
-.field public static final keybind_description_toggle_voice_mode:I = 0x7f120dd9
+.field public static final keybind_description_modal_create_dm_group:I = 0x7f120dd9
 
-.field public static final keybind_description_unassigned:I = 0x7f120dda
+.field public static final keybind_description_modal_create_guild:I = 0x7f120dda
 
-.field public static final keybind_navigate_back:I = 0x7f120ddb
+.field public static final keybind_description_modal_easter_egg:I = 0x7f120ddb
 
-.field public static final keybind_navigate_forward:I = 0x7f120ddc
+.field public static final keybind_description_modal_focus_text_area:I = 0x7f120ddc
 
-.field public static final keybind_push_to_mute:I = 0x7f120ddd
+.field public static final keybind_description_modal_jump_to_first_unread:I = 0x7f120ddd
 
-.field public static final keybind_push_to_talk:I = 0x7f120dde
+.field public static final keybind_description_modal_mark_channel_read:I = 0x7f120dde
 
-.field public static final keybind_push_to_talk_priority:I = 0x7f120ddf
+.field public static final keybind_description_modal_mark_server_read:I = 0x7f120ddf
 
-.field public static final keybind_toggle_deafen:I = 0x7f120de0
+.field public static final keybind_description_modal_mark_top_inbox_channel_read:I = 0x7f120de0
 
-.field public static final keybind_toggle_go_live_streaming:I = 0x7f120de1
+.field public static final keybind_description_modal_navigate_channels:I = 0x7f120de1
 
-.field public static final keybind_toggle_mute:I = 0x7f120de2
+.field public static final keybind_description_modal_navigate_servers:I = 0x7f120de2
 
-.field public static final keybind_toggle_overlay:I = 0x7f120de3
+.field public static final keybind_description_modal_quickswitcher:I = 0x7f120de3
 
-.field public static final keybind_toggle_overlay_input_lock:I = 0x7f120de4
+.field public static final keybind_description_modal_scroll_chat:I = 0x7f120de4
 
-.field public static final keybind_toggle_stream_mode:I = 0x7f120de5
+.field public static final keybind_description_modal_search:I = 0x7f120de5
 
-.field public static final keybind_toggle_voice_mode:I = 0x7f120de6
+.field public static final keybind_description_modal_search_emojis:I = 0x7f120de6
 
-.field public static final keybind_unassigned:I = 0x7f120de7
+.field public static final keybind_description_modal_search_gifs:I = 0x7f120de7
 
-.field public static final keybinds:I = 0x7f120de8
+.field public static final keybind_description_modal_subtitle:I = 0x7f120de8
 
-.field public static final keyboard_behavior_mobile_header:I = 0x7f120de9
+.field public static final keybind_description_modal_title:I = 0x7f120de9
 
-.field public static final keyboard_behavior_mobile_shift_enter_to_send:I = 0x7f120dea
+.field public static final keybind_description_modal_toggle_deafen:I = 0x7f120dea
 
-.field public static final keyboard_behavior_mobile_shift_enter_to_send_hint:I = 0x7f120deb
+.field public static final keybind_description_modal_toggle_help:I = 0x7f120deb
 
-.field public static final kick:I = 0x7f120dec
+.field public static final keybind_description_modal_toggle_inbox:I = 0x7f120dec
 
-.field public static final kick_from_server:I = 0x7f120ded
+.field public static final keybind_description_modal_toggle_mute:I = 0x7f120ded
 
-.field public static final kick_members:I = 0x7f120dee
+.field public static final keybind_description_modal_toggle_pins:I = 0x7f120dee
 
-.field public static final kick_user:I = 0x7f120def
+.field public static final keybind_description_modal_toggle_previous_guild:I = 0x7f120def
 
-.field public static final kick_user_body:I = 0x7f120df0
+.field public static final keybind_description_modal_toggle_users:I = 0x7f120df0
 
-.field public static final kick_user_confirmed:I = 0x7f120df1
+.field public static final keybind_description_modal_unread_channels:I = 0x7f120df1
 
-.field public static final kick_user_error_generic:I = 0x7f120df2
+.field public static final keybind_description_modal_unread_mention_channels:I = 0x7f120df2
 
-.field public static final kick_user_title:I = 0x7f120df3
+.field public static final keybind_description_modal_upload_file:I = 0x7f120df3
 
-.field public static final ko:I = 0x7f120df4
+.field public static final keybind_description_navigate_back:I = 0x7f120df4
 
-.field public static final label_with_online_status:I = 0x7f120df6
+.field public static final keybind_description_navigate_forward:I = 0x7f120df5
 
-.field public static final language:I = 0x7f120df7
+.field public static final keybind_description_push_to_mute:I = 0x7f120df6
 
-.field public static final language_not_found:I = 0x7f120df8
+.field public static final keybind_description_push_to_talk:I = 0x7f120df7
 
-.field public static final language_select:I = 0x7f120df9
+.field public static final keybind_description_push_to_talk_priority:I = 0x7f120df8
 
-.field public static final language_updated:I = 0x7f120dfa
+.field public static final keybind_description_toggle_deafen:I = 0x7f120df9
 
-.field public static final languages:I = 0x7f120dfb
+.field public static final keybind_description_toggle_go_live_streaming:I = 0x7f120dfa
 
-.field public static final large_guild_notify_all_messages_description:I = 0x7f120dfc
+.field public static final keybind_description_toggle_mute:I = 0x7f120dfb
 
-.field public static final large_message_upload_subtitle:I = 0x7f120dfd
+.field public static final keybind_description_toggle_overlay:I = 0x7f120dfc
 
-.field public static final large_message_upload_title:I = 0x7f120dfe
+.field public static final keybind_description_toggle_overlay_input_lock:I = 0x7f120dfd
 
-.field public static final last_seen:I = 0x7f120dff
+.field public static final keybind_description_toggle_streamer_mode:I = 0x7f120dfe
 
-.field public static final last_sync:I = 0x7f120e00
+.field public static final keybind_description_toggle_voice_mode:I = 0x7f120dff
 
-.field public static final last_thread_message:I = 0x7f120e01
+.field public static final keybind_description_unassigned:I = 0x7f120e00
 
-.field public static final launch_app:I = 0x7f120e02
+.field public static final keybind_navigate_back:I = 0x7f120e01
 
-.field public static final learn_more:I = 0x7f120e03
+.field public static final keybind_navigate_forward:I = 0x7f120e02
 
-.field public static final learn_more_link:I = 0x7f120e04
+.field public static final keybind_push_to_mute:I = 0x7f120e03
 
-.field public static final leave_call:I = 0x7f120e05
+.field public static final keybind_push_to_talk:I = 0x7f120e04
 
-.field public static final leave_group_dm:I = 0x7f120e06
+.field public static final keybind_push_to_talk_priority:I = 0x7f120e05
 
-.field public static final leave_group_dm_body:I = 0x7f120e07
+.field public static final keybind_toggle_deafen:I = 0x7f120e06
 
-.field public static final leave_group_dm_managed_body:I = 0x7f120e08
+.field public static final keybind_toggle_go_live_streaming:I = 0x7f120e07
 
-.field public static final leave_group_dm_managed_title:I = 0x7f120e09
+.field public static final keybind_toggle_mute:I = 0x7f120e08
 
-.field public static final leave_group_dm_title:I = 0x7f120e0a
+.field public static final keybind_toggle_overlay:I = 0x7f120e09
 
-.field public static final leave_server:I = 0x7f120e0b
+.field public static final keybind_toggle_overlay_input_lock:I = 0x7f120e0a
 
-.field public static final leave_server_body:I = 0x7f120e0c
+.field public static final keybind_toggle_stream_mode:I = 0x7f120e0b
 
-.field public static final leave_server_body_mobile:I = 0x7f120e0d
+.field public static final keybind_toggle_voice_mode:I = 0x7f120e0c
 
-.field public static final leave_server_title:I = 0x7f120e0e
+.field public static final keybind_unassigned:I = 0x7f120e0d
 
-.field public static final leave_thread:I = 0x7f120e0f
+.field public static final keybinds:I = 0x7f120e0e
 
-.field public static final lets_go:I = 0x7f120e10
+.field public static final keyboard_behavior_mobile_header:I = 0x7f120e0f
 
-.field public static final library:I = 0x7f120e11
+.field public static final keyboard_behavior_mobile_shift_enter_to_send:I = 0x7f120e10
 
-.field public static final light_blue:I = 0x7f120e12
+.field public static final keyboard_behavior_mobile_shift_enter_to_send_hint:I = 0x7f120e11
 
-.field public static final light_green:I = 0x7f120e13
+.field public static final kick:I = 0x7f120e12
 
-.field public static final light_grey:I = 0x7f120e14
+.field public static final kick_from_server:I = 0x7f120e13
 
-.field public static final link_copied:I = 0x7f120e15
+.field public static final kick_members:I = 0x7f120e14
 
-.field public static final link_settings:I = 0x7f120e16
+.field public static final kick_user:I = 0x7f120e15
 
-.field public static final link_your_discord_account:I = 0x7f120e17
+.field public static final kick_user_body:I = 0x7f120e16
 
-.field public static final link_your_xbox_account_1:I = 0x7f120e18
+.field public static final kick_user_confirmed:I = 0x7f120e17
 
-.field public static final link_your_xbox_account_2:I = 0x7f120e19
+.field public static final kick_user_error_generic:I = 0x7f120e18
 
-.field public static final linux:I = 0x7f120e1a
+.field public static final kick_user_title:I = 0x7f120e19
 
-.field public static final listen_on_spotify:I = 0x7f120e1b
+.field public static final ko:I = 0x7f120e1a
 
-.field public static final listening_to:I = 0x7f120e1c
+.field public static final label_with_online_status:I = 0x7f120e1c
 
-.field public static final live:I = 0x7f120e1d
+.field public static final language:I = 0x7f120e1d
 
-.field public static final live_viewers:I = 0x7f120e1e
+.field public static final language_not_found:I = 0x7f120e1e
 
-.field public static final load_image_error:I = 0x7f120e1f
+.field public static final language_select:I = 0x7f120e1f
 
-.field public static final load_more_messages:I = 0x7f120e20
+.field public static final language_updated:I = 0x7f120e20
 
-.field public static final load_reactions_error:I = 0x7f120e21
+.field public static final languages:I = 0x7f120e21
 
-.field public static final loading:I = 0x7f120e22
+.field public static final large_guild_notify_all_messages_description:I = 0x7f120e22
 
-.field public static final loading_did_you_know:I = 0x7f120e23
+.field public static final large_message_upload_subtitle:I = 0x7f120e23
 
-.field public static final loading_keybind_tip_1:I = 0x7f120e24
+.field public static final large_message_upload_title:I = 0x7f120e24
 
-.field public static final loading_keybind_tip_2:I = 0x7f120e25
+.field public static final last_seen:I = 0x7f120e25
 
-.field public static final loading_keybind_tip_3:I = 0x7f120e26
+.field public static final last_sync:I = 0x7f120e26
 
-.field public static final loading_keybind_tip_4:I = 0x7f120e27
+.field public static final last_thread_message:I = 0x7f120e27
 
-.field public static final loading_keybind_tip_5:I = 0x7f120e28
+.field public static final launch_app:I = 0x7f120e28
 
-.field public static final loading_keybind_tip_6:I = 0x7f120e29
+.field public static final learn_more:I = 0x7f120e29
 
-.field public static final loading_keybind_tip_7:I = 0x7f120e2a
+.field public static final learn_more_link:I = 0x7f120e2a
 
-.field public static final loading_keybind_tip_8:I = 0x7f120e2b
+.field public static final leave_call:I = 0x7f120e2b
 
-.field public static final loading_line_1:I = 0x7f120e2c
+.field public static final leave_group_dm:I = 0x7f120e2c
 
-.field public static final loading_line_10:I = 0x7f120e2d
+.field public static final leave_group_dm_body:I = 0x7f120e2d
 
-.field public static final loading_line_11:I = 0x7f120e2e
+.field public static final leave_group_dm_managed_body:I = 0x7f120e2e
 
-.field public static final loading_line_12:I = 0x7f120e2f
+.field public static final leave_group_dm_managed_title:I = 0x7f120e2f
 
-.field public static final loading_line_13:I = 0x7f120e30
+.field public static final leave_group_dm_title:I = 0x7f120e30
 
-.field public static final loading_line_14:I = 0x7f120e31
+.field public static final leave_server:I = 0x7f120e31
 
-.field public static final loading_line_15:I = 0x7f120e32
+.field public static final leave_server_body:I = 0x7f120e32
 
-.field public static final loading_line_2:I = 0x7f120e33
+.field public static final leave_server_body_mobile:I = 0x7f120e33
 
-.field public static final loading_line_3:I = 0x7f120e34
+.field public static final leave_server_title:I = 0x7f120e34
 
-.field public static final loading_line_4:I = 0x7f120e35
+.field public static final leave_thread:I = 0x7f120e35
 
-.field public static final loading_line_5:I = 0x7f120e36
+.field public static final lets_go:I = 0x7f120e36
 
-.field public static final loading_line_6:I = 0x7f120e37
+.field public static final library:I = 0x7f120e37
 
-.field public static final loading_line_7:I = 0x7f120e38
+.field public static final light_blue:I = 0x7f120e38
 
-.field public static final loading_line_8:I = 0x7f120e39
+.field public static final light_green:I = 0x7f120e39
 
-.field public static final loading_line_9:I = 0x7f120e3a
+.field public static final light_grey:I = 0x7f120e3a
 
-.field public static final loading_messages_a11y_label:I = 0x7f120e3b
+.field public static final link_copied:I = 0x7f120e3b
 
-.field public static final loading_note:I = 0x7f120e3c
+.field public static final link_settings:I = 0x7f120e3c
 
-.field public static final loading_tip_1:I = 0x7f120e3d
+.field public static final link_your_discord_account:I = 0x7f120e3d
 
-.field public static final loading_tip_10:I = 0x7f120e3e
+.field public static final link_your_xbox_account_1:I = 0x7f120e3e
 
-.field public static final loading_tip_11:I = 0x7f120e3f
+.field public static final link_your_xbox_account_2:I = 0x7f120e3f
 
-.field public static final loading_tip_12:I = 0x7f120e40
+.field public static final linux:I = 0x7f120e40
 
-.field public static final loading_tip_13:I = 0x7f120e41
+.field public static final listen_on_spotify:I = 0x7f120e41
 
-.field public static final loading_tip_14:I = 0x7f120e42
+.field public static final listening_to:I = 0x7f120e42
 
-.field public static final loading_tip_15:I = 0x7f120e43
+.field public static final live:I = 0x7f120e43
 
-.field public static final loading_tip_16:I = 0x7f120e44
+.field public static final live_viewers:I = 0x7f120e44
 
-.field public static final loading_tip_17:I = 0x7f120e45
+.field public static final load_image_error:I = 0x7f120e45
 
-.field public static final loading_tip_18:I = 0x7f120e46
+.field public static final load_more_messages:I = 0x7f120e46
 
-.field public static final loading_tip_19:I = 0x7f120e47
+.field public static final load_reactions_error:I = 0x7f120e47
 
-.field public static final loading_tip_2:I = 0x7f120e48
+.field public static final loading:I = 0x7f120e48
 
-.field public static final loading_tip_20:I = 0x7f120e49
+.field public static final loading_did_you_know:I = 0x7f120e49
 
-.field public static final loading_tip_21:I = 0x7f120e4a
+.field public static final loading_keybind_tip_1:I = 0x7f120e4a
 
-.field public static final loading_tip_22:I = 0x7f120e4b
+.field public static final loading_keybind_tip_2:I = 0x7f120e4b
 
-.field public static final loading_tip_23:I = 0x7f120e4c
+.field public static final loading_keybind_tip_3:I = 0x7f120e4c
 
-.field public static final loading_tip_24:I = 0x7f120e4d
+.field public static final loading_keybind_tip_4:I = 0x7f120e4d
 
-.field public static final loading_tip_25:I = 0x7f120e4e
+.field public static final loading_keybind_tip_5:I = 0x7f120e4e
 
-.field public static final loading_tip_3:I = 0x7f120e4f
+.field public static final loading_keybind_tip_6:I = 0x7f120e4f
 
-.field public static final loading_tip_4:I = 0x7f120e50
+.field public static final loading_keybind_tip_7:I = 0x7f120e50
 
-.field public static final loading_tip_5:I = 0x7f120e51
+.field public static final loading_keybind_tip_8:I = 0x7f120e51
 
-.field public static final loading_tip_6:I = 0x7f120e52
+.field public static final loading_line_1:I = 0x7f120e52
 
-.field public static final loading_tip_7:I = 0x7f120e53
+.field public static final loading_line_10:I = 0x7f120e53
 
-.field public static final loading_tip_8:I = 0x7f120e54
+.field public static final loading_line_11:I = 0x7f120e54
 
-.field public static final loading_tip_9:I = 0x7f120e55
+.field public static final loading_line_12:I = 0x7f120e55
 
-.field public static final loading_your_pin:I = 0x7f120e56
+.field public static final loading_line_13:I = 0x7f120e56
 
-.field public static final lobby:I = 0x7f120e57
+.field public static final loading_line_14:I = 0x7f120e57
 
-.field public static final local_muted:I = 0x7f120e58
+.field public static final loading_line_15:I = 0x7f120e58
 
-.field public static final local_push_notification_guild_verification_body:I = 0x7f120e59
+.field public static final loading_line_2:I = 0x7f120e59
 
-.field public static final local_video_disabled:I = 0x7f120e5a
+.field public static final loading_line_3:I = 0x7f120e5a
 
-.field public static final locale:I = 0x7f120e5b
+.field public static final loading_line_4:I = 0x7f120e5b
 
-.field public static final login:I = 0x7f120e5c
+.field public static final loading_line_5:I = 0x7f120e5c
 
-.field public static final login_as:I = 0x7f120e5d
+.field public static final loading_line_6:I = 0x7f120e5d
 
-.field public static final login_body:I = 0x7f120e5e
+.field public static final loading_line_7:I = 0x7f120e5e
 
-.field public static final login_title:I = 0x7f120e5f
+.field public static final loading_line_8:I = 0x7f120e5f
 
-.field public static final login_with_qr:I = 0x7f120e60
+.field public static final loading_line_9:I = 0x7f120e60
 
-.field public static final login_with_qr_description:I = 0x7f120e61
+.field public static final loading_messages_a11y_label:I = 0x7f120e61
 
-.field public static final logout:I = 0x7f120e62
+.field public static final loading_note:I = 0x7f120e62
 
-.field public static final low_quality_image_mode:I = 0x7f120e63
+.field public static final loading_tip_1:I = 0x7f120e63
 
-.field public static final low_quality_image_mode_help:I = 0x7f120e64
+.field public static final loading_tip_10:I = 0x7f120e64
 
-.field public static final lt:I = 0x7f120e65
+.field public static final loading_tip_11:I = 0x7f120e65
 
-.field public static final lurker_mode_chat_input_button:I = 0x7f120e66
+.field public static final loading_tip_12:I = 0x7f120e66
 
-.field public static final lurker_mode_chat_input_message:I = 0x7f120e67
+.field public static final loading_tip_13:I = 0x7f120e67
 
-.field public static final lurker_mode_chat_input_message_ios:I = 0x7f120e68
+.field public static final loading_tip_14:I = 0x7f120e68
 
-.field public static final lurker_mode_nag_bar_button:I = 0x7f120e69
+.field public static final loading_tip_15:I = 0x7f120e69
 
-.field public static final lurker_mode_nag_bar_header:I = 0x7f120e6a
+.field public static final loading_tip_16:I = 0x7f120e6a
 
-.field public static final lurker_mode_popout_cancel:I = 0x7f120e6b
+.field public static final loading_tip_17:I = 0x7f120e6b
 
-.field public static final lurker_mode_popout_chat_header:I = 0x7f120e6c
+.field public static final loading_tip_18:I = 0x7f120e6c
 
-.field public static final lurker_mode_popout_join:I = 0x7f120e6d
+.field public static final loading_tip_19:I = 0x7f120e6d
 
-.field public static final lurker_mode_popout_reactions_header:I = 0x7f120e6e
+.field public static final loading_tip_2:I = 0x7f120e6e
 
-.field public static final lurker_mode_popout_success_body:I = 0x7f120e6f
+.field public static final loading_tip_20:I = 0x7f120e6f
 
-.field public static final lurker_mode_popout_success_button:I = 0x7f120e70
+.field public static final loading_tip_21:I = 0x7f120e70
 
-.field public static final lurker_mode_popout_success_header:I = 0x7f120e71
+.field public static final loading_tip_22:I = 0x7f120e71
 
-.field public static final lurker_mode_popout_upsell_body:I = 0x7f120e72
+.field public static final loading_tip_23:I = 0x7f120e72
 
-.field public static final lurker_mode_view_guild:I = 0x7f120e73
+.field public static final loading_tip_24:I = 0x7f120e73
 
-.field public static final macos:I = 0x7f120e74
+.field public static final loading_tip_25:I = 0x7f120e74
 
-.field public static final magenta:I = 0x7f120e75
+.field public static final loading_tip_3:I = 0x7f120e75
 
-.field public static final manage_channel:I = 0x7f120e76
+.field public static final loading_tip_4:I = 0x7f120e76
 
-.field public static final manage_channel_description:I = 0x7f120e77
+.field public static final loading_tip_5:I = 0x7f120e77
 
-.field public static final manage_channels:I = 0x7f120e78
+.field public static final loading_tip_6:I = 0x7f120e78
 
-.field public static final manage_channels_description:I = 0x7f120e79
+.field public static final loading_tip_7:I = 0x7f120e79
 
-.field public static final manage_emojis:I = 0x7f120e7a
+.field public static final loading_tip_8:I = 0x7f120e7a
 
-.field public static final manage_messages:I = 0x7f120e7b
+.field public static final loading_tip_9:I = 0x7f120e7b
 
-.field public static final manage_messages_description:I = 0x7f120e7c
+.field public static final loading_your_pin:I = 0x7f120e7c
 
-.field public static final manage_messages_description_in_announcement_channel:I = 0x7f120e7d
+.field public static final lobby:I = 0x7f120e7d
 
-.field public static final manage_nicknames:I = 0x7f120e7e
+.field public static final local_muted:I = 0x7f120e7e
 
-.field public static final manage_nicknames_description:I = 0x7f120e7f
+.field public static final local_push_notification_guild_verification_body:I = 0x7f120e7f
 
-.field public static final manage_permissions:I = 0x7f120e80
+.field public static final local_video_disabled:I = 0x7f120e80
 
-.field public static final manage_permissions_description:I = 0x7f120e81
+.field public static final locale:I = 0x7f120e81
 
-.field public static final manage_roles:I = 0x7f120e82
+.field public static final login:I = 0x7f120e82
 
-.field public static final manage_roles_description:I = 0x7f120e83
+.field public static final login_as:I = 0x7f120e83
 
-.field public static final manage_server:I = 0x7f120e84
+.field public static final login_body:I = 0x7f120e84
 
-.field public static final manage_server_description:I = 0x7f120e85
+.field public static final login_title:I = 0x7f120e85
 
-.field public static final manage_user:I = 0x7f120e86
+.field public static final login_with_qr:I = 0x7f120e86
 
-.field public static final manage_user_shorthand:I = 0x7f120e87
+.field public static final login_with_qr_description:I = 0x7f120e87
 
-.field public static final manage_webhooks:I = 0x7f120e88
+.field public static final logout:I = 0x7f120e88
 
-.field public static final manage_webhooks_description:I = 0x7f120e89
+.field public static final low_quality_image_mode:I = 0x7f120e89
 
-.field public static final managed_role_explaination:I = 0x7f120e8a
+.field public static final low_quality_image_mode_help:I = 0x7f120e8a
 
-.field public static final managed_role_integration_explanation:I = 0x7f120e8b
+.field public static final lt:I = 0x7f120e8b
 
-.field public static final managed_role_premium_subscriber_explanation:I = 0x7f120e8c
+.field public static final lurker_mode_chat_input_button:I = 0x7f120e8c
 
-.field public static final mark_as_read:I = 0x7f120e8d
+.field public static final lurker_mode_chat_input_message:I = 0x7f120e8d
 
-.field public static final mark_unread:I = 0x7f120e8e
+.field public static final lurker_mode_chat_input_message_ios:I = 0x7f120e8e
 
-.field public static final marked_as_read:I = 0x7f120e8f
+.field public static final lurker_mode_nag_bar_button:I = 0x7f120e8f
 
-.field public static final marketing_refresh_premium_features_badge_heading:I = 0x7f120e90
+.field public static final lurker_mode_nag_bar_header:I = 0x7f120e90
 
-.field public static final marketing_refresh_premium_features_badge_subheading:I = 0x7f120e91
+.field public static final lurker_mode_popout_cancel:I = 0x7f120e91
 
-.field public static final marketing_refresh_premium_features_emoji_heading:I = 0x7f120e92
+.field public static final lurker_mode_popout_chat_header:I = 0x7f120e92
 
-.field public static final marketing_refresh_premium_features_emoji_subheading:I = 0x7f120e93
+.field public static final lurker_mode_popout_join:I = 0x7f120e93
 
-.field public static final marketing_refresh_premium_features_file_upload_heading:I = 0x7f120e94
+.field public static final lurker_mode_popout_reactions_header:I = 0x7f120e94
 
-.field public static final marketing_refresh_premium_features_file_upload_subheading:I = 0x7f120e95
+.field public static final lurker_mode_popout_success_body:I = 0x7f120e95
 
-.field public static final marketing_refresh_premium_features_go_live_heading:I = 0x7f120e96
+.field public static final lurker_mode_popout_success_button:I = 0x7f120e96
 
-.field public static final marketing_refresh_premium_features_go_live_info:I = 0x7f120e97
+.field public static final lurker_mode_popout_success_header:I = 0x7f120e97
 
-.field public static final marketing_refresh_premium_features_go_live_subheading:I = 0x7f120e98
+.field public static final lurker_mode_popout_upsell_body:I = 0x7f120e98
 
-.field public static final marketing_refresh_premium_features_included_guild_subscriptions_heading:I = 0x7f120e99
+.field public static final lurker_mode_view_guild:I = 0x7f120e99
 
-.field public static final marketing_refresh_premium_features_included_guild_subscriptions_subheading:I = 0x7f120e9a
+.field public static final macos:I = 0x7f120e9a
 
-.field public static final marketing_refresh_premium_features_profile_heading:I = 0x7f120e9b
+.field public static final magenta:I = 0x7f120e9b
 
-.field public static final marketing_refresh_premium_features_profile_subheading:I = 0x7f120e9c
+.field public static final manage_channel:I = 0x7f120e9c
 
-.field public static final marketing_refresh_premium_tier_1_cta_description:I = 0x7f120e9d
+.field public static final manage_channel_description:I = 0x7f120e9d
 
-.field public static final marketing_refresh_premium_tier_1_cta_description_perks_info:I = 0x7f120e9e
+.field public static final manage_channels:I = 0x7f120e9e
 
-.field public static final marketing_refresh_premium_tier_1_cta_description_perks_info_label:I = 0x7f120e9f
+.field public static final manage_channels_description:I = 0x7f120e9f
 
-.field public static final marketing_refresh_premium_tier_1_cta_description_with_price:I = 0x7f120ea0
+.field public static final manage_emojis:I = 0x7f120ea0
 
-.field public static final marketing_refresh_premium_tier_2_cta_subtitle:I = 0x7f120ea1
+.field public static final manage_messages:I = 0x7f120ea1
 
-.field public static final marketing_refresh_premium_tier_2_cta_title:I = 0x7f120ea2
+.field public static final manage_messages_description:I = 0x7f120ea2
 
-.field public static final marketing_refresh_premium_tier_2_subtitle:I = 0x7f120ea3
+.field public static final manage_messages_description_in_announcement_channel:I = 0x7f120ea3
 
-.field public static final marketing_refresh_premium_tier_2_subtitle_with_price:I = 0x7f120ea4
+.field public static final manage_nicknames:I = 0x7f120ea4
 
-.field public static final marketing_refresh_premium_tier_2_title:I = 0x7f120ea5
+.field public static final manage_nicknames_description:I = 0x7f120ea5
 
-.field public static final masked_link_body:I = 0x7f120ea6
+.field public static final manage_permissions:I = 0x7f120ea6
 
-.field public static final masked_link_cancel:I = 0x7f120ea7
+.field public static final manage_permissions_description:I = 0x7f120ea7
 
-.field public static final masked_link_confirm:I = 0x7f120ea8
+.field public static final manage_roles:I = 0x7f120ea8
 
-.field public static final masked_link_trust_this_domain:I = 0x7f120ea9
+.field public static final manage_roles_description:I = 0x7f120ea9
 
-.field public static final masked_link_trust_this_protocol:I = 0x7f120eaa
+.field public static final manage_server:I = 0x7f120eaa
 
-.field public static final masked_protocol_link_body:I = 0x7f120eab
+.field public static final manage_server_description:I = 0x7f120eab
 
-.field public static final mature_listing_accept:I = 0x7f120eac
+.field public static final manage_user:I = 0x7f120eac
 
-.field public static final mature_listing_decline:I = 0x7f120ead
+.field public static final manage_user_shorthand:I = 0x7f120ead
 
-.field public static final mature_listing_description:I = 0x7f120eae
+.field public static final manage_webhooks:I = 0x7f120eae
 
-.field public static final mature_listing_title:I = 0x7f120eaf
+.field public static final manage_webhooks_description:I = 0x7f120eaf
 
-.field public static final max_age_never:I = 0x7f120eb0
+.field public static final managed_role_explaination:I = 0x7f120eb0
 
-.field public static final max_age_never_description_mobile:I = 0x7f120eb1
+.field public static final managed_role_integration_explanation:I = 0x7f120eb1
 
-.field public static final max_number_of_uses:I = 0x7f120eb2
+.field public static final managed_role_premium_subscriber_explanation:I = 0x7f120eb2
 
-.field public static final max_uses:I = 0x7f120eb3
+.field public static final mark_as_read:I = 0x7f120eb3
 
-.field public static final max_uses_description_mobile:I = 0x7f120eb4
+.field public static final mark_unread:I = 0x7f120eb4
 
-.field public static final max_uses_description_unlimited_uses:I = 0x7f120eb5
+.field public static final marked_as_read:I = 0x7f120eb5
 
-.field public static final me:I = 0x7f120eb6
+.field public static final marketing_refresh_premium_features_badge_heading:I = 0x7f120eb6
 
-.field public static final media_keyboard_browse:I = 0x7f120eb7
+.field public static final marketing_refresh_premium_features_badge_subheading:I = 0x7f120eb7
 
-.field public static final media_keyboard_gift:I = 0x7f120eb8
+.field public static final marketing_refresh_premium_features_emoji_heading:I = 0x7f120eb8
 
-.field public static final member:I = 0x7f120eb9
+.field public static final marketing_refresh_premium_features_emoji_subheading:I = 0x7f120eb9
 
-.field public static final member_list:I = 0x7f120eba
+.field public static final marketing_refresh_premium_features_file_upload_heading:I = 0x7f120eba
 
-.field public static final member_list_server_owner_help:I = 0x7f120ebb
+.field public static final marketing_refresh_premium_features_file_upload_subheading:I = 0x7f120ebb
 
-.field public static final members:I = 0x7f120ebc
+.field public static final marketing_refresh_premium_features_go_live_heading:I = 0x7f120ebc
 
-.field public static final members_header:I = 0x7f120ebd
+.field public static final marketing_refresh_premium_features_go_live_info:I = 0x7f120ebd
 
-.field public static final members_matching:I = 0x7f120ebe
+.field public static final marketing_refresh_premium_features_go_live_subheading:I = 0x7f120ebe
 
-.field public static final members_search_placeholder:I = 0x7f120ebf
+.field public static final marketing_refresh_premium_features_included_guild_subscriptions_heading:I = 0x7f120ebf
 
-.field public static final mention:I = 0x7f120ec0
+.field public static final marketing_refresh_premium_features_included_guild_subscriptions_subheading:I = 0x7f120ec0
 
-.field public static final mention_everyone:I = 0x7f120ec1
+.field public static final marketing_refresh_premium_features_profile_heading:I = 0x7f120ec1
 
-.field public static final mention_everyone_android:I = 0x7f120ec2
+.field public static final marketing_refresh_premium_features_profile_subheading:I = 0x7f120ec2
 
-.field public static final mention_everyone_autocomplete_description:I = 0x7f120ec3
+.field public static final marketing_refresh_premium_tier_1_cta_description:I = 0x7f120ec3
 
-.field public static final mention_everyone_autocomplete_description_mobile:I = 0x7f120ec4
+.field public static final marketing_refresh_premium_tier_1_cta_description_perks_info:I = 0x7f120ec4
 
-.field public static final mention_everyone_channel_description:I = 0x7f120ec5
+.field public static final marketing_refresh_premium_tier_1_cta_description_perks_info_label:I = 0x7f120ec5
 
-.field public static final mention_everyone_channel_description_android:I = 0x7f120ec6
+.field public static final marketing_refresh_premium_tier_1_cta_description_with_price:I = 0x7f120ec6
 
-.field public static final mention_everyone_description:I = 0x7f120ec7
+.field public static final marketing_refresh_premium_tier_2_cta_subtitle:I = 0x7f120ec7
 
-.field public static final mention_everyone_description_android:I = 0x7f120ec8
+.field public static final marketing_refresh_premium_tier_2_cta_title:I = 0x7f120ec8
 
-.field public static final mention_here_autocomplete_description:I = 0x7f120ec9
+.field public static final marketing_refresh_premium_tier_2_subtitle:I = 0x7f120ec9
 
-.field public static final mention_here_autocomplete_description_mobile:I = 0x7f120eca
+.field public static final marketing_refresh_premium_tier_2_subtitle_with_price:I = 0x7f120eca
 
-.field public static final mention_role_autocomplete_description_mobile:I = 0x7f120ecb
+.field public static final marketing_refresh_premium_tier_2_title:I = 0x7f120ecb
 
-.field public static final mention_users_with_role:I = 0x7f120ecc
+.field public static final masked_link_body:I = 0x7f120ecc
 
-.field public static final mentions:I = 0x7f120ecd
+.field public static final masked_link_cancel:I = 0x7f120ecd
 
-.field public static final mentions_count:I = 0x7f120ece
+.field public static final masked_link_confirm:I = 0x7f120ece
 
-.field public static final message_action_reply:I = 0x7f120ecf
+.field public static final masked_link_trust_this_domain:I = 0x7f120ecf
 
-.field public static final message_actions_menu_label:I = 0x7f120ed0
+.field public static final masked_link_trust_this_protocol:I = 0x7f120ed0
 
-.field public static final message_count:I = 0x7f120ed1
+.field public static final masked_protocol_link_body:I = 0x7f120ed1
 
-.field public static final message_count_in_thread:I = 0x7f120ed2
+.field public static final mature_listing_accept:I = 0x7f120ed2
 
-.field public static final message_count_in_thread_overflow:I = 0x7f120ed3
+.field public static final mature_listing_decline:I = 0x7f120ed3
 
-.field public static final message_count_overflow:I = 0x7f120ed4
+.field public static final mature_listing_description:I = 0x7f120ed4
 
-.field public static final message_display_mode_label:I = 0x7f120ed5
+.field public static final mature_listing_title:I = 0x7f120ed5
 
-.field public static final message_edited:I = 0x7f120ed6
+.field public static final max_age_never:I = 0x7f120ed6
 
-.field public static final message_header_reply:I = 0x7f120ed7
+.field public static final max_age_never_description_mobile:I = 0x7f120ed7
 
-.field public static final message_options:I = 0x7f120ed8
+.field public static final max_number_of_uses:I = 0x7f120ed8
 
-.field public static final message_pinned:I = 0x7f120ed9
+.field public static final max_uses:I = 0x7f120ed9
 
-.field public static final message_preview:I = 0x7f120eda
+.field public static final max_uses_description_mobile:I = 0x7f120eda
 
-.field public static final message_rate_limited_body:I = 0x7f120edb
+.field public static final max_uses_description_unlimited_uses:I = 0x7f120edb
 
-.field public static final message_rate_limited_button:I = 0x7f120edc
+.field public static final me:I = 0x7f120edc
 
-.field public static final message_rate_limited_header:I = 0x7f120edd
+.field public static final media_keyboard_browse:I = 0x7f120edd
 
-.field public static final message_step_subtitle:I = 0x7f120ede
+.field public static final media_keyboard_gift:I = 0x7f120ede
 
-.field public static final message_step_title:I = 0x7f120edf
+.field public static final member:I = 0x7f120edf
 
-.field public static final message_too_long_body_text:I = 0x7f120ee0
+.field public static final member_list:I = 0x7f120ee0
 
-.field public static final message_too_long_header:I = 0x7f120ee1
+.field public static final member_list_server_owner_help:I = 0x7f120ee1
 
-.field public static final message_tts:I = 0x7f120ee2
+.field public static final members:I = 0x7f120ee2
 
-.field public static final message_tts_deleted_role:I = 0x7f120ee3
+.field public static final members_header:I = 0x7f120ee3
 
-.field public static final message_unpinned:I = 0x7f120ee4
+.field public static final members_matching:I = 0x7f120ee4
 
-.field public static final message_utilities_a11y_label:I = 0x7f120ee5
+.field public static final members_search_placeholder:I = 0x7f120ee5
 
-.field public static final messages:I = 0x7f120ee6
+.field public static final mention:I = 0x7f120ee6
 
-.field public static final messages_failed_to_load:I = 0x7f120ee7
+.field public static final mention_everyone:I = 0x7f120ee7
 
-.field public static final messages_failed_to_load_try_again:I = 0x7f120ee8
+.field public static final mention_everyone_android:I = 0x7f120ee8
 
-.field public static final mfa_sms_add_phone:I = 0x7f120ee9
+.field public static final mention_everyone_autocomplete_description:I = 0x7f120ee9
 
-.field public static final mfa_sms_already_enabled:I = 0x7f120eea
+.field public static final mention_everyone_autocomplete_description_mobile:I = 0x7f120eea
 
-.field public static final mfa_sms_auth:I = 0x7f120eeb
+.field public static final mention_everyone_channel_description:I = 0x7f120eeb
 
-.field public static final mfa_sms_auth_current_phone:I = 0x7f120eec
+.field public static final mention_everyone_channel_description_android:I = 0x7f120eec
 
-.field public static final mfa_sms_auth_sales_pitch:I = 0x7f120eed
+.field public static final mention_everyone_description:I = 0x7f120eed
 
-.field public static final mfa_sms_confirm_remove_action:I = 0x7f120eee
+.field public static final mention_everyone_description_android:I = 0x7f120eee
 
-.field public static final mfa_sms_confirm_remove_body:I = 0x7f120eef
+.field public static final mention_here_autocomplete_description:I = 0x7f120eef
 
-.field public static final mfa_sms_disabled_partner:I = 0x7f120ef0
+.field public static final mention_here_autocomplete_description_mobile:I = 0x7f120ef0
 
-.field public static final mfa_sms_enable:I = 0x7f120ef1
+.field public static final mention_role_autocomplete_description_mobile:I = 0x7f120ef1
 
-.field public static final mfa_sms_enable_should_do:I = 0x7f120ef2
+.field public static final mention_users_with_role:I = 0x7f120ef2
 
-.field public static final mfa_sms_enable_subheader:I = 0x7f120ef3
+.field public static final mentions:I = 0x7f120ef3
 
-.field public static final mfa_sms_phone_number_hide:I = 0x7f120ef4
+.field public static final mentions_count:I = 0x7f120ef4
 
-.field public static final mfa_sms_phone_number_reveal:I = 0x7f120ef5
+.field public static final message_action_reply:I = 0x7f120ef5
 
-.field public static final mfa_sms_receive_code:I = 0x7f120ef6
+.field public static final message_actions_menu_label:I = 0x7f120ef6
 
-.field public static final mfa_sms_remove:I = 0x7f120ef7
+.field public static final message_count:I = 0x7f120ef7
 
-.field public static final mfa_sms_resend:I = 0x7f120ef8
+.field public static final message_count_in_thread:I = 0x7f120ef8
 
-.field public static final mic_test_voice_channel_warning:I = 0x7f120ef9
+.field public static final message_count_in_thread_overflow:I = 0x7f120ef9
 
-.field public static final minimum_size:I = 0x7f120efa
+.field public static final message_count_overflow:I = 0x7f120efa
 
-.field public static final missed_an_update:I = 0x7f120efb
+.field public static final message_display_mode_label:I = 0x7f120efb
 
-.field public static final missed_call:I = 0x7f120efc
+.field public static final message_edited:I = 0x7f120efc
 
-.field public static final missing_entitlement_modal_body:I = 0x7f120efd
+.field public static final message_header_reply:I = 0x7f120efd
 
-.field public static final missing_entitlement_modal_body_unknown_application:I = 0x7f120efe
+.field public static final message_options:I = 0x7f120efe
 
-.field public static final missing_entitlement_modal_header:I = 0x7f120eff
+.field public static final message_pinned:I = 0x7f120eff
 
-.field public static final missing_entitlement_modal_header_unknown_application:I = 0x7f120f00
+.field public static final message_preview:I = 0x7f120f00
 
-.field public static final mobile_designate_other_channel:I = 0x7f120f01
+.field public static final message_rate_limited_body:I = 0x7f120f01
 
-.field public static final mobile_enable_hardware_scaling:I = 0x7f120f02
+.field public static final message_rate_limited_button:I = 0x7f120f02
 
-.field public static final mobile_enable_hardware_scaling_desc:I = 0x7f120f03
+.field public static final message_rate_limited_header:I = 0x7f120f03
 
-.field public static final mobile_noise_cancellation_popout_description:I = 0x7f120f04
+.field public static final message_step_subtitle:I = 0x7f120f04
 
-.field public static final mobile_noise_cancellation_popout_title:I = 0x7f120f05
+.field public static final message_step_title:I = 0x7f120f05
 
-.field public static final mobile_stream_participants_hidden:I = 0x7f120f06
+.field public static final message_too_long_body_text:I = 0x7f120f06
 
-.field public static final moderation:I = 0x7f120f07
+.field public static final message_too_long_header:I = 0x7f120f07
 
-.field public static final modify_followed_news_header:I = 0x7f120f08
+.field public static final message_tts:I = 0x7f120f08
 
-.field public static final monthly:I = 0x7f120f09
+.field public static final message_tts_deleted_role:I = 0x7f120f09
 
-.field public static final more:I = 0x7f120f0a
+.field public static final message_unpinned:I = 0x7f120f0a
 
-.field public static final more_options:I = 0x7f120f0b
+.field public static final message_utilities_a11y_label:I = 0x7f120f0b
 
-.field public static final move_from_category_to:I = 0x7f120f0c
+.field public static final messages:I = 0x7f120f0c
 
-.field public static final move_members:I = 0x7f120f0d
+.field public static final messages_failed_to_load:I = 0x7f120f0d
 
-.field public static final move_members_description:I = 0x7f120f0e
+.field public static final messages_failed_to_load_try_again:I = 0x7f120f0e
 
-.field public static final move_to:I = 0x7f120f0f
+.field public static final mfa_sms_add_phone:I = 0x7f120f0f
 
-.field public static final move_to_success:I = 0x7f120f10
+.field public static final mfa_sms_already_enabled:I = 0x7f120f10
 
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f11
+.field public static final mfa_sms_auth:I = 0x7f120f11
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f12
+.field public static final mfa_sms_auth_current_phone:I = 0x7f120f12
 
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f13
+.field public static final mfa_sms_auth_sales_pitch:I = 0x7f120f13
 
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f14
+.field public static final mfa_sms_confirm_remove_action:I = 0x7f120f14
 
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f15
+.field public static final mfa_sms_confirm_remove_body:I = 0x7f120f15
 
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f16
+.field public static final mfa_sms_disabled_partner:I = 0x7f120f16
 
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f17
+.field public static final mfa_sms_enable:I = 0x7f120f17
 
-.field public static final mtrl_picker_cancel:I = 0x7f120f18
+.field public static final mfa_sms_enable_should_do:I = 0x7f120f18
 
-.field public static final mtrl_picker_confirm:I = 0x7f120f19
+.field public static final mfa_sms_enable_subheader:I = 0x7f120f19
 
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f1a
+.field public static final mfa_sms_phone_number_hide:I = 0x7f120f1a
 
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f1b
+.field public static final mfa_sms_phone_number_reveal:I = 0x7f120f1b
 
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f1c
+.field public static final mfa_sms_receive_code:I = 0x7f120f1c
 
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f1d
+.field public static final mfa_sms_remove:I = 0x7f120f1d
 
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f1e
+.field public static final mfa_sms_resend:I = 0x7f120f1e
 
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f1f
+.field public static final mic_test_voice_channel_warning:I = 0x7f120f1f
 
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f20
+.field public static final minimum_size:I = 0x7f120f20
 
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f21
+.field public static final missed_an_update:I = 0x7f120f21
 
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f22
+.field public static final missed_call:I = 0x7f120f22
 
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f23
+.field public static final missing_entitlement_modal_body:I = 0x7f120f23
 
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f24
+.field public static final missing_entitlement_modal_body_unknown_application:I = 0x7f120f24
 
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f25
+.field public static final missing_entitlement_modal_header:I = 0x7f120f25
 
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f26
+.field public static final missing_entitlement_modal_header_unknown_application:I = 0x7f120f26
 
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f27
+.field public static final mobile_designate_other_channel:I = 0x7f120f27
 
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f28
+.field public static final mobile_enable_hardware_scaling:I = 0x7f120f28
 
-.field public static final mtrl_picker_save:I = 0x7f120f29
+.field public static final mobile_enable_hardware_scaling_desc:I = 0x7f120f29
 
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f2a
+.field public static final mobile_noise_cancellation_popout_description:I = 0x7f120f2a
 
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f2b
+.field public static final mobile_noise_cancellation_popout_title:I = 0x7f120f2b
 
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f2c
+.field public static final mobile_stream_active_body:I = 0x7f120f2c
 
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f2d
+.field public static final mobile_stream_active_body_soundshare_warning_android:I = 0x7f120f2d
 
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f2e
+.field public static final mobile_stream_active_header:I = 0x7f120f2e
 
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f2f
+.field public static final mobile_stream_participants_hidden:I = 0x7f120f2f
 
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f30
+.field public static final mobile_stream_stop_sharing:I = 0x7f120f30
 
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f31
+.field public static final moderation:I = 0x7f120f31
 
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f32
+.field public static final modify_followed_news_header:I = 0x7f120f32
 
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f33
+.field public static final monthly:I = 0x7f120f33
 
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f34
+.field public static final more:I = 0x7f120f34
 
-.field public static final mute:I = 0x7f120f35
+.field public static final more_options:I = 0x7f120f35
 
-.field public static final mute_category:I = 0x7f120f36
+.field public static final move_from_category_to:I = 0x7f120f36
 
-.field public static final mute_channel:I = 0x7f120f37
+.field public static final move_members:I = 0x7f120f37
 
-.field public static final mute_channel_generic:I = 0x7f120f38
+.field public static final move_members_description:I = 0x7f120f38
 
-.field public static final mute_conversation:I = 0x7f120f39
+.field public static final move_to:I = 0x7f120f39
 
-.field public static final mute_duration_15_minutes:I = 0x7f120f3a
+.field public static final move_to_success:I = 0x7f120f3a
 
-.field public static final mute_duration_1_hour:I = 0x7f120f3b
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f3b
 
-.field public static final mute_duration_24_hours:I = 0x7f120f3c
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f3c
 
-.field public static final mute_duration_8_hours:I = 0x7f120f3d
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f3d
 
-.field public static final mute_duration_always:I = 0x7f120f3e
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f3e
 
-.field public static final mute_group_dm:I = 0x7f120f3f
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f3f
 
-.field public static final mute_members:I = 0x7f120f40
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f40
 
-.field public static final mute_server:I = 0x7f120f41
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f41
 
-.field public static final mute_settings_mute_category:I = 0x7f120f42
+.field public static final mtrl_picker_cancel:I = 0x7f120f42
 
-.field public static final mute_settings_mute_channel:I = 0x7f120f43
+.field public static final mtrl_picker_confirm:I = 0x7f120f43
 
-.field public static final mute_settings_mute_server:I = 0x7f120f44
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f44
 
-.field public static final mute_settings_mute_this_conversation:I = 0x7f120f45
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f45
 
-.field public static final mute_until:I = 0x7f120f46
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f46
 
-.field public static final muted_until_time:I = 0x7f120f47
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f47
 
-.field public static final mutual_friends:I = 0x7f120f48
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f48
 
-.field public static final mutual_guilds:I = 0x7f120f49
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f49
 
-.field public static final n_days:I = 0x7f120f4a
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f4a
 
-.field public static final nearby_scan:I = 0x7f120f4b
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f4b
 
-.field public static final need_account:I = 0x7f120f4c
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f4c
 
-.field public static final network_error_bad_request:I = 0x7f120f4d
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f4d
 
-.field public static final network_error_cloudflare_intermittent:I = 0x7f120f4e
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f4e
 
-.field public static final network_error_cloudflare_unauthorized:I = 0x7f120f4f
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f4f
 
-.field public static final network_error_connection:I = 0x7f120f50
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f50
 
-.field public static final network_error_forbidden:I = 0x7f120f51
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f51
 
-.field public static final network_error_request_too_large:I = 0x7f120f52
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f52
 
-.field public static final network_error_rest_request:I = 0x7f120f53
+.field public static final mtrl_picker_save:I = 0x7f120f53
 
-.field public static final network_error_ssl:I = 0x7f120f54
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f54
 
-.field public static final network_error_unauthorized:I = 0x7f120f55
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f55
 
-.field public static final network_error_unknown:I = 0x7f120f56
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f56
 
-.field public static final network_offline:I = 0x7f120f57
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f57
 
-.field public static final never_ask_again:I = 0x7f120f58
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f58
 
-.field public static final nevermind:I = 0x7f120f59
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f59
 
-.field public static final new_dm:I = 0x7f120f5a
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f5a
 
-.field public static final new_group_dm:I = 0x7f120f5b
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f5b
 
-.field public static final new_guilds_dm_allowed:I = 0x7f120f5c
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f5c
 
-.field public static final new_member_retention_info:I = 0x7f120f5d
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f5d
 
-.field public static final new_mentions:I = 0x7f120f5e
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f5e
 
-.field public static final new_messages:I = 0x7f120f5f
+.field public static final mute:I = 0x7f120f5f
 
-.field public static final new_messages_divider:I = 0x7f120f60
+.field public static final mute_category:I = 0x7f120f60
 
-.field public static final new_messages_estimated:I = 0x7f120f61
+.field public static final mute_channel:I = 0x7f120f61
 
-.field public static final new_messages_estimated_with_date:I = 0x7f120f62
+.field public static final mute_channel_generic:I = 0x7f120f62
 
-.field public static final new_messages_with_date:I = 0x7f120f63
+.field public static final mute_conversation:I = 0x7f120f63
 
-.field public static final new_override:I = 0x7f120f64
+.field public static final mute_duration_15_minutes:I = 0x7f120f64
 
-.field public static final new_permission:I = 0x7f120f65
+.field public static final mute_duration_1_hour:I = 0x7f120f65
 
-.field public static final new_terms_ack:I = 0x7f120f66
+.field public static final mute_duration_24_hours:I = 0x7f120f66
 
-.field public static final new_terms_continue:I = 0x7f120f67
+.field public static final mute_duration_8_hours:I = 0x7f120f67
 
-.field public static final new_terms_description:I = 0x7f120f68
+.field public static final mute_duration_always:I = 0x7f120f68
 
-.field public static final new_terms_title:I = 0x7f120f69
+.field public static final mute_group_dm:I = 0x7f120f69
 
-.field public static final new_unreads:I = 0x7f120f6a
+.field public static final mute_members:I = 0x7f120f6a
 
-.field public static final news_channel:I = 0x7f120f6b
+.field public static final mute_server:I = 0x7f120f6b
 
-.field public static final news_channel_publish:I = 0x7f120f6c
+.field public static final mute_settings_mute_category:I = 0x7f120f6c
 
-.field public static final news_channel_publish_bump:I = 0x7f120f6d
+.field public static final mute_settings_mute_channel:I = 0x7f120f6d
 
-.field public static final news_channel_publish_bump_hide_permanently:I = 0x7f120f6e
+.field public static final mute_settings_mute_server:I = 0x7f120f6e
 
-.field public static final news_channel_published:I = 0x7f120f6f
+.field public static final mute_settings_mute_this_conversation:I = 0x7f120f6f
 
-.field public static final next:I = 0x7f120f70
+.field public static final mute_until:I = 0x7f120f70
 
-.field public static final nickname:I = 0x7f120f71
+.field public static final muted_until_time:I = 0x7f120f71
 
-.field public static final nickname_changed:I = 0x7f120f72
+.field public static final mutual_friends:I = 0x7f120f72
 
-.field public static final nickname_cleared:I = 0x7f120f73
+.field public static final mutual_guilds:I = 0x7f120f73
 
-.field public static final nl:I = 0x7f120f74
+.field public static final n_days:I = 0x7f120f74
 
-.field public static final no:I = 0x7f120f75
+.field public static final nearby_scan:I = 0x7f120f75
 
-.field public static final no_afk_channel:I = 0x7f120f76
+.field public static final need_account:I = 0x7f120f76
 
-.field public static final no_authorized_apps:I = 0x7f120f77
+.field public static final network_error_bad_request:I = 0x7f120f77
 
-.field public static final no_authorized_apps_note:I = 0x7f120f78
+.field public static final network_error_cloudflare_intermittent:I = 0x7f120f78
 
-.field public static final no_ban_reason:I = 0x7f120f79
+.field public static final network_error_cloudflare_unauthorized:I = 0x7f120f79
 
-.field public static final no_bans:I = 0x7f120f7a
+.field public static final network_error_connection:I = 0x7f120f7a
 
-.field public static final no_camera_access:I = 0x7f120f7b
+.field public static final network_error_forbidden:I = 0x7f120f7b
 
-.field public static final no_camera_body:I = 0x7f120f7c
+.field public static final network_error_request_too_large:I = 0x7f120f7c
 
-.field public static final no_camera_title:I = 0x7f120f7d
+.field public static final network_error_rest_request:I = 0x7f120f7d
 
-.field public static final no_category:I = 0x7f120f7e
+.field public static final network_error_ssl:I = 0x7f120f7e
 
-.field public static final no_emoji:I = 0x7f120f7f
+.field public static final network_error_unauthorized:I = 0x7f120f7f
 
-.field public static final no_emoji_body:I = 0x7f120f80
+.field public static final network_error_unknown:I = 0x7f120f80
 
-.field public static final no_emoji_search_results:I = 0x7f120f81
+.field public static final network_offline:I = 0x7f120f81
 
-.field public static final no_emoji_title:I = 0x7f120f82
+.field public static final never_ask_again:I = 0x7f120f82
 
-.field public static final no_gif_favorites_flavor_favorite_please:I = 0x7f120f83
+.field public static final nevermind:I = 0x7f120f83
 
-.field public static final no_gif_favorites_flavor_still_here:I = 0x7f120f84
+.field public static final new_dm:I = 0x7f120f84
 
-.field public static final no_gif_favorites_go_favorite:I = 0x7f120f85
+.field public static final new_group_dm:I = 0x7f120f85
 
-.field public static final no_gif_favorites_how_to_favorite:I = 0x7f120f86
+.field public static final new_guilds_dm_allowed:I = 0x7f120f86
 
-.field public static final no_gif_favorites_where_to_favorite:I = 0x7f120f87
+.field public static final new_member_retention_info:I = 0x7f120f87
 
-.field public static final no_gif_search_results:I = 0x7f120f88
+.field public static final new_mentions:I = 0x7f120f88
 
-.field public static final no_gif_search_results_with_related_search:I = 0x7f120f89
+.field public static final new_messages:I = 0x7f120f89
 
-.field public static final no_gif_search_results_without_related_search:I = 0x7f120f8a
+.field public static final new_messages_divider:I = 0x7f120f8a
 
-.field public static final no_input_devices:I = 0x7f120f8b
+.field public static final new_messages_estimated:I = 0x7f120f8b
 
-.field public static final no_input_monitoring_access:I = 0x7f120f8c
+.field public static final new_messages_estimated_with_date:I = 0x7f120f8c
 
-.field public static final no_instant_invite:I = 0x7f120f8d
+.field public static final new_messages_with_date:I = 0x7f120f8d
 
-.field public static final no_integrations:I = 0x7f120f8e
+.field public static final new_override:I = 0x7f120f8e
 
-.field public static final no_integrations_body:I = 0x7f120f8f
+.field public static final new_permission:I = 0x7f120f8f
 
-.field public static final no_integrations_label:I = 0x7f120f90
+.field public static final new_terms_ack:I = 0x7f120f90
 
-.field public static final no_invites_body:I = 0x7f120f91
+.field public static final new_terms_continue:I = 0x7f120f91
 
-.field public static final no_invites_caption:I = 0x7f120f92
+.field public static final new_terms_description:I = 0x7f120f92
 
-.field public static final no_invites_label:I = 0x7f120f93
+.field public static final new_terms_title:I = 0x7f120f93
 
-.field public static final no_mic_body:I = 0x7f120f94
+.field public static final new_unreads:I = 0x7f120f94
 
-.field public static final no_mic_title:I = 0x7f120f95
+.field public static final news_channel:I = 0x7f120f95
 
-.field public static final no_micrphone_access:I = 0x7f120f96
+.field public static final news_channel_publish:I = 0x7f120f96
 
-.field public static final no_mutual_friends:I = 0x7f120f97
+.field public static final news_channel_publish_bump:I = 0x7f120f97
 
-.field public static final no_mutual_guilds:I = 0x7f120f98
+.field public static final news_channel_publish_bump_hide_permanently:I = 0x7f120f98
 
-.field public static final no_output_devices:I = 0x7f120f99
+.field public static final news_channel_published:I = 0x7f120f99
 
-.field public static final no_photos_access:I = 0x7f120f9a
+.field public static final next:I = 0x7f120f9a
 
-.field public static final no_pins_in_channel:I = 0x7f120f9b
+.field public static final nickname:I = 0x7f120f9b
 
-.field public static final no_pins_in_dm:I = 0x7f120f9c
+.field public static final nickname_changed:I = 0x7f120f9c
 
-.field public static final no_private_channels_description:I = 0x7f120f9d
+.field public static final nickname_cleared:I = 0x7f120f9d
 
-.field public static final no_private_channels_title:I = 0x7f120f9e
+.field public static final nl:I = 0x7f120f9e
 
-.field public static final no_reactions_body:I = 0x7f120f9f
+.field public static final no:I = 0x7f120f9f
 
-.field public static final no_reactions_header:I = 0x7f120fa0
+.field public static final no_afk_channel:I = 0x7f120fa0
 
-.field public static final no_recent_mentions:I = 0x7f120fa1
+.field public static final no_authorized_apps:I = 0x7f120fa1
 
-.field public static final no_send_messages_permission_placeholder:I = 0x7f120fa2
+.field public static final no_authorized_apps_note:I = 0x7f120fa2
 
-.field public static final no_system_channel:I = 0x7f120fa3
+.field public static final no_ban_reason:I = 0x7f120fa3
 
-.field public static final no_text:I = 0x7f120fa4
+.field public static final no_bans:I = 0x7f120fa4
 
-.field public static final no_thanks:I = 0x7f120fa5
+.field public static final no_camera_access:I = 0x7f120fa5
 
-.field public static final no_user_limit:I = 0x7f120fa6
+.field public static final no_camera_body:I = 0x7f120fa6
 
-.field public static final no_video_devices:I = 0x7f120fa7
+.field public static final no_camera_title:I = 0x7f120fa7
 
-.field public static final no_video_permission_dialog_body:I = 0x7f120fa8
+.field public static final no_category:I = 0x7f120fa8
 
-.field public static final no_video_permission_dialog_title:I = 0x7f120fa9
+.field public static final no_emoji:I = 0x7f120fa9
 
-.field public static final noise_cancellation_off:I = 0x7f120faa
+.field public static final no_emoji_body:I = 0x7f120faa
 
-.field public static final noise_cancellation_on:I = 0x7f120fab
+.field public static final no_emoji_search_results:I = 0x7f120fab
 
-.field public static final noise_cancellation_popout_description:I = 0x7f120fac
+.field public static final no_emoji_title:I = 0x7f120fac
 
-.field public static final noise_cancellation_popout_footer:I = 0x7f120fad
+.field public static final no_gif_favorites_flavor_favorite_please:I = 0x7f120fad
 
-.field public static final noise_cancellation_popout_header:I = 0x7f120fae
+.field public static final no_gif_favorites_flavor_still_here:I = 0x7f120fae
 
-.field public static final noise_cancellation_popout_mic_test_title:I = 0x7f120faf
+.field public static final no_gif_favorites_go_favorite:I = 0x7f120faf
 
-.field public static final noise_cancellation_popout_stop:I = 0x7f120fb0
+.field public static final no_gif_favorites_how_to_favorite:I = 0x7f120fb0
 
-.field public static final noise_cancellation_popout_test:I = 0x7f120fb1
+.field public static final no_gif_favorites_where_to_favorite:I = 0x7f120fb1
 
-.field public static final noise_cancellation_tooltip:I = 0x7f120fb2
+.field public static final no_gif_search_results:I = 0x7f120fb2
 
-.field public static final noise_suppression:I = 0x7f120fb3
+.field public static final no_gif_search_results_with_related_search:I = 0x7f120fb3
 
-.field public static final none:I = 0x7f120fb4
+.field public static final no_gif_search_results_without_related_search:I = 0x7f120fb4
 
-.field public static final not_available:I = 0x7f120fb5
+.field public static final no_input_devices:I = 0x7f120fb5
 
-.field public static final not_in_the_voice_channel:I = 0x7f120fb6
+.field public static final no_input_monitoring_access:I = 0x7f120fb6
 
-.field public static final not_set:I = 0x7f120fb7
+.field public static final no_instant_invite:I = 0x7f120fb7
 
-.field public static final note:I = 0x7f120fb8
+.field public static final no_integrations:I = 0x7f120fb8
 
-.field public static final note_placeholder:I = 0x7f120fb9
+.field public static final no_integrations_body:I = 0x7f120fb9
 
-.field public static final note_placeholder_mobile:I = 0x7f120fba
+.field public static final no_integrations_label:I = 0x7f120fba
 
-.field public static final notice_application_test_mode:I = 0x7f120fbb
+.field public static final no_invites_body:I = 0x7f120fbb
 
-.field public static final notice_application_test_mode_go_to_listing:I = 0x7f120fbc
+.field public static final no_invites_caption:I = 0x7f120fbc
 
-.field public static final notice_connect_spotify:I = 0x7f120fbd
+.field public static final no_invites_label:I = 0x7f120fbd
 
-.field public static final notice_connection_conflict:I = 0x7f120fbe
+.field public static final no_mic_body:I = 0x7f120fbe
 
-.field public static final notice_corrupt_installation:I = 0x7f120fbf
+.field public static final no_mic_title:I = 0x7f120fbf
 
-.field public static final notice_corrupt_installation_help_link_text:I = 0x7f120fc0
+.field public static final no_micrphone_access:I = 0x7f120fc0
 
-.field public static final notice_detected_off_platform_no_premium_perk_message:I = 0x7f120fc1
+.field public static final no_mutual_friends:I = 0x7f120fc1
 
-.field public static final notice_detected_off_platform_premium_perk_button:I = 0x7f120fc2
+.field public static final no_mutual_guilds:I = 0x7f120fc2
 
-.field public static final notice_detected_off_platform_premium_perk_message:I = 0x7f120fc3
+.field public static final no_output_devices:I = 0x7f120fc3
 
-.field public static final notice_dispatch_api_error:I = 0x7f120fc4
+.field public static final no_photos_access:I = 0x7f120fc4
 
-.field public static final notice_dispatch_application_lock_failed:I = 0x7f120fc5
+.field public static final no_pins_in_channel:I = 0x7f120fc5
 
-.field public static final notice_dispatch_error:I = 0x7f120fc6
+.field public static final no_pins_in_dm:I = 0x7f120fc6
 
-.field public static final notice_dispatch_error_disk_full:I = 0x7f120fc7
+.field public static final no_private_channels_description:I = 0x7f120fc7
 
-.field public static final notice_dispatch_error_disk_low:I = 0x7f120fc8
+.field public static final no_private_channels_title:I = 0x7f120fc8
 
-.field public static final notice_dispatch_error_file_name_too_long:I = 0x7f120fc9
+.field public static final no_reactions_body:I = 0x7f120fc9
 
-.field public static final notice_dispatch_error_invalid_drive:I = 0x7f120fca
+.field public static final no_reactions_header:I = 0x7f120fca
 
-.field public static final notice_dispatch_error_io_permission_denied:I = 0x7f120fcb
+.field public static final no_recent_mentions:I = 0x7f120fcb
 
-.field public static final notice_dispatch_error_no_manifests:I = 0x7f120fcc
+.field public static final no_send_messages_permission_placeholder:I = 0x7f120fcc
 
-.field public static final notice_dispatch_error_not_entitled:I = 0x7f120fcd
+.field public static final no_system_channel:I = 0x7f120fcd
 
-.field public static final notice_dispatch_error_post_install_cancelled:I = 0x7f120fce
+.field public static final no_text:I = 0x7f120fce
 
-.field public static final notice_dispatch_error_post_install_failed:I = 0x7f120fcf
+.field public static final no_thanks:I = 0x7f120fcf
 
-.field public static final notice_dispatch_error_unwritable:I = 0x7f120fd0
+.field public static final no_user_limit:I = 0x7f120fd0
 
-.field public static final notice_dispatch_error_with_code:I = 0x7f120fd1
+.field public static final no_video_devices:I = 0x7f120fd1
 
-.field public static final notice_dispatch_install_script_progress:I = 0x7f120fd2
+.field public static final no_video_permission_dialog_body:I = 0x7f120fd2
 
-.field public static final notice_dispatch_install_script_progress_with_name:I = 0x7f120fd3
+.field public static final no_video_permission_dialog_title:I = 0x7f120fd3
 
-.field public static final notice_enable_public_guild_upsell_message:I = 0x7f120fd4
+.field public static final noise_cancellation_off:I = 0x7f120fd4
 
-.field public static final notice_hardware_mute:I = 0x7f120fd5
+.field public static final noise_cancellation_on:I = 0x7f120fd5
 
-.field public static final notice_mfa_sms_backup:I = 0x7f120fd6
+.field public static final noise_cancellation_popout_description:I = 0x7f120fd6
 
-.field public static final notice_mfa_sms_backup_button:I = 0x7f120fd7
+.field public static final noise_cancellation_popout_footer:I = 0x7f120fd7
 
-.field public static final notice_native_apps_2020_06:I = 0x7f120fd8
+.field public static final noise_cancellation_popout_header:I = 0x7f120fd8
 
-.field public static final notice_no_input_detected:I = 0x7f120fd9
+.field public static final noise_cancellation_popout_mic_test_title:I = 0x7f120fd9
 
-.field public static final notice_no_input_detected_help_link_text:I = 0x7f120fda
+.field public static final noise_cancellation_popout_stop:I = 0x7f120fda
 
-.field public static final notice_no_input_detected_settings:I = 0x7f120fdb
+.field public static final noise_cancellation_popout_test:I = 0x7f120fdb
 
-.field public static final notice_no_input_detected_settings_link_text:I = 0x7f120fdc
+.field public static final noise_cancellation_tooltip:I = 0x7f120fdc
 
-.field public static final notice_notification_message:I = 0x7f120fdd
+.field public static final noise_suppression:I = 0x7f120fdd
 
-.field public static final notice_notification_message2:I = 0x7f120fde
+.field public static final none:I = 0x7f120fde
 
-.field public static final notice_premium_grandfathered_ended:I = 0x7f120fdf
+.field public static final not_available:I = 0x7f120fdf
 
-.field public static final notice_premium_grandfathered_ending:I = 0x7f120fe0
+.field public static final not_in_the_voice_channel:I = 0x7f120fe0
 
-.field public static final notice_premium_grandfathered_monthly_ending:I = 0x7f120fe1
+.field public static final not_set:I = 0x7f120fe1
 
-.field public static final notice_premium_grandfathered_upgrade:I = 0x7f120fe2
+.field public static final note:I = 0x7f120fe2
 
-.field public static final notice_premium_promo_action:I = 0x7f120fe3
+.field public static final note_placeholder:I = 0x7f120fe3
 
-.field public static final notice_premium_promo_message:I = 0x7f120fe4
+.field public static final note_placeholder_mobile:I = 0x7f120fe4
 
-.field public static final notice_premium_xbox_game_pass_promotion:I = 0x7f120fe5
+.field public static final notice_application_test_mode:I = 0x7f120fe5
 
-.field public static final notice_premium_xbox_game_pass_promotion_redeem:I = 0x7f120fe6
+.field public static final notice_application_test_mode_go_to_listing:I = 0x7f120fe6
 
-.field public static final notice_scheduled_maintenance:I = 0x7f120fe7
+.field public static final notice_connect_spotify:I = 0x7f120fe7
 
-.field public static final notice_spotify_auto_paused:I = 0x7f120fe8
+.field public static final notice_connection_conflict:I = 0x7f120fe8
 
-.field public static final notice_streamer_mode_text:I = 0x7f120fe9
+.field public static final notice_corrupt_installation:I = 0x7f120fe9
 
-.field public static final notice_survey_body:I = 0x7f120fea
+.field public static final notice_corrupt_installation_help_link_text:I = 0x7f120fea
 
-.field public static final notice_survey_button:I = 0x7f120feb
+.field public static final notice_detected_off_platform_no_premium_perk_message:I = 0x7f120feb
 
-.field public static final notice_survey_prompt:I = 0x7f120fec
+.field public static final notice_detected_off_platform_premium_perk_button:I = 0x7f120fec
 
-.field public static final notice_unclaimed_account:I = 0x7f120fed
+.field public static final notice_detected_off_platform_premium_perk_message:I = 0x7f120fed
 
-.field public static final notice_unverified_account:I = 0x7f120fee
+.field public static final notice_dispatch_api_error:I = 0x7f120fee
 
-.field public static final notice_whats_this:I = 0x7f120fef
+.field public static final notice_dispatch_application_lock_failed:I = 0x7f120fef
 
-.field public static final notification_accepted_friend_request:I = 0x7f120ff0
+.field public static final notice_dispatch_error:I = 0x7f120ff0
 
-.field public static final notification_body_attachment:I = 0x7f120ff1
+.field public static final notice_dispatch_error_disk_full:I = 0x7f120ff1
 
-.field public static final notification_body_start_game:I = 0x7f120ff2
+.field public static final notice_dispatch_error_disk_low:I = 0x7f120ff2
 
-.field public static final notification_dismiss:I = 0x7f120ff3
+.field public static final notice_dispatch_error_file_name_too_long:I = 0x7f120ff3
 
-.field public static final notification_message_create_dm_activity_join:I = 0x7f120ff4
+.field public static final notice_dispatch_error_invalid_drive:I = 0x7f120ff4
 
-.field public static final notification_message_create_dm_activity_join_request:I = 0x7f120ff5
+.field public static final notice_dispatch_error_io_permission_denied:I = 0x7f120ff5
 
-.field public static final notification_message_create_dm_activity_listen:I = 0x7f120ff6
+.field public static final notice_dispatch_error_no_manifests:I = 0x7f120ff6
 
-.field public static final notification_message_create_group_dm_activity_join:I = 0x7f120ff7
+.field public static final notice_dispatch_error_not_entitled:I = 0x7f120ff7
 
-.field public static final notification_message_create_group_dm_activity_listen:I = 0x7f120ff8
+.field public static final notice_dispatch_error_post_install_cancelled:I = 0x7f120ff8
 
-.field public static final notification_message_create_guild_activity_join:I = 0x7f120ff9
+.field public static final notice_dispatch_error_post_install_failed:I = 0x7f120ff9
 
-.field public static final notification_message_create_guild_activity_listen:I = 0x7f120ffa
+.field public static final notice_dispatch_error_unwritable:I = 0x7f120ffa
 
-.field public static final notification_mute_1_hour:I = 0x7f120ffb
+.field public static final notice_dispatch_error_with_code:I = 0x7f120ffb
 
-.field public static final notification_overrides:I = 0x7f120ffc
+.field public static final notice_dispatch_install_script_progress:I = 0x7f120ffc
 
-.field public static final notification_pending_friend_request:I = 0x7f120ffd
+.field public static final notice_dispatch_install_script_progress_with_name:I = 0x7f120ffd
 
-.field public static final notification_reply:I = 0x7f120ffe
+.field public static final notice_enable_public_guild_upsell_message:I = 0x7f120ffe
 
-.field public static final notification_reply_failed:I = 0x7f120fff
+.field public static final notice_hardware_mute:I = 0x7f120fff
 
-.field public static final notification_reply_success:I = 0x7f121000
+.field public static final notice_mfa_sms_backup:I = 0x7f121000
 
-.field public static final notification_settings:I = 0x7f121001
+.field public static final notice_mfa_sms_backup_button:I = 0x7f121001
 
-.field public static final notification_title_discord:I = 0x7f121002
+.field public static final notice_native_apps_2020_06:I = 0x7f121002
 
-.field public static final notification_title_start_game:I = 0x7f121003
+.field public static final notice_no_input_detected:I = 0x7f121003
 
-.field public static final notifications:I = 0x7f121004
+.field public static final notice_no_input_detected_help_link_text:I = 0x7f121004
 
-.field public static final notifications_muted:I = 0x7f121005
+.field public static final notice_no_input_detected_settings:I = 0x7f121005
 
-.field public static final notifications_nuf_body:I = 0x7f121006
+.field public static final notice_no_input_detected_settings_link_text:I = 0x7f121006
 
-.field public static final notifications_nuf_cta:I = 0x7f121007
+.field public static final notice_notification_message:I = 0x7f121007
 
-.field public static final notifications_nuf_title:I = 0x7f121008
+.field public static final notice_notification_message2:I = 0x7f121008
 
-.field public static final now_playing_gdpr_body:I = 0x7f121009
+.field public static final notice_premium_grandfathered_ended:I = 0x7f121009
 
-.field public static final now_playing_gdpr_header:I = 0x7f12100a
+.field public static final notice_premium_grandfathered_ending:I = 0x7f12100a
 
-.field public static final nsfw_accept:I = 0x7f12100b
+.field public static final notice_premium_grandfathered_monthly_ending:I = 0x7f12100b
 
-.field public static final nsfw_decline:I = 0x7f12100c
+.field public static final notice_premium_grandfathered_upgrade:I = 0x7f12100c
 
-.field public static final nsfw_description:I = 0x7f12100d
+.field public static final notice_premium_promo_action:I = 0x7f12100d
 
-.field public static final nsfw_title:I = 0x7f12100e
+.field public static final notice_premium_promo_message:I = 0x7f12100e
 
-.field public static final nuf_age_gate_body:I = 0x7f12100f
+.field public static final notice_premium_xbox_game_pass_promotion:I = 0x7f12100f
 
-.field public static final nuf_body:I = 0x7f121010
+.field public static final notice_premium_xbox_game_pass_promotion_redeem:I = 0x7f121010
 
-.field public static final nuf_body_mobile:I = 0x7f121011
+.field public static final notice_scheduled_maintenance:I = 0x7f121011
 
-.field public static final nuf_body_refresh:I = 0x7f121012
+.field public static final notice_spotify_auto_paused:I = 0x7f121012
 
-.field public static final nuf_channel_prompt_channel_topic_template:I = 0x7f121013
+.field public static final notice_streamer_mode_text:I = 0x7f121013
 
-.field public static final nuf_channel_prompt_cta:I = 0x7f121014
+.field public static final notice_survey_body:I = 0x7f121014
 
-.field public static final nuf_channel_prompt_subtitle:I = 0x7f121015
+.field public static final notice_survey_button:I = 0x7f121015
 
-.field public static final nuf_channel_prompt_title:I = 0x7f121016
+.field public static final notice_survey_prompt:I = 0x7f121016
 
-.field public static final nuf_channel_prompt_topic:I = 0x7f121017
+.field public static final notice_unclaimed_account:I = 0x7f121017
 
-.field public static final nuf_channel_prompt_topic_placeholder:I = 0x7f121018
+.field public static final notice_unverified_account:I = 0x7f121018
 
-.field public static final nuf_channels_cta_label:I = 0x7f121019
+.field public static final notice_whats_this:I = 0x7f121019
 
-.field public static final nuf_channels_description:I = 0x7f12101a
+.field public static final notification_accepted_friend_request:I = 0x7f12101a
 
-.field public static final nuf_channels_title:I = 0x7f12101b
+.field public static final notification_body_attachment:I = 0x7f12101b
 
-.field public static final nuf_chat_with_friends:I = 0x7f12101c
+.field public static final notification_body_start_game:I = 0x7f12101c
 
-.field public static final nuf_claim_account_body_1:I = 0x7f12101d
+.field public static final notification_dismiss:I = 0x7f12101d
 
-.field public static final nuf_claim_account_body_2:I = 0x7f12101e
+.field public static final notification_message_create_dm_activity_join:I = 0x7f12101e
 
-.field public static final nuf_claim_account_button:I = 0x7f12101f
+.field public static final notification_message_create_dm_activity_join_request:I = 0x7f12101f
 
-.field public static final nuf_claim_account_generic_error:I = 0x7f121020
+.field public static final notification_message_create_dm_activity_listen:I = 0x7f121020
 
-.field public static final nuf_claim_account_title:I = 0x7f121021
+.field public static final notification_message_create_group_dm_activity_join:I = 0x7f121021
 
-.field public static final nuf_club_or_interest_group:I = 0x7f121022
+.field public static final notification_message_create_group_dm_activity_listen:I = 0x7f121022
 
-.field public static final nuf_complete_cta:I = 0x7f121023
+.field public static final notification_message_create_guild_activity_join:I = 0x7f121023
 
-.field public static final nuf_complete_title:I = 0x7f121024
+.field public static final notification_message_create_guild_activity_listen:I = 0x7f121024
 
-.field public static final nuf_create_server_body:I = 0x7f121025
+.field public static final notification_mute_1_hour:I = 0x7f121025
 
-.field public static final nuf_create_server_button:I = 0x7f121026
+.field public static final notification_overrides:I = 0x7f121026
 
-.field public static final nuf_create_server_customize_header:I = 0x7f121027
+.field public static final notification_pending_friend_request:I = 0x7f121027
 
-.field public static final nuf_create_server_customize_subheader:I = 0x7f121028
+.field public static final notification_reply:I = 0x7f121028
 
-.field public static final nuf_create_server_error:I = 0x7f121029
+.field public static final notification_reply_failed:I = 0x7f121029
 
-.field public static final nuf_create_server_header:I = 0x7f12102a
+.field public static final notification_reply_success:I = 0x7f12102a
 
-.field public static final nuf_create_server_note_guidelines:I = 0x7f12102b
+.field public static final notification_settings:I = 0x7f12102b
 
-.field public static final nuf_create_server_protip:I = 0x7f12102c
+.field public static final notification_title_discord:I = 0x7f12102c
 
-.field public static final nuf_create_server_title:I = 0x7f12102d
+.field public static final notification_title_start_game:I = 0x7f12102d
 
-.field public static final nuf_desktop_templates_subtitle:I = 0x7f12102e
+.field public static final notifications:I = 0x7f12102e
 
-.field public static final nuf_desktop_templates_title:I = 0x7f12102f
+.field public static final notifications_muted:I = 0x7f12102f
 
-.field public static final nuf_download_app_body:I = 0x7f121030
+.field public static final notifications_nuf_body:I = 0x7f121030
 
-.field public static final nuf_download_app_button_platform:I = 0x7f121031
+.field public static final notifications_nuf_cta:I = 0x7f121031
 
-.field public static final nuf_download_app_button_type:I = 0x7f121032
+.field public static final notifications_nuf_title:I = 0x7f121032
 
-.field public static final nuf_download_app_intro:I = 0x7f121033
+.field public static final now_playing_gdpr_body:I = 0x7f121033
 
-.field public static final nuf_download_app_title:I = 0x7f121034
+.field public static final now_playing_gdpr_header:I = 0x7f121034
 
-.field public static final nuf_gaming_community:I = 0x7f121035
+.field public static final nsfw_accept:I = 0x7f121035
 
-.field public static final nuf_get_started:I = 0x7f121036
+.field public static final nsfw_decline:I = 0x7f121036
 
-.field public static final nuf_have_an_invite_already:I = 0x7f121037
+.field public static final nsfw_description:I = 0x7f121037
 
-.field public static final nuf_join_a_friend:I = 0x7f121038
+.field public static final nsfw_title:I = 0x7f121038
 
-.field public static final nuf_join_server_body_1:I = 0x7f121039
+.field public static final nuf_age_gate_body:I = 0x7f121039
 
-.field public static final nuf_join_server_body_2:I = 0x7f12103a
+.field public static final nuf_body:I = 0x7f12103a
 
-.field public static final nuf_join_server_button:I = 0x7f12103b
+.field public static final nuf_body_mobile:I = 0x7f12103b
 
-.field public static final nuf_join_server_input_label:I = 0x7f12103c
+.field public static final nuf_body_refresh:I = 0x7f12103c
 
-.field public static final nuf_join_server_input_note:I = 0x7f12103d
+.field public static final nuf_channel_prompt_channel_topic_template:I = 0x7f12103d
 
-.field public static final nuf_join_server_title_1:I = 0x7f12103e
+.field public static final nuf_channel_prompt_cta:I = 0x7f12103e
 
-.field public static final nuf_join_server_title_2:I = 0x7f12103f
+.field public static final nuf_channel_prompt_subtitle:I = 0x7f12103f
 
-.field public static final nuf_just_look_around:I = 0x7f121040
+.field public static final nuf_channel_prompt_title:I = 0x7f121040
 
-.field public static final nuf_title_mobile:I = 0x7f121041
+.field public static final nuf_channel_prompt_topic:I = 0x7f121041
 
-.field public static final nuf_voice_channels_description:I = 0x7f121042
+.field public static final nuf_channel_prompt_topic_placeholder:I = 0x7f121042
 
-.field public static final nuf_voice_channels_title:I = 0x7f121043
+.field public static final nuf_channels_cta_label:I = 0x7f121043
 
-.field public static final nuf_voice_chat_while_gaming:I = 0x7f121044
+.field public static final nuf_channels_description:I = 0x7f121044
 
-.field public static final nuf_welcome_body:I = 0x7f121045
+.field public static final nuf_channels_title:I = 0x7f121045
 
-.field public static final nuf_welcome_carousel_1_body_mobile:I = 0x7f121046
+.field public static final nuf_chat_with_friends:I = 0x7f121046
 
-.field public static final nuf_welcome_carousel_1_title_mobile:I = 0x7f121047
+.field public static final nuf_claim_account_body_1:I = 0x7f121047
 
-.field public static final nuf_welcome_carousel_2_body_mobile:I = 0x7f121048
+.field public static final nuf_claim_account_body_2:I = 0x7f121048
 
-.field public static final nuf_welcome_carousel_2_title_mobile:I = 0x7f121049
+.field public static final nuf_claim_account_button:I = 0x7f121049
 
-.field public static final nuf_welcome_carousel_3_body_mobile:I = 0x7f12104a
+.field public static final nuf_claim_account_generic_error:I = 0x7f12104a
 
-.field public static final nuf_welcome_carousel_3_title_mobile:I = 0x7f12104b
+.field public static final nuf_claim_account_title:I = 0x7f12104b
 
-.field public static final nuf_welcome_carousel_4_body_mobile:I = 0x7f12104c
+.field public static final nuf_club_or_interest_group:I = 0x7f12104c
 
-.field public static final nuf_welcome_carousel_4_title_mobile:I = 0x7f12104d
+.field public static final nuf_complete_cta:I = 0x7f12104d
 
-.field public static final nuf_welcome_carousel_5_body_mobile:I = 0x7f12104e
+.field public static final nuf_complete_title:I = 0x7f12104e
 
-.field public static final nuf_welcome_carousel_5_title_mobile:I = 0x7f12104f
+.field public static final nuf_create_server_body:I = 0x7f12104f
 
-.field public static final nuf_what_do_you_want:I = 0x7f121050
+.field public static final nuf_create_server_button:I = 0x7f121050
 
-.field public static final num_active_threads:I = 0x7f121051
+.field public static final nuf_create_server_customize_header:I = 0x7f121051
 
-.field public static final num_channels:I = 0x7f121052
+.field public static final nuf_create_server_customize_subheader:I = 0x7f121052
 
-.field public static final num_members:I = 0x7f121053
+.field public static final nuf_create_server_error:I = 0x7f121053
 
-.field public static final num_subscribers:I = 0x7f121054
+.field public static final nuf_create_server_header:I = 0x7f121054
 
-.field public static final num_users:I = 0x7f121055
+.field public static final nuf_create_server_note_guidelines:I = 0x7f121055
 
-.field public static final numbers_only:I = 0x7f121056
+.field public static final nuf_create_server_protip:I = 0x7f121056
 
-.field public static final nux_navigation_help_channels:I = 0x7f121057
+.field public static final nuf_create_server_title:I = 0x7f121057
 
-.field public static final nux_navigation_help_dms:I = 0x7f121058
+.field public static final nuf_desktop_templates_subtitle:I = 0x7f121058
 
-.field public static final nux_navigation_help_guild:I = 0x7f121059
+.field public static final nuf_desktop_templates_title:I = 0x7f121059
 
-.field public static final nux_overlay_description:I = 0x7f12105a
+.field public static final nuf_download_app_body:I = 0x7f12105a
 
-.field public static final nux_overlay_enable:I = 0x7f12105b
+.field public static final nuf_download_app_button_platform:I = 0x7f12105b
 
-.field public static final nux_overlay_title:I = 0x7f12105c
+.field public static final nuf_download_app_button_type:I = 0x7f12105c
 
-.field public static final nux_post_reg_join_server_description:I = 0x7f12105d
+.field public static final nuf_download_app_intro:I = 0x7f12105d
 
-.field public static final nux_post_reg_join_server_skip:I = 0x7f12105e
+.field public static final nuf_download_app_title:I = 0x7f12105e
 
-.field public static final nux_post_reg_join_server_title:I = 0x7f12105f
+.field public static final nuf_gaming_community:I = 0x7f12105f
 
-.field public static final nux_samsung_game_presence_link_description:I = 0x7f121060
+.field public static final nuf_get_started:I = 0x7f121060
 
-.field public static final nux_samsung_game_presence_link_enable:I = 0x7f121061
+.field public static final nuf_have_an_invite_already:I = 0x7f121061
 
-.field public static final nux_samsung_game_presence_link_title:I = 0x7f121062
+.field public static final nuf_join_a_friend:I = 0x7f121062
 
-.field public static final oauth2_add_bot:I = 0x7f121063
+.field public static final nuf_join_server_body_1:I = 0x7f121063
 
-.field public static final oauth2_add_webhook_incoming:I = 0x7f121064
+.field public static final nuf_join_server_body_2:I = 0x7f121064
 
-.field public static final oauth2_can_read_notice:I = 0x7f121065
+.field public static final nuf_join_server_button:I = 0x7f121065
 
-.field public static final oauth2_cannot_read_send_notice:I = 0x7f121066
+.field public static final nuf_join_server_input_label:I = 0x7f121066
 
-.field public static final oauth2_confirm_bot_permissions:I = 0x7f121067
+.field public static final nuf_join_server_input_note:I = 0x7f121067
 
-.field public static final oauth2_connect_to_discord:I = 0x7f121068
+.field public static final nuf_join_server_title_1:I = 0x7f121068
 
-.field public static final oauth2_details_creation_date:I = 0x7f121069
+.field public static final nuf_join_server_title_2:I = 0x7f121069
 
-.field public static final oauth2_details_guilds:I = 0x7f12106a
+.field public static final nuf_just_look_around:I = 0x7f12106a
 
-.field public static final oauth2_details_redirect:I = 0x7f12106b
+.field public static final nuf_title_mobile:I = 0x7f12106b
 
-.field public static final oauth2_disabled_permissions:I = 0x7f12106c
+.field public static final nuf_voice_channels_description:I = 0x7f12106c
 
-.field public static final oauth2_fake_scope_1:I = 0x7f12106d
+.field public static final nuf_voice_channels_title:I = 0x7f12106d
 
-.field public static final oauth2_fake_scope_2:I = 0x7f12106e
+.field public static final nuf_voice_chat_while_gaming:I = 0x7f12106e
 
-.field public static final oauth2_fake_scope_3:I = 0x7f12106f
+.field public static final nuf_welcome_body:I = 0x7f12106f
 
-.field public static final oauth2_fake_scope_4:I = 0x7f121070
+.field public static final nuf_welcome_carousel_1_body_mobile:I = 0x7f121070
 
-.field public static final oauth2_fake_scope_5:I = 0x7f121071
+.field public static final nuf_welcome_carousel_1_title_mobile:I = 0x7f121071
 
-.field public static final oauth2_fake_scope_6:I = 0x7f121072
+.field public static final nuf_welcome_carousel_2_body_mobile:I = 0x7f121072
 
-.field public static final oauth2_fake_scope_7:I = 0x7f121073
+.field public static final nuf_welcome_carousel_2_title_mobile:I = 0x7f121073
 
-.field public static final oauth2_fake_scope_8:I = 0x7f121074
+.field public static final nuf_welcome_carousel_3_body_mobile:I = 0x7f121074
 
-.field public static final oauth2_logout:I = 0x7f121075
+.field public static final nuf_welcome_carousel_3_title_mobile:I = 0x7f121075
 
-.field public static final oauth2_message_cta:I = 0x7f121076
+.field public static final nuf_welcome_carousel_4_body_mobile:I = 0x7f121076
 
-.field public static final oauth2_request_invalid_scope:I = 0x7f121077
+.field public static final nuf_welcome_carousel_4_title_mobile:I = 0x7f121077
 
-.field public static final oauth2_request_missing_param:I = 0x7f121078
+.field public static final nuf_welcome_carousel_5_body_mobile:I = 0x7f121078
 
-.field public static final oauth2_requests_account_access:I = 0x7f121079
+.field public static final nuf_welcome_carousel_5_title_mobile:I = 0x7f121079
 
-.field public static final oauth2_scopes_label:I = 0x7f12107a
+.field public static final nuf_what_do_you_want:I = 0x7f12107a
 
-.field public static final oauth2_signed_in_as:I = 0x7f12107b
+.field public static final num_active_threads:I = 0x7f12107b
 
-.field public static final oauth2_title:I = 0x7f12107c
+.field public static final num_channels:I = 0x7f12107c
 
-.field public static final oauth2_unknown_error:I = 0x7f12107d
+.field public static final num_members:I = 0x7f12107d
 
-.field public static final okay:I = 0x7f12107e
+.field public static final num_subscribers:I = 0x7f12107e
 
-.field public static final one_user_typing:I = 0x7f12107f
+.field public static final num_users:I = 0x7f12107f
 
-.field public static final ongoing_call:I = 0x7f121080
+.field public static final numbers_only:I = 0x7f121080
 
-.field public static final ongoing_call_connected_users:I = 0x7f121081
+.field public static final nux_navigation_help_channels:I = 0x7f121081
 
-.field public static final ongoing_call_tap_to_join:I = 0x7f121082
+.field public static final nux_navigation_help_dms:I = 0x7f121082
 
-.field public static final ongoing_call_voice_quality_low:I = 0x7f121083
+.field public static final nux_navigation_help_guild:I = 0x7f121083
 
-.field public static final ongoing_call_you_are_all_alone:I = 0x7f121084
+.field public static final nux_overlay_description:I = 0x7f121084
 
-.field public static final only_you_can_see_and_delete_these:I = 0x7f121085
+.field public static final nux_overlay_enable:I = 0x7f121085
 
-.field public static final open:I = 0x7f121086
+.field public static final nux_overlay_title:I = 0x7f121086
 
-.field public static final open_connection_replay:I = 0x7f121087
+.field public static final nux_post_reg_join_server_description:I = 0x7f121087
 
-.field public static final open_in_browser:I = 0x7f121088
+.field public static final nux_post_reg_join_server_skip:I = 0x7f121088
 
-.field public static final open_in_theater:I = 0x7f121089
+.field public static final nux_post_reg_join_server_title:I = 0x7f121089
 
-.field public static final open_link:I = 0x7f12108a
+.field public static final nux_samsung_game_presence_link_description:I = 0x7f12108a
 
-.field public static final open_navigation:I = 0x7f12108b
+.field public static final nux_samsung_game_presence_link_enable:I = 0x7f12108b
 
-.field public static final open_original_image:I = 0x7f12108c
+.field public static final nux_samsung_game_presence_link_title:I = 0x7f12108c
 
-.field public static final open_standard_keyboard_accessibility_label:I = 0x7f12108d
+.field public static final oauth2_add_bot:I = 0x7f12108d
 
-.field public static final options:I = 0x7f12108e
+.field public static final oauth2_add_webhook_incoming:I = 0x7f12108e
 
-.field public static final orange:I = 0x7f12108f
+.field public static final oauth2_can_read_notice:I = 0x7f12108f
 
-.field public static final other_options:I = 0x7f121090
+.field public static final oauth2_cannot_read_send_notice:I = 0x7f121090
 
-.field public static final other_reactions:I = 0x7f121091
+.field public static final oauth2_confirm_bot_permissions:I = 0x7f121091
 
-.field public static final others_online:I = 0x7f121092
+.field public static final oauth2_connect_to_discord:I = 0x7f121092
 
-.field public static final out_of_date_action:I = 0x7f121093
+.field public static final oauth2_details_creation_date:I = 0x7f121093
 
-.field public static final out_of_date_description:I = 0x7f121094
+.field public static final oauth2_details_guilds:I = 0x7f121094
 
-.field public static final out_of_date_title:I = 0x7f121095
+.field public static final oauth2_details_redirect:I = 0x7f121095
 
-.field public static final outgoing_friend_request:I = 0x7f121096
+.field public static final oauth2_disabled_permissions:I = 0x7f121096
 
-.field public static final outgoing_friend_request_delete_msg:I = 0x7f121097
+.field public static final oauth2_fake_scope_1:I = 0x7f121097
 
-.field public static final output_device:I = 0x7f121098
+.field public static final oauth2_fake_scope_2:I = 0x7f121098
 
-.field public static final overlay:I = 0x7f121099
+.field public static final oauth2_fake_scope_3:I = 0x7f121099
 
-.field public static final overlay_actions_menu_label:I = 0x7f12109a
+.field public static final oauth2_fake_scope_4:I = 0x7f12109a
 
-.field public static final overlay_channel_chat_hotkey:I = 0x7f12109b
+.field public static final oauth2_fake_scope_5:I = 0x7f12109b
 
-.field public static final overlay_click_to_jump_to_channel:I = 0x7f12109c
+.field public static final oauth2_fake_scope_6:I = 0x7f12109c
 
-.field public static final overlay_click_to_unlock:I = 0x7f12109d
+.field public static final oauth2_fake_scope_7:I = 0x7f12109d
 
-.field public static final overlay_crashed_title:I = 0x7f12109e
+.field public static final oauth2_fake_scope_8:I = 0x7f12109e
 
-.field public static final overlay_explanation:I = 0x7f12109f
+.field public static final oauth2_logout:I = 0x7f12109f
 
-.field public static final overlay_friend_calling:I = 0x7f1210a0
+.field public static final oauth2_message_cta:I = 0x7f1210a0
 
-.field public static final overlay_in_game_preview_header:I = 0x7f1210a1
+.field public static final oauth2_request_invalid_scope:I = 0x7f1210a1
 
-.field public static final overlay_launch_open_tip:I = 0x7f1210a2
+.field public static final oauth2_request_missing_param:I = 0x7f1210a2
 
-.field public static final overlay_launch_title:I = 0x7f1210a3
+.field public static final oauth2_requests_account_access:I = 0x7f1210a3
 
-.field public static final overlay_link_alert_body:I = 0x7f1210a4
+.field public static final oauth2_scopes_label:I = 0x7f1210a4
 
-.field public static final overlay_link_alert_secondary:I = 0x7f1210a5
+.field public static final oauth2_signed_in_as:I = 0x7f1210a5
 
-.field public static final overlay_link_alert_title:I = 0x7f1210a6
+.field public static final oauth2_title:I = 0x7f1210a6
 
-.field public static final overlay_menu_get_invite:I = 0x7f1210a7
+.field public static final oauth2_unknown_error:I = 0x7f1210a7
 
-.field public static final overlay_menu_open_discord:I = 0x7f1210a8
+.field public static final okay:I = 0x7f1210a8
 
-.field public static final overlay_menu_switch_channels:I = 0x7f1210a9
+.field public static final one_user_typing:I = 0x7f1210a9
 
-.field public static final overlay_mobile_required:I = 0x7f1210aa
+.field public static final ongoing_call:I = 0x7f1210aa
 
-.field public static final overlay_mobile_toggle_desc:I = 0x7f1210ab
+.field public static final ongoing_call_connected_users:I = 0x7f1210ab
 
-.field public static final overlay_mobile_toggle_label:I = 0x7f1210ac
+.field public static final ongoing_call_tap_to_join:I = 0x7f1210ac
 
-.field public static final overlay_mobile_unauthed:I = 0x7f1210ad
+.field public static final ongoing_call_voice_quality_low:I = 0x7f1210ad
 
-.field public static final overlay_news_go_live_body:I = 0x7f1210ae
+.field public static final ongoing_call_you_are_all_alone:I = 0x7f1210ae
 
-.field public static final overlay_news_go_live_body_no_voice_channel:I = 0x7f1210af
+.field public static final only_you_can_see_and_delete_these:I = 0x7f1210af
 
-.field public static final overlay_news_go_live_cta:I = 0x7f1210b0
+.field public static final open:I = 0x7f1210b0
 
-.field public static final overlay_no_results:I = 0x7f1210b1
+.field public static final open_connection_replay:I = 0x7f1210b1
 
-.field public static final overlay_notification_incoming_call:I = 0x7f1210b2
+.field public static final open_in_browser:I = 0x7f1210b2
 
-.field public static final overlay_notification_settings_disabled:I = 0x7f1210b3
+.field public static final open_in_theater:I = 0x7f1210b3
 
-.field public static final overlay_notification_settings_position:I = 0x7f1210b4
+.field public static final open_link:I = 0x7f1210b4
 
-.field public static final overlay_notifications_bottom_left:I = 0x7f1210b5
+.field public static final open_navigation:I = 0x7f1210b5
 
-.field public static final overlay_notifications_bottom_right:I = 0x7f1210b6
+.field public static final open_original_image:I = 0x7f1210b6
 
-.field public static final overlay_notifications_disabled:I = 0x7f1210b7
+.field public static final open_standard_keyboard_accessibility_label:I = 0x7f1210b7
 
-.field public static final overlay_notifications_settings:I = 0x7f1210b8
+.field public static final options:I = 0x7f1210b8
 
-.field public static final overlay_notifications_top_left:I = 0x7f1210b9
+.field public static final orange:I = 0x7f1210b9
 
-.field public static final overlay_notifications_top_right:I = 0x7f1210ba
+.field public static final other_options:I = 0x7f1210ba
 
-.field public static final overlay_reload:I = 0x7f1210bb
+.field public static final other_reactions:I = 0x7f1210bb
 
-.field public static final overlay_reset_default_layout:I = 0x7f1210bc
+.field public static final others_online:I = 0x7f1210bc
 
-.field public static final overlay_settings_general_tab:I = 0x7f1210bd
+.field public static final out_of_date_action:I = 0x7f1210bd
 
-.field public static final overlay_settings_title:I = 0x7f1210be
+.field public static final out_of_date_description:I = 0x7f1210be
 
-.field public static final overlay_settings_voice_tab:I = 0x7f1210bf
+.field public static final out_of_date_title:I = 0x7f1210bf
 
-.field public static final overlay_too_small:I = 0x7f1210c0
+.field public static final outgoing_friend_request:I = 0x7f1210c0
 
-.field public static final overlay_unlock_to_answer:I = 0x7f1210c1
+.field public static final outgoing_friend_request_delete_msg:I = 0x7f1210c1
 
-.field public static final overlay_unlock_to_join:I = 0x7f1210c2
+.field public static final output_device:I = 0x7f1210c2
 
-.field public static final overlay_user_chat_hotkey:I = 0x7f1210c3
+.field public static final overlay:I = 0x7f1210c3
 
-.field public static final overlay_widget_hide_in_game:I = 0x7f1210c4
+.field public static final overlay_actions_menu_label:I = 0x7f1210c4
 
-.field public static final overlay_widget_show_in_game:I = 0x7f1210c5
+.field public static final overlay_channel_chat_hotkey:I = 0x7f1210c5
 
-.field public static final overview:I = 0x7f1210c6
+.field public static final overlay_click_to_jump_to_channel:I = 0x7f1210c6
 
-.field public static final overwrite_autocomplete_a11y_label:I = 0x7f1210c7
+.field public static final overlay_click_to_unlock:I = 0x7f1210c7
 
-.field public static final overwrite_autocomplete_label:I = 0x7f1210c8
+.field public static final overlay_crashed_title:I = 0x7f1210c8
 
-.field public static final overwrite_autocomplete_placeholder:I = 0x7f1210c9
+.field public static final overlay_explanation:I = 0x7f1210c9
 
-.field public static final overwrite_no_role_to_add:I = 0x7f1210ca
+.field public static final overlay_friend_calling:I = 0x7f1210ca
 
-.field public static final pagination_next:I = 0x7f1210cb
+.field public static final overlay_in_game_preview_header:I = 0x7f1210cb
 
-.field public static final pagination_page_label:I = 0x7f1210cc
+.field public static final overlay_launch_open_tip:I = 0x7f1210cc
 
-.field public static final pagination_page_of:I = 0x7f1210cd
+.field public static final overlay_launch_title:I = 0x7f1210cd
 
-.field public static final pagination_previous:I = 0x7f1210ce
+.field public static final overlay_link_alert_body:I = 0x7f1210ce
 
-.field public static final paginator_current_page:I = 0x7f1210cf
+.field public static final overlay_link_alert_secondary:I = 0x7f1210cf
 
-.field public static final paginator_of_pages:I = 0x7f1210d0
+.field public static final overlay_link_alert_title:I = 0x7f1210d0
 
-.field public static final partial_outage:I = 0x7f1210d1
+.field public static final overlay_menu_get_invite:I = 0x7f1210d1
 
-.field public static final partial_outage_a11y:I = 0x7f1210d2
+.field public static final overlay_menu_open_discord:I = 0x7f1210d2
 
-.field public static final partner_badge_tooltip:I = 0x7f1210d3
+.field public static final overlay_menu_switch_channels:I = 0x7f1210d3
 
-.field public static final password_length_error:I = 0x7f1210d4
+.field public static final overlay_mobile_required:I = 0x7f1210d4
 
-.field public static final password_manager:I = 0x7f1210d5
+.field public static final overlay_mobile_toggle_desc:I = 0x7f1210d5
 
-.field public static final password_manager_info_android:I = 0x7f1210d6
+.field public static final overlay_mobile_toggle_label:I = 0x7f1210d6
 
-.field public static final password_manager_open_settings:I = 0x7f1210d7
+.field public static final overlay_mobile_unauthed:I = 0x7f1210d7
 
-.field public static final password_manager_open_settings_error:I = 0x7f1210d8
+.field public static final overlay_news_go_live_body:I = 0x7f1210d8
 
-.field public static final password_manager_use:I = 0x7f1210d9
+.field public static final overlay_news_go_live_body_no_voice_channel:I = 0x7f1210d9
 
-.field public static final password_required:I = 0x7f1210da
+.field public static final overlay_news_go_live_cta:I = 0x7f1210da
 
-.field public static final password_toggle_content_description:I = 0x7f1210db
+.field public static final overlay_no_results:I = 0x7f1210db
 
-.field public static final paste:I = 0x7f1210dc
+.field public static final overlay_notification_incoming_call:I = 0x7f1210dc
 
-.field public static final path_password_eye:I = 0x7f1210dd
+.field public static final overlay_notification_settings_disabled:I = 0x7f1210dd
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210de
+.field public static final overlay_notification_settings_position:I = 0x7f1210de
 
-.field public static final path_password_eye_mask_visible:I = 0x7f1210df
+.field public static final overlay_notifications_bottom_left:I = 0x7f1210df
 
-.field public static final path_password_strike_through:I = 0x7f1210e0
+.field public static final overlay_notifications_bottom_right:I = 0x7f1210e0
 
-.field public static final pause:I = 0x7f1210e1
+.field public static final overlay_notifications_disabled:I = 0x7f1210e1
 
-.field public static final payment_authentication_modal_button:I = 0x7f1210e2
+.field public static final overlay_notifications_settings:I = 0x7f1210e2
 
-.field public static final payment_authentication_modal_button_cancel_payment:I = 0x7f1210e3
+.field public static final overlay_notifications_top_left:I = 0x7f1210e3
 
-.field public static final payment_authentication_modal_canceled:I = 0x7f1210e4
+.field public static final overlay_notifications_top_right:I = 0x7f1210e4
 
-.field public static final payment_authentication_modal_fail:I = 0x7f1210e5
+.field public static final overlay_reload:I = 0x7f1210e5
 
-.field public static final payment_authentication_modal_start:I = 0x7f1210e6
+.field public static final overlay_reset_default_layout:I = 0x7f1210e6
 
-.field public static final payment_authentication_modal_success:I = 0x7f1210e7
+.field public static final overlay_settings_general_tab:I = 0x7f1210e7
 
-.field public static final payment_authentication_modal_title:I = 0x7f1210e8
+.field public static final overlay_settings_title:I = 0x7f1210e8
 
-.field public static final payment_authentication_modal_title_canceled:I = 0x7f1210e9
+.field public static final overlay_settings_voice_tab:I = 0x7f1210e9
 
-.field public static final payment_authentication_modal_title_fail:I = 0x7f1210ea
+.field public static final overlay_too_small:I = 0x7f1210ea
 
-.field public static final payment_authentication_modal_title_success:I = 0x7f1210eb
+.field public static final overlay_unlock_to_answer:I = 0x7f1210eb
 
-.field public static final payment_modal_button_premium:I = 0x7f1210ec
+.field public static final overlay_unlock_to_join:I = 0x7f1210ec
 
-.field public static final payment_modal_button_premium_gift:I = 0x7f1210ed
+.field public static final overlay_user_chat_hotkey:I = 0x7f1210ed
 
-.field public static final payment_modal_one_month:I = 0x7f1210ee
+.field public static final overlay_widget_hide_in_game:I = 0x7f1210ee
 
-.field public static final payment_modal_one_year:I = 0x7f1210ef
+.field public static final overlay_widget_show_in_game:I = 0x7f1210ef
 
-.field public static final payment_modal_subtitle_premium_gift:I = 0x7f1210f0
+.field public static final overview:I = 0x7f1210f0
 
-.field public static final payment_price_change_body:I = 0x7f1210f1
+.field public static final overwrite_autocomplete_a11y_label:I = 0x7f1210f1
 
-.field public static final payment_price_change_title:I = 0x7f1210f2
+.field public static final overwrite_autocomplete_label:I = 0x7f1210f2
 
-.field public static final payment_source_card_ending:I = 0x7f1210f3
+.field public static final overwrite_autocomplete_placeholder:I = 0x7f1210f3
 
-.field public static final payment_source_card_ending_in:I = 0x7f1210f4
+.field public static final overwrite_no_role_to_add:I = 0x7f1210f4
 
-.field public static final payment_source_card_expires:I = 0x7f1210f5
+.field public static final pagination_next:I = 0x7f1210f5
 
-.field public static final payment_source_card_number:I = 0x7f1210f6
+.field public static final pagination_page_label:I = 0x7f1210f6
 
-.field public static final payment_source_confirm_paypal_details:I = 0x7f1210f7
+.field public static final pagination_page_of:I = 0x7f1210f7
 
-.field public static final payment_source_credit_card:I = 0x7f1210f8
+.field public static final pagination_previous:I = 0x7f1210f8
 
-.field public static final payment_source_delete:I = 0x7f1210f9
+.field public static final paginator_current_page:I = 0x7f1210f9
 
-.field public static final payment_source_delete_disabled_tooltip:I = 0x7f1210fa
+.field public static final paginator_of_pages:I = 0x7f1210fa
 
-.field public static final payment_source_deleted:I = 0x7f1210fb
+.field public static final partial_outage:I = 0x7f1210fb
 
-.field public static final payment_source_edit_help_card:I = 0x7f1210fc
+.field public static final partial_outage_a11y:I = 0x7f1210fc
 
-.field public static final payment_source_edit_help_paypal:I = 0x7f1210fd
+.field public static final partner_badge_tooltip:I = 0x7f1210fd
 
-.field public static final payment_source_edit_saved:I = 0x7f1210fe
+.field public static final partner_program:I = 0x7f1210fe
 
-.field public static final payment_source_edit_select_state:I = 0x7f1210ff
+.field public static final password_length_error:I = 0x7f1210ff
 
-.field public static final payment_source_edit_title:I = 0x7f121100
+.field public static final password_manager:I = 0x7f121100
 
-.field public static final payment_source_expiration_date_placeholder:I = 0x7f121101
+.field public static final password_manager_info_android:I = 0x7f121101
 
-.field public static final payment_source_information:I = 0x7f121102
+.field public static final password_manager_open_settings:I = 0x7f121102
 
-.field public static final payment_source_invalid:I = 0x7f121103
+.field public static final password_manager_open_settings_error:I = 0x7f121103
 
-.field public static final payment_source_invalid_help:I = 0x7f121104
+.field public static final password_manager_use:I = 0x7f121104
 
-.field public static final payment_source_make_default:I = 0x7f121105
+.field public static final password_required:I = 0x7f121105
 
-.field public static final payment_source_name_error_required:I = 0x7f121106
+.field public static final password_toggle_content_description:I = 0x7f121106
 
-.field public static final payment_source_payment_request_button_generic:I = 0x7f121107
+.field public static final paste:I = 0x7f121107
 
-.field public static final payment_source_payment_request_button_gpay:I = 0x7f121108
+.field public static final path_password_eye:I = 0x7f121108
 
-.field public static final payment_source_payment_request_info_creating:I = 0x7f121109
+.field public static final path_password_eye_mask_strike_through:I = 0x7f121109
 
-.field public static final payment_source_payment_request_info_loading:I = 0x7f12110a
+.field public static final path_password_eye_mask_visible:I = 0x7f12110a
 
-.field public static final payment_source_payment_request_info_title:I = 0x7f12110b
+.field public static final path_password_strike_through:I = 0x7f12110b
 
-.field public static final payment_source_payment_request_label:I = 0x7f12110c
+.field public static final pause:I = 0x7f12110c
 
-.field public static final payment_source_payment_request_unsupported:I = 0x7f12110d
+.field public static final payment_authentication_modal_button:I = 0x7f12110d
 
-.field public static final payment_source_paypal:I = 0x7f12110e
+.field public static final payment_authentication_modal_button_cancel_payment:I = 0x7f12110e
 
-.field public static final payment_source_paypal_account:I = 0x7f12110f
+.field public static final payment_authentication_modal_canceled:I = 0x7f12110f
 
-.field public static final payment_source_paypal_details:I = 0x7f121110
+.field public static final payment_authentication_modal_fail:I = 0x7f121110
 
-.field public static final payment_source_paypal_loading:I = 0x7f121111
+.field public static final payment_authentication_modal_start:I = 0x7f121111
 
-.field public static final payment_source_paypal_reopen:I = 0x7f121112
+.field public static final payment_authentication_modal_success:I = 0x7f121112
 
-.field public static final payment_source_subscription:I = 0x7f121113
+.field public static final payment_authentication_modal_title:I = 0x7f121113
 
-.field public static final payment_source_type:I = 0x7f121114
+.field public static final payment_authentication_modal_title_canceled:I = 0x7f121114
 
-.field public static final payment_source_type_select:I = 0x7f121115
+.field public static final payment_authentication_modal_title_fail:I = 0x7f121115
 
-.field public static final payment_sources_add:I = 0x7f121116
+.field public static final payment_authentication_modal_title_success:I = 0x7f121116
 
-.field public static final payment_waiting_for_authentication:I = 0x7f121117
+.field public static final payment_modal_button_premium:I = 0x7f121117
 
-.field public static final paypal_account_verifying:I = 0x7f121118
+.field public static final payment_modal_button_premium_gift:I = 0x7f121118
 
-.field public static final paypal_callback_error:I = 0x7f121119
+.field public static final payment_modal_one_month:I = 0x7f121119
 
-.field public static final paypal_callback_success:I = 0x7f12111a
+.field public static final payment_modal_one_year:I = 0x7f12111a
 
-.field public static final pending:I = 0x7f12111b
+.field public static final payment_modal_subtitle_premium_gift:I = 0x7f12111b
 
-.field public static final people:I = 0x7f12111c
+.field public static final payment_price_change_body:I = 0x7f12111c
 
-.field public static final percentage_since_last_week:I = 0x7f12111d
+.field public static final payment_price_change_title:I = 0x7f12111d
 
-.field public static final permission_helpdesk:I = 0x7f12111e
+.field public static final payment_source_card_ending:I = 0x7f12111e
 
-.field public static final permission_media_denied:I = 0x7f12111f
+.field public static final payment_source_card_ending_in:I = 0x7f12111f
 
-.field public static final permission_media_download_denied:I = 0x7f121120
+.field public static final payment_source_card_expires:I = 0x7f121120
 
-.field public static final permission_microphone_denied:I = 0x7f121121
+.field public static final payment_source_card_number:I = 0x7f121121
 
-.field public static final permission_override_allow:I = 0x7f121122
+.field public static final payment_source_confirm_paypal_details:I = 0x7f121122
 
-.field public static final permission_override_deny:I = 0x7f121123
+.field public static final payment_source_credit_card:I = 0x7f121123
 
-.field public static final permission_override_passthrough:I = 0x7f121124
+.field public static final payment_source_delete:I = 0x7f121124
 
-.field public static final permission_overrides:I = 0x7f121125
+.field public static final payment_source_delete_disabled_tooltip:I = 0x7f121125
 
-.field public static final permission_qr_scanner_denied:I = 0x7f121126
+.field public static final payment_source_deleted:I = 0x7f121126
 
-.field public static final permissions:I = 0x7f121127
+.field public static final payment_source_edit_help_card:I = 0x7f121127
 
-.field public static final permissions_unsynced:I = 0x7f121128
+.field public static final payment_source_edit_help_paypal:I = 0x7f121128
 
-.field public static final permit_usage_android:I = 0x7f121129
+.field public static final payment_source_edit_saved:I = 0x7f121129
 
-.field public static final personalization_disable_modal_body:I = 0x7f12112a
+.field public static final payment_source_edit_select_state:I = 0x7f12112a
 
-.field public static final personalization_disable_modal_cancel:I = 0x7f12112b
+.field public static final payment_source_edit_title:I = 0x7f12112b
 
-.field public static final personalization_disable_modal_confirm:I = 0x7f12112c
+.field public static final payment_source_expiration_date_placeholder:I = 0x7f12112c
 
-.field public static final personalization_disable_modal_title:I = 0x7f12112d
+.field public static final payment_source_information:I = 0x7f12112d
 
-.field public static final phone:I = 0x7f12112e
+.field public static final payment_source_invalid:I = 0x7f12112e
 
-.field public static final pick_a_color:I = 0x7f12112f
+.field public static final payment_source_invalid_help:I = 0x7f12112f
 
-.field public static final pin:I = 0x7f121130
+.field public static final payment_source_make_default:I = 0x7f121130
 
-.field public static final pin_confirm:I = 0x7f121131
+.field public static final payment_source_name_error_required:I = 0x7f121131
 
-.field public static final pin_message:I = 0x7f121132
+.field public static final payment_source_payment_request_button_generic:I = 0x7f121132
 
-.field public static final pin_message_body:I = 0x7f121133
+.field public static final payment_source_payment_request_button_gpay:I = 0x7f121133
 
-.field public static final pin_message_body_mobile:I = 0x7f121134
+.field public static final payment_source_payment_request_info_creating:I = 0x7f121134
 
-.field public static final pin_message_body_private_channel:I = 0x7f121135
+.field public static final payment_source_payment_request_info_loading:I = 0x7f121135
 
-.field public static final pin_message_title:I = 0x7f121136
+.field public static final payment_source_payment_request_info_title:I = 0x7f121136
 
-.field public static final pin_message_too_many_body:I = 0x7f121137
+.field public static final payment_source_payment_request_label:I = 0x7f121137
 
-.field public static final pin_message_too_many_body_private_channel:I = 0x7f121138
+.field public static final payment_source_payment_request_unsupported:I = 0x7f121138
 
-.field public static final pin_message_too_many_title:I = 0x7f121139
+.field public static final payment_source_paypal:I = 0x7f121139
 
-.field public static final pinned_messages:I = 0x7f12113a
+.field public static final payment_source_paypal_account:I = 0x7f12113a
 
-.field public static final pinned_messages_pro_tip:I = 0x7f12113b
+.field public static final payment_source_paypal_details:I = 0x7f12113b
 
-.field public static final pinned_messages_pro_tip_body_channel:I = 0x7f12113c
+.field public static final payment_source_paypal_loading:I = 0x7f12113c
 
-.field public static final pinned_messages_pro_tip_body_dm:I = 0x7f12113d
+.field public static final payment_source_paypal_reopen:I = 0x7f12113d
 
-.field public static final pinned_messages_pro_tip_body_group_dm:I = 0x7f12113e
+.field public static final payment_source_subscription:I = 0x7f12113e
 
-.field public static final pins:I = 0x7f12113f
+.field public static final payment_source_type:I = 0x7f12113f
 
-.field public static final pins_disabled_nsfw:I = 0x7f121140
+.field public static final payment_source_type_select:I = 0x7f121140
 
-.field public static final pl:I = 0x7f121141
+.field public static final payment_sources_add:I = 0x7f121141
 
-.field public static final platform_android:I = 0x7f121142
+.field public static final payment_waiting_for_authentication:I = 0x7f121142
 
-.field public static final platform_ios:I = 0x7f121143
+.field public static final paypal_account_verifying:I = 0x7f121143
 
-.field public static final platform_linux:I = 0x7f121144
+.field public static final paypal_callback_error:I = 0x7f121144
 
-.field public static final platform_macos:I = 0x7f121145
+.field public static final paypal_callback_success:I = 0x7f121145
 
-.field public static final platform_windows:I = 0x7f121146
+.field public static final pending:I = 0x7f121146
 
-.field public static final play:I = 0x7f121147
+.field public static final people:I = 0x7f121147
 
-.field public static final play_full_video:I = 0x7f121148
+.field public static final percentage_since_last_week:I = 0x7f121148
 
-.field public static final play_stream:I = 0x7f121149
+.field public static final permission_helpdesk:I = 0x7f121149
 
-.field public static final playing_game:I = 0x7f12114a
+.field public static final permission_media_denied:I = 0x7f12114a
 
-.field public static final popout_player:I = 0x7f12114b
+.field public static final permission_media_download_denied:I = 0x7f12114b
 
-.field public static final popout_player_opened:I = 0x7f12114c
+.field public static final permission_microphone_denied:I = 0x7f12114c
 
-.field public static final popout_remove_from_top:I = 0x7f12114d
+.field public static final permission_override_allow:I = 0x7f12114d
 
-.field public static final popout_return:I = 0x7f12114e
+.field public static final permission_override_deny:I = 0x7f12114e
 
-.field public static final popout_stay_on_top:I = 0x7f12114f
+.field public static final permission_override_passthrough:I = 0x7f12114f
 
-.field public static final preference_copied:I = 0x7f121150
+.field public static final permission_overrides:I = 0x7f121150
 
-.field public static final premium:I = 0x7f121151
+.field public static final permission_qr_scanner_denied:I = 0x7f121151
 
-.field public static final premium_activated:I = 0x7f121152
+.field public static final permissions:I = 0x7f121152
 
-.field public static final premium_alert_error_title:I = 0x7f121153
+.field public static final permissions_unsynced:I = 0x7f121153
 
-.field public static final premium_badge_tooltip:I = 0x7f121154
+.field public static final permit_usage_android:I = 0x7f121154
 
-.field public static final premium_cancel_cancel_mobile:I = 0x7f121155
+.field public static final personalization_disable_modal_body:I = 0x7f121155
 
-.field public static final premium_cancel_confirm_body_tier_1:I = 0x7f121156
+.field public static final personalization_disable_modal_cancel:I = 0x7f121156
 
-.field public static final premium_cancel_confirm_body_tier_1_mobile_part_1:I = 0x7f121157
+.field public static final personalization_disable_modal_confirm:I = 0x7f121157
 
-.field public static final premium_cancel_confirm_body_tier_1_mobile_part_2:I = 0x7f121158
+.field public static final personalization_disable_modal_title:I = 0x7f121158
 
-.field public static final premium_cancel_confirm_body_tier_2:I = 0x7f121159
+.field public static final phone:I = 0x7f121159
 
-.field public static final premium_cancel_confirm_body_tier_2_mobile_part_1:I = 0x7f12115a
+.field public static final pick_a_color:I = 0x7f12115a
 
-.field public static final premium_cancel_confirm_body_tier_2_mobile_part_2:I = 0x7f12115b
+.field public static final pin:I = 0x7f12115b
 
-.field public static final premium_cancel_confirm_mobile:I = 0x7f12115c
+.field public static final pin_confirm:I = 0x7f12115c
 
-.field public static final premium_cancel_confirm_new:I = 0x7f12115d
+.field public static final pin_message:I = 0x7f12115d
 
-.field public static final premium_cancel_confirm_title:I = 0x7f12115e
+.field public static final pin_message_body:I = 0x7f12115e
 
-.field public static final premium_cancel_failed_body:I = 0x7f12115f
+.field public static final pin_message_body_mobile:I = 0x7f12115f
 
-.field public static final premium_change_discriminator_length_error:I = 0x7f121160
+.field public static final pin_message_body_private_channel:I = 0x7f121160
 
-.field public static final premium_change_discriminator_modal_body:I = 0x7f121161
+.field public static final pin_message_title:I = 0x7f121161
 
-.field public static final premium_change_discriminator_modal_confirm:I = 0x7f121162
+.field public static final pin_message_too_many_body:I = 0x7f121162
 
-.field public static final premium_change_discriminator_modal_header:I = 0x7f121163
+.field public static final pin_message_too_many_body_private_channel:I = 0x7f121163
 
-.field public static final premium_change_discriminator_tooltip:I = 0x7f121164
+.field public static final pin_message_too_many_title:I = 0x7f121164
 
-.field public static final premium_change_discriminator_zero_error:I = 0x7f121165
+.field public static final pinned_messages:I = 0x7f121165
 
-.field public static final premium_chat_perks_animated_avatar_and_emoji_mobile:I = 0x7f121166
+.field public static final pinned_messages_pro_tip:I = 0x7f121166
 
-.field public static final premium_chat_perks_custom_emoji_mobile:I = 0x7f121167
+.field public static final pinned_messages_pro_tip_body_channel:I = 0x7f121167
 
-.field public static final premium_chat_perks_description_premium_guild_discount:I = 0x7f121168
+.field public static final pinned_messages_pro_tip_body_dm:I = 0x7f121168
 
-.field public static final premium_chat_perks_description_premium_guild_included:I = 0x7f121169
+.field public static final pinned_messages_pro_tip_body_group_dm:I = 0x7f121169
 
-.field public static final premium_chat_perks_description_upload_limit:I = 0x7f12116a
+.field public static final pins:I = 0x7f12116a
 
-.field public static final premium_chat_perks_discriminator_mobile:I = 0x7f12116b
+.field public static final pins_disabled_nsfw:I = 0x7f12116b
 
-.field public static final premium_chat_perks_premium_guild_subscription:I = 0x7f12116c
+.field public static final pl:I = 0x7f12116c
 
-.field public static final premium_chat_perks_rep_mobile:I = 0x7f12116d
+.field public static final platform_android:I = 0x7f12116d
 
-.field public static final premium_chat_perks_screenshare_mobile:I = 0x7f12116e
+.field public static final platform_ios:I = 0x7f12116e
 
-.field public static final premium_chat_perks_simple_title:I = 0x7f12116f
+.field public static final platform_linux:I = 0x7f12116f
 
-.field public static final premium_chat_perks_streaming_mobile:I = 0x7f121170
+.field public static final platform_macos:I = 0x7f121170
 
-.field public static final premium_classic_payment_gift_blurb_mobile:I = 0x7f121171
+.field public static final platform_windows:I = 0x7f121171
 
-.field public static final premium_downgrade_done_button:I = 0x7f121172
+.field public static final play:I = 0x7f121172
 
-.field public static final premium_features_chat_perks:I = 0x7f121173
+.field public static final play_full_video:I = 0x7f121173
 
-.field public static final premium_features_chat_perks_header:I = 0x7f121174
+.field public static final play_stream:I = 0x7f121174
 
-.field public static final premium_game:I = 0x7f121175
+.field public static final playing_game:I = 0x7f121175
 
-.field public static final premium_gift_button_label:I = 0x7f121176
+.field public static final popout_player:I = 0x7f121176
 
-.field public static final premium_gift_button_tooltip:I = 0x7f121177
+.field public static final popout_player_opened:I = 0x7f121177
 
-.field public static final premium_gift_send:I = 0x7f121178
+.field public static final popout_remove_from_top:I = 0x7f121178
 
-.field public static final premium_gift_share_link_ios:I = 0x7f121179
+.field public static final popout_return:I = 0x7f121179
 
-.field public static final premium_gifting_button:I = 0x7f12117a
+.field public static final popout_stay_on_top:I = 0x7f12117a
 
-.field public static final premium_gifting_title:I = 0x7f12117b
+.field public static final preference_copied:I = 0x7f12117b
 
-.field public static final premium_gifting_title_mobile:I = 0x7f12117c
+.field public static final premium:I = 0x7f12117c
 
-.field public static final premium_grandfathered_monthly:I = 0x7f12117d
+.field public static final premium_activated:I = 0x7f12117d
 
-.field public static final premium_grandfathered_warning:I = 0x7f12117e
+.field public static final premium_alert_error_title:I = 0x7f12117e
 
-.field public static final premium_grandfathered_warning_confirm:I = 0x7f12117f
+.field public static final premium_badge_tooltip:I = 0x7f12117f
 
-.field public static final premium_grandfathered_warning_mobile:I = 0x7f121180
+.field public static final premium_cancel_cancel_mobile:I = 0x7f121180
 
-.field public static final premium_grandfathered_warning_title:I = 0x7f121181
+.field public static final premium_cancel_confirm_body_tier_1:I = 0x7f121181
 
-.field public static final premium_grandfathered_yearly:I = 0x7f121182
+.field public static final premium_cancel_confirm_body_tier_1_mobile_part_1:I = 0x7f121182
 
-.field public static final premium_guild_cooldown_available_countdown:I = 0x7f121183
+.field public static final premium_cancel_confirm_body_tier_1_mobile_part_2:I = 0x7f121183
 
-.field public static final premium_guild_emoji_promo_description:I = 0x7f121184
+.field public static final premium_cancel_confirm_body_tier_2:I = 0x7f121184
 
-.field public static final premium_guild_emoji_promo_title:I = 0x7f121185
+.field public static final premium_cancel_confirm_body_tier_2_mobile_part_1:I = 0x7f121185
 
-.field public static final premium_guild_features_custom_emoji_mobile:I = 0x7f121186
+.field public static final premium_cancel_confirm_body_tier_2_mobile_part_2:I = 0x7f121186
 
-.field public static final premium_guild_features_upload_sizes_mobile:I = 0x7f121187
+.field public static final premium_cancel_confirm_mobile:I = 0x7f121187
 
-.field public static final premium_guild_features_upsell_banner_subscribe:I = 0x7f121188
+.field public static final premium_cancel_confirm_new:I = 0x7f121188
 
-.field public static final premium_guild_features_voice_quality:I = 0x7f121189
+.field public static final premium_cancel_confirm_title:I = 0x7f121189
 
-.field public static final premium_guild_full_feature_list:I = 0x7f12118a
+.field public static final premium_cancel_failed_body:I = 0x7f12118a
 
-.field public static final premium_guild_grace_period_cooldown:I = 0x7f12118b
+.field public static final premium_change_discriminator_length_error:I = 0x7f12118b
 
-.field public static final premium_guild_grace_period_cooldown_soon:I = 0x7f12118c
+.field public static final premium_change_discriminator_modal_body:I = 0x7f12118c
 
-.field public static final premium_guild_grace_period_notice:I = 0x7f12118d
+.field public static final premium_change_discriminator_modal_confirm:I = 0x7f12118d
 
-.field public static final premium_guild_grace_period_notice_button:I = 0x7f12118e
+.field public static final premium_change_discriminator_modal_header:I = 0x7f12118e
 
-.field public static final premium_guild_grace_period_title:I = 0x7f12118f
+.field public static final premium_change_discriminator_tooltip:I = 0x7f12118f
 
-.field public static final premium_guild_guild_feature_audio_quality:I = 0x7f121190
+.field public static final premium_change_discriminator_zero_error:I = 0x7f121190
 
-.field public static final premium_guild_guild_feature_emoji:I = 0x7f121191
+.field public static final premium_chat_perks_animated_avatar_and_emoji_mobile:I = 0x7f121191
 
-.field public static final premium_guild_guild_feature_upload_size:I = 0x7f121192
+.field public static final premium_chat_perks_custom_emoji_mobile:I = 0x7f121192
 
-.field public static final premium_guild_guild_features_header:I = 0x7f121193
+.field public static final premium_chat_perks_description_premium_guild_discount:I = 0x7f121193
 
-.field public static final premium_guild_header_badge_no_tier:I = 0x7f121194
+.field public static final premium_chat_perks_description_premium_guild_included:I = 0x7f121194
 
-.field public static final premium_guild_header_dropdown_nitro_server_subscribe:I = 0x7f121195
+.field public static final premium_chat_perks_description_upload_limit:I = 0x7f121195
 
-.field public static final premium_guild_num_month_guild_subscriptions:I = 0x7f121196
+.field public static final premium_chat_perks_discriminator_mobile:I = 0x7f121196
 
-.field public static final premium_guild_num_year_guild_subscriptions:I = 0x7f121197
+.field public static final premium_chat_perks_premium_guild_subscription:I = 0x7f121197
 
-.field public static final premium_guild_perks_modal_base_perks:I = 0x7f121198
+.field public static final premium_chat_perks_rep_mobile:I = 0x7f121198
 
-.field public static final premium_guild_perks_modal_blurb:I = 0x7f121199
+.field public static final premium_chat_perks_screenshare_mobile:I = 0x7f121199
 
-.field public static final premium_guild_perks_modal_blurb_mobile:I = 0x7f12119a
+.field public static final premium_chat_perks_simple_title:I = 0x7f12119a
 
-.field public static final premium_guild_perks_modal_blurb_mobile_learn_more:I = 0x7f12119b
+.field public static final premium_chat_perks_streaming_mobile:I = 0x7f12119b
 
-.field public static final premium_guild_perks_modal_boost_alert_ios_body:I = 0x7f12119c
+.field public static final premium_classic_payment_gift_blurb_mobile:I = 0x7f12119c
 
-.field public static final premium_guild_perks_modal_boost_alert_ios_title:I = 0x7f12119d
+.field public static final premium_downgrade_done_button:I = 0x7f12119d
 
-.field public static final premium_guild_perks_modal_button_gift_premium:I = 0x7f12119e
+.field public static final premium_features_chat_perks:I = 0x7f12119e
 
-.field public static final premium_guild_perks_modal_button_subscribe_this_server:I = 0x7f12119f
+.field public static final premium_features_chat_perks_header:I = 0x7f12119f
 
-.field public static final premium_guild_perks_modal_button_upgrade_to_premium_ios_error:I = 0x7f1211a0
+.field public static final premium_game:I = 0x7f1211a0
 
-.field public static final premium_guild_perks_modal_gift_nitro:I = 0x7f1211a1
+.field public static final premium_gift_button_label:I = 0x7f1211a1
 
-.field public static final premium_guild_perks_modal_header:I = 0x7f1211a2
+.field public static final premium_gift_button_tooltip:I = 0x7f1211a2
 
-.field public static final premium_guild_perks_modal_header_subscription_count:I = 0x7f1211a3
+.field public static final premium_gift_send:I = 0x7f1211a3
 
-.field public static final premium_guild_perks_modal_header_user_subscription_count:I = 0x7f1211a4
+.field public static final premium_gift_share_link_ios:I = 0x7f1211a4
 
-.field public static final premium_guild_perks_modal_level_subscriber_count_tooltip:I = 0x7f1211a5
+.field public static final premium_gifting_button:I = 0x7f1211a5
 
-.field public static final premium_guild_perks_modal_manage_your_subscriptions:I = 0x7f1211a6
+.field public static final premium_gifting_title:I = 0x7f1211a6
 
-.field public static final premium_guild_perks_modal_previous_perks:I = 0x7f1211a7
+.field public static final premium_gifting_title_mobile:I = 0x7f1211a7
 
-.field public static final premium_guild_perks_modal_protip:I = 0x7f1211a8
+.field public static final premium_grandfathered_monthly:I = 0x7f1211a8
 
-.field public static final premium_guild_perks_modal_protip_mobile:I = 0x7f1211a9
+.field public static final premium_grandfathered_warning:I = 0x7f1211a9
 
-.field public static final premium_guild_perks_modal_subscribe_to_tier_tooltip:I = 0x7f1211aa
+.field public static final premium_grandfathered_warning_confirm:I = 0x7f1211aa
 
-.field public static final premium_guild_perks_modal_subscriber_perks_header:I = 0x7f1211ab
+.field public static final premium_grandfathered_warning_mobile:I = 0x7f1211ab
 
-.field public static final premium_guild_plan_month:I = 0x7f1211ac
+.field public static final premium_grandfathered_warning_title:I = 0x7f1211ac
 
-.field public static final premium_guild_plan_year:I = 0x7f1211ad
+.field public static final premium_grandfathered_yearly:I = 0x7f1211ad
 
-.field public static final premium_guild_settings_members_subscribed_needed:I = 0x7f1211ae
+.field public static final premium_guild_cooldown_available_countdown:I = 0x7f1211ae
 
-.field public static final premium_guild_settings_x_of_y_subscriptions:I = 0x7f1211af
+.field public static final premium_guild_emoji_promo_description:I = 0x7f1211af
 
-.field public static final premium_guild_subscribe_confirm_blurb:I = 0x7f1211b0
+.field public static final premium_guild_emoji_promo_title:I = 0x7f1211b0
 
-.field public static final premium_guild_subscribe_confirm_cancel_warning:I = 0x7f1211b1
+.field public static final premium_guild_features_custom_emoji_mobile:I = 0x7f1211b1
 
-.field public static final premium_guild_subscribe_confirm_confirmation:I = 0x7f1211b2
+.field public static final premium_guild_features_upload_sizes_mobile:I = 0x7f1211b2
 
-.field public static final premium_guild_subscribe_confirm_confirmation_label:I = 0x7f1211b3
+.field public static final premium_guild_features_upsell_banner_subscribe:I = 0x7f1211b3
 
-.field public static final premium_guild_subscribe_confirm_cooldown_warning:I = 0x7f1211b4
+.field public static final premium_guild_features_voice_quality:I = 0x7f1211b4
 
-.field public static final premium_guild_subscribe_confirm_transfer_blurb:I = 0x7f1211b5
+.field public static final premium_guild_full_feature_list:I = 0x7f1211b5
 
-.field public static final premium_guild_subscribe_confirm_transfer_from_guild:I = 0x7f1211b6
+.field public static final premium_guild_grace_period_cooldown:I = 0x7f1211b6
 
-.field public static final premium_guild_subscribe_confirm_transfer_header:I = 0x7f1211b7
+.field public static final premium_guild_grace_period_cooldown_soon:I = 0x7f1211b7
 
-.field public static final premium_guild_subscribe_confirm_transfer_to_guild:I = 0x7f1211b8
+.field public static final premium_guild_grace_period_notice:I = 0x7f1211b8
 
-.field public static final premium_guild_subscribe_search_guild_placeholder:I = 0x7f1211b9
+.field public static final premium_guild_grace_period_notice_button:I = 0x7f1211b9
 
-.field public static final premium_guild_subscribe_select_guild_header:I = 0x7f1211ba
+.field public static final premium_guild_grace_period_title:I = 0x7f1211ba
 
-.field public static final premium_guild_subscribe_select_guild_transfer_header:I = 0x7f1211bb
+.field public static final premium_guild_guild_feature_audio_quality:I = 0x7f1211bb
 
-.field public static final premium_guild_subscribe_success_okay:I = 0x7f1211bc
+.field public static final premium_guild_guild_feature_emoji:I = 0x7f1211bc
 
-.field public static final premium_guild_subscribe_success_thanks:I = 0x7f1211bd
+.field public static final premium_guild_guild_feature_upload_size:I = 0x7f1211bd
 
-.field public static final premium_guild_subscribe_transfer_confirm_confirmation:I = 0x7f1211be
+.field public static final premium_guild_guild_features_header:I = 0x7f1211be
 
-.field public static final premium_guild_subscribe_transfer_confirm_confirmation_label:I = 0x7f1211bf
+.field public static final premium_guild_header_badge_no_tier:I = 0x7f1211bf
 
-.field public static final premium_guild_subscribe_transfer_error_body:I = 0x7f1211c0
+.field public static final premium_guild_header_dropdown_nitro_server_subscribe:I = 0x7f1211c0
 
-.field public static final premium_guild_subscribe_transfer_error_header:I = 0x7f1211c1
+.field public static final premium_guild_num_month_guild_subscriptions:I = 0x7f1211c1
 
-.field public static final premium_guild_subscribe_unused_slots_cancel:I = 0x7f1211c2
+.field public static final premium_guild_num_year_guild_subscriptions:I = 0x7f1211c2
 
-.field public static final premium_guild_subscribe_unused_slots_counter:I = 0x7f1211c3
+.field public static final premium_guild_perks_modal_base_perks:I = 0x7f1211c3
 
-.field public static final premium_guild_subscribe_unused_slots_description:I = 0x7f1211c4
+.field public static final premium_guild_perks_modal_blurb:I = 0x7f1211c4
 
-.field public static final premium_guild_subscribe_unused_slots_header:I = 0x7f1211c5
+.field public static final premium_guild_perks_modal_blurb_mobile:I = 0x7f1211c5
 
-.field public static final premium_guild_subscribe_unused_slots_next:I = 0x7f1211c6
+.field public static final premium_guild_perks_modal_blurb_mobile_learn_more:I = 0x7f1211c6
 
-.field public static final premium_guild_subscriber_feature_member_badge:I = 0x7f1211c7
+.field public static final premium_guild_perks_modal_boost_alert_ios_body:I = 0x7f1211c7
 
-.field public static final premium_guild_subscriber_feature_profile_badge:I = 0x7f1211c8
+.field public static final premium_guild_perks_modal_boost_alert_ios_title:I = 0x7f1211c8
 
-.field public static final premium_guild_subscriber_feature_role:I = 0x7f1211c9
+.field public static final premium_guild_perks_modal_button_gift_premium:I = 0x7f1211c9
 
-.field public static final premium_guild_subscription:I = 0x7f1211ca
+.field public static final premium_guild_perks_modal_button_subscribe_this_server:I = 0x7f1211ca
 
-.field public static final premium_guild_subscription_active_title:I = 0x7f1211cb
+.field public static final premium_guild_perks_modal_button_upgrade_to_premium_ios_error:I = 0x7f1211cb
 
-.field public static final premium_guild_subscription_available:I = 0x7f1211cc
+.field public static final premium_guild_perks_modal_gift_nitro:I = 0x7f1211cc
 
-.field public static final premium_guild_subscription_cancel_body_guild:I = 0x7f1211cd
+.field public static final premium_guild_perks_modal_header:I = 0x7f1211cd
 
-.field public static final premium_guild_subscription_cancel_body_inventory:I = 0x7f1211ce
+.field public static final premium_guild_perks_modal_header_subscription_count:I = 0x7f1211ce
 
-.field public static final premium_guild_subscription_cancel_button:I = 0x7f1211cf
+.field public static final premium_guild_perks_modal_header_user_subscription_count:I = 0x7f1211cf
 
-.field public static final premium_guild_subscription_cancel_button_disabled_tooltip:I = 0x7f1211d0
+.field public static final premium_guild_perks_modal_level_subscriber_count_tooltip:I = 0x7f1211d0
 
-.field public static final premium_guild_subscription_cancel_button_mobile:I = 0x7f1211d1
+.field public static final premium_guild_perks_modal_manage_your_subscriptions:I = 0x7f1211d1
 
-.field public static final premium_guild_subscription_cancel_error_mobile:I = 0x7f1211d2
+.field public static final premium_guild_perks_modal_previous_perks:I = 0x7f1211d2
 
-.field public static final premium_guild_subscription_cancel_invoice_subscription_cancelled:I = 0x7f1211d3
+.field public static final premium_guild_perks_modal_protip:I = 0x7f1211d3
 
-.field public static final premium_guild_subscription_cancel_preview:I = 0x7f1211d4
+.field public static final premium_guild_perks_modal_protip_mobile:I = 0x7f1211d4
 
-.field public static final premium_guild_subscription_cancel_title:I = 0x7f1211d5
+.field public static final premium_guild_perks_modal_subscribe_to_tier_tooltip:I = 0x7f1211d5
 
-.field public static final premium_guild_subscription_cancel_title_guild:I = 0x7f1211d6
+.field public static final premium_guild_perks_modal_subscriber_perks_header:I = 0x7f1211d6
 
-.field public static final premium_guild_subscription_cancel_title_inventory:I = 0x7f1211d7
+.field public static final premium_guild_plan_month:I = 0x7f1211d7
 
-.field public static final premium_guild_subscription_cancel_title_pending_cancellation:I = 0x7f1211d8
+.field public static final premium_guild_plan_year:I = 0x7f1211d8
 
-.field public static final premium_guild_subscription_confirm_body:I = 0x7f1211d9
+.field public static final premium_guild_settings_members_subscribed_needed:I = 0x7f1211d9
 
-.field public static final premium_guild_subscription_confirm_title:I = 0x7f1211da
+.field public static final premium_guild_settings_x_of_y_subscriptions:I = 0x7f1211da
 
-.field public static final premium_guild_subscription_creation_date:I = 0x7f1211db
+.field public static final premium_guild_subscribe_confirm_blurb:I = 0x7f1211db
 
-.field public static final premium_guild_subscription_duration:I = 0x7f1211dc
+.field public static final premium_guild_subscribe_confirm_cancel_warning:I = 0x7f1211dc
 
-.field public static final premium_guild_subscription_error_mobile:I = 0x7f1211dd
+.field public static final premium_guild_subscribe_confirm_confirmation:I = 0x7f1211dd
 
-.field public static final premium_guild_subscription_error_pending_mutation:I = 0x7f1211de
+.field public static final premium_guild_subscribe_confirm_confirmation_label:I = 0x7f1211de
 
-.field public static final premium_guild_subscription_error_rate_limit_days:I = 0x7f1211df
+.field public static final premium_guild_subscribe_confirm_cooldown_warning:I = 0x7f1211df
 
-.field public static final premium_guild_subscription_error_rate_limit_hours:I = 0x7f1211e0
+.field public static final premium_guild_subscribe_confirm_transfer_blurb:I = 0x7f1211e0
 
-.field public static final premium_guild_subscription_error_rate_limit_minutes:I = 0x7f1211e1
+.field public static final premium_guild_subscribe_confirm_transfer_from_guild:I = 0x7f1211e1
 
-.field public static final premium_guild_subscription_guild_affinity_notice:I = 0x7f1211e2
+.field public static final premium_guild_subscribe_confirm_transfer_header:I = 0x7f1211e2
 
-.field public static final premium_guild_subscription_guild_affinity_notice_button:I = 0x7f1211e3
+.field public static final premium_guild_subscribe_confirm_transfer_to_guild:I = 0x7f1211e3
 
-.field public static final premium_guild_subscription_guild_affinity_notice_small_guild:I = 0x7f1211e4
+.field public static final premium_guild_subscribe_search_guild_placeholder:I = 0x7f1211e4
 
-.field public static final premium_guild_subscription_guild_subsription_subtitle:I = 0x7f1211e5
+.field public static final premium_guild_subscribe_select_guild_header:I = 0x7f1211e5
 
-.field public static final premium_guild_subscription_header_subscribe_tooltip_close:I = 0x7f1211e6
+.field public static final premium_guild_subscribe_select_guild_transfer_header:I = 0x7f1211e6
 
-.field public static final premium_guild_subscription_header_subscribe_tooltip_header:I = 0x7f1211e7
+.field public static final premium_guild_subscribe_success_okay:I = 0x7f1211e7
 
-.field public static final premium_guild_subscription_header_subscribe_tooltip_text:I = 0x7f1211e8
+.field public static final premium_guild_subscribe_success_thanks:I = 0x7f1211e8
 
-.field public static final premium_guild_subscription_inventory_uncancel_button:I = 0x7f1211e9
+.field public static final premium_guild_subscribe_transfer_confirm_confirmation:I = 0x7f1211e9
 
-.field public static final premium_guild_subscription_inventory_uncancel_button_mobile:I = 0x7f1211ea
+.field public static final premium_guild_subscribe_transfer_confirm_confirmation_label:I = 0x7f1211ea
 
-.field public static final premium_guild_subscription_inventory_uncancel_confirm_description:I = 0x7f1211eb
+.field public static final premium_guild_subscribe_transfer_error_body:I = 0x7f1211eb
 
-.field public static final premium_guild_subscription_inventory_uncancel_confirm_title:I = 0x7f1211ec
+.field public static final premium_guild_subscribe_transfer_error_header:I = 0x7f1211ec
 
-.field public static final premium_guild_subscription_inventory_uncancel_description:I = 0x7f1211ed
+.field public static final premium_guild_subscribe_unused_slots_cancel:I = 0x7f1211ed
 
-.field public static final premium_guild_subscription_inventory_uncancel_error:I = 0x7f1211ee
+.field public static final premium_guild_subscribe_unused_slots_counter:I = 0x7f1211ee
 
-.field public static final premium_guild_subscription_inventory_uncancel_title:I = 0x7f1211ef
+.field public static final premium_guild_subscribe_unused_slots_description:I = 0x7f1211ef
 
-.field public static final premium_guild_subscription_inventory_uncancel_title_mobile:I = 0x7f1211f0
+.field public static final premium_guild_subscribe_unused_slots_header:I = 0x7f1211f0
 
-.field public static final premium_guild_subscription_marketing_blurb:I = 0x7f1211f1
+.field public static final premium_guild_subscribe_unused_slots_next:I = 0x7f1211f1
 
-.field public static final premium_guild_subscription_marketing_guilds_blurb:I = 0x7f1211f2
+.field public static final premium_guild_subscriber_feature_member_badge:I = 0x7f1211f2
 
-.field public static final premium_guild_subscription_marketing_guilds_blurb_prompt:I = 0x7f1211f3
+.field public static final premium_guild_subscriber_feature_profile_badge:I = 0x7f1211f3
 
-.field public static final premium_guild_subscription_marketing_guilds_blurb_without_prompt:I = 0x7f1211f4
+.field public static final premium_guild_subscriber_feature_role:I = 0x7f1211f4
 
-.field public static final premium_guild_subscription_marketing_guilds_empty_blurb_mobile:I = 0x7f1211f5
+.field public static final premium_guild_subscription:I = 0x7f1211f5
 
-.field public static final premium_guild_subscription_marketing_guilds_empty_description_text:I = 0x7f1211f6
+.field public static final premium_guild_subscription_active_title:I = 0x7f1211f6
 
-.field public static final premium_guild_subscription_marketing_guilds_empty_description_title:I = 0x7f1211f7
+.field public static final premium_guild_subscription_available:I = 0x7f1211f7
 
-.field public static final premium_guild_subscription_marketing_header:I = 0x7f1211f8
+.field public static final premium_guild_subscription_cancel_body_guild:I = 0x7f1211f8
 
-.field public static final premium_guild_subscription_marketing_header_ios:I = 0x7f1211f9
+.field public static final premium_guild_subscription_cancel_body_inventory:I = 0x7f1211f9
 
-.field public static final premium_guild_subscription_notice:I = 0x7f1211fa
+.field public static final premium_guild_subscription_cancel_button:I = 0x7f1211fa
 
-.field public static final premium_guild_subscription_notice_button:I = 0x7f1211fb
+.field public static final premium_guild_subscription_cancel_button_disabled_tooltip:I = 0x7f1211fb
 
-.field public static final premium_guild_subscription_notice_small_guild:I = 0x7f1211fc
+.field public static final premium_guild_subscription_cancel_button_mobile:I = 0x7f1211fc
 
-.field public static final premium_guild_subscription_num_subscriptions:I = 0x7f1211fd
+.field public static final premium_guild_subscription_cancel_error_mobile:I = 0x7f1211fd
 
-.field public static final premium_guild_subscription_pending_cancelation:I = 0x7f1211fe
+.field public static final premium_guild_subscription_cancel_invoice_subscription_cancelled:I = 0x7f1211fe
 
-.field public static final premium_guild_subscription_purchase_button_disabled_pending_mutation_plan:I = 0x7f1211ff
+.field public static final premium_guild_subscription_cancel_preview:I = 0x7f1211ff
 
-.field public static final premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription:I = 0x7f121200
+.field public static final premium_guild_subscription_cancel_title:I = 0x7f121200
 
-.field public static final premium_guild_subscription_purchase_button_disabled_subscription_past_due:I = 0x7f121201
+.field public static final premium_guild_subscription_cancel_title_guild:I = 0x7f121201
 
-.field public static final premium_guild_subscription_select_server_button:I = 0x7f121202
+.field public static final premium_guild_subscription_cancel_title_inventory:I = 0x7f121202
 
-.field public static final premium_guild_subscription_slot_cancel_button:I = 0x7f121203
+.field public static final premium_guild_subscription_cancel_title_pending_cancellation:I = 0x7f121203
 
-.field public static final premium_guild_subscription_slot_uncancel_button:I = 0x7f121204
+.field public static final premium_guild_subscription_confirm_body:I = 0x7f121204
 
-.field public static final premium_guild_subscription_slot_uncancel_button_mobile:I = 0x7f121205
+.field public static final premium_guild_subscription_confirm_title:I = 0x7f121205
 
-.field public static final premium_guild_subscription_subscribe:I = 0x7f121206
+.field public static final premium_guild_subscription_creation_date:I = 0x7f121206
 
-.field public static final premium_guild_subscription_subscriber_count_tooltip:I = 0x7f121207
+.field public static final premium_guild_subscription_duration:I = 0x7f121207
 
-.field public static final premium_guild_subscription_subtitle:I = 0x7f121208
+.field public static final premium_guild_subscription_error_mobile:I = 0x7f121208
 
-.field public static final premium_guild_subscription_subtitle_mobile_1:I = 0x7f121209
+.field public static final premium_guild_subscription_error_pending_mutation:I = 0x7f121209
 
-.field public static final premium_guild_subscription_subtitle_mobile_2:I = 0x7f12120a
+.field public static final premium_guild_subscription_error_rate_limit_days:I = 0x7f12120a
 
-.field public static final premium_guild_subscription_title:I = 0x7f12120b
+.field public static final premium_guild_subscription_error_rate_limit_hours:I = 0x7f12120b
 
-.field public static final premium_guild_subscription_tooltip:I = 0x7f12120c
+.field public static final premium_guild_subscription_error_rate_limit_minutes:I = 0x7f12120c
 
-.field public static final premium_guild_subscription_transfer_button:I = 0x7f12120d
+.field public static final premium_guild_subscription_guild_affinity_notice:I = 0x7f12120d
 
-.field public static final premium_guild_subscription_transfer_button_disabled_tooltip:I = 0x7f12120e
+.field public static final premium_guild_subscription_guild_affinity_notice_button:I = 0x7f12120e
 
-.field public static final premium_guild_subscription_unused_slot_description:I = 0x7f12120f
+.field public static final premium_guild_subscription_guild_affinity_notice_small_guild:I = 0x7f12120f
 
-.field public static final premium_guild_subscriptions_renewal_info:I = 0x7f121210
+.field public static final premium_guild_subscription_guild_subsription_subtitle:I = 0x7f121210
 
-.field public static final premium_guild_subscriptions_renewal_info_android:I = 0x7f121211
+.field public static final premium_guild_subscription_header_subscribe_tooltip_close:I = 0x7f121211
 
-.field public static final premium_guild_subscriptions_renewal_info_pending_cancelation:I = 0x7f121212
+.field public static final premium_guild_subscription_header_subscribe_tooltip_header:I = 0x7f121212
 
-.field public static final premium_guild_subscriptions_renewal_info_pending_cancelation_android:I = 0x7f121213
+.field public static final premium_guild_subscription_header_subscribe_tooltip_text:I = 0x7f121213
 
-.field public static final premium_guild_tier_0:I = 0x7f121214
+.field public static final premium_guild_subscription_inventory_uncancel_button:I = 0x7f121214
 
-.field public static final premium_guild_tier_1:I = 0x7f121215
+.field public static final premium_guild_subscription_inventory_uncancel_button_mobile:I = 0x7f121215
 
-.field public static final premium_guild_tier_2:I = 0x7f121216
+.field public static final premium_guild_subscription_inventory_uncancel_confirm_description:I = 0x7f121216
 
-.field public static final premium_guild_tier_3:I = 0x7f121217
+.field public static final premium_guild_subscription_inventory_uncancel_confirm_title:I = 0x7f121217
 
-.field public static final premium_guild_unsubscribe_confirm_blurb:I = 0x7f121218
+.field public static final premium_guild_subscription_inventory_uncancel_description:I = 0x7f121218
 
-.field public static final premium_guild_unsubscribe_confirm_confirmation:I = 0x7f121219
+.field public static final premium_guild_subscription_inventory_uncancel_error:I = 0x7f121219
 
-.field public static final premium_guild_unsubscribe_confirm_cooldown_warning:I = 0x7f12121a
+.field public static final premium_guild_subscription_inventory_uncancel_title:I = 0x7f12121a
 
-.field public static final premium_guild_unsubscribe_confirm_cooldown_warning_days:I = 0x7f12121b
+.field public static final premium_guild_subscription_inventory_uncancel_title_mobile:I = 0x7f12121b
 
-.field public static final premium_guild_unsubscribe_confirm_cooldown_warning_hours:I = 0x7f12121c
+.field public static final premium_guild_subscription_marketing_blurb:I = 0x7f12121c
 
-.field public static final premium_guild_unsubscribe_confirm_cooldown_warning_minutes:I = 0x7f12121d
+.field public static final premium_guild_subscription_marketing_guilds_blurb:I = 0x7f12121d
 
-.field public static final premium_guild_unsubscribe_confirm_header:I = 0x7f12121e
+.field public static final premium_guild_subscription_marketing_guilds_blurb_prompt:I = 0x7f12121e
 
-.field public static final premium_guild_user_feature_member_badge:I = 0x7f12121f
+.field public static final premium_guild_subscription_marketing_guilds_blurb_without_prompt:I = 0x7f12121f
 
-.field public static final premium_guild_user_feature_profile_badge:I = 0x7f121220
+.field public static final premium_guild_subscription_marketing_guilds_empty_blurb_mobile:I = 0x7f121220
 
-.field public static final premium_guild_user_feature_role:I = 0x7f121221
+.field public static final premium_guild_subscription_marketing_guilds_empty_description_text:I = 0x7f121221
 
-.field public static final premium_guild_user_features_header:I = 0x7f121222
+.field public static final premium_guild_subscription_marketing_guilds_empty_description_title:I = 0x7f121222
 
-.field public static final premium_included:I = 0x7f121223
+.field public static final premium_guild_subscription_marketing_header:I = 0x7f121223
 
-.field public static final premium_legacy:I = 0x7f121224
+.field public static final premium_guild_subscription_marketing_header_ios:I = 0x7f121224
 
-.field public static final premium_not_claimed:I = 0x7f121225
+.field public static final premium_guild_subscription_notice:I = 0x7f121225
 
-.field public static final premium_not_claimed_body:I = 0x7f121226
+.field public static final premium_guild_subscription_notice_button:I = 0x7f121226
 
-.field public static final premium_not_verified:I = 0x7f121227
+.field public static final premium_guild_subscription_notice_small_guild:I = 0x7f121227
 
-.field public static final premium_not_verified_body:I = 0x7f121228
+.field public static final premium_guild_subscription_num_subscriptions:I = 0x7f121228
 
-.field public static final premium_payment_confirmation_blurb_iap:I = 0x7f121229
+.field public static final premium_guild_subscription_pending_cancelation:I = 0x7f121229
 
-.field public static final premium_payment_confirmation_blurb_regular:I = 0x7f12122a
+.field public static final premium_guild_subscription_purchase_button_disabled_pending_mutation_plan:I = 0x7f12122a
 
-.field public static final premium_payment_confirmation_button_iap:I = 0x7f12122b
+.field public static final premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription:I = 0x7f12122b
 
-.field public static final premium_payment_confirmation_button_regular:I = 0x7f12122c
+.field public static final premium_guild_subscription_purchase_button_disabled_subscription_past_due:I = 0x7f12122c
 
-.field public static final premium_payment_gift_blurb_mobile:I = 0x7f12122d
+.field public static final premium_guild_subscription_select_server_button:I = 0x7f12122d
 
-.field public static final premium_payment_gift_subtext_monthly:I = 0x7f12122e
+.field public static final premium_guild_subscription_slot_cancel_button:I = 0x7f12122e
 
-.field public static final premium_payment_gift_subtext_yearly:I = 0x7f12122f
+.field public static final premium_guild_subscription_slot_uncancel_button:I = 0x7f12122f
 
-.field public static final premium_payment_is_gift:I = 0x7f121230
+.field public static final premium_guild_subscription_slot_uncancel_button_mobile:I = 0x7f121230
 
-.field public static final premium_payment_select:I = 0x7f121231
+.field public static final premium_guild_subscription_subscribe:I = 0x7f121231
 
-.field public static final premium_pending_plan_change_cancel_body:I = 0x7f121232
+.field public static final premium_guild_subscription_subscriber_count_tooltip:I = 0x7f121232
 
-.field public static final premium_pending_plan_change_cancel_button:I = 0x7f121233
+.field public static final premium_guild_subscription_subtitle:I = 0x7f121233
 
-.field public static final premium_pending_plan_change_cancel_header:I = 0x7f121234
+.field public static final premium_guild_subscription_subtitle_mobile_1:I = 0x7f121234
 
-.field public static final premium_pending_plan_change_notice:I = 0x7f121235
+.field public static final premium_guild_subscription_subtitle_mobile_2:I = 0x7f121235
 
-.field public static final premium_plan_month:I = 0x7f121236
+.field public static final premium_guild_subscription_title:I = 0x7f121236
 
-.field public static final premium_plan_month_tier_1:I = 0x7f121237
+.field public static final premium_guild_subscription_tooltip:I = 0x7f121237
 
-.field public static final premium_plan_month_tier_2:I = 0x7f121238
+.field public static final premium_guild_subscription_transfer_button:I = 0x7f121238
 
-.field public static final premium_plan_month_tier_2_trial:I = 0x7f121239
+.field public static final premium_guild_subscription_transfer_button_disabled_tooltip:I = 0x7f121239
 
-.field public static final premium_plan_year:I = 0x7f12123a
+.field public static final premium_guild_subscription_unused_slot_description:I = 0x7f12123a
 
-.field public static final premium_plan_year_tier_1:I = 0x7f12123b
+.field public static final premium_guild_subscriptions_renewal_info:I = 0x7f12123b
 
-.field public static final premium_plan_year_tier_2:I = 0x7f12123c
+.field public static final premium_guild_subscriptions_renewal_info_android:I = 0x7f12123c
 
-.field public static final premium_plan_year_tier_2_trial:I = 0x7f12123d
+.field public static final premium_guild_subscriptions_renewal_info_pending_cancelation:I = 0x7f12123d
 
-.field public static final premium_promo_description:I = 0x7f12123e
+.field public static final premium_guild_subscriptions_renewal_info_pending_cancelation_android:I = 0x7f12123e
 
-.field public static final premium_promo_description_trial:I = 0x7f12123f
+.field public static final premium_guild_tier_0:I = 0x7f12123f
 
-.field public static final premium_promo_title:I = 0x7f121240
+.field public static final premium_guild_tier_1:I = 0x7f121240
 
-.field public static final premium_required:I = 0x7f121241
+.field public static final premium_guild_tier_2:I = 0x7f121241
 
-.field public static final premium_required_get_nitro:I = 0x7f121242
+.field public static final premium_guild_tier_3:I = 0x7f121242
 
-.field public static final premium_restore_subscription_ios:I = 0x7f121243
+.field public static final premium_guild_unsubscribe_confirm_blurb:I = 0x7f121243
 
-.field public static final premium_retention_emoji_picker_description:I = 0x7f121244
+.field public static final premium_guild_unsubscribe_confirm_confirmation:I = 0x7f121244
 
-.field public static final premium_retention_emoji_picker_update_payment_information:I = 0x7f121245
+.field public static final premium_guild_unsubscribe_confirm_cooldown_warning:I = 0x7f121245
 
-.field public static final premium_settings:I = 0x7f121246
+.field public static final premium_guild_unsubscribe_confirm_cooldown_warning_days:I = 0x7f121246
 
-.field public static final premium_settings_billing_info:I = 0x7f121247
+.field public static final premium_guild_unsubscribe_confirm_cooldown_warning_hours:I = 0x7f121247
 
-.field public static final premium_settings_cancelled_info:I = 0x7f121248
+.field public static final premium_guild_unsubscribe_confirm_cooldown_warning_minutes:I = 0x7f121248
 
-.field public static final premium_settings_get:I = 0x7f121249
+.field public static final premium_guild_unsubscribe_confirm_header:I = 0x7f121249
 
-.field public static final premium_settings_manage:I = 0x7f12124a
+.field public static final premium_guild_user_feature_member_badge:I = 0x7f12124a
 
-.field public static final premium_settings_past_due_info:I = 0x7f12124b
+.field public static final premium_guild_user_feature_profile_badge:I = 0x7f12124b
 
-.field public static final premium_settings_renewal_info:I = 0x7f12124c
+.field public static final premium_guild_user_feature_role:I = 0x7f12124c
 
-.field public static final premium_settings_subscriptions_mobile_header:I = 0x7f12124d
+.field public static final premium_guild_user_features_header:I = 0x7f12124d
 
-.field public static final premium_subscription_adjustment_tooltip:I = 0x7f12124e
+.field public static final premium_included:I = 0x7f12124e
 
-.field public static final premium_subscription_billing_info_mobile:I = 0x7f12124f
+.field public static final premium_legacy:I = 0x7f12124f
 
-.field public static final premium_subscription_cancelled:I = 0x7f121250
+.field public static final premium_not_claimed:I = 0x7f121250
 
-.field public static final premium_subscription_credit:I = 0x7f121251
+.field public static final premium_not_claimed_body:I = 0x7f121251
 
-.field public static final premium_subscription_credit_applied_mismatched_plan:I = 0x7f121252
+.field public static final premium_not_verified:I = 0x7f121252
 
-.field public static final premium_subscription_credit_applied_on:I = 0x7f121253
+.field public static final premium_not_verified_body:I = 0x7f121253
 
-.field public static final premium_subscription_credit_count_months:I = 0x7f121254
+.field public static final premium_payment_confirmation_blurb_iap:I = 0x7f121254
 
-.field public static final premium_subscription_current_label:I = 0x7f121255
+.field public static final premium_payment_confirmation_blurb_regular:I = 0x7f121255
 
-.field public static final premium_subscription_description_tier_1:I = 0x7f121256
+.field public static final premium_payment_confirmation_button_iap:I = 0x7f121256
 
-.field public static final premium_subscription_description_tier_1_pending_cancelation:I = 0x7f121257
+.field public static final premium_payment_confirmation_button_regular:I = 0x7f121257
 
-.field public static final premium_subscription_description_tier_2:I = 0x7f121258
+.field public static final premium_payment_gift_blurb_mobile:I = 0x7f121258
 
-.field public static final premium_subscription_description_tier_2_pending_cancelation:I = 0x7f121259
+.field public static final premium_payment_gift_subtext_monthly:I = 0x7f121259
 
-.field public static final premium_subscription_grandfathered_upgrade_note:I = 0x7f12125a
+.field public static final premium_payment_gift_subtext_yearly:I = 0x7f12125a
 
-.field public static final premium_subscription_guild_subscription_adjustment:I = 0x7f12125b
+.field public static final premium_payment_is_gift:I = 0x7f12125b
 
-.field public static final premium_subscription_guild_subscription_adjustment_text:I = 0x7f12125c
+.field public static final premium_payment_select:I = 0x7f12125c
 
-.field public static final premium_subscription_guild_subscription_adjustment_tooltip:I = 0x7f12125d
+.field public static final premium_pending_plan_change_cancel_body:I = 0x7f12125d
 
-.field public static final premium_subscription_hide_details:I = 0x7f12125e
+.field public static final premium_pending_plan_change_cancel_button:I = 0x7f12125e
 
-.field public static final premium_subscription_new_label:I = 0x7f12125f
+.field public static final premium_pending_plan_change_cancel_header:I = 0x7f12125f
 
-.field public static final premium_subscription_new_total:I = 0x7f121260
+.field public static final premium_pending_plan_change_notice:I = 0x7f121260
 
-.field public static final premium_subscription_period_reset_notice:I = 0x7f121261
+.field public static final premium_plan_month:I = 0x7f121261
 
-.field public static final premium_subscription_plan_adjustment:I = 0x7f121262
+.field public static final premium_plan_month_tier_1:I = 0x7f121262
 
-.field public static final premium_subscription_policy_hint_ios:I = 0x7f121263
+.field public static final premium_plan_month_tier_2:I = 0x7f121263
 
-.field public static final premium_subscription_policy_ios:I = 0x7f121264
+.field public static final premium_plan_month_tier_2_trial:I = 0x7f121264
 
-.field public static final premium_subscription_renewal_footer:I = 0x7f121265
+.field public static final premium_plan_year:I = 0x7f121265
 
-.field public static final premium_subscription_renewal_footer_trial:I = 0x7f121266
+.field public static final premium_plan_year_tier_1:I = 0x7f121266
 
-.field public static final premium_subscription_required_body:I = 0x7f121267
+.field public static final premium_plan_year_tier_2:I = 0x7f121267
 
-.field public static final premium_subscription_show_details:I = 0x7f121268
+.field public static final premium_plan_year_tier_2_trial:I = 0x7f121268
 
-.field public static final premium_subscription_updates:I = 0x7f121269
+.field public static final premium_promo_description:I = 0x7f121269
 
-.field public static final premium_switch_plan_disabled_in_trial:I = 0x7f12126a
+.field public static final premium_promo_description_trial:I = 0x7f12126a
 
-.field public static final premium_switch_plan_disabled_pending_mutation_plan:I = 0x7f12126b
+.field public static final premium_promo_title:I = 0x7f12126b
 
-.field public static final premium_switch_plan_disabled_pending_mutation_premium_guild_subscription:I = 0x7f12126c
+.field public static final premium_required:I = 0x7f12126c
 
-.field public static final premium_switch_plans:I = 0x7f12126d
+.field public static final premium_required_get_nitro:I = 0x7f12126d
 
-.field public static final premium_switch_review_header_premium_month_tier_1:I = 0x7f12126e
+.field public static final premium_restore_subscription_ios:I = 0x7f12126e
 
-.field public static final premium_switch_review_header_premium_month_tier_2:I = 0x7f12126f
+.field public static final premium_retention_emoji_picker_description:I = 0x7f12126f
 
-.field public static final premium_switch_review_header_premium_year_tier_1:I = 0x7f121270
+.field public static final premium_retention_emoji_picker_update_payment_information:I = 0x7f121270
 
-.field public static final premium_switch_review_header_premium_year_tier_2:I = 0x7f121271
+.field public static final premium_settings:I = 0x7f121271
 
-.field public static final premium_tier_1:I = 0x7f121272
+.field public static final premium_settings_billing_info:I = 0x7f121272
 
-.field public static final premium_tier_2:I = 0x7f121273
+.field public static final premium_settings_cancelled_info:I = 0x7f121273
 
-.field public static final premium_tier_2_subtitle:I = 0x7f121274
+.field public static final premium_settings_get:I = 0x7f121274
 
-.field public static final premium_tier_2_title:I = 0x7f121275
+.field public static final premium_settings_manage:I = 0x7f121275
 
-.field public static final premium_tier_2_trial_cta_note:I = 0x7f121276
+.field public static final premium_settings_past_due_info:I = 0x7f121276
 
-.field public static final premium_tier_2_trial_cta_subtitle:I = 0x7f121277
+.field public static final premium_settings_renewal_info:I = 0x7f121277
 
-.field public static final premium_tier_2_trial_cta_title:I = 0x7f121278
+.field public static final premium_settings_subscriptions_mobile_header:I = 0x7f121278
 
-.field public static final premium_title:I = 0x7f121279
+.field public static final premium_subscription_adjustment_tooltip:I = 0x7f121279
 
-.field public static final premium_trial_cta_button:I = 0x7f12127a
+.field public static final premium_subscription_billing_info_mobile:I = 0x7f12127a
 
-.field public static final premium_trial_cta_descirption:I = 0x7f12127b
+.field public static final premium_subscription_cancelled:I = 0x7f12127b
 
-.field public static final premium_upgrade_disabled_in_trial:I = 0x7f12127c
+.field public static final premium_subscription_credit:I = 0x7f12127c
 
-.field public static final premium_upgrade_done_body_tier_1:I = 0x7f12127d
+.field public static final premium_subscription_credit_applied_mismatched_plan:I = 0x7f12127d
 
-.field public static final premium_upgrade_done_body_tier_2_guild_subscribe:I = 0x7f12127e
+.field public static final premium_subscription_credit_applied_on:I = 0x7f12127e
 
-.field public static final premium_upgrade_done_button:I = 0x7f12127f
+.field public static final premium_subscription_credit_count_months:I = 0x7f12127f
 
-.field public static final premium_upgrade_required_body:I = 0x7f121280
+.field public static final premium_subscription_current_label:I = 0x7f121280
 
-.field public static final premium_upload_promo:I = 0x7f121281
+.field public static final premium_subscription_description_tier_1:I = 0x7f121281
 
-.field public static final premium_upload_promo_trial:I = 0x7f121282
+.field public static final premium_subscription_description_tier_1_pending_cancelation:I = 0x7f121282
 
-.field public static final premium_upsell_animated_avatar_active_mobile:I = 0x7f121283
+.field public static final premium_subscription_description_tier_2:I = 0x7f121283
 
-.field public static final premium_upsell_animated_avatar_description_mobile:I = 0x7f121284
+.field public static final premium_subscription_description_tier_2_pending_cancelation:I = 0x7f121284
 
-.field public static final premium_upsell_animated_avatar_passive_mobile:I = 0x7f121285
+.field public static final premium_subscription_grandfathered_upgrade_note:I = 0x7f121285
 
-.field public static final premium_upsell_animated_emojis_active_mobile:I = 0x7f121286
+.field public static final premium_subscription_guild_subscription_adjustment:I = 0x7f121286
 
-.field public static final premium_upsell_animated_emojis_description_mobile:I = 0x7f121287
+.field public static final premium_subscription_guild_subscription_adjustment_text:I = 0x7f121287
 
-.field public static final premium_upsell_animated_emojis_passive_mobile:I = 0x7f121288
+.field public static final premium_subscription_guild_subscription_adjustment_tooltip:I = 0x7f121288
 
-.field public static final premium_upsell_badge_active_mobile:I = 0x7f121289
+.field public static final premium_subscription_hide_details:I = 0x7f121289
 
-.field public static final premium_upsell_badge_description_mobile:I = 0x7f12128a
+.field public static final premium_subscription_new_label:I = 0x7f12128a
 
-.field public static final premium_upsell_badge_passive_mobile:I = 0x7f12128b
+.field public static final premium_subscription_new_total:I = 0x7f12128b
 
-.field public static final premium_upsell_continue_to_boosts:I = 0x7f12128c
+.field public static final premium_subscription_period_reset_notice:I = 0x7f12128c
 
-.field public static final premium_upsell_emoji_active_mobile:I = 0x7f12128d
+.field public static final premium_subscription_plan_adjustment:I = 0x7f12128d
 
-.field public static final premium_upsell_emoji_description_mobile:I = 0x7f12128e
+.field public static final premium_subscription_policy_hint_ios:I = 0x7f12128e
 
-.field public static final premium_upsell_emoji_passive_mobile:I = 0x7f12128f
+.field public static final premium_subscription_policy_ios:I = 0x7f12128f
 
-.field public static final premium_upsell_feature_chat_perks:I = 0x7f121290
+.field public static final premium_subscription_renewal_footer:I = 0x7f121290
 
-.field public static final premium_upsell_feature_free_guild_subscription:I = 0x7f121291
+.field public static final premium_subscription_renewal_footer_trial:I = 0x7f121291
 
-.field public static final premium_upsell_feature_guild_subscription_discount:I = 0x7f121292
+.field public static final premium_subscription_required_body:I = 0x7f121292
 
-.field public static final premium_upsell_feature_pretext:I = 0x7f121293
+.field public static final premium_subscription_show_details:I = 0x7f121293
 
-.field public static final premium_upsell_feature_pretext_trial:I = 0x7f121294
+.field public static final premium_subscription_updates:I = 0x7f121294
 
-.field public static final premium_upsell_feature_stream:I = 0x7f121295
+.field public static final premium_switch_plan_disabled_in_trial:I = 0x7f121295
 
-.field public static final premium_upsell_feature_upload:I = 0x7f121296
+.field public static final premium_switch_plan_disabled_pending_mutation_plan:I = 0x7f121296
 
-.field public static final premium_upsell_tag_active_mobile:I = 0x7f121297
+.field public static final premium_switch_plan_disabled_pending_mutation_premium_guild_subscription:I = 0x7f121297
 
-.field public static final premium_upsell_tag_description_mobile:I = 0x7f121298
+.field public static final premium_switch_plans:I = 0x7f121298
 
-.field public static final premium_upsell_tag_passive_mobile:I = 0x7f121299
+.field public static final premium_switch_review_header_premium_month_tier_1:I = 0x7f121299
 
-.field public static final premium_upsell_upgrade:I = 0x7f12129a
+.field public static final premium_switch_review_header_premium_month_tier_2:I = 0x7f12129a
 
-.field public static final premium_upsell_upload_active_mobile:I = 0x7f12129b
+.field public static final premium_switch_review_header_premium_year_tier_1:I = 0x7f12129b
 
-.field public static final premium_upsell_upload_description_mobile:I = 0x7f12129c
+.field public static final premium_switch_review_header_premium_year_tier_2:I = 0x7f12129c
 
-.field public static final premium_upsell_upload_passive_mobile:I = 0x7f12129d
+.field public static final premium_tier_1:I = 0x7f12129d
 
-.field public static final preorder_sku_name:I = 0x7f12129e
+.field public static final premium_tier_2:I = 0x7f12129e
 
-.field public static final priority_speaker:I = 0x7f12129f
+.field public static final premium_tier_2_subtitle:I = 0x7f12129f
 
-.field public static final priority_speaker_description:I = 0x7f1212a0
+.field public static final premium_tier_2_title:I = 0x7f1212a0
 
-.field public static final priority_speaker_description_app:I = 0x7f1212a1
+.field public static final premium_tier_2_trial_cta_note:I = 0x7f1212a1
 
-.field public static final privacy_and_safety:I = 0x7f1212a2
+.field public static final premium_tier_2_trial_cta_subtitle:I = 0x7f1212a2
 
-.field public static final privacy_policy:I = 0x7f1212a3
+.field public static final premium_tier_2_trial_cta_title:I = 0x7f1212a3
 
-.field public static final privacy_policy_url:I = 0x7f1212a4
+.field public static final premium_title:I = 0x7f1212a4
 
-.field public static final privacy_settings:I = 0x7f1212a5
+.field public static final premium_trial_cta_button:I = 0x7f1212a5
 
-.field public static final private_category:I = 0x7f1212a6
+.field public static final premium_trial_cta_descirption:I = 0x7f1212a6
 
-.field public static final private_category_note:I = 0x7f1212a7
+.field public static final premium_upgrade_disabled_in_trial:I = 0x7f1212a7
 
-.field public static final private_channel:I = 0x7f1212a8
+.field public static final premium_upgrade_done_body_tier_1:I = 0x7f1212a8
 
-.field public static final private_channel_modal_access_owner:I = 0x7f1212a9
+.field public static final premium_upgrade_done_body_tier_2_guild_subscribe:I = 0x7f1212a9
 
-.field public static final private_channel_modal_access_you:I = 0x7f1212aa
+.field public static final premium_upgrade_done_button:I = 0x7f1212aa
 
-.field public static final private_channel_modal_admin_role_force_enabled:I = 0x7f1212ab
+.field public static final premium_upgrade_required_body:I = 0x7f1212ab
 
-.field public static final private_channel_modal_no_roles:I = 0x7f1212ac
+.field public static final premium_upload_promo:I = 0x7f1212ac
 
-.field public static final private_channel_modal_no_roles_create:I = 0x7f1212ad
+.field public static final premium_upload_promo_trial:I = 0x7f1212ad
 
-.field public static final private_channel_modal_no_roles_edit:I = 0x7f1212ae
+.field public static final premium_upsell_animated_avatar_active_mobile:I = 0x7f1212ae
 
-.field public static final private_channel_note:I = 0x7f1212af
+.field public static final premium_upsell_animated_avatar_description_mobile:I = 0x7f1212af
 
-.field public static final private_channels_a11y_label:I = 0x7f1212b0
+.field public static final premium_upsell_animated_avatar_passive_mobile:I = 0x7f1212b0
 
-.field public static final profile:I = 0x7f1212b1
+.field public static final premium_upsell_animated_emojis_active_mobile:I = 0x7f1212b1
 
-.field public static final progress_completed:I = 0x7f1212b2
+.field public static final premium_upsell_animated_emojis_description_mobile:I = 0x7f1212b2
 
-.field public static final progress_completed_description:I = 0x7f1212b3
+.field public static final premium_upsell_animated_emojis_passive_mobile:I = 0x7f1212b3
 
-.field public static final progress_steps:I = 0x7f1212b4
+.field public static final premium_upsell_badge_active_mobile:I = 0x7f1212b4
 
-.field public static final progress_steps_finished:I = 0x7f1212b5
+.field public static final premium_upsell_badge_description_mobile:I = 0x7f1212b5
 
-.field public static final promotion_card_body_redeemed_hidden:I = 0x7f1212b7
+.field public static final premium_upsell_badge_passive_mobile:I = 0x7f1212b6
 
-.field public static final prune:I = 0x7f1212b8
+.field public static final premium_upsell_continue_to_boosts:I = 0x7f1212b7
 
-.field public static final prune_members:I = 0x7f1212b9
+.field public static final premium_upsell_emoji_active_mobile:I = 0x7f1212b8
 
-.field public static final prune_with_roles:I = 0x7f1212ba
+.field public static final premium_upsell_emoji_description_mobile:I = 0x7f1212b9
 
-.field public static final pt_br:I = 0x7f1212bb
+.field public static final premium_upsell_emoji_passive_mobile:I = 0x7f1212ba
 
-.field public static final ptt_limited_body:I = 0x7f1212bc
+.field public static final premium_upsell_feature_chat_perks:I = 0x7f1212bb
 
-.field public static final ptt_limited_title:I = 0x7f1212bd
+.field public static final premium_upsell_feature_free_guild_subscription:I = 0x7f1212bc
 
-.field public static final ptt_limited_warning:I = 0x7f1212be
+.field public static final premium_upsell_feature_guild_subscription_discount:I = 0x7f1212bd
 
-.field public static final ptt_permission_body:I = 0x7f1212bf
+.field public static final premium_upsell_feature_pretext:I = 0x7f1212be
 
-.field public static final ptt_permission_title:I = 0x7f1212c0
+.field public static final premium_upsell_feature_pretext_trial:I = 0x7f1212bf
 
-.field public static final public_guild_policy_accept:I = 0x7f1212c1
+.field public static final premium_upsell_feature_stream:I = 0x7f1212c0
 
-.field public static final public_guild_policy_title:I = 0x7f1212c2
+.field public static final premium_upsell_feature_upload:I = 0x7f1212c1
 
-.field public static final public_locale_help:I = 0x7f1212c3
+.field public static final premium_upsell_tag_active_mobile:I = 0x7f1212c2
 
-.field public static final public_locale_selector_title:I = 0x7f1212c4
+.field public static final premium_upsell_tag_description_mobile:I = 0x7f1212c3
 
-.field public static final public_locale_title:I = 0x7f1212c5
+.field public static final premium_upsell_tag_passive_mobile:I = 0x7f1212c4
 
-.field public static final public_rules_channel_title:I = 0x7f1212c6
+.field public static final premium_upsell_upgrade:I = 0x7f1212c5
 
-.field public static final public_rules_selector_title:I = 0x7f1212c7
+.field public static final premium_upsell_upload_active_mobile:I = 0x7f1212c6
 
-.field public static final public_updates_channel_title:I = 0x7f1212c8
+.field public static final premium_upsell_upload_description_mobile:I = 0x7f1212c7
 
-.field public static final publish_followed_news_body:I = 0x7f1212c9
+.field public static final premium_upsell_upload_passive_mobile:I = 0x7f1212c8
 
-.field public static final publish_followed_news_body_reach:I = 0x7f1212ca
+.field public static final preorder_sku_name:I = 0x7f1212c9
 
-.field public static final publish_followed_news_body_settings:I = 0x7f1212cb
+.field public static final priority_speaker:I = 0x7f1212ca
 
-.field public static final publish_followed_news_body_settings_body:I = 0x7f1212cc
+.field public static final priority_speaker_description:I = 0x7f1212cb
 
-.field public static final publish_followed_news_fail_body:I = 0x7f1212cd
+.field public static final priority_speaker_description_app:I = 0x7f1212cc
 
-.field public static final publish_followed_news_fail_title:I = 0x7f1212ce
+.field public static final privacy_and_safety:I = 0x7f1212cd
 
-.field public static final publish_followed_news_generic_body:I = 0x7f1212cf
+.field public static final privacy_policy:I = 0x7f1212ce
 
-.field public static final purple:I = 0x7f1212d0
+.field public static final privacy_policy_url:I = 0x7f1212cf
 
-.field public static final qr_code_fail:I = 0x7f1212d1
+.field public static final privacy_settings:I = 0x7f1212d0
 
-.field public static final qr_code_fail_description:I = 0x7f1212d2
+.field public static final private_category:I = 0x7f1212d1
 
-.field public static final qr_code_in_app_scanner_only:I = 0x7f1212d3
+.field public static final private_category_note:I = 0x7f1212d2
 
-.field public static final qr_code_invalid:I = 0x7f1212d4
+.field public static final private_channel:I = 0x7f1212d3
 
-.field public static final qr_code_login_confirm:I = 0x7f1212d5
+.field public static final private_channel_modal_access_owner:I = 0x7f1212d4
 
-.field public static final qr_code_login_finish_button:I = 0x7f1212d6
+.field public static final private_channel_modal_access_you:I = 0x7f1212d5
 
-.field public static final qr_code_login_start_over:I = 0x7f1212d7
+.field public static final private_channel_modal_admin_role_force_enabled:I = 0x7f1212d6
 
-.field public static final qr_code_login_success:I = 0x7f1212d8
+.field public static final private_channel_modal_no_roles:I = 0x7f1212d7
 
-.field public static final qr_code_login_success_flavor:I = 0x7f1212d9
+.field public static final private_channel_modal_no_roles_create:I = 0x7f1212d8
 
-.field public static final qr_code_not_found:I = 0x7f1212da
+.field public static final private_channel_modal_no_roles_edit:I = 0x7f1212d9
 
-.field public static final qr_code_not_found_description:I = 0x7f1212db
+.field public static final private_channel_note:I = 0x7f1212da
 
-.field public static final quality_indicator:I = 0x7f1212dc
+.field public static final private_channels_a11y_label:I = 0x7f1212db
 
-.field public static final quick_dm_blocked:I = 0x7f1212dd
+.field public static final profile:I = 0x7f1212dc
 
-.field public static final quick_dm_user:I = 0x7f1212de
+.field public static final progress_completed:I = 0x7f1212dd
 
-.field public static final quick_switcher:I = 0x7f1212df
+.field public static final progress_completed_description:I = 0x7f1212de
 
-.field public static final quickswitcher_drafts:I = 0x7f1212e0
+.field public static final progress_steps:I = 0x7f1212df
 
-.field public static final quickswitcher_empty_cta:I = 0x7f1212e1
+.field public static final progress_steps_finished:I = 0x7f1212e0
 
-.field public static final quickswitcher_empty_text:I = 0x7f1212e2
+.field public static final promotion_card_body_redeemed_hidden:I = 0x7f1212e2
 
-.field public static final quickswitcher_last_channel:I = 0x7f1212e3
+.field public static final prune:I = 0x7f1212e3
 
-.field public static final quickswitcher_mentions:I = 0x7f1212e4
+.field public static final prune_members:I = 0x7f1212e4
 
-.field public static final quickswitcher_notice:I = 0x7f1212e5
+.field public static final prune_with_roles:I = 0x7f1212e5
 
-.field public static final quickswitcher_placeholder:I = 0x7f1212e6
+.field public static final pt_br:I = 0x7f1212e6
 
-.field public static final quickswitcher_protip:I = 0x7f1212e7
+.field public static final ptt_limited_body:I = 0x7f1212e7
 
-.field public static final quickswitcher_protip_guilds:I = 0x7f1212e8
+.field public static final ptt_limited_title:I = 0x7f1212e8
 
-.field public static final quickswitcher_protip_text_channels:I = 0x7f1212e9
+.field public static final ptt_limited_warning:I = 0x7f1212e9
 
-.field public static final quickswitcher_protip_usernames:I = 0x7f1212ea
+.field public static final ptt_permission_body:I = 0x7f1212ea
 
-.field public static final quickswitcher_protip_voice_channels:I = 0x7f1212eb
+.field public static final ptt_permission_title:I = 0x7f1212eb
 
-.field public static final quickswitcher_querymode_applications:I = 0x7f1212ec
+.field public static final public_guild_policy_accept:I = 0x7f1212ec
 
-.field public static final quickswitcher_querymode_guilds:I = 0x7f1212ed
+.field public static final public_guild_policy_title:I = 0x7f1212ed
 
-.field public static final quickswitcher_querymode_text_channels:I = 0x7f1212ee
+.field public static final public_locale_help:I = 0x7f1212ee
 
-.field public static final quickswitcher_querymode_users:I = 0x7f1212ef
+.field public static final public_locale_selector_title:I = 0x7f1212ef
 
-.field public static final quickswitcher_querymode_users_in_guild:I = 0x7f1212f0
+.field public static final public_locale_title:I = 0x7f1212f0
 
-.field public static final quickswitcher_querymode_voice_channels:I = 0x7f1212f1
+.field public static final public_rules_channel_title:I = 0x7f1212f1
 
-.field public static final quickswitcher_tip_nav:I = 0x7f1212f2
+.field public static final public_rules_selector_title:I = 0x7f1212f2
 
-.field public static final quickswitcher_tip_select:I = 0x7f1212f3
+.field public static final public_updates_channel_title:I = 0x7f1212f3
 
-.field public static final quickswitcher_tutorial_message_search:I = 0x7f1212f4
+.field public static final publish_followed_news_body:I = 0x7f1212f4
 
-.field public static final quickswitcher_tutorial_message_select:I = 0x7f1212f5
+.field public static final publish_followed_news_body_reach:I = 0x7f1212f5
 
-.field public static final quickswitcher_unread_channels:I = 0x7f1212f6
+.field public static final publish_followed_news_body_settings_insights:I = 0x7f1212f6
 
-.field public static final quote:I = 0x7f1212f7
+.field public static final publish_followed_news_fail_body:I = 0x7f1212f7
 
-.field public static final quote_attribution:I = 0x7f1212f8
+.field public static final publish_followed_news_fail_title:I = 0x7f1212f8
 
-.field public static final quote_attribution_facebook:I = 0x7f1212f9
+.field public static final publish_followed_news_generic_body:I = 0x7f1212f9
 
-.field public static final quote_attribution_instagram:I = 0x7f1212fa
+.field public static final purple:I = 0x7f1212fa
 
-.field public static final rate_limited:I = 0x7f1212fb
+.field public static final qr_code_fail:I = 0x7f1212fb
 
-.field public static final rating_request_body_android:I = 0x7f1212fc
+.field public static final qr_code_fail_description:I = 0x7f1212fc
 
-.field public static final rating_request_title:I = 0x7f1212fd
+.field public static final qr_code_in_app_scanner_only:I = 0x7f1212fd
 
-.field public static final react_with_label:I = 0x7f1212fe
+.field public static final qr_code_invalid:I = 0x7f1212fe
 
-.field public static final reaction_tooltip_1:I = 0x7f1212ff
+.field public static final qr_code_login_confirm:I = 0x7f1212ff
 
-.field public static final reaction_tooltip_1_n:I = 0x7f121300
+.field public static final qr_code_login_finish_button:I = 0x7f121300
 
-.field public static final reaction_tooltip_2:I = 0x7f121301
+.field public static final qr_code_login_start_over:I = 0x7f121301
 
-.field public static final reaction_tooltip_2_n:I = 0x7f121302
+.field public static final qr_code_login_success:I = 0x7f121302
 
-.field public static final reaction_tooltip_3:I = 0x7f121303
+.field public static final qr_code_login_success_flavor:I = 0x7f121303
 
-.field public static final reaction_tooltip_3_n:I = 0x7f121304
+.field public static final qr_code_not_found:I = 0x7f121304
 
-.field public static final reaction_tooltip_n:I = 0x7f121305
+.field public static final qr_code_not_found_description:I = 0x7f121305
 
-.field public static final reactions:I = 0x7f121306
+.field public static final quality_indicator:I = 0x7f121306
 
-.field public static final reactions_matching:I = 0x7f121307
+.field public static final quick_dm_blocked:I = 0x7f121307
 
-.field public static final read_message_history:I = 0x7f121308
+.field public static final quick_dm_user:I = 0x7f121308
 
-.field public static final read_messages:I = 0x7f121309
+.field public static final quick_switcher:I = 0x7f121309
 
-.field public static final read_messages_view_channels:I = 0x7f12130a
+.field public static final quickswitcher_drafts:I = 0x7f12130a
 
-.field public static final read_only_channel:I = 0x7f12130b
+.field public static final quickswitcher_empty_cta:I = 0x7f12130b
 
-.field public static final ready:I = 0x7f12130c
+.field public static final quickswitcher_empty_text:I = 0x7f12130c
 
-.field public static final recent_mentions:I = 0x7f12130d
+.field public static final quickswitcher_last_channel:I = 0x7f12130d
 
-.field public static final recent_mentions_direct_only:I = 0x7f12130e
+.field public static final quickswitcher_mentions:I = 0x7f12130e
 
-.field public static final recent_mentions_empty_state_header:I = 0x7f12130f
+.field public static final quickswitcher_notice:I = 0x7f12130f
 
-.field public static final recent_mentions_empty_state_tip:I = 0x7f121310
+.field public static final quickswitcher_placeholder:I = 0x7f121310
 
-.field public static final recent_mentions_everyone_and_direct:I = 0x7f121311
+.field public static final quickswitcher_protip:I = 0x7f121311
 
-.field public static final recent_mentions_filter_all_servers:I = 0x7f121312
+.field public static final quickswitcher_protip_guilds:I = 0x7f121312
 
-.field public static final recent_mentions_filter_everyone:I = 0x7f121313
+.field public static final quickswitcher_protip_text_channels:I = 0x7f121313
 
-.field public static final recent_mentions_filter_explain_everything:I = 0x7f121314
+.field public static final quickswitcher_protip_usernames:I = 0x7f121314
 
-.field public static final recent_mentions_filter_label:I = 0x7f121315
+.field public static final quickswitcher_protip_voice_channels:I = 0x7f121315
 
-.field public static final recent_mentions_filter_roles:I = 0x7f121316
+.field public static final quickswitcher_querymode_applications:I = 0x7f121316
 
-.field public static final recent_mentions_pro_tip:I = 0x7f121317
+.field public static final quickswitcher_querymode_guilds:I = 0x7f121317
 
-.field public static final recent_mentions_roles_and_direct:I = 0x7f121318
+.field public static final quickswitcher_querymode_text_channels:I = 0x7f121318
 
-.field public static final recents_notifications_menu_label:I = 0x7f121319
+.field public static final quickswitcher_querymode_users:I = 0x7f121319
 
-.field public static final reconnect:I = 0x7f12131a
+.field public static final quickswitcher_querymode_users_in_guild:I = 0x7f12131a
 
-.field public static final reconnecting:I = 0x7f12131b
+.field public static final quickswitcher_querymode_voice_channels:I = 0x7f12131b
 
-.field public static final refund:I = 0x7f12131c
+.field public static final quickswitcher_tip_nav:I = 0x7f12131c
 
-.field public static final region:I = 0x7f12131d
+.field public static final quickswitcher_tip_select:I = 0x7f12131d
 
-.field public static final region_select_footer:I = 0x7f12131e
+.field public static final quickswitcher_tutorial_message_search:I = 0x7f12131e
 
-.field public static final region_select_header:I = 0x7f12131f
+.field public static final quickswitcher_tutorial_message_select:I = 0x7f12131f
 
-.field public static final register:I = 0x7f121320
+.field public static final quickswitcher_unread_channels:I = 0x7f121320
 
-.field public static final register_body:I = 0x7f121321
+.field public static final quote:I = 0x7f121321
 
-.field public static final register_title:I = 0x7f121322
+.field public static final quote_attribution:I = 0x7f121322
 
-.field public static final remaining_participants:I = 0x7f121323
+.field public static final quote_attribution_facebook:I = 0x7f121323
 
-.field public static final remind_me_later:I = 0x7f121324
+.field public static final quote_attribution_instagram:I = 0x7f121324
 
-.field public static final remove:I = 0x7f121325
+.field public static final rate_limited:I = 0x7f121325
 
-.field public static final remove_all_reactions:I = 0x7f121326
+.field public static final rating_request_body_android:I = 0x7f121326
 
-.field public static final remove_all_reactions_confirm_body:I = 0x7f121327
+.field public static final rating_request_title:I = 0x7f121327
 
-.field public static final remove_all_reactions_confirm_title:I = 0x7f121328
+.field public static final react_with_label:I = 0x7f121328
 
-.field public static final remove_friend:I = 0x7f121329
+.field public static final reaction_tooltip_1:I = 0x7f121329
 
-.field public static final remove_friend_body:I = 0x7f12132a
+.field public static final reaction_tooltip_1_n:I = 0x7f12132a
 
-.field public static final remove_friend_title:I = 0x7f12132b
+.field public static final reaction_tooltip_2:I = 0x7f12132b
 
-.field public static final remove_from_group:I = 0x7f12132c
+.field public static final reaction_tooltip_2_n:I = 0x7f12132c
 
-.field public static final remove_from_thread:I = 0x7f12132d
+.field public static final reaction_tooltip_3:I = 0x7f12132d
 
-.field public static final remove_icon:I = 0x7f12132e
+.field public static final reaction_tooltip_3_n:I = 0x7f12132e
 
-.field public static final remove_keybind:I = 0x7f12132f
+.field public static final reaction_tooltip_n:I = 0x7f12132f
 
-.field public static final remove_reaction:I = 0x7f121330
+.field public static final reactions:I = 0x7f121330
 
-.field public static final remove_role_or_user:I = 0x7f121331
+.field public static final reactions_matching:I = 0x7f121331
 
-.field public static final remove_synced_role:I = 0x7f121332
+.field public static final read_message_history:I = 0x7f121332
 
-.field public static final remove_vanity_url:I = 0x7f121333
+.field public static final read_messages:I = 0x7f121333
 
-.field public static final render_embeds:I = 0x7f121334
+.field public static final read_messages_view_channels:I = 0x7f121334
 
-.field public static final render_embeds_label:I = 0x7f121335
+.field public static final read_only_channel:I = 0x7f121335
 
-.field public static final render_reactions:I = 0x7f121336
+.field public static final ready:I = 0x7f121336
 
-.field public static final reply_quote_click_to_view:I = 0x7f121337
+.field public static final recent_mentions:I = 0x7f121337
 
-.field public static final replying_to:I = 0x7f121338
+.field public static final recent_mentions_direct_only:I = 0x7f121338
 
-.field public static final report:I = 0x7f121339
+.field public static final recent_mentions_empty_state_header:I = 0x7f121339
 
-.field public static final report_message:I = 0x7f12133a
+.field public static final recent_mentions_empty_state_tip:I = 0x7f12133a
 
-.field public static final report_message_menu_option:I = 0x7f12133b
+.field public static final recent_mentions_everyone_and_direct:I = 0x7f12133b
 
-.field public static final report_modal_block_user:I = 0x7f12133c
+.field public static final recent_mentions_filter_all_servers:I = 0x7f12133c
 
-.field public static final report_modal_description:I = 0x7f12133d
+.field public static final recent_mentions_filter_everyone:I = 0x7f12133d
 
-.field public static final report_modal_description_max_exceeded:I = 0x7f12133e
+.field public static final recent_mentions_filter_explain_everything:I = 0x7f12133e
 
-.field public static final report_modal_description_min_max:I = 0x7f12133f
+.field public static final recent_mentions_filter_label:I = 0x7f12133f
 
-.field public static final report_modal_error:I = 0x7f121340
+.field public static final recent_mentions_filter_roles:I = 0x7f121340
 
-.field public static final report_modal_message_selected:I = 0x7f121341
+.field public static final recent_mentions_pro_tip:I = 0x7f121341
 
-.field public static final report_modal_report_message:I = 0x7f121342
+.field public static final recent_mentions_roles_and_direct:I = 0x7f121342
 
-.field public static final report_modal_select_one:I = 0x7f121343
+.field public static final recents_notifications_menu_label:I = 0x7f121343
 
-.field public static final report_modal_should_block:I = 0x7f121344
+.field public static final reconnect:I = 0x7f121344
 
-.field public static final report_modal_should_delete:I = 0x7f121345
+.field public static final reconnecting:I = 0x7f121345
 
-.field public static final report_modal_subject:I = 0x7f121346
+.field public static final refund:I = 0x7f121346
 
-.field public static final report_modal_submit:I = 0x7f121347
+.field public static final region:I = 0x7f121347
 
-.field public static final report_modal_submitted:I = 0x7f121348
+.field public static final region_select_footer:I = 0x7f121348
 
-.field public static final report_modal_submitted_email_confirmation:I = 0x7f121349
+.field public static final region_select_header:I = 0x7f121349
 
-.field public static final report_modal_type_title:I = 0x7f12134a
+.field public static final register:I = 0x7f12134a
 
-.field public static final report_server:I = 0x7f12134b
+.field public static final register_body:I = 0x7f12134b
 
-.field public static final report_user:I = 0x7f12134c
+.field public static final register_title:I = 0x7f12134c
 
-.field public static final resend:I = 0x7f12134d
+.field public static final remaining_participants:I = 0x7f12134d
 
-.field public static final resend_code:I = 0x7f12134e
+.field public static final remind_me_later:I = 0x7f12134e
 
-.field public static final resend_email:I = 0x7f12134f
+.field public static final remove:I = 0x7f12134f
 
-.field public static final resend_message:I = 0x7f121350
+.field public static final remove_all_reactions:I = 0x7f121350
 
-.field public static final resend_verification_email:I = 0x7f121351
+.field public static final remove_all_reactions_confirm_body:I = 0x7f121351
 
-.field public static final reset:I = 0x7f121352
+.field public static final remove_all_reactions_confirm_title:I = 0x7f121352
 
-.field public static final reset_nickname:I = 0x7f121353
+.field public static final remove_friend:I = 0x7f121353
 
-.field public static final reset_notification_override:I = 0x7f121354
+.field public static final remove_friend_body:I = 0x7f121354
 
-.field public static final reset_notification_settings:I = 0x7f121355
+.field public static final remove_friend_title:I = 0x7f121355
 
-.field public static final reset_password_title:I = 0x7f121356
+.field public static final remove_from_group:I = 0x7f121356
 
-.field public static final reset_to_default:I = 0x7f121357
+.field public static final remove_from_thread:I = 0x7f121357
 
-.field public static final reset_voice_settings:I = 0x7f121358
+.field public static final remove_icon:I = 0x7f121358
 
-.field public static final reset_voice_settings_body:I = 0x7f121359
+.field public static final remove_keybind:I = 0x7f121359
 
-.field public static final resubscribe:I = 0x7f12135a
+.field public static final remove_reaction:I = 0x7f12135a
 
-.field public static final retry:I = 0x7f12135b
+.field public static final remove_role_or_user:I = 0x7f12135b
 
-.field public static final return_to_login:I = 0x7f12135c
+.field public static final remove_synced_role:I = 0x7f12135c
 
-.field public static final reversed:I = 0x7f12135d
+.field public static final remove_vanity_url:I = 0x7f12135d
 
-.field public static final revoke:I = 0x7f12135e
+.field public static final render_embeds:I = 0x7f12135e
 
-.field public static final revoke_ban:I = 0x7f12135f
+.field public static final render_embeds_label:I = 0x7f12135f
 
-.field public static final ring:I = 0x7f121360
+.field public static final render_reactions:I = 0x7f121360
 
-.field public static final ro:I = 0x7f121361
+.field public static final reply_quote_click_to_view:I = 0x7f121361
 
-.field public static final role_color:I = 0x7f121362
+.field public static final replying_to:I = 0x7f121362
 
-.field public static final role_id_copied:I = 0x7f121363
+.field public static final report:I = 0x7f121363
 
-.field public static final role_order_updated:I = 0x7f121364
+.field public static final report_message:I = 0x7f121364
 
-.field public static final role_required_edit_roles_modal_subtitle:I = 0x7f121365
+.field public static final report_message_menu_option:I = 0x7f121365
 
-.field public static final role_required_edit_roles_modal_title:I = 0x7f121366
+.field public static final report_modal_block_user:I = 0x7f121366
 
-.field public static final role_required_single_user_message:I = 0x7f121367
+.field public static final report_modal_description:I = 0x7f121367
 
-.field public static final roles:I = 0x7f121368
+.field public static final report_modal_description_max_exceeded:I = 0x7f121368
 
-.field public static final roles_list:I = 0x7f121369
+.field public static final report_modal_description_min_max:I = 0x7f121369
 
-.field public static final rtc_connection:I = 0x7f12136a
+.field public static final report_modal_error:I = 0x7f12136a
 
-.field public static final rtc_connection_state_authenticating:I = 0x7f12136b
+.field public static final report_modal_message_selected:I = 0x7f12136b
 
-.field public static final rtc_connection_state_awaiting_endpoint:I = 0x7f12136c
+.field public static final report_modal_report_message:I = 0x7f12136c
 
-.field public static final rtc_connection_state_connecting:I = 0x7f12136d
+.field public static final report_modal_select_one:I = 0x7f12136d
 
-.field public static final rtc_connection_state_disconnected:I = 0x7f12136e
+.field public static final report_modal_should_block:I = 0x7f12136e
 
-.field public static final rtc_connection_state_ice_checking:I = 0x7f12136f
+.field public static final report_modal_should_delete:I = 0x7f12136f
 
-.field public static final rtc_connection_state_no_route:I = 0x7f121370
+.field public static final report_modal_subject:I = 0x7f121370
 
-.field public static final rtc_connection_state_rtc_connected:I = 0x7f121371
+.field public static final report_modal_submit:I = 0x7f121371
 
-.field public static final rtc_connection_state_rtc_connected_loss_rate:I = 0x7f121372
+.field public static final report_modal_submitted:I = 0x7f121372
 
-.field public static final rtc_connection_state_rtc_connecting:I = 0x7f121373
+.field public static final report_modal_submitted_email_confirmation:I = 0x7f121373
 
-.field public static final rtc_debug_context:I = 0x7f121374
+.field public static final report_modal_type_title:I = 0x7f121374
 
-.field public static final rtc_debug_open:I = 0x7f121375
+.field public static final report_server:I = 0x7f121375
 
-.field public static final rtc_debug_rtp_inbound:I = 0x7f121376
+.field public static final report_user:I = 0x7f121376
 
-.field public static final rtc_debug_rtp_outbound:I = 0x7f121377
+.field public static final resend:I = 0x7f121377
 
-.field public static final rtc_debug_screenshare:I = 0x7f121378
+.field public static final resend_code:I = 0x7f121378
 
-.field public static final rtc_debug_transport:I = 0x7f121379
+.field public static final resend_email:I = 0x7f121379
 
-.field public static final ru:I = 0x7f12137a
+.field public static final resend_message:I = 0x7f12137a
 
-.field public static final salmon:I = 0x7f12137b
+.field public static final resend_verification_email:I = 0x7f12137b
 
-.field public static final sample_channel_message:I = 0x7f12137c
+.field public static final reset:I = 0x7f12137c
 
-.field public static final sample_channel_name:I = 0x7f12137d
+.field public static final reset_nickname:I = 0x7f12137d
 
-.field public static final sample_channel_name_short:I = 0x7f12137e
+.field public static final reset_notification_override:I = 0x7f12137e
 
-.field public static final sample_channel_search_filter:I = 0x7f12137f
+.field public static final reset_notification_settings:I = 0x7f12137f
 
-.field public static final sample_confirmation:I = 0x7f121380
+.field public static final reset_password_title:I = 0x7f121380
 
-.field public static final sample_connected_account:I = 0x7f121381
+.field public static final reset_to_default:I = 0x7f121381
 
-.field public static final sample_discrim:I = 0x7f121382
+.field public static final reset_voice_settings:I = 0x7f121382
 
-.field public static final sample_email:I = 0x7f121383
+.field public static final reset_voice_settings_body:I = 0x7f121383
 
-.field public static final sample_empty_string:I = 0x7f121384
+.field public static final resubscribe:I = 0x7f121384
 
-.field public static final sample_language:I = 0x7f121385
+.field public static final retry:I = 0x7f121385
 
-.field public static final sample_notification_frequency:I = 0x7f121386
+.field public static final return_to_login:I = 0x7f121386
 
-.field public static final sample_number_9:I = 0x7f121387
+.field public static final reversed:I = 0x7f121387
 
-.field public static final sample_number_99:I = 0x7f121388
+.field public static final revoke:I = 0x7f121388
 
-.field public static final sample_number_999:I = 0x7f121389
+.field public static final revoke_ban:I = 0x7f121389
 
-.field public static final sample_number_9999:I = 0x7f12138a
+.field public static final ring:I = 0x7f12138a
 
-.field public static final sample_number_bandwidth:I = 0x7f12138b
+.field public static final ro:I = 0x7f12138b
 
-.field public static final sample_number_ratio:I = 0x7f12138c
+.field public static final role_color:I = 0x7f12138c
 
-.field public static final sample_online_members:I = 0x7f12138d
+.field public static final role_id_copied:I = 0x7f12138d
 
-.field public static final sample_server_name:I = 0x7f12138e
+.field public static final role_order_updated:I = 0x7f12138e
 
-.field public static final sample_server_name_short:I = 0x7f12138f
+.field public static final role_required_edit_roles_modal_subtitle:I = 0x7f12138f
 
-.field public static final sample_server_role_name:I = 0x7f121390
+.field public static final role_required_edit_roles_modal_title:I = 0x7f121390
 
-.field public static final sample_time_duration_minutes:I = 0x7f121391
+.field public static final role_required_single_user_message:I = 0x7f121391
 
-.field public static final sample_time_duration_seconds:I = 0x7f121392
+.field public static final roles:I = 0x7f121392
 
-.field public static final sample_time_pm:I = 0x7f121393
+.field public static final roles_list:I = 0x7f121393
 
-.field public static final sample_time_stamp:I = 0x7f121394
+.field public static final rtc_connection:I = 0x7f121394
 
-.field public static final sample_total_members:I = 0x7f121395
+.field public static final rtc_connection_state_authenticating:I = 0x7f121395
 
-.field public static final sample_user_generated_link:I = 0x7f121396
+.field public static final rtc_connection_state_awaiting_endpoint:I = 0x7f121396
 
-.field public static final sample_user_name:I = 0x7f121397
+.field public static final rtc_connection_state_connecting:I = 0x7f121397
 
-.field public static final sample_user_name_discrim:I = 0x7f121398
+.field public static final rtc_connection_state_disconnected:I = 0x7f121398
 
-.field public static final sample_user_nick:I = 0x7f121399
+.field public static final rtc_connection_state_ice_checking:I = 0x7f121399
 
-.field public static final sample_user_presence:I = 0x7f12139a
+.field public static final rtc_connection_state_no_route:I = 0x7f12139a
 
-.field public static final sample_user_presence_details:I = 0x7f12139b
+.field public static final rtc_connection_state_rtc_connected:I = 0x7f12139b
 
-.field public static final save:I = 0x7f12139c
+.field public static final rtc_connection_state_rtc_connected_loss_rate:I = 0x7f12139c
 
-.field public static final save_changes:I = 0x7f12139d
+.field public static final rtc_connection_state_rtc_connecting:I = 0x7f12139d
 
-.field public static final save_image:I = 0x7f12139e
+.field public static final rtc_debug_context:I = 0x7f12139e
 
-.field public static final save_image_preview:I = 0x7f12139f
+.field public static final rtc_debug_open:I = 0x7f12139f
 
-.field public static final save_media_failure_help_mobile:I = 0x7f1213a0
+.field public static final rtc_debug_rtp_inbound:I = 0x7f1213a0
 
-.field public static final save_media_failure_mobile:I = 0x7f1213a1
+.field public static final rtc_debug_rtp_outbound:I = 0x7f1213a1
 
-.field public static final save_media_success_mobile:I = 0x7f1213a2
+.field public static final rtc_debug_screenshare:I = 0x7f1213a2
 
-.field public static final saved_settings:I = 0x7f1213a3
+.field public static final rtc_debug_transport:I = 0x7f1213a3
 
-.field public static final scope_activities_read:I = 0x7f1213a4
+.field public static final ru:I = 0x7f1213a4
 
-.field public static final scope_activities_read_description:I = 0x7f1213a5
+.field public static final salmon:I = 0x7f1213a5
 
-.field public static final scope_activities_write:I = 0x7f1213a6
+.field public static final sample_channel_message:I = 0x7f1213a6
 
-.field public static final scope_activities_write_description:I = 0x7f1213a7
+.field public static final sample_channel_name:I = 0x7f1213a7
 
-.field public static final scope_applications_builds_read:I = 0x7f1213a8
+.field public static final sample_channel_name_short:I = 0x7f1213a8
 
-.field public static final scope_applications_builds_read_description:I = 0x7f1213a9
+.field public static final sample_channel_search_filter:I = 0x7f1213a9
 
-.field public static final scope_applications_builds_upload:I = 0x7f1213aa
+.field public static final sample_confirmation:I = 0x7f1213aa
 
-.field public static final scope_applications_builds_upload_description:I = 0x7f1213ab
+.field public static final sample_connected_account:I = 0x7f1213ab
 
-.field public static final scope_applications_entitlements:I = 0x7f1213ac
+.field public static final sample_discrim:I = 0x7f1213ac
 
-.field public static final scope_applications_entitlements_description:I = 0x7f1213ad
+.field public static final sample_email:I = 0x7f1213ad
 
-.field public static final scope_applications_store_update:I = 0x7f1213ae
+.field public static final sample_empty_string:I = 0x7f1213ae
 
-.field public static final scope_applications_store_update_description:I = 0x7f1213af
+.field public static final sample_language:I = 0x7f1213af
 
-.field public static final scope_bot:I = 0x7f1213b0
+.field public static final sample_notification_frequency:I = 0x7f1213b0
 
-.field public static final scope_bot_description:I = 0x7f1213b1
+.field public static final sample_number_9:I = 0x7f1213b1
 
-.field public static final scope_bot_permissions:I = 0x7f1213b2
+.field public static final sample_number_99:I = 0x7f1213b2
 
-.field public static final scope_bot_permissions_description:I = 0x7f1213b3
+.field public static final sample_number_999:I = 0x7f1213b3
 
-.field public static final scope_bot_server_placeholder:I = 0x7f1213b4
+.field public static final sample_number_9999:I = 0x7f1213b4
 
-.field public static final scope_connections:I = 0x7f1213b5
+.field public static final sample_number_bandwidth:I = 0x7f1213b5
 
-.field public static final scope_connections_empty:I = 0x7f1213b6
+.field public static final sample_number_ratio:I = 0x7f1213b6
 
-.field public static final scope_email:I = 0x7f1213b7
+.field public static final sample_online_members:I = 0x7f1213b7
 
-.field public static final scope_email_empty:I = 0x7f1213b8
+.field public static final sample_server_name:I = 0x7f1213b8
 
-.field public static final scope_gdm_join:I = 0x7f1213b9
+.field public static final sample_server_name_short:I = 0x7f1213b9
 
-.field public static final scope_gdm_join_description:I = 0x7f1213ba
+.field public static final sample_server_role_name:I = 0x7f1213ba
 
-.field public static final scope_guilds:I = 0x7f1213bb
+.field public static final sample_time_duration_minutes:I = 0x7f1213bb
 
-.field public static final scope_guilds_empty:I = 0x7f1213bc
+.field public static final sample_time_duration_seconds:I = 0x7f1213bc
 
-.field public static final scope_guilds_join:I = 0x7f1213bd
+.field public static final sample_time_pm:I = 0x7f1213bd
 
-.field public static final scope_guilds_join_description:I = 0x7f1213be
+.field public static final sample_time_stamp:I = 0x7f1213be
 
-.field public static final scope_identify:I = 0x7f1213bf
+.field public static final sample_total_members:I = 0x7f1213bf
 
-.field public static final scope_messages_read:I = 0x7f1213c0
+.field public static final sample_user_generated_link:I = 0x7f1213c0
 
-.field public static final scope_messages_read_description:I = 0x7f1213c1
+.field public static final sample_user_name:I = 0x7f1213c1
 
-.field public static final scope_relationships_read:I = 0x7f1213c2
+.field public static final sample_user_name_discrim:I = 0x7f1213c2
 
-.field public static final scope_relationships_read_description:I = 0x7f1213c3
+.field public static final sample_user_nick:I = 0x7f1213c3
 
-.field public static final scope_rpc:I = 0x7f1213c4
+.field public static final sample_user_presence:I = 0x7f1213c4
 
-.field public static final scope_rpc_description:I = 0x7f1213c5
+.field public static final sample_user_presence_details:I = 0x7f1213c5
 
-.field public static final scope_rpc_notifications_read:I = 0x7f1213c6
+.field public static final save:I = 0x7f1213c6
 
-.field public static final scope_rpc_notifications_read_description:I = 0x7f1213c7
+.field public static final save_changes:I = 0x7f1213c7
 
-.field public static final scope_unsupported_on_android:I = 0x7f1213c8
+.field public static final save_image:I = 0x7f1213c8
 
-.field public static final scope_unsupported_on_android_description:I = 0x7f1213c9
+.field public static final save_image_preview:I = 0x7f1213c9
 
-.field public static final scope_webhook_incoming:I = 0x7f1213ca
+.field public static final save_media_failure_help_mobile:I = 0x7f1213ca
 
-.field public static final scope_webhook_incoming_channel_placeholder:I = 0x7f1213cb
+.field public static final save_media_failure_mobile:I = 0x7f1213cb
 
-.field public static final scope_webhook_incoming_description:I = 0x7f1213cc
+.field public static final save_media_success_mobile:I = 0x7f1213cc
 
-.field public static final screen_share_on:I = 0x7f1213cd
+.field public static final saved_settings:I = 0x7f1213cd
 
-.field public static final screen_share_options:I = 0x7f1213ce
+.field public static final scope_activities_read:I = 0x7f1213ce
 
-.field public static final screenshare_change_windows:I = 0x7f1213cf
+.field public static final scope_activities_read_description:I = 0x7f1213cf
 
-.field public static final screenshare_description:I = 0x7f1213d0
+.field public static final scope_activities_write:I = 0x7f1213d0
 
-.field public static final screenshare_frame_rate:I = 0x7f1213d1
+.field public static final scope_activities_write_description:I = 0x7f1213d1
 
-.field public static final screenshare_relaunch:I = 0x7f1213d2
+.field public static final scope_applications_builds_read:I = 0x7f1213d2
 
-.field public static final screenshare_relaunch_body:I = 0x7f1213d3
+.field public static final scope_applications_builds_read_description:I = 0x7f1213d3
 
-.field public static final screenshare_screen:I = 0x7f1213d4
+.field public static final scope_applications_builds_upload:I = 0x7f1213d4
 
-.field public static final screenshare_share_screen_or_window:I = 0x7f1213d5
+.field public static final scope_applications_builds_upload_description:I = 0x7f1213d5
 
-.field public static final screenshare_sound_toggle_label:I = 0x7f1213d6
+.field public static final scope_applications_entitlements:I = 0x7f1213d6
 
-.field public static final screenshare_source:I = 0x7f1213d7
+.field public static final scope_applications_entitlements_description:I = 0x7f1213d7
 
-.field public static final screenshare_stop:I = 0x7f1213d8
+.field public static final scope_applications_store_update:I = 0x7f1213d8
 
-.field public static final screenshare_stream_game:I = 0x7f1213d9
+.field public static final scope_applications_store_update_description:I = 0x7f1213d9
 
-.field public static final screenshare_stream_quality:I = 0x7f1213da
+.field public static final scope_bot:I = 0x7f1213da
 
-.field public static final screenshare_unavailable:I = 0x7f1213db
+.field public static final scope_bot_description:I = 0x7f1213db
 
-.field public static final screenshare_unavailable_download_app:I = 0x7f1213dc
+.field public static final scope_bot_permissions:I = 0x7f1213dc
 
-.field public static final screenshare_window:I = 0x7f1213dd
+.field public static final scope_bot_permissions_description:I = 0x7f1213dd
 
-.field public static final search:I = 0x7f1213de
+.field public static final scope_bot_server_placeholder:I = 0x7f1213de
 
-.field public static final search_actions:I = 0x7f1213df
+.field public static final scope_connections:I = 0x7f1213df
 
-.field public static final search_answer_date:I = 0x7f1213e0
+.field public static final scope_connections_empty:I = 0x7f1213e0
 
-.field public static final search_answer_file_name:I = 0x7f1213e1
+.field public static final scope_email:I = 0x7f1213e1
 
-.field public static final search_answer_file_type:I = 0x7f1213e2
+.field public static final scope_email_empty:I = 0x7f1213e2
 
-.field public static final search_answer_from:I = 0x7f1213e3
+.field public static final scope_gdm_join:I = 0x7f1213e3
 
-.field public static final search_answer_has:I = 0x7f1213e4
+.field public static final scope_gdm_join_description:I = 0x7f1213e4
 
-.field public static final search_answer_has_attachment:I = 0x7f1213e5
+.field public static final scope_guilds:I = 0x7f1213e5
 
-.field public static final search_answer_has_embed:I = 0x7f1213e6
+.field public static final scope_guilds_empty:I = 0x7f1213e6
 
-.field public static final search_answer_has_image:I = 0x7f1213e7
+.field public static final scope_guilds_join:I = 0x7f1213e7
 
-.field public static final search_answer_has_link:I = 0x7f1213e8
+.field public static final scope_guilds_join_description:I = 0x7f1213e8
 
-.field public static final search_answer_has_sound:I = 0x7f1213e9
+.field public static final scope_identify:I = 0x7f1213e9
 
-.field public static final search_answer_has_video:I = 0x7f1213ea
+.field public static final scope_messages_read:I = 0x7f1213ea
 
-.field public static final search_answer_in:I = 0x7f1213eb
+.field public static final scope_messages_read_description:I = 0x7f1213eb
 
-.field public static final search_answer_link_from:I = 0x7f1213ec
+.field public static final scope_relationships_read:I = 0x7f1213ec
 
-.field public static final search_answer_mentions:I = 0x7f1213ed
+.field public static final scope_relationships_read_description:I = 0x7f1213ed
 
-.field public static final search_channels:I = 0x7f1213ee
+.field public static final scope_rpc:I = 0x7f1213ee
 
-.field public static final search_channels_no_result:I = 0x7f1213ef
+.field public static final scope_rpc_description:I = 0x7f1213ef
 
-.field public static final search_clear:I = 0x7f1213f0
+.field public static final scope_rpc_notifications_read:I = 0x7f1213f0
 
-.field public static final search_clear_history:I = 0x7f1213f1
+.field public static final scope_rpc_notifications_read_description:I = 0x7f1213f1
 
-.field public static final search_country:I = 0x7f1213f2
+.field public static final scope_unsupported_on_android:I = 0x7f1213f2
 
-.field public static final search_date_picker_hint:I = 0x7f1213f3
+.field public static final scope_unsupported_on_android_description:I = 0x7f1213f3
 
-.field public static final search_dm_still_indexing:I = 0x7f1213f4
+.field public static final scope_webhook_incoming:I = 0x7f1213f4
 
-.field public static final search_dm_with:I = 0x7f1213f5
+.field public static final scope_webhook_incoming_channel_placeholder:I = 0x7f1213f5
 
-.field public static final search_emojis:I = 0x7f1213f6
+.field public static final scope_webhook_incoming_description:I = 0x7f1213f6
 
-.field public static final search_error:I = 0x7f1213f7
+.field public static final screen_share_on:I = 0x7f1213f7
 
-.field public static final search_filter_after:I = 0x7f1213f8
+.field public static final screen_share_options:I = 0x7f1213f8
 
-.field public static final search_filter_before:I = 0x7f1213f9
+.field public static final screenshare_change_windows:I = 0x7f1213f9
 
-.field public static final search_filter_during:I = 0x7f1213fa
+.field public static final screenshare_description:I = 0x7f1213fa
 
-.field public static final search_filter_file_name:I = 0x7f1213fb
+.field public static final screenshare_frame_rate:I = 0x7f1213fb
 
-.field public static final search_filter_file_type:I = 0x7f1213fc
+.field public static final screenshare_relaunch:I = 0x7f1213fc
 
-.field public static final search_filter_from:I = 0x7f1213fd
+.field public static final screenshare_relaunch_body:I = 0x7f1213fd
 
-.field public static final search_filter_has:I = 0x7f1213fe
+.field public static final screenshare_screen:I = 0x7f1213fe
 
-.field public static final search_filter_in:I = 0x7f1213ff
+.field public static final screenshare_share_screen_or_window:I = 0x7f1213ff
 
-.field public static final search_filter_link_from:I = 0x7f121400
+.field public static final screenshare_sound_toggle_label:I = 0x7f121400
 
-.field public static final search_filter_mentions:I = 0x7f121401
+.field public static final screenshare_source:I = 0x7f121401
 
-.field public static final search_filter_on:I = 0x7f121402
+.field public static final screenshare_stop:I = 0x7f121402
 
-.field public static final search_for_emoji:I = 0x7f121403
+.field public static final screenshare_stream_game:I = 0x7f121403
 
-.field public static final search_for_value:I = 0x7f121404
+.field public static final screenshare_stream_quality:I = 0x7f121404
 
-.field public static final search_from_suggestions:I = 0x7f121405
+.field public static final screenshare_unavailable:I = 0x7f121405
 
-.field public static final search_gifs:I = 0x7f121406
+.field public static final screenshare_unavailable_download_app:I = 0x7f121406
 
-.field public static final search_group_header_channels:I = 0x7f121407
+.field public static final screenshare_window:I = 0x7f121407
 
-.field public static final search_group_header_dates:I = 0x7f121408
+.field public static final search:I = 0x7f121408
 
-.field public static final search_group_header_file_type:I = 0x7f121409
+.field public static final search_actions:I = 0x7f121409
 
-.field public static final search_group_header_from:I = 0x7f12140a
+.field public static final search_answer_date:I = 0x7f12140a
 
-.field public static final search_group_header_has:I = 0x7f12140b
+.field public static final search_answer_file_name:I = 0x7f12140b
 
-.field public static final search_group_header_history:I = 0x7f12140c
+.field public static final search_answer_file_type:I = 0x7f12140c
 
-.field public static final search_group_header_link_from:I = 0x7f12140d
+.field public static final search_answer_from:I = 0x7f12140d
 
-.field public static final search_group_header_mentions:I = 0x7f12140e
+.field public static final search_answer_has:I = 0x7f12140e
 
-.field public static final search_group_header_search_options:I = 0x7f12140f
+.field public static final search_answer_has_attachment:I = 0x7f12140f
 
-.field public static final search_guild_still_indexing:I = 0x7f121410
+.field public static final search_answer_has_embed:I = 0x7f121410
 
-.field public static final search_hide_blocked_messages:I = 0x7f121411
+.field public static final search_answer_has_image:I = 0x7f121411
 
-.field public static final search_in:I = 0x7f121412
+.field public static final search_answer_has_link:I = 0x7f121412
 
-.field public static final search_members:I = 0x7f121413
+.field public static final search_answer_has_sound:I = 0x7f121413
 
-.field public static final search_members_no_result:I = 0x7f121414
+.field public static final search_answer_has_video:I = 0x7f121414
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_answer_in:I = 0x7f121415
 
-.field public static final search_most_relevant:I = 0x7f121416
+.field public static final search_answer_link_from:I = 0x7f121416
 
-.field public static final search_newest:I = 0x7f121417
+.field public static final search_answer_mentions:I = 0x7f121417
 
-.field public static final search_no_results:I = 0x7f121418
+.field public static final search_channels:I = 0x7f121418
 
-.field public static final search_no_results_alt:I = 0x7f121419
+.field public static final search_channels_no_result:I = 0x7f121419
 
-.field public static final search_num_results_blocked_not_shown:I = 0x7f12141a
+.field public static final search_clear:I = 0x7f12141a
 
-.field public static final search_oldest:I = 0x7f12141b
+.field public static final search_clear_history:I = 0x7f12141b
 
-.field public static final search_pagination_a11y_label:I = 0x7f12141c
+.field public static final search_country:I = 0x7f12141c
 
-.field public static final search_pick_date:I = 0x7f12141d
+.field public static final search_date_picker_hint:I = 0x7f12141d
 
-.field public static final search_results_section_label:I = 0x7f12141e
+.field public static final search_dm_still_indexing:I = 0x7f12141e
 
-.field public static final search_roles:I = 0x7f12141f
+.field public static final search_dm_with:I = 0x7f12141f
 
-.field public static final search_roles_no_result:I = 0x7f121420
+.field public static final search_emojis:I = 0x7f121420
 
-.field public static final search_shortcut_month:I = 0x7f121421
+.field public static final search_error:I = 0x7f121421
 
-.field public static final search_shortcut_today:I = 0x7f121422
+.field public static final search_filter_after:I = 0x7f121422
 
-.field public static final search_shortcut_week:I = 0x7f121423
+.field public static final search_filter_before:I = 0x7f121423
 
-.field public static final search_shortcut_year:I = 0x7f121424
+.field public static final search_filter_during:I = 0x7f121424
 
-.field public static final search_shortcut_yesterday:I = 0x7f121425
+.field public static final search_filter_file_name:I = 0x7f121425
 
-.field public static final search_still_indexing_hint:I = 0x7f121426
+.field public static final search_filter_file_type:I = 0x7f121426
 
-.field public static final search_tenor:I = 0x7f121427
+.field public static final search_filter_from:I = 0x7f121427
 
-.field public static final search_with_google:I = 0x7f121428
+.field public static final search_filter_has:I = 0x7f121428
 
-.field public static final searching:I = 0x7f121429
+.field public static final search_filter_in:I = 0x7f121429
 
-.field public static final security:I = 0x7f12142a
+.field public static final search_filter_link_from:I = 0x7f12142a
 
-.field public static final select:I = 0x7f12142b
+.field public static final search_filter_mentions:I = 0x7f12142b
 
-.field public static final select_channel_or_category:I = 0x7f12142c
+.field public static final search_filter_on:I = 0x7f12142c
 
-.field public static final select_emoji:I = 0x7f12142d
+.field public static final search_for_emoji:I = 0x7f12142d
 
-.field public static final select_picture:I = 0x7f12142e
+.field public static final search_for_value:I = 0x7f12142e
 
-.field public static final select_sort_mode:I = 0x7f12142f
+.field public static final search_from_suggestions:I = 0x7f12142f
 
-.field public static final selection_shrink_scale:I = 0x7f121430
+.field public static final search_gifs:I = 0x7f121430
 
-.field public static final self_deny_permission_body:I = 0x7f121431
+.field public static final search_group_header_channels:I = 0x7f121431
 
-.field public static final self_deny_permission_title:I = 0x7f121432
+.field public static final search_group_header_dates:I = 0x7f121432
 
-.field public static final self_username_indicator:I = 0x7f121433
+.field public static final search_group_header_file_type:I = 0x7f121433
 
-.field public static final self_username_indicator_hook:I = 0x7f121434
+.field public static final search_group_header_from:I = 0x7f121434
 
-.field public static final self_xss_header:I = 0x7f121435
+.field public static final search_group_header_has:I = 0x7f121435
 
-.field public static final self_xss_line_1:I = 0x7f121436
+.field public static final search_group_header_history:I = 0x7f121436
 
-.field public static final self_xss_line_2:I = 0x7f121437
+.field public static final search_group_header_link_from:I = 0x7f121437
 
-.field public static final self_xss_line_3:I = 0x7f121438
+.field public static final search_group_header_mentions:I = 0x7f121438
 
-.field public static final self_xss_line_4:I = 0x7f121439
+.field public static final search_group_header_search_options:I = 0x7f121439
 
-.field public static final send:I = 0x7f12143a
+.field public static final search_guild_still_indexing:I = 0x7f12143a
 
-.field public static final send_a_message:I = 0x7f12143b
+.field public static final search_hide_blocked_messages:I = 0x7f12143b
 
-.field public static final send_dm:I = 0x7f12143c
+.field public static final search_in:I = 0x7f12143c
 
-.field public static final send_images_label:I = 0x7f12143d
+.field public static final search_members:I = 0x7f12143d
 
-.field public static final send_message:I = 0x7f12143e
+.field public static final search_members_no_result:I = 0x7f12143e
 
-.field public static final send_message_failure:I = 0x7f12143f
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final send_messages:I = 0x7f121440
+.field public static final search_most_relevant:I = 0x7f121440
 
-.field public static final send_messages_description:I = 0x7f121441
+.field public static final search_newest:I = 0x7f121441
 
-.field public static final send_tts_messages:I = 0x7f121442
+.field public static final search_no_results:I = 0x7f121442
 
-.field public static final send_tts_messages_description:I = 0x7f121443
+.field public static final search_no_results_alt:I = 0x7f121443
 
-.field public static final server_deafen:I = 0x7f121444
+.field public static final search_num_results_blocked_not_shown:I = 0x7f121444
 
-.field public static final server_deafened:I = 0x7f121445
+.field public static final search_oldest:I = 0x7f121445
 
-.field public static final server_deafened_dialog_body:I = 0x7f121446
+.field public static final search_pagination_a11y_label:I = 0x7f121446
 
-.field public static final server_deafened_dialog_title:I = 0x7f121447
+.field public static final search_pick_date:I = 0x7f121447
 
-.field public static final server_desciption_empty:I = 0x7f121448
+.field public static final search_results_section_label:I = 0x7f121448
 
-.field public static final server_emoji:I = 0x7f121449
+.field public static final search_roles:I = 0x7f121449
 
-.field public static final server_folder_mark_as_read:I = 0x7f12144a
+.field public static final search_roles_no_result:I = 0x7f12144a
 
-.field public static final server_folder_placeholder:I = 0x7f12144b
+.field public static final search_shortcut_month:I = 0x7f12144b
 
-.field public static final server_folder_settings:I = 0x7f12144c
+.field public static final search_shortcut_today:I = 0x7f12144c
 
-.field public static final server_insights:I = 0x7f12144d
+.field public static final search_shortcut_week:I = 0x7f12144d
 
-.field public static final server_mute:I = 0x7f12144e
+.field public static final search_shortcut_year:I = 0x7f12144e
 
-.field public static final server_muted:I = 0x7f12144f
+.field public static final search_shortcut_yesterday:I = 0x7f12144f
 
-.field public static final server_muted_dialog_body:I = 0x7f121450
+.field public static final search_still_indexing_hint:I = 0x7f121450
 
-.field public static final server_muted_dialog_title:I = 0x7f121451
+.field public static final search_tenor:I = 0x7f121451
 
-.field public static final server_name_required:I = 0x7f121452
+.field public static final search_with_google:I = 0x7f121452
 
-.field public static final server_options:I = 0x7f121453
+.field public static final searching:I = 0x7f121453
 
-.field public static final server_overview:I = 0x7f121454
+.field public static final security:I = 0x7f121454
 
-.field public static final server_quest:I = 0x7f121455
+.field public static final select:I = 0x7f121455
 
-.field public static final server_region_unavailable:I = 0x7f121456
+.field public static final select_channel_or_category:I = 0x7f121456
 
-.field public static final server_settings:I = 0x7f121457
+.field public static final select_emoji:I = 0x7f121457
 
-.field public static final server_settings_updated:I = 0x7f121458
+.field public static final select_picture:I = 0x7f121458
 
-.field public static final server_status:I = 0x7f121459
+.field public static final select_sort_mode:I = 0x7f121459
 
-.field public static final server_undeafen:I = 0x7f12145a
+.field public static final selection_shrink_scale:I = 0x7f12145a
 
-.field public static final server_unmute:I = 0x7f12145b
+.field public static final self_deny_permission_body:I = 0x7f12145b
 
-.field public static final server_voice_mute:I = 0x7f12145c
+.field public static final self_deny_permission_title:I = 0x7f12145c
 
-.field public static final server_voice_unmute:I = 0x7f12145d
+.field public static final self_username_indicator:I = 0x7f12145d
 
-.field public static final servers:I = 0x7f12145e
+.field public static final self_username_indicator_hook:I = 0x7f12145e
 
-.field public static final service_connections_disconnect:I = 0x7f12145f
+.field public static final self_xss_header:I = 0x7f12145f
 
-.field public static final set_debug_logging:I = 0x7f121460
+.field public static final self_xss_line_1:I = 0x7f121460
 
-.field public static final set_debug_logging_body:I = 0x7f121461
+.field public static final self_xss_line_2:I = 0x7f121461
 
-.field public static final set_invite_link_never_expire:I = 0x7f121462
+.field public static final self_xss_line_3:I = 0x7f121462
 
-.field public static final set_status:I = 0x7f121463
+.field public static final self_xss_line_4:I = 0x7f121463
 
-.field public static final set_up_description:I = 0x7f121464
+.field public static final send:I = 0x7f121464
 
-.field public static final set_up_your_server:I = 0x7f121465
+.field public static final send_a_message:I = 0x7f121465
 
-.field public static final settings:I = 0x7f121466
+.field public static final send_dm:I = 0x7f121466
 
-.field public static final settings_advanced:I = 0x7f121467
+.field public static final send_images_label:I = 0x7f121467
 
-.field public static final settings_games_add_game:I = 0x7f121468
+.field public static final send_message:I = 0x7f121468
 
-.field public static final settings_games_add_new_game:I = 0x7f121469
+.field public static final send_message_failure:I = 0x7f121469
 
-.field public static final settings_games_added_games_label:I = 0x7f12146a
+.field public static final send_messages:I = 0x7f12146a
 
-.field public static final settings_games_enable_overlay_label:I = 0x7f12146b
+.field public static final send_messages_description:I = 0x7f12146b
 
-.field public static final settings_games_hidden_library_applications_label:I = 0x7f12146c
+.field public static final send_tts_messages:I = 0x7f12146c
 
-.field public static final settings_games_last_played:I = 0x7f12146d
+.field public static final send_tts_messages_description:I = 0x7f12146d
 
-.field public static final settings_games_no_game_detected:I = 0x7f12146e
+.field public static final server_deafen:I = 0x7f12146e
 
-.field public static final settings_games_no_games_header:I = 0x7f12146f
+.field public static final server_deafened:I = 0x7f12146f
 
-.field public static final settings_games_not_playing:I = 0x7f121470
+.field public static final server_deafened_dialog_body:I = 0x7f121470
 
-.field public static final settings_games_not_seeing_game:I = 0x7f121471
+.field public static final server_deafened_dialog_title:I = 0x7f121471
 
-.field public static final settings_games_now_playing_state:I = 0x7f121472
+.field public static final server_desciption_empty:I = 0x7f121472
 
-.field public static final settings_games_overlay:I = 0x7f121473
+.field public static final server_emoji:I = 0x7f121473
 
-.field public static final settings_games_overlay_off:I = 0x7f121474
+.field public static final server_folder_mark_as_read:I = 0x7f121474
 
-.field public static final settings_games_overlay_on:I = 0x7f121475
+.field public static final server_folder_placeholder:I = 0x7f121475
 
-.field public static final settings_games_overlay_warning:I = 0x7f121476
+.field public static final server_folder_settings:I = 0x7f121476
 
-.field public static final settings_games_toggle_overlay:I = 0x7f121477
+.field public static final server_insights:I = 0x7f121477
 
-.field public static final settings_games_verified_icon:I = 0x7f121478
+.field public static final server_mute:I = 0x7f121478
 
-.field public static final settings_invite_tip:I = 0x7f121479
+.field public static final server_muted:I = 0x7f121479
 
-.field public static final settings_invite_tip_without_create:I = 0x7f12147a
+.field public static final server_muted_dialog_body:I = 0x7f12147a
 
-.field public static final settings_notice_message:I = 0x7f12147b
+.field public static final server_muted_dialog_title:I = 0x7f12147b
 
-.field public static final settings_permissions_delete_body:I = 0x7f12147c
+.field public static final server_name_required:I = 0x7f12147c
 
-.field public static final settings_permissions_delete_title:I = 0x7f12147d
+.field public static final server_options:I = 0x7f12147d
 
-.field public static final settings_roles_delete_body:I = 0x7f12147e
+.field public static final server_overview:I = 0x7f12147e
 
-.field public static final settings_roles_delete_title:I = 0x7f12147f
+.field public static final server_quest:I = 0x7f12147f
 
-.field public static final settings_sync:I = 0x7f121480
+.field public static final server_region_unavailable:I = 0x7f121480
 
-.field public static final settings_webhooks_empty_body:I = 0x7f121481
+.field public static final server_settings:I = 0x7f121481
 
-.field public static final settings_webhooks_empty_body_ios:I = 0x7f121482
+.field public static final server_settings_updated:I = 0x7f121482
 
-.field public static final settings_webhooks_empty_title:I = 0x7f121483
+.field public static final server_status:I = 0x7f121483
 
-.field public static final settings_webhooks_intro:I = 0x7f121484
+.field public static final server_undeafen:I = 0x7f121484
 
-.field public static final setup_vanity_url:I = 0x7f121485
+.field public static final server_unmute:I = 0x7f121485
 
-.field public static final several_users_typing:I = 0x7f121486
+.field public static final server_voice_mute:I = 0x7f121486
 
-.field public static final share:I = 0x7f121487
+.field public static final server_voice_unmute:I = 0x7f121487
 
-.field public static final share_invite_link_for_access:I = 0x7f121488
+.field public static final servers:I = 0x7f121488
 
-.field public static final share_invite_mobile:I = 0x7f121489
+.field public static final service_connections_disconnect:I = 0x7f121489
 
-.field public static final share_link:I = 0x7f12148a
+.field public static final set_debug_logging:I = 0x7f12148a
 
-.field public static final share_settings_title:I = 0x7f12148b
+.field public static final set_debug_logging_body:I = 0x7f12148b
 
-.field public static final share_to:I = 0x7f12148c
+.field public static final set_invite_link_never_expire:I = 0x7f12148c
 
-.field public static final share_your_screen:I = 0x7f12148d
+.field public static final set_status:I = 0x7f12148d
 
-.field public static final sharing_screen:I = 0x7f12148e
+.field public static final set_up_description:I = 0x7f12148e
 
-.field public static final shortcut_recorder_button:I = 0x7f12148f
+.field public static final set_up_your_server:I = 0x7f12148f
 
-.field public static final shortcut_recorder_button_edit:I = 0x7f121490
+.field public static final settings:I = 0x7f121490
 
-.field public static final shortcut_recorder_button_recording:I = 0x7f121491
+.field public static final settings_advanced:I = 0x7f121491
 
-.field public static final shortcut_recorder_no_bind:I = 0x7f121492
+.field public static final settings_games_add_game:I = 0x7f121492
 
-.field public static final show_chat:I = 0x7f121493
+.field public static final settings_games_add_new_game:I = 0x7f121493
 
-.field public static final show_current_game:I = 0x7f121494
+.field public static final settings_games_added_games_label:I = 0x7f121494
 
-.field public static final show_current_game_desc:I = 0x7f121495
+.field public static final settings_games_enable_overlay_label:I = 0x7f121495
 
-.field public static final show_folder:I = 0x7f121496
+.field public static final settings_games_hidden_library_applications_label:I = 0x7f121496
 
-.field public static final show_keyboard:I = 0x7f121497
+.field public static final settings_games_last_played:I = 0x7f121497
 
-.field public static final show_muted:I = 0x7f121498
+.field public static final settings_games_no_game_detected:I = 0x7f121498
 
-.field public static final show_muted_channels:I = 0x7f121499
+.field public static final settings_games_no_games_header:I = 0x7f121499
 
-.field public static final show_spoiler_always:I = 0x7f12149a
+.field public static final settings_games_not_playing:I = 0x7f12149a
 
-.field public static final show_spoiler_content:I = 0x7f12149b
+.field public static final settings_games_not_seeing_game:I = 0x7f12149b
 
-.field public static final show_spoiler_content_help:I = 0x7f12149c
+.field public static final settings_games_now_playing_state:I = 0x7f12149c
 
-.field public static final show_spoiler_on_click:I = 0x7f12149d
+.field public static final settings_games_overlay:I = 0x7f12149d
 
-.field public static final show_spoiler_on_servers_i_mod:I = 0x7f12149e
+.field public static final settings_games_overlay_off:I = 0x7f12149e
 
-.field public static final skip:I = 0x7f12149f
+.field public static final settings_games_overlay_on:I = 0x7f12149f
 
-.field public static final skip_all_tips:I = 0x7f1214a0
+.field public static final settings_games_overlay_warning:I = 0x7f1214a0
 
-.field public static final skip_to_content:I = 0x7f1214a1
+.field public static final settings_games_toggle_overlay:I = 0x7f1214a1
 
-.field public static final sky_blue:I = 0x7f1214a2
+.field public static final settings_games_verified_icon:I = 0x7f1214a2
 
-.field public static final sort:I = 0x7f1214a3
+.field public static final settings_invite_tip:I = 0x7f1214a3
 
-.field public static final sorting:I = 0x7f1214a4
+.field public static final settings_invite_tip_without_create:I = 0x7f1214a4
 
-.field public static final sorting_channels:I = 0x7f1214a5
+.field public static final settings_notice_message:I = 0x7f1214a5
 
-.field public static final sound_deafen:I = 0x7f1214a6
+.field public static final settings_permissions_delete_body:I = 0x7f1214a6
 
-.field public static final sound_incoming_ring:I = 0x7f1214a7
+.field public static final settings_permissions_delete_title:I = 0x7f1214a7
 
-.field public static final sound_message:I = 0x7f1214a8
+.field public static final settings_roles_delete_body:I = 0x7f1214a8
 
-.field public static final sound_mute:I = 0x7f1214a9
+.field public static final settings_roles_delete_title:I = 0x7f1214a9
 
-.field public static final sound_outgoing_ring:I = 0x7f1214aa
+.field public static final settings_sync:I = 0x7f1214aa
 
-.field public static final sound_ptt_activate:I = 0x7f1214ab
+.field public static final settings_webhooks_empty_body:I = 0x7f1214ab
 
-.field public static final sound_ptt_deactivate:I = 0x7f1214ac
+.field public static final settings_webhooks_empty_body_ios:I = 0x7f1214ac
 
-.field public static final sound_stream_started:I = 0x7f1214ad
+.field public static final settings_webhooks_empty_title:I = 0x7f1214ad
 
-.field public static final sound_stream_stopped:I = 0x7f1214ae
+.field public static final settings_webhooks_intro:I = 0x7f1214ae
 
-.field public static final sound_undeafen:I = 0x7f1214af
+.field public static final setup_vanity_url:I = 0x7f1214af
 
-.field public static final sound_unmute:I = 0x7f1214b0
+.field public static final several_users_typing:I = 0x7f1214b0
 
-.field public static final sound_user_join:I = 0x7f1214b1
+.field public static final share:I = 0x7f1214b1
 
-.field public static final sound_user_leave:I = 0x7f1214b2
+.field public static final share_invite_link_for_access:I = 0x7f1214b2
 
-.field public static final sound_user_moved:I = 0x7f1214b3
+.field public static final share_invite_mobile:I = 0x7f1214b3
 
-.field public static final sound_viewer_join:I = 0x7f1214b4
+.field public static final share_link:I = 0x7f1214b4
 
-.field public static final sound_viewer_leave:I = 0x7f1214b5
+.field public static final share_settings_title:I = 0x7f1214b5
 
-.field public static final sound_voice_disconnected:I = 0x7f1214b6
+.field public static final share_to:I = 0x7f1214b6
 
-.field public static final sounds:I = 0x7f1214b7
+.field public static final share_your_screen:I = 0x7f1214b7
 
-.field public static final source_message_deleted:I = 0x7f1214b8
+.field public static final sharing_screen:I = 0x7f1214b8
 
-.field public static final speak:I = 0x7f1214b9
+.field public static final shortcut_recorder_button:I = 0x7f1214b9
 
-.field public static final speak_message:I = 0x7f1214ba
+.field public static final shortcut_recorder_button_edit:I = 0x7f1214ba
 
-.field public static final spectators:I = 0x7f1214bb
+.field public static final shortcut_recorder_button_recording:I = 0x7f1214bb
 
-.field public static final spellcheck:I = 0x7f1214bc
+.field public static final shortcut_recorder_no_bind:I = 0x7f1214bc
 
-.field public static final spoiler:I = 0x7f1214bd
+.field public static final show_chat:I = 0x7f1214bd
 
-.field public static final spoiler_mark_selected:I = 0x7f1214be
+.field public static final show_current_game:I = 0x7f1214be
 
-.field public static final spoiler_reveal:I = 0x7f1214bf
+.field public static final show_current_game_desc:I = 0x7f1214bf
 
-.field public static final spotify_connection_info_android:I = 0x7f1214c0
+.field public static final show_folder:I = 0x7f1214c0
 
-.field public static final spotify_listen_along_host:I = 0x7f1214c1
+.field public static final show_keyboard:I = 0x7f1214c1
 
-.field public static final spotify_listen_along_info:I = 0x7f1214c2
+.field public static final show_muted:I = 0x7f1214c2
 
-.field public static final spotify_listen_along_listener:I = 0x7f1214c3
+.field public static final show_muted_channels:I = 0x7f1214c3
 
-.field public static final spotify_listen_along_listeners:I = 0x7f1214c4
+.field public static final show_spoiler_always:I = 0x7f1214c4
 
-.field public static final spotify_listen_along_listening_along_count:I = 0x7f1214c5
+.field public static final show_spoiler_content:I = 0x7f1214c5
 
-.field public static final spotify_listen_along_stop:I = 0x7f1214c6
+.field public static final show_spoiler_content_help:I = 0x7f1214c6
 
-.field public static final spotify_listen_along_subtitle_listener:I = 0x7f1214c7
+.field public static final show_spoiler_on_click:I = 0x7f1214c7
 
-.field public static final spotify_listen_along_title_host:I = 0x7f1214c8
+.field public static final show_spoiler_on_servers_i_mod:I = 0x7f1214c8
 
-.field public static final spotify_listen_along_title_listener:I = 0x7f1214c9
+.field public static final skip:I = 0x7f1214c9
 
-.field public static final spotify_premium_upgrade_body:I = 0x7f1214ca
+.field public static final skip_all_tips:I = 0x7f1214ca
 
-.field public static final spotify_premium_upgrade_button:I = 0x7f1214cb
+.field public static final skip_to_content:I = 0x7f1214cb
 
-.field public static final spotify_premium_upgrade_header:I = 0x7f1214cc
+.field public static final sky_blue:I = 0x7f1214cc
 
-.field public static final staff_badge_tooltip:I = 0x7f1214cd
+.field public static final sort:I = 0x7f1214cd
 
-.field public static final start:I = 0x7f1214ce
+.field public static final sorting:I = 0x7f1214ce
 
-.field public static final start_a_thread:I = 0x7f1214cf
+.field public static final sorting_channels:I = 0x7f1214cf
 
-.field public static final start_call:I = 0x7f1214d0
+.field public static final sound_deafen:I = 0x7f1214d0
 
-.field public static final start_thread:I = 0x7f1214d1
+.field public static final sound_incoming_ring:I = 0x7f1214d1
 
-.field public static final start_thread_modal_reply:I = 0x7f1214d2
+.field public static final sound_message:I = 0x7f1214d2
 
-.field public static final start_thread_modal_subtext:I = 0x7f1214d3
+.field public static final sound_mute:I = 0x7f1214d3
 
-.field public static final start_video_call:I = 0x7f1214d4
+.field public static final sound_outgoing_ring:I = 0x7f1214d4
 
-.field public static final start_voice_call:I = 0x7f1214d5
+.field public static final sound_ptt_activate:I = 0x7f1214d5
 
-.field public static final starting_at:I = 0x7f1214d6
+.field public static final sound_ptt_deactivate:I = 0x7f1214d6
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final sound_stream_started:I = 0x7f1214d7
 
-.field public static final status_dnd:I = 0x7f1214d8
+.field public static final sound_stream_stopped:I = 0x7f1214d8
 
-.field public static final status_dnd_help:I = 0x7f1214d9
+.field public static final sound_undeafen:I = 0x7f1214d9
 
-.field public static final status_idle:I = 0x7f1214da
+.field public static final sound_unmute:I = 0x7f1214da
 
-.field public static final status_invisible:I = 0x7f1214db
+.field public static final sound_user_join:I = 0x7f1214db
 
-.field public static final status_invisible_helper:I = 0x7f1214dc
+.field public static final sound_user_leave:I = 0x7f1214dc
 
-.field public static final status_offline:I = 0x7f1214dd
+.field public static final sound_user_moved:I = 0x7f1214dd
 
-.field public static final status_online:I = 0x7f1214de
+.field public static final sound_viewer_join:I = 0x7f1214de
 
-.field public static final status_online_mobile:I = 0x7f1214df
+.field public static final sound_viewer_leave:I = 0x7f1214df
 
-.field public static final status_streaming:I = 0x7f1214e0
+.field public static final sound_voice_disconnected:I = 0x7f1214e0
 
-.field public static final status_unknown:I = 0x7f1214e1
+.field public static final sounds:I = 0x7f1214e1
 
-.field public static final step_number:I = 0x7f1214e2
+.field public static final source_message_deleted:I = 0x7f1214e2
 
-.field public static final still_indexing:I = 0x7f1214e3
+.field public static final speak:I = 0x7f1214e3
 
-.field public static final stop:I = 0x7f1214e4
+.field public static final speak_message:I = 0x7f1214e4
 
-.field public static final stop_ringing:I = 0x7f1214e5
+.field public static final spectators:I = 0x7f1214e5
 
-.field public static final stop_ringing_username:I = 0x7f1214e6
+.field public static final spellcheck:I = 0x7f1214e6
 
-.field public static final stop_speaking_message:I = 0x7f1214e7
+.field public static final spoiler:I = 0x7f1214e7
 
-.field public static final stop_streaming:I = 0x7f1214e8
+.field public static final spoiler_mark_selected:I = 0x7f1214e8
 
-.field public static final stop_watching:I = 0x7f1214e9
+.field public static final spoiler_reveal:I = 0x7f1214e9
 
-.field public static final stop_watching_user:I = 0x7f1214ea
+.field public static final spotify_connection_info_android:I = 0x7f1214ea
 
-.field public static final storage_permission_denied:I = 0x7f1214eb
+.field public static final spotify_listen_along_host:I = 0x7f1214eb
 
-.field public static final store_channel:I = 0x7f1214ec
+.field public static final spotify_listen_along_info:I = 0x7f1214ec
 
-.field public static final stream_actions_menu_label:I = 0x7f1214ed
+.field public static final spotify_listen_along_listener:I = 0x7f1214ed
 
-.field public static final stream_bad_spectator:I = 0x7f1214ee
+.field public static final spotify_listen_along_listeners:I = 0x7f1214ee
 
-.field public static final stream_bad_streamer:I = 0x7f1214ef
+.field public static final spotify_listen_along_listening_along_count:I = 0x7f1214ef
 
-.field public static final stream_capture_paused:I = 0x7f1214f0
+.field public static final spotify_listen_along_stop:I = 0x7f1214f0
 
-.field public static final stream_capture_paused_details:I = 0x7f1214f1
+.field public static final spotify_listen_along_subtitle_listener:I = 0x7f1214f1
 
-.field public static final stream_capture_paused_details_viewer:I = 0x7f1214f2
+.field public static final spotify_listen_along_title_host:I = 0x7f1214f2
 
-.field public static final stream_channel_description:I = 0x7f1214f3
+.field public static final spotify_listen_along_title_listener:I = 0x7f1214f3
 
-.field public static final stream_description:I = 0x7f1214f4
+.field public static final spotify_premium_upgrade_body:I = 0x7f1214f4
 
-.field public static final stream_ended:I = 0x7f1214f5
+.field public static final spotify_premium_upgrade_button:I = 0x7f1214f5
 
-.field public static final stream_failed_description:I = 0x7f1214f6
+.field public static final spotify_premium_upgrade_header:I = 0x7f1214f6
 
-.field public static final stream_failed_title:I = 0x7f1214f7
+.field public static final staff_badge_tooltip:I = 0x7f1214f7
 
-.field public static final stream_fps_option:I = 0x7f1214f8
+.field public static final start:I = 0x7f1214f8
 
-.field public static final stream_full_modal_body:I = 0x7f1214f9
+.field public static final start_a_thread:I = 0x7f1214f9
 
-.field public static final stream_full_modal_header:I = 0x7f1214fa
+.field public static final start_call:I = 0x7f1214fa
 
-.field public static final stream_issue_modal_header:I = 0x7f1214fb
+.field public static final start_thread:I = 0x7f1214fb
 
-.field public static final stream_network_quality_error:I = 0x7f1214fc
+.field public static final start_thread_modal_reply:I = 0x7f1214fc
 
-.field public static final stream_no_preview:I = 0x7f1214fd
+.field public static final start_thread_modal_subtext:I = 0x7f1214fd
 
-.field public static final stream_participants_hidden:I = 0x7f1214fe
+.field public static final start_video_call:I = 0x7f1214fe
 
-.field public static final stream_playing:I = 0x7f1214ff
+.field public static final start_voice_call:I = 0x7f1214ff
 
-.field public static final stream_premium_upsell_body:I = 0x7f121500
+.field public static final starting_at:I = 0x7f121500
 
-.field public static final stream_premium_upsell_body_no_cta:I = 0x7f121501
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final stream_premium_upsell_cta:I = 0x7f121502
+.field public static final status_dnd:I = 0x7f121502
 
-.field public static final stream_premium_upsell_header:I = 0x7f121503
+.field public static final status_dnd_help:I = 0x7f121503
 
-.field public static final stream_preview_loading:I = 0x7f121504
+.field public static final status_idle:I = 0x7f121504
 
-.field public static final stream_preview_paused:I = 0x7f121505
+.field public static final status_invisible:I = 0x7f121505
 
-.field public static final stream_preview_paused_subtext:I = 0x7f121506
+.field public static final status_invisible_helper:I = 0x7f121506
 
-.field public static final stream_quality_unlock:I = 0x7f121507
+.field public static final status_offline:I = 0x7f121507
 
-.field public static final stream_reconnecting_error:I = 0x7f121508
+.field public static final status_online:I = 0x7f121508
 
-.field public static final stream_reconnecting_error_subtext:I = 0x7f121509
+.field public static final status_online_mobile:I = 0x7f121509
 
-.field public static final stream_report_a_problem:I = 0x7f12150a
+.field public static final status_streaming:I = 0x7f12150a
 
-.field public static final stream_report_a_problem_post_stream:I = 0x7f12150b
+.field public static final status_unknown:I = 0x7f12150b
 
-.field public static final stream_report_audio_missing:I = 0x7f12150c
+.field public static final step_number:I = 0x7f12150c
 
-.field public static final stream_report_audio_poor:I = 0x7f12150d
+.field public static final still_indexing:I = 0x7f12150d
 
-.field public static final stream_report_black:I = 0x7f12150e
+.field public static final stop:I = 0x7f12150e
 
-.field public static final stream_report_blurry:I = 0x7f12150f
+.field public static final stop_ringing:I = 0x7f12150f
 
-.field public static final stream_report_ended_audio_missing:I = 0x7f121510
+.field public static final stop_ringing_username:I = 0x7f121510
 
-.field public static final stream_report_ended_audio_poor:I = 0x7f121511
+.field public static final stop_speaking_message:I = 0x7f121511
 
-.field public static final stream_report_ended_black:I = 0x7f121512
+.field public static final stop_streaming:I = 0x7f121512
 
-.field public static final stream_report_ended_blurry:I = 0x7f121513
+.field public static final stop_watching:I = 0x7f121513
 
-.field public static final stream_report_ended_lagging:I = 0x7f121514
+.field public static final stop_watching_user:I = 0x7f121514
 
-.field public static final stream_report_ended_out_of_sync:I = 0x7f121515
+.field public static final storage_permission_denied:I = 0x7f121515
 
-.field public static final stream_report_game_issue:I = 0x7f121516
+.field public static final store_channel:I = 0x7f121516
 
-.field public static final stream_report_label:I = 0x7f121517
+.field public static final stream_actions_menu_label:I = 0x7f121517
 
-.field public static final stream_report_lagging:I = 0x7f121518
+.field public static final stream_bad_spectator:I = 0x7f121518
 
-.field public static final stream_report_no_issue:I = 0x7f121519
+.field public static final stream_bad_streamer:I = 0x7f121519
 
-.field public static final stream_report_out_of_sync:I = 0x7f12151a
+.field public static final stream_capture_paused:I = 0x7f12151a
 
-.field public static final stream_report_placeholder:I = 0x7f12151b
+.field public static final stream_capture_paused_details:I = 0x7f12151b
 
-.field public static final stream_report_problem:I = 0x7f12151c
+.field public static final stream_capture_paused_details_viewer:I = 0x7f12151c
 
-.field public static final stream_report_problem_body:I = 0x7f12151d
+.field public static final stream_channel_description:I = 0x7f12151d
 
-.field public static final stream_report_problem_header_mobile:I = 0x7f12151e
+.field public static final stream_description:I = 0x7f12151e
 
-.field public static final stream_report_problem_menu_item:I = 0x7f12151f
+.field public static final stream_ended:I = 0x7f12151f
 
-.field public static final stream_report_problem_mobile:I = 0x7f121520
+.field public static final stream_failed_description:I = 0x7f121520
 
-.field public static final stream_report_rating_body:I = 0x7f121521
+.field public static final stream_failed_title:I = 0x7f121521
 
-.field public static final stream_report_rating_body_streamer:I = 0x7f121522
+.field public static final stream_fps_option:I = 0x7f121522
 
-.field public static final stream_report_submit:I = 0x7f121523
+.field public static final stream_full_modal_body:I = 0x7f121523
 
-.field public static final stream_reported:I = 0x7f121524
+.field public static final stream_full_modal_header:I = 0x7f121524
 
-.field public static final stream_reported_body:I = 0x7f121525
+.field public static final stream_issue_modal_header:I = 0x7f121525
 
-.field public static final stream_resolution:I = 0x7f121526
+.field public static final stream_network_quality_error:I = 0x7f121526
 
-.field public static final stream_show_all_participants:I = 0x7f121527
+.field public static final stream_no_preview:I = 0x7f121527
 
-.field public static final stream_show_non_video:I = 0x7f121528
+.field public static final stream_participants_hidden:I = 0x7f121528
 
-.field public static final stream_single_person_body:I = 0x7f121529
+.field public static final stream_playing:I = 0x7f121529
 
-.field public static final stream_single_person_body_alt:I = 0x7f12152a
+.field public static final stream_premium_upsell_body:I = 0x7f12152a
 
-.field public static final stream_soundshare_failed:I = 0x7f12152b
+.field public static final stream_premium_upsell_body_no_cta:I = 0x7f12152b
 
-.field public static final stream_volume:I = 0x7f12152c
+.field public static final stream_premium_upsell_cta:I = 0x7f12152c
 
-.field public static final stream_watch_multiple_tooltip:I = 0x7f12152d
+.field public static final stream_premium_upsell_header:I = 0x7f12152d
 
-.field public static final streamer_mode:I = 0x7f12152e
+.field public static final stream_preview_loading:I = 0x7f12152e
 
-.field public static final streamer_mode_enabled:I = 0x7f12152f
+.field public static final stream_preview_paused:I = 0x7f12152f
 
-.field public static final streamer_playing:I = 0x7f121530
+.field public static final stream_preview_paused_subtext:I = 0x7f121530
 
-.field public static final streamer_settings_title:I = 0x7f121531
+.field public static final stream_quality_unlock:I = 0x7f121531
 
-.field public static final streaming:I = 0x7f121532
+.field public static final stream_reconnecting_error:I = 0x7f121532
 
-.field public static final streaming_a_game:I = 0x7f121533
+.field public static final stream_reconnecting_error_subtext:I = 0x7f121533
 
-.field public static final sub_enabled_servers:I = 0x7f121534
+.field public static final stream_report_a_problem:I = 0x7f121534
 
-.field public static final subscriber_information:I = 0x7f121535
+.field public static final stream_report_a_problem_post_stream:I = 0x7f121535
 
-.field public static final subscription_payment_legalese_monthly:I = 0x7f121536
+.field public static final stream_report_audio_missing:I = 0x7f121536
 
-.field public static final subscription_payment_legalese_yearly:I = 0x7f121537
+.field public static final stream_report_audio_poor:I = 0x7f121537
 
-.field public static final subscriptions_title:I = 0x7f121538
+.field public static final stream_report_black:I = 0x7f121538
 
-.field public static final suggestions:I = 0x7f121539
+.field public static final stream_report_blurry:I = 0x7f121539
 
-.field public static final summary_collapsed_preference_list:I = 0x7f12153a
+.field public static final stream_report_ended_audio_missing:I = 0x7f12153a
 
-.field public static final support:I = 0x7f12153b
+.field public static final stream_report_ended_audio_poor:I = 0x7f12153b
 
-.field public static final suppress_all_embeds:I = 0x7f12153c
+.field public static final stream_report_ended_black:I = 0x7f12153c
 
-.field public static final suppress_embed_body:I = 0x7f12153d
+.field public static final stream_report_ended_blurry:I = 0x7f12153d
 
-.field public static final suppress_embed_confirm:I = 0x7f12153e
+.field public static final stream_report_ended_lagging:I = 0x7f12153e
 
-.field public static final suppress_embed_tip:I = 0x7f12153f
+.field public static final stream_report_ended_out_of_sync:I = 0x7f12153f
 
-.field public static final suppress_embed_title:I = 0x7f121540
+.field public static final stream_report_game_issue:I = 0x7f121540
 
-.field public static final suppressed:I = 0x7f121541
+.field public static final stream_report_label:I = 0x7f121541
 
-.field public static final suppressed_afk_body:I = 0x7f121542
+.field public static final stream_report_lagging:I = 0x7f121542
 
-.field public static final suppressed_afk_title:I = 0x7f121543
+.field public static final stream_report_no_issue:I = 0x7f121543
 
-.field public static final suppressed_permission_body:I = 0x7f121544
+.field public static final stream_report_out_of_sync:I = 0x7f121544
 
-.field public static final sv_se:I = 0x7f121545
+.field public static final stream_report_placeholder:I = 0x7f121545
 
-.field public static final switch_audio_output:I = 0x7f121546
+.field public static final stream_report_problem:I = 0x7f121546
 
-.field public static final switch_hardware_acceleration:I = 0x7f121547
+.field public static final stream_report_problem_body:I = 0x7f121547
 
-.field public static final switch_hardware_acceleration_body:I = 0x7f121548
+.field public static final stream_report_problem_header_mobile:I = 0x7f121548
 
-.field public static final switch_subsystem:I = 0x7f121549
+.field public static final stream_report_problem_menu_item:I = 0x7f121549
 
-.field public static final switch_subsystem_body:I = 0x7f12154a
+.field public static final stream_report_problem_mobile:I = 0x7f12154a
 
-.field public static final switch_to_compact_mode:I = 0x7f12154b
+.field public static final stream_report_rating_body:I = 0x7f12154b
 
-.field public static final switch_to_cozy_mode:I = 0x7f12154c
+.field public static final stream_report_rating_body_streamer:I = 0x7f12154c
 
-.field public static final switch_to_dark_theme:I = 0x7f12154d
+.field public static final stream_report_submit:I = 0x7f12154d
 
-.field public static final switch_to_light_theme:I = 0x7f12154e
+.field public static final stream_reported:I = 0x7f12154e
 
-.field public static final switch_to_push_to_talk:I = 0x7f12154f
+.field public static final stream_reported_body:I = 0x7f12154f
 
-.field public static final switch_to_voice_activity:I = 0x7f121550
+.field public static final stream_resolution:I = 0x7f121550
 
-.field public static final sync:I = 0x7f121551
+.field public static final stream_show_all_participants:I = 0x7f121551
 
-.field public static final sync_across_clients_appearance_help:I = 0x7f121552
+.field public static final stream_show_non_video:I = 0x7f121552
 
-.field public static final sync_across_clients_text:I = 0x7f121553
+.field public static final stream_single_person_body:I = 0x7f121553
 
-.field public static final sync_across_clients_text_help:I = 0x7f121554
+.field public static final stream_single_person_body_alt:I = 0x7f121554
 
-.field public static final sync_friends:I = 0x7f121555
+.field public static final stream_soundshare_failed:I = 0x7f121555
 
-.field public static final sync_now:I = 0x7f121556
+.field public static final stream_volume:I = 0x7f121556
 
-.field public static final sync_permissions:I = 0x7f121557
+.field public static final stream_watch_multiple_tooltip:I = 0x7f121557
 
-.field public static final sync_permissions_explanation:I = 0x7f121558
+.field public static final streamer_mode:I = 0x7f121558
 
-.field public static final sync_revoked:I = 0x7f121559
+.field public static final streamer_mode_enabled:I = 0x7f121559
 
-.field public static final sync_this_account:I = 0x7f12155a
+.field public static final streamer_playing:I = 0x7f12155a
 
-.field public static final system_dm_activity_text:I = 0x7f12155b
+.field public static final streamer_settings_title:I = 0x7f12155b
 
-.field public static final system_dm_channel_description:I = 0x7f12155c
+.field public static final streaming:I = 0x7f12155c
 
-.field public static final system_dm_channel_description_subtext:I = 0x7f12155d
+.field public static final streaming_a_game:I = 0x7f12155d
 
-.field public static final system_dm_empty_message:I = 0x7f12155e
+.field public static final sub_enabled_servers:I = 0x7f12155e
 
-.field public static final system_dm_tag_system:I = 0x7f12155f
+.field public static final subscriber_information:I = 0x7f12155f
 
-.field public static final system_dm_urgent_message_modal_body:I = 0x7f121560
+.field public static final subscription_payment_legalese_monthly:I = 0x7f121560
 
-.field public static final system_dm_urgent_message_modal_header:I = 0x7f121561
+.field public static final subscription_payment_legalese_yearly:I = 0x7f121561
 
-.field public static final system_keyboard:I = 0x7f121562
+.field public static final subscriptions_title:I = 0x7f121562
 
-.field public static final system_message_call_missed:I = 0x7f121563
+.field public static final suggestions:I = 0x7f121563
 
-.field public static final system_message_call_missed_with_duration:I = 0x7f121564
+.field public static final summary_collapsed_preference_list:I = 0x7f121564
 
-.field public static final system_message_call_started:I = 0x7f121565
+.field public static final support:I = 0x7f121565
 
-.field public static final system_message_call_started_with_duration:I = 0x7f121566
+.field public static final suppress_all_embeds:I = 0x7f121566
 
-.field public static final system_message_channel_follow_add:I = 0x7f121567
+.field public static final suppress_embed_body:I = 0x7f121567
 
-.field public static final system_message_channel_follow_add_ios:I = 0x7f121568
+.field public static final suppress_embed_confirm:I = 0x7f121568
 
-.field public static final system_message_channel_icon_change:I = 0x7f121569
+.field public static final suppress_embed_tip:I = 0x7f121569
 
-.field public static final system_message_channel_name_change:I = 0x7f12156a
+.field public static final suppress_embed_title:I = 0x7f12156a
 
-.field public static final system_message_guild_bot_join:I = 0x7f12156b
+.field public static final suppressed:I = 0x7f12156b
 
-.field public static final system_message_guild_discovery_disqualified:I = 0x7f12156c
+.field public static final suppressed_afk_body:I = 0x7f12156c
 
-.field public static final system_message_guild_discovery_disqualified_mobile:I = 0x7f12156d
+.field public static final suppressed_afk_title:I = 0x7f12156d
 
-.field public static final system_message_guild_discovery_grace_period_final_warning:I = 0x7f12156e
+.field public static final suppressed_permission_body:I = 0x7f12156e
 
-.field public static final system_message_guild_discovery_grace_period_initial_warning:I = 0x7f12156f
+.field public static final sv_se:I = 0x7f12156f
 
-.field public static final system_message_guild_discovery_requalified:I = 0x7f121570
+.field public static final switch_audio_output:I = 0x7f121570
 
-.field public static final system_message_guild_member_join_001:I = 0x7f121571
+.field public static final switch_hardware_acceleration:I = 0x7f121571
 
-.field public static final system_message_guild_member_join_002:I = 0x7f121572
+.field public static final switch_hardware_acceleration_body:I = 0x7f121572
 
-.field public static final system_message_guild_member_join_003:I = 0x7f121573
+.field public static final switch_subsystem:I = 0x7f121573
 
-.field public static final system_message_guild_member_join_004:I = 0x7f121574
+.field public static final switch_subsystem_body:I = 0x7f121574
 
-.field public static final system_message_guild_member_join_005:I = 0x7f121575
+.field public static final switch_to_compact_mode:I = 0x7f121575
 
-.field public static final system_message_guild_member_join_006:I = 0x7f121576
+.field public static final switch_to_cozy_mode:I = 0x7f121576
 
-.field public static final system_message_guild_member_join_007:I = 0x7f121577
+.field public static final switch_to_dark_theme:I = 0x7f121577
 
-.field public static final system_message_guild_member_join_008:I = 0x7f121578
+.field public static final switch_to_light_theme:I = 0x7f121578
 
-.field public static final system_message_guild_member_join_009:I = 0x7f121579
+.field public static final switch_to_push_to_talk:I = 0x7f121579
 
-.field public static final system_message_guild_member_join_010:I = 0x7f12157a
+.field public static final switch_to_voice_activity:I = 0x7f12157a
 
-.field public static final system_message_guild_member_join_011:I = 0x7f12157b
+.field public static final sync:I = 0x7f12157b
 
-.field public static final system_message_guild_member_join_012:I = 0x7f12157c
+.field public static final sync_across_clients_appearance_help:I = 0x7f12157c
 
-.field public static final system_message_guild_member_join_013:I = 0x7f12157d
+.field public static final sync_across_clients_text:I = 0x7f12157d
 
-.field public static final system_message_guild_member_subscribed:I = 0x7f12157e
+.field public static final sync_across_clients_text_help:I = 0x7f12157e
 
-.field public static final system_message_guild_member_subscribed_achieved_tier:I = 0x7f12157f
+.field public static final sync_friends:I = 0x7f12157f
 
-.field public static final system_message_guild_member_subscribed_many:I = 0x7f121580
+.field public static final sync_now:I = 0x7f121580
 
-.field public static final system_message_guild_member_subscribed_many_achieved_tier:I = 0x7f121581
+.field public static final sync_permissions:I = 0x7f121581
 
-.field public static final system_message_guild_stream_active:I = 0x7f121582
+.field public static final sync_permissions_explanation:I = 0x7f121582
 
-.field public static final system_message_guild_stream_active_android:I = 0x7f121583
+.field public static final sync_revoked:I = 0x7f121583
 
-.field public static final system_message_guild_stream_active_mobile:I = 0x7f121584
+.field public static final sync_this_account:I = 0x7f121584
 
-.field public static final system_message_guild_stream_active_no_activity:I = 0x7f121585
+.field public static final system_dm_activity_text:I = 0x7f121585
 
-.field public static final system_message_guild_stream_ended:I = 0x7f121586
+.field public static final system_dm_channel_description:I = 0x7f121586
 
-.field public static final system_message_guild_stream_ended_mobile:I = 0x7f121587
+.field public static final system_dm_channel_description_subtext:I = 0x7f121587
 
-.field public static final system_message_join_call:I = 0x7f121588
+.field public static final system_dm_empty_message:I = 0x7f121588
 
-.field public static final system_message_pinned_message:I = 0x7f121589
+.field public static final system_dm_tag_system:I = 0x7f121589
 
-.field public static final system_message_pinned_message_mobile:I = 0x7f12158a
+.field public static final system_dm_urgent_message_modal_body:I = 0x7f12158a
 
-.field public static final system_message_pinned_message_no_cta:I = 0x7f12158b
+.field public static final system_dm_urgent_message_modal_header:I = 0x7f12158b
 
-.field public static final system_message_pinned_message_no_cta_formatted:I = 0x7f12158c
+.field public static final system_keyboard:I = 0x7f12158c
 
-.field public static final system_message_pinned_message_no_cta_formatted_with_message:I = 0x7f12158d
+.field public static final system_message_call_missed:I = 0x7f12158d
 
-.field public static final system_message_pinned_message_with_message:I = 0x7f12158e
+.field public static final system_message_call_missed_with_duration:I = 0x7f12158e
 
-.field public static final system_message_recipient_add:I = 0x7f12158f
+.field public static final system_message_call_started:I = 0x7f12158f
 
-.field public static final system_message_recipient_remove:I = 0x7f121590
+.field public static final system_message_call_started_with_duration:I = 0x7f121590
 
-.field public static final system_message_recipient_remove_self:I = 0x7f121591
+.field public static final system_message_channel_follow_add:I = 0x7f121591
 
-.field public static final system_message_thread_created:I = 0x7f121592
+.field public static final system_message_channel_follow_add_ios:I = 0x7f121592
 
-.field public static final system_message_thread_reply_created:I = 0x7f121593
+.field public static final system_message_channel_icon_change:I = 0x7f121593
 
-.field public static final system_permission_grant:I = 0x7f121594
+.field public static final system_message_channel_name_change:I = 0x7f121594
 
-.field public static final system_permission_request_camera:I = 0x7f121595
+.field public static final system_message_guild_bot_join:I = 0x7f121595
 
-.field public static final system_permission_request_files:I = 0x7f121596
+.field public static final system_message_guild_discovery_disqualified:I = 0x7f121596
 
-.field public static final tab_bar:I = 0x7f121597
+.field public static final system_message_guild_discovery_disqualified_mobile:I = 0x7f121597
 
-.field public static final tabs_friends_accessibility_label:I = 0x7f121598
+.field public static final system_message_guild_discovery_grace_period_final_warning:I = 0x7f121598
 
-.field public static final tabs_home_accessibility_label:I = 0x7f121599
+.field public static final system_message_guild_discovery_grace_period_initial_warning:I = 0x7f121599
 
-.field public static final tabs_mentions_accessibility_label:I = 0x7f12159a
+.field public static final system_message_guild_discovery_requalified:I = 0x7f12159a
 
-.field public static final tabs_search_accessibility_label:I = 0x7f12159b
+.field public static final system_message_guild_member_join_001:I = 0x7f12159b
 
-.field public static final tabs_settings_accessibility_label:I = 0x7f12159c
+.field public static final system_message_guild_member_join_002:I = 0x7f12159c
 
-.field public static final take_a_photo:I = 0x7f12159d
+.field public static final system_message_guild_member_join_003:I = 0x7f12159d
 
-.field public static final tan:I = 0x7f12159e
+.field public static final system_message_guild_member_join_004:I = 0x7f12159e
 
-.field public static final tap_add_nickname:I = 0x7f12159f
+.field public static final system_message_guild_member_join_005:I = 0x7f12159f
 
-.field public static final tar_gz:I = 0x7f1215a0
+.field public static final system_message_guild_member_join_006:I = 0x7f1215a0
 
-.field public static final teal:I = 0x7f1215a1
+.field public static final system_message_guild_member_join_007:I = 0x7f1215a1
 
-.field public static final temporary_membership_explanation:I = 0x7f1215a2
+.field public static final system_message_guild_member_join_008:I = 0x7f1215a2
 
-.field public static final terms_of_service:I = 0x7f1215a3
+.field public static final system_message_guild_member_join_009:I = 0x7f1215a3
 
-.field public static final terms_of_service_url:I = 0x7f1215a4
+.field public static final system_message_guild_member_join_010:I = 0x7f1215a4
 
-.field public static final terms_privacy:I = 0x7f1215a5
+.field public static final system_message_guild_member_join_011:I = 0x7f1215a5
 
-.field public static final terms_privacy_opt_in:I = 0x7f1215a6
+.field public static final system_message_guild_member_join_012:I = 0x7f1215a6
 
-.field public static final terms_privacy_opt_in_tooltip:I = 0x7f1215a7
+.field public static final system_message_guild_member_join_013:I = 0x7f1215a7
 
-.field public static final terracotta:I = 0x7f1215a8
+.field public static final system_message_guild_member_subscribed:I = 0x7f1215a8
 
-.field public static final test_newlines_key:I = 0x7f1215a9
+.field public static final system_message_guild_member_subscribed_achieved_tier:I = 0x7f1215a9
 
-.field public static final test_video:I = 0x7f1215aa
+.field public static final system_message_guild_member_subscribed_many:I = 0x7f1215aa
 
-.field public static final text:I = 0x7f1215ab
+.field public static final system_message_guild_member_subscribed_many_achieved_tier:I = 0x7f1215ab
 
-.field public static final text_actions_menu_label:I = 0x7f1215ac
+.field public static final system_message_guild_stream_active:I = 0x7f1215ac
 
-.field public static final text_and_images:I = 0x7f1215ad
+.field public static final system_message_guild_stream_active_android:I = 0x7f1215ad
 
-.field public static final text_channel:I = 0x7f1215ae
+.field public static final system_message_guild_stream_active_mobile:I = 0x7f1215ae
 
-.field public static final text_channels:I = 0x7f1215af
+.field public static final system_message_guild_stream_active_no_activity:I = 0x7f1215af
 
-.field public static final text_channels_matching:I = 0x7f1215b0
+.field public static final system_message_guild_stream_ended:I = 0x7f1215b0
 
-.field public static final text_permissions:I = 0x7f1215b1
+.field public static final system_message_guild_stream_ended_mobile:I = 0x7f1215b1
 
-.field public static final textarea_actions_menu_label:I = 0x7f1215b2
+.field public static final system_message_join_call:I = 0x7f1215b2
 
-.field public static final textarea_placeholder:I = 0x7f1215b3
+.field public static final system_message_pinned_message:I = 0x7f1215b3
 
-.field public static final th:I = 0x7f1215b4
+.field public static final system_message_pinned_message_mobile:I = 0x7f1215b4
 
-.field public static final theme:I = 0x7f1215b5
+.field public static final system_message_pinned_message_no_cta:I = 0x7f1215b5
 
-.field public static final theme_dark:I = 0x7f1215b6
+.field public static final system_message_pinned_message_no_cta_formatted:I = 0x7f1215b6
 
-.field public static final theme_holy_light_reveal:I = 0x7f1215b7
+.field public static final system_message_pinned_message_no_cta_formatted_with_message:I = 0x7f1215b7
 
-.field public static final theme_light:I = 0x7f1215b8
+.field public static final system_message_pinned_message_with_message:I = 0x7f1215b8
 
-.field public static final theme_pure_evil_easter_hint:I = 0x7f1215b9
+.field public static final system_message_recipient_add:I = 0x7f1215b9
 
-.field public static final theme_pure_evil_easter_reveal:I = 0x7f1215ba
+.field public static final system_message_recipient_remove:I = 0x7f1215ba
 
-.field public static final theme_pure_evil_switch_label:I = 0x7f1215bb
+.field public static final system_message_recipient_remove_self:I = 0x7f1215bb
 
-.field public static final theme_pure_evil_updated:I = 0x7f1215bc
+.field public static final system_message_thread_created:I = 0x7f1215bc
 
-.field public static final theme_updated:I = 0x7f1215bd
+.field public static final system_message_thread_reply_created:I = 0x7f1215bd
 
-.field public static final this_server:I = 0x7f1215be
+.field public static final system_permission_grant:I = 0x7f1215be
 
-.field public static final this_server_named:I = 0x7f1215bf
+.field public static final system_permission_request_camera:I = 0x7f1215bf
 
-.field public static final thread:I = 0x7f1215c0
+.field public static final system_permission_request_files:I = 0x7f1215c0
 
-.field public static final thread_deleted:I = 0x7f1215c1
+.field public static final tab_bar:I = 0x7f1215c1
 
-.field public static final thread_join_header:I = 0x7f1215c2
+.field public static final tabs_friends_accessibility_label:I = 0x7f1215c2
 
-.field public static final thread_join_sub_text:I = 0x7f1215c3
+.field public static final tabs_home_accessibility_label:I = 0x7f1215c3
 
-.field public static final thread_modal_message:I = 0x7f1215c4
+.field public static final tabs_mentions_accessibility_label:I = 0x7f1215c4
 
-.field public static final thread_topic:I = 0x7f1215c5
+.field public static final tabs_search_accessibility_label:I = 0x7f1215c5
 
-.field public static final threads:I = 0x7f1215c6
+.field public static final tabs_settings_accessibility_label:I = 0x7f1215c6
 
-.field public static final threads_active_section:I = 0x7f1215c7
+.field public static final take_a_photo:I = 0x7f1215c7
 
-.field public static final threads_inactive_section:I = 0x7f1215c8
+.field public static final tan:I = 0x7f1215c8
 
-.field public static final threads_joined_section:I = 0x7f1215c9
+.field public static final tap_add_nickname:I = 0x7f1215c9
 
-.field public static final three_users_typing:I = 0x7f1215ca
+.field public static final tar_gz:I = 0x7f1215ca
 
-.field public static final timeout_error:I = 0x7f1215cb
+.field public static final teal:I = 0x7f1215cb
 
-.field public static final tip_create_first_server_body3:I = 0x7f1215cc
+.field public static final temporary_membership_explanation:I = 0x7f1215cc
 
-.field public static final tip_create_first_server_title3:I = 0x7f1215cd
+.field public static final terms_of_service:I = 0x7f1215cd
 
-.field public static final tip_create_more_servers_body3:I = 0x7f1215ce
+.field public static final terms_of_service_url:I = 0x7f1215ce
 
-.field public static final tip_create_more_servers_title3:I = 0x7f1215cf
+.field public static final terms_privacy:I = 0x7f1215cf
 
-.field public static final tip_direct_messages_body3:I = 0x7f1215d0
+.field public static final terms_privacy_opt_in:I = 0x7f1215d0
 
-.field public static final tip_direct_messages_title3:I = 0x7f1215d1
+.field public static final terms_privacy_opt_in_tooltip:I = 0x7f1215d1
 
-.field public static final tip_friends_list_body3:I = 0x7f1215d2
+.field public static final terracotta:I = 0x7f1215d2
 
-.field public static final tip_friends_list_title3:I = 0x7f1215d3
+.field public static final test_newlines_key:I = 0x7f1215d3
 
-.field public static final tip_instant_invite_body3:I = 0x7f1215d4
+.field public static final test_video:I = 0x7f1215d4
 
-.field public static final tip_instant_invite_title3:I = 0x7f1215d5
+.field public static final text:I = 0x7f1215d5
 
-.field public static final tip_organize_by_topic_body3:I = 0x7f1215d6
+.field public static final text_actions_menu_label:I = 0x7f1215d6
 
-.field public static final tip_organize_by_topic_title3:I = 0x7f1215d7
+.field public static final text_and_images:I = 0x7f1215d7
 
-.field public static final tip_server_settings_body3:I = 0x7f1215d8
+.field public static final text_channel:I = 0x7f1215d8
 
-.field public static final tip_server_settings_title3:I = 0x7f1215d9
+.field public static final text_channels:I = 0x7f1215d9
 
-.field public static final tip_voice_conversations_body3:I = 0x7f1215da
+.field public static final text_channels_matching:I = 0x7f1215da
 
-.field public static final tip_voice_conversations_title3:I = 0x7f1215db
+.field public static final text_permissions:I = 0x7f1215db
 
-.field public static final tip_whos_online_body3:I = 0x7f1215dc
+.field public static final textarea_actions_menu_label:I = 0x7f1215dc
 
-.field public static final tip_whos_online_title3:I = 0x7f1215dd
+.field public static final textarea_placeholder:I = 0x7f1215dd
 
-.field public static final tip_writing_messages_body3:I = 0x7f1215de
+.field public static final th:I = 0x7f1215de
 
-.field public static final tip_writing_messages_title3:I = 0x7f1215df
+.field public static final theme:I = 0x7f1215df
 
-.field public static final title:I = 0x7f1215e0
+.field public static final theme_dark:I = 0x7f1215e0
 
-.field public static final title_bar_close_window:I = 0x7f1215e1
+.field public static final theme_holy_light_reveal:I = 0x7f1215e1
 
-.field public static final title_bar_fullscreen_window:I = 0x7f1215e2
+.field public static final theme_light:I = 0x7f1215e2
 
-.field public static final title_bar_maximize_window:I = 0x7f1215e3
+.field public static final theme_pure_evil_easter_hint:I = 0x7f1215e3
 
-.field public static final title_bar_minimize_window:I = 0x7f1215e4
+.field public static final theme_pure_evil_easter_reveal:I = 0x7f1215e4
 
-.field public static final toast_add_friend:I = 0x7f1215e5
+.field public static final theme_pure_evil_switch_label:I = 0x7f1215e5
 
-.field public static final toast_feedback_sent:I = 0x7f1215e6
+.field public static final theme_pure_evil_updated:I = 0x7f1215e6
 
-.field public static final toast_gif_saved:I = 0x7f1215e7
+.field public static final theme_updated:I = 0x7f1215e7
 
-.field public static final toast_id_copied:I = 0x7f1215e8
+.field public static final this_server:I = 0x7f1215e8
 
-.field public static final toast_image_saved:I = 0x7f1215e9
+.field public static final this_server_named:I = 0x7f1215e9
 
-.field public static final toast_message_copied:I = 0x7f1215ea
+.field public static final thread:I = 0x7f1215ea
 
-.field public static final toast_message_id_copied:I = 0x7f1215eb
+.field public static final thread_deleted:I = 0x7f1215eb
 
-.field public static final toast_username_saved:I = 0x7f1215ec
+.field public static final thread_join_header:I = 0x7f1215ec
 
-.field public static final toast_video_saved:I = 0x7f1215ed
+.field public static final thread_join_sub_text:I = 0x7f1215ed
 
-.field public static final toggle_camera:I = 0x7f1215ee
+.field public static final thread_modal_message:I = 0x7f1215ee
 
-.field public static final toggle_deafen:I = 0x7f1215ef
+.field public static final thread_topic:I = 0x7f1215ef
 
-.field public static final toggle_drawer:I = 0x7f1215f0
+.field public static final threads:I = 0x7f1215f0
 
-.field public static final toggle_emoji_keyboard:I = 0x7f1215f1
+.field public static final threads_active_section:I = 0x7f1215f1
 
-.field public static final toggle_media_keyboard:I = 0x7f1215f2
+.field public static final threads_inactive_section:I = 0x7f1215f2
 
-.field public static final toggle_microphone:I = 0x7f1215f3
+.field public static final threads_joined_section:I = 0x7f1215f3
 
-.field public static final toggle_mute:I = 0x7f1215f4
+.field public static final three_users_typing:I = 0x7f1215f4
 
-.field public static final too_many_animated_emoji:I = 0x7f1215f5
+.field public static final timeout_error:I = 0x7f1215f5
 
-.field public static final too_many_emoji:I = 0x7f1215f6
+.field public static final tip_create_first_server_body3:I = 0x7f1215f6
 
-.field public static final too_many_reactions_alert_body:I = 0x7f1215f7
+.field public static final tip_create_first_server_title3:I = 0x7f1215f7
 
-.field public static final too_many_reactions_alert_header:I = 0x7f1215f8
+.field public static final tip_create_more_servers_body3:I = 0x7f1215f8
 
-.field public static final too_many_user_guilds_alert_description:I = 0x7f1215f9
+.field public static final tip_create_more_servers_title3:I = 0x7f1215f9
 
-.field public static final too_many_user_guilds_alert_title:I = 0x7f1215fa
+.field public static final tip_direct_messages_body3:I = 0x7f1215fa
 
-.field public static final too_many_user_guilds_description:I = 0x7f1215fb
+.field public static final tip_direct_messages_title3:I = 0x7f1215fb
 
-.field public static final too_many_user_guilds_title:I = 0x7f1215fc
+.field public static final tip_friends_list_body3:I = 0x7f1215fc
 
-.field public static final tooltip_community_feature_disabled:I = 0x7f1215fd
+.field public static final tip_friends_list_title3:I = 0x7f1215fd
 
-.field public static final tooltip_discoverable_guild_feature_disabled:I = 0x7f1215fe
+.field public static final tip_instant_invite_body3:I = 0x7f1215fe
 
-.field public static final total_members:I = 0x7f1215ff
+.field public static final tip_instant_invite_title3:I = 0x7f1215ff
 
-.field public static final total_results:I = 0x7f121600
+.field public static final tip_organize_by_topic_body3:I = 0x7f121600
 
-.field public static final tr:I = 0x7f121601
+.field public static final tip_organize_by_topic_title3:I = 0x7f121601
 
-.field public static final transfer:I = 0x7f121602
+.field public static final tip_server_settings_body3:I = 0x7f121602
 
-.field public static final transfer_ownership:I = 0x7f121603
+.field public static final tip_server_settings_title3:I = 0x7f121603
 
-.field public static final transfer_ownership_acknowledge:I = 0x7f121604
+.field public static final tip_voice_conversations_body3:I = 0x7f121604
 
-.field public static final transfer_ownership_to_user:I = 0x7f121605
+.field public static final tip_voice_conversations_title3:I = 0x7f121605
 
-.field public static final trending_arrow_down:I = 0x7f121606
+.field public static final tip_whos_online_body3:I = 0x7f121606
 
-.field public static final trending_arrow_up:I = 0x7f121607
+.field public static final tip_whos_online_title3:I = 0x7f121607
 
-.field public static final try_again:I = 0x7f121608
+.field public static final tip_writing_messages_body3:I = 0x7f121608
 
-.field public static final tts_alls:I = 0x7f121609
+.field public static final tip_writing_messages_title3:I = 0x7f121609
 
-.field public static final tts_current:I = 0x7f12160a
+.field public static final title:I = 0x7f12160a
 
-.field public static final tts_never:I = 0x7f12160b
+.field public static final title_bar_close_window:I = 0x7f12160b
 
-.field public static final tutorial_close:I = 0x7f12160c
+.field public static final title_bar_fullscreen_window:I = 0x7f12160c
 
-.field public static final tweet_us:I = 0x7f12160d
+.field public static final title_bar_maximize_window:I = 0x7f12160d
 
-.field public static final twitter:I = 0x7f12160e
+.field public static final title_bar_minimize_window:I = 0x7f12160e
 
-.field public static final twitter_page_url:I = 0x7f12160f
+.field public static final toast_add_friend:I = 0x7f12160f
 
-.field public static final two_fa:I = 0x7f121610
+.field public static final toast_feedback_sent:I = 0x7f121610
 
-.field public static final two_fa_activate:I = 0x7f121611
+.field public static final toast_gif_saved:I = 0x7f121611
 
-.field public static final two_fa_app_name_authy:I = 0x7f121612
+.field public static final toast_id_copied:I = 0x7f121612
 
-.field public static final two_fa_app_name_google_authenticator:I = 0x7f121613
+.field public static final toast_image_saved:I = 0x7f121613
 
-.field public static final two_fa_auth_code:I = 0x7f121614
+.field public static final toast_message_copied:I = 0x7f121614
 
-.field public static final two_fa_backup_code_enter:I = 0x7f121615
+.field public static final toast_message_id_copied:I = 0x7f121615
 
-.field public static final two_fa_backup_code_enter_wrong:I = 0x7f121616
+.field public static final toast_username_saved:I = 0x7f121616
 
-.field public static final two_fa_backup_code_hint:I = 0x7f121617
+.field public static final toast_video_saved:I = 0x7f121617
 
-.field public static final two_fa_backup_code_used:I = 0x7f121618
+.field public static final toggle_camera:I = 0x7f121618
 
-.field public static final two_fa_backup_codes_body:I = 0x7f121619
+.field public static final toggle_deafen:I = 0x7f121619
 
-.field public static final two_fa_backup_codes_label:I = 0x7f12161a
+.field public static final toggle_drawer:I = 0x7f12161a
 
-.field public static final two_fa_backup_codes_sales_pitch:I = 0x7f12161b
+.field public static final toggle_emoji_keyboard:I = 0x7f12161b
 
-.field public static final two_fa_backup_codes_warning:I = 0x7f12161c
+.field public static final toggle_media_keyboard:I = 0x7f12161c
 
-.field public static final two_fa_change_account:I = 0x7f12161d
+.field public static final toggle_microphone:I = 0x7f12161d
 
-.field public static final two_fa_confirm_body:I = 0x7f12161e
+.field public static final toggle_mute:I = 0x7f12161e
 
-.field public static final two_fa_confirm_confirm:I = 0x7f12161f
+.field public static final too_many_animated_emoji:I = 0x7f12161f
 
-.field public static final two_fa_confirm_title:I = 0x7f121620
+.field public static final too_many_emoji:I = 0x7f121620
 
-.field public static final two_fa_disable:I = 0x7f121621
+.field public static final too_many_reactions_alert_body:I = 0x7f121621
 
-.field public static final two_fa_discord_backup_codes:I = 0x7f121622
+.field public static final too_many_reactions_alert_header:I = 0x7f121622
 
-.field public static final two_fa_download_app_body:I = 0x7f121623
+.field public static final too_many_user_guilds_alert_description:I = 0x7f121623
 
-.field public static final two_fa_download_app_label:I = 0x7f121624
+.field public static final too_many_user_guilds_alert_title:I = 0x7f121624
 
-.field public static final two_fa_download_codes:I = 0x7f121625
+.field public static final too_many_user_guilds_description:I = 0x7f121625
 
-.field public static final two_fa_enable:I = 0x7f121626
+.field public static final too_many_user_guilds_title:I = 0x7f121626
 
-.field public static final two_fa_enable_subheader:I = 0x7f121627
+.field public static final tooltip_community_feature_disabled:I = 0x7f121627
 
-.field public static final two_fa_enabled:I = 0x7f121628
+.field public static final tooltip_discoverable_guild_feature_disabled:I = 0x7f121628
 
-.field public static final two_fa_enter_sms_token_label:I = 0x7f121629
+.field public static final total_members:I = 0x7f121629
 
-.field public static final two_fa_enter_sms_token_sending:I = 0x7f12162a
+.field public static final total_results:I = 0x7f12162a
 
-.field public static final two_fa_enter_sms_token_sent:I = 0x7f12162b
+.field public static final tr:I = 0x7f12162b
 
-.field public static final two_fa_enter_token_body:I = 0x7f12162c
+.field public static final transfer:I = 0x7f12162c
 
-.field public static final two_fa_enter_token_label:I = 0x7f12162d
+.field public static final transfer_ownership:I = 0x7f12162d
 
-.field public static final two_fa_generate_codes:I = 0x7f12162e
+.field public static final transfer_ownership_acknowledge:I = 0x7f12162e
 
-.field public static final two_fa_generate_codes_confirm_text:I = 0x7f12162f
+.field public static final transfer_ownership_to_user:I = 0x7f12162f
 
-.field public static final two_fa_guild_mfa_warning:I = 0x7f121630
+.field public static final trending_arrow_down:I = 0x7f121630
 
-.field public static final two_fa_guild_mfa_warning_ios:I = 0x7f121631
+.field public static final trending_arrow_up:I = 0x7f121631
 
-.field public static final two_fa_guild_mfa_warning_message:I = 0x7f121632
+.field public static final try_again:I = 0x7f121632
 
-.field public static final two_fa_guild_mfa_warning_message_with_spacing:I = 0x7f121633
+.field public static final tts_alls:I = 0x7f121633
 
-.field public static final two_fa_guild_mfa_warning_resolve_button:I = 0x7f121634
+.field public static final tts_current:I = 0x7f121634
 
-.field public static final two_fa_key:I = 0x7f121635
+.field public static final tts_never:I = 0x7f121635
 
-.field public static final two_fa_login_body:I = 0x7f121636
+.field public static final tutorial_close:I = 0x7f121636
 
-.field public static final two_fa_login_footer:I = 0x7f121637
+.field public static final tweet_us:I = 0x7f121637
 
-.field public static final two_fa_login_label:I = 0x7f121638
+.field public static final twitter:I = 0x7f121638
 
-.field public static final two_fa_not_verified:I = 0x7f121639
+.field public static final twitter_page_url:I = 0x7f121639
 
-.field public static final two_fa_qr_body:I = 0x7f12163a
+.field public static final two_fa:I = 0x7f12163a
 
-.field public static final two_fa_qr_label:I = 0x7f12163b
+.field public static final two_fa_activate:I = 0x7f12163b
 
-.field public static final two_fa_remove:I = 0x7f12163c
+.field public static final two_fa_app_name_authy:I = 0x7f12163c
 
-.field public static final two_fa_sales_pitch:I = 0x7f12163d
+.field public static final two_fa_app_name_google_authenticator:I = 0x7f12163d
 
-.field public static final two_fa_success_body_mobile:I = 0x7f12163e
+.field public static final two_fa_auth_code:I = 0x7f12163e
 
-.field public static final two_fa_success_header:I = 0x7f12163f
+.field public static final two_fa_backup_code_enter:I = 0x7f12163f
 
-.field public static final two_fa_token_required:I = 0x7f121640
+.field public static final two_fa_backup_code_enter_wrong:I = 0x7f121640
 
-.field public static final two_fa_use_desktop_app:I = 0x7f121641
+.field public static final two_fa_backup_code_hint:I = 0x7f121641
 
-.field public static final two_fa_view_backup_codes:I = 0x7f121642
+.field public static final two_fa_backup_code_used:I = 0x7f121642
 
-.field public static final two_fa_view_codes:I = 0x7f121643
+.field public static final two_fa_backup_codes_body:I = 0x7f121643
 
-.field public static final two_users_typing:I = 0x7f121644
+.field public static final two_fa_backup_codes_label:I = 0x7f121644
 
-.field public static final uk:I = 0x7f12164a
+.field public static final two_fa_backup_codes_sales_pitch:I = 0x7f121645
 
-.field public static final unable_to_join_channel_full:I = 0x7f12164b
+.field public static final two_fa_backup_codes_warning:I = 0x7f121646
 
-.field public static final unable_to_join_channel_full_modal_body:I = 0x7f12164c
+.field public static final two_fa_change_account:I = 0x7f121647
 
-.field public static final unable_to_join_channel_full_modal_header:I = 0x7f12164d
+.field public static final two_fa_confirm_body:I = 0x7f121648
 
-.field public static final unable_to_open_media_chooser:I = 0x7f12164e
+.field public static final two_fa_confirm_confirm:I = 0x7f121649
 
-.field public static final unban:I = 0x7f12164f
+.field public static final two_fa_confirm_title:I = 0x7f12164a
 
-.field public static final unban_user_body:I = 0x7f121650
+.field public static final two_fa_disable:I = 0x7f12164b
 
-.field public static final unban_user_title:I = 0x7f121651
+.field public static final two_fa_discord_backup_codes:I = 0x7f12164c
 
-.field public static final unblock:I = 0x7f121652
+.field public static final two_fa_download_app_body:I = 0x7f12164d
 
-.field public static final unblock_to_jump_body:I = 0x7f121653
+.field public static final two_fa_download_app_label:I = 0x7f12164e
 
-.field public static final unblock_to_jump_title:I = 0x7f121654
+.field public static final two_fa_download_codes:I = 0x7f12164f
 
-.field public static final uncategorized:I = 0x7f121655
+.field public static final two_fa_enable:I = 0x7f121650
 
-.field public static final unclaimed_account_body:I = 0x7f121656
+.field public static final two_fa_enable_subheader:I = 0x7f121651
 
-.field public static final unclaimed_account_title:I = 0x7f121657
+.field public static final two_fa_enabled:I = 0x7f121652
 
-.field public static final undeafen:I = 0x7f121658
+.field public static final two_fa_enter_sms_token_label:I = 0x7f121653
 
-.field public static final unfocus_participant:I = 0x7f121659
+.field public static final two_fa_enter_sms_token_sending:I = 0x7f121654
 
-.field public static final unhandled_link_body:I = 0x7f12165a
+.field public static final two_fa_enter_sms_token_sent:I = 0x7f121655
 
-.field public static final unhandled_link_title:I = 0x7f12165b
+.field public static final two_fa_enter_token_body:I = 0x7f121656
 
-.field public static final unicode_emoji_category_shortcut_a11y_label:I = 0x7f12165c
+.field public static final two_fa_enter_token_label:I = 0x7f121657
 
-.field public static final unknown_region:I = 0x7f12165d
+.field public static final two_fa_generate_codes:I = 0x7f121658
 
-.field public static final unknown_user:I = 0x7f12165e
+.field public static final two_fa_generate_codes_confirm_text:I = 0x7f121659
 
-.field public static final unmute:I = 0x7f12165f
+.field public static final two_fa_guild_mfa_warning:I = 0x7f12165a
 
-.field public static final unmute_category:I = 0x7f121660
+.field public static final two_fa_guild_mfa_warning_ios:I = 0x7f12165b
 
-.field public static final unmute_channel:I = 0x7f121661
+.field public static final two_fa_guild_mfa_warning_message:I = 0x7f12165c
 
-.field public static final unmute_channel_generic:I = 0x7f121662
+.field public static final two_fa_guild_mfa_warning_message_with_spacing:I = 0x7f12165d
 
-.field public static final unmute_conversation:I = 0x7f121663
+.field public static final two_fa_guild_mfa_warning_resolve_button:I = 0x7f12165e
 
-.field public static final unmute_server:I = 0x7f121664
+.field public static final two_fa_key:I = 0x7f12165f
 
-.field public static final unnamed:I = 0x7f121665
+.field public static final two_fa_login_body:I = 0x7f121660
 
-.field public static final unpin:I = 0x7f121666
+.field public static final two_fa_login_footer:I = 0x7f121661
 
-.field public static final unpin_confirm:I = 0x7f121667
+.field public static final two_fa_login_label:I = 0x7f121662
 
-.field public static final unpin_message:I = 0x7f121668
+.field public static final two_fa_not_verified:I = 0x7f121663
 
-.field public static final unpin_message_body:I = 0x7f121669
+.field public static final two_fa_qr_body:I = 0x7f121664
 
-.field public static final unpin_message_context_menu_hint:I = 0x7f12166a
+.field public static final two_fa_qr_label:I = 0x7f121665
 
-.field public static final unpin_message_failed_body:I = 0x7f12166b
+.field public static final two_fa_remove:I = 0x7f121666
 
-.field public static final unpin_message_failed_title:I = 0x7f12166c
+.field public static final two_fa_sales_pitch:I = 0x7f121667
 
-.field public static final unpin_message_title:I = 0x7f12166d
+.field public static final two_fa_success_body_mobile:I = 0x7f121668
 
-.field public static final unreads_confirm_mark_all_read_description:I = 0x7f12166e
+.field public static final two_fa_success_header:I = 0x7f121669
 
-.field public static final unreads_confirm_mark_all_read_header:I = 0x7f12166f
+.field public static final two_fa_token_required:I = 0x7f12166a
 
-.field public static final unreads_empty_state_header:I = 0x7f121670
+.field public static final two_fa_use_desktop_app:I = 0x7f12166b
 
-.field public static final unreads_empty_state_tip:I = 0x7f121671
+.field public static final two_fa_view_backup_codes:I = 0x7f12166c
 
-.field public static final unreads_empty_state_tip_mac:I = 0x7f121672
+.field public static final two_fa_view_codes:I = 0x7f12166d
 
-.field public static final unreads_mark_read:I = 0x7f121673
+.field public static final two_users_typing:I = 0x7f12166e
 
-.field public static final unreads_no_notifications_divider:I = 0x7f121674
+.field public static final uk:I = 0x7f121674
 
-.field public static final unreads_old_channels_divider:I = 0x7f121675
+.field public static final unable_to_join_channel_full:I = 0x7f121675
 
-.field public static final unreads_tab_label:I = 0x7f121676
+.field public static final unable_to_join_channel_full_modal_body:I = 0x7f121676
 
-.field public static final unreads_tutorial_body:I = 0x7f121677
+.field public static final unable_to_join_channel_full_modal_header:I = 0x7f121677
 
-.field public static final unreads_tutorial_header:I = 0x7f121678
+.field public static final unable_to_open_media_chooser:I = 0x7f121678
 
-.field public static final unreads_view_channel:I = 0x7f121679
+.field public static final unban:I = 0x7f121679
 
-.field public static final unsupported_browser:I = 0x7f12167a
+.field public static final unban_user_body:I = 0x7f12167a
 
-.field public static final unsupported_browser_body:I = 0x7f12167b
+.field public static final unban_user_title:I = 0x7f12167b
 
-.field public static final unsupported_browser_details:I = 0x7f12167c
+.field public static final unblock:I = 0x7f12167c
 
-.field public static final unsupported_browser_title:I = 0x7f12167d
+.field public static final unblock_to_jump_body:I = 0x7f12167d
 
-.field public static final unverified_account_title:I = 0x7f12167e
+.field public static final unblock_to_jump_title:I = 0x7f12167e
 
-.field public static final update_available:I = 0x7f12167f
+.field public static final uncategorized:I = 0x7f12167f
 
-.field public static final update_badge_header:I = 0x7f121680
+.field public static final unclaimed_account_body:I = 0x7f121680
 
-.field public static final update_downloaded:I = 0x7f121681
+.field public static final unclaimed_account_title:I = 0x7f121681
 
-.field public static final update_manually:I = 0x7f121682
+.field public static final undeafen:I = 0x7f121682
 
-.field public static final upload:I = 0x7f121683
+.field public static final unfocus_participant:I = 0x7f121683
 
-.field public static final upload_a_media_file:I = 0x7f121684
+.field public static final unhandled_link_body:I = 0x7f121684
 
-.field public static final upload_area_cancel_all:I = 0x7f121685
+.field public static final unhandled_link_title:I = 0x7f121685
 
-.field public static final upload_area_help:I = 0x7f121686
+.field public static final unicode_emoji_category_shortcut_a11y_label:I = 0x7f121686
 
-.field public static final upload_area_invalid_file_type_help:I = 0x7f121687
+.field public static final unknown_region:I = 0x7f121687
 
-.field public static final upload_area_invalid_file_type_title:I = 0x7f121688
+.field public static final unknown_user:I = 0x7f121688
 
-.field public static final upload_area_leave_a_comment:I = 0x7f121689
+.field public static final unmute:I = 0x7f121689
 
-.field public static final upload_area_optional:I = 0x7f12168a
+.field public static final unmute_category:I = 0x7f12168a
 
-.field public static final upload_area_title:I = 0x7f12168b
+.field public static final unmute_channel:I = 0x7f12168b
 
-.field public static final upload_area_title_no_confirmation:I = 0x7f12168c
+.field public static final unmute_channel_generic:I = 0x7f12168c
 
-.field public static final upload_area_too_large_help:I = 0x7f12168d
+.field public static final unmute_conversation:I = 0x7f12168d
 
-.field public static final upload_area_too_large_title:I = 0x7f12168e
+.field public static final unmute_server:I = 0x7f12168e
 
-.field public static final upload_area_upload_failed_help:I = 0x7f12168f
+.field public static final unnamed:I = 0x7f12168f
 
-.field public static final upload_area_upload_failed_title:I = 0x7f121690
+.field public static final unpin:I = 0x7f121690
 
-.field public static final upload_background:I = 0x7f121691
+.field public static final unpin_confirm:I = 0x7f121691
 
-.field public static final upload_debug_log_failure:I = 0x7f121692
+.field public static final unpin_message:I = 0x7f121692
 
-.field public static final upload_debug_log_failure_header:I = 0x7f121693
+.field public static final unpin_message_body:I = 0x7f121693
 
-.field public static final upload_debug_log_failure_no_file:I = 0x7f121694
+.field public static final unpin_message_context_menu_hint:I = 0x7f121694
 
-.field public static final upload_debug_log_failure_progress:I = 0x7f121695
+.field public static final unpin_message_failed_body:I = 0x7f121695
 
-.field public static final upload_debug_log_failure_read:I = 0x7f121696
+.field public static final unpin_message_failed_title:I = 0x7f121696
 
-.field public static final upload_debug_log_failure_upload:I = 0x7f121697
+.field public static final unpin_message_title:I = 0x7f121697
 
-.field public static final upload_debug_log_success:I = 0x7f121698
+.field public static final unreads_confirm_mark_all_read_description:I = 0x7f121698
 
-.field public static final upload_debug_log_success_header:I = 0x7f121699
+.field public static final unreads_confirm_mark_all_read_header:I = 0x7f121699
 
-.field public static final upload_debug_logs:I = 0x7f12169a
+.field public static final unreads_empty_state_header:I = 0x7f12169a
 
-.field public static final upload_emoji:I = 0x7f12169b
+.field public static final unreads_empty_state_tip:I = 0x7f12169b
 
-.field public static final upload_emoji_subtitle:I = 0x7f12169c
+.field public static final unreads_empty_state_tip_mac:I = 0x7f12169c
 
-.field public static final upload_emoji_title:I = 0x7f12169d
+.field public static final unreads_mark_read:I = 0x7f12169d
 
-.field public static final upload_image:I = 0x7f12169e
+.field public static final unreads_no_notifications_divider:I = 0x7f12169e
 
-.field public static final upload_image_body:I = 0x7f12169f
+.field public static final unreads_old_channels_divider:I = 0x7f12169f
 
-.field public static final upload_open_file_failed:I = 0x7f1216a0
+.field public static final unreads_tab_label:I = 0x7f1216a0
 
-.field public static final upload_queued:I = 0x7f1216a1
+.field public static final unreads_tutorial_body:I = 0x7f1216a1
 
-.field public static final upload_uploads_too_large_help:I = 0x7f1216a2
+.field public static final unreads_tutorial_header:I = 0x7f1216a2
 
-.field public static final upload_uploads_too_large_title:I = 0x7f1216a3
+.field public static final unreads_view_channel:I = 0x7f1216a3
 
-.field public static final uploaded_by:I = 0x7f1216a4
+.field public static final unsupported_browser:I = 0x7f1216a4
 
-.field public static final uploading_files:I = 0x7f1216a5
+.field public static final unsupported_browser_body:I = 0x7f1216a5
 
-.field public static final uploading_files_failed:I = 0x7f1216a6
+.field public static final unsupported_browser_details:I = 0x7f1216a6
 
-.field public static final usage_access:I = 0x7f1216a7
+.field public static final unsupported_browser_title:I = 0x7f1216a7
 
-.field public static final usage_statistics_disable_modal_body:I = 0x7f1216a8
+.field public static final unverified_account_title:I = 0x7f1216a8
 
-.field public static final usage_statistics_disable_modal_cancel:I = 0x7f1216a9
+.field public static final update_available:I = 0x7f1216a9
 
-.field public static final usage_statistics_disable_modal_confirm:I = 0x7f1216aa
+.field public static final update_badge_header:I = 0x7f1216aa
 
-.field public static final usage_statistics_disable_modal_title:I = 0x7f1216ab
+.field public static final update_downloaded:I = 0x7f1216ab
 
-.field public static final use_external_emojis:I = 0x7f1216ac
+.field public static final update_manually:I = 0x7f1216ac
 
-.field public static final use_external_emojis_description:I = 0x7f1216ad
+.field public static final upload:I = 0x7f1216ad
 
-.field public static final use_rich_chat_box_description:I = 0x7f1216ae
+.field public static final upload_a_media_file:I = 0x7f1216ae
 
-.field public static final use_speaker:I = 0x7f1216af
+.field public static final upload_area_cancel_all:I = 0x7f1216af
 
-.field public static final use_vad:I = 0x7f1216b0
+.field public static final upload_area_help:I = 0x7f1216b0
 
-.field public static final use_vad_description:I = 0x7f1216b1
+.field public static final upload_area_invalid_file_type_help:I = 0x7f1216b1
 
-.field public static final user_actions_menu_label:I = 0x7f1216b2
+.field public static final upload_area_invalid_file_type_title:I = 0x7f1216b2
 
-.field public static final user_activity_accept_invite:I = 0x7f1216b3
+.field public static final upload_area_leave_a_comment:I = 0x7f1216b3
 
-.field public static final user_activity_action_ask_to_join:I = 0x7f1216b4
+.field public static final upload_area_optional:I = 0x7f1216b4
 
-.field public static final user_activity_action_ask_to_join_user:I = 0x7f1216b5
+.field public static final upload_area_title:I = 0x7f1216b5
 
-.field public static final user_activity_action_download_app:I = 0x7f1216b6
+.field public static final upload_area_title_no_confirmation:I = 0x7f1216b6
 
-.field public static final user_activity_action_failed_to_launch:I = 0x7f1216b7
+.field public static final upload_area_too_large_help:I = 0x7f1216b7
 
-.field public static final user_activity_action_invite_to_join:I = 0x7f1216b8
+.field public static final upload_area_too_large_title:I = 0x7f1216b8
 
-.field public static final user_activity_action_invite_to_listen_along:I = 0x7f1216b9
+.field public static final upload_area_upload_failed_help:I = 0x7f1216b9
 
-.field public static final user_activity_action_notify_me:I = 0x7f1216ba
+.field public static final upload_area_upload_failed_title:I = 0x7f1216ba
 
-.field public static final user_activity_already_playing:I = 0x7f1216bb
+.field public static final upload_background:I = 0x7f1216bb
 
-.field public static final user_activity_already_syncing:I = 0x7f1216bc
+.field public static final upload_debug_log_failure:I = 0x7f1216bc
 
-.field public static final user_activity_cannot_join_self:I = 0x7f1216bd
+.field public static final upload_debug_log_failure_header:I = 0x7f1216bd
 
-.field public static final user_activity_cannot_play_self:I = 0x7f1216be
+.field public static final upload_debug_log_failure_no_file:I = 0x7f1216be
 
-.field public static final user_activity_cannot_sync_self:I = 0x7f1216bf
+.field public static final upload_debug_log_failure_progress:I = 0x7f1216bf
 
-.field public static final user_activity_chat_invite_education:I = 0x7f1216c0
+.field public static final upload_debug_log_failure_read:I = 0x7f1216c0
 
-.field public static final user_activity_connect_platform:I = 0x7f1216c1
+.field public static final upload_debug_log_failure_upload:I = 0x7f1216c1
 
-.field public static final user_activity_header_listening:I = 0x7f1216c2
+.field public static final upload_debug_log_success:I = 0x7f1216c2
 
-.field public static final user_activity_header_live_on_platform:I = 0x7f1216c3
+.field public static final upload_debug_log_success_header:I = 0x7f1216c3
 
-.field public static final user_activity_header_playing:I = 0x7f1216c4
+.field public static final upload_debug_logs:I = 0x7f1216c4
 
-.field public static final user_activity_header_playing_on_platform:I = 0x7f1216c5
+.field public static final upload_emoji:I = 0x7f1216c5
 
-.field public static final user_activity_header_streaming_to_guild:I = 0x7f1216c6
+.field public static final upload_emoji_subtitle:I = 0x7f1216c6
 
-.field public static final user_activity_header_watching:I = 0x7f1216c7
+.field public static final upload_emoji_title:I = 0x7f1216c7
 
-.field public static final user_activity_invite_request_expired:I = 0x7f1216c8
+.field public static final upload_image:I = 0x7f1216c8
 
-.field public static final user_activity_invite_request_received:I = 0x7f1216c9
+.field public static final upload_image_body:I = 0x7f1216c9
 
-.field public static final user_activity_invite_request_requested:I = 0x7f1216ca
+.field public static final upload_open_file_failed:I = 0x7f1216ca
 
-.field public static final user_activity_invite_request_sent:I = 0x7f1216cb
+.field public static final upload_queued:I = 0x7f1216cb
 
-.field public static final user_activity_invite_request_waiting:I = 0x7f1216cc
+.field public static final upload_uploads_too_large_help:I = 0x7f1216cc
 
-.field public static final user_activity_invite_to_join:I = 0x7f1216cd
+.field public static final upload_uploads_too_large_title:I = 0x7f1216cd
 
-.field public static final user_activity_joining:I = 0x7f1216ce
+.field public static final uploaded_by:I = 0x7f1216ce
 
-.field public static final user_activity_listen_along:I = 0x7f1216cf
+.field public static final uploading_files:I = 0x7f1216cf
 
-.field public static final user_activity_listen_along_description:I = 0x7f1216d0
+.field public static final uploading_files_failed:I = 0x7f1216d0
 
-.field public static final user_activity_listening_album:I = 0x7f1216d1
+.field public static final usage_access:I = 0x7f1216d1
 
-.field public static final user_activity_listening_artists:I = 0x7f1216d2
+.field public static final usage_statistics_disable_modal_body:I = 0x7f1216d2
 
-.field public static final user_activity_never_mind:I = 0x7f1216d3
+.field public static final usage_statistics_disable_modal_cancel:I = 0x7f1216d3
 
-.field public static final user_activity_not_detected:I = 0x7f1216d4
+.field public static final usage_statistics_disable_modal_confirm:I = 0x7f1216d4
 
-.field public static final user_activity_play_on_platform:I = 0x7f1216d5
+.field public static final usage_statistics_disable_modal_title:I = 0x7f1216d5
 
-.field public static final user_activity_respond_nope:I = 0x7f1216d6
+.field public static final use_external_emojis:I = 0x7f1216d6
 
-.field public static final user_activity_respond_yeah:I = 0x7f1216d7
+.field public static final use_external_emojis_description:I = 0x7f1216d7
 
-.field public static final user_activity_state_size:I = 0x7f1216d8
+.field public static final use_rich_chat_box_description:I = 0x7f1216d8
 
-.field public static final user_activity_timestamp_end:I = 0x7f1216d9
+.field public static final use_speaker:I = 0x7f1216d9
 
-.field public static final user_activity_timestamp_end_simple:I = 0x7f1216da
+.field public static final use_vad:I = 0x7f1216da
 
-.field public static final user_activity_timestamp_start:I = 0x7f1216db
+.field public static final use_vad_description:I = 0x7f1216db
 
-.field public static final user_activity_timestamp_start_simple:I = 0x7f1216dc
+.field public static final user_actions_menu_label:I = 0x7f1216dc
 
-.field public static final user_activity_user_playing_for_days:I = 0x7f1216dd
+.field public static final user_activity_accept_invite:I = 0x7f1216dd
 
-.field public static final user_activity_user_playing_for_hours:I = 0x7f1216de
+.field public static final user_activity_action_ask_to_join:I = 0x7f1216de
 
-.field public static final user_activity_user_playing_for_minutes:I = 0x7f1216df
+.field public static final user_activity_action_ask_to_join_user:I = 0x7f1216df
 
-.field public static final user_activity_watch_along:I = 0x7f1216e0
+.field public static final user_activity_action_download_app:I = 0x7f1216e0
 
-.field public static final user_dm_settings:I = 0x7f1216e1
+.field public static final user_activity_action_failed_to_launch:I = 0x7f1216e1
 
-.field public static final user_dm_settings_help:I = 0x7f1216e2
+.field public static final user_activity_action_invite_to_join:I = 0x7f1216e2
 
-.field public static final user_dm_settings_question:I = 0x7f1216e3
+.field public static final user_activity_action_invite_to_listen_along:I = 0x7f1216e3
 
-.field public static final user_explicit_content_filter:I = 0x7f1216e4
+.field public static final user_activity_action_notify_me:I = 0x7f1216e4
 
-.field public static final user_explicit_content_filter_disabled:I = 0x7f1216e5
+.field public static final user_activity_already_playing:I = 0x7f1216e5
 
-.field public static final user_explicit_content_filter_disabled_help:I = 0x7f1216e6
+.field public static final user_activity_already_syncing:I = 0x7f1216e6
 
-.field public static final user_explicit_content_filter_friends_and_non_friends:I = 0x7f1216e7
+.field public static final user_activity_cannot_join_self:I = 0x7f1216e7
 
-.field public static final user_explicit_content_filter_friends_and_non_friends_help:I = 0x7f1216e8
+.field public static final user_activity_cannot_play_self:I = 0x7f1216e8
 
-.field public static final user_explicit_content_filter_help:I = 0x7f1216e9
+.field public static final user_activity_cannot_sync_self:I = 0x7f1216e9
 
-.field public static final user_explicit_content_filter_non_friends:I = 0x7f1216ea
+.field public static final user_activity_chat_invite_education:I = 0x7f1216ea
 
-.field public static final user_explicit_content_filter_non_friends_help:I = 0x7f1216eb
+.field public static final user_activity_connect_platform:I = 0x7f1216eb
 
-.field public static final user_has_been_blocked:I = 0x7f1216ec
+.field public static final user_activity_header_listening:I = 0x7f1216ec
 
-.field public static final user_has_been_unblocked:I = 0x7f1216ed
+.field public static final user_activity_header_live_on_platform:I = 0x7f1216ed
 
-.field public static final user_info:I = 0x7f1216ee
+.field public static final user_activity_header_playing:I = 0x7f1216ee
 
-.field public static final user_management:I = 0x7f1216ef
+.field public static final user_activity_header_playing_on_platform:I = 0x7f1216ef
 
-.field public static final user_popout_message:I = 0x7f1216f0
+.field public static final user_activity_header_streaming_to_guild:I = 0x7f1216f0
 
-.field public static final user_popout_wumpus_tooltip:I = 0x7f1216f1
+.field public static final user_activity_header_watching:I = 0x7f1216f1
 
-.field public static final user_profile_add_friend:I = 0x7f1216f2
+.field public static final user_activity_invite_request_expired:I = 0x7f1216f2
 
-.field public static final user_profile_audio:I = 0x7f1216f3
+.field public static final user_activity_invite_request_received:I = 0x7f1216f3
 
-.field public static final user_profile_failure_to_open_message:I = 0x7f1216f4
+.field public static final user_activity_invite_request_requested:I = 0x7f1216f4
 
-.field public static final user_profile_guild_name_content_description:I = 0x7f1216f5
+.field public static final user_activity_invite_request_sent:I = 0x7f1216f5
 
-.field public static final user_profile_incoming_friend_request_dialog_body:I = 0x7f1216f6
+.field public static final user_activity_invite_request_waiting:I = 0x7f1216f6
 
-.field public static final user_profile_message:I = 0x7f1216f7
+.field public static final user_activity_invite_to_join:I = 0x7f1216f7
 
-.field public static final user_profile_mutual_friends:I = 0x7f1216f8
+.field public static final user_activity_joining:I = 0x7f1216f8
 
-.field public static final user_profile_mutual_friends_placeholder:I = 0x7f1216f9
+.field public static final user_activity_listen_along:I = 0x7f1216f9
 
-.field public static final user_profile_mutual_guilds:I = 0x7f1216fa
+.field public static final user_activity_listen_along_description:I = 0x7f1216fa
 
-.field public static final user_profile_mutual_guilds_placeholder:I = 0x7f1216fb
+.field public static final user_activity_listening_album:I = 0x7f1216fb
 
-.field public static final user_profile_pending:I = 0x7f1216fc
+.field public static final user_activity_listening_artists:I = 0x7f1216fc
 
-.field public static final user_profile_settings_setstatus:I = 0x7f1216fd
+.field public static final user_activity_never_mind:I = 0x7f1216fd
 
-.field public static final user_profile_video:I = 0x7f1216fe
+.field public static final user_activity_not_detected:I = 0x7f1216fe
 
-.field public static final user_profile_volume:I = 0x7f1216ff
+.field public static final user_activity_play_on_platform:I = 0x7f1216ff
 
-.field public static final user_settings:I = 0x7f121700
+.field public static final user_activity_respond_nope:I = 0x7f121700
 
-.field public static final user_settings_actions_menu_label:I = 0x7f121701
+.field public static final user_activity_respond_yeah:I = 0x7f121701
 
-.field public static final user_settings_appearance_colorblind_mode_description:I = 0x7f121702
+.field public static final user_activity_state_size:I = 0x7f121702
 
-.field public static final user_settings_appearance_colorblind_mode_title:I = 0x7f121703
+.field public static final user_activity_timestamp_end:I = 0x7f121703
 
-.field public static final user_settings_appearance_colors:I = 0x7f121704
+.field public static final user_activity_timestamp_end_simple:I = 0x7f121704
 
-.field public static final user_settings_appearance_preview_message_1:I = 0x7f121705
+.field public static final user_activity_timestamp_start:I = 0x7f121705
 
-.field public static final user_settings_appearance_preview_message_2_dark:I = 0x7f121706
+.field public static final user_activity_timestamp_start_simple:I = 0x7f121706
 
-.field public static final user_settings_appearance_preview_message_2_light:I = 0x7f121707
+.field public static final user_activity_user_playing_for_days:I = 0x7f121707
 
-.field public static final user_settings_appearance_preview_message_3:I = 0x7f121708
+.field public static final user_activity_user_playing_for_hours:I = 0x7f121708
 
-.field public static final user_settings_appearance_preview_message_4:I = 0x7f121709
+.field public static final user_activity_user_playing_for_minutes:I = 0x7f121709
 
-.field public static final user_settings_appearance_preview_message_5:I = 0x7f12170a
+.field public static final user_activity_watch_along:I = 0x7f12170a
 
-.field public static final user_settings_appearance_zoom_tip:I = 0x7f12170b
+.field public static final user_dm_settings:I = 0x7f12170b
 
-.field public static final user_settings_available_codes:I = 0x7f12170c
+.field public static final user_dm_settings_help:I = 0x7f12170c
 
-.field public static final user_settings_blocked_users:I = 0x7f12170d
+.field public static final user_dm_settings_question:I = 0x7f12170d
 
-.field public static final user_settings_blocked_users_empty:I = 0x7f12170e
+.field public static final user_explicit_content_filter:I = 0x7f12170e
 
-.field public static final user_settings_blocked_users_header:I = 0x7f12170f
+.field public static final user_explicit_content_filter_disabled:I = 0x7f12170f
 
-.field public static final user_settings_blocked_users_unblockbutton:I = 0x7f121710
+.field public static final user_explicit_content_filter_disabled_help:I = 0x7f121710
 
-.field public static final user_settings_close_button:I = 0x7f121711
+.field public static final user_explicit_content_filter_friends_and_non_friends:I = 0x7f121711
 
-.field public static final user_settings_confirm_logout:I = 0x7f121712
+.field public static final user_explicit_content_filter_friends_and_non_friends_help:I = 0x7f121712
 
-.field public static final user_settings_disable_advanced_voice_activity:I = 0x7f121713
+.field public static final user_explicit_content_filter_help:I = 0x7f121713
 
-.field public static final user_settings_disable_noise_suppression:I = 0x7f121714
+.field public static final user_explicit_content_filter_non_friends:I = 0x7f121714
 
-.field public static final user_settings_edit_account:I = 0x7f121715
+.field public static final user_explicit_content_filter_non_friends_help:I = 0x7f121715
 
-.field public static final user_settings_edit_account_password_label:I = 0x7f121716
+.field public static final user_has_been_blocked:I = 0x7f121716
 
-.field public static final user_settings_edit_account_tag:I = 0x7f121717
+.field public static final user_has_been_unblocked:I = 0x7f121717
 
-.field public static final user_settings_enter_password_view_codes:I = 0x7f121718
+.field public static final user_info:I = 0x7f121718
 
-.field public static final user_settings_game_activity:I = 0x7f121719
+.field public static final user_management:I = 0x7f121719
 
-.field public static final user_settings_games_install_location:I = 0x7f12171a
+.field public static final user_popout_message:I = 0x7f12171a
 
-.field public static final user_settings_games_install_location_add:I = 0x7f12171b
+.field public static final user_popout_wumpus_tooltip:I = 0x7f12171b
 
-.field public static final user_settings_games_install_location_make_default:I = 0x7f12171c
+.field public static final user_profile_add_friend:I = 0x7f12171c
 
-.field public static final user_settings_games_install_location_name:I = 0x7f12171d
+.field public static final user_profile_audio:I = 0x7f12171d
 
-.field public static final user_settings_games_install_location_remove:I = 0x7f12171e
+.field public static final user_profile_failure_to_open_message:I = 0x7f12171e
 
-.field public static final user_settings_games_install_location_space:I = 0x7f12171f
+.field public static final user_profile_guild_name_content_description:I = 0x7f12171f
 
-.field public static final user_settings_games_install_locations:I = 0x7f121720
+.field public static final user_profile_incoming_friend_request_dialog_body:I = 0x7f121720
 
-.field public static final user_settings_games_remove_location_body:I = 0x7f121721
+.field public static final user_profile_message:I = 0x7f121721
 
-.field public static final user_settings_games_shortcuts_desktop:I = 0x7f121722
+.field public static final user_profile_mutual_friends:I = 0x7f121722
 
-.field public static final user_settings_games_shortcuts_desktop_note:I = 0x7f121723
+.field public static final user_profile_mutual_friends_placeholder:I = 0x7f121723
 
-.field public static final user_settings_games_shortcuts_start_menu:I = 0x7f121724
+.field public static final user_profile_mutual_guilds:I = 0x7f121724
 
-.field public static final user_settings_games_shortcuts_start_menu_note:I = 0x7f121725
+.field public static final user_profile_mutual_guilds_placeholder:I = 0x7f121725
 
-.field public static final user_settings_hypesquad:I = 0x7f121726
+.field public static final user_profile_pending:I = 0x7f121726
 
-.field public static final user_settings_keybinds_action:I = 0x7f121727
+.field public static final user_profile_settings_setstatus:I = 0x7f121727
 
-.field public static final user_settings_keybinds_keybind:I = 0x7f121728
+.field public static final user_profile_video:I = 0x7f121728
 
-.field public static final user_settings_label_current_password:I = 0x7f121729
+.field public static final user_profile_volume:I = 0x7f121729
 
-.field public static final user_settings_label_discriminator:I = 0x7f12172a
+.field public static final user_settings:I = 0x7f12172a
 
-.field public static final user_settings_label_email:I = 0x7f12172b
+.field public static final user_settings_actions_menu_label:I = 0x7f12172b
 
-.field public static final user_settings_label_new_password:I = 0x7f12172c
+.field public static final user_settings_appearance_colorblind_mode_description:I = 0x7f12172c
 
-.field public static final user_settings_label_username:I = 0x7f12172d
+.field public static final user_settings_appearance_colorblind_mode_title:I = 0x7f12172d
 
-.field public static final user_settings_linux_settings:I = 0x7f12172e
+.field public static final user_settings_appearance_colors:I = 0x7f12172e
 
-.field public static final user_settings_mfa_enable_code_body:I = 0x7f12172f
+.field public static final user_settings_appearance_preview_message_1:I = 0x7f12172f
 
-.field public static final user_settings_mfa_enable_code_label:I = 0x7f121730
+.field public static final user_settings_appearance_preview_message_2_dark:I = 0x7f121730
 
-.field public static final user_settings_mfa_enabled:I = 0x7f121731
+.field public static final user_settings_appearance_preview_message_2_light:I = 0x7f121731
 
-.field public static final user_settings_mfa_removed:I = 0x7f121732
+.field public static final user_settings_appearance_preview_message_3:I = 0x7f121732
 
-.field public static final user_settings_minimize_to_tray_body:I = 0x7f121733
+.field public static final user_settings_appearance_preview_message_4:I = 0x7f121733
 
-.field public static final user_settings_minimize_to_tray_label:I = 0x7f121734
+.field public static final user_settings_appearance_preview_message_5:I = 0x7f121734
 
-.field public static final user_settings_my_account:I = 0x7f121735
+.field public static final user_settings_appearance_zoom_tip:I = 0x7f121735
 
-.field public static final user_settings_noise_cancellation:I = 0x7f121736
+.field public static final user_settings_available_codes:I = 0x7f121736
 
-.field public static final user_settings_noise_cancellation_description:I = 0x7f121737
+.field public static final user_settings_blocked_users:I = 0x7f121737
 
-.field public static final user_settings_noise_cancellation_model:I = 0x7f121738
+.field public static final user_settings_blocked_users_empty:I = 0x7f121738
 
-.field public static final user_settings_notifications_show_badge_body:I = 0x7f121739
+.field public static final user_settings_blocked_users_header:I = 0x7f121739
 
-.field public static final user_settings_notifications_show_badge_label:I = 0x7f12173a
+.field public static final user_settings_blocked_users_unblockbutton:I = 0x7f12173a
 
-.field public static final user_settings_notifications_show_flash_body:I = 0x7f12173b
+.field public static final user_settings_close_button:I = 0x7f12173b
 
-.field public static final user_settings_notifications_show_flash_label:I = 0x7f12173c
+.field public static final user_settings_confirm_logout:I = 0x7f12173c
 
-.field public static final user_settings_open_on_startup_body:I = 0x7f12173d
+.field public static final user_settings_disable_advanced_voice_activity:I = 0x7f12173d
 
-.field public static final user_settings_open_on_startup_label:I = 0x7f12173e
+.field public static final user_settings_disable_noise_suppression:I = 0x7f12173e
 
-.field public static final user_settings_privacy_terms:I = 0x7f12173f
+.field public static final user_settings_edit_account:I = 0x7f12173f
 
-.field public static final user_settings_restart_app_mobile:I = 0x7f121740
+.field public static final user_settings_edit_account_password_label:I = 0x7f121740
 
-.field public static final user_settings_save:I = 0x7f121741
+.field public static final user_settings_edit_account_tag:I = 0x7f121741
 
-.field public static final user_settings_scan_qr_code:I = 0x7f121742
+.field public static final user_settings_enter_password_view_codes:I = 0x7f121742
 
-.field public static final user_settings_show_library:I = 0x7f121743
+.field public static final user_settings_game_activity:I = 0x7f121743
 
-.field public static final user_settings_show_library_note:I = 0x7f121744
+.field public static final user_settings_games_install_location:I = 0x7f121744
 
-.field public static final user_settings_start_minimized_body:I = 0x7f121745
+.field public static final user_settings_games_install_location_add:I = 0x7f121745
 
-.field public static final user_settings_start_minimized_label:I = 0x7f121746
+.field public static final user_settings_games_install_location_make_default:I = 0x7f121746
 
-.field public static final user_settings_startup_behavior:I = 0x7f121747
+.field public static final user_settings_games_install_location_name:I = 0x7f121747
 
-.field public static final user_settings_streamer_notice_body:I = 0x7f121748
+.field public static final user_settings_games_install_location_remove:I = 0x7f121748
 
-.field public static final user_settings_streamer_notice_title:I = 0x7f121749
+.field public static final user_settings_games_install_location_space:I = 0x7f121749
 
-.field public static final user_settings_unverified_account_body:I = 0x7f12174a
+.field public static final user_settings_games_install_locations:I = 0x7f12174a
 
-.field public static final user_settings_used_backup_codes:I = 0x7f12174b
+.field public static final user_settings_games_remove_location_body:I = 0x7f12174b
 
-.field public static final user_settings_voice_add_multiple:I = 0x7f12174c
+.field public static final user_settings_games_shortcuts_desktop:I = 0x7f12174c
 
-.field public static final user_settings_voice_codec_description:I = 0x7f12174d
+.field public static final user_settings_games_shortcuts_desktop_note:I = 0x7f12174d
 
-.field public static final user_settings_voice_codec_title:I = 0x7f12174e
+.field public static final user_settings_games_shortcuts_start_menu:I = 0x7f12174e
 
-.field public static final user_settings_voice_experimental_soundshare_label:I = 0x7f12174f
+.field public static final user_settings_games_shortcuts_start_menu_note:I = 0x7f12174f
 
-.field public static final user_settings_voice_hardware_h264:I = 0x7f121750
+.field public static final user_settings_hypesquad:I = 0x7f121750
 
-.field public static final user_settings_voice_mic_test_button_active:I = 0x7f121751
+.field public static final user_settings_keybinds_action:I = 0x7f121751
 
-.field public static final user_settings_voice_mic_test_button_inactive:I = 0x7f121752
+.field public static final user_settings_keybinds_keybind:I = 0x7f121752
 
-.field public static final user_settings_voice_mic_test_description:I = 0x7f121753
+.field public static final user_settings_label_current_password:I = 0x7f121753
 
-.field public static final user_settings_voice_mic_test_title:I = 0x7f121754
+.field public static final user_settings_label_discriminator:I = 0x7f121754
 
-.field public static final user_settings_voice_mic_test_voice_caption:I = 0x7f121755
+.field public static final user_settings_label_email:I = 0x7f121755
 
-.field public static final user_settings_voice_mic_test_voice_no_input_notice:I = 0x7f121756
+.field public static final user_settings_label_new_password:I = 0x7f121756
 
-.field public static final user_settings_voice_open_h264:I = 0x7f121757
+.field public static final user_settings_label_username:I = 0x7f121757
 
-.field public static final user_settings_voice_video_codec_title:I = 0x7f121758
+.field public static final user_settings_linux_settings:I = 0x7f121758
 
-.field public static final user_settings_voice_video_hook_label:I = 0x7f121759
+.field public static final user_settings_mfa_enable_code_body:I = 0x7f121759
 
-.field public static final user_settings_windows_settings:I = 0x7f12175a
+.field public static final user_settings_mfa_enable_code_label:I = 0x7f12175a
 
-.field public static final user_settings_with_build_override:I = 0x7f12175b
+.field public static final user_settings_mfa_enabled:I = 0x7f12175b
 
-.field public static final user_volume:I = 0x7f12175c
+.field public static final user_settings_mfa_removed:I = 0x7f12175c
 
-.field public static final username:I = 0x7f12175d
+.field public static final user_settings_minimize_to_tray_body:I = 0x7f12175d
 
-.field public static final username_and_tag:I = 0x7f12175e
+.field public static final user_settings_minimize_to_tray_label:I = 0x7f12175e
 
-.field public static final username_live:I = 0x7f12175f
+.field public static final user_settings_my_account:I = 0x7f12175f
 
-.field public static final username_required:I = 0x7f121760
+.field public static final user_settings_noise_cancellation:I = 0x7f121760
 
-.field public static final users:I = 0x7f121761
+.field public static final user_settings_noise_cancellation_description:I = 0x7f121761
 
-.field public static final v7_preference_off:I = 0x7f121762
+.field public static final user_settings_noise_cancellation_model:I = 0x7f121762
 
-.field public static final v7_preference_on:I = 0x7f121763
+.field public static final user_settings_notifications_show_badge_body:I = 0x7f121763
 
-.field public static final vad_permission_body:I = 0x7f121764
+.field public static final user_settings_notifications_show_badge_label:I = 0x7f121764
 
-.field public static final vad_permission_small:I = 0x7f121765
+.field public static final user_settings_notifications_show_flash_body:I = 0x7f121765
 
-.field public static final vad_permission_title:I = 0x7f121766
+.field public static final user_settings_notifications_show_flash_label:I = 0x7f121766
 
-.field public static final vanity_url:I = 0x7f121767
+.field public static final user_settings_open_on_startup_body:I = 0x7f121767
 
-.field public static final vanity_url_help:I = 0x7f121768
+.field public static final user_settings_open_on_startup_label:I = 0x7f121768
 
-.field public static final vanity_url_help_conflict:I = 0x7f121769
+.field public static final user_settings_privacy_terms:I = 0x7f121769
 
-.field public static final vanity_url_help_extended:I = 0x7f12176a
+.field public static final user_settings_restart_app_mobile:I = 0x7f12176a
 
-.field public static final vanity_url_help_extended_link:I = 0x7f12176b
+.field public static final user_settings_save:I = 0x7f12176b
 
-.field public static final vanity_url_hint_mobile:I = 0x7f12176c
+.field public static final user_settings_scan_qr_code:I = 0x7f12176c
 
-.field public static final vanity_url_uses:I = 0x7f12176d
+.field public static final user_settings_show_library:I = 0x7f12176d
 
-.field public static final verfication_expired:I = 0x7f12176e
+.field public static final user_settings_show_library_note:I = 0x7f12176e
 
-.field public static final verification_body:I = 0x7f12176f
+.field public static final user_settings_start_minimized_body:I = 0x7f12176f
 
-.field public static final verification_body_alt:I = 0x7f121770
+.field public static final user_settings_start_minimized_label:I = 0x7f121770
 
-.field public static final verification_email_body:I = 0x7f121771
+.field public static final user_settings_startup_behavior:I = 0x7f121771
 
-.field public static final verification_email_error_body:I = 0x7f121772
+.field public static final user_settings_streamer_notice_body:I = 0x7f121772
 
-.field public static final verification_email_error_title:I = 0x7f121773
+.field public static final user_settings_streamer_notice_title:I = 0x7f121773
 
-.field public static final verification_email_title:I = 0x7f121774
+.field public static final user_settings_unverified_account_body:I = 0x7f121774
 
-.field public static final verification_footer:I = 0x7f121775
+.field public static final user_settings_used_backup_codes:I = 0x7f121775
 
-.field public static final verification_footer_logout:I = 0x7f121776
+.field public static final user_settings_voice_add_multiple:I = 0x7f121776
 
-.field public static final verification_footer_support:I = 0x7f121777
+.field public static final user_settings_voice_codec_description:I = 0x7f121777
 
-.field public static final verification_level_high:I = 0x7f121778
+.field public static final user_settings_voice_codec_title:I = 0x7f121778
 
-.field public static final verification_level_high_criteria:I = 0x7f121779
+.field public static final user_settings_voice_experimental_soundshare_label:I = 0x7f121779
 
-.field public static final verification_level_low:I = 0x7f12177a
+.field public static final user_settings_voice_hardware_h264:I = 0x7f12177a
 
-.field public static final verification_level_low_criteria:I = 0x7f12177b
+.field public static final user_settings_voice_mic_test_button_active:I = 0x7f12177b
 
-.field public static final verification_level_medium:I = 0x7f12177c
+.field public static final user_settings_voice_mic_test_button_inactive:I = 0x7f12177c
 
-.field public static final verification_level_medium_criteria:I = 0x7f12177d
+.field public static final user_settings_voice_mic_test_description:I = 0x7f12177d
 
-.field public static final verification_level_none:I = 0x7f12177e
+.field public static final user_settings_voice_mic_test_title:I = 0x7f12177e
 
-.field public static final verification_level_none_criteria:I = 0x7f12177f
+.field public static final user_settings_voice_mic_test_voice_caption:I = 0x7f12177f
 
-.field public static final verification_level_very_high:I = 0x7f121780
+.field public static final user_settings_voice_mic_test_voice_no_input_notice:I = 0x7f121780
 
-.field public static final verification_level_very_high_criteria:I = 0x7f121781
+.field public static final user_settings_voice_open_h264:I = 0x7f121781
 
-.field public static final verification_open_discord:I = 0x7f121782
+.field public static final user_settings_voice_video_codec_title:I = 0x7f121782
 
-.field public static final verification_phone_description:I = 0x7f121783
+.field public static final user_settings_voice_video_hook_label:I = 0x7f121783
 
-.field public static final verification_phone_title:I = 0x7f121784
+.field public static final user_settings_windows_settings:I = 0x7f121784
 
-.field public static final verification_title:I = 0x7f121785
+.field public static final user_settings_with_build_override:I = 0x7f121785
 
-.field public static final verification_verified:I = 0x7f121786
+.field public static final user_volume:I = 0x7f121786
 
-.field public static final verification_verifying:I = 0x7f121787
+.field public static final username:I = 0x7f121787
 
-.field public static final verified_bot_tooltip:I = 0x7f121788
+.field public static final username_and_tag:I = 0x7f121788
 
-.field public static final verified_developer_badge_tooltip:I = 0x7f121789
+.field public static final username_live:I = 0x7f121789
 
-.field public static final verify:I = 0x7f12178a
+.field public static final username_required:I = 0x7f12178a
 
-.field public static final verify_account:I = 0x7f12178b
+.field public static final users:I = 0x7f12178b
 
-.field public static final verify_by:I = 0x7f12178c
+.field public static final v7_preference_off:I = 0x7f12178c
 
-.field public static final verify_by_email:I = 0x7f12178d
+.field public static final v7_preference_on:I = 0x7f12178d
 
-.field public static final verify_by_email_formatted:I = 0x7f12178e
+.field public static final vad_permission_body:I = 0x7f12178e
 
-.field public static final verify_by_phone_formatted:I = 0x7f12178f
+.field public static final vad_permission_small:I = 0x7f12178f
 
-.field public static final verify_by_recaptcha:I = 0x7f121790
+.field public static final vad_permission_title:I = 0x7f121790
 
-.field public static final verify_by_recaptcha_description:I = 0x7f121791
+.field public static final vanity_url:I = 0x7f121791
 
-.field public static final verify_email_body:I = 0x7f121792
+.field public static final vanity_url_help:I = 0x7f121792
 
-.field public static final verify_email_body_resent:I = 0x7f121793
+.field public static final vanity_url_help_conflict:I = 0x7f121793
 
-.field public static final verify_phone:I = 0x7f121794
+.field public static final vanity_url_help_extended:I = 0x7f121794
 
-.field public static final verifying:I = 0x7f121795
+.field public static final vanity_url_help_extended_link:I = 0x7f121795
 
-.field public static final very_out_of_date_description:I = 0x7f121796
+.field public static final vanity_url_hint_mobile:I = 0x7f121796
 
-.field public static final vi:I = 0x7f121797
+.field public static final vanity_url_uses:I = 0x7f121797
 
-.field public static final video:I = 0x7f121798
+.field public static final verfication_expired:I = 0x7f121798
 
-.field public static final video_call_auto_select:I = 0x7f121799
+.field public static final verification_body:I = 0x7f121799
 
-.field public static final video_call_hide_members:I = 0x7f12179a
+.field public static final verification_body_alt:I = 0x7f12179a
 
-.field public static final video_call_return_to_grid:I = 0x7f12179b
+.field public static final verification_email_body:I = 0x7f12179b
 
-.field public static final video_call_return_to_list:I = 0x7f12179c
+.field public static final verification_email_error_body:I = 0x7f12179c
 
-.field public static final video_call_show_members:I = 0x7f12179d
+.field public static final verification_email_error_title:I = 0x7f12179d
 
-.field public static final video_capacity_modal_body:I = 0x7f12179e
+.field public static final verification_email_title:I = 0x7f12179e
 
-.field public static final video_capacity_modal_header:I = 0x7f12179f
+.field public static final verification_footer:I = 0x7f12179f
 
-.field public static final video_playback_mute_accessibility_label:I = 0x7f1217a0
+.field public static final verification_footer_logout:I = 0x7f1217a0
 
-.field public static final video_playback_unmute_accessibility_label:I = 0x7f1217a1
+.field public static final verification_footer_support:I = 0x7f1217a1
 
-.field public static final video_poor_connection_body:I = 0x7f1217a2
+.field public static final verification_level_high:I = 0x7f1217a2
 
-.field public static final video_poor_connection_title:I = 0x7f1217a3
+.field public static final verification_level_high_criteria:I = 0x7f1217a3
 
-.field public static final video_settings:I = 0x7f1217a4
+.field public static final verification_level_low:I = 0x7f1217a4
 
-.field public static final video_unavailable:I = 0x7f1217a5
+.field public static final verification_level_low_criteria:I = 0x7f1217a5
 
-.field public static final video_unsupported_browser_body:I = 0x7f1217a6
+.field public static final verification_level_medium:I = 0x7f1217a6
 
-.field public static final video_unsupported_browser_title:I = 0x7f1217a7
+.field public static final verification_level_medium_criteria:I = 0x7f1217a7
 
-.field public static final view_as_roles_cta:I = 0x7f1217a8
+.field public static final verification_level_none:I = 0x7f1217a8
 
-.field public static final view_as_roles_voice_warning:I = 0x7f1217a9
+.field public static final verification_level_none_criteria:I = 0x7f1217a9
 
-.field public static final view_audit_log:I = 0x7f1217aa
+.field public static final verification_level_very_high:I = 0x7f1217aa
 
-.field public static final view_audit_log_description:I = 0x7f1217ab
+.field public static final verification_level_very_high_criteria:I = 0x7f1217ab
 
-.field public static final view_channel:I = 0x7f1217ac
+.field public static final verification_open_discord:I = 0x7f1217ac
 
-.field public static final view_embed:I = 0x7f1217ad
+.field public static final verification_phone_description:I = 0x7f1217ad
 
-.field public static final view_guild_analytics:I = 0x7f1217ae
+.field public static final verification_phone_title:I = 0x7f1217ae
 
-.field public static final view_guild_analytics_description:I = 0x7f1217af
+.field public static final verification_title:I = 0x7f1217af
 
-.field public static final view_profile:I = 0x7f1217b0
+.field public static final verification_verified:I = 0x7f1217b0
 
-.field public static final view_spectators:I = 0x7f1217b1
+.field public static final verification_verifying:I = 0x7f1217b1
 
-.field public static final view_surrounding_messages:I = 0x7f1217b2
+.field public static final verified_bot_tooltip:I = 0x7f1217b2
 
-.field public static final viewing_as_roles_edit:I = 0x7f1217b3
+.field public static final verified_developer_badge_tooltip:I = 0x7f1217b3
 
-.field public static final viewing_as_roles_select:I = 0x7f1217b4
+.field public static final verify:I = 0x7f1217b4
 
-.field public static final viewing_as_roles_warning:I = 0x7f1217b5
+.field public static final verify_account:I = 0x7f1217b5
 
-.field public static final visitors_info:I = 0x7f1217b6
+.field public static final verify_by:I = 0x7f1217b6
 
-.field public static final voice:I = 0x7f1217b7
+.field public static final verify_by_email:I = 0x7f1217b7
 
-.field public static final voice_and_video:I = 0x7f1217b8
+.field public static final verify_by_email_formatted:I = 0x7f1217b8
 
-.field public static final voice_call_member_list_title:I = 0x7f1217b9
+.field public static final verify_by_phone_formatted:I = 0x7f1217b9
 
-.field public static final voice_channel:I = 0x7f1217ba
+.field public static final verify_by_recaptcha:I = 0x7f1217ba
 
-.field public static final voice_channel_deafened:I = 0x7f1217bb
+.field public static final verify_by_recaptcha_description:I = 0x7f1217bb
 
-.field public static final voice_channel_empty:I = 0x7f1217bc
+.field public static final verify_email_body:I = 0x7f1217bc
 
-.field public static final voice_channel_hide_names:I = 0x7f1217bd
+.field public static final verify_email_body_resent:I = 0x7f1217bd
 
-.field public static final voice_channel_muted:I = 0x7f1217be
+.field public static final verify_phone:I = 0x7f1217be
 
-.field public static final voice_channel_show_names:I = 0x7f1217bf
+.field public static final verifying:I = 0x7f1217bf
 
-.field public static final voice_channel_subtitle:I = 0x7f1217c0
+.field public static final very_out_of_date_description:I = 0x7f1217c0
 
-.field public static final voice_channel_title:I = 0x7f1217c1
+.field public static final vi:I = 0x7f1217c1
 
-.field public static final voice_channel_undeafened:I = 0x7f1217c2
+.field public static final video:I = 0x7f1217c2
 
-.field public static final voice_channel_unmuted:I = 0x7f1217c3
+.field public static final video_call_auto_select:I = 0x7f1217c3
 
-.field public static final voice_channels:I = 0x7f1217c4
+.field public static final video_call_hide_members:I = 0x7f1217c4
 
-.field public static final voice_panel_introduction_close:I = 0x7f1217c5
+.field public static final video_call_return_to_grid:I = 0x7f1217c5
 
-.field public static final voice_panel_introduction_header:I = 0x7f1217c6
+.field public static final video_call_return_to_list:I = 0x7f1217c6
 
-.field public static final voice_panel_introduction_text:I = 0x7f1217c7
+.field public static final video_call_show_members:I = 0x7f1217c7
 
-.field public static final voice_permissions:I = 0x7f1217c8
+.field public static final video_capacity_modal_body:I = 0x7f1217c8
 
-.field public static final voice_settings:I = 0x7f1217c9
+.field public static final video_capacity_modal_header:I = 0x7f1217c9
 
-.field public static final voice_status_connecting:I = 0x7f1217ca
+.field public static final video_playback_mute_accessibility_label:I = 0x7f1217ca
 
-.field public static final voice_status_not_connected:I = 0x7f1217cb
+.field public static final video_playback_unmute_accessibility_label:I = 0x7f1217cb
 
-.field public static final voice_status_not_connected_mobile:I = 0x7f1217cc
+.field public static final video_poor_connection_body:I = 0x7f1217cc
 
-.field public static final voice_status_ringing:I = 0x7f1217cd
+.field public static final video_poor_connection_title:I = 0x7f1217cd
 
-.field public static final voice_unavailable:I = 0x7f1217ce
+.field public static final video_settings:I = 0x7f1217ce
 
-.field public static final watch:I = 0x7f1217cf
+.field public static final video_unavailable:I = 0x7f1217cf
 
-.field public static final watch_stream:I = 0x7f1217d0
+.field public static final video_unsupported_browser_body:I = 0x7f1217d0
 
-.field public static final watch_stream_in_app:I = 0x7f1217d1
+.field public static final video_unsupported_browser_title:I = 0x7f1217d1
 
-.field public static final watch_stream_streaming:I = 0x7f1217d2
+.field public static final view_as_role:I = 0x7f1217d2
 
-.field public static final watch_stream_tip:I = 0x7f1217d3
+.field public static final view_as_roles_hidden_vc_warning:I = 0x7f1217d3
 
-.field public static final watch_stream_watching:I = 0x7f1217d4
+.field public static final view_as_roles_mentions_warning:I = 0x7f1217d4
 
-.field public static final watch_user_stream:I = 0x7f1217d5
+.field public static final view_as_roles_voice_warning:I = 0x7f1217d5
 
-.field public static final watching:I = 0x7f1217d6
+.field public static final view_audit_log:I = 0x7f1217d6
 
-.field public static final web_browser:I = 0x7f1217d7
+.field public static final view_audit_log_description:I = 0x7f1217d7
 
-.field public static final web_browser_chrome:I = 0x7f1217d8
+.field public static final view_channel:I = 0x7f1217d8
 
-.field public static final web_browser_in_app:I = 0x7f1217d9
+.field public static final view_embed:I = 0x7f1217d9
 
-.field public static final web_browser_safari:I = 0x7f1217da
+.field public static final view_guild_analytics:I = 0x7f1217da
 
-.field public static final webhook_cancel:I = 0x7f1217db
+.field public static final view_guild_analytics_description:I = 0x7f1217db
 
-.field public static final webhook_create:I = 0x7f1217dc
+.field public static final view_profile:I = 0x7f1217dc
 
-.field public static final webhook_created_on:I = 0x7f1217dd
+.field public static final view_spectators:I = 0x7f1217dd
 
-.field public static final webhook_delete:I = 0x7f1217de
+.field public static final view_surrounding_messages:I = 0x7f1217de
 
-.field public static final webhook_delete_body:I = 0x7f1217df
+.field public static final viewing_as_roles:I = 0x7f1217df
 
-.field public static final webhook_delete_title:I = 0x7f1217e0
+.field public static final viewing_as_roles_back:I = 0x7f1217e0
 
-.field public static final webhook_error_creating_webhook:I = 0x7f1217e1
+.field public static final viewing_as_roles_select:I = 0x7f1217e1
 
-.field public static final webhook_error_deleting_webhook:I = 0x7f1217e2
+.field public static final visitors_info:I = 0x7f1217e2
 
-.field public static final webhook_error_internal_server_error:I = 0x7f1217e3
+.field public static final voice:I = 0x7f1217e3
 
-.field public static final webhook_error_max_webhooks_reached:I = 0x7f1217e4
+.field public static final voice_and_video:I = 0x7f1217e4
 
-.field public static final webhook_form_name:I = 0x7f1217e5
+.field public static final voice_call_member_list_title:I = 0x7f1217e5
 
-.field public static final webhook_form_url:I = 0x7f1217e6
+.field public static final voice_channel:I = 0x7f1217e6
 
-.field public static final webhook_form_webhook_url_help:I = 0x7f1217e7
+.field public static final voice_channel_deafened:I = 0x7f1217e7
 
-.field public static final webhook_modal_icon_description:I = 0x7f1217e8
+.field public static final voice_channel_empty:I = 0x7f1217e8
 
-.field public static final webhook_modal_icon_title:I = 0x7f1217e9
+.field public static final voice_channel_hide_names:I = 0x7f1217e9
 
-.field public static final webhook_modal_title:I = 0x7f1217ea
+.field public static final voice_channel_muted:I = 0x7f1217ea
 
-.field public static final webhooks:I = 0x7f1217eb
+.field public static final voice_channel_show_names:I = 0x7f1217eb
 
-.field public static final weekly_communicators:I = 0x7f1217ec
+.field public static final voice_channel_subtitle:I = 0x7f1217ec
 
-.field public static final weekly_new_member_retention:I = 0x7f1217ed
+.field public static final voice_channel_title:I = 0x7f1217ed
 
-.field public static final weekly_new_members:I = 0x7f1217ee
+.field public static final voice_channel_undeafened:I = 0x7f1217ee
 
-.field public static final weekly_visitors:I = 0x7f1217ef
+.field public static final voice_channel_unmuted:I = 0x7f1217ef
 
-.field public static final welcome_channel_delete_confirm_body:I = 0x7f1217f0
+.field public static final voice_channels:I = 0x7f1217f0
 
-.field public static final welcome_channel_delete_confirm_body_generic:I = 0x7f1217f1
+.field public static final voice_panel_introduction_close:I = 0x7f1217f1
 
-.field public static final welcome_channel_delete_confirm_title:I = 0x7f1217f2
+.field public static final voice_panel_introduction_header:I = 0x7f1217f2
 
-.field public static final welcome_channel_emoji_picker_tooltip:I = 0x7f1217f3
+.field public static final voice_panel_introduction_text:I = 0x7f1217f3
 
-.field public static final welcome_cta_create_channel:I = 0x7f1217f4
+.field public static final voice_permissions:I = 0x7f1217f4
 
-.field public static final welcome_cta_download_title:I = 0x7f1217f5
+.field public static final voice_settings:I = 0x7f1217f5
 
-.field public static final welcome_cta_invite_title:I = 0x7f1217f6
+.field public static final voice_status_connecting:I = 0x7f1217f6
 
-.field public static final welcome_cta_message_title:I = 0x7f1217f7
+.field public static final voice_status_not_connected:I = 0x7f1217f7
 
-.field public static final welcome_cta_personalize_title:I = 0x7f1217f8
+.field public static final voice_status_not_connected_mobile:I = 0x7f1217f8
 
-.field public static final welcome_cta_personalize_title_mobile:I = 0x7f1217f9
+.field public static final voice_status_ringing:I = 0x7f1217f9
 
-.field public static final welcome_cta_subtitle_action_with_guide:I = 0x7f1217fa
+.field public static final voice_unavailable:I = 0x7f1217fa
 
-.field public static final welcome_cta_subtitle_existing_server:I = 0x7f1217fb
+.field public static final watch:I = 0x7f1217fb
 
-.field public static final welcome_cta_subtitle_member:I = 0x7f1217fc
+.field public static final watch_stream:I = 0x7f1217fc
 
-.field public static final welcome_cta_subtitle_owner:I = 0x7f1217fd
+.field public static final watch_stream_in_app:I = 0x7f1217fd
 
-.field public static final welcome_cta_title:I = 0x7f1217fe
+.field public static final watch_stream_streaming:I = 0x7f1217fe
 
-.field public static final welcome_cta_title_mobile:I = 0x7f1217ff
+.field public static final watch_stream_tip:I = 0x7f1217ff
 
-.field public static final welcome_message_desktop_apps:I = 0x7f121800
+.field public static final watch_stream_watching:I = 0x7f121800
 
-.field public static final welcome_message_edit_channel:I = 0x7f121801
+.field public static final watch_user_stream:I = 0x7f121801
 
-.field public static final welcome_message_instant_invite:I = 0x7f121802
+.field public static final watching:I = 0x7f121802
 
-.field public static final welcome_message_mobile_apps:I = 0x7f121803
+.field public static final web_browser:I = 0x7f121803
 
-.field public static final welcome_message_mobile_explore_server:I = 0x7f121804
+.field public static final web_browser_chrome:I = 0x7f121804
 
-.field public static final welcome_message_mobile_explore_server_desc:I = 0x7f121805
+.field public static final web_browser_in_app:I = 0x7f121805
 
-.field public static final welcome_message_mobile_instant_invite:I = 0x7f121806
+.field public static final web_browser_safari:I = 0x7f121806
 
-.field public static final welcome_message_mobile_instant_invite_desc:I = 0x7f121807
+.field public static final webhook_cancel:I = 0x7f121807
 
-.field public static final welcome_message_mobile_owner_subtitle:I = 0x7f121808
+.field public static final webhook_create:I = 0x7f121808
 
-.field public static final welcome_message_mobile_owner_title:I = 0x7f121809
+.field public static final webhook_created_on:I = 0x7f121809
 
-.field public static final welcome_message_mobile_upload_icon:I = 0x7f12180a
+.field public static final webhook_delete:I = 0x7f12180a
 
-.field public static final welcome_message_mobile_upload_icon_desc:I = 0x7f12180b
+.field public static final webhook_delete_body:I = 0x7f12180b
 
-.field public static final welcome_message_owner_title:I = 0x7f12180c
+.field public static final webhook_delete_title:I = 0x7f12180c
 
-.field public static final welcome_message_setup_server:I = 0x7f12180d
+.field public static final webhook_error_creating_webhook:I = 0x7f12180d
 
-.field public static final welcome_message_subtitle_channel:I = 0x7f12180e
+.field public static final webhook_error_deleting_webhook:I = 0x7f12180e
 
-.field public static final welcome_message_support:I = 0x7f12180f
+.field public static final webhook_error_internal_server_error:I = 0x7f12180f
 
-.field public static final welcome_message_title:I = 0x7f121810
+.field public static final webhook_error_max_webhooks_reached:I = 0x7f121810
 
-.field public static final welcome_message_title_channel:I = 0x7f121811
+.field public static final webhook_form_name:I = 0x7f121811
 
-.field public static final welcome_message_tutorial:I = 0x7f121812
+.field public static final webhook_form_url:I = 0x7f121812
 
-.field public static final welcome_screen_choice_header:I = 0x7f121813
+.field public static final webhook_form_webhook_url_help:I = 0x7f121813
 
-.field public static final welcome_screen_skip:I = 0x7f121814
+.field public static final webhook_modal_icon_description:I = 0x7f121814
 
-.field public static final welcome_screen_title:I = 0x7f121815
+.field public static final webhook_modal_icon_title:I = 0x7f121815
 
-.field public static final whats_new:I = 0x7f121816
+.field public static final webhook_modal_title:I = 0x7f121816
 
-.field public static final whats_new_date:I = 0x7f121817
+.field public static final webhooks:I = 0x7f121817
 
-.field public static final whitelist_failed:I = 0x7f121818
+.field public static final weekly_communicators:I = 0x7f121818
 
-.field public static final whitelisted:I = 0x7f121819
+.field public static final weekly_new_member_retention:I = 0x7f121819
 
-.field public static final whitelisting:I = 0x7f12181a
+.field public static final weekly_new_members:I = 0x7f12181a
 
-.field public static final widget:I = 0x7f12181b
+.field public static final weekly_visitors:I = 0x7f12181b
 
-.field public static final windows:I = 0x7f12181c
+.field public static final welcome_channel_delete_confirm_body:I = 0x7f12181c
 
-.field public static final working:I = 0x7f12181d
+.field public static final welcome_channel_delete_confirm_body_generic:I = 0x7f12181d
 
-.field public static final wumpus:I = 0x7f12181e
+.field public static final welcome_channel_delete_confirm_title:I = 0x7f12181e
 
-.field public static final xbox_authorization_title:I = 0x7f12181f
+.field public static final welcome_channel_emoji_picker_tooltip:I = 0x7f12181f
 
-.field public static final xbox_game_pass_card_body_redeemed:I = 0x7f121820
+.field public static final welcome_cta_create_channel:I = 0x7f121820
 
-.field public static final xbox_game_pass_card_body_unredeemed:I = 0x7f121821
+.field public static final welcome_cta_download_title:I = 0x7f121821
 
-.field public static final xbox_game_pass_modal_code_description:I = 0x7f121822
+.field public static final welcome_cta_invite_title:I = 0x7f121822
 
-.field public static final xbox_game_pass_modal_code_header:I = 0x7f121823
+.field public static final welcome_cta_message_title:I = 0x7f121823
 
-.field public static final xbox_game_pass_modal_header_confirm_pc:I = 0x7f121824
+.field public static final welcome_cta_personalize_title:I = 0x7f121824
 
-.field public static final xbox_game_pass_modal_header_confirm_xbox:I = 0x7f121825
+.field public static final welcome_cta_personalize_title_mobile:I = 0x7f121825
 
-.field public static final xbox_game_pass_modal_header_description_confirm_pc:I = 0x7f121826
+.field public static final welcome_cta_subtitle_action_with_guide:I = 0x7f121826
 
-.field public static final xbox_game_pass_modal_header_description_confirm_xbox:I = 0x7f121827
+.field public static final welcome_cta_subtitle_existing_server:I = 0x7f121827
 
-.field public static final xbox_game_pass_modal_header_description_plan_select:I = 0x7f121828
+.field public static final welcome_cta_subtitle_member:I = 0x7f121828
 
-.field public static final xbox_game_pass_modal_header_description_success:I = 0x7f121829
+.field public static final welcome_cta_subtitle_owner:I = 0x7f121829
 
-.field public static final xbox_game_pass_modal_header_plan_select:I = 0x7f12182a
+.field public static final welcome_cta_title:I = 0x7f12182a
 
-.field public static final xbox_game_pass_modal_header_success:I = 0x7f12182b
+.field public static final welcome_cta_title_mobile:I = 0x7f12182b
 
-.field public static final xbox_game_pass_modal_plan_select_header:I = 0x7f12182c
+.field public static final welcome_message_desktop_apps:I = 0x7f12182c
 
-.field public static final xbox_game_pass_modal_plan_select_pc_plan:I = 0x7f12182d
+.field public static final welcome_message_edit_channel:I = 0x7f12182d
 
-.field public static final xbox_game_pass_modal_plan_select_plan_duration:I = 0x7f12182e
+.field public static final welcome_message_instant_invite:I = 0x7f12182e
 
-.field public static final xbox_game_pass_modal_plan_select_xbox_plan:I = 0x7f12182f
+.field public static final welcome_message_mobile_apps:I = 0x7f12182f
 
-.field public static final xbox_game_pass_modal_redeem_button_pc:I = 0x7f121830
+.field public static final welcome_message_mobile_explore_server:I = 0x7f121830
 
-.field public static final xbox_game_pass_modal_redeem_button_xbox:I = 0x7f121831
+.field public static final welcome_message_mobile_explore_server_desc:I = 0x7f121831
 
-.field public static final xbox_game_pass_promotion_account_credit_body:I = 0x7f121832
+.field public static final welcome_message_mobile_instant_invite:I = 0x7f121832
 
-.field public static final xbox_game_pass_promotion_account_credit_button:I = 0x7f121833
+.field public static final welcome_message_mobile_instant_invite_desc:I = 0x7f121833
 
-.field public static final xbox_game_pass_promotion_account_credit_confirm_body:I = 0x7f121834
+.field public static final welcome_message_mobile_owner_subtitle:I = 0x7f121834
 
-.field public static final xbox_game_pass_promotion_account_credit_confirm_title:I = 0x7f121835
+.field public static final welcome_message_mobile_owner_title:I = 0x7f121835
 
-.field public static final xbox_game_pass_promotion_account_credit_title:I = 0x7f121836
+.field public static final welcome_message_mobile_upload_icon:I = 0x7f121836
 
-.field public static final xbox_game_pass_promotion_card_header:I = 0x7f121837
+.field public static final welcome_message_mobile_upload_icon_desc:I = 0x7f121837
 
-.field public static final xbox_game_pass_promotion_existing_subscriber_body:I = 0x7f121838
+.field public static final welcome_message_owner_title:I = 0x7f121838
 
-.field public static final xbox_game_pass_promotion_existing_subscriber_title:I = 0x7f121839
+.field public static final welcome_message_setup_server:I = 0x7f121839
 
-.field public static final xbox_game_pass_promotion_redeem_body:I = 0x7f12183a
+.field public static final welcome_message_subtitle_channel:I = 0x7f12183a
 
-.field public static final xbox_link:I = 0x7f12183b
+.field public static final welcome_message_support:I = 0x7f12183b
 
-.field public static final xbox_pin_step1:I = 0x7f12183c
+.field public static final welcome_message_title:I = 0x7f12183c
 
-.field public static final xbox_pin_step2:I = 0x7f12183d
+.field public static final welcome_message_title_channel:I = 0x7f12183d
 
-.field public static final xbox_pin_step3:I = 0x7f12183e
+.field public static final welcome_message_tutorial:I = 0x7f12183e
 
-.field public static final yearly:I = 0x7f12183f
+.field public static final welcome_screen_choice_header:I = 0x7f12183f
 
-.field public static final yellow:I = 0x7f121840
+.field public static final welcome_screen_skip:I = 0x7f121840
 
-.field public static final yes_text:I = 0x7f121841
+.field public static final welcome_screen_title:I = 0x7f121841
 
-.field public static final your_pin_expires:I = 0x7f121842
+.field public static final whats_new:I = 0x7f121842
 
-.field public static final your_pin_is_expired:I = 0x7f121843
+.field public static final whats_new_date:I = 0x7f121843
 
-.field public static final youre_viewing_older_messages:I = 0x7f121844
+.field public static final whitelist_failed:I = 0x7f121844
 
-.field public static final zh_cn:I = 0x7f121845
+.field public static final whitelisted:I = 0x7f121845
 
-.field public static final zh_tw:I = 0x7f121846
+.field public static final whitelisting:I = 0x7f121846
+
+.field public static final widget:I = 0x7f121847
+
+.field public static final windows:I = 0x7f121848
+
+.field public static final working:I = 0x7f121849
+
+.field public static final wumpus:I = 0x7f12184a
+
+.field public static final xbox_authorization_title:I = 0x7f12184b
+
+.field public static final xbox_game_pass_card_body_redeemed:I = 0x7f12184c
+
+.field public static final xbox_game_pass_card_body_unredeemed:I = 0x7f12184d
+
+.field public static final xbox_game_pass_modal_code_description:I = 0x7f12184e
+
+.field public static final xbox_game_pass_modal_code_header:I = 0x7f12184f
+
+.field public static final xbox_game_pass_modal_header_confirm_pc:I = 0x7f121850
+
+.field public static final xbox_game_pass_modal_header_confirm_xbox:I = 0x7f121851
+
+.field public static final xbox_game_pass_modal_header_description_confirm_pc:I = 0x7f121852
+
+.field public static final xbox_game_pass_modal_header_description_confirm_xbox:I = 0x7f121853
+
+.field public static final xbox_game_pass_modal_header_description_plan_select:I = 0x7f121854
+
+.field public static final xbox_game_pass_modal_header_description_success:I = 0x7f121855
+
+.field public static final xbox_game_pass_modal_header_plan_select:I = 0x7f121856
+
+.field public static final xbox_game_pass_modal_header_success:I = 0x7f121857
+
+.field public static final xbox_game_pass_modal_plan_select_header:I = 0x7f121858
+
+.field public static final xbox_game_pass_modal_plan_select_pc_plan:I = 0x7f121859
+
+.field public static final xbox_game_pass_modal_plan_select_plan_duration:I = 0x7f12185a
+
+.field public static final xbox_game_pass_modal_plan_select_xbox_plan:I = 0x7f12185b
+
+.field public static final xbox_game_pass_modal_redeem_button_pc:I = 0x7f12185c
+
+.field public static final xbox_game_pass_modal_redeem_button_xbox:I = 0x7f12185d
+
+.field public static final xbox_game_pass_promotion_account_credit_body:I = 0x7f12185e
+
+.field public static final xbox_game_pass_promotion_account_credit_button:I = 0x7f12185f
+
+.field public static final xbox_game_pass_promotion_account_credit_confirm_body:I = 0x7f121860
+
+.field public static final xbox_game_pass_promotion_account_credit_confirm_title:I = 0x7f121861
+
+.field public static final xbox_game_pass_promotion_account_credit_title:I = 0x7f121862
+
+.field public static final xbox_game_pass_promotion_card_header:I = 0x7f121863
+
+.field public static final xbox_game_pass_promotion_existing_subscriber_body:I = 0x7f121864
+
+.field public static final xbox_game_pass_promotion_existing_subscriber_title:I = 0x7f121865
+
+.field public static final xbox_game_pass_promotion_redeem_body:I = 0x7f121866
+
+.field public static final xbox_link:I = 0x7f121867
+
+.field public static final xbox_pin_step1:I = 0x7f121868
+
+.field public static final xbox_pin_step2:I = 0x7f121869
+
+.field public static final xbox_pin_step3:I = 0x7f12186a
+
+.field public static final yearly:I = 0x7f12186b
+
+.field public static final yellow:I = 0x7f12186c
+
+.field public static final yes_text:I = 0x7f12186d
+
+.field public static final your_pin_expires:I = 0x7f12186e
+
+.field public static final your_pin_is_expired:I = 0x7f12186f
+
+.field public static final youre_viewing_older_messages:I = 0x7f121870
+
+.field public static final zh_cn:I = 0x7f121871
+
+.field public static final zh_tw:I = 0x7f121872
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
index 3e22334652..c90f2286bb 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$h.smali
@@ -1664,553 +1664,551 @@
 
 .field public static final UiKit_Sheet_Header_Title:I = 0x7f130340
 
-.field public static final UiKit_SuperBar:I = 0x7f130341
+.field public static final UiKit_TabLayout_PagerIndicator:I = 0x7f130341
 
-.field public static final UiKit_TabLayout_PagerIndicator:I = 0x7f130342
+.field public static final UiKit_Tabs:I = 0x7f130342
 
-.field public static final UiKit_Tabs:I = 0x7f130343
+.field public static final UiKit_Tabs_TextAppearance:I = 0x7f130343
 
-.field public static final UiKit_Tabs_TextAppearance:I = 0x7f130344
+.field public static final UiKit_TextAppearance:I = 0x7f130344
 
-.field public static final UiKit_TextAppearance:I = 0x7f130345
+.field public static final UiKit_TextAppearance_Bold:I = 0x7f130345
 
-.field public static final UiKit_TextAppearance_Bold:I = 0x7f130346
+.field public static final UiKit_TextAppearance_Button:I = 0x7f130346
 
-.field public static final UiKit_TextAppearance_Button:I = 0x7f130347
+.field public static final UiKit_TextAppearance_ListItem:I = 0x7f130347
 
-.field public static final UiKit_TextAppearance_ListItem:I = 0x7f130348
+.field public static final UiKit_TextAppearance_ListItem_Label:I = 0x7f130348
 
-.field public static final UiKit_TextAppearance_ListItem_Label:I = 0x7f130349
+.field public static final UiKit_TextAppearance_MaterialEditText:I = 0x7f130349
 
-.field public static final UiKit_TextAppearance_MaterialEditText:I = 0x7f13034a
+.field public static final UiKit_TextAppearance_MaterialEditText_Input:I = 0x7f13034a
 
-.field public static final UiKit_TextAppearance_MaterialEditText_Input:I = 0x7f13034b
+.field public static final UiKit_TextAppearance_MaterialEditText_Label:I = 0x7f13034b
 
-.field public static final UiKit_TextAppearance_MaterialEditText_Label:I = 0x7f13034c
+.field public static final UiKit_TextAppearance_Semibold:I = 0x7f13034c
 
-.field public static final UiKit_TextAppearance_Semibold:I = 0x7f13034d
+.field public static final UiKit_TextAppearance_Toolbar:I = 0x7f13034d
 
-.field public static final UiKit_TextAppearance_Toolbar:I = 0x7f13034e
+.field public static final UiKit_TextAppearance_Toolbar_Subtitle:I = 0x7f13034e
 
-.field public static final UiKit_TextAppearance_Toolbar_Subtitle:I = 0x7f13034f
+.field public static final UiKit_TextAppearance_Toolbar_Title:I = 0x7f13034f
 
-.field public static final UiKit_TextAppearance_Toolbar_Title:I = 0x7f130350
+.field public static final UiKit_TextInputLayout:I = 0x7f130350
 
-.field public static final UiKit_TextInputLayout:I = 0x7f130351
+.field public static final UiKit_TextInputLayout_EditText:I = 0x7f130351
 
-.field public static final UiKit_TextInputLayout_EditText:I = 0x7f130352
+.field public static final UiKit_TextInputLayout_EditText_MultiLine:I = 0x7f130352
 
-.field public static final UiKit_TextInputLayout_EditText_MultiLine:I = 0x7f130353
+.field public static final UiKit_TextInputLayout_EditText_NoFocus:I = 0x7f130353
 
-.field public static final UiKit_TextInputLayout_EditText_NoFocus:I = 0x7f130354
+.field public static final UiKit_TextInputLayout_EditText_SingleLine:I = 0x7f130354
 
-.field public static final UiKit_TextInputLayout_EditText_SingleLine:I = 0x7f130355
+.field public static final UiKit_TextInputLayout_EditText_SingleLine_CountryCode:I = 0x7f130355
 
-.field public static final UiKit_TextInputLayout_EditText_SingleLine_CountryCode:I = 0x7f130356
+.field public static final UiKit_TextInputLayout_EditText_SingleLine_Email:I = 0x7f130356
 
-.field public static final UiKit_TextInputLayout_EditText_SingleLine_Email:I = 0x7f130357
+.field public static final UiKit_TextInputLayout_EditText_SingleLine_Password:I = 0x7f130357
 
-.field public static final UiKit_TextInputLayout_EditText_SingleLine_Password:I = 0x7f130358
+.field public static final UiKit_TextInputLayout_EditText_SingleLine_Phone:I = 0x7f130358
 
-.field public static final UiKit_TextInputLayout_EditText_SingleLine_Phone:I = 0x7f130359
+.field public static final UiKit_TextInputLayout_EditText_SingleLine_Search:I = 0x7f130359
 
-.field public static final UiKit_TextInputLayout_EditText_SingleLine_Search:I = 0x7f13035a
+.field public static final UiKit_TextInputLayout_EditText_SingleLine_Username:I = 0x7f13035a
 
-.field public static final UiKit_TextInputLayout_EditText_SingleLine_Username:I = 0x7f13035b
+.field public static final UiKit_TextInputLayout_Password:I = 0x7f13035b
 
-.field public static final UiKit_TextInputLayout_Password:I = 0x7f13035c
+.field public static final UiKit_TextInputLayout_Primary:I = 0x7f13035c
 
-.field public static final UiKit_TextInputLayout_Primary:I = 0x7f13035d
+.field public static final UiKit_TextInputLayout_Primary_Password:I = 0x7f13035d
 
-.field public static final UiKit_TextInputLayout_Primary_Password:I = 0x7f13035e
+.field public static final UiKit_TextInputLayout_Search:I = 0x7f13035e
 
-.field public static final UiKit_TextInputLayout_Search:I = 0x7f13035f
+.field public static final UiKit_TextInputLayout_Search_ActionBar:I = 0x7f13035f
 
-.field public static final UiKit_TextInputLayout_Search_ActionBar:I = 0x7f130360
+.field public static final UiKit_TextInputLayout_Search_ActionBar_Filter:I = 0x7f130360
 
-.field public static final UiKit_TextInputLayout_Search_ActionBar_Filter:I = 0x7f130361
+.field public static final UiKit_TextView:I = 0x7f130361
 
-.field public static final UiKit_TextView:I = 0x7f130362
+.field public static final UiKit_TextView_Bold:I = 0x7f130362
 
-.field public static final UiKit_TextView_Bold:I = 0x7f130363
+.field public static final UiKit_TextView_H1:I = 0x7f130363
 
-.field public static final UiKit_TextView_H1:I = 0x7f130364
+.field public static final UiKit_TextView_H1_Bold:I = 0x7f130364
 
-.field public static final UiKit_TextView_H1_Bold:I = 0x7f130365
+.field public static final UiKit_TextView_H2:I = 0x7f130365
 
-.field public static final UiKit_TextView_H2:I = 0x7f130366
+.field public static final UiKit_TextView_Large:I = 0x7f130366
 
-.field public static final UiKit_TextView_Large:I = 0x7f130367
+.field public static final UiKit_TextView_Large_SingleLine:I = 0x7f130367
 
-.field public static final UiKit_TextView_Large_SingleLine:I = 0x7f130368
+.field public static final UiKit_TextView_Link:I = 0x7f130368
 
-.field public static final UiKit_TextView_Link:I = 0x7f130369
+.field public static final UiKit_TextView_Marquee:I = 0x7f130369
 
-.field public static final UiKit_TextView_Marquee:I = 0x7f13036a
+.field public static final UiKit_TextView_Medium:I = 0x7f13036a
 
-.field public static final UiKit_TextView_Medium:I = 0x7f13036b
+.field public static final UiKit_TextView_NoResults:I = 0x7f13036b
 
-.field public static final UiKit_TextView_NoResults:I = 0x7f13036c
+.field public static final UiKit_TextView_Perk:I = 0x7f13036c
 
-.field public static final UiKit_TextView_Perk:I = 0x7f13036d
+.field public static final UiKit_TextView_Semibold:I = 0x7f13036d
 
-.field public static final UiKit_TextView_Semibold:I = 0x7f13036e
+.field public static final UiKit_TextView_SingleLine:I = 0x7f13036e
 
-.field public static final UiKit_TextView_SingleLine:I = 0x7f13036f
+.field public static final UiKit_TextView_Subtext:I = 0x7f13036f
 
-.field public static final UiKit_TextView_Subtext:I = 0x7f130370
+.field public static final UiKit_TextView_Subtext_SingleLine:I = 0x7f130370
 
-.field public static final UiKit_TextView_Subtext_SingleLine:I = 0x7f130371
+.field public static final UiKit_Toast:I = 0x7f130371
 
-.field public static final UiKit_Toast:I = 0x7f130372
+.field public static final UiKit_User_Phone_Add_Confirm:I = 0x7f130372
 
-.field public static final UiKit_User_Phone_Add_Confirm:I = 0x7f130373
+.field public static final UiKit_User_Phone_Add_Number:I = 0x7f130373
 
-.field public static final UiKit_User_Phone_Add_Number:I = 0x7f130374
+.field public static final UiKit_User_Phone_Verify_Digits:I = 0x7f130374
 
-.field public static final UiKit_User_Phone_Verify_Digits:I = 0x7f130375
+.field public static final UiKit_User_Verify_Char:I = 0x7f130375
 
-.field public static final UiKit_User_Verify_Char:I = 0x7f130376
+.field public static final UiKit_ViewGroup:I = 0x7f130376
 
-.field public static final UiKit_ViewGroup:I = 0x7f130377
+.field public static final UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout:I = 0x7f130377
 
-.field public static final UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout:I = 0x7f130378
+.field public static final UiKit_ViewGroup_ConstraintLayout:I = 0x7f130378
 
-.field public static final UiKit_ViewGroup_ConstraintLayout:I = 0x7f130379
+.field public static final UiKit_ViewGroup_CoordinatorLayout:I = 0x7f130379
 
-.field public static final UiKit_ViewGroup_CoordinatorLayout:I = 0x7f13037a
+.field public static final UiKit_ViewGroup_CoordinatorLayout_Page:I = 0x7f13037a
 
-.field public static final UiKit_ViewGroup_CoordinatorLayout_Page:I = 0x7f13037b
+.field public static final UiKit_ViewGroup_LinearLayout:I = 0x7f13037b
 
-.field public static final UiKit_ViewGroup_LinearLayout:I = 0x7f13037c
+.field public static final UiKit_ViewGroup_LinearLayout_BottomSheet:I = 0x7f13037c
 
-.field public static final UiKit_ViewGroup_LinearLayout_BottomSheet:I = 0x7f13037d
+.field public static final UiKit_ViewGroup_LinearLayout_Horizontal:I = 0x7f13037d
 
-.field public static final UiKit_ViewGroup_LinearLayout_Horizontal:I = 0x7f13037e
+.field public static final UiKit_ViewGroup_LinearLayout_Rotatable:I = 0x7f13037e
 
-.field public static final UiKit_ViewGroup_LinearLayout_Rotatable:I = 0x7f13037f
+.field public static final UiKit_ViewGroup_LinearLayout_Rotatable_Horizontal:I = 0x7f13037f
 
-.field public static final UiKit_ViewGroup_LinearLayout_Rotatable_Horizontal:I = 0x7f130380
+.field public static final UiKit_ViewGroup_NestedScrollView:I = 0x7f130380
 
-.field public static final UiKit_ViewGroup_NestedScrollView:I = 0x7f130381
+.field public static final UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior:I = 0x7f130381
 
-.field public static final UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior:I = 0x7f130382
+.field public static final UiKit_ViewGroup_NestedScrollView_Page:I = 0x7f130382
 
-.field public static final UiKit_ViewGroup_NestedScrollView_Page:I = 0x7f130383
+.field public static final UiKit_ViewGroup_Page:I = 0x7f130383
 
-.field public static final UiKit_ViewGroup_Page:I = 0x7f130384
+.field public static final UiKit_ViewGroup_Page_LinearLayout:I = 0x7f130384
 
-.field public static final UiKit_ViewGroup_Page_LinearLayout:I = 0x7f130385
+.field public static final UiKit_ViewGroup_Page_LinearLayout_Horizontal:I = 0x7f130385
 
-.field public static final UiKit_ViewGroup_Page_LinearLayout_Horizontal:I = 0x7f130386
+.field public static final UiKit_ViewGroup_RecyclerView:I = 0x7f130386
 
-.field public static final UiKit_ViewGroup_RecyclerView:I = 0x7f130387
+.field public static final UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior:I = 0x7f130387
 
-.field public static final UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior:I = 0x7f130388
+.field public static final UiKit_ViewGroup_RecyclerView_Horizontal:I = 0x7f130388
 
-.field public static final UiKit_ViewGroup_RecyclerView_Horizontal:I = 0x7f130389
+.field public static final UiKit_ViewGroup_RelativeLayout:I = 0x7f130389
 
-.field public static final UiKit_ViewGroup_RelativeLayout:I = 0x7f13038a
+.field public static final UiKit_ViewGroup_RelativeLayout_AppBarScrollingViewBehavior:I = 0x7f13038a
 
-.field public static final UiKit_ViewGroup_RelativeLayout_AppBarScrollingViewBehavior:I = 0x7f13038b
+.field public static final UiKit_ViewGroup_ScrollView:I = 0x7f13038b
 
-.field public static final UiKit_ViewGroup_ScrollView:I = 0x7f13038c
+.field public static final UiKit_ViewGroup_ScrollView_Horizontal:I = 0x7f13038c
 
-.field public static final UiKit_ViewGroup_ScrollView_Horizontal:I = 0x7f13038d
+.field public static final UiKit_ViewGroup_ScrollView_Page:I = 0x7f13038d
 
-.field public static final UiKit_ViewGroup_ScrollView_Page:I = 0x7f13038e
+.field public static final UiKit_WelcomeMessageCard:I = 0x7f13038e
 
-.field public static final UiKit_WelcomeMessageCard:I = 0x7f13038f
+.field public static final UserProfile_PresenceSection_Body:I = 0x7f13038f
 
-.field public static final UserProfile_PresenceSection_Body:I = 0x7f130390
+.field public static final UserProfile_PresenceSection_Body_HeaderText:I = 0x7f130390
 
-.field public static final UserProfile_PresenceSection_Body_HeaderText:I = 0x7f130391
+.field public static final UserProfile_PresenceSection_Body_Subtext:I = 0x7f130391
 
-.field public static final UserProfile_PresenceSection_Body_Subtext:I = 0x7f130392
+.field public static final UserProfile_PresenceSection_MaterialButton:I = 0x7f130392
 
-.field public static final UserProfile_PresenceSection_MaterialButton:I = 0x7f130393
+.field public static final UserProfile_Section:I = 0x7f130393
 
-.field public static final UserProfile_Section:I = 0x7f130394
+.field public static final UserProfile_Section_Card:I = 0x7f130394
 
-.field public static final UserProfile_Section_Card:I = 0x7f130395
+.field public static final UserProfile_Section_Header:I = 0x7f130395
 
-.field public static final UserProfile_Section_Header:I = 0x7f130396
+.field public static final UserProfile_Section_HeaderTextAppearance:I = 0x7f130396
 
-.field public static final UserProfile_Section_HeaderTextAppearance:I = 0x7f130397
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_TextView:I = 0x7f1303dc
 
-.field public static final Widget_AppCompat_TextView:I = 0x7f1303dd
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e2
 
-.field public static final Widget_Design_AppBarLayout:I = 0x7f1303e3
+.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e3
 
-.field public static final Widget_Design_BottomNavigationView:I = 0x7f1303e4
+.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e4
 
-.field public static final Widget_Design_BottomSheet_Modal:I = 0x7f1303e5
+.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e5
 
-.field public static final Widget_Design_CollapsingToolbar:I = 0x7f1303e6
+.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e6
 
-.field public static final Widget_Design_FloatingActionButton:I = 0x7f1303e7
+.field public static final Widget_Design_NavigationView:I = 0x7f1303e7
 
-.field public static final Widget_Design_NavigationView:I = 0x7f1303e8
+.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e8
 
-.field public static final Widget_Design_ScrimInsetsFrameLayout:I = 0x7f1303e9
+.field public static final Widget_Design_Snackbar:I = 0x7f1303e9
 
-.field public static final Widget_Design_Snackbar:I = 0x7f1303ea
+.field public static final Widget_Design_TabLayout:I = 0x7f1303ea
 
-.field public static final Widget_Design_TabLayout:I = 0x7f1303eb
+.field public static final Widget_Design_TextInputEditText:I = 0x7f1303eb
 
-.field public static final Widget_Design_TextInputEditText:I = 0x7f1303ec
+.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ec
 
-.field public static final Widget_Design_TextInputLayout:I = 0x7f1303ed
+.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ed
 
-.field public static final Widget_MaterialComponents_ActionBar_Primary:I = 0x7f1303ee
+.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ee
 
-.field public static final Widget_MaterialComponents_ActionBar_PrimarySurface:I = 0x7f1303ef
+.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303ef
 
-.field public static final Widget_MaterialComponents_ActionBar_Solid:I = 0x7f1303f0
+.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f0
 
-.field public static final Widget_MaterialComponents_ActionBar_Surface:I = 0x7f1303f1
+.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f1
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Primary:I = 0x7f1303f2
+.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f2
 
-.field public static final Widget_MaterialComponents_AppBarLayout_PrimarySurface:I = 0x7f1303f3
+.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f3
 
-.field public static final Widget_MaterialComponents_AppBarLayout_Surface:I = 0x7f1303f4
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f4
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox:I = 0x7f1303f5
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f5
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_FilledBox_Dense:I = 0x7f1303f6
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f6
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox:I = 0x7f1303f7
+.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f7
 
-.field public static final Widget_MaterialComponents_AutoCompleteTextView_OutlinedBox_Dense:I = 0x7f1303f8
+.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f8
 
-.field public static final Widget_MaterialComponents_Badge:I = 0x7f1303f9
+.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303f9
 
-.field public static final Widget_MaterialComponents_BottomAppBar:I = 0x7f1303fa
+.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fa
 
-.field public static final Widget_MaterialComponents_BottomAppBar_Colored:I = 0x7f1303fb
+.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fb
 
-.field public static final Widget_MaterialComponents_BottomAppBar_PrimarySurface:I = 0x7f1303fc
+.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fc
 
-.field public static final Widget_MaterialComponents_BottomNavigationView:I = 0x7f1303fd
+.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fd
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_Colored:I = 0x7f1303fe
+.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303fe
 
-.field public static final Widget_MaterialComponents_BottomNavigationView_PrimarySurface:I = 0x7f1303ff
+.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f1303ff
 
-.field public static final Widget_MaterialComponents_BottomSheet:I = 0x7f130400
+.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130400
 
-.field public static final Widget_MaterialComponents_BottomSheet_Modal:I = 0x7f130401
+.field public static final Widget_MaterialComponents_Button:I = 0x7f130401
 
-.field public static final Widget_MaterialComponents_Button:I = 0x7f130402
+.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130402
 
-.field public static final Widget_MaterialComponents_Button_Icon:I = 0x7f130403
+.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130403
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton:I = 0x7f130404
+.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130404
 
-.field public static final Widget_MaterialComponents_Button_OutlinedButton_Icon:I = 0x7f130405
+.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130405
 
-.field public static final Widget_MaterialComponents_Button_TextButton:I = 0x7f130406
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130406
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog:I = 0x7f130407
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130407
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Flush:I = 0x7f130408
+.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130408
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Dialog_Icon:I = 0x7f130409
+.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f130409
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Icon:I = 0x7f13040a
+.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040a
 
-.field public static final Widget_MaterialComponents_Button_TextButton_Snackbar:I = 0x7f13040b
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040b
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton:I = 0x7f13040c
+.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040c
 
-.field public static final Widget_MaterialComponents_Button_UnelevatedButton_Icon:I = 0x7f13040d
+.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040d
 
-.field public static final Widget_MaterialComponents_CardView:I = 0x7f13040e
+.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040e
 
-.field public static final Widget_MaterialComponents_CheckedTextView:I = 0x7f13040f
+.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130413
 
-.field public static final Widget_MaterialComponents_ChipGroup:I = 0x7f130414
+.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f13040f
 
-.field public static final Widget_MaterialComponents_Chip_Action:I = 0x7f130410
+.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130410
 
-.field public static final Widget_MaterialComponents_Chip_Choice:I = 0x7f130411
+.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130411
 
-.field public static final Widget_MaterialComponents_Chip_Entry:I = 0x7f130412
+.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130412
 
-.field public static final Widget_MaterialComponents_Chip_Filter:I = 0x7f130413
+.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130414
 
-.field public static final Widget_MaterialComponents_CompoundButton_CheckBox:I = 0x7f130415
+.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130415
 
-.field public static final Widget_MaterialComponents_CompoundButton_RadioButton:I = 0x7f130416
+.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130416
 
-.field public static final Widget_MaterialComponents_CompoundButton_Switch:I = 0x7f130417
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130417
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton:I = 0x7f130418
+.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130418
 
-.field public static final Widget_MaterialComponents_ExtendedFloatingActionButton_Icon:I = 0x7f130419
+.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f130419
 
-.field public static final Widget_MaterialComponents_FloatingActionButton:I = 0x7f13041a
+.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041a
 
-.field public static final Widget_MaterialComponents_Light_ActionBar_Solid:I = 0x7f13041b
+.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041b
 
-.field public static final Widget_MaterialComponents_MaterialButtonToggleGroup:I = 0x7f13041c
+.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar:I = 0x7f13041d
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041d
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day:I = 0x7f13041e
+.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130421
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_DayTextView:I = 0x7f130422
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041e
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Invalid:I = 0x7f13041f
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f13041f
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Selected:I = 0x7f130420
+.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130420
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Day_Today:I = 0x7f130421
+.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130422
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Fullscreen:I = 0x7f130423
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130423
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderConfirmButton:I = 0x7f130424
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130424
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderDivider:I = 0x7f130425
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130425
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderLayout:I = 0x7f130426
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130426
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection:I = 0x7f130427
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130427
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderSelection_Fullscreen:I = 0x7f130428
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130428
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderTitle:I = 0x7f130429
+.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f130429
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_HeaderToggleButton:I = 0x7f13042a
+.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042a
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Item:I = 0x7f13042b
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042b
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year:I = 0x7f13042c
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042c
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Selected:I = 0x7f13042d
+.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042d
 
-.field public static final Widget_MaterialComponents_MaterialCalendar_Year_Today:I = 0x7f13042e
+.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042e
 
-.field public static final Widget_MaterialComponents_NavigationView:I = 0x7f13042f
+.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f13042f
 
-.field public static final Widget_MaterialComponents_PopupMenu:I = 0x7f130430
+.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130430
 
-.field public static final Widget_MaterialComponents_PopupMenu_ContextMenu:I = 0x7f130431
+.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130431
 
-.field public static final Widget_MaterialComponents_PopupMenu_ListPopupWindow:I = 0x7f130432
+.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130432
 
-.field public static final Widget_MaterialComponents_PopupMenu_Overflow:I = 0x7f130433
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130433
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Determinate:I = 0x7f130434
+.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130434
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Circular_Indeterminate:I = 0x7f130435
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130435
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Determinate:I = 0x7f130436
+.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130436
 
-.field public static final Widget_MaterialComponents_ProgressIndicator_Linear_Indeterminate:I = 0x7f130437
+.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130437
 
-.field public static final Widget_MaterialComponents_ShapeableImageView:I = 0x7f130438
+.field public static final Widget_MaterialComponents_Slider:I = 0x7f130438
 
-.field public static final Widget_MaterialComponents_Slider:I = 0x7f130439
+.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f130439
 
-.field public static final Widget_MaterialComponents_Snackbar:I = 0x7f13043a
+.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043a
 
-.field public static final Widget_MaterialComponents_Snackbar_FullWidth:I = 0x7f13043b
+.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043b
 
-.field public static final Widget_MaterialComponents_Snackbar_TextView:I = 0x7f13043c
+.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043c
 
-.field public static final Widget_MaterialComponents_TabLayout:I = 0x7f13043d
+.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043d
 
-.field public static final Widget_MaterialComponents_TabLayout_Colored:I = 0x7f13043e
+.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043e
 
-.field public static final Widget_MaterialComponents_TabLayout_PrimarySurface:I = 0x7f13043f
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f13043f
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox:I = 0x7f130440
+.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130440
 
-.field public static final Widget_MaterialComponents_TextInputEditText_FilledBox_Dense:I = 0x7f130441
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130441
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox:I = 0x7f130442
+.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130442
 
-.field public static final Widget_MaterialComponents_TextInputEditText_OutlinedBox_Dense:I = 0x7f130443
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130443
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox:I = 0x7f130444
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130444
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense:I = 0x7f130445
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130445
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_Dense_ExposedDropdownMenu:I = 0x7f130446
+.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130446
 
-.field public static final Widget_MaterialComponents_TextInputLayout_FilledBox_ExposedDropdownMenu:I = 0x7f130447
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130447
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox:I = 0x7f130448
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130448
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense:I = 0x7f130449
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f130449
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense_ExposedDropdownMenu:I = 0x7f13044a
+.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044a
 
-.field public static final Widget_MaterialComponents_TextInputLayout_OutlinedBox_ExposedDropdownMenu:I = 0x7f13044b
+.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044b
 
-.field public static final Widget_MaterialComponents_TextView:I = 0x7f13044c
+.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044c
 
-.field public static final Widget_MaterialComponents_Toolbar:I = 0x7f13044d
+.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044d
 
-.field public static final Widget_MaterialComponents_Toolbar_Primary:I = 0x7f13044e
+.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044e
 
-.field public static final Widget_MaterialComponents_Toolbar_PrimarySurface:I = 0x7f13044f
+.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f13044f
 
-.field public static final Widget_MaterialComponents_Toolbar_Surface:I = 0x7f130450
+.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130450
 
-.field public static final Widget_MaterialComponents_Tooltip:I = 0x7f130451
-
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a.smali
index 189875d04a..a74d335793 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a.smali
@@ -29,6 +29,10 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->j:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-direct {p0, p2}, Lf/b/a/c/i;-><init>(Landroid/view/View;)V
@@ -74,11 +78,11 @@
     return-object v0
 
     :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
+    new-instance v0, Ljava/lang/NullPointerException;
 
     const-string v1, "null cannot be cast to non-null type com.facebook.drawee.view.SimpleDraweeView"
 
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali
index b6014c78d5..dc28637b44 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.smali
@@ -118,27 +118,31 @@
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    const/4 v0, 0x0
+    const-string v0, "holder"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    invoke-virtual {v1, p2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->get(I)Lcom/lytefast/flexinput/model/Attachment;
+    invoke-virtual {v0, p2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->get(I)Lcom/lytefast/flexinput/model/Attachment;
 
     move-result-object p2
 
-    if-eqz p2, :cond_1
+    const-string v0, "item"
 
-    instance-of v1, p2, Lcom/lytefast/flexinput/model/Photo;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    instance-of v0, p2, Lcom/lytefast/flexinput/model/Photo;
 
-    move-object v1, p2
+    if-eqz v0, :cond_0
 
-    check-cast v1, Lcom/lytefast/flexinput/model/Photo;
+    move-object v0, p2
 
-    invoke-virtual {p1, v1, v0, v0}, Lf/b/a/c/i;->c(Lcom/lytefast/flexinput/model/Photo;Ljava/lang/Integer;Ljava/lang/Integer;)V
+    check-cast v0, Lcom/lytefast/flexinput/model/Photo;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1, v1}, Lf/b/a/c/i;->c(Lcom/lytefast/flexinput/model/Photo;Ljava/lang/Integer;Ljava/lang/Integer;)V
 
     goto :goto_0
 
@@ -215,26 +219,14 @@
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -256,41 +248,25 @@
 
     const-string v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p0, p1}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;-><init>(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
     invoke-virtual {p1}, Lf/b/a/c/i;->b()V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder.smali
index df6fb042c4..acd42cc96e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder.smali
@@ -20,7 +20,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/adapters/EmptyListAdapter;Landroid/view/View;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -29,6 +29,10 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     invoke-static {p1}, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;->access$getActionBtnId$p(Lcom/lytefast/flexinput/adapters/EmptyListAdapter;)I
@@ -41,7 +45,7 @@
 
     const-string p2, "itemView.findViewById(actionBtnId)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->a:Landroid/view/View;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali
index ca5d7c748e..83897a4b89 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/EmptyListAdapter.smali
@@ -29,7 +29,7 @@
 
 # direct methods
 .method public constructor <init>(IILandroid/view/View$OnClickListener;)V
-    .locals 0
+    .locals 1
     .param p1    # I
         .annotation build Landroidx/annotation/LayoutRes;
         .end annotation
@@ -39,7 +39,9 @@
         .end annotation
     .end param
 
-    if-eqz p3, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -50,15 +52,6 @@
     iput-object p3, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;->onClickListener:Landroid/view/View$OnClickListener;
 
     return-void
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final synthetic access$getActionBtnId$p(Lcom/lytefast/flexinput/adapters/EmptyListAdapter;)I
@@ -92,7 +85,9 @@
 .method public onBindViewHolder(Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;I)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    const-string p2, "holder"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p1, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->a:Landroid/view/View;
 
@@ -101,15 +96,6 @@
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -125,7 +111,9 @@
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -147,18 +135,9 @@
 
     const-string v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p0, p1}, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;-><init>(Lcom/lytefast/flexinput/adapters/EmptyListAdapter;Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a.smali
index fcc8b77bbc..cadd9ce378 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a.smali
@@ -34,7 +34,11 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/adapters/FileListAdapter;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "adapter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroid/os/AsyncTask;-><init>()V
 
@@ -81,7 +85,9 @@
 
     check-cast p1, [Ljava/io/File;
 
-    if-eqz p1, :cond_3
+    const-string v0, "rootFiles"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -118,7 +124,7 @@
 
     const-string v3, "file"
 
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/io/File;->isHidden()Z
 
@@ -161,22 +167,21 @@
 
     invoke-direct {v0}, Lf/b/a/c/f;-><init>()V
 
-    new-instance v2, Lj0/j/b;
+    const-string v2, "$this$then"
 
-    invoke-direct {v2, p1, v0}, Lj0/j/b;-><init>(Ljava/util/Comparator;Ljava/util/Comparator;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "comparator"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lk0/k/b;
+
+    invoke-direct {v2, p1, v0}, Lk0/k/b;-><init>(Ljava/util/Comparator;Ljava/util/Comparator;)V
 
     invoke-static {v1, v2}, Lf/n/a/k/a;->sortWith(Ljava/util/List;Ljava/util/Comparator;)V
 
     return-object v1
-
-    :cond_3
-    const-string p1, "rootFiles"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onPostExecute(Ljava/lang/Object;)V
@@ -184,7 +189,9 @@
 
     check-cast p1, Ljava/util/List;
 
-    if-eqz p1, :cond_0
+    const-string v0, "files"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a;->a:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
@@ -193,13 +200,4 @@
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_0
-    const-string p1, "files"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$a.smali
index d961e3fac4..2f5fdc7a30 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$a.smali
@@ -60,7 +60,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->d(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c(Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -69,7 +69,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v0, v1, v2}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c(Ljava/lang/Object;I)V
+    invoke-virtual {v0, v1, v2}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->b(Ljava/lang/Object;I)V
 
     const/4 v3, 0x1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$b.smali
index e094480189..78e3bda98d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b$b.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/lytefast/flexinput/adapters/FileListAdapter$b$b;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FileListAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/AnimatorSet;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -49,7 +49,9 @@
 .method public final a(Landroid/animation/AnimatorSet;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "animation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/AnimatorSet;->start()V
 
@@ -61,15 +63,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "animation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b.smali
index 3f957aab77..2a7fd8a47e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$b.smali
@@ -52,6 +52,10 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->h:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-direct {p0, p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
@@ -64,7 +68,7 @@
 
     const-string v0, "itemView.findViewById(R.id.thumb_iv)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -78,7 +82,7 @@
 
     const-string v0, "itemView.findViewById(R.id.type_iv)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -92,7 +96,7 @@
 
     const-string v0, "itemView.findViewById(R.id.file_name_tv)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -106,7 +110,7 @@
 
     const-string v0, "itemView.findViewById(R.id.file_subtitle_tv)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/TextView;
 
@@ -116,7 +120,7 @@
 
     const-string v0, "this.itemView"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -175,16 +179,16 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -430,7 +434,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Landroid/view/View;->setSelected(Z)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali
index 3d13f17ede..c4086500fa 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter.smali
@@ -52,7 +52,7 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -65,30 +65,31 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "selectionCoordinator"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->c:Landroid/content/ContentResolver;
 
+    const-string p1, "adapter"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p0, p2, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->a:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     iput-object p2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
 
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->b:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string p1, "selectionCoordinator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -110,37 +111,39 @@
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
-    const/4 v0, 0x0
+    const-string v0, "holder"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->b:Ljava/util/List;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->b:Ljava/util/List;
 
-    invoke-interface {v1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object p2
 
     check-cast p2, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz p2, :cond_b
+    const-string v0, "fileAttachment"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->g:Lcom/lytefast/flexinput/model/Attachment;
 
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->h:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->h:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getAdapterPosition()I
 
-    move-result v2
-
-    invoke-virtual {v1, p2, v2}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->a(Ljava/lang/Object;I)Z
-
     move-result v1
 
-    const/4 v2, 0x0
+    invoke-virtual {v0, p2, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->a(Ljava/lang/Object;I)Z
 
-    invoke-virtual {p1, v1, v2}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->b(ZZ)V
+    move-result v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->b(ZZ)V
 
     invoke-virtual {p2}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object;
 
@@ -148,17 +151,23 @@
 
     check-cast p2, Ljava/io/File;
 
+    const/4 v0, 0x0
+
     if-eqz p2, :cond_2
 
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->e:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->e:Landroid/widget/TextView;
 
     invoke-virtual {p2}, Ljava/io/File;->getName()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->f:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->f:Landroid/widget/TextView;
+
+    const-string v3, "$this$getFileSize"
+
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/io/File;->length()J
 
@@ -231,35 +240,35 @@
     move-result-object v3
 
     :goto_0
-    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     goto :goto_1
 
     :cond_2
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->e:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->e:Landroid/widget/TextView;
 
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->f:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->f:Landroid/widget/TextView;
 
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :goto_1
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->c:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->c:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-virtual {v1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
+    invoke-virtual {v2}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
 
     move-result-object v3
 
-    invoke-virtual {v1, v0, v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;Ljava/lang/Object;)V
+    invoke-virtual {v2, v0, v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;Ljava/lang/Object;)V
 
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
 
     const/16 v3, 0x8
 
-    invoke-virtual {v1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {v2, v3}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    const/4 v1, 0x1
+    const/4 v2, 0x1
 
     if-eqz p2, :cond_4
 
@@ -273,17 +282,17 @@
 
     const-string v4, "fileName"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/16 v4, 0x2e
 
     const/4 v5, 0x6
 
-    invoke-static {v3, v4, v2, v2, v5}, Lj0/t/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
+    invoke-static {v3, v4, v1, v1, v5}, Lk0/u/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
 
     move-result v4
 
-    add-int/2addr v4, v1
+    add-int/2addr v4, v2
 
     invoke-virtual {v3, v4}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
@@ -291,7 +300,7 @@
 
     const-string v4, "(this as java.lang.String).substring(startIndex)"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v3}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -325,16 +334,16 @@
     goto :goto_3
 
     :cond_5
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     :cond_6
     :goto_3
-    if-eqz v1, :cond_7
+    if-eqz v2, :cond_7
 
     goto :goto_4
 
     :cond_7
-    iget-object v1, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->c:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->c:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-static {p2}, Landroid/net/Uri;->fromFile(Ljava/io/File;)Landroid/net/Uri;
 
@@ -346,13 +355,13 @@
 
     move-result-object v4
 
-    invoke-virtual {v1, v3, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;Ljava/lang/Object;)V
+    invoke-virtual {v2, v3, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;Ljava/lang/Object;)V
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
     const-string v3, "image"
 
-    invoke-static {v0, v3, v2, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v0, v3, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v3
 
@@ -360,13 +369,13 @@
 
     iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
 
-    sget v1, Lcom/lytefast/flexinput/R$d;->ic_image_24dp:I
+    sget v2, Lcom/lytefast/flexinput/R$d;->ic_image_24dp:I
 
-    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
     iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
 
-    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
     invoke-virtual {p1, p2}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->a(Ljava/io/File;)V
 
@@ -375,7 +384,7 @@
     :cond_8
     const-string v3, "video"
 
-    invoke-static {v0, v3, v2, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v0, v3, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v3
 
@@ -383,13 +392,13 @@
 
     iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
 
-    sget v1, Lcom/lytefast/flexinput/R$d;->ic_movie_24dp:I
+    sget v2, Lcom/lytefast/flexinput/R$d;->ic_movie_24dp:I
 
-    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
     iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
 
-    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
     invoke-virtual {p1, p2}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->a(Ljava/io/File;)V
 
@@ -398,7 +407,7 @@
     :cond_9
     const-string v3, "audio"
 
-    invoke-static {v0, v3, v2, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v0, v3, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v0
 
@@ -406,33 +415,19 @@
 
     iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
 
-    sget v1, Lcom/lytefast/flexinput/R$d;->ic_audio_24dp:I
+    sget v2, Lcom/lytefast/flexinput/R$d;->ic_audio_24dp:I
 
-    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
     iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->d:Landroid/widget/ImageView;
 
-    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
     invoke-virtual {p1, p2}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->a(Ljava/io/File;)V
 
     :cond_a
     :goto_4
     return-void
-
-    :cond_b
-    const-string p1, "fileAttachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;ILjava/util/List;)V
@@ -440,52 +435,58 @@
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
-    const/4 v0, 0x0
+    const-string v0, "holder"
 
-    if-eqz p3, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "payloads"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
     :cond_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    const/4 v2, 0x0
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    if-eqz v1, :cond_1
 
-    move-result-object v2
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    instance-of v3, v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
+    move-result-object v1
+
+    instance-of v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
 
     if-eqz v3, :cond_0
 
     goto :goto_0
 
     :cond_1
-    move-object v2, v0
+    move-object v1, v2
 
     :goto_0
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
-    instance-of v1, v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
+    instance-of v0, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
     goto :goto_1
 
     :cond_2
-    move-object v0, v2
+    move-object v2, v1
 
     :goto_1
-    check-cast v0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
+    check-cast v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
 
-    if-eqz v0, :cond_3
+    if-eqz v2, :cond_3
 
-    iget-boolean p2, v0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;->b:Z
+    iget-boolean p2, v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;->b:Z
 
     const/4 p3, 0x1
 
@@ -498,19 +499,14 @@
 
     :goto_2
     return-void
-
-    :cond_4
-    const-string p1, "payloads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -532,18 +528,9 @@
 
     const-string v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p0, p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;-><init>(Lcom/lytefast/flexinput/adapters/FileListAdapter;Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali
index e6e0b07821..920c3dbba5 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "PhotoCursorAdapter.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/animation/AnimatorSet;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -49,7 +49,9 @@
 .method public final a(Landroid/animation/AnimatorSet;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "animation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/animation/AnimatorSet;->start()V
 
@@ -61,15 +63,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "animation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali
index 048338fdeb..438367c7c7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$a.smali
@@ -40,6 +40,10 @@
         }
     .end annotation
 
+    const-string v0, "itemView"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->n:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-direct {p0, p2}, Lf/b/a/c/i;-><init>(Landroid/view/View;)V
@@ -52,7 +56,7 @@
 
     const-string v0, "itemView.findViewById(R.id.item_check_indicator)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -115,16 +119,16 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
@@ -144,7 +148,7 @@
 
     const-string v1, "itemView.findViewById(R.id.content_iv)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -158,7 +162,7 @@
 
     const-string v1, "itemView"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1}, Landroid/view/View;->setSelected(Z)V
 
@@ -225,48 +229,43 @@
 .method public onClick(Landroid/view/View;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "v"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->n:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     iget-object p1, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->k:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;->k:Lcom/lytefast/flexinput/model/Photo;
 
     invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getAdapterPosition()I
 
-    move-result v2
+    move-result v1
 
     if-eqz p1, :cond_2
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->d(Ljava/lang/Object;)Z
+    invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c(Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v2
 
-    if-eqz v0, :cond_1
+    if-eqz v2, :cond_1
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p1, v1, v2}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c(Ljava/lang/Object;I)V
+    invoke-virtual {p1, v0, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->b(Ljava/lang/Object;I)V
 
     :goto_0
     return-void
 
     :cond_2
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_3
-    const-string p1, "v"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b.smali
index 6427b0296a..21634436cd 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b.smali
@@ -41,7 +41,9 @@
 .method public onQueryComplete(ILjava/lang/Object;Landroid/database/Cursor;)V
     .locals 0
 
-    if-eqz p2, :cond_1
+    const-string p1, "cookie"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-nez p3, :cond_0
 
@@ -81,13 +83,4 @@
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 
     return-void
-
-    :cond_1
-    const-string p1, "cookie"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
index 596cc2e77c..69feef47b8 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
@@ -46,7 +46,7 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/utils/SelectionCoordinator;II)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -57,7 +57,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "selectionCoordinator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -65,6 +67,10 @@
 
     iput p3, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->g:I
 
+    const-string p2, "adapter"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p0, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->a:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
@@ -74,15 +80,6 @@
     invoke-virtual {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->setHasStableIds(Z)V
 
     return-void
-
-    :cond_0
-    const-string p1, "selectionCoordinator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -116,7 +113,7 @@
 
     const-string v1, "fileUri"
 
-    invoke-static {v4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->e:I
 
@@ -158,35 +155,39 @@
 .end method
 
 .method public final b(Landroid/content/ContentResolver;)V
-    .locals 8
+    .locals 9
 
-    new-instance v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
+    const-string v0, "contentResolver"
 
-    invoke-direct {v0, p0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;-><init>(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Landroid/content/ContentResolver;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x1
+    new-instance v1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
-    sget-object v3, Landroid/provider/MediaStore$Images$Media;->EXTERNAL_CONTENT_URI:Landroid/net/Uri;
+    invoke-direct {v1, p0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;-><init>(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Landroid/content/ContentResolver;)V
+
+    sget-object v4, Landroid/provider/MediaStore$Images$Media;->EXTERNAL_CONTENT_URI:Landroid/net/Uri;
 
     const-string p1, "_id"
 
-    const-string v2, "_data"
+    const-string v0, "_data"
 
-    const-string v4, "_display_name"
+    const-string v2, "_display_name"
 
-    filled-new-array {p1, v2, v4}, [Ljava/lang/String;
+    filled-new-array {p1, v0, v2}, [Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v5
 
-    const/4 v5, 0x0
+    const/4 v2, 0x1
 
     const/4 v6, 0x0
 
-    const-string v7, "date_added DESC"
+    const/4 v7, 0x0
 
-    move-object v2, p0
+    const-string v8, "date_added DESC"
 
-    invoke-virtual/range {v0 .. v7}, Landroid/content/AsyncQueryHandler;->startQuery(ILjava/lang/Object;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V
+    move-object v3, p0
+
+    invoke-virtual/range {v1 .. v8}, Landroid/content/AsyncQueryHandler;->startQuery(ILjava/lang/Object;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
@@ -236,6 +237,10 @@
 .method public onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 1
 
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
@@ -244,7 +249,7 @@
 
     const-string v0, "recyclerView.context"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -252,7 +257,7 @@
 
     const-string v0, "recyclerView.context.contentResolver"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->b(Landroid/content/ContentResolver;)V
 
@@ -264,7 +269,9 @@
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
-    if-eqz p1, :cond_1
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p2}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->a(I)Lcom/lytefast/flexinput/model/Photo;
 
@@ -310,15 +317,6 @@
     invoke-virtual {p1, p2, v0, v1}, Lf/b/a/c/i;->c(Lcom/lytefast/flexinput/model/Photo;Ljava/lang/Integer;Ljava/lang/Integer;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;ILjava/util/List;)V
@@ -326,52 +324,58 @@
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
-    const/4 v0, 0x0
+    const-string v0, "holder"
 
-    if-eqz p3, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "payloads"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v0
 
     :cond_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_1
+    const/4 v2, 0x0
 
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    if-eqz v1, :cond_1
 
-    move-result-object v2
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    instance-of v3, v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
+    move-result-object v1
+
+    instance-of v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
 
     if-eqz v3, :cond_0
 
     goto :goto_0
 
     :cond_1
-    move-object v2, v0
+    move-object v1, v2
 
     :goto_0
-    if-eqz v2, :cond_3
+    if-eqz v1, :cond_3
 
-    instance-of v1, v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
+    instance-of v0, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
 
-    if-nez v1, :cond_2
+    if-nez v0, :cond_2
 
     goto :goto_1
 
     :cond_2
-    move-object v0, v2
+    move-object v2, v1
 
     :goto_1
-    check-cast v0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
+    check-cast v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;
 
-    if-eqz v0, :cond_3
+    if-eqz v2, :cond_3
 
-    iget-boolean p2, v0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;->b:Z
+    iget-boolean p2, v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;->b:Z
 
     const/4 p3, 0x1
 
@@ -384,19 +388,14 @@
 
     :goto_2
     return-void
-
-    :cond_4
-    const-string p1, "payloads"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
 
@@ -418,25 +417,20 @@
 
     const-string v0, "view"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p2, p0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;-><init>(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Landroid/view/View;)V
 
     return-object p2
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onDetachedFromRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
     .locals 1
 
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->b:Landroid/database/Cursor;
 
     if-eqz v0, :cond_0
@@ -450,24 +444,17 @@
 .end method
 
 .method public onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
-    if-eqz p1, :cond_0
+    const-string v0, "holder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 
     invoke-virtual {p1}, Lf/b/a/c/i;->b()V
 
     return-void
-
-    :cond_0
-    const-string p1, "holder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c$a.smali
index 969f7959c9..09b7581b60 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$c$a.smali
@@ -55,7 +55,7 @@
 
     const-string v0, "getString(R.string.permission_media_denied)"
 
-    invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
index 3a12370846..f9c200658d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
@@ -131,7 +131,7 @@
 
     const-string v3, "Intent(MediaStore.ACTION\u2026ANT_WRITE_URI_PERMISSION)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -298,14 +298,14 @@
     :cond_2
     const-string v0, "cameraView"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 
     :cond_3
     const-string v0, "cameraFacingBtn"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v1
 .end method
@@ -439,22 +439,22 @@
     return-void
 
     :cond_7
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_8
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_9
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 
     :cond_a
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v2
 .end method
@@ -533,7 +533,7 @@
 
     const-string p3, "getString(R.string.camera_intent_result_error)"
 
-    invoke-static {p2, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -603,7 +603,9 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string p3, "inflater"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget p3, Lcom/lytefast/flexinput/R$f;->fragment_camera:I
 
@@ -614,15 +616,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onResume()V
@@ -711,7 +704,7 @@
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -726,17 +719,17 @@
     goto :goto_2
 
     :cond_2
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
     :cond_3
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
     :cond_4
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
@@ -794,7 +787,7 @@
 
     const-string v1, "view.findViewById<TextVi\u2026ermissions_required_text)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Landroid/widget/TextView;
 
@@ -806,9 +799,9 @@
 
     const-string v2, "getString(R.string.syste\u2026ermission_request_camera)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lf/a/j/a/b/g;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+    invoke-static {v1}, Lf/a/j/a/b/h;->b(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
     move-result-object v1
 
@@ -817,12 +810,12 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
     :cond_7
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
@@ -838,17 +831,17 @@
     return-void
 
     :cond_a
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
     :cond_b
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
     :cond_c
-    invoke-static {v3}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v3}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 .end method
@@ -856,9 +849,9 @@
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1, p2}, Landroidx/fragment/app/Fragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 
@@ -868,9 +861,9 @@
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.permissions_view_stub)"
+    const-string v0, "view.findViewById(R.id.permissions_view_stub)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/ViewStub;
 
@@ -882,9 +875,9 @@
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.camera_container)"
+    const-string v0, "view.findViewById(R.id.camera_container)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment;->d:Landroid/view/View;
 
@@ -894,9 +887,9 @@
 
     move-result-object p2
 
-    const-string v1, "view.findViewById(R.id.camera_view)"
+    const-string v0, "view.findViewById(R.id.camera_view)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/otaliastudios/cameraview/CameraView;
 
@@ -904,12 +897,14 @@
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getViewLifecycleOwner()Landroidx/lifecycle/LifecycleOwner;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p2, v1}, Lcom/otaliastudios/cameraview/CameraView;->setLifecycleOwner(Landroidx/lifecycle/LifecycleOwner;)V
+    invoke-virtual {p2, v0}, Lcom/otaliastudios/cameraview/CameraView;->setLifecycleOwner(Landroidx/lifecycle/LifecycleOwner;)V
 
     iget-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment;->e:Lcom/otaliastudios/cameraview/CameraView;
 
+    const/4 v0, 0x0
+
     if-eqz p2, :cond_5
 
     new-instance v1, Lcom/lytefast/flexinput/fragment/CameraFragment$d;
@@ -928,7 +923,7 @@
 
     const-string v1, "view.findViewById(R.id.take_photo_btn)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/ImageView;
 
@@ -956,7 +951,7 @@
 
     const-string v1, "view.findViewById(R.id.launch_camera_btn)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/ImageView;
 
@@ -1000,7 +995,7 @@
 
     const-string v1, "view.findViewById(R.id.camera_flash_btn)"
 
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/ImageView;
 
@@ -1032,7 +1027,7 @@
 
     const-string p2, "view.findViewById(R.id.camera_facing_btn)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Landroid/widget/ImageView;
 
@@ -1061,45 +1056,38 @@
     :cond_0
     const-string p1, "cameraFacingBtn"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1
     const-string p1, "cameraFlashBtn"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_3
-    invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_4
     const-string p1, "takePhotoBtn"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_5
     const-string p1, "cameraView"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$b.smali
index 24891651f3..fa016feadd 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$b.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/lytefast/flexinput/fragment/FilesFragment$b;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "FilesFragment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -28,49 +28,33 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/fragment/FilesFragment;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x0
+    const-class v3, Lcom/lytefast/flexinput/fragment/FilesFragment;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x0
+
+    const-string v4, "loadDownloadFolder"
+
+    const-string v5, "loadDownloadFolder()V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "loadDownloadFolder"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/lytefast/flexinput/fragment/FilesFragment;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "loadDownloadFolder()V"
-
-    return-object v0
-.end method
-
 .method public invoke()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/lytefast/flexinput/fragment/FilesFragment;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$c.smali
index 3ede01cdde..3595502029 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment$c.smali
@@ -48,13 +48,13 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
     iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->a:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
@@ -64,7 +64,7 @@
 
     move-result-object v3
 
-    if-eqz v3, :cond_1
+    invoke-static {v3}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-direct {v2, v0, v3}, Lcom/lytefast/flexinput/adapters/FileListAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
@@ -91,17 +91,7 @@
 
     invoke-static {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->access$loadDownloadFolder(Lcom/lytefast/flexinput/fragment/FilesFragment;)V
 
-    goto :goto_0
-
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2
-    :goto_0
     return-void
 .end method
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
index 54a1784f4c..e26b22a063 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
@@ -111,78 +111,60 @@
 .end method
 
 .method private final loadDownloadFolder()V
-    .locals 5
+    .locals 4
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->adapter:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     const/4 v1, 0x0
 
-    const/4 v2, 0x0
-
-    if-nez v0, :cond_1
+    if-nez v0, :cond_0
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->swipeRefreshLayout:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0, v1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setRefreshing(Z)V
 
     return-void
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_1
     sget-object v0, Landroid/os/Environment;->DIRECTORY_DOWNLOADS:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v0
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->adapter:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->adapter:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
-    if-eqz v3, :cond_4
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    const-string v4, "downloadFolder"
+    const-string v3, "downloadFolder"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v3, :cond_3
+    const-string v3, "root"
 
-    new-instance v4, Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v4, v3}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a;-><init>(Lcom/lytefast/flexinput/adapters/FileListAdapter;)V
+    new-instance v3, Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
 
-    const/4 v3, 0x1
+    invoke-direct {v3, v2}, Lcom/lytefast/flexinput/adapters/FileListAdapter$a;-><init>(Lcom/lytefast/flexinput/adapters/FileListAdapter;)V
 
-    new-array v3, v3, [Ljava/io/File;
+    const/4 v2, 0x1
 
-    aput-object v0, v3, v1
+    new-array v2, v2, [Ljava/io/File;
 
-    invoke-virtual {v4, v3}, Landroid/os/AsyncTask;->execute([Ljava/lang/Object;)Landroid/os/AsyncTask;
+    aput-object v0, v2, v1
+
+    invoke-virtual {v3, v2}, Landroid/os/AsyncTask;->execute([Ljava/lang/Object;)Landroid/os/AsyncTask;
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->swipeRefreshLayout:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 
-    if-eqz v0, :cond_2
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0, v1}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setRefreshing(Z)V
 
     return-void
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_3
-    throw v2
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
 .end method
 
 .method private final requestPermissions()V
@@ -224,7 +206,9 @@
 .method public newPermissionsRequestAdapter(Landroid/view/View$OnClickListener;)Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
 
@@ -235,87 +219,72 @@
     invoke-direct {v0, v1, v2, p1}, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;-><init>(IILandroid/view/View$OnClickListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 2
 
-    const/4 p3, 0x0
+    const-string p3, "inflater"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    new-instance p3, Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x3
 
-    invoke-direct {v0, p3, p3, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(Landroidx/collection/ArrayMap;Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;I)V
+    invoke-direct {p3, v0, v0, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(Landroidx/collection/ArrayMap;Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;I)V
 
-    iput-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
 
-    move-result-object v0
+    move-result-object p3
 
-    if-eqz v0, :cond_0
+    if-eqz p3, :cond_0
 
-    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
+    invoke-virtual {p3}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
 
-    move-result-object v0
+    move-result-object p3
 
     goto :goto_0
 
     :cond_0
-    move-object v0, p3
+    move-object p3, v0
 
     :goto_0
-    instance-of v1, v0, Lf/b/a/b;
+    instance-of v1, p3, Lf/b/a/b;
 
     if-nez v1, :cond_1
 
-    move-object v0, p3
+    move-object p3, v0
 
     :cond_1
-    check-cast v0, Lf/b/a/b;
+    check-cast p3, Lf/b/a/b;
 
-    if-eqz v0, :cond_3
+    if-eqz p3, :cond_2
 
-    invoke-interface {v0}, Lf/b/a/b;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lf/b/a/b;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    move-result-object v0
+    move-result-object p3
 
     iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    if-eqz v1, :cond_2
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v0, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
-
-    goto :goto_1
+    invoke-virtual {p3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p3
-
-    :cond_3
-    :goto_1
-    sget v0, Lcom/lytefast/flexinput/R$f;->fragment_recycler_view:I
+    sget p3, Lcom/lytefast/flexinput/R$f;->fragment_recycler_view:I
 
     const/4 v1, 0x0
 
-    invoke-virtual {p1, v0, p2, v1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {p1, p3, p2, v1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
-    if-eqz p1, :cond_8
+    if-eqz p1, :cond_6
 
     sget p2, Lcom/lytefast/flexinput/R$e;->list:I
 
@@ -337,51 +306,46 @@
 
     move-result p2
 
-    if-eqz p2, :cond_5
+    if-eqz p2, :cond_3
 
     new-instance p2, Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v0
+    move-result-object p3
 
-    const-string v1, "context"
+    const-string v0, "context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+    invoke-virtual {p3}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
-    move-result-object v0
+    move-result-object p3
 
-    const-string v1, "context.contentResolver"
+    const-string v0, "context.contentResolver"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    if-eqz v1, :cond_4
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-direct {p2, v0, v1}, Lcom/lytefast/flexinput/adapters/FileListAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
+    invoke-direct {p2, p3, v0}, Lcom/lytefast/flexinput/adapters/FileListAdapter;-><init>(Landroid/content/ContentResolver;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->adapter:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    if-eqz p3, :cond_6
+    if-eqz p3, :cond_4
 
     invoke-virtual {p3, p2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
-    goto :goto_2
+    goto :goto_1
 
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p3
-
-    :cond_5
+    :cond_3
     iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    if-eqz p2, :cond_6
+    if-eqz p2, :cond_4
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FilesFragment$a;
 
@@ -393,8 +357,8 @@
 
     invoke-virtual {p2, p3}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
-    :cond_6
-    :goto_2
+    :cond_4
+    :goto_1
     sget p2, Lcom/lytefast/flexinput/R$e;->swipeRefreshLayout:I
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -405,7 +369,7 @@
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FilesFragment;->swipeRefreshLayout:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 
-    if-eqz p2, :cond_7
+    if-eqz p2, :cond_5
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FilesFragment$b;
 
@@ -417,18 +381,11 @@
 
     invoke-virtual {p2, v0}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setOnRefreshListener(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;)V
 
-    :cond_7
-    move-object p3, p1
+    :cond_5
+    move-object v0, p1
 
-    :cond_8
-    return-object p3
-
-    :cond_9
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
+    :cond_6
+    return-object v0
 .end method
 
 .method public onDestroyView()V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$c.smali
index 6763568e51..ea84b9ef74 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$c.smali
@@ -1,5 +1,5 @@
 .class public final Lcom/lytefast/flexinput/fragment/FlexInputFragment$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/text/Editable;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,33 +51,28 @@
 
     check-cast p1, Landroid/text/Editable;
 
-    const/4 v0, 0x0
+    const-string v0, "it"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$c;->this$0:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$c;->this$0:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->y:Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->y:Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
     invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
     move-result-object p1
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    invoke-static {v1, p1, v0, v2, v0}, Lf/h/a/c/i1/e;->g1(Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;Ljava/lang/String;Ljava/lang/Boolean;ILjava/lang/Object;)V
+    const/4 v2, 0x0
+
+    invoke-static {v0, p1, v2, v1, v2}, Lf/h/a/c/i1/e;->g1(Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;Ljava/lang/String;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     :cond_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali
index b6ab612f9d..53ea04b64a 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$d.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/lytefast/flexinput/fragment/FlexInputFragment$d;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/lytefast/flexinput/viewmodel/FlexInputState;",
         "Lkotlin/Unit;",
@@ -29,53 +29,39 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "configureUI"
+
+    const-string v5, "configureUI(Lcom/lytefast/flexinput/viewmodel/FlexInputState;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "configureUI(Lcom/lytefast/flexinput/viewmodel/FlexInputState;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
     check-cast p1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -84,13 +70,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$e.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$e.smali
index c4d9476d0b..0a90134580 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$e.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$e.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lcom/lytefast/flexinput/fragment/FlexInputFragment$e;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lf/b/a/f/a;",
         "Lkotlin/Unit;",
@@ -29,53 +29,39 @@
 
 # direct methods
 .method public constructor <init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
-    .locals 1
+    .locals 7
 
-    const/4 v0, 0x1
+    const-class v3, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-direct {p0, v0, p1}, Lj0/n/c/g;-><init>(ILjava/lang/Object;)V
+    const/4 v1, 0x1
+
+    const-string v4, "handleEvent"
+
+    const-string v5, "handleEvent(Lcom/lytefast/flexinput/viewmodel/FlexInputEvent;)V"
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/h;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "handleEvent(Lcom/lytefast/flexinput/viewmodel/FlexInputEvent;)V"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 1
 
     check-cast p1, Lf/b/a/f/a;
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
 
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
 
     check-cast v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -84,13 +70,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
index 473e312b10..4eb511a289 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
@@ -105,7 +105,7 @@
 
     const-string v1, "FlexInputFragment::class.java.name"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->D:Ljava/lang/String;
 
@@ -139,7 +139,7 @@
 
     const-string v1, "childFragmentManager.beginTransaction()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lf/b/a/a/a;
 
@@ -182,6 +182,10 @@
 
     invoke-direct {p1, p0}, Lf/b/a/a/g;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
 
+    const-string v0, "listener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, v1, Lf/b/a/a/a;->j:Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
 
     if-eqz v0, :cond_3
@@ -219,6 +223,10 @@
 
     invoke-direct {p1, p0}, Lf/b/a/a/i;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
 
+    const-string p0, "onKeyboardSelectedListener"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object p1, v1, Lf/b/a/a/a;->i:Lkotlin/jvm/functions/Function1;
 
     :goto_0
@@ -271,7 +279,7 @@
 
     iget-object v7, p1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->a:Ljava/lang/String;
 
-    invoke-static {v5, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v5, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v5
 
@@ -304,12 +312,12 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_2
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
@@ -377,7 +385,7 @@
 
     if-eqz v5, :cond_9
 
-    invoke-static {v5}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v5}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object v5
 
@@ -415,11 +423,11 @@
     goto :goto_5
 
     :cond_9
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string p1, "null cannot be cast to non-null type kotlin.CharSequence"
 
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 
@@ -681,83 +689,83 @@
     :cond_17
     const-string p0, "cannotSendText"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_18
     const-string p0, "leftBtnsContainer"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_19
     const-string p0, "attachmentPreviewContainer"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1a
-    invoke-static {v10}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v10}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1b
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string p1, "null cannot be cast to non-null type android.widget.RelativeLayout.LayoutParams"
 
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 
     :cond_1c
-    invoke-static {v10}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v10}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1d
-    invoke-static {v10}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v10}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1e
-    invoke-static {v10}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v10}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_1f
     const-string p0, "sendBtnImage"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_20
     const-string p0, "galleryBtn"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_21
     const-string p0, "cameraBtn"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_22
     const-string p0, "expandBtn"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_23
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
@@ -777,7 +785,7 @@
     :cond_0
     const-string p0, "defaultWindowInsetsHandler"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -796,7 +804,7 @@
     :cond_0
     const-string p0, "expressionBtn"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -815,7 +823,7 @@
     :cond_0
     const-string p0, "expressionContainer"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -892,7 +900,7 @@
     :cond_2
     const-string p0, "inputEt"
 
-    invoke-static {p0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
@@ -990,7 +998,7 @@
     :cond_0
     const-string v0, "attachmentPreviewAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1009,39 +1017,41 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "attachment"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "Add Content"
+    const-string v1, "Add Content"
 
-    invoke-virtual {v1, v2}, Landroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+    invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
 
-    move-result-object v1
+    move-result-object v0
 
-    check-cast v1, Landroidx/fragment/app/DialogFragment;
+    check-cast v0, Landroidx/fragment/app/DialogFragment;
 
-    new-instance v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    new-instance v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x3
 
-    invoke-direct {v2, v0, v0, v3}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(Landroidx/collection/ArrayMap;Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;I)V
+    invoke-direct {v1, v2, v2, v3}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(Landroidx/collection/ArrayMap;Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;I)V
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object v3
 
-    invoke-virtual {v3, v2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
+    invoke-virtual {v3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
     const/4 v3, 0x0
 
-    invoke-virtual {v2, p1, v3}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c(Ljava/lang/Object;I)V
+    invoke-virtual {v1, p1, v3}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->b(Ljava/lang/Object;I)V
 
-    iget-object p1, v2, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object p1, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     invoke-interface {p1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;->unregister()V
 
@@ -1051,40 +1061,33 @@
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getAttachments()Ljava/util/ArrayList;
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getAttachments()Ljava/util/ArrayList;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-interface {p1, v2}, Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;->onAttachmentsUpdated(Ljava/util/List;)V
+    invoke-interface {p1, v1}, Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;->onAttachmentsUpdated(Ljava/util/List;)V
 
     :cond_0
     iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->k:Landroidx/recyclerview/widget/RecyclerView;
 
     if-eqz p1, :cond_1
 
-    new-instance v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$b;
+    new-instance v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$b;
 
-    invoke-direct {v0, v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$b;-><init>(Landroidx/fragment/app/DialogFragment;)V
+    invoke-direct {v1, v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$b;-><init>(Landroidx/fragment/app/DialogFragment;)V
 
-    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->post(Ljava/lang/Runnable;)Z
+    invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->post(Ljava/lang/Runnable;)Z
 
     return-void
 
     :cond_1
     const-string p1, "attachmentPreviewList"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_2
-    const-string p1, "attachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw v2
 .end method
 
 .method public getFileManager()Lcom/lytefast/flexinput/managers/FileManager;
@@ -1099,7 +1102,7 @@
     :cond_0
     const-string v0, "fileManager"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1117,6 +1120,10 @@
         }
     .end annotation
 
+    const-string v0, "onViewCreatedUpdate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->d:Landroid/view/ViewGroup;
 
     if-eqz v0, :cond_0
@@ -1146,7 +1153,7 @@
     :cond_0
     const-string v0, "inputEt"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -1156,15 +1163,15 @@
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 12
 
-    const/4 p3, 0x0
+    const-string p3, "inflater"
 
-    if-eqz p1, :cond_13
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget v0, Lcom/lytefast/flexinput/R$f;->flex_input_widget:I
+    sget p3, Lcom/lytefast/flexinput/R$f;->flex_input_widget:I
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p1, v0, p2, v1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {p1, p3, p2, v0}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
@@ -1178,9 +1185,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026chment_preview_container)"
+    const-string p3, "root.findViewById(R.id.f\u2026chment_preview_container)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->f:Landroid/view/View;
 
@@ -1190,9 +1197,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026put_attachment_clear_btn)"
+    const-string p3, "root.findViewById(R.id.f\u2026put_attachment_clear_btn)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->g:Landroid/view/View;
 
@@ -1202,9 +1209,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026put_main_input_container)"
+    const-string p3, "root.findViewById(R.id.f\u2026put_main_input_container)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/ViewGroup;
 
@@ -1216,9 +1223,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026xpression_tray_container)"
+    const-string p3, "root.findViewById(R.id.f\u2026xpression_tray_container)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/ViewGroup;
 
@@ -1230,9 +1237,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026lt_window_insets_handler)"
+    const-string p3, "root.findViewById(R.id.f\u2026lt_window_insets_handler)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->j:Landroid/view/View;
 
@@ -1242,9 +1249,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026_attachment_preview_list)"
+    const-string p3, "root.findViewById(R.id.f\u2026_attachment_preview_list)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroidx/recyclerview/widget/RecyclerView;
 
@@ -1256,9 +1263,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.flex_input_container)"
+    const-string p3, "root.findViewById(R.id.flex_input_container)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/ViewGroup;
 
@@ -1270,9 +1277,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026nput_left_btns_container)"
+    const-string p3, "root.findViewById(R.id.f\u2026nput_left_btns_container)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/ViewGroup;
 
@@ -1284,29 +1291,31 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.flex_input_text_input)"
+    const-string p3, "root.findViewById(R.id.flex_input_text_input)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Lcom/lytefast/flexinput/widget/FlexEditText;
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->p:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-    new-instance v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$c;
+    new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$c;
 
-    invoke-direct {v0, p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$c;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
+    invoke-direct {p3, p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$c;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V
 
-    invoke-static {p2, p0, v0}, Lcom/discord/utilities/view/text/TextWatcherKt;->addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)V
+    invoke-static {p2, p0, p3}, Lcom/discord/utilities/view/text/TextWatcherKt;->addBindedTextWatcher(Landroid/widget/TextView;Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)V
 
     iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->p:Lcom/lytefast/flexinput/widget/FlexEditText;
 
+    const/4 p3, 0x0
+
     if-eqz p2, :cond_11
 
-    new-instance v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$a;
+    new-instance v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$a;
 
-    invoke-direct {v0, v1, p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v1, v0, p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$a;-><init>(ILjava/lang/Object;)V
 
-    invoke-virtual {p2, v0}, Landroid/widget/EditText;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p2, v1}, Landroid/widget/EditText;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     sget p2, Lcom/lytefast/flexinput/R$e;->flex_input_cannot_send_text:I
 
@@ -1314,9 +1323,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026x_input_cannot_send_text)"
+    const-string v1, "root.findViewById(R.id.f\u2026x_input_cannot_send_text)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->l:Landroid/view/View;
 
@@ -1326,9 +1335,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.flex_input_emoji_btn)"
+    const-string v1, "root.findViewById(R.id.flex_input_emoji_btn)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/widget/ImageView;
 
@@ -1340,9 +1349,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.flex_input_send_btn_image)"
+    const-string v1, "root.findViewById(R.id.flex_input_send_btn_image)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->n:Landroid/view/View;
 
@@ -1352,9 +1361,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.f\u2026input_send_btn_container)"
+    const-string v1, "root.findViewById(R.id.f\u2026input_send_btn_container)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->o:Landroid/view/View;
 
@@ -1364,9 +1373,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.flex_input_camera_btn)"
+    const-string v1, "root.findViewById(R.id.flex_input_camera_btn)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->r:Landroid/view/View;
 
@@ -1376,9 +1385,9 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.flex_input_gallery_btn)"
+    const-string v1, "root.findViewById(R.id.flex_input_gallery_btn)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->q:Landroid/view/View;
 
@@ -1388,15 +1397,15 @@
 
     move-result-object p2
 
-    const-string v0, "root.findViewById(R.id.flex_input_expand_btn)"
+    const-string v1, "root.findViewById(R.id.flex_input_expand_btn)"
 
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->s:Landroid/view/View;
 
     iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->g:Landroid/view/View;
 
-    const-string v0, "attachmentClearButton"
+    const-string v1, "attachmentClearButton"
 
     if-eqz p2, :cond_10
 
@@ -1416,7 +1425,7 @@
 
     new-instance v4, Lh;
 
-    invoke-direct {v4, v1, p0}, Lh;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v4, v0, p0}, Lh;-><init>(ILjava/lang/Object;)V
 
     invoke-virtual {p2, v4}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
@@ -1482,7 +1491,7 @@
 
     if-eqz v10, :cond_a
 
-    aput-object v10, p2, v1
+    aput-object v10, p2, v0
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->q:Landroid/view/View;
 
@@ -1570,7 +1579,7 @@
 
     const-string v3, "requireActivity()"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/app/Activity;->getWindowManager()Landroid/view/WindowManager;
 
@@ -1607,7 +1616,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
@@ -1616,101 +1625,94 @@
     return-object p1
 
     :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.LinearLayout.LayoutParams"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_4
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_5
-    invoke-static {v8}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v8}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_6
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_7
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_8
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_9
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_a
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_b
-    invoke-static {v8}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v8}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_c
-    invoke-static {v6}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v6}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_d
-    invoke-static {v5}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v5}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_e
-    invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v4}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_f
-    invoke-static {v2}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_10
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_11
     const-string p1, "inputEt"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw p3
 
     :cond_12
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type android.widget.LinearLayout"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_13
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
 
 .method public onPause()V
@@ -1803,31 +1805,31 @@
 .end method
 
 .method public onSaveInstanceState(Landroid/os/Bundle;)V
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "outState"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onSaveInstanceState(Landroid/os/Bundle;)V
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getAttachments()Ljava/util/ArrayList;
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getAttachments()Ljava/util/ArrayList;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "FlexInput.ATTACHMENTS"
+    const-string v1, "FlexInput.ATTACHMENTS"
 
-    invoke-virtual {p1, v2, v1}, Landroid/os/Bundle;->putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->putParcelableArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->p:Lcom/lytefast/flexinput/widget/FlexEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->p:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
+    invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
     move-result-object v0
 
@@ -1844,27 +1846,24 @@
     :cond_0
     const-string p1, "inputEt"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "outState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_7
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
+    const/4 v0, 0x0
+
     invoke-direct {p1, v0}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;-><init>(Lkotlin/jvm/functions/Function1;)V
 
     iget-object v1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->a:Lcom/lytefast/flexinput/utils/SelectionAggregator;
@@ -1989,28 +1988,21 @@
     :cond_4
     const-string p1, "container"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_5
     const-string p1, "defaultWindowInsetsHandler"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 
     :cond_6
     const-string p1, "expressionContainer"
 
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -2074,7 +2066,7 @@
     :cond_1
     const-string v0, "attachmentPreviewAdapter"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali
index 7db0a74e9c..cc74b770f6 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PermissionsFragment.smali
@@ -50,7 +50,9 @@
 .method public varargs areAllPermissionsGranted([I)Z
     .locals 5
 
-    if-eqz p1, :cond_5
+    const-string v0, "permissionsAccessList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -106,21 +108,14 @@
     :cond_4
     :goto_3
     return v1
-
-    :cond_5
-    const-string p1, "permissionsAccessList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public varargs hasPermissions([Ljava/lang/String;)Z
     .locals 6
 
-    if-eqz p1, :cond_4
+    const-string v0, "requiredPermissionList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
@@ -168,28 +163,23 @@
     :cond_3
     :goto_2
     return v1
-
-    :cond_4
-    const-string p1, "requiredPermissionList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onRequestPermissionsResult(I[Ljava/lang/String;[I)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "permissions"
 
-    if-eqz p2, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_3
+    const-string p2, "grantResults"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget p2, Lcom/lytefast/flexinput/fragment/PermissionsFragment;->PERMISSIONS_REQUEST_CODE:I
 
+    const/4 v0, 0x0
+
     if-eq p1, p2, :cond_0
 
     iput-object v0, p0, Lcom/lytefast/flexinput/fragment/PermissionsFragment;->permissionRequestCallback:Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;
@@ -225,30 +215,18 @@
     iput-object v0, p0, Lcom/lytefast/flexinput/fragment/PermissionsFragment;->permissionRequestCallback:Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;
 
     return-void
-
-    :cond_3
-    const-string p1, "grantResults"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "permissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final varargs requestPermissions(Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;[Ljava/lang/String;)Z
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "callback"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "requiredPermissions"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p2
 
@@ -280,18 +258,4 @@
     const/4 p1, 0x1
 
     return p1
-
-    :cond_1
-    const-string p1, "requiredPermissions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$b.smali
index 123fbbe9cf..75292687a5 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$b.smali
@@ -69,7 +69,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -77,7 +77,7 @@
 
     const-string v2, "context.contentResolver"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->b(Landroid/content/ContentResolver;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$c.smali
index 86ea691b95..e40a8d2180 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment$c.smali
@@ -46,7 +46,7 @@
 
 # virtual methods
 .method public a()V
-    .locals 5
+    .locals 4
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->a:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
@@ -54,23 +54,21 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    if-eqz v0, :cond_2
+    new-instance v1, Landroidx/recyclerview/widget/GridLayoutManager;
 
-    new-instance v2, Landroidx/recyclerview/widget/GridLayoutManager;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->a:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->a:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    invoke-virtual {v3}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
+    move-result-object v2
 
-    move-result-object v3
+    const/4 v3, 0x3
 
-    const/4 v4, 0x3
+    invoke-direct {v1, v2, v3}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;I)V
 
-    invoke-direct {v2, v3, v4}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;I)V
-
-    invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->a:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
@@ -78,11 +76,11 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->b:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->b:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->a:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
@@ -90,26 +88,11 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->invalidateItemDecorations()V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
 .end method
 
 .method public b()V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
index 8d9875ca23..6360f612df 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
@@ -108,7 +108,9 @@
 .method public newPermissionsRequestAdapter(Landroid/view/View$OnClickListener;)Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "onClickListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
 
@@ -119,87 +121,72 @@
     invoke-direct {v0, v1, v2, p1}, Lcom/lytefast/flexinput/adapters/EmptyListAdapter;-><init>(IILandroid/view/View$OnClickListener;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "onClickListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
     .locals 3
 
-    const/4 p3, 0x0
+    const-string p3, "inflater"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    new-instance p3, Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+
+    const/4 v0, 0x0
 
     const/4 v1, 0x3
 
-    invoke-direct {v0, p3, p3, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(Landroidx/collection/ArrayMap;Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;I)V
+    invoke-direct {p3, v0, v0, v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(Landroidx/collection/ArrayMap;Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;I)V
 
-    iput-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
 
-    move-result-object v0
+    move-result-object p3
 
-    if-eqz v0, :cond_0
+    if-eqz p3, :cond_0
 
-    invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
+    invoke-virtual {p3}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
 
-    move-result-object v0
+    move-result-object p3
 
     goto :goto_0
 
     :cond_0
-    move-object v0, p3
+    move-object p3, v0
 
     :goto_0
-    instance-of v2, v0, Lf/b/a/b;
+    instance-of v2, p3, Lf/b/a/b;
 
     if-nez v2, :cond_1
 
-    move-object v0, p3
+    move-object p3, v0
 
     :cond_1
-    check-cast v0, Lf/b/a/b;
+    check-cast p3, Lf/b/a/b;
 
-    if-eqz v0, :cond_3
+    if-eqz p3, :cond_2
 
-    invoke-interface {v0}, Lf/b/a/b;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lf/b/a/b;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    move-result-object v0
+    move-result-object p3
 
     iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    if-eqz v2, :cond_2
+    invoke-static {v2}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-virtual {v0, v2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
-
-    goto :goto_1
+    invoke-virtual {p3, v2}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p3
-
-    :cond_3
-    :goto_1
-    sget v0, Lcom/lytefast/flexinput/R$f;->fragment_recycler_view:I
+    sget p3, Lcom/lytefast/flexinput/R$f;->fragment_recycler_view:I
 
     const/4 v2, 0x0
 
-    invoke-virtual {p1, v0, p2, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {p1, p3, p2, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
-    if-eqz p1, :cond_b
+    if-eqz p1, :cond_9
 
     sget p2, Lcom/lytefast/flexinput/R$e;->list:I
 
@@ -215,50 +202,45 @@
 
     move-result-object p2
 
-    if-eqz p2, :cond_4
+    if-eqz p2, :cond_3
 
     invoke-virtual {p2}, Landroid/app/Activity;->getWindowManager()Landroid/view/WindowManager;
 
     move-result-object p2
 
-    if-eqz p2, :cond_4
+    if-eqz p2, :cond_3
 
     invoke-interface {p2}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
 
-    move-result-object p2
+    move-result-object v0
 
-    goto :goto_2
+    :cond_3
+    new-instance p2, Landroid/graphics/Point;
+
+    invoke-direct {p2}, Landroid/graphics/Point;-><init>()V
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {v0, p2}, Landroid/view/Display;->getSize(Landroid/graphics/Point;)V
 
     :cond_4
-    move-object p2, p3
-
-    :goto_2
-    new-instance v0, Landroid/graphics/Point;
-
-    invoke-direct {v0}, Landroid/graphics/Point;-><init>()V
-
-    if-eqz p2, :cond_5
-
-    invoke-virtual {p2, v0}, Landroid/view/Display;->getSize(Landroid/graphics/Point;)V
-
-    :cond_5
-    iget p2, v0, Landroid/graphics/Point;->x:I
+    iget p2, p2, Landroid/graphics/Point;->x:I
 
     int-to-float p2, p2
 
-    int-to-float v0, v1
+    int-to-float p3, v1
 
-    div-float/2addr p2, v0
+    div-float/2addr p2, p3
 
     float-to-int p2, p2
 
-    new-instance v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    new-instance p3, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    if-eqz v2, :cond_a
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
-    invoke-direct {v0, v2, p2, p2}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;-><init>(Lcom/lytefast/flexinput/utils/SelectionCoordinator;II)V
+    invoke-direct {p3, v0, p2, p2}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;-><init>(Lcom/lytefast/flexinput/utils/SelectionCoordinator;II)V
 
     const-string p2, "android.permission.READ_EXTERNAL_STORAGE"
 
@@ -270,48 +252,48 @@
 
     move-result p2
 
-    if-eqz p2, :cond_7
+    if-eqz p2, :cond_6
 
     iget-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    if-eqz p2, :cond_6
+    if-eqz p2, :cond_5
 
-    new-instance p3, Landroidx/recyclerview/widget/GridLayoutManager;
+    new-instance v0, Landroidx/recyclerview/widget/GridLayoutManager;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v2
 
-    invoke-direct {p3, v2, v1}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;I)V
+    invoke-direct {v0, v2, v1}, Landroidx/recyclerview/widget/GridLayoutManager;-><init>(Landroid/content/Context;I)V
 
-    invoke-virtual {p2, p3}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+    invoke-virtual {p2, v0}, Landroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+
+    :cond_5
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    if-eqz p2, :cond_7
+
+    invoke-virtual {p2, p3}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+
+    goto :goto_1
 
     :cond_6
     iget-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    if-eqz p2, :cond_8
+    if-eqz p2, :cond_7
+
+    new-instance v0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;
+
+    invoke-direct {v0, p3, p0}, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;-><init>(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Lcom/lytefast/flexinput/fragment/PhotosFragment;)V
+
+    invoke-virtual {p0, v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->newPermissionsRequestAdapter(Landroid/view/View$OnClickListener;)Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+
+    move-result-object v0
 
     invoke-virtual {p2, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
-    goto :goto_3
-
     :cond_7
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
-    if-eqz p2, :cond_8
-
-    new-instance p3, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;
-
-    invoke-direct {p3, v0, p0}, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;-><init>(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Lcom/lytefast/flexinput/fragment/PhotosFragment;)V
-
-    invoke-virtual {p0, p3}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->newPermissionsRequestAdapter(Landroid/view/View$OnClickListener;)Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
-
-    :cond_8
-    :goto_3
+    :goto_1
     sget p2, Lcom/lytefast/flexinput/R$e;->swipeRefreshLayout:I
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -322,34 +304,19 @@
 
     iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->swipeRefreshLayout:Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 
-    if-eqz p2, :cond_9
+    if-eqz p2, :cond_8
 
-    new-instance p3, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;
+    new-instance v0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;
 
-    invoke-direct {p3, p1, v0, p0}, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;-><init>(Landroid/view/View;Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Lcom/lytefast/flexinput/fragment/PhotosFragment;)V
+    invoke-direct {v0, p1, p3, p0}, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;-><init>(Landroid/view/View;Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;Lcom/lytefast/flexinput/fragment/PhotosFragment;)V
 
-    invoke-virtual {p2, p3}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setOnRefreshListener(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;)V
+    invoke-virtual {p2, v0}, Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setOnRefreshListener(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;)V
+
+    :cond_8
+    move-object v0, p1
 
     :cond_9
-    move-object p3, p1
-
-    goto :goto_4
-
-    :cond_a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p3
-
-    :cond_b
-    :goto_4
-    return-object p3
-
-    :cond_c
-    const-string p1, "inflater"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
+    return-object v0
 .end method
 
 .method public onDestroyView()V
@@ -357,7 +324,7 @@
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     iget-object v0, v0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
@@ -366,13 +333,6 @@
     invoke-super {p0}, Landroidx/fragment/app/Fragment;->onDestroyView()V
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public onPause()V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali
index e6d8875231..fd03a6c802 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$Companion.smali
@@ -34,7 +34,7 @@
 
 # virtual methods
 .method public final a(Landroid/net/Uri;Landroid/content/ContentResolver;)Lcom/lytefast/flexinput/model/Attachment;
-    .locals 8
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -47,57 +47,69 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toAttachment"
 
-    if-eqz p1, :cond_a
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_9
+    const-string v0, "resolver"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$getFileName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "contentResolver"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/net/Uri;->getScheme()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
     goto/16 :goto_2
 
     :cond_0
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
-    move-result v2
+    move-result v1
 
-    const v3, 0x2ff57c
+    const v2, 0x2ff57c
 
-    if-eq v2, v3, :cond_5
+    const/4 v3, 0x0
 
-    const v3, 0x38b73479
+    if-eq v1, v2, :cond_5
 
-    if-eq v2, v3, :cond_1
+    const v2, 0x38b73479
+
+    if-eq v1, v2, :cond_1
 
     goto :goto_2
 
     :cond_1
-    const-string v2, "content"
+    const-string v1, "content"
 
-    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_6
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
+    if-eqz v0, :cond_6
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    move-object v2, p2
+    const/4 v8, 0x0
 
-    move-object v3, p1
+    const/4 v9, 0x0
 
-    invoke-virtual/range {v2 .. v7}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
+    move-object v4, p2
+
+    move-object v5, p1
+
+    invoke-virtual/range {v4 .. v9}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
 
     move-result-object p2
 
@@ -106,42 +118,42 @@
     :try_start_0
     invoke-interface {p2}, Landroid/database/Cursor;->moveToFirst()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_3
+    if-eqz v0, :cond_3
 
-    const-string v1, "_display_name"
+    const-string v0, "_display_name"
 
-    invoke-interface {p2, v1}, Landroid/database/Cursor;->getColumnIndex(Ljava/lang/String;)I
+    invoke-interface {p2, v0}, Landroid/database/Cursor;->getColumnIndex(Ljava/lang/String;)I
 
-    move-result v1
+    move-result v0
 
-    if-ltz v1, :cond_3
+    if-ltz v0, :cond_3
 
-    invoke-interface {p2, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
+    invoke-interface {p2, v0}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_2
+    if-eqz v0, :cond_2
 
     goto :goto_0
 
     :cond_2
     invoke-virtual {p1}, Landroid/net/Uri;->getLastPathSegment()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_0
-    invoke-static {p2, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {p2, v3}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
-    move-object v0, v1
+    move-object v3, v0
 
     goto :goto_3
 
     :cond_3
-    invoke-static {p2, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+    invoke-static {p2, v3}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
 
     goto :goto_1
 
@@ -164,14 +176,14 @@
     :goto_1
     invoke-virtual {p1}, Landroid/net/Uri;->getLastPathSegment()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v3
 
     goto :goto_3
 
     :cond_5
     const-string p2, "file"
 
-    invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v0, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result p2
 
@@ -181,15 +193,15 @@
 
     invoke-virtual {p1}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_7
+    if-eqz v0, :cond_7
 
-    invoke-direct {p2, v1}, Ljava/io/File;-><init>(Ljava/lang/String;)V
+    invoke-direct {p2, v0}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
     invoke-virtual {p2}, Ljava/io/File;->getName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v3
 
     goto :goto_3
 
@@ -197,11 +209,11 @@
     :goto_2
     invoke-virtual {p1}, Landroid/net/Uri;->getLastPathSegment()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v3
 
     :cond_7
     :goto_3
-    if-eqz v0, :cond_8
+    if-eqz v3, :cond_8
 
     goto :goto_4
 
@@ -212,10 +224,10 @@
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v3
 
     :goto_4
-    move-object v5, v0
+    move-object v8, v3
 
     new-instance p2, Lcom/lytefast/flexinput/model/Attachment;
 
@@ -223,31 +235,17 @@
 
     move-result v0
 
-    int-to-long v2, v0
+    int-to-long v5, v0
 
-    const/4 v6, 0x0
+    const/4 v9, 0x0
 
-    move-object v1, p2
+    move-object v4, p2
 
-    move-object v4, p1
+    move-object v7, p1
 
-    invoke-direct/range {v1 .. v6}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct/range {v4 .. v9}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
 
     return-object p2
-
-    :cond_9
-    const-string p1, "resolver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "$this$toAttachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final b(Landroidx/core/view/inputmethod/InputContentInfoCompat;Landroid/content/ContentResolver;ZLjava/lang/String;)Lcom/lytefast/flexinput/model/Attachment;
@@ -266,38 +264,44 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toAttachment"
 
-    if-eqz p1, :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_5
+    const-string v0, "resolver"
 
-    if-eqz p4, :cond_4
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "defaultName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->getContentUri()Landroid/net/Uri;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "fileName"
+    const-string v1, "fileName"
 
-    invoke-virtual {v1, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    if-eqz v0, :cond_0
 
-    move-object p4, v1
+    move-object p4, v0
 
     :cond_0
-    const-string v1, "contentUri.getQueryParam\u2026fileName\") ?: defaultName"
+    const-string v0, "contentUri.getQueryParam\u2026fileName\") ?: defaultName"
 
-    invoke-static {p4, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-char v1, Ljava/io/File;->separatorChar:C
+    sget-char v0, Ljava/io/File;->separatorChar:C
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-static {p4, v1, v0, v2}, Lj0/t/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
+    invoke-static {p4, v0, v1, v2}, Lk0/u/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p4
 
@@ -307,9 +311,9 @@
 
     move-result-object p3
 
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
-    invoke-virtual {p3, v1}, Landroid/content/ClipDescription;->getMimeType(I)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Landroid/content/ClipDescription;->getMimeType(I)Ljava/lang/String;
 
     move-result-object p3
 
@@ -322,9 +326,9 @@
 
     move-result-object p3
 
-    const-string v1, "mimeType"
+    const-string v0, "mimeType"
 
-    invoke-virtual {p3, v1}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {p3, v0}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p3
 
@@ -351,13 +355,13 @@
 
     invoke-virtual {p2, p4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/16 v1, 0x2e
+    const/16 v0, 0x2e
 
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    const/16 v1, 0x2f
+    const/16 v0, 0x2f
 
-    invoke-static {p3, v1, v0, v2}, Lj0/t/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
+    invoke-static {p3, v0, v1, v2}, Lk0/u/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p3
 
@@ -395,7 +399,7 @@
 
     const-string p3, "contentUri"
 
-    invoke-static {v3, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v0, p2
 
@@ -404,25 +408,4 @@
     invoke-direct/range {v0 .. v5}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
 
     return-object p2
-
-    :cond_4
-    const-string p1, "defaultName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "resolver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "$this$toAttachment"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali
index af0f1bb147..8beb33cc7e 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment$a.smali
@@ -40,22 +40,15 @@
 .method public createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "parcelIn"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/lytefast/flexinput/model/Attachment;
 
     invoke-direct {v0, p1}, Lcom/lytefast/flexinput/model/Attachment;-><init>(Landroid/os/Parcel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "parcelIn"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public newArray(I)[Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali
index ee03eb0848..e9b97f1184 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Attachment.smali
@@ -86,11 +86,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "uri"
 
-    if-eqz p3, :cond_1
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "displayName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -103,20 +105,6 @@
     iput-object p5, p0, Lcom/lytefast/flexinput/model/Attachment;->data:Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const-string p1, "displayName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "uri"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -145,13 +133,15 @@
 .end method
 
 .method public constructor <init>(Landroid/os/Parcel;)V
-    .locals 6
+    .locals 7
 
-    if-eqz p1, :cond_2
+    const-string v0, "parcelIn"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readLong()J
 
-    move-result-wide v1
+    move-result-wide v2
 
     const-class v0, Landroid/net/Uri;
 
@@ -172,12 +162,12 @@
     :cond_0
     sget-object v0, Landroid/net/Uri;->EMPTY:Landroid/net/Uri;
 
-    const-string v3, "Uri.EMPTY"
+    const-string v1, "Uri.EMPTY"
 
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
-    move-object v3, v0
+    move-object v4, v0
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
@@ -191,24 +181,19 @@
     const-string p1, ""
 
     :goto_1
-    move-object v4, p1
+    move-object v5, p1
 
-    const/4 v5, 0x0
+    const-string p1, "parcelIn.readString() ?: \"\""
 
-    move-object v0, p0
+    invoke-static {v5, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {v0 .. v5}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
+    const/4 v6, 0x0
+
+    move-object v1, p0
+
+    invoke-direct/range {v1 .. v6}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
 
     return-void
-
-    :cond_2
-    const-string p1, "parcelIn"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final toAttachment(Landroid/net/Uri;Landroid/content/ContentResolver;)Lcom/lytefast/flexinput/model/Attachment;
@@ -294,7 +279,7 @@
 
     iget-object p1, p1, Lcom/lytefast/flexinput/model/Attachment;->uri:Landroid/net/Uri;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -354,7 +339,7 @@
 
     iget-object v1, p0, Lcom/lytefast/flexinput/model/Attachment;->uri:Landroid/net/Uri;
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->e0(Ljava/lang/Object;Ljava/lang/Object;)I
+    invoke-static {v0, v1}, Le0/a/b/b/a;->e0(Ljava/lang/Object;Ljava/lang/Object;)I
 
     move-result v0
 
@@ -366,7 +351,9 @@
     .annotation build Landroidx/annotation/CallSuper;
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "dest"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-wide v0, p0, Lcom/lytefast/flexinput/model/Attachment;->id:J
 
@@ -381,13 +368,4 @@
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "dest"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali
index 651e73023d..010cacd99f 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo$a.smali
@@ -40,22 +40,15 @@
 .method public createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "parcel"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/lytefast/flexinput/model/Photo;
 
     invoke-direct {v0, p1}, Lcom/lytefast/flexinput/model/Photo;-><init>(Landroid/os/Parcel;)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "parcel"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public newArray(I)[Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali
index 301f49d208..f255091662 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/model/Photo.smali
@@ -39,26 +39,27 @@
 .end method
 
 .method public constructor <init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p4, :cond_0
+    const-string v0, "uri"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "displayName"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct/range {p0 .. p5}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "displayName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Landroid/os/Parcel;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "parcelIn"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/lytefast/flexinput/model/Attachment;-><init>(Landroid/os/Parcel;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$a.smali
index a653e25445..a4206aa913 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator$a.smali
@@ -58,22 +58,15 @@
 
     check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->a:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-static {v0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->access$addItem(Lcom/lytefast/flexinput/utils/SelectionAggregator;Lcom/lytefast/flexinput/model/Attachment;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onItemUnselected(Ljava/lang/Object;)V
@@ -81,22 +74,15 @@
 
     check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->a:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-static {v0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->access$removeItem(Lcom/lytefast/flexinput/utils/SelectionAggregator;Lcom/lytefast/flexinput/model/Attachment;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public unregister()V
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
index 430d30b9e0..d6c38b8865 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
@@ -86,20 +86,15 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
 
     const-string v1, "SelectionAggregator::class.java.canonicalName!!"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sput-object v0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->TAG:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
 .end method
 
 .method public constructor <init>(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;)V
@@ -214,15 +209,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "adapter"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_2
+    const-string v0, "attachments"
 
-    if-eqz p3, :cond_1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_0
+    const-string v0, "childSelectionCoordinators"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "itemSelectionListeners"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -235,34 +236,6 @@
     iput-object p4, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->itemSelectionListeners:Ljava/util/ArrayList;
 
     return-void
-
-    :cond_0
-    const-string p1, "itemSelectionListeners"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "childSelectionCoordinators"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "attachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public synthetic constructor <init>(Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -458,7 +431,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "itemSelectionListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->itemSelectionListeners:Ljava/util/ArrayList;
 
@@ -474,15 +449,6 @@
 
     :cond_0
     return-object p0
-
-    :cond_1
-    const-string p1, "itemSelectionListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final clear()V
@@ -550,7 +516,7 @@
 
     const-string v4, "position"
 
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
 
@@ -585,7 +551,7 @@
 
     const-string v0, "attachments[position]"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
 
@@ -707,7 +673,7 @@
 
     const-string v2, "coordinator"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinatorInternal(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
@@ -725,7 +691,7 @@
 .end method
 
 .method public final initFrom(Ljava/util/ArrayList;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -738,13 +704,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "savedAttachments"
 
-    if-eqz p1, :cond_4
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance v0, Ljava/util/ArrayList;
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -754,31 +720,31 @@
     :goto_0
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_2
+    if-eqz v1, :cond_2
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v1
 
-    instance-of v3, v2, Lcom/lytefast/flexinput/model/Attachment;
+    instance-of v2, v1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-nez v3, :cond_1
+    if-nez v2, :cond_1
 
-    move-object v2, v0
+    const/4 v1, 0x0
 
     :cond_1
-    check-cast v2, Lcom/lytefast/flexinput/model/Attachment;
+    check-cast v1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz v2, :cond_0
+    if-eqz v1, :cond_0
 
-    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_2
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
@@ -801,17 +767,10 @@
 
     :cond_3
     return-object p0
-
-    :cond_4
-    const-string p1, "savedAttachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
-    .locals 2
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -820,19 +779,71 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "selectionCoordinator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinatorInternal(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
     :try_start_0
     iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->attachments:Ljava/util/ArrayList;
 
-    invoke-virtual {p1, v0}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->b(Ljava/util/ArrayList;)V
-    :try_end_0
-    .catch Lcom/lytefast/flexinput/utils/SelectionCoordinator$RestorationException; {:try_start_0 .. :try_end_0} :catch_0
+    const-string v1, "selectedItems"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->a:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+
+    if-nez v1, :cond_2
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_0
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    instance-of v2, v1, Ljava/lang/Object;
+
+    if-nez v2, :cond_1
+
+    const/4 v1, 0x0
+
+    :cond_1
+    if-eqz v1, :cond_0
+
+    iget-object v2, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->b:Landroidx/collection/ArrayMap;
+
+    const/4 v3, -0x1
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v1, v3}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
+    :cond_2
+    new-instance p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$RestorationException;
+
+    const-string v0, "cannot restoreSelections after adapter set: prevents mismatches"
+
+    invoke-direct {p1, v0}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$RestorationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Lcom/lytefast/flexinput/utils/SelectionCoordinator$RestorationException; {:try_start_0 .. :try_end_0} :catch_0
+
     :catch_0
     move-exception p1
 
@@ -842,21 +853,12 @@
 
     invoke-static {v0, v1, p1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    :goto_0
+    :cond_3
     return-void
-
-    :cond_0
-    const-string p1, "selectionCoordinator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public registerSelectionCoordinatorInternal(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -865,12 +867,18 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "selectionCoordinator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;
 
     invoke-direct {v0, p0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;-><init>(Lcom/lytefast/flexinput/utils/SelectionAggregator;Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
+    const-string v1, "<set-?>"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     iput-object v0, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->childSelectionCoordinators:Ljava/util/ArrayList;
@@ -878,15 +886,6 @@
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "selectionCoordinator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final removeItemSelectionListener(Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;)V
@@ -899,13 +898,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "itemSelectionListener"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->itemSelectionListeners:Ljava/util/ArrayList;
 
     if-eqz v0, :cond_0
 
-    invoke-static {v0}, Lj0/n/c/u;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
+    invoke-static {v0}, Lk0/o/c/v;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
 
     move-result-object v0
 
@@ -914,26 +915,17 @@
     return-void
 
     :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.collections.MutableCollection<T>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "itemSelectionListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
 
 .method public final setItemSelectionListeners(Ljava/util/ArrayList;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -943,20 +935,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->itemSelectionListeners:Ljava/util/ArrayList;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final toggleItemInternal(Lcom/lytefast/flexinput/model/Attachment;)Z
@@ -967,7 +952,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->removeItem(Lcom/lytefast/flexinput/model/Attachment;)Z
 
@@ -979,15 +966,6 @@
 
     :cond_0
     return v0
-
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final unselectItem(Lcom/lytefast/flexinput/model/Attachment;)V
@@ -998,7 +976,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator;->childSelectionCoordinators:Ljava/util/ArrayList;
 
@@ -1019,7 +999,7 @@
 
     check-cast v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
-    invoke-virtual {v1, p1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->d(Ljava/lang/Object;)Z
+    invoke-virtual {v1, p1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c(Ljava/lang/Object;)Z
 
     goto :goto_0
 
@@ -1027,13 +1007,4 @@
     invoke-direct {p0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->removeItem(Lcom/lytefast/flexinput/model/Attachment;)Z
 
     return-void
-
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$RestorationException.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$RestorationException.smali
index e93c3ba524..514217fe88 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$RestorationException.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$RestorationException.smali
@@ -16,7 +16,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "msg"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/lang/Exception;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali
index baaac92a12..cc60d93935 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator$a.smali
@@ -70,7 +70,7 @@
 
     iget-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$a;->a:Ljava/lang/Object;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali
index f7b6bd1b35..9a40eca94d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionCoordinator.smali
@@ -91,41 +91,26 @@
 
     if-eqz p3, :cond_1
 
-    new-instance p3, Lf/b/a/e/c;
+    new-instance p2, Lf/b/a/e/c;
 
-    invoke-direct {p3}, Lf/b/a/e/c;-><init>()V
-
-    goto :goto_1
+    invoke-direct {p2}, Lf/b/a/e/c;-><init>()V
 
     :cond_1
-    move-object p3, p2
+    const-string p3, "selectedItemPositionMap"
 
-    :goto_1
-    if-eqz p1, :cond_3
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_2
+    const-string p3, "itemSelectionListener"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->b:Landroidx/collection/ArrayMap;
 
-    iput-object p3, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->c:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     return-void
-
-    :cond_2
-    const-string p1, "itemSelectionListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_3
-    const-string p1, "selectedItemPositionMap"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
 .end method
 
 
@@ -173,88 +158,7 @@
     return p1
 .end method
 
-.method public final b(Ljava/util/ArrayList;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/ArrayList<",
-            "+TI;>;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/lytefast/flexinput/utils/SelectionCoordinator$RestorationException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->a:Landroidx/recyclerview/widget/RecyclerView$Adapter;
-
-    if-nez v1, :cond_3
-
-    invoke-virtual {p1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_0
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Ljava/lang/Object;
-
-    if-nez v2, :cond_1
-
-    move-object v1, v0
-
-    :cond_1
-    if-eqz v1, :cond_0
-
-    iget-object v2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->b:Landroidx/collection/ArrayMap;
-
-    const/4 v3, -0x1
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v1, v3}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_2
-    return-void
-
-    :cond_3
-    new-instance p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$RestorationException;
-
-    const-string v0, "cannot restoreSelections after adapter set: prevents mismatches"
-
-    invoke-direct {p1, v0}, Lcom/lytefast/flexinput/utils/SelectionCoordinator$RestorationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string p1, "selectedItems"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final c(Ljava/lang/Object;I)V
+.method public final b(Ljava/lang/Object;I)V
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -290,7 +194,7 @@
     return-void
 .end method
 
-.method public final d(Ljava/lang/Object;)Z
+.method public final c(Ljava/lang/Object;)Z
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -302,7 +206,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-static {v0}, Lj0/n/c/u;->asMutableMap(Ljava/lang/Object;)Ljava/util/Map;
+    invoke-static {v0}, Lk0/o/c/v;->asMutableMap(Ljava/lang/Object;)Ljava/util/Map;
 
     move-result-object v0
 
@@ -343,11 +247,11 @@
     return v1
 
     :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type kotlin.collections.MutableMap<K, V>"
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/viewmodel/FlexInputState.smali b/com.discord/smali_classes2/com/lytefast/flexinput/viewmodel/FlexInputState.smali
index 50897e18a2..e6b371b6d4 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/viewmodel/FlexInputState.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/viewmodel/FlexInputState.smali
@@ -73,11 +73,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "inputText"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "attachments"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -96,20 +98,6 @@
     iput-boolean p7, p0, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->g:Z
 
     return-void
-
-    :cond_0
-    const-string p1, "attachments"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "inputText"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Ljava/lang/String;ZLjava/util/List;Ljava/lang/Integer;ZZZI)V
@@ -147,7 +135,7 @@
 
     if-eqz v4, :cond_2
 
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
 
     :cond_2
     and-int/lit8 v4, p8, 0x8
@@ -210,7 +198,7 @@
 .end method
 
 .method public static a(Lcom/lytefast/flexinput/viewmodel/FlexInputState;Ljava/lang/String;ZLjava/util/List;Ljava/lang/Integer;ZZZI)Lcom/lytefast/flexinput/viewmodel/FlexInputState;
-    .locals 9
+    .locals 8
 
     move-object v0, p0
 
@@ -295,16 +283,18 @@
     goto :goto_6
 
     :cond_6
-    move/from16 v7, p7
+    move v7, p7
 
     :goto_6
-    const/4 v8, 0x0
+    if-eqz v0, :cond_7
 
-    if-eqz v0, :cond_9
+    const-string v0, "inputText"
 
-    if-eqz v1, :cond_8
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v3, :cond_7
+    const-string v0, "attachments"
+
+    invoke-static {v3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/lytefast/flexinput/viewmodel/FlexInputState;
 
@@ -322,28 +312,16 @@
 
     move p6, v6
 
-    move/from16 p7, v7
+    move p7, v7
 
     invoke-direct/range {p0 .. p7}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;-><init>(Ljava/lang/String;ZLjava/util/List;Ljava/lang/Integer;ZZZ)V
 
     return-object v0
 
     :cond_7
-    const-string v0, "attachments"
+    const/4 v0, 0x0
 
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_8
-    const-string v0, "inputText"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v8
-
-    :cond_9
-    throw v8
+    throw v0
 .end method
 
 
@@ -363,7 +341,7 @@
 
     iget-object v1, p1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -379,7 +357,7 @@
 
     iget-object v1, p1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->c:Ljava/util/List;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -389,7 +367,7 @@
 
     iget-object v1, p1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->d:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText$a.smali
index 8a2fcc34ea..c5fafac489 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText$a.smali
@@ -75,7 +75,7 @@
 
     const-string p3, "inputContentInfo"
 
-    invoke-static {p1, p3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali b/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali
index da5422d2dd..e967cf4c2f 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText.smali
@@ -45,9 +45,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Landroidx/appcompat/widget/AppCompatEditText;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -58,15 +60,6 @@
     iput-object p1, p0, Lcom/lytefast/flexinput/widget/FlexEditText;->d:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
@@ -126,41 +119,39 @@
 .method public onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "editorInfo"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-super {p0, p1}, Landroidx/appcompat/widget/AppCompatEditText;->onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "image/*"
+
+    filled-new-array {v1}, [Ljava/lang/String;
+
     move-result-object v1
 
-    if-eqz v1, :cond_0
+    invoke-static {p1, v1}, Landroidx/core/view/inputmethod/EditorInfoCompat;->setContentMimeTypes(Landroid/view/inputmethod/EditorInfo;[Ljava/lang/String;)V
 
-    const-string v0, "image/*"
+    new-instance v1, Lcom/lytefast/flexinput/widget/FlexEditText$a;
 
-    filled-new-array {v0}, [Ljava/lang/String;
+    invoke-direct {v1, p0, p1}, Lcom/lytefast/flexinput/widget/FlexEditText$a;-><init>(Lcom/lytefast/flexinput/widget/FlexEditText;Landroid/view/inputmethod/EditorInfo;)V
 
-    move-result-object v0
+    invoke-static {v0, p1, v1}, Landroidx/core/view/inputmethod/InputConnectionCompat;->createWrapper(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)Landroid/view/inputmethod/InputConnection;
 
-    invoke-static {p1, v0}, Landroidx/core/view/inputmethod/EditorInfoCompat;->setContentMimeTypes(Landroid/view/inputmethod/EditorInfo;[Ljava/lang/String;)V
+    move-result-object p1
 
-    new-instance v0, Lcom/lytefast/flexinput/widget/FlexEditText$a;
-
-    invoke-direct {v0, p0, p1}, Lcom/lytefast/flexinput/widget/FlexEditText$a;-><init>(Lcom/lytefast/flexinput/widget/FlexEditText;Landroid/view/inputmethod/EditorInfo;)V
-
-    invoke-static {v1, p1, v0}, Landroidx/core/view/inputmethod/InputConnectionCompat;->createWrapper(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)Landroid/view/inputmethod/InputConnection;
-
-    move-result-object v0
+    goto :goto_0
 
     :cond_0
-    return-object v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "editorInfo"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p1
 .end method
 
 .method public onSelectionChanged(II)V
@@ -191,7 +182,7 @@
 .end method
 
 .method public final setInputContentHandler(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -203,20 +194,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/lytefast/flexinput/widget/FlexEditText;->d:Lkotlin/jvm/functions/Function1;
 
     return-void
-
-    :cond_0
-    const-string p1, "<set-?>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setMaxLines(I)V
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali
index c5a7f612e2..1bbbb17d12 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle$1.smali
@@ -52,9 +52,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali
index cbb457d5cc..03e137b68d 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded$Lifecycle.smali
@@ -93,9 +93,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object p1, p1, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {p1, v0}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded.smali b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded.smali
index b77271dcc1..6c042ddd83 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/backgrounded/Backgrounded.smali
@@ -141,11 +141,11 @@
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    new-instance v2, Lr0/l/a/a;
+    new-instance v2, Ls0/l/a/a;
 
-    invoke-direct {v2, v1, v0}, Lr0/l/a/a;-><init>(Ljava/lang/Object;Lrx/Observable;)V
+    invoke-direct {v2, v1, v0}, Ls0/l/a/a;-><init>(Ljava/lang/Object;Lrx/Observable;)V
 
-    invoke-virtual {v2}, Lr0/l/a/a;->iterator()Ljava/util/Iterator;
+    invoke-virtual {v2}, Ls0/l/a/a;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
 
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 7480707371..6ea863e541 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
@@ -396,199 +396,199 @@
 
 .field public static final ratingBarStyleSmall:I = 0x7f04043f
 
-.field public static final searchHintIcon:I = 0x7f040471
+.field public static final searchHintIcon:I = 0x7f040463
 
-.field public static final searchIcon:I = 0x7f040472
+.field public static final searchIcon:I = 0x7f040464
 
-.field public static final searchViewStyle:I = 0x7f040474
+.field public static final searchViewStyle:I = 0x7f040466
 
-.field public static final seekBarStyle:I = 0x7f04047c
+.field public static final seekBarStyle:I = 0x7f04046e
 
-.field public static final selectableItemBackground:I = 0x7f04047e
+.field public static final selectableItemBackground:I = 0x7f040470
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f04047f
+.field public static final selectableItemBackgroundBorderless:I = 0x7f040471
 
-.field public static final showAsAction:I = 0x7f04048b
+.field public static final showAsAction:I = 0x7f04047d
 
-.field public static final showDividers:I = 0x7f04048f
+.field public static final showDividers:I = 0x7f040481
 
-.field public static final showText:I = 0x7f040492
+.field public static final showText:I = 0x7f040484
 
-.field public static final showTitle:I = 0x7f040493
+.field public static final showTitle:I = 0x7f040485
 
-.field public static final singleChoiceItemLayout:I = 0x7f040499
+.field public static final singleChoiceItemLayout:I = 0x7f04048b
 
-.field public static final spinBars:I = 0x7f0404a3
+.field public static final spinBars:I = 0x7f040495
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f0404a4
+.field public static final spinnerDropDownItemStyle:I = 0x7f040496
 
-.field public static final spinnerStyle:I = 0x7f0404a5
+.field public static final spinnerStyle:I = 0x7f040497
 
-.field public static final splitTrack:I = 0x7f0404a6
+.field public static final splitTrack:I = 0x7f040498
 
-.field public static final srcCompat:I = 0x7f0404a8
+.field public static final srcCompat:I = 0x7f04049a
 
-.field public static final state_above_anchor:I = 0x7f0404af
+.field public static final state_above_anchor:I = 0x7f0404a1
 
-.field public static final statusBarBackground:I = 0x7f0404b5
+.field public static final statusBarBackground:I = 0x7f0404a7
 
-.field public static final subMenuArrow:I = 0x7f0404be
+.field public static final subMenuArrow:I = 0x7f0404b0
 
-.field public static final submitBackground:I = 0x7f0404bf
+.field public static final submitBackground:I = 0x7f0404b1
 
-.field public static final subtitle:I = 0x7f0404c1
+.field public static final subtitle:I = 0x7f0404b3
 
-.field public static final subtitleTextAppearance:I = 0x7f0404c2
+.field public static final subtitleTextAppearance:I = 0x7f0404b4
 
-.field public static final subtitleTextColor:I = 0x7f0404c3
+.field public static final subtitleTextColor:I = 0x7f0404b5
 
-.field public static final subtitleTextStyle:I = 0x7f0404c4
+.field public static final subtitleTextStyle:I = 0x7f0404b6
 
-.field public static final suggestionRowLayout:I = 0x7f0404c8
+.field public static final suggestionRowLayout:I = 0x7f0404ba
 
-.field public static final switchMinWidth:I = 0x7f0404d2
+.field public static final switchMinWidth:I = 0x7f0404c4
 
-.field public static final switchPadding:I = 0x7f0404d3
+.field public static final switchPadding:I = 0x7f0404c5
 
-.field public static final switchStyle:I = 0x7f0404d6
+.field public static final switchStyle:I = 0x7f0404c8
 
-.field public static final switchTextAppearance:I = 0x7f0404d7
+.field public static final switchTextAppearance:I = 0x7f0404c9
 
-.field public static final textAllCaps:I = 0x7f0404f8
+.field public static final textAllCaps:I = 0x7f0404ea
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040503
+.field public static final textAppearanceLargePopupMenu:I = 0x7f0404f5
 
-.field public static final textAppearanceListItem:I = 0x7f040505
+.field public static final textAppearanceListItem:I = 0x7f0404f7
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040506
+.field public static final textAppearanceListItemSecondary:I = 0x7f0404f8
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040507
+.field public static final textAppearanceListItemSmall:I = 0x7f0404f9
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040509
+.field public static final textAppearancePopupMenuHeader:I = 0x7f0404fb
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04050a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0404fc
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04050b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f0404fd
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04050c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f0404fe
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04050f
+.field public static final textColorAlertDialogListItem:I = 0x7f040501
 
-.field public static final textColorSearchUrl:I = 0x7f040510
+.field public static final textColorSearchUrl:I = 0x7f040502
 
-.field public static final theme:I = 0x7f040517
+.field public static final theme:I = 0x7f040509
 
-.field public static final thickness:I = 0x7f040543
+.field public static final thickness:I = 0x7f040535
 
-.field public static final thumbTextPadding:I = 0x7f040547
+.field public static final thumbTextPadding:I = 0x7f040539
 
-.field public static final thumbTint:I = 0x7f040548
+.field public static final thumbTint:I = 0x7f04053a
 
-.field public static final thumbTintMode:I = 0x7f040549
+.field public static final thumbTintMode:I = 0x7f04053b
 
-.field public static final tickMark:I = 0x7f04054d
+.field public static final tickMark:I = 0x7f04053f
 
-.field public static final tickMarkTint:I = 0x7f04054e
+.field public static final tickMarkTint:I = 0x7f040540
 
-.field public static final tickMarkTintMode:I = 0x7f04054f
+.field public static final tickMarkTintMode:I = 0x7f040541
 
-.field public static final tint:I = 0x7f040551
+.field public static final tint:I = 0x7f040543
 
-.field public static final tintMode:I = 0x7f040552
+.field public static final tintMode:I = 0x7f040544
 
-.field public static final title:I = 0x7f040553
+.field public static final title:I = 0x7f040545
 
-.field public static final titleMargin:I = 0x7f040555
+.field public static final titleMargin:I = 0x7f040547
 
-.field public static final titleMarginBottom:I = 0x7f040556
+.field public static final titleMarginBottom:I = 0x7f040548
 
-.field public static final titleMarginEnd:I = 0x7f040557
+.field public static final titleMarginEnd:I = 0x7f040549
 
-.field public static final titleMarginStart:I = 0x7f040558
+.field public static final titleMarginStart:I = 0x7f04054a
 
-.field public static final titleMarginTop:I = 0x7f040559
+.field public static final titleMarginTop:I = 0x7f04054b
 
-.field public static final titleMargins:I = 0x7f04055a
+.field public static final titleMargins:I = 0x7f04054c
 
-.field public static final titleTextAppearance:I = 0x7f04055b
+.field public static final titleTextAppearance:I = 0x7f04054d
 
-.field public static final titleTextColor:I = 0x7f04055c
+.field public static final titleTextColor:I = 0x7f04054e
 
-.field public static final titleTextStyle:I = 0x7f04055d
+.field public static final titleTextStyle:I = 0x7f04054f
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040561
+.field public static final toolbarNavigationButtonStyle:I = 0x7f040553
 
-.field public static final toolbarStyle:I = 0x7f040562
+.field public static final toolbarStyle:I = 0x7f040554
 
-.field public static final tooltipForegroundColor:I = 0x7f040563
+.field public static final tooltipForegroundColor:I = 0x7f040555
 
-.field public static final tooltipFrameBackground:I = 0x7f040564
+.field public static final tooltipFrameBackground:I = 0x7f040556
 
-.field public static final tooltipText:I = 0x7f040566
+.field public static final tooltipText:I = 0x7f040558
 
-.field public static final track:I = 0x7f04056a
+.field public static final track:I = 0x7f04055c
 
-.field public static final trackTint:I = 0x7f04056f
+.field public static final trackTint:I = 0x7f040561
 
-.field public static final trackTintMode:I = 0x7f040570
+.field public static final trackTintMode:I = 0x7f040562
 
-.field public static final ttcIndex:I = 0x7f040573
+.field public static final ttcIndex:I = 0x7f040565
 
-.field public static final ucrop_artv_ratio_title:I = 0x7f040577
+.field public static final ucrop_artv_ratio_title:I = 0x7f040569
 
-.field public static final ucrop_artv_ratio_x:I = 0x7f040578
+.field public static final ucrop_artv_ratio_x:I = 0x7f04056a
 
-.field public static final ucrop_artv_ratio_y:I = 0x7f040579
+.field public static final ucrop_artv_ratio_y:I = 0x7f04056b
 
-.field public static final ucrop_aspect_ratio_x:I = 0x7f04057a
+.field public static final ucrop_aspect_ratio_x:I = 0x7f04056c
 
-.field public static final ucrop_aspect_ratio_y:I = 0x7f04057b
+.field public static final ucrop_aspect_ratio_y:I = 0x7f04056d
 
-.field public static final ucrop_circle_dimmed_layer:I = 0x7f04057c
+.field public static final ucrop_circle_dimmed_layer:I = 0x7f04056e
 
-.field public static final ucrop_dimmed_color:I = 0x7f04057d
+.field public static final ucrop_dimmed_color:I = 0x7f04056f
 
-.field public static final ucrop_frame_color:I = 0x7f04057e
+.field public static final ucrop_frame_color:I = 0x7f040570
 
-.field public static final ucrop_frame_stroke_size:I = 0x7f04057f
+.field public static final ucrop_frame_stroke_size:I = 0x7f040571
 
-.field public static final ucrop_grid_color:I = 0x7f040580
+.field public static final ucrop_grid_color:I = 0x7f040572
 
-.field public static final ucrop_grid_column_count:I = 0x7f040581
+.field public static final ucrop_grid_column_count:I = 0x7f040573
 
-.field public static final ucrop_grid_row_count:I = 0x7f040582
+.field public static final ucrop_grid_row_count:I = 0x7f040574
 
-.field public static final ucrop_grid_stroke_size:I = 0x7f040583
+.field public static final ucrop_grid_stroke_size:I = 0x7f040575
 
-.field public static final ucrop_show_frame:I = 0x7f040584
+.field public static final ucrop_show_frame:I = 0x7f040576
 
-.field public static final ucrop_show_grid:I = 0x7f040585
+.field public static final ucrop_show_grid:I = 0x7f040577
 
-.field public static final ucrop_show_oval_crop_frame:I = 0x7f040586
+.field public static final ucrop_show_oval_crop_frame:I = 0x7f040578
 
-.field public static final viewInflaterClass:I = 0x7f04059d
+.field public static final viewInflaterClass:I = 0x7f04058f
 
-.field public static final voiceIcon:I = 0x7f04059e
+.field public static final voiceIcon:I = 0x7f040590
 
-.field public static final windowActionBar:I = 0x7f0405a1
+.field public static final windowActionBar:I = 0x7f040593
 
-.field public static final windowActionBarOverlay:I = 0x7f0405a2
+.field public static final windowActionBarOverlay:I = 0x7f040594
 
-.field public static final windowActionModeOverlay:I = 0x7f0405a3
+.field public static final windowActionModeOverlay:I = 0x7f040595
 
-.field public static final windowFixedHeightMajor:I = 0x7f0405a4
+.field public static final windowFixedHeightMajor:I = 0x7f040596
 
-.field public static final windowFixedHeightMinor:I = 0x7f0405a5
+.field public static final windowFixedHeightMinor:I = 0x7f040597
 
-.field public static final windowFixedWidthMajor:I = 0x7f0405a6
+.field public static final windowFixedWidthMajor:I = 0x7f040598
 
-.field public static final windowFixedWidthMinor:I = 0x7f0405a7
+.field public static final windowFixedWidthMinor:I = 0x7f040599
 
-.field public static final windowMinWidthMajor:I = 0x7f0405a8
+.field public static final windowMinWidthMajor:I = 0x7f04059a
 
-.field public static final windowMinWidthMinor:I = 0x7f0405a9
+.field public static final windowMinWidthMinor:I = 0x7f04059b
 
-.field public static final windowNoTitle:I = 0x7f0405aa
+.field public static final windowNoTitle:I = 0x7f04059c
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali
index 945f4f4b6c..56f2b1831d 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali
@@ -182,57 +182,57 @@
 
 .field public static final abc_vector_test:I = 0x7f080087
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
-.field public static final ucrop_ic_angle:I = 0x7f08051c
+.field public static final ucrop_ic_angle:I = 0x7f080520
 
-.field public static final ucrop_ic_crop:I = 0x7f08051d
+.field public static final ucrop_ic_crop:I = 0x7f080521
 
-.field public static final ucrop_ic_cross:I = 0x7f08051e
+.field public static final ucrop_ic_cross:I = 0x7f080522
 
-.field public static final ucrop_ic_done:I = 0x7f08051f
+.field public static final ucrop_ic_done:I = 0x7f080523
 
-.field public static final ucrop_ic_next:I = 0x7f080520
+.field public static final ucrop_ic_next:I = 0x7f080524
 
-.field public static final ucrop_ic_reset:I = 0x7f080521
+.field public static final ucrop_ic_reset:I = 0x7f080525
 
-.field public static final ucrop_ic_rotate:I = 0x7f080522
+.field public static final ucrop_ic_rotate:I = 0x7f080526
 
-.field public static final ucrop_ic_scale:I = 0x7f080523
+.field public static final ucrop_ic_scale:I = 0x7f080527
 
-.field public static final ucrop_shadow_upside:I = 0x7f080524
+.field public static final ucrop_shadow_upside:I = 0x7f080528
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080525
+.field public static final ucrop_vector_ic_crop:I = 0x7f080529
 
-.field public static final ucrop_vector_loader:I = 0x7f080526
+.field public static final ucrop_vector_loader:I = 0x7f08052a
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080527
+.field public static final ucrop_vector_loader_animated:I = 0x7f08052b
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$id.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$id.smali
index 7cf3737b57..42e371ff6c 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$id.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$id.smali
@@ -64,219 +64,219 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0418
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final image_view_crop:I = 0x7f0a04e2
+.field public static final image_view_crop:I = 0x7f0a04e8
 
-.field public static final image_view_logo:I = 0x7f0a04e3
+.field public static final image_view_logo:I = 0x7f0a04e9
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a04e4
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a04ea
 
-.field public static final image_view_state_rotate:I = 0x7f0a04e5
+.field public static final image_view_state_rotate:I = 0x7f0a04eb
 
-.field public static final image_view_state_scale:I = 0x7f0a04e6
+.field public static final image_view_state_scale:I = 0x7f0a04ec
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final layout_aspect_ratio:I = 0x7f0a057d
+.field public static final layout_aspect_ratio:I = 0x7f0a0583
 
-.field public static final layout_rotate_wheel:I = 0x7f0a057e
+.field public static final layout_rotate_wheel:I = 0x7f0a0584
 
-.field public static final layout_scale_wheel:I = 0x7f0a057f
+.field public static final layout_scale_wheel:I = 0x7f0a0585
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final menu_crop:I = 0x7f0a05bc
+.field public static final menu_crop:I = 0x7f0a05c2
 
-.field public static final menu_loader:I = 0x7f0a05c5
+.field public static final menu_loader:I = 0x7f0a05cb
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a0785
+.field public static final rotate_scroll_wheel:I = 0x7f0a078b
 
-.field public static final scale_scroll_wheel:I = 0x7f0a078d
+.field public static final scale_scroll_wheel:I = 0x7f0a0793
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final state_aspect_ratio:I = 0x7f0a0930
+.field public static final state_aspect_ratio:I = 0x7f0a0934
 
-.field public static final state_rotate:I = 0x7f0a0931
+.field public static final state_rotate:I = 0x7f0a0935
 
-.field public static final state_scale:I = 0x7f0a0932
+.field public static final state_scale:I = 0x7f0a0936
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final text_view_rotate:I = 0x7f0a0983
+.field public static final text_view_rotate:I = 0x7f0a0987
 
-.field public static final text_view_scale:I = 0x7f0a0984
+.field public static final text_view_scale:I = 0x7f0a0988
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final toolbar:I = 0x7f0a0995
+.field public static final toolbar:I = 0x7f0a0999
 
-.field public static final toolbar_title:I = 0x7f0a0997
+.field public static final toolbar_title:I = 0x7f0a099b
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final ucrop:I = 0x7f0a09aa
+.field public static final ucrop:I = 0x7f0a09ae
 
-.field public static final ucrop_frame:I = 0x7f0a09ab
+.field public static final ucrop_frame:I = 0x7f0a09af
 
-.field public static final ucrop_photobox:I = 0x7f0a09ac
+.field public static final ucrop_photobox:I = 0x7f0a09b0
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final view_overlay:I = 0x7f0a0a39
+.field public static final view_overlay:I = 0x7f0a0a3d
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
-.field public static final wrapper_controls:I = 0x7f0a0aba
+.field public static final wrapper_controls:I = 0x7f0a0abf
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0abb
+.field public static final wrapper_reset_rotate:I = 0x7f0a0ac0
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0abc
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a0ac1
 
-.field public static final wrapper_states:I = 0x7f0a0abd
+.field public static final wrapper_states:I = 0x7f0a0ac2
 
 
 # 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 446ceb14eb..cee9a463d4 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
@@ -68,19 +68,19 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f120020
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121645
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f12166f
 
-.field public static final ucrop_label_edit_photo:I = 0x7f121646
+.field public static final ucrop_label_edit_photo:I = 0x7f121670
 
-.field public static final ucrop_label_original:I = 0x7f121647
+.field public static final ucrop_label_original:I = 0x7f121671
 
-.field public static final ucrop_menu_crop:I = 0x7f121648
+.field public static final ucrop_menu_crop:I = 0x7f121672
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121649
+.field public static final ucrop_mutate_exception_hint:I = 0x7f121673
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali
index 40401c8e6b..e183beb23f 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$style.smali
@@ -556,165 +556,165 @@
 
 .field public static final Theme_AppCompat_NoActionBar:I = 0x7f130264
 
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f130398
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130397
 
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130399
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130398
 
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f13039a
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130399
 
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039b
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f13039a
 
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039c
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f13039b
 
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039d
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f13039c
 
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039e
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f13039d
 
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039f
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f13039e
 
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1303a0
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13039f
 
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a1
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1303a0
 
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a2
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1303a1
 
-.field public static final Widget_AppCompat_Button:I = 0x7f1303a3
+.field public static final Widget_AppCompat_Button:I = 0x7f1303a2
 
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a9
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1303a8
 
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303aa
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1303a9
 
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a4
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1303a3
 
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a5
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1303a4
 
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a6
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1303a5
 
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a7
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1303a6
 
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a8
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f1303a7
 
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303ab
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1303aa
 
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ac
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1303ab
 
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ad
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1303ac
 
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ae
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f1303ad
 
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303af
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1303ae
 
-.field public static final Widget_AppCompat_EditText:I = 0x7f1303b0
+.field public static final Widget_AppCompat_EditText:I = 0x7f1303af
 
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b1
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f1303b0
 
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b2
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f1303b1
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b3
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1303b2
 
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b4
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f1303b3
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b5
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1303b4
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b6
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f1303b5
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b7
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1303b6
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b8
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1303b7
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b9
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1303b8
 
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303ba
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f1303b9
 
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303bb
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f1303ba
 
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bc
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f1303bb
 
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bd
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f1303bc
 
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303be
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f1303bd
 
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303bf
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f1303be
 
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303c0
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f1303bf
 
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c1
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f1303c0
 
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c2
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f1303c1
 
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c3
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f1303c2
 
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c4
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f1303c3
 
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c5
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1303c4
 
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c6
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f1303c5
 
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c7
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f1303c6
 
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c8
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f1303c7
 
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c9
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f1303c8
 
-.field public static final Widget_AppCompat_ListView:I = 0x7f1303ca
+.field public static final Widget_AppCompat_ListView:I = 0x7f1303c9
 
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303cb
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f1303ca
 
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cc
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f1303cb
 
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cd
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f1303cc
 
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303ce
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1303cd
 
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303cf
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f1303ce
 
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303d0
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f1303cf
 
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d1
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1303d0
 
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d2
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f1303d1
 
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d3
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f1303d2
 
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d4
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f1303d3
 
-.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d5
+.field public static final Widget_AppCompat_SearchView:I = 0x7f1303d4
 
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d6
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f1303d5
 
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d7
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f1303d6
 
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d8
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f1303d7
 
-.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d9
+.field public static final Widget_AppCompat_Spinner:I = 0x7f1303d8
 
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303da
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f1303d9
 
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303db
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f1303da
 
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303dc
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f1303db
 
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303de
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1303dd
 
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303df
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f1303de
 
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303e0
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1303df
 
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e1
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1303e0
 
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e2
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1303e1
 
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130452
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130451
 
-.field public static final ucrop_ImageViewWidgetIcon:I = 0x7f130454
+.field public static final ucrop_ImageViewWidgetIcon:I = 0x7f130453
 
-.field public static final ucrop_TextViewCropAspectRatio:I = 0x7f130455
+.field public static final ucrop_TextViewCropAspectRatio:I = 0x7f130454
 
-.field public static final ucrop_TextViewWidgetText:I = 0x7f130456
+.field public static final ucrop_TextViewWidgetText:I = 0x7f130455
 
-.field public static final ucrop_WrapperIconState:I = 0x7f130457
+.field public static final ucrop_WrapperIconState:I = 0x7f130456
 
-.field public static final ucrop_WrapperRotateButton:I = 0x7f130458
+.field public static final ucrop_WrapperRotateButton:I = 0x7f130457
 
 
 # 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 2aa42594c0..7f291e0a82 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
@@ -1239,7 +1239,7 @@
 
     new-array v4, v0, [I
 
-    const v5, 0x7f0404af
+    const v5, 0x7f0404a1
 
     aput v5, v4, v3
 
@@ -1366,10 +1366,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1378,8 +1378,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1396,8 +1396,8 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
@@ -1427,17 +1427,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_9
@@ -1472,8 +1472,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_b
@@ -1571,38 +1571,38 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_c
@@ -1623,7 +1623,7 @@
     :array_e
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_f
@@ -1645,8 +1645,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_11
@@ -1670,7 +1670,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_13
@@ -1705,7 +1705,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_16
@@ -1755,8 +1755,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_1a
@@ -1769,7 +1769,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_1b
@@ -1799,11 +1799,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_1e
@@ -1830,17 +1830,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_21
@@ -1859,8 +1859,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_22
@@ -1883,18 +1883,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_23
@@ -1903,7 +1903,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_24
@@ -1922,26 +1922,26 @@
 
     :array_26
     .array-data 4
-        0x7f040577
-        0x7f040578
-        0x7f040579
+        0x7f040569
+        0x7f04056a
+        0x7f04056b
     .end array-data
 
     :array_27
     .array-data 4
-        0x7f04057a
-        0x7f04057b
-        0x7f04057c
-        0x7f04057d
-        0x7f04057e
-        0x7f04057f
-        0x7f040580
-        0x7f040581
-        0x7f040582
-        0x7f040583
-        0x7f040584
-        0x7f040585
-        0x7f040586
+        0x7f04056c
+        0x7f04056d
+        0x7f04056e
+        0x7f04056f
+        0x7f040570
+        0x7f040571
+        0x7f040572
+        0x7f040573
+        0x7f040574
+        0x7f040575
+        0x7f040576
+        0x7f040577
+        0x7f040578
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/BuildConfig.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/BuildConfig.smali
deleted file mode 100644
index 8eef7c33ef..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/BuildConfig.smali
+++ /dev/null
@@ -1,27 +0,0 @@
-.class public final Lcom/miguelgaeta/super_bar/BuildConfig;
-.super Ljava/lang/Object;
-.source "BuildConfig.java"
-
-
-# static fields
-.field public static final APPLICATION_ID:Ljava/lang/String; = "com.miguelgaeta.super_bar"
-
-.field public static final BUILD_TYPE:Ljava/lang/String; = "release"
-
-.field public static final DEBUG:Z = false
-
-.field public static final FLAVOR:Ljava/lang/String; = ""
-
-.field public static final VERSION_CODE:I = 0x1
-
-.field public static final VERSION_NAME:Ljava/lang/String; = "1.0"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$attr.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$attr.smali
deleted file mode 100644
index 95be4d5d93..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$attr.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Lcom/miguelgaeta/super_bar/R$attr;
-.super Ljava/lang/Object;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/miguelgaeta/super_bar/R;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "attr"
-.end annotation
-
-
-# static fields
-.field public static final sb_barBackgroundColor:I = 0x7f040457
-
-.field public static final sb_barColor:I = 0x7f040458
-
-.field public static final sb_barControlColor:I = 0x7f040459
-
-.field public static final sb_barControlRadius:I = 0x7f04045a
-
-.field public static final sb_barControlShadowColor:I = 0x7f04045b
-
-.field public static final sb_barControlShadowRadius:I = 0x7f04045c
-
-.field public static final sb_barHeight:I = 0x7f04045d
-
-.field public static final sb_barInterval:I = 0x7f04045e
-
-.field public static final sb_barOverlayColor:I = 0x7f04045f
-
-.field public static final sb_barOverlayValue:I = 0x7f040460
-
-.field public static final sb_barTouchEnabled:I = 0x7f040461
-
-.field public static final sb_barValue:I = 0x7f040462
-
-.field public static final sb_barValueMax:I = 0x7f040463
-
-.field public static final sb_barValueMin:I = 0x7f040464
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$styleable.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$styleable.smali
deleted file mode 100644
index effc109d05..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R$styleable.smali
+++ /dev/null
@@ -1,87 +0,0 @@
-.class public final Lcom/miguelgaeta/super_bar/R$styleable;
-.super Ljava/lang/Object;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/miguelgaeta/super_bar/R;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "styleable"
-.end annotation
-
-
-# static fields
-.field public static final SuperBar:[I
-
-.field public static final SuperBar_sb_barBackgroundColor:I = 0x0
-
-.field public static final SuperBar_sb_barColor:I = 0x1
-
-.field public static final SuperBar_sb_barControlColor:I = 0x2
-
-.field public static final SuperBar_sb_barControlRadius:I = 0x3
-
-.field public static final SuperBar_sb_barControlShadowColor:I = 0x4
-
-.field public static final SuperBar_sb_barControlShadowRadius:I = 0x5
-
-.field public static final SuperBar_sb_barHeight:I = 0x6
-
-.field public static final SuperBar_sb_barInterval:I = 0x7
-
-.field public static final SuperBar_sb_barOverlayColor:I = 0x8
-
-.field public static final SuperBar_sb_barOverlayValue:I = 0x9
-
-.field public static final SuperBar_sb_barTouchEnabled:I = 0xa
-
-.field public static final SuperBar_sb_barValue:I = 0xb
-
-.field public static final SuperBar_sb_barValueMax:I = 0xc
-
-.field public static final SuperBar_sb_barValueMin:I = 0xd
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/16 v0, 0xe
-
-    new-array v0, v0, [I
-
-    fill-array-data v0, :array_0
-
-    sput-object v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar:[I
-
-    return-void
-
-    :array_0
-    .array-data 4
-        0x7f040457
-        0x7f040458
-        0x7f040459
-        0x7f04045a
-        0x7f04045b
-        0x7f04045c
-        0x7f04045d
-        0x7f04045e
-        0x7f04045f
-        0x7f040460
-        0x7f040461
-        0x7f040462
-        0x7f040463
-        0x7f040464
-    .end array-data
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/R.smali
deleted file mode 100644
index 4eb81993f5..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/R.smali
+++ /dev/null
@@ -1,21 +0,0 @@
-.class public final Lcom/miguelgaeta/super_bar/R;
-.super Ljava/lang/Object;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/miguelgaeta/super_bar/R$attr;,
-        Lcom/miguelgaeta/super_bar/R$styleable;
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$1.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$1.smali
deleted file mode 100644
index 5aed73bb30..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$1.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.class public Lcom/miguelgaeta/super_bar/SuperBar$1;
-.super Ljava/lang/Object;
-.source "SuperBar.java"
-
-# interfaces
-.implements Landroid/view/View$OnTouchListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/miguelgaeta/super_bar/SuperBar;->init()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lcom/miguelgaeta/super_bar/SuperBar;
-
-
-# direct methods
-.method public constructor <init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar$1;->this$0:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
-    .locals 2
-
-    invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    invoke-interface {v0, v1}, Landroid/view/ViewParent;->requestDisallowInterceptTouchEvent(Z)V
-
-    invoke-virtual {p2}, Landroid/view/MotionEvent;->getAction()I
-
-    move-result p2
-
-    and-int/lit16 p2, p2, 0xff
-
-    const/4 v0, 0x0
-
-    if-eq p2, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
-
-    move-result-object p1
-
-    invoke-interface {p1, v0}, Landroid/view/ViewParent;->requestDisallowInterceptTouchEvent(Z)V
-
-    :goto_0
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid.smali
deleted file mode 100644
index 8fa21fc0f8..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid.smali
+++ /dev/null
@@ -1,43 +0,0 @@
-.class public Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;
-.super Ljava/lang/Object;
-.source "SuperBar.java"
-
-# interfaces
-.implements Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "Solid"
-.end annotation
-
-
-# instance fields
-.field public color:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;->color:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getColor(FFF)I
-    .locals 0
-
-    iget p1, p0, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;->color:I
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter.smali
deleted file mode 100644
index d1012af6cc..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$ColorFormatter.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public interface abstract Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-.super Ljava/lang/Object;
-.source "SuperBar.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/miguelgaeta/super_bar/SuperBar;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "ColorFormatter"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract getColor(FFF)I
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionChanged.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionChanged.smali
deleted file mode 100644
index a5e0e48a58..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionChanged.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public interface abstract Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-.super Ljava/lang/Object;
-.source "SuperBar.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/miguelgaeta/super_bar/SuperBar;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "OnSelectionChanged"
-.end annotation
-
-
-# virtual methods
-.method public abstract onSelectionChanged(FFFLcom/miguelgaeta/super_bar/SuperBar;)V
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionMoved.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionMoved.smali
deleted file mode 100644
index 15adbda915..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar$OnSelectionMoved.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public interface abstract Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
-.super Ljava/lang/Object;
-.source "SuperBar.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/miguelgaeta/super_bar/SuperBar;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "OnSelectionMoved"
-.end annotation
-
-
-# virtual methods
-.method public abstract onSelectionMoved(FFFLcom/miguelgaeta/super_bar/SuperBar;)V
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar.smali
deleted file mode 100644
index aef28b19ad..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBar.smali
+++ /dev/null
@@ -1,215 +0,0 @@
-.class public Lcom/miguelgaeta/super_bar/SuperBar;
-.super Landroid/view/View;
-.source "SuperBar.java"
-
-# interfaces
-.implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;,
-        Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;,
-        Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-    }
-.end annotation
-
-
-# instance fields
-.field public final attrs:Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-.field public final config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-.field public final drawer:Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-.field public final paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-
-# direct methods
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Landroid/view/View;-><init>(Landroid/content/Context;)V
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarAttributes;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->attrs:Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarPainter;-><init>(Landroid/view/View;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->drawer:Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-direct {p0}, Lcom/miguelgaeta/super_bar/SuperBar;->init()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 1
-
-    invoke-direct {p0, p1, p2}, Landroid/view/View;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarAttributes;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->attrs:Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarPainter;-><init>(Landroid/view/View;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->drawer:Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->attrs:Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarAttributes;->parse(Landroid/util/AttributeSet;I)V
-
-    invoke-direct {p0}, Lcom/miguelgaeta/super_bar/SuperBar;->init()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-    .locals 0
-
-    invoke-direct {p0, p1, p2, p3}, Landroid/view/View;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarAttributes;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->attrs:Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarPainter;-><init>(Landroid/view/View;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->drawer:Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    new-instance p1, Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-direct {p1, p0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBar;->attrs:Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-
-    invoke-virtual {p1, p2, p3}, Lcom/miguelgaeta/super_bar/SuperBarAttributes;->parse(Landroid/util/AttributeSet;I)V
-
-    invoke-direct {p0}, Lcom/miguelgaeta/super_bar/SuperBar;->init()V
-
-    return-void
-.end method
-
-.method private init()V
-    .locals 2
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, v0, v1}, Landroid/view/View;->setLayerType(ILandroid/graphics/Paint;)V
-
-    new-instance v0, Lcom/miguelgaeta/super_bar/SuperBar$1;
-
-    invoke-direct {v0, p0}, Lcom/miguelgaeta/super_bar/SuperBar$1;-><init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-
-    invoke-virtual {p0, v0}, Landroid/view/View;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    return-object v0
-.end method
-
-.method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
-    .locals 0
-
-    invoke-virtual {p0}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public onDraw(Landroid/graphics/Canvas;)V
-    .locals 1
-
-    invoke-super {p0, p1}, Landroid/view/View;->onDraw(Landroid/graphics/Canvas;)V
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBar;->drawer:Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    invoke-virtual {v0, p1}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->draw(Landroid/graphics/Canvas;)V
-
-    return-void
-.end method
-
-.method public onTouchEvent(Landroid/view/MotionEvent;)Z
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->isTouchEnabled()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-super {p0, p1}, Landroid/view/View;->onTouchEvent(Landroid/view/MotionEvent;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBar;->drawer:Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-
-    invoke-virtual {v0, p1}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->onTouchEvent(Landroid/view/MotionEvent;)Z
-
-    move-result p1
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarAttributes.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarAttributes.smali
deleted file mode 100644
index da0bb37c9f..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarAttributes.smali
+++ /dev/null
@@ -1,253 +0,0 @@
-.class public Lcom/miguelgaeta/super_bar/SuperBarAttributes;
-.super Ljava/lang/Object;
-.source "SuperBarAttributes.java"
-
-
-# instance fields
-.field public final sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-
-# direct methods
-.method public constructor <init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarAttributes;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public parse(Landroid/util/AttributeSet;I)V
-    .locals 6
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarAttributes;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar:[I
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, p1, v1, p2, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
-
-    move-result-object p1
-
-    :try_start_0
-    iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarAttributes;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBar;->getConfig()Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    move-result-object p2
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barValueMin:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v0
-
-    sget v1, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barValueMax:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v3
-
-    invoke-virtual {p1, v1, v3}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v1
-
-    invoke-virtual {p2, v0, v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarValueBounds(FF)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barHeight:I
-
-    invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result v0
-
-    int-to-float v0, v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarHeight(F)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barInterval:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarInterval()F
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarInterval(F)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barColor:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getColor()Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    move-result-object v1
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarValue()F
-
-    move-result v3
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v4
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v5
-
-    invoke-interface {v1, v3, v4, v5}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;->getColor(FFF)I
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setColor(I)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barBackgroundColor:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBackgroundColor()I
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBackgroundColor(I)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barTouchEnabled:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->isTouchEnabled()Z
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setTouchEnabled(Z)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barOverlayValue:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOverlayBarValue()F
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setOverlayBarValue(F)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barOverlayColor:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOverlayBarColor()Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    move-result-object v1
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOverlayBarValue()F
-
-    move-result v3
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v4
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v5
-
-    invoke-interface {v1, v3, v4, v5}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;->getColor(FFF)I
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setOverlayBarColor(I)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barControlRadius:I
-
-    invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setControlRadius(I)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barControlColor:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlColor()I
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setControlColor(I)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barControlShadowColor:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowColor()I
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setControlShadowColor(I)V
-
-    sget v0, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barControlShadowRadius:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result v0
-
-    invoke-virtual {p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setControlShadowRadius(I)V
-
-    const/4 v0, 0x0
-
-    sget v1, Lcom/miguelgaeta/super_bar/R$styleable;->SuperBar_sb_barValue:I
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarValue()F
-
-    move-result v2
-
-    invoke-virtual {p1, v1, v2}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result v1
-
-    invoke-virtual {p2, v0, v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarValue(Ljava/lang/Integer;F)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
-
-    return-void
-
-    :catchall_0
-    move-exception p2
-
-    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
-
-    throw p2
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarConfig.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarConfig.smali
deleted file mode 100644
index af4c1043ca..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarConfig.smali
+++ /dev/null
@@ -1,591 +0,0 @@
-.class public Lcom/miguelgaeta/super_bar/SuperBarConfig;
-.super Ljava/lang/Object;
-.source "SuperBarConfig.java"
-
-
-# instance fields
-.field public backgroundColor:I
-
-.field public barHeight:F
-
-.field public barInterval:F
-
-.field public barValue:F
-
-.field public color:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-.field public controlColor:I
-
-.field public controlRadius:I
-
-.field public controlShadowColor:I
-
-.field public controlShadowRadius:I
-
-.field public gestureDetector:Landroid/view/GestureDetector;
-
-.field public maxBarValue:F
-
-.field public minBarValue:F
-
-.field public onSelectionChanged:Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-
-.field public onSelectionMoved:Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
-
-.field public overlayBarColor:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-.field public overlayBarValue:F
-
-.field public final superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-.field public touchEnabled:Z
-
-
-# direct methods
-.method public constructor <init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barHeight:F
-
-    const/high16 v1, 0x42200000    # 40.0f
-
-    iput v1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barValue:F
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
-
-    const/high16 v0, 0x42c80000    # 100.0f
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
-
-    const/high16 v0, 0x3f800000    # 1.0f
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barInterval:F
-
-    const v0, -0xff0100
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->backgroundColor:I
-
-    new-instance v0, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;
-
-    const v1, -0xffff01
-
-    invoke-direct {v0, v1}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;-><init>(I)V
-
-    iput-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->color:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->touchEnabled:Z
-
-    const/high16 v0, 0x42a00000    # 80.0f
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->overlayBarValue:F
-
-    new-instance v0, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;
-
-    const/high16 v1, -0x10000
-
-    invoke-direct {v0, v1}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;-><init>(I)V
-
-    iput-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->overlayBarColor:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    const/4 v0, 0x6
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlShadowRadius:I
-
-    const/16 v0, 0x7f
-
-    const/4 v1, 0x0
-
-    invoke-static {v0, v1, v1, v1}, Landroid/graphics/Color;->argb(IIII)I
-
-    move-result v0
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlShadowColor:I
-
-    const/16 v0, -0x100
-
-    iput v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlColor:I
-
-    iput v1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlRadius:I
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    return-void
-.end method
-
-.method private setBarValue(F)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barValue:F
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getBackgroundColor()I
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->backgroundColor:I
-
-    return v0
-.end method
-
-.method public getBarHeight()F
-    .locals 2
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barHeight:F
-
-    const/4 v1, 0x0
-
-    cmpl-float v1, v0, v1
-
-    if-lez v1, :cond_0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v1}, Landroid/view/View;->getHeight()I
-
-    move-result v1
-
-    int-to-float v1, v1
-
-    cmpg-float v0, v0, v1
-
-    if-gez v0, :cond_0
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barHeight:F
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getHeight()I
-
-    move-result v0
-
-    int-to-float v0, v0
-
-    :goto_0
-    return v0
-.end method
-
-.method public getBarInterval()F
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barInterval:F
-
-    return v0
-.end method
-
-.method public getBarValue()F
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barValue:F
-
-    return v0
-.end method
-
-.method public getColor()Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->color:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    return-object v0
-.end method
-
-.method public getControlColor()I
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlColor:I
-
-    return v0
-.end method
-
-.method public getControlRadius()I
-    .locals 2
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlRadius:I
-
-    if-lez v0, :cond_0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v1}, Landroid/view/View;->getHeight()I
-
-    move-result v1
-
-    if-ge v0, v1, :cond_0
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlRadius:I
-
-    int-to-float v0, v0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getHeight()I
-
-    move-result v0
-
-    int-to-float v0, v0
-
-    const/high16 v1, 0x40000000    # 2.0f
-
-    div-float/2addr v0, v1
-
-    :goto_0
-    float-to-int v0, v0
-
-    return v0
-.end method
-
-.method public getControlShadowColor()I
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlShadowColor:I
-
-    return v0
-.end method
-
-.method public getControlShadowRadius()I
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlShadowRadius:I
-
-    return v0
-.end method
-
-.method public getGestureDetector()Landroid/view/GestureDetector;
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->gestureDetector:Landroid/view/GestureDetector;
-
-    return-object v0
-.end method
-
-.method public getMaxBarValue()F
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
-
-    return v0
-.end method
-
-.method public getMinBarValue()F
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
-
-    return v0
-.end method
-
-.method public getOnSelectionChanged()Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->onSelectionChanged:Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-
-    return-object v0
-.end method
-
-.method public getOnSelectionMoved()Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->onSelectionMoved:Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
-
-    return-object v0
-.end method
-
-.method public getOverlayBarColor()Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->overlayBarColor:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    return-object v0
-.end method
-
-.method public getOverlayBarValue()F
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->overlayBarValue:F
-
-    return v0
-.end method
-
-.method public isTouchEnabled()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->touchEnabled:Z
-
-    return v0
-.end method
-
-.method public setBackgroundColor(I)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->backgroundColor:I
-
-    return-void
-.end method
-
-.method public setBarHeight(F)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barHeight:F
-
-    return-void
-.end method
-
-.method public setBarInterval(F)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barInterval:F
-
-    return-void
-.end method
-
-.method public setBarValue(Ljava/lang/Integer;F)V
-    .locals 1
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barValue:F
-
-    invoke-virtual {p0, p1, p2, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarValue(Ljava/lang/Integer;FF)V
-
-    return-void
-.end method
-
-.method public setBarValue(Ljava/lang/Integer;FF)V
-    .locals 2
-
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
-
-    cmpg-float v1, p3, v0
-
-    if-gez v1, :cond_0
-
-    move p3, v0
-
-    :cond_0
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
-
-    cmpl-float v1, p3, v0
-
-    if-lez v1, :cond_1
-
-    move p3, v0
-
-    :cond_1
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
-
-    cmpg-float v1, p2, v0
-
-    if-gez v1, :cond_2
-
-    move p2, v0
-
-    :cond_2
-    iget v0, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
-
-    cmpl-float v1, p2, v0
-
-    if-lez v1, :cond_3
-
-    move p2, v0
-
-    :cond_3
-    if-nez p1, :cond_4
-
-    iput p2, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->barValue:F
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    goto :goto_0
-
-    :cond_4
-    const/4 v0, 0x2
-
-    new-array v0, v0, [F
-
-    const/4 v1, 0x0
-
-    aput p3, v0, v1
-
-    const/4 p3, 0x1
-
-    aput p2, v0, p3
-
-    const-string p2, "barValue"
-
-    invoke-static {p0, p2, v0}, Landroid/animation/ObjectAnimator;->ofFloat(Ljava/lang/Object;Ljava/lang/String;[F)Landroid/animation/ObjectAnimator;
-
-    move-result-object p2
-
-    new-instance p3, Landroid/view/animation/AccelerateDecelerateInterpolator;
-
-    invoke-direct {p3}, Landroid/view/animation/AccelerateDecelerateInterpolator;-><init>()V
-
-    invoke-virtual {p2, p3}, Landroid/animation/ObjectAnimator;->setInterpolator(Landroid/animation/TimeInterpolator;)V
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    int-to-long v0, p1
-
-    invoke-virtual {p2, v0, v1}, Landroid/animation/ObjectAnimator;->setDuration(J)Landroid/animation/ObjectAnimator;
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {p2, p1}, Landroid/animation/ObjectAnimator;->addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
-
-    invoke-virtual {p2}, Landroid/animation/ObjectAnimator;->start()V
-
-    :goto_0
-    return-void
-.end method
-
-.method public setBarValueBounds(FF)V
-    .locals 0
-
-    iput p2, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->maxBarValue:F
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->minBarValue:F
-
-    return-void
-.end method
-
-.method public setColor(I)V
-    .locals 1
-
-    new-instance v0, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;
-
-    invoke-direct {v0, p1}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;-><init>(I)V
-
-    invoke-virtual {p0, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setColor(Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;)V
-
-    return-void
-.end method
-
-.method public setColor(Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;)V
-    .locals 0
-
-    if-nez p1, :cond_0
-
-    return-void
-
-    :cond_0
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->color:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    return-void
-.end method
-
-.method public setControlColor(I)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlColor:I
-
-    return-void
-.end method
-
-.method public setControlRadius(I)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlRadius:I
-
-    return-void
-.end method
-
-.method public setControlShadowColor(I)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlShadowColor:I
-
-    return-void
-.end method
-
-.method public setControlShadowRadius(I)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->controlShadowRadius:I
-
-    return-void
-.end method
-
-.method public setGestureDetector(Landroid/view/GestureDetector;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->gestureDetector:Landroid/view/GestureDetector;
-
-    return-void
-.end method
-
-.method public setOnSelectedChanged(Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->onSelectionChanged:Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-
-    return-void
-.end method
-
-.method public setOnSelectionMoved(Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->onSelectionMoved:Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
-
-    return-void
-.end method
-
-.method public setOverlayBarColor(I)V
-    .locals 1
-
-    new-instance v0, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;
-
-    invoke-direct {v0, p1}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter$Solid;-><init>(I)V
-
-    invoke-virtual {p0, v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setOverlayBarColor(Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;)V
-
-    return-void
-.end method
-
-.method public setOverlayBarColor(Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;)V
-    .locals 0
-
-    if-nez p1, :cond_0
-
-    return-void
-
-    :cond_0
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->overlayBarColor:Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    return-void
-.end method
-
-.method public setOverlayBarValue(F)V
-    .locals 0
-
-    iput p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->overlayBarValue:F
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->superBar:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setTouchEnabled(Z)V
-    .locals 0
-
-    iput-boolean p1, p0, Lcom/miguelgaeta/super_bar/SuperBarConfig;->touchEnabled:Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarDrawer.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarDrawer.smali
deleted file mode 100644
index 14768ec131..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarDrawer.smali
+++ /dev/null
@@ -1,964 +0,0 @@
-.class public Lcom/miguelgaeta/super_bar/SuperBarDrawer;
-.super Ljava/lang/Object;
-.source "SuperBarDrawer.java"
-
-
-# instance fields
-.field public rect:Landroid/graphics/RectF;
-
-.field public final sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-
-# direct methods
-.method public constructor <init>(Lcom/miguelgaeta/super_bar/SuperBar;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Landroid/graphics/RectF;
-
-    invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
-
-    iput-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    return-void
-.end method
-
-.method private drawBackgroundBar(Landroid/graphics/Canvas;FF)V
-    .locals 4
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    int-to-float v1, v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v2}, Landroid/view/View;->getWidth()I
-
-    move-result v2
-
-    iget-object v3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v3, v3, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v3}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v3
-
-    sub-int/2addr v2, v3
-
-    int-to-float v2, v2
-
-    invoke-virtual {v0, v1, p2, v2, p3}, Landroid/graphics/RectF;->set(FFFF)V
-
-    iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p3, p2, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    iget-object p2, p2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBackgroundColor()I
-
-    move-result p2
-
-    invoke-virtual {p3, p2}, Lcom/miguelgaeta/super_bar/SuperBarPainter;->setColor(I)V
-
-    iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
-
-    move-result p3
-
-    const/high16 v0, 0x40000000    # 2.0f
-
-    div-float/2addr p3, v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {v1}, Landroid/graphics/RectF;->height()F
-
-    move-result v1
-
-    div-float/2addr v1, v0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    invoke-virtual {p1, p2, p3, v1, v0}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
-
-    return-void
-.end method
-
-.method private drawBar(Landroid/graphics/Canvas;FFF)V
-    .locals 3
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getWidth()I
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    mul-int/lit8 v1, v1, 0x2
-
-    sub-int/2addr v0, v1
-
-    int-to-float v0, v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v2
-
-    sub-float/2addr v1, v2
-
-    div-float/2addr v0, v1
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v1
-
-    sub-float/2addr p4, v1
-
-    mul-float p4, p4, v0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    int-to-float v1, v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v2
-
-    int-to-float v2, v2
-
-    add-float/2addr p4, v2
-
-    invoke-virtual {v0, v1, p2, p4, p3}, Landroid/graphics/RectF;->set(FFFF)V
-
-    iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p3, p2, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    iget-object p2, p2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getColor()Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    move-result-object p2
-
-    iget-object p4, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p4, p4, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p4}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarValue()F
-
-    move-result p4
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v1
-
-    invoke-interface {p2, p4, v0, v1}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;->getColor(FFF)I
-
-    move-result p2
-
-    invoke-virtual {p3, p2}, Lcom/miguelgaeta/super_bar/SuperBarPainter;->setColor(I)V
-
-    iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
-
-    move-result p3
-
-    const/high16 p4, 0x40000000    # 2.0f
-
-    div-float/2addr p3, p4
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
-
-    move-result v0
-
-    div-float/2addr v0, p4
-
-    iget-object p4, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p4, p4, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    invoke-virtual {p1, p2, p3, v0, p4}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
-
-    return-void
-.end method
-
-.method private drawControl(Landroid/graphics/Canvas;F)V
-    .locals 4
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getWidth()I
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    mul-int/lit8 v1, v1, 0x2
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlRadius()I
-
-    move-result v2
-
-    mul-int/lit8 v2, v2, 0x2
-
-    add-int/2addr v2, v1
-
-    sub-int/2addr v0, v2
-
-    int-to-float v0, v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v2
-
-    sub-float/2addr v1, v2
-
-    div-float/2addr v0, v1
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v1
-
-    sub-float/2addr p2, v1
-
-    mul-float p2, p2, v0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlRadius()I
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    int-to-float v0, v1
-
-    add-float/2addr p2, v0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v0, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlColor()I
-
-    move-result v0
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v3, v3, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v3}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowColor()I
-
-    move-result v3
-
-    invoke-virtual {v1, v0, v2, v3}, Lcom/miguelgaeta/super_bar/SuperBarPainter;->setColor(ILjava/lang/Integer;I)V
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getHeight()I
-
-    move-result v0
-
-    int-to-float v0, v0
-
-    const/high16 v1, 0x40000000    # 2.0f
-
-    div-float/2addr v0, v1
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlRadius()I
-
-    move-result v1
-
-    int-to-float v1, v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    invoke-virtual {p1, p2, v0, v1, v2}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
-
-    return-void
-.end method
-
-.method private drawOverlayBar(Landroid/graphics/Canvas;FFF)V
-    .locals 3
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getWidth()I
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    mul-int/lit8 v1, v1, 0x2
-
-    sub-int/2addr v0, v1
-
-    int-to-float v0, v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v2
-
-    sub-float/2addr v1, v2
-
-    div-float/2addr v0, v1
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v1
-
-    sub-float/2addr p4, v1
-
-    mul-float p4, p4, v0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v1
-
-    int-to-float v1, v1
-
-    add-float/2addr p4, v1
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v1}, Landroid/view/View;->getWidth()I
-
-    move-result v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getControlShadowRadius()I
-
-    move-result v2
-
-    sub-int/2addr v1, v2
-
-    int-to-float v1, v1
-
-    invoke-virtual {v0, p4, p2, v1, p3}, Landroid/graphics/RectF;->set(FFFF)V
-
-    iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p3, p2, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    iget-object p2, p2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOverlayBarColor()Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;
-
-    move-result-object p2
-
-    iget-object p4, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p4, p4, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p4}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOverlayBarValue()F
-
-    move-result p4
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v1
-
-    invoke-interface {p2, p4, v0, v1}, Lcom/miguelgaeta/super_bar/SuperBar$ColorFormatter;->getColor(FFF)I
-
-    move-result p2
-
-    invoke-virtual {p3, p2}, Lcom/miguelgaeta/super_bar/SuperBarPainter;->setColor(I)V
-
-    iget-object p2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
-
-    move-result p3
-
-    const/high16 p4, 0x40000000    # 2.0f
-
-    div-float/2addr p3, p4
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->rect:Landroid/graphics/RectF;
-
-    invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
-
-    move-result v0
-
-    div-float/2addr v0, p4
-
-    iget-object p4, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p4, p4, Lcom/miguelgaeta/super_bar/SuperBar;->paint:Lcom/miguelgaeta/super_bar/SuperBarPainter;
-
-    invoke-virtual {p1, p2, p3, v0, p4}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public draw(Landroid/graphics/Canvas;)V
-    .locals 4
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getHeight()I
-
-    move-result v0
-
-    int-to-float v0, v0
-
-    const/high16 v1, 0x40000000    # 2.0f
-
-    div-float/2addr v0, v1
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarHeight()F
-
-    move-result v2
-
-    div-float/2addr v2, v1
-
-    sub-float/2addr v0, v2
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v2}, Landroid/view/View;->getHeight()I
-
-    move-result v2
-
-    int-to-float v2, v2
-
-    div-float/2addr v2, v1
-
-    iget-object v3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v3, v3, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v3}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarHeight()F
-
-    move-result v3
-
-    div-float/2addr v3, v1
-
-    add-float/2addr v3, v2
-
-    invoke-direct {p0, p1, v0, v3}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->drawBackgroundBar(Landroid/graphics/Canvas;FF)V
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarValue()F
-
-    move-result v1
-
-    invoke-direct {p0, p1, v0, v3, v1}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->drawBar(Landroid/graphics/Canvas;FFF)V
-
-    iget-object v1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v1, v1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOverlayBarValue()F
-
-    move-result v1
-
-    invoke-direct {p0, p1, v0, v3, v1}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->drawOverlayBar(Landroid/graphics/Canvas;FFF)V
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarValue()F
-
-    move-result v0
-
-    invoke-direct {p0, p1, v0}, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->drawControl(Landroid/graphics/Canvas;F)V
-
-    return-void
-.end method
-
-.method public onTouchEvent(Landroid/view/MotionEvent;)Z
-    .locals 7
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getGestureDetector()Landroid/view/GestureDetector;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getGestureDetector()Landroid/view/GestureDetector;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
-
-    move-result v0
-
-    const/4 v2, 0x2
-
-    if-eq v0, v1, :cond_2
-
-    if-eq v0, v2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOnSelectionMoved()Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOnSelectionMoved()Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;
-
-    move-result-object v0
-
-    iget-object v3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v3, v3, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v3}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarValue()F
-
-    move-result v3
-
-    iget-object v4, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v4, v4, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v4}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v4
-
-    iget-object v5, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v5, v5, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v5}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v5
-
-    iget-object v6, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-interface {v0, v3, v4, v5, v6}, Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionMoved;->onSelectionMoved(FFFLcom/miguelgaeta/super_bar/SuperBar;)V
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOnSelectionChanged()Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getOnSelectionChanged()Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;
-
-    move-result-object v0
-
-    iget-object v3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v3, v3, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v3}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarValue()F
-
-    move-result v3
-
-    iget-object v4, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v4, v4, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v4}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v4
-
-    iget-object v5, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v5, v5, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v5}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v5
-
-    iget-object v6, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-interface {v0, v3, v4, v5, v6}, Lcom/miguelgaeta/super_bar/SuperBar$OnSelectionChanged;->onSelectionChanged(FFFLcom/miguelgaeta/super_bar/SuperBar;)V
-
-    :cond_3
-    :goto_0
-    invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
-    if-eq v0, v1, :cond_4
-
-    if-eq v0, v2, :cond_4
-
-    goto/16 :goto_3
-
-    :cond_4
-    invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
-
-    move-result v0
-
-    const/4 v2, 0x0
-
-    cmpg-float v0, v0, v2
-
-    if-gtz v0, :cond_5
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p1, p1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result p1
-
-    goto :goto_1
-
-    :cond_5
-    invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
-
-    move-result v0
-
-    iget-object v3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v3}, Landroid/view/View;->getWidth()I
-
-    move-result v3
-
-    int-to-float v3, v3
-
-    cmpl-float v0, v0, v3
-
-    if-lez v0, :cond_6
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p1, p1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result p1
-
-    goto :goto_1
-
-    :cond_6
-    invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
-
-    move-result p1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {v0}, Landroid/view/View;->getWidth()I
-
-    move-result v0
-
-    int-to-float v0, v0
-
-    div-float/2addr p1, v0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMaxBarValue()F
-
-    move-result v0
-
-    iget-object v3, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v3, v3, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v3}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result v3
-
-    sub-float/2addr v0, v3
-
-    mul-float v0, v0, p1
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object p1, p1, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {p1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getMinBarValue()F
-
-    move-result p1
-
-    add-float/2addr p1, v0
-
-    :goto_1
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarInterval()F
-
-    move-result v0
-
-    cmpl-float v0, v0, v2
-
-    if-lez v0, :cond_8
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarInterval()F
-
-    move-result v0
-
-    rem-float v0, p1, v0
-
-    iget-object v2, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v2, v2, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v2}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarInterval()F
-
-    move-result v2
-
-    const/high16 v3, 0x40000000    # 2.0f
-
-    div-float/2addr v2, v3
-
-    cmpg-float v2, v0, v2
-
-    if-gtz v2, :cond_7
-
-    sub-float/2addr p1, v0
-
-    goto :goto_2
-
-    :cond_7
-    sub-float/2addr p1, v0
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    invoke-virtual {v0}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->getBarInterval()F
-
-    move-result v0
-
-    add-float/2addr p1, v0
-
-    :cond_8
-    :goto_2
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    iget-object v0, v0, Lcom/miguelgaeta/super_bar/SuperBar;->config:Lcom/miguelgaeta/super_bar/SuperBarConfig;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, v2, p1}, Lcom/miguelgaeta/super_bar/SuperBarConfig;->setBarValue(Ljava/lang/Integer;F)V
-
-    iget-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarDrawer;->sb:Lcom/miguelgaeta/super_bar/SuperBar;
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    :goto_3
-    return v1
-.end method
diff --git a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarPainter.smali b/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarPainter.smali
deleted file mode 100644
index 1fddc16b2a..0000000000
--- a/com.discord/smali_classes2/com/miguelgaeta/super_bar/SuperBarPainter.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public Lcom/miguelgaeta/super_bar/SuperBarPainter;
-.super Landroid/graphics/Paint;
-.source "SuperBarPainter.java"
-
-
-# instance fields
-.field public final view:Landroid/view/View;
-
-
-# direct methods
-.method public constructor <init>(Landroid/view/View;)V
-    .locals 0
-
-    invoke-direct {p0}, Landroid/graphics/Paint;-><init>()V
-
-    iput-object p1, p0, Lcom/miguelgaeta/super_bar/SuperBarPainter;->view:Landroid/view/View;
-
-    const/4 p1, 0x1
-
-    invoke-virtual {p0, p1}, Landroid/graphics/Paint;->setFlags(I)V
-
-    sget-object p1, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
-
-    invoke-virtual {p0, p1}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public setColor(I)V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, p1, v0, v1}, Lcom/miguelgaeta/super_bar/SuperBarPainter;->setColor(ILjava/lang/Integer;I)V
-
-    return-void
-.end method
-
-.method public setColor(ILjava/lang/Integer;I)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/miguelgaeta/super_bar/SuperBarPainter;->view:Landroid/view/View;
-
-    invoke-virtual {v0}, Landroid/view/View;->isInEditMode()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p2}, Ljava/lang/Integer;->intValue()I
-
-    move-result p2
-
-    int-to-float p2, p2
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p2, v0, v0, p3}, Landroid/graphics/Paint;->setShadowLayer(FFFI)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Landroid/graphics/Paint;->clearShadowLayer()V
-
-    :cond_1
-    :goto_0
-    invoke-super {p0, p1}, Landroid/graphics/Paint;->setColor(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/otaliastudios/cameraview/CameraView$b$c.smali b/com.discord/smali_classes2/com/otaliastudios/cameraview/CameraView$b$c.smali
index 670dd9398e..907f822a8d 100644
--- a/com.discord/smali_classes2/com/otaliastudios/cameraview/CameraView$b$c.smali
+++ b/com.discord/smali_classes2/com/otaliastudios/cameraview/CameraView$b$c.smali
@@ -68,7 +68,11 @@
 
     check-cast v1, Lcom/lytefast/flexinput/fragment/CameraFragment$d;
 
-    if-eqz v4, :cond_0
+    if-eqz v1, :cond_0
+
+    const-string v2, "exception"
+
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, v1, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->a:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -80,7 +84,7 @@
 
     const-string v1, "getString(R.string.camera_unknown_error)"
 
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v5, 0x1
 
@@ -95,10 +99,6 @@
     goto :goto_0
 
     :cond_0
-    const-string v0, "exception"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 v0, 0x0
 
     throw v0
diff --git a/com.discord/smali_classes2/com/otaliastudios/cameraview/R$a.smali b/com.discord/smali_classes2/com/otaliastudios/cameraview/R$a.smali
index e4a747c80b..22ff56e4b1 100644
--- a/com.discord/smali_classes2/com/otaliastudios/cameraview/R$a.smali
+++ b/com.discord/smali_classes2/com/otaliastudios/cameraview/R$a.smali
@@ -40,133 +40,133 @@
 
 .field public static final bottom:I = 0x7f0a011e
 
-.field public static final camera1:I = 0x7f0a0134
+.field public static final camera1:I = 0x7f0a0137
 
-.field public static final camera2:I = 0x7f0a0135
+.field public static final camera2:I = 0x7f0a0138
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final cloudy:I = 0x7f0a0273
+.field public static final cloudy:I = 0x7f0a0276
 
-.field public static final daylight:I = 0x7f0a02bb
+.field public static final daylight:I = 0x7f0a02be
 
-.field public static final deviceDefault:I = 0x7f0a02cc
+.field public static final deviceDefault:I = 0x7f0a02d2
 
-.field public static final dng:I = 0x7f0a02f5
+.field public static final dng:I = 0x7f0a02fb
 
-.field public static final draw3x3:I = 0x7f0a02f6
+.field public static final draw3x3:I = 0x7f0a02fc
 
-.field public static final draw4x4:I = 0x7f0a02f7
+.field public static final draw4x4:I = 0x7f0a02fd
 
-.field public static final drawPhi:I = 0x7f0a02f8
+.field public static final drawPhi:I = 0x7f0a02fe
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final exposureCorrection:I = 0x7f0a036a
+.field public static final exposureCorrection:I = 0x7f0a0370
 
-.field public static final filterControl1:I = 0x7f0a03a2
+.field public static final filterControl1:I = 0x7f0a03a8
 
-.field public static final filterControl2:I = 0x7f0a03a3
+.field public static final filterControl2:I = 0x7f0a03a9
 
-.field public static final fluorescent:I = 0x7f0a03c1
+.field public static final fluorescent:I = 0x7f0a03c7
 
-.field public static final focusMarkerContainer:I = 0x7f0a03c3
+.field public static final focusMarkerContainer:I = 0x7f0a03c9
 
-.field public static final focusMarkerFill:I = 0x7f0a03c4
+.field public static final focusMarkerFill:I = 0x7f0a03ca
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final front:I = 0x7f0a03e2
+.field public static final front:I = 0x7f0a03e8
 
-.field public static final glSurface:I = 0x7f0a0408
+.field public static final glSurface:I = 0x7f0a040e
 
-.field public static final gl_surface_view:I = 0x7f0a0409
+.field public static final gl_surface_view:I = 0x7f0a040f
 
-.field public static final h263:I = 0x7f0a04bb
+.field public static final h263:I = 0x7f0a04c1
 
-.field public static final h264:I = 0x7f0a04bc
+.field public static final h264:I = 0x7f0a04c2
 
-.field public static final heAac:I = 0x7f0a04be
+.field public static final heAac:I = 0x7f0a04c4
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final incandescent:I = 0x7f0a04e7
+.field public static final incandescent:I = 0x7f0a04ed
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final jpeg:I = 0x7f0a0571
+.field public static final jpeg:I = 0x7f0a0577
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final mono:I = 0x7f0a05e0
+.field public static final mono:I = 0x7f0a05e6
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final off:I = 0x7f0a0664
+.field public static final off:I = 0x7f0a066a
 
-.field public static final on:I = 0x7f0a0668
+.field public static final on:I = 0x7f0a066e
 
-.field public static final picture:I = 0x7f0a06b8
+.field public static final picture:I = 0x7f0a06be
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final stereo:I = 0x7f0a0943
+.field public static final stereo:I = 0x7f0a0947
 
-.field public static final surface:I = 0x7f0a0954
+.field public static final surface:I = 0x7f0a0958
 
-.field public static final surface_view:I = 0x7f0a0955
+.field public static final surface_view:I = 0x7f0a0959
 
-.field public static final surface_view_root:I = 0x7f0a0956
+.field public static final surface_view_root:I = 0x7f0a095a
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096e
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0972
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096f
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0973
 
-.field public static final takePicture:I = 0x7f0a0970
+.field public static final takePicture:I = 0x7f0a0974
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final texture:I = 0x7f0a098b
+.field public static final texture:I = 0x7f0a098f
 
-.field public static final texture_view:I = 0x7f0a098c
+.field public static final texture_view:I = 0x7f0a0990
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final torch:I = 0x7f0a099b
+.field public static final torch:I = 0x7f0a099f
 
-.field public static final video:I = 0x7f0a0a31
+.field public static final video:I = 0x7f0a0a35
 
-.field public static final zoom:I = 0x7f0a0abf
+.field public static final zoom:I = 0x7f0a0ac4
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/otaliastudios/cameraview/R$c.smali b/com.discord/smali_classes2/com/otaliastudios/cameraview/R$c.smali
index 9c774810d2..fcf28f2c8a 100644
--- a/com.discord/smali_classes2/com/otaliastudios/cameraview/R$c.smali
+++ b/com.discord/smali_classes2/com/otaliastudios/cameraview/R$c.smali
@@ -392,7 +392,7 @@
     :array_3
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_4
@@ -427,7 +427,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_7
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
index 8aa57a1e79..4d3e76af8e 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
@@ -180,57 +180,57 @@
 
 .field public static final abc_vector_test:I = 0x7f080087
 
-.field public static final notification_action_background:I = 0x7f0804fa
+.field public static final notification_action_background:I = 0x7f0804fd
 
-.field public static final notification_bg:I = 0x7f0804fb
+.field public static final notification_bg:I = 0x7f0804fe
 
-.field public static final notification_bg_low:I = 0x7f0804fc
+.field public static final notification_bg_low:I = 0x7f0804ff
 
-.field public static final notification_bg_low_normal:I = 0x7f0804fd
+.field public static final notification_bg_low_normal:I = 0x7f080500
 
-.field public static final notification_bg_low_pressed:I = 0x7f0804fe
+.field public static final notification_bg_low_pressed:I = 0x7f080501
 
-.field public static final notification_bg_normal:I = 0x7f0804ff
+.field public static final notification_bg_normal:I = 0x7f080502
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080500
+.field public static final notification_bg_normal_pressed:I = 0x7f080503
 
-.field public static final notification_icon_background:I = 0x7f080501
+.field public static final notification_icon_background:I = 0x7f080504
 
-.field public static final notification_template_icon_bg:I = 0x7f080502
+.field public static final notification_template_icon_bg:I = 0x7f080505
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080503
+.field public static final notification_template_icon_low_bg:I = 0x7f080506
 
-.field public static final notification_tile_bg:I = 0x7f080504
+.field public static final notification_tile_bg:I = 0x7f080507
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080505
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080508
 
-.field public static final tooltip_frame_dark:I = 0x7f080519
+.field public static final tooltip_frame_dark:I = 0x7f08051d
 
-.field public static final tooltip_frame_light:I = 0x7f08051a
+.field public static final tooltip_frame_light:I = 0x7f08051e
 
-.field public static final ucrop_ic_angle:I = 0x7f08051c
+.field public static final ucrop_ic_angle:I = 0x7f080520
 
-.field public static final ucrop_ic_crop:I = 0x7f08051d
+.field public static final ucrop_ic_crop:I = 0x7f080521
 
-.field public static final ucrop_ic_cross:I = 0x7f08051e
+.field public static final ucrop_ic_cross:I = 0x7f080522
 
-.field public static final ucrop_ic_done:I = 0x7f08051f
+.field public static final ucrop_ic_done:I = 0x7f080523
 
-.field public static final ucrop_ic_next:I = 0x7f080520
+.field public static final ucrop_ic_next:I = 0x7f080524
 
-.field public static final ucrop_ic_reset:I = 0x7f080521
+.field public static final ucrop_ic_reset:I = 0x7f080525
 
-.field public static final ucrop_ic_rotate:I = 0x7f080522
+.field public static final ucrop_ic_rotate:I = 0x7f080526
 
-.field public static final ucrop_ic_scale:I = 0x7f080523
+.field public static final ucrop_ic_scale:I = 0x7f080527
 
-.field public static final ucrop_shadow_upside:I = 0x7f080524
+.field public static final ucrop_shadow_upside:I = 0x7f080528
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080525
+.field public static final ucrop_vector_ic_crop:I = 0x7f080529
 
-.field public static final ucrop_vector_loader:I = 0x7f080526
+.field public static final ucrop_vector_loader:I = 0x7f08052a
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080527
+.field public static final ucrop_vector_loader_animated:I = 0x7f08052b
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
index 7e62e704f7..bc3bd8d004 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
@@ -64,211 +64,211 @@
 
 .field public static final buttonPanel:I = 0x7f0a0125
 
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0263
 
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026d
 
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028e
 
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b8
 
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b9
 
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c1
 
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c2
 
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0324
 
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a0351
 
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036e
 
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036f
 
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03cd
 
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c7
 
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04da
 
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04dc
 
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e6
 
-.field public static final image_view_crop:I = 0x7f0a04e2
+.field public static final image_view_crop:I = 0x7f0a04e8
 
-.field public static final image_view_logo:I = 0x7f0a04e3
+.field public static final image_view_logo:I = 0x7f0a04e9
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a04e4
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a04ea
 
-.field public static final image_view_state_rotate:I = 0x7f0a04e5
+.field public static final image_view_state_rotate:I = 0x7f0a04eb
 
-.field public static final image_view_state_scale:I = 0x7f0a04e6
+.field public static final image_view_state_scale:I = 0x7f0a04ec
 
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fe
 
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0537
 
-.field public static final layout_aspect_ratio:I = 0x7f0a057d
+.field public static final layout_aspect_ratio:I = 0x7f0a0583
 
-.field public static final layout_rotate_wheel:I = 0x7f0a057e
+.field public static final layout_rotate_wheel:I = 0x7f0a0584
 
-.field public static final layout_scale_wheel:I = 0x7f0a057f
+.field public static final layout_scale_wheel:I = 0x7f0a0585
 
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a058a
 
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a058c
 
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a058d
 
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a0590
 
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a0591
 
-.field public static final menu_crop:I = 0x7f0a05bc
+.field public static final menu_crop:I = 0x7f0a05c2
 
-.field public static final menu_loader:I = 0x7f0a05c5
+.field public static final menu_loader:I = 0x7f0a05cb
 
-.field public static final message:I = 0x7f0a05da
+.field public static final message:I = 0x7f0a05e0
 
-.field public static final multiply:I = 0x7f0a05fc
+.field public static final multiply:I = 0x7f0a0602
 
-.field public static final none:I = 0x7f0a0623
+.field public static final none:I = 0x7f0a0629
 
-.field public static final normal:I = 0x7f0a0624
+.field public static final normal:I = 0x7f0a062a
 
-.field public static final notification_background:I = 0x7f0a062e
+.field public static final notification_background:I = 0x7f0a0634
 
-.field public static final notification_main_column:I = 0x7f0a062f
+.field public static final notification_main_column:I = 0x7f0a0635
 
-.field public static final notification_main_column_container:I = 0x7f0a0630
+.field public static final notification_main_column_container:I = 0x7f0a0636
 
-.field public static final parentPanel:I = 0x7f0a067d
+.field public static final parentPanel:I = 0x7f0a0683
 
-.field public static final progress_circular:I = 0x7f0a0728
+.field public static final progress_circular:I = 0x7f0a072e
 
-.field public static final progress_horizontal:I = 0x7f0a072b
+.field public static final progress_horizontal:I = 0x7f0a0731
 
-.field public static final radio:I = 0x7f0a0739
+.field public static final radio:I = 0x7f0a073f
 
-.field public static final right:I = 0x7f0a075c
+.field public static final right:I = 0x7f0a0762
 
-.field public static final right_icon:I = 0x7f0a075d
+.field public static final right_icon:I = 0x7f0a0763
 
-.field public static final right_side:I = 0x7f0a075e
+.field public static final right_side:I = 0x7f0a0764
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a0785
+.field public static final rotate_scroll_wheel:I = 0x7f0a078b
 
-.field public static final scale_scroll_wheel:I = 0x7f0a078d
+.field public static final scale_scroll_wheel:I = 0x7f0a0793
 
-.field public static final screen:I = 0x7f0a078e
+.field public static final screen:I = 0x7f0a0794
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0792
+.field public static final scrollIndicatorDown:I = 0x7f0a0798
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0793
+.field public static final scrollIndicatorUp:I = 0x7f0a0799
 
-.field public static final scrollView:I = 0x7f0a0794
+.field public static final scrollView:I = 0x7f0a079a
 
-.field public static final search_badge:I = 0x7f0a0797
+.field public static final search_badge:I = 0x7f0a079d
 
-.field public static final search_bar:I = 0x7f0a0798
+.field public static final search_bar:I = 0x7f0a079e
 
-.field public static final search_button:I = 0x7f0a0799
+.field public static final search_button:I = 0x7f0a079f
 
-.field public static final search_close_btn:I = 0x7f0a079a
+.field public static final search_close_btn:I = 0x7f0a07a0
 
-.field public static final search_edit_frame:I = 0x7f0a079b
+.field public static final search_edit_frame:I = 0x7f0a07a1
 
-.field public static final search_go_btn:I = 0x7f0a079d
+.field public static final search_go_btn:I = 0x7f0a07a3
 
-.field public static final search_mag_icon:I = 0x7f0a079e
+.field public static final search_mag_icon:I = 0x7f0a07a4
 
-.field public static final search_plate:I = 0x7f0a079f
+.field public static final search_plate:I = 0x7f0a07a5
 
-.field public static final search_src_text:I = 0x7f0a07a2
+.field public static final search_src_text:I = 0x7f0a07a8
 
-.field public static final search_voice_btn:I = 0x7f0a07ae
+.field public static final search_voice_btn:I = 0x7f0a07b4
 
-.field public static final select_dialog_listview:I = 0x7f0a07b1
+.field public static final select_dialog_listview:I = 0x7f0a07b7
 
-.field public static final shortcut:I = 0x7f0a0911
+.field public static final shortcut:I = 0x7f0a0915
 
-.field public static final spacer:I = 0x7f0a0920
+.field public static final spacer:I = 0x7f0a0924
 
-.field public static final split_action_bar:I = 0x7f0a0924
+.field public static final split_action_bar:I = 0x7f0a0928
 
-.field public static final src_atop:I = 0x7f0a0928
+.field public static final src_atop:I = 0x7f0a092c
 
-.field public static final src_in:I = 0x7f0a0929
+.field public static final src_in:I = 0x7f0a092d
 
-.field public static final src_over:I = 0x7f0a092a
+.field public static final src_over:I = 0x7f0a092e
 
-.field public static final start:I = 0x7f0a092d
+.field public static final start:I = 0x7f0a0931
 
-.field public static final state_aspect_ratio:I = 0x7f0a0930
+.field public static final state_aspect_ratio:I = 0x7f0a0934
 
-.field public static final state_rotate:I = 0x7f0a0931
+.field public static final state_rotate:I = 0x7f0a0935
 
-.field public static final state_scale:I = 0x7f0a0932
+.field public static final state_scale:I = 0x7f0a0936
 
-.field public static final submenuarrow:I = 0x7f0a0949
+.field public static final submenuarrow:I = 0x7f0a094d
 
-.field public static final submit_area:I = 0x7f0a094a
+.field public static final submit_area:I = 0x7f0a094e
 
-.field public static final tabMode:I = 0x7f0a095a
+.field public static final tabMode:I = 0x7f0a095e
 
-.field public static final tag_transition_group:I = 0x7f0a096d
+.field public static final tag_transition_group:I = 0x7f0a0971
 
-.field public static final text:I = 0x7f0a097a
+.field public static final text:I = 0x7f0a097e
 
-.field public static final text2:I = 0x7f0a097c
+.field public static final text2:I = 0x7f0a0980
 
-.field public static final textSpacerNoButtons:I = 0x7f0a097e
+.field public static final textSpacerNoButtons:I = 0x7f0a0982
 
-.field public static final textSpacerNoTitle:I = 0x7f0a097f
+.field public static final textSpacerNoTitle:I = 0x7f0a0983
 
-.field public static final text_view_rotate:I = 0x7f0a0983
+.field public static final text_view_rotate:I = 0x7f0a0987
 
-.field public static final text_view_scale:I = 0x7f0a0984
+.field public static final text_view_scale:I = 0x7f0a0988
 
-.field public static final time:I = 0x7f0a0990
+.field public static final time:I = 0x7f0a0994
 
-.field public static final title:I = 0x7f0a0991
+.field public static final title:I = 0x7f0a0995
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0992
+.field public static final titleDividerNoCustom:I = 0x7f0a0996
 
-.field public static final title_template:I = 0x7f0a0993
+.field public static final title_template:I = 0x7f0a0997
 
-.field public static final toolbar:I = 0x7f0a0995
+.field public static final toolbar:I = 0x7f0a0999
 
-.field public static final toolbar_title:I = 0x7f0a0997
+.field public static final toolbar_title:I = 0x7f0a099b
 
-.field public static final top:I = 0x7f0a0999
+.field public static final top:I = 0x7f0a099d
 
-.field public static final topPanel:I = 0x7f0a099a
+.field public static final topPanel:I = 0x7f0a099e
 
-.field public static final ucrop:I = 0x7f0a09aa
+.field public static final ucrop:I = 0x7f0a09ae
 
-.field public static final ucrop_frame:I = 0x7f0a09ab
+.field public static final ucrop_frame:I = 0x7f0a09af
 
-.field public static final ucrop_photobox:I = 0x7f0a09ac
+.field public static final ucrop_photobox:I = 0x7f0a09b0
 
-.field public static final uniform:I = 0x7f0a09b3
+.field public static final uniform:I = 0x7f0a09b7
 
-.field public static final up:I = 0x7f0a09b5
+.field public static final up:I = 0x7f0a09b9
 
-.field public static final view_overlay:I = 0x7f0a0a39
+.field public static final view_overlay:I = 0x7f0a0a3d
 
-.field public static final wrap_content:I = 0x7f0a0ab8
+.field public static final wrap_content:I = 0x7f0a0abd
 
-.field public static final wrapper_controls:I = 0x7f0a0aba
+.field public static final wrapper_controls:I = 0x7f0a0abf
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0abb
+.field public static final wrapper_reset_rotate:I = 0x7f0a0ac0
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0abc
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a0ac1
 
-.field public static final wrapper_states:I = 0x7f0a0abd
+.field public static final wrapper_states:I = 0x7f0a0ac2
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
index dc21c74291..af5bc24bb6 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
@@ -48,19 +48,19 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f120020
 
-.field public static final search_menu_title:I = 0x7f121415
+.field public static final search_menu_title:I = 0x7f12143f
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214d7
+.field public static final status_bar_notification_info_overflow:I = 0x7f121501
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121645
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f12166f
 
-.field public static final ucrop_label_edit_photo:I = 0x7f121646
+.field public static final ucrop_label_edit_photo:I = 0x7f121670
 
-.field public static final ucrop_label_original:I = 0x7f121647
+.field public static final ucrop_label_original:I = 0x7f121671
 
-.field public static final ucrop_menu_crop:I = 0x7f121648
+.field public static final ucrop_menu_crop:I = 0x7f121672
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121649
+.field public static final ucrop_mutate_exception_hint:I = 0x7f121673
 
 
 # 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 8705832a09..3e587deaa0 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali
@@ -1121,7 +1121,7 @@
 
     new-array v0, v0, [I
 
-    const v1, 0x7f0404af
+    const v1, 0x7f0404a1
 
     aput v1, v0, v3
 
@@ -1236,10 +1236,10 @@
         0x7f0403f6
         0x7f040430
         0x7f040431
-        0x7f0404c1
-        0x7f0404c4
-        0x7f040553
-        0x7f04055d
+        0x7f0404b3
+        0x7f0404b6
+        0x7f040545
+        0x7f04054f
     .end array-data
 
     :array_1
@@ -1248,8 +1248,8 @@
         0x7f040056
         0x7f040113
         0x7f040261
-        0x7f0404c4
-        0x7f04055d
+        0x7f0404b6
+        0x7f04054f
     .end array-data
 
     :array_2
@@ -1266,24 +1266,24 @@
         0x7f040389
         0x7f04038a
         0x7f0403c8
-        0x7f040493
-        0x7f040499
+        0x7f040485
+        0x7f04048b
     .end array-data
 
     :array_4
     .array-data 4
         0x1010119
-        0x7f0404a8
-        0x7f040551
-        0x7f040552
+        0x7f04049a
+        0x7f040543
+        0x7f040544
     .end array-data
 
     :array_5
     .array-data 4
         0x1010142
-        0x7f04054d
-        0x7f04054e
-        0x7f04054f
+        0x7f04053f
+        0x7f040540
+        0x7f040541
     .end array-data
 
     :array_6
@@ -1318,8 +1318,8 @@
         0x7f04024c
         0x7f04032c
         0x7f040382
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_8
@@ -1417,38 +1417,38 @@
         0x7f04043d
         0x7f04043e
         0x7f04043f
-        0x7f040474
-        0x7f04047c
-        0x7f04047e
-        0x7f04047f
-        0x7f0404a4
-        0x7f0404a5
-        0x7f0404d6
-        0x7f040503
-        0x7f040505
-        0x7f040506
-        0x7f040507
-        0x7f040509
-        0x7f04050a
-        0x7f04050b
-        0x7f04050c
-        0x7f04050f
-        0x7f040510
-        0x7f040561
-        0x7f040562
-        0x7f040563
-        0x7f040564
-        0x7f04059d
-        0x7f0405a1
-        0x7f0405a2
-        0x7f0405a3
-        0x7f0405a4
-        0x7f0405a5
-        0x7f0405a6
-        0x7f0405a7
-        0x7f0405a8
-        0x7f0405a9
-        0x7f0405aa
+        0x7f040466
+        0x7f04046e
+        0x7f040470
+        0x7f040471
+        0x7f040496
+        0x7f040497
+        0x7f0404c8
+        0x7f0404f5
+        0x7f0404f7
+        0x7f0404f8
+        0x7f0404f9
+        0x7f0404fb
+        0x7f0404fc
+        0x7f0404fd
+        0x7f0404fe
+        0x7f040501
+        0x7f040502
+        0x7f040553
+        0x7f040554
+        0x7f040555
+        0x7f040556
+        0x7f04058f
+        0x7f040593
+        0x7f040594
+        0x7f040595
+        0x7f040596
+        0x7f040597
+        0x7f040598
+        0x7f040599
+        0x7f04059a
+        0x7f04059b
+        0x7f04059c
     .end array-data
 
     :array_9
@@ -1469,7 +1469,7 @@
     :array_b
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_c
@@ -1491,8 +1491,8 @@
         0x7f040118
         0x7f0401e9
         0x7f040250
-        0x7f0404a3
-        0x7f040543
+        0x7f040495
+        0x7f040535
     .end array-data
 
     :array_e
@@ -1516,7 +1516,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_10
@@ -1529,7 +1529,7 @@
         0x7f0401dd
         0x7f0401e2
         0x7f0403c4
-        0x7f04048f
+        0x7f040481
     .end array-data
 
     :array_11
@@ -1579,8 +1579,8 @@
         0x7f0402dc
         0x7f0402dd
         0x7f0403d2
-        0x7f04048b
-        0x7f040566
+        0x7f04047d
+        0x7f040558
     .end array-data
 
     :array_15
@@ -1593,7 +1593,7 @@
         0x1010130
         0x1010131
         0x7f040405
-        0x7f0404be
+        0x7f0404b0
     .end array-data
 
     :array_16
@@ -1623,11 +1623,11 @@
         0x7f04032d
         0x7f040437
         0x7f040438
-        0x7f040471
-        0x7f040472
-        0x7f0404bf
-        0x7f0404c8
-        0x7f04059e
+        0x7f040463
+        0x7f040464
+        0x7f0404b1
+        0x7f0404ba
+        0x7f040590
     .end array-data
 
     :array_19
@@ -1644,17 +1644,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040492
-        0x7f0404a6
-        0x7f0404d2
-        0x7f0404d3
-        0x7f0404d7
-        0x7f040547
-        0x7f040548
-        0x7f040549
-        0x7f04056a
-        0x7f04056f
-        0x7f040570
+        0x7f040484
+        0x7f040498
+        0x7f0404c4
+        0x7f0404c5
+        0x7f0404c9
+        0x7f040539
+        0x7f04053a
+        0x7f04053b
+        0x7f04055c
+        0x7f040561
+        0x7f040562
     .end array-data
 
     :array_1b
@@ -1673,8 +1673,8 @@
         0x1010585
         0x7f040244
         0x7f04024c
-        0x7f0404f8
-        0x7f040514
+        0x7f0404ea
+        0x7f040506
     .end array-data
 
     :array_1c
@@ -1697,18 +1697,18 @@
         0x7f0403c9
         0x7f0403ca
         0x7f0403f6
-        0x7f0404c1
-        0x7f0404c2
-        0x7f0404c3
-        0x7f040553
-        0x7f040555
-        0x7f040556
-        0x7f040557
-        0x7f040558
-        0x7f040559
-        0x7f04055a
-        0x7f04055b
-        0x7f04055c
+        0x7f0404b3
+        0x7f0404b4
+        0x7f0404b5
+        0x7f040545
+        0x7f040547
+        0x7f040548
+        0x7f040549
+        0x7f04054a
+        0x7f04054b
+        0x7f04054c
+        0x7f04054d
+        0x7f04054e
     .end array-data
 
     :array_1d
@@ -1717,7 +1717,7 @@
         0x10100da
         0x7f0403db
         0x7f0403de
-        0x7f040517
+        0x7f040509
     .end array-data
 
     :array_1e
@@ -1736,26 +1736,26 @@
 
     :array_20
     .array-data 4
-        0x7f040577
-        0x7f040578
-        0x7f040579
+        0x7f040569
+        0x7f04056a
+        0x7f04056b
     .end array-data
 
     :array_21
     .array-data 4
-        0x7f04057a
-        0x7f04057b
-        0x7f04057c
-        0x7f04057d
-        0x7f04057e
-        0x7f04057f
-        0x7f040580
-        0x7f040581
-        0x7f040582
-        0x7f040583
-        0x7f040584
-        0x7f040585
-        0x7f040586
+        0x7f04056c
+        0x7f04056d
+        0x7f04056e
+        0x7f04056f
+        0x7f040570
+        0x7f040571
+        0x7f040572
+        0x7f040573
+        0x7f040574
+        0x7f040575
+        0x7f040576
+        0x7f040577
+        0x7f040578
     .end array-data
 .end method
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
index 4a666d532b..ea0b6d4bdd 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
@@ -1773,7 +1773,7 @@
 
     iget-object v2, v0, Lf/n/a/l/c;->d:[F
 
-    invoke-static {v2}, Lf/n/a/k/a;->l0([F)Landroid/graphics/RectF;
+    invoke-static {v2}, Lf/n/a/k/a;->g0([F)Landroid/graphics/RectF;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali b/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali
index 1d4105ceb5..d0677afeb6 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/view/OverlayView.smali
@@ -173,7 +173,7 @@
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->d:Landroid/graphics/RectF;
 
-    invoke-static {v0}, Lf/n/a/k/a;->A(Landroid/graphics/RectF;)[F
+    invoke-static {v0}, Lf/n/a/k/a;->x(Landroid/graphics/RectF;)[F
 
     move-result-object v0
 
@@ -181,7 +181,7 @@
 
     iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->d:Landroid/graphics/RectF;
 
-    invoke-static {v0}, Lf/n/a/k/a;->y(Landroid/graphics/RectF;)[F
+    invoke-static {v0}, Lf/n/a/k/a;->v(Landroid/graphics/RectF;)[F
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/f/a/o/g/b.smali b/com.discord/smali_classes2/f/a/o/g/b.smali
index 086606f9ad..f6e1c3f795 100644
--- a/com.discord/smali_classes2/f/a/o/g/b.smali
+++ b/com.discord/smali_classes2/f/a/o/g/b.smali
@@ -30,7 +30,7 @@
 
     check-cast p1, Ljava/lang/Integer;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/a/o/g/j.smali b/com.discord/smali_classes2/f/a/o/g/j.smali
index 21cc2e9218..15f626f694 100644
--- a/com.discord/smali_classes2/f/a/o/g/j.smali
+++ b/com.discord/smali_classes2/f/a/o/g/j.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali_classes2/f/a/o/g/k.smali b/com.discord/smali_classes2/f/a/o/g/k.smali
index 77c2be93fd..3ad3bdfbf4 100644
--- a/com.discord/smali_classes2/f/a/o/g/k.smali
+++ b/com.discord/smali_classes2/f/a/o/g/k.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # instance fields
diff --git a/com.discord/smali_classes2/f/a/o/g/o.smali b/com.discord/smali_classes2/f/a/o/g/o.smali
index 17bf18765a..59451ea91f 100644
--- a/com.discord/smali_classes2/f/a/o/g/o.smali
+++ b/com.discord/smali_classes2/f/a/o/g/o.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali_classes2/f/a/o/g/r.smali b/com.discord/smali_classes2/f/a/o/g/r.smali
index 7738e3f79a..8cf9e274c1 100644
--- a/com.discord/smali_classes2/f/a/o/g/r.smali
+++ b/com.discord/smali_classes2/f/a/o/g/r.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali_classes2/f/a/o/g/u/a.smali b/com.discord/smali_classes2/f/a/o/g/u/a.smali
index e1e8cbd0a1..9ae51a1d68 100644
--- a/com.discord/smali_classes2/f/a/o/g/u/a.smali
+++ b/com.discord/smali_classes2/f/a/o/g/u/a.smali
@@ -3,7 +3,7 @@
 .source "lambda"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # static fields
diff --git a/com.discord/smali_classes2/f/b/a/a/a$b.smali b/com.discord/smali_classes2/f/b/a/a/a$b.smali
index 2dbb4a26b4..d78ffb2dbf 100644
--- a/com.discord/smali_classes2/f/b/a/a/a$b.smali
+++ b/com.discord/smali_classes2/f/b/a/a/a$b.smali
@@ -40,56 +40,35 @@
 
 # virtual methods
 .method public onAnimationEnd(Landroid/view/animation/Animation;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/b/a/a/a$b;->a:Lf/b/a/a/a;
 
     invoke-virtual {p1}, Landroidx/fragment/app/DialogFragment;->dismissAllowingStateLoss()V
 
     return-void
-
-    :cond_0
-    const-string p1, "animation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationRepeat(Landroid/view/animation/Animation;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onAnimationStart(Landroid/view/animation/Animation;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "animation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "animation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/a$c.smali b/com.discord/smali_classes2/f/b/a/a/a$c.smali
index 22a61d5d1a..0f9dc079e3 100644
--- a/com.discord/smali_classes2/f/b/a/a/a$c.smali
+++ b/com.discord/smali_classes2/f/b/a/a/a$c.smali
@@ -49,49 +49,35 @@
 
 # virtual methods
 .method public onItemSelected(Ljava/lang/Object;)V
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/b/a/a/a$c;->a:Lf/b/a/a/a;
 
     invoke-static {p1}, Lf/b/a/a/a;->g(Lf/b/a/a/a;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onItemUnselected(Ljava/lang/Object;)V
-    .locals 0
+    .locals 1
 
     check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz p1, :cond_0
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/b/a/a/a$c;->a:Lf/b/a/a/a;
 
     invoke-static {p1}, Lf/b/a/a/a;->g(Lf/b/a/a/a;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public unregister()V
diff --git a/com.discord/smali_classes2/f/b/a/a/a.smali b/com.discord/smali_classes2/f/b/a/a/a.smali
index 80abea0fe8..b8fecbc141 100644
--- a/com.discord/smali_classes2/f/b/a/a/a.smali
+++ b/com.discord/smali_classes2/f/b/a/a/a.smali
@@ -100,7 +100,7 @@
 
     const-string v1, "context ?: return dismissAllowingStateLoss()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v1, Lcom/google/android/material/R$anim;->design_bottom_sheet_slide_out:I
 
@@ -110,7 +110,7 @@
 
     const-string v2, "animation"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
@@ -244,7 +244,7 @@
 
     move-result p3
 
-    invoke-static {v0, p3}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v0, p3}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object p3
 
@@ -271,9 +271,9 @@
 
     move-object v2, p3
 
-    check-cast v2, Lj0/i/q;
+    check-cast v2, Lk0/j/q;
 
-    invoke-virtual {v2}, Lj0/i/q;->nextInt()I
+    invoke-virtual {v2}, Lk0/j/q;->nextInt()I
 
     move-result v2
 
@@ -283,7 +283,7 @@
 
     const-string v3, "clipData.getItemAt(it)"
 
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v2}, Landroid/content/ClipData$Item;->getUri()Landroid/net/Uri;
 
@@ -315,7 +315,7 @@
 
     const-string v2, "it"
 
-    invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p3, p1}, Lcom/lytefast/flexinput/model/Attachment$Companion;->a(Landroid/net/Uri;Landroid/content/ContentResolver;)Lcom/lytefast/flexinput/model/Attachment;
 
@@ -330,11 +330,11 @@
     return-void
 
     :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/NullPointerException;
 
     const-string p2, "null cannot be cast to non-null type com.lytefast.flexinput.FlexInputCoordinator<kotlin.Any>"
 
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
@@ -407,107 +407,107 @@
 
     move-object/from16 v1, p1
 
-    const/4 v2, 0x0
+    const-string v2, "inflater"
 
-    if-eqz v1, :cond_12
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget v3, Lcom/lytefast/flexinput/R$f;->dialog_add_content_pager_with_fab:I
+    sget v2, Lcom/lytefast/flexinput/R$f;->dialog_add_content_pager_with_fab:I
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    move-object/from16 v5, p2
+    move-object/from16 v4, p2
 
-    invoke-virtual {v1, v3, v5, v4}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-virtual {v1, v2, v4, v3}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object v1
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
     if-eqz v1, :cond_2
 
+    new-instance v4, Lf/b/a/a/a$a;
+
+    invoke-direct {v4, v3, v0}, Lf/b/a/a/a$a;-><init>(ILjava/lang/Object;)V
+
+    invoke-virtual {v1, v4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    sget v4, Lcom/lytefast/flexinput/R$e;->content_pager:I
+
+    invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v4
+
+    check-cast v4, Landroidx/viewpager/widget/ViewPager;
+
+    iput-object v4, v0, Lf/b/a/a/a;->d:Landroidx/viewpager/widget/ViewPager;
+
+    sget v4, Lcom/lytefast/flexinput/R$e;->content_tabs:I
+
+    invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/google/android/material/tabs/TabLayout;
+
+    iput-object v4, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
+
+    sget v4, Lcom/lytefast/flexinput/R$e;->action_btn:I
+
+    invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+
+    iput-object v4, v0, Lf/b/a/a/a;->f:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+
+    sget v4, Lcom/lytefast/flexinput/R$e;->launch_btn:I
+
+    invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v4
+
+    check-cast v4, Landroid/widget/ImageView;
+
+    iput-object v4, v0, Lf/b/a/a/a;->g:Landroid/widget/ImageView;
+
+    if-eqz v4, :cond_0
+
     new-instance v5, Lf/b/a/a/a$a;
 
-    invoke-direct {v5, v4, v0}, Lf/b/a/a/a$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v5, v2, v0}, Lf/b/a/a/a$a;-><init>(ILjava/lang/Object;)V
 
-    invoke-virtual {v1, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    sget v5, Lcom/lytefast/flexinput/R$e;->content_pager:I
-
-    invoke-virtual {v1, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v5
-
-    check-cast v5, Landroidx/viewpager/widget/ViewPager;
-
-    iput-object v5, v0, Lf/b/a/a/a;->d:Landroidx/viewpager/widget/ViewPager;
-
-    sget v5, Lcom/lytefast/flexinput/R$e;->content_tabs:I
-
-    invoke-virtual {v1, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v5
-
-    check-cast v5, Lcom/google/android/material/tabs/TabLayout;
-
-    iput-object v5, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
-
-    sget v5, Lcom/lytefast/flexinput/R$e;->action_btn:I
-
-    invoke-virtual {v1, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v5
-
-    check-cast v5, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
-
-    iput-object v5, v0, Lf/b/a/a/a;->f:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
-
-    sget v5, Lcom/lytefast/flexinput/R$e;->launch_btn:I
-
-    invoke-virtual {v1, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v5
-
-    check-cast v5, Landroid/widget/ImageView;
-
-    iput-object v5, v0, Lf/b/a/a/a;->g:Landroid/widget/ImageView;
-
-    if-eqz v5, :cond_0
-
-    new-instance v6, Lf/b/a/a/a$a;
-
-    invoke-direct {v6, v3, v0}, Lf/b/a/a/a$a;-><init>(ILjava/lang/Object;)V
-
-    invoke-virtual {v5, v6}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v4, v5}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_0
-    iget-object v5, v0, Lf/b/a/a/a;->f:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v4, v0, Lf/b/a/a/a;->f:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    if-eqz v5, :cond_1
+    if-eqz v4, :cond_1
 
     invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v6
+    move-result-object v5
 
-    sget v7, Lcom/lytefast/flexinput/R$c;->brand_500:I
+    sget v6, Lcom/lytefast/flexinput/R$c;->brand_500:I
 
-    invoke-static {v6, v7}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
+    invoke-static {v5, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
-    move-result v6
+    move-result v5
 
-    invoke-static {v6}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+    invoke-static {v5}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-virtual {v5, v6}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {v4, v5}, Lcom/google/android/material/floatingactionbutton/FloatingActionButton;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V
 
     goto :goto_0
 
     :cond_1
-    new-instance v1, Lkotlin/TypeCastException;
+    new-instance v1, Ljava/lang/NullPointerException;
 
     const-string v2, "null cannot be cast to non-null type com.google.android.material.floatingactionbutton.FloatingActionButton"
 
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v1, v2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw v1
 
@@ -515,51 +515,53 @@
     :goto_0
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getParentFragment()Landroidx/fragment/app/Fragment;
 
-    move-result-object v5
+    move-result-object v4
 
-    instance-of v6, v5, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    instance-of v5, v4, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    if-eqz v6, :cond_11
+    if-eqz v5, :cond_11
 
-    new-instance v6, Lf/b/a/c/d;
+    new-instance v5, Lf/b/a/c/d;
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v7
+    move-result-object v6
 
-    const-string v8, "childFragmentManager"
+    const-string v7, "childFragmentManager"
 
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v8, v5
+    move-object v7, v4
 
-    check-cast v8, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    check-cast v7, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v9, v8, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->x:[Lf/b/a/c/d$a;
+    iget-object v8, v7, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->x:[Lf/b/a/c/d$a;
 
-    const-string v10, "pageSuppliers"
+    const-string v9, "pageSuppliers"
 
-    if-eqz v9, :cond_10
+    const/4 v10, 0x0
 
-    array-length v9, v9
+    if-eqz v8, :cond_10
 
-    if-nez v9, :cond_3
+    array-length v8, v8
 
-    const/4 v9, 0x1
+    if-nez v8, :cond_3
+
+    const/4 v8, 0x1
 
     goto :goto_1
 
     :cond_3
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     :goto_1
     const/4 v11, 0x2
 
-    if-eqz v9, :cond_4
+    if-eqz v8, :cond_4
 
-    const/4 v2, 0x3
+    const/4 v8, 0x3
 
-    new-array v2, v2, [Lf/b/a/c/d$a;
+    new-array v8, v8, [Lf/b/a/c/d$a;
 
     new-instance v9, Lf/b/a/c/a;
 
@@ -569,7 +571,7 @@
 
     invoke-direct {v9, v10, v12}, Lf/b/a/c/a;-><init>(II)V
 
-    aput-object v9, v2, v4
+    aput-object v9, v8, v3
 
     new-instance v9, Lf/b/a/c/b;
 
@@ -579,7 +581,7 @@
 
     invoke-direct {v9, v10, v12}, Lf/b/a/c/b;-><init>(II)V
 
-    aput-object v9, v2, v3
+    aput-object v9, v8, v2
 
     new-instance v9, Lf/b/a/c/c;
 
@@ -589,49 +591,57 @@
 
     invoke-direct {v9, v10, v12}, Lf/b/a/c/c;-><init>(II)V
 
-    aput-object v9, v2, v11
+    aput-object v9, v8, v11
 
     goto :goto_2
 
     :cond_4
-    iget-object v9, v8, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->x:[Lf/b/a/c/d$a;
+    iget-object v8, v7, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->x:[Lf/b/a/c/d$a;
 
-    if-eqz v9, :cond_f
-
-    move-object v2, v9
+    if-eqz v8, :cond_f
 
     :goto_2
-    array-length v9, v2
+    array-length v9, v8
 
-    invoke-static {v2, v9}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v8, v9}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v8
 
-    check-cast v2, [Lf/b/a/c/d$a;
+    check-cast v8, [Lf/b/a/c/d$a;
 
-    invoke-direct {v6, v7, v2}, Lf/b/a/c/d;-><init>(Landroidx/fragment/app/FragmentManager;[Lf/b/a/c/d$a;)V
+    invoke-direct {v5, v6, v8}, Lf/b/a/c/d;-><init>(Landroidx/fragment/app/FragmentManager;[Lf/b/a/c/d$a;)V
+
+    const-string v6, "pagerAdapter"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
 
-    move-result-object v2
+    move-result-object v6
 
-    if-eqz v2, :cond_d
+    if-eqz v6, :cond_d
 
-    iget-object v7, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v8, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
 
-    if-eqz v7, :cond_d
+    if-eqz v8, :cond_d
 
     const-string v9, "context"
 
-    invoke-static {v2, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "tabLayout"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v9, Lcom/lytefast/flexinput/R$c;->tab_color_selector:I
 
-    invoke-static {v2, v9}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+    invoke-static {v6, v9}, Landroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
 
-    move-result-object v2
+    move-result-object v6
 
-    invoke-virtual {v7}, Lcom/google/android/material/tabs/TabLayout;->getTabCount()I
+    invoke-virtual {v8}, Lcom/google/android/material/tabs/TabLayout;->getTabCount()I
 
     move-result v9
 
@@ -642,13 +652,13 @@
 
     if-ge v10, v9, :cond_6
 
-    invoke-virtual {v7, v10}, Lcom/google/android/material/tabs/TabLayout;->getTabAt(I)Lcom/google/android/material/tabs/TabLayout$Tab;
+    invoke-virtual {v8, v10}, Lcom/google/android/material/tabs/TabLayout;->getTabAt(I)Lcom/google/android/material/tabs/TabLayout$Tab;
 
     move-result-object v13
 
     if-eqz v13, :cond_5
 
-    invoke-static {v2, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v13}, Lcom/google/android/material/tabs/TabLayout$Tab;->getIcon()Landroid/graphics/drawable/Drawable;
 
@@ -660,7 +670,7 @@
 
     move-result-object v12
 
-    invoke-static {v12, v2}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
+    invoke-static {v12, v6}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
     invoke-virtual {v13, v12}, Lcom/google/android/material/tabs/TabLayout$Tab;->setIcon(Landroid/graphics/drawable/Drawable;)Lcom/google/android/material/tabs/TabLayout$Tab;
 
@@ -670,7 +680,7 @@
     goto :goto_3
 
     :cond_6
-    iget-object v9, v6, Lf/b/a/c/d;->a:[Lf/b/a/c/d$a;
+    iget-object v9, v5, Lf/b/a/c/d;->a:[Lf/b/a/c/d$a;
 
     new-instance v10, Ljava/util/ArrayList;
 
@@ -681,11 +691,11 @@
     array-length v13, v9
 
     :goto_4
-    if-ge v4, v13, :cond_8
+    if-ge v3, v13, :cond_8
 
-    aget-object v14, v9, v4
+    aget-object v14, v9, v3
 
-    invoke-virtual {v7}, Lcom/google/android/material/tabs/TabLayout;->newTab()Lcom/google/android/material/tabs/TabLayout$Tab;
+    invoke-virtual {v8}, Lcom/google/android/material/tabs/TabLayout;->newTab()Lcom/google/android/material/tabs/TabLayout$Tab;
 
     move-result-object v15
 
@@ -699,9 +709,9 @@
 
     const-string v15, "tabLayout.newTab()\n              .setIcon(it.icon)"
 
-    invoke-static {v11, v15}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v15}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v6, v12}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v11}, Lcom/google/android/material/tabs/TabLayout$Tab;->getIcon()Landroid/graphics/drawable/Drawable;
 
@@ -713,7 +723,7 @@
 
     move-result-object v15
 
-    invoke-static {v15, v2}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
+    invoke-static {v15, v6}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 
     invoke-virtual {v11, v15}, Lcom/google/android/material/tabs/TabLayout$Tab;->setIcon(Landroid/graphics/drawable/Drawable;)Lcom/google/android/material/tabs/TabLayout$Tab;
 
@@ -728,7 +738,7 @@
 
     invoke-virtual {v10, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    add-int/lit8 v4, v4, 0x1
+    add-int/lit8 v3, v3, 0x1
 
     const/4 v11, 0x2
 
@@ -737,60 +747,60 @@
     :cond_8
     invoke-virtual {v10}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
-    move-result-object v2
+    move-result-object v3
 
     :goto_5
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v4
+    move-result v6
 
-    if-eqz v4, :cond_9
+    if-eqz v6, :cond_9
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v4
+    move-result-object v6
 
-    check-cast v4, Lcom/google/android/material/tabs/TabLayout$Tab;
+    check-cast v6, Lcom/google/android/material/tabs/TabLayout$Tab;
 
-    invoke-virtual {v7, v4}, Lcom/google/android/material/tabs/TabLayout;->addTab(Lcom/google/android/material/tabs/TabLayout$Tab;)V
+    invoke-virtual {v8, v6}, Lcom/google/android/material/tabs/TabLayout;->addTab(Lcom/google/android/material/tabs/TabLayout$Tab;)V
 
     goto :goto_5
 
     :cond_9
-    iget-object v2, v0, Lf/b/a/a/a;->d:Landroidx/viewpager/widget/ViewPager;
+    iget-object v3, v0, Lf/b/a/a/a;->d:Landroidx/viewpager/widget/ViewPager;
 
-    if-eqz v2, :cond_a
+    if-eqz v3, :cond_a
 
-    invoke-virtual {v2, v6}, Landroidx/viewpager/widget/ViewPager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
+    invoke-virtual {v3, v5}, Landroidx/viewpager/widget/ViewPager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
     :cond_a
-    iget-object v2, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
 
-    if-eqz v2, :cond_b
+    if-eqz v3, :cond_b
 
-    new-instance v4, Lf/b/a/a/b;
+    new-instance v5, Lf/b/a/a/b;
 
-    invoke-direct {v4, v0}, Lf/b/a/a/b;-><init>(Lf/b/a/a/a;)V
+    invoke-direct {v5, v0}, Lf/b/a/a/b;-><init>(Lf/b/a/a/a;)V
 
-    invoke-virtual {v2, v4}, Lcom/google/android/material/tabs/TabLayout;->addOnTabSelectedListener(Lcom/google/android/material/tabs/TabLayout$OnTabSelectedListener;)V
+    invoke-virtual {v3, v5}, Lcom/google/android/material/tabs/TabLayout;->addOnTabSelectedListener(Lcom/google/android/material/tabs/TabLayout$OnTabSelectedListener;)V
 
     :cond_b
-    iget-object v2, v0, Lf/b/a/a/a;->d:Landroidx/viewpager/widget/ViewPager;
+    iget-object v3, v0, Lf/b/a/a/a;->d:Landroidx/viewpager/widget/ViewPager;
 
-    if-eqz v2, :cond_c
+    if-eqz v3, :cond_c
 
-    new-instance v4, Lf/b/a/a/c;
+    new-instance v5, Lf/b/a/a/c;
 
-    invoke-direct {v4, v0}, Lf/b/a/a/c;-><init>(Lf/b/a/a/a;)V
+    invoke-direct {v5, v0}, Lf/b/a/a/c;-><init>(Lf/b/a/a/a;)V
 
-    invoke-virtual {v2, v4}, Landroidx/viewpager/widget/ViewPager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
+    invoke-virtual {v3, v5}, Landroidx/viewpager/widget/ViewPager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
 
     :cond_c
-    iget-object v2, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, v0, Lf/b/a/a/a;->e:Lcom/google/android/material/tabs/TabLayout;
 
-    if-eqz v2, :cond_d
+    if-eqz v3, :cond_d
 
-    invoke-virtual {v2, v3}, Lcom/google/android/material/tabs/TabLayout;->getTabAt(I)Lcom/google/android/material/tabs/TabLayout$Tab;
+    invoke-virtual {v3, v2}, Lcom/google/android/material/tabs/TabLayout;->getTabAt(I)Lcom/google/android/material/tabs/TabLayout$Tab;
 
     move-result-object v2
 
@@ -805,14 +815,14 @@
 
     new-instance v3, Lf/b/a/a/a$a;
 
-    const/4 v4, 0x2
+    const/4 v5, 0x2
 
-    invoke-direct {v3, v4, v5}, Lf/b/a/a/a$a;-><init>(ILjava/lang/Object;)V
+    invoke-direct {v3, v5, v4}, Lf/b/a/a/a$a;-><init>(ILjava/lang/Object;)V
 
     invoke-virtual {v2, v3}, Landroid/widget/ImageButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_e
-    invoke-virtual {v8}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v7}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->b()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object v2
 
@@ -827,25 +837,18 @@
     goto :goto_6
 
     :cond_f
-    invoke-static {v10}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v9}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v2
+    throw v10
 
     :cond_10
-    invoke-static {v10}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v9}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v2
+    throw v10
 
     :cond_11
     :goto_6
     return-object v1
-
-    :cond_12
-    const-string v1, "inflater"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
 .end method
 
 .method public onDestroyView()V
@@ -868,7 +871,9 @@
 .method public onDismiss(Landroid/content/DialogInterface;)V
     .locals 3
 
-    if-eqz p1, :cond_1
+    const-string v0, "dialog"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
 
@@ -882,7 +887,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -894,15 +899,6 @@
     invoke-super {p0, p1}, Landroidx/fragment/app/DialogFragment;->onDismiss(Landroid/content/DialogInterface;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "dialog"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onResume()V
@@ -937,7 +933,7 @@
 
     const-string v1, "it"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v1, Lcom/google/android/material/R$anim;->design_bottom_sheet_slide_in:I
 
@@ -947,7 +943,7 @@
 
     const-string v2, "animation"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getResources()Landroid/content/res/Resources;
 
@@ -999,6 +995,10 @@
         }
     .end annotation
 
+    const-string v0, "transaction"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     sget v0, Lcom/google/android/material/R$anim;->abc_grow_fade_in_from_bottom:I
 
     sget v1, Lcom/google/android/material/R$anim;->abc_shrink_fade_out_from_bottom:I
diff --git a/com.discord/smali_classes2/f/b/a/a/b.smali b/com.discord/smali_classes2/f/b/a/a/b.smali
index 4309210fe0..b48f22ae0b 100644
--- a/com.discord/smali_classes2/f/b/a/a/b.smali
+++ b/com.discord/smali_classes2/f/b/a/a/b.smali
@@ -29,26 +29,21 @@
 
 # virtual methods
 .method public onTabReselected(Lcom/google/android/material/tabs/TabLayout$Tab;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "tab"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "tab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTabSelected(Lcom/google/android/material/tabs/TabLayout$Tab;)V
     .locals 1
 
-    if-eqz p1, :cond_2
+    const-string v0, "tab"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout$Tab;->getPosition()I
 
@@ -75,30 +70,14 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "tab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onTabUnselected(Lcom/google/android/material/tabs/TabLayout$Tab;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "tab"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "tab"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/e.smali b/com.discord/smali_classes2/f/b/a/a/e.smali
index d146ea785a..8f0e947df1 100644
--- a/com.discord/smali_classes2/f/b/a/a/e.smali
+++ b/com.discord/smali_classes2/f/b/a/a/e.smali
@@ -40,7 +40,7 @@
 
     const-string v1, "view.context"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Landroid/content/Intent;
 
diff --git a/com.discord/smali_classes2/f/b/a/a/f.smali b/com.discord/smali_classes2/f/b/a/a/f.smali
index 53e066234a..c3e1c2365d 100644
--- a/com.discord/smali_classes2/f/b/a/a/f.smali
+++ b/com.discord/smali_classes2/f/b/a/a/f.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "invoke(...)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/i.smali b/com.discord/smali_classes2/f/b/a/a/i.smali
index ac884c37d8..785b2cbab6 100644
--- a/com.discord/smali_classes2/f/b/a/a/i.smali
+++ b/com.discord/smali_classes2/f/b/a/a/i.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/a/i;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/view/View;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -38,11 +38,13 @@
 
 # virtual methods
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Landroid/view/View;
 
-    if-eqz p1, :cond_1
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/b/a/a/i;->this$0:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -56,13 +58,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_1
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/j.smali b/com.discord/smali_classes2/f/b/a/a/j.smali
index 8bb7d75e8f..dfbb377f59 100644
--- a/com.discord/smali_classes2/f/b/a/a/j.smali
+++ b/com.discord/smali_classes2/f/b/a/a/j.smali
@@ -34,7 +34,7 @@
 
     const-string v1, "it"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {v0, p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;->onToolTipButtonLongPressed(Landroid/view/View;)Z
 
diff --git a/com.discord/smali_classes2/f/b/a/a/k.smali b/com.discord/smali_classes2/f/b/a/a/k.smali
index f23c6537ff..f0a6d0e57a 100644
--- a/com.discord/smali_classes2/f/b/a/a/k.smali
+++ b/com.discord/smali_classes2/f/b/a/a/k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/a/k;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function2<",
         "Landroid/view/ViewGroup;",
         "Ljava/lang/Boolean;",
@@ -41,7 +41,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -51,30 +51,32 @@
 .method public final a(Landroid/view/ViewGroup;Z)V
     .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "$this$enableChildren"
 
-    if-eqz p1, :cond_2
-
-    const/4 v1, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/ViewGroup;->getChildCount()I
 
-    move-result v2
+    move-result v0
+
+    const/4 v1, 0x0
 
     :goto_0
-    if-ge v1, v2, :cond_1
+    if-ge v1, v0, :cond_1
 
     invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
 
-    move-result-object v3
+    move-result-object v2
 
-    if-eqz v3, :cond_0
+    if-eqz v2, :cond_0
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    const/4 v5, 0x2
+    const/4 v4, 0x2
 
-    invoke-static {v3, p2, v4, v5, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+    const/4 v5, 0x0
+
+    invoke-static {v2, p2, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
     :cond_0
     add-int/lit8 v1, v1, 0x1
@@ -83,13 +85,6 @@
 
     :cond_1
     return-void
-
-    :cond_2
-    const-string p1, "$this$enableChildren"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/f/b/a/a/l.smali b/com.discord/smali_classes2/f/b/a/a/l.smali
index d14d290695..2f7a390b80 100644
--- a/com.discord/smali_classes2/f/b/a/a/l.smali
+++ b/com.discord/smali_classes2/f/b/a/a/l.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/a/l;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/lang/Integer;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/m.smali b/com.discord/smali_classes2/f/b/a/a/m.smali
index 8c93d71c97..9bd9fd0fde 100644
--- a/com.discord/smali_classes2/f/b/a/a/m.smali
+++ b/com.discord/smali_classes2/f/b/a/a/m.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/a/m;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Boolean;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/n.smali b/com.discord/smali_classes2/f/b/a/a/n.smali
index 4a421b6d28..5cc85f234b 100644
--- a/com.discord/smali_classes2/f/b/a/a/n.smali
+++ b/com.discord/smali_classes2/f/b/a/a/n.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/a/n;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FlexInputFragment.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/Unit;",
         ">;"
@@ -29,7 +29,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lr0/j/b/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/j/b/a;->a()Lrx/Scheduler;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/f/b/a/a/o.smali b/com.discord/smali_classes2/f/b/a/a/o.smali
index d5b3dbfc84..692a3689d9 100644
--- a/com.discord/smali_classes2/f/b/a/a/o.smali
+++ b/com.discord/smali_classes2/f/b/a/a/o.smali
@@ -46,7 +46,9 @@
 
     check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz p1, :cond_1
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/b/a/a/o;->a:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -66,15 +68,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onItemUnselected(Ljava/lang/Object;)V
@@ -82,7 +75,9 @@
 
     check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
 
-    if-eqz p1, :cond_1
+    const-string v0, "item"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/b/a/a/o;->a:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -102,15 +97,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "item"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public unregister()V
diff --git a/com.discord/smali_classes2/f/b/a/a/p.smali b/com.discord/smali_classes2/f/b/a/a/p.smali
index 6b4e0b14b5..346c62725b 100644
--- a/com.discord/smali_classes2/f/b/a/a/p.smali
+++ b/com.discord/smali_classes2/f/b/a/a/p.smali
@@ -34,7 +34,7 @@
 
     const-string v0, "invoke(...)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/q.smali b/com.discord/smali_classes2/f/b/a/a/q.smali
index 6c544b2217..e6efd849a3 100644
--- a/com.discord/smali_classes2/f/b/a/a/q.smali
+++ b/com.discord/smali_classes2/f/b/a/a/q.smali
@@ -36,11 +36,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 4
 
-    const/4 v0, 0x0
+    const-string v0, "view"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "insets"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/view/View;->getPaddingLeft()I
 
@@ -65,18 +67,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "view"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/a/r.smali b/com.discord/smali_classes2/f/b/a/a/r.smali
index b8dfb45f89..bd69dcbee7 100644
--- a/com.discord/smali_classes2/f/b/a/a/r.smali
+++ b/com.discord/smali_classes2/f/b/a/a/r.smali
@@ -26,11 +26,13 @@
 .method public final onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "<anonymous parameter 0>"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string p1, "insets"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object p1, p0, Lf/b/a/a/r;->a:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
@@ -53,18 +55,4 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "insets"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/c/d.smali b/com.discord/smali_classes2/f/b/a/c/d.smali
index ae08060b54..1b71eb50af 100644
--- a/com.discord/smali_classes2/f/b/a/c/d.smali
+++ b/com.discord/smali_classes2/f/b/a/c/d.smali
@@ -19,7 +19,13 @@
 .method public varargs constructor <init>(Landroidx/fragment/app/FragmentManager;[Lf/b/a/c/d$a;)V
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "childFragmentManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "pageSuppliers"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x1
 
@@ -28,15 +34,6 @@
     iput-object p2, p0, Lf/b/a/c/d;->a:[Lf/b/a/c/d$a;
 
     return-void
-
-    :cond_0
-    const-string p1, "pageSuppliers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali_classes2/f/b/a/c/h.smali b/com.discord/smali_classes2/f/b/a/c/h.smali
index 37abcc8d12..e9194aabdd 100644
--- a/com.discord/smali_classes2/f/b/a/c/h.smali
+++ b/com.discord/smali_classes2/f/b/a/c/h.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/c/h;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FileListAdapter.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Ljava/io/File;",
         "Lkotlin/sequences/Sequence<",
@@ -42,7 +42,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
 # virtual methods
 .method public final a(Ljava/io/File;)Lkotlin/sequences/Sequence;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -62,7 +62,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_1
+    const-string v0, "$this$getFileList"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -77,19 +79,10 @@
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lj0/s/f;->a:Lj0/s/f;
+    sget-object p1, Lk0/t/f;->a:Lk0/t/f;
 
     :goto_0
     return-object p1
-
-    :cond_1
-    const-string p1, "$this$getFileList"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali_classes2/f/b/a/c/i$b.smali b/com.discord/smali_classes2/f/b/a/c/i$b.smali
index 32941c75c6..633acca036 100644
--- a/com.discord/smali_classes2/f/b/a/c/i$b.smali
+++ b/com.discord/smali_classes2/f/b/a/c/i$b.smali
@@ -30,7 +30,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/ContentResolver;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,7 +64,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 
     :cond_0
     iget-object v0, p0, Lf/b/a/c/i$b;->b:Landroid/os/CancellationSignal;
diff --git a/com.discord/smali_classes2/f/b/a/c/i$c.smali b/com.discord/smali_classes2/f/b/a/c/i$c.smali
index bcc8ab0427..75694a38df 100644
--- a/com.discord/smali_classes2/f/b/a/c/i$c.smali
+++ b/com.discord/smali_classes2/f/b/a/c/i$c.smali
@@ -20,7 +20,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/ContentResolver;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/f/b/a/c/i$d.smali b/com.discord/smali_classes2/f/b/a/c/i$d.smali
index c7163eb503..ce085479bf 100644
--- a/com.discord/smali_classes2/f/b/a/c/i$d.smali
+++ b/com.discord/smali_classes2/f/b/a/c/i$d.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/c/i$d;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ThumbnailViewHolder.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/graphics/Bitmap;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/c/i.smali b/com.discord/smali_classes2/f/b/a/c/i.smali
index a38d0137c0..97f2c59130 100644
--- a/com.discord/smali_classes2/f/b/a/c/i.smali
+++ b/com.discord/smali_classes2/f/b/a/c/i.smali
@@ -47,6 +47,10 @@
 .method public constructor <init>(Landroid/view/View;)V
     .locals 3
 
+    const-string v0, "itemView"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -75,13 +79,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lf/b/a/c/i$b;-><init>(Landroid/content/ContentResolver;)V
 
@@ -96,13 +100,13 @@
 
     move-result-object p1
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object p1
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lf/b/a/c/i$c;-><init>(Landroid/content/ContentResolver;)V
 
@@ -159,7 +163,7 @@
 
     const-string v2, "itemView"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget v2, Lcom/lytefast/flexinput/R$b;->flexInputDialogBackground:I
 
@@ -217,7 +221,7 @@
 
     const/4 v2, 0x0
 
-    if-eqz p2, :cond_6
+    if-eqz p2, :cond_5
 
     invoke-virtual {p0}, Lf/b/a/c/i;->a()Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -237,7 +241,7 @@
 
     iget-object p2, p0, Lf/b/a/c/i;->d:Lf/b/a/c/i$b;
 
-    if-eqz p2, :cond_d
+    if-eqz p2, :cond_a
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
 
@@ -247,43 +251,42 @@
 
     invoke-direct {v0, p0}, Lf/b/a/c/i$d;-><init>(Lf/b/a/c/i;)V
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p3, "onGenerate"
+
+    invoke-static {v0, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lf/b/a/c/i$b;->a()V
 
-    sget-object v3, Lk0/a/s0;->d:Lk0/a/s0;
+    sget-object v3, Ll0/a/s0;->d:Ll0/a/s0;
 
-    invoke-static {}, Lk0/a/j0;->a()Lk0/a/f1;
+    invoke-static {}, Ll0/a/j0;->a()Ll0/a/f1;
 
     move-result-object v4
 
-    const/4 v5, 0x0
-
     new-instance v6, Lf/b/a/c/j;
 
     invoke-direct {v6, p2, p1, v0, v2}, Lf/b/a/c/j;-><init>(Lf/b/a/c/i$b;Landroid/net/Uri;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
 
+    const/4 v5, 0x0
+
     const/4 v7, 0x2
 
     const/4 v8, 0x0
 
-    invoke-static/range {v3 .. v8}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    invoke-static/range {v3 .. v8}, Lf/n/a/k/a;->J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 
     move-result-object p1
 
     iput-object p1, p2, Lf/b/a/c/i$b;->a:Lkotlinx/coroutines/Job;
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_5
-    invoke-static {p3}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_6
     iget-object p2, p0, Lf/b/a/c/i;->e:Lf/b/a/c/i$c;
 
-    if-eqz p2, :cond_c
+    if-eqz p2, :cond_9
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/model/Attachment;->getId()J
 
@@ -293,7 +296,7 @@
 
     move-result-object p1
 
-    if-eqz p1, :cond_b
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p3, Lf/b/a/c/m;
 
@@ -333,17 +336,17 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_8
+    if-eqz v0, :cond_7
 
     invoke-interface {v0}, Landroid/database/Cursor;->moveToFirst()Z
 
     move-result v3
 
-    if-nez v3, :cond_7
+    if-nez v3, :cond_6
 
     goto :goto_1
 
-    :cond_7
+    :cond_6
     :try_start_0
     invoke-interface {v0, v1}, Landroid/database/Cursor;->getLong(I)J
 
@@ -376,11 +379,13 @@
 
     throw p2
 
-    :cond_8
+    :cond_7
     :goto_1
     iget-object p2, p2, Lf/b/a/c/i$c;->a:Landroid/content/ContentResolver;
 
-    if-eqz p2, :cond_a
+    const-string v1, "contentResolver"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v1, Lf/b/a/c/l;
 
@@ -388,30 +393,15 @@
 
     invoke-static {v1}, Landroid/os/AsyncTask;->execute(Ljava/lang/Runnable;)V
 
-    if-eqz v0, :cond_9
+    if-eqz v0, :cond_8
 
     invoke-interface {v0}, Landroid/database/Cursor;->close()V
 
-    :cond_9
+    :cond_8
     :goto_2
     move-object v2, p1
 
-    goto :goto_3
-
-    :cond_a
-    const-string p1, "contentResolver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_b
-    invoke-static {p3}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_c
-    :goto_3
+    :cond_9
     invoke-virtual {p0}, Lf/b/a/c/i;->a()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p1
@@ -426,7 +416,7 @@
 
     invoke-virtual {p1, v2, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Landroid/net/Uri;Ljava/lang/Object;)V
 
-    :cond_d
-    :goto_4
+    :cond_a
+    :goto_3
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/c/j.smali b/com.discord/smali_classes2/f/b/a/c/j.smali
index 6040b24019..740b12c062 100644
--- a/com.discord/smali_classes2/f/b/a/c/j.smali
+++ b/com.discord/smali_classes2/f/b/a/c/j.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/c/j;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "ThumbnailViewHolder.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -21,7 +21,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.lytefast.flexinput.adapters.ThumbnailViewHolder$ThumbnailBitmapGenerator$generate$1"
     f = "ThumbnailViewHolder.kt"
     l = {
@@ -59,7 +59,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p4}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p4}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -80,7 +80,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/b/a/c/j;
 
@@ -97,31 +99,34 @@
     iput-object p1, v0, Lf/b/a/c/j;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 4
 
     check-cast p2, Lkotlin/coroutines/Continuation;
 
-    invoke-virtual {p0, p1, p2}, Lf/b/a/c/j;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    const-string v0, "completion"
 
-    move-result-object p1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p1, Lf/b/a/c/j;
+    new-instance v0, Lf/b/a/c/j;
 
-    sget-object p2, Lkotlin/Unit;->a:Lkotlin/Unit;
+    iget-object v1, p0, Lf/b/a/c/j;->this$0:Lf/b/a/c/i$b;
 
-    invoke-virtual {p1, p2}, Lf/b/a/c/j;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+    iget-object v2, p0, Lf/b/a/c/j;->$uri:Landroid/net/Uri;
+
+    iget-object v3, p0, Lf/b/a/c/j;->$onGenerate:Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {v0, v1, v2, v3, p2}, Lf/b/a/c/j;-><init>(Lf/b/a/c/i$b;Landroid/net/Uri;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
+
+    check-cast p1, Lkotlinx/coroutines/CoroutineScope;
+
+    iput-object p1, v0, Lf/b/a/c/j;->p$:Lkotlinx/coroutines/CoroutineScope;
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    invoke-virtual {v0, p1}, Lf/b/a/c/j;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -131,7 +136,7 @@
 .method public final invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 6
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     iget v1, p0, Lf/b/a/c/j;->label:I
 
@@ -191,13 +196,13 @@
 
     if-eqz v1, :cond_3
 
-    sget-object v2, Lk0/a/j0;->b:Lk0/a/v;
+    sget-object v2, Ll0/a/j0;->b:Ll0/a/v;
 
     new-instance v5, Lf/b/a/c/k;
 
     invoke-direct {v5, v1, v3, v4, p1}, Lf/b/a/c/k;-><init>(Lf/b/a/c/i$b;Landroid/content/ContentResolver;Landroid/net/Uri;Lkotlin/coroutines/Continuation;)V
 
-    invoke-static {v2, v5, p0}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    invoke-static {v2, v5, p0}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/b/a/c/k.smali b/com.discord/smali_classes2/f/b/a/c/k.smali
index db7fb24e69..a5a6c8f19d 100644
--- a/com.discord/smali_classes2/f/b/a/c/k.smali
+++ b/com.discord/smali_classes2/f/b/a/c/k.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/c/k;
-.super Lj0/k/h/a/g;
+.super Lk0/l/h/a/g;
 .source "ThumbnailViewHolder.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/h/a/g;",
+        "Lk0/l/h/a/g;",
         "Lkotlin/jvm/functions/Function2<",
         "Lkotlinx/coroutines/CoroutineScope;",
         "Lkotlin/coroutines/Continuation<",
@@ -21,7 +21,7 @@
     }
 .end annotation
 
-.annotation runtime Lj0/k/h/a/d;
+.annotation runtime Lk0/l/h/a/d;
     c = "com.lytefast.flexinput.adapters.ThumbnailViewHolder$ThumbnailBitmapGenerator$getThumbnailQ$2"
     f = "ThumbnailViewHolder.kt"
     l = {}
@@ -53,7 +53,7 @@
 
     const/4 p1, 0x2
 
-    invoke-direct {p0, p1, p4}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+    invoke-direct {p0, p1, p4}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
 
     return-void
 .end method
@@ -74,7 +74,9 @@
         }
     .end annotation
 
-    if-eqz p2, :cond_0
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/b/a/c/k;
 
@@ -91,31 +93,34 @@
     iput-object p1, v0, Lf/b/a/c/k;->p$:Lkotlinx/coroutines/CoroutineScope;
 
     return-object v0
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 4
 
     check-cast p2, Lkotlin/coroutines/Continuation;
 
-    invoke-virtual {p0, p1, p2}, Lf/b/a/c/k;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    const-string v0, "completion"
 
-    move-result-object p1
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p1, Lf/b/a/c/k;
+    new-instance v0, Lf/b/a/c/k;
 
-    sget-object p2, Lkotlin/Unit;->a:Lkotlin/Unit;
+    iget-object v1, p0, Lf/b/a/c/k;->this$0:Lf/b/a/c/i$b;
 
-    invoke-virtual {p1, p2}, Lf/b/a/c/k;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+    iget-object v2, p0, Lf/b/a/c/k;->$contentResolver:Landroid/content/ContentResolver;
+
+    iget-object v3, p0, Lf/b/a/c/k;->$uri:Landroid/net/Uri;
+
+    invoke-direct {v0, v1, v2, v3, p2}, Lf/b/a/c/k;-><init>(Lf/b/a/c/i$b;Landroid/content/ContentResolver;Landroid/net/Uri;Lkotlin/coroutines/Continuation;)V
+
+    check-cast p1, Lkotlinx/coroutines/CoroutineScope;
+
+    iput-object p1, v0, Lf/b/a/c/k;->p$:Lkotlinx/coroutines/CoroutineScope;
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    invoke-virtual {v0, p1}, Lf/b/a/c/k;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/b/a/c/m.smali b/com.discord/smali_classes2/f/b/a/c/m.smali
index ce16875c2a..0bcbfc1e0e 100644
--- a/com.discord/smali_classes2/f/b/a/c/m.smali
+++ b/com.discord/smali_classes2/f/b/a/c/m.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/c/m;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ThumbnailViewHolder.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroid/content/ContentResolver;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -42,7 +42,9 @@
 
     check-cast p1, Landroid/content/ContentResolver;
 
-    if-eqz p1, :cond_0
+    const-string v0, "contentResolver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lf/b/a/c/l;
 
@@ -53,13 +55,4 @@
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
     return-object p1
-
-    :cond_0
-    const-string p1, "contentResolver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/d/b.smali b/com.discord/smali_classes2/f/b/a/d/b.smali
index c96dc1f1df..a1daae4e67 100644
--- a/com.discord/smali_classes2/f/b/a/d/b.smali
+++ b/com.discord/smali_classes2/f/b/a/d/b.smali
@@ -52,25 +52,28 @@
 
     if-eqz p4, :cond_1
 
-    sget p4, Lcom/lytefast/flexinput/R$g;->discord:I
+    sget p3, Lcom/lytefast/flexinput/R$g;->discord:I
 
-    invoke-virtual {p1, p4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
-    move-result-object p4
+    move-result-object p3
 
-    const-string v0, "context.getString(R.string.discord)"
+    const-string p4, "context.getString(R.string.discord)"
 
-    invoke-static {p4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_1
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_1
-    move-object p4, p3
+    const-string p4, "context"
 
-    :goto_1
-    if-eqz p2, :cond_3
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_2
+    const-string p4, "providerAuthority"
+
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "imageDirName"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -78,23 +81,9 @@
 
     iput-object p2, p0, Lf/b/a/d/b;->b:Ljava/lang/String;
 
-    iput-object p4, p0, Lf/b/a/d/b;->c:Ljava/lang/String;
+    iput-object p3, p0, Lf/b/a/d/b;->c:Ljava/lang/String;
 
     return-void
-
-    :cond_2
-    const-string p1, "imageDirName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_3
-    const-string p1, "providerAuthority"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
 .end method
 
 
@@ -102,11 +91,13 @@
 .method public a(Landroid/content/Context;Ljava/io/File;)Landroid/net/Uri;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "file"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/b/a/d/b;->b:Ljava/lang/String;
 
@@ -116,23 +107,9 @@
 
     const-string p2, "FileProvider.getUriForFi\u2026 providerAuthority, file)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "file"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public b()Ljava/io/File;
@@ -189,7 +166,7 @@
 
     const-string v2, "context.filesDir"
 
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     :goto_0
     const-string v2, ".jpg"
diff --git a/com.discord/smali_classes2/f/b/a/e/a.smali b/com.discord/smali_classes2/f/b/a/e/a.smali
index a147eb239e..a6f9672f16 100644
--- a/com.discord/smali_classes2/f/b/a/e/a.smali
+++ b/com.discord/smali_classes2/f/b/a/e/a.smali
@@ -17,35 +17,39 @@
         }
     .end annotation
 
-    new-instance v6, Lcom/lytefast/flexinput/model/Attachment;
+    const-string v0, "$this$toAttachment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/lytefast/flexinput/model/Attachment;
 
     invoke-virtual {p0}, Ljava/io/File;->hashCode()I
 
-    move-result v0
+    move-result v1
 
-    int-to-long v1, v0
+    int-to-long v2, v1
 
     invoke-static {p0}, Landroid/net/Uri;->fromFile(Ljava/io/File;)Landroid/net/Uri;
 
-    move-result-object v3
+    move-result-object v4
 
-    const-string v0, "Uri.fromFile(this)"
+    const-string v1, "Uri.fromFile(this)"
 
-    invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/io/File;->getName()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v5
 
-    const-string v0, "this.name"
+    const-string v1, "this.name"
 
-    invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object v0, v6
+    move-object v1, v0
 
-    move-object v5, p0
+    move-object v6, p0
 
-    invoke-direct/range {v0 .. v5}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-direct/range {v1 .. v6}, Lcom/lytefast/flexinput/model/Attachment;-><init>(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
 
-    return-object v6
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/f/b/a/f/a$c.smali b/com.discord/smali_classes2/f/b/a/f/a$c.smali
index a3c679e70d..e81074d95e 100644
--- a/com.discord/smali_classes2/f/b/a/f/a$c.smali
+++ b/com.discord/smali_classes2/f/b/a/f/a$c.smali
@@ -22,22 +22,17 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "text"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
 
     invoke-direct {p0, v0}, Lf/b/a/f/a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object p1, p0, Lf/b/a/f/a$c;->a:Ljava/lang/String;
 
     return-void
-
-    :cond_0
-    const-string p1, "text"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -57,7 +52,7 @@
 
     iget-object p1, p1, Lf/b/a/f/a$c;->a:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/f/b/a/g/a.smali b/com.discord/smali_classes2/f/b/a/g/a.smali
index 14edefd028..eabe461f77 100644
--- a/com.discord/smali_classes2/f/b/a/g/a.smali
+++ b/com.discord/smali_classes2/f/b/a/g/a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/b/a/g/a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "FlexEditText.kt"
 
 # interfaces
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function1<",
         "Landroidx/core/view/inputmethod/InputContentInfoCompat;",
         "Lkotlin/Unit;",
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 
     const-string v2, "context"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -62,7 +62,7 @@
 
     const-string v2, "context.contentResolver"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali_classes2/f/f/b/b.smali b/com.discord/smali_classes2/f/f/b/b.smali
index dc1dd217fb..f54cf8ce4f 100644
--- a/com.discord/smali_classes2/f/f/b/b.smali
+++ b/com.discord/smali_classes2/f/f/b/b.smali
@@ -280,9 +280,9 @@
     const-string v0, "com/esotericsoftware/reflectasm/ConstructorAccess"
 
     :goto_3
-    new-instance v9, Lp0/a/a/f;
+    new-instance v9, Lq0/a/a/f;
 
-    invoke-direct {v9, v2}, Lp0/a/a/f;-><init>(I)V
+    invoke-direct {v9, v2}, Lq0/a/a/f;-><init>(I)V
 
     const v11, 0x3002d
 
@@ -296,7 +296,7 @@
 
     move-object v15, v0
 
-    invoke-virtual/range {v10 .. v16}, Lp0/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+    invoke-virtual/range {v10 .. v16}, Lq0/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
     const/4 v15, 0x1
 
@@ -310,13 +310,13 @@
 
     move-object v14, v9
 
-    invoke-virtual/range {v14 .. v19}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v14 .. v19}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object v10
 
     const/16 v11, 0x19
 
-    invoke-virtual {v10, v11, v2}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v10, v11, v2}, Lq0/a/a/q;->t(II)V
 
     const-string v11, "<init>"
 
@@ -324,13 +324,13 @@
 
     const/16 v13, 0xb7
 
-    invoke-virtual {v10, v13, v0, v11, v12}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v10, v13, v0, v11, v12}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v0, 0xb1
 
-    invoke-virtual {v10, v0}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v10, v0}, Lq0/a/a/q;->e(I)V
 
-    invoke-virtual {v10, v3, v3}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {v10, v3, v3}, Lq0/a/a/q;->n(II)V
 
     const/4 v15, 0x1
 
@@ -344,35 +344,35 @@
 
     move-object v14, v9
 
-    invoke-virtual/range {v14 .. v19}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v14 .. v19}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object v0
 
     const/16 v10, 0xbb
 
-    invoke-virtual {v0, v10, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v0, v10, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v10, 0x59
 
-    invoke-virtual {v0, v10}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v0, v10}, Lq0/a/a/q;->e(I)V
 
     const-string v10, "<init>"
 
     const-string v11, "()V"
 
-    invoke-virtual {v0, v13, v5, v10, v11}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v0, v13, v5, v10, v11}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v10, 0xb0
 
-    invoke-virtual {v0, v10}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v0, v10}, Lq0/a/a/q;->e(I)V
 
     const/4 v10, 0x2
 
-    invoke-virtual {v0, v10, v3}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {v0, v10, v3}, Lq0/a/a/q;->n(II)V
 
-    invoke-static {v9, v5, v8}, Lf/f/b/b;->b(Lp0/a/a/f;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v9, v5, v8}, Lf/f/b/b;->b(Lq0/a/a/f;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v9}, Lp0/a/a/f;->f()[B
+    invoke-virtual {v9}, Lq0/a/a/f;->f()[B
 
     move-result-object v0
 
@@ -563,7 +563,7 @@
     throw v0
 .end method
 
-.method public static b(Lp0/a/a/f;Ljava/lang/String;Ljava/lang/String;)V
+.method public static b(Lq0/a/a/f;Ljava/lang/String;Ljava/lang/String;)V
     .locals 7
 
     const/4 v1, 0x1
@@ -578,7 +578,7 @@
 
     move-object v0, p0
 
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object p0
 
@@ -594,21 +594,21 @@
 
     if-eqz p2, :cond_0
 
-    invoke-virtual {p0, v3, p1}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v3, p1}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
-    invoke-virtual {p0, v4}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v4}, Lq0/a/a/q;->e(I)V
 
     const/16 v3, 0x19
 
     const/4 v5, 0x1
 
-    invoke-virtual {p0, v3, v5}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v3, v5}, Lq0/a/a/q;->t(II)V
 
     const/16 v3, 0xc0
 
-    invoke-virtual {p0, v3, p2}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v3, p2}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
-    invoke-virtual {p0, v4}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v4}, Lq0/a/a/q;->e(I)V
 
     const/16 v3, 0xb6
 
@@ -618,11 +618,11 @@
 
     const-string v6, "()Ljava/lang/Class;"
 
-    invoke-virtual {p0, v3, v4, v5, v6}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v3, v4, v5, v6}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v3, 0x57
 
-    invoke-virtual {p0, v3}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v3}, Lq0/a/a/q;->e(I)V
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -642,40 +642,40 @@
 
     move-result-object p2
 
-    invoke-virtual {p0, v2, p1, v1, p2}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v2, p1, v1, p2}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 p1, 0xb0
 
-    invoke-virtual {p0, p1}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, p1}, Lq0/a/a/q;->e(I)V
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, p1, v0}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {p0, p1, v0}, Lq0/a/a/q;->n(II)V
 
     goto :goto_0
 
     :cond_0
     const-string p1, "java/lang/UnsupportedOperationException"
 
-    invoke-virtual {p0, v3, p1}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v3, p1}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
-    invoke-virtual {p0, v4}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v4}, Lq0/a/a/q;->e(I)V
 
     const-string p2, "Not an inner class."
 
-    invoke-virtual {p0, p2}, Lp0/a/a/q;->j(Ljava/lang/Object;)V
+    invoke-virtual {p0, p2}, Lq0/a/a/q;->j(Ljava/lang/Object;)V
 
     const-string p2, "(Ljava/lang/String;)V"
 
-    invoke-virtual {p0, v2, p1, v1, p2}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v2, p1, v1, p2}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 p1, 0xbf
 
-    invoke-virtual {p0, p1}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, p1}, Lq0/a/a/q;->e(I)V
 
     const/4 p1, 0x3
 
-    invoke-virtual {p0, p1, v0}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {p0, p1, v0}, Lq0/a/a/q;->n(II)V
 
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/f/f/b/c.smali b/com.discord/smali_classes2/f/f/b/c.smali
index 9f091c637f..c43dec6dcc 100644
--- a/com.discord/smali_classes2/f/f/b/c.smali
+++ b/com.discord/smali_classes2/f/f/b/c.smali
@@ -196,9 +196,9 @@
 
     move-result-object v1
 
-    new-instance v6, Lp0/a/a/f;
+    new-instance v6, Lq0/a/a/f;
 
-    invoke-direct {v6, v3}, Lp0/a/a/f;-><init>(I)V
+    invoke-direct {v6, v3}, Lq0/a/a/f;-><init>(I)V
 
     const v9, 0x3002d
 
@@ -212,7 +212,7 @@
 
     move-object v8, v6
 
-    invoke-virtual/range {v8 .. v14}, Lp0/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+    invoke-virtual/range {v8 .. v14}, Lq0/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
     const/4 v13, 0x1
 
@@ -226,13 +226,13 @@
 
     move-object v12, v6
 
-    invoke-virtual/range {v12 .. v17}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v12 .. v17}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object v7
 
     const/16 v8, 0x19
 
-    invoke-virtual {v7, v8, v3}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v7, v8, v3}, Lq0/a/a/q;->t(II)V
 
     const/16 v3, 0xb7
 
@@ -242,87 +242,87 @@
 
     const-string v10, "()V"
 
-    invoke-virtual {v7, v3, v8, v9, v10}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v7, v3, v8, v9, v10}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v3, 0xb1
 
-    invoke-virtual {v7, v3}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v7, v3}, Lq0/a/a/q;->e(I)V
 
     const/4 v3, 0x1
 
-    invoke-virtual {v7, v3, v3}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {v7, v3, v3}, Lq0/a/a/q;->n(II)V
 
-    invoke-static {v6, v1, v0}, Lf/f/b/c;->m(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
+    invoke-static {v6, v1, v0}, Lf/f/b/c;->m(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    invoke-static {v6, v1, v0}, Lf/f/b/c;->p(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
+    invoke-static {v6, v1, v0}, Lf/f/b/c;->p(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    sget-object v3, Lp0/a/a/w;->f:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->f:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->f:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->f:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->h:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->h:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->h:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->h:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->i:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->i:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->i:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->i:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->j:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->j:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->j:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->j:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->l:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->l:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->l:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->l:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->m:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->m:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->m:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->m:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->k:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->k:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->k:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->k:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->g:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->g:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    sget-object v3, Lp0/a/a/w;->g:Lp0/a/a/w;
+    sget-object v3, Lq0/a/a/w;->g:Lq0/a/a/w;
 
-    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+    invoke-static {v6, v1, v0, v3}, Lf/f/b/c;->q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
 
-    invoke-static {v6, v1, v0}, Lf/f/b/c;->o(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
+    invoke-static {v6, v1, v0}, Lf/f/b/c;->o(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    invoke-virtual {v6}, Lp0/a/a/f;->f()[B
+    invoke-virtual {v6}, Lq0/a/a/f;->f()[B
 
     move-result-object v0
 
@@ -373,12 +373,12 @@
     throw v0
 .end method
 
-.method public static m(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
+.method public static m(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
     .locals 12
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lp0/a/a/f;",
+            "Lq0/a/a/f;",
             "Ljava/lang/String;",
             "Ljava/util/ArrayList<",
             "Ljava/lang/reflect/Field;",
@@ -398,7 +398,7 @@
 
     move-object v0, p0
 
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object p0
 
@@ -406,7 +406,7 @@
 
     const/4 v1, 0x2
 
-    invoke-virtual {p0, v0, v1}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v0, v1}, Lq0/a/a/q;->t(II)V
 
     invoke-virtual {p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -420,7 +420,7 @@
 
     move-result v1
 
-    new-array v2, v1, [Lp0/a/a/p;
+    new-array v2, v1, [Lq0/a/a/p;
 
     const/4 v3, 0x0
 
@@ -429,9 +429,9 @@
     :goto_0
     if-ge v4, v1, :cond_0
 
-    new-instance v5, Lp0/a/a/p;
+    new-instance v5, Lq0/a/a/p;
 
-    invoke-direct {v5}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v5}, Lq0/a/a/p;-><init>()V
 
     aput-object v5, v2, v4
 
@@ -440,13 +440,13 @@
     goto :goto_0
 
     :cond_0
-    new-instance v4, Lp0/a/a/p;
+    new-instance v4, Lq0/a/a/p;
 
-    invoke-direct {v4}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v4}, Lq0/a/a/p;-><init>()V
 
     add-int/lit8 v5, v1, -0x1
 
-    invoke-virtual {p0, v3, v5, v4, v2}, Lp0/a/a/q;->q(IILp0/a/a/p;[Lp0/a/a/p;)V
+    invoke-virtual {p0, v3, v5, v4, v2}, Lq0/a/a/q;->q(IILq0/a/a/p;[Lq0/a/a/p;)V
 
     :goto_1
     if-ge v3, v1, :cond_1
@@ -459,7 +459,7 @@
 
     aget-object v6, v2, v3
 
-    invoke-virtual {p0, v6}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {p0, v6}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v7, 0x3
 
@@ -473,17 +473,17 @@
 
     move-object v6, p0
 
-    invoke-virtual/range {v6 .. v11}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v6 .. v11}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/16 v6, 0x19
 
     const/4 v7, 0x1
 
-    invoke-virtual {p0, v6, v7}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v6, v7}, Lq0/a/a/q;->t(II)V
 
     const/16 v6, 0xc0
 
-    invoke-virtual {p0, v6, p1}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v6, p1}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v6, 0xb4
 
@@ -495,21 +495,21 @@
 
     move-result-object v8
 
-    invoke-static {v8}, Lp0/a/a/w;->e(Ljava/lang/Class;)Ljava/lang/String;
+    invoke-static {v8}, Lq0/a/a/w;->e(Ljava/lang/Class;)Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {p0, v6, p1, v7, v8}, Lp0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v6, p1, v7, v8}, Lq0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {v5}, Ljava/lang/reflect/Field;->getType()Ljava/lang/Class;
 
     move-result-object v5
 
-    invoke-static {v5}, Lp0/a/a/w;->j(Ljava/lang/Class;)Lp0/a/a/w;
+    invoke-static {v5}, Lq0/a/a/w;->j(Ljava/lang/Class;)Lq0/a/a/w;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lp0/a/a/w;->i()I
+    invoke-virtual {v5}, Lq0/a/a/w;->i()I
 
     move-result v5
 
@@ -526,7 +526,7 @@
 
     const-string v8, "(D)Ljava/lang/Double;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -535,7 +535,7 @@
 
     const-string v8, "(J)Ljava/lang/Long;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -544,7 +544,7 @@
 
     const-string v8, "(F)Ljava/lang/Float;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -553,7 +553,7 @@
 
     const-string v8, "(I)Ljava/lang/Integer;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -562,7 +562,7 @@
 
     const-string v8, "(S)Ljava/lang/Short;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -571,7 +571,7 @@
 
     const-string v8, "(B)Ljava/lang/Byte;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -580,7 +580,7 @@
 
     const-string v8, "(C)Ljava/lang/Character;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
@@ -589,19 +589,19 @@
 
     const-string v8, "(Z)Ljava/lang/Boolean;"
 
-    invoke-virtual {p0, v7, v5, v6, v8}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v7, v5, v6, v8}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_2
     const/16 v5, 0xb0
 
-    invoke-virtual {p0, v5}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v5}, Lq0/a/a/q;->e(I)V
 
     add-int/lit8 v3, v3, 0x1
 
     goto/16 :goto_1
 
     :cond_1
-    invoke-virtual {p0, v4}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {p0, v4}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v7, 0x3
 
@@ -615,7 +615,7 @@
 
     move-object v6, p0
 
-    invoke-virtual/range {v6 .. v11}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v6 .. v11}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     goto :goto_3
 
@@ -623,11 +623,11 @@
     const/4 v0, 0x6
 
     :goto_3
-    invoke-static {p0}, Lf/f/b/c;->r(Lp0/a/a/q;)Lp0/a/a/q;
+    invoke-static {p0}, Lf/f/b/c;->r(Lq0/a/a/q;)Lq0/a/a/q;
 
     const/4 p1, 0x3
 
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/q;->n(II)V
 
     return-void
 
@@ -646,17 +646,17 @@
     .end packed-switch
 .end method
 
-.method public static n(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+.method public static n(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
     .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lp0/a/a/f;",
+            "Lq0/a/a/f;",
             "Ljava/lang/String;",
             "Ljava/util/ArrayList<",
             "Ljava/lang/reflect/Field;",
             ">;",
-            "Lp0/a/a/w;",
+            "Lq0/a/a/w;",
             ")V"
         }
     .end annotation
@@ -665,11 +665,11 @@
 
     move-object/from16 v1, p2
 
-    invoke-virtual/range {p3 .. p3}, Lp0/a/a/w;->d()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lq0/a/a/w;->d()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lp0/a/a/w;->i()I
+    invoke-virtual/range {p3 .. p3}, Lq0/a/a/w;->i()I
 
     move-result v3
 
@@ -744,7 +744,7 @@
 
     move-object/from16 v5, p0
 
-    invoke-virtual/range {v5 .. v10}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v5 .. v10}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object v3
 
@@ -752,7 +752,7 @@
 
     const/4 v6, 0x2
 
-    invoke-virtual {v3, v5, v6}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v3, v5, v6}, Lq0/a/a/q;->t(II)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -764,11 +764,11 @@
 
     move-result v5
 
-    new-array v6, v5, [Lp0/a/a/p;
+    new-array v6, v5, [Lq0/a/a/p;
 
-    new-instance v7, Lp0/a/a/p;
+    new-instance v7, Lq0/a/a/p;
 
-    invoke-direct {v7}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v7}, Lq0/a/a/p;-><init>()V
 
     const/4 v8, 0x0
 
@@ -789,21 +789,21 @@
 
     move-result-object v11
 
-    invoke-static {v11}, Lp0/a/a/w;->j(Ljava/lang/Class;)Lp0/a/a/w;
+    invoke-static {v11}, Lq0/a/a/w;->j(Ljava/lang/Class;)Lq0/a/a/w;
 
     move-result-object v11
 
     move-object/from16 v15, p3
 
-    invoke-virtual {v11, v15}, Lp0/a/a/w;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v11, v15}, Lq0/a/a/w;->equals(Ljava/lang/Object;)Z
 
     move-result v11
 
     if-eqz v11, :cond_0
 
-    new-instance v11, Lp0/a/a/p;
+    new-instance v11, Lq0/a/a/p;
 
-    invoke-direct {v11}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v11}, Lq0/a/a/p;-><init>()V
 
     aput-object v11, v6, v9
 
@@ -822,13 +822,13 @@
     :cond_1
     move-object/from16 v15, p3
 
-    new-instance v9, Lp0/a/a/p;
+    new-instance v9, Lq0/a/a/p;
 
-    invoke-direct {v9}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v9}, Lq0/a/a/p;-><init>()V
 
     add-int/lit8 v11, v5, -0x1
 
-    invoke-virtual {v3, v8, v11, v9, v6}, Lp0/a/a/q;->q(IILp0/a/a/p;[Lp0/a/a/p;)V
+    invoke-virtual {v3, v8, v11, v9, v6}, Lq0/a/a/q;->q(IILq0/a/a/p;[Lq0/a/a/p;)V
 
     :goto_3
     if-ge v8, v5, :cond_3
@@ -851,7 +851,7 @@
 
     aget-object v11, v6, v8
 
-    invoke-virtual {v3, v11}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v3, v11}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v12, 0x3
 
@@ -869,17 +869,17 @@
 
     move-object/from16 v16, v18
 
-    invoke-virtual/range {v11 .. v16}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v11 .. v16}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/16 v11, 0x19
 
     const/4 v12, 0x1
 
-    invoke-virtual {v3, v11, v12}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v3, v11, v12}, Lq0/a/a/q;->t(II)V
 
     const/16 v11, 0xc0
 
-    invoke-virtual {v3, v11, v0}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v3, v11, v0}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v11, 0xb4
 
@@ -887,9 +887,9 @@
 
     move-result-object v12
 
-    invoke-virtual {v3, v11, v0, v12, v2}, Lp0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v3, v11, v0, v12, v2}, Lq0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {v3, v4}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v3, v4}, Lq0/a/a/q;->e(I)V
 
     :cond_2
     add-int/lit8 v8, v8, 0x1
@@ -901,7 +901,7 @@
     :cond_3
     if-eqz v10, :cond_4
 
-    invoke-virtual {v3, v7}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v3, v7}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v12, 0x3
 
@@ -915,16 +915,16 @@
 
     move-object v11, v3
 
-    invoke-virtual/range {v11 .. v16}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v11 .. v16}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
-    invoke-virtual/range {p3 .. p3}, Lp0/a/a/w;->c()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lq0/a/a/w;->c()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v3, v0}, Lf/f/b/c;->s(Lp0/a/a/q;Ljava/lang/String;)Lp0/a/a/q;
+    invoke-static {v3, v0}, Lf/f/b/c;->s(Lq0/a/a/q;Ljava/lang/String;)Lq0/a/a/q;
 
     :cond_4
-    invoke-virtual {v3, v9}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v3, v9}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v12, 0x3
 
@@ -938,7 +938,7 @@
 
     move-object v11, v3
 
-    invoke-virtual/range {v11 .. v16}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v11 .. v16}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/4 v0, 0x5
 
@@ -948,11 +948,11 @@
     const/4 v0, 0x6
 
     :goto_4
-    invoke-static {v3}, Lf/f/b/c;->r(Lp0/a/a/q;)Lp0/a/a/q;
+    invoke-static {v3}, Lf/f/b/c;->r(Lq0/a/a/q;)Lq0/a/a/q;
 
     const/4 v1, 0x3
 
-    invoke-virtual {v3, v0, v1}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {v3, v0, v1}, Lq0/a/a/q;->n(II)V
 
     return-void
 
@@ -971,12 +971,12 @@
     .end packed-switch
 .end method
 
-.method public static o(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
+.method public static o(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
     .locals 13
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lp0/a/a/f;",
+            "Lq0/a/a/f;",
             "Ljava/lang/String;",
             "Ljava/util/ArrayList<",
             "Ljava/lang/reflect/Field;",
@@ -996,7 +996,7 @@
 
     move-object v0, p0
 
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object p0
 
@@ -1004,7 +1004,7 @@
 
     const/4 v1, 0x2
 
-    invoke-virtual {p0, v0, v1}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v0, v1}, Lq0/a/a/q;->t(II)V
 
     invoke-virtual {p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -1016,11 +1016,11 @@
 
     move-result v0
 
-    new-array v1, v0, [Lp0/a/a/p;
+    new-array v1, v0, [Lq0/a/a/p;
 
-    new-instance v2, Lp0/a/a/p;
+    new-instance v2, Lq0/a/a/p;
 
-    invoke-direct {v2}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v2}, Lq0/a/a/p;-><init>()V
 
     const/4 v3, 0x0
 
@@ -1051,9 +1051,9 @@
 
     if-eqz v6, :cond_0
 
-    new-instance v6, Lp0/a/a/p;
+    new-instance v6, Lq0/a/a/p;
 
-    invoke-direct {v6}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v6}, Lq0/a/a/p;-><init>()V
 
     aput-object v6, v1, v4
 
@@ -1070,13 +1070,13 @@
     goto :goto_0
 
     :cond_1
-    new-instance v4, Lp0/a/a/p;
+    new-instance v4, Lq0/a/a/p;
 
-    invoke-direct {v4}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v4}, Lq0/a/a/p;-><init>()V
 
     add-int/lit8 v6, v0, -0x1
 
-    invoke-virtual {p0, v3, v6, v4, v1}, Lp0/a/a/q;->q(IILp0/a/a/p;[Lp0/a/a/p;)V
+    invoke-virtual {p0, v3, v6, v4, v1}, Lq0/a/a/q;->q(IILq0/a/a/p;[Lq0/a/a/p;)V
 
     :goto_2
     if-ge v3, v0, :cond_3
@@ -1091,7 +1091,7 @@
 
     aget-object v6, v1, v3
 
-    invoke-virtual {p0, v6}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {p0, v6}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v7, 0x3
 
@@ -1105,15 +1105,15 @@
 
     move-object v6, p0
 
-    invoke-virtual/range {v6 .. v11}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v6 .. v11}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/16 v6, 0x19
 
-    invoke-virtual {p0, v6, v12}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v6, v12}, Lq0/a/a/q;->t(II)V
 
     const/16 v6, 0xc0
 
-    invoke-virtual {p0, v6, p1}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v6, p1}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v6, 0xb4
 
@@ -1129,11 +1129,11 @@
 
     const-string v8, "Ljava/lang/String;"
 
-    invoke-virtual {p0, v6, p1, v7, v8}, Lp0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v6, p1, v7, v8}, Lq0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v6, 0xb0
 
-    invoke-virtual {p0, v6}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v6}, Lq0/a/a/q;->e(I)V
 
     :cond_2
     add-int/lit8 v3, v3, 0x1
@@ -1143,7 +1143,7 @@
     :cond_3
     if-eqz v5, :cond_4
 
-    invoke-virtual {p0, v2}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {p0, v2}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v7, 0x3
 
@@ -1157,14 +1157,14 @@
 
     move-object v6, p0
 
-    invoke-virtual/range {v6 .. v11}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v6 .. v11}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const-string p1, "String"
 
-    invoke-static {p0, p1}, Lf/f/b/c;->s(Lp0/a/a/q;Ljava/lang/String;)Lp0/a/a/q;
+    invoke-static {p0, p1}, Lf/f/b/c;->s(Lq0/a/a/q;Ljava/lang/String;)Lq0/a/a/q;
 
     :cond_4
-    invoke-virtual {p0, v4}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {p0, v4}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v7, 0x3
 
@@ -1178,7 +1178,7 @@
 
     move-object v6, p0
 
-    invoke-virtual/range {v6 .. v11}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v6 .. v11}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/4 p1, 0x5
 
@@ -1188,21 +1188,21 @@
     const/4 p1, 0x6
 
     :goto_3
-    invoke-static {p0}, Lf/f/b/c;->r(Lp0/a/a/q;)Lp0/a/a/q;
+    invoke-static {p0}, Lf/f/b/c;->r(Lq0/a/a/q;)Lq0/a/a/q;
 
     const/4 p2, 0x3
 
-    invoke-virtual {p0, p1, p2}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {p0, p1, p2}, Lq0/a/a/q;->n(II)V
 
     return-void
 .end method
 
-.method public static p(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
+.method public static p(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;)V
     .locals 13
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lp0/a/a/f;",
+            "Lq0/a/a/f;",
             "Ljava/lang/String;",
             "Ljava/util/ArrayList<",
             "Ljava/lang/reflect/Field;",
@@ -1222,7 +1222,7 @@
 
     move-object v0, p0
 
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object p0
 
@@ -1230,7 +1230,7 @@
 
     const/4 v1, 0x2
 
-    invoke-virtual {p0, v0, v1}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v0, v1}, Lq0/a/a/q;->t(II)V
 
     invoke-virtual {p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -1244,7 +1244,7 @@
 
     move-result v1
 
-    new-array v2, v1, [Lp0/a/a/p;
+    new-array v2, v1, [Lq0/a/a/p;
 
     const/4 v3, 0x0
 
@@ -1253,9 +1253,9 @@
     :goto_0
     if-ge v4, v1, :cond_0
 
-    new-instance v5, Lp0/a/a/p;
+    new-instance v5, Lq0/a/a/p;
 
-    invoke-direct {v5}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v5}, Lq0/a/a/p;-><init>()V
 
     aput-object v5, v2, v4
 
@@ -1264,13 +1264,13 @@
     goto :goto_0
 
     :cond_0
-    new-instance v4, Lp0/a/a/p;
+    new-instance v4, Lq0/a/a/p;
 
-    invoke-direct {v4}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v4}, Lq0/a/a/p;-><init>()V
 
     add-int/lit8 v5, v1, -0x1
 
-    invoke-virtual {p0, v3, v5, v4, v2}, Lp0/a/a/q;->q(IILp0/a/a/p;[Lp0/a/a/p;)V
+    invoke-virtual {p0, v3, v5, v4, v2}, Lq0/a/a/q;->q(IILq0/a/a/p;[Lq0/a/a/p;)V
 
     :goto_1
     if-ge v3, v1, :cond_1
@@ -1285,13 +1285,13 @@
 
     move-result-object v6
 
-    invoke-static {v6}, Lp0/a/a/w;->j(Ljava/lang/Class;)Lp0/a/a/w;
+    invoke-static {v6}, Lq0/a/a/w;->j(Ljava/lang/Class;)Lq0/a/a/w;
 
     move-result-object v12
 
     aget-object v6, v2, v3
 
-    invoke-virtual {p0, v6}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {p0, v6}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v7, 0x3
 
@@ -1305,23 +1305,23 @@
 
     move-object v6, p0
 
-    invoke-virtual/range {v6 .. v11}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v6 .. v11}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/16 v6, 0x19
 
     const/4 v7, 0x1
 
-    invoke-virtual {p0, v6, v7}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v6, v7}, Lq0/a/a/q;->t(II)V
 
     const/16 v7, 0xc0
 
-    invoke-virtual {p0, v7, p1}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, p1}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/4 v8, 0x3
 
-    invoke-virtual {p0, v6, v8}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v6, v8}, Lq0/a/a/q;->t(II)V
 
-    invoke-virtual {v12}, Lp0/a/a/w;->i()I
+    invoke-virtual {v12}, Lq0/a/a/w;->i()I
 
     move-result v6
 
@@ -1332,124 +1332,124 @@
     goto/16 :goto_2
 
     :pswitch_0
-    invoke-virtual {v12}, Lp0/a/a/w;->g()Ljava/lang/String;
+    invoke-virtual {v12}, Lq0/a/a/w;->g()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     goto/16 :goto_2
 
     :pswitch_1
-    invoke-virtual {v12}, Lp0/a/a/w;->d()Ljava/lang/String;
+    invoke-virtual {v12}, Lq0/a/a/w;->d()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_2
     const-string v6, "java/lang/Double"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "doubleValue"
 
     const-string v9, "()D"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_3
     const-string v6, "java/lang/Long"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "longValue"
 
     const-string v9, "()J"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_4
     const-string v6, "java/lang/Float"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "floatValue"
 
     const-string v9, "()F"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_5
     const-string v6, "java/lang/Integer"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "intValue"
 
     const-string v9, "()I"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_6
     const-string v6, "java/lang/Short"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "shortValue"
 
     const-string v9, "()S"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_7
     const-string v6, "java/lang/Byte"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "byteValue"
 
     const-string v9, "()B"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_8
     const-string v6, "java/lang/Character"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "charValue"
 
     const-string v9, "()C"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_2
 
     :pswitch_9
     const-string v6, "java/lang/Boolean"
 
-    invoke-virtual {p0, v7, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v7, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v7, "booleanValue"
 
     const-string v9, "()Z"
 
-    invoke-virtual {p0, v8, v6, v7, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v8, v6, v7, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_2
     const/16 v6, 0xb5
@@ -1458,22 +1458,22 @@
 
     move-result-object v5
 
-    invoke-virtual {v12}, Lp0/a/a/w;->d()Ljava/lang/String;
+    invoke-virtual {v12}, Lq0/a/a/w;->d()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {p0, v6, p1, v5, v7}, Lp0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v6, p1, v5, v7}, Lq0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v5, 0xb1
 
-    invoke-virtual {p0, v5}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v5}, Lq0/a/a/q;->e(I)V
 
     add-int/lit8 v3, v3, 0x1
 
     goto/16 :goto_1
 
     :cond_1
-    invoke-virtual {p0, v4}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {p0, v4}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v7, 0x3
 
@@ -1487,7 +1487,7 @@
 
     move-object v6, p0
 
-    invoke-virtual/range {v6 .. v11}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v6 .. v11}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     goto :goto_3
 
@@ -1495,11 +1495,11 @@
     const/4 v0, 0x6
 
     :goto_3
-    invoke-static {p0}, Lf/f/b/c;->r(Lp0/a/a/q;)Lp0/a/a/q;
+    invoke-static {p0}, Lf/f/b/c;->r(Lq0/a/a/q;)Lq0/a/a/q;
 
     const/4 p1, 0x4
 
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/q;->n(II)V
 
     return-void
 
@@ -1520,17 +1520,17 @@
     .end packed-switch
 .end method
 
-.method public static q(Lp0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lp0/a/a/w;)V
+.method public static q(Lq0/a/a/f;Ljava/lang/String;Ljava/util/ArrayList;Lq0/a/a/w;)V
     .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lp0/a/a/f;",
+            "Lq0/a/a/f;",
             "Ljava/lang/String;",
             "Ljava/util/ArrayList<",
             "Ljava/lang/reflect/Field;",
             ">;",
-            "Lp0/a/a/w;",
+            "Lq0/a/a/w;",
             ")V"
         }
     .end annotation
@@ -1539,11 +1539,11 @@
 
     move-object/from16 v1, p2
 
-    invoke-virtual/range {p3 .. p3}, Lp0/a/a/w;->d()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lq0/a/a/w;->d()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lp0/a/a/w;->i()I
+    invoke-virtual/range {p3 .. p3}, Lq0/a/a/w;->i()I
 
     move-result v3
 
@@ -1643,13 +1643,13 @@
 
     move-object/from16 v5, p0
 
-    invoke-virtual/range {v5 .. v10}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v5 .. v10}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object v5
 
     const/4 v6, 0x2
 
-    invoke-virtual {v5, v4, v6}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v5, v4, v6}, Lq0/a/a/q;->t(II)V
 
     invoke-virtual/range {p2 .. p2}, Ljava/util/ArrayList;->isEmpty()Z
 
@@ -1661,11 +1661,11 @@
 
     move-result v4
 
-    new-array v6, v4, [Lp0/a/a/p;
+    new-array v6, v4, [Lq0/a/a/p;
 
-    new-instance v7, Lp0/a/a/p;
+    new-instance v7, Lq0/a/a/p;
 
-    invoke-direct {v7}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v7}, Lq0/a/a/p;-><init>()V
 
     const/4 v8, 0x0
 
@@ -1686,21 +1686,21 @@
 
     move-result-object v12
 
-    invoke-static {v12}, Lp0/a/a/w;->j(Ljava/lang/Class;)Lp0/a/a/w;
+    invoke-static {v12}, Lq0/a/a/w;->j(Ljava/lang/Class;)Lq0/a/a/w;
 
     move-result-object v12
 
     move-object/from16 v15, p3
 
-    invoke-virtual {v12, v15}, Lp0/a/a/w;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v12, v15}, Lq0/a/a/w;->equals(Ljava/lang/Object;)Z
 
     move-result v12
 
     if-eqz v12, :cond_0
 
-    new-instance v12, Lp0/a/a/p;
+    new-instance v12, Lq0/a/a/p;
 
-    invoke-direct {v12}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v12}, Lq0/a/a/p;-><init>()V
 
     aput-object v12, v6, v9
 
@@ -1719,13 +1719,13 @@
     :cond_1
     move-object/from16 v15, p3
 
-    new-instance v9, Lp0/a/a/p;
+    new-instance v9, Lq0/a/a/p;
 
-    invoke-direct {v9}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v9}, Lq0/a/a/p;-><init>()V
 
     add-int/lit8 v12, v4, -0x1
 
-    invoke-virtual {v5, v8, v12, v9, v6}, Lp0/a/a/q;->q(IILp0/a/a/p;[Lp0/a/a/p;)V
+    invoke-virtual {v5, v8, v12, v9, v6}, Lq0/a/a/q;->q(IILq0/a/a/p;[Lq0/a/a/p;)V
 
     :goto_6
     if-ge v8, v4, :cond_3
@@ -1740,7 +1740,7 @@
 
     aget-object v12, v6, v8
 
-    invoke-virtual {v5, v12}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v5, v12}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v13, 0x3
 
@@ -1762,21 +1762,21 @@
 
     move-object/from16 v17, v18
 
-    invoke-virtual/range {v12 .. v17}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v12 .. v17}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/16 v12, 0x19
 
     const/4 v13, 0x1
 
-    invoke-virtual {v5, v12, v13}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v5, v12, v13}, Lq0/a/a/q;->t(II)V
 
     const/16 v12, 0xc0
 
-    invoke-virtual {v5, v12, v0}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v5, v12, v0}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/4 v12, 0x3
 
-    invoke-virtual {v5, v3, v12}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v5, v3, v12}, Lq0/a/a/q;->t(II)V
 
     const/16 v12, 0xb5
 
@@ -1790,11 +1790,11 @@
 
     move-result-object v13
 
-    invoke-virtual {v5, v12, v0, v13, v2}, Lp0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v5, v12, v0, v13, v2}, Lq0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v12, 0xb1
 
-    invoke-virtual {v5, v12}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v5, v12}, Lq0/a/a/q;->e(I)V
 
     :cond_2
     add-int/lit8 v8, v8, 0x1
@@ -1806,7 +1806,7 @@
     :cond_3
     if-eqz v10, :cond_4
 
-    invoke-virtual {v5, v7}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v5, v7}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v13, 0x3
 
@@ -1820,16 +1820,16 @@
 
     move-object v12, v5
 
-    invoke-virtual/range {v12 .. v17}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v12 .. v17}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
-    invoke-virtual/range {p3 .. p3}, Lp0/a/a/w;->c()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lq0/a/a/w;->c()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-static {v5, v0}, Lf/f/b/c;->s(Lp0/a/a/q;Ljava/lang/String;)Lp0/a/a/q;
+    invoke-static {v5, v0}, Lf/f/b/c;->s(Lq0/a/a/q;Ljava/lang/String;)Lq0/a/a/q;
 
     :cond_4
-    invoke-virtual {v5, v9}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v5, v9}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v13, 0x3
 
@@ -1843,7 +1843,7 @@
 
     move-object v12, v5
 
-    invoke-virtual/range {v12 .. v17}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v12 .. v17}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     const/4 v0, 0x5
 
@@ -1853,9 +1853,9 @@
     const/4 v0, 0x6
 
     :goto_7
-    invoke-static {v5}, Lf/f/b/c;->r(Lp0/a/a/q;)Lp0/a/a/q;
+    invoke-static {v5}, Lf/f/b/c;->r(Lq0/a/a/q;)Lq0/a/a/q;
 
-    invoke-virtual {v5, v0, v11}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {v5, v0, v11}, Lq0/a/a/q;->n(II)V
 
     return-void
 
@@ -1874,28 +1874,28 @@
     .end packed-switch
 .end method
 
-.method public static r(Lp0/a/a/q;)Lp0/a/a/q;
+.method public static r(Lq0/a/a/q;)Lq0/a/a/q;
     .locals 8
 
     const/16 v0, 0xbb
 
     const-string v1, "java/lang/IllegalArgumentException"
 
-    invoke-virtual {p0, v0, v1}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v0, v1}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v2, 0x59
 
-    invoke-virtual {p0, v2}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v2}, Lq0/a/a/q;->e(I)V
 
     const-string v3, "java/lang/StringBuilder"
 
-    invoke-virtual {p0, v0, v3}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v0, v3}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
-    invoke-virtual {p0, v2}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v2}, Lq0/a/a/q;->e(I)V
 
     const-string v0, "Field not found: "
 
-    invoke-virtual {p0, v0}, Lp0/a/a/q;->j(Ljava/lang/Object;)V
+    invoke-virtual {p0, v0}, Lq0/a/a/q;->j(Ljava/lang/Object;)V
 
     const/16 v0, 0xb7
 
@@ -1903,13 +1903,13 @@
 
     const-string v4, "(Ljava/lang/String;)V"
 
-    invoke-virtual {p0, v0, v3, v2, v4}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v0, v3, v2, v4}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v5, 0x15
 
     const/4 v6, 0x2
 
-    invoke-virtual {p0, v5, v6}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v5, v6}, Lq0/a/a/q;->t(II)V
 
     const/16 v5, 0xb6
 
@@ -1917,41 +1917,41 @@
 
     const-string v7, "(I)Ljava/lang/StringBuilder;"
 
-    invoke-virtual {p0, v5, v3, v6, v7}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v5, v3, v6, v7}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v6, "toString"
 
     const-string v7, "()Ljava/lang/String;"
 
-    invoke-virtual {p0, v5, v3, v6, v7}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v5, v3, v6, v7}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0, v0, v1, v2, v4}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v0, v1, v2, v4}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v0, 0xbf
 
-    invoke-virtual {p0, v0}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v0}, Lq0/a/a/q;->e(I)V
 
     return-object p0
 .end method
 
-.method public static s(Lp0/a/a/q;Ljava/lang/String;)Lp0/a/a/q;
+.method public static s(Lq0/a/a/q;Ljava/lang/String;)Lq0/a/a/q;
     .locals 7
 
     const/16 v0, 0xbb
 
     const-string v1, "java/lang/IllegalArgumentException"
 
-    invoke-virtual {p0, v0, v1}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v0, v1}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v2, 0x59
 
-    invoke-virtual {p0, v2}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v2}, Lq0/a/a/q;->e(I)V
 
     const-string v3, "java/lang/StringBuilder"
 
-    invoke-virtual {p0, v0, v3}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {p0, v0, v3}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
-    invoke-virtual {p0, v2}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, v2}, Lq0/a/a/q;->e(I)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1971,7 +1971,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0, p1}, Lp0/a/a/q;->j(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lq0/a/a/q;->j(Ljava/lang/Object;)V
 
     const/16 p1, 0xb7
 
@@ -1979,13 +1979,13 @@
 
     const-string v2, "(Ljava/lang/String;)V"
 
-    invoke-virtual {p0, p1, v3, v0, v2}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, p1, v3, v0, v2}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v4, 0x15
 
     const/4 v5, 0x2
 
-    invoke-virtual {p0, v4, v5}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {p0, v4, v5}, Lq0/a/a/q;->t(II)V
 
     const/16 v4, 0xb6
 
@@ -1993,19 +1993,19 @@
 
     const-string v6, "(I)Ljava/lang/StringBuilder;"
 
-    invoke-virtual {p0, v4, v3, v5, v6}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v4, v3, v5, v6}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v5, "toString"
 
     const-string v6, "()Ljava/lang/String;"
 
-    invoke-virtual {p0, v4, v3, v5, v6}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v4, v3, v5, v6}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0, p1, v1, v0, v2}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, p1, v1, v0, v2}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 p1, 0xbf
 
-    invoke-virtual {p0, p1}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {p0, p1}, Lq0/a/a/q;->e(I)V
 
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/f/f/b/d.smali b/com.discord/smali_classes2/f/f/b/d.smali
index 9a1ece2f4e..99128e2d29 100644
--- a/com.discord/smali_classes2/f/f/b/d.smali
+++ b/com.discord/smali_classes2/f/f/b/d.smali
@@ -226,11 +226,11 @@
 
     move-result-object v8
 
-    new-instance v10, Lp0/a/a/f;
+    new-instance v10, Lq0/a/a/f;
 
     const/4 v11, 0x1
 
-    invoke-direct {v10, v11}, Lp0/a/a/f;-><init>(I)V
+    invoke-direct {v10, v11}, Lq0/a/a/f;-><init>(I)V
 
     const v13, 0x3002d
 
@@ -244,7 +244,7 @@
 
     move-object v12, v10
 
-    invoke-virtual/range {v12 .. v18}, Lp0/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+    invoke-virtual/range {v12 .. v18}, Lq0/a/a/f;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
 
     const/16 v17, 0x1
 
@@ -258,13 +258,13 @@
 
     move-object/from16 v16, v10
 
-    invoke-virtual/range {v16 .. v21}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v16 .. v21}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object v11
 
     const/16 v12, 0x19
 
-    invoke-virtual {v11, v12, v7}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v11, v12, v7}, Lq0/a/a/q;->t(II)V
 
     const-string v12, "com/esotericsoftware/reflectasm/MethodAccess"
 
@@ -274,13 +274,13 @@
 
     const/16 v15, 0xb7
 
-    invoke-virtual {v11, v15, v12, v13, v14}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v11, v15, v12, v13, v14}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v12, 0xb1
 
-    invoke-virtual {v11, v12}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v11, v12}, Lq0/a/a/q;->e(I)V
 
-    invoke-virtual {v11, v7, v7}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {v11, v7, v7}, Lq0/a/a/q;->n(II)V
 
     const/16 v17, 0x81
 
@@ -294,7 +294,7 @@
 
     move-object/from16 v16, v10
 
-    invoke-virtual/range {v16 .. v21}, Lp0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
+    invoke-virtual/range {v16 .. v21}, Lq0/a/a/f;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
 
     move-result-object v15
 
@@ -312,30 +312,30 @@
 
     const/4 v14, 0x1
 
-    invoke-virtual {v15, v11, v14}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v15, v11, v14}, Lq0/a/a/q;->t(II)V
 
     const/16 v11, 0xc0
 
-    invoke-virtual {v15, v11, v8}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v11, v8}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v11, 0x3a
 
     const/4 v14, 0x4
 
-    invoke-virtual {v15, v11, v14}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v15, v11, v14}, Lq0/a/a/q;->t(II)V
 
-    invoke-virtual {v15, v13, v12}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v15, v13, v12}, Lq0/a/a/q;->t(II)V
 
-    new-array v14, v3, [Lp0/a/a/p;
+    new-array v14, v3, [Lq0/a/a/p;
 
     const/4 v11, 0x0
 
     :goto_3
     if-ge v11, v3, :cond_4
 
-    new-instance v12, Lp0/a/a/p;
+    new-instance v12, Lq0/a/a/p;
 
-    invoke-direct {v12}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v12}, Lq0/a/a/p;-><init>()V
 
     aput-object v12, v14, v11
 
@@ -344,13 +344,13 @@
     goto :goto_3
 
     :cond_4
-    new-instance v13, Lp0/a/a/p;
+    new-instance v13, Lq0/a/a/p;
 
-    invoke-direct {v13}, Lp0/a/a/p;-><init>()V
+    invoke-direct {v13}, Lq0/a/a/p;-><init>()V
 
     add-int/lit8 v11, v3, -0x1
 
-    invoke-virtual {v15, v7, v11, v13, v14}, Lp0/a/a/q;->q(IILp0/a/a/p;[Lp0/a/a/p;)V
+    invoke-virtual {v15, v7, v11, v13, v14}, Lq0/a/a/q;->q(IILq0/a/a/p;[Lq0/a/a/p;)V
 
     new-instance v7, Ljava/lang/StringBuilder;
 
@@ -367,7 +367,7 @@
 
     aget-object v11, v14, v12
 
-    invoke-virtual {v15, v11}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v15, v11}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     if-nez v12, :cond_5
 
@@ -409,7 +409,7 @@
 
     move-object/from16 v16, v19
 
-    invoke-virtual/range {v11 .. v16}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v11 .. v16}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     goto :goto_5
 
@@ -434,7 +434,7 @@
 
     move-object/from16 v11, p0
 
-    invoke-virtual/range {v11 .. v16}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v11 .. v16}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     :goto_5
     const/4 v11, 0x4
@@ -443,7 +443,7 @@
 
     move-object/from16 v15, p0
 
-    invoke-virtual {v15, v12, v11}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v15, v12, v11}, Lq0/a/a/q;->t(II)V
 
     const/4 v11, 0x0
 
@@ -474,23 +474,23 @@
 
     const/16 v6, 0x19
 
-    invoke-virtual {v15, v6, v3}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v15, v6, v3}, Lq0/a/a/q;->t(II)V
 
     const/16 v3, 0x10
 
-    invoke-virtual {v15, v3, v14}, Lp0/a/a/q;->g(II)V
+    invoke-virtual {v15, v3, v14}, Lq0/a/a/q;->g(II)V
 
     const/16 v3, 0x32
 
-    invoke-virtual {v15, v3}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v15, v3}, Lq0/a/a/q;->e(I)V
 
     aget-object v3, v12, v14
 
-    invoke-static {v3}, Lp0/a/a/w;->j(Ljava/lang/Class;)Lp0/a/a/w;
+    invoke-static {v3}, Lq0/a/a/w;->j(Ljava/lang/Class;)Lq0/a/a/w;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lp0/a/a/w;->i()I
+    invoke-virtual {v3}, Lq0/a/a/w;->i()I
 
     move-result v6
 
@@ -505,7 +505,7 @@
     goto/16 :goto_8
 
     :pswitch_0
-    invoke-virtual {v3}, Lp0/a/a/w;->g()Ljava/lang/String;
+    invoke-virtual {v3}, Lq0/a/a/w;->g()Ljava/lang/String;
 
     move-result-object v6
 
@@ -513,7 +513,7 @@
 
     const/16 v12, 0xc0
 
-    invoke-virtual {v15, v12, v6}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v12, v6}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     goto :goto_7
 
@@ -522,11 +522,11 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v3}, Lp0/a/a/w;->d()Ljava/lang/String;
+    invoke-virtual {v3}, Lq0/a/a/w;->d()Ljava/lang/String;
 
     move-result-object v12
 
-    invoke-virtual {v15, v6, v12}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v12}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     :goto_7
     move-object/from16 v19, v5
@@ -542,7 +542,7 @@
 
     const-string v12, "java/lang/Double"
 
-    invoke-virtual {v15, v6, v12}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v12}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v6, "java/lang/Double"
 
@@ -556,7 +556,7 @@
 
     const/16 v9, 0xb6
 
-    invoke-virtual {v15, v9, v6, v12, v5}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v9, v6, v12, v5}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -571,7 +571,7 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v15, v6, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v5, "java/lang/Long"
 
@@ -581,7 +581,7 @@
 
     const/16 v12, 0xb6
 
-    invoke-virtual {v15, v12, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v12, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -596,7 +596,7 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v15, v6, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v5, "java/lang/Float"
 
@@ -606,7 +606,7 @@
 
     const/16 v12, 0xb6
 
-    invoke-virtual {v15, v12, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v12, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -621,7 +621,7 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v15, v6, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v5, "java/lang/Integer"
 
@@ -631,7 +631,7 @@
 
     const/16 v12, 0xb6
 
-    invoke-virtual {v15, v12, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v12, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -646,7 +646,7 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v15, v6, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v5, "java/lang/Short"
 
@@ -656,7 +656,7 @@
 
     const/16 v12, 0xb6
 
-    invoke-virtual {v15, v12, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v12, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -671,7 +671,7 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v15, v6, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v5, "java/lang/Byte"
 
@@ -681,7 +681,7 @@
 
     const/16 v12, 0xb6
 
-    invoke-virtual {v15, v12, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v12, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -696,7 +696,7 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v15, v6, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v5, "java/lang/Character"
 
@@ -706,7 +706,7 @@
 
     const/16 v12, 0xb6
 
-    invoke-virtual {v15, v12, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v12, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_8
 
@@ -721,7 +721,7 @@
 
     const/16 v6, 0xc0
 
-    invoke-virtual {v15, v6, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v15, v6, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const-string v5, "java/lang/Boolean"
 
@@ -731,10 +731,10 @@
 
     const/16 v12, 0xb6
 
-    invoke-virtual {v15, v12, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v12, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_8
-    invoke-virtual {v3}, Lp0/a/a/w;->d()Ljava/lang/String;
+    invoke-virtual {v3}, Lq0/a/a/w;->d()Ljava/lang/String;
 
     move-result-object v3
 
@@ -763,7 +763,7 @@
 
     invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-static {v13}, Lp0/a/a/w;->e(Ljava/lang/Class;)Ljava/lang/String;
+    invoke-static {v13}, Lq0/a/a/w;->e(Ljava/lang/Class;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -808,13 +808,13 @@
 
     move-result-object v9
 
-    invoke-virtual {v15, v5, v8, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v5, v8, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {v13}, Lp0/a/a/w;->j(Ljava/lang/Class;)Lp0/a/a/w;
+    invoke-static {v13}, Lq0/a/a/w;->j(Ljava/lang/Class;)Lq0/a/a/w;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lp0/a/a/w;->i()I
+    invoke-virtual {v5}, Lq0/a/a/w;->i()I
 
     move-result v5
 
@@ -829,7 +829,7 @@
 
     const-string v9, "(D)Ljava/lang/Double;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -840,7 +840,7 @@
 
     const-string v9, "(J)Ljava/lang/Long;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -851,7 +851,7 @@
 
     const-string v9, "(F)Ljava/lang/Float;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -862,7 +862,7 @@
 
     const-string v9, "(I)Ljava/lang/Integer;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -873,7 +873,7 @@
 
     const-string v9, "(S)Ljava/lang/Short;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -884,7 +884,7 @@
 
     const-string v9, "(B)Ljava/lang/Byte;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -895,7 +895,7 @@
 
     const-string v9, "(C)Ljava/lang/Character;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
@@ -906,19 +906,19 @@
 
     const-string v9, "(Z)Ljava/lang/Boolean;"
 
-    invoke-virtual {v15, v3, v5, v6, v9}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v15, v3, v5, v6, v9}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_a
 
     :pswitch_12
     const/4 v3, 0x1
 
-    invoke-virtual {v15, v3}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v15, v3}, Lq0/a/a/q;->e(I)V
 
     :goto_a
     const/16 v3, 0xb0
 
-    invoke-virtual {v15, v3}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v15, v3}, Lq0/a/a/q;->e(I)V
 
     add-int/lit8 v12, v11, 0x1
 
@@ -943,7 +943,7 @@
 
     move-object v0, v13
 
-    invoke-virtual {v15, v0}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
+    invoke-virtual {v15, v0}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
 
     const/4 v12, 0x3
 
@@ -961,7 +961,7 @@
 
     move v15, v0
 
-    invoke-virtual/range {v11 .. v16}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    invoke-virtual/range {v11 .. v16}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
     goto :goto_b
 
@@ -977,21 +977,21 @@
 
     const/16 v3, 0xbb
 
-    invoke-virtual {v1, v3, v0}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v1, v3, v0}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
     const/16 v0, 0x59
 
-    invoke-virtual {v1, v0}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v1, v0}, Lq0/a/a/q;->e(I)V
 
     const-string v5, "java/lang/StringBuilder"
 
-    invoke-virtual {v1, v3, v5}, Lp0/a/a/q;->s(ILjava/lang/String;)V
+    invoke-virtual {v1, v3, v5}, Lq0/a/a/q;->s(ILjava/lang/String;)V
 
-    invoke-virtual {v1, v0}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v1, v0}, Lq0/a/a/q;->e(I)V
 
     const-string v0, "Method not found: "
 
-    invoke-virtual {v1, v0}, Lp0/a/a/q;->j(Ljava/lang/Object;)V
+    invoke-virtual {v1, v0}, Lq0/a/a/q;->j(Ljava/lang/Object;)V
 
     const-string v0, "java/lang/StringBuilder"
 
@@ -1001,13 +1001,13 @@
 
     const/16 v6, 0xb7
 
-    invoke-virtual {v1, v6, v0, v3, v5}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v1, v6, v0, v3, v5}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
     const/16 v3, 0x15
 
-    invoke-virtual {v1, v3, v0}, Lp0/a/a/q;->t(II)V
+    invoke-virtual {v1, v3, v0}, Lq0/a/a/q;->t(II)V
 
     const-string v0, "java/lang/StringBuilder"
 
@@ -1017,7 +1017,7 @@
 
     const/16 v6, 0xb6
 
-    invoke-virtual {v1, v6, v0, v3, v5}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v1, v6, v0, v3, v5}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v0, "java/lang/StringBuilder"
 
@@ -1025,7 +1025,7 @@
 
     const-string v5, "()Ljava/lang/String;"
 
-    invoke-virtual {v1, v6, v0, v3, v5}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v1, v6, v0, v3, v5}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v0, "java/lang/IllegalArgumentException"
 
@@ -1035,17 +1035,17 @@
 
     const/16 v6, 0xb7
 
-    invoke-virtual {v1, v6, v0, v3, v5}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v1, v6, v0, v3, v5}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v0, 0xbf
 
-    invoke-virtual {v1, v0}, Lp0/a/a/q;->e(I)V
+    invoke-virtual {v1, v0}, Lq0/a/a/q;->e(I)V
 
     const/4 v0, 0x0
 
-    invoke-virtual {v1, v0, v0}, Lp0/a/a/q;->n(II)V
+    invoke-virtual {v1, v0, v0}, Lq0/a/a/q;->n(II)V
 
-    invoke-virtual {v10}, Lp0/a/a/f;->f()[B
+    invoke-virtual {v10}, Lq0/a/a/f;->f()[B
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/g/b/b/a$f.smali b/com.discord/smali_classes2/f/g/b/b/a$f.smali
index 51da3d806d..38dc4533b8 100644
--- a/com.discord/smali_classes2/f/g/b/b/a$f.smali
+++ b/com.discord/smali_classes2/f/g/b/b/a$f.smali
@@ -97,7 +97,7 @@
     :try_start_0
     iget-object v1, p0, Lf/g/b/b/a$f;->b:Ljava/io/File;
 
-    invoke-static {v1, p1}, Ld0/a/b/b/a;->M0(Ljava/io/File;Ljava/io/File;)V
+    invoke-static {v1, p1}, Le0/a/b/b/a;->M0(Ljava/io/File;Ljava/io/File;)V
     :try_end_0
     .catch Lcom/facebook/common/file/FileUtils$RenameException; {:try_start_0 .. :try_end_0} :catch_0
 
diff --git a/com.discord/smali_classes2/f/g/b/b/a$g.smali b/com.discord/smali_classes2/f/g/b/b/a$g.smali
index fabf831525..e6df3b8b72 100644
--- a/com.discord/smali_classes2/f/g/b/b/a$g.smali
+++ b/com.discord/smali_classes2/f/g/b/b/a$g.smali
@@ -103,7 +103,7 @@
     const/4 v1, 0x1
 
     :cond_3
-    invoke-static {v1}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->m(Z)V
 
     :goto_0
     const/4 v1, 0x1
diff --git a/com.discord/smali_classes2/f/g/b/b/a.smali b/com.discord/smali_classes2/f/g/b/b/a.smali
index 120a929941..ddf5560849 100644
--- a/com.discord/smali_classes2/f/g/b/b/a.smali
+++ b/com.discord/smali_classes2/f/g/b/b/a.smali
@@ -197,7 +197,7 @@
 
     iget-object p1, p0, Lf/g/b/b/a;->a:Ljava/io/File;
 
-    invoke-static {p1}, Ld0/a/b/b/a;->y(Ljava/io/File;)Z
+    invoke-static {p1}, Le0/a/b/b/a;->y(Ljava/io/File;)Z
 
     :goto_2
     const/4 v0, 0x1
@@ -208,7 +208,7 @@
     :try_start_3
     iget-object p1, p0, Lf/g/b/b/a;->c:Ljava/io/File;
 
-    invoke-static {p1}, Ld0/a/b/b/a;->q0(Ljava/io/File;)V
+    invoke-static {p1}, Le0/a/b/b/a;->q0(Ljava/io/File;)V
     :try_end_3
     .catch Lcom/facebook/common/file/FileUtils$CreateDirectoryException; {:try_start_3 .. :try_end_3} :catch_2
 
@@ -402,7 +402,7 @@
 
     invoke-direct {v1, p0, v2}, Lf/g/b/b/a$g;-><init>(Lf/g/b/b/a;Lf/g/b/b/a$a;)V
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->c1(Ljava/io/File;Lf/g/d/c/a;)V
+    invoke-static {v0, v1}, Le0/a/b/b/a;->c1(Ljava/io/File;Lf/g/d/c/a;)V
 
     return-void
 .end method
@@ -434,7 +434,7 @@
     if-nez v1, :cond_1
 
     :try_start_0
-    invoke-static {v0}, Ld0/a/b/b/a;->q0(Ljava/io/File;)V
+    invoke-static {v0}, Le0/a/b/b/a;->q0(Ljava/io/File;)V
     :try_end_0
     .catch Lcom/facebook/common/file/FileUtils$CreateDirectoryException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -554,7 +554,7 @@
 
     iget-object v1, p0, Lf/g/b/b/a;->c:Ljava/io/File;
 
-    invoke-static {v1, v0}, Ld0/a/b/b/a;->c1(Ljava/io/File;Lf/g/d/c/a;)V
+    invoke-static {v1, v0}, Le0/a/b/b/a;->c1(Ljava/io/File;Lf/g/d/c/a;)V
 
     iget-object v0, v0, Lf/g/b/b/a$b;->a:Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/f/g/b/b/e.smali b/com.discord/smali_classes2/f/g/b/b/e.smali
index 0da047d35b..e5022f524f 100644
--- a/com.discord/smali_classes2/f/g/b/b/e.smali
+++ b/com.discord/smali_classes2/f/g/b/b/e.smali
@@ -353,7 +353,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-static {p1}, Ld0/a/b/b/a;->U(Lcom/facebook/cache/common/CacheKey;)Ljava/util/List;
+    invoke-static {p1}, Le0/a/b/b/a;->U(Lcom/facebook/cache/common/CacheKey;)Ljava/util/List;
 
     move-result-object v3
     :try_end_1
@@ -632,7 +632,7 @@
 
     :cond_0
     :try_start_2
-    invoke-static {p1}, Ld0/a/b/b/a;->O0(Lcom/facebook/cache/common/CacheKey;)Ljava/lang/String;
+    invoke-static {p1}, Le0/a/b/b/a;->O0(Lcom/facebook/cache/common/CacheKey;)Ljava/lang/String;
 
     move-result-object v3
     :try_end_2
@@ -1162,7 +1162,7 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-static {p1}, Ld0/a/b/b/a;->U(Lcom/facebook/cache/common/CacheKey;)Ljava/util/List;
+    invoke-static {p1}, Le0/a/b/b/a;->U(Lcom/facebook/cache/common/CacheKey;)Ljava/util/List;
 
     move-result-object p1
     :try_end_0
diff --git a/com.discord/smali_classes2/f/g/b/b/f.smali b/com.discord/smali_classes2/f/g/b/b/f.smali
index 7fe4a10d97..1e5b50a359 100644
--- a/com.discord/smali_classes2/f/g/b/b/f.smali
+++ b/com.discord/smali_classes2/f/g/b/b/f.smali
@@ -247,7 +247,7 @@
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
     :try_start_0
-    invoke-static {v0}, Ld0/a/b/b/a;->q0(Ljava/io/File;)V
+    invoke-static {v0}, Le0/a/b/b/a;->q0(Ljava/io/File;)V
     :try_end_0
     .catch Lcom/facebook/common/file/FileUtils$CreateDirectoryException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -384,7 +384,7 @@
 
     iget-object v0, v0, Lf/g/b/b/f$a;->b:Ljava/io/File;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->y(Ljava/io/File;)Z
+    invoke-static {v0}, Le0/a/b/b/a;->y(Ljava/io/File;)Z
 
     :cond_2
     invoke-virtual {p0}, Lf/g/b/b/f;->g()V
@@ -394,7 +394,7 @@
 
     iget-object v0, v0, Lf/g/b/b/f$a;->a:Lf/g/b/b/c;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     check-cast v0, Lf/g/b/b/c;
     :try_end_0
diff --git a/com.discord/smali_classes2/f/g/d/g/f.smali b/com.discord/smali_classes2/f/g/d/g/f.smali
index ff50c1bddd..153f96e5fc 100644
--- a/com.discord/smali_classes2/f/g/d/g/f.smali
+++ b/com.discord/smali_classes2/f/g/d/g/f.smali
@@ -138,7 +138,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-virtual {p0}, Lf/g/d/g/f;->b()V
 
@@ -276,7 +276,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-virtual {p0}, Lf/g/d/g/f;->b()V
 
@@ -328,7 +328,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-virtual {p0}, Lf/g/d/g/f;->b()V
 
@@ -390,7 +390,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-virtual {p0}, Lf/g/d/g/f;->b()V
 
diff --git a/com.discord/smali_classes2/f/g/d/g/h.smali b/com.discord/smali_classes2/f/g/d/g/h.smali
index 7856952ab1..709a05ff4a 100644
--- a/com.discord/smali_classes2/f/g/d/g/h.smali
+++ b/com.discord/smali_classes2/f/g/d/g/h.smali
@@ -23,7 +23,7 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iput-object p1, p0, Lf/g/d/g/h;->d:Lcom/facebook/common/memory/PooledByteBuffer;
 
@@ -227,7 +227,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     long-to-int p2, p1
 
diff --git a/com.discord/smali_classes2/f/g/d/g/i.smali b/com.discord/smali_classes2/f/g/d/g/i.smali
index 7fc000777a..8f5af78021 100644
--- a/com.discord/smali_classes2/f/g/d/g/i.smali
+++ b/com.discord/smali_classes2/f/g/d/g/i.smali
@@ -27,7 +27,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {v0}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     new-instance v1, Ljava/lang/RuntimeException;
 
diff --git a/com.discord/smali_classes2/f/g/d/g/j.smali b/com.discord/smali_classes2/f/g/d/g/j.smali
index cf0a198ad7..1855a6b67a 100644
--- a/com.discord/smali_classes2/f/g/d/g/j.smali
+++ b/com.discord/smali_classes2/f/g/d/g/j.smali
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x1
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     const/16 v0, 0x4000
 
diff --git a/com.discord/smali_classes2/f/g/d/i/a.smali b/com.discord/smali_classes2/f/g/d/i/a.smali
index 67255f2845..10ab453d8f 100644
--- a/com.discord/smali_classes2/f/g/d/i/a.smali
+++ b/com.discord/smali_classes2/f/g/d/i/a.smali
@@ -252,7 +252,7 @@
     goto :goto_2
 
     :goto_1
-    invoke-static {p1}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     new-instance p2, Ljava/lang/RuntimeException;
 
diff --git a/com.discord/smali_classes2/f/g/e/e.smali b/com.discord/smali_classes2/f/g/e/e.smali
index da3a228cb6..16c18c0dd1 100644
--- a/com.discord/smali_classes2/f/g/e/e.smali
+++ b/com.discord/smali_classes2/f/g/e/e.smali
@@ -39,7 +39,7 @@
 
     iget-object v0, p0, Lf/g/e/e;->a:Ljava/lang/Throwable;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
+    invoke-static {v0}, Le0/a/b/b/a;->h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/g/e/g.smali b/com.discord/smali_classes2/f/g/e/g.smali
index 823f2007d9..3a57b75aad 100644
--- a/com.discord/smali_classes2/f/g/e/g.smali
+++ b/com.discord/smali_classes2/f/g/e/g.smali
@@ -62,7 +62,7 @@
 
     const-string v1, "List of suppliers is empty!"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {v0, v1}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     iput-object p1, p0, Lf/g/e/g;->a:Ljava/util/List;
 
@@ -96,7 +96,7 @@
 
     iget-object p1, p1, Lf/g/e/g;->a:Ljava/util/List;
 
-    invoke-static {v0, p1}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -128,7 +128,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/g/e/h.smali b/com.discord/smali_classes2/f/g/e/h.smali
index 9a4d9043df..65ece5abe5 100644
--- a/com.discord/smali_classes2/f/g/e/h.smali
+++ b/com.discord/smali_classes2/f/g/e/h.smali
@@ -64,7 +64,7 @@
 
     const-string v1, "List of suppliers is empty!"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {v0, v1}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     iput-object p1, p0, Lf/g/e/h;->a:Ljava/util/List;
 
@@ -100,7 +100,7 @@
 
     iget-object p1, p1, Lf/g/e/h;->a:Ljava/util/List;
 
-    invoke-static {v0, p1}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -132,7 +132,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/g/g/a/a/c.smali b/com.discord/smali_classes2/f/g/g/a/a/c.smali
index 0cfadadd8e..a375d72528 100644
--- a/com.discord/smali_classes2/f/g/g/a/a/c.smali
+++ b/com.discord/smali_classes2/f/g/g/a/a/c.smali
@@ -167,7 +167,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->i()Ljava/lang/Object;
 
@@ -287,7 +287,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->i()Ljava/lang/Object;
 
@@ -316,7 +316,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
@@ -708,7 +708,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
+    invoke-static {v1}, Le0/a/b/b/a;->L(Landroid/graphics/drawable/Drawable;)Lf/g/g/e/p;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/f/g/g/b/a.smali b/com.discord/smali_classes2/f/g/g/b/a.smali
index 607945317e..c5030fde98 100644
--- a/com.discord/smali_classes2/f/g/g/b/a.smali
+++ b/com.discord/smali_classes2/f/g/g/b/a.smali
@@ -87,7 +87,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/g/g/c/a.smali b/com.discord/smali_classes2/f/g/g/c/a.smali
index 2dd32b2894..3f3fa3300b 100644
--- a/com.discord/smali_classes2/f/g/g/c/a.smali
+++ b/com.discord/smali_classes2/f/g/g/c/a.smali
@@ -203,7 +203,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/g/g/e/b.smali b/com.discord/smali_classes2/f/g/g/e/b.smali
index ec5456e478..9320e64257 100644
--- a/com.discord/smali_classes2/f/g/g/e/b.smali
+++ b/com.discord/smali_classes2/f/g/g/e/b.smali
@@ -65,7 +65,7 @@
 
     aget-object p1, p1, v0
 
-    invoke-static {p1, p0, p0}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {p1, p0, p0}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
     add-int/lit8 v0, v0, 0x1
 
@@ -105,7 +105,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v2, p0, Lf/g/g/e/b;->f:[Landroid/graphics/drawable/Drawable;
 
@@ -119,7 +119,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/g/e/b;->f:[Landroid/graphics/drawable/Drawable;
 
@@ -153,7 +153,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v2, p0, Lf/g/g/e/b;->f:[Landroid/graphics/drawable/Drawable;
 
@@ -167,7 +167,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/g/e/b;->f:[Landroid/graphics/drawable/Drawable;
 
@@ -190,17 +190,17 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v2, v3, v3}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {v2, v3, v3}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
-    invoke-static {p2, v3, v3}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {p2, v3, v3}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
     iget-object v2, p0, Lf/g/g/e/b;->e:Lf/g/g/e/e;
 
-    invoke-static {p2, v2}, Ld0/a/b/b/a;->R0(Landroid/graphics/drawable/Drawable;Lf/g/g/e/e;)V
+    invoke-static {p2, v2}, Le0/a/b/b/a;->R0(Landroid/graphics/drawable/Drawable;Lf/g/g/e/e;)V
 
-    invoke-static {p2, p0}, Ld0/a/b/b/a;->r(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+    invoke-static {p2, p0}, Le0/a/b/b/a;->r(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
-    invoke-static {p2, p0, p0}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {p2, p0, p0}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
     iput-boolean v1, p0, Lf/g/g/e/b;->j:Z
 
diff --git a/com.discord/smali_classes2/f/g/g/e/f.smali b/com.discord/smali_classes2/f/g/g/e/f.smali
index 0eadbf55bf..b4ea8d2311 100644
--- a/com.discord/smali_classes2/f/g/g/e/f.smali
+++ b/com.discord/smali_classes2/f/g/g/e/f.smali
@@ -51,7 +51,7 @@
     :goto_0
     const-string v3, "At least one layer required!"
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->n(ZLjava/lang/Object;)V
+    invoke-static {v0, v3}, Le0/a/b/b/a;->n(ZLjava/lang/Object;)V
 
     iput-object p1, p0, Lf/g/g/e/f;->l:[Landroid/graphics/drawable/Drawable;
 
@@ -150,7 +150,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
diff --git a/com.discord/smali_classes2/f/g/g/e/g.smali b/com.discord/smali_classes2/f/g/g/e/g.smali
index 71a3cc0135..d8c991aacf 100644
--- a/com.discord/smali_classes2/f/g/g/e/g.smali
+++ b/com.discord/smali_classes2/f/g/g/e/g.smali
@@ -47,7 +47,7 @@
 
     iput-object p1, p0, Lf/g/g/e/g;->d:Landroid/graphics/drawable/Drawable;
 
-    invoke-static {p1, p0, p0}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {p1, p0, p0}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
     return-void
 .end method
@@ -299,17 +299,17 @@
 
     const/4 v1, 0x0
 
-    invoke-static {v0, v1, v1}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {v0, v1, v1}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
-    invoke-static {p1, v1, v1}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {p1, v1, v1}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
     iget-object v1, p0, Lf/g/g/e/g;->e:Lf/g/g/e/e;
 
-    invoke-static {p1, v1}, Ld0/a/b/b/a;->R0(Landroid/graphics/drawable/Drawable;Lf/g/g/e/e;)V
+    invoke-static {p1, v1}, Le0/a/b/b/a;->R0(Landroid/graphics/drawable/Drawable;Lf/g/g/e/e;)V
 
-    invoke-static {p1, p0}, Ld0/a/b/b/a;->r(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+    invoke-static {p1, p0}, Le0/a/b/b/a;->r(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 
-    invoke-static {p1, p0, p0}, Ld0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
+    invoke-static {p1, p0, p0}, Le0/a/b/b/a;->P0(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable$Callback;Lf/g/g/e/c0;)V
 
     iput-object p1, p0, Lf/g/g/e/g;->d:Landroid/graphics/drawable/Drawable;
 
diff --git a/com.discord/smali_classes2/f/g/g/e/k.smali b/com.discord/smali_classes2/f/g/g/e/k.smali
index 2778dd68fa..c0ea1b7698 100644
--- a/com.discord/smali_classes2/f/g/g/e/k.smali
+++ b/com.discord/smali_classes2/f/g/g/e/k.smali
@@ -228,7 +228,7 @@
 
     move-result v3
 
-    invoke-static {v2, v3}, Ld0/a/b/b/a;->r0(II)I
+    invoke-static {v2, v3}, Le0/a/b/b/a;->r0(II)I
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/f/g/g/e/l.smali b/com.discord/smali_classes2/f/g/g/e/l.smali
index 5e8b5d707d..603ab0d2da 100644
--- a/com.discord/smali_classes2/f/g/g/e/l.smali
+++ b/com.discord/smali_classes2/f/g/g/e/l.smali
@@ -425,7 +425,7 @@
 
     iget v2, p0, Lf/g/g/e/l;->r:I
 
-    invoke-static {v1, v2}, Ld0/a/b/b/a;->r0(II)I
+    invoke-static {v1, v2}, Le0/a/b/b/a;->r0(II)I
 
     move-result v1
 
@@ -463,7 +463,7 @@
 
     iget v2, p0, Lf/g/g/e/l;->r:I
 
-    invoke-static {v1, v2}, Ld0/a/b/b/a;->r0(II)I
+    invoke-static {v1, v2}, Le0/a/b/b/a;->r0(II)I
 
     move-result v1
 
@@ -538,7 +538,7 @@
 
     iget v1, p0, Lf/g/g/e/l;->r:I
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->r0(II)I
+    invoke-static {v0, v1}, Le0/a/b/b/a;->r0(II)I
 
     move-result v0
 
@@ -604,7 +604,7 @@
     :goto_0
     const-string v1, "radius should be non negative"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {v0, v1}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     iget-object v0, p0, Lf/g/g/e/l;->d:[F
 
@@ -649,7 +649,7 @@
     :goto_0
     const-string v3, "radii should have exactly 8 values"
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {v0, v3}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     iget-object v0, p0, Lf/g/g/e/l;->d:[F
 
diff --git a/com.discord/smali_classes2/f/g/g/e/m.smali b/com.discord/smali_classes2/f/g/g/e/m.smali
index a96fbe0f6c..7b3e716102 100644
--- a/com.discord/smali_classes2/f/g/g/e/m.smali
+++ b/com.discord/smali_classes2/f/g/g/e/m.smali
@@ -557,7 +557,7 @@
     :goto_0
     const-string v3, "radii should have exactly 8 values"
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {v0, v3}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     iget-object v0, p0, Lf/g/g/e/m;->l:[F
 
diff --git a/com.discord/smali_classes2/f/g/g/e/n.smali b/com.discord/smali_classes2/f/g/g/e/n.smali
index 3233d8f775..9c05fdfb2f 100644
--- a/com.discord/smali_classes2/f/g/g/e/n.smali
+++ b/com.discord/smali_classes2/f/g/g/e/n.smali
@@ -1000,7 +1000,7 @@
     const/4 v3, 0x0
 
     :goto_0
-    invoke-static {v3}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v3}, Le0/a/b/b/a;->m(Z)V
 
     iget-object v3, p0, Lf/g/g/e/n;->l:[F
 
@@ -1056,7 +1056,7 @@
     :goto_0
     const-string v5, "radii should have exactly 8 values"
 
-    invoke-static {v3, v5}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {v3, v5}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     iget-object v3, p0, Lf/g/g/e/n;->l:[F
 
diff --git a/com.discord/smali_classes2/f/g/g/e/p.smali b/com.discord/smali_classes2/f/g/g/e/p.smali
index 0484f4a4dc..f8ec09a046 100644
--- a/com.discord/smali_classes2/f/g/g/e/p.smali
+++ b/com.discord/smali_classes2/f/g/g/e/p.smali
@@ -340,7 +340,7 @@
 
     iget-object v0, p0, Lf/g/g/e/p;->h:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    invoke-static {v0, p1}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/f/g/g/f/a.smali b/com.discord/smali_classes2/f/g/g/f/a.smali
index 6814936744..0928425fe2 100644
--- a/com.discord/smali_classes2/f/g/g/f/a.smali
+++ b/com.discord/smali_classes2/f/g/g/f/a.smali
@@ -150,7 +150,7 @@
 
     check-cast v1, Landroid/graphics/drawable/Drawable;
 
-    invoke-static {v1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/f/g/g/f/d.smali b/com.discord/smali_classes2/f/g/g/f/d.smali
index 7cb2a5d571..c7f41d3a32 100644
--- a/com.discord/smali_classes2/f/g/g/f/d.smali
+++ b/com.discord/smali_classes2/f/g/g/f/d.smali
@@ -295,7 +295,7 @@
 
     iget-object p0, v0, Lf/g/g/e/p;->j:Landroid/graphics/PointF;
 
-    invoke-static {p0, p2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p0, p2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p0
 
diff --git a/com.discord/smali_classes2/f/g/g/j/a.smali b/com.discord/smali_classes2/f/g/g/j/a.smali
index e7db4c41ca..7f7a4f40a7 100644
--- a/com.discord/smali_classes2/f/g/g/j/a.smali
+++ b/com.discord/smali_classes2/f/g/g/j/a.smali
@@ -86,7 +86,7 @@
 
     invoke-direct {v1, v0}, Lf/g/g/f/a;-><init>(Landroid/content/res/Resources;)V
 
-    invoke-static {v1, p1, p2}, Ld0/a/b/b/a;->a1(Lf/g/g/f/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lf/g/g/f/a;
+    invoke-static {v1, p1, p2}, Le0/a/b/b/a;->a1(Lf/g/g/f/a;Landroid/content/Context;Landroid/util/AttributeSet;)Lf/g/g/f/a;
 
     invoke-static {}, Lf/g/j/r/b;->b()Z
 
diff --git a/com.discord/smali_classes2/f/g/i/a.smali b/com.discord/smali_classes2/f/g/i/a.smali
index 7644d12a27..4f7a2c93f1 100644
--- a/com.discord/smali_classes2/f/g/i/a.smali
+++ b/com.discord/smali_classes2/f/g/i/a.smali
@@ -66,7 +66,7 @@
 
     const-string v0, "GIF87a"
 
-    invoke-static {v0}, Ld0/a/b/b/a;->d(Ljava/lang/String;)[B
+    invoke-static {v0}, Le0/a/b/b/a;->d(Ljava/lang/String;)[B
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
 
     const-string v0, "GIF89a"
 
-    invoke-static {v0}, Ld0/a/b/b/a;->d(Ljava/lang/String;)[B
+    invoke-static {v0}, Le0/a/b/b/a;->d(Ljava/lang/String;)[B
 
     move-result-object v0
 
@@ -82,7 +82,7 @@
 
     const-string v0, "BM"
 
-    invoke-static {v0}, Ld0/a/b/b/a;->d(Ljava/lang/String;)[B
+    invoke-static {v0}, Le0/a/b/b/a;->d(Ljava/lang/String;)[B
 
     move-result-object v0
 
@@ -140,7 +140,7 @@
 
     move-result-object v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->d(Ljava/lang/String;)[B
+    invoke-static {v0}, Le0/a/b/b/a;->d(Ljava/lang/String;)[B
 
     move-result-object v0
 
@@ -235,7 +235,7 @@
 
     aput v2, v1, v5
 
-    invoke-static {v4}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v4}, Le0/a/b/b/a;->h(Z)V
 
     aget v2, v1, v3
 
@@ -290,7 +290,7 @@
 
     move-result v3
 
-    invoke-static {v3}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v3}, Le0/a/b/b/a;->h(Z)V
 
     const/16 v3, 0xc
 
@@ -438,7 +438,7 @@
 
     if-lt v1, v5, :cond_b
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->U0([B[B)Z
+    invoke-static {v0, v3}, Le0/a/b/b/a;->U0([B[B)Z
 
     move-result v3
 
@@ -465,7 +465,7 @@
 
     if-lt v1, v5, :cond_d
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->U0([B[B)Z
+    invoke-static {v0, v3}, Le0/a/b/b/a;->U0([B[B)Z
 
     move-result v3
 
@@ -495,7 +495,7 @@
     :cond_f
     sget-object v3, Lf/g/i/a;->f:[B
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->U0([B[B)Z
+    invoke-static {v0, v3}, Le0/a/b/b/a;->U0([B[B)Z
 
     move-result v3
 
@@ -503,7 +503,7 @@
 
     sget-object v3, Lf/g/i/a;->g:[B
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->U0([B[B)Z
+    invoke-static {v0, v3}, Le0/a/b/b/a;->U0([B[B)Z
 
     move-result v3
 
@@ -540,7 +540,7 @@
     goto :goto_a
 
     :cond_13
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->U0([B[B)Z
+    invoke-static {v0, v3}, Le0/a/b/b/a;->U0([B[B)Z
 
     move-result v3
 
@@ -563,7 +563,7 @@
     goto :goto_b
 
     :cond_15
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->U0([B[B)Z
+    invoke-static {v0, v3}, Le0/a/b/b/a;->U0([B[B)Z
 
     move-result v3
 
@@ -620,7 +620,7 @@
 
     move-result-object v6
 
-    invoke-static {v6}, Ld0/a/b/b/a;->d(Ljava/lang/String;)[B
+    invoke-static {v6}, Le0/a/b/b/a;->d(Ljava/lang/String;)[B
 
     move-result-object v6
 
diff --git a/com.discord/smali_classes2/f/g/i/d.smali b/com.discord/smali_classes2/f/g/i/d.smali
index 12a32b6edf..5310afdcae 100644
--- a/com.discord/smali_classes2/f/g/i/d.smali
+++ b/com.discord/smali_classes2/f/g/i/d.smali
@@ -70,7 +70,7 @@
     const/4 v4, 0x0
 
     :goto_0
-    invoke-static {v4}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v4}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p0}, Ljava/io/InputStream;->markSupported()Z
 
@@ -81,7 +81,7 @@
     :try_start_0
     invoke-virtual {p0, v1}, Ljava/io/InputStream;->mark(I)V
 
-    invoke-static {p0, v2, v3, v1}, Ld0/a/b/b/a;->D0(Ljava/io/InputStream;[BII)I
+    invoke-static {p0, v2, v3, v1}, Le0/a/b/b/a;->D0(Ljava/io/InputStream;[BII)I
 
     move-result v1
     :try_end_0
@@ -99,7 +99,7 @@
     throw v0
 
     :cond_1
-    invoke-static {p0, v2, v3, v1}, Ld0/a/b/b/a;->D0(Ljava/io/InputStream;[BII)I
+    invoke-static {p0, v2, v3, v1}, Le0/a/b/b/a;->D0(Ljava/io/InputStream;[BII)I
 
     move-result v1
 
@@ -181,7 +181,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {p0}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {p0}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     new-instance v0, Ljava/lang/RuntimeException;
 
diff --git a/com.discord/smali_classes2/f/g/j/a/a/e.smali b/com.discord/smali_classes2/f/g/j/a/a/e.smali
index 7c350e80b3..068d74b540 100644
--- a/com.discord/smali_classes2/f/g/j/a/a/e.smali
+++ b/com.discord/smali_classes2/f/g/j/a/a/e.smali
@@ -53,7 +53,7 @@
 
     iget-object v0, p1, Lf/g/j/a/a/f;->a:Lf/g/j/a/a/c;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iput-object v0, p0, Lf/g/j/a/a/e;->a:Lf/g/j/a/a/c;
 
diff --git a/com.discord/smali_classes2/f/g/j/a/c/c$b.smali b/com.discord/smali_classes2/f/g/j/a/c/c$b.smali
index e0212656e5..c1dab66fb3 100644
--- a/com.discord/smali_classes2/f/g/j/a/c/c$b.smali
+++ b/com.discord/smali_classes2/f/g/j/a/c/c$b.smali
@@ -113,7 +113,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    invoke-static {p0}, Ld0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
+    invoke-static {p0}, Le0/a/b/b/a;->W0(Ljava/lang/Object;)Lf/g/d/d/g;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/g/j/a/c/c.smali b/com.discord/smali_classes2/f/g/j/a/c/c.smali
index 2d0436f888..b136e0f396 100644
--- a/com.discord/smali_classes2/f/g/j/a/c/c.smali
+++ b/com.discord/smali_classes2/f/g/j/a/c/c.smali
@@ -218,7 +218,7 @@
 
     check-cast v1, Lf/g/j/c/l$c;
 
-    invoke-static {v1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget v2, v1, Lf/g/j/c/l$c;->c:I
 
@@ -227,7 +227,7 @@
     const/4 v4, 0x1
 
     :cond_3
-    invoke-static {v4}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v4}, Le0/a/b/b/a;->m(Z)V
 
     iget-object v2, v1, Lf/g/j/c/l$c;->b:Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali_classes2/f/g/j/b/a.smali b/com.discord/smali_classes2/f/g/j/b/a.smali
index cd28c7d3f7..adc03a5158 100644
--- a/com.discord/smali_classes2/f/g/j/b/a.smali
+++ b/com.discord/smali_classes2/f/g/j/b/a.smali
@@ -77,7 +77,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/graphics/Bitmap;->reconfigure(IILandroid/graphics/Bitmap$Config;)V
 
diff --git a/com.discord/smali_classes2/f/g/j/c/c.smali b/com.discord/smali_classes2/f/g/j/c/c.smali
index b05d9d3b73..a051954b90 100644
--- a/com.discord/smali_classes2/f/g/j/c/c.smali
+++ b/com.discord/smali_classes2/f/g/j/c/c.smali
@@ -241,7 +241,7 @@
 
     iget-object v2, p1, Lf/g/j/c/c;->b:Lf/g/j/d/d;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -251,7 +251,7 @@
 
     iget-object v2, p1, Lf/g/j/c/c;->c:Lf/g/j/d/e;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -261,7 +261,7 @@
 
     iget-object v2, p1, Lf/g/j/c/c;->d:Lcom/facebook/imagepipeline/common/ImageDecodeOptions;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -271,7 +271,7 @@
 
     iget-object v2, p1, Lf/g/j/c/c;->e:Lcom/facebook/cache/common/CacheKey;
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v2}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -281,7 +281,7 @@
 
     iget-object p1, p1, Lf/g/j/c/c;->f:Ljava/lang/String;
 
-    invoke-static {v0, p1}, Ld0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Le0/a/b/b/a;->D(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/f/g/j/c/f.smali b/com.discord/smali_classes2/f/g/j/c/f.smali
index 7fcc288745..0671294a52 100644
--- a/com.discord/smali_classes2/f/g/j/c/f.smali
+++ b/com.discord/smali_classes2/f/g/j/c/f.smali
@@ -305,7 +305,7 @@
 
 
 # virtual methods
-.method public c(Lcom/facebook/cache/common/CacheKey;Ljava/util/concurrent/atomic/AtomicBoolean;)Lf0/h;
+.method public c(Lcom/facebook/cache/common/CacheKey;Ljava/util/concurrent/atomic/AtomicBoolean;)Lg0/h;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -313,7 +313,7 @@
             "Lcom/facebook/cache/common/CacheKey;",
             "Ljava/util/concurrent/atomic/AtomicBoolean;",
             ")",
-            "Lf0/h<",
+            "Lg0/h<",
             "Lcom/facebook/imagepipeline/image/EncodedImage;",
             ">;"
         }
@@ -346,7 +346,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {v0}, Lf0/h;->d(Ljava/lang/Object;)Lf0/h;
+    invoke-static {v0}, Lg0/h;->d(Ljava/lang/Object;)Lg0/h;
 
     move-result-object p1
     :try_end_0
@@ -372,7 +372,7 @@
 
     iget-object p2, p0, Lf/g/j/c/f;->d:Ljava/util/concurrent/Executor;
 
-    invoke-static {v0, p2}, Lf0/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)Lf0/h;
+    invoke-static {v0, p2}, Lg0/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)Lg0/h;
 
     move-result-object p1
     :try_end_2
@@ -403,7 +403,7 @@
 
     invoke-static {v0, p2, p1, v1}, Lf/g/d/e/a;->p(Ljava/lang/Class;Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-static {p2}, Lf0/h;->c(Ljava/lang/Exception;)Lf0/h;
+    invoke-static {p2}, Lg0/h;->c(Ljava/lang/Exception;)Lg0/h;
 
     move-result-object p1
     :try_end_3
@@ -434,7 +434,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/j/c/f;->f:Lf/g/j/c/w;
 
@@ -447,7 +447,7 @@
 
     move-result v1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v1, v0, Lf/g/j/c/w;->a:Ljava/util/Map;
 
diff --git a/com.discord/smali_classes2/f/g/j/c/l$a.smali b/com.discord/smali_classes2/f/g/j/c/l$a.smali
index b98185eb04..374e9122c8 100644
--- a/com.discord/smali_classes2/f/g/j/c/l$a.smali
+++ b/com.discord/smali_classes2/f/g/j/c/l$a.smali
@@ -86,7 +86,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->m(Z)V
 
     iget v2, v0, Lf/g/j/c/l$c;->c:I
 
diff --git a/com.discord/smali_classes2/f/g/j/c/l$c.smali b/com.discord/smali_classes2/f/g/j/c/l$c.smali
index 572985d7ac..01358599f5 100644
--- a/com.discord/smali_classes2/f/g/j/c/l$c.smali
+++ b/com.discord/smali_classes2/f/g/j/c/l$c.smali
@@ -80,7 +80,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     check-cast p1, Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali_classes2/f/g/j/c/l.smali b/com.discord/smali_classes2/f/g/j/c/l.smali
index 95027727d9..ee5098f5d0 100644
--- a/com.discord/smali_classes2/f/g/j/c/l.smali
+++ b/com.discord/smali_classes2/f/g/j/c/l.smali
@@ -512,7 +512,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iput-boolean v1, p1, Lf/g/j/c/l$c;->d:Z
     :try_end_0
@@ -921,7 +921,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iget v0, p1, Lf/g/j/c/l$c;->c:I
 
diff --git a/com.discord/smali_classes2/f/g/j/c/w.smali b/com.discord/smali_classes2/f/g/j/c/w.smali
index 4c0e0f19e6..015a9e957e 100644
--- a/com.discord/smali_classes2/f/g/j/c/w.smali
+++ b/com.discord/smali_classes2/f/g/j/c/w.smali
@@ -299,7 +299,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/j/c/w;->a:Ljava/util/Map;
 
diff --git a/com.discord/smali_classes2/f/g/j/d/a.smali b/com.discord/smali_classes2/f/g/j/d/a.smali
index baae5df892..531fcf123c 100644
--- a/com.discord/smali_classes2/f/g/j/d/a.smali
+++ b/com.discord/smali_classes2/f/g/j/d/a.smali
@@ -73,7 +73,7 @@
 
     iget v1, p0, Lf/g/j/d/a;->b:I
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->d0(II)I
+    invoke-static {v0, v1}, Le0/a/b/b/a;->d0(II)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/f/g/j/d/d.smali b/com.discord/smali_classes2/f/g/j/d/d.smali
index 0118183049..42c69c411a 100644
--- a/com.discord/smali_classes2/f/g/j/d/d.smali
+++ b/com.discord/smali_classes2/f/g/j/d/d.smali
@@ -33,7 +33,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     if-lez p2, :cond_1
 
@@ -43,7 +43,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iput p1, p0, Lf/g/j/d/d;->a:I
 
@@ -111,7 +111,7 @@
 
     iget v1, p0, Lf/g/j/d/d;->b:I
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->d0(II)I
+    invoke-static {v0, v1}, Le0/a/b/b/a;->d0(II)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/f/g/j/d/e.smali b/com.discord/smali_classes2/f/g/j/d/e.smali
index 3eb1bbd5cf..eba7638318 100644
--- a/com.discord/smali_classes2/f/g/j/d/e.smali
+++ b/com.discord/smali_classes2/f/g/j/d/e.smali
@@ -174,7 +174,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->e0(Ljava/lang/Object;Ljava/lang/Object;)I
+    invoke-static {v0, v1}, Le0/a/b/b/a;->e0(Ljava/lang/Object;Ljava/lang/Object;)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/f/g/j/e/i.smali b/com.discord/smali_classes2/f/g/j/e/i.smali
index 798a9d7b34..fb0a0150c9 100644
--- a/com.discord/smali_classes2/f/g/j/e/i.smali
+++ b/com.discord/smali_classes2/f/g/j/e/i.smali
@@ -159,7 +159,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
+    invoke-static {p1}, Le0/a/b/b/a;->h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
 
     move-result-object p1
 
@@ -370,7 +370,7 @@
     move-exception v0
 
     :try_start_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
+    invoke-static {v0}, Le0/a/b/b/a;->h0(Ljava/lang/Throwable;)Lcom/facebook/datasource/DataSource;
 
     move-result-object v0
     :try_end_1
diff --git a/com.discord/smali_classes2/f/g/j/e/k.smali b/com.discord/smali_classes2/f/g/j/e/k.smali
index afec6aa4f9..916a3eed13 100644
--- a/com.discord/smali_classes2/f/g/j/e/k.smali
+++ b/com.discord/smali_classes2/f/g/j/e/k.smali
@@ -199,7 +199,7 @@
 
     iget-object p2, p1, Lf/g/j/e/k$a;->b:Landroid/content/Context;
 
-    invoke-static {p2}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p2}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iput-object p2, p0, Lf/g/j/e/k;->e:Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/f/g/j/e/m.smali b/com.discord/smali_classes2/f/g/j/e/m.smali
index 2908cd1258..99d4cb3f3a 100644
--- a/com.discord/smali_classes2/f/g/j/e/m.smali
+++ b/com.discord/smali_classes2/f/g/j/e/m.smali
@@ -151,7 +151,7 @@
 
     const-string v1, "ImagePipelineFactory was not initialized!"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Le0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     check-cast v0, Lf/g/j/e/m;
 
diff --git a/com.discord/smali_classes2/f/g/j/e/p.smali b/com.discord/smali_classes2/f/g/j/e/p.smali
index 3338f3248e..fd4feadab4 100644
--- a/com.discord/smali_classes2/f/g/j/e/p.smali
+++ b/com.discord/smali_classes2/f/g/j/e/p.smali
@@ -388,7 +388,7 @@
 
     const-string v1, "Uri is null."
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Le0/a/b/b/a;->l(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     iget v1, p1, Lcom/facebook/imagepipeline/request/ImageRequest;->c:I
 
diff --git a/com.discord/smali_classes2/f/g/j/f/a.smali b/com.discord/smali_classes2/f/g/j/f/a.smali
index 93ba38f492..df5511b62d 100644
--- a/com.discord/smali_classes2/f/g/j/f/a.smali
+++ b/com.discord/smali_classes2/f/g/j/f/a.smali
@@ -41,7 +41,7 @@
 
     move-result v1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->m(Z)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/f/g/j/h/e.smali b/com.discord/smali_classes2/f/g/j/h/e.smali
index a0317cf98f..ec5bd8a5a9 100644
--- a/com.discord/smali_classes2/f/g/j/h/e.smali
+++ b/com.discord/smali_classes2/f/g/j/h/e.smali
@@ -123,7 +123,7 @@
 
     if-eq v6, v2, :cond_1
 
-    invoke-static {v3}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v3}, Le0/a/b/b/a;->m(Z)V
 
     goto/16 :goto_2
 
@@ -138,7 +138,7 @@
 
     int-to-long v3, v2
 
-    invoke-static {p1, v3, v4}, Ld0/a/b/b/a;->T0(Ljava/io/InputStream;J)J
+    invoke-static {p1, v3, v4}, Le0/a/b/b/a;->T0(Ljava/io/InputStream;J)J
 
     iget v3, p0, Lf/g/j/h/e;->c:I
 
@@ -309,7 +309,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     new-instance v0, Ljava/lang/RuntimeException;
 
@@ -368,7 +368,7 @@
 
     int-to-long v1, p1
 
-    invoke-static {v0, v1, v2}, Ld0/a/b/b/a;->T0(Ljava/io/InputStream;J)J
+    invoke-static {v0, v1, v2}, Le0/a/b/b/a;->T0(Ljava/io/InputStream;J)J
 
     invoke-virtual {p0, v0}, Lf/g/j/h/e;->a(Ljava/io/InputStream;)Z
 
@@ -390,7 +390,7 @@
     move-exception p1
 
     :try_start_1
-    invoke-static {p1}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     new-instance v1, Ljava/lang/RuntimeException;
 
diff --git a/com.discord/smali_classes2/f/g/j/j/c.smali b/com.discord/smali_classes2/f/g/j/j/c.smali
index 7c01c84b6b..402ca09adb 100644
--- a/com.discord/smali_classes2/f/g/j/j/c.smali
+++ b/com.discord/smali_classes2/f/g/j/j/c.smali
@@ -92,7 +92,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iput-object p1, p0, Lf/g/j/j/c;->d:Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali_classes2/f/g/j/l/a.smali b/com.discord/smali_classes2/f/g/j/l/a.smali
index 6239063bf6..e30bde28dc 100644
--- a/com.discord/smali_classes2/f/g/j/l/a.smali
+++ b/com.discord/smali_classes2/f/g/j/l/a.smali
@@ -43,7 +43,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     if-lez p2, :cond_1
 
@@ -53,7 +53,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iput p1, p0, Lf/g/j/l/a;->c:I
 
@@ -98,7 +98,7 @@
     :goto_0
     const-string v3, "No bitmaps registered."
 
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->i(ZLjava/lang/Object;)V
+    invoke-static {v0, v3}, Le0/a/b/b/a;->i(ZLjava/lang/Object;)V
 
     int-to-long v3, p1
 
@@ -160,7 +160,7 @@
     :try_start_1
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    invoke-static {v5, v6}, Ld0/a/b/b/a;->G(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {v5, v6}, Le0/a/b/b/a;->G(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/g/j/l/a0.smali b/com.discord/smali_classes2/f/g/j/l/a0.smali
index bab01e0b39..d799b79a1f 100644
--- a/com.discord/smali_classes2/f/g/j/l/a0.smali
+++ b/com.discord/smali_classes2/f/g/j/l/a0.smali
@@ -55,7 +55,7 @@
     const/4 p4, 0x0
 
     :goto_0
-    invoke-static {p4}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {p4}, Le0/a/b/b/a;->m(Z)V
 
     iput p1, p0, Lf/g/j/l/a0;->b:I
 
diff --git a/com.discord/smali_classes2/f/g/j/l/e.smali b/com.discord/smali_classes2/f/g/j/l/e.smali
index 6c6151ba60..b7cd3027b0 100644
--- a/com.discord/smali_classes2/f/g/j/l/e.smali
+++ b/com.discord/smali_classes2/f/g/j/l/e.smali
@@ -46,7 +46,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->m(Z)V
 
     if-ltz p2, :cond_1
 
@@ -58,7 +58,7 @@
     const/4 v2, 0x0
 
     :goto_1
-    invoke-static {v2}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->m(Z)V
 
     if-ltz p3, :cond_2
 
@@ -68,7 +68,7 @@
     const/4 v0, 0x0
 
     :goto_2
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iput p1, p0, Lf/g/j/l/e;->a:I
 
@@ -121,7 +121,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iget v0, p0, Lf/g/j/l/e;->e:I
 
@@ -172,7 +172,7 @@
     const/4 v1, 0x1
 
     :cond_0
-    invoke-static {v1}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->m(Z)V
 
     iget v0, p0, Lf/g/j/l/e;->e:I
 
diff --git a/com.discord/smali_classes2/f/g/j/l/h.smali b/com.discord/smali_classes2/f/g/j/l/h.smali
index 0fc9309e0b..54ccf90d86 100644
--- a/com.discord/smali_classes2/f/g/j/l/h.smali
+++ b/com.discord/smali_classes2/f/g/j/l/h.smali
@@ -99,7 +99,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     :cond_0
     invoke-interface {p2}, Lf/g/j/l/r;->getUniqueId()J
@@ -221,11 +221,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iget v0, p0, Lf/g/j/l/h;->e:I
 
-    invoke-static {p1, p4, v0}, Ld0/a/b/b/a;->c(III)I
+    invoke-static {p1, p4, v0}, Le0/a/b/b/a;->c(III)I
 
     move-result p4
 
@@ -233,7 +233,7 @@
 
     iget v1, p0, Lf/g/j/l/h;->e:I
 
-    invoke-static {p1, v0, p3, p4, v1}, Ld0/a/b/b/a;->j(IIIII)V
+    invoke-static {p1, v0, p3, p4, v1}, Le0/a/b/b/a;->j(IIIII)V
 
     iget-object v0, p0, Lf/g/j/l/h;->d:Ljava/nio/ByteBuffer;
 
@@ -270,7 +270,7 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-interface {p2}, Lf/g/j/l/r;->isClosed()Z
 
@@ -278,7 +278,7 @@
 
     xor-int/lit8 v0, v0, 0x1
 
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     invoke-interface {p2}, Lf/g/j/l/r;->getSize()I
 
@@ -286,7 +286,7 @@
 
     iget v1, p0, Lf/g/j/l/h;->e:I
 
-    invoke-static {p1, v0, p3, p4, v1}, Ld0/a/b/b/a;->j(IIIII)V
+    invoke-static {p1, v0, p3, p4, v1}, Le0/a/b/b/a;->j(IIIII)V
 
     iget-object v0, p0, Lf/g/j/l/h;->d:Ljava/nio/ByteBuffer;
 
@@ -442,7 +442,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     if-ltz p1, :cond_1
 
@@ -454,7 +454,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget v0, p0, Lf/g/j/l/h;->e:I
 
@@ -466,7 +466,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/j/l/h;->d:Ljava/nio/ByteBuffer;
 
@@ -510,11 +510,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->m(Z)V
 
     iget v0, p0, Lf/g/j/l/h;->e:I
 
-    invoke-static {p1, p4, v0}, Ld0/a/b/b/a;->c(III)I
+    invoke-static {p1, p4, v0}, Le0/a/b/b/a;->c(III)I
 
     move-result p4
 
@@ -522,7 +522,7 @@
 
     iget v1, p0, Lf/g/j/l/h;->e:I
 
-    invoke-static {p1, v0, p3, p4, v1}, Ld0/a/b/b/a;->j(IIIII)V
+    invoke-static {p1, v0, p3, p4, v1}, Le0/a/b/b/a;->j(IIIII)V
 
     iget-object v0, p0, Lf/g/j/l/h;->d:Ljava/nio/ByteBuffer;
 
diff --git a/com.discord/smali_classes2/f/g/j/l/n.smali b/com.discord/smali_classes2/f/g/j/l/n.smali
index d5b4024c17..8d6cf9e0d1 100644
--- a/com.discord/smali_classes2/f/g/j/l/n.smali
+++ b/com.discord/smali_classes2/f/g/j/l/n.smali
@@ -42,7 +42,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     new-instance v0, Lf/g/j/l/n$b;
 
diff --git a/com.discord/smali_classes2/f/g/j/l/t.smali b/com.discord/smali_classes2/f/g/j/l/t.smali
index 8a04029aa5..7eb6e021ba 100644
--- a/com.discord/smali_classes2/f/g/j/l/t.smali
+++ b/com.discord/smali_classes2/f/g/j/l/t.smali
@@ -58,7 +58,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->b()Lcom/facebook/common/references/CloseableReference;
 
@@ -248,7 +248,7 @@
     const/4 v2, 0x0
 
     :goto_0
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     iget v2, p0, Lf/g/j/l/t;->d:I
 
@@ -260,7 +260,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/j/l/t;->e:Lcom/facebook/common/references/CloseableReference;
 
@@ -310,7 +310,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/j/l/t;->e:Lcom/facebook/common/references/CloseableReference;
 
diff --git a/com.discord/smali_classes2/f/g/j/l/u.smali b/com.discord/smali_classes2/f/g/j/l/u.smali
index 3cfbda7a6a..bb64e7a6ca 100644
--- a/com.discord/smali_classes2/f/g/j/l/u.smali
+++ b/com.discord/smali_classes2/f/g/j/l/u.smali
@@ -83,7 +83,7 @@
     move-exception p1
 
     :try_start_1
-    invoke-static {p1}, Ld0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Le0/a/b/b/a;->B0(Ljava/lang/Throwable;)V
 
     new-instance v1, Ljava/lang/RuntimeException;
 
diff --git a/com.discord/smali_classes2/f/g/j/n/b.smali b/com.discord/smali_classes2/f/g/j/n/b.smali
index 44800e8f64..dee9883714 100644
--- a/com.discord/smali_classes2/f/g/j/n/b.smali
+++ b/com.discord/smali_classes2/f/g/j/n/b.smali
@@ -276,7 +276,7 @@
     :cond_1
     iget-object v0, p1, Lcom/facebook/imagepipeline/image/EncodedImage;->d:Lcom/facebook/common/references/CloseableReference;
 
-    invoke-static {v0}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object v0, p1, Lcom/facebook/imagepipeline/image/EncodedImage;->d:Lcom/facebook/common/references/CloseableReference;
 
@@ -323,7 +323,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/image/EncodedImage;->g()I
 
diff --git a/com.discord/smali_classes2/f/g/j/p/b0.smali b/com.discord/smali_classes2/f/g/j/p/b0.smali
index af87cac711..c0f892410a 100644
--- a/com.discord/smali_classes2/f/g/j/p/b0.smali
+++ b/com.discord/smali_classes2/f/g/j/p/b0.smali
@@ -114,7 +114,7 @@
 
     move-result v1
 
-    invoke-static {v0, v1, p1}, Ld0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
+    invoke-static {v0, v1, p1}, Le0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
 
     move-result p1
 
@@ -228,7 +228,7 @@
 
     move-result v4
 
-    invoke-static {v4}, Ld0/a/b/b/a;->M(I)I
+    invoke-static {v4}, Le0/a/b/b/a;->M(I)I
 
     move-result v2
     :try_end_2
@@ -303,7 +303,7 @@
 
     move-result v1
 
-    invoke-static {v0, v1, p1}, Ld0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
+    invoke-static {v0, v1, p1}, Le0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
 
     move-result v0
 
@@ -326,7 +326,7 @@
 
     move-result v1
 
-    invoke-static {v0, v1, p1}, Ld0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
+    invoke-static {v0, v1, p1}, Le0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/f/g/j/p/c0$a.smali b/com.discord/smali_classes2/f/g/j/p/c0$a.smali
index ab03048d63..58500b2aa7 100644
--- a/com.discord/smali_classes2/f/g/j/p/c0$a.smali
+++ b/com.discord/smali_classes2/f/g/j/p/c0$a.smali
@@ -292,7 +292,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->M(I)I
+    invoke-static {v0}, Le0/a/b/b/a;->M(I)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/f/g/j/p/c0.smali b/com.discord/smali_classes2/f/g/j/p/c0.smali
index 4c5b3bc34d..5348525ac6 100644
--- a/com.discord/smali_classes2/f/g/j/p/c0.smali
+++ b/com.discord/smali_classes2/f/g/j/p/c0.smali
@@ -47,7 +47,7 @@
 
     const/16 v0, 0x200
 
-    invoke-static {v0, v0, p1}, Ld0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
+    invoke-static {v0, v0, p1}, Le0/a/b/b/a;->k0(IILf/g/j/d/d;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/f/g/j/p/d1$a.smali b/com.discord/smali_classes2/f/g/j/p/d1$a.smali
index a4e2ad63d5..df872362f8 100644
--- a/com.discord/smali_classes2/f/g/j/p/d1$a.smali
+++ b/com.discord/smali_classes2/f/g/j/p/d1$a.smali
@@ -110,7 +110,7 @@
 
     iget-object v0, p0, Lf/g/j/p/d1$a;->e:Lf/g/j/d/d;
 
-    invoke-static {p1, v0}, Ld0/a/b/b/a;->l0(Lcom/facebook/imagepipeline/image/EncodedImage;Lf/g/j/d/d;)Z
+    invoke-static {p1, v0}, Le0/a/b/b/a;->l0(Lcom/facebook/imagepipeline/image/EncodedImage;Lf/g/j/d/d;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/f/g/j/p/d1.smali b/com.discord/smali_classes2/f/g/j/p/d1.smali
index c2b17a89f8..9449f881d3 100644
--- a/com.discord/smali_classes2/f/g/j/p/d1.smali
+++ b/com.discord/smali_classes2/f/g/j/p/d1.smali
@@ -90,7 +90,7 @@
 
     const-string p1, "%s (%s) must be less than size (%s)"
 
-    invoke-static {p1, v3}, Ld0/a/b/b/a;->G(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, v3}, Le0/a/b/b/a;->G(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/g/j/p/h0$b.smali b/com.discord/smali_classes2/f/g/j/p/h0$b.smali
index d254754dc4..07cd295379 100644
--- a/com.discord/smali_classes2/f/g/j/p/h0$b.smali
+++ b/com.discord/smali_classes2/f/g/j/p/h0$b.smali
@@ -818,7 +818,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/j/p/h0$b;->g:Lf/g/j/p/h0$b$a;
 
@@ -830,7 +830,7 @@
     const/4 v1, 0x0
 
     :goto_1
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     iget-object v0, p0, Lf/g/j/p/h0$b;->b:Ljava/util/concurrent/CopyOnWriteArraySet;
 
diff --git a/com.discord/smali_classes2/f/g/j/p/i.smali b/com.discord/smali_classes2/f/g/j/p/i.smali
index c55e390be1..285467d645 100644
--- a/com.discord/smali_classes2/f/g/j/p/i.smali
+++ b/com.discord/smali_classes2/f/g/j/p/i.smali
@@ -68,7 +68,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     if-eqz p1, :cond_1
 
diff --git a/com.discord/smali_classes2/f/g/j/p/j$b.smali b/com.discord/smali_classes2/f/g/j/p/j$b.smali
index 35393447d8..1de37daeb1 100644
--- a/com.discord/smali_classes2/f/g/j/p/j$b.smali
+++ b/com.discord/smali_classes2/f/g/j/p/j$b.smali
@@ -77,7 +77,7 @@
 
     iget-object v2, v0, Lcom/facebook/imagepipeline/request/ImageRequest;->h:Lf/g/j/d/d;
 
-    invoke-static {p1, v2}, Ld0/a/b/b/a;->l0(Lcom/facebook/imagepipeline/image/EncodedImage;Lf/g/j/d/d;)Z
+    invoke-static {p1, v2}, Le0/a/b/b/a;->l0(Lcom/facebook/imagepipeline/image/EncodedImage;Lf/g/j/d/d;)Z
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/f/g/j/p/l.smali b/com.discord/smali_classes2/f/g/j/p/l.smali
index c80cb225d8..5d8c7ef001 100644
--- a/com.discord/smali_classes2/f/g/j/p/l.smali
+++ b/com.discord/smali_classes2/f/g/j/p/l.smali
@@ -44,7 +44,7 @@
 
     move-result v0
 
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     const/16 v0, 0x2c
 
diff --git a/com.discord/smali_classes2/f/g/j/p/l0.smali b/com.discord/smali_classes2/f/g/j/p/l0.smali
index ceb9136d9e..f6145187a3 100644
--- a/com.discord/smali_classes2/f/g/j/p/l0.smali
+++ b/com.discord/smali_classes2/f/g/j/p/l0.smali
@@ -3,14 +3,14 @@
 .source "PartialDiskCacheProducer.java"
 
 # interfaces
-.implements Lf0/d;
+.implements Lg0/d;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Ljava/lang/Object;",
-        "Lf0/d<",
+        "Lg0/d<",
         "Lcom/facebook/imagepipeline/image/EncodedImage;",
         "Ljava/lang/Void;",
         ">;"
@@ -55,7 +55,7 @@
 
 
 # virtual methods
-.method public a(Lf0/h;)Ljava/lang/Object;
+.method public a(Lg0/h;)Ljava/lang/Object;
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -63,12 +63,12 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lf0/h;->a:Ljava/lang/Object;
+    iget-object v0, p1, Lg0/h;->a:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p1, Lf0/h;->c:Z
+    iget-boolean v1, p1, Lg0/h;->c:Z
 
     monitor-exit v0
     :try_end_0
@@ -80,13 +80,13 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p1}, Lf0/h;->f()Z
+    invoke-virtual {p1}, Lg0/h;->f()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p1}, Lf0/h;->e()Ljava/lang/Exception;
+    invoke-virtual {p1}, Lg0/h;->e()Ljava/lang/Exception;
 
     move-result-object v1
 
@@ -125,7 +125,7 @@
     goto/16 :goto_5
 
     :cond_2
-    invoke-virtual {p1}, Lf0/h;->f()Z
+    invoke-virtual {p1}, Lg0/h;->f()Z
 
     move-result v1
 
@@ -137,7 +137,7 @@
 
     const-string v2, "PartialDiskCacheProducer"
 
-    invoke-virtual {p1}, Lf0/h;->e()Ljava/lang/Exception;
+    invoke-virtual {p1}, Lg0/h;->e()Ljava/lang/Exception;
 
     move-result-object p1
 
@@ -156,12 +156,12 @@
     goto/16 :goto_5
 
     :cond_3
-    iget-object v1, p1, Lf0/h;->a:Ljava/lang/Object;
+    iget-object v1, p1, Lg0/h;->a:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_1
-    iget-object p1, p1, Lf0/h;->d:Ljava/lang/Object;
+    iget-object p1, p1, Lg0/h;->d:Ljava/lang/Object;
 
     monitor-exit v1
     :try_end_1
@@ -203,7 +203,7 @@
     const/4 v4, 0x0
 
     :goto_2
-    invoke-static {v4}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v4}, Le0/a/b/b/a;->h(Z)V
 
     new-instance v4, Lf/g/j/d/a;
 
@@ -335,7 +335,7 @@
     const/4 v0, 0x1
 
     :cond_8
-    invoke-static {v0}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v0}, Le0/a/b/b/a;->h(Z)V
 
     new-instance v0, Lf/g/j/d/a;
 
diff --git a/com.discord/smali_classes2/f/g/j/p/m$c$a.smali b/com.discord/smali_classes2/f/g/j/p/m$c$a.smali
index 1bed73dae8..2a3f2c39ad 100644
--- a/com.discord/smali_classes2/f/g/j/p/m$c$a.smali
+++ b/com.discord/smali_classes2/f/g/j/p/m$c$a.smali
@@ -99,7 +99,7 @@
 
     iget v5, v1, Lf/g/j/p/m$c$a;->b:I
 
-    invoke-static {v4, v3, v2, v5}, Ld0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
+    invoke-static {v4, v3, v2, v5}, Le0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
 
     move-result v3
 
diff --git a/com.discord/smali_classes2/f/g/j/p/n0$a.smali b/com.discord/smali_classes2/f/g/j/p/n0$a.smali
index f971ef915e..f4732001a8 100644
--- a/com.discord/smali_classes2/f/g/j/p/n0$a.smali
+++ b/com.discord/smali_classes2/f/g/j/p/n0$a.smali
@@ -135,7 +135,7 @@
 
     iget-object p1, p1, Lf/g/j/c/f;->e:Ljava/util/concurrent/Executor;
 
-    invoke-static {v0, p1}, Lf0/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)Lf0/h;
+    invoke-static {v0, p1}, Lg0/h;->a(Ljava/util/concurrent/Callable;Ljava/util/concurrent/Executor;)Lg0/h;
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
 
@@ -162,7 +162,7 @@
 
     invoke-static {v0, p1, p2, v1}, Lf/g/d/e/a;->p(Ljava/lang/Class;Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
 
-    invoke-static {p1}, Lf0/h;->c(Ljava/lang/Exception;)Lf0/h;
+    invoke-static {p1}, Lg0/h;->c(Ljava/lang/Exception;)Lg0/h;
 
     goto :goto_2
 
diff --git a/com.discord/smali_classes2/f/g/j/p/n0.smali b/com.discord/smali_classes2/f/g/j/p/n0.smali
index 5cc77305e2..71ed6ffa43 100644
--- a/com.discord/smali_classes2/f/g/j/p/n0.smali
+++ b/com.discord/smali_classes2/f/g/j/p/n0.smali
@@ -246,7 +246,7 @@
 
     iget-object v1, p0, Lf/g/j/p/n0;->a:Lf/g/j/c/f;
 
-    invoke-virtual {v1, v8, v0}, Lf/g/j/c/f;->c(Lcom/facebook/cache/common/CacheKey;Ljava/util/concurrent/atomic/AtomicBoolean;)Lf0/h;
+    invoke-virtual {v1, v8, v0}, Lf/g/j/c/f;->c(Lcom/facebook/cache/common/CacheKey;Ljava/util/concurrent/atomic/AtomicBoolean;)Lg0/h;
 
     move-result-object v1
 
@@ -270,7 +270,7 @@
 
     invoke-direct/range {v2 .. v8}, Lf/g/j/p/l0;-><init>(Lf/g/j/p/n0;Lf/g/j/k/c;Ljava/lang/String;Lf/g/j/p/k;Lf/g/j/p/u0;Lcom/facebook/cache/common/CacheKey;)V
 
-    invoke-virtual {v1, v9}, Lf0/h;->b(Lf0/d;)Lf0/h;
+    invoke-virtual {v1, v9}, Lg0/h;->b(Lg0/d;)Lg0/h;
 
     new-instance p1, Lf/g/j/p/m0;
 
diff --git a/com.discord/smali_classes2/f/g/j/p/o.smali b/com.discord/smali_classes2/f/g/j/p/o.smali
index 4cdb3db131..1254ce797e 100644
--- a/com.discord/smali_classes2/f/g/j/p/o.smali
+++ b/com.discord/smali_classes2/f/g/j/p/o.smali
@@ -3,14 +3,14 @@
 .source "DiskCacheReadProducer.java"
 
 # interfaces
-.implements Lf0/d;
+.implements Lg0/d;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Ljava/lang/Object;",
-        "Lf0/d<",
+        "Lg0/d<",
         "Lcom/facebook/imagepipeline/image/EncodedImage;",
         "Ljava/lang/Void;",
         ">;"
@@ -51,7 +51,7 @@
 
 
 # virtual methods
-.method public a(Lf0/h;)Ljava/lang/Object;
+.method public a(Lg0/h;)Ljava/lang/Object;
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -59,12 +59,12 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lf0/h;->a:Ljava/lang/Object;
+    iget-object v0, p1, Lg0/h;->a:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p1, Lf0/h;->c:Z
+    iget-boolean v1, p1, Lg0/h;->c:Z
 
     monitor-exit v0
     :try_end_0
@@ -76,13 +76,13 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p1}, Lf0/h;->f()Z
+    invoke-virtual {p1}, Lg0/h;->f()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p1}, Lf0/h;->e()Ljava/lang/Exception;
+    invoke-virtual {p1}, Lg0/h;->e()Ljava/lang/Exception;
 
     move-result-object v1
 
@@ -121,7 +121,7 @@
     goto :goto_2
 
     :cond_2
-    invoke-virtual {p1}, Lf0/h;->f()Z
+    invoke-virtual {p1}, Lg0/h;->f()Z
 
     move-result v1
 
@@ -133,7 +133,7 @@
 
     const-string v2, "DiskCacheProducer"
 
-    invoke-virtual {p1}, Lf0/h;->e()Ljava/lang/Exception;
+    invoke-virtual {p1}, Lg0/h;->e()Ljava/lang/Exception;
 
     move-result-object p1
 
@@ -152,12 +152,12 @@
     goto :goto_2
 
     :cond_3
-    iget-object v1, p1, Lf0/h;->a:Ljava/lang/Object;
+    iget-object v1, p1, Lg0/h;->a:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_1
-    iget-object p1, p1, Lf0/h;->d:Ljava/lang/Object;
+    iget-object p1, p1, Lg0/h;->d:Ljava/lang/Object;
 
     monitor-exit v1
     :try_end_1
diff --git a/com.discord/smali_classes2/f/g/j/p/p0$b.smali b/com.discord/smali_classes2/f/g/j/p/p0$b.smali
index c40bcf59ea..73d426e667 100644
--- a/com.discord/smali_classes2/f/g/j/p/p0$b.smali
+++ b/com.discord/smali_classes2/f/g/j/p/p0$b.smali
@@ -114,7 +114,7 @@
 
     move-result v1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v1}, Le0/a/b/b/a;->h(Z)V
 
     invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->i()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/f/g/j/p/q.smali b/com.discord/smali_classes2/f/g/j/p/q.smali
index a47ee34478..3d0a0794cb 100644
--- a/com.discord/smali_classes2/f/g/j/p/q.smali
+++ b/com.discord/smali_classes2/f/g/j/p/q.smali
@@ -225,7 +225,7 @@
 
     invoke-direct {v2, v4}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    invoke-virtual {v0, v1, v2}, Lf/g/j/c/f;->c(Lcom/facebook/cache/common/CacheKey;Ljava/util/concurrent/atomic/AtomicBoolean;)Lf0/h;
+    invoke-virtual {v0, v1, v2}, Lf/g/j/c/f;->c(Lcom/facebook/cache/common/CacheKey;Ljava/util/concurrent/atomic/AtomicBoolean;)Lg0/h;
 
     move-result-object v0
 
@@ -249,7 +249,7 @@
 
     invoke-direct/range {v3 .. v8}, Lf/g/j/p/o;-><init>(Lf/g/j/p/q;Lf/g/j/k/c;Ljava/lang/String;Lf/g/j/p/k;Lf/g/j/p/u0;)V
 
-    invoke-virtual {v0, v1}, Lf0/h;->b(Lf0/d;)Lf0/h;
+    invoke-virtual {v0, v1}, Lg0/h;->b(Lg0/d;)Lg0/h;
 
     new-instance p1, Lf/g/j/p/p;
 
diff --git a/com.discord/smali_classes2/f/g/j/p/x0$a$a.smali b/com.discord/smali_classes2/f/g/j/p/x0$a$a.smali
index 7d8c0223ed..8d6fd1d357 100644
--- a/com.discord/smali_classes2/f/g/j/p/x0$a$a.smali
+++ b/com.discord/smali_classes2/f/g/j/p/x0$a$a.smali
@@ -53,7 +53,7 @@
 
     move-result-object v1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v1}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     check-cast v1, Lf/g/j/s/b;
 
diff --git a/com.discord/smali_classes2/f/g/j/p/x0$a.smali b/com.discord/smali_classes2/f/g/j/p/x0$a.smali
index cfe181a377..42874e6b90 100644
--- a/com.discord/smali_classes2/f/g/j/p/x0$a.smali
+++ b/com.discord/smali_classes2/f/g/j/p/x0$a.smali
@@ -160,7 +160,7 @@
 
     move-result-object v6
 
-    invoke-static {v6}, Ld0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v6}, Le0/a/b/b/a;->k(Ljava/lang/Object;)Ljava/lang/Object;
 
     sget-object v7, Lf/g/d/l/a;->e:Lf/g/d/l/a;
 
diff --git a/com.discord/smali_classes2/f/g/j/p/y.smali b/com.discord/smali_classes2/f/g/j/p/y.smali
index 3c57abbfae..6f9303cfa0 100644
--- a/com.discord/smali_classes2/f/g/j/p/y.smali
+++ b/com.discord/smali_classes2/f/g/j/p/y.smali
@@ -166,7 +166,7 @@
 
     if-lez v2, :cond_1
 
-    sget-object v0, Ld0/a/b/b/a;->c:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Le0/a/b/b/a;->c:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez v0, :cond_0
 
@@ -174,10 +174,10 @@
 
     move-result-object v0
 
-    sput-object v0, Ld0/a/b/b/a;->c:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Le0/a/b/b/a;->c:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_0
-    sget-object v0, Ld0/a/b/b/a;->c:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Le0/a/b/b/a;->c:Ljava/util/concurrent/ScheduledExecutorService;
 
     iget-object v1, p0, Lf/g/j/p/y;->d:Ljava/lang/Runnable;
 
diff --git a/com.discord/smali_classes2/f/g/j/s/f.smali b/com.discord/smali_classes2/f/g/j/s/f.smali
index d98c56054d..24e0f49304 100644
--- a/com.discord/smali_classes2/f/g/j/s/f.smali
+++ b/com.discord/smali_classes2/f/g/j/s/f.smali
@@ -95,7 +95,7 @@
 
     iget v0, p0, Lf/g/j/s/f;->b:I
 
-    invoke-static {p2, p3, p1, v0}, Ld0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
+    invoke-static {p2, p3, p1, v0}, Le0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
 
     move-result p1
 
@@ -160,7 +160,7 @@
 
     move-object/from16 v8, p4
 
-    invoke-static {v5, v8, v0, v6}, Ld0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
+    invoke-static {v5, v8, v0, v6}, Le0/a/b/b/a;->A(Lf/g/j/d/e;Lf/g/j/d/d;Lcom/facebook/imagepipeline/image/EncodedImage;I)I
 
     move-result v6
 
diff --git a/com.discord/smali_classes2/f/g/k/c.smali b/com.discord/smali_classes2/f/g/k/c.smali
index 610df6efd9..5c4013b49c 100644
--- a/com.discord/smali_classes2/f/g/k/c.smali
+++ b/com.discord/smali_classes2/f/g/k/c.smali
@@ -54,7 +54,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {p0, v2, v1}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v2, v1}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v4
 
@@ -94,7 +94,7 @@
     const/4 v4, 0x0
 
     :goto_1
-    invoke-static {p0, v2, v4}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v2, v4}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v5
 
@@ -143,7 +143,7 @@
     goto :goto_4
 
     :cond_6
-    invoke-static {p0, v6, v4}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v6, v4}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v5
 
@@ -158,7 +158,7 @@
 
     if-lt p1, v5, :cond_8
 
-    invoke-static {p0, v6, v4}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v6, v4}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v5
 
@@ -191,7 +191,7 @@
     goto :goto_6
 
     :cond_9
-    invoke-static {p0, v6, v4}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v6, v4}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result p1
 
@@ -202,7 +202,7 @@
     goto :goto_6
 
     :cond_a
-    invoke-static {p0, v2, v4}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v2, v4}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result p1
 
@@ -211,11 +211,11 @@
     goto :goto_6
 
     :cond_b
-    invoke-static {p0, v6, v4}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v6, v4}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     move-result v1
 
-    invoke-static {p0, v6, v4}, Ld0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
+    invoke-static {p0, v6, v4}, Le0/a/b/b/a;->I0(Ljava/io/InputStream;IZ)I
 
     :cond_c
     :goto_6
diff --git a/com.discord/smali_classes2/f/g/l/b/a.smali b/com.discord/smali_classes2/f/g/l/b/a.smali
index 17cdd99d12..ce0974e5e7 100644
--- a/com.discord/smali_classes2/f/g/l/b/a.smali
+++ b/com.discord/smali_classes2/f/g/l/b/a.smali
@@ -335,13 +335,13 @@
     const/4 v2, 0x1
 
     :cond_2
-    invoke-static {v2}, Ld0/a/b/b/a;->h(Z)V
+    invoke-static {v2}, Le0/a/b/b/a;->h(Z)V
 
     iget-boolean p3, p2, Lf/g/l/b/a;->s:Z
 
     xor-int/2addr p3, v1
 
-    invoke-static {p3}, Ld0/a/b/b/a;->m(Z)V
+    invoke-static {p3}, Le0/a/b/b/a;->m(Z)V
 
     iput-boolean v1, p2, Lf/g/l/b/a;->s:Z
 
diff --git a/com.discord/smali_classes2/f/g/l/b/b.smali b/com.discord/smali_classes2/f/g/l/b/b.smali
index 791e1254ab..00b867b623 100644
--- a/com.discord/smali_classes2/f/g/l/b/b.smali
+++ b/com.discord/smali_classes2/f/g/l/b/b.smali
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/g/l/b/d;
+.field public final synthetic a:Lf/g/l/b/d;
 
 
 # direct methods
 .method public constructor <init>(Lf/g/l/b/d;)V
     .locals 0
 
-    iput-object p1, p0, Lf/g/l/b/b;->d:Lf/g/l/b/d;
+    iput-object p1, p0, Lf/g/l/b/b;->a:Lf/g/l/b/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,7 +26,7 @@
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 6
 
-    iget-object v0, p0, Lf/g/l/b/b;->d:Lf/g/l/b/d;
+    iget-object v0, p0, Lf/g/l/b/b;->a:Lf/g/l/b/d;
 
     iget-object v1, v0, Lf/g/l/b/a;->x:Landroid/graphics/Matrix;
 
@@ -78,7 +78,7 @@
 
     invoke-virtual {v1, p1}, Landroid/graphics/Matrix;->setValues([F)V
 
-    iget-object p1, p0, Lf/g/l/b/b;->d:Lf/g/l/b/d;
+    iget-object p1, p0, Lf/g/l/b/b;->a:Lf/g/l/b/d;
 
     iget-object v0, p1, Lf/g/l/b/a;->x:Landroid/graphics/Matrix;
 
diff --git a/com.discord/smali_classes2/f/g/l/b/c.smali b/com.discord/smali_classes2/f/g/l/b/c.smali
index 58ba12a026..c8eeba5dc5 100644
--- a/com.discord/smali_classes2/f/g/l/b/c.smali
+++ b/com.discord/smali_classes2/f/g/l/b/c.smali
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field public final synthetic d:Ljava/lang/Runnable;
+.field public final synthetic a:Ljava/lang/Runnable;
 
-.field public final synthetic e:Lf/g/l/b/d;
+.field public final synthetic b:Lf/g/l/b/d;
 
 
 # direct methods
 .method public constructor <init>(Lf/g/l/b/d;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lf/g/l/b/c;->e:Lf/g/l/b/d;
+    iput-object p1, p0, Lf/g/l/b/c;->b:Lf/g/l/b/d;
 
-    iput-object p2, p0, Lf/g/l/b/c;->d:Ljava/lang/Runnable;
+    iput-object p2, p0, Lf/g/l/b/c;->a:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -27,7 +27,7 @@
 .method public onAnimationCancel(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/g/l/b/c;->e:Lf/g/l/b/d;
+    iget-object p1, p0, Lf/g/l/b/c;->b:Lf/g/l/b/d;
 
     if-eqz p1, :cond_1
 
@@ -37,14 +37,14 @@
 
     invoke-static {p1, v0}, Lf/g/d/e/a;->h(Ljava/lang/Class;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lf/g/l/b/c;->d:Ljava/lang/Runnable;
+    iget-object p1, p0, Lf/g/l/b/c;->a:Ljava/lang/Runnable;
 
     if-eqz p1, :cond_0
 
     invoke-interface {p1}, Ljava/lang/Runnable;->run()V
 
     :cond_0
-    iget-object p1, p0, Lf/g/l/b/c;->e:Lf/g/l/b/d;
+    iget-object p1, p0, Lf/g/l/b/c;->b:Lf/g/l/b/d;
 
     const/4 v0, 0x0
 
@@ -65,7 +65,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/g/l/b/c;->e:Lf/g/l/b/d;
+    iget-object p1, p0, Lf/g/l/b/c;->b:Lf/g/l/b/d;
 
     if-eqz p1, :cond_1
 
@@ -75,14 +75,14 @@
 
     invoke-static {p1, v0}, Lf/g/d/e/a;->h(Ljava/lang/Class;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lf/g/l/b/c;->d:Ljava/lang/Runnable;
+    iget-object p1, p0, Lf/g/l/b/c;->a:Ljava/lang/Runnable;
 
     if-eqz p1, :cond_0
 
     invoke-interface {p1}, Ljava/lang/Runnable;->run()V
 
     :cond_0
-    iget-object p1, p0, Lf/g/l/b/c;->e:Lf/g/l/b/d;
+    iget-object p1, p0, Lf/g/l/b/c;->b:Lf/g/l/b/d;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/f/g/m/c.smali b/com.discord/smali_classes2/f/g/m/c.smali
index 5706b4143f..0232d3d485 100644
--- a/com.discord/smali_classes2/f/g/m/c.smali
+++ b/com.discord/smali_classes2/f/g/m/c.smali
@@ -168,7 +168,7 @@
 
     move-result-object p3
 
-    invoke-static {p3}, Ld0/a/b/b/a;->F(Ljava/nio/channels/FileChannel;)[Ljava/lang/String;
+    invoke-static {p3}, Le0/a/b/b/a;->F(Ljava/nio/channels/FileChannel;)[Ljava/lang/String;
 
     move-result-object p3
     :try_end_1
diff --git a/com.discord/smali_classes2/f/g/m/n$a.smali b/com.discord/smali_classes2/f/g/m/n$a.smali
index 8fa47c12fe..25e0e5d3e1 100644
--- a/com.discord/smali_classes2/f/g/m/n$a.smali
+++ b/com.discord/smali_classes2/f/g/m/n$a.smali
@@ -162,7 +162,7 @@
 
     iget-object v2, v2, Lf/g/m/c;->a:Ljava/io/File;
 
-    invoke-static {v2}, Ld0/a/b/b/a;->H(Ljava/io/File;)V
+    invoke-static {v2}, Le0/a/b/b/a;->H(Ljava/io/File;)V
 
     iget-object v2, p0, Lf/g/m/n$a;->g:Ljava/io/File;
 
diff --git a/com.discord/smali_classes2/f/g/m/n.smali b/com.discord/smali_classes2/f/g/m/n.smali
index 7d5ea9e3cc..0da96d0d64 100644
--- a/com.discord/smali_classes2/f/g/m/n.smali
+++ b/com.discord/smali_classes2/f/g/m/n.smali
@@ -479,7 +479,7 @@
 
     invoke-static {v4, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-static {v3}, Ld0/a/b/b/a;->B(Ljava/io/File;)V
+    invoke-static {v3}, Le0/a/b/b/a;->B(Ljava/io/File;)V
 
     :cond_3
     :goto_2
@@ -594,7 +594,7 @@
 
     invoke-static {v2, v5, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    invoke-static {v1}, Ld0/a/b/b/a;->B(Ljava/io/File;)V
+    invoke-static {v1}, Le0/a/b/b/a;->B(Ljava/io/File;)V
 
     new-instance v4, Ljava/io/RandomAccessFile;
 
@@ -706,7 +706,7 @@
     move-exception p1
 
     :try_start_3
-    invoke-static {v1}, Ld0/a/b/b/a;->B(Ljava/io/File;)V
+    invoke-static {v1}, Le0/a/b/b/a;->B(Ljava/io/File;)V
 
     throw p1
     :try_end_3
diff --git a/com.discord/smali_classes2/f/h/a/b/i/a.smali b/com.discord/smali_classes2/f/h/a/b/i/a.smali
index 5fc77603d2..92bf96634e 100644
--- a/com.discord/smali_classes2/f/h/a/b/i/a.smali
+++ b/com.discord/smali_classes2/f/h/a/b/i/a.smali
@@ -46,7 +46,7 @@
 
     const-string v1, "tp:/ieaeogn.ogepscmvc/o/ac?omtjo_rt3"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1}, Le0/a/b/b/a;->d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -56,7 +56,7 @@
 
     const-string v1, "tp:/ieaeogn-agolai.o/1frlglgc/aclg"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1}, Le0/a/b/b/a;->d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -66,7 +66,7 @@
 
     const-string v1, "IayckHiZRO1EFl1aGoK"
 
-    invoke-static {v0, v1}, Ld0/a/b/b/a;->d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1}, Le0/a/b/b/a;->d1(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/b/i/c.smali b/com.discord/smali_classes2/f/h/a/b/i/c.smali
index 6470a5e432..4e459eb423 100644
--- a/com.discord/smali_classes2/f/h/a/b/i/c.smali
+++ b/com.discord/smali_classes2/f/h/a/b/i/c.smali
@@ -37,7 +37,7 @@
 
     const-string v4, "Making request to: %s"
 
-    invoke-static {v3, v4, v2}, Ld0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-static {v3, v4, v2}, Le0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 
     iget-object v2, p1, Lf/h/a/b/i/e$a;->a:Ljava/net/URL;
 
@@ -179,7 +179,7 @@
 
     move-result-object v0
 
-    invoke-static {v3, v0}, Ld0/a/b/b/a;->f0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Le0/a/b/b/a;->f0(Ljava/lang/String;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -199,7 +199,7 @@
 
     move-result-object v0
 
-    invoke-static {v3, v0}, Ld0/a/b/b/a;->f0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Le0/a/b/b/a;->f0(Ljava/lang/String;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -219,7 +219,7 @@
 
     move-result-object v0
 
-    invoke-static {v3, v0}, Ld0/a/b/b/a;->f0(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v3, v0}, Le0/a/b/b/a;->f0(Ljava/lang/String;Ljava/lang/String;)V
 
     const/16 v0, 0x12e
 
@@ -408,7 +408,7 @@
     :goto_2
     const-string v0, "Couldn\'t encode request, returning with 400"
 
-    invoke-static {v3, v0, p1}, Ld0/a/b/b/a;->C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    invoke-static {v3, v0, p1}, Le0/a/b/b/a;->C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     new-instance v0, Lf/h/a/b/i/e$b;
 
diff --git a/com.discord/smali_classes2/f/h/a/b/i/e.smali b/com.discord/smali_classes2/f/h/a/b/i/e.smali
index 6059a81980..7c1ed30a18 100644
--- a/com.discord/smali_classes2/f/h/a/b/i/e.smali
+++ b/com.discord/smali_classes2/f/h/a/b/i/e.smali
@@ -634,7 +634,7 @@
     throw v0
 
     :cond_9
-    invoke-static {v6}, Ld0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v6}, Le0/a/b/b/a;->W(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -807,7 +807,7 @@
 
     sget-object v2, Lf/h/a/b/i/d;->a:Lf/h/a/b/i/d;
 
-    invoke-static {v3, v8, v0, v2}, Ld0/a/b/b/a;->N0(ILjava/lang/Object;Lf/h/a/b/i/c;Lf/h/a/b/j/r/a;)Ljava/lang/Object;
+    invoke-static {v3, v8, v0, v2}, Le0/a/b/b/a;->N0(ILjava/lang/Object;Lf/h/a/b/i/c;Lf/h/a/b/j/r/a;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -877,7 +877,7 @@
     :goto_b
     const-string v3, "Could not make request to the backend"
 
-    invoke-static {v6, v3, v0}, Ld0/a/b/b/a;->C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    invoke-static {v6, v3, v0}, Le0/a/b/b/a;->C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     new-instance v0, Lf/h/a/b/j/q/b;
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/c.smali b/com.discord/smali_classes2/f/h/a/b/j/c.smali
index d4e476c230..5a9f3f4634 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/c.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/c.smali
@@ -4,96 +4,96 @@
 
 
 # instance fields
-.field public d:Li0/a/a;
+.field public d:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/util/concurrent/Executor;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public e:Li0/a/a;
+.field public e:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public f:Li0/a/a;
+.field public f:Lj0/a/a;
 
-.field public g:Li0/a/a;
+.field public g:Lj0/a/a;
 
-.field public h:Li0/a/a;
+.field public h:Lj0/a/a;
 
-.field public i:Li0/a/a;
+.field public i:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/o;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public j:Li0/a/a;
+.field public j:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/f;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public k:Li0/a/a;
+.field public k:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/r;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public l:Li0/a/a;
+.field public l:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/c;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public m:Li0/a/a;
+.field public m:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/l;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public n:Li0/a/a;
+.field public n:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/p;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public o:Li0/a/a;
+.field public o:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/n;",
             ">;"
         }
@@ -113,21 +113,21 @@
 
     sget-object v2, Lf/h/a/b/j/g;->a:Lf/h/a/b/j/g;
 
-    invoke-static {v2}, Lg0/a/a;->a(Li0/a/a;)Li0/a/a;
+    invoke-static {v2}, Lh0/a/a;->a(Lj0/a/a;)Lj0/a/a;
 
     move-result-object v2
 
-    iput-object v2, v0, Lf/h/a/b/j/c;->d:Li0/a/a;
+    iput-object v2, v0, Lf/h/a/b/j/c;->d:Lj0/a/a;
 
-    new-instance v2, Lg0/a/b;
+    new-instance v2, Lh0/a/b;
 
     const-string v3, "instance cannot be null"
 
-    invoke-static {v1, v3}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v1, v3}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-direct {v2, v1}, Lg0/a/b;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v2, v1}, Lh0/a/b;-><init>(Ljava/lang/Object;)V
 
-    iput-object v2, v0, Lf/h/a/b/j/c;->e:Li0/a/a;
+    iput-object v2, v0, Lf/h/a/b/j/c;->e:Lj0/a/a;
 
     sget-object v1, Lf/h/a/b/j/u/b;->a:Lf/h/a/b/j/u/b;
 
@@ -135,23 +135,23 @@
 
     new-instance v4, Lf/h/a/b/j/q/j;
 
-    invoke-direct {v4, v2, v1, v3}, Lf/h/a/b/j/q/j;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct {v4, v2, v1, v3}, Lf/h/a/b/j/q/j;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    iput-object v4, v0, Lf/h/a/b/j/c;->f:Li0/a/a;
+    iput-object v4, v0, Lf/h/a/b/j/c;->f:Lj0/a/a;
 
-    iget-object v1, v0, Lf/h/a/b/j/c;->e:Li0/a/a;
+    iget-object v1, v0, Lf/h/a/b/j/c;->e:Lj0/a/a;
 
     new-instance v2, Lf/h/a/b/j/q/l;
 
-    invoke-direct {v2, v1, v4}, Lf/h/a/b/j/q/l;-><init>(Li0/a/a;Li0/a/a;)V
+    invoke-direct {v2, v1, v4}, Lf/h/a/b/j/q/l;-><init>(Lj0/a/a;Lj0/a/a;)V
 
-    invoke-static {v2}, Lg0/a/a;->a(Li0/a/a;)Li0/a/a;
+    invoke-static {v2}, Lh0/a/a;->a(Lj0/a/a;)Lj0/a/a;
 
     move-result-object v1
 
-    iput-object v1, v0, Lf/h/a/b/j/c;->g:Li0/a/a;
+    iput-object v1, v0, Lf/h/a/b/j/c;->g:Lj0/a/a;
 
-    iget-object v1, v0, Lf/h/a/b/j/c;->e:Li0/a/a;
+    iget-object v1, v0, Lf/h/a/b/j/c;->e:Lj0/a/a;
 
     sget-object v2, Lf/h/a/b/j/s/i/e;->a:Lf/h/a/b/j/s/i/e;
 
@@ -159,9 +159,9 @@
 
     new-instance v4, Lf/h/a/b/j/s/i/v;
 
-    invoke-direct {v4, v1, v2, v3}, Lf/h/a/b/j/s/i/v;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct {v4, v1, v2, v3}, Lf/h/a/b/j/s/i/v;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    iput-object v4, v0, Lf/h/a/b/j/c;->h:Li0/a/a;
+    iput-object v4, v0, Lf/h/a/b/j/c;->h:Lj0/a/a;
 
     sget-object v1, Lf/h/a/b/j/u/b;->a:Lf/h/a/b/j/u/b;
 
@@ -171,39 +171,39 @@
 
     new-instance v5, Lf/h/a/b/j/s/i/p;
 
-    invoke-direct {v5, v1, v2, v3, v4}, Lf/h/a/b/j/s/i/p;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct {v5, v1, v2, v3, v4}, Lf/h/a/b/j/s/i/p;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    invoke-static {v5}, Lg0/a/a;->a(Li0/a/a;)Li0/a/a;
+    invoke-static {v5}, Lh0/a/a;->a(Lj0/a/a;)Lj0/a/a;
 
     move-result-object v1
 
-    iput-object v1, v0, Lf/h/a/b/j/c;->i:Li0/a/a;
+    iput-object v1, v0, Lf/h/a/b/j/c;->i:Lj0/a/a;
 
     sget-object v1, Lf/h/a/b/j/u/b;->a:Lf/h/a/b/j/u/b;
 
     new-instance v2, Lf/h/a/b/j/s/f;
 
-    invoke-direct {v2, v1}, Lf/h/a/b/j/s/f;-><init>(Li0/a/a;)V
+    invoke-direct {v2, v1}, Lf/h/a/b/j/s/f;-><init>(Lj0/a/a;)V
 
-    iput-object v2, v0, Lf/h/a/b/j/c;->j:Li0/a/a;
+    iput-object v2, v0, Lf/h/a/b/j/c;->j:Lj0/a/a;
 
-    iget-object v1, v0, Lf/h/a/b/j/c;->e:Li0/a/a;
+    iget-object v1, v0, Lf/h/a/b/j/c;->e:Lj0/a/a;
 
-    iget-object v3, v0, Lf/h/a/b/j/c;->i:Li0/a/a;
+    iget-object v3, v0, Lf/h/a/b/j/c;->i:Lj0/a/a;
 
     sget-object v4, Lf/h/a/b/j/u/c;->a:Lf/h/a/b/j/u/c;
 
     new-instance v8, Lf/h/a/b/j/s/g;
 
-    invoke-direct {v8, v1, v3, v2, v4}, Lf/h/a/b/j/s/g;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct {v8, v1, v3, v2, v4}, Lf/h/a/b/j/s/g;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    iput-object v8, v0, Lf/h/a/b/j/c;->k:Li0/a/a;
+    iput-object v8, v0, Lf/h/a/b/j/c;->k:Lj0/a/a;
 
-    iget-object v6, v0, Lf/h/a/b/j/c;->d:Li0/a/a;
+    iget-object v6, v0, Lf/h/a/b/j/c;->d:Lj0/a/a;
 
-    iget-object v7, v0, Lf/h/a/b/j/c;->g:Li0/a/a;
+    iget-object v7, v0, Lf/h/a/b/j/c;->g:Lj0/a/a;
 
-    iget-object v10, v0, Lf/h/a/b/j/c;->i:Li0/a/a;
+    iget-object v10, v0, Lf/h/a/b/j/c;->i:Lj0/a/a;
 
     new-instance v1, Lf/h/a/b/j/s/d;
 
@@ -211,19 +211,19 @@
 
     move-object v9, v10
 
-    invoke-direct/range {v5 .. v10}, Lf/h/a/b/j/s/d;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct/range {v5 .. v10}, Lf/h/a/b/j/s/d;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    iput-object v1, v0, Lf/h/a/b/j/c;->l:Li0/a/a;
+    iput-object v1, v0, Lf/h/a/b/j/c;->l:Lj0/a/a;
 
-    iget-object v12, v0, Lf/h/a/b/j/c;->e:Li0/a/a;
+    iget-object v12, v0, Lf/h/a/b/j/c;->e:Lj0/a/a;
 
-    iget-object v13, v0, Lf/h/a/b/j/c;->g:Li0/a/a;
+    iget-object v13, v0, Lf/h/a/b/j/c;->g:Lj0/a/a;
 
-    iget-object v1, v0, Lf/h/a/b/j/c;->i:Li0/a/a;
+    iget-object v1, v0, Lf/h/a/b/j/c;->i:Lj0/a/a;
 
-    iget-object v15, v0, Lf/h/a/b/j/c;->k:Li0/a/a;
+    iget-object v15, v0, Lf/h/a/b/j/c;->k:Lj0/a/a;
 
-    iget-object v2, v0, Lf/h/a/b/j/c;->d:Li0/a/a;
+    iget-object v2, v0, Lf/h/a/b/j/c;->d:Lj0/a/a;
 
     sget-object v18, Lf/h/a/b/j/u/b;->a:Lf/h/a/b/j/u/b;
 
@@ -237,41 +237,41 @@
 
     move-object/from16 v17, v1
 
-    invoke-direct/range {v11 .. v18}, Lf/h/a/b/j/s/h/m;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct/range {v11 .. v18}, Lf/h/a/b/j/s/h/m;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    iput-object v3, v0, Lf/h/a/b/j/c;->m:Li0/a/a;
+    iput-object v3, v0, Lf/h/a/b/j/c;->m:Lj0/a/a;
 
-    iget-object v1, v0, Lf/h/a/b/j/c;->d:Li0/a/a;
+    iget-object v1, v0, Lf/h/a/b/j/c;->d:Lj0/a/a;
 
-    iget-object v2, v0, Lf/h/a/b/j/c;->i:Li0/a/a;
+    iget-object v2, v0, Lf/h/a/b/j/c;->i:Lj0/a/a;
 
-    iget-object v3, v0, Lf/h/a/b/j/c;->k:Li0/a/a;
+    iget-object v3, v0, Lf/h/a/b/j/c;->k:Lj0/a/a;
 
     new-instance v9, Lf/h/a/b/j/s/h/q;
 
-    invoke-direct {v9, v1, v2, v3, v2}, Lf/h/a/b/j/s/h/q;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct {v9, v1, v2, v3, v2}, Lf/h/a/b/j/s/h/q;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    iput-object v9, v0, Lf/h/a/b/j/c;->n:Li0/a/a;
+    iput-object v9, v0, Lf/h/a/b/j/c;->n:Lj0/a/a;
 
     sget-object v5, Lf/h/a/b/j/u/b;->a:Lf/h/a/b/j/u/b;
 
     sget-object v6, Lf/h/a/b/j/u/c;->a:Lf/h/a/b/j/u/c;
 
-    iget-object v7, v0, Lf/h/a/b/j/c;->l:Li0/a/a;
+    iget-object v7, v0, Lf/h/a/b/j/c;->l:Lj0/a/a;
 
-    iget-object v8, v0, Lf/h/a/b/j/c;->m:Li0/a/a;
+    iget-object v8, v0, Lf/h/a/b/j/c;->m:Lj0/a/a;
 
     new-instance v1, Lf/h/a/b/j/p;
 
     move-object v4, v1
 
-    invoke-direct/range {v4 .. v9}, Lf/h/a/b/j/p;-><init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+    invoke-direct/range {v4 .. v9}, Lf/h/a/b/j/p;-><init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
 
-    invoke-static {v1}, Lg0/a/a;->a(Li0/a/a;)Li0/a/a;
+    invoke-static {v1}, Lh0/a/a;->a(Lj0/a/a;)Lj0/a/a;
 
     move-result-object v1
 
-    iput-object v1, v0, Lf/h/a/b/j/c;->o:Li0/a/a;
+    iput-object v1, v0, Lf/h/a/b/j/c;->o:Lj0/a/a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/b/j/g.smali b/com.discord/smali_classes2/f/h/a/b/j/g.smali
index aae745c6e0..43e3ab0ce9 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/g.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/g.smali
@@ -3,7 +3,7 @@
 .source "ExecutionModule_ExecutorFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -57,7 +57,7 @@
 
     const-string v1, "Cannot return null from a non-@Nullable @Provides method"
 
-    invoke-static {v0, v1}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/b/j/h$a.smali b/com.discord/smali_classes2/f/h/a/b/j/h$a.smali
index e28fcae3b1..6e4c4d79bf 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/h$a.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/h$a.smali
@@ -53,7 +53,7 @@
 
     const-string v2, "Background execution failure."
 
-    invoke-static {v1, v2, v0}, Ld0/a/b/b/a;->C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+    invoke-static {v1, v2, v0}, Le0/a/b/b/a;->C(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/f/h/a/b/j/n.smali b/com.discord/smali_classes2/f/h/a/b/j/n.smali
index 917fcdd6df..9e9376d263 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/n.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/n.smali
@@ -54,9 +54,9 @@
 
     check-cast v0, Lf/h/a/b/j/c;
 
-    iget-object v0, v0, Lf/h/a/b/j/c;->o:Li0/a/a;
+    iget-object v0, v0, Lf/h/a/b/j/c;->o:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/o.smali b/com.discord/smali_classes2/f/h/a/b/j/o.smali
index 545d1ac8a0..115c69aac1 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/o.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/o.smali
@@ -29,9 +29,9 @@
 
     check-cast v0, Lf/h/a/b/j/c;
 
-    iget-object v0, v0, Lf/h/a/b/j/c;->i:Li0/a/a;
+    iget-object v0, v0, Lf/h/a/b/j/c;->i:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/p.smali b/com.discord/smali_classes2/f/h/a/b/j/p.smali
index b0081122d7..7fe733e377 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/p.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/p.smali
@@ -3,7 +3,7 @@
 .source "TransportRuntime_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,50 +18,50 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/e;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final d:Li0/a/a;
+.field public final d:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/l;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final e:Li0/a/a;
+.field public final e:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/p;",
             ">;"
         }
@@ -70,24 +70,24 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/e;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/l;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/p;",
             ">;)V"
         }
@@ -95,15 +95,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/p;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/p;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/p;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/p;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/p;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/p;->c:Lj0/a/a;
 
-    iput-object p4, p0, Lf/h/a/b/j/p;->d:Li0/a/a;
+    iput-object p4, p0, Lf/h/a/b/j/p;->d:Lj0/a/a;
 
-    iput-object p5, p0, Lf/h/a/b/j/p;->e:Li0/a/a;
+    iput-object p5, p0, Lf/h/a/b/j/p;->e:Lj0/a/a;
 
     return-void
 .end method
@@ -115,9 +115,9 @@
 
     new-instance v6, Lf/h/a/b/j/n;
 
-    iget-object v0, p0, Lf/h/a/b/j/p;->a:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/p;->a:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -125,9 +125,9 @@
 
     check-cast v1, Lf/h/a/b/j/u/a;
 
-    iget-object v0, p0, Lf/h/a/b/j/p;->b:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/p;->b:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -135,9 +135,9 @@
 
     check-cast v2, Lf/h/a/b/j/u/a;
 
-    iget-object v0, p0, Lf/h/a/b/j/p;->c:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/p;->c:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -145,9 +145,9 @@
 
     check-cast v3, Lf/h/a/b/j/s/e;
 
-    iget-object v0, p0, Lf/h/a/b/j/p;->d:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/p;->d:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -155,9 +155,9 @@
 
     check-cast v4, Lf/h/a/b/j/s/h/l;
 
-    iget-object v0, p0, Lf/h/a/b/j/p;->e:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/p;->e:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/q/j.smali b/com.discord/smali_classes2/f/h/a/b/j/q/j.smali
index b8fc3c8af6..6e1e490c79 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/q/j.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/q/j.smali
@@ -3,7 +3,7 @@
 .source "CreationContextFactory_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
@@ -50,18 +50,18 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;)V"
         }
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/q/j;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/q/j;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/q/j;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/q/j;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/q/j;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/q/j;->c:Lj0/a/a;
 
     return-void
 .end method
@@ -85,25 +85,25 @@
 
     new-instance v0, Lf/h/a/b/j/q/i;
 
-    iget-object v1, p0, Lf/h/a/b/j/q/j;->a:Li0/a/a;
+    iget-object v1, p0, Lf/h/a/b/j/q/j;->a:Lj0/a/a;
 
-    invoke-interface {v1}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v1}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Landroid/content/Context;
 
-    iget-object v2, p0, Lf/h/a/b/j/q/j;->b:Li0/a/a;
+    iget-object v2, p0, Lf/h/a/b/j/q/j;->b:Lj0/a/a;
 
-    invoke-interface {v2}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v2}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Lf/h/a/b/j/u/a;
 
-    iget-object v3, p0, Lf/h/a/b/j/q/j;->c:Li0/a/a;
+    iget-object v3, p0, Lf/h/a/b/j/q/j;->c:Lj0/a/a;
 
-    invoke-interface {v3}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v3}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/q/l.smali b/com.discord/smali_classes2/f/h/a/b/j/q/l.smali
index db7d52aa71..5f09621d23 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/q/l.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/q/l.smali
@@ -3,7 +3,7 @@
 .source "MetadataBackendRegistry_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,20 +18,20 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/q/i;",
             ">;"
         }
@@ -40,15 +40,15 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/q/i;",
             ">;)V"
         }
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/q/l;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/q/l;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/q/l;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/q/l;->b:Lj0/a/a;
 
     return-void
 .end method
@@ -70,17 +70,17 @@
 
     new-instance v0, Lf/h/a/b/j/q/k;
 
-    iget-object v1, p0, Lf/h/a/b/j/q/l;->a:Li0/a/a;
+    iget-object v1, p0, Lf/h/a/b/j/q/l;->a:Lj0/a/a;
 
-    invoke-interface {v1}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v1}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Landroid/content/Context;
 
-    iget-object v2, p0, Lf/h/a/b/j/q/l;->b:Li0/a/a;
+    iget-object v2, p0, Lf/h/a/b/j/q/l;->b:Lj0/a/a;
 
-    invoke-interface {v2}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v2}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/d.smali b/com.discord/smali_classes2/f/h/a/b/j/s/d.smali
index daf50dcd41..8528398fd6 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/d.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/d.smali
@@ -3,7 +3,7 @@
 .source "DefaultScheduler_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,50 +18,50 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/util/concurrent/Executor;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/q/e;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/r;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final d:Li0/a/a;
+.field public final d:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final e:Li0/a/a;
+.field public final e:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/t/a;",
             ">;"
         }
@@ -70,24 +70,24 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/util/concurrent/Executor;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/q/e;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/r;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/t/a;",
             ">;)V"
         }
@@ -95,15 +95,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/s/d;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/s/d;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/s/d;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/s/d;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/s/d;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/s/d;->c:Lj0/a/a;
 
-    iput-object p4, p0, Lf/h/a/b/j/s/d;->d:Li0/a/a;
+    iput-object p4, p0, Lf/h/a/b/j/s/d;->d:Lj0/a/a;
 
-    iput-object p5, p0, Lf/h/a/b/j/s/d;->e:Li0/a/a;
+    iput-object p5, p0, Lf/h/a/b/j/s/d;->e:Lj0/a/a;
 
     return-void
 .end method
@@ -115,9 +115,9 @@
 
     new-instance v6, Lf/h/a/b/j/s/c;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/d;->a:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/d;->a:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -125,9 +125,9 @@
 
     check-cast v1, Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/d;->b:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/d;->b:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -135,9 +135,9 @@
 
     check-cast v2, Lf/h/a/b/j/q/e;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/d;->c:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/d;->c:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -145,9 +145,9 @@
 
     check-cast v3, Lf/h/a/b/j/s/h/r;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/d;->d:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/d;->d:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -155,9 +155,9 @@
 
     check-cast v4, Lf/h/a/b/j/s/i/c;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/d;->e:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/d;->e:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/f.smali b/com.discord/smali_classes2/f/h/a/b/j/s/f.smali
index 9b42b152e9..305b69d119 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/f.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/f.smali
@@ -3,7 +3,7 @@
 .source "SchedulingConfigModule_ConfigFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,10 +18,10 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
@@ -30,12 +30,12 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;)V"
         }
@@ -43,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/s/f;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/s/f;->a:Lj0/a/a;
 
     return-void
 .end method
@@ -53,9 +53,9 @@
 .method public get()Ljava/lang/Object;
     .locals 8
 
-    iget-object v0, p0, Lf/h/a/b/j/s/f;->a:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/f;->a:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -181,7 +181,7 @@
 
     const-string v0, "Cannot return null from a non-@Nullable @Provides method"
 
-    invoke-static {v2, v0}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2, v0}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     return-object v2
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/g.smali b/com.discord/smali_classes2/f/h/a/b/j/s/g.smali
index e0866b8ca5..e5455b059b 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/g.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/g.smali
@@ -3,7 +3,7 @@
 .source "SchedulingModule_WorkSchedulerFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,40 +18,40 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/f;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final d:Li0/a/a;
+.field public final d:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
@@ -60,21 +60,21 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/f;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;)V"
         }
@@ -82,13 +82,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/s/g;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/s/g;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/s/g;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/s/g;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/s/g;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/s/g;->c:Lj0/a/a;
 
-    iput-object p4, p0, Lf/h/a/b/j/s/g;->d:Li0/a/a;
+    iput-object p4, p0, Lf/h/a/b/j/s/g;->d:Lj0/a/a;
 
     return-void
 .end method
@@ -98,33 +98,33 @@
 .method public get()Ljava/lang/Object;
     .locals 4
 
-    iget-object v0, p0, Lf/h/a/b/j/s/g;->a:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/g;->a:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Landroid/content/Context;
 
-    iget-object v1, p0, Lf/h/a/b/j/s/g;->b:Li0/a/a;
+    iget-object v1, p0, Lf/h/a/b/j/s/g;->b:Lj0/a/a;
 
-    invoke-interface {v1}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v1}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Lf/h/a/b/j/s/i/c;
 
-    iget-object v2, p0, Lf/h/a/b/j/s/g;->c:Li0/a/a;
+    iget-object v2, p0, Lf/h/a/b/j/s/g;->c:Lj0/a/a;
 
-    invoke-interface {v2}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v2}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Lf/h/a/b/j/s/h/f;
 
-    iget-object v3, p0, Lf/h/a/b/j/s/g;->d:Li0/a/a;
+    iget-object v3, p0, Lf/h/a/b/j/s/g;->d:Lj0/a/a;
 
-    invoke-interface {v3}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v3}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -136,7 +136,7 @@
 
     const-string v0, "Cannot return null from a non-@Nullable @Provides method"
 
-    invoke-static {v3, v0}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v3, v0}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     return-object v3
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/h/d.smali b/com.discord/smali_classes2/f/h/a/b/j/s/h/d.smali
index ce8d9af891..f283e77bd1 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/h/d.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/h/d.smali
@@ -194,7 +194,7 @@
 
     const-string v2, "Upload for context %s is already scheduled. Returning..."
 
-    invoke-static {v8, v2, v1}, Ld0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-static {v8, v2, v1}, Le0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 
     return-void
 
@@ -362,7 +362,7 @@
 
     move-object/from16 v2, v16
 
-    invoke-static {v2, v1, v5}, Ld0/a/b/b/a;->w(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-static {v2, v1, v5}, Le0/a/b/b/a;->w(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
 
     invoke-virtual {v14}, Landroid/app/job/JobInfo$Builder;->build()Landroid/app/job/JobInfo;
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/h/l.smali b/com.discord/smali_classes2/f/h/a/b/j/s/h/l.smali
index 579ea75e32..c7af1be061 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/h/l.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/h/l.smali
@@ -92,7 +92,7 @@
 
     const-string v1, "Unknown backend for %s, deleting event batch for it..."
 
-    invoke-static {v0, v1, p1}, Ld0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
+    invoke-static {v0, v1, p1}, Le0/a/b/b/a;->v(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
 
     invoke-static {}, Lf/h/a/b/j/q/g;->a()Lf/h/a/b/j/q/g;
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/h/m.smali b/com.discord/smali_classes2/f/h/a/b/j/s/h/m.smali
index 3bd41af820..0a610dd271 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/h/m.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/h/m.smali
@@ -3,7 +3,7 @@
 .source "Uploader_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,70 +18,70 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/q/e;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final d:Li0/a/a;
+.field public final d:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/r;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final e:Li0/a/a;
+.field public final e:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/util/concurrent/Executor;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final f:Li0/a/a;
+.field public final f:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/t/a;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final g:Li0/a/a;
+.field public final g:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
@@ -90,30 +90,30 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/q/e;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/r;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/util/concurrent/Executor;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/t/a;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;)V"
         }
@@ -121,19 +121,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/s/h/m;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/s/h/m;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/s/h/m;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/s/h/m;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/s/h/m;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/s/h/m;->c:Lj0/a/a;
 
-    iput-object p4, p0, Lf/h/a/b/j/s/h/m;->d:Li0/a/a;
+    iput-object p4, p0, Lf/h/a/b/j/s/h/m;->d:Lj0/a/a;
 
-    iput-object p5, p0, Lf/h/a/b/j/s/h/m;->e:Li0/a/a;
+    iput-object p5, p0, Lf/h/a/b/j/s/h/m;->e:Lj0/a/a;
 
-    iput-object p6, p0, Lf/h/a/b/j/s/h/m;->f:Li0/a/a;
+    iput-object p6, p0, Lf/h/a/b/j/s/h/m;->f:Lj0/a/a;
 
-    iput-object p7, p0, Lf/h/a/b/j/s/h/m;->g:Li0/a/a;
+    iput-object p7, p0, Lf/h/a/b/j/s/h/m;->g:Lj0/a/a;
 
     return-void
 .end method
@@ -145,9 +145,9 @@
 
     new-instance v8, Lf/h/a/b/j/s/h/l;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->a:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->a:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -155,9 +155,9 @@
 
     check-cast v1, Landroid/content/Context;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->b:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->b:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -165,9 +165,9 @@
 
     check-cast v2, Lf/h/a/b/j/q/e;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->c:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->c:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -175,9 +175,9 @@
 
     check-cast v3, Lf/h/a/b/j/s/i/c;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->d:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->d:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -185,9 +185,9 @@
 
     check-cast v4, Lf/h/a/b/j/s/h/r;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->e:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->e:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -195,9 +195,9 @@
 
     check-cast v5, Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->f:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->f:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -205,9 +205,9 @@
 
     check-cast v6, Lf/h/a/b/j/t/a;
 
-    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->g:Li0/a/a;
+    iget-object v0, p0, Lf/h/a/b/j/s/h/m;->g:Lj0/a/a;
 
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/h/q.smali b/com.discord/smali_classes2/f/h/a/b/j/s/h/q.smali
index 110cbba5eb..c670ff686d 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/h/q.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/h/q.smali
@@ -3,7 +3,7 @@
 .source "WorkInitializer_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,40 +18,40 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/util/concurrent/Executor;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/r;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final d:Li0/a/a;
+.field public final d:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/t/a;",
             ">;"
         }
@@ -60,21 +60,21 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/util/concurrent/Executor;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/c;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/h/r;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/t/a;",
             ">;)V"
         }
@@ -82,13 +82,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/s/h/q;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/s/h/q;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/s/h/q;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/s/h/q;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/s/h/q;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/s/h/q;->c:Lj0/a/a;
 
-    iput-object p4, p0, Lf/h/a/b/j/s/h/q;->d:Li0/a/a;
+    iput-object p4, p0, Lf/h/a/b/j/s/h/q;->d:Lj0/a/a;
 
     return-void
 .end method
@@ -100,33 +100,33 @@
 
     new-instance v0, Lf/h/a/b/j/s/h/p;
 
-    iget-object v1, p0, Lf/h/a/b/j/s/h/q;->a:Li0/a/a;
+    iget-object v1, p0, Lf/h/a/b/j/s/h/q;->a:Lj0/a/a;
 
-    invoke-interface {v1}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v1}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lf/h/a/b/j/s/h/q;->b:Li0/a/a;
+    iget-object v2, p0, Lf/h/a/b/j/s/h/q;->b:Lj0/a/a;
 
-    invoke-interface {v2}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v2}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Lf/h/a/b/j/s/i/c;
 
-    iget-object v3, p0, Lf/h/a/b/j/s/h/q;->c:Li0/a/a;
+    iget-object v3, p0, Lf/h/a/b/j/s/h/q;->c:Lj0/a/a;
 
-    invoke-interface {v3}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v3}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v3
 
     check-cast v3, Lf/h/a/b/j/s/h/r;
 
-    iget-object v4, p0, Lf/h/a/b/j/s/h/q;->d:Li0/a/a;
+    iget-object v4, p0, Lf/h/a/b/j/s/h/q;->d:Lj0/a/a;
 
-    invoke-interface {v4}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v4}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v4
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/i/e.smali b/com.discord/smali_classes2/f/h/a/b/j/s/i/e.smali
index 1b56751990..39207cce85 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/i/e.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/i/e.smali
@@ -3,7 +3,7 @@
 .source "EventStoreModule_DbNameFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -51,7 +51,7 @@
 
     const-string v1, "Cannot return null from a non-@Nullable @Provides method"
 
-    invoke-static {v0, v1}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/i/f.smali b/com.discord/smali_classes2/f/h/a/b/j/s/i/f.smali
index 58df2f1c30..4de79e648a 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/i/f.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/i/f.smali
@@ -3,7 +3,7 @@
 .source "EventStoreModule_SchemaVersionFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/i/g.smali b/com.discord/smali_classes2/f/h/a/b/j/s/i/g.smali
index 5133c394d4..7cf81d5659 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/i/g.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/i/g.smali
@@ -3,7 +3,7 @@
 .source "EventStoreModule_StoreConfigFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -51,7 +51,7 @@
 
     const-string v1, "Cannot return null from a non-@Nullable @Provides method"
 
-    invoke-static {v0, v1}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/i/o.smali b/com.discord/smali_classes2/f/h/a/b/j/s/i/o.smali
index 7b8bcf533a..8e9fa58398 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/i/o.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/i/o.smali
@@ -2250,7 +2250,7 @@
 
     const-string v2, "Storing event with priority=%s, name=%s for destination %s"
 
-    invoke-static {v1, v2, v0}, Ld0/a/b/b/a;->w(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
+    invoke-static {v1, v2, v0}, Le0/a/b/b/a;->w(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V
 
     invoke-virtual {p0}, Lf/h/a/b/j/s/i/o;->b()Landroid/database/sqlite/SQLiteDatabase;
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/i/p.smali b/com.discord/smali_classes2/f/h/a/b/j/s/i/p.smali
index c0dc6e60d9..6d8ca6a2c7 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/i/p.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/i/p.smali
@@ -3,7 +3,7 @@
 .source "SQLiteEventStore_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,40 +18,40 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/d;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final d:Li0/a/a;
+.field public final d:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/u;",
             ">;"
         }
@@ -60,21 +60,21 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/u/a;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/d;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Lf/h/a/b/j/s/i/u;",
             ">;)V"
         }
@@ -82,13 +82,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/s/i/p;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/s/i/p;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/s/i/p;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/s/i/p;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/s/i/p;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/s/i/p;->c:Lj0/a/a;
 
-    iput-object p4, p0, Lf/h/a/b/j/s/i/p;->d:Li0/a/a;
+    iput-object p4, p0, Lf/h/a/b/j/s/i/p;->d:Lj0/a/a;
 
     return-void
 .end method
@@ -100,33 +100,33 @@
 
     new-instance v0, Lf/h/a/b/j/s/i/o;
 
-    iget-object v1, p0, Lf/h/a/b/j/s/i/p;->a:Li0/a/a;
+    iget-object v1, p0, Lf/h/a/b/j/s/i/p;->a:Lj0/a/a;
 
-    invoke-interface {v1}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v1}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Lf/h/a/b/j/u/a;
 
-    iget-object v2, p0, Lf/h/a/b/j/s/i/p;->b:Li0/a/a;
+    iget-object v2, p0, Lf/h/a/b/j/s/i/p;->b:Lj0/a/a;
 
-    invoke-interface {v2}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v2}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Lf/h/a/b/j/u/a;
 
-    iget-object v3, p0, Lf/h/a/b/j/s/i/p;->c:Li0/a/a;
+    iget-object v3, p0, Lf/h/a/b/j/s/i/p;->c:Lj0/a/a;
 
-    invoke-interface {v3}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v3}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v3
 
     check-cast v3, Lf/h/a/b/j/s/i/d;
 
-    iget-object v4, p0, Lf/h/a/b/j/s/i/p;->d:Li0/a/a;
+    iget-object v4, p0, Lf/h/a/b/j/s/i/p;->d:Lj0/a/a;
 
-    invoke-interface {v4}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v4}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v4
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/s/i/v.smali b/com.discord/smali_classes2/f/h/a/b/j/s/i/v.smali
index 048a47cbea..5ed7e19f90 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/s/i/v.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/s/i/v.smali
@@ -3,7 +3,7 @@
 .source "SchemaManager_Factory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field public final a:Li0/a/a;
+.field public final a:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final b:Li0/a/a;
+.field public final b:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/lang/String;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public final c:Li0/a/a;
+.field public final c:Lj0/a/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/lang/Integer;",
             ">;"
         }
@@ -50,18 +50,18 @@
 
 
 # direct methods
-.method public constructor <init>(Li0/a/a;Li0/a/a;Li0/a/a;)V
+.method public constructor <init>(Lj0/a/a;Lj0/a/a;Lj0/a/a;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Landroid/content/Context;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/lang/String;",
             ">;",
-            "Li0/a/a<",
+            "Lj0/a/a<",
             "Ljava/lang/Integer;",
             ">;)V"
         }
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/a/b/j/s/i/v;->a:Li0/a/a;
+    iput-object p1, p0, Lf/h/a/b/j/s/i/v;->a:Lj0/a/a;
 
-    iput-object p2, p0, Lf/h/a/b/j/s/i/v;->b:Li0/a/a;
+    iput-object p2, p0, Lf/h/a/b/j/s/i/v;->b:Lj0/a/a;
 
-    iput-object p3, p0, Lf/h/a/b/j/s/i/v;->c:Li0/a/a;
+    iput-object p3, p0, Lf/h/a/b/j/s/i/v;->c:Lj0/a/a;
 
     return-void
 .end method
@@ -85,25 +85,25 @@
 
     new-instance v0, Lf/h/a/b/j/s/i/u;
 
-    iget-object v1, p0, Lf/h/a/b/j/s/i/v;->a:Li0/a/a;
+    iget-object v1, p0, Lf/h/a/b/j/s/i/v;->a:Lj0/a/a;
 
-    invoke-interface {v1}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v1}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Landroid/content/Context;
 
-    iget-object v2, p0, Lf/h/a/b/j/s/i/v;->b:Li0/a/a;
+    iget-object v2, p0, Lf/h/a/b/j/s/i/v;->b:Lj0/a/a;
 
-    invoke-interface {v2}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v2}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Ljava/lang/String;
 
-    iget-object v3, p0, Lf/h/a/b/j/s/i/v;->c:Li0/a/a;
+    iget-object v3, p0, Lf/h/a/b/j/s/i/v;->c:Lj0/a/a;
 
-    invoke-interface {v3}, Li0/a/a;->get()Ljava/lang/Object;
+    invoke-interface {v3}, Lj0/a/a;->get()Ljava/lang/Object;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/f/h/a/b/j/u/b.smali b/com.discord/smali_classes2/f/h/a/b/j/u/b.smali
index 9b5d81323d..799d33bd92 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/u/b.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/u/b.smali
@@ -3,7 +3,7 @@
 .source "TimeModule_EventClockFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -53,7 +53,7 @@
 
     const-string v1, "Cannot return null from a non-@Nullable @Provides method"
 
-    invoke-static {v0, v1}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/b/j/u/c.smali b/com.discord/smali_classes2/f/h/a/b/j/u/c.smali
index 3e07f7efec..8e25942092 100644
--- a/com.discord/smali_classes2/f/h/a/b/j/u/c.smali
+++ b/com.discord/smali_classes2/f/h/a/b/j/u/c.smali
@@ -3,7 +3,7 @@
 .source "TimeModule_UptimeClockFactory.java"
 
 # interfaces
-.implements Li0/a/a;
+.implements Lj0/a/a;
 
 
 # annotations
@@ -53,7 +53,7 @@
 
     const-string v1, "Cannot return null from a non-@Nullable @Provides method"
 
-    invoke-static {v0, v1}, Lf/n/a/k/a;->s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lf/n/a/k/a;->p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/a0/d$b.smali b/com.discord/smali_classes2/f/h/a/c/a1/a0/d$b.smali
index 1b00256fa4..aef6b732f1 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/a0/d$b.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/a0/d$b.smali
@@ -1555,7 +1555,7 @@
     :cond_25
     const-string v0, "Non-PCM MS/ACM is unsupported. Setting mimeType to "
 
-    invoke-static {v0, v6, v7}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v6, v7}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_d
     move-object v5, v6
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/c0/b.smali b/com.discord/smali_classes2/f/h/a/c/a1/c0/b.smali
index 31ae2b44c0..bc53b306b9 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/c0/b.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/c0/b.smali
@@ -398,7 +398,7 @@
 
     const-string v10, "AtomParsers"
 
-    invoke-static {v9, v8, v10}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v9, v8, v10}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_5
     :goto_4
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/c0/d.smali b/com.discord/smali_classes2/f/h/a/c/a1/c0/d.smali
index bb649ecba7..288a842018 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/c0/d.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/c0/d.smali
@@ -391,7 +391,7 @@
 
     const-string v8, "PsshAtomUtil"
 
-    invoke-static {v6, v7, v8}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v6, v7, v8}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_1
 
@@ -1238,7 +1238,7 @@
 
     iget-object v10, v0, Lf/h/a/c/a1/c0/d;->G:[Lf/h/a/c/a1/s;
 
-    invoke-static {v13, v14, v5, v10}, Ld0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+    invoke-static {v13, v14, v5, v10}, Le0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
 
     goto :goto_9
 
@@ -1867,7 +1867,7 @@
 
     const-string v1, "Skipping unsupported emsg version: "
 
-    invoke-static {v1, v2, v9}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v2, v9}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto/16 :goto_18
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/c0/e.smali b/com.discord/smali_classes2/f/h/a/c/a1/c0/e.smali
index 5ae972732c..24199a5202 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/c0/e.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/c0/e.smali
@@ -522,7 +522,7 @@
 
     const-string p0, "Unrecognized cover art flags: "
 
-    invoke-static {p0, v1, v2}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, v1, v2}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     return-object v3
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/d0/b.smali b/com.discord/smali_classes2/f/h/a/c/a1/d0/b.smali
index bfbb064838..bf8b36b41e 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/d0/b.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/d0/b.smali
@@ -149,7 +149,7 @@
 
     iput-object p2, p0, Lf/h/a/c/a1/d0/b;->o:Lf/h/a/c/a1/d0/b$a;
 
-    invoke-static {p1}, Ld0/a/b/b/a;->K0(Lf/h/a/c/i1/t;)Lf/h/a/c/i1/m$a;
+    invoke-static {p1}, Le0/a/b/b/a;->K0(Lf/h/a/c/i1/t;)Lf/h/a/c/i1/m$a;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/d0/c.smali b/com.discord/smali_classes2/f/h/a/c/a1/d0/c.smali
index 04ba28d911..61f4feec05 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/d0/c.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/d0/c.smali
@@ -125,7 +125,7 @@
     invoke-virtual {v2, v3}, Lf/h/a/c/i1/t;->C(I)V
 
     :try_start_0
-    invoke-static {v1, v2, v1}, Ld0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
+    invoke-static {v1, v2, v1}, Le0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
 
     move-result p1
     :try_end_0
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/d0/i.smali b/com.discord/smali_classes2/f/h/a/c/a1/d0/i.smali
index 85b806ac94..45fcd042ed 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/d0/i.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/d0/i.smali
@@ -237,7 +237,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {v4, v1, v3}, Ld0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
+    invoke-static {v4, v1, v3}, Le0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
 
     invoke-virtual/range {p1 .. p1}, Lf/h/a/c/i1/t;->h()J
 
@@ -338,7 +338,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v1, v2, v2}, Ld0/a/b/b/a;->L0(Lf/h/a/c/i1/t;ZZ)Lf/h/a/c/a1/u;
+    invoke-static {v1, v2, v2}, Le0/a/b/b/a;->L0(Lf/h/a/c/i1/t;ZZ)Lf/h/a/c/a1/u;
 
     move-result-object v1
 
@@ -366,7 +366,7 @@
 
     const/4 v3, 0x5
 
-    invoke-static {v3, v1, v4}, Ld0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
+    invoke-static {v3, v1, v4}, Le0/a/b/b/a;->b1(ILf/h/a/c/i1/t;Z)Z
 
     invoke-virtual/range {p1 .. p1}, Lf/h/a/c/i1/t;->q()I
 
@@ -483,7 +483,7 @@
 
     sub-int v14, v9, v11
 
-    invoke-static {v14}, Ld0/a/b/b/a;->g0(I)I
+    invoke-static {v14}, Le0/a/b/b/a;->g0(I)I
 
     move-result v14
 
@@ -1113,13 +1113,13 @@
 
     add-int/lit8 v10, v2, -0x1
 
-    invoke-static {v10}, Ld0/a/b/b/a;->g0(I)I
+    invoke-static {v10}, Le0/a/b/b/a;->g0(I)I
 
     move-result v11
 
     invoke-virtual {v7, v11}, Lf/h/a/c/a1/t;->c(I)V
 
-    invoke-static {v10}, Ld0/a/b/b/a;->g0(I)I
+    invoke-static {v10}, Le0/a/b/b/a;->g0(I)I
 
     move-result v10
 
@@ -1241,7 +1241,7 @@
 
     add-int/lit8 v1, v1, -0x1
 
-    invoke-static {v1}, Ld0/a/b/b/a;->g0(I)I
+    invoke-static {v1}, Le0/a/b/b/a;->g0(I)I
 
     move-result v8
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/e0/b0.smali b/com.discord/smali_classes2/f/h/a/c/a1/e0/b0.smali
index 6219b9457a..3ff2fe3200 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/e0/b0.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/e0/b0.smali
@@ -356,7 +356,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-static {v1, v4, v6}, Ld0/a/b/b/a;->J0(Lf/h/a/c/i1/t;II)J
+    invoke-static {v1, v4, v6}, Le0/a/b/b/a;->J0(Lf/h/a/c/i1/t;II)J
 
     move-result-wide v10
 
@@ -454,7 +454,7 @@
     goto :goto_5
 
     :cond_9
-    invoke-static {v1, v2, v6}, Ld0/a/b/b/a;->J0(Lf/h/a/c/i1/t;II)J
+    invoke-static {v1, v2, v6}, Le0/a/b/b/a;->J0(Lf/h/a/c/i1/t;II)J
 
     move-result-wide v9
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/e0/k.smali b/com.discord/smali_classes2/f/h/a/c/a1/e0/k.smali
index 6ca4154a18..1c4ad42a34 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/e0/k.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/e0/k.smali
@@ -584,7 +584,7 @@
 
     iget-object v2, v2, Lf/h/a/c/a1/e0/d0;->b:[Lf/h/a/c/a1/s;
 
-    invoke-static {v8, v9, v10, v2}, Ld0/a/b/b/a;->q(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+    invoke-static {v8, v9, v10, v2}, Le0/a/b/b/a;->q(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
 
     goto :goto_8
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/e0/l.smali b/com.discord/smali_classes2/f/h/a/c/a1/e0/l.smali
index 6ea8f1c96c..a12e207dff 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/e0/l.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/e0/l.smali
@@ -1032,7 +1032,7 @@
 
     iget-object v2, v2, Lf/h/a/c/a1/e0/x;->b:[Lf/h/a/c/a1/s;
 
-    invoke-static {v10, v11, v3, v2}, Ld0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+    invoke-static {v10, v11, v3, v2}, Le0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
 
     :cond_8
     iget-object v2, v0, Lf/h/a/c/a1/e0/l;->k:Lf/h/a/c/a1/e0/l$b;
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/e0/m.smali b/com.discord/smali_classes2/f/h/a/c/a1/e0/m.smali
index 8d340d0c25..ef0d8745d1 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/e0/m.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/e0/m.smali
@@ -976,7 +976,7 @@
 
     const-string v6, "H265Reader"
 
-    invoke-static {v3, v2, v6}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v3, v2, v6}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_26
     const/high16 v2, 0x3f800000    # 1.0f
@@ -1069,7 +1069,7 @@
 
     iget-object v1, v1, Lf/h/a/c/a1/e0/x;->b:[Lf/h/a/c/a1/s;
 
-    invoke-static {v12, v13, v3, v1}, Ld0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+    invoke-static {v12, v13, v3, v1}, Le0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
 
     :cond_28
     iget-object v1, v0, Lf/h/a/c/a1/e0/m;->k:Lf/h/a/c/a1/e0/q;
@@ -1108,7 +1108,7 @@
 
     iget-object v1, v1, Lf/h/a/c/a1/e0/x;->b:[Lf/h/a/c/a1/s;
 
-    invoke-static {v12, v13, v2, v1}, Ld0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
+    invoke-static {v12, v13, v2, v1}, Le0/a/b/b/a;->p(JLf/h/a/c/i1/t;[Lf/h/a/c/a1/s;)V
 
     :cond_29
     iget-wide v1, v0, Lf/h/a/c/a1/e0/m;->m:J
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/e0/r.smali b/com.discord/smali_classes2/f/h/a/c/a1/e0/r.smali
index 4a011af16b..338e1ad566 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/e0/r.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/e0/r.smali
@@ -450,7 +450,7 @@
 
     const-string v2, "Unexpected start code prefix: "
 
-    invoke-static {v2, v0, v1}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v2, v0, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     const/4 v0, -0x1
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/e0/z$a.smali b/com.discord/smali_classes2/f/h/a/c/a1/e0/z$a.smali
index 5ba7624265..e1f2f8f3cd 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/e0/z$a.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/e0/z$a.smali
@@ -131,7 +131,7 @@
     :cond_1
     iget v6, v0, Lf/h/a/c/a1/e0/z$a;->c:I
 
-    invoke-static {v1, v14, v6}, Ld0/a/b/b/a;->J0(Lf/h/a/c/i1/t;II)J
+    invoke-static {v1, v14, v6}, Le0/a/b/b/a;->J0(Lf/h/a/c/i1/t;II)J
 
     move-result-wide v6
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/f0/a.smali b/com.discord/smali_classes2/f/h/a/c/a1/f0/a.smali
index 96b8e2f38b..5cfadfba3d 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/f0/a.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/f0/a.smali
@@ -72,7 +72,7 @@
 
     if-nez p2, :cond_8
 
-    invoke-static {p1}, Ld0/a/b/b/a;->y0(Lf/h/a/c/a1/e;)Lf/h/a/c/a1/f0/b;
+    invoke-static {p1}, Le0/a/b/b/a;->y0(Lf/h/a/c/a1/e;)Lf/h/a/c/a1/f0/b;
 
     move-result-object v5
 
@@ -505,7 +505,7 @@
         }
     .end annotation
 
-    invoke-static {p1}, Ld0/a/b/b/a;->y0(Lf/h/a/c/a1/e;)Lf/h/a/c/a1/f0/b;
+    invoke-static {p1}, Le0/a/b/b/a;->y0(Lf/h/a/c/a1/e;)Lf/h/a/c/a1/f0/b;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/y/b$b.smali b/com.discord/smali_classes2/f/h/a/c/a1/y/b$b.smali
index 65f3704692..0dc3823379 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/y/b$b.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/y/b$b.smali
@@ -215,7 +215,7 @@
 
     const/16 v12, 0xe
 
-    invoke-static {p1, v9, v3, v12}, Ld0/a/b/b/a;->A0(Lf/h/a/c/a1/e;[BII)I
+    invoke-static {p1, v9, v3, v12}, Le0/a/b/b/a;->A0(Lf/h/a/c/a1/e;[BII)I
 
     move-result v3
 
diff --git a/com.discord/smali_classes2/f/h/a/c/a1/y/c.smali b/com.discord/smali_classes2/f/h/a/c/a1/y/c.smali
index b06fc6169f..4ec2ed1fff 100644
--- a/com.discord/smali_classes2/f/h/a/c/a1/y/c.smali
+++ b/com.discord/smali_classes2/f/h/a/c/a1/y/c.smali
@@ -242,7 +242,7 @@
 
     iget-object v5, v2, Lf/h/a/c/i1/t;->a:[B
 
-    invoke-static {v1, v5, v4, v11}, Ld0/a/b/b/a;->A0(Lf/h/a/c/a1/e;[BII)I
+    invoke-static {v1, v5, v4, v11}, Le0/a/b/b/a;->A0(Lf/h/a/c/a1/e;[BII)I
 
     move-result v5
 
@@ -727,7 +727,7 @@
 
     invoke-virtual {v1, v12, v4, v5, v4}, Lf/h/a/c/a1/e;->h([BIIZ)Z
 
-    invoke-static {v11}, Ld0/a/b/b/a;->K0(Lf/h/a/c/i1/t;)Lf/h/a/c/i1/m$a;
+    invoke-static {v11}, Le0/a/b/b/a;->K0(Lf/h/a/c/i1/t;)Lf/h/a/c/i1/m$a;
 
     move-result-object v5
 
@@ -753,7 +753,7 @@
 
     invoke-virtual {v11, v10}, Lf/h/a/c/i1/t;->D(I)V
 
-    invoke-static {v11, v4, v4}, Ld0/a/b/b/a;->L0(Lf/h/a/c/i1/t;ZZ)Lf/h/a/c/a1/u;
+    invoke-static {v11, v4, v4}, Le0/a/b/b/a;->L0(Lf/h/a/c/i1/t;ZZ)Lf/h/a/c/a1/u;
 
     move-result-object v5
 
@@ -1133,7 +1133,7 @@
 
     move-result-wide v5
 
-    invoke-static {v0, v2}, Ld0/a/b/b/a;->z0(Lf/h/a/c/a1/e;Z)Lcom/google/android/exoplayer2/metadata/Metadata;
+    invoke-static {v0, v2}, Le0/a/b/b/a;->z0(Lf/h/a/c/a1/e;Z)Lcom/google/android/exoplayer2/metadata/Metadata;
 
     move-result-object v2
 
@@ -1230,7 +1230,7 @@
 
     const/4 v0, 0x0
 
-    invoke-static {p1, v0}, Ld0/a/b/b/a;->z0(Lf/h/a/c/a1/e;Z)Lcom/google/android/exoplayer2/metadata/Metadata;
+    invoke-static {p1, v0}, Le0/a/b/b/a;->z0(Lf/h/a/c/a1/e;Z)Lcom/google/android/exoplayer2/metadata/Metadata;
 
     const/4 v1, 0x4
 
diff --git a/com.discord/smali_classes2/f/h/a/c/c1/i/b.smali b/com.discord/smali_classes2/f/h/a/c/c1/i/b.smali
index 5d60c21bac..0fc19d123f 100644
--- a/com.discord/smali_classes2/f/h/a/c/c1/i/b.smali
+++ b/com.discord/smali_classes2/f/h/a/c/c1/i/b.smali
@@ -2599,7 +2599,7 @@
     :cond_b
     const-string v8, "Skipped ID3 tag with unsupported majorVersion="
 
-    invoke-static {v8, p1, v5}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v8, p1, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     :goto_6
     move-object v10, v7
diff --git a/com.discord/smali_classes2/f/h/a/c/e1/l/c.smali b/com.discord/smali_classes2/f/h/a/c/e1/l/c.smali
index bbf8917c7c..8edd93562e 100644
--- a/com.discord/smali_classes2/f/h/a/c/e1/l/c.smali
+++ b/com.discord/smali_classes2/f/h/a/c/e1/l/c.smali
@@ -478,7 +478,7 @@
 
     const-string v7, "Invalid extended service number: "
 
-    invoke-static {v7, v0, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v7, v0, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_2
     if-nez v2, :cond_3
@@ -568,7 +568,7 @@
 
     const-string v1, "Currently unsupported COMMAND_EXT1 Command: "
 
-    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     iget-object v1, p0, Lf/h/a/c/e1/l/c;->h:Lf/h/a/c/i1/s;
 
@@ -595,7 +595,7 @@
 
     const-string v1, "Currently unsupported COMMAND_P16 Command: "
 
-    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     iget-object v1, p0, Lf/h/a/c/e1/l/c;->h:Lf/h/a/c/i1/s;
 
@@ -606,7 +606,7 @@
     :cond_6
     const-string v1, "Invalid C0 command: "
 
-    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto/16 :goto_9
 
@@ -1407,7 +1407,7 @@
     :cond_1c
     const-string v1, "Invalid base command: "
 
-    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v2, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto/16 :goto_9
 
@@ -1506,7 +1506,7 @@
 
     const-string v0, "Invalid G2 character: "
 
-    invoke-static {v0, v1, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v0, v1, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto/16 :goto_8
 
@@ -1811,7 +1811,7 @@
     :cond_30
     const-string v0, "Invalid G3 character: "
 
-    invoke-static {v0, v1, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v0, v1, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     iget-object v0, p0, Lf/h/a/c/e1/l/c;->k:Lf/h/a/c/e1/l/c$a;
 
@@ -1829,7 +1829,7 @@
     :cond_32
     const-string v2, "Invalid extended command: "
 
-    invoke-static {v2, v1, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v2, v1, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_33
     :goto_9
diff --git a/com.discord/smali_classes2/f/h/a/c/e1/o/a.smali b/com.discord/smali_classes2/f/h/a/c/e1/o/a.smali
index a7b36b1475..855089a8eb 100644
--- a/com.discord/smali_classes2/f/h/a/c/e1/o/a.smali
+++ b/com.discord/smali_classes2/f/h/a/c/e1/o/a.smali
@@ -443,7 +443,7 @@
 
     const-string v6, "Skipping dialogue line before complete format: "
 
-    invoke-static {v6, v5, v7}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, v5, v7}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_d
 
@@ -476,7 +476,7 @@
 
     const-string v6, "Skipping dialogue line with fewer columns than format: "
 
-    invoke-static {v6, v5, v7}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, v5, v7}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_d
 
@@ -497,7 +497,7 @@
 
     if-nez v13, :cond_5
 
-    invoke-static {v10, v5, v7}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v10, v5, v7}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_d
 
@@ -514,7 +514,7 @@
 
     if-nez v15, :cond_6
 
-    invoke-static {v10, v5, v7}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v10, v5, v7}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_d
 
@@ -1263,7 +1263,7 @@
 
     const-string v0, "Skipping \'Style:\' line before \'Format:\' line: "
 
-    invoke-static {v0, v11, v8}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v11, v8}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_4
 
diff --git a/com.discord/smali_classes2/f/h/a/c/e1/o/c.smali b/com.discord/smali_classes2/f/h/a/c/e1/o/c.smali
index 6014c7713a..684178dfc2 100644
--- a/com.discord/smali_classes2/f/h/a/c/e1/o/c.smali
+++ b/com.discord/smali_classes2/f/h/a/c/e1/o/c.smali
@@ -65,7 +65,7 @@
 
     const-string v1, "SsaStyle"
 
-    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/4 p0, -0x1
 
diff --git a/com.discord/smali_classes2/f/h/a/c/e1/p/a.smali b/com.discord/smali_classes2/f/h/a/c/e1/p/a.smali
index 971494da38..83d2602d02 100644
--- a/com.discord/smali_classes2/f/h/a/c/e1/p/a.smali
+++ b/com.discord/smali_classes2/f/h/a/c/e1/p/a.smali
@@ -818,7 +818,7 @@
 
     const-string v0, "Skipping invalid timing: "
 
-    invoke-static {v0, v7, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v7, v1}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_c
 
@@ -827,7 +827,7 @@
 
     const-string v0, "Skipping invalid index: "
 
-    invoke-static {v0, v7, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v7, v1}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_c
     const/4 v5, 0x0
diff --git a/com.discord/smali_classes2/f/h/a/c/e1/q/a.smali b/com.discord/smali_classes2/f/h/a/c/e1/q/a.smali
index 1dfb479bb7..d72e73e285 100644
--- a/com.discord/smali_classes2/f/h/a/c/e1/q/a.smali
+++ b/com.discord/smali_classes2/f/h/a/c/e1/q/a.smali
@@ -1285,7 +1285,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {v2, p1, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, p1, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object p2
 
@@ -1351,7 +1351,7 @@
     .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    invoke-static {v2, p1, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, p1, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object p2
 .end method
@@ -1674,7 +1674,7 @@
     goto :goto_1
 
     :catch_0
-    invoke-static {v10, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v10, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_6
 
@@ -1687,7 +1687,7 @@
 
     if-nez v3, :cond_6
 
-    invoke-static {v11, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v11, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_6
 
@@ -1792,7 +1792,7 @@
     goto :goto_2
 
     :catch_1
-    invoke-static {v15, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v15, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_6
 
@@ -1805,7 +1805,7 @@
 
     if-nez v3, :cond_8
 
-    invoke-static {v11, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v11, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_6
 
@@ -1974,14 +1974,14 @@
     goto :goto_7
 
     :catch_2
-    invoke-static {v15, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v15, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_6
 
     :cond_f
     const-string v6, "Ignoring region with unsupported extent: "
 
-    invoke-static {v6, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_6
 
@@ -1993,14 +1993,14 @@
     goto :goto_6
 
     :catch_3
-    invoke-static {v10, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v10, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_6
 
     :cond_11
     const-string v6, "Ignoring region with unsupported origin: "
 
-    invoke-static {v6, v4, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, v4, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_6
 
@@ -2922,7 +2922,7 @@
     :catch_0
     const-string v4, "Failed parsing fontSize value: "
 
-    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_5
 
@@ -2960,7 +2960,7 @@
     :catch_1
     const-string v4, "Failed parsing color value: "
 
-    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_5
 
@@ -2985,7 +2985,7 @@
     :catch_2
     const-string v4, "Failed parsing background value: "
 
-    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v4, v3, v5}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_5
 
@@ -3123,7 +3123,7 @@
 
     const-string v1, "Ignoring non-pixel tts extent: "
 
-    invoke-static {v1, p1, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, p1, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
 
@@ -3160,7 +3160,7 @@
     :catch_0
     const-string v1, "Ignoring malformed tts extent: "
 
-    invoke-static {v1, p1, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, p1, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/c/e1/s/e$b.smali b/com.discord/smali_classes2/f/h/a/c/e1/s/e$b.smali
index 3329afe3c1..9d3222aa83 100644
--- a/com.discord/smali_classes2/f/h/a/c/e1/s/e$b.smali
+++ b/com.discord/smali_classes2/f/h/a/c/e1/s/e$b.smali
@@ -254,7 +254,7 @@
 
     const-string v4, "WebvttCueBuilder"
 
-    invoke-static {v3, v2, v4}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v3, v2, v4}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali_classes2/f/h/a/c/e1/s/f.smali b/com.discord/smali_classes2/f/h/a/c/e1/s/f.smali
index 9ed1b5704c..ab050b8cba 100644
--- a/com.discord/smali_classes2/f/h/a/c/e1/s/f.smali
+++ b/com.discord/smali_classes2/f/h/a/c/e1/s/f.smali
@@ -1816,7 +1816,7 @@
 
     const-string v1, "WebvttCueParser"
 
-    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/high16 p0, -0x80000000
 
@@ -1960,7 +1960,7 @@
 
     const-string v1, "WebvttCueParser"
 
-    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return v5
 
diff --git a/com.discord/smali_classes2/f/h/a/c/h1/y/f.smali b/com.discord/smali_classes2/f/h/a/c/h1/y/f.smali
index 1a935d4f70..e4599d75c4 100644
--- a/com.discord/smali_classes2/f/h/a/c/h1/y/f.smali
+++ b/com.discord/smali_classes2/f/h/a/c/h1/y/f.smali
@@ -230,7 +230,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {p2, v0, p1}, Ld0/a/b/b/a;->Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
+    invoke-static {p2, v0, p1}, Le0/a/b/b/a;->Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
 
     move-result p2
 
@@ -249,7 +249,7 @@
     .catch Landroid/database/SQLException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    invoke-static {p2, v0, p1, v1}, Ld0/a/b/b/a;->S0(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;I)V
+    invoke-static {p2, v0, p1, v1}, Le0/a/b/b/a;->S0(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;I)V
 
     iget-object p1, p0, Lf/h/a/c/h1/y/f;->b:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/f/h/a/c/h1/y/k$a.smali b/com.discord/smali_classes2/f/h/a/c/h1/y/k$a.smali
index 4dbdb95bf8..302118c9d4 100644
--- a/com.discord/smali_classes2/f/h/a/c/h1/y/k$a.smali
+++ b/com.discord/smali_classes2/f/h/a/c/h1/y/k$a.smali
@@ -222,7 +222,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {v0, v2, v1}, Ld0/a/b/b/a;->Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
+    invoke-static {v0, v2, v1}, Le0/a/b/b/a;->Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
 
     move-result v0
 
@@ -443,7 +443,7 @@
 
     iget-object v3, p0, Lf/h/a/c/h1/y/k$a;->c:Ljava/lang/String;
 
-    invoke-static {v0, v2, v3}, Ld0/a/b/b/a;->Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
+    invoke-static {v0, v2, v3}, Le0/a/b/b/a;->Z(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;)I
 
     move-result v0
 
@@ -653,7 +653,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-static {v0, v3}, Ld0/a/b/b/a;->V0(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
+    invoke-static {v0, v3}, Le0/a/b/b/a;->V0(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;)Z
 
     move-result v4
 
@@ -815,7 +815,7 @@
 
     const/4 v1, 0x1
 
-    invoke-static {p1, v1, v0, v1}, Ld0/a/b/b/a;->S0(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;I)V
+    invoke-static {p1, v1, v0, v1}, Le0/a/b/b/a;->S0(Landroid/database/sqlite/SQLiteDatabase;ILjava/lang/String;I)V
 
     iget-object v0, p0, Lf/h/a/c/h1/y/k$a;->d:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/f/h/a/c/h1/y/r.smali b/com.discord/smali_classes2/f/h/a/c/h1/y/r.smali
index 15d3404e94..823f6559a4 100644
--- a/com.discord/smali_classes2/f/h/a/c/h1/y/r.smali
+++ b/com.discord/smali_classes2/f/h/a/c/h1/y/r.smali
@@ -1740,7 +1740,7 @@
 
     const-string v3, "SimpleCache"
 
-    invoke-static {v2, v1, v3}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v1, v3}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_2
     :goto_1
diff --git a/com.discord/smali_classes2/f/h/a/c/i1/e.smali b/com.discord/smali_classes2/f/h/a/c/i1/e.smali
index 7bfdac6a78..4a2a34e8e2 100644
--- a/com.discord/smali_classes2/f/h/a/c/i1/e.smali
+++ b/com.discord/smali_classes2/f/h/a/c/i1/e.smali
@@ -277,7 +277,7 @@
 
     const-string v2, "Overread allowed size end="
 
-    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -5699,7 +5699,7 @@
 
     const-string v1, "unknown status code: "
 
-    invoke-static {v0, v1, p0}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v1, p0}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p0
 
@@ -5844,7 +5844,7 @@
 
     const-string v1, "negative size: "
 
-    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -8142,7 +8142,7 @@
 
     const-string v1, "negative size: "
 
-    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -8810,7 +8810,7 @@
 
     const-string v0, "negative size: "
 
-    invoke-static {p2, v0, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {p2, v0, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -9443,9 +9443,11 @@
 .end method
 
 .method public static final b1([F)[F
-    .locals 0
+    .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "matrix"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Object;->clone()Ljava/lang/Object;
 
@@ -9454,15 +9456,6 @@
     check-cast p0, [F
 
     return-object p0
-
-    :cond_0
-    const-string p0, "matrix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static b2(Lf/h/a/f/h/k/t7;I[BIILf/h/a/f/h/k/f6;Lf/h/a/f/h/k/t4;)I
@@ -13690,7 +13683,7 @@
 
     const-string v3, "Out of bound index with offput: 0 and length: "
 
-    invoke-static {v2, v3, v0}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v2, v3, v0}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -15950,7 +15943,7 @@
 
     const-string v1, "at index "
 
-    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
@@ -16228,7 +16221,7 @@
 
     const-string v0, "negative size: "
 
-    invoke-static {p2, v0, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {p2, v0, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/h/a/c/i1/m.smali b/com.discord/smali_classes2/f/h/a/c/i1/m.smali
index 2d795b8c4a..2d291593a9 100644
--- a/com.discord/smali_classes2/f/h/a/c/i1/m.smali
+++ b/com.discord/smali_classes2/f/h/a/c/i1/m.smali
@@ -280,7 +280,7 @@
 
     const-string v6, "FlacStreamMetadata"
 
-    invoke-static {v5, v4, v6}, Lf/e/b/a/a;->Q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v5, v4, v6}, Lf/e/b/a/a;->S(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_1
 
diff --git a/com.discord/smali_classes2/f/h/a/c/i1/r.smali b/com.discord/smali_classes2/f/h/a/c/i1/r.smali
index 0aa81384a5..17611a523c 100644
--- a/com.discord/smali_classes2/f/h/a/c/i1/r.smali
+++ b/com.discord/smali_classes2/f/h/a/c/i1/r.smali
@@ -960,7 +960,7 @@
 
     const-string v1, "NalUnitUtil"
 
-    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_14
     const/high16 v0, 0x3f800000    # 1.0f
diff --git a/com.discord/smali_classes2/f/h/a/c/r.smali b/com.discord/smali_classes2/f/h/a/c/r.smali
index 0a0109f3ac..dbbf2e8e54 100644
--- a/com.discord/smali_classes2/f/h/a/c/r.smali
+++ b/com.discord/smali_classes2/f/h/a/c/r.smali
@@ -94,7 +94,7 @@
 
     const-string v0, "AudioFocusManager"
 
-    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->O(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->Q(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_3
 
diff --git a/com.discord/smali_classes2/f/h/a/c/w0/u.smali b/com.discord/smali_classes2/f/h/a/c/w0/u.smali
index 4ddbc03527..17f022342e 100644
--- a/com.discord/smali_classes2/f/h/a/c/w0/u.smali
+++ b/com.discord/smali_classes2/f/h/a/c/w0/u.smali
@@ -702,11 +702,11 @@
 
     iget-object p1, p3, Lcom/google/android/exoplayer2/Format;->n:Ljava/util/List;
 
-    invoke-static {v1, p1}, Ld0/a/b/b/a;->Q0(Landroid/media/MediaFormat;Ljava/util/List;)V
+    invoke-static {v1, p1}, Le0/a/b/b/a;->Q0(Landroid/media/MediaFormat;Ljava/util/List;)V
 
     const-string p1, "max-input-size"
 
-    invoke-static {v1, p1, v0}, Ld0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
+    invoke-static {v1, p1, v0}, Le0/a/b/b/a;->p0(Landroid/media/MediaFormat;Ljava/lang/String;I)V
 
     sget p1, Lf/h/a/c/i1/c0;->a:I
 
diff --git a/com.discord/smali_classes2/f/h/a/f/b/f$b.smali b/com.discord/smali_classes2/f/h/a/f/b/f$b.smali
index 37a14fff45..184af1c34a 100644
--- a/com.discord/smali_classes2/f/h/a/f/b/f$b.smali
+++ b/com.discord/smali_classes2/f/h/a/f/b/f$b.smali
@@ -56,7 +56,7 @@
 
     const-string v2, "measurement-"
 
-    invoke-static {v1, v2, v0}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, v0}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/f/e/k/b$g.smali b/com.discord/smali_classes2/f/h/a/f/e/k/b$g.smali
index 08a00c0fd8..6ca8b441d3 100644
--- a/com.discord/smali_classes2/f/h/a/f/e/k/b$g.smali
+++ b/com.discord/smali_classes2/f/h/a/f/e/k/b$g.smali
@@ -463,7 +463,7 @@
 
     const-string v2, "Don\'t know how to handle message: "
 
-    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/h/a/f/e/k/g$a.smali b/com.discord/smali_classes2/f/h/a/f/e/k/g$a.smali
index 3328e26280..6f2f7aba13 100644
--- a/com.discord/smali_classes2/f/h/a/f/e/k/g$a.smali
+++ b/com.discord/smali_classes2/f/h/a/f/e/k/g$a.smali
@@ -151,7 +151,7 @@
 
     const-string v3, "Dynamic intent resolution failed: "
 
-    invoke-static {v2, v3, p1, v0}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v3, p1, v0}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     move-object p1, v1
 
diff --git a/com.discord/smali_classes2/f/h/a/f/f/b.smali b/com.discord/smali_classes2/f/h/a/f/f/b.smali
index 14795081b9..2f80418b96 100644
--- a/com.discord/smali_classes2/f/h/a/f/f/b.smali
+++ b/com.discord/smali_classes2/f/h/a/f/f/b.smali
@@ -166,7 +166,7 @@
 
     const-string v2, "Unexpected number of IObjectWrapper declared fields: "
 
-    invoke-static {v1, v2, v0}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, v0}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/c/z3.smali b/com.discord/smali_classes2/f/h/a/f/h/c/z3.smali
index 4e47c24b9d..b50653074d 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/c/z3.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/c/z3.smali
@@ -131,7 +131,7 @@
 
     const-string v1, "Unpaired surrogate at index "
 
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -698,7 +698,7 @@
 
     add-int/lit8 v6, v6, -0x1
 
-    invoke-static {v2, v1, v6}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v2, v1, v6}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/f/j.smali b/com.discord/smali_classes2/f/h/a/f/h/f/j.smali
index 0bad05ee1a..fffd9aaba7 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/f/j.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/f/j.smali
@@ -429,7 +429,7 @@
 
     check-cast v3, Ljava/lang/Long;
 
-    invoke-static {v3, v2, v1, v0}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v3, v2, v1, v0}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/f/k0.smali b/com.discord/smali_classes2/f/h/a/f/h/f/k0.smali
index dcec656643..6c6eea50ee 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/f/k0.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/f/k0.smali
@@ -309,29 +309,29 @@
 
     if-eqz p1, :cond_4
 
-    invoke-static {p1}, Ln0/w;->h(Ljava/lang/String;)Ln0/w;
+    invoke-static {p1}, Lo0/w;->h(Ljava/lang/String;)Lo0/w;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Ln0/w;->f()Ln0/w$a;
+    invoke-virtual {v0}, Lo0/w;->f()Lo0/w$a;
 
     move-result-object p1
 
     const-string v0, ""
 
-    invoke-virtual {p1, v0}, Ln0/w$a;->g(Ljava/lang/String;)Ln0/w$a;
+    invoke-virtual {p1, v0}, Lo0/w$a;->g(Ljava/lang/String;)Lo0/w$a;
 
-    invoke-virtual {p1, v0}, Ln0/w$a;->f(Ljava/lang/String;)Ln0/w$a;
+    invoke-virtual {p1, v0}, Lo0/w$a;->f(Ljava/lang/String;)Lo0/w$a;
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Ln0/w$a;->g:Ljava/util/List;
+    iput-object v0, p1, Lo0/w$a;->g:Ljava/util/List;
 
-    iput-object v0, p1, Ln0/w$a;->h:Ljava/lang/String;
+    iput-object v0, p1, Lo0/w$a;->h:Ljava/lang/String;
 
-    invoke-virtual {p1}, Ln0/w$a;->toString()Ljava/lang/String;
+    invoke-virtual {p1}, Lo0/w$a;->toString()Ljava/lang/String;
 
     move-result-object p1
 
@@ -359,13 +359,13 @@
 
     if-eq v1, v4, :cond_2
 
-    invoke-static {p1}, Ln0/w;->h(Ljava/lang/String;)Ln0/w;
+    invoke-static {p1}, Lo0/w;->h(Ljava/lang/String;)Lo0/w;
 
     move-result-object v1
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v1}, Ln0/w;->b()Ljava/lang/String;
+    invoke-virtual {v1}, Lo0/w;->b()Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/f/x2.smali b/com.discord/smali_classes2/f/h/a/f/h/f/x2.smali
index d721c08e82..ad70c1ab0f 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/f/x2.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/f/x2.smali
@@ -51,7 +51,7 @@
 
     const-string v2, "Index < 0: "
 
-    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/f/x6.smali b/com.discord/smali_classes2/f/h/a/f/h/f/x6.smali
index ab5f1e5b2e..bbb7491205 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/f/x6.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/f/x6.smali
@@ -138,7 +138,7 @@
 
     const-string v2, "at index "
 
-    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/k/i3.smali b/com.discord/smali_classes2/f/h/a/f/h/k/i3.smali
index bac48334f2..6b2d1e2f94 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/k/i3.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/k/i3.smali
@@ -205,7 +205,7 @@
 
     const-string v2, "must be power of 2 between 2^1 and 2^30: "
 
-    invoke-static {v1, v2, p0}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, p0}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/k/y4.smali b/com.discord/smali_classes2/f/h/a/f/h/k/y4.smali
index 5c980ef301..82ca3a0ac7 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/k/y4.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/k/y4.smali
@@ -51,7 +51,7 @@
 
     const-string v2, "Index < 0: "
 
-    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, p1}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/f/h/a/f/h/l/e.smali b/com.discord/smali_classes2/f/h/a/f/h/l/e.smali
index 8b85213489..31536c6a89 100644
--- a/com.discord/smali_classes2/f/h/a/f/h/l/e.smali
+++ b/com.discord/smali_classes2/f/h/a/f/h/l/e.smali
@@ -449,7 +449,7 @@
 
     const-string v2, "uuidBytes length invalid - "
 
-    invoke-static {v1, v2, v0}, Lf/e/b/a/a;->Y(ILjava/lang/String;I)Ljava/lang/String;
+    invoke-static {v1, v2, v0}, Lf/e/b/a/a;->a0(ILjava/lang/String;I)Ljava/lang/String;
 
     move-result-object v0
 
@@ -868,7 +868,7 @@
 
     const-string v1, ", mServiceData="
 
-    invoke-static {v6, v0, v2, v1, v10}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, v0, v2, v1, v10}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v0, ", mTxPowerLevel="
 
diff --git a/com.discord/smali_classes2/f/h/a/g/e/d.smali b/com.discord/smali_classes2/f/h/a/g/e/d.smali
index 125d0cf401..01fcd5cb7f 100644
--- a/com.discord/smali_classes2/f/h/a/g/e/d.smali
+++ b/com.discord/smali_classes2/f/h/a/g/e/d.smali
@@ -4,24 +4,24 @@
 
 
 # instance fields
-.field public d:Z
+.field public a:Z
 
-.field public final synthetic e:Z
+.field public final synthetic b:Z
 
-.field public final synthetic f:Lf/h/a/g/e/f$f;
+.field public final synthetic c:Lf/h/a/g/e/f$f;
 
-.field public final synthetic g:Lf/h/a/g/e/f;
+.field public final synthetic d:Lf/h/a/g/e/f;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/e/f;ZLf/h/a/g/e/f$f;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/e/d;->g:Lf/h/a/g/e/f;
+    iput-object p1, p0, Lf/h/a/g/e/d;->d:Lf/h/a/g/e/f;
 
-    iput-boolean p2, p0, Lf/h/a/g/e/d;->e:Z
+    iput-boolean p2, p0, Lf/h/a/g/e/d;->b:Z
 
-    iput-object p3, p0, Lf/h/a/g/e/d;->f:Lf/h/a/g/e/f$f;
+    iput-object p3, p0, Lf/h/a/g/e/d;->c:Lf/h/a/g/e/f$f;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -35,7 +35,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lf/h/a/g/e/d;->d:Z
+    iput-boolean p1, p0, Lf/h/a/g/e/d;->a:Z
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lf/h/a/g/e/d;->g:Lf/h/a/g/e/f;
+    iget-object p1, p0, Lf/h/a/g/e/d;->d:Lf/h/a/g/e/f;
 
     const/4 v0, 0x0
 
@@ -53,13 +53,13 @@
 
     iput-object v0, p1, Lf/h/a/g/e/f;->o:Landroid/animation/Animator;
 
-    iget-boolean v0, p0, Lf/h/a/g/e/d;->d:Z
+    iget-boolean v0, p0, Lf/h/a/g/e/d;->a:Z
 
     if-nez v0, :cond_1
 
     iget-object p1, p1, Lf/h/a/g/e/f;->y:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iget-boolean v0, p0, Lf/h/a/g/e/d;->e:Z
+    iget-boolean v0, p0, Lf/h/a/g/e/d;->b:Z
 
     if-eqz v0, :cond_0
 
@@ -71,11 +71,11 @@
     const/4 v0, 0x4
 
     :goto_0
-    iget-boolean v1, p0, Lf/h/a/g/e/d;->e:Z
+    iget-boolean v1, p0, Lf/h/a/g/e/d;->b:Z
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->internalSetVisibility(IZ)V
 
-    iget-object p1, p0, Lf/h/a/g/e/d;->f:Lf/h/a/g/e/f$f;
+    iget-object p1, p0, Lf/h/a/g/e/d;->c:Lf/h/a/g/e/f$f;
 
     if-eqz p1, :cond_1
 
@@ -94,17 +94,17 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 3
 
-    iget-object v0, p0, Lf/h/a/g/e/d;->g:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/d;->d:Lf/h/a/g/e/f;
 
     iget-object v0, v0, Lf/h/a/g/e/f;->y:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iget-boolean v1, p0, Lf/h/a/g/e/d;->e:Z
+    iget-boolean v1, p0, Lf/h/a/g/e/d;->b:Z
 
     const/4 v2, 0x0
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->internalSetVisibility(IZ)V
 
-    iget-object v0, p0, Lf/h/a/g/e/d;->g:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/d;->d:Lf/h/a/g/e/f;
 
     const/4 v1, 0x1
 
@@ -112,7 +112,7 @@
 
     iput-object p1, v0, Lf/h/a/g/e/f;->o:Landroid/animation/Animator;
 
-    iput-boolean v2, p0, Lf/h/a/g/e/d;->d:Z
+    iput-boolean v2, p0, Lf/h/a/g/e/d;->a:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/h/a/g/e/e.smali b/com.discord/smali_classes2/f/h/a/g/e/e.smali
index ded05e1d41..7ce52684c7 100644
--- a/com.discord/smali_classes2/f/h/a/g/e/e.smali
+++ b/com.discord/smali_classes2/f/h/a/g/e/e.smali
@@ -4,22 +4,22 @@
 
 
 # instance fields
-.field public final synthetic d:Z
+.field public final synthetic a:Z
 
-.field public final synthetic e:Lf/h/a/g/e/f$f;
+.field public final synthetic b:Lf/h/a/g/e/f$f;
 
-.field public final synthetic f:Lf/h/a/g/e/f;
+.field public final synthetic c:Lf/h/a/g/e/f;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/e/f;ZLf/h/a/g/e/f$f;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/e/e;->f:Lf/h/a/g/e/f;
+    iput-object p1, p0, Lf/h/a/g/e/e;->c:Lf/h/a/g/e/f;
 
-    iput-boolean p2, p0, Lf/h/a/g/e/e;->d:Z
+    iput-boolean p2, p0, Lf/h/a/g/e/e;->a:Z
 
-    iput-object p3, p0, Lf/h/a/g/e/e;->e:Lf/h/a/g/e/f$f;
+    iput-object p3, p0, Lf/h/a/g/e/e;->b:Lf/h/a/g/e/f$f;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -31,7 +31,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/h/a/g/e/e;->f:Lf/h/a/g/e/f;
+    iget-object p1, p0, Lf/h/a/g/e/e;->c:Lf/h/a/g/e/f;
 
     const/4 v0, 0x0
 
@@ -41,7 +41,7 @@
 
     iput-object v0, p1, Lf/h/a/g/e/f;->o:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lf/h/a/g/e/e;->e:Lf/h/a/g/e/f$f;
+    iget-object p1, p0, Lf/h/a/g/e/e;->b:Lf/h/a/g/e/f$f;
 
     if-eqz p1, :cond_0
 
@@ -60,17 +60,17 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 3
 
-    iget-object v0, p0, Lf/h/a/g/e/e;->f:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/e;->c:Lf/h/a/g/e/f;
 
     iget-object v0, v0, Lf/h/a/g/e/f;->y:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iget-boolean v1, p0, Lf/h/a/g/e/e;->d:Z
+    iget-boolean v1, p0, Lf/h/a/g/e/e;->a:Z
 
     const/4 v2, 0x0
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->internalSetVisibility(IZ)V
 
-    iget-object v0, p0, Lf/h/a/g/e/e;->f:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/e;->c:Lf/h/a/g/e/f;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/f/h/a/g/e/f$c.smali b/com.discord/smali_classes2/f/h/a/g/e/f$c.smali
index 9bcb31a866..56630952d1 100644
--- a/com.discord/smali_classes2/f/h/a/g/e/f$c.smali
+++ b/com.discord/smali_classes2/f/h/a/g/e/f$c.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic h:Lf/h/a/g/e/f;
+.field public final synthetic e:Lf/h/a/g/e/f;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/e/f;)V
     .locals 1
 
-    iput-object p1, p0, Lf/h/a/g/e/f$c;->h:Lf/h/a/g/e/f;
+    iput-object p1, p0, Lf/h/a/g/e/f$c;->e:Lf/h/a/g/e/f;
 
     const/4 v0, 0x0
 
@@ -36,7 +36,7 @@
 .method public a()F
     .locals 2
 
-    iget-object v0, p0, Lf/h/a/g/e/f$c;->h:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/f$c;->e:Lf/h/a/g/e/f;
 
     iget v1, v0, Lf/h/a/g/e/f;->h:F
 
diff --git a/com.discord/smali_classes2/f/h/a/g/e/f$d.smali b/com.discord/smali_classes2/f/h/a/g/e/f$d.smali
index 1d612c7ca7..931e79478a 100644
--- a/com.discord/smali_classes2/f/h/a/g/e/f$d.smali
+++ b/com.discord/smali_classes2/f/h/a/g/e/f$d.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic h:Lf/h/a/g/e/f;
+.field public final synthetic e:Lf/h/a/g/e/f;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/e/f;)V
     .locals 1
 
-    iput-object p1, p0, Lf/h/a/g/e/f$d;->h:Lf/h/a/g/e/f;
+    iput-object p1, p0, Lf/h/a/g/e/f$d;->e:Lf/h/a/g/e/f;
 
     const/4 v0, 0x0
 
@@ -36,7 +36,7 @@
 .method public a()F
     .locals 2
 
-    iget-object v0, p0, Lf/h/a/g/e/f$d;->h:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/f$d;->e:Lf/h/a/g/e/f;
 
     iget v1, v0, Lf/h/a/g/e/f;->h:F
 
diff --git a/com.discord/smali_classes2/f/h/a/g/e/f$g.smali b/com.discord/smali_classes2/f/h/a/g/e/f$g.smali
index 74e8037c52..05ec5fa008 100644
--- a/com.discord/smali_classes2/f/h/a/g/e/f$g.smali
+++ b/com.discord/smali_classes2/f/h/a/g/e/f$g.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic h:Lf/h/a/g/e/f;
+.field public final synthetic e:Lf/h/a/g/e/f;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/e/f;)V
     .locals 1
 
-    iput-object p1, p0, Lf/h/a/g/e/f$g;->h:Lf/h/a/g/e/f;
+    iput-object p1, p0, Lf/h/a/g/e/f$g;->e:Lf/h/a/g/e/f;
 
     const/4 v0, 0x0
 
@@ -36,7 +36,7 @@
 .method public a()F
     .locals 1
 
-    iget-object v0, p0, Lf/h/a/g/e/f$g;->h:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/f$g;->e:Lf/h/a/g/e/f;
 
     iget v0, v0, Lf/h/a/g/e/f;->h:F
 
diff --git a/com.discord/smali_classes2/f/h/a/g/e/f$h.smali b/com.discord/smali_classes2/f/h/a/g/e/f$h.smali
index 849c305d6e..fb583f4182 100644
--- a/com.discord/smali_classes2/f/h/a/g/e/f$h.smali
+++ b/com.discord/smali_classes2/f/h/a/g/e/f$h.smali
@@ -18,20 +18,20 @@
 
 
 # instance fields
-.field public d:Z
+.field public a:Z
 
-.field public e:F
+.field public b:F
 
-.field public f:F
+.field public c:F
 
-.field public final synthetic g:Lf/h/a/g/e/f;
+.field public final synthetic d:Lf/h/a/g/e/f;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/e/f;Lf/h/a/g/e/d;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/e/f$h;->g:Lf/h/a/g/e/f;
+    iput-object p1, p0, Lf/h/a/g/e/f$h;->d:Lf/h/a/g/e/f;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -46,9 +46,9 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/h/a/g/e/f$h;->g:Lf/h/a/g/e/f;
+    iget-object p1, p0, Lf/h/a/g/e/f$h;->d:Lf/h/a/g/e/f;
 
-    iget v0, p0, Lf/h/a/g/e/f$h;->f:F
+    iget v0, p0, Lf/h/a/g/e/f$h;->c:F
 
     float-to-int v0, v0
 
@@ -58,7 +58,7 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lf/h/a/g/e/f$h;->d:Z
+    iput-boolean p1, p0, Lf/h/a/g/e/f$h;->a:Z
 
     return-void
 .end method
@@ -70,11 +70,11 @@
         .end annotation
     .end param
 
-    iget-boolean v0, p0, Lf/h/a/g/e/f$h;->d:Z
+    iget-boolean v0, p0, Lf/h/a/g/e/f$h;->a:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lf/h/a/g/e/f$h;->g:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/f$h;->d:Lf/h/a/g/e/f;
 
     iget-object v0, v0, Lf/h/a/g/e/f;->b:Lcom/google/android/material/shape/MaterialShapeDrawable;
 
@@ -90,24 +90,24 @@
     move-result v0
 
     :goto_0
-    iput v0, p0, Lf/h/a/g/e/f$h;->e:F
+    iput v0, p0, Lf/h/a/g/e/f$h;->b:F
 
     invoke-virtual {p0}, Lf/h/a/g/e/f$h;->a()F
 
     move-result v0
 
-    iput v0, p0, Lf/h/a/g/e/f$h;->f:F
+    iput v0, p0, Lf/h/a/g/e/f$h;->c:F
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lf/h/a/g/e/f$h;->d:Z
+    iput-boolean v0, p0, Lf/h/a/g/e/f$h;->a:Z
 
     :cond_1
-    iget-object v0, p0, Lf/h/a/g/e/f$h;->g:Lf/h/a/g/e/f;
+    iget-object v0, p0, Lf/h/a/g/e/f$h;->d:Lf/h/a/g/e/f;
 
-    iget v1, p0, Lf/h/a/g/e/f$h;->e:F
+    iget v1, p0, Lf/h/a/g/e/f$h;->b:F
 
-    iget v2, p0, Lf/h/a/g/e/f$h;->f:F
+    iget v2, p0, Lf/h/a/g/e/f$h;->c:F
 
     sub-float/2addr v2, v1
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/b.smali b/com.discord/smali_classes2/f/h/a/g/g/b.smali
index 72dd51876c..4d15c550ef 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/b.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/b.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/e;
+.field public final synthetic a:Lf/h/a/g/g/e;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/e;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/b;->d:Lf/h/a/g/g/e;
+    iput-object p1, p0, Lf/h/a/g/g/b;->a:Lf/h/a/g/g/e;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,7 +25,7 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationEnd(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/b;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/b;->a:Lf/h/a/g/g/e;
 
     iget-boolean v0, p1, Lf/h/a/g/g/e;->y:Z
 
@@ -41,7 +41,7 @@
 
     invoke-virtual {p1, v0}, Landroid/animation/ObjectAnimator;->setFloatValues([F)V
 
-    iget-object p1, p0, Lf/h/a/g/g/b;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/b;->a:Lf/h/a/g/g/e;
 
     const/4 v0, 0x1
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/c.smali b/com.discord/smali_classes2/f/h/a/g/g/c.smali
index e40c6f4264..f08b6535c1 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/c.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/c.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/e;
+.field public final synthetic a:Lf/h/a/g/g/e;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/e;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/c;->d:Lf/h/a/g/g/e;
+    iput-object p1, p0, Lf/h/a/g/g/c;->a:Lf/h/a/g/g/e;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,7 +25,7 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationEnd(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/c;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/c;->a:Lf/h/a/g/g/e;
 
     iget-boolean v0, p1, Lf/h/a/g/g/e;->y:Z
 
@@ -41,7 +41,7 @@
 
     invoke-virtual {v0, p1}, Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;->onAnimationEnd(Landroid/graphics/drawable/Drawable;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/c;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/c;->a:Lf/h/a/g/g/e;
 
     iput-boolean v1, p1, Lf/h/a/g/g/e;->y:Z
 
@@ -50,7 +50,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lf/h/a/g/g/c;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/c;->a:Lf/h/a/g/g/e;
 
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->isVisible()Z
 
@@ -58,7 +58,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lf/h/a/g/g/c;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/c;->a:Lf/h/a/g/g/e;
 
     const/4 v0, 0x0
 
@@ -128,7 +128,7 @@
 
     iput v0, p1, Lf/h/a/g/g/e;->t:I
 
-    iget-object p1, p0, Lf/h/a/g/g/c;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/c;->a:Lf/h/a/g/g/e;
 
     iget-object p1, p1, Lf/h/a/g/g/e;->q:Landroid/animation/Animator;
 
@@ -137,7 +137,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lf/h/a/g/g/c;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/c;->a:Lf/h/a/g/g/e;
 
     invoke-virtual {p1}, Lf/h/a/g/g/e;->g()V
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/d.smali b/com.discord/smali_classes2/f/h/a/g/g/d.smali
index 3913181556..5c2f73ca38 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/d.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/d.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/e;
+.field public final synthetic a:Lf/h/a/g/g/e;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/e;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/d;->d:Lf/h/a/g/g/e;
+    iput-object p1, p0, Lf/h/a/g/g/d;->a:Lf/h/a/g/g/e;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,13 +25,13 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationEnd(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/d;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/d;->a:Lf/h/a/g/g/e;
 
     iget-object p1, p1, Lf/h/a/g/g/e;->q:Landroid/animation/Animator;
 
     invoke-virtual {p1}, Landroid/animation/Animator;->cancel()V
 
-    iget-object p1, p0, Lf/h/a/g/g/d;->d:Lf/h/a/g/g/e;
+    iget-object p1, p0, Lf/h/a/g/g/d;->a:Lf/h/a/g/g/e;
 
     invoke-virtual {p1}, Lf/h/a/g/g/e;->g()V
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/h.smali b/com.discord/smali_classes2/f/h/a/g/g/h.smali
index 306964a702..4ba879c42b 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/h.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/h.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/j;
+.field public final synthetic a:Lf/h/a/g/g/j;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/j;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/h;->d:Lf/h/a/g/g/j;
+    iput-object p1, p0, Lf/h/a/g/g/h;->a:Lf/h/a/g/g/j;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,7 +25,7 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationStart(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/h;->d:Lf/h/a/g/g/j;
+    iget-object p1, p0, Lf/h/a/g/g/h;->a:Lf/h/a/g/g/j;
 
     iget-object v0, p1, Lf/h/a/g/g/j;->g:Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/i.smali b/com.discord/smali_classes2/f/h/a/g/g/i.smali
index dbb3eaf4d2..676978d6ea 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/i.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/i.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/j;
+.field public final synthetic a:Lf/h/a/g/g/j;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/j;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/i;->d:Lf/h/a/g/g/j;
+    iput-object p1, p0, Lf/h/a/g/g/i;->a:Lf/h/a/g/g/j;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,13 +25,13 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationEnd(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/i;->d:Lf/h/a/g/g/j;
+    iget-object p1, p0, Lf/h/a/g/g/i;->a:Lf/h/a/g/g/j;
 
     const/4 v0, 0x0
 
     invoke-static {p1, v0, v0}, Lf/h/a/g/g/j;->c(Lf/h/a/g/g/j;ZZ)Z
 
-    iget-object p1, p0, Lf/h/a/g/g/i;->d:Lf/h/a/g/g/j;
+    iget-object p1, p0, Lf/h/a/g/g/i;->a:Lf/h/a/g/g/j;
 
     iget-object v0, p1, Lf/h/a/g/g/j;->g:Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/o.smali b/com.discord/smali_classes2/f/h/a/g/g/o.smali
index 2024e1da40..a214d6e3a8 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/o.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/o.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/n;
+.field public final synthetic a:Lf/h/a/g/g/n;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/n;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/o;->d:Lf/h/a/g/g/n;
+    iput-object p1, p0, Lf/h/a/g/g/o;->a:Lf/h/a/g/g/n;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,11 +25,11 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationEnd(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/o;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/o;->a:Lf/h/a/g/g/n;
 
     invoke-virtual {p1}, Lf/h/a/g/g/n;->f()V
 
-    iget-object p1, p0, Lf/h/a/g/g/o;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/o;->a:Lf/h/a/g/g/n;
 
     invoke-virtual {p1}, Lf/h/a/g/g/n;->g()V
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/p.smali b/com.discord/smali_classes2/f/h/a/g/g/p.smali
index 1d9796a60d..2caa3316bf 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/p.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/p.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/n;
+.field public final synthetic a:Lf/h/a/g/g/n;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/n;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/p;->d:Lf/h/a/g/g/n;
+    iput-object p1, p0, Lf/h/a/g/g/p;->a:Lf/h/a/g/g/n;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,7 +25,7 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationRepeat(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/p;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/p;->a:Lf/h/a/g/g/n;
 
     iget v0, p1, Lf/h/a/g/g/n;->q:I
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/q.smali b/com.discord/smali_classes2/f/h/a/g/g/q.smali
index 2e7621aa01..4625c07150 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/q.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/q.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/n;
+.field public final synthetic a:Lf/h/a/g/g/n;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/n;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/q;->d:Lf/h/a/g/g/n;
+    iput-object p1, p0, Lf/h/a/g/g/q;->a:Lf/h/a/g/g/n;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,7 +25,7 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationRepeat(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/q;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/q;->a:Lf/h/a/g/g/n;
 
     iget v0, p1, Lf/h/a/g/g/n;->q:I
 
diff --git a/com.discord/smali_classes2/f/h/a/g/g/r.smali b/com.discord/smali_classes2/f/h/a/g/g/r.smali
index e4a60974f2..148d2d7c32 100644
--- a/com.discord/smali_classes2/f/h/a/g/g/r.smali
+++ b/com.discord/smali_classes2/f/h/a/g/g/r.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/g/n;
+.field public final synthetic a:Lf/h/a/g/g/n;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/g/n;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/g/r;->d:Lf/h/a/g/g/n;
+    iput-object p1, p0, Lf/h/a/g/g/r;->a:Lf/h/a/g/g/n;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -25,7 +25,7 @@
 
     invoke-super {p0, p1}, Landroid/animation/AnimatorListenerAdapter;->onAnimationEnd(Landroid/animation/Animator;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/r;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/r;->a:Lf/h/a/g/g/n;
 
     iget-boolean v0, p1, Lf/h/a/g/g/n;->z:Z
 
@@ -35,7 +35,7 @@
 
     invoke-virtual {v0, p1}, Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;->onAnimationEnd(Landroid/graphics/drawable/Drawable;)V
 
-    iget-object p1, p0, Lf/h/a/g/g/r;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/r;->a:Lf/h/a/g/g/n;
 
     const/4 v0, 0x0
 
@@ -52,7 +52,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lf/h/a/g/g/r;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/r;->a:Lf/h/a/g/g/n;
 
     const/4 v0, 0x0
 
@@ -69,7 +69,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lf/h/a/g/g/r;->d:Lf/h/a/g/g/n;
+    iget-object p1, p0, Lf/h/a/g/g/r;->a:Lf/h/a/g/g/n;
 
     invoke-virtual {p1}, Lf/h/a/g/g/n;->g()V
 
diff --git a/com.discord/smali_classes2/f/h/a/g/i/b.smali b/com.discord/smali_classes2/f/h/a/g/i/b.smali
index 907f0fd126..8daa319a40 100644
--- a/com.discord/smali_classes2/f/h/a/g/i/b.smali
+++ b/com.discord/smali_classes2/f/h/a/g/i/b.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/i/a;
+.field public final synthetic a:Lf/h/a/g/i/a;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/i/a;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/i/b;->d:Lf/h/a/g/i/a;
+    iput-object p1, p0, Lf/h/a/g/i/b;->a:Lf/h/a/g/i/a;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -23,7 +23,7 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/h/a/g/i/b;->d:Lf/h/a/g/i/a;
+    iget-object p1, p0, Lf/h/a/g/i/b;->a:Lf/h/a/g/i/a;
 
     iget-object p1, p1, Lf/h/a/g/i/m;->a:Lcom/google/android/material/textfield/TextInputLayout;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/i/c.smali b/com.discord/smali_classes2/f/h/a/g/i/c.smali
index 5f770ab84a..52b2ce61cc 100644
--- a/com.discord/smali_classes2/f/h/a/g/i/c.smali
+++ b/com.discord/smali_classes2/f/h/a/g/i/c.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/i/a;
+.field public final synthetic a:Lf/h/a/g/i/a;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/i/a;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/i/c;->d:Lf/h/a/g/i/a;
+    iput-object p1, p0, Lf/h/a/g/i/c;->a:Lf/h/a/g/i/a;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -23,7 +23,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/h/a/g/i/c;->d:Lf/h/a/g/i/a;
+    iget-object p1, p0, Lf/h/a/g/i/c;->a:Lf/h/a/g/i/a;
 
     iget-object p1, p1, Lf/h/a/g/i/m;->a:Lcom/google/android/material/textfield/TextInputLayout;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/i/d.smali b/com.discord/smali_classes2/f/h/a/g/i/d.smali
index f6e6258e7b..95112a7978 100644
--- a/com.discord/smali_classes2/f/h/a/g/i/d.smali
+++ b/com.discord/smali_classes2/f/h/a/g/i/d.smali
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/i/a;
+.field public final synthetic a:Lf/h/a/g/i/a;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/i/a;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/i/d;->d:Lf/h/a/g/i/a;
+    iput-object p1, p0, Lf/h/a/g/i/d;->a:Lf/h/a/g/i/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +40,7 @@
 
     move-result p1
 
-    iget-object v0, p0, Lf/h/a/g/i/d;->d:Lf/h/a/g/i/a;
+    iget-object v0, p0, Lf/h/a/g/i/d;->a:Lf/h/a/g/i/a;
 
     iget-object v0, v0, Lf/h/a/g/i/m;->c:Lcom/google/android/material/internal/CheckableImageButton;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/i/e.smali b/com.discord/smali_classes2/f/h/a/g/i/e.smali
index 0847e0986b..f9241078d0 100644
--- a/com.discord/smali_classes2/f/h/a/g/i/e.smali
+++ b/com.discord/smali_classes2/f/h/a/g/i/e.smali
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/i/a;
+.field public final synthetic a:Lf/h/a/g/i/a;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/i/a;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/i/e;->d:Lf/h/a/g/i/a;
+    iput-object p1, p0, Lf/h/a/g/i/e;->a:Lf/h/a/g/i/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,13 +40,13 @@
 
     move-result p1
 
-    iget-object v0, p0, Lf/h/a/g/i/e;->d:Lf/h/a/g/i/a;
+    iget-object v0, p0, Lf/h/a/g/i/e;->a:Lf/h/a/g/i/a;
 
     iget-object v0, v0, Lf/h/a/g/i/m;->c:Lcom/google/android/material/internal/CheckableImageButton;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageButton;->setScaleX(F)V
 
-    iget-object v0, p0, Lf/h/a/g/i/e;->d:Lf/h/a/g/i/a;
+    iget-object v0, p0, Lf/h/a/g/i/e;->a:Lf/h/a/g/i/a;
 
     iget-object v0, v0, Lf/h/a/g/i/m;->c:Lcom/google/android/material/internal/CheckableImageButton;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/i/i.smali b/com.discord/smali_classes2/f/h/a/g/i/i.smali
index bcc26213ee..4056e0b16e 100644
--- a/com.discord/smali_classes2/f/h/a/g/i/i.smali
+++ b/com.discord/smali_classes2/f/h/a/g/i/i.smali
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/i/h;
+.field public final synthetic a:Lf/h/a/g/i/h;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/i/h;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/i/i;->d:Lf/h/a/g/i/h;
+    iput-object p1, p0, Lf/h/a/g/i/i;->a:Lf/h/a/g/i/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +40,7 @@
 
     move-result p1
 
-    iget-object v0, p0, Lf/h/a/g/i/i;->d:Lf/h/a/g/i/h;
+    iget-object v0, p0, Lf/h/a/g/i/i;->a:Lf/h/a/g/i/h;
 
     iget-object v0, v0, Lf/h/a/g/i/m;->c:Lcom/google/android/material/internal/CheckableImageButton;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/i/l.smali b/com.discord/smali_classes2/f/h/a/g/i/l.smali
index 96b0aceab0..4f6c8a3528 100644
--- a/com.discord/smali_classes2/f/h/a/g/i/l.smali
+++ b/com.discord/smali_classes2/f/h/a/g/i/l.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lf/h/a/g/i/h;
+.field public final synthetic a:Lf/h/a/g/i/h;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/i/h;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/i/l;->d:Lf/h/a/g/i/h;
+    iput-object p1, p0, Lf/h/a/g/i/l;->a:Lf/h/a/g/i/h;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -23,7 +23,7 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/h/a/g/i/l;->d:Lf/h/a/g/i/h;
+    iget-object p1, p0, Lf/h/a/g/i/l;->a:Lf/h/a/g/i/h;
 
     iget-object v0, p1, Lf/h/a/g/i/m;->c:Lcom/google/android/material/internal/CheckableImageButton;
 
@@ -31,7 +31,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/internal/CheckableImageButton;->setChecked(Z)V
 
-    iget-object p1, p0, Lf/h/a/g/i/l;->d:Lf/h/a/g/i/h;
+    iget-object p1, p0, Lf/h/a/g/i/l;->a:Lf/h/a/g/i/h;
 
     iget-object p1, p1, Lf/h/a/g/i/h;->p:Landroid/animation/ValueAnimator;
 
diff --git a/com.discord/smali_classes2/f/h/a/g/i/n$a.smali b/com.discord/smali_classes2/f/h/a/g/i/n$a.smali
index ece2d561d5..701e43885c 100644
--- a/com.discord/smali_classes2/f/h/a/g/i/n$a.smali
+++ b/com.discord/smali_classes2/f/h/a/g/i/n$a.smali
@@ -15,30 +15,30 @@
 
 
 # instance fields
-.field public final synthetic d:I
+.field public final synthetic a:I
 
-.field public final synthetic e:Landroid/widget/TextView;
+.field public final synthetic b:Landroid/widget/TextView;
 
-.field public final synthetic f:I
+.field public final synthetic c:I
 
-.field public final synthetic g:Landroid/widget/TextView;
+.field public final synthetic d:Landroid/widget/TextView;
 
-.field public final synthetic h:Lf/h/a/g/i/n;
+.field public final synthetic e:Lf/h/a/g/i/n;
 
 
 # direct methods
 .method public constructor <init>(Lf/h/a/g/i/n;ILandroid/widget/TextView;ILandroid/widget/TextView;)V
     .locals 0
 
-    iput-object p1, p0, Lf/h/a/g/i/n$a;->h:Lf/h/a/g/i/n;
+    iput-object p1, p0, Lf/h/a/g/i/n$a;->e:Lf/h/a/g/i/n;
 
-    iput p2, p0, Lf/h/a/g/i/n$a;->d:I
+    iput p2, p0, Lf/h/a/g/i/n$a;->a:I
 
-    iput-object p3, p0, Lf/h/a/g/i/n$a;->e:Landroid/widget/TextView;
+    iput-object p3, p0, Lf/h/a/g/i/n$a;->b:Landroid/widget/TextView;
 
-    iput p4, p0, Lf/h/a/g/i/n$a;->f:I
+    iput p4, p0, Lf/h/a/g/i/n$a;->c:I
 
-    iput-object p5, p0, Lf/h/a/g/i/n$a;->g:Landroid/widget/TextView;
+    iput-object p5, p0, Lf/h/a/g/i/n$a;->d:Landroid/widget/TextView;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -50,9 +50,9 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 2
 
-    iget-object p1, p0, Lf/h/a/g/i/n$a;->h:Lf/h/a/g/i/n;
+    iget-object p1, p0, Lf/h/a/g/i/n$a;->e:Lf/h/a/g/i/n;
 
-    iget v0, p0, Lf/h/a/g/i/n$a;->d:I
+    iget v0, p0, Lf/h/a/g/i/n$a;->a:I
 
     iput v0, p1, Lf/h/a/g/i/n;->i:I
 
@@ -60,7 +60,7 @@
 
     iput-object v0, p1, Lf/h/a/g/i/n;->g:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lf/h/a/g/i/n$a;->e:Landroid/widget/TextView;
+    iget-object p1, p0, Lf/h/a/g/i/n$a;->b:Landroid/widget/TextView;
 
     if-eqz p1, :cond_0
 
@@ -68,13 +68,13 @@
 
     invoke-virtual {p1, v1}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget p1, p0, Lf/h/a/g/i/n$a;->f:I
+    iget p1, p0, Lf/h/a/g/i/n$a;->c:I
 
     const/4 v1, 0x1
 
     if-ne p1, v1, :cond_0
 
-    iget-object p1, p0, Lf/h/a/g/i/n$a;->h:Lf/h/a/g/i/n;
+    iget-object p1, p0, Lf/h/a/g/i/n$a;->e:Lf/h/a/g/i/n;
 
     iget-object p1, p1, Lf/h/a/g/i/n;->m:Landroid/widget/TextView;
 
@@ -83,7 +83,7 @@
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     :cond_0
-    iget-object p1, p0, Lf/h/a/g/i/n$a;->g:Landroid/widget/TextView;
+    iget-object p1, p0, Lf/h/a/g/i/n$a;->d:Landroid/widget/TextView;
 
     if-eqz p1, :cond_1
 
@@ -91,7 +91,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setTranslationY(F)V
 
-    iget-object p1, p0, Lf/h/a/g/i/n$a;->g:Landroid/widget/TextView;
+    iget-object p1, p0, Lf/h/a/g/i/n$a;->d:Landroid/widget/TextView;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -104,7 +104,7 @@
 .method public onAnimationStart(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lf/h/a/g/i/n$a;->g:Landroid/widget/TextView;
+    iget-object p1, p0, Lf/h/a/g/i/n$a;->d:Landroid/widget/TextView;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali_classes2/f/h/c/c.smali b/com.discord/smali_classes2/f/h/c/c.smali
index 3a035628cc..554ee70199 100644
--- a/com.discord/smali_classes2/f/h/c/c.smali
+++ b/com.discord/smali_classes2/f/h/c/c.smali
@@ -442,9 +442,9 @@
 
     :cond_6
     :try_start_2
-    sget-object p2, Lj0/b;->h:Lj0/b;
+    sget-object p2, Lk0/b;->h:Lk0/b;
 
-    invoke-virtual {p2}, Lj0/b;->toString()Ljava/lang/String;
+    invoke-virtual {p2}, Lk0/b;->toString()Ljava/lang/String;
 
     move-result-object p2
     :try_end_2
diff --git a/com.discord/smali_classes2/f/h/c/j/b.smali b/com.discord/smali_classes2/f/h/c/j/b.smali
index 0e3e855371..6350b7d0fb 100644
--- a/com.discord/smali_classes2/f/h/c/j/b.smali
+++ b/com.discord/smali_classes2/f/h/c/j/b.smali
@@ -567,7 +567,7 @@
 
     const-string v1, "Mapping file ID is: "
 
-    invoke-static {v1, v8, v0}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v1, v8, v0}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     iget-object v0, v5, Lf/h/c/j/d/k/k0;->a:Landroid/content/Context;
 
diff --git a/com.discord/smali_classes2/f/h/c/j/d/k/x.smali b/com.discord/smali_classes2/f/h/c/j/d/k/x.smali
index 82f1e35c7b..f0ecc96ea5 100644
--- a/com.discord/smali_classes2/f/h/c/j/d/k/x.smali
+++ b/com.discord/smali_classes2/f/h/c/j/d/k/x.smali
@@ -322,7 +322,7 @@
 
     const-string v11, "Unity Editor version is: "
 
-    invoke-static {v11, v6, v10}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v11, v6, v10}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     goto :goto_0
 
@@ -704,7 +704,7 @@
 
     const-string v2, "Opening a new session with ID "
 
-    invoke-static {v2, v13, v1}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v2, v13, v1}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     iget-object v1, v0, Lf/h/c/j/d/k/x;->p:Lf/h/c/j/d/a;
 
@@ -2321,7 +2321,7 @@
 
     const-string v5, "Finalizing native report for session "
 
-    invoke-static {v5, v6, v0}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v5, v6, v0}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     iget-object v0, v1, Lf/h/c/j/d/k/x;->p:Lf/h/c/j/d/a;
 
@@ -2887,7 +2887,7 @@
 
     const-string v2, "Could not finalize native session: "
 
-    invoke-static {v2, v6, v0}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v2, v6, v0}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     goto :goto_13
 
@@ -2920,7 +2920,7 @@
 
     const-string v6, "Closing session: "
 
-    invoke-static {v6, v2, v5}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v6, v2, v5}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     sget-object v5, Lf/h/c/j/d/b;->c:Lf/h/c/j/d/b;
 
@@ -3057,7 +3057,7 @@
 
     const-string v5, "No events present for session ID "
 
-    invoke-static {v5, v2, v0}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v5, v2, v0}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     move-object/from16 v16, v4
 
diff --git a/com.discord/smali_classes2/f/h/c/j/d/n/a.smali b/com.discord/smali_classes2/f/h/c/j/d/n/a.smali
index 90b78db12e..23aac2abfc 100644
--- a/com.discord/smali_classes2/f/h/c/j/d/n/a.smali
+++ b/com.discord/smali_classes2/f/h/c/j/d/n/a.smali
@@ -136,7 +136,7 @@
 
     const-string v5, "Could not parse map entry: "
 
-    invoke-static {v5, v0, v4}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v5, v0, v4}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     :goto_1
     move-object v4, v8
diff --git a/com.discord/smali_classes2/f/h/c/j/d/o/b.smali b/com.discord/smali_classes2/f/h/c/j/d/o/b.smali
index 6d6480c6cd..d5a049f321 100644
--- a/com.discord/smali_classes2/f/h/c/j/d/o/b.smali
+++ b/com.discord/smali_classes2/f/h/c/j/d/o/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final f:Ln0/x;
+.field public static final f:Lo0/x;
 
 
 # instance fields
@@ -41,44 +41,37 @@
 .method public static constructor <clinit>()V
     .locals 5
 
-    new-instance v0, Ln0/x;
+    new-instance v0, Lo0/x;
 
-    invoke-direct {v0}, Ln0/x;-><init>()V
+    invoke-direct {v0}, Lo0/x;-><init>()V
 
-    invoke-virtual {v0}, Ln0/x;->c()Ln0/x$a;
+    invoke-virtual {v0}, Lo0/x;->c()Lo0/x$a;
 
     move-result-object v0
 
     sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    if-eqz v1, :cond_0
+    const-string v2, "unit"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v2, "timeout"
 
     const-wide/16 v3, 0x2710
 
-    invoke-static {v2, v3, v4, v1}, Ln0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
+    invoke-static {v2, v3, v4, v1}, Lo0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
 
     move-result v1
 
-    iput v1, v0, Ln0/x$a;->x:I
+    iput v1, v0, Lo0/x$a;->x:I
 
-    new-instance v1, Ln0/x;
+    new-instance v1, Lo0/x;
 
-    invoke-direct {v1, v0}, Ln0/x;-><init>(Ln0/x$a;)V
+    invoke-direct {v1, v0}, Lo0/x;-><init>(Lo0/x$a;)V
 
-    sput-object v1, Lf/h/c/j/d/o/b;->f:Ln0/x;
+    sput-object v1, Lf/h/c/j/d/o/b;->f:Lo0/x;
 
     return-void
-
-    :cond_0
-    const-string v0, "unit"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 .method public constructor <init>(Lf/h/c/j/d/o/a;Ljava/lang/String;Ljava/util/Map;)V
@@ -119,7 +112,7 @@
 
 # virtual methods
 .method public a()Lf/h/c/j/d/o/d;
-    .locals 18
+    .locals 19
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -128,15 +121,15 @@
 
     move-object/from16 v0, p0
 
-    new-instance v1, Ln0/a0$a;
+    new-instance v1, Lo0/a0$a;
 
-    invoke-direct {v1}, Ln0/a0$a;-><init>()V
+    invoke-direct {v1}, Lo0/a0$a;-><init>()V
 
     const/4 v11, -0x1
 
     const/4 v3, 0x1
 
-    new-instance v17, Ln0/e;
+    new-instance v15, Lo0/e;
 
     const/4 v4, 0x0
 
@@ -152,21 +145,33 @@
 
     const/4 v14, 0x0
 
-    const/4 v15, 0x0
-
     const/16 v16, 0x0
 
+    const/16 v17, 0x0
+
     const/4 v12, 0x0
 
-    move-object/from16 v2, v17
+    move-object v2, v15
 
     move v5, v11
 
     move v10, v11
 
-    invoke-direct/range {v2 .. v16}, Ln0/e;-><init>(ZZIIZZZIIZZZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    move-object/from16 v18, v15
 
-    invoke-virtual/range {v17 .. v17}, Ln0/e;->toString()Ljava/lang/String;
+    move-object/from16 v15, v16
+
+    move-object/from16 v16, v17
+
+    invoke-direct/range {v2 .. v16}, Lo0/e;-><init>(ZZIIZZZIIZZZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    const-string v2, "cacheControl"
+
+    move-object/from16 v3, v18
+
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Lo0/e;->toString()Ljava/lang/String;
 
     move-result-object v2
 
@@ -188,21 +193,31 @@
 
     if-eqz v3, :cond_1
 
-    invoke-virtual {v1, v4}, Ln0/a0$a;->e(Ljava/lang/String;)Ln0/a0$a;
+    invoke-virtual {v1, v4}, Lo0/a0$a;->e(Ljava/lang/String;)Lo0/a0$a;
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v1, v4, v2}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
+    const-string v3, "name"
+
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "value"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v3, v1, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v3, v4, v2}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
     :goto_1
     iget-object v2, v0, Lf/h/c/j/d/o/b;->b:Ljava/lang/String;
 
-    invoke-static {v2}, Ln0/w;->h(Ljava/lang/String;)Ln0/w;
+    invoke-static {v2}, Lo0/w;->h(Ljava/lang/String;)Lo0/w;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Ln0/w;->f()Ln0/w$a;
+    invoke-virtual {v2}, Lo0/w;->f()Lo0/w$a;
 
     move-result-object v2
 
@@ -241,16 +256,16 @@
 
     check-cast v4, Ljava/lang/String;
 
-    invoke-virtual {v2, v5, v4}, Ln0/w$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/w$a;
+    invoke-virtual {v2, v5, v4}, Lo0/w$a;->a(Ljava/lang/String;Ljava/lang/String;)Lo0/w$a;
 
     goto :goto_2
 
     :cond_2
-    invoke-virtual {v2}, Ln0/w$a;->b()Ln0/w;
+    invoke-virtual {v2}, Lo0/w$a;->b()Lo0/w;
 
     move-result-object v2
 
-    iput-object v2, v1, Ln0/a0$a;->a:Ln0/w;
+    invoke-virtual {v1, v2}, Lo0/a0$a;->g(Lo0/w;)Lo0/a0$a;
 
     iget-object v2, v0, Lf/h/c/j/d/o/b;->d:Ljava/util/Map;
 
@@ -287,7 +302,7 @@
 
     check-cast v3, Ljava/lang/String;
 
-    invoke-virtual {v1, v4, v3}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
+    invoke-virtual {v1, v4, v3}, Lo0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Lo0/a0$a;
 
     goto :goto_3
 
@@ -314,21 +329,21 @@
 
     move-result-object v4
 
-    invoke-virtual {v1, v4, v2}, Ln0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
+    invoke-virtual {v1, v4, v2}, Lo0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
 
-    invoke-virtual {v1}, Ln0/a0$a;->b()Ln0/a0;
+    invoke-virtual {v1}, Lo0/a0$a;->b()Lo0/a0;
 
     move-result-object v1
 
-    sget-object v2, Lf/h/c/j/d/o/b;->f:Ln0/x;
+    sget-object v2, Lf/h/c/j/d/o/b;->f:Lo0/x;
 
-    invoke-virtual {v2, v1}, Ln0/x;->b(Ln0/a0;)Ln0/f;
+    invoke-virtual {v2, v1}, Lo0/x;->b(Lo0/a0;)Lo0/f;
 
     move-result-object v1
 
-    check-cast v1, Ln0/z;
+    check-cast v1, Lo0/z;
 
-    invoke-virtual {v1}, Ln0/z;->execute()Lokhttp3/Response;
+    invoke-virtual {v1}, Lo0/z;->execute()Lokhttp3/Response;
 
     move-result-object v1
 
@@ -356,7 +371,7 @@
 .end method
 
 .method public b(Ljava/lang/String;Ljava/lang/String;)Lf/h/c/j/d/o/b;
-    .locals 3
+    .locals 4
 
     iget-object v0, p0, Lf/h/c/j/d/o/b;->e:Lokhttp3/MultipartBody$a;
 
@@ -377,9 +392,19 @@
 
     const/4 v1, 0x0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_1
 
-    if-eqz p2, :cond_1
+    const-string v2, "name"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "value"
+
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v2, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
 
@@ -398,13 +423,6 @@
     return-object p0
 
     :cond_1
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_2
     throw v1
 .end method
 
@@ -436,13 +454,15 @@
     :cond_0
     iget-object p4, p0, Lf/h/c/j/d/o/b;->e:Lokhttp3/MultipartBody$a;
 
-    const/4 v0, 0x0
+    if-eqz p4, :cond_1
 
-    if-eqz p4, :cond_3
+    const-string v0, "name"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "body"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1, p2, p3}, Lokhttp3/MultipartBody$Part;->b(Ljava/lang/String;Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$Part;
 
@@ -455,19 +475,7 @@
     return-object p0
 
     :cond_1
-    const-string p1, "body"
+    const/4 p1, 0x0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    throw v0
+    throw p1
 .end method
diff --git a/com.discord/smali_classes2/f/h/c/j/d/t/j/c.smali b/com.discord/smali_classes2/f/h/c/j/d/t/j/c.smali
index a4324f4c13..dbfdd79e7c 100644
--- a/com.discord/smali_classes2/f/h/c/j/d/t/j/c.smali
+++ b/com.discord/smali_classes2/f/h/c/j/d/t/j/c.smali
@@ -249,7 +249,7 @@
 
     const-string v2, "Settings response "
 
-    invoke-static {v2, p1, v0}, Lf/e/b/a/a;->P(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
+    invoke-static {v2, p1, v0}, Lf/e/b/a/a;->R(Ljava/lang/String;Ljava/lang/String;Lf/h/c/j/d/b;)V
 
     goto :goto_2
 
diff --git a/com.discord/smali_classes2/f/h/c/p/b0.smali b/com.discord/smali_classes2/f/h/c/p/b0.smali
index 3b14d949fa..52be57aad0 100644
--- a/com.discord/smali_classes2/f/h/c/p/b0.smali
+++ b/com.discord/smali_classes2/f/h/c/p/b0.smali
@@ -365,7 +365,7 @@
 
     const-string v2, "FirebaseInstanceId"
 
-    invoke-static {v0, v1, p1, v2}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v1, p1, v2}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/4 p1, 0x0
 
diff --git a/com.discord/smali_classes2/f/h/c/p/l0$a.smali b/com.discord/smali_classes2/f/h/c/p/l0$a.smali
index 37b270d1ca..693c77b226 100644
--- a/com.discord/smali_classes2/f/h/c/p/l0$a.smali
+++ b/com.discord/smali_classes2/f/h/c/p/l0$a.smali
@@ -194,7 +194,7 @@
 
     const-string v2, "Unexpected response, no error or registration id "
 
-    invoke-static {v1, v2, p1, v0}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, v2, p1, v0}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto/16 :goto_6
 
diff --git a/com.discord/smali_classes2/f/h/c/p/n0$a.smali b/com.discord/smali_classes2/f/h/c/p/n0$a.smali
index edc16a6e15..cba2e01358 100644
--- a/com.discord/smali_classes2/f/h/c/p/n0$a.smali
+++ b/com.discord/smali_classes2/f/h/c/p/n0$a.smali
@@ -102,7 +102,7 @@
 
     const-string p3, "FirebaseInstanceId"
 
-    invoke-static {p1, p2, p0, p3}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {p1, p2, p0, p3}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
@@ -179,7 +179,7 @@
 
     const-string v3, "FirebaseInstanceId"
 
-    invoke-static {v0, v2, p0, v3}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v2, p0, v3}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-object v1
 
diff --git a/com.discord/smali_classes2/f/h/c/p/o0.smali b/com.discord/smali_classes2/f/h/c/p/o0.smali
index 362a293750..4f6637e22b 100644
--- a/com.discord/smali_classes2/f/h/c/p/o0.smali
+++ b/com.discord/smali_classes2/f/h/c/p/o0.smali
@@ -370,7 +370,7 @@
 
     const-string v5, ". Will retry token retrieval"
 
-    invoke-static {v3, v4, v1, v5, v0}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v3, v4, v1, v5, v0}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return v2
 
diff --git a/com.discord/smali_classes2/f/h/c/t/a.smali b/com.discord/smali_classes2/f/h/c/t/a.smali
index 0dab4a0f7e..84855d5d81 100644
--- a/com.discord/smali_classes2/f/h/c/t/a.smali
+++ b/com.discord/smali_classes2/f/h/c/t/a.smali
@@ -121,7 +121,7 @@
 
     add-int/lit8 v3, v3, 0x23
 
-    invoke-static {v3, v0, v2, v1}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v3, v0, v2, v1}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
     sget-object v2, Landroid/os/Bundle;->EMPTY:Landroid/os/Bundle;
@@ -207,7 +207,7 @@
 
     const-string v11, ") has not been created by the app. Manifest configuration, or default, value will be used."
 
-    invoke-static {v6, v10, v4, v11, v1}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v6, v10, v4, v11, v1}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_4
     const-string v4, "com.google.firebase.messaging.default_notification_channel_id"
@@ -393,7 +393,7 @@
 
     const-string v13, " not found. Notification will use default icon."
 
-    invoke-static {v11, v12, v4, v13, v1}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v11, v12, v4, v13, v1}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_c
     const-string v4, "com.google.firebase.messaging.default_notification_icon"
@@ -437,7 +437,7 @@
 
     add-int/lit8 v12, v12, 0x23
 
-    invoke-static {v12, v0, v11, v1}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v12, v0, v11, v1}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_e
     move v11, v4
@@ -847,7 +847,7 @@
 
     const-string v6, ". Notification will use default color."
 
-    invoke-static {v4, v5, v0, v6, v1}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v4, v5, v0, v6, v1}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_22
     const-string v0, "com.google.firebase.messaging.default_notification_color"
@@ -958,7 +958,7 @@
 
     const-string v4, ". Skipping setting notificationPriority."
 
-    invoke-static {v0, v2, p0, v4, v1}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, v2, p0, v4, v1}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_f
     move-object p0, v8
@@ -1015,7 +1015,7 @@
 
     const-string v5, ". Skipping setting visibility."
 
-    invoke-static {v2, v4, p0, v5, v0}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v4, p0, v5, v0}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_10
     move-object p0, v8
@@ -1061,7 +1061,7 @@
 
     const-string v5, ". Skipping setting notificationCount."
 
-    invoke-static {v2, v4, p0, v5, v1}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v4, p0, v5, v1}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_11
     move-object p0, v8
@@ -1215,7 +1215,7 @@
 
     const-string v4, ". Skipping setting vibrateTimings."
 
-    invoke-static {v1, v2, p0, v4, v0}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v1, v2, p0, v4, v0}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_14
     move-object v2, v8
@@ -1349,7 +1349,7 @@
 
     add-int/lit8 v4, v4, 0x3a
 
-    invoke-static {v4, v1, v2, p0, v0}, Lf/e/b/a/a;->L(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v4, v1, v2, p0, v0}, Lf/e/b/a/a;->N(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_15
     if-eqz v8, :cond_3a
diff --git a/com.discord/smali_classes2/f/h/c/t/c.smali b/com.discord/smali_classes2/f/h/c/t/c.smali
index 319e9dd7a1..53e5f76cc1 100644
--- a/com.discord/smali_classes2/f/h/c/t/c.smali
+++ b/com.discord/smali_classes2/f/h/c/t/c.smali
@@ -305,7 +305,7 @@
 
     const-string v5, "Failed to download image: "
 
-    invoke-static {v3, v5, v2, v4}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v3, v5, v2, v4}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_5
     const/4 v2, 0x3
diff --git a/com.discord/smali_classes2/f/h/c/t/j$a.smali b/com.discord/smali_classes2/f/h/c/t/j$a.smali
index 79e06fb39a..60804a8b1b 100644
--- a/com.discord/smali_classes2/f/h/c/t/j$a.smali
+++ b/com.discord/smali_classes2/f/h/c/t/j$a.smali
@@ -108,7 +108,7 @@
 
     const-string v5, "FirebaseMessaging"
 
-    invoke-static {v2, v4, v1, v5}, Lf/e/b/a/a;->K(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v2, v4, v1, v5}, Lf/e/b/a/a;->M(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_1
     const/4 v1, 0x0
diff --git a/com.discord/smali_classes2/f/h/c/u/b/s.smali b/com.discord/smali_classes2/f/h/c/u/b/s.smali
index 44484ba8c0..7d1c0b831c 100644
--- a/com.discord/smali_classes2/f/h/c/u/b/s.smali
+++ b/com.discord/smali_classes2/f/h/c/u/b/s.smali
@@ -156,7 +156,7 @@
 
     check-cast v5, Ljava/lang/Long;
 
-    invoke-static {v5, v4, v3, p1}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v5, v4, v3, p1}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -304,7 +304,7 @@
 
     check-cast v5, Ljava/lang/Long;
 
-    invoke-static {v5, v4, v3, p1}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v5, v4, v3, p1}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -502,7 +502,7 @@
 
     check-cast v7, Ljava/lang/Long;
 
-    invoke-static {v7, p2, v2, v6}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v7, p2, v2, v6}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -650,7 +650,7 @@
 
     check-cast v7, Ljava/lang/Long;
 
-    invoke-static {v7, p2, v2, v6}, Lf/e/b/a/a;->X(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
+    invoke-static {v7, p2, v2, v6}, Lf/e/b/a/a;->Z(Ljava/lang/Long;Lf/h/a/f/h/f/c0;Ljava/lang/String;Lf/h/a/f/h/f/q0;)Ljava/lang/Object;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/f/h/c/u/d/g.smali b/com.discord/smali_classes2/f/h/c/u/d/g.smali
index 9f5638c0d9..b535c249fe 100644
--- a/com.discord/smali_classes2/f/h/c/u/d/g.smali
+++ b/com.discord/smali_classes2/f/h/c/u/d/g.smali
@@ -3,11 +3,11 @@
 .source "com.google.firebase:firebase-perf@@19.0.8"
 
 # interfaces
-.implements Ln0/g;
+.implements Lo0/g;
 
 
 # instance fields
-.field public final a:Ln0/g;
+.field public final a:Lo0/g;
 
 .field public final b:Lf/h/a/f/h/f/k0;
 
@@ -17,12 +17,12 @@
 
 
 # direct methods
-.method public constructor <init>(Ln0/g;Lf/h/c/u/b/e;Lcom/google/android/gms/internal/firebase-perf/zzcb;J)V
+.method public constructor <init>(Lo0/g;Lf/h/c/u/b/e;Lcom/google/android/gms/internal/firebase-perf/zzcb;J)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lf/h/c/u/d/g;->a:Ln0/g;
+    iput-object p1, p0, Lf/h/c/u/d/g;->a:Lo0/g;
 
     new-instance p1, Lf/h/a/f/h/f/k0;
 
@@ -39,7 +39,7 @@
 
 
 # virtual methods
-.method public final a(Ln0/f;Lokhttp3/Response;)V
+.method public final a(Lo0/f;Lokhttp3/Response;)V
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -61,29 +61,29 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/firebase/perf/network/FirebasePerfOkHttpClient;->a(Lokhttp3/Response;Lf/h/a/f/h/f/k0;JJ)V
 
-    iget-object v0, p0, Lf/h/c/u/d/g;->a:Ln0/g;
+    iget-object v0, p0, Lf/h/c/u/d/g;->a:Lo0/g;
 
-    invoke-interface {v0, p1, p2}, Ln0/g;->a(Ln0/f;Lokhttp3/Response;)V
+    invoke-interface {v0, p1, p2}, Lo0/g;->a(Lo0/f;Lokhttp3/Response;)V
 
     return-void
 .end method
 
-.method public final b(Ln0/f;Ljava/io/IOException;)V
+.method public final b(Lo0/f;Ljava/io/IOException;)V
     .locals 3
 
-    invoke-interface {p1}, Ln0/f;->p()Ln0/a0;
+    invoke-interface {p1}, Lo0/f;->p()Lo0/a0;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iget-object v1, v0, Ln0/a0;->b:Ln0/w;
+    iget-object v1, v0, Lo0/a0;->b:Lo0/w;
 
     if-eqz v1, :cond_0
 
     iget-object v2, p0, Lf/h/c/u/d/g;->b:Lf/h/a/f/h/f/k0;
 
-    invoke-virtual {v1}, Ln0/w;->l()Ljava/net/URL;
+    invoke-virtual {v1}, Lo0/w;->k()Ljava/net/URL;
 
     move-result-object v1
 
@@ -94,7 +94,7 @@
     invoke-virtual {v2, v1}, Lf/h/a/f/h/f/k0;->d(Ljava/lang/String;)Lf/h/a/f/h/f/k0;
 
     :cond_0
-    iget-object v0, v0, Ln0/a0;->c:Ljava/lang/String;
+    iget-object v0, v0, Lo0/a0;->c:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
@@ -123,9 +123,9 @@
 
     invoke-static {v0}, Lf/h/a/c/i1/e;->K2(Lf/h/a/f/h/f/k0;)V
 
-    iget-object v0, p0, Lf/h/c/u/d/g;->a:Ln0/g;
+    iget-object v0, p0, Lf/h/c/u/d/g;->a:Lo0/g;
 
-    invoke-interface {v0, p1, p2}, Ln0/g;->b(Ln0/f;Ljava/io/IOException;)V
+    invoke-interface {v0, p1, p2}, Lo0/g;->b(Lo0/f;Ljava/io/IOException;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/h/c/w/k/p.smali b/com.discord/smali_classes2/f/h/c/w/k/p.smali
index 0626cf368c..c3cc7c43bb 100644
--- a/com.discord/smali_classes2/f/h/c/w/k/p.smali
+++ b/com.discord/smali_classes2/f/h/c/w/k/p.smali
@@ -170,7 +170,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {v8}, Lh0/a/a/c;->o([B)Lh0/a/a/c;
+    invoke-static {v8}, Li0/a/a/c;->o([B)Li0/a/a/c;
 
     move-result-object v5
 
@@ -194,7 +194,7 @@
     if-eqz v5, :cond_0
 
     :try_start_1
-    invoke-virtual {p0, v5}, Lf/h/c/w/k/p;->b(Lh0/a/a/c;)Lorg/json/JSONObject;
+    invoke-virtual {p0, v5}, Lf/h/c/w/k/p;->b(Li0/a/a/c;)Lorg/json/JSONObject;
 
     move-result-object v5
 
@@ -354,7 +354,7 @@
     throw v2
 .end method
 
-.method public final b(Lh0/a/a/c;)Lorg/json/JSONObject;
+.method public final b(Li0/a/a/c;)Lorg/json/JSONObject;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -366,13 +366,13 @@
 
     invoke-direct {v0}, Lorg/json/JSONObject;-><init>()V
 
-    iget-object v1, p1, Lh0/a/a/c;->h:Ljava/lang/String;
+    iget-object v1, p1, Li0/a/a/c;->h:Ljava/lang/String;
 
     const-string v2, "experimentId"
 
     invoke-virtual {v0, v2, v1}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
-    iget-object v1, p1, Lh0/a/a/c;->i:Ljava/lang/String;
+    iget-object v1, p1, Li0/a/a/c;->i:Ljava/lang/String;
 
     const-string v2, "variantId"
 
@@ -400,7 +400,7 @@
 
     invoke-virtual {v0, v2, v1}, Lorg/json/JSONObject;->put(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;
 
-    iget-object p1, p1, Lh0/a/a/c;->j:Ljava/lang/String;
+    iget-object p1, p1, Li0/a/a/c;->j:Ljava/lang/String;
 
     const-string v1, "triggerEvent"
 
diff --git a/com.discord/smali_classes2/f/j/a/a$a$a.smali b/com.discord/smali_classes2/f/j/a/a$a$a.smali
index d1869d400b..28ab57773a 100644
--- a/com.discord/smali_classes2/f/j/a/a$a$a.smali
+++ b/com.discord/smali_classes2/f/j/a/a$a$a.smali
@@ -1,5 +1,5 @@
 .class public final Lf/j/a/a$a$a;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "ApngDrawable.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/Long;",
         ">;"
@@ -48,7 +48,7 @@
 
     const/4 v0, 0x0
 
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/j/a/a$a.smali b/com.discord/smali_classes2/f/j/a/a$a.smali
index eb7da98011..6afb803fc5 100644
--- a/com.discord/smali_classes2/f/j/a/a$a.smali
+++ b/com.discord/smali_classes2/f/j/a/a$a.smali
@@ -60,11 +60,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "apng"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p5, :cond_0
+    const-string v0, "currentTimeProvider"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Landroid/graphics/drawable/Drawable$ConstantState;-><init>()V
 
@@ -79,26 +81,14 @@
     iput-object p5, p0, Lf/j/a/a$a;->e:Lkotlin/jvm/functions/Function0;
 
     return-void
-
-    :cond_0
-    const-string p1, "currentTimeProvider"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "apng"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public constructor <init>(Lf/j/a/a$a;)V
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "apngState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p1, Lf/j/a/a$a;->a:Lcom/linecorp/apng/decoder/Apng;
 
@@ -119,15 +109,6 @@
     invoke-direct/range {v1 .. v6}, Lf/j/a/a$a;-><init>(Lcom/linecorp/apng/decoder/Apng;IIILkotlin/jvm/functions/Function0;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "apngState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali_classes2/f/j/a/a.smali b/com.discord/smali_classes2/f/j/a/a.smali
index d31dedf96a..fd6168e185 100644
--- a/com.discord/smali_classes2/f/j/a/a.smali
+++ b/com.discord/smali_classes2/f/j/a/a.smali
@@ -86,6 +86,10 @@
     .annotation build Landroidx/annotation/VisibleForTesting;
     .end annotation
 
+    const-string v0, "apngState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Landroid/graphics/drawable/Drawable;-><init>()V
 
     iput-object p1, p0, Lf/j/a/a;->q:Lf/j/a/a$a;
@@ -375,7 +379,9 @@
 .method public draw(Landroid/graphics/Canvas;)V
     .locals 8
 
-    if-eqz p1, :cond_b
+    const-string v0, "canvas"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lf/j/a/a;->n:Z
 
@@ -643,7 +649,7 @@
 
     const-string v0, "bounds"
 
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v6, p0, Lf/j/a/a;->h:Landroid/graphics/Paint;
 
@@ -659,15 +665,6 @@
 
     :cond_a
     return-void
-
-    :cond_b
-    const-string p1, "canvas"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public getConstantState()Landroid/graphics/drawable/Drawable$ConstantState;
@@ -727,22 +724,15 @@
 .method public registerAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)V
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/j/a/a;->i:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     return-void
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public setAlpha(I)V
@@ -796,7 +786,9 @@
 .method public unregisterAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "callback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lf/j/a/a;->i:Ljava/util/List;
 
@@ -805,13 +797,4 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "callback"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/f/k/a/c.smali b/com.discord/smali_classes2/f/k/a/c.smali
index ec190a72cc..49ff8044ab 100644
--- a/com.discord/smali_classes2/f/k/a/c.smali
+++ b/com.discord/smali_classes2/f/k/a/c.smali
@@ -61,7 +61,7 @@
 
     iget-object p1, p1, Lf/k/a/c;->b:Ljava/lang/Long;
 
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/f/k/a/f/b.smali b/com.discord/smali_classes2/f/k/a/f/b.smali
index 12b2d1717d..52b3ea73f7 100644
--- a/com.discord/smali_classes2/f/k/a/f/b.smali
+++ b/com.discord/smali_classes2/f/k/a/f/b.smali
@@ -14,7 +14,15 @@
 
 # direct methods
 .method public constructor <init>(Lf/k/a/f/d/h;Lf/k/a/a;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "ntpService"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "fallbackClock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/f/k/a/f/c.smali b/com.discord/smali_classes2/f/k/a/f/c.smali
index e1bae6e50d..a5e2077130 100644
--- a/com.discord/smali_classes2/f/k/a/f/c.smali
+++ b/com.discord/smali_classes2/f/k/a/f/c.smali
@@ -12,7 +12,11 @@
 
 # direct methods
 .method public constructor <init>(Landroid/content/SharedPreferences;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "sharedPreferences"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/f/k/a/f/d/b.smali b/com.discord/smali_classes2/f/k/a/f/d/b.smali
index 2b97560a7b..6e463bb496 100644
--- a/com.discord/smali_classes2/f/k/a/f/d/b.smali
+++ b/com.discord/smali_classes2/f/k/a/f/d/b.smali
@@ -20,7 +20,9 @@
 .method public a([B)Ljava/net/DatagramPacket;
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "buffer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/net/DatagramPacket;
 
@@ -29,21 +31,18 @@
     invoke-direct {v0, p1, v1}, Ljava/net/DatagramPacket;-><init>([BI)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "buffer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public b([BLjava/net/InetAddress;I)Ljava/net/DatagramPacket;
     .locals 2
 
-    if-eqz p2, :cond_0
+    const-string v0, "buffer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "address"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/net/DatagramPacket;
 
@@ -52,15 +51,6 @@
     invoke-direct {v0, p1, v1, p2, p3}, Ljava/net/DatagramPacket;-><init>([BILjava/net/InetAddress;I)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "address"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public c()Ljava/net/DatagramSocket;
diff --git a/com.discord/smali_classes2/f/k/a/f/d/d.smali b/com.discord/smali_classes2/f/k/a/f/d/d.smali
index 0a78d6067e..4c8cd40baa 100644
--- a/com.discord/smali_classes2/f/k/a/f/d/d.smali
+++ b/com.discord/smali_classes2/f/k/a/f/d/d.smali
@@ -25,7 +25,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "host"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p1}, Ljava/net/InetAddress;->getByName(Ljava/lang/String;)Ljava/net/InetAddress;
 
@@ -33,16 +35,7 @@
 
     const-string v0, "InetAddress.getByName(host)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/f/k/a/f/d/g.smali b/com.discord/smali_classes2/f/k/a/f/d/g.smali
index ee24a4e7d9..4eb7390452 100644
--- a/com.discord/smali_classes2/f/k/a/f/d/g.smali
+++ b/com.discord/smali_classes2/f/k/a/f/d/g.smali
@@ -14,7 +14,15 @@
 
 # direct methods
 .method public constructor <init>(Lf/k/a/e;Lf/k/a/a;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "syncResponseCache"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "deviceClock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,6 +38,10 @@
 .method public a(Lf/k/a/f/d/e$b;)V
     .locals 3
 
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lf/k/a/f/d/g;->a:Lf/k/a/e;
 
     iget-wide v1, p1, Lf/k/a/f/d/e$b;->a:J
diff --git a/com.discord/smali_classes2/f/k/a/f/d/i$c.smali b/com.discord/smali_classes2/f/k/a/f/d/i$c.smali
index bcd596c021..1eda938431 100644
--- a/com.discord/smali_classes2/f/k/a/f/d/i$c.smali
+++ b/com.discord/smali_classes2/f/k/a/f/d/i$c.smali
@@ -104,7 +104,7 @@
 
     const-string v8, "response"
 
-    invoke-static {v4, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v4}, Lf/k/a/f/d/e$b;->a()J
 
diff --git a/com.discord/smali_classes2/f/k/a/f/d/i.smali b/com.discord/smali_classes2/f/k/a/f/d/i.smali
index c2c349ebc3..05686b07e7 100644
--- a/com.discord/smali_classes2/f/k/a/f/d/i.smali
+++ b/com.discord/smali_classes2/f/k/a/f/d/i.smali
@@ -56,7 +56,7 @@
 
 # direct methods
 .method public constructor <init>(Lf/k/a/f/d/e;Lf/k/a/a;Lf/k/a/f/d/f;Lf/k/a/d;Ljava/util/List;JJJ)V
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -70,7 +70,21 @@
         }
     .end annotation
 
-    if-eqz p5, :cond_0
+    const-string v0, "sntpClient"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "deviceClock"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "responseCache"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ntpHosts"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -115,15 +129,6 @@
     iput-object p1, p0, Lf/k/a/f/d/i;->c:Ljava/util/concurrent/ExecutorService;
 
     return-void
-
-    :cond_0
-    const-string p1, "ntpHosts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
diff --git a/com.discord/smali_classes2/f/m/a/e.smali b/com.discord/smali_classes2/f/m/a/e.smali
index e5f0639201..8e31d80c34 100644
--- a/com.discord/smali_classes2/f/m/a/e.smali
+++ b/com.discord/smali_classes2/f/m/a/e.smali
@@ -59,7 +59,11 @@
 
     const/4 v3, 0x0
 
-    if-eqz v2, :cond_6
+    if-eqz v1, :cond_6
+
+    const-string v4, "cameraOptions"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v4, v1, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->a:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -148,22 +152,18 @@
     :cond_4
     const-string v0, "cameraFlashBtn"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_5
     const-string v0, "cameraFacingBtn"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v3
 
     :cond_6
-    const-string v0, "cameraOptions"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     throw v3
 
     :cond_7
diff --git a/com.discord/smali_classes2/f/m/a/g.smali b/com.discord/smali_classes2/f/m/a/g.smali
index 90efb2ee1b..d61d059db4 100644
--- a/com.discord/smali_classes2/f/m/a/g.smali
+++ b/com.discord/smali_classes2/f/m/a/g.smali
@@ -54,7 +54,7 @@
 
     move-result v2
 
-    if-eqz v2, :cond_1
+    if-eqz v2, :cond_2
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -64,6 +64,8 @@
 
     check-cast v2, Lcom/lytefast/flexinput/fragment/CameraFragment$d;
 
+    if-eqz v2, :cond_1
+
     iget-object v3, v2, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->a:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
     invoke-static {v3}, Lcom/lytefast/flexinput/fragment/CameraFragment;->g(Lcom/lytefast/flexinput/fragment/CameraFragment;)Lf/b/a/b;
@@ -93,5 +95,10 @@
     goto :goto_0
 
     :cond_1
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/m/a/m/a.smali b/com.discord/smali_classes2/f/m/a/m/a.smali
index 0cd1424845..67ca8b3c1d 100644
--- a/com.discord/smali_classes2/f/m/a/m/a.smali
+++ b/com.discord/smali_classes2/f/m/a/m/a.smali
@@ -121,19 +121,19 @@
 
     const-string v7, ";\nvarying vec2 "
 
-    invoke-static {v5, v0, v6, v1, v7}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v5, v0, v6, v1, v7}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v6, ";\nvoid main() {\n    gl_Position = "
 
     const-string v7, " * "
 
-    invoke-static {v5, v4, v6, v2, v7}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v5, v4, v6, v2, v7}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string v2, ";\n    "
 
     const-string v6, " = ("
 
-    invoke-static {v5, v0, v2, v4, v6}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v5, v0, v2, v4, v6}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {v5, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -153,7 +153,7 @@
 .end method
 
 .method public d(J[F)V
-    .locals 23
+    .locals 18
     .param p3    # [F
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -183,452 +183,467 @@
 
     invoke-virtual {v1, v3, v2}, Lf/m/a/b;->a(I[Ljava/lang/Object;)Ljava/lang/String;
 
-    goto/16 :goto_7
+    goto/16 :goto_6
 
     :cond_0
-    if-eqz v1, :cond_15
+    if-eqz v2, :cond_13
+
+    const-string v7, "<set-?>"
+
+    invoke-static {v1, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object v1, v2, Lf/m/b/d/d;->e:[F
 
-    iget-object v1, v0, Lf/m/a/m/a;->b:Lf/m/b/b/b;
+    iget-object v1, v0, Lf/m/a/m/a;->a:Lf/m/b/d/d;
 
-    iget-object v7, v1, Lf/m/b/b/b;->a:[F
+    iget-object v2, v0, Lf/m/a/m/a;->b:Lf/m/b/b/b;
 
-    if-eqz v7, :cond_14
+    iget-object v7, v2, Lf/m/b/b/b;->a:[F
 
-    instance-of v8, v1, Lf/m/b/b/a;
+    if-eqz v1, :cond_12
 
-    if-eqz v8, :cond_13
+    const-string v8, "drawable"
 
-    iget-object v8, v2, Lf/m/b/d/d;->n:Lf/m/b/e/b;
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v8, :cond_1
+    const-string v9, "modelViewProjectionMatrix"
 
-    invoke-virtual {v8}, Lf/m/b/e/b;->a()V
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v9, v2, Lf/m/b/b/a;
+
+    if-eqz v9, :cond_11
+
+    iget-object v9, v1, Lf/m/b/d/d;->n:Lf/m/b/e/a;
+
+    if-eqz v9, :cond_1
+
+    invoke-virtual {v9}, Lf/m/b/e/a;->a()V
 
     :cond_1
-    iget-object v8, v2, Lf/m/b/d/d;->j:Lf/m/b/d/b;
+    iget-object v9, v1, Lf/m/b/d/d;->j:Lf/m/b/d/b;
 
-    iget v8, v8, Lf/m/b/d/b;->a:I
+    iget v9, v9, Lf/m/b/d/b;->a:I
 
-    invoke-static {v8, v4, v5, v7, v5}, Landroid/opengl/GLES20;->glUniformMatrix4fv(IIZ[FI)V
+    invoke-static {v9, v4, v5, v7, v5}, Landroid/opengl/GLES20;->glUniformMatrix4fv(IIZ[FI)V
 
     const-string v7, "glUniformMatrix4fv"
 
     invoke-static {v7}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    iget-object v8, v2, Lf/m/b/d/d;->f:Lf/m/b/d/b;
+    iget-object v9, v1, Lf/m/b/d/d;->f:Lf/m/b/d/b;
 
-    if-eqz v8, :cond_2
+    if-eqz v9, :cond_2
 
-    iget v8, v8, Lf/m/b/d/b;->a:I
+    iget v9, v9, Lf/m/b/d/b;->a:I
 
-    iget-object v9, v2, Lf/m/b/d/d;->e:[F
+    iget-object v10, v1, Lf/m/b/d/d;->e:[F
 
-    invoke-static {v8, v4, v5, v9, v5}, Landroid/opengl/GLES20;->glUniformMatrix4fv(IIZ[FI)V
+    invoke-static {v9, v4, v5, v10, v5}, Landroid/opengl/GLES20;->glUniformMatrix4fv(IIZ[FI)V
 
     invoke-static {v7}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
     :cond_2
-    iget-object v7, v2, Lf/m/b/d/d;->i:Lf/m/b/d/b;
-
-    iget v8, v7, Lf/m/b/d/b;->b:I
-
-    invoke-static {v8}, Landroid/opengl/GLES20;->glEnableVertexAttribArray(I)V
-
-    const-string v8, "glEnableVertexAttribArray"
-
-    invoke-static {v8}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
+    iget-object v7, v1, Lf/m/b/d/d;->i:Lf/m/b/d/b;
 
     iget v9, v7, Lf/m/b/d/b;->b:I
 
-    const/4 v10, 0x2
+    invoke-static {v9}, Landroid/opengl/GLES20;->glEnableVertexAttribArray(I)V
 
-    const/16 v11, 0x1406
-
-    const/4 v12, 0x0
-
-    move-object v7, v1
-
-    check-cast v7, Lf/m/b/b/a;
-
-    iget v13, v7, Lf/m/b/b/a;->b:I
-
-    mul-int/lit8 v13, v13, 0x4
-
-    move-object v15, v1
-
-    check-cast v15, Lf/m/b/b/c;
-
-    iget-object v14, v15, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
-
-    invoke-static/range {v9 .. v14}, Landroid/opengl/GLES20;->glVertexAttribPointer(IIIZILjava/nio/Buffer;)V
-
-    const-string v9, "glVertexAttribPointer"
+    const-string v9, "glEnableVertexAttribArray"
 
     invoke-static {v9}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    iget-object v10, v2, Lf/m/b/d/d;->h:Lf/m/b/d/b;
+    iget v10, v7, Lf/m/b/d/b;->b:I
 
-    if-eqz v10, :cond_d
+    const/4 v11, 0x2
 
-    iget-object v11, v2, Lf/m/b/d/d;->m:Lf/m/b/b/a;
+    const/16 v12, 0x1406
 
-    invoke-static {v1, v11}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    const/4 v13, 0x0
 
-    move-result v1
+    move-object v7, v2
 
-    xor-int/2addr v1, v4
+    check-cast v7, Lf/m/b/b/a;
+
+    iget v14, v7, Lf/m/b/b/a;->b:I
+
+    mul-int/lit8 v14, v14, 0x4
+
+    move-object v15, v2
+
+    check-cast v15, Lf/m/b/b/c;
+
+    iget-object v6, v15, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
+
+    move-object v3, v15
+
+    move-object v15, v6
+
+    invoke-static/range {v10 .. v15}, Landroid/opengl/GLES20;->glVertexAttribPointer(IIIZILjava/nio/Buffer;)V
+
+    const-string v6, "glVertexAttribPointer"
+
+    invoke-static {v6}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
+
+    iget-object v10, v1, Lf/m/b/d/d;->h:Lf/m/b/d/b;
+
+    if-eqz v10, :cond_c
+
+    iget-object v11, v1, Lf/m/b/d/d;->m:Lf/m/b/b/a;
+
+    invoke-static {v2, v11}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/2addr v2, v4
 
     const-string v11, "textureCoordsBuffer"
 
-    if-nez v1, :cond_3
+    if-nez v2, :cond_3
 
-    iget v1, v2, Lf/m/b/d/d;->l:I
+    iget v2, v1, Lf/m/b/d/d;->l:I
 
-    if-eqz v1, :cond_b
+    if-eqz v2, :cond_b
 
     :cond_3
-    iput-object v7, v2, Lf/m/b/d/d;->m:Lf/m/b/b/a;
+    iput-object v7, v1, Lf/m/b/d/d;->m:Lf/m/b/b/a;
 
-    iput v5, v2, Lf/m/b/d/d;->l:I
+    iput v5, v1, Lf/m/b/d/d;->l:I
 
-    iget-object v1, v2, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
+    iget-object v2, v1, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
 
-    if-eqz v1, :cond_c
+    const-string v12, "rect"
+
+    invoke-static {v2, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const v12, 0x7f7fffff    # Float.MAX_VALUE
 
     const v13, -0x800001
 
-    const v4, -0x800001
-
     const v13, 0x7f7fffff    # Float.MAX_VALUE
 
     const v14, -0x800001
 
+    const v15, -0x800001
+
     const/16 v16, 0x0
 
     :goto_0
-    move-object v5, v7
+    move-object v4, v7
 
-    check-cast v5, Lf/m/b/b/c;
+    check-cast v4, Lf/m/b/b/c;
 
-    iget-object v6, v5, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
+    iget-object v5, v4, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v6}, Ljava/nio/FloatBuffer;->hasRemaining()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_5
-
-    iget-object v5, v5, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
-
-    invoke-virtual {v5}, Ljava/nio/FloatBuffer;->get()F
+    invoke-virtual {v5}, Ljava/nio/FloatBuffer;->hasRemaining()Z
 
     move-result v5
 
-    rem-int/lit8 v6, v16, 0x2
+    if-eqz v5, :cond_5
 
-    if-nez v6, :cond_4
+    iget-object v4, v4, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
 
-    invoke-static {v12, v5}, Ljava/lang/Math;->min(FF)F
-
-    move-result v6
-
-    invoke-static {v4, v5}, Ljava/lang/Math;->max(FF)F
+    invoke-virtual {v4}, Ljava/nio/FloatBuffer;->get()F
 
     move-result v4
 
-    move v12, v6
+    rem-int/lit8 v5, v16, 0x2
+
+    if-nez v5, :cond_4
+
+    invoke-static {v12, v4}, Ljava/lang/Math;->min(FF)F
+
+    move-result v5
+
+    invoke-static {v15, v4}, Ljava/lang/Math;->max(FF)F
+
+    move-result v4
+
+    move v15, v4
+
+    move v12, v5
 
     goto :goto_1
 
     :cond_4
-    invoke-static {v14, v5}, Ljava/lang/Math;->max(FF)F
-
-    move-result v6
-
-    invoke-static {v13, v5}, Ljava/lang/Math;->min(FF)F
+    invoke-static {v14, v4}, Ljava/lang/Math;->max(FF)F
 
     move-result v5
 
-    move v13, v5
+    invoke-static {v13, v4}, Ljava/lang/Math;->min(FF)F
 
-    move v14, v6
+    move-result v4
+
+    move v13, v4
+
+    move v14, v5
 
     :goto_1
     add-int/lit8 v16, v16, 0x1
 
+    const/4 v5, 0x0
+
     goto :goto_0
 
     :cond_5
-    iget-object v5, v5, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
+    iget-object v4, v4, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v5}, Ljava/nio/FloatBuffer;->rewind()Ljava/nio/Buffer;
+    invoke-virtual {v4}, Ljava/nio/FloatBuffer;->rewind()Ljava/nio/Buffer;
 
-    invoke-virtual {v1, v12, v14, v4, v13}, Landroid/graphics/RectF;->set(FFFF)V
+    invoke-virtual {v2, v12, v14, v15, v13}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object v1, v15, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
+    iget-object v2, v3, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v1}, Ljava/nio/FloatBuffer;->limit()I
+    invoke-virtual {v2}, Ljava/nio/FloatBuffer;->limit()I
 
-    move-result v1
+    move-result v2
 
     iget v4, v7, Lf/m/b/b/a;->b:I
 
-    div-int/2addr v1, v4
+    div-int/2addr v2, v4
 
-    mul-int/lit8 v1, v1, 0x2
+    const/4 v4, 0x2
 
-    iget-object v3, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    mul-int/lit8 v2, v2, 0x2
 
-    invoke-virtual {v3}, Ljava/nio/FloatBuffer;->capacity()I
+    iget-object v4, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
-    move-result v3
+    invoke-virtual {v4}, Ljava/nio/FloatBuffer;->capacity()I
 
-    if-ge v3, v1, :cond_7
+    move-result v4
 
-    iget-object v3, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    if-ge v4, v2, :cond_7
 
-    invoke-static {v3, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object v4, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
-    instance-of v4, v3, Lf/m/b/f/a;
+    invoke-static {v4, v11}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_6
+    const-string v5, "$this$dispose"
 
-    check-cast v3, Lf/m/b/f/a;
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v3}, Lf/m/b/f/a;->dispose()V
+    instance-of v5, v4, Lf/m/b/f/a;
+
+    if-eqz v5, :cond_6
+
+    check-cast v4, Lf/m/b/f/a;
+
+    invoke-interface {v4}, Lf/m/b/f/a;->dispose()V
 
     :cond_6
-    invoke-static {v1}, Lf/h/a/c/i1/e;->G0(I)Ljava/nio/FloatBuffer;
+    invoke-static {v2}, Lf/h/a/c/i1/e;->G0(I)Ljava/nio/FloatBuffer;
 
-    move-result-object v3
+    move-result-object v4
 
-    iput-object v3, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    iput-object v4, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
     :cond_7
-    iget-object v3, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    iget-object v4, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v3}, Ljava/nio/FloatBuffer;->clear()Ljava/nio/Buffer;
+    invoke-virtual {v4}, Ljava/nio/FloatBuffer;->clear()Ljava/nio/Buffer;
 
-    iget-object v3, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    iget-object v4, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v3, v1}, Ljava/nio/FloatBuffer;->limit(I)Ljava/nio/Buffer;
+    invoke-virtual {v4, v2}, Ljava/nio/FloatBuffer;->limit(I)Ljava/nio/Buffer;
 
-    const/4 v3, 0x0
+    const/4 v4, 0x0
 
     :goto_2
-    if-ge v3, v1, :cond_b
+    if-ge v4, v2, :cond_b
 
-    rem-int/lit8 v4, v3, 0x2
+    rem-int/lit8 v5, v4, 0x2
 
-    if-nez v4, :cond_8
+    if-nez v5, :cond_8
 
-    const/4 v4, 0x1
+    const/4 v5, 0x1
 
     goto :goto_3
 
     :cond_8
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     :goto_3
-    iget-object v5, v15, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
+    iget-object v12, v3, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v5, v3}, Ljava/nio/FloatBuffer;->get(I)F
+    invoke-virtual {v12, v4}, Ljava/nio/FloatBuffer;->get(I)F
 
-    move-result v5
+    move-result v12
 
-    iget-object v6, v2, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
+    iget-object v13, v1, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
 
-    if-eqz v4, :cond_9
+    if-eqz v5, :cond_9
 
-    iget v6, v6, Landroid/graphics/RectF;->left:F
+    iget v13, v13, Landroid/graphics/RectF;->left:F
 
     goto :goto_4
 
     :cond_9
-    iget v6, v6, Landroid/graphics/RectF;->bottom:F
+    iget v13, v13, Landroid/graphics/RectF;->bottom:F
 
     :goto_4
-    if-eqz v4, :cond_a
+    if-eqz v5, :cond_a
 
-    iget-object v4, v2, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
+    iget-object v5, v1, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
 
-    iget v4, v4, Landroid/graphics/RectF;->right:F
+    iget v5, v5, Landroid/graphics/RectF;->right:F
 
     goto :goto_5
 
     :cond_a
-    iget-object v4, v2, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
+    iget-object v5, v1, Lf/m/b/d/d;->k:Landroid/graphics/RectF;
 
-    iget v4, v4, Landroid/graphics/RectF;->top:F
+    iget v5, v5, Landroid/graphics/RectF;->top:F
 
     :goto_5
-    div-int/lit8 v12, v3, 0x2
+    div-int/lit8 v14, v4, 0x2
 
-    sub-float/2addr v5, v6
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sub-float/2addr v4, v6
+    sub-float/2addr v12, v13
 
-    div-float/2addr v5, v4
+    sub-float/2addr v5, v13
 
-    const/4 v4, 0x0
+    div-float/2addr v12, v5
 
-    const/high16 v6, 0x3f800000    # 1.0f
+    const/high16 v5, 0x3f800000    # 1.0f
 
-    mul-float v5, v5, v6
+    mul-float v12, v12, v5
 
-    add-float/2addr v5, v4
+    const/4 v5, 0x0
 
-    iget-object v4, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    add-float/2addr v12, v5
 
-    invoke-virtual {v4, v5}, Ljava/nio/FloatBuffer;->put(F)Ljava/nio/FloatBuffer;
+    iget-object v5, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
-    add-int/lit8 v3, v3, 0x1
+    invoke-virtual {v5, v12}, Ljava/nio/FloatBuffer;->put(F)Ljava/nio/FloatBuffer;
+
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_2
 
     :cond_b
-    iget-object v1, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    iget-object v2, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v1}, Ljava/nio/FloatBuffer;->rewind()Ljava/nio/Buffer;
+    invoke-virtual {v2}, Ljava/nio/FloatBuffer;->rewind()Ljava/nio/Buffer;
 
-    iget v1, v10, Lf/m/b/d/b;->b:I
+    iget v2, v10, Lf/m/b/d/b;->b:I
 
-    invoke-static {v1}, Landroid/opengl/GLES20;->glEnableVertexAttribArray(I)V
-
-    invoke-static {v8}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
-
-    iget v1, v10, Lf/m/b/d/b;->b:I
-
-    const/16 v18, 0x2
-
-    const/16 v19, 0x1406
-
-    const/16 v20, 0x0
-
-    iget v3, v7, Lf/m/b/b/a;->b:I
-
-    mul-int/lit8 v21, v3, 0x4
-
-    iget-object v2, v2, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
-
-    invoke-static {v2, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move/from16 v17, v1
-
-    move-object/from16 v22, v2
-
-    invoke-static/range {v17 .. v22}, Landroid/opengl/GLES20;->glVertexAttribPointer(IIIZILjava/nio/Buffer;)V
+    invoke-static {v2}, Landroid/opengl/GLES20;->glEnableVertexAttribArray(I)V
 
     invoke-static {v9}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    goto :goto_6
+    iget v12, v10, Lf/m/b/d/b;->b:I
+
+    const/4 v13, 0x2
+
+    const/16 v14, 0x1406
+
+    const/4 v15, 0x0
+
+    iget v2, v7, Lf/m/b/b/a;->b:I
+
+    mul-int/lit8 v16, v2, 0x4
+
+    iget-object v1, v1, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+
+    invoke-static {v1, v11}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v17, v1
+
+    invoke-static/range {v12 .. v17}, Landroid/opengl/GLES20;->glVertexAttribPointer(IIIZILjava/nio/Buffer;)V
+
+    invoke-static {v6}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
     :cond_c
-    const-string v1, "rect"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
-
-    :cond_d
-    :goto_6
     iget-object v1, v0, Lf/m/a/m/a;->a:Lf/m/b/d/d;
 
     iget-object v2, v0, Lf/m/a/m/a;->b:Lf/m/b/b/b;
 
-    if-eqz v1, :cond_12
+    if-eqz v1, :cond_10
 
-    const-string v1, "drawable"
-
-    if-eqz v2, :cond_11
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v2, Lf/m/b/b/c;
 
-    const-string v3, "glDrawArrays start"
+    const-string v1, "glDrawArrays start"
 
-    invoke-static {v3}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
+    invoke-static {v1}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    const/4 v3, 0x5
+    const/4 v1, 0x5
 
-    iget-object v4, v2, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
+    iget-object v3, v2, Lf/m/b/b/c;->c:Ljava/nio/FloatBuffer;
 
-    invoke-virtual {v4}, Ljava/nio/FloatBuffer;->limit()I
+    invoke-virtual {v3}, Ljava/nio/FloatBuffer;->limit()I
 
-    move-result v4
+    move-result v3
 
     iget v2, v2, Lf/m/b/b/a;->b:I
 
-    div-int/2addr v4, v2
+    div-int/2addr v3, v2
 
     const/4 v2, 0x0
 
-    invoke-static {v3, v2, v4}, Landroid/opengl/GLES20;->glDrawArrays(III)V
+    invoke-static {v1, v2, v3}, Landroid/opengl/GLES20;->glDrawArrays(III)V
 
-    const-string v2, "glDrawArrays end"
+    const-string v1, "glDrawArrays end"
 
-    invoke-static {v2}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
+    invoke-static {v1}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    iget-object v2, v0, Lf/m/a/m/a;->a:Lf/m/b/d/d;
+    iget-object v1, v0, Lf/m/a/m/a;->a:Lf/m/b/d/d;
 
-    iget-object v3, v0, Lf/m/a/m/a;->b:Lf/m/b/b/b;
-
-    if-eqz v3, :cond_10
-
-    iget-object v1, v2, Lf/m/b/d/d;->i:Lf/m/b/d/b;
-
-    iget v1, v1, Lf/m/b/d/b;->b:I
-
-    invoke-static {v1}, Landroid/opengl/GLES20;->glDisableVertexAttribArray(I)V
-
-    iget-object v1, v2, Lf/m/b/d/d;->h:Lf/m/b/d/b;
-
-    if-eqz v1, :cond_e
-
-    iget v1, v1, Lf/m/b/d/b;->b:I
-
-    invoke-static {v1}, Landroid/opengl/GLES20;->glDisableVertexAttribArray(I)V
-
-    :cond_e
-    iget-object v1, v2, Lf/m/b/d/d;->n:Lf/m/b/e/b;
+    iget-object v2, v0, Lf/m/a/m/a;->b:Lf/m/b/b/b;
 
     if-eqz v1, :cond_f
 
-    invoke-virtual {v1}, Lf/m/b/e/b;->b()V
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_f
+    invoke-static {v2, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v1, Lf/m/b/d/d;->i:Lf/m/b/d/b;
+
+    iget v2, v2, Lf/m/b/d/b;->b:I
+
+    invoke-static {v2}, Landroid/opengl/GLES20;->glDisableVertexAttribArray(I)V
+
+    iget-object v2, v1, Lf/m/b/d/d;->h:Lf/m/b/d/b;
+
+    if-eqz v2, :cond_d
+
+    iget v2, v2, Lf/m/b/d/b;->b:I
+
+    invoke-static {v2}, Landroid/opengl/GLES20;->glDisableVertexAttribArray(I)V
+
+    :cond_d
+    iget-object v1, v1, Lf/m/b/d/d;->n:Lf/m/b/e/a;
+
+    if-eqz v1, :cond_e
+
+    invoke-virtual {v1}, Lf/m/b/e/a;->c()V
+
+    :cond_e
     const-string v1, "onPostDraw end"
 
     invoke-static {v1}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    :goto_7
+    :goto_6
     return-void
 
+    :cond_f
+    const/4 v1, 0x0
+
+    throw v1
+
     :cond_10
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const/4 v1, 0x0
 
-    const/4 v2, 0x0
-
-    throw v2
+    throw v1
 
     :cond_11
-    const/4 v2, 0x0
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_12
-    const/4 v2, 0x0
-
-    throw v2
-
-    :cond_13
     new-instance v1, Ljava/lang/RuntimeException;
 
     const-string v2, "GlTextureProgram only supports 2D drawables."
@@ -637,36 +652,24 @@
 
     throw v1
 
-    :cond_14
-    const/4 v2, 0x0
+    :cond_12
+    const/4 v1, 0x0
 
-    const-string v1, "modelViewProjectionMatrix"
+    throw v1
 
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :cond_13
+    const/4 v1, 0x0
 
-    throw v2
-
-    :cond_15
-    const/4 v2, 0x0
-
-    const-string v1, "<set-?>"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    throw v1
 .end method
 
 .method public e()V
-    .locals 7
+    .locals 5
 
     iget-object v0, p0, Lf/m/a/m/a;->a:Lf/m/b/d/d;
 
     iget-boolean v1, v0, Lf/m/b/d/a;->a:Z
 
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
     if-nez v1, :cond_2
 
     iget-boolean v1, v0, Lf/m/b/d/a;->c:Z
@@ -680,85 +683,58 @@
     :cond_0
     iget-object v1, v0, Lf/m/b/d/a;->d:[Lf/m/b/d/c;
 
-    array-length v4, v1
+    array-length v2, v1
 
-    const/4 v5, 0x0
+    const/4 v3, 0x0
 
     :goto_0
-    if-ge v5, v4, :cond_1
+    if-ge v3, v2, :cond_1
 
-    aget-object v6, v1, v5
+    aget-object v4, v1, v3
 
-    iget v6, v6, Lf/m/b/d/c;->a:I
+    iget v4, v4, Lf/m/b/d/c;->a:I
 
-    invoke-static {v6}, Landroid/opengl/GLES20;->glDeleteShader(I)V
+    invoke-static {v4}, Landroid/opengl/GLES20;->glDeleteShader(I)V
 
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v3, v3, 0x1
 
     goto :goto_0
 
     :cond_1
-    iput-boolean v3, v0, Lf/m/b/d/a;->a:Z
+    const/4 v1, 0x1
+
+    iput-boolean v1, v0, Lf/m/b/d/a;->a:Z
 
     :cond_2
     iget-object v1, v0, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
-    const-string v4, "textureCoordsBuffer"
+    const-string v2, "textureCoordsBuffer"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of v4, v1, Lf/m/b/f/a;
+    const-string v2, "$this$dispose"
 
-    if-eqz v4, :cond_3
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v2, v1, Lf/m/b/f/a;
+
+    if-eqz v2, :cond_3
 
     check-cast v1, Lf/m/b/f/a;
 
     invoke-interface {v1}, Lf/m/b/f/a;->dispose()V
 
     :cond_3
-    iget-object v1, v0, Lf/m/b/d/d;->n:Lf/m/b/e/b;
+    iget-object v1, v0, Lf/m/b/d/d;->n:Lf/m/b/e/a;
 
-    if-eqz v1, :cond_5
+    if-eqz v1, :cond_4
 
-    new-array v4, v3, [I
-
-    iget v1, v1, Lf/m/b/e/b;->a:I
-
-    aput v1, v4, v2
-
-    new-array v1, v3, [I
-
-    const/4 v5, 0x0
-
-    :goto_1
-    if-ge v5, v3, :cond_4
-
-    aget v6, v4, v5
-
-    aput v6, v1, v5
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_1
+    invoke-virtual {v1}, Lf/m/b/e/a;->b()V
 
     :cond_4
-    invoke-static {v3, v1, v2}, Landroid/opengl/GLES20;->glDeleteTextures(I[II)V
-
-    :goto_2
-    if-ge v2, v3, :cond_5
-
-    aget v5, v1, v2
-
-    aput v5, v4, v2
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_2
-
-    :cond_5
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lf/m/b/d/d;->n:Lf/m/b/e/b;
+    iput-object v1, v0, Lf/m/b/d/d;->n:Lf/m/b/e/a;
 
     iput-object v1, p0, Lf/m/a/m/a;->a:Lf/m/b/d/d;
 
diff --git a/com.discord/smali_classes2/f/m/a/p/b.smali b/com.discord/smali_classes2/f/m/a/p/b.smali
index fa001bc0a0..7d60bee8a9 100644
--- a/com.discord/smali_classes2/f/m/a/p/b.smali
+++ b/com.discord/smali_classes2/f/m/a/p/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final a:Lf/m/b/e/b;
+.field public final a:Lf/m/b/e/a;
 
 .field public b:[F
 
@@ -30,7 +30,7 @@
 .method public constructor <init>()V
     .locals 5
 
-    new-instance v0, Lf/m/b/e/b;
+    new-instance v0, Lf/m/b/e/a;
 
     const/4 v1, 0x4
 
@@ -40,7 +40,7 @@
 
     const/4 v4, 0x0
 
-    invoke-direct {v0, v2, v3, v4, v1}, Lf/m/b/e/b;-><init>(IILjava/lang/Integer;I)V
+    invoke-direct {v0, v2, v3, v4, v1}, Lf/m/b/e/a;-><init>(IILjava/lang/Integer;I)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -66,7 +66,7 @@
 
     iput v1, p0, Lf/m/a/p/b;->e:I
 
-    iput-object v0, p0, Lf/m/a/p/b;->a:Lf/m/b/e/b;
+    iput-object v0, p0, Lf/m/a/p/b;->a:Lf/m/b/e/a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/f/m/a/u/d$b.smali b/com.discord/smali_classes2/f/m/a/u/d$b.smali
index e20a2594b1..e31de10fa1 100644
--- a/com.discord/smali_classes2/f/m/a/u/d$b.smali
+++ b/com.discord/smali_classes2/f/m/a/u/d$b.smali
@@ -48,7 +48,7 @@
     :cond_0
     iget v1, p1, Lf/m/a/u/a;->f:I
 
-    if-lez v1, :cond_c
+    if-lez v1, :cond_a
 
     iget v1, p1, Lf/m/a/u/a;->g:I
 
@@ -157,8 +157,6 @@
 
     const/4 v3, -0x1
 
-    const/4 v4, 0x0
-
     if-eqz p1, :cond_5
 
     iget p1, v0, Lf/m/a/p/b;->e:I
@@ -183,12 +181,14 @@
 
     iput-object p1, v0, Lf/m/a/p/b;->c:Lf/m/a/m/b;
 
-    iput-object v4, v0, Lf/m/a/p/b;->d:Lf/m/a/m/b;
+    const/4 p1, 0x0
+
+    iput-object p1, v0, Lf/m/a/p/b;->d:Lf/m/a/m/b;
 
     :cond_5
     iget p1, v0, Lf/m/a/p/b;->e:I
 
-    if-ne p1, v3, :cond_b
+    if-ne p1, v3, :cond_9
 
     iget-object p1, v0, Lf/m/a/p/b;->c:Lf/m/a/m/b;
 
@@ -202,9 +202,13 @@
 
     move-result-object v3
 
-    if-eqz p1, :cond_a
+    const-string v4, "vertexShaderSource"
 
-    if-eqz v3, :cond_9
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "fragmentShaderSource"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v4, 0x2
 
@@ -212,13 +216,13 @@
 
     invoke-static {}, Lf/m/b/c/a;->e()I
 
-    const v6, 0x8b31
+    new-instance v6, Lf/m/b/d/c;
 
-    new-instance v7, Lf/m/b/d/c;
+    const v7, 0x8b31
 
-    invoke-direct {v7, v6, p1}, Lf/m/b/d/c;-><init>(ILjava/lang/String;)V
+    invoke-direct {v6, v7, p1}, Lf/m/b/d/c;-><init>(ILjava/lang/String;)V
 
-    aput-object v7, v5, v8
+    aput-object v6, v5, v8
 
     const p1, 0x8b30
 
@@ -230,6 +234,10 @@
 
     aput-object v6, v5, p1
 
+    const-string v3, "shaders"
+
+    invoke-static {v5, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {}, Landroid/opengl/GLES20;->glCreateProgram()I
 
     move-result v3
@@ -319,20 +327,6 @@
     throw p1
 
     :cond_9
-    const-string p1, "fragmentShaderSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_a
-    const-string p1, "vertexShaderSource"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_b
     :goto_2
     iget p1, v0, Lf/m/a/p/b;->e:I
 
@@ -342,9 +336,9 @@
 
     invoke-static {p1}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    iget-object p1, v0, Lf/m/a/p/b;->a:Lf/m/b/e/b;
+    iget-object p1, v0, Lf/m/a/p/b;->a:Lf/m/b/e/a;
 
-    invoke-virtual {p1}, Lf/m/b/e/b;->a()V
+    invoke-virtual {p1}, Lf/m/b/e/a;->a()V
 
     iget-object p1, v0, Lf/m/a/p/b;->c:Lf/m/a/m/b;
 
@@ -352,9 +346,9 @@
 
     invoke-interface {p1, v1, v2, v3}, Lf/m/a/m/b;->d(J[F)V
 
-    iget-object p1, v0, Lf/m/a/p/b;->a:Lf/m/b/e/b;
+    iget-object p1, v0, Lf/m/a/p/b;->a:Lf/m/b/e/a;
 
-    invoke-virtual {p1}, Lf/m/b/e/b;->b()V
+    invoke-virtual {p1}, Lf/m/b/e/a;->c()V
 
     invoke-static {v8}, Landroid/opengl/GLES20;->glUseProgram(I)V
 
@@ -375,7 +369,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_c
+    if-eqz v0, :cond_a
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -397,7 +391,7 @@
 
     goto :goto_3
 
-    :cond_c
+    :cond_a
     :goto_4
     return-void
 .end method
@@ -482,9 +476,9 @@
 
     iput-object v0, p2, Lf/m/a/p/b;->d:Lf/m/a/m/b;
 
-    iget-object p2, p2, Lf/m/a/p/b;->a:Lf/m/b/e/b;
+    iget-object p2, p2, Lf/m/a/p/b;->a:Lf/m/b/e/a;
 
-    iget p2, p2, Lf/m/b/e/b;->a:I
+    iget p2, p2, Lf/m/b/e/a;->a:I
 
     new-instance v0, Landroid/graphics/SurfaceTexture;
 
diff --git a/com.discord/smali_classes2/f/m/b/a/a.smali b/com.discord/smali_classes2/f/m/b/a/a.smali
index b379349a3f..0f5e3fc8d7 100644
--- a/com.discord/smali_classes2/f/m/b/a/a.smali
+++ b/com.discord/smali_classes2/f/m/b/a/a.smali
@@ -15,6 +15,14 @@
 
     new-array v0, v0, [F
 
+    const-string v1, "$this$makeIdentity"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "matrix"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Landroid/opengl/Matrix;->setIdentityM([FI)V
@@ -27,7 +35,9 @@
 .method public static final a(Ljava/lang/String;)V
     .locals 3
 
-    if-eqz p0, :cond_1
+    const-string v0, "opName"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Landroid/opengl/GLES20;->glGetError()I
 
@@ -54,7 +64,7 @@
 
     const-string v2, "Integer.toHexString(value)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -68,7 +78,7 @@
 
     const-string v1, "GLU.gluErrorString(value)"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -85,21 +95,14 @@
     invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_1
-    const-string p0, "opName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final b(ILjava/lang/String;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "label"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-ltz p0, :cond_0
 
@@ -133,13 +136,4 @@
     invoke-direct {p1, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_1
-    const-string p0, "label"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
diff --git a/com.discord/smali_classes2/f/m/b/d/a.smali b/com.discord/smali_classes2/f/m/b/d/a.smali
index 581545b51f..686ee7351c 100644
--- a/com.discord/smali_classes2/f/m/b/d/a.smali
+++ b/com.discord/smali_classes2/f/m/b/d/a.smali
@@ -15,7 +15,11 @@
 
 # direct methods
 .method public varargs constructor <init>(IZ[Lf/m/b/d/c;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "shaders"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/f/m/b/d/c.smali b/com.discord/smali_classes2/f/m/b/d/c.smali
index d3f143ad24..9db17cafbe 100644
--- a/com.discord/smali_classes2/f/m/b/d/c.smali
+++ b/com.discord/smali_classes2/f/m/b/d/c.smali
@@ -37,6 +37,10 @@
 .method public constructor <init>(ILjava/lang/String;)V
     .locals 4
 
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {p1}, Landroid/opengl/GLES20;->glCreateShader(I)I
 
     move-result v0
diff --git a/com.discord/smali_classes2/f/m/b/d/d.smali b/com.discord/smali_classes2/f/m/b/d/d.smali
index 13a4835939..2b1aaa87e7 100644
--- a/com.discord/smali_classes2/f/m/b/d/d.smali
+++ b/com.discord/smali_classes2/f/m/b/d/d.smali
@@ -22,28 +22,34 @@
 
 .field public m:Lf/m/b/b/a;
 
-.field public n:Lf/m/b/e/b;
+.field public n:Lf/m/b/e/a;
 
 
 # direct methods
 .method public constructor <init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 5
 
+    const-string v0, "vertexPositionName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "vertexMvpMatrixName"
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lf/m/b/d/b$a;->d:Lf/m/b/d/b$a;
+
+    sget-object v3, Lf/m/b/d/b$a;->e:Lf/m/b/d/b$a;
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
-    if-eqz p2, :cond_3
+    new-array v1, v0, [Lf/m/b/d/c;
 
-    if-eqz p3, :cond_2
-
-    sget-object v1, Lf/m/b/d/b$a;->d:Lf/m/b/d/b$a;
-
-    sget-object v2, Lf/m/b/d/b$a;->e:Lf/m/b/d/b$a;
-
-    const/4 v3, 0x0
-
-    new-array v4, v3, [Lf/m/b/d/c;
-
-    invoke-direct {p0, p1, v3, v4}, Lf/m/b/d/a;-><init>(IZ[Lf/m/b/d/c;)V
+    invoke-direct {p0, p1, v0, v1}, Lf/m/b/d/a;-><init>(IZ[Lf/m/b/d/c;)V
 
     sget-object p1, Lf/m/b/a/a;->a:[F
 
@@ -53,61 +59,81 @@
 
     iput-object p1, p0, Lf/m/b/d/d;->e:[F
 
+    const-string p1, "name"
+
+    const/4 v0, 0x0
+
     if-eqz p5, :cond_0
 
-    iget p1, p0, Lf/m/b/d/a;->b:I
+    invoke-static {p5, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v3, Lf/m/b/d/b;
+    iget v1, p0, Lf/m/b/d/a;->b:I
 
-    invoke-direct {v3, p1, v2, p5, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-static {p5, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Lf/m/b/d/b;
+
+    invoke-direct {v4, v1, v3, p5, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     goto :goto_0
 
     :cond_0
-    move-object v3, v0
+    move-object v4, v0
 
     :goto_0
-    iput-object v3, p0, Lf/m/b/d/d;->f:Lf/m/b/d/b;
+    iput-object v4, p0, Lf/m/b/d/d;->f:Lf/m/b/d/b;
 
-    const/16 p1, 0x8
+    const/16 p5, 0x8
 
-    invoke-static {p1}, Lf/h/a/c/i1/e;->G0(I)Ljava/nio/FloatBuffer;
+    invoke-static {p5}, Lf/h/a/c/i1/e;->G0(I)Ljava/nio/FloatBuffer;
 
-    move-result-object p1
+    move-result-object p5
 
-    iput-object p1, p0, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
+    iput-object p5, p0, Lf/m/b/d/d;->g:Ljava/nio/FloatBuffer;
 
     if-eqz p4, :cond_1
 
-    iget p1, p0, Lf/m/b/d/a;->b:I
+    invoke-static {p4, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p5, Lf/m/b/d/b;
+    iget p5, p0, Lf/m/b/d/a;->b:I
 
-    invoke-direct {p5, p1, v1, p4, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-static {p4, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lf/m/b/d/b;
+
+    invoke-direct {v1, p5, v2, p4, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     goto :goto_1
 
     :cond_1
-    move-object p5, v0
+    move-object v1, v0
 
     :goto_1
-    iput-object p5, p0, Lf/m/b/d/d;->h:Lf/m/b/d/b;
+    iput-object v1, p0, Lf/m/b/d/d;->h:Lf/m/b/d/b;
 
-    iget p1, p0, Lf/m/b/d/a;->b:I
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p4, Lf/m/b/d/b;
+    iget p4, p0, Lf/m/b/d/a;->b:I
 
-    invoke-direct {p4, p1, v1, p2, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p4, p0, Lf/m/b/d/d;->i:Lf/m/b/d/b;
+    new-instance p5, Lf/m/b/d/b;
 
-    iget p1, p0, Lf/m/b/d/a;->b:I
+    invoke-direct {p5, p4, v2, p2, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    new-instance p2, Lf/m/b/d/b;
+    iput-object p5, p0, Lf/m/b/d/d;->i:Lf/m/b/d/b;
 
-    invoke-direct {p2, p1, v2, p3, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lf/m/b/d/d;->j:Lf/m/b/d/b;
+    iget p2, p0, Lf/m/b/d/a;->b:I
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lf/m/b/d/b;
+
+    invoke-direct {p1, p2, v3, p3, v0}, Lf/m/b/d/b;-><init>(ILf/m/b/d/b$a;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Lf/m/b/d/d;->j:Lf/m/b/d/b;
 
     new-instance p1, Landroid/graphics/RectF;
 
@@ -120,18 +146,4 @@
     iput p1, p0, Lf/m/b/d/d;->l:I
 
     return-void
-
-    :cond_2
-    const-string p1, "vertexMvpMatrixName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "vertexPositionName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/f/m/b/e/a$a.smali b/com.discord/smali_classes2/f/m/b/e/a$a.smali
new file mode 100644
index 0000000000..6271b8c7f1
--- /dev/null
+++ b/com.discord/smali_classes2/f/m/b/e/a$a.smali
@@ -0,0 +1,179 @@
+.class public final Lf/m/b/e/a$a;
+.super Lk0/o/c/j;
+.source "GlTexture.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lf/m/b/e/a;-><init>(IILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $format:Ljava/lang/Integer;
+
+.field public final synthetic $height:Ljava/lang/Integer;
+
+.field public final synthetic $internalFormat:Ljava/lang/Integer;
+
+.field public final synthetic $type:Ljava/lang/Integer;
+
+.field public final synthetic $width:Ljava/lang/Integer;
+
+.field public final synthetic this$0:Lf/m/b/e/a;
+
+
+# direct methods
+.method public constructor <init>(Lf/m/b/e/a;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
+    .locals 0
+
+    iput-object p1, p0, Lf/m/b/e/a$a;->this$0:Lf/m/b/e/a;
+
+    iput-object p2, p0, Lf/m/b/e/a$a;->$width:Ljava/lang/Integer;
+
+    iput-object p3, p0, Lf/m/b/e/a$a;->$height:Ljava/lang/Integer;
+
+    iput-object p4, p0, Lf/m/b/e/a$a;->$format:Ljava/lang/Integer;
+
+    iput-object p5, p0, Lf/m/b/e/a$a;->$internalFormat:Ljava/lang/Integer;
+
+    iput-object p6, p0, Lf/m/b/e/a$a;->$type:Ljava/lang/Integer;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke()Ljava/lang/Object;
+    .locals 11
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$width:Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$height:Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$format:Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$internalFormat:Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    iget-object v1, p0, Lf/m/b/e/a$a;->$type:Ljava/lang/Integer;
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, p0, Lf/m/b/e/a$a;->this$0:Lf/m/b/e/a;
+
+    iget v2, v1, Lf/m/b/e/a;->c:I
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v4
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$width:Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v5
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$height:Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v6
+
+    const/4 v7, 0x0
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$format:Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v8
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->$type:Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v9
+
+    const/4 v10, 0x0
+
+    invoke-static/range {v2 .. v10}, Landroid/opengl/GLES20;->glTexImage2D(IIIIIIIILjava/nio/Buffer;)V
+
+    :cond_0
+    iget-object v0, p0, Lf/m/b/e/a$a;->this$0:Lf/m/b/e/a;
+
+    iget v0, v0, Lf/m/b/e/a;->c:I
+
+    invoke-static {}, Lf/m/b/c/a;->d()I
+
+    const/16 v1, 0x2801
+
+    sget v2, Lf/m/b/c/a;->a:F
+
+    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameterf(IIF)V
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->this$0:Lf/m/b/e/a;
+
+    iget v0, v0, Lf/m/b/e/a;->c:I
+
+    const/16 v1, 0x2800
+
+    sget v2, Lf/m/b/c/a;->b:F
+
+    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameterf(IIF)V
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->this$0:Lf/m/b/e/a;
+
+    iget v0, v0, Lf/m/b/e/a;->c:I
+
+    const/16 v1, 0x2802
+
+    const v2, 0x812f
+
+    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameteri(III)V
+
+    iget-object v0, p0, Lf/m/b/e/a$a;->this$0:Lf/m/b/e/a;
+
+    iget v0, v0, Lf/m/b/e/a;->c:I
+
+    const/16 v1, 0x2803
+
+    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameteri(III)V
+
+    const-string v0, "glTexParameter"
+
+    invoke-static {v0}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/f/m/b/e/a.smali b/com.discord/smali_classes2/f/m/b/e/a.smali
index c092951b57..f80f76eb5c 100644
--- a/com.discord/smali_classes2/f/m/b/e/a.smali
+++ b/com.discord/smali_classes2/f/m/b/e/a.smali
@@ -1,170 +1,272 @@
 .class public final Lf/m/b/e/a;
-.super Lj0/n/c/i;
+.super Ljava/lang/Object;
 .source "GlTexture.kt"
 
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
 
 # instance fields
-.field public final synthetic $format:Ljava/lang/Integer;
+.field public final a:I
 
-.field public final synthetic $height:Ljava/lang/Integer;
+.field public final b:I
 
-.field public final synthetic $internalFormat:Ljava/lang/Integer;
-
-.field public final synthetic $type:Ljava/lang/Integer;
-
-.field public final synthetic $width:Ljava/lang/Integer;
-
-.field public final synthetic this$0:Lf/m/b/e/b;
+.field public final c:I
 
 
 # direct methods
-.method public constructor <init>(Lf/m/b/e/b;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
+.method public constructor <init>(IILjava/lang/Integer;I)V
+    .locals 9
+
+    and-int/lit8 p3, p4, 0x1
+
+    if-eqz p3, :cond_0
+
+    invoke-static {}, Lf/m/b/c/a;->b()I
+
+    const p1, 0x84c0
+
+    const v1, 0x84c0
+
+    goto :goto_0
+
+    :cond_0
+    move v1, p1
+
+    :goto_0
+    and-int/lit8 p1, p4, 0x2
+
+    if-eqz p1, :cond_1
+
+    invoke-static {}, Lf/m/b/c/a;->c()I
+
+    const p2, 0x8d65
+
+    const v2, 0x8d65
+
+    goto :goto_1
+
+    :cond_1
+    move v2, p2
+
+    :goto_1
+    and-int/lit8 p1, p4, 0x4
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v8}, Lf/m/b/e/a;-><init>(IILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(IILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
     .locals 0
 
-    iput-object p1, p0, Lf/m/b/e/a;->this$0:Lf/m/b/e/b;
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lf/m/b/e/a;->$width:Ljava/lang/Integer;
+    iput p1, p0, Lf/m/b/e/a;->b:I
 
-    iput-object p3, p0, Lf/m/b/e/a;->$height:Ljava/lang/Integer;
+    iput p2, p0, Lf/m/b/e/a;->c:I
 
-    iput-object p4, p0, Lf/m/b/e/a;->$format:Ljava/lang/Integer;
+    if-eqz p3, :cond_0
 
-    iput-object p5, p0, Lf/m/b/e/a;->$internalFormat:Ljava/lang/Integer;
+    invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I
 
-    iput-object p6, p0, Lf/m/b/e/a;->$type:Ljava/lang/Integer;
+    move-result p1
 
-    const/4 p1, 0x0
+    goto :goto_2
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    :cond_0
+    const/4 p1, 0x1
 
+    new-array p2, p1, [I
+
+    const-string p4, "storage"
+
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-array p4, p1, [I
+
+    const/4 p5, 0x0
+
+    const/4 p6, 0x0
+
+    :goto_0
+    if-ge p6, p1, :cond_1
+
+    invoke-static {p2, p6}, Lk0/f;->get-impl([II)I
+
+    move-result p7
+
+    aput p7, p4, p6
+
+    add-int/lit8 p6, p6, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {p1, p4, p5}, Landroid/opengl/GLES20;->glGenTextures(I[II)V
+
+    const/4 p6, 0x0
+
+    :goto_1
+    if-ge p6, p1, :cond_2
+
+    aget p7, p4, p6
+
+    aput p7, p2, p6
+
+    add-int/lit8 p6, p6, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const-string p1, "glGenTextures"
+
+    invoke-static {p1}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
+
+    invoke-static {p2, p5}, Lk0/f;->get-impl([II)I
+
+    move-result p1
+
+    :goto_2
+    iput p1, p0, Lf/m/b/e/a;->a:I
+
+    if-nez p3, :cond_3
+
+    new-instance p1, Lf/m/b/e/a$a;
+
+    const/4 p4, 0x0
+
+    const/4 p5, 0x0
+
+    const/4 p6, 0x0
+
+    const/4 p7, 0x0
+
+    const/4 p8, 0x0
+
+    move-object p2, p1
+
+    move-object p3, p0
+
+    invoke-direct/range {p2 .. p8}, Lf/m/b/e/a$a;-><init>(Lf/m/b/e/a;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
+
+    const-string p2, "$this$use"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "block"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lf/m/b/e/a;->a()V
+
+    invoke-virtual {p1}, Lf/m/b/e/a$a;->invoke()Ljava/lang/Object;
+
+    invoke-virtual {p0}, Lf/m/b/e/a;->c()V
+
+    :cond_3
     return-void
 .end method
 
 
 # virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 11
+.method public a()V
+    .locals 2
 
-    iget-object v0, p0, Lf/m/b/e/a;->$width:Ljava/lang/Integer;
+    iget v0, p0, Lf/m/b/e/a;->b:I
 
-    if-eqz v0, :cond_0
+    invoke-static {v0}, Landroid/opengl/GLES20;->glActiveTexture(I)V
 
-    iget-object v0, p0, Lf/m/b/e/a;->$height:Ljava/lang/Integer;
+    iget v0, p0, Lf/m/b/e/a;->c:I
 
-    if-eqz v0, :cond_0
+    iget v1, p0, Lf/m/b/e/a;->a:I
 
-    iget-object v0, p0, Lf/m/b/e/a;->$format:Ljava/lang/Integer;
+    invoke-static {v0, v1}, Landroid/opengl/GLES20;->glBindTexture(II)V
 
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lf/m/b/e/a;->$internalFormat:Ljava/lang/Integer;
-
-    if-eqz v0, :cond_0
-
-    iget-object v1, p0, Lf/m/b/e/a;->$type:Ljava/lang/Integer;
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lf/m/b/e/a;->this$0:Lf/m/b/e/b;
-
-    iget v2, v1, Lf/m/b/e/b;->c:I
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v4
-
-    iget-object v0, p0, Lf/m/b/e/a;->$width:Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v5
-
-    iget-object v0, p0, Lf/m/b/e/a;->$height:Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v6
-
-    const/4 v7, 0x0
-
-    iget-object v0, p0, Lf/m/b/e/a;->$format:Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v8
-
-    iget-object v0, p0, Lf/m/b/e/a;->$type:Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v9
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v2 .. v10}, Landroid/opengl/GLES20;->glTexImage2D(IIIIIIIILjava/nio/Buffer;)V
-
-    :cond_0
-    iget-object v0, p0, Lf/m/b/e/a;->this$0:Lf/m/b/e/b;
-
-    iget v0, v0, Lf/m/b/e/b;->c:I
-
-    invoke-static {}, Lf/m/b/c/a;->d()I
-
-    const/16 v1, 0x2801
-
-    sget v2, Lf/m/b/c/a;->a:F
-
-    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameterf(IIF)V
-
-    iget-object v0, p0, Lf/m/b/e/a;->this$0:Lf/m/b/e/b;
-
-    iget v0, v0, Lf/m/b/e/b;->c:I
-
-    const/16 v1, 0x2800
-
-    sget v2, Lf/m/b/c/a;->b:F
-
-    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameterf(IIF)V
-
-    iget-object v0, p0, Lf/m/b/e/a;->this$0:Lf/m/b/e/b;
-
-    iget v0, v0, Lf/m/b/e/b;->c:I
-
-    const/16 v1, 0x2802
-
-    const v2, 0x812f
-
-    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameteri(III)V
-
-    iget-object v0, p0, Lf/m/b/e/a;->this$0:Lf/m/b/e/b;
-
-    iget v0, v0, Lf/m/b/e/b;->c:I
-
-    const/16 v1, 0x2803
-
-    invoke-static {v0, v1, v2}, Landroid/opengl/GLES20;->glTexParameteri(III)V
-
-    const-string v0, "glTexParameter"
+    const-string v0, "bind"
 
     invoke-static {v0}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object v0
+    return-void
+.end method
+
+.method public final b()V
+    .locals 6
+
+    const/4 v0, 0x1
+
+    new-array v1, v0, [I
+
+    iget v2, p0, Lf/m/b/e/a;->a:I
+
+    const/4 v3, 0x0
+
+    aput v2, v1, v3
+
+    new-array v2, v0, [I
+
+    const/4 v4, 0x0
+
+    :goto_0
+    if-ge v4, v0, :cond_0
+
+    invoke-static {v1, v4}, Lk0/f;->get-impl([II)I
+
+    move-result v5
+
+    aput v5, v2, v4
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {v0, v2, v3}, Landroid/opengl/GLES20;->glDeleteTextures(I[II)V
+
+    :goto_1
+    if-ge v3, v0, :cond_1
+
+    aget v4, v2, v3
+
+    aput v4, v1, v3
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    return-void
+.end method
+
+.method public c()V
+    .locals 2
+
+    iget v0, p0, Lf/m/b/e/a;->c:I
+
+    const/4 v1, 0x0
+
+    invoke-static {v0, v1}, Landroid/opengl/GLES20;->glBindTexture(II)V
+
+    invoke-static {}, Lf/m/b/c/a;->b()I
+
+    const v0, 0x84c0
+
+    invoke-static {v0}, Landroid/opengl/GLES20;->glActiveTexture(I)V
+
+    const-string v0, "unbind"
+
+    invoke-static {v0}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/f/m/b/e/b.smali b/com.discord/smali_classes2/f/m/b/e/b.smali
deleted file mode 100644
index b7b0631ad1..0000000000
--- a/com.discord/smali_classes2/f/m/b/e/b.smali
+++ /dev/null
@@ -1,159 +0,0 @@
-.class public final Lf/m/b/e/b;
-.super Ljava/lang/Object;
-.source "GlTexture.kt"
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:I
-
-.field public final c:I
-
-
-# direct methods
-.method public constructor <init>(IILjava/lang/Integer;I)V
-    .locals 7
-
-    and-int/lit8 p3, p4, 0x1
-
-    if-eqz p3, :cond_0
-
-    invoke-static {}, Lf/m/b/c/a;->b()I
-
-    const p1, 0x84c0
-
-    :cond_0
-    and-int/lit8 p3, p4, 0x2
-
-    if-eqz p3, :cond_1
-
-    invoke-static {}, Lf/m/b/c/a;->c()I
-
-    const p2, 0x8d65
-
-    :cond_1
-    and-int/lit8 p3, p4, 0x4
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lf/m/b/e/b;->b:I
-
-    iput p2, p0, Lf/m/b/e/b;->c:I
-
-    const/4 p1, 0x1
-
-    new-array p2, p1, [I
-
-    new-array p3, p1, [I
-
-    const/4 p4, 0x0
-
-    const/4 v0, 0x0
-
-    :goto_0
-    if-ge v0, p1, :cond_2
-
-    aget v1, p2, v0
-
-    aput v1, p3, v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {p1, p3, p4}, Landroid/opengl/GLES20;->glGenTextures(I[II)V
-
-    const/4 v0, 0x0
-
-    :goto_1
-    if-ge v0, p1, :cond_3
-
-    aget v1, p3, v0
-
-    aput v1, p2, v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const-string p1, "glGenTextures"
-
-    invoke-static {p1}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
-
-    aget p1, p2, p4
-
-    iput p1, p0, Lf/m/b/e/b;->a:I
-
-    new-instance p1, Lf/m/b/e/a;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    move-object v0, p1
-
-    move-object v1, p0
-
-    invoke-direct/range {v0 .. v6}, Lf/m/b/e/a;-><init>(Lf/m/b/e/b;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
-
-    invoke-virtual {p0}, Lf/m/b/e/b;->a()V
-
-    invoke-virtual {p1}, Lf/m/b/e/a;->invoke()Ljava/lang/Object;
-
-    invoke-virtual {p0}, Lf/m/b/e/b;->b()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 2
-
-    iget v0, p0, Lf/m/b/e/b;->b:I
-
-    invoke-static {v0}, Landroid/opengl/GLES20;->glActiveTexture(I)V
-
-    iget v0, p0, Lf/m/b/e/b;->c:I
-
-    iget v1, p0, Lf/m/b/e/b;->a:I
-
-    invoke-static {v0, v1}, Landroid/opengl/GLES20;->glBindTexture(II)V
-
-    const-string v0, "bind"
-
-    invoke-static {v0}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public b()V
-    .locals 2
-
-    iget v0, p0, Lf/m/b/e/b;->c:I
-
-    const/4 v1, 0x0
-
-    invoke-static {v0, v1}, Landroid/opengl/GLES20;->glBindTexture(II)V
-
-    invoke-static {}, Lf/m/b/c/a;->b()I
-
-    const v0, 0x84c0
-
-    invoke-static {v0}, Landroid/opengl/GLES20;->glActiveTexture(I)V
-
-    const-string v0, "unbind"
-
-    invoke-static {v0}, Lf/m/b/a/a;->a(Ljava/lang/String;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/f/n/a/j/b.smali b/com.discord/smali_classes2/f/n/a/j/b.smali
index 1ba061fcef..ab72cafd78 100644
--- a/com.discord/smali_classes2/f/n/a/j/b.smali
+++ b/com.discord/smali_classes2/f/n/a/j/b.smali
@@ -255,37 +255,37 @@
 
     if-eqz p2, :cond_5
 
-    new-instance v0, Ln0/x;
+    new-instance v0, Lo0/x;
 
-    invoke-direct {v0}, Ln0/x;-><init>()V
+    invoke-direct {v0}, Lo0/x;-><init>()V
 
     const/4 v1, 0x0
 
     :try_start_0
-    new-instance v2, Ln0/a0$a;
+    new-instance v2, Lo0/a0$a;
 
-    invoke-direct {v2}, Ln0/a0$a;-><init>()V
+    invoke-direct {v2}, Lo0/a0$a;-><init>()V
 
     invoke-virtual {p1}, Landroid/net/Uri;->toString()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-virtual {v2, p1}, Ln0/a0$a;->f(Ljava/lang/String;)Ln0/a0$a;
+    invoke-virtual {v2, p1}, Lo0/a0$a;->f(Ljava/lang/String;)Lo0/a0$a;
 
-    invoke-virtual {v2}, Ln0/a0$a;->b()Ln0/a0;
+    invoke-virtual {v2}, Lo0/a0$a;->b()Lo0/a0;
 
     move-result-object p1
 
-    invoke-virtual {v0, p1}, Ln0/x;->b(Ln0/a0;)Ln0/f;
+    invoke-virtual {v0, p1}, Lo0/x;->b(Lo0/a0;)Lo0/f;
 
     move-result-object p1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
-    check-cast p1, Ln0/z;
+    check-cast p1, Lo0/z;
 
     :try_start_1
-    invoke-virtual {p1}, Ln0/z;->execute()Lokhttp3/Response;
+    invoke-virtual {p1}, Lo0/z;->execute()Lokhttp3/Response;
 
     move-result-object p1
     :try_end_1
@@ -294,7 +294,7 @@
     :try_start_2
     iget-object v2, p1, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
 
-    invoke-virtual {v2}, Lokhttp3/ResponseBody;->c()Lo0/g;
+    invoke-virtual {v2}, Lokhttp3/ResponseBody;->c()Lp0/g;
 
     move-result-object v2
     :try_end_2
@@ -313,18 +313,22 @@
 
     if-eqz p2, :cond_1
 
-    new-instance v3, Lo0/o;
+    const-string v3, "$receiver"
 
-    new-instance v4, Lo0/x;
+    invoke-static {p2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v4}, Lo0/x;-><init>()V
+    new-instance v3, Lp0/o;
 
-    invoke-direct {v3, p2, v4}, Lo0/o;-><init>(Ljava/io/OutputStream;Lo0/x;)V
+    new-instance v4, Lp0/x;
+
+    invoke-direct {v4}, Lp0/x;-><init>()V
+
+    invoke-direct {v3, p2, v4}, Lp0/o;-><init>(Ljava/io/OutputStream;Lp0/x;)V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     :try_start_4
-    invoke-interface {v2, v3}, Lo0/g;->F0(Lo0/u;)J
+    invoke-interface {v2, v3}, Lp0/g;->F0(Lp0/u;)J
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
@@ -335,7 +339,7 @@
 
     :catch_0
     :try_start_6
-    invoke-virtual {v3}, Lo0/o;->close()V
+    invoke-virtual {v3}, Lp0/o;->close()V
     :try_end_6
     .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_1
 
@@ -351,9 +355,9 @@
 
     :catch_2
     :cond_0
-    iget-object p1, v0, Ln0/x;->d:Ln0/q;
+    iget-object p1, v0, Lo0/x;->d:Lo0/q;
 
-    invoke-virtual {p1}, Ln0/q;->a()V
+    invoke-virtual {p1}, Lo0/q;->a()V
 
     iget-object p1, p0, Lf/n/a/j/b;->c:Landroid/net/Uri;
 
@@ -434,9 +438,9 @@
 
     :catch_5
     :cond_4
-    iget-object p1, v0, Ln0/x;->d:Ln0/q;
+    iget-object p1, v0, Lo0/x;->d:Lo0/q;
 
-    invoke-virtual {p1}, Ln0/q;->a()V
+    invoke-virtual {p1}, Lo0/q;->a()V
 
     iget-object p1, p0, Lf/n/a/j/b;->c:Landroid/net/Uri;
 
@@ -640,7 +644,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1, v3, v3}, Lf/n/a/k/a;->B(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1, v3, v3}, Lf/n/a/k/a;->y(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
     :try_end_0
@@ -730,7 +734,7 @@
 
     const-string v1, "_id=?"
 
-    invoke-static {v0, v3, v1, v4}, Lf/n/a/k/a;->B(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v3, v1, v4}, Lf/n/a/k/a;->y(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
@@ -766,7 +770,7 @@
     goto :goto_1
 
     :cond_7
-    invoke-static {v0, v5, v3, v3}, Lf/n/a/k/a;->B(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v5, v3, v3}, Lf/n/a/k/a;->y(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/f/n/a/k/a.smali b/com.discord/smali_classes2/f/n/a/k/a.smali
index 2a845249e7..a7a84781cc 100644
--- a/com.discord/smali_classes2/f/n/a/k/a.smali
+++ b/com.discord/smali_classes2/f/n/a/k/a.smali
@@ -4,216 +4,7 @@
 
 
 # direct methods
-.method public static A(Landroid/graphics/RectF;)[F
-    .locals 5
-
-    const/16 v0, 0x8
-
-    new-array v0, v0, [F
-
-    iget v1, p0, Landroid/graphics/RectF;->left:F
-
-    const/4 v2, 0x0
-
-    aput v1, v0, v2
-
-    iget v2, p0, Landroid/graphics/RectF;->top:F
-
-    const/4 v3, 0x1
-
-    aput v2, v0, v3
-
-    iget v3, p0, Landroid/graphics/RectF;->right:F
-
-    const/4 v4, 0x2
-
-    aput v3, v0, v4
-
-    const/4 v4, 0x3
-
-    aput v2, v0, v4
-
-    const/4 v2, 0x4
-
-    aput v3, v0, v2
-
-    iget p0, p0, Landroid/graphics/RectF;->bottom:F
-
-    const/4 v2, 0x5
-
-    aput p0, v0, v2
-
-    const/4 v2, 0x6
-
-    aput v1, v0, v2
-
-    const/4 v1, 0x7
-
-    aput p0, v0, v1
-
-    return-object v0
-.end method
-
-.method public static B(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
-    .locals 8
-
-    const-string v0, "_data"
-
-    filled-new-array {v0}, [Ljava/lang/String;
-
-    move-result-object v3
-
-    const/4 v7, 0x0
-
-    :try_start_0
-    invoke-virtual {p0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
-
-    move-result-object v1
-
-    const/4 v6, 0x0
-
-    move-object v2, p1
-
-    move-object v4, p2
-
-    move-object v5, p3
-
-    invoke-virtual/range {v1 .. v6}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-
-    move-result-object p0
-    :try_end_0
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p0, :cond_0
-
-    :try_start_1
-    invoke-interface {p0}, Landroid/database/Cursor;->moveToFirst()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p0, v0}, Landroid/database/Cursor;->getColumnIndexOrThrow(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-interface {p0, p1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
-
-    move-result-object p1
-    :try_end_1
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    invoke-interface {p0}, Landroid/database/Cursor;->close()V
-
-    return-object p1
-
-    :catch_0
-    move-exception p1
-
-    goto :goto_1
-
-    :cond_0
-    if-eqz p0, :cond_1
-
-    :goto_0
-    invoke-interface {p0}, Landroid/database/Cursor;->close()V
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_3
-
-    :catch_1
-    move-exception p1
-
-    move-object p0, v7
-
-    :goto_1
-    :try_start_2
-    const-string p2, "FileUtils"
-
-    invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
-
-    move-result-object p3
-
-    const-string v0, "getDataColumn: _data - [%s]"
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p1}, Ljava/lang/IllegalArgumentException;->getMessage()Ljava/lang/String;
-
-    move-result-object p1
-
-    aput-object p1, v1, v2
-
-    invoke-static {p3, v0, v1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p2, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-eqz p0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    :goto_2
-    return-object v7
-
-    :catchall_1
-    move-exception p1
-
-    move-object v7, p0
-
-    :goto_3
-    if-eqz v7, :cond_2
-
-    invoke-interface {v7}, Landroid/database/Cursor;->close()V
-
-    :cond_2
-    throw p1
-.end method
-
-.method public static final C(Ljava/lang/Object;)Ljava/lang/String;
-    .locals 1
-
-    if-eqz p0, :cond_0
-
-    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
-
-    move-result p0
-
-    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v0, "Integer.toHexString(System.identityHashCode(this))"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "$this$hexAddress"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static D()I
+.method public static A()I
     .locals 13
     .annotation build Landroid/annotation/TargetApi;
         value = 0x11
@@ -346,7 +137,7 @@
     .end array-data
 .end method
 
-.method public static E(Landroid/content/Context;)I
+.method public static B(Landroid/content/Context;)I
     .locals 2
 
     const-string v0, "window"
@@ -397,10 +188,16 @@
     return p0
 .end method
 
-.method public static final F(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+.method public static final C(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
     .locals 1
 
-    if-eqz p0, :cond_1
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->b:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
@@ -420,34 +217,33 @@
     return-void
 
     :cond_0
-    invoke-static {p0, p1}, Lk0/a/w;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+    invoke-static {p0, p1}, Ll0/a/w;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-static {p1, v0}, Lf/n/a/k/a;->G(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {p1, v0}, Lf/n/a/k/a;->D(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     move-result-object p1
 
-    invoke-static {p0, p1}, Lk0/a/w;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+    invoke-static {p0, p1}, Ll0/a/w;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final G(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+.method public static final D(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
     .locals 2
 
+    const-string v0, "originalException"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "thrownException"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     if-ne p0, p1, :cond_0
 
     return-object p0
@@ -464,7 +260,7 @@
     return-object v0
 .end method
 
-.method public static synthetic H(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lk0/a/k0;
+.method public static synthetic E(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ll0/a/k0;
     .locals 0
 
     and-int/lit8 p5, p4, 0x1
@@ -481,16 +277,20 @@
     const/4 p2, 0x1
 
     :cond_1
-    invoke-interface {p0, p1, p2, p3}, Lkotlinx/coroutines/Job;->d(ZZLkotlin/jvm/functions/Function1;)Lk0/a/k0;
+    invoke-interface {p0, p1, p2, p3}, Lkotlinx/coroutines/Job;->d(ZZLkotlin/jvm/functions/Function1;)Ll0/a/k0;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final I(Ljava/lang/AssertionError;)Z
+.method public static final F(Ljava/lang/AssertionError;)Z
     .locals 3
 
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p0}, Ljava/lang/AssertionError;->getCause()Ljava/lang/Throwable;
 
     move-result-object v0
@@ -509,7 +309,7 @@
 
     const-string v2, "getsockname failed"
 
-    invoke-static {p0, v2, v1, v0}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    invoke-static {p0, v2, v1, v0}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
     move-result p0
 
@@ -527,7 +327,7 @@
     return v1
 .end method
 
-.method public static final J(I)Z
+.method public static final G(I)Z
     .locals 1
 
     const/4 v0, 0x1
@@ -543,7 +343,7 @@
     return v0
 .end method
 
-.method public static K(Landroid/hardware/Camera;)Z
+.method public static H(Landroid/hardware/Camera;)Z
     .locals 3
 
     const/4 v0, 0x0
@@ -607,23 +407,25 @@
     return v0
 .end method
 
-.method public static final L(Lo0/e;)Z
+.method public static final I(Lp0/e;)Z
     .locals 8
 
-    if-eqz p0, :cond_3
+    const-string v0, "$this$isProbablyUtf8"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     :try_start_0
-    new-instance v7, Lo0/e;
+    new-instance v7, Lp0/e;
 
-    invoke-direct {v7}, Lo0/e;-><init>()V
+    invoke-direct {v7}, Lp0/e;-><init>()V
 
-    iget-wide v1, p0, Lo0/e;->e:J
+    iget-wide v1, p0, Lp0/e;->e:J
 
     const-wide/16 v3, 0x40
 
-    invoke-static {v1, v2, v3, v4}, Lj0/q/f;->coerceAtMost(JJ)J
+    invoke-static {v1, v2, v3, v4}, Lk0/r/f;->coerceAtMost(JJ)J
 
     move-result-wide v5
 
@@ -633,7 +435,7 @@
 
     move-object v2, v7
 
-    invoke-virtual/range {v1 .. v6}, Lo0/e;->d(Lo0/e;JJ)Lo0/e;
+    invoke-virtual/range {v1 .. v6}, Lp0/e;->d(Lp0/e;JJ)Lp0/e;
 
     const/16 p0, 0x10
 
@@ -642,7 +444,7 @@
     :goto_0
     if-ge v1, p0, :cond_2
 
-    invoke-virtual {v7}, Lo0/e;->J()Z
+    invoke-virtual {v7}, Lp0/e;->J()Z
 
     move-result v2
 
@@ -651,7 +453,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v7}, Lo0/e;->x()I
+    invoke-virtual {v7}, Lp0/e;->x()I
 
     move-result v2
 
@@ -684,25 +486,16 @@
 
     :catch_0
     return v0
-
-    :cond_3
-    const-string p0, "$this$isProbablyUtf8"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-    .locals 1
+.method public static J(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Ll0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+    .locals 3
 
     and-int/lit8 p2, p4, 0x1
 
     if-eqz p2, :cond_0
 
-    sget-object p1, Lj0/k/f;->d:Lj0/k/f;
+    sget-object p1, Lk0/l/f;->d:Lk0/l/f;
 
     :cond_0
     const/4 p2, 0x2
@@ -713,7 +506,7 @@
 
     if-eqz p4, :cond_1
 
-    sget-object p4, Lk0/a/z;->d:Lk0/a/z;
+    sget-object p4, Ll0/a/z;->d:Ll0/a/z;
 
     goto :goto_0
 
@@ -721,19 +514,29 @@
     move-object p4, p5
 
     :goto_0
-    if-eqz p0, :cond_a
+    const-string v0, "$this$launch"
 
-    if-eqz p1, :cond_9
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p4, :cond_8
+    const-string v0, "context"
 
-    invoke-static {p0, p1}, Lk0/a/u;->b(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "start"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "block"
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Ll0/a/u;->b(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p0
 
-    sget-object p1, Lk0/a/z;->e:Lk0/a/z;
+    sget-object p1, Ll0/a/z;->e:Ll0/a/z;
 
-    const/4 v0, 0x1
+    const/4 v2, 0x1
 
     if-ne p4, p1, :cond_2
 
@@ -747,47 +550,65 @@
     :goto_1
     if-eqz p1, :cond_3
 
-    new-instance p1, Lk0/a/e1;
+    new-instance p1, Ll0/a/e1;
 
-    invoke-direct {p1, p0, p3}, Lk0/a/e1;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {p1, p0, p3}, Ll0/a/e1;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)V
 
     goto :goto_2
 
     :cond_3
-    new-instance p1, Lk0/a/k1;
+    new-instance p1, Ll0/a/k1;
 
-    invoke-direct {p1, p0, v0}, Lk0/a/k1;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
+    invoke-direct {p1, p0, v2}, Ll0/a/k1;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
 
     :goto_2
-    invoke-virtual {p1}, Lk0/a/a;->Q()V
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ll0/a/a;->Q()V
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "completion"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p4}, Ljava/lang/Enum;->ordinal()I
 
-    move-result p0
+    move-result p4
 
-    if-eqz p0, :cond_6
+    if-eqz p4, :cond_6
 
-    if-eq p0, v0, :cond_7
+    if-eq p4, v2, :cond_7
 
-    if-eq p0, p2, :cond_5
+    if-eq p4, p2, :cond_5
 
-    const/4 p4, 0x3
+    const/4 v0, 0x3
 
-    if-ne p0, p4, :cond_4
+    if-ne p4, v0, :cond_4
+
+    const-string p4, "$this$startCoroutineUndispatched"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p0
 
-    invoke-static {p0, p5}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p0, p5}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p4
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-static {p3, p2}, Lj0/n/c/u;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
+    invoke-static {p3, p2}, Lk0/o/c/v;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
 
     invoke-interface {p3, p1, p1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -796,11 +617,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-static {p0, p4}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+    invoke-static {p0, p4}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
-    sget-object p0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object p0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
     if-eq p2, p0, :cond_7
 
@@ -812,7 +633,7 @@
     move-exception p2
 
     :try_start_3
-    invoke-static {p0, p4}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+    invoke-static {p0, p4}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
 
     throw p2
     :try_end_3
@@ -837,6 +658,12 @@
     throw p0
 
     :cond_5
+    const-string p2, "$this$startCoroutine"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {p3, p1, p1}, Lf/n/a/k/a;->createCoroutineUnintercepted(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
     move-result-object p0
@@ -852,35 +679,14 @@
     goto :goto_3
 
     :cond_6
-    invoke-static {p3, p1, p1}, Lf/n/a/k/a;->Z(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+    invoke-static {p3, p1, p1}, Lf/n/a/k/a;->V(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
 
     :cond_7
     :goto_3
     return-object p1
-
-    :cond_8
-    const-string p0, "start"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_9
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_a
-    const-string p0, "$this$launch"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
 .end method
 
-.method public static final N(II)I
+.method public static final K(II)I
     .locals 0
 
     rem-int/2addr p0, p1
@@ -896,7 +702,7 @@
     return p0
 .end method
 
-.method public static final O(JJ)J
+.method public static final L(JJ)J
     .locals 3
 
     rem-long/2addr p0, p2
@@ -916,7 +722,7 @@
     return-wide p0
 .end method
 
-.method public static P(Ljava/lang/CharSequence;III)I
+.method public static M(Ljava/lang/CharSequence;III)I
     .locals 17
 
     move-object/from16 v0, p0
@@ -1187,7 +993,7 @@
     return v0
 .end method
 
-.method public static Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
+.method public static N(Ljava/util/concurrent/atomic/AtomicLong;J)J
     .locals 7
 
     :cond_0
@@ -1234,7 +1040,7 @@
     throw p0
 .end method
 
-.method public static R(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+.method public static O(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
     .locals 1
 
     instance-of v0, p0, Ljava/lang/RuntimeException;
@@ -1262,7 +1068,7 @@
     throw p0
 .end method
 
-.method public static S(ILp0/a/a/c;)V
+.method public static P(ILq0/a/a/c;)V
     .locals 2
 
     ushr-int/lit8 v0, p0, 0x18
@@ -1284,12 +1090,12 @@
     throw p0
 
     :pswitch_0
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
 
     goto :goto_0
 
     :pswitch_1
-    invoke-virtual {p1, p0}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
+    invoke-virtual {p1, p0}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
 
     goto :goto_0
 
@@ -1300,7 +1106,7 @@
 
     shr-int/lit8 p0, p0, 0x8
 
-    invoke-virtual {p1, v0, p0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
+    invoke-virtual {p1, v0, p0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
 
     goto :goto_0
 
@@ -1308,7 +1114,7 @@
     :pswitch_3
     ushr-int/lit8 p0, p0, 0x10
 
-    invoke-virtual {p1, p0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
+    invoke-virtual {p1, p0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
 
     :goto_0
     return-void
@@ -1342,7 +1148,7 @@
     .end packed-switch
 .end method
 
-.method public static final T(ILkotlin/jvm/functions/Function2;)Ll0/h;
+.method public static final Q(ILkotlin/jvm/functions/Function2;)Lm0/h;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1357,23 +1163,23 @@
             "+",
             "Landroid/view/View;",
             ">;)",
-            "Ll0/h<",
+            "Lm0/h<",
             "TT;TV;>;"
         }
     .end annotation
 
-    new-instance v0, Ll0/h;
+    new-instance v0, Lm0/h;
 
-    new-instance v1, Ll0/b;
+    new-instance v1, Lm0/b;
 
-    invoke-direct {v1, p1, p0}, Ll0/b;-><init>(Lkotlin/jvm/functions/Function2;I)V
+    invoke-direct {v1, p1, p0}, Lm0/b;-><init>(Lkotlin/jvm/functions/Function2;I)V
 
-    invoke-direct {v0, v1}, Ll0/h;-><init>(Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {v0, v1}, Lm0/h;-><init>(Lkotlin/jvm/functions/Function2;)V
 
     return-object v0
 .end method
 
-.method public static final U([ILkotlin/jvm/functions/Function2;)Ll0/h;
+.method public static final R([ILkotlin/jvm/functions/Function2;)Lm0/h;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1388,25 +1194,25 @@
             "+",
             "Landroid/view/View;",
             ">;)",
-            "Ll0/h<",
+            "Lm0/h<",
             "TT;",
             "Ljava/util/List<",
             "TV;>;>;"
         }
     .end annotation
 
-    new-instance v0, Ll0/h;
+    new-instance v0, Lm0/h;
 
-    new-instance v1, Ll0/c;
+    new-instance v1, Lm0/c;
 
-    invoke-direct {v1, p0, p1}, Ll0/c;-><init>([ILkotlin/jvm/functions/Function2;)V
+    invoke-direct {v1, p0, p1}, Lm0/c;-><init>([ILkotlin/jvm/functions/Function2;)V
 
-    invoke-direct {v0, v1}, Ll0/h;-><init>(Lkotlin/jvm/functions/Function2;)V
+    invoke-direct {v0, v1}, Lm0/h;-><init>(Lkotlin/jvm/functions/Function2;)V
 
     return-object v0
 .end method
 
-.method public static V(I)I
+.method public static S(I)I
     .locals 1
 
     const/4 v0, 0x1
@@ -1424,7 +1230,7 @@
     return p0
 .end method
 
-.method public static final W(Ljava/net/Socket;)Lo0/u;
+.method public static final T(Ljava/net/Socket;)Lp0/u;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1432,13 +1238,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$receiver"
 
-    new-instance v0, Lo0/v;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p0}, Lo0/v;-><init>(Ljava/net/Socket;)V
+    new-instance v0, Lp0/v;
 
-    new-instance v1, Lo0/o;
+    invoke-direct {v0, p0}, Lp0/v;-><init>(Ljava/net/Socket;)V
+
+    new-instance v1, Lp0/o;
 
     invoke-virtual {p0}, Ljava/net/Socket;->getOutputStream()Ljava/io/OutputStream;
 
@@ -1446,52 +1254,22 @@
 
     const-string v2, "getOutputStream()"
 
-    invoke-static {p0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p0, v0}, Lo0/o;-><init>(Ljava/io/OutputStream;Lo0/x;)V
+    invoke-direct {v1, p0, v0}, Lp0/o;-><init>(Ljava/io/OutputStream;Lp0/x;)V
 
-    new-instance p0, Lo0/c;
+    const-string p0, "sink"
 
-    invoke-direct {p0, v0, v1}, Lo0/c;-><init>(Lo0/b;Lo0/u;)V
+    invoke-static {v1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Lp0/c;
+
+    invoke-direct {p0, v0, v1}, Lp0/c;-><init>(Lp0/b;Lp0/u;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$receiver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final X(Ljava/io/InputStream;)Lo0/w;
-    .locals 2
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Lo0/m;
-
-    new-instance v1, Lo0/x;
-
-    invoke-direct {v1}, Lo0/x;-><init>()V
-
-    invoke-direct {v0, p0, v1}, Lo0/m;-><init>(Ljava/io/InputStream;Lo0/x;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$receiver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final Y(Ljava/net/Socket;)Lo0/w;
+.method public static final U(Ljava/net/Socket;)Lp0/w;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1499,13 +1277,15 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$receiver"
 
-    new-instance v0, Lo0/v;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p0}, Lo0/v;-><init>(Ljava/net/Socket;)V
+    new-instance v0, Lp0/v;
 
-    new-instance v1, Lo0/m;
+    invoke-direct {v0, p0}, Lp0/v;-><init>(Ljava/net/Socket;)V
+
+    new-instance v1, Lp0/m;
 
     invoke-virtual {p0}, Ljava/net/Socket;->getInputStream()Ljava/io/InputStream;
 
@@ -1513,28 +1293,23 @@
 
     const-string v2, "getInputStream()"
 
-    invoke-static {p0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, p0, v0}, Lo0/m;-><init>(Ljava/io/InputStream;Lo0/x;)V
+    invoke-direct {v1, p0, v0}, Lp0/m;-><init>(Ljava/io/InputStream;Lp0/x;)V
 
-    new-instance p0, Lo0/d;
+    const-string p0, "source"
 
-    invoke-direct {p0, v0, v1}, Lo0/d;-><init>(Lo0/b;Lo0/w;)V
+    invoke-static {v1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Lp0/d;
+
+    invoke-direct {p0, v0, v1}, Lp0/d;-><init>(Lp0/b;Lp0/w;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$receiver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final Z(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
-    .locals 0
+.method public static final V(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
@@ -1553,7 +1328,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$startCoroutineCancellable"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-static {p0, p1, p2}, Lf/n/a/k/a;->createCoroutineUnintercepted(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
@@ -1566,7 +1347,7 @@
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
-    invoke-static {p0, p1}, Lk0/a/h0;->c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+    invoke-static {p0, p1}, Ll0/a/h0;->c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1583,59 +1364,9 @@
 
     :goto_0
     return-void
-
-    :cond_0
-    const-string p0, "$this$startCoroutineCancellable"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final a(Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/CoroutineScope;
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    new-instance v1, Lk0/a/r1/e;
-
-    sget-object v2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {p0, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v2, Lk0/a/a1;
-
-    invoke-direct {v2, v0}, Lk0/a/a1;-><init>(Lkotlinx/coroutines/Job;)V
-
-    invoke-interface {p0, v2}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-direct {v1, p0}, Lk0/a/r1/e;-><init>(Lkotlin/coroutines/CoroutineContext;)V
-
-    return-object v1
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final a0(Lk0/a/a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+.method public static final W(Ll0/a/a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1644,7 +1375,7 @@
             "R:",
             "Ljava/lang/Object;",
             ">(",
-            "Lk0/a/a<",
+            "Ll0/a/a<",
             "-TT;>;TR;",
             "Lkotlin/jvm/functions/Function2<",
             "-TR;-",
@@ -1656,16 +1387,22 @@
         }
     .end annotation
 
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
-    if-eqz p2, :cond_3
+    const-string v1, "$this$startUndispatchedOrReturn"
 
-    invoke-virtual {p0}, Lk0/a/a;->Q()V
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "block"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ll0/a/a;->Q()V
 
     const/4 v1, 0x2
 
     :try_start_0
-    invoke-static {p2, v1}, Lj0/n/c/u;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
+    invoke-static {p2, v1}, Lk0/o/c/v;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
 
     invoke-interface {p2, p1, p0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1678,11 +1415,11 @@
     :catchall_0
     move-exception p1
 
-    new-instance p2, Lk0/a/p;
+    new-instance p2, Ll0/a/p;
 
     const/4 v2, 0x0
 
-    invoke-direct {p2, p1, v2, v1}, Lk0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
+    invoke-direct {p2, p1, v2, v1}, Ll0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
 
     move-object p1, p2
 
@@ -1694,32 +1431,32 @@
     :cond_0
     const/4 p2, 0x4
 
-    invoke-virtual {p0, p1, p2}, Lk0/a/c1;->C(Ljava/lang/Object;I)Z
+    invoke-virtual {p0, p1, p2}, Ll0/a/c1;->C(Ljava/lang/Object;I)Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
 
     move-result-object p1
 
-    instance-of p2, p1, Lk0/a/p;
+    instance-of p2, p1, Ll0/a/p;
 
     if-nez p2, :cond_1
 
-    invoke-static {p1}, Lk0/a/d1;->b(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {p1}, Ll0/a/d1;->b(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_1
-    check-cast p1, Lk0/a/p;
+    check-cast p1, Ll0/a/p;
 
-    iget-object p1, p1, Lk0/a/p;->a:Ljava/lang/Throwable;
+    iget-object p1, p1, Ll0/a/p;->a:Ljava/lang/Throwable;
 
-    invoke-static {p0, p1}, Lf/n/a/k/a;->m0(Lk0/a/a;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {p0, p1}, Lf/n/a/k/a;->h0(Ll0/a/a;Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     move-result-object p0
 
@@ -1728,574 +1465,22 @@
     :cond_2
     :goto_1
     return-object v0
-
-    :cond_3
-    const-string p0, "block"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static final access$reverseElementIndex(Ljava/util/List;I)I
-    .locals 3
-
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v0
-
-    if-ltz p1, :cond_0
-
-    if-lt v0, p1, :cond_0
-
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result p0
-
-    sub-int/2addr p0, p1
-
-    return p0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v1, "Element index "
-
-    const-string v2, " must be in range ["
-
-    invoke-static {v1, p1, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    const/4 v1, 0x0
-
-    new-instance v2, Lkotlin/ranges/IntRange;
-
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result p0
-
-    invoke-direct {v2, v1, p0}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p0, "]."
-
-    invoke-virtual {p1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "-TT;>;",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)Z"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_4
-
-    if-eqz p1, :cond_3
-
-    instance-of v0, p1, Ljava/util/Collection;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/util/Collection;
-
-    invoke-interface {p0, p1}, Ljava/util/Collection;->addAll(Ljava/util/Collection;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_1
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-interface {p0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    return v0
-
-    :cond_3
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "$this$addAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final addAll(Ljava/util/Collection;Lkotlin/sequences/Sequence;)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "-TT;>;",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    const/4 v0, 0x0
-
-    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_0
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-interface {p0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return v0
-
-    :cond_2
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "-TT;>;[TT;)Z"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p1}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Ljava/util/Collection;->addAll(Ljava/util/Collection;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$addAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    sget-object v0, Lj0/l/b;->a:Lj0/l/a;
-
-    invoke-virtual {v0, p0, p1}, Lj0/l/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$addSuppressed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final varargs arrayListOf([Ljava/lang/Object;)Ljava/util/ArrayList;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/ArrayList<",
-            "TT;>;"
-        }
-    .end annotation
-
-    array-length v0, p0
-
-    if-nez v0, :cond_0
-
-    new-instance p0, Ljava/util/ArrayList;
-
-    invoke-direct {p0}, Ljava/util/ArrayList;-><init>()V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/util/ArrayList;
-
-    new-instance v1, Lj0/i/d;
-
-    const/4 v2, 0x1
-
-    invoke-direct {v1, p0, v2}, Lj0/i/d;-><init>([Ljava/lang/Object;Z)V
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    move-object p0, v0
-
-    :goto_0
-    return-object p0
-.end method
-
-.method public static final asIterable(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;)",
-            "Ljava/lang/Iterable<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Lj0/s/n;
-
-    invoke-direct {v0, p0}, Lj0/s/n;-><init>(Lkotlin/sequences/Sequence;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$asIterable"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final asList([Ljava/lang/Object;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    invoke-static {p0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    const-string v0, "ArraysUtilJVM.asList(this)"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "$this$asList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final asReversed(Ljava/util/List;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Lj0/i/t;
-
-    invoke-direct {v0, p0}, Lj0/i/t;-><init>(Ljava/util/List;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$asReversed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final asSequence(Ljava/util/Iterator;)Lkotlin/sequences/Sequence;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Iterator<",
-            "+TT;>;)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/j;
-
-    invoke-direct {v0, p0}, Lj0/s/j;-><init>(Ljava/util/Iterator;)V
-
-    instance-of p0, v0, Lj0/s/a;
-
-    if-eqz p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p0, Lj0/s/a;
-
-    invoke-direct {p0, v0}, Lj0/s/a;-><init>(Lkotlin/sequences/Sequence;)V
-
-    move-object v0, p0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public static final asSequence(Ljava/util/Map;)Lkotlin/sequences/Sequence;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Map<",
-            "+TK;+TV;>;)",
-            "Lkotlin/sequences/Sequence<",
-            "Ljava/util/Map$Entry<",
-            "TK;TV;>;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "$this$asSequence"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final asSequence([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    array-length v0, p0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    sget-object p0, Lj0/s/f;->a:Lj0/s/f;
-
-    return-object p0
-
-    :cond_1
-    new-instance v0, Lj0/i/e;
-
-    invoke-direct {v0, p0}, Lj0/i/e;-><init>([Ljava/lang/Object;)V
-
-    return-object v0
-.end method
-
-.method public static final b(ILkotlin/reflect/KProperty;)Ljava/lang/Void;
-    .locals 3
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "View ID "
-
-    const-string v2, " for \'"
-
-    invoke-static {v1, p0, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p0
-
-    invoke-interface {p1}, Lkotlin/reflect/KCallable;->getName()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, "\' not found."
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final b0(Ljava/lang/String;JJJ)J
+.method public static final X(Ljava/lang/String;JJJ)J
     .locals 4
 
-    if-eqz p0, :cond_3
+    const-string v0, "propertyName"
 
-    invoke-static {p0}, Lk0/a/r1/w;->a(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ll0/a/r1/w;->a(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_2
 
-    invoke-static {v0}, Lj0/t/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    invoke-static {v0}, Lk0/u/j;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 
     move-result-object p1
 
@@ -2398,13 +1583,709 @@
     :cond_2
     :goto_0
     return-wide p1
+.end method
+
+.method public static Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+    .locals 7
+
+    and-int/lit8 p5, p4, 0x4
+
+    if-eqz p5, :cond_0
+
+    const/4 p2, 0x1
+
+    :cond_0
+    and-int/lit8 p4, p4, 0x8
+
+    if-eqz p4, :cond_1
+
+    const p3, 0x7fffffff
+
+    :cond_1
+    const-string p4, "propertyName"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    int-to-long v1, p1
+
+    int-to-long v3, p2
+
+    int-to-long v5, p3
+
+    move-object v0, p0
+
+    invoke-static/range {v0 .. v6}, Lf/n/a/k/a;->X(Ljava/lang/String;JJJ)J
+
+    move-result-wide p0
+
+    long-to-int p1, p0
+
+    return p1
+.end method
+
+.method public static synthetic Z(Ljava/lang/String;JJJILjava/lang/Object;)J
+    .locals 7
+
+    and-int/lit8 p8, p7, 0x4
+
+    if-eqz p8, :cond_0
+
+    const-wide/16 p3, 0x1
+
+    :cond_0
+    move-wide v3, p3
+
+    and-int/lit8 p3, p7, 0x8
+
+    if-eqz p3, :cond_1
+
+    const-wide p5, 0x7fffffffffffffffL
+
+    :cond_1
+    move-wide v5, p5
+
+    move-object v0, p0
+
+    move-wide v1, p1
+
+    invoke-static/range {v0 .. v6}, Lf/n/a/k/a;->X(Ljava/lang/String;JJJ)J
+
+    move-result-wide p0
+
+    return-wide p0
+.end method
+
+.method public static final a(Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/CoroutineScope;
+    .locals 3
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ll0/a/r1/e;
+
+    sget-object v1, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {p0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    new-instance v2, Ll0/a/a1;
+
+    invoke-direct {v2, v1}, Ll0/a/a1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    invoke-interface {p0, v2}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-direct {v0, p0}, Ll0/a/r1/e;-><init>(Lkotlin/coroutines/CoroutineContext;)V
+
+    return-object v0
+.end method
+
+.method public static a0(Ljava/util/List;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/lang/Throwable;",
+            ">;)V"
+        }
+    .end annotation
+
+    if-eqz p0, :cond_3
+
+    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_2
+
+    const/4 v0, 0x0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/lang/Throwable;
+
+    instance-of v0, p0, Ljava/lang/RuntimeException;
+
+    if-nez v0, :cond_1
+
+    instance-of v0, p0, Ljava/lang/Error;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/lang/Error;
+
+    throw p0
+
+    :cond_0
+    new-instance v0, Ljava/lang/RuntimeException;
+
+    invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_1
+    check-cast p0, Ljava/lang/RuntimeException;
+
+    throw p0
+
+    :cond_2
+    new-instance v0, Lrx/exceptions/CompositeException;
+
+    invoke-direct {v0, p0}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    throw v0
 
     :cond_3
-    const-string p0, "propertyName"
+    return-void
+.end method
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+.method public static final access$reverseElementIndex(Ljava/util/List;I)I
+    .locals 3
 
-    const/4 p0, 0x0
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result v0
+
+    if-ltz p1, :cond_0
+
+    if-lt v0, p1, :cond_0
+
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result p0
+
+    sub-int/2addr p0, p1
+
+    return p0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v1, "Element index "
+
+    const-string v2, " must be in range ["
+
+    invoke-static {v1, p1, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    const/4 v1, 0x0
+
+    new-instance v2, Lkotlin/ranges/IntRange;
+
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result p0
+
+    invoke-direct {v2, v1, p0}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p0, "]."
+
+    invoke-virtual {p1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static final addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Collection<",
+            "-TT;>;",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)Z"
+        }
+    .end annotation
+
+    const-string v0, "$this$addAll"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-interface {p0, p1}, Ljava/util/Collection;->addAll(Ljava/util/Collection;)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_1
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-interface {p0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    return v0
+.end method
+
+.method public static final addAll(Ljava/util/Collection;Lkotlin/sequences/Sequence;)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Collection<",
+            "-TT;>;",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;)Z"
+        }
+    .end annotation
+
+    const-string v0, "$this$addAll"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    :cond_0
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-interface {p0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return v0
+.end method
+
+.method public static final addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "$this$addSuppressed"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eq p0, p1, :cond_0
+
+    sget-object v0, Lk0/m/b;->a:Lk0/m/a;
+
+    invoke-virtual {v0, p0, p1}, Lk0/m/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public static final varargs arrayListOf([Ljava/lang/Object;)Ljava/util/ArrayList;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Ljava/util/ArrayList<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-nez v0, :cond_0
+
+    new-instance p0, Ljava/util/ArrayList;
+
+    invoke-direct {p0}, Ljava/util/ArrayList;-><init>()V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/util/ArrayList;
+
+    new-instance v1, Lk0/j/d;
+
+    const/4 v2, 0x1
+
+    invoke-direct {v1, p0, v2}, Lk0/j/d;-><init>([Ljava/lang/Object;Z)V
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    move-object p0, v0
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final asIterable(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;)",
+            "Ljava/lang/Iterable<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$asIterable"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/t/n;
+
+    invoke-direct {v0, p0}, Lk0/t/n;-><init>(Lkotlin/sequences/Sequence;)V
+
+    return-object v0
+.end method
+
+.method public static final asList([Ljava/lang/Object;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$asList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    const-string v0, "ArraysUtilJVM.asList(this)"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final asReversed(Ljava/util/List;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$asReversed"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/j/t;
+
+    invoke-direct {v0, p0}, Lk0/j/t;-><init>(Ljava/util/List;)V
+
+    return-object v0
+.end method
+
+.method public static final asSequence(Ljava/util/Iterator;)Lkotlin/sequences/Sequence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Iterator<",
+            "+TT;>;)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$asSequence"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/t/j;
+
+    invoke-direct {v0, p0}, Lk0/t/j;-><init>(Ljava/util/Iterator;)V
+
+    const-string p0, "$this$constrainOnce"
+
+    invoke-static {v0, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of p0, v0, Lk0/t/a;
+
+    if-eqz p0, :cond_0
+
+    check-cast v0, Lk0/t/a;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p0, Lk0/t/a;
+
+    invoke-direct {p0, v0}, Lk0/t/a;-><init>(Lkotlin/sequences/Sequence;)V
+
+    move-object v0, p0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public static final asSequence(Ljava/util/Map;)Lkotlin/sequences/Sequence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K:",
+            "Ljava/lang/Object;",
+            "V:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Map<",
+            "+TK;+TV;>;)",
+            "Lkotlin/sequences/Sequence<",
+            "Ljava/util/Map$Entry<",
+            "TK;TV;>;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$asSequence"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final asSequence([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$asSequence"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    sget-object p0, Lk0/t/f;->a:Lk0/t/f;
+
+    return-object p0
+
+    :cond_1
+    new-instance v0, Lk0/j/e;
+
+    invoke-direct {v0, p0}, Lk0/j/e;-><init>([Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+.method public static final b(ILkotlin/reflect/KProperty;)Ljava/lang/Void;
+    .locals 3
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "View ID "
+
+    const-string v2, " for \'"
+
+    invoke-static {v1, p0, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p0
+
+    invoke-interface {p1}, Lkotlin/reflect/KCallable;->getName()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "\' not found."
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static b0(Ljava/lang/Throwable;)V
+    .locals 1
+
+    instance-of v0, p0, Lrx/exceptions/OnErrorNotImplementedException;
+
+    if-nez v0, :cond_5
+
+    instance-of v0, p0, Lrx/exceptions/OnErrorFailedException;
+
+    if-nez v0, :cond_4
+
+    instance-of v0, p0, Lrx/exceptions/OnCompletedFailedException;
+
+    if-nez v0, :cond_3
+
+    instance-of v0, p0, Ljava/lang/VirtualMachineError;
+
+    if-nez v0, :cond_2
+
+    instance-of v0, p0, Ljava/lang/ThreadDeath;
+
+    if-nez v0, :cond_1
+
+    instance-of v0, p0, Ljava/lang/LinkageError;
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    check-cast p0, Ljava/lang/LinkageError;
+
+    throw p0
+
+    :cond_1
+    check-cast p0, Ljava/lang/ThreadDeath;
+
+    throw p0
+
+    :cond_2
+    check-cast p0, Ljava/lang/VirtualMachineError;
+
+    throw p0
+
+    :cond_3
+    check-cast p0, Lrx/exceptions/OnCompletedFailedException;
+
+    throw p0
+
+    :cond_4
+    check-cast p0, Lrx/exceptions/OnErrorFailedException;
+
+    throw p0
+
+    :cond_5
+    check-cast p0, Lrx/exceptions/OnErrorNotImplementedException;
 
     throw p0
 .end method
@@ -2426,21 +2307,28 @@
     return-wide p0
 .end method
 
-.method public static final c0(Ljava/lang/String;Z)Z
+.method public static c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
     .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Throwable;",
+            "Ls0/g<",
+            "*>;",
+            "Ljava/lang/Object;",
+            ")V"
+        }
+    .end annotation
 
-    invoke-static {p0}, Lk0/a/r1/w;->a(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-static {p0, p2}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
 
     move-result-object p0
 
-    if-eqz p0, :cond_0
+    invoke-interface {p1, p0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
-    invoke-static {p0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
-
-    move-result p1
-
-    :cond_0
-    return p1
+    return-void
 .end method
 
 .method public static final checkRadix(I)I
@@ -2525,7 +2413,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$collectionSizeOrDefault"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     instance-of v0, p0, Ljava/util/Collection;
 
@@ -2539,15 +2429,6 @@
 
     :cond_0
     return p1
-
-    :cond_1
-    const-string p0, "$this$collectionSizeOrDefault"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final varargs compareBy([Lkotlin/jvm/functions/Function1;)Ljava/util/Comparator;
@@ -2566,6 +2447,10 @@
         }
     .end annotation
 
+    const-string v0, "selectors"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length v0, p0
 
     if-lez v0, :cond_0
@@ -2580,9 +2465,9 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    new-instance v0, Lj0/j/a;
+    new-instance v0, Lk0/k/a;
 
-    invoke-direct {v0, p0}, Lj0/j/a;-><init>([Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, p0}, Lk0/k/a;-><init>([Lkotlin/jvm/functions/Function1;)V
 
     return-object v0
 
@@ -2638,44 +2523,6 @@
     return p0
 .end method
 
-.method public static final contains([Ljava/lang/Object;Ljava/lang/Object;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;TT;)Z"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
-
-    move-result p0
-
-    if-ltz p0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-
-    :cond_1
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
 .method public static final convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -2692,6 +2539,14 @@
         }
     .end annotation
 
+    const-string v0, "$this$convertToSetForSetOperationWith"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     instance-of v0, p0, Ljava/util/Set;
 
     if-eqz v0, :cond_0
@@ -2748,7 +2603,7 @@
     :goto_0
     if-eqz v0, :cond_3
 
-    invoke-static {p0}, Lj0/i/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
+    invoke-static {p0}, Lk0/j/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
 
     move-result-object p0
 
@@ -2760,7 +2615,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-static {p0}, Lj0/i/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
+    invoke-static {p0}, Lk0/j/l;->toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
 
     move-result-object p0
 
@@ -2794,22 +2649,19 @@
     array-length p4, p0
 
     :cond_2
-    if-eqz p0, :cond_3
+    const-string p5, "$this$copyInto"
+
+    invoke-static {p0, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p5, "destination"
+
+    invoke-static {p1, p5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sub-int/2addr p4, p3
 
     invoke-static {p0, p3, p1, p2, p4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     return-object p1
-
-    :cond_3
-    const-string p0, "$this$copyInto"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final createCoroutineUnintercepted(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
@@ -2835,13 +2687,23 @@
         }
     .end annotation
 
-    instance-of v0, p0, Lj0/k/h/a/a;
+    const-string v0, "$this$createCoroutineUnintercepted"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "completion"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Lk0/l/h/a/a;
 
     if-eqz v0, :cond_0
 
-    check-cast p0, Lj0/k/h/a/a;
+    check-cast p0, Lk0/l/h/a/a;
 
-    invoke-virtual {p0, p1, p2}, Lj0/k/h/a/a;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0, p1, p2}, Lk0/l/h/a/a;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 
     move-result-object p0
 
@@ -2852,20 +2714,20 @@
 
     move-result-object v4
 
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
 
     if-ne v4, v0, :cond_1
 
-    new-instance v0, Lj0/k/g/b;
+    new-instance v0, Lk0/l/g/b;
 
-    invoke-direct {v0, p2, p2, p0, p1}, Lj0/k/g/b;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
+    invoke-direct {v0, p2, p2, p0, p1}, Lk0/l/g/b;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
 
     move-object p0, v0
 
     goto :goto_0
 
     :cond_1
-    new-instance v7, Lj0/k/g/c;
+    new-instance v7, Lk0/l/g/c;
 
     move-object v0, v7
 
@@ -2879,7 +2741,7 @@
 
     move-object v6, p1
 
-    invoke-direct/range {v0 .. v6}, Lj0/k/g/c;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
+    invoke-direct/range {v0 .. v6}, Lk0/l/g/c;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
 
     move-object p0, v7
 
@@ -2890,27 +2752,24 @@
 .method public static final createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "exception"
 
-    new-instance v0, Lj0/d$a;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p0}, Lj0/d$a;-><init>(Ljava/lang/Throwable;)V
+    new-instance v0, Lk0/d$a;
+
+    invoke-direct {v0, p0}, Lk0/d$a;-><init>(Ljava/lang/Throwable;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final d(ILjava/lang/String;Ljava/lang/Throwable;)V
     .locals 5
 
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x5
 
     if-ne p0, v0, :cond_0
@@ -2955,7 +2814,7 @@
 
     const/4 v3, 0x4
 
-    invoke-static {p1, v2, v1, p2, v3}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+    invoke-static {p1, v2, v1, p2, v3}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
 
     move-result v2
 
@@ -2981,7 +2840,7 @@
 
     const-string v4, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
 
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v4, "OkHttp"
 
@@ -3002,72 +2861,406 @@
     return-void
 .end method
 
-.method public static d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-    .locals 7
+.method public static final d0(Ljava/lang/String;)Ljava/lang/String;
+    .locals 9
 
-    and-int/lit8 p5, p4, 0x4
+    const-string v0, "$this$toCanonicalHost"
 
-    if-eqz p5, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p2, 0x1
+    const-string v0, ":"
 
-    :cond_0
-    and-int/lit8 p4, p4, 0x8
+    const/4 v1, 0x0
 
-    if-eqz p4, :cond_1
+    const/4 v2, 0x2
 
-    const p3, 0x7fffffff
+    invoke-static {p0, v0, v1, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
 
-    :cond_1
-    int-to-long v1, p1
+    move-result v0
 
-    int-to-long v3, p2
+    const/4 v3, -0x1
 
-    int-to-long v5, p3
+    const/4 v4, 0x0
 
-    move-object v0, p0
+    const/4 v5, 0x1
 
-    invoke-static/range {v0 .. v6}, Lf/n/a/k/a;->b0(Ljava/lang/String;JJJ)J
+    if-eqz v0, :cond_b
 
-    move-result-wide p0
+    const-string v0, "["
 
-    long-to-int p1, p0
+    invoke-static {p0, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
-    return p1
-.end method
-
-.method public static final distinct(Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lj0/s/o;->d:Lj0/s/o;
+    move-result v0
 
     if-eqz v0, :cond_0
 
-    new-instance v1, Lj0/s/c;
+    const-string v0, "]"
 
-    invoke-direct {v1, p0, v0}, Lj0/s/c;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
+    invoke-static {p0, v0, v1, v2}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
-    return-object v1
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    sub-int/2addr v0, v5
+
+    invoke-static {p0, v5, v0}, Lf/n/a/k/a;->r(Ljava/lang/String;II)Ljava/net/InetAddress;
+
+    move-result-object v0
+
+    goto :goto_0
 
     :cond_0
-    const-string p0, "selector"
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-result v0
+
+    invoke-static {p0, v1, v0}, Lf/n/a/k/a;->r(Ljava/lang/String;II)Ljava/net/InetAddress;
+
+    move-result-object v0
+
+    :goto_0
+    if-eqz v0, :cond_a
+
+    invoke-virtual {v0}, Ljava/net/InetAddress;->getAddress()[B
+
+    move-result-object v2
+
+    array-length v4, v2
+
+    const/4 v5, 0x4
+
+    const/16 v6, 0x10
+
+    if-ne v4, v6, :cond_8
+
+    const-string p0, "address"
+
+    invoke-static {v2, p0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p0, 0x0
 
-    throw p0
+    const/4 v0, 0x0
+
+    :goto_1
+    array-length v4, v2
+
+    if-ge p0, v4, :cond_3
+
+    move v4, p0
+
+    :goto_2
+    if-ge v4, v6, :cond_1
+
+    aget-byte v7, v2, v4
+
+    if-nez v7, :cond_1
+
+    add-int/lit8 v7, v4, 0x1
+
+    aget-byte v7, v2, v7
+
+    if-nez v7, :cond_1
+
+    add-int/lit8 v4, v4, 0x2
+
+    goto :goto_2
+
+    :cond_1
+    sub-int v7, v4, p0
+
+    if-le v7, v0, :cond_2
+
+    if-lt v7, v5, :cond_2
+
+    move v3, p0
+
+    move v0, v7
+
+    :cond_2
+    add-int/lit8 p0, v4, 0x2
+
+    goto :goto_1
+
+    :cond_3
+    new-instance p0, Lp0/e;
+
+    invoke-direct {p0}, Lp0/e;-><init>()V
+
+    :cond_4
+    :goto_3
+    array-length v4, v2
+
+    if-ge v1, v4, :cond_7
+
+    const/16 v4, 0x3a
+
+    if-ne v1, v3, :cond_5
+
+    invoke-virtual {p0, v4}, Lp0/e;->I(I)Lp0/e;
+
+    add-int/2addr v1, v0
+
+    if-ne v1, v6, :cond_4
+
+    invoke-virtual {p0, v4}, Lp0/e;->I(I)Lp0/e;
+
+    goto :goto_3
+
+    :cond_5
+    if-lez v1, :cond_6
+
+    invoke-virtual {p0, v4}, Lp0/e;->I(I)Lp0/e;
+
+    :cond_6
+    aget-byte v4, v2, v1
+
+    const/16 v5, 0xff
+
+    invoke-static {v4, v5}, Lo0/g0/b;->a(BI)I
+
+    move-result v4
+
+    shl-int/lit8 v4, v4, 0x8
+
+    add-int/lit8 v7, v1, 0x1
+
+    aget-byte v7, v2, v7
+
+    and-int/2addr v5, v7
+
+    or-int/2addr v4, v5
+
+    int-to-long v4, v4
+
+    invoke-virtual {p0, v4, v5}, Lp0/e;->L(J)Lp0/e;
+
+    add-int/lit8 v1, v1, 0x2
+
+    goto :goto_3
+
+    :cond_7
+    invoke-virtual {p0}, Lp0/e;->v()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_8
+    array-length v1, v2
+
+    if-ne v1, v5, :cond_9
+
+    invoke-virtual {v0}, Ljava/net/InetAddress;->getHostAddress()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_9
+    new-instance v0, Ljava/lang/AssertionError;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Invalid IPv6 address: \'"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 p0, 0x27
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_a
+    return-object v4
+
+    :cond_b
+    :try_start_0
+    invoke-static {p0}, Ljava/net/IDN;->toASCII(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "IDN.toASCII(host)"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const-string v2, "Locale.US"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, v0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "(this as java.lang.String).toLowerCase(locale)"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    if-nez v0, :cond_c
+
+    const/4 v0, 0x1
+
+    goto :goto_4
+
+    :cond_c
+    const/4 v0, 0x0
+
+    :goto_4
+    if-eqz v0, :cond_d
+
+    return-object v4
+
+    :cond_d
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    const/4 v2, 0x0
+
+    :goto_5
+    if-ge v2, v0, :cond_11
+
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v6
+
+    const/16 v7, 0x1f
+
+    if-le v6, v7, :cond_10
+
+    const/16 v7, 0x7f
+
+    if-lt v6, v7, :cond_e
+
+    goto :goto_6
+
+    :cond_e
+    const/4 v7, 0x6
+
+    const-string v8, " #%/:?@[\\]"
+
+    invoke-static {v8, v6, v1, v1, v7}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v6
+    :try_end_0
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eq v6, v3, :cond_f
+
+    goto :goto_6
+
+    :cond_f
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_5
+
+    :cond_10
+    :goto_6
+    const/4 v1, 0x1
+
+    :cond_11
+    if-eqz v1, :cond_12
+
+    goto :goto_7
+
+    :cond_12
+    move-object v4, p0
+
+    :catch_0
+    :goto_7
+    return-object v4
+.end method
+
+.method public static final deleteRecursively(Ljava/io/File;)Z
+    .locals 3
+
+    const-string v0, "$this$deleteRecursively"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$walkBottomUp"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/n/b;->e:Lk0/n/b;
+
+    const-string v1, "$this$walk"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "direction"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lk0/n/a;
+
+    invoke-direct {v1, p0, v0}, Lk0/n/a;-><init>(Ljava/io/File;Lk0/n/b;)V
+
+    new-instance p0, Lk0/n/a$b;
+
+    invoke-direct {p0, v1}, Lk0/n/a$b;-><init>(Lk0/n/a;)V
+
+    :goto_0
+    const/4 v0, 0x1
+
+    :goto_1
+    invoke-virtual {p0}, Lk0/j/b;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {p0}, Lk0/j/b;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/io/File;
+
+    invoke-virtual {v1}, Ljava/io/File;->delete()Z
+
+    move-result v2
+
+    if-nez v2, :cond_0
+
+    invoke-virtual {v1}, Ljava/io/File;->exists()Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    :cond_0
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_2
+    return v0
 .end method
 
 .method public static final drop(Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
@@ -3084,6 +3277,10 @@
         }
     .end annotation
 
+    const-string v0, "$this$drop"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     if-ltz p1, :cond_0
 
     const/4 v0, 0x1
@@ -3101,22 +3298,22 @@
     goto :goto_1
 
     :cond_1
-    instance-of v0, p0, Lj0/s/e;
+    instance-of v0, p0, Lk0/t/e;
 
     if-eqz v0, :cond_2
 
-    check-cast p0, Lj0/s/e;
+    check-cast p0, Lk0/t/e;
 
-    invoke-interface {p0, p1}, Lj0/s/e;->drop(I)Lkotlin/sequences/Sequence;
+    invoke-interface {p0, p1}, Lk0/t/e;->drop(I)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
     goto :goto_1
 
     :cond_2
-    new-instance v0, Lj0/s/d;
+    new-instance v0, Lk0/t/d;
 
-    invoke-direct {v0, p0, p1}, Lj0/s/d;-><init>(Lkotlin/sequences/Sequence;I)V
+    invoke-direct {v0, p0, p1}, Lk0/t/d;-><init>(Lkotlin/sequences/Sequence;I)V
 
     move-object p0, v0
 
@@ -3146,7 +3343,13 @@
 .method public static final e([BI[BII)Z
     .locals 4
 
-    if-eqz p0, :cond_2
+    const-string v0, "a"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "b"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -3176,47 +3379,109 @@
     const/4 p0, 0x1
 
     return p0
-
-    :cond_2
-    const-string p0, "a"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
-.method public static synthetic e0(Ljava/lang/String;JJJILjava/lang/Object;)J
-    .locals 7
+.method public static final e0(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "*>;)",
+            "Ljava/lang/String;"
+        }
+    .end annotation
 
-    and-int/lit8 p8, p7, 0x4
+    const-string v0, "$this$toDebugString"
 
-    if-eqz p8, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-wide/16 p3, 0x1
+    instance-of v0, p0, Ll0/a/f0;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    goto :goto_2
 
     :cond_0
-    move-wide v3, p3
+    const/16 v0, 0x40
 
-    and-int/lit8 p3, p7, 0x8
+    :try_start_0
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    if-eqz p3, :cond_1
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-wide p5, 0x7fffffffffffffffL
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    :goto_0
+    invoke-static {v1}, Lk0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v2
+
+    if-nez v2, :cond_1
+
+    goto :goto_1
 
     :cond_1
-    move-wide v5, p5
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    move-object v0, p0
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    move-wide v1, p1
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    invoke-static/range {v0 .. v6}, Lf/n/a/k/a;->b0(Ljava/lang/String;JJJ)J
+    move-result-object v2
 
-    move-result-wide p0
+    invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
-    return-wide p0
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    :goto_1
+    move-object p0, v1
+
+    check-cast p0, Ljava/lang/String;
+
+    :goto_2
+    return-object p0
 .end method
 
 .method public static final equals(CCZ)Z
@@ -3268,133 +3533,68 @@
 .method public static final f([BI[BII)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "src"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "dest"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0, p1, p2, p3, p4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     return-void
-
-    :cond_0
-    const-string p0, "dest"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "src"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
-.method public static f0(Ljava/util/List;)V
-    .locals 2
+.method public static final f0(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/lang/Throwable;",
-            ">;)V"
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Object;",
+            ")",
+            "Ljava/lang/Object;"
         }
     .end annotation
 
-    if-eqz p0, :cond_3
+    instance-of v0, p0, Lk0/d$a;
 
-    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    invoke-interface {p0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_2
-
-    const/4 v0, 0x0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Ljava/lang/Throwable;
-
-    instance-of v0, p0, Ljava/lang/RuntimeException;
-
-    if-nez v0, :cond_1
-
-    instance-of v0, p0, Ljava/lang/Error;
+    xor-int/lit8 v0, v0, 0x1
 
     if-eqz v0, :cond_0
 
-    check-cast p0, Ljava/lang/Error;
+    invoke-static {p0}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
 
-    throw p0
+    goto :goto_0
 
     :cond_0
-    new-instance v0, Ljava/lang/RuntimeException;
+    new-instance v0, Ll0/a/p;
 
-    invoke-direct {v0, p0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+    invoke-static {p0}, Lk0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
 
-    throw v0
+    move-result-object p0
+
+    if-eqz p0, :cond_1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-direct {v0, p0, v1, v2}, Ll0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
+
+    move-object p0, v0
+
+    :goto_0
+    return-object p0
 
     :cond_1
-    check-cast p0, Ljava/lang/RuntimeException;
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p0, 0x0
 
     throw p0
-
-    :cond_2
-    new-instance v0, Lrx/exceptions/CompositeException;
-
-    invoke-direct {v0, p0}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    throw v0
-
-    :cond_3
-    return-void
-.end method
-
-.method public static fill$default([Ljava/lang/Object;Ljava/lang/Object;III)V
-    .locals 0
-
-    and-int/lit8 p1, p4, 0x2
-
-    if-eqz p1, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 p1, p4, 0x4
-
-    if-eqz p1, :cond_1
-
-    array-length p3, p0
-
-    :cond_1
-    const/4 p1, 0x0
-
-    if-eqz p0, :cond_2
-
-    invoke-static {p0, p2, p3, p1}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
-
-    return-void
-
-    :cond_2
-    const-string p0, "$this$fill"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
 .end method
 
 .method public static final filter(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
@@ -3415,33 +3615,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$filter"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "predicate"
 
-    new-instance v0, Lj0/s/g;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/t/g;
 
     const/4 v1, 0x1
 
-    invoke-direct {v0, p0, v1, p1}, Lj0/s/g;-><init>(Lkotlin/sequences/Sequence;ZLkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, p0, v1, p1}, Lk0/t/g;-><init>(Lkotlin/sequences/Sequence;ZLkotlin/jvm/functions/Function1;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "predicate"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$filter"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final filterNot(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
@@ -3462,33 +3650,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$filterNot"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "predicate"
 
-    new-instance v0, Lj0/s/g;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/t/g;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, p0, v1, p1}, Lj0/s/g;-><init>(Lkotlin/sequences/Sequence;ZLkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, p0, v1, p1}, Lk0/t/g;-><init>(Lkotlin/sequences/Sequence;ZLkotlin/jvm/functions/Function1;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "predicate"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$filterNot"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final filterNotNull([Ljava/lang/Object;)Ljava/util/List;
@@ -3503,10 +3679,22 @@
         }
     .end annotation
 
+    const-string v0, "$this$filterNotNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
+    const-string v1, "$this$filterNotNullTo"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "destination"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length v1, p0
 
     const/4 v2, 0x0
@@ -3543,7 +3731,11 @@
         }
     .end annotation
 
-    sget-object v0, Lj0/s/p;->d:Lj0/s/p;
+    const-string v0, "$this$filterNotNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/t/p;->d:Lk0/t/p;
 
     invoke-static {p0, v0}, Lf/n/a/k/a;->filterNot(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
@@ -3553,7 +3745,7 @@
 .end method
 
 .method public static final firstOrNull(Lkotlin/sequences/Sequence;)Ljava/lang/Object;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -3564,9 +3756,9 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$firstOrNull"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
 
@@ -3574,11 +3766,13 @@
 
     invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    return-object v0
+    const/4 p0, 0x0
+
+    return-object p0
 
     :cond_0
     invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -3586,13 +3780,6 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_1
-    const-string p0, "$this$firstOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final firstOrNull([Ljava/lang/Object;)Ljava/lang/Object;
@@ -3605,6 +3792,10 @@
         }
     .end annotation
 
+    const-string v0, "$this$firstOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length v0, p0
 
     const/4 v1, 0x0
@@ -3648,7 +3839,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$flatten"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -3677,15 +3870,6 @@
 
     :cond_0
     return-object v0
-
-    :cond_1
-    const-string p0, "$this$flatten"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final g(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -3703,77 +3887,127 @@
         }
     .end annotation
 
-    sget-object p0, Ll0/f;->d:Ll0/f;
+    const-string v0, "$this$bindOptionalView"
 
-    new-instance v0, Ll0/h;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Ll0/a;
+    sget-object p0, Lm0/f;->d:Lm0/f;
 
-    invoke-direct {v1, p0, p1}, Ll0/a;-><init>(Lkotlin/jvm/functions/Function2;I)V
+    new-instance v0, Lm0/h;
 
-    invoke-direct {v0, v1}, Ll0/h;-><init>(Lkotlin/jvm/functions/Function2;)V
+    new-instance v1, Lm0/a;
+
+    invoke-direct {v1, p0, p1}, Lm0/a;-><init>(Lkotlin/jvm/functions/Function2;I)V
+
+    invoke-direct {v0, v1}, Lm0/h;-><init>(Lkotlin/jvm/functions/Function2;)V
 
     return-object v0
 .end method
 
-.method public static g0(Ljava/lang/Throwable;)V
-    .locals 1
+.method public static g0([F)Landroid/graphics/RectF;
+    .locals 6
 
-    instance-of v0, p0, Lrx/exceptions/OnErrorNotImplementedException;
+    new-instance v0, Landroid/graphics/RectF;
 
-    if-nez v0, :cond_5
+    const/high16 v1, 0x7f800000    # Float.POSITIVE_INFINITY
 
-    instance-of v0, p0, Lrx/exceptions/OnErrorFailedException;
+    const/high16 v2, -0x800000    # Float.NEGATIVE_INFINITY
 
-    if-nez v0, :cond_4
+    invoke-direct {v0, v1, v1, v2, v2}, Landroid/graphics/RectF;-><init>(FFFF)V
 
-    instance-of v0, p0, Lrx/exceptions/OnCompletedFailedException;
+    const/4 v1, 0x1
 
-    if-nez v0, :cond_3
+    :goto_0
+    array-length v2, p0
 
-    instance-of v0, p0, Ljava/lang/VirtualMachineError;
+    if-ge v1, v2, :cond_4
 
-    if-nez v0, :cond_2
+    add-int/lit8 v2, v1, -0x1
 
-    instance-of v0, p0, Ljava/lang/ThreadDeath;
+    aget v2, p0, v2
 
-    if-nez v0, :cond_1
+    const/high16 v3, 0x41200000    # 10.0f
 
-    instance-of v0, p0, Ljava/lang/LinkageError;
+    mul-float v2, v2, v3
 
-    if-nez v0, :cond_0
+    invoke-static {v2}, Ljava/lang/Math;->round(F)I
 
-    return-void
+    move-result v2
+
+    int-to-float v2, v2
+
+    div-float/2addr v2, v3
+
+    aget v4, p0, v1
+
+    mul-float v4, v4, v3
+
+    invoke-static {v4}, Ljava/lang/Math;->round(F)I
+
+    move-result v4
+
+    int-to-float v4, v4
+
+    div-float/2addr v4, v3
+
+    iget v3, v0, Landroid/graphics/RectF;->left:F
+
+    cmpg-float v5, v2, v3
+
+    if-gez v5, :cond_0
+
+    move v3, v2
 
     :cond_0
-    check-cast p0, Ljava/lang/LinkageError;
+    iput v3, v0, Landroid/graphics/RectF;->left:F
 
-    throw p0
+    iget v3, v0, Landroid/graphics/RectF;->top:F
+
+    cmpg-float v5, v4, v3
+
+    if-gez v5, :cond_1
+
+    move v3, v4
 
     :cond_1
-    check-cast p0, Ljava/lang/ThreadDeath;
+    iput v3, v0, Landroid/graphics/RectF;->top:F
 
-    throw p0
+    iget v3, v0, Landroid/graphics/RectF;->right:F
+
+    cmpl-float v5, v2, v3
+
+    if-lez v5, :cond_2
+
+    goto :goto_1
 
     :cond_2
-    check-cast p0, Ljava/lang/VirtualMachineError;
+    move v2, v3
 
-    throw p0
+    :goto_1
+    iput v2, v0, Landroid/graphics/RectF;->right:F
+
+    iget v2, v0, Landroid/graphics/RectF;->bottom:F
+
+    cmpl-float v3, v4, v2
+
+    if-lez v3, :cond_3
+
+    goto :goto_2
 
     :cond_3
-    check-cast p0, Lrx/exceptions/OnCompletedFailedException;
+    move v4, v2
 
-    throw p0
+    :goto_2
+    iput v4, v0, Landroid/graphics/RectF;->bottom:F
+
+    add-int/lit8 v1, v1, 0x2
+
+    goto :goto_0
 
     :cond_4
-    check-cast p0, Lrx/exceptions/OnErrorFailedException;
+    invoke-virtual {v0}, Landroid/graphics/RectF;->sort()V
 
-    throw p0
-
-    :cond_5
-    check-cast p0, Lrx/exceptions/OnErrorNotImplementedException;
-
-    throw p0
+    return-object v0
 .end method
 
 .method public static final getIndices(Ljava/util/Collection;)Lkotlin/ranges/IntRange;
@@ -3787,11 +4021,11 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$indices"
 
-    const/4 v0, 0x0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lkotlin/ranges/IntRange;
+    new-instance v0, Lkotlin/ranges/IntRange;
 
     invoke-interface {p0}, Ljava/util/Collection;->size()I
 
@@ -3799,39 +4033,34 @@
 
     add-int/lit8 p0, p0, -0x1
 
-    invoke-direct {v1, v0, p0}, Lkotlin/ranges/IntRange;-><init>(II)V
+    const/4 v1, 0x0
 
-    return-object v1
+    invoke-direct {v0, v1, p0}, Lkotlin/ranges/IntRange;-><init>(II)V
 
-    :cond_0
-    const-string p0, "$this$indices"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
+    return-object v0
 .end method
 
-.method public static final getJavaClass(Lj0/r/b;)Ljava/lang/Class;
+.method public static final getJavaClass(Lk0/s/b;)Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
             "Ljava/lang/Object;",
             ">(",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "TT;>;)",
             "Ljava/lang/Class<",
             "TT;>;"
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$java"
 
-    check-cast p0, Lj0/n/c/c;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p0}, Lj0/n/c/c;->getJClass()Ljava/lang/Class;
+    check-cast p0, Lk0/o/c/c;
+
+    invoke-interface {p0}, Lk0/o/c/c;->getJClass()Ljava/lang/Class;
 
     move-result-object p0
 
@@ -3840,43 +4069,36 @@
     return-object p0
 
     :cond_0
-    new-instance p0, Lkotlin/TypeCastException;
+    new-instance p0, Ljava/lang/NullPointerException;
 
     const-string v0, "null cannot be cast to non-null type java.lang.Class<T>"
 
-    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    const-string p0, "$this$java"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
+    invoke-direct {p0, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
 
     throw p0
 .end method
 
-.method public static final getJavaObjectType(Lj0/r/b;)Ljava/lang/Class;
+.method public static final getJavaObjectType(Lk0/s/b;)Ljava/lang/Class;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
             "Ljava/lang/Object;",
             ">(",
-            "Lj0/r/b<",
+            "Lk0/s/b<",
             "TT;>;)",
             "Ljava/lang/Class<",
             "TT;>;"
         }
     .end annotation
 
-    if-eqz p0, :cond_2
+    const-string v0, "$this$javaObjectType"
 
-    check-cast p0, Lj0/n/c/c;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p0}, Lj0/n/c/c;->getJClass()Ljava/lang/Class;
+    check-cast p0, Lk0/o/c/c;
+
+    invoke-interface {p0}, Lk0/o/c/c;->getJClass()Ljava/lang/Class;
 
     move-result-object p0
 
@@ -4020,15 +4242,6 @@
     :goto_0
     return-object p0
 
-    :cond_2
-    const-string p0, "$this$javaObjectType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-
     nop
 
     :sswitch_data_0
@@ -4046,7 +4259,7 @@
 .end method
 
 .method public static final getLastIndex(Ljava/util/List;)I
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -4057,7 +4270,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$lastIndex"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Ljava/util/List;->size()I
 
@@ -4066,19 +4281,10 @@
     add-int/lit8 p0, p0, -0x1
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$lastIndex"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final getLastIndex([Ljava/lang/Object;)I
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -4087,26 +4293,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$lastIndex"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length p0, p0
 
     add-int/lit8 p0, p0, -0x1
 
     return p0
-
-    :cond_0
-    const-string p0, "$this$lastIndex"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<V:",
@@ -4120,68 +4319,63 @@
         }
     .end annotation
 
-    sget-object p0, Ll0/d;->d:Ll0/d;
+    const-string v0, "$this$bindView"
 
-    invoke-static {p1, p0}, Lf/n/a/k/a;->T(ILkotlin/jvm/functions/Function2;)Ll0/h;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p0, Lm0/d;->d:Lm0/d;
+
+    invoke-static {p1, p0}, Lf/n/a/k/a;->Q(ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-    .locals 0
+.method public static final h0(Ll0/a/a;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Ljava/lang/Throwable;",
-            "Lr0/g<",
+            "Ll0/a/a<",
             "*>;",
-            "Ljava/lang/Object;",
-            ")V"
+            "Ljava/lang/Throwable;",
+            ")",
+            "Ljava/lang/Throwable;"
         }
     .end annotation
 
-    invoke-static {p0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
+    const-string v0, "$this$tryRecover"
 
-    invoke-static {p0, p2}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ll0/a/r1/t;
+
+    if-nez v0, :cond_0
+
+    const/4 p0, 0x0
+
+    :cond_0
+    check-cast p0, Ll0/a/r1/t;
+
+    if-eqz p0, :cond_1
+
+    iget-object p0, p0, Ll0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
+
+    if-eqz p0, :cond_1
+
+    invoke-static {p1, p0}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
     move-result-object p0
 
-    invoke-interface {p1, p0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    return-object p0
 
-    return-void
-.end method
-
-.method public static final varargs hashMapOf([Lkotlin/Pair;)Ljava/util/HashMap;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            ">([",
-            "Lkotlin/Pair<",
-            "+TK;+TV;>;)",
-            "Ljava/util/HashMap<",
-            "TK;TV;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/HashMap;
-
-    array-length v1, p0
-
-    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(I)V
-
-    invoke-static {v0, p0}, Lf/n/a/k/a;->putAll(Ljava/util/Map;[Lkotlin/Pair;)V
-
-    return-object v0
+    :cond_1
+    return-object p1
 .end method
 
 .method public static final varargs hashSetOf([Ljava/lang/Object;)Ljava/util/HashSet;
@@ -4196,6 +4390,10 @@
         }
     .end annotation
 
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Ljava/util/HashSet;
 
     array-length v1, p0
@@ -4212,7 +4410,7 @@
 .end method
 
 .method public static final i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<V:",
@@ -4226,347 +4424,50 @@
         }
     .end annotation
 
-    sget-object p0, Ll0/e;->d:Ll0/e;
+    const-string v0, "$this$bindView"
 
-    invoke-static {p1, p0}, Lf/n/a/k/a;->T(ILkotlin/jvm/functions/Function2;)Ll0/h;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p0, Lm0/e;->d:Lm0/e;
+
+    invoke-static {p1, p0}, Lf/n/a/k/a;->Q(ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final i0(Ljava/lang/String;)Ljava/lang/String;
-    .locals 9
+.method public static i0(J)Z
+    .locals 3
 
-    const/4 v0, 0x0
+    const-wide/16 v0, 0x0
 
-    if-eqz p0, :cond_13
+    cmp-long v2, p0, v0
 
-    const-string v1, ":"
+    if-ltz v2, :cond_1
 
-    const/4 v2, 0x0
+    if-eqz v2, :cond_0
 
-    const/4 v3, 0x2
-
-    invoke-static {p0, v1, v2, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
-
-    move-result v1
-
-    const/4 v4, -0x1
-
-    const/4 v5, 0x1
-
-    if-eqz v1, :cond_b
-
-    const-string v1, "["
-
-    invoke-static {p0, v1, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    const-string v1, "]"
-
-    invoke-static {p0, v1, v2, v3}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    sub-int/2addr v1, v5
-
-    invoke-static {p0, v5, v1}, Lf/n/a/k/a;->u(Ljava/lang/String;II)Ljava/net/InetAddress;
-
-    move-result-object v1
+    const/4 p0, 0x1
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    invoke-static {p0, v2, v1}, Lf/n/a/k/a;->u(Ljava/lang/String;II)Ljava/net/InetAddress;
-
-    move-result-object v1
-
-    :goto_0
-    if-eqz v1, :cond_a
-
-    invoke-virtual {v1}, Ljava/net/InetAddress;->getAddress()[B
-
-    move-result-object v0
-
-    array-length v3, v0
-
-    const/4 v5, 0x4
-
-    const/16 v6, 0x10
-
-    if-ne v3, v6, :cond_8
-
-    const-string p0, "address"
-
-    invoke-static {v0, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     const/4 p0, 0x0
 
-    const/4 v1, 0x0
-
-    :goto_1
-    array-length v3, v0
-
-    if-ge p0, v3, :cond_3
-
-    move v3, p0
-
-    :goto_2
-    if-ge v3, v6, :cond_1
-
-    aget-byte v7, v0, v3
-
-    if-nez v7, :cond_1
-
-    add-int/lit8 v7, v3, 0x1
-
-    aget-byte v7, v0, v7
-
-    if-nez v7, :cond_1
-
-    add-int/lit8 v3, v3, 0x2
-
-    goto :goto_2
+    :goto_0
+    return p0
 
     :cond_1
-    sub-int v7, v3, p0
+    new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    if-le v7, v1, :cond_2
+    const-string v1, "n >= 0 required but it was "
 
-    if-lt v7, v5, :cond_2
-
-    move v4, p0
-
-    move v1, v7
-
-    :cond_2
-    add-int/lit8 p0, v3, 0x2
-
-    goto :goto_1
-
-    :cond_3
-    new-instance p0, Lo0/e;
-
-    invoke-direct {p0}, Lo0/e;-><init>()V
-
-    :cond_4
-    :goto_3
-    array-length v3, v0
-
-    if-ge v2, v3, :cond_7
-
-    const/16 v3, 0x3a
-
-    if-ne v2, v4, :cond_5
-
-    invoke-virtual {p0, v3}, Lo0/e;->I(I)Lo0/e;
-
-    add-int/2addr v2, v1
-
-    if-ne v2, v6, :cond_4
-
-    invoke-virtual {p0, v3}, Lo0/e;->I(I)Lo0/e;
-
-    goto :goto_3
-
-    :cond_5
-    if-lez v2, :cond_6
-
-    invoke-virtual {p0, v3}, Lo0/e;->I(I)Lo0/e;
-
-    :cond_6
-    aget-byte v3, v0, v2
-
-    const/16 v5, 0xff
-
-    invoke-static {v3, v5}, Ln0/g0/b;->a(BI)I
-
-    move-result v3
-
-    shl-int/lit8 v3, v3, 0x8
-
-    add-int/lit8 v7, v2, 0x1
-
-    aget-byte v7, v0, v7
-
-    and-int/2addr v5, v7
-
-    or-int/2addr v3, v5
-
-    int-to-long v7, v3
-
-    invoke-virtual {p0, v7, v8}, Lo0/e;->L(J)Lo0/e;
-
-    add-int/lit8 v2, v2, 0x2
-
-    goto :goto_3
-
-    :cond_7
-    invoke-virtual {p0}, Lo0/e;->v()Ljava/lang/String;
+    invoke-static {v1, p0, p1}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
 
     move-result-object p0
 
-    return-object p0
-
-    :cond_8
-    array-length v0, v0
-
-    if-ne v0, v5, :cond_9
-
-    invoke-virtual {v1}, Ljava/net/InetAddress;->getHostAddress()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_9
-    new-instance v0, Ljava/lang/AssertionError;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Invalid IPv6 address: \'"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 p0, 0x27
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_a
-    return-object v0
-
-    :cond_b
-    :try_start_0
-    invoke-static {p0}, Ljava/net/IDN;->toASCII(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v1, "IDN.toASCII(host)"
-
-    invoke-static {p0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const-string v3, "Locale.US"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v1, "(this as java.lang.String).toLowerCase(locale)"
-
-    invoke-static {p0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    if-nez v1, :cond_c
-
-    const/4 v1, 0x1
-
-    goto :goto_4
-
-    :cond_c
-    const/4 v1, 0x0
-
-    :goto_4
-    if-eqz v1, :cond_d
-
-    return-object v0
-
-    :cond_d
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    const/4 v3, 0x0
-
-    :goto_5
-    if-ge v3, v1, :cond_11
-
-    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v6
-
-    const/16 v7, 0x1f
-
-    if-le v6, v7, :cond_10
-
-    const/16 v7, 0x7f
-
-    if-lt v6, v7, :cond_e
-
-    goto :goto_6
-
-    :cond_e
-    const/4 v7, 0x6
-
-    const-string v8, " #%/:?@[\\]"
-
-    invoke-static {v8, v6, v2, v2, v7}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v6
-    :try_end_0
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eq v6, v4, :cond_f
-
-    goto :goto_6
-
-    :cond_f
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_5
-
-    :cond_10
-    :goto_6
-    const/4 v2, 0x1
-
-    :cond_11
-    if-eqz v2, :cond_12
-
-    goto :goto_7
-
-    :cond_12
-    move-object v0, p0
-
-    :catch_0
-    :goto_7
-    return-object v0
-
-    :cond_13
-    const-string p0, "$this$toCanonicalHost"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
@@ -4581,7 +4482,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_4
+    const-string v0, "$this$indexOf"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -4611,7 +4514,7 @@
 
     aget-object v2, p0, v0
 
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v2
 
@@ -4628,19 +4531,10 @@
     const/4 p0, -0x1
 
     return p0
-
-    :cond_4
-    const-string p0, "$this$indexOf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -4653,25 +4547,27 @@
         }
     .end annotation
 
+    const-string v0, "$this$intercepted"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Lk0/l/h/a/c;
+
+    if-nez v0, :cond_0
+
     const/4 v0, 0x0
 
-    if-eqz p0, :cond_2
-
-    instance-of v1, p0, Lj0/k/h/a/c;
-
-    if-nez v1, :cond_0
-
     goto :goto_0
 
     :cond_0
     move-object v0, p0
 
     :goto_0
-    check-cast v0, Lj0/k/h/a/c;
+    check-cast v0, Lk0/l/h/a/c;
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lj0/k/h/a/c;->intercepted()Lkotlin/coroutines/Continuation;
+    invoke-virtual {v0}, Lk0/l/h/a/c;->intercepted()Lkotlin/coroutines/Continuation;
 
     move-result-object v0
 
@@ -4681,13 +4577,6 @@
 
     :cond_1
     return-object p0
-
-    :cond_2
-    const-string p0, "$this$intercepted"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final isWhitespace(C)Z
@@ -4732,26 +4621,19 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "array"
 
-    new-instance v0, Lj0/n/c/a;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p0}, Lj0/n/c/a;-><init>([Ljava/lang/Object;)V
+    new-instance v0, Lk0/o/c/a;
+
+    invoke-direct {v0, p0}, Lk0/o/c/a;-><init>([Ljava/lang/Object;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "array"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<V:",
@@ -4765,127 +4647,235 @@
         }
     .end annotation
 
-    sget-object p0, Ll0/f;->d:Ll0/f;
+    const-string v0, "$this$bindView"
 
-    invoke-static {p1, p0}, Lf/n/a/k/a;->T(ILkotlin/jvm/functions/Function2;)Ll0/h;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p0, Lm0/f;->d:Lm0/f;
+
+    invoke-static {p1, p0}, Lf/n/a/k/a;->Q(ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final j0(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
-    .locals 3
+.method public static final j0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(",
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/coroutines/CoroutineContext;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Lkotlinx/coroutines/CoroutineScope;",
+            "-",
             "Lkotlin/coroutines/Continuation<",
-            "*>;)",
-            "Ljava/lang/String;"
+            "-TT;>;+",
+            "Ljava/lang/Object;",
+            ">;",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;)",
+            "Ljava/lang/Object;"
         }
     .end annotation
 
-    if-eqz p0, :cond_2
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
 
-    instance-of v0, p0, Lk0/a/f0;
+    invoke-interface {p2}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
-    if-eqz v0, :cond_0
+    move-result-object v1
 
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-interface {v1, p0}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p0
+
+    const-string v2, "$this$checkCompletion"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {p0, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlinx/coroutines/Job;
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->a()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
+
+    move-result-object p0
+
+    throw p0
+
+    :cond_1
+    :goto_0
+    if-ne p0, v1, :cond_2
+
+    new-instance v1, Ll0/a/r1/t;
+
+    invoke-direct {v1, p0, p2}, Ll0/a/r1/t;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+
+    invoke-static {v1, v1, p1}, Lf/n/a/k/a;->W(Ll0/a/a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
     move-result-object p0
 
     goto :goto_2
 
-    :cond_0
-    const/16 v0, 0x40
+    :cond_2
+    sget-object v2, Lk0/l/d;->a:Lk0/l/d$a;
 
-    :try_start_0
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-interface {p0, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
 
     move-result-object v2
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    check-cast v2, Lk0/l/d;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    sget-object v3, Lk0/l/d;->a:Lk0/l/d$a;
+
+    invoke-interface {v1, v3}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
 
     move-result-object v1
+
+    check-cast v1, Lk0/l/d;
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    new-instance v1, Ll0/a/p1;
+
+    invoke-direct {v1, p0, p2}, Ll0/a/p1;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+
+    const/4 v2, 0x0
+
+    invoke-static {p0, v2}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    :try_start_0
+    invoke-static {v1, v1, p1}, Lf/n/a/k/a;->W(Ll0/a/a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    goto :goto_0
+    invoke-static {p0, v2}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    move-object p0, p1
+
+    goto :goto_2
 
     :catchall_0
-    move-exception v1
+    move-exception p1
 
-    invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+    invoke-static {p0, v2}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
 
-    move-result-object v1
+    throw p1
 
-    :goto_0
-    invoke-static {v1}, Lj0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+    :cond_3
+    new-instance v1, Ll0/a/g0;
 
-    move-result-object v2
+    invoke-direct {v1, p0, p2}, Ll0/a/g0;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
 
-    if-nez v2, :cond_1
+    invoke-virtual {v1}, Ll0/a/a;->Q()V
+
+    invoke-static {p1, v1, v1}, Lf/n/a/k/a;->V(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+
+    :cond_4
+    iget p0, v1, Ll0/a/g0;->_decision:I
+
+    const/4 p1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz p0, :cond_6
+
+    const/4 v2, 0x2
+
+    if-ne p0, v2, :cond_5
 
     goto :goto_1
 
-    :cond_1
-    new-instance v1, Ljava/lang/StringBuilder;
+    :cond_5
+    new-instance p0, Ljava/lang/IllegalStateException;
 
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+    const-string p1, "Already suspended"
 
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object p1
 
-    invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
+    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
-    move-result-object v2
+    throw p0
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    :cond_6
+    sget-object p0, Ll0/a/g0;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {p0, v1, p1, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
 
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
+    move-result p0
+
+    if-eqz p0, :cond_4
+
+    const/4 p1, 0x1
+
+    :goto_1
+    if-eqz p1, :cond_7
+
+    move-object p0, v0
+
+    goto :goto_2
+
+    :cond_7
+    invoke-virtual {v1}, Ll0/a/c1;->x()Ljava/lang/Object;
 
     move-result-object p0
 
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {p0}, Ll0/a/d1;->b(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    move-result-object p0
 
-    move-result-object v1
+    instance-of p1, p0, Ll0/a/p;
 
-    :goto_1
-    move-object p0, v1
-
-    check-cast p0, Ljava/lang/String;
+    if-nez p1, :cond_9
 
     :goto_2
+    if-ne p0, v0, :cond_8
+
+    const-string p1, "frame"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_8
     return-object p0
 
-    :cond_2
-    const-string p0, "$this$toDebugString"
+    :cond_9
+    check-cast p0, Ll0/a/p;
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
+    iget-object p0, p0, Ll0/a/p;->a:Ljava/lang/Throwable;
 
     throw p0
 .end method
 
 .method public static joinToString$default(Lkotlin/sequences/Sequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-    .locals 2
+    .locals 5
 
     and-int/lit8 p2, p7, 0x1
 
@@ -4941,46 +4931,72 @@
     :goto_2
     and-int/lit8 p7, p7, 0x20
 
-    if-eqz p0, :cond_d
+    const-string p7, "$this$joinToString"
 
-    if-eqz p1, :cond_c
+    invoke-static {p0, p7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_b
+    const-string p7, "separator"
 
-    if-eqz p3, :cond_a
+    invoke-static {p1, p7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_9
+    const-string v0, "prefix"
 
-    new-instance p7, Ljava/lang/StringBuilder;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p7}, Ljava/lang/StringBuilder;-><init>()V
+    const-string v1, "postfix"
 
-    invoke-virtual {p7, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p2, 0x0
+    const-string v2, "truncated"
+
+    invoke-static {p6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "$this$joinTo"
+
+    invoke-static {p0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "buffer"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
     invoke-interface {p0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
 
     move-result-object p0
 
+    const/4 p2, 0x0
+
     :goto_3
     invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v0
+    move-result p7
 
-    if-eqz v0, :cond_7
+    if-eqz p7, :cond_7
 
     invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p7
 
     add-int/lit8 p2, p2, 0x1
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
-    if-le p2, v1, :cond_5
+    if-le p2, v0, :cond_5
 
-    invoke-virtual {p7, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
     :cond_5
     if-ltz p4, :cond_6
@@ -4988,7 +5004,7 @@
     if-gt p2, p4, :cond_7
 
     :cond_6
-    invoke-static {p7, v0, p5}, Lj0/t/f;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
+    invoke-static {v3, p7, p5}, Lk0/u/f;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
 
     goto :goto_3
 
@@ -4997,59 +5013,24 @@
 
     if-le p2, p4, :cond_8
 
-    invoke-virtual {p7, p6}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-virtual {v3, p6}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
     :cond_8
-    invoke-virtual {p7, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-virtual {v3, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
-    invoke-virtual {p7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p0
 
     const-string p1, "joinTo(StringBuilder(), \u2026ed, transform).toString()"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_9
-    const-string p0, "truncated"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_a
-    const-string p0, "postfix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_b
-    const-string p0, "prefix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_c
-    const-string p0, "separator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_d
-    const-string p0, "$this$joinToString"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
 .end method
 
 .method public static joinToString$default([Ljava/lang/Object;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-    .locals 4
+    .locals 5
 
     and-int/lit8 p2, p7, 0x1
 
@@ -5105,93 +5086,102 @@
     :goto_2
     and-int/lit8 p7, p7, 0x20
 
-    if-eqz p2, :cond_b
+    const-string p7, "$this$joinToString"
 
-    if-eqz p3, :cond_a
+    invoke-static {p0, p7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p6, :cond_9
+    const-string p7, "separator"
 
-    new-instance p7, Ljava/lang/StringBuilder;
+    invoke-static {p1, p7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p7}, Ljava/lang/StringBuilder;-><init>()V
+    const-string v0, "prefix"
 
-    invoke-virtual {p7, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "postfix"
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "truncated"
+
+    invoke-static {p6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "$this$joinTo"
+
+    invoke-static {p0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "buffer"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p7}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p6, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
     array-length p2, p0
 
+    const/4 p7, 0x0
+
     const/4 v0, 0x0
 
-    const/4 v1, 0x0
-
     :goto_3
-    if-ge v0, p2, :cond_7
+    if-ge p7, p2, :cond_7
 
-    aget-object v2, p0, v0
+    aget-object v1, p0, p7
 
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v0, v0, 0x1
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    if-le v1, v3, :cond_5
+    if-le v0, v2, :cond_5
 
-    invoke-virtual {p7, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
     :cond_5
     if-ltz p4, :cond_6
 
-    if-gt v1, p4, :cond_7
+    if-gt v0, p4, :cond_7
 
     :cond_6
-    invoke-static {p7, v2, p5}, Lj0/t/f;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
+    invoke-static {v3, v1, p5}, Lk0/u/f;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
 
-    add-int/lit8 v0, v0, 0x1
+    add-int/lit8 p7, p7, 0x1
 
     goto :goto_3
 
     :cond_7
     if-ltz p4, :cond_8
 
-    if-le v1, p4, :cond_8
+    if-le v0, p4, :cond_8
 
-    invoke-virtual {p7, p6}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-virtual {v3, p6}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
     :cond_8
-    invoke-virtual {p7, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+    invoke-virtual {v3, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
 
-    invoke-virtual {p7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p0
 
     const-string p1, "joinTo(StringBuilder(), \u2026ed, transform).toString()"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_9
-    const-string p0, "truncated"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_a
-    const-string p0, "postfix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
-
-    :cond_b
-    const-string p0, "prefix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p5
 .end method
 
 .method public static final k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<V:",
@@ -5205,197 +5195,52 @@
         }
     .end annotation
 
-    sget-object p0, Ll0/g;->d:Ll0/g;
+    const-string v0, "$this$bindView"
 
-    invoke-static {p1, p0}, Lf/n/a/k/a;->T(ILkotlin/jvm/functions/Function2;)Ll0/h;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p0, Lm0/g;->d:Lm0/g;
+
+    invoke-static {p1, p0}, Lf/n/a/k/a;->Q(ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static final k0(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Object;",
-            ")",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    instance-of v0, p0, Lj0/d$a;
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lk0/a/p;
-
-    invoke-static {p0}, Lj0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-direct {v0, p0, v1, v2}, Lk0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
-
-    move-object p0, v0
-
-    :goto_0
-    return-object p0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final varargs l(Landroid/view/View;[I)Lkotlin/properties/ReadOnlyProperty;
-    .locals 0
+.method public static final varargs l(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<V:",
             "Landroid/view/View;",
             ">(",
-            "Landroid/view/View;",
+            "Landroidx/fragment/app/Fragment;",
             "[I)",
             "Lkotlin/properties/ReadOnlyProperty<",
-            "Landroid/view/View;",
+            "Landroidx/fragment/app/Fragment;",
             "Ljava/util/List<",
             "TV;>;>;"
         }
     .end annotation
 
-    sget-object p0, Ll0/d;->d:Ll0/d;
+    const-string v0, "$this$bindViews"
 
-    invoke-static {p1, p0}, Lf/n/a/k/a;->U([ILkotlin/jvm/functions/Function2;)Ll0/h;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "ids"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p0, Lm0/f;->d:Lm0/f;
+
+    invoke-static {p1, p0}, Lf/n/a/k/a;->R([ILkotlin/jvm/functions/Function2;)Lm0/h;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static l0([F)Landroid/graphics/RectF;
-    .locals 6
-
-    new-instance v0, Landroid/graphics/RectF;
-
-    const/high16 v1, 0x7f800000    # Float.POSITIVE_INFINITY
-
-    const/high16 v2, -0x800000    # Float.NEGATIVE_INFINITY
-
-    invoke-direct {v0, v1, v1, v2, v2}, Landroid/graphics/RectF;-><init>(FFFF)V
-
-    const/4 v1, 0x1
-
-    :goto_0
-    array-length v2, p0
-
-    if-ge v1, v2, :cond_4
-
-    add-int/lit8 v2, v1, -0x1
-
-    aget v2, p0, v2
-
-    const/high16 v3, 0x41200000    # 10.0f
-
-    mul-float v2, v2, v3
-
-    invoke-static {v2}, Ljava/lang/Math;->round(F)I
-
-    move-result v2
-
-    int-to-float v2, v2
-
-    div-float/2addr v2, v3
-
-    aget v4, p0, v1
-
-    mul-float v4, v4, v3
-
-    invoke-static {v4}, Ljava/lang/Math;->round(F)I
-
-    move-result v4
-
-    int-to-float v4, v4
-
-    div-float/2addr v4, v3
-
-    iget v3, v0, Landroid/graphics/RectF;->left:F
-
-    cmpg-float v5, v2, v3
-
-    if-gez v5, :cond_0
-
-    move v3, v2
-
-    :cond_0
-    iput v3, v0, Landroid/graphics/RectF;->left:F
-
-    iget v3, v0, Landroid/graphics/RectF;->top:F
-
-    cmpg-float v5, v4, v3
-
-    if-gez v5, :cond_1
-
-    move v3, v4
-
-    :cond_1
-    iput v3, v0, Landroid/graphics/RectF;->top:F
-
-    iget v3, v0, Landroid/graphics/RectF;->right:F
-
-    cmpl-float v5, v2, v3
-
-    if-lez v5, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    move v2, v3
-
-    :goto_1
-    iput v2, v0, Landroid/graphics/RectF;->right:F
-
-    iget v2, v0, Landroid/graphics/RectF;->bottom:F
-
-    cmpl-float v3, v4, v2
-
-    if-lez v3, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    move v4, v2
-
-    :goto_2
-    iput v4, v0, Landroid/graphics/RectF;->bottom:F
-
-    add-int/lit8 v1, v1, 0x2
-
-    goto :goto_0
-
-    :cond_4
-    invoke-virtual {v0}, Landroid/graphics/RectF;->sort()V
-
-    return-object v0
-.end method
-
 .method public static final lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
@@ -5410,24 +5255,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "initializer"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lj0/e;
+    new-instance v0, Lk0/e;
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    invoke-direct {v1, p0, v0, v2}, Lj0/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/lang/Object;I)V
+    invoke-direct {v0, p0, v1, v2}, Lk0/e;-><init>(Lkotlin/jvm/functions/Function0;Ljava/lang/Object;I)V
 
-    return-object v1
-
-    :cond_0
-    const-string p0, "initializer"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
 
 .method public static final listOf(Ljava/lang/Object;)Ljava/util/List;
@@ -5448,7 +5288,7 @@
 
     const-string v0, "java.util.Collections.singletonList(element)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
 .end method
@@ -5465,7 +5305,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p0
 
@@ -5478,23 +5320,14 @@
     goto :goto_0
 
     :cond_0
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final varargs listOfNotNull([Ljava/lang/Object;)Ljava/util/List;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -5505,6 +5338,10 @@
         }
     .end annotation
 
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {p0}, Lf/n/a/k/a;->filterNotNull([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object p0
@@ -5512,78 +5349,18 @@
     return-object p0
 .end method
 
-.method public static final varargs m(Landroidx/fragment/app/DialogFragment;[I)Lkotlin/properties/ReadOnlyProperty;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<V:",
-            "Landroid/view/View;",
-            ">(",
-            "Landroidx/fragment/app/DialogFragment;",
-            "[I)",
-            "Lkotlin/properties/ReadOnlyProperty<",
-            "Landroidx/fragment/app/DialogFragment;",
-            "Ljava/util/List<",
-            "TV;>;>;"
-        }
-    .end annotation
+.method public static final m(Lp0/u;)Lokio/BufferedSink;
+    .locals 1
 
-    sget-object p0, Ll0/e;->d:Ll0/e;
+    const-string v0, "$receiver"
 
-    invoke-static {p1, p0}, Lf/n/a/k/a;->U([ILkotlin/jvm/functions/Function2;)Ll0/h;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object p0
+    new-instance v0, Lp0/p;
 
-    return-object p0
-.end method
+    invoke-direct {v0, p0}, Lp0/p;-><init>(Lp0/u;)V
 
-.method public static final m0(Lk0/a/a;Ljava/lang/Throwable;)Ljava/lang/Throwable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/a<",
-            "*>;",
-            "Ljava/lang/Throwable;",
-            ")",
-            "Ljava/lang/Throwable;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    instance-of v1, p0, Lk0/a/r1/t;
-
-    if-nez v1, :cond_0
-
-    move-object p0, v0
-
-    :cond_0
-    check-cast p0, Lk0/a/r1/t;
-
-    if-eqz p0, :cond_1
-
-    iget-object p0, p0, Lk0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
-
-    if-eqz p0, :cond_1
-
-    invoke-static {p1, p0}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    return-object p1
-
-    :cond_2
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v0
 .end method
 
 .method public static final map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
@@ -5604,31 +5381,19 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$map"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "transform"
 
-    new-instance v0, Lj0/s/u;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p0, p1}, Lj0/s/u;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
+    new-instance v0, Lk0/t/u;
+
+    invoke-direct {v0, p0, p1}, Lk0/t/u;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "transform"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$map"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final mapCapacity(I)I
@@ -5691,26 +5456,23 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$mapNotNull"
 
-    new-instance v0, Lj0/s/u;
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v0, p0, p1}, Lj0/s/u;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
+    const-string v0, "transform"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/t/u;
+
+    invoke-direct {v0, p0, p1}, Lk0/t/u;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
 
     invoke-static {v0}, Lf/n/a/k/a;->filterNotNull(Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$mapNotNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final mapOf(Lkotlin/Pair;)Ljava/util/Map;
@@ -5729,7 +5491,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "pair"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lkotlin/Pair;->first:Ljava/lang/Object;
 
@@ -5741,18 +5505,9 @@
 
     const-string v0, "java.util.Collections.si\u2026(pair.first, pair.second)"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
-
-    :cond_0
-    const-string p0, "pair"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final varargs mapOf([Lkotlin/Pair;)Ljava/util/Map;
@@ -5771,6 +5526,10 @@
         }
     .end annotation
 
+    const-string v0, "pairs"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length v0, p0
 
     if-lez v0, :cond_0
@@ -5785,12 +5544,20 @@
 
     invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(I)V
 
+    const-string v1, "$this$toMap"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "destination"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {v0, p0}, Lf/n/a/k/a;->putAll(Ljava/util/Map;[Lkotlin/Pair;)V
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     return-object v0
@@ -5814,31 +5581,39 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$minus"
 
-    if-eqz p0, :cond_2
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    const-string v0, "keys"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {p0}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p0
 
-    move-object v1, p0
+    move-object v0, p0
 
-    check-cast v1, Ljava/util/LinkedHashMap;
+    check-cast v0, Ljava/util/LinkedHashMap;
 
-    invoke-virtual {v1}, Ljava/util/LinkedHashMap;->keySet()Ljava/util/Set;
+    invoke-virtual {v0}, Ljava/util/LinkedHashMap;->keySet()Ljava/util/Set;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_0
+    const-string v1, "$this$removeAll"
 
-    invoke-static {p1, v1}, Lf/n/a/k/a;->convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "elements"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lf/n/a/k/a;->convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
 
     move-result-object p1
 
-    invoke-static {v1}, Lj0/n/c/u;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
+    invoke-static {v0}, Lk0/o/c/v;->asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
 
     move-result-object v0
 
@@ -5849,27 +5624,6 @@
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "$this$removeAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "keys"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$minus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final varargs mutableListOf([Ljava/lang/Object;)Ljava/util/List;
@@ -5884,7 +5638,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p0
 
@@ -5899,11 +5655,11 @@
     :cond_0
     new-instance v0, Ljava/util/ArrayList;
 
-    new-instance v1, Lj0/i/d;
+    new-instance v1, Lk0/j/d;
 
     const/4 v2, 0x1
 
-    invoke-direct {v1, p0, v2}, Lj0/i/d;-><init>([Ljava/lang/Object;Z)V
+    invoke-direct {v1, p0, v2}, Lk0/j/d;-><init>([Ljava/lang/Object;Z)V
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -5911,15 +5667,6 @@
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final varargs mutableMapOf([Lkotlin/Pair;)Ljava/util/Map;
@@ -5938,6 +5685,10 @@
         }
     .end annotation
 
+    const-string v0, "pairs"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Ljava/util/LinkedHashMap;
 
     array-length v1, p0
@@ -5953,320 +5704,43 @@
     return-object v0
 .end method
 
-.method public static final varargs mutableSetOf([Ljava/lang/Object;)Ljava/util/Set;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/Set<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    array-length v1, p0
-
-    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/LinkedHashSet;-><init>(I)V
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
-
-    return-object v0
-.end method
-
-.method public static final varargs n(Landroidx/fragment/app/Fragment;[I)Lkotlin/properties/ReadOnlyProperty;
+.method public static n(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
     .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<V:",
-            "Landroid/view/View;",
-            ">(",
-            "Landroidx/fragment/app/Fragment;",
-            "[I)",
-            "Lkotlin/properties/ReadOnlyProperty<",
-            "Landroidx/fragment/app/Fragment;",
-            "Ljava/util/List<",
-            "TV;>;>;"
-        }
-    .end annotation
 
-    sget-object p0, Ll0/f;->d:Ll0/f;
-
-    invoke-static {p1, p0}, Lf/n/a/k/a;->U([ILkotlin/jvm/functions/Function2;)Ll0/h;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static n0(J)Z
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p0, v0
-
-    if-ltz v2, :cond_1
-
-    if-eqz v2, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "n >= 0 required but it was "
-
-    invoke-static {v1, p0, p1}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final o(Lo0/u;)Lokio/BufferedSink;
-    .locals 1
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Lo0/p;
-
-    invoke-direct {v0, p0}, Lo0/p;-><init>(Lo0/u;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$receiver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/coroutines/CoroutineContext;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Lkotlinx/coroutines/CoroutineScope;",
-            "-",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;+",
-            "Ljava/lang/Object;",
-            ">;",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;)",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
-
-    invoke-interface {p2}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v1
-
-    invoke-interface {v1, p0}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p0
-
-    const/4 v2, 0x0
-
-    if-eqz p0, :cond_9
-
-    sget-object v3, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {p0, v3}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v3
-
-    check-cast v3, Lkotlinx/coroutines/Job;
-
-    if-eqz v3, :cond_1
-
-    invoke-interface {v3}, Lkotlinx/coroutines/Job;->a()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {v3}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
-
-    move-result-object p0
-
-    throw p0
-
-    :cond_1
-    :goto_0
-    if-ne p0, v1, :cond_2
-
-    new-instance v0, Lk0/a/r1/t;
-
-    invoke-direct {v0, p0, p2}, Lk0/a/r1/t;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-
-    invoke-static {v0, v0, p1}, Lf/n/a/k/a;->a0(Lk0/a/a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_2
-    sget-object v3, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-interface {p0, v3}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v3
-
-    check-cast v3, Lj0/k/d;
-
-    sget-object v4, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-interface {v1, v4}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v1
-
-    check-cast v1, Lj0/k/d;
-
-    invoke-static {v3, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    new-instance v0, Lk0/a/p1;
-
-    invoke-direct {v0, p0, p2}, Lk0/a/p1;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-
-    invoke-static {p0, v2}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    :try_start_0
-    invoke-static {v0, v0, p1}, Lf/n/a/k/a;->a0(Lk0/a/a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-static {p0, p2}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p0, p2}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_3
-    new-instance v1, Lk0/a/g0;
-
-    invoke-direct {v1, p0, p2}, Lk0/a/g0;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-
-    invoke-virtual {v1}, Lk0/a/a;->Q()V
-
-    invoke-static {p1, v1, v1}, Lf/n/a/k/a;->Z(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
-
-    :cond_4
-    iget p0, v1, Lk0/a/g0;->_decision:I
+    and-int/lit8 p1, p2, 0x1
 
     const/4 p1, 0x0
 
-    const/4 p2, 0x1
+    const-string p2, "$this$cancel"
 
-    if-eqz p0, :cond_6
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p2, 0x2
+    sget-object p2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
 
-    if-ne p0, p2, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    const-string p1, "Already suspended"
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_6
-    sget-object p0, Lk0/a/g0;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {p0, v1, p1, p2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_4
-
-    const/4 p1, 0x1
-
-    :goto_1
-    if-eqz p1, :cond_7
-
-    goto :goto_2
-
-    :cond_7
-    invoke-virtual {v1}, Lk0/a/c1;->x()Ljava/lang/Object;
+    invoke-interface {p0, p2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
 
     move-result-object p0
 
-    invoke-static {p0}, Lk0/a/d1;->b(Ljava/lang/Object;)Ljava/lang/Object;
+    check-cast p0, Lkotlinx/coroutines/Job;
 
-    move-result-object v0
+    if-eqz p0, :cond_0
 
-    instance-of p0, v0, Lk0/a/p;
+    invoke-interface {p0, p1}, Lkotlinx/coroutines/Job;->p(Ljava/util/concurrent/CancellationException;)V
 
-    if-nez p0, :cond_8
+    :cond_0
+    return-void
+.end method
 
-    :goto_2
-    return-object v0
+.method public static synthetic o(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+    .locals 0
 
-    :cond_8
-    check-cast v0, Lk0/a/p;
+    and-int/lit8 p1, p2, 0x1
 
-    iget-object p0, v0, Lk0/a/p;->a:Ljava/lang/Throwable;
+    const/4 p1, 0x0
 
-    throw p0
+    invoke-interface {p0, p1}, Lkotlinx/coroutines/Job;->p(Ljava/util/concurrent/CancellationException;)V
 
-    :cond_9
-    const-string p0, "$this$checkCompletion"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
+    return-void
 .end method
 
 .method public static final optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
@@ -6283,6 +5757,10 @@
         }
     .end annotation
 
+    const-string v0, "$this$optimizeReadOnlyList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p0}, Ljava/util/List;->size()I
 
     move-result v0
@@ -6309,7 +5787,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_0
     return-object p0
@@ -6331,6 +5809,10 @@
         }
     .end annotation
 
+    const-string v0, "$this$optimizeReadOnlyMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p0}, Ljava/util/Map;->size()I
 
     move-result v0
@@ -6351,7 +5833,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object p0, Lj0/i/o;->d:Lj0/i/o;
+    sget-object p0, Lk0/j/o;->d:Lk0/j/o;
 
     :goto_0
     return-object p0
@@ -6371,6 +5853,10 @@
         }
     .end annotation
 
+    const-string v0, "$this$optimizeReadOnlySet"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p0}, Ljava/util/Set;->size()I
 
     move-result v0
@@ -6399,20 +5885,34 @@
     goto :goto_0
 
     :cond_1
-    sget-object p0, Lj0/i/p;->d:Lj0/i/p;
+    sget-object p0, Lk0/j/p;->d:Lk0/j/p;
 
     :goto_0
     return-object p0
 .end method
 
-.method public static final p(Lo0/w;)Lo0/g;
-    .locals 1
+.method public static p(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(TT;",
+            "Ljava/lang/String;",
+            ")TT;"
+        }
+    .end annotation
 
-    new-instance v0, Lo0/q;
+    if-eqz p0, :cond_0
 
-    invoke-direct {v0, p0}, Lo0/q;-><init>(Lo0/w;)V
+    return-object p0
 
-    return-object v0
+    :cond_0
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p0
 .end method
 
 .method public static final plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
@@ -6433,11 +5933,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_1
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_0
+    const-string v0, "map"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
@@ -6446,20 +5948,6 @@
     invoke-virtual {v0, p1}, Ljava/util/LinkedHashMap;->putAll(Ljava/util/Map;)V
 
     return-object v0
-
-    :cond_0
-    const-string p0, "map"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
@@ -6480,7 +5968,13 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_1
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "pair"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p0}, Ljava/util/Map;->isEmpty()Z
 
@@ -6509,15 +6003,6 @@
 
     :goto_0
     return-object p0
-
-    :cond_1
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
@@ -6536,15 +6021,21 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "$this$plus"
 
-    if-eqz p0, :cond_3
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_2
+    const-string v0, "elements"
 
-    instance-of v1, p1, Ljava/util/Collection;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v1, :cond_0
+    const-string v0, "$this$collectionSizeOrNull"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
 
     move-object v0, p1
 
@@ -6558,7 +6049,12 @@
 
     move-result-object v0
 
+    goto :goto_0
+
     :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
     if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
@@ -6571,7 +6067,7 @@
 
     add-int/2addr v1, v0
 
-    goto :goto_0
+    goto :goto_1
 
     :cond_1
     invoke-interface {p0}, Ljava/util/Set;->size()I
@@ -6580,7 +6076,7 @@
 
     mul-int/lit8 v1, v0, 0x2
 
-    :goto_0
+    :goto_1
     invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
 
     move-result v0
@@ -6594,20 +6090,6 @@
     invoke-static {v1, p1}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
 
     return-object v1
-
-    :cond_2
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
@@ -6624,7 +6106,9 @@
         }
     .end annotation
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/util/LinkedHashSet;
 
@@ -6645,37 +6129,6 @@
     invoke-virtual {v0, p1}, Ljava/util/LinkedHashSet;->add(Ljava/lang/Object;)Z
 
     return-object v0
-
-    :cond_0
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static plus(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    if-ne p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Lj0/k/e;->d:Lj0/k/e;
-
-    invoke-interface {p1, p0, v0}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Lkotlin/coroutines/CoroutineContext;
-
-    :goto_0
-    return-object p0
 .end method
 
 .method public static final plus(Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
@@ -6694,7 +6147,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x2
 
@@ -6712,22 +6171,17 @@
 
     move-result-object p0
 
-    sget-object p1, Lj0/s/k;->d:Lj0/s/k;
+    const-string p1, "$this$flatten"
 
-    invoke-static {p0, p1}, Lf/n/a/k/a;->w(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p1, Lk0/t/k;->d:Lk0/t/k;
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->t(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 
     move-result-object p0
 
     return-object p0
-
-    :cond_0
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
 .end method
 
 .method public static final putAll(Ljava/util/Map;[Lkotlin/Pair;)V
@@ -6746,6 +6200,14 @@
         }
     .end annotation
 
+    const-string v0, "$this$putAll"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "pairs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length v0, p1
 
     const/4 v1, 0x0
@@ -6769,583 +6231,7 @@
     return-void
 .end method
 
-.method public static q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
-    .locals 0
-
-    and-int/lit8 p1, p2, 0x1
-
-    const/4 p1, 0x0
-
-    if-eqz p0, :cond_1
-
-    sget-object p2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {p0, p2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p0
-
-    check-cast p0, Lkotlinx/coroutines/Job;
-
-    if-eqz p0, :cond_0
-
-    invoke-interface {p0, p1}, Lkotlinx/coroutines/Job;->p(Ljava/util/concurrent/CancellationException;)V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    const-string p0, "$this$cancel"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static synthetic r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
-    .locals 0
-
-    and-int/lit8 p1, p2, 0x1
-
-    const/4 p1, 0x0
-
-    invoke-interface {p0, p1}, Lkotlinx/coroutines/Job;->p(Ljava/util/concurrent/CancellationException;)V
-
-    return-void
-.end method
-
-.method public static final random([Ljava/lang/Object;Lj0/p/c;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;",
-            "Lj0/p/c;",
-            ")TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_2
-
-    array-length v0, p0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-nez v0, :cond_1
-
-    array-length v0, p0
-
-    invoke-virtual {p1, v0}, Lj0/p/c;->nextInt(I)I
-
-    move-result p1
-
-    aget-object p0, p0, p1
-
-    return-object p0
-
-    :cond_1
-    new-instance p0, Ljava/util/NoSuchElementException;
-
-    const-string p1, "Array is empty."
-
-    invoke-direct {p0, p1}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_2
-    const-string p0, "$this$random"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final removeAll(Ljava/util/List;Lkotlin/jvm/functions/Function1;)Z
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "TT;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;)Z"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_a
-
-    if-eqz p1, :cond_9
-
-    instance-of v1, p0, Ljava/util/RandomAccess;
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-nez v1, :cond_2
-
-    instance-of v1, p0, Lj0/n/c/v/a;
-
-    if-eqz v1, :cond_1
-
-    instance-of v1, p0, Lj0/n/c/v/b;
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, "kotlin.collections.MutableIterable"
-
-    invoke-static {p0, p1}, Lj0/n/c/u;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    invoke-static {p0, p1, v2}, Lf/n/a/k/a;->v(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
-
-    move-result v2
-
-    goto :goto_4
-
-    :cond_2
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v0
-
-    if-ltz v0, :cond_5
-
-    const/4 v1, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_1
-    invoke-interface {p0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    invoke-interface {p1, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/Boolean;
-
-    invoke-virtual {v6}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v6
-
-    if-ne v6, v2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    if-eq v4, v1, :cond_4
-
-    invoke-interface {p0, v4, v5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    :cond_4
-    add-int/lit8 v4, v4, 0x1
-
-    :goto_2
-    if-eq v1, v0, :cond_6
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    const/4 v4, 0x0
-
-    :cond_6
-    invoke-interface {p0}, Ljava/util/List;->size()I
-
-    move-result p1
-
-    if-ge v4, p1, :cond_7
-
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result p1
-
-    if-lt p1, v4, :cond_8
-
-    :goto_3
-    invoke-interface {p0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-
-    if-eq p1, v4, :cond_8
-
-    add-int/lit8 p1, p1, -0x1
-
-    goto :goto_3
-
-    :cond_7
-    const/4 v2, 0x0
-
-    :cond_8
-    :goto_4
-    return v2
-
-    :cond_9
-    const-string p0, "predicate"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p0, "$this$removeAll"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final roundToInt(F)I
-    .locals 1
-
-    invoke-static {p0}, Ljava/lang/Float;->isNaN(F)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-static {p0}, Ljava/lang/Math;->round(F)I
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Cannot round NaN value."
-
-    invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static s(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(TT;",
-            "Ljava/lang/String;",
-            ")TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Ljava/lang/NullPointerException;
-
-    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static final varargs sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    array-length v0, p0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    sget-object p0, Lj0/s/f;->a:Lj0/s/f;
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {p0}, Lf/n/a/k/a;->asSequence([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
-
-    move-result-object p0
-
-    :goto_1
-    return-object p0
-.end method
-
-.method public static final setOf(Ljava/lang/Object;)Ljava/util/Set;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(TT;)",
-            "Ljava/util/Set<",
-            "TT;>;"
-        }
-    .end annotation
-
-    invoke-static {p0}, Ljava/util/Collections;->singleton(Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object p0
-
-    const-string v0, "java.util.Collections.singleton(element)"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
-.method public static final varargs setOf([Ljava/lang/Object;)Ljava/util/Set;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/Set<",
-            "TT;>;"
-        }
-    .end annotation
-
-    array-length v0, p0
-
-    if-lez v0, :cond_0
-
-    invoke-static {p0}, Lf/n/a/k/a;->toSet([Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object p0, Lj0/i/p;->d:Lj0/i/p;
-
-    :goto_0
-    return-object p0
-.end method
-
-.method public static final single([C)C
-    .locals 2
-
-    array-length v0, p0
-
-    if-eqz v0, :cond_1
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x0
-
-    aget-char p0, p0, v0
-
-    return p0
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Array has more than one element."
-
-    invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    new-instance p0, Ljava/util/NoSuchElementException;
-
-    const-string v0, "Array is empty."
-
-    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static final sort(Ljava/util/List;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T::",
-            "Ljava/lang/Comparable<",
-            "-TT;>;>(",
-            "Ljava/util/List<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-le v0, v1, :cond_0
-
-    invoke-static {p0}, Ljava/util/Collections;->sort(Ljava/util/List;)V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    const-string p0, "$this$sort"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final sortWith(Ljava/util/List;Ljava/util/Comparator;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "TT;>;",
-            "Ljava/util/Comparator<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-le v0, v1, :cond_0
-
-    invoke-static {p0, p1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    const-string p0, "comparator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$sortWith"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final sortWith([Ljava/lang/Object;Ljava/util/Comparator;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;",
-            "Ljava/util/Comparator<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    array-length v0, p0
-
-    const/4 v1, 0x1
-
-    if-le v0, v1, :cond_0
-
-    invoke-static {p0, p1}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public static final sortedWith(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;",
-            "Ljava/util/Comparator<",
-            "-TT;>;)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Lj0/s/r;
-
-    invoke-direct {v0, p0, p1}, Lj0/s/r;-><init>(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "comparator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$sortedWith"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final t(JJJ)V
+.method public static final q(JJJ)V
     .locals 5
 
     or-long v0, p2, p4
@@ -7396,702 +6282,7 @@
     throw v0
 .end method
 
-.method public static final take(Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-ltz p1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_3
-
-    if-nez p1, :cond_1
-
-    sget-object p0, Lj0/s/f;->a:Lj0/s/f;
-
-    goto :goto_1
-
-    :cond_1
-    instance-of v0, p0, Lj0/s/e;
-
-    if-eqz v0, :cond_2
-
-    check-cast p0, Lj0/s/e;
-
-    invoke-interface {p0, p1}, Lj0/s/e;->take(I)Lkotlin/sequences/Sequence;
-
-    move-result-object p0
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v0, Lj0/s/t;
-
-    invoke-direct {v0, p0, p1}, Lj0/s/t;-><init>(Lkotlin/sequences/Sequence;I)V
-
-    move-object p0, v0
-
-    :goto_1
-    return-object p0
-
-    :cond_3
-    const-string p0, "Requested element count "
-
-    const-string v0, " is less than zero."
-
-    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final throwCountOverflow()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/ArithmeticException;
-
-    const-string v1, "Count overflow has happened."
-
-    invoke-direct {v0, v1}, Ljava/lang/ArithmeticException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final throwIndexOverflow()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/ArithmeticException;
-
-    const-string v1, "Index overflow has happened."
-
-    invoke-direct {v0, v1}, Ljava/lang/ArithmeticException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final throwOnFailure(Ljava/lang/Object;)V
-    .locals 1
-
-    instance-of v0, p0, Lj0/d$a;
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    check-cast p0, Lj0/d$a;
-
-    iget-object p0, p0, Lj0/d$a;->exception:Ljava/lang/Throwable;
-
-    throw p0
-.end method
-
-.method public static final toCollection(Lkotlin/sequences/Sequence;Ljava/util/Collection;)Ljava/util/Collection;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            "C::",
-            "Ljava/util/Collection<",
-            "-TT;>;>(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;TC;)TC;"
-        }
-    .end annotation
-
-    invoke-interface {p0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    return-object p1
-.end method
-
-.method public static final toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            "C::",
-            "Ljava/util/Collection<",
-            "-TT;>;>([TT;TC;)TC;"
-        }
-    .end annotation
-
-    array-length v0, p0
-
-    const/4 v1, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_0
-
-    aget-object v2, p0, v1
-
-    invoke-interface {p1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-object p1
-.end method
-
-.method public static final toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    invoke-static {p0}, Lf/n/a/k/a;->toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final toList([I)Ljava/util/List;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([I)",
-            "Ljava/util/List<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_3
-
-    array-length v0, p0
-
-    if-eqz v0, :cond_1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eq v0, v2, :cond_0
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    array-length v2, p0
-
-    invoke-direct {v0, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    array-length v2, p0
-
-    :goto_0
-    if-ge v1, v2, :cond_2
-
-    aget v3, p0, v1
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    aget p0, p0, v1
-
-    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    goto :goto_1
-
-    :cond_1
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
-
-    :cond_2
-    :goto_1
-    return-object v0
-
-    :cond_3
-    const-string p0, "$this$toList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toList([Ljava/lang/Object;)Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_2
-
-    array-length v0, p0
-
-    if-eqz v0, :cond_1
-
-    const/4 v1, 0x1
-
-    if-eq v0, v1, :cond_0
-
-    invoke-static {p0}, Lf/n/a/k/a;->toMutableList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    aget-object p0, p0, v0
-
-    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_1
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
-
-    :goto_0
-    return-object p0
-
-    :cond_2
-    const-string p0, "$this$toList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toMap(Ljava/lang/Iterable;)Ljava/util/Map;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+",
-            "Lkotlin/Pair<",
-            "+TK;+TV;>;>;)",
-            "Ljava/util/Map<",
-            "TK;TV;>;"
-        }
-    .end annotation
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    const/4 v2, 0x1
-
-    if-eq v1, v2, :cond_0
-
-    new-instance v1, Ljava/util/LinkedHashMap;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v0
-
-    invoke-direct {v1, v0}, Ljava/util/LinkedHashMap;-><init>(I)V
-
-    invoke-static {p0, v1}, Lf/n/a/k/a;->toMap(Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map;
-
-    goto :goto_0
-
-    :cond_0
-    check-cast p0, Ljava/util/List;
-
-    const/4 v0, 0x0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Lkotlin/Pair;
-
-    invoke-static {p0}, Lf/n/a/k/a;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v1, Lj0/i/o;->d:Lj0/i/o;
-
-    :goto_0
-    return-object v1
-.end method
-
-.method public static final toMap(Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            "M::",
-            "Ljava/util/Map<",
-            "-TK;-TV;>;>(",
-            "Ljava/lang/Iterable<",
-            "+",
-            "Lkotlin/Pair<",
-            "+TK;+TV;>;>;TM;)TM;"
-        }
-    .end annotation
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/Pair;
-
-    iget-object v1, v0, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    iget-object v0, v0, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_0
-    return-object p1
-.end method
-
-.method public static final toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->toCollection(Lkotlin/sequences/Sequence;Ljava/util/Collection;)Ljava/util/Collection;
-
-    check-cast v0, Ljava/util/List;
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$toMutableList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toMutableList([Ljava/lang/Object;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    new-instance v1, Lj0/i/d;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v1, p0, v2}, Lj0/i/d;-><init>([Ljava/lang/Object;Z)V
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    return-object v0
-.end method
-
-.method public static final toMutableMap(Ljava/util/Map;)Ljava/util/Map;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Map<",
-            "+TK;+TV;>;)",
-            "Ljava/util/Map<",
-            "TK;TV;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0, p0}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$toMutableMap"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toSet([Ljava/lang/Object;)Ljava/util/Set;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/Set<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_2
-
-    array-length v0, p0
-
-    if-eqz v0, :cond_1
-
-    const/4 v1, 0x1
-
-    if-eq v0, v1, :cond_0
-
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    array-length v1, p0
-
-    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/LinkedHashSet;-><init>(I)V
-
-    invoke-static {p0, v0}, Lf/n/a/k/a;->toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
-
-    check-cast v0, Ljava/util/Set;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    aget-object p0, p0, v0
-
-    invoke-static {p0}, Lf/n/a/k/a;->setOf(Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
-
-    :goto_0
-    return-object v0
-
-    :cond_2
-    const-string p0, "$this$toSet"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toSingletonMap(Ljava/util/Map;)Ljava/util/Map;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Map<",
-            "+TK;+TV;>;)",
-            "Ljava/util/Map<",
-            "TK;TV;>;"
-        }
-    .end annotation
-
-    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}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "with(entries.iterator().\u2026ingletonMap(key, value) }"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
-.method public static final toSortedMap(Ljava/util/Map;)Ljava/util/SortedMap;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K::",
-            "Ljava/lang/Comparable<",
-            "-TK;>;V:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Map<",
-            "+TK;+TV;>;)",
-            "Ljava/util/SortedMap<",
-            "TK;TV;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/TreeMap;
-
-    invoke-direct {v0, p0}, Ljava/util/TreeMap;-><init>(Ljava/util/Map;)V
-
-    return-object v0
-.end method
-
-.method public static final u(Ljava/lang/String;II)Ljava/net/InetAddress;
+.method public static final r(Ljava/lang/String;II)Ljava/net/InetAddress;
     .locals 16
 
     move-object/from16 v0, p0
@@ -8134,7 +6325,7 @@
 
     const-string v14, "::"
 
-    invoke-static {v0, v14, v6, v5, v12}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
+    invoke-static {v0, v14, v6, v5, v12}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
 
     move-result v14
 
@@ -8163,7 +6354,7 @@
 
     const-string v11, ":"
 
-    invoke-static {v0, v11, v6, v5, v12}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
+    invoke-static {v0, v11, v6, v5, v12}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
 
     move-result v11
 
@@ -8176,7 +6367,7 @@
     :cond_4
     const-string v11, "."
 
-    invoke-static {v0, v11, v6, v5, v12}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
+    invoke-static {v0, v11, v6, v5, v12}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
 
     move-result v6
 
@@ -8329,7 +6520,7 @@
 
     move-result v4
 
-    invoke-static {v4}, Ln0/g0/b;->w(C)I
+    invoke-static {v4}, Lo0/g0/b;->w(C)I
 
     move-result v4
 
@@ -8426,7 +6617,275 @@
     return-object v0
 .end method
 
-.method public static final v(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
+.method public static final random([Ljava/lang/Object;Lk0/q/c;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;",
+            "Lk0/q/c;",
+            ")TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$random"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "random"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-nez v0, :cond_1
+
+    array-length v0, p0
+
+    invoke-virtual {p1, v0}, Lk0/q/c;->nextInt(I)I
+
+    move-result p1
+
+    aget-object p0, p0, p1
+
+    return-object p0
+
+    :cond_1
+    new-instance p0, Ljava/util/NoSuchElementException;
+
+    const-string p1, "Array is empty."
+
+    invoke-direct {p0, p1}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final readText(Ljava/io/Reader;)Ljava/lang/String;
+    .locals 4
+
+    const-string v0, "$this$readText"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/io/StringWriter;
+
+    invoke-direct {v0}, Ljava/io/StringWriter;-><init>()V
+
+    const-string v1, "$this$copyTo"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "out"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v1, 0x2000
+
+    new-array v1, v1, [C
+
+    invoke-virtual {p0, v1}, Ljava/io/Reader;->read([C)I
+
+    move-result v2
+
+    :goto_0
+    if-ltz v2, :cond_0
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v0, v1, v3, v2}, Ljava/io/Writer;->write([CII)V
+
+    invoke-virtual {p0, v1}, Ljava/io/Reader;->read([C)I
+
+    move-result v2
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/io/StringWriter;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "buffer.toString()"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final removeAll(Ljava/util/List;Lkotlin/jvm/functions/Function1;)Z
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "TT;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;)Z"
+        }
+    .end annotation
+
+    const-string v0, "$this$removeAll"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "predicate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/RandomAccess;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-nez v0, :cond_2
+
+    instance-of v0, p0, Lk0/o/c/w/a;
+
+    if-eqz v0, :cond_1
+
+    instance-of v0, p0, Lk0/o/c/w/b;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p1, "kotlin.collections.MutableIterable"
+
+    invoke-static {p0, p1}, Lk0/o/c/v;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p0, 0x0
+
+    throw p0
+
+    :cond_1
+    :goto_0
+    invoke-static {p0, p1, v1}, Lf/n/a/k/a;->s(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
+
+    move-result v1
+
+    goto :goto_4
+
+    :cond_2
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result v0
+
+    if-ltz v0, :cond_5
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_1
+    invoke-interface {p0, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    invoke-interface {p1, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Ljava/lang/Boolean;
+
+    invoke-virtual {v6}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v6
+
+    if-ne v6, v1, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    if-eq v4, v3, :cond_4
+
+    invoke-interface {p0, v4, v5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    :cond_4
+    add-int/lit8 v4, v4, 0x1
+
+    :goto_2
+    if-eq v3, v0, :cond_6
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_5
+    const/4 v4, 0x0
+
+    :cond_6
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result p1
+
+    if-ge v4, p1, :cond_7
+
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result p1
+
+    if-lt p1, v4, :cond_8
+
+    :goto_3
+    invoke-interface {p0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+
+    if-eq p1, v4, :cond_8
+
+    add-int/lit8 p1, p1, -0x1
+
+    goto :goto_3
+
+    :cond_7
+    const/4 v1, 0x0
+
+    :cond_8
+    :goto_4
+    return v1
+.end method
+
+.method public static final roundToInt(F)I
+    .locals 1
+
+    invoke-static {p0}, Ljava/lang/Float;->isNaN(F)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-static {p0}, Ljava/lang/Math;->round(F)I
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Cannot round NaN value."
+
+    invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final s(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -8482,7 +6941,243 @@
     return v0
 .end method
 
-.method public static final w(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+.method public static final varargs sequenceOf([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    sget-object p0, Lk0/t/f;->a:Lk0/t/f;
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {p0}, Lf/n/a/k/a;->asSequence([Ljava/lang/Object;)Lkotlin/sequences/Sequence;
+
+    move-result-object p0
+
+    :goto_1
+    return-object p0
+.end method
+
+.method public static final setOf(Ljava/lang/Object;)Ljava/util/Set;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(TT;)",
+            "Ljava/util/Set<",
+            "TT;>;"
+        }
+    .end annotation
+
+    invoke-static {p0}, Ljava/util/Collections;->singleton(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object p0
+
+    const-string v0, "java.util.Collections.singleton(element)"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final varargs setOf([Ljava/lang/Object;)Ljava/util/Set;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Ljava/util/Set<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-lez v0, :cond_0
+
+    invoke-static {p0}, Lf/n/a/k/a;->toSet([Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p0, Lk0/j/p;->d:Lk0/j/p;
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final single([C)C
+    .locals 2
+
+    const-string v0, "$this$single"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-eqz v0, :cond_1
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x0
+
+    aget-char p0, p0, v0
+
+    return p0
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Array has more than one element."
+
+    invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_1
+    new-instance p0, Ljava/util/NoSuchElementException;
+
+    const-string v0, "Array is empty."
+
+    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final sort(Ljava/util/List;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T::",
+            "Ljava/lang/Comparable<",
+            "-TT;>;>(",
+            "Ljava/util/List<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$sort"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-le v0, v1, :cond_0
+
+    invoke-static {p0}, Ljava/util/Collections;->sort(Ljava/util/List;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public static final sortWith(Ljava/util/List;Ljava/util/Comparator;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "TT;>;",
+            "Ljava/util/Comparator<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$sortWith"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "comparator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-le v0, v1, :cond_0
+
+    invoke-static {p0, p1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public static final sortedWith(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Lkotlin/sequences/Sequence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;",
+            "Ljava/util/Comparator<",
+            "-TT;>;)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$sortedWith"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "comparator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/t/r;
+
+    invoke-direct {v0, p0, p1}, Lk0/t/r;-><init>(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)V
+
+    return-object v0
+.end method
+
+.method public static final t(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -8502,44 +7197,757 @@
         }
     .end annotation
 
-    instance-of v0, p0, Lj0/s/u;
+    instance-of v0, p0, Lk0/t/u;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
-    check-cast p0, Lj0/s/u;
+    check-cast p0, Lk0/t/u;
 
-    if-eqz p1, :cond_0
+    const-string v0, "iterator"
 
-    new-instance v0, Lj0/s/h;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lj0/s/u;->a:Lkotlin/sequences/Sequence;
+    new-instance v0, Lk0/t/h;
 
-    iget-object p0, p0, Lj0/s/u;->b:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lk0/t/u;->a:Lkotlin/sequences/Sequence;
 
-    invoke-direct {v0, v1, p0, p1}, Lj0/s/h;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+    iget-object p0, p0, Lk0/t/u;->b:Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {v0, v1, p0, p1}, Lk0/t/h;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 
     return-object v0
 
     :cond_0
-    const-string p0, "iterator"
+    new-instance v0, Lk0/t/h;
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    sget-object v1, Lk0/t/m;->d:Lk0/t/m;
 
-    const/4 p0, 0x0
-
-    throw p0
-
-    :cond_1
-    new-instance v0, Lj0/s/h;
-
-    sget-object v1, Lj0/s/m;->d:Lj0/s/m;
-
-    invoke-direct {v0, p0, v1, p1}, Lj0/s/h;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v0, p0, v1, p1}, Lk0/t/h;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 
     return-object v0
 .end method
 
-.method public static x(Ljava/util/concurrent/atomic/AtomicLong;J)J
+.method public static final take(Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$take"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-ltz p1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_3
+
+    if-nez p1, :cond_1
+
+    sget-object p0, Lk0/t/f;->a:Lk0/t/f;
+
+    goto :goto_1
+
+    :cond_1
+    instance-of v0, p0, Lk0/t/e;
+
+    if-eqz v0, :cond_2
+
+    check-cast p0, Lk0/t/e;
+
+    invoke-interface {p0, p1}, Lk0/t/e;->take(I)Lkotlin/sequences/Sequence;
+
+    move-result-object p0
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v0, Lk0/t/t;
+
+    invoke-direct {v0, p0, p1}, Lk0/t/t;-><init>(Lkotlin/sequences/Sequence;I)V
+
+    move-object p0, v0
+
+    :goto_1
+    return-object p0
+
+    :cond_3
+    const-string p0, "Requested element count "
+
+    const-string v0, " is less than zero."
+
+    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final throwCountOverflow()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/ArithmeticException;
+
+    const-string v1, "Count overflow has happened."
+
+    invoke-direct {v0, v1}, Ljava/lang/ArithmeticException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static final throwIndexOverflow()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/ArithmeticException;
+
+    const-string v1, "Index overflow has happened."
+
+    invoke-direct {v0, v1}, Ljava/lang/ArithmeticException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static final throwOnFailure(Ljava/lang/Object;)V
+    .locals 1
+
+    instance-of v0, p0, Lk0/d$a;
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    check-cast p0, Lk0/d$a;
+
+    iget-object p0, p0, Lk0/d$a;->exception:Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static final toCollection(Lkotlin/sequences/Sequence;Ljava/util/Collection;)Ljava/util/Collection;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            "C::",
+            "Ljava/util/Collection<",
+            "-TT;>;>(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;TC;)TC;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toCollection"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "destination"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    return-object p1
+.end method
+
+.method public static final toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            "C::",
+            "Ljava/util/Collection<",
+            "-TT;>;>([TT;TC;)TC;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toCollection"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "destination"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_0
+
+    aget-object v2, p0, v1
+
+    invoke-interface {p1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-object p1
+.end method
+
+.method public static final toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Lf/n/a/k/a;->toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final toList([I)Ljava/util/List;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([I)",
+            "Ljava/util/List<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-eqz v0, :cond_1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eq v0, v2, :cond_0
+
+    const-string v0, "$this$toMutableList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    array-length v2, p0
+
+    invoke-direct {v0, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    array-length v2, p0
+
+    :goto_0
+    if-ge v1, v2, :cond_2
+
+    aget v3, p0, v1
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    aget p0, p0, v1
+
+    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_1
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
+
+    :cond_2
+    :goto_1
+    return-object v0
+.end method
+
+.method public static final toList([Ljava/lang/Object;)Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-eqz v0, :cond_1
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :cond_0
+
+    invoke-static {p0}, Lf/n/a/k/a;->toMutableList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    aget-object p0, p0, v0
+
+    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_1
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final toMap(Ljava/lang/Iterable;)Ljava/util/Map;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K:",
+            "Ljava/lang/Object;",
+            "V:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+",
+            "Lkotlin/Pair<",
+            "+TK;+TV;>;>;)",
+            "Ljava/util/Map<",
+            "TK;TV;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    const/4 v2, 0x1
+
+    if-eq v1, v2, :cond_0
+
+    new-instance v1, Ljava/util/LinkedHashMap;
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v0
+
+    invoke-direct {v1, v0}, Ljava/util/LinkedHashMap;-><init>(I)V
+
+    invoke-static {p0, v1}, Lf/n/a/k/a;->toMap(Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map;
+
+    goto :goto_0
+
+    :cond_0
+    check-cast p0, Ljava/util/List;
+
+    const/4 v0, 0x0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Lkotlin/Pair;
+
+    invoke-static {p0}, Lf/n/a/k/a;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v1, Lk0/j/o;->d:Lk0/j/o;
+
+    :goto_0
+    return-object v1
+.end method
+
+.method public static final toMap(Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K:",
+            "Ljava/lang/Object;",
+            "V:",
+            "Ljava/lang/Object;",
+            "M::",
+            "Ljava/util/Map<",
+            "-TK;-TV;>;>(",
+            "Ljava/lang/Iterable<",
+            "+",
+            "Lkotlin/Pair<",
+            "+TK;+TV;>;>;TM;)TM;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "destination"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$putAll"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "pairs"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/Pair;
+
+    iget-object v1, v0, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    iget-object v0, v0, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_0
+    return-object p1
+.end method
+
+.method public static final toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMutableList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->toCollection(Lkotlin/sequences/Sequence;Ljava/util/Collection;)Ljava/util/Collection;
+
+    check-cast v0, Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public static final toMutableList([Ljava/lang/Object;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMutableList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const-string v1, "$this$asCollection"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lk0/j/d;
+
+    const/4 v2, 0x0
+
+    invoke-direct {v1, p0, v2}, Lk0/j/d;-><init>([Ljava/lang/Object;Z)V
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    return-object v0
+.end method
+
+.method public static final toMutableMap(Ljava/util/Map;)Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K:",
+            "Ljava/lang/Object;",
+            "V:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Map<",
+            "+TK;+TV;>;)",
+            "Ljava/util/Map<",
+            "TK;TV;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMutableMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0, p0}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
+
+    return-object v0
+.end method
+
+.method public static final toSet([Ljava/lang/Object;)Ljava/util/Set;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Ljava/util/Set<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toSet"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-eqz v0, :cond_1
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :cond_0
+
+    new-instance v0, Ljava/util/LinkedHashSet;
+
+    array-length v1, p0
+
+    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/LinkedHashSet;-><init>(I)V
+
+    invoke-static {p0, v0}, Lf/n/a/k/a;->toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
+
+    check-cast v0, Ljava/util/Set;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    aget-object p0, p0, v0
+
+    invoke-static {p0}, Lf/n/a/k/a;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public static final toSingletonMap(Ljava/util/Map;)Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K:",
+            "Ljava/lang/Object;",
+            "V:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Map<",
+            "+TK;+TV;>;)",
+            "Ljava/util/Map<",
+            "TK;TV;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toSingletonMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(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, "with(entries.iterator().\u2026ingletonMap(key, value) }"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final toSortedMap(Ljava/util/Map;)Ljava/util/SortedMap;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K::",
+            "Ljava/lang/Comparable<",
+            "-TK;>;V:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Map<",
+            "+TK;+TV;>;)",
+            "Ljava/util/SortedMap<",
+            "TK;TV;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toSortedMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/TreeMap;
+
+    invoke-direct {v0, p0}, Ljava/util/TreeMap;-><init>(Ljava/util/Map;)V
+
+    return-object v0
+.end method
+
+.method public static u(Ljava/util/concurrent/atomic/AtomicLong;J)J
     .locals 4
 
     :cond_0
@@ -8560,7 +7968,7 @@
     return-wide v0
 .end method
 
-.method public static y(Landroid/graphics/RectF;)[F
+.method public static v(Landroid/graphics/RectF;)[F
     .locals 3
 
     const/4 v0, 0x2
@@ -8586,10 +7994,12 @@
     return-object v0
 .end method
 
-.method public static final z(Ljava/lang/Object;)Ljava/lang/String;
+.method public static final w(Ljava/lang/Object;)Ljava/lang/String;
     .locals 1
 
-    if-eqz p0, :cond_0
+    const-string v0, "$this$classSimpleName"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -8601,16 +8011,209 @@
 
     const-string v0, "this::class.java.simpleName"
 
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p0
+.end method
+
+.method public static x(Landroid/graphics/RectF;)[F
+    .locals 5
+
+    const/16 v0, 0x8
+
+    new-array v0, v0, [F
+
+    iget v1, p0, Landroid/graphics/RectF;->left:F
+
+    const/4 v2, 0x0
+
+    aput v1, v0, v2
+
+    iget v2, p0, Landroid/graphics/RectF;->top:F
+
+    const/4 v3, 0x1
+
+    aput v2, v0, v3
+
+    iget v3, p0, Landroid/graphics/RectF;->right:F
+
+    const/4 v4, 0x2
+
+    aput v3, v0, v4
+
+    const/4 v4, 0x3
+
+    aput v2, v0, v4
+
+    const/4 v2, 0x4
+
+    aput v3, v0, v2
+
+    iget p0, p0, Landroid/graphics/RectF;->bottom:F
+
+    const/4 v2, 0x5
+
+    aput p0, v0, v2
+
+    const/4 v2, 0x6
+
+    aput v1, v0, v2
+
+    const/4 v1, 0x7
+
+    aput p0, v0, v1
+
+    return-object v0
+.end method
+
+.method public static y(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+    .locals 8
+
+    const-string v0, "_data"
+
+    filled-new-array {v0}, [Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v7, 0x0
+
+    :try_start_0
+    invoke-virtual {p0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+
+    move-result-object v1
+
+    const/4 v6, 0x0
+
+    move-object v2, p1
+
+    move-object v4, p2
+
+    move-object v5, p3
+
+    invoke-virtual/range {v1 .. v6}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p0, :cond_0
+
+    :try_start_1
+    invoke-interface {p0}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p0, v0}, Landroid/database/Cursor;->getColumnIndexOrThrow(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-interface {p0, p1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
+
+    move-result-object p1
+    :try_end_1
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    invoke-interface {p0}, Landroid/database/Cursor;->close()V
+
+    return-object p1
+
+    :catch_0
+    move-exception p1
+
+    goto :goto_1
 
     :cond_0
-    const-string p0, "$this$classSimpleName"
+    if-eqz p0, :cond_1
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :goto_0
+    invoke-interface {p0}, Landroid/database/Cursor;->close()V
 
-    const/4 p0, 0x0
+    goto :goto_2
 
-    throw p0
+    :catchall_0
+    move-exception p1
+
+    goto :goto_3
+
+    :catch_1
+    move-exception p1
+
+    move-object p0, v7
+
+    :goto_1
+    :try_start_2
+    const-string p2, "FileUtils"
+
+    invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
+
+    move-result-object p3
+
+    const-string v0, "getDataColumn: _data - [%s]"
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p1}, Ljava/lang/IllegalArgumentException;->getMessage()Ljava/lang/String;
+
+    move-result-object p1
+
+    aput-object p1, v1, v2
+
+    invoke-static {p3, v0, v1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p2, p1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-eqz p0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    :goto_2
+    return-object v7
+
+    :catchall_1
+    move-exception p1
+
+    move-object v7, p0
+
+    :goto_3
+    if-eqz v7, :cond_2
+
+    invoke-interface {v7}, Landroid/database/Cursor;->close()V
+
+    :cond_2
+    throw p1
+.end method
+
+.method public static final z(Ljava/lang/Object;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "$this$hexAddress"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
+
+    move-result p0
+
+    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "Integer.toHexString(System.identityHashCode(this))"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
 .end method
diff --git a/com.discord/smali_classes2/f/n/a/k/c.smali b/com.discord/smali_classes2/f/n/a/k/c.smali
index e9f3f91e1a..373950eb7b 100644
--- a/com.discord/smali_classes2/f/n/a/k/c.smali
+++ b/com.discord/smali_classes2/f/n/a/k/c.smali
@@ -274,7 +274,7 @@
 
     const-string v2, "Parser doesn\'t handle magic number: "
 
-    invoke-static {v2, v1, v6}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v2, v1, v6}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_2
     return v4
@@ -308,7 +308,7 @@
 
     const-string v2, "Unknown segmentId="
 
-    invoke-static {v2, v1, v6}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v2, v1, v6}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     goto/16 :goto_6
 
@@ -633,7 +633,7 @@
 
     const-string v5, "Unknown endianness = "
 
-    invoke-static {v5, v7, v6}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v5, v7, v6}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_17
     sget-object v5, Ljava/nio/ByteOrder;->BIG_ENDIAN:Ljava/nio/ByteOrder;
@@ -762,7 +762,7 @@
 
     const-string v8, "Got byte count > 4, not orientation, continuing, formatCode="
 
-    invoke-static {v8, v10, v6}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v8, v10, v6}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_11
 
@@ -809,7 +809,7 @@
 
     const-string v9, "Illegal number of bytes for TI tag data tagType="
 
-    invoke-static {v9, v8, v6}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v9, v8, v6}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     goto :goto_11
 
@@ -853,7 +853,7 @@
 
     const-string v8, "Got invalid format code = "
 
-    invoke-static {v8, v10, v6}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v8, v10, v6}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     :cond_22
     :goto_11
diff --git a/com.discord/smali_classes2/f/n/a/l/a.smali b/com.discord/smali_classes2/f/n/a/l/a.smali
index 685159e1ad..fca6ed6f81 100644
--- a/com.discord/smali_classes2/f/n/a/l/a.smali
+++ b/com.discord/smali_classes2/f/n/a/l/a.smali
@@ -483,7 +483,7 @@
 
     iget-object v0, p0, Lf/n/a/l/a;->s:Landroid/graphics/RectF;
 
-    invoke-static {v0}, Lf/n/a/k/a;->A(Landroid/graphics/RectF;)[F
+    invoke-static {v0}, Lf/n/a/k/a;->x(Landroid/graphics/RectF;)[F
 
     move-result-object v0
 
@@ -491,11 +491,11 @@
 
     invoke-virtual {v1, v0}, Landroid/graphics/Matrix;->mapPoints([F)V
 
-    invoke-static {p1}, Lf/n/a/k/a;->l0([F)Landroid/graphics/RectF;
+    invoke-static {p1}, Lf/n/a/k/a;->g0([F)Landroid/graphics/RectF;
 
     move-result-object p1
 
-    invoke-static {v0}, Lf/n/a/k/a;->l0([F)Landroid/graphics/RectF;
+    invoke-static {v0}, Lf/n/a/k/a;->g0([F)Landroid/graphics/RectF;
 
     move-result-object v0
 
@@ -754,7 +754,7 @@
 
     iget-object v3, v11, Lf/n/a/l/a;->s:Landroid/graphics/RectF;
 
-    invoke-static {v3}, Lf/n/a/k/a;->A(Landroid/graphics/RectF;)[F
+    invoke-static {v3}, Lf/n/a/k/a;->x(Landroid/graphics/RectF;)[F
 
     move-result-object v3
 
@@ -766,11 +766,11 @@
 
     invoke-virtual {v13, v3}, Landroid/graphics/Matrix;->mapPoints([F)V
 
-    invoke-static {v0}, Lf/n/a/k/a;->l0([F)Landroid/graphics/RectF;
+    invoke-static {v0}, Lf/n/a/k/a;->g0([F)Landroid/graphics/RectF;
 
     move-result-object v0
 
-    invoke-static {v3}, Lf/n/a/k/a;->l0([F)Landroid/graphics/RectF;
+    invoke-static {v3}, Lf/n/a/k/a;->g0([F)Landroid/graphics/RectF;
 
     move-result-object v3
 
diff --git a/com.discord/smali_classes2/f/n/a/l/c.smali b/com.discord/smali_classes2/f/n/a/l/c.smali
index 4a5af6a0c1..fb46386c4a 100644
--- a/com.discord/smali_classes2/f/n/a/l/c.smali
+++ b/com.discord/smali_classes2/f/n/a/l/c.smali
@@ -268,13 +268,13 @@
 
     invoke-direct {v2, v3, v3, v1, v0}, Landroid/graphics/RectF;-><init>(FFFF)V
 
-    invoke-static {v2}, Lf/n/a/k/a;->A(Landroid/graphics/RectF;)[F
+    invoke-static {v2}, Lf/n/a/k/a;->x(Landroid/graphics/RectF;)[F
 
     move-result-object v0
 
     iput-object v0, p0, Lf/n/a/l/c;->k:[F
 
-    invoke-static {v2}, Lf/n/a/k/a;->y(Landroid/graphics/RectF;)[F
+    invoke-static {v2}, Lf/n/a/k/a;->v(Landroid/graphics/RectF;)[F
 
     move-result-object v0
 
@@ -556,7 +556,7 @@
 
     :cond_1
     :try_start_0
-    invoke-static {}, Lf/n/a/k/a;->D()I
+    invoke-static {}, Lf/n/a/k/a;->A()I
 
     move-result v1
     :try_end_0
@@ -587,7 +587,7 @@
 
     const-string v2, "BitmapLoadUtils"
 
-    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->N(Ljava/lang/String;ILjava/lang/String;)V
+    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->P(Ljava/lang/String;ILjava/lang/String;)V
 
     iput v0, p0, Lf/n/a/l/c;->o:I
 
diff --git a/com.discord/smali_classes2/g0/a/a.smali b/com.discord/smali_classes2/g0/a/a.smali
deleted file mode 100644
index 86100c53a8..0000000000
--- a/com.discord/smali_classes2/g0/a/a.smali
+++ /dev/null
@@ -1,218 +0,0 @@
-.class public final Lg0/a/a;
-.super Ljava/lang/Object;
-.source "DoubleCheck.java"
-
-# interfaces
-.implements Li0/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Li0/a/a<",
-        "TT;>;",
-        "Ljava/lang/Object<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:Ljava/lang/Object;
-
-
-# instance fields
-.field public volatile a:Li0/a/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Li0/a/a<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public volatile b:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    sput-object v0, Lg0/a/a;->c:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>(Li0/a/a;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Li0/a/a<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lg0/a/a;->c:Ljava/lang/Object;
-
-    iput-object v0, p0, Lg0/a/a;->b:Ljava/lang/Object;
-
-    iput-object p1, p0, Lg0/a/a;->a:Li0/a/a;
-
-    return-void
-.end method
-
-.method public static a(Li0/a/a;)Li0/a/a;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<P::",
-            "Li0/a/a<",
-            "TT;>;T:",
-            "Ljava/lang/Object;",
-            ">(TP;)",
-            "Li0/a/a<",
-            "TT;>;"
-        }
-    .end annotation
-
-    instance-of v0, p0, Lg0/a/a;
-
-    if-eqz v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    new-instance v0, Lg0/a/a;
-
-    invoke-direct {v0, p0}, Lg0/a/a;-><init>(Li0/a/a;)V
-
-    return-object v0
-.end method
-
-.method public static b(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    sget-object v0, Lg0/a/a;->c:Ljava/lang/Object;
-
-    if-eq p0, v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    if-ne p0, p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Scoped provider was invoked recursively returning different results: "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p0, " & "
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p0, ". This is likely due to a circular dependency."
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    :goto_1
-    return-object p1
-.end method
-
-
-# virtual methods
-.method public get()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lg0/a/a;->b:Ljava/lang/Object;
-
-    sget-object v1, Lg0/a/a;->c:Ljava/lang/Object;
-
-    if-ne v0, v1, :cond_1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lg0/a/a;->b:Ljava/lang/Object;
-
-    sget-object v1, Lg0/a/a;->c:Ljava/lang/Object;
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lg0/a/a;->a:Li0/a/a;
-
-    invoke-interface {v0}, Li0/a/a;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lg0/a/a;->b:Ljava/lang/Object;
-
-    invoke-static {v1, v0}, Lg0/a/a;->b(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    iput-object v0, p0, Lg0/a/a;->b:Ljava/lang/Object;
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lg0/a/a;->a:Li0/a/a;
-
-    :cond_0
-    monitor-exit p0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/g0/a/b.smali b/com.discord/smali_classes2/g0/a/b.smali
deleted file mode 100644
index 8393b57dbb..0000000000
--- a/com.discord/smali_classes2/g0/a/b.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lg0/a/b;
-.super Ljava/lang/Object;
-.source "InstanceFactory.java"
-
-# interfaces
-.implements Li0/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TT;>;",
-        "Ljava/lang/Object<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lg0/a/b;->a:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public get()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lg0/a/b;->a:Ljava/lang/Object;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/h0/a/a.smali b/com.discord/smali_classes2/h0/a/a.smali
new file mode 100644
index 0000000000..16c452cc43
--- /dev/null
+++ b/com.discord/smali_classes2/h0/a/a.smali
@@ -0,0 +1,218 @@
+.class public final Lh0/a/a;
+.super Ljava/lang/Object;
+.source "DoubleCheck.java"
+
+# interfaces
+.implements Lj0/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lj0/a/a<",
+        "TT;>;",
+        "Ljava/lang/Object<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:Ljava/lang/Object;
+
+
+# instance fields
+.field public volatile a:Lj0/a/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lj0/a/a<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public volatile b:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    sput-object v0, Lh0/a/a;->c:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lj0/a/a;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lj0/a/a<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Lh0/a/a;->c:Ljava/lang/Object;
+
+    iput-object v0, p0, Lh0/a/a;->b:Ljava/lang/Object;
+
+    iput-object p1, p0, Lh0/a/a;->a:Lj0/a/a;
+
+    return-void
+.end method
+
+.method public static a(Lj0/a/a;)Lj0/a/a;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<P::",
+            "Lj0/a/a<",
+            "TT;>;T:",
+            "Ljava/lang/Object;",
+            ">(TP;)",
+            "Lj0/a/a<",
+            "TT;>;"
+        }
+    .end annotation
+
+    instance-of v0, p0, Lh0/a/a;
+
+    if-eqz v0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Lh0/a/a;
+
+    invoke-direct {v0, p0}, Lh0/a/a;-><init>(Lj0/a/a;)V
+
+    return-object v0
+.end method
+
+.method public static b(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    sget-object v0, Lh0/a/a;->c:Ljava/lang/Object;
+
+    if-eq p0, v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    if-ne p0, p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Scoped provider was invoked recursively returning different results: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p0, " & "
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p0, ". This is likely due to a circular dependency."
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    :goto_1
+    return-object p1
+.end method
+
+
+# virtual methods
+.method public get()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lh0/a/a;->b:Ljava/lang/Object;
+
+    sget-object v1, Lh0/a/a;->c:Ljava/lang/Object;
+
+    if-ne v0, v1, :cond_1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lh0/a/a;->b:Ljava/lang/Object;
+
+    sget-object v1, Lh0/a/a;->c:Ljava/lang/Object;
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lh0/a/a;->a:Lj0/a/a;
+
+    invoke-interface {v0}, Lj0/a/a;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lh0/a/a;->b:Ljava/lang/Object;
+
+    invoke-static {v1, v0}, Lh0/a/a;->b(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    iput-object v0, p0, Lh0/a/a;->b:Ljava/lang/Object;
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Lh0/a/a;->a:Lj0/a/a;
+
+    :cond_0
+    monitor-exit p0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/h0/a/a/a.smali b/com.discord/smali_classes2/h0/a/a/a.smali
deleted file mode 100644
index 2453c0eb05..0000000000
--- a/com.discord/smali_classes2/h0/a/a/a.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public synthetic Lh0/a/a/a;
-.super Ljava/lang/Object;
-.source "FirebaseAbt.java"
diff --git a/com.discord/smali_classes2/h0/a/a/b$a.smali b/com.discord/smali_classes2/h0/a/a/b$a.smali
deleted file mode 100644
index 60daca1257..0000000000
--- a/com.discord/smali_classes2/h0/a/a/b$a.smali
+++ /dev/null
@@ -1,39 +0,0 @@
-.class public final Lh0/a/a/b$a;
-.super Lf/h/e/u$a;
-.source "FirebaseAbt.java"
-
-# interfaces
-.implements Lf/h/e/m0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lh0/a/a/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lf/h/e/u$a<",
-        "Lh0/a/a/b;",
-        "Lh0/a/a/b$a;",
-        ">;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lh0/a/a/a;)V
-    .locals 0
-
-    sget-object p1, Lh0/a/a/b;->h:Lh0/a/a/b;
-
-    invoke-direct {p0, p1}, Lf/h/e/u$a;-><init>(Lf/h/e/u;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/h0/a/a/b.smali b/com.discord/smali_classes2/h0/a/a/b.smali
deleted file mode 100644
index f98df88976..0000000000
--- a/com.discord/smali_classes2/h0/a/a/b.smali
+++ /dev/null
@@ -1,189 +0,0 @@
-.class public final Lh0/a/a/b;
-.super Lf/h/e/u;
-.source "FirebaseAbt.java"
-
-# interfaces
-.implements Lf/h/e/m0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lh0/a/a/b$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lf/h/e/u<",
-        "Lh0/a/a/b;",
-        "Lh0/a/a/b$a;",
-        ">;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final h:Lh0/a/a/b;
-
-.field public static volatile i:Lf/h/e/s0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lf/h/e/s0<",
-            "Lh0/a/a/b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lh0/a/a/b;
-
-    invoke-direct {v0}, Lh0/a/a/b;-><init>()V
-
-    sput-object v0, Lh0/a/a/b;->h:Lh0/a/a/b;
-
-    const-class v1, Lh0/a/a/b;
-
-    sget-object v2, Lf/h/e/u;->g:Ljava/util/Map;
-
-    invoke-interface {v2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lf/h/e/u;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final h(Lf/h/e/u$f;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
-
-    move-result p1
-
-    const/4 p2, 0x1
-
-    const/4 p3, 0x0
-
-    packed-switch p1, :pswitch_data_0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    sget-object p1, Lh0/a/a/b;->i:Lf/h/e/s0;
-
-    if-nez p1, :cond_1
-
-    const-class p2, Lh0/a/a/b;
-
-    monitor-enter p2
-
-    :try_start_0
-    sget-object p1, Lh0/a/a/b;->i:Lf/h/e/s0;
-
-    if-nez p1, :cond_0
-
-    new-instance p1, Lf/h/e/u$b;
-
-    sget-object p3, Lh0/a/a/b;->h:Lh0/a/a/b;
-
-    invoke-direct {p1, p3}, Lf/h/e/u$b;-><init>(Lf/h/e/u;)V
-
-    sput-object p1, Lh0/a/a/b;->i:Lf/h/e/s0;
-
-    :cond_0
-    monitor-exit p2
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-object p1
-
-    :pswitch_1
-    sget-object p1, Lh0/a/a/b;->h:Lh0/a/a/b;
-
-    return-object p1
-
-    :pswitch_2
-    new-instance p1, Lh0/a/a/b$a;
-
-    invoke-direct {p1, p3}, Lh0/a/a/b$a;-><init>(Lh0/a/a/a;)V
-
-    return-object p1
-
-    :pswitch_3
-    new-instance p1, Lh0/a/a/b;
-
-    invoke-direct {p1}, Lh0/a/a/b;-><init>()V
-
-    return-object p1
-
-    :pswitch_4
-    new-array p1, p2, [Ljava/lang/Object;
-
-    const/4 p2, 0x0
-
-    const-string p3, "experimentId_"
-
-    aput-object p3, p1, p2
-
-    const-string p2, "\u0000\u0001\u0000\u0000\u0001\u0001\u0001\u0000\u0000\u0000\u0001\u0208"
-
-    sget-object p3, Lh0/a/a/b;->h:Lh0/a/a/b;
-
-    new-instance v0, Lf/h/e/x0;
-
-    invoke-direct {v0, p3, p2, p1}, Lf/h/e/x0;-><init>(Lf/h/e/l0;Ljava/lang/String;[Ljava/lang/Object;)V
-
-    return-object v0
-
-    :pswitch_5
-    return-object p3
-
-    :pswitch_6
-    invoke-static {p2}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
-
-    move-result-object p1
-
-    return-object p1
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali_classes2/h0/a/a/c$a.smali b/com.discord/smali_classes2/h0/a/a/c$a.smali
deleted file mode 100644
index 92374b4a07..0000000000
--- a/com.discord/smali_classes2/h0/a/a/c$a.smali
+++ /dev/null
@@ -1,39 +0,0 @@
-.class public final Lh0/a/a/c$a;
-.super Lf/h/e/u$a;
-.source "FirebaseAbt.java"
-
-# interfaces
-.implements Lf/h/e/m0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lh0/a/a/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lf/h/e/u$a<",
-        "Lh0/a/a/c;",
-        "Lh0/a/a/c$a;",
-        ">;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lh0/a/a/a;)V
-    .locals 0
-
-    sget-object p1, Lh0/a/a/c;->k:Lh0/a/a/c;
-
-    invoke-direct {p0, p1}, Lf/h/e/u$a;-><init>(Lf/h/e/u;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/h0/a/a/c.smali b/com.discord/smali_classes2/h0/a/a/c.smali
deleted file mode 100644
index 300fda85b0..0000000000
--- a/com.discord/smali_classes2/h0/a/a/c.smali
+++ /dev/null
@@ -1,402 +0,0 @@
-.class public final Lh0/a/a/c;
-.super Lf/h/e/u;
-.source "FirebaseAbt.java"
-
-# interfaces
-.implements Lf/h/e/m0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lh0/a/a/c$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lf/h/e/u<",
-        "Lh0/a/a/c;",
-        "Lh0/a/a/c$a;",
-        ">;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final k:Lh0/a/a/c;
-
-.field public static volatile l:Lf/h/e/s0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lf/h/e/s0<",
-            "Lh0/a/a/c;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public h:Ljava/lang/String;
-
-.field public i:Ljava/lang/String;
-
-.field public j:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lh0/a/a/c;
-
-    invoke-direct {v0}, Lh0/a/a/c;-><init>()V
-
-    sput-object v0, Lh0/a/a/c;->k:Lh0/a/a/c;
-
-    const-class v1, Lh0/a/a/c;
-
-    sget-object v2, Lf/h/e/u;->g:Ljava/util/Map;
-
-    invoke-interface {v2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lf/h/e/u;-><init>()V
-
-    const-string v0, ""
-
-    iput-object v0, p0, Lh0/a/a/c;->h:Ljava/lang/String;
-
-    iput-object v0, p0, Lh0/a/a/c;->i:Ljava/lang/String;
-
-    iput-object v0, p0, Lh0/a/a/c;->j:Ljava/lang/String;
-
-    sget-object v0, Lf/h/e/w0;->g:Lf/h/e/w0;
-
-    return-void
-.end method
-
-.method public static o([B)Lh0/a/a/c;
-    .locals 10
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lcom/google/protobuf/InvalidProtocolBufferException;
-        }
-    .end annotation
-
-    sget-object v0, Lh0/a/a/c;->k:Lh0/a/a/c;
-
-    array-length v1, p0
-
-    invoke-static {}, Lf/h/e/n;->a()Lf/h/e/n;
-
-    move-result-object v2
-
-    sget-object v3, Lf/h/e/u$f;->g:Lf/h/e/u$f;
-
-    const/4 v4, 0x0
-
-    invoke-virtual {v0, v3, v4, v4}, Lf/h/e/u;->h(Lf/h/e/u$f;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lf/h/e/u;
-
-    :try_start_0
-    sget-object v3, Lf/h/e/v0;->c:Lf/h/e/v0;
-
-    invoke-virtual {v3, v0}, Lf/h/e/v0;->b(Ljava/lang/Object;)Lf/h/e/z0;
-
-    move-result-object v9
-
-    add-int/lit8 v7, v1, 0x0
-
-    new-instance v8, Lf/h/e/e;
-
-    invoke-direct {v8, v2}, Lf/h/e/e;-><init>(Lf/h/e/n;)V
-
-    const/4 v6, 0x0
-
-    move-object v3, v9
-
-    move-object v4, v0
-
-    move-object v5, p0
-
-    invoke-interface/range {v3 .. v8}, Lf/h/e/z0;->g(Ljava/lang/Object;[BIILf/h/e/e;)V
-
-    invoke-interface {v9, v0}, Lf/h/e/z0;->b(Ljava/lang/Object;)V
-
-    iget p0, v0, Lf/h/e/a;->d:I
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-nez p0, :cond_0
-
-    invoke-static {v0}, Lf/h/e/u;->a(Lf/h/e/u;)Lf/h/e/u;
-
-    check-cast v0, Lh0/a/a/c;
-
-    return-object v0
-
-    :cond_0
-    :try_start_1
-    new-instance p0, Ljava/lang/RuntimeException;
-
-    invoke-direct {p0}, Ljava/lang/RuntimeException;-><init>()V
-
-    throw p0
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_1 .. :try_end_1} :catch_0
-
-    :catch_0
-    invoke-static {}, Lcom/google/protobuf/InvalidProtocolBufferException;->h()Lcom/google/protobuf/InvalidProtocolBufferException;
-
-    move-result-object p0
-
-    iput-object v0, p0, Lcom/google/protobuf/InvalidProtocolBufferException;->unfinishedMessage:Lf/h/e/l0;
-
-    throw p0
-
-    :catch_1
-    move-exception p0
-
-    invoke-virtual {p0}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    instance-of v1, v1, Lcom/google/protobuf/InvalidProtocolBufferException;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
-
-    move-result-object p0
-
-    check-cast p0, Lcom/google/protobuf/InvalidProtocolBufferException;
-
-    throw p0
-
-    :cond_1
-    new-instance v1, Lcom/google/protobuf/InvalidProtocolBufferException;
-
-    invoke-virtual {p0}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v1, p0}, Lcom/google/protobuf/InvalidProtocolBufferException;-><init>(Ljava/lang/String;)V
-
-    iput-object v0, v1, Lcom/google/protobuf/InvalidProtocolBufferException;->unfinishedMessage:Lf/h/e/l0;
-
-    throw v1
-.end method
-
-
-# virtual methods
-.method public final h(Lf/h/e/u$f;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
-
-    move-result p1
-
-    const/4 p2, 0x1
-
-    const/4 p3, 0x0
-
-    packed-switch p1, :pswitch_data_0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    sget-object p1, Lh0/a/a/c;->l:Lf/h/e/s0;
-
-    if-nez p1, :cond_1
-
-    const-class p2, Lh0/a/a/c;
-
-    monitor-enter p2
-
-    :try_start_0
-    sget-object p1, Lh0/a/a/c;->l:Lf/h/e/s0;
-
-    if-nez p1, :cond_0
-
-    new-instance p1, Lf/h/e/u$b;
-
-    sget-object p3, Lh0/a/a/c;->k:Lh0/a/a/c;
-
-    invoke-direct {p1, p3}, Lf/h/e/u$b;-><init>(Lf/h/e/u;)V
-
-    sput-object p1, Lh0/a/a/c;->l:Lf/h/e/s0;
-
-    :cond_0
-    monitor-exit p2
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-object p1
-
-    :pswitch_1
-    sget-object p1, Lh0/a/a/c;->k:Lh0/a/a/c;
-
-    return-object p1
-
-    :pswitch_2
-    new-instance p1, Lh0/a/a/c$a;
-
-    invoke-direct {p1, p3}, Lh0/a/a/c$a;-><init>(Lh0/a/a/a;)V
-
-    return-object p1
-
-    :pswitch_3
-    new-instance p1, Lh0/a/a/c;
-
-    invoke-direct {p1}, Lh0/a/a/c;-><init>()V
-
-    return-object p1
-
-    :pswitch_4
-    const/16 p1, 0xe
-
-    new-array p1, p1, [Ljava/lang/Object;
-
-    const/4 p3, 0x0
-
-    const-string v0, "experimentId_"
-
-    aput-object v0, p1, p3
-
-    const-string p3, "variantId_"
-
-    aput-object p3, p1, p2
-
-    const/4 p2, 0x2
-
-    const-string p3, "experimentStartTimeMillis_"
-
-    aput-object p3, p1, p2
-
-    const/4 p2, 0x3
-
-    const-string p3, "triggerEvent_"
-
-    aput-object p3, p1, p2
-
-    const/4 p2, 0x4
-
-    const-string p3, "triggerTimeoutMillis_"
-
-    aput-object p3, p1, p2
-
-    const/4 p2, 0x5
-
-    const-string p3, "timeToLiveMillis_"
-
-    aput-object p3, p1, p2
-
-    const/4 p2, 0x6
-
-    const-string p3, "setEventToLog_"
-
-    aput-object p3, p1, p2
-
-    const/4 p2, 0x7
-
-    const-string p3, "activateEventToLog_"
-
-    aput-object p3, p1, p2
-
-    const/16 p2, 0x8
-
-    const-string p3, "clearEventToLog_"
-
-    aput-object p3, p1, p2
-
-    const/16 p2, 0x9
-
-    const-string p3, "timeoutEventToLog_"
-
-    aput-object p3, p1, p2
-
-    const/16 p2, 0xa
-
-    const-string p3, "ttlExpiryEventToLog_"
-
-    aput-object p3, p1, p2
-
-    const/16 p2, 0xb
-
-    const-string p3, "overflowPolicy_"
-
-    aput-object p3, p1, p2
-
-    const/16 p2, 0xc
-
-    const-string p3, "ongoingExperiments_"
-
-    aput-object p3, p1, p2
-
-    const/16 p2, 0xd
-
-    const-class p3, Lh0/a/a/b;
-
-    aput-object p3, p1, p2
-
-    const-string p2, "\u0000\r\u0000\u0000\u0001\r\r\u0000\u0001\u0000\u0001\u0208\u0002\u0208\u0003\u0002\u0004\u0208\u0005\u0002\u0006\u0002\u0007\u0208\u0008\u0208\t\u0208\n\u0208\u000b\u0208\u000c\u000c\r\u001b"
-
-    sget-object p3, Lh0/a/a/c;->k:Lh0/a/a/c;
-
-    new-instance v0, Lf/h/e/x0;
-
-    invoke-direct {v0, p3, p2, p1}, Lf/h/e/x0;-><init>(Lf/h/e/l0;Ljava/lang/String;[Ljava/lang/Object;)V
-
-    return-object v0
-
-    :pswitch_5
-    return-object p3
-
-    :pswitch_6
-    invoke-static {p2}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
-
-    move-result-object p1
-
-    return-object p1
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali_classes2/h0/a/b.smali b/com.discord/smali_classes2/h0/a/b.smali
new file mode 100644
index 0000000000..3084c8b833
--- /dev/null
+++ b/com.discord/smali_classes2/h0/a/b.smali
@@ -0,0 +1,63 @@
+.class public final Lh0/a/b;
+.super Ljava/lang/Object;
+.source "InstanceFactory.java"
+
+# interfaces
+.implements Lj0/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TT;>;",
+        "Ljava/lang/Object<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lh0/a/b;->a:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public get()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lh0/a/b;->a:Ljava/lang/Object;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/i0/a/a.smali b/com.discord/smali_classes2/i0/a/a.smali
deleted file mode 100644
index 12204bfcb7..0000000000
--- a/com.discord/smali_classes2/i0/a/a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public interface abstract Li0/a/a;
-.super Ljava/lang/Object;
-.source "Provider.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract get()Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/i0/a/a/a.smali b/com.discord/smali_classes2/i0/a/a/a.smali
new file mode 100644
index 0000000000..2767ce8d01
--- /dev/null
+++ b/com.discord/smali_classes2/i0/a/a/a.smali
@@ -0,0 +1,3 @@
+.class public synthetic Li0/a/a/a;
+.super Ljava/lang/Object;
+.source "FirebaseAbt.java"
diff --git a/com.discord/smali_classes2/i0/a/a/b$a.smali b/com.discord/smali_classes2/i0/a/a/b$a.smali
new file mode 100644
index 0000000000..9222cd31e5
--- /dev/null
+++ b/com.discord/smali_classes2/i0/a/a/b$a.smali
@@ -0,0 +1,39 @@
+.class public final Li0/a/a/b$a;
+.super Lf/h/e/u$a;
+.source "FirebaseAbt.java"
+
+# interfaces
+.implements Lf/h/e/m0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Li0/a/a/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lf/h/e/u$a<",
+        "Li0/a/a/b;",
+        "Li0/a/a/b$a;",
+        ">;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Li0/a/a/a;)V
+    .locals 0
+
+    sget-object p1, Li0/a/a/b;->h:Li0/a/a/b;
+
+    invoke-direct {p0, p1}, Lf/h/e/u$a;-><init>(Lf/h/e/u;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/i0/a/a/b.smali b/com.discord/smali_classes2/i0/a/a/b.smali
new file mode 100644
index 0000000000..8114ebb65a
--- /dev/null
+++ b/com.discord/smali_classes2/i0/a/a/b.smali
@@ -0,0 +1,189 @@
+.class public final Li0/a/a/b;
+.super Lf/h/e/u;
+.source "FirebaseAbt.java"
+
+# interfaces
+.implements Lf/h/e/m0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Li0/a/a/b$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lf/h/e/u<",
+        "Li0/a/a/b;",
+        "Li0/a/a/b$a;",
+        ">;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final h:Li0/a/a/b;
+
+.field public static volatile i:Lf/h/e/s0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lf/h/e/s0<",
+            "Li0/a/a/b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Li0/a/a/b;
+
+    invoke-direct {v0}, Li0/a/a/b;-><init>()V
+
+    sput-object v0, Li0/a/a/b;->h:Li0/a/a/b;
+
+    const-class v1, Li0/a/a/b;
+
+    sget-object v2, Lf/h/e/u;->g:Ljava/util/Map;
+
+    invoke-interface {v2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lf/h/e/u;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final h(Lf/h/e/u$f;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
+
+    move-result p1
+
+    const/4 p2, 0x1
+
+    const/4 p3, 0x0
+
+    packed-switch p1, :pswitch_data_0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    sget-object p1, Li0/a/a/b;->i:Lf/h/e/s0;
+
+    if-nez p1, :cond_1
+
+    const-class p2, Li0/a/a/b;
+
+    monitor-enter p2
+
+    :try_start_0
+    sget-object p1, Li0/a/a/b;->i:Lf/h/e/s0;
+
+    if-nez p1, :cond_0
+
+    new-instance p1, Lf/h/e/u$b;
+
+    sget-object p3, Li0/a/a/b;->h:Li0/a/a/b;
+
+    invoke-direct {p1, p3}, Lf/h/e/u$b;-><init>(Lf/h/e/u;)V
+
+    sput-object p1, Li0/a/a/b;->i:Lf/h/e/s0;
+
+    :cond_0
+    monitor-exit p2
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-object p1
+
+    :pswitch_1
+    sget-object p1, Li0/a/a/b;->h:Li0/a/a/b;
+
+    return-object p1
+
+    :pswitch_2
+    new-instance p1, Li0/a/a/b$a;
+
+    invoke-direct {p1, p3}, Li0/a/a/b$a;-><init>(Li0/a/a/a;)V
+
+    return-object p1
+
+    :pswitch_3
+    new-instance p1, Li0/a/a/b;
+
+    invoke-direct {p1}, Li0/a/a/b;-><init>()V
+
+    return-object p1
+
+    :pswitch_4
+    new-array p1, p2, [Ljava/lang/Object;
+
+    const/4 p2, 0x0
+
+    const-string p3, "experimentId_"
+
+    aput-object p3, p1, p2
+
+    const-string p2, "\u0000\u0001\u0000\u0000\u0001\u0001\u0001\u0000\u0000\u0000\u0001\u0208"
+
+    sget-object p3, Li0/a/a/b;->h:Li0/a/a/b;
+
+    new-instance v0, Lf/h/e/x0;
+
+    invoke-direct {v0, p3, p2, p1}, Lf/h/e/x0;-><init>(Lf/h/e/l0;Ljava/lang/String;[Ljava/lang/Object;)V
+
+    return-object v0
+
+    :pswitch_5
+    return-object p3
+
+    :pswitch_6
+    invoke-static {p2}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
+
+    move-result-object p1
+
+    return-object p1
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali_classes2/i0/a/a/c$a.smali b/com.discord/smali_classes2/i0/a/a/c$a.smali
new file mode 100644
index 0000000000..56bb0fcb47
--- /dev/null
+++ b/com.discord/smali_classes2/i0/a/a/c$a.smali
@@ -0,0 +1,39 @@
+.class public final Li0/a/a/c$a;
+.super Lf/h/e/u$a;
+.source "FirebaseAbt.java"
+
+# interfaces
+.implements Lf/h/e/m0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Li0/a/a/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lf/h/e/u$a<",
+        "Li0/a/a/c;",
+        "Li0/a/a/c$a;",
+        ">;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Li0/a/a/a;)V
+    .locals 0
+
+    sget-object p1, Li0/a/a/c;->k:Li0/a/a/c;
+
+    invoke-direct {p0, p1}, Lf/h/e/u$a;-><init>(Lf/h/e/u;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/i0/a/a/c.smali b/com.discord/smali_classes2/i0/a/a/c.smali
new file mode 100644
index 0000000000..dbc01feb72
--- /dev/null
+++ b/com.discord/smali_classes2/i0/a/a/c.smali
@@ -0,0 +1,402 @@
+.class public final Li0/a/a/c;
+.super Lf/h/e/u;
+.source "FirebaseAbt.java"
+
+# interfaces
+.implements Lf/h/e/m0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Li0/a/a/c$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lf/h/e/u<",
+        "Li0/a/a/c;",
+        "Li0/a/a/c$a;",
+        ">;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final k:Li0/a/a/c;
+
+.field public static volatile l:Lf/h/e/s0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lf/h/e/s0<",
+            "Li0/a/a/c;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public h:Ljava/lang/String;
+
+.field public i:Ljava/lang/String;
+
+.field public j:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Li0/a/a/c;
+
+    invoke-direct {v0}, Li0/a/a/c;-><init>()V
+
+    sput-object v0, Li0/a/a/c;->k:Li0/a/a/c;
+
+    const-class v1, Li0/a/a/c;
+
+    sget-object v2, Lf/h/e/u;->g:Ljava/util/Map;
+
+    invoke-interface {v2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lf/h/e/u;-><init>()V
+
+    const-string v0, ""
+
+    iput-object v0, p0, Li0/a/a/c;->h:Ljava/lang/String;
+
+    iput-object v0, p0, Li0/a/a/c;->i:Ljava/lang/String;
+
+    iput-object v0, p0, Li0/a/a/c;->j:Ljava/lang/String;
+
+    sget-object v0, Lf/h/e/w0;->g:Lf/h/e/w0;
+
+    return-void
+.end method
+
+.method public static o([B)Li0/a/a/c;
+    .locals 10
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lcom/google/protobuf/InvalidProtocolBufferException;
+        }
+    .end annotation
+
+    sget-object v0, Li0/a/a/c;->k:Li0/a/a/c;
+
+    array-length v1, p0
+
+    invoke-static {}, Lf/h/e/n;->a()Lf/h/e/n;
+
+    move-result-object v2
+
+    sget-object v3, Lf/h/e/u$f;->g:Lf/h/e/u$f;
+
+    const/4 v4, 0x0
+
+    invoke-virtual {v0, v3, v4, v4}, Lf/h/e/u;->h(Lf/h/e/u$f;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lf/h/e/u;
+
+    :try_start_0
+    sget-object v3, Lf/h/e/v0;->c:Lf/h/e/v0;
+
+    invoke-virtual {v3, v0}, Lf/h/e/v0;->b(Ljava/lang/Object;)Lf/h/e/z0;
+
+    move-result-object v9
+
+    add-int/lit8 v7, v1, 0x0
+
+    new-instance v8, Lf/h/e/e;
+
+    invoke-direct {v8, v2}, Lf/h/e/e;-><init>(Lf/h/e/n;)V
+
+    const/4 v6, 0x0
+
+    move-object v3, v9
+
+    move-object v4, v0
+
+    move-object v5, p0
+
+    invoke-interface/range {v3 .. v8}, Lf/h/e/z0;->g(Ljava/lang/Object;[BIILf/h/e/e;)V
+
+    invoke-interface {v9, v0}, Lf/h/e/z0;->b(Ljava/lang/Object;)V
+
+    iget p0, v0, Lf/h/e/a;->d:I
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-nez p0, :cond_0
+
+    invoke-static {v0}, Lf/h/e/u;->a(Lf/h/e/u;)Lf/h/e/u;
+
+    check-cast v0, Li0/a/a/c;
+
+    return-object v0
+
+    :cond_0
+    :try_start_1
+    new-instance p0, Ljava/lang/RuntimeException;
+
+    invoke-direct {p0}, Ljava/lang/RuntimeException;-><init>()V
+
+    throw p0
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/lang/IndexOutOfBoundsException; {:try_start_1 .. :try_end_1} :catch_0
+
+    :catch_0
+    invoke-static {}, Lcom/google/protobuf/InvalidProtocolBufferException;->h()Lcom/google/protobuf/InvalidProtocolBufferException;
+
+    move-result-object p0
+
+    iput-object v0, p0, Lcom/google/protobuf/InvalidProtocolBufferException;->unfinishedMessage:Lf/h/e/l0;
+
+    throw p0
+
+    :catch_1
+    move-exception p0
+
+    invoke-virtual {p0}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    instance-of v1, v1, Lcom/google/protobuf/InvalidProtocolBufferException;
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/google/protobuf/InvalidProtocolBufferException;
+
+    throw p0
+
+    :cond_1
+    new-instance v1, Lcom/google/protobuf/InvalidProtocolBufferException;
+
+    invoke-virtual {p0}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v1, p0}, Lcom/google/protobuf/InvalidProtocolBufferException;-><init>(Ljava/lang/String;)V
+
+    iput-object v0, v1, Lcom/google/protobuf/InvalidProtocolBufferException;->unfinishedMessage:Lf/h/e/l0;
+
+    throw v1
+.end method
+
+
+# virtual methods
+.method public final h(Lf/h/e/u$f;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
+
+    move-result p1
+
+    const/4 p2, 0x1
+
+    const/4 p3, 0x0
+
+    packed-switch p1, :pswitch_data_0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    sget-object p1, Li0/a/a/c;->l:Lf/h/e/s0;
+
+    if-nez p1, :cond_1
+
+    const-class p2, Li0/a/a/c;
+
+    monitor-enter p2
+
+    :try_start_0
+    sget-object p1, Li0/a/a/c;->l:Lf/h/e/s0;
+
+    if-nez p1, :cond_0
+
+    new-instance p1, Lf/h/e/u$b;
+
+    sget-object p3, Li0/a/a/c;->k:Li0/a/a/c;
+
+    invoke-direct {p1, p3}, Lf/h/e/u$b;-><init>(Lf/h/e/u;)V
+
+    sput-object p1, Li0/a/a/c;->l:Lf/h/e/s0;
+
+    :cond_0
+    monitor-exit p2
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-object p1
+
+    :pswitch_1
+    sget-object p1, Li0/a/a/c;->k:Li0/a/a/c;
+
+    return-object p1
+
+    :pswitch_2
+    new-instance p1, Li0/a/a/c$a;
+
+    invoke-direct {p1, p3}, Li0/a/a/c$a;-><init>(Li0/a/a/a;)V
+
+    return-object p1
+
+    :pswitch_3
+    new-instance p1, Li0/a/a/c;
+
+    invoke-direct {p1}, Li0/a/a/c;-><init>()V
+
+    return-object p1
+
+    :pswitch_4
+    const/16 p1, 0xe
+
+    new-array p1, p1, [Ljava/lang/Object;
+
+    const/4 p3, 0x0
+
+    const-string v0, "experimentId_"
+
+    aput-object v0, p1, p3
+
+    const-string p3, "variantId_"
+
+    aput-object p3, p1, p2
+
+    const/4 p2, 0x2
+
+    const-string p3, "experimentStartTimeMillis_"
+
+    aput-object p3, p1, p2
+
+    const/4 p2, 0x3
+
+    const-string p3, "triggerEvent_"
+
+    aput-object p3, p1, p2
+
+    const/4 p2, 0x4
+
+    const-string p3, "triggerTimeoutMillis_"
+
+    aput-object p3, p1, p2
+
+    const/4 p2, 0x5
+
+    const-string p3, "timeToLiveMillis_"
+
+    aput-object p3, p1, p2
+
+    const/4 p2, 0x6
+
+    const-string p3, "setEventToLog_"
+
+    aput-object p3, p1, p2
+
+    const/4 p2, 0x7
+
+    const-string p3, "activateEventToLog_"
+
+    aput-object p3, p1, p2
+
+    const/16 p2, 0x8
+
+    const-string p3, "clearEventToLog_"
+
+    aput-object p3, p1, p2
+
+    const/16 p2, 0x9
+
+    const-string p3, "timeoutEventToLog_"
+
+    aput-object p3, p1, p2
+
+    const/16 p2, 0xa
+
+    const-string p3, "ttlExpiryEventToLog_"
+
+    aput-object p3, p1, p2
+
+    const/16 p2, 0xb
+
+    const-string p3, "overflowPolicy_"
+
+    aput-object p3, p1, p2
+
+    const/16 p2, 0xc
+
+    const-string p3, "ongoingExperiments_"
+
+    aput-object p3, p1, p2
+
+    const/16 p2, 0xd
+
+    const-class p3, Li0/a/a/b;
+
+    aput-object p3, p1, p2
+
+    const-string p2, "\u0000\r\u0000\u0000\u0001\r\r\u0000\u0001\u0000\u0001\u0208\u0002\u0208\u0003\u0002\u0004\u0208\u0005\u0002\u0006\u0002\u0007\u0208\u0008\u0208\t\u0208\n\u0208\u000b\u0208\u000c\u000c\r\u001b"
+
+    sget-object p3, Li0/a/a/c;->k:Li0/a/a/c;
+
+    new-instance v0, Lf/h/e/x0;
+
+    invoke-direct {v0, p3, p2, p1}, Lf/h/e/x0;-><init>(Lf/h/e/l0;Ljava/lang/String;[Ljava/lang/Object;)V
+
+    return-object v0
+
+    :pswitch_5
+    return-object p3
+
+    :pswitch_6
+    invoke-static {p2}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
+
+    move-result-object p1
+
+    return-object p1
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali_classes2/j0/a.smali b/com.discord/smali_classes2/j0/a.smali
deleted file mode 100644
index 1f0a4bd252..0000000000
--- a/com.discord/smali_classes2/j0/a.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lj0/a;
-.super Ljava/lang/Object;
-.source "Lazy.kt"
-
-# interfaces
-.implements Lkotlin/Lazy;
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/Lazy<",
-        "TT;>;",
-        "Ljava/io/Serializable;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final value:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/a;->value:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getValue()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/a;->value:Ljava/lang/Object;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lj0/a;->value:Ljava/lang/Object;
-
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/a/a.smali b/com.discord/smali_classes2/j0/a/a.smali
new file mode 100644
index 0000000000..43c4fde1e4
--- /dev/null
+++ b/com.discord/smali_classes2/j0/a/a.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Lj0/a/a;
+.super Ljava/lang/Object;
+.source "Provider.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract get()Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/j0/b.smali b/com.discord/smali_classes2/j0/b.smali
deleted file mode 100644
index ab49d47747..0000000000
--- a/com.discord/smali_classes2/j0/b.smali
+++ /dev/null
@@ -1,252 +0,0 @@
-.class public final Lj0/b;
-.super Ljava/lang/Object;
-.source "KotlinVersion.kt"
-
-# interfaces
-.implements Ljava/lang/Comparable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/lang/Comparable<",
-        "Lj0/b;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final h:Lj0/b;
-
-
-# instance fields
-.field public final d:I
-
-.field public final e:I
-
-.field public final f:I
-
-.field public final g:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    new-instance v0, Lj0/b;
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x3
-
-    const/16 v3, 0x48
-
-    invoke-direct {v0, v1, v2, v3}, Lj0/b;-><init>(III)V
-
-    sput-object v0, Lj0/b;->h:Lj0/b;
-
-    return-void
-.end method
-
-.method public constructor <init>(III)V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lj0/b;->e:I
-
-    iput p2, p0, Lj0/b;->f:I
-
-    iput p3, p0, Lj0/b;->g:I
-
-    if-gez p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v0, 0xff
-
-    if-lt v0, p1, :cond_3
-
-    if-gez p2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    if-lt v0, p2, :cond_3
-
-    if-gez p3, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    if-lt v0, p3, :cond_3
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    :goto_0
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_4
-
-    shl-int/lit8 p1, p1, 0x10
-
-    shl-int/lit8 p2, p2, 0x8
-
-    add-int/2addr p1, p2
-
-    add-int/2addr p1, p3
-
-    iput p1, p0, Lj0/b;->d:I
-
-    return-void
-
-    :cond_4
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Version components are out of range: "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2e
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-
-# virtual methods
-.method public compareTo(Ljava/lang/Object;)I
-    .locals 1
-
-    check-cast p1, Lj0/b;
-
-    if-eqz p1, :cond_0
-
-    iget v0, p0, Lj0/b;->d:I
-
-    iget p1, p1, Lj0/b;->d:I
-
-    sub-int/2addr v0, p1
-
-    return v0
-
-    :cond_0
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 3
-
-    const/4 v0, 0x1
-
-    if-ne p0, p1, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Lj0/b;
-
-    if-nez v1, :cond_1
-
-    const/4 p1, 0x0
-
-    :cond_1
-    check-cast p1, Lj0/b;
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_3
-
-    iget v2, p0, Lj0/b;->d:I
-
-    iget p1, p1, Lj0/b;->d:I
-
-    if-ne v2, p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-
-    :cond_3
-    return v1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget v0, p0, Lj0/b;->d:I
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget v1, p0, Lj0/b;->e:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x2e
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget v2, p0, Lj0/b;->f:I
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lj0/b;->g:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/c.smali b/com.discord/smali_classes2/j0/c.smali
deleted file mode 100644
index 95cb072e98..0000000000
--- a/com.discord/smali_classes2/j0/c.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Lj0/c;
-.super Ljava/lang/Error;
-.source "Standard.kt"
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0, p1}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/d$a.smali b/com.discord/smali_classes2/j0/d$a.smali
deleted file mode 100644
index 681421e542..0000000000
--- a/com.discord/smali_classes2/j0/d$a.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final Lj0/d$a;
-.super Ljava/lang/Object;
-.source "Result.kt"
-
-# interfaces
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final exception:Ljava/lang/Throwable;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Throwable;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/d$a;->exception:Ljava/lang/Throwable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Lj0/d$a;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lj0/d$a;->exception:Ljava/lang/Throwable;
-
-    check-cast p1, Lj0/d$a;
-
-    iget-object p1, p1, Lj0/d$a;->exception:Ljava/lang/Throwable;
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Lj0/d$a;->exception:Ljava/lang/Throwable;
-
-    invoke-virtual {v0}, Ljava/lang/Throwable;->hashCode()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "Failure("
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lj0/d$a;->exception:Ljava/lang/Throwable;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/d.smali b/com.discord/smali_classes2/j0/d.smali
deleted file mode 100644
index 60b64e5f8f..0000000000
--- a/com.discord/smali_classes2/j0/d.smali
+++ /dev/null
@@ -1,140 +0,0 @@
-.class public final Lj0/d;
-.super Ljava/lang/Object;
-.source "Result.kt"
-
-# interfaces
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/d$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/io/Serializable;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final value:Ljava/lang/Object;
-
-
-# direct methods
-.method public static final exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
-    .locals 1
-
-    instance-of v0, p0, Lj0/d$a;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Lj0/d$a;
-
-    iget-object p0, p0, Lj0/d$a;->exception:Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    iget-object v0, p0, Lj0/d;->value:Ljava/lang/Object;
-
-    instance-of v1, p1, Lj0/d;
-
-    if-eqz v1, :cond_0
-
-    check-cast p1, Lj0/d;
-
-    iget-object p1, p1, Lj0/d;->value:Ljava/lang/Object;
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Lj0/d;->value:Ljava/lang/Object;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    iget-object v0, p0, Lj0/d;->value:Ljava/lang/Object;
-
-    instance-of v1, v0, Lj0/d$a;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Success("
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x29
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/e.smali b/com.discord/smali_classes2/j0/e.smali
deleted file mode 100644
index e6841ee3fd..0000000000
--- a/com.discord/smali_classes2/j0/e.smali
+++ /dev/null
@@ -1,176 +0,0 @@
-.class public final Lj0/e;
-.super Ljava/lang/Object;
-.source "LazyJVM.kt"
-
-# interfaces
-.implements Lkotlin/Lazy;
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/Lazy<",
-        "TT;>;",
-        "Ljava/io/Serializable;"
-    }
-.end annotation
-
-
-# instance fields
-.field public volatile _value:Ljava/lang/Object;
-
-.field public initializer:Lkotlin/jvm/functions/Function0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function0<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final lock:Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function0;Ljava/lang/Object;I)V
-    .locals 0
-
-    and-int/lit8 p2, p3, 0x2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/e;->initializer:Lkotlin/jvm/functions/Function0;
-
-    sget-object p1, Lj0/f;->a:Lj0/f;
-
-    iput-object p1, p0, Lj0/e;->_value:Ljava/lang/Object;
-
-    iput-object p0, p0, Lj0/e;->lock:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method private final writeReplace()Ljava/lang/Object;
-    .locals 2
-
-    new-instance v0, Lj0/a;
-
-    invoke-virtual {p0}, Lj0/e;->getValue()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lj0/a;-><init>(Ljava/lang/Object;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public getValue()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/e;->_value:Ljava/lang/Object;
-
-    sget-object v1, Lj0/f;->a:Lj0/f;
-
-    if-eq v0, v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    iget-object v0, p0, Lj0/e;->lock:Ljava/lang/Object;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Lj0/e;->_value:Ljava/lang/Object;
-
-    sget-object v2, Lj0/f;->a:Lj0/f;
-
-    if-eq v1, v2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v1, p0, Lj0/e;->initializer:Lkotlin/jvm/functions/Function0;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lj0/e;->_value:Ljava/lang/Object;
-
-    iput-object v2, p0, Lj0/e;->initializer:Lkotlin/jvm/functions/Function0;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :goto_0
-    monitor-exit v0
-
-    return-object v1
-
-    :cond_2
-    :try_start_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v2
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lj0/e;->_value:Ljava/lang/Object;
-
-    sget-object v1, Lj0/f;->a:Lj0/f;
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Lj0/e;->getValue()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_1
-
-    :cond_1
-    const-string v0, "Lazy value not initialized yet."
-
-    :goto_1
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/f.smali b/com.discord/smali_classes2/j0/f.smali
deleted file mode 100644
index f87feb7404..0000000000
--- a/com.discord/smali_classes2/j0/f.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lj0/f;
-.super Ljava/lang/Object;
-.source "Lazy.kt"
-
-
-# static fields
-.field public static final a:Lj0/f;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/f;
-
-    invoke-direct {v0}, Lj0/f;-><init>()V
-
-    sput-object v0, Lj0/f;->a:Lj0/f;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/g.smali b/com.discord/smali_classes2/j0/g.smali
deleted file mode 100644
index 367821fdda..0000000000
--- a/com.discord/smali_classes2/j0/g.smali
+++ /dev/null
@@ -1,151 +0,0 @@
-.class public final Lj0/g;
-.super Ljava/lang/Object;
-.source "Lazy.kt"
-
-# interfaces
-.implements Lkotlin/Lazy;
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/Lazy<",
-        "TT;>;",
-        "Ljava/io/Serializable;"
-    }
-.end annotation
-
-
-# instance fields
-.field public _value:Ljava/lang/Object;
-
-.field public initializer:Lkotlin/jvm/functions/Function0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function0<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function0<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/g;->initializer:Lkotlin/jvm/functions/Function0;
-
-    sget-object p1, Lj0/f;->a:Lj0/f;
-
-    iput-object p1, p0, Lj0/g;->_value:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method private final writeReplace()Ljava/lang/Object;
-    .locals 2
-
-    new-instance v0, Lj0/a;
-
-    invoke-virtual {p0}, Lj0/g;->getValue()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lj0/a;-><init>(Ljava/lang/Object;)V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public getValue()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/g;->_value:Ljava/lang/Object;
-
-    sget-object v1, Lj0/f;->a:Lj0/f;
-
-    if-ne v0, v1, :cond_1
-
-    iget-object v0, p0, Lj0/g;->initializer:Lkotlin/jvm/functions/Function0;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lj0/g;->_value:Ljava/lang/Object;
-
-    iput-object v1, p0, Lj0/g;->initializer:Lkotlin/jvm/functions/Function0;
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lj0/g;->_value:Ljava/lang/Object;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lj0/g;->_value:Ljava/lang/Object;
-
-    sget-object v1, Lj0/f;->a:Lj0/f;
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Lj0/g;->getValue()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_1
-
-    :cond_1
-    const-string v0, "Lazy value not initialized yet."
-
-    :goto_1
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/h.smali b/com.discord/smali_classes2/j0/h.smali
deleted file mode 100644
index 699386c5c1..0000000000
--- a/com.discord/smali_classes2/j0/h.smali
+++ /dev/null
@@ -1,31 +0,0 @@
-.class public final Lj0/h;
-.super Ljava/lang/Object;
-.source "AssertionsJVM.kt"
-
-
-# static fields
-.field public static final a:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const-class v0, Lj0/h;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->desiredAssertionStatus()Z
-
-    move-result v0
-
-    sput-boolean v0, Lj0/h;->a:Z
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/i/a$a.smali b/com.discord/smali_classes2/j0/i/a$a.smali
deleted file mode 100644
index 880e154598..0000000000
--- a/com.discord/smali_classes2/j0/i/a$a.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lj0/i/a$a;
-.super Lj0/n/c/i;
-.source "AbstractCollection.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/i/a;->toString()Ljava/lang/String;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TE;",
-        "Ljava/lang/CharSequence;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Lj0/i/a;
-
-
-# direct methods
-.method public constructor <init>(Lj0/i/a;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/i/a$a;->this$0:Lj0/i/a;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/a$a;->this$0:Lj0/i/a;
-
-    if-ne p1, v0, :cond_0
-
-    const-string p1, "(this Collection)"
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    :goto_0
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/i/a.smali b/com.discord/smali_classes2/j0/i/a.smali
deleted file mode 100644
index 35dd3b4fc4..0000000000
--- a/com.discord/smali_classes2/j0/i/a.smali
+++ /dev/null
@@ -1,338 +0,0 @@
-.class public abstract Lj0/i/a;
-.super Ljava/lang/Object;
-.source "AbstractCollection.kt"
-
-# interfaces
-.implements Ljava/util/Collection;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Collection<",
-        "TE;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public add(Ljava/lang/Object;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public addAll(Ljava/util/Collection;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+TE;>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public clear()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public contains(Ljava/lang/Object;)Z
-    .locals 3
-
-    invoke-interface {p0}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    const/4 v1, 0x1
-
-    :cond_2
-    :goto_0
-    return v1
-.end method
-
-.method public containsAll(Ljava/util/Collection;)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Ljava/lang/Object;",
-            ">;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_1
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Lj0/i/a;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    const/4 v1, 0x0
-
-    :cond_2
-    :goto_0
-    return v1
-
-    :cond_3
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public abstract getSize()I
-.end method
-
-.method public isEmpty()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/i/a;->getSize()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public remove(Ljava/lang/Object;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public removeAll(Ljava/util/Collection;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Ljava/lang/Object;",
-            ">;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public retainAll(Ljava/util/Collection;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Ljava/lang/Object;",
-            ">;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final bridge size()I
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/i/a;->getSize()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public toArray()[Ljava/lang/Object;
-    .locals 1
-
-    invoke-static {p0}, Lj0/n/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)[TT;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lj0/n/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "array"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 8
-
-    new-instance v6, Lj0/i/a$a;
-
-    invoke-direct {v6, p0}, Lj0/i/a$a;-><init>(Lj0/i/a;)V
-
-    const-string v1, ", "
-
-    const-string v2, "["
-
-    const-string v3, "]"
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/16 v7, 0x18
-
-    move-object v0, p0
-
-    invoke-static/range {v0 .. v7}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/b.smali b/com.discord/smali_classes2/j0/i/b.smali
deleted file mode 100644
index 6e563e18e3..0000000000
--- a/com.discord/smali_classes2/j0/i/b.smali
+++ /dev/null
@@ -1,162 +0,0 @@
-.class public abstract Lj0/i/b;
-.super Ljava/lang/Object;
-.source "AbstractIterator.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Lj0/i/u;
-
-.field public e:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lj0/i/u;->e:Lj0/i/u;
-
-    iput-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a()V
-.end method
-
-.method public hasNext()Z
-    .locals 5
-
-    sget-object v0, Lj0/i/u;->g:Lj0/i/u;
-
-    iget-object v1, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-eq v1, v0, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_3
-
-    iget-object v1, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    const/4 v4, 0x2
-
-    if-eq v1, v4, :cond_1
-
-    iput-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    invoke-virtual {p0}, Lj0/i/b;->a()V
-
-    iget-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    sget-object v1, Lj0/i/u;->d:Lj0/i/u;
-
-    if-ne v0, v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :cond_2
-    :goto_1
-    return v2
-
-    :cond_3
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "Failed requirement."
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/i/b;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object v0, Lj0/i/u;->e:Lj0/i/u;
-
-    iput-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    iget-object v0, p0, Lj0/i/b;->e:Ljava/lang/Object;
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/c$a.smali b/com.discord/smali_classes2/j0/i/c$a.smali
deleted file mode 100644
index 1a87abec58..0000000000
--- a/com.discord/smali_classes2/j0/i/c$a.smali
+++ /dev/null
@@ -1,124 +0,0 @@
-.class public Lj0/i/c$a;
-.super Ljava/lang/Object;
-.source "AbstractList.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/i/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TE;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public final synthetic e:Lj0/i/c;
-
-
-# direct methods
-.method public constructor <init>(Lj0/i/c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/i/c$a;->e:Lj0/i/c;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public hasNext()Z
-    .locals 2
-
-    iget v0, p0, Lj0/i/c$a;->d:I
-
-    iget-object v1, p0, Lj0/i/c$a;->e:Lj0/i/c;
-
-    invoke-virtual {v1}, Lj0/i/a;->getSize()I
-
-    move-result v1
-
-    if-ge v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/i/c$a;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lj0/i/c$a;->e:Lj0/i/c;
-
-    iget v1, p0, Lj0/i/c$a;->d:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lj0/i/c$a;->d:I
-
-    invoke-virtual {v0, v1}, Lj0/i/c;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/c$b.smali b/com.discord/smali_classes2/j0/i/c$b.smali
deleted file mode 100644
index d449cbb6de..0000000000
--- a/com.discord/smali_classes2/j0/i/c$b.smali
+++ /dev/null
@@ -1,182 +0,0 @@
-.class public Lj0/i/c$b;
-.super Lj0/i/c$a;
-.source "AbstractList.kt"
-
-# interfaces
-.implements Ljava/util/ListIterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/i/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/i/c<",
-        "TE;>.a;",
-        "Ljava/util/ListIterator<",
-        "TE;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic f:Lj0/i/c;
-
-
-# direct methods
-.method public constructor <init>(Lj0/i/c;I)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/i/c$b;->f:Lj0/i/c;
-
-    invoke-direct {p0, p1}, Lj0/i/c$a;-><init>(Lj0/i/c;)V
-
-    invoke-virtual {p1}, Lj0/i/a;->getSize()I
-
-    move-result p1
-
-    if-ltz p2, :cond_0
-
-    if-gt p2, p1, :cond_0
-
-    iput p2, p0, Lj0/i/c$a;->d:I
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v1, "index: "
-
-    const-string v2, ", size: "
-
-    invoke-static {v1, p2, v2, p1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public add(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)V"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public hasPrevious()Z
-    .locals 1
-
-    iget v0, p0, Lj0/i/c$a;->d:I
-
-    if-lez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public nextIndex()I
-    .locals 1
-
-    iget v0, p0, Lj0/i/c$a;->d:I
-
-    return v0
-.end method
-
-.method public previous()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/i/c$b;->hasPrevious()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lj0/i/c$b;->f:Lj0/i/c;
-
-    iget v1, p0, Lj0/i/c$a;->d:I
-
-    add-int/lit8 v1, v1, -0x1
-
-    iput v1, p0, Lj0/i/c$a;->d:I
-
-    invoke-virtual {v0, v1}, Lj0/i/c;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public previousIndex()I
-    .locals 1
-
-    iget v0, p0, Lj0/i/c$a;->d:I
-
-    add-int/lit8 v0, v0, -0x1
-
-    return v0
-.end method
-
-.method public set(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)V"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/i/c$c.smali b/com.discord/smali_classes2/j0/i/c$c.smali
deleted file mode 100644
index 2b56dc79a2..0000000000
--- a/com.discord/smali_classes2/j0/i/c$c.smali
+++ /dev/null
@@ -1,168 +0,0 @@
-.class public final Lj0/i/c$c;
-.super Lj0/i/c;
-.source "AbstractList.kt"
-
-# interfaces
-.implements Ljava/util/RandomAccess;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/i/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lj0/i/c<",
-        "TE;>;",
-        "Ljava/util/RandomAccess;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public final e:Lj0/i/c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lj0/i/c<",
-            "TE;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:I
-
-
-# direct methods
-.method public constructor <init>(Lj0/i/c;II)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lj0/i/c<",
-            "+TE;>;II)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lj0/i/c;-><init>()V
-
-    iput-object p1, p0, Lj0/i/c$c;->e:Lj0/i/c;
-
-    iput p2, p0, Lj0/i/c$c;->f:I
-
-    invoke-virtual {p1}, Lj0/i/a;->getSize()I
-
-    move-result p1
-
-    const-string v0, "fromIndex: "
-
-    if-ltz p2, :cond_1
-
-    if-gt p3, p1, :cond_1
-
-    if-gt p2, p3, :cond_0
-
-    iget p1, p0, Lj0/i/c$c;->f:I
-
-    sub-int/2addr p3, p1
-
-    iput p3, p0, Lj0/i/c$c;->d:I
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, " > toIndex: "
-
-    invoke-static {v0, p2, v1, p3}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    new-instance v1, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v2, ", toIndex: "
-
-    const-string v3, ", size: "
-
-    invoke-static {v0, p2, v2, p3, v3}, Lf/e/b/a/a;->F(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v1, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-
-# virtual methods
-.method public get(I)Ljava/lang/Object;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)TE;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/i/c$c;->d:I
-
-    if-ltz p1, :cond_0
-
-    if-ge p1, v0, :cond_0
-
-    iget-object v0, p0, Lj0/i/c$c;->e:Lj0/i/c;
-
-    iget v1, p0, Lj0/i/c$c;->f:I
-
-    add-int/2addr v1, p1
-
-    invoke-virtual {v0, v1}, Lj0/i/c;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance v1, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v2, "index: "
-
-    const-string v3, ", size: "
-
-    invoke-static {v2, p1, v3, v0}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v1, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public getSize()I
-    .locals 1
-
-    iget v0, p0, Lj0/i/c$c;->d:I
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/c.smali b/com.discord/smali_classes2/j0/i/c.smali
deleted file mode 100644
index eb5b6dc3f2..0000000000
--- a/com.discord/smali_classes2/j0/i/c.smali
+++ /dev/null
@@ -1,399 +0,0 @@
-.class public abstract Lj0/i/c;
-.super Lj0/i/a;
-.source "AbstractList.kt"
-
-# interfaces
-.implements Ljava/util/List;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/i/c$c;,
-        Lj0/i/c$a;,
-        Lj0/i/c$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lj0/i/a<",
-        "TE;>;",
-        "Ljava/util/List<",
-        "TE;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/i/a;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public add(ILjava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ITE;)V"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public addAll(ILjava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I",
-            "Ljava/util/Collection<",
-            "+TE;>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 5
-
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Ljava/util/List;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p1, Ljava/util/Collection;
-
-    if-eqz p1, :cond_5
-
-    invoke-interface {p0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    invoke-interface {p1}, Ljava/util/Collection;->size()I
-
-    move-result v3
-
-    if-eq v1, v3, :cond_2
-
-    :goto_0
-    const/4 v0, 0x0
-
-    goto :goto_1
-
-    :cond_2
-    invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_3
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_4
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    xor-int/2addr v3, v0
-
-    if-eqz v3, :cond_3
-
-    goto :goto_0
-
-    :cond_4
-    :goto_1
-    return v0
-
-    :cond_5
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public abstract get(I)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)TE;"
-        }
-    .end annotation
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    const/4 v0, 0x1
-
-    invoke-interface {p0}, Ljava/util/Collection;->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_1
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_1
-    add-int/2addr v0, v2
-
-    goto :goto_0
-
-    :cond_1
-    return v0
-.end method
-
-.method public indexOf(Ljava/lang/Object;)I
-    .locals 3
-
-    invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, -0x1
-
-    :goto_1
-    return v1
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/i/c$a;
-
-    invoke-direct {v0, p0}, Lj0/i/c$a;-><init>(Lj0/i/c;)V
-
-    return-object v0
-.end method
-
-.method public lastIndexOf(Ljava/lang/Object;)I
-    .locals 2
-
-    invoke-interface {p0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->listIterator(I)Ljava/util/ListIterator;
-
-    move-result-object v0
-
-    :cond_0
-    invoke-interface {v0}, Ljava/util/ListIterator;->hasPrevious()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {v0}, Ljava/util/ListIterator;->previous()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0}, Ljava/util/ListIterator;->nextIndex()I
-
-    move-result p1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, -0x1
-
-    :goto_0
-    return p1
-.end method
-
-.method public listIterator()Ljava/util/ListIterator;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/ListIterator<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/i/c$b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, p0, v1}, Lj0/i/c$b;-><init>(Lj0/i/c;I)V
-
-    return-object v0
-.end method
-
-.method public listIterator(I)Ljava/util/ListIterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Ljava/util/ListIterator<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/i/c$b;
-
-    invoke-direct {v0, p0, p1}, Lj0/i/c$b;-><init>(Lj0/i/c;I)V
-
-    return-object v0
-.end method
-
-.method public remove(I)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)TE;"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public set(ILjava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ITE;)TE;"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public subList(II)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(II)",
-            "Ljava/util/List<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/i/c$c;
-
-    invoke-direct {v0, p0, p1, p2}, Lj0/i/c$c;-><init>(Lj0/i/c;II)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/d.smali b/com.discord/smali_classes2/j0/i/d.smali
deleted file mode 100644
index 61b2e7cafd..0000000000
--- a/com.discord/smali_classes2/j0/i/d.smali
+++ /dev/null
@@ -1,345 +0,0 @@
-.class public final Lj0/i/d;
-.super Ljava/lang/Object;
-.source "Collections.kt"
-
-# interfaces
-.implements Ljava/util/Collection;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Collection<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TT;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Z
-
-
-# direct methods
-.method public constructor <init>([Ljava/lang/Object;Z)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TT;Z)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/i/d;->d:[Ljava/lang/Object;
-
-    iput-boolean p2, p0, Lj0/i/d;->e:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public add(Ljava/lang/Object;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public addAll(Ljava/util/Collection;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+TT;>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public clear()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public contains(Ljava/lang/Object;)Z
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/d;->d:[Ljava/lang/Object;
-
-    invoke-static {v0, p1}, Lf/n/a/k/a;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public containsAll(Ljava/util/Collection;)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Ljava/lang/Object;",
-            ">;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_1
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Lj0/i/d;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    const/4 v1, 0x0
-
-    :cond_2
-    :goto_0
-    return v1
-
-    :cond_3
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public isEmpty()Z
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/d;->d:[Ljava/lang/Object;
-
-    array-length v0, v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/i/d;->d:[Ljava/lang/Object;
-
-    invoke-static {v0}, Lf/n/a/k/a;->iterator([Ljava/lang/Object;)Ljava/util/Iterator;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public remove(Ljava/lang/Object;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public removeAll(Ljava/util/Collection;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Ljava/lang/Object;",
-            ">;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public retainAll(Ljava/util/Collection;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+",
-            "Ljava/lang/Object;",
-            ">;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final size()I
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/d;->d:[Ljava/lang/Object;
-
-    array-length v0, v0
-
-    return v0
-.end method
-
-.method public final toArray()[Ljava/lang/Object;
-    .locals 3
-
-    iget-object v0, p0, Lj0/i/d;->d:[Ljava/lang/Object;
-
-    iget-boolean v1, p0, Lj0/i/d;->e:Z
-
-    const-class v2, [Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    array-length v1, v0
-
-    invoke-static {v0, v1, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;ILjava/lang/Class;)[Ljava/lang/Object;
-
-    move-result-object v0
-
-    const-string v1, "java.util.Arrays.copyOf(\u2026 Array<Any?>::class.java)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_0
-    return-object v0
-
-    :cond_1
-    const-string v0, "$this$copyToArrayOfAny"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)[TT;"
-        }
-    .end annotation
-
-    invoke-static {p0, p1}, Lj0/n/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/i/e.smali b/com.discord/smali_classes2/j0/i/e.smali
deleted file mode 100644
index 9c6cfd7997..0000000000
--- a/com.discord/smali_classes2/j0/i/e.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Lj0/i/e;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:[Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>([Ljava/lang/Object;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/i/e;->a:[Ljava/lang/Object;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/i/e;->a:[Ljava/lang/Object;
-
-    invoke-static {v0}, Lf/n/a/k/a;->iterator([Ljava/lang/Object;)Ljava/util/Iterator;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/f.smali b/com.discord/smali_classes2/j0/i/f.smali
deleted file mode 100644
index 0aa2faeab4..0000000000
--- a/com.discord/smali_classes2/j0/i/f.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public abstract Lj0/i/f;
-.super Ljava/lang/Object;
-.source "Iterators.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "Ljava/lang/Boolean;",
-        ">;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final next()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/i/f;->nextBoolean()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public bridge synthetic next()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/i/f;->next()Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public abstract nextBoolean()Z
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/g.smali b/com.discord/smali_classes2/j0/i/g.smali
deleted file mode 100644
index 1170bc9221..0000000000
--- a/com.discord/smali_classes2/j0/i/g.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public Lj0/i/g;
-.super Ljava/lang/Object;
-.source "Collections.kt"
diff --git a/com.discord/smali_classes2/j0/i/h.smali b/com.discord/smali_classes2/j0/i/h.smali
deleted file mode 100644
index 8ced147104..0000000000
--- a/com.discord/smali_classes2/j0/i/h.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public Lj0/i/h;
-.super Lj0/i/g;
-.source "IteratorsJVM.kt"
diff --git a/com.discord/smali_classes2/j0/i/i.smali b/com.discord/smali_classes2/j0/i/i.smali
deleted file mode 100644
index 91b51335b2..0000000000
--- a/com.discord/smali_classes2/j0/i/i.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public Lj0/i/i;
-.super Lj0/i/h;
-.source "MutableCollectionsJVM.kt"
diff --git a/com.discord/smali_classes2/j0/i/j.smali b/com.discord/smali_classes2/j0/i/j.smali
deleted file mode 100644
index 4f75d4d7e6..0000000000
--- a/com.discord/smali_classes2/j0/i/j.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public Lj0/i/j;
-.super Lj0/i/i;
-.source "ReversedViews.kt"
diff --git a/com.discord/smali_classes2/j0/i/k.smali b/com.discord/smali_classes2/j0/i/k.smali
deleted file mode 100644
index a1bf541a48..0000000000
--- a/com.discord/smali_classes2/j0/i/k.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public Lj0/i/k;
-.super Lj0/i/j;
-.source "_CollectionsJvm.kt"
diff --git a/com.discord/smali_classes2/j0/i/l$a.smali b/com.discord/smali_classes2/j0/i/l$a.smali
deleted file mode 100644
index b01b7e804d..0000000000
--- a/com.discord/smali_classes2/j0/i/l$a.smali
+++ /dev/null
@@ -1,62 +0,0 @@
-.class public final Lj0/i/l$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Ljava/lang/Iterable;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Iterable;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/i/l$a;->a:Ljava/lang/Iterable;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/i/l$a;->a:Ljava/lang/Iterable;
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/l$b.smali b/com.discord/smali_classes2/j0/i/l$b.smali
deleted file mode 100644
index af555c28c2..0000000000
--- a/com.discord/smali_classes2/j0/i/l$b.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Lj0/i/l$b;
-.super Lj0/n/c/i;
-.source "_Collections.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/i/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic $index:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    iput p1, p0, Lj0/i/l$b;->$index:I
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
-
-    new-instance p1, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v0, "Collection doesn\'t contain element at index "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget v1, p0, Lj0/i/l$b;->$index:I
-
-    const/16 v2, 0x2e
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/i/l.smali b/com.discord/smali_classes2/j0/i/l.smali
deleted file mode 100644
index a300c8d1ad..0000000000
--- a/com.discord/smali_classes2/j0/i/l.smali
+++ /dev/null
@@ -1,3029 +0,0 @@
-.class public Lj0/i/l;
-.super Lj0/i/k;
-.source "_Collections.kt"
-
-
-# direct methods
-.method public static final asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Lj0/i/l$a;
-
-    invoke-direct {v0, p0}, Lj0/i/l$a;-><init>(Ljava/lang/Iterable;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$asSequence"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;TT;)Z"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_2
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/util/Collection;
-
-    invoke-interface {p0, p1}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    invoke-static {p0, p1}, Lj0/i/l;->indexOf(Ljava/lang/Iterable;Ljava/lang/Object;)I
-
-    move-result p0
-
-    if-ltz p0, :cond_1
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-
-    :cond_2
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final distinct(Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    invoke-static {p0}, Lj0/i/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final drop(Ljava/lang/Iterable;I)Ljava/util/List;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;I)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_b
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-ltz p1, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_a
-
-    if-nez p1, :cond_1
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    instance-of v2, p0, Ljava/util/Collection;
-
-    if-eqz v2, :cond_6
-
-    move-object v2, p0
-
-    check-cast v2, Ljava/util/Collection;
-
-    invoke-interface {v2}, Ljava/util/Collection;->size()I
-
-    move-result v3
-
-    sub-int/2addr v3, p1
-
-    if-gtz v3, :cond_2
-
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object p0
-
-    :cond_2
-    if-ne v3, v1, :cond_3
-
-    invoke-static {p0}, Lj0/i/l;->last(Ljava/lang/Iterable;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_3
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1, v3}, Ljava/util/ArrayList;-><init>(I)V
-
-    instance-of v3, p0, Ljava/util/List;
-
-    if-eqz v3, :cond_7
-
-    instance-of v0, p0, Ljava/util/RandomAccess;
-
-    if-eqz v0, :cond_4
-
-    invoke-interface {v2}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    :goto_1
-    if-ge p1, v0, :cond_5
-
-    move-object v2, p0
-
-    check-cast v2, Ljava/util/List;
-
-    invoke-interface {v2, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    check-cast p0, Ljava/util/List;
-
-    invoke-interface {p0, p1}, Ljava/util/List;->listIterator(I)Ljava/util/ListIterator;
-
-    move-result-object p0
-
-    :goto_2
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_5
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_5
-    return-object v1
-
-    :cond_6
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    :cond_7
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_3
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_9
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-lt v0, p1, :cond_8
-
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_3
-
-    :cond_8
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_3
-
-    :cond_9
-    invoke-static {v1}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_a
-    const-string p0, "Requested element count "
-
-    const-string v0, " is less than zero."
-
-    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_b
-    const-string p0, "$this$drop"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;I)TT;"
-        }
-    .end annotation
-
-    instance-of v0, p0, Ljava/util/List;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/util/List;
-
-    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    new-instance v1, Lj0/i/l$b;
-
-    invoke-direct {v1, p1}, Lj0/i/l$b;-><init>(I)V
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_2
-
-    check-cast p0, Ljava/util/List;
-
-    if-ltz p1, :cond_1
-
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v0
-
-    if-gt p1, v0, :cond_1
-
-    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    invoke-virtual {v1, p0}, Lj0/i/l$b;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    throw v2
-
-    :cond_2
-    if-ltz p1, :cond_5
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_4
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    add-int/lit8 v4, v0, 0x1
-
-    if-ne p1, v0, :cond_3
-
-    move-object p0, v3
-
-    :goto_1
-    return-object p0
-
-    :cond_3
-    move v0, v4
-
-    goto :goto_0
-
-    :cond_4
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    invoke-virtual {v1, p0}, Lj0/i/l$b;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    throw v2
-
-    :cond_5
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    invoke-virtual {v1, p0}, Lj0/i/l$b;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    throw v2
-.end method
-
-.method public static final filterNotNull(Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_2
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :cond_0
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_1
-    return-object v0
-
-    :cond_2
-    const-string p0, "$this$filterNotNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final first(Ljava/lang/Iterable;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_2
-
-    instance-of v0, p0, Ljava/util/List;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/util/List;
-
-    invoke-static {p0}, Lj0/i/l;->first(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    new-instance p0, Ljava/util/NoSuchElementException;
-
-    const-string v0, "Collection is empty."
-
-    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_2
-    const-string p0, "$this$first"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final first(Ljava/util/List;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Ljava/util/NoSuchElementException;
-
-    const-string v0, "List is empty."
-
-    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    const-string p0, "$this$first"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final firstOrNull(Ljava/lang/Iterable;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_3
-
-    instance-of v1, p0, Ljava/util/List;
-
-    if-eqz v1, :cond_1
-
-    check-cast p0, Ljava/util/List;
-
-    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    return-object v0
-
-    :cond_2
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_3
-    const-string p0, "$this$firstOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final firstOrNull(Ljava/util/List;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$firstOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final getOrNull(Ljava/util/List;I)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;I)TT;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-ltz p1, :cond_0
-
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v1
-
-    if-gt p1, v1, :cond_0
-
-    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :cond_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$getOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final indexOf(Ljava/lang/Iterable;Ljava/lang/Object;)I
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;TT;)I"
-        }
-    .end annotation
-
-    instance-of v0, p0, Ljava/util/List;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/util/List;
-
-    invoke-interface {p0, p1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-ltz v0, :cond_2
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    return v0
-
-    :cond_1
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
-
-    const/4 p0, 0x0
-
-    throw p0
-
-    :cond_3
-    const/4 p0, -0x1
-
-    return p0
-.end method
-
-.method public static final joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            "A::",
-            "Ljava/lang/Appendable;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;TA;",
-            "Ljava/lang/CharSequence;",
-            "Ljava/lang/CharSequence;",
-            "Ljava/lang/CharSequence;",
-            "I",
-            "Ljava/lang/CharSequence;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+",
-            "Ljava/lang/CharSequence;",
-            ">;)TA;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_9
-
-    if-eqz p1, :cond_8
-
-    if-eqz p2, :cond_7
-
-    if-eqz p3, :cond_6
-
-    if-eqz p4, :cond_5
-
-    if-eqz p6, :cond_4
-
-    invoke-interface {p1, p3}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
-
-    const/4 p3, 0x0
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    add-int/lit8 p3, p3, 0x1
-
-    const/4 v1, 0x1
-
-    if-le p3, v1, :cond_0
-
-    invoke-interface {p1, p2}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
-
-    :cond_0
-    if-ltz p5, :cond_1
-
-    if-gt p3, p5, :cond_2
-
-    :cond_1
-    invoke-static {p1, v0, p7}, Lj0/t/f;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
-
-    goto :goto_0
-
-    :cond_2
-    if-ltz p5, :cond_3
-
-    if-le p3, p5, :cond_3
-
-    invoke-interface {p1, p6}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
-
-    :cond_3
-    invoke-interface {p1, p4}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
-
-    return-object p1
-
-    :cond_4
-    const-string p0, "truncated"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "postfix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "prefix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "separator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p0, "buffer"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p0, "$this$joinTo"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/Appendable;
-    .locals 9
-
-    and-int/lit8 v0, p8, 0x2
-
-    if-eqz v0, :cond_0
-
-    const-string v0, ", "
-
-    move-object v3, v0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v3, p2
-
-    :goto_0
-    and-int/lit8 v0, p8, 0x4
-
-    const-string v1, ""
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_1
-
-    move-object v4, v1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v4, v2
-
-    :goto_1
-    and-int/lit8 v0, p8, 0x8
-
-    if-eqz v0, :cond_2
-
-    move-object v5, v1
-
-    goto :goto_2
-
-    :cond_2
-    move-object v5, v2
-
-    :goto_2
-    and-int/lit8 v0, p8, 0x10
-
-    if-eqz v0, :cond_3
-
-    const/4 v0, -0x1
-
-    const/4 v6, -0x1
-
-    goto :goto_3
-
-    :cond_3
-    move v6, p5
-
-    :goto_3
-    and-int/lit8 v0, p8, 0x20
-
-    if-eqz v0, :cond_4
-
-    const-string v0, "..."
-
-    move-object v7, v0
-
-    goto :goto_4
-
-    :cond_4
-    move-object v7, v2
-
-    :goto_4
-    and-int/lit8 v0, p8, 0x40
-
-    const/4 v8, 0x0
-
-    move-object v1, p0
-
-    move-object v2, p1
-
-    invoke-static/range {v1 .. v8}, Lj0/i/l;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
-
-    return-object p1
-.end method
-
-.method public static joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-    .locals 8
-
-    and-int/lit8 p5, p7, 0x1
-
-    if-eqz p5, :cond_0
-
-    const-string p1, ", "
-
-    :cond_0
-    move-object v2, p1
-
-    and-int/lit8 p1, p7, 0x2
-
-    const-string p5, ""
-
-    if-eqz p1, :cond_1
-
-    move-object v3, p5
-
-    goto :goto_0
-
-    :cond_1
-    move-object v3, p2
-
-    :goto_0
-    and-int/lit8 p1, p7, 0x4
-
-    if-eqz p1, :cond_2
-
-    move-object v4, p5
-
-    goto :goto_1
-
-    :cond_2
-    move-object v4, p3
-
-    :goto_1
-    and-int/lit8 p1, p7, 0x8
-
-    if-eqz p1, :cond_3
-
-    const/4 p4, -0x1
-
-    const/4 v5, -0x1
-
-    goto :goto_2
-
-    :cond_3
-    move v5, p4
-
-    :goto_2
-    and-int/lit8 p1, p7, 0x10
-
-    const/4 p2, 0x0
-
-    if-eqz p1, :cond_4
-
-    const-string p1, "..."
-
-    move-object v6, p1
-
-    goto :goto_3
-
-    :cond_4
-    move-object v6, p2
-
-    :goto_3
-    and-int/lit8 p1, p7, 0x20
-
-    if-eqz p1, :cond_5
-
-    move-object v7, p2
-
-    goto :goto_4
-
-    :cond_5
-    move-object v7, p6
-
-    :goto_4
-    if-eqz p0, :cond_a
-
-    if-eqz v2, :cond_9
-
-    if-eqz v3, :cond_8
-
-    if-eqz v4, :cond_7
-
-    if-eqz v6, :cond_6
-
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    move-object v0, p0
-
-    move-object v1, p1
-
-    invoke-static/range {v0 .. v7}, Lj0/i/l;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "joinTo(StringBuilder(), \u2026ed, transform).toString()"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_6
-    const-string p0, "truncated"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_7
-    const-string p0, "postfix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_8
-    const-string p0, "prefix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_9
-    const-string p0, "separator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_a
-    const-string p0, "$this$joinToString"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public static final last(Ljava/lang/Iterable;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_3
-
-    instance-of v0, p0, Ljava/util/List;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/util/List;
-
-    invoke-static {p0}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_1
-    return-object v0
-
-    :cond_2
-    new-instance p0, Ljava/util/NoSuchElementException;
-
-    const-string v0, "Collection is empty."
-
-    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_3
-    const-string p0, "$this$last"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final last(Ljava/util/List;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Ljava/util/NoSuchElementException;
-
-    const-string v0, "List is empty."
-
-    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    const-string p0, "$this$last"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final lastOrNull(Ljava/util/List;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, -0x1
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$lastOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final max(Ljava/lang/Iterable;)Ljava/lang/Comparable;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T::",
-            "Ljava/lang/Comparable<",
-            "-TT;>;>(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)TT;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_3
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Comparable;
-
-    :cond_1
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Comparable;
-
-    invoke-interface {v0, v1}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
-
-    move-result v2
-
-    if-gez v2, :cond_1
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :cond_2
-    return-object v0
-
-    :cond_3
-    const-string p0, "$this$max"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final max(Ljava/lang/Iterable;)Ljava/lang/Float;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Iterable<",
-            "Ljava/lang/Float;",
-            ">;)",
-            "Ljava/lang/Float;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_4
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->floatValue()F
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Float;->isNaN(F)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Number;
-
-    invoke-virtual {v1}, Ljava/lang/Number;->floatValue()F
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    invoke-static {v1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    cmpg-float v2, v0, v1
-
-    if-gez v2, :cond_1
-
-    move v0, v1
-
-    goto :goto_0
-
-    :cond_3
-    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_4
-    const-string p0, "$this$max"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    invoke-static {p1, p0}, Lf/n/a/k/a;->convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
-
-    move-result-object p1
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :cond_1
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-interface {p1, v1}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    return-object v0
-
-    :cond_3
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;TT;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    const/16 v1, 0xa
-
-    invoke-static {p0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :cond_0
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    const/4 v4, 0x1
-
-    if-nez v2, :cond_1
-
-    invoke-static {v3, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    const/4 v2, 0x1
-
-    const/4 v4, 0x0
-
-    :cond_1
-    if-eqz v4, :cond_0
-
-    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    return-object v0
-.end method
-
-.method public static final plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "+TT;>;",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    instance-of v0, p1, Ljava/util/Collection;
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-interface {p0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    check-cast p1, Ljava/util/Collection;
-
-    invoke-interface {p1}, Ljava/util/Collection;->size()I
-
-    move-result v2
-
-    add-int/2addr v2, v1
-
-    invoke-direct {v0, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
-
-    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0, p0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    invoke-static {v0, p1}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-
-    return-object v0
-
-    :cond_1
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "+TT;>;TT;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-interface {p0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0x1
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
-
-    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$plus"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final reversed(Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_0
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-gt v0, v1, :cond_0
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    invoke-static {p0}, Lj0/i/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
-
-    return-object p0
-
-    :cond_1
-    const-string p0, "$this$reversed"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final slice(Ljava/util/List;Lkotlin/ranges/IntRange;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;",
-            "Lkotlin/ranges/IntRange;",
-            ")",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object p0
-
-    :cond_0
-    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getStart()Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getEndInclusive()Ljava/lang/Integer;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    add-int/lit8 p1, p1, 0x1
-
-    invoke-interface {p0, v0, p1}, Ljava/util/List;->subList(II)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    const-string p0, "indices"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$slice"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final sorted(Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T::",
-            "Ljava/lang/Comparable<",
-            "-TT;>;>(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_4
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_3
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-gt v1, v2, :cond_0
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    new-array p0, p0, [Ljava/lang/Comparable;
-
-    invoke-interface {v0, p0}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_2
-
-    check-cast p0, [Ljava/lang/Comparable;
-
-    array-length v0, p0
-
-    if-le v0, v2, :cond_1
-
-    invoke-static {p0}, Ljava/util/Arrays;->sort([Ljava/lang/Object;)V
-
-    :cond_1
-    invoke-static {p0}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_3
-    invoke-static {p0}, Lj0/i/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->sort(Ljava/util/List;)V
-
-    return-object p0
-
-    :cond_4
-    const-string p0, "$this$sorted"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;",
-            "Ljava/util/Comparator<",
-            "-TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_4
-
-    if-eqz p1, :cond_3
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_2
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-gt v1, v2, :cond_0
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    new-array p0, p0, [Ljava/lang/Object;
-
-    invoke-interface {v0, p0}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_1
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->sortWith([Ljava/lang/Object;Ljava/util/Comparator;)V
-
-    invoke-static {p0}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_2
-    invoke-static {p0}, Lj0/i/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->sortWith(Ljava/util/List;Ljava/util/Comparator;)V
-
-    return-object p0
-
-    :cond_3
-    const-string p0, "comparator"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "$this$sortedWith"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final sumOfFloat(Ljava/lang/Iterable;)F
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Iterable<",
-            "Ljava/lang/Float;",
-            ">;)F"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    const/4 v0, 0x0
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Number;
-
-    invoke-virtual {v1}, Ljava/lang/Number;->floatValue()F
-
-    move-result v1
-
-    add-float/2addr v0, v1
-
-    goto :goto_0
-
-    :cond_0
-    return v0
-
-    :cond_1
-    const-string p0, "$this$sum"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final sumOfInt(Ljava/lang/Iterable;)I
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Iterable<",
-            "Ljava/lang/Integer;",
-            ">;)I"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    const/4 v0, 0x0
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Number;
-
-    invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
-
-    move-result v1
-
-    add-int/2addr v0, v1
-
-    goto :goto_0
-
-    :cond_0
-    return v0
-
-    :cond_1
-    const-string p0, "$this$sum"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final sumOfLong(Ljava/lang/Iterable;)J
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Iterable<",
-            "Ljava/lang/Long;",
-            ">;)J"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    const-wide/16 v0, 0x0
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result 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;->longValue()J
-
-    move-result-wide v2
-
-    add-long/2addr v0, v2
-
-    goto :goto_0
-
-    :cond_0
-    return-wide v0
-
-    :cond_1
-    const-string p0, "$this$sum"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final take(Ljava/lang/Iterable;I)Ljava/util/List;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;I)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_7
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-ltz p1, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_6
-
-    if-nez p1, :cond_1
-
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object p0
-
-    :cond_1
-    instance-of v2, p0, Ljava/util/Collection;
-
-    if-eqz v2, :cond_3
-
-    move-object v2, p0
-
-    check-cast v2, Ljava/util/Collection;
-
-    invoke-interface {v2}, Ljava/util/Collection;->size()I
-
-    move-result v2
-
-    if-lt p1, v2, :cond_2
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    if-ne p1, v0, :cond_3
-
-    invoke-static {p0}, Lj0/i/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_3
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-direct {v2, p1}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :cond_4
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_5
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/2addr v1, v0
-
-    if-ne v1, p1, :cond_4
-
-    :cond_5
-    invoke-static {v2}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_6
-    const-string p0, "Requested element count "
-
-    const-string v0, " is less than zero."
-
-    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_7
-    const-string p0, "$this$take"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final takeLast(Ljava/util/List;I)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;I)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    if-ltz p1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_5
-
-    if-nez p1, :cond_1
-
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object p0
-
-    :cond_1
-    invoke-interface {p0}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    if-lt p1, v1, :cond_2
-
-    invoke-static {p0}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    if-ne p1, v0, :cond_3
-
-    invoke-static {p0}, Lj0/i/l;->last(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_3
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0, p1}, Ljava/util/ArrayList;-><init>(I)V
-
-    sub-int p1, v1, p1
-
-    :goto_1
-    if-ge p1, v1, :cond_4
-
-    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    return-object v0
-
-    :cond_5
-    const-string p0, "Requested element count "
-
-    const-string v0, " is less than zero."
-
-    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            "C::",
-            "Ljava/util/Collection<",
-            "-TT;>;>(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;TC;)TC;"
-        }
-    .end annotation
-
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    return-object p1
-.end method
-
-.method public static final toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/HashSet<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Ljava/util/HashSet;
-
-    const/16 v1, 0xc
-
-    invoke-static {p0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(I)V
-
-    invoke-static {p0, v0}, Lj0/i/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
-
-    check-cast v0, Ljava/util/HashSet;
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$toHashSet"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toIntArray(Ljava/util/Collection;)[I
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "Ljava/lang/Integer;",
-            ">;)[I"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    new-array v0, v0, [I
-
-    const/4 v1, 0x0
-
-    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :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
-
-    :cond_1
-    const-string p0, "$this$toIntArray"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toList(Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_4
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_3
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    const/4 v2, 0x1
-
-    if-eq v1, v2, :cond_0
-
-    invoke-static {v0}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
-
-    move-result-object p0
-
-    goto :goto_1
-
-    :cond_0
-    instance-of v0, p0, Ljava/util/List;
-
-    if-eqz v0, :cond_1
-
-    check-cast p0, Ljava/util/List;
-
-    const/4 v0, 0x0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    goto :goto_1
-
-    :cond_2
-    sget-object p0, Lj0/i/n;->d:Lj0/i/n;
-
-    :goto_1
-    return-object p0
-
-    :cond_3
-    invoke-static {p0}, Lj0/i/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_4
-    const-string p0, "$this$toList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toLongArray(Ljava/util/Collection;)[J
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "Ljava/lang/Long;",
-            ">;)[J"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    new-array v0, v0, [J
-
-    const/4 v1, 0x0
-
-    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :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;->longValue()J
-
-    move-result-wide v2
-
-    add-int/lit8 v4, v1, 0x1
-
-    aput-wide v2, v0, v1
-
-    move v1, v4
-
-    goto :goto_0
-
-    :cond_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$toLongArray"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/util/Collection;
-
-    invoke-static {p0}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-static {p0, v0}, Lj0/i/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
-
-    return-object v0
-.end method
-
-.method public static final toMutableList(Ljava/util/Collection;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Collection<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0, p0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$toMutableList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/Set<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    check-cast p0, Ljava/util/Collection;
-
-    invoke-direct {v0, p0}, Ljava/util/LinkedHashSet;-><init>(Ljava/util/Collection;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
-
-    invoke-static {p0, v0}, Lj0/i/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
-
-    check-cast v0, Ljava/util/Set;
-
-    :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p0, "$this$toMutableSet"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final toSet(Ljava/lang/Iterable;)Ljava/util/Set;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)",
-            "Ljava/util/Set<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_4
-
-    instance-of v0, p0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_3
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    const/4 v2, 0x1
-
-    if-eq v1, v2, :cond_0
-
-    new-instance v1, Ljava/util/LinkedHashSet;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v0
-
-    invoke-direct {v1, v0}, Ljava/util/LinkedHashSet;-><init>(I)V
-
-    invoke-static {p0, v1}, Lj0/i/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
-
-    goto :goto_1
-
-    :cond_0
-    instance-of v0, p0, Ljava/util/List;
-
-    if-eqz v0, :cond_1
-
-    check-cast p0, Ljava/util/List;
-
-    const/4 v0, 0x0
-
-    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-static {p0}, Lf/n/a/k/a;->setOf(Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v1
-
-    goto :goto_1
-
-    :cond_2
-    sget-object v1, Lj0/i/p;->d:Lj0/i/p;
-
-    :goto_1
-    return-object v1
-
-    :cond_3
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
-
-    invoke-static {p0, v0}, Lj0/i/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
-
-    invoke-static {v0}, Lf/n/a/k/a;->optimizeReadOnlySet(Ljava/util/Set;)Ljava/util/Set;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_4
-    const-string p0, "$this$toSet"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/m.smali b/com.discord/smali_classes2/j0/i/m.smali
deleted file mode 100644
index a161159dab..0000000000
--- a/com.discord/smali_classes2/j0/i/m.smali
+++ /dev/null
@@ -1,123 +0,0 @@
-.class public final Lj0/i/m;
-.super Ljava/lang/Object;
-.source "Collections.kt"
-
-# interfaces
-.implements Ljava/util/ListIterator;
-.implements Lj0/n/c/v/a;
-
-
-# static fields
-.field public static final d:Lj0/i/m;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/i/m;
-
-    invoke-direct {v0}, Lj0/i/m;-><init>()V
-
-    sput-object v0, Lj0/i/m;->d:Lj0/i/m;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public synthetic add(Ljava/lang/Object;)V
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public hasNext()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public hasPrevious()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public nextIndex()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public previous()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public previousIndex()I
-    .locals 1
-
-    const/4 v0, -0x1
-
-    return v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public synthetic set(Ljava/lang/Object;)V
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/i/n.smali b/com.discord/smali_classes2/j0/i/n.smali
deleted file mode 100644
index 4304458c76..0000000000
--- a/com.discord/smali_classes2/j0/i/n.smali
+++ /dev/null
@@ -1,449 +0,0 @@
-.class public final Lj0/i/n;
-.super Ljava/lang/Object;
-.source "Collections.kt"
-
-# interfaces
-.implements Ljava/util/List;
-.implements Ljava/io/Serializable;
-.implements Ljava/util/RandomAccess;
-.implements Lj0/n/c/v/a;
-
-
-# static fields
-.field public static final d:Lj0/i/n;
-
-.field public static final serialVersionUID:J = -0x6690382f581f9fceL
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/i/n;
-
-    invoke-direct {v0}, Lj0/i/n;-><init>()V
-
-    sput-object v0, Lj0/i/n;->d:Lj0/i/n;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method private final readResolve()Ljava/lang/Object;
-    .locals 1
-
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public synthetic add(ILjava/lang/Object;)V
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public synthetic add(Ljava/lang/Object;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public addAll(ILjava/util/Collection;)Z
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public addAll(Ljava/util/Collection;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public clear()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final contains(Ljava/lang/Object;)Z
-    .locals 2
-
-    instance-of v0, p1, Ljava/lang/Void;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Ljava/lang/Void;
-
-    if-eqz p1, :cond_0
-
-    return v1
-
-    :cond_0
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    return v1
-.end method
-
-.method public containsAll(Ljava/util/Collection;)Z
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Ljava/util/List;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public get(I)Ljava/lang/Object;
-    .locals 3
-
-    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Empty list doesn\'t contain element at index "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2e
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public final indexOf(Ljava/lang/Object;)I
-    .locals 2
-
-    instance-of v0, p1, Ljava/lang/Void;
-
-    const/4 v1, -0x1
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Ljava/lang/Void;
-
-    if-eqz p1, :cond_0
-
-    return v1
-
-    :cond_0
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    return v1
-.end method
-
-.method public isEmpty()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-
-    sget-object v0, Lj0/i/m;->d:Lj0/i/m;
-
-    return-object v0
-.end method
-
-.method public final lastIndexOf(Ljava/lang/Object;)I
-    .locals 2
-
-    instance-of v0, p1, Ljava/lang/Void;
-
-    const/4 v1, -0x1
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Ljava/lang/Void;
-
-    if-eqz p1, :cond_0
-
-    return v1
-
-    :cond_0
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    return v1
-.end method
-
-.method public listIterator()Ljava/util/ListIterator;
-    .locals 1
-
-    sget-object v0, Lj0/i/m;->d:Lj0/i/m;
-
-    return-object v0
-.end method
-
-.method public listIterator(I)Ljava/util/ListIterator;
-    .locals 2
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lj0/i/m;->d:Lj0/i/m;
-
-    return-object p1
-
-    :cond_0
-    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v1, "Index: "
-
-    invoke-static {v1, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public synthetic remove(I)Ljava/lang/Object;
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public remove(Ljava/lang/Object;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public removeAll(Ljava/util/Collection;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public retainAll(Ljava/util/Collection;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public synthetic set(ILjava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final size()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public subList(II)Ljava/util/List;
-    .locals 3
-
-    if-nez p1, :cond_0
-
-    if-nez p2, :cond_0
-
-    return-object p0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v1, "fromIndex: "
-
-    const-string v2, ", toIndex: "
-
-    invoke-static {v1, p1, v2, p2}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public toArray()[Ljava/lang/Object;
-    .locals 1
-
-    invoke-static {p0}, Lj0/n/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)[TT;"
-        }
-    .end annotation
-
-    invoke-static {p0, p1}, Lj0/n/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "[]"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/o.smali b/com.discord/smali_classes2/j0/i/o.smali
deleted file mode 100644
index a15c5be190..0000000000
--- a/com.discord/smali_classes2/j0/i/o.smali
+++ /dev/null
@@ -1,236 +0,0 @@
-.class public final Lj0/i/o;
-.super Ljava/lang/Object;
-.source "Maps.kt"
-
-# interfaces
-.implements Ljava/util/Map;
-.implements Ljava/io/Serializable;
-.implements Lj0/n/c/v/a;
-
-
-# static fields
-.field public static final d:Lj0/i/o;
-
-.field public static final serialVersionUID:J = 0x72723771cb044cd2L
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/i/o;
-
-    invoke-direct {v0}, Lj0/i/o;-><init>()V
-
-    sput-object v0, Lj0/i/o;->d:Lj0/i/o;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method private final readResolve()Ljava/lang/Object;
-    .locals 1
-
-    sget-object v0, Lj0/i/o;->d:Lj0/i/o;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public clear()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public containsKey(Ljava/lang/Object;)Z
-    .locals 0
-
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public final containsValue(Ljava/lang/Object;)Z
-    .locals 2
-
-    instance-of v0, p1, Ljava/lang/Void;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Ljava/lang/Void;
-
-    if-eqz p1, :cond_0
-
-    return v1
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    return v1
-.end method
-
-.method public final entrySet()Ljava/util/Set;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Set<",
-            "Ljava/util/Map$Entry;",
-            ">;"
-        }
-    .end annotation
-
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
-
-    return-object v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Ljava/util/Map;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/util/Map;
-
-    invoke-interface {p1}, Ljava/util/Map;->isEmpty()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public isEmpty()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public final keySet()Ljava/util/Set;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Set<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
-
-    return-object v0
-.end method
-
-.method public synthetic put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public putAll(Ljava/util/Map;)V
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public remove(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final size()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "{}"
-
-    return-object v0
-.end method
-
-.method public final values()Ljava/util/Collection;
-    .locals 1
-
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/p.smali b/com.discord/smali_classes2/j0/i/p.smali
deleted file mode 100644
index 9aef54c8cc..0000000000
--- a/com.discord/smali_classes2/j0/i/p.smali
+++ /dev/null
@@ -1,260 +0,0 @@
-.class public final Lj0/i/p;
-.super Ljava/lang/Object;
-.source "Sets.kt"
-
-# interfaces
-.implements Ljava/util/Set;
-.implements Ljava/io/Serializable;
-.implements Lj0/n/c/v/a;
-
-
-# static fields
-.field public static final d:Lj0/i/p;
-
-.field public static final serialVersionUID:J = 0x2f46b01576d7e2f4L
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/i/p;
-
-    invoke-direct {v0}, Lj0/i/p;-><init>()V
-
-    sput-object v0, Lj0/i/p;->d:Lj0/i/p;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method private final readResolve()Ljava/lang/Object;
-    .locals 1
-
-    sget-object v0, Lj0/i/p;->d:Lj0/i/p;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public synthetic add(Ljava/lang/Object;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public addAll(Ljava/util/Collection;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public clear()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final contains(Ljava/lang/Object;)Z
-    .locals 2
-
-    instance-of v0, p1, Ljava/lang/Void;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Ljava/lang/Void;
-
-    if-eqz p1, :cond_0
-
-    return v1
-
-    :cond_0
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    return v1
-.end method
-
-.method public containsAll(Ljava/util/Collection;)Z
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const-string p1, "elements"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Ljava/util/Set;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/util/Set;
-
-    invoke-interface {p1}, Ljava/util/Set;->isEmpty()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public isEmpty()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-
-    sget-object v0, Lj0/i/m;->d:Lj0/i/m;
-
-    return-object v0
-.end method
-
-.method public remove(Ljava/lang/Object;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public removeAll(Ljava/util/Collection;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public retainAll(Ljava/util/Collection;)Z
-    .locals 1
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Operation is not supported for read-only collection"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final size()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public toArray()[Ljava/lang/Object;
-    .locals 1
-
-    invoke-static {p0}, Lj0/n/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)[TT;"
-        }
-    .end annotation
-
-    invoke-static {p0, p1}, Lj0/n/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "[]"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/q.smali b/com.discord/smali_classes2/j0/i/q.smali
deleted file mode 100644
index c254119070..0000000000
--- a/com.discord/smali_classes2/j0/i/q.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public abstract Lj0/i/q;
-.super Ljava/lang/Object;
-.source "Iterators.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "Ljava/lang/Integer;",
-        ">;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final next()Ljava/lang/Integer;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/i/q;->nextInt()I
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public bridge synthetic next()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/i/q;->next()Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public abstract nextInt()I
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/r.smali b/com.discord/smali_classes2/j0/i/r.smali
deleted file mode 100644
index 19ab466787..0000000000
--- a/com.discord/smali_classes2/j0/i/r.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public abstract Lj0/i/r;
-.super Ljava/lang/Object;
-.source "Iterators.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "Ljava/lang/Long;",
-        ">;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final next()Ljava/lang/Long;
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/i/r;->nextLong()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public bridge synthetic next()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/i/r;->next()Ljava/lang/Long;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public abstract nextLong()J
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/s.smali b/com.discord/smali_classes2/j0/i/s.smali
deleted file mode 100644
index 9dd19c29bd..0000000000
--- a/com.discord/smali_classes2/j0/i/s.smali
+++ /dev/null
@@ -1,195 +0,0 @@
-.class public final Lj0/i/s;
-.super Ljava/util/AbstractList;
-.source "ReversedViews.kt"
-
-# interfaces
-.implements Ljava/util/List;
-.implements Lj0/n/c/v/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lj0/i/s<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
-
-    iput-object p1, p0, Lj0/i/s;->d:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public add(ILjava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ITT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/i/s;->d:Ljava/util/List;
-
-    invoke-virtual {p0}, Lj0/i/s;->size()I
-
-    move-result v1
-
-    if-ltz p1, :cond_0
-
-    if-lt v1, p1, :cond_0
-
-    invoke-virtual {p0}, Lj0/i/s;->size()I
-
-    move-result v1
-
-    sub-int/2addr v1, p1
-
-    invoke-interface {v0, v1, p2}, Ljava/util/List;->add(ILjava/lang/Object;)V
-
-    return-void
-
-    :cond_0
-    new-instance p2, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v0, "Position index "
-
-    const-string v1, " must be in range ["
-
-    invoke-static {v0, p1, v1}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    new-instance v1, Lkotlin/ranges/IntRange;
-
-    invoke-virtual {p0}, Lj0/i/s;->size()I
-
-    move-result v2
-
-    invoke-direct {v1, v0, v2}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v0, "]."
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public clear()V
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/s;->d:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->clear()V
-
-    return-void
-.end method
-
-.method public get(I)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/i/s;->d:Ljava/util/List;
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
-
-    move-result p1
-
-    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final remove(I)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/s;->d:Ljava/util/List;
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
-
-    move-result p1
-
-    invoke-interface {v0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public set(ILjava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ITT;)TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/i/s;->d:Ljava/util/List;
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
-
-    move-result p1
-
-    invoke-interface {v0, p1, p2}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final size()I
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/s;->d:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/t.smali b/com.discord/smali_classes2/j0/i/t.smali
deleted file mode 100644
index 9b093e1f81..0000000000
--- a/com.discord/smali_classes2/j0/i/t.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public Lj0/i/t;
-.super Lj0/i/c;
-.source "ReversedViews.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lj0/i/c<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lj0/i/c;-><init>()V
-
-    iput-object p1, p0, Lj0/i/t;->d:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public get(I)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/i/t;->d:Ljava/util/List;
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
-
-    move-result p1
-
-    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public getSize()I
-    .locals 1
-
-    iget-object v0, p0, Lj0/i/t;->d:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/j0/i/u.smali b/com.discord/smali_classes2/j0/i/u.smali
deleted file mode 100644
index 76f6c483a7..0000000000
--- a/com.discord/smali_classes2/j0/i/u.smali
+++ /dev/null
@@ -1,128 +0,0 @@
-.class public final enum Lj0/i/u;
-.super Ljava/lang/Enum;
-.source "AbstractIterator.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lj0/i/u;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lj0/i/u;
-
-.field public static final enum e:Lj0/i/u;
-
-.field public static final enum f:Lj0/i/u;
-
-.field public static final enum g:Lj0/i/u;
-
-.field public static final synthetic h:[Lj0/i/u;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x4
-
-    new-array v0, v0, [Lj0/i/u;
-
-    new-instance v1, Lj0/i/u;
-
-    const-string v2, "Ready"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Lj0/i/u;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lj0/i/u;->d:Lj0/i/u;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/i/u;
-
-    const-string v2, "NotReady"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Lj0/i/u;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lj0/i/u;->e:Lj0/i/u;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/i/u;
-
-    const-string v2, "Done"
-
-    const/4 v3, 0x2
-
-    invoke-direct {v1, v2, v3}, Lj0/i/u;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lj0/i/u;->f:Lj0/i/u;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/i/u;
-
-    const-string v2, "Failed"
-
-    const/4 v3, 0x3
-
-    invoke-direct {v1, v2, v3}, Lj0/i/u;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lj0/i/u;->g:Lj0/i/u;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lj0/i/u;->h:[Lj0/i/u;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lj0/i/u;
-    .locals 1
-
-    const-class v0, Lj0/i/u;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lj0/i/u;
-
-    return-object p0
-.end method
-
-.method public static values()[Lj0/i/u;
-    .locals 1
-
-    sget-object v0, Lj0/i/u;->h:[Lj0/i/u;
-
-    invoke-virtual {v0}, [Lj0/i/u;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lj0/i/u;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/j/a.smali b/com.discord/smali_classes2/j0/j/a.smali
deleted file mode 100644
index fda9f7e497..0000000000
--- a/com.discord/smali_classes2/j0/j/a.smali
+++ /dev/null
@@ -1,90 +0,0 @@
-.class public final Lj0/j/a;
-.super Ljava/lang/Object;
-.source "Comparisons.kt"
-
-# interfaces
-.implements Ljava/util/Comparator;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Comparator<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:[Lkotlin/jvm/functions/Function1;
-
-
-# direct methods
-.method public constructor <init>([Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/j/a;->d:[Lkotlin/jvm/functions/Function1;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;TT;)I"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/j/a;->d:[Lkotlin/jvm/functions/Function1;
-
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_1
-
-    aget-object v4, v0, v3
-
-    invoke-interface {v4, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/Comparable;
-
-    invoke-interface {v4, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/Comparable;
-
-    invoke-static {v5, v4}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    move v2, v4
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    return v2
-.end method
diff --git a/com.discord/smali_classes2/j0/j/b.smali b/com.discord/smali_classes2/j0/j/b.smali
deleted file mode 100644
index a732da0911..0000000000
--- a/com.discord/smali_classes2/j0/j/b.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lj0/j/b;
-.super Ljava/lang/Object;
-.source "Comparisons.kt"
-
-# interfaces
-.implements Ljava/util/Comparator;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Comparator<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/Comparator;
-
-.field public final synthetic e:Ljava/util/Comparator;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/Comparator;Ljava/util/Comparator;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/j/b;->d:Ljava/util/Comparator;
-
-    iput-object p2, p0, Lj0/j/b;->e:Ljava/util/Comparator;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;TT;)I"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/j/b;->d:Ljava/util/Comparator;
-
-    invoke-interface {v0, p1, p2}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lj0/j/b;->e:Ljava/util/Comparator;
-
-    invoke-interface {v0, p1, p2}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
-
-    move-result v0
-
-    :goto_0
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/j0/j/c.smali b/com.discord/smali_classes2/j0/j/c.smali
deleted file mode 100644
index a873f5ef54..0000000000
--- a/com.discord/smali_classes2/j0/j/c.smali
+++ /dev/null
@@ -1,98 +0,0 @@
-.class public final Lj0/j/c;
-.super Ljava/lang/Object;
-.source "Comparisons.kt"
-
-# interfaces
-.implements Ljava/util/Comparator;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Comparator<",
-        "Ljava/lang/Comparable<",
-        "-",
-        "Ljava/lang/Object;",
-        ">;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/j/c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/j/c;
-
-    invoke-direct {v0}, Lj0/j/c;-><init>()V
-
-    sput-object v0, Lj0/j/c;->d:Lj0/j/c;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 1
-
-    check-cast p1, Ljava/lang/Comparable;
-
-    check-cast p2, Ljava/lang/Comparable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-interface {p1, p2}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const-string p1, "b"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "a"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final reversed()Ljava/util/Comparator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Comparator<",
-            "Ljava/lang/Comparable<",
-            "Ljava/lang/Object;",
-            ">;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lj0/j/d;->d:Lj0/j/d;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/j/d.smali b/com.discord/smali_classes2/j0/j/d.smali
deleted file mode 100644
index 1e1b324eb5..0000000000
--- a/com.discord/smali_classes2/j0/j/d.smali
+++ /dev/null
@@ -1,98 +0,0 @@
-.class public final Lj0/j/d;
-.super Ljava/lang/Object;
-.source "Comparisons.kt"
-
-# interfaces
-.implements Ljava/util/Comparator;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Comparator<",
-        "Ljava/lang/Comparable<",
-        "-",
-        "Ljava/lang/Object;",
-        ">;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/j/d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/j/d;
-
-    invoke-direct {v0}, Lj0/j/d;-><init>()V
-
-    sput-object v0, Lj0/j/d;->d:Lj0/j/d;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 1
-
-    check-cast p1, Ljava/lang/Comparable;
-
-    check-cast p2, Ljava/lang/Comparable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-interface {p2, p1}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const-string p1, "b"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "a"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final reversed()Ljava/util/Comparator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Comparator<",
-            "Ljava/lang/Comparable<",
-            "Ljava/lang/Object;",
-            ">;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lj0/j/c;->d:Lj0/j/c;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/a.smali b/com.discord/smali_classes2/j0/k/a.smali
deleted file mode 100644
index 943a0073d3..0000000000
--- a/com.discord/smali_classes2/j0/k/a.smali
+++ /dev/null
@@ -1,176 +0,0 @@
-.class public abstract Lj0/k/a;
-.super Ljava/lang/Object;
-.source "CoroutineContextImpl.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext$a;
-
-
-# instance fields
-.field public final key:Lkotlin/coroutines/CoroutineContext$b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext$b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/k/a;->key:Lkotlin/coroutines/CoroutineContext$b;
-
-    return-void
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(TR;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TR;-",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "+TR;>;)TR;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    invoke-static {p0, p1, p2}, Lkotlin/coroutines/CoroutineContext$a$a;->fold(Lkotlin/coroutines/CoroutineContext$a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "operation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            ">(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->get(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public getKey()Lkotlin/coroutines/CoroutineContext$b;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/k/a;->key:Lkotlin/coroutines/CoroutineContext$b;
-
-    return-object v0
-.end method
-
-.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;)",
-            "Lkotlin/coroutines/CoroutineContext;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->minusKey(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->plus(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/k/b.smali b/com.discord/smali_classes2/j0/k/b.smali
deleted file mode 100644
index 21c8bba1c8..0000000000
--- a/com.discord/smali_classes2/j0/k/b.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public abstract Lj0/k/b;
-.super Ljava/lang/Object;
-.source "CoroutineContextImpl.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<B::",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "E::TB;>",
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/CoroutineContext$b<",
-        "TE;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/k/c$a.smali b/com.discord/smali_classes2/j0/k/c$a.smali
deleted file mode 100644
index 3135bfd6de..0000000000
--- a/com.discord/smali_classes2/j0/k/c$a.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Lj0/k/c$a;
-.super Ljava/lang/Object;
-.source "CoroutineContextImpl.kt"
-
-# interfaces
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/k/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J
-
-
-# instance fields
-.field public final elements:[Lkotlin/coroutines/CoroutineContext;
-
-
-# direct methods
-.method public constructor <init>([Lkotlin/coroutines/CoroutineContext;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/k/c$a;->elements:[Lkotlin/coroutines/CoroutineContext;
-
-    return-void
-.end method
-
-.method private final readResolve()Ljava/lang/Object;
-    .locals 5
-
-    iget-object v0, p0, Lj0/k/c$a;->elements:[Lkotlin/coroutines/CoroutineContext;
-
-    sget-object v1, Lj0/k/f;->d:Lj0/k/f;
-
-    array-length v2, v0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v2, :cond_0
-
-    aget-object v4, v0, v3
-
-    invoke-interface {v1, v4}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v1
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/j0/k/c$b.smali b/com.discord/smali_classes2/j0/k/c$b.smali
deleted file mode 100644
index c75e91afc9..0000000000
--- a/com.discord/smali_classes2/j0/k/c$b.smali
+++ /dev/null
@@ -1,128 +0,0 @@
-.class public final Lj0/k/c$b;
-.super Lj0/n/c/i;
-.source "CoroutineContextImpl.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/k/c;->toString()Ljava/lang/String;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Ljava/lang/String;",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/k/c$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/k/c$b;
-
-    invoke-direct {v0}, Lj0/k/c$b;-><init>()V
-
-    sput-object v0, Lj0/k/c$b;->d:Lj0/k/c$b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/String;
-
-    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, ", "
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    :goto_1
-    return-object p1
-
-    :cond_2
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "acc"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/c$c.smali b/com.discord/smali_classes2/j0/k/c$c.smali
deleted file mode 100644
index 173bc7b722..0000000000
--- a/com.discord/smali_classes2/j0/k/c$c.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public final Lj0/k/c$c;
-.super Lj0/n/c/i;
-.source "CoroutineContextImpl.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/k/c;->writeReplace()Ljava/lang/Object;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Lkotlin/Unit;",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $elements:[Lkotlin/coroutines/CoroutineContext;
-
-.field public final synthetic $index:Lkotlin/jvm/internal/Ref$IntRef;
-
-
-# direct methods
-.method public constructor <init>([Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/Ref$IntRef;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/k/c$c;->$elements:[Lkotlin/coroutines/CoroutineContext;
-
-    iput-object p2, p0, Lj0/k/c$c;->$index:Lkotlin/jvm/internal/Ref$IntRef;
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lkotlin/Unit;
-
-    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    iget-object p1, p0, Lj0/k/c$c;->$elements:[Lkotlin/coroutines/CoroutineContext;
-
-    iget-object v0, p0, Lj0/k/c$c;->$index:Lkotlin/jvm/internal/Ref$IntRef;
-
-    iget v1, v0, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, v0, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    aput-object p2, p1, v1
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "<anonymous parameter 0>"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/c.smali b/com.discord/smali_classes2/j0/k/c.smali
deleted file mode 100644
index 4503256195..0000000000
--- a/com.discord/smali_classes2/j0/k/c.smali
+++ /dev/null
@@ -1,478 +0,0 @@
-.class public final Lj0/k/c;
-.super Ljava/lang/Object;
-.source "CoroutineContextImpl.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext;
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/k/c$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final element:Lkotlin/coroutines/CoroutineContext$a;
-
-.field public final left:Lkotlin/coroutines/CoroutineContext;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    iput-object p2, p0, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    return-void
-
-    :cond_0
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "left"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method private final writeReplace()Ljava/lang/Object;
-    .locals 6
-
-    invoke-virtual {p0}, Lj0/k/c;->b()I
-
-    move-result v0
-
-    new-array v1, v0, [Lkotlin/coroutines/CoroutineContext;
-
-    new-instance v2, Lkotlin/jvm/internal/Ref$IntRef;
-
-    invoke-direct {v2}, Lkotlin/jvm/internal/Ref$IntRef;-><init>()V
-
-    const/4 v3, 0x0
-
-    iput v3, v2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    sget-object v4, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    new-instance v5, Lj0/k/c$c;
-
-    invoke-direct {v5, v1, v2}, Lj0/k/c$c;-><init>([Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/Ref$IntRef;)V
-
-    invoke-virtual {p0, v4, v5}, Lj0/k/c;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    iget v2, v2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    if-ne v2, v0, :cond_0
-
-    const/4 v3, 0x1
-
-    :cond_0
-    if-eqz v3, :cond_1
-
-    new-instance v0, Lj0/k/c$a;
-
-    invoke-direct {v0, v1}, Lj0/k/c$a;-><init>([Lkotlin/coroutines/CoroutineContext;)V
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Check failed."
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final b()I
-    .locals 3
-
-    const/4 v0, 0x2
-
-    move-object v1, p0
-
-    :goto_0
-    iget-object v1, v1, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    instance-of v2, v1, Lj0/k/c;
-
-    if-nez v2, :cond_0
-
-    const/4 v1, 0x0
-
-    :cond_0
-    check-cast v1, Lj0/k/c;
-
-    if-eqz v1, :cond_1
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eq p0, p1, :cond_4
-
-    instance-of v1, p1, Lj0/k/c;
-
-    if-eqz v1, :cond_5
-
-    check-cast p1, Lj0/k/c;
-
-    invoke-virtual {p1}, Lj0/k/c;->b()I
-
-    move-result v1
-
-    invoke-virtual {p0}, Lj0/k/c;->b()I
-
-    move-result v2
-
-    if-ne v1, v2, :cond_5
-
-    if-eqz p1, :cond_3
-
-    move-object v1, p0
-
-    :goto_0
-    iget-object v2, v1, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    invoke-interface {v2}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
-
-    move-result-object v3
-
-    invoke-virtual {p1, v3}, Lj0/k/c;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v3
-
-    invoke-static {v3, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_0
-
-    const/4 p1, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v1, v1, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    instance-of v2, v1, Lj0/k/c;
-
-    if-eqz v2, :cond_1
-
-    check-cast v1, Lj0/k/c;
-
-    goto :goto_0
-
-    :cond_1
-    if-eqz v1, :cond_2
-
-    check-cast v1, Lkotlin/coroutines/CoroutineContext$a;
-
-    invoke-interface {v1}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
-
-    move-result-object v2
-
-    invoke-virtual {p1, v2}, Lj0/k/c;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p1
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    :goto_1
-    if-eqz p1, :cond_5
-
-    goto :goto_2
-
-    :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.coroutines.CoroutineContext.Element"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_4
-    :goto_2
-    const/4 v0, 0x1
-
-    :cond_5
-    return v0
-.end method
-
-.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(TR;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TR;-",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "+TR;>;)TR;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    iget-object v0, p0, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-interface {v0, p1, p2}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    invoke-interface {p2, p1, v0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "operation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            ">(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    move-object v0, p0
-
-    :goto_0
-    iget-object v1, v0, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    invoke-interface {v1, p1}, Lkotlin/coroutines/CoroutineContext$a;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    return-object v1
-
-    :cond_0
-    iget-object v0, v0, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    instance-of v1, v0, Lj0/k/c;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Lj0/k/c;
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {v0, p1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    iget-object v1, p0, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    return v1
-.end method
-
-.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;)",
-            "Lkotlin/coroutines/CoroutineContext;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    iget-object v0, p0, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    invoke-interface {v0, p1}, Lkotlin/coroutines/CoroutineContext$a;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p0, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    return-object p1
-
-    :cond_0
-    iget-object v0, p0, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-interface {v0, p1}, Lkotlin/coroutines/CoroutineContext;->minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lj0/k/c;->left:Lkotlin/coroutines/CoroutineContext;
-
-    if-ne p1, v0, :cond_1
-
-    move-object p1, p0
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    if-ne p1, v0, :cond_2
-
-    iget-object p1, p0, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v0, Lj0/k/c;
-
-    iget-object v1, p0, Lj0/k/c;->element:Lkotlin/coroutines/CoroutineContext$a;
-
-    invoke-direct {v0, p1, v1}, Lj0/k/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
-
-    move-object p1, v0
-
-    :goto_0
-    return-object p1
-
-    :cond_3
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lf/n/a/k/a;->plus(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    sget-object v1, Lj0/k/c$b;->d:Lj0/k/c$b;
-
-    const-string v2, ""
-
-    invoke-virtual {p0, v2, v1}, Lj0/k/c;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/String;
-
-    const-string v2, "]"
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/d$a.smali b/com.discord/smali_classes2/j0/k/d$a.smali
deleted file mode 100644
index 273a48b186..0000000000
--- a/com.discord/smali_classes2/j0/k/d$a.smali
+++ /dev/null
@@ -1,52 +0,0 @@
-.class public final Lj0/k/d$a;
-.super Ljava/lang/Object;
-.source "ContinuationInterceptor.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/k/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/CoroutineContext$b<",
-        "Lj0/k/d;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic a:Lj0/k/d$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/k/d$a;
-
-    invoke-direct {v0}, Lj0/k/d$a;-><init>()V
-
-    sput-object v0, Lj0/k/d$a;->a:Lj0/k/d$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/k/d.smali b/com.discord/smali_classes2/j0/k/d.smali
deleted file mode 100644
index 568b62a2ea..0000000000
--- a/com.discord/smali_classes2/j0/k/d.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public interface abstract Lj0/k/d;
-.super Ljava/lang/Object;
-.source "ContinuationInterceptor.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/k/d$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lj0/k/d$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    sget-object v0, Lj0/k/d$a;->a:Lj0/k/d$a;
-
-    sput-object v0, Lj0/k/d;->a:Lj0/k/d$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract interceptContinuation(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;)",
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-.end method
-
-.method public abstract releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "*>;)V"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/j0/k/e.smali b/com.discord/smali_classes2/j0/k/e.smali
deleted file mode 100644
index 8af26d7029..0000000000
--- a/com.discord/smali_classes2/j0/k/e.smali
+++ /dev/null
@@ -1,143 +0,0 @@
-.class public final Lj0/k/e;
-.super Lj0/n/c/i;
-.source "CoroutineContext.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Lkotlin/coroutines/CoroutineContext;",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "Lkotlin/coroutines/CoroutineContext;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/k/e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/k/e;
-
-    invoke-direct {v0}, Lj0/k/e;-><init>()V
-
-    sput-object v0, Lj0/k/e;->d:Lj0/k/e;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lkotlin/coroutines/CoroutineContext;
-
-    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    if-eqz p2, :cond_3
-
-    invoke-interface {p2}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
-
-    move-result-object v0
-
-    invoke-interface {p1, v0}, Lkotlin/coroutines/CoroutineContext;->minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    if-ne p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-interface {p1, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v0
-
-    check-cast v0, Lj0/k/d;
-
-    if-nez v0, :cond_1
-
-    new-instance v0, Lj0/k/c;
-
-    invoke-direct {v0, p1, p2}, Lj0/k/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
-
-    move-object p2, v0
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v1, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-interface {p1, v1}, Lkotlin/coroutines/CoroutineContext;->minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    sget-object v1, Lj0/k/f;->d:Lj0/k/f;
-
-    if-ne p1, v1, :cond_2
-
-    new-instance p1, Lj0/k/c;
-
-    invoke-direct {p1, p2, v0}, Lj0/k/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
-
-    move-object p2, p1
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v1, Lj0/k/c;
-
-    new-instance v2, Lj0/k/c;
-
-    invoke-direct {v2, p1, p2}, Lj0/k/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
-
-    invoke-direct {v1, v2, v0}, Lj0/k/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
-
-    move-object p2, v1
-
-    :goto_0
-    return-object p2
-
-    :cond_3
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "acc"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/f.smali b/com.discord/smali_classes2/j0/k/f.smali
deleted file mode 100644
index 0f9e4a9705..0000000000
--- a/com.discord/smali_classes2/j0/k/f.smali
+++ /dev/null
@@ -1,157 +0,0 @@
-.class public final Lj0/k/f;
-.super Ljava/lang/Object;
-.source "CoroutineContextImpl.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext;
-.implements Ljava/io/Serializable;
-
-
-# static fields
-.field public static final d:Lj0/k/f;
-
-.field public static final serialVersionUID:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/k/f;
-
-    invoke-direct {v0}, Lj0/k/f;-><init>()V
-
-    sput-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method private final readResolve()Ljava/lang/Object;
-    .locals 1
-
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(TR;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TR;-",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "+TR;>;)TR;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "operation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            ">(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;)",
-            "Lkotlin/coroutines/CoroutineContext;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "EmptyCoroutineContext"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/g/a.smali b/com.discord/smali_classes2/j0/k/g/a.smali
deleted file mode 100644
index 25b7d0413e..0000000000
--- a/com.discord/smali_classes2/j0/k/g/a.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.class public final enum Lj0/k/g/a;
-.super Ljava/lang/Enum;
-.source "Intrinsics.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lj0/k/g/a;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lj0/k/g/a;
-
-.field public static final synthetic e:[Lj0/k/g/a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x3
-
-    new-array v0, v0, [Lj0/k/g/a;
-
-    new-instance v1, Lj0/k/g/a;
-
-    const-string v2, "COROUTINE_SUSPENDED"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Lj0/k/g/a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lj0/k/g/a;->d:Lj0/k/g/a;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/k/g/a;
-
-    const-string v2, "UNDECIDED"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Lj0/k/g/a;-><init>(Ljava/lang/String;I)V
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/k/g/a;
-
-    const-string v2, "RESUMED"
-
-    const/4 v3, 0x2
-
-    invoke-direct {v1, v2, v3}, Lj0/k/g/a;-><init>(Ljava/lang/String;I)V
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lj0/k/g/a;->e:[Lj0/k/g/a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lj0/k/g/a;
-    .locals 1
-
-    const-class v0, Lj0/k/g/a;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lj0/k/g/a;
-
-    return-object p0
-.end method
-
-.method public static values()[Lj0/k/g/a;
-    .locals 1
-
-    sget-object v0, Lj0/k/g/a;->e:[Lj0/k/g/a;
-
-    invoke-virtual {v0}, [Lj0/k/g/a;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lj0/k/g/a;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/g/b.smali b/com.discord/smali_classes2/j0/k/g/b.smali
deleted file mode 100644
index 9508cd47a9..0000000000
--- a/com.discord/smali_classes2/j0/k/g/b.smali
+++ /dev/null
@@ -1,95 +0,0 @@
-.class public final Lj0/k/g/b;
-.super Lj0/k/h/a/f;
-.source "IntrinsicsJvm.kt"
-
-
-# instance fields
-.field public final synthetic $completion:Lkotlin/coroutines/Continuation;
-
-.field public final synthetic $receiver$inlined:Ljava/lang/Object;
-
-.field public final synthetic $this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
-
-.field public label:I
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/k/g/b;->$completion:Lkotlin/coroutines/Continuation;
-
-    iput-object p3, p0, Lj0/k/g/b;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
-
-    iput-object p4, p0, Lj0/k/g/b;->$receiver$inlined:Ljava/lang/Object;
-
-    invoke-direct {p0, p2}, Lj0/k/h/a/f;-><init>(Lkotlin/coroutines/Continuation;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    iget v0, p0, Lj0/k/g/b;->label:I
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_1
-
-    if-ne v0, v2, :cond_0
-
-    iput v1, p0, Lj0/k/g/b;->label:I
-
-    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "This coroutine had already completed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    iput v2, p0, Lj0/k/g/b;->label:I
-
-    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lj0/k/g/b;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
-
-    if-eqz p1, :cond_2
-
-    invoke-static {p1, v1}, Lj0/n/c/u;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
-
-    check-cast p1, Lkotlin/jvm/functions/Function2;
-
-    iget-object v0, p0, Lj0/k/g/b;->$receiver$inlined:Ljava/lang/Object;
-
-    invoke-interface {p1, v0, p0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    :goto_0
-    return-object p1
-
-    :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type (R, kotlin.coroutines.Continuation<T>) -> kotlin.Any?"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/k/g/c.smali b/com.discord/smali_classes2/j0/k/g/c.smali
deleted file mode 100644
index 3f1432727a..0000000000
--- a/com.discord/smali_classes2/j0/k/g/c.smali
+++ /dev/null
@@ -1,99 +0,0 @@
-.class public final Lj0/k/g/c;
-.super Lj0/k/h/a/c;
-.source "IntrinsicsJvm.kt"
-
-
-# instance fields
-.field public final synthetic $completion:Lkotlin/coroutines/Continuation;
-
-.field public final synthetic $context:Lkotlin/coroutines/CoroutineContext;
-
-.field public final synthetic $receiver$inlined:Ljava/lang/Object;
-
-.field public final synthetic $this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
-
-.field public label:I
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/k/g/c;->$completion:Lkotlin/coroutines/Continuation;
-
-    iput-object p2, p0, Lj0/k/g/c;->$context:Lkotlin/coroutines/CoroutineContext;
-
-    iput-object p5, p0, Lj0/k/g/c;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
-
-    iput-object p6, p0, Lj0/k/g/c;->$receiver$inlined:Ljava/lang/Object;
-
-    invoke-direct {p0, p3, p4}, Lj0/k/h/a/c;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    iget v0, p0, Lj0/k/g/c;->label:I
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_1
-
-    if-ne v0, v2, :cond_0
-
-    iput v1, p0, Lj0/k/g/c;->label:I
-
-    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "This coroutine had already completed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    iput v2, p0, Lj0/k/g/c;->label:I
-
-    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lj0/k/g/c;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
-
-    if-eqz p1, :cond_2
-
-    invoke-static {p1, v1}, Lj0/n/c/u;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
-
-    check-cast p1, Lkotlin/jvm/functions/Function2;
-
-    iget-object v0, p0, Lj0/k/g/c;->$receiver$inlined:Ljava/lang/Object;
-
-    invoke-interface {p1, v0, p0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    :goto_0
-    return-object p1
-
-    :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type (R, kotlin.coroutines.Continuation<T>) -> kotlin.Any?"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/a.smali b/com.discord/smali_classes2/j0/k/h/a/a.smali
deleted file mode 100644
index 8804f10756..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/a.smali
+++ /dev/null
@@ -1,577 +0,0 @@
-.class public abstract Lj0/k/h/a/a;
-.super Ljava/lang/Object;
-.source "ContinuationImpl.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/Continuation;
-.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/Continuation<",
-        "Ljava/lang/Object;",
-        ">;",
-        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;",
-        "Ljava/io/Serializable;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final completion:Lkotlin/coroutines/Continuation;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/Continuation;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/k/h/a/a;->completion:Lkotlin/coroutines/Continuation;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            "Lkotlin/coroutines/Continuation<",
-            "*>;)",
-            "Lkotlin/coroutines/Continuation<",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "create(Any?;Continuation) has not been overridden"
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public create(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "*>;)",
-            "Lkotlin/coroutines/Continuation<",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "create(Continuation) has not been overridden"
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_0
-    const-string p1, "completion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-    .locals 2
-
-    iget-object v0, p0, Lj0/k/h/a/a;->completion:Lkotlin/coroutines/Continuation;
-
-    instance-of v1, v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    check-cast v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    return-object v0
-.end method
-
-.method public final getCompletion()Lkotlin/coroutines/Continuation;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/k/h/a/a;->completion:Lkotlin/coroutines/Continuation;
-
-    return-object v0
-.end method
-
-.method public getStackTraceElement()Ljava/lang/StackTraceElement;
-    .locals 9
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    const-class v2, Lj0/k/h/a/d;
-
-    invoke-virtual {v1, v2}, Ljava/lang/Class;->getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;
-
-    move-result-object v1
-
-    check-cast v1, Lj0/k/h/a/d;
-
-    if-eqz v1, :cond_a
-
-    invoke-interface {v1}, Lj0/k/h/a/d;->v()I
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    if-gt v2, v3, :cond_9
-
-    const/4 v2, -0x1
-
-    const/4 v4, 0x0
-
-    :try_start_0
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v5
-
-    const-string v6, "label"
-
-    invoke-virtual {v5, v6}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v5
-
-    const-string v6, "field"
-
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5, v3}, Ljava/lang/reflect/Field;->setAccessible(Z)V
-
-    invoke-virtual {v5, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    instance-of v6, v5, Ljava/lang/Integer;
-
-    if-nez v6, :cond_0
-
-    move-object v5, v0
-
-    :cond_0
-    check-cast v5, Ljava/lang/Integer;
-
-    if-eqz v5, :cond_1
-
-    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
-
-    move-result v5
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v5, 0x0
-
-    :goto_0
-    sub-int/2addr v5, v3
-
-    goto :goto_1
-
-    :catch_0
-    const/4 v5, -0x1
-
-    :goto_1
-    if-gez v5, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    invoke-interface {v1}, Lj0/k/h/a/d;->l()[I
-
-    move-result-object v2
-
-    aget v2, v2, v5
-
-    :goto_2
-    sget-object v3, Lj0/k/h/a/e;->b:Lj0/k/h/a/e$a;
-
-    if-eqz v3, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    :try_start_1
-    const-class v3, Ljava/lang/Class;
-
-    const-string v5, "getModule"
-
-    new-array v6, v4, [Ljava/lang/Class;
-
-    invoke-virtual {v3, v5, v6}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v3
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v5
-
-    const-string v6, "java.lang.Module"
-
-    invoke-virtual {v5, v6}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v5
-
-    const-string v6, "getDescriptor"
-
-    new-array v7, v4, [Ljava/lang/Class;
-
-    invoke-virtual {v5, v6, v7}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v5
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v6
-
-    invoke-virtual {v6}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v6
-
-    const-string v7, "java.lang.module.ModuleDescriptor"
-
-    invoke-virtual {v6, v7}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v6
-
-    const-string v7, "name"
-
-    new-array v8, v4, [Ljava/lang/Class;
-
-    invoke-virtual {v6, v7, v8}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v6
-
-    new-instance v7, Lj0/k/h/a/e$a;
-
-    invoke-direct {v7, v3, v5, v6}, Lj0/k/h/a/e$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
-
-    sput-object v7, Lj0/k/h/a/e;->b:Lj0/k/h/a/e$a;
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
-
-    move-object v3, v7
-
-    goto :goto_3
-
-    :catch_1
-    sget-object v3, Lj0/k/h/a/e;->a:Lj0/k/h/a/e$a;
-
-    sput-object v3, Lj0/k/h/a/e;->b:Lj0/k/h/a/e$a;
-
-    :goto_3
-    sget-object v5, Lj0/k/h/a/e;->a:Lj0/k/h/a/e$a;
-
-    if-ne v3, v5, :cond_4
-
-    goto :goto_6
-
-    :cond_4
-    iget-object v5, v3, Lj0/k/h/a/e$a;->a:Ljava/lang/reflect/Method;
-
-    if-eqz v5, :cond_7
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v6
-
-    new-array v7, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v5, v6, v7}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_7
-
-    iget-object v6, v3, Lj0/k/h/a/e$a;->b:Ljava/lang/reflect/Method;
-
-    if-eqz v6, :cond_7
-
-    new-array v7, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v6, v5, v7}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_7
-
-    iget-object v3, v3, Lj0/k/h/a/e$a;->c:Ljava/lang/reflect/Method;
-
-    if-eqz v3, :cond_5
-
-    new-array v4, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v3, v5, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    goto :goto_4
-
-    :cond_5
-    move-object v3, v0
-
-    :goto_4
-    instance-of v4, v3, Ljava/lang/String;
-
-    if-nez v4, :cond_6
-
-    goto :goto_5
-
-    :cond_6
-    move-object v0, v3
-
-    :goto_5
-    check-cast v0, Ljava/lang/String;
-
-    :cond_7
-    :goto_6
-    if-nez v0, :cond_8
-
-    invoke-interface {v1}, Lj0/k/h/a/d;->c()Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_7
-
-    :cond_8
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x2f
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-interface {v1}, Lj0/k/h/a/d;->c()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_7
-    new-instance v3, Ljava/lang/StackTraceElement;
-
-    invoke-interface {v1}, Lj0/k/h/a/d;->m()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-interface {v1}, Lj0/k/h/a/d;->f()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v3, v0, v4, v1, v2}, Ljava/lang/StackTraceElement;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
-
-    move-object v0, v3
-
-    goto :goto_8
-
-    :cond_9
-    const-string v0, "Debug metadata version mismatch. Expected: "
-
-    const-string v1, ", got "
-
-    const-string v4, ". Please update the Kotlin standard library."
-
-    invoke-static {v0, v3, v1, v2, v4}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_a
-    :goto_8
-    return-object v0
-.end method
-
-.method public abstract invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-.end method
-
-.method public releaseIntercepted()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final resumeWith(Ljava/lang/Object;)V
-    .locals 3
-
-    move-object v0, p0
-
-    :goto_0
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_3
-
-    iget-object v2, v0, Lj0/k/h/a/a;->completion:Lkotlin/coroutines/Continuation;
-
-    if-eqz v2, :cond_2
-
-    :try_start_0
-    invoke-virtual {v0, p1}, Lj0/k/h/a/a;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    sget-object v1, Lj0/k/g/a;->d:Lj0/k/g/a;
-
-    if-ne p1, v1, :cond_0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    :cond_0
-    invoke-virtual {v0}, Lj0/k/h/a/a;->releaseIntercepted()V
-
-    instance-of v0, v2, Lj0/k/h/a/a;
-
-    if-eqz v0, :cond_1
-
-    move-object v0, v2
-
-    check-cast v0, Lj0/k/h/a/a;
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {v2, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
-    const-string p1, "frame"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "Continuation at "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lj0/k/h/a/a;->getStackTraceElement()Ljava/lang/StackTraceElement;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/b.smali b/com.discord/smali_classes2/j0/k/h/a/b.smali
deleted file mode 100644
index 9696fb98cf..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/b.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public final Lj0/k/h/a/b;
-.super Ljava/lang/Object;
-.source "ContinuationImpl.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/Continuation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/Continuation<",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/k/h/a/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/k/h/a/b;
-
-    invoke-direct {v0}, Lj0/k/h/a/b;-><init>()V
-
-    sput-object v0, Lj0/k/h/a/b;->d:Lj0/k/h/a/b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 2
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "This continuation is already complete"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public resumeWith(Ljava/lang/Object;)V
-    .locals 1
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "This continuation is already complete"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "This continuation is already complete"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/c.smali b/com.discord/smali_classes2/j0/k/h/a/c.smali
deleted file mode 100644
index d24345d602..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/c.smali
+++ /dev/null
@@ -1,179 +0,0 @@
-.class public abstract Lj0/k/h/a/c;
-.super Lj0/k/h/a/a;
-.source "ContinuationImpl.kt"
-
-
-# instance fields
-.field public final _context:Lkotlin/coroutines/CoroutineContext;
-
-.field public transient intercepted:Lkotlin/coroutines/Continuation;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/Continuation;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-direct {p0, p1, v0}, Lj0/k/h/a/c;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;",
-            "Lkotlin/coroutines/CoroutineContext;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lj0/k/h/a/a;-><init>(Lkotlin/coroutines/Continuation;)V
-
-    iput-object p2, p0, Lj0/k/h/a/c;->_context:Lkotlin/coroutines/CoroutineContext;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    iget-object v0, p0, Lj0/k/h/a/c;->_context:Lkotlin/coroutines/CoroutineContext;
-
-    if-eqz v0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public final intercepted()Lkotlin/coroutines/Continuation;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/k/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-virtual {p0}, Lj0/k/h/a/c;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    sget-object v1, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-interface {v0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v0
-
-    check-cast v0, Lj0/k/d;
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {v0, p0}, Lj0/k/d;->interceptContinuation(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v0, p0
-
-    :goto_0
-    iput-object v0, p0, Lj0/k/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
-
-    :goto_1
-    return-object v0
-.end method
-
-.method public releaseIntercepted()V
-    .locals 3
-
-    iget-object v0, p0, Lj0/k/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
-
-    if-eqz v0, :cond_1
-
-    if-eq v0, p0, :cond_1
-
-    invoke-virtual {p0}, Lj0/k/h/a/c;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v1
-
-    sget-object v2, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-interface {v1, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    check-cast v1, Lj0/k/d;
-
-    invoke-interface {v1, v0}, Lj0/k/d;->releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    sget-object v0, Lj0/k/h/a/b;->d:Lj0/k/h/a/b;
-
-    iput-object v0, p0, Lj0/k/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/d.smali b/com.discord/smali_classes2/j0/k/h/a/d.smali
deleted file mode 100644
index fcbe99bc7f..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/d.smali
+++ /dev/null
@@ -1,48 +0,0 @@
-.class public interface abstract annotation Lj0/k/h/a/d;
-.super Ljava/lang/Object;
-.source "DebugMetadata.kt"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lj0/k/h/a/d;
-        c = ""
-        f = ""
-        i = {}
-        l = {}
-        m = ""
-        n = {}
-        s = {}
-        v = 0x1
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->TYPE:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract c()Ljava/lang/String;
-.end method
-
-.method public abstract f()Ljava/lang/String;
-.end method
-
-.method public abstract l()[I
-.end method
-
-.method public abstract m()Ljava/lang/String;
-.end method
-
-.method public abstract v()I
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/e$a.smali b/com.discord/smali_classes2/j0/k/h/a/e$a.smali
deleted file mode 100644
index 34ce199842..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/e$a.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public final Lj0/k/h/a/e$a;
-.super Ljava/lang/Object;
-.source "DebugMetadata.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/k/h/a/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/reflect/Method;
-
-.field public final b:Ljava/lang/reflect/Method;
-
-.field public final c:Ljava/lang/reflect/Method;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/k/h/a/e$a;->a:Ljava/lang/reflect/Method;
-
-    iput-object p2, p0, Lj0/k/h/a/e$a;->b:Ljava/lang/reflect/Method;
-
-    iput-object p3, p0, Lj0/k/h/a/e$a;->c:Ljava/lang/reflect/Method;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/e.smali b/com.discord/smali_classes2/j0/k/h/a/e.smali
deleted file mode 100644
index 26223855cf..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/e.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class public final Lj0/k/h/a/e;
-.super Ljava/lang/Object;
-.source "DebugMetadata.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/k/h/a/e$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lj0/k/h/a/e$a;
-
-.field public static b:Lj0/k/h/a/e$a;
-
-.field public static final c:Lj0/k/h/a/e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lj0/k/h/a/e;
-
-    invoke-direct {v0}, Lj0/k/h/a/e;-><init>()V
-
-    sput-object v0, Lj0/k/h/a/e;->c:Lj0/k/h/a/e;
-
-    new-instance v0, Lj0/k/h/a/e$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1, v1, v1}, Lj0/k/h/a/e$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
-
-    sput-object v0, Lj0/k/h/a/e;->a:Lj0/k/h/a/e$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/f.smali b/com.discord/smali_classes2/j0/k/h/a/f.smali
deleted file mode 100644
index f127cd831d..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/f.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public abstract Lj0/k/h/a/f;
-.super Lj0/k/h/a/a;
-.source "ContinuationImpl.kt"
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/Continuation;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lj0/k/h/a/a;-><init>(Lkotlin/coroutines/Continuation;)V
-
-    if-eqz p1, :cond_2
-
-    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    if-ne p1, v0, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Coroutines with restricted suspension must have EmptyCoroutineContext"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    :goto_1
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/k/h/a/g.smali b/com.discord/smali_classes2/j0/k/h/a/g.smali
deleted file mode 100644
index 2b188c9b22..0000000000
--- a/com.discord/smali_classes2/j0/k/h/a/g.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class public abstract Lj0/k/h/a/g;
-.super Lj0/k/h/a/c;
-.source "ContinuationImpl.kt"
-
-# interfaces
-.implements Lj0/n/c/f;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/k/h/a/c;",
-        "Lj0/n/c/f<",
-        "Ljava/lang/Object;",
-        ">;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final arity:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lj0/k/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(ILkotlin/coroutines/Continuation;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I",
-            "Lkotlin/coroutines/Continuation<",
-            "Ljava/lang/Object;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p2}, Lj0/k/h/a/c;-><init>(Lkotlin/coroutines/Continuation;)V
-
-    iput p1, p0, Lj0/k/h/a/g;->arity:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getArity()I
-    .locals 1
-
-    iget v0, p0, Lj0/k/h/a/g;->arity:I
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/k/h/a/a;->getCompletion()Lkotlin/coroutines/Continuation;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    sget-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    invoke-virtual {v0, p0}, Lj0/n/c/t;->renderLambdaToString(Lj0/n/c/f;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "Reflection.renderLambdaToString(this)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-super {p0}, Lj0/k/h/a/a;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/l/a$a.smali b/com.discord/smali_classes2/j0/l/a$a.smali
deleted file mode 100644
index 10edaf98e7..0000000000
--- a/com.discord/smali_classes2/j0/l/a$a.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lj0/l/a$a;
-.super Ljava/lang/Object;
-.source "PlatformImplementations.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/l/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Ljava/lang/reflect/Method;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 10
-
-    const-class v0, Ljava/lang/Throwable;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getMethods()[Ljava/lang/reflect/Method;
-
-    move-result-object v1
-
-    const-string v2, "throwableClass.methods"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_0
-    const/4 v5, 0x0
-
-    if-ge v4, v2, :cond_3
-
-    aget-object v6, v1, v4
-
-    const-string v7, "it"
-
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v6}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "addSuppressed"
-
-    invoke-static {v7, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v7
-
-    const/4 v8, 0x1
-
-    if-eqz v7, :cond_1
-
-    invoke-virtual {v6}, Ljava/lang/reflect/Method;->getParameterTypes()[Ljava/lang/Class;
-
-    move-result-object v7
-
-    const-string v9, "it.parameterTypes"
-
-    invoke-static {v7, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v9, v7
-
-    if-ne v9, v8, :cond_0
-
-    aget-object v5, v7, v3
-
-    :cond_0
-    invoke-static {v5, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v8, 0x0
-
-    :goto_1
-    if-eqz v8, :cond_2
-
-    move-object v5, v6
-
-    goto :goto_2
-
-    :cond_2
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    :goto_2
-    sput-object v5, Lj0/l/a$a;->a:Ljava/lang/reflect/Method;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/l/a.smali b/com.discord/smali_classes2/j0/l/a.smali
deleted file mode 100644
index cc02f91d61..0000000000
--- a/com.discord/smali_classes2/j0/l/a.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public Lj0/l/a;
-.super Ljava/lang/Object;
-.source "PlatformImplementations.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/l/a$a;
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    .locals 3
-
-    sget-object v0, Lj0/l/a$a;->a:Ljava/lang/reflect/Method;
-
-    if-eqz v0, :cond_0
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    const/4 v2, 0x0
-
-    aput-object p2, v1, v2
-
-    invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/l/b.smali b/com.discord/smali_classes2/j0/l/b.smali
deleted file mode 100644
index f49cae308f..0000000000
--- a/com.discord/smali_classes2/j0/l/b.smali
+++ /dev/null
@@ -1,413 +0,0 @@
-.class public final Lj0/l/b;
-.super Ljava/lang/Object;
-.source "PlatformImplementations.kt"
-
-
-# static fields
-.field public static final a:Lj0/l/a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 11
-
-    const-class v0, Lj0/l/a;
-
-    const-string v1, "java.specification.version"
-
-    invoke-static {v1}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_2
-
-    const/4 v2, 0x6
-
-    const/16 v3, 0x2e
-
-    const/4 v4, 0x0
-
-    invoke-static {v1, v3, v4, v4, v2}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v2
-
-    const/high16 v5, 0x10000
-
-    if-gez v2, :cond_0
-
-    :try_start_0
-    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v1
-    :try_end_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    mul-int v1, v1, v5
-
-    goto :goto_0
-
-    :cond_0
-    add-int/lit8 v6, v2, 0x1
-
-    const/4 v7, 0x4
-
-    invoke-static {v1, v3, v6, v4, v7}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v3
-
-    if-gez v3, :cond_1
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    :cond_1
-    invoke-virtual {v1, v4, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v4, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v6, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :try_start_1
-    invoke-static {v2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v2
-
-    mul-int v2, v2, v5
-
-    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v1
-    :try_end_1
-    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0
-
-    add-int/2addr v1, v2
-
-    goto :goto_0
-
-    :catch_0
-    :cond_2
-    const v1, 0x10006
-
-    :goto_0
-    const v2, 0x10008
-
-    const-string v3, "ClassCastException(\"Inst\u2026baseTypeCL\").initCause(e)"
-
-    const-string v4, ", base type classloader: "
-
-    const-string v5, "Instance classloader: "
-
-    const-string v6, "Class.forName(\"kotlin.in\u2026entations\").newInstance()"
-
-    if-lt v1, v2, :cond_3
-
-    :try_start_2
-    const-string v2, "kotlin.internal.jdk8.JDK8PlatformImplementations"
-
-    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    :try_end_2
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_2 .. :try_end_2} :catch_2
-
-    :try_start_3
-    check-cast v2, Lj0/l/a;
-    :try_end_3
-    .catch Ljava/lang/ClassCastException; {:try_start_3 .. :try_end_3} :catch_1
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_3 .. :try_end_3} :catch_2
-
-    goto/16 :goto_1
-
-    :catch_1
-    move-exception v7
-
-    :try_start_4
-    invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v2
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v8
-
-    new-instance v9, Ljava/lang/ClassCastException;
-
-    new-instance v10, Ljava/lang/StringBuilder;
-
-    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v10, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v9, v2}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v9, v7}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v2
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v2
-    :try_end_4
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_4 .. :try_end_4} :catch_2
-
-    :catch_2
-    :try_start_5
-    const-string v2, "kotlin.internal.JRE8PlatformImplementations"
-
-    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    :try_end_5
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_5 .. :try_end_5} :catch_4
-
-    :try_start_6
-    check-cast v2, Lj0/l/a;
-    :try_end_6
-    .catch Ljava/lang/ClassCastException; {:try_start_6 .. :try_end_6} :catch_3
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_6 .. :try_end_6} :catch_4
-
-    goto/16 :goto_1
-
-    :catch_3
-    move-exception v7
-
-    :try_start_7
-    invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v2
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v8
-
-    new-instance v9, Ljava/lang/ClassCastException;
-
-    new-instance v10, Ljava/lang/StringBuilder;
-
-    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v10, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v9, v2}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v9, v7}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v2
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v2
-    :try_end_7
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_7 .. :try_end_7} :catch_4
-
-    :catch_4
-    nop
-
-    :cond_3
-    const v2, 0x10007
-
-    if-lt v1, v2, :cond_4
-
-    :try_start_8
-    const-string v1, "j0.l.c.a"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    :try_end_8
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_8 .. :try_end_8} :catch_6
-
-    :try_start_9
-    move-object v2, v1
-
-    check-cast v2, Lj0/l/a;
-    :try_end_9
-    .catch Ljava/lang/ClassCastException; {:try_start_9 .. :try_end_9} :catch_5
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_9 .. :try_end_9} :catch_6
-
-    goto :goto_1
-
-    :catch_5
-    move-exception v2
-
-    :try_start_a
-    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v1
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v7
-
-    new-instance v8, Ljava/lang/ClassCastException;
-
-    new-instance v9, Ljava/lang/StringBuilder;
-
-    invoke-direct {v9}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v8, v1}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v8, v2}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v1
-    :try_end_a
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_a .. :try_end_a} :catch_6
-
-    :catch_6
-    :try_start_b
-    const-string v1, "kotlin.internal.JRE7PlatformImplementations"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    :try_end_b
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_b .. :try_end_b} :catch_8
-
-    :try_start_c
-    move-object v2, v1
-
-    check-cast v2, Lj0/l/a;
-    :try_end_c
-    .catch Ljava/lang/ClassCastException; {:try_start_c .. :try_end_c} :catch_7
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_c .. :try_end_c} :catch_8
-
-    goto :goto_1
-
-    :catch_7
-    move-exception v2
-
-    :try_start_d
-    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v1
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v0
-
-    new-instance v6, Ljava/lang/ClassCastException;
-
-    new-instance v7, Ljava/lang/StringBuilder;
-
-    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v6, v0}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v6, v2}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v0
-    :try_end_d
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_d .. :try_end_d} :catch_8
-
-    :catch_8
-    :cond_4
-    new-instance v2, Lj0/l/a;
-
-    invoke-direct {v2}, Lj0/l/a;-><init>()V
-
-    :goto_1
-    sput-object v2, Lj0/l/b;->a:Lj0/l/a;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/l/c/a.smali b/com.discord/smali_classes2/j0/l/c/a.smali
deleted file mode 100644
index 502b9ecd71..0000000000
--- a/com.discord/smali_classes2/j0/l/c/a.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-.class public Lj0/l/c/a;
-.super Lj0/l/a;
-.source "JDK7PlatformImplementations.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/l/a;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    .locals 0
-
-    invoke-virtual {p1, p2}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/m/a$a.smali b/com.discord/smali_classes2/j0/m/a$a.smali
deleted file mode 100644
index 3e84aabf29..0000000000
--- a/com.discord/smali_classes2/j0/m/a$a.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public abstract Lj0/m/a$a;
-.super Lj0/m/a$c;
-.source "FileTreeWalk.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/m/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Ljava/io/File;)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Lj0/m/a$c;-><init>(Ljava/io/File;)V
-
-    sget-boolean v0, Lj0/h;->a:Z
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p1}, Ljava/io/File;->isDirectory()Z
-
-    move-result p1
-
-    sget-boolean v0, Lj0/h;->a:Z
-
-    if-eqz v0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string v0, "rootDir must be verified to be directory beforehand."
-
-    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/m/a$b$a.smali b/com.discord/smali_classes2/j0/m/a$b$a.smali
deleted file mode 100644
index 55e73c118c..0000000000
--- a/com.discord/smali_classes2/j0/m/a$b$a.smali
+++ /dev/null
@@ -1,188 +0,0 @@
-.class public final Lj0/m/a$b$a;
-.super Lj0/m/a$a;
-.source "FileTreeWalk.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/m/a$b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public b:Z
-
-.field public c:[Ljava/io/File;
-
-.field public d:I
-
-.field public e:Z
-
-.field public final synthetic f:Lj0/m/a$b;
-
-
-# direct methods
-.method public constructor <init>(Lj0/m/a$b;Ljava/io/File;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/io/File;",
-            ")V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    iput-object p1, p0, Lj0/m/a$b$a;->f:Lj0/m/a$b;
-
-    invoke-direct {p0, p2}, Lj0/m/a$a;-><init>(Ljava/io/File;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "rootDir"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public step()Ljava/io/File;
-    .locals 8
-
-    iget-boolean v0, p0, Lj0/m/a$b$a;->e:Z
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Lj0/m/a$b$a;->c:[Ljava/io/File;
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Lj0/m/a$b$a;->f:Lj0/m/a$b;
-
-    iget-object v0, v0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->c:Lkotlin/jvm/functions/Function1;
-
-    if-eqz v0, :cond_0
-
-    iget-object v3, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-interface {v0, v3}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-object v2
-
-    :cond_0
-    iget-object v0, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lj0/m/a$b$a;->c:[Ljava/io/File;
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Lj0/m/a$b$a;->f:Lj0/m/a$b;
-
-    iget-object v0, v0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->e:Lkotlin/jvm/functions/Function2;
-
-    if-eqz v0, :cond_1
-
-    iget-object v3, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    new-instance v4, Lkotlin/io/AccessDeniedException;
-
-    iget-object v5, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    const/4 v6, 0x2
-
-    const-string v7, "Cannot list files in a directory"
-
-    invoke-direct {v4, v5, v2, v7, v6}, Lkotlin/io/AccessDeniedException;-><init>(Ljava/io/File;Ljava/io/File;Ljava/lang/String;I)V
-
-    invoke-interface {v0, v3, v4}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/Unit;
-
-    :cond_1
-    iput-boolean v1, p0, Lj0/m/a$b$a;->e:Z
-
-    :cond_2
-    iget-object v0, p0, Lj0/m/a$b$a;->c:[Ljava/io/File;
-
-    if-eqz v0, :cond_3
-
-    iget v3, p0, Lj0/m/a$b$a;->d:I
-
-    array-length v4, v0
-
-    if-ge v3, v4, :cond_3
-
-    add-int/lit8 v1, v3, 0x1
-
-    iput v1, p0, Lj0/m/a$b$a;->d:I
-
-    aget-object v0, v0, v3
-
-    return-object v0
-
-    :cond_3
-    iget-boolean v0, p0, Lj0/m/a$b$a;->b:Z
-
-    if-nez v0, :cond_4
-
-    iput-boolean v1, p0, Lj0/m/a$b$a;->b:Z
-
-    iget-object v0, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    return-object v0
-
-    :cond_4
-    iget-object v0, p0, Lj0/m/a$b$a;->f:Lj0/m/a$b;
-
-    iget-object v0, v0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->d:Lkotlin/jvm/functions/Function1;
-
-    if-eqz v0, :cond_5
-
-    iget-object v1, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/Unit;
-
-    :cond_5
-    return-object v2
-.end method
diff --git a/com.discord/smali_classes2/j0/m/a$b$b.smali b/com.discord/smali_classes2/j0/m/a$b$b.smali
deleted file mode 100644
index 2a2c4e2537..0000000000
--- a/com.discord/smali_classes2/j0/m/a$b$b.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public final Lj0/m/a$b$b;
-.super Lj0/m/a$c;
-.source "FileTreeWalk.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/m/a$b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public b:Z
-
-
-# direct methods
-.method public constructor <init>(Lj0/m/a$b;Ljava/io/File;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/io/File;",
-            ")V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_2
-
-    invoke-direct {p0, p2}, Lj0/m/a$c;-><init>(Ljava/io/File;)V
-
-    sget-boolean p1, Lj0/h;->a:Z
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p2}, Ljava/io/File;->isFile()Z
-
-    move-result p1
-
-    sget-boolean p2, Lj0/h;->a:Z
-
-    if-eqz p2, :cond_1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string p2, "rootFile must be verified to be file beforehand."
-
-    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-void
-
-    :cond_2
-    const-string p1, "rootFile"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public step()Ljava/io/File;
-    .locals 1
-
-    iget-boolean v0, p0, Lj0/m/a$b$b;->b:Z
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x0
-
-    return-object v0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lj0/m/a$b$b;->b:Z
-
-    iget-object v0, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/m/a$b$c.smali b/com.discord/smali_classes2/j0/m/a$b$c.smali
deleted file mode 100644
index 4c2d52dac8..0000000000
--- a/com.discord/smali_classes2/j0/m/a$b$c.smali
+++ /dev/null
@@ -1,223 +0,0 @@
-.class public final Lj0/m/a$b$c;
-.super Lj0/m/a$a;
-.source "FileTreeWalk.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/m/a$b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public b:Z
-
-.field public c:[Ljava/io/File;
-
-.field public d:I
-
-.field public final synthetic e:Lj0/m/a$b;
-
-
-# direct methods
-.method public constructor <init>(Lj0/m/a$b;Ljava/io/File;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/io/File;",
-            ")V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    iput-object p1, p0, Lj0/m/a$b$c;->e:Lj0/m/a$b;
-
-    invoke-direct {p0, p2}, Lj0/m/a$a;-><init>(Ljava/io/File;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "rootDir"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public step()Ljava/io/File;
-    .locals 7
-
-    iget-boolean v0, p0, Lj0/m/a$b$c;->b:Z
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lj0/m/a$b$c;->e:Lj0/m/a$b;
-
-    iget-object v0, v0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->c:Lkotlin/jvm/functions/Function1;
-
-    if-eqz v0, :cond_0
-
-    iget-object v2, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-interface {v0, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-object v1
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lj0/m/a$b$c;->b:Z
-
-    iget-object v0, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    return-object v0
-
-    :cond_1
-    iget-object v0, p0, Lj0/m/a$b$c;->c:[Ljava/io/File;
-
-    if-eqz v0, :cond_4
-
-    iget v2, p0, Lj0/m/a$b$c;->d:I
-
-    array-length v0, v0
-
-    if-ge v2, v0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v0, p0, Lj0/m/a$b$c;->e:Lj0/m/a$b;
-
-    iget-object v0, v0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->d:Lkotlin/jvm/functions/Function1;
-
-    if-eqz v0, :cond_3
-
-    iget-object v2, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-interface {v0, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/Unit;
-
-    :cond_3
-    return-object v1
-
-    :cond_4
-    :goto_0
-    iget-object v0, p0, Lj0/m/a$b$c;->c:[Ljava/io/File;
-
-    if-nez v0, :cond_8
-
-    iget-object v0, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lj0/m/a$b$c;->c:[Ljava/io/File;
-
-    if-nez v0, :cond_5
-
-    iget-object v0, p0, Lj0/m/a$b$c;->e:Lj0/m/a$b;
-
-    iget-object v0, v0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->e:Lkotlin/jvm/functions/Function2;
-
-    if-eqz v0, :cond_5
-
-    iget-object v2, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    new-instance v3, Lkotlin/io/AccessDeniedException;
-
-    iget-object v4, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    const/4 v5, 0x2
-
-    const-string v6, "Cannot list files in a directory"
-
-    invoke-direct {v3, v4, v1, v6, v5}, Lkotlin/io/AccessDeniedException;-><init>(Ljava/io/File;Ljava/io/File;Ljava/lang/String;I)V
-
-    invoke-interface {v0, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/Unit;
-
-    :cond_5
-    iget-object v0, p0, Lj0/m/a$b$c;->c:[Ljava/io/File;
-
-    if-eqz v0, :cond_6
-
-    array-length v0, v0
-
-    if-nez v0, :cond_8
-
-    :cond_6
-    iget-object v0, p0, Lj0/m/a$b$c;->e:Lj0/m/a$b;
-
-    iget-object v0, v0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->d:Lkotlin/jvm/functions/Function1;
-
-    if-eqz v0, :cond_7
-
-    iget-object v2, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-interface {v0, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/Unit;
-
-    :cond_7
-    return-object v1
-
-    :cond_8
-    iget-object v0, p0, Lj0/m/a$b$c;->c:[Ljava/io/File;
-
-    if-eqz v0, :cond_9
-
-    iget v1, p0, Lj0/m/a$b$c;->d:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lj0/m/a$b$c;->d:I
-
-    aget-object v0, v0, v1
-
-    return-object v0
-
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/j0/m/a$b.smali b/com.discord/smali_classes2/j0/m/a$b.smali
deleted file mode 100644
index 3ec108e4f5..0000000000
--- a/com.discord/smali_classes2/j0/m/a$b.smali
+++ /dev/null
@@ -1,245 +0,0 @@
-.class public final Lj0/m/a$b;
-.super Lj0/i/b;
-.source "FileTreeWalk.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/m/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/m/a$b$a;,
-        Lj0/m/a$b$c;,
-        Lj0/m/a$b$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/i/b<",
-        "Ljava/io/File;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final f:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Lj0/m/a$c;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic g:Lj0/m/a;
-
-
-# direct methods
-.method public constructor <init>(Lj0/m/a;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    invoke-direct {p0}, Lj0/i/b;-><init>()V
-
-    new-instance v0, Ljava/util/ArrayDeque;
-
-    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object v0, p0, Lj0/m/a$b;->f:Ljava/util/ArrayDeque;
-
-    iget-object v0, p1, Lj0/m/a;->a:Ljava/io/File;
-
-    invoke-virtual {v0}, Ljava/io/File;->isDirectory()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lj0/m/a$b;->f:Ljava/util/ArrayDeque;
-
-    iget-object p1, p1, Lj0/m/a;->a:Ljava/io/File;
-
-    invoke-virtual {p0, p1}, Lj0/m/a$b;->b(Ljava/io/File;)Lj0/m/a$a;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->push(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p1, Lj0/m/a;->a:Ljava/io/File;
-
-    invoke-virtual {v0}, Ljava/io/File;->isFile()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lj0/m/a$b;->f:Ljava/util/ArrayDeque;
-
-    new-instance v1, Lj0/m/a$b$b;
-
-    iget-object p1, p1, Lj0/m/a;->a:Ljava/io/File;
-
-    invoke-direct {v1, p0, p1}, Lj0/m/a$b$b;-><init>(Lj0/m/a$b;Ljava/io/File;)V
-
-    invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->push(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_1
-    sget-object p1, Lj0/i/u;->f:Lj0/i/u;
-
-    iput-object p1, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 3
-
-    :goto_0
-    iget-object v0, p0, Lj0/m/a$b;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->peek()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lj0/m/a$c;
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Lj0/m/a$c;->step()Ljava/io/File;
-
-    move-result-object v1
-
-    if-nez v1, :cond_0
-
-    iget-object v0, p0, Lj0/m/a$b;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->pop()Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, v0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    invoke-virtual {v1}, Ljava/io/File;->isDirectory()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lj0/m/a$b;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->size()I
-
-    move-result v0
-
-    iget-object v2, p0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget v2, v2, Lj0/m/a;->f:I
-
-    if-lt v0, v2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v0, p0, Lj0/m/a$b;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {p0, v1}, Lj0/m/a$b;->b(Ljava/io/File;)Lj0/m/a$a;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->push(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :cond_3
-    :goto_1
-    if-eqz v1, :cond_4
-
-    iput-object v1, p0, Lj0/i/b;->e:Ljava/lang/Object;
-
-    sget-object v0, Lj0/i/u;->d:Lj0/i/u;
-
-    iput-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    goto :goto_2
-
-    :cond_4
-    sget-object v0, Lj0/i/u;->f:Lj0/i/u;
-
-    iput-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    :goto_2
-    return-void
-.end method
-
-.method public final b(Ljava/io/File;)Lj0/m/a$a;
-    .locals 2
-
-    iget-object v0, p0, Lj0/m/a$b;->g:Lj0/m/a;
-
-    iget-object v0, v0, Lj0/m/a;->b:Lj0/m/b;
-
-    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    new-instance v0, Lj0/m/a$b$a;
-
-    invoke-direct {v0, p0, p1}, Lj0/m/a$b$a;-><init>(Lj0/m/a$b;Ljava/io/File;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lkotlin/NoWhenBranchMatchedException;
-
-    invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    new-instance v0, Lj0/m/a$b$c;
-
-    invoke-direct {v0, p0, p1}, Lj0/m/a$b$c;-><init>(Lj0/m/a$b;Ljava/io/File;)V
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/m/a$c.smali b/com.discord/smali_classes2/j0/m/a$c.smali
deleted file mode 100644
index d95fc52939..0000000000
--- a/com.discord/smali_classes2/j0/m/a$c.smali
+++ /dev/null
@@ -1,35 +0,0 @@
-.class public abstract Lj0/m/a$c;
-.super Ljava/lang/Object;
-.source "FileTreeWalk.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/m/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/io/File;
-
-
-# direct methods
-.method public constructor <init>(Ljava/io/File;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/m/a$c;->a:Ljava/io/File;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract step()Ljava/io/File;
-.end method
diff --git a/com.discord/smali_classes2/j0/m/a.smali b/com.discord/smali_classes2/j0/m/a.smali
deleted file mode 100644
index 4a8602672c..0000000000
--- a/com.discord/smali_classes2/j0/m/a.smali
+++ /dev/null
@@ -1,113 +0,0 @@
-.class public final Lj0/m/a;
-.super Ljava/lang/Object;
-.source "FileTreeWalk.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/m/a$c;,
-        Lj0/m/a$a;,
-        Lj0/m/a$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "Ljava/io/File;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/io/File;
-
-.field public final b:Lj0/m/b;
-
-.field public final c:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/io/File;",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final d:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/io/File;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "Ljava/io/File;",
-            "Ljava/io/IOException;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final f:I
-
-
-# direct methods
-.method public constructor <init>(Ljava/io/File;Lj0/m/b;)V
-    .locals 1
-
-    const v0, 0x7fffffff
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/m/a;->a:Ljava/io/File;
-
-    iput-object p2, p0, Lj0/m/a;->b:Lj0/m/b;
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lj0/m/a;->c:Lkotlin/jvm/functions/Function1;
-
-    iput-object p1, p0, Lj0/m/a;->d:Lkotlin/jvm/functions/Function1;
-
-    iput-object p1, p0, Lj0/m/a;->e:Lkotlin/jvm/functions/Function2;
-
-    iput v0, p0, Lj0/m/a;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "Ljava/io/File;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/m/a$b;
-
-    invoke-direct {v0, p0}, Lj0/m/a$b;-><init>(Lj0/m/a;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/m/b.smali b/com.discord/smali_classes2/j0/m/b.smali
deleted file mode 100644
index a889396959..0000000000
--- a/com.discord/smali_classes2/j0/m/b.smali
+++ /dev/null
@@ -1,100 +0,0 @@
-.class public final enum Lj0/m/b;
-.super Ljava/lang/Enum;
-.source "FileTreeWalk.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lj0/m/b;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lj0/m/b;
-
-.field public static final enum e:Lj0/m/b;
-
-.field public static final synthetic f:[Lj0/m/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x2
-
-    new-array v0, v0, [Lj0/m/b;
-
-    new-instance v1, Lj0/m/b;
-
-    const-string v2, "TOP_DOWN"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Lj0/m/b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lj0/m/b;->d:Lj0/m/b;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lj0/m/b;
-
-    const-string v2, "BOTTOM_UP"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Lj0/m/b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lj0/m/b;->e:Lj0/m/b;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lj0/m/b;->f:[Lj0/m/b;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lj0/m/b;
-    .locals 1
-
-    const-class v0, Lj0/m/b;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lj0/m/b;
-
-    return-object p0
-.end method
-
-.method public static values()[Lj0/m/b;
-    .locals 1
-
-    sget-object v0, Lj0/m/b;->f:[Lj0/m/b;
-
-    invoke-virtual {v0}, [Lj0/m/b;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lj0/m/b;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/a.smali b/com.discord/smali_classes2/j0/n/a.smali
deleted file mode 100644
index 5a1d617ee3..0000000000
--- a/com.discord/smali_classes2/j0/n/a.smali
+++ /dev/null
@@ -1,15 +0,0 @@
-.class public Lj0/n/a;
-.super Ljava/lang/Error;
-.source "KotlinReflectionNotSupportedError.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    const-string v0, "Kotlin reflection implementation is not found at runtime. Make sure you have kotlin-reflect.jar in the classpath"
-
-    invoke-direct {p0, v0}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/n/b/a.smali b/com.discord/smali_classes2/j0/n/b/a.smali
deleted file mode 100644
index d71380620c..0000000000
--- a/com.discord/smali_classes2/j0/n/b/a.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public interface abstract Lj0/n/b/a;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "P9:",
-        "Ljava/lang/Object;",
-        "P10:",
-        "Ljava/lang/Object;",
-        "P11:",
-        "Ljava/lang/Object;",
-        "P12:",
-        "Ljava/lang/Object;",
-        "P13:",
-        "Ljava/lang/Object;",
-        "P14:",
-        "Ljava/lang/Object;",
-        "P15:",
-        "Ljava/lang/Object;",
-        "P16:",
-        "Ljava/lang/Object;",
-        "P17:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/n/b/b.smali b/com.discord/smali_classes2/j0/n/b/b.smali
deleted file mode 100644
index 65ec031d0c..0000000000
--- a/com.discord/smali_classes2/j0/n/b/b.smali
+++ /dev/null
@@ -1,52 +0,0 @@
-.class public interface abstract Lj0/n/b/b;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "P9:",
-        "Ljava/lang/Object;",
-        "P10:",
-        "Ljava/lang/Object;",
-        "P11:",
-        "Ljava/lang/Object;",
-        "P12:",
-        "Ljava/lang/Object;",
-        "P13:",
-        "Ljava/lang/Object;",
-        "P14:",
-        "Ljava/lang/Object;",
-        "P15:",
-        "Ljava/lang/Object;",
-        "P16:",
-        "Ljava/lang/Object;",
-        "P17:",
-        "Ljava/lang/Object;",
-        "P18:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/n/b/c.smali b/com.discord/smali_classes2/j0/n/b/c.smali
deleted file mode 100644
index 918f0d6fe8..0000000000
--- a/com.discord/smali_classes2/j0/n/b/c.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public interface abstract Lj0/n/b/c;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "P9:",
-        "Ljava/lang/Object;",
-        "P10:",
-        "Ljava/lang/Object;",
-        "P11:",
-        "Ljava/lang/Object;",
-        "P12:",
-        "Ljava/lang/Object;",
-        "P13:",
-        "Ljava/lang/Object;",
-        "P14:",
-        "Ljava/lang/Object;",
-        "P15:",
-        "Ljava/lang/Object;",
-        "P16:",
-        "Ljava/lang/Object;",
-        "P17:",
-        "Ljava/lang/Object;",
-        "P18:",
-        "Ljava/lang/Object;",
-        "P19:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/n/b/d.smali b/com.discord/smali_classes2/j0/n/b/d.smali
deleted file mode 100644
index c662a830a8..0000000000
--- a/com.discord/smali_classes2/j0/n/b/d.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public interface abstract Lj0/n/b/d;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "P9:",
-        "Ljava/lang/Object;",
-        "P10:",
-        "Ljava/lang/Object;",
-        "P11:",
-        "Ljava/lang/Object;",
-        "P12:",
-        "Ljava/lang/Object;",
-        "P13:",
-        "Ljava/lang/Object;",
-        "P14:",
-        "Ljava/lang/Object;",
-        "P15:",
-        "Ljava/lang/Object;",
-        "P16:",
-        "Ljava/lang/Object;",
-        "P17:",
-        "Ljava/lang/Object;",
-        "P18:",
-        "Ljava/lang/Object;",
-        "P19:",
-        "Ljava/lang/Object;",
-        "P20:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/n/b/e.smali b/com.discord/smali_classes2/j0/n/b/e.smali
deleted file mode 100644
index a96bf6efa8..0000000000
--- a/com.discord/smali_classes2/j0/n/b/e.smali
+++ /dev/null
@@ -1,58 +0,0 @@
-.class public interface abstract Lj0/n/b/e;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "P9:",
-        "Ljava/lang/Object;",
-        "P10:",
-        "Ljava/lang/Object;",
-        "P11:",
-        "Ljava/lang/Object;",
-        "P12:",
-        "Ljava/lang/Object;",
-        "P13:",
-        "Ljava/lang/Object;",
-        "P14:",
-        "Ljava/lang/Object;",
-        "P15:",
-        "Ljava/lang/Object;",
-        "P16:",
-        "Ljava/lang/Object;",
-        "P17:",
-        "Ljava/lang/Object;",
-        "P18:",
-        "Ljava/lang/Object;",
-        "P19:",
-        "Ljava/lang/Object;",
-        "P20:",
-        "Ljava/lang/Object;",
-        "P21:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/n/b/f.smali b/com.discord/smali_classes2/j0/n/b/f.smali
deleted file mode 100644
index 5c1d60e5ef..0000000000
--- a/com.discord/smali_classes2/j0/n/b/f.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class public interface abstract Lj0/n/b/f;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "P9:",
-        "Ljava/lang/Object;",
-        "P10:",
-        "Ljava/lang/Object;",
-        "P11:",
-        "Ljava/lang/Object;",
-        "P12:",
-        "Ljava/lang/Object;",
-        "P13:",
-        "Ljava/lang/Object;",
-        "P14:",
-        "Ljava/lang/Object;",
-        "P15:",
-        "Ljava/lang/Object;",
-        "P16:",
-        "Ljava/lang/Object;",
-        "P17:",
-        "Ljava/lang/Object;",
-        "P18:",
-        "Ljava/lang/Object;",
-        "P19:",
-        "Ljava/lang/Object;",
-        "P20:",
-        "Ljava/lang/Object;",
-        "P21:",
-        "Ljava/lang/Object;",
-        "P22:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/n/b/g.smali b/com.discord/smali_classes2/j0/n/b/g.smali
deleted file mode 100644
index 09c0ec61e3..0000000000
--- a/com.discord/smali_classes2/j0/n/b/g.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public interface abstract Lj0/n/b/g;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "P9:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/n/c/a.smali b/com.discord/smali_classes2/j0/n/c/a.smali
deleted file mode 100644
index 30d5727cf6..0000000000
--- a/com.discord/smali_classes2/j0/n/c/a.smali
+++ /dev/null
@@ -1,129 +0,0 @@
-.class public final Lj0/n/c/a;
-.super Ljava/lang/Object;
-.source "ArrayIterator.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public final e:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>([Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/n/c/a;->e:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public hasNext()Z
-    .locals 2
-
-    iget v0, p0, Lj0/n/c/a;->d:I
-
-    iget-object v1, p0, Lj0/n/c/a;->e:[Ljava/lang/Object;
-
-    array-length v1, v1
-
-    if-ge v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lj0/n/c/a;->e:[Ljava/lang/Object;
-
-    iget v1, p0, Lj0/n/c/a;->d:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lj0/n/c/a;->d:I
-
-    aget-object v0, v0, v1
-    :try_end_0
-    .catch Ljava/lang/ArrayIndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    iget v1, p0, Lj0/n/c/a;->d:I
-
-    add-int/lit8 v1, v1, -0x1
-
-    iput v1, p0, Lj0/n/c/a;->d:I
-
-    new-instance v1, Ljava/util/NoSuchElementException;
-
-    invoke-virtual {v0}, Ljava/lang/ArrayIndexOutOfBoundsException;->getMessage()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/b$a.smali b/com.discord/smali_classes2/j0/n/c/b$a.smali
deleted file mode 100644
index 67f389d02e..0000000000
--- a/com.discord/smali_classes2/j0/n/c/b$a.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public Lj0/n/c/b$a;
-.super Ljava/lang/Object;
-.source "CallableReference.java"
-
-# interfaces
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/n/c/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/n/c/b$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/n/c/b$a;
-
-    invoke-direct {v0}, Lj0/n/c/b$a;-><init>()V
-
-    sput-object v0, Lj0/n/c/b$a;->d:Lj0/n/c/b$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method private readResolve()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/ObjectStreamException;
-        }
-    .end annotation
-
-    sget-object v0, Lj0/n/c/b$a;->d:Lj0/n/c/b$a;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/b.smali b/com.discord/smali_classes2/j0/n/c/b.smali
deleted file mode 100644
index edfc3c31bb..0000000000
--- a/com.discord/smali_classes2/j0/n/c/b.smali
+++ /dev/null
@@ -1,314 +0,0 @@
-.class public abstract Lj0/n/c/b;
-.super Ljava/lang/Object;
-.source "CallableReference.java"
-
-# interfaces
-.implements Lkotlin/reflect/KCallable;
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/n/c/b$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final NO_RECEIVER:Ljava/lang/Object;
-
-
-# instance fields
-.field public final receiver:Ljava/lang/Object;
-
-.field public transient reflected:Lkotlin/reflect/KCallable;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    sget-object v0, Lj0/n/c/b$a;->d:Lj0/n/c/b$a;
-
-    sput-object v0, Lj0/n/c/b;->NO_RECEIVER:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    sget-object v0, Lj0/n/c/b;->NO_RECEIVER:Ljava/lang/Object;
-
-    invoke-direct {p0, v0}, Lj0/n/c/b;-><init>(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public callBy(Ljava/util/Map;)Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Lkotlin/reflect/KCallable;->callBy(Ljava/util/Map;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public compute()Lkotlin/reflect/KCallable;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/b;->reflected:Lkotlin/reflect/KCallable;
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lj0/n/c/b;->computeReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lj0/n/c/b;->reflected:Lkotlin/reflect/KCallable;
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public abstract computeReflected()Lkotlin/reflect/KCallable;
-.end method
-
-.method public getAnnotations()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/annotation/Annotation;",
-            ">;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lj0/r/a;->getAnnotations()Ljava/util/List;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getBoundReceiver()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
-
-    return-object v0
-.end method
-
-.method public getName()Ljava/lang/String;
-    .locals 1
-
-    new-instance v0, Ljava/lang/AbstractMethodError;
-
-    invoke-direct {v0}, Ljava/lang/AbstractMethodError;-><init>()V
-
-    throw v0
-.end method
-
-.method public getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    new-instance v0, Ljava/lang/AbstractMethodError;
-
-    invoke-direct {v0}, Ljava/lang/AbstractMethodError;-><init>()V
-
-    throw v0
-.end method
-
-.method public getParameters()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getParameters()Ljava/util/List;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getReflected()Lkotlin/reflect/KCallable;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->compute()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    if-eq v0, p0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Lj0/n/a;
-
-    invoke-direct {v0}, Lj0/n/a;-><init>()V
-
-    throw v0
-.end method
-
-.method public getReturnType()Lkotlin/reflect/KType;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getReturnType()Lkotlin/reflect/KType;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getSignature()Ljava/lang/String;
-    .locals 1
-
-    new-instance v0, Ljava/lang/AbstractMethodError;
-
-    invoke-direct {v0}, Ljava/lang/AbstractMethodError;-><init>()V
-
-    throw v0
-.end method
-
-.method public getTypeParameters()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getTypeParameters()Ljava/util/List;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getVisibility()Lkotlin/reflect/KVisibility;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getVisibility()Lkotlin/reflect/KVisibility;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public isAbstract()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isAbstract()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isFinal()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isFinal()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isOpen()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isOpen()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isSuspend()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isSuspend()Z
-
-    move-result v0
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/c.smali b/com.discord/smali_classes2/j0/n/c/c.smali
deleted file mode 100644
index 88f5397c1e..0000000000
--- a/com.discord/smali_classes2/j0/n/c/c.smali
+++ /dev/null
@@ -1,18 +0,0 @@
-.class public interface abstract Lj0/n/c/c;
-.super Ljava/lang/Object;
-.source "ClassBasedDeclarationContainer.kt"
-
-# interfaces
-.implements Lkotlin/reflect/KDeclarationContainer;
-
-
-# virtual methods
-.method public abstract getJClass()Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/d.smali b/com.discord/smali_classes2/j0/n/c/d.smali
deleted file mode 100644
index ef48d0a854..0000000000
--- a/com.discord/smali_classes2/j0/n/c/d.smali
+++ /dev/null
@@ -1,835 +0,0 @@
-.class public final Lj0/n/c/d;
-.super Ljava/lang/Object;
-.source "ClassReference.kt"
-
-# interfaces
-.implements Lj0/r/b;
-.implements Lj0/n/c/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lj0/r/b<",
-        "Ljava/lang/Object;",
-        ">;",
-        "Lj0/n/c/c;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final e:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/Class<",
-            "+",
-            "Ljava/lang/Object<",
-            "*>;>;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final f:Ljava/util/HashMap;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/HashMap<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final g:Ljava/util/HashMap;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/HashMap<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final h:Ljava/util/HashMap;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/HashMap<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public final d:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 12
-
-    const/16 v0, 0x17
-
-    new-array v0, v0, [Ljava/lang/Class;
-
-    const-class v1, Lkotlin/jvm/functions/Function0;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    const-class v1, Lkotlin/jvm/functions/Function1;
-
-    const/4 v3, 0x1
-
-    aput-object v1, v0, v3
-
-    const-class v1, Lkotlin/jvm/functions/Function2;
-
-    const/4 v3, 0x2
-
-    aput-object v1, v0, v3
-
-    const/4 v1, 0x3
-
-    const-class v4, Lkotlin/jvm/functions/Function3;
-
-    aput-object v4, v0, v1
-
-    const/4 v1, 0x4
-
-    const-class v4, Lkotlin/jvm/functions/Function4;
-
-    aput-object v4, v0, v1
-
-    const/4 v1, 0x5
-
-    const-class v4, Lkotlin/jvm/functions/Function5;
-
-    aput-object v4, v0, v1
-
-    const/4 v1, 0x6
-
-    const-class v4, Lkotlin/jvm/functions/Function6;
-
-    aput-object v4, v0, v1
-
-    const/4 v1, 0x7
-
-    const-class v4, Lkotlin/jvm/functions/Function7;
-
-    aput-object v4, v0, v1
-
-    const/16 v1, 0x8
-
-    const-class v4, Lkotlin/jvm/functions/Function8;
-
-    aput-object v4, v0, v1
-
-    const/16 v1, 0x9
-
-    const-class v4, Lj0/n/b/g;
-
-    aput-object v4, v0, v1
-
-    const-class v1, Lkotlin/jvm/functions/Function10;
-
-    const/16 v4, 0xa
-
-    aput-object v1, v0, v4
-
-    const/16 v1, 0xb
-
-    const-class v5, Lkotlin/jvm/functions/Function11;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0xc
-
-    const-class v5, Lkotlin/jvm/functions/Function12;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0xd
-
-    const-class v5, Lkotlin/jvm/functions/Function13;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0xe
-
-    const-class v5, Lkotlin/jvm/functions/Function14;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0xf
-
-    const-class v5, Lkotlin/jvm/functions/Function15;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0x10
-
-    const-class v5, Lkotlin/jvm/functions/Function16;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0x11
-
-    const-class v5, Lj0/n/b/a;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0x12
-
-    const-class v5, Lj0/n/b/b;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0x13
-
-    const-class v5, Lj0/n/b/c;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0x14
-
-    const-class v5, Lj0/n/b/d;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0x15
-
-    const-class v5, Lj0/n/b/e;
-
-    aput-object v5, v0, v1
-
-    const/16 v1, 0x16
-
-    const-class v5, Lj0/n/b/f;
-
-    aput-object v5, v0, v1
-
-    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-static {v0, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v4
-
-    invoke-direct {v1, v4}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    const/4 v5, 0x0
-
-    if-eqz v4, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    add-int/lit8 v6, v2, 0x1
-
-    if-ltz v2, :cond_0
-
-    check-cast v4, Ljava/lang/Class;
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    new-instance v5, Lkotlin/Pair;
-
-    invoke-direct {v5, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    invoke-interface {v1, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    move v2, v6
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
-
-    throw v5
-
-    :cond_1
-    invoke-static {v1}, Lf/n/a/k/a;->toMap(Ljava/lang/Iterable;)Ljava/util/Map;
-
-    move-result-object v0
-
-    sput-object v0, Lj0/n/c/d;->e:Ljava/util/Map;
-
-    new-instance v0, Ljava/util/HashMap;
-
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
-
-    const-string v1, "boolean"
-
-    const-string v2, "kotlin.Boolean"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "char"
-
-    const-string v4, "kotlin.Char"
-
-    invoke-virtual {v0, v1, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "byte"
-
-    const-string v6, "kotlin.Byte"
-
-    invoke-virtual {v0, v1, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "short"
-
-    const-string v7, "kotlin.Short"
-
-    invoke-virtual {v0, v1, v7}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "int"
-
-    const-string v8, "kotlin.Int"
-
-    invoke-virtual {v0, v1, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "float"
-
-    const-string v9, "kotlin.Float"
-
-    invoke-virtual {v0, v1, v9}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "long"
-
-    const-string v10, "kotlin.Long"
-
-    invoke-virtual {v0, v1, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "double"
-
-    const-string v11, "kotlin.Double"
-
-    invoke-virtual {v0, v1, v11}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    sput-object v0, Lj0/n/c/d;->f:Ljava/util/HashMap;
-
-    new-instance v0, Ljava/util/HashMap;
-
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
-
-    const-string v1, "java.lang.Boolean"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Character"
-
-    invoke-virtual {v0, v1, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Byte"
-
-    invoke-virtual {v0, v1, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Short"
-
-    invoke-virtual {v0, v1, v7}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Integer"
-
-    invoke-virtual {v0, v1, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Float"
-
-    invoke-virtual {v0, v1, v9}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Long"
-
-    invoke-virtual {v0, v1, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Double"
-
-    invoke-virtual {v0, v1, v11}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    sput-object v0, Lj0/n/c/d;->g:Ljava/util/HashMap;
-
-    new-instance v0, Ljava/util/HashMap;
-
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
-
-    const-string v1, "java.lang.Object"
-
-    const-string v2, "kotlin.Any"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.String"
-
-    const-string v2, "kotlin.String"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.CharSequence"
-
-    const-string v2, "kotlin.CharSequence"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Throwable"
-
-    const-string v2, "kotlin.Throwable"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Cloneable"
-
-    const-string v2, "kotlin.Cloneable"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Number"
-
-    const-string v2, "kotlin.Number"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Comparable"
-
-    const-string v2, "kotlin.Comparable"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Enum"
-
-    const-string v2, "kotlin.Enum"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.annotation.Annotation"
-
-    const-string v2, "kotlin.Annotation"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.lang.Iterable"
-
-    const-string v2, "kotlin.collections.Iterable"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.util.Iterator"
-
-    const-string v2, "kotlin.collections.Iterator"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.util.Collection"
-
-    const-string v2, "kotlin.collections.Collection"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.util.List"
-
-    const-string v2, "kotlin.collections.List"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.util.Set"
-
-    const-string v2, "kotlin.collections.Set"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.util.ListIterator"
-
-    const-string v2, "kotlin.collections.ListIterator"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.util.Map"
-
-    const-string v2, "kotlin.collections.Map"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "java.util.Map$Entry"
-
-    const-string v2, "kotlin.collections.Map.Entry"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "kotlin.jvm.internal.StringCompanionObject"
-
-    const-string v2, "kotlin.String.Companion"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    const-string v1, "kotlin.jvm.internal.EnumCompanionObject"
-
-    const-string v2, "kotlin.Enum.Companion"
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    sget-object v1, Lj0/n/c/d;->f:Ljava/util/HashMap;
-
-    invoke-virtual {v0, v1}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
-
-    sget-object v1, Lj0/n/c/d;->g:Ljava/util/HashMap;
-
-    invoke-virtual {v0, v1}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
-
-    sget-object v1, Lj0/n/c/d;->f:Ljava/util/HashMap;
-
-    invoke-virtual {v1}, Ljava/util/HashMap;->values()Ljava/util/Collection;
-
-    move-result-object v1
-
-    const-string v2, "primitiveFqNames.values"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_1
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    const/16 v4, 0x2e
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/String;
-
-    new-instance v6, Ljava/lang/StringBuilder;
-
-    invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v7, "kotlin.jvm.internal."
-
-    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v7, "kotlinName"
-
-    invoke-static {v2, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v2, v4, v5, v3}, Lj0/t/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v4, "CompanionObject"
-
-    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v6, ".Companion"
-
-    invoke-static {v2, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    new-instance v6, Lkotlin/Pair;
-
-    invoke-direct {v6, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    iget-object v2, v6, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    iget-object v4, v6, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    invoke-interface {v0, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_1
-
-    :cond_2
-    sget-object v1, Lj0/n/c/d;->e:Ljava/util/Map;
-
-    invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_2
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/util/Map$Entry;
-
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/Class;
-
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/Number;
-
-    invoke-virtual {v2}, Ljava/lang/Number;->intValue()I
-
-    move-result v2
-
-    invoke-virtual {v6}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v6
-
-    new-instance v7, Ljava/lang/StringBuilder;
-
-    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v8, "kotlin.Function"
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v6, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_2
-
-    :cond_3
-    sput-object v0, Lj0/n/c/d;->h:Ljava/util/HashMap;
-
-    new-instance v1, Ljava/util/LinkedHashMap;
-
-    invoke-interface {v0}, Ljava/util/Map;->size()I
-
-    move-result v2
-
-    invoke-static {v2}, Lf/n/a/k/a;->mapCapacity(I)I
-
-    move-result v2
-
-    invoke-direct {v1, v2}, Ljava/util/LinkedHashMap;-><init>(I)V
-
-    invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_3
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/util/Map$Entry;
-
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v6
-
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/String;
-
-    invoke-static {v2, v4, v5, v3}, Lj0/t/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-interface {v1, v6, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_3
-
-    :cond_4
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/n/c/d;->d:Ljava/lang/Class;
-
-    return-void
-
-    :cond_0
-    const-string p1, "jClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Lj0/n/c/d;
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0}, Lf/n/a/k/a;->getJavaObjectType(Lj0/r/b;)Ljava/lang/Class;
-
-    move-result-object v0
-
-    check-cast p1, Lj0/r/b;
-
-    invoke-static {p1}, Lf/n/a/k/a;->getJavaObjectType(Lj0/r/b;)Ljava/lang/Class;
-
-    move-result-object p1
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public getAnnotations()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/annotation/Annotation;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/n/a;
-
-    invoke-direct {v0}, Lj0/n/a;-><init>()V
-
-    throw v0
-.end method
-
-.method public getJClass()Ljava/lang/Class;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/n/c/d;->d:Ljava/lang/Class;
-
-    return-object v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    invoke-static {p0}, Lf/n/a/k/a;->getJavaObjectType(Lj0/r/b;)Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Class;->hashCode()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lj0/n/c/d;->d:Ljava/lang/Class;
-
-    invoke-virtual {v1}, Ljava/lang/Class;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " (Kotlin reflection is not available)"
-
-    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_classes2/j0/n/c/e.smali b/com.discord/smali_classes2/j0/n/c/e.smali
deleted file mode 100644
index 80b4f2c674..0000000000
--- a/com.discord/smali_classes2/j0/n/c/e.smali
+++ /dev/null
@@ -1,327 +0,0 @@
-.class public final Lj0/n/c/e;
-.super Ljava/lang/Object;
-.source "CollectionToArray.kt"
-
-
-# static fields
-.field public static final a:[Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    sput-object v0, Lj0/n/c/e;->a:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public static final toArray(Ljava/util/Collection;)[Ljava/lang/Object;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)[",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    invoke-interface {p0}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    :goto_0
-    sget-object p0, Lj0/n/c/e;->a:[Ljava/lang/Object;
-
-    goto :goto_3
-
-    :cond_1
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const/4 v1, 0x0
-
-    :goto_1
-    add-int/lit8 v2, v1, 0x1
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    aput-object v3, v0, v1
-
-    array-length v1, v0
-
-    if-lt v2, v1, :cond_5
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    move-object p0, v0
-
-    goto :goto_3
-
-    :cond_2
-    mul-int/lit8 v1, v2, 0x3
-
-    add-int/lit8 v1, v1, 0x1
-
-    ushr-int/lit8 v1, v1, 0x1
-
-    const v3, 0x7ffffffd
-
-    if-gt v1, v2, :cond_4
-
-    if-ge v2, v3, :cond_3
-
-    const v1, 0x7ffffffd
-
-    goto :goto_2
-
-    :cond_3
-    new-instance p0, Ljava/lang/OutOfMemoryError;
-
-    invoke-direct {p0}, Ljava/lang/OutOfMemoryError;-><init>()V
-
-    throw p0
-
-    :cond_4
-    :goto_2
-    invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v0
-
-    const-string v1, "Arrays.copyOf(result, newSize)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_4
-
-    :cond_5
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-nez v1, :cond_6
-
-    invoke-static {v0, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p0
-
-    const-string v0, "Arrays.copyOf(result, size)"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_3
-    return-object p0
-
-    :cond_6
-    :goto_4
-    move v1, v2
-
-    goto :goto_1
-.end method
-
-.method public static final toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;[",
-            "Ljava/lang/Object;",
-            ")[",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_b
-
-    invoke-interface {p0}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    array-length p0, p1
-
-    if-lez p0, :cond_8
-
-    aput-object v0, p1, v2
-
-    goto/16 :goto_2
-
-    :cond_0
-    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-nez v3, :cond_1
-
-    array-length p0, p1
-
-    if-lez p0, :cond_8
-
-    aput-object v0, p1, v2
-
-    goto :goto_2
-
-    :cond_1
-    array-length v3, p1
-
-    if-gt v1, v3, :cond_2
-
-    move-object v1, p1
-
-    goto :goto_0
-
-    :cond_2
-    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object v3
-
-    invoke-static {v3, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_a
-
-    check-cast v1, [Ljava/lang/Object;
-
-    :goto_0
-    add-int/lit8 v3, v2, 0x1
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    aput-object v4, v1, v2
-
-    array-length v2, v1
-
-    if-lt v3, v2, :cond_6
-
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-nez v2, :cond_3
-
-    move-object p1, v1
-
-    goto :goto_2
-
-    :cond_3
-    mul-int/lit8 v2, v3, 0x3
-
-    add-int/lit8 v2, v2, 0x1
-
-    ushr-int/lit8 v2, v2, 0x1
-
-    const v4, 0x7ffffffd
-
-    if-gt v2, v3, :cond_5
-
-    if-ge v3, v4, :cond_4
-
-    const v2, 0x7ffffffd
-
-    goto :goto_1
-
-    :cond_4
-    new-instance p0, Ljava/lang/OutOfMemoryError;
-
-    invoke-direct {p0}, Ljava/lang/OutOfMemoryError;-><init>()V
-
-    throw p0
-
-    :cond_5
-    :goto_1
-    invoke-static {v1, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    const-string v2, "Arrays.copyOf(result, newSize)"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_3
-
-    :cond_6
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-nez v2, :cond_9
-
-    if-ne v1, p1, :cond_7
-
-    aput-object v0, p1, v3
-
-    goto :goto_2
-
-    :cond_7
-    invoke-static {v1, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    const-string p0, "Arrays.copyOf(result, size)"
-
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_8
-    :goto_2
-    return-object p1
-
-    :cond_9
-    :goto_3
-    move v2, v3
-
-    goto :goto_0
-
-    :cond_a
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string p1, "null cannot be cast to non-null type kotlin.Array<kotlin.Any?>"
-
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_b
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/f.smali b/com.discord/smali_classes2/j0/n/c/f.smali
deleted file mode 100644
index 321e11bd5b..0000000000
--- a/com.discord/smali_classes2/j0/n/c/f.smali
+++ /dev/null
@@ -1,21 +0,0 @@
-.class public interface abstract Lj0/n/c/f;
-.super Ljava/lang/Object;
-.source "FunctionBase.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract getArity()I
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/g.smali b/com.discord/smali_classes2/j0/n/c/g.smali
deleted file mode 100644
index d86650100e..0000000000
--- a/com.discord/smali_classes2/j0/n/c/g.smali
+++ /dev/null
@@ -1,374 +0,0 @@
-.class public Lj0/n/c/g;
-.super Lj0/n/c/b;
-.source "FunctionReference.java"
-
-# interfaces
-.implements Lj0/n/c/f;
-.implements Lkotlin/reflect/KFunction;
-
-
-# instance fields
-.field public final arity:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/b;-><init>()V
-
-    iput p1, p0, Lj0/n/c/g;->arity:I
-
-    return-void
-.end method
-
-.method public constructor <init>(ILjava/lang/Object;)V
-    .locals 0
-
-    invoke-direct {p0, p2}, Lj0/n/c/b;-><init>(Ljava/lang/Object;)V
-
-    iput p1, p0, Lj0/n/c/g;->arity:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public computeReflected()Lkotlin/reflect/KCallable;
-    .locals 1
-
-    sget-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    if-eqz v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Lj0/n/c/g;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_3
-
-    check-cast p1, Lj0/n/c/g;
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v1
-
-    if-nez v1, :cond_1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v1
-
-    if-nez v1, :cond_2
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    :goto_0
-    invoke-virtual {p0}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getSignature()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getSignature()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getBoundReceiver()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getBoundReceiver()Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    return v0
-
-    :cond_3
-    instance-of v0, p1, Lkotlin/reflect/KFunction;
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {p0}, Lj0/n/c/b;->compute()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_4
-    return v2
-.end method
-
-.method public getArity()I
-    .locals 1
-
-    iget v0, p0, Lj0/n/c/g;->arity:I
-
-    return v0
-.end method
-
-.method public bridge synthetic getReflected()Lkotlin/reflect/KCallable;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/g;->getReflected()Lkotlin/reflect/KFunction;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getReflected()Lkotlin/reflect/KFunction;
-    .locals 1
-
-    invoke-super {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/reflect/KFunction;
-
-    return-object v0
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    :goto_0
-    invoke-virtual {p0}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getSignature()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public isExternal()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/g;->getReflected()Lkotlin/reflect/KFunction;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isExternal()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isInfix()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/g;->getReflected()Lkotlin/reflect/KFunction;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isInfix()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isInline()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/g;->getReflected()Lkotlin/reflect/KFunction;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isInline()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isOperator()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/g;->getReflected()Lkotlin/reflect/KFunction;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isOperator()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isSuspend()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/g;->getReflected()Lkotlin/reflect/KFunction;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isSuspend()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/n/c/b;->compute()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    if-eq v0, p0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    invoke-virtual {p0}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "<init>"
-
-    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const-string v0, "constructor (Kotlin reflection is not available)"
-
-    goto :goto_0
-
-    :cond_1
-    const-string v0, "function "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " (Kotlin reflection is not available)"
-
-    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
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/h.smali b/com.discord/smali_classes2/j0/n/c/h.smali
deleted file mode 100644
index 7cc216b4b2..0000000000
--- a/com.discord/smali_classes2/j0/n/c/h.smali
+++ /dev/null
@@ -1,302 +0,0 @@
-.class public Lj0/n/c/h;
-.super Ljava/lang/Object;
-.source "Intrinsics.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public static a(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Throwable;",
-            ">(TT;)TT;"
-        }
-    .end annotation
-
-    const-class v0, Lj0/n/c/h;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Throwable;
-
-    return-object p0
-.end method
-
-.method public static areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .locals 0
-
-    if-nez p0, :cond_1
-
-    if-nez p1, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p0
-
-    :goto_0
-    return p0
-.end method
-
-.method public static b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Throwable;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Throwable;",
-            ">(TT;",
-            "Ljava/lang/String;",
-            ")TT;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
-
-    move-result-object v0
-
-    array-length v1, v0
-
-    const/4 v2, -0x1
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_1
-
-    aget-object v4, v0, v3
-
-    invoke-virtual {v4}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {p1, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    move v2, v3
-
-    :cond_0
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    add-int/lit8 v2, v2, 0x1
-
-    invoke-static {v0, v2, v1}, Ljava/util/Arrays;->copyOfRange([Ljava/lang/Object;II)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Ljava/lang/StackTraceElement;
-
-    invoke-virtual {p0, p1}, Ljava/lang/Throwable;->setStackTrace([Ljava/lang/StackTraceElement;)V
-
-    return-object p0
-.end method
-
-.method public static c(Ljava/lang/String;)V
-    .locals 5
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->getStackTrace()[Ljava/lang/StackTraceElement;
-
-    move-result-object v0
-
-    const/4 v1, 0x3
-
-    aget-object v0, v0, v1
-
-    invoke-virtual {v0}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0}, Ljava/lang/StackTraceElement;->getMethodName()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v4, "Parameter specified as non-null is null: method "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "."
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, ", parameter "
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v2, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/n/c/h;->a(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    check-cast v2, Ljava/lang/IllegalArgumentException;
-
-    throw v2
-.end method
-
-.method public static checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    .locals 1
-
-    if-eqz p0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    const-string v0, " must not be null"
-
-    invoke-static {p1, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    invoke-static {p0}, Lj0/n/c/h;->a(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw p0
-.end method
-
-.method public static checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static compare(II)I
-    .locals 0
-
-    if-ge p0, p1, :cond_0
-
-    const/4 p0, -0x1
-
-    goto :goto_0
-
-    :cond_0
-    if-ne p0, p1, :cond_1
-
-    const/4 p0, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p0, 0x1
-
-    :goto_0
-    return p0
-.end method
-
-.method public static reifiedOperationMarker()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "This function has a reified type parameter and thus can only be inlined at compilation time, not called directly."
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
-    .locals 1
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static throwNpe()V
-    .locals 1
-
-    new-instance v0, Lkotlin/KotlinNullPointerException;
-
-    invoke-direct {v0}, Lkotlin/KotlinNullPointerException;-><init>()V
-
-    invoke-static {v0}, Lj0/n/c/h;->a(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    check-cast v0, Lkotlin/KotlinNullPointerException;
-
-    throw v0
-.end method
-
-.method public static throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-    .locals 2
-
-    const-string v0, "lateinit property "
-
-    const-string v1, " has not been initialized"
-
-    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance v0, Lkotlin/UninitializedPropertyAccessException;
-
-    invoke-direct {v0, p0}, Lkotlin/UninitializedPropertyAccessException;-><init>(Ljava/lang/String;)V
-
-    invoke-static {v0}, Lj0/n/c/h;->a(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/i.smali b/com.discord/smali_classes2/j0/n/c/i.smali
deleted file mode 100644
index d130fb0161..0000000000
--- a/com.discord/smali_classes2/j0/n/c/i.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public abstract Lj0/n/c/i;
-.super Ljava/lang/Object;
-.source "Lambda.kt"
-
-# interfaces
-.implements Lj0/n/c/f;
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lj0/n/c/f<",
-        "TR;>;",
-        "Ljava/io/Serializable;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final arity:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lj0/n/c/i;->arity:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getArity()I
-    .locals 1
-
-    iget v0, p0, Lj0/n/c/i;->arity:I
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    sget-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    invoke-virtual {v0, p0}, Lj0/n/c/t;->renderLambdaToString(Lj0/n/c/f;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "Reflection.renderLambdaToString(this)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/j.smali b/com.discord/smali_classes2/j0/n/c/j.smali
deleted file mode 100644
index 371d1a7b47..0000000000
--- a/com.discord/smali_classes2/j0/n/c/j.smali
+++ /dev/null
@@ -1,112 +0,0 @@
-.class public abstract Lj0/n/c/j;
-.super Lj0/n/c/n;
-.source "MutablePropertyReference0.java"
-
-# interfaces
-.implements Lkotlin/reflect/KMutableProperty0;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/n;-><init>()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lj0/n/c/n;-><init>(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public computeReflected()Lkotlin/reflect/KCallable;
-    .locals 0
-
-    invoke-static {p0}, Lj0/n/c/s;->mutableProperty0(Lj0/n/c/j;)Lkotlin/reflect/KMutableProperty0;
-
-    return-object p0
-.end method
-
-.method public getDelegate()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/reflect/KMutableProperty0;
-
-    invoke-interface {v0}, Lkotlin/reflect/KProperty0;->getDelegate()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public bridge synthetic getGetter()Lkotlin/reflect/KProperty$Getter;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/j;->getGetter()Lkotlin/reflect/KProperty0$Getter;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getGetter()Lkotlin/reflect/KProperty0$Getter;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/reflect/KMutableProperty0;
-
-    invoke-interface {v0}, Lkotlin/reflect/KProperty0;->getGetter()Lkotlin/reflect/KProperty0$Getter;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public bridge synthetic getSetter()Lkotlin/reflect/KMutableProperty$Setter;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/j;->getSetter()Lkotlin/reflect/KMutableProperty0$Setter;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getSetter()Lkotlin/reflect/KMutableProperty0$Setter;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/reflect/KMutableProperty0;
-
-    invoke-interface {v0}, Lkotlin/reflect/KMutableProperty0;->getSetter()Lkotlin/reflect/KMutableProperty0$Setter;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-interface {p0}, Lkotlin/reflect/KProperty0;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/k.smali b/com.discord/smali_classes2/j0/n/c/k.smali
deleted file mode 100644
index 98d333080f..0000000000
--- a/com.discord/smali_classes2/j0/n/c/k.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public Lj0/n/c/k;
-.super Lj0/n/c/j;
-.source "MutablePropertyReference0Impl.java"
-
-
-# instance fields
-.field public final name:Ljava/lang/String;
-
-.field public final owner:Lkotlin/reflect/KDeclarationContainer;
-
-.field public final signature:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/j;-><init>()V
-
-    iput-object p1, p0, Lj0/n/c/k;->owner:Lkotlin/reflect/KDeclarationContainer;
-
-    iput-object p2, p0, Lj0/n/c/k;->name:Ljava/lang/String;
-
-    iput-object p3, p0, Lj0/n/c/k;->signature:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public get()Ljava/lang/Object;
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/n/c/j;->getGetter()Lkotlin/reflect/KProperty0$Getter;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    invoke-interface {v0, v1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getName()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/k;->name:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/k;->owner:Lkotlin/reflect/KDeclarationContainer;
-
-    return-object v0
-.end method
-
-.method public getSignature()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/k;->signature:Ljava/lang/String;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/l.smali b/com.discord/smali_classes2/j0/n/c/l.smali
deleted file mode 100644
index 913931ace5..0000000000
--- a/com.discord/smali_classes2/j0/n/c/l.smali
+++ /dev/null
@@ -1,52 +0,0 @@
-.class public abstract Lj0/n/c/l;
-.super Lj0/n/c/n;
-.source "MutablePropertyReference1.java"
-
-# interfaces
-.implements Lj0/r/c;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/n;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public computeReflected()Lkotlin/reflect/KCallable;
-    .locals 0
-
-    invoke-static {p0}, Lj0/n/c/s;->mutableProperty1(Lj0/n/c/l;)Lj0/r/c;
-
-    return-object p0
-.end method
-
-.method public getGetter()Lj0/r/d$a;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    check-cast v0, Lj0/r/c;
-
-    invoke-interface {v0}, Lj0/r/d;->getGetter()Lj0/r/d$a;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    invoke-interface {p0, p1}, Lj0/r/d;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/m.smali b/com.discord/smali_classes2/j0/n/c/m.smali
deleted file mode 100644
index 11668d5527..0000000000
--- a/com.discord/smali_classes2/j0/n/c/m.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public Lj0/n/c/m;
-.super Lj0/n/c/l;
-.source "MutablePropertyReference1Impl.java"
-
-
-# instance fields
-.field public final name:Ljava/lang/String;
-
-.field public final owner:Lkotlin/reflect/KDeclarationContainer;
-
-.field public final signature:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/l;-><init>()V
-
-    iput-object p1, p0, Lj0/n/c/m;->owner:Lkotlin/reflect/KDeclarationContainer;
-
-    iput-object p2, p0, Lj0/n/c/m;->name:Ljava/lang/String;
-
-    iput-object p3, p0, Lj0/n/c/m;->signature:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public get(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    invoke-virtual {p0}, Lj0/n/c/l;->getGetter()Lj0/r/d$a;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    const/4 v2, 0x0
-
-    aput-object p1, v1, v2
-
-    invoke-interface {v0, v1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public getName()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/m;->name:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/m;->owner:Lkotlin/reflect/KDeclarationContainer;
-
-    return-object v0
-.end method
-
-.method public getSignature()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/m;->signature:Ljava/lang/String;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/n.smali b/com.discord/smali_classes2/j0/n/c/n.smali
deleted file mode 100644
index 6e2e9f1735..0000000000
--- a/com.discord/smali_classes2/j0/n/c/n.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public abstract Lj0/n/c/n;
-.super Lj0/n/c/r;
-.source "MutablePropertyReference.java"
-
-# interfaces
-.implements Lkotlin/reflect/KProperty;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/r;-><init>()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lj0/n/c/r;-><init>(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/o.smali b/com.discord/smali_classes2/j0/n/c/o.smali
deleted file mode 100644
index 9da287340f..0000000000
--- a/com.discord/smali_classes2/j0/n/c/o.smali
+++ /dev/null
@@ -1,143 +0,0 @@
-.class public final Lj0/n/c/o;
-.super Ljava/lang/Object;
-.source "PackageReference.kt"
-
-# interfaces
-.implements Lj0/n/c/c;
-
-
-# instance fields
-.field public final d:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;Ljava/lang/String;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/String;",
-            ")V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/n/c/o;->d:Ljava/lang/Class;
-
-    return-void
-
-    :cond_0
-    const-string p1, "moduleName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "jClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Lj0/n/c/o;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lj0/n/c/o;->d:Ljava/lang/Class;
-
-    check-cast p1, Lj0/n/c/o;
-
-    iget-object p1, p1, Lj0/n/c/o;->d:Ljava/lang/Class;
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public getJClass()Ljava/lang/Class;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/n/c/o;->d:Ljava/lang/Class;
-
-    return-object v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/o;->d:Ljava/lang/Class;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->hashCode()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lj0/n/c/o;->d:Ljava/lang/Class;
-
-    invoke-virtual {v1}, Ljava/lang/Class;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " (Kotlin reflection is not available)"
-
-    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_classes2/j0/n/c/p.smali b/com.discord/smali_classes2/j0/n/c/p.smali
deleted file mode 100644
index c7ec02e1de..0000000000
--- a/com.discord/smali_classes2/j0/n/c/p.smali
+++ /dev/null
@@ -1,52 +0,0 @@
-.class public abstract Lj0/n/c/p;
-.super Lj0/n/c/r;
-.source "PropertyReference1.java"
-
-# interfaces
-.implements Lj0/r/d;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/r;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public computeReflected()Lkotlin/reflect/KCallable;
-    .locals 0
-
-    invoke-static {p0}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    return-object p0
-.end method
-
-.method public getGetter()Lj0/r/d$a;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    check-cast v0, Lj0/r/d;
-
-    invoke-interface {v0}, Lj0/r/d;->getGetter()Lj0/r/d$a;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    invoke-interface {p0, p1}, Lj0/r/d;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/q.smali b/com.discord/smali_classes2/j0/n/c/q.smali
deleted file mode 100644
index 531acc1c1d..0000000000
--- a/com.discord/smali_classes2/j0/n/c/q.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public Lj0/n/c/q;
-.super Lj0/n/c/p;
-.source "PropertyReference1Impl.java"
-
-
-# instance fields
-.field public final name:Ljava/lang/String;
-
-.field public final owner:Lkotlin/reflect/KDeclarationContainer;
-
-.field public final signature:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/p;-><init>()V
-
-    iput-object p1, p0, Lj0/n/c/q;->owner:Lkotlin/reflect/KDeclarationContainer;
-
-    iput-object p2, p0, Lj0/n/c/q;->name:Ljava/lang/String;
-
-    iput-object p3, p0, Lj0/n/c/q;->signature:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public get(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    invoke-virtual {p0}, Lj0/n/c/p;->getGetter()Lj0/r/d$a;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    const/4 v2, 0x0
-
-    aput-object p1, v1, v2
-
-    invoke-interface {v0, v1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public getName()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/q;->name:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/q;->owner:Lkotlin/reflect/KDeclarationContainer;
-
-    return-object v0
-.end method
-
-.method public getSignature()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lj0/n/c/q;->signature:Ljava/lang/String;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/r.smali b/com.discord/smali_classes2/j0/n/c/r.smali
deleted file mode 100644
index 297e53f0af..0000000000
--- a/com.discord/smali_classes2/j0/n/c/r.smali
+++ /dev/null
@@ -1,254 +0,0 @@
-.class public abstract Lj0/n/c/r;
-.super Lj0/n/c/b;
-.source "PropertyReference.java"
-
-# interfaces
-.implements Lkotlin/reflect/KProperty;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/n/c/b;-><init>()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lj0/n/c/b;-><init>(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Lj0/n/c/r;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    check-cast p1, Lj0/n/c/r;
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getSignature()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getSignature()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getBoundReceiver()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lj0/n/c/b;->getBoundReceiver()Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-
-    :cond_2
-    instance-of v0, p1, Lkotlin/reflect/KProperty;
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {p0}, Lj0/n/c/b;->compute()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_3
-    return v2
-.end method
-
-.method public bridge synthetic getReflected()Lkotlin/reflect/KCallable;
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getReflected()Lkotlin/reflect/KProperty;
-    .locals 1
-
-    invoke-super {p0}, Lj0/n/c/b;->getReflected()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/reflect/KProperty;
-
-    return-object v0
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getSignature()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public isConst()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KProperty;->isConst()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isLateinit()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/n/c/r;->getReflected()Lkotlin/reflect/KProperty;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Lkotlin/reflect/KProperty;->isLateinit()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/n/c/b;->compute()Lkotlin/reflect/KCallable;
-
-    move-result-object v0
-
-    if-eq v0, p0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    const-string v0, "property "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lj0/n/c/b;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " (Kotlin reflection is not available)"
-
-    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_classes2/j0/n/c/s.smali b/com.discord/smali_classes2/j0/n/c/s.smali
deleted file mode 100644
index 308cf6c395..0000000000
--- a/com.discord/smali_classes2/j0/n/c/s.smali
+++ /dev/null
@@ -1,119 +0,0 @@
-.class public Lj0/n/c/s;
-.super Ljava/lang/Object;
-.source "Reflection.java"
-
-
-# static fields
-.field public static final a:Lj0/n/c/t;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    const-string v1, "kotlin.reflect.jvm.internal.ReflectionFactoryImpl"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lj0/n/c/t;
-    :try_end_0
-    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :catch_0
-    nop
-
-    :goto_0
-    if-eqz v0, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    new-instance v0, Lj0/n/c/t;
-
-    invoke-direct {v0}, Lj0/n/c/t;-><init>()V
-
-    :goto_1
-    sput-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    return-void
-.end method
-
-.method public static getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-    .locals 1
-
-    sget-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lj0/n/c/d;
-
-    invoke-direct {v0, p0}, Lj0/n/c/d;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static mutableProperty0(Lj0/n/c/j;)Lkotlin/reflect/KMutableProperty0;
-    .locals 1
-
-    sget-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    if-eqz v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static mutableProperty1(Lj0/n/c/l;)Lj0/r/c;
-    .locals 1
-
-    sget-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    if-eqz v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static property1(Lj0/n/c/p;)Lj0/r/d;
-    .locals 1
-
-    sget-object v0, Lj0/n/c/s;->a:Lj0/n/c/t;
-
-    if-eqz v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/t.smali b/com.discord/smali_classes2/j0/n/c/t.smali
deleted file mode 100644
index c6567b4786..0000000000
--- a/com.discord/smali_classes2/j0/n/c/t.smali
+++ /dev/null
@@ -1,52 +0,0 @@
-.class public Lj0/n/c/t;
-.super Ljava/lang/Object;
-.source "ReflectionFactory.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public renderLambdaToString(Lj0/n/c/f;)Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getGenericInterfaces()[Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    aget-object p1, p1, v0
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "kotlin.jvm.functions."
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/16 v0, 0x15
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    :cond_0
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/u.smali b/com.discord/smali_classes2/j0/n/c/u.smali
deleted file mode 100644
index ff7e858f69..0000000000
--- a/com.discord/smali_classes2/j0/n/c/u.smali
+++ /dev/null
@@ -1,218 +0,0 @@
-.class public Lj0/n/c/u;
-.super Ljava/lang/Object;
-.source "TypeIntrinsics.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public static asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
-    .locals 2
-
-    instance-of v0, p0, Lj0/n/c/v/a;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    instance-of v0, p0, Lj0/n/c/v/b;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "kotlin.collections.MutableCollection"
-
-    invoke-static {p0, v0}, Lj0/n/c/u;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    :try_start_0
-    check-cast p0, Ljava/util/Collection;
-    :try_end_0
-    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    move-exception p0
-
-    invoke-static {p0}, Lj0/n/c/u;->throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
-
-    throw v1
-.end method
-
-.method public static asMutableMap(Ljava/lang/Object;)Ljava/util/Map;
-    .locals 2
-
-    instance-of v0, p0, Lj0/n/c/v/a;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    instance-of v0, p0, Lj0/n/c/v/d;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "kotlin.collections.MutableMap"
-
-    invoke-static {p0, v0}, Lj0/n/c/u;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    :try_start_0
-    check-cast p0, Ljava/util/Map;
-    :try_end_0
-    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    move-exception p0
-
-    invoke-static {p0}, Lj0/n/c/u;->throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
-
-    throw v1
-.end method
-
-.method public static beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
-    .locals 3
-
-    instance-of v0, p0, Lj0/n/c/f;
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_0
-
-    move-object v0, p0
-
-    check-cast v0, Lj0/n/c/f;
-
-    invoke-interface {v0}, Lj0/n/c/f;->getArity()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v0, p0, Lkotlin/jvm/functions/Function0;
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    instance-of v0, p0, Lkotlin/jvm/functions/Function1;
-
-    if-eqz v0, :cond_2
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v0, 0x2
-
-    :goto_0
-    if-ne v0, p1, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_4
-
-    return-object p0
-
-    :cond_4
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "kotlin.jvm.functions.Function"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Lj0/n/c/u;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
-    .locals 1
-
-    const-class v0, Lj0/n/c/u;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->b(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Throwable;
-
-    throw p0
-.end method
-
-.method public static throwCce(Ljava/lang/Object;Ljava/lang/String;)V
-    .locals 1
-
-    if-nez p0, :cond_0
-
-    const-string p0, "null"
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p0
-
-    :goto_0
-    const-string v0, " cannot be cast to "
-
-    invoke-static {p0, v0, p1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/ClassCastException;
-
-    invoke-direct {p1, p0}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
-
-    invoke-static {p1}, Lj0/n/c/u;->throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/j0/n/c/v/a.smali b/com.discord/smali_classes2/j0/n/c/v/a.smali
deleted file mode 100644
index 71f0ff9aac..0000000000
--- a/com.discord/smali_classes2/j0/n/c/v/a.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public interface abstract Lj0/n/c/v/a;
-.super Ljava/lang/Object;
-.source "KMarkers.kt"
diff --git a/com.discord/smali_classes2/j0/n/c/v/b.smali b/com.discord/smali_classes2/j0/n/c/v/b.smali
deleted file mode 100644
index 16ac17e04b..0000000000
--- a/com.discord/smali_classes2/j0/n/c/v/b.smali
+++ /dev/null
@@ -1,6 +0,0 @@
-.class public interface abstract Lj0/n/c/v/b;
-.super Ljava/lang/Object;
-.source "KMarkers.kt"
-
-# interfaces
-.implements Lj0/n/c/v/a;
diff --git a/com.discord/smali_classes2/j0/n/c/v/c.smali b/com.discord/smali_classes2/j0/n/c/v/c.smali
deleted file mode 100644
index 80b4a74b18..0000000000
--- a/com.discord/smali_classes2/j0/n/c/v/c.smali
+++ /dev/null
@@ -1,6 +0,0 @@
-.class public interface abstract Lj0/n/c/v/c;
-.super Ljava/lang/Object;
-.source "KMarkers.kt"
-
-# interfaces
-.implements Lj0/n/c/v/b;
diff --git a/com.discord/smali_classes2/j0/n/c/v/d.smali b/com.discord/smali_classes2/j0/n/c/v/d.smali
deleted file mode 100644
index 28a7de4d49..0000000000
--- a/com.discord/smali_classes2/j0/n/c/v/d.smali
+++ /dev/null
@@ -1,6 +0,0 @@
-.class public interface abstract Lj0/n/c/v/d;
-.super Ljava/lang/Object;
-.source "KMarkers.kt"
-
-# interfaces
-.implements Lj0/n/c/v/a;
diff --git a/com.discord/smali_classes2/j0/o/a.smali b/com.discord/smali_classes2/j0/o/a.smali
deleted file mode 100644
index cc9d0d64ad..0000000000
--- a/com.discord/smali_classes2/j0/o/a.smali
+++ /dev/null
@@ -1,134 +0,0 @@
-.class public final Lj0/o/a;
-.super Ljava/lang/Object;
-.source "Delegates.kt"
-
-# interfaces
-.implements Lkotlin/properties/ReadWriteProperty;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/properties/ReadWriteProperty<",
-        "Ljava/lang/Object;",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            "Lkotlin/reflect/KProperty<",
-            "*>;)TT;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_1
-
-    iget-object p1, p0, Lj0/o/a;->a:Ljava/lang/Object;
-
-    if-eqz p1, :cond_0
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Property "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-interface {p2}, Lkotlin/reflect/KCallable;->getName()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p2, " should be initialized before get."
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            "Lkotlin/reflect/KProperty<",
-            "*>;TT;)V"
-        }
-    .end annotation
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    iput-object p3, p0, Lj0/o/a;->a:Ljava/lang/Object;
-
-    return-void
-
-    :cond_0
-    const-string p2, "value"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p2, "property"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/o/b.smali b/com.discord/smali_classes2/j0/o/b.smali
deleted file mode 100644
index 4609fa93fb..0000000000
--- a/com.discord/smali_classes2/j0/o/b.smali
+++ /dev/null
@@ -1,152 +0,0 @@
-.class public abstract Lj0/o/b;
-.super Ljava/lang/Object;
-.source "ObservableProperty.kt"
-
-# interfaces
-.implements Lkotlin/properties/ReadWriteProperty;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/properties/ReadWriteProperty<",
-        "Ljava/lang/Object;",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public value:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/o/b;->value:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/reflect/KProperty<",
-            "*>;TT;TT;)V"
-        }
-    .end annotation
-.end method
-
-.method public beforeChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/reflect/KProperty<",
-            "*>;TT;TT;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            "Lkotlin/reflect/KProperty<",
-            "*>;)TT;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    iget-object p1, p0, Lj0/o/b;->value:Ljava/lang/Object;
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            "Lkotlin/reflect/KProperty<",
-            "*>;TT;)V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_1
-
-    iget-object p1, p0, Lj0/o/b;->value:Ljava/lang/Object;
-
-    invoke-virtual {p0, p2, p1, p3}, Lj0/o/b;->beforeChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iput-object p3, p0, Lj0/o/b;->value:Ljava/lang/Object;
-
-    invoke-virtual {p0, p2, p1, p3}, Lj0/o/b;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_1
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/p/a.smali b/com.discord/smali_classes2/j0/p/a.smali
deleted file mode 100644
index d5fdf758ce..0000000000
--- a/com.discord/smali_classes2/j0/p/a.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public abstract Lj0/p/a;
-.super Lj0/p/c;
-.source "PlatformRandom.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/p/c;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract getImpl()Ljava/util/Random;
-.end method
-
-.method public nextBits(I)I
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/p/a;->getImpl()Ljava/util/Random;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/util/Random;->nextInt()I
-
-    move-result v0
-
-    rsub-int/lit8 v1, p1, 0x20
-
-    ushr-int/2addr v0, v1
-
-    neg-int p1, p1
-
-    shr-int/lit8 p1, p1, 0x1f
-
-    and-int/2addr p1, v0
-
-    return p1
-.end method
-
-.method public nextBytes([B)[B
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/p/a;->getImpl()Ljava/util/Random;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1}, Ljava/util/Random;->nextBytes([B)V
-
-    return-object p1
-.end method
-
-.method public nextInt()I
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/p/a;->getImpl()Ljava/util/Random;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/util/Random;->nextInt()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public nextInt(I)I
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/p/a;->getImpl()Ljava/util/Random;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p1}, Ljava/util/Random;->nextInt(I)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public nextLong()J
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/p/a;->getImpl()Ljava/util/Random;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/util/Random;->nextLong()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
diff --git a/com.discord/smali_classes2/j0/p/b$a.smali b/com.discord/smali_classes2/j0/p/b$a.smali
deleted file mode 100644
index 1155cad0a1..0000000000
--- a/com.discord/smali_classes2/j0/p/b$a.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public final Lj0/p/b$a;
-.super Ljava/lang/ThreadLocal;
-.source "PlatformRandom.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/p/b;-><init>()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/ThreadLocal<",
-        "Ljava/util/Random;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/ThreadLocal;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public initialValue()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Ljava/util/Random;
-
-    invoke-direct {v0}, Ljava/util/Random;-><init>()V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/p/b.smali b/com.discord/smali_classes2/j0/p/b.smali
deleted file mode 100644
index 8ffaba3c4f..0000000000
--- a/com.discord/smali_classes2/j0/p/b.smali
+++ /dev/null
@@ -1,43 +0,0 @@
-.class public final Lj0/p/b;
-.super Lj0/p/a;
-.source "PlatformRandom.kt"
-
-
-# instance fields
-.field public final c:Lj0/p/b$a;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lj0/p/a;-><init>()V
-
-    new-instance v0, Lj0/p/b$a;
-
-    invoke-direct {v0}, Lj0/p/b$a;-><init>()V
-
-    iput-object v0, p0, Lj0/p/b;->c:Lj0/p/b$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getImpl()Ljava/util/Random;
-    .locals 2
-
-    iget-object v0, p0, Lj0/p/b;->c:Lj0/p/b$a;
-
-    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    const-string v1, "implStorage.get()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, Ljava/util/Random;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/p/c$a.smali b/com.discord/smali_classes2/j0/p/c$a.smali
deleted file mode 100644
index 53da5f6887..0000000000
--- a/com.discord/smali_classes2/j0/p/c$a.smali
+++ /dev/null
@@ -1,110 +0,0 @@
-.class public final Lj0/p/c$a;
-.super Lj0/p/c;
-.source "Random.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/p/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/p/c;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public nextBits(I)I
-    .locals 1
-
-    sget-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    invoke-virtual {v0, p1}, Lj0/p/c;->nextBits(I)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public nextBytes([B)[B
-    .locals 1
-
-    sget-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    invoke-virtual {v0, p1}, Lj0/p/c;->nextBytes([B)[B
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public nextBytes([BII)[B
-    .locals 1
-
-    sget-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    invoke-virtual {v0, p1, p2, p3}, Lj0/p/c;->nextBytes([BII)[B
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public nextInt()I
-    .locals 1
-
-    sget-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    invoke-virtual {v0}, Lj0/p/c;->nextInt()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public nextInt(I)I
-    .locals 1
-
-    sget-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    invoke-virtual {v0, p1}, Lj0/p/c;->nextInt(I)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public nextInt(II)I
-    .locals 1
-
-    sget-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    invoke-virtual {v0, p1, p2}, Lj0/p/c;->nextInt(II)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public nextLong()J
-    .locals 2
-
-    sget-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    invoke-virtual {v0}, Lj0/p/c;->nextLong()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
diff --git a/com.discord/smali_classes2/j0/p/c.smali b/com.discord/smali_classes2/j0/p/c.smali
deleted file mode 100644
index a278a0b7c3..0000000000
--- a/com.discord/smali_classes2/j0/p/c.smali
+++ /dev/null
@@ -1,433 +0,0 @@
-.class public abstract Lj0/p/c;
-.super Ljava/lang/Object;
-.source "Random.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/p/c$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lj0/p/c;
-
-.field public static final b:Lj0/p/c$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lj0/p/c$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lj0/p/c$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lj0/p/c;->b:Lj0/p/c$a;
-
-    sget-object v0, Lj0/l/b;->a:Lj0/l/a;
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lj0/p/b;
-
-    invoke-direct {v0}, Lj0/p/b;-><init>()V
-
-    sput-object v0, Lj0/p/c;->a:Lj0/p/c;
-
-    return-void
-
-    :cond_0
-    throw v1
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract nextBits(I)I
-.end method
-
-.method public nextBytes([B)[B
-    .locals 2
-
-    const/4 v0, 0x0
-
-    array-length v1, p1
-
-    invoke-virtual {p0, p1, v0, v1}, Lj0/p/c;->nextBytes([BII)[B
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public nextBytes([BII)[B
-    .locals 6
-
-    array-length v0, p1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-gez p2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    if-lt v0, p2, :cond_2
-
-    array-length v0, p1
-
-    if-gez p3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    if-lt v0, p3, :cond_2
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    const/4 v0, 0x0
-
-    :goto_1
-    const-string v3, "fromIndex ("
-
-    if-eqz v0, :cond_7
-
-    if-gt p2, p3, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_2
-    if-eqz v2, :cond_6
-
-    sub-int v0, p3, p2
-
-    div-int/lit8 v0, v0, 0x4
-
-    const/4 v2, 0x0
-
-    :goto_3
-    if-ge v2, v0, :cond_4
-
-    invoke-virtual {p0}, Lj0/p/c;->nextInt()I
-
-    move-result v3
-
-    int-to-byte v4, v3
-
-    aput-byte v4, p1, p2
-
-    add-int/lit8 v4, p2, 0x1
-
-    ushr-int/lit8 v5, v3, 0x8
-
-    int-to-byte v5, v5
-
-    aput-byte v5, p1, v4
-
-    add-int/lit8 v4, p2, 0x2
-
-    ushr-int/lit8 v5, v3, 0x10
-
-    int-to-byte v5, v5
-
-    aput-byte v5, p1, v4
-
-    add-int/lit8 v4, p2, 0x3
-
-    ushr-int/lit8 v3, v3, 0x18
-
-    int-to-byte v3, v3
-
-    aput-byte v3, p1, v4
-
-    add-int/lit8 p2, p2, 0x4
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    sub-int/2addr p3, p2
-
-    mul-int/lit8 v0, p3, 0x8
-
-    invoke-virtual {p0, v0}, Lj0/p/c;->nextBits(I)I
-
-    move-result v0
-
-    :goto_4
-    if-ge v1, p3, :cond_5
-
-    add-int v2, p2, v1
-
-    mul-int/lit8 v3, v1, 0x8
-
-    ushr-int v3, v0, v3
-
-    int-to-byte v3, v3
-
-    aput-byte v3, p1, v2
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_4
-
-    :cond_5
-    return-object p1
-
-    :cond_6
-    const-string p1, ") must be not greater than toIndex ("
-
-    const-string v0, ")."
-
-    invoke-static {v3, p2, p1, p3, v0}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_7
-    const-string v0, ") or toIndex ("
-
-    const-string v1, ") are out of range: 0.."
-
-    invoke-static {v3, p2, v0, p3, v1}, Lf/e/b/a/a;->F(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    array-length p1, p1
-
-    const/16 p3, 0x2e
-
-    invoke-static {p2, p1, p3}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public abstract nextInt()I
-.end method
-
-.method public nextInt(I)I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0, p1}, Lj0/p/c;->nextInt(II)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public nextInt(II)I
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-le p2, p1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-nez v1, :cond_3
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Random range is empty: ["
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ", "
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ")."
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_1
-    const-string p1, "until"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "from"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    sub-int v1, p2, p1
-
-    if-gtz v1, :cond_6
-
-    const/high16 v2, -0x80000000
-
-    if-ne v1, v2, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    :goto_1
-    invoke-virtual {p0}, Lj0/p/c;->nextInt()I
-
-    move-result v0
-
-    if-le p1, v0, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    if-le p2, v0, :cond_4
-
-    return v0
-
-    :cond_6
-    :goto_2
-    neg-int p2, v1
-
-    and-int/2addr p2, v1
-
-    if-ne p2, v1, :cond_7
-
-    invoke-static {v1}, Ljava/lang/Integer;->numberOfLeadingZeros(I)I
-
-    move-result p2
-
-    rsub-int/lit8 p2, p2, 0x1f
-
-    invoke-virtual {p0, p2}, Lj0/p/c;->nextBits(I)I
-
-    move-result p2
-
-    goto :goto_3
-
-    :cond_7
-    invoke-virtual {p0}, Lj0/p/c;->nextInt()I
-
-    move-result p2
-
-    ushr-int/2addr p2, v0
-
-    rem-int v2, p2, v1
-
-    sub-int/2addr p2, v2
-
-    add-int/lit8 v3, v1, -0x1
-
-    add-int/2addr v3, p2
-
-    if-ltz v3, :cond_7
-
-    move p2, v2
-
-    :goto_3
-    add-int/2addr p1, p2
-
-    return p1
-.end method
-
-.method public nextLong()J
-    .locals 4
-
-    invoke-virtual {p0}, Lj0/p/c;->nextInt()I
-
-    move-result v0
-
-    int-to-long v0, v0
-
-    const/16 v2, 0x20
-
-    shl-long/2addr v0, v2
-
-    invoke-virtual {p0}, Lj0/p/c;->nextInt()I
-
-    move-result v2
-
-    int-to-long v2, v2
-
-    add-long/2addr v0, v2
-
-    return-wide v0
-.end method
diff --git a/com.discord/smali_classes2/j0/p/d.smali b/com.discord/smali_classes2/j0/p/d.smali
deleted file mode 100644
index e4c24b1724..0000000000
--- a/com.discord/smali_classes2/j0/p/d.smali
+++ /dev/null
@@ -1,166 +0,0 @@
-.class public final Lj0/p/d;
-.super Lj0/p/c;
-.source "XorWowRandom.kt"
-
-
-# instance fields
-.field public c:I
-
-.field public d:I
-
-.field public e:I
-
-.field public f:I
-
-.field public g:I
-
-.field public h:I
-
-
-# direct methods
-.method public constructor <init>(II)V
-    .locals 3
-
-    not-int v0, p1
-
-    shl-int/lit8 v1, p1, 0xa
-
-    ushr-int/lit8 v2, p2, 0x4
-
-    xor-int/2addr v1, v2
-
-    invoke-direct {p0}, Lj0/p/c;-><init>()V
-
-    iput p1, p0, Lj0/p/d;->c:I
-
-    iput p2, p0, Lj0/p/d;->d:I
-
-    const/4 v2, 0x0
-
-    iput v2, p0, Lj0/p/d;->e:I
-
-    iput v2, p0, Lj0/p/d;->f:I
-
-    iput v0, p0, Lj0/p/d;->g:I
-
-    iput v1, p0, Lj0/p/d;->h:I
-
-    or-int/2addr p1, p2
-
-    or-int/2addr p1, v2
-
-    or-int/2addr p1, v2
-
-    or-int/2addr p1, v0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_2
-
-    const/16 p1, 0x40
-
-    :goto_1
-    if-ge v2, p1, :cond_1
-
-    invoke-virtual {p0}, Lj0/p/d;->nextInt()I
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    return-void
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Initial state must have at least one non-zero element."
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public nextBits(I)I
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/p/d;->nextInt()I
-
-    move-result v0
-
-    rsub-int/lit8 v1, p1, 0x20
-
-    ushr-int/2addr v0, v1
-
-    neg-int p1, p1
-
-    shr-int/lit8 p1, p1, 0x1f
-
-    and-int/2addr p1, v0
-
-    return p1
-.end method
-
-.method public nextInt()I
-    .locals 3
-
-    iget v0, p0, Lj0/p/d;->c:I
-
-    ushr-int/lit8 v1, v0, 0x2
-
-    xor-int/2addr v0, v1
-
-    iget v1, p0, Lj0/p/d;->d:I
-
-    iput v1, p0, Lj0/p/d;->c:I
-
-    iget v1, p0, Lj0/p/d;->e:I
-
-    iput v1, p0, Lj0/p/d;->d:I
-
-    iget v1, p0, Lj0/p/d;->f:I
-
-    iput v1, p0, Lj0/p/d;->e:I
-
-    iget v1, p0, Lj0/p/d;->g:I
-
-    iput v1, p0, Lj0/p/d;->f:I
-
-    shl-int/lit8 v2, v0, 0x1
-
-    xor-int/2addr v0, v2
-
-    xor-int/2addr v0, v1
-
-    shl-int/lit8 v1, v1, 0x4
-
-    xor-int/2addr v0, v1
-
-    iput v0, p0, Lj0/p/d;->g:I
-
-    iget v1, p0, Lj0/p/d;->h:I
-
-    const v2, 0x587c5
-
-    add-int/2addr v1, v2
-
-    iput v1, p0, Lj0/p/d;->h:I
-
-    add-int/2addr v0, v1
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/j0/q/a.smali b/com.discord/smali_classes2/j0/q/a.smali
deleted file mode 100644
index 8101ed2d12..0000000000
--- a/com.discord/smali_classes2/j0/q/a.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract Lj0/q/a;
-.super Ljava/lang/Object;
-.source "Range.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T::",
-        "Ljava/lang/Comparable<",
-        "-TT;>;>",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract getEndInclusive()Ljava/lang/Comparable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-.end method
-
-.method public abstract getStart()Ljava/lang/Comparable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/j0/q/b.smali b/com.discord/smali_classes2/j0/q/b.smali
deleted file mode 100644
index c3eab729ab..0000000000
--- a/com.discord/smali_classes2/j0/q/b.smali
+++ /dev/null
@@ -1,105 +0,0 @@
-.class public final Lj0/q/b;
-.super Lj0/i/q;
-.source "ProgressionIterators.kt"
-
-
-# instance fields
-.field public final d:I
-
-.field public e:Z
-
-.field public f:I
-
-.field public final g:I
-
-
-# direct methods
-.method public constructor <init>(III)V
-    .locals 2
-
-    invoke-direct {p0}, Lj0/i/q;-><init>()V
-
-    iput p3, p0, Lj0/q/b;->g:I
-
-    iput p2, p0, Lj0/q/b;->d:I
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-lez p3, :cond_0
-
-    if-gt p1, p2, :cond_1
-
-    goto :goto_0
-
-    :cond_0
-    if-lt p1, p2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    iput-boolean v0, p0, Lj0/q/b;->e:Z
-
-    if-eqz v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    iget p1, p0, Lj0/q/b;->d:I
-
-    :goto_1
-    iput p1, p0, Lj0/q/b;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public hasNext()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lj0/q/b;->e:Z
-
-    return v0
-.end method
-
-.method public nextInt()I
-    .locals 2
-
-    iget v0, p0, Lj0/q/b;->f:I
-
-    iget v1, p0, Lj0/q/b;->d:I
-
-    if-ne v0, v1, :cond_1
-
-    iget-boolean v1, p0, Lj0/q/b;->e:Z
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x0
-
-    iput-boolean v1, p0, Lj0/q/b;->e:Z
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-
-    :cond_1
-    iget v1, p0, Lj0/q/b;->g:I
-
-    add-int/2addr v1, v0
-
-    iput v1, p0, Lj0/q/b;->f:I
-
-    :goto_0
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/j0/q/c.smali b/com.discord/smali_classes2/j0/q/c.smali
deleted file mode 100644
index baa5e91fb5..0000000000
--- a/com.discord/smali_classes2/j0/q/c.smali
+++ /dev/null
@@ -1,158 +0,0 @@
-.class public Lj0/q/c;
-.super Ljava/lang/Object;
-.source "Progressions.kt"
-
-# interfaces
-.implements Ljava/lang/Iterable;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/lang/Iterable<",
-        "Ljava/lang/Long;",
-        ">;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:J
-
-.field public final f:J
-
-
-# direct methods
-.method public constructor <init>(JJJ)V
-    .locals 4
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p5, v0
-
-    if-eqz v2, :cond_5
-
-    const-wide/high16 v0, -0x8000000000000000L
-
-    cmp-long v3, p5, v0
-
-    if-eqz v3, :cond_4
-
-    iput-wide p1, p0, Lj0/q/c;->d:J
-
-    if-lez v2, :cond_1
-
-    cmp-long v0, p1, p3
-
-    if-ltz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p3, p4, p5, p6}, Lf/n/a/k/a;->O(JJ)J
-
-    move-result-wide v0
-
-    invoke-static {p1, p2, p5, p6}, Lf/n/a/k/a;->O(JJ)J
-
-    move-result-wide p1
-
-    sub-long/2addr v0, p1
-
-    invoke-static {v0, v1, p5, p6}, Lf/n/a/k/a;->O(JJ)J
-
-    move-result-wide p1
-
-    sub-long/2addr p3, p1
-
-    goto :goto_0
-
-    :cond_1
-    if-gez v2, :cond_3
-
-    cmp-long v0, p1, p3
-
-    if-gtz v0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    neg-long v0, p5
-
-    invoke-static {p1, p2, v0, v1}, Lf/n/a/k/a;->O(JJ)J
-
-    move-result-wide p1
-
-    invoke-static {p3, p4, v0, v1}, Lf/n/a/k/a;->O(JJ)J
-
-    move-result-wide v2
-
-    sub-long/2addr p1, v2
-
-    invoke-static {p1, p2, v0, v1}, Lf/n/a/k/a;->O(JJ)J
-
-    move-result-wide p1
-
-    add-long/2addr p3, p1
-
-    :goto_0
-    iput-wide p3, p0, Lj0/q/c;->e:J
-
-    iput-wide p5, p0, Lj0/q/c;->f:J
-
-    return-void
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Step is zero."
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Step must be greater than Long.MIN_VALUE to avoid overflow on negation."
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Step must be non-zero."
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 8
-
-    new-instance v7, Lj0/q/d;
-
-    iget-wide v1, p0, Lj0/q/c;->d:J
-
-    iget-wide v3, p0, Lj0/q/c;->e:J
-
-    iget-wide v5, p0, Lj0/q/c;->f:J
-
-    move-object v0, v7
-
-    invoke-direct/range {v0 .. v6}, Lj0/q/d;-><init>(JJJ)V
-
-    return-object v7
-.end method
diff --git a/com.discord/smali_classes2/j0/q/d.smali b/com.discord/smali_classes2/j0/q/d.smali
deleted file mode 100644
index 65bd4d5147..0000000000
--- a/com.discord/smali_classes2/j0/q/d.smali
+++ /dev/null
@@ -1,113 +0,0 @@
-.class public final Lj0/q/d;
-.super Lj0/i/r;
-.source "ProgressionIterators.kt"
-
-
-# instance fields
-.field public final d:J
-
-.field public e:Z
-
-.field public f:J
-
-.field public final g:J
-
-
-# direct methods
-.method public constructor <init>(JJJ)V
-    .locals 5
-
-    invoke-direct {p0}, Lj0/i/r;-><init>()V
-
-    iput-wide p5, p0, Lj0/q/d;->g:J
-
-    iput-wide p3, p0, Lj0/q/d;->d:J
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, p5, v2
-
-    cmp-long p5, p1, p3
-
-    if-lez v4, :cond_0
-
-    if-gtz p5, :cond_1
-
-    goto :goto_0
-
-    :cond_0
-    if-ltz p5, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    iput-boolean v0, p0, Lj0/q/d;->e:Z
-
-    if-eqz v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    iget-wide p1, p0, Lj0/q/d;->d:J
-
-    :goto_1
-    iput-wide p1, p0, Lj0/q/d;->f:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public hasNext()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lj0/q/d;->e:Z
-
-    return v0
-.end method
-
-.method public nextLong()J
-    .locals 5
-
-    iget-wide v0, p0, Lj0/q/d;->f:J
-
-    iget-wide v2, p0, Lj0/q/d;->d:J
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_1
-
-    iget-boolean v2, p0, Lj0/q/d;->e:Z
-
-    if-eqz v2, :cond_0
-
-    const/4 v2, 0x0
-
-    iput-boolean v2, p0, Lj0/q/d;->e:Z
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-
-    :cond_1
-    iget-wide v2, p0, Lj0/q/d;->g:J
-
-    add-long/2addr v2, v0
-
-    iput-wide v2, p0, Lj0/q/d;->f:J
-
-    :goto_0
-    return-wide v0
-.end method
diff --git a/com.discord/smali_classes2/j0/q/e$a.smali b/com.discord/smali_classes2/j0/q/e$a.smali
deleted file mode 100644
index 194ec7bc72..0000000000
--- a/com.discord/smali_classes2/j0/q/e$a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Lj0/q/e$a;
-.super Ljava/lang/Object;
-.source "Ranges.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/q/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/q/e.smali b/com.discord/smali_classes2/j0/q/e.smali
deleted file mode 100644
index 7f9ef2e5a2..0000000000
--- a/com.discord/smali_classes2/j0/q/e.smali
+++ /dev/null
@@ -1,241 +0,0 @@
-.class public final Lj0/q/e;
-.super Lj0/q/c;
-.source "Ranges.kt"
-
-# interfaces
-.implements Lj0/q/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/q/e$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/q/c;",
-        "Lj0/q/a<",
-        "Ljava/lang/Long;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final g:Lj0/q/e;
-
-.field public static final h:Lj0/q/e$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    new-instance v0, Lj0/q/e$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lj0/q/e$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lj0/q/e;->h:Lj0/q/e$a;
-
-    new-instance v0, Lj0/q/e;
-
-    const-wide/16 v1, 0x1
-
-    const-wide/16 v3, 0x0
-
-    invoke-direct {v0, v1, v2, v3, v4}, Lj0/q/e;-><init>(JJ)V
-
-    sput-object v0, Lj0/q/e;->g:Lj0/q/e;
-
-    return-void
-.end method
-
-.method public constructor <init>(JJ)V
-    .locals 7
-
-    const-wide/16 v5, 0x1
-
-    move-object v0, p0
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    invoke-direct/range {v0 .. v6}, Lj0/q/c;-><init>(JJJ)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 5
-
-    instance-of v0, p1, Lj0/q/e;
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p0}, Lj0/q/e;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    move-object v0, p1
-
-    check-cast v0, Lj0/q/e;
-
-    invoke-virtual {v0}, Lj0/q/e;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    :cond_0
-    iget-wide v0, p0, Lj0/q/c;->d:J
-
-    check-cast p1, Lj0/q/e;
-
-    iget-wide v2, p1, Lj0/q/c;->d:J
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_2
-
-    iget-wide v0, p0, Lj0/q/c;->e:J
-
-    iget-wide v2, p1, Lj0/q/c;->e:J
-
-    cmp-long p1, v0, v2
-
-    if-nez p1, :cond_2
-
-    :cond_1
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public getEndInclusive()Ljava/lang/Comparable;
-    .locals 2
-
-    iget-wide v0, p0, Lj0/q/c;->e:J
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getStart()Ljava/lang/Comparable;
-    .locals 2
-
-    iget-wide v0, p0, Lj0/q/c;->d:J
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public hashCode()I
-    .locals 7
-
-    invoke-virtual {p0}, Lj0/q/e;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, -0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v0, 0x1f
-
-    int-to-long v0, v0
-
-    iget-wide v2, p0, Lj0/q/c;->d:J
-
-    const/16 v4, 0x20
-
-    ushr-long v5, v2, v4
-
-    xor-long/2addr v2, v5
-
-    mul-long v0, v0, v2
-
-    iget-wide v2, p0, Lj0/q/c;->e:J
-
-    ushr-long v4, v2, v4
-
-    xor-long/2addr v2, v4
-
-    add-long/2addr v0, v2
-
-    long-to-int v0, v0
-
-    :goto_0
-    return v0
-.end method
-
-.method public isEmpty()Z
-    .locals 5
-
-    iget-wide v0, p0, Lj0/q/c;->d:J
-
-    iget-wide v2, p0, Lj0/q/c;->e:J
-
-    cmp-long v4, v0, v2
-
-    if-lez v4, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-wide v1, p0, Lj0/q/c;->d:J
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v1, ".."
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-wide v1, p0, Lj0/q/c;->e:J
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/q/f.smali b/com.discord/smali_classes2/j0/q/f.smali
deleted file mode 100644
index bec5834107..0000000000
--- a/com.discord/smali_classes2/j0/q/f.smali
+++ /dev/null
@@ -1,216 +0,0 @@
-.class public Lj0/q/f;
-.super Ljava/lang/Object;
-.source "_Ranges.kt"
-
-
-# direct methods
-.method public static final coerceAtMost(JJ)J
-    .locals 1
-
-    cmp-long v0, p0, p2
-
-    if-lez v0, :cond_0
-
-    move-wide p0, p2
-
-    :cond_0
-    return-wide p0
-.end method
-
-.method public static final coerceIn(III)I
-    .locals 2
-
-    if-gt p1, p2, :cond_2
-
-    if-ge p0, p1, :cond_0
-
-    return p1
-
-    :cond_0
-    if-le p0, p2, :cond_1
-
-    return p2
-
-    :cond_1
-    return p0
-
-    :cond_2
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Cannot coerce value to an empty range: maximum "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string p2, " is less than minimum "
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2e
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static final downTo(II)Lkotlin/ranges/IntProgression;
-    .locals 2
-
-    new-instance v0, Lkotlin/ranges/IntProgression;
-
-    const/4 v1, -0x1
-
-    invoke-direct {v0, p0, p1, v1}, Lkotlin/ranges/IntProgression;-><init>(III)V
-
-    return-object v0
-.end method
-
-.method public static final step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_4
-
-    if-lez p1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_3
-
-    if-eqz v1, :cond_2
-
-    iget v0, p0, Lkotlin/ranges/IntProgression;->d:I
-
-    iget v1, p0, Lkotlin/ranges/IntProgression;->e:I
-
-    iget p0, p0, Lkotlin/ranges/IntProgression;->f:I
-
-    if-lez p0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    neg-int p1, p1
-
-    :goto_1
-    new-instance p0, Lkotlin/ranges/IntProgression;
-
-    invoke-direct {p0, v0, v1, p1}, Lkotlin/ranges/IntProgression;-><init>(III)V
-
-    return-object p0
-
-    :cond_2
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "Step must be positive, was: "
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x2e
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_3
-    const-string p0, "step"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p0, "$this$step"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final until(IJ)Lj0/q/e;
-    .locals 4
-
-    const-wide/high16 v0, -0x8000000000000000L
-
-    cmp-long v2, p1, v0
-
-    if-gtz v2, :cond_0
-
-    sget-object p0, Lj0/q/e;->h:Lj0/q/e$a;
-
-    sget-object p0, Lj0/q/e;->g:Lj0/q/e;
-
-    return-object p0
-
-    :cond_0
-    int-to-long v0, p0
-
-    new-instance p0, Lj0/q/e;
-
-    const-wide/16 v2, 0x1
-
-    sub-long/2addr p1, v2
-
-    invoke-direct {p0, v0, v1, p1, p2}, Lj0/q/e;-><init>(JJ)V
-
-    return-object p0
-.end method
-
-.method public static final until(II)Lkotlin/ranges/IntRange;
-    .locals 1
-
-    const/high16 v0, -0x80000000
-
-    if-gt p1, v0, :cond_0
-
-    sget-object p0, Lkotlin/ranges/IntRange;->h:Lkotlin/ranges/IntRange;
-
-    sget-object p0, Lkotlin/ranges/IntRange;->g:Lkotlin/ranges/IntRange;
-
-    return-object p0
-
-    :cond_0
-    new-instance v0, Lkotlin/ranges/IntRange;
-
-    add-int/lit8 p1, p1, -0x1
-
-    invoke-direct {v0, p0, p1}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/r/a.smali b/com.discord/smali_classes2/j0/r/a.smali
deleted file mode 100644
index cf06d6059b..0000000000
--- a/com.discord/smali_classes2/j0/r/a.smali
+++ /dev/null
@@ -1,16 +0,0 @@
-.class public interface abstract Lj0/r/a;
-.super Ljava/lang/Object;
-.source "KAnnotatedElement.kt"
-
-
-# virtual methods
-.method public abstract getAnnotations()Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/annotation/Annotation;",
-            ">;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/j0/r/b.smali b/com.discord/smali_classes2/j0/r/b.smali
deleted file mode 100644
index eb57954add..0000000000
--- a/com.discord/smali_classes2/j0/r/b.smali
+++ /dev/null
@@ -1,21 +0,0 @@
-.class public interface abstract Lj0/r/b;
-.super Ljava/lang/Object;
-.source "KClass.kt"
-
-# interfaces
-.implements Lkotlin/reflect/KDeclarationContainer;
-.implements Lj0/r/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/reflect/KDeclarationContainer;",
-        "Lj0/r/a;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/r/c.smali b/com.discord/smali_classes2/j0/r/c.smali
deleted file mode 100644
index 11501777eb..0000000000
--- a/com.discord/smali_classes2/j0/r/c.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public interface abstract Lj0/r/c;
-.super Ljava/lang/Object;
-.source "KProperty.kt"
-
-# interfaces
-.implements Lj0/r/d;
-.implements Lkotlin/reflect/KProperty;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lj0/r/d<",
-        "TT;TR;>;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/r/d$a.smali b/com.discord/smali_classes2/j0/r/d$a.smali
deleted file mode 100644
index e5f14bbb87..0000000000
--- a/com.discord/smali_classes2/j0/r/d$a.smali
+++ /dev/null
@@ -1,33 +0,0 @@
-.class public interface abstract Lj0/r/d$a;
-.super Ljava/lang/Object;
-.source "KProperty.kt"
-
-# interfaces
-.implements Lkotlin/reflect/KProperty$Getter;
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lj0/r/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/reflect/KProperty$Getter<",
-        "TR;>;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;TR;>;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/j0/r/d.smali b/com.discord/smali_classes2/j0/r/d.smali
deleted file mode 100644
index 58d356bea8..0000000000
--- a/com.discord/smali_classes2/j0/r/d.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public interface abstract Lj0/r/d;
-.super Ljava/lang/Object;
-.source "KProperty.kt"
-
-# interfaces
-.implements Lkotlin/reflect/KProperty;
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lj0/r/d$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/reflect/KProperty<",
-        "TR;>;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;TR;>;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract get(Ljava/lang/Object;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)TR;"
-        }
-    .end annotation
-.end method
-
-.method public abstract getGetter()Lj0/r/d$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lj0/r/d$a<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/j0/s/a.smali b/com.discord/smali_classes2/j0/s/a.smali
deleted file mode 100644
index b462ffa600..0000000000
--- a/com.discord/smali_classes2/j0/s/a.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.class public final Lj0/s/a;
-.super Ljava/lang/Object;
-.source "SequencesJVM.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Lj0/s/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/s/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/sequences/Sequence;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "This sequence can be consumed only once."
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/b.smali b/com.discord/smali_classes2/j0/s/b.smali
deleted file mode 100644
index 1c71cf2046..0000000000
--- a/com.discord/smali_classes2/j0/s/b.smali
+++ /dev/null
@@ -1,145 +0,0 @@
-.class public final Lj0/s/b;
-.super Lj0/i/b;
-.source "Sequences.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "K:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lj0/i/b<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final f:Ljava/util/HashSet;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/HashSet<",
-            "TK;>;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final h:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TT;TK;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/Iterator;Lkotlin/jvm/functions/Function1;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Iterator<",
-            "+TT;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+TK;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0}, Lj0/i/b;-><init>()V
-
-    iput-object p1, p0, Lj0/s/b;->g:Ljava/util/Iterator;
-
-    iput-object p2, p0, Lj0/s/b;->h:Lkotlin/jvm/functions/Function1;
-
-    new-instance p1, Ljava/util/HashSet;
-
-    invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
-
-    iput-object p1, p0, Lj0/s/b;->f:Ljava/util/HashSet;
-
-    return-void
-
-    :cond_0
-    const-string p1, "keySelector"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 3
-
-    :cond_0
-    iget-object v0, p0, Lj0/s/b;->g:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lj0/s/b;->g:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lj0/s/b;->h:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lj0/s/b;->f:Ljava/util/HashSet;
-
-    invoke-virtual {v2, v1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iput-object v0, p0, Lj0/i/b;->e:Ljava/lang/Object;
-
-    sget-object v0, Lj0/i/u;->d:Lj0/i/u;
-
-    iput-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    return-void
-
-    :cond_1
-    sget-object v0, Lj0/i/u;->f:Lj0/i/u;
-
-    iput-object v0, p0, Lj0/i/b;->d:Lj0/i/u;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/s/c.smali b/com.discord/smali_classes2/j0/s/c.smali
deleted file mode 100644
index b563465d52..0000000000
--- a/com.discord/smali_classes2/j0/s/c.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.class public final Lj0/s/c;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "K:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TT;TK;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+TK;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/c;->a:Lkotlin/sequences/Sequence;
-
-    iput-object p2, p0, Lj0/s/c;->b:Lkotlin/jvm/functions/Function1;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/b;
-
-    iget-object v1, p0, Lj0/s/c;->a:Lkotlin/sequences/Sequence;
-
-    invoke-interface {v1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lj0/s/c;->b:Lkotlin/jvm/functions/Function1;
-
-    invoke-direct {v0, v1, v2}, Lj0/s/b;-><init>(Ljava/util/Iterator;Lkotlin/jvm/functions/Function1;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/d$a.smali b/com.discord/smali_classes2/j0/s/d$a.smali
deleted file mode 100644
index 2bae9d9225..0000000000
--- a/com.discord/smali_classes2/j0/s/d$a.smali
+++ /dev/null
@@ -1,146 +0,0 @@
-.class public final Lj0/s/d$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/s/d;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:I
-
-
-# direct methods
-.method public constructor <init>(Lj0/s/d;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-object v0, p1, Lj0/s/d;->a:Lkotlin/sequences/Sequence;
-
-    invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lj0/s/d$a;->d:Ljava/util/Iterator;
-
-    iget p1, p1, Lj0/s/d;->b:I
-
-    iput p1, p0, Lj0/s/d$a;->e:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 1
-
-    :goto_0
-    iget v0, p0, Lj0/s/d$a;->e:I
-
-    if-lez v0, :cond_0
-
-    iget-object v0, p0, Lj0/s/d$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lj0/s/d$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    iget v0, p0, Lj0/s/d$a;->e:I
-
-    add-int/lit8 v0, v0, -0x1
-
-    iput v0, p0, Lj0/s/d$a;->e:I
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public hasNext()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/s/d$a;->a()V
-
-    iget-object v0, p0, Lj0/s/d$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/s/d$a;->a()V
-
-    iget-object v0, p0, Lj0/s/d$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/d.smali b/com.discord/smali_classes2/j0/s/d.smali
deleted file mode 100644
index 2a5ad0cce2..0000000000
--- a/com.discord/smali_classes2/j0/s/d.smali
+++ /dev/null
@@ -1,193 +0,0 @@
-.class public final Lj0/s/d;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-.implements Lj0/s/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;",
-        "Lj0/s/e<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:I
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;I)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;I)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/d;->a:Lkotlin/sequences/Sequence;
-
-    iput p2, p0, Lj0/s/d;->b:I
-
-    if-ltz p2, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_1
-
-    return-void
-
-    :cond_1
-    const-string p1, "count must be non-negative, but was "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lj0/s/d;->b:I
-
-    const/16 v0, 0x2e
-
-    invoke-static {p1, p2, v0}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    const-string p1, "sequence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public drop(I)Lkotlin/sequences/Sequence;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/d;->b:I
-
-    add-int/2addr v0, p1
-
-    if-gez v0, :cond_0
-
-    new-instance v0, Lj0/s/d;
-
-    invoke-direct {v0, p0, p1}, Lj0/s/d;-><init>(Lkotlin/sequences/Sequence;I)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lj0/s/d;
-
-    iget-object v1, p0, Lj0/s/d;->a:Lkotlin/sequences/Sequence;
-
-    invoke-direct {p1, v1, v0}, Lj0/s/d;-><init>(Lkotlin/sequences/Sequence;I)V
-
-    move-object v0, p1
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/d$a;
-
-    invoke-direct {v0, p0}, Lj0/s/d$a;-><init>(Lj0/s/d;)V
-
-    return-object v0
-.end method
-
-.method public take(I)Lkotlin/sequences/Sequence;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/d;->b:I
-
-    add-int v1, v0, p1
-
-    if-gez v1, :cond_0
-
-    new-instance v0, Lj0/s/t;
-
-    invoke-direct {v0, p0, p1}, Lj0/s/t;-><init>(Lkotlin/sequences/Sequence;I)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lj0/s/s;
-
-    iget-object v2, p0, Lj0/s/d;->a:Lkotlin/sequences/Sequence;
-
-    invoke-direct {p1, v2, v0, v1}, Lj0/s/s;-><init>(Lkotlin/sequences/Sequence;II)V
-
-    move-object v0, p1
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/e.smali b/com.discord/smali_classes2/j0/s/e.smali
deleted file mode 100644
index 787b064054..0000000000
--- a/com.discord/smali_classes2/j0/s/e.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public interface abstract Lj0/s/e;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract drop(I)Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end method
-
-.method public abstract take(I)Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/j0/s/f.smali b/com.discord/smali_classes2/j0/s/f.smali
deleted file mode 100644
index a74f950962..0000000000
--- a/com.discord/smali_classes2/j0/s/f.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public final Lj0/s/f;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-.implements Lj0/s/e;
-
-
-# static fields
-.field public static final a:Lj0/s/f;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/s/f;
-
-    invoke-direct {v0}, Lj0/s/f;-><init>()V
-
-    sput-object v0, Lj0/s/f;->a:Lj0/s/f;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public drop(I)Lkotlin/sequences/Sequence;
-    .locals 0
-
-    sget-object p1, Lj0/s/f;->a:Lj0/s/f;
-
-    return-object p1
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-
-    sget-object v0, Lj0/i/m;->d:Lj0/i/m;
-
-    return-object v0
-.end method
-
-.method public take(I)Lkotlin/sequences/Sequence;
-    .locals 0
-
-    sget-object p1, Lj0/s/f;->a:Lj0/s/f;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/s/g$a.smali b/com.discord/smali_classes2/j0/s/g$a.smali
deleted file mode 100644
index eb5bef235f..0000000000
--- a/com.discord/smali_classes2/j0/s/g$a.smali
+++ /dev/null
@@ -1,213 +0,0 @@
-.class public final Lj0/s/g$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/s/g;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:I
-
-.field public f:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic g:Lj0/s/g;
-
-
-# direct methods
-.method public constructor <init>(Lj0/s/g;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/s/g$a;->g:Lj0/s/g;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-object p1, p1, Lj0/s/g;->a:Lkotlin/sequences/Sequence;
-
-    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lj0/s/g$a;->d:Ljava/util/Iterator;
-
-    const/4 p1, -0x1
-
-    iput p1, p0, Lj0/s/g$a;->e:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 3
-
-    :cond_0
-    iget-object v0, p0, Lj0/s/g$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lj0/s/g$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lj0/s/g$a;->g:Lj0/s/g;
-
-    iget-object v1, v1, Lj0/s/g;->c:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Boolean;
-
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v1
-
-    iget-object v2, p0, Lj0/s/g$a;->g:Lj0/s/g;
-
-    iget-boolean v2, v2, Lj0/s/g;->b:Z
-
-    if-ne v1, v2, :cond_0
-
-    iput-object v0, p0, Lj0/s/g$a;->f:Ljava/lang/Object;
-
-    const/4 v0, 0x1
-
-    iput v0, p0, Lj0/s/g$a;->e:I
-
-    return-void
-
-    :cond_1
-    const/4 v0, 0x0
-
-    iput v0, p0, Lj0/s/g$a;->e:I
-
-    return-void
-.end method
-
-.method public hasNext()Z
-    .locals 2
-
-    iget v0, p0, Lj0/s/g$a;->e:I
-
-    const/4 v1, -0x1
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lj0/s/g$a;->a()V
-
-    :cond_0
-    iget v0, p0, Lj0/s/g$a;->e:I
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/g$a;->e:I
-
-    const/4 v1, -0x1
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lj0/s/g$a;->a()V
-
-    :cond_0
-    iget v0, p0, Lj0/s/g$a;->e:I
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lj0/s/g$a;->f:Ljava/lang/Object;
-
-    const/4 v2, 0x0
-
-    iput-object v2, p0, Lj0/s/g$a;->f:Ljava/lang/Object;
-
-    iput v1, p0, Lj0/s/g$a;->e:I
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/g.smali b/com.discord/smali_classes2/j0/s/g.smali
deleted file mode 100644
index 181d8ff079..0000000000
--- a/com.discord/smali_classes2/j0/s/g.smali
+++ /dev/null
@@ -1,89 +0,0 @@
-.class public final Lj0/s/g;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Z
-
-.field public final c:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TT;",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;ZLkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;Z",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/g;->a:Lkotlin/sequences/Sequence;
-
-    iput-boolean p2, p0, Lj0/s/g;->b:Z
-
-    iput-object p3, p0, Lj0/s/g;->c:Lkotlin/jvm/functions/Function1;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/g$a;
-
-    invoke-direct {v0, p0}, Lj0/s/g$a;-><init>(Lj0/s/g;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/h$a.smali b/com.discord/smali_classes2/j0/s/h$a.smali
deleted file mode 100644
index 8c29298fce..0000000000
--- a/com.discord/smali_classes2/j0/s/h$a.smali
+++ /dev/null
@@ -1,208 +0,0 @@
-.class public final Lj0/s/h$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/s/h;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TE;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "+TE;>;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic f:Lj0/s/h;
-
-
-# direct methods
-.method public constructor <init>(Lj0/s/h;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/s/h$a;->f:Lj0/s/h;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-object p1, p1, Lj0/s/h;->a:Lkotlin/sequences/Sequence;
-
-    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lj0/s/h$a;->d:Ljava/util/Iterator;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()Z
-    .locals 4
-
-    iget-object v0, p0, Lj0/s/h$a;->e:Ljava/util/Iterator;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lj0/s/h$a;->e:Ljava/util/Iterator;
-
-    :cond_0
-    iget-object v0, p0, Lj0/s/h$a;->e:Ljava/util/Iterator;
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Lj0/s/h$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_1
-    iget-object v0, p0, Lj0/s/h$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v2, p0, Lj0/s/h$a;->f:Lj0/s/h;
-
-    iget-object v3, v2, Lj0/s/h;->c:Lkotlin/jvm/functions/Function1;
-
-    iget-object v2, v2, Lj0/s/h;->b:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v2, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-interface {v3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iput-object v0, p0, Lj0/s/h$a;->e:Ljava/util/Iterator;
-
-    :cond_2
-    return v1
-.end method
-
-.method public hasNext()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lj0/s/h$a;->a()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/s/h$a;->a()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lj0/s/h$a;->e:Ljava/util/Iterator;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_1
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/h.smali b/com.discord/smali_classes2/j0/s/h.smali
deleted file mode 100644
index 53ccc93514..0000000000
--- a/com.discord/smali_classes2/j0/s/h.smali
+++ /dev/null
@@ -1,131 +0,0 @@
-.class public final Lj0/s/h;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        "E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TR;",
-            "Ljava/util/Iterator<",
-            "TE;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+TR;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TR;+",
-            "Ljava/util/Iterator<",
-            "+TE;>;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/h;->a:Lkotlin/sequences/Sequence;
-
-    iput-object p2, p0, Lj0/s/h;->b:Lkotlin/jvm/functions/Function1;
-
-    iput-object p3, p0, Lj0/s/h;->c:Lkotlin/jvm/functions/Function1;
-
-    return-void
-
-    :cond_0
-    const-string p1, "iterator"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "transformer"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "sequence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/h$a;
-
-    invoke-direct {v0, p0}, Lj0/s/h$a;-><init>(Lj0/s/h;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/i$a.smali b/com.discord/smali_classes2/j0/s/i$a.smali
deleted file mode 100644
index 8e0a5dacd7..0000000000
--- a/com.discord/smali_classes2/j0/s/i$a.smali
+++ /dev/null
@@ -1,204 +0,0 @@
-.class public final Lj0/s/i$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/s/i;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public e:I
-
-.field public final synthetic f:Lj0/s/i;
-
-
-# direct methods
-.method public constructor <init>(Lj0/s/i;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/s/i$a;->f:Lj0/s/i;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 p1, -0x2
-
-    iput p1, p0, Lj0/s/i$a;->e:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 2
-
-    iget v0, p0, Lj0/s/i$a;->e:I
-
-    const/4 v1, -0x2
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lj0/s/i$a;->f:Lj0/s/i;
-
-    iget-object v0, v0, Lj0/s/i;->a:Lkotlin/jvm/functions/Function0;
-
-    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lj0/s/i$a;->f:Lj0/s/i;
-
-    iget-object v0, v0, Lj0/s/i;->b:Lkotlin/jvm/functions/Function1;
-
-    iget-object v1, p0, Lj0/s/i$a;->d:Ljava/lang/Object;
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_0
-    iput-object v0, p0, Lj0/s/i$a;->d:Ljava/lang/Object;
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x1
-
-    :goto_1
-    iput v0, p0, Lj0/s/i$a;->e:I
-
-    return-void
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public hasNext()Z
-    .locals 2
-
-    iget v0, p0, Lj0/s/i$a;->e:I
-
-    if-gez v0, :cond_0
-
-    invoke-virtual {p0}, Lj0/s/i$a;->a()V
-
-    :cond_0
-    iget v0, p0, Lj0/s/i$a;->e:I
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/i$a;->e:I
-
-    if-gez v0, :cond_0
-
-    invoke-virtual {p0}, Lj0/s/i$a;->a()V
-
-    :cond_0
-    iget v0, p0, Lj0/s/i$a;->e:I
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lj0/s/i$a;->d:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    const/4 v1, -0x1
-
-    iput v1, p0, Lj0/s/i$a;->e:I
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type T"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/i.smali b/com.discord/smali_classes2/j0/s/i.smali
deleted file mode 100644
index ac4a2859b6..0000000000
--- a/com.discord/smali_classes2/j0/s/i.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public final Lj0/s/i;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/jvm/functions/Function0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function0<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TT;TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function0<",
-            "+TT;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/i;->a:Lkotlin/jvm/functions/Function0;
-
-    iput-object p2, p0, Lj0/s/i;->b:Lkotlin/jvm/functions/Function1;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/i$a;
-
-    invoke-direct {v0, p0}, Lj0/s/i$a;-><init>(Lj0/s/i;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/j.smali b/com.discord/smali_classes2/j0/s/j.smali
deleted file mode 100644
index 1b19ed4c47..0000000000
--- a/com.discord/smali_classes2/j0/s/j.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class public final Lj0/s/j;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Ljava/util/Iterator;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/Iterator;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/s/j;->a:Ljava/util/Iterator;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/s/j;->a:Ljava/util/Iterator;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/k.smali b/com.discord/smali_classes2/j0/s/k.smali
deleted file mode 100644
index 2643e4639a..0000000000
--- a/com.discord/smali_classes2/j0/s/k.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public final Lj0/s/k;
-.super Lj0/n/c/i;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lkotlin/sequences/Sequence<",
-        "+TT;>;",
-        "Ljava/util/Iterator<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/s/k;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/s/k;
-
-    invoke-direct {v0}, Lj0/s/k;-><init>()V
-
-    sput-object v0, Lj0/s/k;->d:Lj0/s/k;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lkotlin/sequences/Sequence;
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/s/l.smali b/com.discord/smali_classes2/j0/s/l.smali
deleted file mode 100644
index c16b07f1a7..0000000000
--- a/com.discord/smali_classes2/j0/s/l.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public final Lj0/s/l;
-.super Lj0/n/c/i;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Iterable<",
-        "+TT;>;",
-        "Ljava/util/Iterator<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/s/l;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/s/l;
-
-    invoke-direct {v0}, Lj0/s/l;-><init>()V
-
-    sput-object v0, Lj0/s/l;->d:Lj0/s/l;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Iterable;
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/s/m.smali b/com.discord/smali_classes2/j0/s/m.smali
deleted file mode 100644
index 6fcf0780d2..0000000000
--- a/com.discord/smali_classes2/j0/s/m.smali
+++ /dev/null
@@ -1,57 +0,0 @@
-.class public final Lj0/s/m;
-.super Lj0/n/c/i;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/s/m;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/s/m;
-
-    invoke-direct {v0}, Lj0/s/m;-><init>()V
-
-    sput-object v0, Lj0/s/m;->d:Lj0/s/m;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)TT;"
-        }
-    .end annotation
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/s/n.smali b/com.discord/smali_classes2/j0/s/n.smali
deleted file mode 100644
index eb38376d06..0000000000
--- a/com.discord/smali_classes2/j0/s/n.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class public final Lj0/s/n;
-.super Ljava/lang/Object;
-.source "Iterables.kt"
-
-# interfaces
-.implements Ljava/lang/Iterable;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/lang/Iterable<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lkotlin/sequences/Sequence;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/s/n;->d:Lkotlin/sequences/Sequence;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/s/n;->d:Lkotlin/sequences/Sequence;
-
-    invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/o.smali b/com.discord/smali_classes2/j0/s/o.smali
deleted file mode 100644
index 5251b2b12e..0000000000
--- a/com.discord/smali_classes2/j0/s/o.smali
+++ /dev/null
@@ -1,57 +0,0 @@
-.class public final Lj0/s/o;
-.super Lj0/n/c/i;
-.source "_Sequences.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/s/o;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/s/o;
-
-    invoke-direct {v0}, Lj0/s/o;-><init>()V
-
-    sput-object v0, Lj0/s/o;->d:Lj0/s/o;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)TT;"
-        }
-    .end annotation
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/s/p.smali b/com.discord/smali_classes2/j0/s/p.smali
deleted file mode 100644
index 779ca19ed1..0000000000
--- a/com.discord/smali_classes2/j0/s/p.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public final Lj0/s/p;
-.super Lj0/n/c/i;
-.source "_Sequences.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "TT;",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/s/p;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/s/p;
-
-    invoke-direct {v0}, Lj0/s/p;-><init>()V
-
-    sput-object v0, Lj0/s/p;->d:Lj0/s/p;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    if-nez p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/j0/s/q.smali b/com.discord/smali_classes2/j0/s/q.smali
deleted file mode 100644
index 8ab079ef46..0000000000
--- a/com.discord/smali_classes2/j0/s/q.smali
+++ /dev/null
@@ -1,66 +0,0 @@
-.class public final Lj0/s/q;
-.super Ljava/lang/Object;
-.source "_Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lkotlin/sequences/Sequence;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/s/q;->a:Lkotlin/sequences/Sequence;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/s/q;->a:Lkotlin/sequences/Sequence;
-
-    invoke-static {v0}, Lf/n/a/k/a;->toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->sort(Ljava/util/List;)V
-
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/r.smali b/com.discord/smali_classes2/j0/s/r.smali
deleted file mode 100644
index f5d3298bf4..0000000000
--- a/com.discord/smali_classes2/j0/s/r.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class public final Lj0/s/r;
-.super Ljava/lang/Object;
-.source "_Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lkotlin/sequences/Sequence;
-
-.field public final synthetic b:Ljava/util/Comparator;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;",
-            "Ljava/util/Comparator;",
-            ")V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/s/r;->a:Lkotlin/sequences/Sequence;
-
-    iput-object p2, p0, Lj0/s/r;->b:Ljava/util/Comparator;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/s/r;->a:Lkotlin/sequences/Sequence;
-
-    invoke-static {v0}, Lf/n/a/k/a;->toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lj0/s/r;->b:Ljava/util/Comparator;
-
-    invoke-static {v0, v1}, Lf/n/a/k/a;->sortWith(Ljava/util/List;Ljava/util/Comparator;)V
-
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/s$a.smali b/com.discord/smali_classes2/j0/s/s$a.smali
deleted file mode 100644
index 00db6eebc0..0000000000
--- a/com.discord/smali_classes2/j0/s/s$a.smali
+++ /dev/null
@@ -1,187 +0,0 @@
-.class public final Lj0/s/s$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/s/s;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:I
-
-.field public final synthetic f:Lj0/s/s;
-
-
-# direct methods
-.method public constructor <init>(Lj0/s/s;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/s/s$a;->f:Lj0/s/s;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-object p1, p1, Lj0/s/s;->a:Lkotlin/sequences/Sequence;
-
-    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lj0/s/s$a;->d:Ljava/util/Iterator;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 2
-
-    :goto_0
-    iget v0, p0, Lj0/s/s$a;->e:I
-
-    iget-object v1, p0, Lj0/s/s$a;->f:Lj0/s/s;
-
-    iget v1, v1, Lj0/s/s;->b:I
-
-    if-ge v0, v1, :cond_0
-
-    iget-object v0, p0, Lj0/s/s$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lj0/s/s$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    iget v0, p0, Lj0/s/s$a;->e:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lj0/s/s$a;->e:I
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public hasNext()Z
-    .locals 2
-
-    invoke-virtual {p0}, Lj0/s/s$a;->a()V
-
-    iget v0, p0, Lj0/s/s$a;->e:I
-
-    iget-object v1, p0, Lj0/s/s$a;->f:Lj0/s/s;
-
-    iget v1, v1, Lj0/s/s;->c:I
-
-    if-ge v0, v1, :cond_0
-
-    iget-object v0, p0, Lj0/s/s$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lj0/s/s$a;->a()V
-
-    iget v0, p0, Lj0/s/s$a;->e:I
-
-    iget-object v1, p0, Lj0/s/s$a;->f:Lj0/s/s;
-
-    iget v1, v1, Lj0/s/s;->c:I
-
-    if-ge v0, v1, :cond_0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lj0/s/s$a;->e:I
-
-    iget-object v0, p0, Lj0/s/s$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/s.smali b/com.discord/smali_classes2/j0/s/s.smali
deleted file mode 100644
index 6978d7f4a8..0000000000
--- a/com.discord/smali_classes2/j0/s/s.smali
+++ /dev/null
@@ -1,287 +0,0 @@
-.class public final Lj0/s/s;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-.implements Lj0/s/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;",
-        "Lj0/s/e<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:I
-
-.field public final c:I
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;II)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;II)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_6
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/s;->a:Lkotlin/sequences/Sequence;
-
-    iput p2, p0, Lj0/s/s;->b:I
-
-    iput p3, p0, Lj0/s/s;->c:I
-
-    const/4 p1, 0x1
-
-    if-ltz p2, :cond_0
-
-    const/4 p2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p2, 0x0
-
-    :goto_0
-    if-eqz p2, :cond_5
-
-    iget p2, p0, Lj0/s/s;->c:I
-
-    if-ltz p2, :cond_1
-
-    const/4 p2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p2, 0x0
-
-    :goto_1
-    if-eqz p2, :cond_4
-
-    iget p2, p0, Lj0/s/s;->c:I
-
-    iget p3, p0, Lj0/s/s;->b:I
-
-    if-lt p2, p3, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    const/4 p1, 0x0
-
-    :goto_2
-    if-eqz p1, :cond_3
-
-    return-void
-
-    :cond_3
-    const-string p1, "endIndex should be not less than startIndex, but was "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lj0/s/s;->c:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string p2, " < "
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget p2, p0, Lj0/s/s;->b:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_4
-    const-string p1, "endIndex should be non-negative, but is "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lj0/s/s;->c:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_5
-    const-string p1, "startIndex should be non-negative, but is "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lj0/s/s;->b:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_6
-    const-string p1, "sequence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public drop(I)Lkotlin/sequences/Sequence;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/s;->c:I
-
-    iget v1, p0, Lj0/s/s;->b:I
-
-    sub-int v2, v0, v1
-
-    if-lt p1, v2, :cond_0
-
-    sget-object p1, Lj0/s/f;->a:Lj0/s/f;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v2, Lj0/s/s;
-
-    iget-object v3, p0, Lj0/s/s;->a:Lkotlin/sequences/Sequence;
-
-    add-int/2addr v1, p1
-
-    invoke-direct {v2, v3, v1, v0}, Lj0/s/s;-><init>(Lkotlin/sequences/Sequence;II)V
-
-    move-object p1, v2
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/s$a;
-
-    invoke-direct {v0, p0}, Lj0/s/s$a;-><init>(Lj0/s/s;)V
-
-    return-object v0
-.end method
-
-.method public take(I)Lkotlin/sequences/Sequence;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/s;->c:I
-
-    iget v1, p0, Lj0/s/s;->b:I
-
-    sub-int/2addr v0, v1
-
-    if-lt p1, v0, :cond_0
-
-    move-object v0, p0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lj0/s/s;
-
-    iget-object v2, p0, Lj0/s/s;->a:Lkotlin/sequences/Sequence;
-
-    add-int/2addr p1, v1
-
-    invoke-direct {v0, v2, v1, p1}, Lj0/s/s;-><init>(Lkotlin/sequences/Sequence;II)V
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/t$a.smali b/com.discord/smali_classes2/j0/s/t$a.smali
deleted file mode 100644
index 9aa0ffa7d3..0000000000
--- a/com.discord/smali_classes2/j0/s/t$a.smali
+++ /dev/null
@@ -1,139 +0,0 @@
-.class public final Lj0/s/t$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/s/t;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public final e:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lj0/s/t;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget v0, p1, Lj0/s/t;->b:I
-
-    iput v0, p0, Lj0/s/t$a;->d:I
-
-    iget-object p1, p1, Lj0/s/t;->a:Lkotlin/sequences/Sequence;
-
-    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lj0/s/t$a;->e:Ljava/util/Iterator;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public hasNext()Z
-    .locals 1
-
-    iget v0, p0, Lj0/s/t$a;->d:I
-
-    if-lez v0, :cond_0
-
-    iget-object v0, p0, Lj0/s/t$a;->e:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/t$a;->d:I
-
-    if-eqz v0, :cond_0
-
-    add-int/lit8 v0, v0, -0x1
-
-    iput v0, p0, Lj0/s/t$a;->d:I
-
-    iget-object v0, p0, Lj0/s/t$a;->e:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/t.smali b/com.discord/smali_classes2/j0/s/t.smali
deleted file mode 100644
index 5ed669ee31..0000000000
--- a/com.discord/smali_classes2/j0/s/t.smali
+++ /dev/null
@@ -1,183 +0,0 @@
-.class public final Lj0/s/t;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-.implements Lj0/s/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TT;>;",
-        "Lj0/s/e<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:I
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;I)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;I)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/t;->a:Lkotlin/sequences/Sequence;
-
-    iput p2, p0, Lj0/s/t;->b:I
-
-    if-ltz p2, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_1
-
-    return-void
-
-    :cond_1
-    const-string p1, "count must be non-negative, but was "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lj0/s/t;->b:I
-
-    const/16 v0, 0x2e
-
-    invoke-static {p1, p2, v0}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    const-string p1, "sequence"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public drop(I)Lkotlin/sequences/Sequence;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/t;->b:I
-
-    if-lt p1, v0, :cond_0
-
-    sget-object p1, Lj0/s/f;->a:Lj0/s/f;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lj0/s/s;
-
-    iget-object v2, p0, Lj0/s/t;->a:Lkotlin/sequences/Sequence;
-
-    invoke-direct {v1, v2, p1, v0}, Lj0/s/s;-><init>(Lkotlin/sequences/Sequence;II)V
-
-    move-object p1, v1
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/t$a;
-
-    invoke-direct {v0, p0}, Lj0/s/t$a;-><init>(Lj0/s/t;)V
-
-    return-object v0
-.end method
-
-.method public take(I)Lkotlin/sequences/Sequence;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)",
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget v0, p0, Lj0/s/t;->b:I
-
-    if-lt p1, v0, :cond_0
-
-    move-object v0, p0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lj0/s/t;
-
-    iget-object v1, p0, Lj0/s/t;->a:Lkotlin/sequences/Sequence;
-
-    invoke-direct {v0, v1, p1}, Lj0/s/t;-><init>(Lkotlin/sequences/Sequence;I)V
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/u$a.smali b/com.discord/smali_classes2/j0/s/u$a.smali
deleted file mode 100644
index f5acde1726..0000000000
--- a/com.discord/smali_classes2/j0/s/u$a.smali
+++ /dev/null
@@ -1,116 +0,0 @@
-.class public final Lj0/s/u$a;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/s/u;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TR;>;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic e:Lj0/s/u;
-
-
-# direct methods
-.method public constructor <init>(Lj0/s/u;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/s/u$a;->e:Lj0/s/u;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-object p1, p1, Lj0/s/u;->a:Lkotlin/sequences/Sequence;
-
-    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lj0/s/u$a;->d:Ljava/util/Iterator;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public hasNext()Z
-    .locals 1
-
-    iget-object v0, p0, Lj0/s/u$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TR;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/s/u$a;->e:Lj0/s/u;
-
-    iget-object v0, v0, Lj0/s/u;->b:Lkotlin/jvm/functions/Function1;
-
-    iget-object v1, p0, Lj0/s/u$a;->d:Ljava/util/Iterator;
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/s/u.smali b/com.discord/smali_classes2/j0/s/u.smali
deleted file mode 100644
index 02125a2f6e..0000000000
--- a/com.discord/smali_classes2/j0/s/u.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public final Lj0/s/u;
-.super Ljava/lang/Object;
-.source "Sequences.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lkotlin/sequences/Sequence;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/sequences/Sequence<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/sequences/Sequence<",
-            "+TT;>;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/s/u;->a:Lkotlin/sequences/Sequence;
-
-    iput-object p2, p0, Lj0/s/u;->b:Lkotlin/jvm/functions/Function1;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TR;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/s/u$a;
-
-    invoke-direct {v0, p0}, Lj0/s/u$a;-><init>(Lj0/s/u;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/t/a.smali b/com.discord/smali_classes2/j0/t/a.smali
deleted file mode 100644
index 75dbe4db65..0000000000
--- a/com.discord/smali_classes2/j0/t/a.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public final Lj0/t/a;
-.super Ljava/lang/Object;
-.source "Charsets.kt"
-
-
-# static fields
-.field public static final a:Ljava/nio/charset/Charset;
-
-.field public static b:Ljava/nio/charset/Charset;
-
-.field public static c:Ljava/nio/charset/Charset;
-
-.field public static final d:Lj0/t/a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-string v0, "UTF-8"
-
-    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object v0
-
-    const-string v1, "Charset.forName(\"UTF-8\")"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sput-object v0, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    const-string v0, "UTF-16"
-
-    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object v0
-
-    const-string v1, "Charset.forName(\"UTF-16\")"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "UTF-16BE"
-
-    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object v0
-
-    const-string v1, "Charset.forName(\"UTF-16BE\")"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "UTF-16LE"
-
-    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object v0
-
-    const-string v1, "Charset.forName(\"UTF-16LE\")"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "US-ASCII"
-
-    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object v0
-
-    const-string v1, "Charset.forName(\"US-ASCII\")"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "ISO-8859-1"
-
-    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object v0
-
-    const-string v1, "Charset.forName(\"ISO-8859-1\")"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/t/b$a.smali b/com.discord/smali_classes2/j0/t/b$a.smali
deleted file mode 100644
index 9af5bc5cd6..0000000000
--- a/com.discord/smali_classes2/j0/t/b$a.smali
+++ /dev/null
@@ -1,323 +0,0 @@
-.class public final Lj0/t/b$a;
-.super Ljava/lang/Object;
-.source "Strings.kt"
-
-# interfaces
-.implements Ljava/util/Iterator;
-.implements Lj0/n/c/v/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/t/b;->iterator()Ljava/util/Iterator;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "Lkotlin/ranges/IntRange;",
-        ">;",
-        "Lj0/n/c/v/a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public e:I
-
-.field public f:I
-
-.field public g:Lkotlin/ranges/IntRange;
-
-.field public h:I
-
-.field public final synthetic i:Lj0/t/b;
-
-
-# direct methods
-.method public constructor <init>(Lj0/t/b;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/t/b$a;->i:Lj0/t/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, -0x1
-
-    iput v0, p0, Lj0/t/b$a;->d:I
-
-    iget v0, p1, Lj0/t/b;->b:I
-
-    iget-object p1, p1, Lj0/t/b;->a:Ljava/lang/CharSequence;
-
-    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
-
-    move-result p1
-
-    const/4 v1, 0x0
-
-    invoke-static {v0, v1, p1}, Lj0/q/f;->coerceIn(III)I
-
-    move-result p1
-
-    iput p1, p0, Lj0/t/b$a;->e:I
-
-    iput p1, p0, Lj0/t/b$a;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 6
-
-    iget v0, p0, Lj0/t/b$a;->f:I
-
-    const/4 v1, 0x0
-
-    if-gez v0, :cond_0
-
-    iput v1, p0, Lj0/t/b$a;->d:I
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lj0/t/b$a;->g:Lkotlin/ranges/IntRange;
-
-    goto/16 :goto_1
-
-    :cond_0
-    iget-object v0, p0, Lj0/t/b$a;->i:Lj0/t/b;
-
-    iget v0, v0, Lj0/t/b;->c:I
-
-    const/4 v2, -0x1
-
-    const/4 v3, 0x1
-
-    if-lez v0, :cond_1
-
-    iget v4, p0, Lj0/t/b$a;->h:I
-
-    add-int/2addr v4, v3
-
-    iput v4, p0, Lj0/t/b$a;->h:I
-
-    if-ge v4, v0, :cond_2
-
-    :cond_1
-    iget v0, p0, Lj0/t/b$a;->f:I
-
-    iget-object v4, p0, Lj0/t/b$a;->i:Lj0/t/b;
-
-    iget-object v4, v4, Lj0/t/b;->a:Ljava/lang/CharSequence;
-
-    invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
-
-    move-result v4
-
-    if-le v0, v4, :cond_3
-
-    :cond_2
-    iget v0, p0, Lj0/t/b$a;->e:I
-
-    new-instance v1, Lkotlin/ranges/IntRange;
-
-    iget-object v4, p0, Lj0/t/b$a;->i:Lj0/t/b;
-
-    iget-object v4, v4, Lj0/t/b;->a:Ljava/lang/CharSequence;
-
-    invoke-static {v4}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result v4
-
-    invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    iput-object v1, p0, Lj0/t/b$a;->g:Lkotlin/ranges/IntRange;
-
-    iput v2, p0, Lj0/t/b$a;->f:I
-
-    goto :goto_0
-
-    :cond_3
-    iget-object v0, p0, Lj0/t/b$a;->i:Lj0/t/b;
-
-    iget-object v4, v0, Lj0/t/b;->d:Lkotlin/jvm/functions/Function2;
-
-    iget-object v0, v0, Lj0/t/b;->a:Ljava/lang/CharSequence;
-
-    iget v5, p0, Lj0/t/b$a;->f:I
-
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
-
-    invoke-interface {v4, v0, v5}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlin/Pair;
-
-    if-nez v0, :cond_4
-
-    iget v0, p0, Lj0/t/b$a;->e:I
-
-    new-instance v1, Lkotlin/ranges/IntRange;
-
-    iget-object v4, p0, Lj0/t/b$a;->i:Lj0/t/b;
-
-    iget-object v4, v4, Lj0/t/b;->a:Ljava/lang/CharSequence;
-
-    invoke-static {v4}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result v4
-
-    invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    iput-object v1, p0, Lj0/t/b$a;->g:Lkotlin/ranges/IntRange;
-
-    iput v2, p0, Lj0/t/b$a;->f:I
-
-    goto :goto_0
-
-    :cond_4
-    iget-object v2, v0, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    check-cast v2, Ljava/lang/Number;
-
-    invoke-virtual {v2}, Ljava/lang/Number;->intValue()I
-
-    move-result v2
-
-    iget-object v0, v0, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v0
-
-    iget v4, p0, Lj0/t/b$a;->e:I
-
-    invoke-static {v4, v2}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v4
-
-    iput-object v4, p0, Lj0/t/b$a;->g:Lkotlin/ranges/IntRange;
-
-    add-int/2addr v2, v0
-
-    iput v2, p0, Lj0/t/b$a;->e:I
-
-    if-nez v0, :cond_5
-
-    const/4 v1, 0x1
-
-    :cond_5
-    add-int/2addr v2, v1
-
-    iput v2, p0, Lj0/t/b$a;->f:I
-
-    :goto_0
-    iput v3, p0, Lj0/t/b$a;->d:I
-
-    :goto_1
-    return-void
-.end method
-
-.method public hasNext()Z
-    .locals 2
-
-    iget v0, p0, Lj0/t/b$a;->d:I
-
-    const/4 v1, -0x1
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lj0/t/b$a;->a()V
-
-    :cond_0
-    iget v0, p0, Lj0/t/b$a;->d:I
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 3
-
-    iget v0, p0, Lj0/t/b$a;->d:I
-
-    const/4 v1, -0x1
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lj0/t/b$a;->a()V
-
-    :cond_0
-    iget v0, p0, Lj0/t/b$a;->d:I
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lj0/t/b$a;->g:Lkotlin/ranges/IntRange;
-
-    if-eqz v0, :cond_1
-
-    const/4 v2, 0x0
-
-    iput-object v2, p0, Lj0/t/b$a;->g:Lkotlin/ranges/IntRange;
-
-    iput v1, p0, Lj0/t/b$a;->d:I
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.ranges.IntRange"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Operation is not supported for read-only collection"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/t/b.smali b/com.discord/smali_classes2/j0/t/b.smali
deleted file mode 100644
index 92b78d28f2..0000000000
--- a/com.discord/smali_classes2/j0/t/b.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final Lj0/t/b;
-.super Ljava/lang/Object;
-.source "Strings.kt"
-
-# interfaces
-.implements Lkotlin/sequences/Sequence;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/sequences/Sequence<",
-        "Lkotlin/ranges/IntRange;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/CharSequence;
-
-.field public final b:I
-
-.field public final c:I
-
-.field public final d:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "Ljava/lang/CharSequence;",
-            "Ljava/lang/Integer;",
-            "Lkotlin/Pair<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function2;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/CharSequence;",
-            "II",
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Ljava/lang/CharSequence;",
-            "-",
-            "Ljava/lang/Integer;",
-            "Lkotlin/Pair<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;>;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/t/b;->a:Ljava/lang/CharSequence;
-
-    iput p2, p0, Lj0/t/b;->b:I
-
-    iput p3, p0, Lj0/t/b;->c:I
-
-    iput-object p4, p0, Lj0/t/b;->d:Lkotlin/jvm/functions/Function2;
-
-    return-void
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "Lkotlin/ranges/IntRange;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Lj0/t/b$a;
-
-    invoke-direct {v0, p0}, Lj0/t/b$a;-><init>(Lj0/t/b;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/t/c$a.smali b/com.discord/smali_classes2/j0/t/c$a.smali
deleted file mode 100644
index 8ab70e108b..0000000000
--- a/com.discord/smali_classes2/j0/t/c$a.smali
+++ /dev/null
@@ -1,146 +0,0 @@
-.class public final Lj0/t/c$a;
-.super Lj0/i/c;
-.source "Regex.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/t/c;->getGroupValues()Ljava/util/List;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/i/c<",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lj0/t/c;
-
-
-# direct methods
-.method public constructor <init>(Lj0/t/c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lj0/t/c$a;->d:Lj0/t/c;
-
-    invoke-direct {p0}, Lj0/i/c;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final bridge contains(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-super {p0, p1}, Lj0/i/a;->contains(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public get(I)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lj0/t/c$a;->d:Lj0/t/c;
-
-    iget-object v0, v0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v0, p1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, ""
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public getSize()I
-    .locals 1
-
-    iget-object v0, p0, Lj0/t/c$a;->d:Lj0/t/c;
-
-    iget-object v0, v0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v0}, Ljava/util/regex/Matcher;->groupCount()I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    return v0
-.end method
-
-.method public final bridge indexOf(Ljava/lang/Object;)I
-    .locals 1
-
-    instance-of v0, p1, Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-super {p0, p1}, Lj0/i/c;->indexOf(Ljava/lang/Object;)I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const/4 p1, -0x1
-
-    return p1
-.end method
-
-.method public final bridge lastIndexOf(Ljava/lang/Object;)I
-    .locals 1
-
-    instance-of v0, p1, Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-super {p0, p1}, Lj0/i/c;->lastIndexOf(Ljava/lang/Object;)I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const/4 p1, -0x1
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/j0/t/c.smali b/com.discord/smali_classes2/j0/t/c.smali
deleted file mode 100644
index c33f899f6c..0000000000
--- a/com.discord/smali_classes2/j0/t/c.smali
+++ /dev/null
@@ -1,200 +0,0 @@
-.class public final Lj0/t/c;
-.super Ljava/lang/Object;
-.source "Regex.kt"
-
-# interfaces
-.implements Lkotlin/text/MatchResult;
-
-
-# instance fields
-.field public a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/util/regex/Matcher;
-
-.field public final c:Ljava/lang/CharSequence;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
-    .locals 0
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    iput-object p2, p0, Lj0/t/c;->c:Ljava/lang/CharSequence;
-
-    return-void
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public getGroupValues()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lj0/t/c;->a:Ljava/util/List;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Lj0/t/c$a;
-
-    invoke-direct {v0, p0}, Lj0/t/c$a;-><init>(Lj0/t/c;)V
-
-    iput-object v0, p0, Lj0/t/c;->a:Ljava/util/List;
-
-    :cond_0
-    iget-object v0, p0, Lj0/t/c;->a:Ljava/util/List;
-
-    if-eqz v0, :cond_1
-
-    return-object v0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public getRange()Lkotlin/ranges/IntRange;
-    .locals 2
-
-    iget-object v0, p0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v0}, Ljava/util/regex/Matcher;->start()I
-
-    move-result v1
-
-    invoke-virtual {v0}, Ljava/util/regex/Matcher;->end()I
-
-    move-result v0
-
-    invoke-static {v1, v0}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getValue()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v0}, Ljava/util/regex/Matcher;->group()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "matchResult.group()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public next()Lkotlin/text/MatchResult;
-    .locals 4
-
-    iget-object v0, p0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v0}, Ljava/util/regex/Matcher;->end()I
-
-    move-result v0
-
-    iget-object v1, p0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v1}, Ljava/util/regex/Matcher;->end()I
-
-    move-result v1
-
-    iget-object v2, p0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v2}, Ljava/util/regex/Matcher;->start()I
-
-    move-result v2
-
-    if-ne v1, v2, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    add-int/2addr v0, v1
-
-    iget-object v1, p0, Lj0/t/c;->c:Ljava/lang/CharSequence;
-
-    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-gt v0, v1, :cond_2
-
-    iget-object v1, p0, Lj0/t/c;->b:Ljava/util/regex/Matcher;
-
-    invoke-virtual {v1}, Ljava/util/regex/Matcher;->pattern()Ljava/util/regex/Pattern;
-
-    move-result-object v1
-
-    iget-object v3, p0, Lj0/t/c;->c:Ljava/lang/CharSequence;
-
-    invoke-virtual {v1, v3}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
-
-    move-result-object v1
-
-    const-string v3, "matcher.pattern().matcher(input)"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v3, p0, Lj0/t/c;->c:Ljava/lang/CharSequence;
-
-    invoke-virtual {v1, v0}, Ljava/util/regex/Matcher;->find(I)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v2, Lj0/t/c;
-
-    invoke-direct {v2, v1, v3}, Lj0/t/c;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
-
-    :cond_2
-    :goto_1
-    return-object v2
-.end method
diff --git a/com.discord/smali_classes2/j0/t/d.smali b/com.discord/smali_classes2/j0/t/d.smali
deleted file mode 100644
index 791a721c12..0000000000
--- a/com.discord/smali_classes2/j0/t/d.smali
+++ /dev/null
@@ -1,213 +0,0 @@
-.class public final enum Lj0/t/d;
-.super Ljava/lang/Enum;
-.source "Regex.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lj0/t/d;",
-        ">;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lj0/t/d;
-
-.field public static final synthetic e:[Lj0/t/d;
-
-
-# instance fields
-.field public final mask:I
-
-.field public final value:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 14
-
-    const/4 v0, 0x7
-
-    new-array v0, v0, [Lj0/t/d;
-
-    new-instance v7, Lj0/t/d;
-
-    const-string v2, "IGNORE_CASE"
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x2
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x2
-
-    move-object v1, v7
-
-    invoke-direct/range {v1 .. v6}, Lj0/t/d;-><init>(Ljava/lang/String;IIII)V
-
-    sput-object v7, Lj0/t/d;->d:Lj0/t/d;
-
-    const/4 v1, 0x0
-
-    aput-object v7, v0, v1
-
-    new-instance v1, Lj0/t/d;
-
-    const-string v9, "MULTILINE"
-
-    const/4 v10, 0x1
-
-    const/16 v11, 0x8
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x2
-
-    move-object v8, v1
-
-    invoke-direct/range {v8 .. v13}, Lj0/t/d;-><init>(Ljava/lang/String;IIII)V
-
-    const/4 v2, 0x1
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/t/d;
-
-    const-string v4, "LITERAL"
-
-    const/4 v5, 0x2
-
-    const/16 v6, 0x10
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x2
-
-    move-object v3, v1
-
-    invoke-direct/range {v3 .. v8}, Lj0/t/d;-><init>(Ljava/lang/String;IIII)V
-
-    const/4 v2, 0x2
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/t/d;
-
-    const-string v4, "UNIX_LINES"
-
-    const/4 v5, 0x3
-
-    const/4 v6, 0x1
-
-    move-object v3, v1
-
-    invoke-direct/range {v3 .. v8}, Lj0/t/d;-><init>(Ljava/lang/String;IIII)V
-
-    const/4 v2, 0x3
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/t/d;
-
-    const-string v4, "COMMENTS"
-
-    const/4 v5, 0x4
-
-    const/4 v6, 0x4
-
-    move-object v3, v1
-
-    invoke-direct/range {v3 .. v8}, Lj0/t/d;-><init>(Ljava/lang/String;IIII)V
-
-    const/4 v2, 0x4
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/t/d;
-
-    const-string v4, "DOT_MATCHES_ALL"
-
-    const/4 v5, 0x5
-
-    const/16 v6, 0x20
-
-    move-object v3, v1
-
-    invoke-direct/range {v3 .. v8}, Lj0/t/d;-><init>(Ljava/lang/String;IIII)V
-
-    const/4 v2, 0x5
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Lj0/t/d;
-
-    const-string v4, "CANON_EQ"
-
-    const/4 v5, 0x6
-
-    const/16 v6, 0x80
-
-    move-object v3, v1
-
-    invoke-direct/range {v3 .. v8}, Lj0/t/d;-><init>(Ljava/lang/String;IIII)V
-
-    const/4 v2, 0x6
-
-    aput-object v1, v0, v2
-
-    sput-object v0, Lj0/t/d;->e:[Lj0/t/d;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;IIII)V
-    .locals 0
-
-    and-int/lit8 p5, p5, 0x2
-
-    if-eqz p5, :cond_0
-
-    move p4, p3
-
-    :cond_0
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    iput p3, p0, Lj0/t/d;->value:I
-
-    iput p4, p0, Lj0/t/d;->mask:I
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lj0/t/d;
-    .locals 1
-
-    const-class v0, Lj0/t/d;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lj0/t/d;
-
-    return-object p0
-.end method
-
-.method public static values()[Lj0/t/d;
-    .locals 1
-
-    sget-object v0, Lj0/t/d;->e:[Lj0/t/d;
-
-    invoke-virtual {v0}, [Lj0/t/d;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lj0/t/d;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/j0/t/e.smali b/com.discord/smali_classes2/j0/t/e.smali
deleted file mode 100644
index b6912ceea7..0000000000
--- a/com.discord/smali_classes2/j0/t/e.smali
+++ /dev/null
@@ -1,12 +0,0 @@
-.class public final Lj0/t/e;
-.super Lj0/t/s;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/s;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/t/f.smali b/com.discord/smali_classes2/j0/t/f.smali
deleted file mode 100644
index 3dc521dd31..0000000000
--- a/com.discord/smali_classes2/j0/t/f.smali
+++ /dev/null
@@ -1,86 +0,0 @@
-.class public Lj0/t/f;
-.super Ljava/lang/Object;
-.source "Appendable.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public static final appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Appendable;",
-            "TT;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-TT;+",
-            "Ljava/lang/CharSequence;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/CharSequence;
-
-    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
-
-    goto :goto_1
-
-    :cond_0
-    if-eqz p1, :cond_1
-
-    instance-of p2, p1, Ljava/lang/CharSequence;
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p2, 0x1
-
-    :goto_0
-    if-eqz p2, :cond_2
-
-    check-cast p1, Ljava/lang/CharSequence;
-
-    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
-
-    goto :goto_1
-
-    :cond_2
-    instance-of p2, p1, Ljava/lang/Character;
-
-    if-eqz p2, :cond_3
-
-    check-cast p1, Ljava/lang/Character;
-
-    invoke-virtual {p1}, Ljava/lang/Character;->charValue()C
-
-    move-result p1
-
-    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(C)Ljava/lang/Appendable;
-
-    goto :goto_1
-
-    :cond_3
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
-
-    :goto_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/t/g$a.smali b/com.discord/smali_classes2/j0/t/g$a.smali
deleted file mode 100644
index 1a1708de35..0000000000
--- a/com.discord/smali_classes2/j0/t/g$a.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lj0/t/g$a;
-.super Lj0/n/c/i;
-.source "Indent.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/t/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/String;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/t/g$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/t/g$a;
-
-    invoke-direct {v0}, Lj0/t/g$a;-><init>()V
-
-    sput-object v0, Lj0/t/g$a;->d:Lj0/t/g$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/String;
-
-    if-eqz p1, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "line"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/t/g$b.smali b/com.discord/smali_classes2/j0/t/g$b.smali
deleted file mode 100644
index ee2e4a7f21..0000000000
--- a/com.discord/smali_classes2/j0/t/g$b.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lj0/t/g$b;
-.super Lj0/n/c/i;
-.source "Indent.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lj0/t/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/String;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $indent:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/t/g$b;->$indent:Ljava/lang/String;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Ljava/lang/String;
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lj0/t/g$b;->$indent:Ljava/lang/String;
-
-    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "line"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/t/g.smali b/com.discord/smali_classes2/j0/t/g.smali
deleted file mode 100644
index bbe9b2b457..0000000000
--- a/com.discord/smali_classes2/j0/t/g.smali
+++ /dev/null
@@ -1,315 +0,0 @@
-.class public Lj0/t/g;
-.super Lj0/t/f;
-.source "Indent.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/f;-><init>()V
-
-    return-void
-.end method
-
-.method public static final a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")",
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    sget-object p0, Lj0/t/g$a;->d:Lj0/t/g$a;
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v0, Lj0/t/g$b;
-
-    invoke-direct {v0, p0}, Lj0/t/g$b;-><init>(Ljava/lang/String;)V
-
-    move-object p0, v0
-
-    :goto_1
-    return-object p0
-.end method
-
-.method public static trimMargin$default(Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-    .locals 13
-
-    and-int/lit8 p1, p2, 0x1
-
-    const/4 p2, 0x0
-
-    if-eqz p1, :cond_0
-
-    const-string p1, "|"
-
-    goto :goto_0
-
-    :cond_0
-    move-object p1, p2
-
-    :goto_0
-    if-eqz p0, :cond_d
-
-    if-eqz p1, :cond_c
-
-    invoke-static {p1}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_b
-
-    invoke-static {p0}, Lj0/t/p;->lines(Ljava/lang/CharSequence;)Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result p0
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    mul-int/lit8 v1, v1, 0x0
-
-    add-int/2addr v1, p0
-
-    const-string p0, ""
-
-    invoke-static {p0}, Lj0/t/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-
-    move-result-object p0
-
-    invoke-static {v0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
-
-    move-result v3
-
-    new-instance v4, Ljava/util/ArrayList;
-
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    const/4 v5, 0x0
-
-    :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_a
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v6
-
-    add-int/lit8 v7, v5, 0x1
-
-    if-ltz v5, :cond_9
-
-    check-cast v6, Ljava/lang/String;
-
-    if-eqz v5, :cond_1
-
-    if-ne v5, v3, :cond_2
-
-    :cond_1
-    invoke-static {v6}, Lj0/t/k;->isBlank(Ljava/lang/CharSequence;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    move-object v6, p2
-
-    goto :goto_6
-
-    :cond_2
-    invoke-virtual {v6}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    const/4 v8, 0x0
-
-    :goto_2
-    const/4 v9, -0x1
-
-    if-ge v8, v5, :cond_4
-
-    invoke-virtual {v6, v8}, Ljava/lang/String;->charAt(I)C
-
-    move-result v10
-
-    invoke-static {v10}, Lf/n/a/k/a;->isWhitespace(C)Z
-
-    move-result v10
-
-    xor-int/lit8 v10, v10, 0x1
-
-    if-eqz v10, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    add-int/lit8 v8, v8, 0x1
-
-    goto :goto_2
-
-    :cond_4
-    const/4 v8, -0x1
-
-    :goto_3
-    if-ne v8, v9, :cond_5
-
-    goto :goto_4
-
-    :cond_5
-    const/4 v5, 0x4
-
-    invoke-static {v6, p1, v8, v2, v5}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_6
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    add-int/2addr v5, v8
-
-    invoke-virtual {v6, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v8, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {v5, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_5
-
-    :cond_6
-    :goto_4
-    move-object v5, p2
-
-    :goto_5
-    if-eqz v5, :cond_7
-
-    invoke-interface {p0, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/String;
-
-    if-eqz v5, :cond_7
-
-    move-object v6, v5
-
-    :cond_7
-    :goto_6
-    if-eqz v6, :cond_8
-
-    invoke-virtual {v4, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_8
-    move v5, v7
-
-    goto :goto_1
-
-    :cond_9
-    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
-
-    throw p2
-
-    :cond_a
-    new-instance p0, Ljava/lang/StringBuilder;
-
-    invoke-direct {p0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/16 v12, 0x7c
-
-    const-string v6, "\n"
-
-    move-object v5, p0
-
-    invoke-static/range {v4 .. v12}, Lj0/i/l;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/Appendable;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "mapIndexedNotNull { inde\u2026\"\\n\")\n        .toString()"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_b
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string p1, "marginPrefix must be non-blank string."
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_c
-    const-string p0, "marginPrefix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_d
-    const-string p0, "$this$trimMargin"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-.end method
diff --git a/com.discord/smali_classes2/j0/t/h.smali b/com.discord/smali_classes2/j0/t/h.smali
deleted file mode 100644
index aa3d952599..0000000000
--- a/com.discord/smali_classes2/j0/t/h.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public Lj0/t/h;
-.super Lj0/t/g;
-.source "RegexExtensions.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/g;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/t/i.smali b/com.discord/smali_classes2/j0/t/i.smali
deleted file mode 100644
index 4e819be08f..0000000000
--- a/com.discord/smali_classes2/j0/t/i.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public Lj0/t/i;
-.super Lj0/t/h;
-.source "StringBuilder.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/h;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/t/j.smali b/com.discord/smali_classes2/j0/t/j.smali
deleted file mode 100644
index 1444dedb1a..0000000000
--- a/com.discord/smali_classes2/j0/t/j.smali
+++ /dev/null
@@ -1,312 +0,0 @@
-.class public Lj0/t/j;
-.super Lj0/t/i;
-.source "StringNumberConversions.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/i;-><init>()V
-
-    return-void
-.end method
-
-.method public static final toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
-    .locals 11
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_a
-
-    const/16 v1, 0xa
-
-    invoke-static {v1}, Lf/n/a/k/a;->checkRadix(I)I
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    if-nez v2, :cond_0
-
-    goto :goto_4
-
-    :cond_0
-    const/4 v3, 0x0
-
-    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    const/16 v5, 0x30
-
-    const v6, -0x7fffffff
-
-    const/4 v7, 0x1
-
-    if-ge v4, v5, :cond_3
-
-    if-ne v2, v7, :cond_1
-
-    goto :goto_4
-
-    :cond_1
-    const/16 v5, 0x2d
-
-    if-ne v4, v5, :cond_2
-
-    const/high16 v6, -0x80000000
-
-    const/4 v4, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v5, 0x2b
-
-    if-ne v4, v5, :cond_9
-
-    const/4 v4, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v4, 0x0
-
-    :goto_0
-    const/4 v7, 0x0
-
-    :goto_1
-    const v5, -0x38e38e3
-
-    const v8, -0x38e38e3
-
-    :goto_2
-    if-ge v4, v2, :cond_7
-
-    invoke-virtual {p0, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v9
-
-    invoke-static {v9, v1}, Ljava/lang/Character;->digit(II)I
-
-    move-result v9
-
-    if-gez v9, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    if-ge v3, v8, :cond_5
-
-    if-ne v8, v5, :cond_9
-
-    div-int/lit8 v8, v6, 0xa
-
-    if-ge v3, v8, :cond_5
-
-    goto :goto_4
-
-    :cond_5
-    mul-int/lit8 v3, v3, 0xa
-
-    add-int v10, v6, v9
-
-    if-ge v3, v10, :cond_6
-
-    goto :goto_4
-
-    :cond_6
-    sub-int/2addr v3, v9
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_2
-
-    :cond_7
-    if-eqz v7, :cond_8
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    goto :goto_3
-
-    :cond_8
-    neg-int p0, v3
-
-    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-
-    :goto_3
-    move-object v0, p0
-
-    :cond_9
-    :goto_4
-    return-object v0
-
-    :cond_a
-    const-string p0, "$this$toIntOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
-    .locals 18
-
-    move-object/from16 v0, p0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_a
-
-    const/16 v2, 0xa
-
-    invoke-static {v2}, Lf/n/a/k/a;->checkRadix(I)I
-
-    invoke-virtual/range {p0 .. p0}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    if-nez v3, :cond_0
-
-    goto/16 :goto_3
-
-    :cond_0
-    const/4 v4, 0x0
-
-    invoke-virtual {v0, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    const/16 v6, 0x30
-
-    const-wide v7, -0x7fffffffffffffffL    # -4.9E-324
-
-    const/4 v9, 0x1
-
-    if-ge v5, v6, :cond_3
-
-    if-ne v3, v9, :cond_1
-
-    goto :goto_3
-
-    :cond_1
-    const/16 v6, 0x2d
-
-    if-ne v5, v6, :cond_2
-
-    const-wide/high16 v7, -0x8000000000000000L
-
-    const/4 v4, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/16 v6, 0x2b
-
-    if-ne v5, v6, :cond_9
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v9, 0x0
-
-    :goto_0
-    const-wide/16 v5, 0x0
-
-    const-wide v10, -0x38e38e38e38e38eL    # -2.772000429909333E291
-
-    move-wide v12, v10
-
-    :goto_1
-    if-ge v9, v3, :cond_7
-
-    invoke-virtual {v0, v9}, Ljava/lang/String;->charAt(I)C
-
-    move-result v14
-
-    invoke-static {v14, v2}, Ljava/lang/Character;->digit(II)I
-
-    move-result v14
-
-    if-gez v14, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    cmp-long v15, v5, v12
-
-    if-gez v15, :cond_5
-
-    cmp-long v15, v12, v10
-
-    if-nez v15, :cond_9
-
-    int-to-long v12, v2
-
-    div-long v12, v7, v12
-
-    cmp-long v15, v5, v12
-
-    if-gez v15, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    int-to-long v10, v2
-
-    mul-long v5, v5, v10
-
-    int-to-long v10, v14
-
-    add-long v16, v7, v10
-
-    cmp-long v14, v5, v16
-
-    if-gez v14, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    sub-long/2addr v5, v10
-
-    add-int/lit8 v9, v9, 0x1
-
-    const-wide v10, -0x38e38e38e38e38eL    # -2.772000429909333E291
-
-    goto :goto_1
-
-    :cond_7
-    if-eqz v4, :cond_8
-
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_8
-    neg-long v0, v5
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    :goto_2
-    move-object v1, v0
-
-    :cond_9
-    :goto_3
-    return-object v1
-
-    :cond_a
-    const-string v0, "$this$toLongOrNull"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/j0/t/k.smali b/com.discord/smali_classes2/j0/t/k.smali
deleted file mode 100644
index 06362118b6..0000000000
--- a/com.discord/smali_classes2/j0/t/k.smali
+++ /dev/null
@@ -1,577 +0,0 @@
-.class public Lj0/t/k;
-.super Lj0/t/j;
-.source "StringsJVM.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/j;-><init>()V
-
-    return-void
-.end method
-
-.method public static final compareTo(Ljava/lang/String;Ljava/lang/String;Z)I
-    .locals 0
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->compareToIgnoreCase(Ljava/lang/String;)I
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    invoke-virtual {p0, p1}, Ljava/lang/String;->compareTo(Ljava/lang/String;)I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-    .locals 6
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    const/4 p3, 0x0
-
-    if-eqz p0, :cond_3
-
-    if-eqz p1, :cond_2
-
-    if-nez p2, :cond_1
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
-
-    move-result p0
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result p2
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result p3
-
-    sub-int v1, p2, p3
-
-    const/4 v3, 0x0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    const/4 v5, 0x1
-
-    move-object v0, p0
-
-    move-object v2, p1
-
-    invoke-static/range {v0 .. v5}, Lj0/t/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
-
-    move-result p0
-
-    :goto_0
-    return p0
-
-    :cond_2
-    const-string p0, "suffix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-
-    :cond_3
-    const-string p0, "$this$endsWith"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
-.end method
-
-.method public static final equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-    .locals 0
-
-    if-nez p0, :cond_1
-
-    if-nez p1, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-
-    :cond_1
-    if-nez p2, :cond_2
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result p0
-
-    goto :goto_1
-
-    :cond_2
-    invoke-virtual {p0, p1}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
-
-    move-result p0
-
-    :goto_1
-    return p0
-.end method
-
-.method public static final isBlank(Ljava/lang/CharSequence;)Z
-    .locals 4
-
-    if-eqz p0, :cond_5
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_3
-
-    new-instance v0, Lkotlin/ranges/IntRange;
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v3
-
-    add-int/lit8 v3, v3, -0x1
-
-    invoke-direct {v0, v1, v3}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    instance-of v3, v0, Ljava/util/Collection;
-
-    if-eqz v3, :cond_1
-
-    move-object v3, v0
-
-    check-cast v3, Ljava/util/Collection;
-
-    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    :cond_0
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_2
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    move-object v3, v0
-
-    check-cast v3, Lj0/i/q;
-
-    invoke-virtual {v3}, Lj0/i/q;->nextInt()I
-
-    move-result v3
-
-    invoke-interface {p0, v3}, Ljava/lang/CharSequence;->charAt(I)C
-
-    move-result v3
-
-    invoke-static {v3}, Lf/n/a/k/a;->isWhitespace(C)Z
-
-    move-result v3
-
-    if-nez v3, :cond_2
-
-    const/4 p0, 0x0
-
-    :goto_0
-    if-eqz p0, :cond_4
-
-    :cond_3
-    const/4 v1, 0x1
-
-    :cond_4
-    return v1
-
-    :cond_5
-    const-string p0, "$this$isBlank"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
-    .locals 6
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-nez p5, :cond_0
-
-    invoke-virtual {p0, p1, p2, p3, p4}, Ljava/lang/String;->regionMatches(ILjava/lang/String;II)Z
-
-    move-result p0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, p0
-
-    move v1, p5
-
-    move v2, p1
-
-    move-object v3, p2
-
-    move v4, p3
-
-    move v5, p4
-
-    invoke-virtual/range {v0 .. v5}, Ljava/lang/String;->regionMatches(ZILjava/lang/String;II)Z
-
-    move-result p0
-
-    :goto_0
-    return p0
-
-    :cond_1
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$regionMatches"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static replace$default(Ljava/lang/String;CCZI)Ljava/lang/String;
-    .locals 8
-
-    and-int/lit8 p4, p4, 0x4
-
-    const/4 v0, 0x0
-
-    if-eqz p4, :cond_0
-
-    const/4 v4, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move v4, p3
-
-    :goto_0
-    if-nez v4, :cond_1
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "(this as java.lang.Strin\u2026replace(oldChar, newChar)"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p3, 0x1
-
-    new-array v2, p3, [C
-
-    aput-char p1, v2, v0
-
-    const/4 v5, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v6, 0x2
-
-    move-object v1, p0
-
-    invoke-static/range {v1 .. v6}, Lj0/t/p;->d(Ljava/lang/CharSequence;[CIZII)Lkotlin/sequences/Sequence;
-
-    move-result-object p1
-
-    new-instance p3, Lj0/t/o;
-
-    invoke-direct {p3, p0}, Lj0/t/o;-><init>(Ljava/lang/CharSequence;)V
-
-    invoke-static {p1, p3}, Lf/n/a/k/a;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
-
-    move-result-object v0
-
-    invoke-static {p2}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/16 v7, 0x3e
-
-    invoke-static/range {v0 .. v7}, Lf/n/a/k/a;->joinToString$default(Lkotlin/sequences/Sequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-
-    move-result-object p0
-
-    :goto_1
-    return-object p0
-.end method
-
-.method public static replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-    .locals 10
-
-    const/4 v0, 0x4
-
-    and-int/2addr p4, v0
-
-    const/4 v1, 0x0
-
-    if-eqz p4, :cond_0
-
-    const/4 p3, 0x0
-
-    :cond_0
-    const/4 p4, 0x0
-
-    if-eqz p0, :cond_3
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    const/4 p4, 0x1
-
-    new-array p4, p4, [Ljava/lang/String;
-
-    aput-object p1, p4, v1
-
-    invoke-static {p0, p4, p3, v1, v0}, Lj0/t/p;->splitToSequence$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Lkotlin/sequences/Sequence;
-
-    move-result-object v2
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/16 v9, 0x3e
-
-    move-object v3, p2
-
-    invoke-static/range {v2 .. v9}, Lf/n/a/k/a;->joinToString$default(Lkotlin/sequences/Sequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    const-string p0, "newValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_2
-    const-string p0, "oldValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-
-    :cond_3
-    const-string p0, "$this$replace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-.end method
-
-.method public static final startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
-    .locals 6
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    if-nez p3, :cond_0
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->startsWith(Ljava/lang/String;I)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    move-object v0, p0
-
-    move v1, p2
-
-    move-object v2, p1
-
-    move v5, p3
-
-    invoke-static/range {v0 .. v5}, Lj0/t/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_1
-    const-string p0, "prefix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$startsWith"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
-    .locals 6
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    if-nez p2, :cond_0
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    const/4 v3, 0x0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    move-object v0, p0
-
-    move-object v2, p1
-
-    move v5, p2
-
-    invoke-static/range {v0 .. v5}, Lj0/t/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_1
-    const-string p0, "prefix"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$startsWith"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
-    .locals 0
-
-    and-int/lit8 p4, p4, 0x4
-
-    if-eqz p4, :cond_0
-
-    const/4 p3, 0x0
-
-    :cond_0
-    invoke-static {p0, p1, p2, p3}, Lj0/t/k;->startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static synthetic startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    invoke-static {p0, p1, p2}, Lj0/t/k;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result p0
-
-    return p0
-.end method
diff --git a/com.discord/smali_classes2/j0/t/l.smali b/com.discord/smali_classes2/j0/t/l.smali
deleted file mode 100644
index 6ada8da19a..0000000000
--- a/com.discord/smali_classes2/j0/t/l.smali
+++ /dev/null
@@ -1,100 +0,0 @@
-.class public final Lj0/t/l;
-.super Lj0/n/c/i;
-.source "Strings.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Ljava/lang/CharSequence;",
-        "Ljava/lang/Integer;",
-        "Lkotlin/Pair<",
-        "+",
-        "Ljava/lang/Integer;",
-        "+",
-        "Ljava/lang/Integer;",
-        ">;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $delimiters:[C
-
-.field public final synthetic $ignoreCase:Z
-
-
-# direct methods
-.method public constructor <init>([CZ)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/t/l;->$delimiters:[C
-
-    iput-boolean p2, p0, Lj0/t/l;->$ignoreCase:Z
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Ljava/lang/CharSequence;
-
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
-
-    move-result p2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    iget-object v1, p0, Lj0/t/l;->$delimiters:[C
-
-    iget-boolean v2, p0, Lj0/t/l;->$ignoreCase:Z
-
-    invoke-static {p1, v1, p2, v2}, Lj0/t/p;->indexOfAny(Ljava/lang/CharSequence;[CIZ)I
-
-    move-result p1
-
-    if-gez p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    const/4 p2, 0x1
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p2
-
-    new-instance v0, Lkotlin/Pair;
-
-    invoke-direct {v0, p1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/j0/t/m.smali b/com.discord/smali_classes2/j0/t/m.smali
deleted file mode 100644
index a32426c154..0000000000
--- a/com.discord/smali_classes2/j0/t/m.smali
+++ /dev/null
@@ -1,348 +0,0 @@
-.class public final Lj0/t/m;
-.super Lj0/n/c/i;
-.source "Strings.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Ljava/lang/CharSequence;",
-        "Ljava/lang/Integer;",
-        "Lkotlin/Pair<",
-        "+",
-        "Ljava/lang/Integer;",
-        "+",
-        "Ljava/lang/Integer;",
-        ">;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $delimitersList:Ljava/util/List;
-
-.field public final synthetic $ignoreCase:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;Z)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/t/m;->$delimitersList:Ljava/util/List;
-
-    iput-boolean p2, p0, Lj0/t/m;->$ignoreCase:Z
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 13
-
-    check-cast p1, Ljava/lang/CharSequence;
-
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
-
-    move-result p2
-
-    const/4 v6, 0x0
-
-    if-eqz p1, :cond_10
-
-    iget-object v7, p0, Lj0/t/m;->$delimitersList:Ljava/util/List;
-
-    iget-boolean v8, p0, Lj0/t/m;->$ignoreCase:Z
-
-    const/4 v0, 0x0
-
-    if-nez v8, :cond_3
-
-    invoke-interface {v7}, Ljava/util/Collection;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-ne v1, v2, :cond_3
-
-    invoke-interface {v7}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    if-ne v1, v2, :cond_1
-
-    invoke-interface {v7, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/String;
-
-    const/4 v2, 0x4
-
-    invoke-static {p1, v1, p2, v0, v2}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
-
-    move-result p1
-
-    if-gez p1, :cond_0
-
-    goto/16 :goto_4
-
-    :cond_0
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    new-instance p2, Lkotlin/Pair;
-
-    invoke-direct {p2, p1, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    goto/16 :goto_5
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "List has more than one element."
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/util/NoSuchElementException;
-
-    const-string p2, "List is empty."
-
-    invoke-direct {p1, p2}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    if-gez p2, :cond_4
-
-    const/4 p2, 0x0
-
-    :cond_4
-    new-instance v0, Lkotlin/ranges/IntRange;
-
-    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    invoke-direct {v0, p2, v1}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    instance-of p2, p1, Ljava/lang/String;
-
-    if-eqz p2, :cond_9
-
-    iget p2, v0, Lkotlin/ranges/IntProgression;->d:I
-
-    iget v9, v0, Lkotlin/ranges/IntProgression;->e:I
-
-    iget v10, v0, Lkotlin/ranges/IntProgression;->f:I
-
-    if-ltz v10, :cond_5
-
-    if-gt p2, v9, :cond_e
-
-    goto :goto_0
-
-    :cond_5
-    if-lt p2, v9, :cond_e
-
-    :goto_0
-    invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v11
-
-    :cond_6
-    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_7
-
-    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v12
-
-    move-object v0, v12
-
-    check-cast v0, Ljava/lang/String;
-
-    const/4 v1, 0x0
-
-    move-object v2, p1
-
-    check-cast v2, Ljava/lang/String;
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    move v3, p2
-
-    move v5, v8
-
-    invoke-static/range {v0 .. v5}, Lj0/t/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    goto :goto_1
-
-    :cond_7
-    move-object v12, v6
-
-    :goto_1
-    check-cast v12, Ljava/lang/String;
-
-    if-eqz v12, :cond_8
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    new-instance p2, Lkotlin/Pair;
-
-    invoke-direct {p2, p1, v12}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    goto :goto_5
-
-    :cond_8
-    if-eq p2, v9, :cond_e
-
-    add-int/2addr p2, v10
-
-    goto :goto_0
-
-    :cond_9
-    iget p2, v0, Lkotlin/ranges/IntProgression;->d:I
-
-    iget v9, v0, Lkotlin/ranges/IntProgression;->e:I
-
-    iget v10, v0, Lkotlin/ranges/IntProgression;->f:I
-
-    if-ltz v10, :cond_a
-
-    if-gt p2, v9, :cond_e
-
-    goto :goto_2
-
-    :cond_a
-    if-lt p2, v9, :cond_e
-
-    :goto_2
-    invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v11
-
-    :cond_b
-    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_c
-
-    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v12
-
-    move-object v0, v12
-
-    check-cast v0, Ljava/lang/String;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    move-object v2, p1
-
-    move v3, p2
-
-    move v5, v8
-
-    invoke-static/range {v0 .. v5}, Lj0/t/p;->regionMatchesImpl(Ljava/lang/CharSequence;ILjava/lang/CharSequence;IIZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_b
-
-    goto :goto_3
-
-    :cond_c
-    move-object v12, v6
-
-    :goto_3
-    check-cast v12, Ljava/lang/String;
-
-    if-eqz v12, :cond_d
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    new-instance p2, Lkotlin/Pair;
-
-    invoke-direct {p2, p1, v12}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    goto :goto_5
-
-    :cond_d
-    if-eq p2, v9, :cond_e
-
-    add-int/2addr p2, v10
-
-    goto :goto_2
-
-    :cond_e
-    :goto_4
-    move-object p2, v6
-
-    :goto_5
-    if-eqz p2, :cond_f
-
-    iget-object p1, p2, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    iget-object p2, p2, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    check-cast p2, Ljava/lang/String;
-
-    invoke-virtual {p2}, Ljava/lang/String;->length()I
-
-    move-result p2
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p2
-
-    new-instance v6, Lkotlin/Pair;
-
-    invoke-direct {v6, p1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    :cond_f
-    return-object v6
-
-    :cond_10
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-.end method
diff --git a/com.discord/smali_classes2/j0/t/n.smali b/com.discord/smali_classes2/j0/t/n.smali
deleted file mode 100644
index a55fde5b00..0000000000
--- a/com.discord/smali_classes2/j0/t/n.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lj0/t/n;
-.super Lj0/n/c/i;
-.source "Strings.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lkotlin/ranges/IntRange;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $this_splitToSequence:Ljava/lang/CharSequence;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/CharSequence;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/t/n;->$this_splitToSequence:Ljava/lang/CharSequence;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lkotlin/ranges/IntRange;
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lj0/t/n;->$this_splitToSequence:Ljava/lang/CharSequence;
-
-    invoke-static {v0, p1}, Lj0/t/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/t/o.smali b/com.discord/smali_classes2/j0/t/o.smali
deleted file mode 100644
index a4109274f6..0000000000
--- a/com.discord/smali_classes2/j0/t/o.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lj0/t/o;
-.super Lj0/n/c/i;
-.source "Strings.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lkotlin/ranges/IntRange;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $this_splitToSequence:Ljava/lang/CharSequence;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/CharSequence;)V
-    .locals 0
-
-    iput-object p1, p0, Lj0/t/o;->$this_splitToSequence:Ljava/lang/CharSequence;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lkotlin/ranges/IntRange;
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lj0/t/o;->$this_splitToSequence:Ljava/lang/CharSequence;
-
-    invoke-static {v0, p1}, Lj0/t/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/t/p.smali b/com.discord/smali_classes2/j0/t/p.smali
deleted file mode 100644
index b8f027b7d6..0000000000
--- a/com.discord/smali_classes2/j0/t/p.smali
+++ /dev/null
@@ -1,1828 +0,0 @@
-.class public Lj0/t/p;
-.super Lj0/t/k;
-.source "Strings.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/k;-><init>()V
-
-    return-void
-.end method
-
-.method public static final b(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
-    .locals 6
-
-    const/4 v0, 0x0
-
-    if-nez p5, :cond_2
-
-    if-gez p2, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    new-instance p5, Lkotlin/ranges/IntRange;
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v0
-
-    if-le p3, v0, :cond_1
-
-    move p3, v0
-
-    :cond_1
-    invoke-direct {p5, p2, p3}, Lkotlin/ranges/IntRange;-><init>(II)V
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {p0}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result p5
-
-    if-le p2, p5, :cond_3
-
-    move p2, p5
-
-    :cond_3
-    if-gez p3, :cond_4
-
-    const/4 p3, 0x0
-
-    :cond_4
-    invoke-static {p2, p3}, Lj0/q/f;->downTo(II)Lkotlin/ranges/IntProgression;
-
-    move-result-object p5
-
-    :goto_0
-    instance-of p2, p0, Ljava/lang/String;
-
-    if-eqz p2, :cond_7
-
-    instance-of p2, p1, Ljava/lang/String;
-
-    if-eqz p2, :cond_7
-
-    iget p2, p5, Lkotlin/ranges/IntProgression;->d:I
-
-    iget p3, p5, Lkotlin/ranges/IntProgression;->e:I
-
-    iget p5, p5, Lkotlin/ranges/IntProgression;->f:I
-
-    if-ltz p5, :cond_5
-
-    if-gt p2, p3, :cond_a
-
-    goto :goto_1
-
-    :cond_5
-    if-lt p2, p3, :cond_a
-
-    :goto_1
-    move-object v0, p1
-
-    check-cast v0, Ljava/lang/String;
-
-    const/4 v1, 0x0
-
-    move-object v2, p0
-
-    check-cast v2, Ljava/lang/String;
-
-    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v4
-
-    move v3, p2
-
-    move v5, p4
-
-    invoke-static/range {v0 .. v5}, Lj0/t/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    return p2
-
-    :cond_6
-    if-eq p2, p3, :cond_a
-
-    add-int/2addr p2, p5
-
-    goto :goto_1
-
-    :cond_7
-    iget p2, p5, Lkotlin/ranges/IntProgression;->d:I
-
-    iget p3, p5, Lkotlin/ranges/IntProgression;->e:I
-
-    iget p5, p5, Lkotlin/ranges/IntProgression;->f:I
-
-    if-ltz p5, :cond_8
-
-    if-gt p2, p3, :cond_a
-
-    goto :goto_2
-
-    :cond_8
-    if-lt p2, p3, :cond_a
-
-    :goto_2
-    const/4 v1, 0x0
-
-    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v4
-
-    move-object v0, p1
-
-    move-object v2, p0
-
-    move v3, p2
-
-    move v5, p4
-
-    invoke-static/range {v0 .. v5}, Lj0/t/p;->regionMatchesImpl(Ljava/lang/CharSequence;ILjava/lang/CharSequence;IIZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_9
-
-    return p2
-
-    :cond_9
-    if-eq p2, p3, :cond_a
-
-    add-int/2addr p2, p5
-
-    goto :goto_2
-
-    :cond_a
-    const/4 p0, -0x1
-
-    return p0
-.end method
-
-.method public static synthetic c(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZI)I
-    .locals 6
-
-    and-int/lit8 p6, p6, 0x10
-
-    if-eqz p6, :cond_0
-
-    const/4 p5, 0x0
-
-    const/4 v5, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move v5, p5
-
-    :goto_0
-    move-object v0, p0
-
-    move-object v1, p1
-
-    move v2, p2
-
-    move v3, p3
-
-    move v4, p4
-
-    invoke-static/range {v0 .. v5}, Lj0/t/p;->b(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static final contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
-    .locals 10
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_3
-
-    if-eqz p1, :cond_2
-
-    instance-of v0, p1, Ljava/lang/String;
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/lang/String;
-
-    const/4 v0, 0x2
-
-    invoke-static {p0, p1, v2, p2, v0}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
-
-    move-result p0
-
-    if-ltz p0, :cond_1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v6
-
-    const/4 v8, 0x0
-
-    const/16 v9, 0x10
-
-    move-object v3, p0
-
-    move-object v4, p1
-
-    move v7, p2
-
-    invoke-static/range {v3 .. v9}, Lj0/t/p;->c(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZI)I
-
-    move-result p0
-
-    if-ltz p0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-
-    :cond_2
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static contains$default(Ljava/lang/CharSequence;CZI)Z
-    .locals 2
-
-    const/4 v0, 0x2
-
-    and-int/2addr p3, v0
-
-    const/4 v1, 0x0
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    if-eqz p0, :cond_2
-
-    invoke-static {p0, p1, v1, p2, v0}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result p0
-
-    if-ltz p0, :cond_1
-
-    const/4 v1, 0x1
-
-    :cond_1
-    return v1
-
-    :cond_2
-    const-string p0, "$this$contains"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static synthetic contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    invoke-static {p0, p1, p2}, Lj0/t/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static d(Ljava/lang/CharSequence;[CIZII)Lkotlin/sequences/Sequence;
-    .locals 2
-
-    and-int/lit8 v0, p5, 0x2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 v0, p5, 0x4
-
-    if-eqz v0, :cond_1
-
-    const/4 p3, 0x0
-
-    :cond_1
-    and-int/lit8 p5, p5, 0x8
-
-    if-eqz p5, :cond_2
-
-    const/4 p4, 0x0
-
-    :cond_2
-    if-ltz p4, :cond_3
-
-    const/4 v1, 0x1
-
-    :cond_3
-    if-eqz v1, :cond_4
-
-    new-instance p5, Lj0/t/b;
-
-    new-instance v0, Lj0/t/l;
-
-    invoke-direct {v0, p1, p3}, Lj0/t/l;-><init>([CZ)V
-
-    invoke-direct {p5, p0, p2, p4, v0}, Lj0/t/b;-><init>(Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function2;)V
-
-    return-object p5
-
-    :cond_4
-    new-instance p0, Ljava/lang/StringBuilder;
-
-    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p1, "Limit must be non-negative, but was "
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0, p4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2e
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static e(Ljava/lang/CharSequence;[Ljava/lang/String;IZII)Lkotlin/sequences/Sequence;
-    .locals 2
-
-    and-int/lit8 v0, p5, 0x2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 v0, p5, 0x4
-
-    if-eqz v0, :cond_1
-
-    const/4 p3, 0x0
-
-    :cond_1
-    and-int/lit8 p5, p5, 0x8
-
-    if-eqz p5, :cond_2
-
-    const/4 p4, 0x0
-
-    :cond_2
-    if-ltz p4, :cond_3
-
-    const/4 v1, 0x1
-
-    :cond_3
-    if-eqz v1, :cond_4
-
-    invoke-static {p1}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    new-instance p5, Lj0/t/b;
-
-    new-instance v0, Lj0/t/m;
-
-    invoke-direct {v0, p1, p3}, Lj0/t/m;-><init>(Ljava/util/List;Z)V
-
-    invoke-direct {p5, p0, p2, p4, v0}, Lj0/t/b;-><init>(Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function2;)V
-
-    return-object p5
-
-    :cond_4
-    new-instance p0, Ljava/lang/StringBuilder;
-
-    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p1, "Limit must be non-negative, but was "
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0, p4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2e
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final f(Ljava/lang/CharSequence;Ljava/lang/String;ZI)Ljava/util/List;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/CharSequence;",
-            "Ljava/lang/String;",
-            "ZI)",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-ltz p3, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_8
-
-    invoke-static {p0, p1, v1, p2}, Lj0/t/p;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
-
-    move-result v2
-
-    const/4 v3, -0x1
-
-    if-eq v2, v3, :cond_7
-
-    if-ne p3, v0, :cond_1
-
-    goto :goto_4
-
-    :cond_1
-    if-lez p3, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    new-instance v4, Ljava/util/ArrayList;
-
-    const/16 v5, 0xa
-
-    if-eqz v0, :cond_4
-
-    if-le p3, v5, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    move v5, p3
-
-    :cond_4
-    :goto_2
-    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
-
-    :cond_5
-    invoke-interface {p0, v1, v2}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v4, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    add-int/2addr v1, v2
-
-    if-eqz v0, :cond_6
-
-    invoke-virtual {v4}, Ljava/util/ArrayList;->size()I
-
-    move-result v2
-
-    add-int/lit8 v5, p3, -0x1
-
-    if-ne v2, v5, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    invoke-static {p0, p1, v1, p2}, Lj0/t/p;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
-
-    move-result v2
-
-    if-ne v2, v3, :cond_5
-
-    :goto_3
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result p1
-
-    invoke-interface {p0, v1, p1}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v4, p0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    return-object v4
-
-    :cond_7
-    :goto_4
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_8
-    new-instance p0, Ljava/lang/StringBuilder;
-
-    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p1, "Limit must be non-negative, but was "
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2e
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final getLastIndex(Ljava/lang/CharSequence;)I
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result p0
-
-    add-int/lit8 p0, p0, -0x1
-
-    return p0
-
-    :cond_0
-    const-string p0, "$this$lastIndex"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
-    .locals 7
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_3
-
-    if-eqz p1, :cond_2
-
-    if-nez p3, :cond_1
-
-    instance-of v0, p0, Ljava/lang/String;
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    check-cast p0, Ljava/lang/String;
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->indexOf(Ljava/lang/String;I)I
-
-    move-result p0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v3
-
-    const/4 v5, 0x0
-
-    const/16 v6, 0x10
-
-    move-object v0, p0
-
-    move-object v1, p1
-
-    move v2, p2
-
-    move v4, p3
-
-    invoke-static/range {v0 .. v6}, Lj0/t/p;->c(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZI)I
-
-    move-result p0
-
-    :goto_1
-    return p0
-
-    :cond_2
-    const-string p0, "string"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p0, "$this$indexOf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static indexOf$default(Ljava/lang/CharSequence;CIZI)I
-    .locals 2
-
-    and-int/lit8 v0, p4, 0x2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 p4, p4, 0x4
-
-    if-eqz p4, :cond_1
-
-    const/4 p3, 0x0
-
-    :cond_1
-    if-eqz p0, :cond_4
-
-    if-nez p3, :cond_3
-
-    instance-of p4, p0, Ljava/lang/String;
-
-    if-nez p4, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    check-cast p0, Ljava/lang/String;
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->indexOf(II)I
-
-    move-result p0
-
-    goto :goto_1
-
-    :cond_3
-    :goto_0
-    const/4 p4, 0x1
-
-    new-array p4, p4, [C
-
-    aput-char p1, p4, v1
-
-    invoke-static {p0, p4, p2, p3}, Lj0/t/p;->indexOfAny(Ljava/lang/CharSequence;[CIZ)I
-
-    move-result p0
-
-    :goto_1
-    return p0
-
-    :cond_4
-    const-string p0, "$this$indexOf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static synthetic indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
-    .locals 2
-
-    and-int/lit8 v0, p4, 0x2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 p4, p4, 0x4
-
-    if-eqz p4, :cond_1
-
-    const/4 p3, 0x0
-
-    :cond_1
-    invoke-static {p0, p1, p2, p3}, Lj0/t/p;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static final indexOfAny(Ljava/lang/CharSequence;[CIZ)I
-    .locals 7
-
-    if-eqz p1, :cond_6
-
-    const/4 v0, 0x1
-
-    if-nez p3, :cond_0
-
-    array-length v1, p1
-
-    if-ne v1, v0, :cond_0
-
-    instance-of v1, p0, Ljava/lang/String;
-
-    if-eqz v1, :cond_0
-
-    invoke-static {p1}, Lf/n/a/k/a;->single([C)C
-
-    move-result p1
-
-    check-cast p0, Ljava/lang/String;
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->indexOf(II)I
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    if-gez p2, :cond_1
-
-    const/4 p2, 0x0
-
-    :cond_1
-    invoke-static {p0}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result v2
-
-    if-gt p2, v2, :cond_5
-
-    :goto_0
-    invoke-interface {p0, p2}, Ljava/lang/CharSequence;->charAt(I)C
-
-    move-result v3
-
-    array-length v4, p1
-
-    const/4 v5, 0x0
-
-    :goto_1
-    if-ge v5, v4, :cond_3
-
-    aget-char v6, p1, v5
-
-    invoke-static {v6, v3, p3}, Lf/n/a/k/a;->equals(CCZ)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_2
-
-    const/4 v3, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v3, 0x0
-
-    :goto_2
-    if-eqz v3, :cond_4
-
-    return p2
-
-    :cond_4
-    if-eq p2, v2, :cond_5
-
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_0
-
-    :cond_5
-    const/4 p0, -0x1
-
-    return p0
-
-    :cond_6
-    const-string p0, "chars"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
-    .locals 4
-
-    and-int/lit8 v0, p4, 0x2
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result p2
-
-    :cond_0
-    and-int/lit8 p4, p4, 0x4
-
-    const/4 v0, 0x0
-
-    if-eqz p4, :cond_1
-
-    const/4 p3, 0x0
-
-    :cond_1
-    if-eqz p0, :cond_a
-
-    if-nez p3, :cond_3
-
-    instance-of p4, p0, Ljava/lang/String;
-
-    if-nez p4, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    check-cast p0, Ljava/lang/String;
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->lastIndexOf(II)I
-
-    move-result p0
-
-    goto :goto_4
-
-    :cond_3
-    :goto_0
-    const/4 p4, 0x1
-
-    new-array v1, p4, [C
-
-    aput-char p1, v1, v0
-
-    if-nez p3, :cond_4
-
-    instance-of p1, p0, Ljava/lang/String;
-
-    if-eqz p1, :cond_4
-
-    invoke-static {v1}, Lf/n/a/k/a;->single([C)C
-
-    move-result p1
-
-    check-cast p0, Ljava/lang/String;
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->lastIndexOf(II)I
-
-    move-result p0
-
-    goto :goto_4
-
-    :cond_4
-    invoke-static {p0}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result p1
-
-    if-le p2, p1, :cond_5
-
-    move p2, p1
-
-    :cond_5
-    :goto_1
-    if-ltz p2, :cond_9
-
-    invoke-interface {p0, p2}, Ljava/lang/CharSequence;->charAt(I)C
-
-    move-result p1
-
-    const/4 v2, 0x0
-
-    :goto_2
-    if-ge v2, p4, :cond_7
-
-    aget-char v3, v1, v2
-
-    invoke-static {v3, p1, p3}, Lf/n/a/k/a;->equals(CCZ)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_6
-
-    const/4 p1, 0x1
-
-    goto :goto_3
-
-    :cond_6
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_2
-
-    :cond_7
-    const/4 p1, 0x0
-
-    :goto_3
-    if-eqz p1, :cond_8
-
-    move p0, p2
-
-    goto :goto_4
-
-    :cond_8
-    add-int/lit8 p2, p2, -0x1
-
-    goto :goto_1
-
-    :cond_9
-    const/4 p0, -0x1
-
-    :goto_4
-    return p0
-
-    :cond_a
-    const-string p0, "$this$lastIndexOf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static lastIndexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
-    .locals 6
-
-    and-int/lit8 v0, p4, 0x2
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0}, Lj0/t/p;->getLastIndex(Ljava/lang/CharSequence;)I
-
-    move-result p2
-
-    :cond_0
-    move v2, p2
-
-    and-int/lit8 p2, p4, 0x4
-
-    if-eqz p2, :cond_1
-
-    const/4 p3, 0x0
-
-    const/4 v4, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    move v4, p3
-
-    :goto_0
-    const/4 p2, 0x0
-
-    if-eqz p0, :cond_5
-
-    if-eqz p1, :cond_4
-
-    if-nez v4, :cond_3
-
-    instance-of p2, p0, Ljava/lang/String;
-
-    if-nez p2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    check-cast p0, Ljava/lang/String;
-
-    invoke-virtual {p0, p1, v2}, Ljava/lang/String;->lastIndexOf(Ljava/lang/String;I)I
-
-    move-result p0
-
-    goto :goto_2
-
-    :cond_3
-    :goto_1
-    const/4 v3, 0x0
-
-    const/4 v5, 0x1
-
-    move-object v0, p0
-
-    move-object v1, p1
-
-    invoke-static/range {v0 .. v5}, Lj0/t/p;->b(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
-
-    move-result p0
-
-    :goto_2
-    return p0
-
-    :cond_4
-    const-string p0, "string"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_5
-    const-string p0, "$this$lastIndexOf"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public static final lines(Ljava/lang/CharSequence;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/CharSequence;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    const-string v0, "\r\n"
-
-    const-string v1, "\n"
-
-    const-string v2, "\r"
-
-    filled-new-array {v0, v1, v2}, [Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v1, 0x6
-
-    const/4 v2, 0x0
-
-    invoke-static {p0, v0, v2, v2, v1}, Lj0/t/p;->splitToSequence$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Lkotlin/sequences/Sequence;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final regionMatchesImpl(Ljava/lang/CharSequence;ILjava/lang/CharSequence;IIZ)Z
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_5
-
-    if-eqz p2, :cond_4
-
-    const/4 v0, 0x0
-
-    if-ltz p3, :cond_3
-
-    if-ltz p1, :cond_3
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    sub-int/2addr v1, p4
-
-    if-gt p1, v1, :cond_3
-
-    invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    sub-int/2addr v1, p4
-
-    if-le p3, v1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-ge v1, p4, :cond_2
-
-    add-int v2, p1, v1
-
-    invoke-interface {p0, v2}, Ljava/lang/CharSequence;->charAt(I)C
-
-    move-result v2
-
-    add-int v3, p3, v1
-
-    invoke-interface {p2, v3}, Ljava/lang/CharSequence;->charAt(I)C
-
-    move-result v3
-
-    invoke-static {v2, v3, p5}, Lf/n/a/k/a;->equals(CCZ)Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    return v0
-
-    :cond_1
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 p0, 0x1
-
-    return p0
-
-    :cond_3
-    :goto_1
-    return v0
-
-    :cond_4
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, "$this$regionMatchesImpl"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
-    .locals 8
-
-    and-int/lit8 v0, p4, 0x2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 v5, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move v5, p2
-
-    :goto_0
-    and-int/lit8 p2, p4, 0x4
-
-    if-eqz p2, :cond_1
-
-    const/4 v6, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    move v6, p3
-
-    :goto_1
-    if-eqz p0, :cond_4
-
-    array-length p2, p1
-
-    const/4 p3, 0x1
-
-    if-ne p2, p3, :cond_2
-
-    aget-char p1, p1, v1
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p0, p1, v5, v6}, Lj0/t/p;->f(Ljava/lang/CharSequence;Ljava/lang/String;ZI)Ljava/util/List;
-
-    move-result-object p0
-
-    goto :goto_3
-
-    :cond_2
-    const/4 v4, 0x0
-
-    const/4 v7, 0x2
-
-    move-object v2, p0
-
-    move-object v3, p1
-
-    invoke-static/range {v2 .. v7}, Lj0/t/p;->d(Ljava/lang/CharSequence;[CIZII)Lkotlin/sequences/Sequence;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->asIterable(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/util/ArrayList;
-
-    const/16 p3, 0xa
-
-    invoke-static {p1, p3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result p3
-
-    invoke-direct {p2, p3}, Ljava/util/ArrayList;-><init>(I)V
-
-    check-cast p1, Lj0/s/n;
-
-    invoke-virtual {p1}, Lj0/s/n;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :goto_2
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p3
-
-    if-eqz p3, :cond_3
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p3
-
-    check-cast p3, Lkotlin/ranges/IntRange;
-
-    invoke-static {p0, p3}, Lj0/t/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_3
-    move-object p0, p2
-
-    :goto_3
-    return-object p0
-
-    :cond_4
-    const-string p0, "$this$split"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
-    .locals 8
-
-    and-int/lit8 v0, p4, 0x2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 v5, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move v5, p2
-
-    :goto_0
-    and-int/lit8 p2, p4, 0x4
-
-    if-eqz p2, :cond_1
-
-    const/4 v6, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    move v6, p3
-
-    :goto_1
-    if-eqz p0, :cond_5
-
-    array-length p2, p1
-
-    const/4 p3, 0x1
-
-    if-ne p2, p3, :cond_3
-
-    aget-object p2, p1, v1
-
-    invoke-virtual {p2}, Ljava/lang/String;->length()I
-
-    move-result p4
-
-    if-nez p4, :cond_2
-
-    const/4 v1, 0x1
-
-    :cond_2
-    if-nez v1, :cond_3
-
-    invoke-static {p0, p2, v5, v6}, Lj0/t/p;->f(Ljava/lang/CharSequence;Ljava/lang/String;ZI)Ljava/util/List;
-
-    move-result-object p0
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v4, 0x0
-
-    const/4 v7, 0x2
-
-    move-object v2, p0
-
-    move-object v3, p1
-
-    invoke-static/range {v2 .. v7}, Lj0/t/p;->e(Ljava/lang/CharSequence;[Ljava/lang/String;IZII)Lkotlin/sequences/Sequence;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->asIterable(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/util/ArrayList;
-
-    const/16 p3, 0xa
-
-    invoke-static {p1, p3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result p3
-
-    invoke-direct {p2, p3}, Ljava/util/ArrayList;-><init>(I)V
-
-    check-cast p1, Lj0/s/n;
-
-    invoke-virtual {p1}, Lj0/s/n;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :goto_2
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p3
-
-    if-eqz p3, :cond_4
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p3
-
-    check-cast p3, Lkotlin/ranges/IntRange;
-
-    invoke-static {p0, p3}, Lj0/t/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_4
-    move-object p0, p2
-
-    :goto_3
-    return-object p0
-
-    :cond_5
-    const-string p0, "$this$split"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static splitToSequence$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Lkotlin/sequences/Sequence;
-    .locals 8
-
-    and-int/lit8 v0, p4, 0x2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 v5, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move v5, p2
-
-    :goto_0
-    and-int/lit8 p2, p4, 0x4
-
-    if-eqz p2, :cond_1
-
-    const/4 v6, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    move v6, p3
-
-    :goto_1
-    const/4 v4, 0x0
-
-    const/4 v7, 0x2
-
-    move-object v2, p0
-
-    move-object v3, p1
-
-    invoke-static/range {v2 .. v7}, Lj0/t/p;->e(Ljava/lang/CharSequence;[Ljava/lang/String;IZII)Lkotlin/sequences/Sequence;
-
-    move-result-object p1
-
-    new-instance p2, Lj0/t/n;
-
-    invoke-direct {p2, p0}, Lj0/t/n;-><init>(Ljava/lang/CharSequence;)V
-
-    invoke-static {p1, p2}, Lf/n/a/k/a;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getStart()Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getEndInclusive()Ljava/lang/Integer;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    add-int/lit8 p1, p1, 0x1
-
-    invoke-interface {p0, v0, p1}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "range"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "$this$substring"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p2, :cond_1
-
-    const/4 v0, 0x6
-
-    const/4 v1, 0x0
-
-    invoke-static {p0, p1, v1, v1, v0}, Lj0/t/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result p1
-
-    const/4 v0, -0x1
-
-    if-ne p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    add-int/lit8 p1, p1, 0x1
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result p2
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string p0, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {p2, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_0
-    return-object p2
-
-    :cond_1
-    const-string p0, "missingDelimiterValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$substringAfterLast"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static synthetic substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
-    .locals 0
-
-    and-int/lit8 p2, p3, 0x2
-
-    if-eqz p2, :cond_0
-
-    move-object p2, p0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p2, 0x0
-
-    :goto_0
-    invoke-static {p0, p1, p2}, Lj0/t/p;->substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final substringBefore(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p2, :cond_1
-
-    const/4 v0, 0x6
-
-    const/4 v1, 0x0
-
-    invoke-static {p0, p1, v1, v1, v0}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result p1
-
-    const/4 v0, -0x1
-
-    if-ne p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0, v1, p1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string p0, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {p2, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_0
-    return-object p2
-
-    :cond_1
-    const-string p0, "missingDelimiterValue"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$substringBefore"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-    .locals 5
-
-    if-eqz p0, :cond_5
-
-    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    sub-int/2addr v0, v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-gt v2, v0, :cond_4
-
-    if-nez v3, :cond_0
-
-    move v4, v2
-
-    goto :goto_1
-
-    :cond_0
-    move v4, v0
-
-    :goto_1
-    invoke-interface {p0, v4}, Ljava/lang/CharSequence;->charAt(I)C
-
-    move-result v4
-
-    invoke-static {v4}, Lf/n/a/k/a;->isWhitespace(C)Z
-
-    move-result v4
-
-    if-nez v3, :cond_2
-
-    if-nez v4, :cond_1
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    if-nez v4, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    add-int/lit8 v0, v0, -0x1
-
-    goto :goto_0
-
-    :cond_4
-    :goto_2
-    add-int/2addr v0, v1
-
-    invoke-interface {p0, v2, v0}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_5
-    const-string p0, "$this$trim"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/j0/t/q.smali b/com.discord/smali_classes2/j0/t/q.smali
deleted file mode 100644
index d5e812065d..0000000000
--- a/com.discord/smali_classes2/j0/t/q.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public Lj0/t/q;
-.super Lj0/t/p;
-.source "_StringsJvm.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/p;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/j0/t/r.smali b/com.discord/smali_classes2/j0/t/r.smali
deleted file mode 100644
index 8f35d0ab06..0000000000
--- a/com.discord/smali_classes2/j0/t/r.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public final Lj0/t/r;
-.super Lj0/n/c/i;
-.source "_Strings.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/CharSequence;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lj0/t/r;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lj0/t/r;
-
-    invoke-direct {v0}, Lj0/t/r;-><init>()V
-
-    sput-object v0, Lj0/t/r;->d:Lj0/t/r;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/CharSequence;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/j0/t/s.smali b/com.discord/smali_classes2/j0/t/s.smali
deleted file mode 100644
index 278684ed20..0000000000
--- a/com.discord/smali_classes2/j0/t/s.smali
+++ /dev/null
@@ -1,145 +0,0 @@
-.class public Lj0/t/s;
-.super Lj0/t/q;
-.source "_Strings.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lj0/t/q;-><init>()V
-
-    return-void
-.end method
-
-.method public static final drop(Ljava/lang/String;I)Ljava/lang/String;
-    .locals 1
-
-    if-eqz p0, :cond_3
-
-    if-ltz p1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    if-le p1, v0, :cond_1
-
-    move p1, v0
-
-    :cond_1
-    invoke-virtual {p0, p1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_2
-    const-string p0, "Requested character count "
-
-    const-string v0, " is less than zero."
-
-    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p0, "$this$drop"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final take(Ljava/lang/String;I)Ljava/lang/String;
-    .locals 2
-
-    if-eqz p0, :cond_3
-
-    const/4 v0, 0x0
-
-    if-ltz p1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_2
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    if-le p1, v1, :cond_1
-
-    move p1, v1
-
-    :cond_1
-    invoke-virtual {p0, v0, p1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_2
-    const-string p0, "Requested character count "
-
-    const-string v0, " is less than zero."
-
-    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p0, "$this$take"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/k0/a.smali b/com.discord/smali_classes2/k0/a.smali
new file mode 100644
index 0000000000..a17b1cf3e6
--- /dev/null
+++ b/com.discord/smali_classes2/k0/a.smali
@@ -0,0 +1,75 @@
+.class public final Lk0/a;
+.super Ljava/lang/Object;
+.source "Lazy.kt"
+
+# interfaces
+.implements Lkotlin/Lazy;
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/Lazy<",
+        "TT;>;",
+        "Ljava/io/Serializable;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final value:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/a;->value:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getValue()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/a;->value:Ljava/lang/Object;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lk0/a;->value:Ljava/lang/Object;
+
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/a/a.smali b/com.discord/smali_classes2/k0/a/a.smali
deleted file mode 100644
index b8851dfdc5..0000000000
--- a/com.discord/smali_classes2/k0/a/a.smali
+++ /dev/null
@@ -1,228 +0,0 @@
-.class public abstract Lk0/a/a;
-.super Lk0/a/c1;
-.source "AbstractCoroutine.kt"
-
-# interfaces
-.implements Lkotlinx/coroutines/Job;
-.implements Lkotlin/coroutines/Continuation;
-.implements Lkotlinx/coroutines/CoroutineScope;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/c1;",
-        "Lkotlinx/coroutines/Job;",
-        "Lkotlin/coroutines/Continuation<",
-        "TT;>;",
-        "Lkotlinx/coroutines/CoroutineScope;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final e:Lkotlin/coroutines/CoroutineContext;
-
-.field public final f:Lkotlin/coroutines/CoroutineContext;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Z)V
-    .locals 0
-
-    invoke-direct {p0, p2}, Lk0/a/c1;-><init>(Z)V
-
-    iput-object p1, p0, Lk0/a/a;->f:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-interface {p1, p0}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lk0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public E()Ljava/lang/String;
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-static {v0}, Lk0/a/u;->a(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const/16 v2, 0x22
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "\":"
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final H(Ljava/lang/Object;)V
-    .locals 1
-
-    instance-of v0, p1, Lk0/a/p;
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lk0/a/p;
-
-    iget-object v0, p1, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    iget p1, p1, Lk0/a/p;->_handled:I
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public final I()V
-    .locals 0
-
-    invoke-virtual {p0}, Lk0/a/a;->R()V
-
-    return-void
-.end method
-
-.method public P()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final Q()V
-    .locals 2
-
-    iget-object v0, p0, Lk0/a/a;->f:Lkotlin/coroutines/CoroutineContext;
-
-    sget-object v1, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {v0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v0
-
-    check-cast v0, Lkotlinx/coroutines/Job;
-
-    invoke-virtual {p0, v0}, Lk0/a/c1;->A(Lkotlinx/coroutines/Job;)V
-
-    return-void
-.end method
-
-.method public R()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public a()Z
-    .locals 1
-
-    invoke-super {p0}, Lk0/a/c1;->a()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final getContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
-
-    return-object v0
-.end method
-
-.method public getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
-
-    return-object v0
-.end method
-
-.method public final resumeWith(Ljava/lang/Object;)V
-    .locals 1
-
-    invoke-static {p1}, Lf/n/a/k/a;->k0(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lk0/a/a;->P()I
-
-    move-result v0
-
-    invoke-virtual {p0, p1, v0}, Lk0/a/c1;->C(Ljava/lang/Object;I)Z
-
-    return-void
-.end method
-
-.method public final z(Ljava/lang/Throwable;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lk0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-static {v0, p1}, Lf/n/a/k/a;->F(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/a0.smali b/com.discord/smali_classes2/k0/a/a0.smali
deleted file mode 100644
index eafc4896e7..0000000000
--- a/com.discord/smali_classes2/k0/a/a0.smali
+++ /dev/null
@@ -1,33 +0,0 @@
-.class public final Lk0/a/a0;
-.super Ljava/lang/Error;
-.source "Exceptions.common.kt"
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Error;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/a1.smali b/com.discord/smali_classes2/k0/a/a1.smali
deleted file mode 100644
index bd92ced940..0000000000
--- a/com.discord/smali_classes2/k0/a/a1.smali
+++ /dev/null
@@ -1,100 +0,0 @@
-.class public Lk0/a/a1;
-.super Lk0/a/c1;
-.source "JobSupport.kt"
-
-# interfaces
-.implements Lk0/a/o;
-
-
-# instance fields
-.field public final e:Z
-
-
-# direct methods
-.method public constructor <init>(Lkotlinx/coroutines/Job;)V
-    .locals 3
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lk0/a/c1;-><init>(Z)V
-
-    invoke-virtual {p0, p1}, Lk0/a/c1;->A(Lkotlinx/coroutines/Job;)V
-
-    iget-object p1, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    instance-of v1, p1, Lk0/a/k;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    move-object p1, v2
-
-    :cond_0
-    check-cast p1, Lk0/a/k;
-
-    if-eqz p1, :cond_3
-
-    iget-object p1, p1, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    check-cast p1, Lk0/a/c1;
-
-    if-eqz p1, :cond_3
-
-    :goto_0
-    invoke-virtual {p1}, Lk0/a/c1;->u()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    iget-object p1, p1, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    instance-of v1, p1, Lk0/a/k;
-
-    if-nez v1, :cond_2
-
-    move-object p1, v2
-
-    :cond_2
-    check-cast p1, Lk0/a/k;
-
-    if-eqz p1, :cond_3
-
-    iget-object p1, p1, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    check-cast p1, Lk0/a/c1;
-
-    if-eqz p1, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v0, 0x0
-
-    :goto_1
-    iput-boolean v0, p0, Lk0/a/a1;->e:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public u()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lk0/a/a1;->e:Z
-
-    return v0
-.end method
-
-.method public v()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/b.smali b/com.discord/smali_classes2/k0/a/b.smali
deleted file mode 100644
index 8eb825b6ec..0000000000
--- a/com.discord/smali_classes2/k0/a/b.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lk0/a/b;
-.super Ljava/lang/Object;
-.source "CancellableContinuationImpl.kt"
-
-# interfaces
-.implements Lk0/a/i1;
-
-
-# static fields
-.field public static final d:Lk0/a/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/b;
-
-    invoke-direct {v0}, Lk0/a/b;-><init>()V
-
-    sput-object v0, Lk0/a/b;->d:Lk0/a/b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "Active"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/b0.smali b/com.discord/smali_classes2/k0/a/b0.smali
deleted file mode 100644
index 75dc06ff18..0000000000
--- a/com.discord/smali_classes2/k0/a/b0.smali
+++ /dev/null
@@ -1,166 +0,0 @@
-.class public final Lk0/a/b0;
-.super Ljava/lang/Object;
-.source "Debug.kt"
-
-
-# static fields
-.field public static final a:Z
-
-.field public static final b:Z
-
-.field public static final c:Z
-
-.field public static final d:Ljava/util/concurrent/atomic/AtomicLong;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    const-class v0, Lk0/a/x;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->desiredAssertionStatus()Z
-
-    move-result v0
-
-    sput-boolean v0, Lk0/a/b0;->a:Z
-
-    const-string v0, "kotlinx.coroutines.debug"
-
-    invoke-static {v0}, Lk0/a/r1/w;->a(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v3
-
-    if-eqz v3, :cond_3
-
-    const/16 v4, 0xddf
-
-    if-eq v3, v4, :cond_2
-
-    const v4, 0x1ad6f
-
-    if-eq v3, v4, :cond_1
-
-    const v4, 0x2dddaf
-
-    if-ne v3, v4, :cond_5
-
-    const-string v3, "auto"
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_5
-
-    :goto_0
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    goto :goto_2
-
-    :cond_1
-    const-string v3, "off"
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_5
-
-    const/4 v0, 0x0
-
-    goto :goto_2
-
-    :cond_2
-    const-string v3, "on"
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_5
-
-    goto :goto_1
-
-    :cond_3
-    const-string v3, ""
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_5
-
-    :goto_1
-    const/4 v0, 0x1
-
-    :goto_2
-    sput-boolean v0, Lk0/a/b0;->b:Z
-
-    if-eqz v0, :cond_4
-
-    const-string v0, "kotlinx.coroutines.stacktrace.recovery"
-
-    invoke-static {v0, v2}, Lf/n/a/k/a;->c0(Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
-    const/4 v1, 0x1
-
-    :cond_4
-    sput-boolean v1, Lk0/a/b0;->c:Z
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide/16 v1, 0x0
-
-    invoke-direct {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
-
-    sput-object v0, Lk0/a/b0;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    return-void
-
-    :cond_5
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "System property \'kotlinx.coroutines.debug\' has unrecognized value \'"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x27
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/b1.smali b/com.discord/smali_classes2/k0/a/b1.smali
deleted file mode 100644
index c5f91838e2..0000000000
--- a/com.discord/smali_classes2/k0/a/b1.smali
+++ /dev/null
@@ -1,327 +0,0 @@
-.class public abstract Lk0/a/b1;
-.super Lk0/a/s;
-.source "JobSupport.kt"
-
-# interfaces
-.implements Lk0/a/k0;
-.implements Lk0/a/u0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<J::",
-        "Lkotlinx/coroutines/Job;",
-        ">",
-        "Lk0/a/s;",
-        "Lk0/a/k0;",
-        "Lk0/a/u0;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final g:Lkotlinx/coroutines/Job;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TJ;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlinx/coroutines/Job;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TJ;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Lk0/a/s;-><init>()V
-
-    iput-object p1, p0, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    return-void
-
-    :cond_0
-    const-string p1, "job"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public dispose()V
-    .locals 9
-
-    iget-object v0, p0, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    if-eqz v0, :cond_11
-
-    check-cast v0, Lk0/a/c1;
-
-    const/4 v1, 0x0
-
-    :cond_0
-    invoke-virtual {v0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v2
-
-    instance-of v3, v2, Lk0/a/b1;
-
-    if-eqz v3, :cond_2
-
-    if-eq v2, p0, :cond_1
-
-    goto/16 :goto_4
-
-    :cond_1
-    sget-object v3, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    sget-object v4, Lk0/a/d1;->c:Lk0/a/m0;
-
-    invoke-virtual {v3, v0, v2, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    goto/16 :goto_4
-
-    :cond_2
-    instance-of v0, v2, Lk0/a/u0;
-
-    if-eqz v0, :cond_10
-
-    check-cast v2, Lk0/a/u0;
-
-    invoke-interface {v2}, Lk0/a/u0;->getList()Lk0/a/g1;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_10
-
-    :cond_3
-    invoke-virtual {p0}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v2, v0, Lk0/a/r1/s;
-
-    if-eqz v2, :cond_4
-
-    goto/16 :goto_4
-
-    :cond_4
-    if-ne v0, p0, :cond_5
-
-    goto/16 :goto_4
-
-    :cond_5
-    const-string v2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    if-eqz v0, :cond_f
-
-    move-object v3, v0
-
-    check-cast v3, Lk0/a/r1/m;
-
-    iget-object v4, v3, Lk0/a/r1/m;->_removedRef:Ljava/lang/Object;
-
-    check-cast v4, Lk0/a/r1/s;
-
-    if-eqz v4, :cond_6
-
-    goto :goto_0
-
-    :cond_6
-    new-instance v4, Lk0/a/r1/s;
-
-    invoke-direct {v4, v3}, Lk0/a/r1/s;-><init>(Lk0/a/r1/m;)V
-
-    sget-object v5, Lk0/a/r1/m;->f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v5, v3, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    :goto_0
-    sget-object v5, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v5, p0, v0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {p0}, Lk0/a/r1/m;->g()Lk0/a/r1/m;
-
-    move-result-object v0
-
-    iget-object v4, p0, Lk0/a/r1/m;->_next:Ljava/lang/Object;
-
-    if-eqz v4, :cond_e
-
-    check-cast v4, Lk0/a/r1/s;
-
-    iget-object v4, v4, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    :goto_1
-    move-object v5, v4
-
-    move-object v4, v1
-
-    :cond_7
-    :goto_2
-    invoke-virtual {v5}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v6
-
-    instance-of v7, v6, Lk0/a/r1/s;
-
-    if-eqz v7, :cond_8
-
-    invoke-virtual {v5}, Lk0/a/r1/m;->g()Lk0/a/r1/m;
-
-    check-cast v6, Lk0/a/r1/s;
-
-    iget-object v5, v6, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    goto :goto_2
-
-    :cond_8
-    invoke-virtual {v0}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v6
-
-    instance-of v7, v6, Lk0/a/r1/s;
-
-    if-eqz v7, :cond_a
-
-    if-eqz v4, :cond_9
-
-    invoke-virtual {v0}, Lk0/a/r1/m;->g()Lk0/a/r1/m;
-
-    sget-object v7, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    check-cast v6, Lk0/a/r1/s;
-
-    iget-object v6, v6, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    invoke-virtual {v7, v4, v0, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-object v0, v4
-
-    move-object v4, v5
-
-    goto :goto_1
-
-    :cond_9
-    iget-object v0, v0, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    invoke-static {v0}, Lk0/a/r1/l;->a(Ljava/lang/Object;)Lk0/a/r1/m;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_a
-    if-eq v6, p0, :cond_d
-
-    if-eqz v6, :cond_c
-
-    move-object v4, v6
-
-    check-cast v4, Lk0/a/r1/m;
-
-    if-ne v4, v5, :cond_b
-
-    goto :goto_3
-
-    :cond_b
-    move-object v8, v4
-
-    move-object v4, v0
-
-    move-object v0, v8
-
-    goto :goto_2
-
-    :cond_c
-    new-instance v0, Lkotlin/TypeCastException;
-
-    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    sget-object v6, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v6, v0, p0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_7
-
-    :goto_3
-    iget-object v0, p0, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    invoke-static {v0}, Lk0/a/r1/l;->a(Ljava/lang/Object;)Lk0/a/r1/m;
-
-    move-result-object v0
-
-    invoke-virtual {v3, v0, v1}, Lk0/a/r1/m;->b(Lk0/a/r1/m;Lk0/a/r1/r;)Lk0/a/r1/m;
-
-    goto :goto_4
-
-    :cond_e
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.internal.Removed"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_f
-    new-instance v0, Lkotlin/TypeCastException;
-
-    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_10
-    :goto_4
-    return-void
-
-    :cond_11
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.JobSupport"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public getList()Lk0/a/g1;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/c.smali b/com.discord/smali_classes2/k0/a/c.smali
deleted file mode 100644
index a3804107c2..0000000000
--- a/com.discord/smali_classes2/k0/a/c.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lk0/a/c;
-.super Lk0/a/o0;
-.source "EventLoop.kt"
-
-
-# instance fields
-.field public final i:Ljava/lang/Thread;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Thread;)V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/o0;-><init>()V
-
-    iput-object p1, p0, Lk0/a/c;->i:Ljava/lang/Thread;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public D()Ljava/lang/Thread;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/c;->i:Ljava/lang/Thread;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/c0.smali b/com.discord/smali_classes2/k0/a/c0.smali
deleted file mode 100644
index e8b8bc2a02..0000000000
--- a/com.discord/smali_classes2/k0/a/c0.smali
+++ /dev/null
@@ -1,406 +0,0 @@
-.class public final Lk0/a/c0;
-.super Lk0/a/o0;
-.source "DefaultExecutor.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# static fields
-.field public static volatile _thread:Ljava/lang/Thread;
-
-.field public static volatile debugStatus:I
-
-.field public static final i:J
-
-.field public static final j:Lk0/a/c0;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    new-instance v0, Lk0/a/c0;
-
-    invoke-direct {v0}, Lk0/a/c0;-><init>()V
-
-    sput-object v0, Lk0/a/c0;->j:Lk0/a/c0;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Lk0/a/n0;->z(Z)V
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v1, 0x3e8
-
-    :try_start_0
-    const-string v3, "kotlinx.coroutines.DefaultExecutor.keepAlive"
-
-    invoke-static {v3, v1, v2}, Ljava/lang/Long;->getLong(Ljava/lang/String;J)Ljava/lang/Long;
-
-    move-result-object v1
-    :try_end_0
-    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    :goto_0
-    const-string v2, "try {\n            java.l\u2026AULT_KEEP_ALIVE\n        }"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lk0/a/c0;->i:J
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/o0;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public D()Ljava/lang/Thread;
-    .locals 2
-
-    sget-object v0, Lk0/a/c0;->_thread:Ljava/lang/Thread;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    sget-object v0, Lk0/a/c0;->_thread:Ljava/lang/Thread;
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Ljava/lang/Thread;
-
-    const-string v1, "kotlinx.coroutines.DefaultExecutor"
-
-    invoke-direct {v0, p0, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/c0;->_thread:Ljava/lang/Thread;
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Ljava/lang/Thread;->setDaemon(Z)V
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->start()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :goto_0
-    monitor-exit p0
-
-    :goto_1
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final declared-synchronized N()V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-virtual {p0}, Lk0/a/c0;->O()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x3
-
-    :try_start_1
-    sput v0, Lk0/a/c0;->debugStatus:I
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lk0/a/o0;->_queue:Ljava/lang/Object;
-
-    iput-object v0, p0, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final O()Z
-    .locals 2
-
-    sget v0, Lk0/a/c0;->debugStatus:I
-
-    const/4 v1, 0x2
-
-    if-eq v0, v1, :cond_1
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 v0, 0x1
-
-    :goto_1
-    return v0
-.end method
-
-.method public run()V
-    .locals 12
-
-    sget-object v0, Lk0/a/n1;->b:Lk0/a/n1;
-
-    sget-object v0, Lk0/a/n1;->a:Ljava/lang/ThreadLocal;
-
-    invoke-virtual {v0, p0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    monitor-enter p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-virtual {p0}, Lk0/a/c0;->O()Z
-
-    move-result v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x0
-
-    :try_start_2
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x1
-
-    :try_start_3
-    sput v1, Lk0/a/c0;->debugStatus:I
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :try_start_4
-    monitor-exit p0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :goto_0
-    if-nez v1, :cond_2
-
-    sput-object v0, Lk0/a/c0;->_thread:Ljava/lang/Thread;
-
-    invoke-virtual {p0}, Lk0/a/c0;->N()V
-
-    invoke-virtual {p0}, Lk0/a/o0;->K()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p0}, Lk0/a/c0;->D()Ljava/lang/Thread;
-
-    :cond_1
-    return-void
-
-    :cond_2
-    const-wide v1, 0x7fffffffffffffffL
-
-    move-wide v3, v1
-
-    :cond_3
-    :goto_1
-    :try_start_5
-    invoke-static {}, Ljava/lang/Thread;->interrupted()Z
-
-    invoke-virtual {p0}, Lk0/a/o0;->L()J
-
-    move-result-wide v5
-
-    const-wide/16 v7, 0x0
-
-    cmp-long v9, v5, v1
-
-    if-nez v9, :cond_8
-
-    cmp-long v9, v3, v1
-
-    if-nez v9, :cond_7
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v10
-
-    if-nez v9, :cond_4
-
-    sget-wide v3, Lk0/a/c0;->i:J
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    add-long/2addr v3, v10
-
-    :cond_4
-    sub-long v9, v3, v10
-
-    cmp-long v11, v9, v7
-
-    if-gtz v11, :cond_6
-
-    sput-object v0, Lk0/a/c0;->_thread:Ljava/lang/Thread;
-
-    invoke-virtual {p0}, Lk0/a/c0;->N()V
-
-    invoke-virtual {p0}, Lk0/a/o0;->K()Z
-
-    move-result v0
-
-    if-nez v0, :cond_5
-
-    invoke-virtual {p0}, Lk0/a/c0;->D()Ljava/lang/Thread;
-
-    :cond_5
-    return-void
-
-    :cond_6
-    :try_start_6
-    invoke-static {v5, v6, v9, v10}, Lj0/q/f;->coerceAtMost(JJ)J
-
-    move-result-wide v5
-
-    goto :goto_2
-
-    :cond_7
-    sget-wide v9, Lk0/a/c0;->i:J
-
-    invoke-static {v5, v6, v9, v10}, Lj0/q/f;->coerceAtMost(JJ)J
-
-    move-result-wide v5
-
-    :cond_8
-    :goto_2
-    cmp-long v9, v5, v7
-
-    if-lez v9, :cond_3
-
-    invoke-virtual {p0}, Lk0/a/c0;->O()Z
-
-    move-result v7
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_1
-
-    if-eqz v7, :cond_a
-
-    sput-object v0, Lk0/a/c0;->_thread:Ljava/lang/Thread;
-
-    invoke-virtual {p0}, Lk0/a/c0;->N()V
-
-    invoke-virtual {p0}, Lk0/a/o0;->K()Z
-
-    move-result v0
-
-    if-nez v0, :cond_9
-
-    invoke-virtual {p0}, Lk0/a/c0;->D()Ljava/lang/Thread;
-
-    :cond_9
-    return-void
-
-    :cond_a
-    :try_start_7
-    invoke-static {p0, v5, v6}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(Ljava/lang/Object;J)V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit p0
-
-    throw v1
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_1
-
-    :catchall_1
-    move-exception v1
-
-    sput-object v0, Lk0/a/c0;->_thread:Ljava/lang/Thread;
-
-    invoke-virtual {p0}, Lk0/a/c0;->N()V
-
-    invoke-virtual {p0}, Lk0/a/o0;->K()Z
-
-    move-result v0
-
-    if-nez v0, :cond_b
-
-    invoke-virtual {p0}, Lk0/a/c0;->D()Ljava/lang/Thread;
-
-    :cond_b
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/c1$a.smali b/com.discord/smali_classes2/k0/a/c1$a.smali
deleted file mode 100644
index dc52e6316c..0000000000
--- a/com.discord/smali_classes2/k0/a/c1$a.smali
+++ /dev/null
@@ -1,181 +0,0 @@
-.class public final Lk0/a/c1$a;
-.super Lk0/a/b1;
-.source "JobSupport.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/c1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/b1<",
-        "Lkotlinx/coroutines/Job;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final h:Lk0/a/c1;
-
-.field public final i:Lk0/a/c1$b;
-
-.field public final j:Lk0/a/k;
-
-.field public final k:Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/c1;Lk0/a/c1$b;Lk0/a/k;Ljava/lang/Object;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    iget-object v0, p3, Lk0/a/k;->h:Lk0/a/l;
-
-    invoke-direct {p0, v0}, Lk0/a/b1;-><init>(Lkotlinx/coroutines/Job;)V
-
-    iput-object p1, p0, Lk0/a/c1$a;->h:Lk0/a/c1;
-
-    iput-object p2, p0, Lk0/a/c1$a;->i:Lk0/a/c1$b;
-
-    iput-object p3, p0, Lk0/a/c1$a;->j:Lk0/a/k;
-
-    iput-object p4, p0, Lk0/a/c1$a;->k:Ljava/lang/Object;
-
-    return-void
-
-    :cond_0
-    const-string p1, "child"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public i(Ljava/lang/Throwable;)V
-    .locals 5
-
-    iget-object p1, p0, Lk0/a/c1$a;->h:Lk0/a/c1;
-
-    iget-object v0, p0, Lk0/a/c1$a;->i:Lk0/a/c1$b;
-
-    iget-object v1, p0, Lk0/a/c1$a;->j:Lk0/a/k;
-
-    iget-object v2, p0, Lk0/a/c1$a;->k:Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    if-ne v3, v0, :cond_0
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_2
-
-    invoke-virtual {p1, v1}, Lk0/a/c1;->F(Lk0/a/r1/m;)Lk0/a/k;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p1, v0, v1, v2}, Lk0/a/c1;->O(Lk0/a/c1$b;Lk0/a/k;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p1, v0, v2, v4}, Lk0/a/c1;->M(Lk0/a/c1$b;Ljava/lang/Object;I)Z
-
-    :goto_1
-    return-void
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Failed requirement."
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lk0/a/c1$a;->i(Ljava/lang/Throwable;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "ChildCompletion["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/c1$a;->j:Lk0/a/k;
-
-    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;
-
-    iget-object v1, p0, Lk0/a/c1$a;->k:Ljava/lang/Object;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/c1$c.smali b/com.discord/smali_classes2/k0/a/c1$c.smali
deleted file mode 100644
index 8b004d80e7..0000000000
--- a/com.discord/smali_classes2/k0/a/c1$c.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final Lk0/a/c1$c;
-.super Lk0/a/r1/m$a;
-.source "LockFreeLinkedList.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lk0/a/c1;->h(Ljava/lang/Object;Lk0/a/g1;Lk0/a/b1;)Z
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lk0/a/c1;
-
-.field public final synthetic e:Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/r1/m;Lk0/a/r1/m;Lk0/a/c1;Ljava/lang/Object;)V
-    .locals 0
-
-    iput-object p3, p0, Lk0/a/c1$c;->d:Lk0/a/c1;
-
-    iput-object p4, p0, Lk0/a/c1$c;->e:Ljava/lang/Object;
-
-    invoke-direct {p0, p2}, Lk0/a/r1/m$a;-><init>(Lk0/a/r1/m;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/c1.smali b/com.discord/smali_classes2/k0/a/c1.smali
deleted file mode 100644
index 0440b13abc..0000000000
--- a/com.discord/smali_classes2/k0/a/c1.smali
+++ /dev/null
@@ -1,3315 +0,0 @@
-.class public Lk0/a/c1;
-.super Ljava/lang/Object;
-.source "JobSupport.kt"
-
-# interfaces
-.implements Lkotlinx/coroutines/Job;
-.implements Lk0/a/l;
-.implements Lk0/a/j1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lk0/a/c1$b;,
-        Lk0/a/c1$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-
-# instance fields
-.field public volatile _state:Ljava/lang/Object;
-
-.field public volatile parentHandle:Lk0/a/j;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Lk0/a/c1;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "_state"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    if-eqz p1, :cond_0
-
-    sget-object p1, Lk0/a/d1;->c:Lk0/a/m0;
-
-    goto :goto_0
-
-    :cond_0
-    sget-object p1, Lk0/a/d1;->b:Lk0/a/m0;
-
-    :goto_0
-    iput-object p1, p0, Lk0/a/c1;->_state:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final A(Lkotlinx/coroutines/Job;)V
-    .locals 2
-
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_2
-    :goto_1
-    if-nez p1, :cond_3
-
-    sget-object p1, Lk0/a/h1;->d:Lk0/a/h1;
-
-    iput-object p1, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    return-void
-
-    :cond_3
-    invoke-interface {p1}, Lkotlinx/coroutines/Job;->start()Z
-
-    invoke-interface {p1, p0}, Lkotlinx/coroutines/Job;->t(Lk0/a/l;)Lk0/a/j;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lk0/a/u0;
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_4
-
-    invoke-interface {p1}, Lk0/a/k0;->dispose()V
-
-    sget-object p1, Lk0/a/h1;->d:Lk0/a/h1;
-
-    iput-object p1, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    :cond_4
-    return-void
-.end method
-
-.method public B()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final C(Ljava/lang/Object;I)Z
-    .locals 3
-
-    :goto_0
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0, p1, p2}, Lk0/a/c1;->N(Ljava/lang/Object;Ljava/lang/Object;I)I
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    const/4 v1, 0x1
-
-    if-eq v0, v1, :cond_2
-
-    const/4 v1, 0x2
-
-    if-eq v0, v1, :cond_1
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "unexpected result"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_2
-    return v1
-
-    :cond_3
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Job "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, " is already complete or completing, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "but is being completed with "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    instance-of v1, p1, Lk0/a/p;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_4
-
-    move-object p1, v2
-
-    :cond_4
-    check-cast p1, Lk0/a/p;
-
-    if-eqz p1, :cond_5
-
-    iget-object v2, p1, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    :cond_5
-    invoke-direct {p2, v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p2
-.end method
-
-.method public final D(Lkotlin/jvm/functions/Function1;Z)Lk0/a/b1;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;Z)",
-            "Lk0/a/b1<",
-            "*>;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    const-string v1, "Failed requirement."
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-eqz p2, :cond_4
-
-    instance-of p2, p1, Lk0/a/z0;
-
-    if-nez p2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v3, p1
-
-    :goto_0
-    check-cast v3, Lk0/a/z0;
-
-    if-eqz v3, :cond_3
-
-    iget-object p1, v3, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    if-ne p1, p0, :cond_1
-
-    const/4 v0, 0x1
-
-    :cond_1
-    if-eqz v0, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    new-instance v3, Lk0/a/x0;
-
-    invoke-direct {v3, p0, p1}, Lk0/a/x0;-><init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
-
-    goto :goto_2
-
-    :cond_4
-    instance-of p2, p1, Lk0/a/b1;
-
-    if-nez p2, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    move-object v3, p1
-
-    :goto_1
-    check-cast v3, Lk0/a/b1;
-
-    if-eqz v3, :cond_8
-
-    iget-object p1, v3, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    if-ne p1, p0, :cond_6
-
-    instance-of p1, v3, Lk0/a/z0;
-
-    if-nez p1, :cond_6
-
-    const/4 v0, 0x1
-
-    :cond_6
-    if-eqz v0, :cond_7
-
-    goto :goto_2
-
-    :cond_7
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    new-instance v3, Lk0/a/y0;
-
-    invoke-direct {v3, p0, p1}, Lk0/a/y0;-><init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
-
-    :goto_2
-    return-object v3
-.end method
-
-.method public E()Ljava/lang/String;
-    .locals 1
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final F(Lk0/a/r1/m;)Lk0/a/k;
-    .locals 1
-
-    :goto_0
-    invoke-virtual {p1}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lk0/a/r1/s;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p1}, Lk0/a/r1/m;->f()Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lk0/a/r1/l;->a(Ljava/lang/Object;)Lk0/a/r1/m;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    :goto_1
-    invoke-virtual {p1}, Lk0/a/r1/m;->e()Lk0/a/r1/m;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v0, v0, Lk0/a/r1/s;
-
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    instance-of v0, p1, Lk0/a/k;
-
-    if-eqz v0, :cond_2
-
-    check-cast p1, Lk0/a/k;
-
-    return-object p1
-
-    :cond_2
-    instance-of v0, p1, Lk0/a/g1;
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
-
-.method public final G(Lk0/a/g1;Ljava/lang/Throwable;)V
-    .locals 6
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_4
-
-    check-cast v1, Lk0/a/r1/m;
-
-    :goto_0
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_2
-
-    instance-of v2, v1, Lk0/a/z0;
-
-    if-eqz v2, :cond_1
-
-    move-object v2, v1
-
-    check-cast v2, Lk0/a/b1;
-
-    :try_start_0
-    invoke-virtual {v2, p2}, Lk0/a/s;->i(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v3
-
-    if-eqz v0, :cond_0
-
-    invoke-static {v0, v3}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :cond_0
-    new-instance v0, Lkotlinx/coroutines/CompletionHandlerException;
-
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v5, "Exception in completion handler "
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v2, " for "
-
-    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v0, v2, v3}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    :cond_1
-    :goto_1
-    invoke-virtual {v1}, Lk0/a/r1/m;->e()Lk0/a/r1/m;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_2
-    if-eqz v0, :cond_3
-
-    invoke-virtual {p0, v0}, Lk0/a/c1;->z(Ljava/lang/Throwable;)V
-
-    :cond_3
-    invoke-virtual {p0, p2}, Lk0/a/c1;->m(Ljava/lang/Throwable;)Z
-
-    return-void
-
-    :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public H(Ljava/lang/Object;)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public I()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final J(Lk0/a/b1;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/b1<",
-            "*>;)V"
-        }
-    .end annotation
-
-    new-instance v0, Lk0/a/g1;
-
-    invoke-direct {v0}, Lk0/a/g1;-><init>()V
-
-    sget-object v1, Lk0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    sget-object v1, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    :cond_0
-    invoke-virtual {p1}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eq v1, p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v1, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p1, p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v0, p1}, Lk0/a/r1/m;->c(Lk0/a/r1/m;)V
-
-    :goto_0
-    invoke-virtual {p1}, Lk0/a/r1/m;->e()Lk0/a/r1/m;
-
-    move-result-object v0
-
-    sget-object v1, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p0, p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    return-void
-.end method
-
-.method public final K(Ljava/lang/Object;)Ljava/lang/String;
-    .locals 2
-
-    instance-of v0, p1, Lk0/a/c1$b;
-
-    const-string v1, "Active"
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lk0/a/c1$b;
-
-    invoke-virtual {p1}, Lk0/a/c1$b;->d()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const-string v1, "Cancelling"
-
-    goto :goto_0
-
-    :cond_0
-    iget-boolean p1, p1, Lk0/a/c1$b;->isCompleting:Z
-
-    if-eqz p1, :cond_5
-
-    const-string v1, "Completing"
-
-    goto :goto_0
-
-    :cond_1
-    instance-of v0, p1, Lk0/a/u0;
-
-    if-eqz v0, :cond_3
-
-    check-cast p1, Lk0/a/u0;
-
-    invoke-interface {p1}, Lk0/a/u0;->a()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const-string v1, "New"
-
-    goto :goto_0
-
-    :cond_3
-    instance-of p1, p1, Lk0/a/p;
-
-    if-eqz p1, :cond_4
-
-    const-string v1, "Cancelled"
-
-    goto :goto_0
-
-    :cond_4
-    const-string v1, "Completed"
-
-    :cond_5
-    :goto_0
-    return-object v1
-.end method
-
-.method public final L(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    instance-of v1, p1, Ljava/util/concurrent/CancellationException;
-
-    if-nez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, p1
-
-    :goto_0
-    check-cast v0, Ljava/util/concurrent/CancellationException;
-
-    if-eqz v0, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    new-instance v0, Lkotlinx/coroutines/JobCancellationException;
-
-    if-eqz p2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {p1}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " was cancelled"
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    :goto_1
-    invoke-direct {v0, p2, p1, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
-
-    :goto_2
-    return-object v0
-
-    :cond_3
-    const-string p1, "$this$toCancellationException"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final M(Lk0/a/c1$b;Ljava/lang/Object;I)Z
-    .locals 9
-
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-ne v0, p1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_15
-
-    invoke-virtual {p1}, Lk0/a/c1$b;->e()Z
-
-    move-result v0
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_14
-
-    iget-boolean v0, p1, Lk0/a/c1$b;->isCompleting:Z
-
-    if-eqz v0, :cond_13
-
-    instance-of v0, p2, Lk0/a/p;
-
-    const/4 v3, 0x0
-
-    if-nez v0, :cond_1
-
-    move-object v0, v3
-
-    goto :goto_1
-
-    :cond_1
-    move-object v0, p2
-
-    :goto_1
-    check-cast v0, Lk0/a/p;
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, v0, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    goto :goto_2
-
-    :cond_2
-    move-object v0, v3
-
-    :goto_2
-    monitor-enter p1
-
-    :try_start_0
-    invoke-virtual {p1, v0}, Lk0/a/c1$b;->f(Ljava/lang/Throwable;)Ljava/util/List;
-
-    move-result-object v4
-
-    invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_3
-
-    invoke-virtual {p1}, Lk0/a/c1$b;->d()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_7
-
-    new-instance v5, Lkotlinx/coroutines/JobCancellationException;
-
-    const-string v6, "Job was cancelled"
-
-    invoke-direct {v5, v6, v3, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
-
-    move-object v3, v5
-
-    goto :goto_3
-
-    :cond_3
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v5
-
-    :cond_4
-    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_5
-
-    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v6
-
-    move-object v7, v6
-
-    check-cast v7, Ljava/lang/Throwable;
-
-    instance-of v7, v7, Ljava/util/concurrent/CancellationException;
-
-    xor-int/2addr v7, v1
-
-    if-eqz v7, :cond_4
-
-    move-object v3, v6
-
-    :cond_5
-    check-cast v3, Ljava/lang/Throwable;
-
-    if-eqz v3, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    invoke-interface {v4, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Throwable;
-
-    :cond_7
-    :goto_3
-    if-eqz v3, :cond_a
-
-    invoke-interface {v4}, Ljava/util/List;->size()I
-
-    move-result v5
-
-    if-gt v5, v1, :cond_8
-
-    goto :goto_5
-
-    :cond_8
-    invoke-interface {v4}, Ljava/util/List;->size()I
-
-    move-result v5
-
-    invoke-static {v5}, Lk0/a/r1/d;->a(I)Ljava/util/Set;
-
-    move-result-object v5
-
-    invoke-static {v3}, Lk0/a/r1/u;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v6
-
-    invoke-interface {v4}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v4
-
-    :cond_9
-    :goto_4
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v7
-
-    if-eqz v7, :cond_a
-
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Ljava/lang/Throwable;
-
-    invoke-static {v7}, Lk0/a/r1/u;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v7
-
-    if-eq v7, v3, :cond_9
-
-    if-eq v7, v6, :cond_9
-
-    instance-of v8, v7, Ljava/util/concurrent/CancellationException;
-
-    if-nez v8, :cond_9
-
-    invoke-interface {v5, v7}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_9
-
-    invoke-static {v3, v7}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_4
-
-    :cond_a
-    :goto_5
-    monitor-exit p1
-
-    if-nez v3, :cond_b
-
-    goto :goto_6
-
-    :cond_b
-    if-ne v3, v0, :cond_c
-
-    goto :goto_6
-
-    :cond_c
-    new-instance p2, Lk0/a/p;
-
-    const/4 v0, 0x2
-
-    invoke-direct {p2, v3, v2, v0}, Lk0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
-
-    :goto_6
-    if-eqz v3, :cond_10
-
-    invoke-virtual {p0, v3}, Lk0/a/c1;->m(Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_e
-
-    invoke-virtual {p0, v3}, Lk0/a/c1;->y(Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_d
-
-    goto :goto_7
-
-    :cond_d
-    const/4 v0, 0x0
-
-    goto :goto_8
-
-    :cond_e
-    :goto_7
-    const/4 v0, 0x1
-
-    :goto_8
-    if-eqz v0, :cond_10
-
-    if-eqz p2, :cond_f
-
-    move-object v0, p2
-
-    check-cast v0, Lk0/a/p;
-
-    sget-object v3, Lk0/a/p;->b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {v3, v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    goto :goto_9
-
-    :cond_f
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.CompletedExceptionally"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_10
-    :goto_9
-    invoke-virtual {p0, p2}, Lk0/a/c1;->H(Ljava/lang/Object;)V
-
-    sget-object v0, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    instance-of v2, p2, Lk0/a/u0;
-
-    if-eqz v2, :cond_11
-
-    new-instance v2, Lk0/a/v0;
-
-    move-object v3, p2
-
-    check-cast v3, Lk0/a/u0;
-
-    invoke-direct {v2, v3}, Lk0/a/v0;-><init>(Lk0/a/u0;)V
-
-    goto :goto_a
-
-    :cond_11
-    move-object v2, p2
-
-    :goto_a
-    invoke-virtual {v0, p0, p1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_12
-
-    invoke-virtual {p0, p1, p2, p3}, Lk0/a/c1;->q(Lk0/a/u0;Ljava/lang/Object;I)V
-
-    return v1
-
-    :cond_12
-    const-string p3, "Unexpected state: "
-
-    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p3
-
-    iget-object v0, p0, Lk0/a/c1;->_state:Ljava/lang/Object;
-
-    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v0, ", expected: "
-
-    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ", update: "
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :catchall_0
-    move-exception p2
-
-    monitor-exit p1
-
-    throw p2
-
-    :cond_13
-    const-string p1, "Failed requirement."
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_14
-    const-string p1, "Failed requirement."
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_15
-    const-string p1, "Failed requirement."
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public final N(Ljava/lang/Object;Ljava/lang/Object;I)I
-    .locals 7
-
-    instance-of v0, p1, Lk0/a/u0;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    instance-of v0, p1, Lk0/a/m0;
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x1
-
-    if-nez v0, :cond_1
-
-    instance-of v0, p1, Lk0/a/b1;
-
-    if-eqz v0, :cond_a
-
-    :cond_1
-    instance-of v0, p1, Lk0/a/k;
-
-    if-nez v0, :cond_a
-
-    instance-of v0, p2, Lk0/a/p;
-
-    if-nez v0, :cond_a
-
-    check-cast p1, Lk0/a/u0;
-
-    sget-boolean v4, Lk0/a/b0;->a:Z
-
-    if-eqz v4, :cond_5
-
-    instance-of v4, p1, Lk0/a/m0;
-
-    if-nez v4, :cond_3
-
-    instance-of v4, p1, Lk0/a/b1;
-
-    if-eqz v4, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v4, 0x0
-
-    goto :goto_1
-
-    :cond_3
-    :goto_0
-    const/4 v4, 0x1
-
-    :goto_1
-    if-eqz v4, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_5
-    :goto_2
-    sget-boolean v4, Lk0/a/b0;->a:Z
-
-    if-eqz v4, :cond_7
-
-    xor-int/2addr v0, v3
-
-    if-eqz v0, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_7
-    :goto_3
-    sget-object v0, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-static {p2}, Lk0/a/d1;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-virtual {v0, p0, p1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    invoke-virtual {p0, p2}, Lk0/a/c1;->H(Ljava/lang/Object;)V
-
-    invoke-virtual {p0, p1, p2, p3}, Lk0/a/c1;->q(Lk0/a/u0;Ljava/lang/Object;I)V
-
-    const/4 v1, 0x1
-
-    :goto_4
-    if-nez v1, :cond_9
-
-    return v2
-
-    :cond_9
-    return v3
-
-    :cond_a
-    check-cast p1, Lk0/a/u0;
-
-    invoke-virtual {p0, p1}, Lk0/a/c1;->w(Lk0/a/u0;)Lk0/a/g1;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_18
-
-    instance-of v4, p1, Lk0/a/c1$b;
-
-    const/4 v5, 0x0
-
-    if-nez v4, :cond_b
-
-    move-object v4, v5
-
-    goto :goto_5
-
-    :cond_b
-    move-object v4, p1
-
-    :goto_5
-    check-cast v4, Lk0/a/c1$b;
-
-    if-eqz v4, :cond_c
-
-    goto :goto_6
-
-    :cond_c
-    new-instance v4, Lk0/a/c1$b;
-
-    invoke-direct {v4, v0, v1, v5}, Lk0/a/c1$b;-><init>(Lk0/a/g1;ZLjava/lang/Throwable;)V
-
-    :goto_6
-    monitor-enter v4
-
-    :try_start_0
-    iget-boolean v6, v4, Lk0/a/c1$b;->isCompleting:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v6, :cond_d
-
-    monitor-exit v4
-
-    goto/16 :goto_c
-
-    :cond_d
-    :try_start_1
-    iput-boolean v3, v4, Lk0/a/c1$b;->isCompleting:Z
-
-    if-eq v4, p1, :cond_e
-
-    sget-object v1, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p0, p1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-nez v1, :cond_e
-
-    monitor-exit v4
-
-    goto/16 :goto_b
-
-    :cond_e
-    :try_start_2
-    invoke-virtual {v4}, Lk0/a/c1$b;->e()Z
-
-    move-result v1
-
-    xor-int/2addr v1, v3
-
-    if-eqz v1, :cond_17
-
-    invoke-virtual {v4}, Lk0/a/c1$b;->d()Z
-
-    move-result v1
-
-    instance-of v2, p2, Lk0/a/p;
-
-    if-nez v2, :cond_f
-
-    move-object v2, v5
-
-    goto :goto_7
-
-    :cond_f
-    move-object v2, p2
-
-    :goto_7
-    check-cast v2, Lk0/a/p;
-
-    if-eqz v2, :cond_10
-
-    iget-object v2, v2, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    invoke-virtual {v4, v2}, Lk0/a/c1$b;->b(Ljava/lang/Throwable;)V
-
-    :cond_10
-    iget-object v2, v4, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    xor-int/2addr v1, v3
-
-    if-eqz v1, :cond_11
-
-    goto :goto_8
-
-    :cond_11
-    move-object v2, v5
-
-    :goto_8
-    monitor-exit v4
-
-    if-eqz v2, :cond_12
-
-    invoke-virtual {p0, v0, v2}, Lk0/a/c1;->G(Lk0/a/g1;Ljava/lang/Throwable;)V
-
-    :cond_12
-    instance-of v0, p1, Lk0/a/k;
-
-    if-nez v0, :cond_13
-
-    move-object v0, v5
-
-    goto :goto_9
-
-    :cond_13
-    move-object v0, p1
-
-    :goto_9
-    check-cast v0, Lk0/a/k;
-
-    if-eqz v0, :cond_14
-
-    move-object v5, v0
-
-    goto :goto_a
-
-    :cond_14
-    invoke-interface {p1}, Lk0/a/u0;->getList()Lk0/a/g1;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_15
-
-    invoke-virtual {p0, p1}, Lk0/a/c1;->F(Lk0/a/r1/m;)Lk0/a/k;
-
-    move-result-object v5
-
-    :cond_15
-    :goto_a
-    if-eqz v5, :cond_16
-
-    invoke-virtual {p0, v4, v5, p2}, Lk0/a/c1;->O(Lk0/a/c1$b;Lk0/a/k;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_16
-
-    const/4 v1, 0x2
-
-    goto :goto_c
-
-    :cond_16
-    invoke-virtual {p0, v4, p2, p3}, Lk0/a/c1;->M(Lk0/a/c1$b;Ljava/lang/Object;I)Z
-
-    const/4 v1, 0x1
-
-    goto :goto_c
-
-    :cond_17
-    :try_start_3
-    const-string p1, "Failed requirement."
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v4
-
-    throw p1
-
-    :cond_18
-    :goto_b
-    const/4 v1, 0x3
-
-    :goto_c
-    return v1
-.end method
-
-.method public final O(Lk0/a/c1$b;Lk0/a/k;Ljava/lang/Object;)Z
-    .locals 6
-
-    :goto_0
-    iget-object v0, p2, Lk0/a/k;->h:Lk0/a/l;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    new-instance v3, Lk0/a/c1$a;
-
-    invoke-direct {v3, p0, p1, p2, p3}, Lk0/a/c1$a;-><init>(Lk0/a/c1;Lk0/a/c1$b;Lk0/a/k;Ljava/lang/Object;)V
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    invoke-static/range {v0 .. v5}, Lf/n/a/k/a;->H(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lk0/a/k0;
-
-    move-result-object v0
-
-    sget-object v1, Lk0/a/h1;->d:Lk0/a/h1;
-
-    if-eq v0, v1, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    invoke-virtual {p0, p2}, Lk0/a/c1;->F(Lk0/a/r1/m;)Lk0/a/k;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public a()Z
-    .locals 2
-
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lk0/a/u0;
-
-    if-eqz v1, :cond_0
-
-    check-cast v0, Lk0/a/u0;
-
-    invoke-interface {v0}, Lk0/a/u0;->a()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public final d(ZZLkotlin/jvm/functions/Function1;)Lk0/a/k0;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)",
-            "Lk0/a/k0;"
-        }
-    .end annotation
-
-    const-string v0, "handler"
-
-    const/4 v1, 0x0
-
-    if-eqz p3, :cond_14
-
-    move-object v0, v1
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v2
-
-    instance-of v3, v2, Lk0/a/m0;
-
-    if-eqz v3, :cond_4
-
-    move-object v3, v2
-
-    check-cast v3, Lk0/a/m0;
-
-    iget-boolean v4, v3, Lk0/a/m0;->d:Z
-
-    if-eqz v4, :cond_2
-
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p0, p3, p1}, Lk0/a/c1;->D(Lkotlin/jvm/functions/Function1;Z)Lk0/a/b1;
-
-    move-result-object v0
-
-    :goto_1
-    sget-object v3, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3, p0, v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    return-object v0
-
-    :cond_2
-    new-instance v2, Lk0/a/g1;
-
-    invoke-direct {v2}, Lk0/a/g1;-><init>()V
-
-    iget-boolean v4, v3, Lk0/a/m0;->d:Z
-
-    if-eqz v4, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    new-instance v4, Lk0/a/t0;
-
-    invoke-direct {v4, v2}, Lk0/a/t0;-><init>(Lk0/a/g1;)V
-
-    move-object v2, v4
-
-    :goto_2
-    sget-object v4, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v4, p0, v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_4
-    instance-of v3, v2, Lk0/a/u0;
-
-    if-eqz v3, :cond_10
-
-    move-object v3, v2
-
-    check-cast v3, Lk0/a/u0;
-
-    invoke-interface {v3}, Lk0/a/u0;->getList()Lk0/a/g1;
-
-    move-result-object v3
-
-    if-nez v3, :cond_6
-
-    if-eqz v2, :cond_5
-
-    check-cast v2, Lk0/a/b1;
-
-    invoke-virtual {p0, v2}, Lk0/a/c1;->J(Lk0/a/b1;)V
-
-    goto :goto_0
-
-    :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.JobNode<*>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    sget-object v4, Lk0/a/h1;->d:Lk0/a/h1;
-
-    if-eqz p1, :cond_c
-
-    instance-of v5, v2, Lk0/a/c1$b;
-
-    if-eqz v5, :cond_c
-
-    monitor-enter v2
-
-    :try_start_0
-    move-object v5, v2
-
-    check-cast v5, Lk0/a/c1$b;
-
-    iget-object v5, v5, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
-
-    if-eqz v5, :cond_7
-
-    instance-of v6, p3, Lk0/a/k;
-
-    if-eqz v6, :cond_b
-
-    move-object v6, v2
-
-    check-cast v6, Lk0/a/c1$b;
-
-    iget-boolean v6, v6, Lk0/a/c1$b;->isCompleting:Z
-
-    if-nez v6, :cond_b
-
-    :cond_7
-    if-eqz v0, :cond_8
-
-    goto :goto_3
-
-    :cond_8
-    invoke-virtual {p0, p3, p1}, Lk0/a/c1;->D(Lkotlin/jvm/functions/Function1;Z)Lk0/a/b1;
-
-    move-result-object v0
-
-    :goto_3
-    invoke-virtual {p0, v2, v3, v0}, Lk0/a/c1;->h(Ljava/lang/Object;Lk0/a/g1;Lk0/a/b1;)Z
-
-    move-result v4
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v4, :cond_9
-
-    monitor-exit v2
-
-    goto :goto_0
-
-    :cond_9
-    if-nez v5, :cond_a
-
-    monitor-exit v2
-
-    return-object v0
-
-    :cond_a
-    move-object v4, v0
-
-    :cond_b
-    monitor-exit v2
-
-    goto :goto_4
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v2
-
-    throw p1
-
-    :cond_c
-    move-object v5, v1
-
-    :goto_4
-    if-eqz v5, :cond_e
-
-    if-eqz p2, :cond_d
-
-    invoke-interface {p3, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_d
-    return-object v4
-
-    :cond_e
-    if-eqz v0, :cond_f
-
-    goto :goto_5
-
-    :cond_f
-    invoke-virtual {p0, p3, p1}, Lk0/a/c1;->D(Lkotlin/jvm/functions/Function1;Z)Lk0/a/b1;
-
-    move-result-object v0
-
-    :goto_5
-    invoke-virtual {p0, v2, v3, v0}, Lk0/a/c1;->h(Ljava/lang/Object;Lk0/a/g1;Lk0/a/b1;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    return-object v0
-
-    :cond_10
-    if-eqz p2, :cond_13
-
-    instance-of p1, v2, Lk0/a/p;
-
-    if-nez p1, :cond_11
-
-    move-object v2, v1
-
-    :cond_11
-    check-cast v2, Lk0/a/p;
-
-    if-eqz v2, :cond_12
-
-    iget-object v1, v2, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    :cond_12
-    invoke-interface {p3, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_13
-    sget-object p1, Lk0/a/h1;->d:Lk0/a/h1;
-
-    return-object p1
-
-    :cond_14
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final e()Ljava/util/concurrent/CancellationException;
-    .locals 4
-
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lk0/a/c1$b;
-
-    const-string v2, "Job is still new or active: "
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Lk0/a/c1$b;
-
-    iget-object v0, v0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
-
-    if-eqz v0, :cond_0
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " is cancelling"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p0, v0, v1}, Lk0/a/c1;->L(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    instance-of v1, v0, Lk0/a/u0;
-
-    if-nez v1, :cond_3
-
-    instance-of v1, v0, Lk0/a/p;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    check-cast v0, Lk0/a/p;
-
-    iget-object v0, v0, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    invoke-virtual {p0, v0, v2}, Lk0/a/c1;->L(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v0, Lkotlinx/coroutines/JobCancellationException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, " has completed normally"
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1, v2, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
-
-    :goto_0
-    return-object v0
-
-    :cond_3
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final f(Lk0/a/j1;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0, p1}, Lk0/a/c1;->l(Ljava/lang/Object;)Z
-
-    return-void
-
-    :cond_0
-    const-string p1, "parentJob"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(TR;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TR;-",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "+TR;>;)TR;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    invoke-static {p0, p1, p2}, Lkotlin/coroutines/CoroutineContext$a$a;->fold(Lkotlin/coroutines/CoroutineContext$a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "operation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            ">(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->get(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final getKey()Lkotlin/coroutines/CoroutineContext$b;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;"
-        }
-    .end annotation
-
-    sget-object v0, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    return-object v0
-.end method
-
-.method public final h(Ljava/lang/Object;Lk0/a/g1;Lk0/a/b1;)Z
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            "Lk0/a/g1;",
-            "Lk0/a/b1<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance v0, Lk0/a/c1$c;
-
-    invoke-direct {v0, p3, p3, p0, p1}, Lk0/a/c1$c;-><init>(Lk0/a/r1/m;Lk0/a/r1/m;Lk0/a/c1;Ljava/lang/Object;)V
-
-    :goto_0
-    invoke-virtual {p2}, Lk0/a/r1/m;->f()Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_5
-
-    check-cast p1, Lk0/a/r1/m;
-
-    if-eqz p3, :cond_4
-
-    sget-object v1, Lk0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p3, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    sget-object v1, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p3, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    iput-object p2, v0, Lk0/a/r1/m$a;->b:Lk0/a/r1/m;
-
-    sget-object v1, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p1, p2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    const/4 v4, 0x1
-
-    if-nez v1, :cond_0
-
-    const/4 p1, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-virtual {v0, p1}, Lk0/a/r1/c;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-nez p1, :cond_1
-
-    const/4 p1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x2
-
-    :goto_1
-    if-eq p1, v4, :cond_2
-
-    if-eq p1, v3, :cond_3
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v2, 0x1
-
-    :cond_3
-    return v2
-
-    :cond_4
-    const-string p1, "node"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final i(Lkotlin/jvm/functions/Function1;)Lk0/a/k0;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)",
-            "Lk0/a/k0;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p0, v0, v1, p1}, Lk0/a/c1;->d(ZZLkotlin/jvm/functions/Function1;)Lk0/a/k0;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public j(Ljava/lang/Object;I)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final l(Ljava/lang/Object;)Z
-    .locals 10
-
-    invoke-virtual {p0}, Lk0/a/c1;->v()Z
-
-    move-result v0
-
-    const/4 v1, 0x3
-
-    const/4 v2, 0x2
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-eqz v0, :cond_4
-
-    :goto_0
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v5, v0, Lk0/a/u0;
-
-    if-eqz v5, :cond_3
-
-    instance-of v5, v0, Lk0/a/c1$b;
-
-    if-eqz v5, :cond_0
-
-    move-object v5, v0
-
-    check-cast v5, Lk0/a/c1$b;
-
-    iget-boolean v5, v5, Lk0/a/c1$b;->isCompleting:Z
-
-    if-eqz v5, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    new-instance v5, Lk0/a/p;
-
-    invoke-virtual {p0, p1}, Lk0/a/c1;->s(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v6
-
-    invoke-direct {v5, v6, v3, v2}, Lk0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
-
-    invoke-virtual {p0, v0, v5, v3}, Lk0/a/c1;->N(Ljava/lang/Object;Ljava/lang/Object;I)I
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    if-eq v0, v4, :cond_2
-
-    if-eq v0, v2, :cond_2
-
-    if-ne v0, v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "unexpected result"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    const/4 v0, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    :goto_1
-    const/4 v0, 0x0
-
-    :goto_2
-    if-eqz v0, :cond_4
-
-    return v4
-
-    :cond_4
-    const/4 v0, 0x0
-
-    move-object v5, v0
-
-    :cond_5
-    :goto_3
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v6
-
-    instance-of v7, v6, Lk0/a/c1$b;
-
-    if-eqz v7, :cond_b
-
-    monitor-enter v6
-
-    :try_start_0
-    move-object v1, v6
-
-    check-cast v1, Lk0/a/c1$b;
-
-    invoke-virtual {v1}, Lk0/a/c1$b;->e()Z
-
-    move-result v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v1, :cond_6
-
-    monitor-exit v6
-
-    goto/16 :goto_b
-
-    :cond_6
-    :try_start_1
-    move-object v1, v6
-
-    check-cast v1, Lk0/a/c1$b;
-
-    invoke-virtual {v1}, Lk0/a/c1$b;->d()Z
-
-    move-result v1
-
-    if-nez p1, :cond_7
-
-    if-nez v1, :cond_9
-
-    :cond_7
-    if-eqz v5, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    invoke-virtual {p0, p1}, Lk0/a/c1;->s(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v5
-
-    :goto_4
-    move-object p1, v6
-
-    check-cast p1, Lk0/a/c1$b;
-
-    invoke-virtual {p1, v5}, Lk0/a/c1$b;->b(Ljava/lang/Throwable;)V
-
-    :cond_9
-    move-object p1, v6
-
-    check-cast p1, Lk0/a/c1$b;
-
-    iget-object p1, p1, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    xor-int/2addr v1, v4
-
-    if-eqz v1, :cond_a
-
-    move-object v0, p1
-
-    :cond_a
-    monitor-exit v6
-
-    if-eqz v0, :cond_15
-
-    check-cast v6, Lk0/a/c1$b;
-
-    iget-object p1, v6, Lk0/a/c1$b;->d:Lk0/a/g1;
-
-    invoke-virtual {p0, p1, v0}, Lk0/a/c1;->G(Lk0/a/g1;Ljava/lang/Throwable;)V
-
-    goto/16 :goto_a
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v6
-
-    throw p1
-
-    :cond_b
-    instance-of v7, v6, Lk0/a/u0;
-
-    if-eqz v7, :cond_17
-
-    if-eqz v5, :cond_c
-
-    goto :goto_5
-
-    :cond_c
-    invoke-virtual {p0, p1}, Lk0/a/c1;->s(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v5
-
-    :goto_5
-    move-object v7, v6
-
-    check-cast v7, Lk0/a/u0;
-
-    invoke-interface {v7}, Lk0/a/u0;->a()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_13
-
-    sget-boolean v6, Lk0/a/b0;->a:Z
-
-    if-eqz v6, :cond_e
-
-    instance-of v6, v7, Lk0/a/c1$b;
-
-    xor-int/2addr v6, v4
-
-    if-eqz v6, :cond_d
-
-    goto :goto_6
-
-    :cond_d
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_e
-    :goto_6
-    sget-boolean v6, Lk0/a/b0;->a:Z
-
-    if-eqz v6, :cond_10
-
-    invoke-interface {v7}, Lk0/a/u0;->a()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_f
-
-    goto :goto_7
-
-    :cond_f
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_10
-    :goto_7
-    invoke-virtual {p0, v7}, Lk0/a/c1;->w(Lk0/a/u0;)Lk0/a/g1;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_12
-
-    new-instance v8, Lk0/a/c1$b;
-
-    invoke-direct {v8, v6, v3, v5}, Lk0/a/c1$b;-><init>(Lk0/a/g1;ZLjava/lang/Throwable;)V
-
-    sget-object v9, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v9, p0, v7, v8}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-nez v7, :cond_11
-
-    goto :goto_8
-
-    :cond_11
-    invoke-virtual {p0, v6, v5}, Lk0/a/c1;->G(Lk0/a/g1;Ljava/lang/Throwable;)V
-
-    const/4 v6, 0x1
-
-    goto :goto_9
-
-    :cond_12
-    :goto_8
-    const/4 v6, 0x0
-
-    :goto_9
-    if-eqz v6, :cond_5
-
-    goto :goto_a
-
-    :cond_13
-    new-instance v7, Lk0/a/p;
-
-    invoke-direct {v7, v5, v3, v2}, Lk0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
-
-    invoke-virtual {p0, v6, v7, v3}, Lk0/a/c1;->N(Ljava/lang/Object;Ljava/lang/Object;I)I
-
-    move-result v7
-
-    if-eqz v7, :cond_16
-
-    if-eq v7, v4, :cond_15
-
-    if-eq v7, v2, :cond_15
-
-    if-ne v7, v1, :cond_14
-
-    goto/16 :goto_3
-
-    :cond_14
-    const-string p1, "unexpected result"
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_15
-    :goto_a
-    const/4 v3, 0x1
-
-    goto :goto_b
-
-    :cond_16
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "Cannot happen in "
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_17
-    :goto_b
-    return v3
-.end method
-
-.method public final m(Ljava/lang/Throwable;)Z
-    .locals 4
-
-    invoke-virtual {p0}, Lk0/a/c1;->B()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
-
-    iget-object v2, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    if-eqz v2, :cond_4
-
-    sget-object v3, Lk0/a/h1;->d:Lk0/a/h1;
-
-    if-ne v2, v3, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-interface {v2, p1}, Lk0/a/j;->h(Ljava/lang/Throwable;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_3
-
-    if-eqz v0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :cond_3
-    :goto_0
-    return v1
-
-    :cond_4
-    :goto_1
-    return v0
-.end method
-
-.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;)",
-            "Lkotlin/coroutines/CoroutineContext;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->minusKey(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public n()Ljava/util/concurrent/CancellationException;
-    .locals 4
-
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lk0/a/c1$b;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_0
-
-    move-object v1, v0
-
-    check-cast v1, Lk0/a/c1$b;
-
-    iget-object v1, v1, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v1, v0, Lk0/a/p;
-
-    if-eqz v1, :cond_1
-
-    move-object v1, v0
-
-    check-cast v1, Lk0/a/p;
-
-    iget-object v1, v1, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_1
-    instance-of v1, v0, Lk0/a/u0;
-
-    if-nez v1, :cond_4
-
-    move-object v1, v2
-
-    :goto_0
-    instance-of v3, v1, Ljava/util/concurrent/CancellationException;
-
-    if-nez v3, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    move-object v2, v1
-
-    :goto_1
-    check-cast v2, Ljava/util/concurrent/CancellationException;
-
-    if-eqz v2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    new-instance v2, Lkotlinx/coroutines/JobCancellationException;
-
-    const-string v3, "Parent job is "
-
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    invoke-virtual {p0, v0}, Lk0/a/c1;->K(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v2, v0, v1, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
-
-    :goto_2
-    return-object v2
-
-    :cond_4
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Cannot be cancelling child in this state: "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public o(Ljava/lang/Throwable;)Z
-    .locals 2
-
-    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    invoke-virtual {p0, p1}, Lk0/a/c1;->l(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p0}, Lk0/a/c1;->u()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
-
-.method public p(Ljava/util/concurrent/CancellationException;)V
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lk0/a/c1;->l(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lk0/a/c1;->u()Z
-
-    move-result p1
-
-    :cond_0
-    return-void
-.end method
-
-.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->plus(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final q(Lk0/a/u0;Ljava/lang/Object;I)V
-    .locals 8
-
-    iget-object v0, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lk0/a/k0;->dispose()V
-
-    sget-object v0, Lk0/a/h1;->d:Lk0/a/h1;
-
-    iput-object v0, p0, Lk0/a/c1;->parentHandle:Lk0/a/j;
-
-    :cond_0
-    instance-of v0, p2, Lk0/a/p;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_1
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v0, p2
-
-    :goto_0
-    check-cast v0, Lk0/a/p;
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, v0, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    goto :goto_1
-
-    :cond_2
-    move-object v0, v1
-
-    :goto_1
-    instance-of v2, p1, Lk0/a/b1;
-
-    const-string v3, " for "
-
-    const-string v4, "Exception in completion handler "
-
-    if-eqz v2, :cond_3
-
-    :try_start_0
-    move-object v1, p1
-
-    check-cast v1, Lk0/a/b1;
-
-    invoke-virtual {v1, v0}, Lk0/a/s;->i(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto/16 :goto_4
-
-    :catchall_0
-    move-exception v0
-
-    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v1, p1, v0}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v1}, Lk0/a/c1;->z(Ljava/lang/Throwable;)V
-
-    goto :goto_4
-
-    :cond_3
-    invoke-interface {p1}, Lk0/a/u0;->getList()Lk0/a/g1;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_8
-
-    invoke-virtual {p1}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_7
-
-    check-cast v2, Lk0/a/r1/m;
-
-    :goto_2
-    invoke-static {v2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    xor-int/lit8 v5, v5, 0x1
-
-    if-eqz v5, :cond_6
-
-    instance-of v5, v2, Lk0/a/b1;
-
-    if-eqz v5, :cond_5
-
-    move-object v5, v2
-
-    check-cast v5, Lk0/a/b1;
-
-    :try_start_1
-    invoke-virtual {v5, v0}, Lk0/a/s;->i(Ljava/lang/Throwable;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    goto :goto_3
-
-    :catchall_1
-    move-exception v6
-
-    if-eqz v1, :cond_4
-
-    invoke-static {v1, v6}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    goto :goto_3
-
-    :cond_4
-    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
-
-    new-instance v7, Ljava/lang/StringBuilder;
-
-    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-direct {v1, v5, v6}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    :cond_5
-    :goto_3
-    invoke-virtual {v2}, Lk0/a/r1/m;->e()Lk0/a/r1/m;
-
-    move-result-object v2
-
-    goto :goto_2
-
-    :cond_6
-    if-eqz v1, :cond_8
-
-    invoke-virtual {p0, v1}, Lk0/a/c1;->z(Ljava/lang/Throwable;)V
-
-    goto :goto_4
-
-    :cond_7
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    :goto_4
-    invoke-virtual {p0, p2, p3}, Lk0/a/c1;->j(Ljava/lang/Object;I)V
-
-    return-void
-.end method
-
-.method public final s(Ljava/lang/Object;)Ljava/lang/Throwable;
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    instance-of v0, p1, Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Lkotlinx/coroutines/JobCancellationException;
-
-    const/4 v0, 0x0
-
-    const-string v1, "Job was cancelled"
-
-    invoke-direct {p1, v1, v0, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
-
-    goto :goto_1
-
-    :cond_2
-    if-eqz p1, :cond_3
-
-    check-cast p1, Lk0/a/j1;
-
-    invoke-interface {p1}, Lk0/a/j1;->n()Ljava/util/concurrent/CancellationException;
-
-    move-result-object p1
-
-    :goto_1
-    return-object p1
-
-    :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ParentJob"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final start()Z
-    .locals 6
-
-    :goto_0
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lk0/a/m0;
-
-    const/4 v2, -0x1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-eqz v1, :cond_2
-
-    move-object v1, v0
-
-    check-cast v1, Lk0/a/m0;
-
-    iget-boolean v1, v1, Lk0/a/m0;->d:Z
-
-    if-eqz v1, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    sget-object v1, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    sget-object v5, Lk0/a/d1;->c:Lk0/a/m0;
-
-    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_3
-
-    :cond_1
-    invoke-virtual {p0}, Lk0/a/c1;->I()V
-
-    goto :goto_1
-
-    :cond_2
-    instance-of v1, v0, Lk0/a/t0;
-
-    if-eqz v1, :cond_4
-
-    sget-object v1, Lk0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-object v5, v0
-
-    check-cast v5, Lk0/a/t0;
-
-    iget-object v5, v5, Lk0/a/t0;->d:Lk0/a/g1;
-
-    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    invoke-virtual {p0}, Lk0/a/c1;->I()V
-
-    :goto_1
-    const/4 v2, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    :goto_2
-    const/4 v2, 0x0
-
-    :goto_3
-    if-eqz v2, :cond_6
-
-    if-eq v2, v4, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    return v4
-
-    :cond_6
-    return v3
-.end method
-
-.method public final t(Lk0/a/l;)Lk0/a/j;
-    .locals 6
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    new-instance v3, Lk0/a/k;
-
-    invoke-direct {v3, p0, p1}, Lk0/a/k;-><init>(Lk0/a/c1;Lk0/a/l;)V
-
-    const/4 v4, 0x2
-
-    const/4 v5, 0x0
-
-    move-object v0, p0
-
-    invoke-static/range {v0 .. v5}, Lf/n/a/k/a;->H(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lk0/a/k0;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p1, Lk0/a/j;
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ChildHandle"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p0}, Lk0/a/c1;->E()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x7b
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-virtual {p0, v2}, Lk0/a/c1;->K(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x7d
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public u()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public v()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final w(Lk0/a/u0;)Lk0/a/g1;
-    .locals 2
-
-    invoke-interface {p1}, Lk0/a/u0;->getList()Lk0/a/g1;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v0, p1, Lk0/a/m0;
-
-    if-eqz v0, :cond_1
-
-    new-instance v0, Lk0/a/g1;
-
-    invoke-direct {v0}, Lk0/a/g1;-><init>()V
-
-    goto :goto_0
-
-    :cond_1
-    instance-of v0, p1, Lk0/a/b1;
-
-    if-eqz v0, :cond_2
-
-    check-cast p1, Lk0/a/b1;
-
-    invoke-virtual {p0, p1}, Lk0/a/c1;->J(Lk0/a/b1;)V
-
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-
-    :cond_2
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "State should have list: "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final x()Ljava/lang/Object;
-    .locals 2
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/c1;->_state:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/r1/r;
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    check-cast v0, Lk0/a/r1/r;
-
-    invoke-virtual {v0, p0}, Lk0/a/r1/r;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-.end method
-
-.method public y(Ljava/lang/Throwable;)Z
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public z(Ljava/lang/Throwable;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    throw p1
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/d.smali b/com.discord/smali_classes2/k0/a/d.smali
deleted file mode 100644
index 8f07df8169..0000000000
--- a/com.discord/smali_classes2/k0/a/d.smali
+++ /dev/null
@@ -1,16 +0,0 @@
-.class public abstract Lk0/a/d;
-.super Lk0/a/e;
-.source "CancellableContinuationImpl.kt"
-
-# interfaces
-.implements Lk0/a/i1;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/e;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/d0.smali b/com.discord/smali_classes2/k0/a/d0.smali
deleted file mode 100644
index 3f82748318..0000000000
--- a/com.discord/smali_classes2/k0/a/d0.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public final Lk0/a/d0;
-.super Ljava/lang/Object;
-.source "DefaultExecutor.kt"
-
-
-# static fields
-.field public static final a:Lk0/a/e0;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    sget-object v0, Lk0/a/c0;->j:Lk0/a/c0;
-
-    sput-object v0, Lk0/a/d0;->a:Lk0/a/e0;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/d1.smali b/com.discord/smali_classes2/k0/a/d1.smali
deleted file mode 100644
index cea1cb3c4c..0000000000
--- a/com.discord/smali_classes2/k0/a/d1.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.class public final Lk0/a/d1;
-.super Ljava/lang/Object;
-.source "JobSupport.kt"
-
-
-# static fields
-.field public static final a:Lk0/a/r1/v;
-
-.field public static final b:Lk0/a/m0;
-
-.field public static final c:Lk0/a/m0;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "SEALED"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/d1;->a:Lk0/a/r1/v;
-
-    new-instance v0, Lk0/a/m0;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lk0/a/m0;-><init>(Z)V
-
-    sput-object v0, Lk0/a/d1;->b:Lk0/a/m0;
-
-    new-instance v0, Lk0/a/m0;
-
-    const/4 v1, 0x1
-
-    invoke-direct {v0, v1}, Lk0/a/m0;-><init>(Z)V
-
-    sput-object v0, Lk0/a/d1;->c:Lk0/a/m0;
-
-    return-void
-.end method
-
-.method public static final a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    instance-of v0, p0, Lk0/a/u0;
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lk0/a/v0;
-
-    check-cast p0, Lk0/a/u0;
-
-    invoke-direct {v0, p0}, Lk0/a/v0;-><init>(Lk0/a/u0;)V
-
-    move-object p0, v0
-
-    :cond_0
-    return-object p0
-.end method
-
-.method public static final b(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    instance-of v0, p0, Lk0/a/v0;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, p0
-
-    :goto_0
-    check-cast v0, Lk0/a/v0;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, v0, Lk0/a/v0;->a:Lk0/a/u0;
-
-    if-eqz v0, :cond_1
-
-    move-object p0, v0
-
-    :cond_1
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/e.smali b/com.discord/smali_classes2/k0/a/e.smali
deleted file mode 100644
index 0c99fd5d3b..0000000000
--- a/com.discord/smali_classes2/k0/a/e.smali
+++ /dev/null
@@ -1,33 +0,0 @@
-.class public abstract Lk0/a/e;
-.super Ljava/lang/Object;
-.source "CompletionHandler.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Throwable;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ljava/lang/Throwable;)V
-.end method
diff --git a/com.discord/smali_classes2/k0/a/e0.smali b/com.discord/smali_classes2/k0/a/e0.smali
deleted file mode 100644
index 12d647fc0a..0000000000
--- a/com.discord/smali_classes2/k0/a/e0.smali
+++ /dev/null
@@ -1,17 +0,0 @@
-.class public interface abstract Lk0/a/e0;
-.super Ljava/lang/Object;
-.source "Delay.kt"
-
-
-# virtual methods
-.method public abstract b(JLk0/a/f;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J",
-            "Lk0/a/f<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/k0/a/e1.smali b/com.discord/smali_classes2/k0/a/e1.smali
deleted file mode 100644
index 7c966d60b6..0000000000
--- a/com.discord/smali_classes2/k0/a/e1.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.class public final Lk0/a/e1;
-.super Lk0/a/k1;
-.source "Builders.common.kt"
-
-
-# instance fields
-.field public g:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Lkotlinx/coroutines/CoroutineScope;",
-            "-",
-            "Lkotlin/coroutines/Continuation<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;+",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-",
-            "Lkotlinx/coroutines/CoroutineScope;",
-            "-",
-            "Lkotlin/coroutines/Continuation<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;+",
-            "Ljava/lang/Object;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, p1, v0}, Lk0/a/k1;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
-
-    iput-object p2, p0, Lk0/a/e1;->g:Lkotlin/jvm/functions/Function2;
-
-    return-void
-
-    :cond_0
-    const-string p1, "parentContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public R()V
-    .locals 2
-
-    iget-object v0, p0, Lk0/a/e1;->g:Lkotlin/jvm/functions/Function2;
-
-    if-eqz v0, :cond_0
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lk0/a/e1;->g:Lkotlin/jvm/functions/Function2;
-
-    invoke-static {v0, p0, p0}, Lf/n/a/k/a;->Z(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Already started"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/f.smali b/com.discord/smali_classes2/k0/a/f.smali
deleted file mode 100644
index ba0735d49c..0000000000
--- a/com.discord/smali_classes2/k0/a/f.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class public interface abstract Lk0/a/f;
-.super Ljava/lang/Object;
-.source "CancellableContinuation.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/Continuation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/Continuation<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract b(Lkotlin/jvm/functions/Function1;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-.end method
-
-.method public abstract c(Lk0/a/v;Ljava/lang/Object;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/v;",
-            "TT;)V"
-        }
-    .end annotation
-.end method
-
-.method public abstract g(Ljava/lang/Throwable;)Z
-.end method
diff --git a/com.discord/smali_classes2/k0/a/f0.smali b/com.discord/smali_classes2/k0/a/f0.smali
deleted file mode 100644
index fd381b0042..0000000000
--- a/com.discord/smali_classes2/k0/a/f0.smali
+++ /dev/null
@@ -1,334 +0,0 @@
-.class public final Lk0/a/f0;
-.super Lk0/a/i0;
-.source "Dispatched.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-.implements Lkotlin/coroutines/Continuation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/i0<",
-        "TT;>;",
-        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;",
-        "Lkotlin/coroutines/Continuation<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public g:Ljava/lang/Object;
-
-.field public final h:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-.field public final i:Ljava/lang/Object;
-
-.field public final j:Lk0/a/v;
-
-.field public final k:Lkotlin/coroutines/Continuation;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/v;Lkotlin/coroutines/Continuation;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/v;",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lk0/a/i0;-><init>(I)V
-
-    iput-object p1, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    iput-object p2, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    sget-object p1, Lk0/a/h0;->a:Lk0/a/r1/v;
-
-    iput-object p1, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    instance-of p1, p2, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    if-nez p1, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    check-cast p2, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    iput-object p2, p0, Lk0/a/f0;->h:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lk0/a/r1/x;->b(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lk0/a/f0;->i:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public e()Lkotlin/coroutines/Continuation;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-
-    return-object p0
-.end method
-
-.method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/f0;->h:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    return-object v0
-.end method
-
-.method public getContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getStackTraceElement()Ljava/lang/StackTraceElement;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public i()Ljava/lang/Object;
-    .locals 2
-
-    iget-object v0, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    sget-boolean v1, Lk0/a/b0;->a:Z
-
-    if-eqz v1, :cond_2
-
-    sget-object v1, Lk0/a/h0;->a:Lk0/a/r1/v;
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :cond_2
-    :goto_1
-    sget-object v1, Lk0/a/h0;->a:Lk0/a/r1/v;
-
-    iput-object v1, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    return-object v0
-.end method
-
-.method public resumeWith(Ljava/lang/Object;)V
-    .locals 5
-
-    iget-object v0, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    invoke-static {p1}, Lf/n/a/k/a;->k0(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    invoke-virtual {v2, v0}, Lk0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-
-    move-result v2
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_0
-
-    iput-object v1, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    iput v3, p0, Lk0/a/i0;->f:I
-
-    iget-object p1, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    invoke-virtual {p1, v0, p0}, Lk0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-
-    goto :goto_1
-
-    :cond_0
-    sget-object v0, Lk0/a/n1;->b:Lk0/a/n1;
-
-    invoke-static {}, Lk0/a/n1;->a()Lk0/a/n0;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lk0/a/n0;->A()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    iput-object v1, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    iput v3, p0, Lk0/a/i0;->f:I
-
-    invoke-virtual {v0, p0}, Lk0/a/n0;->x(Lk0/a/i0;)V
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Lk0/a/n0;->z(Z)V
-
-    :try_start_0
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lk0/a/f0;->i:Ljava/lang/Object;
-
-    invoke-static {v2, v3}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v4, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {v4, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    invoke-static {v2, v3}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    :cond_2
-    invoke-virtual {v0}, Lk0/a/n0;->C()Z
-
-    move-result p1
-
-    if-nez p1, :cond_2
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {v2, v3}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    const/4 v2, 0x0
-
-    :try_start_3
-    invoke-virtual {p0, p1, v2}, Lk0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    :goto_0
-    invoke-virtual {v0, v1}, Lk0/a/n0;->v(Z)V
-
-    :goto_1
-    return-void
-
-    :catchall_2
-    move-exception p1
-
-    invoke-virtual {v0, v1}, Lk0/a/n0;->v(Z)V
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "DispatchedContinuation["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    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;
-
-    iget-object v1, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-static {v1}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/f1.smali b/com.discord/smali_classes2/k0/a/f1.smali
deleted file mode 100644
index 2c8a57576c..0000000000
--- a/com.discord/smali_classes2/k0/a/f1.smali
+++ /dev/null
@@ -1,18 +0,0 @@
-.class public abstract Lk0/a/f1;
-.super Lk0/a/v;
-.source "MainCoroutineDispatcher.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/v;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract v()Lk0/a/f1;
-.end method
diff --git a/com.discord/smali_classes2/k0/a/g.smali b/com.discord/smali_classes2/k0/a/g.smali
deleted file mode 100644
index 7cb145463a..0000000000
--- a/com.discord/smali_classes2/k0/a/g.smali
+++ /dev/null
@@ -1,977 +0,0 @@
-.class public Lk0/a/g;
-.super Lk0/a/i0;
-.source "CancellableContinuationImpl.kt"
-
-# interfaces
-.implements Lk0/a/f;
-.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/i0<",
-        "TT;>;",
-        "Lk0/a/f<",
-        "TT;>;",
-        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-.field public static final j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-
-# instance fields
-.field public volatile _decision:I
-
-.field public volatile _state:Ljava/lang/Object;
-
-.field public final g:Lkotlin/coroutines/CoroutineContext;
-
-.field public final h:Lkotlin/coroutines/Continuation;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public volatile parentHandle:Lk0/a/k0;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Lk0/a/g;
-
-    const-string v1, "_decision"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/g;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const-class v0, Lk0/a/g;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "_state"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlin/coroutines/Continuation;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;I)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p2}, Lk0/a/i0;-><init>(I)V
-
-    iput-object p1, p0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lk0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
-
-    const/4 p1, 0x0
-
-    iput p1, p0, Lk0/a/g;->_decision:I
-
-    sget-object p1, Lk0/a/b;->d:Lk0/a/b;
-
-    iput-object p1, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public b(Lkotlin/jvm/functions/Function1;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    move-object v1, v0
-
-    :cond_0
-    iget-object v2, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    instance-of v3, v2, Lk0/a/b;
-
-    if-eqz v3, :cond_3
-
-    if-eqz v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    instance-of v1, p1, Lk0/a/d;
-
-    if-eqz v1, :cond_2
-
-    move-object v1, p1
-
-    check-cast v1, Lk0/a/d;
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v1, Lk0/a/w0;
-
-    invoke-direct {v1, p1}, Lk0/a/w0;-><init>(Lkotlin/jvm/functions/Function1;)V
-
-    :goto_0
-    sget-object v3, Lk0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    return-void
-
-    :cond_3
-    instance-of v1, v2, Lk0/a/d;
-
-    if-nez v1, :cond_9
-
-    instance-of v1, v2, Lk0/a/h;
-
-    if-eqz v1, :cond_8
-
-    move-object v1, v2
-
-    check-cast v1, Lk0/a/h;
-
-    if-eqz v1, :cond_7
-
-    sget-object v3, Lk0/a/p;->b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x1
-
-    invoke-virtual {v3, v1, v4, v5}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_6
-
-    :try_start_0
-    instance-of v1, v2, Lk0/a/p;
-
-    if-nez v1, :cond_4
-
-    move-object v2, v0
-
-    :cond_4
-    check-cast v2, Lk0/a/p;
-
-    if-eqz v2, :cond_5
-
-    iget-object v0, v2, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    :cond_5
-    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v0, p0, Lk0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
-
-    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v3, "Exception in cancellation handler for "
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2, p1}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-static {v0, v1}, Lf/n/a/k/a;->F(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-
-    :goto_1
-    return-void
-
-    :cond_6
-    invoke-virtual {p0, p1, v2}, Lk0/a/g;->l(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_7
-    throw v0
-
-    :cond_8
-    return-void
-
-    :cond_9
-    invoke-virtual {p0, p1, v2}, Lk0/a/g;->l(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
-
-    throw v0
-.end method
-
-.method public c(Lk0/a/v;Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/v;",
-            "TT;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    iget-object v1, p0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    instance-of v2, v1, Lk0/a/f0;
-
-    if-nez v2, :cond_0
-
-    move-object v1, v0
-
-    :cond_0
-    check-cast v1, Lk0/a/f0;
-
-    if-eqz v1, :cond_1
-
-    iget-object v0, v1, Lk0/a/f0;->j:Lk0/a/v;
-
-    :cond_1
-    if-ne v0, p1, :cond_2
-
-    const/4 p1, 0x3
-
-    goto :goto_0
-
-    :cond_2
-    iget p1, p0, Lk0/a/i0;->f:I
-
-    :goto_0
-    invoke-virtual {p0, p2, p1}, Lk0/a/g;->m(Ljava/lang/Object;I)Lk0/a/h;
-
-    return-void
-
-    :cond_3
-    const-string p1, "$this$resumeUndispatched"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public d(Ljava/lang/Object;Ljava/lang/Throwable;)V
-    .locals 3
-
-    if-eqz p2, :cond_1
-
-    instance-of v0, p1, Lk0/a/r;
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    check-cast p1, Lk0/a/r;
-
-    iget-object p1, p1, Lk0/a/r;->b:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    iget-object p2, p0, Lk0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
-
-    new-instance v0, Lkotlinx/coroutines/CompletionHandlerException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Exception in cancellation handler for "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1, p1}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-static {p2, v0}, Lf/n/a/k/a;->F(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-
-    :cond_0
-    :goto_0
-    return-void
-
-    :cond_1
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final e()Lkotlin/coroutines/Continuation;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    return-object v0
-.end method
-
-.method public f(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Object;",
-            ")TT;"
-        }
-    .end annotation
-
-    instance-of v0, p1, Lk0/a/q;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lk0/a/q;
-
-    iget-object p1, p1, Lk0/a/q;->a:Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v0, p1, Lk0/a/r;
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lk0/a/r;
-
-    iget-object p1, p1, Lk0/a/r;->a:Ljava/lang/Object;
-
-    :cond_1
-    :goto_0
-    return-object p1
-.end method
-
-.method public g(Ljava/lang/Throwable;)Z
-    .locals 5
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/i1;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    return v2
-
-    :cond_0
-    new-instance v1, Lk0/a/h;
-
-    instance-of v3, v0, Lk0/a/d;
-
-    invoke-direct {v1, p0, p1, v3}, Lk0/a/h;-><init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
-
-    sget-object v4, Lk0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v4, p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    if-eqz v3, :cond_2
-
-    :try_start_0
-    check-cast v0, Lk0/a/d;
-
-    invoke-virtual {v0, p1}, Lk0/a/e;->a(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v0, p0, Lk0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
-
-    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v4, "Exception in cancellation handler for "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-direct {v1, v3, p1}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-static {v0, v1}, Lf/n/a/k/a;->F(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-
-    :cond_2
-    :goto_1
-    iget-object p1, p0, Lk0/a/g;->parentHandle:Lk0/a/k0;
-
-    if-eqz p1, :cond_3
-
-    invoke-interface {p1}, Lk0/a/k0;->dispose()V
-
-    sget-object p1, Lk0/a/h1;->d:Lk0/a/h1;
-
-    iput-object p1, p0, Lk0/a/g;->parentHandle:Lk0/a/k0;
-
-    :cond_3
-    invoke-virtual {p0, v2}, Lk0/a/g;->j(I)V
-
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-    .locals 2
-
-    iget-object v0, p0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    instance-of v1, v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    check-cast v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    return-object v0
-.end method
-
-.method public getContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
-
-    return-object v0
-.end method
-
-.method public getStackTraceElement()Ljava/lang/StackTraceElement;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public i()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    return-object v0
-.end method
-
-.method public final j(I)V
-    .locals 4
-
-    :cond_0
-    iget v0, p0, Lk0/a/g;->_decision:I
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_2
-
-    if-ne v0, v2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Already resumed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    sget-object v0, Lk0/a/g;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const/4 v3, 0x2
-
-    invoke-virtual {v0, p0, v1, v3}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v1, 0x1
-
-    :goto_0
-    if-eqz v1, :cond_3
-
-    return-void
-
-    :cond_3
-    invoke-static {p0, p1}, Lk0/a/h0;->a(Lk0/a/i0;I)V
-
-    return-void
-.end method
-
-.method public final k()Ljava/lang/Object;
-    .locals 8
-
-    iget-object v0, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    instance-of v0, v0, Lk0/a/i1;
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    sget-object v2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {v0, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v0
-
-    move-object v2, v0
-
-    check-cast v2, Lkotlinx/coroutines/Job;
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v2}, Lkotlinx/coroutines/Job;->start()Z
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    new-instance v5, Lk0/a/i;
-
-    invoke-direct {v5, v2, p0}, Lk0/a/i;-><init>(Lkotlinx/coroutines/Job;Lk0/a/g;)V
-
-    const/4 v6, 0x2
-
-    const/4 v7, 0x0
-
-    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->H(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lk0/a/k0;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lk0/a/g;->parentHandle:Lk0/a/k0;
-
-    iget-object v2, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    instance-of v2, v2, Lk0/a/i1;
-
-    xor-int/2addr v2, v1
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v0}, Lk0/a/k0;->dispose()V
-
-    sget-object v0, Lk0/a/h1;->d:Lk0/a/h1;
-
-    iput-object v0, p0, Lk0/a/g;->parentHandle:Lk0/a/k0;
-
-    :cond_1
-    :goto_0
-    iget v0, p0, Lk0/a/g;->_decision:I
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_3
-
-    const/4 v3, 0x2
-
-    if-ne v0, v3, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Already suspended"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    sget-object v0, Lk0/a/g;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {v0, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const/4 v2, 0x1
-
-    :goto_1
-    if-eqz v2, :cond_4
-
-    sget-object v0, Lj0/k/g/a;->d:Lj0/k/g/a;
-
-    return-object v0
-
-    :cond_4
-    iget-object v0, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    instance-of v2, v0, Lk0/a/p;
-
-    if-nez v2, :cond_7
-
-    iget v2, p0, Lk0/a/i0;->f:I
-
-    if-ne v2, v1, :cond_6
-
-    iget-object v1, p0, Lk0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
-
-    sget-object v2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {v1, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v1
-
-    check-cast v1, Lkotlinx/coroutines/Job;
-
-    if-eqz v1, :cond_6
-
-    invoke-interface {v1}, Lkotlinx/coroutines/Job;->a()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    invoke-interface {v1}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
-
-    move-result-object v1
-
-    invoke-virtual {p0, v0, v1}, Lk0/a/g;->d(Ljava/lang/Object;Ljava/lang/Throwable;)V
-
-    invoke-static {v1, p0}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_6
-    :goto_2
-    invoke-virtual {p0, v0}, Lk0/a/g;->f(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_7
-    check-cast v0, Lk0/a/p;
-
-    iget-object v0, v0, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    invoke-static {v0, p0}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    throw v0
-.end method
-
-.method public final l(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;",
-            "Ljava/lang/Object;",
-            ")V"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "It\'s prohibited to register multiple handlers, tried to register "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ", already has "
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public final m(Ljava/lang/Object;I)Lk0/a/h;
-    .locals 3
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/i1;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    sget-object v1, Lk0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p0, v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p0, Lk0/a/g;->parentHandle:Lk0/a/k0;
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p1}, Lk0/a/k0;->dispose()V
-
-    sget-object p1, Lk0/a/h1;->d:Lk0/a/h1;
-
-    iput-object p1, p0, Lk0/a/g;->parentHandle:Lk0/a/k0;
-
-    :cond_1
-    invoke-virtual {p0, p2}, Lk0/a/g;->j(I)V
-
-    return-object v2
-
-    :cond_2
-    instance-of p2, v0, Lk0/a/h;
-
-    if-eqz p2, :cond_4
-
-    check-cast v0, Lk0/a/h;
-
-    if-eqz v0, :cond_3
-
-    sget-object p2, Lk0/a/h;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p2, v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_4
-
-    return-object v0
-
-    :cond_3
-    throw v2
-
-    :cond_4
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "Already resumed, but proposed with update "
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public resumeWith(Ljava/lang/Object;)V
-    .locals 1
-
-    invoke-static {p1}, Lf/n/a/k/a;->k0(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    iget v0, p0, Lk0/a/i0;->f:I
-
-    invoke-virtual {p0, p1, v0}, Lk0/a/g;->m(Ljava/lang/Object;I)Lk0/a/h;
-
-    return-void
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "CancellableContinuation"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x28
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    invoke-static {v1}, Lf/n/a/k/a;->j0(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "){"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lk0/a/g;->_state:Ljava/lang/Object;
-
-    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-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/g0.smali b/com.discord/smali_classes2/k0/a/g0.smali
deleted file mode 100644
index d80b8324ef..0000000000
--- a/com.discord/smali_classes2/k0/a/g0.smali
+++ /dev/null
@@ -1,124 +0,0 @@
-.class public final Lk0/a/g0;
-.super Lk0/a/r1/t;
-.source "Builders.common.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/r1/t<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
-# instance fields
-.field public volatile _decision:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lk0/a/g0;
-
-    const-string v1, "_decision"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/g0;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext;",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Lk0/a/r1/t;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-
-    const/4 p1, 0x0
-
-    iput p1, p0, Lk0/a/g0;->_decision:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public P()I
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public j(Ljava/lang/Object;I)V
-    .locals 4
-
-    :cond_0
-    iget v0, p0, Lk0/a/g0;->_decision:I
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_2
-
-    if-ne v0, v2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "Already resumed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    sget-object v0, Lk0/a/g0;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const/4 v3, 0x2
-
-    invoke-virtual {v0, p0, v1, v3}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v1, 0x1
-
-    :goto_0
-    if-eqz v1, :cond_3
-
-    return-void
-
-    :cond_3
-    invoke-super {p0, p1, p2}, Lk0/a/r1/t;->j(Ljava/lang/Object;I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/g1.smali b/com.discord/smali_classes2/k0/a/g1.smali
deleted file mode 100644
index c347419319..0000000000
--- a/com.discord/smali_classes2/k0/a/g1.smali
+++ /dev/null
@@ -1,140 +0,0 @@
-.class public final Lk0/a/g1;
-.super Lk0/a/r1/k;
-.source "JobSupport.kt"
-
-# interfaces
-.implements Lk0/a/u0;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/r1/k;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public getList()Lk0/a/g1;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public final i(Ljava/lang/String;)Ljava/lang/String;
-    .locals 4
-
-    const-string v0, "List{"
-
-    const-string v1, "}["
-
-    invoke-static {v0, p1, v1}, Lf/e/b/a/a;->J(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_3
-
-    check-cast v0, Lk0/a/r1/m;
-
-    const/4 v1, 0x1
-
-    :goto_0
-    invoke-static {v0, p0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_2
-
-    instance-of v2, v0, Lk0/a/b1;
-
-    if-eqz v2, :cond_1
-
-    move-object v2, v0
-
-    check-cast v2, Lk0/a/b1;
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    const-string v3, ", "
-
-    invoke-virtual {p1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :goto_1
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    :cond_1
-    invoke-virtual {v0}, Lk0/a/r1/m;->e()Lk0/a/r1/m;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_2
-    const-string v0, "]"
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-
-    :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    sget-boolean v0, Lk0/a/b0;->b:Z
-
-    if-eqz v0, :cond_0
-
-    const-string v0, "Active"
-
-    invoke-virtual {p0, v0}, Lk0/a/g1;->i(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-super {p0}, Lk0/a/r1/m;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/h.smali b/com.discord/smali_classes2/k0/a/h.smali
deleted file mode 100644
index e7bc9b44c8..0000000000
--- a/com.discord/smali_classes2/k0/a/h.smali
+++ /dev/null
@@ -1,78 +0,0 @@
-.class public final Lk0/a/h;
-.super Lk0/a/p;
-.source "CompletedExceptionally.kt"
-
-
-# static fields
-.field public static final c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
-# instance fields
-.field public volatile _resumed:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lk0/a/h;
-
-    const-string v1, "_resumed"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/h;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "*>;",
-            "Ljava/lang/Throwable;",
-            "Z)V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p2, Ljava/util/concurrent/CancellationException;
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Continuation "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, " was cancelled normally"
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
-
-    :goto_0
-    invoke-direct {p0, p2, p3}, Lk0/a/p;-><init>(Ljava/lang/Throwable;Z)V
-
-    const/4 p1, 0x0
-
-    iput p1, p0, Lk0/a/h;->_resumed:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/h0.smali b/com.discord/smali_classes2/k0/a/h0.smali
deleted file mode 100644
index 2db73a1771..0000000000
--- a/com.discord/smali_classes2/k0/a/h0.smali
+++ /dev/null
@@ -1,894 +0,0 @@
-.class public final Lk0/a/h0;
-.super Ljava/lang/Object;
-.source "Dispatched.kt"
-
-
-# static fields
-.field public static final a:Lk0/a/r1/v;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "UNDEFINED"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/h0;->a:Lk0/a/r1/v;
-
-    return-void
-.end method
-
-.method public static final a(Lk0/a/i0;I)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lk0/a/i0<",
-            "-TT;>;I)V"
-        }
-    .end annotation
-
-    move-object v0, p0
-
-    check-cast v0, Lk0/a/g;
-
-    iget-object v0, v0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    const/4 v1, 0x1
-
-    if-eqz p1, :cond_1
-
-    if-ne p1, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 v2, 0x1
-
-    :goto_1
-    if-eqz v2, :cond_5
-
-    instance-of v2, v0, Lk0/a/f0;
-
-    if-eqz v2, :cond_5
-
-    invoke-static {p1}, Lf/n/a/k/a;->J(I)Z
-
-    move-result v2
-
-    iget v3, p0, Lk0/a/i0;->f:I
-
-    invoke-static {v3}, Lf/n/a/k/a;->J(I)Z
-
-    move-result v3
-
-    if-ne v2, v3, :cond_5
-
-    move-object p1, v0
-
-    check-cast p1, Lk0/a/f0;
-
-    iget-object p1, p1, Lk0/a/f0;->j:Lk0/a/v;
-
-    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lk0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {p1, v0, p0}, Lk0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-
-    goto :goto_3
-
-    :cond_2
-    sget-object p1, Lk0/a/n1;->b:Lk0/a/n1;
-
-    invoke-static {}, Lk0/a/n1;->a()Lk0/a/n0;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lk0/a/n0;->A()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {p1, p0}, Lk0/a/n0;->x(Lk0/a/i0;)V
-
-    goto :goto_3
-
-    :cond_3
-    invoke-virtual {p1, v1}, Lk0/a/n0;->z(Z)V
-
-    :try_start_0
-    move-object v0, p0
-
-    check-cast v0, Lk0/a/g;
-
-    iget-object v0, v0, Lk0/a/g;->h:Lkotlin/coroutines/Continuation;
-
-    const/4 v2, 0x3
-
-    invoke-static {p0, v0, v2}, Lk0/a/h0;->b(Lk0/a/i0;Lkotlin/coroutines/Continuation;I)V
-
-    :cond_4
-    invoke-virtual {p1}, Lk0/a/n0;->C()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_4
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception v0
-
-    const/4 v2, 0x0
-
-    :try_start_1
-    invoke-virtual {p0, v0, v2}, Lk0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :goto_2
-    invoke-virtual {p1, v1}, Lk0/a/n0;->v(Z)V
-
-    goto :goto_3
-
-    :catchall_1
-    move-exception p0
-
-    invoke-virtual {p1, v1}, Lk0/a/n0;->v(Z)V
-
-    throw p0
-
-    :cond_5
-    invoke-static {p0, v0, p1}, Lk0/a/h0;->b(Lk0/a/i0;Lkotlin/coroutines/Continuation;I)V
-
-    :goto_3
-    return-void
-.end method
-
-.method public static final b(Lk0/a/i0;Lkotlin/coroutines/Continuation;I)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lk0/a/i0<",
-            "-TT;>;",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;I)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_e
-
-    invoke-virtual {p0}, Lk0/a/i0;->i()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lk0/a/p;
-
-    if-nez v2, :cond_0
-
-    move-object v2, v0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v2, v1
-
-    :goto_0
-    check-cast v2, Lk0/a/p;
-
-    if-eqz v2, :cond_1
-
-    iget-object v0, v2, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    :cond_1
-    const-string v2, "Invalid mode "
-
-    const/4 v3, 0x4
-
-    const/4 v4, 0x3
-
-    const/4 v5, 0x2
-
-    const/4 v6, 0x1
-
-    if-eqz v0, :cond_8
-
-    instance-of p0, p1, Lk0/a/i0;
-
-    if-eqz p0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    invoke-static {v0, p1}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    :goto_1
-    if-eqz p2, :cond_7
-
-    if-eq p2, v6, :cond_6
-
-    if-eq p2, v5, :cond_5
-
-    if-eq p2, v4, :cond_4
-
-    if-ne p2, v3, :cond_3
-
-    goto/16 :goto_2
-
-    :cond_3
-    invoke-static {v2, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    check-cast p1, Lk0/a/f0;
-
-    invoke-virtual {p1}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p0
-
-    iget-object p2, p1, Lk0/a/f0;->i:Ljava/lang/Object;
-
-    invoke-static {p0, p2}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    :try_start_0
-    iget-object p1, p1, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-static {v0, p1}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-interface {p1, v0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-static {p0, p2}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p0, p2}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_5
-    invoke-static {p1, v0}, Lk0/a/h0;->f(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :cond_6
-    invoke-static {p1, v0}, Lk0/a/h0;->d(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :cond_7
-    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-interface {p1, p0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_2
-
-    :cond_8
-    invoke-virtual {p0, v1}, Lk0/a/i0;->f(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p2, :cond_d
-
-    if-eq p2, v6, :cond_c
-
-    if-eq p2, v5, :cond_b
-
-    if-eq p2, v4, :cond_a
-
-    if-ne p2, v3, :cond_9
-
-    goto :goto_2
-
-    :cond_9
-    invoke-static {v2, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_a
-    check-cast p1, Lk0/a/f0;
-
-    invoke-virtual {p1}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p2
-
-    iget-object v0, p1, Lk0/a/f0;->i:Ljava/lang/Object;
-
-    invoke-static {p2, v0}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :try_start_1
-    iget-object p1, p1, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {p1, p0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    invoke-static {p2, v0}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    goto :goto_2
-
-    :catchall_1
-    move-exception p0
-
-    invoke-static {p2, v0}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p0
-
-    :cond_b
-    invoke-static {p1, p0}, Lk0/a/h0;->e(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
-
-    goto :goto_2
-
-    :cond_c
-    invoke-static {p1, p0}, Lk0/a/h0;->c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
-
-    goto :goto_2
-
-    :cond_d
-    invoke-interface {p1, p0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    :goto_2
-    return-void
-
-    :cond_e
-    const-string p0, "delegate"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;TT;)V"
-        }
-    .end annotation
-
-    instance-of v0, p0, Lk0/a/f0;
-
-    if-eqz v0, :cond_4
-
-    check-cast p0, Lk0/a/f0;
-
-    iget-object v0, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lk0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-object p1, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    iput v1, p0, Lk0/a/i0;->f:I
-
-    iget-object p1, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0, p0}, Lk0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-
-    goto :goto_3
-
-    :cond_0
-    sget-object v0, Lk0/a/n1;->b:Lk0/a/n1;
-
-    invoke-static {}, Lk0/a/n1;->a()Lk0/a/n0;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lk0/a/n0;->A()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    iput-object p1, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    iput v1, p0, Lk0/a/i0;->f:I
-
-    invoke-virtual {v0, p0}, Lk0/a/n0;->x(Lk0/a/i0;)V
-
-    goto :goto_3
-
-    :cond_1
-    invoke-virtual {v0, v1}, Lk0/a/n0;->z(Z)V
-
-    :try_start_0
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v2
-
-    sget-object v3, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {v2, v3}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlinx/coroutines/Job;
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v2}, Lkotlinx/coroutines/Job;->a()Z
-
-    move-result v3
-
-    if-nez v3, :cond_2
-
-    invoke-interface {v2}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
-
-    move-result-object v2
-
-    invoke-static {v2}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-virtual {p0, v2}, Lk0/a/f0;->resumeWith(Ljava/lang/Object;)V
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v2, 0x0
-
-    :goto_0
-    if-nez v2, :cond_3
-
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lk0/a/f0;->i:Ljava/lang/Object;
-
-    invoke-static {v2, v3}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v4, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {v4, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    invoke-static {v2, v3}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {v2, v3}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_3
-    :goto_1
-    invoke-virtual {v0}, Lk0/a/n0;->C()Z
-
-    move-result p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-nez p1, :cond_3
-
-    goto :goto_2
-
-    :catchall_1
-    move-exception p1
-
-    const/4 v2, 0x0
-
-    :try_start_3
-    invoke-virtual {p0, p1, v2}, Lk0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    :goto_2
-    invoke-virtual {v0, v1}, Lk0/a/n0;->v(Z)V
-
-    goto :goto_3
-
-    :catchall_2
-    move-exception p0
-
-    invoke-virtual {v0, v1}, Lk0/a/n0;->v(Z)V
-
-    throw p0
-
-    :cond_4
-    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    :goto_3
-    return-void
-.end method
-
-.method public static final d(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;",
-            "Ljava/lang/Throwable;",
-            ")V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    instance-of v1, p0, Lk0/a/f0;
-
-    if-eqz v1, :cond_4
-
-    check-cast p0, Lk0/a/f0;
-
-    iget-object v1, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {v1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v1
-
-    new-instance v2, Lk0/a/p;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x2
-
-    invoke-direct {v2, p1, v3, v4}, Lk0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
-
-    iget-object v5, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    invoke-virtual {v5, v1}, Lk0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-
-    move-result v5
-
-    const/4 v6, 0x1
-
-    if-eqz v5, :cond_0
-
-    new-instance v0, Lk0/a/p;
-
-    invoke-direct {v0, p1, v3, v4}, Lk0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
-
-    iput-object v0, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    iput v6, p0, Lk0/a/i0;->f:I
-
-    iget-object p1, p0, Lk0/a/f0;->j:Lk0/a/v;
-
-    invoke-virtual {p1, v1, p0}, Lk0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-
-    goto/16 :goto_2
-
-    :cond_0
-    sget-object v1, Lk0/a/n1;->b:Lk0/a/n1;
-
-    invoke-static {}, Lk0/a/n1;->a()Lk0/a/n0;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lk0/a/n0;->A()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    iput-object v2, p0, Lk0/a/f0;->g:Ljava/lang/Object;
-
-    iput v6, p0, Lk0/a/i0;->f:I
-
-    invoke-virtual {v1, p0}, Lk0/a/n0;->x(Lk0/a/i0;)V
-
-    goto :goto_2
-
-    :cond_1
-    invoke-virtual {v1, v6}, Lk0/a/n0;->z(Z)V
-
-    :try_start_0
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v2
-
-    sget-object v4, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {v2, v4}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlinx/coroutines/Job;
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v2}, Lkotlinx/coroutines/Job;->a()Z
-
-    move-result v4
-
-    if-nez v4, :cond_2
-
-    invoke-interface {v2}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
-
-    move-result-object v2
-
-    invoke-static {v2}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-virtual {p0, v2}, Lk0/a/f0;->resumeWith(Ljava/lang/Object;)V
-
-    const/4 v3, 0x1
-
-    :cond_2
-    if-nez v3, :cond_3
-
-    invoke-virtual {p0}, Lk0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lk0/a/f0;->i:Ljava/lang/Object;
-
-    invoke-static {v2, v3}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v4, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-static {p1, v4}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {v4, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    invoke-static {v2, v3}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {v2, v3}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_3
-    :goto_0
-    invoke-virtual {v1}, Lk0/a/n0;->C()Z
-
-    move-result p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-nez p1, :cond_3
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_3
-    invoke-virtual {p0, p1, v0}, Lk0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    :goto_1
-    invoke-virtual {v1, v6}, Lk0/a/n0;->v(Z)V
-
-    goto :goto_2
-
-    :catchall_2
-    move-exception p0
-
-    invoke-virtual {v1, v6}, Lk0/a/n0;->v(Z)V
-
-    throw p0
-
-    :cond_4
-    invoke-static {p1, p0}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    :goto_2
-    return-void
-
-    :cond_5
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final e(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;TT;)V"
-        }
-    .end annotation
-
-    instance-of v0, p0, Lk0/a/f0;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Lk0/a/f0;
-
-    iget-object p0, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public static final f(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;",
-            "Ljava/lang/Throwable;",
-            ")V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_1
-
-    instance-of v0, p0, Lk0/a/f0;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Lk0/a/f0;
-
-    iget-object p0, p0, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-static {p1, p0}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1, p0}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    :goto_0
-    return-void
-
-    :cond_1
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/h1.smali b/com.discord/smali_classes2/k0/a/h1.smali
deleted file mode 100644
index 32cc2cc99d..0000000000
--- a/com.discord/smali_classes2/k0/a/h1.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public final Lk0/a/h1;
-.super Ljava/lang/Object;
-.source "Job.kt"
-
-# interfaces
-.implements Lk0/a/k0;
-.implements Lk0/a/j;
-
-
-# static fields
-.field public static final d:Lk0/a/h1;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/h1;
-
-    invoke-direct {v0}, Lk0/a/h1;-><init>()V
-
-    sput-object v0, Lk0/a/h1;->d:Lk0/a/h1;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public dispose()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public h(Ljava/lang/Throwable;)Z
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_0
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "NonDisposableHandle"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/i.smali b/com.discord/smali_classes2/k0/a/i.smali
deleted file mode 100644
index 317a3964f6..0000000000
--- a/com.discord/smali_classes2/k0/a/i.smali
+++ /dev/null
@@ -1,114 +0,0 @@
-.class public final Lk0/a/i;
-.super Lk0/a/z0;
-.source "JobSupport.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/z0<",
-        "Lkotlinx/coroutines/Job;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final h:Lk0/a/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lk0/a/g<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlinx/coroutines/Job;Lk0/a/g;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlinx/coroutines/Job;",
-            "Lk0/a/g<",
-            "*>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lk0/a/z0;-><init>(Lkotlinx/coroutines/Job;)V
-
-    iput-object p2, p0, Lk0/a/i;->h:Lk0/a/g;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public i(Ljava/lang/Throwable;)V
-    .locals 2
-
-    iget-object p1, p0, Lk0/a/i;->h:Lk0/a/g;
-
-    iget-object v0, p0, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lk0/a/g;->g(Ljava/lang/Throwable;)Z
-
-    return-void
-
-    :cond_0
-    const-string p1, "parent"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    throw v1
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lk0/a/i;->i(Ljava/lang/Throwable;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "ChildContinuation["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/i;->h:Lk0/a/g;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/i0.smali b/com.discord/smali_classes2/k0/a/i0.smali
deleted file mode 100644
index 629d04f575..0000000000
--- a/com.discord/smali_classes2/k0/a/i0.smali
+++ /dev/null
@@ -1,363 +0,0 @@
-.class public abstract Lk0/a/i0;
-.super Lk0/a/s1/h;
-.source "Dispatched.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/s1/h;"
-    }
-.end annotation
-
-
-# instance fields
-.field public f:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/s1/h;-><init>()V
-
-    iput p1, p0, Lk0/a/i0;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public d(Ljava/lang/Object;Ljava/lang/Throwable;)V
-    .locals 0
-
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public abstract e()Lkotlin/coroutines/Continuation;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-.end method
-
-.method public f(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Object;",
-            ")TT;"
-        }
-    .end annotation
-
-    return-object p1
-.end method
-
-.method public final h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-    .locals 2
-
-    if-nez p1, :cond_0
-
-    if-nez p2, :cond_0
-
-    return-void
-
-    :cond_0
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_1
-
-    invoke-static {p1, p2}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    :cond_1
-    if-eqz p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    move-object p1, p2
-
-    :goto_0
-    new-instance p2, Lk0/a/a0;
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Fatal exception in coroutines machinery for "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p0}, 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;
-
-    const-string v1, "Please read KDoc to \'handleFatalException\' method and report this incident to maintainers"
-
-    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
-
-    if-eqz p1, :cond_3
-
-    invoke-direct {p2, v0, p1}, Lk0/a/a0;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lk0/a/i0;->e()Lkotlin/coroutines/Continuation;
-
-    move-result-object p1
-
-    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    invoke-static {p1, p2}, Lf/n/a/k/a;->F(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public abstract i()Ljava/lang/Object;
-.end method
-
-.method public final run()V
-    .locals 9
-
-    iget-object v0, p0, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    :try_start_0
-    invoke-virtual {p0}, Lk0/a/i0;->e()Lkotlin/coroutines/Continuation;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_5
-
-    check-cast v1, Lk0/a/f0;
-
-    iget-object v2, v1, Lk0/a/f0;->k:Lkotlin/coroutines/Continuation;
-
-    invoke-interface {v2}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object v3
-
-    invoke-virtual {p0}, Lk0/a/i0;->i()Ljava/lang/Object;
-
-    move-result-object v4
-
-    iget-object v1, v1, Lk0/a/f0;->i:Ljava/lang/Object;
-
-    invoke-static {v3, v1}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :try_start_1
-    instance-of v5, v4, Lk0/a/p;
-
-    const/4 v6, 0x0
-
-    if-nez v5, :cond_0
-
-    move-object v5, v6
-
-    goto :goto_0
-
-    :cond_0
-    move-object v5, v4
-
-    :goto_0
-    check-cast v5, Lk0/a/p;
-
-    if-eqz v5, :cond_1
-
-    iget-object v5, v5, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    goto :goto_1
-
-    :cond_1
-    move-object v5, v6
-
-    :goto_1
-    iget v7, p0, Lk0/a/i0;->f:I
-
-    invoke-static {v7}, Lf/n/a/k/a;->J(I)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_2
-
-    sget-object v7, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
-
-    invoke-interface {v3, v7}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v7
-
-    check-cast v7, Lkotlinx/coroutines/Job;
-
-    goto :goto_2
-
-    :cond_2
-    move-object v7, v6
-
-    :goto_2
-    if-nez v5, :cond_3
-
-    if-eqz v7, :cond_3
-
-    invoke-interface {v7}, Lkotlinx/coroutines/Job;->a()Z
-
-    move-result v8
-
-    if-nez v8, :cond_3
-
-    invoke-interface {v7}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
-
-    move-result-object v5
-
-    invoke-virtual {p0, v4, v5}, Lk0/a/i0;->d(Ljava/lang/Object;Ljava/lang/Throwable;)V
-
-    invoke-static {v5, v2}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object v4
-
-    invoke-static {v4}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-interface {v2, v4}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_3
-
-    :cond_3
-    if-eqz v5, :cond_4
-
-    invoke-static {v5, v2}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object v4
-
-    invoke-static {v4}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-interface {v2, v4}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_3
-
-    :cond_4
-    invoke-virtual {p0, v4}, Lk0/a/i0;->f(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-interface {v2, v4}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :goto_3
-    :try_start_2
-    invoke-static {v3, v1}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    :try_start_3
-    invoke-interface {v0}, Lk0/a/s1/i;->c()V
-
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    goto :goto_4
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_4
-    invoke-static {v0}, Lj0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v6, v0}, Lk0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    goto :goto_6
-
-    :catchall_1
-    move-exception v2
-
-    :try_start_4
-    invoke-static {v3, v1}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw v2
-
-    :cond_5
-    new-instance v1, Lkotlin/TypeCastException;
-
-    const-string v2, "null cannot be cast to non-null type kotlinx.coroutines.DispatchedContinuation<T>"
-
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    :catchall_2
-    move-exception v1
-
-    :try_start_5
-    invoke-interface {v0}, Lk0/a/s1/i;->c()V
-
-    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_3
-
-    goto :goto_5
-
-    :catchall_3
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_5
-    invoke-static {v0}, Lj0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v1, v0}, Lk0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
-
-    :goto_6
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/i1.smali b/com.discord/smali_classes2/k0/a/i1.smali
deleted file mode 100644
index 6f215b69e2..0000000000
--- a/com.discord/smali_classes2/k0/a/i1.smali
+++ /dev/null
@@ -1,3 +0,0 @@
-.class public interface abstract Lk0/a/i1;
-.super Ljava/lang/Object;
-.source "CancellableContinuationImpl.kt"
diff --git a/com.discord/smali_classes2/k0/a/j.smali b/com.discord/smali_classes2/k0/a/j.smali
deleted file mode 100644
index 2e85038914..0000000000
--- a/com.discord/smali_classes2/k0/a/j.smali
+++ /dev/null
@@ -1,11 +0,0 @@
-.class public interface abstract Lk0/a/j;
-.super Ljava/lang/Object;
-.source "Job.kt"
-
-# interfaces
-.implements Lk0/a/k0;
-
-
-# virtual methods
-.method public abstract h(Ljava/lang/Throwable;)Z
-.end method
diff --git a/com.discord/smali_classes2/k0/a/j0.smali b/com.discord/smali_classes2/k0/a/j0.smali
deleted file mode 100644
index 1f61657dad..0000000000
--- a/com.discord/smali_classes2/k0/a/j0.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public final Lk0/a/j0;
-.super Ljava/lang/Object;
-.source "Dispatchers.kt"
-
-
-# static fields
-.field public static final a:Lk0/a/v;
-
-.field public static final b:Lk0/a/v;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    sget-boolean v0, Lk0/a/u;->a:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object v0, Lk0/a/s1/b;->j:Lk0/a/s1/b;
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Lk0/a/m;->e:Lk0/a/m;
-
-    :goto_0
-    sput-object v0, Lk0/a/j0;->a:Lk0/a/v;
-
-    sget-object v0, Lk0/a/o1;->d:Lk0/a/o1;
-
-    sget-object v0, Lk0/a/s1/b;->j:Lk0/a/s1/b;
-
-    if-eqz v0, :cond_1
-
-    sget-object v0, Lk0/a/s1/b;->i:Lk0/a/v;
-
-    sput-object v0, Lk0/a/j0;->b:Lk0/a/v;
-
-    return-void
-
-    :cond_1
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public static final a()Lk0/a/f1;
-    .locals 1
-
-    sget-object v0, Lk0/a/r1/p;->b:Lk0/a/f1;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/j1.smali b/com.discord/smali_classes2/k0/a/j1.smali
deleted file mode 100644
index 1352e94686..0000000000
--- a/com.discord/smali_classes2/k0/a/j1.smali
+++ /dev/null
@@ -1,11 +0,0 @@
-.class public interface abstract Lk0/a/j1;
-.super Ljava/lang/Object;
-.source "Job.kt"
-
-# interfaces
-.implements Lkotlinx/coroutines/Job;
-
-
-# virtual methods
-.method public abstract n()Ljava/util/concurrent/CancellationException;
-.end method
diff --git a/com.discord/smali_classes2/k0/a/k.smali b/com.discord/smali_classes2/k0/a/k.smali
deleted file mode 100644
index 3a682b5757..0000000000
--- a/com.discord/smali_classes2/k0/a/k.smali
+++ /dev/null
@@ -1,110 +0,0 @@
-.class public final Lk0/a/k;
-.super Lk0/a/z0;
-.source "JobSupport.kt"
-
-# interfaces
-.implements Lk0/a/j;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/z0<",
-        "Lk0/a/c1;",
-        ">;",
-        "Lk0/a/j;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final h:Lk0/a/l;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/c1;Lk0/a/l;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lk0/a/z0;-><init>(Lkotlinx/coroutines/Job;)V
-
-    iput-object p2, p0, Lk0/a/k;->h:Lk0/a/l;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public h(Ljava/lang/Throwable;)Z
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    check-cast v0, Lk0/a/c1;
-
-    invoke-virtual {v0, p1}, Lk0/a/c1;->o(Ljava/lang/Throwable;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public i(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object p1, p0, Lk0/a/k;->h:Lk0/a/l;
-
-    iget-object v0, p0, Lk0/a/b1;->g:Lkotlinx/coroutines/Job;
-
-    check-cast v0, Lk0/a/j1;
-
-    invoke-interface {p1, v0}, Lk0/a/l;->f(Lk0/a/j1;)V
-
-    return-void
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lk0/a/k;->i(Ljava/lang/Throwable;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "ChildHandle["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/k;->h:Lk0/a/l;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/k0.smali b/com.discord/smali_classes2/k0/a/k0.smali
deleted file mode 100644
index bd7dc12603..0000000000
--- a/com.discord/smali_classes2/k0/a/k0.smali
+++ /dev/null
@@ -1,8 +0,0 @@
-.class public interface abstract Lk0/a/k0;
-.super Ljava/lang/Object;
-.source "Job.kt"
-
-
-# virtual methods
-.method public abstract dispose()V
-.end method
diff --git a/com.discord/smali_classes2/k0/a/k1.smali b/com.discord/smali_classes2/k0/a/k1.smali
deleted file mode 100644
index 15f199cd83..0000000000
--- a/com.discord/smali_classes2/k0/a/k1.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public Lk0/a/k1;
-.super Lk0/a/a;
-.source "Builders.common.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/a<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Z)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0, p1, p2}, Lk0/a/a;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "parentContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public y(Ljava/lang/Throwable;)Z
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lk0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-static {v0, p1}, Lf/n/a/k/a;->F(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/l.smali b/com.discord/smali_classes2/k0/a/l.smali
deleted file mode 100644
index 2e05deb6eb..0000000000
--- a/com.discord/smali_classes2/k0/a/l.smali
+++ /dev/null
@@ -1,11 +0,0 @@
-.class public interface abstract Lk0/a/l;
-.super Ljava/lang/Object;
-.source "Job.kt"
-
-# interfaces
-.implements Lkotlinx/coroutines/Job;
-
-
-# virtual methods
-.method public abstract f(Lk0/a/j1;)V
-.end method
diff --git a/com.discord/smali_classes2/k0/a/l0.smali b/com.discord/smali_classes2/k0/a/l0.smali
deleted file mode 100644
index 31d54feac0..0000000000
--- a/com.discord/smali_classes2/k0/a/l0.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.class public final Lk0/a/l0;
-.super Lk0/a/d;
-.source "CancellableContinuation.kt"
-
-
-# instance fields
-.field public final d:Lk0/a/k0;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/k0;)V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/d;-><init>()V
-
-    iput-object p1, p0, Lk0/a/l0;->d:Lk0/a/k0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iget-object p1, p0, Lk0/a/l0;->d:Lk0/a/k0;
-
-    invoke-interface {p1}, Lk0/a/k0;->dispose()V
-
-    return-void
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    iget-object p1, p0, Lk0/a/l0;->d:Lk0/a/k0;
-
-    invoke-interface {p1}, Lk0/a/k0;->dispose()V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "DisposeOnCancel["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/l0;->d:Lk0/a/k0;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/l1.smali b/com.discord/smali_classes2/k0/a/l1.smali
deleted file mode 100644
index f15bff67f3..0000000000
--- a/com.discord/smali_classes2/k0/a/l1.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-.class public final Lk0/a/l1;
-.super Lk0/a/a1;
-.source "Supervisor.kt"
-
-
-# direct methods
-.method public constructor <init>(Lkotlinx/coroutines/Job;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lk0/a/a1;-><init>(Lkotlinx/coroutines/Job;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public o(Ljava/lang/Throwable;)Z
-    .locals 0
-
-    const/4 p1, 0x0
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/m$a.smali b/com.discord/smali_classes2/k0/a/m$a.smali
deleted file mode 100644
index 813bd790dd..0000000000
--- a/com.discord/smali_classes2/k0/a/m$a.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lk0/a/m$a;
-.super Ljava/lang/Object;
-.source "CommonPool.kt"
-
-# interfaces
-.implements Ljava/util/concurrent/ThreadFactory;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lk0/a/m;->v()Ljava/util/concurrent/ExecutorService;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
-    .locals 0
-
-    iput-object p1, p0, Lk0/a/m$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
-    .locals 3
-
-    new-instance v0, Ljava/lang/Thread;
-
-    const-string v1, "CommonPool-worker-"
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lk0/a/m$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, p1, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
-
-    const/4 p1, 0x1
-
-    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setDaemon(Z)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/m.smali b/com.discord/smali_classes2/k0/a/m.smali
deleted file mode 100644
index 8c0294fb75..0000000000
--- a/com.discord/smali_classes2/k0/a/m.smali
+++ /dev/null
@@ -1,504 +0,0 @@
-.class public final Lk0/a/m;
-.super Lk0/a/r0;
-.source "CommonPool.kt"
-
-
-# static fields
-.field public static final d:I
-
-.field public static final e:Lk0/a/m;
-
-.field public static volatile pool:Ljava/util/concurrent/Executor;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    new-instance v0, Lk0/a/m;
-
-    invoke-direct {v0}, Lk0/a/m;-><init>()V
-
-    sput-object v0, Lk0/a/m;->e:Lk0/a/m;
-
-    :try_start_0
-    const-string v0, "kotlinx.coroutines.default.parallelism"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    invoke-static {v0}, Lj0/t/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    if-lt v2, v3, :cond_0
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    goto :goto_1
-
-    :cond_0
-    const-string v1, "Expected positive number in kotlinx.coroutines.default.parallelism, but has "
-
-    invoke-static {v1, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const/4 v0, -0x1
-
-    :goto_1
-    sput v0, Lk0/a/m;->d:I
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/r0;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public close()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Close cannot be invoked on CommonPool"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 1
-
-    const-string v0, "context"
-
-    if-eqz p1, :cond_2
-
-    :try_start_0
-    sget-object p1, Lk0/a/m;->pool:Ljava/util/concurrent/Executor;
-
-    if-eqz p1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    monitor-enter p0
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :try_start_1
-    sget-object p1, Lk0/a/m;->pool:Ljava/util/concurrent/Executor;
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Lk0/a/m;->w()Ljava/util/concurrent/ExecutorService;
-
-    move-result-object p1
-
-    sput-object p1, Lk0/a/m;->pool:Ljava/util/concurrent/Executor;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    :try_start_2
-    monitor-exit p0
-
-    :goto_1
-    invoke-interface {p1, p2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-    :try_end_2
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_2 .. :try_end_2} :catch_0
-
-    :catch_0
-    sget-object p1, Lk0/a/c0;->j:Lk0/a/c0;
-
-    invoke-virtual {p1, p2}, Lk0/a/o0;->F(Ljava/lang/Runnable;)V
-
-    :goto_2
-    return-void
-
-    :cond_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "CommonPool"
-
-    return-object v0
-.end method
-
-.method public final v()Ljava/util/concurrent/ExecutorService;
-    .locals 3
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    invoke-virtual {p0}, Lk0/a/m;->x()I
-
-    move-result v1
-
-    new-instance v2, Lk0/a/m$a;
-
-    invoke-direct {v2, v0}, Lk0/a/m$a;-><init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
-
-    invoke-static {v1, v2}, Ljava/util/concurrent/Executors;->newFixedThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;
-
-    move-result-object v0
-
-    const-string v1, "Executors.newFixedThread\u2026Daemon = true }\n        }"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public final w()Ljava/util/concurrent/ExecutorService;
-    .locals 7
-
-    invoke-static {}, Ljava/lang/System;->getSecurityManager()Ljava/lang/SecurityManager;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lk0/a/m;->v()Ljava/util/concurrent/ExecutorService;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :try_start_0
-    const-string v1, "java.util.concurrent.ForkJoinPool"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-object v1, v0
-
-    :goto_0
-    if-eqz v1, :cond_a
-
-    sget v2, Lk0/a/m;->d:I
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    if-gez v2, :cond_7
-
-    :try_start_1
-    const-string v2, "commonPool"
-
-    new-array v5, v4, [Ljava/lang/Class;
-
-    invoke-virtual {v1, v2, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_1
-
-    new-array v5, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v2, v0, v5}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    goto :goto_1
-
-    :cond_1
-    move-object v2, v0
-
-    :goto_1
-    instance-of v5, v2, Ljava/util/concurrent/ExecutorService;
-
-    if-nez v5, :cond_2
-
-    move-object v2, v0
-
-    :cond_2
-    check-cast v2, Ljava/util/concurrent/ExecutorService;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    goto :goto_2
-
-    :catchall_1
-    move-object v2, v0
-
-    :goto_2
-    if-eqz v2, :cond_7
-
-    sget-object v5, Lk0/a/m;->e:Lk0/a/m;
-
-    if-eqz v5, :cond_6
-
-    sget-object v5, Lk0/a/n;->d:Lk0/a/n;
-
-    invoke-interface {v2, v5}, Ljava/util/concurrent/ExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
-
-    :try_start_2
-    const-string v5, "getPoolSize"
-
-    new-array v6, v4, [Ljava/lang/Class;
-
-    invoke-virtual {v1, v5, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v5
-
-    new-array v6, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v5, v2, v6}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    instance-of v6, v5, Ljava/lang/Integer;
-
-    if-nez v6, :cond_3
-
-    move-object v5, v0
-
-    :cond_3
-    check-cast v5, Ljava/lang/Integer;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    goto :goto_3
-
-    :catchall_2
-    move-object v5, v0
-
-    :goto_3
-    if-eqz v5, :cond_4
-
-    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
-
-    move-result v5
-
-    if-lt v5, v3, :cond_4
-
-    const/4 v5, 0x1
-
-    goto :goto_4
-
-    :cond_4
-    const/4 v5, 0x0
-
-    :goto_4
-    if-eqz v5, :cond_5
-
-    goto :goto_5
-
-    :cond_5
-    move-object v2, v0
-
-    :goto_5
-    if-eqz v2, :cond_7
-
-    return-object v2
-
-    :cond_6
-    throw v0
-
-    :cond_7
-    :try_start_3
-    new-array v2, v3, [Ljava/lang/Class;
-
-    sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    aput-object v5, v2, v4
-
-    invoke-virtual {v1, v2}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object v1
-
-    new-array v2, v3, [Ljava/lang/Object;
-
-    sget-object v3, Lk0/a/m;->e:Lk0/a/m;
-
-    invoke-virtual {v3}, Lk0/a/m;->x()I
-
-    move-result v3
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v3
-
-    aput-object v3, v2, v4
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Ljava/util/concurrent/ExecutorService;
-
-    if-nez v2, :cond_8
-
-    move-object v1, v0
-
-    :cond_8
-    check-cast v1, Ljava/util/concurrent/ExecutorService;
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_3
-
-    move-object v0, v1
-
-    goto :goto_6
-
-    :catchall_3
-    nop
-
-    :goto_6
-    if-eqz v0, :cond_9
-
-    return-object v0
-
-    :cond_9
-    invoke-virtual {p0}, Lk0/a/m;->v()Ljava/util/concurrent/ExecutorService;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_a
-    invoke-virtual {p0}, Lk0/a/m;->v()Ljava/util/concurrent/ExecutorService;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final x()I
-    .locals 3
-
-    sget v0, Lk0/a/m;->d:I
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-lez v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    goto :goto_3
-
-    :cond_2
-    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
-
-    move-result v0
-
-    sub-int/2addr v0, v2
-
-    if-ge v0, v2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    move v2, v0
-
-    :goto_2
-    move v0, v2
-
-    :goto_3
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/m0.smali b/com.discord/smali_classes2/k0/a/m0.smali
deleted file mode 100644
index 45ef93f4f9..0000000000
--- a/com.discord/smali_classes2/k0/a/m0.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class public final Lk0/a/m0;
-.super Ljava/lang/Object;
-.source "JobSupport.kt"
-
-# interfaces
-.implements Lk0/a/u0;
-
-
-# instance fields
-.field public final d:Z
-
-
-# direct methods
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Lk0/a/m0;->d:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lk0/a/m0;->d:Z
-
-    return v0
-.end method
-
-.method public getList()Lk0/a/g1;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "Empty{"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-boolean v1, p0, Lk0/a/m0;->d:Z
-
-    if-eqz v1, :cond_0
-
-    const-string v1, "Active"
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "New"
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x7d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/m1.smali b/com.discord/smali_classes2/k0/a/m1.smali
deleted file mode 100644
index 3884abea9f..0000000000
--- a/com.discord/smali_classes2/k0/a/m1.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public interface abstract Lk0/a/m1;
-.super Ljava/lang/Object;
-.source "ThreadContextElement.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<S:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/CoroutineContext$a;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext;",
-            "TS;)V"
-        }
-    .end annotation
-.end method
-
-.method public abstract r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext;",
-            ")TS;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/k0/a/n.smali b/com.discord/smali_classes2/k0/a/n.smali
deleted file mode 100644
index 4003985a98..0000000000
--- a/com.discord/smali_classes2/k0/a/n.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final Lk0/a/n;
-.super Ljava/lang/Object;
-.source "CommonPool.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# static fields
-.field public static final d:Lk0/a/n;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/n;
-
-    invoke-direct {v0}, Lk0/a/n;-><init>()V
-
-    sput-object v0, Lk0/a/n;->d:Lk0/a/n;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/n0.smali b/com.discord/smali_classes2/k0/a/n0.smali
deleted file mode 100644
index 0b04e03166..0000000000
--- a/com.discord/smali_classes2/k0/a/n0.smali
+++ /dev/null
@@ -1,470 +0,0 @@
-.class public abstract Lk0/a/n0;
-.super Lk0/a/v;
-.source "EventLoop.common.kt"
-
-
-# instance fields
-.field public d:J
-
-.field public e:Z
-
-.field public f:Lk0/a/r1/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lk0/a/r1/a<",
-            "Lk0/a/i0<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/v;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final A()Z
-    .locals 6
-
-    iget-wide v0, p0, Lk0/a/n0;->d:J
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p0, v2}, Lk0/a/n0;->w(Z)J
-
-    move-result-wide v3
-
-    cmp-long v5, v0, v3
-
-    if-ltz v5, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    return v2
-.end method
-
-.method public final C()Z
-    .locals 7
-
-    iget-object v0, p0, Lk0/a/n0;->f:Lk0/a/r1/a;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_3
-
-    iget v2, v0, Lk0/a/r1/a;->b:I
-
-    iget v3, v0, Lk0/a/r1/a;->c:I
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x1
-
-    if-ne v2, v3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v3, v0, Lk0/a/r1/a;->a:[Ljava/lang/Object;
-
-    aget-object v6, v3, v2
-
-    aput-object v4, v3, v2
-
-    add-int/2addr v2, v5
-
-    array-length v3, v3
-
-    add-int/lit8 v3, v3, -0x1
-
-    and-int/2addr v2, v3
-
-    iput v2, v0, Lk0/a/r1/a;->b:I
-
-    if-eqz v6, :cond_2
-
-    move-object v4, v6
-
-    :goto_0
-    check-cast v4, Lk0/a/i0;
-
-    if-eqz v4, :cond_1
-
-    invoke-virtual {v4}, Lk0/a/i0;->run()V
-
-    return v5
-
-    :cond_1
-    return v1
-
-    :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type T"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    return v1
-.end method
-
-.method public final v(Z)V
-    .locals 8
-
-    iget-wide v0, p0, Lk0/a/n0;->d:J
-
-    invoke-virtual {p0, p1}, Lk0/a/n0;->w(Z)J
-
-    move-result-wide v2
-
-    sub-long/2addr v0, v2
-
-    iput-wide v0, p0, Lk0/a/n0;->d:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long p1, v0, v2
-
-    if-lez p1, :cond_0
-
-    return-void
-
-    :cond_0
-    sget-boolean p1, Lk0/a/b0;->a:Z
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x1
-
-    if-eqz p1, :cond_3
-
-    cmp-long p1, v0, v2
-
-    if-nez p1, :cond_1
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_3
-    :goto_1
-    iget-boolean p1, p0, Lk0/a/n0;->e:Z
-
-    if-eqz p1, :cond_b
-
-    move-object p1, p0
-
-    check-cast p1, Lk0/a/o0;
-
-    sget-object v0, Lk0/a/n1;->b:Lk0/a/n1;
-
-    sget-object v0, Lk0/a/n1;->a:Ljava/lang/ThreadLocal;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
-
-    iput-boolean v5, p1, Lk0/a/o0;->isCompleted:Z
-
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    if-eqz v0, :cond_5
-
-    iget-boolean v0, p1, Lk0/a/o0;->isCompleted:Z
-
-    if-eqz v0, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_5
-    :goto_2
-    iget-object v0, p1, Lk0/a/o0;->_queue:Ljava/lang/Object;
-
-    if-nez v0, :cond_6
-
-    sget-object v0, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    sget-object v6, Lk0/a/q0;->b:Lk0/a/r1/v;
-
-    invoke-virtual {v0, p1, v1, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    goto :goto_3
-
-    :cond_6
-    instance-of v6, v0, Lk0/a/r1/o;
-
-    if-eqz v6, :cond_7
-
-    check-cast v0, Lk0/a/r1/o;
-
-    invoke-virtual {v0}, Lk0/a/r1/o;->c()Z
-
-    goto :goto_3
-
-    :cond_7
-    sget-object v6, Lk0/a/q0;->b:Lk0/a/r1/v;
-
-    if-ne v0, v6, :cond_8
-
-    goto :goto_3
-
-    :cond_8
-    new-instance v6, Lk0/a/r1/o;
-
-    const/16 v7, 0x8
-
-    invoke-direct {v6, v7, v5}, Lk0/a/r1/o;-><init>(IZ)V
-
-    move-object v7, v0
-
-    check-cast v7, Ljava/lang/Runnable;
-
-    invoke-virtual {v6, v7}, Lk0/a/r1/o;->b(Ljava/lang/Object;)I
-
-    sget-object v7, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v7, p1, v0, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    :goto_3
-    invoke-virtual {p1}, Lk0/a/o0;->L()J
-
-    move-result-wide v5
-
-    cmp-long v0, v5, v2
-
-    if-gtz v0, :cond_9
-
-    goto :goto_3
-
-    :cond_9
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v2
-
-    :goto_4
-    iget-object v0, p1, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/o0$c;
-
-    if-eqz v0, :cond_b
-
-    monitor-enter v0
-
-    :try_start_0
-    iget v5, v0, Lk0/a/r1/y;->_size:I
-
-    if-lez v5, :cond_a
-
-    invoke-virtual {v0, v4}, Lk0/a/r1/y;->c(I)Lk0/a/r1/z;
-
-    move-result-object v5
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_5
-
-    :cond_a
-    move-object v5, v1
-
-    :goto_5
-    monitor-exit v0
-
-    check-cast v5, Lk0/a/o0$b;
-
-    if-eqz v5, :cond_b
-
-    invoke-virtual {p1, v2, v3, v5}, Lk0/a/p0;->E(JLk0/a/o0$b;)V
-
-    goto :goto_4
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_b
-    return-void
-.end method
-
-.method public final w(Z)J
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    const-wide v0, 0x100000000L
-
-    goto :goto_0
-
-    :cond_0
-    const-wide/16 v0, 0x1
-
-    :goto_0
-    return-wide v0
-.end method
-
-.method public final x(Lk0/a/i0;)V
-    .locals 12
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/i0<",
-            "*>;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p0, Lk0/a/n0;->f:Lk0/a/r1/a;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lk0/a/r1/a;
-
-    invoke-direct {v0}, Lk0/a/r1/a;-><init>()V
-
-    iput-object v0, p0, Lk0/a/n0;->f:Lk0/a/r1/a;
-
-    :goto_0
-    iget-object v1, v0, Lk0/a/r1/a;->a:[Ljava/lang/Object;
-
-    iget v2, v0, Lk0/a/r1/a;->c:I
-
-    aput-object p1, v1, v2
-
-    add-int/lit8 v2, v2, 0x1
-
-    array-length p1, v1
-
-    add-int/lit8 p1, p1, -0x1
-
-    and-int/2addr p1, v2
-
-    iput p1, v0, Lk0/a/r1/a;->c:I
-
-    iget v4, v0, Lk0/a/r1/a;->b:I
-
-    if-ne p1, v4, :cond_1
-
-    array-length p1, v1
-
-    shl-int/lit8 v2, p1, 0x1
-
-    new-array v11, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    const/4 v5, 0x0
-
-    const/16 v6, 0xa
-
-    move-object v2, v11
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->copyInto$default([Ljava/lang/Object;[Ljava/lang/Object;IIII)[Ljava/lang/Object;
-
-    iget-object v5, v0, Lk0/a/r1/a;->a:[Ljava/lang/Object;
-
-    array-length v1, v5
-
-    iget v9, v0, Lk0/a/r1/a;->b:I
-
-    sub-int v7, v1, v9
-
-    const/4 v8, 0x0
-
-    const/4 v10, 0x4
-
-    move-object v6, v11
-
-    invoke-static/range {v5 .. v10}, Lf/n/a/k/a;->copyInto$default([Ljava/lang/Object;[Ljava/lang/Object;IIII)[Ljava/lang/Object;
-
-    iput-object v11, v0, Lk0/a/r1/a;->a:[Ljava/lang/Object;
-
-    const/4 v1, 0x0
-
-    iput v1, v0, Lk0/a/r1/a;->b:I
-
-    iput p1, v0, Lk0/a/r1/a;->c:I
-
-    :cond_1
-    return-void
-
-    :cond_2
-    const-string p1, "task"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final z(Z)V
-    .locals 4
-
-    iget-wide v0, p0, Lk0/a/n0;->d:J
-
-    invoke-virtual {p0, p1}, Lk0/a/n0;->w(Z)J
-
-    move-result-wide v2
-
-    add-long/2addr v2, v0
-
-    iput-wide v2, p0, Lk0/a/n0;->d:J
-
-    if-nez p1, :cond_0
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lk0/a/n0;->e:Z
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/n1.smali b/com.discord/smali_classes2/k0/a/n1.smali
deleted file mode 100644
index 103d5f5e32..0000000000
--- a/com.discord/smali_classes2/k0/a/n1.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lk0/a/n1;
-.super Ljava/lang/Object;
-.source "EventLoop.common.kt"
-
-
-# static fields
-.field public static final a:Ljava/lang/ThreadLocal;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/ThreadLocal<",
-            "Lk0/a/n0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final b:Lk0/a/n1;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/ThreadLocal;
-
-    invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
-
-    sput-object v0, Lk0/a/n1;->a:Ljava/lang/ThreadLocal;
-
-    return-void
-.end method
-
-.method public static final a()Lk0/a/n0;
-    .locals 3
-
-    sget-object v0, Lk0/a/n1;->a:Ljava/lang/ThreadLocal;
-
-    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lk0/a/n0;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lk0/a/c;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "Thread.currentThread()"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v0, v1}, Lk0/a/c;-><init>(Ljava/lang/Thread;)V
-
-    sget-object v1, Lk0/a/n1;->a:Ljava/lang/ThreadLocal;
-
-    invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/o.smali b/com.discord/smali_classes2/k0/a/o.smali
deleted file mode 100644
index f13dc561c3..0000000000
--- a/com.discord/smali_classes2/k0/a/o.smali
+++ /dev/null
@@ -1,6 +0,0 @@
-.class public interface abstract Lk0/a/o;
-.super Ljava/lang/Object;
-.source "CompletableJob.kt"
-
-# interfaces
-.implements Lkotlinx/coroutines/Job;
diff --git a/com.discord/smali_classes2/k0/a/o0$a.smali b/com.discord/smali_classes2/k0/a/o0$a.smali
deleted file mode 100644
index bc60a08845..0000000000
--- a/com.discord/smali_classes2/k0/a/o0$a.smali
+++ /dev/null
@@ -1,95 +0,0 @@
-.class public final Lk0/a/o0$a;
-.super Lk0/a/o0$b;
-.source "EventLoop.common.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/o0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final g:Lk0/a/f;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lk0/a/f<",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic h:Lk0/a/o0;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/o0;JLk0/a/f;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J",
-            "Lk0/a/f<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lk0/a/o0$a;->h:Lk0/a/o0;
-
-    invoke-direct {p0, p2, p3}, Lk0/a/o0$b;-><init>(J)V
-
-    iput-object p4, p0, Lk0/a/o0$a;->g:Lk0/a/f;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/o0$a;->g:Lk0/a/f;
-
-    iget-object v1, p0, Lk0/a/o0$a;->h:Lk0/a/o0;
-
-    sget-object v2, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    invoke-interface {v0, v1, v2}, Lk0/a/f;->c(Lk0/a/v;Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-super {p0}, Lk0/a/o0$b;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lk0/a/o0$a;->g:Lk0/a/f;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/o0$b.smali b/com.discord/smali_classes2/k0/a/o0$b.smali
deleted file mode 100644
index 0f7f0513f1..0000000000
--- a/com.discord/smali_classes2/k0/a/o0$b.smali
+++ /dev/null
@@ -1,322 +0,0 @@
-.class public abstract Lk0/a/o0$b;
-.super Ljava/lang/Object;
-.source "EventLoop.common.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-.implements Ljava/lang/Comparable;
-.implements Lk0/a/k0;
-.implements Lk0/a/r1/z;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/o0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/lang/Runnable;",
-        "Ljava/lang/Comparable<",
-        "Lk0/a/o0$b;",
-        ">;",
-        "Lk0/a/k0;",
-        "Lk0/a/r1/z;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Ljava/lang/Object;
-
-.field public e:I
-
-.field public f:J
-
-
-# direct methods
-.method public constructor <init>(J)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lk0/a/o0$b;->f:J
-
-    const/4 p1, -0x1
-
-    iput p1, p0, Lk0/a/o0$b;->e:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public compareTo(Ljava/lang/Object;)I
-    .locals 4
-
-    check-cast p1, Lk0/a/o0$b;
-
-    if-eqz p1, :cond_2
-
-    iget-wide v0, p0, Lk0/a/o0$b;->f:J
-
-    iget-wide v2, p1, Lk0/a/o0$b;->f:J
-
-    sub-long/2addr v0, v2
-
-    const-wide/16 v2, 0x0
-
-    cmp-long p1, v0, v2
-
-    if-lez p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    if-gez p1, :cond_1
-
-    const/4 p1, -0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-
-    :cond_2
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized dispose()V
-    .locals 4
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lk0/a/o0$b;->d:Ljava/lang/Object;
-
-    sget-object v1, Lk0/a/q0;->a:Lk0/a/r1/v;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-ne v0, v1, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    :try_start_1
-    instance-of v1, v0, Lk0/a/o0$c;
-
-    if-nez v1, :cond_1
-
-    const/4 v0, 0x0
-
-    :cond_1
-    check-cast v0, Lk0/a/o0$c;
-
-    if-eqz v0, :cond_6
-
-    monitor-enter v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :try_start_2
-    invoke-interface {p0}, Lk0/a/r1/z;->i()Lk0/a/r1/y;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    invoke-interface {p0}, Lk0/a/r1/z;->j()I
-
-    move-result v1
-
-    sget-boolean v3, Lk0/a/b0;->a:Z
-
-    if-eqz v3, :cond_5
-
-    if-ltz v1, :cond_3
-
-    const/4 v2, 0x1
-
-    :cond_3
-    if-eqz v2, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v1
-
-    :cond_5
-    :goto_0
-    invoke-virtual {v0, v1}, Lk0/a/r1/y;->c(I)Lk0/a/r1/z;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :goto_1
-    :try_start_3
-    monitor-exit v0
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-
-    :cond_6
-    :goto_2
-    sget-object v0, Lk0/a/q0;->a:Lk0/a/r1/v;
-
-    iput-object v0, p0, Lk0/a/o0$b;->d:Ljava/lang/Object;
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public f(I)V
-    .locals 0
-
-    iput p1, p0, Lk0/a/o0$b;->e:I
-
-    return-void
-.end method
-
-.method public g(Lk0/a/r1/y;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/r1/y<",
-            "*>;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lk0/a/o0$b;->d:Ljava/lang/Object;
-
-    sget-object v1, Lk0/a/q0;->a:Lk0/a/r1/v;
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iput-object p1, p0, Lk0/a/o0$b;->d:Ljava/lang/Object;
-
-    return-void
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Failed requirement."
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public i()Lk0/a/r1/y;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lk0/a/r1/y<",
-            "*>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lk0/a/o0$b;->d:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/r1/y;
-
-    if-nez v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    check-cast v0, Lk0/a/r1/y;
-
-    return-object v0
-.end method
-
-.method public j()I
-    .locals 1
-
-    iget v0, p0, Lk0/a/o0$b;->e:I
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "Delayed[nanos="
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-wide v1, p0, Lk0/a/o0$b;->f:J
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/o0$c.smali b/com.discord/smali_classes2/k0/a/o0$c.smali
deleted file mode 100644
index 2d7e3b6f46..0000000000
--- a/com.discord/smali_classes2/k0/a/o0$c.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public final Lk0/a/o0$c;
-.super Lk0/a/r1/y;
-.source "EventLoop.common.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/o0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/r1/y<",
-        "Lk0/a/o0$b;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public b:J
-
-
-# direct methods
-.method public constructor <init>(J)V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/r1/y;-><init>()V
-
-    iput-wide p1, p0, Lk0/a/o0$c;->b:J
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/o0.smali b/com.discord/smali_classes2/k0/a/o0.smali
deleted file mode 100644
index 6efecd2401..0000000000
--- a/com.discord/smali_classes2/k0/a/o0.smali
+++ /dev/null
@@ -1,1093 +0,0 @@
-.class public abstract Lk0/a/o0;
-.super Lk0/a/p0;
-.source "EventLoop.common.kt"
-
-# interfaces
-.implements Lk0/a/e0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lk0/a/o0$b;,
-        Lk0/a/o0$a;,
-        Lk0/a/o0$c;
-    }
-.end annotation
-
-
-# static fields
-.field public static final g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-.field public static final h:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-
-# instance fields
-.field public volatile _delayed:Ljava/lang/Object;
-
-.field public volatile _queue:Ljava/lang/Object;
-
-.field public volatile isCompleted:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Ljava/lang/Object;
-
-    const-class v1, Lk0/a/o0;
-
-    const-string v2, "_queue"
-
-    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v2
-
-    sput-object v2, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const-string v2, "_delayed"
-
-    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/o0;->h:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lk0/a/p0;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lk0/a/o0;->_queue:Ljava/lang/Object;
-
-    iput-object v0, p0, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final F(Ljava/lang/Runnable;)V
-    .locals 1
-
-    invoke-virtual {p0, p1}, Lk0/a/o0;->G(Ljava/lang/Runnable;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lk0/a/p0;->D()Ljava/lang/Thread;
-
-    move-result-object p1
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    if-eq v0, p1, :cond_1
-
-    invoke-static {p1}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Lk0/a/c0;->j:Lk0/a/c0;
-
-    invoke-virtual {v0, p1}, Lk0/a/o0;->F(Ljava/lang/Runnable;)V
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public final G(Ljava/lang/Runnable;)Z
-    .locals 5
-
-    :cond_0
-    :goto_0
-    iget-object v0, p0, Lk0/a/o0;->_queue:Ljava/lang/Object;
-
-    iget-boolean v1, p0, Lk0/a/o0;->isCompleted:Z
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    return v2
-
-    :cond_1
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_2
-
-    sget-object v0, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_2
-    instance-of v3, v0, Lk0/a/r1/o;
-
-    if-eqz v3, :cond_6
-
-    move-object v3, v0
-
-    check-cast v3, Lk0/a/r1/o;
-
-    invoke-virtual {v3, p1}, Lk0/a/r1/o;->b(Ljava/lang/Object;)I
-
-    move-result v4
-
-    if-eqz v4, :cond_5
-
-    if-eq v4, v1, :cond_4
-
-    const/4 v0, 0x2
-
-    if-eq v4, v0, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    return v2
-
-    :cond_4
-    sget-object v1, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object v2
-
-    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_5
-    return v1
-
-    :cond_6
-    sget-object v3, Lk0/a/q0;->b:Lk0/a/r1/v;
-
-    if-ne v0, v3, :cond_7
-
-    return v2
-
-    :cond_7
-    new-instance v2, Lk0/a/r1/o;
-
-    const/16 v3, 0x8
-
-    invoke-direct {v2, v3, v1}, Lk0/a/r1/o;-><init>(IZ)V
-
-    move-object v3, v0
-
-    check-cast v3, Ljava/lang/Runnable;
-
-    invoke-virtual {v2, v3}, Lk0/a/r1/o;->b(Ljava/lang/Object;)I
-
-    invoke-virtual {v2, p1}, Lk0/a/r1/o;->b(Ljava/lang/Object;)I
-
-    sget-object v3, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return v1
-.end method
-
-.method public I()J
-    .locals 7
-
-    iget-object v0, p0, Lk0/a/n0;->f:Lk0/a/r1/a;
-
-    const-wide v1, 0x7fffffffffffffffL
-
-    const-wide/16 v3, 0x0
-
-    if-eqz v0, :cond_2
-
-    iget v5, v0, Lk0/a/r1/a;->b:I
-
-    iget v0, v0, Lk0/a/r1/a;->c:I
-
-    if-ne v5, v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move-wide v5, v3
-
-    goto :goto_2
-
-    :cond_2
-    :goto_1
-    move-wide v5, v1
-
-    :goto_2
-    cmp-long v0, v5, v3
-
-    if-nez v0, :cond_3
-
-    return-wide v3
-
-    :cond_3
-    iget-object v0, p0, Lk0/a/o0;->_queue:Ljava/lang/Object;
-
-    if-nez v0, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    instance-of v5, v0, Lk0/a/r1/o;
-
-    if-eqz v5, :cond_8
-
-    check-cast v0, Lk0/a/r1/o;
-
-    invoke-virtual {v0}, Lk0/a/r1/o;->d()Z
-
-    move-result v0
-
-    if-nez v0, :cond_5
-
-    return-wide v3
-
-    :cond_5
-    :goto_3
-    iget-object v0, p0, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/o0$c;
-
-    if-eqz v0, :cond_7
-
-    monitor-enter v0
-
-    :try_start_0
-    invoke-virtual {v0}, Lk0/a/r1/y;->b()Lk0/a/r1/z;
-
-    move-result-object v5
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    check-cast v5, Lk0/a/o0$b;
-
-    if-eqz v5, :cond_7
-
-    iget-wide v0, v5, Lk0/a/o0$b;->f:J
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v5
-
-    sub-long/2addr v0, v5
-
-    cmp-long v2, v0, v3
-
-    if-gez v2, :cond_6
-
-    goto :goto_4
-
-    :cond_6
-    move-wide v3, v0
-
-    :goto_4
-    return-wide v3
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-
-    :cond_7
-    return-wide v1
-
-    :cond_8
-    sget-object v5, Lk0/a/q0;->b:Lk0/a/r1/v;
-
-    if-ne v0, v5, :cond_9
-
-    return-wide v1
-
-    :cond_9
-    return-wide v3
-.end method
-
-.method public K()Z
-    .locals 4
-
-    iget-object v0, p0, Lk0/a/n0;->f:Lk0/a/r1/a;
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_1
-
-    iget v3, v0, Lk0/a/r1/a;->b:I
-
-    iget v0, v0, Lk0/a/r1/a;->c:I
-
-    if-ne v3, 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
-
-    return v2
-
-    :cond_2
-    iget-object v0, p0, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/o0$c;
-
-    if-eqz v0, :cond_4
-
-    iget v0, v0, Lk0/a/r1/y;->_size:I
-
-    if-nez v0, :cond_3
-
-    const/4 v0, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v0, 0x0
-
-    :goto_2
-    if-nez v0, :cond_4
-
-    return v2
-
-    :cond_4
-    iget-object v0, p0, Lk0/a/o0;->_queue:Ljava/lang/Object;
-
-    if-nez v0, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    instance-of v3, v0, Lk0/a/r1/o;
-
-    if-eqz v3, :cond_6
-
-    check-cast v0, Lk0/a/r1/o;
-
-    invoke-virtual {v0}, Lk0/a/r1/o;->d()Z
-
-    move-result v1
-
-    goto :goto_3
-
-    :cond_6
-    sget-object v3, Lk0/a/q0;->b:Lk0/a/r1/v;
-
-    if-ne v0, v3, :cond_7
-
-    goto :goto_3
-
-    :cond_7
-    const/4 v1, 0x0
-
-    :goto_3
-    return v1
-.end method
-
-.method public L()J
-    .locals 16
-
-    move-object/from16 v1, p0
-
-    invoke-virtual/range {p0 .. p0}, Lk0/a/n0;->C()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual/range {p0 .. p0}, Lk0/a/o0;->I()J
-
-    move-result-wide v2
-
-    return-wide v2
-
-    :cond_0
-    iget-object v0, v1, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    move-object v2, v0
-
-    check-cast v2, Lk0/a/o0$c;
-
-    const/4 v0, 0x0
-
-    const-wide/16 v3, 0x0
-
-    const/4 v5, 0x0
-
-    if-eqz v2, :cond_6
-
-    iget v6, v2, Lk0/a/r1/y;->_size:I
-
-    const/4 v7, 0x1
-
-    if-nez v6, :cond_1
-
-    const/4 v6, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v6, 0x0
-
-    :goto_0
-    if-nez v6, :cond_6
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v8
-
-    :goto_1
-    monitor-enter v2
-
-    :try_start_0
-    invoke-virtual {v2}, Lk0/a/r1/y;->b()Lk0/a/r1/z;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_5
-
-    check-cast v6, Lk0/a/o0$b;
-
-    iget-wide v10, v6, Lk0/a/o0$b;->f:J
-
-    sub-long v10, v8, v10
-
-    cmp-long v12, v10, v3
-
-    if-ltz v12, :cond_2
-
-    const/4 v10, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v10, 0x0
-
-    :goto_2
-    if-eqz v10, :cond_3
-
-    invoke-virtual {v1, v6}, Lk0/a/o0;->G(Ljava/lang/Runnable;)Z
-
-    move-result v6
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v6, 0x0
-
-    :goto_3
-    if-eqz v6, :cond_4
-
-    invoke-virtual {v2, v5}, Lk0/a/r1/y;->c(I)Lk0/a/r1/z;
-
-    move-result-object v6
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_4
-
-    :cond_4
-    move-object v6, v0
-
-    :goto_4
-    monitor-exit v2
-
-    goto :goto_5
-
-    :cond_5
-    monitor-exit v2
-
-    move-object v6, v0
-
-    :goto_5
-    check-cast v6, Lk0/a/o0$b;
-
-    if-eqz v6, :cond_6
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v2
-
-    throw v0
-
-    :cond_6
-    :goto_6
-    iget-object v2, v1, Lk0/a/o0;->_queue:Ljava/lang/Object;
-
-    if-nez v2, :cond_7
-
-    goto/16 :goto_c
-
-    :cond_7
-    instance-of v6, v2, Lk0/a/r1/o;
-
-    if-eqz v6, :cond_11
-
-    move-object v6, v2
-
-    check-cast v6, Lk0/a/r1/o;
-
-    :cond_8
-    :goto_7
-    iget-wide v9, v6, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/high16 v7, 0x1000000000000000L
-
-    and-long/2addr v7, v9
-
-    cmp-long v11, v7, v3
-
-    if-eqz v11, :cond_9
-
-    sget-object v7, Lk0/a/r1/o;->g:Lk0/a/r1/v;
-
-    goto :goto_9
-
-    :cond_9
-    const-wide/32 v7, 0x3fffffff
-
-    and-long/2addr v7, v9
-
-    shr-long/2addr v7, v5
-
-    long-to-int v13, v7
-
-    const-wide v7, 0xfffffffc0000000L
-
-    and-long/2addr v7, v9
-
-    const/16 v11, 0x1e
-
-    shr-long/2addr v7, v11
-
-    long-to-int v8, v7
-
-    iget v7, v6, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v8, v7
-
-    and-int/2addr v7, v13
-
-    if-ne v8, v7, :cond_a
-
-    goto :goto_8
-
-    :cond_a
-    iget-object v8, v6, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v8, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v14
-
-    if-nez v14, :cond_b
-
-    iget-boolean v7, v6, Lk0/a/r1/o;->d:Z
-
-    if-eqz v7, :cond_8
-
-    goto :goto_8
-
-    :cond_b
-    instance-of v7, v14, Lk0/a/r1/o$b;
-
-    if-eqz v7, :cond_c
-
-    :goto_8
-    move-object v7, v0
-
-    :goto_9
-    move-object v14, v7
-
-    goto :goto_b
-
-    :cond_c
-    add-int/lit8 v7, v13, 0x1
-
-    const v8, 0x3fffffff    # 1.9999999f
-
-    and-int v15, v7, v8
-
-    sget-object v7, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    const-wide/32 v11, -0x40000000
-
-    and-long/2addr v11, v9
-
-    int-to-long v3, v15
-
-    shl-long/2addr v3, v5
-
-    or-long/2addr v11, v3
-
-    move-object v8, v6
-
-    invoke-virtual/range {v7 .. v12}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_d
-
-    iget-object v3, v6, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v4, v6, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v4, v13
-
-    invoke-virtual {v3, v4, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    goto :goto_b
-
-    :cond_d
-    iget-boolean v3, v6, Lk0/a/r1/o;->d:Z
-
-    if-nez v3, :cond_e
-
-    const-wide/16 v3, 0x0
-
-    goto :goto_7
-
-    :cond_e
-    move-object v3, v6
-
-    :goto_a
-    invoke-static {v3, v13, v15}, Lk0/a/r1/o;->a(Lk0/a/r1/o;II)Lk0/a/r1/o;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_f
-
-    goto :goto_a
-
-    :cond_f
-    :goto_b
-    sget-object v3, Lk0/a/r1/o;->g:Lk0/a/r1/v;
-
-    if-eq v14, v3, :cond_10
-
-    move-object v0, v14
-
-    check-cast v0, Ljava/lang/Runnable;
-
-    goto :goto_c
-
-    :cond_10
-    sget-object v3, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v6}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object v4
-
-    invoke-virtual {v3, v1, v2, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_d
-
-    :cond_11
-    sget-object v3, Lk0/a/q0;->b:Lk0/a/r1/v;
-
-    if-ne v2, v3, :cond_12
-
-    goto :goto_c
-
-    :cond_12
-    sget-object v3, Lk0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3, v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_14
-
-    move-object v0, v2
-
-    check-cast v0, Ljava/lang/Runnable;
-
-    :goto_c
-    if-eqz v0, :cond_13
-
-    invoke-interface {v0}, Ljava/lang/Runnable;->run()V
-
-    :cond_13
-    invoke-virtual/range {p0 .. p0}, Lk0/a/o0;->I()J
-
-    move-result-wide v2
-
-    return-wide v2
-
-    :cond_14
-    :goto_d
-    const-wide/16 v3, 0x0
-
-    goto/16 :goto_6
-.end method
-
-.method public final M(JLk0/a/o0$b;)V
-    .locals 12
-
-    iget-boolean v0, p0, Lk0/a/o0;->isCompleted:Z
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v0, p0, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/o0$c;
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v0, Lk0/a/o0;->h:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    new-instance v5, Lk0/a/o0$c;
-
-    invoke-direct {v5, p1, p2}, Lk0/a/o0$c;-><init>(J)V
-
-    invoke-virtual {v0, p0, v3, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    iget-object v0, p0, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    if-eqz v0, :cond_e
-
-    check-cast v0, Lk0/a/o0$c;
-
-    :goto_0
-    monitor-enter p3
-
-    :try_start_0
-    iget-object v5, p3, Lk0/a/o0$b;->d:Ljava/lang/Object;
-
-    sget-object v6, Lk0/a/q0;->a:Lk0/a/r1/v;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    if-ne v5, v6, :cond_2
-
-    monitor-exit p3
-
-    const/4 v0, 0x2
-
-    goto :goto_3
-
-    :cond_2
-    :try_start_1
-    monitor-enter v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
-
-    :try_start_2
-    invoke-virtual {v0}, Lk0/a/r1/y;->b()Lk0/a/r1/z;
-
-    move-result-object v5
-
-    check-cast v5, Lk0/a/o0$b;
-
-    iget-boolean v6, p0, Lk0/a/o0;->isCompleted:Z
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-eqz v6, :cond_3
-
-    :try_start_3
-    monitor-exit v0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    monitor-exit p3
-
-    :goto_1
-    const/4 v0, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    const-wide/16 v6, 0x0
-
-    if-nez v5, :cond_4
-
-    :try_start_4
-    iput-wide p1, v0, Lk0/a/o0$c;->b:J
-
-    goto :goto_2
-
-    :cond_4
-    iget-wide v8, v5, Lk0/a/o0$b;->f:J
-
-    sub-long v10, v8, p1
-
-    cmp-long v5, v10, v6
-
-    if-ltz v5, :cond_5
-
-    move-wide v8, p1
-
-    :cond_5
-    iget-wide v10, v0, Lk0/a/o0$c;->b:J
-
-    sub-long v10, v8, v10
-
-    cmp-long v5, v10, v6
-
-    if-lez v5, :cond_6
-
-    iput-wide v8, v0, Lk0/a/o0$c;->b:J
-
-    :cond_6
-    :goto_2
-    iget-wide v8, p3, Lk0/a/o0$b;->f:J
-
-    iget-wide v10, v0, Lk0/a/o0$c;->b:J
-
-    sub-long/2addr v8, v10
-
-    cmp-long v5, v8, v6
-
-    if-gez v5, :cond_7
-
-    iget-wide v5, v0, Lk0/a/o0$c;->b:J
-
-    iput-wide v5, p3, Lk0/a/o0$b;->f:J
-
-    :cond_7
-    invoke-virtual {v0, p3}, Lk0/a/r1/y;->a(Lk0/a/r1/z;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :try_start_5
-    monitor-exit v0
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
-
-    monitor-exit p3
-
-    const/4 v0, 0x0
-
-    :goto_3
-    if-eqz v0, :cond_a
-
-    if-eq v0, v4, :cond_9
-
-    if-ne v0, v1, :cond_8
-
-    goto :goto_5
-
-    :cond_8
-    const-string p1, "unexpected result"
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_9
-    invoke-virtual {p0, p1, p2, p3}, Lk0/a/p0;->E(JLk0/a/o0$b;)V
-
-    goto :goto_5
-
-    :cond_a
-    iget-object p1, p0, Lk0/a/o0;->_delayed:Ljava/lang/Object;
-
-    check-cast p1, Lk0/a/o0$c;
-
-    if-eqz p1, :cond_b
-
-    monitor-enter p1
-
-    :try_start_6
-    invoke-virtual {p1}, Lk0/a/r1/y;->b()Lk0/a/r1/z;
-
-    move-result-object p2
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_0
-
-    monitor-exit p1
-
-    move-object v3, p2
-
-    check-cast v3, Lk0/a/o0$b;
-
-    goto :goto_4
-
-    :catchall_0
-    move-exception p2
-
-    monitor-exit p1
-
-    throw p2
-
-    :cond_b
-    :goto_4
-    if-ne v3, p3, :cond_c
-
-    const/4 v2, 0x1
-
-    :cond_c
-    if-eqz v2, :cond_d
-
-    invoke-virtual {p0}, Lk0/a/p0;->D()Ljava/lang/Thread;
-
-    move-result-object p1
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object p2
-
-    if-eq p2, p1, :cond_d
-
-    invoke-static {p1}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
-
-    :cond_d
-    :goto_5
-    return-void
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_7
-    monitor-exit v0
-
-    throw p1
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
-
-    :catchall_2
-    move-exception p1
-
-    monitor-exit p3
-
-    throw p1
-
-    :cond_e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-.end method
-
-.method public b(JLk0/a/f;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J",
-            "Lk0/a/f<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-static {p1, p2}, Lk0/a/q0;->a(J)J
-
-    move-result-wide p1
-
-    const-wide v0, 0x3fffffffffffffffL    # 1.9999999999999998
-
-    cmp-long v2, p1, v0
-
-    if-gez v2, :cond_0
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v0
-
-    new-instance v2, Lk0/a/o0$a;
-
-    add-long/2addr p1, v0
-
-    invoke-direct {v2, p0, p1, p2, p3}, Lk0/a/o0$a;-><init>(Lk0/a/o0;JLk0/a/f;)V
-
-    new-instance p1, Lk0/a/l0;
-
-    invoke-direct {p1, v2}, Lk0/a/l0;-><init>(Lk0/a/k0;)V
-
-    invoke-interface {p3, p1}, Lk0/a/f;->b(Lkotlin/jvm/functions/Function1;)V
-
-    invoke-virtual {p0, v0, v1, v2}, Lk0/a/o0;->M(JLk0/a/o0$b;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public final dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0, p2}, Lk0/a/o0;->F(Ljava/lang/Runnable;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/o1.smali b/com.discord/smali_classes2/k0/a/o1.smali
deleted file mode 100644
index 3796dd3812..0000000000
--- a/com.discord/smali_classes2/k0/a/o1.smali
+++ /dev/null
@@ -1,79 +0,0 @@
-.class public final Lk0/a/o1;
-.super Lk0/a/v;
-.source "Unconfined.kt"
-
-
-# static fields
-.field public static final d:Lk0/a/o1;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/o1;
-
-    invoke-direct {v0}, Lk0/a/o1;-><init>()V
-
-    sput-object v0, Lk0/a/o1;->d:Lk0/a/o1;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/v;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "Unconfined"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/p.smali b/com.discord/smali_classes2/k0/a/p.smali
deleted file mode 100644
index 66e32c12ea..0000000000
--- a/com.discord/smali_classes2/k0/a/p.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public Lk0/a/p;
-.super Ljava/lang/Object;
-.source "CompletedExceptionally.kt"
-
-
-# static fields
-.field public static final b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
-# instance fields
-.field public volatile _handled:I
-
-.field public final a:Ljava/lang/Throwable;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lk0/a/p;
-
-    const-string v1, "_handled"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/p;->b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Throwable;Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    iput p2, p0, Lk0/a/p;->_handled:I
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Throwable;ZI)V
-    .locals 0
-
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    if-eqz p1, :cond_1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    iput p2, p0, Lk0/a/p;->_handled:I
-
-    return-void
-
-    :cond_1
-    const-string p1, "cause"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5b
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/p0.smali b/com.discord/smali_classes2/k0/a/p0.smali
deleted file mode 100644
index 798894ba98..0000000000
--- a/com.discord/smali_classes2/k0/a/p0.smali
+++ /dev/null
@@ -1,57 +0,0 @@
-.class public abstract Lk0/a/p0;
-.super Lk0/a/n0;
-.source "EventLoop.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/n0;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract D()Ljava/lang/Thread;
-.end method
-
-.method public final E(JLk0/a/o0$b;)V
-    .locals 1
-
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    if-eqz v0, :cond_2
-
-    sget-object v0, Lk0/a/c0;->j:Lk0/a/c0;
-
-    if-eq p0, v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_2
-    :goto_1
-    sget-object v0, Lk0/a/c0;->j:Lk0/a/c0;
-
-    invoke-virtual {v0, p1, p2, p3}, Lk0/a/o0;->M(JLk0/a/o0$b;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/p1.smali b/com.discord/smali_classes2/k0/a/p1.smali
deleted file mode 100644
index 0b98eca4ec..0000000000
--- a/com.discord/smali_classes2/k0/a/p1.smali
+++ /dev/null
@@ -1,43 +0,0 @@
-.class public final Lk0/a/p1;
-.super Lk0/a/r1/t;
-.source "Builders.common.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/r1/t<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext;",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Lk0/a/r1/t;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public P()I
-    .locals 1
-
-    const/4 v0, 0x3
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/q.smali b/com.discord/smali_classes2/k0/a/q.smali
deleted file mode 100644
index e8c4a2c897..0000000000
--- a/com.discord/smali_classes2/k0/a/q.smali
+++ /dev/null
@@ -1,17 +0,0 @@
-.class public final Lk0/a/q;
-.super Ljava/lang/Object;
-.source "CancellableContinuationImpl.kt"
-
-
-# instance fields
-.field public final a:Ljava/lang/Object;
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "CompletedIdempotentResult[null]"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/q0.smali b/com.discord/smali_classes2/k0/a/q0.smali
deleted file mode 100644
index e35d9bf920..0000000000
--- a/com.discord/smali_classes2/k0/a/q0.smali
+++ /dev/null
@@ -1,64 +0,0 @@
-.class public final Lk0/a/q0;
-.super Ljava/lang/Object;
-.source "EventLoop.common.kt"
-
-
-# static fields
-.field public static final a:Lk0/a/r1/v;
-
-.field public static final b:Lk0/a/r1/v;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "REMOVED_TASK"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/q0;->a:Lk0/a/r1/v;
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "CLOSED_EMPTY"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/q0;->b:Lk0/a/r1/v;
-
-    return-void
-.end method
-
-.method public static final a(J)J
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p0, v0
-
-    if-gtz v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-wide v0, 0x8637bd05af6L
-
-    cmp-long v2, p0, v0
-
-    if-ltz v2, :cond_1
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    goto :goto_0
-
-    :cond_1
-    const-wide/32 v0, 0xf4240
-
-    mul-long v0, v0, p0
-
-    :goto_0
-    return-wide v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/q1/a$a.smali b/com.discord/smali_classes2/k0/a/q1/a$a.smali
deleted file mode 100644
index 2b456c86c4..0000000000
--- a/com.discord/smali_classes2/k0/a/q1/a$a.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Lk0/a/q1/a$a;
-.super Ljava/lang/Object;
-.source "Runnable.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lk0/a/q1/a;->b(JLk0/a/f;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lk0/a/q1/a;
-
-.field public final synthetic e:Lk0/a/f;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/q1/a;Lk0/a/f;)V
-    .locals 0
-
-    iput-object p1, p0, Lk0/a/q1/a$a;->d:Lk0/a/q1/a;
-
-    iput-object p2, p0, Lk0/a/q1/a$a;->e:Lk0/a/f;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/q1/a$a;->e:Lk0/a/f;
-
-    iget-object v1, p0, Lk0/a/q1/a$a;->d:Lk0/a/q1/a;
-
-    sget-object v2, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    invoke-interface {v0, v1, v2}, Lk0/a/f;->c(Lk0/a/v;Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/q1/a$b.smali b/com.discord/smali_classes2/k0/a/q1/a$b.smali
deleted file mode 100644
index 6d97fb0326..0000000000
--- a/com.discord/smali_classes2/k0/a/q1/a$b.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.class public final Lk0/a/q1/a$b;
-.super Lj0/n/c/i;
-.source "HandlerDispatcher.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lk0/a/q1/a;->b(JLk0/a/f;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Throwable;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $block:Ljava/lang/Runnable;
-
-.field public final synthetic this$0:Lk0/a/q1/a;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/q1/a;Ljava/lang/Runnable;)V
-    .locals 0
-
-    iput-object p1, p0, Lk0/a/q1/a$b;->this$0:Lk0/a/q1/a;
-
-    iput-object p2, p0, Lk0/a/q1/a$b;->$block:Ljava/lang/Runnable;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    iget-object p1, p0, Lk0/a/q1/a$b;->this$0:Lk0/a/q1/a;
-
-    iget-object p1, p1, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    iget-object v0, p0, Lk0/a/q1/a$b;->$block:Ljava/lang/Runnable;
-
-    invoke-virtual {p1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/q1/a.smali b/com.discord/smali_classes2/k0/a/q1/a.smali
deleted file mode 100644
index 6a4ae06259..0000000000
--- a/com.discord/smali_classes2/k0/a/q1/a.smali
+++ /dev/null
@@ -1,258 +0,0 @@
-.class public final Lk0/a/q1/a;
-.super Lk0/a/q1/b;
-.source "HandlerDispatcher.kt"
-
-# interfaces
-.implements Lk0/a/e0;
-
-
-# instance fields
-.field public volatile _immediate:Lk0/a/q1/a;
-
-.field public final d:Lk0/a/q1/a;
-
-.field public final e:Landroid/os/Handler;
-
-.field public final f:Ljava/lang/String;
-
-.field public final g:Z
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/Handler;Ljava/lang/String;Z)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lk0/a/q1/b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    iput-object p1, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    iput-object p2, p0, Lk0/a/q1/a;->f:Ljava/lang/String;
-
-    iput-boolean p3, p0, Lk0/a/q1/a;->g:Z
-
-    if-eqz p3, :cond_0
-
-    move-object v0, p0
-
-    :cond_0
-    iput-object v0, p0, Lk0/a/q1/a;->_immediate:Lk0/a/q1/a;
-
-    iget-object p1, p0, Lk0/a/q1/a;->_immediate:Lk0/a/q1/a;
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Lk0/a/q1/a;
-
-    iget-object p2, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    iget-object p3, p0, Lk0/a/q1/a;->f:Ljava/lang/String;
-
-    const/4 v0, 0x1
-
-    invoke-direct {p1, p2, p3, v0}, Lk0/a/q1/a;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
-
-    iput-object p1, p0, Lk0/a/q1/a;->_immediate:Lk0/a/q1/a;
-
-    :goto_0
-    iput-object p1, p0, Lk0/a/q1/a;->d:Lk0/a/q1/a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public b(JLk0/a/f;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J",
-            "Lk0/a/f<",
-            "-",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    new-instance v0, Lk0/a/q1/a$a;
-
-    invoke-direct {v0, p0, p3}, Lk0/a/q1/a$a;-><init>(Lk0/a/q1/a;Lk0/a/f;)V
-
-    iget-object v1, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    const-wide v2, 0x3fffffffffffffffL    # 1.9999999999999998
-
-    invoke-static {p1, p2, v2, v3}, Lj0/q/f;->coerceAtMost(JJ)J
-
-    move-result-wide p1
-
-    invoke-virtual {v1, v0, p1, p2}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
-
-    new-instance p1, Lk0/a/q1/a$b;
-
-    invoke-direct {p1, p0, v0}, Lk0/a/q1/a$b;-><init>(Lk0/a/q1/a;Ljava/lang/Runnable;)V
-
-    invoke-interface {p3, p1}, Lk0/a/f;->b(Lkotlin/jvm/functions/Function1;)V
-
-    return-void
-.end method
-
-.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    invoke-virtual {p1, p2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
-
-    return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Lk0/a/q1/a;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lk0/a/q1/a;
-
-    iget-object p1, p1, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    iget-object v0, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    if-ne p1, v0, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    invoke-static {v0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-    .locals 2
-
-    if-eqz p1, :cond_2
-
-    iget-boolean p1, p0, Lk0/a/q1/a;->g:Z
-
-    const/4 v0, 0x1
-
-    if-eqz p1, :cond_1
-
-    invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    invoke-virtual {v1}, Landroid/os/Handler;->getLooper()Landroid/os/Looper;
-
-    move-result-object v1
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    xor-int/2addr p1, v0
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :cond_1
-    :goto_0
-    return v0
-
-    :cond_2
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/q1/a;->f:Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    iget-boolean v1, p0, Lk0/a/q1/a;->g:Z
-
-    if-eqz v1, :cond_1
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lk0/a/q1/a;->f:Ljava/lang/String;
-
-    const-string v2, " [immediate]"
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lk0/a/q1/a;->e:Landroid/os/Handler;
-
-    invoke-virtual {v0}, Landroid/os/Handler;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "handler.toString()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_1
-    :goto_0
-    return-object v0
-.end method
-
-.method public v()Lk0/a/f1;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/q1/a;->d:Lk0/a/q1/a;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/q1/b.smali b/com.discord/smali_classes2/k0/a/q1/b.smali
deleted file mode 100644
index 5d419c9366..0000000000
--- a/com.discord/smali_classes2/k0/a/q1/b.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public abstract Lk0/a/q1/b;
-.super Lk0/a/f1;
-.source "HandlerDispatcher.kt"
-
-# interfaces
-.implements Lk0/a/e0;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/f1;-><init>()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/f1;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/q1/c.smali b/com.discord/smali_classes2/k0/a/q1/c.smali
deleted file mode 100644
index 0319a01243..0000000000
--- a/com.discord/smali_classes2/k0/a/q1/c.smali
+++ /dev/null
@@ -1,180 +0,0 @@
-.class public final Lk0/a/q1/c;
-.super Ljava/lang/Object;
-.source "HandlerDispatcher.kt"
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    :try_start_0
-    new-instance v0, Lk0/a/q1/a;
-
-    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
-
-    move-result-object v1
-
-    const-string v2, "Looper.getMainLooper()"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v2, 0x1
-
-    invoke-static {v1, v2}, Lk0/a/q1/c;->a(Landroid/os/Looper;Z)Landroid/os/Handler;
-
-    move-result-object v1
-
-    const-string v2, "Main"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v0, v1, v2, v3}, Lk0/a/q1/a;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_0
-    instance-of v1, v0, Lj0/d$a;
-
-    if-eqz v1, :cond_0
-
-    const/4 v0, 0x0
-
-    :cond_0
-    check-cast v0, Lk0/a/q1/b;
-
-    return-void
-.end method
-
-.method public static final a(Landroid/os/Looper;Z)Landroid/os/Handler;
-    .locals 7
-    .annotation build Landroidx/annotation/VisibleForTesting;
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 v0, 0x1c
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-lt p1, v0, :cond_1
-
-    const-class p1, Landroid/os/Handler;
-
-    const-string v0, "createAsync"
-
-    new-array v4, v2, [Ljava/lang/Class;
-
-    const-class v5, Landroid/os/Looper;
-
-    aput-object v5, v4, v1
-
-    invoke-virtual {p1, v0, v4}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    new-array v0, v2, [Ljava/lang/Object;
-
-    aput-object p0, v0, v1
-
-    invoke-virtual {p1, v3, v0}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_0
-
-    check-cast p0, Landroid/os/Handler;
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string p1, "null cannot be cast to non-null type android.os.Handler"
-
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_1
-    :try_start_0
-    const-class p1, Landroid/os/Handler;
-
-    const/4 v0, 0x3
-
-    new-array v4, v0, [Ljava/lang/Class;
-
-    const-class v5, Landroid/os/Looper;
-
-    aput-object v5, v4, v1
-
-    const-class v5, Landroid/os/Handler$Callback;
-
-    aput-object v5, v4, v2
-
-    sget-object v5, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    const/4 v6, 0x2
-
-    aput-object v5, v4, v6
-
-    invoke-virtual {p1, v4}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object p1
-
-    const-string v4, "Handler::class.java.getD\u2026:class.javaPrimitiveType)"
-
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    :try_end_0
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    aput-object p0, v0, v1
-
-    aput-object v3, v0, v2
-
-    sget-object p0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    aput-object p0, v0, v6
-
-    invoke-virtual {p1, v0}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    const-string p1, "constructor.newInstance(this, null, true)"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p0, Landroid/os/Handler;
-
-    return-object p0
-
-    :catch_0
-    new-instance p1, Landroid/os/Handler;
-
-    invoke-direct {p1, p0}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
-
-    return-object p1
-
-    :cond_2
-    new-instance p1, Landroid/os/Handler;
-
-    invoke-direct {p1, p0}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r.smali b/com.discord/smali_classes2/k0/a/r.smali
deleted file mode 100644
index 12847dd3e7..0000000000
--- a/com.discord/smali_classes2/k0/a/r.smali
+++ /dev/null
@@ -1,28 +0,0 @@
-.class public final Lk0/a/r;
-.super Ljava/lang/Object;
-.source "CancellableContinuationImpl.kt"
-
-
-# instance fields
-.field public final a:Ljava/lang/Object;
-
-.field public final b:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "CompletedWithCancellation[null]"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r0.smali b/com.discord/smali_classes2/k0/a/r0.smali
deleted file mode 100644
index 53f8e53eca..0000000000
--- a/com.discord/smali_classes2/k0/a/r0.smali
+++ /dev/null
@@ -1,16 +0,0 @@
-.class public abstract Lk0/a/r0;
-.super Lk0/a/v;
-.source "Executors.kt"
-
-# interfaces
-.implements Ljava/io/Closeable;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/v;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/a.smali b/com.discord/smali_classes2/k0/a/r1/a.smali
deleted file mode 100644
index d1f8f9e96d..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/a.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public Lk0/a/r1/a;
-.super Ljava/lang/Object;
-.source "ArrayQueue.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public a:[Ljava/lang/Object;
-
-.field public b:I
-
-.field public c:I
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/16 v0, 0x10
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    iput-object v0, p0, Lk0/a/r1/a;->a:[Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/a0.smali b/com.discord/smali_classes2/k0/a/r1/a0.smali
deleted file mode 100644
index d51e647cff..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/a0.smali
+++ /dev/null
@@ -1,27 +0,0 @@
-.class public final Lk0/a/r1/a0;
-.super Ljava/lang/Object;
-.source "ThreadContext.kt"
-
-
-# instance fields
-.field public a:[Ljava/lang/Object;
-
-.field public b:I
-
-.field public final c:Lkotlin/coroutines/CoroutineContext;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/r1/a0;->c:Lkotlin/coroutines/CoroutineContext;
-
-    new-array p1, p2, [Ljava/lang/Object;
-
-    iput-object p1, p0, Lk0/a/r1/a0;->a:[Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/b.smali b/com.discord/smali_classes2/k0/a/r1/b.smali
deleted file mode 100644
index 734487b237..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/b.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-.class public final Lk0/a/r1/b;
-.super Ljava/lang/Object;
-.source "Atomic.kt"
-
-
-# static fields
-.field public static final a:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "NO_DECISION"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/r1/b;->a:Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/c.smali b/com.discord/smali_classes2/k0/a/r1/c.smali
deleted file mode 100644
index 977f863579..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/c.smali
+++ /dev/null
@@ -1,227 +0,0 @@
-.class public abstract Lk0/a/r1/c;
-.super Lk0/a/r1/r;
-.source "Atomic.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/r1/r;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-
-# instance fields
-.field public volatile _consensus:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Lk0/a/r1/c;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "_consensus"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/r1/c;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lk0/a/r1/r;-><init>()V
-
-    sget-object v0, Lk0/a/r1/b;->a:Ljava/lang/Object;
-
-    iput-object v0, p0, Lk0/a/r1/c;->_consensus:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 7
-
-    iget-object v0, p0, Lk0/a/r1/c;->_consensus:Ljava/lang/Object;
-
-    sget-object v1, Lk0/a/r1/b;->a:Ljava/lang/Object;
-
-    const-string v2, "affected"
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    if-ne v0, v1, :cond_7
-
-    move-object v0, p0
-
-    check-cast v0, Lk0/a/c1$c;
-
-    move-object v1, p1
-
-    check-cast v1, Lk0/a/r1/m;
-
-    if-eqz v1, :cond_6
-
-    iget-object v1, v0, Lk0/a/c1$c;->d:Lk0/a/c1;
-
-    invoke-virtual {v1}, Lk0/a/c1;->x()Ljava/lang/Object;
-
-    move-result-object v1
-
-    iget-object v0, v0, Lk0/a/c1$c;->e:Ljava/lang/Object;
-
-    if-ne v1, v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    move-object v0, v5
-
-    goto :goto_1
-
-    :cond_1
-    sget-object v0, Lk0/a/r1/l;->a:Ljava/lang/Object;
-
-    :goto_1
-    sget-boolean v1, Lk0/a/b0;->a:Z
-
-    if-eqz v1, :cond_4
-
-    sget-object v1, Lk0/a/r1/b;->a:Ljava/lang/Object;
-
-    if-eq v0, v1, :cond_2
-
-    const/4 v1, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_2
-    if-eqz v1, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_4
-    :goto_3
-    sget-object v1, Lk0/a/r1/c;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    sget-object v6, Lk0/a/r1/b;->a:Ljava/lang/Object;
-
-    invoke-virtual {v1, p0, v6, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    goto :goto_4
-
-    :cond_5
-    iget-object v0, p0, Lk0/a/r1/c;->_consensus:Ljava/lang/Object;
-
-    goto :goto_4
-
-    :cond_6
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_7
-    :goto_4
-    move-object v1, p0
-
-    check-cast v1, Lk0/a/r1/m$a;
-
-    check-cast p1, Lk0/a/r1/m;
-
-    if-eqz p1, :cond_c
-
-    if-nez v0, :cond_8
-
-    goto :goto_5
-
-    :cond_8
-    const/4 v3, 0x0
-
-    :goto_5
-    if-eqz v3, :cond_9
-
-    iget-object v2, v1, Lk0/a/r1/m$a;->c:Lk0/a/r1/m;
-
-    goto :goto_6
-
-    :cond_9
-    iget-object v2, v1, Lk0/a/r1/m$a;->b:Lk0/a/r1/m;
-
-    :goto_6
-    if-eqz v2, :cond_b
-
-    sget-object v4, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v4, p1, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_b
-
-    if-eqz v3, :cond_b
-
-    iget-object p1, v1, Lk0/a/r1/m$a;->c:Lk0/a/r1/m;
-
-    iget-object v1, v1, Lk0/a/r1/m$a;->b:Lk0/a/r1/m;
-
-    if-eqz v1, :cond_a
-
-    invoke-virtual {p1, v1}, Lk0/a/r1/m;->c(Lk0/a/r1/m;)V
-
-    goto :goto_7
-
-    :cond_a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_b
-    :goto_7
-    return-object v0
-
-    :cond_c
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/d.smali b/com.discord/smali_classes2/k0/a/r1/d.smali
deleted file mode 100644
index 688551182e..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/d.smali
+++ /dev/null
@@ -1,58 +0,0 @@
-.class public final Lk0/a/r1/d;
-.super Ljava/lang/Object;
-.source "Concurrent.kt"
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    :try_start_0
-    const-class v0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    const-string v1, "setRemoveOnCancelPolicy"
-
-    const/4 v2, 0x1
-
-    new-array v2, v2, [Ljava/lang/Class;
-
-    const/4 v3, 0x0
-
-    sget-object v4, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    aput-object v4, v2, v3
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :catchall_0
-    return-void
-.end method
-
-.method public static final a(I)Ljava/util/Set;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Object;",
-            ">(I)",
-            "Ljava/util/Set<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/IdentityHashMap;
-
-    invoke-direct {v0, p0}, Ljava/util/IdentityHashMap;-><init>(I)V
-
-    invoke-static {v0}, Ljava/util/Collections;->newSetFromMap(Ljava/util/Map;)Ljava/util/Set;
-
-    move-result-object p0
-
-    const-string v0, "Collections.newSetFromMa\u2026ityHashMap(expectedSize))"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/e.smali b/com.discord/smali_classes2/k0/a/r1/e.smali
deleted file mode 100644
index a53a34d566..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/e.smali
+++ /dev/null
@@ -1,43 +0,0 @@
-.class public final Lk0/a/r1/e;
-.super Ljava/lang/Object;
-.source "Scopes.kt"
-
-# interfaces
-.implements Lkotlinx/coroutines/CoroutineScope;
-
-
-# instance fields
-.field public final d:Lkotlin/coroutines/CoroutineContext;
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/r1/e;->d:Lkotlin/coroutines/CoroutineContext;
-
-    return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/r1/e;->d:Lkotlin/coroutines/CoroutineContext;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/f.smali b/com.discord/smali_classes2/k0/a/r1/f.smali
deleted file mode 100644
index 871750f024..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/f.smali
+++ /dev/null
@@ -1,117 +0,0 @@
-.class public final Lk0/a/r1/f;
-.super Lj0/n/c/i;
-.source "ExceptionsConstuctor.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Throwable;",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
-    .locals 0
-
-    iput-object p1, p0, Lk0/a/r1/f;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 5
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    :try_start_0
-    iget-object v1, p0, Lk0/a/r1/f;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 v2, 0x2
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {p1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v2, v3
-
-    const/4 v3, 0x1
-
-    aput-object p1, v2, v3
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.Throwable"
-
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    :goto_0
-    instance-of v1, p1, Lj0/d$a;
-
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v0, p1
-
-    :goto_1
-    check-cast v0, Ljava/lang/Throwable;
-
-    return-object v0
-
-    :cond_2
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/g.smali b/com.discord/smali_classes2/k0/a/r1/g.smali
deleted file mode 100644
index f143ba7bd6..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/g.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lk0/a/r1/g;
-.super Lj0/n/c/i;
-.source "ExceptionsConstuctor.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Throwable;",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
-    .locals 0
-
-    iput-object p1, p0, Lk0/a/r1/g;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    :try_start_0
-    iget-object v1, p0, Lk0/a/r1/g;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 v2, 0x1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    aput-object p1, v2, v3
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.Throwable"
-
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    :goto_0
-    instance-of v1, p1, Lj0/d$a;
-
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v0, p1
-
-    :goto_1
-    check-cast v0, Ljava/lang/Throwable;
-
-    return-object v0
-
-    :cond_2
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/h.smali b/com.discord/smali_classes2/k0/a/r1/h.smali
deleted file mode 100644
index 13ce41819a..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/h.smali
+++ /dev/null
@@ -1,115 +0,0 @@
-.class public final Lk0/a/r1/h;
-.super Lj0/n/c/i;
-.source "ExceptionsConstuctor.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Throwable;",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
-    .locals 0
-
-    iput-object p1, p0, Lk0/a/r1/h;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 5
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    :try_start_0
-    iget-object v1, p0, Lk0/a/r1/h;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 v2, 0x1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {p1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v2, v3
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    invoke-virtual {v1, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.Throwable"
-
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    :goto_0
-    instance-of p1, v1, Lj0/d$a;
-
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v0, v1
-
-    :goto_1
-    check-cast v0, Ljava/lang/Throwable;
-
-    return-object v0
-
-    :cond_2
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/i.smali b/com.discord/smali_classes2/k0/a/r1/i.smali
deleted file mode 100644
index 1155bcb454..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/i.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public final Lk0/a/r1/i;
-.super Lj0/n/c/i;
-.source "ExceptionsConstuctor.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Throwable;",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
-    .locals 0
-
-    iput-object p1, p0, Lk0/a/r1/i;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 p1, 0x1
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    :try_start_0
-    iget-object v1, p0, Lk0/a/r1/i;->$constructor$inlined:Ljava/lang/reflect/Constructor;
-
-    const/4 v2, 0x0
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    invoke-virtual {v1, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.Throwable"
-
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    :goto_0
-    instance-of p1, v1, Lj0/d$a;
-
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v0, v1
-
-    :goto_1
-    check-cast v0, Ljava/lang/Throwable;
-
-    return-object v0
-
-    :cond_2
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/j$a.smali b/com.discord/smali_classes2/k0/a/r1/j$a.smali
deleted file mode 100644
index 06f6acb0ea..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/j$a.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public final Lk0/a/r1/j$a;
-.super Ljava/lang/Object;
-.source "Comparisons.kt"
-
-# interfaces
-.implements Ljava/util/Comparator;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lk0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Comparator<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;TT;)I"
-        }
-    .end annotation
-
-    check-cast p2, Ljava/lang/reflect/Constructor;
-
-    const-string v0, "it"
-
-    invoke-static {p2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Ljava/lang/reflect/Constructor;->getParameterTypes()[Ljava/lang/Class;
-
-    move-result-object p2
-
-    array-length p2, p2
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p2
-
-    check-cast p1, Ljava/lang/reflect/Constructor;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Ljava/lang/reflect/Constructor;->getParameterTypes()[Ljava/lang/Class;
-
-    move-result-object p1
-
-    array-length p1, p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    invoke-static {p2, p1}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
-
-    move-result p1
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/j$b.smali b/com.discord/smali_classes2/k0/a/r1/j$b.smali
deleted file mode 100644
index 43bee5b038..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/j$b.smali
+++ /dev/null
@@ -1,66 +0,0 @@
-.class public final Lk0/a/r1/j$b;
-.super Lj0/n/c/i;
-.source "ExceptionsConstuctor.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lk0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final d:Lk0/a/r1/j$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/r1/j$b;
-
-    invoke-direct {v0}, Lk0/a/r1/j$b;-><init>()V
-
-    sput-object v0, Lk0/a/r1/j$b;->d:Lk0/a/r1/j$b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/j$c.smali b/com.discord/smali_classes2/k0/a/r1/j$c.smali
deleted file mode 100644
index 592ab2633c..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/j$c.smali
+++ /dev/null
@@ -1,66 +0,0 @@
-.class public final Lk0/a/r1/j$c;
-.super Lj0/n/c/i;
-.source "ExceptionsConstuctor.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lk0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final d:Lk0/a/r1/j$c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/r1/j$c;
-
-    invoke-direct {v0}, Lk0/a/r1/j$c;-><init>()V
-
-    sput-object v0, Lk0/a/r1/j$c;->d:Lk0/a/r1/j$c;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    const-string p1, "it"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/j.smali b/com.discord/smali_classes2/k0/a/r1/j.smali
deleted file mode 100644
index b64db04973..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/j.smali
+++ /dev/null
@@ -1,645 +0,0 @@
-.class public final Lk0/a/r1/j;
-.super Ljava/lang/Object;
-.source "ExceptionsConstuctor.kt"
-
-
-# static fields
-.field public static final a:I
-
-.field public static final b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
-
-.field public static final c:Ljava/util/WeakHashMap;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/WeakHashMap<",
-            "Ljava/lang/Class<",
-            "+",
-            "Ljava/lang/Throwable;",
-            ">;",
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/Throwable;",
-            "Ljava/lang/Throwable;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Ljava/lang/Throwable;
-
-    const/4 v1, -0x1
-
-    invoke-static {v0, v1}, Lk0/a/r1/j;->a(Ljava/lang/Class;I)I
-
-    move-result v0
-
-    sput v0, Lk0/a/r1/j;->a:I
-
-    new-instance v0, Ljava/util/concurrent/locks/ReentrantReadWriteLock;
-
-    invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;-><init>()V
-
-    sput-object v0, Lk0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
-
-    new-instance v0, Ljava/util/WeakHashMap;
-
-    invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
-
-    sput-object v0, Lk0/a/r1/j;->c:Ljava/util/WeakHashMap;
-
-    return-void
-.end method
-
-.method public static final a(Ljava/lang/Class;I)I
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;I)I"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_4
-
-    invoke-static {p0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    :goto_0
-    :try_start_0
-    invoke-virtual {p0}, Ljava/lang/Class;->getDeclaredFields()[Ljava/lang/reflect/Field;
-
-    move-result-object v2
-
-    const-string v3, "declaredFields"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v3, v2
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    :goto_1
-    if-ge v4, v3, :cond_1
-
-    aget-object v6, v2, v4
-
-    const-string v7, "it"
-
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v6}, Ljava/lang/reflect/Field;->getModifiers()I
-
-    move-result v6
-
-    invoke-static {v6}, Ljava/lang/reflect/Modifier;->isStatic(I)Z
-
-    move-result v6
-
-    xor-int/lit8 v6, v6, 0x1
-
-    if-eqz v6, :cond_0
-
-    add-int/lit8 v5, v5, 0x1
-
-    :cond_0
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    add-int/2addr v1, v5
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    :goto_2
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    instance-of v0, p0, Lj0/d$a;
-
-    if-eqz v0, :cond_3
-
-    move-object p0, p1
-
-    :cond_3
-    check-cast p0, Ljava/lang/Number;
-
-    invoke-virtual {p0}, Ljava/lang/Number;->intValue()I
-
-    move-result p0
-
-    return p0
-
-    :cond_4
-    const-string p0, "$this$kotlin"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Throwable;",
-            ">(TE;)TE;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_17
-
-    instance-of v1, p0, Lk0/a/t;
-
-    if-eqz v1, :cond_1
-
-    :try_start_0
-    check-cast p0, Lk0/a/t;
-
-    invoke-interface {p0}, Lk0/a/t;->a()Ljava/lang/Throwable;
-
-    move-result-object p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p0
-
-    invoke-static {p0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    :goto_0
-    instance-of v1, p0, Lj0/d$a;
-
-    if-eqz v1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    move-object v0, p0
-
-    :goto_1
-    check-cast v0, Ljava/lang/Throwable;
-
-    return-object v0
-
-    :cond_1
-    sget-object v1, Lk0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
-
-    :try_start_1
-    sget-object v2, Lk0/a/r1/j;->c:Ljava/util/WeakHashMap;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/jvm/functions/Function1;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_3
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Ljava/lang/Throwable;
-
-    return-object p0
-
-    :cond_2
-    sget v1, Lk0/a/r1/j;->a:I
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    invoke-static {v2, v3}, Lk0/a/r1/j;->a(Ljava/lang/Class;I)I
-
-    move-result v2
-
-    if-eq v1, v2, :cond_7
-
-    sget-object v1, Lk0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
-
-    move-result-object v2
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getWriteHoldCount()I
-
-    move-result v4
-
-    if-nez v4, :cond_3
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getReadHoldCount()I
-
-    move-result v4
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v4, 0x0
-
-    :goto_2
-    const/4 v5, 0x0
-
-    :goto_3
-    if-ge v5, v4, :cond_4
-
-    invoke-virtual {v2}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
-
-    :try_start_2
-    sget-object v5, Lk0/a/r1/j;->c:Ljava/util/WeakHashMap;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    sget-object v6, Lk0/a/r1/j$b;->d:Lk0/a/r1/j$b;
-
-    invoke-interface {v5, p0, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :goto_4
-    if-ge v3, v4, :cond_5
-
-    invoke-virtual {v2}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_4
-
-    :cond_5
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
-
-    return-object v0
-
-    :catchall_1
-    move-exception p0
-
-    :goto_5
-    if-ge v3, v4, :cond_6
-
-    invoke-virtual {v2}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_5
-
-    :cond_6
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
-
-    throw p0
-
-    :cond_7
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getConstructors()[Ljava/lang/reflect/Constructor;
-
-    move-result-object v1
-
-    const-string v2, "exception.javaClass.constructors"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v2, Lk0/a/r1/j$a;
-
-    invoke-direct {v2}, Lk0/a/r1/j$a;-><init>()V
-
-    array-length v4, v1
-
-    const/4 v5, 0x1
-
-    if-nez v4, :cond_8
-
-    const/4 v4, 0x1
-
-    goto :goto_6
-
-    :cond_8
-    const/4 v4, 0x0
-
-    :goto_6
-    if-eqz v4, :cond_9
-
-    goto :goto_7
-
-    :cond_9
-    array-length v4, v1
-
-    invoke-static {v1, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    const-string v4, "java.util.Arrays.copyOf(this, size)"
-
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v1, v2}, Lf/n/a/k/a;->sortWith([Ljava/lang/Object;Ljava/util/Comparator;)V
-
-    :goto_7
-    invoke-static {v1}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    move-object v2, v0
-
-    :cond_a
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_10
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/reflect/Constructor;
-
-    const-string v4, "constructor"
-
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-class v4, Ljava/lang/String;
-
-    invoke-virtual {v2}, Ljava/lang/reflect/Constructor;->getParameterTypes()[Ljava/lang/Class;
-
-    move-result-object v6
-
-    array-length v7, v6
-
-    if-eqz v7, :cond_f
-
-    if-eq v7, v5, :cond_c
-
-    const/4 v8, 0x2
-
-    if-eq v7, v8, :cond_b
-
-    goto :goto_8
-
-    :cond_b
-    aget-object v7, v6, v3
-
-    invoke-static {v7, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_e
-
-    aget-object v4, v6, v5
-
-    const-class v6, Ljava/lang/Throwable;
-
-    invoke-static {v4, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_e
-
-    new-instance v4, Lk0/a/r1/f;
-
-    invoke-direct {v4, v2}, Lk0/a/r1/f;-><init>(Ljava/lang/reflect/Constructor;)V
-
-    goto :goto_9
-
-    :cond_c
-    aget-object v6, v6, v3
-
-    const-class v7, Ljava/lang/Throwable;
-
-    invoke-static {v6, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_d
-
-    new-instance v4, Lk0/a/r1/g;
-
-    invoke-direct {v4, v2}, Lk0/a/r1/g;-><init>(Ljava/lang/reflect/Constructor;)V
-
-    goto :goto_9
-
-    :cond_d
-    invoke-static {v6, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_e
-
-    new-instance v4, Lk0/a/r1/h;
-
-    invoke-direct {v4, v2}, Lk0/a/r1/h;-><init>(Ljava/lang/reflect/Constructor;)V
-
-    goto :goto_9
-
-    :cond_e
-    :goto_8
-    move-object v2, v0
-
-    goto :goto_a
-
-    :cond_f
-    new-instance v4, Lk0/a/r1/i;
-
-    invoke-direct {v4, v2}, Lk0/a/r1/i;-><init>(Ljava/lang/reflect/Constructor;)V
-
-    :goto_9
-    move-object v2, v4
-
-    :goto_a
-    if-eqz v2, :cond_a
-
-    :cond_10
-    sget-object v1, Lk0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
-
-    move-result-object v4
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getWriteHoldCount()I
-
-    move-result v5
-
-    if-nez v5, :cond_11
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getReadHoldCount()I
-
-    move-result v5
-
-    goto :goto_b
-
-    :cond_11
-    const/4 v5, 0x0
-
-    :goto_b
-    const/4 v6, 0x0
-
-    :goto_c
-    if-ge v6, v5, :cond_12
-
-    invoke-virtual {v4}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
-
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_c
-
-    :cond_12
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
-
-    :try_start_3
-    sget-object v6, Lk0/a/r1/j;->c:Ljava/util/WeakHashMap;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v7
-
-    if-eqz v2, :cond_13
-
-    move-object v8, v2
-
-    goto :goto_d
-
-    :cond_13
-    sget-object v8, Lk0/a/r1/j$c;->d:Lk0/a/r1/j$c;
-
-    :goto_d
-    invoke-interface {v6, v7, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    :goto_e
-    if-ge v3, v5, :cond_14
-
-    invoke-virtual {v4}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_e
-
-    :cond_14
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
-
-    if-eqz v2, :cond_15
-
-    invoke-interface {v2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    :cond_15
-    return-object v0
-
-    :catchall_2
-    move-exception p0
-
-    :goto_f
-    if-ge v3, v5, :cond_16
-
-    invoke-virtual {v4}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_f
-
-    :cond_16
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
-
-    throw p0
-
-    :catchall_3
-    move-exception p0
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
-
-    throw p0
-
-    :cond_17
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/k.smali b/com.discord/smali_classes2/k0/a/r1/k.smali
deleted file mode 100644
index d50bb41573..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/k.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public Lk0/a/r1/k;
-.super Lk0/a/r1/m;
-.source "LockFreeLinkedList.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/r1/m;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/l.smali b/com.discord/smali_classes2/k0/a/r1/l.smali
deleted file mode 100644
index 1e971fe268..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/l.smali
+++ /dev/null
@@ -1,66 +0,0 @@
-.class public final Lk0/a/r1/l;
-.super Ljava/lang/Object;
-.source "LockFreeLinkedList.kt"
-
-
-# static fields
-.field public static final a:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "CONDITION_FALSE"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/r1/l;->a:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public static final a(Ljava/lang/Object;)Lk0/a/r1/m;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    instance-of v1, p0, Lk0/a/r1/s;
-
-    if-nez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, p0
-
-    :goto_0
-    check-cast v0, Lk0/a/r1/s;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, v0, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v0, p0
-
-    check-cast v0, Lk0/a/r1/m;
-
-    :goto_1
-    return-object v0
-
-    :cond_2
-    const-string p0, "$this$unwrap"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/m$a.smali b/com.discord/smali_classes2/k0/a/r1/m$a.smali
deleted file mode 100644
index 59ddba8d12..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/m$a.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public abstract Lk0/a/r1/m$a;
-.super Lk0/a/r1/c;
-.source "LockFreeLinkedList.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/r1/m;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/r1/c<",
-        "Lk0/a/r1/m;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public b:Lk0/a/r1/m;
-
-.field public final c:Lk0/a/r1/m;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/r1/m;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Lk0/a/r1/c;-><init>()V
-
-    iput-object p1, p0, Lk0/a/r1/m$a;->c:Lk0/a/r1/m;
-
-    return-void
-
-    :cond_0
-    const-string p1, "newNode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/m.smali b/com.discord/smali_classes2/k0/a/r1/m.smali
deleted file mode 100644
index 6847d5d0fe..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/m.smali
+++ /dev/null
@@ -1,478 +0,0 @@
-.class public Lk0/a/r1/m;
-.super Ljava/lang/Object;
-.source "LockFreeLinkedList.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lk0/a/r1/m$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-.field public static final e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-.field public static final f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-
-# instance fields
-.field public volatile _next:Ljava/lang/Object;
-
-.field public volatile _prev:Ljava/lang/Object;
-
-.field public volatile _removedRef:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Ljava/lang/Object;
-
-    const-class v1, Lk0/a/r1/m;
-
-    const-string v2, "_next"
-
-    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v2
-
-    sput-object v2, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const-string v2, "_prev"
-
-    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v2
-
-    sput-object v2, Lk0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const-string v2, "_removedRef"
-
-    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/r1/m;->f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p0, p0, Lk0/a/r1/m;->_next:Ljava/lang/Object;
-
-    iput-object p0, p0, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lk0/a/r1/m;->_removedRef:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final b(Lk0/a/r1/m;Lk0/a/r1/r;)Lk0/a/r1/m;
-    .locals 5
-
-    :goto_0
-    const/4 p2, 0x0
-
-    move-object v0, p2
-
-    :cond_0
-    :goto_1
-    iget-object v1, p1, Lk0/a/r1/m;->_next:Ljava/lang/Object;
-
-    if-nez v1, :cond_1
-
-    return-object p1
-
-    :cond_1
-    instance-of v2, v1, Lk0/a/r1/r;
-
-    if-eqz v2, :cond_2
-
-    check-cast v1, Lk0/a/r1/r;
-
-    invoke-virtual {v1, p1}, Lk0/a/r1/r;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_1
-
-    :cond_2
-    instance-of v2, v1, Lk0/a/r1/s;
-
-    if-eqz v2, :cond_4
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {p1}, Lk0/a/r1/m;->g()Lk0/a/r1/m;
-
-    sget-object p2, Lk0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    check-cast v1, Lk0/a/r1/s;
-
-    iget-object v1, v1, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    invoke-virtual {p2, v0, p1, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-object p1, v0
-
-    goto :goto_0
-
-    :cond_3
-    iget-object p1, p1, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    invoke-static {p1}, Lk0/a/r1/l;->a(Ljava/lang/Object;)Lk0/a/r1/m;
-
-    move-result-object p1
-
-    goto :goto_1
-
-    :cond_4
-    iget-object v2, p0, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    instance-of v3, v2, Lk0/a/r1/s;
-
-    if-eqz v3, :cond_5
-
-    return-object p2
-
-    :cond_5
-    if-eq v1, p0, :cond_7
-
-    if-eqz v1, :cond_6
-
-    move-object v0, v1
-
-    check-cast v0, Lk0/a/r1/m;
-
-    move-object v4, v0
-
-    move-object v0, p1
-
-    move-object p1, v4
-
-    goto :goto_1
-
-    :cond_6
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_7
-    if-ne v2, p1, :cond_8
-
-    return-object p2
-
-    :cond_8
-    sget-object v1, Lk0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p1, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    instance-of v1, v1, Lk0/a/r1/s;
-
-    if-nez v1, :cond_0
-
-    return-object p2
-.end method
-
-.method public final c(Lk0/a/r1/m;)V
-    .locals 2
-
-    :cond_0
-    iget-object v0, p1, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/r1/s;
-
-    if-nez v1, :cond_3
-
-    invoke-virtual {p0}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eq v1, p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v1, Lk0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p1, v0, p0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {p0}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v1, v1, Lk0/a/r1/s;
-
-    if-eqz v1, :cond_3
-
-    if-eqz v0, :cond_2
-
-    check-cast v0, Lk0/a/r1/m;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p1, v0, v1}, Lk0/a/r1/m;->b(Lk0/a/r1/m;Lk0/a/r1/r;)Lk0/a/r1/m;
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    :goto_0
-    return-void
-.end method
-
-.method public final d()Ljava/lang/Object;
-    .locals 2
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/r1/m;->_next:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/r1/r;
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    check-cast v0, Lk0/a/r1/r;
-
-    invoke-virtual {v0, p0}, Lk0/a/r1/r;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-.end method
-
-.method public final e()Lk0/a/r1/m;
-    .locals 1
-
-    invoke-virtual {p0}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lk0/a/r1/l;->a(Ljava/lang/Object;)Lk0/a/r1/m;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final f()Ljava/lang/Object;
-    .locals 3
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/r1/s;
-
-    if-eqz v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    if-eqz v0, :cond_2
-
-    move-object v1, v0
-
-    check-cast v1, Lk0/a/r1/m;
-
-    invoke-virtual {v1}, Lk0/a/r1/m;->d()Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-ne v2, p0, :cond_1
-
-    return-object v0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v1, v0}, Lk0/a/r1/m;->b(Lk0/a/r1/m;Lk0/a/r1/r;)Lk0/a/r1/m;
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final g()Lk0/a/r1/m;
-    .locals 4
-
-    :cond_0
-    iget-object v0, p0, Lk0/a/r1/m;->_prev:Ljava/lang/Object;
-
-    instance-of v1, v0, Lk0/a/r1/s;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Lk0/a/r1/s;
-
-    iget-object v0, v0, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    return-object v0
-
-    :cond_1
-    if-ne v0, p0, :cond_6
-
-    move-object v1, p0
-
-    :cond_2
-    :goto_0
-    instance-of v2, v1, Lk0/a/r1/k;
-
-    if-eqz v2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    invoke-virtual {v1}, Lk0/a/r1/m;->e()Lk0/a/r1/m;
-
-    move-result-object v1
-
-    sget-boolean v2, Lk0/a/b0;->a:Z
-
-    if-eqz v2, :cond_2
-
-    if-eq v1, p0, :cond_4
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    const/4 v2, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :cond_6
-    if-eqz v0, :cond_8
-
-    move-object v1, v0
-
-    check-cast v1, Lk0/a/r1/m;
-
-    :goto_2
-    iget-object v2, v1, Lk0/a/r1/m;->_removedRef:Ljava/lang/Object;
-
-    check-cast v2, Lk0/a/r1/s;
-
-    if-eqz v2, :cond_7
-
-    goto :goto_3
-
-    :cond_7
-    new-instance v2, Lk0/a/r1/s;
-
-    invoke-direct {v2, v1}, Lk0/a/r1/s;-><init>(Lk0/a/r1/m;)V
-
-    sget-object v3, Lk0/a/r1/m;->f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v3, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    :goto_3
-    sget-object v1, Lk0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    check-cast v0, Lk0/a/r1/m;
-
-    return-object v0
-
-    :cond_8
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/n.smali b/com.discord/smali_classes2/k0/a/r1/n.smali
deleted file mode 100644
index 2f5989804d..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/n.smali
+++ /dev/null
@@ -1,285 +0,0 @@
-.class public Lk0/a/r1/n;
-.super Ljava/lang/Object;
-.source "LockFreeTaskQueue.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-
-# instance fields
-.field public volatile synthetic _cur$internal:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Lk0/a/r1/n;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "_cur$internal"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Z)V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lk0/a/r1/o;
-
-    const/16 v1, 0x8
-
-    invoke-direct {v0, v1, p1}, Lk0/a/r1/o;-><init>(IZ)V
-
-    iput-object v0, p0, Lk0/a/r1/n;->_cur$internal:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/Object;)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/r1/n;->_cur$internal:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/r1/o;
-
-    invoke-virtual {v0, p1}, Lk0/a/r1/o;->b(Ljava/lang/Object;)I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_2
-
-    if-eq v1, v2, :cond_1
-
-    const/4 v0, 0x2
-
-    if-eq v1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    sget-object v1, Lk0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v0}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object v2
-
-    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    return v2
-
-    :cond_3
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final b()Ljava/lang/Object;
-    .locals 11
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/r1/n;->_cur$internal:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/r1/o;
-
-    :cond_0
-    :goto_1
-    iget-wide v3, v0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/high16 v1, 0x1000000000000000L
-
-    and-long/2addr v1, v3
-
-    const-wide/16 v5, 0x0
-
-    const/4 v7, 0x0
-
-    cmp-long v8, v1, v5
-
-    if-eqz v8, :cond_1
-
-    sget-object v7, Lk0/a/r1/o;->g:Lk0/a/r1/v;
-
-    goto :goto_4
-
-    :cond_1
-    sget-object v1, Lk0/a/r1/o;->h:Lk0/a/r1/o$a;
-
-    const-wide/32 v1, 0x3fffffff
-
-    and-long/2addr v1, v3
-
-    const/4 v5, 0x0
-
-    shr-long/2addr v1, v5
-
-    long-to-int v8, v1
-
-    const-wide v1, 0xfffffffc0000000L
-
-    and-long/2addr v1, v3
-
-    const/16 v5, 0x1e
-
-    shr-long/2addr v1, v5
-
-    long-to-int v2, v1
-
-    iget v1, v0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v2, v1
-
-    and-int v5, v8, v1
-
-    if-ne v2, v5, :cond_2
-
-    goto :goto_4
-
-    :cond_2
-    iget-object v2, v0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    and-int/2addr v1, v8
-
-    invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v9
-
-    if-nez v9, :cond_3
-
-    iget-boolean v1, v0, Lk0/a/r1/o;->d:Z
-
-    if-eqz v1, :cond_0
-
-    goto :goto_4
-
-    :cond_3
-    instance-of v1, v9, Lk0/a/r1/o$b;
-
-    if-eqz v1, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    add-int/lit8 v1, v8, 0x1
-
-    const v2, 0x3fffffff    # 1.9999999f
-
-    and-int v10, v1, v2
-
-    sget-object v1, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    sget-object v2, Lk0/a/r1/o;->h:Lk0/a/r1/o$a;
-
-    invoke-virtual {v2, v3, v4, v10}, Lk0/a/r1/o$a;->a(JI)J
-
-    move-result-wide v5
-
-    move-object v2, v0
-
-    invoke-virtual/range {v1 .. v6}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    iget-object v1, v0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v2, v0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v2, v8
-
-    invoke-virtual {v1, v2, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    goto :goto_3
-
-    :cond_5
-    iget-boolean v1, v0, Lk0/a/r1/o;->d:Z
-
-    if-nez v1, :cond_6
-
-    goto :goto_1
-
-    :cond_6
-    move-object v1, v0
-
-    :goto_2
-    invoke-static {v1, v8, v10}, Lk0/a/r1/o;->a(Lk0/a/r1/o;II)Lk0/a/r1/o;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_7
-
-    goto :goto_2
-
-    :cond_7
-    :goto_3
-    move-object v7, v9
-
-    :goto_4
-    sget-object v1, Lk0/a/r1/o;->g:Lk0/a/r1/v;
-
-    if-eq v7, v1, :cond_8
-
-    return-object v7
-
-    :cond_8
-    sget-object v1, Lk0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v0}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object v2
-
-    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/o$a.smali b/com.discord/smali_classes2/k0/a/r1/o$a.smali
deleted file mode 100644
index 1489c035f8..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/o$a.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public final Lk0/a/r1/o$a;
-.super Ljava/lang/Object;
-.source "LockFreeTaskQueue.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/r1/o;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(JI)J
-    .locals 2
-
-    const-wide/32 v0, -0x40000000
-
-    and-long/2addr p1, v0
-
-    int-to-long v0, p3
-
-    const/4 p3, 0x0
-
-    shl-long/2addr v0, p3
-
-    or-long/2addr p1, v0
-
-    return-wide p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/o$b.smali b/com.discord/smali_classes2/k0/a/r1/o$b.smali
deleted file mode 100644
index 8abc567af4..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/o$b.smali
+++ /dev/null
@@ -1,30 +0,0 @@
-.class public final Lk0/a/r1/o$b;
-.super Ljava/lang/Object;
-.source "LockFreeTaskQueue.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/r1/o;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final a:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lk0/a/r1/o$b;->a:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/o.smali b/com.discord/smali_classes2/k0/a/r1/o.smali
deleted file mode 100644
index acbdc57ca2..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/o.smali
+++ /dev/null
@@ -1,714 +0,0 @@
-.class public final Lk0/a/r1/o;
-.super Ljava/lang/Object;
-.source "LockFreeTaskQueue.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lk0/a/r1/o$b;,
-        Lk0/a/r1/o$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-.field public static final synthetic f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-.field public static final g:Lk0/a/r1/v;
-
-.field public static final h:Lk0/a/r1/o$a;
-
-
-# instance fields
-.field public volatile _next:Ljava/lang/Object;
-
-.field public volatile synthetic _state$internal:J
-
-.field public final a:I
-
-.field public synthetic b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-.field public final c:I
-
-.field public final d:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Lk0/a/r1/o;
-
-    new-instance v1, Lk0/a/r1/o$a;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v1, v2}, Lk0/a/r1/o$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v1, Lk0/a/r1/o;->h:Lk0/a/r1/o$a;
-
-    new-instance v1, Lk0/a/r1/v;
-
-    const-string v2, "REMOVE_FROZEN"
-
-    invoke-direct {v1, v2}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v1, Lk0/a/r1/o;->g:Lk0/a/r1/v;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "_next"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v1
-
-    sput-object v1, Lk0/a/r1/o;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const-string v1, "_state$internal"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(IZ)V
-    .locals 3
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lk0/a/r1/o;->c:I
-
-    iput-boolean p2, p0, Lk0/a/r1/o;->d:Z
-
-    const/4 p2, 0x1
-
-    sub-int/2addr p1, p2
-
-    iput p1, p0, Lk0/a/r1/o;->a:I
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lk0/a/r1/o;->_next:Ljava/lang/Object;
-
-    const-wide/16 v0, 0x0
-
-    iput-wide v0, p0, Lk0/a/r1/o;->_state$internal:J
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v0, p0, Lk0/a/r1/o;->c:I
-
-    invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object p1, p0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget p1, p0, Lk0/a/r1/o;->a:I
-
-    const/4 v0, 0x0
-
-    const v1, 0x3fffffff    # 1.9999999f
-
-    if-gt p1, v1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    const-string v1, "Check failed."
-
-    if-eqz p1, :cond_3
-
-    iget p1, p0, Lk0/a/r1/o;->c:I
-
-    iget v2, p0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr p1, v2
-
-    if-nez p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p2, 0x0
-
-    :goto_1
-    if-eqz p2, :cond_2
-
-    return-void
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final a(Lk0/a/r1/o;II)Lk0/a/r1/o;
-    .locals 11
-
-    :cond_0
-    iget-wide v2, p0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/32 v0, 0x3fffffff
-
-    and-long/2addr v0, v2
-
-    const/4 v4, 0x0
-
-    shr-long/2addr v0, v4
-
-    long-to-int v6, v0
-
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    if-eqz v0, :cond_3
-
-    if-ne v6, p1, :cond_1
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p0, Ljava/lang/AssertionError;
-
-    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p0
-
-    :cond_3
-    :goto_1
-    const-wide/high16 v0, 0x1000000000000000L
-
-    and-long/2addr v0, v2
-
-    const-wide/16 v7, 0x0
-
-    cmp-long v5, v0, v7
-
-    if-eqz v5, :cond_4
-
-    invoke-virtual {p0}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object p0
-
-    goto :goto_2
-
-    :cond_4
-    sget-object v0, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    const-wide/32 v7, -0x40000000
-
-    and-long/2addr v7, v2
-
-    int-to-long v9, p2
-
-    shl-long v4, v9, v4
-
-    or-long/2addr v4, v7
-
-    move-object v1, p0
-
-    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget p0, p0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr p0, v6
-
-    const/4 p2, 0x0
-
-    invoke-virtual {p1, p0, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    move-object p0, p2
-
-    :goto_2
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final b(Ljava/lang/Object;)I
-    .locals 16
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)I"
-        }
-    .end annotation
-
-    move-object/from16 v6, p0
-
-    move-object/from16 v7, p1
-
-    if-eqz v7, :cond_9
-
-    :cond_0
-    iget-wide v2, v6, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/high16 v0, 0x3000000000000000L    # 1.727233711018889E-77
-
-    and-long/2addr v0, v2
-
-    const-wide/16 v9, 0x0
-
-    const/4 v4, 0x1
-
-    cmp-long v5, v0, v9
-
-    if-eqz v5, :cond_2
-
-    const-wide/high16 v0, 0x2000000000000000L
-
-    and-long/2addr v0, v2
-
-    cmp-long v2, v0, v9
-
-    if-eqz v2, :cond_1
-
-    const/4 v4, 0x2
-
-    :cond_1
-    return v4
-
-    :cond_2
-    const-wide/32 v0, 0x3fffffff
-
-    and-long/2addr v0, v2
-
-    const/4 v11, 0x0
-
-    shr-long/2addr v0, v11
-
-    long-to-int v1, v0
-
-    const-wide v12, 0xfffffffc0000000L
-
-    and-long/2addr v12, v2
-
-    const/16 v0, 0x1e
-
-    shr-long/2addr v12, v0
-
-    long-to-int v13, v12
-
-    iget v12, v6, Lk0/a/r1/o;->a:I
-
-    add-int/lit8 v5, v13, 0x2
-
-    and-int/2addr v5, v12
-
-    and-int v14, v1, v12
-
-    if-ne v5, v14, :cond_3
-
-    return v4
-
-    :cond_3
-    iget-boolean v5, v6, Lk0/a/r1/o;->d:Z
-
-    const v14, 0x3fffffff    # 1.9999999f
-
-    if-nez v5, :cond_5
-
-    iget-object v5, v6, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    and-int v15, v13, v12
-
-    invoke-virtual {v5, v15}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_5
-
-    iget v0, v6, Lk0/a/r1/o;->c:I
-
-    const/16 v2, 0x400
-
-    if-lt v0, v2, :cond_4
-
-    sub-int/2addr v13, v1
-
-    and-int v1, v13, v14
-
-    shr-int/lit8 v0, v0, 0x1
-
-    if-le v1, v0, :cond_0
-
-    :cond_4
-    return v4
-
-    :cond_5
-    add-int/lit8 v1, v13, 0x1
-
-    and-int/2addr v1, v14
-
-    sget-object v4, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    const-wide v14, -0xfffffffc0000001L    # -3.1050369248997324E231
-
-    and-long/2addr v14, v2
-
-    int-to-long v8, v1
-
-    shl-long v0, v8, v0
-
-    or-long v8, v14, v0
-
-    move-object v0, v4
-
-    move-object/from16 v1, p0
-
-    move-wide v4, v8
-
-    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, v6, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    and-int v1, v13, v12
-
-    invoke-virtual {v0, v1, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    move-object v0, v6
-
-    :goto_0
-    iget-wide v1, v0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/high16 v3, 0x1000000000000000L
-
-    and-long/2addr v1, v3
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_6
-
-    goto :goto_2
-
-    :cond_6
-    invoke-virtual {v0}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object v0
-
-    iget-object v1, v0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v2, v0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v2, v13
-
-    invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    instance-of v2, v1, Lk0/a/r1/o$b;
-
-    if-eqz v2, :cond_7
-
-    check-cast v1, Lk0/a/r1/o$b;
-
-    iget v1, v1, Lk0/a/r1/o$b;->a:I
-
-    if-ne v1, v13, :cond_7
-
-    iget-object v1, v0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v2, v0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v2, v13
-
-    invoke-virtual {v1, v2, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_7
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_8
-
-    goto :goto_0
-
-    :cond_8
-    :goto_2
-    return v11
-
-    :cond_9
-    const-string v0, "element"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public final c()Z
-    .locals 10
-
-    :cond_0
-    iget-wide v2, p0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/high16 v0, 0x2000000000000000L
-
-    and-long v4, v2, v0
-
-    const/4 v6, 0x1
-
-    const-wide/16 v7, 0x0
-
-    cmp-long v9, v4, v7
-
-    if-eqz v9, :cond_1
-
-    return v6
-
-    :cond_1
-    const-wide/high16 v4, 0x1000000000000000L
-
-    and-long/2addr v4, v2
-
-    cmp-long v9, v4, v7
-
-    if-eqz v9, :cond_2
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_2
-    or-long v4, v2, v0
-
-    sget-object v0, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    move-object v1, p0
-
-    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return v6
-.end method
-
-.method public final d()Z
-    .locals 7
-
-    iget-wide v0, p0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/32 v2, 0x3fffffff
-
-    and-long/2addr v2, v0
-
-    const/4 v4, 0x0
-
-    shr-long/2addr v2, v4
-
-    long-to-int v3, v2
-
-    const-wide v5, 0xfffffffc0000000L
-
-    and-long/2addr v0, v5
-
-    const/16 v2, 0x1e
-
-    shr-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    if-ne v3, v1, :cond_0
-
-    const/4 v4, 0x1
-
-    :cond_0
-    return v4
-.end method
-
-.method public final e()Lk0/a/r1/o;
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lk0/a/r1/o<",
-            "TE;>;"
-        }
-    .end annotation
-
-    :cond_0
-    iget-wide v2, p0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/high16 v0, 0x1000000000000000L
-
-    and-long v4, v2, v0
-
-    const-wide/16 v6, 0x0
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    or-long v6, v2, v0
-
-    sget-object v0, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    move-object v1, p0
-
-    move-wide v4, v6
-
-    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    move-wide v2, v6
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/r1/o;->_next:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/r1/o;
-
-    if-eqz v0, :cond_2
-
-    return-object v0
-
-    :cond_2
-    sget-object v0, Lk0/a/r1/o;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const/4 v1, 0x0
-
-    new-instance v4, Lk0/a/r1/o;
-
-    iget v5, p0, Lk0/a/r1/o;->c:I
-
-    mul-int/lit8 v5, v5, 0x2
-
-    iget-boolean v6, p0, Lk0/a/r1/o;->d:Z
-
-    invoke-direct {v4, v5, v6}, Lk0/a/r1/o;-><init>(IZ)V
-
-    const-wide/32 v5, 0x3fffffff
-
-    and-long/2addr v5, v2
-
-    const/4 v7, 0x0
-
-    shr-long/2addr v5, v7
-
-    long-to-int v6, v5
-
-    const-wide v7, 0xfffffffc0000000L
-
-    and-long/2addr v7, v2
-
-    const/16 v5, 0x1e
-
-    shr-long/2addr v7, v5
-
-    long-to-int v5, v7
-
-    :goto_1
-    iget v7, p0, Lk0/a/r1/o;->a:I
-
-    and-int v8, v6, v7
-
-    and-int/2addr v7, v5
-
-    if-eq v8, v7, :cond_4
-
-    iget-object v7, p0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v7, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    new-instance v7, Lk0/a/r1/o$b;
-
-    invoke-direct {v7, v6}, Lk0/a/r1/o$b;-><init>(I)V
-
-    :goto_2
-    iget-object v8, v4, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v9, v4, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v9, v6
-
-    invoke-virtual {v8, v9, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    const-wide v5, -0x1000000000000001L    # -3.1050361846014175E231
-
-    and-long/2addr v5, v2
-
-    iput-wide v5, v4, Lk0/a/r1/o;->_state$internal:J
-
-    invoke-virtual {v0, p0, v1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/p.smali b/com.discord/smali_classes2/k0/a/r1/p.smali
deleted file mode 100644
index dcb7458144..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/p.smali
+++ /dev/null
@@ -1,166 +0,0 @@
-.class public final Lk0/a/r1/p;
-.super Ljava/lang/Object;
-.source "MainDispatchers.kt"
-
-
-# static fields
-.field public static final a:Z
-
-.field public static final b:Lk0/a/f1;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 8
-
-    const-string v0, "kotlinx.coroutines.fast.service.loader"
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, v1}, Lf/n/a/k/a;->c0(Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    sput-boolean v0, Lk0/a/r1/p;->a:Z
-
-    const/4 v0, 0x2
-
-    const/4 v1, 0x0
-
-    :try_start_0
-    invoke-static {}, La;->b()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    const-string v3, "ServiceLoader.load(\n    \u2026             ).iterator()"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lf/n/a/k/a;->asSequence(Ljava/util/Iterator;)Lkotlin/sequences/Sequence;
-
-    move-result-object v2
-
-    invoke-static {v2}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-
-    move-result-object v2
-
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-nez v4, :cond_0
-
-    move-object v4, v1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-nez v5, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v5, v4
-
-    check-cast v5, Lkotlinx/coroutines/internal/MainDispatcherFactory;
-
-    invoke-interface {v5}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->c()I
-
-    move-result v5
-
-    :cond_2
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v6
-
-    move-object v7, v6
-
-    check-cast v7, Lkotlinx/coroutines/internal/MainDispatcherFactory;
-
-    invoke-interface {v7}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->c()I
-
-    move-result v7
-
-    if-ge v5, v7, :cond_3
-
-    move-object v4, v6
-
-    move v5, v7
-
-    :cond_3
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v6
-
-    if-nez v6, :cond_2
-
-    :goto_0
-    check-cast v4, Lkotlinx/coroutines/internal/MainDispatcherFactory;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v4, :cond_4
-
-    :try_start_1
-    invoke-interface {v4, v2}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->b(Ljava/util/List;)Lk0/a/f1;
-
-    move-result-object v2
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v2
-
-    :try_start_2
-    new-instance v3, Lk0/a/r1/q;
-
-    invoke-interface {v4}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->a()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-direct {v3, v2, v4}, Lk0/a/r1/q;-><init>(Ljava/lang/Throwable;Ljava/lang/String;)V
-
-    move-object v2, v3
-
-    :goto_1
-    if-eqz v2, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    new-instance v2, Lk0/a/r1/q;
-
-    invoke-direct {v2, v1, v1, v0}, Lk0/a/r1/q;-><init>(Ljava/lang/Throwable;Ljava/lang/String;I)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    goto :goto_2
-
-    :catchall_1
-    move-exception v2
-
-    new-instance v3, Lk0/a/r1/q;
-
-    invoke-direct {v3, v2, v1, v0}, Lk0/a/r1/q;-><init>(Ljava/lang/Throwable;Ljava/lang/String;I)V
-
-    move-object v2, v3
-
-    :goto_2
-    sput-object v2, Lk0/a/r1/p;->b:Lk0/a/f1;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/q.smali b/com.discord/smali_classes2/k0/a/r1/q.smali
deleted file mode 100644
index 7feebd498e..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/q.smali
+++ /dev/null
@@ -1,199 +0,0 @@
-.class public final Lk0/a/r1/q;
-.super Lk0/a/f1;
-.source "MainDispatchers.kt"
-
-# interfaces
-.implements Lk0/a/e0;
-
-
-# instance fields
-.field public final d:Ljava/lang/Throwable;
-
-.field public final e:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Throwable;Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/f1;-><init>()V
-
-    iput-object p1, p0, Lk0/a/r1/q;->d:Ljava/lang/Throwable;
-
-    iput-object p2, p0, Lk0/a/r1/q;->e:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Throwable;Ljava/lang/String;I)V
-    .locals 0
-
-    and-int/lit8 p2, p3, 0x2
-
-    const/4 p2, 0x0
-
-    invoke-direct {p0}, Lk0/a/f1;-><init>()V
-
-    iput-object p1, p0, Lk0/a/r1/q;->d:Ljava/lang/Throwable;
-
-    iput-object p2, p0, Lk0/a/r1/q;->e:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public b(JLk0/a/f;)V
-    .locals 0
-
-    invoke-virtual {p0}, Lk0/a/r1/q;->w()Ljava/lang/Void;
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 0
-
-    const/4 p2, 0x0
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lk0/a/r1/q;->w()Ljava/lang/Void;
-
-    throw p2
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lk0/a/r1/q;->w()Ljava/lang/Void;
-
-    throw v0
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "Main[missing"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/r1/q;->d:Ljava/lang/Throwable;
-
-    if-eqz v1, :cond_0
-
-    const-string v1, ", cause="
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lk0/a/r1/q;->d:Ljava/lang/Throwable;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, ""
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public v()Lk0/a/f1;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public final w()Ljava/lang/Void;
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/r1/q;->d:Ljava/lang/Throwable;
-
-    if-eqz v0, :cond_1
-
-    const-string v0, "Module with the Main dispatcher had failed to initialize"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/r1/q;->e:Ljava/lang/String;
-
-    if-eqz v1, :cond_0
-
-    const-string v2, ". "
-
-    invoke-static {v2, v1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, ""
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    iget-object v2, p0, Lk0/a/r1/q;->d:Ljava/lang/Throwable;
-
-    invoke-direct {v1, v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Module with the Main dispatcher is missing. Add dependency providing the Main dispatcher, e.g. \'kotlinx-coroutines-android\'"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/r.smali b/com.discord/smali_classes2/k0/a/r1/r.smali
deleted file mode 100644
index 12603b55c0..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/r.smali
+++ /dev/null
@@ -1,18 +0,0 @@
-.class public abstract Lk0/a/r1/r;
-.super Ljava/lang/Object;
-.source "Atomic.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ljava/lang/Object;)Ljava/lang/Object;
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/s.smali b/com.discord/smali_classes2/k0/a/r1/s.smali
deleted file mode 100644
index a07f52e826..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/s.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.class public final Lk0/a/r1/s;
-.super Ljava/lang/Object;
-.source "LockFreeLinkedList.kt"
-
-
-# instance fields
-.field public final a:Lk0/a/r1/m;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/r1/m;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "Removed["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/r1/s;->a:Lk0/a/r1/m;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/t.smali b/com.discord/smali_classes2/k0/a/r1/t.smali
deleted file mode 100644
index f2420be745..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/t.smali
+++ /dev/null
@@ -1,319 +0,0 @@
-.class public Lk0/a/r1/t;
-.super Lk0/a/a;
-.source "Scopes.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lk0/a/a<",
-        "TT;>;",
-        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final g:Lkotlin/coroutines/Continuation;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext;",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, p1, v0}, Lk0/a/a;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
-
-    iput-object p2, p0, Lk0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final B()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public P()I
-    .locals 1
-
-    const/4 v0, 0x2
-
-    return v0
-.end method
-
-.method public final getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
-
-    check-cast v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    return-object v0
-.end method
-
-.method public final getStackTraceElement()Ljava/lang/StackTraceElement;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public j(Ljava/lang/Object;I)V
-    .locals 7
-
-    instance-of v0, p1, Lk0/a/p;
-
-    const-string v1, "Invalid mode "
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x2
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x4
-
-    const/4 v6, 0x0
-
-    if-eqz v0, :cond_8
-
-    check-cast p1, Lk0/a/p;
-
-    iget-object p1, p1, Lk0/a/p;->a:Ljava/lang/Throwable;
-
-    if-ne p2, v5, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lk0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
-
-    invoke-static {p1, v0}, Lk0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
-
-    if-eqz v0, :cond_7
-
-    if-eqz p1, :cond_6
-
-    if-eqz p2, :cond_5
-
-    if-eq p2, v4, :cond_4
-
-    if-eq p2, v3, :cond_3
-
-    if-eq p2, v2, :cond_2
-
-    if-ne p2, v5, :cond_1
-
-    goto/16 :goto_1
-
-    :cond_1
-    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p2
-
-    invoke-static {p2, v6}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    :try_start_0
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-static {p2, v1}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    goto/16 :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p2, v1}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_3
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_4
-    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-
-    move-result-object p2
-
-    invoke-static {p2, p1}, Lk0/a/h0;->d(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :cond_5
-    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-
-    move-result-object p2
-
-    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-interface {p2, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_6
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_7
-    const-string p1, "$this$resumeUninterceptedWithExceptionMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-
-    :cond_8
-    iget-object v0, p0, Lk0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
-
-    if-eqz v0, :cond_e
-
-    if-eqz p2, :cond_d
-
-    if-eq p2, v4, :cond_c
-
-    if-eq p2, v3, :cond_b
-
-    if-eq p2, v2, :cond_a
-
-    if-ne p2, v5, :cond_9
-
-    goto :goto_1
-
-    :cond_9
-    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_a
-    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p2
-
-    invoke-static {p2, v6}, Lk0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    :try_start_1
-    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    invoke-static {p2, v1}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception p1
-
-    invoke-static {p2, v1}, Lk0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_b
-    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_c
-    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-
-    move-result-object p2
-
-    invoke-static {p2, p1}, Lk0/a/h0;->c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_d
-    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-
-    move-result-object p2
-
-    invoke-interface {p2, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
-
-    :goto_1
-    return-void
-
-    :cond_e
-    const-string p1, "$this$resumeUninterceptedMode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v6
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/u.smali b/com.discord/smali_classes2/k0/a/r1/u.smali
deleted file mode 100644
index 5edb9c8968..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/u.smali
+++ /dev/null
@@ -1,694 +0,0 @@
-.class public final Lk0/a/r1/u;
-.super Ljava/lang/Object;
-.source "StackTraceRecovery.kt"
-
-
-# static fields
-.field public static final a:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    :try_start_0
-    const-string v0, "j0.k.h.a.a"
-
-    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v0
-
-    const-string v1, "Class.forName(baseContinuationImplClass)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getCanonicalName()Ljava/lang/String;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-static {v0}, Lj0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    if-nez v1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    const-string v0, "kotlin.coroutines.jvm.internal.BaseContinuationImpl"
-
-    :goto_1
-    check-cast v0, Ljava/lang/String;
-
-    sput-object v0, Lk0/a/r1/u;->a:Ljava/lang/String;
-
-    :try_start_1
-    const-string v0, "k0.a.r1.u"
-
-    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v0
-
-    const-string v1, "Class.forName(stackTraceRecoveryClass)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getCanonicalName()Ljava/lang/String;
-
-    move-result-object v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    goto :goto_2
-
-    :catchall_1
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    :goto_2
-    invoke-static {v0}, Lj0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    if-nez v1, :cond_1
-
-    goto :goto_3
-
-    :cond_1
-    const-string v0, "kotlinx.coroutines.internal.StackTraceRecoveryKt"
-
-    :goto_3
-    check-cast v0, Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static final a(Ljava/lang/StackTraceElement;)Z
-    .locals 3
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p0}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v0, "className"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x2
-
-    const-string v2, "\u0008\u0008\u0008"
-
-    invoke-static {p0, v2, v0, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const-string p0, "$this$isArtificial"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
-    .locals 11
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Throwable;",
-            ">(TE;",
-            "Lkotlin/coroutines/Continuation<",
-            "*>;)TE;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_15
-
-    if-eqz p1, :cond_14
-
-    sget-boolean v0, Lk0/a/b0;->c:Z
-
-    if-eqz v0, :cond_13
-
-    instance-of v0, p1, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    if-nez v0, :cond_0
-
-    goto/16 :goto_e
-
-    :cond_0
-    check-cast p1, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    invoke-virtual {p0}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v3
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v4
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_4
-
-    invoke-virtual {p0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
-
-    move-result-object v3
-
-    const-string v4, "currentTrace"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v4, v3
-
-    const/4 v5, 0x0
-
-    :goto_0
-    if-ge v5, v4, :cond_2
-
-    aget-object v6, v3, v5
-
-    const-string v7, "it"
-
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v6}, Lk0/a/r1/u;->a(Ljava/lang/StackTraceElement;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_1
-
-    const/4 v4, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v4, 0x0
-
-    :goto_1
-    if-eqz v4, :cond_3
-
-    new-instance v4, Lkotlin/Pair;
-
-    invoke-direct {v4, v0, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    goto :goto_3
-
-    :cond_3
-    new-array v0, v2, [Ljava/lang/StackTraceElement;
-
-    new-instance v3, Lkotlin/Pair;
-
-    invoke-direct {v3, p0, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    goto :goto_2
-
-    :cond_4
-    new-array v0, v2, [Ljava/lang/StackTraceElement;
-
-    new-instance v3, Lkotlin/Pair;
-
-    invoke-direct {v3, p0, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-
-    :goto_2
-    move-object v4, v3
-
-    :goto_3
-    iget-object v0, v4, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    iget-object v3, v4, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    check-cast v3, [Ljava/lang/StackTraceElement;
-
-    invoke-static {v0}, Lk0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_13
-
-    new-instance v5, Ljava/util/ArrayDeque;
-
-    invoke-direct {v5}, Ljava/util/ArrayDeque;-><init>()V
-
-    invoke-interface {p1}, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;->getStackTraceElement()Ljava/lang/StackTraceElement;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_5
-
-    invoke-virtual {v5, v6}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    :cond_5
-    :goto_4
-    invoke-interface {p1}, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;->getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_6
-
-    invoke-interface {p1}, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;->getStackTraceElement()Ljava/lang/StackTraceElement;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_5
-
-    invoke-virtual {v5, v6}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    goto :goto_4
-
-    :cond_6
-    invoke-virtual {v5}, Ljava/util/ArrayDeque;->isEmpty()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_7
-
-    goto/16 :goto_e
-
-    :cond_7
-    const/4 p1, -0x1
-
-    if-eq v0, p0, :cond_c
-
-    array-length p0, v3
-
-    const/4 v6, 0x0
-
-    :goto_5
-    if-ge v6, p0, :cond_9
-
-    aget-object v7, v3, v6
-
-    invoke-static {v7}, Lk0/a/r1/u;->a(Ljava/lang/StackTraceElement;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_8
-
-    goto :goto_6
-
-    :cond_8
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_5
-
-    :cond_9
-    const/4 v6, -0x1
-
-    :goto_6
-    add-int/2addr v6, v1
-
-    array-length p0, v3
-
-    sub-int/2addr p0, v1
-
-    if-lt p0, v6, :cond_c
-
-    :goto_7
-    aget-object v7, v3, p0
-
-    invoke-virtual {v5}, Ljava/util/ArrayDeque;->getLast()Ljava/lang/Object;
-
-    move-result-object v8
-
-    const-string v9, "result.last"
-
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v8, Ljava/lang/StackTraceElement;
-
-    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getLineNumber()I
-
-    move-result v9
-
-    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getLineNumber()I
-
-    move-result v10
-
-    if-ne v9, v10, :cond_a
-
-    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getMethodName()Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getMethodName()Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-static {v9, v10}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_a
-
-    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getFileName()Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getFileName()Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-static {v9, v10}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_a
-
-    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-static {v7, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_a
-
-    const/4 v7, 0x1
-
-    goto :goto_8
-
-    :cond_a
-    const/4 v7, 0x0
-
-    :goto_8
-    if-eqz v7, :cond_b
-
-    invoke-virtual {v5}, Ljava/util/ArrayDeque;->removeLast()Ljava/lang/Object;
-
-    :cond_b
-    aget-object v7, v3, p0
-
-    invoke-virtual {v5, v7}, Ljava/util/ArrayDeque;->addFirst(Ljava/lang/Object;)V
-
-    if-eq p0, v6, :cond_c
-
-    add-int/lit8 p0, p0, -0x1
-
-    goto :goto_7
-
-    :cond_c
-    new-instance p0, Ljava/lang/StackTraceElement;
-
-    const-string v3, "\u0008\u0008\u0008(Coroutine boundary"
-
-    const-string v6, "\u0008"
-
-    invoke-direct {p0, v3, v6, v6, p1}, Ljava/lang/StackTraceElement;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
-
-    invoke-virtual {v5, p0}, Ljava/util/ArrayDeque;->addFirst(Ljava/lang/Object;)V
-
-    invoke-virtual {v0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
-
-    move-result-object p0
-
-    const-string v0, "causeTrace"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v0, Lk0/a/r1/u;->a:Ljava/lang/String;
-
-    const-string v3, "baseContinuationImplClassName"
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v3, p0
-
-    const/4 v6, 0x0
-
-    :goto_9
-    if-ge v6, v3, :cond_e
-
-    aget-object v7, p0, v6
-
-    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-static {v0, v7}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_d
-
-    goto :goto_a
-
-    :cond_d
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_9
-
-    :cond_e
-    const/4 v6, -0x1
-
-    :goto_a
-    if-ne v6, p1, :cond_10
-
-    new-array p0, v2, [Ljava/lang/StackTraceElement;
-
-    invoke-virtual {v5, p0}, Ljava/util/ArrayDeque;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_f
-
-    check-cast p0, [Ljava/lang/StackTraceElement;
-
-    invoke-virtual {v4, p0}, Ljava/lang/Throwable;->setStackTrace([Ljava/lang/StackTraceElement;)V
-
-    goto :goto_d
-
-    :cond_f
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_10
-    invoke-virtual {v5}, Ljava/util/ArrayDeque;->size()I
-
-    move-result p1
-
-    add-int/2addr p1, v6
-
-    new-array p1, p1, [Ljava/lang/StackTraceElement;
-
-    const/4 v0, 0x0
-
-    :goto_b
-    if-ge v0, v6, :cond_11
-
-    aget-object v3, p0, v0
-
-    aput-object v3, p1, v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_b
-
-    :cond_11
-    invoke-virtual {v5}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_c
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_12
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/StackTraceElement;
-
-    add-int v3, v6, v2
-
-    aput-object v0, p1, v3
-
-    add-int/2addr v2, v1
-
-    goto :goto_c
-
-    :cond_12
-    invoke-virtual {v4, p1}, Ljava/lang/Throwable;->setStackTrace([Ljava/lang/StackTraceElement;)V
-
-    :goto_d
-    move-object p0, v4
-
-    :cond_13
-    :goto_e
-    return-object p0
-
-    :cond_14
-    const-string p0, "continuation"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_15
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Throwable;",
-            ">(TE;)TE;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_5
-
-    sget-boolean v0, Lk0/a/b0;->c:Z
-
-    if-nez v0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    xor-int/2addr v1, v2
-
-    if-eqz v1, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    invoke-virtual {p0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
-
-    move-result-object v1
-
-    const-string v3, "exception.stackTrace"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v3, v1
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    :goto_0
-    if-ge v5, v3, :cond_3
-
-    aget-object v6, v1, v5
-
-    const-string v7, "it"
-
-    invoke-static {v6, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v6}, Lk0/a/r1/u;->a(Ljava/lang/StackTraceElement;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_4
-
-    return-object v0
-
-    :cond_4
-    :goto_2
-    return-object p0
-
-    :cond_5
-    const-string p0, "exception"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/v.smali b/com.discord/smali_classes2/k0/a/r1/v.smali
deleted file mode 100644
index de2c2e6079..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/v.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lk0/a/r1/v;
-.super Ljava/lang/Object;
-.source "Symbol.kt"
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/r1/v;->a:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/r1/v;->a:Ljava/lang/String;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/w.smali b/com.discord/smali_classes2/k0/a/r1/w.smali
deleted file mode 100644
index cefae2afb2..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/w.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public final synthetic Lk0/a/r1/w;
-.super Ljava/lang/Object;
-.source "SystemProps.kt"
-
-
-# static fields
-.field public static final a:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
-
-    move-result v0
-
-    sput v0, Lk0/a/r1/w;->a:I
-
-    return-void
-.end method
-
-.method public static final a(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_0
-
-    :try_start_0
-    invoke-static {p0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-object v0
-
-    :cond_0
-    const-string p0, "propertyName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/x$a.smali b/com.discord/smali_classes2/k0/a/r1/x$a.smali
deleted file mode 100644
index 3f5730e0c6..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/x$a.smali
+++ /dev/null
@@ -1,119 +0,0 @@
-.class public final Lk0/a/r1/x$a;
-.super Lj0/n/c/i;
-.source "ThreadContext.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/r1/x;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lk0/a/r1/x$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/r1/x$a;
-
-    invoke-direct {v0}, Lk0/a/r1/x$a;-><init>()V
-
-    sput-object v0, Lk0/a/r1/x$a;->d:Lk0/a/r1/x$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_4
-
-    instance-of v1, p2, Lk0/a/m1;
-
-    if-eqz v1, :cond_3
-
-    instance-of v1, p1, Ljava/lang/Integer;
-
-    if-nez v1, :cond_0
-
-    move-object p1, v0
-
-    :cond_0
-    check-cast p1, Ljava/lang/Integer;
-
-    const/4 v0, 0x1
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x1
-
-    :goto_0
-    if-nez p1, :cond_2
-
-    move-object p1, p2
-
-    goto :goto_1
-
-    :cond_2
-    add-int/2addr p1, v0
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    :cond_3
-    :goto_1
-    return-object p1
-
-    :cond_4
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/x$b.smali b/com.discord/smali_classes2/k0/a/r1/x$b.smali
deleted file mode 100644
index a9f07a9d08..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/x$b.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.class public final Lk0/a/r1/x$b;
-.super Lj0/n/c/i;
-.source "ThreadContext.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/r1/x;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Lk0/a/m1<",
-        "*>;",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "Lk0/a/m1<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lk0/a/r1/x$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/r1/x$b;
-
-    invoke-direct {v0}, Lk0/a/r1/x$b;-><init>()V
-
-    sput-object v0, Lk0/a/r1/x$b;->d:Lk0/a/r1/x$b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lk0/a/m1;
-
-    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_2
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    instance-of p1, p2, Lk0/a/m1;
-
-    if-nez p1, :cond_1
-
-    move-object p2, v0
-
-    :cond_1
-    move-object p1, p2
-
-    check-cast p1, Lk0/a/m1;
-
-    :goto_0
-    return-object p1
-
-    :cond_2
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/x$c.smali b/com.discord/smali_classes2/k0/a/r1/x$c.smali
deleted file mode 100644
index dad27b89b5..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/x$c.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lk0/a/r1/x$c;
-.super Lj0/n/c/i;
-.source "ThreadContext.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/r1/x;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Lk0/a/r1/a0;",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "Lk0/a/r1/a0;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lk0/a/r1/x$c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/r1/x$c;
-
-    invoke-direct {v0}, Lk0/a/r1/x$c;-><init>()V
-
-    sput-object v0, Lk0/a/r1/x$c;->d:Lk0/a/r1/x$c;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
-
-    check-cast p1, Lk0/a/r1/a0;
-
-    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    instance-of v0, p2, Lk0/a/m1;
-
-    if-eqz v0, :cond_0
-
-    check-cast p2, Lk0/a/m1;
-
-    iget-object v0, p1, Lk0/a/r1/a0;->c:Lkotlin/coroutines/CoroutineContext;
-
-    iget-object v1, p1, Lk0/a/r1/a0;->a:[Ljava/lang/Object;
-
-    iget v2, p1, Lk0/a/r1/a0;->b:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    iput v3, p1, Lk0/a/r1/a0;->b:I
-
-    aget-object v1, v1, v2
-
-    invoke-interface {p2, v0, v1}, Lk0/a/m1;->k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    :cond_0
-    return-object p1
-
-    :cond_1
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/x$d.smali b/com.discord/smali_classes2/k0/a/r1/x$d.smali
deleted file mode 100644
index 9136f10fcd..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/x$d.smali
+++ /dev/null
@@ -1,111 +0,0 @@
-.class public final Lk0/a/r1/x$d;
-.super Lj0/n/c/i;
-.source "ThreadContext.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/r1/x;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Lk0/a/r1/a0;",
-        "Lkotlin/coroutines/CoroutineContext$a;",
-        "Lk0/a/r1/a0;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lk0/a/r1/x$d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/r1/x$d;
-
-    invoke-direct {v0}, Lk0/a/r1/x$d;-><init>()V
-
-    sput-object v0, Lk0/a/r1/x$d;->d:Lk0/a/r1/x$d;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lk0/a/r1/a0;
-
-    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    instance-of v0, p2, Lk0/a/m1;
-
-    if-eqz v0, :cond_0
-
-    check-cast p2, Lk0/a/m1;
-
-    iget-object v0, p1, Lk0/a/r1/a0;->c:Lkotlin/coroutines/CoroutineContext;
-
-    invoke-interface {p2, v0}, Lk0/a/m1;->r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    iget-object v0, p1, Lk0/a/r1/a0;->a:[Ljava/lang/Object;
-
-    iget v1, p1, Lk0/a/r1/a0;->b:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p1, Lk0/a/r1/a0;->b:I
-
-    aput-object p2, v0, v1
-
-    :cond_0
-    return-object p1
-
-    :cond_1
-    const-string p1, "element"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/x.smali b/com.discord/smali_classes2/k0/a/r1/x.smali
deleted file mode 100644
index c9f3b398c2..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/x.smali
+++ /dev/null
@@ -1,261 +0,0 @@
-.class public final Lk0/a/r1/x;
-.super Ljava/lang/Object;
-.source "ThreadContext.kt"
-
-
-# static fields
-.field public static final a:Lk0/a/r1/v;
-
-.field public static final b:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "Ljava/lang/Object;",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final c:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "Lk0/a/m1<",
-            "*>;",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "Lk0/a/m1<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field public static final d:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "Lk0/a/r1/a0;",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "Lk0/a/r1/a0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final e:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "Lk0/a/r1/a0;",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "Lk0/a/r1/a0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "ZERO"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/r1/x;->a:Lk0/a/r1/v;
-
-    sget-object v0, Lk0/a/r1/x$a;->d:Lk0/a/r1/x$a;
-
-    sput-object v0, Lk0/a/r1/x;->b:Lkotlin/jvm/functions/Function2;
-
-    sget-object v0, Lk0/a/r1/x$b;->d:Lk0/a/r1/x$b;
-
-    sput-object v0, Lk0/a/r1/x;->c:Lkotlin/jvm/functions/Function2;
-
-    sget-object v0, Lk0/a/r1/x$d;->d:Lk0/a/r1/x$d;
-
-    sput-object v0, Lk0/a/r1/x;->d:Lkotlin/jvm/functions/Function2;
-
-    sget-object v0, Lk0/a/r1/x$c;->d:Lk0/a/r1/x$c;
-
-    sput-object v0, Lk0/a/r1/x;->e:Lkotlin/jvm/functions/Function2;
-
-    return-void
-.end method
-
-.method public static final a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-    .locals 2
-
-    sget-object v0, Lk0/a/r1/x;->a:Lk0/a/r1/v;
-
-    if-ne p1, v0, :cond_0
-
-    return-void
-
-    :cond_0
-    instance-of v0, p1, Lk0/a/r1/a0;
-
-    if-eqz v0, :cond_1
-
-    move-object v0, p1
-
-    check-cast v0, Lk0/a/r1/a0;
-
-    const/4 v1, 0x0
-
-    iput v1, v0, Lk0/a/r1/a0;->b:I
-
-    sget-object v0, Lk0/a/r1/x;->e:Lkotlin/jvm/functions/Function2;
-
-    invoke-interface {p0, p1, v0}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v0, Lk0/a/r1/x;->c:Lkotlin/jvm/functions/Function2;
-
-    const/4 v1, 0x0
-
-    invoke-interface {p0, v1, v0}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    check-cast v0, Lk0/a/m1;
-
-    invoke-interface {v0, p0, p1}, Lk0/a/m1;->k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-
-    :goto_0
-    return-void
-
-    :cond_2
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string p1, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement<kotlin.Any?>"
-
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static final b(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_1
-
-    const/4 v1, 0x0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    sget-object v2, Lk0/a/r1/x;->b:Lkotlin/jvm/functions/Function2;
-
-    invoke-interface {p0, v1, v2}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    if-eqz p0, :cond_4
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p0}, Lk0/a/r1/x;->b(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    :goto_0
-    const/4 v0, 0x0
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    if-ne p1, v0, :cond_1
-
-    sget-object p0, Lk0/a/r1/x;->a:Lk0/a/r1/v;
-
-    goto :goto_1
-
-    :cond_1
-    instance-of v0, p1, Ljava/lang/Integer;
-
-    if-eqz v0, :cond_2
-
-    new-instance v0, Lk0/a/r1/a0;
-
-    check-cast p1, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
-
-    move-result p1
-
-    invoke-direct {v0, p0, p1}, Lk0/a/r1/a0;-><init>(Lkotlin/coroutines/CoroutineContext;I)V
-
-    sget-object p1, Lk0/a/r1/x;->d:Lkotlin/jvm/functions/Function2;
-
-    invoke-interface {p0, v0, p1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    goto :goto_1
-
-    :cond_2
-    if-eqz p1, :cond_3
-
-    check-cast p1, Lk0/a/m1;
-
-    invoke-interface {p1, p0}, Lk0/a/m1;->r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    :goto_1
-    return-object p0
-
-    :cond_3
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string p1, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement<kotlin.Any?>"
-
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_4
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/y.smali b/com.discord/smali_classes2/k0/a/r1/y.smali
deleted file mode 100644
index 61d68b5f93..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/y.smali
+++ /dev/null
@@ -1,528 +0,0 @@
-.class public Lk0/a/r1/y;
-.super Ljava/lang/Object;
-.source "ThreadSafeHeap.common.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T::",
-        "Lk0/a/r1/z;",
-        ":",
-        "Ljava/lang/Comparable<",
-        "-TT;>;>",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public volatile _size:I
-
-.field public a:[Lk0/a/r1/z;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lk0/a/r1/y;
-
-    const-string v1, "_size"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lk0/a/r1/y;->_size:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Lk0/a/r1/z;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {p1}, Lk0/a/r1/z;->i()Lk0/a/r1/y;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_2
-    :goto_1
-    invoke-interface {p1, p0}, Lk0/a/r1/z;->g(Lk0/a/r1/y;)V
-
-    iget-object v0, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    if-nez v0, :cond_3
-
-    const/4 v0, 0x4
-
-    new-array v0, v0, [Lk0/a/r1/z;
-
-    iput-object v0, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    goto :goto_2
-
-    :cond_3
-    iget v1, p0, Lk0/a/r1/y;->_size:I
-
-    array-length v2, v0
-
-    if-lt v1, v2, :cond_4
-
-    iget v1, p0, Lk0/a/r1/y;->_size:I
-
-    mul-int/lit8 v1, v1, 0x2
-
-    invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v0
-
-    const-string v1, "java.util.Arrays.copyOf(this, newSize)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v0, [Lk0/a/r1/z;
-
-    iput-object v0, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    :cond_4
-    :goto_2
-    iget v1, p0, Lk0/a/r1/y;->_size:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lk0/a/r1/y;->_size:I
-
-    aput-object p1, v0, v1
-
-    invoke-interface {p1, v1}, Lk0/a/r1/z;->f(I)V
-
-    invoke-virtual {p0, v1}, Lk0/a/r1/y;->d(I)V
-
-    return-void
-.end method
-
-.method public final b()Lk0/a/r1/z;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    if-eqz v0, :cond_0
-
-    const/4 v1, 0x0
-
-    aget-object v0, v0, v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public final c(I)Lk0/a/r1/z;
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)TT;"
-        }
-    .end annotation
-
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_2
-
-    iget v0, p0, Lk0/a/r1/y;->_size:I
-
-    if-lez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_2
-    :goto_1
-    iget-object v0, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    const/4 v3, 0x0
-
-    if-eqz v0, :cond_13
-
-    iget v4, p0, Lk0/a/r1/y;->_size:I
-
-    const/4 v5, -0x1
-
-    add-int/2addr v4, v5
-
-    iput v4, p0, Lk0/a/r1/y;->_size:I
-
-    iget v4, p0, Lk0/a/r1/y;->_size:I
-
-    if-ge p1, v4, :cond_e
-
-    iget v4, p0, Lk0/a/r1/y;->_size:I
-
-    invoke-virtual {p0, p1, v4}, Lk0/a/r1/y;->e(II)V
-
-    add-int/lit8 v4, p1, -0x1
-
-    div-int/lit8 v4, v4, 0x2
-
-    if-lez p1, :cond_5
-
-    aget-object v6, v0, p1
-
-    if-eqz v6, :cond_4
-
-    check-cast v6, Ljava/lang/Comparable;
-
-    aget-object v7, v0, v4
-
-    if-eqz v7, :cond_3
-
-    invoke-interface {v6, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
-
-    move-result v6
-
-    if-gez v6, :cond_5
-
-    invoke-virtual {p0, p1, v4}, Lk0/a/r1/y;->e(II)V
-
-    invoke-virtual {p0, v4}, Lk0/a/r1/y;->d(I)V
-
-    goto :goto_4
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_5
-    :goto_2
-    mul-int/lit8 v4, p1, 0x2
-
-    add-int/2addr v4, v2
-
-    iget v6, p0, Lk0/a/r1/y;->_size:I
-
-    if-lt v4, v6, :cond_6
-
-    goto :goto_4
-
-    :cond_6
-    iget-object v6, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    if-eqz v6, :cond_d
-
-    add-int/lit8 v7, v4, 0x1
-
-    iget v8, p0, Lk0/a/r1/y;->_size:I
-
-    if-ge v7, v8, :cond_9
-
-    aget-object v8, v6, v7
-
-    if-eqz v8, :cond_8
-
-    check-cast v8, Ljava/lang/Comparable;
-
-    aget-object v9, v6, v4
-
-    if-eqz v9, :cond_7
-
-    invoke-interface {v8, v9}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
-
-    move-result v8
-
-    if-gez v8, :cond_9
-
-    move v4, v7
-
-    goto :goto_3
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_9
-    :goto_3
-    aget-object v7, v6, p1
-
-    if-eqz v7, :cond_c
-
-    check-cast v7, Ljava/lang/Comparable;
-
-    aget-object v6, v6, v4
-
-    if-eqz v6, :cond_b
-
-    invoke-interface {v7, v6}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
-
-    move-result v6
-
-    if-gtz v6, :cond_a
-
-    goto :goto_4
-
-    :cond_a
-    invoke-virtual {p0, p1, v4}, Lk0/a/r1/y;->e(II)V
-
-    move p1, v4
-
-    goto :goto_2
-
-    :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_c
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_d
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_e
-    :goto_4
-    iget p1, p0, Lk0/a/r1/y;->_size:I
-
-    aget-object p1, v0, p1
-
-    if-eqz p1, :cond_12
-
-    sget-boolean v4, Lk0/a/b0;->a:Z
-
-    if-eqz v4, :cond_11
-
-    invoke-interface {p1}, Lk0/a/r1/z;->i()Lk0/a/r1/y;
-
-    move-result-object v4
-
-    if-ne v4, p0, :cond_f
-
-    const/4 v1, 0x1
-
-    :cond_f
-    if-eqz v1, :cond_10
-
-    goto :goto_5
-
-    :cond_10
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_11
-    :goto_5
-    invoke-interface {p1, v3}, Lk0/a/r1/z;->g(Lk0/a/r1/y;)V
-
-    invoke-interface {p1, v5}, Lk0/a/r1/z;->f(I)V
-
-    iget v1, p0, Lk0/a/r1/y;->_size:I
-
-    aput-object v3, v0, v1
-
-    return-object p1
-
-    :cond_12
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_13
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-.end method
-
-.method public final d(I)V
-    .locals 4
-
-    :goto_0
-    if-gtz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_4
-
-    add-int/lit8 v2, p1, -0x1
-
-    div-int/lit8 v2, v2, 0x2
-
-    aget-object v3, v0, v2
-
-    if-eqz v3, :cond_3
-
-    check-cast v3, Ljava/lang/Comparable;
-
-    aget-object v0, v0, p1
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {v3, v0}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
-
-    move-result v0
-
-    if-gtz v0, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-virtual {p0, p1, v2}, Lk0/a/r1/y;->e(II)V
-
-    move p1, v2
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public final e(II)V
-    .locals 4
-
-    iget-object v0, p0, Lk0/a/r1/y;->a:[Lk0/a/r1/z;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_2
-
-    aget-object v2, v0, p2
-
-    if-eqz v2, :cond_1
-
-    aget-object v3, v0, p1
-
-    if-eqz v3, :cond_0
-
-    aput-object v2, v0, p1
-
-    aput-object v3, v0, p2
-
-    invoke-interface {v2, p1}, Lk0/a/r1/z;->f(I)V
-
-    invoke-interface {v3, p2}, Lk0/a/r1/z;->f(I)V
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/r1/z.smali b/com.discord/smali_classes2/k0/a/r1/z.smali
deleted file mode 100644
index a9a19f83ed..0000000000
--- a/com.discord/smali_classes2/k0/a/r1/z.smali
+++ /dev/null
@@ -1,31 +0,0 @@
-.class public interface abstract Lk0/a/r1/z;
-.super Ljava/lang/Object;
-.source "ThreadSafeHeap.common.kt"
-
-
-# virtual methods
-.method public abstract f(I)V
-.end method
-
-.method public abstract g(Lk0/a/r1/y;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lk0/a/r1/y<",
-            "*>;)V"
-        }
-    .end annotation
-.end method
-
-.method public abstract i()Lk0/a/r1/y;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lk0/a/r1/y<",
-            "*>;"
-        }
-    .end annotation
-.end method
-
-.method public abstract j()I
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s.smali b/com.discord/smali_classes2/k0/a/s.smali
deleted file mode 100644
index aa85a538ca..0000000000
--- a/com.discord/smali_classes2/k0/a/s.smali
+++ /dev/null
@@ -1,33 +0,0 @@
-.class public abstract Lk0/a/s;
-.super Lk0/a/r1/m;
-.source "CompletionHandler.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/r1/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Throwable;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/r1/m;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract i(Ljava/lang/Throwable;)V
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s0.smali b/com.discord/smali_classes2/k0/a/s0.smali
deleted file mode 100644
index c11f32a0e5..0000000000
--- a/com.discord/smali_classes2/k0/a/s0.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lk0/a/s0;
-.super Ljava/lang/Object;
-.source "CoroutineScope.kt"
-
-# interfaces
-.implements Lkotlinx/coroutines/CoroutineScope;
-
-
-# static fields
-.field public static final d:Lk0/a/s0;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/s0;
-
-    invoke-direct {v0}, Lk0/a/s0;-><init>()V
-
-    sput-object v0, Lk0/a/s0;->d:Lk0/a/s0;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
-    .locals 1
-
-    sget-object v0, Lj0/k/f;->d:Lj0/k/f;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/a$a.smali b/com.discord/smali_classes2/k0/a/s1/a$a.smali
deleted file mode 100644
index 233b987bc9..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/a$a.smali
+++ /dev/null
@@ -1,1228 +0,0 @@
-.class public final Lk0/a/s1/a$a;
-.super Ljava/lang/Thread;
-.source "CoroutineScheduler.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/s1/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
-# instance fields
-.field public final d:Lk0/a/s1/n;
-
-.field public e:J
-
-.field public f:J
-
-.field public g:I
-
-.field public h:I
-
-.field public i:I
-
-.field public volatile indexInArray:I
-
-.field public final synthetic j:Lk0/a/s1/a;
-
-.field public volatile nextParkedWorker:Ljava/lang/Object;
-
-.field public volatile spins:I
-
-.field public volatile state:Lk0/a/s1/a$b;
-
-.field public volatile terminationState:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lk0/a/s1/a$a;
-
-    const-string v1, "terminationState"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/s1/a$a;->k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lk0/a/s1/a;I)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-direct {p0}, Ljava/lang/Thread;-><init>()V
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p0, v0}, Ljava/lang/Thread;->setDaemon(Z)V
-
-    new-instance v0, Lk0/a/s1/n;
-
-    invoke-direct {v0}, Lk0/a/s1/n;-><init>()V
-
-    iput-object v0, p0, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    sget-object v0, Lk0/a/s1/a$b;->g:Lk0/a/s1/a$b;
-
-    iput-object v0, p0, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lk0/a/s1/a$a;->terminationState:I
-
-    sget-object v0, Lk0/a/s1/a;->s:Lk0/a/r1/v;
-
-    iput-object v0, p0, Lk0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
-
-    sget v0, Lk0/a/s1/a;->r:I
-
-    iput v0, p0, Lk0/a/s1/a$a;->g:I
-
-    iget-object p1, p1, Lk0/a/s1/a;->g:Ljava/util/Random;
-
-    invoke-virtual {p1}, Ljava/util/Random;->nextInt()I
-
-    move-result p1
-
-    iput p1, p0, Lk0/a/s1/a$a;->h:I
-
-    invoke-virtual {p0, p2}, Lk0/a/s1/a$a;->d(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()Z
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v0, v0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    sget-object v1, Lk0/a/s1/k;->e:Lk0/a/s1/k;
-
-    invoke-virtual {v0, v1}, Lk0/a/s1/d;->c(Lk0/a/s1/k;)Lk0/a/s1/h;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v1, p0, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    iget-object v2, p0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v2, v2, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    invoke-virtual {v1, v0, v2}, Lk0/a/s1/n;->a(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public final b()Lk0/a/s1/h;
-    .locals 19
-
-    move-object/from16 v0, p0
-
-    invoke-virtual/range {p0 .. p0}, Lk0/a/s1/a$a;->e()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_16
-
-    iget-object v1, v0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget v1, v1, Lk0/a/s1/a;->h:I
-
-    const/4 v2, 0x2
-
-    mul-int/lit8 v1, v1, 0x2
-
-    invoke-virtual {v0, v1}, Lk0/a/s1/a$a;->c(I)I
-
-    move-result v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-nez v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    iget-object v5, v0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v5, v5, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    sget-object v6, Lk0/a/s1/k;->d:Lk0/a/s1/k;
-
-    invoke-virtual {v5, v6}, Lk0/a/s1/d;->c(Lk0/a/s1/k;)Lk0/a/s1/h;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_1
-
-    goto/16 :goto_7
-
-    :cond_1
-    iget-object v5, v0, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    invoke-virtual {v5}, Lk0/a/s1/n;->e()Lk0/a/s1/h;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_2
-
-    goto/16 :goto_7
-
-    :cond_2
-    if-nez v1, :cond_3
-
-    iget-object v1, v0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v1, v1, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    invoke-virtual {v1}, Lk0/a/r1/n;->b()Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v5, v1
-
-    check-cast v5, Lk0/a/s1/h;
-
-    if-eqz v5, :cond_3
-
-    goto/16 :goto_7
-
-    :cond_3
-    iget-object v1, v0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-wide v5, v1, Lk0/a/s1/a;->controlState:J
-
-    const-wide/32 v7, 0x1fffff
-
-    and-long/2addr v5, v7
-
-    long-to-int v1, v5
-
-    const/4 v5, 0x0
-
-    if-ge v1, v2, :cond_4
-
-    goto/16 :goto_7
-
-    :cond_4
-    iget v6, v0, Lk0/a/s1/a$a;->i:I
-
-    if-nez v6, :cond_5
-
-    invoke-virtual {v0, v1}, Lk0/a/s1/a$a;->c(I)I
-
-    move-result v6
-
-    :cond_5
-    add-int/2addr v6, v4
-
-    if-le v6, v1, :cond_6
-
-    const/4 v6, 0x1
-
-    :cond_6
-    iput v6, v0, Lk0/a/s1/a$a;->i:I
-
-    iget-object v1, v0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v7, v1, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aget-object v6, v7, v6
-
-    if-eqz v6, :cond_15
-
-    if-eq v6, v0, :cond_15
-
-    iget-object v7, v0, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    iget-object v6, v6, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    iget-object v1, v1, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    if-eqz v7, :cond_14
-
-    if-eqz v6, :cond_13
-
-    if-eqz v1, :cond_12
-
-    sget-object v8, Lk0/a/s1/l;->f:Lk0/a/s1/m;
-
-    check-cast v8, Lk0/a/s1/f;
-
-    if-eqz v8, :cond_11
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v8
-
-    invoke-virtual {v6}, Lk0/a/s1/n;->d()I
-
-    move-result v10
-
-    if-nez v10, :cond_8
-
-    iget-object v2, v6, Lk0/a/s1/n;->lastScheduledTask:Ljava/lang/Object;
-
-    check-cast v2, Lk0/a/s1/h;
-
-    if-eqz v2, :cond_10
-
-    iget-wide v10, v2, Lk0/a/s1/h;->d:J
-
-    sub-long/2addr v8, v10
-
-    sget-wide v10, Lk0/a/s1/l;->a:J
-
-    cmp-long v12, v8, v10
-
-    if-gez v12, :cond_7
-
-    goto :goto_6
-
-    :cond_7
-    sget-object v8, Lk0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v8, v6, v2, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_10
-
-    invoke-virtual {v7, v2, v1}, Lk0/a/s1/n;->a(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-
-    const/4 v3, 0x1
-
-    goto :goto_6
-
-    :cond_8
-    div-int/2addr v10, v2
-
-    if-ge v10, v4, :cond_9
-
-    const/4 v10, 0x1
-
-    :cond_9
-    const/4 v2, 0x0
-
-    const/4 v11, 0x0
-
-    :goto_1
-    if-ge v2, v10, :cond_f
-
-    :cond_a
-    iget v12, v6, Lk0/a/s1/n;->consumerIndex:I
-
-    iget v13, v6, Lk0/a/s1/n;->producerIndex:I
-
-    sub-int v13, v12, v13
-
-    if-nez v13, :cond_b
-
-    goto :goto_4
-
-    :cond_b
-    and-int/lit8 v13, v12, 0x7f
-
-    iget-object v14, v6, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v14, v13}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v14
-
-    check-cast v14, Lk0/a/s1/h;
-
-    if-eqz v14, :cond_a
-
-    iget-wide v14, v14, Lk0/a/s1/h;->d:J
-
-    sub-long v14, v8, v14
-
-    sget-wide v16, Lk0/a/s1/l;->a:J
-
-    cmp-long v18, v14, v16
-
-    if-gez v18, :cond_d
-
-    invoke-virtual {v6}, Lk0/a/s1/n;->d()I
-
-    move-result v14
-
-    sget v15, Lk0/a/s1/l;->b:I
-
-    if-le v14, v15, :cond_c
-
-    goto :goto_2
-
-    :cond_c
-    const/4 v14, 0x0
-
-    goto :goto_3
-
-    :cond_d
-    :goto_2
-    const/4 v14, 0x1
-
-    :goto_3
-    if-nez v14, :cond_e
-
-    :goto_4
-    move-object v12, v5
-
-    goto :goto_5
-
-    :cond_e
-    sget-object v14, Lk0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    add-int/lit8 v15, v12, 0x1
-
-    invoke-virtual {v14, v6, v12, v15}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_a
-
-    iget-object v12, v6, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v12, v13, v5}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v12
-
-    check-cast v12, Lk0/a/s1/h;
-
-    :goto_5
-    if-eqz v12, :cond_f
-
-    invoke-virtual {v7, v12, v1}, Lk0/a/s1/n;->a(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-
-    add-int/lit8 v2, v2, 0x1
-
-    const/4 v11, 0x1
-
-    goto :goto_1
-
-    :cond_f
-    move v3, v11
-
-    :cond_10
-    :goto_6
-    if-eqz v3, :cond_15
-
-    iget-object v1, v0, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    invoke-virtual {v1}, Lk0/a/s1/n;->e()Lk0/a/s1/h;
-
-    move-result-object v1
-
-    move-object v5, v1
-
-    goto :goto_7
-
-    :cond_11
-    throw v5
-
-    :cond_12
-    const-string v1, "globalQueue"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_13
-    const-string v1, "victim"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_14
-    throw v5
-
-    :cond_15
-    :goto_7
-    return-object v5
-
-    :cond_16
-    iget-object v1, v0, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    invoke-virtual {v1}, Lk0/a/s1/n;->e()Lk0/a/s1/h;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_17
-
-    goto :goto_8
-
-    :cond_17
-    iget-object v1, v0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v1, v1, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    sget-object v2, Lk0/a/s1/k;->e:Lk0/a/s1/k;
-
-    invoke-virtual {v1, v2}, Lk0/a/s1/d;->c(Lk0/a/s1/k;)Lk0/a/s1/h;
-
-    move-result-object v1
-
-    :goto_8
-    return-object v1
-.end method
-
-.method public final c(I)I
-    .locals 3
-
-    iget v0, p0, Lk0/a/s1/a$a;->h:I
-
-    shl-int/lit8 v1, v0, 0xd
-
-    xor-int/2addr v0, v1
-
-    iput v0, p0, Lk0/a/s1/a$a;->h:I
-
-    shr-int/lit8 v1, v0, 0x11
-
-    xor-int/2addr v0, v1
-
-    iput v0, p0, Lk0/a/s1/a$a;->h:I
-
-    shl-int/lit8 v1, v0, 0x5
-
-    xor-int/2addr v0, v1
-
-    iput v0, p0, Lk0/a/s1/a$a;->h:I
-
-    add-int/lit8 v1, p1, -0x1
-
-    and-int v2, v1, p1
-
-    if-nez v2, :cond_0
-
-    and-int p1, v0, v1
-
-    return p1
-
-    :cond_0
-    const v1, 0x7fffffff
-
-    and-int/2addr v0, v1
-
-    rem-int/2addr v0, p1
-
-    return v0
-.end method
-
-.method public final d(I)V
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v1, v1, Lk0/a/s1/a;->k:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "-worker-"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    if-nez p1, :cond_0
-
-    const-string v1, "TERMINATED"
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    :goto_0
-    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
-
-    invoke-virtual {p0, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    iput p1, p0, Lk0/a/s1/a$a;->indexInArray:I
-
-    return-void
-.end method
-
-.method public final e()Z
-    .locals 3
-
-    sget-object v0, Lk0/a/s1/a$b;->d:Lk0/a/s1/a$b;
-
-    iget-object v1, p0, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    const/4 v2, 0x1
-
-    if-ne v1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, p0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v1, v1, Lk0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/Semaphore;->tryAcquire()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iput-object v0, p0, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_0
-    return v2
-.end method
-
-.method public final f(Lk0/a/s1/a$b;)Z
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    sget-object v1, Lk0/a/s1/a$b;->d:Lk0/a/s1/a$b;
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    iget-object v2, p0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v2, v2, Lk0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/Semaphore;->release()V
-
-    :cond_1
-    if-eq v0, p1, :cond_2
-
-    iput-object p1, p0, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    :cond_2
-    return v1
-.end method
-
-.method public run()V
-    .locals 18
-
-    move-object/from16 v1, p0
-
-    sget-object v0, Lk0/a/s1/k;->d:Lk0/a/s1/k;
-
-    sget-object v2, Lk0/a/s1/a$b;->f:Lk0/a/s1/a$b;
-
-    sget-object v3, Lk0/a/s1/a$b;->e:Lk0/a/s1/a$b;
-
-    sget-object v4, Lk0/a/s1/a$b;->h:Lk0/a/s1/a$b;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    :goto_0
-    iget-object v7, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget v7, v7, Lk0/a/s1/a;->_isTerminated:I
-
-    const/4 v8, 0x1
-
-    if-eqz v7, :cond_0
-
-    const/4 v7, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v7, 0x0
-
-    :goto_1
-    if-nez v7, :cond_21
-
-    iget-object v7, v1, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    if-eq v7, v4, :cond_21
-
-    invoke-virtual/range {p0 .. p0}, Lk0/a/s1/a$a;->b()Lk0/a/s1/h;
-
-    move-result-object v7
-
-    const-wide/16 v9, 0x0
-
-    const/4 v11, 0x0
-
-    if-nez v7, :cond_12
-
-    iget-object v6, v1, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    sget-object v7, Lk0/a/s1/a$b;->d:Lk0/a/s1/a$b;
-
-    if-ne v6, v7, :cond_5
-
-    iget v6, v1, Lk0/a/s1/a$a;->spins:I
-
-    sget v7, Lk0/a/s1/a;->p:I
-
-    if-gt v6, v7, :cond_1
-
-    add-int/lit8 v7, v6, 0x1
-
-    iput v7, v1, Lk0/a/s1/a$a;->spins:I
-
-    sget v7, Lk0/a/s1/a;->o:I
-
-    if-lt v6, v7, :cond_11
-
-    invoke-static {}, Ljava/lang/Thread;->yield()V
-
-    goto/16 :goto_6
-
-    :cond_1
-    iget v6, v1, Lk0/a/s1/a$a;->g:I
-
-    sget v7, Lk0/a/s1/a;->q:I
-
-    if-ge v6, v7, :cond_3
-
-    mul-int/lit8 v6, v6, 0x3
-
-    ushr-int/2addr v6, v8
-
-    if-le v6, v7, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    move v7, v6
-
-    :goto_2
-    iput v7, v1, Lk0/a/s1/a$a;->g:I
-
-    :cond_3
-    invoke-virtual {v1, v2}, Lk0/a/s1/a$a;->f(Lk0/a/s1/a$b;)Z
-
-    iget v6, v1, Lk0/a/s1/a$a;->g:I
-
-    int-to-long v6, v6
-
-    iget-object v9, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-static {v9, v1}, Lk0/a/s1/a;->a(Lk0/a/s1/a;Lk0/a/s1/a$a;)V
-
-    invoke-virtual/range {p0 .. p0}, Lk0/a/s1/a$a;->a()Z
-
-    move-result v9
-
-    if-nez v9, :cond_4
-
-    goto/16 :goto_6
-
-    :cond_4
-    invoke-static {v6, v7}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(J)V
-
-    goto/16 :goto_6
-
-    :cond_5
-    invoke-virtual {v1, v2}, Lk0/a/s1/a$a;->f(Lk0/a/s1/a$b;)Z
-
-    invoke-virtual/range {p0 .. p0}, Lk0/a/s1/a$a;->a()Z
-
-    move-result v6
-
-    if-nez v6, :cond_6
-
-    goto/16 :goto_6
-
-    :cond_6
-    iput v5, v1, Lk0/a/s1/a$a;->terminationState:I
-
-    iget-wide v6, v1, Lk0/a/s1/a$a;->e:J
-
-    cmp-long v12, v6, v9
-
-    if-nez v12, :cond_7
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v6
-
-    iget-object v12, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-wide v12, v12, Lk0/a/s1/a;->j:J
-
-    add-long/2addr v6, v12
-
-    iput-wide v6, v1, Lk0/a/s1/a$a;->e:J
-
-    :cond_7
-    iget-object v6, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-wide v12, v6, Lk0/a/s1/a;->j:J
-
-    invoke-static {v6, v1}, Lk0/a/s1/a;->a(Lk0/a/s1/a;Lk0/a/s1/a$a;)V
-
-    invoke-virtual/range {p0 .. p0}, Lk0/a/s1/a$a;->a()Z
-
-    move-result v6
-
-    if-nez v6, :cond_8
-
-    const/4 v6, 0x0
-
-    goto :goto_3
-
-    :cond_8
-    invoke-static {v12, v13}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(J)V
-
-    const/4 v6, 0x1
-
-    :goto_3
-    if-nez v6, :cond_9
-
-    goto/16 :goto_6
-
-    :cond_9
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v6
-
-    iget-wide v12, v1, Lk0/a/s1/a$a;->e:J
-
-    sub-long/2addr v6, v12
-
-    cmp-long v12, v6, v9
-
-    if-ltz v12, :cond_11
-
-    iput-wide v9, v1, Lk0/a/s1/a$a;->e:J
-
-    iget-object v6, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v6, v6, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    monitor-enter v6
-
-    :try_start_0
-    iget-object v7, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget v7, v7, Lk0/a/s1/a;->_isTerminated:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v7, :cond_a
-
-    const/4 v7, 0x1
-
-    goto :goto_4
-
-    :cond_a
-    const/4 v7, 0x0
-
-    :goto_4
-    if-eqz v7, :cond_b
-
-    monitor-exit v6
-
-    goto :goto_6
-
-    :cond_b
-    :try_start_1
-    iget-object v7, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-wide v9, v7, Lk0/a/s1/a;->controlState:J
-
-    const-wide/32 v12, 0x1fffff
-
-    and-long/2addr v9, v12
-
-    long-to-int v7, v9
-
-    iget-object v9, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget v9, v9, Lk0/a/s1/a;->h:I
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-gt v7, v9, :cond_c
-
-    monitor-exit v6
-
-    goto :goto_6
-
-    :cond_c
-    :try_start_2
-    invoke-virtual/range {p0 .. p0}, Lk0/a/s1/a$a;->a()Z
-
-    move-result v7
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    if-nez v7, :cond_d
-
-    monitor-exit v6
-
-    goto :goto_6
-
-    :cond_d
-    :try_start_3
-    sget-object v7, Lk0/a/s1/a$a;->k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {v7, v1, v5, v8}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v7
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    if-nez v7, :cond_e
-
-    monitor-exit v6
-
-    goto :goto_6
-
-    :cond_e
-    :try_start_4
-    iget v7, v1, Lk0/a/s1/a$a;->indexInArray:I
-
-    invoke-virtual {v1, v5}, Lk0/a/s1/a$a;->d(I)V
-
-    iget-object v9, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-static {v9, v1, v7, v5}, Lk0/a/s1/a;->b(Lk0/a/s1/a;Lk0/a/s1/a$a;II)V
-
-    iget-object v9, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    sget-object v10, Lk0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    invoke-virtual {v10, v9}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->getAndDecrement(Ljava/lang/Object;)J
-
-    move-result-wide v9
-
-    and-long/2addr v9, v12
-
-    long-to-int v10, v9
-
-    if-eq v10, v7, :cond_10
-
-    iget-object v9, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v9, v9, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aget-object v9, v9, v10
-
-    if-eqz v9, :cond_f
-
-    iget-object v12, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v12, v12, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aput-object v9, v12, v7
-
-    invoke-virtual {v9, v7}, Lk0/a/s1/a$a;->d(I)V
-
-    iget-object v12, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-static {v12, v9, v10, v7}, Lk0/a/s1/a;->b(Lk0/a/s1/a;Lk0/a/s1/a$a;II)V
-
-    goto :goto_5
-
-    :cond_f
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    throw v11
-
-    :cond_10
-    :goto_5
-    :try_start_5
-    iget-object v7, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v7, v7, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aput-object v11, v7, v10
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_0
-
-    monitor-exit v6
-
-    iput-object v4, v1, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    goto :goto_6
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v6
-
-    throw v0
-
-    :cond_11
-    :goto_6
-    const/4 v6, 0x1
-
-    goto/16 :goto_d
-
-    :cond_12
-    invoke-virtual {v7}, Lk0/a/s1/h;->a()Lk0/a/s1/k;
-
-    move-result-object v12
-
-    if-eqz v6, :cond_17
-
-    iput-wide v9, v1, Lk0/a/s1/a$a;->e:J
-
-    iput v5, v1, Lk0/a/s1/a$a;->i:I
-
-    iget-object v6, v1, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    if-ne v6, v2, :cond_16
-
-    sget-boolean v6, Lk0/a/b0;->a:Z
-
-    if-eqz v6, :cond_15
-
-    sget-object v6, Lk0/a/s1/k;->e:Lk0/a/s1/k;
-
-    if-ne v12, v6, :cond_13
-
-    const/4 v6, 0x1
-
-    goto :goto_7
-
-    :cond_13
-    const/4 v6, 0x0
-
-    :goto_7
-    if-eqz v6, :cond_14
-
-    goto :goto_8
-
-    :cond_14
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :cond_15
-    :goto_8
-    iput-object v3, v1, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    sget v6, Lk0/a/s1/a;->r:I
-
-    iput v6, v1, Lk0/a/s1/a$a;->g:I
-
-    :cond_16
-    iput v5, v1, Lk0/a/s1/a$a;->spins:I
-
-    const/4 v6, 0x0
-
-    :cond_17
-    iget-wide v9, v7, Lk0/a/s1/h;->d:J
-
-    if-eq v12, v0, :cond_19
-
-    iget-object v9, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    sget-object v10, Lk0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    const-wide/32 v13, 0x200000
-
-    invoke-virtual {v10, v9, v13, v14}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->addAndGet(Ljava/lang/Object;J)J
-
-    invoke-virtual {v1, v3}, Lk0/a/s1/a$a;->f(Lk0/a/s1/a$b;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_18
-
-    iget-object v9, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-virtual {v9}, Lk0/a/s1/a;->k()V
-
-    :cond_18
-    :goto_9
-    move/from16 v17, v6
-
-    goto :goto_a
-
-    :cond_19
-    iget-object v13, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    iget-object v13, v13, Lk0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
-
-    invoke-virtual {v13}, Ljava/util/concurrent/Semaphore;->availablePermits()I
-
-    move-result v13
-
-    if-nez v13, :cond_1a
-
-    goto :goto_9
-
-    :cond_1a
-    sget-object v13, Lk0/a/s1/l;->f:Lk0/a/s1/m;
-
-    check-cast v13, Lk0/a/s1/f;
-
-    if-eqz v13, :cond_20
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v13
-
-    sub-long v9, v13, v9
-
-    sget-wide v15, Lk0/a/s1/l;->a:J
-
-    cmp-long v11, v9, v15
-
-    if-ltz v11, :cond_18
-
-    iget-wide v9, v1, Lk0/a/s1/a$a;->f:J
-
-    sub-long v9, v13, v9
-
-    const/4 v11, 0x5
-
-    move/from16 v17, v6
-
-    int-to-long v5, v11
-
-    mul-long v15, v15, v5
-
-    cmp-long v5, v9, v15
-
-    if-ltz v5, :cond_1b
-
-    iput-wide v13, v1, Lk0/a/s1/a$a;->f:J
-
-    iget-object v5, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-virtual {v5}, Lk0/a/s1/a;->k()V
-
-    :cond_1b
-    :goto_a
-    iget-object v5, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-virtual {v5, v7}, Lk0/a/s1/a;->n(Lk0/a/s1/h;)V
-
-    if-eq v12, v0, :cond_1f
-
-    iget-object v5, v1, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    sget-object v6, Lk0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    const-wide/32 v9, -0x200000
-
-    invoke-virtual {v6, v5, v9, v10}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->addAndGet(Ljava/lang/Object;J)J
-
-    iget-object v5, v1, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    if-eq v5, v4, :cond_1f
-
-    sget-boolean v6, Lk0/a/b0;->a:Z
-
-    if-eqz v6, :cond_1e
-
-    if-ne v5, v3, :cond_1c
-
-    goto :goto_b
-
-    :cond_1c
-    const/4 v8, 0x0
-
-    :goto_b
-    if-eqz v8, :cond_1d
-
-    goto :goto_c
-
-    :cond_1d
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :cond_1e
-    :goto_c
-    sget-object v5, Lk0/a/s1/a$b;->g:Lk0/a/s1/a$b;
-
-    iput-object v5, v1, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    :cond_1f
-    move/from16 v6, v17
-
-    :goto_d
-    const/4 v5, 0x0
-
-    goto/16 :goto_0
-
-    :cond_20
-    throw v11
-
-    :cond_21
-    invoke-virtual {v1, v4}, Lk0/a/s1/a$a;->f(Lk0/a/s1/a$b;)Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/a$b.smali b/com.discord/smali_classes2/k0/a/s1/a$b.smali
deleted file mode 100644
index 3a5d216bba..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/a$b.smali
+++ /dev/null
@@ -1,151 +0,0 @@
-.class public final enum Lk0/a/s1/a$b;
-.super Ljava/lang/Enum;
-.source "CoroutineScheduler.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/s1/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x4019
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lk0/a/s1/a$b;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lk0/a/s1/a$b;
-
-.field public static final enum e:Lk0/a/s1/a$b;
-
-.field public static final enum f:Lk0/a/s1/a$b;
-
-.field public static final enum g:Lk0/a/s1/a$b;
-
-.field public static final enum h:Lk0/a/s1/a$b;
-
-.field public static final synthetic i:[Lk0/a/s1/a$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x5
-
-    new-array v0, v0, [Lk0/a/s1/a$b;
-
-    new-instance v1, Lk0/a/s1/a$b;
-
-    const-string v2, "CPU_ACQUIRED"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Lk0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/s1/a$b;->d:Lk0/a/s1/a$b;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/s1/a$b;
-
-    const-string v2, "BLOCKING"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Lk0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/s1/a$b;->e:Lk0/a/s1/a$b;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/s1/a$b;
-
-    const-string v2, "PARKING"
-
-    const/4 v3, 0x2
-
-    invoke-direct {v1, v2, v3}, Lk0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/s1/a$b;->f:Lk0/a/s1/a$b;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/s1/a$b;
-
-    const-string v2, "RETIRING"
-
-    const/4 v3, 0x3
-
-    invoke-direct {v1, v2, v3}, Lk0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/s1/a$b;->g:Lk0/a/s1/a$b;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/s1/a$b;
-
-    const-string v2, "TERMINATED"
-
-    const/4 v3, 0x4
-
-    invoke-direct {v1, v2, v3}, Lk0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/s1/a$b;->h:Lk0/a/s1/a$b;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lk0/a/s1/a$b;->i:[Lk0/a/s1/a$b;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lk0/a/s1/a$b;
-    .locals 1
-
-    const-class v0, Lk0/a/s1/a$b;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lk0/a/s1/a$b;
-
-    return-object p0
-.end method
-
-.method public static values()[Lk0/a/s1/a$b;
-    .locals 1
-
-    sget-object v0, Lk0/a/s1/a$b;->i:[Lk0/a/s1/a$b;
-
-    invoke-virtual {v0}, [Lk0/a/s1/a$b;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lk0/a/s1/a$b;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/a.smali b/com.discord/smali_classes2/k0/a/s1/a.smali
deleted file mode 100644
index b4d8458a55..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/a.smali
+++ /dev/null
@@ -1,2008 +0,0 @@
-.class public final Lk0/a/s1/a;
-.super Ljava/lang/Object;
-.source "CoroutineScheduler.kt"
-
-# interfaces
-.implements Ljava/util/concurrent/Executor;
-.implements Ljava/io/Closeable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lk0/a/s1/a$a;,
-        Lk0/a/s1/a$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-.field public static final m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-.field public static final n:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-.field public static final o:I
-
-.field public static final p:I
-
-.field public static final q:I
-
-.field public static final r:I
-
-.field public static final s:Lk0/a/r1/v;
-
-
-# instance fields
-.field public volatile _isTerminated:I
-
-.field public volatile controlState:J
-
-.field public final d:Lk0/a/s1/d;
-
-.field public final e:Ljava/util/concurrent/Semaphore;
-
-.field public final f:[Lk0/a/s1/a$a;
-
-.field public final g:Ljava/util/Random;
-
-.field public final h:I
-
-.field public final i:I
-
-.field public final j:J
-
-.field public final k:Ljava/lang/String;
-
-.field public volatile parkedWorkersStack:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 7
-
-    const-string v0, "kotlinx.coroutines.scheduler.spins"
-
-    const/16 v1, 0x3e8
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    const/16 v4, 0x8
-
-    const/4 v5, 0x0
-
-    invoke-static/range {v0 .. v5}, Lf/n/a/k/a;->d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-
-    move-result v0
-
-    sput v0, Lk0/a/s1/a;->o:I
-
-    const-string v1, "kotlinx.coroutines.scheduler.yields"
-
-    const/4 v2, 0x0
-
-    const/4 v4, 0x0
-
-    const/16 v5, 0x8
-
-    const/4 v6, 0x0
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-
-    move-result v1
-
-    add-int/2addr v0, v1
-
-    sput v0, Lk0/a/s1/a;->p:I
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v1, 0x1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    sput v1, Lk0/a/s1/a;->q:I
-
-    sget-wide v0, Lk0/a/s1/l;->a:J
-
-    const/4 v2, 0x4
-
-    int-to-long v2, v2
-
-    div-long/2addr v0, v2
-
-    const-wide/16 v2, 0xa
-
-    cmp-long v4, v0, v2
-
-    if-gez v4, :cond_0
-
-    move-wide v0, v2
-
-    :cond_0
-    sget v2, Lk0/a/s1/a;->q:I
-
-    int-to-long v2, v2
-
-    invoke-static {v0, v1, v2, v3}, Lj0/q/f;->coerceAtMost(JJ)J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    sput v1, Lk0/a/s1/a;->r:I
-
-    new-instance v0, Lk0/a/r1/v;
-
-    const-string v1, "NOT_IN_STACK"
-
-    invoke-direct {v0, v1}, Lk0/a/r1/v;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lk0/a/s1/a;->s:Lk0/a/r1/v;
-
-    const-class v0, Lk0/a/s1/a;
-
-    const-string v1, "parkedWorkersStack"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    const-class v0, Lk0/a/s1/a;
-
-    const-string v1, "controlState"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    const-class v0, Lk0/a/s1/a;
-
-    const-string v1, "_isTerminated"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/s1/a;->n:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(IIJLjava/lang/String;)V
-    .locals 2
-
-    if-eqz p5, :cond_8
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lk0/a/s1/a;->h:I
-
-    iput p2, p0, Lk0/a/s1/a;->i:I
-
-    iput-wide p3, p0, Lk0/a/s1/a;->j:J
-
-    iput-object p5, p0, Lk0/a/s1/a;->k:Ljava/lang/String;
-
-    const/4 p2, 0x0
-
-    const/4 p3, 0x1
-
-    if-lt p1, p3, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_7
-
-    iget p1, p0, Lk0/a/s1/a;->i:I
-
-    iget p4, p0, Lk0/a/s1/a;->h:I
-
-    if-lt p1, p4, :cond_1
-
-    const/4 p1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_1
-    const-string p4, "Max pool size "
-
-    if-eqz p1, :cond_6
-
-    iget p1, p0, Lk0/a/s1/a;->i:I
-
-    const p5, 0x1ffffe
-
-    if-gt p1, p5, :cond_2
-
-    const/4 p1, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 p1, 0x0
-
-    :goto_2
-    if-eqz p1, :cond_5
-
-    iget-wide p4, p0, Lk0/a/s1/a;->j:J
-
-    const-wide/16 v0, 0x0
-
-    cmp-long p1, p4, v0
-
-    if-lez p1, :cond_3
-
-    const/4 p1, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_3
-    if-eqz p1, :cond_4
-
-    new-instance p1, Lk0/a/s1/d;
-
-    invoke-direct {p1}, Lk0/a/s1/d;-><init>()V
-
-    iput-object p1, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    new-instance p1, Ljava/util/concurrent/Semaphore;
-
-    iget p4, p0, Lk0/a/s1/a;->h:I
-
-    invoke-direct {p1, p4, p2}, Ljava/util/concurrent/Semaphore;-><init>(IZ)V
-
-    iput-object p1, p0, Lk0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
-
-    iput-wide v0, p0, Lk0/a/s1/a;->parkedWorkersStack:J
-
-    iget p1, p0, Lk0/a/s1/a;->i:I
-
-    add-int/2addr p1, p3
-
-    new-array p1, p1, [Lk0/a/s1/a$a;
-
-    iput-object p1, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    iput-wide v0, p0, Lk0/a/s1/a;->controlState:J
-
-    new-instance p1, Ljava/util/Random;
-
-    invoke-direct {p1}, Ljava/util/Random;-><init>()V
-
-    iput-object p1, p0, Lk0/a/s1/a;->g:Ljava/util/Random;
-
-    iput p2, p0, Lk0/a/s1/a;->_isTerminated:I
-
-    return-void
-
-    :cond_4
-    const-string p1, "Idle worker keep alive time "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget-wide p2, p0, Lk0/a/s1/a;->j:J
-
-    const-string p4, " must be positive"
-
-    invoke-static {p1, p2, p3, p4}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_5
-    invoke-static {p4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lk0/a/s1/a;->i:I
-
-    const-string p3, " should not exceed maximal supported number of threads 2097150"
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->s(Ljava/lang/StringBuilder;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_6
-    invoke-static {p4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lk0/a/s1/a;->i:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string p2, " should be greater than or equals to core pool size "
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget p2, p0, Lk0/a/s1/a;->h:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_7
-    const-string p1, "Core pool size "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Lk0/a/s1/a;->h:I
-
-    const-string p3, " should be at least 1"
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->s(Ljava/lang/StringBuilder;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_8
-    const-string p1, "schedulerName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public static final a(Lk0/a/s1/a;Lk0/a/s1/a$a;)V
-    .locals 8
-
-    if-eqz p0, :cond_4
-
-    iget-object v0, p1, Lk0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
-
-    sget-object v1, Lk0/a/s1/a;->s:Lk0/a/r1/v;
-
-    if-eq v0, v1, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    iget-wide v4, p0, Lk0/a/s1/a;->parkedWorkersStack:J
-
-    const-wide/32 v0, 0x1fffff
-
-    and-long/2addr v0, v4
-
-    long-to-int v1, v0
-
-    const-wide/32 v2, 0x200000
-
-    add-long/2addr v2, v4
-
-    const-wide/32 v6, -0x200000
-
-    and-long/2addr v2, v6
-
-    iget v0, p1, Lk0/a/s1/a$a;->indexInArray:I
-
-    sget-boolean v6, Lk0/a/b0;->a:Z
-
-    if-eqz v6, :cond_3
-
-    if-eqz v0, :cond_1
-
-    const/4 v6, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v6, 0x0
-
-    :goto_0
-    if-eqz v6, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p0, Ljava/lang/AssertionError;
-
-    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p0
-
-    :cond_3
-    :goto_1
-    iget-object v6, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aget-object v1, v6, v1
-
-    iput-object v1, p1, Lk0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
-
-    sget-object v1, Lk0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    int-to-long v6, v0
-
-    or-long/2addr v6, v2
-
-    move-object v2, v1
-
-    move-object v3, p0
-
-    invoke-virtual/range {v2 .. v7}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    :goto_2
-    return-void
-
-    :cond_4
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final b(Lk0/a/s1/a;Lk0/a/s1/a$a;II)V
-    .locals 8
-
-    :cond_0
-    :goto_0
-    iget-wide v2, p0, Lk0/a/s1/a;->parkedWorkersStack:J
-
-    const-wide/32 v0, 0x1fffff
-
-    and-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    const-wide/32 v4, 0x200000
-
-    add-long/2addr v4, v2
-
-    const-wide/32 v6, -0x200000
-
-    and-long/2addr v4, v6
-
-    if-ne v1, p2, :cond_2
-
-    if-nez p3, :cond_1
-
-    invoke-virtual {p0, p1}, Lk0/a/s1/a;->i(Lk0/a/s1/a$a;)I
-
-    move-result v1
-
-    goto :goto_1
-
-    :cond_1
-    move v1, p3
-
-    :cond_2
-    :goto_1
-    if-gez v1, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    sget-object v0, Lk0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    int-to-long v6, v1
-
-    or-long/2addr v4, v6
-
-    move-object v1, p0
-
-    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-.end method
-
-.method public static synthetic g(Lk0/a/s1/a;Ljava/lang/Runnable;Lk0/a/s1/i;ZI)V
-    .locals 0
-
-    and-int/lit8 p2, p4, 0x2
-
-    if-eqz p2, :cond_0
-
-    sget-object p2, Lk0/a/s1/g;->e:Lk0/a/s1/g;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p2, 0x0
-
-    :goto_0
-    and-int/lit8 p4, p4, 0x4
-
-    if-eqz p4, :cond_1
-
-    const/4 p3, 0x0
-
-    :cond_1
-    invoke-virtual {p0, p1, p2, p3}, Lk0/a/s1/a;->f(Ljava/lang/Runnable;Lk0/a/s1/i;Z)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final c()I
-    .locals 10
-
-    iget-object v0, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget v1, p0, Lk0/a/s1/a;->_isTerminated:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    const/4 v1, -0x1
-
-    monitor-exit v0
-
-    return v1
-
-    :cond_1
-    :try_start_1
-    iget-wide v4, p0, Lk0/a/s1/a;->controlState:J
-
-    const-wide/32 v6, 0x1fffff
-
-    and-long v8, v4, v6
-
-    long-to-int v1, v8
-
-    const-wide v8, 0x3ffffe00000L
-
-    and-long/2addr v4, v8
-
-    const/16 v8, 0x15
-
-    shr-long/2addr v4, v8
-
-    long-to-int v5, v4
-
-    sub-int v4, v1, v5
-
-    iget v5, p0, Lk0/a/s1/a;->h:I
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-lt v4, v5, :cond_2
-
-    monitor-exit v0
-
-    return v2
-
-    :cond_2
-    :try_start_2
-    iget v5, p0, Lk0/a/s1/a;->i:I
-
-    if-ge v1, v5, :cond_8
-
-    iget-object v1, p0, Lk0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/Semaphore;->availablePermits()I
-
-    move-result v1
-
-    if-nez v1, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    iget-wide v8, p0, Lk0/a/s1/a;->controlState:J
-
-    and-long/2addr v8, v6
-
-    long-to-int v1, v8
-
-    add-int/2addr v1, v3
-
-    if-lez v1, :cond_4
-
-    iget-object v5, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aget-object v5, v5, v1
-
-    if-nez v5, :cond_4
-
-    const/4 v5, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    const/4 v5, 0x0
-
-    :goto_1
-    if-eqz v5, :cond_7
-
-    new-instance v5, Lk0/a/s1/a$a;
-
-    invoke-direct {v5, p0, v1}, Lk0/a/s1/a$a;-><init>(Lk0/a/s1/a;I)V
-
-    invoke-virtual {v5}, Ljava/lang/Thread;->start()V
-
-    sget-object v8, Lk0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    invoke-virtual {v8, p0}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->incrementAndGet(Ljava/lang/Object;)J
-
-    move-result-wide v8
-
-    and-long/2addr v6, v8
-
-    long-to-int v7, v6
-
-    if-ne v1, v7, :cond_5
-
-    const/4 v2, 0x1
-
-    :cond_5
-    if-eqz v2, :cond_6
-
-    iget-object v2, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aput-object v5, v2, v1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    add-int/2addr v4, v3
-
-    monitor-exit v0
-
-    return v4
-
-    :cond_6
-    :try_start_3
-    const-string v1, "Failed requirement."
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_7
-    const-string v1, "Failed requirement."
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :cond_8
-    :goto_2
-    monitor-exit v0
-
-    return v2
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public close()V
-    .locals 13
-
-    sget-object v0, Lk0/a/s1/a$b;->h:Lk0/a/s1/a$b;
-
-    sget-object v1, Lk0/a/s1/a;->n:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v1, p0, v2, v3}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    goto/16 :goto_a
-
-    :cond_0
-    invoke-virtual {p0}, Lk0/a/s1/a;->e()Lk0/a/s1/a$a;
-
-    move-result-object v1
-
-    iget-object v4, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    monitor-enter v4
-
-    :try_start_0
-    iget-wide v5, p0, Lk0/a/s1/a;->controlState:J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const-wide/32 v7, 0x1fffff
-
-    and-long/2addr v5, v7
-
-    long-to-int v6, v5
-
-    monitor-exit v4
-
-    if-gt v3, v6, :cond_b
-
-    const/4 v4, 0x1
-
-    :goto_0
-    iget-object v5, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aget-object v5, v5, v4
-
-    const/4 v7, 0x0
-
-    if-eqz v5, :cond_a
-
-    if-eq v5, v1, :cond_9
-
-    :goto_1
-    invoke-virtual {v5}, Ljava/lang/Thread;->isAlive()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_1
-
-    invoke-static {v5}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
-
-    const-wide/16 v8, 0x2710
-
-    invoke-virtual {v5, v8, v9}, Ljava/lang/Thread;->join(J)V
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v8, v5, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    sget-boolean v9, Lk0/a/b0;->a:Z
-
-    if-eqz v9, :cond_4
-
-    if-ne v8, v0, :cond_2
-
-    const/4 v8, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v8, 0x0
-
-    :goto_2
-    if-eqz v8, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :cond_4
-    :goto_3
-    iget-object v5, v5, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    iget-object v8, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    if-eqz v5, :cond_8
-
-    if-eqz v8, :cond_7
-
-    sget-object v9, Lk0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v9, v5, v7}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->getAndSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Lk0/a/s1/h;
-
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v5, v8, v9}, Lk0/a/s1/n;->c(Lk0/a/s1/d;Lk0/a/s1/h;)V
-
-    :cond_5
-    :goto_4
-    iget v9, v5, Lk0/a/s1/n;->consumerIndex:I
-
-    iget v10, v5, Lk0/a/s1/n;->producerIndex:I
-
-    sub-int v10, v9, v10
-
-    if-nez v10, :cond_6
-
-    move-object v9, v7
-
-    goto :goto_5
-
-    :cond_6
-    and-int/lit8 v10, v9, 0x7f
-
-    iget-object v11, v5, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v11, v10}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v11
-
-    check-cast v11, Lk0/a/s1/h;
-
-    if-eqz v11, :cond_5
-
-    sget-object v11, Lk0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    add-int/lit8 v12, v9, 0x1
-
-    invoke-virtual {v11, v5, v9, v12}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    iget-object v9, v5, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v9, v10, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Lk0/a/s1/h;
-
-    :goto_5
-    if-eqz v9, :cond_9
-
-    invoke-virtual {v5, v8, v9}, Lk0/a/s1/n;->c(Lk0/a/s1/d;Lk0/a/s1/h;)V
-
-    goto :goto_4
-
-    :cond_7
-    const-string v0, "globalQueue"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_8
-    throw v7
-
-    :cond_9
-    if-eq v4, v6, :cond_b
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v7
-
-    :cond_b
-    iget-object v5, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    :goto_6
-    iget-object v4, v5, Lk0/a/r1/n;->_cur$internal:Ljava/lang/Object;
-
-    check-cast v4, Lk0/a/r1/o;
-
-    invoke-virtual {v4}, Lk0/a/r1/o;->c()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_12
-
-    :goto_7
-    if-eqz v1, :cond_c
-
-    invoke-virtual {v1}, Lk0/a/s1/a$a;->b()Lk0/a/s1/h;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_c
-
-    goto :goto_8
-
-    :cond_c
-    iget-object v4, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    invoke-virtual {v4}, Lk0/a/r1/n;->b()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Lk0/a/s1/h;
-
-    :goto_8
-    if-eqz v4, :cond_d
-
-    invoke-virtual {p0, v4}, Lk0/a/s1/a;->n(Lk0/a/s1/h;)V
-
-    goto :goto_7
-
-    :cond_d
-    if-eqz v1, :cond_e
-
-    invoke-virtual {v1, v0}, Lk0/a/s1/a$a;->f(Lk0/a/s1/a$b;)Z
-
-    :cond_e
-    sget-boolean v0, Lk0/a/b0;->a:Z
-
-    if-eqz v0, :cond_11
-
-    iget-object v0, p0, Lk0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
-
-    move-result v0
-
-    iget v1, p0, Lk0/a/s1/a;->h:I
-
-    if-ne v0, v1, :cond_f
-
-    const/4 v2, 0x1
-
-    :cond_f
-    if-eqz v2, :cond_10
-
-    goto :goto_9
-
-    :cond_10
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :cond_11
-    :goto_9
-    const-wide/16 v0, 0x0
-
-    iput-wide v0, p0, Lk0/a/s1/a;->parkedWorkersStack:J
-
-    iput-wide v0, p0, Lk0/a/s1/a;->controlState:J
-
-    :goto_a
-    return-void
-
-    :cond_12
-    sget-object v6, Lk0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v4}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object v7
-
-    invoke-virtual {v6, v5, v4, v7}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_6
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v4
-
-    throw v0
-.end method
-
-.method public final d(Ljava/lang/Runnable;Lk0/a/s1/i;)Lk0/a/s1/h;
-    .locals 3
-
-    sget-object v0, Lk0/a/s1/l;->f:Lk0/a/s1/m;
-
-    check-cast v0, Lk0/a/s1/f;
-
-    if-eqz v0, :cond_1
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v0
-
-    instance-of v2, p1, Lk0/a/s1/h;
-
-    if-eqz v2, :cond_0
-
-    check-cast p1, Lk0/a/s1/h;
-
-    iput-wide v0, p1, Lk0/a/s1/h;->d:J
-
-    iput-object p2, p1, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    return-object p1
-
-    :cond_0
-    new-instance v2, Lk0/a/s1/j;
-
-    invoke-direct {v2, p1, v0, v1, p2}, Lk0/a/s1/j;-><init>(Ljava/lang/Runnable;JLk0/a/s1/i;)V
-
-    return-object v2
-
-    :cond_1
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final e()Lk0/a/s1/a$a;
-    .locals 3
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    instance-of v1, v0, Lk0/a/s1/a$a;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    move-object v0, v2
-
-    :cond_0
-    check-cast v0, Lk0/a/s1/a$a;
-
-    if-eqz v0, :cond_1
-
-    iget-object v1, v0, Lk0/a/s1/a$a;->j:Lk0/a/s1/a;
-
-    invoke-static {v1, p0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    move-object v2, v0
-
-    :cond_1
-    return-object v2
-.end method
-
-.method public execute(Ljava/lang/Runnable;)V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x6
-
-    invoke-static {p0, p1, v0, v1, v2}, Lk0/a/s1/a;->g(Lk0/a/s1/a;Ljava/lang/Runnable;Lk0/a/s1/i;ZI)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "command"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final f(Ljava/lang/Runnable;Lk0/a/s1/i;Z)V
-    .locals 5
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_c
-
-    if-eqz p2, :cond_b
-
-    invoke-virtual {p0, p1, p2}, Lk0/a/s1/a;->d(Ljava/lang/Runnable;Lk0/a/s1/i;)Lk0/a/s1/h;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lk0/a/s1/a;->e()Lk0/a/s1/a$a;
-
-    move-result-object p2
-
-    const/4 v0, -0x1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz p2, :cond_6
-
-    iget-object v3, p2, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    sget-object v4, Lk0/a/s1/a$b;->h:Lk0/a/s1/a$b;
-
-    if-ne v3, v4, :cond_0
-
-    goto :goto_3
-
-    :cond_0
-    invoke-virtual {p1}, Lk0/a/s1/h;->a()Lk0/a/s1/k;
-
-    move-result-object v3
-
-    sget-object v4, Lk0/a/s1/k;->d:Lk0/a/s1/k;
-
-    if-ne v3, v4, :cond_3
-
-    iget-object v3, p2, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    sget-object v4, Lk0/a/s1/a$b;->e:Lk0/a/s1/a$b;
-
-    if-ne v3, v4, :cond_1
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_2
-
-    const/4 v3, 0x0
-
-    goto :goto_1
-
-    :cond_2
-    invoke-virtual {p2}, Lk0/a/s1/a$a;->e()Z
-
-    move-result v3
-
-    if-nez v3, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v3, -0x1
-
-    :goto_1
-    if-eqz p3, :cond_4
-
-    iget-object p3, p2, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    iget-object v4, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    invoke-virtual {p3, p1, v4}, Lk0/a/s1/n;->b(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-
-    move-result p3
-
-    goto :goto_2
-
-    :cond_4
-    iget-object p3, p2, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    iget-object v4, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    invoke-virtual {p3, p1, v4}, Lk0/a/s1/n;->a(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-
-    move-result p3
-
-    :goto_2
-    if-eqz p3, :cond_7
-
-    iget-object p2, p2, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    invoke-virtual {p2}, Lk0/a/s1/n;->d()I
-
-    move-result p2
-
-    sget p3, Lk0/a/s1/l;->b:I
-
-    if-le p2, p3, :cond_5
-
-    goto :goto_4
-
-    :cond_5
-    move v1, v3
-
-    goto :goto_4
-
-    :cond_6
-    :goto_3
-    const/4 v1, 0x1
-
-    :cond_7
-    :goto_4
-    if-eq v1, v0, :cond_a
-
-    if-eq v1, v2, :cond_8
-
-    invoke-virtual {p0}, Lk0/a/s1/a;->k()V
-
-    goto :goto_5
-
-    :cond_8
-    iget-object p2, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    invoke-virtual {p2, p1}, Lk0/a/r1/n;->a(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_9
-
-    invoke-virtual {p0}, Lk0/a/s1/a;->k()V
-
-    :goto_5
-    return-void
-
-    :cond_9
-    new-instance p1, Ljava/util/concurrent/RejectedExecutionException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object p3, p0, Lk0/a/s1/a;->k:Ljava/lang/String;
-
-    const-string v0, " was terminated"
-
-    invoke-static {p2, p3, v0}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/util/concurrent/RejectedExecutionException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_a
-    return-void
-
-    :cond_b
-    const-string p1, "taskContext"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final i(Lk0/a/s1/a$a;)I
-    .locals 1
-
-    iget-object p1, p1, Lk0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
-
-    :goto_0
-    sget-object v0, Lk0/a/s1/a;->s:Lk0/a/r1/v;
-
-    if-ne p1, v0, :cond_0
-
-    const/4 p1, -0x1
-
-    return p1
-
-    :cond_0
-    if-nez p1, :cond_1
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    check-cast p1, Lk0/a/s1/a$a;
-
-    iget v0, p1, Lk0/a/s1/a$a;->indexInArray:I
-
-    if-eqz v0, :cond_2
-
-    return v0
-
-    :cond_2
-    iget-object p1, p1, Lk0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
-
-    goto :goto_0
-.end method
-
-.method public final k()V
-    .locals 6
-
-    iget-object v0, p0, Lk0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lk0/a/s1/a;->p()Z
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Lk0/a/s1/a;->p()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-wide v0, p0, Lk0/a/s1/a;->controlState:J
-
-    const-wide/32 v2, 0x1fffff
-
-    and-long/2addr v2, v0
-
-    long-to-int v3, v2
-
-    const-wide v4, 0x3ffffe00000L
-
-    and-long/2addr v0, v4
-
-    const/16 v2, 0x15
-
-    shr-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    sub-int/2addr v3, v1
-
-    iget v0, p0, Lk0/a/s1/a;->h:I
-
-    if-ge v3, v0, :cond_3
-
-    invoke-virtual {p0}, Lk0/a/s1/a;->c()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_2
-
-    iget v2, p0, Lk0/a/s1/a;->h:I
-
-    if-le v2, v1, :cond_2
-
-    invoke-virtual {p0}, Lk0/a/s1/a;->c()I
-
-    :cond_2
-    if-lez v0, :cond_3
-
-    return-void
-
-    :cond_3
-    invoke-virtual {p0}, Lk0/a/s1/a;->p()Z
-
-    return-void
-.end method
-
-.method public final n(Lk0/a/s1/h;)V
-    .locals 2
-
-    :try_start_0
-    invoke-interface {p1}, Ljava/lang/Runnable;->run()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    const-string v1, "thread"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v1
-
-    invoke-interface {v1, v0, p1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :goto_0
-    return-void
-
-    :catchall_1
-    move-exception p1
-
-    throw p1
-.end method
-
-.method public final p()Z
-    .locals 9
-
-    :cond_0
-    :goto_0
-    iget-wide v2, p0, Lk0/a/s1/a;->parkedWorkersStack:J
-
-    const-wide/32 v0, 0x1fffff
-
-    and-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    iget-object v0, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    aget-object v6, v0, v1
-
-    if-eqz v6, :cond_2
-
-    const-wide/32 v0, 0x200000
-
-    add-long/2addr v0, v2
-
-    const-wide/32 v4, -0x200000
-
-    and-long/2addr v0, v4
-
-    invoke-virtual {p0, v6}, Lk0/a/s1/a;->i(Lk0/a/s1/a$a;)I
-
-    move-result v4
-
-    if-gez v4, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v5, Lk0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    int-to-long v7, v4
-
-    or-long/2addr v7, v0
-
-    move-object v0, v5
-
-    move-object v1, p0
-
-    move-wide v4, v7
-
-    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object v0, Lk0/a/s1/a;->s:Lk0/a/r1/v;
-
-    iput-object v0, v6, Lk0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v6, 0x0
-
-    :goto_1
-    const/4 v0, 0x0
-
-    if-eqz v6, :cond_9
-
-    sget v1, Lk0/a/s1/a;->r:I
-
-    iput v1, v6, Lk0/a/s1/a$a;->g:I
-
-    iput v0, v6, Lk0/a/s1/a$a;->spins:I
-
-    iget-object v1, v6, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    sget-object v2, Lk0/a/s1/a$b;->f:Lk0/a/s1/a$b;
-
-    const/4 v3, 0x1
-
-    if-ne v1, v2, :cond_3
-
-    const/4 v1, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v1, 0x0
-
-    :goto_2
-    invoke-static {v6}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
-
-    if-nez v1, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    iget v1, v6, Lk0/a/s1/a$a;->terminationState:I
-
-    if-ne v1, v3, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v2, -0x1
-
-    if-ne v1, v2, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    if-nez v1, :cond_8
-
-    sget-object v1, Lk0/a/s1/a$a;->k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {v1, v6, v0, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v0
-
-    :goto_3
-    if-nez v0, :cond_7
-
-    goto :goto_0
-
-    :cond_7
-    return v3
-
-    :cond_8
-    const-string v0, "Invalid terminationState = "
-
-    invoke-static {v0, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_9
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 14
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iget-object v1, p0, Lk0/a/s1/a;->f:[Lk0/a/s1/a$a;
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    :goto_0
-    if-ge v4, v2, :cond_8
-
-    aget-object v10, v1, v4
-
-    if-nez v10, :cond_0
-
-    goto/16 :goto_1
-
-    :cond_0
-    iget-object v11, v10, Lk0/a/s1/a$a;->d:Lk0/a/s1/n;
-
-    iget-object v12, v11, Lk0/a/s1/n;->lastScheduledTask:Ljava/lang/Object;
-
-    const/4 v13, 0x1
-
-    invoke-virtual {v11}, Lk0/a/s1/n;->d()I
-
-    move-result v11
-
-    if-eqz v12, :cond_1
-
-    add-int/2addr v11, v13
-
-    :cond_1
-    iget-object v10, v10, Lk0/a/s1/a$a;->state:Lk0/a/s1/a$b;
-
-    invoke-virtual {v10}, Ljava/lang/Enum;->ordinal()I
-
-    move-result v10
-
-    if-eqz v10, :cond_6
-
-    if-eq v10, v13, :cond_5
-
-    const/4 v12, 0x2
-
-    if-eq v10, v12, :cond_4
-
-    const/4 v12, 0x3
-
-    if-eq v10, v12, :cond_3
-
-    const/4 v11, 0x4
-
-    if-eq v10, v11, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    add-int/lit8 v9, v9, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    add-int/lit8 v8, v8, 0x1
-
-    if-lez v11, :cond_7
-
-    new-instance v10, Ljava/lang/StringBuilder;
-
-    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v11, "r"
-
-    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-interface {v0, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_4
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    add-int/lit8 v6, v6, 0x1
-
-    new-instance v10, Ljava/lang/StringBuilder;
-
-    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v11, "b"
-
-    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-interface {v0, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_6
-    add-int/lit8 v5, v5, 0x1
-
-    new-instance v10, Ljava/lang/StringBuilder;
-
-    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v11, "c"
-
-    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-interface {v0, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    :cond_7
-    :goto_1
-    add-int/lit8 v4, v4, 0x1
-
-    goto/16 :goto_0
-
-    :cond_8
-    iget-wide v1, p0, Lk0/a/s1/a;->controlState:J
-
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v10, p0, Lk0/a/s1/a;->k:Ljava/lang/String;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v10, 0x40
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v10, 0x5b
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v10, "Pool Size {"
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v10, "core = "
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v10, p0, Lk0/a/s1/a;->h:I
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v10, ", "
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v11, "max = "
-
-    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v11, p0, Lk0/a/s1/a;->i:I
-
-    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v11, "}, "
-
-    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v12, "Worker States {"
-
-    invoke-virtual {v4, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v12, "CPU = "
-
-    invoke-virtual {v4, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v5, "blocking = "
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v6, "parked = "
-
-    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v7}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v6, "retired = "
-
-    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v6, "terminated = "
-
-    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v9}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v6, "running workers queues = "
-
-    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "global queue size = "
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v0, p0, Lk0/a/s1/a;->d:Lk0/a/s1/d;
-
-    iget-object v0, v0, Lk0/a/r1/n;->_cur$internal:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/r1/o;
-
-    iget-wide v6, v0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/32 v8, 0x3fffffff
-
-    and-long/2addr v8, v6
-
-    shr-long/2addr v8, v3
-
-    long-to-int v0, v8
-
-    const-wide v8, 0xfffffffc0000000L
-
-    and-long/2addr v6, v8
-
-    const/16 v3, 0x1e
-
-    shr-long/2addr v6, v3
-
-    long-to-int v3, v6
-
-    sub-int/2addr v3, v0
-
-    const v0, 0x3fffffff    # 1.9999999f
-
-    and-int/2addr v0, v3
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "Control State Workers {"
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "created = "
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-wide/32 v6, 0x1fffff
-
-    and-long/2addr v6, v1
-
-    long-to-int v0, v6
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-wide v5, 0x3ffffe00000L
-
-    and-long v0, v1, v5
-
-    const/16 v2, 0x15
-
-    shr-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x7d
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v0, "]"
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/b.smali b/com.discord/smali_classes2/k0/a/s1/b.smali
deleted file mode 100644
index 4937e3f5ff..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/b.smali
+++ /dev/null
@@ -1,126 +0,0 @@
-.class public final Lk0/a/s1/b;
-.super Lk0/a/s1/c;
-.source "Dispatcher.kt"
-
-
-# static fields
-.field public static final i:Lk0/a/v;
-
-.field public static final j:Lk0/a/s1/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 8
-
-    new-instance v0, Lk0/a/s1/b;
-
-    invoke-direct {v0}, Lk0/a/s1/b;-><init>()V
-
-    sput-object v0, Lk0/a/s1/b;->j:Lk0/a/s1/b;
-
-    sget v1, Lk0/a/r1/w;->a:I
-
-    const/16 v2, 0x40
-
-    if-ge v2, v1, :cond_0
-
-    move v3, v1
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v1, 0x40
-
-    const/16 v3, 0x40
-
-    :goto_0
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/16 v6, 0xc
-
-    const/4 v7, 0x0
-
-    const-string v2, "kotlinx.coroutines.io.parallelism"
-
-    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-
-    move-result v1
-
-    if-lez v1, :cond_1
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_2
-
-    new-instance v2, Lk0/a/s1/e;
-
-    sget-object v3, Lk0/a/s1/k;->e:Lk0/a/s1/k;
-
-    invoke-direct {v2, v0, v1, v3}, Lk0/a/s1/e;-><init>(Lk0/a/s1/c;ILk0/a/s1/k;)V
-
-    sput-object v2, Lk0/a/s1/b;->i:Lk0/a/v;
-
-    return-void
-
-    :cond_2
-    const-string v0, "Expected positive parallelism level, but have "
-
-    invoke-static {v0, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public constructor <init>()V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x7
-
-    invoke-direct {p0, v0, v0, v1, v2}, Lk0/a/s1/c;-><init>(IILjava/lang/String;I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public close()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "DefaultDispatcher cannot be closed"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "DefaultDispatcher"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/c.smali b/com.discord/smali_classes2/k0/a/s1/c.smali
deleted file mode 100644
index c4558ef51a..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/c.smali
+++ /dev/null
@@ -1,209 +0,0 @@
-.class public Lk0/a/s1/c;
-.super Lk0/a/r0;
-.source "Dispatcher.kt"
-
-
-# instance fields
-.field public d:Lk0/a/s1/a;
-
-.field public final e:I
-
-.field public final f:I
-
-.field public final g:J
-
-.field public final h:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(IILjava/lang/String;I)V
-    .locals 8
-
-    and-int/lit8 p3, p4, 0x1
-
-    if-eqz p3, :cond_0
-
-    sget p1, Lk0/a/s1/l;->c:I
-
-    :cond_0
-    and-int/lit8 p3, p4, 0x2
-
-    if-eqz p3, :cond_1
-
-    sget p2, Lk0/a/s1/l;->d:I
-
-    :cond_1
-    and-int/lit8 p3, p4, 0x4
-
-    const/4 p4, 0x0
-
-    if-eqz p3, :cond_2
-
-    const-string p3, "DefaultDispatcher"
-
-    goto :goto_0
-
-    :cond_2
-    move-object p3, p4
-
-    :goto_0
-    if-eqz p3, :cond_3
-
-    sget-wide v0, Lk0/a/s1/l;->e:J
-
-    invoke-direct {p0}, Lk0/a/r0;-><init>()V
-
-    iput p1, p0, Lk0/a/s1/c;->e:I
-
-    iput p2, p0, Lk0/a/s1/c;->f:I
-
-    iput-wide v0, p0, Lk0/a/s1/c;->g:J
-
-    iput-object p3, p0, Lk0/a/s1/c;->h:Ljava/lang/String;
-
-    new-instance p1, Lk0/a/s1/a;
-
-    iget v3, p0, Lk0/a/s1/c;->e:I
-
-    iget v4, p0, Lk0/a/s1/c;->f:I
-
-    iget-wide v5, p0, Lk0/a/s1/c;->g:J
-
-    iget-object v7, p0, Lk0/a/s1/c;->h:Ljava/lang/String;
-
-    move-object v2, p1
-
-    invoke-direct/range {v2 .. v7}, Lk0/a/s1/a;-><init>(IIJLjava/lang/String;)V
-
-    iput-object p1, p0, Lk0/a/s1/c;->d:Lk0/a/s1/a;
-
-    return-void
-
-    :cond_3
-    const-string p1, "schedulerName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
-.end method
-
-
-# virtual methods
-.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    :try_start_0
-    iget-object p1, p0, Lk0/a/s1/c;->d:Lk0/a/s1/a;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x6
-
-    invoke-static {p1, p2, v0, v1, v2}, Lk0/a/s1/a;->g(Lk0/a/s1/a;Ljava/lang/Runnable;Lk0/a/s1/i;ZI)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    sget-object p1, Lk0/a/c0;->j:Lk0/a/c0;
-
-    invoke-virtual {p1, p2}, Lk0/a/o0;->F(Ljava/lang/Runnable;)V
-
-    :goto_0
-    return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public dispatchYield(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    :try_start_0
-    iget-object v1, p0, Lk0/a/s1/c;->d:Lk0/a/s1/a;
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x2
-
-    invoke-static {v1, p2, v0, v2, v3}, Lk0/a/s1/a;->g(Lk0/a/s1/a;Ljava/lang/Runnable;Lk0/a/s1/i;ZI)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    sget-object v0, Lk0/a/c0;->j:Lk0/a/c0;
-
-    invoke-virtual {v0, p1, p2}, Lk0/a/v;->dispatchYield(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-
-    :goto_0
-    return-void
-
-    :cond_0
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final v(Ljava/lang/Runnable;Lk0/a/s1/i;Z)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    :try_start_0
-    iget-object v0, p0, Lk0/a/s1/c;->d:Lk0/a/s1/a;
-
-    invoke-virtual {v0, p1, p2, p3}, Lk0/a/s1/a;->f(Ljava/lang/Runnable;Lk0/a/s1/i;Z)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    sget-object p3, Lk0/a/c0;->j:Lk0/a/c0;
-
-    iget-object v0, p0, Lk0/a/s1/c;->d:Lk0/a/s1/a;
-
-    invoke-virtual {v0, p1, p2}, Lk0/a/s1/a;->d(Ljava/lang/Runnable;Lk0/a/s1/i;)Lk0/a/s1/h;
-
-    move-result-object p1
-
-    invoke-virtual {p3, p1}, Lk0/a/o0;->F(Ljava/lang/Runnable;)V
-
-    :goto_0
-    return-void
-
-    :cond_0
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/d.smali b/com.discord/smali_classes2/k0/a/s1/d.smali
deleted file mode 100644
index 1170ba9d51..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/d.smali
+++ /dev/null
@@ -1,205 +0,0 @@
-.class public Lk0/a/s1/d;
-.super Lk0/a/r1/n;
-.source "Tasks.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/r1/n<",
-        "Lk0/a/s1/h;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lk0/a/r1/n;-><init>(Z)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final c(Lk0/a/s1/k;)Lk0/a/s1/h;
-    .locals 11
-
-    :goto_0
-    iget-object v0, p0, Lk0/a/r1/n;->_cur$internal:Ljava/lang/Object;
-
-    check-cast v0, Lk0/a/r1/o;
-
-    :cond_0
-    :goto_1
-    iget-wide v3, v0, Lk0/a/r1/o;->_state$internal:J
-
-    const-wide/high16 v1, 0x1000000000000000L
-
-    and-long/2addr v1, v3
-
-    const-wide/16 v5, 0x0
-
-    const/4 v7, 0x0
-
-    cmp-long v8, v1, v5
-
-    if-eqz v8, :cond_1
-
-    sget-object v7, Lk0/a/r1/o;->g:Lk0/a/r1/v;
-
-    goto/16 :goto_4
-
-    :cond_1
-    sget-object v1, Lk0/a/r1/o;->h:Lk0/a/r1/o$a;
-
-    const-wide/32 v1, 0x3fffffff
-
-    and-long/2addr v1, v3
-
-    const/4 v5, 0x0
-
-    shr-long/2addr v1, v5
-
-    long-to-int v8, v1
-
-    const-wide v1, 0xfffffffc0000000L
-
-    and-long/2addr v1, v3
-
-    const/16 v6, 0x1e
-
-    shr-long/2addr v1, v6
-
-    long-to-int v2, v1
-
-    iget v1, v0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v2, v1
-
-    and-int/2addr v1, v8
-
-    if-ne v2, v1, :cond_2
-
-    goto :goto_4
-
-    :cond_2
-    iget-object v2, v0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v9
-
-    if-nez v9, :cond_3
-
-    iget-boolean v1, v0, Lk0/a/r1/o;->d:Z
-
-    if-eqz v1, :cond_0
-
-    goto :goto_4
-
-    :cond_3
-    instance-of v1, v9, Lk0/a/r1/o$b;
-
-    if-eqz v1, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    move-object v1, v9
-
-    check-cast v1, Lk0/a/s1/h;
-
-    invoke-virtual {v1}, Lk0/a/s1/h;->a()Lk0/a/s1/k;
-
-    move-result-object v1
-
-    if-ne v1, p1, :cond_5
-
-    const/4 v5, 0x1
-
-    :cond_5
-    if-nez v5, :cond_6
-
-    goto :goto_4
-
-    :cond_6
-    add-int/lit8 v1, v8, 0x1
-
-    const v2, 0x3fffffff    # 1.9999999f
-
-    and-int v10, v1, v2
-
-    sget-object v1, Lk0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
-
-    sget-object v2, Lk0/a/r1/o;->h:Lk0/a/r1/o$a;
-
-    invoke-virtual {v2, v3, v4, v10}, Lk0/a/r1/o$a;->a(JI)J
-
-    move-result-wide v5
-
-    move-object v2, v0
-
-    invoke-virtual/range {v1 .. v6}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    iget-object v1, v0, Lk0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v2, v0, Lk0/a/r1/o;->a:I
-
-    and-int/2addr v2, v8
-
-    invoke-virtual {v1, v2, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
-
-    goto :goto_3
-
-    :cond_7
-    iget-boolean v1, v0, Lk0/a/r1/o;->d:Z
-
-    if-nez v1, :cond_8
-
-    goto :goto_1
-
-    :cond_8
-    move-object v1, v0
-
-    :goto_2
-    invoke-static {v1, v8, v10}, Lk0/a/r1/o;->a(Lk0/a/r1/o;II)Lk0/a/r1/o;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_9
-
-    goto :goto_2
-
-    :cond_9
-    :goto_3
-    move-object v7, v9
-
-    :goto_4
-    sget-object v1, Lk0/a/r1/o;->g:Lk0/a/r1/v;
-
-    if-eq v7, v1, :cond_a
-
-    check-cast v7, Lk0/a/s1/h;
-
-    return-object v7
-
-    :cond_a
-    sget-object v1, Lk0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v0}, Lk0/a/r1/o;->e()Lk0/a/r1/o;
-
-    move-result-object v2
-
-    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto/16 :goto_0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/e.smali b/com.discord/smali_classes2/k0/a/s1/e.smali
deleted file mode 100644
index 065b84a55c..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/e.smali
+++ /dev/null
@@ -1,269 +0,0 @@
-.class public final Lk0/a/s1/e;
-.super Lk0/a/r0;
-.source "Dispatcher.kt"
-
-# interfaces
-.implements Lk0/a/s1/i;
-.implements Ljava/util/concurrent/Executor;
-
-
-# static fields
-.field public static final h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
-            "Ljava/lang/Runnable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lk0/a/s1/c;
-
-.field public final f:I
-
-.field public final g:Lk0/a/s1/k;
-
-.field public volatile inFlightTasks:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lk0/a/s1/e;
-
-    const-string v1, "inFlightTasks"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lk0/a/s1/c;ILk0/a/s1/k;)V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/r0;-><init>()V
-
-    iput-object p1, p0, Lk0/a/s1/e;->e:Lk0/a/s1/c;
-
-    iput p2, p0, Lk0/a/s1/e;->f:I
-
-    iput-object p3, p0, Lk0/a/s1/e;->g:Lk0/a/s1/k;
-
-    new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
-
-    iput-object p1, p0, Lk0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    const/4 p1, 0x0
-
-    iput p1, p0, Lk0/a/s1/e;->inFlightTasks:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public c()V
-    .locals 3
-
-    iget-object v0, p0, Lk0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Runnable;
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v2, p0, Lk0/a/s1/e;->e:Lk0/a/s1/c;
-
-    invoke-virtual {v2, v0, p0, v1}, Lk0/a/s1/c;->v(Ljava/lang/Runnable;Lk0/a/s1/i;Z)V
-
-    return-void
-
-    :cond_0
-    sget-object v0, Lk0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {v0, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->decrementAndGet(Ljava/lang/Object;)I
-
-    iget-object v0, p0, Lk0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Runnable;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0, v0, v1}, Lk0/a/s1/e;->v(Ljava/lang/Runnable;Z)V
-
-    :cond_1
-    return-void
-.end method
-
-.method public close()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Close cannot be invoked on LimitingBlockingDispatcher"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p2, p1}, Lk0/a/s1/e;->v(Ljava/lang/Runnable;Z)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public execute(Ljava/lang/Runnable;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Lk0/a/s1/e;->v(Ljava/lang/Runnable;Z)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "command"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public g()Lk0/a/s1/k;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/s1/e;->g:Lk0/a/s1/k;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-super {p0}, Lk0/a/v;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "[dispatcher = "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lk0/a/s1/e;->e:Lk0/a/s1/c;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final v(Ljava/lang/Runnable;Z)V
-    .locals 2
-
-    :goto_0
-    sget-object v0, Lk0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {v0, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->incrementAndGet(Ljava/lang/Object;)I
-
-    move-result v0
-
-    iget v1, p0, Lk0/a/s1/e;->f:I
-
-    if-gt v0, v1, :cond_0
-
-    iget-object v0, p0, Lk0/a/s1/e;->e:Lk0/a/s1/c;
-
-    invoke-virtual {v0, p1, p0, p2}, Lk0/a/s1/c;->v(Ljava/lang/Runnable;Lk0/a/s1/i;Z)V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lk0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
-
-    sget-object p1, Lk0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {p1, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->decrementAndGet(Ljava/lang/Object;)I
-
-    move-result p1
-
-    iget v0, p0, Lk0/a/s1/e;->f:I
-
-    if-lt p1, v0, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object p1, p0, Lk0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Runnable;
-
-    if-eqz p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/f.smali b/com.discord/smali_classes2/k0/a/s1/f.smali
deleted file mode 100644
index 151b92462f..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/f.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lk0/a/s1/f;
-.super Lk0/a/s1/m;
-.source "Tasks.kt"
-
-
-# static fields
-.field public static final a:Lk0/a/s1/f;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/s1/f;
-
-    invoke-direct {v0}, Lk0/a/s1/f;-><init>()V
-
-    sput-object v0, Lk0/a/s1/f;->a:Lk0/a/s1/f;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lk0/a/s1/m;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/g.smali b/com.discord/smali_classes2/k0/a/s1/g.smali
deleted file mode 100644
index cdff4793cc..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/g.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public final Lk0/a/s1/g;
-.super Ljava/lang/Object;
-.source "Tasks.kt"
-
-# interfaces
-.implements Lk0/a/s1/i;
-
-
-# static fields
-.field public static final d:Lk0/a/s1/k;
-
-.field public static final e:Lk0/a/s1/g;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lk0/a/s1/g;
-
-    invoke-direct {v0}, Lk0/a/s1/g;-><init>()V
-
-    sput-object v0, Lk0/a/s1/g;->e:Lk0/a/s1/g;
-
-    sget-object v0, Lk0/a/s1/k;->d:Lk0/a/s1/k;
-
-    sput-object v0, Lk0/a/s1/g;->d:Lk0/a/s1/k;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public c()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public g()Lk0/a/s1/k;
-    .locals 1
-
-    sget-object v0, Lk0/a/s1/k;->d:Lk0/a/s1/k;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/h.smali b/com.discord/smali_classes2/k0/a/s1/h.smali
deleted file mode 100644
index d8f184d17f..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/h.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public abstract Lk0/a/s1/h;
-.super Ljava/lang/Object;
-.source "Tasks.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public d:J
-
-.field public e:Lk0/a/s1/i;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 3
-
-    sget-object v0, Lk0/a/s1/g;->e:Lk0/a/s1/g;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const-wide/16 v1, 0x0
-
-    iput-wide v1, p0, Lk0/a/s1/h;->d:J
-
-    iput-object v0, p0, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    return-void
-.end method
-
-.method public constructor <init>(JLk0/a/s1/i;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lk0/a/s1/h;->d:J
-
-    iput-object p3, p0, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()Lk0/a/s1/k;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    invoke-interface {v0}, Lk0/a/s1/i;->g()Lk0/a/s1/k;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/i.smali b/com.discord/smali_classes2/k0/a/s1/i.smali
deleted file mode 100644
index c14e6b5a65..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/i.smali
+++ /dev/null
@@ -1,11 +0,0 @@
-.class public interface abstract Lk0/a/s1/i;
-.super Ljava/lang/Object;
-.source "Tasks.kt"
-
-
-# virtual methods
-.method public abstract c()V
-.end method
-
-.method public abstract g()Lk0/a/s1/k;
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/j.smali b/com.discord/smali_classes2/k0/a/s1/j.smali
deleted file mode 100644
index ad6e168e05..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/j.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final Lk0/a/s1/j;
-.super Lk0/a/s1/h;
-.source "Tasks.kt"
-
-
-# instance fields
-.field public final f:Ljava/lang/Runnable;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Runnable;JLk0/a/s1/i;)V
-    .locals 0
-
-    invoke-direct {p0, p2, p3, p4}, Lk0/a/s1/h;-><init>(JLk0/a/s1/i;)V
-
-    iput-object p1, p0, Lk0/a/s1/j;->f:Ljava/lang/Runnable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lk0/a/s1/j;->f:Ljava/lang/Runnable;
-
-    invoke-interface {v0}, Ljava/lang/Runnable;->run()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    invoke-interface {v0}, Lk0/a/s1/i;->c()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    invoke-interface {v1}, Lk0/a/s1/i;->c()V
-
-    throw v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 4
-
-    const-string v0, "Task["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/s1/j;->f:Ljava/lang/Runnable;
-
-    invoke-static {v1}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lk0/a/s1/j;->f:Ljava/lang/Runnable;
-
-    invoke-static {v1}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-wide v2, p0, Lk0/a/s1/h;->d:J
-
-    invoke-virtual {v0, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lk0/a/s1/h;->e:Lk0/a/s1/i;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/k.smali b/com.discord/smali_classes2/k0/a/s1/k.smali
deleted file mode 100644
index cffd048e6d..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/k.smali
+++ /dev/null
@@ -1,100 +0,0 @@
-.class public final enum Lk0/a/s1/k;
-.super Ljava/lang/Enum;
-.source "Tasks.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lk0/a/s1/k;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lk0/a/s1/k;
-
-.field public static final enum e:Lk0/a/s1/k;
-
-.field public static final synthetic f:[Lk0/a/s1/k;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x2
-
-    new-array v0, v0, [Lk0/a/s1/k;
-
-    new-instance v1, Lk0/a/s1/k;
-
-    const-string v2, "NON_BLOCKING"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Lk0/a/s1/k;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/s1/k;->d:Lk0/a/s1/k;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/s1/k;
-
-    const-string v2, "PROBABLY_BLOCKING"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Lk0/a/s1/k;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/s1/k;->e:Lk0/a/s1/k;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lk0/a/s1/k;->f:[Lk0/a/s1/k;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lk0/a/s1/k;
-    .locals 1
-
-    const-class v0, Lk0/a/s1/k;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lk0/a/s1/k;
-
-    return-object p0
-.end method
-
-.method public static values()[Lk0/a/s1/k;
-    .locals 1
-
-    sget-object v0, Lk0/a/s1/k;->f:[Lk0/a/s1/k;
-
-    invoke-virtual {v0}, [Lk0/a/s1/k;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lk0/a/s1/k;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/l.smali b/com.discord/smali_classes2/k0/a/s1/l.smali
deleted file mode 100644
index a65cd99dca..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/l.smali
+++ /dev/null
@@ -1,159 +0,0 @@
-.class public final Lk0/a/s1/l;
-.super Ljava/lang/Object;
-.source "Tasks.kt"
-
-
-# static fields
-.field public static final a:J
-
-.field public static final b:I
-
-.field public static final c:I
-
-.field public static final d:I
-
-.field public static final e:J
-
-.field public static f:Lk0/a/s1/m;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 10
-
-    const-string v0, "kotlinx.coroutines.scheduler.resolution.ns"
-
-    const-wide/32 v1, 0x186a0
-
-    const-wide/16 v3, 0x0
-
-    const-wide/16 v5, 0x0
-
-    const/16 v7, 0xc
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v0 .. v8}, Lf/n/a/k/a;->e0(Ljava/lang/String;JJJILjava/lang/Object;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lk0/a/s1/l;->a:J
-
-    const-string v2, "kotlinx.coroutines.scheduler.offload.threshold"
-
-    const/16 v3, 0x60
-
-    const/4 v4, 0x0
-
-    const/16 v5, 0x80
-
-    const/4 v6, 0x4
-
-    const/4 v7, 0x0
-
-    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-
-    move-result v0
-
-    sput v0, Lk0/a/s1/l;->b:I
-
-    const-string v1, "kotlinx.coroutines.scheduler.blocking.parallelism"
-
-    const/16 v2, 0x10
-
-    const/4 v3, 0x0
-
-    const/16 v5, 0xc
-
-    const/4 v6, 0x0
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-
-    sget v0, Lk0/a/r1/w;->a:I
-
-    const/4 v1, 0x2
-
-    if-ge v0, v1, :cond_0
-
-    const/4 v3, 0x2
-
-    goto :goto_0
-
-    :cond_0
-    move v3, v0
-
-    :goto_0
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    const/16 v6, 0x8
-
-    const/4 v7, 0x0
-
-    const-string v2, "kotlinx.coroutines.scheduler.core.pool.size"
-
-    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-
-    move-result v0
-
-    sput v0, Lk0/a/s1/l;->c:I
-
-    sget v0, Lk0/a/r1/w;->a:I
-
-    mul-int/lit16 v0, v0, 0x80
-
-    sget v1, Lk0/a/s1/l;->c:I
-
-    const v2, 0x1ffffe
-
-    invoke-static {v0, v1, v2}, Lj0/q/f;->coerceIn(III)I
-
-    move-result v4
-
-    const/4 v5, 0x0
-
-    const v6, 0x1ffffe
-
-    const/4 v7, 0x4
-
-    const/4 v8, 0x0
-
-    const-string v3, "kotlinx.coroutines.scheduler.max.pool.size"
-
-    invoke-static/range {v3 .. v8}, Lf/n/a/k/a;->d0(Ljava/lang/String;IIIILjava/lang/Object;)I
-
-    move-result v0
-
-    sput v0, Lk0/a/s1/l;->d:I
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v2, 0x5
-
-    const-wide/16 v4, 0x0
-
-    const-wide/16 v6, 0x0
-
-    const/16 v8, 0xc
-
-    const/4 v9, 0x0
-
-    const-string v1, "kotlinx.coroutines.scheduler.keep.alive.sec"
-
-    invoke-static/range {v1 .. v9}, Lf/n/a/k/a;->e0(Ljava/lang/String;JJJILjava/lang/Object;)J
-
-    move-result-wide v1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lk0/a/s1/l;->e:J
-
-    sget-object v0, Lk0/a/s1/f;->a:Lk0/a/s1/f;
-
-    sput-object v0, Lk0/a/s1/l;->f:Lk0/a/s1/m;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/m.smali b/com.discord/smali_classes2/k0/a/s1/m.smali
deleted file mode 100644
index 26aa5562e0..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/m.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public abstract Lk0/a/s1/m;
-.super Ljava/lang/Object;
-.source "Tasks.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/s1/n.smali b/com.discord/smali_classes2/k0/a/s1/n.smali
deleted file mode 100644
index 4e7f6d045b..0000000000
--- a/com.discord/smali_classes2/k0/a/s1/n.smali
+++ /dev/null
@@ -1,383 +0,0 @@
-.class public final Lk0/a/s1/n;
-.super Ljava/lang/Object;
-.source "WorkQueue.kt"
-
-
-# static fields
-.field public static final b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-.field public static final c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-.field public static final d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-            "Lk0/a/s1/h;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public volatile consumerIndex:I
-
-.field public volatile lastScheduledTask:Ljava/lang/Object;
-
-.field public volatile producerIndex:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, Lk0/a/s1/n;
-
-    const-class v1, Ljava/lang/Object;
-
-    const-string v2, "lastScheduledTask"
-
-    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    move-result-object v1
-
-    sput-object v1, Lk0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const-string v1, "producerIndex"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v1
-
-    sput-object v1, Lk0/a/s1/n;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const-string v1, "consumerIndex"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    const/16 v1, 0x80
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object v0, p0, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lk0/a/s1/n;->lastScheduledTask:Ljava/lang/Object;
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lk0/a/s1/n;->producerIndex:I
-
-    iput v0, p0, Lk0/a/s1/n;->consumerIndex:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    sget-object v0, Lk0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    invoke-virtual {v0, p0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->getAndSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lk0/a/s1/h;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0, p1, p2}, Lk0/a/s1/n;->b(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_1
-    const-string p1, "globalQueue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "task"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final b(Lk0/a/s1/h;Lk0/a/s1/d;)Z
-    .locals 9
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_7
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x1
-
-    :goto_0
-    invoke-virtual {p0}, Lk0/a/s1/n;->d()I
-
-    move-result v4
-
-    const/16 v5, 0x7f
-
-    if-ne v4, v5, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    iget v4, p0, Lk0/a/s1/n;->producerIndex:I
-
-    and-int/2addr v4, v5
-
-    iget-object v5, p0, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v5, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_1
-
-    :goto_1
-    const/4 v4, 0x0
-
-    goto :goto_2
-
-    :cond_1
-    iget-object v5, p0, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v5, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    sget-object v4, Lk0/a/s1/n;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    invoke-virtual {v4, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->incrementAndGet(Ljava/lang/Object;)I
-
-    const/4 v4, 0x1
-
-    :goto_2
-    if-nez v4, :cond_6
-
-    invoke-virtual {p0}, Lk0/a/s1/n;->d()I
-
-    move-result v3
-
-    div-int/lit8 v3, v3, 0x2
-
-    if-ge v3, v2, :cond_2
-
-    const/4 v3, 0x1
-
-    :cond_2
-    const/4 v4, 0x0
-
-    :goto_3
-    if-ge v4, v3, :cond_5
-
-    :cond_3
-    iget v5, p0, Lk0/a/s1/n;->consumerIndex:I
-
-    iget v6, p0, Lk0/a/s1/n;->producerIndex:I
-
-    sub-int v6, v5, v6
-
-    if-nez v6, :cond_4
-
-    move-object v5, v0
-
-    goto :goto_4
-
-    :cond_4
-    and-int/lit8 v6, v5, 0x7f
-
-    iget-object v7, p0, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v7, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Lk0/a/s1/h;
-
-    if-eqz v7, :cond_3
-
-    sget-object v7, Lk0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    add-int/lit8 v8, v5, 0x1
-
-    invoke-virtual {v7, p0, v5, v8}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_3
-
-    iget-object v5, p0, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v5, v6, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lk0/a/s1/h;
-
-    :goto_4
-    if-eqz v5, :cond_5
-
-    invoke-virtual {p0, p2, v5}, Lk0/a/s1/n;->c(Lk0/a/s1/d;Lk0/a/s1/h;)V
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v3, 0x0
-
-    goto :goto_0
-
-    :cond_6
-    return v3
-
-    :cond_7
-    const-string p1, "globalQueue"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final c(Lk0/a/s1/d;Lk0/a/s1/h;)V
-    .locals 0
-
-    invoke-virtual {p1, p2}, Lk0/a/r1/n;->a(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "GlobalQueue could not be closed yet"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final d()I
-    .locals 2
-
-    iget v0, p0, Lk0/a/s1/n;->producerIndex:I
-
-    iget v1, p0, Lk0/a/s1/n;->consumerIndex:I
-
-    sub-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final e()Lk0/a/s1/h;
-    .locals 5
-
-    sget-object v0, Lk0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, p0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->getAndSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lk0/a/s1/h;
-
-    if-eqz v0, :cond_0
-
-    move-object v1, v0
-
-    goto :goto_0
-
-    :cond_0
-    iget v0, p0, Lk0/a/s1/n;->consumerIndex:I
-
-    iget v2, p0, Lk0/a/s1/n;->producerIndex:I
-
-    sub-int v2, v0, v2
-
-    if-nez v2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    and-int/lit8 v2, v0, 0x7f
-
-    iget-object v3, p0, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lk0/a/s1/h;
-
-    if-eqz v3, :cond_0
-
-    sget-object v3, Lk0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    add-int/lit8 v4, v0, 0x1
-
-    invoke-virtual {v3, p0, v0, v4}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lk0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v1, v0
-
-    check-cast v1, Lk0/a/s1/h;
-
-    :goto_0
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/t.smali b/com.discord/smali_classes2/k0/a/t.smali
deleted file mode 100644
index e4a948d2e5..0000000000
--- a/com.discord/smali_classes2/k0/a/t.smali
+++ /dev/null
@@ -1,26 +0,0 @@
-.class public interface abstract Lk0/a/t;
-.super Ljava/lang/Object;
-.source "Debug.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Throwable;",
-        ":",
-        "Lk0/a/t<",
-        "TT;>;>",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract a()Ljava/lang/Throwable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/k0/a/t0.smali b/com.discord/smali_classes2/k0/a/t0.smali
deleted file mode 100644
index fcf8d9d455..0000000000
--- a/com.discord/smali_classes2/k0/a/t0.smali
+++ /dev/null
@@ -1,66 +0,0 @@
-.class public final Lk0/a/t0;
-.super Ljava/lang/Object;
-.source "JobSupport.kt"
-
-# interfaces
-.implements Lk0/a/u0;
-
-
-# instance fields
-.field public final d:Lk0/a/g1;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/g1;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/t0;->d:Lk0/a/g1;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public getList()Lk0/a/g1;
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/t0;->d:Lk0/a/g1;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    sget-boolean v0, Lk0/a/b0;->b:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lk0/a/t0;->d:Lk0/a/g1;
-
-    const-string v1, "New"
-
-    invoke-virtual {v0, v1}, Lk0/a/g1;->i(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-super {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/u.smali b/com.discord/smali_classes2/k0/a/u.smali
deleted file mode 100644
index 5e8070686f..0000000000
--- a/com.discord/smali_classes2/k0/a/u.smali
+++ /dev/null
@@ -1,240 +0,0 @@
-.class public final Lk0/a/u;
-.super Ljava/lang/Object;
-.source "CoroutineContext.kt"
-
-
-# static fields
-.field public static final a:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-string v0, "kotlinx.coroutines.scheduler"
-
-    invoke-static {v0}, Lk0/a/r1/w;->a(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    const/16 v2, 0xddf
-
-    if-eq v1, v2, :cond_1
-
-    const v2, 0x1ad6f
-
-    if-ne v1, v2, :cond_3
-
-    const-string v1, "off"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    const/4 v0, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    const-string v1, "on"
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    goto :goto_0
-
-    :cond_2
-    const-string v1, ""
-
-    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    :goto_0
-    const/4 v0, 0x1
-
-    :goto_1
-    sput-boolean v0, Lk0/a/u;->a:Z
-
-    return-void
-
-    :cond_3
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "System property \'kotlinx.coroutines.scheduler\' has unrecognized value \'"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x27
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public static final a(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/String;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    sget-boolean v1, Lk0/a/b0;->b:Z
-
-    if-nez v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    sget-object v1, Lk0/a/x;->e:Lk0/a/x$a;
-
-    invoke-interface {p0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object v1
-
-    check-cast v1, Lk0/a/x;
-
-    if-eqz v1, :cond_1
-
-    sget-object v0, Lk0/a/y;->e:Lk0/a/y$a;
-
-    invoke-interface {p0, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p0
-
-    check-cast p0, Lk0/a/y;
-
-    new-instance p0, Ljava/lang/StringBuilder;
-
-    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "coroutine"
-
-    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x23
-
-    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-wide v0, v1, Lk0/a/x;->d:J
-
-    invoke-virtual {p0, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_1
-    return-object v0
-
-    :cond_2
-    const-string p0, "$this$coroutineName"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final b(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 2
-
-    if-eqz p1, :cond_2
-
-    invoke-interface {p0}, Lkotlinx/coroutines/CoroutineScope;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p0
-
-    invoke-interface {p0, p1}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p0
-
-    sget-boolean p1, Lk0/a/b0;->b:Z
-
-    if-eqz p1, :cond_0
-
-    new-instance p1, Lk0/a/x;
-
-    sget-object v0, Lk0/a/b0;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
-
-    move-result-wide v0
-
-    invoke-direct {p1, v0, v1}, Lk0/a/x;-><init>(J)V
-
-    invoke-interface {p0, p1}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    move-object p1, p0
-
-    :goto_0
-    sget-object v0, Lk0/a/j0;->a:Lk0/a/v;
-
-    if-eq p0, v0, :cond_1
-
-    sget-object v0, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-interface {p0, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p0
-
-    if-nez p0, :cond_1
-
-    sget-object p0, Lk0/a/j0;->a:Lk0/a/v;
-
-    invoke-interface {p1, p0}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    :cond_1
-    return-object p1
-
-    :cond_2
-    const-string p0, "context"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/u0.smali b/com.discord/smali_classes2/k0/a/u0.smali
deleted file mode 100644
index 1e808dcf30..0000000000
--- a/com.discord/smali_classes2/k0/a/u0.smali
+++ /dev/null
@@ -1,11 +0,0 @@
-.class public interface abstract Lk0/a/u0;
-.super Ljava/lang/Object;
-.source "JobSupport.kt"
-
-
-# virtual methods
-.method public abstract a()Z
-.end method
-
-.method public abstract getList()Lk0/a/g1;
-.end method
diff --git a/com.discord/smali_classes2/k0/a/v.smali b/com.discord/smali_classes2/k0/a/v.smali
deleted file mode 100644
index da11761db6..0000000000
--- a/com.discord/smali_classes2/k0/a/v.smali
+++ /dev/null
@@ -1,315 +0,0 @@
-.class public abstract Lk0/a/v;
-.super Lj0/k/a;
-.source "CoroutineDispatcher.kt"
-
-# interfaces
-.implements Lj0/k/d;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    sget-object v0, Lj0/k/d;->a:Lj0/k/d$a;
-
-    invoke-direct {p0, v0}, Lj0/k/a;-><init>(Lkotlin/coroutines/CoroutineContext$b;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-.end method
-
-.method public dispatchYield(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p0, p1, p2}, Lk0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "block"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            ">(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    const-string v0, "key"
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_5
-
-    instance-of v2, p1, Lj0/k/b;
-
-    if-eqz v2, :cond_3
-
-    check-cast p1, Lj0/k/b;
-
-    invoke-interface {p0}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_2
-
-    if-eq v2, p1, :cond_0
-
-    const/4 p1, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x1
-
-    :goto_0
-    if-nez p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    throw v1
-
-    :cond_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    sget-object v0, Lj0/k/d;->a:Lj0/k/d$a;
-
-    if-ne v0, p1, :cond_4
-
-    move-object v1, p0
-
-    :cond_4
-    :goto_1
-    return-object v1
-
-    :cond_5
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final interceptContinuation(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lkotlin/coroutines/Continuation<",
-            "-TT;>;)",
-            "Lkotlin/coroutines/Continuation<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Lk0/a/f0;
-
-    invoke-direct {v0, p0, p1}, Lk0/a/f0;-><init>(Lk0/a/v;Lkotlin/coroutines/Continuation;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p1, "continuation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;)",
-            "Lkotlin/coroutines/CoroutineContext;"
-        }
-    .end annotation
-
-    const-string v0, "key"
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_5
-
-    instance-of v2, p1, Lj0/k/b;
-
-    if-eqz v2, :cond_3
-
-    check-cast p1, Lj0/k/b;
-
-    invoke-interface {p0}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_2
-
-    if-eq v2, p1, :cond_0
-
-    const/4 p1, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x1
-
-    :goto_0
-    if-nez p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    throw v1
-
-    :cond_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    sget-object v0, Lj0/k/d;->a:Lj0/k/d$a;
-
-    if-ne v0, p1, :cond_4
-
-    sget-object p1, Lj0/k/f;->d:Lj0/k/f;
-
-    goto :goto_2
-
-    :cond_4
-    :goto_1
-    move-object p1, p0
-
-    :goto_2
-    return-object p1
-
-    :cond_5
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final plus(Lk0/a/v;)Lk0/a/v;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/Continuation<",
-            "*>;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "continuation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/v0.smali b/com.discord/smali_classes2/k0/a/v0.smali
deleted file mode 100644
index f41352217c..0000000000
--- a/com.discord/smali_classes2/k0/a/v0.smali
+++ /dev/null
@@ -1,30 +0,0 @@
-.class public final Lk0/a/v0;
-.super Ljava/lang/Object;
-.source "JobSupport.kt"
-
-
-# instance fields
-.field public final a:Lk0/a/u0;
-
-
-# direct methods
-.method public constructor <init>(Lk0/a/u0;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lk0/a/v0;->a:Lk0/a/u0;
-
-    return-void
-
-    :cond_0
-    const-string p1, "state"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/k0/a/w.smali b/com.discord/smali_classes2/k0/a/w.smali
deleted file mode 100644
index 6a79f9932d..0000000000
--- a/com.discord/smali_classes2/k0/a/w.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lk0/a/w;
-.super Ljava/lang/Object;
-.source "CoroutineExceptionHandlerImpl.kt"
-
-
-# static fields
-.field public static final a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lkotlinx/coroutines/CoroutineExceptionHandler;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    invoke-static {}, La;->a()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    const-string v1, "ServiceLoader.load(\n    \u2026.classLoader\n).iterator()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0}, Lf/n/a/k/a;->asSequence(Ljava/util/Iterator;)Lkotlin/sequences/Sequence;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/w;->a:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public static final a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-    .locals 4
-
-    sget-object v0, Lk0/a/w;->a:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    const-string v2, "currentThread"
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lkotlinx/coroutines/CoroutineExceptionHandler;
-
-    :try_start_0
-    invoke-interface {v1, p0, p1}, Lkotlinx/coroutines/CoroutineExceptionHandler;->handleException(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v3
-
-    invoke-static {v3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v2
-
-    invoke-static {p1, v1}, Lf/n/a/k/a;->G(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    move-result-object v1
-
-    invoke-interface {v2, v3, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object p0
-
-    invoke-static {p0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v0
-
-    invoke-interface {v0, p0, p1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/w0.smali b/com.discord/smali_classes2/k0/a/w0.smali
deleted file mode 100644
index 19447da02d..0000000000
--- a/com.discord/smali_classes2/k0/a/w0.smali
+++ /dev/null
@@ -1,113 +0,0 @@
-.class public final Lk0/a/w0;
-.super Lk0/a/d;
-.source "CancellableContinuationImpl.kt"
-
-
-# instance fields
-.field public final d:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Lk0/a/d;-><init>()V
-
-    iput-object p1, p0, Lk0/a/w0;->d:Lkotlin/jvm/functions/Function1;
-
-    return-void
-
-    :cond_0
-    const-string p1, "handler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/w0;->d:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    iget-object v0, p0, Lk0/a/w0;->d:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "InvokeOnCancel["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lk0/a/w0;->d:Lkotlin/jvm/functions/Function1;
-
-    invoke-static {v1}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/x$a.smali b/com.discord/smali_classes2/k0/a/x$a.smali
deleted file mode 100644
index 6e2176646c..0000000000
--- a/com.discord/smali_classes2/k0/a/x$a.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final Lk0/a/x$a;
-.super Ljava/lang/Object;
-.source "CoroutineContext.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/x;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/CoroutineContext$b<",
-        "Lk0/a/x;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/x.smali b/com.discord/smali_classes2/k0/a/x.smali
deleted file mode 100644
index 1604ce5f06..0000000000
--- a/com.discord/smali_classes2/k0/a/x.smali
+++ /dev/null
@@ -1,396 +0,0 @@
-.class public final Lk0/a/x;
-.super Lj0/k/a;
-.source "CoroutineContext.kt"
-
-# interfaces
-.implements Lk0/a/m1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lk0/a/x$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/k/a;",
-        "Lk0/a/m1<",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final e:Lk0/a/x$a;
-
-
-# instance fields
-.field public final d:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/x$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lk0/a/x$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lk0/a/x;->e:Lk0/a/x$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(J)V
-    .locals 1
-
-    sget-object v0, Lk0/a/x;->e:Lk0/a/x$a;
-
-    invoke-direct {p0, v0}, Lj0/k/a;-><init>(Lkotlin/coroutines/CoroutineContext$b;)V
-
-    iput-wide p1, p0, Lk0/a/x;->d:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 7
-
-    const/4 v0, 0x1
-
-    if-eq p0, p1, :cond_2
-
-    instance-of v1, p1, Lk0/a/x;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    check-cast p1, Lk0/a/x;
-
-    iget-wide v3, p0, Lk0/a/x;->d:J
-
-    iget-wide v5, p1, Lk0/a/x;->d:J
-
-    cmp-long p1, v3, v5
-
-    if-nez p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    return v2
-
-    :cond_2
-    :goto_1
-    return v0
-.end method
-
-.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(TR;",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TR;-",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            "+TR;>;)TR;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    invoke-static {p0, p1, p2}, Lkotlin/coroutines/CoroutineContext$a$a;->fold(Lkotlin/coroutines/CoroutineContext$a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "operation"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E::",
-            "Lkotlin/coroutines/CoroutineContext$a;",
-            ">(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "TE;>;)TE;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->get(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public hashCode()I
-    .locals 4
-
-    iget-wide v0, p0, Lk0/a/x;->d:J
-
-    const/16 v2, 0x20
-
-    ushr-long v2, v0, v2
-
-    xor-long/2addr v0, v2
-
-    long-to-int v1, v0
-
-    return v1
-.end method
-
-.method public k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
-    .locals 1
-
-    check-cast p2, Ljava/lang/String;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object p1
-
-    const-string v0, "Thread.currentThread()"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, p2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "oldState"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/coroutines/CoroutineContext$b<",
-            "*>;)",
-            "Lkotlin/coroutines/CoroutineContext;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->minusKey(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "key"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->plus(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
-    .locals 6
-
-    if-eqz p1, :cond_1
-
-    sget-object v0, Lk0/a/y;->e:Lk0/a/y$a;
-
-    invoke-interface {p1, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
-
-    move-result-object p1
-
-    check-cast p1, Lk0/a/y;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object p1
-
-    const-string v0, "currentThread"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "oldName"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v1, 0x6
-
-    const-string v2, " @"
-
-    const/4 v3, 0x0
-
-    invoke-static {v0, v2, v3, v3, v1}, Lj0/t/p;->lastIndexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
-
-    move-result v1
-
-    if-gez v1, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    :cond_0
-    const/16 v4, 0x9
-
-    add-int/2addr v4, v1
-
-    add-int/lit8 v4, v4, 0xa
-
-    new-instance v5, Ljava/lang/StringBuilder;
-
-    invoke-direct {v5, v4}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    invoke-virtual {v0, v3, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v3, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "coroutine"
-
-    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x23
-
-    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-wide v1, p0, Lk0/a/x;->d:J
-
-    invoke-virtual {v5, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v2, "StringBuilder(capacity).\u2026builderAction).toString()"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, v1}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_1
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "CoroutineId("
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-wide v1, p0, Lk0/a/x;->d:J
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/x0.smali b/com.discord/smali_classes2/k0/a/x0.smali
deleted file mode 100644
index 67a20aea44..0000000000
--- a/com.discord/smali_classes2/k0/a/x0.smali
+++ /dev/null
@@ -1,159 +0,0 @@
-.class public final Lk0/a/x0;
-.super Lk0/a/z0;
-.source "JobSupport.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/z0<",
-        "Lkotlinx/coroutines/Job;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-
-# instance fields
-.field public volatile _invoked:I
-
-.field public final h:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lk0/a/x0;
-
-    const-string v1, "_invoked"
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    move-result-object v0
-
-    sput-object v0, Lk0/a/x0;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlinx/coroutines/Job;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0, p1}, Lk0/a/z0;-><init>(Lkotlinx/coroutines/Job;)V
-
-    iput-object p2, p0, Lk0/a/x0;->h:Lkotlin/jvm/functions/Function1;
-
-    const/4 p1, 0x0
-
-    iput p1, p0, Lk0/a/x0;->_invoked:I
-
-    return-void
-
-    :cond_0
-    const-string p1, "handler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public i(Ljava/lang/Throwable;)V
-    .locals 3
-
-    sget-object v0, Lk0/a/x0;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lk0/a/x0;->h:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_0
-    return-void
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, p1}, Lk0/a/x0;->i(Ljava/lang/Throwable;)V
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "InvokeOnCancelling["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/y$a.smali b/com.discord/smali_classes2/k0/a/y$a.smali
deleted file mode 100644
index ef58eec1b4..0000000000
--- a/com.discord/smali_classes2/k0/a/y$a.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final Lk0/a/y$a;
-.super Ljava/lang/Object;
-.source "CoroutineName.kt"
-
-# interfaces
-.implements Lkotlin/coroutines/CoroutineContext$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/y;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lkotlin/coroutines/CoroutineContext$b<",
-        "Lk0/a/y;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/a/y.smali b/com.discord/smali_classes2/k0/a/y.smali
deleted file mode 100644
index 82cc77ee3e..0000000000
--- a/com.discord/smali_classes2/k0/a/y.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.class public final Lk0/a/y;
-.super Lj0/k/a;
-.source "CoroutineName.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lk0/a/y$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final e:Lk0/a/y$a;
-
-
-# instance fields
-.field public final d:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lk0/a/y$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lk0/a/y$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lk0/a/y;->e:Lk0/a/y$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lk0/a/y;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lk0/a/y;
-
-    const/4 v0, 0x0
-
-    iget-object p1, p1, Lk0/a/y;->d:Ljava/lang/String;
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "CoroutineName(null)"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/y0.smali b/com.discord/smali_classes2/k0/a/y0.smali
deleted file mode 100644
index 62d35a6647..0000000000
--- a/com.discord/smali_classes2/k0/a/y0.smali
+++ /dev/null
@@ -1,122 +0,0 @@
-.class public final Lk0/a/y0;
-.super Lk0/a/b1;
-.source "JobSupport.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lk0/a/b1<",
-        "Lkotlinx/coroutines/Job;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final h:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlinx/coroutines/Job;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0, p1}, Lk0/a/b1;-><init>(Lkotlinx/coroutines/Job;)V
-
-    iput-object p2, p0, Lk0/a/y0;->h:Lkotlin/jvm/functions/Function1;
-
-    return-void
-
-    :cond_0
-    const-string p1, "handler"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public i(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lk0/a/y0;->h:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    iget-object v0, p0, Lk0/a/y0;->h:Lkotlin/jvm/functions/Function1;
-
-    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "InvokeOnCompletion["
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-static {p0}, Lf/n/a/k/a;->C(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/z.smali b/com.discord/smali_classes2/k0/a/z.smali
deleted file mode 100644
index 6db834699d..0000000000
--- a/com.discord/smali_classes2/k0/a/z.smali
+++ /dev/null
@@ -1,128 +0,0 @@
-.class public final enum Lk0/a/z;
-.super Ljava/lang/Enum;
-.source "CoroutineStart.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lk0/a/z;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lk0/a/z;
-
-.field public static final enum e:Lk0/a/z;
-
-.field public static final enum f:Lk0/a/z;
-
-.field public static final enum g:Lk0/a/z;
-
-.field public static final synthetic h:[Lk0/a/z;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x4
-
-    new-array v0, v0, [Lk0/a/z;
-
-    new-instance v1, Lk0/a/z;
-
-    const-string v2, "DEFAULT"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Lk0/a/z;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/z;->d:Lk0/a/z;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/z;
-
-    const-string v2, "LAZY"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Lk0/a/z;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/z;->e:Lk0/a/z;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/z;
-
-    const-string v2, "ATOMIC"
-
-    const/4 v3, 0x2
-
-    invoke-direct {v1, v2, v3}, Lk0/a/z;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/z;->f:Lk0/a/z;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Lk0/a/z;
-
-    const-string v2, "UNDISPATCHED"
-
-    const/4 v3, 0x3
-
-    invoke-direct {v1, v2, v3}, Lk0/a/z;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Lk0/a/z;->g:Lk0/a/z;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Lk0/a/z;->h:[Lk0/a/z;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lk0/a/z;
-    .locals 1
-
-    const-class v0, Lk0/a/z;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lk0/a/z;
-
-    return-object p0
-.end method
-
-.method public static values()[Lk0/a/z;
-    .locals 1
-
-    sget-object v0, Lk0/a/z;->h:[Lk0/a/z;
-
-    invoke-virtual {v0}, [Lk0/a/z;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lk0/a/z;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/k0/a/z0.smali b/com.discord/smali_classes2/k0/a/z0.smali
deleted file mode 100644
index a7cb56fa65..0000000000
--- a/com.discord/smali_classes2/k0/a/z0.smali
+++ /dev/null
@@ -1,30 +0,0 @@
-.class public abstract Lk0/a/z0;
-.super Lk0/a/b1;
-.source "JobSupport.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<J::",
-        "Lkotlinx/coroutines/Job;",
-        ">",
-        "Lk0/a/b1<",
-        "TJ;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlinx/coroutines/Job;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TJ;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lk0/a/b1;-><init>(Lkotlinx/coroutines/Job;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/k0/b.smali b/com.discord/smali_classes2/k0/b.smali
new file mode 100644
index 0000000000..bf19534089
--- /dev/null
+++ b/com.discord/smali_classes2/k0/b.smali
@@ -0,0 +1,245 @@
+.class public final Lk0/b;
+.super Ljava/lang/Object;
+.source "KotlinVersion.kt"
+
+# interfaces
+.implements Ljava/lang/Comparable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/lang/Comparable<",
+        "Lk0/b;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final h:Lk0/b;
+
+
+# instance fields
+.field public final d:I
+
+.field public final e:I
+
+.field public final f:I
+
+.field public final g:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    new-instance v0, Lk0/b;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x4
+
+    const/4 v3, 0x0
+
+    invoke-direct {v0, v1, v2, v3}, Lk0/b;-><init>(III)V
+
+    sput-object v0, Lk0/b;->h:Lk0/b;
+
+    return-void
+.end method
+
+.method public constructor <init>(III)V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lk0/b;->e:I
+
+    iput p2, p0, Lk0/b;->f:I
+
+    iput p3, p0, Lk0/b;->g:I
+
+    if-gez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v0, 0xff
+
+    if-lt v0, p1, :cond_3
+
+    if-gez p2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    if-lt v0, p2, :cond_3
+
+    if-gez p3, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    if-lt v0, p3, :cond_3
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    :goto_0
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_4
+
+    shl-int/lit8 p1, p1, 0x10
+
+    shl-int/lit8 p2, p2, 0x8
+
+    add-int/2addr p1, p2
+
+    add-int/2addr p1, p3
+
+    iput p1, p0, Lk0/b;->d:I
+
+    return-void
+
+    :cond_4
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Version components are out of range: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2e
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+
+# virtual methods
+.method public compareTo(Ljava/lang/Object;)I
+    .locals 1
+
+    check-cast p1, Lk0/b;
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v0, p0, Lk0/b;->d:I
+
+    iget p1, p1, Lk0/b;->d:I
+
+    sub-int/2addr v0, p1
+
+    return v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 3
+
+    const/4 v0, 0x1
+
+    if-ne p0, p1, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lk0/b;
+
+    if-nez v1, :cond_1
+
+    const/4 p1, 0x0
+
+    :cond_1
+    check-cast p1, Lk0/b;
+
+    const/4 v1, 0x0
+
+    if-eqz p1, :cond_3
+
+    iget v2, p0, Lk0/b;->d:I
+
+    iget p1, p1, Lk0/b;->d:I
+
+    if-ne v2, p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+
+    :cond_3
+    return v1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget v0, p0, Lk0/b;->d:I
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget v1, p0, Lk0/b;->e:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x2e
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget v2, p0, Lk0/b;->f:I
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lk0/b;->g:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/c.smali b/com.discord/smali_classes2/k0/c.smali
new file mode 100644
index 0000000000..71dd0cecd9
--- /dev/null
+++ b/com.discord/smali_classes2/k0/c.smali
@@ -0,0 +1,17 @@
+.class public final Lk0/c;
+.super Ljava/lang/Error;
+.source "Standard.kt"
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/d$a.smali b/com.discord/smali_classes2/k0/d$a.smali
new file mode 100644
index 0000000000..ec6425dcc7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/d$a.smali
@@ -0,0 +1,105 @@
+.class public final Lk0/d$a;
+.super Ljava/lang/Object;
+.source "Result.kt"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final exception:Ljava/lang/Throwable;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/d$a;->exception:Ljava/lang/Throwable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Lk0/d$a;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/d$a;->exception:Ljava/lang/Throwable;
+
+    check-cast p1, Lk0/d$a;
+
+    iget-object p1, p1, Lk0/d$a;->exception:Ljava/lang/Throwable;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lk0/d$a;->exception:Ljava/lang/Throwable;
+
+    invoke-virtual {v0}, Ljava/lang/Throwable;->hashCode()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "Failure("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lk0/d$a;->exception:Ljava/lang/Throwable;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/d.smali b/com.discord/smali_classes2/k0/d.smali
new file mode 100644
index 0000000000..65efe6cbee
--- /dev/null
+++ b/com.discord/smali_classes2/k0/d.smali
@@ -0,0 +1,140 @@
+.class public final Lk0/d;
+.super Ljava/lang/Object;
+.source "Result.kt"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/d$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/io/Serializable;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final value:Ljava/lang/Object;
+
+
+# direct methods
+.method public static final exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+    .locals 1
+
+    instance-of v0, p0, Lk0/d$a;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Lk0/d$a;
+
+    iget-object p0, p0, Lk0/d$a;->exception:Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    iget-object v0, p0, Lk0/d;->value:Ljava/lang/Object;
+
+    instance-of v1, p1, Lk0/d;
+
+    if-eqz v1, :cond_0
+
+    check-cast p1, Lk0/d;
+
+    iget-object p1, p1, Lk0/d;->value:Ljava/lang/Object;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lk0/d;->value:Ljava/lang/Object;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    iget-object v0, p0, Lk0/d;->value:Ljava/lang/Object;
+
+    instance-of v1, v0, Lk0/d$a;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Success("
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v0, 0x29
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/e.smali b/com.discord/smali_classes2/k0/e.smali
new file mode 100644
index 0000000000..e64daeeb27
--- /dev/null
+++ b/com.discord/smali_classes2/k0/e.smali
@@ -0,0 +1,172 @@
+.class public final Lk0/e;
+.super Ljava/lang/Object;
+.source "LazyJVM.kt"
+
+# interfaces
+.implements Lkotlin/Lazy;
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/Lazy<",
+        "TT;>;",
+        "Ljava/io/Serializable;"
+    }
+.end annotation
+
+
+# instance fields
+.field public volatile _value:Ljava/lang/Object;
+
+.field public initializer:Lkotlin/jvm/functions/Function0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function0<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final lock:Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function0;Ljava/lang/Object;I)V
+    .locals 0
+
+    and-int/lit8 p2, p3, 0x2
+
+    const-string p2, "initializer"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/e;->initializer:Lkotlin/jvm/functions/Function0;
+
+    sget-object p1, Lk0/g;->a:Lk0/g;
+
+    iput-object p1, p0, Lk0/e;->_value:Ljava/lang/Object;
+
+    iput-object p0, p0, Lk0/e;->lock:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method private final writeReplace()Ljava/lang/Object;
+    .locals 2
+
+    new-instance v0, Lk0/a;
+
+    invoke-virtual {p0}, Lk0/e;->getValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lk0/a;-><init>(Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public getValue()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/e;->_value:Ljava/lang/Object;
+
+    sget-object v1, Lk0/g;->a:Lk0/g;
+
+    if-eq v0, v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v0, p0, Lk0/e;->lock:Ljava/lang/Object;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lk0/e;->_value:Ljava/lang/Object;
+
+    sget-object v2, Lk0/g;->a:Lk0/g;
+
+    if-eq v1, v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v1, p0, Lk0/e;->initializer:Lkotlin/jvm/functions/Function0;
+
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    invoke-interface {v1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    move-result-object v1
+
+    iput-object v1, p0, Lk0/e;->_value:Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    iput-object v2, p0, Lk0/e;->initializer:Lkotlin/jvm/functions/Function0;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_0
+    monitor-exit v0
+
+    return-object v1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lk0/e;->_value:Ljava/lang/Object;
+
+    sget-object v1, Lk0/g;->a:Lk0/g;
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0}, Lk0/e;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_1
+    const-string v0, "Lazy value not initialized yet."
+
+    :goto_1
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/f.smali b/com.discord/smali_classes2/k0/f.smali
new file mode 100644
index 0000000000..902c703a5c
--- /dev/null
+++ b/com.discord/smali_classes2/k0/f.smali
@@ -0,0 +1,19 @@
+.class public final Lk0/f;
+.super Ljava/lang/Object;
+.source "UIntArray.kt"
+
+# interfaces
+.implements Ljava/util/Collection;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Collection<",
+        "Ljava/lang/Object;",
+        ">;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/g.smali b/com.discord/smali_classes2/k0/g.smali
new file mode 100644
index 0000000000..cf68d3109a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/g.smali
@@ -0,0 +1,29 @@
+.class public final Lk0/g;
+.super Ljava/lang/Object;
+.source "Lazy.kt"
+
+
+# static fields
+.field public static final a:Lk0/g;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/g;
+
+    invoke-direct {v0}, Lk0/g;-><init>()V
+
+    sput-object v0, Lk0/g;->a:Lk0/g;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/h.smali b/com.discord/smali_classes2/k0/h.smali
new file mode 100644
index 0000000000..5a43735a44
--- /dev/null
+++ b/com.discord/smali_classes2/k0/h.smali
@@ -0,0 +1,147 @@
+.class public final Lk0/h;
+.super Ljava/lang/Object;
+.source "Lazy.kt"
+
+# interfaces
+.implements Lkotlin/Lazy;
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/Lazy<",
+        "TT;>;",
+        "Ljava/io/Serializable;"
+    }
+.end annotation
+
+
+# instance fields
+.field public _value:Ljava/lang/Object;
+
+.field public initializer:Lkotlin/jvm/functions/Function0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function0<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function0;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function0<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "initializer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/h;->initializer:Lkotlin/jvm/functions/Function0;
+
+    sget-object p1, Lk0/g;->a:Lk0/g;
+
+    iput-object p1, p0, Lk0/h;->_value:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method private final writeReplace()Ljava/lang/Object;
+    .locals 2
+
+    new-instance v0, Lk0/a;
+
+    invoke-virtual {p0}, Lk0/h;->getValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lk0/a;-><init>(Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public getValue()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/h;->_value:Ljava/lang/Object;
+
+    sget-object v1, Lk0/g;->a:Lk0/g;
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lk0/h;->initializer:Lkotlin/jvm/functions/Function0;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lk0/h;->_value:Ljava/lang/Object;
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lk0/h;->initializer:Lkotlin/jvm/functions/Function0;
+
+    :cond_0
+    iget-object v0, p0, Lk0/h;->_value:Ljava/lang/Object;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lk0/h;->_value:Ljava/lang/Object;
+
+    sget-object v1, Lk0/g;->a:Lk0/g;
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0}, Lk0/h;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_1
+    const-string v0, "Lazy value not initialized yet."
+
+    :goto_1
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/i.smali b/com.discord/smali_classes2/k0/i.smali
new file mode 100644
index 0000000000..40a54cacf0
--- /dev/null
+++ b/com.discord/smali_classes2/k0/i.smali
@@ -0,0 +1,31 @@
+.class public final Lk0/i;
+.super Ljava/lang/Object;
+.source "AssertionsJVM.kt"
+
+
+# static fields
+.field public static final a:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const-class v0, Lk0/i;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->desiredAssertionStatus()Z
+
+    move-result v0
+
+    sput-boolean v0, Lk0/i;->a:Z
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/j/a$a.smali b/com.discord/smali_classes2/k0/j/a$a.smali
new file mode 100644
index 0000000000..823a0668fb
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/a$a.smali
@@ -0,0 +1,67 @@
+.class public final Lk0/j/a$a;
+.super Lk0/o/c/j;
+.source "AbstractCollection.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/j/a;->toString()Ljava/lang/String;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TE;",
+        "Ljava/lang/CharSequence;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lk0/j/a;
+
+
+# direct methods
+.method public constructor <init>(Lk0/j/a;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/j/a$a;->this$0:Lk0/j/a;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lk0/j/a$a;->this$0:Lk0/j/a;
+
+    if-ne p1, v0, :cond_0
+
+    const-string p1, "(this Collection)"
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/j/a.smali b/com.discord/smali_classes2/k0/j/a.smali
new file mode 100644
index 0000000000..f4ea336cfa
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/a.smali
@@ -0,0 +1,324 @@
+.class public abstract Lk0/j/a;
+.super Ljava/lang/Object;
+.source "AbstractCollection.kt"
+
+# interfaces
+.implements Ljava/util/Collection;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Collection<",
+        "TE;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public add(Ljava/lang/Object;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public addAll(Ljava/util/Collection;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+TE;>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public clear()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public contains(Ljava/lang/Object;)Z
+    .locals 3
+
+    invoke-interface {p0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    const/4 v1, 0x1
+
+    :cond_2
+    :goto_0
+    return v1
+.end method
+
+.method public containsAll(Ljava/util/Collection;)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+",
+            "Ljava/lang/Object;",
+            ">;)Z"
+        }
+    .end annotation
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_1
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Lk0/j/a;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const/4 v1, 0x0
+
+    :cond_2
+    :goto_0
+    return v1
+.end method
+
+.method public abstract getSize()I
+.end method
+
+.method public isEmpty()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/j/a;->getSize()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public remove(Ljava/lang/Object;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public removeAll(Ljava/util/Collection;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+",
+            "Ljava/lang/Object;",
+            ">;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public retainAll(Ljava/util/Collection;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+",
+            "Ljava/lang/Object;",
+            ">;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final bridge size()I
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/j/a;->getSize()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public toArray()[Ljava/lang/Object;
+    .locals 1
+
+    invoke-static {p0}, Lk0/o/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)[TT;"
+        }
+    .end annotation
+
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lk0/o/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 8
+
+    new-instance v6, Lk0/j/a$a;
+
+    invoke-direct {v6, p0}, Lk0/j/a$a;-><init>(Lk0/j/a;)V
+
+    const-string v1, ", "
+
+    const-string v2, "["
+
+    const-string v3, "]"
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v7, 0x18
+
+    move-object v0, p0
+
+    invoke-static/range {v0 .. v7}, Lk0/j/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/b.smali b/com.discord/smali_classes2/k0/j/b.smali
new file mode 100644
index 0000000000..0c9acabbeb
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/b.smali
@@ -0,0 +1,162 @@
+.class public abstract Lk0/j/b;
+.super Ljava/lang/Object;
+.source "AbstractIterator.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Lk0/j/u;
+
+.field public e:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Lk0/j/u;->e:Lk0/j/u;
+
+    iput-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a()V
+.end method
+
+.method public hasNext()Z
+    .locals 5
+
+    sget-object v0, Lk0/j/u;->g:Lk0/j/u;
+
+    iget-object v1, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-eq v1, v0, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    const/4 v4, 0x2
+
+    if-eq v1, v4, :cond_1
+
+    iput-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    invoke-virtual {p0}, Lk0/j/b;->a()V
+
+    iget-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    sget-object v1, Lk0/j/u;->d:Lk0/j/u;
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :cond_2
+    :goto_1
+    return v2
+
+    :cond_3
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "Failed requirement."
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/j/b;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lk0/j/u;->e:Lk0/j/u;
+
+    iput-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    iget-object v0, p0, Lk0/j/b;->e:Ljava/lang/Object;
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/c$a.smali b/com.discord/smali_classes2/k0/j/c$a.smali
new file mode 100644
index 0000000000..3c7b850410
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/c$a.smali
@@ -0,0 +1,124 @@
+.class public Lk0/j/c$a;
+.super Ljava/lang/Object;
+.source "AbstractList.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/j/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TE;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public final synthetic e:Lk0/j/c;
+
+
+# direct methods
+.method public constructor <init>(Lk0/j/c;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/j/c$a;->e:Lk0/j/c;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public hasNext()Z
+    .locals 2
+
+    iget v0, p0, Lk0/j/c$a;->d:I
+
+    iget-object v1, p0, Lk0/j/c$a;->e:Lk0/j/c;
+
+    invoke-virtual {v1}, Lk0/j/a;->getSize()I
+
+    move-result v1
+
+    if-ge v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/j/c$a;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/j/c$a;->e:Lk0/j/c;
+
+    iget v1, p0, Lk0/j/c$a;->d:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Lk0/j/c$a;->d:I
+
+    invoke-virtual {v0, v1}, Lk0/j/c;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/c$b.smali b/com.discord/smali_classes2/k0/j/c$b.smali
new file mode 100644
index 0000000000..621edd3901
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/c$b.smali
@@ -0,0 +1,182 @@
+.class public Lk0/j/c$b;
+.super Lk0/j/c$a;
+.source "AbstractList.kt"
+
+# interfaces
+.implements Ljava/util/ListIterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/j/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/j/c<",
+        "TE;>.a;",
+        "Ljava/util/ListIterator<",
+        "TE;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic f:Lk0/j/c;
+
+
+# direct methods
+.method public constructor <init>(Lk0/j/c;I)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/j/c$b;->f:Lk0/j/c;
+
+    invoke-direct {p0, p1}, Lk0/j/c$a;-><init>(Lk0/j/c;)V
+
+    invoke-virtual {p1}, Lk0/j/a;->getSize()I
+
+    move-result p1
+
+    if-ltz p2, :cond_0
+
+    if-gt p2, p1, :cond_0
+
+    iput p2, p0, Lk0/j/c$a;->d:I
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v1, "index: "
+
+    const-string v2, ", size: "
+
+    invoke-static {v1, p2, v2, p1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public add(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)V"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public hasPrevious()Z
+    .locals 1
+
+    iget v0, p0, Lk0/j/c$a;->d:I
+
+    if-lez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public nextIndex()I
+    .locals 1
+
+    iget v0, p0, Lk0/j/c$a;->d:I
+
+    return v0
+.end method
+
+.method public previous()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/j/c$b;->hasPrevious()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/j/c$b;->f:Lk0/j/c;
+
+    iget v1, p0, Lk0/j/c$a;->d:I
+
+    add-int/lit8 v1, v1, -0x1
+
+    iput v1, p0, Lk0/j/c$a;->d:I
+
+    invoke-virtual {v0, v1}, Lk0/j/c;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public previousIndex()I
+    .locals 1
+
+    iget v0, p0, Lk0/j/c$a;->d:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    return v0
+.end method
+
+.method public set(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)V"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/k0/j/c$c.smali b/com.discord/smali_classes2/k0/j/c$c.smali
new file mode 100644
index 0000000000..70f7dec09f
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/c$c.smali
@@ -0,0 +1,172 @@
+.class public final Lk0/j/c$c;
+.super Lk0/j/c;
+.source "AbstractList.kt"
+
+# interfaces
+.implements Ljava/util/RandomAccess;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/j/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lk0/j/c<",
+        "TE;>;",
+        "Ljava/util/RandomAccess;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public final e:Lk0/j/c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lk0/j/c<",
+            "TE;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:I
+
+
+# direct methods
+.method public constructor <init>(Lk0/j/c;II)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lk0/j/c<",
+            "+TE;>;II)V"
+        }
+    .end annotation
+
+    const-string v0, "list"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lk0/j/c;-><init>()V
+
+    iput-object p1, p0, Lk0/j/c$c;->e:Lk0/j/c;
+
+    iput p2, p0, Lk0/j/c$c;->f:I
+
+    invoke-virtual {p1}, Lk0/j/a;->getSize()I
+
+    move-result p1
+
+    const-string v0, "fromIndex: "
+
+    if-ltz p2, :cond_1
+
+    if-gt p3, p1, :cond_1
+
+    if-gt p2, p3, :cond_0
+
+    iget p1, p0, Lk0/j/c$c;->f:I
+
+    sub-int/2addr p3, p1
+
+    iput p3, p0, Lk0/j/c$c;->d:I
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, " > toIndex: "
+
+    invoke-static {v0, p2, v1, p3}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    new-instance v1, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v2, ", toIndex: "
+
+    const-string v3, ", size: "
+
+    invoke-static {v0, p2, v2, p3, v3}, Lf/e/b/a/a;->F(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v1, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+
+# virtual methods
+.method public get(I)Ljava/lang/Object;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)TE;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/j/c$c;->d:I
+
+    if-ltz p1, :cond_0
+
+    if-ge p1, v0, :cond_0
+
+    iget-object v0, p0, Lk0/j/c$c;->e:Lk0/j/c;
+
+    iget v1, p0, Lk0/j/c$c;->f:I
+
+    add-int/2addr v1, p1
+
+    invoke-virtual {v0, v1}, Lk0/j/c;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance v1, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v2, "index: "
+
+    const-string v3, ", size: "
+
+    invoke-static {v2, p1, v3, v0}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v1, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public getSize()I
+    .locals 1
+
+    iget v0, p0, Lk0/j/c$c;->d:I
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/c.smali b/com.discord/smali_classes2/k0/j/c.smali
new file mode 100644
index 0000000000..42f527f1a8
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/c.smali
@@ -0,0 +1,400 @@
+.class public abstract Lk0/j/c;
+.super Lk0/j/a;
+.source "AbstractList.kt"
+
+# interfaces
+.implements Ljava/util/List;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/j/c$c;,
+        Lk0/j/c$a;,
+        Lk0/j/c$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lk0/j/a<",
+        "TE;>;",
+        "Ljava/util/List<",
+        "TE;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/j/a;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public add(ILjava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ITE;)V"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public addAll(ILjava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/Collection<",
+            "+TE;>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 5
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Ljava/util/List;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_1
+
+    return v2
+
+    :cond_1
+    check-cast p1, Ljava/util/Collection;
+
+    const-string v1, "c"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "other"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    invoke-interface {p1}, Ljava/util/Collection;->size()I
+
+    move-result v3
+
+    if-eq v1, v3, :cond_2
+
+    :goto_0
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_2
+    invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :cond_3
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_4
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    xor-int/2addr v3, v0
+
+    if-eqz v3, :cond_3
+
+    goto :goto_0
+
+    :cond_4
+    :goto_1
+    return v0
+.end method
+
+.method public abstract get(I)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)TE;"
+        }
+    .end annotation
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    const-string v0, "c"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v1, v2
+
+    goto :goto_0
+
+    :cond_1
+    return v1
+.end method
+
+.method public indexOf(Ljava/lang/Object;)I
+    .locals 3
+
+    invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, -0x1
+
+    :goto_1
+    return v1
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/j/c$a;
+
+    invoke-direct {v0, p0}, Lk0/j/c$a;-><init>(Lk0/j/c;)V
+
+    return-object v0
+.end method
+
+.method public lastIndexOf(Ljava/lang/Object;)I
+    .locals 2
+
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->listIterator(I)Ljava/util/ListIterator;
+
+    move-result-object v0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/ListIterator;->hasPrevious()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {v0}, Ljava/util/ListIterator;->previous()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0}, Ljava/util/ListIterator;->nextIndex()I
+
+    move-result p1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, -0x1
+
+    :goto_0
+    return p1
+.end method
+
+.method public listIterator()Ljava/util/ListIterator;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/ListIterator<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/j/c$b;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, p0, v1}, Lk0/j/c$b;-><init>(Lk0/j/c;I)V
+
+    return-object v0
+.end method
+
+.method public listIterator(I)Ljava/util/ListIterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Ljava/util/ListIterator<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/j/c$b;
+
+    invoke-direct {v0, p0, p1}, Lk0/j/c$b;-><init>(Lk0/j/c;I)V
+
+    return-object v0
+.end method
+
+.method public remove(I)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)TE;"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public set(ILjava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ITE;)TE;"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public subList(II)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(II)",
+            "Ljava/util/List<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/j/c$c;
+
+    invoke-direct {v0, p0, p1, p2}, Lk0/j/c$c;-><init>(Lk0/j/c;II)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/d.smali b/com.discord/smali_classes2/k0/j/d.smali
new file mode 100644
index 0000000000..81b2944084
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/d.smali
@@ -0,0 +1,349 @@
+.class public final Lk0/j/d;
+.super Ljava/lang/Object;
+.source "Collections.kt"
+
+# interfaces
+.implements Ljava/util/Collection;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Collection<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TT;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Z
+
+
+# direct methods
+.method public constructor <init>([Ljava/lang/Object;Z)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TT;Z)V"
+        }
+    .end annotation
+
+    const-string v0, "values"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/j/d;->d:[Ljava/lang/Object;
+
+    iput-boolean p2, p0, Lk0/j/d;->e:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public add(Ljava/lang/Object;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public addAll(Ljava/util/Collection;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+TT;>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public clear()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public contains(Ljava/lang/Object;)Z
+    .locals 2
+
+    iget-object v0, p0, Lk0/j/d;->d:[Ljava/lang/Object;
+
+    const-string v1, "$this$contains"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p1}, Lf/n/a/k/a;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
+
+    move-result p1
+
+    if-ltz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public containsAll(Ljava/util/Collection;)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+",
+            "Ljava/lang/Object;",
+            ">;)Z"
+        }
+    .end annotation
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_1
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Lk0/j/d;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const/4 v1, 0x0
+
+    :cond_2
+    :goto_0
+    return v1
+.end method
+
+.method public isEmpty()Z
+    .locals 1
+
+    iget-object v0, p0, Lk0/j/d;->d:[Ljava/lang/Object;
+
+    array-length v0, v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/j/d;->d:[Ljava/lang/Object;
+
+    invoke-static {v0}, Lf/n/a/k/a;->iterator([Ljava/lang/Object;)Ljava/util/Iterator;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public remove(Ljava/lang/Object;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public removeAll(Ljava/util/Collection;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+",
+            "Ljava/lang/Object;",
+            ">;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public retainAll(Ljava/util/Collection;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+",
+            "Ljava/lang/Object;",
+            ">;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final size()I
+    .locals 1
+
+    iget-object v0, p0, Lk0/j/d;->d:[Ljava/lang/Object;
+
+    array-length v0, v0
+
+    return v0
+.end method
+
+.method public final toArray()[Ljava/lang/Object;
+    .locals 4
+
+    iget-object v0, p0, Lk0/j/d;->d:[Ljava/lang/Object;
+
+    iget-boolean v1, p0, Lk0/j/d;->e:Z
+
+    const-class v2, [Ljava/lang/Object;
+
+    const-string v3, "$this$copyToArrayOfAny"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    array-length v1, v0
+
+    invoke-static {v0, v1, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;ILjava/lang/Class;)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_0
+    const-string v1, "if (isVarargs && this.ja\u2026 Array<Any?>::class.java)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)[TT;"
+        }
+    .end annotation
+
+    invoke-static {p0, p1}, Lk0/o/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/j/e.smali b/com.discord/smali_classes2/k0/j/e.smali
new file mode 100644
index 0000000000..88dcd1a0ad
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/e.smali
@@ -0,0 +1,53 @@
+.class public final Lk0/j/e;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:[Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>([Ljava/lang/Object;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/j/e;->a:[Ljava/lang/Object;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/j/e;->a:[Ljava/lang/Object;
+
+    invoke-static {v0}, Lf/n/a/k/a;->iterator([Ljava/lang/Object;)Ljava/util/Iterator;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/f.smali b/com.discord/smali_classes2/k0/j/f.smali
new file mode 100644
index 0000000000..7246ead963
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/f.smali
@@ -0,0 +1,70 @@
+.class public abstract Lk0/j/f;
+.super Ljava/lang/Object;
+.source "Iterators.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "Ljava/lang/Boolean;",
+        ">;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final next()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/j/f;->nextBoolean()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic next()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/j/f;->next()Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public abstract nextBoolean()Z
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/g.smali b/com.discord/smali_classes2/k0/j/g.smali
new file mode 100644
index 0000000000..a252570a4d
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/g.smali
@@ -0,0 +1,3 @@
+.class public Lk0/j/g;
+.super Ljava/lang/Object;
+.source "Collections.kt"
diff --git a/com.discord/smali_classes2/k0/j/h.smali b/com.discord/smali_classes2/k0/j/h.smali
new file mode 100644
index 0000000000..57a386896f
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/h.smali
@@ -0,0 +1,3 @@
+.class public Lk0/j/h;
+.super Lk0/j/g;
+.source "IteratorsJVM.kt"
diff --git a/com.discord/smali_classes2/k0/j/i.smali b/com.discord/smali_classes2/k0/j/i.smali
new file mode 100644
index 0000000000..2620fff062
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/i.smali
@@ -0,0 +1,3 @@
+.class public Lk0/j/i;
+.super Lk0/j/h;
+.source "MutableCollectionsJVM.kt"
diff --git a/com.discord/smali_classes2/k0/j/j.smali b/com.discord/smali_classes2/k0/j/j.smali
new file mode 100644
index 0000000000..0ab5c636aa
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/j.smali
@@ -0,0 +1,3 @@
+.class public Lk0/j/j;
+.super Lk0/j/i;
+.source "ReversedViews.kt"
diff --git a/com.discord/smali_classes2/k0/j/k.smali b/com.discord/smali_classes2/k0/j/k.smali
new file mode 100644
index 0000000000..923d4b51aa
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/k.smali
@@ -0,0 +1,3 @@
+.class public Lk0/j/k;
+.super Lk0/j/j;
+.source "_CollectionsJvm.kt"
diff --git a/com.discord/smali_classes2/k0/j/l$a.smali b/com.discord/smali_classes2/k0/j/l$a.smali
new file mode 100644
index 0000000000..af90815eaa
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/l$a.smali
@@ -0,0 +1,62 @@
+.class public final Lk0/j/l$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Ljava/lang/Iterable;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Iterable;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/j/l$a;->a:Ljava/lang/Iterable;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/j/l$a;->a:Ljava/lang/Iterable;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/l$b.smali b/com.discord/smali_classes2/k0/j/l$b.smali
new file mode 100644
index 0000000000..857d1b5dc1
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/l$b.smali
@@ -0,0 +1,74 @@
+.class public final Lk0/j/l$b;
+.super Lk0/o/c/j;
+.source "_Collections.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/j/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Integer;",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $index:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    iput p1, p0, Lk0/j/l$b;->$index:I
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
+
+    new-instance p1, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v0, "Collection doesn\'t contain element at index "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget v1, p0, Lk0/j/l$b;->$index:I
+
+    const/16 v2, 0x2e
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/k0/j/l.smali b/com.discord/smali_classes2/k0/j/l.smali
new file mode 100644
index 0000000000..8573a842a1
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/l.smali
@@ -0,0 +1,2803 @@
+.class public Lk0/j/l;
+.super Lk0/j/k;
+.source "_Collections.kt"
+
+
+# direct methods
+.method public static final asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$asSequence"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lk0/j/l$a;
+
+    invoke-direct {v0, p0}, Lk0/j/l$a;-><init>(Ljava/lang/Iterable;)V
+
+    return-object v0
+.end method
+
+.method public static final contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;TT;)Z"
+        }
+    .end annotation
+
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/util/Collection;
+
+    invoke-interface {p0, p1}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    invoke-static {p0, p1}, Lk0/j/l;->indexOf(Ljava/lang/Iterable;Ljava/lang/Object;)I
+
+    move-result p0
+
+    if-ltz p0, :cond_1
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static final distinct(Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$distinct"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Lk0/j/l;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final drop(Ljava/lang/Iterable;I)Ljava/util/List;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;I)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$drop"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    if-ltz p1, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_a
+
+    if-nez p1, :cond_1
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_1
+    instance-of v2, p0, Ljava/util/Collection;
+
+    if-eqz v2, :cond_6
+
+    move-object v2, p0
+
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-interface {v2}, Ljava/util/Collection;->size()I
+
+    move-result v3
+
+    sub-int/2addr v3, p1
+
+    if-gtz v3, :cond_2
+
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object p0
+
+    :cond_2
+    if-ne v3, v1, :cond_3
+
+    invoke-static {p0}, Lk0/j/l;->last(Ljava/lang/Iterable;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_3
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1, v3}, Ljava/util/ArrayList;-><init>(I)V
+
+    instance-of v3, p0, Ljava/util/List;
+
+    if-eqz v3, :cond_7
+
+    instance-of v0, p0, Ljava/util/RandomAccess;
+
+    if-eqz v0, :cond_4
+
+    invoke-interface {v2}, Ljava/util/Collection;->size()I
+
+    move-result v0
+
+    :goto_1
+    if-ge p1, v0, :cond_5
+
+    move-object v2, p0
+
+    check-cast v2, Ljava/util/List;
+
+    invoke-interface {v2, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    check-cast p0, Ljava/util/List;
+
+    invoke-interface {p0, p1}, Ljava/util/List;->listIterator(I)Ljava/util/ListIterator;
+
+    move-result-object p0
+
+    :goto_2
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_5
+    return-object v1
+
+    :cond_6
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    :cond_7
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_3
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_9
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-lt v0, p1, :cond_8
+
+    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_3
+
+    :cond_8
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_3
+
+    :cond_9
+    invoke-static {v1}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_a
+    const-string p0, "Requested element count "
+
+    const-string v0, " is less than zero."
+
+    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;I)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$elementAt"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/util/List;
+
+    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance v1, Lk0/j/l$b;
+
+    invoke-direct {v1, p1}, Lk0/j/l$b;-><init>(I)V
+
+    const-string v2, "$this$elementAtOrElse"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "defaultValue"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_2
+
+    check-cast p0, Ljava/util/List;
+
+    if-ltz p1, :cond_1
+
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result v0
+
+    if-gt p1, v0, :cond_1
+
+    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    invoke-virtual {v1, p0}, Lk0/j/l$b;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    throw v2
+
+    :cond_2
+    if-ltz p1, :cond_5
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_4
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    add-int/lit8 v4, v0, 0x1
+
+    if-ne p1, v0, :cond_3
+
+    move-object p0, v3
+
+    :goto_1
+    return-object p0
+
+    :cond_3
+    move v0, v4
+
+    goto :goto_0
+
+    :cond_4
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    invoke-virtual {v1, p0}, Lk0/j/l$b;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    throw v2
+
+    :cond_5
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    invoke-virtual {v1, p0}, Lk0/j/l$b;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    throw v2
+.end method
+
+.method public static final filterNotNull(Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$filterNotNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    const-string v1, "$this$filterNotNullTo"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "destination"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :cond_0
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_1
+    return-object v0
+.end method
+
+.method public static final first(Ljava/lang/Iterable;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$first"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/util/List;
+
+    invoke-static {p0}, Lk0/j/l;->first(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_1
+    new-instance p0, Ljava/util/NoSuchElementException;
+
+    const-string v0, "Collection is empty."
+
+    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final first(Ljava/util/List;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$first"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance p0, Ljava/util/NoSuchElementException;
+
+    const-string v0, "List is empty."
+
+    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final firstOrNull(Ljava/lang/Iterable;)Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$firstOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    check-cast p0, Ljava/util/List;
+
+    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-object v1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_1
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    return-object v1
+
+    :cond_2
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final firstOrNull(Ljava/util/List;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$firstOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final getOrNull(Ljava/util/List;I)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;I)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$getOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-ltz p1, :cond_0
+
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result v0
+
+    if-gt p1, v0, :cond_0
+
+    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final indexOf(Ljava/lang/Iterable;Ljava/lang/Object;)I
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;TT;)I"
+        }
+    .end annotation
+
+    const-string v0, "$this$indexOf"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/util/List;
+
+    invoke-interface {p0, p1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-ltz v0, :cond_2
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    return v0
+
+    :cond_1
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
+
+    const/4 p0, 0x0
+
+    throw p0
+
+    :cond_3
+    const/4 p0, -0x1
+
+    return p0
+.end method
+
+.method public static final joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            "A::",
+            "Ljava/lang/Appendable;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;TA;",
+            "Ljava/lang/CharSequence;",
+            "Ljava/lang/CharSequence;",
+            "Ljava/lang/CharSequence;",
+            "I",
+            "Ljava/lang/CharSequence;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+",
+            "Ljava/lang/CharSequence;",
+            ">;)TA;"
+        }
+    .end annotation
+
+    const-string v0, "$this$joinTo"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "buffer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "separator"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "prefix"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "postfix"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "truncated"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1, p3}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    const/4 p3, 0x0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    add-int/lit8 p3, p3, 0x1
+
+    const/4 v1, 0x1
+
+    if-le p3, v1, :cond_0
+
+    invoke-interface {p1, p2}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+
+    :cond_0
+    if-ltz p5, :cond_1
+
+    if-gt p3, p5, :cond_2
+
+    :cond_1
+    invoke-static {p1, v0, p7}, Lk0/u/f;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
+
+    goto :goto_0
+
+    :cond_2
+    if-ltz p5, :cond_3
+
+    if-le p3, p5, :cond_3
+
+    invoke-interface {p1, p6}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+
+    :cond_3
+    invoke-interface {p1, p4}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+
+    return-object p1
+.end method
+
+.method public static synthetic joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/Appendable;
+    .locals 9
+
+    and-int/lit8 v0, p8, 0x2
+
+    if-eqz v0, :cond_0
+
+    const-string v0, ", "
+
+    move-object v3, v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v3, p2
+
+    :goto_0
+    and-int/lit8 v0, p8, 0x4
+
+    const-string v1, ""
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
+
+    move-object v4, v1
+
+    goto :goto_1
+
+    :cond_1
+    move-object v4, v2
+
+    :goto_1
+    and-int/lit8 v0, p8, 0x8
+
+    if-eqz v0, :cond_2
+
+    move-object v5, v1
+
+    goto :goto_2
+
+    :cond_2
+    move-object v5, v2
+
+    :goto_2
+    and-int/lit8 v0, p8, 0x10
+
+    if-eqz v0, :cond_3
+
+    const/4 v0, -0x1
+
+    const/4 v6, -0x1
+
+    goto :goto_3
+
+    :cond_3
+    move v6, p5
+
+    :goto_3
+    and-int/lit8 v0, p8, 0x20
+
+    if-eqz v0, :cond_4
+
+    const-string v0, "..."
+
+    move-object v7, v0
+
+    goto :goto_4
+
+    :cond_4
+    move-object v7, v2
+
+    :goto_4
+    and-int/lit8 v0, p8, 0x40
+
+    const/4 v8, 0x0
+
+    move-object v1, p0
+
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v8}, Lk0/j/l;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
+
+    return-object p1
+.end method
+
+.method public static joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+    .locals 8
+
+    and-int/lit8 p5, p7, 0x1
+
+    if-eqz p5, :cond_0
+
+    const-string p1, ", "
+
+    :cond_0
+    move-object v2, p1
+
+    and-int/lit8 p1, p7, 0x2
+
+    const-string p5, ""
+
+    if-eqz p1, :cond_1
+
+    move-object v3, p5
+
+    goto :goto_0
+
+    :cond_1
+    move-object v3, p2
+
+    :goto_0
+    and-int/lit8 p1, p7, 0x4
+
+    if-eqz p1, :cond_2
+
+    move-object v4, p5
+
+    goto :goto_1
+
+    :cond_2
+    move-object v4, p3
+
+    :goto_1
+    and-int/lit8 p1, p7, 0x8
+
+    if-eqz p1, :cond_3
+
+    const/4 p4, -0x1
+
+    const/4 v5, -0x1
+
+    goto :goto_2
+
+    :cond_3
+    move v5, p4
+
+    :goto_2
+    and-int/lit8 p1, p7, 0x10
+
+    const/4 p2, 0x0
+
+    if-eqz p1, :cond_4
+
+    const-string p1, "..."
+
+    move-object v6, p1
+
+    goto :goto_3
+
+    :cond_4
+    move-object v6, p2
+
+    :goto_3
+    and-int/lit8 p1, p7, 0x20
+
+    if-eqz p1, :cond_5
+
+    move-object v7, p2
+
+    goto :goto_4
+
+    :cond_5
+    move-object v7, p6
+
+    :goto_4
+    const-string p1, "$this$joinToString"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "separator"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "prefix"
+
+    invoke-static {v3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "postfix"
+
+    invoke-static {v4, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "truncated"
+
+    invoke-static {v6, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-static/range {v0 .. v7}, Lk0/j/l;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "joinTo(StringBuilder(), \u2026ed, transform).toString()"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final last(Ljava/lang/Iterable;)Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$last"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/util/List;
+
+    invoke-static {p0}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_1
+    return-object v0
+
+    :cond_2
+    new-instance p0, Ljava/util/NoSuchElementException;
+
+    const-string v0, "Collection is empty."
+
+    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final last(Ljava/util/List;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$last"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-static {p0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result v0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance p0, Ljava/util/NoSuchElementException;
+
+    const-string v0, "List is empty."
+
+    invoke-direct {p0, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final lastOrNull(Ljava/util/List;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$lastOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, -0x1
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final max(Ljava/lang/Iterable;)Ljava/lang/Comparable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T::",
+            "Ljava/lang/Comparable<",
+            "-TT;>;>(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$max"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$maxOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Comparable;
+
+    :cond_1
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Comparable;
+
+    invoke-interface {v0, v1}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result v2
+
+    if-gez v2, :cond_1
+
+    move-object v0, v1
+
+    goto :goto_0
+
+    :cond_2
+    move-object p0, v0
+
+    :goto_1
+    return-object p0
+.end method
+
+.method public static final max(Ljava/lang/Iterable;)Ljava/lang/Float;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Iterable<",
+            "Ljava/lang/Float;",
+            ">;)",
+            "Ljava/lang/Float;"
+        }
+    .end annotation
+
+    const-string v0, "$this$max"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$maxOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 p0, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->floatValue()F
+
+    move-result v0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Number;
+
+    invoke-virtual {v1}, Ljava/lang/Number;->floatValue()F
+
+    move-result v1
+
+    invoke-static {v0, v1}, Ljava/lang/Math;->max(FF)F
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object p0
+
+    :goto_1
+    return-object p0
+.end method
+
+.method public static final minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$minus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p0}, Lf/n/a/k/a;->convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :cond_1
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-interface {p1, v1}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-nez v2, :cond_1
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    return-object v0
+.end method
+
+.method public static final minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;TT;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$minus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {p0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :cond_0
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    const/4 v4, 0x1
+
+    if-nez v2, :cond_1
+
+    invoke-static {v3, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    const/4 v2, 0x1
+
+    const/4 v4, 0x0
+
+    :cond_1
+    if-eqz v4, :cond_0
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    return-object v0
+.end method
+
+.method public static final plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Collection<",
+            "+TT;>;",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-interface {p0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    check-cast p1, Ljava/util/Collection;
+
+    invoke-interface {p1}, Ljava/util/Collection;->size()I
+
+    move-result v2
+
+    add-int/2addr v2, v1
+
+    invoke-direct {v0, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0, p0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    invoke-static {v0, p1}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+
+    return-object v0
+.end method
+
+.method public static final plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Collection<",
+            "+TT;>;TT;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-interface {p0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    return-object v0
+.end method
+
+.method public static final reversed(Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$reversed"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    move-object v0, p0
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-gt v0, v1, :cond_0
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    invoke-static {p0}, Lk0/j/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    const-string v0, "$this$reverse"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/util/Collections;->reverse(Ljava/util/List;)V
+
+    return-object p0
+.end method
+
+.method public static final slice(Ljava/util/List;Lkotlin/ranges/IntRange;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;",
+            "Lkotlin/ranges/IntRange;",
+            ")",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$slice"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "indices"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object p0
+
+    :cond_0
+    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getStart()Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getEndInclusive()Ljava/lang/Integer;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    add-int/lit8 p1, p1, 0x1
+
+    invoke-interface {p0, v0, p1}, Ljava/util/List;->subList(II)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final sorted(Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T::",
+            "Ljava/lang/Comparable<",
+            "-TT;>;>(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$sorted"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_3
+
+    move-object v0, p0
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-gt v1, v2, :cond_0
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    new-array p0, p0, [Ljava/lang/Comparable;
+
+    invoke-interface {v0, p0}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_2
+
+    check-cast p0, [Ljava/lang/Comparable;
+
+    const-string v0, "$this$sort"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-le v0, v2, :cond_1
+
+    invoke-static {p0}, Ljava/util/Arrays;->sort([Ljava/lang/Object;)V
+
+    :cond_1
+    invoke-static {p0}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p0, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_3
+    invoke-static {p0}, Lk0/j/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->sort(Ljava/util/List;)V
+
+    return-object p0
+.end method
+
+.method public static final sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;",
+            "Ljava/util/Comparator<",
+            "-TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$sortedWith"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "comparator"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v1, p0, Ljava/util/Collection;
+
+    if-eqz v1, :cond_3
+
+    move-object v1, p0
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/util/Collection;->size()I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    if-gt v2, v3, :cond_0
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    new-array p0, p0, [Ljava/lang/Object;
+
+    invoke-interface {v1, p0}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_2
+
+    const-string v1, "$this$sortWith"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    if-le v0, v3, :cond_1
+
+    invoke-static {p0, p1}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
+
+    :cond_1
+    invoke-static {p0}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_3
+    invoke-static {p0}, Lk0/j/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->sortWith(Ljava/util/List;Ljava/util/Comparator;)V
+
+    return-object p0
+.end method
+
+.method public static final sumOfFloat(Ljava/lang/Iterable;)F
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Iterable<",
+            "Ljava/lang/Float;",
+            ">;)F"
+        }
+    .end annotation
+
+    const-string v0, "$this$sum"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Number;
+
+    invoke-virtual {v1}, Ljava/lang/Number;->floatValue()F
+
+    move-result v1
+
+    add-float/2addr v0, v1
+
+    goto :goto_0
+
+    :cond_0
+    return v0
+.end method
+
+.method public static final sumOfInt(Ljava/lang/Iterable;)I
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Iterable<",
+            "Ljava/lang/Integer;",
+            ">;)I"
+        }
+    .end annotation
+
+    const-string v0, "$this$sum"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Number;
+
+    invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    goto :goto_0
+
+    :cond_0
+    return v0
+.end method
+
+.method public static final sumOfLong(Ljava/lang/Iterable;)J
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Iterable<",
+            "Ljava/lang/Long;",
+            ">;)J"
+        }
+    .end annotation
+
+    const-string v0, "$this$sum"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    const-wide/16 v0, 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;->longValue()J
+
+    move-result-wide v2
+
+    add-long/2addr v0, v2
+
+    goto :goto_0
+
+    :cond_0
+    return-wide v0
+.end method
+
+.method public static final take(Ljava/lang/Iterable;I)Ljava/util/List;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;I)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$take"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-ltz p1, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_6
+
+    if-nez p1, :cond_1
+
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object p0
+
+    :cond_1
+    instance-of v2, p0, Ljava/util/Collection;
+
+    if-eqz v2, :cond_3
+
+    move-object v2, p0
+
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-interface {v2}, Ljava/util/Collection;->size()I
+
+    move-result v2
+
+    if-lt p1, v2, :cond_2
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    if-ne p1, v0, :cond_3
+
+    invoke-static {p0}, Lk0/j/l;->first(Ljava/lang/Iterable;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_3
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-direct {v2, p1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :cond_4
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_5
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/2addr v1, v0
+
+    if-ne v1, p1, :cond_4
+
+    :cond_5
+    invoke-static {v2}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_6
+    const-string p0, "Requested element count "
+
+    const-string v0, " is less than zero."
+
+    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final takeLast(Ljava/util/List;I)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;I)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$takeLast"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    if-ltz p1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_5
+
+    if-nez p1, :cond_1
+
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object p0
+
+    :cond_1
+    invoke-interface {p0}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    if-lt p1, v1, :cond_2
+
+    invoke-static {p0}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    if-ne p1, v0, :cond_3
+
+    invoke-static {p0}, Lk0/j/l;->last(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_3
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0, p1}, Ljava/util/ArrayList;-><init>(I)V
+
+    sub-int p1, v1, p1
+
+    :goto_1
+    if-ge p1, v1, :cond_4
+
+    invoke-interface {p0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    return-object v0
+
+    :cond_5
+    const-string p0, "Requested element count "
+
+    const-string v0, " is less than zero."
+
+    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            "C::",
+            "Ljava/util/Collection<",
+            "-TT;>;>(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;TC;)TC;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toCollection"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "destination"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    return-object p1
+.end method
+
+.method public static final toHashSet(Ljava/lang/Iterable;)Ljava/util/HashSet;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/HashSet<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toHashSet"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/HashSet;
+
+    const/16 v1, 0xc
+
+    invoke-static {p0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(I)V
+
+    invoke-static {p0, v0}, Lk0/j/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
+
+    check-cast v0, Ljava/util/HashSet;
+
+    return-object v0
+.end method
+
+.method public static final toIntArray(Ljava/util/Collection;)[I
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "Ljava/lang/Integer;",
+            ">;)[I"
+        }
+    .end annotation
+
+    const-string v0, "$this$toIntArray"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(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 toList(Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_3
+
+    move-object v0, p0
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    const/4 v2, 0x1
+
+    if-eq v1, v2, :cond_0
+
+    invoke-static {v0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+
+    move-result-object p0
+
+    goto :goto_1
+
+    :cond_0
+    instance-of v0, p0, Ljava/util/List;
+
+    if-eqz v0, :cond_1
+
+    check-cast p0, Ljava/util/List;
+
+    const/4 v0, 0x0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    goto :goto_1
+
+    :cond_2
+    sget-object p0, Lk0/j/n;->d:Lk0/j/n;
+
+    :goto_1
+    return-object p0
+
+    :cond_3
+    invoke-static {p0}, Lk0/j/l;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final toLongArray(Ljava/util/Collection;)[J
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "Ljava/lang/Long;",
+            ">;)[J"
+        }
+    .end annotation
+
+    const-string v0, "$this$toLongArray"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/Collection;->size()I
+
+    move-result v0
+
+    new-array v0, v0, [J
+
+    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;->longValue()J
+
+    move-result-wide v2
+
+    add-int/lit8 v4, v1, 0x1
+
+    aput-wide v2, v0, v1
+
+    move v1, v4
+
+    goto :goto_0
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public static final toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMutableList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/util/Collection;
+
+    invoke-static {p0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-static {p0, v0}, Lk0/j/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
+
+    return-object v0
+.end method
+
+.method public static final toMutableList(Ljava/util/Collection;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Collection<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMutableList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0, p0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    return-object v0
+.end method
+
+.method public static final toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/Set<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toMutableSet"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ljava/util/LinkedHashSet;
+
+    check-cast p0, Ljava/util/Collection;
+
+    invoke-direct {v0, p0}, Ljava/util/LinkedHashSet;-><init>(Ljava/util/Collection;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/util/LinkedHashSet;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
+
+    invoke-static {p0, v0}, Lk0/j/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
+
+    check-cast v0, Ljava/util/LinkedHashSet;
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public static final toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/Set<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toSet"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_3
+
+    move-object v0, p0
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    const/4 v2, 0x1
+
+    if-eq v1, v2, :cond_0
+
+    new-instance v1, Ljava/util/LinkedHashSet;
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v0
+
+    invoke-direct {v1, v0}, Ljava/util/LinkedHashSet;-><init>(I)V
+
+    invoke-static {p0, v1}, Lk0/j/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
+
+    goto :goto_1
+
+    :cond_0
+    instance-of v0, p0, Ljava/util/List;
+
+    if-eqz v0, :cond_1
+
+    check-cast p0, Ljava/util/List;
+
+    const/4 v0, 0x0
+
+    invoke-interface {p0, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-static {p0}, Lf/n/a/k/a;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v1
+
+    goto :goto_1
+
+    :cond_2
+    sget-object v1, Lk0/j/p;->d:Lk0/j/p;
+
+    :goto_1
+    return-object v1
+
+    :cond_3
+    new-instance v0, Ljava/util/LinkedHashSet;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
+
+    invoke-static {p0, v0}, Lk0/j/l;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
+
+    invoke-static {v0}, Lf/n/a/k/a;->optimizeReadOnlySet(Ljava/util/Set;)Ljava/util/Set;
+
+    move-result-object p0
+
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/m.smali b/com.discord/smali_classes2/k0/j/m.smali
new file mode 100644
index 0000000000..3f5855f4c5
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/m.smali
@@ -0,0 +1,123 @@
+.class public final Lk0/j/m;
+.super Ljava/lang/Object;
+.source "Collections.kt"
+
+# interfaces
+.implements Ljava/util/ListIterator;
+.implements Lk0/o/c/w/a;
+
+
+# static fields
+.field public static final d:Lk0/j/m;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/j/m;
+
+    invoke-direct {v0}, Lk0/j/m;-><init>()V
+
+    sput-object v0, Lk0/j/m;->d:Lk0/j/m;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public synthetic add(Ljava/lang/Object;)V
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public hasNext()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public hasPrevious()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public nextIndex()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public previous()Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public previousIndex()I
+    .locals 1
+
+    const/4 v0, -0x1
+
+    return v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public synthetic set(Ljava/lang/Object;)V
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/k0/j/n.smali b/com.discord/smali_classes2/k0/j/n.smali
new file mode 100644
index 0000000000..d95369bad7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/n.smali
@@ -0,0 +1,415 @@
+.class public final Lk0/j/n;
+.super Ljava/lang/Object;
+.source "Collections.kt"
+
+# interfaces
+.implements Ljava/util/List;
+.implements Ljava/io/Serializable;
+.implements Ljava/util/RandomAccess;
+.implements Lk0/o/c/w/a;
+
+
+# static fields
+.field public static final d:Lk0/j/n;
+
+.field public static final serialVersionUID:J = -0x6690382f581f9fceL
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/j/n;
+
+    invoke-direct {v0}, Lk0/j/n;-><init>()V
+
+    sput-object v0, Lk0/j/n;->d:Lk0/j/n;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method private final readResolve()Ljava/lang/Object;
+    .locals 1
+
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public synthetic add(ILjava/lang/Object;)V
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public synthetic add(Ljava/lang/Object;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public addAll(ILjava/util/Collection;)Z
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public addAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public clear()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final contains(Ljava/lang/Object;)Z
+    .locals 2
+
+    instance-of v0, p1, Ljava/lang/Void;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/Void;
+
+    const-string v0, "element"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    return v1
+.end method
+
+.method public containsAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public get(I)Ljava/lang/Object;
+    .locals 3
+
+    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Empty list doesn\'t contain element at index "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2e
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public final indexOf(Ljava/lang/Object;)I
+    .locals 2
+
+    instance-of v0, p1, Ljava/lang/Void;
+
+    const/4 v1, -0x1
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/Void;
+
+    const-string v0, "element"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    return v1
+.end method
+
+.method public isEmpty()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+
+    sget-object v0, Lk0/j/m;->d:Lk0/j/m;
+
+    return-object v0
+.end method
+
+.method public final lastIndexOf(Ljava/lang/Object;)I
+    .locals 2
+
+    instance-of v0, p1, Ljava/lang/Void;
+
+    const/4 v1, -0x1
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/Void;
+
+    const-string v0, "element"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    return v1
+.end method
+
+.method public listIterator()Ljava/util/ListIterator;
+    .locals 1
+
+    sget-object v0, Lk0/j/m;->d:Lk0/j/m;
+
+    return-object v0
+.end method
+
+.method public listIterator(I)Ljava/util/ListIterator;
+    .locals 2
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Lk0/j/m;->d:Lk0/j/m;
+
+    return-object p1
+
+    :cond_0
+    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v1, "Index: "
+
+    invoke-static {v1, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public synthetic remove(I)Ljava/lang/Object;
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public remove(Ljava/lang/Object;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public removeAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public retainAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public synthetic set(ILjava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final size()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public subList(II)Ljava/util/List;
+    .locals 3
+
+    if-nez p1, :cond_0
+
+    if-nez p2, :cond_0
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v1, "fromIndex: "
+
+    const-string v2, ", toIndex: "
+
+    invoke-static {v1, p1, v2, p2}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public toArray()[Ljava/lang/Object;
+    .locals 1
+
+    invoke-static {p0}, Lk0/o/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)[TT;"
+        }
+    .end annotation
+
+    invoke-static {p0, p1}, Lk0/o/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "[]"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/o.smali b/com.discord/smali_classes2/k0/j/o.smali
new file mode 100644
index 0000000000..f64871f888
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/o.smali
@@ -0,0 +1,227 @@
+.class public final Lk0/j/o;
+.super Ljava/lang/Object;
+.source "Maps.kt"
+
+# interfaces
+.implements Ljava/util/Map;
+.implements Ljava/io/Serializable;
+.implements Lk0/o/c/w/a;
+
+
+# static fields
+.field public static final d:Lk0/j/o;
+
+.field public static final serialVersionUID:J = 0x72723771cb044cd2L
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/j/o;
+
+    invoke-direct {v0}, Lk0/j/o;-><init>()V
+
+    sput-object v0, Lk0/j/o;->d:Lk0/j/o;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method private final readResolve()Ljava/lang/Object;
+    .locals 1
+
+    sget-object v0, Lk0/j/o;->d:Lk0/j/o;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public clear()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public containsKey(Ljava/lang/Object;)Z
+    .locals 0
+
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public final containsValue(Ljava/lang/Object;)Z
+    .locals 2
+
+    instance-of v0, p1, Ljava/lang/Void;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/Void;
+
+    const-string v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    return v1
+.end method
+
+.method public final entrySet()Ljava/util/Set;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Set<",
+            "Ljava/util/Map$Entry;",
+            ">;"
+        }
+    .end annotation
+
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Ljava/util/Map;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/util/Map;
+
+    invoke-interface {p1}, Ljava/util/Map;->isEmpty()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public final get(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public isEmpty()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public final keySet()Ljava/util/Set;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Set<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
+
+    return-object v0
+.end method
+
+.method public synthetic put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public putAll(Ljava/util/Map;)V
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public remove(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final size()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "{}"
+
+    return-object v0
+.end method
+
+.method public final values()Ljava/util/Collection;
+    .locals 1
+
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/p.smali b/com.discord/smali_classes2/k0/j/p.smali
new file mode 100644
index 0000000000..c08633c049
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/p.smali
@@ -0,0 +1,244 @@
+.class public final Lk0/j/p;
+.super Ljava/lang/Object;
+.source "Sets.kt"
+
+# interfaces
+.implements Ljava/util/Set;
+.implements Ljava/io/Serializable;
+.implements Lk0/o/c/w/a;
+
+
+# static fields
+.field public static final d:Lk0/j/p;
+
+.field public static final serialVersionUID:J = 0x2f46b01576d7e2f4L
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/j/p;
+
+    invoke-direct {v0}, Lk0/j/p;-><init>()V
+
+    sput-object v0, Lk0/j/p;->d:Lk0/j/p;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method private final readResolve()Ljava/lang/Object;
+    .locals 1
+
+    sget-object v0, Lk0/j/p;->d:Lk0/j/p;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public synthetic add(Ljava/lang/Object;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public addAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public clear()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final contains(Ljava/lang/Object;)Z
+    .locals 2
+
+    instance-of v0, p1, Ljava/lang/Void;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/Void;
+
+    const-string v0, "element"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    return v1
+.end method
+
+.method public containsAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Ljava/util/Set;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/util/Set;
+
+    invoke-interface {p1}, Ljava/util/Set;->isEmpty()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public isEmpty()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+
+    sget-object v0, Lk0/j/m;->d:Lk0/j/m;
+
+    return-object v0
+.end method
+
+.method public remove(Ljava/lang/Object;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public removeAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public retainAll(Ljava/util/Collection;)Z
+    .locals 1
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Operation is not supported for read-only collection"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final size()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public toArray()[Ljava/lang/Object;
+    .locals 1
+
+    invoke-static {p0}, Lk0/o/c/e;->toArray(Ljava/util/Collection;)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)[TT;"
+        }
+    .end annotation
+
+    invoke-static {p0, p1}, Lk0/o/c/e;->toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "[]"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/q.smali b/com.discord/smali_classes2/k0/j/q.smali
new file mode 100644
index 0000000000..ecf6fd9704
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/q.smali
@@ -0,0 +1,70 @@
+.class public abstract Lk0/j/q;
+.super Ljava/lang/Object;
+.source "Iterators.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "Ljava/lang/Integer;",
+        ">;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final next()Ljava/lang/Integer;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/j/q;->nextInt()I
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic next()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/j/q;->next()Ljava/lang/Integer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public abstract nextInt()I
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/r.smali b/com.discord/smali_classes2/k0/j/r.smali
new file mode 100644
index 0000000000..f4651dafb7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/r.smali
@@ -0,0 +1,70 @@
+.class public abstract Lk0/j/r;
+.super Ljava/lang/Object;
+.source "Iterators.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final next()Ljava/lang/Long;
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/j/r;->nextLong()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic next()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/j/r;->next()Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public abstract nextLong()J
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/s.smali b/com.discord/smali_classes2/k0/j/s.smali
new file mode 100644
index 0000000000..4dac0e89ee
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/s.smali
@@ -0,0 +1,199 @@
+.class public final Lk0/j/s;
+.super Ljava/util/AbstractList;
+.source "ReversedViews.kt"
+
+# interfaces
+.implements Ljava/util/List;
+.implements Lk0/o/c/w/c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lk0/j/s<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
+
+    iput-object p1, p0, Lk0/j/s;->d:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public add(ILjava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ITT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/j/s;->d:Ljava/util/List;
+
+    invoke-virtual {p0}, Lk0/j/s;->size()I
+
+    move-result v1
+
+    if-ltz p1, :cond_0
+
+    if-lt v1, p1, :cond_0
+
+    invoke-virtual {p0}, Lk0/j/s;->size()I
+
+    move-result v1
+
+    sub-int/2addr v1, p1
+
+    invoke-interface {v0, v1, p2}, Ljava/util/List;->add(ILjava/lang/Object;)V
+
+    return-void
+
+    :cond_0
+    new-instance p2, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v0, "Position index "
+
+    const-string v1, " must be in range ["
+
+    invoke-static {v0, p1, v1}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    new-instance v1, Lkotlin/ranges/IntRange;
+
+    invoke-virtual {p0}, Lk0/j/s;->size()I
+
+    move-result v2
+
+    invoke-direct {v1, v0, v2}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v0, "]."
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public clear()V
+    .locals 1
+
+    iget-object v0, p0, Lk0/j/s;->d:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->clear()V
+
+    return-void
+.end method
+
+.method public get(I)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/j/s;->d:Ljava/util/List;
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
+
+    move-result p1
+
+    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final remove(I)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lk0/j/s;->d:Ljava/util/List;
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
+
+    move-result p1
+
+    invoke-interface {v0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public set(ILjava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ITT;)TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/j/s;->d:Ljava/util/List;
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
+
+    move-result p1
+
+    invoke-interface {v0, p1, p2}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final size()I
+    .locals 1
+
+    iget-object v0, p0, Lk0/j/s;->d:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/t.smali b/com.discord/smali_classes2/k0/j/t.smali
new file mode 100644
index 0000000000..517ecb98d5
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/t.smali
@@ -0,0 +1,84 @@
+.class public Lk0/j/t;
+.super Lk0/j/c;
+.source "ReversedViews.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lk0/j/c<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lk0/j/c;-><init>()V
+
+    iput-object p1, p0, Lk0/j/t;->d:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public get(I)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/j/t;->d:Ljava/util/List;
+
+    invoke-static {p0, p1}, Lf/n/a/k/a;->access$reverseElementIndex(Ljava/util/List;I)I
+
+    move-result p1
+
+    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public getSize()I
+    .locals 1
+
+    iget-object v0, p0, Lk0/j/t;->d:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/k0/j/u.smali b/com.discord/smali_classes2/k0/j/u.smali
new file mode 100644
index 0000000000..65f176f24e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/j/u.smali
@@ -0,0 +1,128 @@
+.class public final enum Lk0/j/u;
+.super Ljava/lang/Enum;
+.source "AbstractIterator.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lk0/j/u;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lk0/j/u;
+
+.field public static final enum e:Lk0/j/u;
+
+.field public static final enum f:Lk0/j/u;
+
+.field public static final enum g:Lk0/j/u;
+
+.field public static final synthetic h:[Lk0/j/u;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Lk0/j/u;
+
+    new-instance v1, Lk0/j/u;
+
+    const-string v2, "Ready"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Lk0/j/u;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lk0/j/u;->d:Lk0/j/u;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lk0/j/u;
+
+    const-string v2, "NotReady"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Lk0/j/u;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lk0/j/u;->e:Lk0/j/u;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lk0/j/u;
+
+    const-string v2, "Done"
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, v2, v3}, Lk0/j/u;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lk0/j/u;->f:Lk0/j/u;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lk0/j/u;
+
+    const-string v2, "Failed"
+
+    const/4 v3, 0x3
+
+    invoke-direct {v1, v2, v3}, Lk0/j/u;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lk0/j/u;->g:Lk0/j/u;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lk0/j/u;->h:[Lk0/j/u;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lk0/j/u;
+    .locals 1
+
+    const-class v0, Lk0/j/u;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lk0/j/u;
+
+    return-object p0
+.end method
+
+.method public static values()[Lk0/j/u;
+    .locals 1
+
+    sget-object v0, Lk0/j/u;->h:[Lk0/j/u;
+
+    invoke-virtual {v0}, [Lk0/j/u;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lk0/j/u;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/k/a.smali b/com.discord/smali_classes2/k0/k/a.smali
new file mode 100644
index 0000000000..f667e7177c
--- /dev/null
+++ b/com.discord/smali_classes2/k0/k/a.smali
@@ -0,0 +1,90 @@
+.class public final Lk0/k/a;
+.super Ljava/lang/Object;
+.source "Comparisons.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:[Lkotlin/jvm/functions/Function1;
+
+
+# direct methods
+.method public constructor <init>([Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/k/a;->d:[Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;TT;)I"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/k/a;->d:[Lkotlin/jvm/functions/Function1;
+
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_1
+
+    aget-object v4, v0, v3
+
+    invoke-interface {v4, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/Comparable;
+
+    invoke-interface {v4, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/Comparable;
+
+    invoke-static {v5, v4}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    move v2, v4
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    return v2
+.end method
diff --git a/com.discord/smali_classes2/k0/k/b.smali b/com.discord/smali_classes2/k0/k/b.smali
new file mode 100644
index 0000000000..4937fa1642
--- /dev/null
+++ b/com.discord/smali_classes2/k0/k/b.smali
@@ -0,0 +1,70 @@
+.class public final Lk0/k/b;
+.super Ljava/lang/Object;
+.source "Comparisons.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/Comparator;
+
+.field public final synthetic e:Ljava/util/Comparator;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Comparator;Ljava/util/Comparator;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/k/b;->d:Ljava/util/Comparator;
+
+    iput-object p2, p0, Lk0/k/b;->e:Ljava/util/Comparator;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;TT;)I"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/k/b;->d:Ljava/util/Comparator;
+
+    invoke-interface {v0, p1, p2}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lk0/k/b;->e:Ljava/util/Comparator;
+
+    invoke-interface {v0, p1, p2}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+
+    move-result v0
+
+    :goto_0
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/k0/k/c.smali b/com.discord/smali_classes2/k0/k/c.smali
new file mode 100644
index 0000000000..1025b79cd5
--- /dev/null
+++ b/com.discord/smali_classes2/k0/k/c.smali
@@ -0,0 +1,86 @@
+.class public final Lk0/k/c;
+.super Ljava/lang/Object;
+.source "Comparisons.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "Ljava/lang/Comparable<",
+        "-",
+        "Ljava/lang/Object;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/k/c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/k/c;
+
+    invoke-direct {v0}, Lk0/k/c;-><init>()V
+
+    sput-object v0, Lk0/k/c;->d:Lk0/k/c;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 1
+
+    check-cast p1, Ljava/lang/Comparable;
+
+    check-cast p2, Ljava/lang/Comparable;
+
+    const-string v0, "a"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "b"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1, p2}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final reversed()Ljava/util/Comparator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Comparator<",
+            "Ljava/lang/Comparable<",
+            "Ljava/lang/Object;",
+            ">;>;"
+        }
+    .end annotation
+
+    sget-object v0, Lk0/k/d;->d:Lk0/k/d;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/k/d.smali b/com.discord/smali_classes2/k0/k/d.smali
new file mode 100644
index 0000000000..49ba5e5ebb
--- /dev/null
+++ b/com.discord/smali_classes2/k0/k/d.smali
@@ -0,0 +1,86 @@
+.class public final Lk0/k/d;
+.super Ljava/lang/Object;
+.source "Comparisons.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "Ljava/lang/Comparable<",
+        "-",
+        "Ljava/lang/Object;",
+        ">;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/k/d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/k/d;
+
+    invoke-direct {v0}, Lk0/k/d;-><init>()V
+
+    sput-object v0, Lk0/k/d;->d:Lk0/k/d;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 1
+
+    check-cast p1, Ljava/lang/Comparable;
+
+    check-cast p2, Ljava/lang/Comparable;
+
+    const-string v0, "a"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "b"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p2, p1}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final reversed()Ljava/util/Comparator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Comparator<",
+            "Ljava/lang/Comparable<",
+            "Ljava/lang/Object;",
+            ">;>;"
+        }
+    .end annotation
+
+    sget-object v0, Lk0/k/c;->d:Lk0/k/c;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/l/a.smali b/com.discord/smali_classes2/k0/l/a.smali
new file mode 100644
index 0000000000..886192c077
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/a.smali
@@ -0,0 +1,141 @@
+.class public abstract Lk0/l/a;
+.super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext$a;
+
+
+# instance fields
+.field public final key:Lkotlin/coroutines/CoroutineContext$b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext$b;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;)V"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/l/a;->key:Lkotlin/coroutines/CoroutineContext$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(TR;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TR;-",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "+TR;>;)TR;"
+        }
+    .end annotation
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2}, Lkotlin/coroutines/CoroutineContext$a$a;->fold(Lkotlin/coroutines/CoroutineContext$a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            ">(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->get(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public getKey()Lkotlin/coroutines/CoroutineContext$b;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/l/a;->key:Lkotlin/coroutines/CoroutineContext$b;
+
+    return-object v0
+.end method
+
+.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;)",
+            "Lkotlin/coroutines/CoroutineContext;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->minusKey(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->plus(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/l/b.smali b/com.discord/smali_classes2/k0/l/b.smali
new file mode 100644
index 0000000000..133b8d1d99
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/b.smali
@@ -0,0 +1,19 @@
+.class public abstract Lk0/l/b;
+.super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<B::",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "E::TB;>",
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/CoroutineContext$b<",
+        "TE;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/l/c$a.smali b/com.discord/smali_classes2/k0/l/c$a.smali
new file mode 100644
index 0000000000..d1bbb0ff71
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/c$a.smali
@@ -0,0 +1,69 @@
+.class public final Lk0/l/c$a;
+.super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/l/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J
+
+
+# instance fields
+.field public final elements:[Lkotlin/coroutines/CoroutineContext;
+
+
+# direct methods
+.method public constructor <init>([Lkotlin/coroutines/CoroutineContext;)V
+    .locals 1
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/l/c$a;->elements:[Lkotlin/coroutines/CoroutineContext;
+
+    return-void
+.end method
+
+.method private final readResolve()Ljava/lang/Object;
+    .locals 5
+
+    iget-object v0, p0, Lk0/l/c$a;->elements:[Lkotlin/coroutines/CoroutineContext;
+
+    sget-object v1, Lk0/l/f;->d:Lk0/l/f;
+
+    array-length v2, v0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v2, :cond_0
+
+    aget-object v4, v0, v3
+
+    invoke-interface {v1, v4}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v1
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-object v1
+.end method
diff --git a/com.discord/smali_classes2/k0/l/c$b.smali b/com.discord/smali_classes2/k0/l/c$b.smali
new file mode 100644
index 0000000000..57f185408c
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/c$b.smali
@@ -0,0 +1,116 @@
+.class public final Lk0/l/c$b;
+.super Lk0/o/c/j;
+.source "CoroutineContextImpl.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/l/c;->toString()Ljava/lang/String;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ljava/lang/String;",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/l/c$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/l/c$b;
+
+    invoke-direct {v0}, Lk0/l/c$b;-><init>()V
+
+    sput-object v0, Lk0/l/c$b;->d:Lk0/l/c$b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/String;
+
+    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
+
+    const-string v0, "acc"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "element"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, ", "
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    :goto_1
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/l/c$c.smali b/com.discord/smali_classes2/k0/l/c$c.smali
new file mode 100644
index 0000000000..9e218e19ab
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/c$c.smali
@@ -0,0 +1,84 @@
+.class public final Lk0/l/c$c;
+.super Lk0/o/c/j;
+.source "CoroutineContextImpl.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/l/c;->writeReplace()Ljava/lang/Object;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Lkotlin/Unit;",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $elements:[Lkotlin/coroutines/CoroutineContext;
+
+.field public final synthetic $index:Lkotlin/jvm/internal/Ref$IntRef;
+
+
+# direct methods
+.method public constructor <init>([Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/Ref$IntRef;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/l/c$c;->$elements:[Lkotlin/coroutines/CoroutineContext;
+
+    iput-object p2, p0, Lk0/l/c$c;->$index:Lkotlin/jvm/internal/Ref$IntRef;
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lkotlin/Unit;
+
+    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
+
+    const-string v0, "<anonymous parameter 0>"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "element"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lk0/l/c$c;->$elements:[Lkotlin/coroutines/CoroutineContext;
+
+    iget-object v0, p0, Lk0/l/c$c;->$index:Lkotlin/jvm/internal/Ref$IntRef;
+
+    iget v1, v0, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, v0, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+
+    aput-object p2, p1, v1
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/l/c.smali b/com.discord/smali_classes2/k0/l/c.smali
new file mode 100644
index 0000000000..e5653d8594
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/c.smali
@@ -0,0 +1,454 @@
+.class public final Lk0/l/c;
+.super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext;
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/l/c$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final element:Lkotlin/coroutines/CoroutineContext$a;
+
+.field public final left:Lkotlin/coroutines/CoroutineContext;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
+    .locals 1
+
+    const-string v0, "left"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "element"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    iput-object p2, p0, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    return-void
+.end method
+
+.method private final writeReplace()Ljava/lang/Object;
+    .locals 6
+
+    invoke-virtual {p0}, Lk0/l/c;->b()I
+
+    move-result v0
+
+    new-array v1, v0, [Lkotlin/coroutines/CoroutineContext;
+
+    new-instance v2, Lkotlin/jvm/internal/Ref$IntRef;
+
+    invoke-direct {v2}, Lkotlin/jvm/internal/Ref$IntRef;-><init>()V
+
+    const/4 v3, 0x0
+
+    iput v3, v2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+
+    sget-object v4, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    new-instance v5, Lk0/l/c$c;
+
+    invoke-direct {v5, v1, v2}, Lk0/l/c$c;-><init>([Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/Ref$IntRef;)V
+
+    invoke-virtual {p0, v4, v5}, Lk0/l/c;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    iget v2, v2, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+
+    if-ne v2, v0, :cond_0
+
+    const/4 v3, 0x1
+
+    :cond_0
+    if-eqz v3, :cond_1
+
+    new-instance v0, Lk0/l/c$a;
+
+    invoke-direct {v0, v1}, Lk0/l/c$a;-><init>([Lkotlin/coroutines/CoroutineContext;)V
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Check failed."
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public final b()I
+    .locals 3
+
+    const/4 v0, 0x2
+
+    move-object v1, p0
+
+    :goto_0
+    iget-object v1, v1, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    instance-of v2, v1, Lk0/l/c;
+
+    if-nez v2, :cond_0
+
+    const/4 v1, 0x0
+
+    :cond_0
+    check-cast v1, Lk0/l/c;
+
+    if-eqz v1, :cond_1
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x0
+
+    if-eq p0, p1, :cond_4
+
+    instance-of v1, p1, Lk0/l/c;
+
+    if-eqz v1, :cond_5
+
+    check-cast p1, Lk0/l/c;
+
+    invoke-virtual {p1}, Lk0/l/c;->b()I
+
+    move-result v1
+
+    invoke-virtual {p0}, Lk0/l/c;->b()I
+
+    move-result v2
+
+    if-ne v1, v2, :cond_5
+
+    if-eqz p1, :cond_3
+
+    move-object v1, p0
+
+    :goto_0
+    iget-object v2, v1, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    invoke-interface {v2}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
+
+    move-result-object v3
+
+    invoke-virtual {p1, v3}, Lk0/l/c;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v3
+
+    invoke-static {v3, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-nez v2, :cond_0
+
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v1, v1, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    instance-of v2, v1, Lk0/l/c;
+
+    if-eqz v2, :cond_1
+
+    check-cast v1, Lk0/l/c;
+
+    goto :goto_0
+
+    :cond_1
+    if-eqz v1, :cond_2
+
+    check-cast v1, Lkotlin/coroutines/CoroutineContext$a;
+
+    invoke-interface {v1}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
+
+    move-result-object v2
+
+    invoke-virtual {p1, v2}, Lk0/l/c;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p1
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    :goto_1
+    if-eqz p1, :cond_5
+
+    goto :goto_2
+
+    :cond_2
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.coroutines.CoroutineContext.Element"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_4
+    :goto_2
+    const/4 v0, 0x1
+
+    :cond_5
+    return v0
+.end method
+
+.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(TR;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TR;-",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "+TR;>;)TR;"
+        }
+    .end annotation
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-interface {v0, p1, p2}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    invoke-interface {p2, p1, v0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            ">(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    :goto_0
+    iget-object v1, v0, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    invoke-interface {v1, p1}, Lkotlin/coroutines/CoroutineContext$a;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    return-object v1
+
+    :cond_0
+    iget-object v0, v0, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    instance-of v1, v0, Lk0/l/c;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Lk0/l/c;
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {v0, p1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    iget-object v0, p0, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    iget-object v1, p0, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    return v1
+.end method
+
+.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;)",
+            "Lkotlin/coroutines/CoroutineContext;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    invoke-interface {v0, p1}, Lkotlin/coroutines/CoroutineContext$a;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget-object p1, p0, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-interface {v0, p1}, Lkotlin/coroutines/CoroutineContext;->minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lk0/l/c;->left:Lkotlin/coroutines/CoroutineContext;
+
+    if-ne p1, v0, :cond_1
+
+    move-object p1, p0
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    if-ne p1, v0, :cond_2
+
+    iget-object p1, p0, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Lk0/l/c;
+
+    iget-object v1, p0, Lk0/l/c;->element:Lkotlin/coroutines/CoroutineContext$a;
+
+    invoke-direct {v0, p1, v1}, Lk0/l/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
+
+    move-object p1, v0
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    if-ne p1, v0, :cond_0
+
+    move-object p1, p0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Lk0/l/e;->d:Lk0/l/e;
+
+    invoke-interface {p1, p0, v0}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lkotlin/coroutines/CoroutineContext;
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    sget-object v1, Lk0/l/c$b;->d:Lk0/l/c$b;
+
+    const-string v2, ""
+
+    invoke-virtual {p0, v2, v1}, Lk0/l/c;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/String;
+
+    const-string v2, "]"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/l/d$a.smali b/com.discord/smali_classes2/k0/l/d$a.smali
new file mode 100644
index 0000000000..2506df1504
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/d$a.smali
@@ -0,0 +1,52 @@
+.class public final Lk0/l/d$a;
+.super Ljava/lang/Object;
+.source "ContinuationInterceptor.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/l/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/CoroutineContext$b<",
+        "Lk0/l/d;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic a:Lk0/l/d$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/l/d$a;
+
+    invoke-direct {v0}, Lk0/l/d$a;-><init>()V
+
+    sput-object v0, Lk0/l/d$a;->a:Lk0/l/d$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/l/d.smali b/com.discord/smali_classes2/k0/l/d.smali
new file mode 100644
index 0000000000..121e527368
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/d.smali
@@ -0,0 +1,56 @@
+.class public interface abstract Lk0/l/d;
+.super Ljava/lang/Object;
+.source "ContinuationInterceptor.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/l/d$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lk0/l/d$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Lk0/l/d$a;->a:Lk0/l/d$a;
+
+    sput-object v0, Lk0/l/d;->a:Lk0/l/d$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract interceptContinuation(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;)",
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+.end method
+
+.method public abstract releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "*>;)V"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/k0/l/e.smali b/com.discord/smali_classes2/k0/l/e.smali
new file mode 100644
index 0000000000..eda5f5d069
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/e.smali
@@ -0,0 +1,131 @@
+.class public final Lk0/l/e;
+.super Lk0/o/c/j;
+.source "CoroutineContext.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Lkotlin/coroutines/CoroutineContext;",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "Lkotlin/coroutines/CoroutineContext;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/l/e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/l/e;
+
+    invoke-direct {v0}, Lk0/l/e;-><init>()V
+
+    sput-object v0, Lk0/l/e;->d:Lk0/l/e;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lkotlin/coroutines/CoroutineContext;
+
+    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
+
+    const-string v0, "acc"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "element"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p2}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lkotlin/coroutines/CoroutineContext;->minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    if-ne p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Lk0/l/d;->a:Lk0/l/d$a;
+
+    invoke-interface {p1, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v0
+
+    check-cast v0, Lk0/l/d;
+
+    if-nez v0, :cond_1
+
+    new-instance v0, Lk0/l/c;
+
+    invoke-direct {v0, p1, p2}, Lk0/l/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
+
+    move-object p2, v0
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v1, Lk0/l/d;->a:Lk0/l/d$a;
+
+    invoke-interface {p1, v1}, Lkotlin/coroutines/CoroutineContext;->minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    sget-object v1, Lk0/l/f;->d:Lk0/l/f;
+
+    if-ne p1, v1, :cond_2
+
+    new-instance p1, Lk0/l/c;
+
+    invoke-direct {p1, p2, v0}, Lk0/l/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
+
+    move-object p2, p1
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v1, Lk0/l/c;
+
+    new-instance v2, Lk0/l/c;
+
+    invoke-direct {v2, p1, p2}, Lk0/l/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
+
+    invoke-direct {v1, v2, v0}, Lk0/l/c;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$a;)V
+
+    move-object p2, v1
+
+    :goto_0
+    return-object p2
+.end method
diff --git a/com.discord/smali_classes2/k0/l/f.smali b/com.discord/smali_classes2/k0/l/f.smali
new file mode 100644
index 0000000000..ab0375df36
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/f.smali
@@ -0,0 +1,131 @@
+.class public final Lk0/l/f;
+.super Ljava/lang/Object;
+.source "CoroutineContextImpl.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext;
+.implements Ljava/io/Serializable;
+
+
+# static fields
+.field public static final d:Lk0/l/f;
+
+.field public static final serialVersionUID:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/l/f;
+
+    invoke-direct {v0}, Lk0/l/f;-><init>()V
+
+    sput-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method private final readResolve()Ljava/lang/Object;
+    .locals 1
+
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(TR;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TR;-",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "+TR;>;)TR;"
+        }
+    .end annotation
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            ">(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;)",
+            "Lkotlin/coroutines/CoroutineContext;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "EmptyCoroutineContext"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/l/g/a.smali b/com.discord/smali_classes2/k0/l/g/a.smali
new file mode 100644
index 0000000000..b4f7e9abf9
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/g/a.smali
@@ -0,0 +1,106 @@
+.class public final enum Lk0/l/g/a;
+.super Ljava/lang/Enum;
+.source "Intrinsics.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lk0/l/g/a;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lk0/l/g/a;
+
+.field public static final synthetic e:[Lk0/l/g/a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [Lk0/l/g/a;
+
+    new-instance v1, Lk0/l/g/a;
+
+    const-string v2, "COROUTINE_SUSPENDED"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Lk0/l/g/a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lk0/l/g/a;->d:Lk0/l/g/a;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lk0/l/g/a;
+
+    const-string v2, "UNDECIDED"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Lk0/l/g/a;-><init>(Ljava/lang/String;I)V
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lk0/l/g/a;
+
+    const-string v2, "RESUMED"
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, v2, v3}, Lk0/l/g/a;-><init>(Ljava/lang/String;I)V
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lk0/l/g/a;->e:[Lk0/l/g/a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lk0/l/g/a;
+    .locals 1
+
+    const-class v0, Lk0/l/g/a;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lk0/l/g/a;
+
+    return-object p0
+.end method
+
+.method public static values()[Lk0/l/g/a;
+    .locals 1
+
+    sget-object v0, Lk0/l/g/a;->e:[Lk0/l/g/a;
+
+    invoke-virtual {v0}, [Lk0/l/g/a;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lk0/l/g/a;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/l/g/b.smali b/com.discord/smali_classes2/k0/l/g/b.smali
new file mode 100644
index 0000000000..56d9d9d658
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/g/b.smali
@@ -0,0 +1,95 @@
+.class public final Lk0/l/g/b;
+.super Lk0/l/h/a/f;
+.source "IntrinsicsJvm.kt"
+
+
+# instance fields
+.field public final synthetic $completion:Lkotlin/coroutines/Continuation;
+
+.field public final synthetic $receiver$inlined:Ljava/lang/Object;
+
+.field public final synthetic $this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
+
+.field public label:I
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/l/g/b;->$completion:Lkotlin/coroutines/Continuation;
+
+    iput-object p3, p0, Lk0/l/g/b;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
+
+    iput-object p4, p0, Lk0/l/g/b;->$receiver$inlined:Ljava/lang/Object;
+
+    invoke-direct {p0, p2}, Lk0/l/h/a/f;-><init>(Lkotlin/coroutines/Continuation;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    iget v0, p0, Lk0/l/g/b;->label:I
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_1
+
+    if-ne v0, v2, :cond_0
+
+    iput v1, p0, Lk0/l/g/b;->label:I
+
+    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "This coroutine had already completed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    iput v2, p0, Lk0/l/g/b;->label:I
+
+    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Lk0/l/g/b;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
+
+    if-eqz p1, :cond_2
+
+    invoke-static {p1, v1}, Lk0/o/c/v;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
+
+    check-cast p1, Lkotlin/jvm/functions/Function2;
+
+    iget-object v0, p0, Lk0/l/g/b;->$receiver$inlined:Ljava/lang/Object;
+
+    invoke-interface {p1, v0, p0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    :goto_0
+    return-object p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "null cannot be cast to non-null type (R, kotlin.coroutines.Continuation<T>) -> kotlin.Any?"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/k0/l/g/c.smali b/com.discord/smali_classes2/k0/l/g/c.smali
new file mode 100644
index 0000000000..0a202e0e68
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/g/c.smali
@@ -0,0 +1,99 @@
+.class public final Lk0/l/g/c;
+.super Lk0/l/h/a/c;
+.source "IntrinsicsJvm.kt"
+
+
+# instance fields
+.field public final synthetic $completion:Lkotlin/coroutines/Continuation;
+
+.field public final synthetic $context:Lkotlin/coroutines/CoroutineContext;
+
+.field public final synthetic $receiver$inlined:Ljava/lang/Object;
+
+.field public final synthetic $this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
+
+.field public label:I
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Ljava/lang/Object;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/l/g/c;->$completion:Lkotlin/coroutines/Continuation;
+
+    iput-object p2, p0, Lk0/l/g/c;->$context:Lkotlin/coroutines/CoroutineContext;
+
+    iput-object p5, p0, Lk0/l/g/c;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
+
+    iput-object p6, p0, Lk0/l/g/c;->$receiver$inlined:Ljava/lang/Object;
+
+    invoke-direct {p0, p3, p4}, Lk0/l/h/a/c;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    iget v0, p0, Lk0/l/g/c;->label:I
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_1
+
+    if-ne v0, v2, :cond_0
+
+    iput v1, p0, Lk0/l/g/c;->label:I
+
+    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "This coroutine had already completed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    iput v2, p0, Lk0/l/g/c;->label:I
+
+    invoke-static {p1}, Lf/n/a/k/a;->throwOnFailure(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Lk0/l/g/c;->$this_createCoroutineUnintercepted$inlined:Lkotlin/jvm/functions/Function2;
+
+    if-eqz p1, :cond_2
+
+    invoke-static {p1, v1}, Lk0/o/c/v;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
+
+    check-cast p1, Lkotlin/jvm/functions/Function2;
+
+    iget-object v0, p0, Lk0/l/g/c;->$receiver$inlined:Ljava/lang/Object;
+
+    invoke-interface {p1, v0, p0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    :goto_0
+    return-object p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "null cannot be cast to non-null type (R, kotlin.coroutines.Continuation<T>) -> kotlin.Any?"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/a.smali b/com.discord/smali_classes2/k0/l/h/a/a.smali
new file mode 100644
index 0000000000..a74c641ab3
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/a.smali
@@ -0,0 +1,559 @@
+.class public abstract Lk0/l/h/a/a;
+.super Ljava/lang/Object;
+.source "ContinuationImpl.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/Continuation;
+.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/Continuation<",
+        "Ljava/lang/Object;",
+        ">;",
+        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;",
+        "Ljava/io/Serializable;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final completion:Lkotlin/coroutines/Continuation;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/Continuation;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/l/h/a/a;->completion:Lkotlin/coroutines/Continuation;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            "Lkotlin/coroutines/Continuation<",
+            "*>;)",
+            "Lkotlin/coroutines/Continuation<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    const-string p1, "completion"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "create(Any?;Continuation) has not been overridden"
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public create(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "*>;)",
+            "Lkotlin/coroutines/Continuation<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "completion"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "create(Continuation) has not been overridden"
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    .locals 2
+
+    iget-object v0, p0, Lk0/l/h/a/a;->completion:Lkotlin/coroutines/Continuation;
+
+    instance-of v1, v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    check-cast v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    return-object v0
+.end method
+
+.method public final getCompletion()Lkotlin/coroutines/Continuation;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/l/h/a/a;->completion:Lkotlin/coroutines/Continuation;
+
+    return-object v0
+.end method
+
+.method public getStackTraceElement()Ljava/lang/StackTraceElement;
+    .locals 9
+
+    const-string v0, "$this$getStackTraceElementImpl"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    const-class v1, Lk0/l/h/a/d;
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->getAnnotation(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;
+
+    move-result-object v0
+
+    check-cast v0, Lk0/l/h/a/d;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_a
+
+    invoke-interface {v0}, Lk0/l/h/a/d;->v()I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    if-gt v2, v3, :cond_9
+
+    const/4 v2, -0x1
+
+    const/4 v4, 0x0
+
+    :try_start_0
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    const-string v6, "label"
+
+    invoke-virtual {v5, v6}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v5
+
+    const-string v6, "field"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v3}, Ljava/lang/reflect/Field;->setAccessible(Z)V
+
+    invoke-virtual {v5, p0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    instance-of v6, v5, Ljava/lang/Integer;
+
+    if-nez v6, :cond_0
+
+    move-object v5, v1
+
+    :cond_0
+    check-cast v5, Ljava/lang/Integer;
+
+    if-eqz v5, :cond_1
+
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
+
+    move-result v5
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v5, 0x0
+
+    :goto_0
+    sub-int/2addr v5, v3
+
+    goto :goto_1
+
+    :catch_0
+    const/4 v5, -0x1
+
+    :goto_1
+    if-gez v5, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    invoke-interface {v0}, Lk0/l/h/a/d;->l()[I
+
+    move-result-object v2
+
+    aget v2, v2, v5
+
+    :goto_2
+    const-string v3, "continuation"
+
+    invoke-static {p0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v3, Lk0/l/h/a/e;->b:Lk0/l/h/a/e$a;
+
+    if-eqz v3, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    :try_start_1
+    const-class v3, Ljava/lang/Class;
+
+    const-string v5, "getModule"
+
+    new-array v6, v4, [Ljava/lang/Class;
+
+    invoke-virtual {v3, v5, v6}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v3
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v5
+
+    const-string v6, "java.lang.Module"
+
+    invoke-virtual {v5, v6}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v5
+
+    const-string v6, "getDescriptor"
+
+    new-array v7, v4, [Ljava/lang/Class;
+
+    invoke-virtual {v5, v6, v7}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v5
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v6
+
+    invoke-virtual {v6}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v6
+
+    const-string v7, "java.lang.module.ModuleDescriptor"
+
+    invoke-virtual {v6, v7}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v6
+
+    const-string v7, "name"
+
+    new-array v8, v4, [Ljava/lang/Class;
+
+    invoke-virtual {v6, v7, v8}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v6
+
+    new-instance v7, Lk0/l/h/a/e$a;
+
+    invoke-direct {v7, v3, v5, v6}, Lk0/l/h/a/e$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
+
+    sput-object v7, Lk0/l/h/a/e;->b:Lk0/l/h/a/e$a;
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+
+    move-object v3, v7
+
+    goto :goto_3
+
+    :catch_1
+    sget-object v3, Lk0/l/h/a/e;->a:Lk0/l/h/a/e$a;
+
+    sput-object v3, Lk0/l/h/a/e;->b:Lk0/l/h/a/e$a;
+
+    :goto_3
+    sget-object v5, Lk0/l/h/a/e;->a:Lk0/l/h/a/e$a;
+
+    if-ne v3, v5, :cond_4
+
+    goto :goto_6
+
+    :cond_4
+    iget-object v5, v3, Lk0/l/h/a/e$a;->a:Ljava/lang/reflect/Method;
+
+    if-eqz v5, :cond_7
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v6
+
+    new-array v7, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v5, v6, v7}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_7
+
+    iget-object v6, v3, Lk0/l/h/a/e$a;->b:Ljava/lang/reflect/Method;
+
+    if-eqz v6, :cond_7
+
+    new-array v7, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v6, v5, v7}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_7
+
+    iget-object v3, v3, Lk0/l/h/a/e$a;->c:Ljava/lang/reflect/Method;
+
+    if-eqz v3, :cond_5
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v3, v5, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    goto :goto_4
+
+    :cond_5
+    move-object v3, v1
+
+    :goto_4
+    instance-of v4, v3, Ljava/lang/String;
+
+    if-nez v4, :cond_6
+
+    goto :goto_5
+
+    :cond_6
+    move-object v1, v3
+
+    :goto_5
+    check-cast v1, Ljava/lang/String;
+
+    :cond_7
+    :goto_6
+    if-nez v1, :cond_8
+
+    invoke-interface {v0}, Lk0/l/h/a/d;->c()Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_7
+
+    :cond_8
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x2f
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-interface {v0}, Lk0/l/h/a/d;->c()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    :goto_7
+    new-instance v3, Ljava/lang/StackTraceElement;
+
+    invoke-interface {v0}, Lk0/l/h/a/d;->m()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-interface {v0}, Lk0/l/h/a/d;->f()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v3, v1, v4, v0, v2}, Ljava/lang/StackTraceElement;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+
+    move-object v1, v3
+
+    goto :goto_8
+
+    :cond_9
+    const-string v0, "Debug metadata version mismatch. Expected: "
+
+    const-string v1, ", got "
+
+    const-string v4, ". Please update the Kotlin standard library."
+
+    invoke-static {v0, v3, v1, v2, v4}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_a
+    :goto_8
+    return-object v1
+.end method
+
+.method public abstract invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+.end method
+
+.method public releaseIntercepted()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final resumeWith(Ljava/lang/Object;)V
+    .locals 3
+
+    move-object v0, p0
+
+    :goto_0
+    const-string v1, "frame"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v0, Lk0/l/h/a/a;->completion:Lkotlin/coroutines/Continuation;
+
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    :try_start_0
+    invoke-virtual {v0, p1}, Lk0/l/h/a/a;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    sget-object v2, Lk0/l/g/a;->d:Lk0/l/g/a;
+
+    if-ne p1, v2, :cond_0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    :cond_0
+    invoke-virtual {v0}, Lk0/l/h/a/a;->releaseIntercepted()V
+
+    instance-of v0, v1, Lk0/l/h/a/a;
+
+    if-eqz v0, :cond_1
+
+    move-object v0, v1
+
+    check-cast v0, Lk0/l/h/a/a;
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {v1, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "Continuation at "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lk0/l/h/a/a;->getStackTraceElement()Ljava/lang/StackTraceElement;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/b.smali b/com.discord/smali_classes2/k0/l/h/a/b.smali
new file mode 100644
index 0000000000..9f33802848
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/b.smali
@@ -0,0 +1,85 @@
+.class public final Lk0/l/h/a/b;
+.super Ljava/lang/Object;
+.source "ContinuationImpl.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/Continuation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/Continuation<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/l/h/a/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/l/h/a/b;
+
+    invoke-direct {v0}, Lk0/l/h/a/b;-><init>()V
+
+    sput-object v0, Lk0/l/h/a/b;->d:Lk0/l/h/a/b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 2
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "This continuation is already complete"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public resumeWith(Ljava/lang/Object;)V
+    .locals 1
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "This continuation is already complete"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "This continuation is already complete"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/c.smali b/com.discord/smali_classes2/k0/l/h/a/c.smali
new file mode 100644
index 0000000000..95673dcaf7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/c.smali
@@ -0,0 +1,162 @@
+.class public abstract Lk0/l/h/a/c;
+.super Lk0/l/h/a/a;
+.source "ContinuationImpl.kt"
+
+
+# instance fields
+.field public final _context:Lkotlin/coroutines/CoroutineContext;
+
+.field public transient intercepted:Lkotlin/coroutines/Continuation;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/Continuation;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_0
+
+    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-direct {p0, p1, v0}, Lk0/l/h/a/c;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;",
+            "Lkotlin/coroutines/CoroutineContext;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lk0/l/h/a/a;-><init>(Lkotlin/coroutines/Continuation;)V
+
+    iput-object p2, p0, Lk0/l/h/a/c;->_context:Lkotlin/coroutines/CoroutineContext;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    iget-object v0, p0, Lk0/l/h/a/c;->_context:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+.method public final intercepted()Lkotlin/coroutines/Continuation;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/l/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {p0}, Lk0/l/h/a/c;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    sget-object v1, Lk0/l/d;->a:Lk0/l/d$a;
+
+    invoke-interface {v0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v0
+
+    check-cast v0, Lk0/l/d;
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {v0, p0}, Lk0/l/d;->interceptContinuation(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    move-object v0, p0
+
+    :goto_0
+    iput-object v0, p0, Lk0/l/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
+
+    :goto_1
+    return-object v0
+.end method
+
+.method public releaseIntercepted()V
+    .locals 3
+
+    iget-object v0, p0, Lk0/l/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
+
+    if-eqz v0, :cond_0
+
+    if-eq v0, p0, :cond_0
+
+    invoke-virtual {p0}, Lk0/l/h/a/c;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v1
+
+    sget-object v2, Lk0/l/d;->a:Lk0/l/d$a;
+
+    invoke-interface {v1, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    check-cast v1, Lk0/l/d;
+
+    invoke-interface {v1, v0}, Lk0/l/d;->releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
+
+    :cond_0
+    sget-object v0, Lk0/l/h/a/b;->d:Lk0/l/h/a/b;
+
+    iput-object v0, p0, Lk0/l/h/a/c;->intercepted:Lkotlin/coroutines/Continuation;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/d.smali b/com.discord/smali_classes2/k0/l/h/a/d.smali
new file mode 100644
index 0000000000..22b501f067
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/d.smali
@@ -0,0 +1,48 @@
+.class public interface abstract annotation Lk0/l/h/a/d;
+.super Ljava/lang/Object;
+.source "DebugMetadata.kt"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lk0/l/h/a/d;
+        c = ""
+        f = ""
+        i = {}
+        l = {}
+        m = ""
+        n = {}
+        s = {}
+        v = 0x1
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->TYPE:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract c()Ljava/lang/String;
+.end method
+
+.method public abstract f()Ljava/lang/String;
+.end method
+
+.method public abstract l()[I
+.end method
+
+.method public abstract m()Ljava/lang/String;
+.end method
+
+.method public abstract v()I
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/e$a.smali b/com.discord/smali_classes2/k0/l/h/a/e$a.smali
new file mode 100644
index 0000000000..6b4d9e5681
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/e$a.smali
@@ -0,0 +1,38 @@
+.class public final Lk0/l/h/a/e$a;
+.super Ljava/lang/Object;
+.source "DebugMetadata.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/l/h/a/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/reflect/Method;
+
+.field public final b:Ljava/lang/reflect/Method;
+
+.field public final c:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/l/h/a/e$a;->a:Ljava/lang/reflect/Method;
+
+    iput-object p2, p0, Lk0/l/h/a/e$a;->b:Ljava/lang/reflect/Method;
+
+    iput-object p3, p0, Lk0/l/h/a/e$a;->c:Ljava/lang/reflect/Method;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/e.smali b/com.discord/smali_classes2/k0/l/h/a/e.smali
new file mode 100644
index 0000000000..5d237e2122
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/e.smali
@@ -0,0 +1,49 @@
+.class public final Lk0/l/h/a/e;
+.super Ljava/lang/Object;
+.source "DebugMetadata.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/l/h/a/e$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lk0/l/h/a/e$a;
+
+.field public static b:Lk0/l/h/a/e$a;
+
+.field public static final c:Lk0/l/h/a/e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lk0/l/h/a/e;
+
+    invoke-direct {v0}, Lk0/l/h/a/e;-><init>()V
+
+    sput-object v0, Lk0/l/h/a/e;->c:Lk0/l/h/a/e;
+
+    new-instance v0, Lk0/l/h/a/e$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1, v1, v1}, Lk0/l/h/a/e$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
+
+    sput-object v0, Lk0/l/h/a/e;->a:Lk0/l/h/a/e$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/f.smali b/com.discord/smali_classes2/k0/l/h/a/f.smali
new file mode 100644
index 0000000000..bb5d34de27
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/f.smali
@@ -0,0 +1,68 @@
+.class public abstract Lk0/l/h/a/f;
+.super Lk0/l/h/a/a;
+.source "ContinuationImpl.kt"
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/Continuation;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lk0/l/h/a/a;-><init>(Lkotlin/coroutines/Continuation;)V
+
+    if-eqz p1, :cond_2
+
+    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Coroutines with restricted suspension must have EmptyCoroutineContext"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    :goto_1
+    return-void
+.end method
+
+
+# virtual methods
+.method public getContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/l/h/a/g.smali b/com.discord/smali_classes2/k0/l/h/a/g.smali
new file mode 100644
index 0000000000..2790b8f69a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/l/h/a/g.smali
@@ -0,0 +1,92 @@
+.class public abstract Lk0/l/h/a/g;
+.super Lk0/l/h/a/c;
+.source "ContinuationImpl.kt"
+
+# interfaces
+.implements Lk0/o/c/f;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/l/h/a/c;",
+        "Lk0/o/c/f<",
+        "Ljava/lang/Object;",
+        ">;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final arity:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, p1, v0}, Lk0/l/h/a/g;-><init>(ILkotlin/coroutines/Continuation;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(ILkotlin/coroutines/Continuation;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Lkotlin/coroutines/Continuation<",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p2}, Lk0/l/h/a/c;-><init>(Lkotlin/coroutines/Continuation;)V
+
+    iput p1, p0, Lk0/l/h/a/g;->arity:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getArity()I
+    .locals 1
+
+    iget v0, p0, Lk0/l/h/a/g;->arity:I
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/l/h/a/a;->getCompletion()Lkotlin/coroutines/Continuation;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    sget-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    invoke-virtual {v0, p0}, Lk0/o/c/u;->renderLambdaToString(Lk0/o/c/f;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "Reflection.renderLambdaToString(this)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-super {p0}, Lk0/l/h/a/a;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/m/a$a.smali b/com.discord/smali_classes2/k0/m/a$a.smali
new file mode 100644
index 0000000000..51c378cde2
--- /dev/null
+++ b/com.discord/smali_classes2/k0/m/a$a.smali
@@ -0,0 +1,143 @@
+.class public final Lk0/m/a$a;
+.super Ljava/lang/Object;
+.source "PlatformImplementations.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/m/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 11
+
+    const-class v0, Ljava/lang/Throwable;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getMethods()[Ljava/lang/reflect/Method;
+
+    move-result-object v1
+
+    const-string v2, "throwableMethods"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v2, v1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_0
+    const-string v5, "it"
+
+    const/4 v6, 0x0
+
+    if-ge v4, v2, :cond_3
+
+    aget-object v7, v1, v4
+
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v7}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v9, "addSuppressed"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v8
+
+    const/4 v9, 0x1
+
+    if-eqz v8, :cond_1
+
+    invoke-virtual {v7}, Ljava/lang/reflect/Method;->getParameterTypes()[Ljava/lang/Class;
+
+    move-result-object v8
+
+    const-string v10, "it.parameterTypes"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "$this$singleOrNull"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v10, v8
+
+    if-ne v10, v9, :cond_0
+
+    aget-object v6, v8, v3
+
+    :cond_0
+    invoke-static {v6, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v9, 0x0
+
+    :goto_1
+    if-eqz v9, :cond_2
+
+    move-object v6, v7
+
+    goto :goto_2
+
+    :cond_2
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    :goto_2
+    sput-object v6, Lk0/m/a$a;->a:Ljava/lang/reflect/Method;
+
+    array-length v0, v1
+
+    :goto_3
+    if-ge v3, v0, :cond_5
+
+    aget-object v2, v1, v3
+
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v4, "getSuppressed"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_3
+
+    :cond_5
+    :goto_4
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/m/a.smali b/com.discord/smali_classes2/k0/m/a.smali
new file mode 100644
index 0000000000..1166963042
--- /dev/null
+++ b/com.discord/smali_classes2/k0/m/a.smali
@@ -0,0 +1,52 @@
+.class public Lk0/m/a;
+.super Ljava/lang/Object;
+.source "PlatformImplementations.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/m/a$a;
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    .locals 3
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/m/a$a;->a:Ljava/lang/reflect/Method;
+
+    if-eqz v0, :cond_0
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    aput-object p2, v1, v2
+
+    invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/m/b.smali b/com.discord/smali_classes2/k0/m/b.smali
new file mode 100644
index 0000000000..b2267e1a26
--- /dev/null
+++ b/com.discord/smali_classes2/k0/m/b.smali
@@ -0,0 +1,413 @@
+.class public final Lk0/m/b;
+.super Ljava/lang/Object;
+.source "PlatformImplementations.kt"
+
+
+# static fields
+.field public static final a:Lk0/m/a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 11
+
+    const-class v0, Lk0/m/a;
+
+    const-string v1, "java.specification.version"
+
+    invoke-static {v1}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    const/4 v2, 0x6
+
+    const/16 v3, 0x2e
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v3, v4, v4, v2}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v2
+
+    const/high16 v5, 0x10000
+
+    if-gez v2, :cond_0
+
+    :try_start_0
+    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v1
+    :try_end_0
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
+
+    mul-int v1, v1, v5
+
+    goto :goto_0
+
+    :cond_0
+    add-int/lit8 v6, v2, 0x1
+
+    const/4 v7, 0x4
+
+    invoke-static {v1, v3, v6, v4, v7}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v3
+
+    if-gez v3, :cond_1
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    :cond_1
+    invoke-virtual {v1, v4, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v4, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v6, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_1
+    invoke-static {v2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v2
+
+    mul-int v2, v2, v5
+
+    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v1
+    :try_end_1
+    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0
+
+    add-int/2addr v1, v2
+
+    goto :goto_0
+
+    :catch_0
+    :cond_2
+    const v1, 0x10006
+
+    :goto_0
+    const v2, 0x10008
+
+    const-string v3, "ClassCastException(\"Inst\u2026baseTypeCL\").initCause(e)"
+
+    const-string v4, ", base type classloader: "
+
+    const-string v5, "Instance classloader: "
+
+    const-string v6, "Class.forName(\"kotlin.in\u2026entations\").newInstance()"
+
+    if-lt v1, v2, :cond_3
+
+    :try_start_2
+    const-string v2, "kotlin.internal.jdk8.JDK8PlatformImplementations"
+
+    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_2
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_2 .. :try_end_2} :catch_2
+
+    :try_start_3
+    check-cast v2, Lk0/m/a;
+    :try_end_3
+    .catch Ljava/lang/ClassCastException; {:try_start_3 .. :try_end_3} :catch_1
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_3 .. :try_end_3} :catch_2
+
+    goto/16 :goto_1
+
+    :catch_1
+    move-exception v7
+
+    :try_start_4
+    invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v8
+
+    new-instance v9, Ljava/lang/ClassCastException;
+
+    new-instance v10, Ljava/lang/StringBuilder;
+
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v10, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v9, v2}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v9, v7}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v2
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v2
+    :try_end_4
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_4 .. :try_end_4} :catch_2
+
+    :catch_2
+    :try_start_5
+    const-string v2, "kotlin.internal.JRE8PlatformImplementations"
+
+    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_5
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_5 .. :try_end_5} :catch_4
+
+    :try_start_6
+    check-cast v2, Lk0/m/a;
+    :try_end_6
+    .catch Ljava/lang/ClassCastException; {:try_start_6 .. :try_end_6} :catch_3
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_6 .. :try_end_6} :catch_4
+
+    goto/16 :goto_1
+
+    :catch_3
+    move-exception v7
+
+    :try_start_7
+    invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v8
+
+    new-instance v9, Ljava/lang/ClassCastException;
+
+    new-instance v10, Ljava/lang/StringBuilder;
+
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v10, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v9, v2}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v9, v7}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v2
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v2
+    :try_end_7
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_7 .. :try_end_7} :catch_4
+
+    :catch_4
+    nop
+
+    :cond_3
+    const v2, 0x10007
+
+    if-lt v1, v2, :cond_4
+
+    :try_start_8
+    const-string v1, "k0.m.c.a"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_8
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_8 .. :try_end_8} :catch_6
+
+    :try_start_9
+    move-object v2, v1
+
+    check-cast v2, Lk0/m/a;
+    :try_end_9
+    .catch Ljava/lang/ClassCastException; {:try_start_9 .. :try_end_9} :catch_5
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_9 .. :try_end_9} :catch_6
+
+    goto :goto_1
+
+    :catch_5
+    move-exception v2
+
+    :try_start_a
+    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v7
+
+    new-instance v8, Ljava/lang/ClassCastException;
+
+    new-instance v9, Ljava/lang/StringBuilder;
+
+    invoke-direct {v9}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v9, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v8, v1}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v8, v2}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v1
+    :try_end_a
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_a .. :try_end_a} :catch_6
+
+    :catch_6
+    :try_start_b
+    const-string v1, "kotlin.internal.JRE7PlatformImplementations"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_b
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_b .. :try_end_b} :catch_8
+
+    :try_start_c
+    move-object v2, v1
+
+    check-cast v2, Lk0/m/a;
+    :try_end_c
+    .catch Ljava/lang/ClassCastException; {:try_start_c .. :try_end_c} :catch_7
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_c .. :try_end_c} :catch_8
+
+    goto :goto_1
+
+    :catch_7
+    move-exception v2
+
+    :try_start_d
+    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v0
+
+    new-instance v6, Ljava/lang/ClassCastException;
+
+    new-instance v7, Ljava/lang/StringBuilder;
+
+    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v6, v0}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v6, v2}, Ljava/lang/ClassCastException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v0
+    :try_end_d
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_d .. :try_end_d} :catch_8
+
+    :catch_8
+    :cond_4
+    new-instance v2, Lk0/m/a;
+
+    invoke-direct {v2}, Lk0/m/a;-><init>()V
+
+    :goto_1
+    sput-object v2, Lk0/m/b;->a:Lk0/m/a;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/m/c/a.smali b/com.discord/smali_classes2/k0/m/c/a.smali
new file mode 100644
index 0000000000..a958dacfe2
--- /dev/null
+++ b/com.discord/smali_classes2/k0/m/c/a.smali
@@ -0,0 +1,31 @@
+.class public Lk0/m/c/a;
+.super Lk0/m/a;
+.source "JDK7PlatformImplementations.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/m/a;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, p2}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/n/a$a.smali b/com.discord/smali_classes2/k0/n/a$a.smali
new file mode 100644
index 0000000000..dd07d694e0
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/a$a.smali
@@ -0,0 +1,55 @@
+.class public abstract Lk0/n/a$a;
+.super Lk0/n/a$c;
+.source "FileTreeWalk.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/n/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Ljava/io/File;)V
+    .locals 1
+
+    const-string v0, "rootDir"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lk0/n/a$c;-><init>(Ljava/io/File;)V
+
+    sget-boolean v0, Lk0/i;->a:Z
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p1}, Ljava/io/File;->isDirectory()Z
+
+    move-result p1
+
+    sget-boolean v0, Lk0/i;->a:Z
+
+    if-eqz v0, :cond_1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string v0, "rootDir must be verified to be directory beforehand."
+
+    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/n/a$b$a.smali b/com.discord/smali_classes2/k0/n/a$b$a.smali
new file mode 100644
index 0000000000..76cd6ea5d2
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/a$b$a.smali
@@ -0,0 +1,189 @@
+.class public final Lk0/n/a$b$a;
+.super Lk0/n/a$a;
+.source "FileTreeWalk.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/n/a$b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public b:Z
+
+.field public c:[Ljava/io/File;
+
+.field public d:I
+
+.field public e:Z
+
+.field public final synthetic f:Lk0/n/a$b;
+
+
+# direct methods
+.method public constructor <init>(Lk0/n/a$b;Ljava/io/File;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/io/File;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "rootDir"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lk0/n/a$b$a;->f:Lk0/n/a$b;
+
+    invoke-direct {p0, p2}, Lk0/n/a$a;-><init>(Ljava/io/File;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public step()Ljava/io/File;
+    .locals 8
+
+    iget-boolean v0, p0, Lk0/n/a$b$a;->e:Z
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lk0/n/a$b$a;->c:[Ljava/io/File;
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lk0/n/a$b$a;->f:Lk0/n/a$b;
+
+    iget-object v0, v0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->c:Lkotlin/jvm/functions/Function1;
+
+    if-eqz v0, :cond_0
+
+    iget-object v3, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-interface {v0, v3}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-object v2
+
+    :cond_0
+    iget-object v0, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lk0/n/a$b$a;->c:[Ljava/io/File;
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lk0/n/a$b$a;->f:Lk0/n/a$b;
+
+    iget-object v0, v0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->e:Lkotlin/jvm/functions/Function2;
+
+    if-eqz v0, :cond_1
+
+    iget-object v3, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    new-instance v4, Lkotlin/io/AccessDeniedException;
+
+    iget-object v5, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    const/4 v6, 0x2
+
+    const-string v7, "Cannot list files in a directory"
+
+    invoke-direct {v4, v5, v2, v7, v6}, Lkotlin/io/AccessDeniedException;-><init>(Ljava/io/File;Ljava/io/File;Ljava/lang/String;I)V
+
+    invoke-interface {v0, v3, v4}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/Unit;
+
+    :cond_1
+    iput-boolean v1, p0, Lk0/n/a$b$a;->e:Z
+
+    :cond_2
+    iget-object v0, p0, Lk0/n/a$b$a;->c:[Ljava/io/File;
+
+    if-eqz v0, :cond_3
+
+    iget v3, p0, Lk0/n/a$b$a;->d:I
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    array-length v0, v0
+
+    if-ge v3, v0, :cond_3
+
+    iget-object v0, p0, Lk0/n/a$b$a;->c:[Ljava/io/File;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    iget v1, p0, Lk0/n/a$b$a;->d:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Lk0/n/a$b$a;->d:I
+
+    aget-object v0, v0, v1
+
+    return-object v0
+
+    :cond_3
+    iget-boolean v0, p0, Lk0/n/a$b$a;->b:Z
+
+    if-nez v0, :cond_4
+
+    iput-boolean v1, p0, Lk0/n/a$b$a;->b:Z
+
+    iget-object v0, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    return-object v0
+
+    :cond_4
+    iget-object v0, p0, Lk0/n/a$b$a;->f:Lk0/n/a$b;
+
+    iget-object v0, v0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->d:Lkotlin/jvm/functions/Function1;
+
+    if-eqz v0, :cond_5
+
+    iget-object v1, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/Unit;
+
+    :cond_5
+    return-object v2
+.end method
diff --git a/com.discord/smali_classes2/k0/n/a$b$b.smali b/com.discord/smali_classes2/k0/n/a$b$b.smali
new file mode 100644
index 0000000000..5d7c974f3a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/a$b$b.smali
@@ -0,0 +1,89 @@
+.class public final Lk0/n/a$b$b;
+.super Lk0/n/a$c;
+.source "FileTreeWalk.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/n/a$b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public b:Z
+
+
+# direct methods
+.method public constructor <init>(Lk0/n/a$b;Ljava/io/File;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/io/File;",
+            ")V"
+        }
+    .end annotation
+
+    const-string p1, "rootFile"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p2}, Lk0/n/a$c;-><init>(Ljava/io/File;)V
+
+    sget-boolean p1, Lk0/i;->a:Z
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p2}, Ljava/io/File;->isFile()Z
+
+    move-result p1
+
+    sget-boolean p2, Lk0/i;->a:Z
+
+    if-eqz p2, :cond_1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string p2, "rootFile must be verified to be file beforehand."
+
+    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public step()Ljava/io/File;
+    .locals 1
+
+    iget-boolean v0, p0, Lk0/n/a$b$b;->b:Z
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lk0/n/a$b$b;->b:Z
+
+    iget-object v0, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/n/a$b$c.smali b/com.discord/smali_classes2/k0/n/a$b$c.smali
new file mode 100644
index 0000000000..bb97bc94b6
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/a$b$c.smali
@@ -0,0 +1,215 @@
+.class public final Lk0/n/a$b$c;
+.super Lk0/n/a$a;
+.source "FileTreeWalk.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/n/a$b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public b:Z
+
+.field public c:[Ljava/io/File;
+
+.field public d:I
+
+.field public final synthetic e:Lk0/n/a$b;
+
+
+# direct methods
+.method public constructor <init>(Lk0/n/a$b;Ljava/io/File;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/io/File;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "rootDir"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lk0/n/a$b$c;->e:Lk0/n/a$b;
+
+    invoke-direct {p0, p2}, Lk0/n/a$a;-><init>(Ljava/io/File;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public step()Ljava/io/File;
+    .locals 7
+
+    iget-boolean v0, p0, Lk0/n/a$b$c;->b:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lk0/n/a$b$c;->e:Lk0/n/a$b;
+
+    iget-object v0, v0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->c:Lkotlin/jvm/functions/Function1;
+
+    if-eqz v0, :cond_0
+
+    iget-object v2, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-interface {v0, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-object v1
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lk0/n/a$b$c;->b:Z
+
+    iget-object v0, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    return-object v0
+
+    :cond_1
+    iget-object v0, p0, Lk0/n/a$b$c;->c:[Ljava/io/File;
+
+    if-eqz v0, :cond_4
+
+    iget v2, p0, Lk0/n/a$b$c;->d:I
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    array-length v0, v0
+
+    if-ge v2, v0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    iget-object v0, p0, Lk0/n/a$b$c;->e:Lk0/n/a$b;
+
+    iget-object v0, v0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->d:Lkotlin/jvm/functions/Function1;
+
+    if-eqz v0, :cond_3
+
+    iget-object v2, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-interface {v0, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/Unit;
+
+    :cond_3
+    return-object v1
+
+    :cond_4
+    :goto_0
+    iget-object v0, p0, Lk0/n/a$b$c;->c:[Ljava/io/File;
+
+    if-nez v0, :cond_8
+
+    iget-object v0, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lk0/n/a$b$c;->c:[Ljava/io/File;
+
+    if-nez v0, :cond_5
+
+    iget-object v0, p0, Lk0/n/a$b$c;->e:Lk0/n/a$b;
+
+    iget-object v0, v0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->e:Lkotlin/jvm/functions/Function2;
+
+    if-eqz v0, :cond_5
+
+    iget-object v2, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    new-instance v3, Lkotlin/io/AccessDeniedException;
+
+    iget-object v4, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    const/4 v5, 0x2
+
+    const-string v6, "Cannot list files in a directory"
+
+    invoke-direct {v3, v4, v1, v6, v5}, Lkotlin/io/AccessDeniedException;-><init>(Ljava/io/File;Ljava/io/File;Ljava/lang/String;I)V
+
+    invoke-interface {v0, v2, v3}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/Unit;
+
+    :cond_5
+    iget-object v0, p0, Lk0/n/a$b$c;->c:[Ljava/io/File;
+
+    if-eqz v0, :cond_6
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    array-length v0, v0
+
+    if-nez v0, :cond_8
+
+    :cond_6
+    iget-object v0, p0, Lk0/n/a$b$c;->e:Lk0/n/a$b;
+
+    iget-object v0, v0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->d:Lkotlin/jvm/functions/Function1;
+
+    if-eqz v0, :cond_7
+
+    iget-object v2, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-interface {v0, v2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/Unit;
+
+    :cond_7
+    return-object v1
+
+    :cond_8
+    iget-object v0, p0, Lk0/n/a$b$c;->c:[Ljava/io/File;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    iget v1, p0, Lk0/n/a$b$c;->d:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Lk0/n/a$b$c;->d:I
+
+    aget-object v0, v0, v1
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/n/a$b.smali b/com.discord/smali_classes2/k0/n/a$b.smali
new file mode 100644
index 0000000000..956bbd6bc5
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/a$b.smali
@@ -0,0 +1,245 @@
+.class public final Lk0/n/a$b;
+.super Lk0/j/b;
+.source "FileTreeWalk.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/n/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/n/a$b$a;,
+        Lk0/n/a$b$c;,
+        Lk0/n/a$b$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/j/b<",
+        "Ljava/io/File;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final f:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Lk0/n/a$c;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic g:Lk0/n/a;
+
+
+# direct methods
+.method public constructor <init>(Lk0/n/a;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    invoke-direct {p0}, Lk0/j/b;-><init>()V
+
+    new-instance v0, Ljava/util/ArrayDeque;
+
+    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object v0, p0, Lk0/n/a$b;->f:Ljava/util/ArrayDeque;
+
+    iget-object v0, p1, Lk0/n/a;->a:Ljava/io/File;
+
+    invoke-virtual {v0}, Ljava/io/File;->isDirectory()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/n/a$b;->f:Ljava/util/ArrayDeque;
+
+    iget-object p1, p1, Lk0/n/a;->a:Ljava/io/File;
+
+    invoke-virtual {p0, p1}, Lk0/n/a$b;->b(Ljava/io/File;)Lk0/n/a$a;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->push(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p1, Lk0/n/a;->a:Ljava/io/File;
+
+    invoke-virtual {v0}, Ljava/io/File;->isFile()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lk0/n/a$b;->f:Ljava/util/ArrayDeque;
+
+    new-instance v1, Lk0/n/a$b$b;
+
+    iget-object p1, p1, Lk0/n/a;->a:Ljava/io/File;
+
+    invoke-direct {v1, p0, p1}, Lk0/n/a$b$b;-><init>(Lk0/n/a$b;Ljava/io/File;)V
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->push(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_1
+    sget-object p1, Lk0/j/u;->f:Lk0/j/u;
+
+    iput-object p1, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 3
+
+    :goto_0
+    iget-object v0, p0, Lk0/n/a$b;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->peek()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lk0/n/a$c;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lk0/n/a$c;->step()Ljava/io/File;
+
+    move-result-object v1
+
+    if-nez v1, :cond_0
+
+    iget-object v0, p0, Lk0/n/a$b;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->pop()Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, v0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    invoke-virtual {v1}, Ljava/io/File;->isDirectory()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, p0, Lk0/n/a$b;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->size()I
+
+    move-result v0
+
+    iget-object v2, p0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget v2, v2, Lk0/n/a;->f:I
+
+    if-lt v0, v2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v0, p0, Lk0/n/a$b;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {p0, v1}, Lk0/n/a$b;->b(Ljava/io/File;)Lk0/n/a$a;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->push(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :cond_3
+    :goto_1
+    if-eqz v1, :cond_4
+
+    iput-object v1, p0, Lk0/j/b;->e:Ljava/lang/Object;
+
+    sget-object v0, Lk0/j/u;->d:Lk0/j/u;
+
+    iput-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    goto :goto_2
+
+    :cond_4
+    sget-object v0, Lk0/j/u;->f:Lk0/j/u;
+
+    iput-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    :goto_2
+    return-void
+.end method
+
+.method public final b(Ljava/io/File;)Lk0/n/a$a;
+    .locals 2
+
+    iget-object v0, p0, Lk0/n/a$b;->g:Lk0/n/a;
+
+    iget-object v0, v0, Lk0/n/a;->b:Lk0/n/b;
+
+    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    new-instance v0, Lk0/n/a$b$a;
+
+    invoke-direct {v0, p0, p1}, Lk0/n/a$b$a;-><init>(Lk0/n/a$b;Ljava/io/File;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lkotlin/NoWhenBranchMatchedException;
+
+    invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;-><init>()V
+
+    throw p1
+
+    :cond_1
+    new-instance v0, Lk0/n/a$b$c;
+
+    invoke-direct {v0, p0, p1}, Lk0/n/a$b$c;-><init>(Lk0/n/a$b;Ljava/io/File;)V
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/n/a$c.smali b/com.discord/smali_classes2/k0/n/a$c.smali
new file mode 100644
index 0000000000..ce00625c0e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/a$c.smali
@@ -0,0 +1,39 @@
+.class public abstract Lk0/n/a$c;
+.super Ljava/lang/Object;
+.source "FileTreeWalk.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/n/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/io/File;
+
+
+# direct methods
+.method public constructor <init>(Ljava/io/File;)V
+    .locals 1
+
+    const-string v0, "root"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/n/a$c;->a:Ljava/io/File;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract step()Ljava/io/File;
+.end method
diff --git a/com.discord/smali_classes2/k0/n/a.smali b/com.discord/smali_classes2/k0/n/a.smali
new file mode 100644
index 0000000000..d44c8d8b07
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/a.smali
@@ -0,0 +1,121 @@
+.class public final Lk0/n/a;
+.super Ljava/lang/Object;
+.source "FileTreeWalk.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/n/a$c;,
+        Lk0/n/a$a;,
+        Lk0/n/a$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "Ljava/io/File;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/io/File;
+
+.field public final b:Lk0/n/b;
+
+.field public final c:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/io/File;",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final d:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/io/File;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "Ljava/io/File;",
+            "Ljava/io/IOException;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final f:I
+
+
+# direct methods
+.method public constructor <init>(Ljava/io/File;Lk0/n/b;)V
+    .locals 1
+
+    const-string v0, "start"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "direction"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/n/a;->a:Ljava/io/File;
+
+    iput-object p2, p0, Lk0/n/a;->b:Lk0/n/b;
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lk0/n/a;->c:Lkotlin/jvm/functions/Function1;
+
+    iput-object p1, p0, Lk0/n/a;->d:Lkotlin/jvm/functions/Function1;
+
+    iput-object p1, p0, Lk0/n/a;->e:Lkotlin/jvm/functions/Function2;
+
+    const p1, 0x7fffffff
+
+    iput p1, p0, Lk0/n/a;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "Ljava/io/File;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/n/a$b;
+
+    invoke-direct {v0, p0}, Lk0/n/a$b;-><init>(Lk0/n/a;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/n/b.smali b/com.discord/smali_classes2/k0/n/b.smali
new file mode 100644
index 0000000000..d1f0f4bc98
--- /dev/null
+++ b/com.discord/smali_classes2/k0/n/b.smali
@@ -0,0 +1,100 @@
+.class public final enum Lk0/n/b;
+.super Ljava/lang/Enum;
+.source "FileTreeWalk.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lk0/n/b;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lk0/n/b;
+
+.field public static final enum e:Lk0/n/b;
+
+.field public static final synthetic f:[Lk0/n/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lk0/n/b;
+
+    new-instance v1, Lk0/n/b;
+
+    const-string v2, "TOP_DOWN"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Lk0/n/b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lk0/n/b;->d:Lk0/n/b;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lk0/n/b;
+
+    const-string v2, "BOTTOM_UP"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Lk0/n/b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lk0/n/b;->e:Lk0/n/b;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lk0/n/b;->f:[Lk0/n/b;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lk0/n/b;
+    .locals 1
+
+    const-class v0, Lk0/n/b;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lk0/n/b;
+
+    return-object p0
+.end method
+
+.method public static values()[Lk0/n/b;
+    .locals 1
+
+    sget-object v0, Lk0/n/b;->f:[Lk0/n/b;
+
+    invoke-virtual {v0}, [Lk0/n/b;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lk0/n/b;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/a.smali b/com.discord/smali_classes2/k0/o/a.smali
new file mode 100644
index 0000000000..4f041fbb09
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/a.smali
@@ -0,0 +1,15 @@
+.class public Lk0/o/a;
+.super Ljava/lang/Error;
+.source "KotlinReflectionNotSupportedError.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    const-string v0, "Kotlin reflection implementation is not found at runtime. Make sure you have kotlin-reflect.jar in the classpath"
+
+    invoke-direct {p0, v0}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/o/b/a.smali b/com.discord/smali_classes2/k0/o/b/a.smali
new file mode 100644
index 0000000000..bcb4543cdc
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/a.smali
@@ -0,0 +1,50 @@
+.class public interface abstract Lk0/o/b/a;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "P9:",
+        "Ljava/lang/Object;",
+        "P10:",
+        "Ljava/lang/Object;",
+        "P11:",
+        "Ljava/lang/Object;",
+        "P12:",
+        "Ljava/lang/Object;",
+        "P13:",
+        "Ljava/lang/Object;",
+        "P14:",
+        "Ljava/lang/Object;",
+        "P15:",
+        "Ljava/lang/Object;",
+        "P16:",
+        "Ljava/lang/Object;",
+        "P17:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/b/b.smali b/com.discord/smali_classes2/k0/o/b/b.smali
new file mode 100644
index 0000000000..3631156d3f
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/b.smali
@@ -0,0 +1,52 @@
+.class public interface abstract Lk0/o/b/b;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "P9:",
+        "Ljava/lang/Object;",
+        "P10:",
+        "Ljava/lang/Object;",
+        "P11:",
+        "Ljava/lang/Object;",
+        "P12:",
+        "Ljava/lang/Object;",
+        "P13:",
+        "Ljava/lang/Object;",
+        "P14:",
+        "Ljava/lang/Object;",
+        "P15:",
+        "Ljava/lang/Object;",
+        "P16:",
+        "Ljava/lang/Object;",
+        "P17:",
+        "Ljava/lang/Object;",
+        "P18:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/b/c.smali b/com.discord/smali_classes2/k0/o/b/c.smali
new file mode 100644
index 0000000000..e88f6b0d55
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/c.smali
@@ -0,0 +1,54 @@
+.class public interface abstract Lk0/o/b/c;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "P9:",
+        "Ljava/lang/Object;",
+        "P10:",
+        "Ljava/lang/Object;",
+        "P11:",
+        "Ljava/lang/Object;",
+        "P12:",
+        "Ljava/lang/Object;",
+        "P13:",
+        "Ljava/lang/Object;",
+        "P14:",
+        "Ljava/lang/Object;",
+        "P15:",
+        "Ljava/lang/Object;",
+        "P16:",
+        "Ljava/lang/Object;",
+        "P17:",
+        "Ljava/lang/Object;",
+        "P18:",
+        "Ljava/lang/Object;",
+        "P19:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/b/d.smali b/com.discord/smali_classes2/k0/o/b/d.smali
new file mode 100644
index 0000000000..184dadf477
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/d.smali
@@ -0,0 +1,56 @@
+.class public interface abstract Lk0/o/b/d;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "P9:",
+        "Ljava/lang/Object;",
+        "P10:",
+        "Ljava/lang/Object;",
+        "P11:",
+        "Ljava/lang/Object;",
+        "P12:",
+        "Ljava/lang/Object;",
+        "P13:",
+        "Ljava/lang/Object;",
+        "P14:",
+        "Ljava/lang/Object;",
+        "P15:",
+        "Ljava/lang/Object;",
+        "P16:",
+        "Ljava/lang/Object;",
+        "P17:",
+        "Ljava/lang/Object;",
+        "P18:",
+        "Ljava/lang/Object;",
+        "P19:",
+        "Ljava/lang/Object;",
+        "P20:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/b/e.smali b/com.discord/smali_classes2/k0/o/b/e.smali
new file mode 100644
index 0000000000..50350b3c74
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/e.smali
@@ -0,0 +1,58 @@
+.class public interface abstract Lk0/o/b/e;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "P9:",
+        "Ljava/lang/Object;",
+        "P10:",
+        "Ljava/lang/Object;",
+        "P11:",
+        "Ljava/lang/Object;",
+        "P12:",
+        "Ljava/lang/Object;",
+        "P13:",
+        "Ljava/lang/Object;",
+        "P14:",
+        "Ljava/lang/Object;",
+        "P15:",
+        "Ljava/lang/Object;",
+        "P16:",
+        "Ljava/lang/Object;",
+        "P17:",
+        "Ljava/lang/Object;",
+        "P18:",
+        "Ljava/lang/Object;",
+        "P19:",
+        "Ljava/lang/Object;",
+        "P20:",
+        "Ljava/lang/Object;",
+        "P21:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/b/f.smali b/com.discord/smali_classes2/k0/o/b/f.smali
new file mode 100644
index 0000000000..14417e8dc0
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/f.smali
@@ -0,0 +1,60 @@
+.class public interface abstract Lk0/o/b/f;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "P9:",
+        "Ljava/lang/Object;",
+        "P10:",
+        "Ljava/lang/Object;",
+        "P11:",
+        "Ljava/lang/Object;",
+        "P12:",
+        "Ljava/lang/Object;",
+        "P13:",
+        "Ljava/lang/Object;",
+        "P14:",
+        "Ljava/lang/Object;",
+        "P15:",
+        "Ljava/lang/Object;",
+        "P16:",
+        "Ljava/lang/Object;",
+        "P17:",
+        "Ljava/lang/Object;",
+        "P18:",
+        "Ljava/lang/Object;",
+        "P19:",
+        "Ljava/lang/Object;",
+        "P20:",
+        "Ljava/lang/Object;",
+        "P21:",
+        "Ljava/lang/Object;",
+        "P22:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/b/g.smali b/com.discord/smali_classes2/k0/o/b/g.smali
new file mode 100644
index 0000000000..367722a1ff
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/g.smali
@@ -0,0 +1,32 @@
+.class public interface abstract Lk0/o/b/g;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/b/h.smali b/com.discord/smali_classes2/k0/o/b/h.smali
new file mode 100644
index 0000000000..12b2a5aaba
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/b/h.smali
@@ -0,0 +1,34 @@
+.class public interface abstract Lk0/o/b/h;
+.super Ljava/lang/Object;
+.source "Functions.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<P1:",
+        "Ljava/lang/Object;",
+        "P2:",
+        "Ljava/lang/Object;",
+        "P3:",
+        "Ljava/lang/Object;",
+        "P4:",
+        "Ljava/lang/Object;",
+        "P5:",
+        "Ljava/lang/Object;",
+        "P6:",
+        "Ljava/lang/Object;",
+        "P7:",
+        "Ljava/lang/Object;",
+        "P8:",
+        "Ljava/lang/Object;",
+        "P9:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/o/c/a.smali b/com.discord/smali_classes2/k0/o/c/a.smali
new file mode 100644
index 0000000000..b8a7b5b71f
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/a.smali
@@ -0,0 +1,133 @@
+.class public final Lk0/o/c/a;
+.super Ljava/lang/Object;
+.source "ArrayIterator.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public final e:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>([Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TT;)V"
+        }
+    .end annotation
+
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/o/c/a;->e:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public hasNext()Z
+    .locals 2
+
+    iget v0, p0, Lk0/o/c/a;->d:I
+
+    iget-object v1, p0, Lk0/o/c/a;->e:[Ljava/lang/Object;
+
+    array-length v1, v1
+
+    if-ge v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lk0/o/c/a;->e:[Ljava/lang/Object;
+
+    iget v1, p0, Lk0/o/c/a;->d:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Lk0/o/c/a;->d:I
+
+    aget-object v0, v0, v1
+    :try_end_0
+    .catch Ljava/lang/ArrayIndexOutOfBoundsException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    iget v1, p0, Lk0/o/c/a;->d:I
+
+    add-int/lit8 v1, v1, -0x1
+
+    iput v1, p0, Lk0/o/c/a;->d:I
+
+    new-instance v1, Ljava/util/NoSuchElementException;
+
+    invoke-virtual {v0}, Ljava/lang/ArrayIndexOutOfBoundsException;->getMessage()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/b$a.smali b/com.discord/smali_classes2/k0/o/c/b$a.smali
new file mode 100644
index 0000000000..98d178ba36
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/b$a.smali
@@ -0,0 +1,56 @@
+.class public Lk0/o/c/b$a;
+.super Ljava/lang/Object;
+.source "CallableReference.java"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/o/c/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/o/c/b$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/o/c/b$a;
+
+    invoke-direct {v0}, Lk0/o/c/b$a;-><init>()V
+
+    sput-object v0, Lk0/o/c/b$a;->d:Lk0/o/c/b$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method private readResolve()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/ObjectStreamException;
+        }
+    .end annotation
+
+    sget-object v0, Lk0/o/c/b$a;->d:Lk0/o/c/b$a;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/b.smali b/com.discord/smali_classes2/k0/o/c/b.smali
new file mode 100644
index 0000000000..4d560a7238
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/b.smali
@@ -0,0 +1,376 @@
+.class public abstract Lk0/o/c/b;
+.super Ljava/lang/Object;
+.source "CallableReference.java"
+
+# interfaces
+.implements Lkotlin/reflect/KCallable;
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/o/c/b$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final NO_RECEIVER:Ljava/lang/Object;
+
+
+# instance fields
+.field public final isTopLevel:Z
+
+.field public final name:Ljava/lang/String;
+
+.field public final owner:Ljava/lang/Class;
+
+.field public final receiver:Ljava/lang/Object;
+
+.field public transient reflected:Lkotlin/reflect/KCallable;
+
+.field public final signature:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Lk0/o/c/b$a;->d:Lk0/o/c/b$a;
+
+    sput-object v0, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    sget-object v0, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    invoke-direct {p0, v0}, Lk0/o/c/b;-><init>(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 6
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/b;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    iput-object p2, p0, Lk0/o/c/b;->owner:Ljava/lang/Class;
+
+    iput-object p3, p0, Lk0/o/c/b;->name:Ljava/lang/String;
+
+    iput-object p4, p0, Lk0/o/c/b;->signature:Ljava/lang/String;
+
+    iput-boolean p5, p0, Lk0/o/c/b;->isTopLevel:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0, p1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public callBy(Ljava/util/Map;)Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0, p1}, Lkotlin/reflect/KCallable;->callBy(Ljava/util/Map;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public compute()Lkotlin/reflect/KCallable;
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->reflected:Lkotlin/reflect/KCallable;
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Lk0/o/c/b;->computeReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lk0/o/c/b;->reflected:Lkotlin/reflect/KCallable;
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public abstract computeReflected()Lkotlin/reflect/KCallable;
+.end method
+
+.method public getAnnotations()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/annotation/Annotation;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lk0/s/a;->getAnnotations()Ljava/util/List;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getBoundReceiver()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->receiver:Ljava/lang/Object;
+
+    return-object v0
+.end method
+
+.method public getName()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->name:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 3
+
+    iget-object v0, p0, Lk0/o/c/b;->owner:Ljava/lang/Class;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-boolean v2, p0, Lk0/o/c/b;->isTopLevel:Z
+
+    if-eqz v2, :cond_2
+
+    sget-object v2, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    if-eqz v2, :cond_1
+
+    new-instance v1, Lk0/o/c/p;
+
+    const-string v2, ""
+
+    invoke-direct {v1, v0, v2}, Lk0/o/c/p;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_1
+    throw v1
+
+    :cond_2
+    invoke-static {v0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v1
+
+    :goto_0
+    return-object v1
+.end method
+
+.method public getParameters()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getParameters()Ljava/util/List;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getReflected()Lkotlin/reflect/KCallable;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->compute()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    if-eq v0, p0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Lk0/o/a;
+
+    invoke-direct {v0}, Lk0/o/a;-><init>()V
+
+    throw v0
+.end method
+
+.method public getReturnType()Lkotlin/reflect/KType;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getReturnType()Lkotlin/reflect/KType;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getSignature()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/b;->signature:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public getTypeParameters()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getTypeParameters()Ljava/util/List;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getVisibility()Lkotlin/reflect/KVisibility;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->getVisibility()Lkotlin/reflect/KVisibility;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public isAbstract()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isAbstract()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isFinal()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isFinal()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isOpen()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isOpen()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isSuspend()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KCallable;->isSuspend()Z
+
+    move-result v0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/c.smali b/com.discord/smali_classes2/k0/o/c/c.smali
new file mode 100644
index 0000000000..91b86cc38b
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/c.smali
@@ -0,0 +1,18 @@
+.class public interface abstract Lk0/o/c/c;
+.super Ljava/lang/Object;
+.source "ClassBasedDeclarationContainer.kt"
+
+# interfaces
+.implements Lkotlin/reflect/KDeclarationContainer;
+
+
+# virtual methods
+.method public abstract getJClass()Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/d.smali b/com.discord/smali_classes2/k0/o/c/d.smali
new file mode 100644
index 0000000000..9f44b58471
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/d.smali
@@ -0,0 +1,828 @@
+.class public final Lk0/o/c/d;
+.super Ljava/lang/Object;
+.source "ClassReference.kt"
+
+# interfaces
+.implements Lk0/s/b;
+.implements Lk0/o/c/c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lk0/s/b<",
+        "Ljava/lang/Object;",
+        ">;",
+        "Lk0/o/c/c;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final e:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Class<",
+            "+",
+            "Ljava/lang/Object<",
+            "*>;>;",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final f:Ljava/util/HashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/HashMap<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final g:Ljava/util/HashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/HashMap<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final h:Ljava/util/HashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/HashMap<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public final d:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 12
+
+    const/16 v0, 0x17
+
+    new-array v0, v0, [Ljava/lang/Class;
+
+    const-class v1, Lkotlin/jvm/functions/Function0;
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    const-class v1, Lkotlin/jvm/functions/Function1;
+
+    const/4 v3, 0x1
+
+    aput-object v1, v0, v3
+
+    const-class v1, Lkotlin/jvm/functions/Function2;
+
+    const/4 v3, 0x2
+
+    aput-object v1, v0, v3
+
+    const/4 v1, 0x3
+
+    const-class v4, Lkotlin/jvm/functions/Function3;
+
+    aput-object v4, v0, v1
+
+    const/4 v1, 0x4
+
+    const-class v4, Lkotlin/jvm/functions/Function4;
+
+    aput-object v4, v0, v1
+
+    const/4 v1, 0x5
+
+    const-class v4, Lkotlin/jvm/functions/Function5;
+
+    aput-object v4, v0, v1
+
+    const/4 v1, 0x6
+
+    const-class v4, Lkotlin/jvm/functions/Function6;
+
+    aput-object v4, v0, v1
+
+    const/4 v1, 0x7
+
+    const-class v4, Lkotlin/jvm/functions/Function7;
+
+    aput-object v4, v0, v1
+
+    const/16 v1, 0x8
+
+    const-class v4, Lk0/o/b/g;
+
+    aput-object v4, v0, v1
+
+    const/16 v1, 0x9
+
+    const-class v4, Lk0/o/b/h;
+
+    aput-object v4, v0, v1
+
+    const-class v1, Lkotlin/jvm/functions/Function10;
+
+    const/16 v4, 0xa
+
+    aput-object v1, v0, v4
+
+    const/16 v1, 0xb
+
+    const-class v5, Lkotlin/jvm/functions/Function11;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0xc
+
+    const-class v5, Lkotlin/jvm/functions/Function12;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0xd
+
+    const-class v5, Lkotlin/jvm/functions/Function13;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0xe
+
+    const-class v5, Lkotlin/jvm/functions/Function14;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0xf
+
+    const-class v5, Lkotlin/jvm/functions/Function15;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0x10
+
+    const-class v5, Lkotlin/jvm/functions/Function16;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0x11
+
+    const-class v5, Lk0/o/b/a;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0x12
+
+    const-class v5, Lk0/o/b/b;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0x13
+
+    const-class v5, Lk0/o/b/c;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0x14
+
+    const-class v5, Lk0/o/b/d;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0x15
+
+    const-class v5, Lk0/o/b/e;
+
+    aput-object v5, v0, v1
+
+    const/16 v1, 0x16
+
+    const-class v5, Lk0/o/b/f;
+
+    aput-object v5, v0, v1
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-static {v0, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v4
+
+    invoke-direct {v1, v4}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    const/4 v5, 0x0
+
+    if-eqz v4, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    add-int/lit8 v6, v2, 0x1
+
+    if-ltz v2, :cond_0
+
+    check-cast v4, Ljava/lang/Class;
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    new-instance v5, Lkotlin/Pair;
+
+    invoke-direct {v5, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    invoke-interface {v1, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    move v2, v6
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
+
+    throw v5
+
+    :cond_1
+    invoke-static {v1}, Lf/n/a/k/a;->toMap(Ljava/lang/Iterable;)Ljava/util/Map;
+
+    move-result-object v0
+
+    sput-object v0, Lk0/o/c/d;->e:Ljava/util/Map;
+
+    new-instance v0, Ljava/util/HashMap;
+
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+
+    const-string v1, "boolean"
+
+    const-string v2, "kotlin.Boolean"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "char"
+
+    const-string v4, "kotlin.Char"
+
+    invoke-virtual {v0, v1, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "byte"
+
+    const-string v6, "kotlin.Byte"
+
+    invoke-virtual {v0, v1, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "short"
+
+    const-string v7, "kotlin.Short"
+
+    invoke-virtual {v0, v1, v7}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "int"
+
+    const-string v8, "kotlin.Int"
+
+    invoke-virtual {v0, v1, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "float"
+
+    const-string v9, "kotlin.Float"
+
+    invoke-virtual {v0, v1, v9}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "long"
+
+    const-string v10, "kotlin.Long"
+
+    invoke-virtual {v0, v1, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "double"
+
+    const-string v11, "kotlin.Double"
+
+    invoke-virtual {v0, v1, v11}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    sput-object v0, Lk0/o/c/d;->f:Ljava/util/HashMap;
+
+    new-instance v0, Ljava/util/HashMap;
+
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+
+    const-string v1, "java.lang.Boolean"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Character"
+
+    invoke-virtual {v0, v1, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Byte"
+
+    invoke-virtual {v0, v1, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Short"
+
+    invoke-virtual {v0, v1, v7}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Integer"
+
+    invoke-virtual {v0, v1, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Float"
+
+    invoke-virtual {v0, v1, v9}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Long"
+
+    invoke-virtual {v0, v1, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Double"
+
+    invoke-virtual {v0, v1, v11}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    sput-object v0, Lk0/o/c/d;->g:Ljava/util/HashMap;
+
+    new-instance v0, Ljava/util/HashMap;
+
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+
+    const-string v1, "java.lang.Object"
+
+    const-string v2, "kotlin.Any"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.String"
+
+    const-string v2, "kotlin.String"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.CharSequence"
+
+    const-string v2, "kotlin.CharSequence"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Throwable"
+
+    const-string v2, "kotlin.Throwable"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Cloneable"
+
+    const-string v2, "kotlin.Cloneable"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Number"
+
+    const-string v2, "kotlin.Number"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Comparable"
+
+    const-string v2, "kotlin.Comparable"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Enum"
+
+    const-string v2, "kotlin.Enum"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.annotation.Annotation"
+
+    const-string v2, "kotlin.Annotation"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.lang.Iterable"
+
+    const-string v2, "kotlin.collections.Iterable"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.util.Iterator"
+
+    const-string v2, "kotlin.collections.Iterator"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.util.Collection"
+
+    const-string v2, "kotlin.collections.Collection"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.util.List"
+
+    const-string v2, "kotlin.collections.List"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.util.Set"
+
+    const-string v2, "kotlin.collections.Set"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.util.ListIterator"
+
+    const-string v2, "kotlin.collections.ListIterator"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.util.Map"
+
+    const-string v2, "kotlin.collections.Map"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "java.util.Map$Entry"
+
+    const-string v2, "kotlin.collections.Map.Entry"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "kotlin.jvm.internal.StringCompanionObject"
+
+    const-string v2, "kotlin.String.Companion"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    const-string v1, "kotlin.jvm.internal.EnumCompanionObject"
+
+    const-string v2, "kotlin.Enum.Companion"
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    sget-object v1, Lk0/o/c/d;->f:Ljava/util/HashMap;
+
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
+
+    sget-object v1, Lk0/o/c/d;->g:Ljava/util/HashMap;
+
+    invoke-virtual {v0, v1}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
+
+    sget-object v1, Lk0/o/c/d;->f:Ljava/util/HashMap;
+
+    invoke-virtual {v1}, Ljava/util/HashMap;->values()Ljava/util/Collection;
+
+    move-result-object v1
+
+    const-string v2, "primitiveFqNames.values"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_1
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    const/16 v4, 0x2e
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    new-instance v6, Ljava/lang/StringBuilder;
+
+    invoke-direct {v6}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v7, "kotlin.jvm.internal."
+
+    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v7, "kotlinName"
+
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2, v4, v5, v3}, Lk0/u/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, "CompanionObject"
+
+    invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v6, ".Companion"
+
+    invoke-static {v2, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    new-instance v6, Lkotlin/Pair;
+
+    invoke-direct {v6, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    iget-object v2, v6, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    iget-object v4, v6, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    invoke-interface {v0, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_1
+
+    :cond_2
+    sget-object v1, Lk0/o/c/d;->e:Ljava/util/Map;
+
+    invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_2
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/util/Map$Entry;
+
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Ljava/lang/Class;
+
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/Number;
+
+    invoke-virtual {v2}, Ljava/lang/Number;->intValue()I
+
+    move-result v2
+
+    invoke-virtual {v6}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v6
+
+    new-instance v7, Ljava/lang/StringBuilder;
+
+    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v8, "kotlin.Function"
+
+    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v6, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_2
+
+    :cond_3
+    sput-object v0, Lk0/o/c/d;->h:Ljava/util/HashMap;
+
+    new-instance v1, Ljava/util/LinkedHashMap;
+
+    invoke-interface {v0}, Ljava/util/Map;->size()I
+
+    move-result v2
+
+    invoke-static {v2}, Lf/n/a/k/a;->mapCapacity(I)I
+
+    move-result v2
+
+    invoke-direct {v1, v2}, Ljava/util/LinkedHashMap;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_3
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_4
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/util/Map$Entry;
+
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v6
+
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    invoke-static {v2, v4, v5, v3}, Lk0/u/p;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-interface {v1, v6, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_3
+
+    :cond_4
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)V"
+        }
+    .end annotation
+
+    const-string v0, "jClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/o/c/d;->d:Ljava/lang/Class;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Lk0/o/c/d;
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0}, Lf/n/a/k/a;->getJavaObjectType(Lk0/s/b;)Ljava/lang/Class;
+
+    move-result-object v0
+
+    check-cast p1, Lk0/s/b;
+
+    invoke-static {p1}, Lf/n/a/k/a;->getJavaObjectType(Lk0/s/b;)Ljava/lang/Class;
+
+    move-result-object p1
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public getAnnotations()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/annotation/Annotation;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/o/a;
+
+    invoke-direct {v0}, Lk0/o/a;-><init>()V
+
+    throw v0
+.end method
+
+.method public getJClass()Ljava/lang/Class;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/o/c/d;->d:Ljava/lang/Class;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    invoke-static {p0}, Lf/n/a/k/a;->getJavaObjectType(Lk0/s/b;)Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Class;->hashCode()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lk0/o/c/d;->d:Ljava/lang/Class;
+
+    invoke-virtual {v1}, Ljava/lang/Class;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " (Kotlin reflection is not available)"
+
+    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_classes2/k0/o/c/e.smali b/com.discord/smali_classes2/k0/o/c/e.smali
new file mode 100644
index 0000000000..a15bc3b069
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/e.smali
@@ -0,0 +1,335 @@
+.class public final Lk0/o/c/e;
+.super Ljava/lang/Object;
+.source "CollectionToArray.kt"
+
+
+# static fields
+.field public static final a:[Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    sput-object v0, Lk0/o/c/e;->a:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public static final toArray(Ljava/util/Collection;)[Ljava/lang/Object;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)[",
+            "Ljava/lang/Object;"
+        }
+    .end annotation
+
+    const-string v0, "collection"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/Collection;->size()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    :goto_0
+    sget-object p0, Lk0/o/c/e;->a:[Ljava/lang/Object;
+
+    goto :goto_3
+
+    :cond_1
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const/4 v1, 0x0
+
+    :goto_1
+    add-int/lit8 v2, v1, 0x1
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    aput-object v3, v0, v1
+
+    array-length v1, v0
+
+    if-lt v2, v1, :cond_5
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    move-object p0, v0
+
+    goto :goto_3
+
+    :cond_2
+    mul-int/lit8 v1, v2, 0x3
+
+    add-int/lit8 v1, v1, 0x1
+
+    ushr-int/lit8 v1, v1, 0x1
+
+    const v3, 0x7ffffffd
+
+    if-gt v1, v2, :cond_4
+
+    if-ge v2, v3, :cond_3
+
+    const v1, 0x7ffffffd
+
+    goto :goto_2
+
+    :cond_3
+    new-instance p0, Ljava/lang/OutOfMemoryError;
+
+    invoke-direct {p0}, Ljava/lang/OutOfMemoryError;-><init>()V
+
+    throw p0
+
+    :cond_4
+    :goto_2
+    invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v1, "Arrays.copyOf(result, newSize)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_4
+
+    :cond_5
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-nez v1, :cond_6
+
+    invoke-static {v0, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p0
+
+    const-string v0, "Arrays.copyOf(result, size)"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_3
+    return-object p0
+
+    :cond_6
+    :goto_4
+    move v1, v2
+
+    goto :goto_1
+.end method
+
+.method public static final toArray(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;[",
+            "Ljava/lang/Object;",
+            ")[",
+            "Ljava/lang/Object;"
+        }
+    .end annotation
+
+    const-string v0, "collection"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_b
+
+    invoke-interface {p0}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    array-length p0, p1
+
+    if-lez p0, :cond_8
+
+    aput-object v0, p1, v2
+
+    goto/16 :goto_2
+
+    :cond_0
+    invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-nez v3, :cond_1
+
+    array-length p0, p1
+
+    if-lez p0, :cond_8
+
+    aput-object v0, p1, v2
+
+    goto :goto_2
+
+    :cond_1
+    array-length v3, p1
+
+    if-gt v1, v3, :cond_2
+
+    move-object v1, p1
+
+    goto :goto_0
+
+    :cond_2
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object v3
+
+    invoke-static {v3, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_a
+
+    check-cast v1, [Ljava/lang/Object;
+
+    :goto_0
+    add-int/lit8 v3, v2, 0x1
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    aput-object v4, v1, v2
+
+    array-length v2, v1
+
+    if-lt v3, v2, :cond_6
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-nez v2, :cond_3
+
+    move-object p1, v1
+
+    goto :goto_2
+
+    :cond_3
+    mul-int/lit8 v2, v3, 0x3
+
+    add-int/lit8 v2, v2, 0x1
+
+    ushr-int/lit8 v2, v2, 0x1
+
+    const v4, 0x7ffffffd
+
+    if-gt v2, v3, :cond_5
+
+    if-ge v3, v4, :cond_4
+
+    const v2, 0x7ffffffd
+
+    goto :goto_1
+
+    :cond_4
+    new-instance p0, Ljava/lang/OutOfMemoryError;
+
+    invoke-direct {p0}, Ljava/lang/OutOfMemoryError;-><init>()V
+
+    throw p0
+
+    :cond_5
+    :goto_1
+    invoke-static {v1, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v1
+
+    const-string v2, "Arrays.copyOf(result, newSize)"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_3
+
+    :cond_6
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-nez v2, :cond_9
+
+    if-ne v1, p1, :cond_7
+
+    aput-object v0, p1, v3
+
+    goto :goto_2
+
+    :cond_7
+    invoke-static {v1, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    const-string p0, "Arrays.copyOf(result, size)"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_8
+    :goto_2
+    return-object p1
+
+    :cond_9
+    :goto_3
+    move v2, v3
+
+    goto :goto_0
+
+    :cond_a
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    const-string p1, "null cannot be cast to non-null type kotlin.Array<kotlin.Any?>"
+
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_b
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/f.smali b/com.discord/smali_classes2/k0/o/c/f.smali
new file mode 100644
index 0000000000..4c71322032
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/f.smali
@@ -0,0 +1,21 @@
+.class public interface abstract Lk0/o/c/f;
+.super Ljava/lang/Object;
+.source "FunctionBase.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract getArity()I
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/g.smali b/com.discord/smali_classes2/k0/o/c/g.smali
new file mode 100644
index 0000000000..2bbbc7fdf7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/g.smali
@@ -0,0 +1,436 @@
+.class public Lk0/o/c/g;
+.super Lk0/o/c/b;
+.source "FunctionReference.java"
+
+# interfaces
+.implements Lk0/o/c/f;
+.implements Lkotlin/reflect/KFunction;
+
+
+# instance fields
+.field public final arity:I
+
+.field public final flags:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 7
+
+    sget-object v2, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move v1, p1
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/g;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(ILjava/lang/Object;)V
+    .locals 7
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move-object v2, p2
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/g;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 8
+
+    and-int/lit8 v0, p6, 0x1
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v7, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    const/4 v7, 0x0
+
+    :goto_0
+    move-object v2, p0
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    invoke-direct/range {v2 .. v7}, Lk0/o/c/b;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V
+
+    iput p1, p0, Lk0/o/c/g;->arity:I
+
+    shr-int/lit8 p1, p6, 0x1
+
+    iput p1, p0, Lk0/o/c/g;->flags:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public computeReflected()Lkotlin/reflect/KCallable;
+    .locals 1
+
+    sget-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    if-eqz v0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lk0/o/c/g;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lk0/o/c/g;
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+
+    move-result-object v3
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getSignature()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getSignature()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget v1, p0, Lk0/o/c/g;->flags:I
+
+    iget v3, p1, Lk0/o/c/g;->flags:I
+
+    if-ne v1, v3, :cond_1
+
+    iget v1, p0, Lk0/o/c/g;->arity:I
+
+    iget v3, p1, Lk0/o/c/g;->arity:I
+
+    if-ne v1, v3, :cond_1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getBoundReceiver()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getBoundReceiver()Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+
+    :cond_2
+    instance-of v0, p1, Lkotlin/reflect/KFunction;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p0}, Lk0/o/c/b;->compute()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_3
+    return v2
+.end method
+
+.method public getArity()I
+    .locals 1
+
+    iget v0, p0, Lk0/o/c/g;->arity:I
+
+    return v0
+.end method
+
+.method public bridge synthetic getReflected()Lkotlin/reflect/KCallable;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/g;->getReflected()Lkotlin/reflect/KFunction;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getReflected()Lkotlin/reflect/KFunction;
+    .locals 1
+
+    invoke-super {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KFunction;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Lk0/o/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    :goto_0
+    invoke-virtual {p0}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getSignature()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public isExternal()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/g;->getReflected()Lkotlin/reflect/KFunction;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isExternal()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isInfix()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/g;->getReflected()Lkotlin/reflect/KFunction;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isInfix()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isInline()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/g;->getReflected()Lkotlin/reflect/KFunction;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isInline()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isOperator()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/g;->getReflected()Lkotlin/reflect/KFunction;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isOperator()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isSuspend()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/g;->getReflected()Lkotlin/reflect/KFunction;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KFunction;->isSuspend()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/o/c/b;->compute()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    if-eq v0, p0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-virtual {p0}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "<init>"
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const-string v0, "constructor (Kotlin reflection is not available)"
+
+    goto :goto_0
+
+    :cond_1
+    const-string v0, "function "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " (Kotlin reflection is not available)"
+
+    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
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/h.smali b/com.discord/smali_classes2/k0/o/c/h.smali
new file mode 100644
index 0000000000..7852891013
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/h.smali
@@ -0,0 +1,65 @@
+.class public Lk0/o/c/h;
+.super Lk0/o/c/g;
+.source "FunctionReferenceImpl.java"
+
+
+# direct methods
+.method public constructor <init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 7
+
+    sget-object v2, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move v6, p5
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/g;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p6}, Lk0/o/c/g;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(ILkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 7
+
+    sget-object v2, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    move-object v0, p2
+
+    check-cast v0, Lk0/o/c/c;
+
+    invoke-interface {v0}, Lk0/o/c/c;->getJClass()Ljava/lang/Class;
+
+    move-result-object v3
+
+    instance-of p2, p2, Lk0/s/b;
+
+    xor-int/lit8 v6, p2, 0x1
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    invoke-direct/range {v0 .. v6}, Lk0/o/c/g;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/i.smali b/com.discord/smali_classes2/k0/o/c/i.smali
new file mode 100644
index 0000000000..7926438a88
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/i.smali
@@ -0,0 +1,361 @@
+.class public Lk0/o/c/i;
+.super Ljava/lang/Object;
+.source "Intrinsics.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static a(Ljava/lang/String;)Ljava/lang/String;
+    .locals 4
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->getStackTrace()[Ljava/lang/StackTraceElement;
+
+    move-result-object v0
+
+    const/4 v1, 0x4
+
+    aget-object v0, v0, v1
+
+    invoke-virtual {v0}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Ljava/lang/StackTraceElement;->getMethodName()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v3, "Parameter specified as non-null is null: method "
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "."
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, ", parameter "
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    .locals 0
+
+    if-nez p0, :cond_1
+
+    if-nez p1, :cond_0
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Throwable;",
+            ">(TT;)TT;"
+        }
+    .end annotation
+
+    const-class v0, Lk0/o/c/i;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->c(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Throwable;
+
+    return-object p0
+.end method
+
+.method public static c(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Throwable;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Throwable;",
+            ">(TT;",
+            "Ljava/lang/String;",
+            ")TT;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
+
+    move-result-object v0
+
+    array-length v1, v0
+
+    const/4 v2, -0x1
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_1
+
+    aget-object v4, v0, v3
+
+    invoke-virtual {v4}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {p1, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    move v2, v3
+
+    :cond_0
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    add-int/lit8 v2, v2, 0x1
+
+    invoke-static {v0, v2, v1}, Ljava/util/Arrays;->copyOfRange([Ljava/lang/Object;II)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ljava/lang/StackTraceElement;
+
+    invoke-virtual {p0, p1}, Ljava/lang/Throwable;->setStackTrace([Ljava/lang/StackTraceElement;)V
+
+    return-object p0
+.end method
+
+.method public static checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    .locals 1
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    const-string v0, " must not be null"
+
+    invoke-static {p1, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    invoke-static {p0}, Lk0/o/c/i;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static checkNotNull(Ljava/lang/Object;)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    invoke-direct {p0}, Ljava/lang/NullPointerException;-><init>()V
+
+    invoke-static {p0}, Lk0/o/c/i;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    .locals 1
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    const-string v0, " must not be null"
+
+    invoke-static {p1, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    invoke-static {p0}, Lk0/o/c/i;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    invoke-static {p1}, Lk0/o/c/i;->a(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    invoke-static {p0}, Lk0/o/c/i;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    .locals 0
+
+    if-eqz p0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    invoke-static {p1}, Lk0/o/c/i;->a(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    invoke-static {p0}, Lk0/o/c/i;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static compare(II)I
+    .locals 0
+
+    if-ge p0, p1, :cond_0
+
+    const/4 p0, -0x1
+
+    goto :goto_0
+
+    :cond_0
+    if-ne p0, p1, :cond_1
+
+    const/4 p0, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p0, 0x1
+
+    :goto_0
+    return p0
+.end method
+
+.method public static reifiedOperationMarker()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "This function has a reified type parameter and thus can only be inlined at compilation time, not called directly."
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
+    .locals 1
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static throwNpe()V
+    .locals 1
+
+    new-instance v0, Lkotlin/KotlinNullPointerException;
+
+    invoke-direct {v0}, Lkotlin/KotlinNullPointerException;-><init>()V
+
+    invoke-static {v0}, Lk0/o/c/i;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    check-cast v0, Lkotlin/KotlinNullPointerException;
+
+    throw v0
+.end method
+
+.method public static throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    .locals 2
+
+    const-string v0, "lateinit property "
+
+    const-string v1, " has not been initialized"
+
+    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance v0, Lkotlin/UninitializedPropertyAccessException;
+
+    invoke-direct {v0, p0}, Lkotlin/UninitializedPropertyAccessException;-><init>(Ljava/lang/String;)V
+
+    invoke-static {v0}, Lk0/o/c/i;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/j.smali b/com.discord/smali_classes2/k0/o/c/j.smali
new file mode 100644
index 0000000000..d2e5e883ac
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/j.smali
@@ -0,0 +1,63 @@
+.class public abstract Lk0/o/c/j;
+.super Ljava/lang/Object;
+.source "Lambda.kt"
+
+# interfaces
+.implements Lk0/o/c/f;
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lk0/o/c/f<",
+        "TR;>;",
+        "Ljava/io/Serializable;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final arity:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lk0/o/c/j;->arity:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getArity()I
+    .locals 1
+
+    iget v0, p0, Lk0/o/c/j;->arity:I
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    sget-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    invoke-virtual {v0, p0}, Lk0/o/c/u;->renderLambdaToString(Lk0/o/c/f;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "Reflection.renderLambdaToString(this)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/k.smali b/com.discord/smali_classes2/k0/o/c/k.smali
new file mode 100644
index 0000000000..e25748521a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/k.smali
@@ -0,0 +1,120 @@
+.class public abstract Lk0/o/c/k;
+.super Lk0/o/c/o;
+.source "MutablePropertyReference0.java"
+
+# interfaces
+.implements Lkotlin/reflect/KMutableProperty0;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/o/c/o;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lk0/o/c/o;-><init>(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p5}, Lk0/o/c/o;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public computeReflected()Lkotlin/reflect/KCallable;
+    .locals 0
+
+    invoke-static {p0}, Lk0/o/c/t;->mutableProperty0(Lk0/o/c/k;)Lkotlin/reflect/KMutableProperty0;
+
+    return-object p0
+.end method
+
+.method public getDelegate()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KMutableProperty0;
+
+    invoke-interface {v0}, Lkotlin/reflect/KProperty0;->getDelegate()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic getGetter()Lkotlin/reflect/KProperty$Getter;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/k;->getGetter()Lkotlin/reflect/KProperty0$Getter;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getGetter()Lkotlin/reflect/KProperty0$Getter;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KMutableProperty0;
+
+    invoke-interface {v0}, Lkotlin/reflect/KProperty0;->getGetter()Lkotlin/reflect/KProperty0$Getter;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public bridge synthetic getSetter()Lkotlin/reflect/KMutableProperty$Setter;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/k;->getSetter()Lkotlin/reflect/KMutableProperty0$Setter;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getSetter()Lkotlin/reflect/KMutableProperty0$Setter;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KMutableProperty0;
+
+    invoke-interface {v0}, Lkotlin/reflect/KMutableProperty0;->getSetter()Lkotlin/reflect/KMutableProperty0$Setter;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public invoke()Ljava/lang/Object;
+    .locals 1
+
+    invoke-interface {p0}, Lkotlin/reflect/KProperty0;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/l.smali b/com.discord/smali_classes2/k0/o/c/l.smali
new file mode 100644
index 0000000000..a69c6625b9
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/l.smali
@@ -0,0 +1,101 @@
+.class public Lk0/o/c/l;
+.super Lk0/o/c/k;
+.source "MutablePropertyReference0Impl.java"
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 6
+
+    sget-object v1, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move v5, p4
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/k;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p5}, Lk0/o/c/k;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 6
+
+    sget-object v1, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    move-object v0, p1
+
+    check-cast v0, Lk0/o/c/c;
+
+    invoke-interface {v0}, Lk0/o/c/c;->getJClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    instance-of p1, p1, Lk0/s/b;
+
+    xor-int/lit8 v5, p1, 0x1
+
+    move-object v0, p0
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/k;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public get()Ljava/lang/Object;
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/o/c/k;->getGetter()Lkotlin/reflect/KProperty0$Getter;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    invoke-interface {v0, v1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public set(Ljava/lang/Object;)V
+    .locals 3
+
+    invoke-virtual {p0}, Lk0/o/c/k;->getSetter()Lkotlin/reflect/KMutableProperty0$Setter;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    aput-object p1, v1, v2
+
+    invoke-interface {v0, v1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/m.smali b/com.discord/smali_classes2/k0/o/c/m.smali
new file mode 100644
index 0000000000..4f789f1613
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/m.smali
@@ -0,0 +1,60 @@
+.class public abstract Lk0/o/c/m;
+.super Lk0/o/c/o;
+.source "MutablePropertyReference1.java"
+
+# interfaces
+.implements Lk0/s/c;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/o/c/o;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p5}, Lk0/o/c/o;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public computeReflected()Lkotlin/reflect/KCallable;
+    .locals 0
+
+    invoke-static {p0}, Lk0/o/c/t;->mutableProperty1(Lk0/o/c/m;)Lk0/s/c;
+
+    return-object p0
+.end method
+
+.method public getGetter()Lk0/s/d$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    check-cast v0, Lk0/s/c;
+
+    invoke-interface {v0}, Lk0/s/d;->getGetter()Lk0/s/d$a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-interface {p0, p1}, Lk0/s/d;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/n.smali b/com.discord/smali_classes2/k0/o/c/n.smali
new file mode 100644
index 0000000000..a44750c01a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/n.smali
@@ -0,0 +1,49 @@
+.class public Lk0/o/c/n;
+.super Lk0/o/c/m;
+.source "MutablePropertyReference1Impl.java"
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 6
+
+    sget-object v1, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move v5, p4
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/m;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public get(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    invoke-virtual {p0}, Lk0/o/c/m;->getGetter()Lk0/s/d$a;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    aput-object p1, v1, v2
+
+    invoke-interface {v0, v1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/o.smali b/com.discord/smali_classes2/k0/o/c/o.smali
new file mode 100644
index 0000000000..df4a3610e8
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/o.smali
@@ -0,0 +1,32 @@
+.class public abstract Lk0/o/c/o;
+.super Lk0/o/c/s;
+.source "MutablePropertyReference.java"
+
+# interfaces
+.implements Lkotlin/reflect/KProperty;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/o/c/s;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lk0/o/c/s;-><init>(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p5}, Lk0/o/c/s;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/p.smali b/com.discord/smali_classes2/k0/o/c/p.smali
new file mode 100644
index 0000000000..7bd7014c20
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/p.smali
@@ -0,0 +1,131 @@
+.class public final Lk0/o/c/p;
+.super Ljava/lang/Object;
+.source "PackageReference.kt"
+
+# interfaces
+.implements Lk0/o/c/c;
+
+
+# instance fields
+.field public final d:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;Ljava/lang/String;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/String;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "jClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "moduleName"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/o/c/p;->d:Ljava/lang/Class;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Lk0/o/c/p;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/o/c/p;->d:Ljava/lang/Class;
+
+    check-cast p1, Lk0/o/c/p;
+
+    iget-object p1, p1, Lk0/o/c/p;->d:Ljava/lang/Class;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public getJClass()Ljava/lang/Class;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/o/c/p;->d:Ljava/lang/Class;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lk0/o/c/p;->d:Ljava/lang/Class;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->hashCode()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lk0/o/c/p;->d:Ljava/lang/Class;
+
+    invoke-virtual {v1}, Ljava/lang/Class;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " (Kotlin reflection is not available)"
+
+    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_classes2/k0/o/c/q.smali b/com.discord/smali_classes2/k0/o/c/q.smali
new file mode 100644
index 0000000000..0dfe9cd382
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/q.smali
@@ -0,0 +1,60 @@
+.class public abstract Lk0/o/c/q;
+.super Lk0/o/c/s;
+.source "PropertyReference1.java"
+
+# interfaces
+.implements Lk0/s/d;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/o/c/s;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p5}, Lk0/o/c/s;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public computeReflected()Lkotlin/reflect/KCallable;
+    .locals 0
+
+    invoke-static {p0}, Lk0/o/c/t;->property1(Lk0/o/c/q;)Lk0/s/d;
+
+    return-object p0
+.end method
+
+.method public getGetter()Lk0/s/d$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    check-cast v0, Lk0/s/d;
+
+    invoke-interface {v0}, Lk0/s/d;->getGetter()Lk0/s/d$a;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    invoke-interface {p0, p1}, Lk0/s/d;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/r.smali b/com.discord/smali_classes2/k0/o/c/r.smali
new file mode 100644
index 0000000000..c9ad872f88
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/r.smali
@@ -0,0 +1,73 @@
+.class public Lk0/o/c/r;
+.super Lk0/o/c/q;
+.source "PropertyReference1Impl.java"
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 6
+
+    sget-object v1, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move v5, p4
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/q;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 6
+
+    sget-object v1, Lk0/o/c/b;->NO_RECEIVER:Ljava/lang/Object;
+
+    check-cast p1, Lk0/o/c/c;
+
+    invoke-interface {p1}, Lk0/o/c/c;->getJClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/q;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public get(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    invoke-virtual {p0}, Lk0/o/c/q;->getGetter()Lk0/s/d$a;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    aput-object p1, v1, v2
+
+    invoke-interface {v0, v1}, Lkotlin/reflect/KCallable;->call([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/s.smali b/com.discord/smali_classes2/k0/o/c/s.smali
new file mode 100644
index 0000000000..c39e6fe2b3
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/s.smali
@@ -0,0 +1,288 @@
+.class public abstract Lk0/o/c/s;
+.super Lk0/o/c/b;
+.source "PropertyReference.java"
+
+# interfaces
+.implements Lkotlin/reflect/KProperty;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/o/c/b;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lk0/o/c/b;-><init>(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 7
+
+    const/4 v0, 0x1
+
+    and-int/2addr p5, v0
+
+    if-ne p5, v0, :cond_0
+
+    const/4 v6, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    const/4 v6, 0x0
+
+    :goto_0
+    move-object v1, p0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    invoke-direct/range {v1 .. v6}, Lk0/o/c/b;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lk0/o/c/s;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lk0/o/c/s;
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getSignature()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getSignature()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getBoundReceiver()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lk0/o/c/b;->getBoundReceiver()Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+
+    :cond_2
+    instance-of v0, p1, Lkotlin/reflect/KProperty;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p0}, Lk0/o/c/b;->compute()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_3
+    return v2
+.end method
+
+.method public bridge synthetic getReflected()Lkotlin/reflect/KCallable;
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getReflected()Lkotlin/reflect/KProperty;
+    .locals 1
+
+    invoke-super {p0}, Lk0/o/c/b;->getReflected()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/reflect/KProperty;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getSignature()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public isConst()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KProperty;->isConst()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isLateinit()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/o/c/s;->getReflected()Lkotlin/reflect/KProperty;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Lkotlin/reflect/KProperty;->isLateinit()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/o/c/b;->compute()Lkotlin/reflect/KCallable;
+
+    move-result-object v0
+
+    if-eq v0, p0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    const-string v0, "property "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lk0/o/c/b;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " (Kotlin reflection is not available)"
+
+    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_classes2/k0/o/c/t.smali b/com.discord/smali_classes2/k0/o/c/t.smali
new file mode 100644
index 0000000000..f1ef10817e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/t.smali
@@ -0,0 +1,119 @@
+.class public Lk0/o/c/t;
+.super Ljava/lang/Object;
+.source "Reflection.java"
+
+
+# static fields
+.field public static final a:Lk0/o/c/u;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    const-string v1, "kotlin.reflect.jvm.internal.ReflectionFactoryImpl"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lk0/o/c/u;
+    :try_end_0
+    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
+
+    move-object v0, v1
+
+    goto :goto_0
+
+    :catch_0
+    nop
+
+    :goto_0
+    if-eqz v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    new-instance v0, Lk0/o/c/u;
+
+    invoke-direct {v0}, Lk0/o/c/u;-><init>()V
+
+    :goto_1
+    sput-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    return-void
+.end method
+
+.method public static getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+    .locals 1
+
+    sget-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lk0/o/c/d;
+
+    invoke-direct {v0, p0}, Lk0/o/c/d;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static mutableProperty0(Lk0/o/c/k;)Lkotlin/reflect/KMutableProperty0;
+    .locals 1
+
+    sget-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    if-eqz v0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static mutableProperty1(Lk0/o/c/m;)Lk0/s/c;
+    .locals 1
+
+    sget-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    if-eqz v0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static property1(Lk0/o/c/q;)Lk0/s/d;
+    .locals 1
+
+    sget-object v0, Lk0/o/c/t;->a:Lk0/o/c/u;
+
+    if-eqz v0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/u.smali b/com.discord/smali_classes2/k0/o/c/u.smali
new file mode 100644
index 0000000000..c7be00b95c
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/u.smali
@@ -0,0 +1,52 @@
+.class public Lk0/o/c/u;
+.super Ljava/lang/Object;
+.source "ReflectionFactory.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public renderLambdaToString(Lk0/o/c/f;)Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getGenericInterfaces()[Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    aget-object p1, p1, v0
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "kotlin.jvm.functions."
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/16 v0, 0x15
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    :cond_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/v.smali b/com.discord/smali_classes2/k0/o/c/v.smali
new file mode 100644
index 0000000000..9098321f3e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/v.smali
@@ -0,0 +1,218 @@
+.class public Lk0/o/c/v;
+.super Ljava/lang/Object;
+.source "TypeIntrinsics.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static asMutableCollection(Ljava/lang/Object;)Ljava/util/Collection;
+    .locals 2
+
+    instance-of v0, p0, Lk0/o/c/w/a;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    instance-of v0, p0, Lk0/o/c/w/b;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "kotlin.collections.MutableCollection"
+
+    invoke-static {p0, v0}, Lk0/o/c/v;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    :try_start_0
+    check-cast p0, Ljava/util/Collection;
+    :try_end_0
+    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    move-exception p0
+
+    invoke-static {p0}, Lk0/o/c/v;->throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
+
+    throw v1
+.end method
+
+.method public static asMutableMap(Ljava/lang/Object;)Ljava/util/Map;
+    .locals 2
+
+    instance-of v0, p0, Lk0/o/c/w/a;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    instance-of v0, p0, Lk0/o/c/w/d;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "kotlin.collections.MutableMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/v;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    :try_start_0
+    check-cast p0, Ljava/util/Map;
+    :try_end_0
+    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    move-exception p0
+
+    invoke-static {p0}, Lk0/o/c/v;->throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
+
+    throw v1
+.end method
+
+.method public static beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
+    .locals 3
+
+    instance-of v0, p0, Lk0/o/c/f;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_0
+
+    move-object v0, p0
+
+    check-cast v0, Lk0/o/c/f;
+
+    invoke-interface {v0}, Lk0/o/c/f;->getArity()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v0, p0, Lkotlin/jvm/functions/Function0;
+
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    instance-of v0, p0, Lkotlin/jvm/functions/Function1;
+
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v0, 0x2
+
+    :goto_0
+    if-ne v0, p1, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_4
+
+    return-object p0
+
+    :cond_4
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "kotlin.jvm.functions.Function"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Lk0/o/c/v;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
+    .locals 1
+
+    const-class v0, Lk0/o/c/v;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->c(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Throwable;
+
+    throw p0
+.end method
+
+.method public static throwCce(Ljava/lang/Object;Ljava/lang/String;)V
+    .locals 1
+
+    if-nez p0, :cond_0
+
+    const-string p0, "null"
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p0
+
+    :goto_0
+    const-string v0, " cannot be cast to "
+
+    invoke-static {p0, v0, p1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/ClassCastException;
+
+    invoke-direct {p1, p0}, Ljava/lang/ClassCastException;-><init>(Ljava/lang/String;)V
+
+    invoke-static {p1}, Lk0/o/c/v;->throwCce(Ljava/lang/ClassCastException;)Ljava/lang/ClassCastException;
+
+    const/4 p0, 0x0
+
+    throw p0
+.end method
diff --git a/com.discord/smali_classes2/k0/o/c/w/a.smali b/com.discord/smali_classes2/k0/o/c/w/a.smali
new file mode 100644
index 0000000000..90667e8d51
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/w/a.smali
@@ -0,0 +1,3 @@
+.class public interface abstract Lk0/o/c/w/a;
+.super Ljava/lang/Object;
+.source "KMarkers.kt"
diff --git a/com.discord/smali_classes2/k0/o/c/w/b.smali b/com.discord/smali_classes2/k0/o/c/w/b.smali
new file mode 100644
index 0000000000..89ed8e311c
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/w/b.smali
@@ -0,0 +1,6 @@
+.class public interface abstract Lk0/o/c/w/b;
+.super Ljava/lang/Object;
+.source "KMarkers.kt"
+
+# interfaces
+.implements Lk0/o/c/w/a;
diff --git a/com.discord/smali_classes2/k0/o/c/w/c.smali b/com.discord/smali_classes2/k0/o/c/w/c.smali
new file mode 100644
index 0000000000..bab507c322
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/w/c.smali
@@ -0,0 +1,6 @@
+.class public interface abstract Lk0/o/c/w/c;
+.super Ljava/lang/Object;
+.source "KMarkers.kt"
+
+# interfaces
+.implements Lk0/o/c/w/b;
diff --git a/com.discord/smali_classes2/k0/o/c/w/d.smali b/com.discord/smali_classes2/k0/o/c/w/d.smali
new file mode 100644
index 0000000000..2c8b6193e7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/o/c/w/d.smali
@@ -0,0 +1,6 @@
+.class public interface abstract Lk0/o/c/w/d;
+.super Ljava/lang/Object;
+.source "KMarkers.kt"
+
+# interfaces
+.implements Lk0/o/c/w/a;
diff --git a/com.discord/smali_classes2/k0/p/a.smali b/com.discord/smali_classes2/k0/p/a.smali
new file mode 100644
index 0000000000..93a27e861e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/p/a.smali
@@ -0,0 +1,115 @@
+.class public final Lk0/p/a;
+.super Ljava/lang/Object;
+.source "Delegates.kt"
+
+# interfaces
+.implements Lkotlin/properties/ReadWriteProperty;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/properties/ReadWriteProperty<",
+        "Ljava/lang/Object;",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            "Lkotlin/reflect/KProperty<",
+            "*>;)TT;"
+        }
+    .end annotation
+
+    const-string p1, "property"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lk0/p/a;->a:Ljava/lang/Object;
+
+    if-eqz p1, :cond_0
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Property "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-interface {p2}, Lkotlin/reflect/KCallable;->getName()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p2, " should be initialized before get."
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            "Lkotlin/reflect/KProperty<",
+            "*>;TT;)V"
+        }
+    .end annotation
+
+    const-string p1, "property"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "value"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p3, p0, Lk0/p/a;->a:Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/p/b.smali b/com.discord/smali_classes2/k0/p/b.smali
new file mode 100644
index 0000000000..13ddad5c6e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/p/b.smali
@@ -0,0 +1,131 @@
+.class public abstract Lk0/p/b;
+.super Ljava/lang/Object;
+.source "ObservableProperty.kt"
+
+# interfaces
+.implements Lkotlin/properties/ReadWriteProperty;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/properties/ReadWriteProperty<",
+        "Ljava/lang/Object;",
+        "TV;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public value:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TV;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TV;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/p/b;->value:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/reflect/KProperty<",
+            "*>;TV;TV;)V"
+        }
+    .end annotation
+.end method
+
+.method public beforeChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/reflect/KProperty<",
+            "*>;TV;TV;)Z"
+        }
+    .end annotation
+
+    const-string p2, "property"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            "Lkotlin/reflect/KProperty<",
+            "*>;)TV;"
+        }
+    .end annotation
+
+    const-string p1, "property"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lk0/p/b;->value:Ljava/lang/Object;
+
+    return-object p1
+.end method
+
+.method public setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            "Lkotlin/reflect/KProperty<",
+            "*>;TV;)V"
+        }
+    .end annotation
+
+    const-string p1, "property"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lk0/p/b;->value:Ljava/lang/Object;
+
+    invoke-virtual {p0, p2, p1, p3}, Lk0/p/b;->beforeChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iput-object p3, p0, Lk0/p/b;->value:Ljava/lang/Object;
+
+    invoke-virtual {p0, p2, p1, p3}, Lk0/p/b;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/q/a.smali b/com.discord/smali_classes2/k0/q/a.smali
new file mode 100644
index 0000000000..84248b7d8f
--- /dev/null
+++ b/com.discord/smali_classes2/k0/q/a.smali
@@ -0,0 +1,100 @@
+.class public abstract Lk0/q/a;
+.super Lk0/q/c;
+.source "PlatformRandom.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/q/c;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract getImpl()Ljava/util/Random;
+.end method
+
+.method public nextBits(I)I
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/q/a;->getImpl()Ljava/util/Random;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/util/Random;->nextInt()I
+
+    move-result v0
+
+    rsub-int/lit8 v1, p1, 0x20
+
+    ushr-int/2addr v0, v1
+
+    neg-int p1, p1
+
+    shr-int/lit8 p1, p1, 0x1f
+
+    and-int/2addr p1, v0
+
+    return p1
+.end method
+
+.method public nextBytes([B)[B
+    .locals 1
+
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lk0/q/a;->getImpl()Ljava/util/Random;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Ljava/util/Random;->nextBytes([B)V
+
+    return-object p1
+.end method
+
+.method public nextInt()I
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/q/a;->getImpl()Ljava/util/Random;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/util/Random;->nextInt()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public nextInt(I)I
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/q/a;->getImpl()Ljava/util/Random;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Ljava/util/Random;->nextInt(I)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public nextLong()J
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/q/a;->getImpl()Ljava/util/Random;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/util/Random;->nextLong()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/k0/q/b$a.smali b/com.discord/smali_classes2/k0/q/b$a.smali
new file mode 100644
index 0000000000..d88c56d571
--- /dev/null
+++ b/com.discord/smali_classes2/k0/q/b$a.smali
@@ -0,0 +1,44 @@
+.class public final Lk0/q/b$a;
+.super Ljava/lang/ThreadLocal;
+.source "PlatformRandom.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/q/b;-><init>()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/ThreadLocal<",
+        "Ljava/util/Random;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/ThreadLocal;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public initialValue()Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/util/Random;
+
+    invoke-direct {v0}, Ljava/util/Random;-><init>()V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/q/b.smali b/com.discord/smali_classes2/k0/q/b.smali
new file mode 100644
index 0000000000..337048a879
--- /dev/null
+++ b/com.discord/smali_classes2/k0/q/b.smali
@@ -0,0 +1,43 @@
+.class public final Lk0/q/b;
+.super Lk0/q/a;
+.source "PlatformRandom.kt"
+
+
+# instance fields
+.field public final c:Lk0/q/b$a;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lk0/q/a;-><init>()V
+
+    new-instance v0, Lk0/q/b$a;
+
+    invoke-direct {v0}, Lk0/q/b$a;-><init>()V
+
+    iput-object v0, p0, Lk0/q/b;->c:Lk0/q/b$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getImpl()Ljava/util/Random;
+    .locals 2
+
+    iget-object v0, p0, Lk0/q/b;->c:Lk0/q/b$a;
+
+    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v1, "implStorage.get()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Ljava/util/Random;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/q/c$a.smali b/com.discord/smali_classes2/k0/q/c$a.smali
new file mode 100644
index 0000000000..35473afd9e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/q/c$a.smali
@@ -0,0 +1,118 @@
+.class public final Lk0/q/c$a;
+.super Lk0/q/c;
+.source "Random.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/q/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/q/c;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public nextBits(I)I
+    .locals 1
+
+    sget-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    invoke-virtual {v0, p1}, Lk0/q/c;->nextBits(I)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public nextBytes([B)[B
+    .locals 1
+
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    invoke-virtual {v0, p1}, Lk0/q/c;->nextBytes([B)[B
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public nextBytes([BII)[B
+    .locals 1
+
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    invoke-virtual {v0, p1, p2, p3}, Lk0/q/c;->nextBytes([BII)[B
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public nextInt()I
+    .locals 1
+
+    sget-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    invoke-virtual {v0}, Lk0/q/c;->nextInt()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public nextInt(I)I
+    .locals 1
+
+    sget-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    invoke-virtual {v0, p1}, Lk0/q/c;->nextInt(I)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public nextInt(II)I
+    .locals 1
+
+    sget-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    invoke-virtual {v0, p1, p2}, Lk0/q/c;->nextInt(II)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public nextLong()J
+    .locals 2
+
+    sget-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    invoke-virtual {v0}, Lk0/q/c;->nextLong()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/k0/q/c.smali b/com.discord/smali_classes2/k0/q/c.smali
new file mode 100644
index 0000000000..1e121bf871
--- /dev/null
+++ b/com.discord/smali_classes2/k0/q/c.smali
@@ -0,0 +1,429 @@
+.class public abstract Lk0/q/c;
+.super Ljava/lang/Object;
+.source "Random.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/q/c$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lk0/q/c;
+
+.field public static final b:Lk0/q/c$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lk0/q/c$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lk0/q/c$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lk0/q/c;->b:Lk0/q/c$a;
+
+    sget-object v0, Lk0/m/b;->a:Lk0/m/a;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lk0/q/b;
+
+    invoke-direct {v0}, Lk0/q/b;-><init>()V
+
+    sput-object v0, Lk0/q/c;->a:Lk0/q/c;
+
+    return-void
+
+    :cond_0
+    throw v1
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract nextBits(I)I
+.end method
+
+.method public nextBytes([B)[B
+    .locals 2
+
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, p1, v1, v0}, Lk0/q/c;->nextBytes([BII)[B
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public nextBytes([BII)[B
+    .locals 6
+
+    const-string v0, "array"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-gez p2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    if-lt v0, p2, :cond_2
+
+    array-length v0, p1
+
+    if-gez p3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    if-lt v0, p3, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    const/4 v0, 0x0
+
+    :goto_1
+    const-string v3, "fromIndex ("
+
+    if-eqz v0, :cond_7
+
+    if-gt p2, p3, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_2
+    if-eqz v2, :cond_6
+
+    sub-int v0, p3, p2
+
+    div-int/lit8 v0, v0, 0x4
+
+    const/4 v2, 0x0
+
+    :goto_3
+    if-ge v2, v0, :cond_4
+
+    invoke-virtual {p0}, Lk0/q/c;->nextInt()I
+
+    move-result v3
+
+    int-to-byte v4, v3
+
+    aput-byte v4, p1, p2
+
+    add-int/lit8 v4, p2, 0x1
+
+    ushr-int/lit8 v5, v3, 0x8
+
+    int-to-byte v5, v5
+
+    aput-byte v5, p1, v4
+
+    add-int/lit8 v4, p2, 0x2
+
+    ushr-int/lit8 v5, v3, 0x10
+
+    int-to-byte v5, v5
+
+    aput-byte v5, p1, v4
+
+    add-int/lit8 v4, p2, 0x3
+
+    ushr-int/lit8 v3, v3, 0x18
+
+    int-to-byte v3, v3
+
+    aput-byte v3, p1, v4
+
+    add-int/lit8 p2, p2, 0x4
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    sub-int/2addr p3, p2
+
+    mul-int/lit8 v0, p3, 0x8
+
+    invoke-virtual {p0, v0}, Lk0/q/c;->nextBits(I)I
+
+    move-result v0
+
+    :goto_4
+    if-ge v1, p3, :cond_5
+
+    add-int v2, p2, v1
+
+    mul-int/lit8 v3, v1, 0x8
+
+    ushr-int v3, v0, v3
+
+    int-to-byte v3, v3
+
+    aput-byte v3, p1, v2
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_4
+
+    :cond_5
+    return-object p1
+
+    :cond_6
+    const-string p1, ") must be not greater than toIndex ("
+
+    const-string v0, ")."
+
+    invoke-static {v3, p2, p1, p3, v0}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_7
+    const-string v0, ") or toIndex ("
+
+    const-string v1, ") are out of range: 0.."
+
+    invoke-static {v3, p2, v0, p3, v1}, Lf/e/b/a/a;->F(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    array-length p1, p1
+
+    const/16 p3, 0x2e
+
+    invoke-static {p2, p1, p3}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public abstract nextInt()I
+.end method
+
+.method public nextInt(I)I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0, p1}, Lk0/q/c;->nextInt(II)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public nextInt(II)I
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-le p2, p1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_5
+
+    sub-int v1, p2, p1
+
+    if-gtz v1, :cond_3
+
+    const/high16 v2, -0x80000000
+
+    if-ne v1, v2, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    :goto_1
+    invoke-virtual {p0}, Lk0/q/c;->nextInt()I
+
+    move-result v0
+
+    if-le p1, v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    if-le p2, v0, :cond_1
+
+    return v0
+
+    :cond_3
+    :goto_2
+    neg-int p2, v1
+
+    and-int/2addr p2, v1
+
+    if-ne p2, v1, :cond_4
+
+    invoke-static {v1}, Ljava/lang/Integer;->numberOfLeadingZeros(I)I
+
+    move-result p2
+
+    rsub-int/lit8 p2, p2, 0x1f
+
+    invoke-virtual {p0, p2}, Lk0/q/c;->nextBits(I)I
+
+    move-result p2
+
+    goto :goto_3
+
+    :cond_4
+    invoke-virtual {p0}, Lk0/q/c;->nextInt()I
+
+    move-result p2
+
+    ushr-int/2addr p2, v0
+
+    rem-int v2, p2, v1
+
+    sub-int/2addr p2, v2
+
+    add-int/lit8 v3, v1, -0x1
+
+    add-int/2addr v3, p2
+
+    if-ltz v3, :cond_4
+
+    move p2, v2
+
+    :goto_3
+    add-int/2addr p1, p2
+
+    return p1
+
+    :cond_5
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    const-string v0, "from"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "until"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Random range is empty: ["
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ", "
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ")."
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public nextLong()J
+    .locals 4
+
+    invoke-virtual {p0}, Lk0/q/c;->nextInt()I
+
+    move-result v0
+
+    int-to-long v0, v0
+
+    const/16 v2, 0x20
+
+    shl-long/2addr v0, v2
+
+    invoke-virtual {p0}, Lk0/q/c;->nextInt()I
+
+    move-result v2
+
+    int-to-long v2, v2
+
+    add-long/2addr v0, v2
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/k0/q/d.smali b/com.discord/smali_classes2/k0/q/d.smali
new file mode 100644
index 0000000000..6d02a1e555
--- /dev/null
+++ b/com.discord/smali_classes2/k0/q/d.smali
@@ -0,0 +1,166 @@
+.class public final Lk0/q/d;
+.super Lk0/q/c;
+.source "XorWowRandom.kt"
+
+
+# instance fields
+.field public c:I
+
+.field public d:I
+
+.field public e:I
+
+.field public f:I
+
+.field public g:I
+
+.field public h:I
+
+
+# direct methods
+.method public constructor <init>(II)V
+    .locals 3
+
+    not-int v0, p1
+
+    shl-int/lit8 v1, p1, 0xa
+
+    ushr-int/lit8 v2, p2, 0x4
+
+    xor-int/2addr v1, v2
+
+    invoke-direct {p0}, Lk0/q/c;-><init>()V
+
+    iput p1, p0, Lk0/q/d;->c:I
+
+    iput p2, p0, Lk0/q/d;->d:I
+
+    const/4 v2, 0x0
+
+    iput v2, p0, Lk0/q/d;->e:I
+
+    iput v2, p0, Lk0/q/d;->f:I
+
+    iput v0, p0, Lk0/q/d;->g:I
+
+    iput v1, p0, Lk0/q/d;->h:I
+
+    or-int/2addr p1, p2
+
+    or-int/2addr p1, v2
+
+    or-int/2addr p1, v2
+
+    or-int/2addr p1, v0
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_2
+
+    const/16 p1, 0x40
+
+    :goto_1
+    if-ge v2, p1, :cond_1
+
+    invoke-virtual {p0}, Lk0/q/d;->nextInt()I
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    return-void
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Initial state must have at least one non-zero element."
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+
+# virtual methods
+.method public nextBits(I)I
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/q/d;->nextInt()I
+
+    move-result v0
+
+    rsub-int/lit8 v1, p1, 0x20
+
+    ushr-int/2addr v0, v1
+
+    neg-int p1, p1
+
+    shr-int/lit8 p1, p1, 0x1f
+
+    and-int/2addr p1, v0
+
+    return p1
+.end method
+
+.method public nextInt()I
+    .locals 3
+
+    iget v0, p0, Lk0/q/d;->c:I
+
+    ushr-int/lit8 v1, v0, 0x2
+
+    xor-int/2addr v0, v1
+
+    iget v1, p0, Lk0/q/d;->d:I
+
+    iput v1, p0, Lk0/q/d;->c:I
+
+    iget v1, p0, Lk0/q/d;->e:I
+
+    iput v1, p0, Lk0/q/d;->d:I
+
+    iget v1, p0, Lk0/q/d;->f:I
+
+    iput v1, p0, Lk0/q/d;->e:I
+
+    iget v1, p0, Lk0/q/d;->g:I
+
+    iput v1, p0, Lk0/q/d;->f:I
+
+    shl-int/lit8 v2, v0, 0x1
+
+    xor-int/2addr v0, v2
+
+    xor-int/2addr v0, v1
+
+    shl-int/lit8 v1, v1, 0x4
+
+    xor-int/2addr v0, v1
+
+    iput v0, p0, Lk0/q/d;->g:I
+
+    iget v1, p0, Lk0/q/d;->h:I
+
+    const v2, 0x587c5
+
+    add-int/2addr v1, v2
+
+    iput v1, p0, Lk0/q/d;->h:I
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/k0/r/a.smali b/com.discord/smali_classes2/k0/r/a.smali
new file mode 100644
index 0000000000..e8fbdb0328
--- /dev/null
+++ b/com.discord/smali_classes2/k0/r/a.smali
@@ -0,0 +1,32 @@
+.class public interface abstract Lk0/r/a;
+.super Ljava/lang/Object;
+.source "Range.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T::",
+        "Ljava/lang/Comparable<",
+        "-TT;>;>",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract getEndInclusive()Ljava/lang/Comparable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+.end method
+
+.method public abstract getStart()Ljava/lang/Comparable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/k0/r/b.smali b/com.discord/smali_classes2/k0/r/b.smali
new file mode 100644
index 0000000000..ed5f803932
--- /dev/null
+++ b/com.discord/smali_classes2/k0/r/b.smali
@@ -0,0 +1,105 @@
+.class public final Lk0/r/b;
+.super Lk0/j/q;
+.source "ProgressionIterators.kt"
+
+
+# instance fields
+.field public final d:I
+
+.field public e:Z
+
+.field public f:I
+
+.field public final g:I
+
+
+# direct methods
+.method public constructor <init>(III)V
+    .locals 2
+
+    invoke-direct {p0}, Lk0/j/q;-><init>()V
+
+    iput p3, p0, Lk0/r/b;->g:I
+
+    iput p2, p0, Lk0/r/b;->d:I
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-lez p3, :cond_0
+
+    if-gt p1, p2, :cond_1
+
+    goto :goto_0
+
+    :cond_0
+    if-lt p1, p2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    iput-boolean v0, p0, Lk0/r/b;->e:Z
+
+    if-eqz v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    iget p1, p0, Lk0/r/b;->d:I
+
+    :goto_1
+    iput p1, p0, Lk0/r/b;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public hasNext()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lk0/r/b;->e:Z
+
+    return v0
+.end method
+
+.method public nextInt()I
+    .locals 2
+
+    iget v0, p0, Lk0/r/b;->f:I
+
+    iget v1, p0, Lk0/r/b;->d:I
+
+    if-ne v0, v1, :cond_1
+
+    iget-boolean v1, p0, Lk0/r/b;->e:Z
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x0
+
+    iput-boolean v1, p0, Lk0/r/b;->e:Z
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+
+    :cond_1
+    iget v1, p0, Lk0/r/b;->g:I
+
+    add-int/2addr v1, v0
+
+    iput v1, p0, Lk0/r/b;->f:I
+
+    :goto_0
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/k0/r/c.smali b/com.discord/smali_classes2/k0/r/c.smali
new file mode 100644
index 0000000000..73c0b33c37
--- /dev/null
+++ b/com.discord/smali_classes2/k0/r/c.smali
@@ -0,0 +1,158 @@
+.class public Lk0/r/c;
+.super Ljava/lang/Object;
+.source "Progressions.kt"
+
+# interfaces
+.implements Ljava/lang/Iterable;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/lang/Iterable<",
+        "Ljava/lang/Long;",
+        ">;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:J
+
+.field public final f:J
+
+
+# direct methods
+.method public constructor <init>(JJJ)V
+    .locals 4
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p5, v0
+
+    if-eqz v2, :cond_5
+
+    const-wide/high16 v0, -0x8000000000000000L
+
+    cmp-long v3, p5, v0
+
+    if-eqz v3, :cond_4
+
+    iput-wide p1, p0, Lk0/r/c;->d:J
+
+    if-lez v2, :cond_1
+
+    cmp-long v0, p1, p3
+
+    if-ltz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p3, p4, p5, p6}, Lf/n/a/k/a;->L(JJ)J
+
+    move-result-wide v0
+
+    invoke-static {p1, p2, p5, p6}, Lf/n/a/k/a;->L(JJ)J
+
+    move-result-wide p1
+
+    sub-long/2addr v0, p1
+
+    invoke-static {v0, v1, p5, p6}, Lf/n/a/k/a;->L(JJ)J
+
+    move-result-wide p1
+
+    sub-long/2addr p3, p1
+
+    goto :goto_0
+
+    :cond_1
+    if-gez v2, :cond_3
+
+    cmp-long v0, p1, p3
+
+    if-gtz v0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    neg-long v0, p5
+
+    invoke-static {p1, p2, v0, v1}, Lf/n/a/k/a;->L(JJ)J
+
+    move-result-wide p1
+
+    invoke-static {p3, p4, v0, v1}, Lf/n/a/k/a;->L(JJ)J
+
+    move-result-wide v2
+
+    sub-long/2addr p1, v2
+
+    invoke-static {p1, p2, v0, v1}, Lf/n/a/k/a;->L(JJ)J
+
+    move-result-wide p1
+
+    add-long/2addr p3, p1
+
+    :goto_0
+    iput-wide p3, p0, Lk0/r/c;->e:J
+
+    iput-wide p5, p0, Lk0/r/c;->f:J
+
+    return-void
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Step is zero."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Step must be greater than Long.MIN_VALUE to avoid overflow on negation."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Step must be non-zero."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 8
+
+    new-instance v7, Lk0/r/d;
+
+    iget-wide v1, p0, Lk0/r/c;->d:J
+
+    iget-wide v3, p0, Lk0/r/c;->e:J
+
+    iget-wide v5, p0, Lk0/r/c;->f:J
+
+    move-object v0, v7
+
+    invoke-direct/range {v0 .. v6}, Lk0/r/d;-><init>(JJJ)V
+
+    return-object v7
+.end method
diff --git a/com.discord/smali_classes2/k0/r/d.smali b/com.discord/smali_classes2/k0/r/d.smali
new file mode 100644
index 0000000000..097fecdb3b
--- /dev/null
+++ b/com.discord/smali_classes2/k0/r/d.smali
@@ -0,0 +1,113 @@
+.class public final Lk0/r/d;
+.super Lk0/j/r;
+.source "ProgressionIterators.kt"
+
+
+# instance fields
+.field public final d:J
+
+.field public e:Z
+
+.field public f:J
+
+.field public final g:J
+
+
+# direct methods
+.method public constructor <init>(JJJ)V
+    .locals 5
+
+    invoke-direct {p0}, Lk0/j/r;-><init>()V
+
+    iput-wide p5, p0, Lk0/r/d;->g:J
+
+    iput-wide p3, p0, Lk0/r/d;->d:J
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, p5, v2
+
+    cmp-long p5, p1, p3
+
+    if-lez v4, :cond_0
+
+    if-gtz p5, :cond_1
+
+    goto :goto_0
+
+    :cond_0
+    if-ltz p5, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    iput-boolean v0, p0, Lk0/r/d;->e:Z
+
+    if-eqz v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    iget-wide p1, p0, Lk0/r/d;->d:J
+
+    :goto_1
+    iput-wide p1, p0, Lk0/r/d;->f:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public hasNext()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lk0/r/d;->e:Z
+
+    return v0
+.end method
+
+.method public nextLong()J
+    .locals 5
+
+    iget-wide v0, p0, Lk0/r/d;->f:J
+
+    iget-wide v2, p0, Lk0/r/d;->d:J
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_1
+
+    iget-boolean v2, p0, Lk0/r/d;->e:Z
+
+    if-eqz v2, :cond_0
+
+    const/4 v2, 0x0
+
+    iput-boolean v2, p0, Lk0/r/d;->e:Z
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+
+    :cond_1
+    iget-wide v2, p0, Lk0/r/d;->g:J
+
+    add-long/2addr v2, v0
+
+    iput-wide v2, p0, Lk0/r/d;->f:J
+
+    :goto_0
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/k0/r/e$a.smali b/com.discord/smali_classes2/k0/r/e$a.smali
new file mode 100644
index 0000000000..51885753d7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/r/e$a.smali
@@ -0,0 +1,24 @@
+.class public final Lk0/r/e$a;
+.super Ljava/lang/Object;
+.source "Ranges.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/r/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/r/e.smali b/com.discord/smali_classes2/k0/r/e.smali
new file mode 100644
index 0000000000..bbf950af9d
--- /dev/null
+++ b/com.discord/smali_classes2/k0/r/e.smali
@@ -0,0 +1,241 @@
+.class public final Lk0/r/e;
+.super Lk0/r/c;
+.source "Ranges.kt"
+
+# interfaces
+.implements Lk0/r/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/r/e$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/r/c;",
+        "Lk0/r/a<",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final g:Lk0/r/e;
+
+.field public static final h:Lk0/r/e$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    new-instance v0, Lk0/r/e$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lk0/r/e$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lk0/r/e;->h:Lk0/r/e$a;
+
+    new-instance v0, Lk0/r/e;
+
+    const-wide/16 v1, 0x1
+
+    const-wide/16 v3, 0x0
+
+    invoke-direct {v0, v1, v2, v3, v4}, Lk0/r/e;-><init>(JJ)V
+
+    sput-object v0, Lk0/r/e;->g:Lk0/r/e;
+
+    return-void
+.end method
+
+.method public constructor <init>(JJ)V
+    .locals 7
+
+    const-wide/16 v5, 0x1
+
+    move-object v0, p0
+
+    move-wide v1, p1
+
+    move-wide v3, p3
+
+    invoke-direct/range {v0 .. v6}, Lk0/r/c;-><init>(JJJ)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 5
+
+    instance-of v0, p1, Lk0/r/e;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p0}, Lk0/r/e;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    move-object v0, p1
+
+    check-cast v0, Lk0/r/e;
+
+    invoke-virtual {v0}, Lk0/r/e;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    :cond_0
+    iget-wide v0, p0, Lk0/r/c;->d:J
+
+    check-cast p1, Lk0/r/e;
+
+    iget-wide v2, p1, Lk0/r/c;->d:J
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_2
+
+    iget-wide v0, p0, Lk0/r/c;->e:J
+
+    iget-wide v2, p1, Lk0/r/c;->e:J
+
+    cmp-long p1, v0, v2
+
+    if-nez p1, :cond_2
+
+    :cond_1
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public getEndInclusive()Ljava/lang/Comparable;
+    .locals 2
+
+    iget-wide v0, p0, Lk0/r/c;->e:J
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getStart()Ljava/lang/Comparable;
+    .locals 2
+
+    iget-wide v0, p0, Lk0/r/c;->d:J
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 7
+
+    invoke-virtual {p0}, Lk0/r/e;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, -0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v0, 0x1f
+
+    int-to-long v0, v0
+
+    iget-wide v2, p0, Lk0/r/c;->d:J
+
+    const/16 v4, 0x20
+
+    ushr-long v5, v2, v4
+
+    xor-long/2addr v2, v5
+
+    mul-long v0, v0, v2
+
+    iget-wide v2, p0, Lk0/r/c;->e:J
+
+    ushr-long v4, v2, v4
+
+    xor-long/2addr v2, v4
+
+    add-long/2addr v0, v2
+
+    long-to-int v0, v0
+
+    :goto_0
+    return v0
+.end method
+
+.method public isEmpty()Z
+    .locals 5
+
+    iget-wide v0, p0, Lk0/r/c;->d:J
+
+    iget-wide v2, p0, Lk0/r/c;->e:J
+
+    cmp-long v4, v0, v2
+
+    if-lez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-wide v1, p0, Lk0/r/c;->d:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, ".."
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Lk0/r/c;->e:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/r/f.smali b/com.discord/smali_classes2/k0/r/f.smali
new file mode 100644
index 0000000000..e054f96b24
--- /dev/null
+++ b/com.discord/smali_classes2/k0/r/f.smali
@@ -0,0 +1,204 @@
+.class public Lk0/r/f;
+.super Ljava/lang/Object;
+.source "_Ranges.kt"
+
+
+# direct methods
+.method public static final coerceAtMost(JJ)J
+    .locals 1
+
+    cmp-long v0, p0, p2
+
+    if-lez v0, :cond_0
+
+    move-wide p0, p2
+
+    :cond_0
+    return-wide p0
+.end method
+
+.method public static final coerceIn(III)I
+    .locals 2
+
+    if-gt p1, p2, :cond_2
+
+    if-ge p0, p1, :cond_0
+
+    return p1
+
+    :cond_0
+    if-le p0, p2, :cond_1
+
+    return p2
+
+    :cond_1
+    return p0
+
+    :cond_2
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Cannot coerce value to an empty range: maximum "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string p2, " is less than minimum "
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2e
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final downTo(II)Lkotlin/ranges/IntProgression;
+    .locals 2
+
+    new-instance v0, Lkotlin/ranges/IntProgression;
+
+    const/4 v1, -0x1
+
+    invoke-direct {v0, p0, p1, v1}, Lkotlin/ranges/IntProgression;-><init>(III)V
+
+    return-object v0
+.end method
+
+.method public static final step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
+    .locals 3
+
+    const-string v0, "$this$step"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-lez p1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    const-string v2, "step"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz v0, :cond_2
+
+    iget v0, p0, Lkotlin/ranges/IntProgression;->d:I
+
+    iget v1, p0, Lkotlin/ranges/IntProgression;->e:I
+
+    iget p0, p0, Lkotlin/ranges/IntProgression;->f:I
+
+    if-lez p0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    neg-int p1, p1
+
+    :goto_1
+    new-instance p0, Lkotlin/ranges/IntProgression;
+
+    invoke-direct {p0, v0, v1, p1}, Lkotlin/ranges/IntProgression;-><init>(III)V
+
+    return-object p0
+
+    :cond_2
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "Step must be positive, was: "
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v0, 0x2e
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final until(IJ)Lk0/r/e;
+    .locals 4
+
+    const-wide/high16 v0, -0x8000000000000000L
+
+    cmp-long v2, p1, v0
+
+    if-gtz v2, :cond_0
+
+    sget-object p0, Lk0/r/e;->h:Lk0/r/e$a;
+
+    sget-object p0, Lk0/r/e;->g:Lk0/r/e;
+
+    return-object p0
+
+    :cond_0
+    int-to-long v0, p0
+
+    new-instance p0, Lk0/r/e;
+
+    const-wide/16 v2, 0x1
+
+    sub-long/2addr p1, v2
+
+    invoke-direct {p0, v0, v1, p1, p2}, Lk0/r/e;-><init>(JJ)V
+
+    return-object p0
+.end method
+
+.method public static final until(II)Lkotlin/ranges/IntRange;
+    .locals 1
+
+    const/high16 v0, -0x80000000
+
+    if-gt p1, v0, :cond_0
+
+    sget-object p0, Lkotlin/ranges/IntRange;->h:Lkotlin/ranges/IntRange;
+
+    sget-object p0, Lkotlin/ranges/IntRange;->g:Lkotlin/ranges/IntRange;
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Lkotlin/ranges/IntRange;
+
+    add-int/lit8 p1, p1, -0x1
+
+    invoke-direct {v0, p0, p1}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/s/a.smali b/com.discord/smali_classes2/k0/s/a.smali
new file mode 100644
index 0000000000..4c90060ef0
--- /dev/null
+++ b/com.discord/smali_classes2/k0/s/a.smali
@@ -0,0 +1,16 @@
+.class public interface abstract Lk0/s/a;
+.super Ljava/lang/Object;
+.source "KAnnotatedElement.kt"
+
+
+# virtual methods
+.method public abstract getAnnotations()Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/annotation/Annotation;",
+            ">;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/k0/s/b.smali b/com.discord/smali_classes2/k0/s/b.smali
new file mode 100644
index 0000000000..08f8689d9a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/s/b.smali
@@ -0,0 +1,21 @@
+.class public interface abstract Lk0/s/b;
+.super Ljava/lang/Object;
+.source "KClass.kt"
+
+# interfaces
+.implements Lkotlin/reflect/KDeclarationContainer;
+.implements Lk0/s/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/reflect/KDeclarationContainer;",
+        "Lk0/s/a;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/s/c.smali b/com.discord/smali_classes2/k0/s/c.smali
new file mode 100644
index 0000000000..9a03eae1bd
--- /dev/null
+++ b/com.discord/smali_classes2/k0/s/c.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Lk0/s/c;
+.super Ljava/lang/Object;
+.source "KProperty.kt"
+
+# interfaces
+.implements Lk0/s/d;
+.implements Lkotlin/reflect/KProperty;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lk0/s/d<",
+        "TT;TV;>;",
+        "Ljava/lang/Object<",
+        "TV;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/s/d$a.smali b/com.discord/smali_classes2/k0/s/d$a.smali
new file mode 100644
index 0000000000..da20328607
--- /dev/null
+++ b/com.discord/smali_classes2/k0/s/d$a.smali
@@ -0,0 +1,33 @@
+.class public interface abstract Lk0/s/d$a;
+.super Ljava/lang/Object;
+.source "KProperty.kt"
+
+# interfaces
+.implements Lkotlin/reflect/KProperty$Getter;
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lk0/s/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/reflect/KProperty$Getter<",
+        "TV;>;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;TV;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/k0/s/d.smali b/com.discord/smali_classes2/k0/s/d.smali
new file mode 100644
index 0000000000..367f72636b
--- /dev/null
+++ b/com.discord/smali_classes2/k0/s/d.smali
@@ -0,0 +1,50 @@
+.class public interface abstract Lk0/s/d;
+.super Ljava/lang/Object;
+.source "KProperty.kt"
+
+# interfaces
+.implements Lkotlin/reflect/KProperty;
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lk0/s/d$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/reflect/KProperty<",
+        "TV;>;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;TV;>;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract get(Ljava/lang/Object;)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)TV;"
+        }
+    .end annotation
+.end method
+
+.method public abstract getGetter()Lk0/s/d$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lk0/s/d$a<",
+            "TT;TV;>;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/k0/t/a.smali b/com.discord/smali_classes2/k0/t/a.smali
new file mode 100644
index 0000000000..d98e61c9c3
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/a.smali
@@ -0,0 +1,98 @@
+.class public final Lk0/t/a;
+.super Ljava/lang/Object;
+.source "SequencesJVM.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "sequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Lk0/t/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/t/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/sequences/Sequence;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "This sequence can be consumed only once."
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/b.smali b/com.discord/smali_classes2/k0/t/b.smali
new file mode 100644
index 0000000000..54da26a104
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/b.smali
@@ -0,0 +1,133 @@
+.class public final Lk0/t/b;
+.super Lk0/j/b;
+.source "Sequences.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "K:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lk0/j/b<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final f:Ljava/util/HashSet;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/HashSet<",
+            "TK;>;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final h:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "TT;TK;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Iterator;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Iterator<",
+            "+TT;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+TK;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "keySelector"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lk0/j/b;-><init>()V
+
+    iput-object p1, p0, Lk0/t/b;->g:Ljava/util/Iterator;
+
+    iput-object p2, p0, Lk0/t/b;->h:Lkotlin/jvm/functions/Function1;
+
+    new-instance p1, Ljava/util/HashSet;
+
+    invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
+
+    iput-object p1, p0, Lk0/t/b;->f:Ljava/util/HashSet;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 3
+
+    :cond_0
+    iget-object v0, p0, Lk0/t/b;->g:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lk0/t/b;->g:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lk0/t/b;->h:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lk0/t/b;->f:Ljava/util/HashSet;
+
+    invoke-virtual {v2, v1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    iput-object v0, p0, Lk0/j/b;->e:Ljava/lang/Object;
+
+    sget-object v0, Lk0/j/u;->d:Lk0/j/u;
+
+    iput-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    return-void
+
+    :cond_1
+    sget-object v0, Lk0/j/u;->f:Lk0/j/u;
+
+    iput-object v0, p0, Lk0/j/b;->d:Lk0/j/u;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/t/c.smali b/com.discord/smali_classes2/k0/t/c.smali
new file mode 100644
index 0000000000..85d068e4f1
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/c.smali
@@ -0,0 +1,99 @@
+.class public final Lk0/t/c;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "K:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "TT;TK;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+TK;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "keySelector"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/c;->a:Lkotlin/sequences/Sequence;
+
+    iput-object p2, p0, Lk0/t/c;->b:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/b;
+
+    iget-object v1, p0, Lk0/t/c;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {v1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lk0/t/c;->b:Lkotlin/jvm/functions/Function1;
+
+    invoke-direct {v0, v1, v2}, Lk0/t/b;-><init>(Ljava/util/Iterator;Lkotlin/jvm/functions/Function1;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/d$a.smali b/com.discord/smali_classes2/k0/t/d$a.smali
new file mode 100644
index 0000000000..e03cc8a809
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/d$a.smali
@@ -0,0 +1,146 @@
+.class public final Lk0/t/d$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/t/d;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:I
+
+
+# direct methods
+.method public constructor <init>(Lk0/t/d;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-object v0, p1, Lk0/t/d;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lk0/t/d$a;->d:Ljava/util/Iterator;
+
+    iget p1, p1, Lk0/t/d;->b:I
+
+    iput p1, p0, Lk0/t/d$a;->e:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 1
+
+    :goto_0
+    iget v0, p0, Lk0/t/d$a;->e:I
+
+    if-lez v0, :cond_0
+
+    iget-object v0, p0, Lk0/t/d$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/t/d$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    iget v0, p0, Lk0/t/d$a;->e:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    iput v0, p0, Lk0/t/d$a;->e:I
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public hasNext()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/t/d$a;->a()V
+
+    iget-object v0, p0, Lk0/t/d$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/t/d$a;->a()V
+
+    iget-object v0, p0, Lk0/t/d$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/d.smali b/com.discord/smali_classes2/k0/t/d.smali
new file mode 100644
index 0000000000..915af2be8b
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/d.smali
@@ -0,0 +1,186 @@
+.class public final Lk0/t/d;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+.implements Lk0/t/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;",
+        "Lk0/t/e<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:I
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;I)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;I)V"
+        }
+    .end annotation
+
+    const-string v0, "sequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/d;->a:Lkotlin/sequences/Sequence;
+
+    iput p2, p0, Lk0/t/d;->b:I
+
+    if-ltz p2, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
+
+    return-void
+
+    :cond_1
+    const-string p1, "count must be non-negative, but was "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lk0/t/d;->b:I
+
+    const/16 v0, 0x2e
+
+    invoke-static {p1, p2, v0}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+
+# virtual methods
+.method public drop(I)Lkotlin/sequences/Sequence;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/d;->b:I
+
+    add-int/2addr v0, p1
+
+    if-gez v0, :cond_0
+
+    new-instance v0, Lk0/t/d;
+
+    invoke-direct {v0, p0, p1}, Lk0/t/d;-><init>(Lkotlin/sequences/Sequence;I)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lk0/t/d;
+
+    iget-object v1, p0, Lk0/t/d;->a:Lkotlin/sequences/Sequence;
+
+    invoke-direct {p1, v1, v0}, Lk0/t/d;-><init>(Lkotlin/sequences/Sequence;I)V
+
+    move-object v0, p1
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/d$a;
+
+    invoke-direct {v0, p0}, Lk0/t/d$a;-><init>(Lk0/t/d;)V
+
+    return-object v0
+.end method
+
+.method public take(I)Lkotlin/sequences/Sequence;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/d;->b:I
+
+    add-int v1, v0, p1
+
+    if-gez v1, :cond_0
+
+    new-instance v0, Lk0/t/t;
+
+    invoke-direct {v0, p0, p1}, Lk0/t/t;-><init>(Lkotlin/sequences/Sequence;I)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lk0/t/s;
+
+    iget-object v2, p0, Lk0/t/d;->a:Lkotlin/sequences/Sequence;
+
+    invoke-direct {p1, v2, v0, v1}, Lk0/t/s;-><init>(Lkotlin/sequences/Sequence;II)V
+
+    move-object v0, p1
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/e.smali b/com.discord/smali_classes2/k0/t/e.smali
new file mode 100644
index 0000000000..7464511024
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/e.smali
@@ -0,0 +1,41 @@
+.class public interface abstract Lk0/t/e;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract drop(I)Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end method
+
+.method public abstract take(I)Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/k0/t/f.smali b/com.discord/smali_classes2/k0/t/f.smali
new file mode 100644
index 0000000000..104f4eece7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/f.smali
@@ -0,0 +1,59 @@
+.class public final Lk0/t/f;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+.implements Lk0/t/e;
+
+
+# static fields
+.field public static final a:Lk0/t/f;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/t/f;
+
+    invoke-direct {v0}, Lk0/t/f;-><init>()V
+
+    sput-object v0, Lk0/t/f;->a:Lk0/t/f;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public drop(I)Lkotlin/sequences/Sequence;
+    .locals 0
+
+    sget-object p1, Lk0/t/f;->a:Lk0/t/f;
+
+    return-object p1
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+
+    sget-object v0, Lk0/j/m;->d:Lk0/j/m;
+
+    return-object v0
+.end method
+
+.method public take(I)Lkotlin/sequences/Sequence;
+    .locals 0
+
+    sget-object p1, Lk0/t/f;->a:Lk0/t/f;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/t/g$a.smali b/com.discord/smali_classes2/k0/t/g$a.smali
new file mode 100644
index 0000000000..442d8701e7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/g$a.smali
@@ -0,0 +1,213 @@
+.class public final Lk0/t/g$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/t/g;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:I
+
+.field public f:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic g:Lk0/t/g;
+
+
+# direct methods
+.method public constructor <init>(Lk0/t/g;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/t/g$a;->g:Lk0/t/g;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-object p1, p1, Lk0/t/g;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lk0/t/g$a;->d:Ljava/util/Iterator;
+
+    const/4 p1, -0x1
+
+    iput p1, p0, Lk0/t/g$a;->e:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 3
+
+    :cond_0
+    iget-object v0, p0, Lk0/t/g$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lk0/t/g$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lk0/t/g$a;->g:Lk0/t/g;
+
+    iget-object v1, v1, Lk0/t/g;->c:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Boolean;
+
+    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v1
+
+    iget-object v2, p0, Lk0/t/g$a;->g:Lk0/t/g;
+
+    iget-boolean v2, v2, Lk0/t/g;->b:Z
+
+    if-ne v1, v2, :cond_0
+
+    iput-object v0, p0, Lk0/t/g$a;->f:Ljava/lang/Object;
+
+    const/4 v0, 0x1
+
+    iput v0, p0, Lk0/t/g$a;->e:I
+
+    return-void
+
+    :cond_1
+    const/4 v0, 0x0
+
+    iput v0, p0, Lk0/t/g$a;->e:I
+
+    return-void
+.end method
+
+.method public hasNext()Z
+    .locals 2
+
+    iget v0, p0, Lk0/t/g$a;->e:I
+
+    const/4 v1, -0x1
+
+    if-ne v0, v1, :cond_0
+
+    invoke-virtual {p0}, Lk0/t/g$a;->a()V
+
+    :cond_0
+    iget v0, p0, Lk0/t/g$a;->e:I
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/g$a;->e:I
+
+    const/4 v1, -0x1
+
+    if-ne v0, v1, :cond_0
+
+    invoke-virtual {p0}, Lk0/t/g$a;->a()V
+
+    :cond_0
+    iget v0, p0, Lk0/t/g$a;->e:I
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lk0/t/g$a;->f:Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    iput-object v2, p0, Lk0/t/g$a;->f:Ljava/lang/Object;
+
+    iput v1, p0, Lk0/t/g$a;->e:I
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/g.smali b/com.discord/smali_classes2/k0/t/g.smali
new file mode 100644
index 0000000000..d15642fcd6
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/g.smali
@@ -0,0 +1,97 @@
+.class public final Lk0/t/g;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Z
+
+.field public final c:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "TT;",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;ZLkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;Z",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "sequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "predicate"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/g;->a:Lkotlin/sequences/Sequence;
+
+    iput-boolean p2, p0, Lk0/t/g;->b:Z
+
+    iput-object p3, p0, Lk0/t/g;->c:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/g$a;
+
+    invoke-direct {v0, p0}, Lk0/t/g$a;-><init>(Lk0/t/g;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/h$a.smali b/com.discord/smali_classes2/k0/t/h$a.smali
new file mode 100644
index 0000000000..1d4d905c30
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/h$a.smali
@@ -0,0 +1,201 @@
+.class public final Lk0/t/h$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/t/h;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TE;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "+TE;>;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic f:Lk0/t/h;
+
+
+# direct methods
+.method public constructor <init>(Lk0/t/h;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/t/h$a;->f:Lk0/t/h;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-object p1, p1, Lk0/t/h;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lk0/t/h$a;->d:Ljava/util/Iterator;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Z
+    .locals 4
+
+    iget-object v0, p0, Lk0/t/h$a;->e:Ljava/util/Iterator;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lk0/t/h$a;->e:Ljava/util/Iterator;
+
+    :cond_0
+    iget-object v0, p0, Lk0/t/h$a;->e:Ljava/util/Iterator;
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lk0/t/h$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_1
+    iget-object v0, p0, Lk0/t/h$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v2, p0, Lk0/t/h$a;->f:Lk0/t/h;
+
+    iget-object v3, v2, Lk0/t/h;->c:Lkotlin/jvm/functions/Function1;
+
+    iget-object v2, v2, Lk0/t/h;->b:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v2, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-interface {v3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iput-object v0, p0, Lk0/t/h$a;->e:Ljava/util/Iterator;
+
+    :cond_2
+    return v1
+.end method
+
+.method public hasNext()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lk0/t/h$a;->a()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/t/h$a;->a()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/t/h$a;->e:Ljava/util/Iterator;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/h.smali b/com.discord/smali_classes2/k0/t/h.smali
new file mode 100644
index 0000000000..a3752c74ca
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/h.smali
@@ -0,0 +1,114 @@
+.class public final Lk0/t/h;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        "E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "TR;",
+            "Ljava/util/Iterator<",
+            "TE;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+TR;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TR;+",
+            "Ljava/util/Iterator<",
+            "+TE;>;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "sequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "transformer"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "iterator"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/h;->a:Lkotlin/sequences/Sequence;
+
+    iput-object p2, p0, Lk0/t/h;->b:Lkotlin/jvm/functions/Function1;
+
+    iput-object p3, p0, Lk0/t/h;->c:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/h$a;
+
+    invoke-direct {v0, p0}, Lk0/t/h$a;-><init>(Lk0/t/h;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/i$a.smali b/com.discord/smali_classes2/k0/t/i$a.smali
new file mode 100644
index 0000000000..83c1ec305a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/i$a.smali
@@ -0,0 +1,197 @@
+.class public final Lk0/t/i$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/t/i;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public e:I
+
+.field public final synthetic f:Lk0/t/i;
+
+
+# direct methods
+.method public constructor <init>(Lk0/t/i;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/t/i$a;->f:Lk0/t/i;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 p1, -0x2
+
+    iput p1, p0, Lk0/t/i$a;->e:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 2
+
+    iget v0, p0, Lk0/t/i$a;->e:I
+
+    const/4 v1, -0x2
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lk0/t/i$a;->f:Lk0/t/i;
+
+    iget-object v0, v0, Lk0/t/i;->a:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lk0/t/i$a;->f:Lk0/t/i;
+
+    iget-object v0, v0, Lk0/t/i;->b:Lkotlin/jvm/functions/Function1;
+
+    iget-object v1, p0, Lk0/t/i$a;->d:Ljava/lang/Object;
+
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_0
+    iput-object v0, p0, Lk0/t/i$a;->d:Ljava/lang/Object;
+
+    if-nez v0, :cond_1
+
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x1
+
+    :goto_1
+    iput v0, p0, Lk0/t/i$a;->e:I
+
+    return-void
+.end method
+
+.method public hasNext()Z
+    .locals 2
+
+    iget v0, p0, Lk0/t/i$a;->e:I
+
+    if-gez v0, :cond_0
+
+    invoke-virtual {p0}, Lk0/t/i$a;->a()V
+
+    :cond_0
+    iget v0, p0, Lk0/t/i$a;->e:I
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/i$a;->e:I
+
+    if-gez v0, :cond_0
+
+    invoke-virtual {p0}, Lk0/t/i$a;->a()V
+
+    :cond_0
+    iget v0, p0, Lk0/t/i$a;->e:I
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Lk0/t/i$a;->d:Ljava/lang/Object;
+
+    if-eqz v0, :cond_1
+
+    const/4 v1, -0x1
+
+    iput v1, p0, Lk0/t/i$a;->e:I
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "null cannot be cast to non-null type T"
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/i.smali b/com.discord/smali_classes2/k0/t/i.smali
new file mode 100644
index 0000000000..bbf5cf2618
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/i.smali
@@ -0,0 +1,89 @@
+.class public final Lk0/t/i;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/jvm/functions/Function0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function0<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "TT;TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function0<",
+            "+TT;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "getInitialValue"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "getNextValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/i;->a:Lkotlin/jvm/functions/Function0;
+
+    iput-object p2, p0, Lk0/t/i;->b:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/i$a;
+
+    invoke-direct {v0, p0}, Lk0/t/i$a;-><init>(Lk0/t/i;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/j.smali b/com.discord/smali_classes2/k0/t/j.smali
new file mode 100644
index 0000000000..21104d161a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/j.smali
@@ -0,0 +1,49 @@
+.class public final Lk0/t/j;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Ljava/util/Iterator;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/Iterator;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/t/j;->a:Ljava/util/Iterator;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/t/j;->a:Ljava/util/Iterator;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/k.smali b/com.discord/smali_classes2/k0/t/k.smali
new file mode 100644
index 0000000000..3a91a8715e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/k.smali
@@ -0,0 +1,65 @@
+.class public final Lk0/t/k;
+.super Lk0/o/c/j;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lkotlin/sequences/Sequence<",
+        "+TT;>;",
+        "Ljava/util/Iterator<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/t/k;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/t/k;
+
+    invoke-direct {v0}, Lk0/t/k;-><init>()V
+
+    sput-object v0, Lk0/t/k;->d:Lk0/t/k;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lkotlin/sequences/Sequence;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/t/l.smali b/com.discord/smali_classes2/k0/t/l.smali
new file mode 100644
index 0000000000..37513e8503
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/l.smali
@@ -0,0 +1,65 @@
+.class public final Lk0/t/l;
+.super Lk0/o/c/j;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Iterable<",
+        "+TT;>;",
+        "Ljava/util/Iterator<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/t/l;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/t/l;
+
+    invoke-direct {v0}, Lk0/t/l;-><init>()V
+
+    sput-object v0, Lk0/t/l;->d:Lk0/t/l;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/t/m.smali b/com.discord/smali_classes2/k0/t/m.smali
new file mode 100644
index 0000000000..33960f7989
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/m.smali
@@ -0,0 +1,57 @@
+.class public final Lk0/t/m;
+.super Lk0/o/c/j;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/t/m;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/t/m;
+
+    invoke-direct {v0}, Lk0/t/m;-><init>()V
+
+    sput-object v0, Lk0/t/m;->d:Lk0/t/m;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)TT;"
+        }
+    .end annotation
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/t/n.smali b/com.discord/smali_classes2/k0/t/n.smali
new file mode 100644
index 0000000000..8ba942c544
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/n.smali
@@ -0,0 +1,55 @@
+.class public final Lk0/t/n;
+.super Ljava/lang/Object;
+.source "Iterables.kt"
+
+# interfaces
+.implements Ljava/lang/Iterable;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/lang/Iterable<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lkotlin/sequences/Sequence;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/t/n;->d:Lkotlin/sequences/Sequence;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/t/n;->d:Lkotlin/sequences/Sequence;
+
+    invoke-interface {v0}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/o.smali b/com.discord/smali_classes2/k0/t/o.smali
new file mode 100644
index 0000000000..c475788600
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/o.smali
@@ -0,0 +1,57 @@
+.class public final Lk0/t/o;
+.super Lk0/o/c/j;
+.source "_Sequences.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/t/o;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/t/o;
+
+    invoke-direct {v0}, Lk0/t/o;-><init>()V
+
+    sput-object v0, Lk0/t/o;->d:Lk0/t/o;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)TT;"
+        }
+    .end annotation
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/t/p.smali b/com.discord/smali_classes2/k0/t/p.smali
new file mode 100644
index 0000000000..196db1cbc4
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/p.smali
@@ -0,0 +1,68 @@
+.class public final Lk0/t/p;
+.super Lk0/o/c/j;
+.source "_Sequences.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "TT;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/t/p;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/t/p;
+
+    invoke-direct {v0}, Lk0/t/p;-><init>()V
+
+    sput-object v0, Lk0/t/p;->d:Lk0/t/p;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/t/q.smali b/com.discord/smali_classes2/k0/t/q.smali
new file mode 100644
index 0000000000..5dec972091
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/q.smali
@@ -0,0 +1,66 @@
+.class public final Lk0/t/q;
+.super Ljava/lang/Object;
+.source "_Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lkotlin/sequences/Sequence;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/t/q;->a:Lkotlin/sequences/Sequence;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/t/q;->a:Lkotlin/sequences/Sequence;
+
+    invoke-static {v0}, Lf/n/a/k/a;->toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->sort(Ljava/util/List;)V
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/r.smali b/com.discord/smali_classes2/k0/t/r.smali
new file mode 100644
index 0000000000..cbe1c75be1
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/r.smali
@@ -0,0 +1,74 @@
+.class public final Lk0/t/r;
+.super Ljava/lang/Object;
+.source "_Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lkotlin/sequences/Sequence;
+
+.field public final synthetic b:Ljava/util/Comparator;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;Ljava/util/Comparator;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;",
+            "Ljava/util/Comparator;",
+            ")V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/t/r;->a:Lkotlin/sequences/Sequence;
+
+    iput-object p2, p0, Lk0/t/r;->b:Ljava/util/Comparator;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/t/r;->a:Lkotlin/sequences/Sequence;
+
+    invoke-static {v0}, Lf/n/a/k/a;->toMutableList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lk0/t/r;->b:Ljava/util/Comparator;
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->sortWith(Ljava/util/List;Ljava/util/Comparator;)V
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/s$a.smali b/com.discord/smali_classes2/k0/t/s$a.smali
new file mode 100644
index 0000000000..40ebc73895
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/s$a.smali
@@ -0,0 +1,187 @@
+.class public final Lk0/t/s$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/t/s;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:I
+
+.field public final synthetic f:Lk0/t/s;
+
+
+# direct methods
+.method public constructor <init>(Lk0/t/s;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/t/s$a;->f:Lk0/t/s;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-object p1, p1, Lk0/t/s;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lk0/t/s$a;->d:Ljava/util/Iterator;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 2
+
+    :goto_0
+    iget v0, p0, Lk0/t/s$a;->e:I
+
+    iget-object v1, p0, Lk0/t/s$a;->f:Lk0/t/s;
+
+    iget v1, v1, Lk0/t/s;->b:I
+
+    if-ge v0, v1, :cond_0
+
+    iget-object v0, p0, Lk0/t/s$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lk0/t/s$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    iget v0, p0, Lk0/t/s$a;->e:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lk0/t/s$a;->e:I
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public hasNext()Z
+    .locals 2
+
+    invoke-virtual {p0}, Lk0/t/s$a;->a()V
+
+    iget v0, p0, Lk0/t/s$a;->e:I
+
+    iget-object v1, p0, Lk0/t/s$a;->f:Lk0/t/s;
+
+    iget v1, v1, Lk0/t/s;->c:I
+
+    if-ge v0, v1, :cond_0
+
+    iget-object v0, p0, Lk0/t/s$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lk0/t/s$a;->a()V
+
+    iget v0, p0, Lk0/t/s$a;->e:I
+
+    iget-object v1, p0, Lk0/t/s$a;->f:Lk0/t/s;
+
+    iget v1, v1, Lk0/t/s;->c:I
+
+    if-ge v0, v1, :cond_0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lk0/t/s$a;->e:I
+
+    iget-object v0, p0, Lk0/t/s$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/s.smali b/com.discord/smali_classes2/k0/t/s.smali
new file mode 100644
index 0000000000..30f6f0ead9
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/s.smali
@@ -0,0 +1,280 @@
+.class public final Lk0/t/s;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+.implements Lk0/t/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;",
+        "Lk0/t/e<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:I
+
+.field public final c:I
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;II)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;II)V"
+        }
+    .end annotation
+
+    const-string v0, "sequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/s;->a:Lkotlin/sequences/Sequence;
+
+    iput p2, p0, Lk0/t/s;->b:I
+
+    iput p3, p0, Lk0/t/s;->c:I
+
+    const/4 p1, 0x1
+
+    if-ltz p2, :cond_0
+
+    const/4 p2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p2, 0x0
+
+    :goto_0
+    if-eqz p2, :cond_5
+
+    iget p2, p0, Lk0/t/s;->c:I
+
+    if-ltz p2, :cond_1
+
+    const/4 p2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_1
+    if-eqz p2, :cond_4
+
+    iget p2, p0, Lk0/t/s;->c:I
+
+    iget p3, p0, Lk0/t/s;->b:I
+
+    if-lt p2, p3, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    :goto_2
+    if-eqz p1, :cond_3
+
+    return-void
+
+    :cond_3
+    const-string p1, "endIndex should be not less than startIndex, but was "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lk0/t/s;->c:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string p2, " < "
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget p2, p0, Lk0/t/s;->b:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_4
+    const-string p1, "endIndex should be non-negative, but is "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lk0/t/s;->c:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_5
+    const-string p1, "startIndex should be non-negative, but is "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lk0/t/s;->b:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+
+# virtual methods
+.method public drop(I)Lkotlin/sequences/Sequence;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/s;->c:I
+
+    iget v1, p0, Lk0/t/s;->b:I
+
+    sub-int v2, v0, v1
+
+    if-lt p1, v2, :cond_0
+
+    sget-object p1, Lk0/t/f;->a:Lk0/t/f;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v2, Lk0/t/s;
+
+    iget-object v3, p0, Lk0/t/s;->a:Lkotlin/sequences/Sequence;
+
+    add-int/2addr v1, p1
+
+    invoke-direct {v2, v3, v1, v0}, Lk0/t/s;-><init>(Lkotlin/sequences/Sequence;II)V
+
+    move-object p1, v2
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/s$a;
+
+    invoke-direct {v0, p0}, Lk0/t/s$a;-><init>(Lk0/t/s;)V
+
+    return-object v0
+.end method
+
+.method public take(I)Lkotlin/sequences/Sequence;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/s;->c:I
+
+    iget v1, p0, Lk0/t/s;->b:I
+
+    sub-int/2addr v0, v1
+
+    if-lt p1, v0, :cond_0
+
+    move-object v0, p0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lk0/t/s;
+
+    iget-object v2, p0, Lk0/t/s;->a:Lkotlin/sequences/Sequence;
+
+    add-int/2addr p1, v1
+
+    invoke-direct {v0, v2, v1, p1}, Lk0/t/s;-><init>(Lkotlin/sequences/Sequence;II)V
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/t$a.smali b/com.discord/smali_classes2/k0/t/t$a.smali
new file mode 100644
index 0000000000..8776ba4669
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/t$a.smali
@@ -0,0 +1,139 @@
+.class public final Lk0/t/t$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/t/t;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public final e:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lk0/t/t;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget v0, p1, Lk0/t/t;->b:I
+
+    iput v0, p0, Lk0/t/t$a;->d:I
+
+    iget-object p1, p1, Lk0/t/t;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lk0/t/t$a;->e:Ljava/util/Iterator;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public hasNext()Z
+    .locals 1
+
+    iget v0, p0, Lk0/t/t$a;->d:I
+
+    if-lez v0, :cond_0
+
+    iget-object v0, p0, Lk0/t/t$a;->e:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/t$a;->d:I
+
+    if-eqz v0, :cond_0
+
+    add-int/lit8 v0, v0, -0x1
+
+    iput v0, p0, Lk0/t/t$a;->d:I
+
+    iget-object v0, p0, Lk0/t/t$a;->e:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/t.smali b/com.discord/smali_classes2/k0/t/t.smali
new file mode 100644
index 0000000000..b3a8bccda1
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/t.smali
@@ -0,0 +1,176 @@
+.class public final Lk0/t/t;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+.implements Lk0/t/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TT;>;",
+        "Lk0/t/e<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:I
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;I)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;I)V"
+        }
+    .end annotation
+
+    const-string v0, "sequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/t;->a:Lkotlin/sequences/Sequence;
+
+    iput p2, p0, Lk0/t/t;->b:I
+
+    if-ltz p2, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
+
+    return-void
+
+    :cond_1
+    const-string p1, "count must be non-negative, but was "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lk0/t/t;->b:I
+
+    const/16 v0, 0x2e
+
+    invoke-static {p1, p2, v0}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+
+# virtual methods
+.method public drop(I)Lkotlin/sequences/Sequence;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/t;->b:I
+
+    if-lt p1, v0, :cond_0
+
+    sget-object p1, Lk0/t/f;->a:Lk0/t/f;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Lk0/t/s;
+
+    iget-object v2, p0, Lk0/t/t;->a:Lkotlin/sequences/Sequence;
+
+    invoke-direct {v1, v2, p1, v0}, Lk0/t/s;-><init>(Lkotlin/sequences/Sequence;II)V
+
+    move-object p1, v1
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/t$a;
+
+    invoke-direct {v0, p0}, Lk0/t/t$a;-><init>(Lk0/t/t;)V
+
+    return-object v0
+.end method
+
+.method public take(I)Lkotlin/sequences/Sequence;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)",
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget v0, p0, Lk0/t/t;->b:I
+
+    if-lt p1, v0, :cond_0
+
+    move-object v0, p0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lk0/t/t;
+
+    iget-object v1, p0, Lk0/t/t;->a:Lkotlin/sequences/Sequence;
+
+    invoke-direct {v0, v1, p1}, Lk0/t/t;-><init>(Lkotlin/sequences/Sequence;I)V
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/u$a.smali b/com.discord/smali_classes2/k0/t/u$a.smali
new file mode 100644
index 0000000000..bd9b147dca
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/u$a.smali
@@ -0,0 +1,116 @@
+.class public final Lk0/t/u$a;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/t/u;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TR;>;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic e:Lk0/t/u;
+
+
+# direct methods
+.method public constructor <init>(Lk0/t/u;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/t/u$a;->e:Lk0/t/u;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-object p1, p1, Lk0/t/u;->a:Lkotlin/sequences/Sequence;
+
+    invoke-interface {p1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lk0/t/u$a;->d:Ljava/util/Iterator;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public hasNext()Z
+    .locals 1
+
+    iget-object v0, p0, Lk0/t/u$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TR;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/t/u$a;->e:Lk0/t/u;
+
+    iget-object v0, v0, Lk0/t/u;->b:Lkotlin/jvm/functions/Function1;
+
+    iget-object v1, p0, Lk0/t/u$a;->d:Ljava/util/Iterator;
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/t/u.smali b/com.discord/smali_classes2/k0/t/u.smali
new file mode 100644
index 0000000000..fb03b8ddf7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/t/u.smali
@@ -0,0 +1,91 @@
+.class public final Lk0/t/u;
+.super Ljava/lang/Object;
+.source "Sequences.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lkotlin/sequences/Sequence;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/sequences/Sequence<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/sequences/Sequence<",
+            "+TT;>;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+TR;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "sequence"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "transformer"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/t/u;->a:Lkotlin/sequences/Sequence;
+
+    iput-object p2, p0, Lk0/t/u;->b:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TR;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/t/u$a;
+
+    invoke-direct {v0, p0}, Lk0/t/u$a;-><init>(Lk0/t/u;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/u/a.smali b/com.discord/smali_classes2/k0/u/a.smali
new file mode 100644
index 0000000000..c6fa2b0887
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/a.smali
@@ -0,0 +1,83 @@
+.class public final Lk0/u/a;
+.super Ljava/lang/Object;
+.source "Charsets.kt"
+
+
+# static fields
+.field public static final a:Ljava/nio/charset/Charset;
+
+.field public static b:Ljava/nio/charset/Charset;
+
+.field public static c:Ljava/nio/charset/Charset;
+
+.field public static final d:Lk0/u/a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-string v0, "UTF-8"
+
+    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object v0
+
+    const-string v1, "Charset.forName(\"UTF-8\")"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    const-string v0, "UTF-16"
+
+    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object v0
+
+    const-string v1, "Charset.forName(\"UTF-16\")"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "UTF-16BE"
+
+    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object v0
+
+    const-string v1, "Charset.forName(\"UTF-16BE\")"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "UTF-16LE"
+
+    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object v0
+
+    const-string v1, "Charset.forName(\"UTF-16LE\")"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "US-ASCII"
+
+    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object v0
+
+    const-string v1, "Charset.forName(\"US-ASCII\")"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ISO-8859-1"
+
+    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object v0
+
+    const-string v1, "Charset.forName(\"ISO-8859-1\")"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/u/b$a.smali b/com.discord/smali_classes2/k0/u/b$a.smali
new file mode 100644
index 0000000000..93364be307
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/b$a.smali
@@ -0,0 +1,323 @@
+.class public final Lk0/u/b$a;
+.super Ljava/lang/Object;
+.source "Strings.kt"
+
+# interfaces
+.implements Ljava/util/Iterator;
+.implements Lk0/o/c/w/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/u/b;->iterator()Ljava/util/Iterator;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "Lkotlin/ranges/IntRange;",
+        ">;",
+        "Lk0/o/c/w/a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public e:I
+
+.field public f:I
+
+.field public g:Lkotlin/ranges/IntRange;
+
+.field public h:I
+
+.field public final synthetic i:Lk0/u/b;
+
+
+# direct methods
+.method public constructor <init>(Lk0/u/b;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/u/b$a;->i:Lk0/u/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, -0x1
+
+    iput v0, p0, Lk0/u/b$a;->d:I
+
+    iget v0, p1, Lk0/u/b;->b:I
+
+    iget-object p1, p1, Lk0/u/b;->a:Ljava/lang/CharSequence;
+
+    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
+
+    move-result p1
+
+    const/4 v1, 0x0
+
+    invoke-static {v0, v1, p1}, Lk0/r/f;->coerceIn(III)I
+
+    move-result p1
+
+    iput p1, p0, Lk0/u/b$a;->e:I
+
+    iput p1, p0, Lk0/u/b$a;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 6
+
+    iget v0, p0, Lk0/u/b$a;->f:I
+
+    const/4 v1, 0x0
+
+    if-gez v0, :cond_0
+
+    iput v1, p0, Lk0/u/b$a;->d:I
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lk0/u/b$a;->g:Lkotlin/ranges/IntRange;
+
+    goto/16 :goto_1
+
+    :cond_0
+    iget-object v0, p0, Lk0/u/b$a;->i:Lk0/u/b;
+
+    iget v0, v0, Lk0/u/b;->c:I
+
+    const/4 v2, -0x1
+
+    const/4 v3, 0x1
+
+    if-lez v0, :cond_1
+
+    iget v4, p0, Lk0/u/b$a;->h:I
+
+    add-int/2addr v4, v3
+
+    iput v4, p0, Lk0/u/b$a;->h:I
+
+    if-ge v4, v0, :cond_2
+
+    :cond_1
+    iget v0, p0, Lk0/u/b$a;->f:I
+
+    iget-object v4, p0, Lk0/u/b$a;->i:Lk0/u/b;
+
+    iget-object v4, v4, Lk0/u/b;->a:Ljava/lang/CharSequence;
+
+    invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
+
+    move-result v4
+
+    if-le v0, v4, :cond_3
+
+    :cond_2
+    iget v0, p0, Lk0/u/b$a;->e:I
+
+    new-instance v1, Lkotlin/ranges/IntRange;
+
+    iget-object v4, p0, Lk0/u/b$a;->i:Lk0/u/b;
+
+    iget-object v4, v4, Lk0/u/b;->a:Ljava/lang/CharSequence;
+
+    invoke-static {v4}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
+
+    move-result v4
+
+    invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    iput-object v1, p0, Lk0/u/b$a;->g:Lkotlin/ranges/IntRange;
+
+    iput v2, p0, Lk0/u/b$a;->f:I
+
+    goto :goto_0
+
+    :cond_3
+    iget-object v0, p0, Lk0/u/b$a;->i:Lk0/u/b;
+
+    iget-object v4, v0, Lk0/u/b;->d:Lkotlin/jvm/functions/Function2;
+
+    iget-object v0, v0, Lk0/u/b;->a:Ljava/lang/CharSequence;
+
+    iget v5, p0, Lk0/u/b$a;->f:I
+
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v5
+
+    invoke-interface {v4, v0, v5}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlin/Pair;
+
+    if-nez v0, :cond_4
+
+    iget v0, p0, Lk0/u/b$a;->e:I
+
+    new-instance v1, Lkotlin/ranges/IntRange;
+
+    iget-object v4, p0, Lk0/u/b$a;->i:Lk0/u/b;
+
+    iget-object v4, v4, Lk0/u/b;->a:Ljava/lang/CharSequence;
+
+    invoke-static {v4}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
+
+    move-result v4
+
+    invoke-direct {v1, v0, v4}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    iput-object v1, p0, Lk0/u/b$a;->g:Lkotlin/ranges/IntRange;
+
+    iput v2, p0, Lk0/u/b$a;->f:I
+
+    goto :goto_0
+
+    :cond_4
+    iget-object v2, v0, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    check-cast v2, Ljava/lang/Number;
+
+    invoke-virtual {v2}, Ljava/lang/Number;->intValue()I
+
+    move-result v2
+
+    iget-object v0, v0, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v0
+
+    iget v4, p0, Lk0/u/b$a;->e:I
+
+    invoke-static {v4, v2}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
+
+    move-result-object v4
+
+    iput-object v4, p0, Lk0/u/b$a;->g:Lkotlin/ranges/IntRange;
+
+    add-int/2addr v2, v0
+
+    iput v2, p0, Lk0/u/b$a;->e:I
+
+    if-nez v0, :cond_5
+
+    const/4 v1, 0x1
+
+    :cond_5
+    add-int/2addr v2, v1
+
+    iput v2, p0, Lk0/u/b$a;->f:I
+
+    :goto_0
+    iput v3, p0, Lk0/u/b$a;->d:I
+
+    :goto_1
+    return-void
+.end method
+
+.method public hasNext()Z
+    .locals 2
+
+    iget v0, p0, Lk0/u/b$a;->d:I
+
+    const/4 v1, -0x1
+
+    if-ne v0, v1, :cond_0
+
+    invoke-virtual {p0}, Lk0/u/b$a;->a()V
+
+    :cond_0
+    iget v0, p0, Lk0/u/b$a;->d:I
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 3
+
+    iget v0, p0, Lk0/u/b$a;->d:I
+
+    const/4 v1, -0x1
+
+    if-ne v0, v1, :cond_0
+
+    invoke-virtual {p0}, Lk0/u/b$a;->a()V
+
+    :cond_0
+    iget v0, p0, Lk0/u/b$a;->d:I
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Lk0/u/b$a;->g:Lkotlin/ranges/IntRange;
+
+    if-eqz v0, :cond_1
+
+    const/4 v2, 0x0
+
+    iput-object v2, p0, Lk0/u/b$a;->g:Lkotlin/ranges/IntRange;
+
+    iput v1, p0, Lk0/u/b$a;->d:I
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "null cannot be cast to non-null type kotlin.ranges.IntRange"
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Operation is not supported for read-only collection"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/k0/u/b.smali b/com.discord/smali_classes2/k0/u/b.smali
new file mode 100644
index 0000000000..e81ec81df4
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/b.smali
@@ -0,0 +1,101 @@
+.class public final Lk0/u/b;
+.super Ljava/lang/Object;
+.source "Strings.kt"
+
+# interfaces
+.implements Lkotlin/sequences/Sequence;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/sequences/Sequence<",
+        "Lkotlin/ranges/IntRange;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/CharSequence;
+
+.field public final b:I
+
+.field public final c:I
+
+.field public final d:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "Ljava/lang/CharSequence;",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Pair<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function2;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/CharSequence;",
+            "II",
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Ljava/lang/CharSequence;",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Pair<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
+            ">;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "getNextMatch"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/u/b;->a:Ljava/lang/CharSequence;
+
+    iput p2, p0, Lk0/u/b;->b:I
+
+    iput p3, p0, Lk0/u/b;->c:I
+
+    iput-object p4, p0, Lk0/u/b;->d:Lkotlin/jvm/functions/Function2;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "Lkotlin/ranges/IntRange;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Lk0/u/b$a;
+
+    invoke-direct {v0, p0}, Lk0/u/b$a;-><init>(Lk0/u/b;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/u/c$a.smali b/com.discord/smali_classes2/k0/u/c$a.smali
new file mode 100644
index 0000000000..1101f515c7
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/c$a.smali
@@ -0,0 +1,146 @@
+.class public final Lk0/u/c$a;
+.super Lk0/j/c;
+.source "Regex.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/u/c;->getGroupValues()Ljava/util/List;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/j/c<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lk0/u/c;
+
+
+# direct methods
+.method public constructor <init>(Lk0/u/c;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lk0/u/c$a;->d:Lk0/u/c;
+
+    invoke-direct {p0}, Lk0/j/c;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge contains(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Ljava/lang/String;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-super {p0, p1}, Lk0/j/a;->contains(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public get(I)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lk0/u/c$a;->d:Lk0/u/c;
+
+    iget-object v0, v0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v0, p1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p1, ""
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public getSize()I
+    .locals 1
+
+    iget-object v0, p0, Lk0/u/c$a;->d:Lk0/u/c;
+
+    iget-object v0, v0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->groupCount()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    return v0
+.end method
+
+.method public final bridge indexOf(Ljava/lang/Object;)I
+    .locals 1
+
+    instance-of v0, p1, Ljava/lang/String;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-super {p0, p1}, Lk0/j/c;->indexOf(Ljava/lang/Object;)I
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    const/4 p1, -0x1
+
+    return p1
+.end method
+
+.method public final bridge lastIndexOf(Ljava/lang/Object;)I
+    .locals 1
+
+    instance-of v0, p1, Ljava/lang/String;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-super {p0, p1}, Lk0/j/c;->lastIndexOf(Ljava/lang/Object;)I
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    const/4 p1, -0x1
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/k0/u/c.smali b/com.discord/smali_classes2/k0/u/c.smali
new file mode 100644
index 0000000000..5beba008dc
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/c.smali
@@ -0,0 +1,190 @@
+.class public final Lk0/u/c;
+.super Ljava/lang/Object;
+.source "Regex.kt"
+
+# interfaces
+.implements Lkotlin/text/MatchResult;
+
+
+# instance fields
+.field public a:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/util/regex/Matcher;
+
+.field public final c:Ljava/lang/CharSequence;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+    .locals 1
+
+    const-string v0, "matcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "input"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    iput-object p2, p0, Lk0/u/c;->c:Ljava/lang/CharSequence;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getGroupValues()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lk0/u/c;->a:Ljava/util/List;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Lk0/u/c$a;
+
+    invoke-direct {v0, p0}, Lk0/u/c$a;-><init>(Lk0/u/c;)V
+
+    iput-object v0, p0, Lk0/u/c;->a:Ljava/util/List;
+
+    :cond_0
+    iget-object v0, p0, Lk0/u/c;->a:Ljava/util/List;
+
+    invoke-static {v0}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+.method public getRange()Lkotlin/ranges/IntRange;
+    .locals 2
+
+    iget-object v0, p0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->start()I
+
+    move-result v1
+
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->end()I
+
+    move-result v0
+
+    invoke-static {v1, v0}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getValue()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->group()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "matchResult.group()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public next()Lkotlin/text/MatchResult;
+    .locals 4
+
+    iget-object v0, p0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->end()I
+
+    move-result v0
+
+    iget-object v1, p0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v1}, Ljava/util/regex/Matcher;->end()I
+
+    move-result v1
+
+    iget-object v2, p0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v2}, Ljava/util/regex/Matcher;->start()I
+
+    move-result v2
+
+    if-ne v1, v2, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    add-int/2addr v0, v1
+
+    iget-object v1, p0, Lk0/u/c;->c:Ljava/lang/CharSequence;
+
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-gt v0, v1, :cond_2
+
+    iget-object v1, p0, Lk0/u/c;->b:Ljava/util/regex/Matcher;
+
+    invoke-virtual {v1}, Ljava/util/regex/Matcher;->pattern()Ljava/util/regex/Pattern;
+
+    move-result-object v1
+
+    iget-object v3, p0, Lk0/u/c;->c:Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, v3}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+
+    move-result-object v1
+
+    const-string v3, "matcher.pattern().matcher(input)"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v3, p0, Lk0/u/c;->c:Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, v0}, Ljava/util/regex/Matcher;->find(I)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v2, Lk0/u/c;
+
+    invoke-direct {v2, v1, v3}, Lk0/u/c;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+
+    :cond_2
+    :goto_1
+    return-object v2
+.end method
diff --git a/com.discord/smali_classes2/k0/u/d.smali b/com.discord/smali_classes2/k0/u/d.smali
new file mode 100644
index 0000000000..a0009f9d3d
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/d.smali
@@ -0,0 +1,217 @@
+.class public final enum Lk0/u/d;
+.super Ljava/lang/Enum;
+.source "Regex.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lk0/u/d;",
+        ">;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lk0/u/d;
+
+.field public static final enum e:Lk0/u/d;
+
+.field public static final synthetic f:[Lk0/u/d;
+
+
+# instance fields
+.field public final mask:I
+
+.field public final value:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 14
+
+    const/4 v0, 0x7
+
+    new-array v0, v0, [Lk0/u/d;
+
+    new-instance v7, Lk0/u/d;
+
+    const-string v2, "IGNORE_CASE"
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x2
+
+    move-object v1, v7
+
+    invoke-direct/range {v1 .. v6}, Lk0/u/d;-><init>(Ljava/lang/String;IIII)V
+
+    sput-object v7, Lk0/u/d;->d:Lk0/u/d;
+
+    const/4 v1, 0x0
+
+    aput-object v7, v0, v1
+
+    new-instance v1, Lk0/u/d;
+
+    const-string v9, "MULTILINE"
+
+    const/4 v10, 0x1
+
+    const/16 v11, 0x8
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x2
+
+    move-object v8, v1
+
+    invoke-direct/range {v8 .. v13}, Lk0/u/d;-><init>(Ljava/lang/String;IIII)V
+
+    sput-object v1, Lk0/u/d;->e:Lk0/u/d;
+
+    const/4 v2, 0x1
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lk0/u/d;
+
+    const-string v4, "LITERAL"
+
+    const/4 v5, 0x2
+
+    const/16 v6, 0x10
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x2
+
+    move-object v3, v1
+
+    invoke-direct/range {v3 .. v8}, Lk0/u/d;-><init>(Ljava/lang/String;IIII)V
+
+    const/4 v2, 0x2
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lk0/u/d;
+
+    const-string v4, "UNIX_LINES"
+
+    const/4 v5, 0x3
+
+    const/4 v6, 0x1
+
+    move-object v3, v1
+
+    invoke-direct/range {v3 .. v8}, Lk0/u/d;-><init>(Ljava/lang/String;IIII)V
+
+    const/4 v2, 0x3
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lk0/u/d;
+
+    const-string v4, "COMMENTS"
+
+    const/4 v5, 0x4
+
+    const/4 v6, 0x4
+
+    move-object v3, v1
+
+    invoke-direct/range {v3 .. v8}, Lk0/u/d;-><init>(Ljava/lang/String;IIII)V
+
+    const/4 v2, 0x4
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lk0/u/d;
+
+    const-string v4, "DOT_MATCHES_ALL"
+
+    const/4 v5, 0x5
+
+    const/16 v6, 0x20
+
+    move-object v3, v1
+
+    invoke-direct/range {v3 .. v8}, Lk0/u/d;-><init>(Ljava/lang/String;IIII)V
+
+    const/4 v2, 0x5
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lk0/u/d;
+
+    const-string v4, "CANON_EQ"
+
+    const/4 v5, 0x6
+
+    const/16 v6, 0x80
+
+    move-object v3, v1
+
+    invoke-direct/range {v3 .. v8}, Lk0/u/d;-><init>(Ljava/lang/String;IIII)V
+
+    const/4 v2, 0x6
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lk0/u/d;->f:[Lk0/u/d;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;IIII)V
+    .locals 0
+
+    and-int/lit8 p5, p5, 0x2
+
+    if-eqz p5, :cond_0
+
+    move p4, p3
+
+    :cond_0
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    iput p3, p0, Lk0/u/d;->value:I
+
+    iput p4, p0, Lk0/u/d;->mask:I
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lk0/u/d;
+    .locals 1
+
+    const-class v0, Lk0/u/d;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lk0/u/d;
+
+    return-object p0
+.end method
+
+.method public static values()[Lk0/u/d;
+    .locals 1
+
+    sget-object v0, Lk0/u/d;->f:[Lk0/u/d;
+
+    invoke-virtual {v0}, [Lk0/u/d;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lk0/u/d;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/u/e.smali b/com.discord/smali_classes2/k0/u/e.smali
new file mode 100644
index 0000000000..c3dd19a43e
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/e.smali
@@ -0,0 +1,12 @@
+.class public final Lk0/u/e;
+.super Lk0/u/s;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/s;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/u/f.smali b/com.discord/smali_classes2/k0/u/f.smali
new file mode 100644
index 0000000000..fe257e1bae
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/f.smali
@@ -0,0 +1,90 @@
+.class public Lk0/u/f;
+.super Ljava/lang/Object;
+.source "Appendable.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Appendable;",
+            "TT;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-TT;+",
+            "Ljava/lang/CharSequence;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$appendElement"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_0
+
+    invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+
+    goto :goto_1
+
+    :cond_0
+    if-eqz p1, :cond_1
+
+    instance-of p2, p1, Ljava/lang/CharSequence;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p2, 0x1
+
+    :goto_0
+    if-eqz p2, :cond_2
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+
+    goto :goto_1
+
+    :cond_2
+    instance-of p2, p1, Ljava/lang/Character;
+
+    if-eqz p2, :cond_3
+
+    check-cast p1, Ljava/lang/Character;
+
+    invoke-virtual {p1}, Ljava/lang/Character;->charValue()C
+
+    move-result p1
+
+    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(C)Ljava/lang/Appendable;
+
+    goto :goto_1
+
+    :cond_3
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Ljava/lang/Appendable;->append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;
+
+    :goto_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/u/g$a.smali b/com.discord/smali_classes2/k0/u/g$a.smali
new file mode 100644
index 0000000000..2491fbefcf
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/g$a.smali
@@ -0,0 +1,69 @@
+.class public final Lk0/u/g$a;
+.super Lk0/o/c/j;
+.source "Indent.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/u/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/u/g$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/u/g$a;
+
+    invoke-direct {v0}, Lk0/u/g$a;-><init>()V
+
+    sput-object v0, Lk0/u/g$a;->d:Lk0/u/g$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/String;
+
+    const-string v0, "line"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/u/g$b.smali b/com.discord/smali_classes2/k0/u/g$b.smali
new file mode 100644
index 0000000000..f2c8cbf350
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/g$b.smali
@@ -0,0 +1,69 @@
+.class public final Lk0/u/g$b;
+.super Lk0/o/c/j;
+.source "Indent.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lk0/u/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $indent:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/u/g$b;->$indent:Ljava/lang/String;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Ljava/lang/String;
+
+    const-string v0, "line"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lk0/u/g$b;->$indent:Ljava/lang/String;
+
+    invoke-static {v0, v1, p1}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/u/g.smali b/com.discord/smali_classes2/k0/u/g.smali
new file mode 100644
index 0000000000..72733ac9f4
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/g.smali
@@ -0,0 +1,315 @@
+.class public Lk0/u/g;
+.super Lk0/u/f;
+.source "Indent.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/f;-><init>()V
+
+    return-void
+.end method
+
+.method public static final a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")",
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    sget-object p0, Lk0/u/g$a;->d:Lk0/u/g$a;
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v0, Lk0/u/g$b;
+
+    invoke-direct {v0, p0}, Lk0/u/g$b;-><init>(Ljava/lang/String;)V
+
+    move-object p0, v0
+
+    :goto_1
+    return-object p0
+.end method
+
+.method public static trimMargin$default(Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+    .locals 13
+
+    and-int/lit8 p1, p2, 0x1
+
+    const/4 p2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const-string p1, "|"
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, p2
+
+    :goto_0
+    const-string v0, "$this$trimMargin"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "marginPrefix"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "$this$replaceIndentByMargin"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, ""
+
+    const-string v2, "newIndent"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_b
+
+    invoke-static {p0}, Lk0/u/p;->lines(Ljava/lang/CharSequence;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result p0
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    mul-int/lit8 v2, v2, 0x0
+
+    add-int/2addr v2, p0
+
+    invoke-static {v1}, Lk0/u/g;->a(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+
+    move-result-object p0
+
+    invoke-static {v0}, Lf/n/a/k/a;->getLastIndex(Ljava/util/List;)I
+
+    move-result v1
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const/4 v5, 0x0
+
+    :goto_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_a
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    add-int/lit8 v7, v5, 0x1
+
+    if-ltz v5, :cond_9
+
+    check-cast v6, Ljava/lang/String;
+
+    if-eqz v5, :cond_1
+
+    if-ne v5, v1, :cond_2
+
+    :cond_1
+    invoke-static {v6}, Lk0/u/k;->isBlank(Ljava/lang/CharSequence;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    move-object v6, p2
+
+    goto :goto_6
+
+    :cond_2
+    invoke-virtual {v6}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    const/4 v8, 0x0
+
+    :goto_2
+    const/4 v9, -0x1
+
+    if-ge v8, v5, :cond_4
+
+    invoke-virtual {v6, v8}, Ljava/lang/String;->charAt(I)C
+
+    move-result v10
+
+    invoke-static {v10}, Lf/n/a/k/a;->isWhitespace(C)Z
+
+    move-result v10
+
+    xor-int/lit8 v10, v10, 0x1
+
+    if-eqz v10, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    add-int/lit8 v8, v8, 0x1
+
+    goto :goto_2
+
+    :cond_4
+    const/4 v8, -0x1
+
+    :goto_3
+    if-ne v8, v9, :cond_5
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v5, 0x4
+
+    invoke-static {v6, p1, v8, v3, v5}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    add-int/2addr v5, v8
+
+    invoke-virtual {v6, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v8, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {v5, v8}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_5
+
+    :cond_6
+    :goto_4
+    move-object v5, p2
+
+    :goto_5
+    if-eqz v5, :cond_7
+
+    invoke-interface {p0, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/String;
+
+    if-eqz v5, :cond_7
+
+    move-object v6, v5
+
+    :cond_7
+    :goto_6
+    if-eqz v6, :cond_8
+
+    invoke-virtual {v4, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_8
+    move v5, v7
+
+    goto :goto_1
+
+    :cond_9
+    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
+
+    throw p2
+
+    :cond_a
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0, v2}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/16 v12, 0x7c
+
+    const-string v6, "\n"
+
+    move-object v5, p0
+
+    invoke-static/range {v4 .. v12}, Lk0/j/l;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/Appendable;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "mapIndexedNotNull { inde\u2026\"\\n\")\n        .toString()"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+
+    :cond_b
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string p1, "marginPrefix must be non-blank string."
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
diff --git a/com.discord/smali_classes2/k0/u/h.smali b/com.discord/smali_classes2/k0/u/h.smali
new file mode 100644
index 0000000000..2eb01a5321
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/h.smali
@@ -0,0 +1,13 @@
+.class public Lk0/u/h;
+.super Lk0/u/g;
+.source "RegexExtensions.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/g;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/u/i.smali b/com.discord/smali_classes2/k0/u/i.smali
new file mode 100644
index 0000000000..63519ad952
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/i.smali
@@ -0,0 +1,13 @@
+.class public Lk0/u/i;
+.super Lk0/u/h;
+.source "StringBuilder.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/h;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/u/j.smali b/com.discord/smali_classes2/k0/u/j.smali
new file mode 100644
index 0000000000..9b3b48161d
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/j.smali
@@ -0,0 +1,302 @@
+.class public Lk0/u/j;
+.super Lk0/u/i;
+.source "StringNumberConversions.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/i;-><init>()V
+
+    return-void
+.end method
+
+.method public static final toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+    .locals 11
+
+    const-string v0, "$this$toIntOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v0, 0xa
+
+    invoke-static {v0}, Lf/n/a/k/a;->checkRadix(I)I
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    goto :goto_4
+
+    :cond_0
+    const/4 v3, 0x0
+
+    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    const/16 v5, 0x30
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->compare(II)I
+
+    move-result v5
+
+    const v6, -0x7fffffff
+
+    const/4 v7, 0x1
+
+    if-gez v5, :cond_3
+
+    if-ne v1, v7, :cond_1
+
+    goto :goto_4
+
+    :cond_1
+    const/16 v5, 0x2d
+
+    if-ne v4, v5, :cond_2
+
+    const/high16 v6, -0x80000000
+
+    const/4 v4, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/16 v5, 0x2b
+
+    if-ne v4, v5, :cond_9
+
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v4, 0x0
+
+    :goto_0
+    const/4 v7, 0x0
+
+    :goto_1
+    const v5, -0x38e38e3
+
+    const v8, -0x38e38e3
+
+    :goto_2
+    if-ge v4, v1, :cond_7
+
+    invoke-virtual {p0, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v9
+
+    invoke-static {v9, v0}, Ljava/lang/Character;->digit(II)I
+
+    move-result v9
+
+    if-gez v9, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    if-ge v3, v8, :cond_5
+
+    if-ne v8, v5, :cond_9
+
+    div-int/lit8 v8, v6, 0xa
+
+    if-ge v3, v8, :cond_5
+
+    goto :goto_4
+
+    :cond_5
+    mul-int/lit8 v3, v3, 0xa
+
+    add-int v10, v6, v9
+
+    if-ge v3, v10, :cond_6
+
+    goto :goto_4
+
+    :cond_6
+    sub-int/2addr v3, v9
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_2
+
+    :cond_7
+    if-eqz v7, :cond_8
+
+    goto :goto_3
+
+    :cond_8
+    neg-int v3, v3
+
+    :goto_3
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    :cond_9
+    :goto_4
+    return-object v2
+.end method
+
+.method public static final toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    const-string v1, "$this$toLongOrNull"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v1, 0xa
+
+    invoke-static {v1}, Lf/n/a/k/a;->checkRadix(I)I
+
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    if-nez v2, :cond_0
+
+    goto/16 :goto_3
+
+    :cond_0
+    const/4 v4, 0x0
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    const/16 v6, 0x30
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->compare(II)I
+
+    move-result v6
+
+    const-wide v7, -0x7fffffffffffffffL    # -4.9E-324
+
+    const/4 v9, 0x1
+
+    if-gez v6, :cond_3
+
+    if-ne v2, v9, :cond_1
+
+    goto :goto_3
+
+    :cond_1
+    const/16 v6, 0x2d
+
+    if-ne v5, v6, :cond_2
+
+    const-wide/high16 v7, -0x8000000000000000L
+
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/16 v6, 0x2b
+
+    if-ne v5, v6, :cond_9
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v9, 0x0
+
+    :goto_0
+    const-wide/16 v5, 0x0
+
+    const-wide v10, -0x38e38e38e38e38eL    # -2.772000429909333E291
+
+    move-wide v12, v10
+
+    :goto_1
+    if-ge v9, v2, :cond_7
+
+    invoke-virtual {v0, v9}, Ljava/lang/String;->charAt(I)C
+
+    move-result v14
+
+    invoke-static {v14, v1}, Ljava/lang/Character;->digit(II)I
+
+    move-result v14
+
+    if-gez v14, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    cmp-long v15, v5, v12
+
+    if-gez v15, :cond_5
+
+    cmp-long v15, v12, v10
+
+    if-nez v15, :cond_9
+
+    int-to-long v12, v1
+
+    div-long v12, v7, v12
+
+    cmp-long v15, v5, v12
+
+    if-gez v15, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    int-to-long v10, v1
+
+    mul-long v5, v5, v10
+
+    int-to-long v10, v14
+
+    add-long v16, v7, v10
+
+    cmp-long v14, v5, v16
+
+    if-gez v14, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    sub-long/2addr v5, v10
+
+    add-int/lit8 v9, v9, 0x1
+
+    const-wide v10, -0x38e38e38e38e38eL    # -2.772000429909333E291
+
+    goto :goto_1
+
+    :cond_7
+    if-eqz v4, :cond_8
+
+    goto :goto_2
+
+    :cond_8
+    neg-long v5, v5
+
+    :goto_2
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    :cond_9
+    :goto_3
+    return-object v3
+.end method
diff --git a/com.discord/smali_classes2/k0/u/k.smali b/com.discord/smali_classes2/k0/u/k.smali
new file mode 100644
index 0000000000..3bd450329c
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/k.smali
@@ -0,0 +1,529 @@
+.class public Lk0/u/k;
+.super Lk0/u/j;
+.source "StringsJVM.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/j;-><init>()V
+
+    return-void
+.end method
+
+.method public static final compareTo(Ljava/lang/String;Ljava/lang/String;Z)I
+    .locals 1
+
+    const-string v0, "$this$compareTo"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->compareToIgnoreCase(Ljava/lang/String;)I
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    invoke-virtual {p0, p1}, Ljava/lang/String;->compareTo(Ljava/lang/String;)I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    .locals 6
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    const-string p3, "$this$endsWith"
+
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p3, "suffix"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p2, :cond_1
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
+
+    move-result p0
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result p2
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p3
+
+    sub-int v1, p2, p3
+
+    const/4 v3, 0x0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    const/4 v5, 0x1
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-static/range {v0 .. v5}, Lk0/u/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
+
+    move-result p0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static final equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    .locals 0
+
+    if-nez p0, :cond_1
+
+    if-nez p1, :cond_0
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+
+    :cond_1
+    if-nez p2, :cond_2
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p0, p1}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result p0
+
+    :goto_1
+    return p0
+.end method
+
+.method public static final isBlank(Ljava/lang/CharSequence;)Z
+    .locals 4
+
+    const-string v0, "$this$isBlank"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_3
+
+    const-string v0, "$this$indices"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lkotlin/ranges/IntRange;
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v3
+
+    add-int/lit8 v3, v3, -0x1
+
+    invoke-direct {v0, v1, v3}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    instance-of v3, v0, Ljava/util/Collection;
+
+    if-eqz v3, :cond_1
+
+    move-object v3, v0
+
+    check-cast v3, Ljava/util/Collection;
+
+    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    :cond_0
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    move-object v3, v0
+
+    check-cast v3, Lk0/j/q;
+
+    invoke-virtual {v3}, Lk0/j/q;->nextInt()I
+
+    move-result v3
+
+    invoke-interface {p0, v3}, Ljava/lang/CharSequence;->charAt(I)C
+
+    move-result v3
+
+    invoke-static {v3}, Lf/n/a/k/a;->isWhitespace(C)Z
+
+    move-result v3
+
+    if-nez v3, :cond_2
+
+    const/4 p0, 0x0
+
+    :goto_0
+    if-eqz p0, :cond_4
+
+    :cond_3
+    const/4 v1, 0x1
+
+    :cond_4
+    return v1
+.end method
+
+.method public static final regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
+    .locals 6
+
+    const-string v0, "$this$regionMatches"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p5, :cond_0
+
+    invoke-virtual {p0, p1, p2, p3, p4}, Ljava/lang/String;->regionMatches(ILjava/lang/String;II)Z
+
+    move-result p0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, p0
+
+    move v1, p5
+
+    move v2, p1
+
+    move-object v3, p2
+
+    move v4, p3
+
+    move v5, p4
+
+    invoke-virtual/range {v0 .. v5}, Ljava/lang/String;->regionMatches(ZILjava/lang/String;II)Z
+
+    move-result p0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static replace$default(Ljava/lang/String;CCZI)Ljava/lang/String;
+    .locals 8
+
+    and-int/lit8 p4, p4, 0x4
+
+    const/4 v0, 0x0
+
+    if-eqz p4, :cond_0
+
+    const/4 v4, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move v4, p3
+
+    :goto_0
+    const-string p3, "$this$replace"
+
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez v4, :cond_1
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "(this as java.lang.Strin\u2026replace(oldChar, newChar)"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p3, 0x1
+
+    new-array v2, p3, [C
+
+    aput-char p1, v2, v0
+
+    const/4 v5, 0x0
+
+    const-string p1, "$this$splitToSequence"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "delimiters"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    const/4 v6, 0x2
+
+    move-object v1, p0
+
+    invoke-static/range {v1 .. v6}, Lk0/u/p;->d(Ljava/lang/CharSequence;[CIZII)Lkotlin/sequences/Sequence;
+
+    move-result-object p1
+
+    new-instance p3, Lk0/u/o;
+
+    invoke-direct {p3, p0}, Lk0/u/o;-><init>(Ljava/lang/CharSequence;)V
+
+    invoke-static {p1, p3}, Lf/n/a/k/a;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object v0
+
+    invoke-static {p2}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x3e
+
+    invoke-static/range {v0 .. v7}, Lf/n/a/k/a;->joinToString$default(Lkotlin/sequences/Sequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+
+    move-result-object p0
+
+    :goto_1
+    return-object p0
+.end method
+
+.method public static replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+    .locals 10
+
+    const/4 v0, 0x4
+
+    and-int/2addr p4, v0
+
+    const/4 v1, 0x0
+
+    if-eqz p4, :cond_0
+
+    const/4 p3, 0x0
+
+    :cond_0
+    const-string p4, "$this$replace"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "oldValue"
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "newValue"
+
+    invoke-static {p2, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p4, 0x1
+
+    new-array p4, p4, [Ljava/lang/String;
+
+    aput-object p1, p4, v1
+
+    invoke-static {p0, p4, p3, v1, v0}, Lk0/u/p;->splitToSequence$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Lkotlin/sequences/Sequence;
+
+    move-result-object v2
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/16 v9, 0x3e
+
+    move-object v3, p2
+
+    invoke-static/range {v2 .. v9}, Lf/n/a/k/a;->joinToString$default(Lkotlin/sequences/Sequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
+    .locals 6
+
+    const-string v0, "$this$startsWith"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "prefix"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p3, :cond_0
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->startsWith(Ljava/lang/String;I)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    move-object v0, p0
+
+    move v1, p2
+
+    move-object v2, p1
+
+    move v5, p3
+
+    invoke-static/range {v0 .. v5}, Lk0/u/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
+    .locals 6
+
+    const-string v0, "$this$startsWith"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "prefix"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p2, :cond_0
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    const/4 v3, 0x0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    move v5, p2
+
+    invoke-static/range {v0 .. v5}, Lk0/u/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static synthetic startsWith$default(Ljava/lang/String;Ljava/lang/String;IZI)Z
+    .locals 0
+
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_0
+
+    const/4 p3, 0x0
+
+    :cond_0
+    invoke-static {p0, p1, p2, p3}, Lk0/u/k;->startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static synthetic startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    invoke-static {p0, p1, p2}, Lk0/u/k;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result p0
+
+    return p0
+.end method
diff --git a/com.discord/smali_classes2/k0/u/l.smali b/com.discord/smali_classes2/k0/u/l.smali
new file mode 100644
index 0000000000..c70a1c368d
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/l.smali
@@ -0,0 +1,97 @@
+.class public final Lk0/u/l;
+.super Lk0/o/c/j;
+.source "Strings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ljava/lang/CharSequence;",
+        "Ljava/lang/Integer;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/Integer;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $delimiters:[C
+
+.field public final synthetic $ignoreCase:Z
+
+
+# direct methods
+.method public constructor <init>([CZ)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/u/l;->$delimiters:[C
+
+    iput-boolean p2, p0, Lk0/u/l;->$ignoreCase:Z
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/u/l;->$delimiters:[C
+
+    iget-boolean v1, p0, Lk0/u/l;->$ignoreCase:Z
+
+    invoke-static {p1, v0, p2, v1}, Lk0/u/p;->indexOfAny(Ljava/lang/CharSequence;[CIZ)I
+
+    move-result p1
+
+    if-gez p1, :cond_0
+
+    const/4 p1, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    const/4 p2, 0x1
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    new-instance v0, Lkotlin/Pair;
+
+    invoke-direct {v0, p1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    move-object p1, v0
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/u/m.smali b/com.discord/smali_classes2/k0/u/m.smali
new file mode 100644
index 0000000000..136ef4d0d2
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/m.smali
@@ -0,0 +1,349 @@
+.class public final Lk0/u/m;
+.super Lk0/o/c/j;
+.source "Strings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ljava/lang/CharSequence;",
+        "Ljava/lang/Integer;",
+        "Lkotlin/Pair<",
+        "+",
+        "Ljava/lang/Integer;",
+        "+",
+        "Ljava/lang/Integer;",
+        ">;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $delimitersList:Ljava/util/List;
+
+.field public final synthetic $ignoreCase:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;Z)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/u/m;->$delimitersList:Ljava/util/List;
+
+    iput-boolean p2, p0, Lk0/u/m;->$ignoreCase:Z
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 13
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v6, p0, Lk0/u/m;->$delimitersList:Ljava/util/List;
+
+    iget-boolean v7, p0, Lk0/u/m;->$ignoreCase:Z
+
+    const/4 v8, 0x0
+
+    const/4 v0, 0x0
+
+    if-nez v7, :cond_3
+
+    invoke-interface {v6}, Ljava/util/Collection;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-ne v1, v2, :cond_3
+
+    const-string v1, "$this$single"
+
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v6}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    if-ne v1, v2, :cond_1
+
+    invoke-interface {v6, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/String;
+
+    const/4 v2, 0x4
+
+    invoke-static {p1, v1, p2, v0, v2}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+
+    move-result p1
+
+    if-gez p1, :cond_0
+
+    goto/16 :goto_4
+
+    :cond_0
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    new-instance p2, Lkotlin/Pair;
+
+    invoke-direct {p2, p1, v1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    goto/16 :goto_5
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "List has more than one element."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    new-instance p1, Ljava/util/NoSuchElementException;
+
+    const-string p2, "List is empty."
+
+    invoke-direct {p1, p2}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    if-gez p2, :cond_4
+
+    const/4 p2, 0x0
+
+    :cond_4
+    new-instance v0, Lkotlin/ranges/IntRange;
+
+    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    invoke-direct {v0, p2, v1}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    instance-of p2, p1, Ljava/lang/String;
+
+    if-eqz p2, :cond_9
+
+    iget p2, v0, Lkotlin/ranges/IntProgression;->d:I
+
+    iget v9, v0, Lkotlin/ranges/IntProgression;->e:I
+
+    iget v10, v0, Lkotlin/ranges/IntProgression;->f:I
+
+    if-ltz v10, :cond_5
+
+    if-gt p2, v9, :cond_e
+
+    goto :goto_0
+
+    :cond_5
+    if-lt p2, v9, :cond_e
+
+    :goto_0
+    invoke-interface {v6}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v11
+
+    :cond_6
+    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_7
+
+    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v12
+
+    move-object v0, v12
+
+    check-cast v0, Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    move-object v2, p1
+
+    check-cast v2, Ljava/lang/String;
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    move v3, p2
+
+    move v5, v7
+
+    invoke-static/range {v0 .. v5}, Lk0/u/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    goto :goto_1
+
+    :cond_7
+    move-object v12, v8
+
+    :goto_1
+    check-cast v12, Ljava/lang/String;
+
+    if-eqz v12, :cond_8
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    new-instance p2, Lkotlin/Pair;
+
+    invoke-direct {p2, p1, v12}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    goto :goto_5
+
+    :cond_8
+    if-eq p2, v9, :cond_e
+
+    add-int/2addr p2, v10
+
+    goto :goto_0
+
+    :cond_9
+    iget p2, v0, Lkotlin/ranges/IntProgression;->d:I
+
+    iget v9, v0, Lkotlin/ranges/IntProgression;->e:I
+
+    iget v10, v0, Lkotlin/ranges/IntProgression;->f:I
+
+    if-ltz v10, :cond_a
+
+    if-gt p2, v9, :cond_e
+
+    goto :goto_2
+
+    :cond_a
+    if-lt p2, v9, :cond_e
+
+    :goto_2
+    invoke-interface {v6}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v11
+
+    :cond_b
+    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_c
+
+    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v12
+
+    move-object v0, v12
+
+    check-cast v0, Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    move-object v2, p1
+
+    move v3, p2
+
+    move v5, v7
+
+    invoke-static/range {v0 .. v5}, Lk0/u/p;->regionMatchesImpl(Ljava/lang/CharSequence;ILjava/lang/CharSequence;IIZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_b
+
+    goto :goto_3
+
+    :cond_c
+    move-object v12, v8
+
+    :goto_3
+    check-cast v12, Ljava/lang/String;
+
+    if-eqz v12, :cond_d
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    new-instance p2, Lkotlin/Pair;
+
+    invoke-direct {p2, p1, v12}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    goto :goto_5
+
+    :cond_d
+    if-eq p2, v9, :cond_e
+
+    add-int/2addr p2, v10
+
+    goto :goto_2
+
+    :cond_e
+    :goto_4
+    move-object p2, v8
+
+    :goto_5
+    if-eqz p2, :cond_f
+
+    iget-object p1, p2, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    iget-object p2, p2, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast p2, Ljava/lang/String;
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    new-instance v8, Lkotlin/Pair;
+
+    invoke-direct {v8, p1, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    :cond_f
+    return-object v8
+.end method
diff --git a/com.discord/smali_classes2/k0/u/n.smali b/com.discord/smali_classes2/k0/u/n.smali
new file mode 100644
index 0000000000..2b3e9ecdef
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/n.smali
@@ -0,0 +1,56 @@
+.class public final Lk0/u/n;
+.super Lk0/o/c/j;
+.source "Strings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lkotlin/ranges/IntRange;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $this_splitToSequence:Ljava/lang/CharSequence;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/CharSequence;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/u/n;->$this_splitToSequence:Ljava/lang/CharSequence;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lkotlin/ranges/IntRange;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/u/n;->$this_splitToSequence:Ljava/lang/CharSequence;
+
+    invoke-static {v0, p1}, Lk0/u/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/u/o.smali b/com.discord/smali_classes2/k0/u/o.smali
new file mode 100644
index 0000000000..2eeaf8079a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/o.smali
@@ -0,0 +1,56 @@
+.class public final Lk0/u/o;
+.super Lk0/o/c/j;
+.source "Strings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lkotlin/ranges/IntRange;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $this_splitToSequence:Ljava/lang/CharSequence;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/CharSequence;)V
+    .locals 0
+
+    iput-object p1, p0, Lk0/u/o;->$this_splitToSequence:Ljava/lang/CharSequence;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lkotlin/ranges/IntRange;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lk0/u/o;->$this_splitToSequence:Ljava/lang/CharSequence;
+
+    invoke-static {v0, p1}, Lk0/u/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/u/p.smali b/com.discord/smali_classes2/k0/u/p.smali
new file mode 100644
index 0000000000..054795992f
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/p.smali
@@ -0,0 +1,1724 @@
+.class public Lk0/u/p;
+.super Lk0/u/k;
+.source "Strings.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/k;-><init>()V
+
+    return-void
+.end method
+
+.method public static final b(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
+    .locals 6
+
+    const/4 v0, 0x0
+
+    if-nez p5, :cond_2
+
+    if-gez p2, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    new-instance p5, Lkotlin/ranges/IntRange;
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    if-le p3, v0, :cond_1
+
+    move p3, v0
+
+    :cond_1
+    invoke-direct {p5, p2, p3}, Lkotlin/ranges/IntRange;-><init>(II)V
+
+    goto :goto_0
+
+    :cond_2
+    invoke-static {p0}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
+
+    move-result p5
+
+    if-le p2, p5, :cond_3
+
+    move p2, p5
+
+    :cond_3
+    if-gez p3, :cond_4
+
+    const/4 p3, 0x0
+
+    :cond_4
+    invoke-static {p2, p3}, Lk0/r/f;->downTo(II)Lkotlin/ranges/IntProgression;
+
+    move-result-object p5
+
+    :goto_0
+    instance-of p2, p0, Ljava/lang/String;
+
+    if-eqz p2, :cond_7
+
+    instance-of p2, p1, Ljava/lang/String;
+
+    if-eqz p2, :cond_7
+
+    iget p2, p5, Lkotlin/ranges/IntProgression;->d:I
+
+    iget p3, p5, Lkotlin/ranges/IntProgression;->e:I
+
+    iget p5, p5, Lkotlin/ranges/IntProgression;->f:I
+
+    if-ltz p5, :cond_5
+
+    if-gt p2, p3, :cond_a
+
+    goto :goto_1
+
+    :cond_5
+    if-lt p2, p3, :cond_a
+
+    :goto_1
+    move-object v0, p1
+
+    check-cast v0, Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    move-object v2, p0
+
+    check-cast v2, Ljava/lang/String;
+
+    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v4
+
+    move v3, p2
+
+    move v5, p4
+
+    invoke-static/range {v0 .. v5}, Lk0/u/k;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    return p2
+
+    :cond_6
+    if-eq p2, p3, :cond_a
+
+    add-int/2addr p2, p5
+
+    goto :goto_1
+
+    :cond_7
+    iget p2, p5, Lkotlin/ranges/IntProgression;->d:I
+
+    iget p3, p5, Lkotlin/ranges/IntProgression;->e:I
+
+    iget p5, p5, Lkotlin/ranges/IntProgression;->f:I
+
+    if-ltz p5, :cond_8
+
+    if-gt p2, p3, :cond_a
+
+    goto :goto_2
+
+    :cond_8
+    if-lt p2, p3, :cond_a
+
+    :goto_2
+    const/4 v1, 0x0
+
+    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v4
+
+    move-object v0, p1
+
+    move-object v2, p0
+
+    move v3, p2
+
+    move v5, p4
+
+    invoke-static/range {v0 .. v5}, Lk0/u/p;->regionMatchesImpl(Ljava/lang/CharSequence;ILjava/lang/CharSequence;IIZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_9
+
+    return p2
+
+    :cond_9
+    if-eq p2, p3, :cond_a
+
+    add-int/2addr p2, p5
+
+    goto :goto_2
+
+    :cond_a
+    const/4 p0, -0x1
+
+    return p0
+.end method
+
+.method public static synthetic c(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZI)I
+    .locals 6
+
+    and-int/lit8 p6, p6, 0x10
+
+    if-eqz p6, :cond_0
+
+    const/4 p5, 0x0
+
+    const/4 v5, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move v5, p5
+
+    :goto_0
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move v2, p2
+
+    move v3, p3
+
+    move v4, p4
+
+    invoke-static/range {v0 .. v5}, Lk0/u/p;->b(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+    .locals 10
+
+    const-string v0, "$this$contains"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Ljava/lang/String;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/String;
+
+    const/4 v0, 0x2
+
+    invoke-static {p0, p1, v2, p2, v0}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+
+    move-result p0
+
+    if-ltz p0, :cond_1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v5, 0x0
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v6
+
+    const/4 v8, 0x0
+
+    const/16 v9, 0x10
+
+    move-object v3, p0
+
+    move-object v4, p1
+
+    move v7, p2
+
+    invoke-static/range {v3 .. v9}, Lk0/u/p;->c(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZI)I
+
+    move-result p0
+
+    if-ltz p0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
+
+.method public static contains$default(Ljava/lang/CharSequence;CZI)Z
+    .locals 2
+
+    const/4 v0, 0x2
+
+    and-int/2addr p3, v0
+
+    const/4 v1, 0x0
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    const-string p3, "$this$contains"
+
+    invoke-static {p0, p3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, v1, p2, v0}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result p0
+
+    if-ltz p0, :cond_1
+
+    const/4 v1, 0x1
+
+    :cond_1
+    return v1
+.end method
+
+.method public static synthetic contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    invoke-static {p0, p1, p2}, Lk0/u/p;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static d(Ljava/lang/CharSequence;[CIZII)Lkotlin/sequences/Sequence;
+    .locals 2
+
+    and-int/lit8 v0, p5, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    and-int/lit8 v0, p5, 0x4
+
+    if-eqz v0, :cond_1
+
+    const/4 p3, 0x0
+
+    :cond_1
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_2
+
+    const/4 p4, 0x0
+
+    :cond_2
+    if-ltz p4, :cond_3
+
+    const/4 v1, 0x1
+
+    :cond_3
+    if-eqz v1, :cond_4
+
+    new-instance p5, Lk0/u/b;
+
+    new-instance v0, Lk0/u/l;
+
+    invoke-direct {v0, p1, p3}, Lk0/u/l;-><init>([CZ)V
+
+    invoke-direct {p5, p0, p2, p4, v0}, Lk0/u/b;-><init>(Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function2;)V
+
+    return-object p5
+
+    :cond_4
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string p1, "Limit must be non-negative, but was "
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, p4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2e
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static e(Ljava/lang/CharSequence;[Ljava/lang/String;IZII)Lkotlin/sequences/Sequence;
+    .locals 2
+
+    and-int/lit8 v0, p5, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    and-int/lit8 v0, p5, 0x4
+
+    if-eqz v0, :cond_1
+
+    const/4 p3, 0x0
+
+    :cond_1
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_2
+
+    const/4 p4, 0x0
+
+    :cond_2
+    if-ltz p4, :cond_3
+
+    const/4 v1, 0x1
+
+    :cond_3
+    if-eqz v1, :cond_4
+
+    invoke-static {p1}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    new-instance p5, Lk0/u/b;
+
+    new-instance v0, Lk0/u/m;
+
+    invoke-direct {v0, p1, p3}, Lk0/u/m;-><init>(Ljava/util/List;Z)V
+
+    invoke-direct {p5, p0, p2, p4, v0}, Lk0/u/b;-><init>(Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function2;)V
+
+    return-object p5
+
+    :cond_4
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string p1, "Limit must be non-negative, but was "
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, p4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2e
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final f(Ljava/lang/CharSequence;Ljava/lang/String;ZI)Ljava/util/List;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/CharSequence;",
+            "Ljava/lang/String;",
+            "ZI)",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-ltz p3, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_8
+
+    invoke-static {p0, p1, v1, p2}, Lk0/u/p;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
+
+    move-result v2
+
+    const/4 v3, -0x1
+
+    if-eq v2, v3, :cond_7
+
+    if-ne p3, v0, :cond_1
+
+    goto :goto_4
+
+    :cond_1
+    if-lez p3, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
+    new-instance v4, Ljava/util/ArrayList;
+
+    const/16 v5, 0xa
+
+    if-eqz v0, :cond_4
+
+    if-le p3, v5, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    move v5, p3
+
+    :cond_4
+    :goto_2
+    invoke-direct {v4, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    :cond_5
+    invoke-interface {p0, v1, v2}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v4, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/2addr v1, v2
+
+    if-eqz v0, :cond_6
+
+    invoke-virtual {v4}, Ljava/util/ArrayList;->size()I
+
+    move-result v2
+
+    add-int/lit8 v5, p3, -0x1
+
+    if-ne v2, v5, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    invoke-static {p0, p1, v1, p2}, Lk0/u/p;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
+
+    move-result v2
+
+    if-ne v2, v3, :cond_5
+
+    :goto_3
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result p1
+
+    invoke-interface {p0, v1, p1}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v4, p0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    return-object v4
+
+    :cond_7
+    :goto_4
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_8
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string p1, "Limit must be non-negative, but was "
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2e
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final getLastIndex(Ljava/lang/CharSequence;)I
+    .locals 1
+
+    const-string v0, "$this$lastIndex"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result p0
+
+    add-int/lit8 p0, p0, -0x1
+
+    return p0
+.end method
+
+.method public static final indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
+    .locals 7
+
+    const-string v0, "$this$indexOf"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "string"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p3, :cond_1
+
+    instance-of v0, p0, Ljava/lang/String;
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    check-cast p0, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->indexOf(Ljava/lang/String;I)I
+
+    move-result p0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v3
+
+    const/4 v5, 0x0
+
+    const/16 v6, 0x10
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move v2, p2
+
+    move v4, p3
+
+    invoke-static/range {v0 .. v6}, Lk0/u/p;->c(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZI)I
+
+    move-result p0
+
+    :goto_1
+    return p0
+.end method
+
+.method public static indexOf$default(Ljava/lang/CharSequence;CIZI)I
+    .locals 2
+
+    and-int/lit8 v0, p4, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_1
+
+    const/4 p3, 0x0
+
+    :cond_1
+    const-string p4, "$this$indexOf"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p3, :cond_3
+
+    instance-of p4, p0, Ljava/lang/String;
+
+    if-nez p4, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    check-cast p0, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->indexOf(II)I
+
+    move-result p0
+
+    goto :goto_1
+
+    :cond_3
+    :goto_0
+    const/4 p4, 0x1
+
+    new-array p4, p4, [C
+
+    aput-char p1, p4, v1
+
+    invoke-static {p0, p4, p2, p3}, Lk0/u/p;->indexOfAny(Ljava/lang/CharSequence;[CIZ)I
+
+    move-result p0
+
+    :goto_1
+    return p0
+.end method
+
+.method public static synthetic indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+    .locals 2
+
+    and-int/lit8 v0, p4, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_1
+
+    const/4 p3, 0x0
+
+    :cond_1
+    invoke-static {p0, p1, p2, p3}, Lk0/u/p;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final indexOfAny(Ljava/lang/CharSequence;[CIZ)I
+    .locals 7
+
+    const-string v0, "$this$indexOfAny"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "chars"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    if-nez p3, :cond_0
+
+    array-length v1, p1
+
+    if-ne v1, v0, :cond_0
+
+    instance-of v1, p0, Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p1}, Lf/n/a/k/a;->single([C)C
+
+    move-result p1
+
+    check-cast p0, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->indexOf(II)I
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    if-gez p2, :cond_1
+
+    const/4 p2, 0x0
+
+    :cond_1
+    invoke-static {p0}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
+
+    move-result v2
+
+    if-gt p2, v2, :cond_5
+
+    :goto_0
+    invoke-interface {p0, p2}, Ljava/lang/CharSequence;->charAt(I)C
+
+    move-result v3
+
+    array-length v4, p1
+
+    const/4 v5, 0x0
+
+    :goto_1
+    if-ge v5, v4, :cond_3
+
+    aget-char v6, p1, v5
+
+    invoke-static {v6, v3, p3}, Lf/n/a/k/a;->equals(CCZ)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_2
+
+    const/4 v3, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v3, 0x0
+
+    :goto_2
+    if-eqz v3, :cond_4
+
+    return p2
+
+    :cond_4
+    if-eq p2, v2, :cond_5
+
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    const/4 p0, -0x1
+
+    return p0
+.end method
+
+.method public static lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
+    .locals 4
+
+    and-int/lit8 v0, p4, 0x2
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
+
+    move-result p2
+
+    :cond_0
+    and-int/lit8 p4, p4, 0x4
+
+    const/4 v0, 0x0
+
+    if-eqz p4, :cond_1
+
+    const/4 p3, 0x0
+
+    :cond_1
+    const-string p4, "$this$lastIndexOf"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p3, :cond_3
+
+    instance-of p4, p0, Ljava/lang/String;
+
+    if-nez p4, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    check-cast p0, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->lastIndexOf(II)I
+
+    move-result p0
+
+    goto :goto_4
+
+    :cond_3
+    :goto_0
+    const/4 p4, 0x1
+
+    new-array v1, p4, [C
+
+    aput-char p1, v1, v0
+
+    const-string p1, "$this$lastIndexOfAny"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "chars"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p3, :cond_4
+
+    instance-of p1, p0, Ljava/lang/String;
+
+    if-eqz p1, :cond_4
+
+    invoke-static {v1}, Lf/n/a/k/a;->single([C)C
+
+    move-result p1
+
+    check-cast p0, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->lastIndexOf(II)I
+
+    move-result p0
+
+    goto :goto_4
+
+    :cond_4
+    invoke-static {p0}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
+
+    move-result p1
+
+    if-le p2, p1, :cond_5
+
+    move p2, p1
+
+    :cond_5
+    :goto_1
+    if-ltz p2, :cond_9
+
+    invoke-interface {p0, p2}, Ljava/lang/CharSequence;->charAt(I)C
+
+    move-result p1
+
+    const/4 v2, 0x0
+
+    :goto_2
+    if-ge v2, p4, :cond_7
+
+    aget-char v3, v1, v2
+
+    invoke-static {v3, p1, p3}, Lf/n/a/k/a;->equals(CCZ)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_6
+
+    const/4 p1, 0x1
+
+    goto :goto_3
+
+    :cond_6
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_2
+
+    :cond_7
+    const/4 p1, 0x0
+
+    :goto_3
+    if-eqz p1, :cond_8
+
+    move p0, p2
+
+    goto :goto_4
+
+    :cond_8
+    add-int/lit8 p2, p2, -0x1
+
+    goto :goto_1
+
+    :cond_9
+    const/4 p0, -0x1
+
+    :goto_4
+    return p0
+.end method
+
+.method public static lastIndexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+    .locals 6
+
+    and-int/lit8 v0, p4, 0x2
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0}, Lk0/u/p;->getLastIndex(Ljava/lang/CharSequence;)I
+
+    move-result p2
+
+    :cond_0
+    move v2, p2
+
+    and-int/lit8 p2, p4, 0x4
+
+    if-eqz p2, :cond_1
+
+    const/4 p3, 0x0
+
+    const/4 v4, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    move v4, p3
+
+    :goto_0
+    const-string p2, "$this$lastIndexOf"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "string"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez v4, :cond_3
+
+    instance-of p2, p0, Ljava/lang/String;
+
+    if-nez p2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    check-cast p0, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, v2}, Ljava/lang/String;->lastIndexOf(Ljava/lang/String;I)I
+
+    move-result p0
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    const/4 v3, 0x0
+
+    const/4 v5, 0x1
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-static/range {v0 .. v5}, Lk0/u/p;->b(Ljava/lang/CharSequence;Ljava/lang/CharSequence;IIZZ)I
+
+    move-result p0
+
+    :goto_2
+    return p0
+.end method
+
+.method public static final lines(Ljava/lang/CharSequence;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/CharSequence;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "$this$lines"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$lineSequence"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "\r\n"
+
+    const-string v1, "\n"
+
+    const-string v2, "\r"
+
+    filled-new-array {v0, v1, v2}, [Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
+    invoke-static {p0, v0, v1, v1, v2}, Lk0/u/p;->splitToSequence$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Lkotlin/sequences/Sequence;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final regionMatchesImpl(Ljava/lang/CharSequence;ILjava/lang/CharSequence;IIZ)Z
+    .locals 4
+
+    const-string v0, "$this$regionMatchesImpl"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    if-ltz p3, :cond_3
+
+    if-ltz p1, :cond_3
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    sub-int/2addr v1, p4
+
+    if-gt p1, v1, :cond_3
+
+    invoke-interface {p2}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    sub-int/2addr v1, p4
+
+    if-le p3, v1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, p4, :cond_2
+
+    add-int v2, p1, v1
+
+    invoke-interface {p0, v2}, Ljava/lang/CharSequence;->charAt(I)C
+
+    move-result v2
+
+    add-int v3, p3, v1
+
+    invoke-interface {p2, v3}, Ljava/lang/CharSequence;->charAt(I)C
+
+    move-result v3
+
+    invoke-static {v2, v3, p5}, Lf/n/a/k/a;->equals(CCZ)Z
+
+    move-result v2
+
+    if-nez v2, :cond_1
+
+    return v0
+
+    :cond_1
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p0, 0x1
+
+    return p0
+
+    :cond_3
+    :goto_1
+    return v0
+.end method
+
+.method public static split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    .locals 8
+
+    and-int/lit8 v0, p4, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 v5, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move v5, p2
+
+    :goto_0
+    and-int/lit8 p2, p4, 0x4
+
+    if-eqz p2, :cond_1
+
+    const/4 v6, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    move v6, p3
+
+    :goto_1
+    const-string p2, "$this$split"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "delimiters"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length p2, p1
+
+    const/4 p3, 0x1
+
+    if-ne p2, p3, :cond_2
+
+    aget-char p1, p1, v1
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p0, p1, v5, v6}, Lk0/u/p;->f(Ljava/lang/CharSequence;Ljava/lang/String;ZI)Ljava/util/List;
+
+    move-result-object p0
+
+    goto :goto_3
+
+    :cond_2
+    const/4 v4, 0x0
+
+    const/4 v7, 0x2
+
+    move-object v2, p0
+
+    move-object v3, p1
+
+    invoke-static/range {v2 .. v7}, Lk0/u/p;->d(Ljava/lang/CharSequence;[CIZII)Lkotlin/sequences/Sequence;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->asIterable(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/util/ArrayList;
+
+    const/16 p3, 0xa
+
+    invoke-static {p1, p3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result p3
+
+    invoke-direct {p2, p3}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast p1, Lk0/t/n;
+
+    invoke-virtual {p1}, Lk0/t/n;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_2
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p3
+
+    if-eqz p3, :cond_3
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p3
+
+    check-cast p3, Lkotlin/ranges/IntRange;
+
+    invoke-static {p0, p3}, Lk0/u/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_3
+    move-object p0, p2
+
+    :goto_3
+    return-object p0
+.end method
+
+.method public static split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+    .locals 8
+
+    and-int/lit8 v0, p4, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 v5, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move v5, p2
+
+    :goto_0
+    and-int/lit8 p2, p4, 0x4
+
+    if-eqz p2, :cond_1
+
+    const/4 v6, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    move v6, p3
+
+    :goto_1
+    const-string p2, "$this$split"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "delimiters"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length p2, p1
+
+    const/4 p3, 0x1
+
+    if-ne p2, p3, :cond_3
+
+    aget-object p2, p1, v1
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p4
+
+    if-nez p4, :cond_2
+
+    const/4 v1, 0x1
+
+    :cond_2
+    if-nez v1, :cond_3
+
+    invoke-static {p0, p2, v5, v6}, Lk0/u/p;->f(Ljava/lang/CharSequence;Ljava/lang/String;ZI)Ljava/util/List;
+
+    move-result-object p0
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v4, 0x0
+
+    const/4 v7, 0x2
+
+    move-object v2, p0
+
+    move-object v3, p1
+
+    invoke-static/range {v2 .. v7}, Lk0/u/p;->e(Ljava/lang/CharSequence;[Ljava/lang/String;IZII)Lkotlin/sequences/Sequence;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->asIterable(Lkotlin/sequences/Sequence;)Ljava/lang/Iterable;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/util/ArrayList;
+
+    const/16 p3, 0xa
+
+    invoke-static {p1, p3}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result p3
+
+    invoke-direct {p2, p3}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast p1, Lk0/t/n;
+
+    invoke-virtual {p1}, Lk0/t/n;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_2
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p3
+
+    if-eqz p3, :cond_4
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p3
+
+    check-cast p3, Lkotlin/ranges/IntRange;
+
+    invoke-static {p0, p3}, Lk0/u/p;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_4
+    move-object p0, p2
+
+    :goto_3
+    return-object p0
+.end method
+
+.method public static splitToSequence$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Lkotlin/sequences/Sequence;
+    .locals 8
+
+    and-int/lit8 v0, p4, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 v5, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move v5, p2
+
+    :goto_0
+    and-int/lit8 p2, p4, 0x4
+
+    if-eqz p2, :cond_1
+
+    const/4 v6, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    move v6, p3
+
+    :goto_1
+    const-string p2, "$this$splitToSequence"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "delimiters"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x0
+
+    const/4 v7, 0x2
+
+    move-object v2, p0
+
+    move-object v3, p1
+
+    invoke-static/range {v2 .. v7}, Lk0/u/p;->e(Ljava/lang/CharSequence;[Ljava/lang/String;IZII)Lkotlin/sequences/Sequence;
+
+    move-result-object p1
+
+    new-instance p2, Lk0/u/n;
+
+    invoke-direct {p2, p0}, Lk0/u/n;-><init>(Ljava/lang/CharSequence;)V
+
+    invoke-static {p1, p2}, Lf/n/a/k/a;->map(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "$this$substring"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "range"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getStart()Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    invoke-virtual {p1}, Lkotlin/ranges/IntRange;->getEndInclusive()Ljava/lang/Integer;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    add-int/lit8 p1, p1, 0x1
+
+    invoke-interface {p0, v0, p1}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "$this$substringAfterLast"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "missingDelimiterValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x6
+
+    invoke-static {p0, p1, v0, v0, v1}, Lk0/u/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result p1
+
+    const/4 v0, -0x1
+
+    if-ne p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    add-int/lit8 p1, p1, 0x1
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result p2
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string p0, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {p2, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    return-object p2
+.end method
+
+.method public static synthetic substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;I)Ljava/lang/String;
+    .locals 0
+
+    and-int/lit8 p2, p3, 0x2
+
+    if-eqz p2, :cond_0
+
+    move-object p2, p0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p2, 0x0
+
+    :goto_0
+    invoke-static {p0, p1, p2}, Lk0/u/p;->substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final substringBefore(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "$this$substringBefore"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "missingDelimiterValue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x6
+
+    invoke-static {p0, p1, v0, v0, v1}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result p1
+
+    const/4 v1, -0x1
+
+    if-ne p1, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0, v0, p1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string p0, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {p2, p0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    return-object p2
+.end method
+
+.method public static final trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    .locals 5
+
+    const-string v0, "$this$trim"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    sub-int/2addr v0, v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-gt v2, v0, :cond_4
+
+    if-nez v3, :cond_0
+
+    move v4, v2
+
+    goto :goto_1
+
+    :cond_0
+    move v4, v0
+
+    :goto_1
+    invoke-interface {p0, v4}, Ljava/lang/CharSequence;->charAt(I)C
+
+    move-result v4
+
+    invoke-static {v4}, Lf/n/a/k/a;->isWhitespace(C)Z
+
+    move-result v4
+
+    if-nez v3, :cond_2
+
+    if-nez v4, :cond_1
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    if-nez v4, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    add-int/lit8 v0, v0, -0x1
+
+    goto :goto_0
+
+    :cond_4
+    :goto_2
+    add-int/2addr v0, v1
+
+    invoke-interface {p0, v2, v0}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
+
+    move-result-object p0
+
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/k0/u/q.smali b/com.discord/smali_classes2/k0/u/q.smali
new file mode 100644
index 0000000000..299756152a
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/q.smali
@@ -0,0 +1,13 @@
+.class public Lk0/u/q;
+.super Lk0/u/p;
+.source "_StringsJvm.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/p;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/k0/u/r.smali b/com.discord/smali_classes2/k0/u/r.smali
new file mode 100644
index 0000000000..80283c55f0
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/r.smali
@@ -0,0 +1,64 @@
+.class public final Lk0/u/r;
+.super Lk0/o/c/j;
+.source "_Strings.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/CharSequence;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lk0/u/r;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lk0/u/r;
+
+    invoke-direct {v0}, Lk0/u/r;-><init>()V
+
+    sput-object v0, Lk0/u/r;->d:Lk0/u/r;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/CharSequence;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/k0/u/s.smali b/com.discord/smali_classes2/k0/u/s.smali
new file mode 100644
index 0000000000..41990c6ee0
--- /dev/null
+++ b/com.discord/smali_classes2/k0/u/s.smali
@@ -0,0 +1,131 @@
+.class public Lk0/u/s;
+.super Lk0/u/q;
+.source "_Strings.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lk0/u/q;-><init>()V
+
+    return-void
+.end method
+
+.method public static final drop(Ljava/lang/String;I)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "$this$drop"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-ltz p1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    if-le p1, v0, :cond_1
+
+    move p1, v0
+
+    :cond_1
+    invoke-virtual {p0, p1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+
+    :cond_2
+    const-string p0, "Requested character count "
+
+    const-string v0, " is less than zero."
+
+    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final take(Ljava/lang/String;I)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "$this$take"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    if-ltz p1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    if-le p1, v1, :cond_1
+
+    move p1, v1
+
+    :cond_1
+    invoke-virtual {p0, v0, p1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+
+    :cond_2
+    const-string p0, "Requested character count "
+
+    const-string v0, " is less than zero."
+
+    invoke-static {p0, p1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/kotlin/KotlinNothingValueException.smali b/com.discord/smali_classes2/kotlin/KotlinNothingValueException.smali
new file mode 100644
index 0000000000..a49bcc32af
--- /dev/null
+++ b/com.discord/smali_classes2/kotlin/KotlinNothingValueException.smali
@@ -0,0 +1,13 @@
+.class public final Lkotlin/KotlinNothingValueException;
+.super Ljava/lang/RuntimeException;
+.source "ExceptionsH.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/RuntimeException;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/kotlin/Pair.smali b/com.discord/smali_classes2/kotlin/Pair.smali
index 2feb14ddb1..858fe7df65 100644
--- a/com.discord/smali_classes2/kotlin/Pair.smali
+++ b/com.discord/smali_classes2/kotlin/Pair.smali
@@ -73,7 +73,7 @@
 
     iget-object v1, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -83,7 +83,7 @@
 
     iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/kotlin/Triple.smali b/com.discord/smali_classes2/kotlin/Triple.smali
index ae2113ec7c..2745e6c738 100644
--- a/com.discord/smali_classes2/kotlin/Triple.smali
+++ b/com.discord/smali_classes2/kotlin/Triple.smali
@@ -85,7 +85,7 @@
 
     iget-object v1, p1, Lkotlin/Triple;->first:Ljava/lang/Object;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -95,7 +95,7 @@
 
     iget-object v1, p1, Lkotlin/Triple;->second:Ljava/lang/Object;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -105,7 +105,7 @@
 
     iget-object p1, p1, Lkotlin/Triple;->third:Ljava/lang/Object;
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a$a.smali b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a$a.smali
index e36153606c..cdee801a85 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$a$a.smali
@@ -16,7 +16,7 @@
 
 # direct methods
 .method public static fold(Lkotlin/coroutines/CoroutineContext$a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
@@ -31,6 +31,10 @@
         }
     .end annotation
 
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p2, p1, p0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p0
@@ -51,11 +55,15 @@
         }
     .end annotation
 
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p0}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
 
     move-result-object v0
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -82,28 +90,50 @@
         }
     .end annotation
 
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p0}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
 
     move-result-object v0
 
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    sget-object p0, Lj0/k/f;->d:Lj0/k/f;
+    sget-object p0, Lk0/l/f;->d:Lk0/l/f;
 
     :cond_0
     return-object p0
 .end method
 
 .method public static plus(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
-    .locals 0
+    .locals 1
 
-    invoke-static {p0, p1}, Lf/n/a/k/a;->plus(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    if-ne p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Lk0/l/e;->d:Lk0/l/e;
+
+    invoke-interface {p1, p0, v0}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
     move-result-object p0
 
+    check-cast p0, Lkotlin/coroutines/CoroutineContext;
+
+    :goto_0
     return-object p0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/io/AccessDeniedException.smali b/com.discord/smali_classes2/kotlin/io/AccessDeniedException.smali
index 43da02bc62..9bac579d11 100644
--- a/com.discord/smali_classes2/kotlin/io/AccessDeniedException.smali
+++ b/com.discord/smali_classes2/kotlin/io/AccessDeniedException.smali
@@ -18,16 +18,11 @@
     move-object p3, p4
 
     :cond_0
-    if-eqz p1, :cond_1
+    const-string p2, "file"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p4, p3}, Lkotlin/io/FileSystemException;-><init>(Ljava/io/File;Ljava/io/File;Ljava/lang/String;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "file"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p4
 .end method
diff --git a/com.discord/smali_classes2/kotlin/io/FileSystemException.smali b/com.discord/smali_classes2/kotlin/io/FileSystemException.smali
index 0aed04a657..f2e6953e40 100644
--- a/com.discord/smali_classes2/kotlin/io/FileSystemException.smali
+++ b/com.discord/smali_classes2/kotlin/io/FileSystemException.smali
@@ -15,6 +15,10 @@
 .method public constructor <init>(Ljava/io/File;Ljava/io/File;Ljava/lang/String;)V
     .locals 3
 
+    const-string v0, "file"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Ljava/lang/StringBuilder;
 
     invoke-virtual {p1}, Ljava/io/File;->toString()Ljava/lang/String;
@@ -67,7 +71,7 @@
 
     const-string v1, "sb.toString()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/kotlin/jvm/functions/Function8.smali b/com.discord/smali_classes2/kotlin/jvm/functions/Function8.smali
deleted file mode 100644
index 3da37927d5..0000000000
--- a/com.discord/smali_classes2/kotlin/jvm/functions/Function8.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public interface abstract Lkotlin/jvm/functions/Function8;
-.super Ljava/lang/Object;
-.source "Functions.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<P1:",
-        "Ljava/lang/Object;",
-        "P2:",
-        "Ljava/lang/Object;",
-        "P3:",
-        "Ljava/lang/Object;",
-        "P4:",
-        "Ljava/lang/Object;",
-        "P5:",
-        "Ljava/lang/Object;",
-        "P6:",
-        "Ljava/lang/Object;",
-        "P7:",
-        "Ljava/lang/Object;",
-        "P8:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract invoke(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;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TP1;TP2;TP3;TP4;TP5;TP6;TP7;TP8;)TR;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali b/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali
index 224f6c0c18..43b687d36d 100644
--- a/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali
+++ b/com.discord/smali_classes2/kotlin/properties/ReadOnlyProperty.smali
@@ -6,9 +6,9 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<T:",
         "Ljava/lang/Object;",
-        "T:",
+        "V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;"
@@ -20,9 +20,9 @@
 .method public abstract getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(TR;",
+            "(TT;",
             "Lkotlin/reflect/KProperty<",
-            "*>;)TT;"
+            "*>;)TV;"
         }
     .end annotation
 .end method
diff --git a/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali b/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali
index d158785593..e8f910b2c9 100644
--- a/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali
+++ b/com.discord/smali_classes2/kotlin/properties/ReadWriteProperty.smali
@@ -2,16 +2,21 @@
 .super Ljava/lang/Object;
 .source "Interfaces.kt"
 
+# interfaces
+.implements Lkotlin/properties/ReadOnlyProperty;
+
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<T:",
         "Ljava/lang/Object;",
-        "T:",
+        "V:",
         "Ljava/lang/Object;",
         ">",
-        "Ljava/lang/Object;"
+        "Ljava/lang/Object;",
+        "Lkotlin/properties/ReadOnlyProperty<",
+        "TT;TV;>;"
     }
 .end annotation
 
@@ -20,9 +25,9 @@
 .method public abstract getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(TR;",
+            "(TT;",
             "Lkotlin/reflect/KProperty<",
-            "*>;)TT;"
+            "*>;)TV;"
         }
     .end annotation
 .end method
@@ -30,9 +35,9 @@
 .method public abstract setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(TR;",
+            "(TT;",
             "Lkotlin/reflect/KProperty<",
-            "*>;TT;)V"
+            "*>;TV;)V"
         }
     .end annotation
 .end method
diff --git a/com.discord/smali_classes2/kotlin/ranges/IntProgression.smali b/com.discord/smali_classes2/kotlin/ranges/IntProgression.smali
index 49b22caee6..d7e124ec04 100644
--- a/com.discord/smali_classes2/kotlin/ranges/IntProgression.smali
+++ b/com.discord/smali_classes2/kotlin/ranges/IntProgression.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/lang/Iterable;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -14,7 +14,7 @@
         "Ljava/lang/Iterable<",
         "Ljava/lang/Integer;",
         ">;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
@@ -48,17 +48,17 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {p2, p3}, Lf/n/a/k/a;->N(II)I
+    invoke-static {p2, p3}, Lf/n/a/k/a;->K(II)I
 
     move-result v0
 
-    invoke-static {p1, p3}, Lf/n/a/k/a;->N(II)I
+    invoke-static {p1, p3}, Lf/n/a/k/a;->K(II)I
 
     move-result p1
 
     sub-int/2addr v0, p1
 
-    invoke-static {v0, p3}, Lf/n/a/k/a;->N(II)I
+    invoke-static {v0, p3}, Lf/n/a/k/a;->K(II)I
 
     move-result p1
 
@@ -76,17 +76,17 @@
     :cond_2
     neg-int v0, p3
 
-    invoke-static {p1, v0}, Lf/n/a/k/a;->N(II)I
+    invoke-static {p1, v0}, Lf/n/a/k/a;->K(II)I
 
     move-result p1
 
-    invoke-static {p2, v0}, Lf/n/a/k/a;->N(II)I
+    invoke-static {p2, v0}, Lf/n/a/k/a;->K(II)I
 
     move-result v1
 
     sub-int/2addr p1, v1
 
-    invoke-static {p1, v0}, Lf/n/a/k/a;->N(II)I
+    invoke-static {p1, v0}, Lf/n/a/k/a;->K(II)I
 
     move-result p1
 
@@ -255,7 +255,7 @@
 .method public iterator()Ljava/util/Iterator;
     .locals 4
 
-    new-instance v0, Lj0/q/b;
+    new-instance v0, Lk0/r/b;
 
     iget v1, p0, Lkotlin/ranges/IntProgression;->d:I
 
@@ -263,7 +263,7 @@
 
     iget v3, p0, Lkotlin/ranges/IntProgression;->f:I
 
-    invoke-direct {v0, v1, v2, v3}, Lj0/q/b;-><init>(III)V
+    invoke-direct {v0, v1, v2, v3}, Lk0/r/b;-><init>(III)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/ranges/IntRange.smali b/com.discord/smali_classes2/kotlin/ranges/IntRange.smali
index 86bdef2f21..62d0447f36 100644
--- a/com.discord/smali_classes2/kotlin/ranges/IntRange.smali
+++ b/com.discord/smali_classes2/kotlin/ranges/IntRange.smali
@@ -3,14 +3,14 @@
 .source "Ranges.kt"
 
 # interfaces
-.implements Lj0/q/a;
+.implements Lk0/r/a;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lkotlin/ranges/IntProgression;",
-        "Lj0/q/a<",
+        "Lk0/r/a<",
         "Ljava/lang/Integer;",
         ">;"
     }
diff --git a/com.discord/smali_classes2/kotlin/reflect/KCallable.smali b/com.discord/smali_classes2/kotlin/reflect/KCallable.smali
index 2d36ecd561..cbc4c15613 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KCallable.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KCallable.smali
@@ -3,7 +3,7 @@
 .source "KCallable.kt"
 
 # interfaces
-.implements Lj0/r/a;
+.implements Lk0/s/a;
 
 
 # annotations
@@ -13,7 +13,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lj0/r/a;"
+        "Lk0/s/a;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/kotlin/reflect/KMutableProperty$Setter.smali b/com.discord/smali_classes2/kotlin/reflect/KMutableProperty$Setter.smali
index b666b41e76..e67f344893 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KMutableProperty$Setter.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KMutableProperty$Setter.smali
@@ -9,12 +9,12 @@
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
         "Ljava/lang/Object<",
-        "TR;>;",
+        "TV;>;",
         "Lkotlin/reflect/KFunction<",
         "Lkotlin/Unit;",
         ">;"
diff --git a/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0$Setter.smali b/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0$Setter.smali
index 85a2cc194f..e003aa1a14 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0$Setter.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0$Setter.smali
@@ -19,14 +19,14 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
         "Lkotlin/reflect/KMutableProperty$Setter<",
-        "TR;>;",
+        "TV;>;",
         "Lkotlin/jvm/functions/Function1<",
-        "TR;",
+        "TV;",
         "Lkotlin/Unit;",
         ">;"
     }
diff --git a/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0.smali b/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0.smali
index f437357084..5ab1f27437 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KMutableProperty0.smali
@@ -16,14 +16,14 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
         "Lkotlin/reflect/KProperty0<",
-        "TR;>;",
+        "TV;>;",
         "Ljava/lang/Object<",
-        "TR;>;"
+        "TV;>;"
     }
 .end annotation
 
@@ -34,7 +34,7 @@
         value = {
             "()",
             "Lkotlin/reflect/KMutableProperty0$Setter<",
-            "TR;>;"
+            "TV;>;"
         }
     .end annotation
 .end method
diff --git a/com.discord/smali_classes2/kotlin/reflect/KProperty$Getter.smali b/com.discord/smali_classes2/kotlin/reflect/KProperty$Getter.smali
index c08d7cf568..38e09f69ad 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KProperty$Getter.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KProperty$Getter.smali
@@ -18,13 +18,13 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
         "Ljava/lang/Object<",
-        "TR;>;",
+        "TV;>;",
         "Lkotlin/reflect/KFunction<",
-        "TR;>;"
+        "TV;>;"
     }
 .end annotation
diff --git a/com.discord/smali_classes2/kotlin/reflect/KProperty.smali b/com.discord/smali_classes2/kotlin/reflect/KProperty.smali
index 5e7b9297d1..d0d7be9d00 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KProperty.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KProperty.smali
@@ -15,12 +15,12 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
         "Lkotlin/reflect/KCallable<",
-        "TR;>;"
+        "TV;>;"
     }
 .end annotation
 
diff --git a/com.discord/smali_classes2/kotlin/reflect/KProperty0$Getter.smali b/com.discord/smali_classes2/kotlin/reflect/KProperty0$Getter.smali
index 17941101c7..412d097a78 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KProperty0$Getter.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KProperty0$Getter.smali
@@ -19,13 +19,13 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
         "Lkotlin/reflect/KProperty$Getter<",
-        "TR;>;",
+        "TV;>;",
         "Lkotlin/jvm/functions/Function0<",
-        "TR;>;"
+        "TV;>;"
     }
 .end annotation
diff --git a/com.discord/smali_classes2/kotlin/reflect/KProperty0.smali b/com.discord/smali_classes2/kotlin/reflect/KProperty0.smali
index 313cf8ac75..3ff68bfa3a 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KProperty0.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KProperty0.smali
@@ -16,14 +16,14 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<R:",
+        "<V:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
         "Lkotlin/reflect/KProperty<",
-        "TR;>;",
+        "TV;>;",
         "Lkotlin/jvm/functions/Function0<",
-        "TR;>;"
+        "TV;>;"
     }
 .end annotation
 
@@ -32,7 +32,7 @@
 .method public abstract get()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "()TR;"
+            "()TV;"
         }
     .end annotation
 .end method
@@ -45,7 +45,7 @@
         value = {
             "()",
             "Lkotlin/reflect/KProperty0$Getter<",
-            "TR;>;"
+            "TV;>;"
         }
     .end annotation
 .end method
diff --git a/com.discord/smali_classes2/kotlin/reflect/KType.smali b/com.discord/smali_classes2/kotlin/reflect/KType.smali
index 3e146750b6..f24d88ffb2 100644
--- a/com.discord/smali_classes2/kotlin/reflect/KType.smali
+++ b/com.discord/smali_classes2/kotlin/reflect/KType.smali
@@ -3,4 +3,4 @@
 .source "KType.kt"
 
 # interfaces
-.implements Lj0/r/a;
+.implements Lk0/s/a;
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$b.smali b/com.discord/smali_classes2/kotlin/text/Regex$b.smali
index 38f8551eef..71b1b8e46e 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$b.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$b.smali
@@ -29,7 +29,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "pattern"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,7 +59,7 @@
 
     const-string v2, "Pattern.compile(pattern, flags)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/util/regex/Pattern;)V
 
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$c.smali b/com.discord/smali_classes2/kotlin/text/Regex$c.smali
index 761d21b0c7..37872dce20 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$c.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$c.smali
@@ -1,5 +1,5 @@
 .class public final Lkotlin/text/Regex$c;
-.super Lj0/n/c/i;
+.super Lk0/o/c/j;
 .source "Regex.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/i;",
+        "Lk0/o/c/j;",
         "Lkotlin/jvm/functions/Function0<",
         "Lkotlin/text/MatchResult;",
         ">;"
@@ -46,7 +46,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/text/Regex$d.smali b/com.discord/smali_classes2/kotlin/text/Regex$d.smali
index ad5720c9e5..11e4979fb1 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex$d.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex$d.smali
@@ -1,5 +1,5 @@
 .class public final synthetic Lkotlin/text/Regex$d;
-.super Lj0/n/c/g;
+.super Lk0/o/c/h;
 .source "Regex.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/n/c/g;",
+        "Lk0/o/c/h;",
         "Lkotlin/jvm/functions/Function1<",
         "Lkotlin/text/MatchResult;",
         "Lkotlin/text/MatchResult;",
@@ -45,64 +45,39 @@
 .end method
 
 .method public constructor <init>()V
-    .locals 1
+    .locals 6
 
-    const/4 v0, 0x1
+    const-class v2, Lkotlin/text/MatchResult;
 
-    invoke-direct {p0, v0}, Lj0/n/c/g;-><init>(I)V
+    const/4 v1, 0x1
+
+    const-string v3, "next"
+
+    const-string v4, "next()Lkotlin/text/MatchResult;"
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    invoke-direct/range {v0 .. v5}, Lk0/o/c/h;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final getName()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "next"
-
-    return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
-    .locals 1
-
-    const-class v0, Lkotlin/text/MatchResult;
-
-    invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "next()Lkotlin/text/MatchResult;"
-
-    return-object v0
-.end method
-
 .method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+    .locals 1
 
     check-cast p1, Lkotlin/text/MatchResult;
 
-    if-eqz p1, :cond_0
+    const-string v0, "p1"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-interface {p1}, Lkotlin/text/MatchResult;->next()Lkotlin/text/MatchResult;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "p1"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/kotlin/text/Regex.smali b/com.discord/smali_classes2/kotlin/text/Regex.smali
index 8a197973b4..dcf6ac2cca 100644
--- a/com.discord/smali_classes2/kotlin/text/Regex.smali
+++ b/com.discord/smali_classes2/kotlin/text/Regex.smali
@@ -25,7 +25,7 @@
         value = {
             "Ljava/util/Set<",
             "+",
-            "Lj0/t/d;",
+            "Lk0/u/d;",
             ">;"
         }
     .end annotation
@@ -52,25 +52,35 @@
 .method public constructor <init>(Ljava/lang/String;)V
     .locals 1
 
+    const-string v0, "pattern"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {p1}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
 
     move-result-object p1
 
     const-string v0, "Pattern.compile(pattern)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lkotlin/text/Regex;-><init>(Ljava/util/regex/Pattern;)V
 
     return-void
 .end method
 
-.method public constructor <init>(Ljava/lang/String;Lj0/t/d;)V
+.method public constructor <init>(Ljava/lang/String;Lk0/u/d;)V
     .locals 1
 
-    if-eqz p1, :cond_1
+    const-string v0, "pattern"
 
-    iget p2, p2, Lj0/t/d;->value:I
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "option"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget p2, p2, Lk0/u/d;->value:I
 
     and-int/lit8 v0, p2, 0x2
 
@@ -85,24 +95,19 @@
 
     const-string p2, "Pattern.compile(pattern,\u2026nicodeCase(option.value))"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Lkotlin/text/Regex;-><init>(Ljava/util/regex/Pattern;)V
 
     return-void
-
-    :cond_1
-    const-string p1, "pattern"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public constructor <init>(Ljava/util/regex/Pattern;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "nativePattern"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -124,7 +129,7 @@
 
     const-string v2, "nativePattern.pattern()"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v2, p0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
 
@@ -140,48 +145,45 @@
 
 # virtual methods
 .method public final find(Ljava/lang/CharSequence;I)Lkotlin/text/MatchResult;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "input"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
+    iget-object v0, p0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
 
-    invoke-virtual {v1, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+    invoke-virtual {v0, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "nativePattern.matcher(input)"
+    const-string v1, "nativePattern.matcher(input)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->find(I)Z
+    invoke-virtual {v0, p2}, Ljava/util/regex/Matcher;->find(I)Z
 
     move-result p2
 
     if-nez p2, :cond_0
 
+    const/4 p1, 0x0
+
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lj0/t/c;
+    new-instance p2, Lk0/u/c;
 
-    invoke-direct {v0, v1, p1}, Lj0/t/c;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+    invoke-direct {p2, v0, p1}, Lk0/u/c;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+
+    move-object p1, p2
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public final findAll(Ljava/lang/CharSequence;I)Lkotlin/sequences/Sequence;
-    .locals 2
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -193,84 +195,108 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "input"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v1, Lkotlin/text/Regex$c;
+    if-ltz p2, :cond_0
 
-    invoke-direct {v1, p0, p1, p2}, Lkotlin/text/Regex$c;-><init>(Lkotlin/text/Regex;Ljava/lang/CharSequence;I)V
+    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    if-gt p2, v0, :cond_0
+
+    new-instance v0, Lkotlin/text/Regex$c;
+
+    invoke-direct {v0, p0, p1, p2}, Lkotlin/text/Regex$c;-><init>(Lkotlin/text/Regex;Ljava/lang/CharSequence;I)V
 
     sget-object p1, Lkotlin/text/Regex$d;->d:Lkotlin/text/Regex$d;
 
-    if-eqz p1, :cond_0
+    const-string p2, "seedFunction"
 
-    new-instance p2, Lj0/s/i;
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p2, v1, p1}, Lj0/s/i;-><init>(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
+    const-string p2, "nextFunction"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lk0/t/i;
+
+    invoke-direct {p2, v0, p1}, Lk0/t/i;-><init>(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
 
     return-object p2
 
     :cond_0
-    const-string p1, "nextFunction"
+    new-instance v0, Ljava/lang/IndexOutOfBoundsException;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v1, "Start index out of bounds: "
 
-    throw v0
+    const-string v2, ", input length: "
 
-    :cond_1
-    const-string p1, "input"
+    invoke-static {v1, p2, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    move-result-object p2
+
+    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
+
+    move-result p1
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
 
     throw v0
 .end method
 
 .method public final matchEntire(Ljava/lang/CharSequence;)Lkotlin/text/MatchResult;
-    .locals 3
+    .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "input"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
+    iget-object v0, p0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
 
-    invoke-virtual {v1, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+    invoke-virtual {v0, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string v2, "nativePattern.matcher(input)"
+    const-string v1, "nativePattern.matcher(input)"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Ljava/util/regex/Matcher;->matches()Z
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->matches()Z
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_0
+    if-nez v1, :cond_0
+
+    const/4 p1, 0x0
 
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lj0/t/c;
+    new-instance v1, Lk0/u/c;
 
-    invoke-direct {v0, v1, p1}, Lj0/t/c;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+    invoke-direct {v1, v0, p1}, Lk0/u/c;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+
+    move-object p1, v1
 
     :goto_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object p1
 .end method
 
 .method public final matches(Ljava/lang/CharSequence;)Z
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
 
@@ -283,21 +309,18 @@
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final replace(Ljava/lang/CharSequence;Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "replacement"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern;
 
@@ -311,18 +334,9 @@
 
     const-string p2, "nativePattern.matcher(in\u2026).replaceAll(replacement)"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
-
-    :cond_0
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final replace(Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/String;
@@ -341,11 +355,13 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "input"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string v0, "transform"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -364,6 +380,8 @@
     invoke-direct {v3, v2}, Ljava/lang/StringBuilder;-><init>(I)V
 
     :cond_0
+    invoke-static {v1}, Lk0/o/c/i;->checkNotNull(Ljava/lang/Object;)V
+
     invoke-interface {v1}, Lkotlin/text/MatchResult;->getRange()Lkotlin/ranges/IntRange;
 
     move-result-object v4
@@ -420,7 +438,7 @@
 
     const-string p2, "sb.toString()"
 
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object p1
 
@@ -430,20 +448,6 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_4
-    const-string p1, "transform"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "input"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public toString()Ljava/lang/String;
@@ -457,7 +461,7 @@
 
     const-string v1, "nativePattern.toString()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/CompletionHandlerException.smali b/com.discord/smali_classes2/kotlinx/coroutines/CompletionHandlerException.smali
index 27f43f8db0..8f44bd9213 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/CompletionHandlerException.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/CompletionHandlerException.smali
@@ -5,20 +5,17 @@
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cause"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1, p2}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/Job.smali b/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
index 27d7649902..e31a358dde 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
@@ -34,7 +34,7 @@
 .method public abstract a()Z
 .end method
 
-.method public abstract d(ZZLkotlin/jvm/functions/Function1;)Lk0/a/k0;
+.method public abstract d(ZZLkotlin/jvm/functions/Function1;)Ll0/a/k0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(ZZ",
@@ -43,7 +43,7 @@
             "Ljava/lang/Throwable;",
             "Lkotlin/Unit;",
             ">;)",
-            "Lk0/a/k0;"
+            "Ll0/a/k0;"
         }
     .end annotation
 .end method
@@ -51,7 +51,7 @@
 .method public abstract e()Ljava/util/concurrent/CancellationException;
 .end method
 
-.method public abstract i(Lkotlin/jvm/functions/Function1;)Lk0/a/k0;
+.method public abstract i(Lkotlin/jvm/functions/Function1;)Ll0/a/k0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -60,7 +60,7 @@
             "Ljava/lang/Throwable;",
             "Lkotlin/Unit;",
             ">;)",
-            "Lk0/a/k0;"
+            "Ll0/a/k0;"
         }
     .end annotation
 .end method
@@ -71,5 +71,5 @@
 .method public abstract start()Z
 .end method
 
-.method public abstract t(Lk0/a/l;)Lk0/a/j;
+.method public abstract t(Ll0/a/l;)Ll0/a/j;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/JobCancellationException.smali b/com.discord/smali_classes2/kotlinx/coroutines/JobCancellationException.smali
index 205d1465b0..8871101363 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/JobCancellationException.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/JobCancellationException.smali
@@ -3,14 +3,14 @@
 .source "Exceptions.kt"
 
 # interfaces
-.implements Lk0/a/t;
+.implements Ll0/a/t;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Ljava/util/concurrent/CancellationException;",
-        "Lk0/a/t<",
+        "Ll0/a/t<",
         "Lkotlinx/coroutines/JobCancellationException;",
         ">;"
     }
@@ -25,11 +25,13 @@
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "message"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_1
+    const-string v0, "job"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
 
@@ -41,20 +43,6 @@
 
     :cond_0
     return-void
-
-    :cond_1
-    const-string p1, "job"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -62,7 +50,7 @@
 .method public a()Ljava/lang/Throwable;
     .locals 3
 
-    sget-boolean v0, Lk0/a/b0;->b:Z
+    sget-boolean v0, Ll0/a/b0;->b:Z
 
     const/4 v1, 0x0
 
@@ -85,7 +73,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
     throw v1
 
@@ -113,7 +101,7 @@
 
     move-result-object v1
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -123,7 +111,7 @@
 
     iget-object v1, p0, Lkotlinx/coroutines/JobCancellationException;->job:Lkotlinx/coroutines/Job;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -137,7 +125,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -161,7 +149,7 @@
 .method public fillInStackTrace()Ljava/lang/Throwable;
     .locals 2
 
-    sget-boolean v0, Lk0/a/b0;->b:Z
+    sget-boolean v0, Ll0/a/b0;->b:Z
 
     if-eqz v0, :cond_0
 
@@ -171,7 +159,7 @@
 
     const-string v1, "super.fillInStackTrace()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 
@@ -225,7 +213,7 @@
     return v1
 
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali
index 228392de50..5973133b03 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidDispatcherFactory.smali
@@ -25,10 +25,14 @@
     return-object v0
 .end method
 
-.method public b(Ljava/util/List;)Lk0/a/f1;
+.method public b(Ljava/util/List;)Ll0/a/f1;
     .locals 3
 
-    new-instance p1, Lk0/a/q1/a;
+    const-string v0, "allFactories"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Ll0/a/q1/a;
 
     invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
 
@@ -36,19 +40,23 @@
 
     const-string v1, "Looper.getMainLooper()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v1, 0x1
 
-    invoke-static {v0, v1}, Lk0/a/q1/c;->a(Landroid/os/Looper;Z)Landroid/os/Handler;
+    invoke-static {v0, v1}, Ll0/a/q1/c;->a(Landroid/os/Looper;Z)Landroid/os/Handler;
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    const-string v1, "handler"
 
-    const-string v2, "Main"
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p1, v0, v2, v1}, Lk0/a/q1/a;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
+    const-string v1, "Main"
+
+    const/4 v2, 0x0
+
+    invoke-direct {p1, v0, v1, v2}, Ll0/a/q1/a;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
index ca5d494125..0569d6b035 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
@@ -1,5 +1,5 @@
 .class public final Lkotlinx/coroutines/android/AndroidExceptionPreHandler;
-.super Lj0/k/a;
+.super Lk0/l/a;
 .source "AndroidExceptionPreHandler.kt"
 
 # interfaces
@@ -13,7 +13,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lj0/k/a;",
+        "Lk0/l/a;",
         "Lkotlinx/coroutines/CoroutineExceptionHandler;",
         "Lkotlin/jvm/functions/Function0<",
         "Ljava/lang/reflect/Method;",
@@ -38,11 +38,11 @@
 
     new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    new-instance v1, Lj0/n/c/q;
+    new-instance v1, Lk0/o/c/r;
 
     const-class v2, Lkotlinx/coroutines/android/AndroidExceptionPreHandler;
 
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
 
     move-result-object v2
 
@@ -50,9 +50,9 @@
 
     const-string v4, "getPreHandler()Ljava/lang/reflect/Method;"
 
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-direct {v1, v2, v3, v4}, Lk0/o/c/r;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
+    invoke-static {v1}, Lk0/o/c/t;->property1(Lk0/o/c/q;)Lk0/s/d;
 
     const/4 v2, 0x0
 
@@ -68,7 +68,7 @@
 
     sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->b:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
-    invoke-direct {p0, v0}, Lj0/k/a;-><init>(Lkotlin/coroutines/CoroutineContext$b;)V
+    invoke-direct {p0, v0}, Lk0/l/a;-><init>(Lkotlin/coroutines/CoroutineContext$b;)V
 
     invoke-static {p0}, Lf/n/a/k/a;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
 
@@ -104,25 +104,27 @@
 .method public handleException(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
     .locals 3
 
-    const/4 v0, 0x0
+    const-string v0, "context"
 
-    if-eqz p1, :cond_5
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_4
+    const-string p1, "exception"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object p1
 
-    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    const/16 v2, 0x1c
+    const/16 v1, 0x1c
 
-    if-lt v1, v2, :cond_0
+    if-lt v0, v1, :cond_0
 
     const-string v0, "thread"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
 
@@ -135,57 +137,45 @@
     :cond_0
     invoke-direct {p0}, Lkotlinx/coroutines/android/AndroidExceptionPreHandler;->getPreHandler()Ljava/lang/reflect/Method;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-eqz v1, :cond_1
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
 
     const/4 v2, 0x0
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    invoke-virtual {v1, v0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     goto :goto_0
 
     :cond_1
-    move-object v1, v0
+    move-object v0, v1
 
     :goto_0
-    instance-of v2, v1, Ljava/lang/Thread$UncaughtExceptionHandler;
+    instance-of v2, v0, Ljava/lang/Thread$UncaughtExceptionHandler;
 
     if-nez v2, :cond_2
 
     goto :goto_1
 
     :cond_2
-    move-object v0, v1
+    move-object v1, v0
 
     :goto_1
-    check-cast v0, Ljava/lang/Thread$UncaughtExceptionHandler;
+    check-cast v1, Ljava/lang/Thread$UncaughtExceptionHandler;
 
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_3
 
-    invoke-interface {v0, p1, p2}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+    invoke-interface {v1, p1, p2}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
 
     :cond_3
     :goto_2
     return-void
-
-    :cond_4
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "context"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public bridge synthetic invoke()Ljava/lang/Object;
@@ -218,7 +208,7 @@
 
     const-string v2, "it"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/reflect/Method;->getModifiers()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/AbortFlowException.smali b/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/AbortFlowException.smali
index cd299cbbb6..82996ea1b3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/AbortFlowException.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/AbortFlowException.smali
@@ -19,7 +19,7 @@
 .method public fillInStackTrace()Ljava/lang/Throwable;
     .locals 1
 
-    sget-boolean v0, Lk0/a/b0;->b:Z
+    sget-boolean v0, Ll0/a/b0;->b:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/ChildCancelledException.smali b/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/ChildCancelledException.smali
index 12e5801214..195a906724 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/ChildCancelledException.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/flow/internal/ChildCancelledException.smali
@@ -19,7 +19,7 @@
 .method public fillInStackTrace()Ljava/lang/Throwable;
     .locals 1
 
-    sget-boolean v0, Lk0/a/b0;->b:Z
+    sget-boolean v0, Ll0/a/b0;->b:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/MainDispatcherFactory.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/MainDispatcherFactory.smali
index e61cdbcb79..9feb5e7658 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/internal/MainDispatcherFactory.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/internal/MainDispatcherFactory.smali
@@ -7,7 +7,7 @@
 .method public abstract a()Ljava/lang/String;
 .end method
 
-.method public abstract b(Ljava/util/List;)Lk0/a/f1;
+.method public abstract b(Ljava/util/List;)Ll0/a/f1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -15,7 +15,7 @@
             "+",
             "Lkotlinx/coroutines/internal/MainDispatcherFactory;",
             ">;)",
-            "Lk0/a/f1;"
+            "Ll0/a/f1;"
         }
     .end annotation
 .end method
diff --git a/com.discord/smali_classes2/l0/a.smali b/com.discord/smali_classes2/l0/a.smali
deleted file mode 100644
index b6d7b9b528..0000000000
--- a/com.discord/smali_classes2/l0/a.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Ll0/a;
-.super Lj0/n/c/i;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "TT;",
-        "Lkotlin/reflect/KProperty<",
-        "*>;TV;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $finder:Lkotlin/jvm/functions/Function2;
-
-.field public final synthetic $id:I
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function2;I)V
-    .locals 0
-
-    iput-object p1, p0, Ll0/a;->$finder:Lkotlin/jvm/functions/Function2;
-
-    iput p2, p0, Ll0/a;->$id:I
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p2, Lkotlin/reflect/KProperty;
-
-    if-eqz p2, :cond_0
-
-    iget-object p2, p0, Ll0/a;->$finder:Lkotlin/jvm/functions/Function2;
-
-    iget v0, p0, Ll0/a;->$id:I
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-interface {p2, p1, v0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/view/View;
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "desc"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/l0/a/a.smali b/com.discord/smali_classes2/l0/a/a.smali
new file mode 100644
index 0000000000..ef009eadfd
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/a.smali
@@ -0,0 +1,215 @@
+.class public abstract Ll0/a/a;
+.super Ll0/a/c1;
+.source "AbstractCoroutine.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/Job;
+.implements Lkotlin/coroutines/Continuation;
+.implements Lkotlinx/coroutines/CoroutineScope;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/c1;",
+        "Lkotlinx/coroutines/Job;",
+        "Lkotlin/coroutines/Continuation<",
+        "TT;>;",
+        "Lkotlinx/coroutines/CoroutineScope;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final e:Lkotlin/coroutines/CoroutineContext;
+
+.field public final f:Lkotlin/coroutines/CoroutineContext;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Z)V
+    .locals 1
+
+    const-string v0, "parentContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p2}, Ll0/a/c1;-><init>(Z)V
+
+    iput-object p1, p0, Ll0/a/a;->f:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-interface {p1, p0}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    iput-object p1, p0, Ll0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public E()Ljava/lang/String;
+    .locals 3
+
+    iget-object v0, p0, Ll0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-static {v0}, Ll0/a/u;->a(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const/16 v2, 0x22
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "\":"
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final H(Ljava/lang/Object;)V
+    .locals 1
+
+    instance-of v0, p1, Ll0/a/p;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ll0/a/p;
+
+    iget-object v0, p1, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    iget p1, p1, Ll0/a/p;->_handled:I
+
+    const-string p1, "cause"
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public final I()V
+    .locals 0
+
+    invoke-virtual {p0}, Ll0/a/a;->R()V
+
+    return-void
+.end method
+
+.method public P()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final Q()V
+    .locals 2
+
+    iget-object v0, p0, Ll0/a/a;->f:Lkotlin/coroutines/CoroutineContext;
+
+    sget-object v1, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {v0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v0
+
+    check-cast v0, Lkotlinx/coroutines/Job;
+
+    invoke-virtual {p0, v0}, Ll0/a/c1;->A(Lkotlinx/coroutines/Job;)V
+
+    return-void
+.end method
+
+.method public R()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public a()Z
+    .locals 1
+
+    invoke-super {p0}, Ll0/a/c1;->a()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final getContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
+
+    return-object v0
+.end method
+
+.method public getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
+
+    return-object v0
+.end method
+
+.method public final resumeWith(Ljava/lang/Object;)V
+    .locals 1
+
+    invoke-static {p1}, Lf/n/a/k/a;->f0(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Ll0/a/a;->P()I
+
+    move-result v0
+
+    invoke-virtual {p0, p1, v0}, Ll0/a/c1;->C(Ljava/lang/Object;I)Z
+
+    return-void
+.end method
+
+.method public final z(Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Ll0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-static {v0, p1}, Lf/n/a/k/a;->C(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/a0.smali b/com.discord/smali_classes2/l0/a/a0.smali
new file mode 100644
index 0000000000..5f7da15427
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/a0.smali
@@ -0,0 +1,21 @@
+.class public final Ll0/a/a0;
+.super Ljava/lang/Error;
+.source "Exceptions.common.kt"
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cause"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Error;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/a1.smali b/com.discord/smali_classes2/l0/a/a1.smali
new file mode 100644
index 0000000000..4adac5c331
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/a1.smali
@@ -0,0 +1,100 @@
+.class public Ll0/a/a1;
+.super Ll0/a/c1;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Ll0/a/o;
+
+
+# instance fields
+.field public final e:Z
+
+
+# direct methods
+.method public constructor <init>(Lkotlinx/coroutines/Job;)V
+    .locals 3
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Ll0/a/c1;-><init>(Z)V
+
+    invoke-virtual {p0, p1}, Ll0/a/c1;->A(Lkotlinx/coroutines/Job;)V
+
+    iget-object p1, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    instance-of v1, p1, Ll0/a/k;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object p1, v2
+
+    :cond_0
+    check-cast p1, Ll0/a/k;
+
+    if-eqz p1, :cond_3
+
+    iget-object p1, p1, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    check-cast p1, Ll0/a/c1;
+
+    if-eqz p1, :cond_3
+
+    :goto_0
+    invoke-virtual {p1}, Ll0/a/c1;->u()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    iget-object p1, p1, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    instance-of v1, p1, Ll0/a/k;
+
+    if-nez v1, :cond_2
+
+    move-object p1, v2
+
+    :cond_2
+    check-cast p1, Ll0/a/k;
+
+    if-eqz p1, :cond_3
+
+    iget-object p1, p1, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    check-cast p1, Ll0/a/c1;
+
+    if-eqz p1, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :goto_1
+    iput-boolean v0, p0, Ll0/a/a1;->e:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public u()Z
+    .locals 1
+
+    iget-boolean v0, p0, Ll0/a/a1;->e:Z
+
+    return v0
+.end method
+
+.method public v()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/b.smali b/com.discord/smali_classes2/l0/a/b.smali
new file mode 100644
index 0000000000..e027de98d4
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/b.smali
@@ -0,0 +1,42 @@
+.class public final Ll0/a/b;
+.super Ljava/lang/Object;
+.source "CancellableContinuationImpl.kt"
+
+# interfaces
+.implements Ll0/a/i1;
+
+
+# static fields
+.field public static final d:Ll0/a/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/b;
+
+    invoke-direct {v0}, Ll0/a/b;-><init>()V
+
+    sput-object v0, Ll0/a/b;->d:Ll0/a/b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "Active"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/b0.smali b/com.discord/smali_classes2/l0/a/b0.smali
new file mode 100644
index 0000000000..6e616e80a8
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/b0.smali
@@ -0,0 +1,201 @@
+.class public final Ll0/a/b0;
+.super Ljava/lang/Object;
+.source "Debug.kt"
+
+
+# static fields
+.field public static final a:Z
+
+.field public static final b:Z
+
+.field public static final c:Z
+
+.field public static final d:Ljava/util/concurrent/atomic/AtomicLong;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 7
+
+    const-class v0, Ll0/a/x;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->desiredAssertionStatus()Z
+
+    move-result v0
+
+    sput-boolean v0, Ll0/a/b0;->a:Z
+
+    const-string v0, "kotlinx.coroutines.debug"
+
+    const-string v1, "propertyName"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    :try_start_0
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-object v0, v2
+
+    :goto_0
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-nez v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v5
+
+    if-eqz v5, :cond_3
+
+    const/16 v6, 0xddf
+
+    if-eq v5, v6, :cond_2
+
+    const v6, 0x1ad6f
+
+    if-eq v5, v6, :cond_1
+
+    const v6, 0x2dddaf
+
+    if-ne v5, v6, :cond_6
+
+    const-string v5, "auto"
+
+    invoke-virtual {v0, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    :goto_1
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    goto :goto_3
+
+    :cond_1
+    const-string v5, "off"
+
+    invoke-virtual {v0, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    const/4 v0, 0x0
+
+    goto :goto_3
+
+    :cond_2
+    const-string v5, "on"
+
+    invoke-virtual {v0, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    goto :goto_2
+
+    :cond_3
+    const-string v5, ""
+
+    invoke-virtual {v0, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    :goto_2
+    const/4 v0, 0x1
+
+    :goto_3
+    sput-boolean v0, Ll0/a/b0;->b:Z
+
+    if-eqz v0, :cond_5
+
+    const-string v0, "kotlinx.coroutines.stacktrace.recovery"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_1
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+    :try_end_1
+    .catch Ljava/lang/SecurityException; {:try_start_1 .. :try_end_1} :catch_1
+
+    :catch_1
+    if-eqz v2, :cond_4
+
+    invoke-static {v2}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
+
+    move-result v0
+
+    goto :goto_4
+
+    :cond_4
+    const/4 v0, 0x1
+
+    :goto_4
+    if-eqz v0, :cond_5
+
+    const/4 v3, 0x1
+
+    :cond_5
+    sput-boolean v3, Ll0/a/b0;->c:Z
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide/16 v1, 0x0
+
+    invoke-direct {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
+
+    sput-object v0, Ll0/a/b0;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    return-void
+
+    :cond_6
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "System property \'kotlinx.coroutines.debug\' has unrecognized value \'"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v0, 0x27
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/b1.smali b/com.discord/smali_classes2/l0/a/b1.smali
new file mode 100644
index 0000000000..7e0d401a36
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/b1.smali
@@ -0,0 +1,324 @@
+.class public abstract Ll0/a/b1;
+.super Ll0/a/s;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Ll0/a/k0;
+.implements Ll0/a/u0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<J::",
+        "Lkotlinx/coroutines/Job;",
+        ">",
+        "Ll0/a/s;",
+        "Ll0/a/k0;",
+        "Ll0/a/u0;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final g:Lkotlinx/coroutines/Job;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TJ;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlinx/coroutines/Job;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TJ;)V"
+        }
+    .end annotation
+
+    const-string v0, "job"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ll0/a/s;-><init>()V
+
+    iput-object p1, p0, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public dispose()V
+    .locals 9
+
+    iget-object v0, p0, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    if-eqz v0, :cond_11
+
+    check-cast v0, Ll0/a/c1;
+
+    const-string v1, "node"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {v0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v1
+
+    instance-of v2, v1, Ll0/a/b1;
+
+    if-eqz v2, :cond_2
+
+    if-eq v1, p0, :cond_1
+
+    goto/16 :goto_4
+
+    :cond_1
+    sget-object v2, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    sget-object v3, Ll0/a/d1;->c:Ll0/a/m0;
+
+    invoke-virtual {v2, v0, v1, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    goto/16 :goto_4
+
+    :cond_2
+    instance-of v0, v1, Ll0/a/u0;
+
+    if-eqz v0, :cond_10
+
+    check-cast v1, Ll0/a/u0;
+
+    invoke-interface {v1}, Ll0/a/u0;->getList()Ll0/a/g1;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_10
+
+    :cond_3
+    invoke-virtual {p0}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Ll0/a/r1/s;
+
+    if-eqz v1, :cond_4
+
+    goto/16 :goto_4
+
+    :cond_4
+    if-ne v0, p0, :cond_5
+
+    goto/16 :goto_4
+
+    :cond_5
+    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    if-eqz v0, :cond_f
+
+    move-object v2, v0
+
+    check-cast v2, Ll0/a/r1/m;
+
+    iget-object v3, v2, Ll0/a/r1/m;->_removedRef:Ljava/lang/Object;
+
+    check-cast v3, Ll0/a/r1/s;
+
+    if-eqz v3, :cond_6
+
+    goto :goto_0
+
+    :cond_6
+    new-instance v3, Ll0/a/r1/s;
+
+    invoke-direct {v3, v2}, Ll0/a/r1/s;-><init>(Ll0/a/r1/m;)V
+
+    sget-object v4, Ll0/a/r1/m;->f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v4, v2, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    :goto_0
+    sget-object v4, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v4, p0, v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p0}, Ll0/a/r1/m;->g()Ll0/a/r1/m;
+
+    move-result-object v0
+
+    iget-object v3, p0, Ll0/a/r1/m;->_next:Ljava/lang/Object;
+
+    if-eqz v3, :cond_e
+
+    check-cast v3, Ll0/a/r1/s;
+
+    iget-object v3, v3, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    :goto_1
+    const/4 v4, 0x0
+
+    move-object v5, v3
+
+    move-object v3, v4
+
+    :cond_7
+    :goto_2
+    invoke-virtual {v5}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v6
+
+    instance-of v7, v6, Ll0/a/r1/s;
+
+    if-eqz v7, :cond_8
+
+    invoke-virtual {v5}, Ll0/a/r1/m;->g()Ll0/a/r1/m;
+
+    check-cast v6, Ll0/a/r1/s;
+
+    iget-object v5, v6, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    goto :goto_2
+
+    :cond_8
+    invoke-virtual {v0}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v6
+
+    instance-of v7, v6, Ll0/a/r1/s;
+
+    if-eqz v7, :cond_a
+
+    if-eqz v3, :cond_9
+
+    invoke-virtual {v0}, Ll0/a/r1/m;->g()Ll0/a/r1/m;
+
+    sget-object v4, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    check-cast v6, Ll0/a/r1/s;
+
+    iget-object v6, v6, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    invoke-virtual {v4, v3, v0, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-object v0, v3
+
+    move-object v3, v5
+
+    goto :goto_1
+
+    :cond_9
+    iget-object v0, v0, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    invoke-static {v0}, Ll0/a/r1/l;->a(Ljava/lang/Object;)Ll0/a/r1/m;
+
+    move-result-object v0
+
+    goto :goto_2
+
+    :cond_a
+    if-eq v6, p0, :cond_d
+
+    if-eqz v6, :cond_c
+
+    move-object v3, v6
+
+    check-cast v3, Ll0/a/r1/m;
+
+    if-ne v3, v5, :cond_b
+
+    goto :goto_3
+
+    :cond_b
+    move-object v8, v3
+
+    move-object v3, v0
+
+    move-object v0, v8
+
+    goto :goto_2
+
+    :cond_c
+    new-instance v0, Lkotlin/TypeCastException;
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_d
+    sget-object v6, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v6, v0, p0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_7
+
+    :goto_3
+    iget-object v0, p0, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    invoke-static {v0}, Ll0/a/r1/l;->a(Ljava/lang/Object;)Ll0/a/r1/m;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0, v4}, Ll0/a/r1/m;->b(Ll0/a/r1/m;Ll0/a/r1/r;)Ll0/a/r1/m;
+
+    goto :goto_4
+
+    :cond_e
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.internal.Removed"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_f
+    new-instance v0, Lkotlin/TypeCastException;
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_10
+    :goto_4
+    return-void
+
+    :cond_11
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.JobSupport"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public getList()Ll0/a/g1;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/c.smali b/com.discord/smali_classes2/l0/a/c.smali
new file mode 100644
index 0000000000..08b598db7b
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/c.smali
@@ -0,0 +1,33 @@
+.class public final Ll0/a/c;
+.super Ll0/a/o0;
+.source "EventLoop.kt"
+
+
+# instance fields
+.field public final i:Ljava/lang/Thread;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Thread;)V
+    .locals 1
+
+    const-string v0, "thread"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ll0/a/o0;-><init>()V
+
+    iput-object p1, p0, Ll0/a/c;->i:Ljava/lang/Thread;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public D()Ljava/lang/Thread;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/c;->i:Ljava/lang/Thread;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/c0.smali b/com.discord/smali_classes2/l0/a/c0.smali
new file mode 100644
index 0000000000..c794dbf95c
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/c0.smali
@@ -0,0 +1,410 @@
+.class public final Ll0/a/c0;
+.super Ll0/a/o0;
+.source "DefaultExecutor.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# static fields
+.field public static volatile _thread:Ljava/lang/Thread;
+
+.field public static volatile debugStatus:I
+
+.field public static final i:J
+
+.field public static final j:Ll0/a/c0;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    new-instance v0, Ll0/a/c0;
+
+    invoke-direct {v0}, Ll0/a/c0;-><init>()V
+
+    sput-object v0, Ll0/a/c0;->j:Ll0/a/c0;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ll0/a/n0;->z(Z)V
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v1, 0x3e8
+
+    :try_start_0
+    const-string v3, "kotlinx.coroutines.DefaultExecutor.keepAlive"
+
+    invoke-static {v3, v1, v2}, Ljava/lang/Long;->getLong(Ljava/lang/String;J)Ljava/lang/Long;
+
+    move-result-object v1
+    :try_end_0
+    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    :goto_0
+    const-string v2, "try {\n            java.l\u2026AULT_KEEP_ALIVE\n        }"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ll0/a/c0;->i:J
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/o0;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public D()Ljava/lang/Thread;
+    .locals 2
+
+    sget-object v0, Ll0/a/c0;->_thread:Ljava/lang/Thread;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    sget-object v0, Ll0/a/c0;->_thread:Ljava/lang/Thread;
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ljava/lang/Thread;
+
+    const-string v1, "kotlinx.coroutines.DefaultExecutor"
+
+    invoke-direct {v0, p0, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/c0;->_thread:Ljava/lang/Thread;
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Thread;->setDaemon(Z)V
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->start()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_0
+    monitor-exit p0
+
+    :goto_1
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final declared-synchronized N()V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-virtual {p0}, Ll0/a/c0;->O()Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x3
+
+    :try_start_1
+    sput v0, Ll0/a/c0;->debugStatus:I
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ll0/a/o0;->_queue:Ljava/lang/Object;
+
+    iput-object v0, p0, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final O()Z
+    .locals 2
+
+    sget v0, Ll0/a/c0;->debugStatus:I
+
+    const/4 v1, 0x2
+
+    if-eq v0, v1, :cond_1
+
+    const/4 v1, 0x3
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v0, 0x1
+
+    :goto_1
+    return v0
+.end method
+
+.method public run()V
+    .locals 12
+
+    sget-object v0, Ll0/a/n1;->b:Ll0/a/n1;
+
+    const-string v0, "eventLoop"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ll0/a/n1;->a:Ljava/lang/ThreadLocal;
+
+    invoke-virtual {v0, p0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    monitor-enter p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    invoke-virtual {p0}, Ll0/a/c0;->O()Z
+
+    move-result v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x0
+
+    :try_start_2
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x1
+
+    :try_start_3
+    sput v1, Ll0/a/c0;->debugStatus:I
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :try_start_4
+    monitor-exit p0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :goto_0
+    if-nez v1, :cond_2
+
+    sput-object v0, Ll0/a/c0;->_thread:Ljava/lang/Thread;
+
+    invoke-virtual {p0}, Ll0/a/c0;->N()V
+
+    invoke-virtual {p0}, Ll0/a/o0;->K()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p0}, Ll0/a/c0;->D()Ljava/lang/Thread;
+
+    :cond_1
+    return-void
+
+    :cond_2
+    const-wide v1, 0x7fffffffffffffffL
+
+    move-wide v3, v1
+
+    :cond_3
+    :goto_1
+    :try_start_5
+    invoke-static {}, Ljava/lang/Thread;->interrupted()Z
+
+    invoke-virtual {p0}, Ll0/a/o0;->L()J
+
+    move-result-wide v5
+
+    const-wide/16 v7, 0x0
+
+    cmp-long v9, v5, v1
+
+    if-nez v9, :cond_8
+
+    cmp-long v9, v3, v1
+
+    if-nez v9, :cond_7
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v10
+
+    if-nez v9, :cond_4
+
+    sget-wide v3, Ll0/a/c0;->i:J
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    add-long/2addr v3, v10
+
+    :cond_4
+    sub-long v9, v3, v10
+
+    cmp-long v11, v9, v7
+
+    if-gtz v11, :cond_6
+
+    sput-object v0, Ll0/a/c0;->_thread:Ljava/lang/Thread;
+
+    invoke-virtual {p0}, Ll0/a/c0;->N()V
+
+    invoke-virtual {p0}, Ll0/a/o0;->K()Z
+
+    move-result v0
+
+    if-nez v0, :cond_5
+
+    invoke-virtual {p0}, Ll0/a/c0;->D()Ljava/lang/Thread;
+
+    :cond_5
+    return-void
+
+    :cond_6
+    :try_start_6
+    invoke-static {v5, v6, v9, v10}, Lk0/r/f;->coerceAtMost(JJ)J
+
+    move-result-wide v5
+
+    goto :goto_2
+
+    :cond_7
+    sget-wide v9, Ll0/a/c0;->i:J
+
+    invoke-static {v5, v6, v9, v10}, Lk0/r/f;->coerceAtMost(JJ)J
+
+    move-result-wide v5
+
+    :cond_8
+    :goto_2
+    cmp-long v9, v5, v7
+
+    if-lez v9, :cond_3
+
+    invoke-virtual {p0}, Ll0/a/c0;->O()Z
+
+    move-result v7
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
+
+    if-eqz v7, :cond_a
+
+    sput-object v0, Ll0/a/c0;->_thread:Ljava/lang/Thread;
+
+    invoke-virtual {p0}, Ll0/a/c0;->N()V
+
+    invoke-virtual {p0}, Ll0/a/o0;->K()Z
+
+    move-result v0
+
+    if-nez v0, :cond_9
+
+    invoke-virtual {p0}, Ll0/a/c0;->D()Ljava/lang/Thread;
+
+    :cond_9
+    return-void
+
+    :cond_a
+    :try_start_7
+    invoke-static {p0, v5, v6}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(Ljava/lang/Object;J)V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit p0
+
+    throw v1
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_1
+
+    :catchall_1
+    move-exception v1
+
+    sput-object v0, Ll0/a/c0;->_thread:Ljava/lang/Thread;
+
+    invoke-virtual {p0}, Ll0/a/c0;->N()V
+
+    invoke-virtual {p0}, Ll0/a/o0;->K()Z
+
+    move-result v0
+
+    if-nez v0, :cond_b
+
+    invoke-virtual {p0}, Ll0/a/c0;->D()Ljava/lang/Thread;
+
+    :cond_b
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/c1$a.smali b/com.discord/smali_classes2/l0/a/c1$a.smali
new file mode 100644
index 0000000000..2ea5e64bbc
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/c1$a.smali
@@ -0,0 +1,173 @@
+.class public final Ll0/a/c1$a;
+.super Ll0/a/b1;
+.source "JobSupport.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/c1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/b1<",
+        "Lkotlinx/coroutines/Job;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final h:Ll0/a/c1;
+
+.field public final i:Ll0/a/c1$b;
+
+.field public final j:Ll0/a/k;
+
+.field public final k:Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/c1;Ll0/a/c1$b;Ll0/a/k;Ljava/lang/Object;)V
+    .locals 1
+
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "state"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "child"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p3, Ll0/a/k;->h:Ll0/a/l;
+
+    invoke-direct {p0, v0}, Ll0/a/b1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    iput-object p1, p0, Ll0/a/c1$a;->h:Ll0/a/c1;
+
+    iput-object p2, p0, Ll0/a/c1$a;->i:Ll0/a/c1$b;
+
+    iput-object p3, p0, Ll0/a/c1$a;->j:Ll0/a/k;
+
+    iput-object p4, p0, Ll0/a/c1$a;->k:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public i(Ljava/lang/Throwable;)V
+    .locals 5
+
+    iget-object p1, p0, Ll0/a/c1$a;->h:Ll0/a/c1;
+
+    iget-object v0, p0, Ll0/a/c1$a;->i:Ll0/a/c1$b;
+
+    iget-object v1, p0, Ll0/a/c1$a;->j:Ll0/a/k;
+
+    iget-object v2, p0, Ll0/a/c1$a;->k:Ljava/lang/Object;
+
+    invoke-virtual {p1}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    if-ne v3, v0, :cond_0
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
+    if-eqz v3, :cond_2
+
+    invoke-virtual {p1, v1}, Ll0/a/c1;->F(Ll0/a/r1/m;)Ll0/a/k;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p1, v0, v1, v2}, Ll0/a/c1;->O(Ll0/a/c1$b;Ll0/a/k;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p1, v0, v2, v4}, Ll0/a/c1;->M(Ll0/a/c1$b;Ljava/lang/Object;I)Z
+
+    :goto_1
+    return-void
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Failed requirement."
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Ll0/a/c1$a;->i(Ljava/lang/Throwable;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "ChildCompletion["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/c1$a;->j:Ll0/a/k;
+
+    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;
+
+    iget-object v1, p0, Ll0/a/c1$a;->k:Ljava/lang/Object;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/k0/a/c1$b.smali b/com.discord/smali_classes2/l0/a/c1$b.smali
similarity index 76%
rename from com.discord/smali_classes2/k0/a/c1$b.smali
rename to com.discord/smali_classes2/l0/a/c1$b.smali
index 1bc11e5f77..568d2806b8 100644
--- a/com.discord/smali_classes2/k0/a/c1$b.smali
+++ b/com.discord/smali_classes2/l0/a/c1$b.smali
@@ -1,14 +1,14 @@
-.class public final Lk0/a/c1$b;
+.class public final Ll0/a/c1$b;
 .super Ljava/lang/Object;
 .source "JobSupport.kt"
 
 # interfaces
-.implements Lk0/a/u0;
+.implements Ll0/a/u0;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lk0/a/c1;
+    value = Ll0/a/c1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,7 +20,7 @@
 # instance fields
 .field public volatile _exceptionsHolder:Ljava/lang/Object;
 
-.field public final d:Lk0/a/g1;
+.field public final d:Ll0/a/g1;
 
 .field public volatile isCompleting:Z
 
@@ -28,16 +28,20 @@
 
 
 # direct methods
-.method public constructor <init>(Lk0/a/g1;ZLjava/lang/Throwable;)V
-    .locals 0
+.method public constructor <init>(Ll0/a/g1;ZLjava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "list"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lk0/a/c1$b;->d:Lk0/a/g1;
+    iput-object p1, p0, Ll0/a/c1$b;->d:Ll0/a/g1;
 
-    iput-boolean p2, p0, Lk0/a/c1$b;->isCompleting:Z
+    iput-boolean p2, p0, Ll0/a/c1$b;->isCompleting:Z
 
-    iput-object p3, p0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    iput-object p3, p0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -47,7 +51,7 @@
 .method public a()Z
     .locals 1
 
-    iget-object v0, p0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    iget-object v0, p0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
 
     if-nez v0, :cond_0
 
@@ -65,13 +69,15 @@
 .method public final b(Ljava/lang/Throwable;)V
     .locals 2
 
-    if-eqz p1, :cond_6
+    const-string v0, "exception"
 
-    iget-object v0, p0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    iput-object p1, p0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
 
     return-void
 
@@ -81,11 +87,11 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lk0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
+    iget-object v0, p0, Ll0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
 
     if-nez v0, :cond_2
 
-    iput-object p1, p0, Lk0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
+    iput-object p1, p0, Ll0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
 
     goto :goto_0
 
@@ -99,7 +105,7 @@
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lk0/a/c1$b;->c()Ljava/util/ArrayList;
+    invoke-virtual {p0}, Ll0/a/c1$b;->c()Ljava/util/ArrayList;
 
     move-result-object v1
 
@@ -107,7 +113,7 @@
 
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    iput-object v1, p0, Lk0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
+    iput-object v1, p0, Ll0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
 
     goto :goto_0
 
@@ -147,15 +153,6 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_6
-    const-string p1, "exception"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final c()Ljava/util/ArrayList;
@@ -181,7 +178,7 @@
 .method public final d()Z
     .locals 1
 
-    iget-object v0, p0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    iget-object v0, p0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_0
 
@@ -199,9 +196,9 @@
 .method public final e()Z
     .locals 2
 
-    iget-object v0, p0, Lk0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
+    iget-object v0, p0, Ll0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
 
-    sget-object v1, Lk0/a/d1;->a:Lk0/a/r1/v;
+    sget-object v1, Ll0/a/d1;->a:Ll0/a/r1/v;
 
     if-ne v0, v1, :cond_0
 
@@ -229,11 +226,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lk0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
+    iget-object v0, p0, Ll0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lk0/a/c1$b;->c()Ljava/util/ArrayList;
+    invoke-virtual {p0}, Ll0/a/c1$b;->c()Ljava/util/ArrayList;
 
     move-result-object v0
 
@@ -244,7 +241,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {p0}, Lk0/a/c1$b;->c()Ljava/util/ArrayList;
+    invoke-virtual {p0}, Ll0/a/c1$b;->c()Ljava/util/ArrayList;
 
     move-result-object v1
 
@@ -262,7 +259,7 @@
     check-cast v0, Ljava/util/ArrayList;
 
     :goto_0
-    iget-object v1, p0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    iget-object v1, p0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
 
     if-eqz v1, :cond_2
 
@@ -273,7 +270,7 @@
     :cond_2
     if-eqz p1, :cond_3
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -284,9 +281,9 @@
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_3
-    sget-object p1, Lk0/a/d1;->a:Lk0/a/r1/v;
+    sget-object p1, Ll0/a/d1;->a:Ll0/a/r1/v;
 
-    iput-object p1, p0, Lk0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
+    iput-object p1, p0, Ll0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
 
     return-object v0
 
@@ -316,10 +313,10 @@
     throw v0
 .end method
 
-.method public getList()Lk0/a/g1;
+.method public getList()Ll0/a/g1;
     .locals 1
 
-    iget-object v0, p0, Lk0/a/c1$b;->d:Lk0/a/g1;
+    iget-object v0, p0, Ll0/a/c1$b;->d:Ll0/a/g1;
 
     return-object v0
 .end method
@@ -333,7 +330,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lk0/a/c1$b;->d()Z
+    invoke-virtual {p0}, Ll0/a/c1$b;->d()Z
 
     move-result v1
 
@@ -343,7 +340,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lk0/a/c1$b;->isCompleting:Z
+    iget-boolean v1, p0, Ll0/a/c1$b;->isCompleting:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -351,7 +348,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lk0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    iget-object v1, p0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -359,7 +356,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lk0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
+    iget-object v1, p0, Ll0/a/c1$b;->_exceptionsHolder:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -367,7 +364,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lk0/a/c1$b;->d:Lk0/a/g1;
+    iget-object v1, p0, Ll0/a/c1$b;->d:Ll0/a/g1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/l0/a/c1$c.smali b/com.discord/smali_classes2/l0/a/c1$c.smali
new file mode 100644
index 0000000000..f9cbea0f71
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/c1$c.smali
@@ -0,0 +1,34 @@
+.class public final Ll0/a/c1$c;
+.super Ll0/a/r1/m$a;
+.source "LockFreeLinkedList.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ll0/a/c1;->h(Ljava/lang/Object;Ll0/a/g1;Ll0/a/b1;)Z
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ll0/a/c1;
+
+.field public final synthetic e:Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/r1/m;Ll0/a/r1/m;Ll0/a/c1;Ljava/lang/Object;)V
+    .locals 0
+
+    iput-object p3, p0, Ll0/a/c1$c;->d:Ll0/a/c1;
+
+    iput-object p4, p0, Ll0/a/c1$c;->e:Ljava/lang/Object;
+
+    invoke-direct {p0, p2}, Ll0/a/r1/m$a;-><init>(Ll0/a/r1/m;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/c1.smali b/com.discord/smali_classes2/l0/a/c1.smali
new file mode 100644
index 0000000000..05037b422c
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/c1.smali
@@ -0,0 +1,3281 @@
+.class public Ll0/a/c1;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/Job;
+.implements Ll0/a/l;
+.implements Ll0/a/j1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ll0/a/c1$b;,
+        Ll0/a/c1$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
+# instance fields
+.field public volatile _state:Ljava/lang/Object;
+
+.field public volatile parentHandle:Ll0/a/j;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ll0/a/c1;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "_state"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    if-eqz p1, :cond_0
+
+    sget-object p1, Ll0/a/d1;->c:Ll0/a/m0;
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p1, Ll0/a/d1;->b:Ll0/a/m0;
+
+    :goto_0
+    iput-object p1, p0, Ll0/a/c1;->_state:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final A(Lkotlinx/coroutines/Job;)V
+    .locals 2
+
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_2
+    :goto_1
+    if-nez p1, :cond_3
+
+    sget-object p1, Ll0/a/h1;->d:Ll0/a/h1;
+
+    iput-object p1, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    return-void
+
+    :cond_3
+    invoke-interface {p1}, Lkotlinx/coroutines/Job;->start()Z
+
+    invoke-interface {p1, p0}, Lkotlinx/coroutines/Job;->t(Ll0/a/l;)Ll0/a/j;
+
+    move-result-object p1
+
+    iput-object p1, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v0, v0, Ll0/a/u0;
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_4
+
+    invoke-interface {p1}, Ll0/a/k0;->dispose()V
+
+    sget-object p1, Ll0/a/h1;->d:Ll0/a/h1;
+
+    iput-object p1, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    :cond_4
+    return-void
+.end method
+
+.method public B()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final C(Ljava/lang/Object;I)Z
+    .locals 3
+
+    :goto_0
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0, p1, p2}, Ll0/a/c1;->N(Ljava/lang/Object;Ljava/lang/Object;I)I
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :cond_2
+
+    const/4 v1, 0x2
+
+    if-eq v0, v1, :cond_1
+
+    const/4 v1, 0x3
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "unexpected result"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_2
+    return v1
+
+    :cond_3
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Job "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, " is already complete or completing, "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "but is being completed with "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    instance-of v1, p1, Ll0/a/p;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_4
+
+    move-object p1, v2
+
+    :cond_4
+    check-cast p1, Ll0/a/p;
+
+    if-eqz p1, :cond_5
+
+    iget-object v2, p1, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    :cond_5
+    invoke-direct {p2, v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p2
+.end method
+
+.method public final D(Lkotlin/jvm/functions/Function1;Z)Ll0/a/b1;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;Z)",
+            "Ll0/a/b1<",
+            "*>;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    const-string v1, "Failed requirement."
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-eqz p2, :cond_4
+
+    instance-of p2, p1, Ll0/a/z0;
+
+    if-nez p2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v3, p1
+
+    :goto_0
+    check-cast v3, Ll0/a/z0;
+
+    if-eqz v3, :cond_3
+
+    iget-object p1, v3, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    if-ne p1, p0, :cond_1
+
+    const/4 v0, 0x1
+
+    :cond_1
+    if-eqz v0, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    new-instance v3, Ll0/a/x0;
+
+    invoke-direct {v3, p0, p1}, Ll0/a/x0;-><init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
+
+    goto :goto_2
+
+    :cond_4
+    instance-of p2, p1, Ll0/a/b1;
+
+    if-nez p2, :cond_5
+
+    goto :goto_1
+
+    :cond_5
+    move-object v3, p1
+
+    :goto_1
+    check-cast v3, Ll0/a/b1;
+
+    if-eqz v3, :cond_8
+
+    iget-object p1, v3, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    if-ne p1, p0, :cond_6
+
+    instance-of p1, v3, Ll0/a/z0;
+
+    if-nez p1, :cond_6
+
+    const/4 v0, 0x1
+
+    :cond_6
+    if-eqz v0, :cond_7
+
+    goto :goto_2
+
+    :cond_7
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_8
+    new-instance v3, Ll0/a/y0;
+
+    invoke-direct {v3, p0, p1}, Ll0/a/y0;-><init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
+
+    :goto_2
+    return-object v3
+.end method
+
+.method public E()Ljava/lang/String;
+    .locals 1
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final F(Ll0/a/r1/m;)Ll0/a/k;
+    .locals 1
+
+    :goto_0
+    invoke-virtual {p1}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v0, v0, Ll0/a/r1/s;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p1}, Ll0/a/r1/m;->f()Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ll0/a/r1/l;->a(Ljava/lang/Object;)Ll0/a/r1/m;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    :goto_1
+    invoke-virtual {p1}, Ll0/a/r1/m;->e()Ll0/a/r1/m;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v0, v0, Ll0/a/r1/s;
+
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    instance-of v0, p1, Ll0/a/k;
+
+    if-eqz v0, :cond_2
+
+    check-cast p1, Ll0/a/k;
+
+    return-object p1
+
+    :cond_2
+    instance-of v0, p1, Ll0/a/g1;
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public final G(Ll0/a/g1;Ljava/lang/Throwable;)V
+    .locals 6
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_4
+
+    check-cast v1, Ll0/a/r1/m;
+
+    :goto_0
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_2
+
+    instance-of v2, v1, Ll0/a/z0;
+
+    if-eqz v2, :cond_1
+
+    move-object v2, v1
+
+    check-cast v2, Ll0/a/b1;
+
+    :try_start_0
+    invoke-virtual {v2, p2}, Ll0/a/s;->i(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v3
+
+    if-eqz v0, :cond_0
+
+    invoke-static {v0, v3}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :cond_0
+    new-instance v0, Lkotlinx/coroutines/CompletionHandlerException;
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v5, "Exception in completion handler "
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v2, " for "
+
+    invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v0, v2, v3}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    :cond_1
+    :goto_1
+    invoke-virtual {v1}, Ll0/a/r1/m;->e()Ll0/a/r1/m;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_2
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p0, v0}, Ll0/a/c1;->z(Ljava/lang/Throwable;)V
+
+    :cond_3
+    invoke-virtual {p0, p2}, Ll0/a/c1;->m(Ljava/lang/Throwable;)Z
+
+    return-void
+
+    :cond_4
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public H(Ljava/lang/Object;)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public I()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final J(Ll0/a/b1;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ll0/a/b1<",
+            "*>;)V"
+        }
+    .end annotation
+
+    new-instance v0, Ll0/a/g1;
+
+    invoke-direct {v0}, Ll0/a/g1;-><init>()V
+
+    const-string v1, "node"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Ll0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    sget-object v1, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    :cond_0
+    invoke-virtual {p1}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eq v1, p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v1, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p1, p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0, p1}, Ll0/a/r1/m;->c(Ll0/a/r1/m;)V
+
+    :goto_0
+    invoke-virtual {p1}, Ll0/a/r1/m;->e()Ll0/a/r1/m;
+
+    move-result-object v0
+
+    sget-object v1, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p0, p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public final K(Ljava/lang/Object;)Ljava/lang/String;
+    .locals 2
+
+    instance-of v0, p1, Ll0/a/c1$b;
+
+    const-string v1, "Active"
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Ll0/a/c1$b;
+
+    invoke-virtual {p1}, Ll0/a/c1$b;->d()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "Cancelling"
+
+    goto :goto_0
+
+    :cond_0
+    iget-boolean p1, p1, Ll0/a/c1$b;->isCompleting:Z
+
+    if-eqz p1, :cond_5
+
+    const-string v1, "Completing"
+
+    goto :goto_0
+
+    :cond_1
+    instance-of v0, p1, Ll0/a/u0;
+
+    if-eqz v0, :cond_3
+
+    check-cast p1, Ll0/a/u0;
+
+    invoke-interface {p1}, Ll0/a/u0;->a()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const-string v1, "New"
+
+    goto :goto_0
+
+    :cond_3
+    instance-of p1, p1, Ll0/a/p;
+
+    if-eqz p1, :cond_4
+
+    const-string v1, "Cancelled"
+
+    goto :goto_0
+
+    :cond_4
+    const-string v1, "Completed"
+
+    :cond_5
+    :goto_0
+    return-object v1
+.end method
+
+.method public final L(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
+    .locals 2
+
+    const-string v0, "$this$toCancellationException"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, p1
+
+    :goto_0
+    check-cast v0, Ljava/util/concurrent/CancellationException;
+
+    if-eqz v0, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    new-instance v0, Lkotlinx/coroutines/JobCancellationException;
+
+    if-eqz p2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {p1}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " was cancelled"
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    :goto_1
+    invoke-direct {v0, p2, p1, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
+
+    :goto_2
+    return-object v0
+.end method
+
+.method public final M(Ll0/a/c1$b;Ljava/lang/Object;I)Z
+    .locals 9
+
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-ne v0, p1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_15
+
+    invoke-virtual {p1}, Ll0/a/c1$b;->e()Z
+
+    move-result v0
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_14
+
+    iget-boolean v0, p1, Ll0/a/c1$b;->isCompleting:Z
+
+    if-eqz v0, :cond_13
+
+    instance-of v0, p2, Ll0/a/p;
+
+    const/4 v3, 0x0
+
+    if-nez v0, :cond_1
+
+    move-object v0, v3
+
+    goto :goto_1
+
+    :cond_1
+    move-object v0, p2
+
+    :goto_1
+    check-cast v0, Ll0/a/p;
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, v0, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    goto :goto_2
+
+    :cond_2
+    move-object v0, v3
+
+    :goto_2
+    monitor-enter p1
+
+    :try_start_0
+    invoke-virtual {p1, v0}, Ll0/a/c1$b;->f(Ljava/lang/Throwable;)Ljava/util/List;
+
+    move-result-object v4
+
+    invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_3
+
+    invoke-virtual {p1}, Ll0/a/c1$b;->d()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_7
+
+    new-instance v5, Lkotlinx/coroutines/JobCancellationException;
+
+    const-string v6, "Job was cancelled"
+
+    invoke-direct {v5, v6, v3, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
+
+    move-object v3, v5
+
+    goto :goto_3
+
+    :cond_3
+    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v5
+
+    :cond_4
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_5
+
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    move-object v7, v6
+
+    check-cast v7, Ljava/lang/Throwable;
+
+    instance-of v7, v7, Ljava/util/concurrent/CancellationException;
+
+    xor-int/2addr v7, v1
+
+    if-eqz v7, :cond_4
+
+    move-object v3, v6
+
+    :cond_5
+    check-cast v3, Ljava/lang/Throwable;
+
+    if-eqz v3, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    invoke-interface {v4, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Throwable;
+
+    :cond_7
+    :goto_3
+    if-eqz v3, :cond_a
+
+    invoke-interface {v4}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    if-gt v5, v1, :cond_8
+
+    goto :goto_5
+
+    :cond_8
+    invoke-interface {v4}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    invoke-static {v5}, Ll0/a/r1/d;->a(I)Ljava/util/Set;
+
+    move-result-object v5
+
+    invoke-static {v3}, Ll0/a/r1/u;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v6
+
+    invoke-interface {v4}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v4
+
+    :cond_9
+    :goto_4
+    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v7
+
+    if-eqz v7, :cond_a
+
+    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Ljava/lang/Throwable;
+
+    invoke-static {v7}, Ll0/a/r1/u;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v7
+
+    if-eq v7, v3, :cond_9
+
+    if-eq v7, v6, :cond_9
+
+    instance-of v8, v7, Ljava/util/concurrent/CancellationException;
+
+    if-nez v8, :cond_9
+
+    invoke-interface {v5, v7}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_9
+
+    invoke-static {v3, v7}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_4
+
+    :cond_a
+    :goto_5
+    monitor-exit p1
+
+    if-nez v3, :cond_b
+
+    goto :goto_6
+
+    :cond_b
+    if-ne v3, v0, :cond_c
+
+    goto :goto_6
+
+    :cond_c
+    new-instance p2, Ll0/a/p;
+
+    const/4 v0, 0x2
+
+    invoke-direct {p2, v3, v2, v0}, Ll0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
+
+    :goto_6
+    if-eqz v3, :cond_10
+
+    invoke-virtual {p0, v3}, Ll0/a/c1;->m(Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_e
+
+    invoke-virtual {p0, v3}, Ll0/a/c1;->y(Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_d
+
+    goto :goto_7
+
+    :cond_d
+    const/4 v0, 0x0
+
+    goto :goto_8
+
+    :cond_e
+    :goto_7
+    const/4 v0, 0x1
+
+    :goto_8
+    if-eqz v0, :cond_10
+
+    if-eqz p2, :cond_f
+
+    move-object v0, p2
+
+    check-cast v0, Ll0/a/p;
+
+    sget-object v3, Ll0/a/p;->b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {v3, v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    goto :goto_9
+
+    :cond_f
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.CompletedExceptionally"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_10
+    :goto_9
+    invoke-virtual {p0, p2}, Ll0/a/c1;->H(Ljava/lang/Object;)V
+
+    sget-object v0, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    instance-of v2, p2, Ll0/a/u0;
+
+    if-eqz v2, :cond_11
+
+    new-instance v2, Ll0/a/v0;
+
+    move-object v3, p2
+
+    check-cast v3, Ll0/a/u0;
+
+    invoke-direct {v2, v3}, Ll0/a/v0;-><init>(Ll0/a/u0;)V
+
+    goto :goto_a
+
+    :cond_11
+    move-object v2, p2
+
+    :goto_a
+    invoke-virtual {v0, p0, p1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_12
+
+    invoke-virtual {p0, p1, p2, p3}, Ll0/a/c1;->q(Ll0/a/u0;Ljava/lang/Object;I)V
+
+    return v1
+
+    :cond_12
+    const-string p3, "Unexpected state: "
+
+    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p3
+
+    iget-object v0, p0, Ll0/a/c1;->_state:Ljava/lang/Object;
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v0, ", expected: "
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ", update: "
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :catchall_0
+    move-exception p2
+
+    monitor-exit p1
+
+    throw p2
+
+    :cond_13
+    const-string p1, "Failed requirement."
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_14
+    const-string p1, "Failed requirement."
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_15
+    const-string p1, "Failed requirement."
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final N(Ljava/lang/Object;Ljava/lang/Object;I)I
+    .locals 7
+
+    instance-of v0, p1, Ll0/a/u0;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    instance-of v0, p1, Ll0/a/m0;
+
+    const/4 v2, 0x3
+
+    const/4 v3, 0x1
+
+    if-nez v0, :cond_1
+
+    instance-of v0, p1, Ll0/a/b1;
+
+    if-eqz v0, :cond_a
+
+    :cond_1
+    instance-of v0, p1, Ll0/a/k;
+
+    if-nez v0, :cond_a
+
+    instance-of v0, p2, Ll0/a/p;
+
+    if-nez v0, :cond_a
+
+    check-cast p1, Ll0/a/u0;
+
+    sget-boolean v4, Ll0/a/b0;->a:Z
+
+    if-eqz v4, :cond_5
+
+    instance-of v4, p1, Ll0/a/m0;
+
+    if-nez v4, :cond_3
+
+    instance-of v4, p1, Ll0/a/b1;
+
+    if-eqz v4, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v4, 0x0
+
+    goto :goto_1
+
+    :cond_3
+    :goto_0
+    const/4 v4, 0x1
+
+    :goto_1
+    if-eqz v4, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_5
+    :goto_2
+    sget-boolean v4, Ll0/a/b0;->a:Z
+
+    if-eqz v4, :cond_7
+
+    xor-int/2addr v0, v3
+
+    if-eqz v0, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_7
+    :goto_3
+    sget-object v0, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-static {p2}, Ll0/a/d1;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-virtual {v0, p0, p1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    invoke-virtual {p0, p2}, Ll0/a/c1;->H(Ljava/lang/Object;)V
+
+    invoke-virtual {p0, p1, p2, p3}, Ll0/a/c1;->q(Ll0/a/u0;Ljava/lang/Object;I)V
+
+    const/4 v1, 0x1
+
+    :goto_4
+    if-nez v1, :cond_9
+
+    return v2
+
+    :cond_9
+    return v3
+
+    :cond_a
+    check-cast p1, Ll0/a/u0;
+
+    invoke-virtual {p0, p1}, Ll0/a/c1;->w(Ll0/a/u0;)Ll0/a/g1;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_18
+
+    instance-of v4, p1, Ll0/a/c1$b;
+
+    const/4 v5, 0x0
+
+    if-nez v4, :cond_b
+
+    move-object v4, v5
+
+    goto :goto_5
+
+    :cond_b
+    move-object v4, p1
+
+    :goto_5
+    check-cast v4, Ll0/a/c1$b;
+
+    if-eqz v4, :cond_c
+
+    goto :goto_6
+
+    :cond_c
+    new-instance v4, Ll0/a/c1$b;
+
+    invoke-direct {v4, v0, v1, v5}, Ll0/a/c1$b;-><init>(Ll0/a/g1;ZLjava/lang/Throwable;)V
+
+    :goto_6
+    monitor-enter v4
+
+    :try_start_0
+    iget-boolean v6, v4, Ll0/a/c1$b;->isCompleting:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v6, :cond_d
+
+    monitor-exit v4
+
+    goto/16 :goto_c
+
+    :cond_d
+    :try_start_1
+    iput-boolean v3, v4, Ll0/a/c1$b;->isCompleting:Z
+
+    if-eq v4, p1, :cond_e
+
+    sget-object v1, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p0, p1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-nez v1, :cond_e
+
+    monitor-exit v4
+
+    goto/16 :goto_b
+
+    :cond_e
+    :try_start_2
+    invoke-virtual {v4}, Ll0/a/c1$b;->e()Z
+
+    move-result v1
+
+    xor-int/2addr v1, v3
+
+    if-eqz v1, :cond_17
+
+    invoke-virtual {v4}, Ll0/a/c1$b;->d()Z
+
+    move-result v1
+
+    instance-of v2, p2, Ll0/a/p;
+
+    if-nez v2, :cond_f
+
+    move-object v2, v5
+
+    goto :goto_7
+
+    :cond_f
+    move-object v2, p2
+
+    :goto_7
+    check-cast v2, Ll0/a/p;
+
+    if-eqz v2, :cond_10
+
+    iget-object v2, v2, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    invoke-virtual {v4, v2}, Ll0/a/c1$b;->b(Ljava/lang/Throwable;)V
+
+    :cond_10
+    iget-object v2, v4, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    xor-int/2addr v1, v3
+
+    if-eqz v1, :cond_11
+
+    goto :goto_8
+
+    :cond_11
+    move-object v2, v5
+
+    :goto_8
+    monitor-exit v4
+
+    if-eqz v2, :cond_12
+
+    invoke-virtual {p0, v0, v2}, Ll0/a/c1;->G(Ll0/a/g1;Ljava/lang/Throwable;)V
+
+    :cond_12
+    instance-of v0, p1, Ll0/a/k;
+
+    if-nez v0, :cond_13
+
+    move-object v0, v5
+
+    goto :goto_9
+
+    :cond_13
+    move-object v0, p1
+
+    :goto_9
+    check-cast v0, Ll0/a/k;
+
+    if-eqz v0, :cond_14
+
+    move-object v5, v0
+
+    goto :goto_a
+
+    :cond_14
+    invoke-interface {p1}, Ll0/a/u0;->getList()Ll0/a/g1;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_15
+
+    invoke-virtual {p0, p1}, Ll0/a/c1;->F(Ll0/a/r1/m;)Ll0/a/k;
+
+    move-result-object v5
+
+    :cond_15
+    :goto_a
+    if-eqz v5, :cond_16
+
+    invoke-virtual {p0, v4, v5, p2}, Ll0/a/c1;->O(Ll0/a/c1$b;Ll0/a/k;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_16
+
+    const/4 v1, 0x2
+
+    goto :goto_c
+
+    :cond_16
+    invoke-virtual {p0, v4, p2, p3}, Ll0/a/c1;->M(Ll0/a/c1$b;Ljava/lang/Object;I)Z
+
+    const/4 v1, 0x1
+
+    goto :goto_c
+
+    :cond_17
+    :try_start_3
+    const-string p1, "Failed requirement."
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v4
+
+    throw p1
+
+    :cond_18
+    :goto_b
+    const/4 v1, 0x3
+
+    :goto_c
+    return v1
+.end method
+
+.method public final O(Ll0/a/c1$b;Ll0/a/k;Ljava/lang/Object;)Z
+    .locals 6
+
+    :goto_0
+    iget-object v0, p2, Ll0/a/k;->h:Ll0/a/l;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    new-instance v3, Ll0/a/c1$a;
+
+    invoke-direct {v3, p0, p1, p2, p3}, Ll0/a/c1$a;-><init>(Ll0/a/c1;Ll0/a/c1$b;Ll0/a/k;Ljava/lang/Object;)V
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lf/n/a/k/a;->E(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ll0/a/k0;
+
+    move-result-object v0
+
+    sget-object v1, Ll0/a/h1;->d:Ll0/a/h1;
+
+    if-eq v0, v1, :cond_0
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    invoke-virtual {p0, p2}, Ll0/a/c1;->F(Ll0/a/r1/m;)Ll0/a/k;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public a()Z
+    .locals 2
+
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Ll0/a/u0;
+
+    if-eqz v1, :cond_0
+
+    check-cast v0, Ll0/a/u0;
+
+    invoke-interface {v0}, Ll0/a/u0;->a()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public final d(ZZLkotlin/jvm/functions/Function1;)Ll0/a/k0;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Ll0/a/k0;"
+        }
+    .end annotation
+
+    const-string v0, "handler"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    move-object v1, v0
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v2
+
+    instance-of v3, v2, Ll0/a/m0;
+
+    if-eqz v3, :cond_4
+
+    move-object v3, v2
+
+    check-cast v3, Ll0/a/m0;
+
+    iget-boolean v4, v3, Ll0/a/m0;->d:Z
+
+    if-eqz v4, :cond_2
+
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p0, p3, p1}, Ll0/a/c1;->D(Lkotlin/jvm/functions/Function1;Z)Ll0/a/b1;
+
+    move-result-object v1
+
+    :goto_1
+    sget-object v3, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    return-object v1
+
+    :cond_2
+    new-instance v2, Ll0/a/g1;
+
+    invoke-direct {v2}, Ll0/a/g1;-><init>()V
+
+    iget-boolean v4, v3, Ll0/a/m0;->d:Z
+
+    if-eqz v4, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    new-instance v4, Ll0/a/t0;
+
+    invoke-direct {v4, v2}, Ll0/a/t0;-><init>(Ll0/a/g1;)V
+
+    move-object v2, v4
+
+    :goto_2
+    sget-object v4, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v4, p0, v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_4
+    instance-of v3, v2, Ll0/a/u0;
+
+    if-eqz v3, :cond_10
+
+    move-object v3, v2
+
+    check-cast v3, Ll0/a/u0;
+
+    invoke-interface {v3}, Ll0/a/u0;->getList()Ll0/a/g1;
+
+    move-result-object v3
+
+    if-nez v3, :cond_6
+
+    if-eqz v2, :cond_5
+
+    check-cast v2, Ll0/a/b1;
+
+    invoke-virtual {p0, v2}, Ll0/a/c1;->J(Ll0/a/b1;)V
+
+    goto :goto_0
+
+    :cond_5
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.JobNode<*>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    sget-object v4, Ll0/a/h1;->d:Ll0/a/h1;
+
+    if-eqz p1, :cond_c
+
+    instance-of v5, v2, Ll0/a/c1$b;
+
+    if-eqz v5, :cond_c
+
+    monitor-enter v2
+
+    :try_start_0
+    move-object v5, v2
+
+    check-cast v5, Ll0/a/c1$b;
+
+    iget-object v5, v5, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+
+    if-eqz v5, :cond_7
+
+    instance-of v6, p3, Ll0/a/k;
+
+    if-eqz v6, :cond_b
+
+    move-object v6, v2
+
+    check-cast v6, Ll0/a/c1$b;
+
+    iget-boolean v6, v6, Ll0/a/c1$b;->isCompleting:Z
+
+    if-nez v6, :cond_b
+
+    :cond_7
+    if-eqz v1, :cond_8
+
+    goto :goto_3
+
+    :cond_8
+    invoke-virtual {p0, p3, p1}, Ll0/a/c1;->D(Lkotlin/jvm/functions/Function1;Z)Ll0/a/b1;
+
+    move-result-object v1
+
+    :goto_3
+    invoke-virtual {p0, v2, v3, v1}, Ll0/a/c1;->h(Ljava/lang/Object;Ll0/a/g1;Ll0/a/b1;)Z
+
+    move-result v4
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v4, :cond_9
+
+    monitor-exit v2
+
+    goto :goto_0
+
+    :cond_9
+    if-nez v5, :cond_a
+
+    monitor-exit v2
+
+    return-object v1
+
+    :cond_a
+    move-object v4, v1
+
+    :cond_b
+    monitor-exit v2
+
+    goto :goto_4
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v2
+
+    throw p1
+
+    :cond_c
+    move-object v5, v0
+
+    :goto_4
+    if-eqz v5, :cond_e
+
+    if-eqz p2, :cond_d
+
+    invoke-interface {p3, v5}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_d
+    return-object v4
+
+    :cond_e
+    if-eqz v1, :cond_f
+
+    goto :goto_5
+
+    :cond_f
+    invoke-virtual {p0, p3, p1}, Ll0/a/c1;->D(Lkotlin/jvm/functions/Function1;Z)Ll0/a/b1;
+
+    move-result-object v1
+
+    :goto_5
+    invoke-virtual {p0, v2, v3, v1}, Ll0/a/c1;->h(Ljava/lang/Object;Ll0/a/g1;Ll0/a/b1;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    return-object v1
+
+    :cond_10
+    if-eqz p2, :cond_13
+
+    instance-of p1, v2, Ll0/a/p;
+
+    if-nez p1, :cond_11
+
+    move-object v2, v0
+
+    :cond_11
+    check-cast v2, Ll0/a/p;
+
+    if-eqz v2, :cond_12
+
+    iget-object v0, v2, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    :cond_12
+    invoke-interface {p3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_13
+    sget-object p1, Ll0/a/h1;->d:Ll0/a/h1;
+
+    return-object p1
+.end method
+
+.method public final e()Ljava/util/concurrent/CancellationException;
+    .locals 4
+
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Ll0/a/c1$b;
+
+    const-string v2, "Job is still new or active: "
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Ll0/a/c1$b;
+
+    iget-object v0, v0, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_0
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " is cancelling"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p0, v0, v1}, Ll0/a/c1;->L(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1
+    instance-of v1, v0, Ll0/a/u0;
+
+    if-nez v1, :cond_3
+
+    instance-of v1, v0, Ll0/a/p;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast v0, Ll0/a/p;
+
+    iget-object v0, v0, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    invoke-virtual {p0, v0, v2}, Ll0/a/c1;->L(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Lkotlinx/coroutines/JobCancellationException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, " has completed normally"
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1, v2, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
+
+    :goto_0
+    return-object v0
+
+    :cond_3
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public final f(Ll0/a/j1;)V
+    .locals 1
+
+    const-string v0, "parentJob"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Ll0/a/c1;->l(Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(TR;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TR;-",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "+TR;>;)TR;"
+        }
+    .end annotation
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2}, Lkotlin/coroutines/CoroutineContext$a$a;->fold(Lkotlin/coroutines/CoroutineContext$a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            ">(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->get(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final getKey()Lkotlin/coroutines/CoroutineContext$b;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;"
+        }
+    .end annotation
+
+    sget-object v0, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    return-object v0
+.end method
+
+.method public final h(Ljava/lang/Object;Ll0/a/g1;Ll0/a/b1;)Z
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            "Ll0/a/g1;",
+            "Ll0/a/b1<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance v0, Ll0/a/c1$c;
+
+    invoke-direct {v0, p3, p3, p0, p1}, Ll0/a/c1$c;-><init>(Ll0/a/r1/m;Ll0/a/r1/m;Ll0/a/c1;Ljava/lang/Object;)V
+
+    :goto_0
+    invoke-virtual {p2}, Ll0/a/r1/m;->f()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    check-cast p1, Ll0/a/r1/m;
+
+    const-string v1, "node"
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "next"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "condAdd"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Ll0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p3, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    sget-object v1, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p3, p2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    iput-object p2, v0, Ll0/a/r1/m$a;->b:Ll0/a/r1/m;
+
+    sget-object v1, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p1, p2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    const/4 v4, 0x1
+
+    if-nez v1, :cond_0
+
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {v0, p1}, Ll0/a/r1/c;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-nez p1, :cond_1
+
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x2
+
+    :goto_1
+    if-eq p1, v4, :cond_2
+
+    if-eq p1, v3, :cond_3
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v2, 0x1
+
+    :cond_3
+    return v2
+
+    :cond_4
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final i(Lkotlin/jvm/functions/Function1;)Ll0/a/k0;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Ll0/a/k0;"
+        }
+    .end annotation
+
+    const-string v0, "handler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v0, v1, p1}, Ll0/a/c1;->d(ZZLkotlin/jvm/functions/Function1;)Ll0/a/k0;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public j(Ljava/lang/Object;I)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final l(Ljava/lang/Object;)Z
+    .locals 10
+
+    invoke-virtual {p0}, Ll0/a/c1;->v()Z
+
+    move-result v0
+
+    const/4 v1, 0x3
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-eqz v0, :cond_4
+
+    :goto_0
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v5, v0, Ll0/a/u0;
+
+    if-eqz v5, :cond_3
+
+    instance-of v5, v0, Ll0/a/c1$b;
+
+    if-eqz v5, :cond_0
+
+    move-object v5, v0
+
+    check-cast v5, Ll0/a/c1$b;
+
+    iget-boolean v5, v5, Ll0/a/c1$b;->isCompleting:Z
+
+    if-eqz v5, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    new-instance v5, Ll0/a/p;
+
+    invoke-virtual {p0, p1}, Ll0/a/c1;->s(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v6
+
+    invoke-direct {v5, v6, v3, v2}, Ll0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
+
+    invoke-virtual {p0, v0, v5, v3}, Ll0/a/c1;->N(Ljava/lang/Object;Ljava/lang/Object;I)I
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    if-eq v0, v4, :cond_2
+
+    if-eq v0, v2, :cond_2
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "unexpected result"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    const/4 v0, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    const/4 v0, 0x0
+
+    :goto_2
+    if-eqz v0, :cond_4
+
+    return v4
+
+    :cond_4
+    const/4 v0, 0x0
+
+    move-object v5, v0
+
+    :cond_5
+    :goto_3
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v6
+
+    instance-of v7, v6, Ll0/a/c1$b;
+
+    if-eqz v7, :cond_b
+
+    monitor-enter v6
+
+    :try_start_0
+    move-object v1, v6
+
+    check-cast v1, Ll0/a/c1$b;
+
+    invoke-virtual {v1}, Ll0/a/c1$b;->e()Z
+
+    move-result v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v1, :cond_6
+
+    monitor-exit v6
+
+    goto/16 :goto_b
+
+    :cond_6
+    :try_start_1
+    move-object v1, v6
+
+    check-cast v1, Ll0/a/c1$b;
+
+    invoke-virtual {v1}, Ll0/a/c1$b;->d()Z
+
+    move-result v1
+
+    if-nez p1, :cond_7
+
+    if-nez v1, :cond_9
+
+    :cond_7
+    if-eqz v5, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    invoke-virtual {p0, p1}, Ll0/a/c1;->s(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v5
+
+    :goto_4
+    move-object p1, v6
+
+    check-cast p1, Ll0/a/c1$b;
+
+    invoke-virtual {p1, v5}, Ll0/a/c1$b;->b(Ljava/lang/Throwable;)V
+
+    :cond_9
+    move-object p1, v6
+
+    check-cast p1, Ll0/a/c1$b;
+
+    iget-object p1, p1, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    xor-int/2addr v1, v4
+
+    if-eqz v1, :cond_a
+
+    move-object v0, p1
+
+    :cond_a
+    monitor-exit v6
+
+    if-eqz v0, :cond_15
+
+    check-cast v6, Ll0/a/c1$b;
+
+    iget-object p1, v6, Ll0/a/c1$b;->d:Ll0/a/g1;
+
+    invoke-virtual {p0, p1, v0}, Ll0/a/c1;->G(Ll0/a/g1;Ljava/lang/Throwable;)V
+
+    goto/16 :goto_a
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v6
+
+    throw p1
+
+    :cond_b
+    instance-of v7, v6, Ll0/a/u0;
+
+    if-eqz v7, :cond_17
+
+    if-eqz v5, :cond_c
+
+    goto :goto_5
+
+    :cond_c
+    invoke-virtual {p0, p1}, Ll0/a/c1;->s(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v5
+
+    :goto_5
+    move-object v7, v6
+
+    check-cast v7, Ll0/a/u0;
+
+    invoke-interface {v7}, Ll0/a/u0;->a()Z
+
+    move-result v8
+
+    if-eqz v8, :cond_13
+
+    sget-boolean v6, Ll0/a/b0;->a:Z
+
+    if-eqz v6, :cond_e
+
+    instance-of v6, v7, Ll0/a/c1$b;
+
+    xor-int/2addr v6, v4
+
+    if-eqz v6, :cond_d
+
+    goto :goto_6
+
+    :cond_d
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_e
+    :goto_6
+    sget-boolean v6, Ll0/a/b0;->a:Z
+
+    if-eqz v6, :cond_10
+
+    invoke-interface {v7}, Ll0/a/u0;->a()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_f
+
+    goto :goto_7
+
+    :cond_f
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_10
+    :goto_7
+    invoke-virtual {p0, v7}, Ll0/a/c1;->w(Ll0/a/u0;)Ll0/a/g1;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_12
+
+    new-instance v8, Ll0/a/c1$b;
+
+    invoke-direct {v8, v6, v3, v5}, Ll0/a/c1$b;-><init>(Ll0/a/g1;ZLjava/lang/Throwable;)V
+
+    sget-object v9, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v9, p0, v7, v8}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-nez v7, :cond_11
+
+    goto :goto_8
+
+    :cond_11
+    invoke-virtual {p0, v6, v5}, Ll0/a/c1;->G(Ll0/a/g1;Ljava/lang/Throwable;)V
+
+    const/4 v6, 0x1
+
+    goto :goto_9
+
+    :cond_12
+    :goto_8
+    const/4 v6, 0x0
+
+    :goto_9
+    if-eqz v6, :cond_5
+
+    goto :goto_a
+
+    :cond_13
+    new-instance v7, Ll0/a/p;
+
+    invoke-direct {v7, v5, v3, v2}, Ll0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
+
+    invoke-virtual {p0, v6, v7, v3}, Ll0/a/c1;->N(Ljava/lang/Object;Ljava/lang/Object;I)I
+
+    move-result v7
+
+    if-eqz v7, :cond_16
+
+    if-eq v7, v4, :cond_15
+
+    if-eq v7, v2, :cond_15
+
+    if-ne v7, v1, :cond_14
+
+    goto/16 :goto_3
+
+    :cond_14
+    const-string p1, "unexpected result"
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_15
+    :goto_a
+    const/4 v3, 0x1
+
+    goto :goto_b
+
+    :cond_16
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "Cannot happen in "
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_17
+    :goto_b
+    return v3
+.end method
+
+.method public final m(Ljava/lang/Throwable;)Z
+    .locals 4
+
+    invoke-virtual {p0}, Ll0/a/c1;->B()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
+
+    iget-object v2, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    if-eqz v2, :cond_4
+
+    sget-object v3, Ll0/a/h1;->d:Ll0/a/h1;
+
+    if-ne v2, v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-interface {v2, p1}, Ll0/a/j;->h(Ljava/lang/Throwable;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_3
+
+    if-eqz v0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :cond_3
+    :goto_0
+    return v1
+
+    :cond_4
+    :goto_1
+    return v0
+.end method
+
+.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;)",
+            "Lkotlin/coroutines/CoroutineContext;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->minusKey(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public n()Ljava/util/concurrent/CancellationException;
+    .locals 4
+
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Ll0/a/c1$b;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_0
+
+    move-object v1, v0
+
+    check-cast v1, Ll0/a/c1$b;
+
+    iget-object v1, v1, Ll0/a/c1$b;->rootCause:Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v1, v0, Ll0/a/p;
+
+    if-eqz v1, :cond_1
+
+    move-object v1, v0
+
+    check-cast v1, Ll0/a/p;
+
+    iget-object v1, v1, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_1
+    instance-of v1, v0, Ll0/a/u0;
+
+    if-nez v1, :cond_4
+
+    move-object v1, v2
+
+    :goto_0
+    instance-of v3, v1, Ljava/util/concurrent/CancellationException;
+
+    if-nez v3, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    move-object v2, v1
+
+    :goto_1
+    check-cast v2, Ljava/util/concurrent/CancellationException;
+
+    if-eqz v2, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    new-instance v2, Lkotlinx/coroutines/JobCancellationException;
+
+    const-string v3, "Parent job is "
+
+    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    invoke-virtual {p0, v0}, Ll0/a/c1;->K(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v2, v0, v1, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
+
+    :goto_2
+    return-object v2
+
+    :cond_4
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Cannot be cancelling child in this state: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public o(Ljava/lang/Throwable;)Z
+    .locals 2
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Ljava/util/concurrent/CancellationException;
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    invoke-virtual {p0, p1}, Ll0/a/c1;->l(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p0}, Ll0/a/c1;->u()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
+
+.method public p(Ljava/util/concurrent/CancellationException;)V
+    .locals 0
+
+    invoke-virtual {p0, p1}, Ll0/a/c1;->l(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p0}, Ll0/a/c1;->u()Z
+
+    move-result p1
+
+    :cond_0
+    return-void
+.end method
+
+.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->plus(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final q(Ll0/a/u0;Ljava/lang/Object;I)V
+    .locals 8
+
+    iget-object v0, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Ll0/a/k0;->dispose()V
+
+    sget-object v0, Ll0/a/h1;->d:Ll0/a/h1;
+
+    iput-object v0, p0, Ll0/a/c1;->parentHandle:Ll0/a/j;
+
+    :cond_0
+    instance-of v0, p2, Ll0/a/p;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_1
+
+    move-object v0, v1
+
+    goto :goto_0
+
+    :cond_1
+    move-object v0, p2
+
+    :goto_0
+    check-cast v0, Ll0/a/p;
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, v0, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    goto :goto_1
+
+    :cond_2
+    move-object v0, v1
+
+    :goto_1
+    instance-of v2, p1, Ll0/a/b1;
+
+    const-string v3, " for "
+
+    const-string v4, "Exception in completion handler "
+
+    if-eqz v2, :cond_3
+
+    :try_start_0
+    move-object v1, p1
+
+    check-cast v1, Ll0/a/b1;
+
+    invoke-virtual {v1, v0}, Ll0/a/s;->i(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto/16 :goto_4
+
+    :catchall_0
+    move-exception v0
+
+    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v1, p1, v0}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v1}, Ll0/a/c1;->z(Ljava/lang/Throwable;)V
+
+    goto :goto_4
+
+    :cond_3
+    invoke-interface {p1}, Ll0/a/u0;->getList()Ll0/a/g1;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_8
+
+    invoke-virtual {p1}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_7
+
+    check-cast v2, Ll0/a/r1/m;
+
+    :goto_2
+    invoke-static {v2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    xor-int/lit8 v5, v5, 0x1
+
+    if-eqz v5, :cond_6
+
+    instance-of v5, v2, Ll0/a/b1;
+
+    if-eqz v5, :cond_5
+
+    move-object v5, v2
+
+    check-cast v5, Ll0/a/b1;
+
+    :try_start_1
+    invoke-virtual {v5, v0}, Ll0/a/s;->i(Ljava/lang/Throwable;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    goto :goto_3
+
+    :catchall_1
+    move-exception v6
+
+    if-eqz v1, :cond_4
+
+    invoke-static {v1, v6}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    goto :goto_3
+
+    :cond_4
+    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
+
+    new-instance v7, Ljava/lang/StringBuilder;
+
+    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-direct {v1, v5, v6}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    :cond_5
+    :goto_3
+    invoke-virtual {v2}, Ll0/a/r1/m;->e()Ll0/a/r1/m;
+
+    move-result-object v2
+
+    goto :goto_2
+
+    :cond_6
+    if-eqz v1, :cond_8
+
+    invoke-virtual {p0, v1}, Ll0/a/c1;->z(Ljava/lang/Throwable;)V
+
+    goto :goto_4
+
+    :cond_7
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_8
+    :goto_4
+    invoke-virtual {p0, p2, p3}, Ll0/a/c1;->j(Ljava/lang/Object;I)V
+
+    return-void
+.end method
+
+.method public final s(Ljava/lang/Object;)Ljava/lang/Throwable;
+    .locals 2
+
+    if-eqz p1, :cond_0
+
+    instance-of v0, p1, Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Lkotlinx/coroutines/JobCancellationException;
+
+    const/4 v0, 0x0
+
+    const-string v1, "Job was cancelled"
+
+    invoke-direct {p1, v1, v0, p0}, Lkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
+
+    goto :goto_1
+
+    :cond_2
+    if-eqz p1, :cond_3
+
+    check-cast p1, Ll0/a/j1;
+
+    invoke-interface {p1}, Ll0/a/j1;->n()Ljava/util/concurrent/CancellationException;
+
+    move-result-object p1
+
+    :goto_1
+    return-object p1
+
+    :cond_3
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ParentJob"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final start()Z
+    .locals 6
+
+    :goto_0
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Ll0/a/m0;
+
+    const/4 v2, -0x1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-eqz v1, :cond_2
+
+    move-object v1, v0
+
+    check-cast v1, Ll0/a/m0;
+
+    iget-boolean v1, v1, Ll0/a/m0;->d:Z
+
+    if-eqz v1, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    sget-object v1, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    sget-object v5, Ll0/a/d1;->c:Ll0/a/m0;
+
+    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_3
+
+    :cond_1
+    invoke-virtual {p0}, Ll0/a/c1;->I()V
+
+    goto :goto_1
+
+    :cond_2
+    instance-of v1, v0, Ll0/a/t0;
+
+    if-eqz v1, :cond_4
+
+    sget-object v1, Ll0/a/c1;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-object v5, v0
+
+    check-cast v5, Ll0/a/t0;
+
+    iget-object v5, v5, Ll0/a/t0;->d:Ll0/a/g1;
+
+    invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    invoke-virtual {p0}, Ll0/a/c1;->I()V
+
+    :goto_1
+    const/4 v2, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    :goto_2
+    const/4 v2, 0x0
+
+    :goto_3
+    if-eqz v2, :cond_6
+
+    if-eq v2, v4, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    return v4
+
+    :cond_6
+    return v3
+.end method
+
+.method public final t(Ll0/a/l;)Ll0/a/j;
+    .locals 7
+
+    const-string v0, "child"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Ll0/a/k;
+
+    invoke-direct {v4, p0, p1}, Ll0/a/k;-><init>(Ll0/a/c1;Ll0/a/l;)V
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x0
+
+    move-object v1, p0
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->E(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ll0/a/k0;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Ll0/a/j;
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.ChildHandle"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0}, Ll0/a/c1;->E()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x7b
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-virtual {p0, v2}, Ll0/a/c1;->K(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x7d
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public u()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public v()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final w(Ll0/a/u0;)Ll0/a/g1;
+    .locals 2
+
+    invoke-interface {p1}, Ll0/a/u0;->getList()Ll0/a/g1;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v0, p1, Ll0/a/m0;
+
+    if-eqz v0, :cond_1
+
+    new-instance v0, Ll0/a/g1;
+
+    invoke-direct {v0}, Ll0/a/g1;-><init>()V
+
+    goto :goto_0
+
+    :cond_1
+    instance-of v0, p1, Ll0/a/b1;
+
+    if-eqz v0, :cond_2
+
+    check-cast p1, Ll0/a/b1;
+
+    invoke-virtual {p0, p1}, Ll0/a/c1;->J(Ll0/a/b1;)V
+
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+
+    :cond_2
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "State should have list: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final x()Ljava/lang/Object;
+    .locals 2
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/c1;->_state:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/r1/r;
+
+    if-nez v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    check-cast v0, Ll0/a/r1/r;
+
+    invoke-virtual {v0, p0}, Ll0/a/r1/r;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
+.end method
+
+.method public y(Ljava/lang/Throwable;)Z
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public z(Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/d.smali b/com.discord/smali_classes2/l0/a/d.smali
new file mode 100644
index 0000000000..4cb3b976ee
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/d.smali
@@ -0,0 +1,16 @@
+.class public abstract Ll0/a/d;
+.super Ll0/a/e;
+.source "CancellableContinuationImpl.kt"
+
+# interfaces
+.implements Ll0/a/i1;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/e;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/d0.smali b/com.discord/smali_classes2/l0/a/d0.smali
new file mode 100644
index 0000000000..8cdc5ec812
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/d0.smali
@@ -0,0 +1,19 @@
+.class public final Ll0/a/d0;
+.super Ljava/lang/Object;
+.source "DefaultExecutor.kt"
+
+
+# static fields
+.field public static final a:Ll0/a/e0;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Ll0/a/c0;->j:Ll0/a/c0;
+
+    sput-object v0, Ll0/a/d0;->a:Ll0/a/e0;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/d1.smali b/com.discord/smali_classes2/l0/a/d1.smali
new file mode 100644
index 0000000000..be555c0fe8
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/d1.smali
@@ -0,0 +1,91 @@
+.class public final Ll0/a/d1;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
+
+
+# static fields
+.field public static final a:Ll0/a/r1/v;
+
+.field public static final b:Ll0/a/m0;
+
+.field public static final c:Ll0/a/m0;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "SEALED"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/d1;->a:Ll0/a/r1/v;
+
+    new-instance v0, Ll0/a/m0;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Ll0/a/m0;-><init>(Z)V
+
+    sput-object v0, Ll0/a/d1;->b:Ll0/a/m0;
+
+    new-instance v0, Ll0/a/m0;
+
+    const/4 v1, 0x1
+
+    invoke-direct {v0, v1}, Ll0/a/m0;-><init>(Z)V
+
+    sput-object v0, Ll0/a/d1;->c:Ll0/a/m0;
+
+    return-void
+.end method
+
+.method public static final a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    instance-of v0, p0, Ll0/a/u0;
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ll0/a/v0;
+
+    check-cast p0, Ll0/a/u0;
+
+    invoke-direct {v0, p0}, Ll0/a/v0;-><init>(Ll0/a/u0;)V
+
+    move-object p0, v0
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static final b(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    instance-of v0, p0, Ll0/a/v0;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, p0
+
+    :goto_0
+    check-cast v0, Ll0/a/v0;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, v0, Ll0/a/v0;->a:Ll0/a/u0;
+
+    if-eqz v0, :cond_1
+
+    move-object p0, v0
+
+    :cond_1
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/e.smali b/com.discord/smali_classes2/l0/a/e.smali
new file mode 100644
index 0000000000..5f8882bb3f
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/e.smali
@@ -0,0 +1,33 @@
+.class public abstract Ll0/a/e;
+.super Ljava/lang/Object;
+.source "CompletionHandler.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Throwable;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(Ljava/lang/Throwable;)V
+.end method
diff --git a/com.discord/smali_classes2/l0/a/e0.smali b/com.discord/smali_classes2/l0/a/e0.smali
new file mode 100644
index 0000000000..97ecfd8af2
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/e0.smali
@@ -0,0 +1,17 @@
+.class public interface abstract Ll0/a/e0;
+.super Ljava/lang/Object;
+.source "Delay.kt"
+
+
+# virtual methods
+.method public abstract b(JLl0/a/f;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Ll0/a/f<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/l0/a/e1.smali b/com.discord/smali_classes2/l0/a/e1.smali
new file mode 100644
index 0000000000..47d9c4dc7e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/e1.smali
@@ -0,0 +1,91 @@
+.class public final Ll0/a/e1;
+.super Ll0/a/k1;
+.source "Builders.common.kt"
+
+
+# instance fields
+.field public g:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Lkotlinx/coroutines/CoroutineScope;",
+            "-",
+            "Lkotlin/coroutines/Continuation<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;+",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Lkotlinx/coroutines/CoroutineScope;",
+            "-",
+            "Lkotlin/coroutines/Continuation<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;+",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "parentContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, p1, v0}, Ll0/a/k1;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
+
+    iput-object p2, p0, Ll0/a/e1;->g:Lkotlin/jvm/functions/Function2;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public R()V
+    .locals 2
+
+    iget-object v0, p0, Ll0/a/e1;->g:Lkotlin/jvm/functions/Function2;
+
+    if-eqz v0, :cond_0
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Ll0/a/e1;->g:Lkotlin/jvm/functions/Function2;
+
+    invoke-static {v0, p0, p0}, Lf/n/a/k/a;->V(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Already started"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/f.smali b/com.discord/smali_classes2/l0/a/f.smali
new file mode 100644
index 0000000000..3e881e21ed
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/f.smali
@@ -0,0 +1,47 @@
+.class public interface abstract Ll0/a/f;
+.super Ljava/lang/Object;
+.source "CancellableContinuation.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/Continuation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/Continuation<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract b(Lkotlin/jvm/functions/Function1;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+.end method
+
+.method public abstract c(Ll0/a/v;Ljava/lang/Object;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ll0/a/v;",
+            "TT;)V"
+        }
+    .end annotation
+.end method
+
+.method public abstract g(Ljava/lang/Throwable;)Z
+.end method
diff --git a/com.discord/smali_classes2/l0/a/f0.smali b/com.discord/smali_classes2/l0/a/f0.smali
new file mode 100644
index 0000000000..6ba738236a
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/f0.smali
@@ -0,0 +1,342 @@
+.class public final Ll0/a/f0;
+.super Ll0/a/i0;
+.source "Dispatched.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+.implements Lkotlin/coroutines/Continuation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/i0<",
+        "TT;>;",
+        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;",
+        "Lkotlin/coroutines/Continuation<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public g:Ljava/lang/Object;
+
+.field public final h:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+.field public final i:Ljava/lang/Object;
+
+.field public final j:Ll0/a/v;
+
+.field public final k:Lkotlin/coroutines/Continuation;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/v;Lkotlin/coroutines/Continuation;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ll0/a/v;",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "continuation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Ll0/a/i0;-><init>(I)V
+
+    iput-object p1, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    iput-object p2, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    sget-object p1, Ll0/a/h0;->a:Ll0/a/r1/v;
+
+    iput-object p1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    instance-of p1, p2, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    if-nez p1, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    check-cast p2, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    iput-object p2, p0, Ll0/a/f0;->h:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ll0/a/r1/x;->b(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    iput-object p1, p0, Ll0/a/f0;->i:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public e()Lkotlin/coroutines/Continuation;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+
+    return-object p0
+.end method
+
+.method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/f0;->h:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    return-object v0
+.end method
+
+.method public getContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public getStackTraceElement()Ljava/lang/StackTraceElement;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public i()Ljava/lang/Object;
+    .locals 2
+
+    iget-object v0, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    sget-boolean v1, Ll0/a/b0;->a:Z
+
+    if-eqz v1, :cond_2
+
+    sget-object v1, Ll0/a/h0;->a:Ll0/a/r1/v;
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :cond_2
+    :goto_1
+    sget-object v1, Ll0/a/h0;->a:Ll0/a/r1/v;
+
+    iput-object v1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    return-object v0
+.end method
+
+.method public resumeWith(Ljava/lang/Object;)V
+    .locals 5
+
+    iget-object v0, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    invoke-static {p1}, Lf/n/a/k/a;->f0(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    iget-object v2, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    invoke-virtual {v2, v0}, Ll0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_0
+
+    iput-object v1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    iput v3, p0, Ll0/a/i0;->f:I
+
+    iget-object p1, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    invoke-virtual {p1, v0, p0}, Ll0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+
+    goto :goto_1
+
+    :cond_0
+    sget-object v0, Ll0/a/n1;->b:Ll0/a/n1;
+
+    invoke-static {}, Ll0/a/n1;->a()Ll0/a/n0;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ll0/a/n0;->A()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    iput-object v1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    iput v3, p0, Ll0/a/i0;->f:I
+
+    invoke-virtual {v0, p0}, Ll0/a/n0;->x(Ll0/a/i0;)V
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Ll0/a/n0;->z(Z)V
+
+    :try_start_0
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v2
+
+    iget-object v3, p0, Ll0/a/f0;->i:Ljava/lang/Object;
+
+    invoke-static {v2, v3}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v4, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {v4, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    invoke-static {v2, v3}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    :cond_2
+    invoke-virtual {v0}, Ll0/a/n0;->C()Z
+
+    move-result p1
+
+    if-nez p1, :cond_2
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {v2, v3}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    const/4 v2, 0x0
+
+    :try_start_3
+    invoke-virtual {p0, p1, v2}, Ll0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ll0/a/n0;->v(Z)V
+
+    :goto_1
+    return-void
+
+    :catchall_2
+    move-exception p1
+
+    invoke-virtual {v0, v1}, Ll0/a/n0;->v(Z)V
+
+    throw p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "DispatchedContinuation["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    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;
+
+    iget-object v1, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-static {v1}, Lf/n/a/k/a;->e0(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/f1.smali b/com.discord/smali_classes2/l0/a/f1.smali
new file mode 100644
index 0000000000..b9dcc2a004
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/f1.smali
@@ -0,0 +1,18 @@
+.class public abstract Ll0/a/f1;
+.super Ll0/a/v;
+.source "MainCoroutineDispatcher.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/v;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract v()Ll0/a/f1;
+.end method
diff --git a/com.discord/smali_classes2/l0/a/g.smali b/com.discord/smali_classes2/l0/a/g.smali
new file mode 100644
index 0000000000..d604949546
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/g.smali
@@ -0,0 +1,973 @@
+.class public Ll0/a/g;
+.super Ll0/a/i0;
+.source "CancellableContinuationImpl.kt"
+
+# interfaces
+.implements Ll0/a/f;
+.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/i0<",
+        "TT;>;",
+        "Ll0/a/f<",
+        "TT;>;",
+        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+.field public static final j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
+# instance fields
+.field public volatile _decision:I
+
+.field public volatile _state:Ljava/lang/Object;
+
+.field public final g:Lkotlin/coroutines/CoroutineContext;
+
+.field public final h:Lkotlin/coroutines/Continuation;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public volatile parentHandle:Ll0/a/k0;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ll0/a/g;
+
+    const-string v1, "_decision"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/g;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const-class v0, Ll0/a/g;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "_state"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/coroutines/Continuation;I)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;I)V"
+        }
+    .end annotation
+
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p2}, Ll0/a/i0;-><init>(I)V
+
+    iput-object p1, p0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    iput-object p1, p0, Ll0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Ll0/a/g;->_decision:I
+
+    sget-object p1, Ll0/a/b;->d:Ll0/a/b;
+
+    iput-object p1, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public b(Lkotlin/jvm/functions/Function1;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "handler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    move-object v1, v0
+
+    :cond_0
+    iget-object v2, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    instance-of v3, v2, Ll0/a/b;
+
+    if-eqz v3, :cond_3
+
+    if-eqz v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    instance-of v1, p1, Ll0/a/d;
+
+    if-eqz v1, :cond_2
+
+    move-object v1, p1
+
+    check-cast v1, Ll0/a/d;
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v1, Ll0/a/w0;
+
+    invoke-direct {v1, p1}, Ll0/a/w0;-><init>(Lkotlin/jvm/functions/Function1;)V
+
+    :goto_0
+    sget-object v3, Ll0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    return-void
+
+    :cond_3
+    instance-of v1, v2, Ll0/a/d;
+
+    if-nez v1, :cond_9
+
+    instance-of v1, v2, Ll0/a/h;
+
+    if-eqz v1, :cond_8
+
+    move-object v1, v2
+
+    check-cast v1, Ll0/a/h;
+
+    if-eqz v1, :cond_7
+
+    sget-object v3, Ll0/a/p;->b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    invoke-virtual {v3, v1, v4, v5}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_6
+
+    :try_start_0
+    instance-of v1, v2, Ll0/a/p;
+
+    if-nez v1, :cond_4
+
+    move-object v2, v0
+
+    :cond_4
+    check-cast v2, Ll0/a/p;
+
+    if-eqz v2, :cond_5
+
+    iget-object v0, v2, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    :cond_5
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v0, p0, Ll0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
+
+    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v3, "Exception in cancellation handler for "
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2, p1}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->C(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+
+    :goto_1
+    return-void
+
+    :cond_6
+    invoke-virtual {p0, p1, v2}, Ll0/a/g;->l(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_7
+    throw v0
+
+    :cond_8
+    return-void
+
+    :cond_9
+    invoke-virtual {p0, p1, v2}, Ll0/a/g;->l(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
+
+    throw v0
+.end method
+
+.method public c(Ll0/a/v;Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ll0/a/v;",
+            "TT;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$resumeUndispatched"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    instance-of v1, v0, Ll0/a/f0;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object v0, v2
+
+    :cond_0
+    check-cast v0, Ll0/a/f0;
+
+    if-eqz v0, :cond_1
+
+    iget-object v2, v0, Ll0/a/f0;->j:Ll0/a/v;
+
+    :cond_1
+    if-ne v2, p1, :cond_2
+
+    const/4 p1, 0x3
+
+    goto :goto_0
+
+    :cond_2
+    iget p1, p0, Ll0/a/i0;->f:I
+
+    :goto_0
+    invoke-virtual {p0, p2, p1}, Ll0/a/g;->m(Ljava/lang/Object;I)Ll0/a/h;
+
+    return-void
+.end method
+
+.method public d(Ljava/lang/Object;Ljava/lang/Throwable;)V
+    .locals 3
+
+    const-string v0, "cause"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Ll0/a/r;
+
+    if-eqz v0, :cond_0
+
+    :try_start_0
+    check-cast p1, Ll0/a/r;
+
+    iget-object p1, p1, Ll0/a/r;->b:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    iget-object p2, p0, Ll0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
+
+    new-instance v0, Lkotlinx/coroutines/CompletionHandlerException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Exception in cancellation handler for "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1, p1}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    invoke-static {p2, v0}, Lf/n/a/k/a;->C(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public final e()Lkotlin/coroutines/Continuation;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    return-object v0
+.end method
+
+.method public f(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Object;",
+            ")TT;"
+        }
+    .end annotation
+
+    instance-of v0, p1, Ll0/a/q;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ll0/a/q;
+
+    iget-object p1, p1, Ll0/a/q;->a:Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v0, p1, Ll0/a/r;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Ll0/a/r;
+
+    iget-object p1, p1, Ll0/a/r;->a:Ljava/lang/Object;
+
+    :cond_1
+    :goto_0
+    return-object p1
+.end method
+
+.method public g(Ljava/lang/Throwable;)Z
+    .locals 5
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/i1;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    return v2
+
+    :cond_0
+    new-instance v1, Ll0/a/h;
+
+    instance-of v3, v0, Ll0/a/d;
+
+    invoke-direct {v1, p0, p1, v3}, Ll0/a/h;-><init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
+
+    sget-object v4, Ll0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v4, p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    if-eqz v3, :cond_2
+
+    :try_start_0
+    check-cast v0, Ll0/a/d;
+
+    invoke-virtual {v0, p1}, Ll0/a/e;->a(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v0, p0, Ll0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
+
+    new-instance v1, Lkotlinx/coroutines/CompletionHandlerException;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "Exception in cancellation handler for "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-direct {v1, v3, p1}, Lkotlinx/coroutines/CompletionHandlerException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->C(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+
+    :cond_2
+    :goto_1
+    iget-object p1, p0, Ll0/a/g;->parentHandle:Ll0/a/k0;
+
+    if-eqz p1, :cond_3
+
+    invoke-interface {p1}, Ll0/a/k0;->dispose()V
+
+    sget-object p1, Ll0/a/h1;->d:Ll0/a/h1;
+
+    iput-object p1, p0, Ll0/a/g;->parentHandle:Ll0/a/k0;
+
+    :cond_3
+    invoke-virtual {p0, v2}, Ll0/a/g;->j(I)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    .locals 2
+
+    iget-object v0, p0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    instance-of v1, v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    check-cast v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    return-object v0
+.end method
+
+.method public getContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
+
+    return-object v0
+.end method
+
+.method public getStackTraceElement()Ljava/lang/StackTraceElement;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public i()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    return-object v0
+.end method
+
+.method public final j(I)V
+    .locals 4
+
+    :cond_0
+    iget v0, p0, Ll0/a/g;->_decision:I
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_2
+
+    if-ne v0, v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Already resumed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    sget-object v0, Ll0/a/g;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const/4 v3, 0x2
+
+    invoke-virtual {v0, p0, v1, v3}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v1, 0x1
+
+    :goto_0
+    if-eqz v1, :cond_3
+
+    return-void
+
+    :cond_3
+    invoke-static {p0, p1}, Ll0/a/h0;->a(Ll0/a/i0;I)V
+
+    return-void
+.end method
+
+.method public final k()Ljava/lang/Object;
+    .locals 8
+
+    iget-object v0, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    instance-of v0, v0, Ll0/a/i1;
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    sget-object v2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {v0, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v0
+
+    move-object v2, v0
+
+    check-cast v2, Lkotlinx/coroutines/Job;
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->start()Z
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    new-instance v5, Ll0/a/i;
+
+    invoke-direct {v5, v2, p0}, Ll0/a/i;-><init>(Lkotlinx/coroutines/Job;Ll0/a/g;)V
+
+    const/4 v6, 0x2
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->E(Lkotlinx/coroutines/Job;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ll0/a/k0;
+
+    move-result-object v0
+
+    iput-object v0, p0, Ll0/a/g;->parentHandle:Ll0/a/k0;
+
+    iget-object v2, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    instance-of v2, v2, Ll0/a/i1;
+
+    xor-int/2addr v2, v1
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0}, Ll0/a/k0;->dispose()V
+
+    sget-object v0, Ll0/a/h1;->d:Ll0/a/h1;
+
+    iput-object v0, p0, Ll0/a/g;->parentHandle:Ll0/a/k0;
+
+    :cond_1
+    :goto_0
+    iget v0, p0, Ll0/a/g;->_decision:I
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_3
+
+    const/4 v3, 0x2
+
+    if-ne v0, v3, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Already suspended"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    sget-object v0, Ll0/a/g;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {v0, p0, v2, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const/4 v2, 0x1
+
+    :goto_1
+    if-eqz v2, :cond_4
+
+    sget-object v0, Lk0/l/g/a;->d:Lk0/l/g/a;
+
+    return-object v0
+
+    :cond_4
+    iget-object v0, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    instance-of v2, v0, Ll0/a/p;
+
+    if-nez v2, :cond_7
+
+    iget v2, p0, Ll0/a/i0;->f:I
+
+    if-ne v2, v1, :cond_6
+
+    iget-object v1, p0, Ll0/a/g;->g:Lkotlin/coroutines/CoroutineContext;
+
+    sget-object v2, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {v1, v2}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlinx/coroutines/Job;
+
+    if-eqz v1, :cond_6
+
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->a()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
+
+    move-result-object v1
+
+    invoke-virtual {p0, v0, v1}, Ll0/a/g;->d(Ljava/lang/Object;Ljava/lang/Throwable;)V
+
+    invoke-static {v1, p0}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_6
+    :goto_2
+    invoke-virtual {p0, v0}, Ll0/a/g;->f(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_7
+    check-cast v0, Ll0/a/p;
+
+    iget-object v0, v0, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    invoke-static {v0, p0}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    throw v0
+.end method
+
+.method public final l(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;",
+            "Ljava/lang/Object;",
+            ")V"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "It\'s prohibited to register multiple handlers, tried to register "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ", already has "
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final m(Ljava/lang/Object;I)Ll0/a/h;
+    .locals 3
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/i1;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    sget-object v1, Ll0/a/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p0, v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Ll0/a/g;->parentHandle:Ll0/a/k0;
+
+    if-eqz p1, :cond_1
+
+    invoke-interface {p1}, Ll0/a/k0;->dispose()V
+
+    sget-object p1, Ll0/a/h1;->d:Ll0/a/h1;
+
+    iput-object p1, p0, Ll0/a/g;->parentHandle:Ll0/a/k0;
+
+    :cond_1
+    invoke-virtual {p0, p2}, Ll0/a/g;->j(I)V
+
+    return-object v2
+
+    :cond_2
+    instance-of p2, v0, Ll0/a/h;
+
+    if-eqz p2, :cond_4
+
+    check-cast v0, Ll0/a/h;
+
+    if-eqz v0, :cond_3
+
+    sget-object p2, Ll0/a/h;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {p2, v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_4
+
+    return-object v0
+
+    :cond_3
+    throw v2
+
+    :cond_4
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "Already resumed, but proposed with update "
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public resumeWith(Ljava/lang/Object;)V
+    .locals 1
+
+    invoke-static {p1}, Lf/n/a/k/a;->f0(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    iget v0, p0, Ll0/a/i0;->f:I
+
+    invoke-virtual {p0, p1, v0}, Ll0/a/g;->m(Ljava/lang/Object;I)Ll0/a/h;
+
+    return-void
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "CancellableContinuation"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x28
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    invoke-static {v1}, Lf/n/a/k/a;->e0(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "){"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ll0/a/g;->_state:Ljava/lang/Object;
+
+    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-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/g0.smali b/com.discord/smali_classes2/l0/a/g0.smali
new file mode 100644
index 0000000000..b55e1668e6
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/g0.smali
@@ -0,0 +1,132 @@
+.class public final Ll0/a/g0;
+.super Ll0/a/r1/t;
+.source "Builders.common.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/r1/t<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field public volatile _decision:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ll0/a/g0;
+
+    const-string v1, "_decision"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/g0;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext;",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "uCont"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Ll0/a/r1/t;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Ll0/a/g0;->_decision:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public P()I
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public j(Ljava/lang/Object;I)V
+    .locals 4
+
+    :cond_0
+    iget v0, p0, Ll0/a/g0;->_decision:I
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_2
+
+    if-ne v0, v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "Already resumed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    sget-object v0, Ll0/a/g0;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const/4 v3, 0x2
+
+    invoke-virtual {v0, p0, v1, v3}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v1, 0x1
+
+    :goto_0
+    if-eqz v1, :cond_3
+
+    return-void
+
+    :cond_3
+    invoke-super {p0, p1, p2}, Ll0/a/r1/t;->j(Ljava/lang/Object;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/g1.smali b/com.discord/smali_classes2/l0/a/g1.smali
new file mode 100644
index 0000000000..d4efa7bab5
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/g1.smali
@@ -0,0 +1,152 @@
+.class public final Ll0/a/g1;
+.super Ll0/a/r1/k;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Ll0/a/u0;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/r1/k;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public getList()Ll0/a/g1;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public final i(Ljava/lang/String;)Ljava/lang/String;
+    .locals 5
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "List{"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "}["
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_3
+
+    check-cast p1, Ll0/a/r1/m;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x1
+
+    :goto_0
+    invoke-static {p1, p0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    xor-int/2addr v3, v1
+
+    if-eqz v3, :cond_2
+
+    instance-of v3, p1, Ll0/a/b1;
+
+    if-eqz v3, :cond_1
+
+    move-object v3, p1
+
+    check-cast v3, Ll0/a/b1;
+
+    if-eqz v2, :cond_0
+
+    const/4 v2, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    const-string v4, ", "
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :goto_1
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    :cond_1
+    invoke-virtual {p1}, Ll0/a/r1/m;->e()Ll0/a/r1/m;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_2
+    const-string p1, "]"
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    :cond_3
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    sget-boolean v0, Ll0/a/b0;->b:Z
+
+    if-eqz v0, :cond_0
+
+    const-string v0, "Active"
+
+    invoke-virtual {p0, v0}, Ll0/a/g1;->i(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-super {p0}, Ll0/a/r1/m;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/h.smali b/com.discord/smali_classes2/l0/a/h.smali
new file mode 100644
index 0000000000..93d3326737
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/h.smali
@@ -0,0 +1,82 @@
+.class public final Ll0/a/h;
+.super Ll0/a/p;
+.source "CompletedExceptionally.kt"
+
+
+# static fields
+.field public static final c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field public volatile _resumed:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ll0/a/h;
+
+    const-string v1, "_resumed"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/h;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "*>;",
+            "Ljava/lang/Throwable;",
+            "Z)V"
+        }
+    .end annotation
+
+    const-string v0, "continuation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p2, Ljava/util/concurrent/CancellationException;
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Continuation "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, " was cancelled normally"
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
+
+    :goto_0
+    invoke-direct {p0, p2, p3}, Ll0/a/p;-><init>(Ljava/lang/Throwable;Z)V
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Ll0/a/h;->_resumed:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/h0.smali b/com.discord/smali_classes2/l0/a/h0.smali
new file mode 100644
index 0000000000..4119d7ab46
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/h0.smali
@@ -0,0 +1,913 @@
+.class public final Ll0/a/h0;
+.super Ljava/lang/Object;
+.source "Dispatched.kt"
+
+
+# static fields
+.field public static final a:Ll0/a/r1/v;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "UNDEFINED"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/h0;->a:Ll0/a/r1/v;
+
+    return-void
+.end method
+
+.method public static final a(Ll0/a/i0;I)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ll0/a/i0<",
+            "-TT;>;I)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$dispatch"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    check-cast v0, Ll0/a/g;
+
+    iget-object v0, v0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    const/4 v1, 0x1
+
+    if-eqz p1, :cond_1
+
+    if-ne p1, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v2, 0x1
+
+    :goto_1
+    if-eqz v2, :cond_5
+
+    instance-of v2, v0, Ll0/a/f0;
+
+    if-eqz v2, :cond_5
+
+    invoke-static {p1}, Lf/n/a/k/a;->G(I)Z
+
+    move-result v2
+
+    iget v3, p0, Ll0/a/i0;->f:I
+
+    invoke-static {v3}, Lf/n/a/k/a;->G(I)Z
+
+    move-result v3
+
+    if-ne v2, v3, :cond_5
+
+    move-object p1, v0
+
+    check-cast p1, Ll0/a/f0;
+
+    iget-object p1, p1, Ll0/a/f0;->j:Ll0/a/v;
+
+    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Ll0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {p1, v0, p0}, Ll0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+
+    goto :goto_3
+
+    :cond_2
+    sget-object p1, Ll0/a/n1;->b:Ll0/a/n1;
+
+    invoke-static {}, Ll0/a/n1;->a()Ll0/a/n0;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ll0/a/n0;->A()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p1, p0}, Ll0/a/n0;->x(Ll0/a/i0;)V
+
+    goto :goto_3
+
+    :cond_3
+    invoke-virtual {p1, v1}, Ll0/a/n0;->z(Z)V
+
+    :try_start_0
+    move-object v0, p0
+
+    check-cast v0, Ll0/a/g;
+
+    iget-object v0, v0, Ll0/a/g;->h:Lkotlin/coroutines/Continuation;
+
+    const/4 v2, 0x3
+
+    invoke-static {p0, v0, v2}, Ll0/a/h0;->b(Ll0/a/i0;Lkotlin/coroutines/Continuation;I)V
+
+    :cond_4
+    invoke-virtual {p1}, Ll0/a/n0;->C()Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_4
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception v0
+
+    const/4 v2, 0x0
+
+    :try_start_1
+    invoke-virtual {p0, v0, v2}, Ll0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :goto_2
+    invoke-virtual {p1, v1}, Ll0/a/n0;->v(Z)V
+
+    goto :goto_3
+
+    :catchall_1
+    move-exception p0
+
+    invoke-virtual {p1, v1}, Ll0/a/n0;->v(Z)V
+
+    throw p0
+
+    :cond_5
+    invoke-static {p0, v0, p1}, Ll0/a/h0;->b(Ll0/a/i0;Lkotlin/coroutines/Continuation;I)V
+
+    :goto_3
+    return-void
+.end method
+
+.method public static final b(Ll0/a/i0;Lkotlin/coroutines/Continuation;I)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ll0/a/i0<",
+            "-TT;>;",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;I)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$resume"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ll0/a/i0;->i()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Ll0/a/p;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object v1, v2
+
+    goto :goto_0
+
+    :cond_0
+    move-object v1, v0
+
+    :goto_0
+    check-cast v1, Ll0/a/p;
+
+    if-eqz v1, :cond_1
+
+    iget-object v2, v1, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    :cond_1
+    const-string v1, "Invalid mode "
+
+    const/4 v3, 0x4
+
+    const/4 v4, 0x3
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x1
+
+    if-eqz v2, :cond_8
+
+    instance-of p0, p1, Ll0/a/i0;
+
+    if-eqz p0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-static {v2, p1}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object v2
+
+    :goto_1
+    const-string p0, "$this$resumeWithExceptionMode"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "exception"
+
+    invoke-static {v2, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_7
+
+    if-eq p2, v6, :cond_6
+
+    if-eq p2, v5, :cond_5
+
+    if-eq p2, v4, :cond_4
+
+    if-ne p2, v3, :cond_3
+
+    goto/16 :goto_2
+
+    :cond_3
+    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    check-cast p1, Ll0/a/f0;
+
+    invoke-virtual {p1}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p0
+
+    iget-object p2, p1, Ll0/a/f0;->i:Ljava/lang/Object;
+
+    invoke-static {p0, p2}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    :try_start_0
+    iget-object p1, p1, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-static {v2, p1}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-static {p0, p2}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p0, p2}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_5
+    invoke-static {p1, v2}, Ll0/a/h0;->f(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :cond_6
+    invoke-static {p1, v2}, Ll0/a/h0;->d(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :cond_7
+    invoke-static {v2}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-interface {p1, p0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :cond_8
+    invoke-virtual {p0, v0}, Ll0/a/i0;->f(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    const-string v0, "$this$resumeMode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_d
+
+    if-eq p2, v6, :cond_c
+
+    if-eq p2, v5, :cond_b
+
+    if-eq p2, v4, :cond_a
+
+    if-ne p2, v3, :cond_9
+
+    goto :goto_2
+
+    :cond_9
+    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_a
+    check-cast p1, Ll0/a/f0;
+
+    invoke-virtual {p1}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p2
+
+    iget-object v0, p1, Ll0/a/f0;->i:Ljava/lang/Object;
+
+    invoke-static {p2, v0}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :try_start_1
+    iget-object p1, p1, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {p1, p0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    invoke-static {p2, v0}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :catchall_1
+    move-exception p0
+
+    invoke-static {p2, v0}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw p0
+
+    :cond_b
+    invoke-static {p1, p0}, Ll0/a/h0;->e(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :cond_c
+    invoke-static {p1, p0}, Ll0/a/h0;->c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :cond_d
+    invoke-interface {p1, p0}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    :goto_2
+    return-void
+.end method
+
+.method public static final c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;TT;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$resumeCancellable"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ll0/a/f0;
+
+    if-eqz v0, :cond_4
+
+    check-cast p0, Ll0/a/f0;
+
+    iget-object v0, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ll0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-object p1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    iput v1, p0, Ll0/a/i0;->f:I
+
+    iget-object p1, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0, p0}, Ll0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+
+    goto :goto_3
+
+    :cond_0
+    sget-object v0, Ll0/a/n1;->b:Ll0/a/n1;
+
+    invoke-static {}, Ll0/a/n1;->a()Ll0/a/n0;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ll0/a/n0;->A()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    iput-object p1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    iput v1, p0, Ll0/a/i0;->f:I
+
+    invoke-virtual {v0, p0}, Ll0/a/n0;->x(Ll0/a/i0;)V
+
+    goto :goto_3
+
+    :cond_1
+    invoke-virtual {v0, v1}, Ll0/a/n0;->z(Z)V
+
+    :try_start_0
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v2
+
+    sget-object v3, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {v2, v3}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlinx/coroutines/Job;
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->a()Z
+
+    move-result v3
+
+    if-nez v3, :cond_2
+
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
+
+    move-result-object v2
+
+    invoke-static {v2}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-virtual {p0, v2}, Ll0/a/f0;->resumeWith(Ljava/lang/Object;)V
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v2, 0x0
+
+    :goto_0
+    if-nez v2, :cond_3
+
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v2
+
+    iget-object v3, p0, Ll0/a/f0;->i:Ljava/lang/Object;
+
+    invoke-static {v2, v3}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v4, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {v4, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    invoke-static {v2, v3}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {v2, v3}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_3
+    :goto_1
+    invoke-virtual {v0}, Ll0/a/n0;->C()Z
+
+    move-result p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-nez p1, :cond_3
+
+    goto :goto_2
+
+    :catchall_1
+    move-exception p1
+
+    const/4 v2, 0x0
+
+    :try_start_3
+    invoke-virtual {p0, p1, v2}, Ll0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    :goto_2
+    invoke-virtual {v0, v1}, Ll0/a/n0;->v(Z)V
+
+    goto :goto_3
+
+    :catchall_2
+    move-exception p0
+
+    invoke-virtual {v0, v1}, Ll0/a/n0;->v(Z)V
+
+    throw p0
+
+    :cond_4
+    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    :goto_3
+    return-void
+.end method
+
+.method public static final d(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;",
+            "Ljava/lang/Throwable;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "$this$resumeCancellableWithException"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ll0/a/f0;
+
+    if-eqz v0, :cond_4
+
+    check-cast p0, Ll0/a/f0;
+
+    iget-object v0, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v0
+
+    new-instance v1, Ll0/a/p;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, p1, v2, v3}, Ll0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
+
+    iget-object v4, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    invoke-virtual {v4, v0}, Ll0/a/v;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+
+    move-result v4
+
+    const/4 v5, 0x1
+
+    if-eqz v4, :cond_0
+
+    new-instance v1, Ll0/a/p;
+
+    invoke-direct {v1, p1, v2, v3}, Ll0/a/p;-><init>(Ljava/lang/Throwable;ZI)V
+
+    iput-object v1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    iput v5, p0, Ll0/a/i0;->f:I
+
+    iget-object p1, p0, Ll0/a/f0;->j:Ll0/a/v;
+
+    invoke-virtual {p1, v0, p0}, Ll0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+
+    goto/16 :goto_2
+
+    :cond_0
+    sget-object v0, Ll0/a/n1;->b:Ll0/a/n1;
+
+    invoke-static {}, Ll0/a/n1;->a()Ll0/a/n0;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ll0/a/n0;->A()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    iput-object v1, p0, Ll0/a/f0;->g:Ljava/lang/Object;
+
+    iput v5, p0, Ll0/a/i0;->f:I
+
+    invoke-virtual {v0, p0}, Ll0/a/n0;->x(Ll0/a/i0;)V
+
+    goto :goto_2
+
+    :cond_1
+    invoke-virtual {v0, v5}, Ll0/a/n0;->z(Z)V
+
+    :try_start_0
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v1
+
+    sget-object v3, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {v1, v3}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlinx/coroutines/Job;
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->a()Z
+
+    move-result v3
+
+    if-nez v3, :cond_2
+
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {p0, v1}, Ll0/a/f0;->resumeWith(Ljava/lang/Object;)V
+
+    const/4 v2, 0x1
+
+    :cond_2
+    if-nez v2, :cond_3
+
+    invoke-virtual {p0}, Ll0/a/f0;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v1
+
+    iget-object v2, p0, Ll0/a/f0;->i:Ljava/lang/Object;
+
+    invoke-static {v1, v2}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v3, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-static {p1, v3}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {v3, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    invoke-static {v1, v2}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {v1, v2}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_3
+    :goto_0
+    invoke-virtual {v0}, Ll0/a/n0;->C()Z
+
+    move-result p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-nez p1, :cond_3
+
+    goto :goto_1
+
+    :catchall_1
+    move-exception p1
+
+    const/4 v1, 0x0
+
+    :try_start_3
+    invoke-virtual {p0, p1, v1}, Ll0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    :goto_1
+    invoke-virtual {v0, v5}, Ll0/a/n0;->v(Z)V
+
+    goto :goto_2
+
+    :catchall_2
+    move-exception p0
+
+    invoke-virtual {v0, v5}, Ll0/a/n0;->v(Z)V
+
+    throw p0
+
+    :cond_4
+    invoke-static {p1, p0}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    :goto_2
+    return-void
+.end method
+
+.method public static final e(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;TT;)V"
+        }
+    .end annotation
+
+    const-string v0, "$this$resumeDirect"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ll0/a/f0;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ll0/a/f0;
+
+    iget-object p0, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public static final f(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;",
+            "Ljava/lang/Throwable;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "$this$resumeDirectWithException"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ll0/a/f0;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ll0/a/f0;
+
+    iget-object p0, p0, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-static {p1, p0}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1, p0}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/h1.smali b/com.discord/smali_classes2/l0/a/h1.smali
new file mode 100644
index 0000000000..fb2c15c843
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/h1.smali
@@ -0,0 +1,61 @@
+.class public final Ll0/a/h1;
+.super Ljava/lang/Object;
+.source "Job.kt"
+
+# interfaces
+.implements Ll0/a/k0;
+.implements Ll0/a/j;
+
+
+# static fields
+.field public static final d:Ll0/a/h1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/h1;
+
+    invoke-direct {v0}, Ll0/a/h1;-><init>()V
+
+    sput-object v0, Ll0/a/h1;->d:Ll0/a/h1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public dispose()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public h(Ljava/lang/Throwable;)Z
+    .locals 1
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "NonDisposableHandle"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/i.smali b/com.discord/smali_classes2/l0/a/i.smali
new file mode 100644
index 0000000000..71504c3674
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/i.smali
@@ -0,0 +1,117 @@
+.class public final Ll0/a/i;
+.super Ll0/a/z0;
+.source "JobSupport.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/z0<",
+        "Lkotlinx/coroutines/Job;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final h:Ll0/a/g;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ll0/a/g<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlinx/coroutines/Job;Ll0/a/g;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlinx/coroutines/Job;",
+            "Ll0/a/g<",
+            "*>;)V"
+        }
+    .end annotation
+
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "child"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ll0/a/z0;-><init>(Lkotlinx/coroutines/Job;)V
+
+    iput-object p2, p0, Ll0/a/i;->h:Ll0/a/g;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public i(Ljava/lang/Throwable;)V
+    .locals 2
+
+    iget-object p1, p0, Ll0/a/i;->h:Ll0/a/g;
+
+    iget-object v0, p0, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    if-eqz p1, :cond_0
+
+    const-string v1, "parent"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v0}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Ll0/a/g;->g(Ljava/lang/Throwable;)Z
+
+    return-void
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Ll0/a/i;->i(Ljava/lang/Throwable;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "ChildContinuation["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/i;->h:Ll0/a/g;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/i0.smali b/com.discord/smali_classes2/l0/a/i0.smali
new file mode 100644
index 0000000000..90e5878bf1
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/i0.smali
@@ -0,0 +1,356 @@
+.class public abstract Ll0/a/i0;
+.super Ll0/a/s1/h;
+.source "Dispatched.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/s1/h;"
+    }
+.end annotation
+
+
+# instance fields
+.field public f:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/s1/h;-><init>()V
+
+    iput p1, p0, Ll0/a/i0;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public d(Ljava/lang/Object;Ljava/lang/Throwable;)V
+    .locals 0
+
+    const-string p1, "cause"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public abstract e()Lkotlin/coroutines/Continuation;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+.end method
+
+.method public f(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Object;",
+            ")TT;"
+        }
+    .end annotation
+
+    return-object p1
+.end method
+
+.method public final h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+    .locals 2
+
+    if-nez p1, :cond_0
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    if-eqz p1, :cond_1
+
+    if-eqz p2, :cond_1
+
+    invoke-static {p1, p2}, Lf/n/a/k/a;->addSuppressed(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    :cond_1
+    if-eqz p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    move-object p1, p2
+
+    :goto_0
+    new-instance p2, Ll0/a/a0;
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Fatal exception in coroutines machinery for "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p0}, 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;
+
+    const-string v1, "Please read KDoc to \'handleFatalException\' method and report this incident to maintainers"
+
+    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
+
+    if-eqz p1, :cond_3
+
+    invoke-direct {p2, v0, p1}, Ll0/a/a0;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Ll0/a/i0;->e()Lkotlin/coroutines/Continuation;
+
+    move-result-object p1
+
+    invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    invoke-static {p1, p2}, Lf/n/a/k/a;->C(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public abstract i()Ljava/lang/Object;
+.end method
+
+.method public final run()V
+    .locals 9
+
+    iget-object v0, p0, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    :try_start_0
+    invoke-virtual {p0}, Ll0/a/i0;->e()Lkotlin/coroutines/Continuation;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_5
+
+    check-cast v1, Ll0/a/f0;
+
+    iget-object v2, v1, Ll0/a/f0;->k:Lkotlin/coroutines/Continuation;
+
+    invoke-interface {v2}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object v3
+
+    invoke-virtual {p0}, Ll0/a/i0;->i()Ljava/lang/Object;
+
+    move-result-object v4
+
+    iget-object v1, v1, Ll0/a/f0;->i:Ljava/lang/Object;
+
+    invoke-static {v3, v1}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :try_start_1
+    instance-of v5, v4, Ll0/a/p;
+
+    const/4 v6, 0x0
+
+    if-nez v5, :cond_0
+
+    move-object v5, v6
+
+    goto :goto_0
+
+    :cond_0
+    move-object v5, v4
+
+    :goto_0
+    check-cast v5, Ll0/a/p;
+
+    if-eqz v5, :cond_1
+
+    iget-object v5, v5, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    goto :goto_1
+
+    :cond_1
+    move-object v5, v6
+
+    :goto_1
+    iget v7, p0, Ll0/a/i0;->f:I
+
+    invoke-static {v7}, Lf/n/a/k/a;->G(I)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_2
+
+    sget-object v7, Lkotlinx/coroutines/Job;->c:Lkotlinx/coroutines/Job$a;
+
+    invoke-interface {v3, v7}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v7
+
+    check-cast v7, Lkotlinx/coroutines/Job;
+
+    goto :goto_2
+
+    :cond_2
+    move-object v7, v6
+
+    :goto_2
+    if-nez v5, :cond_3
+
+    if-eqz v7, :cond_3
+
+    invoke-interface {v7}, Lkotlinx/coroutines/Job;->a()Z
+
+    move-result v8
+
+    if-nez v8, :cond_3
+
+    invoke-interface {v7}, Lkotlinx/coroutines/Job;->e()Ljava/util/concurrent/CancellationException;
+
+    move-result-object v5
+
+    invoke-virtual {p0, v4, v5}, Ll0/a/i0;->d(Ljava/lang/Object;Ljava/lang/Throwable;)V
+
+    invoke-static {v5, v2}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object v4
+
+    invoke-static {v4}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-interface {v2, v4}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_3
+
+    :cond_3
+    if-eqz v5, :cond_4
+
+    invoke-static {v5, v2}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object v4
+
+    invoke-static {v4}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-interface {v2, v4}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_3
+
+    :cond_4
+    invoke-virtual {p0, v4}, Ll0/a/i0;->f(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-interface {v2, v4}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :goto_3
+    :try_start_2
+    invoke-static {v3, v1}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    :try_start_3
+    invoke-interface {v0}, Ll0/a/s1/i;->c()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    goto :goto_4
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_4
+    invoke-static {v0}, Lk0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v6, v0}, Ll0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    goto :goto_6
+
+    :catchall_1
+    move-exception v2
+
+    :try_start_4
+    invoke-static {v3, v1}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw v2
+
+    :cond_5
+    new-instance v1, Lkotlin/TypeCastException;
+
+    const-string v2, "null cannot be cast to non-null type kotlinx.coroutines.DispatchedContinuation<T>"
+
+    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    :catchall_2
+    move-exception v1
+
+    :try_start_5
+    invoke-interface {v0}, Ll0/a/s1/i;->c()V
+
+    sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_3
+
+    goto :goto_5
+
+    :catchall_3
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_5
+    invoke-static {v0}, Lk0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v1, v0}, Ll0/a/i0;->h(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
+
+    :goto_6
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/i1.smali b/com.discord/smali_classes2/l0/a/i1.smali
new file mode 100644
index 0000000000..1c08d28de8
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/i1.smali
@@ -0,0 +1,3 @@
+.class public interface abstract Ll0/a/i1;
+.super Ljava/lang/Object;
+.source "CancellableContinuationImpl.kt"
diff --git a/com.discord/smali_classes2/l0/a/j.smali b/com.discord/smali_classes2/l0/a/j.smali
new file mode 100644
index 0000000000..f6648160c0
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/j.smali
@@ -0,0 +1,11 @@
+.class public interface abstract Ll0/a/j;
+.super Ljava/lang/Object;
+.source "Job.kt"
+
+# interfaces
+.implements Ll0/a/k0;
+
+
+# virtual methods
+.method public abstract h(Ljava/lang/Throwable;)Z
+.end method
diff --git a/com.discord/smali_classes2/l0/a/j0.smali b/com.discord/smali_classes2/l0/a/j0.smali
new file mode 100644
index 0000000000..30e8914585
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/j0.smali
@@ -0,0 +1,54 @@
+.class public final Ll0/a/j0;
+.super Ljava/lang/Object;
+.source "Dispatchers.kt"
+
+
+# static fields
+.field public static final a:Ll0/a/v;
+
+.field public static final b:Ll0/a/v;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget-boolean v0, Ll0/a/u;->a:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Ll0/a/s1/b;->j:Ll0/a/s1/b;
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Ll0/a/m;->e:Ll0/a/m;
+
+    :goto_0
+    sput-object v0, Ll0/a/j0;->a:Ll0/a/v;
+
+    sget-object v0, Ll0/a/o1;->d:Ll0/a/o1;
+
+    sget-object v0, Ll0/a/s1/b;->j:Ll0/a/s1/b;
+
+    if-eqz v0, :cond_1
+
+    sget-object v0, Ll0/a/s1/b;->i:Ll0/a/v;
+
+    sput-object v0, Ll0/a/j0;->b:Ll0/a/v;
+
+    return-void
+
+    :cond_1
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public static final a()Ll0/a/f1;
+    .locals 1
+
+    sget-object v0, Ll0/a/r1/p;->b:Ll0/a/f1;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/j1.smali b/com.discord/smali_classes2/l0/a/j1.smali
new file mode 100644
index 0000000000..1b1703d6cd
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/j1.smali
@@ -0,0 +1,11 @@
+.class public interface abstract Ll0/a/j1;
+.super Ljava/lang/Object;
+.source "Job.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/Job;
+
+
+# virtual methods
+.method public abstract n()Ljava/util/concurrent/CancellationException;
+.end method
diff --git a/com.discord/smali_classes2/l0/a/k.smali b/com.discord/smali_classes2/l0/a/k.smali
new file mode 100644
index 0000000000..5ecb8c258e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/k.smali
@@ -0,0 +1,111 @@
+.class public final Ll0/a/k;
+.super Ll0/a/z0;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Ll0/a/j;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/z0<",
+        "Ll0/a/c1;",
+        ">;",
+        "Ll0/a/j;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final h:Ll0/a/l;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/c1;Ll0/a/l;)V
+    .locals 1
+
+    const-string v0, "parent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "childJob"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ll0/a/z0;-><init>(Lkotlinx/coroutines/Job;)V
+
+    iput-object p2, p0, Ll0/a/k;->h:Ll0/a/l;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public h(Ljava/lang/Throwable;)Z
+    .locals 1
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    check-cast v0, Ll0/a/c1;
+
+    invoke-virtual {v0, p1}, Ll0/a/c1;->o(Ljava/lang/Throwable;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public i(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object p1, p0, Ll0/a/k;->h:Ll0/a/l;
+
+    iget-object v0, p0, Ll0/a/b1;->g:Lkotlinx/coroutines/Job;
+
+    check-cast v0, Ll0/a/j1;
+
+    invoke-interface {p1, v0}, Ll0/a/l;->f(Ll0/a/j1;)V
+
+    return-void
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Ll0/a/k;->i(Ljava/lang/Throwable;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "ChildHandle["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/k;->h:Ll0/a/l;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/k0.smali b/com.discord/smali_classes2/l0/a/k0.smali
new file mode 100644
index 0000000000..e1abee5371
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/k0.smali
@@ -0,0 +1,8 @@
+.class public interface abstract Ll0/a/k0;
+.super Ljava/lang/Object;
+.source "Job.kt"
+
+
+# virtual methods
+.method public abstract dispose()V
+.end method
diff --git a/com.discord/smali_classes2/l0/a/k1.smali b/com.discord/smali_classes2/l0/a/k1.smali
new file mode 100644
index 0000000000..1795911cb4
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/k1.smali
@@ -0,0 +1,45 @@
+.class public Ll0/a/k1;
+.super Ll0/a/a;
+.source "Builders.common.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/a<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Z)V
+    .locals 1
+
+    const-string v0, "parentContext"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Ll0/a/a;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public y(Ljava/lang/Throwable;)Z
+    .locals 1
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Ll0/a/a;->e:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-static {v0, p1}, Lf/n/a/k/a;->C(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/l.smali b/com.discord/smali_classes2/l0/a/l.smali
new file mode 100644
index 0000000000..56da390c34
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/l.smali
@@ -0,0 +1,11 @@
+.class public interface abstract Ll0/a/l;
+.super Ljava/lang/Object;
+.source "Job.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/Job;
+
+
+# virtual methods
+.method public abstract f(Ll0/a/j1;)V
+.end method
diff --git a/com.discord/smali_classes2/l0/a/l0.smali b/com.discord/smali_classes2/l0/a/l0.smali
new file mode 100644
index 0000000000..52b1a2411e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/l0.smali
@@ -0,0 +1,73 @@
+.class public final Ll0/a/l0;
+.super Ll0/a/d;
+.source "CancellableContinuation.kt"
+
+
+# instance fields
+.field public final d:Ll0/a/k0;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/k0;)V
+    .locals 1
+
+    const-string v0, "handle"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ll0/a/d;-><init>()V
+
+    iput-object p1, p0, Ll0/a/l0;->d:Ll0/a/k0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iget-object p1, p0, Ll0/a/l0;->d:Ll0/a/k0;
+
+    invoke-interface {p1}, Ll0/a/k0;->dispose()V
+
+    return-void
+.end method
+
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    iget-object p1, p0, Ll0/a/l0;->d:Ll0/a/k0;
+
+    invoke-interface {p1}, Ll0/a/k0;->dispose()V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "DisposeOnCancel["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/l0;->d:Ll0/a/k0;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/l1.smali b/com.discord/smali_classes2/l0/a/l1.smali
new file mode 100644
index 0000000000..841d509b75
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/l1.smali
@@ -0,0 +1,27 @@
+.class public final Ll0/a/l1;
+.super Ll0/a/a1;
+.source "Supervisor.kt"
+
+
+# direct methods
+.method public constructor <init>(Lkotlinx/coroutines/Job;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ll0/a/a1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public o(Ljava/lang/Throwable;)Z
+    .locals 1
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/m$a.smali b/com.discord/smali_classes2/l0/a/m$a.smali
new file mode 100644
index 0000000000..3131b5a2ce
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/m$a.smali
@@ -0,0 +1,67 @@
+.class public final Ll0/a/m$a;
+.super Ljava/lang/Object;
+.source "CommonPool.kt"
+
+# interfaces
+.implements Ljava/util/concurrent/ThreadFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ll0/a/m;->v()Ljava/util/concurrent/ExecutorService;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
+    .locals 0
+
+    iput-object p1, p0, Ll0/a/m$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+    .locals 3
+
+    new-instance v0, Ljava/lang/Thread;
+
+    const-string v1, "CommonPool-worker-"
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Ll0/a/m$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, p1, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setDaemon(Z)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/m.smali b/com.discord/smali_classes2/l0/a/m.smali
new file mode 100644
index 0000000000..6a95683778
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/m.smali
@@ -0,0 +1,509 @@
+.class public final Ll0/a/m;
+.super Ll0/a/r0;
+.source "CommonPool.kt"
+
+
+# static fields
+.field public static final d:I
+
+.field public static final e:Ll0/a/m;
+
+.field public static volatile pool:Ljava/util/concurrent/Executor;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    new-instance v0, Ll0/a/m;
+
+    invoke-direct {v0}, Ll0/a/m;-><init>()V
+
+    sput-object v0, Ll0/a/m;->e:Ll0/a/m;
+
+    :try_start_0
+    const-string v0, "kotlinx.coroutines.default.parallelism"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    invoke-static {v0}, Lk0/u/j;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    if-lt v2, v3, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    goto :goto_1
+
+    :cond_0
+    const-string v1, "Expected positive number in kotlinx.coroutines.default.parallelism, but has "
+
+    invoke-static {v1, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1
+    const/4 v0, -0x1
+
+    :goto_1
+    sput v0, Ll0/a/m;->d:I
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/r0;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Close cannot be invoked on CommonPool"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    sget-object p1, Ll0/a/m;->pool:Ljava/util/concurrent/Executor;
+
+    if-eqz p1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    monitor-enter p0
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :try_start_1
+    sget-object p1, Ll0/a/m;->pool:Ljava/util/concurrent/Executor;
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ll0/a/m;->w()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object p1
+
+    sput-object p1, Ll0/a/m;->pool:Ljava/util/concurrent/Executor;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    :try_start_2
+    monitor-exit p0
+
+    :goto_1
+    invoke-interface {p1, p2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+    :try_end_2
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_2 .. :try_end_2} :catch_0
+
+    :catch_0
+    sget-object p1, Ll0/a/c0;->j:Ll0/a/c0;
+
+    invoke-virtual {p1, p2}, Ll0/a/o0;->F(Ljava/lang/Runnable;)V
+
+    :goto_2
+    return-void
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "CommonPool"
+
+    return-object v0
+.end method
+
+.method public final v()Ljava/util/concurrent/ExecutorService;
+    .locals 3
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    invoke-virtual {p0}, Ll0/a/m;->x()I
+
+    move-result v1
+
+    new-instance v2, Ll0/a/m$a;
+
+    invoke-direct {v2, v0}, Ll0/a/m$a;-><init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
+
+    invoke-static {v1, v2}, Ljava/util/concurrent/Executors;->newFixedThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    const-string v1, "Executors.newFixedThread\u2026Daemon = true }\n        }"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final w()Ljava/util/concurrent/ExecutorService;
+    .locals 7
+
+    invoke-static {}, Ljava/lang/System;->getSecurityManager()Ljava/lang/SecurityManager;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Ll0/a/m;->v()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :try_start_0
+    const-string v1, "java.util.concurrent.ForkJoinPool"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-object v1, v0
+
+    :goto_0
+    if-eqz v1, :cond_a
+
+    sget v2, Ll0/a/m;->d:I
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-gez v2, :cond_7
+
+    :try_start_1
+    const-string v2, "commonPool"
+
+    new-array v5, v4, [Ljava/lang/Class;
+
+    invoke-virtual {v1, v2, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_1
+
+    new-array v5, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v2, v0, v5}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    goto :goto_1
+
+    :cond_1
+    move-object v2, v0
+
+    :goto_1
+    instance-of v5, v2, Ljava/util/concurrent/ExecutorService;
+
+    if-nez v5, :cond_2
+
+    move-object v2, v0
+
+    :cond_2
+    check-cast v2, Ljava/util/concurrent/ExecutorService;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    goto :goto_2
+
+    :catchall_1
+    move-object v2, v0
+
+    :goto_2
+    if-eqz v2, :cond_7
+
+    sget-object v5, Ll0/a/m;->e:Ll0/a/m;
+
+    if-eqz v5, :cond_6
+
+    const-string v5, "fjpClass"
+
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "executor"
+
+    invoke-static {v2, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v5, Ll0/a/n;->d:Ll0/a/n;
+
+    invoke-interface {v2, v5}, Ljava/util/concurrent/ExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
+
+    :try_start_2
+    const-string v5, "getPoolSize"
+
+    new-array v6, v4, [Ljava/lang/Class;
+
+    invoke-virtual {v1, v5, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v5
+
+    new-array v6, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v5, v2, v6}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    instance-of v6, v5, Ljava/lang/Integer;
+
+    if-nez v6, :cond_3
+
+    move-object v5, v0
+
+    :cond_3
+    check-cast v5, Ljava/lang/Integer;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    goto :goto_3
+
+    :catchall_2
+    move-object v5, v0
+
+    :goto_3
+    if-eqz v5, :cond_4
+
+    invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
+
+    move-result v5
+
+    if-lt v5, v3, :cond_4
+
+    const/4 v5, 0x1
+
+    goto :goto_4
+
+    :cond_4
+    const/4 v5, 0x0
+
+    :goto_4
+    if-eqz v5, :cond_5
+
+    goto :goto_5
+
+    :cond_5
+    move-object v2, v0
+
+    :goto_5
+    if-eqz v2, :cond_7
+
+    return-object v2
+
+    :cond_6
+    throw v0
+
+    :cond_7
+    :try_start_3
+    new-array v2, v3, [Ljava/lang/Class;
+
+    sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    aput-object v5, v2, v4
+
+    invoke-virtual {v1, v2}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object v1
+
+    new-array v2, v3, [Ljava/lang/Object;
+
+    sget-object v3, Ll0/a/m;->e:Ll0/a/m;
+
+    invoke-virtual {v3}, Ll0/a/m;->x()I
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    aput-object v3, v2, v4
+
+    invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    instance-of v2, v1, Ljava/util/concurrent/ExecutorService;
+
+    if-nez v2, :cond_8
+
+    move-object v1, v0
+
+    :cond_8
+    check-cast v1, Ljava/util/concurrent/ExecutorService;
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_3
+
+    move-object v0, v1
+
+    goto :goto_6
+
+    :catchall_3
+    nop
+
+    :goto_6
+    if-eqz v0, :cond_9
+
+    return-object v0
+
+    :cond_9
+    invoke-virtual {p0}, Ll0/a/m;->v()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_a
+    invoke-virtual {p0}, Ll0/a/m;->v()Ljava/util/concurrent/ExecutorService;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final x()I
+    .locals 3
+
+    sget v0, Ll0/a/m;->d:I
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-lez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    goto :goto_3
+
+    :cond_2
+    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
+
+    move-result v0
+
+    sub-int/2addr v0, v2
+
+    if-ge v0, v2, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    move v2, v0
+
+    :goto_2
+    move v0, v2
+
+    :goto_3
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/m0.smali b/com.discord/smali_classes2/l0/a/m0.smali
new file mode 100644
index 0000000000..356216072d
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/m0.smali
@@ -0,0 +1,74 @@
+.class public final Ll0/a/m0;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Ll0/a/u0;
+
+
+# instance fields
+.field public final d:Z
+
+
+# direct methods
+.method public constructor <init>(Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Ll0/a/m0;->d:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 1
+
+    iget-boolean v0, p0, Ll0/a/m0;->d:Z
+
+    return v0
+.end method
+
+.method public getList()Ll0/a/g1;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "Empty{"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-boolean v1, p0, Ll0/a/m0;->d:Z
+
+    if-eqz v1, :cond_0
+
+    const-string v1, "Active"
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "New"
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x7d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/m1.smali b/com.discord/smali_classes2/l0/a/m1.smali
new file mode 100644
index 0000000000..6f056cfd62
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/m1.smali
@@ -0,0 +1,40 @@
+.class public interface abstract Ll0/a/m1;
+.super Ljava/lang/Object;
+.source "ThreadContextElement.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<S:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/CoroutineContext$a;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext;",
+            "TS;)V"
+        }
+    .end annotation
+.end method
+
+.method public abstract r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext;",
+            ")TS;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/l0/a/n.smali b/com.discord/smali_classes2/l0/a/n.smali
new file mode 100644
index 0000000000..0f6b5b56ea
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/n.smali
@@ -0,0 +1,40 @@
+.class public final Ll0/a/n;
+.super Ljava/lang/Object;
+.source "CommonPool.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# static fields
+.field public static final d:Ll0/a/n;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/n;
+
+    invoke-direct {v0}, Ll0/a/n;-><init>()V
+
+    sput-object v0, Ll0/a/n;->d:Ll0/a/n;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/n0.smali b/com.discord/smali_classes2/l0/a/n0.smali
new file mode 100644
index 0000000000..303782c682
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/n0.smali
@@ -0,0 +1,467 @@
+.class public abstract Ll0/a/n0;
+.super Ll0/a/v;
+.source "EventLoop.common.kt"
+
+
+# instance fields
+.field public d:J
+
+.field public e:Z
+
+.field public f:Ll0/a/r1/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ll0/a/r1/a<",
+            "Ll0/a/i0<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/v;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final A()Z
+    .locals 6
+
+    iget-wide v0, p0, Ll0/a/n0;->d:J
+
+    const/4 v2, 0x1
+
+    invoke-virtual {p0, v2}, Ll0/a/n0;->w(Z)J
+
+    move-result-wide v3
+
+    cmp-long v5, v0, v3
+
+    if-ltz v5, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    return v2
+.end method
+
+.method public final C()Z
+    .locals 7
+
+    iget-object v0, p0, Ll0/a/n0;->f:Ll0/a/r1/a;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    iget v2, v0, Ll0/a/r1/a;->b:I
+
+    iget v3, v0, Ll0/a/r1/a;->c:I
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    if-ne v2, v3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v3, v0, Ll0/a/r1/a;->a:[Ljava/lang/Object;
+
+    aget-object v6, v3, v2
+
+    aput-object v4, v3, v2
+
+    add-int/2addr v2, v5
+
+    array-length v3, v3
+
+    add-int/lit8 v3, v3, -0x1
+
+    and-int/2addr v2, v3
+
+    iput v2, v0, Ll0/a/r1/a;->b:I
+
+    if-eqz v6, :cond_2
+
+    move-object v4, v6
+
+    :goto_0
+    check-cast v4, Ll0/a/i0;
+
+    if-eqz v4, :cond_1
+
+    invoke-virtual {v4}, Ll0/a/i0;->run()V
+
+    return v5
+
+    :cond_1
+    return v1
+
+    :cond_2
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type T"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    return v1
+.end method
+
+.method public final v(Z)V
+    .locals 8
+
+    iget-wide v0, p0, Ll0/a/n0;->d:J
+
+    invoke-virtual {p0, p1}, Ll0/a/n0;->w(Z)J
+
+    move-result-wide v2
+
+    sub-long/2addr v0, v2
+
+    iput-wide v0, p0, Ll0/a/n0;->d:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long p1, v0, v2
+
+    if-lez p1, :cond_0
+
+    return-void
+
+    :cond_0
+    sget-boolean p1, Ll0/a/b0;->a:Z
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    if-eqz p1, :cond_3
+
+    cmp-long p1, v0, v2
+
+    if-nez p1, :cond_1
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_3
+    :goto_1
+    iget-boolean p1, p0, Ll0/a/n0;->e:Z
+
+    if-eqz p1, :cond_b
+
+    move-object p1, p0
+
+    check-cast p1, Ll0/a/o0;
+
+    sget-object v0, Ll0/a/n1;->b:Ll0/a/n1;
+
+    sget-object v0, Ll0/a/n1;->a:Ljava/lang/ThreadLocal;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
+
+    iput-boolean v5, p1, Ll0/a/o0;->isCompleted:Z
+
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    if-eqz v0, :cond_5
+
+    iget-boolean v0, p1, Ll0/a/o0;->isCompleted:Z
+
+    if-eqz v0, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_5
+    :goto_2
+    iget-object v0, p1, Ll0/a/o0;->_queue:Ljava/lang/Object;
+
+    if-nez v0, :cond_6
+
+    sget-object v0, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    sget-object v6, Ll0/a/q0;->b:Ll0/a/r1/v;
+
+    invoke-virtual {v0, p1, v1, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    goto :goto_3
+
+    :cond_6
+    instance-of v6, v0, Ll0/a/r1/o;
+
+    if-eqz v6, :cond_7
+
+    check-cast v0, Ll0/a/r1/o;
+
+    invoke-virtual {v0}, Ll0/a/r1/o;->c()Z
+
+    goto :goto_3
+
+    :cond_7
+    sget-object v6, Ll0/a/q0;->b:Ll0/a/r1/v;
+
+    if-ne v0, v6, :cond_8
+
+    goto :goto_3
+
+    :cond_8
+    new-instance v6, Ll0/a/r1/o;
+
+    const/16 v7, 0x8
+
+    invoke-direct {v6, v7, v5}, Ll0/a/r1/o;-><init>(IZ)V
+
+    move-object v7, v0
+
+    check-cast v7, Ljava/lang/Runnable;
+
+    invoke-virtual {v6, v7}, Ll0/a/r1/o;->b(Ljava/lang/Object;)I
+
+    sget-object v7, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v7, p1, v0, v6}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    :goto_3
+    invoke-virtual {p1}, Ll0/a/o0;->L()J
+
+    move-result-wide v5
+
+    cmp-long v0, v5, v2
+
+    if-gtz v0, :cond_9
+
+    goto :goto_3
+
+    :cond_9
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v2
+
+    :goto_4
+    iget-object v0, p1, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/o0$c;
+
+    if-eqz v0, :cond_b
+
+    monitor-enter v0
+
+    :try_start_0
+    iget v5, v0, Ll0/a/r1/y;->_size:I
+
+    if-lez v5, :cond_a
+
+    invoke-virtual {v0, v4}, Ll0/a/r1/y;->c(I)Ll0/a/r1/z;
+
+    move-result-object v5
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_5
+
+    :cond_a
+    move-object v5, v1
+
+    :goto_5
+    monitor-exit v0
+
+    check-cast v5, Ll0/a/o0$b;
+
+    if-eqz v5, :cond_b
+
+    invoke-virtual {p1, v2, v3, v5}, Ll0/a/p0;->E(JLl0/a/o0$b;)V
+
+    goto :goto_4
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+
+    :cond_b
+    return-void
+.end method
+
+.method public final w(Z)J
+    .locals 2
+
+    if-eqz p1, :cond_0
+
+    const-wide v0, 0x100000000L
+
+    goto :goto_0
+
+    :cond_0
+    const-wide/16 v0, 0x1
+
+    :goto_0
+    return-wide v0
+.end method
+
+.method public final x(Ll0/a/i0;)V
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ll0/a/i0<",
+            "*>;)V"
+        }
+    .end annotation
+
+    const-string v0, "task"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Ll0/a/n0;->f:Ll0/a/r1/a;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ll0/a/r1/a;
+
+    invoke-direct {v0}, Ll0/a/r1/a;-><init>()V
+
+    iput-object v0, p0, Ll0/a/n0;->f:Ll0/a/r1/a;
+
+    :goto_0
+    const-string v1, "element"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v0, Ll0/a/r1/a;->a:[Ljava/lang/Object;
+
+    iget v1, v0, Ll0/a/r1/a;->c:I
+
+    aput-object p1, v2, v1
+
+    add-int/lit8 v1, v1, 0x1
+
+    array-length p1, v2
+
+    add-int/lit8 p1, p1, -0x1
+
+    and-int/2addr p1, v1
+
+    iput p1, v0, Ll0/a/r1/a;->c:I
+
+    iget v5, v0, Ll0/a/r1/a;->b:I
+
+    if-ne p1, v5, :cond_1
+
+    array-length p1, v2
+
+    shl-int/lit8 v1, p1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0xa
+
+    move-object v3, v1
+
+    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->copyInto$default([Ljava/lang/Object;[Ljava/lang/Object;IIII)[Ljava/lang/Object;
+
+    iget-object v6, v0, Ll0/a/r1/a;->a:[Ljava/lang/Object;
+
+    array-length v2, v6
+
+    iget v10, v0, Ll0/a/r1/a;->b:I
+
+    sub-int v8, v2, v10
+
+    const/4 v9, 0x0
+
+    const/4 v11, 0x4
+
+    move-object v7, v1
+
+    invoke-static/range {v6 .. v11}, Lf/n/a/k/a;->copyInto$default([Ljava/lang/Object;[Ljava/lang/Object;IIII)[Ljava/lang/Object;
+
+    iput-object v1, v0, Ll0/a/r1/a;->a:[Ljava/lang/Object;
+
+    const/4 v1, 0x0
+
+    iput v1, v0, Ll0/a/r1/a;->b:I
+
+    iput p1, v0, Ll0/a/r1/a;->c:I
+
+    :cond_1
+    return-void
+.end method
+
+.method public final z(Z)V
+    .locals 4
+
+    iget-wide v0, p0, Ll0/a/n0;->d:J
+
+    invoke-virtual {p0, p1}, Ll0/a/n0;->w(Z)J
+
+    move-result-wide v2
+
+    add-long/2addr v2, v0
+
+    iput-wide v2, p0, Ll0/a/n0;->d:J
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ll0/a/n0;->e:Z
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/n1.smali b/com.discord/smali_classes2/l0/a/n1.smali
new file mode 100644
index 0000000000..c3d6186e2e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/n1.smali
@@ -0,0 +1,67 @@
+.class public final Ll0/a/n1;
+.super Ljava/lang/Object;
+.source "EventLoop.common.kt"
+
+
+# static fields
+.field public static final a:Ljava/lang/ThreadLocal;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/ThreadLocal<",
+            "Ll0/a/n0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final b:Ll0/a/n1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/ThreadLocal;
+
+    invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
+
+    sput-object v0, Ll0/a/n1;->a:Ljava/lang/ThreadLocal;
+
+    return-void
+.end method
+
+.method public static final a()Ll0/a/n0;
+    .locals 3
+
+    sget-object v0, Ll0/a/n1;->a:Ljava/lang/ThreadLocal;
+
+    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ll0/a/n0;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ll0/a/c;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "Thread.currentThread()"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, v1}, Ll0/a/c;-><init>(Ljava/lang/Thread;)V
+
+    sget-object v1, Ll0/a/n1;->a:Ljava/lang/ThreadLocal;
+
+    invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/o.smali b/com.discord/smali_classes2/l0/a/o.smali
new file mode 100644
index 0000000000..3f6c184f1a
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/o.smali
@@ -0,0 +1,6 @@
+.class public interface abstract Ll0/a/o;
+.super Ljava/lang/Object;
+.source "CompletableJob.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/Job;
diff --git a/com.discord/smali_classes2/l0/a/o0$a.smali b/com.discord/smali_classes2/l0/a/o0$a.smali
new file mode 100644
index 0000000000..0ef6960ae4
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/o0$a.smali
@@ -0,0 +1,99 @@
+.class public final Ll0/a/o0$a;
+.super Ll0/a/o0$b;
+.source "EventLoop.common.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/o0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final g:Ll0/a/f;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ll0/a/f<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic h:Ll0/a/o0;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/o0;JLl0/a/f;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Ll0/a/f<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "cont"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Ll0/a/o0$a;->h:Ll0/a/o0;
+
+    invoke-direct {p0, p2, p3}, Ll0/a/o0$b;-><init>(J)V
+
+    iput-object p4, p0, Ll0/a/o0$a;->g:Ll0/a/f;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 3
+
+    iget-object v0, p0, Ll0/a/o0$a;->g:Ll0/a/f;
+
+    iget-object v1, p0, Ll0/a/o0$a;->h:Ll0/a/o0;
+
+    sget-object v2, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    invoke-interface {v0, v1, v2}, Ll0/a/f;->c(Ll0/a/v;Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-super {p0}, Ll0/a/o0$b;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ll0/a/o0$a;->g:Ll0/a/f;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/o0$b.smali b/com.discord/smali_classes2/l0/a/o0$b.smali
new file mode 100644
index 0000000000..69df5c9ccf
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/o0$b.smali
@@ -0,0 +1,319 @@
+.class public abstract Ll0/a/o0$b;
+.super Ljava/lang/Object;
+.source "EventLoop.common.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+.implements Ljava/lang/Comparable;
+.implements Ll0/a/k0;
+.implements Ll0/a/r1/z;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/o0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/lang/Runnable;",
+        "Ljava/lang/Comparable<",
+        "Ll0/a/o0$b;",
+        ">;",
+        "Ll0/a/k0;",
+        "Ll0/a/r1/z;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Ljava/lang/Object;
+
+.field public e:I
+
+.field public f:J
+
+
+# direct methods
+.method public constructor <init>(J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Ll0/a/o0$b;->f:J
+
+    const/4 p1, -0x1
+
+    iput p1, p0, Ll0/a/o0$b;->e:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public compareTo(Ljava/lang/Object;)I
+    .locals 4
+
+    check-cast p1, Ll0/a/o0$b;
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v0, p0, Ll0/a/o0$b;->f:J
+
+    iget-wide v2, p1, Ll0/a/o0$b;->f:J
+
+    sub-long/2addr v0, v2
+
+    const-wide/16 v2, 0x0
+
+    cmp-long p1, v0, v2
+
+    if-lez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    if-gez p1, :cond_1
+
+    const/4 p1, -0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public final declared-synchronized dispose()V
+    .locals 4
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/o0$b;->d:Ljava/lang/Object;
+
+    sget-object v1, Ll0/a/q0;->a:Ll0/a/r1/v;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-ne v0, v1, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    :try_start_1
+    instance-of v1, v0, Ll0/a/o0$c;
+
+    if-nez v1, :cond_1
+
+    const/4 v0, 0x0
+
+    :cond_1
+    check-cast v0, Ll0/a/o0$c;
+
+    if-eqz v0, :cond_6
+
+    const-string v1, "node"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    monitor-enter v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :try_start_2
+    invoke-interface {p0}, Ll0/a/r1/z;->i()Ll0/a/r1/y;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-interface {p0}, Ll0/a/r1/z;->j()I
+
+    move-result v1
+
+    sget-boolean v3, Ll0/a/b0;->a:Z
+
+    if-eqz v3, :cond_5
+
+    if-ltz v1, :cond_3
+
+    const/4 v2, 0x1
+
+    :cond_3
+    if-eqz v2, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v1
+
+    :cond_5
+    :goto_0
+    invoke-virtual {v0, v1}, Ll0/a/r1/y;->c(I)Ll0/a/r1/z;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :goto_1
+    :try_start_3
+    monitor-exit v0
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+
+    :cond_6
+    :goto_2
+    sget-object v0, Ll0/a/q0;->a:Ll0/a/r1/v;
+
+    iput-object v0, p0, Ll0/a/o0$b;->d:Ljava/lang/Object;
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public f(I)V
+    .locals 0
+
+    iput p1, p0, Ll0/a/o0$b;->e:I
+
+    return-void
+.end method
+
+.method public g(Ll0/a/r1/y;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ll0/a/r1/y<",
+            "*>;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ll0/a/o0$b;->d:Ljava/lang/Object;
+
+    sget-object v1, Ll0/a/q0;->a:Ll0/a/r1/v;
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iput-object p1, p0, Ll0/a/o0$b;->d:Ljava/lang/Object;
+
+    return-void
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Failed requirement."
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public i()Ll0/a/r1/y;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ll0/a/r1/y<",
+            "*>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ll0/a/o0$b;->d:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/r1/y;
+
+    if-nez v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    check-cast v0, Ll0/a/r1/y;
+
+    return-object v0
+.end method
+
+.method public j()I
+    .locals 1
+
+    iget v0, p0, Ll0/a/o0$b;->e:I
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "Delayed[nanos="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-wide v1, p0, Ll0/a/o0$b;->f:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/o0$c.smali b/com.discord/smali_classes2/l0/a/o0$c.smali
new file mode 100644
index 0000000000..704937ec4e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/o0$c.smali
@@ -0,0 +1,38 @@
+.class public final Ll0/a/o0$c;
+.super Ll0/a/r1/y;
+.source "EventLoop.common.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/o0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/r1/y<",
+        "Ll0/a/o0$b;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public b:J
+
+
+# direct methods
+.method public constructor <init>(J)V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/r1/y;-><init>()V
+
+    iput-wide p1, p0, Ll0/a/o0$c;->b:J
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/o0.smali b/com.discord/smali_classes2/l0/a/o0.smali
new file mode 100644
index 0000000000..19fafab685
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/o0.smali
@@ -0,0 +1,1118 @@
+.class public abstract Ll0/a/o0;
+.super Ll0/a/p0;
+.source "EventLoop.common.kt"
+
+# interfaces
+.implements Ll0/a/e0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ll0/a/o0$b;,
+        Ll0/a/o0$a;,
+        Ll0/a/o0$c;
+    }
+.end annotation
+
+
+# static fields
+.field public static final g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+.field public static final h:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
+# instance fields
+.field public volatile _delayed:Ljava/lang/Object;
+
+.field public volatile _queue:Ljava/lang/Object;
+
+.field public volatile isCompleted:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ljava/lang/Object;
+
+    const-class v1, Ll0/a/o0;
+
+    const-string v2, "_queue"
+
+    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v2
+
+    sput-object v2, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const-string v2, "_delayed"
+
+    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/o0;->h:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ll0/a/p0;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ll0/a/o0;->_queue:Ljava/lang/Object;
+
+    iput-object v0, p0, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final F(Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "task"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Ll0/a/o0;->G(Ljava/lang/Runnable;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Ll0/a/p0;->D()Ljava/lang/Thread;
+
+    move-result-object p1
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    if-eq v0, p1, :cond_1
+
+    invoke-static {p1}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Ll0/a/c0;->j:Ll0/a/c0;
+
+    invoke-virtual {v0, p1}, Ll0/a/o0;->F(Ljava/lang/Runnable;)V
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public final G(Ljava/lang/Runnable;)Z
+    .locals 5
+
+    :cond_0
+    :goto_0
+    iget-object v0, p0, Ll0/a/o0;->_queue:Ljava/lang/Object;
+
+    iget-boolean v1, p0, Ll0/a/o0;->isCompleted:Z
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    return v2
+
+    :cond_1
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_2
+
+    sget-object v0, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_2
+    instance-of v3, v0, Ll0/a/r1/o;
+
+    if-eqz v3, :cond_6
+
+    move-object v3, v0
+
+    check-cast v3, Ll0/a/r1/o;
+
+    invoke-virtual {v3, p1}, Ll0/a/r1/o;->b(Ljava/lang/Object;)I
+
+    move-result v4
+
+    if-eqz v4, :cond_5
+
+    if-eq v4, v1, :cond_4
+
+    const/4 v0, 0x2
+
+    if-eq v4, v0, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    return v2
+
+    :cond_4
+    sget-object v1, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object v2
+
+    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_5
+    return v1
+
+    :cond_6
+    sget-object v3, Ll0/a/q0;->b:Ll0/a/r1/v;
+
+    if-ne v0, v3, :cond_7
+
+    return v2
+
+    :cond_7
+    new-instance v2, Ll0/a/r1/o;
+
+    const/16 v3, 0x8
+
+    invoke-direct {v2, v3, v1}, Ll0/a/r1/o;-><init>(IZ)V
+
+    move-object v3, v0
+
+    check-cast v3, Ljava/lang/Runnable;
+
+    invoke-virtual {v2, v3}, Ll0/a/r1/o;->b(Ljava/lang/Object;)I
+
+    invoke-virtual {v2, p1}, Ll0/a/r1/o;->b(Ljava/lang/Object;)I
+
+    sget-object v3, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return v1
+.end method
+
+.method public I()J
+    .locals 7
+
+    iget-object v0, p0, Ll0/a/n0;->f:Ll0/a/r1/a;
+
+    const-wide v1, 0x7fffffffffffffffL
+
+    const-wide/16 v3, 0x0
+
+    if-eqz v0, :cond_2
+
+    iget v5, v0, Ll0/a/r1/a;->b:I
+
+    iget v0, v0, Ll0/a/r1/a;->c:I
+
+    if-ne v5, v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    move-wide v5, v3
+
+    goto :goto_2
+
+    :cond_2
+    :goto_1
+    move-wide v5, v1
+
+    :goto_2
+    cmp-long v0, v5, v3
+
+    if-nez v0, :cond_3
+
+    return-wide v3
+
+    :cond_3
+    iget-object v0, p0, Ll0/a/o0;->_queue:Ljava/lang/Object;
+
+    if-nez v0, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    instance-of v5, v0, Ll0/a/r1/o;
+
+    if-eqz v5, :cond_8
+
+    check-cast v0, Ll0/a/r1/o;
+
+    invoke-virtual {v0}, Ll0/a/r1/o;->d()Z
+
+    move-result v0
+
+    if-nez v0, :cond_5
+
+    return-wide v3
+
+    :cond_5
+    :goto_3
+    iget-object v0, p0, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/o0$c;
+
+    if-eqz v0, :cond_7
+
+    monitor-enter v0
+
+    :try_start_0
+    invoke-virtual {v0}, Ll0/a/r1/y;->b()Ll0/a/r1/z;
+
+    move-result-object v5
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    check-cast v5, Ll0/a/o0$b;
+
+    if-eqz v5, :cond_7
+
+    iget-wide v0, v5, Ll0/a/o0$b;->f:J
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v5
+
+    sub-long/2addr v0, v5
+
+    cmp-long v2, v0, v3
+
+    if-gez v2, :cond_6
+
+    goto :goto_4
+
+    :cond_6
+    move-wide v3, v0
+
+    :goto_4
+    return-wide v3
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+
+    :cond_7
+    return-wide v1
+
+    :cond_8
+    sget-object v5, Ll0/a/q0;->b:Ll0/a/r1/v;
+
+    if-ne v0, v5, :cond_9
+
+    return-wide v1
+
+    :cond_9
+    return-wide v3
+.end method
+
+.method public K()Z
+    .locals 4
+
+    iget-object v0, p0, Ll0/a/n0;->f:Ll0/a/r1/a;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
+
+    iget v3, v0, Ll0/a/r1/a;->b:I
+
+    iget v0, v0, Ll0/a/r1/a;->c:I
+
+    if-ne v3, 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
+
+    return v2
+
+    :cond_2
+    iget-object v0, p0, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/o0$c;
+
+    if-eqz v0, :cond_4
+
+    iget v0, v0, Ll0/a/r1/y;->_size:I
+
+    if-nez v0, :cond_3
+
+    const/4 v0, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :goto_2
+    if-nez v0, :cond_4
+
+    return v2
+
+    :cond_4
+    iget-object v0, p0, Ll0/a/o0;->_queue:Ljava/lang/Object;
+
+    if-nez v0, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    instance-of v3, v0, Ll0/a/r1/o;
+
+    if-eqz v3, :cond_6
+
+    check-cast v0, Ll0/a/r1/o;
+
+    invoke-virtual {v0}, Ll0/a/r1/o;->d()Z
+
+    move-result v1
+
+    goto :goto_3
+
+    :cond_6
+    sget-object v3, Ll0/a/q0;->b:Ll0/a/r1/v;
+
+    if-ne v0, v3, :cond_7
+
+    goto :goto_3
+
+    :cond_7
+    const/4 v1, 0x0
+
+    :goto_3
+    return v1
+.end method
+
+.method public L()J
+    .locals 16
+
+    move-object/from16 v1, p0
+
+    invoke-virtual/range {p0 .. p0}, Ll0/a/n0;->C()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual/range {p0 .. p0}, Ll0/a/o0;->I()J
+
+    move-result-wide v2
+
+    return-wide v2
+
+    :cond_0
+    iget-object v0, v1, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    move-object v2, v0
+
+    check-cast v2, Ll0/a/o0$c;
+
+    const/4 v0, 0x0
+
+    const-wide/16 v3, 0x0
+
+    const/4 v5, 0x0
+
+    if-eqz v2, :cond_6
+
+    iget v6, v2, Ll0/a/r1/y;->_size:I
+
+    const/4 v7, 0x1
+
+    if-nez v6, :cond_1
+
+    const/4 v6, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v6, 0x0
+
+    :goto_0
+    if-nez v6, :cond_6
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v8
+
+    :goto_1
+    monitor-enter v2
+
+    :try_start_0
+    invoke-virtual {v2}, Ll0/a/r1/y;->b()Ll0/a/r1/z;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_5
+
+    check-cast v6, Ll0/a/o0$b;
+
+    iget-wide v10, v6, Ll0/a/o0$b;->f:J
+
+    sub-long v10, v8, v10
+
+    cmp-long v12, v10, v3
+
+    if-ltz v12, :cond_2
+
+    const/4 v10, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v10, 0x0
+
+    :goto_2
+    if-eqz v10, :cond_3
+
+    invoke-virtual {v1, v6}, Ll0/a/o0;->G(Ljava/lang/Runnable;)Z
+
+    move-result v6
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v6, 0x0
+
+    :goto_3
+    if-eqz v6, :cond_4
+
+    invoke-virtual {v2, v5}, Ll0/a/r1/y;->c(I)Ll0/a/r1/z;
+
+    move-result-object v6
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_4
+
+    :cond_4
+    move-object v6, v0
+
+    :goto_4
+    monitor-exit v2
+
+    goto :goto_5
+
+    :cond_5
+    monitor-exit v2
+
+    move-object v6, v0
+
+    :goto_5
+    check-cast v6, Ll0/a/o0$b;
+
+    if-eqz v6, :cond_6
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v2
+
+    throw v0
+
+    :cond_6
+    :goto_6
+    iget-object v2, v1, Ll0/a/o0;->_queue:Ljava/lang/Object;
+
+    if-nez v2, :cond_7
+
+    goto/16 :goto_c
+
+    :cond_7
+    instance-of v6, v2, Ll0/a/r1/o;
+
+    if-eqz v6, :cond_11
+
+    move-object v6, v2
+
+    check-cast v6, Ll0/a/r1/o;
+
+    :cond_8
+    :goto_7
+    iget-wide v9, v6, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/high16 v7, 0x1000000000000000L
+
+    and-long/2addr v7, v9
+
+    cmp-long v11, v7, v3
+
+    if-eqz v11, :cond_9
+
+    sget-object v7, Ll0/a/r1/o;->g:Ll0/a/r1/v;
+
+    goto :goto_9
+
+    :cond_9
+    const-wide/32 v7, 0x3fffffff
+
+    and-long/2addr v7, v9
+
+    shr-long/2addr v7, v5
+
+    long-to-int v13, v7
+
+    const-wide v7, 0xfffffffc0000000L
+
+    and-long/2addr v7, v9
+
+    const/16 v11, 0x1e
+
+    shr-long/2addr v7, v11
+
+    long-to-int v8, v7
+
+    iget v7, v6, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v8, v7
+
+    and-int/2addr v7, v13
+
+    if-ne v8, v7, :cond_a
+
+    goto :goto_8
+
+    :cond_a
+    iget-object v8, v6, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v8, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v14
+
+    if-nez v14, :cond_b
+
+    iget-boolean v7, v6, Ll0/a/r1/o;->d:Z
+
+    if-eqz v7, :cond_8
+
+    goto :goto_8
+
+    :cond_b
+    instance-of v7, v14, Ll0/a/r1/o$b;
+
+    if-eqz v7, :cond_c
+
+    :goto_8
+    move-object v7, v0
+
+    :goto_9
+    move-object v14, v7
+
+    goto :goto_b
+
+    :cond_c
+    add-int/lit8 v7, v13, 0x1
+
+    const v8, 0x3fffffff    # 1.9999999f
+
+    and-int v15, v7, v8
+
+    sget-object v7, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    const-wide/32 v11, -0x40000000
+
+    and-long/2addr v11, v9
+
+    int-to-long v3, v15
+
+    shl-long/2addr v3, v5
+
+    or-long/2addr v11, v3
+
+    move-object v8, v6
+
+    invoke-virtual/range {v7 .. v12}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_d
+
+    iget-object v3, v6, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v4, v6, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v4, v13
+
+    invoke-virtual {v3, v4, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    goto :goto_b
+
+    :cond_d
+    iget-boolean v3, v6, Ll0/a/r1/o;->d:Z
+
+    if-nez v3, :cond_e
+
+    const-wide/16 v3, 0x0
+
+    goto :goto_7
+
+    :cond_e
+    move-object v3, v6
+
+    :goto_a
+    invoke-static {v3, v13, v15}, Ll0/a/r1/o;->a(Ll0/a/r1/o;II)Ll0/a/r1/o;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_f
+
+    goto :goto_a
+
+    :cond_f
+    :goto_b
+    sget-object v3, Ll0/a/r1/o;->g:Ll0/a/r1/v;
+
+    if-eq v14, v3, :cond_10
+
+    move-object v0, v14
+
+    check-cast v0, Ljava/lang/Runnable;
+
+    goto :goto_c
+
+    :cond_10
+    sget-object v3, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v6}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v1, v2, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_d
+
+    :cond_11
+    sget-object v3, Ll0/a/q0;->b:Ll0/a/r1/v;
+
+    if-ne v2, v3, :cond_12
+
+    goto :goto_c
+
+    :cond_12
+    sget-object v3, Ll0/a/o0;->g:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3, v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_14
+
+    move-object v0, v2
+
+    check-cast v0, Ljava/lang/Runnable;
+
+    :goto_c
+    if-eqz v0, :cond_13
+
+    invoke-interface {v0}, Ljava/lang/Runnable;->run()V
+
+    :cond_13
+    invoke-virtual/range {p0 .. p0}, Ll0/a/o0;->I()J
+
+    move-result-wide v2
+
+    return-wide v2
+
+    :cond_14
+    :goto_d
+    const-wide/16 v3, 0x0
+
+    goto/16 :goto_6
+.end method
+
+.method public final M(JLl0/a/o0$b;)V
+    .locals 12
+
+    const-string v0, "delayedTask"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Ll0/a/o0;->isCompleted:Z
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v0, p0, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/o0$c;
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v0, Ll0/a/o0;->h:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    new-instance v5, Ll0/a/o0$c;
+
+    invoke-direct {v5, p1, p2}, Ll0/a/o0$c;-><init>(J)V
+
+    invoke-virtual {v0, p0, v1, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    iget-object v0, p0, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    if-eqz v0, :cond_e
+
+    check-cast v0, Ll0/a/o0$c;
+
+    :goto_0
+    monitor-enter p3
+
+    :try_start_0
+    const-string v5, "delayed"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "eventLoop"
+
+    invoke-static {p0, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v5, p3, Ll0/a/o0$b;->d:Ljava/lang/Object;
+
+    sget-object v6, Ll0/a/q0;->a:Ll0/a/r1/v;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    if-ne v5, v6, :cond_2
+
+    monitor-exit p3
+
+    const/4 v0, 0x2
+
+    goto :goto_3
+
+    :cond_2
+    :try_start_1
+    monitor-enter v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+
+    :try_start_2
+    invoke-virtual {v0}, Ll0/a/r1/y;->b()Ll0/a/r1/z;
+
+    move-result-object v5
+
+    check-cast v5, Ll0/a/o0$b;
+
+    iget-boolean v6, p0, Ll0/a/o0;->isCompleted:Z
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-eqz v6, :cond_3
+
+    :try_start_3
+    monitor-exit v0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    monitor-exit p3
+
+    :goto_1
+    const/4 v0, 0x1
+
+    goto :goto_3
+
+    :cond_3
+    const-wide/16 v6, 0x0
+
+    if-nez v5, :cond_4
+
+    :try_start_4
+    iput-wide p1, v0, Ll0/a/o0$c;->b:J
+
+    goto :goto_2
+
+    :cond_4
+    iget-wide v8, v5, Ll0/a/o0$b;->f:J
+
+    sub-long v10, v8, p1
+
+    cmp-long v5, v10, v6
+
+    if-ltz v5, :cond_5
+
+    move-wide v8, p1
+
+    :cond_5
+    iget-wide v10, v0, Ll0/a/o0$c;->b:J
+
+    sub-long v10, v8, v10
+
+    cmp-long v5, v10, v6
+
+    if-lez v5, :cond_6
+
+    iput-wide v8, v0, Ll0/a/o0$c;->b:J
+
+    :cond_6
+    :goto_2
+    iget-wide v8, p3, Ll0/a/o0$b;->f:J
+
+    iget-wide v10, v0, Ll0/a/o0$c;->b:J
+
+    sub-long/2addr v8, v10
+
+    cmp-long v5, v8, v6
+
+    if-gez v5, :cond_7
+
+    iget-wide v5, v0, Ll0/a/o0$c;->b:J
+
+    iput-wide v5, p3, Ll0/a/o0$b;->f:J
+
+    :cond_7
+    invoke-virtual {v0, p3}, Ll0/a/r1/y;->a(Ll0/a/r1/z;)V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :try_start_5
+    monitor-exit v0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+
+    monitor-exit p3
+
+    const/4 v0, 0x0
+
+    :goto_3
+    if-eqz v0, :cond_a
+
+    if-eq v0, v4, :cond_9
+
+    if-ne v0, v2, :cond_8
+
+    goto :goto_5
+
+    :cond_8
+    const-string p1, "unexpected result"
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_9
+    invoke-virtual {p0, p1, p2, p3}, Ll0/a/p0;->E(JLl0/a/o0$b;)V
+
+    goto :goto_5
+
+    :cond_a
+    iget-object p1, p0, Ll0/a/o0;->_delayed:Ljava/lang/Object;
+
+    check-cast p1, Ll0/a/o0$c;
+
+    if-eqz p1, :cond_b
+
+    monitor-enter p1
+
+    :try_start_6
+    invoke-virtual {p1}, Ll0/a/r1/y;->b()Ll0/a/r1/z;
+
+    move-result-object p2
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_0
+
+    monitor-exit p1
+
+    move-object v1, p2
+
+    check-cast v1, Ll0/a/o0$b;
+
+    goto :goto_4
+
+    :catchall_0
+    move-exception p2
+
+    monitor-exit p1
+
+    throw p2
+
+    :cond_b
+    :goto_4
+    if-ne v1, p3, :cond_c
+
+    const/4 v3, 0x1
+
+    :cond_c
+    if-eqz v3, :cond_d
+
+    invoke-virtual {p0}, Ll0/a/p0;->D()Ljava/lang/Thread;
+
+    move-result-object p1
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object p2
+
+    if-eq p2, p1, :cond_d
+
+    invoke-static {p1}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
+
+    :cond_d
+    :goto_5
+    return-void
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_7
+    monitor-exit v0
+
+    throw p1
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
+
+    :catchall_2
+    move-exception p1
+
+    monitor-exit p3
+
+    throw p1
+
+    :cond_e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public b(JLl0/a/f;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Ll0/a/f<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "continuation"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p2}, Ll0/a/q0;->a(J)J
+
+    move-result-wide p1
+
+    const-wide v0, 0x3fffffffffffffffL    # 1.9999999999999998
+
+    cmp-long v2, p1, v0
+
+    if-gez v2, :cond_0
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v0
+
+    new-instance v2, Ll0/a/o0$a;
+
+    add-long/2addr p1, v0
+
+    invoke-direct {v2, p0, p1, p2, p3}, Ll0/a/o0$a;-><init>(Ll0/a/o0;JLl0/a/f;)V
+
+    const-string p1, "$this$disposeOnCancellation"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "handle"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Ll0/a/l0;
+
+    invoke-direct {p1, v2}, Ll0/a/l0;-><init>(Ll0/a/k0;)V
+
+    invoke-interface {p3, p1}, Ll0/a/f;->b(Lkotlin/jvm/functions/Function1;)V
+
+    invoke-virtual {p0, v0, v1, v2}, Ll0/a/o0;->M(JLl0/a/o0$b;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public final dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p2}, Ll0/a/o0;->F(Ljava/lang/Runnable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/o1.smali b/com.discord/smali_classes2/l0/a/o1.smali
new file mode 100644
index 0000000000..0f8c494570
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/o1.smali
@@ -0,0 +1,69 @@
+.class public final Ll0/a/o1;
+.super Ll0/a/v;
+.source "Unconfined.kt"
+
+
+# static fields
+.field public static final d:Ll0/a/o1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/o1;
+
+    invoke-direct {v0}, Ll0/a/o1;-><init>()V
+
+    sput-object v0, Ll0/a/o1;->d:Ll0/a/o1;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/v;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "Unconfined"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/p.smali b/com.discord/smali_classes2/l0/a/p.smali
new file mode 100644
index 0000000000..8023a0db32
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/p.smali
@@ -0,0 +1,104 @@
+.class public Ll0/a/p;
+.super Ljava/lang/Object;
+.source "CompletedExceptionally.kt"
+
+
+# static fields
+.field public static final b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field public volatile _handled:I
+
+.field public final a:Ljava/lang/Throwable;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ll0/a/p;
+
+    const-string v1, "_handled"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/p;->b:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Throwable;Z)V
+    .locals 1
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    iput p2, p0, Ll0/a/p;->_handled:I
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Throwable;ZI)V
+    .locals 0
+
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    const-string p3, "cause"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    iput p2, p0, Ll0/a/p;->_handled:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5b
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/p0.smali b/com.discord/smali_classes2/l0/a/p0.smali
new file mode 100644
index 0000000000..dc4e0ce7be
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/p0.smali
@@ -0,0 +1,61 @@
+.class public abstract Ll0/a/p0;
+.super Ll0/a/n0;
+.source "EventLoop.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/n0;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract D()Ljava/lang/Thread;
+.end method
+
+.method public final E(JLl0/a/o0$b;)V
+    .locals 1
+
+    const-string v0, "delayedTask"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    if-eqz v0, :cond_2
+
+    sget-object v0, Ll0/a/c0;->j:Ll0/a/c0;
+
+    if-eq p0, v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_2
+    :goto_1
+    sget-object v0, Ll0/a/c0;->j:Ll0/a/c0;
+
+    invoke-virtual {v0, p1, p2, p3}, Ll0/a/o0;->M(JLl0/a/o0$b;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/p1.smali b/com.discord/smali_classes2/l0/a/p1.smali
new file mode 100644
index 0000000000..2d45fed2d0
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/p1.smali
@@ -0,0 +1,51 @@
+.class public final Ll0/a/p1;
+.super Ll0/a/r1/t;
+.source "Builders.common.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/r1/t<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext;",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "uCont"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Ll0/a/r1/t;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public P()I
+    .locals 1
+
+    const/4 v0, 0x3
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/q.smali b/com.discord/smali_classes2/l0/a/q.smali
new file mode 100644
index 0000000000..7350c7d3ee
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/q.smali
@@ -0,0 +1,17 @@
+.class public final Ll0/a/q;
+.super Ljava/lang/Object;
+.source "CancellableContinuationImpl.kt"
+
+
+# instance fields
+.field public final a:Ljava/lang/Object;
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "CompletedIdempotentResult[null]"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/q0.smali b/com.discord/smali_classes2/l0/a/q0.smali
new file mode 100644
index 0000000000..e861cf26c9
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/q0.smali
@@ -0,0 +1,64 @@
+.class public final Ll0/a/q0;
+.super Ljava/lang/Object;
+.source "EventLoop.common.kt"
+
+
+# static fields
+.field public static final a:Ll0/a/r1/v;
+
+.field public static final b:Ll0/a/r1/v;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "REMOVED_TASK"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/q0;->a:Ll0/a/r1/v;
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "CLOSED_EMPTY"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/q0;->b:Ll0/a/r1/v;
+
+    return-void
+.end method
+
+.method public static final a(J)J
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p0, v0
+
+    if-gtz v2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-wide v0, 0x8637bd05af6L
+
+    cmp-long v2, p0, v0
+
+    if-ltz v2, :cond_1
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    goto :goto_0
+
+    :cond_1
+    const-wide/32 v0, 0xf4240
+
+    mul-long v0, v0, p0
+
+    :goto_0
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/q1/a$a.smali b/com.discord/smali_classes2/l0/a/q1/a$a.smali
new file mode 100644
index 0000000000..5f60c6c101
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/q1/a$a.smali
@@ -0,0 +1,53 @@
+.class public final Ll0/a/q1/a$a;
+.super Ljava/lang/Object;
+.source "Runnable.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ll0/a/q1/a;->b(JLl0/a/f;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ll0/a/q1/a;
+
+.field public final synthetic e:Ll0/a/f;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/q1/a;Ll0/a/f;)V
+    .locals 0
+
+    iput-object p1, p0, Ll0/a/q1/a$a;->d:Ll0/a/q1/a;
+
+    iput-object p2, p0, Ll0/a/q1/a$a;->e:Ll0/a/f;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 3
+
+    iget-object v0, p0, Ll0/a/q1/a$a;->e:Ll0/a/f;
+
+    iget-object v1, p0, Ll0/a/q1/a$a;->d:Ll0/a/q1/a;
+
+    sget-object v2, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    invoke-interface {v0, v1, v2}, Ll0/a/f;->c(Ll0/a/v;Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/q1/a$b.smali b/com.discord/smali_classes2/l0/a/q1/a$b.smali
new file mode 100644
index 0000000000..39ea7ab642
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/q1/a$b.smali
@@ -0,0 +1,69 @@
+.class public final Ll0/a/q1/a$b;
+.super Lk0/o/c/j;
+.source "HandlerDispatcher.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ll0/a/q1/a;->b(JLl0/a/f;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Throwable;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $block:Ljava/lang/Runnable;
+
+.field public final synthetic this$0:Ll0/a/q1/a;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/q1/a;Ljava/lang/Runnable;)V
+    .locals 0
+
+    iput-object p1, p0, Ll0/a/q1/a$b;->this$0:Ll0/a/q1/a;
+
+    iput-object p2, p0, Ll0/a/q1/a$b;->$block:Ljava/lang/Runnable;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    iget-object p1, p0, Ll0/a/q1/a$b;->this$0:Ll0/a/q1/a;
+
+    iget-object p1, p1, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    iget-object v0, p0, Ll0/a/q1/a$b;->$block:Ljava/lang/Runnable;
+
+    invoke-virtual {p1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/q1/a.smali b/com.discord/smali_classes2/l0/a/q1/a.smali
new file mode 100644
index 0000000000..e2015e86c1
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/q1/a.smali
@@ -0,0 +1,252 @@
+.class public final Ll0/a/q1/a;
+.super Ll0/a/q1/b;
+.source "HandlerDispatcher.kt"
+
+# interfaces
+.implements Ll0/a/e0;
+
+
+# instance fields
+.field public volatile _immediate:Ll0/a/q1/a;
+
+.field public final d:Ll0/a/q1/a;
+
+.field public final e:Landroid/os/Handler;
+
+.field public final f:Ljava/lang/String;
+
+.field public final g:Z
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/Handler;Ljava/lang/String;Z)V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Ll0/a/q1/b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    iput-object p1, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    iput-object p2, p0, Ll0/a/q1/a;->f:Ljava/lang/String;
+
+    iput-boolean p3, p0, Ll0/a/q1/a;->g:Z
+
+    if-eqz p3, :cond_0
+
+    move-object v0, p0
+
+    :cond_0
+    iput-object v0, p0, Ll0/a/q1/a;->_immediate:Ll0/a/q1/a;
+
+    iget-object p1, p0, Ll0/a/q1/a;->_immediate:Ll0/a/q1/a;
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ll0/a/q1/a;
+
+    iget-object p2, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    iget-object p3, p0, Ll0/a/q1/a;->f:Ljava/lang/String;
+
+    const/4 v0, 0x1
+
+    invoke-direct {p1, p2, p3, v0}, Ll0/a/q1/a;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
+
+    iput-object p1, p0, Ll0/a/q1/a;->_immediate:Ll0/a/q1/a;
+
+    :goto_0
+    iput-object p1, p0, Ll0/a/q1/a;->d:Ll0/a/q1/a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public b(JLl0/a/f;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Ll0/a/f<",
+            "-",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "continuation"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ll0/a/q1/a$a;
+
+    invoke-direct {v0, p0, p3}, Ll0/a/q1/a$a;-><init>(Ll0/a/q1/a;Ll0/a/f;)V
+
+    iget-object v1, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    const-wide v2, 0x3fffffffffffffffL    # 1.9999999999999998
+
+    invoke-static {p1, p2, v2, v3}, Lk0/r/f;->coerceAtMost(JJ)J
+
+    move-result-wide p1
+
+    invoke-virtual {v1, v0, p1, p2}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
+
+    new-instance p1, Ll0/a/q1/a$b;
+
+    invoke-direct {p1, p0, v0}, Ll0/a/q1/a$b;-><init>(Ll0/a/q1/a;Ljava/lang/Runnable;)V
+
+    invoke-interface {p3, p1}, Ll0/a/f;->b(Lkotlin/jvm/functions/Function1;)V
+
+    return-void
+.end method
+
+.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    invoke-virtual {p1, p2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Ll0/a/q1/a;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ll0/a/q1/a;
+
+    iget-object p1, p1, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    iget-object v0, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    invoke-static {v0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean p1, p0, Ll0/a/q1/a;->g:Z
+
+    const/4 v0, 0x1
+
+    if-eqz p1, :cond_1
+
+    invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
+
+    move-result-object p1
+
+    iget-object v1, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    invoke-virtual {v1}, Landroid/os/Handler;->getLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    xor-int/2addr p1, v0
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :cond_1
+    :goto_0
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    iget-object v0, p0, Ll0/a/q1/a;->f:Ljava/lang/String;
+
+    if-eqz v0, :cond_0
+
+    iget-boolean v1, p0, Ll0/a/q1/a;->g:Z
+
+    if-eqz v1, :cond_1
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Ll0/a/q1/a;->f:Ljava/lang/String;
+
+    const-string v2, " [immediate]"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Ll0/a/q1/a;->e:Landroid/os/Handler;
+
+    invoke-virtual {v0}, Landroid/os/Handler;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "handler.toString()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_1
+    :goto_0
+    return-object v0
+.end method
+
+.method public v()Ll0/a/f1;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/q1/a;->d:Ll0/a/q1/a;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/q1/b.smali b/com.discord/smali_classes2/l0/a/q1/b.smali
new file mode 100644
index 0000000000..86b6dcac13
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/q1/b.smali
@@ -0,0 +1,24 @@
+.class public abstract Ll0/a/q1/b;
+.super Ll0/a/f1;
+.source "HandlerDispatcher.kt"
+
+# interfaces
+.implements Ll0/a/e0;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/f1;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/f1;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/q1/c.smali b/com.discord/smali_classes2/l0/a/q1/c.smali
new file mode 100644
index 0000000000..33ea8a9f1b
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/q1/c.smali
@@ -0,0 +1,188 @@
+.class public final Ll0/a/q1/c;
+.super Ljava/lang/Object;
+.source "HandlerDispatcher.kt"
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    :try_start_0
+    new-instance v0, Ll0/a/q1/a;
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    const-string v2, "Looper.getMainLooper()"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x1
+
+    invoke-static {v1, v2}, Ll0/a/q1/c;->a(Landroid/os/Looper;Z)Landroid/os/Handler;
+
+    move-result-object v1
+
+    const-string v2, "Main"
+
+    const-string v3, "handler"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    invoke-direct {v0, v1, v2, v3}, Ll0/a/q1/a;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_0
+    instance-of v1, v0, Lk0/d$a;
+
+    if-eqz v1, :cond_0
+
+    const/4 v0, 0x0
+
+    :cond_0
+    check-cast v0, Ll0/a/q1/b;
+
+    return-void
+.end method
+
+.method public static final a(Landroid/os/Looper;Z)Landroid/os/Handler;
+    .locals 7
+    .annotation build Landroidx/annotation/VisibleForTesting;
+    .end annotation
+
+    const-string v0, "$this$asHandler"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p1, :cond_2
+
+    sget p1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v0, 0x1c
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-lt p1, v0, :cond_1
+
+    const-class p1, Landroid/os/Handler;
+
+    const-string v0, "createAsync"
+
+    new-array v4, v3, [Ljava/lang/Class;
+
+    const-class v5, Landroid/os/Looper;
+
+    aput-object v5, v4, v2
+
+    invoke-virtual {p1, v0, v4}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    new-array v0, v3, [Ljava/lang/Object;
+
+    aput-object p0, v0, v2
+
+    invoke-virtual {p1, v1, v0}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_0
+
+    check-cast p0, Landroid/os/Handler;
+
+    return-object p0
+
+    :cond_0
+    new-instance p0, Lkotlin/TypeCastException;
+
+    const-string p1, "null cannot be cast to non-null type android.os.Handler"
+
+    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_1
+    :try_start_0
+    const-class p1, Landroid/os/Handler;
+
+    const/4 v0, 0x3
+
+    new-array v4, v0, [Ljava/lang/Class;
+
+    const-class v5, Landroid/os/Looper;
+
+    aput-object v5, v4, v2
+
+    const-class v5, Landroid/os/Handler$Callback;
+
+    aput-object v5, v4, v3
+
+    sget-object v5, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    const/4 v6, 0x2
+
+    aput-object v5, v4, v6
+
+    invoke-virtual {p1, v4}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object p1
+
+    const-string v4, "Handler::class.java.getD\u2026:class.javaPrimitiveType)"
+
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_0
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    aput-object p0, v0, v2
+
+    aput-object v1, v0, v3
+
+    sget-object p0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    aput-object p0, v0, v6
+
+    invoke-virtual {p1, v0}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    const-string p1, "constructor.newInstance(this, null, true)"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p0, Landroid/os/Handler;
+
+    return-object p0
+
+    :catch_0
+    new-instance p1, Landroid/os/Handler;
+
+    invoke-direct {p1, p0}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    return-object p1
+
+    :cond_2
+    new-instance p1, Landroid/os/Handler;
+
+    invoke-direct {p1, p0}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r.smali b/com.discord/smali_classes2/l0/a/r.smali
new file mode 100644
index 0000000000..7421bb7fdd
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r.smali
@@ -0,0 +1,28 @@
+.class public final Ll0/a/r;
+.super Ljava/lang/Object;
+.source "CancellableContinuationImpl.kt"
+
+
+# instance fields
+.field public final a:Ljava/lang/Object;
+
+.field public final b:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "CompletedWithCancellation[null]"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r0.smali b/com.discord/smali_classes2/l0/a/r0.smali
new file mode 100644
index 0000000000..0a06d92d15
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r0.smali
@@ -0,0 +1,16 @@
+.class public abstract Ll0/a/r0;
+.super Ll0/a/v;
+.source "Executors.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/v;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/a.smali b/com.discord/smali_classes2/l0/a/r1/a.smali
new file mode 100644
index 0000000000..7a2a21c596
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/a.smali
@@ -0,0 +1,38 @@
+.class public Ll0/a/r1/a;
+.super Ljava/lang/Object;
+.source "ArrayQueue.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public a:[Ljava/lang/Object;
+
+.field public b:I
+
+.field public c:I
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/16 v0, 0x10
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    iput-object v0, p0, Ll0/a/r1/a;->a:[Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/a0.smali b/com.discord/smali_classes2/l0/a/r1/a0.smali
new file mode 100644
index 0000000000..bb6276d612
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/a0.smali
@@ -0,0 +1,31 @@
+.class public final Ll0/a/r1/a0;
+.super Ljava/lang/Object;
+.source "ThreadContext.kt"
+
+
+# instance fields
+.field public a:[Ljava/lang/Object;
+
+.field public b:I
+
+.field public final c:Lkotlin/coroutines/CoroutineContext;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;I)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/r1/a0;->c:Lkotlin/coroutines/CoroutineContext;
+
+    new-array p1, p2, [Ljava/lang/Object;
+
+    iput-object p1, p0, Ll0/a/r1/a0;->a:[Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/b.smali b/com.discord/smali_classes2/l0/a/r1/b.smali
new file mode 100644
index 0000000000..d160899d8e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/b.smali
@@ -0,0 +1,23 @@
+.class public final Ll0/a/r1/b;
+.super Ljava/lang/Object;
+.source "Atomic.kt"
+
+
+# static fields
+.field public static final a:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "NO_DECISION"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/r1/b;->a:Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/c.smali b/com.discord/smali_classes2/l0/a/r1/c.smali
new file mode 100644
index 0000000000..ffea297e9d
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/c.smali
@@ -0,0 +1,215 @@
+.class public abstract Ll0/a/r1/c;
+.super Ll0/a/r1/r;
+.source "Atomic.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/r1/r;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
+# instance fields
+.field public volatile _consensus:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ll0/a/r1/c;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "_consensus"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/r1/c;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ll0/a/r1/r;-><init>()V
+
+    sget-object v0, Ll0/a/r1/b;->a:Ljava/lang/Object;
+
+    iput-object v0, p0, Ll0/a/r1/c;->_consensus:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 7
+
+    iget-object v0, p0, Ll0/a/r1/c;->_consensus:Ljava/lang/Object;
+
+    sget-object v1, Ll0/a/r1/b;->a:Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    const-string v3, "affected"
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    if-ne v0, v1, :cond_6
+
+    move-object v0, p0
+
+    check-cast v0, Ll0/a/c1$c;
+
+    move-object v1, p1
+
+    check-cast v1, Ll0/a/r1/m;
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v0, Ll0/a/c1$c;->d:Ll0/a/c1;
+
+    invoke-virtual {v1}, Ll0/a/c1;->x()Ljava/lang/Object;
+
+    move-result-object v1
+
+    iget-object v0, v0, Ll0/a/c1$c;->e:Ljava/lang/Object;
+
+    if-ne v1, v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    move-object v0, v2
+
+    goto :goto_1
+
+    :cond_1
+    sget-object v0, Ll0/a/r1/l;->a:Ljava/lang/Object;
+
+    :goto_1
+    sget-boolean v1, Ll0/a/b0;->a:Z
+
+    if-eqz v1, :cond_4
+
+    sget-object v1, Ll0/a/r1/b;->a:Ljava/lang/Object;
+
+    if-eq v0, v1, :cond_2
+
+    const/4 v1, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
+    if-eqz v1, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_4
+    :goto_3
+    sget-object v1, Ll0/a/r1/c;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    sget-object v6, Ll0/a/r1/b;->a:Ljava/lang/Object;
+
+    invoke-virtual {v1, p0, v6, v0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    goto :goto_4
+
+    :cond_5
+    iget-object v0, p0, Ll0/a/r1/c;->_consensus:Ljava/lang/Object;
+
+    :cond_6
+    :goto_4
+    move-object v1, p0
+
+    check-cast v1, Ll0/a/r1/m$a;
+
+    check-cast p1, Ll0/a/r1/m;
+
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez v0, :cond_7
+
+    goto :goto_5
+
+    :cond_7
+    const/4 v4, 0x0
+
+    :goto_5
+    if-eqz v4, :cond_8
+
+    iget-object v3, v1, Ll0/a/r1/m$a;->c:Ll0/a/r1/m;
+
+    goto :goto_6
+
+    :cond_8
+    iget-object v3, v1, Ll0/a/r1/m$a;->b:Ll0/a/r1/m;
+
+    :goto_6
+    if-eqz v3, :cond_a
+
+    sget-object v5, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v5, p1, v1, v3}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_a
+
+    if-eqz v4, :cond_a
+
+    iget-object p1, v1, Ll0/a/r1/m$a;->c:Ll0/a/r1/m;
+
+    iget-object v1, v1, Ll0/a/r1/m$a;->b:Ll0/a/r1/m;
+
+    if-eqz v1, :cond_9
+
+    invoke-virtual {p1, v1}, Ll0/a/r1/m;->c(Ll0/a/r1/m;)V
+
+    goto :goto_7
+
+    :cond_9
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_a
+    :goto_7
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/d.smali b/com.discord/smali_classes2/l0/a/r1/d.smali
new file mode 100644
index 0000000000..3c61fe85fe
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/d.smali
@@ -0,0 +1,58 @@
+.class public final Ll0/a/r1/d;
+.super Ljava/lang/Object;
+.source "Concurrent.kt"
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    :try_start_0
+    const-class v0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    const-string v1, "setRemoveOnCancelPolicy"
+
+    const/4 v2, 0x1
+
+    new-array v2, v2, [Ljava/lang/Class;
+
+    const/4 v3, 0x0
+
+    sget-object v4, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    aput-object v4, v2, v3
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :catchall_0
+    return-void
+.end method
+
+.method public static final a(I)Ljava/util/Set;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Object;",
+            ">(I)",
+            "Ljava/util/Set<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/util/IdentityHashMap;
+
+    invoke-direct {v0, p0}, Ljava/util/IdentityHashMap;-><init>(I)V
+
+    invoke-static {v0}, Ljava/util/Collections;->newSetFromMap(Ljava/util/Map;)Ljava/util/Set;
+
+    move-result-object p0
+
+    const-string v0, "Collections.newSetFromMa\u2026ityHashMap(expectedSize))"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/e.smali b/com.discord/smali_classes2/l0/a/r1/e.smali
new file mode 100644
index 0000000000..5f2bcf3afe
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/e.smali
@@ -0,0 +1,36 @@
+.class public final Ll0/a/r1/e;
+.super Ljava/lang/Object;
+.source "Scopes.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/CoroutineScope;
+
+
+# instance fields
+.field public final d:Lkotlin/coroutines/CoroutineContext;
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/r1/e;->d:Lkotlin/coroutines/CoroutineContext;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/r1/e;->d:Lkotlin/coroutines/CoroutineContext;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/f.smali b/com.discord/smali_classes2/l0/a/r1/f.smali
new file mode 100644
index 0000000000..a7a904837e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/f.smali
@@ -0,0 +1,107 @@
+.class public final Ll0/a/r1/f;
+.super Lk0/o/c/j;
+.source "ExceptionsConstuctor.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Throwable;",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
+    .locals 0
+
+    iput-object p1, p0, Ll0/a/r1/f;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/r1/f;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
+
+    move-result-object v3
+
+    aput-object v3, v1, v2
+
+    const/4 v2, 0x1
+
+    aput-object p1, v1, v2
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Throwable"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    :goto_0
+    instance-of v0, p1, Lk0/d$a;
+
+    if-eqz v0, :cond_1
+
+    const/4 p1, 0x0
+
+    :cond_1
+    check-cast p1, Ljava/lang/Throwable;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/g.smali b/com.discord/smali_classes2/l0/a/r1/g.smali
new file mode 100644
index 0000000000..9d71a7fd18
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/g.smali
@@ -0,0 +1,99 @@
+.class public final Ll0/a/r1/g;
+.super Lk0/o/c/j;
+.source "ExceptionsConstuctor.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Throwable;",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
+    .locals 0
+
+    iput-object p1, p0, Ll0/a/r1/g;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/r1/g;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    aput-object p1, v1, v2
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Throwable"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    :goto_0
+    instance-of v0, p1, Lk0/d$a;
+
+    if-eqz v0, :cond_1
+
+    const/4 p1, 0x0
+
+    :cond_1
+    check-cast p1, Ljava/lang/Throwable;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/h.smali b/com.discord/smali_classes2/l0/a/r1/h.smali
new file mode 100644
index 0000000000..8cb475bfa3
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/h.smali
@@ -0,0 +1,105 @@
+.class public final Ll0/a/r1/h;
+.super Lk0/o/c/j;
+.source "ExceptionsConstuctor.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Throwable;",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
+    .locals 0
+
+    iput-object p1, p0, Ll0/a/r1/h;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/r1/h;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
+
+    move-result-object v3
+
+    aput-object v3, v1, v2
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    invoke-virtual {v0, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Throwable"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_0
+    instance-of p1, v0, Lk0/d$a;
+
+    if-eqz p1, :cond_1
+
+    const/4 v0, 0x0
+
+    :cond_1
+    check-cast v0, Ljava/lang/Throwable;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/i.smali b/com.discord/smali_classes2/l0/a/r1/i.smali
new file mode 100644
index 0000000000..148fc8a631
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/i.smali
@@ -0,0 +1,97 @@
+.class public final Ll0/a/r1/i;
+.super Lk0/o/c/j;
+.source "ExceptionsConstuctor.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Throwable;",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $constructor$inlined:Ljava/lang/reflect/Constructor;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Constructor;)V
+    .locals 0
+
+    iput-object p1, p0, Ll0/a/r1/i;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/r1/i;->$constructor$inlined:Ljava/lang/reflect/Constructor;
+
+    const/4 v1, 0x0
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    invoke-virtual {v0, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Throwable"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_0
+    instance-of p1, v0, Lk0/d$a;
+
+    if-eqz p1, :cond_1
+
+    const/4 v0, 0x0
+
+    :cond_1
+    check-cast v0, Ljava/lang/Throwable;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/j$a.smali b/com.discord/smali_classes2/l0/a/r1/j$a.smali
new file mode 100644
index 0000000000..87fa3d31d7
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/j$a.smali
@@ -0,0 +1,85 @@
+.class public final Ll0/a/r1/j$a;
+.super Ljava/lang/Object;
+.source "Comparisons.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ll0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;TT;)I"
+        }
+    .end annotation
+
+    check-cast p2, Ljava/lang/reflect/Constructor;
+
+    const-string v0, "it"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Ljava/lang/reflect/Constructor;->getParameterTypes()[Ljava/lang/Class;
+
+    move-result-object p2
+
+    array-length p2, p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    check-cast p1, Ljava/lang/reflect/Constructor;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/reflect/Constructor;->getParameterTypes()[Ljava/lang/Class;
+
+    move-result-object p1
+
+    array-length p1, p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    invoke-static {p2, p1}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
+
+    move-result p1
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/j$b.smali b/com.discord/smali_classes2/l0/a/r1/j$b.smali
new file mode 100644
index 0000000000..363e22d35b
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/j$b.smali
@@ -0,0 +1,61 @@
+.class public final Ll0/a/r1/j$b;
+.super Lk0/o/c/j;
+.source "ExceptionsConstuctor.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ll0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final d:Ll0/a/r1/j$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/r1/j$b;
+
+    invoke-direct {v0}, Ll0/a/r1/j$b;-><init>()V
+
+    sput-object v0, Ll0/a/r1/j$b;->d:Ll0/a/r1/j$b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/j$c.smali b/com.discord/smali_classes2/l0/a/r1/j$c.smali
new file mode 100644
index 0000000000..103d96ddbd
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/j$c.smali
@@ -0,0 +1,61 @@
+.class public final Ll0/a/r1/j$c;
+.super Lk0/o/c/j;
+.source "ExceptionsConstuctor.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ll0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final d:Ll0/a/r1/j$c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/r1/j$c;
+
+    invoke-direct {v0}, Ll0/a/r1/j$c;-><init>()V
+
+    sput-object v0, Ll0/a/r1/j$c;->d:Ll0/a/r1/j$c;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/j.smali b/com.discord/smali_classes2/l0/a/r1/j.smali
new file mode 100644
index 0000000000..32434029f8
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/j.smali
@@ -0,0 +1,658 @@
+.class public final Ll0/a/r1/j;
+.super Ljava/lang/Object;
+.source "ExceptionsConstuctor.kt"
+
+
+# static fields
+.field public static final a:I
+
+.field public static final b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+
+.field public static final c:Ljava/util/WeakHashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/WeakHashMap<",
+            "Ljava/lang/Class<",
+            "+",
+            "Ljava/lang/Throwable;",
+            ">;",
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/Throwable;",
+            "Ljava/lang/Throwable;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ljava/lang/Throwable;
+
+    const/4 v1, -0x1
+
+    invoke-static {v0, v1}, Ll0/a/r1/j;->a(Ljava/lang/Class;I)I
+
+    move-result v0
+
+    sput v0, Ll0/a/r1/j;->a:I
+
+    new-instance v0, Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+
+    invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;-><init>()V
+
+    sput-object v0, Ll0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+
+    new-instance v0, Ljava/util/WeakHashMap;
+
+    invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
+
+    sput-object v0, Ll0/a/r1/j;->c:Ljava/util/WeakHashMap;
+
+    return-void
+.end method
+
+.method public static final a(Ljava/lang/Class;I)I
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;I)I"
+        }
+    .end annotation
+
+    const-string v0, "$this$kotlin"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    :try_start_0
+    invoke-virtual {p0}, Ljava/lang/Class;->getDeclaredFields()[Ljava/lang/reflect/Field;
+
+    move-result-object v2
+
+    const-string v3, "declaredFields"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v3, v2
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    :goto_1
+    if-ge v4, v3, :cond_1
+
+    aget-object v6, v2, v4
+
+    const-string v7, "it"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v6}, Ljava/lang/reflect/Field;->getModifiers()I
+
+    move-result v6
+
+    invoke-static {v6}, Ljava/lang/reflect/Modifier;->isStatic(I)Z
+
+    move-result v6
+
+    xor-int/lit8 v6, v6, 0x1
+
+    if-eqz v6, :cond_0
+
+    add-int/lit8 v5, v5, 0x1
+
+    :cond_0
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    add-int/2addr v1, v5
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_2
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    instance-of v0, p0, Lk0/d$a;
+
+    if-eqz v0, :cond_3
+
+    move-object p0, p1
+
+    :cond_3
+    check-cast p0, Ljava/lang/Number;
+
+    invoke-virtual {p0}, Ljava/lang/Number;->intValue()I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Throwable;",
+            ">(TE;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "exception"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ll0/a/t;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    :try_start_0
+    check-cast p0, Ll0/a/t;
+
+    invoke-interface {p0}, Ll0/a/t;->a()Ljava/lang/Throwable;
+
+    move-result-object p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p0
+
+    invoke-static {p0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_0
+    instance-of v0, p0, Lk0/d$a;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    move-object v1, p0
+
+    :goto_1
+    check-cast v1, Ljava/lang/Throwable;
+
+    return-object v1
+
+    :cond_1
+    sget-object v0, Ll0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
+
+    :try_start_1
+    sget-object v2, Ll0/a/r1/j;->c:Ljava/util/WeakHashMap;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/jvm/functions/Function1;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_3
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {v2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/lang/Throwable;
+
+    return-object p0
+
+    :cond_2
+    sget v0, Ll0/a/r1/j;->a:I
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    const/4 v3, 0x0
+
+    invoke-static {v2, v3}, Ll0/a/r1/j;->a(Ljava/lang/Class;I)I
+
+    move-result v2
+
+    if-eq v0, v2, :cond_7
+
+    sget-object v0, Ll0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getWriteHoldCount()I
+
+    move-result v4
+
+    if-nez v4, :cond_3
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getReadHoldCount()I
+
+    move-result v4
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v4, 0x0
+
+    :goto_2
+    const/4 v5, 0x0
+
+    :goto_3
+    if-ge v5, v4, :cond_4
+
+    invoke-virtual {v2}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
+
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
+
+    :try_start_2
+    sget-object v5, Ll0/a/r1/j;->c:Ljava/util/WeakHashMap;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    sget-object v6, Ll0/a/r1/j$b;->d:Ll0/a/r1/j$b;
+
+    invoke-interface {v5, p0, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    :goto_4
+    if-ge v3, v4, :cond_5
+
+    invoke-virtual {v2}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_4
+
+    :cond_5
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
+
+    return-object v1
+
+    :catchall_1
+    move-exception p0
+
+    :goto_5
+    if-ge v3, v4, :cond_6
+
+    invoke-virtual {v2}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_5
+
+    :cond_6
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
+
+    throw p0
+
+    :cond_7
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getConstructors()[Ljava/lang/reflect/Constructor;
+
+    move-result-object v0
+
+    const-string v2, "exception.javaClass.constructors"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Ll0/a/r1/j$a;
+
+    invoke-direct {v2}, Ll0/a/r1/j$a;-><init>()V
+
+    const-string v4, "$this$sortedWith"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "comparator"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "$this$sortedArrayWith"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v5, v0
+
+    const/4 v6, 0x1
+
+    if-nez v5, :cond_8
+
+    const/4 v5, 0x1
+
+    goto :goto_6
+
+    :cond_8
+    const/4 v5, 0x0
+
+    :goto_6
+    if-eqz v5, :cond_9
+
+    goto :goto_7
+
+    :cond_9
+    array-length v5, v0
+
+    invoke-static {v0, v5}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v5, "java.util.Arrays.copyOf(this, size)"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "$this$sortWith"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v4, v0
+
+    if-le v4, v6, :cond_a
+
+    invoke-static {v0, v2}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
+
+    :cond_a
+    :goto_7
+    invoke-static {v0}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    move-object v2, v1
+
+    :cond_b
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_11
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/reflect/Constructor;
+
+    const-string v4, "constructor"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-class v4, Ljava/lang/String;
+
+    invoke-virtual {v2}, Ljava/lang/reflect/Constructor;->getParameterTypes()[Ljava/lang/Class;
+
+    move-result-object v5
+
+    array-length v7, v5
+
+    if-eqz v7, :cond_10
+
+    if-eq v7, v6, :cond_d
+
+    const/4 v8, 0x2
+
+    if-eq v7, v8, :cond_c
+
+    goto :goto_8
+
+    :cond_c
+    aget-object v7, v5, v3
+
+    invoke-static {v7, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_f
+
+    aget-object v4, v5, v6
+
+    const-class v5, Ljava/lang/Throwable;
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_f
+
+    new-instance v4, Ll0/a/r1/f;
+
+    invoke-direct {v4, v2}, Ll0/a/r1/f;-><init>(Ljava/lang/reflect/Constructor;)V
+
+    goto :goto_9
+
+    :cond_d
+    aget-object v5, v5, v3
+
+    const-class v7, Ljava/lang/Throwable;
+
+    invoke-static {v5, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_e
+
+    new-instance v4, Ll0/a/r1/g;
+
+    invoke-direct {v4, v2}, Ll0/a/r1/g;-><init>(Ljava/lang/reflect/Constructor;)V
+
+    goto :goto_9
+
+    :cond_e
+    invoke-static {v5, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_f
+
+    new-instance v4, Ll0/a/r1/h;
+
+    invoke-direct {v4, v2}, Ll0/a/r1/h;-><init>(Ljava/lang/reflect/Constructor;)V
+
+    goto :goto_9
+
+    :cond_f
+    :goto_8
+    move-object v2, v1
+
+    goto :goto_a
+
+    :cond_10
+    new-instance v4, Ll0/a/r1/i;
+
+    invoke-direct {v4, v2}, Ll0/a/r1/i;-><init>(Ljava/lang/reflect/Constructor;)V
+
+    :goto_9
+    move-object v2, v4
+
+    :goto_a
+    if-eqz v2, :cond_b
+
+    :cond_11
+    sget-object v0, Ll0/a/r1/j;->b:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
+
+    move-result-object v4
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getWriteHoldCount()I
+
+    move-result v5
+
+    if-nez v5, :cond_12
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->getReadHoldCount()I
+
+    move-result v5
+
+    goto :goto_b
+
+    :cond_12
+    const/4 v5, 0x0
+
+    :goto_b
+    const/4 v6, 0x0
+
+    :goto_c
+    if-ge v6, v5, :cond_13
+
+    invoke-virtual {v4}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
+
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_c
+
+    :cond_13
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->writeLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
+
+    :try_start_3
+    sget-object v6, Ll0/a/r1/j;->c:Ljava/util/WeakHashMap;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v7
+
+    if-eqz v2, :cond_14
+
+    move-object v8, v2
+
+    goto :goto_d
+
+    :cond_14
+    sget-object v8, Ll0/a/r1/j$c;->d:Ll0/a/r1/j$c;
+
+    :goto_d
+    invoke-interface {v6, v7, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    :goto_e
+    if-ge v3, v5, :cond_15
+
+    invoke-virtual {v4}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_e
+
+    :cond_15
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
+
+    if-eqz v2, :cond_16
+
+    invoke-interface {v2, p0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    move-object v1, p0
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    :cond_16
+    return-object v1
+
+    :catchall_2
+    move-exception p0
+
+    :goto_f
+    if-ge v3, v5, :cond_17
+
+    invoke-virtual {v4}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_f
+
+    :cond_17
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->unlock()V
+
+    throw p0
+
+    :catchall_3
+    move-exception p0
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->unlock()V
+
+    throw p0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/k.smali b/com.discord/smali_classes2/l0/a/r1/k.smali
new file mode 100644
index 0000000000..bf0dea9a2c
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/k.smali
@@ -0,0 +1,13 @@
+.class public Ll0/a/r1/k;
+.super Ll0/a/r1/m;
+.source "LockFreeLinkedList.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/r1/m;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/l.smali b/com.discord/smali_classes2/l0/a/r1/l.smali
new file mode 100644
index 0000000000..f19d317813
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/l.smali
@@ -0,0 +1,75 @@
+.class public final Ll0/a/r1/l;
+.super Ljava/lang/Object;
+.source "LockFreeLinkedList.kt"
+
+
+# static fields
+.field public static final a:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "CONDITION_FALSE"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/r1/l;->a:Ljava/lang/Object;
+
+    const-string v0, "ALREADY_REMOVED"
+
+    const-string v1, "symbol"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "LIST_EMPTY"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "REMOVE_PREPARED"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public static final a(Ljava/lang/Object;)Ll0/a/r1/m;
+    .locals 1
+
+    const-string v0, "$this$unwrap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ll0/a/r1/s;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, p0
+
+    :goto_0
+    check-cast v0, Ll0/a/r1/s;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, v0, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    move-object v0, p0
+
+    check-cast v0, Ll0/a/r1/m;
+
+    :goto_1
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/m$a.smali b/com.discord/smali_classes2/l0/a/r1/m$a.smali
new file mode 100644
index 0000000000..deab53a4c9
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/m$a.smali
@@ -0,0 +1,44 @@
+.class public abstract Ll0/a/r1/m$a;
+.super Ll0/a/r1/c;
+.source "LockFreeLinkedList.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/r1/m;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/r1/c<",
+        "Ll0/a/r1/m;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public b:Ll0/a/r1/m;
+
+.field public final c:Ll0/a/r1/m;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/r1/m;)V
+    .locals 1
+
+    const-string v0, "newNode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ll0/a/r1/c;-><init>()V
+
+    iput-object p1, p0, Ll0/a/r1/m$a;->c:Ll0/a/r1/m;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/m.smali b/com.discord/smali_classes2/l0/a/r1/m.smali
new file mode 100644
index 0000000000..779dfec62c
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/m.smali
@@ -0,0 +1,478 @@
+.class public Ll0/a/r1/m;
+.super Ljava/lang/Object;
+.source "LockFreeLinkedList.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ll0/a/r1/m$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+.field public static final e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+.field public static final f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
+# instance fields
+.field public volatile _next:Ljava/lang/Object;
+
+.field public volatile _prev:Ljava/lang/Object;
+
+.field public volatile _removedRef:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ljava/lang/Object;
+
+    const-class v1, Ll0/a/r1/m;
+
+    const-string v2, "_next"
+
+    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v2
+
+    sput-object v2, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const-string v2, "_prev"
+
+    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v2
+
+    sput-object v2, Ll0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const-string v2, "_removedRef"
+
+    invoke-static {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/r1/m;->f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p0, p0, Ll0/a/r1/m;->_next:Ljava/lang/Object;
+
+    iput-object p0, p0, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ll0/a/r1/m;->_removedRef:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final b(Ll0/a/r1/m;Ll0/a/r1/r;)Ll0/a/r1/m;
+    .locals 5
+
+    :goto_0
+    const/4 p2, 0x0
+
+    move-object v0, p2
+
+    :cond_0
+    :goto_1
+    iget-object v1, p1, Ll0/a/r1/m;->_next:Ljava/lang/Object;
+
+    if-nez v1, :cond_1
+
+    return-object p1
+
+    :cond_1
+    instance-of v2, v1, Ll0/a/r1/r;
+
+    if-eqz v2, :cond_2
+
+    check-cast v1, Ll0/a/r1/r;
+
+    invoke-virtual {v1, p1}, Ll0/a/r1/r;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_1
+
+    :cond_2
+    instance-of v2, v1, Ll0/a/r1/s;
+
+    if-eqz v2, :cond_4
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p1}, Ll0/a/r1/m;->g()Ll0/a/r1/m;
+
+    sget-object p2, Ll0/a/r1/m;->d:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    check-cast v1, Ll0/a/r1/s;
+
+    iget-object v1, v1, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    invoke-virtual {p2, v0, p1, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-object p1, v0
+
+    goto :goto_0
+
+    :cond_3
+    iget-object p1, p1, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    invoke-static {p1}, Ll0/a/r1/l;->a(Ljava/lang/Object;)Ll0/a/r1/m;
+
+    move-result-object p1
+
+    goto :goto_1
+
+    :cond_4
+    iget-object v2, p0, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    instance-of v3, v2, Ll0/a/r1/s;
+
+    if-eqz v3, :cond_5
+
+    return-object p2
+
+    :cond_5
+    if-eq v1, p0, :cond_7
+
+    if-eqz v1, :cond_6
+
+    move-object v0, v1
+
+    check-cast v0, Ll0/a/r1/m;
+
+    move-object v4, v0
+
+    move-object v0, p1
+
+    move-object p1, v4
+
+    goto :goto_1
+
+    :cond_6
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_7
+    if-ne v2, p1, :cond_8
+
+    return-object p2
+
+    :cond_8
+    sget-object v1, Ll0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, p1, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    instance-of v1, v1, Ll0/a/r1/s;
+
+    if-nez v1, :cond_0
+
+    return-object p2
+.end method
+
+.method public final c(Ll0/a/r1/m;)V
+    .locals 2
+
+    :cond_0
+    iget-object v0, p1, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/r1/s;
+
+    if-nez v1, :cond_3
+
+    invoke-virtual {p0}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eq v1, p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v1, Ll0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p1, v0, p0}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {p0}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v1
+
+    instance-of v1, v1, Ll0/a/r1/s;
+
+    if-eqz v1, :cond_3
+
+    if-eqz v0, :cond_2
+
+    check-cast v0, Ll0/a/r1/m;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1}, Ll0/a/r1/m;->b(Ll0/a/r1/m;Ll0/a/r1/r;)Ll0/a/r1/m;
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    :goto_0
+    return-void
+.end method
+
+.method public final d()Ljava/lang/Object;
+    .locals 2
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/r1/m;->_next:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/r1/r;
+
+    if-nez v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    check-cast v0, Ll0/a/r1/r;
+
+    invoke-virtual {v0, p0}, Ll0/a/r1/r;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_0
+.end method
+
+.method public final e()Ll0/a/r1/m;
+    .locals 1
+
+    invoke-virtual {p0}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ll0/a/r1/l;->a(Ljava/lang/Object;)Ll0/a/r1/m;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final f()Ljava/lang/Object;
+    .locals 3
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/r1/s;
+
+    if-eqz v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    if-eqz v0, :cond_2
+
+    move-object v1, v0
+
+    check-cast v1, Ll0/a/r1/m;
+
+    invoke-virtual {v1}, Ll0/a/r1/m;->d()Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-ne v2, p0, :cond_1
+
+    return-object v0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v1, v0}, Ll0/a/r1/m;->b(Ll0/a/r1/m;Ll0/a/r1/r;)Ll0/a/r1/m;
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final g()Ll0/a/r1/m;
+    .locals 4
+
+    :cond_0
+    iget-object v0, p0, Ll0/a/r1/m;->_prev:Ljava/lang/Object;
+
+    instance-of v1, v0, Ll0/a/r1/s;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Ll0/a/r1/s;
+
+    iget-object v0, v0, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    return-object v0
+
+    :cond_1
+    if-ne v0, p0, :cond_6
+
+    move-object v1, p0
+
+    :cond_2
+    :goto_0
+    instance-of v2, v1, Ll0/a/r1/k;
+
+    if-eqz v2, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    invoke-virtual {v1}, Ll0/a/r1/m;->e()Ll0/a/r1/m;
+
+    move-result-object v1
+
+    sget-boolean v2, Ll0/a/b0;->a:Z
+
+    if-eqz v2, :cond_2
+
+    if-eq v1, p0, :cond_4
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :cond_6
+    if-eqz v0, :cond_8
+
+    move-object v1, v0
+
+    check-cast v1, Ll0/a/r1/m;
+
+    :goto_2
+    iget-object v2, v1, Ll0/a/r1/m;->_removedRef:Ljava/lang/Object;
+
+    check-cast v2, Ll0/a/r1/s;
+
+    if-eqz v2, :cond_7
+
+    goto :goto_3
+
+    :cond_7
+    new-instance v2, Ll0/a/r1/s;
+
+    invoke-direct {v2, v1}, Ll0/a/r1/s;-><init>(Ll0/a/r1/m;)V
+
+    sget-object v3, Ll0/a/r1/m;->f:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v3, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->lazySet(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    :goto_3
+    sget-object v1, Ll0/a/r1/m;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    check-cast v0, Ll0/a/r1/m;
+
+    return-object v0
+
+    :cond_8
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/n.smali b/com.discord/smali_classes2/l0/a/r1/n.smali
new file mode 100644
index 0000000000..258142ed58
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/n.smali
@@ -0,0 +1,278 @@
+.class public Ll0/a/r1/n;
+.super Ljava/lang/Object;
+.source "LockFreeTaskQueue.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+
+# instance fields
+.field public volatile synthetic _cur$internal:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ll0/a/r1/n;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "_cur$internal"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Z)V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ll0/a/r1/o;
+
+    const/16 v1, 0x8
+
+    invoke-direct {v0, v1, p1}, Ll0/a/r1/o;-><init>(IZ)V
+
+    iput-object v0, p0, Ll0/a/r1/n;->_cur$internal:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/lang/Object;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    const-string v0, "element"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/r1/n;->_cur$internal:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/r1/o;
+
+    invoke-virtual {v0, p1}, Ll0/a/r1/o;->b(Ljava/lang/Object;)I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-eqz v1, :cond_2
+
+    if-eq v1, v2, :cond_1
+
+    const/4 v0, 0x2
+
+    if-eq v1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    sget-object v1, Ll0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v0}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object v2
+
+    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    return v2
+.end method
+
+.method public final b()Ljava/lang/Object;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/r1/n;->_cur$internal:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/r1/o;
+
+    :cond_0
+    :goto_1
+    iget-wide v3, v0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/high16 v1, 0x1000000000000000L
+
+    and-long/2addr v1, v3
+
+    const-wide/16 v5, 0x0
+
+    const/4 v7, 0x0
+
+    cmp-long v8, v1, v5
+
+    if-eqz v8, :cond_1
+
+    sget-object v7, Ll0/a/r1/o;->g:Ll0/a/r1/v;
+
+    goto :goto_4
+
+    :cond_1
+    sget-object v1, Ll0/a/r1/o;->h:Ll0/a/r1/o$a;
+
+    const-wide/32 v1, 0x3fffffff
+
+    and-long/2addr v1, v3
+
+    const/4 v5, 0x0
+
+    shr-long/2addr v1, v5
+
+    long-to-int v8, v1
+
+    const-wide v1, 0xfffffffc0000000L
+
+    and-long/2addr v1, v3
+
+    const/16 v5, 0x1e
+
+    shr-long/2addr v1, v5
+
+    long-to-int v2, v1
+
+    iget v1, v0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v2, v1
+
+    and-int v5, v8, v1
+
+    if-ne v2, v5, :cond_2
+
+    goto :goto_4
+
+    :cond_2
+    iget-object v2, v0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    and-int/2addr v1, v8
+
+    invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v9
+
+    if-nez v9, :cond_3
+
+    iget-boolean v1, v0, Ll0/a/r1/o;->d:Z
+
+    if-eqz v1, :cond_0
+
+    goto :goto_4
+
+    :cond_3
+    instance-of v1, v9, Ll0/a/r1/o$b;
+
+    if-eqz v1, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    add-int/lit8 v1, v8, 0x1
+
+    const v2, 0x3fffffff    # 1.9999999f
+
+    and-int v10, v1, v2
+
+    sget-object v1, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    sget-object v2, Ll0/a/r1/o;->h:Ll0/a/r1/o$a;
+
+    invoke-virtual {v2, v3, v4, v10}, Ll0/a/r1/o$a;->a(JI)J
+
+    move-result-wide v5
+
+    move-object v2, v0
+
+    invoke-virtual/range {v1 .. v6}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    iget-object v1, v0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v2, v0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v2, v8
+
+    invoke-virtual {v1, v2, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    goto :goto_3
+
+    :cond_5
+    iget-boolean v1, v0, Ll0/a/r1/o;->d:Z
+
+    if-nez v1, :cond_6
+
+    goto :goto_1
+
+    :cond_6
+    move-object v1, v0
+
+    :goto_2
+    invoke-static {v1, v8, v10}, Ll0/a/r1/o;->a(Ll0/a/r1/o;II)Ll0/a/r1/o;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_7
+
+    goto :goto_2
+
+    :cond_7
+    :goto_3
+    move-object v7, v9
+
+    :goto_4
+    sget-object v1, Ll0/a/r1/o;->g:Ll0/a/r1/v;
+
+    if-eq v7, v1, :cond_8
+
+    return-object v7
+
+    :cond_8
+    sget-object v1, Ll0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v0}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object v2
+
+    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/o$a.smali b/com.discord/smali_classes2/l0/a/r1/o$a.smali
new file mode 100644
index 0000000000..62b4c30380
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/o$a.smali
@@ -0,0 +1,44 @@
+.class public final Ll0/a/r1/o$a;
+.super Ljava/lang/Object;
+.source "LockFreeTaskQueue.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/r1/o;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(JI)J
+    .locals 2
+
+    const-wide/32 v0, -0x40000000
+
+    and-long/2addr p1, v0
+
+    int-to-long v0, p3
+
+    const/4 p3, 0x0
+
+    shl-long/2addr v0, p3
+
+    or-long/2addr p1, v0
+
+    return-wide p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/o$b.smali b/com.discord/smali_classes2/l0/a/r1/o$b.smali
new file mode 100644
index 0000000000..8b2f799c49
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/o$b.smali
@@ -0,0 +1,30 @@
+.class public final Ll0/a/r1/o$b;
+.super Ljava/lang/Object;
+.source "LockFreeTaskQueue.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/r1/o;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final a:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Ll0/a/r1/o$b;->a:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/o.smali b/com.discord/smali_classes2/l0/a/r1/o.smali
new file mode 100644
index 0000000000..b0d3aabc5e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/o.smali
@@ -0,0 +1,699 @@
+.class public final Ll0/a/r1/o;
+.super Ljava/lang/Object;
+.source "LockFreeTaskQueue.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ll0/a/r1/o$b;,
+        Ll0/a/r1/o$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+.field public static final synthetic f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+.field public static final g:Ll0/a/r1/v;
+
+.field public static final h:Ll0/a/r1/o$a;
+
+
+# instance fields
+.field public volatile _next:Ljava/lang/Object;
+
+.field public volatile synthetic _state$internal:J
+
+.field public final a:I
+
+.field public synthetic b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+.field public final c:I
+
+.field public final d:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ll0/a/r1/o;
+
+    new-instance v1, Ll0/a/r1/o$a;
+
+    const/4 v2, 0x0
+
+    invoke-direct {v1, v2}, Ll0/a/r1/o$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v1, Ll0/a/r1/o;->h:Ll0/a/r1/o$a;
+
+    new-instance v1, Ll0/a/r1/v;
+
+    const-string v2, "REMOVE_FROZEN"
+
+    invoke-direct {v1, v2}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v1, Ll0/a/r1/o;->g:Ll0/a/r1/v;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "_next"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v1
+
+    sput-object v1, Ll0/a/r1/o;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const-string v1, "_state$internal"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(IZ)V
+    .locals 3
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Ll0/a/r1/o;->c:I
+
+    iput-boolean p2, p0, Ll0/a/r1/o;->d:Z
+
+    const/4 p2, 0x1
+
+    sub-int/2addr p1, p2
+
+    iput p1, p0, Ll0/a/r1/o;->a:I
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Ll0/a/r1/o;->_next:Ljava/lang/Object;
+
+    const-wide/16 v0, 0x0
+
+    iput-wide v0, p0, Ll0/a/r1/o;->_state$internal:J
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v0, p0, Ll0/a/r1/o;->c:I
+
+    invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object p1, p0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget p1, p0, Ll0/a/r1/o;->a:I
+
+    const/4 v0, 0x0
+
+    const v1, 0x3fffffff    # 1.9999999f
+
+    if-gt p1, v1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    const-string v1, "Check failed."
+
+    if-eqz p1, :cond_3
+
+    iget p1, p0, Ll0/a/r1/o;->c:I
+
+    iget v2, p0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr p1, v2
+
+    if-nez p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_1
+    if-eqz p2, :cond_2
+
+    return-void
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final a(Ll0/a/r1/o;II)Ll0/a/r1/o;
+    .locals 11
+
+    :cond_0
+    iget-wide v2, p0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/32 v0, 0x3fffffff
+
+    and-long/2addr v0, v2
+
+    const/4 v4, 0x0
+
+    shr-long/2addr v0, v4
+
+    long-to-int v6, v0
+
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    if-eqz v0, :cond_3
+
+    if-ne v6, p1, :cond_1
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p0, Ljava/lang/AssertionError;
+
+    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p0
+
+    :cond_3
+    :goto_1
+    const-wide/high16 v0, 0x1000000000000000L
+
+    and-long/2addr v0, v2
+
+    const-wide/16 v7, 0x0
+
+    cmp-long v5, v0, v7
+
+    if-eqz v5, :cond_4
+
+    invoke-virtual {p0}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object p0
+
+    goto :goto_2
+
+    :cond_4
+    sget-object v0, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    const-wide/32 v7, -0x40000000
+
+    and-long/2addr v7, v2
+
+    int-to-long v9, p2
+
+    shl-long v4, v9, v4
+
+    or-long/2addr v4, v7
+
+    move-object v1, p0
+
+    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object p1, p0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget p0, p0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr p0, v6
+
+    const/4 p2, 0x0
+
+    invoke-virtual {p1, p0, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    move-object p0, p2
+
+    :goto_2
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final b(Ljava/lang/Object;)I
+    .locals 14
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)I"
+        }
+    .end annotation
+
+    const-string v0, "element"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    iget-wide v3, p0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/high16 v0, 0x3000000000000000L    # 1.727233711018889E-77
+
+    and-long/2addr v0, v3
+
+    const-wide/16 v7, 0x0
+
+    const/4 v2, 0x1
+
+    cmp-long v5, v0, v7
+
+    if-eqz v5, :cond_2
+
+    const-wide/high16 v0, 0x2000000000000000L
+
+    and-long/2addr v0, v3
+
+    cmp-long p1, v0, v7
+
+    if-eqz p1, :cond_1
+
+    const/4 v2, 0x2
+
+    :cond_1
+    return v2
+
+    :cond_2
+    const-wide/32 v0, 0x3fffffff
+
+    and-long/2addr v0, v3
+
+    const/4 v9, 0x0
+
+    shr-long/2addr v0, v9
+
+    long-to-int v1, v0
+
+    const-wide v5, 0xfffffffc0000000L
+
+    and-long/2addr v5, v3
+
+    const/16 v0, 0x1e
+
+    shr-long/2addr v5, v0
+
+    long-to-int v10, v5
+
+    iget v11, p0, Ll0/a/r1/o;->a:I
+
+    add-int/lit8 v5, v10, 0x2
+
+    and-int/2addr v5, v11
+
+    and-int v6, v1, v11
+
+    if-ne v5, v6, :cond_3
+
+    return v2
+
+    :cond_3
+    iget-boolean v5, p0, Ll0/a/r1/o;->d:Z
+
+    const v6, 0x3fffffff    # 1.9999999f
+
+    if-nez v5, :cond_5
+
+    iget-object v5, p0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    and-int v12, v10, v11
+
+    invoke-virtual {v5, v12}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_5
+
+    iget v0, p0, Ll0/a/r1/o;->c:I
+
+    const/16 v3, 0x400
+
+    if-lt v0, v3, :cond_4
+
+    sub-int/2addr v10, v1
+
+    and-int v1, v10, v6
+
+    shr-int/lit8 v0, v0, 0x1
+
+    if-le v1, v0, :cond_0
+
+    :cond_4
+    return v2
+
+    :cond_5
+    add-int/lit8 v1, v10, 0x1
+
+    and-int/2addr v1, v6
+
+    sget-object v2, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    const-wide v5, -0xfffffffc0000001L    # -3.1050369248997324E231
+
+    and-long/2addr v5, v3
+
+    int-to-long v12, v1
+
+    shl-long v0, v12, v0
+
+    or-long/2addr v5, v0
+
+    move-object v1, v2
+
+    move-object v2, p0
+
+    invoke-virtual/range {v1 .. v6}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    and-int v1, v10, v11
+
+    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    move-object v0, p0
+
+    :goto_0
+    iget-wide v1, v0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/high16 v3, 0x1000000000000000L
+
+    and-long/2addr v1, v3
+
+    cmp-long v3, v1, v7
+
+    if-nez v3, :cond_6
+
+    goto :goto_2
+
+    :cond_6
+    invoke-virtual {v0}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object v0
+
+    iget-object v1, v0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v2, v0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v2, v10
+
+    invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    instance-of v2, v1, Ll0/a/r1/o$b;
+
+    if-eqz v2, :cond_7
+
+    check-cast v1, Ll0/a/r1/o$b;
+
+    iget v1, v1, Ll0/a/r1/o$b;->a:I
+
+    if-ne v1, v10, :cond_7
+
+    iget-object v1, v0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v2, v0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v2, v10
+
+    invoke-virtual {v1, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_7
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_8
+
+    goto :goto_0
+
+    :cond_8
+    :goto_2
+    return v9
+.end method
+
+.method public final c()Z
+    .locals 10
+
+    :cond_0
+    iget-wide v2, p0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/high16 v0, 0x2000000000000000L
+
+    and-long v4, v2, v0
+
+    const/4 v6, 0x1
+
+    const-wide/16 v7, 0x0
+
+    cmp-long v9, v4, v7
+
+    if-eqz v9, :cond_1
+
+    return v6
+
+    :cond_1
+    const-wide/high16 v4, 0x1000000000000000L
+
+    and-long/2addr v4, v2
+
+    cmp-long v9, v4, v7
+
+    if-eqz v9, :cond_2
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_2
+    or-long v4, v2, v0
+
+    sget-object v0, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    move-object v1, p0
+
+    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return v6
+.end method
+
+.method public final d()Z
+    .locals 7
+
+    iget-wide v0, p0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/32 v2, 0x3fffffff
+
+    and-long/2addr v2, v0
+
+    const/4 v4, 0x0
+
+    shr-long/2addr v2, v4
+
+    long-to-int v3, v2
+
+    const-wide v5, 0xfffffffc0000000L
+
+    and-long/2addr v0, v5
+
+    const/16 v2, 0x1e
+
+    shr-long/2addr v0, v2
+
+    long-to-int v1, v0
+
+    if-ne v3, v1, :cond_0
+
+    const/4 v4, 0x1
+
+    :cond_0
+    return v4
+.end method
+
+.method public final e()Ll0/a/r1/o;
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ll0/a/r1/o<",
+            "TE;>;"
+        }
+    .end annotation
+
+    :cond_0
+    iget-wide v2, p0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/high16 v0, 0x1000000000000000L
+
+    and-long v4, v2, v0
+
+    const-wide/16 v6, 0x0
+
+    cmp-long v8, v4, v6
+
+    if-eqz v8, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    or-long v6, v2, v0
+
+    sget-object v0, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    move-object v1, p0
+
+    move-wide v4, v6
+
+    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    move-wide v2, v6
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/r1/o;->_next:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/r1/o;
+
+    if-eqz v0, :cond_2
+
+    return-object v0
+
+    :cond_2
+    sget-object v0, Ll0/a/r1/o;->e:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const/4 v1, 0x0
+
+    new-instance v4, Ll0/a/r1/o;
+
+    iget v5, p0, Ll0/a/r1/o;->c:I
+
+    mul-int/lit8 v5, v5, 0x2
+
+    iget-boolean v6, p0, Ll0/a/r1/o;->d:Z
+
+    invoke-direct {v4, v5, v6}, Ll0/a/r1/o;-><init>(IZ)V
+
+    const-wide/32 v5, 0x3fffffff
+
+    and-long/2addr v5, v2
+
+    const/4 v7, 0x0
+
+    shr-long/2addr v5, v7
+
+    long-to-int v6, v5
+
+    const-wide v7, 0xfffffffc0000000L
+
+    and-long/2addr v7, v2
+
+    const/16 v5, 0x1e
+
+    shr-long/2addr v7, v5
+
+    long-to-int v5, v7
+
+    :goto_1
+    iget v7, p0, Ll0/a/r1/o;->a:I
+
+    and-int v8, v6, v7
+
+    and-int/2addr v7, v5
+
+    if-eq v8, v7, :cond_4
+
+    iget-object v7, p0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v7, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    new-instance v7, Ll0/a/r1/o$b;
+
+    invoke-direct {v7, v6}, Ll0/a/r1/o$b;-><init>(I)V
+
+    :goto_2
+    iget-object v8, v4, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v9, v4, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v9, v6
+
+    invoke-virtual {v8, v9, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    const-wide v5, -0x1000000000000001L    # -3.1050361846014175E231
+
+    and-long/2addr v5, v2
+
+    iput-wide v5, v4, Ll0/a/r1/o;->_state$internal:J
+
+    invoke-virtual {v0, p0, v1, v4}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/p.smali b/com.discord/smali_classes2/l0/a/r1/p.smali
new file mode 100644
index 0000000000..b07ebec940
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/p.smali
@@ -0,0 +1,188 @@
+.class public final Ll0/a/r1/p;
+.super Ljava/lang/Object;
+.source "MainDispatchers.kt"
+
+
+# static fields
+.field public static final a:Z
+
+.field public static final b:Ll0/a/f1;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 8
+
+    const-string v0, "kotlinx.coroutines.fast.service.loader"
+
+    const-string v1, "propertyName"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Ll0/a/r1/w;->a(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :goto_0
+    sput-boolean v0, Ll0/a/r1/p;->a:Z
+
+    const/4 v0, 0x2
+
+    const/4 v1, 0x0
+
+    :try_start_0
+    invoke-static {}, La;->b()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    const-string v3, "ServiceLoader.load(\n    \u2026             ).iterator()"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lf/n/a/k/a;->asSequence(Ljava/util/Iterator;)Lkotlin/sequences/Sequence;
+
+    move-result-object v2
+
+    invoke-static {v2}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+
+    move-result-object v2
+
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    move-object v4, v1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-nez v5, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    move-object v5, v4
+
+    check-cast v5, Lkotlinx/coroutines/internal/MainDispatcherFactory;
+
+    invoke-interface {v5}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->c()I
+
+    move-result v5
+
+    :cond_3
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    move-object v7, v6
+
+    check-cast v7, Lkotlinx/coroutines/internal/MainDispatcherFactory;
+
+    invoke-interface {v7}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->c()I
+
+    move-result v7
+
+    if-ge v5, v7, :cond_4
+
+    move-object v4, v6
+
+    move v5, v7
+
+    :cond_4
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+
+    if-nez v6, :cond_3
+
+    :goto_1
+    check-cast v4, Lkotlinx/coroutines/internal/MainDispatcherFactory;
+
+    if-eqz v4, :cond_5
+
+    const-string v3, "$this$tryCreateDispatcher"
+
+    invoke-static {v4, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "factories"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    invoke-interface {v4, v2}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->b(Ljava/util/List;)Ll0/a/f1;
+
+    move-result-object v2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception v2
+
+    :try_start_2
+    new-instance v3, Ll0/a/r1/q;
+
+    invoke-interface {v4}, Lkotlinx/coroutines/internal/MainDispatcherFactory;->a()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-direct {v3, v2, v4}, Ll0/a/r1/q;-><init>(Ljava/lang/Throwable;Ljava/lang/String;)V
+
+    move-object v2, v3
+
+    :goto_2
+    if-eqz v2, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    new-instance v2, Ll0/a/r1/q;
+
+    invoke-direct {v2, v1, v1, v0}, Ll0/a/r1/q;-><init>(Ljava/lang/Throwable;Ljava/lang/String;I)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    goto :goto_3
+
+    :catchall_1
+    move-exception v2
+
+    new-instance v3, Ll0/a/r1/q;
+
+    invoke-direct {v3, v2, v1, v0}, Ll0/a/r1/q;-><init>(Ljava/lang/Throwable;Ljava/lang/String;I)V
+
+    move-object v2, v3
+
+    :goto_3
+    sput-object v2, Ll0/a/r1/p;->b:Ll0/a/f1;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/q.smali b/com.discord/smali_classes2/l0/a/r1/q.smali
new file mode 100644
index 0000000000..098b7b1b31
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/q.smali
@@ -0,0 +1,197 @@
+.class public final Ll0/a/r1/q;
+.super Ll0/a/f1;
+.source "MainDispatchers.kt"
+
+# interfaces
+.implements Ll0/a/e0;
+
+
+# instance fields
+.field public final d:Ljava/lang/Throwable;
+
+.field public final e:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Throwable;Ljava/lang/String;)V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/f1;-><init>()V
+
+    iput-object p1, p0, Ll0/a/r1/q;->d:Ljava/lang/Throwable;
+
+    iput-object p2, p0, Ll0/a/r1/q;->e:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Throwable;Ljava/lang/String;I)V
+    .locals 0
+
+    and-int/lit8 p2, p3, 0x2
+
+    const/4 p2, 0x0
+
+    invoke-direct {p0}, Ll0/a/f1;-><init>()V
+
+    iput-object p1, p0, Ll0/a/r1/q;->d:Ljava/lang/Throwable;
+
+    iput-object p2, p0, Ll0/a/r1/q;->e:Ljava/lang/String;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public b(JLl0/a/f;)V
+    .locals 0
+
+    const-string p1, "continuation"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ll0/a/r1/q;->w()Ljava/lang/Void;
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ll0/a/r1/q;->w()Ljava/lang/Void;
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ll0/a/r1/q;->w()Ljava/lang/Void;
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "Main[missing"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/r1/q;->d:Ljava/lang/Throwable;
+
+    if-eqz v1, :cond_0
+
+    const-string v1, ", cause="
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Ll0/a/r1/q;->d:Ljava/lang/Throwable;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, ""
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public v()Ll0/a/f1;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public final w()Ljava/lang/Void;
+    .locals 3
+
+    iget-object v0, p0, Ll0/a/r1/q;->d:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_1
+
+    const-string v0, "Module with the Main dispatcher had failed to initialize"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/r1/q;->e:Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    const-string v2, ". "
+
+    invoke-static {v2, v1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, ""
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    iget-object v2, p0, Ll0/a/r1/q;->d:Ljava/lang/Throwable;
+
+    invoke-direct {v1, v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Module with the Main dispatcher is missing. Add dependency providing the Main dispatcher, e.g. \'kotlinx-coroutines-android\'"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/r.smali b/com.discord/smali_classes2/l0/a/r1/r.smali
new file mode 100644
index 0000000000..e5973b4f15
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/r.smali
@@ -0,0 +1,18 @@
+.class public abstract Ll0/a/r1/r;
+.super Ljava/lang/Object;
+.source "Atomic.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(Ljava/lang/Object;)Ljava/lang/Object;
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/s.smali b/com.discord/smali_classes2/l0/a/r1/s.smali
new file mode 100644
index 0000000000..aa9827001c
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/s.smali
@@ -0,0 +1,49 @@
+.class public final Ll0/a/r1/s;
+.super Ljava/lang/Object;
+.source "LockFreeLinkedList.kt"
+
+
+# instance fields
+.field public final a:Ll0/a/r1/m;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/r1/m;)V
+    .locals 1
+
+    const-string v0, "ref"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "Removed["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/r1/s;->a:Ll0/a/r1/m;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/t.smali b/com.discord/smali_classes2/l0/a/r1/t.smali
new file mode 100644
index 0000000000..ffa8a441ca
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/t.smali
@@ -0,0 +1,312 @@
+.class public Ll0/a/r1/t;
+.super Ll0/a/a;
+.source "Scopes.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ll0/a/a<",
+        "TT;>;",
+        "Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final g:Lkotlin/coroutines/Continuation;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext;",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "uCont"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, p1, v0}, Ll0/a/a;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
+
+    iput-object p2, p0, Ll0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final B()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public P()I
+    .locals 1
+
+    const/4 v0, 0x2
+
+    return v0
+.end method
+
+.method public final getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
+
+    check-cast v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    return-object v0
+.end method
+
+.method public final getStackTraceElement()Ljava/lang/StackTraceElement;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public j(Ljava/lang/Object;I)V
+    .locals 8
+
+    instance-of v0, p1, Ll0/a/p;
+
+    const-string v1, "Invalid mode "
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x3
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x1
+
+    const/4 v6, 0x4
+
+    if-eqz v0, :cond_6
+
+    check-cast p1, Ll0/a/p;
+
+    iget-object p1, p1, Ll0/a/p;->a:Ljava/lang/Throwable;
+
+    if-ne p2, v6, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Ll0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
+
+    invoke-static {p1, v0}, Ll0/a/r1/u;->b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
+
+    const-string v7, "$this$resumeUninterceptedWithExceptionMode"
+
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "exception"
+
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_5
+
+    if-eq p2, v5, :cond_4
+
+    if-eq p2, v4, :cond_3
+
+    if-eq p2, v3, :cond_2
+
+    if-ne p2, v6, :cond_1
+
+    goto/16 :goto_1
+
+    :cond_1
+    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_2
+    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p2
+
+    invoke-static {p2, v2}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    :try_start_0
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-static {p2, v1}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p2, v1}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_3
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_4
+    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+
+    move-result-object p2
+
+    invoke-static {p2, p1}, Ll0/a/h0;->d(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :cond_5
+    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+
+    move-result-object p2
+
+    invoke-static {p1}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-interface {p2, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_6
+    iget-object v0, p0, Ll0/a/r1/t;->g:Lkotlin/coroutines/Continuation;
+
+    const-string v7, "$this$resumeUninterceptedMode"
+
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p2, :cond_b
+
+    if-eq p2, v5, :cond_a
+
+    if-eq p2, v4, :cond_9
+
+    if-eq p2, v3, :cond_8
+
+    if-ne p2, v6, :cond_7
+
+    goto :goto_1
+
+    :cond_7
+    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_8
+    invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p2
+
+    invoke-static {p2, v2}, Ll0/a/r1/x;->c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    :try_start_1
+    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    invoke-static {p2, v1}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :catchall_1
+    move-exception p1
+
+    invoke-static {p2, v1}, Ll0/a/r1/x;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_9
+    invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_a
+    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+
+    move-result-object p2
+
+    invoke-static {p2, p1}, Ll0/a/h0;->c(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_b
+    invoke-static {v0}, Lf/n/a/k/a;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+
+    move-result-object p2
+
+    invoke-interface {p2, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
+
+    :goto_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/u.smali b/com.discord/smali_classes2/l0/a/r1/u.smali
new file mode 100644
index 0000000000..8719bea47d
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/u.smali
@@ -0,0 +1,674 @@
+.class public final Ll0/a/r1/u;
+.super Ljava/lang/Object;
+.source "StackTraceRecovery.kt"
+
+
+# static fields
+.field public static final a:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    :try_start_0
+    const-string v0, "k0.l.h.a.a"
+
+    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v0
+
+    const-string v1, "Class.forName(baseContinuationImplClass)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getCanonicalName()Ljava/lang/String;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-static {v0}, Lk0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    if-nez v1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const-string v0, "kotlin.coroutines.jvm.internal.BaseContinuationImpl"
+
+    :goto_1
+    check-cast v0, Ljava/lang/String;
+
+    sput-object v0, Ll0/a/r1/u;->a:Ljava/lang/String;
+
+    :try_start_1
+    const-string v0, "l0.a.r1.u"
+
+    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v0
+
+    const-string v1, "Class.forName(stackTraceRecoveryClass)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getCanonicalName()Ljava/lang/String;
+
+    move-result-object v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    goto :goto_2
+
+    :catchall_1
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    :goto_2
+    invoke-static {v0}, Lk0/d;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    if-nez v1, :cond_1
+
+    goto :goto_3
+
+    :cond_1
+    const-string v0, "kotlinx.coroutines.internal.StackTraceRecoveryKt"
+
+    :goto_3
+    check-cast v0, Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static final a(Ljava/lang/StackTraceElement;)Z
+    .locals 3
+
+    const-string v0, "$this$isArtificial"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "className"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "\u0008\u0008\u0008"
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p0, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final b(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Throwable;",
+            ">(TE;",
+            "Lkotlin/coroutines/Continuation<",
+            "*>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "exception"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "continuation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-boolean v0, Ll0/a/b0;->c:Z
+
+    if-eqz v0, :cond_13
+
+    instance-of v0, p1, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    if-nez v0, :cond_0
+
+    goto/16 :goto_e
+
+    :cond_0
+    check-cast p1, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    invoke-virtual {p0}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v3
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_4
+
+    invoke-virtual {p0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
+
+    move-result-object v3
+
+    const-string v4, "currentTrace"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v4, v3
+
+    const/4 v5, 0x0
+
+    :goto_0
+    if-ge v5, v4, :cond_2
+
+    aget-object v6, v3, v5
+
+    const-string v7, "it"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v6}, Ll0/a/r1/u;->a(Ljava/lang/StackTraceElement;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_1
+
+    const/4 v4, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v4, 0x0
+
+    :goto_1
+    if-eqz v4, :cond_3
+
+    new-instance v4, Lkotlin/Pair;
+
+    invoke-direct {v4, v0, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    goto :goto_3
+
+    :cond_3
+    new-array v0, v2, [Ljava/lang/StackTraceElement;
+
+    new-instance v3, Lkotlin/Pair;
+
+    invoke-direct {v3, p0, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    goto :goto_2
+
+    :cond_4
+    new-array v0, v2, [Ljava/lang/StackTraceElement;
+
+    new-instance v3, Lkotlin/Pair;
+
+    invoke-direct {v3, p0, v0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+
+    :goto_2
+    move-object v4, v3
+
+    :goto_3
+    iget-object v0, v4, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    iget-object v3, v4, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast v3, [Ljava/lang/StackTraceElement;
+
+    invoke-static {v0}, Ll0/a/r1/j;->b(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_13
+
+    new-instance v5, Ljava/util/ArrayDeque;
+
+    invoke-direct {v5}, Ljava/util/ArrayDeque;-><init>()V
+
+    invoke-interface {p1}, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;->getStackTraceElement()Ljava/lang/StackTraceElement;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_5
+
+    invoke-virtual {v5, v6}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+
+    :cond_5
+    :goto_4
+    invoke-interface {p1}, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;->getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_6
+
+    invoke-interface {p1}, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;->getStackTraceElement()Ljava/lang/StackTraceElement;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_5
+
+    invoke-virtual {v5, v6}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+
+    goto :goto_4
+
+    :cond_6
+    invoke-virtual {v5}, Ljava/util/ArrayDeque;->isEmpty()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_7
+
+    goto/16 :goto_e
+
+    :cond_7
+    const/4 p1, -0x1
+
+    if-eq v0, p0, :cond_c
+
+    array-length p0, v3
+
+    const/4 v6, 0x0
+
+    :goto_5
+    if-ge v6, p0, :cond_9
+
+    aget-object v7, v3, v6
+
+    invoke-static {v7}, Ll0/a/r1/u;->a(Ljava/lang/StackTraceElement;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_8
+
+    goto :goto_6
+
+    :cond_8
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_5
+
+    :cond_9
+    const/4 v6, -0x1
+
+    :goto_6
+    add-int/2addr v6, v1
+
+    array-length p0, v3
+
+    sub-int/2addr p0, v1
+
+    if-lt p0, v6, :cond_c
+
+    :goto_7
+    aget-object v7, v3, p0
+
+    invoke-virtual {v5}, Ljava/util/ArrayDeque;->getLast()Ljava/lang/Object;
+
+    move-result-object v8
+
+    const-string v9, "result.last"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v8, Ljava/lang/StackTraceElement;
+
+    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getLineNumber()I
+
+    move-result v9
+
+    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getLineNumber()I
+
+    move-result v10
+
+    if-ne v9, v10, :cond_a
+
+    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getMethodName()Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getMethodName()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_a
+
+    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getFileName()Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getFileName()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_a
+
+    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-virtual {v8}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-static {v7, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_a
+
+    const/4 v7, 0x1
+
+    goto :goto_8
+
+    :cond_a
+    const/4 v7, 0x0
+
+    :goto_8
+    if-eqz v7, :cond_b
+
+    invoke-virtual {v5}, Ljava/util/ArrayDeque;->removeLast()Ljava/lang/Object;
+
+    :cond_b
+    aget-object v7, v3, p0
+
+    invoke-virtual {v5, v7}, Ljava/util/ArrayDeque;->addFirst(Ljava/lang/Object;)V
+
+    if-eq p0, v6, :cond_c
+
+    add-int/lit8 p0, p0, -0x1
+
+    goto :goto_7
+
+    :cond_c
+    const-string p0, "Coroutine boundary"
+
+    const-string v3, "message"
+
+    invoke-static {p0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Ljava/lang/StackTraceElement;
+
+    const-string v3, "\u0008\u0008\u0008(Coroutine boundary"
+
+    const-string v6, "\u0008"
+
+    invoke-direct {p0, v3, v6, v6, p1}, Ljava/lang/StackTraceElement;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+
+    invoke-virtual {v5, p0}, Ljava/util/ArrayDeque;->addFirst(Ljava/lang/Object;)V
+
+    invoke-virtual {v0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
+
+    move-result-object p0
+
+    const-string v0, "causeTrace"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ll0/a/r1/u;->a:Ljava/lang/String;
+
+    const-string v3, "baseContinuationImplClassName"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v3, p0
+
+    const/4 v6, 0x0
+
+    :goto_9
+    if-ge v6, v3, :cond_e
+
+    aget-object v7, p0, v6
+
+    invoke-virtual {v7}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-static {v0, v7}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_d
+
+    goto :goto_a
+
+    :cond_d
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_9
+
+    :cond_e
+    const/4 v6, -0x1
+
+    :goto_a
+    if-ne v6, p1, :cond_10
+
+    new-array p0, v2, [Ljava/lang/StackTraceElement;
+
+    invoke-virtual {v5, p0}, Ljava/util/ArrayDeque;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_f
+
+    check-cast p0, [Ljava/lang/StackTraceElement;
+
+    invoke-virtual {v4, p0}, Ljava/lang/Throwable;->setStackTrace([Ljava/lang/StackTraceElement;)V
+
+    goto :goto_d
+
+    :cond_f
+    new-instance p0, Lkotlin/TypeCastException;
+
+    const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_10
+    invoke-virtual {v5}, Ljava/util/ArrayDeque;->size()I
+
+    move-result p1
+
+    add-int/2addr p1, v6
+
+    new-array p1, p1, [Ljava/lang/StackTraceElement;
+
+    const/4 v0, 0x0
+
+    :goto_b
+    if-ge v0, v6, :cond_11
+
+    aget-object v3, p0, v0
+
+    aput-object v3, p1, v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_b
+
+    :cond_11
+    invoke-virtual {v5}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_c
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_12
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/StackTraceElement;
+
+    add-int v3, v6, v2
+
+    aput-object v0, p1, v3
+
+    add-int/2addr v2, v1
+
+    goto :goto_c
+
+    :cond_12
+    invoke-virtual {v4, p1}, Ljava/lang/Throwable;->setStackTrace([Ljava/lang/StackTraceElement;)V
+
+    :goto_d
+    move-object p0, v4
+
+    :cond_13
+    :goto_e
+    return-object p0
+.end method
+
+.method public static final c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Throwable;",
+            ">(TE;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "exception"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-boolean v0, Ll0/a/b0;->c:Z
+
+    if-nez v0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/lang/Throwable;->getCause()Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    xor-int/2addr v1, v2
+
+    if-eqz v1, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    invoke-virtual {p0}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
+
+    move-result-object v1
+
+    const-string v3, "exception.stackTrace"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v3, v1
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    :goto_0
+    if-ge v5, v3, :cond_3
+
+    aget-object v6, v1, v5
+
+    const-string v7, "it"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v6}, Ll0/a/r1/u;->a(Ljava/lang/StackTraceElement;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_4
+
+    return-object v0
+
+    :cond_4
+    :goto_2
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/v.smali b/com.discord/smali_classes2/l0/a/r1/v.smali
new file mode 100644
index 0000000000..878d102e66
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/v.smali
@@ -0,0 +1,33 @@
+.class public final Ll0/a/r1/v;
+.super Ljava/lang/Object;
+.source "Symbol.kt"
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "symbol"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/r1/v;->a:Ljava/lang/String;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/r1/v;->a:Ljava/lang/String;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/w.smali b/com.discord/smali_classes2/l0/a/r1/w.smali
new file mode 100644
index 0000000000..9fd85ee14a
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/w.smali
@@ -0,0 +1,48 @@
+.class public final synthetic Ll0/a/r1/w;
+.super Ljava/lang/Object;
+.source "SystemProps.kt"
+
+
+# static fields
+.field public static final a:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
+
+    move-result v0
+
+    sput v0, Ll0/a/r1/w;->a:I
+
+    return-void
+.end method
+
+.method public static final a(Ljava/lang/String;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "propertyName"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-static {p0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/x$a.smali b/com.discord/smali_classes2/l0/a/r1/x$a.smali
new file mode 100644
index 0000000000..4248fd04ba
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/x$a.smali
@@ -0,0 +1,112 @@
+.class public final Ll0/a/r1/x$a;
+.super Lk0/o/c/j;
+.source "ThreadContext.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/r1/x;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ll0/a/r1/x$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/r1/x$a;
+
+    invoke-direct {v0}, Ll0/a/r1/x$a;-><init>()V
+
+    sput-object v0, Ll0/a/r1/x$a;->d:Ll0/a/r1/x$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
+
+    const-string v0, "element"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p2, Ll0/a/m1;
+
+    if-eqz v0, :cond_3
+
+    instance-of v0, p1, Ljava/lang/Integer;
+
+    if-nez v0, :cond_0
+
+    const/4 p1, 0x0
+
+    :cond_0
+    check-cast p1, Ljava/lang/Integer;
+
+    const/4 v0, 0x1
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x1
+
+    :goto_0
+    if-nez p1, :cond_2
+
+    move-object p1, p2
+
+    goto :goto_1
+
+    :cond_2
+    add-int/2addr p1, v0
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    :cond_3
+    :goto_1
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/x$b.smali b/com.discord/smali_classes2/l0/a/r1/x$b.smali
new file mode 100644
index 0000000000..a88e6e19ab
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/x$b.smali
@@ -0,0 +1,90 @@
+.class public final Ll0/a/r1/x$b;
+.super Lk0/o/c/j;
+.source "ThreadContext.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/r1/x;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ll0/a/m1<",
+        "*>;",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "Ll0/a/m1<",
+        "*>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ll0/a/r1/x$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/r1/x$b;
+
+    invoke-direct {v0}, Ll0/a/r1/x$b;-><init>()V
+
+    sput-object v0, Ll0/a/r1/x$b;->d:Ll0/a/r1/x$b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ll0/a/m1;
+
+    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
+
+    const-string v0, "element"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    instance-of p1, p2, Ll0/a/m1;
+
+    if-nez p1, :cond_1
+
+    const/4 p2, 0x0
+
+    :cond_1
+    move-object p1, p2
+
+    check-cast p1, Ll0/a/m1;
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/x$c.smali b/com.discord/smali_classes2/l0/a/r1/x$c.smali
new file mode 100644
index 0000000000..657768d1b6
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/x$c.smali
@@ -0,0 +1,97 @@
+.class public final Ll0/a/r1/x$c;
+.super Lk0/o/c/j;
+.source "ThreadContext.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/r1/x;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ll0/a/r1/a0;",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "Ll0/a/r1/a0;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ll0/a/r1/x$c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/r1/x$c;
+
+    invoke-direct {v0}, Ll0/a/r1/x$c;-><init>()V
+
+    sput-object v0, Ll0/a/r1/x$c;->d:Ll0/a/r1/x$c;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+
+    check-cast p1, Ll0/a/r1/a0;
+
+    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "element"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p2, Ll0/a/m1;
+
+    if-eqz v0, :cond_0
+
+    check-cast p2, Ll0/a/m1;
+
+    iget-object v0, p1, Ll0/a/r1/a0;->c:Lkotlin/coroutines/CoroutineContext;
+
+    iget-object v1, p1, Ll0/a/r1/a0;->a:[Ljava/lang/Object;
+
+    iget v2, p1, Ll0/a/r1/a0;->b:I
+
+    add-int/lit8 v3, v2, 0x1
+
+    iput v3, p1, Ll0/a/r1/a0;->b:I
+
+    aget-object v1, v1, v2
+
+    invoke-interface {p2, v0, v1}, Ll0/a/m1;->k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    :cond_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/x$d.smali b/com.discord/smali_classes2/l0/a/r1/x$d.smali
new file mode 100644
index 0000000000..11e97366b1
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/x$d.smali
@@ -0,0 +1,99 @@
+.class public final Ll0/a/r1/x$d;
+.super Lk0/o/c/j;
+.source "ThreadContext.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/r1/x;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Ll0/a/r1/a0;",
+        "Lkotlin/coroutines/CoroutineContext$a;",
+        "Ll0/a/r1/a0;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ll0/a/r1/x$d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/r1/x$d;
+
+    invoke-direct {v0}, Ll0/a/r1/x$d;-><init>()V
+
+    sput-object v0, Ll0/a/r1/x$d;->d:Ll0/a/r1/x$d;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Ll0/a/r1/a0;
+
+    check-cast p2, Lkotlin/coroutines/CoroutineContext$a;
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "element"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p2, Ll0/a/m1;
+
+    if-eqz v0, :cond_0
+
+    check-cast p2, Ll0/a/m1;
+
+    iget-object v0, p1, Ll0/a/r1/a0;->c:Lkotlin/coroutines/CoroutineContext;
+
+    invoke-interface {p2, v0}, Ll0/a/m1;->r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    iget-object v0, p1, Ll0/a/r1/a0;->a:[Ljava/lang/Object;
+
+    iget v1, p1, Ll0/a/r1/a0;->b:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p1, Ll0/a/r1/a0;->b:I
+
+    aput-object p2, v0, v1
+
+    :cond_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/x.smali b/com.discord/smali_classes2/l0/a/r1/x.smali
new file mode 100644
index 0000000000..693ea8dd7e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/x.smali
@@ -0,0 +1,253 @@
+.class public final Ll0/a/r1/x;
+.super Ljava/lang/Object;
+.source "ThreadContext.kt"
+
+
+# static fields
+.field public static final a:Ll0/a/r1/v;
+
+.field public static final b:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "Ljava/lang/Object;",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final c:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "Ll0/a/m1<",
+            "*>;",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "Ll0/a/m1<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+.field public static final d:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "Ll0/a/r1/a0;",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "Ll0/a/r1/a0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final e:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "Ll0/a/r1/a0;",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "Ll0/a/r1/a0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "ZERO"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/r1/x;->a:Ll0/a/r1/v;
+
+    sget-object v0, Ll0/a/r1/x$a;->d:Ll0/a/r1/x$a;
+
+    sput-object v0, Ll0/a/r1/x;->b:Lkotlin/jvm/functions/Function2;
+
+    sget-object v0, Ll0/a/r1/x$b;->d:Ll0/a/r1/x$b;
+
+    sput-object v0, Ll0/a/r1/x;->c:Lkotlin/jvm/functions/Function2;
+
+    sget-object v0, Ll0/a/r1/x$d;->d:Ll0/a/r1/x$d;
+
+    sput-object v0, Ll0/a/r1/x;->d:Lkotlin/jvm/functions/Function2;
+
+    sget-object v0, Ll0/a/r1/x$c;->d:Ll0/a/r1/x$c;
+
+    sput-object v0, Ll0/a/r1/x;->e:Lkotlin/jvm/functions/Function2;
+
+    return-void
+.end method
+
+.method public static final a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ll0/a/r1/x;->a:Ll0/a/r1/v;
+
+    if-ne p1, v0, :cond_0
+
+    return-void
+
+    :cond_0
+    instance-of v0, p1, Ll0/a/r1/a0;
+
+    if-eqz v0, :cond_1
+
+    move-object v0, p1
+
+    check-cast v0, Ll0/a/r1/a0;
+
+    const/4 v1, 0x0
+
+    iput v1, v0, Ll0/a/r1/a0;->b:I
+
+    sget-object v0, Ll0/a/r1/x;->e:Lkotlin/jvm/functions/Function2;
+
+    invoke-interface {p0, p1, v0}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    sget-object v1, Ll0/a/r1/x;->c:Lkotlin/jvm/functions/Function2;
+
+    invoke-interface {p0, v0, v1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    check-cast v0, Ll0/a/m1;
+
+    invoke-interface {v0, p0, p1}, Ll0/a/m1;->k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+
+    :goto_0
+    return-void
+
+    :cond_2
+    new-instance p0, Lkotlin/TypeCastException;
+
+    const-string p1, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement<kotlin.Any?>"
+
+    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final b(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sget-object v1, Ll0/a/r1/x;->b:Lkotlin/jvm/functions/Function2;
+
+    invoke-interface {p0, v0, v1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static final c(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p0}, Ll0/a/r1/x;->b(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    :goto_0
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    if-ne p1, v0, :cond_1
+
+    sget-object p0, Ll0/a/r1/x;->a:Ll0/a/r1/v;
+
+    goto :goto_1
+
+    :cond_1
+    instance-of v0, p1, Ljava/lang/Integer;
+
+    if-eqz v0, :cond_2
+
+    new-instance v0, Ll0/a/r1/a0;
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
+
+    move-result p1
+
+    invoke-direct {v0, p0, p1}, Ll0/a/r1/a0;-><init>(Lkotlin/coroutines/CoroutineContext;I)V
+
+    sget-object p1, Ll0/a/r1/x;->d:Lkotlin/jvm/functions/Function2;
+
+    invoke-interface {p0, v0, p1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    goto :goto_1
+
+    :cond_2
+    if-eqz p1, :cond_3
+
+    check-cast p1, Ll0/a/m1;
+
+    invoke-interface {p1, p0}, Ll0/a/m1;->r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    :goto_1
+    return-object p0
+
+    :cond_3
+    new-instance p0, Lkotlin/TypeCastException;
+
+    const-string p1, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement<kotlin.Any?>"
+
+    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/y.smali b/com.discord/smali_classes2/l0/a/r1/y.smali
new file mode 100644
index 0000000000..cf0ce85bd0
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/y.smali
@@ -0,0 +1,532 @@
+.class public Ll0/a/r1/y;
+.super Ljava/lang/Object;
+.source "ThreadSafeHeap.common.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T::",
+        "Ll0/a/r1/z;",
+        ":",
+        "Ljava/lang/Comparable<",
+        "-TT;>;>",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public volatile _size:I
+
+.field public a:[Ll0/a/r1/z;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ll0/a/r1/y;
+
+    const-string v1, "_size"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Ll0/a/r1/y;->_size:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ll0/a/r1/z;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    const-string v0, "node"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p1}, Ll0/a/r1/z;->i()Ll0/a/r1/y;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_2
+    :goto_1
+    invoke-interface {p1, p0}, Ll0/a/r1/z;->g(Ll0/a/r1/y;)V
+
+    iget-object v0, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    if-nez v0, :cond_3
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Ll0/a/r1/z;
+
+    iput-object v0, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    goto :goto_2
+
+    :cond_3
+    iget v1, p0, Ll0/a/r1/y;->_size:I
+
+    array-length v2, v0
+
+    if-lt v1, v2, :cond_4
+
+    iget v1, p0, Ll0/a/r1/y;->_size:I
+
+    mul-int/lit8 v1, v1, 0x2
+
+    invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v1, "java.util.Arrays.copyOf(this, newSize)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, [Ll0/a/r1/z;
+
+    iput-object v0, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    :cond_4
+    :goto_2
+    iget v1, p0, Ll0/a/r1/y;->_size:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Ll0/a/r1/y;->_size:I
+
+    aput-object p1, v0, v1
+
+    invoke-interface {p1, v1}, Ll0/a/r1/z;->f(I)V
+
+    invoke-virtual {p0, v1}, Ll0/a/r1/y;->d(I)V
+
+    return-void
+.end method
+
+.method public final b()Ll0/a/r1/z;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    if-eqz v0, :cond_0
+
+    const/4 v1, 0x0
+
+    aget-object v0, v0, v1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public final c(I)Ll0/a/r1/z;
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)TT;"
+        }
+    .end annotation
+
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_2
+
+    iget v0, p0, Ll0/a/r1/y;->_size:I
+
+    if-lez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_2
+    :goto_1
+    iget-object v0, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    const/4 v3, 0x0
+
+    if-eqz v0, :cond_13
+
+    iget v4, p0, Ll0/a/r1/y;->_size:I
+
+    const/4 v5, -0x1
+
+    add-int/2addr v4, v5
+
+    iput v4, p0, Ll0/a/r1/y;->_size:I
+
+    iget v4, p0, Ll0/a/r1/y;->_size:I
+
+    if-ge p1, v4, :cond_e
+
+    iget v4, p0, Ll0/a/r1/y;->_size:I
+
+    invoke-virtual {p0, p1, v4}, Ll0/a/r1/y;->e(II)V
+
+    add-int/lit8 v4, p1, -0x1
+
+    div-int/lit8 v4, v4, 0x2
+
+    if-lez p1, :cond_5
+
+    aget-object v6, v0, p1
+
+    if-eqz v6, :cond_4
+
+    check-cast v6, Ljava/lang/Comparable;
+
+    aget-object v7, v0, v4
+
+    if-eqz v7, :cond_3
+
+    invoke-interface {v6, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result v6
+
+    if-gez v6, :cond_5
+
+    invoke-virtual {p0, p1, v4}, Ll0/a/r1/y;->e(II)V
+
+    invoke-virtual {p0, v4}, Ll0/a/r1/y;->d(I)V
+
+    goto :goto_4
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_5
+    :goto_2
+    mul-int/lit8 v4, p1, 0x2
+
+    add-int/2addr v4, v2
+
+    iget v6, p0, Ll0/a/r1/y;->_size:I
+
+    if-lt v4, v6, :cond_6
+
+    goto :goto_4
+
+    :cond_6
+    iget-object v6, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    if-eqz v6, :cond_d
+
+    add-int/lit8 v7, v4, 0x1
+
+    iget v8, p0, Ll0/a/r1/y;->_size:I
+
+    if-ge v7, v8, :cond_9
+
+    aget-object v8, v6, v7
+
+    if-eqz v8, :cond_8
+
+    check-cast v8, Ljava/lang/Comparable;
+
+    aget-object v9, v6, v4
+
+    if-eqz v9, :cond_7
+
+    invoke-interface {v8, v9}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result v8
+
+    if-gez v8, :cond_9
+
+    move v4, v7
+
+    goto :goto_3
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_9
+    :goto_3
+    aget-object v7, v6, p1
+
+    if-eqz v7, :cond_c
+
+    check-cast v7, Ljava/lang/Comparable;
+
+    aget-object v6, v6, v4
+
+    if-eqz v6, :cond_b
+
+    invoke-interface {v7, v6}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result v6
+
+    if-gtz v6, :cond_a
+
+    goto :goto_4
+
+    :cond_a
+    invoke-virtual {p0, p1, v4}, Ll0/a/r1/y;->e(II)V
+
+    move p1, v4
+
+    goto :goto_2
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_d
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_e
+    :goto_4
+    iget p1, p0, Ll0/a/r1/y;->_size:I
+
+    aget-object p1, v0, p1
+
+    if-eqz p1, :cond_12
+
+    sget-boolean v4, Ll0/a/b0;->a:Z
+
+    if-eqz v4, :cond_11
+
+    invoke-interface {p1}, Ll0/a/r1/z;->i()Ll0/a/r1/y;
+
+    move-result-object v4
+
+    if-ne v4, p0, :cond_f
+
+    const/4 v1, 0x1
+
+    :cond_f
+    if-eqz v1, :cond_10
+
+    goto :goto_5
+
+    :cond_10
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_11
+    :goto_5
+    invoke-interface {p1, v3}, Ll0/a/r1/z;->g(Ll0/a/r1/y;)V
+
+    invoke-interface {p1, v5}, Ll0/a/r1/z;->f(I)V
+
+    iget v1, p0, Ll0/a/r1/y;->_size:I
+
+    aput-object v3, v0, v1
+
+    return-object p1
+
+    :cond_12
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_13
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+.end method
+
+.method public final d(I)V
+    .locals 4
+
+    :goto_0
+    if-gtz p1, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_4
+
+    add-int/lit8 v2, p1, -0x1
+
+    div-int/lit8 v2, v2, 0x2
+
+    aget-object v3, v0, v2
+
+    if-eqz v3, :cond_3
+
+    check-cast v3, Ljava/lang/Comparable;
+
+    aget-object v0, v0, p1
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {v3, v0}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result v0
+
+    if-gtz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {p0, p1, v2}, Ll0/a/r1/y;->e(II)V
+
+    move p1, v2
+
+    goto :goto_0
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public final e(II)V
+    .locals 4
+
+    iget-object v0, p0, Ll0/a/r1/y;->a:[Ll0/a/r1/z;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_2
+
+    aget-object v2, v0, p2
+
+    if-eqz v2, :cond_1
+
+    aget-object v3, v0, p1
+
+    if-eqz v3, :cond_0
+
+    aput-object v2, v0, p1
+
+    aput-object v3, v0, p2
+
+    invoke-interface {v2, p1}, Ll0/a/r1/z;->f(I)V
+
+    invoke-interface {v3, p2}, Ll0/a/r1/z;->f(I)V
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/r1/z.smali b/com.discord/smali_classes2/l0/a/r1/z.smali
new file mode 100644
index 0000000000..136ffa1c26
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/r1/z.smali
@@ -0,0 +1,31 @@
+.class public interface abstract Ll0/a/r1/z;
+.super Ljava/lang/Object;
+.source "ThreadSafeHeap.common.kt"
+
+
+# virtual methods
+.method public abstract f(I)V
+.end method
+
+.method public abstract g(Ll0/a/r1/y;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ll0/a/r1/y<",
+            "*>;)V"
+        }
+    .end annotation
+.end method
+
+.method public abstract i()Ll0/a/r1/y;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ll0/a/r1/y<",
+            "*>;"
+        }
+    .end annotation
+.end method
+
+.method public abstract j()I
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s.smali b/com.discord/smali_classes2/l0/a/s.smali
new file mode 100644
index 0000000000..3113e30375
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s.smali
@@ -0,0 +1,33 @@
+.class public abstract Ll0/a/s;
+.super Ll0/a/r1/m;
+.source "CompletionHandler.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/r1/m;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Throwable;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/r1/m;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract i(Ljava/lang/Throwable;)V
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s0.smali b/com.discord/smali_classes2/l0/a/s0.smali
new file mode 100644
index 0000000000..d53f1cd7ed
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s0.smali
@@ -0,0 +1,42 @@
+.class public final Ll0/a/s0;
+.super Ljava/lang/Object;
+.source "CoroutineScope.kt"
+
+# interfaces
+.implements Lkotlinx/coroutines/CoroutineScope;
+
+
+# static fields
+.field public static final d:Ll0/a/s0;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/s0;
+
+    invoke-direct {v0}, Ll0/a/s0;-><init>()V
+
+    sput-object v0, Ll0/a/s0;->d:Ll0/a/s0;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    sget-object v0, Lk0/l/f;->d:Lk0/l/f;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/a$a.smali b/com.discord/smali_classes2/l0/a/s1/a$a.smali
new file mode 100644
index 0000000000..d2b326234c
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/a$a.smali
@@ -0,0 +1,1222 @@
+.class public final Ll0/a/s1/a$a;
+.super Ljava/lang/Thread;
+.source "CoroutineScheduler.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/s1/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field public final d:Ll0/a/s1/n;
+
+.field public e:J
+
+.field public f:J
+
+.field public g:I
+
+.field public h:I
+
+.field public i:I
+
+.field public volatile indexInArray:I
+
+.field public final synthetic j:Ll0/a/s1/a;
+
+.field public volatile nextParkedWorker:Ljava/lang/Object;
+
+.field public volatile spins:I
+
+.field public volatile state:Ll0/a/s1/a$b;
+
+.field public volatile terminationState:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ll0/a/s1/a$a;
+
+    const-string v1, "terminationState"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/s1/a$a;->k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ll0/a/s1/a;I)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-direct {p0}, Ljava/lang/Thread;-><init>()V
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0}, Ljava/lang/Thread;->setDaemon(Z)V
+
+    new-instance v0, Ll0/a/s1/n;
+
+    invoke-direct {v0}, Ll0/a/s1/n;-><init>()V
+
+    iput-object v0, p0, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    sget-object v0, Ll0/a/s1/a$b;->g:Ll0/a/s1/a$b;
+
+    iput-object v0, p0, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Ll0/a/s1/a$a;->terminationState:I
+
+    sget-object v0, Ll0/a/s1/a;->s:Ll0/a/r1/v;
+
+    iput-object v0, p0, Ll0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
+
+    sget v0, Ll0/a/s1/a;->r:I
+
+    iput v0, p0, Ll0/a/s1/a$a;->g:I
+
+    iget-object p1, p1, Ll0/a/s1/a;->g:Ljava/util/Random;
+
+    invoke-virtual {p1}, Ljava/util/Random;->nextInt()I
+
+    move-result p1
+
+    iput p1, p0, Ll0/a/s1/a$a;->h:I
+
+    invoke-virtual {p0, p2}, Ll0/a/s1/a$a;->d(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Z
+    .locals 3
+
+    iget-object v0, p0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v0, v0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    sget-object v1, Ll0/a/s1/k;->e:Ll0/a/s1/k;
+
+    invoke-virtual {v0, v1}, Ll0/a/s1/d;->c(Ll0/a/s1/k;)Ll0/a/s1/h;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v1, p0, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    iget-object v2, p0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v2, v2, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    invoke-virtual {v1, v0, v2}, Ll0/a/s1/n;->a(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public final b()Ll0/a/s1/h;
+    .locals 19
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {p0 .. p0}, Ll0/a/s1/a$a;->e()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_14
+
+    iget-object v1, v0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget v1, v1, Ll0/a/s1/a;->h:I
+
+    const/4 v2, 0x2
+
+    mul-int/lit8 v1, v1, 0x2
+
+    invoke-virtual {v0, v1}, Ll0/a/s1/a$a;->c(I)I
+
+    move-result v1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-nez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget-object v5, v0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v5, v5, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    sget-object v6, Ll0/a/s1/k;->d:Ll0/a/s1/k;
+
+    invoke-virtual {v5, v6}, Ll0/a/s1/d;->c(Ll0/a/s1/k;)Ll0/a/s1/h;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_1
+
+    goto/16 :goto_7
+
+    :cond_1
+    iget-object v5, v0, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    invoke-virtual {v5}, Ll0/a/s1/n;->e()Ll0/a/s1/h;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_2
+
+    goto/16 :goto_7
+
+    :cond_2
+    if-nez v1, :cond_3
+
+    iget-object v1, v0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v1, v1, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    invoke-virtual {v1}, Ll0/a/r1/n;->b()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v5, v1
+
+    check-cast v5, Ll0/a/s1/h;
+
+    if-eqz v5, :cond_3
+
+    goto/16 :goto_7
+
+    :cond_3
+    iget-object v1, v0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-wide v5, v1, Ll0/a/s1/a;->controlState:J
+
+    const-wide/32 v7, 0x1fffff
+
+    and-long/2addr v5, v7
+
+    long-to-int v1, v5
+
+    const/4 v5, 0x0
+
+    if-ge v1, v2, :cond_4
+
+    goto/16 :goto_7
+
+    :cond_4
+    iget v6, v0, Ll0/a/s1/a$a;->i:I
+
+    if-nez v6, :cond_5
+
+    invoke-virtual {v0, v1}, Ll0/a/s1/a$a;->c(I)I
+
+    move-result v6
+
+    :cond_5
+    add-int/2addr v6, v4
+
+    if-le v6, v1, :cond_6
+
+    const/4 v6, 0x1
+
+    :cond_6
+    iput v6, v0, Ll0/a/s1/a$a;->i:I
+
+    iget-object v1, v0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v7, v1, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aget-object v6, v7, v6
+
+    if-eqz v6, :cond_13
+
+    if-eq v6, v0, :cond_13
+
+    iget-object v7, v0, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    iget-object v6, v6, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    iget-object v1, v1, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    if-eqz v7, :cond_12
+
+    const-string v8, "victim"
+
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "globalQueue"
+
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v8, Ll0/a/s1/l;->f:Ll0/a/s1/m;
+
+    check-cast v8, Ll0/a/s1/f;
+
+    if-eqz v8, :cond_11
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v8
+
+    invoke-virtual {v6}, Ll0/a/s1/n;->d()I
+
+    move-result v10
+
+    if-nez v10, :cond_8
+
+    iget-object v2, v6, Ll0/a/s1/n;->lastScheduledTask:Ljava/lang/Object;
+
+    check-cast v2, Ll0/a/s1/h;
+
+    if-eqz v2, :cond_10
+
+    iget-wide v10, v2, Ll0/a/s1/h;->d:J
+
+    sub-long/2addr v8, v10
+
+    sget-wide v10, Ll0/a/s1/l;->a:J
+
+    cmp-long v12, v8, v10
+
+    if-gez v12, :cond_7
+
+    goto :goto_6
+
+    :cond_7
+    sget-object v8, Ll0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v8, v6, v2, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_10
+
+    invoke-virtual {v7, v2, v1}, Ll0/a/s1/n;->a(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+
+    const/4 v3, 0x1
+
+    goto :goto_6
+
+    :cond_8
+    div-int/2addr v10, v2
+
+    if-ge v10, v4, :cond_9
+
+    const/4 v10, 0x1
+
+    :cond_9
+    const/4 v2, 0x0
+
+    const/4 v11, 0x0
+
+    :goto_1
+    if-ge v2, v10, :cond_f
+
+    :cond_a
+    iget v12, v6, Ll0/a/s1/n;->consumerIndex:I
+
+    iget v13, v6, Ll0/a/s1/n;->producerIndex:I
+
+    sub-int v13, v12, v13
+
+    if-nez v13, :cond_b
+
+    goto :goto_4
+
+    :cond_b
+    and-int/lit8 v13, v12, 0x7f
+
+    iget-object v14, v6, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v14, v13}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v14
+
+    check-cast v14, Ll0/a/s1/h;
+
+    if-eqz v14, :cond_a
+
+    iget-wide v14, v14, Ll0/a/s1/h;->d:J
+
+    sub-long v14, v8, v14
+
+    sget-wide v16, Ll0/a/s1/l;->a:J
+
+    cmp-long v18, v14, v16
+
+    if-gez v18, :cond_d
+
+    invoke-virtual {v6}, Ll0/a/s1/n;->d()I
+
+    move-result v14
+
+    sget v15, Ll0/a/s1/l;->b:I
+
+    if-le v14, v15, :cond_c
+
+    goto :goto_2
+
+    :cond_c
+    const/4 v14, 0x0
+
+    goto :goto_3
+
+    :cond_d
+    :goto_2
+    const/4 v14, 0x1
+
+    :goto_3
+    if-nez v14, :cond_e
+
+    :goto_4
+    move-object v12, v5
+
+    goto :goto_5
+
+    :cond_e
+    sget-object v14, Ll0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    add-int/lit8 v15, v12, 0x1
+
+    invoke-virtual {v14, v6, v12, v15}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_a
+
+    iget-object v12, v6, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v12, v13, v5}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v12
+
+    check-cast v12, Ll0/a/s1/h;
+
+    :goto_5
+    if-eqz v12, :cond_f
+
+    invoke-virtual {v7, v12, v1}, Ll0/a/s1/n;->a(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+
+    add-int/lit8 v2, v2, 0x1
+
+    const/4 v11, 0x1
+
+    goto :goto_1
+
+    :cond_f
+    move v3, v11
+
+    :cond_10
+    :goto_6
+    if-eqz v3, :cond_13
+
+    iget-object v1, v0, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    invoke-virtual {v1}, Ll0/a/s1/n;->e()Ll0/a/s1/h;
+
+    move-result-object v1
+
+    move-object v5, v1
+
+    goto :goto_7
+
+    :cond_11
+    throw v5
+
+    :cond_12
+    throw v5
+
+    :cond_13
+    :goto_7
+    return-object v5
+
+    :cond_14
+    iget-object v1, v0, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    invoke-virtual {v1}, Ll0/a/s1/n;->e()Ll0/a/s1/h;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_15
+
+    goto :goto_8
+
+    :cond_15
+    iget-object v1, v0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v1, v1, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    sget-object v2, Ll0/a/s1/k;->e:Ll0/a/s1/k;
+
+    invoke-virtual {v1, v2}, Ll0/a/s1/d;->c(Ll0/a/s1/k;)Ll0/a/s1/h;
+
+    move-result-object v1
+
+    :goto_8
+    return-object v1
+.end method
+
+.method public final c(I)I
+    .locals 3
+
+    iget v0, p0, Ll0/a/s1/a$a;->h:I
+
+    shl-int/lit8 v1, v0, 0xd
+
+    xor-int/2addr v0, v1
+
+    iput v0, p0, Ll0/a/s1/a$a;->h:I
+
+    shr-int/lit8 v1, v0, 0x11
+
+    xor-int/2addr v0, v1
+
+    iput v0, p0, Ll0/a/s1/a$a;->h:I
+
+    shl-int/lit8 v1, v0, 0x5
+
+    xor-int/2addr v0, v1
+
+    iput v0, p0, Ll0/a/s1/a$a;->h:I
+
+    add-int/lit8 v1, p1, -0x1
+
+    and-int v2, v1, p1
+
+    if-nez v2, :cond_0
+
+    and-int p1, v0, v1
+
+    return p1
+
+    :cond_0
+    const v1, 0x7fffffff
+
+    and-int/2addr v0, v1
+
+    rem-int/2addr v0, p1
+
+    return v0
+.end method
+
+.method public final d(I)V
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v1, v1, Ll0/a/s1/a;->k:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "-worker-"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    if-nez p1, :cond_0
+
+    const-string v1, "TERMINATED"
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    :goto_0
+    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
+
+    invoke-virtual {p0, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    iput p1, p0, Ll0/a/s1/a$a;->indexInArray:I
+
+    return-void
+.end method
+
+.method public final e()Z
+    .locals 3
+
+    sget-object v0, Ll0/a/s1/a$b;->d:Ll0/a/s1/a$b;
+
+    iget-object v1, p0, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    const/4 v2, 0x1
+
+    if-ne v1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, p0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v1, v1, Ll0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/Semaphore;->tryAcquire()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iput-object v0, p0, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_0
+    return v2
+.end method
+
+.method public final f(Ll0/a/s1/a$b;)Z
+    .locals 3
+
+    const-string v0, "newState"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    sget-object v1, Ll0/a/s1/a$b;->d:Ll0/a/s1/a$b;
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget-object v2, p0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v2, v2, Ll0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/Semaphore;->release()V
+
+    :cond_1
+    if-eq v0, p1, :cond_2
+
+    iput-object p1, p0, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    :cond_2
+    return v1
+.end method
+
+.method public run()V
+    .locals 18
+
+    move-object/from16 v1, p0
+
+    sget-object v0, Ll0/a/s1/k;->d:Ll0/a/s1/k;
+
+    sget-object v2, Ll0/a/s1/a$b;->f:Ll0/a/s1/a$b;
+
+    sget-object v3, Ll0/a/s1/a$b;->e:Ll0/a/s1/a$b;
+
+    sget-object v4, Ll0/a/s1/a$b;->h:Ll0/a/s1/a$b;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    :goto_0
+    iget-object v7, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget v7, v7, Ll0/a/s1/a;->_isTerminated:I
+
+    const/4 v8, 0x1
+
+    if-eqz v7, :cond_0
+
+    const/4 v7, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v7, 0x0
+
+    :goto_1
+    if-nez v7, :cond_21
+
+    iget-object v7, v1, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    if-eq v7, v4, :cond_21
+
+    invoke-virtual/range {p0 .. p0}, Ll0/a/s1/a$a;->b()Ll0/a/s1/h;
+
+    move-result-object v7
+
+    const-wide/16 v9, 0x0
+
+    const/4 v11, 0x0
+
+    if-nez v7, :cond_12
+
+    iget-object v6, v1, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    sget-object v7, Ll0/a/s1/a$b;->d:Ll0/a/s1/a$b;
+
+    if-ne v6, v7, :cond_5
+
+    iget v6, v1, Ll0/a/s1/a$a;->spins:I
+
+    sget v7, Ll0/a/s1/a;->p:I
+
+    if-gt v6, v7, :cond_1
+
+    add-int/lit8 v7, v6, 0x1
+
+    iput v7, v1, Ll0/a/s1/a$a;->spins:I
+
+    sget v7, Ll0/a/s1/a;->o:I
+
+    if-lt v6, v7, :cond_11
+
+    invoke-static {}, Ljava/lang/Thread;->yield()V
+
+    goto/16 :goto_6
+
+    :cond_1
+    iget v6, v1, Ll0/a/s1/a$a;->g:I
+
+    sget v7, Ll0/a/s1/a;->q:I
+
+    if-ge v6, v7, :cond_3
+
+    mul-int/lit8 v6, v6, 0x3
+
+    ushr-int/2addr v6, v8
+
+    if-le v6, v7, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    move v7, v6
+
+    :goto_2
+    iput v7, v1, Ll0/a/s1/a$a;->g:I
+
+    :cond_3
+    invoke-virtual {v1, v2}, Ll0/a/s1/a$a;->f(Ll0/a/s1/a$b;)Z
+
+    iget v6, v1, Ll0/a/s1/a$a;->g:I
+
+    int-to-long v6, v6
+
+    iget-object v9, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-static {v9, v1}, Ll0/a/s1/a;->a(Ll0/a/s1/a;Ll0/a/s1/a$a;)V
+
+    invoke-virtual/range {p0 .. p0}, Ll0/a/s1/a$a;->a()Z
+
+    move-result v9
+
+    if-nez v9, :cond_4
+
+    goto/16 :goto_6
+
+    :cond_4
+    invoke-static {v6, v7}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(J)V
+
+    goto/16 :goto_6
+
+    :cond_5
+    invoke-virtual {v1, v2}, Ll0/a/s1/a$a;->f(Ll0/a/s1/a$b;)Z
+
+    invoke-virtual/range {p0 .. p0}, Ll0/a/s1/a$a;->a()Z
+
+    move-result v6
+
+    if-nez v6, :cond_6
+
+    goto/16 :goto_6
+
+    :cond_6
+    iput v5, v1, Ll0/a/s1/a$a;->terminationState:I
+
+    iget-wide v6, v1, Ll0/a/s1/a$a;->e:J
+
+    cmp-long v12, v6, v9
+
+    if-nez v12, :cond_7
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v6
+
+    iget-object v12, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-wide v12, v12, Ll0/a/s1/a;->j:J
+
+    add-long/2addr v6, v12
+
+    iput-wide v6, v1, Ll0/a/s1/a$a;->e:J
+
+    :cond_7
+    iget-object v6, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-wide v12, v6, Ll0/a/s1/a;->j:J
+
+    invoke-static {v6, v1}, Ll0/a/s1/a;->a(Ll0/a/s1/a;Ll0/a/s1/a$a;)V
+
+    invoke-virtual/range {p0 .. p0}, Ll0/a/s1/a$a;->a()Z
+
+    move-result v6
+
+    if-nez v6, :cond_8
+
+    const/4 v6, 0x0
+
+    goto :goto_3
+
+    :cond_8
+    invoke-static {v12, v13}, Ljava/util/concurrent/locks/LockSupport;->parkNanos(J)V
+
+    const/4 v6, 0x1
+
+    :goto_3
+    if-nez v6, :cond_9
+
+    goto/16 :goto_6
+
+    :cond_9
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v6
+
+    iget-wide v12, v1, Ll0/a/s1/a$a;->e:J
+
+    sub-long/2addr v6, v12
+
+    cmp-long v12, v6, v9
+
+    if-ltz v12, :cond_11
+
+    iput-wide v9, v1, Ll0/a/s1/a$a;->e:J
+
+    iget-object v6, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v6, v6, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    monitor-enter v6
+
+    :try_start_0
+    iget-object v7, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget v7, v7, Ll0/a/s1/a;->_isTerminated:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v7, :cond_a
+
+    const/4 v7, 0x1
+
+    goto :goto_4
+
+    :cond_a
+    const/4 v7, 0x0
+
+    :goto_4
+    if-eqz v7, :cond_b
+
+    monitor-exit v6
+
+    goto :goto_6
+
+    :cond_b
+    :try_start_1
+    iget-object v7, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-wide v9, v7, Ll0/a/s1/a;->controlState:J
+
+    const-wide/32 v12, 0x1fffff
+
+    and-long/2addr v9, v12
+
+    long-to-int v7, v9
+
+    iget-object v9, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget v9, v9, Ll0/a/s1/a;->h:I
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-gt v7, v9, :cond_c
+
+    monitor-exit v6
+
+    goto :goto_6
+
+    :cond_c
+    :try_start_2
+    invoke-virtual/range {p0 .. p0}, Ll0/a/s1/a$a;->a()Z
+
+    move-result v7
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    if-nez v7, :cond_d
+
+    monitor-exit v6
+
+    goto :goto_6
+
+    :cond_d
+    :try_start_3
+    sget-object v7, Ll0/a/s1/a$a;->k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {v7, v1, v5, v8}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v7
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    if-nez v7, :cond_e
+
+    monitor-exit v6
+
+    goto :goto_6
+
+    :cond_e
+    :try_start_4
+    iget v7, v1, Ll0/a/s1/a$a;->indexInArray:I
+
+    invoke-virtual {v1, v5}, Ll0/a/s1/a$a;->d(I)V
+
+    iget-object v9, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-static {v9, v1, v7, v5}, Ll0/a/s1/a;->b(Ll0/a/s1/a;Ll0/a/s1/a$a;II)V
+
+    iget-object v9, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    sget-object v10, Ll0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    invoke-virtual {v10, v9}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->getAndDecrement(Ljava/lang/Object;)J
+
+    move-result-wide v9
+
+    and-long/2addr v9, v12
+
+    long-to-int v10, v9
+
+    if-eq v10, v7, :cond_10
+
+    iget-object v9, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v9, v9, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aget-object v9, v9, v10
+
+    if-eqz v9, :cond_f
+
+    iget-object v12, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v12, v12, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aput-object v9, v12, v7
+
+    invoke-virtual {v9, v7}, Ll0/a/s1/a$a;->d(I)V
+
+    iget-object v12, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-static {v12, v9, v10, v7}, Ll0/a/s1/a;->b(Ll0/a/s1/a;Ll0/a/s1/a$a;II)V
+
+    goto :goto_5
+
+    :cond_f
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+
+    throw v11
+
+    :cond_10
+    :goto_5
+    :try_start_5
+    iget-object v7, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v7, v7, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aput-object v11, v7, v10
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
+
+    monitor-exit v6
+
+    iput-object v4, v1, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    goto :goto_6
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v6
+
+    throw v0
+
+    :cond_11
+    :goto_6
+    const/4 v6, 0x1
+
+    goto/16 :goto_d
+
+    :cond_12
+    invoke-virtual {v7}, Ll0/a/s1/h;->a()Ll0/a/s1/k;
+
+    move-result-object v12
+
+    if-eqz v6, :cond_17
+
+    iput-wide v9, v1, Ll0/a/s1/a$a;->e:J
+
+    iput v5, v1, Ll0/a/s1/a$a;->i:I
+
+    iget-object v6, v1, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    if-ne v6, v2, :cond_16
+
+    sget-boolean v6, Ll0/a/b0;->a:Z
+
+    if-eqz v6, :cond_15
+
+    sget-object v6, Ll0/a/s1/k;->e:Ll0/a/s1/k;
+
+    if-ne v12, v6, :cond_13
+
+    const/4 v6, 0x1
+
+    goto :goto_7
+
+    :cond_13
+    const/4 v6, 0x0
+
+    :goto_7
+    if-eqz v6, :cond_14
+
+    goto :goto_8
+
+    :cond_14
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :cond_15
+    :goto_8
+    iput-object v3, v1, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    sget v6, Ll0/a/s1/a;->r:I
+
+    iput v6, v1, Ll0/a/s1/a$a;->g:I
+
+    :cond_16
+    iput v5, v1, Ll0/a/s1/a$a;->spins:I
+
+    const/4 v6, 0x0
+
+    :cond_17
+    iget-wide v9, v7, Ll0/a/s1/h;->d:J
+
+    if-eq v12, v0, :cond_19
+
+    iget-object v9, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    sget-object v10, Ll0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    const-wide/32 v13, 0x200000
+
+    invoke-virtual {v10, v9, v13, v14}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->addAndGet(Ljava/lang/Object;J)J
+
+    invoke-virtual {v1, v3}, Ll0/a/s1/a$a;->f(Ll0/a/s1/a$b;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_18
+
+    iget-object v9, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-virtual {v9}, Ll0/a/s1/a;->k()V
+
+    :cond_18
+    :goto_9
+    move/from16 v17, v6
+
+    goto :goto_a
+
+    :cond_19
+    iget-object v13, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    iget-object v13, v13, Ll0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
+
+    invoke-virtual {v13}, Ljava/util/concurrent/Semaphore;->availablePermits()I
+
+    move-result v13
+
+    if-nez v13, :cond_1a
+
+    goto :goto_9
+
+    :cond_1a
+    sget-object v13, Ll0/a/s1/l;->f:Ll0/a/s1/m;
+
+    check-cast v13, Ll0/a/s1/f;
+
+    if-eqz v13, :cond_20
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v13
+
+    sub-long v9, v13, v9
+
+    sget-wide v15, Ll0/a/s1/l;->a:J
+
+    cmp-long v11, v9, v15
+
+    if-ltz v11, :cond_18
+
+    iget-wide v9, v1, Ll0/a/s1/a$a;->f:J
+
+    sub-long v9, v13, v9
+
+    const/4 v11, 0x5
+
+    move/from16 v17, v6
+
+    int-to-long v5, v11
+
+    mul-long v15, v15, v5
+
+    cmp-long v5, v9, v15
+
+    if-ltz v5, :cond_1b
+
+    iput-wide v13, v1, Ll0/a/s1/a$a;->f:J
+
+    iget-object v5, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-virtual {v5}, Ll0/a/s1/a;->k()V
+
+    :cond_1b
+    :goto_a
+    iget-object v5, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-virtual {v5, v7}, Ll0/a/s1/a;->n(Ll0/a/s1/h;)V
+
+    if-eq v12, v0, :cond_1f
+
+    iget-object v5, v1, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    sget-object v6, Ll0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    const-wide/32 v9, -0x200000
+
+    invoke-virtual {v6, v5, v9, v10}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->addAndGet(Ljava/lang/Object;J)J
+
+    iget-object v5, v1, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    if-eq v5, v4, :cond_1f
+
+    sget-boolean v6, Ll0/a/b0;->a:Z
+
+    if-eqz v6, :cond_1e
+
+    if-ne v5, v3, :cond_1c
+
+    goto :goto_b
+
+    :cond_1c
+    const/4 v8, 0x0
+
+    :goto_b
+    if-eqz v8, :cond_1d
+
+    goto :goto_c
+
+    :cond_1d
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :cond_1e
+    :goto_c
+    sget-object v5, Ll0/a/s1/a$b;->g:Ll0/a/s1/a$b;
+
+    iput-object v5, v1, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    :cond_1f
+    move/from16 v6, v17
+
+    :goto_d
+    const/4 v5, 0x0
+
+    goto/16 :goto_0
+
+    :cond_20
+    throw v11
+
+    :cond_21
+    invoke-virtual {v1, v4}, Ll0/a/s1/a$a;->f(Ll0/a/s1/a$b;)Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/a$b.smali b/com.discord/smali_classes2/l0/a/s1/a$b.smali
new file mode 100644
index 0000000000..850a1669a2
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/a$b.smali
@@ -0,0 +1,151 @@
+.class public final enum Ll0/a/s1/a$b;
+.super Ljava/lang/Enum;
+.source "CoroutineScheduler.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/s1/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ll0/a/s1/a$b;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ll0/a/s1/a$b;
+
+.field public static final enum e:Ll0/a/s1/a$b;
+
+.field public static final enum f:Ll0/a/s1/a$b;
+
+.field public static final enum g:Ll0/a/s1/a$b;
+
+.field public static final enum h:Ll0/a/s1/a$b;
+
+.field public static final synthetic i:[Ll0/a/s1/a$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x5
+
+    new-array v0, v0, [Ll0/a/s1/a$b;
+
+    new-instance v1, Ll0/a/s1/a$b;
+
+    const-string v2, "CPU_ACQUIRED"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Ll0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/s1/a$b;->d:Ll0/a/s1/a$b;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/s1/a$b;
+
+    const-string v2, "BLOCKING"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Ll0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/s1/a$b;->e:Ll0/a/s1/a$b;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/s1/a$b;
+
+    const-string v2, "PARKING"
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, v2, v3}, Ll0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/s1/a$b;->f:Ll0/a/s1/a$b;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/s1/a$b;
+
+    const-string v2, "RETIRING"
+
+    const/4 v3, 0x3
+
+    invoke-direct {v1, v2, v3}, Ll0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/s1/a$b;->g:Ll0/a/s1/a$b;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/s1/a$b;
+
+    const-string v2, "TERMINATED"
+
+    const/4 v3, 0x4
+
+    invoke-direct {v1, v2, v3}, Ll0/a/s1/a$b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/s1/a$b;->h:Ll0/a/s1/a$b;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Ll0/a/s1/a$b;->i:[Ll0/a/s1/a$b;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ll0/a/s1/a$b;
+    .locals 1
+
+    const-class v0, Ll0/a/s1/a$b;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ll0/a/s1/a$b;
+
+    return-object p0
+.end method
+
+.method public static values()[Ll0/a/s1/a$b;
+    .locals 1
+
+    sget-object v0, Ll0/a/s1/a$b;->i:[Ll0/a/s1/a$b;
+
+    invoke-virtual {v0}, [Ll0/a/s1/a$b;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ll0/a/s1/a$b;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/a.smali b/com.discord/smali_classes2/l0/a/s1/a.smali
new file mode 100644
index 0000000000..e4353dee4a
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/a.smali
@@ -0,0 +1,1987 @@
+.class public final Ll0/a/s1/a;
+.super Ljava/lang/Object;
+.source "CoroutineScheduler.kt"
+
+# interfaces
+.implements Ljava/util/concurrent/Executor;
+.implements Ljava/io/Closeable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ll0/a/s1/a$a;,
+        Ll0/a/s1/a$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+.field public static final m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+.field public static final n:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+.field public static final o:I
+
+.field public static final p:I
+
+.field public static final q:I
+
+.field public static final r:I
+
+.field public static final s:Ll0/a/r1/v;
+
+
+# instance fields
+.field public volatile _isTerminated:I
+
+.field public volatile controlState:J
+
+.field public final d:Ll0/a/s1/d;
+
+.field public final e:Ljava/util/concurrent/Semaphore;
+
+.field public final f:[Ll0/a/s1/a$a;
+
+.field public final g:Ljava/util/Random;
+
+.field public final h:I
+
+.field public final i:I
+
+.field public final j:J
+
+.field public final k:Ljava/lang/String;
+
+.field public volatile parkedWorkersStack:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 7
+
+    const-string v0, "kotlinx.coroutines.scheduler.spins"
+
+    const/16 v1, 0x3e8
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    const/16 v4, 0x8
+
+    const/4 v5, 0x0
+
+    invoke-static/range {v0 .. v5}, Lf/n/a/k/a;->Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+
+    move-result v0
+
+    sput v0, Ll0/a/s1/a;->o:I
+
+    const-string v1, "kotlinx.coroutines.scheduler.yields"
+
+    const/4 v2, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v5, 0x8
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    sput v0, Ll0/a/s1/a;->p:I
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v1, 0x1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    sput v1, Ll0/a/s1/a;->q:I
+
+    sget-wide v0, Ll0/a/s1/l;->a:J
+
+    const/4 v2, 0x4
+
+    int-to-long v2, v2
+
+    div-long/2addr v0, v2
+
+    const-wide/16 v2, 0xa
+
+    cmp-long v4, v0, v2
+
+    if-gez v4, :cond_0
+
+    move-wide v0, v2
+
+    :cond_0
+    sget v2, Ll0/a/s1/a;->q:I
+
+    int-to-long v2, v2
+
+    invoke-static {v0, v1, v2, v3}, Lk0/r/f;->coerceAtMost(JJ)J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    sput v1, Ll0/a/s1/a;->r:I
+
+    new-instance v0, Ll0/a/r1/v;
+
+    const-string v1, "NOT_IN_STACK"
+
+    invoke-direct {v0, v1}, Ll0/a/r1/v;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ll0/a/s1/a;->s:Ll0/a/r1/v;
+
+    const-class v0, Ll0/a/s1/a;
+
+    const-string v1, "parkedWorkersStack"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    const-class v0, Ll0/a/s1/a;
+
+    const-string v1, "controlState"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    const-class v0, Ll0/a/s1/a;
+
+    const-string v1, "_isTerminated"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/s1/a;->n:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(IIJLjava/lang/String;)V
+    .locals 2
+
+    const-string v0, "schedulerName"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Ll0/a/s1/a;->h:I
+
+    iput p2, p0, Ll0/a/s1/a;->i:I
+
+    iput-wide p3, p0, Ll0/a/s1/a;->j:J
+
+    iput-object p5, p0, Ll0/a/s1/a;->k:Ljava/lang/String;
+
+    const/4 p2, 0x0
+
+    const/4 p3, 0x1
+
+    if-lt p1, p3, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_7
+
+    iget p1, p0, Ll0/a/s1/a;->i:I
+
+    iget p4, p0, Ll0/a/s1/a;->h:I
+
+    if-lt p1, p4, :cond_1
+
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_1
+    const-string p4, "Max pool size "
+
+    if-eqz p1, :cond_6
+
+    iget p1, p0, Ll0/a/s1/a;->i:I
+
+    const p5, 0x1ffffe
+
+    if-gt p1, p5, :cond_2
+
+    const/4 p1, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    :goto_2
+    if-eqz p1, :cond_5
+
+    iget-wide p4, p0, Ll0/a/s1/a;->j:J
+
+    const-wide/16 v0, 0x0
+
+    cmp-long p1, p4, v0
+
+    if-lez p1, :cond_3
+
+    const/4 p1, 0x1
+
+    goto :goto_3
+
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_3
+    if-eqz p1, :cond_4
+
+    new-instance p1, Ll0/a/s1/d;
+
+    invoke-direct {p1}, Ll0/a/s1/d;-><init>()V
+
+    iput-object p1, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    new-instance p1, Ljava/util/concurrent/Semaphore;
+
+    iget p4, p0, Ll0/a/s1/a;->h:I
+
+    invoke-direct {p1, p4, p2}, Ljava/util/concurrent/Semaphore;-><init>(IZ)V
+
+    iput-object p1, p0, Ll0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
+
+    iput-wide v0, p0, Ll0/a/s1/a;->parkedWorkersStack:J
+
+    iget p1, p0, Ll0/a/s1/a;->i:I
+
+    add-int/2addr p1, p3
+
+    new-array p1, p1, [Ll0/a/s1/a$a;
+
+    iput-object p1, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    iput-wide v0, p0, Ll0/a/s1/a;->controlState:J
+
+    new-instance p1, Ljava/util/Random;
+
+    invoke-direct {p1}, Ljava/util/Random;-><init>()V
+
+    iput-object p1, p0, Ll0/a/s1/a;->g:Ljava/util/Random;
+
+    iput p2, p0, Ll0/a/s1/a;->_isTerminated:I
+
+    return-void
+
+    :cond_4
+    const-string p1, "Idle worker keep alive time "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget-wide p2, p0, Ll0/a/s1/a;->j:J
+
+    const-string p4, " must be positive"
+
+    invoke-static {p1, p2, p3, p4}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_5
+    invoke-static {p4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Ll0/a/s1/a;->i:I
+
+    const-string p3, " should not exceed maximal supported number of threads 2097150"
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->s(Ljava/lang/StringBuilder;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_6
+    invoke-static {p4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Ll0/a/s1/a;->i:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string p2, " should be greater than or equals to core pool size "
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget p2, p0, Ll0/a/s1/a;->h:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_7
+    const-string p1, "Core pool size "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Ll0/a/s1/a;->h:I
+
+    const-string p3, " should be at least 1"
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->s(Ljava/lang/StringBuilder;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public static final a(Ll0/a/s1/a;Ll0/a/s1/a$a;)V
+    .locals 8
+
+    if-eqz p0, :cond_4
+
+    iget-object v0, p1, Ll0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
+
+    sget-object v1, Ll0/a/s1/a;->s:Ll0/a/r1/v;
+
+    if-eq v0, v1, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    iget-wide v4, p0, Ll0/a/s1/a;->parkedWorkersStack:J
+
+    const-wide/32 v0, 0x1fffff
+
+    and-long/2addr v0, v4
+
+    long-to-int v1, v0
+
+    const-wide/32 v2, 0x200000
+
+    add-long/2addr v2, v4
+
+    const-wide/32 v6, -0x200000
+
+    and-long/2addr v2, v6
+
+    iget v0, p1, Ll0/a/s1/a$a;->indexInArray:I
+
+    sget-boolean v6, Ll0/a/b0;->a:Z
+
+    if-eqz v6, :cond_3
+
+    if-eqz v0, :cond_1
+
+    const/4 v6, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v6, 0x0
+
+    :goto_0
+    if-eqz v6, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p0, Ljava/lang/AssertionError;
+
+    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p0
+
+    :cond_3
+    :goto_1
+    iget-object v6, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aget-object v1, v6, v1
+
+    iput-object v1, p1, Ll0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
+
+    sget-object v1, Ll0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    int-to-long v6, v0
+
+    or-long/2addr v6, v2
+
+    move-object v2, v1
+
+    move-object v3, p0
+
+    invoke-virtual/range {v2 .. v7}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    :goto_2
+    return-void
+
+    :cond_4
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static final b(Ll0/a/s1/a;Ll0/a/s1/a$a;II)V
+    .locals 8
+
+    :cond_0
+    :goto_0
+    iget-wide v2, p0, Ll0/a/s1/a;->parkedWorkersStack:J
+
+    const-wide/32 v0, 0x1fffff
+
+    and-long/2addr v0, v2
+
+    long-to-int v1, v0
+
+    const-wide/32 v4, 0x200000
+
+    add-long/2addr v4, v2
+
+    const-wide/32 v6, -0x200000
+
+    and-long/2addr v4, v6
+
+    if-ne v1, p2, :cond_2
+
+    if-nez p3, :cond_1
+
+    invoke-virtual {p0, p1}, Ll0/a/s1/a;->i(Ll0/a/s1/a$a;)I
+
+    move-result v1
+
+    goto :goto_1
+
+    :cond_1
+    move v1, p3
+
+    :cond_2
+    :goto_1
+    if-gez v1, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    sget-object v0, Ll0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    int-to-long v6, v1
+
+    or-long/2addr v4, v6
+
+    move-object v1, p0
+
+    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+.end method
+
+.method public static synthetic g(Ll0/a/s1/a;Ljava/lang/Runnable;Ll0/a/s1/i;ZI)V
+    .locals 0
+
+    and-int/lit8 p2, p4, 0x2
+
+    if-eqz p2, :cond_0
+
+    sget-object p2, Ll0/a/s1/g;->e:Ll0/a/s1/g;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p2, 0x0
+
+    :goto_0
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_1
+
+    const/4 p3, 0x0
+
+    :cond_1
+    invoke-virtual {p0, p1, p2, p3}, Ll0/a/s1/a;->f(Ljava/lang/Runnable;Ll0/a/s1/i;Z)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final c()I
+    .locals 10
+
+    iget-object v0, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget v1, p0, Ll0/a/s1/a;->_isTerminated:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    const/4 v1, -0x1
+
+    monitor-exit v0
+
+    return v1
+
+    :cond_1
+    :try_start_1
+    iget-wide v4, p0, Ll0/a/s1/a;->controlState:J
+
+    const-wide/32 v6, 0x1fffff
+
+    and-long v8, v4, v6
+
+    long-to-int v1, v8
+
+    const-wide v8, 0x3ffffe00000L
+
+    and-long/2addr v4, v8
+
+    const/16 v8, 0x15
+
+    shr-long/2addr v4, v8
+
+    long-to-int v5, v4
+
+    sub-int v4, v1, v5
+
+    iget v5, p0, Ll0/a/s1/a;->h:I
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-lt v4, v5, :cond_2
+
+    monitor-exit v0
+
+    return v2
+
+    :cond_2
+    :try_start_2
+    iget v5, p0, Ll0/a/s1/a;->i:I
+
+    if-ge v1, v5, :cond_8
+
+    iget-object v1, p0, Ll0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/Semaphore;->availablePermits()I
+
+    move-result v1
+
+    if-nez v1, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    iget-wide v8, p0, Ll0/a/s1/a;->controlState:J
+
+    and-long/2addr v8, v6
+
+    long-to-int v1, v8
+
+    add-int/2addr v1, v3
+
+    if-lez v1, :cond_4
+
+    iget-object v5, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aget-object v5, v5, v1
+
+    if-nez v5, :cond_4
+
+    const/4 v5, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v5, 0x0
+
+    :goto_1
+    if-eqz v5, :cond_7
+
+    new-instance v5, Ll0/a/s1/a$a;
+
+    invoke-direct {v5, p0, v1}, Ll0/a/s1/a$a;-><init>(Ll0/a/s1/a;I)V
+
+    invoke-virtual {v5}, Ljava/lang/Thread;->start()V
+
+    sget-object v8, Ll0/a/s1/a;->m:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    invoke-virtual {v8, p0}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->incrementAndGet(Ljava/lang/Object;)J
+
+    move-result-wide v8
+
+    and-long/2addr v6, v8
+
+    long-to-int v7, v6
+
+    if-ne v1, v7, :cond_5
+
+    const/4 v2, 0x1
+
+    :cond_5
+    if-eqz v2, :cond_6
+
+    iget-object v2, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aput-object v5, v2, v1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    add-int/2addr v4, v3
+
+    monitor-exit v0
+
+    return v4
+
+    :cond_6
+    :try_start_3
+    const-string v1, "Failed requirement."
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_7
+    const-string v1, "Failed requirement."
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :cond_8
+    :goto_2
+    monitor-exit v0
+
+    return v2
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public close()V
+    .locals 13
+
+    sget-object v0, Ll0/a/s1/a$b;->h:Ll0/a/s1/a$b;
+
+    sget-object v1, Ll0/a/s1/a;->n:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v1, p0, v2, v3}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    goto/16 :goto_a
+
+    :cond_0
+    invoke-virtual {p0}, Ll0/a/s1/a;->e()Ll0/a/s1/a$a;
+
+    move-result-object v1
+
+    iget-object v4, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    monitor-enter v4
+
+    :try_start_0
+    iget-wide v5, p0, Ll0/a/s1/a;->controlState:J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const-wide/32 v7, 0x1fffff
+
+    and-long/2addr v5, v7
+
+    long-to-int v6, v5
+
+    monitor-exit v4
+
+    if-gt v3, v6, :cond_a
+
+    const/4 v4, 0x1
+
+    :goto_0
+    iget-object v5, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aget-object v5, v5, v4
+
+    const/4 v7, 0x0
+
+    if-eqz v5, :cond_9
+
+    if-eq v5, v1, :cond_8
+
+    :goto_1
+    invoke-virtual {v5}, Ljava/lang/Thread;->isAlive()Z
+
+    move-result v8
+
+    if-eqz v8, :cond_1
+
+    invoke-static {v5}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
+
+    const-wide/16 v8, 0x2710
+
+    invoke-virtual {v5, v8, v9}, Ljava/lang/Thread;->join(J)V
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v8, v5, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    sget-boolean v9, Ll0/a/b0;->a:Z
+
+    if-eqz v9, :cond_4
+
+    if-ne v8, v0, :cond_2
+
+    const/4 v8, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v8, 0x0
+
+    :goto_2
+    if-eqz v8, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :cond_4
+    :goto_3
+    iget-object v5, v5, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    iget-object v8, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    if-eqz v5, :cond_7
+
+    const-string v9, "globalQueue"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v9, Ll0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v9, v5, v7}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->getAndSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ll0/a/s1/h;
+
+    if-eqz v9, :cond_5
+
+    invoke-virtual {v5, v8, v9}, Ll0/a/s1/n;->c(Ll0/a/s1/d;Ll0/a/s1/h;)V
+
+    :cond_5
+    :goto_4
+    iget v9, v5, Ll0/a/s1/n;->consumerIndex:I
+
+    iget v10, v5, Ll0/a/s1/n;->producerIndex:I
+
+    sub-int v10, v9, v10
+
+    if-nez v10, :cond_6
+
+    move-object v9, v7
+
+    goto :goto_5
+
+    :cond_6
+    and-int/lit8 v10, v9, 0x7f
+
+    iget-object v11, v5, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v11, v10}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v11
+
+    check-cast v11, Ll0/a/s1/h;
+
+    if-eqz v11, :cond_5
+
+    sget-object v11, Ll0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    add-int/lit8 v12, v9, 0x1
+
+    invoke-virtual {v11, v5, v9, v12}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_5
+
+    iget-object v9, v5, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v9, v10, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ll0/a/s1/h;
+
+    :goto_5
+    if-eqz v9, :cond_8
+
+    invoke-virtual {v5, v8, v9}, Ll0/a/s1/n;->c(Ll0/a/s1/d;Ll0/a/s1/h;)V
+
+    goto :goto_4
+
+    :cond_7
+    throw v7
+
+    :cond_8
+    if-eq v4, v6, :cond_a
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_9
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v7
+
+    :cond_a
+    iget-object v5, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    :goto_6
+    iget-object v4, v5, Ll0/a/r1/n;->_cur$internal:Ljava/lang/Object;
+
+    check-cast v4, Ll0/a/r1/o;
+
+    invoke-virtual {v4}, Ll0/a/r1/o;->c()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_11
+
+    :goto_7
+    if-eqz v1, :cond_b
+
+    invoke-virtual {v1}, Ll0/a/s1/a$a;->b()Ll0/a/s1/h;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_b
+
+    goto :goto_8
+
+    :cond_b
+    iget-object v4, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    invoke-virtual {v4}, Ll0/a/r1/n;->b()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ll0/a/s1/h;
+
+    :goto_8
+    if-eqz v4, :cond_c
+
+    invoke-virtual {p0, v4}, Ll0/a/s1/a;->n(Ll0/a/s1/h;)V
+
+    goto :goto_7
+
+    :cond_c
+    if-eqz v1, :cond_d
+
+    invoke-virtual {v1, v0}, Ll0/a/s1/a$a;->f(Ll0/a/s1/a$b;)Z
+
+    :cond_d
+    sget-boolean v0, Ll0/a/b0;->a:Z
+
+    if-eqz v0, :cond_10
+
+    iget-object v0, p0, Ll0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
+
+    move-result v0
+
+    iget v1, p0, Ll0/a/s1/a;->h:I
+
+    if-ne v0, v1, :cond_e
+
+    const/4 v2, 0x1
+
+    :cond_e
+    if-eqz v2, :cond_f
+
+    goto :goto_9
+
+    :cond_f
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :cond_10
+    :goto_9
+    const-wide/16 v0, 0x0
+
+    iput-wide v0, p0, Ll0/a/s1/a;->parkedWorkersStack:J
+
+    iput-wide v0, p0, Ll0/a/s1/a;->controlState:J
+
+    :goto_a
+    return-void
+
+    :cond_11
+    sget-object v6, Ll0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v4}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object v7
+
+    invoke-virtual {v6, v5, v4, v7}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_6
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v4
+
+    throw v0
+.end method
+
+.method public final d(Ljava/lang/Runnable;Ll0/a/s1/i;)Ll0/a/s1/h;
+    .locals 3
+
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "taskContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ll0/a/s1/l;->f:Ll0/a/s1/m;
+
+    check-cast v0, Ll0/a/s1/f;
+
+    if-eqz v0, :cond_1
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v0
+
+    instance-of v2, p1, Ll0/a/s1/h;
+
+    if-eqz v2, :cond_0
+
+    check-cast p1, Ll0/a/s1/h;
+
+    iput-wide v0, p1, Ll0/a/s1/h;->d:J
+
+    iput-object p2, p1, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    return-object p1
+
+    :cond_0
+    new-instance v2, Ll0/a/s1/j;
+
+    invoke-direct {v2, p1, v0, v1, p2}, Ll0/a/s1/j;-><init>(Ljava/lang/Runnable;JLl0/a/s1/i;)V
+
+    return-object v2
+
+    :cond_1
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public final e()Ll0/a/s1/a$a;
+    .locals 3
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    instance-of v1, v0, Ll0/a/s1/a$a;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object v0, v2
+
+    :cond_0
+    check-cast v0, Ll0/a/s1/a$a;
+
+    if-eqz v0, :cond_1
+
+    iget-object v1, v0, Ll0/a/s1/a$a;->j:Ll0/a/s1/a;
+
+    invoke-static {v1, p0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    move-object v2, v0
+
+    :cond_1
+    return-object v2
+.end method
+
+.method public execute(Ljava/lang/Runnable;)V
+    .locals 3
+
+    const-string v0, "command"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x6
+
+    invoke-static {p0, p1, v0, v1, v2}, Ll0/a/s1/a;->g(Ll0/a/s1/a;Ljava/lang/Runnable;Ll0/a/s1/i;ZI)V
+
+    return-void
+.end method
+
+.method public final f(Ljava/lang/Runnable;Ll0/a/s1/i;Z)V
+    .locals 5
+
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "taskContext"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1, p2}, Ll0/a/s1/a;->d(Ljava/lang/Runnable;Ll0/a/s1/i;)Ll0/a/s1/h;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Ll0/a/s1/a;->e()Ll0/a/s1/a$a;
+
+    move-result-object p2
+
+    const/4 v0, -0x1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz p2, :cond_6
+
+    iget-object v3, p2, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    sget-object v4, Ll0/a/s1/a$b;->h:Ll0/a/s1/a$b;
+
+    if-ne v3, v4, :cond_0
+
+    goto :goto_3
+
+    :cond_0
+    invoke-virtual {p1}, Ll0/a/s1/h;->a()Ll0/a/s1/k;
+
+    move-result-object v3
+
+    sget-object v4, Ll0/a/s1/k;->d:Ll0/a/s1/k;
+
+    if-ne v3, v4, :cond_3
+
+    iget-object v3, p2, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    sget-object v4, Ll0/a/s1/a$b;->e:Ll0/a/s1/a$b;
+
+    if-ne v3, v4, :cond_1
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :goto_0
+    if-eqz v3, :cond_2
+
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p2}, Ll0/a/s1/a$a;->e()Z
+
+    move-result v3
+
+    if-nez v3, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v3, -0x1
+
+    :goto_1
+    if-eqz p3, :cond_4
+
+    iget-object p3, p2, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    iget-object v4, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    invoke-virtual {p3, p1, v4}, Ll0/a/s1/n;->b(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+
+    move-result p3
+
+    goto :goto_2
+
+    :cond_4
+    iget-object p3, p2, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    iget-object v4, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    invoke-virtual {p3, p1, v4}, Ll0/a/s1/n;->a(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+
+    move-result p3
+
+    :goto_2
+    if-eqz p3, :cond_7
+
+    iget-object p2, p2, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    invoke-virtual {p2}, Ll0/a/s1/n;->d()I
+
+    move-result p2
+
+    sget p3, Ll0/a/s1/l;->b:I
+
+    if-le p2, p3, :cond_5
+
+    goto :goto_4
+
+    :cond_5
+    move v1, v3
+
+    goto :goto_4
+
+    :cond_6
+    :goto_3
+    const/4 v1, 0x1
+
+    :cond_7
+    :goto_4
+    if-eq v1, v0, :cond_a
+
+    if-eq v1, v2, :cond_8
+
+    invoke-virtual {p0}, Ll0/a/s1/a;->k()V
+
+    goto :goto_5
+
+    :cond_8
+    iget-object p2, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    invoke-virtual {p2, p1}, Ll0/a/r1/n;->a(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_9
+
+    invoke-virtual {p0}, Ll0/a/s1/a;->k()V
+
+    :goto_5
+    return-void
+
+    :cond_9
+    new-instance p1, Ljava/util/concurrent/RejectedExecutionException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object p3, p0, Ll0/a/s1/a;->k:Ljava/lang/String;
+
+    const-string v0, " was terminated"
+
+    invoke-static {p2, p3, v0}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/util/concurrent/RejectedExecutionException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_a
+    return-void
+.end method
+
+.method public final i(Ll0/a/s1/a$a;)I
+    .locals 1
+
+    iget-object p1, p1, Ll0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
+
+    :goto_0
+    sget-object v0, Ll0/a/s1/a;->s:Ll0/a/r1/v;
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, -0x1
+
+    return p1
+
+    :cond_0
+    if-nez p1, :cond_1
+
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    check-cast p1, Ll0/a/s1/a$a;
+
+    iget v0, p1, Ll0/a/s1/a$a;->indexInArray:I
+
+    if-eqz v0, :cond_2
+
+    return v0
+
+    :cond_2
+    iget-object p1, p1, Ll0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
+
+    goto :goto_0
+.end method
+
+.method public final k()V
+    .locals 6
+
+    iget-object v0, p0, Ll0/a/s1/a;->e:Ljava/util/concurrent/Semaphore;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Ll0/a/s1/a;->p()Z
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Ll0/a/s1/a;->p()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-wide v0, p0, Ll0/a/s1/a;->controlState:J
+
+    const-wide/32 v2, 0x1fffff
+
+    and-long/2addr v2, v0
+
+    long-to-int v3, v2
+
+    const-wide v4, 0x3ffffe00000L
+
+    and-long/2addr v0, v4
+
+    const/16 v2, 0x15
+
+    shr-long/2addr v0, v2
+
+    long-to-int v1, v0
+
+    sub-int/2addr v3, v1
+
+    iget v0, p0, Ll0/a/s1/a;->h:I
+
+    if-ge v3, v0, :cond_3
+
+    invoke-virtual {p0}, Ll0/a/s1/a;->c()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_2
+
+    iget v2, p0, Ll0/a/s1/a;->h:I
+
+    if-le v2, v1, :cond_2
+
+    invoke-virtual {p0}, Ll0/a/s1/a;->c()I
+
+    :cond_2
+    if-lez v0, :cond_3
+
+    return-void
+
+    :cond_3
+    invoke-virtual {p0}, Ll0/a/s1/a;->p()Z
+
+    return-void
+.end method
+
+.method public final n(Ll0/a/s1/h;)V
+    .locals 2
+
+    :try_start_0
+    invoke-interface {p1}, Ljava/lang/Runnable;->run()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    const-string v1, "thread"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v1
+
+    invoke-interface {v1, v0, p1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :goto_0
+    return-void
+
+    :catchall_1
+    move-exception p1
+
+    throw p1
+.end method
+
+.method public final p()Z
+    .locals 9
+
+    :cond_0
+    :goto_0
+    iget-wide v2, p0, Ll0/a/s1/a;->parkedWorkersStack:J
+
+    const-wide/32 v0, 0x1fffff
+
+    and-long/2addr v0, v2
+
+    long-to-int v1, v0
+
+    iget-object v0, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    aget-object v6, v0, v1
+
+    if-eqz v6, :cond_2
+
+    const-wide/32 v0, 0x200000
+
+    add-long/2addr v0, v2
+
+    const-wide/32 v4, -0x200000
+
+    and-long/2addr v0, v4
+
+    invoke-virtual {p0, v6}, Ll0/a/s1/a;->i(Ll0/a/s1/a$a;)I
+
+    move-result v4
+
+    if-gez v4, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v5, Ll0/a/s1/a;->l:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    int-to-long v7, v4
+
+    or-long/2addr v7, v0
+
+    move-object v0, v5
+
+    move-object v1, p0
+
+    move-wide v4, v7
+
+    invoke-virtual/range {v0 .. v5}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Ll0/a/s1/a;->s:Ll0/a/r1/v;
+
+    iput-object v0, v6, Ll0/a/s1/a$a;->nextParkedWorker:Ljava/lang/Object;
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v6, 0x0
+
+    :goto_1
+    const/4 v0, 0x0
+
+    if-eqz v6, :cond_9
+
+    sget v1, Ll0/a/s1/a;->r:I
+
+    iput v1, v6, Ll0/a/s1/a$a;->g:I
+
+    iput v0, v6, Ll0/a/s1/a$a;->spins:I
+
+    iget-object v1, v6, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    sget-object v2, Ll0/a/s1/a$b;->f:Ll0/a/s1/a$b;
+
+    const/4 v3, 0x1
+
+    if-ne v1, v2, :cond_3
+
+    const/4 v1, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v1, 0x0
+
+    :goto_2
+    invoke-static {v6}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
+
+    if-nez v1, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    iget v1, v6, Ll0/a/s1/a$a;->terminationState:I
+
+    if-ne v1, v3, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    const/4 v2, -0x1
+
+    if-ne v1, v2, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    if-nez v1, :cond_8
+
+    sget-object v1, Ll0/a/s1/a$a;->k:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {v1, v6, v0, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v0
+
+    :goto_3
+    if-nez v0, :cond_7
+
+    goto :goto_0
+
+    :cond_7
+    return v3
+
+    :cond_8
+    const-string v0, "Invalid terminationState = "
+
+    invoke-static {v0, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_9
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 14
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iget-object v1, p0, Ll0/a/s1/a;->f:[Ll0/a/s1/a$a;
+
+    array-length v2, v1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    :goto_0
+    if-ge v4, v2, :cond_8
+
+    aget-object v10, v1, v4
+
+    if-nez v10, :cond_0
+
+    goto/16 :goto_1
+
+    :cond_0
+    iget-object v11, v10, Ll0/a/s1/a$a;->d:Ll0/a/s1/n;
+
+    iget-object v12, v11, Ll0/a/s1/n;->lastScheduledTask:Ljava/lang/Object;
+
+    const/4 v13, 0x1
+
+    invoke-virtual {v11}, Ll0/a/s1/n;->d()I
+
+    move-result v11
+
+    if-eqz v12, :cond_1
+
+    add-int/2addr v11, v13
+
+    :cond_1
+    iget-object v10, v10, Ll0/a/s1/a$a;->state:Ll0/a/s1/a$b;
+
+    invoke-virtual {v10}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v10
+
+    if-eqz v10, :cond_6
+
+    if-eq v10, v13, :cond_5
+
+    const/4 v12, 0x2
+
+    if-eq v10, v12, :cond_4
+
+    const/4 v12, 0x3
+
+    if-eq v10, v12, :cond_3
+
+    const/4 v11, 0x4
+
+    if-eq v10, v11, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    add-int/lit8 v8, v8, 0x1
+
+    if-lez v11, :cond_7
+
+    new-instance v10, Ljava/lang/StringBuilder;
+
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v11, "r"
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-interface {v0, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_4
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_1
+
+    :cond_5
+    add-int/lit8 v6, v6, 0x1
+
+    new-instance v10, Ljava/lang/StringBuilder;
+
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v11, "b"
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-interface {v0, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_6
+    add-int/lit8 v5, v5, 0x1
+
+    new-instance v10, Ljava/lang/StringBuilder;
+
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v11, "c"
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-interface {v0, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    :cond_7
+    :goto_1
+    add-int/lit8 v4, v4, 0x1
+
+    goto/16 :goto_0
+
+    :cond_8
+    iget-wide v1, p0, Ll0/a/s1/a;->controlState:J
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v10, p0, Ll0/a/s1/a;->k:Ljava/lang/String;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v10, 0x40
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v10, 0x5b
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v10, "Pool Size {"
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v10, "core = "
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v10, p0, Ll0/a/s1/a;->h:I
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v10, ", "
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v11, "max = "
+
+    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v11, p0, Ll0/a/s1/a;->i:I
+
+    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v11, "}, "
+
+    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v12, "Worker States {"
+
+    invoke-virtual {v4, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v12, "CPU = "
+
+    invoke-virtual {v4, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v5, "blocking = "
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v6, "parked = "
+
+    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v7}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v6, "retired = "
+
+    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v6, "terminated = "
+
+    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v9}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v6, "running workers queues = "
+
+    invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "global queue size = "
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v0, p0, Ll0/a/s1/a;->d:Ll0/a/s1/d;
+
+    iget-object v0, v0, Ll0/a/r1/n;->_cur$internal:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/r1/o;
+
+    iget-wide v6, v0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/32 v8, 0x3fffffff
+
+    and-long/2addr v8, v6
+
+    shr-long/2addr v8, v3
+
+    long-to-int v0, v8
+
+    const-wide v8, 0xfffffffc0000000L
+
+    and-long/2addr v6, v8
+
+    const/16 v3, 0x1e
+
+    shr-long/2addr v6, v3
+
+    long-to-int v3, v6
+
+    sub-int/2addr v3, v0
+
+    const v0, 0x3fffffff    # 1.9999999f
+
+    and-int/2addr v0, v3
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "Control State Workers {"
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "created = "
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-wide/32 v6, 0x1fffff
+
+    and-long/2addr v6, v1
+
+    long-to-int v0, v6
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-wide v5, 0x3ffffe00000L
+
+    and-long v0, v1, v5
+
+    const/16 v2, 0x15
+
+    shr-long/2addr v0, v2
+
+    long-to-int v1, v0
+
+    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v0, 0x7d
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v0, "]"
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/b.smali b/com.discord/smali_classes2/l0/a/s1/b.smali
new file mode 100644
index 0000000000..ee2820f708
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/b.smali
@@ -0,0 +1,126 @@
+.class public final Ll0/a/s1/b;
+.super Ll0/a/s1/c;
+.source "Dispatcher.kt"
+
+
+# static fields
+.field public static final i:Ll0/a/v;
+
+.field public static final j:Ll0/a/s1/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 8
+
+    new-instance v0, Ll0/a/s1/b;
+
+    invoke-direct {v0}, Ll0/a/s1/b;-><init>()V
+
+    sput-object v0, Ll0/a/s1/b;->j:Ll0/a/s1/b;
+
+    sget v1, Ll0/a/r1/w;->a:I
+
+    const/16 v2, 0x40
+
+    if-ge v2, v1, :cond_0
+
+    move v3, v1
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v1, 0x40
+
+    const/16 v3, 0x40
+
+    :goto_0
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/16 v6, 0xc
+
+    const/4 v7, 0x0
+
+    const-string v2, "kotlinx.coroutines.io.parallelism"
+
+    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+
+    move-result v1
+
+    if-lez v1, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_2
+
+    new-instance v2, Ll0/a/s1/e;
+
+    sget-object v3, Ll0/a/s1/k;->e:Ll0/a/s1/k;
+
+    invoke-direct {v2, v0, v1, v3}, Ll0/a/s1/e;-><init>(Ll0/a/s1/c;ILl0/a/s1/k;)V
+
+    sput-object v2, Ll0/a/s1/b;->i:Ll0/a/v;
+
+    return-void
+
+    :cond_2
+    const-string v0, "Expected positive parallelism level, but have "
+
+    invoke-static {v0, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public constructor <init>()V
+    .locals 3
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x7
+
+    invoke-direct {p0, v0, v0, v1, v2}, Ll0/a/s1/c;-><init>(IILjava/lang/String;I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "DefaultDispatcher cannot be closed"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "DefaultDispatcher"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/c.smali b/com.discord/smali_classes2/l0/a/s1/c.smali
new file mode 100644
index 0000000000..2aadf072e7
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/c.smali
@@ -0,0 +1,201 @@
+.class public Ll0/a/s1/c;
+.super Ll0/a/r0;
+.source "Dispatcher.kt"
+
+
+# instance fields
+.field public d:Ll0/a/s1/a;
+
+.field public final e:I
+
+.field public final f:I
+
+.field public final g:J
+
+.field public final h:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(IILjava/lang/String;I)V
+    .locals 8
+
+    and-int/lit8 p3, p4, 0x1
+
+    if-eqz p3, :cond_0
+
+    sget p1, Ll0/a/s1/l;->c:I
+
+    :cond_0
+    and-int/lit8 p3, p4, 0x2
+
+    if-eqz p3, :cond_1
+
+    sget p2, Ll0/a/s1/l;->d:I
+
+    :cond_1
+    and-int/lit8 p3, p4, 0x4
+
+    if-eqz p3, :cond_2
+
+    const-string p3, "DefaultDispatcher"
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p3, 0x0
+
+    :goto_0
+    const-string p4, "schedulerName"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-wide v0, Ll0/a/s1/l;->e:J
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ll0/a/r0;-><init>()V
+
+    iput p1, p0, Ll0/a/s1/c;->e:I
+
+    iput p2, p0, Ll0/a/s1/c;->f:I
+
+    iput-wide v0, p0, Ll0/a/s1/c;->g:J
+
+    iput-object p3, p0, Ll0/a/s1/c;->h:Ljava/lang/String;
+
+    new-instance p1, Ll0/a/s1/a;
+
+    iget v3, p0, Ll0/a/s1/c;->e:I
+
+    iget v4, p0, Ll0/a/s1/c;->f:I
+
+    iget-wide v5, p0, Ll0/a/s1/c;->g:J
+
+    iget-object v7, p0, Ll0/a/s1/c;->h:Ljava/lang/String;
+
+    move-object v2, p1
+
+    invoke-direct/range {v2 .. v7}, Ll0/a/s1/a;-><init>(IIJLjava/lang/String;)V
+
+    iput-object p1, p0, Ll0/a/s1/c;->d:Ll0/a/s1/a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 6
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "block"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    :try_start_0
+    iget-object v3, p0, Ll0/a/s1/c;->d:Ll0/a/s1/a;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x6
+
+    invoke-static {v3, p2, v2, v4, v5}, Ll0/a/s1/a;->g(Ll0/a/s1/a;Ljava/lang/Runnable;Ll0/a/s1/i;ZI)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    nop
+
+    sget-object v3, Ll0/a/c0;->j:Ll0/a/c0;
+
+    if-eqz v3, :cond_0
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, p2}, Ll0/a/o0;->F(Ljava/lang/Runnable;)V
+
+    :goto_0
+    return-void
+
+    :cond_0
+    throw v2
+.end method
+
+.method public dispatchYield(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 4
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/s1/c;->d:Ll0/a/s1/a;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x2
+
+    invoke-static {v0, p2, v1, v2, v3}, Ll0/a/s1/a;->g(Ll0/a/s1/a;Ljava/lang/Runnable;Ll0/a/s1/i;ZI)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    sget-object v0, Ll0/a/c0;->j:Ll0/a/c0;
+
+    invoke-virtual {v0, p1, p2}, Ll0/a/v;->dispatchYield(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public final v(Ljava/lang/Runnable;Ll0/a/s1/i;Z)V
+    .locals 1
+
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/s1/c;->d:Ll0/a/s1/a;
+
+    invoke-virtual {v0, p1, p2, p3}, Ll0/a/s1/a;->f(Ljava/lang/Runnable;Ll0/a/s1/i;Z)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    sget-object p3, Ll0/a/c0;->j:Ll0/a/c0;
+
+    iget-object v0, p0, Ll0/a/s1/c;->d:Ll0/a/s1/a;
+
+    invoke-virtual {v0, p1, p2}, Ll0/a/s1/a;->d(Ljava/lang/Runnable;Ll0/a/s1/i;)Ll0/a/s1/h;
+
+    move-result-object p1
+
+    invoke-virtual {p3, p1}, Ll0/a/o0;->F(Ljava/lang/Runnable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/d.smali b/com.discord/smali_classes2/l0/a/s1/d.smali
new file mode 100644
index 0000000000..6514f01c0f
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/d.smali
@@ -0,0 +1,209 @@
+.class public Ll0/a/s1/d;
+.super Ll0/a/r1/n;
+.source "Tasks.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/r1/n<",
+        "Ll0/a/s1/h;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Ll0/a/r1/n;-><init>(Z)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final c(Ll0/a/s1/k;)Ll0/a/s1/h;
+    .locals 11
+
+    const-string v0, "mode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    iget-object v0, p0, Ll0/a/r1/n;->_cur$internal:Ljava/lang/Object;
+
+    check-cast v0, Ll0/a/r1/o;
+
+    :cond_0
+    :goto_1
+    iget-wide v3, v0, Ll0/a/r1/o;->_state$internal:J
+
+    const-wide/high16 v1, 0x1000000000000000L
+
+    and-long/2addr v1, v3
+
+    const-wide/16 v5, 0x0
+
+    const/4 v7, 0x0
+
+    cmp-long v8, v1, v5
+
+    if-eqz v8, :cond_1
+
+    sget-object v7, Ll0/a/r1/o;->g:Ll0/a/r1/v;
+
+    goto/16 :goto_4
+
+    :cond_1
+    sget-object v1, Ll0/a/r1/o;->h:Ll0/a/r1/o$a;
+
+    const-wide/32 v1, 0x3fffffff
+
+    and-long/2addr v1, v3
+
+    const/4 v5, 0x0
+
+    shr-long/2addr v1, v5
+
+    long-to-int v8, v1
+
+    const-wide v1, 0xfffffffc0000000L
+
+    and-long/2addr v1, v3
+
+    const/16 v6, 0x1e
+
+    shr-long/2addr v1, v6
+
+    long-to-int v2, v1
+
+    iget v1, v0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v2, v1
+
+    and-int/2addr v1, v8
+
+    if-ne v2, v1, :cond_2
+
+    goto :goto_4
+
+    :cond_2
+    iget-object v2, v0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v9
+
+    if-nez v9, :cond_3
+
+    iget-boolean v1, v0, Ll0/a/r1/o;->d:Z
+
+    if-eqz v1, :cond_0
+
+    goto :goto_4
+
+    :cond_3
+    instance-of v1, v9, Ll0/a/r1/o$b;
+
+    if-eqz v1, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    move-object v1, v9
+
+    check-cast v1, Ll0/a/s1/h;
+
+    invoke-virtual {v1}, Ll0/a/s1/h;->a()Ll0/a/s1/k;
+
+    move-result-object v1
+
+    if-ne v1, p1, :cond_5
+
+    const/4 v5, 0x1
+
+    :cond_5
+    if-nez v5, :cond_6
+
+    goto :goto_4
+
+    :cond_6
+    add-int/lit8 v1, v8, 0x1
+
+    const v2, 0x3fffffff    # 1.9999999f
+
+    and-int v10, v1, v2
+
+    sget-object v1, Ll0/a/r1/o;->f:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+
+    sget-object v2, Ll0/a/r1/o;->h:Ll0/a/r1/o$a;
+
+    invoke-virtual {v2, v3, v4, v10}, Ll0/a/r1/o$a;->a(JI)J
+
+    move-result-wide v5
+
+    move-object v2, v0
+
+    invoke-virtual/range {v1 .. v6}, Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;->compareAndSet(Ljava/lang/Object;JJ)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    iget-object v1, v0, Ll0/a/r1/o;->b:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v2, v0, Ll0/a/r1/o;->a:I
+
+    and-int/2addr v2, v8
+
+    invoke-virtual {v1, v2, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->set(ILjava/lang/Object;)V
+
+    goto :goto_3
+
+    :cond_7
+    iget-boolean v1, v0, Ll0/a/r1/o;->d:Z
+
+    if-nez v1, :cond_8
+
+    goto :goto_1
+
+    :cond_8
+    move-object v1, v0
+
+    :goto_2
+    invoke-static {v1, v8, v10}, Ll0/a/r1/o;->a(Ll0/a/r1/o;II)Ll0/a/r1/o;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_9
+
+    goto :goto_2
+
+    :cond_9
+    :goto_3
+    move-object v7, v9
+
+    :goto_4
+    sget-object v1, Ll0/a/r1/o;->g:Ll0/a/r1/v;
+
+    if-eq v7, v1, :cond_a
+
+    check-cast v7, Ll0/a/s1/h;
+
+    return-object v7
+
+    :cond_a
+    sget-object v1, Ll0/a/r1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v0}, Ll0/a/r1/o;->e()Ll0/a/r1/o;
+
+    move-result-object v2
+
+    invoke-virtual {v1, p0, v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto/16 :goto_0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/e.smali b/com.discord/smali_classes2/l0/a/s1/e.smali
new file mode 100644
index 0000000000..e18a396281
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/e.smali
@@ -0,0 +1,267 @@
+.class public final Ll0/a/s1/e;
+.super Ll0/a/r0;
+.source "Dispatcher.kt"
+
+# interfaces
+.implements Ll0/a/s1/i;
+.implements Ljava/util/concurrent/Executor;
+
+
+# static fields
+.field public static final h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
+            "Ljava/lang/Runnable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ll0/a/s1/c;
+
+.field public final f:I
+
+.field public final g:Ll0/a/s1/k;
+
+.field public volatile inFlightTasks:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ll0/a/s1/e;
+
+    const-string v1, "inFlightTasks"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ll0/a/s1/c;ILl0/a/s1/k;)V
+    .locals 1
+
+    const-string v0, "dispatcher"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "taskMode"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ll0/a/r0;-><init>()V
+
+    iput-object p1, p0, Ll0/a/s1/e;->e:Ll0/a/s1/c;
+
+    iput p2, p0, Ll0/a/s1/e;->f:I
+
+    iput-object p3, p0, Ll0/a/s1/e;->g:Ll0/a/s1/k;
+
+    new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
+
+    iput-object p1, p0, Ll0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Ll0/a/s1/e;->inFlightTasks:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public c()V
+    .locals 3
+
+    iget-object v0, p0, Ll0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Runnable;
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v2, p0, Ll0/a/s1/e;->e:Ll0/a/s1/c;
+
+    invoke-virtual {v2, v0, p0, v1}, Ll0/a/s1/c;->v(Ljava/lang/Runnable;Ll0/a/s1/i;Z)V
+
+    return-void
+
+    :cond_0
+    sget-object v0, Ll0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {v0, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->decrementAndGet(Ljava/lang/Object;)I
+
+    iget-object v0, p0, Ll0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Runnable;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0, v0, v1}, Ll0/a/s1/e;->v(Ljava/lang/Runnable;Z)V
+
+    :cond_1
+    return-void
+.end method
+
+.method public close()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Close cannot be invoked on LimitingBlockingDispatcher"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "block"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p2, p1}, Ll0/a/s1/e;->v(Ljava/lang/Runnable;Z)V
+
+    return-void
+.end method
+
+.method public execute(Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "command"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Ll0/a/s1/e;->v(Ljava/lang/Runnable;Z)V
+
+    return-void
+.end method
+
+.method public g()Ll0/a/s1/k;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/s1/e;->g:Ll0/a/s1/k;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-super {p0}, Ll0/a/v;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "[dispatcher = "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ll0/a/s1/e;->e:Ll0/a/s1/c;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final v(Ljava/lang/Runnable;Z)V
+    .locals 2
+
+    :goto_0
+    sget-object v0, Ll0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {v0, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->incrementAndGet(Ljava/lang/Object;)I
+
+    move-result v0
+
+    iget v1, p0, Ll0/a/s1/e;->f:I
+
+    if-gt v0, v1, :cond_0
+
+    iget-object v0, p0, Ll0/a/s1/e;->e:Ll0/a/s1/c;
+
+    invoke-virtual {v0, p1, p0, p2}, Ll0/a/s1/c;->v(Ljava/lang/Runnable;Ll0/a/s1/i;Z)V
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ll0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
+
+    sget-object p1, Ll0/a/s1/e;->h:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {p1, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->decrementAndGet(Ljava/lang/Object;)I
+
+    move-result p1
+
+    iget v0, p0, Ll0/a/s1/e;->f:I
+
+    if-lt p1, v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object p1, p0, Ll0/a/s1/e;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Runnable;
+
+    if-eqz p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/f.smali b/com.discord/smali_classes2/l0/a/s1/f.smali
new file mode 100644
index 0000000000..60b9f42e49
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/f.smali
@@ -0,0 +1,29 @@
+.class public final Ll0/a/s1/f;
+.super Ll0/a/s1/m;
+.source "Tasks.kt"
+
+
+# static fields
+.field public static final a:Ll0/a/s1/f;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/s1/f;
+
+    invoke-direct {v0}, Ll0/a/s1/f;-><init>()V
+
+    sput-object v0, Ll0/a/s1/f;->a:Ll0/a/s1/f;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ll0/a/s1/m;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/g.smali b/com.discord/smali_classes2/l0/a/s1/g.smali
new file mode 100644
index 0000000000..e50ee7b350
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/g.smali
@@ -0,0 +1,54 @@
+.class public final Ll0/a/s1/g;
+.super Ljava/lang/Object;
+.source "Tasks.kt"
+
+# interfaces
+.implements Ll0/a/s1/i;
+
+
+# static fields
+.field public static final d:Ll0/a/s1/k;
+
+.field public static final e:Ll0/a/s1/g;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ll0/a/s1/g;
+
+    invoke-direct {v0}, Ll0/a/s1/g;-><init>()V
+
+    sput-object v0, Ll0/a/s1/g;->e:Ll0/a/s1/g;
+
+    sget-object v0, Ll0/a/s1/k;->d:Ll0/a/s1/k;
+
+    sput-object v0, Ll0/a/s1/g;->d:Ll0/a/s1/k;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public c()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public g()Ll0/a/s1/k;
+    .locals 1
+
+    sget-object v0, Ll0/a/s1/k;->d:Ll0/a/s1/k;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/h.smali b/com.discord/smali_classes2/l0/a/s1/h.smali
new file mode 100644
index 0000000000..771f856853
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/h.smali
@@ -0,0 +1,64 @@
+.class public abstract Ll0/a/s1/h;
+.super Ljava/lang/Object;
+.source "Tasks.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public d:J
+
+.field public e:Ll0/a/s1/i;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 3
+
+    sget-object v0, Ll0/a/s1/g;->e:Ll0/a/s1/g;
+
+    const-string v1, "taskContext"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const-wide/16 v1, 0x0
+
+    iput-wide v1, p0, Ll0/a/s1/h;->d:J
+
+    iput-object v0, p0, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    return-void
+.end method
+
+.method public constructor <init>(JLl0/a/s1/i;)V
+    .locals 1
+
+    const-string v0, "taskContext"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Ll0/a/s1/h;->d:J
+
+    iput-object p3, p0, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Ll0/a/s1/k;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    invoke-interface {v0}, Ll0/a/s1/i;->g()Ll0/a/s1/k;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/i.smali b/com.discord/smali_classes2/l0/a/s1/i.smali
new file mode 100644
index 0000000000..f1b6a0c472
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/i.smali
@@ -0,0 +1,11 @@
+.class public interface abstract Ll0/a/s1/i;
+.super Ljava/lang/Object;
+.source "Tasks.kt"
+
+
+# virtual methods
+.method public abstract c()V
+.end method
+
+.method public abstract g()Ll0/a/s1/k;
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/j.smali b/com.discord/smali_classes2/l0/a/s1/j.smali
new file mode 100644
index 0000000000..f042458e6d
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/j.smali
@@ -0,0 +1,109 @@
+.class public final Ll0/a/s1/j;
+.super Ll0/a/s1/h;
+.source "Tasks.kt"
+
+
+# instance fields
+.field public final f:Ljava/lang/Runnable;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Runnable;JLl0/a/s1/i;)V
+    .locals 1
+
+    const-string v0, "block"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "taskContext"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p2, p3, p4}, Ll0/a/s1/h;-><init>(JLl0/a/s1/i;)V
+
+    iput-object p1, p0, Ll0/a/s1/j;->f:Ljava/lang/Runnable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Ll0/a/s1/j;->f:Ljava/lang/Runnable;
+
+    invoke-interface {v0}, Ljava/lang/Runnable;->run()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    invoke-interface {v0}, Ll0/a/s1/i;->c()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    invoke-interface {v1}, Ll0/a/s1/i;->c()V
+
+    throw v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 4
+
+    const-string v0, "Task["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/s1/j;->f:Ljava/lang/Runnable;
+
+    invoke-static {v1}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ll0/a/s1/j;->f:Ljava/lang/Runnable;
+
+    invoke-static {v1}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v2, p0, Ll0/a/s1/h;->d:J
+
+    invoke-virtual {v0, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ll0/a/s1/h;->e:Ll0/a/s1/i;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/k.smali b/com.discord/smali_classes2/l0/a/s1/k.smali
new file mode 100644
index 0000000000..55830ae162
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/k.smali
@@ -0,0 +1,100 @@
+.class public final enum Ll0/a/s1/k;
+.super Ljava/lang/Enum;
+.source "Tasks.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ll0/a/s1/k;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ll0/a/s1/k;
+
+.field public static final enum e:Ll0/a/s1/k;
+
+.field public static final synthetic f:[Ll0/a/s1/k;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Ll0/a/s1/k;
+
+    new-instance v1, Ll0/a/s1/k;
+
+    const-string v2, "NON_BLOCKING"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Ll0/a/s1/k;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/s1/k;->d:Ll0/a/s1/k;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/s1/k;
+
+    const-string v2, "PROBABLY_BLOCKING"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Ll0/a/s1/k;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/s1/k;->e:Ll0/a/s1/k;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Ll0/a/s1/k;->f:[Ll0/a/s1/k;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ll0/a/s1/k;
+    .locals 1
+
+    const-class v0, Ll0/a/s1/k;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ll0/a/s1/k;
+
+    return-object p0
+.end method
+
+.method public static values()[Ll0/a/s1/k;
+    .locals 1
+
+    sget-object v0, Ll0/a/s1/k;->f:[Ll0/a/s1/k;
+
+    invoke-virtual {v0}, [Ll0/a/s1/k;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ll0/a/s1/k;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/l.smali b/com.discord/smali_classes2/l0/a/s1/l.smali
new file mode 100644
index 0000000000..158849018e
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/l.smali
@@ -0,0 +1,159 @@
+.class public final Ll0/a/s1/l;
+.super Ljava/lang/Object;
+.source "Tasks.kt"
+
+
+# static fields
+.field public static final a:J
+
+.field public static final b:I
+
+.field public static final c:I
+
+.field public static final d:I
+
+.field public static final e:J
+
+.field public static f:Ll0/a/s1/m;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 10
+
+    const-string v0, "kotlinx.coroutines.scheduler.resolution.ns"
+
+    const-wide/32 v1, 0x186a0
+
+    const-wide/16 v3, 0x0
+
+    const-wide/16 v5, 0x0
+
+    const/16 v7, 0xc
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lf/n/a/k/a;->Z(Ljava/lang/String;JJJILjava/lang/Object;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ll0/a/s1/l;->a:J
+
+    const-string v2, "kotlinx.coroutines.scheduler.offload.threshold"
+
+    const/16 v3, 0x60
+
+    const/4 v4, 0x0
+
+    const/16 v5, 0x80
+
+    const/4 v6, 0x4
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+
+    move-result v0
+
+    sput v0, Ll0/a/s1/l;->b:I
+
+    const-string v1, "kotlinx.coroutines.scheduler.blocking.parallelism"
+
+    const/16 v2, 0x10
+
+    const/4 v3, 0x0
+
+    const/16 v5, 0xc
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+
+    sget v0, Ll0/a/r1/w;->a:I
+
+    const/4 v1, 0x2
+
+    if-ge v0, v1, :cond_0
+
+    const/4 v3, 0x2
+
+    goto :goto_0
+
+    :cond_0
+    move v3, v0
+
+    :goto_0
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    const/16 v6, 0x8
+
+    const/4 v7, 0x0
+
+    const-string v2, "kotlinx.coroutines.scheduler.core.pool.size"
+
+    invoke-static/range {v2 .. v7}, Lf/n/a/k/a;->Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+
+    move-result v0
+
+    sput v0, Ll0/a/s1/l;->c:I
+
+    sget v0, Ll0/a/r1/w;->a:I
+
+    mul-int/lit16 v0, v0, 0x80
+
+    sget v1, Ll0/a/s1/l;->c:I
+
+    const v2, 0x1ffffe
+
+    invoke-static {v0, v1, v2}, Lk0/r/f;->coerceIn(III)I
+
+    move-result v4
+
+    const/4 v5, 0x0
+
+    const v6, 0x1ffffe
+
+    const/4 v7, 0x4
+
+    const/4 v8, 0x0
+
+    const-string v3, "kotlinx.coroutines.scheduler.max.pool.size"
+
+    invoke-static/range {v3 .. v8}, Lf/n/a/k/a;->Y(Ljava/lang/String;IIIILjava/lang/Object;)I
+
+    move-result v0
+
+    sput v0, Ll0/a/s1/l;->d:I
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v2, 0x5
+
+    const-wide/16 v4, 0x0
+
+    const-wide/16 v6, 0x0
+
+    const/16 v8, 0xc
+
+    const/4 v9, 0x0
+
+    const-string v1, "kotlinx.coroutines.scheduler.keep.alive.sec"
+
+    invoke-static/range {v1 .. v9}, Lf/n/a/k/a;->Z(Ljava/lang/String;JJJILjava/lang/Object;)J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ll0/a/s1/l;->e:J
+
+    sget-object v0, Ll0/a/s1/f;->a:Ll0/a/s1/f;
+
+    sput-object v0, Ll0/a/s1/l;->f:Ll0/a/s1/m;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/m.smali b/com.discord/smali_classes2/l0/a/s1/m.smali
new file mode 100644
index 0000000000..74abdfaa89
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/m.smali
@@ -0,0 +1,13 @@
+.class public abstract Ll0/a/s1/m;
+.super Ljava/lang/Object;
+.source "Tasks.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/s1/n.smali b/com.discord/smali_classes2/l0/a/s1/n.smali
new file mode 100644
index 0000000000..eee6a6e82d
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/s1/n.smali
@@ -0,0 +1,370 @@
+.class public final Ll0/a/s1/n;
+.super Ljava/lang/Object;
+.source "WorkQueue.kt"
+
+
+# static fields
+.field public static final b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+.field public static final c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+.field public static final d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+            "Ll0/a/s1/h;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public volatile consumerIndex:I
+
+.field public volatile lastScheduledTask:Ljava/lang/Object;
+
+.field public volatile producerIndex:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, Ll0/a/s1/n;
+
+    const-class v1, Ljava/lang/Object;
+
+    const-string v2, "lastScheduledTask"
+
+    invoke-static {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    move-result-object v1
+
+    sput-object v1, Ll0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const-string v1, "producerIndex"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v1
+
+    sput-object v1, Ll0/a/s1/n;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const-string v1, "consumerIndex"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    const/16 v1, 0x80
+
+    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object v0, p0, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ll0/a/s1/n;->lastScheduledTask:Ljava/lang/Object;
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Ll0/a/s1/n;->producerIndex:I
+
+    iput v0, p0, Ll0/a/s1/n;->consumerIndex:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+    .locals 1
+
+    const-string v0, "task"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "globalQueue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ll0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    invoke-virtual {v0, p0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->getAndSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ll0/a/s1/h;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p0, p1, p2}, Ll0/a/s1/n;->b(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final b(Ll0/a/s1/h;Ll0/a/s1/d;)Z
+    .locals 9
+
+    const-string v0, "task"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "globalQueue"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x1
+
+    :goto_0
+    invoke-virtual {p0}, Ll0/a/s1/n;->d()I
+
+    move-result v3
+
+    const/16 v4, 0x7f
+
+    if-ne v3, v4, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    iget v3, p0, Ll0/a/s1/n;->producerIndex:I
+
+    and-int/2addr v3, v4
+
+    iget-object v4, p0, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v4, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    :goto_1
+    const/4 v3, 0x0
+
+    goto :goto_2
+
+    :cond_1
+    iget-object v4, p0, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v4, v3, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    sget-object v3, Ll0/a/s1/n;->c:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    invoke-virtual {v3, p0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->incrementAndGet(Ljava/lang/Object;)I
+
+    const/4 v3, 0x1
+
+    :goto_2
+    if-nez v3, :cond_6
+
+    invoke-virtual {p0}, Ll0/a/s1/n;->d()I
+
+    move-result v2
+
+    div-int/lit8 v2, v2, 0x2
+
+    if-ge v2, v1, :cond_2
+
+    const/4 v2, 0x1
+
+    :cond_2
+    const/4 v3, 0x0
+
+    :goto_3
+    if-ge v3, v2, :cond_5
+
+    :cond_3
+    iget v4, p0, Ll0/a/s1/n;->consumerIndex:I
+
+    iget v5, p0, Ll0/a/s1/n;->producerIndex:I
+
+    sub-int v5, v4, v5
+
+    const/4 v6, 0x0
+
+    if-nez v5, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    and-int/lit8 v5, v4, 0x7f
+
+    iget-object v7, p0, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v7, v5}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Ll0/a/s1/h;
+
+    if-eqz v7, :cond_3
+
+    sget-object v7, Ll0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    add-int/lit8 v8, v4, 0x1
+
+    invoke-virtual {v7, p0, v4, v8}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_3
+
+    iget-object v4, p0, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v4, v5, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    move-object v6, v4
+
+    check-cast v6, Ll0/a/s1/h;
+
+    :goto_4
+    if-eqz v6, :cond_5
+
+    invoke-virtual {p0, p2, v6}, Ll0/a/s1/n;->c(Ll0/a/s1/d;Ll0/a/s1/h;)V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_3
+
+    :cond_5
+    const/4 v2, 0x0
+
+    goto :goto_0
+
+    :cond_6
+    return v2
+.end method
+
+.method public final c(Ll0/a/s1/d;Ll0/a/s1/h;)V
+    .locals 0
+
+    invoke-virtual {p1, p2}, Ll0/a/r1/n;->a(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "GlobalQueue could not be closed yet"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final d()I
+    .locals 2
+
+    iget v0, p0, Ll0/a/s1/n;->producerIndex:I
+
+    iget v1, p0, Ll0/a/s1/n;->consumerIndex:I
+
+    sub-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final e()Ll0/a/s1/h;
+    .locals 5
+
+    sget-object v0, Ll0/a/s1/n;->b:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, p0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->getAndSet(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ll0/a/s1/h;
+
+    if-eqz v0, :cond_0
+
+    move-object v1, v0
+
+    goto :goto_0
+
+    :cond_0
+    iget v0, p0, Ll0/a/s1/n;->consumerIndex:I
+
+    iget v2, p0, Ll0/a/s1/n;->producerIndex:I
+
+    sub-int v2, v0, v2
+
+    if-nez v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    and-int/lit8 v2, v0, 0x7f
+
+    iget-object v3, p0, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ll0/a/s1/h;
+
+    if-eqz v3, :cond_0
+
+    sget-object v3, Ll0/a/s1/n;->d:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    add-int/lit8 v4, v0, 0x1
+
+    invoke-virtual {v3, p0, v0, v4}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ll0/a/s1/n;->a:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->getAndSet(ILjava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v1, v0
+
+    check-cast v1, Ll0/a/s1/h;
+
+    :goto_0
+    return-object v1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/t.smali b/com.discord/smali_classes2/l0/a/t.smali
new file mode 100644
index 0000000000..f2ad2cd6c9
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/t.smali
@@ -0,0 +1,26 @@
+.class public interface abstract Ll0/a/t;
+.super Ljava/lang/Object;
+.source "Debug.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Throwable;",
+        ":",
+        "Ll0/a/t<",
+        "TT;>;>",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract a()Ljava/lang/Throwable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/l0/a/t0.smali b/com.discord/smali_classes2/l0/a/t0.smali
new file mode 100644
index 0000000000..d61414faf7
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/t0.smali
@@ -0,0 +1,70 @@
+.class public final Ll0/a/t0;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
+
+# interfaces
+.implements Ll0/a/u0;
+
+
+# instance fields
+.field public final d:Ll0/a/g1;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/g1;)V
+    .locals 1
+
+    const-string v0, "list"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/t0;->d:Ll0/a/g1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public getList()Ll0/a/g1;
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/t0;->d:Ll0/a/g1;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    sget-boolean v0, Ll0/a/b0;->b:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ll0/a/t0;->d:Ll0/a/g1;
+
+    const-string v1, "New"
+
+    invoke-virtual {v0, v1}, Ll0/a/g1;->i(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-super {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/u.smali b/com.discord/smali_classes2/l0/a/u.smali
new file mode 100644
index 0000000000..438c515805
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/u.smali
@@ -0,0 +1,232 @@
+.class public final Ll0/a/u;
+.super Ljava/lang/Object;
+.source "CoroutineContext.kt"
+
+
+# static fields
+.field public static final a:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-string v0, "kotlinx.coroutines.scheduler"
+
+    invoke-static {v0}, Ll0/a/r1/w;->a(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    const/16 v2, 0xddf
+
+    if-eq v1, v2, :cond_1
+
+    const v2, 0x1ad6f
+
+    if-ne v1, v2, :cond_3
+
+    const-string v1, "off"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    const-string v1, "on"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    goto :goto_0
+
+    :cond_2
+    const-string v1, ""
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    :goto_0
+    const/4 v0, 0x1
+
+    :goto_1
+    sput-boolean v0, Ll0/a/u;->a:Z
+
+    return-void
+
+    :cond_3
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "System property \'kotlinx.coroutines.scheduler\' has unrecognized value \'"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v0, 0x27
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public static final a(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "$this$coroutineName"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-boolean v0, Ll0/a/b0;->b:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return-object v1
+
+    :cond_0
+    sget-object v0, Ll0/a/x;->e:Ll0/a/x$a;
+
+    invoke-interface {p0, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object v0
+
+    check-cast v0, Ll0/a/x;
+
+    if-eqz v0, :cond_1
+
+    sget-object v1, Ll0/a/y;->e:Ll0/a/y$a;
+
+    invoke-interface {p0, v1}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p0
+
+    check-cast p0, Ll0/a/y;
+
+    new-instance p0, Ljava/lang/StringBuilder;
+
+    invoke-direct {p0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "coroutine"
+
+    invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x23
+
+    invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-wide v0, v0, Ll0/a/x;->d:J
+
+    invoke-virtual {p0, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_1
+    return-object v1
+.end method
+
+.method public static final b(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    .locals 2
+
+    const-string v0, "$this$newCoroutineContext"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Lkotlinx/coroutines/CoroutineScope;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p0
+
+    invoke-interface {p0, p1}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p0
+
+    sget-boolean p1, Ll0/a/b0;->b:Z
+
+    if-eqz p1, :cond_0
+
+    new-instance p1, Ll0/a/x;
+
+    sget-object v0, Ll0/a/b0;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
+
+    move-result-wide v0
+
+    invoke-direct {p1, v0, v1}, Ll0/a/x;-><init>(J)V
+
+    invoke-interface {p0, p1}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, p0
+
+    :goto_0
+    sget-object v0, Ll0/a/j0;->a:Ll0/a/v;
+
+    if-eq p0, v0, :cond_1
+
+    sget-object v0, Lk0/l/d;->a:Lk0/l/d$a;
+
+    invoke-interface {p0, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p0
+
+    if-nez p0, :cond_1
+
+    sget-object p0, Ll0/a/j0;->a:Ll0/a/v;
+
+    invoke-interface {p1, p0}, Lkotlin/coroutines/CoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    :cond_1
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/l0/a/u0.smali b/com.discord/smali_classes2/l0/a/u0.smali
new file mode 100644
index 0000000000..a1904e0f80
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/u0.smali
@@ -0,0 +1,11 @@
+.class public interface abstract Ll0/a/u0;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
+
+
+# virtual methods
+.method public abstract a()Z
+.end method
+
+.method public abstract getList()Ll0/a/g1;
+.end method
diff --git a/com.discord/smali_classes2/l0/a/v.smali b/com.discord/smali_classes2/l0/a/v.smali
new file mode 100644
index 0000000000..dd1a8fc3ff
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/v.smali
@@ -0,0 +1,269 @@
+.class public abstract Ll0/a/v;
+.super Lk0/l/a;
+.source "CoroutineDispatcher.kt"
+
+# interfaces
+.implements Lk0/l/d;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    sget-object v0, Lk0/l/d;->a:Lk0/l/d$a;
+
+    invoke-direct {p0, v0}, Lk0/l/a;-><init>(Lkotlin/coroutines/CoroutineContext$b;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+.end method
+
+.method public dispatchYield(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "block"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1, p2}, Ll0/a/v;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+
+    return-void
+.end method
+
+.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            ">(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v1, p1, Lk0/l/b;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lk0/l/b;
+
+    invoke-interface {p0}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
+
+    move-result-object v1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eq v1, p1, :cond_0
+
+    const/4 p1, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x1
+
+    :goto_0
+    if-nez p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const-string p1, "element"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_2
+    sget-object v0, Lk0/l/d;->a:Lk0/l/d$a;
+
+    if-ne v0, p1, :cond_3
+
+    move-object v2, p0
+
+    :cond_3
+    :goto_1
+    return-object v2
+.end method
+
+.method public final interceptContinuation(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lkotlin/coroutines/Continuation<",
+            "-TT;>;)",
+            "Lkotlin/coroutines/Continuation<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "continuation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ll0/a/f0;
+
+    invoke-direct {v0, p0, p1}, Ll0/a/f0;-><init>(Ll0/a/v;Lkotlin/coroutines/Continuation;)V
+
+    return-object v0
+.end method
+
+.method public isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;)",
+            "Lkotlin/coroutines/CoroutineContext;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v1, p1, Lk0/l/b;
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lk0/l/b;
+
+    invoke-interface {p0}, Lkotlin/coroutines/CoroutineContext$a;->getKey()Lkotlin/coroutines/CoroutineContext$b;
+
+    move-result-object v1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eq v1, p1, :cond_0
+
+    const/4 p1, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x1
+
+    :goto_0
+    if-nez p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const-string p1, "element"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_2
+    sget-object v0, Lk0/l/d;->a:Lk0/l/d$a;
+
+    if-ne v0, p1, :cond_3
+
+    sget-object p1, Lk0/l/f;->d:Lk0/l/f;
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    move-object p1, p0
+
+    :goto_2
+    return-object p1
+.end method
+
+.method public final plus(Ll0/a/v;)Ll0/a/v;
+    .locals 1
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/Continuation<",
+            "*>;)V"
+        }
+    .end annotation
+
+    const-string v0, "continuation"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/v0.smali b/com.discord/smali_classes2/l0/a/v0.smali
new file mode 100644
index 0000000000..3fab9e4c07
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/v0.smali
@@ -0,0 +1,23 @@
+.class public final Ll0/a/v0;
+.super Ljava/lang/Object;
+.source "JobSupport.kt"
+
+
+# instance fields
+.field public final a:Ll0/a/u0;
+
+
+# direct methods
+.method public constructor <init>(Ll0/a/u0;)V
+    .locals 1
+
+    const-string v0, "state"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ll0/a/v0;->a:Ll0/a/u0;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/w.smali b/com.discord/smali_classes2/l0/a/w.smali
new file mode 100644
index 0000000000..d871b0c5ef
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/w.smali
@@ -0,0 +1,117 @@
+.class public final Ll0/a/w;
+.super Ljava/lang/Object;
+.source "CoroutineExceptionHandlerImpl.kt"
+
+
+# static fields
+.field public static final a:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lkotlinx/coroutines/CoroutineExceptionHandler;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    invoke-static {}, La;->a()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const-string v1, "ServiceLoader.load(\n    \u2026.classLoader\n).iterator()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lf/n/a/k/a;->asSequence(Ljava/util/Iterator;)Lkotlin/sequences/Sequence;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/w;->a:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static final a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+    .locals 4
+
+    const-string v0, "context"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "exception"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ll0/a/w;->a:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const-string v2, "currentThread"
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lkotlinx/coroutines/CoroutineExceptionHandler;
+
+    :try_start_0
+    invoke-interface {v1, p0, p1}, Lkotlinx/coroutines/CoroutineExceptionHandler;->handleException(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v3
+
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v2
+
+    invoke-static {p1, v1}, Lf/n/a/k/a;->D(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    move-result-object v1
+
+    invoke-interface {v2, v3, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object p0
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v0
+
+    invoke-interface {v0, p0, p1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/w0.smali b/com.discord/smali_classes2/l0/a/w0.smali
new file mode 100644
index 0000000000..6c853dc7b7
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/w0.smali
@@ -0,0 +1,106 @@
+.class public final Ll0/a/w0;
+.super Ll0/a/d;
+.source "CancellableContinuationImpl.kt"
+
+
+# instance fields
+.field public final d:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "handler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ll0/a/d;-><init>()V
+
+    iput-object p1, p0, Ll0/a/w0;->d:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/w0;->d:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    iget-object v0, p0, Ll0/a/w0;->d:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "InvokeOnCancel["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ll0/a/w0;->d:Lkotlin/jvm/functions/Function1;
+
+    invoke-static {v1}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/x$a.smali b/com.discord/smali_classes2/l0/a/x$a.smali
new file mode 100644
index 0000000000..0b304f0cc9
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/x$a.smali
@@ -0,0 +1,36 @@
+.class public final Ll0/a/x$a;
+.super Ljava/lang/Object;
+.source "CoroutineContext.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/x;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/CoroutineContext$b<",
+        "Ll0/a/x;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/x.smali b/com.discord/smali_classes2/l0/a/x.smali
new file mode 100644
index 0000000000..51465c43fb
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/x.smali
@@ -0,0 +1,357 @@
+.class public final Ll0/a/x;
+.super Lk0/l/a;
+.source "CoroutineContext.kt"
+
+# interfaces
+.implements Ll0/a/m1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ll0/a/x$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/l/a;",
+        "Ll0/a/m1<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final e:Ll0/a/x$a;
+
+
+# instance fields
+.field public final d:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/x$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Ll0/a/x$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Ll0/a/x;->e:Ll0/a/x$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(J)V
+    .locals 1
+
+    sget-object v0, Ll0/a/x;->e:Ll0/a/x$a;
+
+    invoke-direct {p0, v0}, Lk0/l/a;-><init>(Lkotlin/coroutines/CoroutineContext$b;)V
+
+    iput-wide p1, p0, Ll0/a/x;->d:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 7
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_2
+
+    instance-of v1, p1, Ll0/a/x;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Ll0/a/x;
+
+    iget-wide v3, p0, Ll0/a/x;->d:J
+
+    iget-wide v5, p1, Ll0/a/x;->d:J
+
+    cmp-long p1, v3, v5
+
+    if-nez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(TR;",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TR;-",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            "+TR;>;)TR;"
+        }
+    .end annotation
+
+    const-string v0, "operation"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2}, Lkotlin/coroutines/CoroutineContext$a$a;->fold(Lkotlin/coroutines/CoroutineContext$a;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E::",
+            "Lkotlin/coroutines/CoroutineContext$a;",
+            ">(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "TE;>;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->get(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public hashCode()I
+    .locals 4
+
+    iget-wide v0, p0, Ll0/a/x;->d:J
+
+    const/16 v2, 0x20
+
+    ushr-long v2, v0, v2
+
+    xor-long/2addr v0, v2
+
+    long-to-int v1, v0
+
+    return v1
+.end method
+
+.method public k(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+    .locals 1
+
+    check-cast p2, Ljava/lang/String;
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "oldState"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object p1
+
+    const-string v0, "Thread.currentThread()"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, p2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public minusKey(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/coroutines/CoroutineContext$b<",
+            "*>;)",
+            "Lkotlin/coroutines/CoroutineContext;"
+        }
+    .end annotation
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->minusKey(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lkotlin/coroutines/CoroutineContext$a$a;->plus(Lkotlin/coroutines/CoroutineContext$a;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public r(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+    .locals 6
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ll0/a/y;->e:Ll0/a/y$a;
+
+    invoke-interface {p1, v0}, Lkotlin/coroutines/CoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$b;)Lkotlin/coroutines/CoroutineContext$a;
+
+    move-result-object p1
+
+    check-cast p1, Ll0/a/y;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object p1
+
+    const-string v0, "currentThread"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "oldName"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x6
+
+    const-string v2, " @"
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v2, v3, v3, v1}, Lk0/u/p;->lastIndexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+
+    move-result v1
+
+    if-gez v1, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    :cond_0
+    const/16 v4, 0x9
+
+    add-int/2addr v4, v1
+
+    add-int/lit8 v4, v4, 0xa
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    invoke-direct {v5, v4}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    invoke-virtual {v0, v3, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v3, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "coroutine"
+
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x23
+
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Ll0/a/x;->d:J
+
+    invoke-virtual {v5, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "StringBuilder(capacity).\u2026builderAction).toString()"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, v1}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "CoroutineId("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-wide v1, p0, Ll0/a/x;->d:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/x0.smali b/com.discord/smali_classes2/l0/a/x0.smali
new file mode 100644
index 0000000000..fd43d964f5
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/x0.smali
@@ -0,0 +1,156 @@
+.class public final Ll0/a/x0;
+.super Ll0/a/z0;
+.source "JobSupport.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/z0<",
+        "Lkotlinx/coroutines/Job;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+
+# instance fields
+.field public volatile _invoked:I
+
+.field public final h:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ll0/a/x0;
+
+    const-string v1, "_invoked"
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->newUpdater(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    move-result-object v0
+
+    sput-object v0, Ll0/a/x0;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlinx/coroutines/Job;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "job"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "handler"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ll0/a/z0;-><init>(Lkotlinx/coroutines/Job;)V
+
+    iput-object p2, p0, Ll0/a/x0;->h:Lkotlin/jvm/functions/Function1;
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Ll0/a/x0;->_invoked:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public i(Ljava/lang/Throwable;)V
+    .locals 3
+
+    sget-object v0, Ll0/a/x0;->i:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ll0/a/x0;->h:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    return-void
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Ll0/a/x0;->i(Ljava/lang/Throwable;)V
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "InvokeOnCancelling["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/y$a.smali b/com.discord/smali_classes2/l0/a/y$a.smali
new file mode 100644
index 0000000000..560574b2c9
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/y$a.smali
@@ -0,0 +1,36 @@
+.class public final Ll0/a/y$a;
+.super Ljava/lang/Object;
+.source "CoroutineName.kt"
+
+# interfaces
+.implements Lkotlin/coroutines/CoroutineContext$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ll0/a/y;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lkotlin/coroutines/CoroutineContext$b<",
+        "Ll0/a/y;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/a/y.smali b/com.discord/smali_classes2/l0/a/y.smali
new file mode 100644
index 0000000000..b39d760cba
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/y.smali
@@ -0,0 +1,88 @@
+.class public final Ll0/a/y;
+.super Lk0/l/a;
+.source "CoroutineName.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ll0/a/y$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final e:Ll0/a/y$a;
+
+
+# instance fields
+.field public final d:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ll0/a/y$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Ll0/a/y$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Ll0/a/y;->e:Ll0/a/y$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Ll0/a/y;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ll0/a/y;
+
+    const/4 v0, 0x0
+
+    iget-object p1, p1, Ll0/a/y;->d:Ljava/lang/String;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "CoroutineName(null)"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/y0.smali b/com.discord/smali_classes2/l0/a/y0.smali
new file mode 100644
index 0000000000..9d1f87e35b
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/y0.smali
@@ -0,0 +1,119 @@
+.class public final Ll0/a/y0;
+.super Ll0/a/b1;
+.source "JobSupport.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ll0/a/b1<",
+        "Lkotlinx/coroutines/Job;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final h:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlinx/coroutines/Job;Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlinx/coroutines/Job;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "job"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "handler"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ll0/a/b1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    iput-object p2, p0, Ll0/a/y0;->h:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public i(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ll0/a/y0;->h:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    iget-object v0, p0, Ll0/a/y0;->h:Lkotlin/jvm/functions/Function1;
+
+    invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "InvokeOnCompletion["
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-static {p0}, Lf/n/a/k/a;->w(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-static {p0}, Lf/n/a/k/a;->z(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/z.smali b/com.discord/smali_classes2/l0/a/z.smali
new file mode 100644
index 0000000000..55b2dc192a
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/z.smali
@@ -0,0 +1,128 @@
+.class public final enum Ll0/a/z;
+.super Ljava/lang/Enum;
+.source "CoroutineStart.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ll0/a/z;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ll0/a/z;
+
+.field public static final enum e:Ll0/a/z;
+
+.field public static final enum f:Ll0/a/z;
+
+.field public static final enum g:Ll0/a/z;
+
+.field public static final synthetic h:[Ll0/a/z;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Ll0/a/z;
+
+    new-instance v1, Ll0/a/z;
+
+    const-string v2, "DEFAULT"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Ll0/a/z;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/z;->d:Ll0/a/z;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/z;
+
+    const-string v2, "LAZY"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Ll0/a/z;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/z;->e:Ll0/a/z;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/z;
+
+    const-string v2, "ATOMIC"
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, v2, v3}, Ll0/a/z;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/z;->f:Ll0/a/z;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Ll0/a/z;
+
+    const-string v2, "UNDISPATCHED"
+
+    const/4 v3, 0x3
+
+    invoke-direct {v1, v2, v3}, Ll0/a/z;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Ll0/a/z;->g:Ll0/a/z;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Ll0/a/z;->h:[Ll0/a/z;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ll0/a/z;
+    .locals 1
+
+    const-class v0, Ll0/a/z;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ll0/a/z;
+
+    return-object p0
+.end method
+
+.method public static values()[Ll0/a/z;
+    .locals 1
+
+    sget-object v0, Ll0/a/z;->h:[Ll0/a/z;
+
+    invoke-virtual {v0}, [Ll0/a/z;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ll0/a/z;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/l0/a/z0.smali b/com.discord/smali_classes2/l0/a/z0.smali
new file mode 100644
index 0000000000..36860174f3
--- /dev/null
+++ b/com.discord/smali_classes2/l0/a/z0.smali
@@ -0,0 +1,34 @@
+.class public abstract Ll0/a/z0;
+.super Ll0/a/b1;
+.source "JobSupport.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<J::",
+        "Lkotlinx/coroutines/Job;",
+        ">",
+        "Ll0/a/b1<",
+        "TJ;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlinx/coroutines/Job;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TJ;)V"
+        }
+    .end annotation
+
+    const-string v0, "job"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ll0/a/b1;-><init>(Lkotlinx/coroutines/Job;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/l0/b.smali b/com.discord/smali_classes2/l0/b.smali
deleted file mode 100644
index 1856f65293..0000000000
--- a/com.discord/smali_classes2/l0/b.smali
+++ /dev/null
@@ -1,84 +0,0 @@
-.class public final Ll0/b;
-.super Lj0/n/c/i;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "TT;",
-        "Lkotlin/reflect/KProperty<",
-        "*>;TV;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $finder:Lkotlin/jvm/functions/Function2;
-
-.field public final synthetic $id:I
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function2;I)V
-    .locals 0
-
-    iput-object p1, p0, Ll0/b;->$finder:Lkotlin/jvm/functions/Function2;
-
-    iput p2, p0, Ll0/b;->$id:I
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p2, Lkotlin/reflect/KProperty;
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_1
-
-    iget-object v1, p0, Ll0/b;->$finder:Lkotlin/jvm/functions/Function2;
-
-    iget v2, p0, Ll0/b;->$id:I
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-interface {v1, p1, v2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/view/View;
-
-    if-eqz p1, :cond_0
-
-    return-object p1
-
-    :cond_0
-    iget p1, p0, Ll0/b;->$id:I
-
-    invoke-static {p1, p2}, Lf/n/a/k/a;->b(ILkotlin/reflect/KProperty;)Ljava/lang/Void;
-
-    throw v0
-
-    :cond_1
-    const-string p1, "desc"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/l0/c.smali b/com.discord/smali_classes2/l0/c.smali
deleted file mode 100644
index d5ca5d1a76..0000000000
--- a/com.discord/smali_classes2/l0/c.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.class public final Ll0/c;
-.super Lj0/n/c/i;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "TT;",
-        "Lkotlin/reflect/KProperty<",
-        "*>;",
-        "Ljava/util/List<",
-        "+TV;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $finder:Lkotlin/jvm/functions/Function2;
-
-.field public final synthetic $ids:[I
-
-
-# direct methods
-.method public constructor <init>([ILkotlin/jvm/functions/Function2;)V
-    .locals 0
-
-    iput-object p1, p0, Ll0/c;->$ids:[I
-
-    iput-object p2, p0, Ll0/c;->$finder:Lkotlin/jvm/functions/Function2;
-
-    const/4 p1, 0x2
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 8
-
-    check-cast p2, Lkotlin/reflect/KProperty;
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_2
-
-    iget-object v1, p0, Ll0/c;->$ids:[I
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    array-length v3, v1
-
-    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
-
-    array-length v3, v1
-
-    const/4 v4, 0x0
-
-    :goto_0
-    if-ge v4, v3, :cond_1
-
-    aget v5, v1, v4
-
-    iget-object v6, p0, Ll0/c;->$finder:Lkotlin/jvm/functions/Function2;
-
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v7
-
-    invoke-interface {v6, p1, v7}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Landroid/view/View;
-
-    if-eqz v6, :cond_0
-
-    invoke-virtual {v2, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {v5, p2}, Lf/n/a/k/a;->b(ILkotlin/reflect/KProperty;)Ljava/lang/Void;
-
-    throw v0
-
-    :cond_1
-    return-object v2
-
-    :cond_2
-    const-string p1, "desc"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/l0/d.smali b/com.discord/smali_classes2/l0/d.smali
deleted file mode 100644
index 9f9ae6c4d0..0000000000
--- a/com.discord/smali_classes2/l0/d.smali
+++ /dev/null
@@ -1,78 +0,0 @@
-.class public final Ll0/d;
-.super Lj0/n/c/i;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Landroid/view/View;",
-        "Ljava/lang/Integer;",
-        "Landroid/view/View;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ll0/d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ll0/d;
-
-    invoke-direct {v0}, Ll0/d;-><init>()V
-
-    sput-object v0, Ll0/d;->d:Ll0/d;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Landroid/view/View;
-
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
-
-    move-result p2
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/l0/e.smali b/com.discord/smali_classes2/l0/e.smali
deleted file mode 100644
index 4416175537..0000000000
--- a/com.discord/smali_classes2/l0/e.smali
+++ /dev/null
@@ -1,103 +0,0 @@
-.class public final Ll0/e;
-.super Lj0/n/c/i;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Landroidx/fragment/app/DialogFragment;",
-        "Ljava/lang/Integer;",
-        "Landroid/view/View;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ll0/e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ll0/e;
-
-    invoke-direct {v0}, Ll0/e;-><init>()V
-
-    sput-object v0, Ll0/e;->d:Ll0/e;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Landroidx/fragment/app/DialogFragment;
-
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
-
-    move-result p2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p1}, Landroidx/fragment/app/DialogFragment;->getDialog()Landroid/app/Dialog;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1, p2}, Landroid/app/Dialog;->findViewById(I)Landroid/view/View;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    :cond_1
-    :goto_0
-    return-object v0
-
-    :cond_2
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/l0/f.smali b/com.discord/smali_classes2/l0/f.smali
deleted file mode 100644
index 1cdcd2032d..0000000000
--- a/com.discord/smali_classes2/l0/f.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public final Ll0/f;
-.super Lj0/n/c/i;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Landroidx/fragment/app/Fragment;",
-        "Ljava/lang/Integer;",
-        "Landroid/view/View;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ll0/f;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ll0/f;
-
-    invoke-direct {v0}, Ll0/f;-><init>()V
-
-    sput-object v0, Ll0/f;->d:Ll0/f;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Landroidx/fragment/app/Fragment;
-
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
-
-    move-result p2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    :cond_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/l0/g.smali b/com.discord/smali_classes2/l0/g.smali
deleted file mode 100644
index d532abacd9..0000000000
--- a/com.discord/smali_classes2/l0/g.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public final Ll0/g;
-.super Lj0/n/c/i;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Landroidx/recyclerview/widget/RecyclerView$ViewHolder;",
-        "Ljava/lang/Integer;",
-        "Landroid/view/View;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ll0/g;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ll0/g;
-
-    invoke-direct {v0}, Ll0/g;-><init>()V
-
-    sput-object v0, Ll0/g;->d:Ll0/g;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    invoke-direct {p0, v0}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-
-    check-cast p2, Ljava/lang/Number;
-
-    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
-
-    move-result p2
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/l0/h$a.smali b/com.discord/smali_classes2/l0/h$a.smali
deleted file mode 100644
index 70d4b4e54b..0000000000
--- a/com.discord/smali_classes2/l0/h$a.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final Ll0/h$a;
-.super Ljava/lang/Object;
-.source "Kotterknife.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ll0/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Ll0/h$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ll0/h$a;
-
-    invoke-direct {v0}, Ll0/h$a;-><init>()V
-
-    sput-object v0, Ll0/h$a;->a:Ll0/h$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/l0/h.smali b/com.discord/smali_classes2/l0/h.smali
deleted file mode 100644
index d69af06161..0000000000
--- a/com.discord/smali_classes2/l0/h.smali
+++ /dev/null
@@ -1,139 +0,0 @@
-.class public final Ll0/h;
-.super Ljava/lang/Object;
-.source "Kotterknife.kt"
-
-# interfaces
-.implements Lkotlin/properties/ReadOnlyProperty;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ll0/h$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "V:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lkotlin/properties/ReadOnlyProperty<",
-        "TT;TV;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Ljava/lang/Object;
-
-.field public final b:Lkotlin/jvm/functions/Function2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function2<",
-            "TT;",
-            "Lkotlin/reflect/KProperty<",
-            "*>;TV;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/functions/Function2;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function2<",
-            "-TT;-",
-            "Lkotlin/reflect/KProperty<",
-            "*>;+TV;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ll0/h;->b:Lkotlin/jvm/functions/Function2;
-
-    sget-object p1, Ll0/h$a;->a:Ll0/h$a;
-
-    iput-object p1, p0, Ll0/h;->a:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;",
-            "Lkotlin/reflect/KProperty<",
-            "*>;)TV;"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_2
-
-    iget-object v0, p0, Ll0/h;->a:Ljava/lang/Object;
-
-    sget-object v1, Ll0/h$a;->a:Ll0/h$a;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Ll0/h;->b:Lkotlin/jvm/functions/Function2;
-
-    invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    iput-object p2, p0, Ll0/h;->a:Ljava/lang/Object;
-
-    sget-object p2, Ll0/i;->b:Ll0/i;
-
-    sget-object p2, Ll0/i;->a:Ljava/util/WeakHashMap;
-
-    invoke-interface {p2, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Ljava/util/WeakHashMap;
-
-    invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
-
-    invoke-static {v0}, Ljava/util/Collections;->newSetFromMap(Ljava/util/Map;)Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_0
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0, p0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    :cond_1
-    iget-object p1, p0, Ll0/h;->a:Ljava/lang/Object;
-
-    return-object p1
-
-    :cond_2
-    const-string p1, "property"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/l0/i.smali b/com.discord/smali_classes2/l0/i.smali
deleted file mode 100644
index 1ea10a653a..0000000000
--- a/com.discord/smali_classes2/l0/i.smali
+++ /dev/null
@@ -1,33 +0,0 @@
-.class public final Ll0/i;
-.super Ljava/lang/Object;
-.source "Kotterknife.kt"
-
-
-# static fields
-.field public static final a:Ljava/util/WeakHashMap;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/WeakHashMap<",
-            "Ljava/lang/Object;",
-            "Ljava/util/Collection<",
-            "Ll0/h<",
-            "**>;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public static final b:Ll0/i;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/util/WeakHashMap;
-
-    invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
-
-    sput-object v0, Ll0/i;->a:Ljava/util/WeakHashMap;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a.smali b/com.discord/smali_classes2/m0/a.smali
new file mode 100644
index 0000000000..158d081dc1
--- /dev/null
+++ b/com.discord/smali_classes2/m0/a.smali
@@ -0,0 +1,68 @@
+.class public final Lm0/a;
+.super Lk0/o/c/j;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "TT;",
+        "Lkotlin/reflect/KProperty<",
+        "*>;TV;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $finder:Lkotlin/jvm/functions/Function2;
+
+.field public final synthetic $id:I
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function2;I)V
+    .locals 0
+
+    iput-object p1, p0, Lm0/a;->$finder:Lkotlin/jvm/functions/Function2;
+
+    iput p2, p0, Lm0/a;->$id:I
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p2, Lkotlin/reflect/KProperty;
+
+    const-string v0, "desc"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p2, p0, Lm0/a;->$finder:Lkotlin/jvm/functions/Function2;
+
+    iget v0, p0, Lm0/a;->$id:I
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-interface {p2, p1, v0}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/view/View;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/a.smali b/com.discord/smali_classes2/m0/a/a/a/a.smali
deleted file mode 100644
index 0223d453e5..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/a.smali
+++ /dev/null
@@ -1,868 +0,0 @@
-.class public abstract Lm0/a/a/a/a;
-.super Landroid/widget/FrameLayout;
-.source "BarcodeScannerView.java"
-
-# interfaces
-.implements Landroid/hardware/Camera$PreviewCallback;
-
-
-# instance fields
-.field public d:Lm0/a/a/a/e;
-
-.field public e:Lm0/a/a/a/d;
-
-.field public f:Lm0/a/a/a/f;
-
-.field public g:Landroid/graphics/Rect;
-
-.field public h:Lm0/a/a/a/c;
-
-.field public i:Ljava/lang/Boolean;
-
-.field public j:Z
-
-.field public k:Z
-
-.field public l:Z
-
-.field public m:I
-    .annotation build Landroidx/annotation/ColorInt;
-    .end annotation
-.end field
-
-.field public n:I
-    .annotation build Landroidx/annotation/ColorInt;
-    .end annotation
-.end field
-
-.field public o:I
-
-.field public p:I
-
-.field public q:I
-
-.field public r:Z
-
-.field public s:I
-
-.field public t:Z
-
-.field public u:F
-
-.field public v:I
-
-.field public w:F
-
-
-# direct methods
-.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-    .locals 3
-
-    invoke-direct {p0, p1, p2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lm0/a/a/a/a;->j:Z
-
-    iput-boolean v0, p0, Lm0/a/a/a/a;->k:Z
-
-    iput-boolean v0, p0, Lm0/a/a/a/a;->l:Z
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    sget v2, Lme/dm7/barcodescanner/core/R$a;->viewfinder_laser:I
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
-
-    move-result v1
-
-    iput v1, p0, Lm0/a/a/a/a;->m:I
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    sget v2, Lme/dm7/barcodescanner/core/R$a;->viewfinder_border:I
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
-
-    move-result v1
-
-    iput v1, p0, Lm0/a/a/a/a;->n:I
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    sget v2, Lme/dm7/barcodescanner/core/R$a;->viewfinder_mask:I
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
-
-    move-result v1
-
-    iput v1, p0, Lm0/a/a/a/a;->o:I
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    sget v2, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_width:I
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getInteger(I)I
-
-    move-result v1
-
-    iput v1, p0, Lm0/a/a/a/a;->p:I
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v1
-
-    sget v2, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_length:I
-
-    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getInteger(I)I
-
-    move-result v1
-
-    iput v1, p0, Lm0/a/a/a/a;->q:I
-
-    const/4 v1, 0x0
-
-    iput-boolean v1, p0, Lm0/a/a/a/a;->r:Z
-
-    iput v1, p0, Lm0/a/a/a/a;->s:I
-
-    iput-boolean v1, p0, Lm0/a/a/a/a;->t:Z
-
-    const/high16 v2, 0x3f800000    # 1.0f
-
-    iput v2, p0, Lm0/a/a/a/a;->u:F
-
-    iput v1, p0, Lm0/a/a/a/a;->v:I
-
-    const v2, 0x3dcccccd    # 0.1f
-
-    iput v2, p0, Lm0/a/a/a/a;->w:F
-
-    invoke-virtual {p1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
-
-    move-result-object p1
-
-    sget-object v2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView:[I
-
-    invoke-virtual {p1, p2, v2, v1, v1}, Landroid/content/res/Resources$Theme;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
-
-    move-result-object p1
-
-    :try_start_0
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_shouldScaleToFill:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result p2
-
-    invoke-virtual {p0, p2}, Lm0/a/a/a/a;->setShouldScaleToFill(Z)V
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_laserEnabled:I
-
-    iget-boolean v0, p0, Lm0/a/a/a/a;->l:Z
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result p2
-
-    iput-boolean p2, p0, Lm0/a/a/a/a;->l:Z
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_laserColor:I
-
-    iget v0, p0, Lm0/a/a/a/a;->m:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->m:I
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderColor:I
-
-    iget v0, p0, Lm0/a/a/a/a;->n:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->n:I
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_maskColor:I
-
-    iget v0, p0, Lm0/a/a/a/a;->o:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->o:I
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderWidth:I
-
-    iget v0, p0, Lm0/a/a/a/a;->p:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->p:I
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderLength:I
-
-    iget v0, p0, Lm0/a/a/a/a;->q:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->q:I
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_roundedCorner:I
-
-    iget-boolean v0, p0, Lm0/a/a/a/a;->r:Z
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result p2
-
-    iput-boolean p2, p0, Lm0/a/a/a/a;->r:Z
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_cornerRadius:I
-
-    iget v0, p0, Lm0/a/a/a/a;->s:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->s:I
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_squaredFinder:I
-
-    iget-boolean v0, p0, Lm0/a/a/a/a;->t:Z
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
-
-    move-result p2
-
-    iput-boolean p2, p0, Lm0/a/a/a/a;->t:Z
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderAlpha:I
-
-    iget v0, p0, Lm0/a/a/a/a;->u:F
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getFloat(IF)F
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->u:F
-
-    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_finderOffset:I
-
-    iget v0, p0, Lm0/a/a/a/a;->v:I
-
-    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
-
-    move-result p2
-
-    iput p2, p0, Lm0/a/a/a/a;->v:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    new-instance p2, Lm0/a/a/a/g;
-
-    invoke-direct {p2, p1}, Lm0/a/a/a/g;-><init>(Landroid/content/Context;)V
-
-    iget p1, p0, Lm0/a/a/a/a;->n:I
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setBorderColor(I)V
-
-    iget p1, p0, Lm0/a/a/a/a;->m:I
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setLaserColor(I)V
-
-    iget-boolean p1, p0, Lm0/a/a/a/a;->l:Z
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setLaserEnabled(Z)V
-
-    iget p1, p0, Lm0/a/a/a/a;->p:I
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setBorderStrokeWidth(I)V
-
-    iget p1, p0, Lm0/a/a/a/a;->q:I
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setBorderLineLength(I)V
-
-    iget p1, p0, Lm0/a/a/a/a;->o:I
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setMaskColor(I)V
-
-    iget-boolean p1, p0, Lm0/a/a/a/a;->r:Z
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setBorderCornerRounded(Z)V
-
-    iget p1, p0, Lm0/a/a/a/a;->s:I
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setBorderCornerRadius(I)V
-
-    iget-boolean p1, p0, Lm0/a/a/a/a;->t:Z
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setSquareViewFinder(Z)V
-
-    iget p1, p0, Lm0/a/a/a/a;->v:I
-
-    invoke-virtual {p2, p1}, Lm0/a/a/a/g;->setViewFinderOffset(I)V
-
-    iput-object p2, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    return-void
-
-    :catchall_0
-    move-exception p2
-
-    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
-
-    throw p2
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 2
-
-    iget-object v0, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    invoke-virtual {v0}, Lm0/a/a/a/d;->f()V
-
-    iget-object v0, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    iput-object v1, v0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iput-object v1, v0, Lm0/a/a/a/d;->j:Landroid/hardware/Camera$PreviewCallback;
-
-    iget-object v0, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v0}, Landroid/hardware/Camera;->release()V
-
-    iput-object v1, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    :cond_0
-    iget-object v0, p0, Lm0/a/a/a/a;->h:Lm0/a/a/a/c;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Landroid/os/HandlerThread;->quit()Z
-
-    iput-object v1, p0, Lm0/a/a/a/a;->h:Lm0/a/a/a/c;
-
-    :cond_1
-    return-void
-.end method
-
-.method public getFlash()Z
-    .locals 3
-
-    iget-object v0, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-static {v0}, Lf/n/a/k/a;->K(Landroid/hardware/Camera;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v0}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Landroid/hardware/Camera$Parameters;->getFlashMode()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v2, "torch"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    return v1
-.end method
-
-.method public getRotationCount()I
-    .locals 1
-
-    iget-object v0, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    invoke-virtual {v0}, Lm0/a/a/a/d;->getDisplayOrientation()I
-
-    move-result v0
-
-    div-int/lit8 v0, v0, 0x5a
-
-    return v0
-.end method
-
-.method public setAspectTolerance(F)V
-    .locals 0
-
-    iput p1, p0, Lm0/a/a/a/a;->w:F
-
-    return-void
-.end method
-
-.method public setAutoFocus(Z)V
-    .locals 1
-
-    iput-boolean p1, p0, Lm0/a/a/a/a;->j:Z
-
-    iget-object v0, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0, p1}, Lm0/a/a/a/d;->setAutoFocus(Z)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public setBorderAlpha(F)V
-    .locals 1
-
-    iput p1, p0, Lm0/a/a/a/a;->u:F
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setBorderAlpha(F)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setBorderColor(I)V
-    .locals 1
-
-    iput p1, p0, Lm0/a/a/a/a;->n:I
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setBorderColor(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setBorderCornerRadius(I)V
-    .locals 1
-
-    iput p1, p0, Lm0/a/a/a/a;->s:I
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setBorderCornerRadius(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setBorderLineLength(I)V
-    .locals 1
-
-    iput p1, p0, Lm0/a/a/a/a;->q:I
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setBorderLineLength(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setBorderStrokeWidth(I)V
-    .locals 1
-
-    iput p1, p0, Lm0/a/a/a/a;->p:I
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setBorderStrokeWidth(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setFlash(Z)V
-    .locals 2
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lm0/a/a/a/a;->i:Ljava/lang/Boolean;
-
-    iget-object v0, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-static {v0}, Lf/n/a/k/a;->K(Landroid/hardware/Camera;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v0}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
-
-    move-result-object v0
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {v0}, Landroid/hardware/Camera$Parameters;->getFlashMode()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v1, "torch"
-
-    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {v0, v1}, Landroid/hardware/Camera$Parameters;->setFlashMode(Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {v0}, Landroid/hardware/Camera$Parameters;->getFlashMode()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v1, "off"
-
-    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-virtual {v0, v1}, Landroid/hardware/Camera$Parameters;->setFlashMode(Ljava/lang/String;)V
-
-    :goto_0
-    iget-object p1, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    iget-object p1, p1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {p1, v0}, Landroid/hardware/Camera;->setParameters(Landroid/hardware/Camera$Parameters;)V
-
-    :cond_3
-    return-void
-.end method
-
-.method public setIsBorderCornerRounded(Z)V
-    .locals 1
-
-    iput-boolean p1, p0, Lm0/a/a/a/a;->r:Z
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setBorderCornerRounded(Z)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setLaserColor(I)V
-    .locals 1
-
-    iput p1, p0, Lm0/a/a/a/a;->m:I
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setLaserColor(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setLaserEnabled(Z)V
-    .locals 1
-
-    iput-boolean p1, p0, Lm0/a/a/a/a;->l:Z
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setLaserEnabled(Z)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setMaskColor(I)V
-    .locals 1
-
-    iput p1, p0, Lm0/a/a/a/a;->o:I
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setMaskColor(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setShouldScaleToFill(Z)V
-    .locals 0
-
-    iput-boolean p1, p0, Lm0/a/a/a/a;->k:Z
-
-    return-void
-.end method
-
-.method public setSquareViewFinder(Z)V
-    .locals 1
-
-    iput-boolean p1, p0, Lm0/a/a/a/a;->t:Z
-
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    invoke-interface {v0, p1}, Lm0/a/a/a/f;->setSquareViewFinder(Z)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    return-void
-.end method
-
-.method public setupCameraPreview(Lm0/a/a/a/e;)V
-    .locals 0
-
-    iput-object p1, p0, Lm0/a/a/a/a;->d:Lm0/a/a/a/e;
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p0, p1}, Lm0/a/a/a/a;->setupLayout(Lm0/a/a/a/e;)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    check-cast p1, Lm0/a/a/a/g;
-
-    invoke-virtual {p1}, Lm0/a/a/a/g;->a()V
-
-    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->i:Ljava/lang/Boolean;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    invoke-virtual {p0, p1}, Lm0/a/a/a/a;->setFlash(Z)V
-
-    :cond_0
-    iget-boolean p1, p0, Lm0/a/a/a/a;->j:Z
-
-    invoke-virtual {p0, p1}, Lm0/a/a/a/a;->setAutoFocus(Z)V
-
-    :cond_1
-    return-void
-.end method
-
-.method public final setupLayout(Lm0/a/a/a/e;)V
-    .locals 2
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->removeAllViews()V
-
-    new-instance v0, Lm0/a/a/a/d;
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1, p1, p0}, Lm0/a/a/a/d;-><init>(Landroid/content/Context;Lm0/a/a/a/e;Landroid/hardware/Camera$PreviewCallback;)V
-
-    iput-object v0, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    iget p1, p0, Lm0/a/a/a/a;->w:F
-
-    invoke-virtual {v0, p1}, Lm0/a/a/a/d;->setAspectTolerance(F)V
-
-    iget-object p1, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    iget-boolean v0, p0, Lm0/a/a/a/a;->k:Z
-
-    invoke-virtual {p1, v0}, Lm0/a/a/a/d;->setShouldScaleToFill(Z)V
-
-    iget-boolean p1, p0, Lm0/a/a/a/a;->k:Z
-
-    if-nez p1, :cond_0
-
-    new-instance p1, Landroid/widget/RelativeLayout;
-
-    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
-
-    const/16 v0, 0x11
-
-    invoke-virtual {p1, v0}, Landroid/widget/RelativeLayout;->setGravity(I)V
-
-    const/high16 v0, -0x1000000
-
-    invoke-virtual {p1, v0}, Landroid/widget/RelativeLayout;->setBackgroundColor(I)V
-
-    iget-object v0, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    invoke-virtual {p1, v0}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
-
-    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
-
-    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
-
-    :goto_0
-    iget-object p1, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
-
-    instance-of v0, p1, Landroid/view/View;
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Landroid/view/View;
-
-    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
-
-    return-void
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "IViewFinder object returned by \'createViewFinderView()\' should be instance of android.view.View"
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/b$a.smali b/com.discord/smali_classes2/m0/a/a/a/b$a.smali
deleted file mode 100644
index cabd924778..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/b$a.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public Lm0/a/a/a/b$a;
-.super Ljava/lang/Object;
-.source "CameraHandlerThread.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lm0/a/a/a/b;->run()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Landroid/hardware/Camera;
-
-.field public final synthetic e:Lm0/a/a/a/b;
-
-
-# direct methods
-.method public constructor <init>(Lm0/a/a/a/b;Landroid/hardware/Camera;)V
-    .locals 0
-
-    iput-object p1, p0, Lm0/a/a/a/b$a;->e:Lm0/a/a/a/b;
-
-    iput-object p2, p0, Lm0/a/a/a/b$a;->d:Landroid/hardware/Camera;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 4
-
-    iget-object v0, p0, Lm0/a/a/a/b$a;->e:Lm0/a/a/a/b;
-
-    iget-object v1, v0, Lm0/a/a/a/b;->e:Lm0/a/a/a/c;
-
-    iget-object v1, v1, Lm0/a/a/a/c;->d:Lm0/a/a/a/a;
-
-    iget-object v2, p0, Lm0/a/a/a/b$a;->d:Landroid/hardware/Camera;
-
-    iget v0, v0, Lm0/a/a/a/b;->d:I
-
-    if-nez v2, :cond_0
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v3, Lm0/a/a/a/e;
-
-    invoke-direct {v3, v2, v0}, Lm0/a/a/a/e;-><init>(Landroid/hardware/Camera;I)V
-
-    move-object v0, v3
-
-    :goto_0
-    invoke-virtual {v1, v0}, Lm0/a/a/a/a;->setupCameraPreview(Lm0/a/a/a/e;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/b.smali b/com.discord/smali_classes2/m0/a/a/a/b.smali
deleted file mode 100644
index 729402e09d..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/b.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class public Lm0/a/a/a/b;
-.super Ljava/lang/Object;
-.source "CameraHandlerThread.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:I
-
-.field public final synthetic e:Lm0/a/a/a/c;
-
-
-# direct methods
-.method public constructor <init>(Lm0/a/a/a/c;I)V
-    .locals 0
-
-    iput-object p1, p0, Lm0/a/a/a/b;->e:Lm0/a/a/a/c;
-
-    iput p2, p0, Lm0/a/a/a/b;->d:I
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 3
-
-    iget v0, p0, Lm0/a/a/a/b;->d:I
-
-    const/4 v1, -0x1
-
-    if-ne v0, v1, :cond_0
-
-    :try_start_0
-    invoke-static {}, Landroid/hardware/Camera;->open()Landroid/hardware/Camera;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {v0}, Landroid/hardware/Camera;->open(I)Landroid/hardware/Camera;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    const/4 v0, 0x0
-
-    :goto_0
-    new-instance v1, Landroid/os/Handler;
-
-    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
-
-    new-instance v2, Lm0/a/a/a/b$a;
-
-    invoke-direct {v2, p0, v0}, Lm0/a/a/a/b$a;-><init>(Lm0/a/a/a/b;Landroid/hardware/Camera;)V
-
-    invoke-virtual {v1, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/c.smali b/com.discord/smali_classes2/m0/a/a/a/c.smali
deleted file mode 100644
index 91d2a019a2..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/c.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-.class public Lm0/a/a/a/c;
-.super Landroid/os/HandlerThread;
-.source "CameraHandlerThread.java"
-
-
-# instance fields
-.field public d:Lm0/a/a/a/a;
-
-
-# direct methods
-.method public constructor <init>(Lm0/a/a/a/a;)V
-    .locals 1
-
-    const-string v0, "CameraHandlerThread"
-
-    invoke-direct {p0, v0}, Landroid/os/HandlerThread;-><init>(Ljava/lang/String;)V
-
-    iput-object p1, p0, Lm0/a/a/a/c;->d:Lm0/a/a/a/a;
-
-    invoke-virtual {p0}, Landroid/os/HandlerThread;->start()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/d$a.smali b/com.discord/smali_classes2/m0/a/a/a/d$a.smali
deleted file mode 100644
index f161d1d064..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/d$a.smali
+++ /dev/null
@@ -1,62 +0,0 @@
-.class public Lm0/a/a/a/d$a;
-.super Ljava/lang/Object;
-.source "CameraPreview.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lm0/a/a/a/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lm0/a/a/a/d;
-
-
-# direct methods
-.method public constructor <init>(Lm0/a/a/a/d;)V
-    .locals 0
-
-    iput-object p1, p0, Lm0/a/a/a/d$a;->d:Lm0/a/a/a/d;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 2
-
-    iget-object v0, p0, Lm0/a/a/a/d$a;->d:Lm0/a/a/a/d;
-
-    iget-object v1, v0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    if-eqz v1, :cond_0
-
-    iget-boolean v1, v0, Lm0/a/a/a/d;->f:Z
-
-    if-eqz v1, :cond_0
-
-    iget-boolean v1, v0, Lm0/a/a/a/d;->g:Z
-
-    if-eqz v1, :cond_0
-
-    iget-boolean v1, v0, Lm0/a/a/a/d;->h:Z
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v0}, Lm0/a/a/a/d;->b()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/d$b.smali b/com.discord/smali_classes2/m0/a/a/a/d$b.smali
deleted file mode 100644
index 307f2f127f..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/d$b.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.class public Lm0/a/a/a/d$b;
-.super Ljava/lang/Object;
-.source "CameraPreview.java"
-
-# interfaces
-.implements Landroid/hardware/Camera$AutoFocusCallback;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lm0/a/a/a/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lm0/a/a/a/d;
-
-
-# direct methods
-.method public constructor <init>(Lm0/a/a/a/d;)V
-    .locals 0
-
-    iput-object p1, p0, Lm0/a/a/a/d$b;->a:Lm0/a/a/a/d;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onAutoFocus(ZLandroid/hardware/Camera;)V
-    .locals 0
-
-    iget-object p1, p0, Lm0/a/a/a/d$b;->a:Lm0/a/a/a/d;
-
-    invoke-static {p1}, Lm0/a/a/a/d;->a(Lm0/a/a/a/d;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/d.smali b/com.discord/smali_classes2/m0/a/a/a/d.smali
deleted file mode 100644
index ae66a0107a..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/d.smali
+++ /dev/null
@@ -1,893 +0,0 @@
-.class public Lm0/a/a/a/d;
-.super Landroid/view/SurfaceView;
-.source "CameraPreview.java"
-
-# interfaces
-.implements Landroid/view/SurfaceHolder$Callback;
-
-
-# instance fields
-.field public d:Lm0/a/a/a/e;
-
-.field public e:Landroid/os/Handler;
-
-.field public f:Z
-
-.field public g:Z
-
-.field public h:Z
-
-.field public i:Z
-
-.field public j:Landroid/hardware/Camera$PreviewCallback;
-
-.field public k:F
-
-.field public l:Ljava/lang/Runnable;
-
-.field public m:Landroid/hardware/Camera$AutoFocusCallback;
-
-
-# direct methods
-.method public constructor <init>(Landroid/content/Context;Lm0/a/a/a/e;Landroid/hardware/Camera$PreviewCallback;)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Landroid/view/SurfaceView;-><init>(Landroid/content/Context;)V
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lm0/a/a/a/d;->f:Z
-
-    iput-boolean p1, p0, Lm0/a/a/a/d;->g:Z
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lm0/a/a/a/d;->h:Z
-
-    iput-boolean p1, p0, Lm0/a/a/a/d;->i:Z
-
-    const p1, 0x3dcccccd    # 0.1f
-
-    iput p1, p0, Lm0/a/a/a/d;->k:F
-
-    new-instance p1, Lm0/a/a/a/d$a;
-
-    invoke-direct {p1, p0}, Lm0/a/a/a/d$a;-><init>(Lm0/a/a/a/d;)V
-
-    iput-object p1, p0, Lm0/a/a/a/d;->l:Ljava/lang/Runnable;
-
-    new-instance p1, Lm0/a/a/a/d$b;
-
-    invoke-direct {p1, p0}, Lm0/a/a/a/d$b;-><init>(Lm0/a/a/a/d;)V
-
-    iput-object p1, p0, Lm0/a/a/a/d;->m:Landroid/hardware/Camera$AutoFocusCallback;
-
-    iput-object p2, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iput-object p3, p0, Lm0/a/a/a/d;->j:Landroid/hardware/Camera$PreviewCallback;
-
-    new-instance p1, Landroid/os/Handler;
-
-    invoke-direct {p1}, Landroid/os/Handler;-><init>()V
-
-    iput-object p1, p0, Lm0/a/a/a/d;->e:Landroid/os/Handler;
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
-
-    move-result-object p1
-
-    invoke-interface {p1, p0}, Landroid/view/SurfaceHolder;->addCallback(Landroid/view/SurfaceHolder$Callback;)V
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
-
-    move-result-object p1
-
-    const/4 p2, 0x3
-
-    invoke-interface {p1, p2}, Landroid/view/SurfaceHolder;->setType(I)V
-
-    return-void
-.end method
-
-.method public static synthetic a(Lm0/a/a/a/d;)V
-    .locals 0
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->c()V
-
-    return-void
-.end method
-
-.method private getOptimalPreviewSize()Landroid/hardware/Camera$Size;
-    .locals 18
-
-    move-object/from16 v0, p0
-
-    iget-object v1, v0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_0
-
-    return-object v2
-
-    :cond_0
-    iget-object v1, v1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v1}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Landroid/hardware/Camera$Parameters;->getSupportedPreviewSizes()Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-virtual/range {p0 .. p0}, Landroid/view/SurfaceView;->getWidth()I
-
-    move-result v3
-
-    invoke-virtual/range {p0 .. p0}, Landroid/view/SurfaceView;->getHeight()I
-
-    move-result v4
-
-    invoke-virtual/range {p0 .. p0}, Landroid/view/SurfaceView;->getContext()Landroid/content/Context;
-
-    move-result-object v5
-
-    invoke-static {v5}, Lf/n/a/k/a;->E(Landroid/content/Context;)I
-
-    move-result v5
-
-    const/4 v6, 0x1
-
-    if-ne v5, v6, :cond_1
-
-    move/from16 v17, v4
-
-    move v4, v3
-
-    move/from16 v3, v17
-
-    :cond_1
-    int-to-double v5, v3
-
-    int-to-double v7, v4
-
-    div-double/2addr v5, v7
-
-    if-nez v1, :cond_2
-
-    return-object v2
-
-    :cond_2
-    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    const-wide v7, 0x7fefffffffffffffL    # Double.MAX_VALUE
-
-    move-wide v9, v7
-
-    :cond_3
-    :goto_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v11
-
-    if-eqz v11, :cond_5
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v11
-
-    check-cast v11, Landroid/hardware/Camera$Size;
-
-    iget v12, v11, Landroid/hardware/Camera$Size;->width:I
-
-    int-to-double v12, v12
-
-    iget v14, v11, Landroid/hardware/Camera$Size;->height:I
-
-    int-to-double v14, v14
-
-    div-double/2addr v12, v14
-
-    sub-double/2addr v12, v5
-
-    invoke-static {v12, v13}, Ljava/lang/Math;->abs(D)D
-
-    move-result-wide v12
-
-    iget v14, v0, Lm0/a/a/a/d;->k:F
-
-    float-to-double v14, v14
-
-    cmpl-double v16, v12, v14
-
-    if-lez v16, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    iget v12, v11, Landroid/hardware/Camera$Size;->height:I
-
-    sub-int/2addr v12, v4
-
-    invoke-static {v12}, Ljava/lang/Math;->abs(I)I
-
-    move-result v12
-
-    int-to-double v12, v12
-
-    cmpg-double v14, v12, v9
-
-    if-gez v14, :cond_3
-
-    iget v2, v11, Landroid/hardware/Camera$Size;->height:I
-
-    sub-int/2addr v2, v4
-
-    invoke-static {v2}, Ljava/lang/Math;->abs(I)I
-
-    move-result v2
-
-    int-to-double v9, v2
-
-    move-object v2, v11
-
-    goto :goto_0
-
-    :cond_5
-    if-nez v2, :cond_7
-
-    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_6
-    :goto_1
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_7
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/hardware/Camera$Size;
-
-    iget v5, v3, Landroid/hardware/Camera$Size;->height:I
-
-    sub-int/2addr v5, v4
-
-    invoke-static {v5}, Ljava/lang/Math;->abs(I)I
-
-    move-result v5
-
-    int-to-double v5, v5
-
-    cmpg-double v9, v5, v7
-
-    if-gez v9, :cond_6
-
-    iget v2, v3, Landroid/hardware/Camera$Size;->height:I
-
-    sub-int/2addr v2, v4
-
-    invoke-static {v2}, Ljava/lang/Math;->abs(I)I
-
-    move-result v2
-
-    int-to-double v5, v2
-
-    move-object v2, v3
-
-    move-wide v7, v5
-
-    goto :goto_1
-
-    :cond_7
-    return-object v2
-.end method
-
-
-# virtual methods
-.method public b()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    iget-object v1, p0, Lm0/a/a/a/d;->m:Landroid/hardware/Camera$AutoFocusCallback;
-
-    invoke-virtual {v0, v1}, Landroid/hardware/Camera;->autoFocus(Landroid/hardware/Camera$AutoFocusCallback;)V
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    invoke-virtual {p0}, Lm0/a/a/a/d;->c()V
-
-    :goto_0
-    return-void
-.end method
-
-.method public final c()V
-    .locals 4
-
-    iget-object v0, p0, Lm0/a/a/a/d;->e:Landroid/os/Handler;
-
-    iget-object v1, p0, Lm0/a/a/a/d;->l:Ljava/lang/Runnable;
-
-    const-wide/16 v2, 0x3e8
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
-
-    return-void
-.end method
-
-.method public final d(II)V
-    .locals 5
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->getDisplayOrientation()I
-
-    move-result v1
-
-    rem-int/lit16 v1, v1, 0xb4
-
-    if-nez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move v4, p2
-
-    move p2, p1
-
-    move p1, v4
-
-    :goto_0
-    iget-boolean v1, p0, Lm0/a/a/a/d;->i:Z
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getParent()Landroid/view/ViewParent;
-
-    move-result-object v1
-
-    check-cast v1, Landroid/view/View;
-
-    invoke-virtual {v1}, Landroid/view/View;->getWidth()I
-
-    move-result v1
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getParent()Landroid/view/ViewParent;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/view/View;
-
-    invoke-virtual {v2}, Landroid/view/View;->getHeight()I
-
-    move-result v2
-
-    int-to-float v1, v1
-
-    int-to-float p1, p1
-
-    div-float/2addr v1, p1
-
-    int-to-float v2, v2
-
-    int-to-float p2, p2
-
-    div-float/2addr v2, p2
-
-    cmpl-float v3, v1, v2
-
-    if-lez v3, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    move v1, v2
-
-    :goto_1
-    mul-float p1, p1, v1
-
-    invoke-static {p1}, Ljava/lang/Math;->round(F)I
-
-    move-result p1
-
-    mul-float p2, p2, v1
-
-    invoke-static {p2}, Ljava/lang/Math;->round(F)I
-
-    move-result p2
-
-    :cond_2
-    iput p1, v0, Landroid/view/ViewGroup$LayoutParams;->width:I
-
-    iput p2, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
-
-    invoke-virtual {p0, v0}, Landroid/view/SurfaceView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
-
-    return-void
-.end method
-
-.method public e()V
-    .locals 6
-
-    invoke-direct {p0}, Lm0/a/a/a/d;->getOptimalPreviewSize()Landroid/hardware/Camera$Size;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object v1, v1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v1}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
-
-    move-result-object v1
-
-    iget v2, v0, Landroid/hardware/Camera$Size;->width:I
-
-    iget v3, v0, Landroid/hardware/Camera$Size;->height:I
-
-    invoke-virtual {v1, v2, v3}, Landroid/hardware/Camera$Parameters;->setPreviewSize(II)V
-
-    iget-object v2, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object v2, v2, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v2, v1}, Landroid/hardware/Camera;->setParameters(Landroid/hardware/Camera$Parameters;)V
-
-    new-instance v1, Landroid/graphics/Point;
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getWidth()I
-
-    move-result v2
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHeight()I
-
-    move-result v3
-
-    invoke-direct {v1, v2, v3}, Landroid/graphics/Point;-><init>(II)V
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->getDisplayOrientation()I
-
-    move-result v2
-
-    rem-int/lit16 v2, v2, 0xb4
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v2, Landroid/graphics/Point;
-
-    iget v3, v1, Landroid/graphics/Point;->y:I
-
-    iget v1, v1, Landroid/graphics/Point;->x:I
-
-    invoke-direct {v2, v3, v1}, Landroid/graphics/Point;-><init>(II)V
-
-    move-object v1, v2
-
-    :goto_0
-    iget v2, v0, Landroid/hardware/Camera$Size;->width:I
-
-    int-to-float v2, v2
-
-    iget v0, v0, Landroid/hardware/Camera$Size;->height:I
-
-    int-to-float v0, v0
-
-    div-float/2addr v2, v0
-
-    iget v0, v1, Landroid/graphics/Point;->x:I
-
-    int-to-float v3, v0
-
-    iget v1, v1, Landroid/graphics/Point;->y:I
-
-    int-to-float v4, v1
-
-    div-float v5, v3, v4
-
-    cmpl-float v5, v5, v2
-
-    if-lez v5, :cond_1
-
-    mul-float v4, v4, v2
-
-    float-to-int v0, v4
-
-    invoke-virtual {p0, v0, v1}, Lm0/a/a/a/d;->d(II)V
-
-    goto :goto_1
-
-    :cond_1
-    div-float/2addr v3, v2
-
-    float-to-int v1, v3
-
-    invoke-virtual {p0, v0, v1}, Lm0/a/a/a/d;->d(II)V
-
-    :goto_1
-    return-void
-.end method
-
-.method public f()V
-    .locals 3
-
-    iget-object v0, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iput-boolean v0, p0, Lm0/a/a/a/d;->f:Z
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
-
-    move-result-object v0
-
-    invoke-interface {v0, p0}, Landroid/view/SurfaceHolder;->removeCallback(Landroid/view/SurfaceHolder$Callback;)V
-
-    iget-object v0, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v0}, Landroid/hardware/Camera;->cancelAutoFocus()V
-
-    iget-object v0, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Landroid/hardware/Camera;->setOneShotPreviewCallback(Landroid/hardware/Camera$PreviewCallback;)V
-
-    iget-object v0, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object v0, v0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {v0}, Landroid/hardware/Camera;->stopPreview()V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    invoke-virtual {v0}, Ljava/lang/Exception;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v2, "CameraPreview"
-
-    invoke-static {v2, v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public getDisplayOrientation()I
-    .locals 5
-
-    iget-object v0, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    new-instance v0, Landroid/hardware/Camera$CameraInfo;
-
-    invoke-direct {v0}, Landroid/hardware/Camera$CameraInfo;-><init>()V
-
-    iget-object v2, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget v2, v2, Lm0/a/a/a/e;->b:I
-
-    const/4 v3, -0x1
-
-    if-ne v2, v3, :cond_1
-
-    invoke-static {v1, v0}, Landroid/hardware/Camera;->getCameraInfo(ILandroid/hardware/Camera$CameraInfo;)V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {v2, v0}, Landroid/hardware/Camera;->getCameraInfo(ILandroid/hardware/Camera$CameraInfo;)V
-
-    :goto_0
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    const-string v3, "window"
-
-    invoke-virtual {v2, v3}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/view/WindowManager;
-
-    invoke-interface {v2}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Landroid/view/Display;->getRotation()I
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    if-eqz v2, :cond_5
-
-    if-eq v2, v3, :cond_4
-
-    const/4 v4, 0x2
-
-    if-eq v2, v4, :cond_3
-
-    const/4 v4, 0x3
-
-    if-eq v2, v4, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v1, 0x10e
-
-    goto :goto_1
-
-    :cond_3
-    const/16 v1, 0xb4
-
-    goto :goto_1
-
-    :cond_4
-    const/16 v1, 0x5a
-
-    :cond_5
-    :goto_1
-    iget v2, v0, Landroid/hardware/Camera$CameraInfo;->facing:I
-
-    if-ne v2, v3, :cond_6
-
-    iget v0, v0, Landroid/hardware/Camera$CameraInfo;->orientation:I
-
-    add-int/2addr v0, v1
-
-    rem-int/lit16 v0, v0, 0x168
-
-    rsub-int v0, v0, 0x168
-
-    rem-int/lit16 v0, v0, 0x168
-
-    goto :goto_2
-
-    :cond_6
-    iget v0, v0, Landroid/hardware/Camera$CameraInfo;->orientation:I
-
-    sub-int/2addr v0, v1
-
-    add-int/lit16 v0, v0, 0x168
-
-    rem-int/lit16 v0, v0, 0x168
-
-    :goto_2
-    return v0
-.end method
-
-.method public setAspectTolerance(F)V
-    .locals 0
-
-    iput p1, p0, Lm0/a/a/a/d;->k:F
-
-    return-void
-.end method
-
-.method public setAutoFocus(Z)V
-    .locals 1
-
-    iget-object v0, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    if-eqz v0, :cond_3
-
-    iget-boolean v0, p0, Lm0/a/a/a/d;->f:Z
-
-    if-eqz v0, :cond_3
-
-    iget-boolean v0, p0, Lm0/a/a/a/d;->g:Z
-
-    if-ne p1, v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iput-boolean p1, p0, Lm0/a/a/a/d;->g:Z
-
-    const-string v0, "CameraPreview"
-
-    if-eqz p1, :cond_2
-
-    iget-boolean p1, p0, Lm0/a/a/a/d;->h:Z
-
-    if-eqz p1, :cond_1
-
-    const-string p1, "Starting autofocus"
-
-    invoke-static {v0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->b()V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Lm0/a/a/a/d;->c()V
-
-    goto :goto_0
-
-    :cond_2
-    const-string p1, "Cancelling autofocus"
-
-    invoke-static {v0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
-
-    iget-object p1, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object p1, p1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {p1}, Landroid/hardware/Camera;->cancelAutoFocus()V
-
-    :cond_3
-    :goto_0
-    return-void
-.end method
-
-.method public setShouldScaleToFill(Z)V
-    .locals 0
-
-    iput-boolean p1, p0, Lm0/a/a/a/d;->i:Z
-
-    return-void
-.end method
-
-.method public surfaceChanged(Landroid/view/SurfaceHolder;III)V
-    .locals 0
-
-    invoke-interface {p1}, Landroid/view/SurfaceHolder;->getSurface()Landroid/view/Surface;
-
-    move-result-object p1
-
-    if-nez p1, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Lm0/a/a/a/d;->f()V
-
-    iget-object p1, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    if-eqz p1, :cond_2
-
-    :try_start_0
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
-
-    move-result-object p1
-
-    invoke-interface {p1, p0}, Landroid/view/SurfaceHolder;->addCallback(Landroid/view/SurfaceHolder$Callback;)V
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lm0/a/a/a/d;->f:Z
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->e()V
-
-    iget-object p1, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object p1, p1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Landroid/hardware/Camera;->setPreviewDisplay(Landroid/view/SurfaceHolder;)V
-
-    iget-object p1, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object p1, p1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->getDisplayOrientation()I
-
-    move-result p2
-
-    invoke-virtual {p1, p2}, Landroid/hardware/Camera;->setDisplayOrientation(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object p1, p1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    iget-object p2, p0, Lm0/a/a/a/d;->j:Landroid/hardware/Camera$PreviewCallback;
-
-    invoke-virtual {p1, p2}, Landroid/hardware/Camera;->setOneShotPreviewCallback(Landroid/hardware/Camera$PreviewCallback;)V
-
-    iget-object p1, p0, Lm0/a/a/a/d;->d:Lm0/a/a/a/e;
-
-    iget-object p1, p1, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    invoke-virtual {p1}, Landroid/hardware/Camera;->startPreview()V
-
-    iget-boolean p1, p0, Lm0/a/a/a/d;->g:Z
-
-    if-eqz p1, :cond_2
-
-    iget-boolean p1, p0, Lm0/a/a/a/d;->h:Z
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->b()V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Lm0/a/a/a/d;->c()V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    invoke-virtual {p1}, Ljava/lang/Exception;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string p3, "CameraPreview"
-
-    invoke-static {p3, p2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
-
-.method public surfaceCreated(Landroid/view/SurfaceHolder;)V
-    .locals 0
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lm0/a/a/a/d;->h:Z
-
-    return-void
-.end method
-
-.method public surfaceDestroyed(Landroid/view/SurfaceHolder;)V
-    .locals 0
-
-    const/4 p1, 0x0
-
-    iput-boolean p1, p0, Lm0/a/a/a/d;->h:Z
-
-    invoke-virtual {p0}, Lm0/a/a/a/d;->f()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/e.smali b/com.discord/smali_classes2/m0/a/a/a/e.smali
deleted file mode 100644
index eb117cefc9..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/e.smali
+++ /dev/null
@@ -1,27 +0,0 @@
-.class public Lm0/a/a/a/e;
-.super Ljava/lang/Object;
-.source "CameraWrapper.java"
-
-
-# instance fields
-.field public final a:Landroid/hardware/Camera;
-
-.field public final b:I
-
-
-# direct methods
-.method public constructor <init>(Landroid/hardware/Camera;I)V
-    .locals 0
-    .param p1    # Landroid/hardware/Camera;
-        .annotation build Landroidx/annotation/NonNull;
-        .end annotation
-    .end param
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lm0/a/a/a/e;->a:Landroid/hardware/Camera;
-
-    iput p2, p0, Lm0/a/a/a/e;->b:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/f.smali b/com.discord/smali_classes2/m0/a/a/a/f.smali
deleted file mode 100644
index 8a5c057a75..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/f.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public interface abstract Lm0/a/a/a/f;
-.super Ljava/lang/Object;
-.source "IViewFinder.java"
-
-
-# virtual methods
-.method public abstract getFramingRect()Landroid/graphics/Rect;
-.end method
-
-.method public abstract getHeight()I
-.end method
-
-.method public abstract getWidth()I
-.end method
-
-.method public abstract setBorderAlpha(F)V
-.end method
-
-.method public abstract setBorderColor(I)V
-.end method
-
-.method public abstract setBorderCornerRadius(I)V
-.end method
-
-.method public abstract setBorderCornerRounded(Z)V
-.end method
-
-.method public abstract setBorderLineLength(I)V
-.end method
-
-.method public abstract setBorderStrokeWidth(I)V
-.end method
-
-.method public abstract setLaserColor(I)V
-.end method
-
-.method public abstract setLaserEnabled(Z)V
-.end method
-
-.method public abstract setMaskColor(I)V
-.end method
-
-.method public abstract setSquareViewFinder(Z)V
-.end method
diff --git a/com.discord/smali_classes2/m0/a/a/a/g.smali b/com.discord/smali_classes2/m0/a/a/a/g.smali
deleted file mode 100644
index 5c3ba77110..0000000000
--- a/com.discord/smali_classes2/m0/a/a/a/g.smali
+++ /dev/null
@@ -1,907 +0,0 @@
-.class public Lm0/a/a/a/g;
-.super Landroid/view/View;
-.source "ViewFinderView.java"
-
-# interfaces
-.implements Lm0/a/a/a/f;
-
-
-# static fields
-.field public static final r:[I
-
-
-# instance fields
-.field public d:Landroid/graphics/Rect;
-
-.field public e:I
-
-.field public final f:I
-
-.field public final g:I
-
-.field public final h:I
-
-.field public final i:I
-
-.field public final j:I
-
-.field public k:Landroid/graphics/Paint;
-
-.field public l:Landroid/graphics/Paint;
-
-.field public m:Landroid/graphics/Paint;
-
-.field public n:I
-
-.field public o:Z
-
-.field public p:Z
-
-.field public q:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/16 v0, 0x8
-
-    new-array v0, v0, [I
-
-    fill-array-data v0, :array_0
-
-    sput-object v0, Lm0/a/a/a/g;->r:[I
-
-    return-void
-
-    :array_0
-    .array-data 4
-        0x0
-        0x40
-        0x80
-        0xc0
-        0xff
-        0xc0
-        0x80
-        0x40
-    .end array-data
-.end method
-
-.method public constructor <init>(Landroid/content/Context;)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Landroid/view/View;-><init>(Landroid/content/Context;)V
-
-    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    sget v0, Lme/dm7/barcodescanner/core/R$a;->viewfinder_laser:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getColor(I)I
-
-    move-result p1
-
-    iput p1, p0, Lm0/a/a/a/g;->f:I
-
-    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    sget v0, Lme/dm7/barcodescanner/core/R$a;->viewfinder_mask:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getColor(I)I
-
-    move-result p1
-
-    iput p1, p0, Lm0/a/a/a/g;->g:I
-
-    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    sget v0, Lme/dm7/barcodescanner/core/R$a;->viewfinder_border:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getColor(I)I
-
-    move-result p1
-
-    iput p1, p0, Lm0/a/a/a/g;->h:I
-
-    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    sget v0, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_width:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getInteger(I)I
-
-    move-result p1
-
-    iput p1, p0, Lm0/a/a/a/g;->i:I
-
-    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
-
-    move-result-object p1
-
-    sget v0, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_length:I
-
-    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getInteger(I)I
-
-    move-result p1
-
-    iput p1, p0, Lm0/a/a/a/g;->j:I
-
-    const/4 p1, 0x0
-
-    iput p1, p0, Lm0/a/a/a/g;->q:I
-
-    new-instance p1, Landroid/graphics/Paint;
-
-    invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
-
-    iput-object p1, p0, Lm0/a/a/a/g;->k:Landroid/graphics/Paint;
-
-    iget v0, p0, Lm0/a/a/a/g;->f:I
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setColor(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/g;->k:Landroid/graphics/Paint;
-
-    sget-object v0, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
-
-    new-instance p1, Landroid/graphics/Paint;
-
-    invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
-
-    iput-object p1, p0, Lm0/a/a/a/g;->l:Landroid/graphics/Paint;
-
-    iget v0, p0, Lm0/a/a/a/g;->g:I
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setColor(I)V
-
-    new-instance p1, Landroid/graphics/Paint;
-
-    invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
-
-    iput-object p1, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    iget v0, p0, Lm0/a/a/a/g;->h:I
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setColor(I)V
-
-    iget-object p1, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    sget-object v0, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
-
-    iget-object p1, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    iget v0, p0, Lm0/a/a/a/g;->i:I
-
-    int-to-float v0, v0
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStrokeWidth(F)V
-
-    iget-object p1, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setAntiAlias(Z)V
-
-    iget p1, p0, Lm0/a/a/a/g;->j:I
-
-    iput p1, p0, Lm0/a/a/a/g;->n:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public declared-synchronized a()V
-    .locals 8
-
-    monitor-enter p0
-
-    :try_start_0
-    new-instance v0, Landroid/graphics/Point;
-
-    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
-
-    move-result v1
-
-    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
-
-    move-result v2
-
-    invoke-direct {v0, v1, v2}, Landroid/graphics/Point;-><init>(II)V
-
-    invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->E(Landroid/content/Context;)I
-
-    move-result v1
-
-    iget-boolean v2, p0, Lm0/a/a/a/g;->o:Z
-
-    const/4 v3, 0x1
-
-    const/high16 v4, 0x3f200000    # 0.625f
-
-    if-eqz v2, :cond_1
-
-    if-eq v1, v3, :cond_0
-
-    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
-
-    move-result v1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
-
-    move-result v1
-
-    :goto_0
-    int-to-float v1, v1
-
-    mul-float v1, v1, v4
-
-    float-to-int v1, v1
-
-    move v2, v1
-
-    goto :goto_1
-
-    :cond_1
-    if-eq v1, v3, :cond_2
-
-    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
-
-    move-result v1
-
-    int-to-float v1, v1
-
-    mul-float v1, v1, v4
-
-    float-to-int v1, v1
-
-    const v2, 0x3fb33333    # 1.4f
-
-    int-to-float v3, v1
-
-    mul-float v3, v3, v2
-
-    float-to-int v2, v3
-
-    move v7, v2
-
-    move v2, v1
-
-    move v1, v7
-
-    goto :goto_1
-
-    :cond_2
-    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
-
-    move-result v1
-
-    int-to-float v1, v1
-
-    const/high16 v2, 0x3f400000    # 0.75f
-
-    mul-float v1, v1, v2
-
-    float-to-int v1, v1
-
-    int-to-float v3, v1
-
-    mul-float v3, v3, v2
-
-    float-to-int v2, v3
-
-    :goto_1
-    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
-
-    move-result v3
-
-    if-le v1, v3, :cond_3
-
-    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, -0x32
-
-    :cond_3
-    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
-
-    move-result v3
-
-    if-le v2, v3, :cond_4
-
-    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
-
-    move-result v2
-
-    add-int/lit8 v2, v2, -0x32
-
-    :cond_4
-    iget v3, v0, Landroid/graphics/Point;->x:I
-
-    sub-int/2addr v3, v1
-
-    div-int/lit8 v3, v3, 0x2
-
-    iget v0, v0, Landroid/graphics/Point;->y:I
-
-    sub-int/2addr v0, v2
-
-    div-int/lit8 v0, v0, 0x2
-
-    new-instance v4, Landroid/graphics/Rect;
-
-    iget v5, p0, Lm0/a/a/a/g;->q:I
-
-    add-int/2addr v5, v3
-
-    iget v6, p0, Lm0/a/a/a/g;->q:I
-
-    add-int/2addr v6, v0
-
-    add-int/2addr v3, v1
-
-    iget v1, p0, Lm0/a/a/a/g;->q:I
-
-    sub-int/2addr v3, v1
-
-    add-int/2addr v0, v2
-
-    iget v1, p0, Lm0/a/a/a/g;->q:I
-
-    sub-int/2addr v0, v1
-
-    invoke-direct {v4, v5, v6, v3, v0}, Landroid/graphics/Rect;-><init>(IIII)V
-
-    iput-object v4, p0, Lm0/a/a/a/g;->d:Landroid/graphics/Rect;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public getFramingRect()Landroid/graphics/Rect;
-    .locals 1
-
-    iget-object v0, p0, Lm0/a/a/a/g;->d:Landroid/graphics/Rect;
-
-    return-object v0
-.end method
-
-.method public onDraw(Landroid/graphics/Canvas;)V
-    .locals 11
-
-    invoke-virtual {p0}, Lm0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p1}, Landroid/graphics/Canvas;->getWidth()I
-
-    move-result v0
-
-    invoke-virtual {p1}, Landroid/graphics/Canvas;->getHeight()I
-
-    move-result v7
-
-    invoke-virtual {p0}, Lm0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
-
-    move-result-object v8
-
-    int-to-float v9, v0
-
-    iget v0, v8, Landroid/graphics/Rect;->top:I
-
-    int-to-float v4, v0
-
-    iget-object v5, p0, Lm0/a/a/a/g;->l:Landroid/graphics/Paint;
-
-    const/4 v1, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v2, 0x0
-
-    move-object v0, p1
-
-    move v3, v9
-
-    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
-
-    iget v0, v8, Landroid/graphics/Rect;->top:I
-
-    int-to-float v2, v0
-
-    iget v0, v8, Landroid/graphics/Rect;->left:I
-
-    int-to-float v3, v0
-
-    iget v0, v8, Landroid/graphics/Rect;->bottom:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    int-to-float v4, v0
-
-    iget-object v5, p0, Lm0/a/a/a/g;->l:Landroid/graphics/Paint;
-
-    move-object v0, p1
-
-    move v1, v10
-
-    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
-
-    iget v0, v8, Landroid/graphics/Rect;->right:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    int-to-float v1, v0
-
-    iget v0, v8, Landroid/graphics/Rect;->top:I
-
-    int-to-float v2, v0
-
-    iget v0, v8, Landroid/graphics/Rect;->bottom:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    int-to-float v4, v0
-
-    iget-object v5, p0, Lm0/a/a/a/g;->l:Landroid/graphics/Paint;
-
-    move-object v0, p1
-
-    move v3, v9
-
-    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
-
-    iget v0, v8, Landroid/graphics/Rect;->bottom:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    int-to-float v2, v0
-
-    int-to-float v4, v7
-
-    iget-object v5, p0, Lm0/a/a/a/g;->l:Landroid/graphics/Paint;
-
-    const/4 v1, 0x0
-
-    move-object v0, p1
-
-    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
-
-    invoke-virtual {p0}, Lm0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
-
-    move-result-object v0
-
-    new-instance v1, Landroid/graphics/Path;
-
-    invoke-direct {v1}, Landroid/graphics/Path;-><init>()V
-
-    iget v2, v0, Landroid/graphics/Rect;->left:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->top:I
-
-    iget v4, p0, Lm0/a/a/a/g;->n:I
-
-    add-int/2addr v3, v4
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->left:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->top:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->left:I
-
-    iget v3, p0, Lm0/a/a/a/g;->n:I
-
-    add-int/2addr v2, v3
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->top:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget-object v2, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
-
-    iget v2, v0, Landroid/graphics/Rect;->right:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->top:I
-
-    iget v4, p0, Lm0/a/a/a/g;->n:I
-
-    add-int/2addr v3, v4
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->right:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->top:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->right:I
-
-    iget v3, p0, Lm0/a/a/a/g;->n:I
-
-    sub-int/2addr v2, v3
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->top:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget-object v2, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
-
-    iget v2, v0, Landroid/graphics/Rect;->right:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->bottom:I
-
-    iget v4, p0, Lm0/a/a/a/g;->n:I
-
-    sub-int/2addr v3, v4
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->right:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->bottom:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->right:I
-
-    iget v3, p0, Lm0/a/a/a/g;->n:I
-
-    sub-int/2addr v2, v3
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->bottom:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget-object v2, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
-
-    iget v2, v0, Landroid/graphics/Rect;->left:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->bottom:I
-
-    iget v4, p0, Lm0/a/a/a/g;->n:I
-
-    sub-int/2addr v3, v4
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->left:I
-
-    int-to-float v2, v2
-
-    iget v3, v0, Landroid/graphics/Rect;->bottom:I
-
-    int-to-float v3, v3
-
-    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget v2, v0, Landroid/graphics/Rect;->left:I
-
-    iget v3, p0, Lm0/a/a/a/g;->n:I
-
-    add-int/2addr v2, v3
-
-    int-to-float v2, v2
-
-    iget v0, v0, Landroid/graphics/Rect;->bottom:I
-
-    int-to-float v0, v0
-
-    invoke-virtual {v1, v2, v0}, Landroid/graphics/Path;->lineTo(FF)V
-
-    iget-object v0, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    invoke-virtual {p1, v1, v0}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
-
-    iget-boolean v0, p0, Lm0/a/a/a/g;->p:Z
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Lm0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
-
-    move-result-object v7
-
-    iget-object v0, p0, Lm0/a/a/a/g;->k:Landroid/graphics/Paint;
-
-    sget-object v1, Lm0/a/a/a/g;->r:[I
-
-    iget v2, p0, Lm0/a/a/a/g;->e:I
-
-    aget v1, v1, v2
-
-    invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setAlpha(I)V
-
-    iget v0, p0, Lm0/a/a/a/g;->e:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    sget-object v1, Lm0/a/a/a/g;->r:[I
-
-    array-length v1, v1
-
-    rem-int/2addr v0, v1
-
-    iput v0, p0, Lm0/a/a/a/g;->e:I
-
-    invoke-virtual {v7}, Landroid/graphics/Rect;->height()I
-
-    move-result v0
-
-    div-int/lit8 v0, v0, 0x2
-
-    iget v1, v7, Landroid/graphics/Rect;->top:I
-
-    add-int/2addr v0, v1
-
-    iget v1, v7, Landroid/graphics/Rect;->left:I
-
-    add-int/lit8 v1, v1, 0x2
-
-    int-to-float v1, v1
-
-    add-int/lit8 v2, v0, -0x1
-
-    int-to-float v2, v2
-
-    iget v3, v7, Landroid/graphics/Rect;->right:I
-
-    add-int/lit8 v3, v3, -0x1
-
-    int-to-float v3, v3
-
-    add-int/lit8 v0, v0, 0x2
-
-    int-to-float v4, v0
-
-    iget-object v5, p0, Lm0/a/a/a/g;->k:Landroid/graphics/Paint;
-
-    move-object v0, p1
-
-    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
-
-    iget v0, v7, Landroid/graphics/Rect;->left:I
-
-    add-int/lit8 v3, v0, -0xa
-
-    iget v0, v7, Landroid/graphics/Rect;->top:I
-
-    add-int/lit8 v4, v0, -0xa
-
-    iget v0, v7, Landroid/graphics/Rect;->right:I
-
-    add-int/lit8 v5, v0, 0xa
-
-    iget v0, v7, Landroid/graphics/Rect;->bottom:I
-
-    add-int/lit8 v6, v0, 0xa
-
-    const-wide/16 v1, 0x50
-
-    move-object v0, p0
-
-    invoke-virtual/range {v0 .. v6}, Landroid/view/View;->postInvalidateDelayed(JIIII)V
-
-    :cond_1
-    return-void
-.end method
-
-.method public onSizeChanged(IIII)V
-    .locals 0
-
-    invoke-virtual {p0}, Lm0/a/a/a/g;->a()V
-
-    return-void
-.end method
-
-.method public setBorderAlpha(F)V
-    .locals 1
-
-    const/high16 v0, 0x437f0000    # 255.0f
-
-    mul-float p1, p1, v0
-
-    float-to-int p1, p1
-
-    iget-object v0, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setAlpha(I)V
-
-    return-void
-.end method
-
-.method public setBorderColor(I)V
-    .locals 1
-
-    iget-object v0, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
-
-    return-void
-.end method
-
-.method public setBorderCornerRadius(I)V
-    .locals 2
-
-    iget-object v0, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    new-instance v1, Landroid/graphics/CornerPathEffect;
-
-    int-to-float p1, p1
-
-    invoke-direct {v1, p1}, Landroid/graphics/CornerPathEffect;-><init>(F)V
-
-    invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setPathEffect(Landroid/graphics/PathEffect;)Landroid/graphics/PathEffect;
-
-    return-void
-.end method
-
-.method public setBorderCornerRounded(Z)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    sget-object v0, Landroid/graphics/Paint$Join;->ROUND:Landroid/graphics/Paint$Join;
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStrokeJoin(Landroid/graphics/Paint$Join;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    sget-object v0, Landroid/graphics/Paint$Join;->BEVEL:Landroid/graphics/Paint$Join;
-
-    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStrokeJoin(Landroid/graphics/Paint$Join;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public setBorderLineLength(I)V
-    .locals 0
-
-    iput p1, p0, Lm0/a/a/a/g;->n:I
-
-    return-void
-.end method
-
-.method public setBorderStrokeWidth(I)V
-    .locals 1
-
-    iget-object v0, p0, Lm0/a/a/a/g;->m:Landroid/graphics/Paint;
-
-    int-to-float p1, p1
-
-    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
-
-    return-void
-.end method
-
-.method public setLaserColor(I)V
-    .locals 1
-
-    iget-object v0, p0, Lm0/a/a/a/g;->k:Landroid/graphics/Paint;
-
-    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
-
-    return-void
-.end method
-
-.method public setLaserEnabled(Z)V
-    .locals 0
-
-    iput-boolean p1, p0, Lm0/a/a/a/g;->p:Z
-
-    return-void
-.end method
-
-.method public setMaskColor(I)V
-    .locals 1
-
-    iget-object v0, p0, Lm0/a/a/a/g;->l:Landroid/graphics/Paint;
-
-    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
-
-    return-void
-.end method
-
-.method public setSquareViewFinder(Z)V
-    .locals 0
-
-    iput-boolean p1, p0, Lm0/a/a/a/g;->o:Z
-
-    return-void
-.end method
-
-.method public setViewFinderOffset(I)V
-    .locals 0
-
-    iput p1, p0, Lm0/a/a/a/g;->q:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/m0/b.smali b/com.discord/smali_classes2/m0/b.smali
new file mode 100644
index 0000000000..e430b882f3
--- /dev/null
+++ b/com.discord/smali_classes2/m0/b.smali
@@ -0,0 +1,79 @@
+.class public final Lm0/b;
+.super Lk0/o/c/j;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "TT;",
+        "Lkotlin/reflect/KProperty<",
+        "*>;TV;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $finder:Lkotlin/jvm/functions/Function2;
+
+.field public final synthetic $id:I
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function2;I)V
+    .locals 0
+
+    iput-object p1, p0, Lm0/b;->$finder:Lkotlin/jvm/functions/Function2;
+
+    iput p2, p0, Lm0/b;->$id:I
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p2, Lkotlin/reflect/KProperty;
+
+    const-string v0, "desc"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lm0/b;->$finder:Lkotlin/jvm/functions/Function2;
+
+    iget v1, p0, Lm0/b;->$id:I
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-interface {v0, p1, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/view/View;
+
+    if-eqz p1, :cond_0
+
+    return-object p1
+
+    :cond_0
+    iget p1, p0, Lm0/b;->$id:I
+
+    invoke-static {p1, p2}, Lf/n/a/k/a;->b(ILkotlin/reflect/KProperty;)Ljava/lang/Void;
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/m0/c.smali b/com.discord/smali_classes2/m0/c.smali
new file mode 100644
index 0000000000..4c0f880364
--- /dev/null
+++ b/com.discord/smali_classes2/m0/c.smali
@@ -0,0 +1,101 @@
+.class public final Lm0/c;
+.super Lk0/o/c/j;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "TT;",
+        "Lkotlin/reflect/KProperty<",
+        "*>;",
+        "Ljava/util/List<",
+        "+TV;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $finder:Lkotlin/jvm/functions/Function2;
+
+.field public final synthetic $ids:[I
+
+
+# direct methods
+.method public constructor <init>([ILkotlin/jvm/functions/Function2;)V
+    .locals 0
+
+    iput-object p1, p0, Lm0/c;->$ids:[I
+
+    iput-object p2, p0, Lm0/c;->$finder:Lkotlin/jvm/functions/Function2;
+
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 7
+
+    check-cast p2, Lkotlin/reflect/KProperty;
+
+    const-string v0, "desc"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lm0/c;->$ids:[I
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    array-length v2, v0
+
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    array-length v2, v0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v2, :cond_1
+
+    aget v4, v0, v3
+
+    iget-object v5, p0, Lm0/c;->$finder:Lkotlin/jvm/functions/Function2;
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v6
+
+    invoke-interface {v5, p1, v6}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Landroid/view/View;
+
+    if-eqz v5, :cond_0
+
+    invoke-virtual {v1, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {v4, p2}, Lf/n/a/k/a;->b(ILkotlin/reflect/KProperty;)Ljava/lang/Void;
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_1
+    return-object v1
+.end method
diff --git a/com.discord/smali_classes2/m0/d.smali b/com.discord/smali_classes2/m0/d.smali
new file mode 100644
index 0000000000..20d01c278d
--- /dev/null
+++ b/com.discord/smali_classes2/m0/d.smali
@@ -0,0 +1,71 @@
+.class public final Lm0/d;
+.super Lk0/o/c/j;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroid/view/View;",
+        "Ljava/lang/Integer;",
+        "Landroid/view/View;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lm0/d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lm0/d;
+
+    invoke-direct {v0}, Lm0/d;-><init>()V
+
+    sput-object v0, Lm0/d;->d:Lm0/d;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroid/view/View;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/m0/e.smali b/com.discord/smali_classes2/m0/e.smali
new file mode 100644
index 0000000000..d5d3afd655
--- /dev/null
+++ b/com.discord/smali_classes2/m0/e.smali
@@ -0,0 +1,98 @@
+.class public final Lm0/e;
+.super Lk0/o/c/j;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroidx/fragment/app/DialogFragment;",
+        "Ljava/lang/Integer;",
+        "Landroid/view/View;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lm0/e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lm0/e;
+
+    invoke-direct {v0}, Lm0/e;-><init>()V
+
+    sput-object v0, Lm0/e;->d:Lm0/e;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroidx/fragment/app/DialogFragment;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroidx/fragment/app/DialogFragment;->getDialog()Landroid/app/Dialog;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0, p2}, Landroid/app/Dialog;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/m0/f.smali b/com.discord/smali_classes2/m0/f.smali
new file mode 100644
index 0000000000..5a7741f0a2
--- /dev/null
+++ b/com.discord/smali_classes2/m0/f.smali
@@ -0,0 +1,83 @@
+.class public final Lm0/f;
+.super Lk0/o/c/j;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroidx/fragment/app/Fragment;",
+        "Ljava/lang/Integer;",
+        "Landroid/view/View;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lm0/f;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lm0/f;
+
+    invoke-direct {v0}, Lm0/f;-><init>()V
+
+    sput-object v0, Lm0/f;->d:Lm0/f;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroidx/fragment/app/Fragment;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/m0/g.smali b/com.discord/smali_classes2/m0/g.smali
new file mode 100644
index 0000000000..ebfd25df57
--- /dev/null
+++ b/com.discord/smali_classes2/m0/g.smali
@@ -0,0 +1,73 @@
+.class public final Lm0/g;
+.super Lk0/o/c/j;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroidx/recyclerview/widget/RecyclerView$ViewHolder;",
+        "Ljava/lang/Integer;",
+        "Landroid/view/View;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Lm0/g;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lm0/g;
+
+    invoke-direct {v0}, Lm0/g;-><init>()V
+
+    sput-object v0, Lm0/g;->d:Lm0/g;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    invoke-direct {p0, v0}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/m0/h$a.smali b/com.discord/smali_classes2/m0/h$a.smali
new file mode 100644
index 0000000000..da70ddc6a9
--- /dev/null
+++ b/com.discord/smali_classes2/m0/h$a.smali
@@ -0,0 +1,40 @@
+.class public final Lm0/h$a;
+.super Ljava/lang/Object;
+.source "Kotterknife.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lm0/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Lm0/h$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lm0/h$a;
+
+    invoke-direct {v0}, Lm0/h$a;-><init>()V
+
+    sput-object v0, Lm0/h$a;->a:Lm0/h$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/m0/h.smali b/com.discord/smali_classes2/m0/h.smali
new file mode 100644
index 0000000000..6f26a4743f
--- /dev/null
+++ b/com.discord/smali_classes2/m0/h.smali
@@ -0,0 +1,140 @@
+.class public final Lm0/h;
+.super Ljava/lang/Object;
+.source "Kotterknife.kt"
+
+# interfaces
+.implements Lkotlin/properties/ReadOnlyProperty;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lm0/h$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lkotlin/properties/ReadOnlyProperty<",
+        "TT;TV;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Ljava/lang/Object;
+
+.field public final b:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "TT;",
+            "Lkotlin/reflect/KProperty<",
+            "*>;TV;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/functions/Function2;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function2<",
+            "-TT;-",
+            "Lkotlin/reflect/KProperty<",
+            "*>;+TV;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "initializer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lm0/h;->b:Lkotlin/jvm/functions/Function2;
+
+    sget-object p1, Lm0/h$a;->a:Lm0/h$a;
+
+    iput-object p1, p0, Lm0/h;->a:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;",
+            "Lkotlin/reflect/KProperty<",
+            "*>;)TV;"
+        }
+    .end annotation
+
+    const-string v0, "property"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lm0/h;->a:Ljava/lang/Object;
+
+    sget-object v1, Lm0/h$a;->a:Lm0/h$a;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lm0/h;->b:Lkotlin/jvm/functions/Function2;
+
+    invoke-interface {v0, p1, p2}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lm0/h;->a:Ljava/lang/Object;
+
+    sget-object p2, Lm0/i;->b:Lm0/i;
+
+    const-string p2, "lazy"
+
+    invoke-static {p0, p2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p2, Lm0/i;->a:Ljava/util/WeakHashMap;
+
+    invoke-interface {p2, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Ljava/util/WeakHashMap;
+
+    invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
+
+    invoke-static {v0}, Ljava/util/Collections;->newSetFromMap(Ljava/util/Map;)Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {p2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0, p0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    :cond_1
+    iget-object p1, p0, Lm0/h;->a:Ljava/lang/Object;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/m0/i.smali b/com.discord/smali_classes2/m0/i.smali
new file mode 100644
index 0000000000..a56b47fc27
--- /dev/null
+++ b/com.discord/smali_classes2/m0/i.smali
@@ -0,0 +1,33 @@
+.class public final Lm0/i;
+.super Ljava/lang/Object;
+.source "Kotterknife.kt"
+
+
+# static fields
+.field public static final a:Ljava/util/WeakHashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/WeakHashMap<",
+            "Ljava/lang/Object;",
+            "Ljava/util/Collection<",
+            "Lm0/h<",
+            "**>;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public static final b:Lm0/i;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/util/WeakHashMap;
+
+    invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
+
+    sput-object v0, Lm0/i;->a:Ljava/util/WeakHashMap;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/me/dm7/barcodescanner/core/R$c.smali b/com.discord/smali_classes2/me/dm7/barcodescanner/core/R$c.smali
index 7e5b29d89e..1297adbeb7 100644
--- a/com.discord/smali_classes2/me/dm7/barcodescanner/core/R$c.smali
+++ b/com.discord/smali_classes2/me/dm7/barcodescanner/core/R$c.smali
@@ -219,8 +219,8 @@
         0x7f04032b
         0x7f0403a5
         0x7f040452
-        0x7f04048a
-        0x7f0404a7
+        0x7f04047c
+        0x7f040499
     .end array-data
 
     :array_1
@@ -233,7 +233,7 @@
     :array_2
     .array-data 4
         0x7f040326
-        0x7f0404b5
+        0x7f0404a7
     .end array-data
 
     :array_3
@@ -268,7 +268,7 @@
         0x7f04024b
         0x7f04024c
         0x7f04024d
-        0x7f040573
+        0x7f040565
     .end array-data
 
     :array_6
diff --git a/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView$a.smali b/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView$a.smali
index 48165a31c6..e3d2478f91 100644
--- a/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView$a.smali
+++ b/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView$a.smali
@@ -49,11 +49,11 @@
 
     iput-object v2, v0, Lme/dm7/barcodescanner/zxing/ZXingScannerView;->z:Lme/dm7/barcodescanner/zxing/ZXingScannerView$b;
 
-    iget-object v0, v0, Lm0/a/a/a/a;->e:Lm0/a/a/a/d;
+    iget-object v0, v0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lm0/a/a/a/d;->f()V
+    invoke-virtual {v0}, Ln0/a/a/a/d;->f()V
 
     :cond_0
     if-eqz v1, :cond_1
diff --git a/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView.smali b/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView.smali
index 50ed3e49d9..6c1ce63797 100644
--- a/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView.smali
+++ b/com.discord/smali_classes2/me/dm7/barcodescanner/zxing/ZXingScannerView.smali
@@ -1,5 +1,5 @@
 .class public Lme/dm7/barcodescanner/zxing/ZXingScannerView;
-.super Lm0/a/a/a/a;
+.super Ln0/a/a/a/a;
 .source "ZXingScannerView.java"
 
 
@@ -155,7 +155,7 @@
 .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
     .locals 0
 
-    invoke-direct {p0, p1, p2}, Lm0/a/a/a/a;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    invoke-direct {p0, p1, p2}, Ln0/a/a/a/a;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
     invoke-virtual {p0}, Lme/dm7/barcodescanner/zxing/ZXingScannerView;->c()V
 
@@ -170,27 +170,27 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lm0/a/a/a/a;->g:Landroid/graphics/Rect;
+    iget-object v0, p0, Ln0/a/a/a/a;->g:Landroid/graphics/Rect;
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
 
-    invoke-interface {v0}, Lm0/a/a/a/f;->getFramingRect()Landroid/graphics/Rect;
+    invoke-interface {v0}, Ln0/a/a/a/f;->getFramingRect()Landroid/graphics/Rect;
 
     move-result-object v0
 
-    iget-object v2, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
+    iget-object v2, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
 
-    invoke-interface {v2}, Lm0/a/a/a/f;->getWidth()I
+    invoke-interface {v2}, Ln0/a/a/a/f;->getWidth()I
 
     move-result v2
 
-    iget-object v3, p0, Lm0/a/a/a/a;->f:Lm0/a/a/a/f;
+    iget-object v3, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
 
-    invoke-interface {v3}, Lm0/a/a/a/f;->getHeight()I
+    invoke-interface {v3}, Ln0/a/a/a/f;->getHeight()I
 
     move-result v3
 
@@ -245,7 +245,7 @@
     iput v0, v4, Landroid/graphics/Rect;->bottom:I
 
     :cond_2
-    iput-object v4, p0, Lm0/a/a/a/a;->g:Landroid/graphics/Rect;
+    iput-object v4, p0, Ln0/a/a/a/a;->g:Landroid/graphics/Rect;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -262,7 +262,7 @@
     :cond_4
     :goto_1
     :try_start_1
-    iget-object v0, p0, Lm0/a/a/a/a;->g:Landroid/graphics/Rect;
+    iget-object v0, p0, Ln0/a/a/a/a;->g:Landroid/graphics/Rect;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -394,7 +394,7 @@
 
     move-result-object v3
 
-    invoke-static {v3}, Lf/n/a/k/a;->E(Landroid/content/Context;)I
+    invoke-static {v3}, Lf/n/a/k/a;->B(Landroid/content/Context;)I
 
     move-result v3
 
@@ -402,7 +402,7 @@
 
     if-ne v3, v4, :cond_7
 
-    invoke-virtual/range {p0 .. p0}, Lm0/a/a/a/a;->getRotationCount()I
+    invoke-virtual/range {p0 .. p0}, Ln0/a/a/a/a;->getRotationCount()I
 
     move-result v3
 
@@ -435,7 +435,7 @@
 
     iget v3, v3, Landroid/hardware/Camera$Size;->height:I
 
-    invoke-virtual/range {p0 .. p0}, Lm0/a/a/a/a;->getRotationCount()I
+    invoke-virtual/range {p0 .. p0}, Ln0/a/a/a/a;->getRotationCount()I
 
     move-result v7
 
diff --git a/com.discord/smali_classes2/n0/a.smali b/com.discord/smali_classes2/n0/a.smali
deleted file mode 100644
index 95b8d51c10..0000000000
--- a/com.discord/smali_classes2/n0/a.smali
+++ /dev/null
@@ -1,675 +0,0 @@
-.class public final Ln0/a;
-.super Ljava/lang/Object;
-.source "Address.kt"
-
-
-# instance fields
-.field public final a:Ln0/w;
-
-.field public final b:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/y;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/m;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final d:Ln0/s;
-
-.field public final e:Ljavax/net/SocketFactory;
-
-.field public final f:Ljavax/net/ssl/SSLSocketFactory;
-
-.field public final g:Ljavax/net/ssl/HostnameVerifier;
-
-.field public final h:Ln0/h;
-
-.field public final i:Ln0/c;
-
-.field public final j:Ljava/net/Proxy;
-
-.field public final k:Ljava/net/ProxySelector;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;ILn0/s;Ljavax/net/SocketFactory;Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/HostnameVerifier;Ln0/h;Ln0/c;Ljava/net/Proxy;Ljava/util/List;Ljava/util/List;Ljava/net/ProxySelector;)V
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "I",
-            "Ln0/s;",
-            "Ljavax/net/SocketFactory;",
-            "Ljavax/net/ssl/SSLSocketFactory;",
-            "Ljavax/net/ssl/HostnameVerifier;",
-            "Ln0/h;",
-            "Ln0/c;",
-            "Ljava/net/Proxy;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;",
-            "Ljava/util/List<",
-            "Ln0/m;",
-            ">;",
-            "Ljava/net/ProxySelector;",
-            ")V"
-        }
-    .end annotation
-
-    move-object v0, p0
-
-    move-object v1, p1
-
-    move v2, p2
-
-    move-object v3, p3
-
-    move-object v4, p4
-
-    move-object/from16 v5, p8
-
-    move-object/from16 v6, p12
-
-    const/4 v7, 0x0
-
-    if-eqz v1, :cond_d
-
-    if-eqz v3, :cond_c
-
-    if-eqz v4, :cond_b
-
-    if-eqz v5, :cond_a
-
-    if-eqz p10, :cond_9
-
-    if-eqz p11, :cond_8
-
-    if-eqz v6, :cond_7
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object v3, v0, Ln0/a;->d:Ln0/s;
-
-    iput-object v4, v0, Ln0/a;->e:Ljavax/net/SocketFactory;
-
-    move-object v3, p5
-
-    iput-object v3, v0, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    move-object/from16 v3, p6
-
-    iput-object v3, v0, Ln0/a;->g:Ljavax/net/ssl/HostnameVerifier;
-
-    move-object/from16 v3, p7
-
-    iput-object v3, v0, Ln0/a;->h:Ln0/h;
-
-    iput-object v5, v0, Ln0/a;->i:Ln0/c;
-
-    move-object/from16 v3, p9
-
-    iput-object v3, v0, Ln0/a;->j:Ljava/net/Proxy;
-
-    iput-object v6, v0, Ln0/a;->k:Ljava/net/ProxySelector;
-
-    new-instance v3, Ln0/w$a;
-
-    invoke-direct {v3}, Ln0/w$a;-><init>()V
-
-    iget-object v4, v0, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    const-string v5, "https"
-
-    const-string v6, "http"
-
-    if-eqz v4, :cond_0
-
-    move-object v4, v5
-
-    goto :goto_0
-
-    :cond_0
-    move-object v4, v6
-
-    :goto_0
-    const/4 v7, 0x1
-
-    invoke-static {v4, v6, v7}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_1
-
-    iput-object v6, v3, Ln0/w$a;->a:Ljava/lang/String;
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {v4, v5, v7}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_6
-
-    iput-object v5, v3, Ln0/w$a;->a:Ljava/lang/String;
-
-    :goto_1
-    sget-object v4, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x7
-
-    move-object p3, v4
-
-    move-object p4, p1
-
-    move p5, v5
-
-    move/from16 p6, v6
-
-    move/from16 p7, v8
-
-    move/from16 p8, v9
-
-    invoke-static/range {p3 .. p8}, Ln0/w$b;->d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-static {v4}, Lf/n/a/k/a;->i0(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_5
-
-    iput-object v4, v3, Ln0/w$a;->d:Ljava/lang/String;
-
-    if-le v7, v2, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    const v1, 0xffff
-
-    if-lt v1, v2, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    :goto_2
-    const/4 v7, 0x0
-
-    :goto_3
-    if-eqz v7, :cond_4
-
-    iput v2, v3, Ln0/w$a;->e:I
-
-    invoke-virtual {v3}, Ln0/w$a;->b()Ln0/w;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/a;->a:Ln0/w;
-
-    invoke-static/range {p10 .. p10}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/a;->b:Ljava/util/List;
-
-    invoke-static/range {p11 .. p11}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/a;->c:Ljava/util/List;
-
-    return-void
-
-    :cond_4
-    const-string v1, "unexpected port: "
-
-    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_5
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    const-string v3, "unexpected host: "
-
-    invoke-static {v3, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_6
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    const-string v2, "unexpected scheme: "
-
-    invoke-static {v2, v4}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_7
-    const-string v1, "proxySelector"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_8
-    const-string v1, "connectionSpecs"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_9
-    const-string v1, "protocols"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_a
-    const-string v1, "proxyAuthenticator"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_b
-    const-string v1, "socketFactory"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_c
-    const-string v1, "dns"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-
-    :cond_d
-    const-string v1, "uriHost"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v7
-.end method
-
-
-# virtual methods
-.method public final a(Ln0/a;)Z
-    .locals 2
-
-    if-eqz p1, :cond_1
-
-    iget-object v0, p0, Ln0/a;->d:Ln0/s;
-
-    iget-object v1, p1, Ln0/a;->d:Ln0/s;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->i:Ln0/c;
-
-    iget-object v1, p1, Ln0/a;->i:Ln0/c;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->b:Ljava/util/List;
-
-    iget-object v1, p1, Ln0/a;->b:Ljava/util/List;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->c:Ljava/util/List;
-
-    iget-object v1, p1, Ln0/a;->c:Ljava/util/List;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->k:Ljava/net/ProxySelector;
-
-    iget-object v1, p1, Ln0/a;->k:Ljava/net/ProxySelector;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->j:Ljava/net/Proxy;
-
-    iget-object v1, p1, Ln0/a;->j:Ljava/net/Proxy;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    iget-object v1, p1, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->g:Ljavax/net/ssl/HostnameVerifier;
-
-    iget-object v1, p1, Ln0/a;->g:Ljavax/net/ssl/HostnameVerifier;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->h:Ln0/h;
-
-    iget-object v1, p1, Ln0/a;->h:Ln0/h;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->a:Ln0/w;
-
-    iget v0, v0, Ln0/w;->f:I
-
-    iget-object p1, p1, Ln0/a;->a:Ln0/w;
-
-    iget p1, p1, Ln0/w;->f:I
-
-    if-ne v0, p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-
-    :cond_1
-    const-string p1, "that"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    instance-of v0, p1, Ln0/a;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/a;->a:Ln0/w;
-
-    check-cast p1, Ln0/a;
-
-    iget-object v1, p1, Ln0/a;->a:Ln0/w;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0, p1}, Ln0/a;->a(Ln0/a;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Ln0/a;->a:Ln0/w;
-
-    invoke-virtual {v0}, Ln0/w;->hashCode()I
-
-    move-result v0
-
-    add-int/lit16 v0, v0, 0x20f
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/a;->d:Ln0/s;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Ln0/a;->i:Ln0/c;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/a;->b:Ljava/util/List;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Ln0/a;->c:Ljava/util/List;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/a;->k:Ljava/net/ProxySelector;
-
-    invoke-virtual {v1}, Ljava/net/ProxySelector;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Ln0/a;->j:Ljava/net/Proxy;
-
-    invoke-static {v0}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    invoke-static {v1}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Ln0/a;->g:Ljavax/net/ssl/HostnameVerifier;
-
-    invoke-static {v0}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/a;->h:Ln0/h;
-
-    invoke-static {v1}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    return v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "Address{"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/a;->a:Ln0/w;
-
-    iget-object v1, v1, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x3a
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/a;->a:Ln0/w;
-
-    iget v1, v1, Ln0/w;->f:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/a;->j:Ljava/net/Proxy;
-
-    if-eqz v1, :cond_0
-
-    const-string v1, "proxy="
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/a;->j:Ljava/net/Proxy;
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "proxySelector="
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/a;->k:Ljava/net/ProxySelector;
-
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)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_classes2/n0/a/a/a/a.smali b/com.discord/smali_classes2/n0/a/a/a/a.smali
new file mode 100644
index 0000000000..130f0b02ad
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/a.smali
@@ -0,0 +1,868 @@
+.class public abstract Ln0/a/a/a/a;
+.super Landroid/widget/FrameLayout;
+.source "BarcodeScannerView.java"
+
+# interfaces
+.implements Landroid/hardware/Camera$PreviewCallback;
+
+
+# instance fields
+.field public d:Ln0/a/a/a/e;
+
+.field public e:Ln0/a/a/a/d;
+
+.field public f:Ln0/a/a/a/f;
+
+.field public g:Landroid/graphics/Rect;
+
+.field public h:Ln0/a/a/a/c;
+
+.field public i:Ljava/lang/Boolean;
+
+.field public j:Z
+
+.field public k:Z
+
+.field public l:Z
+
+.field public m:I
+    .annotation build Landroidx/annotation/ColorInt;
+    .end annotation
+.end field
+
+.field public n:I
+    .annotation build Landroidx/annotation/ColorInt;
+    .end annotation
+.end field
+
+.field public o:I
+
+.field public p:I
+
+.field public q:I
+
+.field public r:Z
+
+.field public s:I
+
+.field public t:Z
+
+.field public u:F
+
+.field public v:I
+
+.field public w:F
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 3
+
+    invoke-direct {p0, p1, p2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ln0/a/a/a/a;->j:Z
+
+    iput-boolean v0, p0, Ln0/a/a/a/a;->k:Z
+
+    iput-boolean v0, p0, Ln0/a/a/a/a;->l:Z
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    sget v2, Lme/dm7/barcodescanner/core/R$a;->viewfinder_laser:I
+
+    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
+
+    move-result v1
+
+    iput v1, p0, Ln0/a/a/a/a;->m:I
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    sget v2, Lme/dm7/barcodescanner/core/R$a;->viewfinder_border:I
+
+    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
+
+    move-result v1
+
+    iput v1, p0, Ln0/a/a/a/a;->n:I
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    sget v2, Lme/dm7/barcodescanner/core/R$a;->viewfinder_mask:I
+
+    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
+
+    move-result v1
+
+    iput v1, p0, Ln0/a/a/a/a;->o:I
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    sget v2, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_width:I
+
+    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getInteger(I)I
+
+    move-result v1
+
+    iput v1, p0, Ln0/a/a/a/a;->p:I
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    sget v2, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_length:I
+
+    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getInteger(I)I
+
+    move-result v1
+
+    iput v1, p0, Ln0/a/a/a/a;->q:I
+
+    const/4 v1, 0x0
+
+    iput-boolean v1, p0, Ln0/a/a/a/a;->r:Z
+
+    iput v1, p0, Ln0/a/a/a/a;->s:I
+
+    iput-boolean v1, p0, Ln0/a/a/a/a;->t:Z
+
+    const/high16 v2, 0x3f800000    # 1.0f
+
+    iput v2, p0, Ln0/a/a/a/a;->u:F
+
+    iput v1, p0, Ln0/a/a/a/a;->v:I
+
+    const v2, 0x3dcccccd    # 0.1f
+
+    iput v2, p0, Ln0/a/a/a/a;->w:F
+
+    invoke-virtual {p1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme;
+
+    move-result-object p1
+
+    sget-object v2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView:[I
+
+    invoke-virtual {p1, p2, v2, v1, v1}, Landroid/content/res/Resources$Theme;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+
+    move-result-object p1
+
+    :try_start_0
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_shouldScaleToFill:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result p2
+
+    invoke-virtual {p0, p2}, Ln0/a/a/a/a;->setShouldScaleToFill(Z)V
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_laserEnabled:I
+
+    iget-boolean v0, p0, Ln0/a/a/a/a;->l:Z
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result p2
+
+    iput-boolean p2, p0, Ln0/a/a/a/a;->l:Z
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_laserColor:I
+
+    iget v0, p0, Ln0/a/a/a/a;->m:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->m:I
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderColor:I
+
+    iget v0, p0, Ln0/a/a/a/a;->n:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->n:I
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_maskColor:I
+
+    iget v0, p0, Ln0/a/a/a/a;->o:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getColor(II)I
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->o:I
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderWidth:I
+
+    iget v0, p0, Ln0/a/a/a/a;->p:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->p:I
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderLength:I
+
+    iget v0, p0, Ln0/a/a/a/a;->q:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->q:I
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_roundedCorner:I
+
+    iget-boolean v0, p0, Ln0/a/a/a/a;->r:Z
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result p2
+
+    iput-boolean p2, p0, Ln0/a/a/a/a;->r:Z
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_cornerRadius:I
+
+    iget v0, p0, Ln0/a/a/a/a;->s:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->s:I
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_squaredFinder:I
+
+    iget-boolean v0, p0, Ln0/a/a/a/a;->t:Z
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+
+    move-result p2
+
+    iput-boolean p2, p0, Ln0/a/a/a/a;->t:Z
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_borderAlpha:I
+
+    iget v0, p0, Ln0/a/a/a/a;->u:F
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->u:F
+
+    sget p2, Lme/dm7/barcodescanner/core/R$c;->BarcodeScannerView_finderOffset:I
+
+    iget v0, p0, Ln0/a/a/a/a;->v:I
+
+    invoke-virtual {p1, p2, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I
+
+    move-result p2
+
+    iput p2, p0, Ln0/a/a/a/a;->v:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    new-instance p2, Ln0/a/a/a/g;
+
+    invoke-direct {p2, p1}, Ln0/a/a/a/g;-><init>(Landroid/content/Context;)V
+
+    iget p1, p0, Ln0/a/a/a/a;->n:I
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setBorderColor(I)V
+
+    iget p1, p0, Ln0/a/a/a/a;->m:I
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setLaserColor(I)V
+
+    iget-boolean p1, p0, Ln0/a/a/a/a;->l:Z
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setLaserEnabled(Z)V
+
+    iget p1, p0, Ln0/a/a/a/a;->p:I
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setBorderStrokeWidth(I)V
+
+    iget p1, p0, Ln0/a/a/a/a;->q:I
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setBorderLineLength(I)V
+
+    iget p1, p0, Ln0/a/a/a/a;->o:I
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setMaskColor(I)V
+
+    iget-boolean p1, p0, Ln0/a/a/a/a;->r:Z
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setBorderCornerRounded(Z)V
+
+    iget p1, p0, Ln0/a/a/a/a;->s:I
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setBorderCornerRadius(I)V
+
+    iget-boolean p1, p0, Ln0/a/a/a/a;->t:Z
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setSquareViewFinder(Z)V
+
+    iget p1, p0, Ln0/a/a/a/a;->v:I
+
+    invoke-virtual {p2, p1}, Ln0/a/a/a/g;->setViewFinderOffset(I)V
+
+    iput-object p2, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    return-void
+
+    :catchall_0
+    move-exception p2
+
+    invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
+
+    throw p2
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 2
+
+    iget-object v0, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    invoke-virtual {v0}, Ln0/a/a/a/d;->f()V
+
+    iget-object v0, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    iput-object v1, v0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iput-object v1, v0, Ln0/a/a/a/d;->j:Landroid/hardware/Camera$PreviewCallback;
+
+    iget-object v0, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v0}, Landroid/hardware/Camera;->release()V
+
+    iput-object v1, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    :cond_0
+    iget-object v0, p0, Ln0/a/a/a/a;->h:Ln0/a/a/a/c;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Landroid/os/HandlerThread;->quit()Z
+
+    iput-object v1, p0, Ln0/a/a/a/a;->h:Ln0/a/a/a/c;
+
+    :cond_1
+    return-void
+.end method
+
+.method public getFlash()Z
+    .locals 3
+
+    iget-object v0, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-static {v0}, Lf/n/a/k/a;->H(Landroid/hardware/Camera;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v0}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/hardware/Camera$Parameters;->getFlashMode()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "torch"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    return v1
+.end method
+
+.method public getRotationCount()I
+    .locals 1
+
+    iget-object v0, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    invoke-virtual {v0}, Ln0/a/a/a/d;->getDisplayOrientation()I
+
+    move-result v0
+
+    div-int/lit8 v0, v0, 0x5a
+
+    return v0
+.end method
+
+.method public setAspectTolerance(F)V
+    .locals 0
+
+    iput p1, p0, Ln0/a/a/a/a;->w:F
+
+    return-void
+.end method
+
+.method public setAutoFocus(Z)V
+    .locals 1
+
+    iput-boolean p1, p0, Ln0/a/a/a/a;->j:Z
+
+    iget-object v0, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0, p1}, Ln0/a/a/a/d;->setAutoFocus(Z)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public setBorderAlpha(F)V
+    .locals 1
+
+    iput p1, p0, Ln0/a/a/a/a;->u:F
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setBorderAlpha(F)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setBorderColor(I)V
+    .locals 1
+
+    iput p1, p0, Ln0/a/a/a/a;->n:I
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setBorderColor(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setBorderCornerRadius(I)V
+    .locals 1
+
+    iput p1, p0, Ln0/a/a/a/a;->s:I
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setBorderCornerRadius(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setBorderLineLength(I)V
+    .locals 1
+
+    iput p1, p0, Ln0/a/a/a/a;->q:I
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setBorderLineLength(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setBorderStrokeWidth(I)V
+    .locals 1
+
+    iput p1, p0, Ln0/a/a/a/a;->p:I
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setBorderStrokeWidth(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setFlash(Z)V
+    .locals 2
+
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    iput-object v0, p0, Ln0/a/a/a/a;->i:Ljava/lang/Boolean;
+
+    iget-object v0, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-static {v0}, Lf/n/a/k/a;->H(Landroid/hardware/Camera;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v0}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {v0}, Landroid/hardware/Camera$Parameters;->getFlashMode()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v1, "torch"
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {v0, v1}, Landroid/hardware/Camera$Parameters;->setFlashMode(Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {v0}, Landroid/hardware/Camera$Parameters;->getFlashMode()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v1, "off"
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-virtual {v0, v1}, Landroid/hardware/Camera$Parameters;->setFlashMode(Ljava/lang/String;)V
+
+    :goto_0
+    iget-object p1, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    iget-object p1, p1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {p1, v0}, Landroid/hardware/Camera;->setParameters(Landroid/hardware/Camera$Parameters;)V
+
+    :cond_3
+    return-void
+.end method
+
+.method public setIsBorderCornerRounded(Z)V
+    .locals 1
+
+    iput-boolean p1, p0, Ln0/a/a/a/a;->r:Z
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setBorderCornerRounded(Z)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setLaserColor(I)V
+    .locals 1
+
+    iput p1, p0, Ln0/a/a/a/a;->m:I
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setLaserColor(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setLaserEnabled(Z)V
+    .locals 1
+
+    iput-boolean p1, p0, Ln0/a/a/a/a;->l:Z
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setLaserEnabled(Z)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setMaskColor(I)V
+    .locals 1
+
+    iput p1, p0, Ln0/a/a/a/a;->o:I
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setMaskColor(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setShouldScaleToFill(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Ln0/a/a/a/a;->k:Z
+
+    return-void
+.end method
+
+.method public setSquareViewFinder(Z)V
+    .locals 1
+
+    iput-boolean p1, p0, Ln0/a/a/a/a;->t:Z
+
+    iget-object v0, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    invoke-interface {v0, p1}, Ln0/a/a/a/f;->setSquareViewFinder(Z)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    return-void
+.end method
+
+.method public setupCameraPreview(Ln0/a/a/a/e;)V
+    .locals 0
+
+    iput-object p1, p0, Ln0/a/a/a/a;->d:Ln0/a/a/a/e;
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p0, p1}, Ln0/a/a/a/a;->setupLayout(Ln0/a/a/a/e;)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    check-cast p1, Ln0/a/a/a/g;
+
+    invoke-virtual {p1}, Ln0/a/a/a/g;->a()V
+
+    invoke-virtual {p1}, Landroid/view/View;->invalidate()V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->i:Ljava/lang/Boolean;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Ln0/a/a/a/a;->setFlash(Z)V
+
+    :cond_0
+    iget-boolean p1, p0, Ln0/a/a/a/a;->j:Z
+
+    invoke-virtual {p0, p1}, Ln0/a/a/a/a;->setAutoFocus(Z)V
+
+    :cond_1
+    return-void
+.end method
+
+.method public final setupLayout(Ln0/a/a/a/e;)V
+    .locals 2
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->removeAllViews()V
+
+    new-instance v0, Ln0/a/a/a/d;
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1, p1, p0}, Ln0/a/a/a/d;-><init>(Landroid/content/Context;Ln0/a/a/a/e;Landroid/hardware/Camera$PreviewCallback;)V
+
+    iput-object v0, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    iget p1, p0, Ln0/a/a/a/a;->w:F
+
+    invoke-virtual {v0, p1}, Ln0/a/a/a/d;->setAspectTolerance(F)V
+
+    iget-object p1, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    iget-boolean v0, p0, Ln0/a/a/a/a;->k:Z
+
+    invoke-virtual {p1, v0}, Ln0/a/a/a/d;->setShouldScaleToFill(Z)V
+
+    iget-boolean p1, p0, Ln0/a/a/a/a;->k:Z
+
+    if-nez p1, :cond_0
+
+    new-instance p1, Landroid/widget/RelativeLayout;
+
+    invoke-virtual {p0}, Landroid/widget/FrameLayout;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;)V
+
+    const/16 v0, 0x11
+
+    invoke-virtual {p1, v0}, Landroid/widget/RelativeLayout;->setGravity(I)V
+
+    const/high16 v0, -0x1000000
+
+    invoke-virtual {p1, v0}, Landroid/widget/RelativeLayout;->setBackgroundColor(I)V
+
+    iget-object v0, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    invoke-virtual {p1, v0}, Landroid/widget/RelativeLayout;->addView(Landroid/view/View;)V
+
+    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Ln0/a/a/a/a;->e:Ln0/a/a/a/d;
+
+    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
+
+    :goto_0
+    iget-object p1, p0, Ln0/a/a/a/a;->f:Ln0/a/a/a/f;
+
+    instance-of v0, p1, Landroid/view/View;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
+
+    return-void
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "IViewFinder object returned by \'createViewFinderView()\' should be instance of android.view.View"
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/b$a.smali b/com.discord/smali_classes2/n0/a/a/a/b$a.smali
new file mode 100644
index 0000000000..3e3c487927
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/b$a.smali
@@ -0,0 +1,71 @@
+.class public Ln0/a/a/a/b$a;
+.super Ljava/lang/Object;
+.source "CameraHandlerThread.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ln0/a/a/a/b;->run()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Landroid/hardware/Camera;
+
+.field public final synthetic e:Ln0/a/a/a/b;
+
+
+# direct methods
+.method public constructor <init>(Ln0/a/a/a/b;Landroid/hardware/Camera;)V
+    .locals 0
+
+    iput-object p1, p0, Ln0/a/a/a/b$a;->e:Ln0/a/a/a/b;
+
+    iput-object p2, p0, Ln0/a/a/a/b$a;->d:Landroid/hardware/Camera;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 4
+
+    iget-object v0, p0, Ln0/a/a/a/b$a;->e:Ln0/a/a/a/b;
+
+    iget-object v1, v0, Ln0/a/a/a/b;->e:Ln0/a/a/a/c;
+
+    iget-object v1, v1, Ln0/a/a/a/c;->d:Ln0/a/a/a/a;
+
+    iget-object v2, p0, Ln0/a/a/a/b$a;->d:Landroid/hardware/Camera;
+
+    iget v0, v0, Ln0/a/a/a/b;->d:I
+
+    if-nez v2, :cond_0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v3, Ln0/a/a/a/e;
+
+    invoke-direct {v3, v2, v0}, Ln0/a/a/a/e;-><init>(Landroid/hardware/Camera;I)V
+
+    move-object v0, v3
+
+    :goto_0
+    invoke-virtual {v1, v0}, Ln0/a/a/a/a;->setupCameraPreview(Ln0/a/a/a/e;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/b.smali b/com.discord/smali_classes2/n0/a/a/a/b.smali
new file mode 100644
index 0000000000..3e1cb7b999
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/b.smali
@@ -0,0 +1,74 @@
+.class public Ln0/a/a/a/b;
+.super Ljava/lang/Object;
+.source "CameraHandlerThread.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:I
+
+.field public final synthetic e:Ln0/a/a/a/c;
+
+
+# direct methods
+.method public constructor <init>(Ln0/a/a/a/c;I)V
+    .locals 0
+
+    iput-object p1, p0, Ln0/a/a/a/b;->e:Ln0/a/a/a/c;
+
+    iput p2, p0, Ln0/a/a/a/b;->d:I
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 3
+
+    iget v0, p0, Ln0/a/a/a/b;->d:I
+
+    const/4 v1, -0x1
+
+    if-ne v0, v1, :cond_0
+
+    :try_start_0
+    invoke-static {}, Landroid/hardware/Camera;->open()Landroid/hardware/Camera;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {v0}, Landroid/hardware/Camera;->open(I)Landroid/hardware/Camera;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    const/4 v0, 0x0
+
+    :goto_0
+    new-instance v1, Landroid/os/Handler;
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    new-instance v2, Ln0/a/a/a/b$a;
+
+    invoke-direct {v2, p0, v0}, Ln0/a/a/a/b$a;-><init>(Ln0/a/a/a/b;Landroid/hardware/Camera;)V
+
+    invoke-virtual {v1, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/c.smali b/com.discord/smali_classes2/n0/a/a/a/c.smali
new file mode 100644
index 0000000000..9a4f3bccbf
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/c.smali
@@ -0,0 +1,23 @@
+.class public Ln0/a/a/a/c;
+.super Landroid/os/HandlerThread;
+.source "CameraHandlerThread.java"
+
+
+# instance fields
+.field public d:Ln0/a/a/a/a;
+
+
+# direct methods
+.method public constructor <init>(Ln0/a/a/a/a;)V
+    .locals 1
+
+    const-string v0, "CameraHandlerThread"
+
+    invoke-direct {p0, v0}, Landroid/os/HandlerThread;-><init>(Ljava/lang/String;)V
+
+    iput-object p1, p0, Ln0/a/a/a/c;->d:Ln0/a/a/a/a;
+
+    invoke-virtual {p0}, Landroid/os/HandlerThread;->start()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/d$a.smali b/com.discord/smali_classes2/n0/a/a/a/d$a.smali
new file mode 100644
index 0000000000..9020b1d87f
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/d$a.smali
@@ -0,0 +1,62 @@
+.class public Ln0/a/a/a/d$a;
+.super Ljava/lang/Object;
+.source "CameraPreview.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ln0/a/a/a/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ln0/a/a/a/d;
+
+
+# direct methods
+.method public constructor <init>(Ln0/a/a/a/d;)V
+    .locals 0
+
+    iput-object p1, p0, Ln0/a/a/a/d$a;->d:Ln0/a/a/a/d;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 2
+
+    iget-object v0, p0, Ln0/a/a/a/d$a;->d:Ln0/a/a/a/d;
+
+    iget-object v1, v0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    if-eqz v1, :cond_0
+
+    iget-boolean v1, v0, Ln0/a/a/a/d;->f:Z
+
+    if-eqz v1, :cond_0
+
+    iget-boolean v1, v0, Ln0/a/a/a/d;->g:Z
+
+    if-eqz v1, :cond_0
+
+    iget-boolean v1, v0, Ln0/a/a/a/d;->h:Z
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0}, Ln0/a/a/a/d;->b()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/d$b.smali b/com.discord/smali_classes2/n0/a/a/a/d$b.smali
new file mode 100644
index 0000000000..8092b25e25
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/d$b.smali
@@ -0,0 +1,45 @@
+.class public Ln0/a/a/a/d$b;
+.super Ljava/lang/Object;
+.source "CameraPreview.java"
+
+# interfaces
+.implements Landroid/hardware/Camera$AutoFocusCallback;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ln0/a/a/a/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Ln0/a/a/a/d;
+
+
+# direct methods
+.method public constructor <init>(Ln0/a/a/a/d;)V
+    .locals 0
+
+    iput-object p1, p0, Ln0/a/a/a/d$b;->a:Ln0/a/a/a/d;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onAutoFocus(ZLandroid/hardware/Camera;)V
+    .locals 0
+
+    iget-object p1, p0, Ln0/a/a/a/d$b;->a:Ln0/a/a/a/d;
+
+    invoke-static {p1}, Ln0/a/a/a/d;->a(Ln0/a/a/a/d;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/d.smali b/com.discord/smali_classes2/n0/a/a/a/d.smali
new file mode 100644
index 0000000000..b64adbcb73
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/d.smali
@@ -0,0 +1,893 @@
+.class public Ln0/a/a/a/d;
+.super Landroid/view/SurfaceView;
+.source "CameraPreview.java"
+
+# interfaces
+.implements Landroid/view/SurfaceHolder$Callback;
+
+
+# instance fields
+.field public d:Ln0/a/a/a/e;
+
+.field public e:Landroid/os/Handler;
+
+.field public f:Z
+
+.field public g:Z
+
+.field public h:Z
+
+.field public i:Z
+
+.field public j:Landroid/hardware/Camera$PreviewCallback;
+
+.field public k:F
+
+.field public l:Ljava/lang/Runnable;
+
+.field public m:Landroid/hardware/Camera$AutoFocusCallback;
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;Ln0/a/a/a/e;Landroid/hardware/Camera$PreviewCallback;)V
+    .locals 1
+
+    invoke-direct {p0, p1}, Landroid/view/SurfaceView;-><init>(Landroid/content/Context;)V
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ln0/a/a/a/d;->f:Z
+
+    iput-boolean p1, p0, Ln0/a/a/a/d;->g:Z
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Ln0/a/a/a/d;->h:Z
+
+    iput-boolean p1, p0, Ln0/a/a/a/d;->i:Z
+
+    const p1, 0x3dcccccd    # 0.1f
+
+    iput p1, p0, Ln0/a/a/a/d;->k:F
+
+    new-instance p1, Ln0/a/a/a/d$a;
+
+    invoke-direct {p1, p0}, Ln0/a/a/a/d$a;-><init>(Ln0/a/a/a/d;)V
+
+    iput-object p1, p0, Ln0/a/a/a/d;->l:Ljava/lang/Runnable;
+
+    new-instance p1, Ln0/a/a/a/d$b;
+
+    invoke-direct {p1, p0}, Ln0/a/a/a/d$b;-><init>(Ln0/a/a/a/d;)V
+
+    iput-object p1, p0, Ln0/a/a/a/d;->m:Landroid/hardware/Camera$AutoFocusCallback;
+
+    iput-object p2, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iput-object p3, p0, Ln0/a/a/a/d;->j:Landroid/hardware/Camera$PreviewCallback;
+
+    new-instance p1, Landroid/os/Handler;
+
+    invoke-direct {p1}, Landroid/os/Handler;-><init>()V
+
+    iput-object p1, p0, Ln0/a/a/a/d;->e:Landroid/os/Handler;
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
+
+    move-result-object p1
+
+    invoke-interface {p1, p0}, Landroid/view/SurfaceHolder;->addCallback(Landroid/view/SurfaceHolder$Callback;)V
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
+
+    move-result-object p1
+
+    const/4 p2, 0x3
+
+    invoke-interface {p1, p2}, Landroid/view/SurfaceHolder;->setType(I)V
+
+    return-void
+.end method
+
+.method public static synthetic a(Ln0/a/a/a/d;)V
+    .locals 0
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->c()V
+
+    return-void
+.end method
+
+.method private getOptimalPreviewSize()Landroid/hardware/Camera$Size;
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    iget-object v1, v0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    return-object v2
+
+    :cond_0
+    iget-object v1, v1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v1}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Landroid/hardware/Camera$Parameters;->getSupportedPreviewSizes()Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-virtual/range {p0 .. p0}, Landroid/view/SurfaceView;->getWidth()I
+
+    move-result v3
+
+    invoke-virtual/range {p0 .. p0}, Landroid/view/SurfaceView;->getHeight()I
+
+    move-result v4
+
+    invoke-virtual/range {p0 .. p0}, Landroid/view/SurfaceView;->getContext()Landroid/content/Context;
+
+    move-result-object v5
+
+    invoke-static {v5}, Lf/n/a/k/a;->B(Landroid/content/Context;)I
+
+    move-result v5
+
+    const/4 v6, 0x1
+
+    if-ne v5, v6, :cond_1
+
+    move/from16 v17, v4
+
+    move v4, v3
+
+    move/from16 v3, v17
+
+    :cond_1
+    int-to-double v5, v3
+
+    int-to-double v7, v4
+
+    div-double/2addr v5, v7
+
+    if-nez v1, :cond_2
+
+    return-object v2
+
+    :cond_2
+    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    const-wide v7, 0x7fefffffffffffffL    # Double.MAX_VALUE
+
+    move-wide v9, v7
+
+    :cond_3
+    :goto_0
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_5
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v11
+
+    check-cast v11, Landroid/hardware/Camera$Size;
+
+    iget v12, v11, Landroid/hardware/Camera$Size;->width:I
+
+    int-to-double v12, v12
+
+    iget v14, v11, Landroid/hardware/Camera$Size;->height:I
+
+    int-to-double v14, v14
+
+    div-double/2addr v12, v14
+
+    sub-double/2addr v12, v5
+
+    invoke-static {v12, v13}, Ljava/lang/Math;->abs(D)D
+
+    move-result-wide v12
+
+    iget v14, v0, Ln0/a/a/a/d;->k:F
+
+    float-to-double v14, v14
+
+    cmpl-double v16, v12, v14
+
+    if-lez v16, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    iget v12, v11, Landroid/hardware/Camera$Size;->height:I
+
+    sub-int/2addr v12, v4
+
+    invoke-static {v12}, Ljava/lang/Math;->abs(I)I
+
+    move-result v12
+
+    int-to-double v12, v12
+
+    cmpg-double v14, v12, v9
+
+    if-gez v14, :cond_3
+
+    iget v2, v11, Landroid/hardware/Camera$Size;->height:I
+
+    sub-int/2addr v2, v4
+
+    invoke-static {v2}, Ljava/lang/Math;->abs(I)I
+
+    move-result v2
+
+    int-to-double v9, v2
+
+    move-object v2, v11
+
+    goto :goto_0
+
+    :cond_5
+    if-nez v2, :cond_7
+
+    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :cond_6
+    :goto_1
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_7
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Landroid/hardware/Camera$Size;
+
+    iget v5, v3, Landroid/hardware/Camera$Size;->height:I
+
+    sub-int/2addr v5, v4
+
+    invoke-static {v5}, Ljava/lang/Math;->abs(I)I
+
+    move-result v5
+
+    int-to-double v5, v5
+
+    cmpg-double v9, v5, v7
+
+    if-gez v9, :cond_6
+
+    iget v2, v3, Landroid/hardware/Camera$Size;->height:I
+
+    sub-int/2addr v2, v4
+
+    invoke-static {v2}, Ljava/lang/Math;->abs(I)I
+
+    move-result v2
+
+    int-to-double v5, v2
+
+    move-object v2, v3
+
+    move-wide v7, v5
+
+    goto :goto_1
+
+    :cond_7
+    return-object v2
+.end method
+
+
+# virtual methods
+.method public b()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    iget-object v1, p0, Ln0/a/a/a/d;->m:Landroid/hardware/Camera$AutoFocusCallback;
+
+    invoke-virtual {v0, v1}, Landroid/hardware/Camera;->autoFocus(Landroid/hardware/Camera$AutoFocusCallback;)V
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    invoke-virtual {p0}, Ln0/a/a/a/d;->c()V
+
+    :goto_0
+    return-void
+.end method
+
+.method public final c()V
+    .locals 4
+
+    iget-object v0, p0, Ln0/a/a/a/d;->e:Landroid/os/Handler;
+
+    iget-object v1, p0, Ln0/a/a/a/d;->l:Ljava/lang/Runnable;
+
+    const-wide/16 v2, 0x3e8
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
+
+    return-void
+.end method
+
+.method public final d(II)V
+    .locals 5
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->getDisplayOrientation()I
+
+    move-result v1
+
+    rem-int/lit16 v1, v1, 0xb4
+
+    if-nez v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    move v4, p2
+
+    move p2, p1
+
+    move p1, v4
+
+    :goto_0
+    iget-boolean v1, p0, Ln0/a/a/a/d;->i:Z
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getParent()Landroid/view/ViewParent;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/view/View;
+
+    invoke-virtual {v1}, Landroid/view/View;->getWidth()I
+
+    move-result v1
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getParent()Landroid/view/ViewParent;
+
+    move-result-object v2
+
+    check-cast v2, Landroid/view/View;
+
+    invoke-virtual {v2}, Landroid/view/View;->getHeight()I
+
+    move-result v2
+
+    int-to-float v1, v1
+
+    int-to-float p1, p1
+
+    div-float/2addr v1, p1
+
+    int-to-float v2, v2
+
+    int-to-float p2, p2
+
+    div-float/2addr v2, p2
+
+    cmpl-float v3, v1, v2
+
+    if-lez v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    move v1, v2
+
+    :goto_1
+    mul-float p1, p1, v1
+
+    invoke-static {p1}, Ljava/lang/Math;->round(F)I
+
+    move-result p1
+
+    mul-float p2, p2, v1
+
+    invoke-static {p2}, Ljava/lang/Math;->round(F)I
+
+    move-result p2
+
+    :cond_2
+    iput p1, v0, Landroid/view/ViewGroup$LayoutParams;->width:I
+
+    iput p2, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
+
+    invoke-virtual {p0, v0}, Landroid/view/SurfaceView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    return-void
+.end method
+
+.method public e()V
+    .locals 6
+
+    invoke-direct {p0}, Ln0/a/a/a/d;->getOptimalPreviewSize()Landroid/hardware/Camera$Size;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object v1, v1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v1}, Landroid/hardware/Camera;->getParameters()Landroid/hardware/Camera$Parameters;
+
+    move-result-object v1
+
+    iget v2, v0, Landroid/hardware/Camera$Size;->width:I
+
+    iget v3, v0, Landroid/hardware/Camera$Size;->height:I
+
+    invoke-virtual {v1, v2, v3}, Landroid/hardware/Camera$Parameters;->setPreviewSize(II)V
+
+    iget-object v2, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object v2, v2, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v2, v1}, Landroid/hardware/Camera;->setParameters(Landroid/hardware/Camera$Parameters;)V
+
+    new-instance v1, Landroid/graphics/Point;
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getWidth()I
+
+    move-result v2
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHeight()I
+
+    move-result v3
+
+    invoke-direct {v1, v2, v3}, Landroid/graphics/Point;-><init>(II)V
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->getDisplayOrientation()I
+
+    move-result v2
+
+    rem-int/lit16 v2, v2, 0xb4
+
+    if-nez v2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v2, Landroid/graphics/Point;
+
+    iget v3, v1, Landroid/graphics/Point;->y:I
+
+    iget v1, v1, Landroid/graphics/Point;->x:I
+
+    invoke-direct {v2, v3, v1}, Landroid/graphics/Point;-><init>(II)V
+
+    move-object v1, v2
+
+    :goto_0
+    iget v2, v0, Landroid/hardware/Camera$Size;->width:I
+
+    int-to-float v2, v2
+
+    iget v0, v0, Landroid/hardware/Camera$Size;->height:I
+
+    int-to-float v0, v0
+
+    div-float/2addr v2, v0
+
+    iget v0, v1, Landroid/graphics/Point;->x:I
+
+    int-to-float v3, v0
+
+    iget v1, v1, Landroid/graphics/Point;->y:I
+
+    int-to-float v4, v1
+
+    div-float v5, v3, v4
+
+    cmpl-float v5, v5, v2
+
+    if-lez v5, :cond_1
+
+    mul-float v4, v4, v2
+
+    float-to-int v0, v4
+
+    invoke-virtual {p0, v0, v1}, Ln0/a/a/a/d;->d(II)V
+
+    goto :goto_1
+
+    :cond_1
+    div-float/2addr v3, v2
+
+    float-to-int v1, v3
+
+    invoke-virtual {p0, v0, v1}, Ln0/a/a/a/d;->d(II)V
+
+    :goto_1
+    return-void
+.end method
+
+.method public f()V
+    .locals 3
+
+    iget-object v0, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iput-boolean v0, p0, Ln0/a/a/a/d;->f:Z
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
+
+    move-result-object v0
+
+    invoke-interface {v0, p0}, Landroid/view/SurfaceHolder;->removeCallback(Landroid/view/SurfaceHolder$Callback;)V
+
+    iget-object v0, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v0}, Landroid/hardware/Camera;->cancelAutoFocus()V
+
+    iget-object v0, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroid/hardware/Camera;->setOneShotPreviewCallback(Landroid/hardware/Camera$PreviewCallback;)V
+
+    iget-object v0, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object v0, v0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {v0}, Landroid/hardware/Camera;->stopPreview()V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    invoke-virtual {v0}, Ljava/lang/Exception;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "CameraPreview"
+
+    invoke-static {v2, v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public getDisplayOrientation()I
+    .locals 5
+
+    iget-object v0, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    new-instance v0, Landroid/hardware/Camera$CameraInfo;
+
+    invoke-direct {v0}, Landroid/hardware/Camera$CameraInfo;-><init>()V
+
+    iget-object v2, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget v2, v2, Ln0/a/a/a/e;->b:I
+
+    const/4 v3, -0x1
+
+    if-ne v2, v3, :cond_1
+
+    invoke-static {v1, v0}, Landroid/hardware/Camera;->getCameraInfo(ILandroid/hardware/Camera$CameraInfo;)V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {v2, v0}, Landroid/hardware/Camera;->getCameraInfo(ILandroid/hardware/Camera$CameraInfo;)V
+
+    :goto_0
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    const-string v3, "window"
+
+    invoke-virtual {v2, v3}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Landroid/view/WindowManager;
+
+    invoke-interface {v2}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Landroid/view/Display;->getRotation()I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    if-eqz v2, :cond_5
+
+    if-eq v2, v3, :cond_4
+
+    const/4 v4, 0x2
+
+    if-eq v2, v4, :cond_3
+
+    const/4 v4, 0x3
+
+    if-eq v2, v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/16 v1, 0x10e
+
+    goto :goto_1
+
+    :cond_3
+    const/16 v1, 0xb4
+
+    goto :goto_1
+
+    :cond_4
+    const/16 v1, 0x5a
+
+    :cond_5
+    :goto_1
+    iget v2, v0, Landroid/hardware/Camera$CameraInfo;->facing:I
+
+    if-ne v2, v3, :cond_6
+
+    iget v0, v0, Landroid/hardware/Camera$CameraInfo;->orientation:I
+
+    add-int/2addr v0, v1
+
+    rem-int/lit16 v0, v0, 0x168
+
+    rsub-int v0, v0, 0x168
+
+    rem-int/lit16 v0, v0, 0x168
+
+    goto :goto_2
+
+    :cond_6
+    iget v0, v0, Landroid/hardware/Camera$CameraInfo;->orientation:I
+
+    sub-int/2addr v0, v1
+
+    add-int/lit16 v0, v0, 0x168
+
+    rem-int/lit16 v0, v0, 0x168
+
+    :goto_2
+    return v0
+.end method
+
+.method public setAspectTolerance(F)V
+    .locals 0
+
+    iput p1, p0, Ln0/a/a/a/d;->k:F
+
+    return-void
+.end method
+
+.method public setAutoFocus(Z)V
+    .locals 1
+
+    iget-object v0, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    if-eqz v0, :cond_3
+
+    iget-boolean v0, p0, Ln0/a/a/a/d;->f:Z
+
+    if-eqz v0, :cond_3
+
+    iget-boolean v0, p0, Ln0/a/a/a/d;->g:Z
+
+    if-ne p1, v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iput-boolean p1, p0, Ln0/a/a/a/d;->g:Z
+
+    const-string v0, "CameraPreview"
+
+    if-eqz p1, :cond_2
+
+    iget-boolean p1, p0, Ln0/a/a/a/d;->h:Z
+
+    if-eqz p1, :cond_1
+
+    const-string p1, "Starting autofocus"
+
+    invoke-static {v0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->b()V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ln0/a/a/a/d;->c()V
+
+    goto :goto_0
+
+    :cond_2
+    const-string p1, "Cancelling autofocus"
+
+    invoke-static {v0, p1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
+
+    iget-object p1, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object p1, p1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {p1}, Landroid/hardware/Camera;->cancelAutoFocus()V
+
+    :cond_3
+    :goto_0
+    return-void
+.end method
+
+.method public setShouldScaleToFill(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Ln0/a/a/a/d;->i:Z
+
+    return-void
+.end method
+
+.method public surfaceChanged(Landroid/view/SurfaceHolder;III)V
+    .locals 0
+
+    invoke-interface {p1}, Landroid/view/SurfaceHolder;->getSurface()Landroid/view/Surface;
+
+    move-result-object p1
+
+    if-nez p1, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Ln0/a/a/a/d;->f()V
+
+    iget-object p1, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    if-eqz p1, :cond_2
+
+    :try_start_0
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
+
+    move-result-object p1
+
+    invoke-interface {p1, p0}, Landroid/view/SurfaceHolder;->addCallback(Landroid/view/SurfaceHolder$Callback;)V
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ln0/a/a/a/d;->f:Z
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->e()V
+
+    iget-object p1, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object p1, p1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {p0}, Landroid/view/SurfaceView;->getHolder()Landroid/view/SurfaceHolder;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Landroid/hardware/Camera;->setPreviewDisplay(Landroid/view/SurfaceHolder;)V
+
+    iget-object p1, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object p1, p1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->getDisplayOrientation()I
+
+    move-result p2
+
+    invoke-virtual {p1, p2}, Landroid/hardware/Camera;->setDisplayOrientation(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object p1, p1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    iget-object p2, p0, Ln0/a/a/a/d;->j:Landroid/hardware/Camera$PreviewCallback;
+
+    invoke-virtual {p1, p2}, Landroid/hardware/Camera;->setOneShotPreviewCallback(Landroid/hardware/Camera$PreviewCallback;)V
+
+    iget-object p1, p0, Ln0/a/a/a/d;->d:Ln0/a/a/a/e;
+
+    iget-object p1, p1, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    invoke-virtual {p1}, Landroid/hardware/Camera;->startPreview()V
+
+    iget-boolean p1, p0, Ln0/a/a/a/d;->g:Z
+
+    if-eqz p1, :cond_2
+
+    iget-boolean p1, p0, Ln0/a/a/a/d;->h:Z
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->b()V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ln0/a/a/a/d;->c()V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    invoke-virtual {p1}, Ljava/lang/Exception;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string p3, "CameraPreview"
+
+    invoke-static {p3, p2, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
+
+.method public surfaceCreated(Landroid/view/SurfaceHolder;)V
+    .locals 0
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ln0/a/a/a/d;->h:Z
+
+    return-void
+.end method
+
+.method public surfaceDestroyed(Landroid/view/SurfaceHolder;)V
+    .locals 0
+
+    const/4 p1, 0x0
+
+    iput-boolean p1, p0, Ln0/a/a/a/d;->h:Z
+
+    invoke-virtual {p0}, Ln0/a/a/a/d;->f()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/e.smali b/com.discord/smali_classes2/n0/a/a/a/e.smali
new file mode 100644
index 0000000000..e6ab3907bb
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/e.smali
@@ -0,0 +1,27 @@
+.class public Ln0/a/a/a/e;
+.super Ljava/lang/Object;
+.source "CameraWrapper.java"
+
+
+# instance fields
+.field public final a:Landroid/hardware/Camera;
+
+.field public final b:I
+
+
+# direct methods
+.method public constructor <init>(Landroid/hardware/Camera;I)V
+    .locals 0
+    .param p1    # Landroid/hardware/Camera;
+        .annotation build Landroidx/annotation/NonNull;
+        .end annotation
+    .end param
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ln0/a/a/a/e;->a:Landroid/hardware/Camera;
+
+    iput p2, p0, Ln0/a/a/a/e;->b:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/f.smali b/com.discord/smali_classes2/n0/a/a/a/f.smali
new file mode 100644
index 0000000000..c07ace274d
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/f.smali
@@ -0,0 +1,44 @@
+.class public interface abstract Ln0/a/a/a/f;
+.super Ljava/lang/Object;
+.source "IViewFinder.java"
+
+
+# virtual methods
+.method public abstract getFramingRect()Landroid/graphics/Rect;
+.end method
+
+.method public abstract getHeight()I
+.end method
+
+.method public abstract getWidth()I
+.end method
+
+.method public abstract setBorderAlpha(F)V
+.end method
+
+.method public abstract setBorderColor(I)V
+.end method
+
+.method public abstract setBorderCornerRadius(I)V
+.end method
+
+.method public abstract setBorderCornerRounded(Z)V
+.end method
+
+.method public abstract setBorderLineLength(I)V
+.end method
+
+.method public abstract setBorderStrokeWidth(I)V
+.end method
+
+.method public abstract setLaserColor(I)V
+.end method
+
+.method public abstract setLaserEnabled(Z)V
+.end method
+
+.method public abstract setMaskColor(I)V
+.end method
+
+.method public abstract setSquareViewFinder(Z)V
+.end method
diff --git a/com.discord/smali_classes2/n0/a/a/a/g.smali b/com.discord/smali_classes2/n0/a/a/a/g.smali
new file mode 100644
index 0000000000..14a46d20cf
--- /dev/null
+++ b/com.discord/smali_classes2/n0/a/a/a/g.smali
@@ -0,0 +1,907 @@
+.class public Ln0/a/a/a/g;
+.super Landroid/view/View;
+.source "ViewFinderView.java"
+
+# interfaces
+.implements Ln0/a/a/a/f;
+
+
+# static fields
+.field public static final r:[I
+
+
+# instance fields
+.field public d:Landroid/graphics/Rect;
+
+.field public e:I
+
+.field public final f:I
+
+.field public final g:I
+
+.field public final h:I
+
+.field public final i:I
+
+.field public final j:I
+
+.field public k:Landroid/graphics/Paint;
+
+.field public l:Landroid/graphics/Paint;
+
+.field public m:Landroid/graphics/Paint;
+
+.field public n:I
+
+.field public o:Z
+
+.field public p:Z
+
+.field public q:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/16 v0, 0x8
+
+    new-array v0, v0, [I
+
+    fill-array-data v0, :array_0
+
+    sput-object v0, Ln0/a/a/a/g;->r:[I
+
+    return-void
+
+    :array_0
+    .array-data 4
+        0x0
+        0x40
+        0x80
+        0xc0
+        0xff
+        0xc0
+        0x80
+        0x40
+    .end array-data
+.end method
+
+.method public constructor <init>(Landroid/content/Context;)V
+    .locals 1
+
+    invoke-direct {p0, p1}, Landroid/view/View;-><init>(Landroid/content/Context;)V
+
+    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p1
+
+    sget v0, Lme/dm7/barcodescanner/core/R$a;->viewfinder_laser:I
+
+    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getColor(I)I
+
+    move-result p1
+
+    iput p1, p0, Ln0/a/a/a/g;->f:I
+
+    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p1
+
+    sget v0, Lme/dm7/barcodescanner/core/R$a;->viewfinder_mask:I
+
+    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getColor(I)I
+
+    move-result p1
+
+    iput p1, p0, Ln0/a/a/a/g;->g:I
+
+    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p1
+
+    sget v0, Lme/dm7/barcodescanner/core/R$a;->viewfinder_border:I
+
+    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getColor(I)I
+
+    move-result p1
+
+    iput p1, p0, Ln0/a/a/a/g;->h:I
+
+    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p1
+
+    sget v0, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_width:I
+
+    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getInteger(I)I
+
+    move-result p1
+
+    iput p1, p0, Ln0/a/a/a/g;->i:I
+
+    invoke-virtual {p0}, Landroid/view/View;->getResources()Landroid/content/res/Resources;
+
+    move-result-object p1
+
+    sget v0, Lme/dm7/barcodescanner/core/R$b;->viewfinder_border_length:I
+
+    invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getInteger(I)I
+
+    move-result p1
+
+    iput p1, p0, Ln0/a/a/a/g;->j:I
+
+    const/4 p1, 0x0
+
+    iput p1, p0, Ln0/a/a/a/g;->q:I
+
+    new-instance p1, Landroid/graphics/Paint;
+
+    invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
+
+    iput-object p1, p0, Ln0/a/a/a/g;->k:Landroid/graphics/Paint;
+
+    iget v0, p0, Ln0/a/a/a/g;->f:I
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setColor(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/g;->k:Landroid/graphics/Paint;
+
+    sget-object v0, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style;
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
+
+    new-instance p1, Landroid/graphics/Paint;
+
+    invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
+
+    iput-object p1, p0, Ln0/a/a/a/g;->l:Landroid/graphics/Paint;
+
+    iget v0, p0, Ln0/a/a/a/g;->g:I
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setColor(I)V
+
+    new-instance p1, Landroid/graphics/Paint;
+
+    invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
+
+    iput-object p1, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    iget v0, p0, Ln0/a/a/a/g;->h:I
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setColor(I)V
+
+    iget-object p1, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    sget-object v0, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V
+
+    iget-object p1, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    iget v0, p0, Ln0/a/a/a/g;->i:I
+
+    int-to-float v0, v0
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStrokeWidth(F)V
+
+    iget-object p1, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setAntiAlias(Z)V
+
+    iget p1, p0, Ln0/a/a/a/g;->j:I
+
+    iput p1, p0, Ln0/a/a/a/g;->n:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public declared-synchronized a()V
+    .locals 8
+
+    monitor-enter p0
+
+    :try_start_0
+    new-instance v0, Landroid/graphics/Point;
+
+    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
+
+    move-result v1
+
+    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
+
+    move-result v2
+
+    invoke-direct {v0, v1, v2}, Landroid/graphics/Point;-><init>(II)V
+
+    invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->B(Landroid/content/Context;)I
+
+    move-result v1
+
+    iget-boolean v2, p0, Ln0/a/a/a/g;->o:Z
+
+    const/4 v3, 0x1
+
+    const/high16 v4, 0x3f200000    # 0.625f
+
+    if-eqz v2, :cond_1
+
+    if-eq v1, v3, :cond_0
+
+    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
+
+    move-result v1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
+
+    move-result v1
+
+    :goto_0
+    int-to-float v1, v1
+
+    mul-float v1, v1, v4
+
+    float-to-int v1, v1
+
+    move v2, v1
+
+    goto :goto_1
+
+    :cond_1
+    if-eq v1, v3, :cond_2
+
+    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
+
+    move-result v1
+
+    int-to-float v1, v1
+
+    mul-float v1, v1, v4
+
+    float-to-int v1, v1
+
+    const v2, 0x3fb33333    # 1.4f
+
+    int-to-float v3, v1
+
+    mul-float v3, v3, v2
+
+    float-to-int v2, v3
+
+    move v7, v2
+
+    move v2, v1
+
+    move v1, v7
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
+
+    move-result v1
+
+    int-to-float v1, v1
+
+    const/high16 v2, 0x3f400000    # 0.75f
+
+    mul-float v1, v1, v2
+
+    float-to-int v1, v1
+
+    int-to-float v3, v1
+
+    mul-float v3, v3, v2
+
+    float-to-int v2, v3
+
+    :goto_1
+    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
+
+    move-result v3
+
+    if-le v1, v3, :cond_3
+
+    invoke-virtual {p0}, Landroid/view/View;->getWidth()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, -0x32
+
+    :cond_3
+    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
+
+    move-result v3
+
+    if-le v2, v3, :cond_4
+
+    invoke-virtual {p0}, Landroid/view/View;->getHeight()I
+
+    move-result v2
+
+    add-int/lit8 v2, v2, -0x32
+
+    :cond_4
+    iget v3, v0, Landroid/graphics/Point;->x:I
+
+    sub-int/2addr v3, v1
+
+    div-int/lit8 v3, v3, 0x2
+
+    iget v0, v0, Landroid/graphics/Point;->y:I
+
+    sub-int/2addr v0, v2
+
+    div-int/lit8 v0, v0, 0x2
+
+    new-instance v4, Landroid/graphics/Rect;
+
+    iget v5, p0, Ln0/a/a/a/g;->q:I
+
+    add-int/2addr v5, v3
+
+    iget v6, p0, Ln0/a/a/a/g;->q:I
+
+    add-int/2addr v6, v0
+
+    add-int/2addr v3, v1
+
+    iget v1, p0, Ln0/a/a/a/g;->q:I
+
+    sub-int/2addr v3, v1
+
+    add-int/2addr v0, v2
+
+    iget v1, p0, Ln0/a/a/a/g;->q:I
+
+    sub-int/2addr v0, v1
+
+    invoke-direct {v4, v5, v6, v3, v0}, Landroid/graphics/Rect;-><init>(IIII)V
+
+    iput-object v4, p0, Ln0/a/a/a/g;->d:Landroid/graphics/Rect;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public getFramingRect()Landroid/graphics/Rect;
+    .locals 1
+
+    iget-object v0, p0, Ln0/a/a/a/g;->d:Landroid/graphics/Rect;
+
+    return-object v0
+.end method
+
+.method public onDraw(Landroid/graphics/Canvas;)V
+    .locals 11
+
+    invoke-virtual {p0}, Ln0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p1}, Landroid/graphics/Canvas;->getWidth()I
+
+    move-result v0
+
+    invoke-virtual {p1}, Landroid/graphics/Canvas;->getHeight()I
+
+    move-result v7
+
+    invoke-virtual {p0}, Ln0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
+
+    move-result-object v8
+
+    int-to-float v9, v0
+
+    iget v0, v8, Landroid/graphics/Rect;->top:I
+
+    int-to-float v4, v0
+
+    iget-object v5, p0, Ln0/a/a/a/g;->l:Landroid/graphics/Paint;
+
+    const/4 v1, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v2, 0x0
+
+    move-object v0, p1
+
+    move v3, v9
+
+    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    iget v0, v8, Landroid/graphics/Rect;->top:I
+
+    int-to-float v2, v0
+
+    iget v0, v8, Landroid/graphics/Rect;->left:I
+
+    int-to-float v3, v0
+
+    iget v0, v8, Landroid/graphics/Rect;->bottom:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    int-to-float v4, v0
+
+    iget-object v5, p0, Ln0/a/a/a/g;->l:Landroid/graphics/Paint;
+
+    move-object v0, p1
+
+    move v1, v10
+
+    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    iget v0, v8, Landroid/graphics/Rect;->right:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    int-to-float v1, v0
+
+    iget v0, v8, Landroid/graphics/Rect;->top:I
+
+    int-to-float v2, v0
+
+    iget v0, v8, Landroid/graphics/Rect;->bottom:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    int-to-float v4, v0
+
+    iget-object v5, p0, Ln0/a/a/a/g;->l:Landroid/graphics/Paint;
+
+    move-object v0, p1
+
+    move v3, v9
+
+    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    iget v0, v8, Landroid/graphics/Rect;->bottom:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    int-to-float v2, v0
+
+    int-to-float v4, v7
+
+    iget-object v5, p0, Ln0/a/a/a/g;->l:Landroid/graphics/Paint;
+
+    const/4 v1, 0x0
+
+    move-object v0, p1
+
+    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    invoke-virtual {p0}, Ln0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
+
+    move-result-object v0
+
+    new-instance v1, Landroid/graphics/Path;
+
+    invoke-direct {v1}, Landroid/graphics/Path;-><init>()V
+
+    iget v2, v0, Landroid/graphics/Rect;->left:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->top:I
+
+    iget v4, p0, Ln0/a/a/a/g;->n:I
+
+    add-int/2addr v3, v4
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->left:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->top:I
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->left:I
+
+    iget v3, p0, Ln0/a/a/a/g;->n:I
+
+    add-int/2addr v2, v3
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->top:I
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget-object v2, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+
+    iget v2, v0, Landroid/graphics/Rect;->right:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->top:I
+
+    iget v4, p0, Ln0/a/a/a/g;->n:I
+
+    add-int/2addr v3, v4
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->right:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->top:I
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->right:I
+
+    iget v3, p0, Ln0/a/a/a/g;->n:I
+
+    sub-int/2addr v2, v3
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->top:I
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget-object v2, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+
+    iget v2, v0, Landroid/graphics/Rect;->right:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->bottom:I
+
+    iget v4, p0, Ln0/a/a/a/g;->n:I
+
+    sub-int/2addr v3, v4
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->right:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->bottom:I
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->right:I
+
+    iget v3, p0, Ln0/a/a/a/g;->n:I
+
+    sub-int/2addr v2, v3
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->bottom:I
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget-object v2, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+
+    iget v2, v0, Landroid/graphics/Rect;->left:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->bottom:I
+
+    iget v4, p0, Ln0/a/a/a/g;->n:I
+
+    sub-int/2addr v3, v4
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->moveTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->left:I
+
+    int-to-float v2, v2
+
+    iget v3, v0, Landroid/graphics/Rect;->bottom:I
+
+    int-to-float v3, v3
+
+    invoke-virtual {v1, v2, v3}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget v2, v0, Landroid/graphics/Rect;->left:I
+
+    iget v3, p0, Ln0/a/a/a/g;->n:I
+
+    add-int/2addr v2, v3
+
+    int-to-float v2, v2
+
+    iget v0, v0, Landroid/graphics/Rect;->bottom:I
+
+    int-to-float v0, v0
+
+    invoke-virtual {v1, v2, v0}, Landroid/graphics/Path;->lineTo(FF)V
+
+    iget-object v0, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    invoke-virtual {p1, v1, v0}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
+
+    iget-boolean v0, p0, Ln0/a/a/a/g;->p:Z
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0}, Ln0/a/a/a/g;->getFramingRect()Landroid/graphics/Rect;
+
+    move-result-object v7
+
+    iget-object v0, p0, Ln0/a/a/a/g;->k:Landroid/graphics/Paint;
+
+    sget-object v1, Ln0/a/a/a/g;->r:[I
+
+    iget v2, p0, Ln0/a/a/a/g;->e:I
+
+    aget v1, v1, v2
+
+    invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setAlpha(I)V
+
+    iget v0, p0, Ln0/a/a/a/g;->e:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    sget-object v1, Ln0/a/a/a/g;->r:[I
+
+    array-length v1, v1
+
+    rem-int/2addr v0, v1
+
+    iput v0, p0, Ln0/a/a/a/g;->e:I
+
+    invoke-virtual {v7}, Landroid/graphics/Rect;->height()I
+
+    move-result v0
+
+    div-int/lit8 v0, v0, 0x2
+
+    iget v1, v7, Landroid/graphics/Rect;->top:I
+
+    add-int/2addr v0, v1
+
+    iget v1, v7, Landroid/graphics/Rect;->left:I
+
+    add-int/lit8 v1, v1, 0x2
+
+    int-to-float v1, v1
+
+    add-int/lit8 v2, v0, -0x1
+
+    int-to-float v2, v2
+
+    iget v3, v7, Landroid/graphics/Rect;->right:I
+
+    add-int/lit8 v3, v3, -0x1
+
+    int-to-float v3, v3
+
+    add-int/lit8 v0, v0, 0x2
+
+    int-to-float v4, v0
+
+    iget-object v5, p0, Ln0/a/a/a/g;->k:Landroid/graphics/Paint;
+
+    move-object v0, p1
+
+    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    iget v0, v7, Landroid/graphics/Rect;->left:I
+
+    add-int/lit8 v3, v0, -0xa
+
+    iget v0, v7, Landroid/graphics/Rect;->top:I
+
+    add-int/lit8 v4, v0, -0xa
+
+    iget v0, v7, Landroid/graphics/Rect;->right:I
+
+    add-int/lit8 v5, v0, 0xa
+
+    iget v0, v7, Landroid/graphics/Rect;->bottom:I
+
+    add-int/lit8 v6, v0, 0xa
+
+    const-wide/16 v1, 0x50
+
+    move-object v0, p0
+
+    invoke-virtual/range {v0 .. v6}, Landroid/view/View;->postInvalidateDelayed(JIIII)V
+
+    :cond_1
+    return-void
+.end method
+
+.method public onSizeChanged(IIII)V
+    .locals 0
+
+    invoke-virtual {p0}, Ln0/a/a/a/g;->a()V
+
+    return-void
+.end method
+
+.method public setBorderAlpha(F)V
+    .locals 1
+
+    const/high16 v0, 0x437f0000    # 255.0f
+
+    mul-float p1, p1, v0
+
+    float-to-int p1, p1
+
+    iget-object v0, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setAlpha(I)V
+
+    return-void
+.end method
+
+.method public setBorderColor(I)V
+    .locals 1
+
+    iget-object v0, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
+
+    return-void
+.end method
+
+.method public setBorderCornerRadius(I)V
+    .locals 2
+
+    iget-object v0, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    new-instance v1, Landroid/graphics/CornerPathEffect;
+
+    int-to-float p1, p1
+
+    invoke-direct {v1, p1}, Landroid/graphics/CornerPathEffect;-><init>(F)V
+
+    invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setPathEffect(Landroid/graphics/PathEffect;)Landroid/graphics/PathEffect;
+
+    return-void
+.end method
+
+.method public setBorderCornerRounded(Z)V
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    sget-object v0, Landroid/graphics/Paint$Join;->ROUND:Landroid/graphics/Paint$Join;
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStrokeJoin(Landroid/graphics/Paint$Join;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    sget-object v0, Landroid/graphics/Paint$Join;->BEVEL:Landroid/graphics/Paint$Join;
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setStrokeJoin(Landroid/graphics/Paint$Join;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public setBorderLineLength(I)V
+    .locals 0
+
+    iput p1, p0, Ln0/a/a/a/g;->n:I
+
+    return-void
+.end method
+
+.method public setBorderStrokeWidth(I)V
+    .locals 1
+
+    iget-object v0, p0, Ln0/a/a/a/g;->m:Landroid/graphics/Paint;
+
+    int-to-float p1, p1
+
+    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
+
+    return-void
+.end method
+
+.method public setLaserColor(I)V
+    .locals 1
+
+    iget-object v0, p0, Ln0/a/a/a/g;->k:Landroid/graphics/Paint;
+
+    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
+
+    return-void
+.end method
+
+.method public setLaserEnabled(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Ln0/a/a/a/g;->p:Z
+
+    return-void
+.end method
+
+.method public setMaskColor(I)V
+    .locals 1
+
+    iget-object v0, p0, Ln0/a/a/a/g;->l:Landroid/graphics/Paint;
+
+    invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
+
+    return-void
+.end method
+
+.method public setSquareViewFinder(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Ln0/a/a/a/g;->o:Z
+
+    return-void
+.end method
+
+.method public setViewFinderOffset(I)V
+    .locals 0
+
+    iput p1, p0, Ln0/a/a/a/g;->q:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/n0/a0$a.smali b/com.discord/smali_classes2/n0/a0$a.smali
deleted file mode 100644
index 6fce3f60b8..0000000000
--- a/com.discord/smali_classes2/n0/a0$a.smali
+++ /dev/null
@@ -1,507 +0,0 @@
-.class public Ln0/a0$a;
-.super Ljava/lang/Object;
-.source "Request.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/a0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Ln0/w;
-
-.field public b:Ljava/lang/String;
-
-.field public c:Lokhttp3/Headers$a;
-
-.field public d:Lokhttp3/RequestBody;
-
-.field public e:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
-
-    iput-object v0, p0, Ln0/a0$a;->e:Ljava/util/Map;
-
-    const-string v0, "GET"
-
-    iput-object v0, p0, Ln0/a0$a;->b:Ljava/lang/String;
-
-    new-instance v0, Lokhttp3/Headers$a;
-
-    invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
-
-    iput-object v0, p0, Ln0/a0$a;->c:Lokhttp3/Headers$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ln0/a0;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
-
-    iput-object v0, p0, Ln0/a0$a;->e:Ljava/util/Map;
-
-    iget-object v0, p1, Ln0/a0;->b:Ln0/w;
-
-    iput-object v0, p0, Ln0/a0$a;->a:Ln0/w;
-
-    iget-object v0, p1, Ln0/a0;->c:Ljava/lang/String;
-
-    iput-object v0, p0, Ln0/a0$a;->b:Ljava/lang/String;
-
-    iget-object v0, p1, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    iput-object v0, p0, Ln0/a0$a;->d:Lokhttp3/RequestBody;
-
-    iget-object v0, p1, Ln0/a0;->f:Ljava/util/Map;
-
-    invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p1, Ln0/a0;->f:Ljava/util/Map;
-
-    invoke-static {v0}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
-
-    move-result-object v0
-
-    :goto_0
-    iput-object v0, p0, Ln0/a0$a;->e:Ljava/util/Map;
-
-    iget-object p1, p1, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {p1}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/a0$a;->c:Lokhttp3/Headers$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    iget-object v0, p0, Ln0/a0$a;->c:Lokhttp3/Headers$a;
-
-    invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public b()Ln0/a0;
-    .locals 7
-
-    iget-object v1, p0, Ln0/a0$a;->a:Ln0/w;
-
-    if-eqz v1, :cond_0
-
-    iget-object v2, p0, Ln0/a0$a;->b:Ljava/lang/String;
-
-    iget-object v0, p0, Ln0/a0$a;->c:Lokhttp3/Headers$a;
-
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v3
-
-    iget-object v4, p0, Ln0/a0$a;->d:Lokhttp3/RequestBody;
-
-    iget-object v0, p0, Ln0/a0$a;->e:Ljava/util/Map;
-
-    invoke-static {v0}, Ln0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
-
-    move-result-object v5
-
-    new-instance v6, Ln0/a0;
-
-    move-object v0, v6
-
-    invoke-direct/range {v0 .. v5}, Ln0/a0;-><init>(Ln0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
-
-    return-object v6
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "url == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    iget-object v0, p0, Ln0/a0$a;->c:Lokhttp3/Headers$a;
-
-    invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
-    .locals 3
-
-    if-eqz p1, :cond_7
-
-    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-lez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_6
-
-    const-string v0, "method "
-
-    if-nez p2, :cond_4
-
-    const-string v2, "POST"
-
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    const-string v2, "PUT"
-
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    const-string v2, "PATCH"
-
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    const-string v2, "PROPPATCH"
-
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    const-string v2, "REPORT"
-
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    :cond_1
-    const/4 v1, 0x1
-
-    :cond_2
-    xor-int/lit8 v1, v1, 0x1
-
-    if-eqz v1, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const-string p2, " must have a request body."
-
-    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_4
-    invoke-static {p1}, Ln0/g0/e/f;->a(Ljava/lang/String;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    :goto_1
-    iput-object p1, p0, Ln0/a0$a;->b:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/a0$a;->d:Lokhttp3/RequestBody;
-
-    return-object p0
-
-    :cond_5
-    const-string p2, " must not have a request body."
-
-    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_6
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "method.isEmpty() == true"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_7
-    const-string p1, "method"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public e(Ljava/lang/String;)Ln0/a0$a;
-    .locals 1
-
-    iget-object v0, p0, Ln0/a0$a;->c:Lokhttp3/Headers$a;
-
-    invoke-virtual {v0, p1}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    return-object p0
-.end method
-
-.method public f(Ljava/lang/String;)Ln0/a0$a;
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    const-string v1, "ws:"
-
-    const/4 v2, 0x1
-
-    invoke-static {p1, v1, v2}, Lj0/t/k;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    const-string v3, "(this as java.lang.String).substring(startIndex)"
-
-    if-eqz v1, :cond_0
-
-    const-string v1, "http:"
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    const/4 v2, 0x3
-
-    invoke-virtual {p1, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "wss:"
-
-    invoke-static {p1, v1, v2}, Lj0/t/k;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    const-string v1, "https:"
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    const/4 v2, 0x4
-
-    invoke-virtual {p1, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    :cond_1
-    :goto_0
-    if-eqz p1, :cond_2
-
-    new-instance v1, Ln0/w$a;
-
-    invoke-direct {v1}, Ln0/w$a;-><init>()V
-
-    invoke-virtual {v1, v0, p1}, Ln0/w$a;->e(Ln0/w;Ljava/lang/String;)Ln0/w$a;
-
-    invoke-virtual {v1}, Ln0/w$a;->b()Ln0/w;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/a0$a;->a:Ln0/w;
-
-    return-object p0
-
-    :cond_2
-    const-string p1, "$this$toHttpUrl"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public g(Ln0/w;)Ln0/a0$a;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    iput-object p1, p0, Ln0/a0$a;->a:Ln0/w;
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/a0.smali b/com.discord/smali_classes2/n0/a0.smali
deleted file mode 100644
index e90a5da2d3..0000000000
--- a/com.discord/smali_classes2/n0/a0.smali
+++ /dev/null
@@ -1,274 +0,0 @@
-.class public final Ln0/a0;
-.super Ljava/lang/Object;
-.source "Request.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/a0$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Ln0/e;
-
-.field public final b:Ln0/w;
-
-.field public final c:Ljava/lang/String;
-
-.field public final d:Lokhttp3/Headers;
-
-.field public final e:Lokhttp3/RequestBody;
-
-.field public final f:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ln0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/w;",
-            "Ljava/lang/String;",
-            "Lokhttp3/Headers;",
-            "Lokhttp3/RequestBody;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Class<",
-            "*>;+",
-            "Ljava/lang/Object;",
-            ">;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p5, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/a0;->b:Ln0/w;
-
-    iput-object p2, p0, Ln0/a0;->c:Ljava/lang/String;
-
-    iput-object p3, p0, Ln0/a0;->d:Lokhttp3/Headers;
-
-    iput-object p4, p0, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    iput-object p5, p0, Ln0/a0;->f:Ljava/util/Map;
-
-    return-void
-
-    :cond_0
-    const-string p1, "tags"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "headers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "method"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a()Ln0/e;
-    .locals 2
-
-    iget-object v0, p0, Ln0/a0;->a:Ln0/e;
-
-    if-nez v0, :cond_0
-
-    sget-object v0, Ln0/e;->n:Ln0/e$a;
-
-    iget-object v1, p0, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {v0, v1}, Ln0/e$a;->b(Lokhttp3/Headers;)Ln0/e;
-
-    move-result-object v0
-
-    iput-object v0, p0, Ln0/a0;->a:Ln0/e;
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public final b(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {v0, p1}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 6
-
-    const-string v0, "Request{method="
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", url="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {v1}, Lokhttp3/Headers;->size()I
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    const-string v1, ", headers=["
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/a0;->d:Lokhttp3/Headers;
-
-    const/4 v2, 0x0
-
-    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 v3
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    add-int/lit8 v4, v2, 0x1
-
-    if-ltz v2, :cond_1
-
-    check-cast v3, Lkotlin/Pair;
-
-    iget-object v5, v3, Lkotlin/Pair;->first:Ljava/lang/Object;
-
-    check-cast v5, Ljava/lang/String;
-
-    iget-object v3, v3, Lkotlin/Pair;->second:Ljava/lang/Object;
-
-    check-cast v3, Ljava/lang/String;
-
-    if-lez v2, :cond_0
-
-    const-string v2, ", "
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_0
-    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x3a
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move v2, v4
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :cond_3
-    iget-object v1, p0, Ln0/a0;->f:Ljava/util/Map;
-
-    invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
-
-    move-result v1
-
-    xor-int/lit8 v1, v1, 0x1
-
-    if-eqz v1, :cond_4
-
-    const-string v1, ", tags="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/a0;->f:Ljava/util/Map;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    :cond_4
-    const/16 v1, 0x7d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/b$a.smali b/com.discord/smali_classes2/n0/b$a.smali
deleted file mode 100644
index 8095feac2c..0000000000
--- a/com.discord/smali_classes2/n0/b$a.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final Ln0/b$a;
-.super Ljava/lang/Object;
-.source "Authenticator.kt"
-
-# interfaces
-.implements Ln0/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ln0/e0;Lokhttp3/Response;)Ln0/a0;
-    .locals 0
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const-string p2, "response"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/b0.smali b/com.discord/smali_classes2/n0/b0.smali
deleted file mode 100644
index 41da44a07d..0000000000
--- a/com.discord/smali_classes2/n0/b0.smali
+++ /dev/null
@@ -1,103 +0,0 @@
-.class public final Ln0/b0;
-.super Lokhttp3/RequestBody;
-.source "RequestBody.kt"
-
-
-# instance fields
-.field public final synthetic a:Ljava/io/File;
-
-.field public final synthetic b:Lokhttp3/MediaType;
-
-
-# direct methods
-.method public constructor <init>(Ljava/io/File;Lokhttp3/MediaType;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/b0;->a:Ljava/io/File;
-
-    iput-object p2, p0, Ln0/b0;->b:Lokhttp3/MediaType;
-
-    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public contentLength()J
-    .locals 2
-
-    iget-object v0, p0, Ln0/b0;->a:Ljava/io/File;
-
-    invoke-virtual {v0}, Ljava/io/File;->length()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public contentType()Lokhttp3/MediaType;
-    .locals 1
-
-    iget-object v0, p0, Ln0/b0;->b:Lokhttp3/MediaType;
-
-    return-object v0
-.end method
-
-.method public writeTo(Lokio/BufferedSink;)V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    iget-object v1, p0, Ln0/b0;->a:Ljava/io/File;
-
-    if-eqz v1, :cond_0
-
-    new-instance v2, Ljava/io/FileInputStream;
-
-    invoke-direct {v2, v1}, Ljava/io/FileInputStream;-><init>(Ljava/io/File;)V
-
-    invoke-static {v2}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
-
-    move-result-object v1
-
-    :try_start_0
-    invoke-interface {p1, v1}, Lokio/BufferedSink;->i0(Lo0/w;)J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-static {v1, v0}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    invoke-static {v1, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/c.smali b/com.discord/smali_classes2/n0/c.smali
deleted file mode 100644
index c56f6d99c6..0000000000
--- a/com.discord/smali_classes2/n0/c.smali
+++ /dev/null
@@ -1,31 +0,0 @@
-.class public interface abstract Ln0/c;
-.super Ljava/lang/Object;
-.source "Authenticator.kt"
-
-
-# static fields
-.field public static final a:Ln0/c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/b$a;
-
-    invoke-direct {v0}, Ln0/b$a;-><init>()V
-
-    sput-object v0, Ln0/c;->a:Ln0/c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ln0/e0;Lokhttp3/Response;)Ln0/a0;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/c0.smali b/com.discord/smali_classes2/n0/c0.smali
deleted file mode 100644
index 8ad7886aed..0000000000
--- a/com.discord/smali_classes2/n0/c0.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public final Ln0/c0;
-.super Lokhttp3/RequestBody;
-.source "RequestBody.kt"
-
-
-# instance fields
-.field public final synthetic a:Lokio/ByteString;
-
-.field public final synthetic b:Lokhttp3/MediaType;
-
-
-# direct methods
-.method public constructor <init>(Lokio/ByteString;Lokhttp3/MediaType;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/c0;->a:Lokio/ByteString;
-
-    iput-object p2, p0, Ln0/c0;->b:Lokhttp3/MediaType;
-
-    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public contentLength()J
-    .locals 2
-
-    iget-object v0, p0, Ln0/c0;->a:Lokio/ByteString;
-
-    invoke-virtual {v0}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    int-to-long v0, v0
-
-    return-wide v0
-.end method
-
-.method public contentType()Lokhttp3/MediaType;
-    .locals 1
-
-    iget-object v0, p0, Ln0/c0;->b:Lokhttp3/MediaType;
-
-    return-object v0
-.end method
-
-.method public writeTo(Lokio/BufferedSink;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Ln0/c0;->a:Lokio/ByteString;
-
-    invoke-interface {p1, v0}, Lokio/BufferedSink;->y0(Lokio/ByteString;)Lokio/BufferedSink;
-
-    return-void
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/d.smali b/com.discord/smali_classes2/n0/d.smali
deleted file mode 100644
index 8d8e879b2d..0000000000
--- a/com.discord/smali_classes2/n0/d.smali
+++ /dev/null
@@ -1,7 +0,0 @@
-.class public final Ln0/d;
-.super Ljava/lang/Object;
-.source "Cache.kt"
-
-# interfaces
-.implements Ljava/io/Closeable;
-.implements Ljava/io/Flushable;
diff --git a/com.discord/smali_classes2/n0/d0.smali b/com.discord/smali_classes2/n0/d0.smali
deleted file mode 100644
index 59a0267fd2..0000000000
--- a/com.discord/smali_classes2/n0/d0.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Ln0/d0;
-.super Lokhttp3/ResponseBody;
-.source "ResponseBody.kt"
-
-
-# instance fields
-.field public final synthetic f:Lo0/g;
-
-.field public final synthetic g:Lokhttp3/MediaType;
-
-.field public final synthetic h:J
-
-
-# direct methods
-.method public constructor <init>(Lo0/g;Lokhttp3/MediaType;J)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/d0;->f:Lo0/g;
-
-    iput-object p2, p0, Ln0/d0;->g:Lokhttp3/MediaType;
-
-    iput-wide p3, p0, Ln0/d0;->h:J
-
-    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()J
-    .locals 2
-
-    iget-wide v0, p0, Ln0/d0;->h:J
-
-    return-wide v0
-.end method
-
-.method public b()Lokhttp3/MediaType;
-    .locals 1
-
-    iget-object v0, p0, Ln0/d0;->g:Lokhttp3/MediaType;
-
-    return-object v0
-.end method
-
-.method public c()Lo0/g;
-    .locals 1
-
-    iget-object v0, p0, Ln0/d0;->f:Lo0/g;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/e$a.smali b/com.discord/smali_classes2/n0/e$a.smali
deleted file mode 100644
index 15699d4ec6..0000000000
--- a/com.discord/smali_classes2/n0/e$a.smali
+++ /dev/null
@@ -1,549 +0,0 @@
-.class public final Ln0/e$a;
-.super Ljava/lang/Object;
-.source "CacheControl.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/String;Ljava/lang/String;I)I
-    .locals 4
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    :goto_0
-    if-ge p3, v0, :cond_1
-
-    invoke-virtual {p1, p3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    invoke-static {p2, v1, v2, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    return p3
-
-    :cond_0
-    add-int/lit8 p3, p3, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public final b(Lokhttp3/Headers;)Ln0/e;
-    .locals 26
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    if-eqz v1, :cond_16
-
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/Headers;->size()I
-
-    move-result v3
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/4 v12, -0x1
-
-    const/4 v13, -0x1
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
-
-    const/16 v17, -0x1
-
-    const/16 v18, -0x1
-
-    const/16 v19, 0x0
-
-    const/16 v20, 0x0
-
-    const/16 v21, 0x0
-
-    :goto_0
-    if-ge v7, v3, :cond_14
-
-    invoke-virtual {v1, v7}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v7}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "Cache-Control"
-
-    invoke-static {v2, v5, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    if-eqz v9, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    move-object v9, v4
-
-    goto :goto_2
-
-    :cond_1
-    const-string v5, "Pragma"
-
-    invoke-static {v2, v5, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_13
-
-    :goto_1
-    const/4 v8, 0x0
-
-    :goto_2
-    const/4 v2, 0x0
-
-    :goto_3
-    invoke-virtual {v4}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    if-ge v2, v5, :cond_12
-
-    const-string v5, "=,;"
-
-    invoke-virtual {v0, v4, v5, v2}, Ln0/e$a;->a(Ljava/lang/String;Ljava/lang/String;I)I
-
-    move-result v5
-
-    invoke-virtual {v4, v2, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v6, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v4}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    if-eq v5, v1, :cond_4
-
-    invoke-virtual {v4, v5}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    move/from16 v24, v3
-
-    const/16 v3, 0x2c
-
-    if-eq v1, v3, :cond_5
-
-    invoke-virtual {v4, v5}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v3, 0x3b
-
-    if-ne v1, v3, :cond_2
-
-    goto :goto_4
-
-    :cond_2
-    add-int/lit8 v5, v5, 0x1
-
-    invoke-static {v4, v5}, Ln0/g0/b;->u(Ljava/lang/String;I)I
-
-    move-result v1
-
-    invoke-virtual {v4}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    if-ge v1, v3, :cond_3
-
-    invoke-virtual {v4, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v3
-
-    const/16 v5, 0x22
-
-    if-ne v3, v5, :cond_3
-
-    add-int/lit8 v1, v1, 0x1
-
-    const/4 v3, 0x4
-
-    move-object/from16 v25, v9
-
-    const/4 v9, 0x0
-
-    invoke-static {v4, v5, v1, v9, v3}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v3
-
-    invoke-virtual {v4, v1, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v5, 0x1
-
-    add-int/2addr v3, v5
-
-    goto :goto_5
-
-    :cond_3
-    move-object/from16 v25, v9
-
-    const/4 v9, 0x0
-
-    const-string v3, ",;"
-
-    invoke-virtual {v0, v4, v3, v1}, Ln0/e$a;->a(Ljava/lang/String;Ljava/lang/String;I)I
-
-    move-result v3
-
-    invoke-virtual {v4, v1, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_5
-
-    :cond_4
-    move/from16 v24, v3
-
-    :cond_5
-    :goto_4
-    move-object/from16 v25, v9
-
-    const/4 v9, 0x0
-
-    add-int/lit8 v5, v5, 0x1
-
-    move v3, v5
-
-    const/4 v1, 0x0
-
-    :goto_5
-    const-string v5, "no-cache"
-
-    const/4 v6, 0x1
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_6
-
-    const/4 v5, -0x1
-
-    const/4 v10, 0x1
-
-    goto/16 :goto_6
-
-    :cond_6
-    const-string v5, "no-store"
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_7
-
-    const/4 v5, -0x1
-
-    const/4 v11, 0x1
-
-    goto/16 :goto_6
-
-    :cond_7
-    const-string v5, "max-age"
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_8
-
-    const/4 v5, -0x1
-
-    invoke-static {v1, v5}, Ln0/g0/b;->G(Ljava/lang/String;I)I
-
-    move-result v12
-
-    goto/16 :goto_6
-
-    :cond_8
-    const/4 v5, -0x1
-
-    const-string v9, "s-maxage"
-
-    invoke-static {v9, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_9
-
-    invoke-static {v1, v5}, Ln0/g0/b;->G(Ljava/lang/String;I)I
-
-    move-result v13
-
-    goto :goto_6
-
-    :cond_9
-    const-string v5, "private"
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_a
-
-    const/4 v5, -0x1
-
-    const/4 v14, 0x1
-
-    goto :goto_6
-
-    :cond_a
-    const-string v5, "public"
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_b
-
-    const/4 v5, -0x1
-
-    const/4 v15, 0x1
-
-    goto :goto_6
-
-    :cond_b
-    const-string v5, "must-revalidate"
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_c
-
-    const/4 v5, -0x1
-
-    const/16 v16, 0x1
-
-    goto :goto_6
-
-    :cond_c
-    const-string v5, "max-stale"
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_d
-
-    const v2, 0x7fffffff
-
-    invoke-static {v1, v2}, Ln0/g0/b;->G(Ljava/lang/String;I)I
-
-    move-result v17
-
-    const/4 v5, -0x1
-
-    goto :goto_6
-
-    :cond_d
-    const-string v5, "min-fresh"
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_e
-
-    const/4 v5, -0x1
-
-    invoke-static {v1, v5}, Ln0/g0/b;->G(Ljava/lang/String;I)I
-
-    move-result v18
-
-    goto :goto_6
-
-    :cond_e
-    const/4 v5, -0x1
-
-    const-string v1, "only-if-cached"
-
-    invoke-static {v1, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_f
-
-    const/16 v19, 0x1
-
-    goto :goto_6
-
-    :cond_f
-    const-string v1, "no-transform"
-
-    invoke-static {v1, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_10
-
-    const/16 v20, 0x1
-
-    goto :goto_6
-
-    :cond_10
-    const-string v1, "immutable"
-
-    invoke-static {v1, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_11
-
-    const/16 v21, 0x1
-
-    :cond_11
-    :goto_6
-    move-object/from16 v1, p1
-
-    move v2, v3
-
-    move/from16 v3, v24
-
-    move-object/from16 v9, v25
-
-    goto/16 :goto_3
-
-    :cond_12
-    move/from16 v24, v3
-
-    move-object/from16 v25, v9
-
-    goto :goto_7
-
-    :cond_13
-    move/from16 v24, v3
-
-    move-object v2, v9
-
-    :goto_7
-    const/4 v5, -0x1
-
-    add-int/lit8 v7, v7, 0x1
-
-    move-object/from16 v1, p1
-
-    move/from16 v3, v24
-
-    goto/16 :goto_0
-
-    :cond_14
-    move-object v2, v9
-
-    if-nez v8, :cond_15
-
-    const/16 v22, 0x0
-
-    goto :goto_8
-
-    :cond_15
-    move-object/from16 v22, v2
-
-    :goto_8
-    new-instance v1, Ln0/e;
-
-    const/16 v23, 0x0
-
-    move-object v9, v1
-
-    invoke-direct/range {v9 .. v23}, Ln0/e;-><init>(ZZIIZZZIIZZZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v1
-
-    :cond_16
-    const-string v1, "headers"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/e.smali b/com.discord/smali_classes2/n0/e.smali
deleted file mode 100644
index 96ba5b3bac..0000000000
--- a/com.discord/smali_classes2/n0/e.smali
+++ /dev/null
@@ -1,306 +0,0 @@
-.class public final Ln0/e;
-.super Ljava/lang/Object;
-.source "CacheControl.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/e$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final n:Ln0/e$a;
-
-
-# instance fields
-.field public final a:Z
-
-.field public final b:Z
-
-.field public final c:I
-
-.field public final d:I
-
-.field public final e:Z
-
-.field public final f:Z
-
-.field public final g:Z
-
-.field public final h:I
-
-.field public final i:I
-
-.field public final j:Z
-
-.field public final k:Z
-
-.field public final l:Z
-
-.field public m:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Ln0/e$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/e$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/e;->n:Ln0/e$a;
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    if-eqz v0, :cond_0
-
-    const v1, 0x7fffffff
-
-    int-to-long v1, v1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toSeconds(J)J
-
-    return-void
-
-    :cond_0
-    const-string v0, "timeUnit"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public constructor <init>(ZZIIZZZIIZZZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/e;->a:Z
-
-    iput-boolean p2, p0, Ln0/e;->b:Z
-
-    iput p3, p0, Ln0/e;->c:I
-
-    iput p4, p0, Ln0/e;->d:I
-
-    iput-boolean p5, p0, Ln0/e;->e:Z
-
-    iput-boolean p6, p0, Ln0/e;->f:Z
-
-    iput-boolean p7, p0, Ln0/e;->g:Z
-
-    iput p8, p0, Ln0/e;->h:I
-
-    iput p9, p0, Ln0/e;->i:I
-
-    iput-boolean p10, p0, Ln0/e;->j:Z
-
-    iput-boolean p11, p0, Ln0/e;->k:Z
-
-    iput-boolean p12, p0, Ln0/e;->l:Z
-
-    iput-object p13, p0, Ln0/e;->m:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 4
-
-    iget-object v0, p0, Ln0/e;->m:Ljava/lang/String;
-
-    if-nez v0, :cond_e
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-boolean v1, p0, Ln0/e;->a:Z
-
-    if-eqz v1, :cond_0
-
-    const-string v1, "no-cache, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_0
-    iget-boolean v1, p0, Ln0/e;->b:Z
-
-    if-eqz v1, :cond_1
-
-    const-string v1, "no-store, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_1
-    iget v1, p0, Ln0/e;->c:I
-
-    const-string v2, ", "
-
-    const/4 v3, -0x1
-
-    if-eq v1, v3, :cond_2
-
-    const-string v1, "max-age="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Ln0/e;->c:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_2
-    iget v1, p0, Ln0/e;->d:I
-
-    if-eq v1, v3, :cond_3
-
-    const-string v1, "s-maxage="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Ln0/e;->d:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_3
-    iget-boolean v1, p0, Ln0/e;->e:Z
-
-    if-eqz v1, :cond_4
-
-    const-string v1, "private, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_4
-    iget-boolean v1, p0, Ln0/e;->f:Z
-
-    if-eqz v1, :cond_5
-
-    const-string v1, "public, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_5
-    iget-boolean v1, p0, Ln0/e;->g:Z
-
-    if-eqz v1, :cond_6
-
-    const-string v1, "must-revalidate, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_6
-    iget v1, p0, Ln0/e;->h:I
-
-    if-eq v1, v3, :cond_7
-
-    const-string v1, "max-stale="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Ln0/e;->h:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_7
-    iget v1, p0, Ln0/e;->i:I
-
-    if-eq v1, v3, :cond_8
-
-    const-string v1, "min-fresh="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Ln0/e;->i:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_8
-    iget-boolean v1, p0, Ln0/e;->j:Z
-
-    if-eqz v1, :cond_9
-
-    const-string v1, "only-if-cached, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_9
-    iget-boolean v1, p0, Ln0/e;->k:Z
-
-    if-eqz v1, :cond_a
-
-    const-string v1, "no-transform, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_a
-    iget-boolean v1, p0, Ln0/e;->l:Z
-
-    if-eqz v1, :cond_b
-
-    const-string v1, "immutable, "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_b
-    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    if-nez v1, :cond_c
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_c
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_d
-
-    const-string v0, ""
-
-    return-object v0
-
-    :cond_d
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->length()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, -0x2
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->length()I
-
-    move-result v2
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->delete(II)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v0, p0, Ln0/e;->m:Ljava/lang/String;
-
-    :cond_e
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/e0.smali b/com.discord/smali_classes2/n0/e0.smali
deleted file mode 100644
index 759c8de196..0000000000
--- a/com.discord/smali_classes2/n0/e0.smali
+++ /dev/null
@@ -1,187 +0,0 @@
-.class public final Ln0/e0;
-.super Ljava/lang/Object;
-.source "Route.kt"
-
-
-# instance fields
-.field public final a:Ln0/a;
-
-.field public final b:Ljava/net/Proxy;
-
-.field public final c:Ljava/net/InetSocketAddress;
-
-
-# direct methods
-.method public constructor <init>(Ln0/a;Ljava/net/Proxy;Ljava/net/InetSocketAddress;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p3, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/e0;->a:Ln0/a;
-
-    iput-object p2, p0, Ln0/e0;->b:Ljava/net/Proxy;
-
-    iput-object p3, p0, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    return-void
-
-    :cond_0
-    const-string p1, "socketAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "address"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a()Z
-    .locals 2
-
-    iget-object v0, p0, Ln0/e0;->a:Ln0/a;
-
-    iget-object v0, v0, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v0
-
-    sget-object v1, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    instance-of v0, p1, Ln0/e0;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/e0;
-
-    iget-object v0, p1, Ln0/e0;->a:Ln0/a;
-
-    iget-object v1, p0, Ln0/e0;->a:Ln0/a;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p1, Ln0/e0;->b:Ljava/net/Proxy;
-
-    iget-object v1, p0, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p1, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    iget-object v0, p0, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Ln0/e0;->a:Ln0/a;
-
-    invoke-virtual {v0}, Ln0/a;->hashCode()I
-
-    move-result v0
-
-    add-int/lit16 v0, v0, 0x20f
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v1}, Ljava/net/Proxy;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    invoke-virtual {v0}, Ljava/net/InetSocketAddress;->hashCode()I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "Route{"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x7d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/f$a.smali b/com.discord/smali_classes2/n0/f$a.smali
deleted file mode 100644
index 47ae892c17..0000000000
--- a/com.discord/smali_classes2/n0/f$a.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public interface abstract Ln0/f$a;
-.super Ljava/lang/Object;
-.source "Call.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/f;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "a"
-.end annotation
-
-
-# virtual methods
-.method public abstract b(Ln0/a0;)Ln0/f;
-.end method
diff --git a/com.discord/smali_classes2/n0/f.smali b/com.discord/smali_classes2/n0/f.smali
deleted file mode 100644
index e5745ece38..0000000000
--- a/com.discord/smali_classes2/n0/f.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public interface abstract Ln0/f;
-.super Ljava/lang/Object;
-.source "Call.kt"
-
-# interfaces
-.implements Ljava/lang/Cloneable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/f$a;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract F(Ln0/g;)V
-.end method
-
-.method public abstract cancel()V
-.end method
-
-.method public abstract execute()Lokhttp3/Response;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract k()Z
-.end method
-
-.method public abstract p()Ln0/a0;
-.end method
diff --git a/com.discord/smali_classes2/n0/f0.smali b/com.discord/smali_classes2/n0/f0.smali
deleted file mode 100644
index 2bc2ba1334..0000000000
--- a/com.discord/smali_classes2/n0/f0.smali
+++ /dev/null
@@ -1,176 +0,0 @@
-.class public final enum Ln0/f0;
-.super Ljava/lang/Enum;
-.source "TlsVersion.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/f0$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Ln0/f0;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Ln0/f0;
-
-.field public static final enum e:Ln0/f0;
-
-.field public static final enum f:Ln0/f0;
-
-.field public static final enum g:Ln0/f0;
-
-.field public static final enum h:Ln0/f0;
-
-.field public static final synthetic i:[Ln0/f0;
-
-.field public static final j:Ln0/f0$a;
-
-
-# instance fields
-.field public final javaName:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    const/4 v0, 0x5
-
-    new-array v0, v0, [Ln0/f0;
-
-    new-instance v1, Ln0/f0;
-
-    const-string v2, "TLS_1_3"
-
-    const/4 v3, 0x0
-
-    const-string v4, "TLSv1.3"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/f0;->d:Ln0/f0;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/f0;
-
-    const-string v2, "TLS_1_2"
-
-    const/4 v3, 0x1
-
-    const-string v4, "TLSv1.2"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/f0;->e:Ln0/f0;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/f0;
-
-    const-string v2, "TLS_1_1"
-
-    const/4 v3, 0x2
-
-    const-string v4, "TLSv1.1"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/f0;->f:Ln0/f0;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/f0;
-
-    const-string v2, "TLS_1_0"
-
-    const/4 v3, 0x3
-
-    const-string v4, "TLSv1"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/f0;->g:Ln0/f0;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/f0;
-
-    const-string v2, "SSL_3_0"
-
-    const/4 v3, 0x4
-
-    const-string v4, "SSLv3"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/f0;->h:Ln0/f0;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Ln0/f0;->i:[Ln0/f0;
-
-    new-instance v0, Ln0/f0$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/f0$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/f0;->j:Ln0/f0$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;ILjava/lang/String;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    iput-object p3, p0, Ln0/f0;->javaName:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Ln0/f0;
-    .locals 1
-
-    const-class v0, Ln0/f0;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Ln0/f0;
-
-    return-object p0
-.end method
-
-.method public static values()[Ln0/f0;
-    .locals 1
-
-    sget-object v0, Ln0/f0;->i:[Ln0/f0;
-
-    invoke-virtual {v0}, [Ln0/f0;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Ln0/f0;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g.smali b/com.discord/smali_classes2/n0/g.smali
deleted file mode 100644
index 9c0c6856d0..0000000000
--- a/com.discord/smali_classes2/n0/g.smali
+++ /dev/null
@@ -1,16 +0,0 @@
-.class public interface abstract Ln0/g;
-.super Ljava/lang/Object;
-.source "Callback.kt"
-
-
-# virtual methods
-.method public abstract a(Ln0/f;Lokhttp3/Response;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract b(Ln0/f;Ljava/io/IOException;)V
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/a.smali b/com.discord/smali_classes2/n0/g0/a.smali
deleted file mode 100644
index 63d9a30b58..0000000000
--- a/com.discord/smali_classes2/n0/g0/a.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public final Ln0/g0/a;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ln0/t$b;
-
-
-# instance fields
-.field public final synthetic a:Ln0/t;
-
-
-# direct methods
-.method public constructor <init>(Ln0/t;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/a;->a:Ln0/t;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ln0/f;)Ln0/t;
-    .locals 0
-
-    iget-object p1, p0, Ln0/g0/a;->a:Ln0/t;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/b$a.smali b/com.discord/smali_classes2/n0/g0/b$a.smali
deleted file mode 100644
index 7b169bae68..0000000000
--- a/com.discord/smali_classes2/n0/g0/b$a.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class public final Ln0/g0/b$a;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/util/concurrent/ThreadFactory;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Z)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/b$a;->d:Ljava/lang/String;
-
-    iput-boolean p2, p0, Ln0/g0/b$a;->e:Z
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
-    .locals 2
-
-    new-instance v0, Ljava/lang/Thread;
-
-    iget-object v1, p0, Ln0/g0/b$a;->d:Ljava/lang/String;
-
-    invoke-direct {v0, p1, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
-
-    iget-boolean p1, p0, Ln0/g0/b$a;->e:Z
-
-    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setDaemon(Z)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/b.smali b/com.discord/smali_classes2/n0/g0/b.smali
deleted file mode 100644
index a4940df3d3..0000000000
--- a/com.discord/smali_classes2/n0/g0/b.smali
+++ /dev/null
@@ -1,2104 +0,0 @@
-.class public final Ln0/g0/b;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-
-# static fields
-.field public static final a:[B
-
-.field public static final b:Lokhttp3/Headers;
-
-.field public static final c:Lokhttp3/ResponseBody;
-
-.field public static final d:Lo0/n;
-
-.field public static final e:Ljava/util/TimeZone;
-
-.field public static final f:Lkotlin/text/Regex;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 12
-
-    const/4 v0, 0x0
-
-    new-array v1, v0, [B
-
-    sput-object v1, Ln0/g0/b;->a:[B
-
-    sget-object v1, Lokhttp3/Headers;->e:Lokhttp3/Headers$b;
-
-    new-array v2, v0, [Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Lokhttp3/Headers$b;->c([Ljava/lang/String;)Lokhttp3/Headers;
-
-    move-result-object v1
-
-    sput-object v1, Ln0/g0/b;->b:Lokhttp3/Headers;
-
-    sget-object v1, Ln0/g0/b;->a:[B
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    new-instance v3, Lo0/e;
-
-    invoke-direct {v3}, Lo0/e;-><init>()V
-
-    invoke-virtual {v3, v1}, Lo0/e;->E([B)Lo0/e;
-
-    array-length v1, v1
-
-    int-to-long v4, v1
-
-    new-instance v1, Ln0/d0;
-
-    invoke-direct {v1, v3, v2, v4, v5}, Ln0/d0;-><init>(Lo0/g;Lokhttp3/MediaType;J)V
-
-    sput-object v1, Ln0/g0/b;->c:Lokhttp3/ResponseBody;
-
-    sget-object v6, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
-
-    sget-object v7, Ln0/g0/b;->a:[B
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x7
-
-    invoke-static/range {v6 .. v11}, Lokhttp3/RequestBody$Companion;->d(Lokhttp3/RequestBody$Companion;[BLokhttp3/MediaType;III)Lokhttp3/RequestBody;
-
-    sget-object v1, Lo0/n;->f:Lo0/n$a;
-
-    const/4 v3, 0x5
-
-    new-array v3, v3, [Lokio/ByteString;
-
-    sget-object v4, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v5, "efbbbf"
-
-    invoke-virtual {v4, v5}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v4
-
-    aput-object v4, v3, v0
-
-    const/4 v0, 0x1
-
-    sget-object v4, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v5, "feff"
-
-    invoke-virtual {v4, v5}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v4
-
-    aput-object v4, v3, v0
-
-    const/4 v0, 0x2
-
-    sget-object v4, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v5, "fffe"
-
-    invoke-virtual {v4, v5}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v4
-
-    aput-object v4, v3, v0
-
-    const/4 v0, 0x3
-
-    sget-object v4, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v5, "0000ffff"
-
-    invoke-virtual {v4, v5}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v4
-
-    aput-object v4, v3, v0
-
-    const/4 v0, 0x4
-
-    sget-object v4, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v5, "ffff0000"
-
-    invoke-virtual {v4, v5}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v4
-
-    aput-object v4, v3, v0
-
-    invoke-virtual {v1, v3}, Lo0/n$a;->c([Lokio/ByteString;)Lo0/n;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/b;->d:Lo0/n;
-
-    const-string v0, "GMT"
-
-    invoke-static {v0}, Ljava/util/TimeZone;->getTimeZone(Ljava/lang/String;)Ljava/util/TimeZone;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    sput-object v0, Ln0/g0/b;->e:Ljava/util/TimeZone;
-
-    new-instance v0, Lkotlin/text/Regex;
-
-    const-string v1, "([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)"
-
-    invoke-direct {v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Ln0/g0/b;->f:Lkotlin/text/Regex;
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_1
-    const-string v0, "$this$toResponseBody"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-.end method
-
-.method public static final A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-    .locals 1
-
-    new-instance v0, Ln0/g0/b$a;
-
-    invoke-direct {v0, p0, p1}, Ln0/g0/b$a;-><init>(Ljava/lang/String;Z)V
-
-    return-object v0
-.end method
-
-.method public static final B(Ljava/util/List;)Lokhttp3/Headers;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)",
-            "Lokhttp3/Headers;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    const/16 v1, 0x14
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p0
-
-    :goto_0
-    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ln0/g0/g/b;
-
-    iget-object v3, v1, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    iget-object v1, v1, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    if-eqz v3, :cond_1
-
-    invoke-static {v3}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v3
-
-    if-eqz v1, :cond_0
-
-    invoke-static {v1}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    invoke-static {v1}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    throw v2
-
-    :cond_1
-    throw v2
-
-    :cond_2
-    const/4 p0, 0x0
-
-    new-array p0, p0, [Ljava/lang/String;
-
-    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_3
-
-    check-cast p0, [Ljava/lang/String;
-
-    new-instance v0, Lokhttp3/Headers;
-
-    invoke-direct {v0, p0, v2}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v0
-
-    :cond_3
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static final C(I)Ljava/lang/String;
-    .locals 1
-
-    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v0, "Integer.toHexString(this)"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-.end method
-
-.method public static final D(Ln0/w;Z)Ljava/lang/String;
-    .locals 5
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_7
-
-    iget-object v1, p0, Ln0/w;->e:Ljava/lang/String;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    const-string v4, ":"
-
-    invoke-static {v1, v4, v2, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    const/16 v1, 0x5b
-
-    invoke-static {v1}, Lf/e/b/a/a;->B(C)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x5d
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, p0, Ln0/w;->e:Ljava/lang/String;
-
-    :goto_0
-    if-nez p1, :cond_5
-
-    iget p1, p0, Ln0/w;->f:I
-
-    iget-object v2, p0, Ln0/w;->b:Ljava/lang/String;
-
-    if-eqz v2, :cond_4
-
-    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    const v3, 0x310888    # 4.503E-39f
-
-    if-eq v0, v3, :cond_2
-
-    const v3, 0x5f008eb
-
-    if-eq v0, v3, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const-string v0, "https"
-
-    invoke-virtual {v2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    const/16 v0, 0x1bb
-
-    goto :goto_2
-
-    :cond_2
-    const-string v0, "http"
-
-    invoke-virtual {v2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    const/16 v0, 0x50
-
-    goto :goto_2
-
-    :cond_3
-    :goto_1
-    const/4 v0, -0x1
-
-    :goto_2
-    if-eq p1, v0, :cond_6
-
-    goto :goto_3
-
-    :cond_4
-    const-string p0, "scheme"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    :goto_3
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v0, 0x3a
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget p0, p0, Ln0/w;->f:I
-
-    invoke-virtual {p1, p0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    :cond_6
-    return-object v1
-
-    :cond_7
-    const-string p0, "$this$toHostHeader"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final E(Ljava/util/List;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/List<",
-            "+TT;>;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    invoke-static {p0}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p0
-
-    const-string v0, "Collections.unmodifiableList(toMutableList())"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "$this$toImmutableList"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final F(Ljava/util/Map;)Ljava/util/Map;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<K:",
-            "Ljava/lang/Object;",
-            "V:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Map<",
-            "TK;+TV;>;)",
-            "Ljava/util/Map<",
-            "TK;TV;>;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_1
-
-    invoke-interface {p0}, Ljava/util/Map;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object p0, Lj0/i/o;->d:Lj0/i/o;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0, p0}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
-
-    invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
-
-    move-result-object p0
-
-    const-string v0, "Collections.unmodifiableMap(LinkedHashMap(this))"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_0
-    return-object p0
-
-    :cond_1
-    const-string p0, "$this$toImmutableMap"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final G(Ljava/lang/String;I)I
-    .locals 4
-
-    if-eqz p0, :cond_2
-
-    :try_start_0
-    invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
-
-    move-result-wide p0
-    :try_end_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    const v0, 0x7fffffff
-
-    int-to-long v1, v0
-
-    cmp-long v3, p0, v1
-
-    if-lez v3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p0, v0
-
-    if-gez v2, :cond_1
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    long-to-int v0, p0
-
-    :goto_0
-    return v0
-
-    :catch_0
-    :cond_2
-    return p1
-.end method
-
-.method public static final H(Ljava/lang/String;II)Ljava/lang/String;
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    invoke-static {p0, p1, p2}, Ln0/g0/b;->r(Ljava/lang/String;II)I
-
-    move-result p1
-
-    invoke-static {p0, p1, p2}, Ln0/g0/b;->t(Ljava/lang/String;II)I
-
-    move-result p2
-
-    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "$this$trimSubstring"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final I(Lokio/BufferedSink;I)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    ushr-int/lit8 v0, p1, 0x10
-
-    and-int/lit16 v0, v0, 0xff
-
-    invoke-interface {p0, v0}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
-
-    ushr-int/lit8 v0, p1, 0x8
-
-    and-int/lit16 v0, v0, 0xff
-
-    invoke-interface {p0, v0}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
-
-    and-int/lit16 p1, p1, 0xff
-
-    invoke-interface {p0, p1}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
-
-    return-void
-
-    :cond_0
-    const-string p0, "$this$writeMedium"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final a(BI)I
-    .locals 0
-
-    and-int/2addr p0, p1
-
-    return p0
-.end method
-
-.method public static final b(Ljava/lang/String;)Z
-    .locals 1
-
-    if-eqz p0, :cond_0
-
-    sget-object v0, Ln0/g0/b;->f:Lkotlin/text/Regex;
-
-    invoke-virtual {v0, p0}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    const-string p0, "$this$canParseAsIpAddress"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final c(Ln0/w;Ln0/w;)Z
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_2
-
-    if-eqz p1, :cond_1
-
-    iget-object v0, p0, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v1, p1, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget v0, p0, Ln0/w;->f:I
-
-    iget v1, p1, Ln0/w;->f:I
-
-    if-ne v0, v1, :cond_0
-
-    iget-object p0, p0, Ln0/w;->b:Ljava/lang/String;
-
-    iget-object p1, p1, Ln0/w;->b:Ljava/lang/String;
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-
-    :cond_1
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p0, "$this$canReuseConnectionFor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
-    .locals 7
-
-    const-wide/16 v0, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    cmp-long v4, p1, v0
-
-    if-ltz v4, :cond_0
-
-    const/4 v5, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    :goto_0
-    if-eqz v5, :cond_7
-
-    if-eqz v3, :cond_6
-
-    invoke-virtual {p3, p1, p2}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
-
-    move-result-wide p1
-
-    const p3, 0x7fffffff
-
-    int-to-long v5, p3
-
-    cmp-long p3, p1, v5
-
-    if-gtz p3, :cond_1
-
-    const/4 p3, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p3, 0x0
-
-    :goto_1
-    if-eqz p3, :cond_5
-
-    cmp-long p3, p1, v0
-
-    if-nez p3, :cond_2
-
-    if-gtz v4, :cond_3
-
-    :cond_2
-    const/4 v2, 0x1
-
-    :cond_3
-    if-eqz v2, :cond_4
-
-    long-to-int p0, p1
-
-    return p0
-
-    :cond_4
-    const-string p1, " too small."
-
-    invoke-static {p0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    const-string p1, " too large."
-
-    invoke-static {p0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    const-string p1, "unit == null"
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_7
-    const-string p1, " < 0"
-
-    invoke-static {p0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {p1, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static final e(JJJ)V
-    .locals 5
-
-    or-long v0, p2, p4
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-ltz v4, :cond_0
-
-    cmp-long v0, p2, p0
-
-    if-gtz v0, :cond_0
-
-    sub-long/2addr p0, p2
-
-    cmp-long p2, p0, p4
-
-    if-ltz p2, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p0, Ljava/lang/ArrayIndexOutOfBoundsException;
-
-    invoke-direct {p0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>()V
-
-    throw p0
-.end method
-
-.method public static final f(Ljava/io/Closeable;)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    :try_start_0
-    invoke-interface {p0}, Ljava/io/Closeable;->close()V
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-void
-
-    :catch_1
-    move-exception p0
-
-    throw p0
-
-    :cond_0
-    const-string p0, "$this$closeQuietly"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final g(Ljava/net/Socket;)V
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    :try_start_0
-    invoke-virtual {p0}, Ljava/net/Socket;->close()V
-    :try_end_0
-    .catch Ljava/lang/AssertionError; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-void
-
-    :catch_1
-    move-exception p0
-
-    throw p0
-
-    :catch_2
-    move-exception p0
-
-    throw p0
-
-    :cond_0
-    const-string p0, "$this$closeQuietly"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final h(Ljava/lang/String;CII)I
-    .locals 1
-
-    if-eqz p0, :cond_2
-
-    :goto_0
-    if-ge p2, p3, :cond_1
-
-    invoke-virtual {p0, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    if-ne v0, p1, :cond_0
-
-    return p2
-
-    :cond_0
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return p3
-
-    :cond_2
-    const-string p0, "$this$delimiterOffset"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final i(Ljava/lang/String;Ljava/lang/String;II)I
-    .locals 3
-
-    if-eqz p0, :cond_2
-
-    :goto_0
-    if-ge p2, p3, :cond_1
-
-    invoke-virtual {p0, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p1, v0, v1, v2}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return p2
-
-    :cond_0
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return p3
-
-    :cond_2
-    const-string p0, "$this$delimiterOffset"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static synthetic j(Ljava/lang/String;CIII)I
-    .locals 1
-
-    and-int/lit8 v0, p4, 0x2
-
-    if-eqz v0, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 p4, p4, 0x4
-
-    if-eqz p4, :cond_1
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result p3
-
-    :cond_1
-    invoke-static {p0, p1, p2, p3}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static final k(Lo0/w;ILjava/util/concurrent/TimeUnit;)Z
-    .locals 0
-
-    if-eqz p2, :cond_0
-
-    :try_start_0
-    invoke-static {p0, p1, p2}, Ln0/g0/b;->z(Lo0/w;ILjava/util/concurrent/TimeUnit;)Z
-
-    move-result p0
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-
-    :cond_0
-    const-string p0, "timeUnit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final varargs l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-    .locals 2
-
-    if-eqz p0, :cond_0
-
-    sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const-string v1, "Locale.US"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v1, p1
-
-    invoke-static {p1, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    array-length v1, p1
-
-    invoke-static {p1, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-static {v0, p0, p1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "java.lang.String.format(locale, format, *args)"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "format"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final m([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)Z
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/String;",
-            "[",
-            "Ljava/lang/String;",
-            "Ljava/util/Comparator<",
-            "-",
-            "Ljava/lang/String;",
-            ">;)Z"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_6
-
-    array-length v0, p0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-nez v0, :cond_5
-
-    if-eqz p1, :cond_5
-
-    array-length v0, p1
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_2
-
-    goto :goto_4
-
-    :cond_2
-    array-length v0, p0
-
-    const/4 v3, 0x0
-
-    :goto_2
-    if-ge v3, v0, :cond_5
-
-    aget-object v4, p0, v3
-
-    array-length v5, p1
-
-    const/4 v6, 0x0
-
-    :goto_3
-    if-ge v6, v5, :cond_4
-
-    aget-object v7, p1, v6
-
-    invoke-interface {p2, v4, v7}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
-
-    move-result v7
-
-    if-nez v7, :cond_3
-
-    return v2
-
-    :cond_3
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_2
-
-    :cond_5
-    :goto_4
-    return v1
-
-    :cond_6
-    const-string p0, "$this$hasIntersection"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final n(Lokhttp3/Response;)J
-    .locals 2
-
-    iget-object p0, p0, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    const-string v0, "Content-Length"
-
-    invoke-virtual {p0, v0}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-wide/16 v0, -0x1
-
-    if-eqz p0, :cond_0
-
-    :try_start_0
-    invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
-
-    move-result-wide v0
-    :try_end_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    :cond_0
-    return-wide v0
-.end method
-
-.method public static final varargs o([Ljava/lang/Object;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">([TT;)",
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-
-    .annotation runtime Ljava/lang/SafeVarargs;
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    invoke-virtual {p0}, Ljava/lang/Object;->clone()Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, [Ljava/lang/Object;
-
-    array-length v0, p0
-
-    invoke-static {p0, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-static {p0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p0
-
-    invoke-static {p0}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p0
-
-    const-string v0, "Collections.unmodifiable\u2026sList(*elements.clone()))"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-
-    :cond_0
-    const-string p0, "elements"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final p([Ljava/lang/String;Ljava/lang/String;Ljava/util/Comparator;)I
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            "Ljava/util/Comparator<",
-            "Ljava/lang/String;",
-            ">;)I"
-        }
-    .end annotation
-
-    array-length v0, p0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v0, :cond_2
-
-    aget-object v3, p0, v2
-
-    invoke-interface {p2, v3, p1}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
-
-    move-result v3
-
-    if-nez v3, :cond_0
-
-    const/4 v3, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eqz v3, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v2, -0x1
-
-    :goto_2
-    return v2
-.end method
-
-.method public static final q(Ljava/lang/String;)I
-    .locals 4
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    :goto_0
-    if-ge v0, v1, :cond_2
-
-    invoke-virtual {p0, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    const/16 v3, 0x1f
-
-    if-le v2, v3, :cond_1
-
-    const/16 v3, 0x7f
-
-    if-lt v2, v3, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    return v0
-
-    :cond_2
-    const/4 p0, -0x1
-
-    return p0
-.end method
-
-.method public static final r(Ljava/lang/String;II)I
-    .locals 2
-
-    if-eqz p0, :cond_2
-
-    :goto_0
-    if-ge p1, p2, :cond_1
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v1, 0x9
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0xa
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0xc
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0xd
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0x20
-
-    if-eq v0, v1, :cond_0
-
-    return p1
-
-    :cond_0
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return p2
-
-    :cond_2
-    const-string p0, "$this$indexOfFirstNonAsciiWhitespace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static synthetic s(Ljava/lang/String;III)I
-    .locals 1
-
-    and-int/lit8 v0, p3, 0x1
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x0
-
-    :cond_0
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_1
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result p2
-
-    :cond_1
-    invoke-static {p0, p1, p2}, Ln0/g0/b;->r(Ljava/lang/String;II)I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static final t(Ljava/lang/String;II)I
-    .locals 2
-
-    if-eqz p0, :cond_2
-
-    add-int/lit8 p2, p2, -0x1
-
-    if-lt p2, p1, :cond_1
-
-    :goto_0
-    invoke-virtual {p0, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v1, 0x9
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0xa
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0xc
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0xd
-
-    if-eq v0, v1, :cond_0
-
-    const/16 v1, 0x20
-
-    if-eq v0, v1, :cond_0
-
-    add-int/lit8 p2, p2, 0x1
-
-    return p2
-
-    :cond_0
-    if-eq p2, p1, :cond_1
-
-    add-int/lit8 p2, p2, -0x1
-
-    goto :goto_0
-
-    :cond_1
-    return p1
-
-    :cond_2
-    const-string p0, "$this$indexOfLastNonAsciiWhitespace"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final u(Ljava/lang/String;I)I
-    .locals 3
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    :goto_0
-    if-ge p1, v0, :cond_1
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v2, 0x20
-
-    if-eq v1, v2, :cond_0
-
-    const/16 v2, 0x9
-
-    if-eq v1, v2, :cond_0
-
-    return p1
-
-    :cond_0
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static final v([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)[Ljava/lang/String;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/String;",
-            "[",
-            "Ljava/lang/String;",
-            "Ljava/util/Comparator<",
-            "-",
-            "Ljava/lang/String;",
-            ">;)[",
-            "Ljava/lang/String;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_4
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    array-length v1, p0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_2
-
-    aget-object v4, p0, v3
-
-    array-length v5, p1
-
-    const/4 v6, 0x0
-
-    :goto_1
-    if-ge v6, v5, :cond_1
-
-    aget-object v7, p1, v6
-
-    invoke-interface {p2, v4, v7}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
-
-    move-result v7
-
-    if-nez v7, :cond_0
-
-    invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_0
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    :goto_2
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    new-array p0, v2, [Ljava/lang/String;
-
-    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p0
-
-    if-eqz p0, :cond_3
-
-    check-cast p0, [Ljava/lang/String;
-
-    return-object p0
-
-    :cond_3
-    new-instance p0, Lkotlin/TypeCastException;
-
-    const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_4
-    const-string p0, "other"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final w(C)I
-    .locals 2
-
-    const/16 v0, 0x30
-
-    if-le v0, p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v1, 0x39
-
-    if-lt v1, p0, :cond_1
-
-    sub-int/2addr p0, v0
-
-    goto :goto_4
-
-    :cond_1
-    :goto_0
-    const/16 v0, 0x66
-
-    const/16 v1, 0x61
-
-    if-le v1, p0, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    if-lt v0, p0, :cond_3
-
-    :goto_1
-    sub-int/2addr p0, v1
-
-    add-int/lit8 p0, p0, 0xa
-
-    goto :goto_4
-
-    :cond_3
-    :goto_2
-    const/16 v0, 0x46
-
-    const/16 v1, 0x41
-
-    if-le v1, p0, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    if-lt v0, p0, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    :goto_3
-    const/4 p0, -0x1
-
-    :goto_4
-    return p0
-.end method
-
-.method public static final x(Lo0/g;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_9
-
-    if-eqz p1, :cond_8
-
-    sget-object v0, Ln0/g0/b;->d:Lo0/n;
-
-    invoke-interface {p0, v0}, Lo0/g;->X0(Lo0/n;)I
-
-    move-result p0
-
-    const/4 v0, -0x1
-
-    if-eq p0, v0, :cond_7
-
-    if-eqz p0, :cond_6
-
-    const/4 p1, 0x1
-
-    if-eq p0, p1, :cond_5
-
-    const/4 p1, 0x2
-
-    if-eq p0, p1, :cond_4
-
-    const/4 p1, 0x3
-
-    if-eq p0, p1, :cond_2
-
-    const/4 p1, 0x4
-
-    if-ne p0, p1, :cond_1
-
-    sget-object p0, Lj0/t/a;->d:Lj0/t/a;
-
-    sget-object p0, Lj0/t/a;->b:Ljava/nio/charset/Charset;
-
-    if-eqz p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p0, "UTF-32LE"
-
-    invoke-static {p0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object p0
-
-    const-string p1, "Charset.forName(\"UTF-32LE\")"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sput-object p0, Lj0/t/a;->b:Ljava/nio/charset/Charset;
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p0, Ljava/lang/AssertionError;
-
-    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p0
-
-    :cond_2
-    sget-object p0, Lj0/t/a;->d:Lj0/t/a;
-
-    sget-object p0, Lj0/t/a;->c:Ljava/nio/charset/Charset;
-
-    if-eqz p0, :cond_3
-
-    :goto_0
-    goto :goto_1
-
-    :cond_3
-    const-string p0, "UTF-32BE"
-
-    invoke-static {p0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object p0
-
-    const-string p1, "Charset.forName(\"UTF-32BE\")"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sput-object p0, Lj0/t/a;->c:Ljava/nio/charset/Charset;
-
-    :goto_1
-    move-object p1, p0
-
-    goto :goto_2
-
-    :cond_4
-    sget-object p1, Ljava/nio/charset/StandardCharsets;->UTF_16LE:Ljava/nio/charset/Charset;
-
-    const-string p0, "UTF_16LE"
-
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_2
-
-    :cond_5
-    sget-object p1, Ljava/nio/charset/StandardCharsets;->UTF_16BE:Ljava/nio/charset/Charset;
-
-    const-string p0, "UTF_16BE"
-
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_2
-
-    :cond_6
-    sget-object p1, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
-
-    const-string p0, "UTF_8"
-
-    invoke-static {p1, p0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_7
-    :goto_2
-    return-object p1
-
-    :cond_8
-    const-string p0, "default"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const-string p0, "$this$readBomAsCharset"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final y(Lo0/g;)I
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    invoke-interface {p0}, Lo0/g;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    shl-int/lit8 v0, v0, 0x10
-
-    invoke-interface {p0}, Lo0/g;->readByte()B
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    shl-int/lit8 v1, v1, 0x8
-
-    or-int/2addr v0, v1
-
-    invoke-interface {p0}, Lo0/g;->readByte()B
-
-    move-result p0
-
-    and-int/lit16 p0, p0, 0xff
-
-    or-int/2addr p0, v0
-
-    return p0
-
-    :cond_0
-    const-string p0, "$this$readMedium"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final z(Lo0/w;ILjava/util/concurrent/TimeUnit;)Z
-    .locals 11
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p2, :cond_4
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v0
-
-    invoke-interface {p0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lo0/x;->e()Z
-
-    move-result v2
-
-    const-wide v3, 0x7fffffffffffffffL
-
-    if-eqz v2, :cond_0
-
-    invoke-interface {p0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lo0/x;->c()J
-
-    move-result-wide v5
-
-    sub-long/2addr v5, v0
-
-    goto :goto_0
-
-    :cond_0
-    move-wide v5, v3
-
-    :goto_0
-    invoke-interface {p0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v2
-
-    int-to-long v7, p1
-
-    invoke-virtual {p2, v7, v8}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide p1
-
-    invoke-static {v5, v6, p1, p2}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide p1
-
-    add-long/2addr p1, v0
-
-    invoke-virtual {v2, p1, p2}, Lo0/x;->d(J)Lo0/x;
-
-    :try_start_0
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    :goto_1
-    const-wide/16 v7, 0x2000
-
-    invoke-interface {p0, p1, v7, v8}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v7
-
-    const-wide/16 v9, -0x1
-
-    cmp-long p2, v7, v9
-
-    if-eqz p2, :cond_1
-
-    iget-wide v7, p1, Lo0/e;->e:J
-
-    invoke-virtual {p1, v7, v8}, Lo0/e;->skip(J)V
-    :try_end_0
-    .catch Ljava/io/InterruptedIOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p1, 0x1
-
-    cmp-long p2, v5, v3
-
-    if-nez p2, :cond_3
-
-    goto :goto_3
-
-    :catchall_0
-    move-exception p1
-
-    cmp-long p2, v5, v3
-
-    if-nez p2, :cond_2
-
-    invoke-interface {p0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Lo0/x;->a()Lo0/x;
-
-    goto :goto_2
-
-    :cond_2
-    invoke-interface {p0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object p0
-
-    add-long/2addr v0, v5
-
-    invoke-virtual {p0, v0, v1}, Lo0/x;->d(J)Lo0/x;
-
-    :goto_2
-    throw p1
-
-    :catch_0
-    nop
-
-    const/4 p1, 0x0
-
-    cmp-long p2, v5, v3
-
-    if-nez p2, :cond_3
-
-    :goto_3
-    invoke-interface {p0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Lo0/x;->a()Lo0/x;
-
-    goto :goto_4
-
-    :cond_3
-    invoke-interface {p0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object p0
-
-    add-long/2addr v0, v5
-
-    invoke-virtual {p0, v0, v1}, Lo0/x;->d(J)Lo0/x;
-
-    :goto_4
-    return p1
-
-    :cond_4
-    const-string p0, "timeUnit"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/c/a$a.smali b/com.discord/smali_classes2/n0/g0/c/a$a.smali
deleted file mode 100644
index b3bc82377e..0000000000
--- a/com.discord/smali_classes2/n0/g0/c/a$a.smali
+++ /dev/null
@@ -1,298 +0,0 @@
-.class public final Ln0/g0/c/a$a;
-.super Ljava/lang/Object;
-.source "CacheInterceptor.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/c/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public static final a(Ln0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
-    .locals 20
-
-    move-object/from16 v0, p1
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    iget-object v2, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    goto :goto_0
-
-    :cond_0
-    move-object v2, v1
-
-    :goto_0
-    if-eqz v2, :cond_7
-
-    if-eqz v0, :cond_6
-
-    iget-object v4, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v5, v0, Lokhttp3/Response;->e:Ln0/y;
-
-    iget v7, v0, Lokhttp3/Response;->g:I
-
-    iget-object v6, v0, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    iget-object v8, v0, Lokhttp3/Response;->h:Ln0/v;
-
-    iget-object v1, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v1}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object v1
-
-    iget-object v11, v0, Lokhttp3/Response;->k:Lokhttp3/Response;
-
-    iget-object v12, v0, Lokhttp3/Response;->l:Lokhttp3/Response;
-
-    iget-object v13, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
-
-    iget-wide v14, v0, Lokhttp3/Response;->n:J
-
-    iget-wide v9, v0, Lokhttp3/Response;->o:J
-
-    iget-object v0, v0, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    const/4 v2, 0x0
-
-    if-ltz v7, :cond_1
-
-    const/4 v3, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eqz v3, :cond_5
-
-    if-eqz v4, :cond_4
-
-    if-eqz v5, :cond_3
-
-    if-eqz v6, :cond_2
-
-    invoke-virtual {v1}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v1
-
-    new-instance v19, Lokhttp3/Response;
-
-    move-object/from16 v3, v19
-
-    move-wide/from16 v16, v9
-
-    move-object v9, v1
-
-    move-object v10, v2
-
-    move-object/from16 v18, v0
-
-    invoke-direct/range {v3 .. v18}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
-
-    move-object/from16 v0, v19
-
-    goto :goto_2
-
-    :cond_2
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "message == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "protocol == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "request == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string v0, "code < 0: "
-
-    invoke-static {v0, v7}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    throw v1
-
-    :cond_7
-    :goto_2
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public final b(Ljava/lang/String;)Z
-    .locals 2
-
-    const-string v0, "Content-Length"
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    const-string v0, "Content-Encoding"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    const-string v0, "Content-Type"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :cond_1
-    :goto_0
-    return v1
-.end method
-
-.method public final c(Ljava/lang/String;)Z
-    .locals 2
-
-    const-string v0, "Connection"
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "Keep-Alive"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "Proxy-Authenticate"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "Proxy-Authorization"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "TE"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "Trailers"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "Transfer-Encoding"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "Upgrade"
-
-    invoke-static {v0, p1, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result p1
-
-    if-nez p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/c/a.smali b/com.discord/smali_classes2/n0/g0/c/a.smali
deleted file mode 100644
index d07bd8f9ef..0000000000
--- a/com.discord/smali_classes2/n0/g0/c/a.smali
+++ /dev/null
@@ -1,526 +0,0 @@
-.class public final Ln0/g0/c/a;
-.super Ljava/lang/Object;
-.source "CacheInterceptor.kt"
-
-# interfaces
-.implements Lokhttp3/Interceptor;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/c/a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:Ln0/g0/c/a$a;
-
-
-# instance fields
-.field public final b:Ln0/d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ln0/g0/c/a$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/g0/c/a$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/g0/c/a;->c:Ln0/g0/c/a$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Ln0/g0/c/a;->b:Ln0/d;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 17
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_14
-
-    new-instance v2, Ln0/g0/c/b;
-
-    invoke-direct {v2, v0, v1}, Ln0/g0/c/b;-><init>(Ln0/a0;Lokhttp3/Response;)V
-
-    iget-object v3, v2, Ln0/g0/c/b;->a:Ln0/a0;
-
-    if-eqz v3, :cond_0
-
-    invoke-virtual {v0}, Ln0/a0;->a()Ln0/e;
-
-    move-result-object v0
-
-    iget-boolean v0, v0, Ln0/e;->j:Z
-
-    if-eqz v0, :cond_0
-
-    new-instance v2, Ln0/g0/c/b;
-
-    invoke-direct {v2, v1, v1}, Ln0/g0/c/b;-><init>(Ln0/a0;Lokhttp3/Response;)V
-
-    :cond_0
-    iget-object v0, v2, Ln0/g0/c/b;->a:Ln0/a0;
-
-    iget-object v2, v2, Ln0/g0/c/b;->b:Lokhttp3/Response;
-
-    if-nez v0, :cond_1
-
-    if-nez v2, :cond_1
-
-    new-instance v0, Lokhttp3/Response$a;
-
-    invoke-direct {v0}, Lokhttp3/Response$a;-><init>()V
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lokhttp3/Response$a;->g(Ln0/a0;)Lokhttp3/Response$a;
-
-    sget-object v1, Ln0/y;->e:Ln0/y;
-
-    iput-object v1, v0, Lokhttp3/Response$a;->b:Ln0/y;
-
-    const/16 v1, 0x1f8
-
-    iput v1, v0, Lokhttp3/Response$a;->c:I
-
-    const-string v1, "Unsatisfiable Request (only-if-cached)"
-
-    iput-object v1, v0, Lokhttp3/Response$a;->d:Ljava/lang/String;
-
-    sget-object v1, Ln0/g0/b;->c:Lokhttp3/ResponseBody;
-
-    iput-object v1, v0, Lokhttp3/Response$a;->g:Lokhttp3/ResponseBody;
-
-    const-wide/16 v1, -0x1
-
-    iput-wide v1, v0, Lokhttp3/Response$a;->k:J
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v1
-
-    iput-wide v1, v0, Lokhttp3/Response$a;->l:J
-
-    invoke-virtual {v0}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_1
-    if-nez v0, :cond_3
-
-    if-eqz v2, :cond_2
-
-    new-instance v0, Lokhttp3/Response$a;
-
-    invoke-direct {v0, v2}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
-
-    sget-object v1, Ln0/g0/c/a;->c:Ln0/g0/c/a$a;
-
-    invoke-static {v1, v2}, Ln0/g0/c/a$a;->a(Ln0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lokhttp3/Response$a;->b(Lokhttp3/Response;)Lokhttp3/Response$a;
-
-    invoke-virtual {v0}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
-    move-object/from16 v3, p1
-
-    :try_start_0
-    invoke-interface {v3, v0}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const-string v3, "networkResponse"
-
-    if-eqz v2, :cond_12
-
-    if-eqz v0, :cond_11
-
-    iget v4, v0, Lokhttp3/Response;->g:I
-
-    const/16 v5, 0x130
-
-    if-ne v4, v5, :cond_11
-
-    new-instance v4, Lokhttp3/Response$a;
-
-    invoke-direct {v4, v2}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
-
-    sget-object v5, Ln0/g0/c/a;->c:Ln0/g0/c/a$a;
-
-    iget-object v6, v2, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    iget-object v7, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    new-instance v8, Ljava/util/ArrayList;
-
-    const/16 v9, 0x14
-
-    invoke-direct {v8, v9}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v6}, Lokhttp3/Headers;->size()I
-
-    move-result v9
-
-    const/4 v11, 0x0
-
-    :goto_0
-    const-string v12, "value"
-
-    const-string v13, "name"
-
-    if-ge v11, v9, :cond_a
-
-    invoke-virtual {v6, v11}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
-
-    move-result-object v14
-
-    invoke-virtual {v6, v11}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v15
-
-    const-string v1, "Warning"
-
-    const/4 v10, 0x1
-
-    invoke-static {v1, v14, v10}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    const/4 v1, 0x2
-
-    const-string v10, "1"
-
-    move-object/from16 v16, v6
-
-    const/4 v6, 0x0
-
-    invoke-static {v15, v10, v6, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    goto :goto_1
-
-    :cond_4
-    move-object/from16 v16, v6
-
-    :cond_5
-    invoke-virtual {v5, v14}, Ln0/g0/c/a$a;->b(Ljava/lang/String;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_6
-
-    invoke-virtual {v5, v14}, Ln0/g0/c/a$a;->c(Ljava/lang/String;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_6
-
-    invoke-virtual {v7, v14}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    if-nez v1, :cond_7
-
-    :cond_6
-    if-eqz v14, :cond_9
-
-    if-eqz v15, :cond_8
-
-    invoke-virtual {v8, v14}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    invoke-static {v15}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v8, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_7
-    :goto_1
-    add-int/lit8 v11, v11, 0x1
-
-    move-object/from16 v6, v16
-
-    const/4 v1, 0x0
-
-    goto :goto_0
-
-    :cond_8
-    invoke-static {v12}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_9
-    const/4 v0, 0x0
-
-    invoke-static {v13}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    invoke-virtual {v7}, Lokhttp3/Headers;->size()I
-
-    move-result v1
-
-    const/4 v6, 0x0
-
-    :goto_2
-    if-ge v6, v1, :cond_e
-
-    invoke-virtual {v7, v6}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-virtual {v5, v9}, Ln0/g0/c/a$a;->b(Ljava/lang/String;)Z
-
-    move-result v10
-
-    if-nez v10, :cond_d
-
-    invoke-virtual {v5, v9}, Ln0/g0/c/a$a;->c(Ljava/lang/String;)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_d
-
-    invoke-virtual {v7, v6}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v10
-
-    if-eqz v9, :cond_c
-
-    if-eqz v10, :cond_b
-
-    invoke-virtual {v8, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    invoke-static {v10}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object v9
-
-    invoke-virtual {v9}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-virtual {v8, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_3
-
-    :cond_b
-    invoke-static {v12}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v9, 0x0
-
-    throw v9
-
-    :cond_c
-    const/4 v9, 0x0
-
-    invoke-static {v13}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_d
-    :goto_3
-    const/4 v9, 0x0
-
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_2
-
-    :cond_e
-    const/4 v6, 0x0
-
-    const/4 v9, 0x0
-
-    new-array v1, v6, [Ljava/lang/String;
-
-    invoke-virtual {v8, v1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_10
-
-    check-cast v1, [Ljava/lang/String;
-
-    new-instance v5, Lokhttp3/Headers;
-
-    invoke-direct {v5, v1, v9}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v4, v5}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
-
-    iget-wide v5, v0, Lokhttp3/Response;->n:J
-
-    iput-wide v5, v4, Lokhttp3/Response$a;->k:J
-
-    iget-wide v5, v0, Lokhttp3/Response;->o:J
-
-    iput-wide v5, v4, Lokhttp3/Response$a;->l:J
-
-    sget-object v1, Ln0/g0/c/a;->c:Ln0/g0/c/a$a;
-
-    invoke-static {v1, v2}, Ln0/g0/c/a$a;->a(Ln0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
-
-    move-result-object v1
-
-    invoke-virtual {v4, v1}, Lokhttp3/Response$a;->b(Lokhttp3/Response;)Lokhttp3/Response$a;
-
-    sget-object v1, Ln0/g0/c/a;->c:Ln0/g0/c/a$a;
-
-    invoke-static {v1, v0}, Ln0/g0/c/a$a;->a(Ln0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
-
-    move-result-object v1
-
-    invoke-virtual {v4, v3, v1}, Lokhttp3/Response$a;->c(Ljava/lang/String;Lokhttp3/Response;)V
-
-    iput-object v1, v4, Lokhttp3/Response$a;->h:Lokhttp3/Response;
-
-    invoke-virtual {v4}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    iget-object v0, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v0, :cond_f
-
-    invoke-virtual {v0}, Lokhttp3/ResponseBody;->close()V
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_f
-    const/4 v0, 0x0
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_10
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_11
-    iget-object v1, v2, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v1, :cond_12
-
-    invoke-static {v1}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_12
-    if-eqz v0, :cond_13
-
-    new-instance v1, Lokhttp3/Response$a;
-
-    invoke-direct {v1, v0}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
-
-    sget-object v4, Ln0/g0/c/a;->c:Ln0/g0/c/a$a;
-
-    invoke-static {v4, v2}, Ln0/g0/c/a$a;->a(Ln0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Lokhttp3/Response$a;->b(Lokhttp3/Response;)Lokhttp3/Response$a;
-
-    sget-object v2, Ln0/g0/c/a;->c:Ln0/g0/c/a$a;
-
-    invoke-static {v2, v0}, Ln0/g0/c/a$a;->a(Ln0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
-
-    move-result-object v0
-
-    invoke-virtual {v1, v3, v0}, Lokhttp3/Response$a;->c(Ljava/lang/String;Lokhttp3/Response;)V
-
-    iput-object v0, v1, Lokhttp3/Response$a;->h:Lokhttp3/Response;
-
-    invoke-virtual {v1}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_13
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :catchall_0
-    move-exception v0
-
-    move-object v1, v0
-
-    throw v1
-
-    :cond_14
-    move-object v0, v1
-
-    const-string v1, "request"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/c/b.smali b/com.discord/smali_classes2/n0/g0/c/b.smali
deleted file mode 100644
index bc1cb0dbd2..0000000000
--- a/com.discord/smali_classes2/n0/g0/c/b.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-.class public final Ln0/g0/c/b;
-.super Ljava/lang/Object;
-.source "CacheStrategy.kt"
-
-
-# instance fields
-.field public final a:Ln0/a0;
-
-.field public final b:Lokhttp3/Response;
-
-
-# direct methods
-.method public constructor <init>(Ln0/a0;Lokhttp3/Response;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/c/b;->a:Ln0/a0;
-
-    iput-object p2, p0, Ln0/g0/c/b;->b:Lokhttp3/Response;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/a.smali b/com.discord/smali_classes2/n0/g0/d/a.smali
deleted file mode 100644
index eadd792a0b..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/a.smali
+++ /dev/null
@@ -1,253 +0,0 @@
-.class public final Ln0/g0/d/a;
-.super Ljava/lang/Object;
-.source "ConnectInterceptor.kt"
-
-# interfaces
-.implements Lokhttp3/Interceptor;
-
-
-# static fields
-.field public static final b:Ln0/g0/d/a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/g0/d/a;
-
-    invoke-direct {v0}, Ln0/g0/d/a;-><init>()V
-
-    sput-object v0, Ln0/g0/d/a;->b:Ln0/g0/d/a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 17
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v0, p1
-
-    move-object v1, v0
-
-    check-cast v1, Ln0/g0/e/g;
-
-    iget-object v2, v1, Ln0/g0/e/g;->f:Ln0/a0;
-
-    iget-object v9, v1, Ln0/g0/e/g;->c:Ln0/g0/d/m;
-
-    iget-object v3, v2, Ln0/a0;->c:Ljava/lang/String;
-
-    const-string v4, "GET"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    xor-int/lit8 v16, v3, 0x1
-
-    iget-object v3, v9, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v3
-
-    :try_start_0
-    iget-boolean v5, v9, Ln0/g0/d/m;->m:Z
-
-    xor-int/2addr v5, v4
-
-    if-eqz v5, :cond_5
-
-    iget-object v5, v9, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    const/4 v8, 0x0
-
-    if-nez v5, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v4, 0x0
-
-    :goto_0
-    if-eqz v4, :cond_4
-
-    monitor-exit v3
-
-    iget-object v3, v9, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    const/4 v4, 0x0
-
-    if-eqz v3, :cond_3
-
-    iget-object v5, v9, Ln0/g0/d/m;->n:Ln0/x;
-
-    if-eqz v5, :cond_2
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->e()I
-
-    move-result v11
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->b()I
-
-    move-result v12
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->c()I
-
-    move-result v13
-
-    iget v14, v5, Ln0/x;->E:I
-
-    iget-boolean v15, v5, Ln0/x;->i:Z
-
-    move-object v10, v3
-
-    :try_start_1
-    invoke-virtual/range {v10 .. v16}, Ln0/g0/d/d;->b(IIIIZZ)Ln0/g0/d/i;
-
-    move-result-object v6
-
-    invoke-virtual {v6, v5, v0}, Ln0/g0/d/i;->i(Ln0/x;Lokhttp3/Interceptor$Chain;)Ln0/g0/e/d;
-
-    move-result-object v0
-    :try_end_1
-    .catch Lokhttp3/internal/connection/RouteException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-
-    new-instance v10, Ln0/g0/d/c;
-
-    iget-object v5, v9, Ln0/g0/d/m;->o:Ln0/f;
-
-    iget-object v6, v9, Ln0/g0/d/m;->b:Ln0/t;
-
-    iget-object v7, v9, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    if-eqz v7, :cond_1
-
-    move-object v3, v10
-
-    move-object v4, v9
-
-    const/4 v11, 0x0
-
-    move-object v8, v0
-
-    invoke-direct/range {v3 .. v8}, Ln0/g0/d/c;-><init>(Ln0/g0/d/m;Ln0/f;Ln0/t;Ln0/g0/d/d;Ln0/g0/e/d;)V
-
-    iget-object v3, v9, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v3
-
-    :try_start_2
-    iput-object v10, v9, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    iput-boolean v11, v9, Ln0/g0/d/m;->i:Z
-
-    iput-boolean v11, v9, Ln0/g0/d/m;->j:Z
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    monitor-exit v3
-
-    invoke-virtual {v1, v2, v9, v10}, Ln0/g0/e/g;->f(Ln0/a0;Ln0/g0/d/m;Ln0/g0/d/c;)Lokhttp3/Response;
-
-    move-result-object v0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v3
-
-    throw v0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v4
-
-    :catch_0
-    move-exception v0
-
-    invoke-virtual {v3}, Ln0/g0/d/d;->e()V
-
-    new-instance v1, Lokhttp3/internal/connection/RouteException;
-
-    invoke-direct {v1, v0}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
-
-    throw v1
-
-    :catch_1
-    move-exception v0
-
-    invoke-virtual {v3}, Ln0/g0/d/d;->e()V
-
-    throw v0
-
-    :cond_2
-    const-string v0, "client"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v4
-
-    :cond_4
-    :try_start_3
-    const-string v0, "cannot make a new request because the previous response is still open: please call response.close()"
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    const-string v0, "released"
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit v3
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/b.smali b/com.discord/smali_classes2/n0/g0/d/b.smali
deleted file mode 100644
index be1414a9a1..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/b.smali
+++ /dev/null
@@ -1,380 +0,0 @@
-.class public final Ln0/g0/d/b;
-.super Ljava/lang/Object;
-.source "ConnectionSpecSelector.kt"
-
-
-# instance fields
-.field public a:I
-
-.field public b:Z
-
-.field public c:Z
-
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/m;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Ln0/m;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/b;->d:Ljava/util/List;
-
-    return-void
-
-    :cond_0
-    const-string p1, "connectionSpecs"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public final a(Ljavax/net/ssl/SSLSocket;)Ln0/m;
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget v0, p0, Ln0/g0/d/b;->a:I
-
-    iget-object v1, p0, Ln0/g0/d/b;->d:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    :goto_0
-    const/4 v2, 0x0
-
-    if-ge v0, v1, :cond_1
-
-    iget-object v3, p0, Ln0/g0/d/b;->d:Ljava/util/List;
-
-    invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ln0/m;
-
-    invoke-virtual {v3, p1}, Ln0/m;->b(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Ln0/g0/d/b;->a:I
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v3, v2
-
-    :goto_1
-    if-nez v3, :cond_3
-
-    const-string v0, "Unable to find acceptable protocols. isFallback="
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-boolean v1, p0, Ln0/g0/d/b;->c:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x2c
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v3, " modes="
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v3, p0, Ln0/g0/d/b;->d:Ljava/util/List;
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v1, " supported protocols="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
-
-    move-result-object p1
-
-    if-nez p1, :cond_2
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_2
-    invoke-static {p1}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v1, "java.util.Arrays.toString(this)"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/net/UnknownServiceException;
-
-    invoke-direct {v0, p1}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    iget v0, p0, Ln0/g0/d/b;->a:I
-
-    iget-object v1, p0, Ln0/g0/d/b;->d:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    :goto_2
-    if-ge v0, v1, :cond_5
-
-    iget-object v2, p0, Ln0/g0/d/b;->d:Ljava/util/List;
-
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ln0/m;
-
-    invoke-virtual {v2, p1}, Ln0/m;->b(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    const/4 v0, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_2
-
-    :cond_5
-    const/4 v0, 0x0
-
-    :goto_3
-    iput-boolean v0, p0, Ln0/g0/d/b;->b:Z
-
-    iget-boolean v0, p0, Ln0/g0/d/b;->c:Z
-
-    iget-object v1, v3, Ln0/m;->c:[Ljava/lang/String;
-
-    if-eqz v1, :cond_6
-
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v2, "sslSocket.enabledCipherSuites"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v2, v3, Ln0/m;->c:[Ljava/lang/String;
-
-    sget-object v4, Ln0/j;->t:Ln0/j$b;
-
-    sget-object v4, Ln0/j;->b:Ljava/util/Comparator;
-
-    invoke-static {v1, v2, v4}, Ln0/g0/b;->v([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)[Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_4
-
-    :cond_6
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
-
-    move-result-object v1
-
-    :goto_4
-    iget-object v2, v3, Ln0/m;->d:[Ljava/lang/String;
-
-    if-eqz v2, :cond_7
-
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v4, "sslSocket.enabledProtocols"
-
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v4, v3, Ln0/m;->d:[Ljava/lang/String;
-
-    sget-object v5, Lj0/j/c;->d:Lj0/j/c;
-
-    invoke-static {v2, v4, v5}, Ln0/g0/b;->v([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)[Ljava/lang/String;
-
-    move-result-object v2
-
-    goto :goto_5
-
-    :cond_7
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
-
-    move-result-object v2
-
-    :goto_5
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getSupportedCipherSuites()[Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "supportedCipherSuites"
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v5, Ln0/j;->t:Ln0/j$b;
-
-    sget-object v5, Ln0/j;->b:Ljava/util/Comparator;
-
-    const-string v6, "TLS_FALLBACK_SCSV"
-
-    invoke-static {v4, v6, v5}, Ln0/g0/b;->p([Ljava/lang/String;Ljava/lang/String;Ljava/util/Comparator;)I
-
-    move-result v5
-
-    const-string v6, "cipherSuitesIntersection"
-
-    if-eqz v0, :cond_8
-
-    const/4 v0, -0x1
-
-    if-eq v5, v0, :cond_8
-
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    aget-object v0, v4, v5
-
-    const-string v4, "supportedCipherSuites[indexOfFallbackScsv]"
-
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v4, v1
-
-    add-int/lit8 v4, v4, 0x1
-
-    invoke-static {v1, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    const-string v4, "java.util.Arrays.copyOf(this, newSize)"
-
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v1, [Ljava/lang/String;
-
-    invoke-static {v1}, Lf/n/a/k/a;->getLastIndex([Ljava/lang/Object;)I
-
-    move-result v4
-
-    aput-object v0, v1, v4
-
-    :cond_8
-    new-instance v0, Ln0/m$a;
-
-    invoke-direct {v0, v3}, Ln0/m$a;-><init>(Ln0/m;)V
-
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v4, v1
-
-    invoke-static {v1, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, [Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ln0/m$a;->b([Ljava/lang/String;)Ln0/m$a;
-
-    const-string v1, "tlsVersionsIntersection"
-
-    invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v1, v2
-
-    invoke-static {v2, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, [Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ln0/m$a;->e([Ljava/lang/String;)Ln0/m$a;
-
-    invoke-virtual {v0}, Ln0/m$a;->a()Ln0/m;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ln0/m;->c()Ljava/util/List;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_9
-
-    iget-object v1, v0, Ln0/m;->d:[Ljava/lang/String;
-
-    invoke-virtual {p1, v1}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
-
-    :cond_9
-    invoke-virtual {v0}, Ln0/m;->a()Ljava/util/List;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_a
-
-    iget-object v0, v0, Ln0/m;->c:[Ljava/lang/String;
-
-    invoke-virtual {p1, v0}, Ljavax/net/ssl/SSLSocket;->setEnabledCipherSuites([Ljava/lang/String;)V
-
-    :cond_a
-    return-object v3
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/c$a.smali b/com.discord/smali_classes2/n0/g0/d/c$a.smali
deleted file mode 100644
index 1db15ff92b..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/c$a.smali
+++ /dev/null
@@ -1,302 +0,0 @@
-.class public final Ln0/g0/d/c$a;
-.super Lo0/h;
-.source "Exchange.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/d/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public e:J
-
-.field public f:Z
-
-.field public final g:J
-
-.field public final synthetic h:Ln0/g0/d/c;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/c;Lo0/u;J)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lo0/u;",
-            "J)V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    iput-object p1, p0, Ln0/g0/d/c$a;->h:Ln0/g0/d/c;
-
-    invoke-direct {p0, p2}, Lo0/h;-><init>(Lo0/u;)V
-
-    iput-wide p3, p0, Ln0/g0/d/c$a;->g:J
-
-    return-void
-
-    :cond_0
-    const-string p1, "delegate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/io/IOException;)Ljava/io/IOException;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/io/IOException;",
-            ">(TE;)TE;"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/d/c$a;->d:Z
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/d/c$a;->d:Z
-
-    iget-object v1, p0, Ln0/g0/d/c$a;->h:Ln0/g0/d/c;
-
-    iget-wide v2, p0, Ln0/g0/d/c$a;->e:J
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x1
-
-    move-object v6, p1
-
-    invoke-virtual/range {v1 .. v6}, Ln0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public close()V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/d/c$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/d/c$a;->f:Z
-
-    iget-wide v0, p0, Ln0/g0/d/c$a;->g:J
-
-    const-wide/16 v2, -0x1
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_2
-
-    iget-wide v2, p0, Ln0/g0/d/c$a;->e:J
-
-    cmp-long v4, v2, v0
-
-    if-nez v4, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "unexpected end of stream"
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    :goto_0
-    :try_start_0
-    invoke-super {p0}, Lo0/h;->close()V
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception v0
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    throw v0
-.end method
-
-.method public flush()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    :try_start_0
-    invoke-super {p0}, Lo0/h;->flush()V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception v0
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    throw v0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    iget-boolean v0, p0, Ln0/g0/d/c$a;->f:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_2
-
-    iget-wide v0, p0, Ln0/g0/d/c$a;->g:J
-
-    const-wide/16 v2, -0x1
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_1
-
-    iget-wide v2, p0, Ln0/g0/d/c$a;->e:J
-
-    add-long/2addr v2, p2
-
-    cmp-long v4, v2, v0
-
-    if-gtz v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/net/ProtocolException;
-
-    const-string v0, "expected "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-wide v1, p0, Ln0/g0/d/c$a;->g:J
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v1, " bytes but received "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-wide v1, p0, Ln0/g0/d/c$a;->e:J
-
-    add-long/2addr v1, p2
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    :try_start_0
-    invoke-super {p0, p1, p2, p3}, Lo0/h;->write(Lo0/e;J)V
-
-    iget-wide v0, p0, Ln0/g0/d/c$a;->e:J
-
-    add-long/2addr v0, p2
-
-    iput-wide v0, p0, Ln0/g0/d/c$a;->e:J
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    invoke-virtual {p0, p1}, Ln0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/c$b.smali b/com.discord/smali_classes2/n0/g0/d/c$b.smali
deleted file mode 100644
index 21c1d57d9a..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/c$b.smali
+++ /dev/null
@@ -1,279 +0,0 @@
-.class public final Ln0/g0/d/c$b;
-.super Lo0/i;
-.source "Exchange.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/d/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public e:J
-
-.field public f:Z
-
-.field public g:Z
-
-.field public final h:J
-
-.field public final synthetic i:Ln0/g0/d/c;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/c;Lo0/w;J)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lo0/w;",
-            "J)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_1
-
-    iput-object p1, p0, Ln0/g0/d/c$b;->i:Ln0/g0/d/c;
-
-    invoke-direct {p0, p2}, Lo0/i;-><init>(Lo0/w;)V
-
-    iput-wide p3, p0, Ln0/g0/d/c$b;->h:J
-
-    const-wide/16 p1, 0x0
-
-    cmp-long v1, p3, p1
-
-    if-nez v1, :cond_0
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
-
-    :cond_0
-    return-void
-
-    :cond_1
-    const-string p1, "delegate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    iget-boolean v1, p0, Ln0/g0/d/c$b;->g:Z
-
-    xor-int/lit8 v1, v1, 0x1
-
-    if-eqz v1, :cond_4
-
-    :try_start_0
-    iget-object v1, p0, Lo0/i;->d:Lo0/w;
-
-    invoke-interface {v1, p1, p2, p3}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-
-    const-wide/16 v1, -0x1
-
-    cmp-long p3, p1, v1
-
-    if-nez p3, :cond_0
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
-
-    return-wide v1
-
-    :cond_0
-    iget-wide v3, p0, Ln0/g0/d/c$b;->e:J
-
-    add-long/2addr v3, p1
-
-    iget-wide v5, p0, Ln0/g0/d/c$b;->h:J
-
-    cmp-long p3, v5, v1
-
-    if-eqz p3, :cond_2
-
-    iget-wide v1, p0, Ln0/g0/d/c$b;->h:J
-
-    cmp-long p3, v3, v1
-
-    if-gtz p3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Ljava/net/ProtocolException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p3, "expected "
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-wide v0, p0, Ln0/g0/d/c$b;->h:J
-
-    invoke-virtual {p2, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string p3, " bytes but received "
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v3, v4}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    :goto_0
-    iput-wide v3, p0, Ln0/g0/d/c$b;->e:J
-
-    iget-wide v1, p0, Ln0/g0/d/c$b;->h:J
-
-    cmp-long p3, v3, v1
-
-    if-nez p3, :cond_3
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :cond_3
-    return-wide p1
-
-    :catch_0
-    move-exception p1
-
-    invoke-virtual {p0, p1}, Ln0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    throw p1
-
-    :cond_4
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final a(Ljava/io/IOException;)Ljava/io/IOException;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/io/IOException;",
-            ">(TE;)TE;"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/d/c$b;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/d/c$b;->f:Z
-
-    iget-object v1, p0, Ln0/g0/d/c$b;->i:Ln0/g0/d/c;
-
-    iget-wide v2, p0, Ln0/g0/d/c$b;->e:J
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    move-object v6, p1
-
-    invoke-virtual/range {v1 .. v6}, Ln0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public close()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/d/c$b;->g:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/d/c$b;->g:Z
-
-    :try_start_0
-    iget-object v0, p0, Lo0/i;->d:Lo0/w;
-
-    invoke-interface {v0}, Lo0/w;->close()V
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception v0
-
-    invoke-virtual {p0, v0}, Ln0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/c.smali b/com.discord/smali_classes2/n0/g0/d/c.smali
deleted file mode 100644
index a8fd2a48ad..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/c.smali
+++ /dev/null
@@ -1,505 +0,0 @@
-.class public final Ln0/g0/d/c;
-.super Ljava/lang/Object;
-.source "Exchange.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/d/c$a;,
-        Ln0/g0/d/c$b;
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Z
-
-.field public final b:Ln0/g0/d/m;
-
-.field public final c:Ln0/f;
-
-.field public final d:Ln0/t;
-
-.field public final e:Ln0/g0/d/d;
-
-.field public final f:Ln0/g0/e/d;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/m;Ln0/f;Ln0/t;Ln0/g0/d/d;Ln0/g0/e/d;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_2
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/c;->b:Ln0/g0/d/m;
-
-    iput-object p2, p0, Ln0/g0/d/c;->c:Ln0/f;
-
-    iput-object p3, p0, Ln0/g0/d/c;->d:Ln0/t;
-
-    iput-object p4, p0, Ln0/g0/d/c;->e:Ln0/g0/d/d;
-
-    iput-object p5, p0, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    return-void
-
-    :cond_0
-    const-string p1, "finder"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "eventListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a(JZZLjava/io/IOException;)Ljava/io/IOException;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/io/IOException;",
-            ">(JZZTE;)TE;"
-        }
-    .end annotation
-
-    if-eqz p5, :cond_0
-
-    invoke-virtual {p0, p5}, Ln0/g0/d/c;->f(Ljava/io/IOException;)V
-
-    :cond_0
-    const-string p1, "call"
-
-    const/4 p2, 0x0
-
-    if-eqz p4, :cond_4
-
-    if-eqz p5, :cond_1
-
-    iget-object v0, p0, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v1, p0, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {v0, v1, p5}, Ln0/t;->c(Ln0/f;Ljava/io/IOException;)V
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v1, p0, Ln0/g0/d/c;->c:Ln0/f;
-
-    if-eqz v0, :cond_3
-
-    if-eqz v1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_3
-    throw p2
-
-    :cond_4
-    :goto_0
-    if-eqz p3, :cond_8
-
-    if-eqz p5, :cond_5
-
-    iget-object p1, p0, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object p2, p0, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {p1, p2, p5}, Ln0/t;->d(Ln0/f;Ljava/io/IOException;)V
-
-    goto :goto_1
-
-    :cond_5
-    iget-object v0, p0, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v1, p0, Ln0/g0/d/c;->c:Ln0/f;
-
-    if-eqz v0, :cond_7
-
-    if-eqz v1, :cond_6
-
-    goto :goto_1
-
-    :cond_6
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_7
-    throw p2
-
-    :cond_8
-    :goto_1
-    iget-object p1, p0, Ln0/g0/d/c;->b:Ln0/g0/d/m;
-
-    invoke-virtual {p1, p0, p4, p3, p5}, Ln0/g0/d/m;->e(Ln0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final b()Ln0/g0/d/i;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v0}, Ln0/g0/e/d;->a()Ln0/g0/d/i;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final c(Ln0/a0;Z)Lo0/u;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iput-boolean p2, p0, Ln0/g0/d/c;->a:Z
-
-    iget-object p2, p1, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_2
-
-    invoke-virtual {p2}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v1
-
-    iget-object p2, p0, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v3, p0, Ln0/g0/d/c;->c:Ln0/f;
-
-    if-eqz p2, :cond_1
-
-    if-eqz v3, :cond_0
-
-    iget-object p2, p0, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {p2, p1, v1, v2}, Ln0/g0/e/d;->h(Ln0/a0;J)Lo0/u;
-
-    move-result-object p1
-
-    new-instance p2, Ln0/g0/d/c$a;
-
-    invoke-direct {p2, p0, p1, v1, v2}, Ln0/g0/d/c$a;-><init>(Ln0/g0/d/c;Lo0/u;J)V
-
-    return-object p2
-
-    :cond_0
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    throw v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-.end method
-
-.method public final d()Ln0/g0/k/a$f;
-    .locals 10
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/net/SocketException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/d/c;->b:Ln0/g0/d/m;
-
-    invoke-virtual {v0}, Ln0/g0/d/m;->j()V
-
-    iget-object v0, p0, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v0}, Ln0/g0/e/d;->a()Ln0/g0/d/i;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_3
-
-    iget-object v2, v0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    if-eqz v2, :cond_2
-
-    iget-object v8, v0, Ln0/g0/d/i;->g:Lo0/g;
-
-    if-eqz v8, :cond_1
-
-    iget-object v9, v0, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-
-    if-eqz v9, :cond_0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v2, v1}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    invoke-virtual {v0}, Ln0/g0/d/i;->j()V
-
-    new-instance v0, Ln0/g0/d/h;
-
-    const/4 v7, 0x1
-
-    move-object v3, v0
-
-    move-object v4, p0
-
-    move-object v5, v8
-
-    move-object v6, v9
-
-    invoke-direct/range {v3 .. v9}, Ln0/g0/d/h;-><init>(Ln0/g0/d/c;Lo0/g;Lokio/BufferedSink;ZLo0/g;Lokio/BufferedSink;)V
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public final e(Z)Lokhttp3/Response$a;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v0, p1}, Ln0/g0/e/d;->e(Z)Lokhttp3/Response$a;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    iput-object p0, p1, Lokhttp3/Response$a;->m:Ln0/g0/d/c;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :cond_0
-    return-object p1
-
-    :catch_0
-    move-exception p1
-
-    iget-object v0, p0, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v1, p0, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {v0, v1, p1}, Ln0/t;->d(Ln0/f;Ljava/io/IOException;)V
-
-    invoke-virtual {p0, p1}, Ln0/g0/d/c;->f(Ljava/io/IOException;)V
-
-    throw p1
-.end method
-
-.method public final f(Ljava/io/IOException;)V
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/d/c;->e:Ln0/g0/d/d;
-
-    invoke-virtual {v0}, Ln0/g0/d/d;->e()V
-
-    iget-object v0, p0, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v0}, Ln0/g0/e/d;->a()Ln0/g0/d/i;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_6
-
-    iget-object v1, v0, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    invoke-static {v1}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    xor-int/2addr v1, v2
-
-    sget-boolean v3, Lj0/h;->a:Z
-
-    if-eqz v3, :cond_1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, "Assertion failed"
-
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    iget-object v1, v0, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    monitor-enter v1
-
-    :try_start_0
-    instance-of v3, p1, Lokhttp3/internal/http2/StreamResetException;
-
-    if-eqz v3, :cond_3
-
-    check-cast p1, Lokhttp3/internal/http2/StreamResetException;
-
-    iget-object p1, p1, Lokhttp3/internal/http2/StreamResetException;->errorCode:Ln0/g0/g/a;
-
-    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
-
-    move-result p1
-
-    const/4 v3, 0x4
-
-    if-eq p1, v3, :cond_2
-
-    const/4 v3, 0x5
-
-    if-eq p1, v3, :cond_5
-
-    iput-boolean v2, v0, Ln0/g0/d/i;->i:Z
-
-    iget p1, v0, Ln0/g0/d/i;->j:I
-
-    add-int/2addr p1, v2
-
-    iput p1, v0, Ln0/g0/d/i;->j:I
-
-    goto :goto_1
-
-    :cond_2
-    iget p1, v0, Ln0/g0/d/i;->l:I
-
-    add-int/2addr p1, v2
-
-    iput p1, v0, Ln0/g0/d/i;->l:I
-
-    if-le p1, v2, :cond_5
-
-    iput-boolean v2, v0, Ln0/g0/d/i;->i:Z
-
-    iget p1, v0, Ln0/g0/d/i;->j:I
-
-    add-int/2addr p1, v2
-
-    iput p1, v0, Ln0/g0/d/i;->j:I
-
-    goto :goto_1
-
-    :cond_3
-    invoke-virtual {v0}, Ln0/g0/d/i;->h()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_4
-
-    instance-of v3, p1, Lokhttp3/internal/http2/ConnectionShutdownException;
-
-    if-eqz v3, :cond_5
-
-    :cond_4
-    iput-boolean v2, v0, Ln0/g0/d/i;->i:Z
-
-    iget v3, v0, Ln0/g0/d/i;->k:I
-
-    if-nez v3, :cond_5
-
-    iget-object v3, v0, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    iget-object v4, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    invoke-virtual {v3, v4, p1}, Ln0/g0/d/j;->a(Ln0/e0;Ljava/io/IOException;)V
-
-    iget p1, v0, Ln0/g0/d/i;->j:I
-
-    add-int/2addr p1, v2
-
-    iput p1, v0, Ln0/g0/d/i;->j:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_5
-    :goto_1
-    monitor-exit v1
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v1
-
-    throw p1
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/d.smali b/com.discord/smali_classes2/n0/g0/d/d.smali
deleted file mode 100644
index aab166b8f7..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/d.smali
+++ /dev/null
@@ -1,1459 +0,0 @@
-.class public final Ln0/g0/d/d;
-.super Ljava/lang/Object;
-.source "ExchangeFinder.kt"
-
-
-# instance fields
-.field public a:Ln0/g0/d/l$a;
-
-.field public final b:Ln0/g0/d/l;
-
-.field public c:Ln0/g0/d/i;
-
-.field public d:Z
-
-.field public e:Ln0/e0;
-
-.field public final f:Ln0/g0/d/m;
-
-.field public final g:Ln0/g0/d/j;
-
-.field public final h:Ln0/a;
-
-.field public final i:Ln0/f;
-
-.field public final j:Ln0/t;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/m;Ln0/g0/d/j;Ln0/a;Ln0/f;Ln0/t;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_2
-
-    if-eqz p4, :cond_1
-
-    if-eqz p5, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iput-object p2, p0, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    iput-object p3, p0, Ln0/g0/d/d;->h:Ln0/a;
-
-    iput-object p4, p0, Ln0/g0/d/d;->i:Ln0/f;
-
-    iput-object p5, p0, Ln0/g0/d/d;->j:Ln0/t;
-
-    new-instance p1, Ln0/g0/d/l;
-
-    iget-object p2, p2, Ln0/g0/d/j;->d:Ln0/g0/d/k;
-
-    invoke-direct {p1, p3, p2, p4, p5}, Ln0/g0/d/l;-><init>(Ln0/a;Ln0/g0/d/k;Ln0/f;Ln0/t;)V
-
-    iput-object p1, p0, Ln0/g0/d/d;->b:Ln0/g0/d/l;
-
-    return-void
-
-    :cond_0
-    const-string p1, "eventListener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "connectionPool"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a(IIIIZ)Ln0/g0/d/i;
-    .locals 18
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v1, p0
-
-    new-instance v0, Lkotlin/jvm/internal/Ref$ObjectRef;
-
-    invoke-direct {v0}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
-
-    iget-object v2, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    monitor-enter v2
-
-    :try_start_0
-    iget-object v3, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    invoke-virtual {v3}, Ln0/g0/d/m;->f()Z
-
-    move-result v3
-
-    if-nez v3, :cond_35
-
-    const/4 v3, 0x0
-
-    iput-boolean v3, v1, Ln0/g0/d/d;->d:Z
-
-    iget-object v4, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v4, v4, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    iput-object v4, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    iget-object v4, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v4, v4, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    const/4 v5, 0x0
-
-    if-eqz v4, :cond_1
-
-    iget-object v4, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v4, v4, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-eqz v4, :cond_0
-
-    iget-boolean v4, v4, Ln0/g0/d/i;->i:Z
-
-    if-eqz v4, :cond_1
-
-    iget-object v4, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    invoke-virtual {v4}, Ln0/g0/d/m;->i()Ljava/net/Socket;
-
-    move-result-object v4
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_3
-
-    throw v5
-
-    :cond_1
-    move-object v4, v5
-
-    :goto_0
-    :try_start_1
-    iget-object v6, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v6, v6, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-eqz v6, :cond_2
-
-    iget-object v6, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v6, v6, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    iput-object v5, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    goto :goto_1
-
-    :cond_2
-    move-object v6, v5
-
-    :goto_1
-    const/4 v7, 0x1
-
-    if-nez v6, :cond_6
-
-    iget-object v8, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    iget-object v9, v1, Ln0/g0/d/d;->h:Ln0/a;
-
-    iget-object v10, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    invoke-virtual {v8, v9, v10, v5, v3}, Ln0/g0/d/j;->d(Ln0/a;Ln0/g0/d/m;Ljava/util/List;Z)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    iget-object v6, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v6, v6, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    const/4 v8, 0x1
-
-    move-object v8, v5
-
-    const/4 v9, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    iget-object v8, v1, Ln0/g0/d/d;->e:Ln0/e0;
-
-    if-eqz v8, :cond_4
-
-    iget-object v8, v1, Ln0/g0/d/d;->e:Ln0/e0;
-
-    iput-object v5, v1, Ln0/g0/d/d;->e:Ln0/e0;
-
-    goto :goto_2
-
-    :cond_4
-    invoke-virtual/range {p0 .. p0}, Ln0/g0/d/d;->d()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_6
-
-    iget-object v8, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v8, v8, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-eqz v8, :cond_5
-
-    iget-object v8, v8, Ln0/g0/d/i;->q:Ln0/e0;
-
-    goto :goto_2
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_3
-
-    throw v5
-
-    :cond_6
-    move-object v8, v5
-
-    :goto_2
-    const/4 v9, 0x0
-
-    :goto_3
-    monitor-exit v2
-
-    if-eqz v4, :cond_7
-
-    invoke-static {v4}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_7
-    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    check-cast v0, Ln0/g0/d/i;
-
-    if-eqz v0, :cond_b
-
-    iget-object v2, v1, Ln0/g0/d/d;->j:Ln0/t;
-
-    iget-object v4, v1, Ln0/g0/d/d;->i:Ln0/f;
-
-    if-eqz v0, :cond_a
-
-    if-eqz v2, :cond_9
-
-    if-eqz v4, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    const-string v0, "call"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_9
-    throw v5
-
-    :cond_a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_b
-    :goto_4
-    if-eqz v9, :cond_d
-
-    iget-object v0, v1, Ln0/g0/d/d;->j:Ln0/t;
-
-    iget-object v2, v1, Ln0/g0/d/d;->i:Ln0/f;
-
-    if-eqz v6, :cond_c
-
-    invoke-virtual {v0, v2, v6}, Ln0/t;->b(Ln0/f;Ln0/k;)V
-
-    goto :goto_5
-
-    :cond_c
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_d
-    :goto_5
-    if-eqz v6, :cond_e
-
-    return-object v6
-
-    :cond_e
-    if-nez v8, :cond_25
-
-    iget-object v0, v1, Ln0/g0/d/d;->a:Ln0/g0/d/l$a;
-
-    if-eqz v0, :cond_f
-
-    invoke-virtual {v0}, Ln0/g0/d/l$a;->a()Z
-
-    move-result v0
-
-    if-nez v0, :cond_25
-
-    :cond_f
-    iget-object v0, v1, Ln0/g0/d/d;->b:Ln0/g0/d/l;
-
-    invoke-virtual {v0}, Ln0/g0/d/l;->a()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_24
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
-
-    :cond_10
-    invoke-virtual {v0}, Ln0/g0/d/l;->b()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_22
-
-    invoke-virtual {v0}, Ln0/g0/d/l;->b()Z
-
-    move-result v4
-
-    const-string v10, "No route to "
-
-    if-eqz v4, :cond_21
-
-    iget-object v4, v0, Ln0/g0/d/l;->a:Ljava/util/List;
-
-    iget v11, v0, Ln0/g0/d/l;->b:I
-
-    add-int/lit8 v12, v11, 0x1
-
-    iput v12, v0, Ln0/g0/d/l;->b:I
-
-    invoke-interface {v4, v11}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/net/Proxy;
-
-    new-instance v11, Ljava/util/ArrayList;
-
-    invoke-direct {v11}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v11, v0, Ln0/g0/d/l;->c:Ljava/util/List;
-
-    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v12
-
-    sget-object v13, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
-
-    if-eq v12, v13, :cond_15
-
-    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v12
-
-    sget-object v13, Ljava/net/Proxy$Type;->SOCKS:Ljava/net/Proxy$Type;
-
-    if-ne v12, v13, :cond_11
-
-    goto :goto_7
-
-    :cond_11
-    invoke-virtual {v4}, Ljava/net/Proxy;->address()Ljava/net/SocketAddress;
-
-    move-result-object v12
-
-    instance-of v13, v12, Ljava/net/InetSocketAddress;
-
-    if-eqz v13, :cond_14
-
-    check-cast v12, Ljava/net/InetSocketAddress;
-
-    if-eqz v12, :cond_13
-
-    invoke-virtual {v12}, Ljava/net/InetSocketAddress;->getAddress()Ljava/net/InetAddress;
-
-    move-result-object v13
-
-    if-eqz v13, :cond_12
-
-    invoke-virtual {v13}, Ljava/net/InetAddress;->getHostAddress()Ljava/lang/String;
-
-    move-result-object v13
-
-    const-string v14, "address.hostAddress"
-
-    invoke-static {v13, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_6
-
-    :cond_12
-    invoke-virtual {v12}, Ljava/net/InetSocketAddress;->getHostName()Ljava/lang/String;
-
-    move-result-object v13
-
-    const-string v14, "hostName"
-
-    invoke-static {v13, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_6
-    invoke-virtual {v12}, Ljava/net/InetSocketAddress;->getPort()I
-
-    move-result v12
-
-    goto :goto_8
-
-    :cond_13
-    const-string v0, "$this$socketHost"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_14
-    const-string v0, "Proxy.address() is not an InetSocketAddress: "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {v12}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v2, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_15
-    :goto_7
-    iget-object v12, v0, Ln0/g0/d/l;->e:Ln0/a;
-
-    iget-object v12, v12, Ln0/a;->a:Ln0/w;
-
-    iget-object v13, v12, Ln0/w;->e:Ljava/lang/String;
-
-    iget v12, v12, Ln0/w;->f:I
-
-    :goto_8
-    const v14, 0xffff
-
-    if-gt v7, v12, :cond_20
-
-    if-lt v14, v12, :cond_20
-
-    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v10
-
-    sget-object v14, Ljava/net/Proxy$Type;->SOCKS:Ljava/net/Proxy$Type;
-
-    if-ne v10, v14, :cond_16
-
-    invoke-static {v13, v12}, Ljava/net/InetSocketAddress;->createUnresolved(Ljava/lang/String;I)Ljava/net/InetSocketAddress;
-
-    move-result-object v10
-
-    invoke-virtual {v11, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_a
-
-    :cond_16
-    iget-object v10, v0, Ln0/g0/d/l;->h:Ln0/t;
-
-    iget-object v14, v0, Ln0/g0/d/l;->g:Ln0/f;
-
-    if-eqz v10, :cond_1f
-
-    const-string v10, "call"
-
-    if-eqz v14, :cond_1e
-
-    if-eqz v13, :cond_1d
-
-    iget-object v14, v0, Ln0/g0/d/l;->e:Ln0/a;
-
-    iget-object v14, v14, Ln0/a;->d:Ln0/s;
-
-    invoke-interface {v14, v13}, Ln0/s;->a(Ljava/lang/String;)Ljava/util/List;
-
-    move-result-object v14
-
-    invoke-interface {v14}, Ljava/util/List;->isEmpty()Z
-
-    move-result v15
-
-    if-nez v15, :cond_1c
-
-    iget-object v13, v0, Ln0/g0/d/l;->h:Ln0/t;
-
-    iget-object v15, v0, Ln0/g0/d/l;->g:Ln0/f;
-
-    if-eqz v13, :cond_1b
-
-    if-eqz v15, :cond_1a
-
-    invoke-interface {v14}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v10
-
-    :goto_9
-    invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v13
-
-    if-eqz v13, :cond_17
-
-    invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v13
-
-    check-cast v13, Ljava/net/InetAddress;
-
-    new-instance v14, Ljava/net/InetSocketAddress;
-
-    invoke-direct {v14, v13, v12}, Ljava/net/InetSocketAddress;-><init>(Ljava/net/InetAddress;I)V
-
-    invoke-virtual {v11, v14}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_9
-
-    :cond_17
-    :goto_a
-    iget-object v10, v0, Ln0/g0/d/l;->c:Ljava/util/List;
-
-    invoke-interface {v10}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v10
-
-    :goto_b
-    invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v11
-
-    if-eqz v11, :cond_19
-
-    invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v11
-
-    check-cast v11, Ljava/net/InetSocketAddress;
-
-    new-instance v12, Ln0/e0;
-
-    iget-object v13, v0, Ln0/g0/d/l;->e:Ln0/a;
-
-    invoke-direct {v12, v13, v4, v11}, Ln0/e0;-><init>(Ln0/a;Ljava/net/Proxy;Ljava/net/InetSocketAddress;)V
-
-    iget-object v11, v0, Ln0/g0/d/l;->f:Ln0/g0/d/k;
-
-    monitor-enter v11
-
-    :try_start_2
-    iget-object v13, v11, Ln0/g0/d/k;->a:Ljava/util/Set;
-
-    invoke-interface {v13, v12}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v13
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    monitor-exit v11
-
-    if-eqz v13, :cond_18
-
-    iget-object v11, v0, Ln0/g0/d/l;->d:Ljava/util/List;
-
-    invoke-interface {v11, v12}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_b
-
-    :cond_18
-    invoke-virtual {v2, v12}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_b
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v11
-
-    throw v0
-
-    :cond_19
-    invoke-virtual {v2}, Ljava/util/ArrayList;->isEmpty()Z
-
-    move-result v4
-
-    xor-int/2addr v4, v7
-
-    if-eqz v4, :cond_10
-
-    goto :goto_c
-
-    :cond_1a
-    invoke-static {v10}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_1b
-    throw v5
-
-    :cond_1c
-    new-instance v2, Ljava/net/UnknownHostException;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v0, v0, Ln0/g0/d/l;->e:Ln0/a;
-
-    iget-object v0, v0, Ln0/a;->d:Ln0/s;
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v0, " returned no addresses for "
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v2, v0}, Ljava/net/UnknownHostException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1d
-    const-string v0, "domainName"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_1e
-    invoke-static {v10}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_1f
-    throw v5
-
-    :cond_20
-    new-instance v0, Ljava/net/SocketException;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v3, 0x3a
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v12}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v3, "; port is out of range"
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v0, v2}, Ljava/net/SocketException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_21
-    new-instance v2, Ljava/net/SocketException;
-
-    invoke-static {v10}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    iget-object v4, v0, Ln0/g0/d/l;->e:Ln0/a;
-
-    iget-object v4, v4, Ln0/a;->a:Ln0/w;
-
-    iget-object v4, v4, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v4, "; exhausted proxy configurations: "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v0, v0, Ln0/g0/d/l;->a:Ljava/util/List;
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v2, v0}, Ljava/net/SocketException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_22
-    :goto_c
-    invoke-virtual {v2}, Ljava/util/ArrayList;->isEmpty()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_23
-
-    iget-object v4, v0, Ln0/g0/d/l;->d:Ljava/util/List;
-
-    invoke-static {v2, v4}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-
-    iget-object v0, v0, Ln0/g0/d/l;->d:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->clear()V
-
-    :cond_23
-    new-instance v0, Ln0/g0/d/l$a;
-
-    invoke-direct {v0, v2}, Ln0/g0/d/l$a;-><init>(Ljava/util/List;)V
-
-    iput-object v0, v1, Ln0/g0/d/d;->a:Ln0/g0/d/l$a;
-
-    const/4 v0, 0x1
-
-    goto :goto_d
-
-    :cond_24
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-
-    :cond_25
-    const/4 v0, 0x0
-
-    :goto_d
-    iget-object v2, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    monitor-enter v2
-
-    :try_start_3
-    iget-object v4, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    invoke-virtual {v4}, Ln0/g0/d/m;->f()Z
-
-    move-result v4
-
-    if-nez v4, :cond_34
-
-    if-eqz v0, :cond_27
-
-    iget-object v0, v1, Ln0/g0/d/d;->a:Ln0/g0/d/l$a;
-
-    if-eqz v0, :cond_26
-
-    iget-object v0, v0, Ln0/g0/d/l$a;->b:Ljava/util/List;
-
-    iget-object v4, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    iget-object v10, v1, Ln0/g0/d/d;->h:Ln0/a;
-
-    iget-object v11, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    invoke-virtual {v4, v10, v11, v0, v3}, Ln0/g0/d/j;->d(Ln0/a;Ln0/g0/d/m;Ljava/util/List;Z)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_28
-
-    iget-object v3, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v6, v3, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    const/4 v9, 0x1
-
-    goto :goto_e
-
-    :cond_26
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    throw v5
-
-    :cond_27
-    move-object v0, v5
-
-    :cond_28
-    :goto_e
-    if-nez v9, :cond_2d
-
-    if-nez v8, :cond_2b
-
-    :try_start_4
-    iget-object v3, v1, Ln0/g0/d/d;->a:Ln0/g0/d/l$a;
-
-    if-eqz v3, :cond_2a
-
-    invoke-virtual {v3}, Ln0/g0/d/l$a;->a()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_29
-
-    iget-object v4, v3, Ln0/g0/d/l$a;->b:Ljava/util/List;
-
-    iget v6, v3, Ln0/g0/d/l$a;->a:I
-
-    add-int/lit8 v8, v6, 0x1
-
-    iput v8, v3, Ln0/g0/d/l$a;->a:I
-
-    invoke-interface {v4, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    move-object v8, v3
-
-    check-cast v8, Ln0/e0;
-
-    goto :goto_f
-
-    :cond_29
-    new-instance v0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v0
-
-    :cond_2a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    throw v5
-
-    :cond_2b
-    :goto_f
-    :try_start_5
-    new-instance v6, Ln0/g0/d/i;
-
-    iget-object v3, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    if-eqz v8, :cond_2c
-
-    invoke-direct {v6, v3, v8}, Ln0/g0/d/i;-><init>(Ln0/g0/d/j;Ln0/e0;)V
-
-    iput-object v6, v1, Ln0/g0/d/d;->c:Ln0/g0/d/i;
-
-    goto :goto_10
-
-    :cond_2c
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
-
-    throw v5
-
-    :cond_2d
-    :goto_10
-    monitor-exit v2
-
-    if-eqz v9, :cond_2f
-
-    iget-object v0, v1, Ln0/g0/d/d;->j:Ln0/t;
-
-    iget-object v2, v1, Ln0/g0/d/d;->i:Ln0/f;
-
-    if-eqz v6, :cond_2e
-
-    invoke-virtual {v0, v2, v6}, Ln0/t;->b(Ln0/f;Ln0/k;)V
-
-    return-object v6
-
-    :cond_2e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_2f
-    if-eqz v6, :cond_33
-
-    iget-object v2, v1, Ln0/g0/d/d;->i:Ln0/f;
-
-    iget-object v3, v1, Ln0/g0/d/d;->j:Ln0/t;
-
-    move-object v10, v6
-
-    move/from16 v11, p1
-
-    move/from16 v12, p2
-
-    move/from16 v13, p3
-
-    move/from16 v14, p4
-
-    move/from16 v15, p5
-
-    move-object/from16 v16, v2
-
-    move-object/from16 v17, v3
-
-    invoke-virtual/range {v10 .. v17}, Ln0/g0/d/i;->d(IIIIZLn0/f;Ln0/t;)V
-
-    iget-object v2, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    iget-object v2, v2, Ln0/g0/d/j;->d:Ln0/g0/d/k;
-
-    iget-object v3, v6, Ln0/g0/d/i;->q:Ln0/e0;
-
-    invoke-virtual {v2, v3}, Ln0/g0/d/k;->a(Ln0/e0;)V
-
-    iget-object v2, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    monitor-enter v2
-
-    :try_start_6
-    iput-object v5, v1, Ln0/g0/d/d;->c:Ln0/g0/d/i;
-
-    iget-object v3, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    iget-object v4, v1, Ln0/g0/d/d;->h:Ln0/a;
-
-    iget-object v9, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    invoke-virtual {v3, v4, v9, v0, v7}, Ln0/g0/d/j;->d(Ln0/a;Ln0/g0/d/m;Ljava/util/List;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_30
-
-    iput-boolean v7, v6, Ln0/g0/d/i;->i:Z
-
-    invoke-virtual {v6}, Ln0/g0/d/i;->k()Ljava/net/Socket;
-
-    move-result-object v0
-
-    iget-object v3, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v6, v3, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    iput-object v8, v1, Ln0/g0/d/d;->e:Ln0/e0;
-
-    goto :goto_11
-
-    :cond_30
-    iget-object v0, v1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    invoke-virtual {v0, v6}, Ln0/g0/d/j;->c(Ln0/g0/d/i;)V
-
-    iget-object v0, v1, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    invoke-virtual {v0, v6}, Ln0/g0/d/m;->a(Ln0/g0/d/i;)V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_1
-
-    move-object v0, v5
-
-    :goto_11
-    monitor-exit v2
-
-    if-eqz v0, :cond_31
-
-    invoke-static {v0}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_31
-    iget-object v0, v1, Ln0/g0/d/d;->j:Ln0/t;
-
-    iget-object v2, v1, Ln0/g0/d/d;->i:Ln0/f;
-
-    if-eqz v6, :cond_32
-
-    invoke-virtual {v0, v2, v6}, Ln0/t;->b(Ln0/f;Ln0/k;)V
-
-    return-object v6
-
-    :cond_32
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit v2
-
-    throw v0
-
-    :cond_33
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_34
-    :try_start_7
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v3, "Canceled"
-
-    invoke-direct {v0, v3}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
-
-    :catchall_2
-    move-exception v0
-
-    monitor-exit v2
-
-    throw v0
-
-    :cond_35
-    :try_start_8
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v3, "Canceled"
-
-    invoke-direct {v0, v3}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_3
-
-    :catchall_3
-    move-exception v0
-
-    monitor-exit v2
-
-    throw v0
-.end method
-
-.method public final b(IIIIZZ)Ln0/g0/d/i;
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    :goto_0
-    invoke-virtual/range {p0 .. p5}, Ln0/g0/d/d;->a(IIIIZ)Ln0/g0/d/i;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget v2, v0, Ln0/g0/d/i;->k:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    if-nez v2, :cond_0
-
-    monitor-exit v1
-
-    return-object v0
-
-    :cond_0
-    monitor-exit v1
-
-    iget-object v1, v0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_7
-
-    iget-object v3, v0, Ln0/g0/d/i;->g:Lo0/g;
-
-    if-eqz v3, :cond_6
-
-    invoke-virtual {v1}, Ljava/net/Socket;->isClosed()Z
-
-    move-result v2
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x1
-
-    if-nez v2, :cond_4
-
-    invoke-virtual {v1}, Ljava/net/Socket;->isInputShutdown()Z
-
-    move-result v2
-
-    if-nez v2, :cond_4
-
-    invoke-virtual {v1}, Ljava/net/Socket;->isOutputShutdown()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v2, v0, Ln0/g0/d/i;->f:Ln0/g0/g/e;
-
-    if-eqz v2, :cond_2
-
-    monitor-enter v2
-
-    :try_start_1
-    iget-boolean v1, v2, Ln0/g0/g/e;->j:Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit v2
-
-    xor-int/lit8 v4, v1, 0x1
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v2
-
-    throw p1
-
-    :cond_2
-    if-eqz p6, :cond_3
-
-    :try_start_2
-    invoke-virtual {v1}, Ljava/net/Socket;->getSoTimeout()I
-
-    move-result v2
-    :try_end_2
-    .catch Ljava/net/SocketTimeoutException; {:try_start_2 .. :try_end_2} :catch_1
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-
-    :try_start_3
-    invoke-virtual {v1, v5}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    invoke-interface {v3}, Lo0/g;->J()Z
-
-    move-result v3
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    xor-int/2addr v3, v5
-
-    :try_start_4
-    invoke-virtual {v1, v2}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    move v4, v3
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception v3
-
-    invoke-virtual {v1, v2}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    throw v3
-    :try_end_4
-    .catch Ljava/net/SocketTimeoutException; {:try_start_4 .. :try_end_4} :catch_1
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
-
-    :catch_0
-    nop
-
-    goto :goto_1
-
-    :catch_1
-    :cond_3
-    const/4 v4, 0x1
-
-    :cond_4
-    :goto_1
-    if-nez v4, :cond_5
-
-    invoke-virtual {v0}, Ln0/g0/d/i;->j()V
-
-    goto :goto_0
-
-    :cond_5
-    return-object v0
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :catchall_2
-    move-exception p1
-
-    monitor-exit v1
-
-    throw p1
-.end method
-
-.method public final c()Z
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/d/d;->e:Ln0/e0;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_0
-
-    monitor-exit v0
-
-    return v2
-
-    :cond_0
-    :try_start_1
-    invoke-virtual {p0}, Ln0/g0/d/d;->d()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v1, v1, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, v1, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iput-object v1, p0, Ln0/g0/d/d;->e:Ln0/e0;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit v0
-
-    return v2
-
-    :cond_1
-    :try_start_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2
-    :try_start_3
-    iget-object v1, p0, Ln0/g0/d/d;->a:Ln0/g0/d/l$a;
-
-    const/4 v3, 0x0
-
-    if-eqz v1, :cond_3
-
-    invoke-virtual {v1}, Ln0/g0/d/l$a;->a()Z
-
-    move-result v1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v1, 0x0
-
-    :goto_0
-    if-nez v1, :cond_5
-
-    iget-object v1, p0, Ln0/g0/d/d;->b:Ln0/g0/d/l;
-
-    invoke-virtual {v1}, Ln0/g0/d/l;->a()Z
-
-    move-result v1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    if-eqz v1, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    const/4 v2, 0x0
-
-    :cond_5
-    :goto_1
-    monitor-exit v0
-
-    return v2
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public final d()Z
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/d/d;->f:Ln0/g0/d/m;
-
-    iget-object v0, v0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-eqz v0, :cond_2
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    iget v2, v0, Ln0/g0/d/i;->j:I
-
-    if-nez v2, :cond_2
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v0, v0, Ln0/e0;->a:Ln0/a;
-
-    iget-object v0, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object v1, p0, Ln0/g0/d/d;->h:Ln0/a;
-
-    iget-object v1, v1, Ln0/a;->a:Ln0/w;
-
-    invoke-static {v0, v1}, Ln0/g0/b;->c(Ln0/w;Ln0/w;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public final e()V
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    sget-boolean v2, Lj0/h;->a:Z
-
-    if-eqz v2, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "Assertion failed"
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    :try_start_0
-    iput-boolean v1, p0, Ln0/g0/d/d;->d:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/e.smali b/com.discord/smali_classes2/n0/g0/d/e.smali
deleted file mode 100644
index abf4428248..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/e.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public final synthetic Ln0/g0/d/e;
-.super Ljava/lang/Object;
-
-
-# static fields
-.field public static final synthetic a:[I
-
-.field public static final synthetic b:[I
-
-
-# direct methods
-.method public static synthetic constructor <clinit>()V
-    .locals 4
-
-    invoke-static {}, Ljava/net/Proxy$Type;->values()[Ljava/net/Proxy$Type;
-
-    move-result-object v0
-
-    array-length v0, v0
-
-    new-array v0, v0, [I
-
-    sput-object v0, Ln0/g0/d/e;->a:[I
-
-    sget-object v1, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
-
-    invoke-virtual {v1}, Ljava/net/Proxy$Type;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    aput v2, v0, v1
-
-    sget-object v0, Ln0/g0/d/e;->a:[I
-
-    sget-object v1, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
-
-    invoke-virtual {v1}, Ljava/net/Proxy$Type;->ordinal()I
-
-    move-result v1
-
-    const/4 v3, 0x2
-
-    aput v3, v0, v1
-
-    invoke-static {}, Ln0/g0/g/a;->values()[Ln0/g0/g/a;
-
-    move-result-object v0
-
-    array-length v0, v0
-
-    new-array v0, v0, [I
-
-    sput-object v0, Ln0/g0/d/e;->b:[I
-
-    const/4 v1, 0x4
-
-    aput v2, v0, v1
-
-    sget-object v0, Ln0/g0/d/e;->b:[I
-
-    const/4 v1, 0x5
-
-    aput v3, v0, v1
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/f.smali b/com.discord/smali_classes2/n0/g0/d/f.smali
deleted file mode 100644
index 4bb24a59ec..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/f.smali
+++ /dev/null
@@ -1,82 +0,0 @@
-.class public final Ln0/g0/d/f;
-.super Lj0/n/c/i;
-.source "RealConnection.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Ljava/util/List<",
-        "+",
-        "Ljava/security/cert/Certificate;",
-        ">;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $address:Ln0/a;
-
-.field public final synthetic $certificatePinner:Ln0/h;
-
-.field public final synthetic $unverifiedHandshake:Ln0/v;
-
-
-# direct methods
-.method public constructor <init>(Ln0/h;Ln0/v;Ln0/a;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/d/f;->$certificatePinner:Ln0/h;
-
-    iput-object p2, p0, Ln0/g0/d/f;->$unverifiedHandshake:Ln0/v;
-
-    iput-object p3, p0, Ln0/g0/d/f;->$address:Ln0/a;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/d/f;->$certificatePinner:Ln0/h;
-
-    iget-object v0, v0, Ln0/h;->b:Ln0/g0/j/c;
-
-    if-eqz v0, :cond_0
-
-    iget-object v1, p0, Ln0/g0/d/f;->$unverifiedHandshake:Ln0/v;
-
-    invoke-virtual {v1}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/g0/d/f;->$address:Ln0/a;
-
-    iget-object v2, v2, Ln0/a;->a:Ln0/w;
-
-    iget-object v2, v2, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1, v2}, Ln0/g0/j/c;->a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/g.smali b/com.discord/smali_classes2/n0/g0/d/g.smali
deleted file mode 100644
index efbc5209cf..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/g.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public final Ln0/g0/d/g;
-.super Lj0/n/c/i;
-.source "RealConnection.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Ljava/util/List<",
-        "+",
-        "Ljava/security/cert/X509Certificate;",
-        ">;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Ln0/g0/d/i;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/i;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/d/g;->this$0:Ln0/g0/d/i;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/d/g;->this$0:Ln0/g0/d/i;
-
-    iget-object v0, v0, Ln0/g0/d/i;->d:Ln0/v;
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    const/16 v2, 0xa
-
-    invoke-static {v0, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v2
-
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/security/cert/Certificate;
-
-    if-eqz v2, :cond_0
-
-    check-cast v2, Ljava/security/cert/X509Certificate;
-
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.security.cert.X509Certificate"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    return-object v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/h.smali b/com.discord/smali_classes2/n0/g0/d/h.smali
deleted file mode 100644
index e5644b49f5..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/h.smali
+++ /dev/null
@@ -1,39 +0,0 @@
-.class public final Ln0/g0/d/h;
-.super Ln0/g0/k/a$f;
-.source "RealConnection.kt"
-
-
-# instance fields
-.field public final synthetic g:Ln0/g0/d/c;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/c;Lo0/g;Lokio/BufferedSink;ZLo0/g;Lokio/BufferedSink;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/d/h;->g:Ln0/g0/d/c;
-
-    invoke-direct {p0, p4, p5, p6}, Ln0/g0/k/a$f;-><init>(ZLo0/g;Lokio/BufferedSink;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public close()V
-    .locals 6
-
-    iget-object v0, p0, Ln0/g0/d/h;->g:Ln0/g0/d/c;
-
-    const-wide/16 v1, -0x1
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    invoke-virtual/range {v0 .. v5}, Ln0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/i.smali b/com.discord/smali_classes2/n0/g0/d/i.smali
deleted file mode 100644
index dd7f086241..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/i.smali
+++ /dev/null
@@ -1,2392 +0,0 @@
-.class public final Ln0/g0/d/i;
-.super Ln0/g0/g/e$c;
-.source "RealConnection.kt"
-
-# interfaces
-.implements Ln0/k;
-
-
-# instance fields
-.field public b:Ljava/net/Socket;
-
-.field public c:Ljava/net/Socket;
-
-.field public d:Ln0/v;
-
-.field public e:Ln0/y;
-
-.field public f:Ln0/g0/g/e;
-
-.field public g:Lo0/g;
-
-.field public h:Lokio/BufferedSink;
-
-.field public i:Z
-
-.field public j:I
-
-.field public k:I
-
-.field public l:I
-
-.field public m:I
-
-.field public final n:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/ref/Reference<",
-            "Ln0/g0/d/m;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field public o:J
-
-.field public final p:Ln0/g0/d/j;
-
-.field public final q:Ln0/e0;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/j;Ln0/e0;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0}, Ln0/g0/g/e$c;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    iput-object p2, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    const/4 p1, 0x1
-
-    iput p1, p0, Ln0/g0/d/i;->m:I
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    const-wide p1, 0x7fffffffffffffffL
-
-    iput-wide p1, p0, Ln0/g0/d/i;->o:J
-
-    return-void
-
-    :cond_0
-    const-string p1, "route"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "connectionPool"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public a()Ln0/y;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/d/i;->e:Ln0/y;
-
-    if-eqz v0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public b(Ln0/g0/g/e;)V
-    .locals 1
-
-    const-string v0, "connection"
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    :try_start_0
-    invoke-virtual {p1}, Ln0/g0/g/e;->c()I
-
-    move-result p1
-
-    iput p1, p0, Ln0/g0/d/i;->m:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_0
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public c(Ln0/g0/g/l;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    sget-object v1, Ln0/g0/g/a;->h:Ln0/g0/g/a;
-
-    invoke-virtual {p1, v1, v0}, Ln0/g0/g/l;->c(Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final d(IIIIZLn0/f;Ln0/t;)V
-    .locals 14
-
-    move-object v7, p0
-
-    move-object/from16 v8, p6
-
-    move-object/from16 v9, p7
-
-    const-string v0, "call"
-
-    const/4 v10, 0x0
-
-    if-eqz v8, :cond_18
-
-    const-string v0, "eventListener"
-
-    if-eqz v9, :cond_17
-
-    iget-object v0, v7, Ln0/g0/d/i;->e:Ln0/y;
-
-    const/4 v11, 0x1
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_16
-
-    iget-object v0, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v0, v0, Ln0/e0;->a:Ln0/a;
-
-    iget-object v0, v0, Ln0/a;->c:Ljava/util/List;
-
-    new-instance v12, Ln0/g0/d/b;
-
-    invoke-direct {v12, v0}, Ln0/g0/d/b;-><init>(Ljava/util/List;)V
-
-    iget-object v1, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v1, Ln0/e0;->a:Ln0/a;
-
-    iget-object v2, v1, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    if-nez v2, :cond_3
-
-    sget-object v1, Ln0/m;->h:Ln0/m;
-
-    invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v0, v0, Ln0/e0;->a:Ln0/a;
-
-    iget-object v0, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object v0, v0, Ln0/w;->e:Ljava/lang/String;
-
-    sget-object v1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {v1, v0}, Ln0/g0/h/f;->j(Ljava/lang/String;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v1, Lokhttp3/internal/connection/RouteException;
-
-    new-instance v2, Ljava/net/UnknownServiceException;
-
-    const-string v3, "CLEARTEXT communication to "
-
-    const-string v4, " not permitted by network security policy"
-
-    invoke-static {v3, v0, v4}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v2, v0}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
-
-    invoke-direct {v1, v2}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
-
-    throw v1
-
-    :cond_2
-    new-instance v0, Lokhttp3/internal/connection/RouteException;
-
-    new-instance v1, Ljava/net/UnknownServiceException;
-
-    const-string v2, "CLEARTEXT communication not enabled for client"
-
-    invoke-direct {v1, v2}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
-
-    invoke-direct {v0, v1}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_3
-    iget-object v0, v1, Ln0/a;->b:Ljava/util/List;
-
-    sget-object v1, Ln0/y;->h:Ln0/y;
-
-    invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_15
-
-    :goto_1
-    move-object v13, v10
-
-    :goto_2
-    :try_start_0
-    iget-object v0, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    invoke-virtual {v0}, Ln0/e0;->a()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    move-object v1, p0
-
-    move v2, p1
-
-    move/from16 v3, p2
-
-    move/from16 v4, p3
-
-    move-object/from16 v5, p6
-
-    move-object/from16 v6, p7
-
-    invoke-virtual/range {v1 .. v6}, Ln0/g0/d/i;->f(IIILn0/f;Ln0/t;)V
-
-    iget-object v0, v7, Ln0/g0/d/i;->b:Ljava/net/Socket;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
-
-    if-nez v0, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    move v1, p1
-
-    move/from16 v2, p2
-
-    goto :goto_3
-
-    :cond_5
-    move v1, p1
-
-    move/from16 v2, p2
-
-    :try_start_1
-    invoke-virtual {p0, p1, v2, v8, v9}, Ln0/g0/d/i;->e(IILn0/f;Ln0/t;)V
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
-
-    :goto_3
-    move/from16 v3, p4
-
-    :try_start_2
-    invoke-virtual {p0, v12, v3, v8, v9}, Ln0/g0/d/i;->g(Ln0/g0/d/b;ILn0/f;Ln0/t;)V
-
-    iget-object v0, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v0, v0, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    iget-object v4, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v4, v4, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v9, v8, v0, v4}, Ln0/t;->a(Ln0/f;Ljava/net/InetSocketAddress;Ljava/net/Proxy;)V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-
-    :goto_4
-    iget-object v0, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    invoke-virtual {v0}, Ln0/e0;->a()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_7
-
-    iget-object v0, v7, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    if-eqz v0, :cond_6
-
-    goto :goto_5
-
-    :cond_6
-    new-instance v0, Lokhttp3/internal/connection/RouteException;
-
-    new-instance v1, Ljava/net/ProtocolException;
-
-    const-string v2, "Too many tunnel connections attempted: 21"
-
-    invoke-direct {v1, v2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    invoke-direct {v0, v1}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_7
-    :goto_5
-    iget-object v0, v7, Ln0/g0/d/i;->f:Ln0/g0/g/e;
-
-    if-eqz v0, :cond_8
-
-    iget-object v1, v7, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    monitor-enter v1
-
-    :try_start_3
-    invoke-virtual {v0}, Ln0/g0/g/e;->c()I
-
-    move-result v0
-
-    iput v0, v7, Ln0/g0/d/i;->m:I
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    monitor-exit v1
-
-    goto :goto_6
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v1
-
-    throw v0
-
-    :cond_8
-    :goto_6
-    return-void
-
-    :catch_0
-    move-exception v0
-
-    goto :goto_8
-
-    :catch_1
-    move-exception v0
-
-    :goto_7
-    move/from16 v3, p4
-
-    goto :goto_8
-
-    :catch_2
-    move-exception v0
-
-    move v1, p1
-
-    move/from16 v2, p2
-
-    goto :goto_7
-
-    :goto_8
-    iget-object v4, v7, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    if-eqz v4, :cond_9
-
-    invoke-static {v4}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_9
-    iget-object v4, v7, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    if-eqz v4, :cond_a
-
-    invoke-static {v4}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_a
-    iput-object v10, v7, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    iput-object v10, v7, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    iput-object v10, v7, Ln0/g0/d/i;->g:Lo0/g;
-
-    iput-object v10, v7, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-
-    iput-object v10, v7, Ln0/g0/d/i;->d:Ln0/v;
-
-    iput-object v10, v7, Ln0/g0/d/i;->e:Ln0/y;
-
-    iput-object v10, v7, Ln0/g0/d/i;->f:Ln0/g0/g/e;
-
-    iget-object v4, v7, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v5, v4, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    iget-object v4, v4, Ln0/e0;->b:Ljava/net/Proxy;
-
-    if-eqz v5, :cond_14
-
-    if-eqz v4, :cond_13
-
-    if-nez v13, :cond_b
-
-    new-instance v13, Lokhttp3/internal/connection/RouteException;
-
-    invoke-direct {v13, v0}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
-
-    goto :goto_9
-
-    :cond_b
-    iget-object v4, v13, Lokhttp3/internal/connection/RouteException;->firstConnectException:Ljava/io/IOException;
-
-    invoke-virtual {v4, v0}, Ljava/io/IOException;->addSuppressed(Ljava/lang/Throwable;)V
-
-    iput-object v0, v13, Lokhttp3/internal/connection/RouteException;->lastConnectException:Ljava/io/IOException;
-
-    :goto_9
-    if-eqz p5, :cond_12
-
-    iput-boolean v11, v12, Ln0/g0/d/b;->c:Z
-
-    iget-boolean v4, v12, Ln0/g0/d/b;->b:Z
-
-    if-nez v4, :cond_c
-
-    goto :goto_a
-
-    :cond_c
-    instance-of v4, v0, Ljava/net/ProtocolException;
-
-    if-eqz v4, :cond_d
-
-    goto :goto_a
-
-    :cond_d
-    instance-of v4, v0, Ljava/io/InterruptedIOException;
-
-    if-eqz v4, :cond_e
-
-    goto :goto_a
-
-    :cond_e
-    instance-of v4, v0, Ljavax/net/ssl/SSLHandshakeException;
-
-    if-eqz v4, :cond_f
-
-    invoke-virtual {v0}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
-
-    move-result-object v4
-
-    instance-of v4, v4, Ljava/security/cert/CertificateException;
-
-    if-eqz v4, :cond_f
-
-    goto :goto_a
-
-    :cond_f
-    instance-of v4, v0, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    if-eqz v4, :cond_10
-
-    goto :goto_a
-
-    :cond_10
-    instance-of v0, v0, Ljavax/net/ssl/SSLException;
-
-    if-eqz v0, :cond_11
-
-    const/4 v0, 0x1
-
-    goto :goto_b
-
-    :cond_11
-    :goto_a
-    const/4 v0, 0x0
-
-    :goto_b
-    if-eqz v0, :cond_12
-
-    goto/16 :goto_2
-
-    :cond_12
-    throw v13
-
-    :cond_13
-    const-string v0, "proxy"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_14
-    const-string v0, "inetSocketAddress"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_15
-    new-instance v0, Lokhttp3/internal/connection/RouteException;
-
-    new-instance v1, Ljava/net/UnknownServiceException;
-
-    const-string v2, "H2_PRIOR_KNOWLEDGE cannot be used with HTTPS"
-
-    invoke-direct {v1, v2}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
-
-    invoke-direct {v0, v1}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_16
-    const-string v0, "already connected"
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_17
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_18
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-.end method
-
-.method public final e(IILn0/f;Ln0/t;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v0, Ln0/e0;->b:Ljava/net/Proxy;
-
-    iget-object v0, v0, Ln0/e0;->a:Ln0/a;
-
-    invoke-virtual {v1}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v4, Ln0/g0/d/e;->a:[I
-
-    invoke-virtual {v2}, Ljava/net/Proxy$Type;->ordinal()I
-
-    move-result v2
-
-    aget v2, v4, v2
-
-    const/4 v4, 0x1
-
-    if-eq v2, v4, :cond_1
-
-    const/4 v4, 0x2
-
-    if-eq v2, v4, :cond_1
-
-    :goto_0
-    new-instance v0, Ljava/net/Socket;
-
-    invoke-direct {v0, v1}, Ljava/net/Socket;-><init>(Ljava/net/Proxy;)V
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v0, v0, Ln0/a;->e:Ljavax/net/SocketFactory;
-
-    invoke-virtual {v0}, Ljavax/net/SocketFactory;->createSocket()Ljava/net/Socket;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_6
-
-    :goto_1
-    iput-object v0, p0, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    iget-object v1, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v1, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    if-eqz p4, :cond_5
-
-    if-eqz p3, :cond_4
-
-    if-eqz v1, :cond_3
-
-    invoke-virtual {v0, p2}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    :try_start_0
-    sget-object p2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object p2, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    iget-object p3, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object p3, p3, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    invoke-virtual {p2, v0, p3, p1}, Ln0/g0/h/f;->g(Ljava/net/Socket;Ljava/net/InetSocketAddress;I)V
-    :try_end_0
-    .catch Ljava/net/ConnectException; {:try_start_0 .. :try_end_0} :catch_1
-
-    :try_start_1
-    invoke-static {v0}, Lf/n/a/k/a;->Y(Ljava/net/Socket;)Lo0/w;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/d/i;->g:Lo0/g;
-
-    invoke-static {v0}, Lf/n/a/k/a;->W(Ljava/net/Socket;)Lo0/u;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->o(Lo0/u;)Lokio/BufferedSink;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-    :try_end_1
-    .catch Ljava/lang/NullPointerException; {:try_start_1 .. :try_end_1} :catch_0
-
-    goto :goto_2
-
-    :catch_0
-    move-exception p1
-
-    invoke-virtual {p1}, Ljava/lang/NullPointerException;->getMessage()Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string p3, "throw with null exception"
-
-    invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    if-nez p2, :cond_2
-
-    :goto_2
-    return-void
-
-    :cond_2
-    new-instance p2, Ljava/io/IOException;
-
-    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/Throwable;)V
-
-    throw p2
-
-    :catch_1
-    move-exception p1
-
-    new-instance p2, Ljava/net/ConnectException;
-
-    const-string p3, "Failed to connect to "
-
-    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p3
-
-    iget-object p4, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object p4, p4, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    invoke-virtual {p3, p4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-direct {p2, p3}, Ljava/net/ConnectException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p2, p1}, Ljava/net/ConnectException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw p2
-
-    :cond_3
-    const-string p1, "inetSocketAddress"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_4
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_5
-    throw v3
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-.end method
-
-.method public final f(IIILn0/f;Ln0/t;)V
-    .locals 25
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    move/from16 v1, p2
-
-    move-object/from16 v2, p4
-
-    move-object/from16 v3, p5
-
-    new-instance v4, Ln0/a0$a;
-
-    invoke-direct {v4}, Ln0/a0$a;-><init>()V
-
-    iget-object v5, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v5, v5, Ln0/e0;->a:Ln0/a;
-
-    iget-object v5, v5, Ln0/a;->a:Ln0/w;
-
-    invoke-virtual {v4, v5}, Ln0/a0$a;->g(Ln0/w;)Ln0/a0$a;
-
-    const-string v5, "CONNECT"
-
-    const/4 v6, 0x0
-
-    invoke-virtual {v4, v5, v6}, Ln0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
-
-    iget-object v5, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v5, v5, Ln0/e0;->a:Ln0/a;
-
-    iget-object v5, v5, Ln0/a;->a:Ln0/w;
-
-    const/4 v7, 0x1
-
-    invoke-static {v5, v7}, Ln0/g0/b;->D(Ln0/w;Z)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v8, "Host"
-
-    invoke-virtual {v4, v8, v5}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    const-string v5, "Proxy-Connection"
-
-    const-string v8, "Keep-Alive"
-
-    invoke-virtual {v4, v5, v8}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    const-string v5, "User-Agent"
-
-    const-string v8, "okhttp/4.2.1"
-
-    invoke-virtual {v4, v5, v8}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    invoke-virtual {v4}, Ln0/a0$a;->b()Ln0/a0;
-
-    move-result-object v4
-
-    new-instance v5, Lokhttp3/Headers$a;
-
-    invoke-direct {v5}, Lokhttp3/Headers$a;-><init>()V
-
-    sget-object v11, Ln0/y;->e:Ln0/y;
-
-    sget-object v16, Ln0/g0/b;->c:Lokhttp3/ResponseBody;
-
-    const-string v8, "Proxy-Authenticate"
-
-    const-string v9, "OkHttp-Preemptive"
-
-    invoke-virtual {v5, v8, v9}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    invoke-virtual {v5}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v15
-
-    new-instance v5, Lokhttp3/Response;
-
-    const-string v12, "Preemptive Authenticate"
-
-    const/16 v13, 0x197
-
-    const/4 v14, 0x0
-
-    const/16 v17, 0x0
-
-    const/16 v18, 0x0
-
-    const/16 v19, 0x0
-
-    const-wide/16 v20, -0x1
-
-    const-wide/16 v22, -0x1
-
-    const/16 v24, 0x0
-
-    move-object v9, v5
-
-    move-object v10, v4
-
-    invoke-direct/range {v9 .. v24}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
-
-    iget-object v8, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v9, v8, Ln0/e0;->a:Ln0/a;
-
-    iget-object v9, v9, Ln0/a;->i:Ln0/c;
-
-    invoke-interface {v9, v8, v5}, Ln0/c;->a(Ln0/e0;Lokhttp3/Response;)Ln0/a0;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_0
-
-    move-object v4, v5
-
-    :cond_0
-    iget-object v5, v4, Ln0/a0;->b:Ln0/w;
-
-    const/4 v8, 0x0
-
-    :goto_0
-    const/16 v9, 0x15
-
-    if-ge v8, v9, :cond_b
-
-    move/from16 v9, p1
-
-    invoke-virtual {v0, v9, v1, v2, v3}, Ln0/g0/d/i;->e(IILn0/f;Ln0/t;)V
-
-    new-instance v10, Ljava/lang/StringBuilder;
-
-    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v11, "CONNECT "
-
-    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-static {v5, v7}, Ln0/g0/b;->D(Ln0/w;Z)Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-virtual {v10, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v7, " HTTP/1.1"
-
-    invoke-virtual {v10, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v7
-
-    :goto_1
-    iget-object v10, v0, Ln0/g0/d/i;->g:Lo0/g;
-
-    if-eqz v10, :cond_a
-
-    iget-object v11, v0, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-
-    if-eqz v11, :cond_9
-
-    new-instance v12, Ln0/g0/f/a;
-
-    invoke-direct {v12, v6, v6, v10, v11}, Ln0/g0/f/a;-><init>(Ln0/x;Ln0/g0/d/i;Lo0/g;Lokio/BufferedSink;)V
-
-    invoke-interface {v10}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v6
-
-    int-to-long v13, v1
-
-    sget-object v15, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v6, v13, v14, v15}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    invoke-interface {v11}, Lo0/u;->timeout()Lo0/x;
-
-    move-result-object v6
-
-    move/from16 v13, p3
-
-    int-to-long v14, v13
-
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v6, v14, v15, v1}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    iget-object v1, v4, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {v12, v1, v7}, Ln0/g0/f/a;->m(Lokhttp3/Headers;Ljava/lang/String;)V
-
-    iget-object v1, v12, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v1}, Lokio/BufferedSink;->flush()V
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v12, v1}, Ln0/g0/f/a;->e(Z)Lokhttp3/Response$a;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_8
-
-    iput-object v4, v1, Lokhttp3/Response$a;->a:Ln0/a0;
-
-    invoke-virtual {v1}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    move-result-object v1
-
-    invoke-static {v1}, Ln0/g0/b;->n(Lokhttp3/Response;)J
-
-    move-result-wide v14
-
-    const-wide/16 v16, -0x1
-
-    cmp-long v4, v14, v16
-
-    if-nez v4, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    invoke-virtual {v12, v14, v15}, Ln0/g0/f/a;->j(J)Lo0/w;
-
-    move-result-object v4
-
-    const v6, 0x7fffffff
-
-    sget-object v12, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-static {v4, v6, v12}, Ln0/g0/b;->z(Lo0/w;ILjava/util/concurrent/TimeUnit;)Z
-
-    check-cast v4, Ln0/g0/f/a$d;
-
-    invoke-virtual {v4}, Ln0/g0/f/a$d;->close()V
-
-    :goto_2
-    iget v4, v1, Lokhttp3/Response;->g:I
-
-    const/16 v6, 0xc8
-
-    if-eq v4, v6, :cond_5
-
-    const/16 v6, 0x197
-
-    if-ne v4, v6, :cond_4
-
-    iget-object v4, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v6, v4, Ln0/e0;->a:Ln0/a;
-
-    iget-object v6, v6, Ln0/a;->i:Ln0/c;
-
-    invoke-interface {v6, v4, v1}, Ln0/c;->a(Ln0/e0;Lokhttp3/Response;)Ln0/a0;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_3
-
-    const/4 v6, 0x2
-
-    const-string v10, "Connection"
-
-    const/4 v11, 0x0
-
-    invoke-static {v1, v10, v11, v6}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v6, "close"
-
-    const/4 v10, 0x1
-
-    invoke-static {v6, v1, v10}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    goto :goto_3
-
-    :cond_2
-    const/4 v6, 0x0
-
-    move/from16 v1, p2
-
-    goto/16 :goto_1
-
-    :cond_3
-    new-instance v1, Ljava/io/IOException;
-
-    const-string v2, "Failed to authenticate with proxy"
-
-    invoke-direct {v1, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    new-instance v2, Ljava/io/IOException;
-
-    const-string v3, "Unexpected response code for CONNECT: "
-
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    iget v1, v1, Lokhttp3/Response;->g:I
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_5
-    invoke-interface {v10}, Lo0/g;->h()Lo0/e;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lo0/e;->J()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    invoke-interface {v11}, Lokio/BufferedSink;->h()Lo0/e;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lo0/e;->J()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    const/4 v1, 0x0
-
-    move-object v4, v1
-
-    :goto_3
-    if-eqz v4, :cond_b
-
-    iget-object v1, v0, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    if-eqz v1, :cond_6
-
-    invoke-static {v1}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_6
-    const/4 v1, 0x0
-
-    iput-object v1, v0, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    iput-object v1, v0, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-
-    iput-object v1, v0, Ln0/g0/d/i;->g:Lo0/g;
-
-    iget-object v1, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v6, v1, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    iget-object v1, v1, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v3, v2, v6, v1}, Ln0/t;->a(Ln0/f;Ljava/net/InetSocketAddress;Ljava/net/Proxy;)V
-
-    add-int/lit8 v8, v8, 0x1
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
-
-    move/from16 v1, p2
-
-    goto/16 :goto_0
-
-    :cond_7
-    new-instance v1, Ljava/io/IOException;
-
-    const-string v2, "TLS tunnel buffered too many bytes!"
-
-    invoke-direct {v1, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v1, 0x0
-
-    throw v1
-
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v6
-
-    :cond_a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v6
-
-    :cond_b
-    return-void
-.end method
-
-.method public final g(Ln0/g0/d/b;ILn0/f;Ln0/t;)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    sget-object p3, Ln0/y;->h:Ln0/y;
-
-    sget-object p4, Ln0/y;->e:Ln0/y;
-
-    iget-object v0, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v0, v0, Ln0/e0;->a:Ln0/a;
-
-    iget-object v1, v0, Ln0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
-
-    if-nez v1, :cond_1
-
-    iget-object p1, v0, Ln0/a;->b:Ljava/util/List;
-
-    invoke-interface {p1, p3}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    iput-object p1, p0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    iput-object p3, p0, Ln0/g0/d/i;->e:Ln0/y;
-
-    invoke-virtual {p0, p2}, Ln0/g0/d/i;->l(I)V
-
-    return-void
-
-    :cond_0
-    iget-object p1, p0, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    iput-object p1, p0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    iput-object p4, p0, Ln0/g0/d/i;->e:Ln0/y;
-
-    return-void
-
-    :cond_1
-    const/4 p3, 0x0
-
-    :try_start_0
-    iget-object v2, p0, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    iget-object v3, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object v3, v3, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v4, v0, Ln0/a;->a:Ln0/w;
-
-    iget v4, v4, Ln0/w;->f:I
-
-    const/4 v5, 0x1
-
-    invoke-virtual {v1, v2, v3, v4, v5}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_b
-
-    check-cast v1, Ljavax/net/ssl/SSLSocket;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-virtual {p1, v1}, Ln0/g0/d/b;->a(Ljavax/net/ssl/SSLSocket;)Ln0/m;
-
-    move-result-object p1
-
-    iget-boolean v2, p1, Ln0/m;->b:Z
-
-    if-eqz v2, :cond_2
-
-    sget-object v2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v2, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    iget-object v3, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object v3, v3, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v4, v0, Ln0/a;->b:Ljava/util/List;
-
-    invoke-virtual {v2, v1, v3, v4}, Ln0/g0/h/f;->e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-
-    :cond_2
-    invoke-virtual {v1}, Ljavax/net/ssl/SSLSocket;->startHandshake()V
-
-    invoke-virtual {v1}, Ljavax/net/ssl/SSLSocket;->getSession()Ljavax/net/ssl/SSLSession;
-
-    move-result-object v2
-
-    sget-object v3, Ln0/v;->f:Ln0/v$a;
-
-    const-string v4, "sslSocketSession"
-
-    invoke-static {v2, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3, v2}, Ln0/v$a;->a(Ljavax/net/ssl/SSLSession;)Ln0/v;
-
-    move-result-object v3
-
-    iget-object v4, v0, Ln0/a;->g:Ljavax/net/ssl/HostnameVerifier;
-
-    if-eqz v4, :cond_a
-
-    iget-object v6, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object v6, v6, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-interface {v4, v6, v2}, Ljavax/net/ssl/HostnameVerifier;->verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_5
-
-    invoke-virtual {v3}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p2
-
-    xor-int/2addr p2, v5
-
-    if-eqz p2, :cond_4
-
-    const/4 p2, 0x0
-
-    invoke-interface {p1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_3
-
-    check-cast p1, Ljava/security/cert/X509Certificate;
-
-    new-instance p2, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    new-instance p4, Ljava/lang/StringBuilder;
-
-    invoke-direct {p4}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "\n              |Hostname "
-
-    invoke-virtual {p4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v0, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object v0, v0, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, " not verified:\n              |    certificate: "
-
-    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v0, Ln0/h;->d:Ln0/h$a;
-
-    invoke-virtual {v0, p1}, Ln0/h$a;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "\n              |    DN: "
-
-    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
-
-    move-result-object v0
-
-    const-string v2, "cert.subjectDN"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v0}, Ljava/security/Principal;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "\n              |    subjectAltNames: "
-
-    invoke-virtual {p4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v0, Ln0/g0/j/d;->a:Ln0/g0/j/d;
-
-    const/4 v2, 0x7
-
-    invoke-virtual {v0, p1, v2}, Ln0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
-
-    move-result-object v2
-
-    const/4 v3, 0x2
-
-    invoke-virtual {v0, p1, v3}, Ln0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-static {v2, p1}, Lj0/i/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-virtual {p4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, "\n              "
-
-    invoke-virtual {p4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, p3, v5}, Lj0/t/g;->trimMargin$default(Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_3
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type java.security.cert.X509Certificate"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    new-instance p1, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p3, "Hostname "
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object p3, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object p3, p3, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p3, " not verified (no certificates)"
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    iget-object v2, v0, Ln0/a;->h:Ln0/h;
-
-    if-eqz v2, :cond_9
-
-    new-instance v4, Ln0/v;
-
-    iget-object v5, v3, Ln0/v;->b:Ln0/f0;
-
-    iget-object v6, v3, Ln0/v;->c:Ln0/j;
-
-    iget-object v7, v3, Ln0/v;->d:Ljava/util/List;
-
-    new-instance v8, Ln0/g0/d/f;
-
-    invoke-direct {v8, v2, v3, v0}, Ln0/g0/d/f;-><init>(Ln0/h;Ln0/v;Ln0/a;)V
-
-    invoke-direct {v4, v5, v6, v7, v8}, Ln0/v;-><init>(Ln0/f0;Ln0/j;Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
-
-    iput-object v4, p0, Ln0/g0/d/i;->d:Ln0/v;
-
-    iget-object v0, v0, Ln0/a;->a:Ln0/w;
-
-    iget-object v0, v0, Ln0/w;->e:Ljava/lang/String;
-
-    new-instance v3, Ln0/g0/d/g;
-
-    invoke-direct {v3, p0}, Ln0/g0/d/g;-><init>(Ln0/g0/d/i;)V
-
-    invoke-virtual {v2, v0, v3}, Ln0/h;->a(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    iget-boolean p1, p1, Ln0/m;->b:Z
-
-    if-eqz p1, :cond_6
-
-    sget-object p1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object p1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {p1, v1}, Ln0/g0/h/f;->h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-
-    move-result-object p3
-
-    :cond_6
-    iput-object v1, p0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    invoke-static {v1}, Lf/n/a/k/a;->Y(Ljava/net/Socket;)Lo0/w;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/d/i;->g:Lo0/g;
-
-    invoke-static {v1}, Lf/n/a/k/a;->W(Ljava/net/Socket;)Lo0/u;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->o(Lo0/u;)Lokio/BufferedSink;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-
-    if-eqz p3, :cond_7
-
-    sget-object p1, Ln0/y;->k:Ln0/y$a;
-
-    invoke-virtual {p1, p3}, Ln0/y$a;->a(Ljava/lang/String;)Ln0/y;
-
-    move-result-object p4
-
-    :cond_7
-    iput-object p4, p0, Ln0/g0/d/i;->e:Ln0/y;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    sget-object p1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object p1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {p1, v1}, Ln0/g0/h/f;->a(Ljavax/net/ssl/SSLSocket;)V
-
-    iget-object p1, p0, Ln0/g0/d/i;->e:Ln0/y;
-
-    sget-object p3, Ln0/y;->g:Ln0/y;
-
-    if-ne p1, p3, :cond_8
-
-    invoke-virtual {p0, p2}, Ln0/g0/d/i;->l(I)V
-
-    :cond_8
-    return-void
-
-    :cond_9
-    :try_start_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw p3
-
-    :cond_a
-    :try_start_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw p3
-
-    :catchall_0
-    move-exception p1
-
-    move-object p3, v1
-
-    goto :goto_0
-
-    :cond_b
-    :try_start_4
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type javax.net.ssl.SSLSocket"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    :goto_0
-    if-eqz p3, :cond_c
-
-    sget-object p2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object p2, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {p2, p3}, Ln0/g0/h/f;->a(Ljavax/net/ssl/SSLSocket;)V
-
-    :cond_c
-    if-eqz p3, :cond_d
-
-    invoke-static {p3}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_d
-    throw p1
-.end method
-
-.method public final h()Z
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/d/i;->f:Ln0/g0/g/e;
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public final i(Ln0/x;Lokhttp3/Interceptor$Chain;)Ln0/g0/e/d;
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/net/SocketException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_3
-
-    iget-object v2, p0, Ln0/g0/d/i;->g:Lo0/g;
-
-    if-eqz v2, :cond_2
-
-    iget-object v3, p0, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-
-    if-eqz v3, :cond_1
-
-    iget-object v1, p0, Ln0/g0/d/i;->f:Ln0/g0/g/e;
-
-    if-eqz v1, :cond_0
-
-    new-instance v0, Ln0/g0/g/j;
-
-    invoke-direct {v0, p1, p0, p2, v1}, Ln0/g0/g/j;-><init>(Ln0/x;Ln0/g0/d/i;Lokhttp3/Interceptor$Chain;Ln0/g0/g/e;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->b()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    invoke-interface {v2}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->b()I
-
-    move-result v1
-
-    int-to-long v4, v1
-
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v4, v5, v1}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    invoke-interface {v3}, Lo0/u;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->c()I
-
-    move-result p2
-
-    int-to-long v4, p2
-
-    sget-object p2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v4, v5, p2}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    new-instance v0, Ln0/g0/f/a;
-
-    invoke-direct {v0, p1, p0, v2, v3}, Ln0/g0/f/a;-><init>(Ln0/x;Ln0/g0/d/i;Lo0/g;Lokio/BufferedSink;)V
-
-    :goto_0
-    return-object v0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public final j()V
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    sget-boolean v2, Lj0/h;->a:Z
-
-    if-eqz v2, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "Assertion failed"
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/d/i;->p:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    :try_start_0
-    iput-boolean v1, p0, Ln0/g0/d/i;->i:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public k()Ljava/net/Socket;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    if-eqz v0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public final l(I)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/d/i;->c:Ljava/net/Socket;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_10
-
-    iget-object v2, p0, Ln0/g0/d/i;->g:Lo0/g;
-
-    if-eqz v2, :cond_f
-
-    iget-object v3, p0, Ln0/g0/d/i;->h:Lokio/BufferedSink;
-
-    if-eqz v3, :cond_e
-
-    const/4 v4, 0x0
-
-    invoke-virtual {v0, v4}, Ljava/net/Socket;->setSoTimeout(I)V
-
-    new-instance v5, Ln0/g0/g/e$b;
-
-    const/4 v6, 0x1
-
-    invoke-direct {v5, v6}, Ln0/g0/g/e$b;-><init>(Z)V
-
-    iget-object v7, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v7, v7, Ln0/e0;->a:Ln0/a;
-
-    iget-object v7, v7, Ln0/a;->a:Ln0/w;
-
-    iget-object v7, v7, Ln0/w;->e:Ljava/lang/String;
-
-    if-eqz v7, :cond_d
-
-    if-eqz v2, :cond_c
-
-    if-eqz v3, :cond_b
-
-    iput-object v0, v5, Ln0/g0/g/e$b;->a:Ljava/net/Socket;
-
-    iput-object v7, v5, Ln0/g0/g/e$b;->b:Ljava/lang/String;
-
-    iput-object v2, v5, Ln0/g0/g/e$b;->c:Lo0/g;
-
-    iput-object v3, v5, Ln0/g0/g/e$b;->d:Lokio/BufferedSink;
-
-    iput-object p0, v5, Ln0/g0/g/e$b;->e:Ln0/g0/g/e$c;
-
-    iput p1, v5, Ln0/g0/g/e$b;->g:I
-
-    new-instance p1, Ln0/g0/g/e;
-
-    invoke-direct {p1, v5}, Ln0/g0/g/e;-><init>(Ln0/g0/g/e$b;)V
-
-    iput-object p1, p0, Ln0/g0/d/i;->f:Ln0/g0/g/e;
-
-    iget-object v0, p1, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v2, v0, Ln0/g0/g/m;->f:Z
-
-    if-nez v2, :cond_a
-
-    iget-boolean v2, v0, Ln0/g0/g/m;->i:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-nez v2, :cond_0
-
-    monitor-exit v0
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_1
-    sget-object v2, Ln0/g0/g/m;->j:Ljava/util/logging/Logger;
-
-    sget-object v3, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
-
-    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    sget-object v2, Ln0/g0/g/m;->j:Ljava/util/logging/Logger;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v5, ">> CONNECTION "
-
-    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v5, Ln0/g0/g/d;->a:Lokio/ByteString;
-
-    invoke-virtual {v5}, Lokio/ByteString;->i()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    new-array v5, v4, [Ljava/lang/Object;
-
-    invoke-static {v3, v5}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
-
-    :cond_1
-    iget-object v2, v0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    sget-object v3, Ln0/g0/g/d;->a:Lokio/ByteString;
-
-    invoke-interface {v2, v3}, Lokio/BufferedSink;->y0(Lokio/ByteString;)Lokio/BufferedSink;
-
-    iget-object v2, v0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {v2}, Lokio/BufferedSink;->flush()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    monitor-exit v0
-
-    :goto_0
-    iget-object v0, p1, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    iget-object v2, p1, Ln0/g0/g/e;->o:Ln0/g0/g/q;
-
-    monitor-enter v0
-
-    :try_start_2
-    const-string v3, "settings"
-
-    if-eqz v2, :cond_9
-
-    iget-boolean v1, v0, Ln0/g0/g/m;->f:Z
-
-    if-nez v1, :cond_8
-
-    iget v1, v2, Ln0/g0/g/q;->a:I
-
-    invoke-static {v1}, Ljava/lang/Integer;->bitCount(I)I
-
-    move-result v1
-
-    mul-int/lit8 v1, v1, 0x6
-
-    const/4 v3, 0x4
-
-    invoke-virtual {v0, v4, v1, v3, v4}, Ln0/g0/g/m;->c(IIII)V
-
-    const/16 v1, 0xa
-
-    const/4 v5, 0x0
-
-    :goto_1
-    if-ge v5, v1, :cond_6
-
-    shl-int v7, v6, v5
-
-    iget v8, v2, Ln0/g0/g/q;->a:I
-
-    and-int/2addr v7, v8
-
-    if-eqz v7, :cond_2
-
-    const/4 v7, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v7, 0x0
-
-    :goto_2
-    if-nez v7, :cond_3
-
-    goto :goto_4
-
-    :cond_3
-    if-eq v5, v3, :cond_5
-
-    const/4 v7, 0x7
-
-    if-eq v5, v7, :cond_4
-
-    move v7, v5
-
-    goto :goto_3
-
-    :cond_4
-    const/4 v7, 0x4
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v7, 0x3
-
-    :goto_3
-    iget-object v8, v0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {v8, v7}, Lokio/BufferedSink;->writeShort(I)Lokio/BufferedSink;
-
-    iget-object v7, v0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    iget-object v8, v2, Ln0/g0/g/q;->b:[I
-
-    aget v8, v8, v5
-
-    invoke-interface {v7, v8}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    :goto_4
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_1
-
-    :cond_6
-    iget-object v1, v0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {v1}, Lokio/BufferedSink;->flush()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    monitor-exit v0
-
-    iget-object v0, p1, Ln0/g0/g/e;->o:Ln0/g0/g/q;
-
-    invoke-virtual {v0}, Ln0/g0/g/q;->a()I
-
-    move-result v0
-
-    const v1, 0xffff
-
-    if-eq v0, v1, :cond_7
-
-    iget-object v2, p1, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    sub-int/2addr v0, v1
-
-    int-to-long v0, v0
-
-    invoke-virtual {v2, v4, v0, v1}, Ln0/g0/g/m;->i(IJ)V
-
-    :cond_7
-    new-instance v0, Ljava/lang/Thread;
-
-    iget-object v1, p1, Ln0/g0/g/e;->w:Ln0/g0/g/e$d;
-
-    const-string v2, "OkHttp "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    iget-object p1, p1, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, v1, p1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->start()V
-
-    return-void
-
-    :cond_8
-    :try_start_3
-    new-instance p1, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {p1, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_9
-    invoke-static {v3}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw v1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_a
-    :try_start_4
-    new-instance p1, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {p1, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_b
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_c
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_d
-    const-string p1, "connectionName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_f
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public final m(Ln0/w;)Z
-    .locals 5
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    iget-object v1, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v1, Ln0/e0;->a:Ln0/a;
-
-    iget-object v1, v1, Ln0/a;->a:Ln0/w;
-
-    iget v2, p1, Ln0/w;->f:I
-
-    iget v3, v1, Ln0/w;->f:I
-
-    const/4 v4, 0x0
-
-    if-eq v2, v3, :cond_0
-
-    return v4
-
-    :cond_0
-    iget-object v2, p1, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v1, v1, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-static {v2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_1
-
-    return v2
-
-    :cond_1
-    iget-object v1, p0, Ln0/g0/d/i;->d:Ln0/v;
-
-    if-eqz v1, :cond_4
-
-    sget-object v3, Ln0/g0/j/d;->a:Ln0/g0/j/d;
-
-    iget-object p1, p1, Ln0/w;->e:Ljava/lang/String;
-
-    if-eqz v1, :cond_3
-
-    invoke-virtual {v1}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-interface {v0, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    check-cast v0, Ljava/security/cert/X509Certificate;
-
-    invoke-virtual {v3, p1, v0}, Ln0/g0/j/d;->b(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
-    const/4 v4, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type java.security.cert.X509Certificate"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    :goto_0
-    return v4
-
-    :cond_5
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "Connection{"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v1, Ln0/e0;->a:Ln0/a;
-
-    iget-object v1, v1, Ln0/a;->a:Ln0/w;
-
-    iget-object v1, v1, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x3a
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v1, Ln0/e0;->a:Ln0/a;
-
-    iget-object v1, v1, Ln0/a;->a:Ln0/w;
-
-    iget v1, v1, Ln0/w;->f:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x2c
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v1, " proxy="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v1, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, " hostAddress="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v1, v1, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, " cipherSuite="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/d/i;->d:Ln0/v;
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, v1, Ln0/v;->c:Ln0/j;
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "none"
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, " protocol="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/d/i;->e:Ln0/y;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x7d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/j$a.smali b/com.discord/smali_classes2/n0/g0/d/j$a.smali
deleted file mode 100644
index 8a92c68788..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/j$a.smali
+++ /dev/null
@@ -1,369 +0,0 @@
-.class public final Ln0/g0/d/j$a;
-.super Ljava/lang/Object;
-.source "RealConnectionPool.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/d/j;-><init>(IJLjava/util/concurrent/TimeUnit;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ln0/g0/d/j;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/j;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/d/j$a;->d:Ln0/g0/d/j;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 15
-
-    :cond_0
-    :goto_0
-    iget-object v0, p0, Ln0/g0/d/j$a;->d:Ln0/g0/d/j;
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v1
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v3, v0, Ln0/g0/d/j;->c:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v3}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    const-wide/high16 v4, -0x8000000000000000L
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    move-object v9, v7
-
-    const/4 v8, 0x0
-
-    const/4 v10, 0x0
-
-    :cond_1
-    :goto_1
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v11
-
-    if-eqz v11, :cond_3
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v11
-
-    check-cast v11, Ln0/g0/d/i;
-
-    const-string v12, "connection"
-
-    invoke-static {v11, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v11, v1, v2}, Ln0/g0/d/j;->b(Ln0/g0/d/i;J)I
-
-    move-result v12
-
-    if-lez v12, :cond_2
-
-    add-int/lit8 v10, v10, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    add-int/lit8 v8, v8, 0x1
-
-    iget-wide v12, v11, Ln0/g0/d/i;->o:J
-
-    sub-long v12, v1, v12
-
-    cmp-long v14, v12, v4
-
-    if-lez v14, :cond_1
-
-    move-object v9, v11
-
-    move-wide v4, v12
-
-    goto :goto_1
-
-    :cond_3
-    iget-wide v1, v0, Ln0/g0/d/j;->a:J
-
-    const-wide/16 v11, -0x1
-
-    const-wide/16 v13, 0x0
-
-    cmp-long v3, v4, v1
-
-    if-gez v3, :cond_7
-
-    iget v1, v0, Ln0/g0/d/j;->f:I
-
-    if-le v8, v1, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    if-lez v8, :cond_5
-
-    iget-wide v1, v0, Ln0/g0/d/j;->a:J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    sub-long/2addr v1, v4
-
-    monitor-exit v0
-
-    goto :goto_3
-
-    :cond_5
-    if-lez v10, :cond_6
-
-    :try_start_1
-    iget-wide v1, v0, Ln0/g0/d/j;->a:J
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
-
-    monitor-exit v0
-
-    goto :goto_3
-
-    :cond_6
-    :try_start_2
-    iput-boolean v6, v0, Ln0/g0/d/j;->e:Z
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    monitor-exit v0
-
-    move-wide v1, v11
-
-    goto :goto_3
-
-    :cond_7
-    :goto_2
-    :try_start_3
-    iget-object v1, v0, Ln0/g0/d/j;->c:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v1, v9}, Ljava/util/ArrayDeque;->remove(Ljava/lang/Object;)Z
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    monitor-exit v0
-
-    if-eqz v9, :cond_f
-
-    invoke-virtual {v9}, Ln0/g0/d/i;->k()Ljava/net/Socket;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    move-wide v1, v13
-
-    :goto_3
-    cmp-long v0, v1, v11
-
-    if-nez v0, :cond_8
-
-    return-void
-
-    :cond_8
-    :try_start_4
-    iget-object v0, p0, Ln0/g0/d/j$a;->d:Ln0/g0/d/j;
-
-    const-string v3, "$this$lockAndWaitNanos"
-
-    if-eqz v0, :cond_b
-
-    const-wide/32 v3, 0xf4240
-
-    div-long v5, v1, v3
-    :try_end_4
-    .catch Ljava/lang/InterruptedException; {:try_start_4 .. :try_end_4} :catch_0
-
-    invoke-static {v5, v6}, Ljava/lang/Long;->signum(J)I
-
-    mul-long v3, v3, v5
-
-    sub-long/2addr v1, v3
-
-    :try_start_5
-    monitor-enter v0
-    :try_end_5
-    .catch Ljava/lang/InterruptedException; {:try_start_5 .. :try_end_5} :catch_0
-
-    long-to-int v2, v1
-
-    cmp-long v1, v5, v13
-
-    if-gtz v1, :cond_9
-
-    if-lez v2, :cond_a
-
-    :cond_9
-    :try_start_6
-    invoke-virtual {v0, v5, v6, v2}, Ljava/lang/Object;->wait(JI)V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_0
-
-    :cond_a
-    :try_start_7
-    monitor-exit v0
-
-    goto/16 :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-
-    :cond_b
-    invoke-static {v3}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_7
-    .catch Ljava/lang/InterruptedException; {:try_start_7 .. :try_end_7} :catch_0
-
-    throw v7
-
-    :catch_0
-    iget-object v0, p0, Ln0/g0/d/j$a;->d:Ln0/g0/d/j;
-
-    if-eqz v0, :cond_e
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    monitor-enter v0
-
-    :try_start_8
-    iget-object v2, v0, Ln0/g0/d/j;->c:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v2}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    const-string v3, "connections.iterator()"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_c
-    :goto_4
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_d
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ln0/g0/d/i;
-
-    iget-object v4, v3, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_c
-
-    const/4 v4, 0x1
-
-    iput-boolean v4, v3, Ln0/g0/d/i;->i:Z
-
-    const-string v4, "connection"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    invoke-interface {v2}, Ljava/util/Iterator;->remove()V
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_1
-
-    goto :goto_4
-
-    :cond_d
-    monitor-exit v0
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_5
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ln0/g0/d/i;
-
-    invoke-virtual {v1}, Ln0/g0/d/i;->k()Ljava/net/Socket;
-
-    move-result-object v1
-
-    invoke-static {v1}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    goto :goto_5
-
-    :catchall_1
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-
-    :cond_e
-    throw v7
-
-    :cond_f
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v7
-
-    :catchall_2
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/j.smali b/com.discord/smali_classes2/n0/g0/d/j.smali
deleted file mode 100644
index 06c6cc4298..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/j.smali
+++ /dev/null
@@ -1,698 +0,0 @@
-.class public final Ln0/g0/d/j;
-.super Ljava/lang/Object;
-.source "RealConnectionPool.kt"
-
-
-# static fields
-.field public static final g:Ljava/util/concurrent/ThreadPoolExecutor;
-
-
-# instance fields
-.field public final a:J
-
-.field public final b:Ln0/g0/d/j$a;
-
-.field public final c:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Ln0/g0/d/i;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final d:Ln0/g0/d/k;
-
-.field public e:Z
-
-.field public final f:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 9
-
-    new-instance v8, Ljava/util/concurrent/ThreadPoolExecutor;
-
-    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    new-instance v6, Ljava/util/concurrent/SynchronousQueue;
-
-    invoke-direct {v6}, Ljava/util/concurrent/SynchronousQueue;-><init>()V
-
-    const-string v0, "OkHttp ConnectionPool"
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, v1}, Ln0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-
-    move-result-object v7
-
-    const/4 v1, 0x0
-
-    const v2, 0x7fffffff
-
-    const-wide/16 v3, 0x3c
-
-    move-object v0, v8
-
-    invoke-direct/range {v0 .. v7}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
-
-    sput-object v8, Ln0/g0/d/j;->g:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    return-void
-.end method
-
-.method public constructor <init>(IJLjava/util/concurrent/TimeUnit;)V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Ln0/g0/d/j;->f:I
-
-    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    iput-wide v0, p0, Ln0/g0/d/j;->a:J
-
-    new-instance p1, Ln0/g0/d/j$a;
-
-    invoke-direct {p1, p0}, Ln0/g0/d/j$a;-><init>(Ln0/g0/d/j;)V
-
-    iput-object p1, p0, Ln0/g0/d/j;->b:Ln0/g0/d/j$a;
-
-    new-instance p1, Ljava/util/ArrayDeque;
-
-    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/j;->c:Ljava/util/ArrayDeque;
-
-    new-instance p1, Ln0/g0/d/k;
-
-    invoke-direct {p1}, Ln0/g0/d/k;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/j;->d:Ln0/g0/d/k;
-
-    const-wide/16 v0, 0x0
-
-    cmp-long p1, p2, v0
-
-    if-lez p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_1
-
-    return-void
-
-    :cond_1
-    const-string p1, "keepAliveDuration <= 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-
-# virtual methods
-.method public final a(Ln0/e0;Ljava/io/IOException;)V
-    .locals 3
-
-    const-string v0, "failedRoute"
-
-    if-eqz p1, :cond_1
-
-    iget-object v0, p1, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v0
-
-    sget-object v1, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
-
-    if-eq v0, v1, :cond_0
-
-    iget-object v0, p1, Ln0/e0;->a:Ln0/a;
-
-    iget-object v1, v0, Ln0/a;->k:Ljava/net/ProxySelector;
-
-    iget-object v0, v0, Ln0/a;->a:Ln0/w;
-
-    invoke-virtual {v0}, Ln0/w;->k()Ljava/net/URI;
-
-    move-result-object v0
-
-    iget-object v2, p1, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v2}, Ljava/net/Proxy;->address()Ljava/net/SocketAddress;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0, v2, p2}, Ljava/net/ProxySelector;->connectFailed(Ljava/net/URI;Ljava/net/SocketAddress;Ljava/io/IOException;)V
-
-    :cond_0
-    iget-object p2, p0, Ln0/g0/d/j;->d:Ln0/g0/d/k;
-
-    monitor-enter p2
-
-    :try_start_0
-    iget-object v0, p2, Ln0/g0/d/k;->a:Ljava/util/Set;
-
-    invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p2
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p2
-
-    throw p1
-
-    :cond_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final b(Ln0/g0/d/i;J)I
-    .locals 6
-
-    iget-object v0, p1, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :cond_0
-    :goto_0
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    if-ge v2, v3, :cond_2
-
-    invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/ref/Reference;
-
-    invoke-virtual {v3}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_1
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    check-cast v3, Ln0/g0/d/m$a;
-
-    const-string v4, "A connection to "
-
-    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v4
-
-    iget-object v5, p1, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v5, v5, Ln0/e0;->a:Ln0/a;
-
-    iget-object v5, v5, Ln0/a;->a:Ln0/w;
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v5, " was leaked. "
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v5, "Did you forget to close a response body?"
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v5, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v5, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    iget-object v3, v3, Ln0/g0/d/m$a;->a:Ljava/lang/Object;
-
-    invoke-virtual {v5, v4, v3}, Ln0/g0/h/f;->l(Ljava/lang/String;Ljava/lang/Object;)V
-
-    invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-
-    const/4 v3, 0x1
-
-    iput-boolean v3, p1, Ln0/g0/d/i;->i:Z
-
-    invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    iget-wide v2, p0, Ln0/g0/d/j;->a:J
-
-    sub-long/2addr p2, v2
-
-    iput-wide p2, p1, Ln0/g0/d/i;->o:J
-
-    return v1
-
-    :cond_2
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public final c(Ln0/g0/d/i;)V
-    .locals 2
-
-    if-eqz p1, :cond_3
-
-    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string v0, "Assertion failed"
-
-    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iget-boolean v0, p0, Ln0/g0/d/j;->e:Z
-
-    if-nez v0, :cond_2
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/d/j;->e:Z
-
-    sget-object v0, Ln0/g0/d/j;->g:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    iget-object v1, p0, Ln0/g0/d/j;->b:Ln0/g0/d/j$a;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/ThreadPoolExecutor;->execute(Ljava/lang/Runnable;)V
-
-    :cond_2
-    iget-object v0, p0, Ln0/g0/d/j;->c:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    return-void
-
-    :cond_3
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final d(Ln0/a;Ln0/g0/d/m;Ljava/util/List;Z)Z
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/a;",
-            "Ln0/g0/d/m;",
-            "Ljava/util/List<",
-            "Ln0/e0;",
-            ">;Z)Z"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_16
-
-    if-eqz p2, :cond_15
-
-    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    sget-boolean v2, Lj0/h;->a:Z
-
-    if-eqz v2, :cond_1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string p2, "Assertion failed"
-
-    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iget-object v1, p0, Ln0/g0/d/j;->c:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v1}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_1
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_14
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ln0/g0/d/i;
-
-    if-eqz p4, :cond_2
-
-    invoke-virtual {v2}, Ln0/g0/d/i;->h()Z
-
-    move-result v4
-
-    if-nez v4, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    iget-object v4, v2, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->size()I
-
-    move-result v4
-
-    iget v5, v2, Ln0/g0/d/i;->m:I
-
-    const/4 v6, 0x1
-
-    if-ge v4, v5, :cond_12
-
-    iget-boolean v4, v2, Ln0/g0/d/i;->i:Z
-
-    if-eqz v4, :cond_3
-
-    goto/16 :goto_6
-
-    :cond_3
-    iget-object v4, v2, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v4, v4, Ln0/e0;->a:Ln0/a;
-
-    invoke-virtual {v4, p1}, Ln0/a;->a(Ln0/a;)Z
-
-    move-result v4
-
-    if-nez v4, :cond_4
-
-    goto/16 :goto_6
-
-    :cond_4
-    iget-object v4, p1, Ln0/a;->a:Ln0/w;
-
-    iget-object v4, v4, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v5, v2, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v5, v5, Ln0/e0;->a:Ln0/a;
-
-    iget-object v5, v5, Ln0/a;->a:Ln0/w;
-
-    iget-object v5, v5, Ln0/w;->e:Ljava/lang/String;
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_5
-
-    :goto_2
-    const/4 v3, 0x1
-
-    goto/16 :goto_6
-
-    :cond_5
-    iget-object v4, v2, Ln0/g0/d/i;->f:Ln0/g0/g/e;
-
-    if-nez v4, :cond_6
-
-    goto/16 :goto_6
-
-    :cond_6
-    if-eqz p3, :cond_12
-
-    invoke-interface {p3}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_7
-
-    goto :goto_4
-
-    :cond_7
-    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v4
-
-    :cond_8
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_a
-
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ln0/e0;
-
-    iget-object v7, v5, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v7}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v7
-
-    sget-object v8, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
-
-    if-ne v7, v8, :cond_9
-
-    iget-object v7, v2, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v7, v7, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v7}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v7
-
-    sget-object v8, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
-
-    if-ne v7, v8, :cond_9
-
-    iget-object v7, v2, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v7, v7, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    iget-object v5, v5, Ln0/e0;->c:Ljava/net/InetSocketAddress;
-
-    invoke-static {v7, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_9
-
-    const/4 v5, 0x1
-
-    goto :goto_3
-
-    :cond_9
-    const/4 v5, 0x0
-
-    :goto_3
-    if-eqz v5, :cond_8
-
-    const/4 v4, 0x1
-
-    goto :goto_5
-
-    :cond_a
-    :goto_4
-    const/4 v4, 0x0
-
-    :goto_5
-    if-nez v4, :cond_b
-
-    goto :goto_6
-
-    :cond_b
-    iget-object v4, p1, Ln0/a;->g:Ljavax/net/ssl/HostnameVerifier;
-
-    sget-object v5, Ln0/g0/j/d;->a:Ln0/g0/j/d;
-
-    if-eq v4, v5, :cond_c
-
-    goto :goto_6
-
-    :cond_c
-    iget-object v4, p1, Ln0/a;->a:Ln0/w;
-
-    invoke-virtual {v2, v4}, Ln0/g0/d/i;->m(Ln0/w;)Z
-
-    move-result v4
-
-    if-nez v4, :cond_d
-
-    goto :goto_6
-
-    :cond_d
-    :try_start_0
-    iget-object v4, p1, Ln0/a;->h:Ln0/h;
-
-    if-eqz v4, :cond_11
-
-    iget-object v5, p1, Ln0/a;->a:Ln0/w;
-
-    iget-object v5, v5, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v7, v2, Ln0/g0/d/i;->d:Ln0/v;
-
-    if-eqz v7, :cond_10
-
-    invoke-virtual {v7}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v7
-
-    if-eqz v5, :cond_f
-
-    if-eqz v7, :cond_e
-
-    new-instance v8, Ln0/i;
-
-    invoke-direct {v8, v4, v7, v5}, Ln0/i;-><init>(Ln0/h;Ljava/util/List;Ljava/lang/String;)V
-
-    invoke-virtual {v4, v5, v8}, Ln0/h;->a(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    goto :goto_2
-
-    :cond_e
-    const-string v4, "peerCertificates"
-
-    invoke-static {v4}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_0
-    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_0 .. :try_end_0} :catch_0
-
-    throw v0
-
-    :cond_f
-    :try_start_1
-    const-string v4, "hostname"
-
-    invoke-static {v4}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_1 .. :try_end_1} :catch_0
-
-    throw v0
-
-    :cond_10
-    :try_start_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_2
-    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_2 .. :try_end_2} :catch_0
-
-    throw v0
-
-    :cond_11
-    :try_start_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_3 .. :try_end_3} :catch_0
-
-    throw v0
-
-    :catch_0
-    :cond_12
-    :goto_6
-    if-nez v3, :cond_13
-
-    goto/16 :goto_1
-
-    :cond_13
-    const-string p1, "connection"
-
-    invoke-static {v2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2, v2}, Ln0/g0/d/m;->a(Ln0/g0/d/i;)V
-
-    return v6
-
-    :cond_14
-    return v3
-
-    :cond_15
-    const-string p1, "transmitter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_16
-    const-string p1, "address"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/k.smali b/com.discord/smali_classes2/n0/g0/d/k.smali
deleted file mode 100644
index aaa10d9ca1..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/k.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public final Ln0/g0/d/k;
-.super Ljava/lang/Object;
-.source "RouteDatabase.kt"
-
-
-# instance fields
-.field public final a:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ln0/e0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
-
-    iput-object v0, p0, Ln0/g0/d/k;->a:Ljava/util/Set;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final declared-synchronized a(Ln0/e0;)V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    const-string v0, "route"
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Ln0/g0/d/k;->a:Ljava/util/Set;
-
-    invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/l$a.smali b/com.discord/smali_classes2/n0/g0/d/l$a.smali
deleted file mode 100644
index fb4ddf22a9..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/l$a.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class public final Ln0/g0/d/l$a;
-.super Ljava/lang/Object;
-.source "RouteSelector.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/d/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:I
-
-.field public final b:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/e0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Ln0/e0;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/l$a;->b:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()Z
-    .locals 2
-
-    iget v0, p0, Ln0/g0/d/l$a;->a:I
-
-    iget-object v1, p0, Ln0/g0/d/l$a;->b:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    if-ge v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/l.smali b/com.discord/smali_classes2/n0/g0/d/l.smali
deleted file mode 100644
index 85458a7df7..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/l.smali
+++ /dev/null
@@ -1,257 +0,0 @@
-.class public final Ln0/g0/d/l;
-.super Ljava/lang/Object;
-.source "RouteSelector.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/d/l$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "+",
-            "Ljava/net/Proxy;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public b:I
-
-.field public c:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "+",
-            "Ljava/net/InetSocketAddress;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/e0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ln0/a;
-
-.field public final f:Ln0/g0/d/k;
-
-.field public final g:Ln0/f;
-
-.field public final h:Ln0/t;
-
-
-# direct methods
-.method public constructor <init>(Ln0/a;Ln0/g0/d/k;Ln0/f;Ln0/t;)V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_7
-
-    const-string v1, "call"
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/l;->e:Ln0/a;
-
-    iput-object p2, p0, Ln0/g0/d/l;->f:Ln0/g0/d/k;
-
-    iput-object p3, p0, Ln0/g0/d/l;->g:Ln0/f;
-
-    iput-object p4, p0, Ln0/g0/d/l;->h:Ln0/t;
-
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
-
-    iput-object p1, p0, Ln0/g0/d/l;->a:Ljava/util/List;
-
-    iput-object p1, p0, Ln0/g0/d/l;->c:Ljava/util/List;
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/l;->d:Ljava/util/List;
-
-    iget-object p1, p0, Ln0/g0/d/l;->e:Ln0/a;
-
-    iget-object p2, p1, Ln0/a;->a:Ln0/w;
-
-    iget-object p3, p1, Ln0/a;->j:Ljava/net/Proxy;
-
-    iget-object p4, p0, Ln0/g0/d/l;->h:Ln0/t;
-
-    iget-object v2, p0, Ln0/g0/d/l;->g:Ln0/f;
-
-    if-eqz p4, :cond_6
-
-    if-eqz v2, :cond_5
-
-    if-eqz p2, :cond_4
-
-    const/4 p4, 0x0
-
-    if-eqz p3, :cond_0
-
-    invoke-static {p3}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p1, Ln0/a;->k:Ljava/net/ProxySelector;
-
-    invoke-virtual {p2}, Ln0/w;->k()Ljava/net/URI;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Ljava/net/ProxySelector;->select(Ljava/net/URI;)Ljava/util/List;
-
-    move-result-object p1
-
-    const/4 p2, 0x1
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p3
-
-    xor-int/2addr p3, p2
-
-    if-eqz p3, :cond_1
-
-    invoke-static {p1}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_1
-    new-array p1, p2, [Ljava/net/Proxy;
-
-    sget-object p2, Ljava/net/Proxy;->NO_PROXY:Ljava/net/Proxy;
-
-    aput-object p2, p1, p4
-
-    invoke-static {p1}, Ln0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    :goto_0
-    iput-object p1, p0, Ln0/g0/d/l;->a:Ljava/util/List;
-
-    iput p4, p0, Ln0/g0/d/l;->b:I
-
-    iget-object p1, p0, Ln0/g0/d/l;->h:Ln0/t;
-
-    iget-object p2, p0, Ln0/g0/d/l;->g:Ln0/f;
-
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    throw v0
-
-    :cond_4
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    throw v0
-
-    :cond_7
-    const-string p1, "routeDatabase"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a()Z
-    .locals 2
-
-    invoke-virtual {p0}, Ln0/g0/d/l;->b()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Ln0/g0/d/l;->d:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v0
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :cond_1
-    :goto_0
-    return v1
-.end method
-
-.method public final b()Z
-    .locals 2
-
-    iget v0, p0, Ln0/g0/d/l;->b:I
-
-    iget-object v1, p0, Ln0/g0/d/l;->a:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    if-ge v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/m$a.smali b/com.discord/smali_classes2/n0/g0/d/m$a.smali
deleted file mode 100644
index c8be117e7c..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/m$a.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public final Ln0/g0/d/m$a;
-.super Ljava/lang/ref/WeakReference;
-.source "Transmitter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/d/m;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/ref/WeakReference<",
-        "Ln0/g0/d/m;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/m;Ljava/lang/Object;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object p2, p0, Ln0/g0/d/m$a;->a:Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/m$b.smali b/com.discord/smali_classes2/n0/g0/d/m$b.smali
deleted file mode 100644
index 0ca9496bf2..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/m$b.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class public final Ln0/g0/d/m$b;
-.super Lo0/b;
-.source "Transmitter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/d/m;-><init>(Ln0/x;Ln0/f;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic l:Ln0/g0/d/m;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/d/m;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/d/m$b;->l:Ln0/g0/d/m;
-
-    invoke-direct {p0}, Lo0/b;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public n()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/d/m$b;->l:Ln0/g0/d/m;
-
-    invoke-virtual {v0}, Ln0/g0/d/m;->c()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/d/m.smali b/com.discord/smali_classes2/n0/g0/d/m.smali
deleted file mode 100644
index 48f4df52cb..0000000000
--- a/com.discord/smali_classes2/n0/g0/d/m.smali
+++ /dev/null
@@ -1,1048 +0,0 @@
-.class public final Ln0/g0/d/m;
-.super Ljava/lang/Object;
-.source "Transmitter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/d/m$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ln0/g0/d/j;
-
-.field public final b:Ln0/t;
-
-.field public final c:Ln0/g0/d/m$b;
-
-.field public d:Ljava/lang/Object;
-
-.field public e:Ln0/a0;
-
-.field public f:Ln0/g0/d/d;
-
-.field public g:Ln0/g0/d/i;
-
-.field public h:Ln0/g0/d/c;
-
-.field public i:Z
-
-.field public j:Z
-
-.field public k:Z
-
-.field public l:Z
-
-.field public m:Z
-
-.field public final n:Ln0/x;
-
-.field public final o:Ln0/f;
-
-
-# direct methods
-.method public constructor <init>(Ln0/x;Ln0/f;)V
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/d/m;->n:Ln0/x;
-
-    iput-object p2, p0, Ln0/g0/d/m;->o:Ln0/f;
-
-    iget-object v0, p1, Ln0/x;->e:Ln0/l;
-
-    iget-object v0, v0, Ln0/l;->a:Ln0/g0/d/j;
-
-    iput-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    iget-object p1, p1, Ln0/x;->h:Ln0/t$b;
-
-    invoke-interface {p1, p2}, Ln0/t$b;->a(Ln0/f;)Ln0/t;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/d/m;->b:Ln0/t;
-
-    new-instance p1, Ln0/g0/d/m$b;
-
-    invoke-direct {p1, p0}, Ln0/g0/d/m$b;-><init>(Ln0/g0/d/m;)V
-
-    iget-object p2, p0, Ln0/g0/d/m;->n:Ln0/x;
-
-    iget p2, p2, Ln0/x;->A:I
-
-    int-to-long v0, p2
-
-    sget-object p2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {p1, v0, v1, p2}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    iput-object p1, p0, Ln0/g0/d/m;->c:Ln0/g0/d/m$b;
-
-    return-void
-
-    :cond_0
-    const-string p1, "client"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public final a(Ln0/g0/d/i;)V
-    .locals 2
-
-    if-eqz p1, :cond_4
-
-    iget-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string v0, "Assertion failed"
-
-    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-nez v0, :cond_2
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_3
-
-    iput-object p1, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    iget-object p1, p1, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    new-instance v0, Ln0/g0/d/m$a;
-
-    iget-object v1, p0, Ln0/g0/d/m;->d:Ljava/lang/Object;
-
-    invoke-direct {v0, p0, v1}, Ln0/g0/d/m$a;-><init>(Ln0/g0/d/m;Ljava/lang/Object;)V
-
-    invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    return-void
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Check failed."
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final b()V
-    .locals 3
-
-    sget-object v0, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v0, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    const-string v1, "response.body().close()"
-
-    invoke-virtual {v0, v1}, Ln0/g0/h/f;->i(Ljava/lang/String;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    iput-object v0, p0, Ln0/g0/d/m;->d:Ljava/lang/Object;
-
-    iget-object v0, p0, Ln0/g0/d/m;->b:Ln0/t;
-
-    iget-object v1, p0, Ln0/g0/d/m;->o:Ln0/f;
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_1
-
-    if-eqz v1, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string v0, "call"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    throw v2
-.end method
-
-.method public final c()V
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    const/4 v1, 0x1
-
-    :try_start_0
-    iput-boolean v1, p0, Ln0/g0/d/m;->k:Z
-
-    iget-object v1, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    iget-object v2, p0, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    if-eqz v2, :cond_2
-
-    iget-object v3, v2, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    invoke-static {v3}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    sget-boolean v4, Lj0/h;->a:Z
-
-    if-eqz v4, :cond_1
-
-    if-eqz v3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Ljava/lang/AssertionError;
-
-    const-string v2, "Assertion failed"
-
-    invoke-direct {v1, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    iget-object v2, v2, Ln0/g0/d/d;->c:Ln0/g0/d/i;
-
-    if-eqz v2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    iget-object v2, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :goto_1
-    monitor-exit v0
-
-    if-eqz v1, :cond_3
-
-    iget-object v0, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v0}, Ln0/g0/e/d;->cancel()V
-
-    goto :goto_2
-
-    :cond_3
-    if-eqz v2, :cond_4
-
-    iget-object v0, v2, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    if-eqz v0, :cond_4
-
-    invoke-static {v0}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_4
-    :goto_2
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public final d()V
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v1, p0, Ln0/g0/d/m;->m:Z
-
-    xor-int/lit8 v1, v1, 0x1
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return-void
-
-    :cond_0
-    :try_start_1
-    const-string v1, "Check failed."
-
-    new-instance v2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public final e(Ln0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/io/IOException;",
-            ">(",
-            "Ln0/g0/d/c;",
-            "ZZTE;)TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v1, 0x1
-
-    xor-int/2addr p1, v1
-
-    if-eqz p1, :cond_0
-
-    monitor-exit v0
-
-    return-object p4
-
-    :cond_0
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_1
-
-    :try_start_1
-    iget-boolean p2, p0, Ln0/g0/d/m;->i:Z
-
-    xor-int/2addr p2, v1
-
-    iput-boolean v1, p0, Ln0/g0/d/m;->i:Z
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p2, 0x0
-
-    :goto_0
-    if-eqz p3, :cond_3
-
-    iget-boolean p3, p0, Ln0/g0/d/m;->j:Z
-
-    if-nez p3, :cond_2
-
-    const/4 p2, 0x1
-
-    :cond_2
-    iput-boolean v1, p0, Ln0/g0/d/m;->j:Z
-
-    :cond_3
-    iget-boolean p3, p0, Ln0/g0/d/m;->i:Z
-
-    if-eqz p3, :cond_6
-
-    iget-boolean p3, p0, Ln0/g0/d/m;->j:Z
-
-    if-eqz p3, :cond_6
-
-    if-eqz p2, :cond_6
-
-    iget-object p2, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    const/4 p3, 0x0
-
-    if-eqz p2, :cond_5
-
-    invoke-virtual {p2}, Ln0/g0/d/c;->b()Ln0/g0/d/i;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_4
-
-    iget v2, p2, Ln0/g0/d/i;->k:I
-
-    add-int/2addr v2, v1
-
-    iput v2, p2, Ln0/g0/d/i;->k:I
-
-    iput-object p3, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    goto :goto_1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p3
-
-    :cond_5
-    :try_start_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw p3
-
-    :cond_6
-    const/4 v1, 0x0
-
-    :goto_1
-    monitor-exit v0
-
-    if-eqz v1, :cond_7
-
-    invoke-virtual {p0, p4, p1}, Ln0/g0/d/m;->g(Ljava/io/IOException;Z)Ljava/io/IOException;
-
-    move-result-object p4
-
-    :cond_7
-    return-object p4
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-.end method
-
-.method public final f()Z
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v1, p0, Ln0/g0/d/m;->k:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return v1
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public final g(Ljava/io/IOException;Z)Ljava/io/IOException;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/io/IOException;",
-            ">(TE;Z)TE;"
-        }
-    .end annotation
-
-    new-instance v0, Lkotlin/jvm/internal/Ref$ObjectRef;
-
-    invoke-direct {v0}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
-
-    iget-object v1, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-eqz p2, :cond_1
-
-    :try_start_0
-    iget-object v4, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    if-nez v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v4, 0x0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    goto/16 :goto_8
-
-    :cond_1
-    :goto_0
-    const/4 v4, 0x1
-
-    :goto_1
-    if-eqz v4, :cond_16
-
-    iget-object v4, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    iput-object v4, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    iget-object v4, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    const/4 v5, 0x0
-
-    if-eqz v4, :cond_3
-
-    iget-object v4, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    if-nez v4, :cond_3
-
-    if-nez p2, :cond_2
-
-    iget-boolean p2, p0, Ln0/g0/d/m;->m:Z
-
-    if-eqz p2, :cond_3
-
-    :cond_2
-    invoke-virtual {p0}, Ln0/g0/d/m;->i()Ljava/net/Socket;
-
-    move-result-object p2
-
-    goto :goto_2
-
-    :cond_3
-    move-object p2, v5
-
-    :goto_2
-    iget-object v4, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-eqz v4, :cond_4
-
-    iput-object v5, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    :cond_4
-    iget-boolean v4, p0, Ln0/g0/d/m;->m:Z
-
-    if-eqz v4, :cond_5
-
-    iget-object v4, p0, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v4, :cond_5
-
-    const/4 v4, 0x1
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v4, 0x0
-
-    :goto_3
-    monitor-exit v1
-
-    if-eqz p2, :cond_6
-
-    invoke-static {p2}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_6
-    iget-object p2, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
-    check-cast p2, Ln0/k;
-
-    if-eqz p2, :cond_a
-
-    iget-object v0, p0, Ln0/g0/d/m;->b:Ln0/t;
-
-    iget-object v1, p0, Ln0/g0/d/m;->o:Ln0/f;
-
-    if-eqz p2, :cond_9
-
-    if-eqz v0, :cond_8
-
-    if-eqz v1, :cond_7
-
-    goto :goto_4
-
-    :cond_7
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_8
-    throw v5
-
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_a
-    :goto_4
-    if-eqz v4, :cond_15
-
-    if-eqz p1, :cond_b
-
-    goto :goto_5
-
-    :cond_b
-    const/4 v2, 0x0
-
-    :goto_5
-    iget-boolean p2, p0, Ln0/g0/d/m;->l:Z
-
-    if-eqz p2, :cond_c
-
-    goto :goto_6
-
-    :cond_c
-    iget-object p2, p0, Ln0/g0/d/m;->c:Ln0/g0/d/m$b;
-
-    invoke-virtual {p2}, Lo0/b;->j()Z
-
-    move-result p2
-
-    if-nez p2, :cond_d
-
-    goto :goto_6
-
-    :cond_d
-    new-instance p2, Ljava/io/InterruptedIOException;
-
-    const-string v0, "timeout"
-
-    invoke-direct {p2, v0}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_e
-
-    invoke-virtual {p2, p1}, Ljava/io/InterruptedIOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    :cond_e
-    move-object p1, p2
-
-    :goto_6
-    if-eqz v2, :cond_12
-
-    iget-object p2, p0, Ln0/g0/d/m;->b:Ln0/t;
-
-    iget-object v0, p0, Ln0/g0/d/m;->o:Ln0/f;
-
-    if-eqz p1, :cond_11
-
-    if-eqz p2, :cond_10
-
-    if-eqz v0, :cond_f
-
-    goto :goto_7
-
-    :cond_f
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_10
-    throw v5
-
-    :cond_11
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_12
-    iget-object p2, p0, Ln0/g0/d/m;->b:Ln0/t;
-
-    iget-object v0, p0, Ln0/g0/d/m;->o:Ln0/f;
-
-    if-eqz p2, :cond_14
-
-    if-eqz v0, :cond_13
-
-    goto :goto_7
-
-    :cond_13
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_14
-    throw v5
-
-    :cond_15
-    :goto_7
-    return-object p1
-
-    :cond_16
-    :try_start_1
-    const-string p1, "cannot release connection while it is in use"
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_8
-    monitor-exit v1
-
-    throw p1
-.end method
-
-.method public final h(Ljava/io/IOException;)Ljava/io/IOException;
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v0
-
-    const/4 v1, 0x1
-
-    :try_start_0
-    iput-boolean v1, p0, Ln0/g0/d/m;->m:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Ln0/g0/d/m;->g(Ljava/io/IOException;Z)Ljava/io/IOException;
-
-    move-result-object p1
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-.end method
-
-.method public final i()Ljava/net/Socket;
-    .locals 8
-
-    iget-object v0, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    const-string v2, "Assertion failed"
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_d
-
-    iget-object v0, v0, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    const/4 v6, -0x1
-
-    if-eqz v5, :cond_3
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/ref/Reference;
-
-    invoke-virtual {v5}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ln0/g0/d/m;
-
-    invoke-static {v5, p0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v4, -0x1
-
-    :goto_2
-    const/4 v0, 0x1
-
-    if-eq v4, v6, :cond_4
-
-    const/4 v5, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    const/4 v5, 0x0
-
-    :goto_3
-    if-eqz v5, :cond_c
-
-    iget-object v5, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    if-eqz v5, :cond_b
-
-    iget-object v6, v5, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    invoke-interface {v6, v4}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-
-    iput-object v1, p0, Ln0/g0/d/m;->g:Ln0/g0/d/i;
-
-    iget-object v4, v5, Ln0/g0/d/i;->n:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_a
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v6
-
-    iput-wide v6, v5, Ln0/g0/d/i;->o:J
-
-    iget-object v4, p0, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    if-eqz v4, :cond_9
-
-    invoke-static {v4}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v6
-
-    sget-boolean v7, Lj0/h;->a:Z
-
-    if-eqz v7, :cond_6
-
-    if-eqz v6, :cond_5
-
-    goto :goto_4
-
-    :cond_5
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_6
-    :goto_4
-    iget-boolean v2, v5, Ln0/g0/d/i;->i:Z
-
-    if-nez v2, :cond_8
-
-    iget v2, v4, Ln0/g0/d/j;->f:I
-
-    if-nez v2, :cond_7
-
-    goto :goto_5
-
-    :cond_7
-    invoke-virtual {v4}, Ljava/lang/Object;->notifyAll()V
-
-    goto :goto_6
-
-    :cond_8
-    :goto_5
-    iget-object v2, v4, Ln0/g0/d/j;->c:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v2, v5}, Ljava/util/ArrayDeque;->remove(Ljava/lang/Object;)Z
-
-    const/4 v3, 0x1
-
-    :goto_6
-    if-eqz v3, :cond_a
-
-    invoke-virtual {v5}, Ln0/g0/d/i;->k()Ljava/net/Socket;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_9
-    throw v1
-
-    :cond_a
-    return-object v1
-
-    :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_c
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Check failed."
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public final j()V
-    .locals 2
-
-    iget-boolean v0, p0, Ln0/g0/d/m;->l:Z
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, p0, Ln0/g0/d/m;->l:Z
-
-    iget-object v0, p0, Ln0/g0/d/m;->c:Ln0/g0/d/m$b;
-
-    invoke-virtual {v0}, Lo0/b;->j()Z
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Check failed."
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/a.smali b/com.discord/smali_classes2/n0/g0/e/a.smali
deleted file mode 100644
index 6646ed1be3..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/a.smali
+++ /dev/null
@@ -1,364 +0,0 @@
-.class public final Ln0/g0/e/a;
-.super Ljava/lang/Object;
-.source "BridgeInterceptor.kt"
-
-# interfaces
-.implements Lokhttp3/Interceptor;
-
-
-# instance fields
-.field public final b:Ln0/p;
-
-
-# direct methods
-.method public constructor <init>(Ln0/p;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/e/a;->b:Ln0/p;
-
-    return-void
-
-    :cond_0
-    const-string p1, "cookieJar"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 16
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_c
-
-    new-instance v3, Ln0/a0$a;
-
-    invoke-direct {v3, v1}, Ln0/a0$a;-><init>(Ln0/a0;)V
-
-    iget-object v4, v1, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    const-string v5, "Content-Type"
-
-    const-wide/16 v6, -0x1
-
-    const-string v8, "Content-Length"
-
-    if-eqz v4, :cond_2
-
-    invoke-virtual {v4}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
-
-    move-result-object v9
-
-    if-eqz v9, :cond_0
-
-    iget-object v9, v9, Lokhttp3/MediaType;->a:Ljava/lang/String;
-
-    invoke-virtual {v3, v5, v9}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_0
-    invoke-virtual {v4}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v9
-
-    const-string v4, "Transfer-Encoding"
-
-    cmp-long v11, v9, v6
-
-    if-eqz v11, :cond_1
-
-    invoke-static {v9, v10}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-virtual {v3, v8, v9}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    invoke-virtual {v3, v4}, Ln0/a0$a;->e(Ljava/lang/String;)Ln0/a0$a;
-
-    goto :goto_0
-
-    :cond_1
-    const-string v9, "chunked"
-
-    invoke-virtual {v3, v4, v9}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    invoke-virtual {v3, v8}, Ln0/a0$a;->e(Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_2
-    :goto_0
-    const-string v4, "Host"
-
-    invoke-virtual {v1, v4}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v9
-
-    const/4 v10, 0x0
-
-    if-nez v9, :cond_3
-
-    iget-object v9, v1, Ln0/a0;->b:Ln0/w;
-
-    invoke-static {v9, v10}, Ln0/g0/b;->D(Ln0/w;Z)Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-virtual {v3, v4, v9}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_3
-    const-string v4, "Connection"
-
-    invoke-virtual {v1, v4}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v9
-
-    if-nez v9, :cond_4
-
-    const-string v9, "Keep-Alive"
-
-    invoke-virtual {v3, v4, v9}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_4
-    const-string v4, "Accept-Encoding"
-
-    invoke-virtual {v1, v4}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v9
-
-    const-string v11, "gzip"
-
-    const/4 v12, 0x1
-
-    if-nez v9, :cond_5
-
-    const-string v9, "Range"
-
-    invoke-virtual {v1, v9}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v9
-
-    if-nez v9, :cond_5
-
-    invoke-virtual {v3, v4, v11}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    const/4 v4, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    const/4 v4, 0x0
-
-    :goto_1
-    iget-object v9, v0, Ln0/g0/e/a;->b:Ln0/p;
-
-    iget-object v13, v1, Ln0/a0;->b:Ln0/w;
-
-    invoke-interface {v9, v13}, Ln0/p;->b(Ln0/w;)Ljava/util/List;
-
-    move-result-object v9
-
-    invoke-interface {v9}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v13
-
-    xor-int/2addr v13, v12
-
-    if-eqz v13, :cond_9
-
-    new-instance v13, Ljava/lang/StringBuilder;
-
-    invoke-direct {v13}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-interface {v9}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v9
-
-    :goto_2
-    invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v14
-
-    if-eqz v14, :cond_8
-
-    invoke-interface {v9}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v14
-
-    add-int/lit8 v15, v10, 0x1
-
-    if-ltz v10, :cond_7
-
-    check-cast v14, Ln0/n;
-
-    if-lez v10, :cond_6
-
-    const-string v10, "; "
-
-    invoke-virtual {v13, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_6
-    iget-object v10, v14, Ln0/n;->a:Ljava/lang/String;
-
-    invoke-virtual {v13, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v10, 0x3d
-
-    invoke-virtual {v13, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v10, v14, Ln0/n;->b:Ljava/lang/String;
-
-    invoke-virtual {v13, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move v10, v15
-
-    goto :goto_2
-
-    :cond_7
-    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
-
-    throw v2
-
-    :cond_8
-    invoke-virtual {v13}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v9
-
-    const-string v10, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {v9, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v10, "Cookie"
-
-    invoke-virtual {v3, v10, v9}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_9
-    const-string v9, "User-Agent"
-
-    invoke-virtual {v1, v9}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v10
-
-    if-nez v10, :cond_a
-
-    const-string v10, "okhttp/4.2.1"
-
-    invoke-virtual {v3, v9, v10}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_a
-    invoke-virtual {v3}, Ln0/a0$a;->b()Ln0/a0;
-
-    move-result-object v3
-
-    move-object/from16 v9, p1
-
-    invoke-interface {v9, v3}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
-
-    move-result-object v3
-
-    iget-object v9, v0, Ln0/g0/e/a;->b:Ln0/p;
-
-    iget-object v10, v1, Ln0/a0;->b:Ln0/w;
-
-    iget-object v13, v3, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-static {v9, v10, v13}, Ln0/g0/e/e;->b(Ln0/p;Ln0/w;Lokhttp3/Headers;)V
-
-    new-instance v9, Lokhttp3/Response$a;
-
-    invoke-direct {v9, v3}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
-
-    iput-object v1, v9, Lokhttp3/Response$a;->a:Ln0/a0;
-
-    if-eqz v4, :cond_b
-
-    const-string v1, "Content-Encoding"
-
-    const/4 v4, 0x2
-
-    invoke-static {v3, v1, v2, v4}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-static {v11, v10, v12}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    invoke-static {v3}, Ln0/g0/e/e;->a(Lokhttp3/Response;)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_b
-
-    iget-object v10, v3, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v10, :cond_b
-
-    new-instance v11, Lo0/k;
-
-    invoke-virtual {v10}, Lokhttp3/ResponseBody;->c()Lo0/g;
-
-    move-result-object v10
-
-    invoke-direct {v11, v10}, Lo0/k;-><init>(Lo0/w;)V
-
-    iget-object v10, v3, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v10}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object v10
-
-    invoke-virtual {v10, v1}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    invoke-virtual {v10, v8}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    invoke-virtual {v10}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v1
-
-    invoke-virtual {v9, v1}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
-
-    invoke-static {v3, v5, v2, v4}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ln0/g0/e/h;
-
-    invoke-static {v11}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
-
-    move-result-object v3
-
-    invoke-direct {v2, v1, v6, v7, v3}, Ln0/g0/e/h;-><init>(Ljava/lang/String;JLo0/g;)V
-
-    iput-object v2, v9, Lokhttp3/Response$a;->g:Lokhttp3/ResponseBody;
-
-    :cond_b
-    invoke-virtual {v9}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    move-result-object v1
-
-    return-object v1
-
-    :cond_c
-    throw v2
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/b.smali b/com.discord/smali_classes2/n0/g0/e/b.smali
deleted file mode 100644
index 5d93729239..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/b.smali
+++ /dev/null
@@ -1,998 +0,0 @@
-.class public final Ln0/g0/e/b;
-.super Ljava/lang/Object;
-.source "CallServerInterceptor.kt"
-
-# interfaces
-.implements Lokhttp3/Interceptor;
-
-
-# instance fields
-.field public final b:Z
-
-
-# direct methods
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/g0/e/b;->b:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 28
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v0, p1
-
-    check-cast v0, Ln0/g0/e/g;
-
-    iget-object v1, v0, Ln0/g0/e/g;->d:Ln0/g0/d/c;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2e
-
-    iget-object v0, v0, Ln0/g0/e/g;->f:Ln0/a0;
-
-    iget-object v3, v0, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v4
-
-    :try_start_0
-    iget-object v6, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v7, v1, Ln0/g0/d/c;->c:Ln0/f;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_5
-
-    if-eqz v6, :cond_2d
-
-    const-string v6, "call"
-
-    if-eqz v7, :cond_2c
-
-    :try_start_1
-    iget-object v7, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v7, v0}, Ln0/g0/e/d;->c(Ln0/a0;)V
-
-    iget-object v7, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v8, v1, Ln0/g0/d/c;->c:Ln0/f;
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_5
-
-    if-eqz v7, :cond_2b
-
-    if-eqz v8, :cond_2a
-
-    iget-object v7, v0, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-static {v7}, Ln0/g0/e/f;->a(Ljava/lang/String;)Z
-
-    move-result v7
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    if-eqz v7, :cond_7
-
-    if-eqz v3, :cond_7
-
-    const-string v7, "Expect"
-
-    invoke-virtual {v0, v7}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v10, "100-continue"
-
-    invoke-static {v10, v7, v8}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_2
-
-    :try_start_2
-    iget-object v7, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v7}, Ln0/g0/e/d;->f()V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-
-    iget-object v7, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v10, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    if-eqz v7, :cond_1
-
-    if-eqz v10, :cond_0
-
-    invoke-virtual {v1, v8}, Ln0/g0/d/c;->e(Z)Lokhttp3/Response$a;
-
-    move-result-object v7
-
-    const/4 v10, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {v6}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_1
-    throw v2
-
-    :catch_0
-    move-exception v0
-
-    iget-object v2, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v3, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {v2, v3, v0}, Ln0/t;->c(Ln0/f;Ljava/io/IOException;)V
-
-    invoke-virtual {v1, v0}, Ln0/g0/d/c;->f(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_2
-    const/4 v10, 0x0
-
-    move-object v7, v2
-
-    :goto_0
-    if-nez v7, :cond_4
-
-    invoke-virtual {v3}, Lokhttp3/RequestBody;->isDuplex()Z
-
-    move-result v11
-
-    if-eqz v11, :cond_3
-
-    :try_start_3
-    iget-object v11, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v11}, Ln0/g0/e/d;->f()V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_1
-
-    invoke-virtual {v1, v0, v8}, Ln0/g0/d/c;->c(Ln0/a0;Z)Lo0/u;
-
-    move-result-object v8
-
-    invoke-static {v8}, Lf/n/a/k/a;->o(Lo0/u;)Lokio/BufferedSink;
-
-    move-result-object v8
-
-    invoke-virtual {v3, v8}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
-
-    goto :goto_1
-
-    :catch_1
-    move-exception v0
-
-    iget-object v2, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v3, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {v2, v3, v0}, Ln0/t;->c(Ln0/f;Ljava/io/IOException;)V
-
-    invoke-virtual {v1, v0}, Ln0/g0/d/c;->f(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_3
-    invoke-virtual {v1, v0, v9}, Ln0/g0/d/c;->c(Ln0/a0;Z)Lo0/u;
-
-    move-result-object v8
-
-    invoke-static {v8}, Lf/n/a/k/a;->o(Lo0/u;)Lokio/BufferedSink;
-
-    move-result-object v8
-
-    invoke-virtual {v3, v8}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
-
-    check-cast v8, Lo0/p;
-
-    invoke-virtual {v8}, Lo0/p;->close()V
-
-    goto :goto_1
-
-    :cond_4
-    iget-object v11, v1, Ln0/g0/d/c;->b:Ln0/g0/d/m;
-
-    invoke-virtual {v11, v1, v8, v9, v2}, Ln0/g0/d/m;->e(Ln0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
-
-    invoke-virtual {v1}, Ln0/g0/d/c;->b()Ln0/g0/d/i;
-
-    move-result-object v8
-
-    if-eqz v8, :cond_6
-
-    invoke-virtual {v8}, Ln0/g0/d/i;->h()Z
-
-    move-result v8
-
-    if-nez v8, :cond_8
-
-    iget-object v8, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v8}, Ln0/g0/e/d;->a()Ln0/g0/d/i;
-
-    move-result-object v8
-
-    if-eqz v8, :cond_5
-
-    invoke-virtual {v8}, Ln0/g0/d/i;->j()V
-
-    goto :goto_1
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_7
-    iget-object v7, v1, Ln0/g0/d/c;->b:Ln0/g0/d/m;
-
-    invoke-virtual {v7, v1, v8, v9, v2}, Ln0/g0/d/m;->e(Ln0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
-
-    const/4 v10, 0x0
-
-    move-object v7, v2
-
-    :cond_8
-    :goto_1
-    if-eqz v3, :cond_9
-
-    invoke-virtual {v3}, Lokhttp3/RequestBody;->isDuplex()Z
-
-    move-result v3
-
-    if-nez v3, :cond_a
-
-    :cond_9
-    :try_start_4
-    iget-object v3, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v3}, Ln0/g0/e/d;->b()V
-    :try_end_4
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_4
-
-    :cond_a
-    if-nez v10, :cond_d
-
-    iget-object v3, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v8, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    if-eqz v3, :cond_c
-
-    if-eqz v8, :cond_b
-
-    goto :goto_2
-
-    :cond_b
-    invoke-static {v6}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_c
-    throw v2
-
-    :cond_d
-    :goto_2
-    if-nez v7, :cond_f
-
-    invoke-virtual {v1, v9}, Ln0/g0/d/c;->e(Z)Lokhttp3/Response$a;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_e
-
-    goto :goto_3
-
-    :cond_e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_f
-    :goto_3
-    iput-object v0, v7, Lokhttp3/Response$a;->a:Ln0/a0;
-
-    invoke-virtual {v1}, Ln0/g0/d/c;->b()Ln0/g0/d/i;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_29
-
-    iget-object v3, v3, Ln0/g0/d/i;->d:Ln0/v;
-
-    iput-object v3, v7, Lokhttp3/Response$a;->e:Ln0/v;
-
-    iput-wide v4, v7, Lokhttp3/Response$a;->k:J
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v10
-
-    iput-wide v10, v7, Lokhttp3/Response$a;->l:J
-
-    invoke-virtual {v7}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    move-result-object v3
-
-    iget v7, v3, Lokhttp3/Response;->g:I
-
-    const/16 v8, 0x64
-
-    if-ne v7, v8, :cond_12
-
-    invoke-virtual {v1, v9}, Ln0/g0/d/c;->e(Z)Lokhttp3/Response$a;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_11
-
-    iput-object v0, v3, Lokhttp3/Response$a;->a:Ln0/a0;
-
-    invoke-virtual {v1}, Ln0/g0/d/c;->b()Ln0/g0/d/i;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_10
-
-    iget-object v0, v0, Ln0/g0/d/i;->d:Ln0/v;
-
-    iput-object v0, v3, Lokhttp3/Response$a;->e:Ln0/v;
-
-    iput-wide v4, v3, Lokhttp3/Response$a;->k:J
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v4
-
-    iput-wide v4, v3, Lokhttp3/Response$a;->l:J
-
-    invoke-virtual {v3}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
-
-    move-result-object v3
-
-    iget v7, v3, Lokhttp3/Response;->g:I
-
-    goto :goto_4
-
-    :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_11
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_12
-    :goto_4
-    iget-object v0, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v4, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    if-eqz v0, :cond_28
-
-    if-eqz v4, :cond_27
-
-    move-object/from16 v4, p0
-
-    iget-boolean v0, v4, Ln0/g0/e/b;->b:Z
-
-    const-string v2, "message == null"
-
-    const-string v5, "protocol == null"
-
-    const-string v8, "request == null"
-
-    const-string v9, "code < 0: "
-
-    if-eqz v0, :cond_18
-
-    const/16 v0, 0x65
-
-    if-ne v7, v0, :cond_18
-
-    iget-object v11, v3, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v12, v3, Lokhttp3/Response;->e:Ln0/y;
-
-    iget v14, v3, Lokhttp3/Response;->g:I
-
-    iget-object v13, v3, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    iget-object v15, v3, Lokhttp3/Response;->h:Ln0/v;
-
-    iget-object v0, v3, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v0}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object v0
-
-    iget-object v6, v3, Lokhttp3/Response;->k:Lokhttp3/Response;
-
-    iget-object v10, v3, Lokhttp3/Response;->l:Lokhttp3/Response;
-
-    iget-object v4, v3, Lokhttp3/Response;->m:Lokhttp3/Response;
-
-    move/from16 p1, v7
-
-    move-object/from16 v16, v8
-
-    iget-wide v7, v3, Lokhttp3/Response;->n:J
-
-    move-object/from16 v26, v1
-
-    move-object/from16 v17, v2
-
-    iget-wide v1, v3, Lokhttp3/Response;->o:J
-
-    iget-object v3, v3, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    sget-object v18, Ln0/g0/b;->c:Lokhttp3/ResponseBody;
-
-    if-ltz v14, :cond_13
-
-    const/16 v19, 0x1
-
-    goto :goto_5
-
-    :cond_13
-    const/16 v19, 0x0
-
-    :goto_5
-    if-eqz v19, :cond_17
-
-    if-eqz v11, :cond_16
-
-    if-eqz v12, :cond_15
-
-    if-eqz v13, :cond_14
-
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v16
-
-    new-instance v0, Lokhttp3/Response;
-
-    move-object v5, v10
-
-    move-object v10, v0
-
-    move-object/from16 v17, v18
-
-    move-object/from16 v18, v6
-
-    move-object/from16 v19, v5
-
-    move-object/from16 v20, v4
-
-    move-wide/from16 v21, v7
-
-    move-wide/from16 v23, v1
-
-    move-object/from16 v25, v3
-
-    invoke-direct/range {v10 .. v25}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
-
-    move-object/from16 v27, v26
-
-    goto/16 :goto_7
-
-    :cond_14
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual/range {v17 .. v17}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_15
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v5}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_16
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual/range {v16 .. v16}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_17
-    invoke-static {v9, v14}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_18
-    move-object/from16 v26, v1
-
-    move-object/from16 v17, v2
-
-    move/from16 p1, v7
-
-    move-object/from16 v16, v8
-
-    iget-object v0, v3, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v4, v3, Lokhttp3/Response;->e:Ln0/y;
-
-    iget v1, v3, Lokhttp3/Response;->g:I
-
-    iget-object v7, v3, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    iget-object v8, v3, Lokhttp3/Response;->h:Ln0/v;
-
-    iget-object v2, v3, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v2}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object v2
-
-    iget-object v10, v3, Lokhttp3/Response;->k:Lokhttp3/Response;
-
-    iget-object v11, v3, Lokhttp3/Response;->l:Lokhttp3/Response;
-
-    iget-object v12, v3, Lokhttp3/Response;->m:Lokhttp3/Response;
-
-    iget-wide v13, v3, Lokhttp3/Response;->n:J
-
-    move-wide/from16 v18, v13
-
-    iget-wide v13, v3, Lokhttp3/Response;->o:J
-
-    iget-object v15, v3, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    move-wide/from16 v21, v13
-
-    move-object/from16 v20, v15
-
-    move-object/from16 v15, v26
-
-    :try_start_5
-    iget-object v13, v15, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v14, v15, Ln0/g0/d/c;->c:Ln0/f;
-
-    if-eqz v13, :cond_26
-
-    if-eqz v14, :cond_25
-
-    const-string v6, "Content-Type"
-
-    const/4 v13, 0x2
-
-    const/4 v14, 0x0
-
-    invoke-static {v3, v6, v14, v13}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v6
-
-    iget-object v13, v15, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v13, v3}, Ln0/g0/e/d;->g(Lokhttp3/Response;)J
-
-    move-result-wide v13
-
-    move-object/from16 v23, v9
-
-    iget-object v9, v15, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v9, v3}, Ln0/g0/e/d;->d(Lokhttp3/Response;)Lo0/w;
-
-    move-result-object v3
-
-    new-instance v9, Ln0/g0/d/c$b;
-
-    invoke-direct {v9, v15, v3, v13, v14}, Ln0/g0/d/c$b;-><init>(Ln0/g0/d/c;Lo0/w;J)V
-
-    new-instance v3, Ln0/g0/e/h;
-
-    invoke-static {v9}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
-
-    move-result-object v9
-
-    invoke-direct {v3, v6, v13, v14, v9}, Ln0/g0/e/h;-><init>(Ljava/lang/String;JLo0/g;)V
-    :try_end_5
-    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
-
-    if-ltz v1, :cond_19
-
-    const/4 v6, 0x1
-
-    goto :goto_6
-
-    :cond_19
-    const/4 v6, 0x0
-
-    :goto_6
-    if-eqz v6, :cond_24
-
-    if-eqz v0, :cond_23
-
-    if-eqz v4, :cond_22
-
-    if-eqz v7, :cond_21
-
-    invoke-virtual {v2}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v9
-
-    new-instance v23, Lokhttp3/Response;
-
-    move-object/from16 v2, v23
-
-    move-object v13, v3
-
-    move-object v3, v0
-
-    move-object v5, v7
-
-    move v6, v1
-
-    move-object v7, v8
-
-    move-object v8, v9
-
-    move-object v9, v13
-
-    move-wide/from16 v0, v21
-
-    move-wide/from16 v13, v18
-
-    move-object/from16 v27, v15
-
-    move-object/from16 v17, v20
-
-    move-wide v15, v0
-
-    invoke-direct/range {v2 .. v17}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
-
-    move-object/from16 v0, v23
-
-    :goto_7
-    iget-object v1, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    const-string v2, "Connection"
-
-    invoke-virtual {v1, v2}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v3, "close"
-
-    const/4 v4, 0x1
-
-    invoke-static {v3, v1, v4}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-nez v1, :cond_1a
-
-    const/4 v1, 0x2
-
-    const/4 v5, 0x0
-
-    invoke-static {v0, v2, v5, v1}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v3, v1, v4}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1b
-
-    :cond_1a
-    move-object/from16 v1, v27
-
-    iget-object v1, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v1}, Ln0/g0/e/d;->a()Ln0/g0/d/i;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_20
-
-    invoke-virtual {v1}, Ln0/g0/d/i;->j()V
-
-    :cond_1b
-    const/16 v1, 0xcc
-
-    move/from16 v7, p1
-
-    if-eq v7, v1, :cond_1c
-
-    const/16 v1, 0xcd
-
-    if-ne v7, v1, :cond_1f
-
-    :cond_1c
-    iget-object v1, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v1, :cond_1d
-
-    invoke-virtual {v1}, Lokhttp3/ResponseBody;->a()J
-
-    move-result-wide v1
-
-    goto :goto_8
-
-    :cond_1d
-    const-wide/16 v1, -0x1
-
-    :goto_8
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-lez v5, :cond_1f
-
-    new-instance v1, Ljava/net/ProtocolException;
-
-    const-string v2, "HTTP "
-
-    const-string v3, " had non-zero Content-Length: "
-
-    invoke-static {v2, v7, v3}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    iget-object v0, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v0, :cond_1e
-
-    invoke-virtual {v0}, Lokhttp3/ResponseBody;->a()J
-
-    move-result-wide v3
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    goto :goto_9
-
-    :cond_1e
-    const/4 v0, 0x0
-
-    :goto_9
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1f
-    return-object v0
-
-    :cond_20
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_21
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual/range {v17 .. v17}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_22
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v5}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_23
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual/range {v16 .. v16}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_24
-    move-object/from16 v0, v23
-
-    invoke-static {v0, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_25
-    move-object v1, v15
-
-    :try_start_6
-    invoke-static {v6}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_6
-    .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_2
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_26
-    move-object v1, v15
-
-    const/4 v0, 0x0
-
-    :try_start_7
-    throw v0
-    :try_end_7
-    .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_2
-
-    :catch_2
-    move-exception v0
-
-    goto :goto_a
-
-    :catch_3
-    move-exception v0
-
-    move-object v1, v15
-
-    :goto_a
-    iget-object v2, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v3, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {v2, v3, v0}, Ln0/t;->d(Ln0/f;Ljava/io/IOException;)V
-
-    invoke-virtual {v1, v0}, Ln0/g0/d/c;->f(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_27
-    invoke-static {v6}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_28
-    throw v2
-
-    :cond_29
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :catch_4
-    move-exception v0
-
-    iget-object v2, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v3, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {v2, v3, v0}, Ln0/t;->c(Ln0/f;Ljava/io/IOException;)V
-
-    invoke-virtual {v1, v0}, Ln0/g0/d/c;->f(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_2a
-    :try_start_8
-    invoke-static {v6}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_8
-    .catch Ljava/io/IOException; {:try_start_8 .. :try_end_8} :catch_5
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2b
-    :try_start_9
-    throw v2
-
-    :cond_2c
-    invoke-static {v6}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_9
-    .catch Ljava/io/IOException; {:try_start_9 .. :try_end_9} :catch_5
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2d
-    :try_start_a
-    throw v2
-    :try_end_a
-    .catch Ljava/io/IOException; {:try_start_a .. :try_end_a} :catch_5
-
-    :catch_5
-    move-exception v0
-
-    iget-object v2, v1, Ln0/g0/d/c;->d:Ln0/t;
-
-    iget-object v3, v1, Ln0/g0/d/c;->c:Ln0/f;
-
-    invoke-virtual {v2, v3, v0}, Ln0/t;->c(Ln0/f;Ljava/io/IOException;)V
-
-    invoke-virtual {v1, v0}, Ln0/g0/d/c;->f(Ljava/io/IOException;)V
-
-    throw v0
-
-    :cond_2e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/c$a.smali b/com.discord/smali_classes2/n0/g0/e/c$a.smali
deleted file mode 100644
index bfd1ec2da6..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/c$a.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public final Ln0/g0/e/c$a;
-.super Ljava/lang/ThreadLocal;
-.source "dates.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/e/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/ThreadLocal<",
-        "Ljava/text/DateFormat;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/ThreadLocal;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public initialValue()Ljava/lang/Object;
-    .locals 3
-
-    new-instance v0, Ljava/text/SimpleDateFormat;
-
-    sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const-string v2, "EEE, dd MMM yyyy HH:mm:ss \'GMT\'"
-
-    invoke-direct {v0, v2, v1}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;Ljava/util/Locale;)V
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/text/SimpleDateFormat;->setLenient(Z)V
-
-    sget-object v1, Ln0/g0/b;->e:Ljava/util/TimeZone;
-
-    invoke-virtual {v0, v1}, Ljava/text/SimpleDateFormat;->setTimeZone(Ljava/util/TimeZone;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/c.smali b/com.discord/smali_classes2/n0/g0/e/c.smali
deleted file mode 100644
index 2382912357..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/c.smali
+++ /dev/null
@@ -1,89 +0,0 @@
-.class public final Ln0/g0/e/c;
-.super Ljava/lang/Object;
-.source "dates.kt"
-
-
-# static fields
-.field public static final a:Ln0/g0/e/c$a;
-
-.field public static final b:[Ljava/lang/String;
-
-.field public static final c:[Ljava/text/DateFormat;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 16
-
-    new-instance v0, Ln0/g0/e/c$a;
-
-    invoke-direct {v0}, Ln0/g0/e/c$a;-><init>()V
-
-    sput-object v0, Ln0/g0/e/c;->a:Ln0/g0/e/c$a;
-
-    const-string v1, "EEE, dd MMM yyyy HH:mm:ss zzz"
-
-    const-string v2, "EEEE, dd-MMM-yy HH:mm:ss zzz"
-
-    const-string v3, "EEE MMM d HH:mm:ss yyyy"
-
-    const-string v4, "EEE, dd-MMM-yyyy HH:mm:ss z"
-
-    const-string v5, "EEE, dd-MMM-yyyy HH-mm-ss z"
-
-    const-string v6, "EEE, dd MMM yy HH:mm:ss z"
-
-    const-string v7, "EEE dd-MMM-yyyy HH:mm:ss z"
-
-    const-string v8, "EEE dd MMM yyyy HH:mm:ss z"
-
-    const-string v9, "EEE dd-MMM-yyyy HH-mm-ss z"
-
-    const-string v10, "EEE dd-MMM-yy HH:mm:ss z"
-
-    const-string v11, "EEE dd MMM yy HH:mm:ss z"
-
-    const-string v12, "EEE,dd-MMM-yy HH:mm:ss z"
-
-    const-string v13, "EEE,dd-MMM-yyyy HH:mm:ss z"
-
-    const-string v14, "EEE, dd-MM-yyyy HH:mm:ss z"
-
-    const-string v15, "EEE MMM d yyyy HH:mm:ss z"
-
-    filled-new-array/range {v1 .. v15}, [Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/e/c;->b:[Ljava/lang/String;
-
-    array-length v0, v0
-
-    new-array v0, v0, [Ljava/text/DateFormat;
-
-    sput-object v0, Ln0/g0/e/c;->c:[Ljava/text/DateFormat;
-
-    return-void
-.end method
-
-.method public static final a(Ljava/util/Date;)Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Ln0/g0/e/c;->a:Ln0/g0/e/c$a;
-
-    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/text/DateFormat;
-
-    invoke-virtual {v0, p0}, Ljava/text/DateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v0, "STANDARD_DATE_FORMAT.get().format(this)"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/d.smali b/com.discord/smali_classes2/n0/g0/e/d.smali
deleted file mode 100644
index 1384d582fc..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/d.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public interface abstract Ln0/g0/e/d;
-.super Ljava/lang/Object;
-.source "ExchangeCode.kt"
-
-
-# virtual methods
-.method public abstract a()Ln0/g0/d/i;
-.end method
-
-.method public abstract b()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract c(Ln0/a0;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract cancel()V
-.end method
-
-.method public abstract d(Lokhttp3/Response;)Lo0/w;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract e(Z)Lokhttp3/Response$a;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract f()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract g(Lokhttp3/Response;)J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract h(Ln0/a0;J)Lo0/u;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/e.smali b/com.discord/smali_classes2/n0/g0/e/e.smali
deleted file mode 100644
index cc15f4b101..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/e.smali
+++ /dev/null
@@ -1,789 +0,0 @@
-.class public final Ln0/g0/e/e;
-.super Ljava/lang/Object;
-.source "HttpHeaders.kt"
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, "\"\\"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, "\t ,="
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    return-void
-.end method
-
-.method public static final a(Lokhttp3/Response;)Z
-    .locals 8
-
-    iget-object v0, p0, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v0, v0, Ln0/a0;->c:Ljava/lang/String;
-
-    const-string v1, "HEAD"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    iget v0, p0, Lokhttp3/Response;->g:I
-
-    const/16 v2, 0x64
-
-    const/4 v3, 0x1
-
-    if-lt v0, v2, :cond_1
-
-    const/16 v2, 0xc8
-
-    if-lt v0, v2, :cond_2
-
-    :cond_1
-    const/16 v2, 0xcc
-
-    if-eq v0, v2, :cond_2
-
-    const/16 v2, 0x130
-
-    if-eq v0, v2, :cond_2
-
-    return v3
-
-    :cond_2
-    invoke-static {p0}, Ln0/g0/b;->n(Lokhttp3/Response;)J
-
-    move-result-wide v4
-
-    const-wide/16 v6, -0x1
-
-    cmp-long v0, v4, v6
-
-    if-nez v0, :cond_4
-
-    const/4 v0, 0x2
-
-    const-string v2, "Transfer-Encoding"
-
-    const/4 v4, 0x0
-
-    invoke-static {p0, v2, v4, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v0, "chunked"
-
-    invoke-static {v0, p0, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    return v1
-
-    :cond_4
-    :goto_0
-    return v3
-.end method
-
-.method public static final b(Ln0/p;Ln0/w;Lokhttp3/Headers;)V
-    .locals 36
-
-    move-object/from16 v1, p0
-
-    move-object/from16 v2, p1
-
-    move-object/from16 v0, p2
-
-    if-eqz v1, :cond_28
-
-    if-eqz v2, :cond_27
-
-    if-eqz v0, :cond_26
-
-    sget-object v4, Ln0/p;->a:Ln0/p;
-
-    if-ne v1, v4, :cond_0
-
-    return-void
-
-    :cond_0
-    sget-object v4, Ln0/n;->n:Ln0/n$a;
-
-    invoke-virtual/range {p2 .. p2}, Lokhttp3/Headers;->size()I
-
-    move-result v5
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    :goto_0
-    const/4 v9, 0x2
-
-    const/4 v10, 0x1
-
-    if-ge v7, v5, :cond_3
-
-    invoke-virtual {v0, v7}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
-
-    move-result-object v11
-
-    const-string v12, "Set-Cookie"
-
-    invoke-static {v12, v11, v10}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_2
-
-    if-nez v8, :cond_1
-
-    new-instance v8, Ljava/util/ArrayList;
-
-    invoke-direct {v8, v9}, Ljava/util/ArrayList;-><init>(I)V
-
-    :cond_1
-    invoke-virtual {v0, v7}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-interface {v8, v9}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_2
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    if-eqz v8, :cond_4
-
-    invoke-static {v8}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object v0
-
-    const-string v5, "Collections.unmodifiableList(result)"
-
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_1
-
-    :cond_4
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
-
-    :goto_1
-    move-object v5, v0
-
-    invoke-interface {v5}, Ljava/util/List;->size()I
-
-    move-result v7
-
-    const/4 v8, 0x0
-
-    const/4 v11, 0x0
-
-    :goto_2
-    if-ge v8, v7, :cond_23
-
-    invoke-interface {v5, v8}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v12, v0
-
-    check-cast v12, Ljava/lang/String;
-
-    if-eqz v12, :cond_22
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v13
-
-    const/16 v15, 0x3b
-
-    const/4 v3, 0x6
-
-    invoke-static {v12, v15, v6, v6, v3}, Ln0/g0/b;->j(Ljava/lang/String;CIII)I
-
-    move-result v0
-
-    const/16 v3, 0x3d
-
-    invoke-static {v12, v3, v6, v0}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result v9
-
-    if-ne v9, v0, :cond_6
-
-    :cond_5
-    :goto_3
-    const/4 v9, 0x2
-
-    const/4 v10, 0x0
-
-    const/4 v15, 0x1
-
-    goto/16 :goto_f
-
-    :cond_6
-    invoke-static {v12, v6, v9}, Ln0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
-
-    move-result-object v17
-
-    invoke-virtual/range {v17 .. v17}, Ljava/lang/String;->length()I
-
-    move-result v16
-
-    if-nez v16, :cond_7
-
-    const/16 v16, 0x1
-
-    goto :goto_4
-
-    :cond_7
-    const/16 v16, 0x0
-
-    :goto_4
-    if-nez v16, :cond_5
-
-    invoke-static/range {v17 .. v17}, Ln0/g0/b;->q(Ljava/lang/String;)I
-
-    move-result v6
-
-    const/4 v10, -0x1
-
-    if-eq v6, v10, :cond_8
-
-    goto :goto_3
-
-    :cond_8
-    add-int/lit8 v9, v9, 0x1
-
-    invoke-static {v12, v9, v0}, Ln0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
-
-    move-result-object v18
-
-    invoke-static/range {v18 .. v18}, Ln0/g0/b;->q(Ljava/lang/String;)I
-
-    move-result v6
-
-    if-eq v6, v10, :cond_9
-
-    goto :goto_3
-
-    :cond_9
-    add-int/lit8 v0, v0, 0x1
-
-    invoke-virtual {v12}, Ljava/lang/String;->length()I
-
-    move-result v6
-
-    const-wide v19, 0xe677d21fdbffL
-
-    move-wide/from16 v30, v19
-
-    const-wide/16 v21, -0x1
-
-    const/16 v23, 0x0
-
-    const/16 v24, 0x0
-
-    const/16 v25, 0x0
-
-    const/16 v26, 0x1
-
-    const/16 v28, 0x0
-
-    const/16 v29, 0x0
-
-    :goto_5
-    const-wide v32, 0x7fffffffffffffffL
-
-    const-wide/high16 v34, -0x8000000000000000L
-
-    if-ge v0, v6, :cond_14
-
-    invoke-static {v12, v15, v0, v6}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result v9
-
-    invoke-static {v12, v3, v0, v9}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result v10
-
-    invoke-static {v12, v0, v10}, Ln0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-ge v10, v9, :cond_a
-
-    add-int/lit8 v10, v10, 0x1
-
-    invoke-static {v12, v10, v9}, Ln0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
-
-    move-result-object v10
-
-    goto :goto_6
-
-    :cond_a
-    const-string v10, ""
-
-    :goto_6
-    const-string v3, "expires"
-
-    const/4 v15, 0x1
-
-    invoke-static {v0, v3, v15}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_b
-
-    :try_start_0
-    invoke-virtual {v10}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v4, v10, v3, v0}, Ln0/n$a;->d(Ljava/lang/String;II)J
-
-    move-result-wide v30
-    :try_end_0
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
-
-    goto :goto_8
-
-    :cond_b
-    const-string v3, "max-age"
-
-    invoke-static {v0, v3, v15}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_f
-
-    :try_start_1
-    invoke-static {v10}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
-
-    move-result-wide v21
-    :try_end_1
-    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0
-
-    const-wide/16 v32, 0x0
-
-    cmp-long v0, v21, v32
-
-    if-gtz v0, :cond_c
-
-    goto :goto_7
-
-    :cond_c
-    move-wide/from16 v34, v21
-
-    :goto_7
-    move-wide/from16 v21, v34
-
-    goto :goto_8
-
-    :catch_0
-    move-exception v0
-
-    move-object v3, v0
-
-    :try_start_2
-    new-instance v0, Lkotlin/text/Regex;
-
-    const-string v15, "-?\\d+"
-
-    invoke-direct {v0, v15}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v0, v10}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_e
-
-    const-string v0, "-"
-
-    const/4 v3, 0x2
-
-    const/4 v15, 0x0
-
-    invoke-static {v10, v0, v15, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_d
-
-    move-wide/from16 v32, v34
-
-    :cond_d
-    move-wide/from16 v21, v32
-
-    :goto_8
-    const/4 v15, 0x1
-
-    const/16 v25, 0x1
-
-    goto :goto_9
-
-    :cond_e
-    throw v3
-    :try_end_2
-    .catch Ljava/lang/NumberFormatException; {:try_start_2 .. :try_end_2} :catch_1
-
-    :catch_1
-    const/4 v15, 0x1
-
-    goto :goto_9
-
-    :cond_f
-    const-string v3, "domain"
-
-    const/4 v15, 0x1
-
-    invoke-static {v0, v3, v15}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_10
-
-    :try_start_3
-    invoke-virtual {v4, v10}, Ln0/n$a;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-    :try_end_3
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_3 .. :try_end_3} :catch_2
-
-    move-object/from16 v28, v0
-
-    const/16 v26, 0x0
-
-    goto :goto_9
-
-    :cond_10
-    const-string v3, "path"
-
-    invoke-static {v0, v3, v15}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_11
-
-    move-object/from16 v29, v10
-
-    goto :goto_9
-
-    :cond_11
-    const-string v3, "secure"
-
-    invoke-static {v0, v3, v15}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_12
-
-    const/16 v23, 0x1
-
-    goto :goto_9
-
-    :cond_12
-    const-string v3, "httponly"
-
-    invoke-static {v0, v3, v15}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_13
-
-    const/16 v24, 0x1
-
-    :catch_2
-    :cond_13
-    :goto_9
-    add-int/lit8 v0, v9, 0x1
-
-    const/16 v3, 0x3d
-
-    const/16 v15, 0x3b
-
-    goto/16 :goto_5
-
-    :cond_14
-    const/4 v15, 0x1
-
-    cmp-long v0, v21, v34
-
-    if-nez v0, :cond_15
-
-    move-wide/from16 v19, v34
-
-    goto :goto_a
-
-    :cond_15
-    const-wide/16 v9, -0x1
-
-    cmp-long v0, v21, v9
-
-    if-eqz v0, :cond_18
-
-    const-wide v9, 0x20c49ba5e353f7L
-
-    cmp-long v0, v21, v9
-
-    if-gtz v0, :cond_16
-
-    const/16 v0, 0x3e8
-
-    int-to-long v9, v0
-
-    mul-long v32, v21, v9
-
-    :cond_16
-    add-long v32, v13, v32
-
-    cmp-long v0, v32, v13
-
-    if-ltz v0, :cond_19
-
-    cmp-long v0, v32, v19
-
-    if-lez v0, :cond_17
-
-    goto :goto_a
-
-    :cond_17
-    move-wide/from16 v19, v32
-
-    goto :goto_a
-
-    :cond_18
-    move-wide/from16 v19, v30
-
-    :cond_19
-    :goto_a
-    iget-object v0, v2, Ln0/w;->e:Ljava/lang/String;
-
-    move-object/from16 v3, v28
-
-    if-nez v3, :cond_1a
-
-    move-object v3, v0
-
-    goto :goto_b
-
-    :cond_1a
-    invoke-virtual {v4, v0, v3}, Ln0/n$a;->b(Ljava/lang/String;Ljava/lang/String;)Z
-
-    move-result v6
-
-    if-nez v6, :cond_1b
-
-    goto :goto_c
-
-    :cond_1b
-    :goto_b
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    invoke-virtual {v3}, Ljava/lang/String;->length()I
-
-    move-result v6
-
-    if-eq v0, v6, :cond_1c
-
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->h:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;
-
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->g:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
-
-    invoke-virtual {v0, v3}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1c
-
-    :goto_c
-    const/4 v9, 0x2
-
-    const/4 v10, 0x0
-
-    goto :goto_f
-
-    :cond_1c
-    const-string v0, "/"
-
-    move-object/from16 v6, v29
-
-    const/4 v9, 0x2
-
-    const/4 v10, 0x0
-
-    if-eqz v6, :cond_1e
-
-    invoke-static {v6, v0, v10, v9}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v12
-
-    if-nez v12, :cond_1d
-
-    goto :goto_d
-
-    :cond_1d
-    move-object/from16 v22, v6
-
-    goto :goto_e
-
-    :cond_1e
-    :goto_d
-    invoke-virtual/range {p1 .. p1}, Ln0/w;->b()Ljava/lang/String;
-
-    move-result-object v6
-
-    const/16 v12, 0x2f
-
-    const/4 v13, 0x6
-
-    invoke-static {v6, v12, v10, v10, v13}, Lj0/t/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v12
-
-    if-eqz v12, :cond_1f
-
-    invoke-virtual {v6, v10, v12}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v6, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v0, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_1f
-    move-object/from16 v22, v0
-
-    :goto_e
-    new-instance v0, Ln0/n;
-
-    const/16 v27, 0x0
-
-    move-object/from16 v16, v0
-
-    move-object/from16 v21, v3
-
-    invoke-direct/range {v16 .. v27}, Ln0/n;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    goto :goto_10
-
-    :goto_f
-    const/4 v0, 0x0
-
-    :goto_10
-    if-eqz v0, :cond_21
-
-    if-nez v11, :cond_20
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
-
-    move-object v11, v3
-
-    :cond_20
-    invoke-interface {v11, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_21
-    add-int/lit8 v8, v8, 0x1
-
-    const/4 v6, 0x0
-
-    const/4 v10, 0x1
-
-    goto/16 :goto_2
-
-    :cond_22
-    const-string v0, "setCookie"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
-
-    :cond_23
-    if-eqz v11, :cond_24
-
-    invoke-static {v11}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object v0
-
-    const-string v3, "Collections.unmodifiableList(cookies)"
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_11
-
-    :cond_24
-    sget-object v0, Lj0/i/n;->d:Lj0/i/n;
-
-    :goto_11
-    invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_25
-
-    return-void
-
-    :cond_25
-    invoke-interface {v1, v2, v0}, Ln0/p;->a(Ln0/w;Ljava/util/List;)V
-
-    return-void
-
-    :cond_26
-    const-string v0, "headers"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v1, 0x0
-
-    throw v1
-
-    :cond_27
-    const/4 v1, 0x0
-
-    const-string v0, "url"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_28
-    const/4 v1, 0x0
-
-    const-string v0, "$this$receiveHeaders"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/f.smali b/com.discord/smali_classes2/n0/g0/e/f.smali
deleted file mode 100644
index 7f180be17e..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/f.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final Ln0/g0/e/f;
-.super Ljava/lang/Object;
-.source "HttpMethod.kt"
-
-
-# direct methods
-.method public static final a(Ljava/lang/String;)Z
-    .locals 1
-
-    if-eqz p0, :cond_1
-
-    const-string v0, "GET"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-string v0, "HEAD"
-
-    invoke-static {p0, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p0
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-
-    :cond_1
-    const-string p0, "method"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/g.smali b/com.discord/smali_classes2/n0/g0/e/g.smali
deleted file mode 100644
index eb681f5b73..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/g.smali
+++ /dev/null
@@ -1,554 +0,0 @@
-.class public final Ln0/g0/e/g;
-.super Ljava/lang/Object;
-.source "RealInterceptorChain.kt"
-
-# interfaces
-.implements Lokhttp3/Interceptor$Chain;
-
-
-# instance fields
-.field public a:I
-
-.field public final b:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lokhttp3/Interceptor;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Ln0/g0/d/m;
-
-.field public final d:Ln0/g0/d/c;
-
-.field public final e:I
-
-.field public final f:Ln0/a0;
-
-.field public final g:Ln0/f;
-
-.field public final h:I
-
-.field public final i:I
-
-.field public final j:I
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;Ln0/g0/d/m;Ln0/g0/d/c;ILn0/a0;Ln0/f;III)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Lokhttp3/Interceptor;",
-            ">;",
-            "Ln0/g0/d/m;",
-            "Ln0/g0/d/c;",
-            "I",
-            "Ln0/a0;",
-            "Ln0/f;",
-            "III)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    if-eqz p5, :cond_1
-
-    if-eqz p6, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/e/g;->b:Ljava/util/List;
-
-    iput-object p2, p0, Ln0/g0/e/g;->c:Ln0/g0/d/m;
-
-    iput-object p3, p0, Ln0/g0/e/g;->d:Ln0/g0/d/c;
-
-    iput p4, p0, Ln0/g0/e/g;->e:I
-
-    iput-object p5, p0, Ln0/g0/e/g;->f:Ln0/a0;
-
-    iput-object p6, p0, Ln0/g0/e/g;->g:Ln0/f;
-
-    iput p7, p0, Ln0/g0/e/g;->h:I
-
-    iput p8, p0, Ln0/g0/e/g;->i:I
-
-    iput p9, p0, Ln0/g0/e/g;->j:I
-
-    return-void
-
-    :cond_0
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "request"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "transmitter"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "interceptors"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public a()Ln0/k;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/e/g;->d:Ln0/g0/d/c;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/d/c;->b()Ln0/g0/d/i;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public b()I
-    .locals 1
-
-    iget v0, p0, Ln0/g0/e/g;->i:I
-
-    return v0
-.end method
-
-.method public c()I
-    .locals 1
-
-    iget v0, p0, Ln0/g0/e/g;->j:I
-
-    return v0
-.end method
-
-.method public d(Ln0/a0;)Lokhttp3/Response;
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Ln0/g0/e/g;->c:Ln0/g0/d/m;
-
-    iget-object v1, p0, Ln0/g0/e/g;->d:Ln0/g0/d/c;
-
-    invoke-virtual {p0, p1, v0, v1}, Ln0/g0/e/g;->f(Ln0/a0;Ln0/g0/d/m;Ln0/g0/d/c;)Lokhttp3/Response;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "request"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public e()I
-    .locals 1
-
-    iget v0, p0, Ln0/g0/e/g;->h:I
-
-    return v0
-.end method
-
-.method public final f(Ln0/a0;Ln0/g0/d/m;Ln0/g0/d/c;)Lokhttp3/Response;
-    .locals 15
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object v0, p0
-
-    move-object/from16 v6, p1
-
-    const/4 v1, 0x0
-
-    if-eqz v6, :cond_f
-
-    if-eqz p2, :cond_e
-
-    iget v2, v0, Ln0/g0/e/g;->e:I
-
-    iget-object v3, v0, Ln0/g0/e/g;->b:Ljava/util/List;
-
-    invoke-interface {v3}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    if-ge v2, v3, :cond_d
-
-    iget v2, v0, Ln0/g0/e/g;->a:I
-
-    const/4 v11, 0x1
-
-    add-int/2addr v2, v11
-
-    iput v2, v0, Ln0/g0/e/g;->a:I
-
-    iget-object v2, v0, Ln0/g0/e/g;->d:Ln0/g0/d/c;
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v2}, Ln0/g0/d/c;->b()Ln0/g0/d/i;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_1
-
-    iget-object v1, v6, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v2, v1}, Ln0/g0/d/i;->m(Ln0/w;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    :goto_0
-    const/4 v1, 0x1
-
-    :goto_1
-    const-string v12, "network interceptor "
-
-    if-eqz v1, :cond_c
-
-    iget-object v1, v0, Ln0/g0/e/g;->d:Ln0/g0/d/c;
-
-    if-eqz v1, :cond_4
-
-    iget v1, v0, Ln0/g0/e/g;->a:I
-
-    if-gt v1, v11, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v1, 0x0
-
-    goto :goto_3
-
-    :cond_4
-    :goto_2
-    const/4 v1, 0x1
-
-    :goto_3
-    const-string v13, " must call proceed() exactly once"
-
-    if-eqz v1, :cond_b
-
-    new-instance v14, Ln0/g0/e/g;
-
-    iget-object v2, v0, Ln0/g0/e/g;->b:Ljava/util/List;
-
-    iget v1, v0, Ln0/g0/e/g;->e:I
-
-    add-int/lit8 v5, v1, 0x1
-
-    iget-object v7, v0, Ln0/g0/e/g;->g:Ln0/f;
-
-    iget v8, v0, Ln0/g0/e/g;->h:I
-
-    iget v9, v0, Ln0/g0/e/g;->i:I
-
-    iget v10, v0, Ln0/g0/e/g;->j:I
-
-    move-object v1, v14
-
-    move-object/from16 v3, p2
-
-    move-object/from16 v4, p3
-
-    move-object/from16 v6, p1
-
-    invoke-direct/range {v1 .. v10}, Ln0/g0/e/g;-><init>(Ljava/util/List;Ln0/g0/d/m;Ln0/g0/d/c;ILn0/a0;Ln0/f;III)V
-
-    iget-object v1, v0, Ln0/g0/e/g;->b:Ljava/util/List;
-
-    iget v2, v0, Ln0/g0/e/g;->e:I
-
-    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lokhttp3/Interceptor;
-
-    invoke-interface {v1, v14}, Lokhttp3/Interceptor;->intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-
-    move-result-object v2
-
-    const-string v3, "interceptor "
-
-    if-eqz v2, :cond_a
-
-    if-eqz p3, :cond_6
-
-    iget v4, v0, Ln0/g0/e/g;->e:I
-
-    add-int/2addr v4, v11
-
-    iget-object v5, v0, Ln0/g0/e/g;->b:Ljava/util/List;
-
-    invoke-interface {v5}, Ljava/util/List;->size()I
-
-    move-result v5
-
-    if-ge v4, v5, :cond_6
-
-    iget v4, v14, Ln0/g0/e/g;->a:I
-
-    if-ne v4, v11, :cond_5
-
-    goto :goto_4
-
-    :cond_5
-    const/4 v4, 0x0
-
-    goto :goto_5
-
-    :cond_6
-    :goto_4
-    const/4 v4, 0x1
-
-    :goto_5
-    if-eqz v4, :cond_9
-
-    iget-object v4, v2, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v4, :cond_7
-
-    goto :goto_6
-
-    :cond_7
-    const/4 v11, 0x0
-
-    :goto_6
-    if-eqz v11, :cond_8
-
-    return-object v2
-
-    :cond_8
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, " returned a response with no body"
-
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_9
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_a
-    new-instance v2, Ljava/lang/NullPointerException;
-
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, " returned null"
-
-    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_b
-    invoke-static {v12}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, v0, Ln0/g0/e/g;->b:Ljava/util/List;
-
-    iget v3, v0, Ln0/g0/e/g;->e:I
-
-    sub-int/2addr v3, v11
-
-    invoke-interface {v2, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lokhttp3/Interceptor;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_c
-    invoke-static {v12}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, v0, Ln0/g0/e/g;->b:Ljava/util/List;
-
-    iget v3, v0, Ln0/g0/e/g;->e:I
-
-    sub-int/2addr v3, v11
-
-    invoke-interface {v2, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lokhttp3/Interceptor;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v2, " must retain the same host and port"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_d
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v1
-
-    :cond_e
-    const-string v2, "transmitter"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_f
-    const-string v2, "request"
-
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public p()Ln0/a0;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/e/g;->f:Ln0/a0;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/h.smali b/com.discord/smali_classes2/n0/g0/e/h.smali
deleted file mode 100644
index cdb9234b10..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/h.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Ln0/g0/e/h;
-.super Lokhttp3/ResponseBody;
-.source "RealResponseBody.kt"
-
-
-# instance fields
-.field public final f:Ljava/lang/String;
-
-.field public final g:J
-
-.field public final h:Lo0/g;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;JLo0/g;)V
-    .locals 0
-
-    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/e/h;->f:Ljava/lang/String;
-
-    iput-wide p2, p0, Ln0/g0/e/h;->g:J
-
-    iput-object p4, p0, Ln0/g0/e/h;->h:Lo0/g;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()J
-    .locals 2
-
-    iget-wide v0, p0, Ln0/g0/e/h;->g:J
-
-    return-wide v0
-.end method
-
-.method public b()Lokhttp3/MediaType;
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/e/h;->f:Ljava/lang/String;
-
-    if-eqz v0, :cond_0
-
-    sget-object v1, Lokhttp3/MediaType;->g:Lokhttp3/MediaType$a;
-
-    invoke-static {v0}, Lokhttp3/MediaType$a;->b(Ljava/lang/String;)Lokhttp3/MediaType;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public c()Lo0/g;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/e/h;->h:Lo0/g;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/i.smali b/com.discord/smali_classes2/n0/g0/e/i.smali
deleted file mode 100644
index cc4605a68c..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/i.smali
+++ /dev/null
@@ -1,1417 +0,0 @@
-.class public final Ln0/g0/e/i;
-.super Ljava/lang/Object;
-.source "RetryAndFollowUpInterceptor.kt"
-
-# interfaces
-.implements Lokhttp3/Interceptor;
-
-
-# instance fields
-.field public final b:Ln0/x;
-
-
-# direct methods
-.method public constructor <init>(Ln0/x;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/e/i;->b:Ln0/x;
-
-    return-void
-
-    :cond_0
-    const-string p1, "client"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public final a(Lokhttp3/Response;Ljava/lang/String;)Ln0/a0;
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/e/i;->b:Ln0/x;
-
-    iget-boolean v0, v0, Ln0/x;->k:Z
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return-object v1
-
-    :cond_0
-    const/4 v0, 0x2
-
-    const-string v2, "Location"
-
-    invoke-static {p1, v2, v1, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_7
-
-    iget-object v2, p1, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v2, v2, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v2, v0}, Ln0/w;->j(Ljava/lang/String;)Ln0/w;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_7
-
-    iget-object v2, v0, Ln0/w;->b:Ljava/lang/String;
-
-    iget-object v3, p1, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v3, v3, Ln0/a0;->b:Ln0/w;
-
-    iget-object v3, v3, Ln0/w;->b:Ljava/lang/String;
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    iget-object v2, p0, Ln0/g0/e/i;->b:Ln0/x;
-
-    iget-boolean v2, v2, Ln0/x;->l:Z
-
-    if-nez v2, :cond_1
-
-    return-object v1
-
-    :cond_1
-    iget-object v2, p1, Lokhttp3/Response;->d:Ln0/a0;
-
-    if-eqz v2, :cond_6
-
-    new-instance v3, Ln0/a0$a;
-
-    invoke-direct {v3, v2}, Ln0/a0$a;-><init>(Ln0/a0;)V
-
-    invoke-static {p2}, Ln0/g0/e/f;->a(Ljava/lang/String;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    const-string v2, "PROPFIND"
-
-    invoke-static {p2, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    invoke-static {p2, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_2
-
-    const-string p2, "GET"
-
-    invoke-virtual {v3, p2, v1}, Ln0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
-
-    goto :goto_0
-
-    :cond_2
-    if-eqz v4, :cond_3
-
-    iget-object v1, p1, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v1, v1, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    :cond_3
-    invoke-virtual {v3, p2, v1}, Ln0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
-
-    :goto_0
-    if-nez v4, :cond_4
-
-    const-string p2, "Transfer-Encoding"
-
-    invoke-virtual {v3, p2}, Ln0/a0$a;->e(Ljava/lang/String;)Ln0/a0$a;
-
-    const-string p2, "Content-Length"
-
-    invoke-virtual {v3, p2}, Ln0/a0$a;->e(Ljava/lang/String;)Ln0/a0$a;
-
-    const-string p2, "Content-Type"
-
-    invoke-virtual {v3, p2}, Ln0/a0$a;->e(Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_4
-    iget-object p1, p1, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object p1, p1, Ln0/a0;->b:Ln0/w;
-
-    invoke-static {p1, v0}, Ln0/g0/b;->c(Ln0/w;Ln0/w;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_5
-
-    const-string p1, "Authorization"
-
-    invoke-virtual {v3, p1}, Ln0/a0$a;->e(Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_5
-    iput-object v0, v3, Ln0/a0$a;->a:Ln0/w;
-
-    invoke-virtual {v3}, Ln0/a0$a;->b()Ln0/a0;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_6
-    throw v1
-
-    :cond_7
-    return-object v1
-.end method
-
-.method public final b(Ljava/io/IOException;Ln0/g0/d/m;ZLn0/a0;)Z
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/e/i;->b:Ln0/x;
-
-    iget-boolean v0, v0, Ln0/x;->i:Z
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    const/4 v0, 0x1
-
-    if-eqz p3, :cond_4
-
-    iget-object p4, p4, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    if-eqz p4, :cond_1
-
-    invoke-virtual {p4}, Lokhttp3/RequestBody;->isOneShot()Z
-
-    move-result p4
-
-    if-nez p4, :cond_2
-
-    :cond_1
-    instance-of p4, p1, Ljava/io/FileNotFoundException;
-
-    if-eqz p4, :cond_3
-
-    :cond_2
-    const/4 p4, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 p4, 0x0
-
-    :goto_0
-    if-eqz p4, :cond_4
-
-    return v1
-
-    :cond_4
-    instance-of p4, p1, Ljava/net/ProtocolException;
-
-    if-eqz p4, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    instance-of p4, p1, Ljava/io/InterruptedIOException;
-
-    if-eqz p4, :cond_6
-
-    instance-of p1, p1, Ljava/net/SocketTimeoutException;
-
-    if-eqz p1, :cond_8
-
-    if-nez p3, :cond_8
-
-    goto :goto_2
-
-    :cond_6
-    instance-of p3, p1, Ljavax/net/ssl/SSLHandshakeException;
-
-    if-eqz p3, :cond_7
-
-    invoke-virtual {p1}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
-
-    move-result-object p3
-
-    instance-of p3, p3, Ljava/security/cert/CertificateException;
-
-    if-eqz p3, :cond_7
-
-    goto :goto_1
-
-    :cond_7
-    instance-of p1, p1, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    if-eqz p1, :cond_9
-
-    :cond_8
-    :goto_1
-    const/4 p1, 0x0
-
-    goto :goto_3
-
-    :cond_9
-    :goto_2
-    const/4 p1, 0x1
-
-    :goto_3
-    if-nez p1, :cond_a
-
-    return v1
-
-    :cond_a
-    iget-object p1, p2, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    const/4 p3, 0x0
-
-    if-eqz p1, :cond_e
-
-    iget-object p4, p1, Ln0/g0/d/d;->g:Ln0/g0/d/j;
-
-    monitor-enter p4
-
-    :try_start_0
-    iget-boolean p1, p1, Ln0/g0/d/d;->d:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p4
-
-    if-eqz p1, :cond_c
-
-    iget-object p1, p2, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    if-eqz p1, :cond_b
-
-    invoke-virtual {p1}, Ln0/g0/d/d;->c()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_c
-
-    const/4 p1, 0x1
-
-    goto :goto_4
-
-    :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p3
-
-    :cond_c
-    const/4 p1, 0x0
-
-    :goto_4
-    if-nez p1, :cond_d
-
-    return v1
-
-    :cond_d
-    return v0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p4
-
-    throw p1
-
-    :cond_e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p3
-.end method
-
-.method public final c(Lokhttp3/Response;I)I
-    .locals 3
-
-    const-string v0, "Retry-After"
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p1, v0, v1, v2}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    new-instance p2, Lkotlin/text/Regex;
-
-    const-string v0, "\\d+"
-
-    invoke-direct {p2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p2, p1}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_0
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(Ljava/lang/String;)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    const-string p2, "Integer.valueOf(header)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const p1, 0x7fffffff
-
-    return p1
-
-    :cond_1
-    return p2
-.end method
-
-.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 46
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v1, p0
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
-
-    move-result-object v0
-
-    move-object/from16 v2, p1
-
-    check-cast v2, Ln0/g0/e/g;
-
-    iget-object v9, v2, Ln0/g0/e/g;->c:Ln0/g0/d/m;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    move-object v10, v0
-
-    move-object v11, v3
-
-    const/4 v12, 0x0
-
-    :goto_0
-    if-eqz v10, :cond_2e
-
-    iget-object v0, v9, Ln0/g0/d/m;->e:Ln0/a0;
-
-    const/4 v4, 0x1
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, v0, Ln0/a0;->b:Ln0/w;
-
-    iget-object v5, v10, Ln0/a0;->b:Ln0/w;
-
-    invoke-static {v0, v5}, Ln0/g0/b;->c(Ln0/w;Ln0/w;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, v9, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/d/d;->c()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    move/from16 p1, v12
-
-    goto/16 :goto_4
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_1
-    iget-object v0, v9, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-
-    if-nez v0, :cond_2
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_3
-
-    iget-object v0, v9, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {v9, v3, v4}, Ln0/g0/d/m;->g(Ljava/io/IOException;Z)Ljava/io/IOException;
-
-    iput-object v3, v9, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    goto :goto_2
-
-    :cond_3
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v2, "Check failed."
-
-    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    :goto_2
-    iput-object v10, v9, Ln0/g0/d/m;->e:Ln0/a0;
-
-    new-instance v0, Ln0/g0/d/d;
-
-    iget-object v5, v9, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    iget-object v4, v10, Ln0/a0;->b:Ln0/w;
-
-    iget-boolean v6, v4, Ln0/w;->a:Z
-
-    if-eqz v6, :cond_6
-
-    iget-object v3, v9, Ln0/g0/d/m;->n:Ln0/x;
-
-    iget-object v6, v3, Ln0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
-
-    if-eqz v6, :cond_5
-
-    iget-object v7, v3, Ln0/x;->x:Ljavax/net/ssl/HostnameVerifier;
-
-    iget-object v3, v3, Ln0/x;->y:Ln0/h;
-
-    move-object/from16 v20, v3
-
-    move-object/from16 v18, v6
-
-    move-object/from16 v19, v7
-
-    goto :goto_3
-
-    :cond_5
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v2, "CLEARTEXT-only client"
-
-    invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    move-object/from16 v18, v3
-
-    move-object/from16 v19, v18
-
-    move-object/from16 v20, v19
-
-    :goto_3
-    new-instance v6, Ln0/a;
-
-    iget-object v14, v4, Ln0/w;->e:Ljava/lang/String;
-
-    iget v15, v4, Ln0/w;->f:I
-
-    iget-object v3, v9, Ln0/g0/d/m;->n:Ln0/x;
-
-    iget-object v4, v3, Ln0/x;->o:Ln0/s;
-
-    iget-object v7, v3, Ln0/x;->s:Ljavax/net/SocketFactory;
-
-    iget-object v8, v3, Ln0/x;->r:Ln0/c;
-
-    iget-object v13, v3, Ln0/x;->p:Ljava/net/Proxy;
-
-    move/from16 p1, v12
-
-    iget-object v12, v3, Ln0/x;->w:Ljava/util/List;
-
-    iget-object v1, v3, Ln0/x;->v:Ljava/util/List;
-
-    iget-object v3, v3, Ln0/x;->q:Ljava/net/ProxySelector;
-
-    move-object/from16 v22, v13
-
-    move-object v13, v6
-
-    move-object/from16 v16, v4
-
-    move-object/from16 v17, v7
-
-    move-object/from16 v21, v8
-
-    move-object/from16 v23, v12
-
-    move-object/from16 v24, v1
-
-    move-object/from16 v25, v3
-
-    invoke-direct/range {v13 .. v25}, Ln0/a;-><init>(Ljava/lang/String;ILn0/s;Ljavax/net/SocketFactory;Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/HostnameVerifier;Ln0/h;Ln0/c;Ljava/net/Proxy;Ljava/util/List;Ljava/util/List;Ljava/net/ProxySelector;)V
-
-    iget-object v7, v9, Ln0/g0/d/m;->o:Ln0/f;
-
-    iget-object v8, v9, Ln0/g0/d/m;->b:Ln0/t;
-
-    move-object v3, v0
-
-    move-object v4, v9
-
-    invoke-direct/range {v3 .. v8}, Ln0/g0/d/d;-><init>(Ln0/g0/d/m;Ln0/g0/d/j;Ln0/a;Ln0/f;Ln0/t;)V
-
-    iput-object v0, v9, Ln0/g0/d/m;->f:Ln0/g0/d/d;
-
-    :goto_4
-    invoke-virtual {v9}, Ln0/g0/d/m;->f()Z
-
-    move-result v0
-
-    if-nez v0, :cond_2d
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    invoke-virtual {v2, v10, v9, v0}, Ln0/g0/e/g;->f(Ln0/a0;Ln0/g0/d/m;Ln0/g0/d/c;)Lokhttp3/Response;
-
-    move-result-object v0
-    :try_end_0
-    .catch Lokhttp3/internal/connection/RouteException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v11, :cond_13
-
-    iget-object v13, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v14, v0, Lokhttp3/Response;->e:Ln0/y;
-
-    iget v1, v0, Lokhttp3/Response;->g:I
-
-    iget-object v15, v0, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    iget-object v3, v0, Lokhttp3/Response;->h:Ln0/v;
-
-    iget-object v4, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v4}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object v4
-
-    iget-object v5, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    iget-object v6, v0, Lokhttp3/Response;->k:Lokhttp3/Response;
-
-    iget-object v7, v0, Lokhttp3/Response;->l:Lokhttp3/Response;
-
-    move-object/from16 v28, v9
-
-    iget-wide v8, v0, Lokhttp3/Response;->n:J
-
-    move-wide/from16 v23, v8
-
-    iget-wide v8, v0, Lokhttp3/Response;->o:J
-
-    iget-object v0, v0, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    iget-object v10, v11, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v12, v11, Lokhttp3/Response;->e:Ln0/y;
-
-    move-object/from16 v45, v2
-
-    iget v2, v11, Lokhttp3/Response;->g:I
-
-    move-object/from16 v27, v0
-
-    iget-object v0, v11, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    move-wide/from16 v25, v8
-
-    iget-object v8, v11, Lokhttp3/Response;->h:Ln0/v;
-
-    iget-object v9, v11, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v9}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object v9
-
-    move-object/from16 v21, v7
-
-    iget-object v7, v11, Lokhttp3/Response;->k:Lokhttp3/Response;
-
-    move-object/from16 v20, v6
-
-    iget-object v6, v11, Lokhttp3/Response;->l:Lokhttp3/Response;
-
-    move-object/from16 v19, v5
-
-    iget-object v5, v11, Lokhttp3/Response;->m:Lokhttp3/Response;
-
-    move-object/from16 v17, v3
-
-    move-object/from16 v16, v4
-
-    iget-wide v3, v11, Lokhttp3/Response;->n:J
-
-    move-object/from16 v18, v14
-
-    move-object/from16 v22, v15
-
-    iget-wide v14, v11, Lokhttp3/Response;->o:J
-
-    iget-object v11, v11, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    const/16 v36, 0x0
-
-    if-ltz v2, :cond_7
-
-    const/16 v29, 0x1
-
-    goto :goto_5
-
-    :cond_7
-    const/16 v29, 0x0
-
-    :goto_5
-    if-eqz v29, :cond_12
-
-    if-eqz v10, :cond_11
-
-    if-eqz v12, :cond_10
-
-    if-eqz v0, :cond_f
-
-    invoke-virtual {v9}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v35
-
-    new-instance v9, Lokhttp3/Response;
-
-    move-object/from16 v29, v9
-
-    move-object/from16 v30, v10
-
-    move-object/from16 v31, v12
-
-    move-object/from16 v32, v0
-
-    move/from16 v33, v2
-
-    move-object/from16 v34, v8
-
-    move-object/from16 v37, v7
-
-    move-object/from16 v38, v6
-
-    move-object/from16 v39, v5
-
-    move-wide/from16 v40, v3
-
-    move-wide/from16 v42, v14
-
-    move-object/from16 v44, v11
-
-    invoke-direct/range {v29 .. v44}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
-
-    iget-object v0, v9, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-nez v0, :cond_8
-
-    const/4 v0, 0x1
-
-    goto :goto_6
-
-    :cond_8
-    const/4 v0, 0x0
-
-    :goto_6
-    if-eqz v0, :cond_e
-
-    if-ltz v1, :cond_9
-
-    const/4 v0, 0x1
-
-    goto :goto_7
-
-    :cond_9
-    const/4 v0, 0x0
-
-    :goto_7
-    if-eqz v0, :cond_d
-
-    if-eqz v13, :cond_c
-
-    if-eqz v18, :cond_b
-
-    if-eqz v22, :cond_a
-
-    invoke-virtual/range {v16 .. v16}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v0
-
-    new-instance v2, Lokhttp3/Response;
-
-    move-object v12, v2
-
-    move-object/from16 v14, v18
-
-    move-object/from16 v15, v22
-
-    move/from16 v16, v1
-
-    move-object/from16 v18, v0
-
-    move-object/from16 v22, v9
-
-    invoke-direct/range {v12 .. v27}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
-
-    move-object v0, v2
-
-    goto :goto_8
-
-    :cond_a
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "message == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "protocol == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "request == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    const-string v0, "code < 0: "
-
-    invoke-static {v0, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_e
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "priorResponse.body != null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_f
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "message == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_10
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "protocol == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_11
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "request == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_12
-    const-string v0, "code < 0: "
-
-    invoke-static {v0, v2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_13
-    move-object/from16 v45, v2
-
-    move-object/from16 v28, v9
-
-    :goto_8
-    iget-object v1, v0, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    if-eqz v1, :cond_14
-
-    invoke-virtual {v1}, Ln0/g0/d/c;->b()Ln0/g0/d/i;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_14
-
-    iget-object v2, v2, Ln0/g0/d/i;->q:Ln0/e0;
-
-    goto :goto_9
-
-    :cond_14
-    const/4 v2, 0x0
-
-    :goto_9
-    iget v3, v0, Lokhttp3/Response;->g:I
-
-    iget-object v4, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v5, v4, Ln0/a0;->c:Ljava/lang/String;
-
-    const/16 v6, 0x133
-
-    if-eq v3, v6, :cond_20
-
-    const/16 v6, 0x134
-
-    if-eq v3, v6, :cond_20
-
-    const/16 v6, 0x191
-
-    if-eq v3, v6, :cond_1f
-
-    const/16 v6, 0x1f7
-
-    if-eq v3, v6, :cond_1d
-
-    const/16 v6, 0x197
-
-    if-eq v3, v6, :cond_1a
-
-    const/16 v2, 0x198
-
-    if-eq v3, v2, :cond_15
-
-    packed-switch v3, :pswitch_data_0
-
-    move-object/from16 v3, p0
-
-    goto/16 :goto_a
-
-    :pswitch_0
-    move-object/from16 v3, p0
-
-    invoke-virtual {v3, v0, v5}, Ln0/g0/e/i;->a(Lokhttp3/Response;Ljava/lang/String;)Ln0/a0;
-
-    move-result-object v2
-
-    goto/16 :goto_b
-
-    :cond_15
-    move-object/from16 v3, p0
-
-    iget-object v5, v3, Ln0/g0/e/i;->b:Ln0/x;
-
-    iget-boolean v5, v5, Ln0/x;->i:Z
-
-    if-nez v5, :cond_16
-
-    goto/16 :goto_a
-
-    :cond_16
-    iget-object v4, v4, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    if-eqz v4, :cond_17
-
-    invoke-virtual {v4}, Lokhttp3/RequestBody;->isOneShot()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_17
-
-    goto/16 :goto_a
-
-    :cond_17
-    iget-object v4, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
-
-    if-eqz v4, :cond_18
-
-    iget v4, v4, Lokhttp3/Response;->g:I
-
-    if-ne v4, v2, :cond_18
-
-    goto/16 :goto_a
-
-    :cond_18
-    const/4 v2, 0x0
-
-    invoke-virtual {v3, v0, v2}, Ln0/g0/e/i;->c(Lokhttp3/Response;I)I
-
-    move-result v2
-
-    if-lez v2, :cond_19
-
-    goto :goto_a
-
-    :cond_19
-    iget-object v2, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    goto :goto_b
-
-    :cond_1a
-    move-object/from16 v3, p0
-
-    if-eqz v2, :cond_1c
-
-    iget-object v4, v2, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v4
-
-    sget-object v5, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
-
-    if-ne v4, v5, :cond_1b
-
-    iget-object v4, v3, Ln0/g0/e/i;->b:Ln0/x;
-
-    iget-object v4, v4, Ln0/x;->r:Ln0/c;
-
-    invoke-interface {v4, v2, v0}, Ln0/c;->a(Ln0/e0;Lokhttp3/Response;)Ln0/a0;
-
-    move-result-object v2
-
-    goto :goto_b
-
-    :cond_1b
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Received HTTP_PROXY_AUTH (407) code while not using proxy"
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1c
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_1d
-    move-object/from16 v3, p0
-
-    iget-object v2, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
-
-    if-eqz v2, :cond_1e
-
-    iget v2, v2, Lokhttp3/Response;->g:I
-
-    if-ne v2, v6, :cond_1e
-
-    goto :goto_a
-
-    :cond_1e
-    const v2, 0x7fffffff
-
-    invoke-virtual {v3, v0, v2}, Ln0/g0/e/i;->c(Lokhttp3/Response;I)I
-
-    move-result v2
-
-    if-nez v2, :cond_21
-
-    iget-object v2, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    goto :goto_b
-
-    :cond_1f
-    move-object/from16 v3, p0
-
-    iget-object v4, v3, Ln0/g0/e/i;->b:Ln0/x;
-
-    iget-object v4, v4, Ln0/x;->j:Ln0/c;
-
-    invoke-interface {v4, v2, v0}, Ln0/c;->a(Ln0/e0;Lokhttp3/Response;)Ln0/a0;
-
-    move-result-object v2
-
-    goto :goto_b
-
-    :cond_20
-    move-object/from16 v3, p0
-
-    const-string v2, "GET"
-
-    invoke-static {v5, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_22
-
-    const-string v2, "HEAD"
-
-    invoke-static {v5, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_22
-
-    :cond_21
-    :goto_a
-    const/4 v2, 0x0
-
-    goto :goto_b
-
-    :cond_22
-    invoke-virtual {v3, v0, v5}, Ln0/g0/e/i;->a(Lokhttp3/Response;Ljava/lang/String;)Ln0/a0;
-
-    move-result-object v2
-
-    :goto_b
-    if-nez v2, :cond_24
-
-    if-eqz v1, :cond_23
-
-    iget-boolean v1, v1, Ln0/g0/d/c;->a:Z
-
-    if-eqz v1, :cond_23
-
-    invoke-virtual/range {v28 .. v28}, Ln0/g0/d/m;->j()V
-
-    :cond_23
-    return-object v0
-
-    :cond_24
-    iget-object v4, v2, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    if-eqz v4, :cond_25
-
-    invoke-virtual {v4}, Lokhttp3/RequestBody;->isOneShot()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_25
-
-    return-object v0
-
-    :cond_25
-    iget-object v4, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v4, :cond_26
-
-    invoke-static {v4}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_26
-    move-object/from16 v4, v28
-
-    iget-object v5, v4, Ln0/g0/d/m;->a:Ln0/g0/d/j;
-
-    monitor-enter v5
-
-    :try_start_1
-    iget-object v6, v4, Ln0/g0/d/m;->h:Ln0/g0/d/c;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v6, :cond_27
-
-    const/4 v6, 0x1
-
-    goto :goto_c
-
-    :cond_27
-    const/4 v6, 0x0
-
-    :goto_c
-    monitor-exit v5
-
-    if-eqz v6, :cond_28
-
-    if-eqz v1, :cond_28
-
-    iget-object v5, v1, Ln0/g0/d/c;->f:Ln0/g0/e/d;
-
-    invoke-interface {v5}, Ln0/g0/e/d;->cancel()V
-
-    iget-object v5, v1, Ln0/g0/d/c;->b:Ln0/g0/d/m;
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
-
-    invoke-virtual {v5, v1, v7, v7, v6}, Ln0/g0/d/m;->e(Ln0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
-
-    :cond_28
-    add-int/lit8 v12, p1, 0x1
-
-    const/16 v1, 0x14
-
-    if-gt v12, v1, :cond_29
-
-    move-object v11, v0
-
-    move-object v10, v2
-
-    goto :goto_f
-
-    :cond_29
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Too many follow-up requests: "
-
-    invoke-static {v1, v12}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :catchall_0
-    move-exception v0
-
-    move-object v1, v0
-
-    monitor-exit v5
-
-    throw v1
-
-    :catchall_1
-    move-exception v0
-
-    move-object/from16 v3, p0
-
-    move-object v4, v9
-
-    goto :goto_10
-
-    :catch_0
-    move-exception v0
-
-    move-object/from16 v3, p0
-
-    move-object/from16 v45, v2
-
-    move-object v4, v9
-
-    move-object v1, v0
-
-    :try_start_2
-    nop
-
-    instance-of v0, v1, Lokhttp3/internal/http2/ConnectionShutdownException;
-
-    if-nez v0, :cond_2a
-
-    const/4 v0, 0x1
-
-    goto :goto_d
-
-    :cond_2a
-    const/4 v0, 0x0
-
-    :goto_d
-    invoke-virtual {v3, v1, v4, v0, v10}, Ln0/g0/e/i;->b(Ljava/io/IOException;Ln0/g0/d/m;ZLn0/a0;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2b
-
-    goto :goto_e
-
-    :cond_2b
-    throw v1
-
-    :catch_1
-    move-exception v0
-
-    move-object/from16 v3, p0
-
-    move-object/from16 v45, v2
-
-    move-object v4, v9
-
-    move-object v1, v0
-
-    iget-object v0, v1, Lokhttp3/internal/connection/RouteException;->lastConnectException:Ljava/io/IOException;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v3, v0, v4, v2, v10}, Ln0/g0/e/i;->b(Ljava/io/IOException;Ln0/g0/d/m;ZLn0/a0;)Z
-
-    move-result v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    if-eqz v0, :cond_2c
-
-    :goto_e
-    invoke-virtual {v4}, Ln0/g0/d/m;->d()V
-
-    move/from16 v12, p1
-
-    :goto_f
-    const/4 v0, 0x0
-
-    move-object v1, v3
-
-    move-object v9, v4
-
-    move-object/from16 v2, v45
-
-    move-object v3, v0
-
-    goto/16 :goto_0
-
-    :cond_2c
-    :try_start_3
-    iget-object v0, v1, Lokhttp3/internal/connection/RouteException;->firstConnectException:Ljava/io/IOException;
-
-    throw v0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    :catchall_2
-    move-exception v0
-
-    :goto_10
-    invoke-virtual {v4}, Ln0/g0/d/m;->d()V
-
-    throw v0
-
-    :cond_2d
-    move-object/from16 v3, p0
-
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "Canceled"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2e
-    move-object v3, v1
-
-    const-string v0, "request"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x12c
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/e/j.smali b/com.discord/smali_classes2/n0/g0/e/j.smali
deleted file mode 100644
index 1cff4e53af..0000000000
--- a/com.discord/smali_classes2/n0/g0/e/j.smali
+++ /dev/null
@@ -1,289 +0,0 @@
-.class public final Ln0/g0/e/j;
-.super Ljava/lang/Object;
-.source "StatusLine.kt"
-
-
-# instance fields
-.field public final a:Ln0/y;
-
-.field public final b:I
-
-.field public final c:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Ln0/y;ILjava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/e/j;->a:Ln0/y;
-
-    iput p2, p0, Ln0/g0/e/j;->b:I
-
-    iput-object p3, p0, Ln0/g0/e/j;->c:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static final a(Ljava/lang/String;)Ln0/g0/e/j;
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    sget-object v0, Ln0/y;->d:Ln0/y;
-
-    if-eqz p0, :cond_8
-
-    const-string v1, "HTTP/1."
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    invoke-static {p0, v1, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    const/16 v4, 0x20
-
-    const/16 v5, 0x9
-
-    const-string v6, "Unexpected status line: "
-
-    if-eqz v1, :cond_3
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    if-lt v1, v5, :cond_2
-
-    const/16 v1, 0x8
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    if-ne v1, v4, :cond_2
-
-    const/4 v1, 0x7
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    add-int/lit8 v1, v1, -0x30
-
-    if-nez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    if-ne v1, v0, :cond_1
-
-    sget-object v0, Ln0/y;->e:Ln0/y;
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Ljava/net/ProtocolException;
-
-    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    new-instance v0, Ljava/net/ProtocolException;
-
-    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string v1, "ICY "
-
-    invoke-static {p0, v1, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    const/4 v5, 0x4
-
-    :goto_0
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    add-int/lit8 v2, v5, 0x3
-
-    if-lt v1, v2, :cond_6
-
-    :try_start_0
-    invoke-virtual {p0, v5, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v3, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v1
-    :try_end_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    if-le v3, v2, :cond_5
-
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    if-ne v2, v4, :cond_4
-
-    add-int/lit8 v5, v5, 0x4
-
-    invoke-virtual {p0, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string v2, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {p0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_1
-
-    :cond_4
-    new-instance v0, Ljava/net/ProtocolException;
-
-    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p0, ""
-
-    :goto_1
-    new-instance v2, Ln0/g0/e/j;
-
-    invoke-direct {v2, v0, v1, p0}, Ln0/g0/e/j;-><init>(Ln0/y;ILjava/lang/String;)V
-
-    return-object v2
-
-    :catch_0
-    new-instance v0, Ljava/net/ProtocolException;
-
-    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    new-instance v0, Ljava/net/ProtocolException;
-
-    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    new-instance v0, Ljava/net/ProtocolException;
-
-    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    const-string p0, "statusLine"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Ln0/g0/e/j;->a:Ln0/y;
-
-    sget-object v2, Ln0/y;->d:Ln0/y;
-
-    if-ne v1, v2, :cond_0
-
-    const-string v1, "HTTP/1.0"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "HTTP/1.1"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :goto_0
-    const/16 v1, 0x20
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget v2, p0, Ln0/g0/e/j;->b:I
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/e/j;->c:Ljava/lang/String;
-
-    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
-
-    const-string v1, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/f/a$a.smali b/com.discord/smali_classes2/n0/g0/f/a$a.smali
deleted file mode 100644
index 253e7b6894..0000000000
--- a/com.discord/smali_classes2/n0/g0/f/a$a.smali
+++ /dev/null
@@ -1,164 +0,0 @@
-.class public abstract Ln0/g0/f/a$a;
-.super Ljava/lang/Object;
-.source "Http1ExchangeCodec.kt"
-
-# interfaces
-.implements Lo0/w;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/f/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x401
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Lo0/j;
-
-.field public e:Z
-
-.field public final synthetic f:Ln0/g0/f/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/f/a;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/f/a$a;->f:Ln0/g0/f/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lo0/j;
-
-    iget-object p1, p1, Ln0/g0/f/a;->f:Lo0/g;
-
-    invoke-interface {p1}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Lo0/j;-><init>(Lo0/x;)V
-
-    iput-object v0, p0, Ln0/g0/f/a$a;->d:Lo0/j;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/f/a$a;->f:Ln0/g0/f/a;
-
-    iget-object v1, v1, Ln0/g0/f/a;->f:Lo0/g;
-
-    invoke-interface {v1, p1, p2, p3}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-wide p1
-
-    :catch_0
-    move-exception p1
-
-    iget-object p2, p0, Ln0/g0/f/a$a;->f:Ln0/g0/f/a;
-
-    iget-object p2, p2, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-nez p2, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_0
-    invoke-virtual {p2}, Ln0/g0/d/i;->j()V
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final a()V
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/f/a$a;->f:Ln0/g0/f/a;
-
-    iget v1, v0, Ln0/g0/f/a;->a:I
-
-    const/4 v2, 0x6
-
-    if-ne v1, v2, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v3, 0x5
-
-    if-ne v1, v3, :cond_1
-
-    iget-object v1, p0, Ln0/g0/f/a$a;->d:Lo0/j;
-
-    invoke-static {v0, v1}, Ln0/g0/f/a;->i(Ln0/g0/f/a;Lo0/j;)V
-
-    iget-object v0, p0, Ln0/g0/f/a$a;->f:Ln0/g0/f/a;
-
-    iput v2, v0, Ln0/g0/f/a;->a:I
-
-    return-void
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "state: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/g0/f/a$a;->f:Ln0/g0/f/a;
-
-    iget v2, v2, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/f/a$a;->d:Lo0/j;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/f/a$b.smali b/com.discord/smali_classes2/n0/g0/f/a$b.smali
deleted file mode 100644
index 961270afcd..0000000000
--- a/com.discord/smali_classes2/n0/g0/f/a$b.smali
+++ /dev/null
@@ -1,229 +0,0 @@
-.class public final Ln0/g0/f/a$b;
-.super Ljava/lang/Object;
-.source "Http1ExchangeCodec.kt"
-
-# interfaces
-.implements Lo0/u;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/f/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final d:Lo0/j;
-
-.field public e:Z
-
-.field public final synthetic f:Ln0/g0/f/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/f/a;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lo0/j;
-
-    iget-object p1, p1, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lo0/u;->timeout()Lo0/x;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Lo0/j;-><init>(Lo0/x;)V
-
-    iput-object v0, p0, Ln0/g0/f/a$b;->d:Lo0/j;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public declared-synchronized close()V
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/f/a$b;->e:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    :try_start_1
-    iput-boolean v0, p0, Ln0/g0/f/a$b;->e:Z
-
-    iget-object v0, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    const-string v1, "0\r\n\r\n"
-
-    invoke-interface {v0, v1}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    iget-object v0, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    iget-object v1, p0, Ln0/g0/f/a$b;->d:Lo0/j;
-
-    invoke-static {v0, v1}, Ln0/g0/f/a;->i(Ln0/g0/f/a;Lo0/j;)V
-
-    iget-object v0, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    const/4 v1, 0x3
-
-    iput v1, v0, Ln0/g0/f/a;->a:I
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public declared-synchronized flush()V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/f/a$b;->e:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    :try_start_1
-    iget-object v0, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/f/a$b;->d:Lo0/j;
-
-    return-object v0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 3
-
-    if-eqz p1, :cond_2
-
-    iget-boolean v0, p0, Ln0/g0/f/a$b;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_1
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p2, v0
-
-    if-nez v2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0, p2, p3}, Lokio/BufferedSink;->j0(J)Lokio/BufferedSink;
-
-    iget-object v0, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    const-string v1, "\r\n"
-
-    invoke-interface {v0, v1}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    iget-object v0, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0, p1, p2, p3}, Lo0/u;->write(Lo0/e;J)V
-
-    iget-object p1, p0, Ln0/g0/f/a$b;->f:Ln0/g0/f/a;
-
-    iget-object p1, p1, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {p1, v1}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    return-void
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/f/a$c.smali b/com.discord/smali_classes2/n0/g0/f/a$c.smali
deleted file mode 100644
index e297189c25..0000000000
--- a/com.discord/smali_classes2/n0/g0/f/a$c.smali
+++ /dev/null
@@ -1,443 +0,0 @@
-.class public final Ln0/g0/f/a$c;
-.super Ln0/g0/f/a$a;
-.source "Http1ExchangeCodec.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/f/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public g:J
-
-.field public h:Z
-
-.field public final i:Ln0/w;
-
-.field public final synthetic j:Ln0/g0/f/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/f/a;Ln0/w;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/w;",
-            ")V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    iput-object p1, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    invoke-direct {p0, p1}, Ln0/g0/f/a$a;-><init>(Ln0/g0/f/a;)V
-
-    iput-object p2, p0, Ln0/g0/f/a$c;->i:Ln0/w;
-
-    const-wide/16 p1, -0x1
-
-    iput-wide p1, p0, Ln0/g0/f/a$c;->g:J
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Ln0/g0/f/a$c;->h:Z
-
-    return-void
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 11
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_10
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, p2, v3
-
-    if-ltz v5, :cond_0
-
-    const/4 v5, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    :goto_0
-    if-eqz v5, :cond_f
-
-    iget-boolean v5, p0, Ln0/g0/f/a$a;->e:Z
-
-    xor-int/2addr v5, v1
-
-    if-eqz v5, :cond_e
-
-    iget-boolean v5, p0, Ln0/g0/f/a$c;->h:Z
-
-    const-wide/16 v6, -0x1
-
-    if-nez v5, :cond_1
-
-    return-wide v6
-
-    :cond_1
-    iget-wide v8, p0, Ln0/g0/f/a$c;->g:J
-
-    cmp-long v5, v8, v3
-
-    if-eqz v5, :cond_2
-
-    cmp-long v5, v8, v6
-
-    if-nez v5, :cond_9
-
-    :cond_2
-    iget-wide v8, p0, Ln0/g0/f/a$c;->g:J
-
-    cmp-long v5, v8, v6
-
-    if-eqz v5, :cond_3
-
-    iget-object v5, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    iget-object v5, v5, Ln0/g0/f/a;->f:Lo0/g;
-
-    invoke-interface {v5}, Lo0/g;->o0()Ljava/lang/String;
-
-    :cond_3
-    :try_start_0
-    iget-object v5, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    iget-object v5, v5, Ln0/g0/f/a;->f:Lo0/g;
-
-    invoke-interface {v5}, Lo0/g;->U0()J
-
-    move-result-wide v8
-
-    iput-wide v8, p0, Ln0/g0/f/a$c;->g:J
-
-    iget-object v5, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    iget-object v5, v5, Ln0/g0/f/a;->f:Lo0/g;
-
-    invoke-interface {v5}, Lo0/g;->o0()Ljava/lang/String;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_d
-
-    invoke-static {v5}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    iget-wide v8, p0, Ln0/g0/f/a$c;->g:J
-
-    cmp-long v10, v8, v3
-
-    if-ltz v10, :cond_c
-
-    invoke-virtual {v5}, Ljava/lang/String;->length()I
-
-    move-result v8
-
-    if-lez v8, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_5
-
-    const-string v1, ";"
-
-    const/4 v8, 0x2
-
-    invoke-static {v5, v1, v2, v8}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-    :try_end_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eqz v1, :cond_c
-
-    :cond_5
-    iget-wide v8, p0, Ln0/g0/f/a$c;->g:J
-
-    cmp-long v1, v8, v3
-
-    if-nez v1, :cond_8
-
-    iput-boolean v2, p0, Ln0/g0/f/a$c;->h:Z
-
-    iget-object v1, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    invoke-virtual {v1}, Ln0/g0/f/a;->l()Lokhttp3/Headers;
-
-    move-result-object v2
-
-    iput-object v2, v1, Ln0/g0/f/a;->c:Lokhttp3/Headers;
-
-    iget-object v1, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    iget-object v2, v1, Ln0/g0/f/a;->d:Ln0/x;
-
-    if-eqz v2, :cond_7
-
-    iget-object v2, v2, Ln0/x;->m:Ln0/p;
-
-    iget-object v3, p0, Ln0/g0/f/a$c;->i:Ln0/w;
-
-    iget-object v1, v1, Ln0/g0/f/a;->c:Lokhttp3/Headers;
-
-    if-eqz v1, :cond_6
-
-    invoke-static {v2, v3, v1}, Ln0/g0/e/e;->b(Ln0/p;Ln0/w;Lokhttp3/Headers;)V
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    goto :goto_2
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_8
-    :goto_2
-    iget-boolean v1, p0, Ln0/g0/f/a$c;->h:Z
-
-    if-nez v1, :cond_9
-
-    return-wide v6
-
-    :cond_9
-    iget-wide v1, p0, Ln0/g0/f/a$c;->g:J
-
-    invoke-static {p2, p3, v1, v2}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide p2
-
-    invoke-super {p0, p1, p2, p3}, Ln0/g0/f/a$a;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-
-    cmp-long p3, p1, v6
-
-    if-nez p3, :cond_b
-
-    iget-object p1, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    iget-object p1, p1, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-nez p1, :cond_a
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_a
-    invoke-virtual {p1}, Ln0/g0/d/i;->j()V
-
-    new-instance p1, Ljava/net/ProtocolException;
-
-    const-string p2, "unexpected end of stream"
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    throw p1
-
-    :cond_b
-    iget-wide v0, p0, Ln0/g0/f/a$c;->g:J
-
-    sub-long/2addr v0, p1
-
-    iput-wide v0, p0, Ln0/g0/f/a$c;->g:J
-
-    return-wide p1
-
-    :cond_c
-    :try_start_1
-    new-instance p1, Ljava/net/ProtocolException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p3, "expected chunk size and optional extensions"
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p3, " but was \""
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-wide v0, p0, Ln0/g0/f/a$c;->g:J
-
-    invoke-virtual {p2, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 p3, 0x22
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_d
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.CharSequence"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance p2, Ljava/net/ProtocolException;
-
-    invoke-virtual {p1}, Ljava/lang/NumberFormatException;->getMessage()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_e
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_f
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_10
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public close()V
-    .locals 2
-
-    iget-boolean v0, p0, Ln0/g0/f/a$a;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-boolean v0, p0, Ln0/g0/f/a$c;->h:Z
-
-    if-eqz v0, :cond_2
-
-    const/16 v0, 0x64
-
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-static {p0, v0, v1}, Ln0/g0/b;->k(Lo0/w;ILjava/util/concurrent/TimeUnit;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/f/a$c;->j:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Ln0/g0/d/i;->j()V
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2
-    :goto_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/f/a$a;->e:Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/f/a$d.smali b/com.discord/smali_classes2/n0/g0/f/a$d.smali
deleted file mode 100644
index d243d0ebff..0000000000
--- a/com.discord/smali_classes2/n0/g0/f/a$d.smali
+++ /dev/null
@@ -1,235 +0,0 @@
-.class public final Ln0/g0/f/a$d;
-.super Ln0/g0/f/a$a;
-.source "Http1ExchangeCodec.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/f/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "d"
-.end annotation
-
-
-# instance fields
-.field public g:J
-
-.field public final synthetic h:Ln0/g0/f/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/f/a;J)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/f/a$d;->h:Ln0/g0/f/a;
-
-    invoke-direct {p0, p1}, Ln0/g0/f/a$a;-><init>(Ln0/g0/f/a;)V
-
-    iput-wide p2, p0, Ln0/g0/f/a$d;->g:J
-
-    const-wide/16 v0, 0x0
-
-    cmp-long p1, p2, v0
-
-    if-nez p1, :cond_0
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    :cond_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 8
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_7
-
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p2, v1
-
-    if-ltz v3, :cond_0
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_6
-
-    iget-boolean v3, p0, Ln0/g0/f/a$a;->e:Z
-
-    xor-int/lit8 v3, v3, 0x1
-
-    if-eqz v3, :cond_5
-
-    iget-wide v3, p0, Ln0/g0/f/a$d;->g:J
-
-    const-wide/16 v5, -0x1
-
-    cmp-long v7, v3, v1
-
-    if-nez v7, :cond_1
-
-    return-wide v5
-
-    :cond_1
-    invoke-static {v3, v4, p2, p3}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide p2
-
-    invoke-super {p0, p1, p2, p3}, Ln0/g0/f/a$a;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-
-    cmp-long p3, p1, v5
-
-    if-nez p3, :cond_3
-
-    iget-object p1, p0, Ln0/g0/f/a$d;->h:Ln0/g0/f/a;
-
-    iget-object p1, p1, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-nez p1, :cond_2
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    invoke-virtual {p1}, Ln0/g0/d/i;->j()V
-
-    new-instance p1, Ljava/net/ProtocolException;
-
-    const-string p2, "unexpected end of stream"
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    throw p1
-
-    :cond_3
-    iget-wide v3, p0, Ln0/g0/f/a$d;->g:J
-
-    sub-long/2addr v3, p1
-
-    iput-wide v3, p0, Ln0/g0/f/a$d;->g:J
-
-    cmp-long p3, v3, v1
-
-    if-nez p3, :cond_4
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    :cond_4
-    return-wide p1
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_7
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public close()V
-    .locals 5
-
-    iget-boolean v0, p0, Ln0/g0/f/a$a;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-wide v0, p0, Ln0/g0/f/a$d;->g:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_2
-
-    const/16 v0, 0x64
-
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-static {p0, v0, v1}, Ln0/g0/b;->k(Lo0/w;ILjava/util/concurrent/TimeUnit;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/f/a$d;->h:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Ln0/g0/d/i;->j()V
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2
-    :goto_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/f/a$a;->e:Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/f/a$e.smali b/com.discord/smali_classes2/n0/g0/f/a$e.smali
deleted file mode 100644
index 5ccd3e754a..0000000000
--- a/com.discord/smali_classes2/n0/g0/f/a$e.smali
+++ /dev/null
@@ -1,162 +0,0 @@
-.class public final Ln0/g0/f/a$e;
-.super Ljava/lang/Object;
-.source "Http1ExchangeCodec.kt"
-
-# interfaces
-.implements Lo0/u;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/f/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "e"
-.end annotation
-
-
-# instance fields
-.field public final d:Lo0/j;
-
-.field public e:Z
-
-.field public final synthetic f:Ln0/g0/f/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/f/a;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/f/a$e;->f:Ln0/g0/f/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lo0/j;
-
-    iget-object p1, p1, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lo0/u;->timeout()Lo0/x;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Lo0/j;-><init>(Lo0/x;)V
-
-    iput-object v0, p0, Ln0/g0/f/a$e;->d:Lo0/j;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public close()V
-    .locals 2
-
-    iget-boolean v0, p0, Ln0/g0/f/a$e;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/f/a$e;->e:Z
-
-    iget-object v0, p0, Ln0/g0/f/a$e;->f:Ln0/g0/f/a;
-
-    iget-object v1, p0, Ln0/g0/f/a$e;->d:Lo0/j;
-
-    invoke-static {v0, v1}, Ln0/g0/f/a;->i(Ln0/g0/f/a;Lo0/j;)V
-
-    iget-object v0, p0, Ln0/g0/f/a$e;->f:Ln0/g0/f/a;
-
-    const/4 v1, 0x3
-
-    iput v1, v0, Ln0/g0/f/a;->a:I
-
-    return-void
-.end method
-
-.method public flush()V
-    .locals 1
-
-    iget-boolean v0, p0, Ln0/g0/f/a$e;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Ln0/g0/f/a$e;->f:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/f/a$e;->d:Lo0/j;
-
-    return-object v0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 7
-
-    if-eqz p1, :cond_1
-
-    iget-boolean v0, p0, Ln0/g0/f/a$e;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-wide v1, p1, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    move-wide v5, p2
-
-    invoke-static/range {v1 .. v6}, Ln0/g0/b;->e(JJJ)V
-
-    iget-object v0, p0, Ln0/g0/f/a$e;->f:Ln0/g0/f/a;
-
-    iget-object v0, v0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0, p1, p2, p3}, Lo0/u;->write(Lo0/e;J)V
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/f/a$f.smali b/com.discord/smali_classes2/n0/g0/f/a$f.smali
deleted file mode 100644
index 9354005e22..0000000000
--- a/com.discord/smali_classes2/n0/g0/f/a$f.smali
+++ /dev/null
@@ -1,154 +0,0 @@
-.class public final Ln0/g0/f/a$f;
-.super Ln0/g0/f/a$a;
-.source "Http1ExchangeCodec.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/f/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "f"
-.end annotation
-
-
-# instance fields
-.field public g:Z
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/f/a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Ln0/g0/f/a$a;-><init>(Ln0/g0/f/a;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 5
-
-    if-eqz p1, :cond_5
-
-    const-wide/16 v0, 0x0
-
-    const/4 v2, 0x1
-
-    cmp-long v3, p2, v0
-
-    if-ltz v3, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_4
-
-    iget-boolean v0, p0, Ln0/g0/f/a$a;->e:Z
-
-    xor-int/2addr v0, v2
-
-    if-eqz v0, :cond_3
-
-    iget-boolean v0, p0, Ln0/g0/f/a$f;->g:Z
-
-    const-wide/16 v3, -0x1
-
-    if-eqz v0, :cond_1
-
-    return-wide v3
-
-    :cond_1
-    invoke-super {p0, p1, p2, p3}, Ln0/g0/f/a$a;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-
-    cmp-long p3, p1, v3
-
-    if-nez p3, :cond_2
-
-    iput-boolean v2, p0, Ln0/g0/f/a$f;->g:Z
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    return-wide v3
-
-    :cond_2
-    return-wide p1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_5
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public close()V
-    .locals 1
-
-    iget-boolean v0, p0, Ln0/g0/f/a$a;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-boolean v0, p0, Ln0/g0/f/a$f;->g:Z
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p0}, Ln0/g0/f/a$a;->a()V
-
-    :cond_1
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/f/a$a;->e:Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/f/a.smali b/com.discord/smali_classes2/n0/g0/f/a.smali
deleted file mode 100644
index cf5cffca2d..0000000000
--- a/com.discord/smali_classes2/n0/g0/f/a.smali
+++ /dev/null
@@ -1,1098 +0,0 @@
-.class public final Ln0/g0/f/a;
-.super Ljava/lang/Object;
-.source "Http1ExchangeCodec.kt"
-
-# interfaces
-.implements Ln0/g0/e/d;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/f/a$e;,
-        Ln0/g0/f/a$b;,
-        Ln0/g0/f/a$a;,
-        Ln0/g0/f/a$d;,
-        Ln0/g0/f/a$c;,
-        Ln0/g0/f/a$f;
-    }
-.end annotation
-
-
-# instance fields
-.field public a:I
-
-.field public b:J
-
-.field public c:Lokhttp3/Headers;
-
-.field public final d:Ln0/x;
-
-.field public final e:Ln0/g0/d/i;
-
-.field public final f:Lo0/g;
-
-.field public final g:Lokio/BufferedSink;
-
-
-# direct methods
-.method public constructor <init>(Ln0/x;Ln0/g0/d/i;Lo0/g;Lokio/BufferedSink;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p3, :cond_1
-
-    if-eqz p4, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/f/a;->d:Ln0/x;
-
-    iput-object p2, p0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    iput-object p3, p0, Ln0/g0/f/a;->f:Lo0/g;
-
-    iput-object p4, p0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    const/high16 p1, 0x40000
-
-    int-to-long p1, p1
-
-    iput-wide p1, p0, Ln0/g0/f/a;->b:J
-
-    return-void
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final i(Ln0/g0/f/a;Lo0/j;)V
-    .locals 1
-
-    if-eqz p0, :cond_0
-
-    iget-object p0, p1, Lo0/j;->e:Lo0/x;
-
-    sget-object v0, Lo0/x;->d:Lo0/x;
-
-    iput-object v0, p1, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {p0}, Lo0/x;->a()Lo0/x;
-
-    invoke-virtual {p0}, Lo0/x;->b()Lo0/x;
-
-    return-void
-
-    :cond_0
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-
-# virtual methods
-.method public a()Ln0/g0/d/i;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    return-object v0
-.end method
-
-.method public b()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
-
-    return-void
-.end method
-
-.method public c(Ln0/a0;)V
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    iget-object v0, v0, Ln0/e0;->b:Ljava/net/Proxy;
-
-    invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
-
-    move-result-object v0
-
-    const-string v2, "realConnection!!.route().proxy.type()"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v3, p1, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v3, 0x20
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v3, p1, Ln0/a0;->b:Ln0/w;
-
-    iget-boolean v3, v3, Ln0/w;->a:Z
-
-    if-nez v3, :cond_0
-
-    sget-object v3, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
-
-    if-ne v0, v3, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v0, p1, Ln0/a0;->b:Ln0/w;
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {v0}, Ln0/w;->b()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0}, Ln0/w;->d()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x3f
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    :cond_2
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :goto_1
-    const-string v0, " HTTP/1.1"
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object p1, p1, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {p0, p1, v0}, Ln0/g0/f/a;->m(Lokhttp3/Headers;Ljava/lang/String;)V
-
-    return-void
-
-    :cond_3
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public cancel()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, v0, Ln0/g0/d/i;->b:Ljava/net/Socket;
-
-    if-eqz v0, :cond_0
-
-    invoke-static {v0}, Ln0/g0/b;->g(Ljava/net/Socket;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public d(Lokhttp3/Response;)Lo0/w;
-    .locals 10
-
-    invoke-static {p1}, Ln0/g0/e/e;->a(Lokhttp3/Response;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-wide/16 v0, 0x0
-
-    invoke-virtual {p0, v0, v1}, Ln0/g0/f/a;->j(J)Lo0/w;
-
-    move-result-object p1
-
-    goto :goto_2
-
-    :cond_0
-    const/4 v0, 0x2
-
-    const-string v1, "Transfer-Encoding"
-
-    const/4 v2, 0x0
-
-    invoke-static {p1, v1, v2, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    const-string v3, "chunked"
-
-    invoke-static {v3, v0, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    const/4 v3, 0x5
-
-    const-string v4, "state: "
-
-    const/4 v5, 0x4
-
-    if-eqz v0, :cond_3
-
-    iget-object p1, p1, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object p1, p1, Ln0/a0;->b:Ln0/w;
-
-    iget v0, p0, Ln0/g0/f/a;->a:I
-
-    if-ne v0, v5, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_2
-
-    iput v3, p0, Ln0/g0/f/a;->a:I
-
-    new-instance v0, Ln0/g0/f/a$c;
-
-    invoke-direct {v0, p0, p1}, Ln0/g0/f/a$c;-><init>(Ln0/g0/f/a;Ln0/w;)V
-
-    move-object p1, v0
-
-    goto :goto_2
-
-    :cond_2
-    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget v0, p0, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    invoke-static {p1}, Ln0/g0/b;->n(Lokhttp3/Response;)J
-
-    move-result-wide v6
-
-    const-wide/16 v8, -0x1
-
-    cmp-long p1, v6, v8
-
-    if-eqz p1, :cond_4
-
-    invoke-virtual {p0, v6, v7}, Ln0/g0/f/a;->j(J)Lo0/w;
-
-    move-result-object p1
-
-    goto :goto_2
-
-    :cond_4
-    iget p1, p0, Ln0/g0/f/a;->a:I
-
-    if-ne p1, v5, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_7
-
-    iput v3, p0, Ln0/g0/f/a;->a:I
-
-    iget-object p1, p0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-eqz p1, :cond_6
-
-    invoke-virtual {p1}, Ln0/g0/d/i;->j()V
-
-    new-instance p1, Ln0/g0/f/a$f;
-
-    invoke-direct {p1, p0}, Ln0/g0/f/a$f;-><init>(Ln0/g0/f/a;)V
-
-    :goto_2
-    return-object p1
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_7
-    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget v0, p0, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public e(Z)Lokhttp3/Response$a;
-    .locals 4
-
-    iget v0, p0, Ln0/g0/f/a;->a:I
-
-    const/4 v1, 0x3
-
-    const/4 v2, 0x1
-
-    if-eq v0, v2, :cond_1
-
-    if-ne v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :cond_1
-    :goto_0
-    if-eqz v2, :cond_5
-
-    :try_start_0
-    invoke-virtual {p0}, Ln0/g0/f/a;->k()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ln0/g0/e/j;->a(Ljava/lang/String;)Ln0/g0/e/j;
-
-    move-result-object v0
-
-    new-instance v2, Lokhttp3/Response$a;
-
-    invoke-direct {v2}, Lokhttp3/Response$a;-><init>()V
-
-    iget-object v3, v0, Ln0/g0/e/j;->a:Ln0/y;
-
-    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->f(Ln0/y;)Lokhttp3/Response$a;
-
-    iget v3, v0, Ln0/g0/e/j;->b:I
-
-    iput v3, v2, Lokhttp3/Response$a;->c:I
-
-    iget-object v3, v0, Ln0/g0/e/j;->c:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->e(Ljava/lang/String;)Lokhttp3/Response$a;
-
-    invoke-virtual {p0}, Ln0/g0/f/a;->l()Lokhttp3/Headers;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
-
-    const/16 v3, 0x64
-
-    if-eqz p1, :cond_2
-
-    iget p1, v0, Ln0/g0/e/j;->b:I
-
-    if-ne p1, v3, :cond_2
-
-    const/4 v2, 0x0
-
-    goto :goto_1
-
-    :cond_2
-    iget p1, v0, Ln0/g0/e/j;->b:I
-
-    if-ne p1, v3, :cond_3
-
-    iput v1, p0, Ln0/g0/f/a;->a:I
-
-    goto :goto_1
-
-    :cond_3
-    const/4 p1, 0x4
-
-    iput p1, p0, Ln0/g0/f/a;->a:I
-    :try_end_0
-    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :goto_1
-    return-object v2
-
-    :catch_0
-    move-exception p1
-
-    iget-object v0, p0, Ln0/g0/f/a;->e:Ln0/g0/d/i;
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, v0, Ln0/g0/d/i;->q:Ln0/e0;
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, v0, Ln0/e0;->a:Ln0/a;
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, v0, Ln0/a;->a:Ln0/w;
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {v0}, Ln0/w;->i()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    const-string v0, "unknown"
-
-    :goto_2
-    new-instance v1, Ljava/io/IOException;
-
-    const-string v2, "unexpected end of stream on "
-
-    invoke-static {v2, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :cond_5
-    const-string p1, "state: "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget v0, p0, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public f()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
-
-    return-void
-.end method
-
-.method public g(Lokhttp3/Response;)J
-    .locals 3
-
-    invoke-static {p1}, Ln0/g0/e/e;->a(Lokhttp3/Response;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const-wide/16 v0, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x2
-
-    const-string v1, "Transfer-Encoding"
-
-    const/4 v2, 0x0
-
-    invoke-static {p1, v1, v2, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    const-string v2, "chunked"
-
-    invoke-static {v2, v0, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const-wide/16 v0, -0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {p1}, Ln0/g0/b;->n(Lokhttp3/Response;)J
-
-    move-result-wide v0
-
-    :goto_0
-    return-wide v0
-.end method
-
-.method public h(Ln0/a0;J)Lo0/u;
-    .locals 5
-
-    iget-object v0, p1, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lokhttp3/RequestBody;->isDuplex()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/net/ProtocolException;
-
-    const-string p2, "Duplex connections are not supported for HTTP/1"
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    const-string v0, "Transfer-Encoding"
-
-    invoke-virtual {p1, v0}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const/4 v0, 0x1
-
-    const-string v1, "chunked"
-
-    invoke-static {v1, p1, v0}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result p1
-
-    const/4 v1, 0x2
-
-    const-string v2, "state: "
-
-    if-eqz p1, :cond_4
-
-    iget p1, p0, Ln0/g0/f/a;->a:I
-
-    if-ne p1, v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_3
-
-    iput v1, p0, Ln0/g0/f/a;->a:I
-
-    new-instance p1, Ln0/g0/f/a$b;
-
-    invoke-direct {p1, p0}, Ln0/g0/f/a$b;-><init>(Ln0/g0/f/a;)V
-
-    goto :goto_3
-
-    :cond_3
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_4
-    const-wide/16 v3, -0x1
-
-    cmp-long p1, p2, v3
-
-    if-eqz p1, :cond_7
-
-    iget p1, p0, Ln0/g0/f/a;->a:I
-
-    if-ne p1, v0, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    const/4 v0, 0x0
-
-    :goto_2
-    if-eqz v0, :cond_6
-
-    iput v1, p0, Ln0/g0/f/a;->a:I
-
-    new-instance p1, Ln0/g0/f/a$e;
-
-    invoke-direct {p1, p0}, Ln0/g0/f/a$e;-><init>(Ln0/g0/f/a;)V
-
-    :goto_3
-    return-object p1
-
-    :cond_6
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_7
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "Cannot stream a request body without chunked encoding or a known content length!"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final j(J)Lo0/w;
-    .locals 2
-
-    iget v0, p0, Ln0/g0/f/a;->a:I
-
-    const/4 v1, 0x4
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x5
-
-    iput v0, p0, Ln0/g0/f/a;->a:I
-
-    new-instance v0, Ln0/g0/f/a$d;
-
-    invoke-direct {v0, p0, p1, p2}, Ln0/g0/f/a$d;-><init>(Ln0/g0/f/a;J)V
-
-    return-object v0
-
-    :cond_1
-    const-string p1, "state: "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public final k()Ljava/lang/String;
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/f/a;->f:Lo0/g;
-
-    iget-wide v1, p0, Ln0/g0/f/a;->b:J
-
-    invoke-interface {v0, v1, v2}, Lo0/g;->T(J)Ljava/lang/String;
-
-    move-result-object v0
-
-    iget-wide v1, p0, Ln0/g0/f/a;->b:J
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    int-to-long v3, v3
-
-    sub-long/2addr v1, v3
-
-    iput-wide v1, p0, Ln0/g0/f/a;->b:J
-
-    return-object v0
-.end method
-
-.method public final l()Lokhttp3/Headers;
-    .locals 8
-
-    new-instance v0, Lokhttp3/Headers$a;
-
-    invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
-
-    invoke-virtual {p0}, Ln0/g0/f/a;->k()Ljava/lang/String;
-
-    move-result-object v1
-
-    :goto_0
-    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    if-lez v2, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_3
-
-    const/4 v2, 0x4
-
-    const/16 v5, 0x3a
-
-    invoke-static {v1, v5, v3, v4, v2}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v2
-
-    const/4 v6, -0x1
-
-    const-string v7, "(this as java.lang.String).substring(startIndex)"
-
-    if-eq v2, v6, :cond_1
-
-    invoke-virtual {v1, v4, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v3
-
-    const-string v4, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    add-int/lit8 v2, v2, 0x1
-
-    invoke-virtual {v1, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v3, v1}, Lokhttp3/Headers$a;->b(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    goto :goto_2
-
-    :cond_1
-    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    const-string v4, ""
-
-    if-ne v2, v5, :cond_2
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v4, v1}, Lokhttp3/Headers$a;->b(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {v0, v4, v1}, Lokhttp3/Headers$a;->b(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    :goto_2
-    invoke-virtual {p0}, Ln0/g0/f/a;->k()Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_3
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final m(Lokhttp3/Headers;Ljava/lang/String;)V
-    .locals 5
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    if-eqz p2, :cond_3
-
-    iget v0, p0, Ln0/g0/f/a;->a:I
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {v0, p2}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    move-result-object p2
-
-    const-string v0, "\r\n"
-
-    invoke-interface {p2, v0}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    invoke-virtual {p1}, Lokhttp3/Headers;->size()I
-
-    move-result p2
-
-    :goto_1
-    if-ge v1, p2, :cond_1
-
-    iget-object v3, p0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-virtual {p1, v1}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    move-result-object v3
-
-    const-string v4, ": "
-
-    invoke-interface {v3, v4}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    move-result-object v3
-
-    invoke-virtual {p1, v1}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    move-result-object v3
-
-    invoke-interface {v3, v0}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    iget-object p1, p0, Ln0/g0/f/a;->g:Lokio/BufferedSink;
-
-    invoke-interface {p1, v0}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
-
-    iput v2, p0, Ln0/g0/f/a;->a:I
-
-    return-void
-
-    :cond_2
-    const-string p1, "state: "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p2, p0, Ln0/g0/f/a;->a:I
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_3
-    const-string p1, "requestLine"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "headers"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/a$a.smali b/com.discord/smali_classes2/n0/g0/g/a$a.smali
deleted file mode 100644
index dd46165889..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/a$a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Ln0/g0/g/a$a;
-.super Ljava/lang/Object;
-.source "ErrorCode.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/a.smali b/com.discord/smali_classes2/n0/g0/g/a.smali
deleted file mode 100644
index ed876517df..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/a.smali
+++ /dev/null
@@ -1,232 +0,0 @@
-.class public final enum Ln0/g0/g/a;
-.super Ljava/lang/Enum;
-.source "ErrorCode.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/g/a$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Ln0/g0/g/a;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Ln0/g0/g/a;
-
-.field public static final enum e:Ln0/g0/g/a;
-
-.field public static final enum f:Ln0/g0/g/a;
-
-.field public static final enum g:Ln0/g0/g/a;
-
-.field public static final enum h:Ln0/g0/g/a;
-
-.field public static final enum i:Ln0/g0/g/a;
-
-.field public static final synthetic j:[Ln0/g0/g/a;
-
-.field public static final k:Ln0/g0/g/a$a;
-
-
-# instance fields
-.field public final httpCode:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 8
-
-    const/16 v0, 0xb
-
-    new-array v1, v0, [Ln0/g0/g/a;
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "NO_ERROR"
-
-    const/4 v4, 0x0
-
-    invoke-direct {v2, v3, v4, v4}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    sput-object v2, Ln0/g0/g/a;->d:Ln0/g0/g/a;
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "PROTOCOL_ERROR"
-
-    const/4 v4, 0x1
-
-    invoke-direct {v2, v3, v4, v4}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    sput-object v2, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "INTERNAL_ERROR"
-
-    const/4 v4, 0x2
-
-    invoke-direct {v2, v3, v4, v4}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    sput-object v2, Ln0/g0/g/a;->f:Ln0/g0/g/a;
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "FLOW_CONTROL_ERROR"
-
-    const/4 v4, 0x3
-
-    invoke-direct {v2, v3, v4, v4}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    sput-object v2, Ln0/g0/g/a;->g:Ln0/g0/g/a;
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "REFUSED_STREAM"
-
-    const/4 v4, 0x4
-
-    const/4 v5, 0x7
-
-    invoke-direct {v2, v3, v4, v5}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    sput-object v2, Ln0/g0/g/a;->h:Ln0/g0/g/a;
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "CANCEL"
-
-    const/4 v4, 0x5
-
-    const/16 v6, 0x8
-
-    invoke-direct {v2, v3, v4, v6}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    sput-object v2, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "COMPRESSION_ERROR"
-
-    const/4 v4, 0x6
-
-    const/16 v7, 0x9
-
-    invoke-direct {v2, v3, v4, v7}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "CONNECT_ERROR"
-
-    const/16 v4, 0xa
-
-    invoke-direct {v2, v3, v5, v4}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    aput-object v2, v1, v5
-
-    new-instance v2, Ln0/g0/g/a;
-
-    const-string v3, "ENHANCE_YOUR_CALM"
-
-    invoke-direct {v2, v3, v6, v0}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    aput-object v2, v1, v6
-
-    new-instance v0, Ln0/g0/g/a;
-
-    const-string v2, "INADEQUATE_SECURITY"
-
-    const/16 v3, 0xc
-
-    invoke-direct {v0, v2, v7, v3}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    aput-object v0, v1, v7
-
-    new-instance v0, Ln0/g0/g/a;
-
-    const-string v2, "HTTP_1_1_REQUIRED"
-
-    const/16 v3, 0xd
-
-    invoke-direct {v0, v2, v4, v3}, Ln0/g0/g/a;-><init>(Ljava/lang/String;II)V
-
-    aput-object v0, v1, v4
-
-    sput-object v1, Ln0/g0/g/a;->j:[Ln0/g0/g/a;
-
-    new-instance v0, Ln0/g0/g/a$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/g0/g/a$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/g0/g/a;->k:Ln0/g0/g/a$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;II)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    iput p3, p0, Ln0/g0/g/a;->httpCode:I
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Ln0/g0/g/a;
-    .locals 1
-
-    const-class v0, Ln0/g0/g/a;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Ln0/g0/g/a;
-
-    return-object p0
-.end method
-
-.method public static values()[Ln0/g0/g/a;
-    .locals 1
-
-    sget-object v0, Ln0/g0/g/a;->j:[Ln0/g0/g/a;
-
-    invoke-virtual {v0}, [Ln0/g0/g/a;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Ln0/g0/g/a;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/b.smali b/com.discord/smali_classes2/n0/g0/g/b.smali
deleted file mode 100644
index 3d11f667b7..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/b.smali
+++ /dev/null
@@ -1,343 +0,0 @@
-.class public final Ln0/g0/g/b;
-.super Ljava/lang/Object;
-.source "Header.kt"
-
-
-# static fields
-.field public static final d:Lokio/ByteString;
-
-.field public static final e:Lokio/ByteString;
-
-.field public static final f:Lokio/ByteString;
-
-.field public static final g:Lokio/ByteString;
-
-.field public static final h:Lokio/ByteString;
-
-.field public static final i:Lokio/ByteString;
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:Lokio/ByteString;
-
-.field public final c:Lokio/ByteString;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, ":"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/b;->d:Lokio/ByteString;
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, ":status"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, ":method"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/b;->f:Lokio/ByteString;
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, ":path"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/b;->g:Lokio/ByteString;
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, ":scheme"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/b;->h:Lokio/ByteString;
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, ":authority"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/b;->i:Lokio/ByteString;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    invoke-virtual {v0, p1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object p1
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    invoke-virtual {v0, p2}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object p2
-
-    invoke-direct {p0, p1, p2}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public constructor <init>(Lokio/ByteString;Ljava/lang/String;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    invoke-virtual {v0, p2}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object p2
-
-    invoke-direct {p0, p1, p2}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public constructor <init>(Lokio/ByteString;Lokio/ByteString;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    iput-object p2, p0, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result p1
-
-    add-int/lit8 p1, p1, 0x20
-
-    iget-object p2, p0, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    invoke-virtual {p2}, Lokio/ByteString;->h()I
-
-    move-result p2
-
-    add-int/2addr p1, p2
-
-    iput p1, p0, Ln0/g0/g/b;->a:I
-
-    return-void
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Ln0/g0/g/b;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/g0/g/b;
-
-    iget-object v0, p0, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    iget-object v1, p1, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    iget-object p1, p1, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lokio/ByteString;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Lokio/ByteString;->hashCode()I
-
-    move-result v1
-
-    :cond_1
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    invoke-static {v1}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, ": "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    if-eqz v1, :cond_0
-
-    invoke-static {v1}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    throw v2
-
-    :cond_1
-    throw v2
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/c$a.smali b/com.discord/smali_classes2/n0/g0/g/c$a.smali
deleted file mode 100644
index d2f68d62a7..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/c$a.smali
+++ /dev/null
@@ -1,714 +0,0 @@
-.class public final Ln0/g0/g/c$a;
-.super Ljava/lang/Object;
-.source "Hpack.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Lo0/g;
-
-.field public c:[Ln0/g0/g/b;
-
-.field public d:I
-
-.field public e:I
-
-.field public f:I
-
-.field public final g:I
-
-.field public h:I
-
-
-# direct methods
-.method public constructor <init>(Lo0/w;III)V
-    .locals 0
-
-    and-int/lit8 p4, p4, 0x4
-
-    if-eqz p4, :cond_0
-
-    move p3, p2
-
-    :cond_0
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p2, p0, Ln0/g0/g/c$a;->g:I
-
-    iput p3, p0, Ln0/g0/g/c$a;->h:I
-
-    new-instance p2, Ljava/util/ArrayList;
-
-    invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object p2, p0, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    invoke-static {p1}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/g/c$a;->b:Lo0/g;
-
-    const/16 p1, 0x8
-
-    new-array p1, p1, [Ln0/g0/g/b;
-
-    iput-object p1, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    const/4 p1, 0x7
-
-    iput p1, p0, Ln0/g0/g/c$a;->d:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x6
-
-    invoke-static {v0, v1, v2, v2, v3}, Lf/n/a/k/a;->fill$default([Ljava/lang/Object;Ljava/lang/Object;III)V
-
-    iget-object v0, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    array-length v0, v0
-
-    add-int/lit8 v0, v0, -0x1
-
-    iput v0, p0, Ln0/g0/g/c$a;->d:I
-
-    iput v2, p0, Ln0/g0/g/c$a;->e:I
-
-    iput v2, p0, Ln0/g0/g/c$a;->f:I
-
-    return-void
-.end method
-
-.method public final b(I)I
-    .locals 1
-
-    iget v0, p0, Ln0/g0/g/c$a;->d:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    add-int/2addr v0, p1
-
-    return v0
-.end method
-
-.method public final c(I)I
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-lez p1, :cond_2
-
-    iget-object v1, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    array-length v1, v1
-
-    add-int/lit8 v1, v1, -0x1
-
-    :goto_0
-    iget v2, p0, Ln0/g0/g/c$a;->d:I
-
-    if-lt v1, v2, :cond_1
-
-    if-lez p1, :cond_1
-
-    iget-object v2, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    aget-object v2, v2, v1
-
-    if-eqz v2, :cond_0
-
-    iget v2, v2, Ln0/g0/g/b;->a:I
-
-    sub-int/2addr p1, v2
-
-    iget v3, p0, Ln0/g0/g/c$a;->f:I
-
-    sub-int/2addr v3, v2
-
-    iput v3, p0, Ln0/g0/g/c$a;->f:I
-
-    iget v2, p0, Ln0/g0/g/c$a;->e:I
-
-    add-int/lit8 v2, v2, -0x1
-
-    iput v2, p0, Ln0/g0/g/c$a;->e:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    add-int/lit8 v1, v1, -0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    iget-object p1, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    iget v1, p0, Ln0/g0/g/c$a;->d:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    add-int/lit8 v1, v1, 0x1
-
-    add-int/2addr v1, v0
-
-    iget v3, p0, Ln0/g0/g/c$a;->e:I
-
-    invoke-static {p1, v2, p1, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget p1, p0, Ln0/g0/g/c$a;->d:I
-
-    add-int/2addr p1, v0
-
-    iput p1, p0, Ln0/g0/g/c$a;->d:I
-
-    :cond_2
-    return v0
-.end method
-
-.method public final d(I)Lokio/ByteString;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-ltz p1, :cond_0
-
-    sget-object v0, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v0, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length v0, v0
-
-    add-int/lit8 v0, v0, -0x1
-
-    if-gt p1, v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    sget-object v0, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v0, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    aget-object p1, v0, p1
-
-    iget-object p1, p1, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    goto :goto_1
-
-    :cond_1
-    sget-object v0, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v0, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length v0, v0
-
-    sub-int v0, p1, v0
-
-    invoke-virtual {p0, v0}, Ln0/g0/g/c$a;->b(I)I
-
-    move-result v0
-
-    if-ltz v0, :cond_3
-
-    iget-object v1, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    array-length v2, v1
-
-    if-ge v0, v2, :cond_3
-
-    aget-object p1, v1, v0
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p1, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    :goto_1
-    return-object p1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_3
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "Header index too large "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    add-int/lit8 p1, p1, 0x1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final e(ILn0/g0/g/b;)V
-    .locals 6
-
-    iget-object v0, p0, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    iget v0, p2, Ln0/g0/g/b;->a:I
-
-    const/4 v1, -0x1
-
-    if-eq p1, v1, :cond_1
-
-    iget-object v2, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    iget v3, p0, Ln0/g0/g/c$a;->d:I
-
-    add-int/lit8 v3, v3, 0x1
-
-    add-int/2addr v3, p1
-
-    aget-object v2, v2, v3
-
-    if-eqz v2, :cond_0
-
-    iget v2, v2, Ln0/g0/g/b;->a:I
-
-    sub-int/2addr v0, v2
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iget v2, p0, Ln0/g0/g/c$a;->h:I
-
-    if-le v0, v2, :cond_2
-
-    invoke-virtual {p0}, Ln0/g0/g/c$a;->a()V
-
-    return-void
-
-    :cond_2
-    iget v3, p0, Ln0/g0/g/c$a;->f:I
-
-    add-int/2addr v3, v0
-
-    sub-int/2addr v3, v2
-
-    invoke-virtual {p0, v3}, Ln0/g0/g/c$a;->c(I)I
-
-    move-result v2
-
-    if-ne p1, v1, :cond_4
-
-    iget p1, p0, Ln0/g0/g/c$a;->e:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iget-object v2, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    array-length v3, v2
-
-    if-le p1, v3, :cond_3
-
-    array-length p1, v2
-
-    mul-int/lit8 p1, p1, 0x2
-
-    new-array p1, p1, [Ln0/g0/g/b;
-
-    const/4 v3, 0x0
-
-    array-length v4, v2
-
-    array-length v5, v2
-
-    invoke-static {v2, v3, p1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget-object v2, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    array-length v2, v2
-
-    add-int/2addr v2, v1
-
-    iput v2, p0, Ln0/g0/g/c$a;->d:I
-
-    iput-object p1, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    :cond_3
-    iget p1, p0, Ln0/g0/g/c$a;->d:I
-
-    add-int/lit8 v1, p1, -0x1
-
-    iput v1, p0, Ln0/g0/g/c$a;->d:I
-
-    iget-object v1, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    aput-object p2, v1, p1
-
-    iget p1, p0, Ln0/g0/g/c$a;->e:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Ln0/g0/g/c$a;->e:I
-
-    goto :goto_1
-
-    :cond_4
-    iget v1, p0, Ln0/g0/g/c$a;->d:I
-
-    add-int/lit8 v1, v1, 0x1
-
-    add-int/2addr v1, p1
-
-    add-int/2addr v1, v2
-
-    add-int/2addr v1, p1
-
-    iget-object p1, p0, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    aput-object p2, p1, v1
-
-    :goto_1
-    iget p1, p0, Ln0/g0/g/c$a;->f:I
-
-    add-int/2addr p1, v0
-
-    iput p1, p0, Ln0/g0/g/c$a;->f:I
-
-    return-void
-.end method
-
-.method public final f()Lokio/ByteString;
-    .locals 13
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/c$a;->b:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readByte()B
-
-    move-result v0
-
-    const/16 v1, 0xff
-
-    invoke-static {v0, v1}, Ln0/g0/b;->a(BI)I
-
-    move-result v0
-
-    and-int/lit16 v2, v0, 0x80
-
-    const/16 v3, 0x80
-
-    const/4 v4, 0x0
-
-    if-ne v2, v3, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    const/16 v3, 0x7f
-
-    invoke-virtual {p0, v0, v3}, Ln0/g0/g/c$a;->g(II)I
-
-    move-result v0
-
-    int-to-long v5, v0
-
-    if-eqz v2, :cond_b
-
-    new-instance v0, Lo0/e;
-
-    invoke-direct {v0}, Lo0/e;-><init>()V
-
-    sget-object v2, Ln0/g0/g/n;->d:Ln0/g0/g/n;
-
-    iget-object v2, p0, Ln0/g0/g/c$a;->b:Lo0/g;
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_a
-
-    sget-object v7, Ln0/g0/g/n;->c:Ln0/g0/g/n$a;
-
-    const-wide/16 v8, 0x0
-
-    move-wide v9, v8
-
-    move-object v8, v7
-
-    const/4 v7, 0x0
-
-    :goto_1
-    cmp-long v11, v9, v5
-
-    if-gez v11, :cond_5
-
-    invoke-interface {v2}, Lo0/g;->readByte()B
-
-    move-result v11
-
-    and-int/2addr v11, v1
-
-    shl-int/lit8 v4, v4, 0x8
-
-    or-int/2addr v4, v11
-
-    add-int/lit8 v7, v7, 0x8
-
-    :goto_2
-    const/16 v11, 0x8
-
-    if-lt v7, v11, :cond_4
-
-    add-int/lit8 v11, v7, -0x8
-
-    ushr-int v12, v4, v11
-
-    and-int/2addr v12, v1
-
-    iget-object v8, v8, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    if-eqz v8, :cond_3
-
-    aget-object v8, v8, v12
-
-    if-eqz v8, :cond_2
-
-    iget-object v12, v8, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    if-nez v12, :cond_1
-
-    iget v11, v8, Ln0/g0/g/n$a;->b:I
-
-    invoke-virtual {v0, v11}, Lo0/e;->I(I)Lo0/e;
-
-    iget v8, v8, Ln0/g0/g/n$a;->c:I
-
-    sub-int/2addr v7, v8
-
-    sget-object v8, Ln0/g0/g/n;->c:Ln0/g0/g/n$a;
-
-    goto :goto_2
-
-    :cond_1
-    move v7, v11
-
-    goto :goto_2
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_4
-    const-wide/16 v11, 0x1
-
-    add-long/2addr v9, v11
-
-    goto :goto_1
-
-    :cond_5
-    :goto_3
-    if-lez v7, :cond_9
-
-    rsub-int/lit8 v2, v7, 0x8
-
-    shl-int v2, v4, v2
-
-    and-int/2addr v2, v1
-
-    iget-object v5, v8, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    if-eqz v5, :cond_8
-
-    aget-object v2, v5, v2
-
-    if-eqz v2, :cond_7
-
-    iget-object v5, v2, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    if-nez v5, :cond_9
-
-    iget v5, v2, Ln0/g0/g/n$a;->c:I
-
-    if-le v5, v7, :cond_6
-
-    goto :goto_4
-
-    :cond_6
-    iget v5, v2, Ln0/g0/g/n$a;->b:I
-
-    invoke-virtual {v0, v5}, Lo0/e;->I(I)Lo0/e;
-
-    iget v2, v2, Ln0/g0/g/n$a;->c:I
-
-    sub-int/2addr v7, v2
-
-    sget-object v8, Ln0/g0/g/n;->c:Ln0/g0/g/n$a;
-
-    goto :goto_3
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_9
-    :goto_4
-    invoke-virtual {v0}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object v0
-
-    goto :goto_5
-
-    :cond_a
-    const-string v0, "source"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_b
-    iget-object v0, p0, Ln0/g0/g/c$a;->b:Lo0/g;
-
-    invoke-interface {v0, v5, v6}, Lo0/g;->u(J)Lokio/ByteString;
-
-    move-result-object v0
-
-    :goto_5
-    return-object v0
-.end method
-
-.method public final g(II)I
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    and-int/2addr p1, p2
-
-    if-ge p1, p2, :cond_0
-
-    return p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    iget-object v0, p0, Ln0/g0/g/c$a;->b:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readByte()B
-
-    move-result v0
-
-    const/16 v1, 0xff
-
-    invoke-static {v0, v1}, Ln0/g0/b;->a(BI)I
-
-    move-result v0
-
-    and-int/lit16 v1, v0, 0x80
-
-    if-eqz v1, :cond_1
-
-    and-int/lit8 v0, v0, 0x7f
-
-    shl-int/2addr v0, p1
-
-    add-int/2addr p2, v0
-
-    add-int/lit8 p1, p1, 0x7
-
-    goto :goto_0
-
-    :cond_1
-    shl-int p1, v0, p1
-
-    add-int/2addr p2, p1
-
-    return p2
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/c$b.smali b/com.discord/smali_classes2/n0/g0/g/c$b.smali
deleted file mode 100644
index e796778a3f..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/c$b.smali
+++ /dev/null
@@ -1,877 +0,0 @@
-.class public final Ln0/g0/g/c$b;
-.super Ljava/lang/Object;
-.source "Hpack.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public a:I
-
-.field public b:Z
-
-.field public c:I
-
-.field public d:[Ln0/g0/g/b;
-
-.field public e:I
-
-.field public f:I
-
-.field public g:I
-
-.field public h:I
-
-.field public final i:Z
-
-.field public final j:Lo0/e;
-
-
-# direct methods
-.method public constructor <init>(IZLo0/e;I)V
-    .locals 1
-
-    and-int/lit8 v0, p4, 0x1
-
-    if-eqz v0, :cond_0
-
-    const/16 p1, 0x1000
-
-    :cond_0
-    and-int/lit8 p4, p4, 0x2
-
-    if-eqz p4, :cond_1
-
-    const/4 p2, 0x1
-
-    :cond_1
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Ln0/g0/g/c$b;->h:I
-
-    iput-boolean p2, p0, Ln0/g0/g/c$b;->i:Z
-
-    iput-object p3, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    const p2, 0x7fffffff
-
-    iput p2, p0, Ln0/g0/g/c$b;->a:I
-
-    iput p1, p0, Ln0/g0/g/c$b;->c:I
-
-    const/16 p1, 0x8
-
-    new-array p1, p1, [Ln0/g0/g/b;
-
-    iput-object p1, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    const/4 p1, 0x7
-
-    iput p1, p0, Ln0/g0/g/c$b;->e:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x6
-
-    invoke-static {v0, v1, v2, v2, v3}, Lf/n/a/k/a;->fill$default([Ljava/lang/Object;Ljava/lang/Object;III)V
-
-    iget-object v0, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    array-length v0, v0
-
-    add-int/lit8 v0, v0, -0x1
-
-    iput v0, p0, Ln0/g0/g/c$b;->e:I
-
-    iput v2, p0, Ln0/g0/g/c$b;->f:I
-
-    iput v2, p0, Ln0/g0/g/c$b;->g:I
-
-    return-void
-.end method
-
-.method public final b(I)I
-    .locals 5
-
-    const/4 v0, 0x0
-
-    if-lez p1, :cond_3
-
-    iget-object v1, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    array-length v1, v1
-
-    add-int/lit8 v1, v1, -0x1
-
-    :goto_0
-    iget v2, p0, Ln0/g0/g/c$b;->e:I
-
-    const/4 v3, 0x0
-
-    if-lt v1, v2, :cond_2
-
-    if-lez p1, :cond_2
-
-    iget-object v2, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    aget-object v4, v2, v1
-
-    if-eqz v4, :cond_1
-
-    iget v4, v4, Ln0/g0/g/b;->a:I
-
-    sub-int/2addr p1, v4
-
-    iget v4, p0, Ln0/g0/g/c$b;->g:I
-
-    aget-object v2, v2, v1
-
-    if-eqz v2, :cond_0
-
-    iget v2, v2, Ln0/g0/g/b;->a:I
-
-    sub-int/2addr v4, v2
-
-    iput v4, p0, Ln0/g0/g/c$b;->g:I
-
-    iget v2, p0, Ln0/g0/g/c$b;->f:I
-
-    add-int/lit8 v2, v2, -0x1
-
-    iput v2, p0, Ln0/g0/g/c$b;->f:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    add-int/lit8 v1, v1, -0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_2
-    iget-object p1, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    iget v1, p0, Ln0/g0/g/c$b;->e:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    add-int/lit8 v1, v1, 0x1
-
-    add-int/2addr v1, v0
-
-    iget v4, p0, Ln0/g0/g/c$b;->f:I
-
-    invoke-static {p1, v2, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget-object p1, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    iget v1, p0, Ln0/g0/g/c$b;->e:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    add-int/lit8 v1, v1, 0x1
-
-    add-int/2addr v1, v0
-
-    invoke-static {p1, v2, v1, v3}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
-
-    iget p1, p0, Ln0/g0/g/c$b;->e:I
-
-    add-int/2addr p1, v0
-
-    iput p1, p0, Ln0/g0/g/c$b;->e:I
-
-    :cond_3
-    return v0
-.end method
-
-.method public final c(Ln0/g0/g/b;)V
-    .locals 6
-
-    iget v0, p1, Ln0/g0/g/b;->a:I
-
-    iget v1, p0, Ln0/g0/g/c$b;->c:I
-
-    if-le v0, v1, :cond_0
-
-    invoke-virtual {p0}, Ln0/g0/g/c$b;->a()V
-
-    return-void
-
-    :cond_0
-    iget v2, p0, Ln0/g0/g/c$b;->g:I
-
-    add-int/2addr v2, v0
-
-    sub-int/2addr v2, v1
-
-    invoke-virtual {p0, v2}, Ln0/g0/g/c$b;->b(I)I
-
-    iget v1, p0, Ln0/g0/g/c$b;->f:I
-
-    add-int/lit8 v1, v1, 0x1
-
-    iget-object v2, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    array-length v3, v2
-
-    if-le v1, v3, :cond_1
-
-    array-length v1, v2
-
-    mul-int/lit8 v1, v1, 0x2
-
-    new-array v1, v1, [Ln0/g0/g/b;
-
-    const/4 v3, 0x0
-
-    array-length v4, v2
-
-    array-length v5, v2
-
-    invoke-static {v2, v3, v1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget-object v2, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    array-length v2, v2
-
-    add-int/lit8 v2, v2, -0x1
-
-    iput v2, p0, Ln0/g0/g/c$b;->e:I
-
-    iput-object v1, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    :cond_1
-    iget v1, p0, Ln0/g0/g/c$b;->e:I
-
-    add-int/lit8 v2, v1, -0x1
-
-    iput v2, p0, Ln0/g0/g/c$b;->e:I
-
-    iget-object v2, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    aput-object p1, v2, v1
-
-    iget p1, p0, Ln0/g0/g/c$b;->f:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Ln0/g0/g/c$b;->f:I
-
-    iget p1, p0, Ln0/g0/g/c$b;->g:I
-
-    add-int/2addr p1, v0
-
-    iput p1, p0, Ln0/g0/g/c$b;->g:I
-
-    return-void
-.end method
-
-.method public final d(Lokio/ByteString;)V
-    .locals 11
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_5
-
-    iget-boolean v0, p0, Ln0/g0/g/c$b;->i:Z
-
-    const/16 v1, 0x7f
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_4
-
-    sget-object v0, Ln0/g0/g/n;->d:Ln0/g0/g/n;
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    const-wide/16 v3, 0x0
-
-    move-wide v6, v3
-
-    const/4 v5, 0x0
-
-    :goto_0
-    const/16 v8, 0xff
-
-    if-ge v5, v0, :cond_0
-
-    invoke-virtual {p1, v5}, Lokio/ByteString;->k(I)B
-
-    move-result v9
-
-    invoke-static {v9, v8}, Ln0/g0/b;->a(BI)I
-
-    move-result v8
-
-    sget-object v9, Ln0/g0/g/n;->b:[B
-
-    aget-byte v8, v9, v8
-
-    int-to-long v8, v8
-
-    add-long/2addr v6, v8
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x7
-
-    int-to-long v9, v0
-
-    add-long/2addr v6, v9
-
-    const/4 v0, 0x3
-
-    shr-long v5, v6, v0
-
-    long-to-int v0, v5
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v5
-
-    if-ge v0, v5, :cond_4
-
-    new-instance v0, Lo0/e;
-
-    invoke-direct {v0}, Lo0/e;-><init>()V
-
-    sget-object v5, Ln0/g0/g/n;->d:Ln0/g0/g/n;
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v5
-
-    move-wide v6, v3
-
-    const/4 v3, 0x0
-
-    :goto_1
-    if-ge v2, v5, :cond_2
-
-    invoke-virtual {p1, v2}, Lokio/ByteString;->k(I)B
-
-    move-result v4
-
-    invoke-static {v4, v8}, Ln0/g0/b;->a(BI)I
-
-    move-result v4
-
-    sget-object v9, Ln0/g0/g/n;->a:[I
-
-    aget v9, v9, v4
-
-    sget-object v10, Ln0/g0/g/n;->b:[B
-
-    aget-byte v4, v10, v4
-
-    shl-long/2addr v6, v4
-
-    int-to-long v9, v9
-
-    or-long/2addr v6, v9
-
-    add-int/2addr v3, v4
-
-    :goto_2
-    const/16 v4, 0x8
-
-    if-lt v3, v4, :cond_1
-
-    add-int/lit8 v3, v3, -0x8
-
-    shr-long v9, v6, v3
-
-    long-to-int v4, v9
-
-    invoke-interface {v0, v4}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
-
-    goto :goto_2
-
-    :cond_1
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    if-lez v3, :cond_3
-
-    rsub-int/lit8 p1, v3, 0x8
-
-    shl-long v4, v6, p1
-
-    const-wide/16 v6, 0xff
-
-    ushr-long v2, v6, v3
-
-    or-long/2addr v2, v4
-
-    long-to-int p1, v2
-
-    invoke-interface {v0, p1}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
-
-    :cond_3
-    invoke-virtual {v0}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    const/16 v2, 0x80
-
-    invoke-virtual {p0, v0, v1, v2}, Ln0/g0/g/c$b;->f(III)V
-
-    iget-object v0, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->D(Lokio/ByteString;)Lo0/e;
-
-    goto :goto_3
-
-    :cond_4
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    invoke-virtual {p0, v0, v1, v2}, Ln0/g0/g/c$b;->f(III)V
-
-    iget-object v0, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->D(Lokio/ByteString;)Lo0/e;
-
-    :goto_3
-    return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final e(Ljava/util/List;)V
-    .locals 14
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/g/c$b;->b:Z
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    iget v0, p0, Ln0/g0/g/c$b;->a:I
-
-    iget v2, p0, Ln0/g0/g/c$b;->c:I
-
-    const/16 v3, 0x20
-
-    const/16 v4, 0x1f
-
-    if-ge v0, v2, :cond_0
-
-    invoke-virtual {p0, v0, v4, v3}, Ln0/g0/g/c$b;->f(III)V
-
-    :cond_0
-    iput-boolean v1, p0, Ln0/g0/g/c$b;->b:Z
-
-    const v0, 0x7fffffff
-
-    iput v0, p0, Ln0/g0/g/c$b;->a:I
-
-    iget v0, p0, Ln0/g0/g/c$b;->c:I
-
-    invoke-virtual {p0, v0, v4, v3}, Ln0/g0/g/c$b;->f(III)V
-
-    :cond_1
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v0, :cond_10
-
-    invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ln0/g0/g/b;
-
-    iget-object v4, v3, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    invoke-virtual {v4}, Lokio/ByteString;->n()Lokio/ByteString;
-
-    move-result-object v4
-
-    iget-object v5, v3, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    sget-object v6, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v6, Ln0/g0/g/c;->b:Ljava/util/Map;
-
-    invoke-interface {v6, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/Integer;
-
-    const/4 v7, -0x1
-
-    if-eqz v6, :cond_5
-
-    invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
-
-    move-result v6
-
-    add-int/lit8 v6, v6, 0x1
-
-    const/4 v8, 0x7
-
-    const/4 v9, 0x2
-
-    if-le v9, v6, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    if-lt v8, v6, :cond_4
-
-    sget-object v8, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v8, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    add-int/lit8 v9, v6, -0x1
-
-    aget-object v8, v8, v9
-
-    iget-object v8, v8, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    invoke-static {v8, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_3
-
-    move v8, v6
-
-    goto :goto_2
-
-    :cond_3
-    sget-object v8, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v8, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    aget-object v8, v8, v6
-
-    iget-object v8, v8, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    invoke-static {v8, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_4
-
-    add-int/lit8 v8, v6, 0x1
-
-    move v13, v8
-
-    move v8, v6
-
-    move v6, v13
-
-    goto :goto_2
-
-    :cond_4
-    :goto_1
-    move v8, v6
-
-    const/4 v6, -0x1
-
-    goto :goto_2
-
-    :cond_5
-    const/4 v6, -0x1
-
-    const/4 v8, -0x1
-
-    :goto_2
-    const/4 v9, 0x0
-
-    if-ne v6, v7, :cond_a
-
-    iget v10, p0, Ln0/g0/g/c$b;->e:I
-
-    add-int/lit8 v10, v10, 0x1
-
-    iget-object v11, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    array-length v11, v11
-
-    :goto_3
-    if-ge v10, v11, :cond_a
-
-    iget-object v12, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    aget-object v12, v12, v10
-
-    if-eqz v12, :cond_9
-
-    iget-object v12, v12, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    invoke-static {v12, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_8
-
-    iget-object v12, p0, Ln0/g0/g/c$b;->d:[Ln0/g0/g/b;
-
-    aget-object v12, v12, v10
-
-    if-eqz v12, :cond_7
-
-    iget-object v12, v12, Ln0/g0/g/b;->c:Lokio/ByteString;
-
-    invoke-static {v12, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_6
-
-    iget v6, p0, Ln0/g0/g/c$b;->e:I
-
-    sub-int/2addr v10, v6
-
-    sget-object v6, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v6, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length v6, v6
-
-    add-int/2addr v6, v10
-
-    goto :goto_5
-
-    :cond_6
-    if-ne v8, v7, :cond_8
-
-    iget v8, p0, Ln0/g0/g/c$b;->e:I
-
-    sub-int v8, v10, v8
-
-    sget-object v12, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object v12, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length v12, v12
-
-    add-int/2addr v8, v12
-
-    goto :goto_4
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_8
-    :goto_4
-    add-int/lit8 v10, v10, 0x1
-
-    goto :goto_3
-
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_a
-    :goto_5
-    if-eq v6, v7, :cond_b
-
-    const/16 v3, 0x7f
-
-    const/16 v4, 0x80
-
-    invoke-virtual {p0, v6, v3, v4}, Ln0/g0/g/c$b;->f(III)V
-
-    goto :goto_6
-
-    :cond_b
-    const/16 v6, 0x40
-
-    if-ne v8, v7, :cond_c
-
-    iget-object v7, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    invoke-virtual {v7, v6}, Lo0/e;->I(I)Lo0/e;
-
-    invoke-virtual {p0, v4}, Ln0/g0/g/c$b;->d(Lokio/ByteString;)V
-
-    invoke-virtual {p0, v5}, Ln0/g0/g/c$b;->d(Lokio/ByteString;)V
-
-    invoke-virtual {p0, v3}, Ln0/g0/g/c$b;->c(Ln0/g0/g/b;)V
-
-    goto :goto_6
-
-    :cond_c
-    sget-object v7, Ln0/g0/g/b;->d:Lokio/ByteString;
-
-    if-eqz v4, :cond_f
-
-    if-eqz v7, :cond_e
-
-    invoke-static {v4, v7}, Lo0/y/a;->n(Lokio/ByteString;Lokio/ByteString;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_d
-
-    sget-object v7, Ln0/g0/g/b;->i:Lokio/ByteString;
-
-    invoke-static {v7, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    xor-int/lit8 v4, v4, 0x1
-
-    if-eqz v4, :cond_d
-
-    const/16 v3, 0xf
-
-    invoke-virtual {p0, v8, v3, v1}, Ln0/g0/g/c$b;->f(III)V
-
-    invoke-virtual {p0, v5}, Ln0/g0/g/c$b;->d(Lokio/ByteString;)V
-
-    goto :goto_6
-
-    :cond_d
-    const/16 v4, 0x3f
-
-    invoke-virtual {p0, v8, v4, v6}, Ln0/g0/g/c$b;->f(III)V
-
-    invoke-virtual {p0, v5}, Ln0/g0/g/c$b;->d(Lokio/ByteString;)V
-
-    invoke-virtual {p0, v3}, Ln0/g0/g/c$b;->c(Ln0/g0/g/b;)V
-
-    :goto_6
-    add-int/lit8 v2, v2, 0x1
-
-    goto/16 :goto_0
-
-    :cond_e
-    const-string p1, "prefix"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v9
-
-    :cond_f
-    throw v9
-
-    :cond_10
-    return-void
-.end method
-
-.method public final f(III)V
-    .locals 1
-
-    if-ge p1, p2, :cond_0
-
-    iget-object p2, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    or-int/2addr p1, p3
-
-    invoke-virtual {p2, p1}, Lo0/e;->I(I)Lo0/e;
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    or-int/2addr p3, p2
-
-    invoke-virtual {v0, p3}, Lo0/e;->I(I)Lo0/e;
-
-    sub-int/2addr p1, p2
-
-    :goto_0
-    const/16 p2, 0x80
-
-    if-lt p1, p2, :cond_1
-
-    and-int/lit8 p3, p1, 0x7f
-
-    iget-object v0, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    or-int/2addr p2, p3
-
-    invoke-virtual {v0, p2}, Lo0/e;->I(I)Lo0/e;
-
-    ushr-int/lit8 p1, p1, 0x7
-
-    goto :goto_0
-
-    :cond_1
-    iget-object p2, p0, Ln0/g0/g/c$b;->j:Lo0/e;
-
-    invoke-virtual {p2, p1}, Lo0/e;->I(I)Lo0/e;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/c.smali b/com.discord/smali_classes2/n0/g0/g/c.smali
deleted file mode 100644
index 5ee91ec429..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/c.smali
+++ /dev/null
@@ -1,833 +0,0 @@
-.class public final Ln0/g0/g/c;
-.super Ljava/lang/Object;
-.source "Hpack.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/g/c$a;,
-        Ln0/g0/g/c$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:[Ln0/g0/g/b;
-
-.field public static final b:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Lokio/ByteString;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final c:Ln0/g0/g/c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 6
-
-    new-instance v0, Ln0/g0/g/c;
-
-    invoke-direct {v0}, Ln0/g0/g/c;-><init>()V
-
-    sput-object v0, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    const/16 v0, 0x3d
-
-    new-array v0, v0, [Ln0/g0/g/b;
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v2, Ln0/g0/g/b;->i:Lokio/ByteString;
-
-    const-string v3, ""
-
-    invoke-direct {v1, v2, v3}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->f:Lokio/ByteString;
-
-    const-string v5, "GET"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v4, 0x1
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->f:Lokio/ByteString;
-
-    const-string v5, "POST"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v4, 0x2
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->g:Lokio/ByteString;
-
-    const-string v5, "/"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v4, 0x3
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->g:Lokio/ByteString;
-
-    const-string v5, "/index.html"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v4, 0x4
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->h:Lokio/ByteString;
-
-    const-string v5, "http"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v4, 0x5
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->h:Lokio/ByteString;
-
-    const-string v5, "https"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v4, 0x6
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    const-string v5, "200"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/4 v4, 0x7
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    const-string v5, "204"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/16 v4, 0x8
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    const-string v5, "206"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/16 v4, 0x9
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    const-string v5, "304"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/16 v4, 0xa
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    const-string v5, "400"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/16 v4, 0xb
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    const-string v5, "404"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/16 v4, 0xc
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    sget-object v4, Ln0/g0/g/b;->e:Lokio/ByteString;
-
-    const-string v5, "500"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    const/16 v4, 0xd
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "accept-charset"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0xe
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "accept-encoding"
-
-    const-string v5, "gzip, deflate"
-
-    invoke-direct {v1, v4, v5}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0xf
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "accept-language"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x10
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "accept-ranges"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x11
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "accept"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x12
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "access-control-allow-origin"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x13
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "age"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x14
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "allow"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x15
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "authorization"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x16
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "cache-control"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x17
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "content-disposition"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x18
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "content-encoding"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x19
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "content-language"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x1a
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "content-length"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x1b
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "content-location"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x1c
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "content-range"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x1d
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "content-type"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x1e
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "cookie"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x1f
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "date"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x20
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "etag"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x21
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "expect"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x22
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "expires"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x23
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "from"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x24
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "host"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x25
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "if-match"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x26
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "if-modified-since"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x27
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "if-none-match"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x28
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "if-range"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x29
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "if-unmodified-since"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x2a
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "last-modified"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x2b
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "link"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x2c
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "location"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x2d
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "max-forwards"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x2e
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "proxy-authenticate"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x2f
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "proxy-authorization"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x30
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "range"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x31
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "referer"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x32
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "refresh"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x33
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "retry-after"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x34
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "server"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x35
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "set-cookie"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x36
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "strict-transport-security"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x37
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "transfer-encoding"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x38
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "user-agent"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x39
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "vary"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x3a
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "via"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v4, 0x3b
-
-    aput-object v1, v0, v4
-
-    new-instance v1, Ln0/g0/g/b;
-
-    const-string v4, "www-authenticate"
-
-    invoke-direct {v1, v4, v3}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    const/16 v3, 0x3c
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    sget-object v1, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length v1, v1
-
-    invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(I)V
-
-    sget-object v1, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length v1, v1
-
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    sget-object v3, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    aget-object v3, v3, v2
-
-    iget-object v3, v3, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    invoke-virtual {v0, v3}, Ljava/util/LinkedHashMap;->containsKey(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-nez v3, :cond_0
-
-    sget-object v3, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    aget-object v3, v3, v2
-
-    iget-object v3, v3, Ln0/g0/g/b;->b:Lokio/ByteString;
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-virtual {v0, v3, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
-
-    move-result-object v0
-
-    const-string v1, "Collections.unmodifiableMap(result)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sput-object v0, Ln0/g0/g/c;->b:Ljava/util/Map;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Lokio/ByteString;)Lokio/ByteString;
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v1
-
-    :goto_0
-    if-ge v0, v1, :cond_2
-
-    const/16 v2, 0x41
-
-    int-to-byte v2, v2
-
-    const/16 v3, 0x5a
-
-    int-to-byte v3, v3
-
-    invoke-virtual {p1, v0}, Lokio/ByteString;->k(I)B
-
-    move-result v4
-
-    if-le v2, v4, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    if-ge v3, v4, :cond_1
-
-    :goto_1
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "PROTOCOL_ERROR response malformed: mixed case name: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-static {p1}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    return-object p1
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/d.smali b/com.discord/smali_classes2/n0/g0/g/d.smali
deleted file mode 100644
index 498ac72589..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/d.smali
+++ /dev/null
@@ -1,499 +0,0 @@
-.class public final Ln0/g0/g/d;
-.super Ljava/lang/Object;
-.source "Http2.kt"
-
-
-# static fields
-.field public static final a:Lokio/ByteString;
-
-.field public static final b:[Ljava/lang/String;
-
-.field public static final c:[Ljava/lang/String;
-
-.field public static final d:[Ljava/lang/String;
-
-.field public static final e:Ln0/g0/g/d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 16
-
-    new-instance v0, Ln0/g0/g/d;
-
-    invoke-direct {v0}, Ln0/g0/g/d;-><init>()V
-
-    sput-object v0, Ln0/g0/g/d;->e:Ln0/g0/g/d;
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const-string v1, "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/d;->a:Lokio/ByteString;
-
-    const-string v1, "DATA"
-
-    const-string v2, "HEADERS"
-
-    const-string v3, "PRIORITY"
-
-    const-string v4, "RST_STREAM"
-
-    const-string v5, "SETTINGS"
-
-    const-string v6, "PUSH_PROMISE"
-
-    const-string v7, "PING"
-
-    const-string v8, "GOAWAY"
-
-    const-string v9, "WINDOW_UPDATE"
-
-    const-string v10, "CONTINUATION"
-
-    filled-new-array/range {v1 .. v10}, [Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/d;->b:[Ljava/lang/String;
-
-    const/16 v0, 0x40
-
-    new-array v0, v0, [Ljava/lang/String;
-
-    sput-object v0, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    const/16 v0, 0x100
-
-    new-array v1, v0, [Ljava/lang/String;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    const/4 v4, 0x4
-
-    const/16 v5, 0x20
-
-    const/4 v6, 0x1
-
-    if-ge v3, v0, :cond_0
-
-    new-array v6, v6, [Ljava/lang/Object;
-
-    invoke-static {v3}, Ljava/lang/Integer;->toBinaryString(I)Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "Integer.toBinaryString(it)"
-
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    aput-object v7, v6, v2
-
-    const-string v7, "%8s"
-
-    invoke-static {v7, v6}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v6
-
-    const/16 v7, 0x30
-
-    invoke-static {v6, v5, v7, v2, v4}, Lj0/t/k;->replace$default(Ljava/lang/String;CCZI)Ljava/lang/String;
-
-    move-result-object v4
-
-    aput-object v4, v1, v3
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    sput-object v1, Ln0/g0/g/d;->d:[Ljava/lang/String;
-
-    sget-object v0, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    const-string v1, ""
-
-    aput-object v1, v0, v2
-
-    const-string v1, "END_STREAM"
-
-    aput-object v1, v0, v6
-
-    new-array v1, v6, [I
-
-    aput v6, v1, v2
-
-    const-string v3, "PADDED"
-
-    const/16 v7, 0x8
-
-    aput-object v3, v0, v7
-
-    const/4 v0, 0x0
-
-    :goto_1
-    const-string v3, "|PADDED"
-
-    if-ge v0, v6, :cond_1
-
-    aget v8, v1, v0
-
-    sget-object v9, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    or-int/lit8 v10, v8, 0x8
-
-    aget-object v8, v9, v8
-
-    invoke-static {v8, v3}, Lj0/n/c/h;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    aput-object v3, v9, v10
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    sget-object v0, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    const-string v8, "END_HEADERS"
-
-    aput-object v8, v0, v4
-
-    const-string v4, "PRIORITY"
-
-    aput-object v4, v0, v5
-
-    const/16 v4, 0x24
-
-    const-string v5, "END_HEADERS|PRIORITY"
-
-    aput-object v5, v0, v4
-
-    const/4 v0, 0x3
-
-    new-array v4, v0, [I
-
-    fill-array-data v4, :array_0
-
-    const/4 v5, 0x0
-
-    :goto_2
-    if-ge v5, v0, :cond_3
-
-    aget v8, v4, v5
-
-    const/4 v9, 0x0
-
-    :goto_3
-    if-ge v9, v6, :cond_2
-
-    aget v10, v1, v9
-
-    sget-object v11, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    or-int v12, v10, v8
-
-    new-instance v13, Ljava/lang/StringBuilder;
-
-    invoke-direct {v13}, Ljava/lang/StringBuilder;-><init>()V
-
-    sget-object v14, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    aget-object v14, v14, v10
-
-    invoke-virtual {v13, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v14, "|"
-
-    invoke-virtual {v13, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v15, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    aget-object v15, v15, v8
-
-    invoke-virtual {v13, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v13}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v13
-
-    aput-object v13, v11, v12
-
-    sget-object v11, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    or-int/2addr v12, v7
-
-    new-instance v13, Ljava/lang/StringBuilder;
-
-    invoke-direct {v13}, Ljava/lang/StringBuilder;-><init>()V
-
-    sget-object v15, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    aget-object v10, v15, v10
-
-    invoke-virtual {v13, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v13, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v10, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    aget-object v10, v10, v8
-
-    invoke-static {v13, v10, v3}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v10
-
-    aput-object v10, v11, v12
-
-    add-int/lit8 v9, v9, 0x1
-
-    goto :goto_3
-
-    :cond_2
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    sget-object v0, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    array-length v0, v0
-
-    :goto_4
-    if-ge v2, v0, :cond_5
-
-    sget-object v1, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    aget-object v3, v1, v2
-
-    if-nez v3, :cond_4
-
-    sget-object v3, Ln0/g0/g/d;->d:[Ljava/lang/String;
-
-    aget-object v3, v3, v2
-
-    aput-object v3, v1, v2
-
-    :cond_4
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_4
-
-    :cond_5
-    return-void
-
-    :array_0
-    .array-data 4
-        0x4
-        0x20
-        0x24
-    .end array-data
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(ZIIII)Ljava/lang/String;
-    .locals 9
-
-    sget-object v0, Ln0/g0/g/d;->b:[Ljava/lang/String;
-
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-ge p4, v1, :cond_0
-
-    aget-object v0, v0, p4
-
-    goto :goto_0
-
-    :cond_0
-    new-array v0, v3, [Ljava/lang/Object;
-
-    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    aput-object v1, v0, v2
-
-    const-string v1, "0x%02x"
-
-    invoke-static {v1, v0}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_0
-    const/4 v1, 0x5
-
-    const/4 v4, 0x3
-
-    const/4 v5, 0x2
-
-    const/4 v6, 0x4
-
-    if-nez p5, :cond_1
-
-    const-string p4, ""
-
-    goto :goto_2
-
-    :cond_1
-    if-eq p4, v5, :cond_8
-
-    if-eq p4, v4, :cond_8
-
-    if-eq p4, v6, :cond_6
-
-    const/4 v7, 0x6
-
-    if-eq p4, v7, :cond_6
-
-    const/4 v7, 0x7
-
-    if-eq p4, v7, :cond_8
-
-    const/16 v7, 0x8
-
-    if-eq p4, v7, :cond_8
-
-    sget-object v7, Ln0/g0/g/d;->c:[Ljava/lang/String;
-
-    array-length v8, v7
-
-    if-ge p5, v8, :cond_3
-
-    aget-object v7, v7, p5
-
-    if-eqz v7, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_3
-    sget-object v7, Ln0/g0/g/d;->d:[Ljava/lang/String;
-
-    aget-object v7, v7, p5
-
-    :goto_1
-    if-ne p4, v1, :cond_4
-
-    and-int/lit8 v8, p5, 0x4
-
-    if-eqz v8, :cond_4
-
-    const-string p4, "HEADERS"
-
-    const-string p5, "PUSH_PROMISE"
-
-    invoke-static {v7, p4, p5, v2, v6}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object p4
-
-    goto :goto_2
-
-    :cond_4
-    if-nez p4, :cond_5
-
-    and-int/lit8 p4, p5, 0x20
-
-    if-eqz p4, :cond_5
-
-    const-string p4, "PRIORITY"
-
-    const-string p5, "COMPRESSED"
-
-    invoke-static {v7, p4, p5, v2, v6}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object p4
-
-    goto :goto_2
-
-    :cond_5
-    move-object p4, v7
-
-    goto :goto_2
-
-    :cond_6
-    if-ne p5, v3, :cond_7
-
-    const-string p4, "ACK"
-
-    goto :goto_2
-
-    :cond_7
-    sget-object p4, Ln0/g0/g/d;->d:[Ljava/lang/String;
-
-    aget-object p4, p4, p5
-
-    goto :goto_2
-
-    :cond_8
-    sget-object p4, Ln0/g0/g/d;->d:[Ljava/lang/String;
-
-    aget-object p4, p4, p5
-
-    :goto_2
-    if-eqz p1, :cond_9
-
-    const-string p1, "<<"
-
-    goto :goto_3
-
-    :cond_9
-    const-string p1, ">>"
-
-    :goto_3
-    new-array p5, v1, [Ljava/lang/Object;
-
-    aput-object p1, p5, v2
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    aput-object p1, p5, v3
-
-    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    aput-object p1, p5, v5
-
-    aput-object v0, p5, v4
-
-    aput-object p4, p5, v6
-
-    const-string p1, "%s 0x%08x %5d %-13s %s"
-
-    invoke-static {p1, p5}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$a.smali b/com.discord/smali_classes2/n0/g0/g/e$a.smali
deleted file mode 100644
index 142ab317dd..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$a.smali
+++ /dev/null
@@ -1,89 +0,0 @@
-.class public final Ln0/g0/g/e$a;
-.super Ljava/lang/Object;
-.source "Http2Connection.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/g/e;-><init>(Ln0/g0/g/e$b;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ln0/g0/g/e;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/g/e;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/e$a;->d:Ln0/g0/g/e;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 4
-
-    const-string v0, "OkHttp "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/g0/g/e$a;->d:Ln0/g0/g/e;
-
-    iget-object v1, v1, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    const-string v2, " ping"
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$a;->d:Ln0/g0/g/e;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v0, v3, v3, v3}, Ln0/g0/g/e;->k(ZII)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$b.smali b/com.discord/smali_classes2/n0/g0/g/e$b.smali
deleted file mode 100644
index 1e869fa97a..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$b.smali
+++ /dev/null
@@ -1,52 +0,0 @@
-.class public final Ln0/g0/g/e$b;
-.super Ljava/lang/Object;
-.source "Http2Connection.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public a:Ljava/net/Socket;
-
-.field public b:Ljava/lang/String;
-
-.field public c:Lo0/g;
-
-.field public d:Lokio/BufferedSink;
-
-.field public e:Ln0/g0/g/e$c;
-
-.field public f:Ln0/g0/g/p;
-
-.field public g:I
-
-.field public h:Z
-
-
-# direct methods
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/g0/g/e$b;->h:Z
-
-    sget-object p1, Ln0/g0/g/e$c;->a:Ln0/g0/g/e$c;
-
-    iput-object p1, p0, Ln0/g0/g/e$b;->e:Ln0/g0/g/e$c;
-
-    sget-object p1, Ln0/g0/g/p;->a:Ln0/g0/g/p;
-
-    iput-object p1, p0, Ln0/g0/g/e$b;->f:Ln0/g0/g/p;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$c$a.smali b/com.discord/smali_classes2/n0/g0/g/e$c$a.smali
deleted file mode 100644
index 33bb23e50b..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$c$a.smali
+++ /dev/null
@@ -1,52 +0,0 @@
-.class public final Ln0/g0/g/e$c$a;
-.super Ln0/g0/g/e$c;
-.source "Http2Connection.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/e$c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ln0/g0/g/e$c;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public c(Ln0/g0/g/l;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    sget-object v1, Ln0/g0/g/a;->h:Ln0/g0/g/a;
-
-    invoke-virtual {p1, v1, v0}, Ln0/g0/g/l;->c(Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "stream"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$c.smali b/com.discord/smali_classes2/n0/g0/g/e$c.smali
deleted file mode 100644
index 71425a6cb5..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$c.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public abstract Ln0/g0/g/e$c;
-.super Ljava/lang/Object;
-.source "Http2Connection.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "c"
-.end annotation
-
-
-# static fields
-.field public static final a:Ln0/g0/g/e$c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/g0/g/e$c$a;
-
-    invoke-direct {v0}, Ln0/g0/g/e$c$a;-><init>()V
-
-    sput-object v0, Ln0/g0/g/e$c;->a:Ln0/g0/g/e$c;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public b(Ln0/g0/g/e;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public abstract c(Ln0/g0/g/l;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$d$a.smali b/com.discord/smali_classes2/n0/g0/g/e$d$a.smali
deleted file mode 100644
index 6ac4505cc3..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$d$a.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public final Ln0/g0/g/e$d$a;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/g/e$d;->k(ZLn0/g0/g/q;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e$d;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e$d;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/e$d$a;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/e$d$a;->e:Ln0/g0/g/e$d;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/g/e$d$a;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$d$a;->e:Ln0/g0/g/e$d;
-
-    iget-object v0, v0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->e:Ln0/g0/g/e$c;
-
-    iget-object v3, p0, Ln0/g0/g/e$d$a;->e:Ln0/g0/g/e$d;
-
-    iget-object v3, v3, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v0, v3}, Ln0/g0/g/e$c;->b(Ln0/g0/g/e;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$d$b.smali b/com.discord/smali_classes2/n0/g0/g/e$d$b.smali
deleted file mode 100644
index de0177504a..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$d$b.smali
+++ /dev/null
@@ -1,139 +0,0 @@
-.class public final Ln0/g0/g/e$d$b;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/g/e$d;->c(ZIILjava/util/List;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/l;
-
-.field public final synthetic f:Ln0/g0/g/e$d;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/l;Ln0/g0/g/e$d;Ln0/g0/g/l;ILjava/util/List;Z)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/e$d$b;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/e$d$b;->e:Ln0/g0/g/l;
-
-    iput-object p3, p0, Ln0/g0/g/e$d$b;->f:Ln0/g0/g/e$d;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 7
-
-    iget-object v0, p0, Ln0/g0/g/e$d$b;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$d$b;->f:Ln0/g0/g/e$d;
-
-    iget-object v0, v0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->e:Ln0/g0/g/e$c;
-
-    iget-object v3, p0, Ln0/g0/g/e$d$b;->e:Ln0/g0/g/l;
-
-    invoke-virtual {v0, v3}, Ln0/g0/g/e$c;->c(Ln0/g0/g/l;)V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    :try_start_1
-    sget-object v3, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v3, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    const/4 v4, 0x4
-
-    new-instance v5, Ljava/lang/StringBuilder;
-
-    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v6, "Http2Connection.Listener failure for "
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v6, p0, Ln0/g0/g/e$d$b;->f:Ln0/g0/g/e$d;
-
-    iget-object v6, v6, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v6, v6, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-virtual {v3, v4, v5, v0}, Ln0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    iget-object v3, p0, Ln0/g0/g/e$d$b;->e:Ln0/g0/g/l;
-
-    sget-object v4, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    invoke-virtual {v3, v4, v0}, Ln0/g0/g/l;->c(Ln0/g0/g/a;Ljava/io/IOException;)V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :catch_1
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :goto_1
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$d$c.smali b/com.discord/smali_classes2/n0/g0/g/e$d$c.smali
deleted file mode 100644
index 4a5e0561b0..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$d$c.smali
+++ /dev/null
@@ -1,93 +0,0 @@
-.class public final Ln0/g0/g/e$d$c;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/g/e$d;->f(ZII)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e$d;
-
-.field public final synthetic f:I
-
-.field public final synthetic g:I
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e$d;II)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/e$d$c;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/e$d$c;->e:Ln0/g0/g/e$d;
-
-    iput p3, p0, Ln0/g0/g/e$d$c;->f:I
-
-    iput p4, p0, Ln0/g0/g/e$d$c;->g:I
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 6
-
-    iget-object v0, p0, Ln0/g0/g/e$d$c;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$d$c;->e:Ln0/g0/g/e$d;
-
-    iget-object v0, v0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    const/4 v3, 0x1
-
-    iget v4, p0, Ln0/g0/g/e$d$c;->f:I
-
-    iget v5, p0, Ln0/g0/g/e$d$c;->g:I
-
-    invoke-virtual {v0, v3, v4, v5}, Ln0/g0/g/e;->k(ZII)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$d$d.smali b/com.discord/smali_classes2/n0/g0/g/e$d$d.smali
deleted file mode 100644
index f96e54fb29..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$d$d.smali
+++ /dev/null
@@ -1,89 +0,0 @@
-.class public final Ln0/g0/g/e$d$d;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/g/e$d;->b(ZLn0/g0/g/q;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e$d;
-
-.field public final synthetic f:Z
-
-.field public final synthetic g:Ln0/g0/g/q;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e$d;ZLn0/g0/g/q;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/e$d$d;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/e$d$d;->e:Ln0/g0/g/e$d;
-
-    iput-boolean p3, p0, Ln0/g0/g/e$d$d;->f:Z
-
-    iput-object p4, p0, Ln0/g0/g/e$d$d;->g:Ln0/g0/g/q;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/g/e$d$d;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$d$d;->e:Ln0/g0/g/e$d;
-
-    iget-boolean v3, p0, Ln0/g0/g/e$d$d;->f:Z
-
-    iget-object v4, p0, Ln0/g0/g/e$d$d;->g:Ln0/g0/g/q;
-
-    invoke-virtual {v0, v3, v4}, Ln0/g0/g/e$d;->k(ZLn0/g0/g/q;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$d.smali b/com.discord/smali_classes2/n0/g0/g/e$d.smali
deleted file mode 100644
index 98e6f15e21..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$d.smali
+++ /dev/null
@@ -1,1576 +0,0 @@
-.class public final Ln0/g0/g/e$d;
-.super Ljava/lang/Object;
-.source "Http2Connection.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-.implements Ln0/g0/g/k$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "d"
-.end annotation
-
-
-# instance fields
-.field public final d:Ln0/g0/g/k;
-
-.field public final synthetic e:Ln0/g0/g/e;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/g/e;Ln0/g0/g/k;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/g0/g/k;",
-            ")V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p2, p0, Ln0/g0/g/e$d;->d:Ln0/g0/g/k;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public b(ZLn0/g0/g/q;)V
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    const-string v1, "OkHttp "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v2, v2, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    const-string v3, " ACK Settings"
-
-    invoke-static {v1, v2, v3}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    :try_start_0
-    new-instance v2, Ln0/g0/g/e$d$d;
-
-    invoke-direct {v2, v1, p0, p1, p2}, Ln0/g0/g/e$d$d;-><init>(Ljava/lang/String;Ln0/g0/g/e$d;ZLn0/g0/g/q;)V
-
-    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-void
-.end method
-
-.method public c(ZIILjava/util/List;)V
-    .locals 13
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZII",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)V"
-        }
-    .end annotation
-
-    move-object v9, p0
-
-    move v0, p2
-
-    iget-object v1, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v1, p2}, Ln0/g0/g/e;->d(I)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-object v3, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-boolean v1, v3, Ln0/g0/g/e;->j:Z
-
-    if-nez v1, :cond_0
-
-    iget-object v7, v3, Ln0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    const-string v1, "OkHttp "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, v3, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " Push Headers["
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x5d
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    :try_start_0
-    new-instance v8, Ln0/g0/g/g;
-
-    move-object v1, v8
-
-    move v4, p2
-
-    move-object/from16 v5, p4
-
-    move v6, p1
-
-    invoke-direct/range {v1 .. v6}, Ln0/g0/g/g;-><init>(Ljava/lang/String;Ln0/g0/g/e;ILjava/util/List;Z)V
-
-    invoke-interface {v7, v8}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    :cond_0
-    return-void
-
-    :cond_1
-    iget-object v10, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    monitor-enter v10
-
-    :try_start_1
-    iget-object v1, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v1, p2}, Ln0/g0/g/e;->b(I)Ln0/g0/g/l;
-
-    move-result-object v7
-
-    if-nez v7, :cond_5
-
-    iget-object v1, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    monitor-enter v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :try_start_2
-    iget-boolean v2, v1, Ln0/g0/g/e;->j:Z
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :try_start_3
-    monitor-exit v1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    if-eqz v2, :cond_2
-
-    monitor-exit v10
-
-    return-void
-
-    :cond_2
-    :try_start_4
-    iget-object v1, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget v1, v1, Ln0/g0/g/e;->h:I
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    if-gt v0, v1, :cond_3
-
-    monitor-exit v10
-
-    return-void
-
-    :cond_3
-    :try_start_5
-    rem-int/lit8 v1, v0, 0x2
-
-    iget-object v2, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget v2, v2, Ln0/g0/g/e;->i:I
-
-    rem-int/lit8 v2, v2, 0x2
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    if-ne v1, v2, :cond_4
-
-    monitor-exit v10
-
-    return-void
-
-    :cond_4
-    :try_start_6
-    invoke-static/range {p4 .. p4}, Ln0/g0/b;->B(Ljava/util/List;)Lokhttp3/Headers;
-
-    move-result-object v6
-
-    new-instance v8, Ln0/g0/g/l;
-
-    iget-object v3, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    const/4 v4, 0x0
-
-    move-object v1, v8
-
-    move v2, p2
-
-    move v5, p1
-
-    invoke-direct/range {v1 .. v6}, Ln0/g0/g/l;-><init>(ILn0/g0/g/e;ZZLokhttp3/Headers;)V
-
-    iget-object v1, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iput v0, v1, Ln0/g0/g/e;->h:I
-
-    iget-object v1, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v1, v1, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    sget-object v11, Ln0/g0/g/e;->y:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "OkHttp "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v2, v9, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v2, v2, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " stream "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    new-instance v12, Ln0/g0/g/e$d$b;
-
-    move-object v1, v12
-
-    move-object v3, v8
-
-    move-object v4, p0
-
-    move-object v5, v7
-
-    move v6, p2
-
-    move-object/from16 v7, p4
-
-    move v8, p1
-
-    invoke-direct/range {v1 .. v8}, Ln0/g0/g/e$d$b;-><init>(Ljava/lang/String;Ln0/g0/g/l;Ln0/g0/g/e$d;Ln0/g0/g/l;ILjava/util/List;Z)V
-
-    invoke-interface {v11, v12}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_1
-
-    monitor-exit v10
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    move-object v2, v0
-
-    :try_start_7
-    monitor-exit v1
-
-    throw v2
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_1
-
-    :cond_5
-    monitor-exit v10
-
-    invoke-static/range {p4 .. p4}, Ln0/g0/b;->B(Ljava/util/List;)Lokhttp3/Headers;
-
-    move-result-object v0
-
-    move v1, p1
-
-    invoke-virtual {v7, v0, p1}, Ln0/g0/g/l;->j(Lokhttp3/Headers;Z)V
-
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit v10
-
-    throw v0
-.end method
-
-.method public d(IJ)V
-    .locals 3
-
-    if-nez p1, :cond_1
-
-    iget-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    monitor-enter p1
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-wide v1, v0, Ln0/g0/g/e;->t:J
-
-    add-long/2addr v1, p2
-
-    iput-wide v1, v0, Ln0/g0/g/e;->t:J
-
-    iget-object p2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p2}, Ljava/lang/Object;->notifyAll()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p1
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_1
-    new-instance p2, Lkotlin/TypeCastException;
-
-    const-string p3, "null cannot be cast to non-null type java.lang.Object"
-
-    invoke-direct {p2, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p2
-
-    monitor-exit p1
-
-    throw p2
-
-    :cond_1
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v0, p1}, Ln0/g0/g/e;->b(I)Ln0/g0/g/l;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_3
-
-    monitor-enter p1
-
-    :try_start_2
-    iget-wide v0, p1, Ln0/g0/g/l;->d:J
-
-    add-long/2addr v0, p2
-
-    iput-wide v0, p1, Ln0/g0/g/l;->d:J
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p2, v0
-
-    if-lez v2, :cond_2
-
-    invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :cond_2
-    monitor-exit p1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception p2
-
-    monitor-exit p1
-
-    throw p2
-
-    :cond_3
-    :goto_0
-    return-void
-.end method
-
-.method public e(ZILo0/g;I)V
-    .locals 17
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v1, p0
-
-    move/from16 v0, p2
-
-    move-object/from16 v2, p3
-
-    move/from16 v7, p4
-
-    const-string v3, "source"
-
-    const/4 v4, 0x0
-
-    if-eqz v2, :cond_12
-
-    iget-object v3, v1, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v3, v0}, Ln0/g0/g/e;->d(I)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    iget-object v5, v1, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    if-eqz v5, :cond_1
-
-    new-instance v6, Lo0/e;
-
-    invoke-direct {v6}, Lo0/e;-><init>()V
-
-    int-to-long v3, v7
-
-    invoke-interface {v2, v3, v4}, Lo0/g;->P0(J)V
-
-    invoke-interface {v2, v6, v3, v4}, Lo0/w;->B0(Lo0/e;J)J
-
-    iget-boolean v2, v5, Ln0/g0/g/e;->j:Z
-
-    if-nez v2, :cond_0
-
-    iget-object v9, v5, Ln0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    const-string v2, "OkHttp "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    iget-object v3, v5, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, " Push Data["
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v3, 0x5d
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    new-instance v10, Ln0/g0/g/f;
-
-    move-object v2, v10
-
-    move-object v4, v5
-
-    move/from16 v5, p2
-
-    move/from16 v7, p4
-
-    move/from16 v8, p1
-
-    invoke-direct/range {v2 .. v8}, Ln0/g0/g/f;-><init>(Ljava/lang/String;Ln0/g0/g/e;ILo0/e;IZ)V
-
-    invoke-interface {v9, v10}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    throw v4
-
-    :cond_2
-    iget-object v3, v1, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v3, v0}, Ln0/g0/g/e;->b(I)Ln0/g0/g/l;
-
-    move-result-object v3
-
-    if-nez v3, :cond_3
-
-    iget-object v3, v1, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    sget-object v4, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    invoke-virtual {v3, v0, v4}, Ln0/g0/g/e;->n(ILn0/g0/g/a;)V
-
-    iget-object v0, v1, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    int-to-long v3, v7
-
-    invoke-virtual {v0, v3, v4}, Ln0/g0/g/e;->g(J)V
-
-    invoke-interface {v2, v3, v4}, Lo0/g;->skip(J)V
-
-    return-void
-
-    :cond_3
-    invoke-static {v3}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v4, 0x1
-
-    xor-int/2addr v0, v4
-
-    sget-boolean v5, Lj0/h;->a:Z
-
-    if-eqz v5, :cond_5
-
-    if-eqz v0, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    const-string v0, "Assertion failed"
-
-    new-instance v2, Ljava/lang/AssertionError;
-
-    invoke-direct {v2, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v2
-
-    :cond_5
-    :goto_0
-    iget-object v0, v3, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    int-to-long v5, v7
-
-    iget-object v7, v0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    invoke-static {v7}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v7
-
-    xor-int/2addr v7, v4
-
-    sget-boolean v8, Lj0/h;->a:Z
-
-    if-eqz v8, :cond_7
-
-    if-eqz v7, :cond_6
-
-    goto :goto_1
-
-    :cond_6
-    const-string v0, "Assertion failed"
-
-    new-instance v2, Ljava/lang/AssertionError;
-
-    invoke-direct {v2, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v2
-
-    :cond_7
-    :goto_1
-    const-wide/16 v7, 0x0
-
-    cmp-long v9, v5, v7
-
-    if-lez v9, :cond_10
-
-    iget-object v9, v0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    monitor-enter v9
-
-    :try_start_0
-    iget-boolean v10, v0, Ln0/g0/g/l$b;->h:Z
-
-    iget-object v11, v0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-wide v11, v11, Lo0/e;->e:J
-
-    add-long/2addr v11, v5
-
-    iget-wide v13, v0, Ln0/g0/g/l$b;->g:J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    const/4 v15, 0x0
-
-    cmp-long v16, v11, v13
-
-    if-lez v16, :cond_8
-
-    const/4 v11, 0x1
-
-    goto :goto_2
-
-    :cond_8
-    const/4 v11, 0x0
-
-    :goto_2
-    monitor-exit v9
-
-    if-eqz v11, :cond_9
-
-    invoke-interface {v2, v5, v6}, Lo0/g;->skip(J)V
-
-    iget-object v0, v0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    sget-object v2, Ln0/g0/g/a;->g:Ln0/g0/g/a;
-
-    invoke-virtual {v0, v2}, Ln0/g0/g/l;->e(Ln0/g0/g/a;)V
-
-    goto :goto_5
-
-    :cond_9
-    if-eqz v10, :cond_a
-
-    invoke-interface {v2, v5, v6}, Lo0/g;->skip(J)V
-
-    goto :goto_5
-
-    :cond_a
-    iget-object v9, v0, Ln0/g0/g/l$b;->d:Lo0/e;
-
-    invoke-interface {v2, v9, v5, v6}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v9
-
-    const-wide/16 v11, -0x1
-
-    cmp-long v13, v9, v11
-
-    if-eqz v13, :cond_f
-
-    sub-long/2addr v5, v9
-
-    iget-object v9, v0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    monitor-enter v9
-
-    :try_start_1
-    iget-boolean v10, v0, Ln0/g0/g/l$b;->f:Z
-
-    if-eqz v10, :cond_b
-
-    iget-object v10, v0, Ln0/g0/g/l$b;->d:Lo0/e;
-
-    iget-wide v10, v10, Lo0/e;->e:J
-
-    iget-object v12, v0, Ln0/g0/g/l$b;->d:Lo0/e;
-
-    iget-wide v13, v12, Lo0/e;->e:J
-
-    invoke-virtual {v12, v13, v14}, Lo0/e;->skip(J)V
-
-    goto :goto_4
-
-    :cond_b
-    iget-object v10, v0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-wide v10, v10, Lo0/e;->e:J
-
-    cmp-long v12, v10, v7
-
-    if-nez v12, :cond_c
-
-    const/4 v15, 0x1
-
-    :cond_c
-    iget-object v10, v0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-object v11, v0, Ln0/g0/g/l$b;->d:Lo0/e;
-
-    invoke-virtual {v10, v11}, Lo0/e;->i0(Lo0/w;)J
-
-    if-eqz v15, :cond_e
-
-    iget-object v10, v0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    if-eqz v10, :cond_d
-
-    invoke-virtual {v10}, Ljava/lang/Object;->notifyAll()V
-
-    goto :goto_3
-
-    :cond_d
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v2, "null cannot be cast to non-null type java.lang.Object"
-
-    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :cond_e
-    :goto_3
-    move-wide v10, v7
-
-    :goto_4
-    monitor-exit v9
-
-    cmp-long v9, v10, v7
-
-    if-lez v9, :cond_7
-
-    invoke-virtual {v0, v10, v11}, Ln0/g0/g/l$b;->a(J)V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v9
-
-    throw v0
-
-    :cond_f
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit v9
-
-    throw v0
-
-    :cond_10
-    :goto_5
-    if-eqz p1, :cond_11
-
-    sget-object v0, Ln0/g0/b;->b:Lokhttp3/Headers;
-
-    invoke-virtual {v3, v0, v4}, Ln0/g0/g/l;->j(Lokhttp3/Headers;Z)V
-
-    :cond_11
-    return-void
-
-    :cond_12
-    invoke-static {v3}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v4
-.end method
-
-.method public f(ZII)V
-    .locals 3
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    monitor-enter p1
-
-    :try_start_0
-    iget-object p2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    const/4 p3, 0x0
-
-    iput-boolean p3, p2, Ln0/g0/g/e;->n:Z
-
-    iget-object p2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p2}, Ljava/lang/Object;->notifyAll()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p1
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_1
-    new-instance p2, Lkotlin/TypeCastException;
-
-    const-string p3, "null cannot be cast to non-null type java.lang.Object"
-
-    invoke-direct {p2, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p2
-
-    monitor-exit p1
-
-    throw p2
-
-    :cond_1
-    iget-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object p1, p1, Ln0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    const-string v0, "OkHttp "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v1, v1, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    const-string v2, " ping"
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    :try_start_2
-    new-instance v1, Ln0/g0/g/e$d$c;
-
-    invoke-direct {v1, v0, p0, p2, p3}, Ln0/g0/g/e$d$c;-><init>(Ljava/lang/String;Ln0/g0/g/e$d;II)V
-
-    invoke-interface {p1, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_2
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_2 .. :try_end_2} :catch_0
-
-    :catch_0
-    :goto_0
-    return-void
-.end method
-
-.method public g(IIIZ)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public h(ILn0/g0/g/a;)V
-    .locals 4
-
-    if-eqz p2, :cond_3
-
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v0, p1}, Ln0/g0/g/e;->d(I)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-boolean v1, v0, Ln0/g0/g/e;->j:Z
-
-    if-nez v1, :cond_0
-
-    iget-object v1, v0, Ln0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    const-string v2, "OkHttp "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    iget-object v3, v0, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, " Push Reset["
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v3, 0x5d
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    new-instance v3, Ln0/g0/g/i;
-
-    invoke-direct {v3, v2, v0, p1, p2}, Ln0/g0/g/i;-><init>(Ljava/lang/String;Ln0/g0/g/e;ILn0/g0/g/a;)V
-
-    invoke-interface {v1, v3}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v0, p1}, Ln0/g0/g/e;->e(I)Ln0/g0/g/l;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p1, p2}, Ln0/g0/g/l;->k(Ln0/g0/g/a;)V
-
-    :cond_2
-    return-void
-
-    :cond_3
-    const-string p1, "errorCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public i(IILjava/util/List;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(II",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)V"
-        }
-    .end annotation
-
-    iget-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    monitor-enter p1
-
-    :try_start_0
-    iget-object v0, p1, Ln0/g0/g/e;->x:Ljava/util/Set;
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object p3, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    invoke-virtual {p1, p2, p3}, Ln0/g0/g/e;->n(ILn0/g0/g/a;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p1
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_1
-    iget-object v0, p1, Ln0/g0/g/e;->x:Ljava/util/Set;
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p1
-
-    iget-boolean v0, p1, Ln0/g0/g/e;->j:Z
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p1, Ln0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    const-string v1, "OkHttp "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p1, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " Push Request["
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x5d
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    :try_start_2
-    new-instance v2, Ln0/g0/g/h;
-
-    invoke-direct {v2, v1, p1, p2, p3}, Ln0/g0/g/h;-><init>(Ljava/lang/String;Ln0/g0/g/e;ILjava/util/List;)V
-
-    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_2
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_2 .. :try_end_2} :catch_0
-
-    :catch_0
-    :cond_1
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception p2
-
-    monitor-exit p1
-
-    throw p2
-.end method
-
-.method public j(ILn0/g0/g/a;Lokio/ByteString;)V
-    .locals 3
-
-    const-string v0, "errorCode"
-
-    const/4 v1, 0x0
-
-    if-eqz p2, :cond_4
-
-    const-string p2, "debugData"
-
-    if-eqz p3, :cond_3
-
-    invoke-virtual {p3}, Lokio/ByteString;->h()I
-
-    move-result p2
-
-    iget-object p2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    monitor-enter p2
-
-    :try_start_0
-    iget-object p3, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object p3, p3, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-interface {p3}, Ljava/util/Map;->values()Ljava/util/Collection;
-
-    move-result-object p3
-
-    const/4 v0, 0x0
-
-    new-array v1, v0, [Ln0/g0/g/l;
-
-    invoke-interface {p3, v1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p3
-
-    if-eqz p3, :cond_2
-
-    check-cast p3, [Ln0/g0/g/l;
-
-    iget-object v1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    const/4 v2, 0x1
-
-    iput-boolean v2, v1, Ln0/g0/g/e;->j:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p2
-
-    array-length p2, p3
-
-    :goto_0
-    if-ge v0, p2, :cond_1
-
-    aget-object v1, p3, v0
-
-    iget v2, v1, Ln0/g0/g/l;->m:I
-
-    if-le v2, p1, :cond_0
-
-    invoke-virtual {v1}, Ln0/g0/g/l;->h()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    sget-object v2, Ln0/g0/g/a;->h:Ln0/g0/g/a;
-
-    invoke-virtual {v1, v2}, Ln0/g0/g/l;->k(Ln0/g0/g/a;)V
-
-    iget-object v2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget v1, v1, Ln0/g0/g/l;->m:I
-
-    invoke-virtual {v2, v1}, Ln0/g0/g/e;->e(I)Ln0/g0/g/l;
-
-    :cond_0
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-
-    :cond_2
-    :try_start_1
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p3, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p2
-
-    throw p1
-
-    :cond_3
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final k(ZLn0/g0/g/q;)V
-    .locals 10
-
-    const-string v0, "settings"
-
-    const/4 v1, 0x0
-
-    if-eqz p2, :cond_a
-
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    monitor-enter v2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :try_start_1
-    iget-object v3, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    invoke-virtual {v3}, Ln0/g0/g/q;->a()I
-
-    move-result v3
-
-    const/4 v4, 0x0
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object p1, p1, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    iput v4, p1, Ln0/g0/g/q;->a:I
-
-    iget-object p1, p1, Ln0/g0/g/q;->b:[I
-
-    array-length v5, p1
-
-    invoke-static {p1, v4, v5, v4}, Ljava/util/Arrays;->fill([IIII)V
-
-    :cond_0
-    iget-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object p1, p1, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    if-eqz p1, :cond_9
-
-    const/16 v5, 0xa
-
-    const/4 v6, 0x0
-
-    :goto_0
-    const/4 v7, 0x1
-
-    if-ge v6, v5, :cond_3
-
-    shl-int v8, v7, v6
-
-    iget v9, p2, Ln0/g0/g/q;->a:I
-
-    and-int/2addr v8, v9
-
-    if-eqz v8, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v7, 0x0
-
-    :goto_1
-    if-nez v7, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    iget-object v7, p2, Ln0/g0/g/q;->b:[I
-
-    aget v7, v7, v6
-
-    invoke-virtual {p1, v6, v7}, Ln0/g0/g/q;->b(II)Ln0/g0/g/q;
-
-    :goto_2
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    iget-object p1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object p1, p1, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    invoke-virtual {p1}, Ln0/g0/g/q;->a()I
-
-    move-result p1
-
-    const/4 p2, -0x1
-
-    const-wide/16 v5, 0x0
-
-    if-eq p1, p2, :cond_5
-
-    if-eq p1, v3, :cond_5
-
-    sub-int/2addr p1, v3
-
-    int-to-long p1, p1
-
-    iget-object v3, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-interface {v3}, Ljava/util/Map;->isEmpty()Z
-
-    move-result v3
-
-    xor-int/2addr v3, v7
-
-    if-eqz v3, :cond_6
-
-    iget-object v1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v1, v1, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
-
-    move-result-object v1
-
-    new-array v3, v4, [Ln0/g0/g/l;
-
-    invoke-interface {v1, v3}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_4
-
-    check-cast v1, [Ln0/g0/g/l;
-
-    goto :goto_3
-
-    :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :cond_5
-    move-wide p1, v5
-
-    :cond_6
-    :goto_3
-    :try_start_2
-    monitor-exit v2
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    :try_start_3
-    iget-object v2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v2, v2, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    iget-object v3, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    invoke-virtual {v2, v3}, Ln0/g0/g/m;->a(Ln0/g0/g/q;)V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    goto :goto_4
-
-    :catch_0
-    move-exception v2
-
-    :try_start_4
-    iget-object v3, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    sget-object v7, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    invoke-virtual {v3, v7, v7, v2}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    :goto_4
-    monitor-exit v0
-
-    if-eqz v1, :cond_8
-
-    array-length v0, v1
-
-    :goto_5
-    if-ge v4, v0, :cond_8
-
-    aget-object v2, v1, v4
-
-    monitor-enter v2
-
-    :try_start_5
-    iget-wide v7, v2, Ln0/g0/g/l;->d:J
-
-    add-long/2addr v7, p1
-
-    iput-wide v7, v2, Ln0/g0/g/l;->d:J
-
-    cmp-long v3, p1, v5
-
-    if-lez v3, :cond_7
-
-    invoke-virtual {v2}, Ljava/lang/Object;->notifyAll()V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_0
-
-    :cond_7
-    monitor-exit v2
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_5
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v2
-
-    throw p1
-
-    :cond_8
-    sget-object p1, Ln0/g0/g/e;->y:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    const-string p2, "OkHttp "
-
-    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    iget-object v0, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    const-string v1, " settings"
-
-    invoke-static {p2, v0, v1}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p2
-
-    new-instance v0, Ln0/g0/g/e$d$a;
-
-    invoke-direct {v0, p2, p0}, Ln0/g0/g/e$d$a;-><init>(Ljava/lang/String;Ln0/g0/g/e$d;)V
-
-    invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-
-    return-void
-
-    :cond_9
-    :try_start_6
-    throw v1
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_7
-    monitor-exit v2
-
-    throw p1
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
-
-    :catchall_2
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_a
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public run()V
-    .locals 5
-
-    sget-object v0, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    sget-object v1, Ln0/g0/g/a;->f:Ln0/g0/g/a;
-
-    const/4 v2, 0x0
-
-    :try_start_0
-    iget-object v3, p0, Ln0/g0/g/e$d;->d:Ln0/g0/g/k;
-
-    invoke-virtual {v3, p0}, Ln0/g0/g/k;->b(Ln0/g0/g/k$b;)V
-
-    :goto_0
-    iget-object v3, p0, Ln0/g0/g/e$d;->d:Ln0/g0/g/k;
-
-    const/4 v4, 0x0
-
-    invoke-virtual {v3, v4, p0}, Ln0/g0/g/k;->a(ZLn0/g0/g/k$b;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v3, Ln0/g0/g/a;->d:Ln0/g0/g/a;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    sget-object v0, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    iget-object v1, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v1, v3, v0, v2}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_2
-
-    :catchall_1
-    move-exception v0
-
-    move-object v3, v1
-
-    goto :goto_2
-
-    :catch_0
-    move-exception v1
-
-    iget-object v2, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v2, v0, v0, v1}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    :goto_1
-    iget-object v0, p0, Ln0/g0/g/e$d;->d:Ln0/g0/g/k;
-
-    invoke-static {v0}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    return-void
-
-    :goto_2
-    iget-object v4, p0, Ln0/g0/g/e$d;->e:Ln0/g0/g/e;
-
-    invoke-virtual {v4, v3, v1, v2}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    iget-object v1, p0, Ln0/g0/g/e$d;->d:Ln0/g0/g/k;
-
-    invoke-static {v1}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$e.smali b/com.discord/smali_classes2/n0/g0/g/e$e.smali
deleted file mode 100644
index b9cfcc32e0..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$e.smali
+++ /dev/null
@@ -1,121 +0,0 @@
-.class public final Ln0/g0/g/e$e;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/g/e;->n(ILn0/g0/g/a;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e;
-
-.field public final synthetic f:I
-
-.field public final synthetic g:Ln0/g0/g/a;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e;ILn0/g0/g/a;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/e$e;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/e$e;->e:Ln0/g0/g/e;
-
-    iput p3, p0, Ln0/g0/g/e$e;->f:I
-
-    iput-object p4, p0, Ln0/g0/g/e$e;->g:Ln0/g0/g/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/g/e$e;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$e;->e:Ln0/g0/g/e;
-
-    iget v3, p0, Ln0/g0/g/e$e;->f:I
-
-    iget-object v4, p0, Ln0/g0/g/e$e;->g:Ln0/g0/g/a;
-
-    if-eqz v4, :cond_0
-
-    iget-object v0, v0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {v0, v3, v4}, Ln0/g0/g/m;->g(ILn0/g0/g/a;)V
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "statusCode"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    :try_start_1
-    iget-object v3, p0, Ln0/g0/g/e$e;->e:Ln0/g0/g/e;
-
-    sget-object v4, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    invoke-virtual {v3, v4, v4, v0}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :goto_1
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e$f.smali b/com.discord/smali_classes2/n0/g0/g/e$f.smali
deleted file mode 100644
index 4f68b6e564..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e$f.smali
+++ /dev/null
@@ -1,110 +0,0 @@
-.class public final Ln0/g0/g/e$f;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/g/e;->p(IJ)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e;
-
-.field public final synthetic f:I
-
-.field public final synthetic g:J
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e;IJ)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/e$f;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/e$f;->e:Ln0/g0/g/e;
-
-    iput p3, p0, Ln0/g0/g/e$f;->f:I
-
-    iput-wide p4, p0, Ln0/g0/g/e$f;->g:J
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 6
-
-    iget-object v0, p0, Ln0/g0/g/e$f;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e$f;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    iget v3, p0, Ln0/g0/g/e$f;->f:I
-
-    iget-wide v4, p0, Ln0/g0/g/e$f;->g:J
-
-    invoke-virtual {v0, v3, v4, v5}, Ln0/g0/g/m;->i(IJ)V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    :try_start_1
-    iget-object v3, p0, Ln0/g0/g/e$f;->e:Ln0/g0/g/e;
-
-    sget-object v4, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    invoke-virtual {v3, v4, v4, v0}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :goto_1
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/e.smali b/com.discord/smali_classes2/n0/g0/g/e.smali
deleted file mode 100644
index 5b53cf446f..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/e.smali
+++ /dev/null
@@ -1,1088 +0,0 @@
-.class public final Ln0/g0/g/e;
-.super Ljava/lang/Object;
-.source "Http2Connection.kt"
-
-# interfaces
-.implements Ljava/io/Closeable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/g/e$b;,
-        Ln0/g0/g/e$d;,
-        Ln0/g0/g/e$c;
-    }
-.end annotation
-
-
-# static fields
-.field public static final y:Ljava/util/concurrent/ThreadPoolExecutor;
-
-
-# instance fields
-.field public final d:Z
-
-.field public final e:Ln0/g0/g/e$c;
-
-.field public final f:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/Integer;",
-            "Ln0/g0/g/l;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Ljava/lang/String;
-
-.field public h:I
-
-.field public i:I
-
-.field public j:Z
-
-.field public final k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-.field public final l:Ljava/util/concurrent/ThreadPoolExecutor;
-
-.field public final m:Ln0/g0/g/p;
-
-.field public n:Z
-
-.field public final o:Ln0/g0/g/q;
-
-.field public final p:Ln0/g0/g/q;
-
-.field public q:J
-
-.field public r:J
-
-.field public s:J
-
-.field public t:J
-
-.field public final u:Ljava/net/Socket;
-
-.field public final v:Ln0/g0/g/m;
-
-.field public final w:Ln0/g0/g/e$d;
-
-.field public final x:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 9
-
-    new-instance v8, Ljava/util/concurrent/ThreadPoolExecutor;
-
-    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    new-instance v6, Ljava/util/concurrent/SynchronousQueue;
-
-    invoke-direct {v6}, Ljava/util/concurrent/SynchronousQueue;-><init>()V
-
-    const-string v0, "OkHttp Http2Connection"
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, v1}, Ln0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-
-    move-result-object v7
-
-    const/4 v1, 0x0
-
-    const v2, 0x7fffffff
-
-    const-wide/16 v3, 0x3c
-
-    move-object v0, v8
-
-    invoke-direct/range {v0 .. v7}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
-
-    sput-object v8, Ln0/g0/g/e;->y:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ln0/g0/g/e$b;)V
-    .locals 14
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-boolean v0, p1, Ln0/g0/g/e$b;->h:Z
-
-    iput-boolean v0, p0, Ln0/g0/g/e;->d:Z
-
-    iget-object v0, p1, Ln0/g0/g/e$b;->e:Ln0/g0/g/e$c;
-
-    iput-object v0, p0, Ln0/g0/g/e;->e:Ln0/g0/g/e$c;
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
-
-    iput-object v0, p0, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    iget-object v0, p1, Ln0/g0/g/e$b;->b:Ljava/lang/String;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_6
-
-    iput-object v0, p0, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    iget-boolean v0, p1, Ln0/g0/g/e$b;->h:Z
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x3
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x2
-
-    :goto_0
-    iput v0, p0, Ln0/g0/g/e;->i:I
-
-    new-instance v0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    const/4 v2, 0x1
-
-    new-array v3, v2, [Ljava/lang/Object;
-
-    iget-object v4, p0, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    const/4 v5, 0x0
-
-    aput-object v4, v3, v5
-
-    const-string v4, "OkHttp %s Writer"
-
-    invoke-static {v4, v3}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {v3, v5}, Ln0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-
-    move-result-object v3
-
-    invoke-direct {v0, v2, v3}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
-
-    iput-object v0, p0, Ln0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    new-instance v0, Ljava/util/concurrent/ThreadPoolExecutor;
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    const-wide/16 v9, 0x3c
-
-    sget-object v11, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    new-instance v12, Ljava/util/concurrent/LinkedBlockingQueue;
-
-    invoke-direct {v12}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
-
-    new-array v3, v2, [Ljava/lang/Object;
-
-    iget-object v4, p0, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    aput-object v4, v3, v5
-
-    const-string v4, "OkHttp %s Push Observer"
-
-    invoke-static {v4, v3}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {v3, v2}, Ln0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-
-    move-result-object v13
-
-    move-object v6, v0
-
-    invoke-direct/range {v6 .. v13}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
-
-    iput-object v0, p0, Ln0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    iget-object v0, p1, Ln0/g0/g/e$b;->f:Ln0/g0/g/p;
-
-    iput-object v0, p0, Ln0/g0/g/e;->m:Ln0/g0/g/p;
-
-    new-instance v0, Ln0/g0/g/q;
-
-    invoke-direct {v0}, Ln0/g0/g/q;-><init>()V
-
-    iget-boolean v2, p1, Ln0/g0/g/e$b;->h:Z
-
-    const/4 v3, 0x7
-
-    if-eqz v2, :cond_1
-
-    const/high16 v2, 0x1000000
-
-    invoke-virtual {v0, v3, v2}, Ln0/g0/g/q;->b(II)Ln0/g0/g/q;
-
-    :cond_1
-    iput-object v0, p0, Ln0/g0/g/e;->o:Ln0/g0/g/q;
-
-    new-instance v0, Ln0/g0/g/q;
-
-    invoke-direct {v0}, Ln0/g0/g/q;-><init>()V
-
-    const v2, 0xffff
-
-    invoke-virtual {v0, v3, v2}, Ln0/g0/g/q;->b(II)Ln0/g0/g/q;
-
-    const/4 v2, 0x5
-
-    const/16 v3, 0x4000
-
-    invoke-virtual {v0, v2, v3}, Ln0/g0/g/q;->b(II)Ln0/g0/g/q;
-
-    iput-object v0, p0, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    invoke-virtual {v0}, Ln0/g0/g/q;->a()I
-
-    move-result v0
-
-    int-to-long v2, v0
-
-    iput-wide v2, p0, Ln0/g0/g/e;->t:J
-
-    iget-object v0, p1, Ln0/g0/g/e$b;->a:Ljava/net/Socket;
-
-    if-eqz v0, :cond_5
-
-    iput-object v0, p0, Ln0/g0/g/e;->u:Ljava/net/Socket;
-
-    new-instance v0, Ln0/g0/g/m;
-
-    iget-object v2, p1, Ln0/g0/g/e$b;->d:Lokio/BufferedSink;
-
-    if-eqz v2, :cond_4
-
-    iget-boolean v3, p0, Ln0/g0/g/e;->d:Z
-
-    invoke-direct {v0, v2, v3}, Ln0/g0/g/m;-><init>(Lokio/BufferedSink;Z)V
-
-    iput-object v0, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    new-instance v0, Ln0/g0/g/e$d;
-
-    new-instance v2, Ln0/g0/g/k;
-
-    iget-object v3, p1, Ln0/g0/g/e$b;->c:Lo0/g;
-
-    if-eqz v3, :cond_3
-
-    iget-boolean v1, p0, Ln0/g0/g/e;->d:Z
-
-    invoke-direct {v2, v3, v1}, Ln0/g0/g/k;-><init>(Lo0/g;Z)V
-
-    invoke-direct {v0, p0, v2}, Ln0/g0/g/e$d;-><init>(Ln0/g0/g/e;Ln0/g0/g/k;)V
-
-    iput-object v0, p0, Ln0/g0/g/e;->w:Ln0/g0/g/e$d;
-
-    new-instance v0, Ljava/util/LinkedHashSet;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
-
-    iput-object v0, p0, Ln0/g0/g/e;->x:Ljava/util/Set;
-
-    iget v0, p1, Ln0/g0/g/e$b;->g:I
-
-    if-eqz v0, :cond_2
-
-    iget-object v1, p0, Ln0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    new-instance v2, Ln0/g0/g/e$a;
-
-    invoke-direct {v2, p0}, Ln0/g0/g/e$a;-><init>(Ln0/g0/g/e;)V
-
-    iget p1, p1, Ln0/g0/g/e$b;->g:I
-
-    int-to-long v5, p1
-
-    sget-object v7, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    move-wide v3, v5
-
-    invoke-virtual/range {v1 .. v7}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    :cond_2
-    return-void
-
-    :cond_3
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    const-string p1, "socket"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    const-string p1, "connectionName"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-
-# virtual methods
-.method public final a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-    .locals 3
-
-    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/lit8 v0, v0, 0x1
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, "Assertion failed"
-
-    new-instance p2, Ljava/lang/AssertionError;
-
-    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p2
-
-    :cond_1
-    :goto_0
-    :try_start_0
-    invoke-virtual {p0, p1}, Ln0/g0/g/e;->f(Ln0/g0/g/a;)V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    monitor-enter p0
-
-    :try_start_1
-    iget-object p1, p0, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-interface {p1}, Ljava/util/Map;->isEmpty()Z
-
-    move-result p1
-
-    xor-int/lit8 p1, p1, 0x1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    iget-object p1, p0, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
-
-    move-result-object p1
-
-    new-array v1, v0, [Ln0/g0/g/l;
-
-    invoke-interface {p1, v1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_2
-
-    check-cast p1, [Ln0/g0/g/l;
-
-    iget-object v1, p0, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-interface {v1}, Ljava/util/Map;->clear()V
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_1
-    monitor-exit p0
-
-    if-eqz p1, :cond_4
-
-    array-length v1, p1
-
-    :goto_2
-    if-ge v0, v1, :cond_4
-
-    aget-object v2, p1, v0
-
-    :try_start_2
-    invoke-virtual {v2, p2, p3}, Ln0/g0/g/l;->c(Ln0/g0/g/a;Ljava/io/IOException;)V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
-
-    :catch_1
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_2
-
-    :cond_4
-    :try_start_3
-    iget-object p1, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {p1}, Ln0/g0/g/m;->close()V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
-
-    :catch_2
-    :try_start_4
-    iget-object p1, p0, Ln0/g0/g/e;->u:Ljava/net/Socket;
-
-    invoke-virtual {p1}, Ljava/net/Socket;->close()V
-    :try_end_4
-    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_3
-
-    :catch_3
-    iget-object p1, p0, Ln0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->shutdown()V
-
-    iget-object p1, p0, Ln0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/ThreadPoolExecutor;->shutdown()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized b(I)Ln0/g0/g/l;
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ln0/g0/g/l;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized c()I
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    const v1, 0x7fffffff
-
-    iget v2, v0, Ln0/g0/g/q;->a:I
-
-    and-int/lit8 v2, v2, 0x10
-
-    if-eqz v2, :cond_0
-
-    iget-object v0, v0, Ln0/g0/g/q;->b:[I
-
-    const/4 v1, 0x4
-
-    aget v1, v0, v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_0
-    monitor-exit p0
-
-    return v1
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public close()V
-    .locals 3
-
-    sget-object v0, Ln0/g0/g/a;->d:Ln0/g0/g/a;
-
-    sget-object v1, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p0, v0, v1, v2}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    return-void
-.end method
-
-.method public final d(I)Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    if-eqz p1, :cond_0
-
-    and-int/2addr p1, v0
-
-    if-nez p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public final declared-synchronized e(I)Ln0/g0/g/l;
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ln0/g0/g/l;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final f(Ln0/g0/g/a;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    monitor-enter v0
-
-    :try_start_0
-    monitor-enter p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-boolean v1, p0, Ln0/g0/g/e;->j:Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v1, :cond_0
-
-    :try_start_2
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    monitor-exit v0
-
-    return-void
-
-    :cond_0
-    const/4 v1, 0x1
-
-    :try_start_3
-    iput-boolean v1, p0, Ln0/g0/g/e;->j:Z
-
-    iget v1, p0, Ln0/g0/g/e;->h:I
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :try_start_4
-    monitor-exit p0
-
-    iget-object v2, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    sget-object v3, Ln0/g0/b;->a:[B
-
-    invoke-virtual {v2, v1, p1, v3}, Ln0/g0/g/m;->d(ILn0/g0/g/a;[B)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_5
-    monitor-exit p0
-
-    throw p1
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-.end method
-
-.method public final flush()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {v0}, Ln0/g0/g/m;->flush()V
-
-    return-void
-.end method
-
-.method public final declared-synchronized g(J)V
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-wide v0, p0, Ln0/g0/g/e;->q:J
-
-    add-long/2addr v0, p1
-
-    iput-wide v0, p0, Ln0/g0/g/e;->q:J
-
-    iget-wide p1, p0, Ln0/g0/g/e;->r:J
-
-    sub-long/2addr v0, p1
-
-    iget-object p1, p0, Ln0/g0/g/e;->o:Ln0/g0/g/q;
-
-    invoke-virtual {p1}, Ln0/g0/g/q;->a()I
-
-    move-result p1
-
-    div-int/lit8 p1, p1, 0x2
-
-    int-to-long p1, p1
-
-    cmp-long v2, v0, p1
-
-    if-ltz v2, :cond_0
-
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p1, v0, v1}, Ln0/g0/g/e;->p(IJ)V
-
-    iget-wide p1, p0, Ln0/g0/g/e;->r:J
-
-    add-long/2addr p1, v0
-
-    iput-wide p1, p0, Ln0/g0/g/e;->r:J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_0
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final i(IZLo0/e;J)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p4, v1
-
-    if-nez v3, :cond_0
-
-    iget-object p4, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {p4, p2, p1, p3, v0}, Ln0/g0/g/m;->b(ZILo0/e;I)V
-
-    return-void
-
-    :cond_0
-    :goto_0
-    cmp-long v3, p4, v1
-
-    if-lez v3, :cond_4
-
-    new-instance v3, Lkotlin/jvm/internal/Ref$IntRef;
-
-    invoke-direct {v3}, Lkotlin/jvm/internal/Ref$IntRef;-><init>()V
-
-    monitor-enter p0
-
-    :goto_1
-    :try_start_0
-    iget-wide v4, p0, Ln0/g0/g/e;->s:J
-
-    iget-wide v6, p0, Ln0/g0/g/e;->t:J
-
-    cmp-long v8, v4, v6
-
-    if-ltz v8, :cond_2
-
-    iget-object v4, p0, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
-
-    invoke-interface {v4, v5}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    invoke-virtual {p0}, Ljava/lang/Object;->wait()V
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "stream closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_2
-    :try_start_1
-    iget-wide v4, p0, Ln0/g0/g/e;->t:J
-
-    iget-wide v6, p0, Ln0/g0/g/e;->s:J
-
-    sub-long/2addr v4, v6
-
-    invoke-static {p4, p5, v4, v5}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v4
-
-    long-to-int v5, v4
-
-    iput v5, v3, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    iget-object v4, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    iget v4, v4, Ln0/g0/g/m;->e:I
-
-    invoke-static {v5, v4}, Ljava/lang/Math;->min(II)I
-
-    move-result v4
-
-    iput v4, v3, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    iget-wide v5, p0, Ln0/g0/g/e;->s:J
-
-    int-to-long v7, v4
-
-    add-long/2addr v5, v7
-
-    iput-wide v5, p0, Ln0/g0/g/e;->s:J
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    int-to-long v4, v4
-
-    sub-long/2addr p4, v4
-
-    iget-object v4, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    if-eqz p2, :cond_3
-
-    cmp-long v5, p4, v1
-
-    if-nez v5, :cond_3
-
-    const/4 v5, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v5, 0x0
-
-    :goto_2
-    iget v3, v3, Lkotlin/jvm/internal/Ref$IntRef;->element:I
-
-    invoke-virtual {v4, v5, p1, p3, v3}, Ln0/g0/g/m;->b(ZILo0/e;I)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_3
-
-    :catch_0
-    :try_start_2
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Thread;->interrupt()V
-
-    new-instance p1, Ljava/io/InterruptedIOException;
-
-    invoke-direct {p1}, Ljava/io/InterruptedIOException;-><init>()V
-
-    throw p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :goto_3
-    monitor-exit p0
-
-    throw p1
-
-    :cond_4
-    return-void
-.end method
-
-.method public final k(ZII)V
-    .locals 3
-
-    sget-object v0, Ln0/g0/g/a;->e:Ln0/g0/g/a;
-
-    if-nez p1, :cond_0
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v1, p0, Ln0/g0/g/e;->n:Z
-
-    const/4 v2, 0x1
-
-    iput-boolean v2, p0, Ln0/g0/g/e;->n:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    if-eqz v1, :cond_0
-
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, v0, v0, p1}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-
-    :cond_0
-    :try_start_1
-    iget-object v1, p0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {v1, p1, p2, p3}, Ln0/g0/g/m;->f(ZII)V
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    invoke-virtual {p0, v0, v0, p1}, Ln0/g0/g/e;->a(Ln0/g0/g/a;Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public final n(ILn0/g0/g/a;)V
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    const-string v1, "OkHttp "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " stream "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    :try_start_0
-    new-instance v2, Ln0/g0/g/e$e;
-
-    invoke-direct {v2, v1, p0, p1, p2}, Ln0/g0/g/e$e;-><init>(Ljava/lang/String;Ln0/g0/g/e;ILn0/g0/g/a;)V
-
-    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-void
-.end method
-
-.method public final p(IJ)V
-    .locals 9
-
-    iget-object v0, p0, Ln0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    const-string v1, "OkHttp Window Update "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/g0/g/e;->g:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " stream "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v4
-
-    :try_start_0
-    new-instance v1, Ln0/g0/g/e$f;
-
-    move-object v3, v1
-
-    move-object v5, p0
-
-    move v6, p1
-
-    move-wide v7, p2
-
-    invoke-direct/range {v3 .. v8}, Ln0/g0/g/e$f;-><init>(Ljava/lang/String;Ln0/g0/g/e;IJ)V
-
-    invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/f.smali b/com.discord/smali_classes2/n0/g0/g/f.smali
deleted file mode 100644
index c763296819..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/f.smali
+++ /dev/null
@@ -1,152 +0,0 @@
-.class public final Ln0/g0/g/f;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e;
-
-.field public final synthetic f:I
-
-.field public final synthetic g:Lo0/e;
-
-.field public final synthetic h:I
-
-.field public final synthetic i:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e;ILo0/e;IZ)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/f;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/f;->e:Ln0/g0/g/e;
-
-    iput p3, p0, Ln0/g0/g/f;->f:I
-
-    iput-object p4, p0, Ln0/g0/g/f;->g:Lo0/e;
-
-    iput p5, p0, Ln0/g0/g/f;->h:I
-
-    iput-boolean p6, p0, Ln0/g0/g/f;->i:Z
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 7
-
-    iget-object v0, p0, Ln0/g0/g/f;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/f;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->m:Ln0/g0/g/p;
-
-    iget v3, p0, Ln0/g0/g/f;->f:I
-
-    iget-object v4, p0, Ln0/g0/g/f;->g:Lo0/e;
-
-    iget v5, p0, Ln0/g0/g/f;->h:I
-
-    iget-boolean v6, p0, Ln0/g0/g/f;->i:Z
-
-    invoke-interface {v0, v3, v4, v5, v6}, Ln0/g0/g/p;->d(ILo0/g;IZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v3, p0, Ln0/g0/g/f;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    iget v4, p0, Ln0/g0/g/f;->f:I
-
-    sget-object v5, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    invoke-virtual {v3, v4, v5}, Ln0/g0/g/m;->g(ILn0/g0/g/a;)V
-
-    :cond_0
-    if-nez v0, :cond_1
-
-    iget-boolean v0, p0, Ln0/g0/g/f;->i:Z
-
-    if-eqz v0, :cond_2
-
-    :cond_1
-    iget-object v0, p0, Ln0/g0/g/f;->e:Ln0/g0/g/e;
-
-    monitor-enter v0
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v3, p0, Ln0/g0/g/f;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->x:Ljava/util/Set;
-
-    iget v4, p0, Ln0/g0/g/f;->f:I
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    monitor-exit v0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v3
-
-    monitor-exit v0
-
-    throw v3
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-
-    :catch_0
-    :cond_2
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/g.smali b/com.discord/smali_classes2/n0/g0/g/g.smali
deleted file mode 100644
index 8655da9b9f..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/g.smali
+++ /dev/null
@@ -1,149 +0,0 @@
-.class public final Ln0/g0/g/g;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e;
-
-.field public final synthetic f:I
-
-.field public final synthetic g:Ljava/util/List;
-
-.field public final synthetic h:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e;ILjava/util/List;Z)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/g;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/g;->e:Ln0/g0/g/e;
-
-    iput p3, p0, Ln0/g0/g/g;->f:I
-
-    iput-object p4, p0, Ln0/g0/g/g;->g:Ljava/util/List;
-
-    iput-boolean p5, p0, Ln0/g0/g/g;->h:Z
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 6
-
-    iget-object v0, p0, Ln0/g0/g/g;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/g;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->m:Ln0/g0/g/p;
-
-    iget v3, p0, Ln0/g0/g/g;->f:I
-
-    iget-object v4, p0, Ln0/g0/g/g;->g:Ljava/util/List;
-
-    iget-boolean v5, p0, Ln0/g0/g/g;->h:Z
-
-    invoke-interface {v0, v3, v4, v5}, Ln0/g0/g/p;->b(ILjava/util/List;Z)Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v0, :cond_0
-
-    :try_start_1
-    iget-object v3, p0, Ln0/g0/g/g;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    iget v4, p0, Ln0/g0/g/g;->f:I
-
-    sget-object v5, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    invoke-virtual {v3, v4, v5}, Ln0/g0/g/m;->g(ILn0/g0/g/a;)V
-
-    :cond_0
-    if-nez v0, :cond_1
-
-    iget-boolean v0, p0, Ln0/g0/g/g;->h:Z
-
-    if-eqz v0, :cond_2
-
-    :cond_1
-    iget-object v0, p0, Ln0/g0/g/g;->e:Ln0/g0/g/e;
-
-    monitor-enter v0
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :try_start_2
-    iget-object v3, p0, Ln0/g0/g/g;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->x:Ljava/util/Set;
-
-    iget v4, p0, Ln0/g0/g/g;->f:I
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :try_start_3
-    monitor-exit v0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v3
-
-    monitor-exit v0
-
-    throw v3
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :catch_0
-    :cond_2
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/h.smali b/com.discord/smali_classes2/n0/g0/g/h.smali
deleted file mode 100644
index 23b4f6970a..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/h.smali
+++ /dev/null
@@ -1,135 +0,0 @@
-.class public final Ln0/g0/g/h;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e;
-
-.field public final synthetic f:I
-
-.field public final synthetic g:Ljava/util/List;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e;ILjava/util/List;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/h;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/h;->e:Ln0/g0/g/e;
-
-    iput p3, p0, Ln0/g0/g/h;->f:I
-
-    iput-object p4, p0, Ln0/g0/g/h;->g:Ljava/util/List;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/g/h;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/h;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->m:Ln0/g0/g/p;
-
-    iget v3, p0, Ln0/g0/g/h;->f:I
-
-    iget-object v4, p0, Ln0/g0/g/h;->g:Ljava/util/List;
-
-    invoke-interface {v0, v3, v4}, Ln0/g0/g/p;->a(ILjava/util/List;)Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v0, :cond_0
-
-    :try_start_1
-    iget-object v0, p0, Ln0/g0/g/h;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    iget v3, p0, Ln0/g0/g/h;->f:I
-
-    sget-object v4, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    invoke-virtual {v0, v3, v4}, Ln0/g0/g/m;->g(ILn0/g0/g/a;)V
-
-    iget-object v0, p0, Ln0/g0/g/h;->e:Ln0/g0/g/e;
-
-    monitor-enter v0
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :try_start_2
-    iget-object v3, p0, Ln0/g0/g/h;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->x:Ljava/util/Set;
-
-    iget v4, p0, Ln0/g0/g/h;->f:I
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :try_start_3
-    monitor-exit v0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v3
-
-    monitor-exit v0
-
-    throw v3
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :catch_0
-    :cond_0
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/i.smali b/com.discord/smali_classes2/n0/g0/g/i.smali
deleted file mode 100644
index b4807bb72a..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/i.smali
+++ /dev/null
@@ -1,114 +0,0 @@
-.class public final Ln0/g0/g/i;
-.super Ljava/lang/Object;
-.source "Util.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/String;
-
-.field public final synthetic e:Ln0/g0/g/e;
-
-.field public final synthetic f:I
-
-.field public final synthetic g:Ln0/g0/g/a;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Ln0/g0/g/e;ILn0/g0/g/a;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/g/i;->d:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/g0/g/i;->e:Ln0/g0/g/e;
-
-    iput p3, p0, Ln0/g0/g/i;->f:I
-
-    iput-object p4, p0, Ln0/g0/g/i;->g:Ln0/g0/g/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/g/i;->d:Ljava/lang/String;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/i;->e:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->m:Ln0/g0/g/p;
-
-    iget v3, p0, Ln0/g0/g/i;->f:I
-
-    iget-object v4, p0, Ln0/g0/g/i;->g:Ln0/g0/g/a;
-
-    invoke-interface {v0, v3, v4}, Ln0/g0/g/p;->c(ILn0/g0/g/a;)V
-
-    iget-object v0, p0, Ln0/g0/g/i;->e:Ln0/g0/g/e;
-
-    monitor-enter v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v3, p0, Ln0/g0/g/i;->e:Ln0/g0/g/e;
-
-    iget-object v3, v3, Ln0/g0/g/e;->x:Ljava/util/Set;
-
-    iget v4, p0, Ln0/g0/g/i;->f:I
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    monitor-exit v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v3
-
-    :try_start_3
-    monitor-exit v0
-
-    throw v3
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/j.smali b/com.discord/smali_classes2/n0/g0/g/j.smali
deleted file mode 100644
index fff096d2e6..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/j.smali
+++ /dev/null
@@ -1,983 +0,0 @@
-.class public final Ln0/g0/g/j;
-.super Ljava/lang/Object;
-.source "Http2ExchangeCodec.kt"
-
-# interfaces
-.implements Ln0/g0/e/d;
-
-
-# static fields
-.field public static final g:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final h:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public volatile a:Ln0/g0/g/l;
-
-.field public final b:Ln0/y;
-
-.field public volatile c:Z
-
-.field public final d:Ln0/g0/d/i;
-
-.field public final e:Lokhttp3/Interceptor$Chain;
-
-.field public final f:Ln0/g0/g/e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 12
-
-    const-string v0, "connection"
-
-    const-string v1, "host"
-
-    const-string v2, "keep-alive"
-
-    const-string v3, "proxy-connection"
-
-    const-string v4, "te"
-
-    const-string v5, "transfer-encoding"
-
-    const-string v6, "encoding"
-
-    const-string v7, "upgrade"
-
-    const-string v8, ":method"
-
-    const-string v9, ":path"
-
-    const-string v10, ":scheme"
-
-    const-string v11, ":authority"
-
-    filled-new-array/range {v0 .. v11}, [Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ln0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/j;->g:Ljava/util/List;
-
-    const-string v1, "connection"
-
-    const-string v2, "host"
-
-    const-string v3, "keep-alive"
-
-    const-string v4, "proxy-connection"
-
-    const-string v5, "te"
-
-    const-string v6, "transfer-encoding"
-
-    const-string v7, "encoding"
-
-    const-string v8, "upgrade"
-
-    filled-new-array/range {v1 .. v8}, [Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ln0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/j;->h:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ln0/x;Ln0/g0/d/i;Lokhttp3/Interceptor$Chain;Ln0/g0/g/e;)V
-    .locals 1
-
-    sget-object v0, Ln0/y;->h:Ln0/y;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p2, p0, Ln0/g0/g/j;->d:Ln0/g0/d/i;
-
-    iput-object p3, p0, Ln0/g0/g/j;->e:Lokhttp3/Interceptor$Chain;
-
-    iput-object p4, p0, Ln0/g0/g/j;->f:Ln0/g0/g/e;
-
-    iget-object p1, p1, Ln0/x;->w:Ljava/util/List;
-
-    invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Ln0/y;->g:Ln0/y;
-
-    :goto_0
-    iput-object v0, p0, Ln0/g0/g/j;->b:Ln0/y;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Ln0/g0/d/i;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/g/j;->d:Ln0/g0/d/i;
-
-    return-object v0
-.end method
-
-.method public b()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/g/l;->g()Lo0/u;
-
-    move-result-object v0
-
-    check-cast v0, Ln0/g0/g/l$a;
-
-    invoke-virtual {v0}, Ln0/g0/g/l$a;->close()V
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public c(Ln0/a0;)V
-    .locals 17
-
-    move-object/from16 v1, p0
-
-    move-object/from16 v0, p1
-
-    iget-object v2, v1, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-eqz v2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v2, v0, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-eqz v2, :cond_1
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_0
-    iget-object v5, v0, Ln0/a0;->d:Lokhttp3/Headers;
-
-    new-instance v6, Ljava/util/ArrayList;
-
-    invoke-virtual {v5}, Lokhttp3/Headers;->size()I
-
-    move-result v7
-
-    add-int/lit8 v7, v7, 0x4
-
-    invoke-direct {v6, v7}, Ljava/util/ArrayList;-><init>(I)V
-
-    new-instance v7, Ln0/g0/g/b;
-
-    sget-object v8, Ln0/g0/g/b;->f:Lokio/ByteString;
-
-    iget-object v9, v0, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-direct {v7, v8, v9}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    invoke-virtual {v6, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    new-instance v7, Ln0/g0/g/b;
-
-    sget-object v8, Ln0/g0/g/b;->g:Lokio/ByteString;
-
-    iget-object v9, v0, Ln0/a0;->b:Ln0/w;
-
-    const/4 v10, 0x0
-
-    if-eqz v9, :cond_12
-
-    invoke-virtual {v9}, Ln0/w;->b()Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-virtual {v9}, Ln0/w;->d()Ljava/lang/String;
-
-    move-result-object v9
-
-    if-eqz v9, :cond_2
-
-    new-instance v12, Ljava/lang/StringBuilder;
-
-    invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v12, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v11, 0x3f
-
-    invoke-virtual {v12, v11}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v11
-
-    :cond_2
-    invoke-direct {v7, v8, v11}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    invoke-virtual {v6, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    const-string v7, "Host"
-
-    invoke-virtual {v0, v7}, Ln0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_3
-
-    new-instance v8, Ln0/g0/g/b;
-
-    sget-object v9, Ln0/g0/g/b;->i:Lokio/ByteString;
-
-    invoke-direct {v8, v9, v7}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    invoke-virtual {v6, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_3
-    new-instance v7, Ln0/g0/g/b;
-
-    sget-object v8, Ln0/g0/g/b;->h:Lokio/ByteString;
-
-    iget-object v0, v0, Ln0/a0;->b:Ln0/w;
-
-    iget-object v0, v0, Ln0/w;->b:Ljava/lang/String;
-
-    invoke-direct {v7, v8, v0}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
-
-    invoke-virtual {v6, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    invoke-virtual {v5}, Lokhttp3/Headers;->size()I
-
-    move-result v0
-
-    const/4 v7, 0x0
-
-    :goto_1
-    if-ge v7, v0, :cond_7
-
-    invoke-virtual {v5, v7}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    sget-object v9, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const-string v11, "Locale.US"
-
-    invoke-static {v9, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    if-eqz v8, :cond_6
-
-    invoke-virtual {v8, v9}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object v8
-
-    const-string v9, "(this as java.lang.String).toLowerCase(locale)"
-
-    invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v9, Ln0/g0/g/j;->g:Ljava/util/List;
-
-    invoke-interface {v9, v8}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_4
-
-    const-string v9, "te"
-
-    invoke-static {v8, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v5, v7}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v9
-
-    const-string v11, "trailers"
-
-    invoke-static {v9, v11}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    :cond_4
-    new-instance v9, Ln0/g0/g/b;
-
-    invoke-virtual {v5, v7}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-direct {v9, v8, v11}, Ln0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-virtual {v6, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :cond_5
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_1
-
-    :cond_6
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v2, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    iget-object v5, v1, Ln0/g0/g/j;->f:Ln0/g0/g/e;
-
-    xor-int/lit8 v0, v2, 0x1
-
-    const/4 v15, 0x0
-
-    iget-object v7, v5, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    monitor-enter v7
-
-    :try_start_0
-    monitor-enter v5
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget v8, v5, Ln0/g0/g/e;->i:I
-
-    const v9, 0x3fffffff    # 1.9999999f
-
-    if-le v8, v9, :cond_8
-
-    sget-object v8, Ln0/g0/g/a;->h:Ln0/g0/g/a;
-
-    invoke-virtual {v5, v8}, Ln0/g0/g/e;->f(Ln0/g0/g/a;)V
-
-    :cond_8
-    iget-boolean v8, v5, Ln0/g0/g/e;->j:Z
-
-    if-nez v8, :cond_11
-
-    iget v8, v5, Ln0/g0/g/e;->i:I
-
-    iget v9, v5, Ln0/g0/g/e;->i:I
-
-    add-int/lit8 v9, v9, 0x2
-
-    iput v9, v5, Ln0/g0/g/e;->i:I
-
-    new-instance v9, Ln0/g0/g/l;
-
-    const/16 v16, 0x0
-
-    move-object v11, v9
-
-    move v12, v8
-
-    move-object v13, v5
-
-    move v14, v0
-
-    invoke-direct/range {v11 .. v16}, Ln0/g0/g/l;-><init>(ILn0/g0/g/e;ZZLokhttp3/Headers;)V
-
-    if-eqz v2, :cond_9
-
-    iget-wide v11, v5, Ln0/g0/g/e;->s:J
-
-    iget-wide v13, v5, Ln0/g0/g/e;->t:J
-
-    cmp-long v2, v11, v13
-
-    if-gez v2, :cond_9
-
-    iget-wide v11, v9, Ln0/g0/g/l;->c:J
-
-    iget-wide v13, v9, Ln0/g0/g/l;->d:J
-
-    cmp-long v2, v11, v13
-
-    if-ltz v2, :cond_a
-
-    :cond_9
-    const/4 v3, 0x1
-
-    :cond_a
-    invoke-virtual {v9}, Ln0/g0/g/l;->i()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_b
-
-    iget-object v2, v5, Ln0/g0/g/e;->f:Ljava/util/Map;
-
-    invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-interface {v2, v4, v9}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :cond_b
-    :try_start_2
-    monitor-exit v5
-
-    iget-object v2, v5, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {v2, v0, v8, v6}, Ln0/g0/g/m;->e(ZILjava/util/List;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    monitor-exit v7
-
-    if-eqz v3, :cond_c
-
-    iget-object v0, v5, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {v0}, Ln0/g0/g/m;->flush()V
-
-    :cond_c
-    iput-object v9, v1, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    iget-boolean v0, v1, Ln0/g0/g/j;->c:Z
-
-    if-eqz v0, :cond_e
-
-    iget-object v0, v1, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-nez v0, :cond_d
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v10
-
-    :cond_d
-    sget-object v2, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    invoke-virtual {v0, v2}, Ln0/g0/g/l;->e(Ln0/g0/g/a;)V
-
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v2, "Canceled"
-
-    invoke-direct {v0, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
-    iget-object v0, v1, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-eqz v0, :cond_10
-
-    iget-object v0, v0, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    iget-object v2, v1, Ln0/g0/g/j;->e:Lokhttp3/Interceptor$Chain;
-
-    invoke-interface {v2}, Lokhttp3/Interceptor$Chain;->b()I
-
-    move-result v2
-
-    int-to-long v2, v2
-
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v2, v3, v4}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    iget-object v0, v1, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-eqz v0, :cond_f
-
-    iget-object v0, v0, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    iget-object v2, v1, Ln0/g0/g/j;->e:Lokhttp3/Interceptor$Chain;
-
-    invoke-interface {v2}, Lokhttp3/Interceptor$Chain;->c()I
-
-    move-result v2
-
-    int-to-long v2, v2
-
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v2, v3, v4}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    return-void
-
-    :cond_f
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v10
-
-    :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v10
-
-    :cond_11
-    :try_start_3
-    new-instance v0, Lokhttp3/internal/http2/ConnectionShutdownException;
-
-    invoke-direct {v0}, Lokhttp3/internal/http2/ConnectionShutdownException;-><init>()V
-
-    throw v0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_4
-    monitor-exit v5
-
-    throw v0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit v7
-
-    throw v0
-
-    :cond_12
-    const-string v0, "url"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v10
-.end method
-
-.method public cancel()V
-    .locals 2
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/g/j;->c:Z
-
-    iget-object v0, p0, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-eqz v0, :cond_0
-
-    sget-object v1, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    invoke-virtual {v0, v1}, Ln0/g0/g/l;->e(Ln0/g0/g/a;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public d(Lokhttp3/Response;)Lo0/w;
-    .locals 0
-
-    iget-object p1, p0, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p1, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public e(Z)Lokhttp3/Response$a;
-    .locals 11
-
-    iget-object v0, p0, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_d
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v2, v0, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    invoke-virtual {v2}, Lo0/b;->i()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :goto_0
-    :try_start_1
-    iget-object v2, v0, Ln0/g0/g/l;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v2}, Ljava/util/ArrayDeque;->isEmpty()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iget-object v2, v0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-
-    if-nez v2, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/g/l;->l()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_2
-    iget-object v2, v0, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    invoke-virtual {v2}, Ln0/g0/g/l$c;->o()V
-
-    iget-object v2, v0, Ln0/g0/g/l;->e:Ljava/util/ArrayDeque;
-
-    invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v2
-
-    xor-int/lit8 v2, v2, 0x1
-
-    if-eqz v2, :cond_a
-
-    iget-object v2, v0, Ln0/g0/g/l;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v2}, Ljava/util/ArrayDeque;->removeFirst()Ljava/lang/Object;
-
-    move-result-object v2
-
-    const-string v3, "headersQueue.removeFirst()"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v2, Lokhttp3/Headers;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    monitor-exit v0
-
-    iget-object v0, p0, Ln0/g0/g/j;->b:Ln0/y;
-
-    if-eqz v0, :cond_9
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    const/16 v4, 0x14
-
-    invoke-direct {v3, v4}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v2}, Lokhttp3/Headers;->size()I
-
-    move-result v4
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    move-object v7, v1
-
-    :goto_1
-    if-ge v6, v4, :cond_5
-
-    invoke-virtual {v2, v6}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v2, v6}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
-
-    move-result-object v9
-
-    const-string v10, ":status"
-
-    invoke-static {v8, v10}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_1
-
-    new-instance v7, Ljava/lang/StringBuilder;
-
-    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v8, "HTTP/1.1 "
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-static {v7}, Ln0/g0/e/j;->a(Ljava/lang/String;)Ln0/g0/e/j;
-
-    move-result-object v7
-
-    goto :goto_2
-
-    :cond_1
-    sget-object v10, Ln0/g0/g/j;->h:Ljava/util/List;
-
-    invoke-interface {v10, v8}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result v10
-
-    if-nez v10, :cond_4
-
-    if-eqz v8, :cond_3
-
-    if-eqz v9, :cond_2
-
-    invoke-virtual {v3, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    invoke-static {v9}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-
-    move-result-object v8
-
-    invoke-virtual {v8}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v3, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_2
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    :goto_2
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    if-eqz v7, :cond_8
-
-    new-instance v2, Lokhttp3/Response$a;
-
-    invoke-direct {v2}, Lokhttp3/Response$a;-><init>()V
-
-    iput-object v0, v2, Lokhttp3/Response$a;->b:Ln0/y;
-
-    iget v0, v7, Ln0/g0/e/j;->b:I
-
-    iput v0, v2, Lokhttp3/Response$a;->c:I
-
-    iget-object v0, v7, Ln0/g0/e/j;->c:Ljava/lang/String;
-
-    invoke-virtual {v2, v0}, Lokhttp3/Response$a;->e(Ljava/lang/String;)Lokhttp3/Response$a;
-
-    new-array v0, v5, [Ljava/lang/String;
-
-    invoke-virtual {v3, v0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_7
-
-    check-cast v0, [Ljava/lang/String;
-
-    new-instance v3, Lokhttp3/Headers;
-
-    invoke-direct {v3, v0, v1}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
-
-    if-eqz p1, :cond_6
-
-    iget p1, v2, Lokhttp3/Response$a;->c:I
-
-    const/16 v0, 0x64
-
-    if-ne p1, v0, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    move-object v1, v2
-
-    :goto_3
-    return-object v1
-
-    :cond_7
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    new-instance p1, Ljava/net/ProtocolException;
-
-    const-string v0, "Expected \':status\' header not present"
-
-    invoke-direct {p1, v0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_9
-    const-string p1, "protocol"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_a
-    :try_start_3
-    iget-object p1, v0, Ln0/g0/g/l;->l:Ljava/io/IOException;
-
-    if-nez p1, :cond_c
-
-    new-instance p1, Lokhttp3/internal/http2/StreamResetException;
-
-    iget-object v2, v0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-
-    if-nez v2, :cond_b
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    throw v1
-
-    :cond_b
-    :try_start_4
-    invoke-direct {p1, v2}, Lokhttp3/internal/http2/StreamResetException;-><init>(Ln0/g0/g/a;)V
-
-    :cond_c
-    throw p1
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v1, v0, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    invoke-virtual {v1}, Ln0/g0/g/l$c;->o()V
-
-    throw p1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_d
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public f()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/g/j;->f:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {v0}, Ln0/g0/g/m;->flush()V
-
-    return-void
-.end method
-
-.method public g(Lokhttp3/Response;)J
-    .locals 2
-
-    invoke-static {p1}, Ln0/g0/b;->n(Lokhttp3/Response;)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public h(Ln0/a0;J)Lo0/u;
-    .locals 0
-
-    iget-object p1, p0, Ln0/g0/g/j;->a:Ln0/g0/g/l;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Ln0/g0/g/l;->g()Lo0/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/k$a.smali b/com.discord/smali_classes2/n0/g0/g/k$a.smali
deleted file mode 100644
index 16ee996dcc..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/k$a.smali
+++ /dev/null
@@ -1,261 +0,0 @@
-.class public final Ln0/g0/g/k$a;
-.super Ljava/lang/Object;
-.source "Http2Reader.kt"
-
-# interfaces
-.implements Lo0/w;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public e:I
-
-.field public f:I
-
-.field public g:I
-
-.field public h:I
-
-.field public final i:Lo0/g;
-
-
-# direct methods
-.method public constructor <init>(Lo0/g;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_6
-
-    :goto_0
-    iget v0, p0, Ln0/g0/g/k$a;->g:I
-
-    const-wide/16 v1, -0x1
-
-    if-nez v0, :cond_4
-
-    iget-object v0, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    iget v3, p0, Ln0/g0/g/k$a;->h:I
-
-    int-to-long v3, v3
-
-    invoke-interface {v0, v3, v4}, Lo0/g;->skip(J)V
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Ln0/g0/g/k$a;->h:I
-
-    iget v0, p0, Ln0/g0/g/k$a;->e:I
-
-    and-int/lit8 v0, v0, 0x4
-
-    if-eqz v0, :cond_0
-
-    return-wide v1
-
-    :cond_0
-    iget v0, p0, Ln0/g0/g/k$a;->f:I
-
-    iget-object v1, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    invoke-static {v1}, Ln0/g0/b;->y(Lo0/g;)I
-
-    move-result v1
-
-    iput v1, p0, Ln0/g0/g/k$a;->g:I
-
-    iput v1, p0, Ln0/g0/g/k$a;->d:I
-
-    iget-object v1, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    invoke-interface {v1}, Lo0/g;->readByte()B
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    iget-object v2, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    invoke-interface {v2}, Lo0/g;->readByte()B
-
-    move-result v2
-
-    and-int/lit16 v2, v2, 0xff
-
-    iput v2, p0, Ln0/g0/g/k$a;->e:I
-
-    sget-object v2, Ln0/g0/g/k;->i:Ln0/g0/g/k;
-
-    sget-object v2, Ln0/g0/g/k;->h:Ljava/util/logging/Logger;
-
-    sget-object v3, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
-
-    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    sget-object v2, Ln0/g0/g/k;->i:Ln0/g0/g/k;
-
-    sget-object v8, Ln0/g0/g/k;->h:Ljava/util/logging/Logger;
-
-    sget-object v2, Ln0/g0/g/d;->e:Ln0/g0/g/d;
-
-    const/4 v3, 0x1
-
-    iget v4, p0, Ln0/g0/g/k$a;->f:I
-
-    iget v5, p0, Ln0/g0/g/k$a;->d:I
-
-    iget v7, p0, Ln0/g0/g/k$a;->e:I
-
-    move v6, v1
-
-    invoke-virtual/range {v2 .. v7}, Ln0/g0/g/d;->a(ZIIII)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v8, v2}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
-
-    :cond_1
-    iget-object v2, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    invoke-interface {v2}, Lo0/g;->readInt()I
-
-    move-result v2
-
-    const v3, 0x7fffffff
-
-    and-int/2addr v2, v3
-
-    iput v2, p0, Ln0/g0/g/k$a;->f:I
-
-    const/16 v3, 0x9
-
-    if-ne v1, v3, :cond_3
-
-    if-ne v2, v0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_CONTINUATION streamId changed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/io/IOException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string p3, " != TYPE_CONTINUATION"
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    iget-object v3, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    int-to-long v4, v0
-
-    invoke-static {p2, p3, v4, v5}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide p2
-
-    invoke-interface {v3, p1, p2, p3}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-
-    cmp-long p3, p1, v1
-
-    if-nez p3, :cond_5
-
-    return-wide v1
-
-    :cond_5
-    iget p3, p0, Ln0/g0/g/k$a;->g:I
-
-    long-to-int v0, p1
-
-    sub-int/2addr p3, v0
-
-    iput p3, p0, Ln0/g0/g/k$a;->g:I
-
-    return-wide p1
-
-    :cond_6
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public close()V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/g/k$a;->i:Lo0/g;
-
-    invoke-interface {v0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/k$b.smali b/com.discord/smali_classes2/n0/g0/g/k$b.smali
deleted file mode 100644
index 1ac6922ea9..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/k$b.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class public interface abstract Ln0/g0/g/k$b;
-.super Ljava/lang/Object;
-.source "Http2Reader.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "b"
-.end annotation
-
-
-# virtual methods
-.method public abstract a()V
-.end method
-
-.method public abstract b(ZLn0/g0/g/q;)V
-.end method
-
-.method public abstract c(ZIILjava/util/List;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZII",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)V"
-        }
-    .end annotation
-.end method
-
-.method public abstract d(IJ)V
-.end method
-
-.method public abstract e(ZILo0/g;I)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract f(ZII)V
-.end method
-
-.method public abstract g(IIIZ)V
-.end method
-
-.method public abstract h(ILn0/g0/g/a;)V
-.end method
-
-.method public abstract i(IILjava/util/List;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(II",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract j(ILn0/g0/g/a;Lokio/ByteString;)V
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/k.smali b/com.discord/smali_classes2/n0/g0/g/k.smali
deleted file mode 100644
index 1beff1246b..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/k.smali
+++ /dev/null
@@ -1,1561 +0,0 @@
-.class public final Ln0/g0/g/k;
-.super Ljava/lang/Object;
-.source "Http2Reader.kt"
-
-# interfaces
-.implements Ljava/io/Closeable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/g/k$a;,
-        Ln0/g0/g/k$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final h:Ljava/util/logging/Logger;
-
-.field public static final i:Ln0/g0/g/k;
-
-
-# instance fields
-.field public final d:Ln0/g0/g/k$a;
-
-.field public final e:Ln0/g0/g/c$a;
-
-.field public final f:Lo0/g;
-
-.field public final g:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Ln0/g0/g/d;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
-
-    move-result-object v0
-
-    const-string v1, "Logger.getLogger(Http2::class.java.name)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sput-object v0, Ln0/g0/g/k;->h:Ljava/util/logging/Logger;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lo0/g;Z)V
-    .locals 3
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    iput-boolean p2, p0, Ln0/g0/g/k;->g:Z
-
-    new-instance p2, Ln0/g0/g/k$a;
-
-    invoke-direct {p2, p1}, Ln0/g0/g/k$a;-><init>(Lo0/g;)V
-
-    iput-object p2, p0, Ln0/g0/g/k;->d:Ln0/g0/g/k$a;
-
-    new-instance p1, Ln0/g0/g/c$a;
-
-    const/16 v0, 0x1000
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x4
-
-    invoke-direct {p1, p2, v0, v1, v2}, Ln0/g0/g/c$a;-><init>(Lo0/w;III)V
-
-    iput-object p1, p0, Ln0/g0/g/k;->e:Ln0/g0/g/c$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(ZLn0/g0/g/k$b;)Z
-    .locals 13
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    const-wide/16 v2, 0x9
-
-    invoke-interface {v1, v2, v3}, Lo0/g;->P0(J)V
-    :try_end_0
-    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
-
-    iget-object v1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-static {v1}, Ln0/g0/b;->y(Lo0/g;)I
-
-    move-result v1
-
-    const/16 v2, 0x4000
-
-    if-gt v1, v2, :cond_36
-
-    iget-object v2, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v2}, Lo0/g;->readByte()B
-
-    move-result v2
-
-    and-int/lit16 v8, v2, 0xff
-
-    const/4 v9, 0x4
-
-    if-eqz p1, :cond_1
-
-    if-ne v8, v9, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "Expected a SETTINGS frame but was "
-
-    invoke-static {p2, v8}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {p1}, Lo0/g;->readByte()B
-
-    move-result p1
-
-    and-int/lit16 p1, p1, 0xff
-
-    iget-object v2, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v2}, Lo0/g;->readInt()I
-
-    move-result v2
-
-    const v10, 0x7fffffff
-
-    and-int v11, v2, v10
-
-    sget-object v2, Ln0/g0/g/k;->h:Ljava/util/logging/Logger;
-
-    sget-object v3, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
-
-    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    sget-object v12, Ln0/g0/g/k;->h:Ljava/util/logging/Logger;
-
-    sget-object v2, Ln0/g0/g/d;->e:Ln0/g0/g/d;
-
-    const/4 v3, 0x1
-
-    move v4, v11
-
-    move v5, v1
-
-    move v6, v8
-
-    move v7, p1
-
-    invoke-virtual/range {v2 .. v7}, Ln0/g0/g/d;->a(ZIIII)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v12, v2}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
-
-    :cond_2
-    const/4 v2, 0x5
-
-    const-string v3, " > remaining length "
-
-    const-string v4, "PROTOCOL_ERROR padding "
-
-    const/4 v5, 0x0
-
-    const/16 v6, 0x8
-
-    const/4 v7, 0x1
-
-    packed-switch v8, :pswitch_data_0
-
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    int-to-long v0, v1
-
-    invoke-interface {p1, v0, v1}, Lo0/g;->skip(J)V
-
-    goto/16 :goto_c
-
-    :pswitch_0
-    if-ne v1, v9, :cond_4
-
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {p1}, Lo0/g;->readInt()I
-
-    move-result p1
-
-    const-wide/32 v0, 0x7fffffff
-
-    int-to-long v2, p1
-
-    and-long/2addr v0, v2
-
-    const-wide/16 v2, 0x0
-
-    cmp-long p1, v0, v2
-
-    if-eqz p1, :cond_3
-
-    invoke-interface {p2, v11, v0, v1}, Ln0/g0/g/k$b;->d(IJ)V
-
-    goto/16 :goto_c
-
-    :cond_3
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "windowSizeIncrement was 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_WINDOW_UPDATE length !=4: "
-
-    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_1
-    if-lt v1, v6, :cond_b
-
-    if-nez v11, :cond_a
-
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {p1}, Lo0/g;->readInt()I
-
-    move-result p1
-
-    iget-object v0, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readInt()I
-
-    move-result v0
-
-    sub-int/2addr v1, v6
-
-    invoke-static {}, Ln0/g0/g/a;->values()[Ln0/g0/g/a;
-
-    move-result-object v2
-
-    array-length v3, v2
-
-    const/4 v4, 0x0
-
-    :goto_1
-    if-ge v4, v3, :cond_7
-
-    aget-object v6, v2, v4
-
-    iget v8, v6, Ln0/g0/g/a;->httpCode:I
-
-    if-ne v8, v0, :cond_5
-
-    const/4 v8, 0x1
-
-    goto :goto_2
-
-    :cond_5
-    const/4 v8, 0x0
-
-    :goto_2
-    if-eqz v8, :cond_6
-
-    move-object v5, v6
-
-    goto :goto_3
-
-    :cond_6
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
-
-    :cond_7
-    :goto_3
-    if-eqz v5, :cond_9
-
-    sget-object v0, Lokio/ByteString;->f:Lokio/ByteString;
-
-    if-lez v1, :cond_8
-
-    iget-object v0, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    int-to-long v1, v1
-
-    invoke-interface {v0, v1, v2}, Lo0/g;->u(J)Lokio/ByteString;
-
-    move-result-object v0
-
-    :cond_8
-    invoke-interface {p2, p1, v5, v0}, Ln0/g0/g/k$b;->j(ILn0/g0/g/a;Lokio/ByteString;)V
-
-    goto/16 :goto_c
-
-    :cond_9
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_GOAWAY unexpected error code: "
-
-    invoke-static {p2, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_a
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_GOAWAY streamId != 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_b
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_GOAWAY length < 8: "
-
-    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_2
-    if-ne v1, v6, :cond_e
-
-    if-nez v11, :cond_d
-
-    iget-object v1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v1}, Lo0/g;->readInt()I
-
-    move-result v1
-
-    iget-object v2, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v2}, Lo0/g;->readInt()I
-
-    move-result v2
-
-    and-int/lit8 p1, p1, 0x1
-
-    if-eqz p1, :cond_c
-
-    const/4 v0, 0x1
-
-    :cond_c
-    invoke-interface {p2, v0, v1, v2}, Ln0/g0/g/k$b;->f(ZII)V
-
-    goto/16 :goto_c
-
-    :cond_d
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_PING streamId != 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_e
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_PING length != 8: "
-
-    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_3
-    if-eqz v11, :cond_12
-
-    and-int/lit8 v2, p1, 0x8
-
-    if-eqz v2, :cond_f
-
-    iget-object v0, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    :cond_f
-    iget-object v5, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v5}, Lo0/g;->readInt()I
-
-    move-result v5
-
-    and-int/2addr v5, v10
-
-    add-int/lit8 v1, v1, -0x4
-
-    if-eqz v2, :cond_10
-
-    add-int/lit8 v1, v1, -0x1
-
-    :cond_10
-    if-gt v0, v1, :cond_11
-
-    sub-int/2addr v1, v0
-
-    invoke-virtual {p0, v1, v0, p1, v11}, Ln0/g0/g/k;->c(IIII)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-interface {p2, v11, v5, p1}, Ln0/g0/g/k$b;->i(IILjava/util/List;)V
-
-    goto/16 :goto_c
-
-    :cond_11
-    new-instance p1, Ljava/io/IOException;
-
-    invoke-static {v4, v0, v3, v1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_12
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "PROTOCOL_ERROR: TYPE_PUSH_PROMISE streamId == 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_4
-    if-nez v11, :cond_20
-
-    and-int/lit8 p1, p1, 0x1
-
-    if-eqz p1, :cond_14
-
-    if-nez v1, :cond_13
-
-    invoke-interface {p2}, Ln0/g0/g/k$b;->a()V
-
-    goto/16 :goto_c
-
-    :cond_13
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "FRAME_SIZE_ERROR ack frame should be empty!"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_14
-    rem-int/lit8 p1, v1, 0x6
-
-    if-nez p1, :cond_1f
-
-    new-instance p1, Ln0/g0/g/q;
-
-    invoke-direct {p1}, Ln0/g0/g/q;-><init>()V
-
-    invoke-static {v0, v1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v1
-
-    const/4 v3, 0x6
-
-    invoke-static {v1, v3}, Lj0/q/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
-
-    move-result-object v1
-
-    iget v3, v1, Lkotlin/ranges/IntProgression;->d:I
-
-    iget v4, v1, Lkotlin/ranges/IntProgression;->e:I
-
-    iget v1, v1, Lkotlin/ranges/IntProgression;->f:I
-
-    if-ltz v1, :cond_15
-
-    if-gt v3, v4, :cond_1e
-
-    goto :goto_4
-
-    :cond_15
-    if-lt v3, v4, :cond_1e
-
-    :goto_4
-    iget-object v5, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v5}, Lo0/g;->readShort()S
-
-    move-result v5
-
-    const v6, 0xffff
-
-    and-int/2addr v5, v6
-
-    iget-object v6, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v6}, Lo0/g;->readInt()I
-
-    move-result v6
-
-    const/4 v8, 0x2
-
-    if-eq v5, v8, :cond_1b
-
-    const/4 v8, 0x3
-
-    if-eq v5, v8, :cond_1a
-
-    if-eq v5, v9, :cond_18
-
-    const/16 v8, 0x4000
-
-    if-eq v5, v2, :cond_16
-
-    goto :goto_5
-
-    :cond_16
-    if-lt v6, v8, :cond_17
-
-    const v8, 0xffffff
-
-    if-gt v6, v8, :cond_17
-
-    goto :goto_5
-
-    :cond_17
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "PROTOCOL_ERROR SETTINGS_MAX_FRAME_SIZE: "
-
-    invoke-static {p2, v6}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_18
-    const/4 v5, 0x7
-
-    if-ltz v6, :cond_19
-
-    goto :goto_5
-
-    :cond_19
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "PROTOCOL_ERROR SETTINGS_INITIAL_WINDOW_SIZE > 2^31 - 1"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1a
-    const/4 v5, 0x4
-
-    goto :goto_5
-
-    :cond_1b
-    if-eqz v6, :cond_1d
-
-    if-ne v6, v7, :cond_1c
-
-    goto :goto_5
-
-    :cond_1c
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "PROTOCOL_ERROR SETTINGS_ENABLE_PUSH != 0 or 1"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1d
-    :goto_5
-    invoke-virtual {p1, v5, v6}, Ln0/g0/g/q;->b(II)Ln0/g0/g/q;
-
-    if-eq v3, v4, :cond_1e
-
-    add-int/2addr v3, v1
-
-    goto :goto_4
-
-    :cond_1e
-    invoke-interface {p2, v0, p1}, Ln0/g0/g/k$b;->b(ZLn0/g0/g/q;)V
-
-    goto/16 :goto_c
-
-    :cond_1f
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_SETTINGS length % 6 != 0: "
-
-    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_20
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_SETTINGS streamId != 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_5
-    if-ne v1, v9, :cond_26
-
-    if-eqz v11, :cond_25
-
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {p1}, Lo0/g;->readInt()I
-
-    move-result p1
-
-    invoke-static {}, Ln0/g0/g/a;->values()[Ln0/g0/g/a;
-
-    move-result-object v0
-
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    :goto_6
-    if-ge v2, v1, :cond_23
-
-    aget-object v3, v0, v2
-
-    iget v4, v3, Ln0/g0/g/a;->httpCode:I
-
-    if-ne v4, p1, :cond_21
-
-    const/4 v4, 0x1
-
-    goto :goto_7
-
-    :cond_21
-    const/4 v4, 0x0
-
-    :goto_7
-    if-eqz v4, :cond_22
-
-    move-object v5, v3
-
-    goto :goto_8
-
-    :cond_22
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_6
-
-    :cond_23
-    :goto_8
-    if-eqz v5, :cond_24
-
-    invoke-interface {p2, v11, v5}, Ln0/g0/g/k$b;->h(ILn0/g0/g/a;)V
-
-    goto/16 :goto_c
-
-    :cond_24
-    new-instance p2, Ljava/io/IOException;
-
-    const-string v0, "TYPE_RST_STREAM unexpected error code: "
-
-    invoke-static {v0, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_25
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_RST_STREAM streamId == 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_26
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_RST_STREAM length: "
-
-    const-string v0, " != 4"
-
-    invoke-static {p2, v1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_6
-    if-ne v1, v2, :cond_28
-
-    if-eqz v11, :cond_27
-
-    invoke-virtual {p0, p2, v11}, Ln0/g0/g/k;->d(Ln0/g0/g/k$b;I)V
-
-    goto/16 :goto_c
-
-    :cond_27
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_PRIORITY streamId == 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_28
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "TYPE_PRIORITY length: "
-
-    const-string v0, " != 5"
-
-    invoke-static {p2, v1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_7
-    if-eqz v11, :cond_2e
-
-    and-int/lit8 v2, p1, 0x1
-
-    if-eqz v2, :cond_29
-
-    const/4 v2, 0x1
-
-    goto :goto_9
-
-    :cond_29
-    const/4 v2, 0x0
-
-    :goto_9
-    and-int/lit8 v5, p1, 0x8
-
-    if-eqz v5, :cond_2a
-
-    iget-object v0, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    :cond_2a
-    and-int/lit8 v6, p1, 0x20
-
-    if-eqz v6, :cond_2b
-
-    invoke-virtual {p0, p2, v11}, Ln0/g0/g/k;->d(Ln0/g0/g/k$b;I)V
-
-    add-int/lit8 v1, v1, -0x5
-
-    :cond_2b
-    if-eqz v5, :cond_2c
-
-    add-int/lit8 v1, v1, -0x1
-
-    :cond_2c
-    if-gt v0, v1, :cond_2d
-
-    sub-int/2addr v1, v0
-
-    invoke-virtual {p0, v1, v0, p1, v11}, Ln0/g0/g/k;->c(IIII)Ljava/util/List;
-
-    move-result-object p1
-
-    const/4 v0, -0x1
-
-    invoke-interface {p2, v2, v11, v0, p1}, Ln0/g0/g/k$b;->c(ZIILjava/util/List;)V
-
-    goto :goto_c
-
-    :cond_2d
-    new-instance p1, Ljava/io/IOException;
-
-    invoke-static {v4, v0, v3, v1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2e
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "PROTOCOL_ERROR: TYPE_HEADERS streamId == 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :pswitch_8
-    if-eqz v11, :cond_35
-
-    and-int/lit8 v2, p1, 0x1
-
-    if-eqz v2, :cond_2f
-
-    const/4 v2, 0x1
-
-    goto :goto_a
-
-    :cond_2f
-    const/4 v2, 0x0
-
-    :goto_a
-    and-int/lit8 v5, p1, 0x20
-
-    if-eqz v5, :cond_30
-
-    const/4 v5, 0x1
-
-    goto :goto_b
-
-    :cond_30
-    const/4 v5, 0x0
-
-    :goto_b
-    if-nez v5, :cond_34
-
-    and-int/lit8 p1, p1, 0x8
-
-    if-eqz p1, :cond_31
-
-    iget-object v0, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    :cond_31
-    if-eqz p1, :cond_32
-
-    add-int/lit8 v1, v1, -0x1
-
-    :cond_32
-    if-gt v0, v1, :cond_33
-
-    sub-int/2addr v1, v0
-
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {p2, v2, v11, p1, v1}, Ln0/g0/g/k$b;->e(ZILo0/g;I)V
-
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    int-to-long v0, v0
-
-    invoke-interface {p1, v0, v1}, Lo0/g;->skip(J)V
-
-    goto :goto_c
-
-    :cond_33
-    new-instance p1, Ljava/io/IOException;
-
-    invoke-static {v4, v0, v3, v1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_34
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "PROTOCOL_ERROR: FLAG_COMPRESSED without SETTINGS_COMPRESS_DATA"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_35
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "PROTOCOL_ERROR: TYPE_DATA streamId == 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :goto_c
-    return v7
-
-    :cond_36
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "FRAME_SIZE_ERROR: "
-
-    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :catch_0
-    return v0
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public final b(Ln0/g0/g/k$b;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/g/k;->g:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0, v1, p1}, Ln0/g0/g/k;->a(ZLn0/g0/g/k$b;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/io/IOException;
-
-    const-string v0, "Required SETTINGS preface not received"
-
-    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    iget-object p1, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    sget-object v0, Ln0/g0/g/d;->a:Lokio/ByteString;
-
-    invoke-virtual {v0}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    int-to-long v2, v0
-
-    invoke-interface {p1, v2, v3}, Lo0/g;->u(J)Lokio/ByteString;
-
-    move-result-object p1
-
-    sget-object v0, Ln0/g0/g/k;->h:Ljava/util/logging/Logger;
-
-    sget-object v2, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
-
-    invoke-virtual {v0, v2}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    sget-object v0, Ln0/g0/g/k;->h:Ljava/util/logging/Logger;
-
-    const-string v2, "<< CONNECTION "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-virtual {p1}, Lokio/ByteString;->i()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-static {v2, v3}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
-
-    :cond_2
-    sget-object v0, Ln0/g0/g/d;->a:Lokio/ByteString;
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_4
-
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "Expected a connection header but was "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    if-eqz p1, :cond_3
-
-    invoke-static {p1}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_4
-    :goto_0
-    return-void
-.end method
-
-.method public final c(IIII)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(IIII)",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/k;->d:Ln0/g0/g/k$a;
-
-    iput p1, v0, Ln0/g0/g/k$a;->g:I
-
-    iput p1, v0, Ln0/g0/g/k$a;->d:I
-
-    iput p2, v0, Ln0/g0/g/k$a;->h:I
-
-    iput p3, v0, Ln0/g0/g/k$a;->e:I
-
-    iput p4, v0, Ln0/g0/g/k$a;->f:I
-
-    iget-object p1, p0, Ln0/g0/g/k;->e:Ln0/g0/g/c$a;
-
-    :cond_0
-    :goto_0
-    iget-object p2, p1, Ln0/g0/g/c$a;->b:Lo0/g;
-
-    invoke-interface {p2}, Lo0/g;->J()Z
-
-    move-result p2
-
-    if-nez p2, :cond_e
-
-    iget-object p2, p1, Ln0/g0/g/c$a;->b:Lo0/g;
-
-    invoke-interface {p2}, Lo0/g;->readByte()B
-
-    move-result p2
-
-    const/16 p3, 0xff
-
-    invoke-static {p2, p3}, Ln0/g0/b;->a(BI)I
-
-    move-result p2
-
-    const/16 p3, 0x80
-
-    if-eq p2, p3, :cond_d
-
-    and-int/lit16 p4, p2, 0x80
-
-    if-ne p4, p3, :cond_5
-
-    const/16 p3, 0x7f
-
-    invoke-virtual {p1, p2, p3}, Ln0/g0/g/c$a;->g(II)I
-
-    move-result p2
-
-    add-int/lit8 p2, p2, -0x1
-
-    if-ltz p2, :cond_1
-
-    sget-object p3, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object p3, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length p3, p3
-
-    add-int/lit8 p3, p3, -0x1
-
-    if-gt p2, p3, :cond_1
-
-    const/4 p3, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p3, 0x0
-
-    :goto_1
-    if-eqz p3, :cond_2
-
-    sget-object p3, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object p3, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    aget-object p2, p3, p2
-
-    iget-object p3, p1, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    invoke-interface {p3, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    sget-object p3, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    sget-object p3, Ln0/g0/g/c;->a:[Ln0/g0/g/b;
-
-    array-length p3, p3
-
-    sub-int p3, p2, p3
-
-    invoke-virtual {p1, p3}, Ln0/g0/g/c$a;->b(I)I
-
-    move-result p3
-
-    if-ltz p3, :cond_4
-
-    iget-object p4, p1, Ln0/g0/g/c$a;->c:[Ln0/g0/g/b;
-
-    array-length v0, p4
-
-    if-ge p3, v0, :cond_4
-
-    iget-object p2, p1, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    aget-object p3, p4, p3
-
-    if-eqz p3, :cond_3
-
-    invoke-interface {p2, p3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_4
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p3, "Header index too large "
-
-    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p3
-
-    add-int/lit8 p2, p2, 0x1
-
-    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    const/4 p3, -0x1
-
-    const/16 p4, 0x40
-
-    if-ne p2, p4, :cond_6
-
-    sget-object p2, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    invoke-virtual {p1}, Ln0/g0/g/c$a;->f()Lokio/ByteString;
-
-    move-result-object p4
-
-    invoke-virtual {p2, p4}, Ln0/g0/g/c;->a(Lokio/ByteString;)Lokio/ByteString;
-
-    invoke-virtual {p1}, Ln0/g0/g/c$a;->f()Lokio/ByteString;
-
-    move-result-object p2
-
-    new-instance v0, Ln0/g0/g/b;
-
-    invoke-direct {v0, p4, p2}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
-
-    invoke-virtual {p1, p3, v0}, Ln0/g0/g/c$a;->e(ILn0/g0/g/b;)V
-
-    goto/16 :goto_0
-
-    :cond_6
-    and-int/lit8 v0, p2, 0x40
-
-    if-ne v0, p4, :cond_7
-
-    const/16 p4, 0x3f
-
-    invoke-virtual {p1, p2, p4}, Ln0/g0/g/c$a;->g(II)I
-
-    move-result p2
-
-    add-int/lit8 p2, p2, -0x1
-
-    invoke-virtual {p1, p2}, Ln0/g0/g/c$a;->d(I)Lokio/ByteString;
-
-    move-result-object p2
-
-    invoke-virtual {p1}, Ln0/g0/g/c$a;->f()Lokio/ByteString;
-
-    move-result-object p4
-
-    new-instance v0, Ln0/g0/g/b;
-
-    invoke-direct {v0, p2, p4}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
-
-    invoke-virtual {p1, p3, v0}, Ln0/g0/g/c$a;->e(ILn0/g0/g/b;)V
-
-    goto/16 :goto_0
-
-    :cond_7
-    and-int/lit8 p3, p2, 0x20
-
-    const/16 p4, 0x20
-
-    if-ne p3, p4, :cond_a
-
-    const/16 p3, 0x1f
-
-    invoke-virtual {p1, p2, p3}, Ln0/g0/g/c$a;->g(II)I
-
-    move-result p2
-
-    iput p2, p1, Ln0/g0/g/c$a;->h:I
-
-    if-ltz p2, :cond_9
-
-    iget p3, p1, Ln0/g0/g/c$a;->g:I
-
-    if-gt p2, p3, :cond_9
-
-    iget p3, p1, Ln0/g0/g/c$a;->f:I
-
-    if-ge p2, p3, :cond_0
-
-    if-nez p2, :cond_8
-
-    invoke-virtual {p1}, Ln0/g0/g/c$a;->a()V
-
-    goto/16 :goto_0
-
-    :cond_8
-    sub-int/2addr p3, p2
-
-    invoke-virtual {p1, p3}, Ln0/g0/g/c$a;->c(I)I
-
-    goto/16 :goto_0
-
-    :cond_9
-    new-instance p2, Ljava/io/IOException;
-
-    const-string p3, "Invalid dynamic table size update "
-
-    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p3
-
-    iget p1, p1, Ln0/g0/g/c$a;->h:I
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_a
-    const/16 p3, 0x10
-
-    if-eq p2, p3, :cond_c
-
-    if-nez p2, :cond_b
-
-    goto :goto_2
-
-    :cond_b
-    const/16 p3, 0xf
-
-    invoke-virtual {p1, p2, p3}, Ln0/g0/g/c$a;->g(II)I
-
-    move-result p2
-
-    add-int/lit8 p2, p2, -0x1
-
-    invoke-virtual {p1, p2}, Ln0/g0/g/c$a;->d(I)Lokio/ByteString;
-
-    move-result-object p2
-
-    invoke-virtual {p1}, Ln0/g0/g/c$a;->f()Lokio/ByteString;
-
-    move-result-object p3
-
-    iget-object p4, p1, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    new-instance v0, Ln0/g0/g/b;
-
-    invoke-direct {v0, p2, p3}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
-
-    invoke-interface {p4, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto/16 :goto_0
-
-    :cond_c
-    :goto_2
-    sget-object p2, Ln0/g0/g/c;->c:Ln0/g0/g/c;
-
-    invoke-virtual {p1}, Ln0/g0/g/c$a;->f()Lokio/ByteString;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ln0/g0/g/c;->a(Lokio/ByteString;)Lokio/ByteString;
-
-    invoke-virtual {p1}, Ln0/g0/g/c$a;->f()Lokio/ByteString;
-
-    move-result-object p2
-
-    iget-object p4, p1, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    new-instance v0, Ln0/g0/g/b;
-
-    invoke-direct {v0, p3, p2}, Ln0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
-
-    invoke-interface {p4, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto/16 :goto_0
-
-    :cond_d
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "index == 0"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_e
-    iget-object p1, p0, Ln0/g0/g/k;->e:Ln0/g0/g/c$a;
-
-    iget-object p2, p1, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    invoke-static {p2}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p2
-
-    iget-object p1, p1, Ln0/g0/g/c$a;->a:Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->clear()V
-
-    return-object p2
-.end method
-
-.method public close()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/w;->close()V
-
-    return-void
-.end method
-
-.method public final d(Ln0/g0/g/k$b;I)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readInt()I
-
-    move-result v0
-
-    const-wide v1, 0x80000000L
-
-    long-to-int v2, v1
-
-    and-int v1, v0, v2
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    const v3, 0x7fffffff
-
-    and-int/2addr v0, v3
-
-    iget-object v3, p0, Ln0/g0/g/k;->f:Lo0/g;
-
-    invoke-interface {v3}, Lo0/g;->readByte()B
-
-    move-result v3
-
-    const/16 v4, 0xff
-
-    invoke-static {v3, v4}, Ln0/g0/b;->a(BI)I
-
-    move-result v3
-
-    add-int/2addr v3, v2
-
-    invoke-interface {p1, p2, v0, v3, v1}, Ln0/g0/g/k$b;->g(IIIZ)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/l$a.smali b/com.discord/smali_classes2/n0/g0/g/l$a.smali
deleted file mode 100644
index 0dac6b29ae..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/l$a.smali
+++ /dev/null
@@ -1,557 +0,0 @@
-.class public final Ln0/g0/g/l$a;
-.super Ljava/lang/Object;
-.source "Http2Stream.kt"
-
-# interfaces
-.implements Lo0/u;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Lo0/e;
-
-.field public e:Z
-
-.field public f:Z
-
-.field public final synthetic g:Ln0/g0/g/l;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/g/l;Z)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(Z)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p2, p0, Ln0/g0/g/l$a;->f:Z
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Z)V
-    .locals 11
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v1, v1, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    invoke-virtual {v1}, Lo0/b;->i()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :goto_0
-    :try_start_1
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-wide v1, v1, Ln0/g0/g/l;->c:J
-
-    iget-object v3, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-wide v3, v3, Ln0/g0/g/l;->d:J
-
-    cmp-long v5, v1, v3
-
-    if-ltz v5, :cond_0
-
-    iget-boolean v1, p0, Ln0/g0/g/l$a;->f:Z
-
-    if-nez v1, :cond_0
-
-    iget-boolean v1, p0, Ln0/g0/g/l$a;->e:Z
-
-    if-nez v1, :cond_0
-
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-virtual {v1}, Ln0/g0/g/l;->f()Ln0/g0/g/a;
-
-    move-result-object v1
-
-    if-nez v1, :cond_0
-
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-virtual {v1}, Ln0/g0/g/l;->l()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_2
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v1, v1, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    invoke-virtual {v1}, Ln0/g0/g/l$c;->o()V
-
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-virtual {v1}, Ln0/g0/g/l;->b()V
-
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-wide v1, v1, Ln0/g0/g/l;->d:J
-
-    iget-object v3, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-wide v3, v3, Ln0/g0/g/l;->c:J
-
-    sub-long/2addr v1, v3
-
-    iget-object v3, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    iget-wide v3, v3, Lo0/e;->e:J
-
-    invoke-static {v1, v2, v3, v4}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v9
-
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-wide v2, v1, Ln0/g0/g/l;->c:J
-
-    add-long/2addr v2, v9
-
-    iput-wide v2, v1, Ln0/g0/g/l;->c:J
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    monitor-exit v0
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    invoke-virtual {v0}, Lo0/b;->i()V
-
-    if-eqz p1, :cond_1
-
-    :try_start_3
-    iget-object p1, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    cmp-long p1, v9, v0
-
-    if-nez p1, :cond_1
-
-    const/4 p1, 0x1
-
-    const/4 v7, 0x1
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_2
-
-    :cond_1
-    const/4 p1, 0x0
-
-    const/4 v7, 0x0
-
-    :goto_1
-    iget-object p1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v5, p1, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget-object p1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget v6, p1, Ln0/g0/g/l;->m:I
-
-    iget-object v8, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    invoke-virtual/range {v5 .. v10}, Ln0/g0/g/e;->i(IZLo0/e;J)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    iget-object p1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object p1, p1, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    invoke-virtual {p1}, Ln0/g0/g/l$c;->o()V
-
-    return-void
-
-    :goto_2
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    invoke-virtual {v0}, Ln0/g0/g/l$c;->o()V
-
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_4
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v1, v1, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    invoke-virtual {v1}, Ln0/g0/g/l$c;->o()V
-
-    throw p1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    :catchall_2
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-.end method
-
-.method public close()V
-    .locals 8
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    sget-boolean v2, Lj0/h;->a:Z
-
-    if-eqz v2, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "Assertion failed"
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v2, p0, Ln0/g0/g/l$a;->e:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v2, :cond_2
-
-    monitor-exit v0
-
-    return-void
-
-    :cond_2
-    monitor-exit v0
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$a;->f:Z
-
-    if-nez v0, :cond_5
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    iget-wide v2, v0, Lo0/e;->e:J
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v0, v2, v4
-
-    if-lez v0, :cond_3
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_4
-
-    :goto_2
-    iget-object v0, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    iget-wide v2, v0, Lo0/e;->e:J
-
-    cmp-long v0, v2, v4
-
-    if-lez v0, :cond_5
-
-    invoke-virtual {p0, v1}, Ln0/g0/g/l$a;->a(Z)V
-
-    goto :goto_2
-
-    :cond_4
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v2, v0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget v3, v0, Ln0/g0/g/l;->m:I
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    const-wide/16 v6, 0x0
-
-    invoke-virtual/range {v2 .. v7}, Ln0/g0/g/e;->i(IZLo0/e;J)V
-
-    :cond_5
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    monitor-enter v0
-
-    :try_start_1
-    iput-boolean v1, p0, Ln0/g0/g/l$a;->e:Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit v0
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget-object v0, v0, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {v0}, Ln0/g0/g/m;->flush()V
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-virtual {v0}, Ln0/g0/g/l;->a()V
-
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-
-    :catchall_1
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public flush()V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/lit8 v0, v0, 0x1
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "Assertion failed"
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-virtual {v1}, Ln0/g0/g/l;->b()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    :goto_1
-    iget-object v0, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    iget-wide v0, v0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-lez v4, :cond_2
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0}, Ln0/g0/g/l$a;->a(Z)V
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    invoke-virtual {v0}, Ln0/g0/g/e;->flush()V
-
-    goto :goto_1
-
-    :cond_2
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    return-object v0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    iget-object v0, p0, Ln0/g0/g/l$a;->g:Ln0/g0/g/l;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/lit8 v0, v0, 0x1
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string p2, "Assertion failed"
-
-    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->write(Lo0/e;J)V
-
-    :goto_1
-    iget-object p1, p0, Ln0/g0/g/l$a;->d:Lo0/e;
-
-    iget-wide p1, p1, Lo0/e;->e:J
-
-    const-wide/16 v0, 0x4000
-
-    cmp-long p3, p1, v0
-
-    if-ltz p3, :cond_2
-
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p1}, Ln0/g0/g/l$a;->a(Z)V
-
-    goto :goto_1
-
-    :cond_2
-    return-void
-
-    :cond_3
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/l$b.smali b/com.discord/smali_classes2/n0/g0/g/l$b.smali
deleted file mode 100644
index a72ad196df..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/l$b.smali
+++ /dev/null
@@ -1,487 +0,0 @@
-.class public final Ln0/g0/g/l$b;
-.super Ljava/lang/Object;
-.source "Http2Stream.kt"
-
-# interfaces
-.implements Lo0/w;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final d:Lo0/e;
-
-.field public final e:Lo0/e;
-
-.field public f:Z
-
-.field public final g:J
-
-.field public h:Z
-
-.field public final synthetic i:Ln0/g0/g/l;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/g/l;JZ)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(JZ)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p2, p0, Ln0/g0/g/l$b;->g:J
-
-    iput-boolean p4, p0, Ln0/g0/g/l$b;->h:Z
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/l$b;->d:Lo0/e;
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 11
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const-string v0, "sink"
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_c
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v0, p2, v2
-
-    if-ltz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_b
-
-    :goto_1
-    iget-object v0, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v4, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v4, v4, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    invoke-virtual {v4}, Lo0/b;->i()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v4, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    invoke-virtual {v4}, Ln0/g0/g/l;->f()Ln0/g0/g/a;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_3
-
-    iget-object v4, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v4, v4, Ln0/g0/g/l;->l:Ljava/io/IOException;
-
-    if-eqz v4, :cond_1
-
-    :goto_2
-    move-object v1, v4
-
-    goto :goto_3
-
-    :cond_1
-    new-instance v4, Lokhttp3/internal/http2/StreamResetException;
-
-    iget-object v5, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    invoke-virtual {v5}, Ln0/g0/g/l;->f()Ln0/g0/g/a;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_2
-
-    invoke-direct {v4, v5}, Lokhttp3/internal/http2/StreamResetException;-><init>(Ln0/g0/g/a;)V
-
-    goto :goto_2
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
-    :cond_3
-    :goto_3
-    :try_start_2
-    iget-boolean v4, p0, Ln0/g0/g/l$b;->f:Z
-
-    if-nez v4, :cond_a
-
-    iget-object v4, p0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-wide v4, v4, Lo0/e;->e:J
-
-    const-wide/16 v6, -0x1
-
-    cmp-long v8, v4, v2
-
-    if-lez v8, :cond_4
-
-    iget-object v2, p0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-object v3, p0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-wide v3, v3, Lo0/e;->e:J
-
-    invoke-static {p2, p3, v3, v4}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v3
-
-    invoke-virtual {v2, p1, v3, v4}, Lo0/e;->B0(Lo0/e;J)J
-
-    move-result-wide v2
-
-    iget-object v4, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-wide v8, v4, Ln0/g0/g/l;->a:J
-
-    add-long/2addr v8, v2
-
-    iput-wide v8, v4, Ln0/g0/g/l;->a:J
-
-    iget-object v4, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-wide v4, v4, Ln0/g0/g/l;->a:J
-
-    iget-object v8, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-wide v8, v8, Ln0/g0/g/l;->b:J
-
-    sub-long/2addr v4, v8
-
-    if-nez v1, :cond_6
-
-    iget-object v8, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v8, v8, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget-object v8, v8, Ln0/g0/g/e;->o:Ln0/g0/g/q;
-
-    invoke-virtual {v8}, Ln0/g0/g/q;->a()I
-
-    move-result v8
-
-    div-int/lit8 v8, v8, 0x2
-
-    int-to-long v8, v8
-
-    cmp-long v10, v4, v8
-
-    if-ltz v10, :cond_6
-
-    iget-object v8, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v8, v8, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget-object v9, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget v9, v9, Ln0/g0/g/l;->m:I
-
-    invoke-virtual {v8, v9, v4, v5}, Ln0/g0/g/e;->p(IJ)V
-
-    iget-object v4, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v5, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-wide v8, v5, Ln0/g0/g/l;->a:J
-
-    iput-wide v8, v4, Ln0/g0/g/l;->b:J
-
-    goto :goto_4
-
-    :cond_4
-    iget-boolean v2, p0, Ln0/g0/g/l$b;->h:Z
-
-    if-nez v2, :cond_5
-
-    if-nez v1, :cond_5
-
-    iget-object v2, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    invoke-virtual {v2}, Ln0/g0/g/l;->l()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    const/4 v2, 0x1
-
-    move-wide v3, v6
-
-    goto :goto_5
-
-    :cond_5
-    move-wide v2, v6
-
-    :cond_6
-    :goto_4
-    const/4 v4, 0x0
-
-    move-wide v3, v2
-
-    const/4 v2, 0x0
-
-    :goto_5
-    :try_start_3
-    iget-object v5, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v5, v5, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    invoke-virtual {v5}, Ln0/g0/g/l$c;->o()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    monitor-exit v0
-
-    if-eqz v2, :cond_7
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    goto/16 :goto_1
-
-    :cond_7
-    cmp-long p1, v3, v6
-
-    if-eqz p1, :cond_8
-
-    invoke-virtual {p0, v3, v4}, Ln0/g0/g/l$b;->a(J)V
-
-    return-wide v3
-
-    :cond_8
-    if-nez v1, :cond_9
-
-    return-wide v6
-
-    :cond_9
-    throw v1
-
-    :cond_a
-    :try_start_4
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "stream closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_5
-    iget-object p2, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object p2, p2, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    invoke-virtual {p2}, Ln0/g0/g/l$c;->o()V
-
-    throw p1
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_b
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_c
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final a(J)V
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/lit8 v0, v0, 0x1
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string p2, "Assertion failed"
-
-    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    invoke-virtual {v0, p1, p2}, Ln0/g0/g/e;->g(J)V
-
-    return-void
-.end method
-
-.method public close()V
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    monitor-enter v0
-
-    const/4 v1, 0x1
-
-    :try_start_0
-    iput-boolean v1, p0, Ln0/g0/g/l$b;->f:Z
-
-    iget-object v1, p0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-wide v1, v1, Lo0/e;->e:J
-
-    iget-object v3, p0, Ln0/g0/g/l$b;->e:Lo0/e;
-
-    iget-wide v4, v3, Lo0/e;->e:J
-
-    invoke-virtual {v3, v4, v5}, Lo0/e;->skip(J)V
-
-    iget-object v3, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    if-eqz v3, :cond_1
-
-    invoke-virtual {v3}, Ljava/lang/Object;->notifyAll()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v0, v1, v3
-
-    if-lez v0, :cond_0
-
-    invoke-virtual {p0, v1, v2}, Ln0/g0/g/l$b;->a(J)V
-
-    :cond_0
-    iget-object v0, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    invoke-virtual {v0}, Ln0/g0/g/l;->a()V
-
-    return-void
-
-    :cond_1
-    :try_start_1
-    new-instance v1, Lkotlin/TypeCastException;
-
-    const-string v2, "null cannot be cast to non-null type java.lang.Object"
-
-    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/g/l$b;->i:Ln0/g0/g/l;
-
-    iget-object v0, v0, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/l$c.smali b/com.discord/smali_classes2/n0/g0/g/l$c.smali
deleted file mode 100644
index d8b0af802c..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/l$c.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class public final Ln0/g0/g/l$c;
-.super Lo0/b;
-.source "Http2Stream.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public final synthetic l:Ln0/g0/g/l;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/g/l;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/g/l$c;->l:Ln0/g0/g/l;
-
-    invoke-direct {p0}, Lo0/b;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(Ljava/io/IOException;)Ljava/io/IOException;
-    .locals 2
-
-    new-instance v0, Ljava/net/SocketTimeoutException;
-
-    const-string v1, "timeout"
-
-    invoke-direct {v0, v1}, Ljava/net/SocketTimeoutException;-><init>(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {v0, p1}, Ljava/net/SocketTimeoutException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public n()V
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/g/l$c;->l:Ln0/g0/g/l;
-
-    sget-object v1, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    invoke-virtual {v0, v1}, Ln0/g0/g/l;->e(Ln0/g0/g/a;)V
-
-    return-void
-.end method
-
-.method public final o()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lo0/b;->j()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0}, Ln0/g0/g/l$c;->m(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/l.smali b/com.discord/smali_classes2/n0/g0/g/l.smali
deleted file mode 100644
index 4b5d8f274a..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/l.smali
+++ /dev/null
@@ -1,852 +0,0 @@
-.class public final Ln0/g0/g/l;
-.super Ljava/lang/Object;
-.source "Http2Stream.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/g/l$b;,
-        Ln0/g0/g/l$a;,
-        Ln0/g0/g/l$c;
-    }
-.end annotation
-
-
-# instance fields
-.field public a:J
-
-.field public b:J
-
-.field public c:J
-
-.field public d:J
-
-.field public final e:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Lokhttp3/Headers;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public f:Z
-
-.field public final g:Ln0/g0/g/l$b;
-
-.field public final h:Ln0/g0/g/l$a;
-
-.field public final i:Ln0/g0/g/l$c;
-
-.field public final j:Ln0/g0/g/l$c;
-
-.field public k:Ln0/g0/g/a;
-
-.field public l:Ljava/io/IOException;
-
-.field public final m:I
-
-.field public final n:Ln0/g0/g/e;
-
-
-# direct methods
-.method public constructor <init>(ILn0/g0/g/e;ZZLokhttp3/Headers;)V
-    .locals 2
-
-    if-eqz p2, :cond_3
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Ln0/g0/g/l;->m:I
-
-    iput-object p2, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget-object p1, p2, Ln0/g0/g/e;->p:Ln0/g0/g/q;
-
-    invoke-virtual {p1}, Ln0/g0/g/q;->a()I
-
-    move-result p1
-
-    int-to-long p1, p1
-
-    iput-wide p1, p0, Ln0/g0/g/l;->d:J
-
-    new-instance p1, Ljava/util/ArrayDeque;
-
-    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/l;->e:Ljava/util/ArrayDeque;
-
-    new-instance p1, Ln0/g0/g/l$b;
-
-    iget-object p2, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget-object p2, p2, Ln0/g0/g/e;->o:Ln0/g0/g/q;
-
-    invoke-virtual {p2}, Ln0/g0/g/q;->a()I
-
-    move-result p2
-
-    int-to-long v0, p2
-
-    invoke-direct {p1, p0, v0, v1, p4}, Ln0/g0/g/l$b;-><init>(Ln0/g0/g/l;JZ)V
-
-    iput-object p1, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    new-instance p1, Ln0/g0/g/l$a;
-
-    invoke-direct {p1, p0, p3}, Ln0/g0/g/l$a;-><init>(Ln0/g0/g/l;Z)V
-
-    iput-object p1, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    new-instance p1, Ln0/g0/g/l$c;
-
-    invoke-direct {p1, p0}, Ln0/g0/g/l$c;-><init>(Ln0/g0/g/l;)V
-
-    iput-object p1, p0, Ln0/g0/g/l;->i:Ln0/g0/g/l$c;
-
-    new-instance p1, Ln0/g0/g/l$c;
-
-    invoke-direct {p1, p0}, Ln0/g0/g/l$c;-><init>(Ln0/g0/g/l;)V
-
-    iput-object p1, p0, Ln0/g0/g/l;->j:Ln0/g0/g/l$c;
-
-    if-eqz p5, :cond_1
-
-    invoke-virtual {p0}, Ln0/g0/g/l;->h()Z
-
-    move-result p1
-
-    xor-int/lit8 p1, p1, 0x1
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Ln0/g0/g/l;->e:Ljava/util/ArrayDeque;
-
-    invoke-interface {p1, p5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "locally-initiated streams shouldn\'t have headers yet"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    invoke-virtual {p0}, Ln0/g0/g/l;->h()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    :goto_0
-    return-void
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "remotely-initiated streams should have headers"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    sget-boolean v2, Lj0/h;->a:Z
-
-    if-eqz v2, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "Assertion failed"
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$b;->h:Z
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$b;->f:Z
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$a;->f:Z
-
-    if-nez v0, :cond_3
-
-    iget-object v0, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$a;->e:Z
-
-    if-eqz v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :cond_3
-    :goto_1
-    invoke-virtual {p0}, Ln0/g0/g/l;->i()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    if-eqz v1, :cond_4
-
-    sget-object v0, Ln0/g0/g/a;->i:Ln0/g0/g/a;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, v0, v1}, Ln0/g0/g/l;->c(Ln0/g0/g/a;Ljava/io/IOException;)V
-
-    goto :goto_2
-
-    :cond_4
-    if-nez v0, :cond_5
-
-    iget-object v0, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget v1, p0, Ln0/g0/g/l;->m:I
-
-    invoke-virtual {v0, v1}, Ln0/g0/g/e;->e(I)Ln0/g0/g/l;
-
-    :cond_5
-    :goto_2
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final b()V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    iget-boolean v1, v0, Ln0/g0/g/l$a;->e:Z
-
-    if-nez v1, :cond_4
-
-    iget-boolean v0, v0, Ln0/g0/g/l$a;->f:Z
-
-    if-nez v0, :cond_3
-
-    iget-object v0, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/g/l;->l:Ljava/io/IOException;
-
-    if-nez v0, :cond_1
-
-    new-instance v0, Lokhttp3/internal/http2/StreamResetException;
-
-    iget-object v1, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-
-    if-nez v1, :cond_0
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_0
-    invoke-direct {v0, v1}, Lokhttp3/internal/http2/StreamResetException;-><init>(Ln0/g0/g/a;)V
-
-    :cond_1
-    throw v0
-
-    :cond_2
-    return-void
-
-    :cond_3
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "stream finished"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "stream closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final c(Ln0/g0/g/a;Ljava/io/IOException;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p0, p1, p2}, Ln0/g0/g/l;->d(Ln0/g0/g/a;Ljava/io/IOException;)Z
-
-    move-result p2
-
-    if-nez p2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object p2, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget v0, p0, Ln0/g0/g/l;->m:I
-
-    iget-object p2, p2, Ln0/g0/g/e;->v:Ln0/g0/g/m;
-
-    invoke-virtual {p2, v0, p1}, Ln0/g0/g/m;->g(ILn0/g0/g/a;)V
-
-    return-void
-.end method
-
-.method public final d(Ln0/g0/g/a;Ljava/io/IOException;)Z
-    .locals 3
-
-    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    sget-boolean v2, Lj0/h;->a:Z
-
-    if-eqz v2, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, "Assertion failed"
-
-    new-instance p2, Ljava/lang/AssertionError;
-
-    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p2
-
-    :cond_1
-    :goto_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_2
-
-    monitor-exit p0
-
-    return v2
-
-    :cond_2
-    :try_start_1
-    iget-object v0, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$b;->h:Z
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$a;->f:Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v0, :cond_3
-
-    monitor-exit p0
-
-    return v2
-
-    :cond_3
-    :try_start_2
-    iput-object p1, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-
-    iput-object p2, p0, Ln0/g0/g/l;->l:Ljava/io/IOException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    monitor-exit p0
-
-    iget-object p1, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget p2, p0, Ln0/g0/g/l;->m:I
-
-    invoke-virtual {p1, p2}, Ln0/g0/g/e;->e(I)Ln0/g0/g/l;
-
-    return v1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final e(Ln0/g0/g/a;)V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Ln0/g0/g/l;->d(Ln0/g0/g/a;Ljava/io/IOException;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget v1, p0, Ln0/g0/g/l;->m:I
-
-    invoke-virtual {v0, v1, p1}, Ln0/g0/g/e;->n(ILn0/g0/g/a;)V
-
-    return-void
-.end method
-
-.method public final declared-synchronized f()Ln0/g0/g/a;
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final g()Lo0/u;
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/l;->f:Z
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p0}, Ln0/g0/g/l;->h()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    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-eqz v0, :cond_2
-
-    monitor-exit p0
-
-    iget-object v0, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    return-object v0
-
-    :cond_2
-    :try_start_1
-    const-string v0, "reply before requesting the sink"
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final h()Z
-    .locals 4
-
-    iget v0, p0, Ln0/g0/g/l;->m:I
-
-    const/4 v1, 0x1
-
-    and-int/2addr v0, v1
-
-    const/4 v2, 0x0
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    iget-object v3, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget-boolean v3, v3, Ln0/g0/g/e;->d:Z
-
-    if-ne v3, v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_1
-    return v1
-.end method
-
-.method public final declared-synchronized i()Z
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return v1
-
-    :cond_0
-    :try_start_1
-    iget-object v0, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$b;->h:Z
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$b;->f:Z
-
-    if-eqz v0, :cond_3
-
-    :cond_1
-    iget-object v0, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$a;->f:Z
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/g/l;->h:Ln0/g0/g/l$a;
-
-    iget-boolean v0, v0, Ln0/g0/g/l$a;->e:Z
-
-    if-eqz v0, :cond_3
-
-    :cond_2
-    iget-boolean v0, p0, Ln0/g0/g/l;->f:Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v0, :cond_3
-
-    monitor-exit p0
-
-    return v1
-
-    :cond_3
-    const/4 v0, 0x1
-
-    monitor-exit p0
-
-    return v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final j(Lokhttp3/Headers;Z)V
-    .locals 4
-
-    const-string v0, "headers"
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_7
-
-    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v2, 0x1
-
-    xor-int/2addr v0, v2
-
-    sget-boolean v3, Lj0/h;->a:Z
-
-    if-eqz v3, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string p1, "Assertion failed"
-
-    new-instance p2, Ljava/lang/AssertionError;
-
-    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p2
-
-    :cond_1
-    :goto_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/l;->f:Z
-
-    if-eqz v0, :cond_4
-
-    if-nez p2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    iget-object p1, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    if-eqz p1, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    throw v1
-
-    :cond_4
-    :goto_1
-    iput-boolean v2, p0, Ln0/g0/g/l;->f:Z
-
-    iget-object v0, p0, Ln0/g0/g/l;->e:Ljava/util/ArrayDeque;
-
-    invoke-interface {v0, p1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    :goto_2
-    if-eqz p2, :cond_5
-
-    iget-object p1, p0, Ln0/g0/g/l;->g:Ln0/g0/g/l$b;
-
-    iput-boolean v2, p1, Ln0/g0/g/l$b;->h:Z
-
-    :cond_5
-    invoke-virtual {p0}, Ln0/g0/g/l;->i()Z
-
-    move-result p1
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    if-nez p1, :cond_6
-
-    iget-object p1, p0, Ln0/g0/g/l;->n:Ln0/g0/g/e;
-
-    iget p2, p0, Ln0/g0/g/l;->m:I
-
-    invoke-virtual {p1, p2}, Ln0/g0/g/e;->e(I)Ln0/g0/g/l;
-
-    :cond_6
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-
-    :cond_7
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final declared-synchronized k(Ln0/g0/g/a;)V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-
-    if-nez v0, :cond_0
-
-    iput-object p1, p0, Ln0/g0/g/l;->k:Ln0/g0/g/a;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_0
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final l()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/InterruptedIOException;
-        }
-    .end annotation
-
-    :try_start_0
-    invoke-virtual {p0}, Ljava/lang/Object;->wait()V
-    :try_end_0
-    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
-
-    new-instance v0, Ljava/io/InterruptedIOException;
-
-    invoke-direct {v0}, Ljava/io/InterruptedIOException;-><init>()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/m.smali b/com.discord/smali_classes2/n0/g0/g/m.smali
deleted file mode 100644
index d1d571460d..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/m.smali
+++ /dev/null
@@ -1,1084 +0,0 @@
-.class public final Ln0/g0/g/m;
-.super Ljava/lang/Object;
-.source "Http2Writer.kt"
-
-# interfaces
-.implements Ljava/io/Closeable;
-
-
-# static fields
-.field public static final j:Ljava/util/logging/Logger;
-
-
-# instance fields
-.field public final d:Lo0/e;
-
-.field public e:I
-
-.field public f:Z
-
-.field public final g:Ln0/g0/g/c$b;
-
-.field public final h:Lokio/BufferedSink;
-
-.field public final i:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const-class v0, Ln0/g0/g/d;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/g/m;->j:Ljava/util/logging/Logger;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lokio/BufferedSink;Z)V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    iput-boolean p2, p0, Ln0/g0/g/m;->i:Z
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/g/m;->d:Lo0/e;
-
-    const/16 p2, 0x4000
-
-    iput p2, p0, Ln0/g0/g/m;->e:I
-
-    new-instance p2, Ln0/g0/g/c$b;
-
-    const/4 v0, 0x3
-
-    const/4 v1, 0x0
-
-    invoke-direct {p2, v1, v1, p1, v0}, Ln0/g0/g/c$b;-><init>(IZLo0/e;I)V
-
-    iput-object p2, p0, Ln0/g0/g/m;->g:Ln0/g0/g/c$b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final declared-synchronized a(Ln0/g0/g/q;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    const-string v0, "peerSettings"
-
-    if-eqz p1, :cond_8
-
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_7
-
-    iget v0, p0, Ln0/g0/g/m;->e:I
-
-    iget v1, p1, Ln0/g0/g/q;->a:I
-
-    and-int/lit8 v1, v1, 0x20
-
-    if-eqz v1, :cond_0
-
-    iget-object v0, p1, Ln0/g0/g/q;->b:[I
-
-    const/4 v1, 0x5
-
-    aget v0, v0, v1
-
-    :cond_0
-    iput v0, p0, Ln0/g0/g/m;->e:I
-
-    iget v0, p1, Ln0/g0/g/q;->a:I
-
-    and-int/lit8 v0, v0, 0x2
-
-    const/4 v1, 0x1
-
-    const/4 v2, -0x1
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Ln0/g0/g/q;->b:[I
-
-    aget v0, v0, v1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, -0x1
-
-    :goto_0
-    if-eq v0, v2, :cond_6
-
-    iget-object v0, p0, Ln0/g0/g/m;->g:Ln0/g0/g/c$b;
-
-    iget v3, p1, Ln0/g0/g/q;->a:I
-
-    and-int/lit8 v3, v3, 0x2
-
-    if-eqz v3, :cond_2
-
-    iget-object p1, p1, Ln0/g0/g/q;->b:[I
-
-    aget v2, p1, v1
-
-    :cond_2
-    iput v2, v0, Ln0/g0/g/c$b;->h:I
-
-    const/16 p1, 0x4000
-
-    invoke-static {v2, p1}, Ljava/lang/Math;->min(II)I
-
-    move-result p1
-
-    iget v2, v0, Ln0/g0/g/c$b;->c:I
-
-    if-ne v2, p1, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    if-ge p1, v2, :cond_4
-
-    iget v2, v0, Ln0/g0/g/c$b;->a:I
-
-    invoke-static {v2, p1}, Ljava/lang/Math;->min(II)I
-
-    move-result v2
-
-    iput v2, v0, Ln0/g0/g/c$b;->a:I
-
-    :cond_4
-    iput-boolean v1, v0, Ln0/g0/g/c$b;->b:Z
-
-    iput p1, v0, Ln0/g0/g/c$b;->c:I
-
-    iget v2, v0, Ln0/g0/g/c$b;->g:I
-
-    if-ge p1, v2, :cond_6
-
-    if-nez p1, :cond_5
-
-    invoke-virtual {v0}, Ln0/g0/g/c$b;->a()V
-
-    goto :goto_1
-
-    :cond_5
-    sub-int/2addr v2, p1
-
-    invoke-virtual {v0, v2}, Ln0/g0/g/c$b;->b(I)I
-
-    :cond_6
-    :goto_1
-    const/4 p1, 0x4
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0, v0, p1, v1}, Ln0/g0/g/m;->c(IIII)V
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_7
-    :try_start_1
-    new-instance p1, Ljava/io/IOException;
-
-    const-string v0, "closed"
-
-    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized b(ZILo0/e;I)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_3
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {p0, p2, p4, v0, p1}, Ln0/g0/g/m;->c(IIII)V
-
-    if-lez p4, :cond_2
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    if-eqz p3, :cond_1
-
-    int-to-long v0, p4
-
-    invoke-interface {p1, p3, v0, v1}, Lo0/u;->write(Lo0/e;J)V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_2
-    :goto_1
-    monitor-exit p0
-
-    return-void
-
-    :cond_3
-    :try_start_1
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final c(IIII)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    sget-object v0, Ln0/g0/g/m;->j:Ljava/util/logging/Logger;
-
-    sget-object v1, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
-
-    invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object v0, Ln0/g0/g/m;->j:Ljava/util/logging/Logger;
-
-    sget-object v1, Ln0/g0/g/d;->e:Ln0/g0/g/d;
-
-    const/4 v2, 0x0
-
-    move v3, p1
-
-    move v4, p2
-
-    move v5, p3
-
-    move v6, p4
-
-    invoke-virtual/range {v1 .. v6}, Ln0/g0/g/d;->a(ZIIII)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
-
-    :cond_0
-    iget v0, p0, Ln0/g0/g/m;->e:I
-
-    const/4 v1, 0x1
-
-    if-gt p2, v0, :cond_1
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_4
-
-    const-wide v2, 0x80000000L
-
-    long-to-int v0, v2
-
-    and-int/2addr v0, p1
-
-    if-nez v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_3
-
-    iget-object v0, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-static {v0, p2}, Ln0/g0/b;->I(Lokio/BufferedSink;I)V
-
-    iget-object p2, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    and-int/lit16 p3, p3, 0xff
-
-    invoke-interface {p2, p3}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
-
-    iget-object p2, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    and-int/lit16 p3, p4, 0xff
-
-    invoke-interface {p2, p3}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
-
-    iget-object p2, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    const p3, 0x7fffffff
-
-    and-int/2addr p1, p3
-
-    invoke-interface {p2, p1}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    return-void
-
-    :cond_3
-    const-string p2, "reserved bit set: "
-
-    invoke-static {p2, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_4
-    const-string p1, "FRAME_SIZE_ERROR length > "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget p3, p0, Ln0/g0/g/m;->e:I
-
-    invoke-virtual {p1, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string p3, ": "
-
-    invoke-virtual {p1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public declared-synchronized close()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    const/4 v0, 0x1
-
-    :try_start_0
-    iput-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    iget-object v0, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lo0/u;->close()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final declared-synchronized d(ILn0/g0/g/a;[B)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_4
-
-    iget v0, p2, Ln0/g0/g/a;->httpCode:I
-
-    const/4 v1, -0x1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_3
-
-    array-length v0, p3
-
-    add-int/lit8 v0, v0, 0x8
-
-    const/4 v1, 0x7
-
-    invoke-virtual {p0, v2, v0, v1, v2}, Ln0/g0/g/m;->c(IIII)V
-
-    iget-object v0, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {v0, p1}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    iget p2, p2, Ln0/g0/g/a;->httpCode:I
-
-    invoke-interface {p1, p2}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    array-length p1, p3
-
-    if-nez p1, :cond_1
-
-    const/4 v2, 0x1
-
-    :cond_1
-    xor-int/lit8 p1, v2, 0x1
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1, p3}, Lokio/BufferedSink;->write([B)Lokio/BufferedSink;
-
-    :cond_2
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_3
-    :try_start_1
-    const-string p1, "errorCode.httpCode == -1"
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_4
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized e(ZILjava/util/List;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZI",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    const-string v0, "headerBlock"
-
-    if-eqz p3, :cond_4
-
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_3
-
-    iget-object v0, p0, Ln0/g0/g/m;->g:Ln0/g0/g/c$b;
-
-    invoke-virtual {v0, p3}, Ln0/g0/g/c$b;->e(Ljava/util/List;)V
-
-    iget-object p3, p0, Ln0/g0/g/m;->d:Lo0/e;
-
-    iget-wide v0, p3, Lo0/e;->e:J
-
-    iget p3, p0, Ln0/g0/g/m;->e:I
-
-    int-to-long v2, p3
-
-    invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v2
-
-    cmp-long p3, v0, v2
-
-    if-nez p3, :cond_0
-
-    const/4 v4, 0x4
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v4, 0x0
-
-    :goto_0
-    if-eqz p1, :cond_1
-
-    or-int/lit8 v4, v4, 0x1
-
-    :cond_1
-    long-to-int p1, v2
-
-    const/4 v5, 0x1
-
-    invoke-virtual {p0, p2, p1, v5, v4}, Ln0/g0/g/m;->c(IIII)V
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    iget-object v4, p0, Ln0/g0/g/m;->d:Lo0/e;
-
-    invoke-interface {p1, v4, v2, v3}, Lo0/u;->write(Lo0/e;J)V
-
-    if-lez p3, :cond_2
-
-    sub-long/2addr v0, v2
-
-    invoke-virtual {p0, p2, v0, v1}, Ln0/g0/g/m;->k(IJ)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_2
-    monitor-exit p0
-
-    return-void
-
-    :cond_3
-    :try_start_1
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized f(ZII)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_1
-
-    const/16 v0, 0x8
-
-    const/4 v1, 0x6
-
-    const/4 v2, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {p0, v2, v0, v1, p1}, Ln0/g0/g/m;->c(IIII)V
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1, p2}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1, p3}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    :try_start_1
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized flush()V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    :try_start_1
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final declared-synchronized g(ILn0/g0/g/a;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_2
-
-    iget v0, p2, Ln0/g0/g/a;->httpCode:I
-
-    const/4 v1, -0x1
-
-    const/4 v2, 0x0
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x4
-
-    const/4 v1, 0x3
-
-    invoke-virtual {p0, p1, v0, v1, v2}, Ln0/g0/g/m;->c(IIII)V
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    iget p2, p2, Ln0/g0/g/a;->httpCode:I
-
-    invoke-interface {p1, p2}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    :try_start_1
-    const-string p1, "Failed requirement."
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final declared-synchronized i(IJ)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/g/m;->f:Z
-
-    if-nez v0, :cond_2
-
-    const-wide/16 v0, 0x0
-
-    const/4 v2, 0x0
-
-    cmp-long v3, p2, v0
-
-    if-eqz v3, :cond_0
-
-    const-wide/32 v0, 0x7fffffff
-
-    cmp-long v3, p2, v0
-
-    if-gtz v3, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x4
-
-    const/16 v1, 0x8
-
-    invoke-virtual {p0, p1, v0, v1, v2}, Ln0/g0/g/m;->c(IIII)V
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    long-to-int p3, p2
-
-    invoke-interface {p1, p3}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
-
-    iget-object p1, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    :try_start_1
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL: "
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final k(IJ)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    :goto_0
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p2, v0
-
-    if-lez v2, :cond_1
-
-    iget v2, p0, Ln0/g0/g/m;->e:I
-
-    int-to-long v2, v2
-
-    invoke-static {v2, v3, p2, p3}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v2
-
-    sub-long/2addr p2, v2
-
-    long-to-int v4, v2
-
-    const/16 v5, 0x9
-
-    cmp-long v6, p2, v0
-
-    if-nez v6, :cond_0
-
-    const/4 v0, 0x4
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_1
-    invoke-virtual {p0, p1, v4, v5, v0}, Ln0/g0/g/m;->c(IIII)V
-
-    iget-object v0, p0, Ln0/g0/g/m;->h:Lokio/BufferedSink;
-
-    iget-object v1, p0, Ln0/g0/g/m;->d:Lo0/e;
-
-    invoke-interface {v0, v1, v2, v3}, Lo0/u;->write(Lo0/e;J)V
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/n$a.smali b/com.discord/smali_classes2/n0/g0/g/n$a.smali
deleted file mode 100644
index 36bf707f85..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/n$a.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Ln0/g0/g/n$a;
-.super Ljava/lang/Object;
-.source "Huffman.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/n;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:[Ln0/g0/g/n$a;
-
-.field public final b:I
-
-.field public final c:I
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/16 v0, 0x100
-
-    new-array v0, v0, [Ln0/g0/g/n$a;
-
-    iput-object v0, p0, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Ln0/g0/g/n$a;->b:I
-
-    iput v0, p0, Ln0/g0/g/n$a;->c:I
-
-    return-void
-.end method
-
-.method public constructor <init>(II)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    iput p1, p0, Ln0/g0/g/n$a;->b:I
-
-    and-int/lit8 p1, p2, 0x7
-
-    if-nez p1, :cond_0
-
-    const/16 p1, 0x8
-
-    :cond_0
-    iput p1, p0, Ln0/g0/g/n$a;->c:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/n.smali b/com.discord/smali_classes2/n0/g0/g/n.smali
deleted file mode 100644
index dbedffc620..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/n.smali
+++ /dev/null
@@ -1,684 +0,0 @@
-.class public final Ln0/g0/g/n;
-.super Ljava/lang/Object;
-.source "Huffman.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/g/n$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:[I
-
-.field public static final b:[B
-
-.field public static final c:Ln0/g0/g/n$a;
-
-.field public static final d:Ln0/g0/g/n;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    new-instance v0, Ln0/g0/g/n;
-
-    invoke-direct {v0}, Ln0/g0/g/n;-><init>()V
-
-    sput-object v0, Ln0/g0/g/n;->d:Ln0/g0/g/n;
-
-    const/16 v1, 0x100
-
-    new-array v2, v1, [I
-
-    fill-array-data v2, :array_0
-
-    sput-object v2, Ln0/g0/g/n;->a:[I
-
-    new-array v1, v1, [B
-
-    fill-array-data v1, :array_1
-
-    sput-object v1, Ln0/g0/g/n;->b:[B
-
-    new-instance v1, Ln0/g0/g/n$a;
-
-    invoke-direct {v1}, Ln0/g0/g/n$a;-><init>()V
-
-    sput-object v1, Ln0/g0/g/n;->c:Ln0/g0/g/n$a;
-
-    sget-object v1, Ln0/g0/g/n;->b:[B
-
-    array-length v1, v1
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_0
-
-    sget-object v3, Ln0/g0/g/n;->a:[I
-
-    aget v3, v3, v2
-
-    sget-object v4, Ln0/g0/g/n;->b:[B
-
-    aget-byte v4, v4, v2
-
-    invoke-virtual {v0, v2, v3, v4}, Ln0/g0/g/n;->a(III)V
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-
-    nop
-
-    :array_0
-    .array-data 4
-        0x1ff8
-        0x7fffd8
-        0xfffffe2
-        0xfffffe3
-        0xfffffe4
-        0xfffffe5
-        0xfffffe6
-        0xfffffe7
-        0xfffffe8
-        0xffffea
-        0x3ffffffc    # 1.9999995f
-        0xfffffe9
-        0xfffffea
-        0x3ffffffd    # 1.9999996f
-        0xfffffeb
-        0xfffffec
-        0xfffffed
-        0xfffffee
-        0xfffffef
-        0xffffff0
-        0xffffff1
-        0xffffff2
-        0x3ffffffe    # 1.9999998f
-        0xffffff3
-        0xffffff4
-        0xffffff5
-        0xffffff6
-        0xffffff7
-        0xffffff8
-        0xffffff9
-        0xffffffa
-        0xffffffb
-        0x14
-        0x3f8
-        0x3f9
-        0xffa
-        0x1ff9
-        0x15
-        0xf8
-        0x7fa
-        0x3fa
-        0x3fb
-        0xf9
-        0x7fb
-        0xfa
-        0x16
-        0x17
-        0x18
-        0x0
-        0x1
-        0x2
-        0x19
-        0x1a
-        0x1b
-        0x1c
-        0x1d
-        0x1e
-        0x1f
-        0x5c
-        0xfb
-        0x7ffc
-        0x20
-        0xffb
-        0x3fc
-        0x1ffa
-        0x21
-        0x5d
-        0x5e
-        0x5f
-        0x60
-        0x61
-        0x62
-        0x63
-        0x64
-        0x65
-        0x66
-        0x67
-        0x68
-        0x69
-        0x6a
-        0x6b
-        0x6c
-        0x6d
-        0x6e
-        0x6f
-        0x70
-        0x71
-        0x72
-        0xfc
-        0x73
-        0xfd
-        0x1ffb
-        0x7fff0
-        0x1ffc
-        0x3ffc
-        0x22
-        0x7ffd
-        0x3
-        0x23
-        0x4
-        0x24
-        0x5
-        0x25
-        0x26
-        0x27
-        0x6
-        0x74
-        0x75
-        0x28
-        0x29
-        0x2a
-        0x7
-        0x2b
-        0x76
-        0x2c
-        0x8
-        0x9
-        0x2d
-        0x77
-        0x78
-        0x79
-        0x7a
-        0x7b
-        0x7ffe
-        0x7fc
-        0x3ffd
-        0x1ffd
-        0xffffffc
-        0xfffe6
-        0x3fffd2
-        0xfffe7
-        0xfffe8
-        0x3fffd3
-        0x3fffd4
-        0x3fffd5
-        0x7fffd9
-        0x3fffd6
-        0x7fffda
-        0x7fffdb
-        0x7fffdc
-        0x7fffdd
-        0x7fffde
-        0xffffeb
-        0x7fffdf
-        0xffffec
-        0xffffed
-        0x3fffd7
-        0x7fffe0
-        0xffffee
-        0x7fffe1
-        0x7fffe2
-        0x7fffe3
-        0x7fffe4
-        0x1fffdc
-        0x3fffd8
-        0x7fffe5
-        0x3fffd9
-        0x7fffe6
-        0x7fffe7
-        0xffffef
-        0x3fffda
-        0x1fffdd
-        0xfffe9
-        0x3fffdb
-        0x3fffdc
-        0x7fffe8
-        0x7fffe9
-        0x1fffde
-        0x7fffea
-        0x3fffdd
-        0x3fffde
-        0xfffff0
-        0x1fffdf
-        0x3fffdf
-        0x7fffeb
-        0x7fffec
-        0x1fffe0
-        0x1fffe1
-        0x3fffe0
-        0x1fffe2
-        0x7fffed
-        0x3fffe1
-        0x7fffee
-        0x7fffef
-        0xfffea
-        0x3fffe2
-        0x3fffe3
-        0x3fffe4
-        0x7ffff0
-        0x3fffe5
-        0x3fffe6
-        0x7ffff1
-        0x3ffffe0
-        0x3ffffe1
-        0xfffeb
-        0x7fff1
-        0x3fffe7
-        0x7ffff2
-        0x3fffe8
-        0x1ffffec
-        0x3ffffe2
-        0x3ffffe3
-        0x3ffffe4
-        0x7ffffde
-        0x7ffffdf
-        0x3ffffe5
-        0xfffff1
-        0x1ffffed
-        0x7fff2
-        0x1fffe3
-        0x3ffffe6
-        0x7ffffe0
-        0x7ffffe1
-        0x3ffffe7
-        0x7ffffe2
-        0xfffff2
-        0x1fffe4
-        0x1fffe5
-        0x3ffffe8
-        0x3ffffe9
-        0xffffffd
-        0x7ffffe3
-        0x7ffffe4
-        0x7ffffe5
-        0xfffec
-        0xfffff3
-        0xfffed
-        0x1fffe6
-        0x3fffe9
-        0x1fffe7
-        0x1fffe8
-        0x7ffff3
-        0x3fffea
-        0x3fffeb
-        0x1ffffee
-        0x1ffffef
-        0xfffff4
-        0xfffff5
-        0x3ffffea
-        0x7ffff4
-        0x3ffffeb
-        0x7ffffe6
-        0x3ffffec
-        0x3ffffed
-        0x7ffffe7
-        0x7ffffe8
-        0x7ffffe9
-        0x7ffffea
-        0x7ffffeb
-        0xffffffe
-        0x7ffffec
-        0x7ffffed
-        0x7ffffee
-        0x7ffffef
-        0x7fffff0
-        0x3ffffee
-    .end array-data
-
-    :array_1
-    .array-data 1
-        0xdt
-        0x17t
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x18t
-        0x1et
-        0x1ct
-        0x1ct
-        0x1et
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1et
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x1ct
-        0x6t
-        0xat
-        0xat
-        0xct
-        0xdt
-        0x6t
-        0x8t
-        0xbt
-        0xat
-        0xat
-        0x8t
-        0xbt
-        0x8t
-        0x6t
-        0x6t
-        0x6t
-        0x5t
-        0x5t
-        0x5t
-        0x6t
-        0x6t
-        0x6t
-        0x6t
-        0x6t
-        0x6t
-        0x6t
-        0x7t
-        0x8t
-        0xft
-        0x6t
-        0xct
-        0xat
-        0xdt
-        0x6t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x8t
-        0x7t
-        0x8t
-        0xdt
-        0x13t
-        0xdt
-        0xet
-        0x6t
-        0xft
-        0x5t
-        0x6t
-        0x5t
-        0x6t
-        0x5t
-        0x6t
-        0x6t
-        0x6t
-        0x5t
-        0x7t
-        0x7t
-        0x6t
-        0x6t
-        0x6t
-        0x5t
-        0x6t
-        0x7t
-        0x6t
-        0x5t
-        0x5t
-        0x6t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0x7t
-        0xft
-        0xbt
-        0xet
-        0xdt
-        0x1ct
-        0x14t
-        0x16t
-        0x14t
-        0x14t
-        0x16t
-        0x16t
-        0x16t
-        0x17t
-        0x16t
-        0x17t
-        0x17t
-        0x17t
-        0x17t
-        0x17t
-        0x18t
-        0x17t
-        0x18t
-        0x18t
-        0x16t
-        0x17t
-        0x18t
-        0x17t
-        0x17t
-        0x17t
-        0x17t
-        0x15t
-        0x16t
-        0x17t
-        0x16t
-        0x17t
-        0x17t
-        0x18t
-        0x16t
-        0x15t
-        0x14t
-        0x16t
-        0x16t
-        0x17t
-        0x17t
-        0x15t
-        0x17t
-        0x16t
-        0x16t
-        0x18t
-        0x15t
-        0x16t
-        0x17t
-        0x17t
-        0x15t
-        0x15t
-        0x16t
-        0x15t
-        0x17t
-        0x16t
-        0x17t
-        0x17t
-        0x14t
-        0x16t
-        0x16t
-        0x16t
-        0x17t
-        0x16t
-        0x16t
-        0x17t
-        0x1at
-        0x1at
-        0x14t
-        0x13t
-        0x16t
-        0x17t
-        0x16t
-        0x19t
-        0x1at
-        0x1at
-        0x1at
-        0x1bt
-        0x1bt
-        0x1at
-        0x18t
-        0x19t
-        0x13t
-        0x15t
-        0x1at
-        0x1bt
-        0x1bt
-        0x1at
-        0x1bt
-        0x18t
-        0x15t
-        0x15t
-        0x1at
-        0x1at
-        0x1ct
-        0x1bt
-        0x1bt
-        0x1bt
-        0x14t
-        0x18t
-        0x14t
-        0x15t
-        0x16t
-        0x15t
-        0x15t
-        0x17t
-        0x16t
-        0x16t
-        0x19t
-        0x19t
-        0x18t
-        0x18t
-        0x1at
-        0x17t
-        0x1at
-        0x1bt
-        0x1at
-        0x1at
-        0x1bt
-        0x1bt
-        0x1bt
-        0x1bt
-        0x1bt
-        0x1ct
-        0x1bt
-        0x1bt
-        0x1bt
-        0x1bt
-        0x1bt
-        0x1at
-    .end array-data
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(III)V
-    .locals 3
-
-    new-instance v0, Ln0/g0/g/n$a;
-
-    invoke-direct {v0, p1, p3}, Ln0/g0/g/n$a;-><init>(II)V
-
-    sget-object p1, Ln0/g0/g/n;->c:Ln0/g0/g/n$a;
-
-    :goto_0
-    const/16 v1, 0x8
-
-    const/4 v2, 0x0
-
-    if-le p3, v1, :cond_2
-
-    add-int/lit8 p3, p3, -0x8
-
-    ushr-int v1, p2, p3
-
-    and-int/lit16 v1, v1, 0xff
-
-    iget-object p1, p1, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    if-eqz p1, :cond_1
-
-    aget-object v2, p1, v1
-
-    if-nez v2, :cond_0
-
-    new-instance v2, Ln0/g0/g/n$a;
-
-    invoke-direct {v2}, Ln0/g0/g/n$a;-><init>()V
-
-    aput-object v2, p1, v1
-
-    :cond_0
-    move-object p1, v2
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_2
-    sub-int/2addr v1, p3
-
-    shl-int/2addr p2, v1
-
-    and-int/lit16 p2, p2, 0xff
-
-    const/4 p3, 0x1
-
-    shl-int/2addr p3, v1
-
-    iget-object p1, p1, Ln0/g0/g/n$a;->a:[Ln0/g0/g/n$a;
-
-    if-eqz p1, :cond_3
-
-    add-int/2addr p3, p2
-
-    invoke-static {p1, p2, p3, v0}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
-
-    return-void
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/o$a.smali b/com.discord/smali_classes2/n0/g0/g/o$a.smali
deleted file mode 100644
index 199c6cfcb9..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/o$a.smali
+++ /dev/null
@@ -1,128 +0,0 @@
-.class public final Ln0/g0/g/o$a;
-.super Ljava/lang/Object;
-.source "PushObserver.kt"
-
-# interfaces
-.implements Ln0/g0/g/p;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/g/o;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(ILjava/util/List;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)Z"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const-string p1, "requestHeaders"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public b(ILjava/util/List;Z)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;Z)Z"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const-string p1, "responseHeaders"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public c(ILn0/g0/g/a;)V
-    .locals 0
-
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "errorCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public d(ILo0/g;IZ)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    int-to-long p3, p3
-
-    invoke-interface {p2, p3, p4}, Lo0/g;->skip(J)V
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/p.smali b/com.discord/smali_classes2/n0/g0/g/p.smali
deleted file mode 100644
index ddda4bb821..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/p.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public interface abstract Ln0/g0/g/p;
-.super Ljava/lang/Object;
-.source "PushObserver.kt"
-
-
-# static fields
-.field public static final a:Ln0/g0/g/p;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/g0/g/o$a;
-
-    invoke-direct {v0}, Ln0/g0/g/o$a;-><init>()V
-
-    sput-object v0, Ln0/g0/g/p;->a:Ln0/g0/g/p;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(ILjava/util/List;)Z
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;)Z"
-        }
-    .end annotation
-.end method
-
-.method public abstract b(ILjava/util/List;Z)Z
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I",
-            "Ljava/util/List<",
-            "Ln0/g0/g/b;",
-            ">;Z)Z"
-        }
-    .end annotation
-.end method
-
-.method public abstract c(ILn0/g0/g/a;)V
-.end method
-
-.method public abstract d(ILo0/g;IZ)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/g/q.smali b/com.discord/smali_classes2/n0/g0/g/q.smali
deleted file mode 100644
index f273c5144b..0000000000
--- a/com.discord/smali_classes2/n0/g0/g/q.smali
+++ /dev/null
@@ -1,82 +0,0 @@
-.class public final Ln0/g0/g/q;
-.super Ljava/lang/Object;
-.source "Settings.kt"
-
-
-# instance fields
-.field public a:I
-
-.field public final b:[I
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/16 v0, 0xa
-
-    new-array v0, v0, [I
-
-    iput-object v0, p0, Ln0/g0/g/q;->b:[I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()I
-    .locals 2
-
-    iget v0, p0, Ln0/g0/g/q;->a:I
-
-    and-int/lit16 v0, v0, 0x80
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/g0/g/q;->b:[I
-
-    const/4 v1, 0x7
-
-    aget v0, v0, v1
-
-    goto :goto_0
-
-    :cond_0
-    const v0, 0xffff
-
-    :goto_0
-    return v0
-.end method
-
-.method public final b(II)Ln0/g0/g/q;
-    .locals 3
-
-    if-ltz p1, :cond_1
-
-    iget-object v0, p0, Ln0/g0/g/q;->b:[I
-
-    array-length v1, v0
-
-    if-lt p1, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x1
-
-    shl-int/2addr v1, p1
-
-    iget v2, p0, Ln0/g0/g/q;->a:I
-
-    or-int/2addr v1, v2
-
-    iput v1, p0, Ln0/g0/g/q;->a:I
-
-    aput p2, v0, p1
-
-    :cond_1
-    :goto_0
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/a$a.smali b/com.discord/smali_classes2/n0/g0/h/a$a.smali
deleted file mode 100644
index 543e84886b..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/a$a.smali
+++ /dev/null
@@ -1,184 +0,0 @@
-.class public final Ln0/g0/h/a$a;
-.super Ln0/g0/j/c;
-.source "AndroidPlatform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/h/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/Object;
-
-.field public final b:Ljava/lang/reflect/Method;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;Ljava/lang/reflect/Method;)V
-    .locals 0
-
-    invoke-direct {p0}, Ln0/g0/j/c;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/a$a;->a:Ljava/lang/Object;
-
-    iput-object p2, p0, Ln0/g0/h/a$a;->b:Ljava/lang/reflect/Method;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/security/cert/Certificate;",
-            ">;",
-            "Ljava/lang/String;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/security/cert/Certificate;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljavax/net/ssl/SSLPeerUnverifiedException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    if-eqz p2, :cond_2
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    new-array v1, v0, [Ljava/security/cert/X509Certificate;
-
-    invoke-interface {p1, v1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    check-cast p1, [Ljava/security/cert/X509Certificate;
-
-    iget-object v1, p0, Ln0/g0/h/a$a;->b:Ljava/lang/reflect/Method;
-
-    iget-object v2, p0, Ln0/g0/h/a$a;->a:Ljava/lang/Object;
-
-    const/4 v3, 0x3
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    aput-object p1, v3, v0
-
-    const/4 p1, 0x1
-
-    const-string v0, "RSA"
-
-    aput-object v0, v3, p1
-
-    const/4 p1, 0x2
-
-    aput-object p2, v3, p1
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p1, Ljava/util/List;
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.collections.List<java.security.cert.Certificate>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance p2, Ljava/lang/AssertionError;
-
-    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p2
-
-    :catch_1
-    move-exception p1
-
-    new-instance p2, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getMessage()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p2, v0}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw p2
-
-    :cond_2
-    const-string p1, "hostname"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "chain"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 0
-
-    instance-of p1, p1, Ln0/g0/h/a$a;
-
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/a$b.smali b/com.discord/smali_classes2/n0/g0/h/a$b.smali
deleted file mode 100644
index db4e293295..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/a$b.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Ln0/g0/h/a$b;
-.super Ljava/lang/Object;
-.source "AndroidPlatform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/h/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/a$c.smali b/com.discord/smali_classes2/n0/g0/h/a$c.smali
deleted file mode 100644
index d2c9bf19d1..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/a$c.smali
+++ /dev/null
@@ -1,211 +0,0 @@
-.class public final Ln0/g0/h/a$c;
-.super Ljava/lang/Object;
-.source "AndroidPlatform.kt"
-
-# interfaces
-.implements Ln0/g0/j/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/h/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljavax/net/ssl/X509TrustManager;
-
-.field public final b:Ljava/lang/reflect/Method;
-
-
-# direct methods
-.method public constructor <init>(Ljavax/net/ssl/X509TrustManager;Ljava/lang/reflect/Method;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
-
-    iput-object p2, p0, Ln0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
-    .locals 4
-
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
-
-    iget-object v1, p0, Ln0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
-
-    const/4 v2, 0x1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    aput-object p1, v2, v3
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    check-cast p1, Ljava/security/cert/TrustAnchor;
-
-    invoke-virtual {p1}, Ljava/security/cert/TrustAnchor;->getTrustedCert()Ljava/security/cert/X509Certificate;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type java.security.cert.TrustAnchor"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return-object p1
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Ljava/lang/AssertionError;
-
-    const-string v1, "unable to get issues and signature"
-
-    invoke-direct {v0, v1, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Ln0/g0/h/a$c;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/g0/h/a$c;
-
-    iget-object v0, p0, Ln0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
-
-    iget-object v1, p1, Ln0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
-
-    iget-object p1, p1, Ln0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Ln0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Ln0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :cond_1
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "CustomTrustRootIndex(trustManager="
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", findByIssuerAndSignatureMethod="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
-
-    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_classes2/n0/g0/h/a.smali b/com.discord/smali_classes2/n0/g0/h/a.smali
deleted file mode 100644
index 9ccbe69f75..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/a.smali
+++ /dev/null
@@ -1,963 +0,0 @@
-.class public final Ln0/g0/h/a;
-.super Ln0/g0/h/f;
-.source "AndroidPlatform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/h/a$a;,
-        Ln0/g0/h/a$c;,
-        Ln0/g0/h/a$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:Z
-
-.field public static final g:Ln0/g0/h/a$b;
-
-
-# instance fields
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/g0/h/g/e;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ln0/g0/h/g/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ln0/g0/h/a$b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/g0/h/a$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/g0/h/a;->g:Ln0/g0/h/a$b;
-
-    const/4 v0, 0x1
-
-    :try_start_0
-    const-string v1, "com.android.org.conscrypt.OpenSSLSocketImpl"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Expected Android API level 21+ but was "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    const/4 v0, 0x0
-
-    :goto_0
-    sput-boolean v0, Ln0/g0/h/a;->f:Z
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 7
-
-    invoke-direct {p0}, Ln0/g0/h/f;-><init>()V
-
-    const/4 v0, 0x3
-
-    new-array v0, v0, [Ln0/g0/h/g/e;
-
-    const-string v1, "com.android.org.conscrypt"
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_3
-
-    :try_start_0
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v4, ".OpenSSLSocketImpl"
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {v3}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v3
-
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v5, ".OpenSSLSocketFactoryImpl"
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-static {v4}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    new-instance v5, Ljava/lang/StringBuilder;
-
-    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, ".SSLParametersImpl"
-
-    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v1
-
-    new-instance v5, Ln0/g0/h/g/f;
-
-    const-string v6, "paramsClass"
-
-    invoke-static {v1, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v5, v3, v4, v1}, Ln0/g0/h/g/f;-><init>(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v1
-
-    const/4 v3, 0x5
-
-    const-string v4, "unable to load android socket classes"
-
-    invoke-static {v3, v4, v1}, Lf/n/a/k/a;->d(ILjava/lang/String;Ljava/lang/Throwable;)V
-
-    move-object v5, v2
-
-    :goto_0
-    const/4 v1, 0x0
-
-    aput-object v5, v0, v1
-
-    sget-object v3, Ln0/g0/h/b;->f:Ln0/g0/h/b$a;
-
-    sget-boolean v3, Ln0/g0/h/b;->e:Z
-
-    if-eqz v3, :cond_0
-
-    sget-object v3, Ln0/g0/h/g/c;->a:Ln0/g0/h/g/c;
-
-    goto :goto_1
-
-    :cond_0
-    move-object v3, v2
-
-    :goto_1
-    const/4 v4, 0x1
-
-    aput-object v3, v0, v4
-
-    const/4 v3, 0x2
-
-    new-instance v5, Ln0/g0/h/g/d;
-
-    const-string v6, "com.google.android.gms.org.conscrypt"
-
-    invoke-direct {v5, v6}, Ln0/g0/h/g/d;-><init>(Ljava/lang/String;)V
-
-    aput-object v5, v0, v3
-
-    invoke-static {v0}, Lf/n/a/k/a;->listOfNotNull([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_1
-    :goto_2
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    move-object v6, v5
-
-    check-cast v6, Ln0/g0/h/g/e;
-
-    invoke-interface {v6}, Ln0/g0/h/g/e;->a()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_1
-
-    invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_2
-    iput-object v3, p0, Ln0/g0/h/a;->d:Ljava/util/List;
-
-    :try_start_1
-    const-string v0, "dalvik.system.CloseGuard"
-
-    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v0
-
-    const-string v3, "get"
-
-    new-array v5, v1, [Ljava/lang/Class;
-
-    invoke-virtual {v0, v3, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v3
-
-    const-string v5, "open"
-
-    new-array v4, v4, [Ljava/lang/Class;
-
-    const-class v6, Ljava/lang/String;
-
-    aput-object v6, v4, v1
-
-    invoke-virtual {v0, v5, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v4
-
-    const-string v5, "warnIfOpen"
-
-    new-array v1, v1, [Ljava/lang/Class;
-
-    invoke-virtual {v0, v5, v1}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v2
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
-
-    move-object v0, v2
-
-    move-object v2, v3
-
-    goto :goto_3
-
-    :catch_1
-    move-object v0, v2
-
-    move-object v4, v0
-
-    :goto_3
-    new-instance v1, Ln0/g0/h/g/b;
-
-    invoke-direct {v1, v2, v4, v0}, Ln0/g0/h/g/b;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
-
-    iput-object v1, p0, Ln0/g0/h/a;->e:Ln0/g0/h/g/b;
-
-    return-void
-
-    :cond_3
-    const-string v0, "packageName"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-.end method
-
-
-# virtual methods
-.method public b(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/c;
-    .locals 8
-
-    const-class v0, Ljava/lang/String;
-
-    const-string v1, "checkServerTrusted"
-
-    :try_start_0
-    const-string v2, "android.net.http.X509TrustManagerExtensions"
-
-    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v2
-
-    const/4 v3, 0x1
-
-    new-array v4, v3, [Ljava/lang/Class;
-
-    const-class v5, Ljavax/net/ssl/X509TrustManager;
-
-    const/4 v6, 0x0
-
-    aput-object v5, v4, v6
-
-    invoke-virtual {v2, v4}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object v4
-
-    new-array v5, v3, [Ljava/lang/Object;
-
-    aput-object p1, v5, v6
-
-    invoke-virtual {v4, v5}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    const/4 v5, 0x3
-
-    new-array v5, v5, [Ljava/lang/Class;
-
-    const-class v7, [Ljava/security/cert/X509Certificate;
-
-    aput-object v7, v5, v6
-
-    aput-object v0, v5, v3
-
-    const/4 v3, 0x2
-
-    aput-object v0, v5, v3
-
-    invoke-virtual {v2, v1, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    new-instance v2, Ln0/g0/h/a$a;
-
-    const-string v3, "extensions"
-
-    invoke-static {v4, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v2, v4, v0}, Ln0/g0/h/a$a;-><init>(Ljava/lang/Object;Ljava/lang/reflect/Method;)V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    new-instance v2, Ln0/g0/j/a;
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/f;->c(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/e;
-
-    move-result-object p1
-
-    invoke-direct {v2, p1}, Ln0/g0/j/a;-><init>(Ln0/g0/j/e;)V
-
-    :goto_0
-    return-object v2
-.end method
-
-.method public c(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/e;
-    .locals 6
-
-    :try_start_0
-    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    const-string v1, "findTrustAnchorByIssuerAndSignature"
-
-    const/4 v2, 0x1
-
-    new-array v3, v2, [Ljava/lang/Class;
-
-    const/4 v4, 0x0
-
-    const-class v5, Ljava/security/cert/X509Certificate;
-
-    aput-object v5, v3, v4
-
-    invoke-virtual {v0, v1, v3}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    const-string v1, "method"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v2}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-
-    new-instance v1, Ln0/g0/h/a$c;
-
-    invoke-direct {v1, p1, v0}, Ln0/g0/h/a$c;-><init>(Ljavax/net/ssl/X509TrustManager;Ljava/lang/reflect/Method;)V
-    :try_end_0
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    invoke-super {p0, p1}, Ln0/g0/h/f;->c(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/e;
-
-    move-result-object v1
-
-    :goto_0
-    return-object v1
-.end method
-
-.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p3, :cond_3
-
-    iget-object v1, p0, Ln0/g0/h/a;->d:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object v3, v2
-
-    check-cast v3, Ln0/g0/h/g/e;
-
-    invoke-interface {v3, p1}, Ln0/g0/h/g/e;->c(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    move-object v0, v2
-
-    :cond_1
-    check-cast v0, Ln0/g0/h/g/e;
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {v0, p1, p2, p3}, Ln0/g0/h/g/e;->d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-
-    :cond_2
-    return-void
-
-    :cond_3
-    const-string p1, "protocols"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public g(Ljava/net/Socket;Ljava/net/InetSocketAddress;I)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    :try_start_0
-    invoke-virtual {p1, p2, p3}, Ljava/net/Socket;->connect(Ljava/net/SocketAddress;I)V
-    :try_end_0
-    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
-
-    const/16 p3, 0x1a
-
-    if-ne p2, p3, :cond_0
-
-    new-instance p2, Ljava/io/IOException;
-
-    const-string p3, "Exception in connect"
-
-    invoke-direct {p2, p3, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p2
-
-    :cond_0
-    throw p1
-
-    :cond_1
-    const-string p1, "address"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "socket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 4
-
-    iget-object v0, p0, Ln0/g0/h/a;->d:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v3, v1
-
-    check-cast v3, Ln0/g0/h/g/e;
-
-    invoke-interface {v3, p1}, Ln0/g0/h/g/e;->c(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    goto :goto_0
-
-    :cond_1
-    move-object v1, v2
-
-    :goto_0
-    check-cast v1, Ln0/g0/h/g/e;
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v1, p1}, Ln0/g0/h/g/e;->b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-
-    move-result-object v2
-
-    :cond_2
-    return-object v2
-.end method
-
-.method public i(Ljava/lang/String;)Ljava/lang/Object;
-    .locals 5
-
-    iget-object v0, p0, Ln0/g0/h/a;->e:Ln0/g0/h/g/b;
-
-    iget-object v1, v0, Ln0/g0/h/g/b;->a:Ljava/lang/reflect/Method;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    const/4 v3, 0x0
-
-    :try_start_0
-    new-array v4, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    iget-object v0, v0, Ln0/g0/h/g/b;->b:Ljava/lang/reflect/Method;
-
-    if-eqz v0, :cond_0
-
-    const/4 v4, 0x1
-
-    new-array v4, v4, [Ljava/lang/Object;
-
-    aput-object p1, v4, v3
-
-    invoke-virtual {v0, v1, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-object v2, v1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    throw v2
-
-    :catch_0
-    :cond_1
-    :goto_0
-    return-object v2
-.end method
-
-.method public j(Ljava/lang/String;)Z
-    .locals 7
-
-    const-string v0, "unable to determine cleartext support"
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_0
-
-    const/4 v2, 0x1
-
-    :try_start_0
-    const-string v3, "android.security.NetworkSecurityPolicy"
-
-    invoke-static {v3}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v3
-
-    const-string v4, "getInstance"
-
-    const/4 v5, 0x0
-
-    new-array v6, v5, [Ljava/lang/Class;
-
-    invoke-virtual {v3, v4, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v4
-
-    new-array v5, v5, [Ljava/lang/Object;
-
-    invoke-virtual {v4, v1, v5}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    const-string v4, "networkPolicyClass"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v4, "networkSecurityPolicy"
-
-    invoke-static {v1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0, p1, v3, v1}, Ln0/g0/h/a;->o(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;)Z
-
-    move-result v2
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_4
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_3
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_2
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_3
-    invoke-super {p0, p1}, Ln0/g0/h/f;->j(Ljava/lang/String;)Z
-
-    goto :goto_0
-
-    :catch_4
-    invoke-super {p0, p1}, Ln0/g0/h/f;->j(Ljava/lang/String;)Z
-
-    :goto_0
-    return v2
-
-    :cond_0
-    const-string p1, "hostname"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public k(ILjava/lang/String;Ljava/lang/Throwable;)V
-    .locals 0
-
-    if-eqz p2, :cond_0
-
-    invoke-static {p1, p2, p3}, Lf/n/a/k/a;->d(ILjava/lang/String;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public l(Ljava/lang/String;Ljava/lang/Object;)V
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    iget-object v1, p0, Ln0/g0/h/a;->e:Ln0/g0/h/g/b;
-
-    if-eqz v1, :cond_3
-
-    const/4 v2, 0x0
-
-    if-eqz p2, :cond_1
-
-    :try_start_0
-    iget-object v1, v1, Ln0/g0/h/g/b;->c:Ljava/lang/reflect/Method;
-
-    if-eqz v1, :cond_0
-
-    new-array v3, v2, [Ljava/lang/Object;
-
-    invoke-virtual {v1, p2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    throw v0
-
-    :catch_0
-    :cond_1
-    :goto_0
-    if-nez v2, :cond_2
-
-    const/4 p2, 0x5
-
-    invoke-virtual {p0, p2, p1, v0}, Ln0/g0/h/a;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
-
-    :cond_2
-    return-void
-
-    :cond_3
-    throw v0
-
-    :cond_4
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final o(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;)Z
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Object;",
-            ")Z"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/reflect/InvocationTargetException;,
-            Ljava/lang/IllegalAccessException;
-        }
-    .end annotation
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Boolean"
-
-    const-string v1, "isCleartextTrafficPermitted"
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    :try_start_0
-    new-array v4, v3, [Ljava/lang/Class;
-
-    const-class v5, Ljava/lang/String;
-
-    aput-object v5, v4, v2
-
-    invoke-virtual {p2, v1, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v4
-
-    new-array v5, v3, [Ljava/lang/Object;
-
-    aput-object p1, v5, v2
-
-    invoke-virtual {v4, p3, v5}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_0
-
-    check-cast v4, Ljava/lang/Boolean;
-
-    invoke-virtual {v4}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    goto :goto_1
-
-    :cond_0
-    new-instance v4, Lkotlin/TypeCastException;
-
-    invoke-direct {v4, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v4
-    :try_end_0
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    :try_start_1
-    new-array v4, v2, [Ljava/lang/Class;
-
-    invoke-virtual {p2, v1, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p2
-
-    new-array v1, v2, [Ljava/lang/Object;
-
-    invoke-virtual {p2, p3, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_1
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v3
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p2, Lkotlin/TypeCastException;
-
-    invoke-direct {p2, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-    :try_end_1
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_1
-
-    :catch_1
-    invoke-super {p0, p1}, Ln0/g0/h/f;->j(Ljava/lang/String;)Z
-
-    :goto_0
-    move p1, v3
-
-    :goto_1
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/b$a.smali b/com.discord/smali_classes2/n0/g0/h/b$a.smali
deleted file mode 100644
index db9784b607..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/b$a.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.class public final Ln0/g0/h/b$a;
-.super Ljava/lang/Object;
-.source "ConscryptPlatform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/h/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(III)Z
-    .locals 4
-
-    invoke-static {}, Lorg/conscrypt/Conscrypt;->version()Lorg/conscrypt/Conscrypt$Version;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->major()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-eq v1, p1, :cond_1
-
-    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->major()I
-
-    move-result p2
-
-    if-le p2, p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    return v2
-
-    :cond_1
-    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->minor()I
-
-    move-result p1
-
-    if-eq p1, p2, :cond_3
-
-    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->minor()I
-
-    move-result p1
-
-    if-le p1, p2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v2, 0x0
-
-    :goto_1
-    return v2
-
-    :cond_3
-    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->patch()I
-
-    move-result p1
-
-    if-lt p1, p3, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    const/4 v2, 0x0
-
-    :goto_2
-    return v2
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/b$b.smali b/com.discord/smali_classes2/n0/g0/h/b$b.smali
deleted file mode 100644
index e0ea832466..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/b$b.smali
+++ /dev/null
@@ -1,43 +0,0 @@
-.class public final Ln0/g0/h/b$b;
-.super Ljava/lang/Object;
-.source "ConscryptPlatform.kt"
-
-# interfaces
-.implements Lorg/conscrypt/ConscryptHostnameVerifier;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/h/b;->f(Ljavax/net/ssl/X509TrustManager;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final a:Ln0/g0/h/b$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/g0/h/b$b;
-
-    invoke-direct {v0}, Ln0/g0/h/b$b;-><init>()V
-
-    sput-object v0, Ln0/g0/h/b$b;->a:Ln0/g0/h/b$b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/b.smali b/com.discord/smali_classes2/n0/g0/h/b.smali
deleted file mode 100644
index b777c5111f..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/b.smali
+++ /dev/null
@@ -1,347 +0,0 @@
-.class public final Ln0/g0/h/b;
-.super Ln0/g0/h/f;
-.source "ConscryptPlatform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/h/b$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final e:Z
-
-.field public static final f:Ln0/g0/h/b$a;
-
-
-# instance fields
-.field public final d:Ljava/security/Provider;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    new-instance v0, Ln0/g0/h/b$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/g0/h/b$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/g0/h/b;->f:Ln0/g0/h/b$a;
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    const-string v1, "org.conscrypt.Conscrypt$Version"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    invoke-static {}, Lorg/conscrypt/Conscrypt;->isAvailable()Z
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_0
-
-    sget-object v1, Ln0/g0/h/b;->f:Ln0/g0/h/b$a;
-
-    const/4 v3, 0x2
-
-    invoke-virtual {v1, v3, v2, v0}, Ln0/g0/h/b$a;->a(III)Z
-
-    move-result v1
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eqz v1, :cond_0
-
-    const/4 v0, 0x1
-
-    :catch_0
-    :cond_0
-    sput-boolean v0, Ln0/g0/h/b;->e:Z
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ln0/g0/h/f;-><init>()V
-
-    invoke-static {}, Lorg/conscrypt/Conscrypt;->newProviderBuilder()Lorg/conscrypt/Conscrypt$ProviderBuilder;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Lorg/conscrypt/Conscrypt$ProviderBuilder;->provideTrustManager(Z)Lorg/conscrypt/Conscrypt$ProviderBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$ProviderBuilder;->build()Ljava/security/Provider;
-
-    move-result-object v0
-
-    const-string v1, "Conscrypt.newProviderBui\u2026rustManager(true).build()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v0, p0, Ln0/g0/h/b;->d:Ljava/security/Provider;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public d(Ljavax/net/ssl/SSLSocketFactory;)V
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocketFactory;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setUseEngineSocket(Ljavax/net/ssl/SSLSocketFactory;Z)V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    const-string p1, "socketFactory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p3, :cond_7
-
-    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    const/4 v0, 0x1
-
-    if-eqz p2, :cond_0
-
-    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setUseSessionTickets(Ljavax/net/ssl/SSLSocket;Z)V
-
-    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setHostname(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;)V
-
-    :cond_0
-    new-instance p2, Ljava/util/ArrayList;
-
-    invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p3
-
-    :cond_1
-    :goto_0
-    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_3
-
-    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v3, v1
-
-    check-cast v3, Ln0/y;
-
-    sget-object v4, Ln0/y;->d:Ln0/y;
-
-    if-eq v3, v4, :cond_2
-
-    const/4 v2, 0x1
-
-    :cond_2
-    if-eqz v2, :cond_1
-
-    invoke-virtual {p2, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_3
-    new-instance p3, Ljava/util/ArrayList;
-
-    const/16 v0, 0xa
-
-    invoke-static {p2, v0}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v0
-
-    invoke-direct {p3, v0}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {p2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :goto_1
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ln0/y;
-
-    iget-object v0, v0, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-virtual {p3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_4
-    new-array p2, v2, [Ljava/lang/String;
-
-    invoke-virtual {p3, p2}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_5
-
-    check-cast p2, [Ljava/lang/String;
-
-    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setApplicationProtocols(Ljavax/net/ssl/SSLSocket;[Ljava/lang/String;)V
-
-    goto :goto_2
-
-    :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    invoke-super {p0, p1, p2, p3}, Ln0/g0/h/f;->e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-
-    :goto_2
-    return-void
-
-    :cond_7
-    const-string p1, "protocols"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public f(Ljavax/net/ssl/X509TrustManager;)V
-    .locals 1
-
-    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/TrustManager;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object v0, Ln0/g0/h/b$b;->a:Ln0/g0/h/b$b;
-
-    check-cast v0, Lorg/conscrypt/ConscryptHostnameVerifier;
-
-    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setHostnameVerifier(Ljavax/net/ssl/TrustManager;Lorg/conscrypt/ConscryptHostnameVerifier;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 1
-
-    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->getApplicationProtocol(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-super {p0, p1}, Ln0/g0/h/f;->h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-
-    const/4 p1, 0x0
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public m()Ljavax/net/ssl/SSLContext;
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/h/b;->d:Ljava/security/Provider;
-
-    const-string v1, "TLS"
-
-    invoke-static {v1, v0}, Ljavax/net/ssl/SSLContext;->getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljavax/net/ssl/SSLContext;
-
-    move-result-object v0
-
-    const-string v1, "SSLContext.getInstance(\"TLS\", provider)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public n()Ljavax/net/ssl/X509TrustManager;
-    .locals 2
-
-    invoke-static {}, Lorg/conscrypt/Conscrypt;->getDefaultX509TrustManager()Ljavax/net/ssl/X509TrustManager;
-
-    move-result-object v0
-
-    const-string v1, "Conscrypt.getDefaultX509TrustManager()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/c$a.smali b/com.discord/smali_classes2/n0/g0/h/c$a.smali
deleted file mode 100644
index c28f8dae96..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/c$a.smali
+++ /dev/null
@@ -1,333 +0,0 @@
-.class public final Ln0/g0/h/c$a;
-.super Ljava/lang/Object;
-.source "Jdk8WithJettyBootPlatform.kt"
-
-# interfaces
-.implements Ljava/lang/reflect/InvocationHandler;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/h/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Z
-
-.field public b:Ljava/lang/String;
-
-.field public final c:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/c$a;->c:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Throwable;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_f
-
-    if-eqz p2, :cond_e
-
-    const/4 p1, 0x0
-
-    if-eqz p3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-array p3, p1, [Ljava/lang/Object;
-
-    :goto_0
-    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getReturnType()Ljava/lang/Class;
-
-    move-result-object v2
-
-    const-string v3, "supports"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    sget-object v3, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    invoke-static {v3, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    return-object p1
-
-    :cond_1
-    const-string v3, "unsupported"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    if-eqz v3, :cond_2
-
-    sget-object v3, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
-
-    invoke-static {v3, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    iput-boolean v4, p0, Ln0/g0/h/c$a;->a:Z
-
-    return-object v0
-
-    :cond_2
-    const-string v3, "protocols"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_4
-
-    array-length v3, p3
-
-    if-nez v3, :cond_3
-
-    const/4 v3, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eqz v3, :cond_4
-
-    iget-object p1, p0, Ln0/g0/h/c$a;->c:Ljava/util/List;
-
-    return-object p1
-
-    :cond_4
-    const-string v3, "selectProtocol"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    const-string v5, "null cannot be cast to non-null type kotlin.String"
-
-    if-nez v3, :cond_5
-
-    const-string v3, "select"
-
-    invoke-static {v1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_a
-
-    :cond_5
-    const-class v3, Ljava/lang/String;
-
-    invoke-static {v3, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_a
-
-    array-length v2, p3
-
-    if-ne v2, v4, :cond_a
-
-    aget-object v2, p3, p1
-
-    instance-of v2, v2, Ljava/util/List;
-
-    if-eqz v2, :cond_a
-
-    aget-object p2, p3, p1
-
-    if-eqz p2, :cond_9
-
-    check-cast p2, Ljava/util/List;
-
-    invoke-interface {p2}, Ljava/util/List;->size()I
-
-    move-result p3
-
-    if-ltz p3, :cond_8
-
-    const/4 v0, 0x0
-
-    :goto_2
-    invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_7
-
-    check-cast v1, Ljava/lang/String;
-
-    iget-object v2, p0, Ln0/g0/h/c$a;->c:Ljava/util/List;
-
-    invoke-interface {v2, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_6
-
-    iput-object v1, p0, Ln0/g0/h/c$a;->b:Ljava/lang/String;
-
-    return-object v1
-
-    :cond_6
-    if-eq v0, p3, :cond_8
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_2
-
-    :cond_7
-    new-instance p1, Lkotlin/TypeCastException;
-
-    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    iget-object p2, p0, Ln0/g0/h/c$a;->c:Ljava/util/List;
-
-    invoke-interface {p2, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/String;
-
-    iput-object p1, p0, Ln0/g0/h/c$a;->b:Ljava/lang/String;
-
-    return-object p1
-
-    :cond_9
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.collections.List<*>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_a
-    const-string v2, "protocolSelected"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_b
-
-    const-string v2, "selected"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_d
-
-    :cond_b
-    array-length v1, p3
-
-    if-ne v1, v4, :cond_d
-
-    aget-object p1, p3, p1
-
-    if-eqz p1, :cond_c
-
-    check-cast p1, Ljava/lang/String;
-
-    iput-object p1, p0, Ln0/g0/h/c$a;->b:Ljava/lang/String;
-
-    return-object v0
-
-    :cond_c
-    new-instance p1, Lkotlin/TypeCastException;
-
-    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_d
-    array-length p1, p3
-
-    invoke-static {p3, p1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-virtual {p2, p0, p1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_e
-    const-string p1, "method"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_f
-    const-string p1, "proxy"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/c.smali b/com.discord/smali_classes2/n0/g0/h/c.smali
deleted file mode 100644
index b06f965fd0..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/c.smali
+++ /dev/null
@@ -1,383 +0,0 @@
-.class public final Ln0/g0/h/c;
-.super Ln0/g0/h/f;
-.source "Jdk8WithJettyBootPlatform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/h/c$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/reflect/Method;
-
-.field public final e:Ljava/lang/reflect/Method;
-
-.field public final f:Ljava/lang/reflect/Method;
-
-.field public final g:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field public final h:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Class;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Method;",
-            "Ljava/lang/reflect/Method;",
-            "Ljava/lang/reflect/Method;",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Class<",
-            "*>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ln0/g0/h/f;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/c;->d:Ljava/lang/reflect/Method;
-
-    iput-object p2, p0, Ln0/g0/h/c;->e:Ljava/lang/reflect/Method;
-
-    iput-object p3, p0, Ln0/g0/h/c;->f:Ljava/lang/reflect/Method;
-
-    iput-object p4, p0, Ln0/g0/h/c;->g:Ljava/lang/Class;
-
-    iput-object p5, p0, Ln0/g0/h/c;->h:Ljava/lang/Class;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljavax/net/ssl/SSLSocket;)V
-    .locals 5
-
-    const-string v0, "failed to remove ALPN"
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_0
-
-    :try_start_0
-    iget-object v2, p0, Ln0/g0/h/c;->f:Ljava/lang/reflect/Method;
-
-    const/4 v3, 0x1
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    const/4 v4, 0x0
-
-    aput-object p1, v3, v4
-
-    invoke-virtual {v2, v1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :cond_0
-    const-string p1, "sslSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string p2, "failed to set ALPN"
-
-    const/4 v0, 0x0
-
-    if-eqz p3, :cond_4
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p3
-
-    :cond_0
-    :goto_0
-    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object v5, v2
-
-    check-cast v5, Ln0/y;
-
-    sget-object v6, Ln0/y;->d:Ln0/y;
-
-    if-eq v5, v6, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eqz v3, :cond_0
-
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p3, Ljava/util/ArrayList;
-
-    const/16 v2, 0xa
-
-    invoke-static {v1, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v2
-
-    invoke-direct {p3, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_2
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ln0/y;
-
-    iget-object v2, v2, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-virtual {p3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_3
-    :try_start_0
-    const-class v1, Ln0/g0/h/f;
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v1
-
-    const/4 v2, 0x2
-
-    new-array v5, v2, [Ljava/lang/Class;
-
-    iget-object v6, p0, Ln0/g0/h/c;->g:Ljava/lang/Class;
-
-    aput-object v6, v5, v4
-
-    iget-object v6, p0, Ln0/g0/h/c;->h:Ljava/lang/Class;
-
-    aput-object v6, v5, v3
-
-    new-instance v6, Ln0/g0/h/c$a;
-
-    invoke-direct {v6, p3}, Ln0/g0/h/c$a;-><init>(Ljava/util/List;)V
-
-    invoke-static {v1, v5, v6}, Ljava/lang/reflect/Proxy;->newProxyInstance(Ljava/lang/ClassLoader;[Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;
-
-    move-result-object p3
-
-    iget-object v1, p0, Ln0/g0/h/c;->d:Ljava/lang/reflect/Method;
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    aput-object p1, v2, v4
-
-    aput-object p3, v2, v3
-
-    invoke-virtual {v1, v0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance p3, Ljava/lang/AssertionError;
-
-    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p3
-
-    :catch_1
-    move-exception p1
-
-    new-instance p3, Ljava/lang/AssertionError;
-
-    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p3
-
-    :cond_4
-    const-string p1, "protocols"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 4
-
-    const-string v0, "failed to get ALPN selected protocol"
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/h/c;->e:Ljava/lang/reflect/Method;
-
-    const/4 v2, 0x1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    aput-object p1, v2, v3
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v1, p1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-static {v1}, Ljava/lang/reflect/Proxy;->getInvocationHandler(Ljava/lang/Object;)Ljava/lang/reflect/InvocationHandler;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_2
-
-    check-cast v1, Ln0/g0/h/c$a;
-
-    iget-boolean v2, v1, Ln0/g0/h/c$a;->a:Z
-
-    if-nez v2, :cond_0
-
-    iget-object v2, v1, Ln0/g0/h/c$a;->b:Ljava/lang/String;
-
-    if-nez v2, :cond_0
-
-    sget-object v1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    const/4 v2, 0x4
-
-    const-string v3, "ALPN callback dropped: HTTP/2 is disabled. Is alpn-boot on the boot class path?"
-
-    invoke-virtual {v1, v2, v3, p1}, Ln0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
-
-    return-object p1
-
-    :cond_0
-    iget-boolean v2, v1, Ln0/g0/h/c$a;->a:Z
-
-    if-eqz v2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object p1, v1, Ln0/g0/h/c$a;->b:Ljava/lang/String;
-
-    :goto_0
-    return-object p1
-
-    :cond_2
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type okhttp3.internal.platform.Jdk8WithJettyBootPlatform.AlpnProvider"
-
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/d.smali b/com.discord/smali_classes2/n0/g0/h/d.smali
deleted file mode 100644
index ced08c770a..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/d.smali
+++ /dev/null
@@ -1,246 +0,0 @@
-.class public final Ln0/g0/h/d;
-.super Ln0/g0/h/f;
-.source "Jdk9Platform.kt"
-
-
-# instance fields
-.field public final d:Ljava/lang/reflect/Method;
-
-.field public final e:Ljava/lang/reflect/Method;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
-    .locals 0
-
-    invoke-direct {p0}, Ln0/g0/h/f;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/d;->d:Ljava/lang/reflect/Method;
-
-    iput-object p2, p0, Ln0/g0/h/d;->e:Ljava/lang/reflect/Method;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string p2, "failed to set SSL parameters"
-
-    if-eqz p3, :cond_5
-
-    :try_start_0
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getSSLParameters()Ljavax/net/ssl/SSLParameters;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p3
-
-    :cond_0
-    :goto_0
-    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object v5, v2
-
-    check-cast v5, Ln0/y;
-
-    sget-object v6, Ln0/y;->d:Ln0/y;
-
-    if-eq v5, v6, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eqz v3, :cond_0
-
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p3, Ljava/util/ArrayList;
-
-    const/16 v2, 0xa
-
-    invoke-static {v1, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v2
-
-    invoke-direct {p3, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_2
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ln0/y;
-
-    iget-object v2, v2, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-virtual {p3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_3
-    iget-object v1, p0, Ln0/g0/h/d;->d:Ljava/lang/reflect/Method;
-
-    new-array v2, v3, [Ljava/lang/Object;
-
-    new-array v3, v4, [Ljava/lang/String;
-
-    invoke-virtual {p3, v3}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p3
-
-    if-eqz p3, :cond_4
-
-    aput-object p3, v2, v4
-
-    invoke-virtual {v1, v0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-virtual {p1, v0}, Ljavax/net/ssl/SSLSocket;->setSSLParameters(Ljavax/net/ssl/SSLParameters;)V
-
-    return-void
-
-    :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p3, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance p3, Ljava/lang/AssertionError;
-
-    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p3
-
-    :catch_1
-    move-exception p1
-
-    new-instance p3, Ljava/lang/AssertionError;
-
-    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p3
-
-    :cond_5
-    const-string p1, "protocols"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "failed to get ALPN selected protocol"
-
-    :try_start_0
-    iget-object v1, p0, Ln0/g0/h/d;->e:Ljava/lang/reflect/Method;
-
-    const/4 v2, 0x0
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-virtual {v1, p1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/String;
-
-    if-nez p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, ""
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-    :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eqz v0, :cond_1
-
-    :goto_0
-    const/4 p1, 0x0
-
-    :cond_1
-    return-object p1
-
-    :catch_0
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    move-exception p1
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/e.smali b/com.discord/smali_classes2/n0/g0/h/e.smali
deleted file mode 100644
index b604fa4a6b..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/e.smali
+++ /dev/null
@@ -1,365 +0,0 @@
-.class public final Ln0/g0/h/e;
-.super Ln0/g0/h/f;
-.source "OpenJSSEPlatform.kt"
-
-
-# static fields
-.field public static final e:Z
-
-.field public static final f:Ln0/g0/h/e;
-
-
-# instance fields
-.field public final d:Ljava/security/Provider;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    :try_start_0
-    const-string v0, "org.openjsse.net.ssl.OpenJSSE"
-
-    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :catch_0
-    const/4 v0, 0x0
-
-    :goto_0
-    sput-boolean v0, Ln0/g0/h/e;->e:Z
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ln0/g0/h/f;-><init>()V
-
-    new-instance v0, Lorg/openjsse/net/ssl/OpenJSSE;
-
-    invoke-direct {v0}, Lorg/openjsse/net/ssl/OpenJSSE;-><init>()V
-
-    check-cast v0, Ljava/security/Provider;
-
-    iput-object v0, p0, Ln0/g0/h/e;->d:Ljava/security/Provider;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p3, :cond_7
-
-    instance-of v0, p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
-
-    if-eqz v0, :cond_5
-
-    check-cast p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
-
-    invoke-virtual {p1}, Lorg/openjsse/javax/net/ssl/SSLSocket;->getSSLParameters()Ljavax/net/ssl/SSLParameters;
-
-    move-result-object p2
-
-    instance-of v0, p2, Lorg/openjsse/javax/net/ssl/SSLParameters;
-
-    if-eqz v0, :cond_6
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p3
-
-    :cond_0
-    :goto_0
-    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v3, v1
-
-    check-cast v3, Ln0/y;
-
-    sget-object v4, Ln0/y;->d:Ln0/y;
-
-    if-eq v3, v4, :cond_1
-
-    const/4 v2, 0x1
-
-    :cond_1
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p3, Ljava/util/ArrayList;
-
-    const/16 v1, 0xa
-
-    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v1
-
-    invoke-direct {p3, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ln0/y;
-
-    iget-object v1, v1, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-virtual {p3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_3
-    move-object v0, p2
-
-    check-cast v0, Lorg/openjsse/javax/net/ssl/SSLParameters;
-
-    new-array v1, v2, [Ljava/lang/String;
-
-    invoke-virtual {p3, v1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p3
-
-    if-eqz p3, :cond_4
-
-    check-cast p3, [Ljava/lang/String;
-
-    invoke-virtual {v0, p3}, Lorg/openjsse/javax/net/ssl/SSLParameters;->setApplicationProtocols([Ljava/lang/String;)V
-
-    invoke-virtual {p1, p2}, Lorg/openjsse/javax/net/ssl/SSLSocket;->setSSLParameters(Ljavax/net/ssl/SSLParameters;)V
-
-    goto :goto_2
-
-    :cond_4
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    invoke-super {p0, p1, p2, p3}, Ln0/g0/h/f;->e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-
-    :cond_6
-    :goto_2
-    return-void
-
-    :cond_7
-    const-string p1, "protocols"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 1
-
-    instance-of v0, p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
-
-    invoke-virtual {p1}, Lorg/openjsse/javax/net/ssl/SSLSocket;->getApplicationProtocol()Ljava/lang/String;
-
-    move-result-object p1
-
-    if-nez p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, ""
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    goto :goto_0
-
-    :cond_1
-    invoke-super {p0, p1}, Ln0/g0/h/f;->h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-
-    :goto_0
-    const/4 p1, 0x0
-
-    :cond_2
-    return-object p1
-.end method
-
-.method public m()Ljavax/net/ssl/SSLContext;
-    .locals 2
-
-    iget-object v0, p0, Ln0/g0/h/e;->d:Ljava/security/Provider;
-
-    const-string v1, "TLSv1.3"
-
-    invoke-static {v1, v0}, Ljavax/net/ssl/SSLContext;->getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljavax/net/ssl/SSLContext;
-
-    move-result-object v0
-
-    const-string v1, "SSLContext.getInstance(\"TLSv1.3\", provider)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public n()Ljavax/net/ssl/X509TrustManager;
-    .locals 4
-
-    invoke-static {}, Ljavax/net/ssl/TrustManagerFactory;->getDefaultAlgorithm()Ljava/lang/String;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/g0/h/e;->d:Ljava/security/Provider;
-
-    invoke-static {v0, v1}, Ljavax/net/ssl/TrustManagerFactory;->getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljavax/net/ssl/TrustManagerFactory;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
-
-    const-string v2, "factory"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljavax/net/ssl/TrustManagerFactory;->getTrustManagers()[Ljavax/net/ssl/TrustManager;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_3
-
-    array-length v1, v0
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-ne v1, v2, :cond_0
-
-    aget-object v1, v0, v3
-
-    instance-of v1, v1, Ljavax/net/ssl/X509TrustManager;
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_2
-
-    aget-object v0, v0, v3
-
-    if-eqz v0, :cond_1
-
-    check-cast v0, Ljavax/net/ssl/X509TrustManager;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type javax.net.ssl.X509TrustManager"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "Unexpected default trust managers: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-static {v0}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v2, "java.util.Arrays.toString(this)"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/f$a.smali b/com.discord/smali_classes2/n0/g0/h/f$a.smali
deleted file mode 100644
index 86b035bb12..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/f$a.smali
+++ /dev/null
@@ -1,180 +0,0 @@
-.class public final Ln0/g0/h/f$a;
-.super Ljava/lang/Object;
-.source "Platform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/h/f;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/util/List;)Ljava/util/List;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_0
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v2, v1
-
-    check-cast v2, Ln0/y;
-
-    sget-object v3, Ln0/y;->d:Ln0/y;
-
-    if-eq v2, v3, :cond_1
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p1, Ljava/util/ArrayList;
-
-    const/16 v1, 0xa
-
-    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v1
-
-    invoke-direct {p1, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_2
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ln0/y;
-
-    iget-object v1, v1, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_3
-    return-object p1
-.end method
-
-.method public final b(Ljava/util/List;)[B
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)[B"
-        }
-    .end annotation
-
-    new-instance v0, Lo0/e;
-
-    invoke-direct {v0}, Lo0/e;-><init>()V
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/f$a;->a(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/util/ArrayList;
-
-    invoke-virtual {p1}, Ljava/util/ArrayList;->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, Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    invoke-virtual {v0, v2}, Lo0/e;->I(I)Lo0/e;
-
-    invoke-virtual {v0, v1}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
-
-    goto :goto_0
-
-    :cond_0
-    iget-wide v1, v0, Lo0/e;->e:J
-
-    invoke-virtual {v0, v1, v2}, Lo0/e;->t0(J)[B
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/f.smali b/com.discord/smali_classes2/n0/g0/h/f.smali
deleted file mode 100644
index 90b68a4264..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/f.smali
+++ /dev/null
@@ -1,759 +0,0 @@
-.class public Ln0/g0/h/f;
-.super Ljava/lang/Object;
-.source "Platform.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/h/f$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static volatile a:Ln0/g0/h/f;
-
-.field public static final b:Ljava/util/logging/Logger;
-
-.field public static final c:Ln0/g0/h/f$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 12
-
-    new-instance v0, Ln0/g0/h/f$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/g0/h/f$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    if-eqz v0, :cond_9
-
-    sget-object v0, Ln0/g0/h/a;->g:Ln0/g0/h/a$b;
-
-    sget-boolean v0, Ln0/g0/h/a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Ln0/g0/h/a;
-
-    invoke-direct {v0}, Ln0/g0/h/a;-><init>()V
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, v1
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    goto/16 :goto_5
-
-    :cond_1
-    invoke-static {}, Ljava/security/Security;->getProviders()[Ljava/security/Provider;
-
-    move-result-object v0
-
-    const/4 v2, 0x0
-
-    aget-object v0, v0, v2
-
-    const-string v3, "Security.getProviders()[0]"
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/security/Provider;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v4, "Conscrypt"
-
-    invoke-static {v4, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    sget-object v0, Ln0/g0/h/b;->f:Ln0/g0/h/b$a;
-
-    sget-boolean v0, Ln0/g0/h/b;->e:Z
-
-    if-eqz v0, :cond_2
-
-    new-instance v0, Ln0/g0/h/b;
-
-    invoke-direct {v0}, Ln0/g0/h/b;-><init>()V
-
-    goto :goto_1
-
-    :cond_2
-    move-object v0, v1
-
-    :goto_1
-    if-eqz v0, :cond_3
-
-    goto/16 :goto_5
-
-    :cond_3
-    invoke-static {}, Ljava/security/Security;->getProviders()[Ljava/security/Provider;
-
-    move-result-object v0
-
-    aget-object v0, v0, v2
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/security/Provider;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v3, "OpenJSSE"
-
-    invoke-static {v3, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    sget-object v0, Ln0/g0/h/e;->f:Ln0/g0/h/e;
-
-    sget-boolean v0, Ln0/g0/h/e;->e:Z
-
-    if-eqz v0, :cond_4
-
-    new-instance v0, Ln0/g0/h/e;
-
-    invoke-direct {v0}, Ln0/g0/h/e;-><init>()V
-
-    goto :goto_2
-
-    :cond_4
-    move-object v0, v1
-
-    :goto_2
-    if-eqz v0, :cond_5
-
-    goto/16 :goto_5
-
-    :cond_5
-    const/4 v0, 0x1
-
-    :try_start_0
-    const-class v3, Ljavax/net/ssl/SSLParameters;
-
-    const-string v4, "setApplicationProtocols"
-
-    new-array v5, v0, [Ljava/lang/Class;
-
-    const-class v6, [Ljava/lang/String;
-
-    aput-object v6, v5, v2
-
-    invoke-virtual {v3, v4, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v3
-
-    const-class v4, Ljavax/net/ssl/SSLSocket;
-
-    const-string v5, "getApplicationProtocol"
-
-    new-array v6, v2, [Ljava/lang/Class;
-
-    invoke-virtual {v4, v5, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v4
-
-    new-instance v5, Ln0/g0/h/d;
-
-    const-string v6, "setProtocolMethod"
-
-    invoke-static {v3, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "getProtocolMethod"
-
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v5, v3, v4}, Ln0/g0/h/d;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
-    :try_end_0
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_3
-
-    :catch_0
-    move-object v5, v1
-
-    :goto_3
-    if-eqz v5, :cond_6
-
-    move-object v0, v5
-
-    goto/16 :goto_5
-
-    :cond_6
-    const-string v3, "java.specification.version"
-
-    const-string v4, "unknown"
-
-    invoke-static {v3, v4}, Ljava/lang/System;->getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v3
-
-    :try_start_1
-    const-string v4, "jvmVersion"
-
-    invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v3}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v3
-    :try_end_1
-    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_1
-
-    const/16 v4, 0x9
-
-    if-lt v3, v4, :cond_7
-
-    goto :goto_4
-
-    :catch_1
-    :cond_7
-    const-string v3, "org.eclipse.jetty.alpn.ALPN"
-
-    :try_start_2
-    invoke-static {v3, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
-
-    move-result-object v3
-
-    const-string v4, "org.eclipse.jetty.alpn.ALPN$Provider"
-
-    invoke-static {v4, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    const-string v5, "org.eclipse.jetty.alpn.ALPN$ClientProvider"
-
-    invoke-static {v5, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
-
-    move-result-object v10
-
-    const-string v5, "org.eclipse.jetty.alpn.ALPN$ServerProvider"
-
-    invoke-static {v5, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
-
-    move-result-object v11
-
-    const-string v5, "put"
-
-    const/4 v6, 0x2
-
-    new-array v6, v6, [Ljava/lang/Class;
-
-    const-class v7, Ljavax/net/ssl/SSLSocket;
-
-    aput-object v7, v6, v2
-
-    aput-object v4, v6, v0
-
-    invoke-virtual {v3, v5, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v7
-
-    const-string v4, "get"
-
-    new-array v5, v0, [Ljava/lang/Class;
-
-    const-class v6, Ljavax/net/ssl/SSLSocket;
-
-    aput-object v6, v5, v2
-
-    invoke-virtual {v3, v4, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v8
-
-    const-string v4, "remove"
-
-    new-array v0, v0, [Ljava/lang/Class;
-
-    const-class v5, Ljavax/net/ssl/SSLSocket;
-
-    aput-object v5, v0, v2
-
-    invoke-virtual {v3, v4, v0}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v9
-
-    new-instance v0, Ln0/g0/h/c;
-
-    const-string v2, "putMethod"
-
-    invoke-static {v7, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v2, "getMethod"
-
-    invoke-static {v8, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v2, "removeMethod"
-
-    invoke-static {v9, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v2, "clientProviderClass"
-
-    invoke-static {v10, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v2, "serverProviderClass"
-
-    invoke-static {v11, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v6, v0
-
-    invoke-direct/range {v6 .. v11}, Ln0/g0/h/c;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Class;)V
-    :try_end_2
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_2 .. :try_end_2} :catch_2
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_2 .. :try_end_2} :catch_2
-
-    move-object v1, v0
-
-    goto :goto_4
-
-    :catch_2
-    nop
-
-    :goto_4
-    if-eqz v1, :cond_8
-
-    move-object v0, v1
-
-    goto :goto_5
-
-    :cond_8
-    new-instance v0, Ln0/g0/h/f;
-
-    invoke-direct {v0}, Ln0/g0/h/f;-><init>()V
-
-    :goto_5
-    sput-object v0, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    const-class v0, Ln0/x;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/h/f;->b:Ljava/util/logging/Logger;
-
-    return-void
-
-    :cond_9
-    throw v1
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljavax/net/ssl/SSLSocket;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "sslSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public b(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/c;
-    .locals 1
-
-    new-instance v0, Ln0/g0/j/a;
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/f;->c(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/e;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ln0/g0/j/a;-><init>(Ln0/g0/j/e;)V
-
-    return-object v0
-.end method
-
-.method public c(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/e;
-    .locals 2
-
-    new-instance v0, Ln0/g0/j/b;
-
-    invoke-interface {p1}, Ljavax/net/ssl/X509TrustManager;->getAcceptedIssuers()[Ljava/security/cert/X509Certificate;
-
-    move-result-object p1
-
-    const-string v1, "trustManager.acceptedIssuers"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v1, p1
-
-    invoke-static {p1, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Ljava/security/cert/X509Certificate;
-
-    invoke-direct {v0, p1}, Ln0/g0/j/b;-><init>([Ljava/security/cert/X509Certificate;)V
-
-    return-object v0
-.end method
-
-.method public d(Ljavax/net/ssl/SSLSocketFactory;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "socketFactory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "protocols"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public f(Ljavax/net/ssl/X509TrustManager;)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public g(Ljava/net/Socket;Ljava/net/InetSocketAddress;I)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {p1, p2, p3}, Ljava/net/Socket;->connect(Ljava/net/SocketAddress;I)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "address"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "socket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 0
-
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
-
-.method public i(Ljava/lang/String;)Ljava/lang/Object;
-    .locals 2
-
-    sget-object v0, Ln0/g0/h/f;->b:Ljava/util/logging/Logger;
-
-    sget-object v1, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
-
-    invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Ljava/lang/Throwable;
-
-    invoke-direct {v0, p1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public j(Ljava/lang/String;)Z
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    const-string p1, "hostname"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public k(ILjava/lang/String;Ljava/lang/Throwable;)V
-    .locals 1
-
-    if-eqz p2, :cond_1
-
-    const/4 v0, 0x5
-
-    if-ne p1, v0, :cond_0
-
-    sget-object p1, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
-
-    goto :goto_0
-
-    :cond_0
-    sget-object p1, Ljava/util/logging/Level;->INFO:Ljava/util/logging/Level;
-
-    :goto_0
-    sget-object v0, Ln0/g0/h/f;->b:Ljava/util/logging/Logger;
-
-    invoke-virtual {v0, p1, p2, p3}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public l(Ljava/lang/String;Ljava/lang/Object;)V
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    if-nez p2, :cond_0
-
-    const-string v0, " To see where this was allocated, set the OkHttpClient logger level to FINE: Logger.getLogger(OkHttpClient.class.getName()).setLevel(Level.FINE);"
-
-    invoke-static {p1, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    :cond_0
-    const/4 v0, 0x5
-
-    check-cast p2, Ljava/lang/Throwable;
-
-    invoke-virtual {p0, v0, p1, p2}, Ln0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_1
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public m()Ljavax/net/ssl/SSLContext;
-    .locals 2
-
-    const-string v0, "TLS"
-
-    invoke-static {v0}, Ljavax/net/ssl/SSLContext;->getInstance(Ljava/lang/String;)Ljavax/net/ssl/SSLContext;
-
-    move-result-object v0
-
-    const-string v1, "SSLContext.getInstance(\"TLS\")"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public n()Ljavax/net/ssl/X509TrustManager;
-    .locals 4
-
-    invoke-static {}, Ljavax/net/ssl/TrustManagerFactory;->getDefaultAlgorithm()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljavax/net/ssl/TrustManagerFactory;->getInstance(Ljava/lang/String;)Ljavax/net/ssl/TrustManagerFactory;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
-
-    const-string v2, "factory"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljavax/net/ssl/TrustManagerFactory;->getTrustManagers()[Ljavax/net/ssl/TrustManager;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_3
-
-    array-length v1, v0
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-ne v1, v2, :cond_0
-
-    aget-object v1, v0, v3
-
-    instance-of v1, v1, Ljavax/net/ssl/X509TrustManager;
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_2
-
-    aget-object v0, v0, v3
-
-    if-eqz v0, :cond_1
-
-    check-cast v0, Ljavax/net/ssl/X509TrustManager;
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type javax.net.ssl.X509TrustManager"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string v1, "Unexpected default trust managers: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-static {v0}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v2, "java.util.Arrays.toString(this)"
-
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "javaClass.simpleName"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/g/a.smali b/com.discord/smali_classes2/n0/g0/h/g/a.smali
deleted file mode 100644
index f30ad6230b..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/g/a.smali
+++ /dev/null
@@ -1,301 +0,0 @@
-.class public Ln0/g0/h/g/a;
-.super Ljava/lang/Object;
-.source "AndroidSocketAdapter.kt"
-
-# interfaces
-.implements Ln0/g0/h/g/e;
-
-
-# instance fields
-.field public final a:Ljava/lang/reflect/Method;
-
-.field public final b:Ljava/lang/reflect/Method;
-
-.field public final c:Ljava/lang/reflect/Method;
-
-.field public final d:Ljava/lang/reflect/Method;
-
-.field public final e:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "-",
-            "Ljavax/net/ssl/SSLSocket;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "-",
-            "Ljavax/net/ssl/SSLSocket;",
-            ">;)V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/g/a;->e:Ljava/lang/Class;
-
-    const/4 v0, 0x1
-
-    new-array v1, v0, [Ljava/lang/Class;
-
-    sget-object v2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    const-string v2, "setUseSessionTickets"
-
-    invoke-virtual {p1, v2, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    const-string v1, "sslSocketClass.getDeclar\u2026:class.javaPrimitiveType)"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Ln0/g0/h/g/a;->a:Ljava/lang/reflect/Method;
-
-    iget-object p1, p0, Ln0/g0/h/g/a;->e:Ljava/lang/Class;
-
-    new-array v1, v0, [Ljava/lang/Class;
-
-    const-class v2, Ljava/lang/String;
-
-    aput-object v2, v1, v3
-
-    const-string v2, "setHostname"
-
-    invoke-virtual {p1, v2, v1}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/h/g/a;->b:Ljava/lang/reflect/Method;
-
-    iget-object p1, p0, Ln0/g0/h/g/a;->e:Ljava/lang/Class;
-
-    new-array v1, v3, [Ljava/lang/Class;
-
-    const-string v2, "getAlpnSelectedProtocol"
-
-    invoke-virtual {p1, v2, v1}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/h/g/a;->c:Ljava/lang/reflect/Method;
-
-    iget-object p1, p0, Ln0/g0/h/g/a;->e:Ljava/lang/Class;
-
-    new-array v0, v0, [Ljava/lang/Class;
-
-    const-class v1, [B
-
-    aput-object v1, v0, v3
-
-    const-string v1, "setAlpnProtocols"
-
-    invoke-virtual {p1, v1, v0}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/h/g/a;->d:Ljava/lang/reflect/Method;
-
-    return-void
-
-    :cond_0
-    const-string p1, "sslSocketClass"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 1
-
-    sget-object v0, Ln0/g0/h/a;->g:Ln0/g0/h/a$b;
-
-    sget-boolean v0, Ln0/g0/h/a;->f:Z
-
-    return v0
-.end method
-
-.method public b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 3
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/g/a;->c(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return-object v1
-
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/h/g/a;->c:Ljava/lang/reflect/Method;
-
-    const/4 v2, 0x0
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-virtual {v0, p1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [B
-
-    if-eqz p1, :cond_1
-
-    sget-object v0, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
-
-    const-string v1, "StandardCharsets.UTF_8"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v1, Ljava/lang/String;
-
-    invoke-direct {v1, p1, v0}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
-    :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :cond_1
-    return-object v1
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-.end method
-
-.method public c(Ljavax/net/ssl/SSLSocket;)Z
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/h/g/a;->e:Ljava/lang/Class;
-
-    invoke-virtual {v0, p1}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/g/a;->c(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-eqz p2, :cond_0
-
-    :try_start_0
-    iget-object v2, p0, Ln0/g0/h/g/a;->a:Ljava/lang/reflect/Method;
-
-    new-array v3, v1, [Ljava/lang/Object;
-
-    sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    aput-object v4, v3, v0
-
-    invoke-virtual {v2, p1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    iget-object v2, p0, Ln0/g0/h/g/a;->b:Ljava/lang/reflect/Method;
-
-    new-array v3, v1, [Ljava/lang/Object;
-
-    aput-object p2, v3, v0
-
-    invoke-virtual {v2, p1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_0
-    iget-object p2, p0, Ln0/g0/h/g/a;->d:Ljava/lang/reflect/Method;
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    sget-object v2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    invoke-virtual {v2, p3}, Ln0/g0/h/f$a;->b(Ljava/util/List;)[B
-
-    move-result-object p3
-
-    aput-object p3, v1, v0
-
-    invoke-virtual {p2, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance p2, Ljava/lang/AssertionError;
-
-    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p2
-
-    :catch_1
-    move-exception p1
-
-    new-instance p2, Ljava/lang/AssertionError;
-
-    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p2
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/g/b.smali b/com.discord/smali_classes2/n0/g0/h/g/b.smali
deleted file mode 100644
index 173ebdb3de..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/g/b.smali
+++ /dev/null
@@ -1,27 +0,0 @@
-.class public final Ln0/g0/h/g/b;
-.super Ljava/lang/Object;
-.source "CloseGuard.kt"
-
-
-# instance fields
-.field public final a:Ljava/lang/reflect/Method;
-
-.field public final b:Ljava/lang/reflect/Method;
-
-.field public final c:Ljava/lang/reflect/Method;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/g/b;->a:Ljava/lang/reflect/Method;
-
-    iput-object p2, p0, Ln0/g0/h/g/b;->b:Ljava/lang/reflect/Method;
-
-    iput-object p3, p0, Ln0/g0/h/g/b;->c:Ljava/lang/reflect/Method;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/g/c.smali b/com.discord/smali_classes2/n0/g0/h/g/c.smali
deleted file mode 100644
index 5b2bea102e..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/g/c.smali
+++ /dev/null
@@ -1,143 +0,0 @@
-.class public final Ln0/g0/h/g/c;
-.super Ljava/lang/Object;
-.source "ConscryptSocketAdapter.kt"
-
-# interfaces
-.implements Ln0/g0/h/g/e;
-
-
-# static fields
-.field public static final a:Ln0/g0/h/g/c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/g0/h/g/c;
-
-    invoke-direct {v0}, Ln0/g0/h/g/c;-><init>()V
-
-    sput-object v0, Ln0/g0/h/g/c;->a:Ln0/g0/h/g/c;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 1
-
-    sget-object v0, Ln0/g0/h/b;->f:Ln0/g0/h/b$a;
-
-    sget-boolean v0, Ln0/g0/h/b;->e:Z
-
-    return v0
-.end method
-
-.method public b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/g/c;->c(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->getApplicationProtocol(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public c(Ljavax/net/ssl/SSLSocket;)Z
-    .locals 0
-
-    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/g/c;->c(Ljavax/net/ssl/SSLSocket;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    if-eqz p2, :cond_0
-
-    const/4 v0, 0x1
-
-    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setUseSessionTickets(Ljavax/net/ssl/SSLSocket;Z)V
-
-    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setHostname(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;)V
-
-    :cond_0
-    sget-object p2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    invoke-virtual {p2, p3}, Ln0/g0/h/f$a;->a(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p2
-
-    const/4 p3, 0x0
-
-    new-array p3, p3, [Ljava/lang/String;
-
-    check-cast p2, Ljava/util/ArrayList;
-
-    invoke-virtual {p2, p3}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_1
-
-    check-cast p2, [Ljava/lang/String;
-
-    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setApplicationProtocols(Ljavax/net/ssl/SSLSocket;[Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/g/d.smali b/com.discord/smali_classes2/n0/g0/h/g/d.smali
deleted file mode 100644
index 911c524378..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/g/d.smali
+++ /dev/null
@@ -1,230 +0,0 @@
-.class public final Ln0/g0/h/g/d;
-.super Ljava/lang/Object;
-.source "DeferredSocketAdapter.kt"
-
-# interfaces
-.implements Ln0/g0/h/g/e;
-
-
-# instance fields
-.field public a:Z
-
-.field public b:Ln0/g0/h/g/e;
-
-.field public final c:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/h/g/d;->c:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/g/d;->e(Ljavax/net/ssl/SSLSocket;)Ln0/g0/h/g/e;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0, p1}, Ln0/g0/h/g/e;->b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public c(Ljavax/net/ssl/SSLSocket;)Z
-    .locals 3
-
-    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "sslSocket.javaClass.name"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Ln0/g0/h/g/d;->c:Ljava/lang/String;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p1, v0, v1, v2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0, p1}, Ln0/g0/h/g/d;->e(Ljavax/net/ssl/SSLSocket;)Ln0/g0/h/g/e;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0, p1, p2, p3}, Ln0/g0/h/g/e;->d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public final declared-synchronized e(Ljavax/net/ssl/SSLSocket;)Ln0/g0/h/g/e;
-    .locals 5
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/h/g/d;->a:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x1
-
-    :try_start_1
-    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p1
-
-    :goto_0
-    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v3, p0, Ln0/g0/h/g/d;->c:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, ".OpenSSLSocketImpl"
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    xor-int/2addr v1, v0
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
-
-    move-result-object p1
-
-    const-string v1, "possibleClass.superclass"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Ln0/g0/h/g/a;
-
-    invoke-direct {v1, p1}, Ln0/g0/h/g/a;-><init>(Ljava/lang/Class;)V
-
-    iput-object v1, p0, Ln0/g0/h/g/d;->b:Ln0/g0/h/g/e;
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception p1
-
-    :try_start_2
-    sget-object v1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    const/4 v2, 0x5
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v4, "Failed to initialize DeferredSocketAdapter "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v4, p0, Ln0/g0/h/g/d;->c:Ljava/lang/String;
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v2, v3, p1}, Ln0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
-
-    :goto_1
-    iput-boolean v0, p0, Ln0/g0/h/g/d;->a:Z
-
-    :cond_1
-    iget-object p1, p0, Ln0/g0/h/g/d;->b:Ln0/g0/h/g/e;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    monitor-exit p0
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/g/e.smali b/com.discord/smali_classes2/n0/g0/h/g/e.smali
deleted file mode 100644
index f4c24aade5..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/g/e.smali
+++ /dev/null
@@ -1,28 +0,0 @@
-.class public interface abstract Ln0/g0/h/g/e;
-.super Ljava/lang/Object;
-.source "SocketAdapter.kt"
-
-
-# virtual methods
-.method public abstract a()Z
-.end method
-
-.method public abstract b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
-.end method
-
-.method public abstract c(Ljavax/net/ssl/SSLSocket;)Z
-.end method
-
-.method public abstract d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljavax/net/ssl/SSLSocket;",
-            "Ljava/lang/String;",
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;)V"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/g/f$a.smali b/com.discord/smali_classes2/n0/g0/h/g/f$a.smali
deleted file mode 100644
index a65daced1a..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/g/f$a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Ln0/g0/h/g/f$a;
-.super Ljava/lang/Object;
-.source "StandardAndroidSocketAdapter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/h/g/f;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/h/g/f.smali b/com.discord/smali_classes2/n0/g0/h/g/f.smali
deleted file mode 100644
index 4dfad47b71..0000000000
--- a/com.discord/smali_classes2/n0/g0/h/g/f.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public final Ln0/g0/h/g/f;
-.super Ln0/g0/h/g/a;
-.source "StandardAndroidSocketAdapter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/h/g/f$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:Ln0/g0/h/g/f$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ln0/g0/h/g/f$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/g0/h/g/f$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/g0/h/g/f;->f:Ln0/g0/h/g/f$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "-",
-            "Ljavax/net/ssl/SSLSocket;",
-            ">;",
-            "Ljava/lang/Class<",
-            "-",
-            "Ljavax/net/ssl/SSLSocketFactory;",
-            ">;",
-            "Ljava/lang/Class<",
-            "*>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Ln0/g0/h/g/a;-><init>(Ljava/lang/Class;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/i/a.smali b/com.discord/smali_classes2/n0/g0/i/a.smali
deleted file mode 100644
index 6c17682a00..0000000000
--- a/com.discord/smali_classes2/n0/g0/i/a.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class public final Ln0/g0/i/a;
-.super Ljava/net/ProxySelector;
-.source "NullProxySelector.kt"
-
-
-# static fields
-.field public static final a:Ln0/g0/i/a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/g0/i/a;
-
-    invoke-direct {v0}, Ln0/g0/i/a;-><init>()V
-
-    sput-object v0, Ln0/g0/i/a;->a:Ln0/g0/i/a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/net/ProxySelector;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public connectFailed(Ljava/net/URI;Ljava/net/SocketAddress;Ljava/io/IOException;)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public select(Ljava/net/URI;)Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/net/URI;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/net/Proxy;",
-            ">;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    sget-object p1, Ljava/net/Proxy;->NO_PROXY:Ljava/net/Proxy;
-
-    invoke-static {p1}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "uri must not be null"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/j/a.smali b/com.discord/smali_classes2/n0/g0/j/a.smali
deleted file mode 100644
index 73890c2b8b..0000000000
--- a/com.discord/smali_classes2/n0/g0/j/a.smali
+++ /dev/null
@@ -1,351 +0,0 @@
-.class public final Ln0/g0/j/a;
-.super Ln0/g0/j/c;
-.source "BasicCertificateChainCleaner.kt"
-
-
-# instance fields
-.field public final a:Ln0/g0/j/e;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/j/e;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ln0/g0/j/c;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/j/a;->a:Ln0/g0/j/e;
-
-    return-void
-
-    :cond_0
-    const-string p1, "trustRootIndex"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/security/cert/Certificate;",
-            ">;",
-            "Ljava/lang/String;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/security/cert/Certificate;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljavax/net/ssl/SSLPeerUnverifiedException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_b
-
-    if-eqz p2, :cond_a
-
-    new-instance p2, Ljava/util/ArrayDeque;
-
-    invoke-direct {p2, p1}, Ljava/util/ArrayDeque;-><init>(Ljava/util/Collection;)V
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p2}, Ljava/util/Deque;->removeFirst()Ljava/lang/Object;
-
-    move-result-object v0
-
-    const-string v1, "queue.removeFirst()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    const/16 v0, 0x9
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_9
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    sub-int/2addr v3, v4
-
-    invoke-interface {p1, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    const-string v5, "null cannot be cast to non-null type java.security.cert.X509Certificate"
-
-    if-eqz v3, :cond_8
-
-    check-cast v3, Ljava/security/cert/X509Certificate;
-
-    iget-object v6, p0, Ln0/g0/j/a;->a:Ln0/g0/j/e;
-
-    invoke-interface {v6, v3}, Ln0/g0/j/e;->a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_3
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v2
-
-    if-gt v2, v4, :cond_0
-
-    invoke-static {v3, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    xor-int/2addr v2, v4
-
-    if-eqz v2, :cond_1
-
-    :cond_0
-    invoke-interface {p1, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_1
-    invoke-virtual {p0, v6, v6}, Ln0/g0/j/a;->b(Ljava/security/cert/X509Certificate;Ljava/security/cert/X509Certificate;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    return-object p1
-
-    :cond_2
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    invoke-interface {p2}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v4
-
-    const-string v6, "queue.iterator()"
-
-    invoke-static {v4, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_4
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_6
-
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_5
-
-    check-cast v6, Ljava/security/cert/X509Certificate;
-
-    invoke-virtual {p0, v3, v6}, Ln0/g0/j/a;->b(Ljava/security/cert/X509Certificate;Ljava/security/cert/X509Certificate;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_4
-
-    invoke-interface {v4}, Ljava/util/Iterator;->remove()V
-
-    invoke-interface {p1, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :goto_1
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_5
-    new-instance p1, Lkotlin/TypeCastException;
-
-    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    if-eqz v2, :cond_7
-
-    return-object p1
-
-    :cond_7
-    new-instance p1, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "Failed to find a trusted cert that signed "
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    new-instance p1, Lkotlin/TypeCastException;
-
-    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_9
-    new-instance p2, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v1, "Certificate chain too long: "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_a
-    const-string p1, "hostname"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_b
-    const-string p1, "chain"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final b(Ljava/security/cert/X509Certificate;Ljava/security/cert/X509Certificate;)Z
-    .locals 3
-
-    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getIssuerDN()Ljava/security/Principal;
-
-    move-result-object v0
-
-    invoke-virtual {p2}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_0
-
-    return v2
-
-    :cond_0
-    :try_start_0
-    invoke-virtual {p2}, Ljava/security/cert/X509Certificate;->getPublicKey()Ljava/security/PublicKey;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Ljava/security/cert/X509Certificate;->verify(Ljava/security/PublicKey;)V
-    :try_end_0
-    .catch Ljava/security/GeneralSecurityException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v1, p1, Ln0/g0/j/a;
-
-    if-eqz v1, :cond_1
-
-    check-cast p1, Ln0/g0/j/a;
-
-    iget-object p1, p1, Ln0/g0/j/a;->a:Ln0/g0/j/e;
-
-    iget-object v1, p0, Ln0/g0/j/a;->a:Ln0/g0/j/e;
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/j/a;->a:Ln0/g0/j/e;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/j/b.smali b/com.discord/smali_classes2/n0/g0/j/b.smali
deleted file mode 100644
index 50060f6ca1..0000000000
--- a/com.discord/smali_classes2/n0/g0/j/b.smali
+++ /dev/null
@@ -1,202 +0,0 @@
-.class public final Ln0/g0/j/b;
-.super Ljava/lang/Object;
-.source "BasicTrustRootIndex.kt"
-
-# interfaces
-.implements Ln0/g0/j/e;
-
-
-# instance fields
-.field public final a:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljavax/security/auth/x500/X500Principal;",
-            "Ljava/util/Set<",
-            "Ljava/security/cert/X509Certificate;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public varargs constructor <init>([Ljava/security/cert/X509Certificate;)V
-    .locals 6
-
-    if-eqz p1, :cond_2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
-
-    array-length v1, p1
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    aget-object v3, p1, v2
-
-    invoke-virtual {v3}, Ljava/security/cert/X509Certificate;->getSubjectX500Principal()Ljavax/security/auth/x500/X500Principal;
-
-    move-result-object v4
-
-    const-string v5, "caCert.subjectX500Principal"
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-nez v5, :cond_0
-
-    new-instance v5, Ljava/util/LinkedHashSet;
-
-    invoke-direct {v5}, Ljava/util/LinkedHashSet;-><init>()V
-
-    invoke-interface {v0, v4, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_0
-    check-cast v5, Ljava/util/Set;
-
-    invoke-interface {v5, v3}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    iput-object v0, p0, Ln0/g0/j/b;->a:Ljava/util/Map;
-
-    return-void
-
-    :cond_2
-    const-string p1, "caCerts"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
-    .locals 4
-
-    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getIssuerX500Principal()Ljavax/security/auth/x500/X500Principal;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/g0/j/b;->a:Ljava/util/Map;
-
-    invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/Set;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_2
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    move-object v3, v2
-
-    check-cast v3, Ljava/security/cert/X509Certificate;
-
-    :try_start_0
-    invoke-virtual {v3}, Ljava/security/cert/X509Certificate;->getPublicKey()Ljava/security/PublicKey;
-
-    move-result-object v3
-
-    invoke-virtual {p1, v3}, Ljava/security/cert/X509Certificate;->verify(Ljava/security/PublicKey;)V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :catch_0
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_0
-
-    move-object v1, v2
-
-    :cond_1
-    check-cast v1, Ljava/security/cert/X509Certificate;
-
-    :cond_2
-    return-object v1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    if-eq p1, p0, :cond_1
-
-    instance-of v0, p1, Ln0/g0/j/b;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/g0/j/b;
-
-    iget-object p1, p1, Ln0/g0/j/b;->a:Ljava/util/Map;
-
-    iget-object v0, p0, Ln0/g0/j/b;->a:Ljava/util/Map;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    :goto_1
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/j/b;->a:Ljava/util/Map;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/j/c.smali b/com.discord/smali_classes2/n0/g0/j/c.smali
deleted file mode 100644
index 0f57a45484..0000000000
--- a/com.discord/smali_classes2/n0/g0/j/c.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public abstract Ln0/g0/j/c;
-.super Ljava/lang/Object;
-.source "CertificateChainCleaner.kt"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/security/cert/Certificate;",
-            ">;",
-            "Ljava/lang/String;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/security/cert/Certificate;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljavax/net/ssl/SSLPeerUnverifiedException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/j/d.smali b/com.discord/smali_classes2/n0/g0/j/d.smali
deleted file mode 100644
index 611b581b8b..0000000000
--- a/com.discord/smali_classes2/n0/g0/j/d.smali
+++ /dev/null
@@ -1,552 +0,0 @@
-.class public final Ln0/g0/j/d;
-.super Ljava/lang/Object;
-.source "OkHostnameVerifier.kt"
-
-# interfaces
-.implements Ljavax/net/ssl/HostnameVerifier;
-
-
-# static fields
-.field public static final a:Ln0/g0/j/d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/g0/j/d;
-
-    invoke-direct {v0}, Ln0/g0/j/d;-><init>()V
-
-    sput-object v0, Ln0/g0/j/d;->a:Ln0/g0/j/d;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/security/cert/X509Certificate;",
-            "I)",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    :try_start_0
-    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getSubjectAlternativeNames()Ljava/util/Collection;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_4
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_0
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/util/List;
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v2
-
-    const/4 v3, 0x2
-
-    if-ge v2, v3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v2, 0x0
-
-    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v3
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    xor-int/2addr v2, v3
-
-    if-eqz v2, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    invoke-interface {v1, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    check-cast v1, Ljava/lang/String;
-
-    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_3
-    return-object v0
-
-    :cond_4
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
-    :try_end_0
-    .catch Ljava/security/cert/CertificateParsingException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p1
-
-    :catch_0
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object p1
-.end method
-
-.method public final b(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
-    .locals 12
-
-    if-eqz p1, :cond_15
-
-    invoke-static {p1}, Ln0/g0/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_2
-
-    const/4 v0, 0x7
-
-    invoke-virtual {p0, p2, v0}, Ln0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
-
-    move-result-object p2
-
-    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto/16 :goto_6
-
-    :cond_0
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :cond_1
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_14
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    invoke-static {p1, v0, v1}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    goto/16 :goto_7
-
-    :cond_2
-    sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const-string v3, "Locale.US"
-
-    invoke-static {v0, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "(this as java.lang.String).toLowerCase(locale)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v4, 0x2
-
-    invoke-virtual {p0, p2, v4}, Ln0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
-
-    move-result-object p2
-
-    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_3
-
-    goto/16 :goto_6
-
-    :cond_3
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :cond_4
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_14
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/String;
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v6
-
-    if-nez v6, :cond_5
-
-    const/4 v6, 0x1
-
-    goto :goto_0
-
-    :cond_5
-    const/4 v6, 0x0
-
-    :goto_0
-    if-nez v6, :cond_13
-
-    const-string v6, "."
-
-    invoke-static {p1, v6, v2, v4}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v7
-
-    if-nez v7, :cond_13
-
-    const-string v7, ".."
-
-    invoke-static {p1, v7, v2, v4}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_6
-
-    goto/16 :goto_4
-
-    :cond_6
-    if-eqz v5, :cond_8
-
-    invoke-virtual {v5}, Ljava/lang/String;->length()I
-
-    move-result v8
-
-    if-nez v8, :cond_7
-
-    goto :goto_1
-
-    :cond_7
-    const/4 v8, 0x0
-
-    goto :goto_2
-
-    :cond_8
-    :goto_1
-    const/4 v8, 0x1
-
-    :goto_2
-    if-nez v8, :cond_13
-
-    invoke-static {v5, v6, v2, v4}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v8
-
-    if-nez v8, :cond_13
-
-    invoke-static {v5, v7, v2, v4}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_9
-
-    goto/16 :goto_4
-
-    :cond_9
-    invoke-static {p1, v6, v2, v4}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v7
-
-    if-nez v7, :cond_a
-
-    invoke-static {p1, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v7
-
-    goto :goto_3
-
-    :cond_a
-    move-object v7, p1
-
-    :goto_3
-    invoke-static {v5, v6, v2, v4}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v8
-
-    if-nez v8, :cond_b
-
-    invoke-static {v5, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v5
-
-    :cond_b
-    sget-object v6, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    invoke-static {v6, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    if-eqz v5, :cond_12
-
-    invoke-virtual {v5, v6}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "*"
-
-    invoke-static {v5, v6, v2, v4}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
-
-    move-result v6
-
-    if-nez v6, :cond_c
-
-    invoke-static {v7, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    goto :goto_5
-
-    :cond_c
-    const-string v6, "*."
-
-    invoke-static {v5, v6, v2, v4}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_13
-
-    const/16 v8, 0x2a
-
-    const/4 v9, 0x4
-
-    invoke-static {v5, v8, v1, v2, v9}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v8
-
-    const/4 v10, -0x1
-
-    if-eq v8, v10, :cond_d
-
-    goto :goto_4
-
-    :cond_d
-    invoke-virtual {v7}, Ljava/lang/String;->length()I
-
-    move-result v8
-
-    invoke-virtual {v5}, Ljava/lang/String;->length()I
-
-    move-result v11
-
-    if-ge v8, v11, :cond_e
-
-    goto :goto_4
-
-    :cond_e
-    invoke-static {v6, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_f
-
-    goto :goto_4
-
-    :cond_f
-    invoke-virtual {v5, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v6, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v7, v5, v2, v4}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v6
-
-    if-nez v6, :cond_10
-
-    goto :goto_4
-
-    :cond_10
-    invoke-virtual {v7}, Ljava/lang/String;->length()I
-
-    move-result v6
-
-    invoke-virtual {v5}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    sub-int/2addr v6, v5
-
-    if-lez v6, :cond_11
-
-    const/16 v5, 0x2e
-
-    add-int/lit8 v6, v6, -0x1
-
-    invoke-static {v7, v5, v6, v2, v9}, Lj0/t/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v5
-
-    if-eq v5, v10, :cond_11
-
-    goto :goto_4
-
-    :cond_11
-    const/4 v5, 0x1
-
-    goto :goto_5
-
-    :cond_12
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_13
-    :goto_4
-    const/4 v5, 0x0
-
-    :goto_5
-    if-eqz v5, :cond_4
-
-    goto :goto_7
-
-    :cond_14
-    :goto_6
-    const/4 v1, 0x0
-
-    :goto_7
-    return v1
-
-    :cond_15
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    invoke-interface {p2}, Ljavax/net/ssl/SSLSession;->getPeerCertificates()[Ljava/security/cert/Certificate;
-
-    move-result-object p2
-
-    aget-object p2, p2, v0
-
-    if-eqz p2, :cond_0
-
-    check-cast p2, Ljava/security/cert/X509Certificate;
-
-    invoke-virtual {p0, p1, p2}, Ln0/g0/j/d;->b(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type java.security.cert.X509Certificate"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_0
-    .catch Ljavax/net/ssl/SSLException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    :goto_0
-    return v0
-
-    :cond_1
-    const-string p1, "session"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "host"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/j/e.smali b/com.discord/smali_classes2/n0/g0/j/e.smali
deleted file mode 100644
index 9513ab81b2..0000000000
--- a/com.discord/smali_classes2/n0/g0/j/e.smali
+++ /dev/null
@@ -1,8 +0,0 @@
-.class public interface abstract Ln0/g0/j/e;
-.super Ljava/lang/Object;
-.source "TrustRootIndex.kt"
-
-
-# virtual methods
-.method public abstract a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/a$a.smali b/com.discord/smali_classes2/n0/g0/k/a$a.smali
deleted file mode 100644
index 6ca3796121..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/a$a.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Ln0/g0/k/a$a;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/g0/k/a;-><init>(Ln0/a0;Lokhttp3/WebSocketListener;Ljava/util/Random;J)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ln0/g0/k/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/k/a;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/g0/k/a$a;->d:Ln0/g0/k/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 3
-
-    :goto_0
-    :try_start_0
-    iget-object v0, p0, Ln0/g0/k/a$a;->d:Ln0/g0/k/a;
-
-    invoke-virtual {v0}, Ln0/g0/k/a;->m()Z
-
-    move-result v0
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    iget-object v1, p0, Ln0/g0/k/a$a;->d:Ln0/g0/k/a;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v0, v2}, Ln0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/a$b.smali b/com.discord/smali_classes2/n0/g0/k/a$b.smali
deleted file mode 100644
index 040e2a825b..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/a$b.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class public final Ln0/g0/k/a$b;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/k/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ln0/g0/k/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/k/a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/k/a$b;->d:Ln0/g0/k/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/k/a$b;->d:Ln0/g0/k/a;
-
-    iget-object v0, v0, Ln0/g0/k/a;->b:Ln0/f;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Ln0/f;->cancel()V
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/a$c.smali b/com.discord/smali_classes2/n0/g0/k/a$c.smali
deleted file mode 100644
index 0ea3ad5b6c..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/a$c.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public final Ln0/g0/k/a$c;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/k/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:Lokio/ByteString;
-
-.field public final c:J
-
-
-# direct methods
-.method public constructor <init>(ILokio/ByteString;J)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Ln0/g0/k/a$c;->a:I
-
-    iput-object p2, p0, Ln0/g0/k/a$c;->b:Lokio/ByteString;
-
-    iput-wide p3, p0, Ln0/g0/k/a$c;->c:J
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/a$d.smali b/com.discord/smali_classes2/n0/g0/k/a$d.smali
deleted file mode 100644
index b894d46fc7..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/a$d.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final Ln0/g0/k/a$d;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/k/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "d"
-.end annotation
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:Lokio/ByteString;
-
-
-# direct methods
-.method public constructor <init>(ILokio/ByteString;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Ln0/g0/k/a$d;->a:I
-
-    iput-object p2, p0, Ln0/g0/k/a$d;->b:Lokio/ByteString;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/a$e.smali b/com.discord/smali_classes2/n0/g0/k/a$e.smali
deleted file mode 100644
index 7cf7defeb2..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/a$e.smali
+++ /dev/null
@@ -1,175 +0,0 @@
-.class public final Ln0/g0/k/a$e;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/k/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "e"
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ln0/g0/k/a;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/k/a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/k/a$e;->d:Ln0/g0/k/a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 8
-
-    iget-object v0, p0, Ln0/g0/k/a$e;->d:Ln0/g0/k/a;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v1, v0, Ln0/g0/k/a;->o:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v1, :cond_0
-
-    monitor-exit v0
-
-    goto :goto_1
-
-    :cond_0
-    :try_start_1
-    iget-object v1, v0, Ln0/g0/k/a;->e:Ln0/g0/k/e;
-
-    iget-boolean v2, v0, Ln0/g0/k/a;->s:Z
-
-    const/4 v3, -0x1
-
-    if-eqz v2, :cond_1
-
-    iget v2, v0, Ln0/g0/k/a;->p:I
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v2, -0x1
-
-    :goto_0
-    iget v4, v0, Ln0/g0/k/a;->p:I
-
-    const/4 v5, 0x1
-
-    add-int/2addr v4, v5
-
-    iput v4, v0, Ln0/g0/k/a;->p:I
-
-    iput-boolean v5, v0, Ln0/g0/k/a;->s:Z
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit v0
-
-    const/4 v4, 0x0
-
-    if-eq v2, v3, :cond_2
-
-    new-instance v1, Ljava/net/SocketTimeoutException;
-
-    const-string v3, "sent ping but didn\'t receive pong within "
-
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    iget-wide v6, v0, Ln0/g0/k/a;->w:J
-
-    invoke-virtual {v3, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v6, "ms (after "
-
-    invoke-virtual {v3, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sub-int/2addr v2, v5
-
-    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v2, " successful ping/pongs)"
-
-    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2}, Ljava/net/SocketTimeoutException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1, v4}, Ln0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
-
-    goto :goto_1
-
-    :cond_2
-    if-eqz v1, :cond_4
-
-    :try_start_2
-    sget-object v2, Lokio/ByteString;->f:Lokio/ByteString;
-
-    if-eqz v2, :cond_3
-
-    const/16 v3, 0x9
-
-    invoke-virtual {v1, v3, v2}, Ln0/g0/k/e;->a(ILokio/ByteString;)V
-
-    goto :goto_1
-
-    :cond_3
-    const-string v1, "payload"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-
-    throw v4
-
-    :cond_4
-    :try_start_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
-
-    throw v4
-
-    :catch_0
-    move-exception v1
-
-    invoke-virtual {v0, v1, v4}, Ln0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
-
-    :goto_1
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/a$f.smali b/com.discord/smali_classes2/n0/g0/k/a$f.smali
deleted file mode 100644
index 1cb41e1c51..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/a$f.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class public abstract Ln0/g0/k/a$f;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-# interfaces
-.implements Ljava/io/Closeable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/k/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "f"
-.end annotation
-
-
-# instance fields
-.field public final d:Z
-
-.field public final e:Lo0/g;
-
-.field public final f:Lokio/BufferedSink;
-
-
-# direct methods
-.method public constructor <init>(ZLo0/g;Lokio/BufferedSink;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/g0/k/a$f;->d:Z
-
-    iput-object p2, p0, Ln0/g0/k/a$f;->e:Lo0/g;
-
-    iput-object p3, p0, Ln0/g0/k/a$f;->f:Lokio/BufferedSink;
-
-    return-void
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/a.smali b/com.discord/smali_classes2/n0/g0/k/a.smali
deleted file mode 100644
index 28c79d726a..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/a.smali
+++ /dev/null
@@ -1,1810 +0,0 @@
-.class public final Ln0/g0/k/a;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-# interfaces
-.implements Lokhttp3/WebSocket;
-.implements Ln0/g0/k/d$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/k/a$e;,
-        Ln0/g0/k/a$d;,
-        Ln0/g0/k/a$c;,
-        Ln0/g0/k/a$f;,
-        Ln0/g0/k/a$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final x:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/y;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public b:Ln0/f;
-
-.field public final c:Ljava/lang/Runnable;
-
-.field public d:Ln0/g0/k/d;
-
-.field public e:Ln0/g0/k/e;
-
-.field public f:Ljava/util/concurrent/ScheduledExecutorService;
-
-.field public g:Ln0/g0/k/a$f;
-
-.field public final h:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Lokio/ByteString;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final i:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public j:J
-
-.field public k:Z
-
-.field public l:Ljava/util/concurrent/ScheduledFuture;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/ScheduledFuture<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field public m:I
-
-.field public n:Ljava/lang/String;
-
-.field public o:Z
-
-.field public p:I
-
-.field public q:I
-
-.field public r:I
-
-.field public s:Z
-
-.field public final t:Ln0/a0;
-
-.field public final u:Lokhttp3/WebSocketListener;
-
-.field public final v:Ljava/util/Random;
-
-.field public final w:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    sget-object v0, Ln0/y;->e:Ln0/y;
-
-    invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/g0/k/a;->x:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ln0/a0;Lokhttp3/WebSocketListener;Ljava/util/Random;J)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/k/a;->t:Ln0/a0;
-
-    iput-object p2, p0, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    iput-object p3, p0, Ln0/g0/k/a;->v:Ljava/util/Random;
-
-    iput-wide p4, p0, Ln0/g0/k/a;->w:J
-
-    new-instance p1, Ljava/util/ArrayDeque;
-
-    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/k/a;->h:Ljava/util/ArrayDeque;
-
-    new-instance p1, Ljava/util/ArrayDeque;
-
-    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/k/a;->i:Ljava/util/ArrayDeque;
-
-    const/4 p1, -0x1
-
-    iput p1, p0, Ln0/g0/k/a;->m:I
-
-    iget-object p1, p0, Ln0/g0/k/a;->t:Ln0/a0;
-
-    iget-object p1, p1, Ln0/a0;->c:Ljava/lang/String;
-
-    const-string p2, "GET"
-
-    invoke-static {p2, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    sget-object p1, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const/16 p2, 0x10
-
-    new-array p2, p2, [B
-
-    iget-object p3, p0, Ln0/g0/k/a;->v:Ljava/util/Random;
-
-    invoke-virtual {p3, p2}, Ljava/util/Random;->nextBytes([B)V
-
-    const/4 p3, 0x3
-
-    const/4 p4, 0x0
-
-    invoke-static {p1, p2, p4, p4, p3}, Lokio/ByteString$a;->c(Lokio/ByteString$a;[BIII)Lokio/ByteString;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lo0/y/a;->a(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/k/a;->a:Ljava/lang/String;
-
-    new-instance p1, Ln0/g0/k/a$a;
-
-    invoke-direct {p1, p0}, Ln0/g0/k/a$a;-><init>(Ln0/g0/k/a;)V
-
-    iput-object p1, p0, Ln0/g0/k/a;->c:Ljava/lang/Runnable;
-
-    return-void
-
-    :cond_0
-    const-string p1, "Request must be GET: "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget-object p2, p0, Ln0/g0/k/a;->t:Ln0/a0;
-
-    iget-object p2, p2, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/String;)Z
-    .locals 7
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    invoke-virtual {v0, p1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object p1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/k/a;->o:Z
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-nez v0, :cond_2
-
-    iget-boolean v0, p0, Ln0/g0/k/a;->k:Z
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-wide v3, p0, Ln0/g0/k/a;->j:J
-
-    invoke-static {p1}, Lo0/y/a;->g(Lokio/ByteString;)I
-
-    move-result v0
-
-    int-to-long v5, v0
-
-    add-long/2addr v3, v5
-
-    const-wide/32 v5, 0x1000000
-
-    cmp-long v0, v3, v5
-
-    if-lez v0, :cond_1
-
-    const/16 p1, 0x3e9
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Ln0/g0/k/a;->e(ILjava/lang/String;)Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    goto :goto_1
-
-    :cond_1
-    :try_start_1
-    iget-wide v0, p0, Ln0/g0/k/a;->j:J
-
-    invoke-static {p1}, Lo0/y/a;->g(Lokio/ByteString;)I
-
-    move-result v3
-
-    int-to-long v3, v3
-
-    add-long/2addr v0, v3
-
-    iput-wide v0, p0, Ln0/g0/k/a;->j:J
-
-    iget-object v0, p0, Ln0/g0/k/a;->i:Ljava/util/ArrayDeque;
-
-    new-instance v1, Ln0/g0/k/a$d;
-
-    invoke-direct {v1, v2, p1}, Ln0/g0/k/a$d;-><init>(ILokio/ByteString;)V
-
-    invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    invoke-virtual {p0}, Ln0/g0/k/a;->l()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    const/4 v1, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    monitor-exit p0
-
-    :goto_1
-    return v1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public b(Lokio/ByteString;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
-
-    return-void
-.end method
-
-.method public c(Ljava/lang/String;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public cancel()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/k/a;->b:Ln0/f;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Ln0/f;->cancel()V
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public declared-synchronized d(Lokio/ByteString;)V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/k/a;->o:Z
-
-    if-nez v0, :cond_1
-
-    iget-boolean v0, p0, Ln0/g0/k/a;->k:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Ln0/g0/k/a;->i:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Ln0/g0/k/a;->h:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    invoke-virtual {p0}, Ln0/g0/k/a;->l()V
-
-    iget p1, p0, Ln0/g0/k/a;->q:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Ln0/g0/k/a;->q:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    :goto_0
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public e(ILjava/lang/String;)Z
-    .locals 7
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-static {p1}, Ln0/g0/k/c;->c(I)V
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    if-eqz p2, :cond_2
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    invoke-virtual {v0, p2}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lokio/ByteString;->h()I
-
-    move-result v2
-
-    int-to-long v2, v2
-
-    const-wide/16 v4, 0x7b
-
-    cmp-long v6, v2, v4
-
-    if-gtz v6, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "reason.size() > 123: "
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    :goto_1
-    iget-boolean p2, p0, Ln0/g0/k/a;->o:Z
-
-    if-nez p2, :cond_4
-
-    iget-boolean p2, p0, Ln0/g0/k/a;->k:Z
-
-    if-eqz p2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    iput-boolean v1, p0, Ln0/g0/k/a;->k:Z
-
-    iget-object p2, p0, Ln0/g0/k/a;->i:Ljava/util/ArrayDeque;
-
-    new-instance v2, Ln0/g0/k/a$c;
-
-    const-wide/32 v3, 0xea60
-
-    invoke-direct {v2, p1, v0, v3, v4}, Ln0/g0/k/a$c;-><init>(ILokio/ByteString;J)V
-
-    invoke-virtual {p2, v2}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    invoke-virtual {p0}, Ln0/g0/k/a;->l()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    goto :goto_3
-
-    :cond_4
-    :goto_2
-    monitor-exit p0
-
-    const/4 v1, 0x0
-
-    :goto_3
-    return v1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public declared-synchronized f(Lokio/ByteString;)V
-    .locals 0
-
-    monitor-enter p0
-
-    :try_start_0
-    iget p1, p0, Ln0/g0/k/a;->r:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Ln0/g0/k/a;->r:I
-
-    const/4 p1, 0x0
-
-    iput-boolean p1, p0, Ln0/g0/k/a;->s:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public g(ILjava/lang/String;)V
-    .locals 4
-
-    const/4 v0, -0x1
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eq p1, v0, :cond_0
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_a
-
-    monitor-enter p0
-
-    :try_start_0
-    iget v3, p0, Ln0/g0/k/a;->m:I
-
-    if-ne v3, v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_9
-
-    iput p1, p0, Ln0/g0/k/a;->m:I
-
-    iput-object p2, p0, Ln0/g0/k/a;->n:Ljava/lang/String;
-
-    iget-boolean v0, p0, Ln0/g0/k/a;->k:Z
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_5
-
-    iget-object v0, p0, Ln0/g0/k/a;->i:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    iget-object v0, p0, Ln0/g0/k/a;->g:Ln0/g0/k/a$f;
-
-    iput-object v1, p0, Ln0/g0/k/a;->g:Ln0/g0/k/a$f;
-
-    iget-object v3, p0, Ln0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
-
-    if-eqz v3, :cond_3
-
-    iget-object v3, p0, Ln0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {v3, v2}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
-
-    goto :goto_2
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    throw v1
-
-    :cond_3
-    :goto_2
-    :try_start_1
-    iget-object v2, p0, Ln0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-eqz v2, :cond_4
-
-    invoke-interface {v2}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
-
-    move-object v1, v0
-
-    goto :goto_3
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    throw v1
-
-    :cond_5
-    :goto_3
-    monitor-exit p0
-
-    :try_start_2
-    iget-object v0, p0, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    invoke-virtual {v0, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosing(Lokhttp3/WebSocket;ILjava/lang/String;)V
-
-    if-eqz v1, :cond_6
-
-    iget-object v0, p0, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    invoke-virtual {v0, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :cond_6
-    if-eqz v1, :cond_7
-
-    invoke-static {v1}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_7
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    if-eqz v1, :cond_8
-
-    invoke-static {v1}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_8
-    throw p1
-
-    :cond_9
-    :try_start_3
-    const-string p1, "already closed"
-
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-
-    :cond_a
-    const-string p1, "Failed requirement."
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public final h(Lokhttp3/Response;Ln0/g0/d/c;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget v0, p1, Lokhttp3/Response;->g:I
-
-    const/16 v1, 0x65
-
-    const/16 v2, 0x27
-
-    if-ne v0, v1, :cond_4
-
-    const/4 v0, 0x2
-
-    const-string v1, "Connection"
-
-    const/4 v3, 0x0
-
-    invoke-static {p1, v1, v3, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v4, "Upgrade"
-
-    const/4 v5, 0x1
-
-    invoke-static {v4, v1, v5}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_3
-
-    invoke-static {p1, v4, v3, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v4, "websocket"
-
-    invoke-static {v4, v1, v5}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_2
-
-    const-string v1, "Sec-WebSocket-Accept"
-
-    invoke-static {p1, v1, v3, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v3, p0, Ln0/g0/k/a;->a:Ljava/lang/String;
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    const-string v1, "SHA-1"
-
-    invoke-virtual {v0, v1}, Lokio/ByteString;->f(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lo0/y/a;->a(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    xor-int/2addr v1, v5
-
-    if-nez v1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/net/ProtocolException;
-
-    const-string p2, "Web Socket exchange missing: bad interceptor?"
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    new-instance p2, Ljava/net/ProtocolException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v3, "Expected \'Sec-WebSocket-Accept\' header value \'"
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "\' but was \'"
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    new-instance p1, Ljava/net/ProtocolException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "Expected \'Upgrade\' header value \'websocket\' but was \'"
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/net/ProtocolException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "Expected \'Connection\' header value \'Upgrade\' but was \'"
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    new-instance p2, Ljava/net/ProtocolException;
-
-    const-string v0, "Expected HTTP 101 response but was \'"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget v1, p1, Lokhttp3/Response;->g:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x20
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object p1, p1, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public final i(Ljava/lang/Exception;Lokhttp3/Response;)V
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/k/a;->o:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    :try_start_1
-    iput-boolean v0, p0, Ln0/g0/k/a;->o:Z
-
-    iget-object v0, p0, Ln0/g0/k/a;->g:Ln0/g0/k/a$f;
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Ln0/g0/k/a;->g:Ln0/g0/k/a$f;
-
-    iget-object v1, p0, Ln0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
-
-    if-eqz v1, :cond_1
-
-    const/4 v2, 0x0
-
-    invoke-interface {v1, v2}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
-
-    :cond_1
-    iget-object v1, p0, Ln0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v1}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :cond_2
-    monitor-exit p0
-
-    :try_start_2
-    iget-object v1, p0, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    if-eqz v0, :cond_3
-
-    invoke-static {v0}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_3
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    if-eqz v0, :cond_4
-
-    invoke-static {v0}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_4
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final j(Ljava/lang/String;Ln0/g0/k/a$f;)V
-    .locals 11
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const-string v0, "name"
-
-    if-eqz p1, :cond_2
-
-    monitor-enter p0
-
-    :try_start_0
-    iput-object p2, p0, Ln0/g0/k/a;->g:Ln0/g0/k/a$f;
-
-    new-instance v0, Ln0/g0/k/e;
-
-    iget-boolean v1, p2, Ln0/g0/k/a$f;->d:Z
-
-    iget-object v2, p2, Ln0/g0/k/a$f;->f:Lokio/BufferedSink;
-
-    iget-object v3, p0, Ln0/g0/k/a;->v:Ljava/util/Random;
-
-    invoke-direct {v0, v1, v2, v3}, Ln0/g0/k/e;-><init>(ZLokio/BufferedSink;Ljava/util/Random;)V
-
-    iput-object v0, p0, Ln0/g0/k/a;->e:Ln0/g0/k/e;
-
-    new-instance v4, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    const/4 v0, 0x0
-
-    invoke-static {p1, v0}, Ln0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-
-    move-result-object p1
-
-    const/4 v0, 0x1
-
-    invoke-direct {v4, v0, p1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
-
-    iput-object v4, p0, Ln0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
-
-    iget-wide v1, p0, Ln0/g0/k/a;->w:J
-
-    const-wide/16 v5, 0x0
-
-    cmp-long p1, v1, v5
-
-    if-eqz p1, :cond_0
-
-    new-instance v5, Ln0/g0/k/a$e;
-
-    invoke-direct {v5, p0}, Ln0/g0/k/a$e;-><init>(Ln0/g0/k/a;)V
-
-    iget-wide v6, p0, Ln0/g0/k/a;->w:J
-
-    iget-wide v8, p0, Ln0/g0/k/a;->w:J
-
-    sget-object v10, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual/range {v4 .. v10}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    :cond_0
-    iget-object p1, p0, Ln0/g0/k/a;->i:Ljava/util/ArrayDeque;
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p1
-
-    xor-int/2addr p1, v0
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p0}, Ln0/g0/k/a;->l()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_1
-    monitor-exit p0
-
-    new-instance p1, Ln0/g0/k/d;
-
-    iget-boolean v0, p2, Ln0/g0/k/a$f;->d:Z
-
-    iget-object p2, p2, Ln0/g0/k/a$f;->e:Lo0/g;
-
-    invoke-direct {p1, v0, p2, p0}, Ln0/g0/k/d;-><init>(ZLo0/g;Ln0/g0/k/d$a;)V
-
-    iput-object p1, p0, Ln0/g0/k/a;->d:Ln0/g0/k/d;
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-
-    :cond_2
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final k()V
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    :goto_0
-    iget v0, p0, Ln0/g0/k/a;->m:I
-
-    const/4 v1, -0x1
-
-    if-ne v0, v1, :cond_d
-
-    iget-object v0, p0, Ln0/g0/k/a;->d:Ln0/g0/k/d;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_c
-
-    invoke-virtual {v0}, Ln0/g0/k/d;->b()V
-
-    iget-boolean v2, v0, Ln0/g0/k/d;->e:Z
-
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/k/d;->a()V
-
-    goto :goto_0
-
-    :cond_0
-    iget v2, v0, Ln0/g0/k/d;->b:I
-
-    const/4 v3, 0x1
-
-    if-eq v2, v3, :cond_2
-
-    const/4 v4, 0x2
-
-    if-ne v2, v4, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Unknown opcode: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-static {v2}, Ln0/g0/b;->C(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    :goto_1
-    iget-boolean v4, v0, Ln0/g0/k/d;->a:Z
-
-    if-nez v4, :cond_b
-
-    iget-wide v4, v0, Ln0/g0/k/d;->c:J
-
-    const-wide/16 v6, 0x0
-
-    cmp-long v8, v4, v6
-
-    if-lez v8, :cond_5
-
-    iget-object v6, v0, Ln0/g0/k/d;->k:Lo0/g;
-
-    iget-object v7, v0, Ln0/g0/k/d;->g:Lo0/e;
-
-    invoke-interface {v6, v7, v4, v5}, Lo0/g;->Q(Lo0/e;J)V
-
-    iget-boolean v4, v0, Ln0/g0/k/d;->j:Z
-
-    if-nez v4, :cond_5
-
-    iget-object v4, v0, Ln0/g0/k/d;->g:Lo0/e;
-
-    iget-object v5, v0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    if-eqz v5, :cond_4
-
-    invoke-virtual {v4, v5}, Lo0/e;->i(Lo0/e$a;)Lo0/e$a;
-
-    iget-object v4, v0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    iget-object v5, v0, Ln0/g0/k/d;->g:Lo0/e;
-
-    iget-wide v5, v5, Lo0/e;->e:J
-
-    iget-wide v7, v0, Ln0/g0/k/d;->c:J
-
-    sub-long/2addr v5, v7
-
-    invoke-virtual {v4, v5, v6}, Lo0/e$a;->a(J)I
-
-    iget-object v4, v0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    iget-object v5, v0, Ln0/g0/k/d;->h:[B
-
-    if-eqz v5, :cond_3
-
-    invoke-static {v4, v5}, Ln0/g0/k/c;->b(Lo0/e$a;[B)V
-
-    iget-object v4, v0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    invoke-virtual {v4}, Lo0/e$a;->close()V
-
-    goto :goto_2
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_5
-    :goto_2
-    iget-boolean v4, v0, Ln0/g0/k/d;->d:Z
-
-    if-eqz v4, :cond_7
-
-    if-ne v2, v3, :cond_6
-
-    iget-object v1, v0, Ln0/g0/k/d;->l:Ln0/g0/k/d$a;
-
-    iget-object v0, v0, Ln0/g0/k/d;->g:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->v()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-interface {v1, v0}, Ln0/g0/k/d$a;->c(Ljava/lang/String;)V
-
-    goto/16 :goto_0
-
-    :cond_6
-    iget-object v1, v0, Ln0/g0/k/d;->l:Ln0/g0/k/d$a;
-
-    iget-object v0, v0, Ln0/g0/k/d;->g:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-interface {v1, v0}, Ln0/g0/k/d$a;->b(Lokio/ByteString;)V
-
-    goto/16 :goto_0
-
-    :cond_7
-    :goto_3
-    iget-boolean v4, v0, Ln0/g0/k/d;->a:Z
-
-    if-nez v4, :cond_9
-
-    invoke-virtual {v0}, Ln0/g0/k/d;->b()V
-
-    iget-boolean v4, v0, Ln0/g0/k/d;->e:Z
-
-    if-nez v4, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    invoke-virtual {v0}, Ln0/g0/k/d;->a()V
-
-    goto :goto_3
-
-    :cond_9
-    :goto_4
-    iget v4, v0, Ln0/g0/k/d;->b:I
-
-    if-nez v4, :cond_a
-
-    goto :goto_1
-
-    :cond_a
-    new-instance v1, Ljava/net/ProtocolException;
-
-    const-string v2, "Expected continuation opcode. Got: "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    iget v0, v0, Ln0/g0/k/d;->b:I
-
-    invoke-static {v0}, Ln0/g0/b;->C(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_b
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_d
-    return-void
-.end method
-
-.method public final l()V
-    .locals 2
-
-    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    sget-boolean v1, Lj0/h;->a:Z
-
-    if-eqz v1, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/lang/AssertionError;
-
-    const-string v1, "Assertion failed"
-
-    invoke-direct {v0, v1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Ln0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-eqz v0, :cond_2
-
-    iget-object v1, p0, Ln0/g0/k/a;->c:Ljava/lang/Runnable;
-
-    invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledExecutorService;->execute(Ljava/lang/Runnable;)V
-
-    :cond_2
-    return-void
-.end method
-
-.method public final m()Z
-    .locals 12
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/g0/k/a;->o:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_3
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return v1
-
-    :cond_0
-    :try_start_1
-    iget-object v0, p0, Ln0/g0/k/a;->e:Ln0/g0/k/e;
-
-    iget-object v2, p0, Ln0/g0/k/a;->h:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v2}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lokio/ByteString;
-
-    const/4 v3, -0x1
-
-    const/4 v4, 0x0
-
-    if-nez v2, :cond_5
-
-    iget-object v5, p0, Ln0/g0/k/a;->i:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v5}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
-
-    move-result-object v5
-
-    instance-of v6, v5, Ln0/g0/k/a$c;
-
-    if-eqz v6, :cond_4
-
-    iget v6, p0, Ln0/g0/k/a;->m:I
-
-    iget-object v7, p0, Ln0/g0/k/a;->n:Ljava/lang/String;
-
-    if-eq v6, v3, :cond_2
-
-    iget-object v3, p0, Ln0/g0/k/a;->g:Ln0/g0/k/a$f;
-
-    iput-object v4, p0, Ln0/g0/k/a;->g:Ln0/g0/k/a$f;
-
-    iget-object v8, p0, Ln0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-eqz v8, :cond_1
-
-    invoke-interface {v8}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_3
-
-    throw v4
-
-    :cond_2
-    :try_start_2
-    iget-object v3, p0, Ln0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-eqz v3, :cond_3
-
-    new-instance v8, Ln0/g0/k/a$b;
-
-    invoke-direct {v8, p0}, Ln0/g0/k/a$b;-><init>(Ln0/g0/k/a;)V
-
-    move-object v9, v5
-
-    check-cast v9, Ln0/g0/k/a$c;
-
-    iget-wide v9, v9, Ln0/g0/k/a$c;->c:J
-
-    sget-object v11, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-interface {v3, v8, v9, v10, v11}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    move-result-object v3
-
-    iput-object v3, p0, Ln0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
-
-    move-object v3, v4
-
-    goto :goto_0
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_3
-
-    throw v4
-
-    :cond_4
-    if-nez v5, :cond_6
-
-    monitor-exit p0
-
-    return v1
-
-    :cond_5
-    move-object v5, v4
-
-    :cond_6
-    const/4 v6, -0x1
-
-    move-object v3, v4
-
-    move-object v7, v3
-
-    :goto_0
-    monitor-exit p0
-
-    const/4 v8, 0x1
-
-    if-eqz v2, :cond_8
-
-    if-eqz v0, :cond_7
-
-    const/16 v1, 0xa
-
-    :try_start_3
-    invoke-virtual {v0, v1, v2}, Ln0/g0/k/e;->a(ILokio/ByteString;)V
-
-    goto/16 :goto_1
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    throw v4
-
-    :cond_8
-    :try_start_4
-    instance-of v2, v5, Ln0/g0/k/a$d;
-
-    if-eqz v2, :cond_b
-
-    move-object v2, v5
-
-    check-cast v2, Ln0/g0/k/a$d;
-
-    iget-object v2, v2, Ln0/g0/k/a$d;->b:Lokio/ByteString;
-
-    if-eqz v0, :cond_a
-
-    check-cast v5, Ln0/g0/k/a$d;
-
-    iget v4, v5, Ln0/g0/k/a$d;->a:I
-
-    invoke-virtual {v2}, Lokio/ByteString;->h()I
-
-    move-result v5
-
-    int-to-long v5, v5
-
-    iget-boolean v7, v0, Ln0/g0/k/e;->e:Z
-
-    xor-int/2addr v7, v8
-
-    if-eqz v7, :cond_9
-
-    iput-boolean v8, v0, Ln0/g0/k/e;->e:Z
-
-    iget-object v0, v0, Ln0/g0/k/e;->d:Ln0/g0/k/e$a;
-
-    iput v4, v0, Ln0/g0/k/e$a;->d:I
-
-    iput-wide v5, v0, Ln0/g0/k/e$a;->e:J
-
-    iput-boolean v8, v0, Ln0/g0/k/e$a;->f:Z
-
-    iput-boolean v1, v0, Ln0/g0/k/e$a;->g:Z
-
-    invoke-static {v0}, Lf/n/a/k/a;->o(Lo0/u;)Lokio/BufferedSink;
-
-    move-result-object v0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    check-cast v0, Lo0/p;
-
-    :try_start_5
-    invoke-virtual {v0, v2}, Lo0/p;->y0(Lokio/ByteString;)Lokio/BufferedSink;
-
-    invoke-virtual {v0}, Lo0/p;->close()V
-
-    monitor-enter p0
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
-
-    :try_start_6
-    iget-wide v0, p0, Ln0/g0/k/a;->j:J
-
-    invoke-virtual {v2}, Lokio/ByteString;->h()I
-
-    move-result v2
-
-    int-to-long v4, v2
-
-    sub-long/2addr v0, v4
-
-    iput-wide v0, p0, Ln0/g0/k/a;->j:J
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_0
-
-    :try_start_7
-    monitor-exit p0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-
-    :cond_9
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Another message writer is active. Did you call close()?"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
-
-    throw v4
-
-    :cond_b
-    :try_start_8
-    instance-of v1, v5, Ln0/g0/k/a$c;
-
-    if-eqz v1, :cond_15
-
-    check-cast v5, Ln0/g0/k/a$c;
-
-    if-eqz v0, :cond_14
-
-    iget v1, v5, Ln0/g0/k/a$c;->a:I
-
-    iget-object v2, v5, Ln0/g0/k/a$c;->b:Lokio/ByteString;
-
-    if-eqz v0, :cond_13
-
-    sget-object v5, Lokio/ByteString;->f:Lokio/ByteString;
-
-    if-nez v1, :cond_c
-
-    if-eqz v2, :cond_f
-
-    :cond_c
-    if-eqz v1, :cond_d
-
-    invoke-static {v1}, Ln0/g0/k/c;->c(I)V
-
-    :cond_d
-    new-instance v5, Lo0/e;
-
-    invoke-direct {v5}, Lo0/e;-><init>()V
-
-    invoke-virtual {v5, v1}, Lo0/e;->N(I)Lo0/e;
-
-    if-eqz v2, :cond_e
-
-    invoke-virtual {v5, v2}, Lo0/e;->D(Lokio/ByteString;)Lo0/e;
-
-    :cond_e
-    invoke-virtual {v5}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object v5
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_2
-
-    :cond_f
-    const/16 v1, 0x8
-
-    :try_start_9
-    invoke-virtual {v0, v1, v5}, Ln0/g0/k/e;->a(ILokio/ByteString;)V
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_1
-
-    :try_start_a
-    iput-boolean v8, v0, Ln0/g0/k/e;->b:Z
-
-    if-eqz v3, :cond_11
-
-    iget-object v0, p0, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    if-eqz v7, :cond_10
-
-    invoke-virtual {v0, p0, v6, v7}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
-
-    goto :goto_1
-
-    :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_a
-    .catchall {:try_start_a .. :try_end_a} :catchall_2
-
-    throw v4
-
-    :cond_11
-    :goto_1
-    if-eqz v3, :cond_12
-
-    invoke-static {v3}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_12
-    return v8
-
-    :catchall_1
-    move-exception v1
-
-    :try_start_b
-    iput-boolean v8, v0, Ln0/g0/k/e;->b:Z
-
-    throw v1
-
-    :cond_13
-    throw v4
-
-    :cond_14
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_b
-    .catchall {:try_start_b .. :try_end_b} :catchall_2
-
-    throw v4
-
-    :cond_15
-    :try_start_c
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-    :try_end_c
-    .catchall {:try_start_c .. :try_end_c} :catchall_2
-
-    :catchall_2
-    move-exception v0
-
-    if-eqz v3, :cond_16
-
-    invoke-static {v3}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    :cond_16
-    throw v0
-
-    :catchall_3
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/b.smali b/com.discord/smali_classes2/n0/g0/k/b.smali
deleted file mode 100644
index 04ea0f2915..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/b.smali
+++ /dev/null
@@ -1,170 +0,0 @@
-.class public final Ln0/g0/k/b;
-.super Ljava/lang/Object;
-.source "RealWebSocket.kt"
-
-# interfaces
-.implements Ln0/g;
-
-
-# instance fields
-.field public final synthetic a:Ln0/g0/k/a;
-
-.field public final synthetic b:Ln0/a0;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/k/a;Ln0/a0;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/a0;",
-            ")V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    iput-object p2, p0, Ln0/g0/k/b;->b:Ln0/a0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ln0/f;Lokhttp3/Response;)V
-    .locals 7
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    iget-object v1, p2, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    :try_start_0
-    iget-object p1, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    invoke-virtual {p1, p2, v1}, Ln0/g0/k/a;->h(Lokhttp3/Response;Ln0/g0/d/c;)V
-
-    invoke-virtual {v1}, Ln0/g0/d/c;->d()Ln0/g0/k/a$f;
-
-    move-result-object p1
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
-
-    :try_start_1
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "OkHttp WebSocket "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v2, p0, Ln0/g0/k/b;->b:Ln0/a0;
-
-    iget-object v2, v2, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v2}, Ln0/w;->i()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    invoke-virtual {v2, v1, p1}, Ln0/g0/k/a;->j(Ljava/lang/String;Ln0/g0/k/a$f;)V
-
-    iget-object p1, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    iget-object p1, p1, Ln0/g0/k/a;->u:Lokhttp3/WebSocketListener;
-
-    iget-object v1, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    invoke-virtual {p1, v1, p2}, Lokhttp3/WebSocketListener;->onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
-
-    iget-object p1, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    invoke-virtual {p1}, Ln0/g0/k/a;->k()V
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    iget-object p2, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    invoke-virtual {p2, p1, v0}, Ln0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
-
-    :goto_0
-    return-void
-
-    :catch_1
-    move-exception p1
-
-    if-eqz v1, :cond_0
-
-    const-wide/16 v2, -0x1
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x1
-
-    const/4 v6, 0x0
-
-    invoke-virtual/range {v1 .. v6}, Ln0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
-
-    :cond_0
-    iget-object v0, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    invoke-virtual {v0, p1, p2}, Ln0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
-
-    invoke-static {p2}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    return-void
-
-    :cond_1
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public b(Ln0/f;Ljava/io/IOException;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    iget-object p1, p0, Ln0/g0/k/b;->a:Ln0/g0/k/a;
-
-    invoke-virtual {p1, p2, v0}, Ln0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
-
-    return-void
-
-    :cond_0
-    const-string p1, "e"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/c.smali b/com.discord/smali_classes2/n0/g0/k/c.smali
deleted file mode 100644
index 935e2395b1..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/c.smali
+++ /dev/null
@@ -1,243 +0,0 @@
-.class public final Ln0/g0/k/c;
-.super Ljava/lang/Object;
-.source "WebSocketProtocol.kt"
-
-
-# direct methods
-.method public static final a(I)Ljava/lang/String;
-    .locals 2
-
-    const/16 v0, 0x3e8
-
-    if-lt p0, v0, :cond_5
-
-    const/16 v0, 0x1388
-
-    if-lt p0, v0, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    const/16 v0, 0x3ee
-
-    const/16 v1, 0x3ec
-
-    if-gt v1, p0, :cond_1
-
-    if-ge v0, p0, :cond_3
-
-    :cond_1
-    const/16 v0, 0xbb7
-
-    const/16 v1, 0x3f7
-
-    if-le v1, p0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    if-lt v0, p0, :cond_4
-
-    :cond_3
-    const-string v0, "Code "
-
-    const-string v1, " is reserved and may not be used."
-
-    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    goto :goto_2
-
-    :cond_4
-    :goto_0
-    const/4 p0, 0x0
-
-    goto :goto_2
-
-    :cond_5
-    :goto_1
-    const-string v0, "Code must be in range [1000,5000): "
-
-    invoke-static {v0, p0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p0
-
-    :goto_2
-    return-object p0
-.end method
-
-.method public static final b(Lo0/e$a;[B)V
-    .locals 9
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_7
-
-    if-eqz p1, :cond_6
-
-    array-length v1, p1
-
-    const/4 v2, 0x0
-
-    :cond_0
-    iget-object v3, p0, Lo0/e$a;->h:[B
-
-    iget v4, p0, Lo0/e$a;->i:I
-
-    iget v5, p0, Lo0/e$a;->j:I
-
-    const/4 v6, 0x1
-
-    if-eqz v3, :cond_1
-
-    :goto_0
-    if-ge v4, v5, :cond_1
-
-    rem-int/2addr v2, v1
-
-    aget-byte v7, v3, v4
-
-    aget-byte v8, p1, v2
-
-    xor-int/2addr v7, v8
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v3, v4
-
-    add-int/lit8 v4, v4, 0x1
-
-    add-int/2addr v2, v6
-
-    goto :goto_0
-
-    :cond_1
-    iget-wide v3, p0, Lo0/e$a;->g:J
-
-    iget-object v5, p0, Lo0/e$a;->d:Lo0/e;
-
-    if-eqz v5, :cond_5
-
-    iget-wide v7, v5, Lo0/e;->e:J
-
-    cmp-long v5, v3, v7
-
-    if-eqz v5, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v6, 0x0
-
-    :goto_1
-    if-eqz v6, :cond_4
-
-    iget-wide v3, p0, Lo0/e$a;->g:J
-
-    const-wide/16 v5, -0x1
-
-    cmp-long v7, v3, v5
-
-    if-nez v7, :cond_3
-
-    const-wide/16 v3, 0x0
-
-    goto :goto_2
-
-    :cond_3
-    iget v5, p0, Lo0/e$a;->j:I
-
-    iget v6, p0, Lo0/e$a;->i:I
-
-    sub-int/2addr v5, v6
-
-    int-to-long v5, v5
-
-    add-long/2addr v3, v5
-
-    :goto_2
-    invoke-virtual {p0, v3, v4}, Lo0/e$a;->a(J)I
-
-    move-result v3
-
-    const/4 v4, -0x1
-
-    if-ne v3, v4, :cond_0
-
-    return-void
-
-    :cond_4
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    const-string p1, "no more bytes"
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_6
-    const-string p0, "key"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_7
-    const-string p0, "cursor"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final c(I)V
-    .locals 1
-
-    invoke-static {p0}, Ln0/g0/k/c;->a(I)Ljava/lang/String;
-
-    move-result-object p0
-
-    if-nez p0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-nez v0, :cond_2
-
-    if-nez p0, :cond_1
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p0, 0x0
-
-    throw p0
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/d$a.smali b/com.discord/smali_classes2/n0/g0/k/d$a.smali
deleted file mode 100644
index f699302847..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/d$a.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public interface abstract Ln0/g0/k/d$a;
-.super Ljava/lang/Object;
-.source "WebSocketReader.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/k/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "a"
-.end annotation
-
-
-# virtual methods
-.method public abstract b(Lokio/ByteString;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract c(Ljava/lang/String;)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract d(Lokio/ByteString;)V
-.end method
-
-.method public abstract f(Lokio/ByteString;)V
-.end method
-
-.method public abstract g(ILjava/lang/String;)V
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/d.smali b/com.discord/smali_classes2/n0/g0/k/d.smali
deleted file mode 100644
index 14f2e5e59c..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/d.smali
+++ /dev/null
@@ -1,711 +0,0 @@
-.class public final Ln0/g0/k/d;
-.super Ljava/lang/Object;
-.source "WebSocketReader.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/k/d$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Z
-
-.field public b:I
-
-.field public c:J
-
-.field public d:Z
-
-.field public e:Z
-
-.field public final f:Lo0/e;
-
-.field public final g:Lo0/e;
-
-.field public final h:[B
-
-.field public final i:Lo0/e$a;
-
-.field public final j:Z
-
-.field public final k:Lo0/g;
-
-.field public final l:Ln0/g0/k/d$a;
-
-
-# direct methods
-.method public constructor <init>(ZLo0/g;Ln0/g0/k/d$a;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/g0/k/d;->j:Z
-
-    iput-object p2, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    iput-object p3, p0, Ln0/g0/k/d;->l:Ln0/g0/k/d$a;
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/k/d;->f:Lo0/e;
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/k/d;->g:Lo0/e;
-
-    iget-boolean p1, p0, Ln0/g0/k/d;->j:Z
-
-    if-eqz p1, :cond_0
-
-    move-object p1, v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x4
-
-    new-array p1, p1, [B
-
-    :goto_0
-    iput-object p1, p0, Ln0/g0/k/d;->h:[B
-
-    iget-boolean p1, p0, Ln0/g0/k/d;->j:Z
-
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v0, Lo0/e$a;
-
-    invoke-direct {v0}, Lo0/e$a;-><init>()V
-
-    :goto_1
-    iput-object v0, p0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    return-void
-
-    :cond_2
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 10
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Ln0/g0/k/d;->c:J
-
-    const/4 v2, 0x0
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v0, v3
-
-    if-lez v5, :cond_2
-
-    iget-object v5, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    iget-object v6, p0, Ln0/g0/k/d;->f:Lo0/e;
-
-    invoke-interface {v5, v6, v0, v1}, Lo0/g;->Q(Lo0/e;J)V
-
-    iget-boolean v0, p0, Ln0/g0/k/d;->j:Z
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/k/d;->f:Lo0/e;
-
-    iget-object v1, p0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v0, v1}, Lo0/e;->i(Lo0/e$a;)Lo0/e$a;
-
-    iget-object v0, p0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    invoke-virtual {v0, v3, v4}, Lo0/e$a;->a(J)I
-
-    iget-object v0, p0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    iget-object v1, p0, Ln0/g0/k/d;->h:[B
-
-    if-eqz v1, :cond_0
-
-    invoke-static {v0, v1}, Ln0/g0/k/c;->b(Lo0/e$a;[B)V
-
-    iget-object v0, p0, Ln0/g0/k/d;->i:Lo0/e$a;
-
-    invoke-virtual {v0}, Lo0/e$a;->close()V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_2
-    :goto_0
-    iget v0, p0, Ln0/g0/k/d;->b:I
-
-    packed-switch v0, :pswitch_data_0
-
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Unknown control opcode: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget v2, p0, Ln0/g0/k/d;->b:I
-
-    invoke-static {v2}, Ln0/g0/b;->C(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :pswitch_0
-    iget-object v0, p0, Ln0/g0/k/d;->l:Ln0/g0/k/d$a;
-
-    iget-object v1, p0, Ln0/g0/k/d;->f:Lo0/e;
-
-    invoke-virtual {v1}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Ln0/g0/k/d$a;->f(Lokio/ByteString;)V
-
-    goto :goto_4
-
-    :pswitch_1
-    iget-object v0, p0, Ln0/g0/k/d;->l:Ln0/g0/k/d$a;
-
-    iget-object v1, p0, Ln0/g0/k/d;->f:Lo0/e;
-
-    invoke-virtual {v1}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Ln0/g0/k/d$a;->d(Lokio/ByteString;)V
-
-    goto :goto_4
-
-    :pswitch_2
-    const/16 v0, 0x3ed
-
-    iget-object v1, p0, Ln0/g0/k/d;->f:Lo0/e;
-
-    iget-wide v5, v1, Lo0/e;->e:J
-
-    const-wide/16 v7, 0x1
-
-    cmp-long v9, v5, v7
-
-    if-eqz v9, :cond_b
-
-    cmp-long v7, v5, v3
-
-    if-eqz v7, :cond_a
-
-    invoke-virtual {v1}, Lo0/e;->readShort()S
-
-    move-result v0
-
-    iget-object v1, p0, Ln0/g0/k/d;->f:Lo0/e;
-
-    invoke-virtual {v1}, Lo0/e;->v()Ljava/lang/String;
-
-    move-result-object v1
-
-    const/16 v3, 0x3e8
-
-    if-lt v0, v3, :cond_7
-
-    const/16 v3, 0x1388
-
-    if-lt v0, v3, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const/16 v3, 0x3ee
-
-    const/16 v4, 0x3ec
-
-    if-gt v4, v0, :cond_4
-
-    if-ge v3, v0, :cond_6
-
-    :cond_4
-    const/16 v3, 0xbb7
-
-    const/16 v4, 0x3f7
-
-    if-le v4, v0, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    if-lt v3, v0, :cond_8
-
-    :cond_6
-    const-string v2, "Code "
-
-    const-string v3, " is reserved and may not be used."
-
-    invoke-static {v2, v0, v3}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    goto :goto_2
-
-    :cond_7
-    :goto_1
-    const-string v2, "Code must be in range [1000,5000): "
-
-    invoke-static {v2, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v2
-
-    :cond_8
-    :goto_2
-    if-nez v2, :cond_9
-
-    goto :goto_3
-
-    :cond_9
-    new-instance v0, Ljava/net/ProtocolException;
-
-    invoke-direct {v0, v2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string v1, ""
-
-    :goto_3
-    iget-object v2, p0, Ln0/g0/k/d;->l:Ln0/g0/k/d$a;
-
-    invoke-interface {v2, v0, v1}, Ln0/g0/k/d$a;->g(ILjava/lang/String;)V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/k/d;->a:Z
-
-    :goto_4
-    return-void
-
-    :cond_b
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Malformed close payload length of 1."
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :pswitch_data_0
-    .packed-switch 0x8
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public final b()V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;,
-            Ljava/net/ProtocolException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/k/d;->a:Z
-
-    if-nez v0, :cond_12
-
-    iget-object v0, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lo0/x;->h()J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v2}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lo0/x;->b()Lo0/x;
-
-    :try_start_0
-    iget-object v2, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v2}, Lo0/g;->readByte()B
-
-    move-result v2
-
-    const/16 v3, 0xff
-
-    invoke-static {v2, v3}, Ln0/g0/b;->a(BI)I
-
-    move-result v2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v4, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v4}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v4
-
-    sget-object v5, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v4, v0, v1, v5}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    and-int/lit8 v0, v2, 0xf
-
-    iput v0, p0, Ln0/g0/k/d;->b:I
-
-    and-int/lit16 v0, v2, 0x80
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    iput-boolean v0, p0, Ln0/g0/k/d;->d:Z
-
-    and-int/lit8 v0, v2, 0x8
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
-    iput-boolean v0, p0, Ln0/g0/k/d;->e:Z
-
-    if-eqz v0, :cond_3
-
-    iget-boolean v0, p0, Ln0/g0/k/d;->d:Z
-
-    if-eqz v0, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Control frames must be final."
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    :goto_2
-    and-int/lit8 v0, v2, 0x40
-
-    if-eqz v0, :cond_4
-
-    const/4 v0, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    const/4 v0, 0x0
-
-    :goto_3
-    and-int/lit8 v4, v2, 0x20
-
-    if-eqz v4, :cond_5
-
-    const/4 v4, 0x1
-
-    goto :goto_4
-
-    :cond_5
-    const/4 v4, 0x0
-
-    :goto_4
-    and-int/lit8 v2, v2, 0x10
-
-    if-eqz v2, :cond_6
-
-    const/4 v2, 0x1
-
-    goto :goto_5
-
-    :cond_6
-    const/4 v2, 0x0
-
-    :goto_5
-    if-nez v0, :cond_11
-
-    if-nez v4, :cond_11
-
-    if-nez v2, :cond_11
-
-    iget-object v0, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readByte()B
-
-    move-result v0
-
-    and-int/2addr v0, v3
-
-    and-int/lit16 v2, v0, 0x80
-
-    if-eqz v2, :cond_7
-
-    const/4 v1, 0x1
-
-    :cond_7
-    iget-boolean v2, p0, Ln0/g0/k/d;->j:Z
-
-    if-ne v1, v2, :cond_9
-
-    new-instance v0, Ljava/net/ProtocolException;
-
-    iget-boolean v1, p0, Ln0/g0/k/d;->j:Z
-
-    if-eqz v1, :cond_8
-
-    const-string v1, "Server-sent frames must not be masked."
-
-    goto :goto_6
-
-    :cond_8
-    const-string v1, "Client-sent frames must be masked."
-
-    :goto_6
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    const/16 v2, 0x7f
-
-    and-int/2addr v0, v2
-
-    int-to-long v3, v0
-
-    iput-wide v3, p0, Ln0/g0/k/d;->c:J
-
-    const/16 v0, 0x7e
-
-    int-to-long v5, v0
-
-    cmp-long v0, v3, v5
-
-    if-nez v0, :cond_a
-
-    iget-object v0, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readShort()S
-
-    move-result v0
-
-    const v2, 0xffff
-
-    and-int/2addr v0, v2
-
-    int-to-long v2, v0
-
-    iput-wide v2, p0, Ln0/g0/k/d;->c:J
-
-    goto :goto_7
-
-    :cond_a
-    int-to-long v5, v2
-
-    cmp-long v0, v3, v5
-
-    if-nez v0, :cond_c
-
-    iget-object v0, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v0}, Lo0/g;->readLong()J
-
-    move-result-wide v2
-
-    iput-wide v2, p0, Ln0/g0/k/d;->c:J
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v0, v2, v4
-
-    if-ltz v0, :cond_b
-
-    goto :goto_7
-
-    :cond_b
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Frame length 0x"
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-wide v2, p0, Ln0/g0/k/d;->c:J
-
-    invoke-static {v2, v3}, Ljava/lang/Long;->toHexString(J)Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v3, "java.lang.Long.toHexString(this)"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, " > 0x7FFFFFFFFFFFFFFF"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    :goto_7
-    iget-boolean v0, p0, Ln0/g0/k/d;->e:Z
-
-    if-eqz v0, :cond_e
-
-    iget-wide v2, p0, Ln0/g0/k/d;->c:J
-
-    const-wide/16 v4, 0x7d
-
-    cmp-long v0, v2, v4
-
-    if-gtz v0, :cond_d
-
-    goto :goto_8
-
-    :cond_d
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Control frame must be less than 125B."
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
-    :goto_8
-    if-eqz v1, :cond_10
-
-    iget-object v0, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    iget-object v1, p0, Ln0/g0/k/d;->h:[B
-
-    if-eqz v1, :cond_f
-
-    invoke-interface {v0, v1}, Lo0/g;->readFully([B)V
-
-    goto :goto_9
-
-    :cond_f
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_10
-    :goto_9
-    return-void
-
-    :cond_11
-    new-instance v0, Ljava/net/ProtocolException;
-
-    const-string v1, "Reserved flags are unsupported."
-
-    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :catchall_0
-    move-exception v2
-
-    iget-object v3, p0, Ln0/g0/k/d;->k:Lo0/g;
-
-    invoke-interface {v3}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v3
-
-    sget-object v4, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v3, v0, v1, v4}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    throw v2
-
-    :cond_12
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/e$a.smali b/com.discord/smali_classes2/n0/g0/k/e$a.smali
deleted file mode 100644
index 43164d0d4e..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/e$a.smali
+++ /dev/null
@@ -1,260 +0,0 @@
-.class public final Ln0/g0/k/e$a;
-.super Ljava/lang/Object;
-.source "WebSocketWriter.kt"
-
-# interfaces
-.implements Lo0/u;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/g0/k/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public e:J
-
-.field public f:Z
-
-.field public g:Z
-
-.field public final synthetic h:Ln0/g0/k/e;
-
-
-# direct methods
-.method public constructor <init>(Ln0/g0/k/e;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public close()V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/k/e$a;->g:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v1, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    iget v2, p0, Ln0/g0/k/e$a;->d:I
-
-    iget-object v0, v1, Ln0/g0/k/e;->c:Lo0/e;
-
-    iget-wide v3, v0, Lo0/e;->e:J
-
-    iget-boolean v5, p0, Ln0/g0/k/e$a;->f:Z
-
-    const/4 v6, 0x1
-
-    invoke-virtual/range {v1 .. v6}, Ln0/g0/k/e;->b(IJZZ)V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/g0/k/e$a;->g:Z
-
-    iget-object v0, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    const/4 v1, 0x0
-
-    iput-boolean v1, v0, Ln0/g0/k/e;->e:Z
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public flush()V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/k/e$a;->g:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v1, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    iget v2, p0, Ln0/g0/k/e$a;->d:I
-
-    iget-object v0, v1, Ln0/g0/k/e;->c:Lo0/e;
-
-    iget-wide v3, v0, Lo0/e;->e:J
-
-    iget-boolean v5, p0, Ln0/g0/k/e$a;->f:Z
-
-    const/4 v6, 0x0
-
-    invoke-virtual/range {v1 .. v6}, Ln0/g0/k/e;->b(IJZZ)V
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Ln0/g0/k/e$a;->f:Z
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    iget-object v0, v0, Ln0/g0/k/e;->i:Lokio/BufferedSink;
-
-    invoke-interface {v0}, Lo0/u;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    iget-boolean v0, p0, Ln0/g0/k/e$a;->g:Z
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    iget-object v0, v0, Ln0/g0/k/e;->c:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->write(Lo0/e;J)V
-
-    iget-boolean p1, p0, Ln0/g0/k/e$a;->f:Z
-
-    const/4 p2, 0x0
-
-    if-eqz p1, :cond_0
-
-    iget-wide v0, p0, Ln0/g0/k/e$a;->e:J
-
-    const-wide/16 v2, -0x1
-
-    cmp-long p1, v0, v2
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    iget-object p1, p1, Ln0/g0/k/e;->c:Lo0/e;
-
-    iget-wide v2, p1, Lo0/e;->e:J
-
-    const/16 p1, 0x2000
-
-    int-to-long v4, p1
-
-    sub-long/2addr v0, v4
-
-    cmp-long p1, v2, v0
-
-    if-lez p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    iget-object p3, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    iget-object p3, p3, Ln0/g0/k/e;->c:Lo0/e;
-
-    invoke-virtual {p3}, Lo0/e;->c()J
-
-    move-result-wide v2
-
-    const-wide/16 v0, 0x0
-
-    cmp-long p3, v2, v0
-
-    if-lez p3, :cond_1
-
-    if-nez p1, :cond_1
-
-    iget-object v0, p0, Ln0/g0/k/e$a;->h:Ln0/g0/k/e;
-
-    iget v1, p0, Ln0/g0/k/e$a;->d:I
-
-    iget-boolean v4, p0, Ln0/g0/k/e$a;->f:Z
-
-    const/4 v5, 0x0
-
-    invoke-virtual/range {v0 .. v5}, Ln0/g0/k/e;->b(IJZZ)V
-
-    iput-boolean p2, p0, Ln0/g0/k/e$a;->f:Z
-
-    :cond_1
-    return-void
-
-    :cond_2
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/g0/k/e.smali b/com.discord/smali_classes2/n0/g0/k/e.smali
deleted file mode 100644
index 12f51bf2b5..0000000000
--- a/com.discord/smali_classes2/n0/g0/k/e.smali
+++ /dev/null
@@ -1,570 +0,0 @@
-.class public final Ln0/g0/k/e;
-.super Ljava/lang/Object;
-.source "WebSocketWriter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/g0/k/e$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lo0/e;
-
-.field public b:Z
-
-.field public final c:Lo0/e;
-
-.field public final d:Ln0/g0/k/e$a;
-
-.field public e:Z
-
-.field public final f:[B
-
-.field public final g:Lo0/e$a;
-
-.field public final h:Z
-
-.field public final i:Lokio/BufferedSink;
-
-.field public final j:Ljava/util/Random;
-
-
-# direct methods
-.method public constructor <init>(ZLokio/BufferedSink;Ljava/util/Random;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_3
-
-    if-eqz p3, :cond_2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/g0/k/e;->h:Z
-
-    iput-object p2, p0, Ln0/g0/k/e;->i:Lokio/BufferedSink;
-
-    iput-object p3, p0, Ln0/g0/k/e;->j:Ljava/util/Random;
-
-    invoke-interface {p2}, Lokio/BufferedSink;->h()Lo0/e;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Ln0/g0/k/e;->c:Lo0/e;
-
-    new-instance p1, Ln0/g0/k/e$a;
-
-    invoke-direct {p1, p0}, Ln0/g0/k/e$a;-><init>(Ln0/g0/k/e;)V
-
-    iput-object p1, p0, Ln0/g0/k/e;->d:Ln0/g0/k/e$a;
-
-    iget-boolean p1, p0, Ln0/g0/k/e;->h:Z
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x4
-
-    new-array p1, p1, [B
-
-    goto :goto_0
-
-    :cond_0
-    move-object p1, v0
-
-    :goto_0
-    iput-object p1, p0, Ln0/g0/k/e;->f:[B
-
-    iget-boolean p1, p0, Ln0/g0/k/e;->h:Z
-
-    if-eqz p1, :cond_1
-
-    new-instance v0, Lo0/e$a;
-
-    invoke-direct {v0}, Lo0/e$a;-><init>()V
-
-    :cond_1
-    iput-object v0, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    return-void
-
-    :cond_2
-    const-string p1, "random"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a(ILokio/ByteString;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/k/e;->b:Z
-
-    if-nez v0, :cond_6
-
-    invoke-virtual {p2}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    int-to-long v1, v0
-
-    const-wide/16 v3, 0x7d
-
-    cmp-long v5, v1, v3
-
-    if-gtz v5, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_5
-
-    or-int/lit16 p1, p1, 0x80
-
-    iget-object v1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {v1, p1}, Lo0/e;->I(I)Lo0/e;
-
-    iget-boolean p1, p0, Ln0/g0/k/e;->h:Z
-
-    if-eqz p1, :cond_3
-
-    or-int/lit16 p1, v0, 0x80
-
-    iget-object v1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {v1, p1}, Lo0/e;->I(I)Lo0/e;
-
-    iget-object p1, p0, Ln0/g0/k/e;->j:Ljava/util/Random;
-
-    iget-object v1, p0, Ln0/g0/k/e;->f:[B
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {p1, v1}, Ljava/util/Random;->nextBytes([B)V
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    iget-object v1, p0, Ln0/g0/k/e;->f:[B
-
-    invoke-virtual {p1, v1}, Lo0/e;->E([B)Lo0/e;
-
-    if-lez v0, :cond_4
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    invoke-virtual {p1, p2}, Lo0/e;->D(Lokio/ByteString;)Lo0/e;
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    iget-object p2, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {p1, p2}, Lo0/e;->i(Lo0/e$a;)Lo0/e$a;
-
-    iget-object p1, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    invoke-virtual {p1, v0, v1}, Lo0/e$a;->a(J)I
-
-    iget-object p1, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    iget-object p2, p0, Ln0/g0/k/e;->f:[B
-
-    invoke-static {p1, p2}, Ln0/g0/k/c;->b(Lo0/e$a;[B)V
-
-    iget-object p1, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    invoke-virtual {p1}, Lo0/e$a;->close()V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_3
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {p1, v0}, Lo0/e;->I(I)Lo0/e;
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {p1, p2}, Lo0/e;->D(Lokio/ByteString;)Lo0/e;
-
-    :cond_4
-    :goto_1
-    iget-object p1, p0, Ln0/g0/k/e;->i:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
-
-    return-void
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Payload size must be less than or equal to 125"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final b(IJZZ)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Ln0/g0/k/e;->b:Z
-
-    if-nez v0, :cond_9
-
-    const/4 v0, 0x0
-
-    if-eqz p4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    if-eqz p5, :cond_1
-
-    or-int/lit16 p1, p1, 0x80
-
-    :cond_1
-    iget-object p4, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {p4, p1}, Lo0/e;->I(I)Lo0/e;
-
-    iget-boolean p1, p0, Ln0/g0/k/e;->h:Z
-
-    if-eqz p1, :cond_2
-
-    const/16 v0, 0x80
-
-    :cond_2
-    const-wide/16 p4, 0x7d
-
-    cmp-long p1, p2, p4
-
-    if-gtz p1, :cond_3
-
-    long-to-int p1, p2
-
-    or-int/2addr p1, v0
-
-    iget-object p4, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {p4, p1}, Lo0/e;->I(I)Lo0/e;
-
-    goto/16 :goto_1
-
-    :cond_3
-    const-wide/32 p4, 0xffff
-
-    cmp-long p1, p2, p4
-
-    if-gtz p1, :cond_4
-
-    or-int/lit8 p1, v0, 0x7e
-
-    iget-object p4, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {p4, p1}, Lo0/e;->I(I)Lo0/e;
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    long-to-int p4, p2
-
-    invoke-virtual {p1, p4}, Lo0/e;->N(I)Lo0/e;
-
-    goto :goto_1
-
-    :cond_4
-    or-int/lit8 p1, v0, 0x7f
-
-    iget-object p4, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    invoke-virtual {p4, p1}, Lo0/e;->I(I)Lo0/e;
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    const/16 p4, 0x8
-
-    invoke-virtual {p1, p4}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object p5
-
-    iget-object v0, p5, Lo0/r;->a:[B
-
-    iget v1, p5, Lo0/r;->c:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    const/16 v3, 0x38
-
-    ushr-long v3, p2, v3
-
-    const-wide/16 v5, 0xff
-
-    and-long/2addr v3, v5
-
-    long-to-int v4, v3
-
-    int-to-byte v3, v4
-
-    aput-byte v3, v0, v1
-
-    add-int/lit8 v1, v2, 0x1
-
-    const/16 v3, 0x30
-
-    ushr-long v3, p2, v3
-
-    and-long/2addr v3, v5
-
-    long-to-int v4, v3
-
-    int-to-byte v3, v4
-
-    aput-byte v3, v0, v2
-
-    add-int/lit8 v2, v1, 0x1
-
-    const/16 v3, 0x28
-
-    ushr-long v3, p2, v3
-
-    and-long/2addr v3, v5
-
-    long-to-int v4, v3
-
-    int-to-byte v3, v4
-
-    aput-byte v3, v0, v1
-
-    add-int/lit8 v1, v2, 0x1
-
-    const/16 v3, 0x20
-
-    ushr-long v3, p2, v3
-
-    and-long/2addr v3, v5
-
-    long-to-int v4, v3
-
-    int-to-byte v3, v4
-
-    aput-byte v3, v0, v2
-
-    add-int/lit8 v2, v1, 0x1
-
-    const/16 v3, 0x18
-
-    ushr-long v3, p2, v3
-
-    and-long/2addr v3, v5
-
-    long-to-int v4, v3
-
-    int-to-byte v3, v4
-
-    aput-byte v3, v0, v1
-
-    add-int/lit8 v1, v2, 0x1
-
-    const/16 v3, 0x10
-
-    ushr-long v3, p2, v3
-
-    and-long/2addr v3, v5
-
-    long-to-int v4, v3
-
-    int-to-byte v3, v4
-
-    aput-byte v3, v0, v2
-
-    add-int/lit8 v2, v1, 0x1
-
-    ushr-long v3, p2, p4
-
-    and-long/2addr v3, v5
-
-    long-to-int p4, v3
-
-    int-to-byte p4, p4
-
-    aput-byte p4, v0, v1
-
-    add-int/lit8 p4, v2, 0x1
-
-    and-long v3, p2, v5
-
-    long-to-int v1, v3
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v0, v2
-
-    iput p4, p5, Lo0/r;->c:I
-
-    iget-wide p4, p1, Lo0/e;->e:J
-
-    const-wide/16 v0, 0x8
-
-    add-long/2addr p4, v0
-
-    iput-wide p4, p1, Lo0/e;->e:J
-
-    :goto_1
-    iget-boolean p1, p0, Ln0/g0/k/e;->h:Z
-
-    if-eqz p1, :cond_7
-
-    iget-object p1, p0, Ln0/g0/k/e;->j:Ljava/util/Random;
-
-    iget-object p4, p0, Ln0/g0/k/e;->f:[B
-
-    const/4 p5, 0x0
-
-    if-eqz p4, :cond_6
-
-    invoke-virtual {p1, p4}, Ljava/util/Random;->nextBytes([B)V
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    iget-object p4, p0, Ln0/g0/k/e;->f:[B
-
-    invoke-virtual {p1, p4}, Lo0/e;->E([B)Lo0/e;
-
-    const-wide/16 v0, 0x0
-
-    cmp-long p1, p2, v0
-
-    if-lez p1, :cond_8
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    iget-object p4, p0, Ln0/g0/k/e;->c:Lo0/e;
-
-    invoke-virtual {p1, p4, p2, p3}, Lo0/e;->write(Lo0/e;J)V
-
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    iget-object p2, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    if-eqz p2, :cond_5
-
-    invoke-virtual {p1, p2}, Lo0/e;->i(Lo0/e$a;)Lo0/e$a;
-
-    iget-object p1, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    invoke-virtual {p1, v0, v1}, Lo0/e$a;->a(J)I
-
-    iget-object p1, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    iget-object p2, p0, Ln0/g0/k/e;->f:[B
-
-    invoke-static {p1, p2}, Ln0/g0/k/c;->b(Lo0/e$a;[B)V
-
-    iget-object p1, p0, Ln0/g0/k/e;->g:Lo0/e$a;
-
-    invoke-virtual {p1}, Lo0/e$a;->close()V
-
-    goto :goto_2
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p5
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw p5
-
-    :cond_7
-    iget-object p1, p0, Ln0/g0/k/e;->a:Lo0/e;
-
-    iget-object p4, p0, Ln0/g0/k/e;->c:Lo0/e;
-
-    invoke-virtual {p1, p4, p2, p3}, Lo0/e;->write(Lo0/e;J)V
-
-    :cond_8
-    :goto_2
-    iget-object p1, p0, Ln0/g0/k/e;->i:Lokio/BufferedSink;
-
-    invoke-interface {p1}, Lokio/BufferedSink;->y()Lokio/BufferedSink;
-
-    return-void
-
-    :cond_9
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/h$a.smali b/com.discord/smali_classes2/n0/h$a.smali
deleted file mode 100644
index 61b8a3919c..0000000000
--- a/com.discord/smali_classes2/n0/h$a.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class public final Ln0/h$a;
-.super Ljava/lang/Object;
-.source "CertificatePinner.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/security/cert/Certificate;)Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "sha256/"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    check-cast p1, Ljava/security/cert/X509Certificate;
-
-    invoke-virtual {p0, p1}, Ln0/h$a;->b(Ljava/security/cert/X509Certificate;)Lokio/ByteString;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lo0/y/a;->a(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final b(Ljava/security/cert/X509Certificate;)Lokio/ByteString;
-    .locals 3
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getPublicKey()Ljava/security/PublicKey;
-
-    move-result-object p1
-
-    const-string v1, "publicKey"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {p1}, Ljava/security/PublicKey;->getEncoded()[B
-
-    move-result-object p1
-
-    const-string v1, "publicKey.encoded"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v1, 0x3
-
-    const/4 v2, 0x0
-
-    invoke-static {v0, p1, v2, v2, v1}, Lokio/ByteString$a;->c(Lokio/ByteString$a;[BIII)Lokio/ByteString;
-
-    move-result-object p1
-
-    const-string v0, "SHA-256"
-
-    invoke-virtual {p1, v0}, Lokio/ByteString;->f(Ljava/lang/String;)Lokio/ByteString;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/n0/h$b.smali b/com.discord/smali_classes2/n0/h$b.smali
deleted file mode 100644
index b62cefe8c7..0000000000
--- a/com.discord/smali_classes2/n0/h$b.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public final Ln0/h$b;
-.super Ljava/lang/Object;
-.source "CertificatePinner.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public final b:Ljava/lang/String;
-
-.field public final c:Ljava/lang/String;
-
-.field public final d:Lokio/ByteString;
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Ln0/h$b;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/h$b;
-
-    iget-object v0, p1, Ln0/h$b;->a:Ljava/lang/String;
-
-    const/4 v1, 0x0
-
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p1, Ln0/h$b;->b:Ljava/lang/String;
-
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p1, Ln0/h$b;->c:Ljava/lang/String;
-
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p1, Ln0/h$b;->d:Lokio/ByteString;
-
-    invoke-static {v1, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/n0/h.smali b/com.discord/smali_classes2/n0/h.smali
deleted file mode 100644
index e70dcb9669..0000000000
--- a/com.discord/smali_classes2/n0/h.smali
+++ /dev/null
@@ -1,460 +0,0 @@
-.class public final Ln0/h;
-.super Ljava/lang/Object;
-.source "CertificatePinner.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/h$b;,
-        Ln0/h$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:Ln0/h;
-
-.field public static final d:Ln0/h$a;
-
-
-# instance fields
-.field public final a:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ln0/h$b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ln0/g0/j/c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Ln0/h$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/h$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/h;->d:Ln0/h$a;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    new-instance v2, Ln0/h;
-
-    invoke-static {v0}, Lj0/i/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-direct {v2, v0, v1}, Ln0/h;-><init>(Ljava/util/Set;Ln0/g0/j/c;)V
-
-    sput-object v2, Ln0/h;->c:Ln0/h;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/util/Set;Ln0/g0/j/c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Set<",
-            "Ln0/h$b;",
-            ">;",
-            "Ln0/g0/j/c;",
-            ")V"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/h;->a:Ljava/util/Set;
-
-    iput-object p2, p0, Ln0/h;->b:Ln0/g0/j/c;
-
-    return-void
-
-    :cond_0
-    const-string p1, "pins"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Lkotlin/jvm/functions/Function0<",
-            "+",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/security/cert/X509Certificate;",
-            ">;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_e
-
-    sget-object v1, Lj0/i/n;->d:Lj0/i/n;
-
-    iget-object v2, p0, Ln0/h;->a:Ljava/util/Set;
-
-    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :cond_0
-    :goto_0
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_6
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ln0/h$b;
-
-    if-eqz v3, :cond_5
-
-    const/4 v4, 0x2
-
-    const/4 v5, 0x0
-
-    const-string v6, "*."
-
-    invoke-static {v0, v6, v5, v4}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v4
-
-    if-nez v4, :cond_4
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    :cond_1
-    instance-of v4, v1, Lj0/n/c/v/a;
-
-    if-eqz v4, :cond_3
-
-    instance-of v4, v1, Lj0/n/c/v/c;
-
-    if-eqz v4, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const-string p1, "kotlin.collections.MutableList"
-
-    invoke-static {v1, p1}, Lj0/n/c/u;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    :goto_1
-    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_4
-    const/16 p2, 0x2e
-
-    const/4 v1, 0x6
-
-    invoke-static {p1, p2, v5, v5, v1}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    throw v0
-
-    :cond_5
-    throw v0
-
-    :cond_6
-    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_7
-
-    return-void
-
-    :cond_7
-    invoke-interface {p2}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/util/List;
-
-    invoke-interface {p2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :cond_8
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_a
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/security/cert/X509Certificate;
-
-    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_8
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ln0/h$b;
-
-    if-eqz p1, :cond_9
-
-    throw v0
-
-    :cond_9
-    throw v0
-
-    :cond_a
-    const-string v0, "Certificate pinning failure!"
-
-    const-string v2, "\n  Peer certificate chain:"
-
-    invoke-static {v0, v2}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-interface {p2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :goto_2
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    const-string v3, "\n    "
-
-    if-eqz v2, :cond_c
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/security/cert/X509Certificate;
-
-    if-eqz v2, :cond_b
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v3, Ln0/h;->d:Ln0/h$a;
-
-    invoke-virtual {v3, v2}, Ln0/h$a;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, ": "
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
-
-    move-result-object v2
-
-    const-string v3, "x509Certificate.subjectDN"
-
-    invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v2}, Ljava/security/Principal;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :cond_b
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string p2, "null cannot be cast to non-null type java.security.cert.X509Certificate"
-
-    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_c
-    const-string p2, "\n  Pinned certificates for "
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, ":"
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :goto_3
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_d
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Ln0/h$b;
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    goto :goto_3
-
-    :cond_d
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string p2, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance p2, Ljavax/net/ssl/SSLPeerUnverifiedException;
-
-    invoke-direct {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_e
-    const-string p1, "hostname"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    instance-of v0, p1, Ln0/h;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/h;
-
-    iget-object v0, p1, Ln0/h;->a:Ljava/util/Set;
-
-    iget-object v1, p0, Ln0/h;->a:Ljava/util/Set;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p1, Ln0/h;->b:Ln0/g0/j/c;
-
-    iget-object v0, p0, Ln0/h;->b:Ln0/g0/j/c;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Ln0/h;->a:Ljava/util/Set;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    add-int/lit16 v0, v0, 0x5ed
-
-    mul-int/lit8 v0, v0, 0x29
-
-    iget-object v1, p0, Ln0/h;->b:Ln0/g0/j/c;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    add-int/2addr v0, v1
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/n0/h0/a$a.smali b/com.discord/smali_classes2/n0/h0/a$a.smali
deleted file mode 100644
index c7be580d6d..0000000000
--- a/com.discord/smali_classes2/n0/h0/a$a.smali
+++ /dev/null
@@ -1,137 +0,0 @@
-.class public final enum Ln0/h0/a$a;
-.super Ljava/lang/Enum;
-.source "HttpLoggingInterceptor.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/h0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x4019
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Ln0/h0/a$a;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Ln0/h0/a$a;
-
-.field public static final enum e:Ln0/h0/a$a;
-
-.field public static final enum f:Ln0/h0/a$a;
-
-.field public static final enum g:Ln0/h0/a$a;
-
-.field public static final synthetic h:[Ln0/h0/a$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x4
-
-    new-array v0, v0, [Ln0/h0/a$a;
-
-    new-instance v1, Ln0/h0/a$a;
-
-    const-string v2, "NONE"
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3}, Ln0/h0/a$a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Ln0/h0/a$a;->d:Ln0/h0/a$a;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/h0/a$a;
-
-    const-string v2, "BASIC"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v1, v2, v3}, Ln0/h0/a$a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Ln0/h0/a$a;->e:Ln0/h0/a$a;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/h0/a$a;
-
-    const-string v2, "HEADERS"
-
-    const/4 v3, 0x2
-
-    invoke-direct {v1, v2, v3}, Ln0/h0/a$a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Ln0/h0/a$a;->f:Ln0/h0/a$a;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/h0/a$a;
-
-    const-string v2, "BODY"
-
-    const/4 v3, 0x3
-
-    invoke-direct {v1, v2, v3}, Ln0/h0/a$a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v1, Ln0/h0/a$a;->g:Ln0/h0/a$a;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Ln0/h0/a$a;->h:[Ln0/h0/a$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Ln0/h0/a$a;
-    .locals 1
-
-    const-class v0, Ln0/h0/a$a;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Ln0/h0/a$a;
-
-    return-object p0
-.end method
-
-.method public static values()[Ln0/h0/a$a;
-    .locals 1
-
-    sget-object v0, Ln0/h0/a$a;->h:[Ln0/h0/a$a;
-
-    invoke-virtual {v0}, [Ln0/h0/a$a;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Ln0/h0/a$a;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/h0/a$b.smali b/com.discord/smali_classes2/n0/h0/a$b.smali
deleted file mode 100644
index 18c9794730..0000000000
--- a/com.discord/smali_classes2/n0/h0/a$b.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public interface abstract Ln0/h0/a$b;
-.super Ljava/lang/Object;
-.source "HttpLoggingInterceptor.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/h0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "b"
-.end annotation
-
-
-# virtual methods
-.method public abstract log(Ljava/lang/String;)V
-.end method
diff --git a/com.discord/smali_classes2/n0/h0/a.smali b/com.discord/smali_classes2/n0/h0/a.smali
deleted file mode 100644
index cfebfc9a80..0000000000
--- a/com.discord/smali_classes2/n0/h0/a.smali
+++ /dev/null
@@ -1,1059 +0,0 @@
-.class public final Ln0/h0/a;
-.super Ljava/lang/Object;
-.source "HttpLoggingInterceptor.kt"
-
-# interfaces
-.implements Lokhttp3/Interceptor;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/h0/a$a;,
-        Ln0/h0/a$b;
-    }
-.end annotation
-
-
-# instance fields
-.field public volatile b:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public volatile c:Ln0/h0/a$a;
-
-.field public final d:Ln0/h0/a$b;
-
-
-# direct methods
-.method public constructor <init>(Ln0/h0/a$b;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    sget-object p1, Lj0/i/p;->d:Lj0/i/p;
-
-    iput-object p1, p0, Ln0/h0/a;->b:Ljava/util/Set;
-
-    sget-object p1, Ln0/h0/a$a;->d:Ln0/h0/a$a;
-
-    iput-object p1, p0, Ln0/h0/a;->c:Ln0/h0/a$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Lokhttp3/Headers;)Z
-    .locals 3
-
-    const-string v0, "Content-Encoding"
-
-    invoke-virtual {p1, v0}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    const-string v1, "identity"
-
-    const/4 v2, 0x1
-
-    invoke-static {p1, v1, v2}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    const-string v1, "gzip"
-
-    invoke-static {p1, v1, v2}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result p1
-
-    if-nez p1, :cond_0
-
-    const/4 v0, 0x1
-
-    :cond_0
-    return v0
-.end method
-
-.method public final b(Lokhttp3/Headers;I)V
-    .locals 3
-
-    iget-object v0, p0, Ln0/h0/a;->b:Ljava/util/Set;
-
-    iget-object v1, p1, Lokhttp3/Headers;->d:[Ljava/lang/String;
-
-    mul-int/lit8 p2, p2, 0x2
-
-    aget-object v1, v1, p2
-
-    invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const-string v0, "\u2588\u2588"
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p1, Lokhttp3/Headers;->d:[Ljava/lang/String;
-
-    add-int/lit8 v1, p2, 0x1
-
-    aget-object v0, v0, v1
-
-    :goto_0
-    iget-object v1, p0, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object p1, p1, Lokhttp3/Headers;->d:[Ljava/lang/String;
-
-    aget-object p1, p1, p2
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, ": "
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-interface {v1, p1}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    return-void
-.end method
-
-.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
-    .locals 21
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v1, p0
-
-    move-object/from16 v0, p1
-
-    iget-object v2, v1, Ln0/h0/a;->c:Ln0/h0/a$a;
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Ln0/a0;
-
-    move-result-object v3
-
-    sget-object v4, Ln0/h0/a$a;->d:Ln0/h0/a$a;
-
-    if-ne v2, v4, :cond_0
-
-    invoke-interface {v0, v3}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    sget-object v4, Ln0/h0/a$a;->g:Ln0/h0/a$a;
-
-    if-ne v2, v4, :cond_1
-
-    const/4 v4, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v4, 0x0
-
-    :goto_0
-    if-nez v4, :cond_3
-
-    sget-object v5, Ln0/h0/a$a;->f:Ln0/h0/a$a;
-
-    if-ne v2, v5, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v2, 0x0
-
-    goto :goto_2
-
-    :cond_3
-    :goto_1
-    const/4 v2, 0x1
-
-    :goto_2
-    iget-object v5, v3, Ln0/a0;->e:Lokhttp3/RequestBody;
-
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->a()Ln0/k;
-
-    move-result-object v6
-
-    const-string v7, "--> "
-
-    invoke-static {v7}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v7
-
-    iget-object v8, v3, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v8, 0x20
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v8, v3, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v8, ""
-
-    if-eqz v6, :cond_4
-
-    const-string v9, " "
-
-    invoke-static {v9}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v9
-
-    invoke-interface {v6}, Ln0/k;->a()Ln0/y;
-
-    move-result-object v6
-
-    invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v6
-
-    goto :goto_3
-
-    :cond_4
-    move-object v6, v8
-
-    :goto_3
-    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v6
-
-    const-string v7, "-byte body)"
-
-    const-string v9, " ("
-
-    if-nez v2, :cond_5
-
-    if-eqz v5, :cond_5
-
-    invoke-static {v6, v9}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v6
-
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v10
-
-    invoke-virtual {v6, v10, v11}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v6
-
-    :cond_5
-    iget-object v10, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-interface {v10, v6}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    const-string v6, "-byte body omitted)"
-
-    const-string v10, "UTF_8"
-
-    if-eqz v2, :cond_f
-
-    iget-object v11, v3, Ln0/a0;->d:Lokhttp3/Headers;
-
-    if-eqz v5, :cond_7
-
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
-
-    move-result-object v12
-
-    if-eqz v12, :cond_6
-
-    const-string v13, "Content-Type"
-
-    invoke-virtual {v11, v13}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v13
-
-    if-nez v13, :cond_6
-
-    iget-object v13, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    new-instance v14, Ljava/lang/StringBuilder;
-
-    invoke-direct {v14}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v15, "Content-Type: "
-
-    invoke-virtual {v14, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v14, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v14}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v12
-
-    invoke-interface {v13, v12}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    :cond_6
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v12
-
-    const-wide/16 v14, -0x1
-
-    cmp-long v16, v12, v14
-
-    if-eqz v16, :cond_7
-
-    const-string v12, "Content-Length"
-
-    invoke-virtual {v11, v12}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v12
-
-    if-nez v12, :cond_7
-
-    iget-object v12, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    const-string v13, "Content-Length: "
-
-    invoke-static {v13}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v13
-
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v14
-
-    invoke-virtual {v13, v14, v15}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v13}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v13
-
-    invoke-interface {v12, v13}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    :cond_7
-    invoke-virtual {v11}, Lokhttp3/Headers;->size()I
-
-    move-result v12
-
-    const/4 v13, 0x0
-
-    :goto_4
-    if-ge v13, v12, :cond_8
-
-    invoke-virtual {v1, v11, v13}, Ln0/h0/a;->b(Lokhttp3/Headers;I)V
-
-    add-int/lit8 v13, v13, 0x1
-
-    goto :goto_4
-
-    :cond_8
-    const-string v11, "--> END "
-
-    if-eqz v4, :cond_e
-
-    if-nez v5, :cond_9
-
-    goto/16 :goto_6
-
-    :cond_9
-    iget-object v12, v3, Ln0/a0;->d:Lokhttp3/Headers;
-
-    invoke-virtual {v1, v12}, Ln0/h0/a;->a(Lokhttp3/Headers;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_a
-
-    iget-object v5, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v11
-
-    iget-object v12, v3, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v12, " (encoded body omitted)"
-
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-interface {v5, v11}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    goto/16 :goto_7
-
-    :cond_a
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->isDuplex()Z
-
-    move-result v12
-
-    if-eqz v12, :cond_b
-
-    iget-object v5, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v11
-
-    iget-object v12, v3, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v12, " (duplex request body omitted)"
-
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-interface {v5, v11}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    goto/16 :goto_7
-
-    :cond_b
-    new-instance v12, Lo0/e;
-
-    invoke-direct {v12}, Lo0/e;-><init>()V
-
-    invoke-virtual {v5, v12}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
-
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
-
-    move-result-object v13
-
-    if-eqz v13, :cond_c
-
-    sget-object v14, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-virtual {v13, v14}, Lokhttp3/MediaType;->a(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
-
-    move-result-object v13
-
-    if-eqz v13, :cond_c
-
-    goto :goto_5
-
-    :cond_c
-    sget-object v13, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-static {v13, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_5
-    iget-object v14, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-interface {v14, v8}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    invoke-static {v12}, Lf/n/a/k/a;->L(Lo0/e;)Z
-
-    move-result v14
-
-    if-eqz v14, :cond_d
-
-    iget-object v14, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-virtual {v12, v13}, Lo0/e;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
-
-    move-result-object v12
-
-    invoke-interface {v14, v12}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    iget-object v12, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v11
-
-    iget-object v13, v3, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v11, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v13
-
-    invoke-virtual {v11, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-interface {v12, v5}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    goto :goto_7
-
-    :cond_d
-    iget-object v12, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v11
-
-    iget-object v13, v3, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v11, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v13, " (binary "
-
-    invoke-virtual {v11, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v13
-
-    invoke-virtual {v11, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-interface {v12, v5}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    goto :goto_7
-
-    :cond_e
-    :goto_6
-    iget-object v5, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v11
-
-    iget-object v12, v3, Ln0/a0;->c:Ljava/lang/String;
-
-    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-interface {v5, v11}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    :cond_f
-    :goto_7
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v11
-
-    :try_start_0
-    invoke-interface {v0, v3}, Lokhttp3/Interceptor$Chain;->d(Ln0/a0;)Lokhttp3/Response;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    sget-object v3, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v13
-
-    sub-long/2addr v13, v11
-
-    invoke-virtual {v3, v13, v14}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
-
-    move-result-wide v11
-
-    iget-object v3, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    if-eqz v3, :cond_1e
-
-    invoke-virtual {v3}, Lokhttp3/ResponseBody;->a()J
-
-    move-result-wide v13
-
-    const-wide/16 v15, -0x1
-
-    cmp-long v5, v13, v15
-
-    if-eqz v5, :cond_10
-
-    new-instance v5, Ljava/lang/StringBuilder;
-
-    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v5, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v15, "-byte"
-
-    invoke-virtual {v5, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    goto :goto_8
-
-    :cond_10
-    const-string v5, "unknown-length"
-
-    :goto_8
-    iget-object v15, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    const-string v16, "<-- "
-
-    move-object/from16 v17, v7
-
-    invoke-static/range {v16 .. v16}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v7
-
-    move-wide/from16 v18, v13
-
-    iget v13, v0, Lokhttp3/Response;->g:I
-
-    invoke-virtual {v7, v13}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    iget-object v13, v0, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    invoke-virtual {v13}, Ljava/lang/String;->length()I
-
-    move-result v13
-
-    if-nez v13, :cond_11
-
-    const/4 v13, 0x1
-
-    goto :goto_9
-
-    :cond_11
-    const/4 v13, 0x0
-
-    :goto_9
-    if-eqz v13, :cond_12
-
-    move-object/from16 v20, v6
-
-    move-object v6, v8
-
-    goto :goto_a
-
-    :cond_12
-    iget-object v13, v0, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    new-instance v14, Ljava/lang/StringBuilder;
-
-    invoke-direct {v14}, Ljava/lang/StringBuilder;-><init>()V
-
-    const/16 v16, 0x20
-
-    move-object/from16 v20, v6
-
-    invoke-static/range {v16 .. v16}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-virtual {v14, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v14, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v14}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v6
-
-    :goto_a
-    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v6, 0x20
-
-    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v6, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v6, v6, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7, v11, v12}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v6, "ms"
-
-    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    if-nez v2, :cond_13
-
-    const-string v6, ", "
-
-    const-string v9, " body"
-
-    invoke-static {v6, v5, v9}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v5
-
-    goto :goto_b
-
-    :cond_13
-    move-object v5, v8
-
-    :goto_b
-    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v5, 0x29
-
-    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-interface {v15, v5}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    if-eqz v2, :cond_1d
-
-    iget-object v2, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v2}, Lokhttp3/Headers;->size()I
-
-    move-result v5
-
-    const/4 v6, 0x0
-
-    :goto_c
-    if-ge v6, v5, :cond_14
-
-    invoke-virtual {v1, v2, v6}, Ln0/h0/a;->b(Lokhttp3/Headers;I)V
-
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_c
-
-    :cond_14
-    if-eqz v4, :cond_1c
-
-    invoke-static {v0}, Ln0/g0/e/e;->a(Lokhttp3/Response;)Z
-
-    move-result v4
-
-    if-nez v4, :cond_15
-
-    goto/16 :goto_f
-
-    :cond_15
-    iget-object v4, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v1, v4}, Ln0/h0/a;->a(Lokhttp3/Headers;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_16
-
-    iget-object v2, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    const-string v3, "<-- END HTTP (encoded body omitted)"
-
-    invoke-interface {v2, v3}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    goto/16 :goto_10
-
-    :cond_16
-    invoke-virtual {v3}, Lokhttp3/ResponseBody;->c()Lo0/g;
-
-    move-result-object v4
-
-    const-wide v5, 0x7fffffffffffffffL
-
-    invoke-interface {v4, v5, v6}, Lo0/g;->m(J)Z
-
-    invoke-interface {v4}, Lo0/g;->h()Lo0/e;
-
-    move-result-object v4
-
-    const-string v5, "Content-Encoding"
-
-    invoke-virtual {v2, v5}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v5, "gzip"
-
-    const/4 v6, 0x1
-
-    invoke-static {v5, v2, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_17
-
-    iget-wide v5, v4, Lo0/e;->e:J
-
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    new-instance v5, Lo0/k;
-
-    invoke-virtual {v4}, Lo0/e;->b()Lo0/e;
-
-    move-result-object v4
-
-    invoke-direct {v5, v4}, Lo0/k;-><init>(Lo0/w;)V
-
-    :try_start_1
-    new-instance v4, Lo0/e;
-
-    invoke-direct {v4}, Lo0/e;-><init>()V
-
-    invoke-virtual {v4, v5}, Lo0/e;->i0(Lo0/w;)J
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 v6, 0x0
-
-    invoke-static {v5, v6}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
-
-    goto :goto_d
-
-    :catchall_0
-    move-exception v0
-
-    move-object v2, v0
-
-    :try_start_2
-    throw v2
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    move-object v3, v0
-
-    invoke-static {v5, v2}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
-
-    throw v3
-
-    :cond_17
-    const/4 v2, 0x0
-
-    :goto_d
-    invoke-virtual {v3}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_18
-
-    sget-object v5, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-virtual {v3, v5}, Lokhttp3/MediaType;->a(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_18
-
-    goto :goto_e
-
-    :cond_18
-    sget-object v3, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-static {v3, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_e
-    invoke-static {v4}, Lf/n/a/k/a;->L(Lo0/e;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_19
-
-    iget-object v2, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-interface {v2, v8}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    iget-object v2, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    const-string v3, "<-- END HTTP (binary "
-
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    iget-wide v4, v4, Lo0/e;->e:J
-
-    invoke-virtual {v3, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    move-object/from16 v4, v20
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-interface {v2, v3}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_19
-    const-wide/16 v5, 0x0
-
-    cmp-long v7, v18, v5
-
-    if-eqz v7, :cond_1a
-
-    iget-object v5, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-interface {v5, v8}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    iget-object v5, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-virtual {v4}, Lo0/e;->b()Lo0/e;
-
-    move-result-object v6
-
-    invoke-virtual {v6, v3}, Lo0/e;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-interface {v5, v3}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    :cond_1a
-    const-string v3, "<-- END HTTP ("
-
-    if-eqz v2, :cond_1b
-
-    iget-object v5, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    iget-wide v6, v4, Lo0/e;->e:J
-
-    invoke-virtual {v3, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v4, "-byte, "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v2, "-gzipped-byte body)"
-
-    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-interface {v5, v2}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    goto :goto_10
-
-    :cond_1b
-    iget-object v2, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v3
-
-    iget-wide v4, v4, Lo0/e;->e:J
-
-    invoke-virtual {v3, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    move-object/from16 v4, v17
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-interface {v2, v3}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    goto :goto_10
-
-    :cond_1c
-    :goto_f
-    iget-object v2, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    const-string v3, "<-- END HTTP"
-
-    invoke-interface {v2, v3}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    :cond_1d
-    :goto_10
-    return-object v0
-
-    :cond_1e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :catch_0
-    move-exception v0
-
-    move-object v2, v0
-
-    iget-object v0, v1, Ln0/h0/a;->d:Ln0/h0/a$b;
-
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v4, "<-- HTTP FAILED: "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-interface {v0, v3}, Ln0/h0/a$b;->log(Ljava/lang/String;)V
-
-    throw v2
-.end method
diff --git a/com.discord/smali_classes2/n0/i.smali b/com.discord/smali_classes2/n0/i.smali
deleted file mode 100644
index 60ddf6217a..0000000000
--- a/com.discord/smali_classes2/n0/i.smali
+++ /dev/null
@@ -1,120 +0,0 @@
-.class public final Ln0/i;
-.super Lj0/n/c/i;
-.source "CertificatePinner.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Ljava/util/List<",
-        "+",
-        "Ljava/security/cert/X509Certificate;",
-        ">;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $hostname:Ljava/lang/String;
-
-.field public final synthetic $peerCertificates:Ljava/util/List;
-
-.field public final synthetic this$0:Ln0/h;
-
-
-# direct methods
-.method public constructor <init>(Ln0/h;Ljava/util/List;Ljava/lang/String;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/i;->this$0:Ln0/h;
-
-    iput-object p2, p0, Ln0/i;->$peerCertificates:Ljava/util/List;
-
-    iput-object p3, p0, Ln0/i;->$hostname:Ljava/lang/String;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 3
-
-    iget-object v0, p0, Ln0/i;->this$0:Ln0/h;
-
-    iget-object v0, v0, Ln0/h;->b:Ln0/g0/j/c;
-
-    if-eqz v0, :cond_0
-
-    iget-object v1, p0, Ln0/i;->$peerCertificates:Ljava/util/List;
-
-    iget-object v2, p0, Ln0/i;->$hostname:Ljava/lang/String;
-
-    invoke-virtual {v0, v1, v2}, Ln0/g0/j/c;->a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Ln0/i;->$peerCertificates:Ljava/util/List;
-
-    :goto_0
-    new-instance v1, Ljava/util/ArrayList;
-
-    const/16 v2, 0xa
-
-    invoke-static {v0, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v2
-
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/security/cert/Certificate;
-
-    if-eqz v2, :cond_1
-
-    check-cast v2, Ljava/security/cert/X509Certificate;
-
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.security.cert.X509Certificate"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/n0/j$a.smali b/com.discord/smali_classes2/n0/j$a.smali
deleted file mode 100644
index 6ee3297250..0000000000
--- a/com.discord/smali_classes2/n0/j$a.smali
+++ /dev/null
@@ -1,132 +0,0 @@
-.class public final Ln0/j$a;
-.super Ljava/lang/Object;
-.source "CipherSuite.kt"
-
-# interfaces
-.implements Ljava/util/Comparator;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/j;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Comparator<",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public compare(Ljava/lang/Object;Ljava/lang/Object;)I
-    .locals 6
-
-    check-cast p1, Ljava/lang/String;
-
-    check-cast p2, Ljava/lang/String;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    if-eqz p2, :cond_4
-
-    const/4 v0, 0x4
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    invoke-virtual {p2}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    invoke-static {v1, v2}, Ljava/lang/Math;->min(II)I
-
-    move-result v1
-
-    :goto_0
-    const/4 v2, -0x1
-
-    const/4 v3, 0x1
-
-    if-ge v0, v1, :cond_2
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    invoke-virtual {p2, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    if-eq v4, v5, :cond_1
-
-    if-ge v4, v5, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result p1
-
-    invoke-virtual {p2}, Ljava/lang/String;->length()I
-
-    move-result p2
-
-    if-eq p1, p2, :cond_3
-
-    if-ge p1, p2, :cond_0
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_1
-    return v2
-
-    :cond_4
-    const-string p1, "b"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const-string p1, "a"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/j$b.smali b/com.discord/smali_classes2/n0/j$b.smali
deleted file mode 100644
index ad6b87f41a..0000000000
--- a/com.discord/smali_classes2/n0/j$b.smali
+++ /dev/null
@@ -1,182 +0,0 @@
-.class public final Ln0/j$b;
-.super Ljava/lang/Object;
-.source "CipherSuite.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/j;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public static final a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-    .locals 0
-
-    const/4 p2, 0x0
-
-    if-eqz p0, :cond_0
-
-    new-instance p0, Ln0/j;
-
-    invoke-direct {p0, p1, p2}, Ln0/j;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sget-object p2, Ln0/j;->c:Ljava/util/Map;
-
-    invoke-interface {p2, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-object p0
-
-    :cond_0
-    throw p2
-.end method
-
-
-# virtual methods
-.method public final declared-synchronized b(Ljava/lang/String;)Ln0/j;
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    const-string v0, "javaName"
-
-    const/4 v1, 0x0
-
-    if-eqz p1, :cond_2
-
-    sget-object v0, Ln0/j;->c:Ljava/util/Map;
-
-    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ln0/j;
-
-    if-nez v0, :cond_1
-
-    sget-object v0, Ln0/j;->c:Ljava/util/Map;
-
-    invoke-virtual {p0, p1}, Ln0/j$b;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ln0/j;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Ln0/j;
-
-    invoke-direct {v0, p1, v1}, Ln0/j;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    :cond_0
-    sget-object v1, Ln0/j;->c:Ljava/util/Map;
-
-    invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_1
-    monitor-exit p0
-
-    return-object v0
-
-    :cond_2
-    :try_start_1
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final c(Ljava/lang/String;)Ljava/lang/String;
-    .locals 7
-
-    const-string v0, "TLS_"
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p1, v0, v1, v2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v3
-
-    const-string v4, "(this as java.lang.String).substring(startIndex)"
-
-    const/4 v5, 0x4
-
-    const-string v6, "SSL_"
-
-    if-eqz v3, :cond_0
-
-    invoke-static {v6}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1, v6, v1, v2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    :cond_1
-    :goto_0
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/n0/j.smali b/com.discord/smali_classes2/n0/j.smali
deleted file mode 100644
index 012a24e6f6..0000000000
--- a/com.discord/smali_classes2/n0/j.smali
+++ /dev/null
@@ -1,1136 +0,0 @@
-.class public final Ln0/j;
-.super Ljava/lang/Object;
-.source "CipherSuite.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/j$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final b:Ljava/util/Comparator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Comparator<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final c:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ln0/j;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final d:Ln0/j;
-
-.field public static final e:Ln0/j;
-
-.field public static final f:Ln0/j;
-
-.field public static final g:Ln0/j;
-
-.field public static final h:Ln0/j;
-
-.field public static final i:Ln0/j;
-
-.field public static final j:Ln0/j;
-
-.field public static final k:Ln0/j;
-
-.field public static final l:Ln0/j;
-
-.field public static final m:Ln0/j;
-
-.field public static final n:Ln0/j;
-
-.field public static final o:Ln0/j;
-
-.field public static final p:Ln0/j;
-
-.field public static final q:Ln0/j;
-
-.field public static final r:Ln0/j;
-
-.field public static final s:Ln0/j;
-
-.field public static final t:Ln0/j$b;
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Ln0/j$b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/j$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/j;->t:Ln0/j$b;
-
-    new-instance v0, Ln0/j$a;
-
-    invoke-direct {v0}, Ln0/j$a;-><init>()V
-
-    sput-object v0, Ln0/j;->b:Ljava/util/Comparator;
-
-    new-instance v0, Ljava/util/LinkedHashMap;
-
-    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
-
-    sput-object v0, Ln0/j;->c:Ljava/util/Map;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_WITH_NULL_MD5"
-
-    const/4 v2, 0x1
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_WITH_NULL_SHA"
-
-    const/4 v2, 0x2
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_EXPORT_WITH_RC4_40_MD5"
-
-    const/4 v2, 0x3
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_WITH_RC4_128_MD5"
-
-    const/4 v2, 0x4
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_WITH_RC4_128_SHA"
-
-    const/4 v2, 0x5
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"
-
-    const/16 v2, 0x8
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_WITH_DES_CBC_SHA"
-
-    const/16 v2, 0x9
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
-
-    const/16 v2, 0xa
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->d:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"
-
-    const/16 v2, 0x11
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DHE_DSS_WITH_DES_CBC_SHA"
-
-    const/16 v2, 0x12
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
-
-    const/16 v2, 0x13
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"
-
-    const/16 v2, 0x14
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DHE_RSA_WITH_DES_CBC_SHA"
-
-    const/16 v2, 0x15
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
-
-    const/16 v2, 0x16
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
-
-    const/16 v2, 0x17
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DH_anon_WITH_RC4_128_MD5"
-
-    const/16 v2, 0x18
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
-
-    const/16 v2, 0x19
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DH_anon_WITH_DES_CBC_SHA"
-
-    const/16 v2, 0x1a
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
-
-    const/16 v2, 0x1b
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_WITH_DES_CBC_SHA"
-
-    const/16 v2, 0x1e
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"
-
-    const/16 v2, 0x1f
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_WITH_RC4_128_SHA"
-
-    const/16 v2, 0x20
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_WITH_DES_CBC_MD5"
-
-    const/16 v2, 0x22
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"
-
-    const/16 v2, 0x23
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_WITH_RC4_128_MD5"
-
-    const/16 v2, 0x24
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"
-
-    const/16 v2, 0x26
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"
-
-    const/16 v2, 0x28
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
-
-    const/16 v2, 0x29
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
-
-    const/16 v2, 0x2b
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_AES_128_CBC_SHA"
-
-    const/16 v2, 0x2f
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->e:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
-
-    const/16 v2, 0x32
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
-
-    const/16 v2, 0x33
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DH_anon_WITH_AES_128_CBC_SHA"
-
-    const/16 v2, 0x34
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_AES_256_CBC_SHA"
-
-    const/16 v2, 0x35
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->f:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
-
-    const/16 v2, 0x38
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
-
-    const/16 v2, 0x39
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DH_anon_WITH_AES_256_CBC_SHA"
-
-    const/16 v2, 0x3a
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_NULL_SHA256"
-
-    const/16 v2, 0x3b
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_AES_128_CBC_SHA256"
-
-    const/16 v2, 0x3c
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_AES_256_CBC_SHA256"
-
-    const/16 v2, 0x3d
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
-
-    const/16 v2, 0x40
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
-
-    const/16 v2, 0x41
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
-
-    const/16 v2, 0x44
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
-
-    const/16 v2, 0x45
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
-
-    const/16 v2, 0x67
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
-
-    const/16 v2, 0x6a
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
-
-    const/16 v2, 0x6b
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
-
-    const/16 v2, 0x6c
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
-
-    const/16 v2, 0x6d
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
-
-    const/16 v2, 0x84
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
-
-    const/16 v2, 0x87
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
-
-    const/16 v2, 0x88
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_PSK_WITH_RC4_128_SHA"
-
-    const/16 v2, 0x8a
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
-
-    const/16 v2, 0x8b
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_PSK_WITH_AES_128_CBC_SHA"
-
-    const/16 v2, 0x8c
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_PSK_WITH_AES_256_CBC_SHA"
-
-    const/16 v2, 0x8d
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_SEED_CBC_SHA"
-
-    const/16 v2, 0x96
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_AES_128_GCM_SHA256"
-
-    const/16 v2, 0x9c
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->g:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_RSA_WITH_AES_256_GCM_SHA384"
-
-    const/16 v2, 0x9d
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->h:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
-
-    const/16 v2, 0x9e
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
-
-    const/16 v2, 0x9f
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
-
-    const/16 v2, 0xa2
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
-
-    const/16 v2, 0xa3
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
-
-    const/16 v2, 0xa6
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
-
-    const/16 v2, 0xa7
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
-
-    const/16 v2, 0xff
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_FALLBACK_SCSV"
-
-    const/16 v2, 0x5600
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_NULL_SHA"
-
-    const v2, 0xc001
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"
-
-    const v2, 0xc002
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"
-
-    const v2, 0xc003
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"
-
-    const v2, 0xc004
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"
-
-    const v2, 0xc005
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
-
-    const v2, 0xc006
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
-
-    const v2, 0xc007
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
-
-    const v2, 0xc008
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
-
-    const v2, 0xc009
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
-
-    const v2, 0xc00a
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_NULL_SHA"
-
-    const v2, 0xc00b
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_RC4_128_SHA"
-
-    const v2, 0xc00c
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"
-
-    const v2, 0xc00d
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"
-
-    const v2, 0xc00e
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"
-
-    const v2, 0xc00f
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_NULL_SHA"
-
-    const v2, 0xc010
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
-
-    const v2, 0xc011
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
-
-    const v2, 0xc012
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
-
-    const v2, 0xc013
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->i:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
-
-    const v2, 0xc014
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->j:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_anon_WITH_NULL_SHA"
-
-    const v2, 0xc015
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_anon_WITH_RC4_128_SHA"
-
-    const v2, 0xc016
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
-
-    const v2, 0xc017
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
-
-    const v2, 0xc018
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
-
-    const v2, 0xc019
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
-
-    const v2, 0xc023
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
-
-    const v2, 0xc024
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"
-
-    const v2, 0xc025
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"
-
-    const v2, 0xc026
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
-
-    const v2, 0xc027
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
-
-    const v2, 0xc028
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"
-
-    const v2, 0xc029
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"
-
-    const v2, 0xc02a
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
-
-    const v2, 0xc02b
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->k:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
-
-    const v2, 0xc02c
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->l:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"
-
-    const v2, 0xc02d
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"
-
-    const v2, 0xc02e
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
-
-    const v2, 0xc02f
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->m:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
-
-    const v2, 0xc030
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->n:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
-
-    const v2, 0xc031
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"
-
-    const v2, 0xc032
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
-
-    const v2, 0xc035
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
-
-    const v2, 0xc036
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
-
-    const v2, 0xcca8
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->o:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
-
-    const v2, 0xcca9
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->p:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
-
-    const v2, 0xccaa
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
-
-    const v2, 0xccac
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_AES_128_GCM_SHA256"
-
-    const/16 v2, 0x1301
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->q:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_AES_256_GCM_SHA384"
-
-    const/16 v2, 0x1302
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->r:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_CHACHA20_POLY1305_SHA256"
-
-    const/16 v2, 0x1303
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/j;->s:Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_AES_128_CCM_SHA256"
-
-    const/16 v2, 0x1304
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    sget-object v0, Ln0/j;->t:Ln0/j$b;
-
-    const-string v1, "TLS_AES_128_CCM_8_SHA256"
-
-    const/16 v2, 0x1305
-
-    invoke-static {v0, v1, v2}, Ln0/j$b;->a(Ln0/j$b;Ljava/lang/String;I)Ln0/j;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/j;->a:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Ln0/j;->a:Ljava/lang/String;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/k.smali b/com.discord/smali_classes2/n0/k.smali
deleted file mode 100644
index eb6b8e3e82..0000000000
--- a/com.discord/smali_classes2/n0/k.smali
+++ /dev/null
@@ -1,8 +0,0 @@
-.class public interface abstract Ln0/k;
-.super Ljava/lang/Object;
-.source "Connection.kt"
-
-
-# virtual methods
-.method public abstract a()Ln0/y;
-.end method
diff --git a/com.discord/smali_classes2/n0/l.smali b/com.discord/smali_classes2/n0/l.smali
deleted file mode 100644
index b3573c83f7..0000000000
--- a/com.discord/smali_classes2/n0/l.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final Ln0/l;
-.super Ljava/lang/Object;
-.source "ConnectionPool.kt"
-
-
-# instance fields
-.field public final a:Ln0/g0/d/j;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 5
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
-
-    if-eqz v0, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v1, Ln0/g0/d/j;
-
-    const/4 v2, 0x5
-
-    const-wide/16 v3, 0x5
-
-    invoke-direct {v1, v2, v3, v4, v0}, Ln0/g0/d/j;-><init>(IJLjava/util/concurrent/TimeUnit;)V
-
-    iput-object v1, p0, Ln0/l;->a:Ln0/g0/d/j;
-
-    return-void
-
-    :cond_0
-    const-string v0, "timeUnit"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/m$a.smali b/com.discord/smali_classes2/n0/m$a.smali
deleted file mode 100644
index 59ce20eebd..0000000000
--- a/com.discord/smali_classes2/n0/m$a.smali
+++ /dev/null
@@ -1,451 +0,0 @@
-.class public final Ln0/m$a;
-.super Ljava/lang/Object;
-.source "ConnectionSpec.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/m;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:Z
-
-.field public b:[Ljava/lang/String;
-
-.field public c:[Ljava/lang/String;
-
-.field public d:Z
-
-
-# direct methods
-.method public constructor <init>(Ln0/m;)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-boolean v0, p1, Ln0/m;->a:Z
-
-    iput-boolean v0, p0, Ln0/m$a;->a:Z
-
-    iget-object v0, p1, Ln0/m;->c:[Ljava/lang/String;
-
-    iput-object v0, p0, Ln0/m$a;->b:[Ljava/lang/String;
-
-    iget-object v0, p1, Ln0/m;->d:[Ljava/lang/String;
-
-    iput-object v0, p0, Ln0/m$a;->c:[Ljava/lang/String;
-
-    iget-boolean p1, p1, Ln0/m;->b:Z
-
-    iput-boolean p1, p0, Ln0/m$a;->d:Z
-
-    return-void
-
-    :cond_0
-    const-string p1, "connectionSpec"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/m$a;->a:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()Ln0/m;
-    .locals 5
-
-    new-instance v0, Ln0/m;
-
-    iget-boolean v1, p0, Ln0/m$a;->a:Z
-
-    iget-boolean v2, p0, Ln0/m$a;->d:Z
-
-    iget-object v3, p0, Ln0/m$a;->b:[Ljava/lang/String;
-
-    iget-object v4, p0, Ln0/m$a;->c:[Ljava/lang/String;
-
-    invoke-direct {v0, v1, v2, v3, v4}, Ln0/m;-><init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
-
-    return-object v0
-.end method
-
-.method public final varargs b([Ljava/lang/String;)Ln0/m$a;
-    .locals 2
-
-    if-eqz p1, :cond_4
-
-    iget-boolean v0, p0, Ln0/m$a;->a:Z
-
-    if-eqz v0, :cond_3
-
-    array-length v0, p1
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p1}, Ljava/lang/Object;->clone()Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    check-cast p1, [Ljava/lang/String;
-
-    iput-object p1, p0, Ln0/m$a;->b:[Ljava/lang/String;
-
-    return-object p0
-
-    :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<kotlin.String>"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "At least one cipher suite is required"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "no cipher suites for cleartext connections"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string p1, "cipherSuites"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final varargs c([Ln0/j;)Ln0/m$a;
-    .locals 5
-
-    if-eqz p1, :cond_3
-
-    iget-boolean v0, p0, Ln0/m$a;->a:Z
-
-    if-eqz v0, :cond_2
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    array-length v1, p1
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    array-length v1, p1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_0
-
-    aget-object v4, p1, v3
-
-    iget-object v4, v4, Ln0/j;->a:Ljava/lang/String;
-
-    invoke-interface {v0, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    new-array p1, v2, [Ljava/lang/String;
-
-    invoke-interface {v0, p1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    check-cast p1, [Ljava/lang/String;
-
-    array-length v0, p1
-
-    invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Ln0/m$a;->b([Ljava/lang/String;)Ln0/m$a;
-
-    return-object p0
-
-    :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "no cipher suites for cleartext connections"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "cipherSuites"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final d(Z)Ln0/m$a;
-    .locals 1
-
-    iget-boolean v0, p0, Ln0/m$a;->a:Z
-
-    if-eqz v0, :cond_0
-
-    iput-boolean p1, p0, Ln0/m$a;->d:Z
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "no TLS extensions for cleartext connections"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final varargs e([Ljava/lang/String;)Ln0/m$a;
-    .locals 2
-
-    if-eqz p1, :cond_4
-
-    iget-boolean v0, p0, Ln0/m$a;->a:Z
-
-    if-eqz v0, :cond_3
-
-    array-length v0, p1
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p1}, Ljava/lang/Object;->clone()Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    check-cast p1, [Ljava/lang/String;
-
-    iput-object p1, p0, Ln0/m$a;->c:[Ljava/lang/String;
-
-    return-object p0
-
-    :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<kotlin.String>"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "At least one TLS version is required"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "no TLS versions for cleartext connections"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string p1, "tlsVersions"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final varargs f([Ln0/f0;)Ln0/m$a;
-    .locals 5
-
-    iget-boolean v0, p0, Ln0/m$a;->a:Z
-
-    if-eqz v0, :cond_2
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    array-length v1, p1
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    array-length v1, p1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_0
-
-    aget-object v4, p1, v3
-
-    iget-object v4, v4, Ln0/f0;->javaName:Ljava/lang/String;
-
-    invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    new-array p1, v2, [Ljava/lang/String;
-
-    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    check-cast p1, [Ljava/lang/String;
-
-    array-length v0, p1
-
-    invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Ljava/lang/String;
-
-    invoke-virtual {p0, p1}, Ln0/m$a;->e([Ljava/lang/String;)Ln0/m$a;
-
-    return-object p0
-
-    :cond_1
-    new-instance p1, Lkotlin/TypeCastException;
-
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
-
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "no TLS versions for cleartext connections"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/m.smali b/com.discord/smali_classes2/n0/m.smali
deleted file mode 100644
index e4ebffbcc7..0000000000
--- a/com.discord/smali_classes2/n0/m.smali
+++ /dev/null
@@ -1,685 +0,0 @@
-.class public final Ln0/m;
-.super Ljava/lang/Object;
-.source "ConnectionSpec.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/m$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final e:[Ln0/j;
-
-.field public static final f:[Ln0/j;
-
-.field public static final g:Ln0/m;
-
-.field public static final h:Ln0/m;
-
-
-# instance fields
-.field public final a:Z
-
-.field public final b:Z
-
-.field public final c:[Ljava/lang/String;
-
-.field public final d:[Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 14
-
-    sget-object v0, Ln0/f0;->e:Ln0/f0;
-
-    sget-object v1, Ln0/f0;->d:Ln0/f0;
-
-    const/16 v2, 0x9
-
-    new-array v3, v2, [Ln0/j;
-
-    sget-object v4, Ln0/j;->q:Ln0/j;
-
-    const/4 v5, 0x0
-
-    aput-object v4, v3, v5
-
-    sget-object v4, Ln0/j;->r:Ln0/j;
-
-    const/4 v6, 0x1
-
-    aput-object v4, v3, v6
-
-    sget-object v4, Ln0/j;->s:Ln0/j;
-
-    const/4 v7, 0x2
-
-    aput-object v4, v3, v7
-
-    sget-object v4, Ln0/j;->k:Ln0/j;
-
-    const/4 v8, 0x3
-
-    aput-object v4, v3, v8
-
-    sget-object v4, Ln0/j;->m:Ln0/j;
-
-    const/4 v9, 0x4
-
-    aput-object v4, v3, v9
-
-    sget-object v4, Ln0/j;->l:Ln0/j;
-
-    const/4 v10, 0x5
-
-    aput-object v4, v3, v10
-
-    sget-object v4, Ln0/j;->n:Ln0/j;
-
-    const/4 v11, 0x6
-
-    aput-object v4, v3, v11
-
-    sget-object v4, Ln0/j;->p:Ln0/j;
-
-    const/4 v12, 0x7
-
-    aput-object v4, v3, v12
-
-    sget-object v4, Ln0/j;->o:Ln0/j;
-
-    const/16 v13, 0x8
-
-    aput-object v4, v3, v13
-
-    sput-object v3, Ln0/m;->e:[Ln0/j;
-
-    const/16 v3, 0x10
-
-    new-array v3, v3, [Ln0/j;
-
-    sget-object v4, Ln0/j;->q:Ln0/j;
-
-    aput-object v4, v3, v5
-
-    sget-object v4, Ln0/j;->r:Ln0/j;
-
-    aput-object v4, v3, v6
-
-    sget-object v4, Ln0/j;->s:Ln0/j;
-
-    aput-object v4, v3, v7
-
-    sget-object v4, Ln0/j;->k:Ln0/j;
-
-    aput-object v4, v3, v8
-
-    sget-object v4, Ln0/j;->m:Ln0/j;
-
-    aput-object v4, v3, v9
-
-    sget-object v4, Ln0/j;->l:Ln0/j;
-
-    aput-object v4, v3, v10
-
-    sget-object v4, Ln0/j;->n:Ln0/j;
-
-    aput-object v4, v3, v11
-
-    sget-object v4, Ln0/j;->p:Ln0/j;
-
-    aput-object v4, v3, v12
-
-    sget-object v4, Ln0/j;->o:Ln0/j;
-
-    aput-object v4, v3, v13
-
-    sget-object v4, Ln0/j;->i:Ln0/j;
-
-    aput-object v4, v3, v2
-
-    sget-object v2, Ln0/j;->j:Ln0/j;
-
-    const/16 v4, 0xa
-
-    aput-object v2, v3, v4
-
-    sget-object v2, Ln0/j;->g:Ln0/j;
-
-    const/16 v4, 0xb
-
-    aput-object v2, v3, v4
-
-    sget-object v2, Ln0/j;->h:Ln0/j;
-
-    const/16 v4, 0xc
-
-    aput-object v2, v3, v4
-
-    sget-object v2, Ln0/j;->e:Ln0/j;
-
-    const/16 v4, 0xd
-
-    aput-object v2, v3, v4
-
-    sget-object v2, Ln0/j;->f:Ln0/j;
-
-    const/16 v4, 0xe
-
-    aput-object v2, v3, v4
-
-    sget-object v2, Ln0/j;->d:Ln0/j;
-
-    const/16 v4, 0xf
-
-    aput-object v2, v3, v4
-
-    sput-object v3, Ln0/m;->f:[Ln0/j;
-
-    new-instance v2, Ln0/m$a;
-
-    invoke-direct {v2, v6}, Ln0/m$a;-><init>(Z)V
-
-    sget-object v3, Ln0/m;->e:[Ln0/j;
-
-    array-length v4, v3
-
-    invoke-static {v3, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, [Ln0/j;
-
-    invoke-virtual {v2, v3}, Ln0/m$a;->c([Ln0/j;)Ln0/m$a;
-
-    new-array v3, v7, [Ln0/f0;
-
-    aput-object v1, v3, v5
-
-    aput-object v0, v3, v6
-
-    invoke-virtual {v2, v3}, Ln0/m$a;->f([Ln0/f0;)Ln0/m$a;
-
-    invoke-virtual {v2, v6}, Ln0/m$a;->d(Z)Ln0/m$a;
-
-    invoke-virtual {v2}, Ln0/m$a;->a()Ln0/m;
-
-    new-instance v2, Ln0/m$a;
-
-    invoke-direct {v2, v6}, Ln0/m$a;-><init>(Z)V
-
-    sget-object v3, Ln0/m;->f:[Ln0/j;
-
-    array-length v4, v3
-
-    invoke-static {v3, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, [Ln0/j;
-
-    invoke-virtual {v2, v3}, Ln0/m$a;->c([Ln0/j;)Ln0/m$a;
-
-    new-array v3, v7, [Ln0/f0;
-
-    aput-object v1, v3, v5
-
-    aput-object v0, v3, v6
-
-    invoke-virtual {v2, v3}, Ln0/m$a;->f([Ln0/f0;)Ln0/m$a;
-
-    invoke-virtual {v2, v6}, Ln0/m$a;->d(Z)Ln0/m$a;
-
-    invoke-virtual {v2}, Ln0/m$a;->a()Ln0/m;
-
-    move-result-object v2
-
-    sput-object v2, Ln0/m;->g:Ln0/m;
-
-    new-instance v2, Ln0/m$a;
-
-    invoke-direct {v2, v6}, Ln0/m$a;-><init>(Z)V
-
-    sget-object v3, Ln0/m;->f:[Ln0/j;
-
-    array-length v4, v3
-
-    invoke-static {v3, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, [Ln0/j;
-
-    invoke-virtual {v2, v3}, Ln0/m$a;->c([Ln0/j;)Ln0/m$a;
-
-    new-array v3, v9, [Ln0/f0;
-
-    aput-object v1, v3, v5
-
-    aput-object v0, v3, v6
-
-    sget-object v0, Ln0/f0;->f:Ln0/f0;
-
-    aput-object v0, v3, v7
-
-    sget-object v0, Ln0/f0;->g:Ln0/f0;
-
-    aput-object v0, v3, v8
-
-    invoke-virtual {v2, v3}, Ln0/m$a;->f([Ln0/f0;)Ln0/m$a;
-
-    invoke-virtual {v2, v6}, Ln0/m$a;->d(Z)Ln0/m$a;
-
-    invoke-virtual {v2}, Ln0/m$a;->a()Ln0/m;
-
-    new-instance v0, Ln0/m;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v5, v5, v1, v1}, Ln0/m;-><init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
-
-    sput-object v0, Ln0/m;->h:Ln0/m;
-
-    return-void
-.end method
-
-.method public constructor <init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Ln0/m;->a:Z
-
-    iput-boolean p2, p0, Ln0/m;->b:Z
-
-    iput-object p3, p0, Ln0/m;->c:[Ljava/lang/String;
-
-    iput-object p4, p0, Ln0/m;->d:[Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()Ljava/util/List;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ln0/j;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/m;->c:[Ljava/lang/String;
-
-    if-eqz v0, :cond_1
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    array-length v2, v0
-
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    array-length v2, v0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v2, :cond_0
-
-    aget-object v4, v0, v3
-
-    sget-object v5, Ln0/j;->t:Ln0/j$b;
-
-    invoke-virtual {v5, v4}, Ln0/j$b;->b(Ljava/lang/String;)Ln0/j;
-
-    move-result-object v4
-
-    invoke-interface {v1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {v1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object v0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
-    return-object v0
-.end method
-
-.method public final b(Ljavax/net/ssl/SSLSocket;)Z
-    .locals 4
-
-    if-eqz p1, :cond_3
-
-    iget-boolean v0, p0, Ln0/m;->a:Z
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    iget-object v0, p0, Ln0/m;->d:[Ljava/lang/String;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
-
-    move-result-object v2
-
-    sget-object v3, Lj0/j/c;->d:Lj0/j/c;
-
-    invoke-static {v0, v2, v3}, Ln0/g0/b;->m([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    return v1
-
-    :cond_1
-    iget-object v0, p0, Ln0/m;->c:[Ljava/lang/String;
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
-
-    move-result-object p1
-
-    sget-object v2, Ln0/j;->t:Ln0/j$b;
-
-    sget-object v2, Ln0/j;->b:Ljava/util/Comparator;
-
-    invoke-static {v0, p1, v2}, Ln0/g0/b;->m([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_2
-
-    return v1
-
-    :cond_2
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_3
-    const-string p1, "socket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final c()Ljava/util/List;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ln0/f0;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/m;->d:[Ljava/lang/String;
-
-    if-eqz v0, :cond_1
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    array-length v2, v0
-
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
-
-    array-length v2, v0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v2, :cond_0
-
-    aget-object v4, v0, v3
-
-    sget-object v5, Ln0/f0;->j:Ln0/f0$a;
-
-    invoke-virtual {v5, v4}, Ln0/f0$a;->a(Ljava/lang/String;)Ln0/f0;
-
-    move-result-object v4
-
-    invoke-interface {v1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {v1}, Lj0/i/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object v0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
-    return-object v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    instance-of v0, p1, Ln0/m;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_1
-
-    return v0
-
-    :cond_1
-    iget-boolean v2, p0, Ln0/m;->a:Z
-
-    check-cast p1, Ln0/m;
-
-    iget-boolean v3, p1, Ln0/m;->a:Z
-
-    if-eq v2, v3, :cond_2
-
-    return v1
-
-    :cond_2
-    if-eqz v2, :cond_5
-
-    iget-object v2, p0, Ln0/m;->c:[Ljava/lang/String;
-
-    iget-object v3, p1, Ln0/m;->c:[Ljava/lang/String;
-
-    invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_3
-
-    return v1
-
-    :cond_3
-    iget-object v2, p0, Ln0/m;->d:[Ljava/lang/String;
-
-    iget-object v3, p1, Ln0/m;->d:[Ljava/lang/String;
-
-    invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_4
-
-    return v1
-
-    :cond_4
-    iget-boolean v2, p0, Ln0/m;->b:Z
-
-    iget-boolean p1, p1, Ln0/m;->b:Z
-
-    if-eq v2, p1, :cond_5
-
-    return v1
-
-    :cond_5
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget-boolean v0, p0, Ln0/m;->a:Z
-
-    if-eqz v0, :cond_2
-
-    const/16 v0, 0x20f
-
-    iget-object v1, p0, Ln0/m;->c:[Ljava/lang/String;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_0
-
-    invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
-
-    move-result v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/m;->d:[Ljava/lang/String;
-
-    if-eqz v1, :cond_1
-
-    invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
-
-    move-result v2
-
-    :cond_1
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Ln0/m;->b:Z
-
-    xor-int/lit8 v1, v1, 0x1
-
-    add-int/2addr v0, v1
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v0, 0x11
-
-    :goto_1
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 4
-
-    iget-boolean v0, p0, Ln0/m;->a:Z
-
-    if-nez v0, :cond_0
-
-    const-string v0, "ConnectionSpec()"
-
-    return-object v0
-
-    :cond_0
-    const-string v0, "ConnectionSpec("
-
-    const-string v1, "cipherSuites="
-
-    invoke-static {v0, v1}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Ln0/m;->a()Ljava/util/List;
-
-    move-result-object v1
-
-    const-string v2, "[all enabled]"
-
-    invoke-static {v1, v2}, Ljava/util/Objects;->toString(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, "tlsVersions="
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ln0/m;->c()Ljava/util/List;
-
-    move-result-object v3
-
-    invoke-static {v3, v2}, Ljava/util/Objects;->toString(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "supportsTlsExtensions="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Ln0/m;->b:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/n$a.smali b/com.discord/smali_classes2/n0/n$a.smali
deleted file mode 100644
index 86e63d88ae..0000000000
--- a/com.discord/smali_classes2/n0/n$a.smali
+++ /dev/null
@@ -1,676 +0,0 @@
-.class public final Ln0/n$a;
-.super Ljava/lang/Object;
-.source "Cookie.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/n;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/String;IIZ)I
-    .locals 4
-
-    :goto_0
-    if-ge p2, p3, :cond_7
-
-    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v1, 0x20
-
-    const/4 v2, 0x1
-
-    if-ge v0, v1, :cond_0
-
-    const/16 v1, 0x9
-
-    if-ne v0, v1, :cond_5
-
-    :cond_0
-    const/16 v1, 0x7f
-
-    if-ge v0, v1, :cond_5
-
-    const/16 v1, 0x39
-
-    const/16 v3, 0x30
-
-    if-gt v3, v0, :cond_1
-
-    if-ge v1, v0, :cond_5
-
-    :cond_1
-    const/16 v1, 0x7a
-
-    const/16 v3, 0x61
-
-    if-gt v3, v0, :cond_2
-
-    if-ge v1, v0, :cond_5
-
-    :cond_2
-    const/16 v1, 0x5a
-
-    const/16 v3, 0x41
-
-    if-gt v3, v0, :cond_3
-
-    if-ge v1, v0, :cond_5
-
-    :cond_3
-    const/16 v1, 0x3a
-
-    if-ne v0, v1, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    const/4 v0, 0x0
-
-    goto :goto_2
-
-    :cond_5
-    :goto_1
-    const/4 v0, 0x1
-
-    :goto_2
-    xor-int/lit8 v1, p4, 0x1
-
-    if-ne v0, v1, :cond_6
-
-    return p2
-
-    :cond_6
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_0
-
-    :cond_7
-    return p3
-.end method
-
-.method public final b(Ljava/lang/String;Ljava/lang/String;)Z
-    .locals 3
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    const/4 v0, 0x2
-
-    const/4 v2, 0x0
-
-    invoke-static {p1, p2, v2, v0}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    invoke-virtual {p2}, Ljava/lang/String;->length()I
-
-    move-result p2
-
-    sub-int/2addr v0, p2
-
-    sub-int/2addr v0, v1
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result p2
-
-    const/16 v0, 0x2e
-
-    if-ne p2, v0, :cond_1
-
-    invoke-static {p1}, Ln0/g0/b;->b(Ljava/lang/String;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
-
-.method public final c(Ljava/lang/String;)Ljava/lang/String;
-    .locals 4
-
-    const-string v0, "."
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    invoke-static {p1, v0, v1, v2}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v3
-
-    xor-int/lit8 v3, v3, 0x1
-
-    if-eqz v3, :cond_2
-
-    invoke-static {p1, v0, v1, v2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_0
-    invoke-static {p1}, Lf/n/a/k/a;->i0(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    return-object p1
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Failed requirement."
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final d(Ljava/lang/String;II)J
-    .locals 12
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, p2, p3, v0}, Ln0/n$a;->a(Ljava/lang/String;IIZ)I
-
-    move-result p2
-
-    sget-object v1, Ln0/n;->m:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v1, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
-
-    move-result-object v1
-
-    const/4 v2, -0x1
-
-    const/4 v3, -0x1
-
-    const/4 v4, -0x1
-
-    const/4 v5, -0x1
-
-    const/4 v6, -0x1
-
-    const/4 v7, -0x1
-
-    const/4 v8, -0x1
-
-    :goto_0
-    const/4 v9, 0x2
-
-    const/4 v10, 0x1
-
-    if-ge p2, p3, :cond_4
-
-    add-int/lit8 v11, p2, 0x1
-
-    invoke-virtual {p0, p1, v11, p3, v10}, Ln0/n$a;->a(Ljava/lang/String;IIZ)I
-
-    move-result v11
-
-    invoke-virtual {v1, p2, v11}, Ljava/util/regex/Matcher;->region(II)Ljava/util/regex/Matcher;
-
-    if-ne v4, v2, :cond_0
-
-    sget-object p2, Ln0/n;->m:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_0
-
-    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v4
-
-    invoke-virtual {v1, v9}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v7
-
-    const/4 p2, 0x3
-
-    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v8
-
-    goto :goto_1
-
-    :cond_0
-    if-ne v5, v2, :cond_1
-
-    sget-object p2, Ln0/n;->l:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_1
-
-    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v5
-
-    goto :goto_1
-
-    :cond_1
-    if-ne v6, v2, :cond_2
-
-    sget-object p2, Ln0/n;->k:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_2
-
-    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string v6, "matcher.group(1)"
-
-    invoke-static {p2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v6, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const-string v9, "Locale.US"
-
-    invoke-static {v6, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2, v6}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object p2
-
-    const-string v6, "(this as java.lang.String).toLowerCase(locale)"
-
-    invoke-static {p2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v6, Ln0/n;->k:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v6}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
-
-    move-result-object v6
-
-    const-string v9, "MONTH_PATTERN.pattern()"
-
-    invoke-static {v6, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v9, 0x6
-
-    invoke-static {v6, p2, v0, v0, v9}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
-
-    move-result p2
-
-    div-int/lit8 v6, p2, 0x4
-
-    goto :goto_1
-
-    :cond_2
-    if-ne v3, v2, :cond_3
-
-    sget-object p2, Ln0/n;->j:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_3
-
-    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v3
-
-    :cond_3
-    :goto_1
-    add-int/lit8 v11, v11, 0x1
-
-    invoke-virtual {p0, p1, v11, p3, v0}, Ln0/n$a;->a(Ljava/lang/String;IIZ)I
-
-    move-result p2
-
-    goto/16 :goto_0
-
-    :cond_4
-    const/16 p1, 0x63
-
-    const/16 p2, 0x46
-
-    if-le p2, v3, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    if-lt p1, v3, :cond_6
-
-    add-int/lit16 v3, v3, 0x76c
-
-    :cond_6
-    :goto_2
-    const/16 p1, 0x45
-
-    if-gez v3, :cond_7
-
-    goto :goto_3
-
-    :cond_7
-    if-lt p1, v3, :cond_8
-
-    add-int/lit16 v3, v3, 0x7d0
-
-    :cond_8
-    :goto_3
-    const/16 p1, 0x641
-
-    if-lt v3, p1, :cond_9
-
-    const/4 p1, 0x1
-
-    goto :goto_4
-
-    :cond_9
-    const/4 p1, 0x0
-
-    :goto_4
-    const-string p2, "Failed requirement."
-
-    if-eqz p1, :cond_18
-
-    if-eq v6, v2, :cond_a
-
-    const/4 p1, 0x1
-
-    goto :goto_5
-
-    :cond_a
-    const/4 p1, 0x0
-
-    :goto_5
-    if-eqz p1, :cond_17
-
-    const/16 p1, 0x1f
-
-    if-le v10, v5, :cond_b
-
-    goto :goto_6
-
-    :cond_b
-    if-lt p1, v5, :cond_c
-
-    const/4 p1, 0x1
-
-    goto :goto_7
-
-    :cond_c
-    :goto_6
-    const/4 p1, 0x0
-
-    :goto_7
-    if-eqz p1, :cond_16
-
-    const/16 p1, 0x17
-
-    if-gez v4, :cond_d
-
-    goto :goto_8
-
-    :cond_d
-    if-lt p1, v4, :cond_e
-
-    const/4 p1, 0x1
-
-    goto :goto_9
-
-    :cond_e
-    :goto_8
-    const/4 p1, 0x0
-
-    :goto_9
-    if-eqz p1, :cond_15
-
-    const/16 p1, 0x3b
-
-    if-gez v7, :cond_f
-
-    goto :goto_a
-
-    :cond_f
-    if-lt p1, v7, :cond_10
-
-    const/4 p3, 0x1
-
-    goto :goto_b
-
-    :cond_10
-    :goto_a
-    const/4 p3, 0x0
-
-    :goto_b
-    if-eqz p3, :cond_14
-
-    if-gez v8, :cond_11
-
-    goto :goto_c
-
-    :cond_11
-    if-lt p1, v8, :cond_12
-
-    const/4 p1, 0x1
-
-    goto :goto_d
-
-    :cond_12
-    :goto_c
-    const/4 p1, 0x0
-
-    :goto_d
-    if-eqz p1, :cond_13
-
-    new-instance p1, Ljava/util/GregorianCalendar;
-
-    sget-object p2, Ln0/g0/b;->e:Ljava/util/TimeZone;
-
-    invoke-direct {p1, p2}, Ljava/util/GregorianCalendar;-><init>(Ljava/util/TimeZone;)V
-
-    invoke-virtual {p1, v0}, Ljava/util/GregorianCalendar;->setLenient(Z)V
-
-    invoke-virtual {p1, v10, v3}, Ljava/util/GregorianCalendar;->set(II)V
-
-    sub-int/2addr v6, v10
-
-    invoke-virtual {p1, v9, v6}, Ljava/util/GregorianCalendar;->set(II)V
-
-    const/4 p2, 0x5
-
-    invoke-virtual {p1, p2, v5}, Ljava/util/GregorianCalendar;->set(II)V
-
-    const/16 p2, 0xb
-
-    invoke-virtual {p1, p2, v4}, Ljava/util/GregorianCalendar;->set(II)V
-
-    const/16 p2, 0xc
-
-    invoke-virtual {p1, p2, v7}, Ljava/util/GregorianCalendar;->set(II)V
-
-    const/16 p2, 0xd
-
-    invoke-virtual {p1, p2, v8}, Ljava/util/GregorianCalendar;->set(II)V
-
-    const/16 p2, 0xe
-
-    invoke-virtual {p1, p2, v0}, Ljava/util/GregorianCalendar;->set(II)V
-
-    invoke-virtual {p1}, Ljava/util/GregorianCalendar;->getTimeInMillis()J
-
-    move-result-wide p1
-
-    return-wide p1
-
-    :cond_13
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_14
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_15
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_16
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_17
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_18
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/n.smali b/com.discord/smali_classes2/n0/n.smali
deleted file mode 100644
index c20f7d12ff..0000000000
--- a/com.discord/smali_classes2/n0/n.smali
+++ /dev/null
@@ -1,573 +0,0 @@
-.class public final Ln0/n;
-.super Ljava/lang/Object;
-.source "Cookie.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/n$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final j:Ljava/util/regex/Pattern;
-
-.field public static final k:Ljava/util/regex/Pattern;
-
-.field public static final l:Ljava/util/regex/Pattern;
-
-.field public static final m:Ljava/util/regex/Pattern;
-
-.field public static final n:Ln0/n$a;
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public final b:Ljava/lang/String;
-
-.field public final c:J
-
-.field public final d:Ljava/lang/String;
-
-.field public final e:Ljava/lang/String;
-
-.field public final f:Z
-
-.field public final g:Z
-
-.field public final h:Z
-
-.field public final i:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ln0/n$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/n$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/n;->n:Ln0/n$a;
-
-    const-string v0, "(\\d{2,4})[^\\d]*"
-
-    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/n;->j:Ljava/util/regex/Pattern;
-
-    const-string v0, "(?i)(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*"
-
-    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/n;->k:Ljava/util/regex/Pattern;
-
-    const-string v0, "(\\d{1,2})[^\\d]*"
-
-    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/n;->l:Ljava/util/regex/Pattern;
-
-    const-string v0, "(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[^\\d]*"
-
-    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/n;->m:Ljava/util/regex/Pattern;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/n;->a:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/n;->b:Ljava/lang/String;
-
-    iput-wide p3, p0, Ln0/n;->c:J
-
-    iput-object p5, p0, Ln0/n;->d:Ljava/lang/String;
-
-    iput-object p6, p0, Ln0/n;->e:Ljava/lang/String;
-
-    iput-boolean p7, p0, Ln0/n;->f:Z
-
-    iput-boolean p8, p0, Ln0/n;->g:Z
-
-    iput-boolean p9, p0, Ln0/n;->h:Z
-
-    iput-boolean p10, p0, Ln0/n;->i:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ln0/w;)Z
-    .locals 6
-
-    if-eqz p1, :cond_a
-
-    iget-boolean v0, p0, Ln0/n;->i:Z
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p1, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v4, p0, Ln0/n;->d:Ljava/lang/String;
-
-    invoke-static {v0, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v0, p1, Ln0/w;->e:Ljava/lang/String;
-
-    iget-object v4, p0, Ln0/n;->d:Ljava/lang/String;
-
-    invoke-static {v0, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {v0, v4, v3, v1}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    invoke-virtual {v4}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    sub-int/2addr v5, v4
-
-    sub-int/2addr v5, v2
-
-    invoke-virtual {v0, v5}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    const/16 v5, 0x2e
-
-    if-ne v4, v5, :cond_2
-
-    invoke-static {v0}, Ln0/g0/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    :goto_0
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    if-nez v0, :cond_3
-
-    return v3
-
-    :cond_3
-    iget-object v0, p0, Ln0/n;->e:Ljava/lang/String;
-
-    invoke-virtual {p1}, Ln0/w;->b()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-static {v4, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    invoke-static {v4, v0, v3, v1}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_6
-
-    const-string v5, "/"
-
-    invoke-static {v0, v5, v3, v1}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    invoke-virtual {v4, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v1, 0x2f
-
-    if-ne v0, v1, :cond_6
-
-    :goto_2
-    const/4 v0, 0x1
-
-    goto :goto_3
-
-    :cond_6
-    const/4 v0, 0x0
-
-    :goto_3
-    if-nez v0, :cond_7
-
-    return v3
-
-    :cond_7
-    iget-boolean v0, p0, Ln0/n;->f:Z
-
-    if-eqz v0, :cond_9
-
-    iget-boolean p1, p1, Ln0/w;->a:Z
-
-    if-eqz p1, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    const/4 v2, 0x0
-
-    :cond_9
-    :goto_4
-    return v2
-
-    :cond_a
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 5
-
-    instance-of v0, p1, Ln0/n;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/n;
-
-    iget-object v0, p1, Ln0/n;->a:Ljava/lang/String;
-
-    iget-object v1, p0, Ln0/n;->a:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p1, Ln0/n;->b:Ljava/lang/String;
-
-    iget-object v1, p0, Ln0/n;->b:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-wide v0, p1, Ln0/n;->c:J
-
-    iget-wide v2, p0, Ln0/n;->c:J
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    iget-object v0, p1, Ln0/n;->d:Ljava/lang/String;
-
-    iget-object v1, p0, Ln0/n;->d:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p1, Ln0/n;->e:Ljava/lang/String;
-
-    iget-object v1, p0, Ln0/n;->e:Ljava/lang/String;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-boolean v0, p1, Ln0/n;->f:Z
-
-    iget-boolean v1, p0, Ln0/n;->f:Z
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean v0, p1, Ln0/n;->g:Z
-
-    iget-boolean v1, p0, Ln0/n;->g:Z
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean v0, p1, Ln0/n;->h:Z
-
-    iget-boolean v1, p0, Ln0/n;->h:Z
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean p1, p1, Ln0/n;->i:Z
-
-    iget-boolean v0, p0, Ln0/n;->i:Z
-
-    if-ne p1, v0, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 3
-    .annotation build Lorg/codehaus/mojo/animal_sniffer/IgnoreJRERequirement;
-    .end annotation
-
-    iget-object v0, p0, Ln0/n;->a:Ljava/lang/String;
-
-    const/16 v1, 0x20f
-
-    const/16 v2, 0x1f
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
-
-    move-result v0
-
-    iget-object v1, p0, Ln0/n;->b:Ljava/lang/String;
-
-    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
-
-    move-result v0
-
-    iget-wide v1, p0, Ln0/n;->c:J
-
-    invoke-static {v1, v2}, Ld;->a(J)I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v0, p0, Ln0/n;->d:Ljava/lang/String;
-
-    const/16 v2, 0x1f
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
-
-    move-result v0
-
-    iget-object v1, p0, Ln0/n;->e:Ljava/lang/String;
-
-    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
-
-    move-result v0
-
-    iget-boolean v1, p0, Ln0/n;->f:Z
-
-    invoke-static {v1}, Lb;->a(Z)I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-boolean v0, p0, Ln0/n;->g:Z
-
-    invoke-static {v0}, Lb;->a(Z)I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Ln0/n;->h:Z
-
-    invoke-static {v1}, Lb;->a(Z)I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-boolean v0, p0, Ln0/n;->i:Z
-
-    invoke-static {v0}, Lb;->a(Z)I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 6
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Ln0/n;->a:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x3d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/n;->b:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Ln0/n;->h:Z
-
-    if-eqz v1, :cond_1
-
-    iget-wide v1, p0, Ln0/n;->c:J
-
-    const-wide/high16 v3, -0x8000000000000000L
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_0
-
-    const-string v1, "; max-age=0"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "; expires="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    new-instance v1, Ljava/util/Date;
-
-    iget-wide v2, p0, Ln0/n;->c:J
-
-    invoke-direct {v1, v2, v3}, Ljava/util/Date;-><init>(J)V
-
-    invoke-static {v1}, Ln0/g0/e/c;->a(Ljava/util/Date;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_1
-    :goto_0
-    iget-boolean v1, p0, Ln0/n;->i:Z
-
-    if-nez v1, :cond_2
-
-    const-string v1, "; domain="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/n;->d:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_2
-    const-string v1, "; path="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/n;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Ln0/n;->f:Z
-
-    if-eqz v1, :cond_3
-
-    const-string v1, "; secure"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_3
-    iget-boolean v1, p0, Ln0/n;->g:Z
-
-    if-eqz v1, :cond_4
-
-    const-string v1, "; httponly"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_4
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "toString()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/o$a.smali b/com.discord/smali_classes2/n0/o$a.smali
deleted file mode 100644
index 4089475add..0000000000
--- a/com.discord/smali_classes2/n0/o$a.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class public final Ln0/o$a;
-.super Ljava/lang/Object;
-.source "CookieJar.kt"
-
-# interfaces
-.implements Ln0/p;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/o;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ln0/w;Ljava/util/List;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/w;",
-            "Ljava/util/List<",
-            "Ln0/n;",
-            ">;)V"
-        }
-    .end annotation
-
-    return-void
-.end method
-
-.method public b(Ln0/w;)Ljava/util/List;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/w;",
-            ")",
-            "Ljava/util/List<",
-            "Ln0/n;",
-            ">;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "url"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/p.smali b/com.discord/smali_classes2/n0/p.smali
deleted file mode 100644
index d4acc6d78e..0000000000
--- a/com.discord/smali_classes2/n0/p.smali
+++ /dev/null
@@ -1,48 +0,0 @@
-.class public interface abstract Ln0/p;
-.super Ljava/lang/Object;
-.source "CookieJar.kt"
-
-
-# static fields
-.field public static final a:Ln0/p;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/o$a;
-
-    invoke-direct {v0}, Ln0/o$a;-><init>()V
-
-    sput-object v0, Ln0/p;->a:Ln0/p;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ln0/w;Ljava/util/List;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/w;",
-            "Ljava/util/List<",
-            "Ln0/n;",
-            ">;)V"
-        }
-    .end annotation
-.end method
-
-.method public abstract b(Ln0/w;)Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/w;",
-            ")",
-            "Ljava/util/List<",
-            "Ln0/n;",
-            ">;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/q.smali b/com.discord/smali_classes2/n0/q.smali
deleted file mode 100644
index 08fdb01379..0000000000
--- a/com.discord/smali_classes2/n0/q.smali
+++ /dev/null
@@ -1,591 +0,0 @@
-.class public final Ln0/q;
-.super Ljava/lang/Object;
-.source "Dispatcher.kt"
-
-
-# instance fields
-.field public a:I
-
-.field public b:I
-
-.field public c:Ljava/util/concurrent/ExecutorService;
-
-.field public final d:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Ln0/z$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Ln0/z$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Ljava/util/ArrayDeque;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/ArrayDeque<",
-            "Ln0/z;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/16 v0, 0x40
-
-    iput v0, p0, Ln0/q;->a:I
-
-    const/4 v0, 0x5
-
-    iput v0, p0, Ln0/q;->b:I
-
-    new-instance v0, Ljava/util/ArrayDeque;
-
-    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object v0, p0, Ln0/q;->d:Ljava/util/ArrayDeque;
-
-    new-instance v0, Ljava/util/ArrayDeque;
-
-    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object v0, p0, Ln0/q;->e:Ljava/util/ArrayDeque;
-
-    new-instance v0, Ljava/util/ArrayDeque;
-
-    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
-
-    iput-object v0, p0, Ln0/q;->f:Ljava/util/ArrayDeque;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final declared-synchronized a()V
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Ln0/q;->d:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ln0/z$a;
-
-    iget-object v1, v1, Ln0/z$a;->f:Ln0/z;
-
-    invoke-virtual {v1}, Ln0/z;->cancel()V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Ln0/q;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ln0/z$a;
-
-    iget-object v1, v1, Ln0/z$a;->f:Ln0/z;
-
-    invoke-virtual {v1}, Ln0/z;->cancel()V
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v0, p0, Ln0/q;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_2
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ln0/z;
-
-    invoke-virtual {v1}, Ln0/z;->cancel()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_2
-
-    :cond_2
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final b(Ljava/util/Deque;Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/util/Deque<",
-            "TT;>;TT;)V"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-interface {p1, p2}, Ljava/util/Deque;->remove(Ljava/lang/Object;)Z
-
-    move-result p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p1, :cond_0
-
-    monitor-exit p0
-
-    invoke-virtual {p0}, Ln0/q;->d()Z
-
-    return-void
-
-    :cond_0
-    :try_start_1
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string p2, "Call wasn\'t in-flight!"
-
-    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final c(Ln0/z$a;)V
-    .locals 1
-
-    iget-object v0, p1, Ln0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
-
-    iget-object v0, p0, Ln0/q;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {p0, v0, p1}, Ln0/q;->b(Ljava/util/Deque;Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public final d()Z
-    .locals 17
-
-    move-object/from16 v1, p0
-
-    invoke-static/range {p0 .. p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v2, 0x1
-
-    xor-int/2addr v0, v2
-
-    sget-boolean v3, Lj0/h;->a:Z
-
-    if-eqz v3, :cond_1
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "Assertion failed"
-
-    new-instance v2, Ljava/lang/AssertionError;
-
-    invoke-direct {v2, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v2
-
-    :cond_1
-    :goto_0
-    new-instance v3, Ljava/util/ArrayList;
-
-    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, v1, Ln0/q;->d:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    const-string v4, "readyAsyncCalls.iterator()"
-
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_4
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ln0/z$a;
-
-    iget-object v5, v1, Ln0/q;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v5}, Ljava/util/ArrayDeque;->size()I
-
-    move-result v5
-
-    iget v6, v1, Ln0/q;->a:I
-
-    if-lt v5, v6, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    iget-object v5, v4, Ln0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
-
-    move-result v5
-
-    iget v6, v1, Ln0/q;->b:I
-
-    if-lt v5, v6, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    invoke-interface {v0}, Ljava/util/Iterator;->remove()V
-
-    iget-object v5, v4, Ln0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
-
-    const-string v5, "asyncCall"
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    iget-object v5, v1, Ln0/q;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v5, v4}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_4
-    :goto_2
-    monitor-enter p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_3
-
-    :try_start_1
-    iget-object v0, v1, Ln0/q;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v0}, Ljava/util/ArrayDeque;->size()I
-
-    move-result v0
-
-    iget-object v4, v1, Ln0/q;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v4}, Ljava/util/ArrayDeque;->size()I
-
-    move-result v4
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
-
-    add-int/2addr v0, v4
-
-    :try_start_2
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_3
-
-    const/4 v4, 0x0
-
-    if-lez v0, :cond_5
-
-    const/4 v5, 0x1
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v5, 0x0
-
-    :goto_3
-    monitor-exit p0
-
-    invoke-interface {v3}, Ljava/util/List;->size()I
-
-    move-result v6
-
-    const/4 v7, 0x0
-
-    :goto_4
-    if-ge v7, v6, :cond_b
-
-    invoke-interface {v3, v7}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v8, v0
-
-    check-cast v8, Ln0/z$a;
-
-    monitor-enter p0
-
-    :try_start_3
-    iget-object v0, v1, Ln0/q;->c:Ljava/util/concurrent/ExecutorService;
-
-    if-nez v0, :cond_6
-
-    new-instance v0, Ljava/util/concurrent/ThreadPoolExecutor;
-
-    const/4 v10, 0x0
-
-    const v11, 0x7fffffff
-
-    const-wide/16 v12, 0x3c
-
-    sget-object v14, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    new-instance v15, Ljava/util/concurrent/SynchronousQueue;
-
-    invoke-direct {v15}, Ljava/util/concurrent/SynchronousQueue;-><init>()V
-
-    const-string v9, "OkHttp Dispatcher"
-
-    invoke-static {v9, v4}, Ln0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
-
-    move-result-object v16
-
-    move-object v9, v0
-
-    invoke-direct/range {v9 .. v16}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
-
-    iput-object v0, v1, Ln0/q;->c:Ljava/util/concurrent/ExecutorService;
-
-    :cond_6
-    iget-object v0, v1, Ln0/q;->c:Ljava/util/concurrent/ExecutorService;
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    const/4 v9, 0x0
-
-    if-eqz v0, :cond_a
-
-    monitor-exit p0
-
-    iget-object v10, v8, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v10, v10, Ln0/z;->f:Ln0/x;
-
-    iget-object v10, v10, Ln0/x;->d:Ln0/q;
-
-    invoke-static {v10}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
-
-    move-result v10
-
-    xor-int/2addr v10, v2
-
-    sget-boolean v11, Lj0/h;->a:Z
-
-    if-eqz v11, :cond_8
-
-    if-eqz v10, :cond_7
-
-    goto :goto_5
-
-    :cond_7
-    new-instance v0, Ljava/lang/AssertionError;
-
-    const-string v2, "Assertion failed"
-
-    invoke-direct {v0, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_8
-    :goto_5
-    :try_start_4
-    invoke-interface {v0, v8}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
-    :try_end_4
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_4 .. :try_end_4} :catch_0
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    goto :goto_6
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_7
-
-    :catch_0
-    move-exception v0
-
-    move-object v10, v0
-
-    :try_start_5
-    new-instance v0, Ljava/io/InterruptedIOException;
-
-    const-string v11, "executor rejected"
-
-    invoke-direct {v0, v11}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v0, v10}, Ljava/io/InterruptedIOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    iget-object v10, v8, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v10, v10, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v10, :cond_9
-
-    invoke-virtual {v10, v0}, Ln0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
-
-    iget-object v9, v8, Ln0/z$a;->e:Ln0/g;
-
-    iget-object v10, v8, Ln0/z$a;->f:Ln0/z;
-
-    invoke-interface {v9, v10, v0}, Ln0/g;->b(Ln0/f;Ljava/io/IOException;)V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_0
-
-    iget-object v0, v8, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v0, v0, Ln0/z;->f:Ln0/x;
-
-    iget-object v0, v0, Ln0/x;->d:Ln0/q;
-
-    invoke-virtual {v0, v8}, Ln0/q;->c(Ln0/z$a;)V
-
-    :goto_6
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_4
-
-    :cond_9
-    :try_start_6
-    const-string v0, "transmitter"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_0
-
-    throw v9
-
-    :goto_7
-    iget-object v2, v8, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v2, v2, Ln0/z;->f:Ln0/x;
-
-    iget-object v2, v2, Ln0/x;->d:Ln0/q;
-
-    invoke-virtual {v2, v8}, Ln0/q;->c(Ln0/z$a;)V
-
-    throw v0
-
-    :cond_a
-    :try_start_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_1
-
-    throw v9
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-
-    :cond_b
-    return v5
-
-    :catchall_2
-    move-exception v0
-
-    :try_start_8
-    monitor-exit p0
-
-    throw v0
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_3
-
-    :catchall_3
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/r$a.smali b/com.discord/smali_classes2/n0/r$a.smali
deleted file mode 100644
index 12126ad460..0000000000
--- a/com.discord/smali_classes2/n0/r$a.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.class public final Ln0/r$a;
-.super Ljava/lang/Object;
-.source "Dns.kt"
-
-# interfaces
-.implements Ln0/s;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/r;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/String;)Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/net/InetAddress;",
-            ">;"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    :try_start_0
-    invoke-static {p1}, Ljava/net/InetAddress;->getAllByName(Ljava/lang/String;)[Ljava/net/InetAddress;
-
-    move-result-object v0
-
-    const-string v1, "InetAddress.getAllByName(hostname)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v0}, Lf/n/a/k/a;->toList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-    :try_end_0
-    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p1
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/net/UnknownHostException;
-
-    const-string v2, "Broken system behaviour for dns lookup of "
-
-    invoke-static {v2, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v1, p1}, Ljava/net/UnknownHostException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v1, v0}, Ljava/net/UnknownHostException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw v1
-
-    :cond_0
-    const-string p1, "hostname"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/s.smali b/com.discord/smali_classes2/n0/s.smali
deleted file mode 100644
index 0eaff98270..0000000000
--- a/com.discord/smali_classes2/n0/s.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public interface abstract Ln0/s;
-.super Ljava/lang/Object;
-.source "Dns.kt"
-
-
-# static fields
-.field public static final a:Ln0/s;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/r$a;
-
-    invoke-direct {v0}, Ln0/r$a;-><init>()V
-
-    sput-object v0, Ln0/s;->a:Ln0/s;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ljava/lang/String;)Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/net/InetAddress;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/net/UnknownHostException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/n0/t$a.smali b/com.discord/smali_classes2/n0/t$a.smali
deleted file mode 100644
index 14903ba616..0000000000
--- a/com.discord/smali_classes2/n0/t$a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Ln0/t$a;
-.super Ln0/t;
-.source "EventListener.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/t;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ln0/t;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/t$b.smali b/com.discord/smali_classes2/n0/t$b.smali
deleted file mode 100644
index d3d973b37d..0000000000
--- a/com.discord/smali_classes2/n0/t$b.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public interface abstract Ln0/t$b;
-.super Ljava/lang/Object;
-.source "EventListener.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/t;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "b"
-.end annotation
-
-
-# virtual methods
-.method public abstract a(Ln0/f;)Ln0/t;
-.end method
diff --git a/com.discord/smali_classes2/n0/t.smali b/com.discord/smali_classes2/n0/t.smali
deleted file mode 100644
index 5c662c0715..0000000000
--- a/com.discord/smali_classes2/n0/t.smali
+++ /dev/null
@@ -1,125 +0,0 @@
-.class public abstract Ln0/t;
-.super Ljava/lang/Object;
-.source "EventListener.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/t$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Ln0/t;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ln0/t$a;
-
-    invoke-direct {v0}, Ln0/t$a;-><init>()V
-
-    sput-object v0, Ln0/t;->a:Ln0/t;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ln0/f;Ljava/net/InetSocketAddress;Ljava/net/Proxy;)V
-    .locals 0
-
-    const/4 p1, 0x0
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p2, "proxy"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p2, "inetSocketAddress"
-
-    invoke-static {p2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public b(Ln0/f;Ln0/k;)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "connection"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public c(Ln0/f;Ljava/io/IOException;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public d(Ln0/f;Ljava/io/IOException;)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const-string p1, "call"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/u$a.smali b/com.discord/smali_classes2/n0/u$a.smali
deleted file mode 100644
index f3553b1ae4..0000000000
--- a/com.discord/smali_classes2/n0/u$a.smali
+++ /dev/null
@@ -1,64 +0,0 @@
-.class public final Ln0/u$a;
-.super Ljava/lang/Object;
-.source "FormBody.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/u;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Ljava/nio/charset/Charset;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object v0, p0, Ln0/u$a;->c:Ljava/nio/charset/Charset;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Ln0/u$a;->a:Ljava/util/List;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Ln0/u$a;->b:Ljava/util/List;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/u.smali b/com.discord/smali_classes2/n0/u.smali
deleted file mode 100644
index 70468fa7a5..0000000000
--- a/com.discord/smali_classes2/n0/u.smali
+++ /dev/null
@@ -1,244 +0,0 @@
-.class public final Ln0/u;
-.super Lokhttp3/RequestBody;
-.source "FormBody.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/u$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:Lokhttp3/MediaType;
-
-
-# instance fields
-.field public final a:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    sget-object v0, Lokhttp3/MediaType;->g:Lokhttp3/MediaType$a;
-
-    const-string v0, "application/x-www-form-urlencoded"
-
-    invoke-static {v0}, Lokhttp3/MediaType$a;->a(Ljava/lang/String;)Lokhttp3/MediaType;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/u;->c:Lokhttp3/MediaType;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/util/List;Ljava/util/List;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
-
-    invoke-static {p1}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/u;->a:Ljava/util/List;
-
-    invoke-static {p2}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/u;->b:Ljava/util/List;
-
-    return-void
-
-    :cond_0
-    const-string p1, "encodedValues"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "encodedNames"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a(Lokio/BufferedSink;Z)J
-    .locals 3
-
-    if-eqz p2, :cond_0
-
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    goto :goto_0
-
-    :cond_0
-    if-eqz p1, :cond_4
-
-    invoke-interface {p1}, Lokio/BufferedSink;->h()Lo0/e;
-
-    move-result-object p1
-
-    :goto_0
-    const/4 v0, 0x0
-
-    iget-object v1, p0, Ln0/u;->a:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    :goto_1
-    if-ge v0, v1, :cond_2
-
-    if-lez v0, :cond_1
-
-    const/16 v2, 0x26
-
-    invoke-virtual {p1, v2}, Lo0/e;->I(I)Lo0/e;
-
-    :cond_1
-    iget-object v2, p0, Ln0/u;->a:Ljava/util/List;
-
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/String;
-
-    invoke-virtual {p1, v2}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
-
-    const/16 v2, 0x3d
-
-    invoke-virtual {p1, v2}, Lo0/e;->I(I)Lo0/e;
-
-    iget-object v2, p0, Ln0/u;->b:Ljava/util/List;
-
-    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/String;
-
-    invoke-virtual {p1, v2}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    if-eqz p2, :cond_3
-
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    invoke-virtual {p1, v0, v1}, Lo0/e;->skip(J)V
-
-    goto :goto_2
-
-    :cond_3
-    const-wide/16 v0, 0x0
-
-    :goto_2
-    return-wide v0
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public contentLength()J
-    .locals 2
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p0, v0, v1}, Ln0/u;->a(Lokio/BufferedSink;Z)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public contentType()Lokhttp3/MediaType;
-    .locals 1
-
-    sget-object v0, Ln0/u;->c:Lokhttp3/MediaType;
-
-    return-object v0
-.end method
-
-.method public writeTo(Lokio/BufferedSink;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Ln0/u;->a(Lokio/BufferedSink;Z)J
-
-    return-void
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/v$a$a.smali b/com.discord/smali_classes2/n0/v$a$a.smali
deleted file mode 100644
index f17353a75c..0000000000
--- a/com.discord/smali_classes2/n0/v$a$a.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public final Ln0/v$a$a;
-.super Lj0/n/c/i;
-.source "Handshake.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Ln0/v$a;->a(Ljavax/net/ssl/SSLSession;)Ln0/v;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lj0/n/c/i;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Ljava/util/List<",
-        "+",
-        "Ljava/security/cert/Certificate;",
-        ">;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $peerCertificatesCopy:Ljava/util/List;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;)V
-    .locals 0
-
-    iput-object p1, p0, Ln0/v$a$a;->$peerCertificatesCopy:Ljava/util/List;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lj0/n/c/i;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Ln0/v$a$a;->$peerCertificatesCopy:Ljava/util/List;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/v$a.smali b/com.discord/smali_classes2/n0/v$a.smali
deleted file mode 100644
index 6bc6f6f879..0000000000
--- a/com.discord/smali_classes2/n0/v$a.smali
+++ /dev/null
@@ -1,185 +0,0 @@
-.class public final Ln0/v$a;
-.super Ljava/lang/Object;
-.source "Handshake.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/v;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljavax/net/ssl/SSLSession;)Ln0/v;
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getCipherSuite()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_5
-
-    const-string v1, "SSL_NULL_WITH_NULL_NULL"
-
-    invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_4
-
-    sget-object v1, Ln0/j;->t:Ln0/j$b;
-
-    invoke-virtual {v1, v0}, Ln0/j$b;->b(Ljava/lang/String;)Ln0/j;
-
-    move-result-object v0
-
-    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getProtocol()Ljava/lang/String;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_3
-
-    const-string v2, "NONE"
-
-    invoke-static {v2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-nez v2, :cond_2
-
-    sget-object v2, Ln0/f0;->j:Ln0/f0$a;
-
-    invoke-virtual {v2, v1}, Ln0/f0$a;->a(Ljava/lang/String;)Ln0/f0;
-
-    move-result-object v1
-
-    :try_start_0
-    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getPeerCertificates()[Ljava/security/cert/Certificate;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_0
-
-    array-length v3, v2
-
-    invoke-static {v2, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, [Ljava/security/cert/Certificate;
-
-    invoke-static {v2}, Ln0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v2
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
-    :try_end_0
-    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    sget-object v2, Lj0/i/n;->d:Lj0/i/n;
-
-    :goto_0
-    new-instance v3, Ln0/v;
-
-    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getLocalCertificates()[Ljava/security/cert/Certificate;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    array-length v4, p1
-
-    invoke-static {p1, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Ljava/security/cert/Certificate;
-
-    invoke-static {p1}, Ln0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    goto :goto_1
-
-    :cond_1
-    sget-object p1, Lj0/i/n;->d:Lj0/i/n;
-
-    :goto_1
-    new-instance v4, Ln0/v$a$a;
-
-    invoke-direct {v4, v2}, Ln0/v$a$a;-><init>(Ljava/util/List;)V
-
-    invoke-direct {v3, v1, v0, p1, v4}, Ln0/v;-><init>(Ln0/f0;Ln0/j;Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
-
-    return-object v3
-
-    :cond_2
-    new-instance p1, Ljava/io/IOException;
-
-    const-string v0, "tlsVersion == NONE"
-
-    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "tlsVersion == null"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    new-instance p1, Ljava/io/IOException;
-
-    const-string v0, "cipherSuite == SSL_NULL_WITH_NULL_NULL"
-
-    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "cipherSuite == null"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/v.smali b/com.discord/smali_classes2/n0/v.smali
deleted file mode 100644
index 611e493bb5..0000000000
--- a/com.discord/smali_classes2/n0/v.smali
+++ /dev/null
@@ -1,441 +0,0 @@
-.class public final Ln0/v;
-.super Ljava/lang/Object;
-.source "Handshake.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/v$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final synthetic e:[Lkotlin/reflect/KProperty;
-
-.field public static final f:Ln0/v$a;
-
-
-# instance fields
-.field public final a:Lkotlin/Lazy;
-
-.field public final b:Ln0/f0;
-
-.field public final c:Ln0/j;
-
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/security/cert/Certificate;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    const/4 v0, 0x1
-
-    new-array v0, v0, [Lkotlin/reflect/KProperty;
-
-    new-instance v1, Lj0/n/c/q;
-
-    const-class v2, Ln0/v;
-
-    invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
-    move-result-object v2
-
-    const-string v3, "peerCertificates"
-
-    const-string v4, "peerCertificates()Ljava/util/List;"
-
-    invoke-direct {v1, v2, v3, v4}, Lj0/n/c/q;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lj0/n/c/s;->property1(Lj0/n/c/p;)Lj0/r/d;
-
-    const/4 v2, 0x0
-
-    aput-object v1, v0, v2
-
-    sput-object v0, Ln0/v;->e:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Ln0/v$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/v$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/v;->f:Ln0/v$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ln0/f0;Ln0/j;Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/f0;",
-            "Ln0/j;",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/security/cert/Certificate;",
-            ">;",
-            "Lkotlin/jvm/functions/Function0<",
-            "+",
-            "Ljava/util/List<",
-            "+",
-            "Ljava/security/cert/Certificate;",
-            ">;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    if-eqz p3, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/v;->b:Ln0/f0;
-
-    iput-object p2, p0, Ln0/v;->c:Ln0/j;
-
-    iput-object p3, p0, Ln0/v;->d:Ljava/util/List;
-
-    invoke-static {p4}, Lf/n/a/k/a;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/v;->a:Lkotlin/Lazy;
-
-    return-void
-
-    :cond_0
-    const-string p1, "localCertificates"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "cipherSuite"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "tlsVersion"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/security/cert/Certificate;)Ljava/lang/String;
-    .locals 1
-
-    instance-of v0, p1, Ljava/security/cert/X509Certificate;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/security/cert/X509Certificate;
-
-    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Ljava/security/cert/Certificate;->getType()Ljava/lang/String;
-
-    move-result-object p1
-
-    const-string v0, "type"
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public final b()Ljava/util/List;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/security/cert/Certificate;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/v;->a:Lkotlin/Lazy;
-
-    sget-object v1, Ln0/v;->e:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x0
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    instance-of v0, p1, Ln0/v;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/v;
-
-    iget-object v0, p1, Ln0/v;->b:Ln0/f0;
-
-    iget-object v1, p0, Ln0/v;->b:Ln0/f0;
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p1, Ln0/v;->c:Ln0/j;
-
-    iget-object v1, p0, Ln0/v;->c:Ln0/j;
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p1}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p1, Ln0/v;->d:Ljava/util/List;
-
-    iget-object v0, p0, Ln0/v;->d:Ljava/util/List;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Ln0/v;->b:Ln0/f0;
-
-    invoke-virtual {v0}, Ljava/lang/Enum;->hashCode()I
-
-    move-result v0
-
-    add-int/lit16 v0, v0, 0x20f
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/v;->c:Ln0/j;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    invoke-virtual {p0}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Ln0/v;->d:Ljava/util/List;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    return v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 6
-
-    const-string v0, "Handshake{"
-
-    const-string v1, "tlsVersion="
-
-    invoke-static {v0, v1}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/v;->b:Ln0/f0;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x20
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v2, "cipherSuite="
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v2, p0, Ln0/v;->c:Ln0/j;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v2, "peerCertificates="
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ln0/v;->b()Ljava/util/List;
-
-    move-result-object v2
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    const/16 v4, 0xa
-
-    invoke-static {v2, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v5
-
-    invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :goto_0
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_0
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/security/cert/Certificate;
-
-    invoke-virtual {p0, v5}, Ln0/v;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    const-string v1, "localCertificates="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/v;->d:Ljava/util/List;
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-static {v1, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v3
-
-    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_1
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/security/cert/Certificate;
-
-    invoke-virtual {p0, v3}, Ln0/v;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x7d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/w$a.smali b/com.discord/smali_classes2/n0/w$a.smali
deleted file mode 100644
index 68d75f113a..0000000000
--- a/com.discord/smali_classes2/n0/w$a.smali
+++ /dev/null
@@ -1,2453 +0,0 @@
-.class public final Ln0/w$a;
-.super Ljava/lang/Object;
-.source "HttpUrl.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/w;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/w$a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final i:Ln0/w$a$a;
-
-
-# instance fields
-.field public a:Ljava/lang/String;
-
-.field public b:Ljava/lang/String;
-
-.field public c:Ljava/lang/String;
-
-.field public d:Ljava/lang/String;
-
-.field public e:I
-
-.field public final f:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public g:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public h:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ln0/w$a$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/w$a$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/w$a;->i:Ln0/w$a$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const-string v0, ""
-
-    iput-object v0, p0, Ln0/w$a;->b:Ljava/lang/String;
-
-    iput-object v0, p0, Ln0/w$a;->c:Ljava/lang/String;
-
-    const/4 v1, -0x1
-
-    iput v1, p0, Ln0/w$a;->e:I
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v1, p0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/String;Ljava/lang/String;)Ln0/w$a;
-    .locals 13
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    iget-object v1, p0, Ln0/w$a;->g:Ljava/util/List;
-
-    if-nez v1, :cond_0
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v1, p0, Ln0/w$a;->g:Ljava/util/List;
-
-    :cond_0
-    iget-object v1, p0, Ln0/w$a;->g:Ljava/util/List;
-
-    if-eqz v1, :cond_3
-
-    sget-object v2, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v7, 0x1
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x1
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/16 v12, 0xd3
-
-    const-string v6, " \"\'<>#&="
-
-    move-object v3, p1
-
-    invoke-static/range {v2 .. v12}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-interface {v1, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    iget-object p1, p0, Ln0/w$a;->g:Ljava/util/List;
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_1
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/16 v11, 0xd3
-
-    const-string v5, " \"\'<>#&="
-
-    move-object v2, p2
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    :cond_1
-    invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    return-object p0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    const-string p1, "encodedName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final b()Ln0/w;
-    .locals 18
-
-    move-object/from16 v0, p0
-
-    new-instance v11, Ln0/w;
-
-    iget-object v2, v0, Ln0/w$a;->a:Ljava/lang/String;
-
-    if-eqz v2, :cond_3
-
-    sget-object v3, Ln0/w;->l:Ln0/w$b;
-
-    iget-object v4, v0, Ln0/w$a;->b:Ljava/lang/String;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x7
-
-    invoke-static/range {v3 .. v8}, Ln0/w$b;->d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-
-    move-result-object v3
-
-    sget-object v4, Ln0/w;->l:Ln0/w$b;
-
-    iget-object v5, v0, Ln0/w$a;->c:Ljava/lang/String;
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x7
-
-    invoke-static/range {v4 .. v9}, Ln0/w$b;->d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-
-    move-result-object v4
-
-    iget-object v5, v0, Ln0/w$a;->d:Ljava/lang/String;
-
-    if-eqz v5, :cond_2
-
-    invoke-virtual/range {p0 .. p0}, Ln0/w$a;->c()I
-
-    move-result v6
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    iget-object v7, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    const/4 v8, 0x0
-
-    invoke-virtual {v1, v7, v8}, Ln0/w$b;->c(Ljava/util/List;Z)Ljava/util/List;
-
-    move-result-object v7
-
-    iget-object v1, v0, Ln0/w$a;->g:Ljava/util/List;
-
-    const/4 v8, 0x0
-
-    if-eqz v1, :cond_0
-
-    sget-object v9, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v10, 0x1
-
-    invoke-virtual {v9, v1, v10}, Ln0/w$b;->c(Ljava/util/List;Z)Ljava/util/List;
-
-    move-result-object v1
-
-    move-object v9, v1
-
-    goto :goto_0
-
-    :cond_0
-    move-object v9, v8
-
-    :goto_0
-    iget-object v13, v0, Ln0/w$a;->h:Ljava/lang/String;
-
-    if-eqz v13, :cond_1
-
-    sget-object v12, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x7
-
-    invoke-static/range {v12 .. v17}, Ln0/w$b;->d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-
-    move-result-object v1
-
-    move-object v10, v1
-
-    goto :goto_1
-
-    :cond_1
-    move-object v10, v8
-
-    :goto_1
-    invoke-virtual/range {p0 .. p0}, Ln0/w$a;->toString()Ljava/lang/String;
-
-    move-result-object v12
-
-    move-object v1, v11
-
-    move-object v8, v9
-
-    move-object v9, v10
-
-    move-object v10, v12
-
-    invoke-direct/range {v1 .. v10}, Ln0/w;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object v11
-
-    :cond_2
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    const-string v2, "host == null"
-
-    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    const-string v2, "scheme == null"
-
-    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final c()I
-    .locals 4
-
-    iget v0, p0, Ln0/w$a;->e:I
-
-    const/4 v1, -0x1
-
-    if-eq v0, v1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v0, p0, Ln0/w$a;->a:Ljava/lang/String;
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_5
-
-    if-eqz v0, :cond_4
-
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v2
-
-    const v3, 0x310888    # 4.503E-39f
-
-    if-eq v2, v3, :cond_2
-
-    const v3, 0x5f008eb
-
-    if-eq v2, v3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const-string v2, "https"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    const/16 v0, 0x1bb
-
-    goto :goto_1
-
-    :cond_2
-    const-string v2, "http"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    const/16 v0, 0x50
-
-    goto :goto_1
-
-    :cond_3
-    :goto_0
-    const/4 v0, -0x1
-
-    :goto_1
-    return v0
-
-    :cond_4
-    const-string v0, "scheme"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-.end method
-
-.method public final d(Ljava/lang/String;)Ln0/w$a;
-    .locals 12
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/16 v11, 0xd3
-
-    const-string v5, " \"\'<>#"
-
-    move-object v2, p1
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    if-gt v3, v4, :cond_3
-
-    const/16 v4, 0x26
-
-    const/4 v5, 0x4
-
-    invoke-static {p1, v4, v3, v2, v5}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v4
-
-    const/4 v6, -0x1
-
-    if-ne v4, v6, :cond_0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    :cond_0
-    const/16 v7, 0x3d
-
-    invoke-static {p1, v7, v3, v2, v5}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v5
-
-    const-string v7, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    if-eq v5, v6, :cond_2
-
-    if-le v5, v4, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p1, v3, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v5, v5, 0x1
-
-    invoke-virtual {p1, v5, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_2
-    :goto_1
-    invoke-virtual {p1, v3, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-static {v3, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :goto_2
-    add-int/lit8 v3, v4, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    move-object v0, v1
-
-    :cond_4
-    iput-object v0, p0, Ln0/w$a;->g:Ljava/util/List;
-
-    return-object p0
-.end method
-
-.method public final e(Ln0/w;Ljava/lang/String;)Ln0/w$a;
-    .locals 27
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-object/from16 v12, p2
-
-    if-eqz v12, :cond_40
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x0
-
-    invoke-static {v12, v3, v3, v2}, Ln0/g0/b;->s(Ljava/lang/String;III)I
-
-    move-result v2
-
-    invoke-virtual/range {p2 .. p2}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    invoke-static {v12, v2, v4}, Ln0/g0/b;->t(Ljava/lang/String;II)I
-
-    move-result v13
-
-    sub-int v4, v13, v2
-
-    const/4 v5, 0x2
-
-    const/16 v6, 0x3a
-
-    const/4 v7, -0x1
-
-    const/4 v8, 0x1
-
-    if-ge v4, v5, :cond_0
-
-    goto :goto_5
-
-    :cond_0
-    invoke-virtual {v12, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    const/16 v9, 0x5a
-
-    const/16 v10, 0x7a
-
-    const/16 v11, 0x41
-
-    const/16 v14, 0x61
-
-    if-lt v4, v14, :cond_1
-
-    if-le v4, v10, :cond_2
-
-    :cond_1
-    if-lt v4, v11, :cond_c
-
-    if-le v4, v9, :cond_2
-
-    goto :goto_5
-
-    :cond_2
-    move v4, v2
-
-    :goto_0
-    add-int/2addr v4, v8
-
-    if-ge v4, v13, :cond_c
-
-    invoke-virtual {v12, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v15
-
-    if-le v14, v15, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    if-lt v10, v15, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    :goto_1
-    if-le v11, v15, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    if-lt v9, v15, :cond_6
-
-    goto :goto_4
-
-    :cond_6
-    :goto_2
-    const/16 v9, 0x39
-
-    const/16 v10, 0x30
-
-    if-le v10, v15, :cond_7
-
-    goto :goto_3
-
-    :cond_7
-    if-lt v9, v15, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    :goto_3
-    const/16 v9, 0x2b
-
-    if-ne v15, v9, :cond_9
-
-    goto :goto_4
-
-    :cond_9
-    const/16 v9, 0x2d
-
-    if-ne v15, v9, :cond_a
-
-    goto :goto_4
-
-    :cond_a
-    const/16 v9, 0x2e
-
-    if-ne v15, v9, :cond_b
-
-    :goto_4
-    const/16 v9, 0x5a
-
-    const/16 v10, 0x7a
-
-    goto :goto_0
-
-    :cond_b
-    if-ne v15, v6, :cond_c
-
-    goto :goto_6
-
-    :cond_c
-    :goto_5
-    const/4 v4, -0x1
-
-    :goto_6
-    const-string v14, "http"
-
-    const-string v15, "https"
-
-    const-string v11, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    if-eq v4, v7, :cond_f
-
-    const-string v6, "https:"
-
-    invoke-static {v12, v6, v2, v8}, Lj0/t/k;->startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_d
-
-    iput-object v15, v0, Ln0/w$a;->a:Ljava/lang/String;
-
-    add-int/lit8 v2, v2, 0x6
-
-    goto :goto_7
-
-    :cond_d
-    const-string v6, "http:"
-
-    invoke-static {v12, v6, v2, v8}, Lj0/t/k;->startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_e
-
-    iput-object v14, v0, Ln0/w$a;->a:Ljava/lang/String;
-
-    add-int/lit8 v2, v2, 0x5
-
-    goto :goto_7
-
-    :cond_e
-    const-string v1, "Expected URL scheme \'http\' or \'https\' but was \'"
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-virtual {v12, v3, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v2, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, "\'"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_f
-    if-eqz v1, :cond_3f
-
-    iget-object v3, v1, Ln0/w;->b:Ljava/lang/String;
-
-    iput-object v3, v0, Ln0/w$a;->a:Ljava/lang/String;
-
-    :goto_7
-    const/4 v3, 0x0
-
-    move v4, v2
-
-    :goto_8
-    const/16 v6, 0x2f
-
-    const/16 v9, 0x5c
-
-    if-ge v4, v13, :cond_11
-
-    invoke-virtual {v12, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v10
-
-    if-eq v10, v9, :cond_10
-
-    if-ne v10, v6, :cond_11
-
-    :cond_10
-    add-int/lit8 v3, v3, 0x1
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_8
-
-    :cond_11
-    const/16 v4, 0x23
-
-    if-ge v3, v5, :cond_15
-
-    if-eqz v1, :cond_15
-
-    iget-object v5, v1, Ln0/w;->b:Ljava/lang/String;
-
-    iget-object v10, v0, Ln0/w$a;->a:Ljava/lang/String;
-
-    invoke-static {v5, v10}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    xor-int/2addr v5, v8
-
-    if-eqz v5, :cond_12
-
-    goto :goto_9
-
-    :cond_12
-    invoke-virtual/range {p1 .. p1}, Ln0/w;->e()Ljava/lang/String;
-
-    move-result-object v3
-
-    iput-object v3, v0, Ln0/w$a;->b:Ljava/lang/String;
-
-    invoke-virtual/range {p1 .. p1}, Ln0/w;->a()Ljava/lang/String;
-
-    move-result-object v3
-
-    iput-object v3, v0, Ln0/w$a;->c:Ljava/lang/String;
-
-    iget-object v3, v1, Ln0/w;->e:Ljava/lang/String;
-
-    iput-object v3, v0, Ln0/w$a;->d:Ljava/lang/String;
-
-    iget v3, v1, Ln0/w;->f:I
-
-    iput v3, v0, Ln0/w$a;->e:I
-
-    iget-object v3, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v3}, Ljava/util/List;->clear()V
-
-    iget-object v3, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-virtual/range {p1 .. p1}, Ln0/w;->c()Ljava/util/List;
-
-    move-result-object v5
-
-    invoke-interface {v3, v5}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
-
-    if-eq v2, v13, :cond_13
-
-    invoke-virtual {v12, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v3
-
-    if-ne v3, v4, :cond_14
-
-    :cond_13
-    invoke-virtual/range {p1 .. p1}, Ln0/w;->d()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ln0/w$a;->d(Ljava/lang/String;)Ln0/w$a;
-
-    :cond_14
-    const/4 v1, 0x1
-
-    move/from16 v18, v13
-
-    goto/16 :goto_19
-
-    :cond_15
-    :goto_9
-    add-int/2addr v2, v3
-
-    const/4 v1, 0x0
-
-    const/4 v3, 0x0
-
-    move v10, v2
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x0
-
-    :goto_a
-    const-string v1, "@/\\?#"
-
-    invoke-static {v12, v1, v10, v13}, Ln0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
-
-    move-result v8
-
-    if-eq v8, v13, :cond_16
-
-    invoke-virtual {v12, v8}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    goto :goto_b
-
-    :cond_16
-    const/4 v1, -0x1
-
-    :goto_b
-    if-eq v1, v7, :cond_1b
-
-    if-eq v1, v4, :cond_1b
-
-    if-eq v1, v6, :cond_1b
-
-    if-eq v1, v9, :cond_1b
-
-    const/16 v2, 0x3f
-
-    if-eq v1, v2, :cond_1b
-
-    const/16 v2, 0x40
-
-    if-eq v1, v2, :cond_17
-
-    move/from16 v18, v13
-
-    move-object/from16 v19, v14
-
-    move-object v13, v11
-
-    goto/16 :goto_e
-
-    :cond_17
-    const-string v9, "%40"
-
-    if-nez v16, :cond_1a
-
-    const/16 v1, 0x3a
-
-    invoke-static {v12, v1, v10, v8}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result v7
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v6, 0x1
-
-    const/16 v18, 0x0
-
-    const/16 v19, 0x0
-
-    const/16 v20, 0x0
-
-    const/16 v21, 0x0
-
-    const/16 v22, 0xf0
-
-    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
-
-    move-object/from16 v2, p2
-
-    move v3, v10
-
-    move v4, v7
-
-    move v10, v7
-
-    move/from16 v7, v18
-
-    move/from16 v23, v8
-
-    move/from16 v8, v19
-
-    move-object/from16 v24, v9
-
-    move/from16 v9, v20
-
-    move/from16 v25, v10
-
-    move-object/from16 v10, v21
-
-    move/from16 v18, v13
-
-    move-object v13, v11
-
-    move/from16 v11, v22
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    if-eqz v17, :cond_18
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v3, v0, Ln0/w$a;->b:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-object/from16 v3, v24
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    :cond_18
-    iput-object v1, v0, Ln0/w$a;->b:Ljava/lang/String;
-
-    move/from16 v11, v23
-
-    move/from16 v1, v25
-
-    if-eq v1, v11, :cond_19
-
-    sget-object v2, Ln0/w;->l:Ln0/w$b;
-
-    add-int/lit8 v3, v1, 0x1
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/16 v16, 0xf0
-
-    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
-
-    move-object v1, v2
-
-    move-object/from16 v2, p2
-
-    move v4, v11
-
-    move/from16 v23, v11
-
-    move/from16 v11, v16
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/w$a;->c:Ljava/lang/String;
-
-    const/16 v16, 0x1
-
-    goto :goto_c
-
-    :cond_19
-    move/from16 v23, v11
-
-    :goto_c
-    const/16 v17, 0x1
-
-    move-object/from16 v19, v14
-
-    goto :goto_d
-
-    :cond_1a
-    move/from16 v23, v8
-
-    move-object v3, v9
-
-    move/from16 v18, v13
-
-    move-object v13, v11
-
-    new-instance v11, Ljava/lang/StringBuilder;
-
-    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, v0, Ln0/w$a;->c:Ljava/lang/String;
-
-    invoke-virtual {v11, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v19, 0x0
-
-    const/16 v20, 0xf0
-
-    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
-
-    move-object/from16 v2, p2
-
-    move v3, v10
-
-    move/from16 v4, v23
-
-    move-object/from16 v10, v19
-
-    move-object/from16 v19, v14
-
-    move-object v14, v11
-
-    move/from16 v11, v20
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v14, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v14}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/w$a;->c:Ljava/lang/String;
-
-    :goto_d
-    move/from16 v14, v23
-
-    add-int/lit8 v10, v14, 0x1
-
-    :goto_e
-    const/16 v4, 0x23
-
-    const/16 v6, 0x2f
-
-    const/4 v7, -0x1
-
-    const/16 v9, 0x5c
-
-    move-object v11, v13
-
-    move/from16 v13, v18
-
-    move-object/from16 v14, v19
-
-    goto/16 :goto_a
-
-    :cond_1b
-    move/from16 v18, v13
-
-    move-object/from16 v19, v14
-
-    move v14, v8
-
-    move-object v13, v11
-
-    const/16 v1, 0x3a
-
-    move v8, v10
-
-    :goto_f
-    if-ge v8, v14, :cond_1f
-
-    invoke-virtual {v12, v8}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    if-eq v2, v1, :cond_1e
-
-    const/16 v3, 0x5b
-
-    if-eq v2, v3, :cond_1c
-
-    goto :goto_10
-
-    :cond_1c
-    add-int/lit8 v8, v8, 0x1
-
-    if-ge v8, v14, :cond_1d
-
-    invoke-virtual {v12, v8}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    const/16 v3, 0x5d
-
-    if-ne v2, v3, :cond_1c
-
-    :cond_1d
-    :goto_10
-    add-int/lit8 v8, v8, 0x1
-
-    goto :goto_f
-
-    :cond_1e
-    move v11, v8
-
-    goto :goto_11
-
-    :cond_1f
-    move v11, v14
-
-    :goto_11
-    add-int/lit8 v9, v11, 0x1
-
-    if-ge v9, v14, :cond_24
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x4
-
-    move-object/from16 v2, p2
-
-    move v3, v10
-
-    move v4, v11
-
-    invoke-static/range {v1 .. v6}, Ln0/w$b;->d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->i0(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/w$a;->d:Ljava/lang/String;
-
-    :try_start_0
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const-string v5, ""
-    :try_end_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0xf8
-
-    move-object/from16 v2, p2
-
-    move v3, v9
-
-    move v4, v14
-
-    move/from16 v26, v9
-
-    move v9, v15
-
-    move v15, v10
-
-    move-object/from16 v10, v16
-
-    move/from16 p1, v11
-
-    move/from16 v11, v17
-
-    :try_start_1
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v1
-    :try_end_1
-    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_1
-
-    const v2, 0xffff
-
-    const/4 v3, 0x1
-
-    if-le v3, v1, :cond_20
-
-    goto :goto_12
-
-    :cond_20
-    if-lt v2, v1, :cond_21
-
-    goto :goto_13
-
-    :catch_0
-    move/from16 v26, v9
-
-    move v15, v10
-
-    move/from16 p1, v11
-
-    :catch_1
-    const/4 v3, 0x1
-
-    :cond_21
-    :goto_12
-    const/4 v1, -0x1
-
-    :goto_13
-    iput v1, v0, Ln0/w$a;->e:I
-
-    const/4 v2, -0x1
-
-    if-eq v1, v2, :cond_22
-
-    const/4 v1, 0x1
-
-    goto :goto_14
-
-    :cond_22
-    const/4 v1, 0x0
-
-    :goto_14
-    if-eqz v1, :cond_23
-
-    const/16 v1, 0x22
-
-    move v10, v15
-
-    goto/16 :goto_17
-
-    :cond_23
-    const-string v1, "Invalid URL port: \""
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    move/from16 v11, v26
-
-    invoke-virtual {v12, v11, v14}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v2, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v2, 0x22
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-
-    :cond_24
-    move/from16 p1, v11
-
-    const/16 v7, 0x22
-
-    const/4 v8, 0x1
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x4
-
-    move-object/from16 v2, p2
-
-    move v3, v10
-
-    move/from16 v4, p1
-
-    invoke-static/range {v1 .. v6}, Ln0/w$b;->d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->i0(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/w$a;->d:Ljava/lang/String;
-
-    iget-object v1, v0, Ln0/w$a;->a:Ljava/lang/String;
-
-    if-eqz v1, :cond_3e
-
-    if-eqz v1, :cond_3d
-
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
-
-    move-result v2
-
-    const v3, 0x310888    # 4.503E-39f
-
-    if-eq v2, v3, :cond_26
-
-    const v3, 0x5f008eb
-
-    if-eq v2, v3, :cond_25
-
-    goto :goto_15
-
-    :cond_25
-    invoke-virtual {v1, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_27
-
-    const/16 v1, 0x1bb
-
-    goto :goto_16
-
-    :cond_26
-    move-object/from16 v2, v19
-
-    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_27
-
-    const/16 v1, 0x50
-
-    goto :goto_16
-
-    :cond_27
-    :goto_15
-    const/4 v1, -0x1
-
-    :goto_16
-    iput v1, v0, Ln0/w$a;->e:I
-
-    const/16 v1, 0x22
-
-    const/4 v3, 0x1
-
-    :goto_17
-    iget-object v2, v0, Ln0/w$a;->d:Ljava/lang/String;
-
-    if-eqz v2, :cond_28
-
-    const/4 v2, 0x1
-
-    goto :goto_18
-
-    :cond_28
-    const/4 v2, 0x0
-
-    :goto_18
-    if-eqz v2, :cond_3c
-
-    move v1, v3
-
-    move v2, v14
-
-    :goto_19
-    const-string v3, "?#"
-
-    move/from16 v4, v18
-
-    invoke-static {v12, v3, v2, v4}, Ln0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
-
-    move-result v3
-
-    if-ne v2, v3, :cond_29
-
-    move-object v15, v0
-
-    move v14, v4
-
-    move-object v1, v12
-
-    move-object v2, v1
-
-    goto/16 :goto_26
-
-    :cond_29
-    invoke-virtual {v12, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    const-string v6, ""
-
-    const/16 v7, 0x2f
-
-    if-eq v5, v7, :cond_2b
-
-    const/16 v7, 0x5c
-
-    if-ne v5, v7, :cond_2a
-
-    goto :goto_1a
-
-    :cond_2a
-    iget-object v5, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v5}, Ljava/util/List;->size()I
-
-    move-result v7
-
-    sub-int/2addr v7, v1
-
-    invoke-interface {v5, v7, v6}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    move-object v8, v0
-
-    move-object v9, v8
-
-    move v5, v3
-
-    move v13, v4
-
-    move-object v7, v6
-
-    move v4, v2
-
-    move v6, v5
-
-    move-object v2, v12
-
-    move v3, v1
-
-    move-object v1, v2
-
-    goto :goto_1c
-
-    :cond_2b
-    :goto_1a
-    iget-object v5, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v5}, Ljava/util/List;->clear()V
-
-    iget-object v5, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v5, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    move-object v8, v0
-
-    move-object v9, v8
-
-    move v5, v3
-
-    move v13, v4
-
-    move-object v7, v6
-
-    move v4, v2
-
-    move v6, v5
-
-    move-object v2, v12
-
-    move v3, v1
-
-    move-object v1, v2
-
-    :goto_1b
-    add-int/2addr v4, v3
-
-    :cond_2c
-    :goto_1c
-    if-ge v4, v6, :cond_39
-
-    const-string v10, "/\\"
-
-    invoke-static {v1, v10, v4, v6}, Ln0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
-
-    move-result v10
-
-    if-ge v10, v6, :cond_2d
-
-    const/4 v11, 0x1
-
-    goto :goto_1d
-
-    :cond_2d
-    const/4 v11, 0x0
-
-    :goto_1d
-    const/16 v19, 0x1
-
-    sget-object v14, Ln0/w;->l:Ln0/w$b;
-
-    const/16 v20, 0x0
-
-    const/16 v21, 0x0
-
-    const/16 v22, 0x0
-
-    const/16 v23, 0x0
-
-    const/16 v24, 0xf0
-
-    const-string v18, " \"<>^`{}|/\\?#"
-
-    move-object v15, v1
-
-    move/from16 v16, v4
-
-    move/from16 v17, v10
-
-    invoke-static/range {v14 .. v24}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v14, "."
-
-    invoke-static {v4, v14}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v14
-
-    if-nez v14, :cond_2f
-
-    const-string v14, "%2e"
-
-    invoke-static {v4, v14, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v14
-
-    if-eqz v14, :cond_2e
-
-    goto :goto_1e
-
-    :cond_2e
-    const/4 v14, 0x0
-
-    goto :goto_1f
-
-    :cond_2f
-    :goto_1e
-    const/4 v14, 0x1
-
-    :goto_1f
-    if-eqz v14, :cond_30
-
-    goto/16 :goto_25
-
-    :cond_30
-    const-string v14, ".."
-
-    invoke-static {v4, v14}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v14
-
-    if-nez v14, :cond_32
-
-    const-string v14, "%2e."
-
-    invoke-static {v4, v14, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v14
-
-    if-nez v14, :cond_32
-
-    const-string v14, ".%2e"
-
-    invoke-static {v4, v14, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v14
-
-    if-nez v14, :cond_32
-
-    const-string v14, "%2e%2e"
-
-    invoke-static {v4, v14, v3}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
-
-    move-result v14
-
-    if-eqz v14, :cond_31
-
-    goto :goto_20
-
-    :cond_31
-    const/4 v14, 0x0
-
-    goto :goto_21
-
-    :cond_32
-    :goto_20
-    const/4 v14, 0x1
-
-    :goto_21
-    if-eqz v14, :cond_35
-
-    iget-object v4, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->size()I
-
-    move-result v14
-
-    sub-int/2addr v14, v3
-
-    invoke-interface {v4, v14}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/String;
-
-    invoke-virtual {v4}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    if-nez v4, :cond_33
-
-    const/4 v4, 0x1
-
-    goto :goto_22
-
-    :cond_33
-    const/4 v4, 0x0
-
-    :goto_22
-    if-eqz v4, :cond_34
-
-    iget-object v4, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v4
-
-    xor-int/2addr v4, v3
-
-    if-eqz v4, :cond_34
-
-    iget-object v4, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v4}, Ljava/util/List;->size()I
-
-    move-result v14
-
-    sub-int/2addr v14, v3
-
-    invoke-interface {v4, v14, v7}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_25
-
-    :cond_34
-    iget-object v4, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v4, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_25
-
-    :cond_35
-    iget-object v14, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v14}, Ljava/util/List;->size()I
-
-    move-result v15
-
-    sub-int/2addr v15, v3
-
-    invoke-interface {v14, v15}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v14
-
-    check-cast v14, Ljava/lang/CharSequence;
-
-    invoke-interface {v14}, Ljava/lang/CharSequence;->length()I
-
-    move-result v14
-
-    if-nez v14, :cond_36
-
-    const/4 v14, 0x1
-
-    goto :goto_23
-
-    :cond_36
-    const/4 v14, 0x0
-
-    :goto_23
-    if-eqz v14, :cond_37
-
-    iget-object v14, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v14}, Ljava/util/List;->size()I
-
-    move-result v15
-
-    sub-int/2addr v15, v3
-
-    invoke-interface {v14, v15, v4}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_24
-
-    :cond_37
-    iget-object v14, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v14, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :goto_24
-    if-eqz v11, :cond_38
-
-    iget-object v4, v9, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v4, v7}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_38
-    :goto_25
-    move v4, v10
-
-    if-eqz v11, :cond_2c
-
-    goto/16 :goto_1b
-
-    :cond_39
-    move v3, v5
-
-    move-object v15, v8
-
-    move-object v1, v12
-
-    move v14, v13
-
-    :goto_26
-    if-ge v3, v14, :cond_3a
-
-    invoke-virtual {v2, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    const/16 v5, 0x3f
-
-    if-ne v4, v5, :cond_3a
-
-    const/16 v4, 0x23
-
-    invoke-static {v2, v4, v3, v14}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result v16
-
-    sget-object v13, Ln0/w;->l:Ln0/w$b;
-
-    add-int/lit8 v5, v3, 0x1
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x1
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/16 v17, 0xd0
-
-    const-string v7, " \"\'<>#"
-
-    move-object v3, v13
-
-    move-object v4, v1
-
-    move/from16 v6, v16
-
-    move-object v0, v13
-
-    move/from16 v13, v17
-
-    invoke-static/range {v3 .. v13}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ln0/w$b;->e(Ljava/lang/String;)Ljava/util/List;
-
-    move-result-object v0
-
-    iput-object v0, v15, Ln0/w$a;->g:Ljava/util/List;
-
-    move/from16 v3, v16
-
-    :cond_3a
-    if-ge v3, v14, :cond_3b
-
-    invoke-virtual {v2, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v2, 0x23
-
-    if-ne v0, v2, :cond_3b
-
-    sget-object v0, Ln0/w;->l:Ln0/w$b;
-
-    add-int/lit8 v5, v3, 0x1
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x1
-
-    const/4 v12, 0x0
-
-    const/16 v13, 0xb0
-
-    const-string v7, ""
-
-    move-object v3, v0
-
-    move-object v4, v1
-
-    move v6, v14
-
-    invoke-static/range {v3 .. v13}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    iput-object v0, v15, Ln0/w$a;->h:Ljava/lang/String;
-
-    :cond_3b
-    return-object v15
-
-    :cond_3c
-    const-string v0, "Invalid URL host: \""
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    move/from16 v14, p1
-
-    invoke-virtual {v12, v10, v14}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v2, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3d
-    const-string v0, "scheme"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_3e
-    const/4 v0, 0x0
-
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3f
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "Expected URL scheme \'http\' or \'https\' but no colon was found"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_40
-    const/4 v0, 0x0
-
-    const-string v1, "input"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final f(Ljava/lang/String;)Ln0/w$a;
-    .locals 11
-
-    sget-object v0, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v10, 0xfb
-
-    const-string v4, " \"\':;<=>@[]^`{}|/\\?#"
-
-    move-object v1, p1
-
-    invoke-static/range {v0 .. v10}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/w$a;->c:Ljava/lang/String;
-
-    return-object p0
-.end method
-
-.method public final g(Ljava/lang/String;)Ln0/w$a;
-    .locals 11
-
-    sget-object v0, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v10, 0xfb
-
-    const-string v4, " \"\':;<=>@[]^`{}|/\\?#"
-
-    move-object v1, p1
-
-    invoke-static/range {v0 .. v10}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/w$a;->b:Ljava/lang/String;
-
-    return-object p0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 10
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Ln0/w$a;->a:Ljava/lang/String;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, "://"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, "//"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :goto_0
-    iget-object v1, p0, Ln0/w$a;->b:Ljava/lang/String;
-
-    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-lez v1, :cond_1
-
-    const/4 v1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_1
-    const/16 v4, 0x3a
-
-    if-nez v1, :cond_3
-
-    iget-object v1, p0, Ln0/w$a;->c:Ljava/lang/String;
-
-    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    if-lez v1, :cond_2
-
-    const/4 v1, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_2
-    if-eqz v1, :cond_6
-
-    :cond_3
-    iget-object v1, p0, Ln0/w$a;->b:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/w$a;->c:Ljava/lang/String;
-
-    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
-
-    move-result v1
-
-    if-lez v1, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    const/4 v2, 0x0
-
-    :goto_3
-    if-eqz v2, :cond_5
-
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/w$a;->c:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_5
-    const/16 v1, 0x40
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :cond_6
-    iget-object v1, p0, Ln0/w$a;->d:Ljava/lang/String;
-
-    const/4 v2, 0x2
-
-    const/4 v5, 0x0
-
-    if-eqz v1, :cond_9
-
-    if-eqz v1, :cond_8
-
-    invoke-static {v1, v4, v3, v2}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    const/16 v1, 0x5b
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/w$a;->d:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_4
-
-    :cond_7
-    iget-object v1, p0, Ln0/w$a;->d:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    goto :goto_4
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_9
-    :goto_4
-    iget v1, p0, Ln0/w$a;->e:I
-
-    const/4 v6, -0x1
-
-    if-ne v1, v6, :cond_a
-
-    iget-object v1, p0, Ln0/w$a;->a:Ljava/lang/String;
-
-    if-eqz v1, :cond_11
-
-    :cond_a
-    invoke-virtual {p0}, Ln0/w$a;->c()I
-
-    move-result v1
-
-    iget-object v7, p0, Ln0/w$a;->a:Ljava/lang/String;
-
-    if-eqz v7, :cond_10
-
-    if-eqz v7, :cond_f
-
-    if-eqz v7, :cond_e
-
-    invoke-virtual {v7}, Ljava/lang/String;->hashCode()I
-
-    move-result v8
-
-    const v9, 0x310888    # 4.503E-39f
-
-    if-eq v8, v9, :cond_c
-
-    const v9, 0x5f008eb
-
-    if-eq v8, v9, :cond_b
-
-    goto :goto_5
-
-    :cond_b
-    const-string v8, "https"
-
-    invoke-virtual {v7, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_d
-
-    const/16 v6, 0x1bb
-
-    goto :goto_5
-
-    :cond_c
-    const-string v8, "http"
-
-    invoke-virtual {v7, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_d
-
-    const/16 v6, 0x50
-
-    :cond_d
-    :goto_5
-    if-eq v1, v6, :cond_11
-
-    goto :goto_6
-
-    :cond_e
-    const-string v0, "scheme"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_f
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_10
-    :goto_6
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    :cond_11
-    iget-object v1, p0, Ln0/w$a;->f:Ljava/util/List;
-
-    if-eqz v1, :cond_1a
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v4
-
-    const/4 v6, 0x0
-
-    :goto_7
-    if-ge v6, v4, :cond_12
-
-    const/16 v7, 0x2f
-
-    invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-interface {v1, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Ljava/lang/String;
-
-    invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_7
-
-    :cond_12
-    iget-object v1, p0, Ln0/w$a;->g:Ljava/util/List;
-
-    if-eqz v1, :cond_18
-
-    const/16 v1, 0x3f
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/w$a;->g:Ljava/util/List;
-
-    if-eqz v1, :cond_17
-
-    if-eqz v1, :cond_16
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v4
-
-    invoke-static {v3, v4}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v3
-
-    invoke-static {v3, v2}, Lj0/q/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
-
-    move-result-object v2
-
-    iget v3, v2, Lkotlin/ranges/IntProgression;->d:I
-
-    iget v4, v2, Lkotlin/ranges/IntProgression;->e:I
-
-    iget v2, v2, Lkotlin/ranges/IntProgression;->f:I
-
-    if-ltz v2, :cond_13
-
-    if-gt v3, v4, :cond_18
-
-    goto :goto_8
-
-    :cond_13
-    if-lt v3, v4, :cond_18
-
-    :goto_8
-    invoke-interface {v1, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Ljava/lang/String;
-
-    add-int/lit8 v6, v3, 0x1
-
-    invoke-interface {v1, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/String;
-
-    if-lez v3, :cond_14
-
-    const/16 v7, 0x26
-
-    invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :cond_14
-    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    if-eqz v6, :cond_15
-
-    const/16 v5, 0x3d
-
-    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_15
-    if-eq v3, v4, :cond_18
-
-    add-int/2addr v3, v2
-
-    goto :goto_8
-
-    :cond_16
-    const-string v0, "$this$toQueryString"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_17
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_18
-    iget-object v1, p0, Ln0/w$a;->h:Ljava/lang/String;
-
-    if-eqz v1, :cond_19
-
-    const/16 v1, 0x23
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/w$a;->h:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_19
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "StringBuilder().apply(builderAction).toString()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_1a
-    const-string v0, "$this$toPathString"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-.end method
diff --git a/com.discord/smali_classes2/n0/w$b.smali b/com.discord/smali_classes2/n0/w$b.smali
deleted file mode 100644
index 5396cd458a..0000000000
--- a/com.discord/smali_classes2/n0/w$b.smali
+++ /dev/null
@@ -1,956 +0,0 @@
-.class public final Ln0/w$b;
-.super Ljava/lang/Object;
-.source "HttpUrl.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/w;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public static a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-    .locals 16
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-object/from16 v2, p4
-
-    move/from16 v3, p10
-
-    and-int/lit8 v4, v3, 0x1
-
-    if-eqz v4, :cond_0
-
-    const/4 v4, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    move/from16 v4, p2
-
-    :goto_0
-    and-int/lit8 v5, v3, 0x2
-
-    if-eqz v5, :cond_1
-
-    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
-
-    move-result v5
-
-    goto :goto_1
-
-    :cond_1
-    move/from16 v5, p3
-
-    :goto_1
-    and-int/lit8 v6, v3, 0x8
-
-    if-eqz v6, :cond_2
-
-    const/4 v6, 0x0
-
-    goto :goto_2
-
-    :cond_2
-    move/from16 v6, p5
-
-    :goto_2
-    and-int/lit8 v7, v3, 0x10
-
-    if-eqz v7, :cond_3
-
-    const/4 v7, 0x0
-
-    goto :goto_3
-
-    :cond_3
-    move/from16 v7, p6
-
-    :goto_3
-    and-int/lit8 v8, v3, 0x20
-
-    if-eqz v8, :cond_4
-
-    const/4 v8, 0x0
-
-    goto :goto_4
-
-    :cond_4
-    move/from16 v8, p7
-
-    :goto_4
-    and-int/lit8 v9, v3, 0x40
-
-    if-eqz v9, :cond_5
-
-    const/4 v9, 0x0
-
-    goto :goto_5
-
-    :cond_5
-    move/from16 v9, p8
-
-    :goto_5
-    and-int/lit16 v3, v3, 0x80
-
-    if-eqz v3, :cond_6
-
-    const/4 v3, 0x0
-
-    goto :goto_6
-
-    :cond_6
-    move-object/from16 v3, p9
-
-    :goto_6
-    if-eqz v1, :cond_20
-
-    move v10, v4
-
-    :goto_7
-    const-string v11, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    if-ge v10, v5, :cond_1f
-
-    invoke-virtual {v1, v10}, Ljava/lang/String;->codePointAt(I)I
-
-    move-result v12
-
-    const/16 v13, 0x7f
-
-    const/16 v14, 0x20
-
-    const/4 v15, 0x2
-
-    if-lt v12, v14, :cond_a
-
-    if-eq v12, v13, :cond_a
-
-    const/16 v13, 0x80
-
-    if-lt v12, v13, :cond_7
-
-    if-eqz v9, :cond_a
-
-    :cond_7
-    int-to-char v13, v12
-
-    const/4 v14, 0x0
-
-    invoke-static {v2, v13, v14, v15}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
-
-    move-result v13
-
-    if-nez v13, :cond_a
-
-    const/16 v13, 0x25
-
-    if-ne v12, v13, :cond_8
-
-    if-eqz v6, :cond_a
-
-    if-eqz v7, :cond_8
-
-    invoke-virtual {v0, v1, v10, v5}, Ln0/w$b;->b(Ljava/lang/String;II)Z
-
-    move-result v13
-
-    if-eqz v13, :cond_a
-
-    :cond_8
-    const/16 v13, 0x2b
-
-    if-ne v12, v13, :cond_9
-
-    if-eqz v8, :cond_9
-
-    goto :goto_8
-
-    :cond_9
-    invoke-static {v12}, Ljava/lang/Character;->charCount(I)I
-
-    move-result v11
-
-    add-int/2addr v10, v11
-
-    goto :goto_7
-
-    :cond_a
-    :goto_8
-    new-instance v12, Lo0/e;
-
-    invoke-direct {v12}, Lo0/e;-><init>()V
-
-    invoke-virtual {v12, v1, v4, v10}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
-
-    const/4 v4, 0x0
-
-    :goto_9
-    if-ge v10, v5, :cond_1e
-
-    invoke-virtual {v1, v10}, Ljava/lang/String;->codePointAt(I)I
-
-    move-result v13
-
-    if-eqz v6, :cond_b
-
-    const/16 v14, 0x9
-
-    if-eq v13, v14, :cond_d
-
-    const/16 v14, 0xa
-
-    if-eq v13, v14, :cond_d
-
-    const/16 v14, 0xc
-
-    if-eq v13, v14, :cond_d
-
-    const/16 v14, 0xd
-
-    if-eq v13, v14, :cond_d
-
-    :cond_b
-    const/16 v14, 0x2b
-
-    if-ne v13, v14, :cond_e
-
-    if-eqz v8, :cond_e
-
-    if-eqz v6, :cond_c
-
-    const-string v14, "+"
-
-    goto :goto_a
-
-    :cond_c
-    const-string v14, "%2B"
-
-    :goto_a
-    invoke-virtual {v12, v14}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
-
-    :cond_d
-    move/from16 p2, v8
-
-    goto/16 :goto_11
-
-    :cond_e
-    const/16 v14, 0x20
-
-    if-lt v13, v14, :cond_11
-
-    const/16 v14, 0x7f
-
-    if-eq v13, v14, :cond_11
-
-    const/16 v14, 0x80
-
-    if-lt v13, v14, :cond_f
-
-    if-eqz v9, :cond_11
-
-    :cond_f
-    int-to-char v14, v13
-
-    move/from16 p2, v8
-
-    const/4 v8, 0x0
-
-    invoke-static {v2, v14, v8, v15}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
-
-    move-result v8
-
-    if-nez v8, :cond_12
-
-    const/16 v8, 0x25
-
-    if-ne v13, v8, :cond_10
-
-    if-eqz v6, :cond_12
-
-    if-eqz v7, :cond_10
-
-    invoke-virtual {v0, v1, v10, v5}, Ln0/w$b;->b(Ljava/lang/String;II)Z
-
-    move-result v8
-
-    if-nez v8, :cond_10
-
-    goto :goto_b
-
-    :cond_10
-    invoke-virtual {v12, v13}, Lo0/e;->U(I)Lo0/e;
-
-    goto/16 :goto_11
-
-    :cond_11
-    move/from16 p2, v8
-
-    :cond_12
-    :goto_b
-    if-nez v4, :cond_13
-
-    new-instance v4, Lo0/e;
-
-    invoke-direct {v4}, Lo0/e;-><init>()V
-
-    :cond_13
-    if-eqz v3, :cond_1c
-
-    sget-object v8, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
-
-    invoke-static {v3, v8}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_14
-
-    goto/16 :goto_f
-
-    :cond_14
-    invoke-static {v13}, Ljava/lang/Character;->charCount(I)I
-
-    move-result v8
-
-    add-int/2addr v8, v10
-
-    const/4 v14, 0x1
-
-    if-ltz v10, :cond_15
-
-    const/4 v15, 0x1
-
-    goto :goto_c
-
-    :cond_15
-    const/4 v15, 0x0
-
-    :goto_c
-    if-eqz v15, :cond_1b
-
-    if-lt v8, v10, :cond_16
-
-    const/4 v15, 0x1
-
-    goto :goto_d
-
-    :cond_16
-    const/4 v15, 0x0
-
-    :goto_d
-    if-eqz v15, :cond_1a
-
-    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
-
-    move-result v15
-
-    if-gt v8, v15, :cond_17
-
-    goto :goto_e
-
-    :cond_17
-    const/4 v14, 0x0
-
-    :goto_e
-    if-eqz v14, :cond_19
-
-    sget-object v14, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    invoke-static {v3, v14}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v14
-
-    if-eqz v14, :cond_18
-
-    invoke-virtual {v4, v1, v10, v8}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
-
-    goto :goto_10
-
-    :cond_18
-    invoke-virtual {v1, v10, v8}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-static {v8, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v8, v3}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
-
-    move-result-object v8
-
-    const-string v14, "(this as java.lang.String).getBytes(charset)"
-
-    invoke-static {v8, v14}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    array-length v14, v8
-
-    const/4 v15, 0x0
-
-    invoke-virtual {v4, v8, v15, v14}, Lo0/e;->G([BII)Lo0/e;
-
-    goto :goto_10
-
-    :cond_19
-    const-string v0, "endIndex > string.length: "
-
-    const-string v2, " > "
-
-    invoke-static {v0, v8, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1a
-    const-string v0, "endIndex < beginIndex: "
-
-    const-string v1, " < "
-
-    invoke-static {v0, v8, v1, v10}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1b
-    const-string v0, "beginIndex < 0: "
-
-    invoke-static {v0, v10}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1c
-    :goto_f
-    invoke-virtual {v4, v13}, Lo0/e;->U(I)Lo0/e;
-
-    :goto_10
-    invoke-virtual {v4}, Lo0/e;->J()Z
-
-    move-result v8
-
-    if-nez v8, :cond_1d
-
-    invoke-virtual {v4}, Lo0/e;->readByte()B
-
-    move-result v8
-
-    and-int/lit16 v8, v8, 0xff
-
-    const/16 v14, 0x25
-
-    invoke-virtual {v12, v14}, Lo0/e;->I(I)Lo0/e;
-
-    sget-object v14, Ln0/w;->k:[C
-
-    shr-int/lit8 v15, v8, 0x4
-
-    and-int/lit8 v15, v15, 0xf
-
-    aget-char v14, v14, v15
-
-    invoke-virtual {v12, v14}, Lo0/e;->I(I)Lo0/e;
-
-    sget-object v14, Ln0/w;->k:[C
-
-    and-int/lit8 v8, v8, 0xf
-
-    aget-char v8, v14, v8
-
-    invoke-virtual {v12, v8}, Lo0/e;->I(I)Lo0/e;
-
-    goto :goto_10
-
-    :cond_1d
-    :goto_11
-    invoke-static {v13}, Ljava/lang/Character;->charCount(I)I
-
-    move-result v8
-
-    add-int/2addr v10, v8
-
-    const/4 v15, 0x2
-
-    move/from16 v8, p2
-
-    goto/16 :goto_9
-
-    :cond_1e
-    invoke-virtual {v12}, Lo0/e;->v()Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_12
-
-    :cond_1f
-    invoke-virtual {v1, v4, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_12
-    return-object v0
-
-    :cond_20
-    const-string v0, "$this$canonicalize"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public static d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-    .locals 6
-
-    and-int/lit8 p0, p5, 0x1
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_0
-
-    const/4 p2, 0x0
-
-    :cond_0
-    and-int/lit8 p0, p5, 0x2
-
-    if-eqz p0, :cond_1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result p3
-
-    :cond_1
-    and-int/lit8 p0, p5, 0x4
-
-    if-eqz p0, :cond_2
-
-    const/4 p4, 0x0
-
-    :cond_2
-    if-eqz p1, :cond_9
-
-    move p0, p2
-
-    :goto_0
-    if-ge p0, p3, :cond_8
-
-    invoke-virtual {p1, p0}, Ljava/lang/String;->charAt(I)C
-
-    move-result p5
-
-    const/16 v0, 0x2b
-
-    const/16 v1, 0x25
-
-    if-eq p5, v1, :cond_4
-
-    if-ne p5, v0, :cond_3
-
-    if-eqz p4, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    add-int/lit8 p0, p0, 0x1
-
-    goto :goto_0
-
-    :cond_4
-    :goto_1
-    new-instance p5, Lo0/e;
-
-    invoke-direct {p5}, Lo0/e;-><init>()V
-
-    invoke-virtual {p5, p1, p2, p0}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
-
-    :goto_2
-    if-ge p0, p3, :cond_7
-
-    invoke-virtual {p1, p0}, Ljava/lang/String;->codePointAt(I)I
-
-    move-result p2
-
-    if-ne p2, v1, :cond_5
-
-    add-int/lit8 v2, p0, 0x2
-
-    if-ge v2, p3, :cond_5
-
-    add-int/lit8 v3, p0, 0x1
-
-    invoke-virtual {p1, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v3
-
-    invoke-static {v3}, Ln0/g0/b;->w(C)I
-
-    move-result v3
-
-    invoke-virtual {p1, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    invoke-static {v4}, Ln0/g0/b;->w(C)I
-
-    move-result v4
-
-    const/4 v5, -0x1
-
-    if-eq v3, v5, :cond_6
-
-    if-eq v4, v5, :cond_6
-
-    shl-int/lit8 p0, v3, 0x4
-
-    add-int/2addr p0, v4
-
-    invoke-virtual {p5, p0}, Lo0/e;->I(I)Lo0/e;
-
-    invoke-static {p2}, Ljava/lang/Character;->charCount(I)I
-
-    move-result p0
-
-    add-int/2addr p0, v2
-
-    goto :goto_2
-
-    :cond_5
-    if-ne p2, v0, :cond_6
-
-    if-eqz p4, :cond_6
-
-    const/16 p2, 0x20
-
-    invoke-virtual {p5, p2}, Lo0/e;->I(I)Lo0/e;
-
-    add-int/lit8 p0, p0, 0x1
-
-    goto :goto_2
-
-    :cond_6
-    invoke-virtual {p5, p2}, Lo0/e;->U(I)Lo0/e;
-
-    invoke-static {p2}, Ljava/lang/Character;->charCount(I)I
-
-    move-result p2
-
-    add-int/2addr p0, p2
-
-    goto :goto_2
-
-    :cond_7
-    invoke-virtual {p5}, Lo0/e;->v()Ljava/lang/String;
-
-    move-result-object p0
-
-    goto :goto_3
-
-    :cond_8
-    invoke-virtual {p1, p2, p3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object p0
-
-    const-string p1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_3
-    return-object p0
-
-    :cond_9
-    const-string p0, "$this$percentDecode"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-
-# virtual methods
-.method public final b(Ljava/lang/String;II)Z
-    .locals 3
-
-    add-int/lit8 v0, p2, 0x2
-
-    const/4 v1, 0x1
-
-    if-ge v0, p3, :cond_0
-
-    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result p3
-
-    const/16 v2, 0x25
-
-    if-ne p3, v2, :cond_0
-
-    add-int/2addr p2, v1
-
-    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result p2
-
-    invoke-static {p2}, Ln0/g0/b;->w(C)I
-
-    move-result p2
-
-    const/4 p3, -0x1
-
-    if-eq p2, p3, :cond_0
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result p1
-
-    invoke-static {p1}, Ln0/g0/b;->w(C)I
-
-    move-result p1
-
-    if-eq p1, p3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-.end method
-
-.method public final c(Ljava/util/List;Z)Ljava/util/List;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;Z)",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1, v0}, Ljava/util/ArrayList;-><init>(I)V
-
-    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v3, v0
-
-    check-cast v3, Ljava/lang/String;
-
-    if-eqz v3, :cond_0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v7, 0x3
-
-    move-object v2, p0
-
-    move v6, p2
-
-    invoke-static/range {v2 .. v7}, Ln0/w$b;->d(Ln0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_1
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {v1}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    const-string p2, "Collections.unmodifiableList(result)"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-.end method
-
-.method public final e(Ljava/lang/String;)Ljava/util/List;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    if-gt v2, v3, :cond_3
-
-    const/16 v3, 0x26
-
-    const/4 v4, 0x4
-
-    invoke-static {p1, v3, v2, v1, v4}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v3
-
-    const/4 v5, -0x1
-
-    if-ne v3, v5, :cond_0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    :cond_0
-    const/16 v6, 0x3d
-
-    invoke-static {p1, v6, v2, v1, v4}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v4
-
-    const-string v6, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    if-eq v4, v5, :cond_2
-
-    if-le v4, v3, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p1, v2, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v4, v4, 0x1
-
-    invoke-virtual {p1, v4, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_2
-    :goto_1
-    invoke-virtual {p1, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v2, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    :goto_2
-    add-int/lit8 v2, v3, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/w.smali b/com.discord/smali_classes2/n0/w.smali
deleted file mode 100644
index 949902401c..0000000000
--- a/com.discord/smali_classes2/n0/w.smali
+++ /dev/null
@@ -1,1078 +0,0 @@
-.class public final Ln0/w;
-.super Ljava/lang/Object;
-.source "HttpUrl.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/w$a;,
-        Ln0/w$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final k:[C
-
-.field public static final l:Ln0/w$b;
-
-
-# instance fields
-.field public final a:Z
-
-.field public final b:Ljava/lang/String;
-
-.field public final c:Ljava/lang/String;
-
-.field public final d:Ljava/lang/String;
-
-.field public final e:Ljava/lang/String;
-
-.field public final f:I
-
-.field public final g:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final h:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final i:Ljava/lang/String;
-
-.field public final j:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ln0/w$b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/w$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/w;->l:Ln0/w$b;
-
-    const/16 v0, 0x10
-
-    new-array v0, v0, [C
-
-    fill-array-data v0, :array_0
-
-    sput-object v0, Ln0/w;->k:[C
-
-    return-void
-
-    :array_0
-    .array-data 2
-        0x30s
-        0x31s
-        0x32s
-        0x33s
-        0x34s
-        0x35s
-        0x36s
-        0x37s
-        0x38s
-        0x39s
-        0x41s
-        0x42s
-        0x43s
-        0x44s
-        0x45s
-        0x46s
-    .end array-data
-.end method
-
-.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            "I",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/w;->b:Ljava/lang/String;
-
-    iput-object p2, p0, Ln0/w;->c:Ljava/lang/String;
-
-    iput-object p3, p0, Ln0/w;->d:Ljava/lang/String;
-
-    iput-object p4, p0, Ln0/w;->e:Ljava/lang/String;
-
-    iput p5, p0, Ln0/w;->f:I
-
-    iput-object p6, p0, Ln0/w;->g:Ljava/util/List;
-
-    iput-object p7, p0, Ln0/w;->h:Ljava/util/List;
-
-    iput-object p8, p0, Ln0/w;->i:Ljava/lang/String;
-
-    iput-object p9, p0, Ln0/w;->j:Ljava/lang/String;
-
-    const-string p2, "https"
-
-    invoke-static {p1, p2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    iput-boolean p1, p0, Ln0/w;->a:Z
-
-    return-void
-.end method
-
-.method public static final h(Ljava/lang/String;)Ln0/w;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p0, :cond_0
-
-    :try_start_0
-    new-instance v1, Ln0/w$a;
-
-    invoke-direct {v1}, Ln0/w$a;-><init>()V
-
-    invoke-virtual {v1, v0, p0}, Ln0/w$a;->e(Ln0/w;Ljava/lang/String;)Ln0/w$a;
-
-    invoke-virtual {v1}, Ln0/w$a;->b()Ln0/w;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-object v0
-
-    :cond_0
-    const-string p0, "$this$toHttpUrlOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public final a()Ljava/lang/String;
-    .locals 6
-
-    iget-object v0, p0, Ln0/w;->d:Ljava/lang/String;
-
-    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    const-string v0, ""
-
-    return-object v0
-
-    :cond_1
-    iget-object v0, p0, Ln0/w;->j:Ljava/lang/String;
-
-    const/16 v3, 0x3a
-
-    iget-object v4, p0, Ln0/w;->b:Ljava/lang/String;
-
-    invoke-virtual {v4}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    add-int/lit8 v4, v4, 0x3
-
-    const/4 v5, 0x4
-
-    invoke-static {v0, v3, v4, v2, v5}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v0
-
-    add-int/2addr v0, v1
-
-    iget-object v1, p0, Ln0/w;->j:Ljava/lang/String;
-
-    const/16 v3, 0x40
-
-    const/4 v4, 0x6
-
-    invoke-static {v1, v3, v2, v2, v4}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v1
-
-    iget-object v2, p0, Ln0/w;->j:Ljava/lang/String;
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final b()Ljava/lang/String;
-    .locals 5
-
-    iget-object v0, p0, Ln0/w;->j:Ljava/lang/String;
-
-    iget-object v1, p0, Ln0/w;->b:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0x3
-
-    const/16 v2, 0x2f
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x4
-
-    invoke-static {v0, v2, v1, v3, v4}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v0
-
-    iget-object v1, p0, Ln0/w;->j:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    const-string v3, "?#"
-
-    invoke-static {v1, v3, v0, v2}, Ln0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
-
-    move-result v1
-
-    iget-object v2, p0, Ln0/w;->j:Ljava/lang/String;
-
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final c()Ljava/util/List;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Ln0/w;->j:Ljava/lang/String;
-
-    iget-object v1, p0, Ln0/w;->b:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0x3
-
-    const/16 v2, 0x2f
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x4
-
-    invoke-static {v0, v2, v1, v3, v4}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v0
-
-    iget-object v1, p0, Ln0/w;->j:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    const-string v4, "?#"
-
-    invoke-static {v1, v4, v0, v3}, Ln0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
-
-    move-result v1
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
-
-    :goto_0
-    if-ge v0, v1, :cond_1
-
-    add-int/lit8 v0, v0, 0x1
-
-    iget-object v4, p0, Ln0/w;->j:Ljava/lang/String;
-
-    invoke-static {v4, v2, v0, v1}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result v4
-
-    iget-object v5, p0, Ln0/w;->j:Ljava/lang/String;
-
-    if-eqz v5, :cond_0
-
-    invoke-virtual {v5, v0, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v5, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v0, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-interface {v3, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    move v0, v4
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    return-object v3
-.end method
-
-.method public final d()Ljava/lang/String;
-    .locals 4
-
-    iget-object v0, p0, Ln0/w;->h:Ljava/util/List;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    return-object v0
-
-    :cond_0
-    iget-object v0, p0, Ln0/w;->j:Ljava/lang/String;
-
-    const/16 v1, 0x3f
-
-    const/4 v2, 0x6
-
-    const/4 v3, 0x0
-
-    invoke-static {v0, v1, v3, v3, v2}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iget-object v1, p0, Ln0/w;->j:Ljava/lang/String;
-
-    const/16 v2, 0x23
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    invoke-static {v1, v2, v0, v3}, Ln0/g0/b;->h(Ljava/lang/String;CII)I
-
-    move-result v1
-
-    iget-object v2, p0, Ln0/w;->j:Ljava/lang/String;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_1
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final e()Ljava/lang/String;
-    .locals 4
-
-    iget-object v0, p0, Ln0/w;->c:Ljava/lang/String;
-
-    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    const-string v0, ""
-
-    return-object v0
-
-    :cond_1
-    iget-object v0, p0, Ln0/w;->b:Ljava/lang/String;
-
-    invoke-virtual {v0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x3
-
-    iget-object v1, p0, Ln0/w;->j:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->length()I
-
-    move-result v2
-
-    const-string v3, ":@"
-
-    invoke-static {v1, v3, v0, v2}, Ln0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
-
-    move-result v1
-
-    iget-object v2, p0, Ln0/w;->j:Ljava/lang/String;
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object v0
-
-    :cond_2
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Ln0/w;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ln0/w;
-
-    iget-object p1, p1, Ln0/w;->j:Ljava/lang/String;
-
-    iget-object v0, p0, Ln0/w;->j:Ljava/lang/String;
-
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public final f()Ln0/w$a;
-    .locals 7
-
-    new-instance v0, Ln0/w$a;
-
-    invoke-direct {v0}, Ln0/w$a;-><init>()V
-
-    iget-object v1, p0, Ln0/w;->b:Ljava/lang/String;
-
-    iput-object v1, v0, Ln0/w$a;->a:Ljava/lang/String;
-
-    invoke-virtual {p0}, Ln0/w;->e()Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/w$a;->b:Ljava/lang/String;
-
-    invoke-virtual {p0}, Ln0/w;->a()Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Ln0/w$a;->c:Ljava/lang/String;
-
-    iget-object v1, p0, Ln0/w;->e:Ljava/lang/String;
-
-    iput-object v1, v0, Ln0/w$a;->d:Ljava/lang/String;
-
-    iget v1, p0, Ln0/w;->f:I
-
-    iget-object v2, p0, Ln0/w;->b:Ljava/lang/String;
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_6
-
-    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
-
-    move-result v4
-
-    const v5, 0x310888    # 4.503E-39f
-
-    const/4 v6, -0x1
-
-    if-eq v4, v5, :cond_1
-
-    const v5, 0x5f008eb
-
-    if-eq v4, v5, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v4, "https"
-
-    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    const/16 v2, 0x1bb
-
-    goto :goto_1
-
-    :cond_1
-    const-string v4, "http"
-
-    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    const/16 v2, 0x50
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    const/4 v2, -0x1
-
-    :goto_1
-    if-eq v1, v2, :cond_3
-
-    iget v6, p0, Ln0/w;->f:I
-
-    :cond_3
-    iput v6, v0, Ln0/w$a;->e:I
-
-    iget-object v1, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->clear()V
-
-    iget-object v1, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-virtual {p0}, Ln0/w;->c()Ljava/util/List;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
-
-    invoke-virtual {p0}, Ln0/w;->d()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ln0/w$a;->d(Ljava/lang/String;)Ln0/w$a;
-
-    iget-object v1, p0, Ln0/w;->i:Ljava/lang/String;
-
-    if-nez v1, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    iget-object v1, p0, Ln0/w;->j:Ljava/lang/String;
-
-    const/16 v2, 0x23
-
-    const/4 v3, 0x6
-
-    const/4 v4, 0x0
-
-    invoke-static {v1, v2, v4, v4, v3}, Lj0/t/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0x1
-
-    iget-object v2, p0, Ln0/w;->j:Ljava/lang/String;
-
-    if-eqz v2, :cond_5
-
-    invoke-virtual {v2, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    const-string v1, "(this as java.lang.String).substring(startIndex)"
-
-    invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_2
-    iput-object v3, v0, Ln0/w$a;->h:Ljava/lang/String;
-
-    return-object v0
-
-    :cond_5
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type java.lang.String"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string v0, "scheme"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-.end method
-
-.method public final g(Ljava/lang/String;)Ln0/w$a;
-    .locals 2
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_0
-
-    :try_start_0
-    new-instance v1, Ln0/w$a;
-
-    invoke-direct {v1}, Ln0/w$a;-><init>()V
-
-    invoke-virtual {v1, p0, p1}, Ln0/w$a;->e(Ln0/w;Ljava/lang/String;)Ln0/w$a;
-    :try_end_0
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
-
-    move-object v0, v1
-
-    :catch_0
-    return-object v0
-
-    :cond_0
-    const-string p1, "link"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Ln0/w;->j:Ljava/lang/String;
-
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final i()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "/..."
-
-    invoke-virtual {p0, v0}, Ln0/w;->g(Ljava/lang/String;)Ln0/w$a;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const-string v1, ""
-
-    invoke-virtual {v0, v1}, Ln0/w$a;->g(Ljava/lang/String;)Ln0/w$a;
-
-    invoke-virtual {v0, v1}, Ln0/w$a;->f(Ljava/lang/String;)Ln0/w$a;
-
-    invoke-virtual {v0}, Ln0/w$a;->b()Ln0/w;
-
-    move-result-object v0
-
-    iget-object v0, v0, Ln0/w;->j:Ljava/lang/String;
-
-    return-object v0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public final j(Ljava/lang/String;)Ln0/w;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p0, p1}, Ln0/w;->g(Ljava/lang/String;)Ln0/w$a;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Ln0/w$a;->b()Ln0/w;
-
-    move-result-object v0
-
-    :cond_0
-    return-object v0
-
-    :cond_1
-    const-string p1, "link"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final k()Ljava/net/URI;
-    .locals 17
-
-    invoke-virtual/range {p0 .. p0}, Ln0/w;->f()Ln0/w$a;
-
-    move-result-object v0
-
-    iget-object v1, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_0
-
-    iget-object v4, v0, Ln0/w$a;->f:Ljava/util/List;
-
-    sget-object v5, Ln0/w;->l:Ln0/w$b;
-
-    invoke-interface {v4, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/String;
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v10, 0x1
-
-    const/4 v11, 0x1
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xe3
-
-    const-string v9, "[]"
-
-    invoke-static/range {v5 .. v15}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-interface {v4, v3, v5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, v0, Ln0/w$a;->g:Ljava/util/List;
-
-    const/4 v3, 0x0
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v4
-
-    :goto_1
-    if-ge v2, v4, :cond_2
-
-    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    move-object v7, v5
-
-    check-cast v7, Ljava/lang/String;
-
-    if-eqz v7, :cond_1
-
-    sget-object v6, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/4 v11, 0x1
-
-    const/4 v12, 0x1
-
-    const/4 v13, 0x1
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0xc3
-
-    const-string v10, "\\^`{|}"
-
-    invoke-static/range {v6 .. v16}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v5
-
-    goto :goto_2
-
-    :cond_1
-    move-object v5, v3
-
-    :goto_2
-    invoke-interface {v1, v2, v5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    iget-object v6, v0, Ln0/w$a;->h:Ljava/lang/String;
-
-    if-eqz v6, :cond_3
-
-    sget-object v5, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v10, 0x1
-
-    const/4 v11, 0x1
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x1
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xa3
-
-    const-string v9, " \"#<>\\^`{|}"
-
-    invoke-static/range {v5 .. v15}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v3
-
-    :cond_3
-    iput-object v3, v0, Ln0/w$a;->h:Ljava/lang/String;
-
-    invoke-virtual {v0}, Ln0/w$a;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    :try_start_0
-    new-instance v0, Ljava/net/URI;
-
-    invoke-direct {v0, v1}, Ljava/net/URI;-><init>(Ljava/lang/String;)V
-    :try_end_0
-    .catch Ljava/net/URISyntaxException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_3
-
-    :catch_0
-    move-exception v0
-
-    :try_start_1
-    new-instance v2, Lkotlin/text/Regex;
-
-    const-string v3, "[\\u0000-\\u001F\\u007F-\\u009F\\p{javaWhitespace}]"
-
-    invoke-direct {v2, v3}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
-
-    const-string v3, ""
-
-    invoke-virtual {v2, v1, v3}, Lkotlin/text/Regex;->replace(Ljava/lang/CharSequence;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v1}, Ljava/net/URI;->create(Ljava/lang/String;)Ljava/net/URI;
-
-    move-result-object v1
-
-    const-string v2, "URI.create(stripped)"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    :try_end_1
-    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
-
-    move-object v0, v1
-
-    :goto_3
-    return-object v0
-
-    :catch_1
-    new-instance v1, Ljava/lang/RuntimeException;
-
-    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
-
-.method public final l()Ljava/net/URL;
-    .locals 2
-
-    :try_start_0
-    new-instance v0, Ljava/net/URL;
-
-    iget-object v1, p0, Ln0/w;->j:Ljava/lang/String;
-
-    invoke-direct {v0, v1}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
-    :try_end_0
-    .catch Ljava/net/MalformedURLException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/lang/RuntimeException;
-
-    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Ln0/w;->j:Ljava/lang/String;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/x$a.smali b/com.discord/smali_classes2/n0/x$a.smali
deleted file mode 100644
index 80fe50a201..0000000000
--- a/com.discord/smali_classes2/n0/x$a.smali
+++ /dev/null
@@ -1,276 +0,0 @@
-.class public final Ln0/x$a;
-.super Ljava/lang/Object;
-.source "OkHttpClient.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/x;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public A:I
-
-.field public B:I
-
-.field public a:Ln0/q;
-
-.field public b:Ln0/l;
-
-.field public final c:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lokhttp3/Interceptor;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lokhttp3/Interceptor;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public e:Ln0/t$b;
-
-.field public f:Z
-
-.field public g:Ln0/c;
-
-.field public h:Z
-
-.field public i:Z
-
-.field public j:Ln0/p;
-
-.field public k:Ln0/d;
-
-.field public l:Ln0/s;
-
-.field public m:Ljava/net/Proxy;
-
-.field public n:Ljava/net/ProxySelector;
-
-.field public o:Ln0/c;
-
-.field public p:Ljavax/net/SocketFactory;
-
-.field public q:Ljavax/net/ssl/SSLSocketFactory;
-
-.field public r:Ljavax/net/ssl/X509TrustManager;
-
-.field public s:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/m;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public t:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "+",
-            "Ln0/y;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public u:Ljavax/net/ssl/HostnameVerifier;
-
-.field public v:Ln0/h;
-
-.field public w:Ln0/g0/j/c;
-
-.field public x:I
-
-.field public y:I
-
-.field public z:I
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ln0/q;
-
-    invoke-direct {v0}, Ln0/q;-><init>()V
-
-    iput-object v0, p0, Ln0/x$a;->a:Ln0/q;
-
-    new-instance v0, Ln0/l;
-
-    invoke-direct {v0}, Ln0/l;-><init>()V
-
-    iput-object v0, p0, Ln0/x$a;->b:Ln0/l;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Ln0/x$a;->c:Ljava/util/List;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Ln0/x$a;->d:Ljava/util/List;
-
-    sget-object v0, Ln0/t;->a:Ln0/t;
-
-    new-instance v1, Ln0/g0/a;
-
-    invoke-direct {v1, v0}, Ln0/g0/a;-><init>(Ln0/t;)V
-
-    iput-object v1, p0, Ln0/x$a;->e:Ln0/t$b;
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Ln0/x$a;->f:Z
-
-    sget-object v1, Ln0/c;->a:Ln0/c;
-
-    iput-object v1, p0, Ln0/x$a;->g:Ln0/c;
-
-    iput-boolean v0, p0, Ln0/x$a;->h:Z
-
-    iput-boolean v0, p0, Ln0/x$a;->i:Z
-
-    sget-object v0, Ln0/p;->a:Ln0/p;
-
-    iput-object v0, p0, Ln0/x$a;->j:Ln0/p;
-
-    sget-object v0, Ln0/s;->a:Ln0/s;
-
-    iput-object v0, p0, Ln0/x$a;->l:Ln0/s;
-
-    sget-object v0, Ln0/c;->a:Ln0/c;
-
-    iput-object v0, p0, Ln0/x$a;->o:Ln0/c;
-
-    invoke-static {}, Ljavax/net/SocketFactory;->getDefault()Ljavax/net/SocketFactory;
-
-    move-result-object v0
-
-    const-string v1, "SocketFactory.getDefault()"
-
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v0, p0, Ln0/x$a;->p:Ljavax/net/SocketFactory;
-
-    sget-object v0, Ln0/x;->H:Ln0/x$b;
-
-    sget-object v0, Ln0/x;->G:Ljava/util/List;
-
-    iput-object v0, p0, Ln0/x$a;->s:Ljava/util/List;
-
-    sget-object v0, Ln0/x;->H:Ln0/x$b;
-
-    sget-object v0, Ln0/x;->F:Ljava/util/List;
-
-    iput-object v0, p0, Ln0/x$a;->t:Ljava/util/List;
-
-    sget-object v0, Ln0/g0/j/d;->a:Ln0/g0/j/d;
-
-    iput-object v0, p0, Ln0/x$a;->u:Ljavax/net/ssl/HostnameVerifier;
-
-    sget-object v0, Ln0/h;->c:Ln0/h;
-
-    iput-object v0, p0, Ln0/x$a;->v:Ln0/h;
-
-    const/16 v0, 0x2710
-
-    iput v0, p0, Ln0/x$a;->y:I
-
-    iput v0, p0, Ln0/x$a;->z:I
-
-    iput v0, p0, Ln0/x$a;->A:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(JLjava/util/concurrent/TimeUnit;)Ln0/x$a;
-    .locals 1
-
-    if-eqz p3, :cond_0
-
-    const-string v0, "timeout"
-
-    invoke-static {v0, p1, p2, p3}, Ln0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
-
-    move-result p1
-
-    iput p1, p0, Ln0/x$a;->z:I
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "unit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final b(Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/X509TrustManager;)Ln0/x$a;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    if-eqz p2, :cond_0
-
-    iput-object p1, p0, Ln0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
-
-    sget-object p1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object p1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {p1, p2}, Ln0/g0/h/f;->b(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/c;
-
-    move-result-object p1
-
-    iput-object p1, p0, Ln0/x$a;->w:Ln0/g0/j/c;
-
-    iput-object p2, p0, Ln0/x$a;->r:Ljavax/net/ssl/X509TrustManager;
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "trustManager"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "sslSocketFactory"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/x$b.smali b/com.discord/smali_classes2/n0/x$b.smali
deleted file mode 100644
index b8e66424b1..0000000000
--- a/com.discord/smali_classes2/n0/x$b.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Ln0/x$b;
-.super Ljava/lang/Object;
-.source "OkHttpClient.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/x;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/n0/x.smali b/com.discord/smali_classes2/n0/x.smali
deleted file mode 100644
index 396c18d689..0000000000
--- a/com.discord/smali_classes2/n0/x.smali
+++ /dev/null
@@ -1,1074 +0,0 @@
-.class public Ln0/x;
-.super Ljava/lang/Object;
-.source "OkHttpClient.kt"
-
-# interfaces
-.implements Ljava/lang/Cloneable;
-.implements Ln0/f$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/x$a;,
-        Ln0/x$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final F:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/y;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final G:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/m;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final H:Ln0/x$b;
-
-
-# instance fields
-.field public final A:I
-
-.field public final B:I
-
-.field public final C:I
-
-.field public final D:I
-
-.field public final E:I
-
-.field public final d:Ln0/q;
-
-.field public final e:Ln0/l;
-
-.field public final f:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lokhttp3/Interceptor;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lokhttp3/Interceptor;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final h:Ln0/t$b;
-
-.field public final i:Z
-
-.field public final j:Ln0/c;
-
-.field public final k:Z
-
-.field public final l:Z
-
-.field public final m:Ln0/p;
-
-.field public final n:Ln0/d;
-
-.field public final o:Ln0/s;
-
-.field public final p:Ljava/net/Proxy;
-
-.field public final q:Ljava/net/ProxySelector;
-
-.field public final r:Ln0/c;
-
-.field public final s:Ljavax/net/SocketFactory;
-
-.field public final t:Ljavax/net/ssl/SSLSocketFactory;
-
-.field public final u:Ljavax/net/ssl/X509TrustManager;
-
-.field public final v:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/m;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final w:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ln0/y;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final x:Ljavax/net/ssl/HostnameVerifier;
-
-.field public final y:Ln0/h;
-
-.field public final z:Ln0/g0/j/c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    new-instance v0, Ln0/x$b;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/x$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/x;->H:Ln0/x$b;
-
-    const/4 v0, 0x2
-
-    new-array v1, v0, [Ln0/y;
-
-    sget-object v2, Ln0/y;->g:Ln0/y;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    sget-object v2, Ln0/y;->e:Ln0/y;
-
-    const/4 v4, 0x1
-
-    aput-object v2, v1, v4
-
-    invoke-static {v1}, Ln0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    sput-object v1, Ln0/x;->F:Ljava/util/List;
-
-    new-array v0, v0, [Ln0/m;
-
-    sget-object v1, Ln0/m;->g:Ln0/m;
-
-    aput-object v1, v0, v3
-
-    sget-object v1, Ln0/m;->h:Ln0/m;
-
-    aput-object v1, v0, v4
-
-    invoke-static {v0}, Ln0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    sput-object v0, Ln0/x;->G:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    new-instance v0, Ln0/x$a;
-
-    invoke-direct {v0}, Ln0/x$a;-><init>()V
-
-    invoke-direct {p0, v0}, Ln0/x;-><init>(Ln0/x$a;)V
-
-    return-void
-.end method
-
-.method public constructor <init>(Ln0/x$a;)V
-    .locals 6
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-object v0, p1, Ln0/x$a;->a:Ln0/q;
-
-    iput-object v0, p0, Ln0/x;->d:Ln0/q;
-
-    iget-object v0, p1, Ln0/x$a;->b:Ln0/l;
-
-    iput-object v0, p0, Ln0/x;->e:Ln0/l;
-
-    iget-object v0, p1, Ln0/x$a;->c:Ljava/util/List;
-
-    invoke-static {v0}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object v0
-
-    iput-object v0, p0, Ln0/x;->f:Ljava/util/List;
-
-    iget-object v0, p1, Ln0/x$a;->d:Ljava/util/List;
-
-    invoke-static {v0}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object v0
-
-    iput-object v0, p0, Ln0/x;->g:Ljava/util/List;
-
-    iget-object v0, p1, Ln0/x$a;->e:Ln0/t$b;
-
-    iput-object v0, p0, Ln0/x;->h:Ln0/t$b;
-
-    iget-boolean v0, p1, Ln0/x$a;->f:Z
-
-    iput-boolean v0, p0, Ln0/x;->i:Z
-
-    iget-object v0, p1, Ln0/x$a;->g:Ln0/c;
-
-    iput-object v0, p0, Ln0/x;->j:Ln0/c;
-
-    iget-boolean v0, p1, Ln0/x$a;->h:Z
-
-    iput-boolean v0, p0, Ln0/x;->k:Z
-
-    iget-boolean v0, p1, Ln0/x$a;->i:Z
-
-    iput-boolean v0, p0, Ln0/x;->l:Z
-
-    iget-object v0, p1, Ln0/x$a;->j:Ln0/p;
-
-    iput-object v0, p0, Ln0/x;->m:Ln0/p;
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Ln0/x;->n:Ln0/d;
-
-    iget-object v1, p1, Ln0/x$a;->l:Ln0/s;
-
-    iput-object v1, p0, Ln0/x;->o:Ln0/s;
-
-    iget-object v1, p1, Ln0/x$a;->m:Ljava/net/Proxy;
-
-    iput-object v1, p0, Ln0/x;->p:Ljava/net/Proxy;
-
-    if-eqz v1, :cond_0
-
-    sget-object v1, Ln0/g0/i/a;->a:Ln0/g0/i/a;
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v1, p1, Ln0/x$a;->n:Ljava/net/ProxySelector;
-
-    if-eqz v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Ljava/net/ProxySelector;->getDefault()Ljava/net/ProxySelector;
-
-    move-result-object v1
-
-    :goto_0
-    if-eqz v1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    sget-object v1, Ln0/g0/i/a;->a:Ln0/g0/i/a;
-
-    :goto_1
-    iput-object v1, p0, Ln0/x;->q:Ljava/net/ProxySelector;
-
-    iget-object v1, p1, Ln0/x$a;->o:Ln0/c;
-
-    iput-object v1, p0, Ln0/x;->r:Ln0/c;
-
-    iget-object v1, p1, Ln0/x$a;->p:Ljavax/net/SocketFactory;
-
-    iput-object v1, p0, Ln0/x;->s:Ljavax/net/SocketFactory;
-
-    iget-object v1, p1, Ln0/x$a;->s:Ljava/util/List;
-
-    iput-object v1, p0, Ln0/x;->v:Ljava/util/List;
-
-    iget-object v2, p1, Ln0/x$a;->t:Ljava/util/List;
-
-    iput-object v2, p0, Ln0/x;->w:Ljava/util/List;
-
-    iget-object v2, p1, Ln0/x$a;->u:Ljavax/net/ssl/HostnameVerifier;
-
-    iput-object v2, p0, Ln0/x;->x:Ljavax/net/ssl/HostnameVerifier;
-
-    iget v2, p1, Ln0/x$a;->x:I
-
-    iput v2, p0, Ln0/x;->A:I
-
-    iget v2, p1, Ln0/x$a;->y:I
-
-    iput v2, p0, Ln0/x;->B:I
-
-    iget v2, p1, Ln0/x$a;->z:I
-
-    iput v2, p0, Ln0/x;->C:I
-
-    iget v2, p1, Ln0/x$a;->A:I
-
-    iput v2, p0, Ln0/x;->D:I
-
-    iget v2, p1, Ln0/x$a;->B:I
-
-    iput v2, p0, Ln0/x;->E:I
-
-    iget-object v2, p1, Ln0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
-
-    const/4 v3, 0x1
-
-    if-nez v2, :cond_9
-
-    instance-of v2, v1, Ljava/util/Collection;
-
-    const/4 v4, 0x0
-
-    if-eqz v2, :cond_3
-
-    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_4
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_5
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ln0/m;
-
-    iget-boolean v2, v2, Ln0/m;->a:Z
-
-    if-eqz v2, :cond_4
-
-    const/4 v1, 0x0
-
-    goto :goto_3
-
-    :cond_5
-    :goto_2
-    const/4 v1, 0x1
-
-    :goto_3
-    if-eqz v1, :cond_6
-
-    goto :goto_4
-
-    :cond_6
-    sget-object v1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {v1}, Ln0/g0/h/f;->n()Ljavax/net/ssl/X509TrustManager;
-
-    move-result-object v1
-
-    iput-object v1, p0, Ln0/x;->u:Ljavax/net/ssl/X509TrustManager;
-
-    sget-object v1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    iget-object v2, p0, Ln0/x;->u:Ljavax/net/ssl/X509TrustManager;
-
-    invoke-virtual {v1, v2}, Ln0/g0/h/f;->f(Ljavax/net/ssl/X509TrustManager;)V
-
-    iget-object v1, p0, Ln0/x;->u:Ljavax/net/ssl/X509TrustManager;
-
-    if-eqz v1, :cond_8
-
-    :try_start_0
-    sget-object v2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v2, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {v2}, Ln0/g0/h/f;->m()Ljavax/net/ssl/SSLContext;
-
-    move-result-object v2
-
-    new-array v5, v3, [Ljavax/net/ssl/TrustManager;
-
-    aput-object v1, v5, v4
-
-    invoke-virtual {v2, v0, v5, v0}, Ljavax/net/ssl/SSLContext;->init([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;Ljava/security/SecureRandom;)V
-
-    invoke-virtual {v2}, Ljavax/net/ssl/SSLContext;->getSocketFactory()Ljavax/net/ssl/SSLSocketFactory;
-
-    move-result-object v1
-
-    const-string v2, "sslContext.socketFactory"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-    :try_end_0
-    .catch Ljava/security/GeneralSecurityException; {:try_start_0 .. :try_end_0} :catch_0
-
-    iput-object v1, p0, Ln0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
-
-    iget-object v1, p0, Ln0/x;->u:Ljavax/net/ssl/X509TrustManager;
-
-    if-eqz v1, :cond_7
-
-    sget-object v2, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v2, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    invoke-virtual {v2, v1}, Ln0/g0/h/f;->b(Ljavax/net/ssl/X509TrustManager;)Ln0/g0/j/c;
-
-    move-result-object v1
-
-    iput-object v1, p0, Ln0/x;->z:Ln0/g0/j/c;
-
-    goto :goto_5
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Ljava/lang/AssertionError;
-
-    const-string v1, "No System TLS"
-
-    invoke-direct {v0, v1, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_9
-    :goto_4
-    iget-object v1, p1, Ln0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
-
-    iput-object v1, p0, Ln0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
-
-    iget-object v1, p1, Ln0/x$a;->w:Ln0/g0/j/c;
-
-    iput-object v1, p0, Ln0/x;->z:Ln0/g0/j/c;
-
-    iget-object v1, p1, Ln0/x$a;->r:Ljavax/net/ssl/X509TrustManager;
-
-    iput-object v1, p0, Ln0/x;->u:Ljavax/net/ssl/X509TrustManager;
-
-    :goto_5
-    iget-object v1, p0, Ln0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
-
-    if-eqz v1, :cond_a
-
-    sget-object v1, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v1, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    iget-object v2, p0, Ln0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
-
-    invoke-virtual {v1, v2}, Ln0/g0/h/f;->d(Ljavax/net/ssl/SSLSocketFactory;)V
-
-    :cond_a
-    iget-object p1, p1, Ln0/x$a;->v:Ln0/h;
-
-    iget-object v1, p0, Ln0/x;->z:Ln0/g0/j/c;
-
-    iget-object v2, p1, Ln0/h;->b:Ln0/g0/j/c;
-
-    invoke-static {v2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_b
-
-    goto :goto_6
-
-    :cond_b
-    new-instance v2, Ln0/h;
-
-    iget-object p1, p1, Ln0/h;->a:Ljava/util/Set;
-
-    invoke-direct {v2, p1, v1}, Ln0/h;-><init>(Ljava/util/Set;Ln0/g0/j/c;)V
-
-    move-object p1, v2
-
-    :goto_6
-    iput-object p1, p0, Ln0/x;->y:Ln0/h;
-
-    iget-object p1, p0, Ln0/x;->f:Ljava/util/List;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.collections.List<okhttp3.Interceptor?>"
-
-    if-eqz p1, :cond_f
-
-    invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    xor-int/2addr p1, v3
-
-    if-eqz p1, :cond_e
-
-    iget-object p1, p0, Ln0/x;->g:Ljava/util/List;
-
-    if-eqz p1, :cond_d
-
-    invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    xor-int/2addr p1, v3
-
-    if-eqz p1, :cond_c
-
-    return-void
-
-    :cond_c
-    const-string p1, "Null network interceptor: "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget-object v0, p0, Ln0/x;->g:Ljava/util/List;
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_d
-    new-instance p1, Lkotlin/TypeCastException;
-
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_e
-    const-string p1, "Null interceptor: "
-
-    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    iget-object v0, p0, Ln0/x;->f:Ljava/util/List;
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_f
-    new-instance p1, Lkotlin/TypeCastException;
-
-    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public b(Ln0/a0;)Ln0/f;
-    .locals 3
-
-    const/4 v0, 0x0
-
-    new-instance v1, Ln0/z;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v1, p0, p1, v0, v2}, Ln0/z;-><init>(Ln0/x;Ln0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    new-instance p1, Ln0/g0/d/m;
-
-    invoke-direct {p1, p0, v1}, Ln0/g0/d/m;-><init>(Ln0/x;Ln0/f;)V
-
-    iput-object p1, v1, Ln0/z;->d:Ln0/g0/d/m;
-
-    return-object v1
-.end method
-
-.method public c()Ln0/x$a;
-    .locals 4
-
-    new-instance v0, Ln0/x$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0}, Ln0/x$a;-><init>()V
-
-    iget-object v2, p0, Ln0/x;->d:Ln0/q;
-
-    iput-object v2, v0, Ln0/x$a;->a:Ln0/q;
-
-    iget-object v2, p0, Ln0/x;->e:Ln0/l;
-
-    iput-object v2, v0, Ln0/x$a;->b:Ln0/l;
-
-    iget-object v2, v0, Ln0/x$a;->c:Ljava/util/List;
-
-    iget-object v3, p0, Ln0/x;->f:Ljava/util/List;
-
-    invoke-static {v2, v3}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-
-    iget-object v2, v0, Ln0/x$a;->d:Ljava/util/List;
-
-    iget-object v3, p0, Ln0/x;->g:Ljava/util/List;
-
-    invoke-static {v2, v3}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-
-    iget-object v2, p0, Ln0/x;->h:Ln0/t$b;
-
-    iput-object v2, v0, Ln0/x$a;->e:Ln0/t$b;
-
-    iget-boolean v2, p0, Ln0/x;->i:Z
-
-    iput-boolean v2, v0, Ln0/x$a;->f:Z
-
-    iget-object v2, p0, Ln0/x;->j:Ln0/c;
-
-    iput-object v2, v0, Ln0/x$a;->g:Ln0/c;
-
-    iget-boolean v2, p0, Ln0/x;->k:Z
-
-    iput-boolean v2, v0, Ln0/x$a;->h:Z
-
-    iget-boolean v2, p0, Ln0/x;->l:Z
-
-    iput-boolean v2, v0, Ln0/x$a;->i:Z
-
-    iget-object v2, p0, Ln0/x;->m:Ln0/p;
-
-    iput-object v2, v0, Ln0/x$a;->j:Ln0/p;
-
-    iput-object v1, v0, Ln0/x$a;->k:Ln0/d;
-
-    iget-object v1, p0, Ln0/x;->o:Ln0/s;
-
-    iput-object v1, v0, Ln0/x$a;->l:Ln0/s;
-
-    iget-object v1, p0, Ln0/x;->p:Ljava/net/Proxy;
-
-    iput-object v1, v0, Ln0/x$a;->m:Ljava/net/Proxy;
-
-    iget-object v1, p0, Ln0/x;->q:Ljava/net/ProxySelector;
-
-    iput-object v1, v0, Ln0/x$a;->n:Ljava/net/ProxySelector;
-
-    iget-object v1, p0, Ln0/x;->r:Ln0/c;
-
-    iput-object v1, v0, Ln0/x$a;->o:Ln0/c;
-
-    iget-object v1, p0, Ln0/x;->s:Ljavax/net/SocketFactory;
-
-    iput-object v1, v0, Ln0/x$a;->p:Ljavax/net/SocketFactory;
-
-    iget-object v1, p0, Ln0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
-
-    iput-object v1, v0, Ln0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
-
-    iget-object v1, p0, Ln0/x;->u:Ljavax/net/ssl/X509TrustManager;
-
-    iput-object v1, v0, Ln0/x$a;->r:Ljavax/net/ssl/X509TrustManager;
-
-    iget-object v1, p0, Ln0/x;->v:Ljava/util/List;
-
-    iput-object v1, v0, Ln0/x$a;->s:Ljava/util/List;
-
-    iget-object v1, p0, Ln0/x;->w:Ljava/util/List;
-
-    iput-object v1, v0, Ln0/x$a;->t:Ljava/util/List;
-
-    iget-object v1, p0, Ln0/x;->x:Ljavax/net/ssl/HostnameVerifier;
-
-    iput-object v1, v0, Ln0/x$a;->u:Ljavax/net/ssl/HostnameVerifier;
-
-    iget-object v1, p0, Ln0/x;->y:Ln0/h;
-
-    iput-object v1, v0, Ln0/x$a;->v:Ln0/h;
-
-    iget-object v1, p0, Ln0/x;->z:Ln0/g0/j/c;
-
-    iput-object v1, v0, Ln0/x$a;->w:Ln0/g0/j/c;
-
-    iget v1, p0, Ln0/x;->A:I
-
-    iput v1, v0, Ln0/x$a;->x:I
-
-    iget v1, p0, Ln0/x;->B:I
-
-    iput v1, v0, Ln0/x$a;->y:I
-
-    iget v1, p0, Ln0/x;->C:I
-
-    iput v1, v0, Ln0/x$a;->z:I
-
-    iget v1, p0, Ln0/x;->D:I
-
-    iput v1, v0, Ln0/x$a;->A:I
-
-    iget v1, p0, Ln0/x;->E:I
-
-    iput v1, v0, Ln0/x$a;->B:I
-
-    return-object v0
-.end method
-
-.method public clone()Ljava/lang/Object;
-    .locals 1
-
-    invoke-super {p0}, Ljava/lang/Object;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public d(Ln0/a0;Lokhttp3/WebSocketListener;)Lokhttp3/WebSocket;
-    .locals 8
-
-    const/4 v0, 0x0
-
-    if-eqz p2, :cond_a
-
-    new-instance v7, Ln0/g0/k/a;
-
-    new-instance v4, Ljava/util/Random;
-
-    invoke-direct {v4}, Ljava/util/Random;-><init>()V
-
-    iget v1, p0, Ln0/x;->E:I
-
-    int-to-long v5, v1
-
-    move-object v1, v7
-
-    move-object v2, p1
-
-    move-object v3, p2
-
-    invoke-direct/range {v1 .. v6}, Ln0/g0/k/a;-><init>(Ln0/a0;Lokhttp3/WebSocketListener;Ljava/util/Random;J)V
-
-    invoke-virtual {p0}, Ln0/x;->c()Ln0/x$a;
-
-    move-result-object p1
-
-    sget-object p2, Ln0/t;->a:Ln0/t;
-
-    new-instance v1, Ln0/g0/a;
-
-    invoke-direct {v1, p2}, Ln0/g0/a;-><init>(Ln0/t;)V
-
-    iput-object v1, p1, Ln0/x$a;->e:Ln0/t$b;
-
-    sget-object p2, Ln0/g0/k/a;->x:Ljava/util/List;
-
-    sget-object v1, Ln0/y;->h:Ln0/y;
-
-    if-eqz p2, :cond_9
-
-    invoke-static {p2}, Lj0/i/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
-
-    move-result-object v2
-
-    move-object v3, v2
-
-    check-cast v3, Ljava/util/ArrayList;
-
-    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x1
-
-    if-nez v4, :cond_1
-
-    sget-object v4, Ln0/y;->e:Ln0/y;
-
-    invoke-virtual {v3, v4}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v4, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 v4, 0x1
-
-    :goto_1
-    if-eqz v4, :cond_8
-
-    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
-
-    move-result v1
-
-    if-gt v1, v6, :cond_3
-
-    :cond_2
-    const/4 v5, 0x1
-
-    :cond_3
-    if-eqz v5, :cond_7
-
-    sget-object v1, Ln0/y;->d:Ln0/y;
-
-    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    xor-int/2addr v1, v6
-
-    if-eqz v1, :cond_6
-
-    invoke-virtual {v3, v0}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    xor-int/2addr v1, v6
-
-    if-eqz v1, :cond_5
-
-    sget-object v1, Ln0/y;->f:Ln0/y;
-
-    invoke-virtual {v3, v1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
-
-    invoke-static {p2}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p2
-
-    const-string v1, "Collections.unmodifiableList(protocols)"
-
-    invoke-static {p2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p2, p1, Ln0/x$a;->t:Ljava/util/List;
-
-    new-instance p2, Ln0/x;
-
-    invoke-direct {p2, p1}, Ln0/x;-><init>(Ln0/x$a;)V
-
-    iget-object p1, v7, Ln0/g0/k/a;->t:Ln0/a0;
-
-    if-eqz p1, :cond_4
-
-    new-instance v1, Ln0/a0$a;
-
-    invoke-direct {v1, p1}, Ln0/a0$a;-><init>(Ln0/a0;)V
-
-    const-string p1, "Upgrade"
-
-    const-string v2, "websocket"
-
-    invoke-virtual {v1, p1, v2}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    const-string v2, "Connection"
-
-    invoke-virtual {v1, v2, p1}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    iget-object p1, v7, Ln0/g0/k/a;->a:Ljava/lang/String;
-
-    const-string v2, "Sec-WebSocket-Key"
-
-    invoke-virtual {v1, v2, p1}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    const-string p1, "Sec-WebSocket-Version"
-
-    const-string v2, "13"
-
-    invoke-virtual {v1, p1, v2}, Ln0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    invoke-virtual {v1}, Ln0/a0$a;->b()Ln0/a0;
-
-    move-result-object p1
-
-    new-instance v1, Ln0/z;
-
-    invoke-direct {v1, p2, p1, v6, v0}, Ln0/z;-><init>(Ln0/x;Ln0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    new-instance v0, Ln0/g0/d/m;
-
-    invoke-direct {v0, p2, v1}, Ln0/g0/d/m;-><init>(Ln0/x;Ln0/f;)V
-
-    iput-object v0, v1, Ln0/z;->d:Ln0/g0/d/m;
-
-    iput-object v1, v7, Ln0/g0/k/a;->b:Ln0/f;
-
-    new-instance p2, Ln0/g0/k/b;
-
-    invoke-direct {p2, v7, p1}, Ln0/g0/k/b;-><init>(Ln0/g0/k/a;Ln0/a0;)V
-
-    invoke-virtual {v1, p2}, Ln0/z;->F(Ln0/g;)V
-
-    return-object v7
-
-    :cond_4
-    throw v0
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "protocols must not contain null"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p2, "protocols must not contain http/1.0: "
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_7
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p2, "protocols containing h2_prior_knowledge cannot use other protocols: "
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_8
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string p2, "protocols must contain h2_prior_knowledge or http/1.1: "
-
-    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_9
-    const-string p1, "protocols"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    const-string p1, "listener"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/y$a.smali b/com.discord/smali_classes2/n0/y$a.smali
deleted file mode 100644
index 016cc54fca..0000000000
--- a/com.discord/smali_classes2/n0/y$a.smali
+++ /dev/null
@@ -1,147 +0,0 @@
-.class public final Ln0/y$a;
-.super Ljava/lang/Object;
-.source "Protocol.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/y;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/String;)Ln0/y;
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    sget-object v0, Ln0/y;->i:Ln0/y;
-
-    sget-object v1, Ln0/y;->f:Ln0/y;
-
-    sget-object v2, Ln0/y;->g:Ln0/y;
-
-    sget-object v3, Ln0/y;->h:Ln0/y;
-
-    sget-object v4, Ln0/y;->e:Ln0/y;
-
-    sget-object v5, Ln0/y;->d:Ln0/y;
-
-    if-eqz p1, :cond_6
-
-    iget-object v6, v5, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-static {p1, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_0
-
-    move-object v0, v5
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v5, v4, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-static {p1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    move-object v0, v4
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v4, v3, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-static {p1, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_2
-
-    move-object v0, v3
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v3, v2, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-static {p1, v3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_3
-
-    move-object v0, v2
-
-    goto :goto_0
-
-    :cond_3
-    iget-object v2, v1, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-static {p1, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    move-object v0, v1
-
-    goto :goto_0
-
-    :cond_4
-    iget-object v1, v0, Ln0/y;->protocol:Ljava/lang/String;
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    :goto_0
-    return-object v0
-
-    :cond_5
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "Unexpected protocol: "
-
-    invoke-static {v1, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    const-string p1, "protocol"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/n0/y.smali b/com.discord/smali_classes2/n0/y.smali
deleted file mode 100644
index 9edfb3e1b8..0000000000
--- a/com.discord/smali_classes2/n0/y.smali
+++ /dev/null
@@ -1,202 +0,0 @@
-.class public final enum Ln0/y;
-.super Ljava/lang/Enum;
-.source "Protocol.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/y$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Ln0/y;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Ln0/y;
-
-.field public static final enum e:Ln0/y;
-
-.field public static final enum f:Ln0/y;
-
-.field public static final enum g:Ln0/y;
-
-.field public static final enum h:Ln0/y;
-
-.field public static final enum i:Ln0/y;
-
-.field public static final synthetic j:[Ln0/y;
-
-.field public static final k:Ln0/y$a;
-
-
-# instance fields
-.field public final protocol:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 5
-
-    const/4 v0, 0x6
-
-    new-array v0, v0, [Ln0/y;
-
-    new-instance v1, Ln0/y;
-
-    const-string v2, "HTTP_1_0"
-
-    const/4 v3, 0x0
-
-    const-string v4, "http/1.0"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/y;->d:Ln0/y;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/y;
-
-    const-string v2, "HTTP_1_1"
-
-    const/4 v3, 0x1
-
-    const-string v4, "http/1.1"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/y;->e:Ln0/y;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/y;
-
-    const-string v2, "SPDY_3"
-
-    const/4 v3, 0x2
-
-    const-string v4, "spdy/3.1"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/y;->f:Ln0/y;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/y;
-
-    const-string v2, "HTTP_2"
-
-    const/4 v3, 0x3
-
-    const-string v4, "h2"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/y;->g:Ln0/y;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/y;
-
-    const-string v2, "H2_PRIOR_KNOWLEDGE"
-
-    const/4 v3, 0x4
-
-    const-string v4, "h2_prior_knowledge"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/y;->h:Ln0/y;
-
-    aput-object v1, v0, v3
-
-    new-instance v1, Ln0/y;
-
-    const-string v2, "QUIC"
-
-    const/4 v3, 0x5
-
-    const-string v4, "quic"
-
-    invoke-direct {v1, v2, v3, v4}, Ln0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-
-    sput-object v1, Ln0/y;->i:Ln0/y;
-
-    aput-object v1, v0, v3
-
-    sput-object v0, Ln0/y;->j:[Ln0/y;
-
-    new-instance v0, Ln0/y$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ln0/y$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Ln0/y;->k:Ln0/y$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;ILjava/lang/String;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    iput-object p3, p0, Ln0/y;->protocol:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Ln0/y;
-    .locals 1
-
-    const-class v0, Ln0/y;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Ln0/y;
-
-    return-object p0
-.end method
-
-.method public static values()[Ln0/y;
-    .locals 1
-
-    sget-object v0, Ln0/y;->j:[Ln0/y;
-
-    invoke-virtual {v0}, [Ln0/y;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Ln0/y;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Ln0/y;->protocol:Ljava/lang/String;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/n0/z$a.smali b/com.discord/smali_classes2/n0/z$a.smali
deleted file mode 100644
index ea64d46cbb..0000000000
--- a/com.discord/smali_classes2/n0/z$a.smali
+++ /dev/null
@@ -1,260 +0,0 @@
-.class public final Ln0/z$a;
-.super Ljava/lang/Object;
-.source "RealCall.kt"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/z;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public volatile d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field public final e:Ln0/g;
-
-.field public final synthetic f:Ln0/z;
-
-
-# direct methods
-.method public constructor <init>(Ln0/z;Ln0/g;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/g;",
-            ")V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Ln0/z$a;->f:Ln0/z;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p2, p0, Ln0/z$a;->e:Ln0/g;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    const/4 p2, 0x0
-
-    invoke-direct {p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
-
-    iput-object p1, p0, Ln0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v0, v0, Ln0/z;->g:Ln0/a0;
-
-    iget-object v0, v0, Ln0/a0;->b:Ln0/w;
-
-    iget-object v0, v0, Ln0/w;->e:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public run()V
-    .locals 7
-
-    const-string v0, "OkHttp "
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v1, v1, Ln0/z;->g:Ln0/a0;
-
-    iget-object v1, v1, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v1}, Ln0/w;->i()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    const-string v2, "currentThread"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    :try_start_0
-    iget-object v0, p0, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v0, v0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, v0, Ln0/g0/d/m;->c:Ln0/g0/d/m$b;
-
-    invoke-virtual {v0}, Lo0/b;->i()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v0, p0, Ln0/z$a;->f:Ln0/z;
-
-    invoke-virtual {v0}, Ln0/z;->b()Lokhttp3/Response;
-
-    move-result-object v0
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const/4 v3, 0x1
-
-    :try_start_2
-    iget-object v4, p0, Ln0/z$a;->e:Ln0/g;
-
-    iget-object v5, p0, Ln0/z$a;->f:Ln0/z;
-
-    invoke-interface {v4, v5, v0}, Ln0/g;->a(Ln0/f;Lokhttp3/Response;)V
-    :try_end_2
-    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :try_start_3
-    iget-object v0, p0, Ln0/z$a;->f:Ln0/z;
-
-    :goto_0
-    iget-object v0, v0, Ln0/z;->f:Ln0/x;
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    goto :goto_3
-
-    :catch_0
-    move-exception v0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_4
-
-    :catch_1
-    move-exception v0
-
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eqz v3, :cond_0
-
-    :try_start_4
-    sget-object v3, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
-
-    sget-object v3, Ln0/g0/h/f;->a:Ln0/g0/h/f;
-
-    const/4 v4, 0x4
-
-    new-instance v5, Ljava/lang/StringBuilder;
-
-    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v6, "Callback failure for "
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v6, p0, Ln0/z$a;->f:Ln0/z;
-
-    invoke-virtual {v6}, Ln0/z;->c()Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-virtual {v3, v4, v5, v0}, Ln0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :cond_0
-    iget-object v3, p0, Ln0/z$a;->e:Ln0/g;
-
-    iget-object v4, p0, Ln0/z$a;->f:Ln0/z;
-
-    invoke-interface {v3, v4, v0}, Ln0/g;->b(Ln0/f;Ljava/io/IOException;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    :goto_2
-    :try_start_5
-    iget-object v0, p0, Ln0/z$a;->f:Ln0/z;
-
-    goto :goto_0
-
-    :goto_3
-    iget-object v0, v0, Ln0/x;->d:Ln0/q;
-
-    invoke-virtual {v0, p0}, Ln0/q;->c(Ln0/z$a;)V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-void
-
-    :goto_4
-    :try_start_6
-    iget-object v3, p0, Ln0/z$a;->f:Ln0/z;
-
-    iget-object v3, v3, Ln0/z;->f:Ln0/x;
-
-    iget-object v3, v3, Ln0/x;->d:Ln0/q;
-
-    invoke-virtual {v3, p0}, Ln0/q;->c(Ln0/z$a;)V
-
-    throw v0
-
-    :cond_1
-    const-string v0, "transmitter"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_1
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :catchall_1
-    move-exception v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/n0/z.smali b/com.discord/smali_classes2/n0/z.smali
deleted file mode 100644
index ce312c5893..0000000000
--- a/com.discord/smali_classes2/n0/z.smali
+++ /dev/null
@@ -1,739 +0,0 @@
-.class public final Ln0/z;
-.super Ljava/lang/Object;
-.source "RealCall.kt"
-
-# interfaces
-.implements Ln0/f;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Ln0/z$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Ln0/g0/d/m;
-
-.field public e:Z
-
-.field public final f:Ln0/x;
-
-.field public final g:Ln0/a0;
-
-.field public final h:Z
-
-
-# direct methods
-.method public constructor <init>(Ln0/x;Ln0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Ln0/z;->f:Ln0/x;
-
-    iput-object p2, p0, Ln0/z;->g:Ln0/a0;
-
-    iput-boolean p3, p0, Ln0/z;->h:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public F(Ln0/g;)V
-    .locals 6
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/z;->e:Z
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_6
-
-    iput-boolean v1, p0, Ln0/z;->e:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    monitor-exit p0
-
-    iget-object v0, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_5
-
-    invoke-virtual {v0}, Ln0/g0/d/m;->b()V
-
-    iget-object v0, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v0, v0, Ln0/x;->d:Ln0/q;
-
-    new-instance v2, Ln0/z$a;
-
-    invoke-direct {v2, p0, p1}, Ln0/z$a;-><init>(Ln0/z;Ln0/g;)V
-
-    monitor-enter v0
-
-    :try_start_1
-    iget-object p1, v0, Ln0/q;->d:Ljava/util/ArrayDeque;
-
-    invoke-virtual {p1, v2}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-
-    iget-object p1, v2, Ln0/z$a;->f:Ln0/z;
-
-    iget-boolean p1, p1, Ln0/z;->h:Z
-
-    if-nez p1, :cond_4
-
-    invoke-virtual {v2}, Ln0/z$a;->a()Ljava/lang/String;
-
-    move-result-object p1
-
-    iget-object v3, v0, Ln0/q;->e:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v3}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :cond_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ln0/z$a;
-
-    invoke-virtual {v4}, Ln0/z$a;->a()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-static {v5, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_0
-
-    :goto_0
-    move-object v1, v4
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v3, v0, Ln0/q;->d:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v3}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :cond_2
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_3
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ln0/z$a;
-
-    invoke-virtual {v4}, Ln0/z$a;->a()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-static {v5, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    goto :goto_0
-
-    :cond_3
-    :goto_1
-    if-eqz v1, :cond_4
-
-    iget-object p1, v1, Ln0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    iput-object p1, v2, Ln0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :cond_4
-    monitor-exit v0
-
-    invoke-virtual {v0}, Ln0/q;->d()Z
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-
-    :cond_5
-    const-string p1, "transmitter"
-
-    invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_6
-    :try_start_2
-    const-string p1, "Already Executed"
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method public final b()Lokhttp3/Response;
-    .locals 13
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    iget-object v0, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v0, v0, Ln0/x;->f:Ljava/util/List;
-
-    invoke-static {v1, v0}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-
-    new-instance v0, Ln0/g0/e/i;
-
-    iget-object v2, p0, Ln0/z;->f:Ln0/x;
-
-    invoke-direct {v0, v2}, Ln0/g0/e/i;-><init>(Ln0/x;)V
-
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    new-instance v0, Ln0/g0/e/a;
-
-    iget-object v2, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v2, v2, Ln0/x;->m:Ln0/p;
-
-    invoke-direct {v0, v2}, Ln0/g0/e/a;-><init>(Ln0/p;)V
-
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    new-instance v0, Ln0/g0/c/a;
-
-    iget-object v2, p0, Ln0/z;->f:Ln0/x;
-
-    const/4 v10, 0x0
-
-    if-eqz v2, :cond_9
-
-    invoke-direct {v0}, Ln0/g0/c/a;-><init>()V
-
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    sget-object v0, Ln0/g0/d/a;->b:Ln0/g0/d/a;
-
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    iget-boolean v0, p0, Ln0/z;->h:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v0, v0, Ln0/x;->g:Ljava/util/List;
-
-    invoke-static {v1, v0}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
-
-    :cond_0
-    new-instance v0, Ln0/g0/e/b;
-
-    iget-boolean v2, p0, Ln0/z;->h:Z
-
-    invoke-direct {v0, v2}, Ln0/g0/e/b;-><init>(Z)V
-
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    new-instance v11, Ln0/g0/e/g;
-
-    iget-object v2, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    const-string v12, "transmitter"
-
-    if-eqz v2, :cond_8
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    iget-object v5, p0, Ln0/z;->g:Ln0/a0;
-
-    iget-object v0, p0, Ln0/z;->f:Ln0/x;
-
-    iget v7, v0, Ln0/x;->B:I
-
-    iget v8, v0, Ln0/x;->C:I
-
-    iget v9, v0, Ln0/x;->D:I
-
-    move-object v0, v11
-
-    move-object v6, p0
-
-    invoke-direct/range {v0 .. v9}, Ln0/g0/e/g;-><init>(Ljava/util/List;Ln0/g0/d/m;Ln0/g0/d/c;ILn0/a0;Ln0/f;III)V
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iget-object v1, p0, Ln0/z;->g:Ln0/a0;
-
-    invoke-virtual {v11, v1}, Ln0/g0/e/g;->d(Ln0/a0;)Lokhttp3/Response;
-
-    move-result-object v1
-
-    iget-object v2, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v2, :cond_3
-
-    invoke-virtual {v2}, Ln0/g0/d/m;->f()Z
-
-    move-result v2
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v2, :cond_2
-
-    iget-object v0, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0, v10}, Ln0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
-
-    return-object v1
-
-    :cond_1
-    invoke-static {v12}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_2
-    :try_start_1
-    invoke-static {v1}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
-
-    new-instance v1, Ljava/io/IOException;
-
-    const-string v2, "Canceled"
-
-    invoke-direct {v1, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_3
-    invoke-static {v12}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v10
-
-    :catchall_0
-    move-exception v1
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    :try_start_2
-    iget-object v1, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v1, :cond_5
-
-    invoke-virtual {v1, v0}, Ln0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    if-nez v0, :cond_4
-
-    new-instance v0, Lkotlin/TypeCastException;
-
-    const-string v1, "null cannot be cast to non-null type kotlin.Throwable"
-
-    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    throw v0
-
-    :cond_5
-    invoke-static {v12}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v10
-
-    :catchall_1
-    move-exception v0
-
-    move-object v1, v0
-
-    const/4 v0, 0x1
-
-    :goto_0
-    if-nez v0, :cond_7
-
-    iget-object v0, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-nez v0, :cond_6
-
-    invoke-static {v12}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_6
-    invoke-virtual {v0, v10}, Ln0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
-
-    :cond_7
-    throw v1
-
-    :cond_8
-    invoke-static {v12}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v10
-
-    :cond_9
-    throw v10
-.end method
-
-.method public final c()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v1}, Ln0/g0/d/m;->f()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    const-string v1, "canceled "
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, ""
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Ln0/z;->h:Z
-
-    if-eqz v1, :cond_1
-
-    const-string v1, "web socket"
-
-    goto :goto_1
-
-    :cond_1
-    const-string v1, "call"
-
-    :goto_1
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " to "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Ln0/z;->g:Ln0/a0;
-
-    iget-object v1, v1, Ln0/a0;->b:Ln0/w;
-
-    invoke-virtual {v1}, Ln0/w;->i()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_2
-    const-string v0, "transmitter"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public cancel()V
-    .locals 1
-
-    iget-object v0, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/d/m;->c()V
-
-    return-void
-
-    :cond_0
-    const-string v0, "transmitter"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public clone()Ljava/lang/Object;
-    .locals 5
-
-    iget-object v0, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v1, p0, Ln0/z;->g:Ln0/a0;
-
-    iget-boolean v2, p0, Ln0/z;->h:Z
-
-    const/4 v3, 0x0
-
-    if-eqz v0, :cond_1
-
-    if-eqz v1, :cond_0
-
-    new-instance v4, Ln0/z;
-
-    invoke-direct {v4, v0, v1, v2, v3}, Ln0/z;-><init>(Ln0/x;Ln0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    new-instance v1, Ln0/g0/d/m;
-
-    invoke-direct {v1, v0, v4}, Ln0/g0/d/m;-><init>(Ln0/x;Ln0/f;)V
-
-    iput-object v1, v4, Ln0/z;->d:Ln0/g0/d/m;
-
-    return-object v4
-
-    :cond_0
-    const-string v0, "originalRequest"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-
-    :cond_1
-    const-string v0, "client"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
-.end method
-
-.method public execute()Lokhttp3/Response;
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Ln0/z;->e:Z
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_2
-
-    iput-boolean v1, p0, Ln0/z;->e:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    monitor-exit p0
-
-    iget-object v0, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, v0, Ln0/g0/d/m;->c:Ln0/g0/d/m$b;
-
-    invoke-virtual {v0}, Lo0/b;->i()V
-
-    iget-object v0, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/d/m;->b()V
-
-    :try_start_1
-    iget-object v0, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v0, v0, Ln0/x;->d:Ln0/q;
-
-    monitor-enter v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :try_start_2
-    iget-object v1, v0, Ln0/q;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v1, p0}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :try_start_3
-    monitor-exit v0
-
-    invoke-virtual {p0}, Ln0/z;->b()Lokhttp3/Response;
-
-    move-result-object v0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    iget-object v1, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v1, v1, Ln0/x;->d:Ln0/q;
-
-    iget-object v2, v1, Ln0/q;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v1, v2, p0}, Ln0/q;->b(Ljava/util/Deque;Ljava/lang/Object;)V
-
-    return-object v0
-
-    :catchall_0
-    move-exception v1
-
-    :try_start_4
-    monitor-exit v0
-
-    throw v1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    iget-object v1, p0, Ln0/z;->f:Ln0/x;
-
-    iget-object v1, v1, Ln0/x;->d:Ln0/q;
-
-    iget-object v2, v1, Ln0/q;->f:Ljava/util/ArrayDeque;
-
-    invoke-virtual {v1, v2, p0}, Ln0/q;->b(Ljava/util/Deque;Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_0
-    const-string v0, "transmitter"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    const-string v0, "transmitter"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_2
-    :try_start_5
-    const-string v0, "Already Executed"
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
-
-    :catchall_2
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public k()Z
-    .locals 1
-
-    iget-object v0, p0, Ln0/z;->d:Ln0/g0/d/m;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Ln0/g0/d/m;->f()Z
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    const-string v0, "transmitter"
-
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public p()Ln0/a0;
-    .locals 1
-
-    iget-object v0, p0, Ln0/z;->g:Ln0/a0;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/o0/a.smali b/com.discord/smali_classes2/o0/a.smali
index 0da50393e9..5a98633d81 100644
--- a/com.discord/smali_classes2/o0/a.smali
+++ b/com.discord/smali_classes2/o0/a.smali
@@ -1,266 +1,643 @@
 .class public final Lo0/a;
 .super Ljava/lang/Object;
-.source "-Base64.kt"
+.source "Address.kt"
 
 
-# static fields
-.field public static final a:[B
+# instance fields
+.field public final a:Lo0/w;
+
+.field public final b:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/y;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/m;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final d:Lo0/s;
+
+.field public final e:Ljavax/net/SocketFactory;
+
+.field public final f:Ljavax/net/ssl/SSLSocketFactory;
+
+.field public final g:Ljavax/net/ssl/HostnameVerifier;
+
+.field public final h:Lo0/h;
+
+.field public final i:Lo0/c;
+
+.field public final j:Ljava/net/Proxy;
+
+.field public final k:Ljava/net/ProxySelector;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 2
+.method public constructor <init>(Ljava/lang/String;ILo0/s;Ljavax/net/SocketFactory;Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/HostnameVerifier;Lo0/h;Lo0/c;Ljava/net/Proxy;Ljava/util/List;Ljava/util/List;Ljava/net/ProxySelector;)V
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "I",
+            "Lo0/s;",
+            "Ljavax/net/SocketFactory;",
+            "Ljavax/net/ssl/SSLSocketFactory;",
+            "Ljavax/net/ssl/HostnameVerifier;",
+            "Lo0/h;",
+            "Lo0/c;",
+            "Ljava/net/Proxy;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;",
+            "Ljava/util/List<",
+            "Lo0/m;",
+            ">;",
+            "Ljava/net/ProxySelector;",
+            ")V"
+        }
+    .end annotation
 
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+    move-object v0, p0
 
-    const-string v1, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+    move-object v1, p1
 
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+    move v2, p2
 
-    move-result-object v0
+    move-object v3, p3
 
-    iget-object v0, v0, Lokio/ByteString;->data:[B
+    move-object/from16 v4, p4
 
-    sput-object v0, Lo0/a;->a:[B
+    move-object/from16 v5, p8
 
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+    move-object/from16 v6, p12
 
-    const-string v1, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
+    const-string v7, "uriHost"
 
-    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p1, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-void
-.end method
+    const-string v7, "dns"
 
-.method public static a([B[BI)Ljava/lang/String;
-    .locals 10
+    invoke-static {p3, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 p1, 0x1
+    const-string v7, "socketFactory"
 
-    and-int/2addr p2, p1
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v0, 0x0
+    const-string v7, "proxyAuthenticator"
 
-    if-eqz p2, :cond_0
+    invoke-static {v5, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lo0/a;->a:[B
+    const-string v7, "protocols"
+
+    move-object/from16 v8, p10
+
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "connectionSpecs"
+
+    move-object/from16 v9, p11
+
+    invoke-static {v9, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "proxySelector"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v3, v0, Lo0/a;->d:Lo0/s;
+
+    iput-object v4, v0, Lo0/a;->e:Ljavax/net/SocketFactory;
+
+    move-object/from16 v3, p5
+
+    iput-object v3, v0, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    move-object/from16 v3, p6
+
+    iput-object v3, v0, Lo0/a;->g:Ljavax/net/ssl/HostnameVerifier;
+
+    move-object/from16 v3, p7
+
+    iput-object v3, v0, Lo0/a;->h:Lo0/h;
+
+    iput-object v5, v0, Lo0/a;->i:Lo0/c;
+
+    move-object/from16 v3, p9
+
+    iput-object v3, v0, Lo0/a;->j:Ljava/net/Proxy;
+
+    iput-object v6, v0, Lo0/a;->k:Ljava/net/ProxySelector;
+
+    new-instance v3, Lo0/w$a;
+
+    invoke-direct {v3}, Lo0/w$a;-><init>()V
+
+    iget-object v4, v0, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    const-string v5, "https"
+
+    const-string v6, "http"
+
+    if-eqz v4, :cond_0
+
+    move-object v4, v5
 
     goto :goto_0
 
     :cond_0
-    move-object p2, v0
+    move-object v4, v6
 
     :goto_0
-    if-eqz p0, :cond_5
+    const-string v7, "scheme"
 
-    if-eqz p2, :cond_4
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    array-length v0, p0
+    const/4 v7, 0x1
 
-    const/4 v1, 0x2
+    invoke-static {v4, v6, v7}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
-    add-int/2addr v0, v1
+    move-result v10
 
-    div-int/lit8 v0, v0, 0x3
+    if-eqz v10, :cond_1
 
-    mul-int/lit8 v0, v0, 0x4
-
-    new-array v0, v0, [B
-
-    array-length v2, p0
-
-    array-length v3, p0
-
-    rem-int/lit8 v3, v3, 0x3
-
-    sub-int/2addr v2, v3
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_1
-    if-ge v3, v2, :cond_1
-
-    add-int/lit8 v5, v3, 0x1
-
-    aget-byte v3, p0, v3
-
-    add-int/lit8 v6, v5, 0x1
-
-    aget-byte v5, p0, v5
-
-    add-int/lit8 v7, v6, 0x1
-
-    aget-byte v6, p0, v6
-
-    add-int/lit8 v8, v4, 0x1
-
-    and-int/lit16 v9, v3, 0xff
-
-    shr-int/2addr v9, v1
-
-    aget-byte v9, p2, v9
-
-    aput-byte v9, v0, v4
-
-    add-int/lit8 v4, v8, 0x1
-
-    and-int/lit8 v3, v3, 0x3
-
-    shl-int/lit8 v3, v3, 0x4
-
-    and-int/lit16 v9, v5, 0xff
-
-    shr-int/lit8 v9, v9, 0x4
-
-    or-int/2addr v3, v9
-
-    aget-byte v3, p2, v3
-
-    aput-byte v3, v0, v8
-
-    add-int/lit8 v3, v4, 0x1
-
-    and-int/lit8 v5, v5, 0xf
-
-    shl-int/2addr v5, v1
-
-    and-int/lit16 v8, v6, 0xff
-
-    shr-int/lit8 v8, v8, 0x6
-
-    or-int/2addr v5, v8
-
-    aget-byte v5, p2, v5
-
-    aput-byte v5, v0, v4
-
-    add-int/lit8 v4, v3, 0x1
-
-    and-int/lit8 v5, v6, 0x3f
-
-    aget-byte v5, p2, v5
-
-    aput-byte v5, v0, v3
-
-    move v3, v7
+    iput-object v6, v3, Lo0/w$a;->a:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    array-length v5, p0
+    invoke-static {v4, v5, v7}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
-    sub-int/2addr v5, v2
+    move-result v6
 
-    const/16 v2, 0x3d
+    if-eqz v6, :cond_6
 
-    if-eq v5, p1, :cond_3
+    iput-object v5, v3, Lo0/w$a;->a:Ljava/lang/String;
 
-    if-eq v5, v1, :cond_2
+    :goto_1
+    const-string v4, "host"
+
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x7
+
+    move-object p3, v4
+
+    move-object/from16 p4, p1
+
+    move/from16 p5, v5
+
+    move/from16 p6, v6
+
+    move/from16 p7, v10
+
+    move/from16 p8, v11
+
+    invoke-static/range {p3 .. p8}, Lo0/w$b;->d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-static {v4}, Lf/n/a/k/a;->d0(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_5
+
+    iput-object v4, v3, Lo0/w$a;->d:Ljava/lang/String;
+
+    if-le v7, v2, :cond_2
 
     goto :goto_2
 
     :cond_2
-    add-int/lit8 p1, v3, 0x1
+    const v1, 0xffff
 
-    aget-byte v3, p0, v3
+    if-lt v1, v2, :cond_3
 
-    aget-byte p0, p0, p1
-
-    add-int/lit8 p1, v4, 0x1
-
-    and-int/lit16 v5, v3, 0xff
-
-    shr-int/2addr v5, v1
-
-    aget-byte v5, p2, v5
-
-    aput-byte v5, v0, v4
-
-    add-int/lit8 v4, p1, 0x1
-
-    and-int/lit8 v3, v3, 0x3
-
-    shl-int/lit8 v3, v3, 0x4
-
-    and-int/lit16 v5, p0, 0xff
-
-    shr-int/lit8 v5, v5, 0x4
-
-    or-int/2addr v3, v5
-
-    aget-byte v3, p2, v3
-
-    aput-byte v3, v0, p1
-
-    add-int/lit8 p1, v4, 0x1
-
-    and-int/lit8 p0, p0, 0xf
-
-    shl-int/2addr p0, v1
-
-    aget-byte p0, p2, p0
-
-    aput-byte p0, v0, v4
-
-    int-to-byte p0, v2
-
-    aput-byte p0, v0, p1
-
-    goto :goto_2
+    goto :goto_3
 
     :cond_3
-    aget-byte p0, p0, v3
-
-    add-int/lit8 p1, v4, 0x1
-
-    and-int/lit16 v3, p0, 0xff
-
-    shr-int/lit8 v1, v3, 0x2
-
-    aget-byte v1, p2, v1
-
-    aput-byte v1, v0, v4
-
-    add-int/lit8 v1, p1, 0x1
-
-    and-int/lit8 p0, p0, 0x3
-
-    shl-int/lit8 p0, p0, 0x4
-
-    aget-byte p0, p2, p0
-
-    aput-byte p0, v0, p1
-
-    add-int/lit8 p0, v1, 0x1
-
-    int-to-byte p1, v2
-
-    aput-byte p1, v0, v1
-
-    aput-byte p1, v0, p0
-
     :goto_2
-    sget-object p0, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    const/4 v7, 0x0
 
-    new-instance p1, Ljava/lang/String;
+    :goto_3
+    if-eqz v7, :cond_4
 
-    invoke-direct {p1, v0, p0}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
+    iput v2, v3, Lo0/w$a;->e:I
 
-    return-object p1
+    invoke-virtual {v3}, Lo0/w$a;->b()Lo0/w;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/a;->a:Lo0/w;
+
+    invoke-static/range {p10 .. p10}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/a;->b:Ljava/util/List;
+
+    invoke-static/range {p11 .. p11}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/a;->c:Ljava/util/List;
+
+    return-void
 
     :cond_4
-    const-string p0, "map"
+    const-string v1, "unexpected port: "
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
 
-    throw v0
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
 
     :cond_5
-    const-string p0, "$receiver"
+    new-instance v2, Ljava/lang/IllegalArgumentException;
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v3, "unexpected host: "
 
-    throw v0
+    invoke-static {v3, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_6
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "unexpected scheme: "
+
+    invoke-static {v2, v4}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+
+# virtual methods
+.method public final a(Lo0/a;)Z
+    .locals 2
+
+    const-string v0, "that"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/a;->d:Lo0/s;
+
+    iget-object v1, p1, Lo0/a;->d:Lo0/s;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->i:Lo0/c;
+
+    iget-object v1, p1, Lo0/a;->i:Lo0/c;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->b:Ljava/util/List;
+
+    iget-object v1, p1, Lo0/a;->b:Ljava/util/List;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->c:Ljava/util/List;
+
+    iget-object v1, p1, Lo0/a;->c:Ljava/util/List;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->k:Ljava/net/ProxySelector;
+
+    iget-object v1, p1, Lo0/a;->k:Ljava/net/ProxySelector;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->j:Ljava/net/Proxy;
+
+    iget-object v1, p1, Lo0/a;->j:Ljava/net/Proxy;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    iget-object v1, p1, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->g:Ljavax/net/ssl/HostnameVerifier;
+
+    iget-object v1, p1, Lo0/a;->g:Ljavax/net/ssl/HostnameVerifier;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->h:Lo0/h;
+
+    iget-object v1, p1, Lo0/a;->h:Lo0/h;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->a:Lo0/w;
+
+    iget v0, v0, Lo0/w;->f:I
+
+    iget-object p1, p1, Lo0/a;->a:Lo0/w;
+
+    iget p1, p1, Lo0/w;->f:I
+
+    if-ne v0, p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    instance-of v0, p1, Lo0/a;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/a;->a:Lo0/w;
+
+    check-cast p1, Lo0/a;
+
+    iget-object v1, p1, Lo0/a;->a:Lo0/w;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0, p1}, Lo0/a;->a(Lo0/a;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    iget-object v0, p0, Lo0/a;->a:Lo0/w;
+
+    invoke-virtual {v0}, Lo0/w;->hashCode()I
+
+    move-result v0
+
+    add-int/lit16 v0, v0, 0x20f
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/a;->d:Lo0/s;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-object v0, p0, Lo0/a;->i:Lo0/c;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/a;->b:Ljava/util/List;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-object v0, p0, Lo0/a;->c:Ljava/util/List;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/a;->k:Ljava/net/ProxySelector;
+
+    invoke-virtual {v1}, Ljava/net/ProxySelector;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-object v0, p0, Lo0/a;->j:Ljava/net/Proxy;
+
+    invoke-static {v0}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    invoke-static {v1}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-object v0, p0, Lo0/a;->g:Ljavax/net/ssl/HostnameVerifier;
+
+    invoke-static {v0}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/a;->h:Lo0/h;
+
+    invoke-static {v1}, Ljava/util/Objects;->hashCode(Ljava/lang/Object;)I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    return v1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "Address{"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/a;->a:Lo0/w;
+
+    iget-object v1, v1, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x3a
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/a;->a:Lo0/w;
+
+    iget v1, v1, Lo0/w;->f:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/a;->j:Ljava/net/Proxy;
+
+    if-eqz v1, :cond_0
+
+    const-string v1, "proxy="
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/a;->j:Ljava/net/Proxy;
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "proxySelector="
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/a;->k:Ljava/net/ProxySelector;
+
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)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_classes2/o0/a0$a.smali b/com.discord/smali_classes2/o0/a0$a.smali
new file mode 100644
index 0000000000..5e280831b2
--- /dev/null
+++ b/com.discord/smali_classes2/o0/a0$a.smali
@@ -0,0 +1,469 @@
+.class public Lo0/a0$a;
+.super Ljava/lang/Object;
+.source "Request.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/a0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Lo0/w;
+
+.field public b:Ljava/lang/String;
+
+.field public c:Lokhttp3/Headers$a;
+
+.field public d:Lokhttp3/RequestBody;
+
+.field public e:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+
+    iput-object v0, p0, Lo0/a0$a;->e:Ljava/util/Map;
+
+    const-string v0, "GET"
+
+    iput-object v0, p0, Lo0/a0$a;->b:Ljava/lang/String;
+
+    new-instance v0, Lokhttp3/Headers$a;
+
+    invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
+
+    iput-object v0, p0, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lo0/a0;)V
+    .locals 1
+
+    const-string v0, "request"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+
+    iput-object v0, p0, Lo0/a0$a;->e:Ljava/util/Map;
+
+    iget-object v0, p1, Lo0/a0;->b:Lo0/w;
+
+    iput-object v0, p0, Lo0/a0$a;->a:Lo0/w;
+
+    iget-object v0, p1, Lo0/a0;->c:Ljava/lang/String;
+
+    iput-object v0, p0, Lo0/a0$a;->b:Ljava/lang/String;
+
+    iget-object v0, p1, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    iput-object v0, p0, Lo0/a0$a;->d:Lokhttp3/RequestBody;
+
+    iget-object v0, p1, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p1, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-static {v0}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v0
+
+    :goto_0
+    iput-object v0, p0, Lo0/a0$a;->e:Ljava/util/Map;
+
+    iget-object p1, p1, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {p1}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/String;Ljava/lang/String;)Lo0/a0$a;
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    return-object p0
+.end method
+
+.method public b()Lo0/a0;
+    .locals 7
+
+    iget-object v1, p0, Lo0/a0$a;->a:Lo0/w;
+
+    if-eqz v1, :cond_0
+
+    iget-object v2, p0, Lo0/a0$a;->b:Ljava/lang/String;
+
+    iget-object v0, p0, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v3
+
+    iget-object v4, p0, Lo0/a0$a;->d:Lokhttp3/RequestBody;
+
+    iget-object v0, p0, Lo0/a0$a;->e:Ljava/util/Map;
+
+    invoke-static {v0}, Lo0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v5
+
+    new-instance v6, Lo0/a0;
+
+    move-object v0, v6
+
+    invoke-direct/range {v0 .. v5}, Lo0/a0;-><init>(Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+
+    return-object v6
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "url == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public c(Ljava/lang/String;Ljava/lang/String;)Lo0/a0$a;
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    return-object p0
+.end method
+
+.method public d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
+    .locals 3
+
+    const-string v0, "method"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-lez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_6
+
+    const-string v1, "method "
+
+    if-nez p2, :cond_4
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "POST"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const-string v0, "PUT"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const-string v0, "PATCH"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const-string v0, "PROPPATCH"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const-string v0, "REPORT"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    :cond_1
+    const/4 v2, 0x1
+
+    :cond_2
+    xor-int/lit8 v0, v2, 0x1
+
+    if-eqz v0, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const-string p2, " must have a request body."
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_4
+    invoke-static {p1}, Lo0/g0/e/f;->a(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    :goto_1
+    iput-object p1, p0, Lo0/a0$a;->b:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/a0$a;->d:Lokhttp3/RequestBody;
+
+    return-object p0
+
+    :cond_5
+    const-string p2, " must not have a request body."
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_6
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "method.isEmpty() == true"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public e(Ljava/lang/String;)Lo0/a0$a;
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v0, p1}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    return-object p0
+.end method
+
+.method public f(Ljava/lang/String;)Lo0/a0$a;
+    .locals 3
+
+    const-string v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ws:"
+
+    const/4 v1, 0x1
+
+    invoke-static {p1, v0, v1}, Lk0/u/k;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    const-string v2, "(this as java.lang.String).substring(startIndex)"
+
+    if-eqz v0, :cond_0
+
+    const-string v0, "http:"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    const/4 v1, 0x3
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "wss:"
+
+    invoke-static {p1, v0, v1}, Lk0/u/k;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const-string v0, "https:"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    const/4 v1, 0x4
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    :cond_1
+    :goto_0
+    const-string v0, "$this$toHttpUrl"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lo0/w$a;
+
+    invoke-direct {v0}, Lo0/w$a;-><init>()V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1, p1}, Lo0/w$a;->e(Lo0/w;Ljava/lang/String;)Lo0/w$a;
+
+    invoke-virtual {v0}, Lo0/w$a;->b()Lo0/w;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Lo0/a0$a;->g(Lo0/w;)Lo0/a0$a;
+
+    return-object p0
+.end method
+
+.method public g(Lo0/w;)Lo0/a0$a;
+    .locals 1
+
+    const-string v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/a0$a;->a:Lo0/w;
+
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/o0/a0.smali b/com.discord/smali_classes2/o0/a0.smali
new file mode 100644
index 0000000000..cf61df1662
--- /dev/null
+++ b/com.discord/smali_classes2/o0/a0.smali
@@ -0,0 +1,256 @@
+.class public final Lo0/a0;
+.super Ljava/lang/Object;
+.source "Request.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/a0$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Lo0/e;
+
+.field public final b:Lo0/w;
+
+.field public final c:Ljava/lang/String;
+
+.field public final d:Lokhttp3/Headers;
+
+.field public final e:Lokhttp3/RequestBody;
+
+.field public final f:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/w;",
+            "Ljava/lang/String;",
+            "Lokhttp3/Headers;",
+            "Lokhttp3/RequestBody;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Class<",
+            "*>;+",
+            "Ljava/lang/Object;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "method"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "headers"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "tags"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/a0;->b:Lo0/w;
+
+    iput-object p2, p0, Lo0/a0;->c:Ljava/lang/String;
+
+    iput-object p3, p0, Lo0/a0;->d:Lokhttp3/Headers;
+
+    iput-object p4, p0, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    iput-object p5, p0, Lo0/a0;->f:Ljava/util/Map;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Lo0/e;
+    .locals 2
+
+    iget-object v0, p0, Lo0/a0;->a:Lo0/e;
+
+    if-nez v0, :cond_0
+
+    sget-object v0, Lo0/e;->n:Lo0/e$a;
+
+    iget-object v1, p0, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {v0, v1}, Lo0/e$a;->b(Lokhttp3/Headers;)Lo0/e;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lo0/a0;->a:Lo0/e;
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public final b(Ljava/lang/String;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {v0, p1}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 6
+
+    const-string v0, "Request{method="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", url="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {v1}, Lokhttp3/Headers;->size()I
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    const-string v1, ", headers=["
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/a0;->d:Lokhttp3/Headers;
+
+    const/4 v2, 0x0
+
+    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 v3
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    add-int/lit8 v4, v2, 0x1
+
+    if-ltz v2, :cond_1
+
+    check-cast v3, Lkotlin/Pair;
+
+    iget-object v5, v3, Lkotlin/Pair;->first:Ljava/lang/Object;
+
+    check-cast v5, Ljava/lang/String;
+
+    iget-object v3, v3, Lkotlin/Pair;->second:Ljava/lang/Object;
+
+    check-cast v3, Ljava/lang/String;
+
+    if-lez v2, :cond_0
+
+    const-string v2, ", "
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_0
+    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x3a
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move v2, v4
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :cond_3
+    iget-object v1, p0, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v1
+
+    xor-int/lit8 v1, v1, 0x1
+
+    if-eqz v1, :cond_4
+
+    const-string v1, ", tags="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    :cond_4
+    const/16 v1, 0x7d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/b$a.smali b/com.discord/smali_classes2/o0/b$a.smali
index 4753bcc1ce..0a46b0011d 100644
--- a/com.discord/smali_classes2/o0/b$a.smali
+++ b/com.discord/smali_classes2/o0/b$a.smali
@@ -1,6 +1,9 @@
 .class public final Lo0/b$a;
 .super Ljava/lang/Object;
-.source "AsyncTimeout.kt"
+.source "Authenticator.kt"
+
+# interfaces
+.implements Lo0/c;
 
 
 # annotations
@@ -10,12 +13,12 @@
 
 .annotation system Ldalvik/annotation/InnerClass;
     accessFlags = 0x19
-    name = "a"
+    name = null
 .end annotation
 
 
 # direct methods
-.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public constructor <init>()V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -25,113 +28,14 @@
 
 
 # virtual methods
-.method public final a()Lo0/b;
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/InterruptedException;
-        }
-    .end annotation
+.method public a(Lo0/e0;Lokhttp3/Response;)Lo0/a0;
+    .locals 0
 
-    const-class v0, Lo0/b;
+    const-string p1, "response"
 
-    sget-object v1, Lo0/b;->j:Lo0/b;
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x0
+    const/4 p1, 0x0
 
-    if-eqz v1, :cond_5
-
-    iget-object v1, v1, Lo0/b;->f:Lo0/b;
-
-    if-nez v1, :cond_2
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v3
-
-    sget-wide v5, Lo0/b;->h:J
-
-    invoke-virtual {v0, v5, v6}, Ljava/lang/Object;->wait(J)V
-
-    sget-object v0, Lo0/b;->j:Lo0/b;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, v0, Lo0/b;->f:Lo0/b;
-
-    if-nez v0, :cond_0
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v0
-
-    sub-long/2addr v0, v3
-
-    sget-wide v3, Lo0/b;->i:J
-
-    cmp-long v5, v0, v3
-
-    if-ltz v5, :cond_0
-
-    sget-object v2, Lo0/b;->j:Lo0/b;
-
-    :cond_0
-    return-object v2
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_2
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v3
-
-    iget-wide v5, v1, Lo0/b;->g:J
-
-    sub-long/2addr v5, v3
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v7, v5, v3
-
-    if-lez v7, :cond_3
-
-    const-wide/32 v3, 0xf4240
-
-    div-long v7, v5, v3
-
-    mul-long v3, v3, v7
-
-    sub-long/2addr v5, v3
-
-    long-to-int v1, v5
-
-    invoke-virtual {v0, v7, v8, v1}, Ljava/lang/Object;->wait(JI)V
-
-    return-object v2
-
-    :cond_3
-    sget-object v0, Lo0/b;->j:Lo0/b;
-
-    if-eqz v0, :cond_4
-
-    iget-object v3, v1, Lo0/b;->f:Lo0/b;
-
-    iput-object v3, v0, Lo0/b;->f:Lo0/b;
-
-    iput-object v2, v1, Lo0/b;->f:Lo0/b;
-
-    return-object v1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/o0/b$b.smali b/com.discord/smali_classes2/o0/b$b.smali
deleted file mode 100644
index f61945fefa..0000000000
--- a/com.discord/smali_classes2/o0/b$b.smali
+++ /dev/null
@@ -1,86 +0,0 @@
-.class public final Lo0/b$b;
-.super Ljava/lang/Thread;
-.source "AsyncTimeout.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lo0/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    const-string v0, "Okio Watchdog"
-
-    invoke-direct {p0, v0}, Ljava/lang/Thread;-><init>(Ljava/lang/String;)V
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p0, v0}, Ljava/lang/Thread;->setDaemon(Z)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 3
-
-    :catch_0
-    :cond_0
-    :goto_0
-    :try_start_0
-    const-class v0, Lo0/b;
-
-    monitor-enter v0
-    :try_end_0
-    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :try_start_1
-    sget-object v1, Lo0/b;->k:Lo0/b$a;
-
-    invoke-virtual {v1}, Lo0/b$a;->a()Lo0/b;
-
-    move-result-object v1
-
-    sget-object v2, Lo0/b;->j:Lo0/b;
-
-    if-ne v1, v2, :cond_1
-
-    const/4 v1, 0x0
-
-    sput-object v1, Lo0/b;->j:Lo0/b;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    monitor-exit v0
-
-    return-void
-
-    :cond_1
-    monitor-exit v0
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Lo0/b;->n()V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-    :try_end_2
-    .catch Ljava/lang/InterruptedException; {:try_start_2 .. :try_end_2} :catch_0
-.end method
diff --git a/com.discord/smali_classes2/o0/b.smali b/com.discord/smali_classes2/o0/b.smali
deleted file mode 100644
index de75ff8db9..0000000000
--- a/com.discord/smali_classes2/o0/b.smali
+++ /dev/null
@@ -1,417 +0,0 @@
-.class public Lo0/b;
-.super Lo0/x;
-.source "AsyncTimeout.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lo0/b$b;,
-        Lo0/b$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final h:J
-
-.field public static final i:J
-
-.field public static j:Lo0/b;
-
-.field public static final k:Lo0/b$a;
-
-
-# instance fields
-.field public e:Z
-
-.field public f:Lo0/b;
-
-.field public g:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lo0/b$a;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lo0/b$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lo0/b;->k:Lo0/b$a;
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v1, 0x3c
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lo0/b;->h:J
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    sget-wide v1, Lo0/b;->h:J
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lo0/b;->i:J
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lo0/x;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final i()V
-    .locals 10
-
-    iget-boolean v0, p0, Lo0/b;->e:Z
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_b
-
-    iget-wide v2, p0, Lo0/x;->c:J
-
-    iget-boolean v0, p0, Lo0/x;->a:Z
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iput-boolean v1, p0, Lo0/b;->e:Z
-
-    const-class v1, Lo0/b;
-
-    monitor-enter v1
-
-    :try_start_0
-    sget-object v4, Lo0/b;->j:Lo0/b;
-
-    if-nez v4, :cond_1
-
-    new-instance v4, Lo0/b;
-
-    invoke-direct {v4}, Lo0/b;-><init>()V
-
-    sput-object v4, Lo0/b;->j:Lo0/b;
-
-    new-instance v4, Lo0/b$b;
-
-    invoke-direct {v4}, Lo0/b$b;-><init>()V
-
-    invoke-virtual {v4}, Ljava/lang/Thread;->start()V
-
-    :cond_1
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v4
-
-    if-eqz v6, :cond_2
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p0}, Lo0/x;->c()J
-
-    move-result-wide v6
-
-    sub-long/2addr v6, v4
-
-    invoke-static {v2, v3, v6, v7}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v2
-
-    add-long/2addr v2, v4
-
-    iput-wide v2, p0, Lo0/b;->g:J
-
-    goto :goto_0
-
-    :cond_2
-    if-eqz v6, :cond_3
-
-    add-long/2addr v2, v4
-
-    iput-wide v2, p0, Lo0/b;->g:J
-
-    goto :goto_0
-
-    :cond_3
-    if-eqz v0, :cond_a
-
-    invoke-virtual {p0}, Lo0/x;->c()J
-
-    move-result-wide v2
-
-    iput-wide v2, p0, Lo0/b;->g:J
-
-    :goto_0
-    iget-wide v2, p0, Lo0/b;->g:J
-
-    sub-long/2addr v2, v4
-
-    sget-object v0, Lo0/b;->j:Lo0/b;
-
-    const/4 v6, 0x0
-
-    if-eqz v0, :cond_9
-
-    :goto_1
-    iget-object v7, v0, Lo0/b;->f:Lo0/b;
-
-    if-eqz v7, :cond_7
-
-    iget-object v7, v0, Lo0/b;->f:Lo0/b;
-
-    if-eqz v7, :cond_6
-
-    iget-wide v7, v7, Lo0/b;->g:J
-
-    sub-long/2addr v7, v4
-
-    cmp-long v9, v2, v7
-
-    if-gez v9, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    iget-object v0, v0, Lo0/b;->f:Lo0/b;
-
-    if-eqz v0, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v6
-
-    :cond_6
-    :try_start_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v6
-
-    :cond_7
-    :goto_2
-    :try_start_2
-    iget-object v2, v0, Lo0/b;->f:Lo0/b;
-
-    iput-object v2, p0, Lo0/b;->f:Lo0/b;
-
-    iput-object p0, v0, Lo0/b;->f:Lo0/b;
-
-    sget-object v2, Lo0/b;->j:Lo0/b;
-
-    if-ne v0, v2, :cond_8
-
-    invoke-virtual {v1}, Ljava/lang/Object;->notify()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :cond_8
-    monitor-exit v1
-
-    return-void
-
-    :cond_9
-    :try_start_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw v6
-
-    :cond_a
-    :try_start_4
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v1
-
-    throw v0
-
-    :cond_b
-    const-string v0, "Unbalanced enter/exit"
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public final j()Z
-    .locals 5
-
-    iget-boolean v0, p0, Lo0/b;->e:Z
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    iput-boolean v1, p0, Lo0/b;->e:Z
-
-    const/4 v0, 0x0
-
-    const-class v2, Lo0/b;
-
-    monitor-enter v2
-
-    :try_start_0
-    sget-object v3, Lo0/b;->j:Lo0/b;
-
-    :goto_0
-    if-eqz v3, :cond_2
-
-    iget-object v4, v3, Lo0/b;->f:Lo0/b;
-
-    if-ne v4, p0, :cond_1
-
-    iget-object v4, p0, Lo0/b;->f:Lo0/b;
-
-    iput-object v4, v3, Lo0/b;->f:Lo0/b;
-
-    iput-object v0, p0, Lo0/b;->f:Lo0/b;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v2
-
-    goto :goto_1
-
-    :cond_1
-    :try_start_1
-    iget-object v3, v3, Lo0/b;->f:Lo0/b;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v1, 0x1
-
-    monitor-exit v2
-
-    :goto_1
-    return v1
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v2
-
-    throw v0
-.end method
-
-.method public final k(Ljava/io/IOException;)Ljava/io/IOException;
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/b;->j()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0, p1}, Lo0/b;->m(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public final l(Z)V
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/b;->j()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    if-nez p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p1}, Lo0/b;->m(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public m(Ljava/io/IOException;)Ljava/io/IOException;
-    .locals 2
-
-    new-instance v0, Ljava/io/InterruptedIOException;
-
-    const-string v1, "timeout"
-
-    invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {v0, p1}, Ljava/io/InterruptedIOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public n()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/o0/b0.smali b/com.discord/smali_classes2/o0/b0.smali
new file mode 100644
index 0000000000..be692585df
--- /dev/null
+++ b/com.discord/smali_classes2/o0/b0.smali
@@ -0,0 +1,99 @@
+.class public final Lo0/b0;
+.super Lokhttp3/RequestBody;
+.source "RequestBody.kt"
+
+
+# instance fields
+.field public final synthetic a:Ljava/io/File;
+
+.field public final synthetic b:Lokhttp3/MediaType;
+
+
+# direct methods
+.method public constructor <init>(Ljava/io/File;Lokhttp3/MediaType;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/b0;->a:Ljava/io/File;
+
+    iput-object p2, p0, Lo0/b0;->b:Lokhttp3/MediaType;
+
+    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public contentLength()J
+    .locals 2
+
+    iget-object v0, p0, Lo0/b0;->a:Ljava/io/File;
+
+    invoke-virtual {v0}, Ljava/io/File;->length()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public contentType()Lokhttp3/MediaType;
+    .locals 1
+
+    iget-object v0, p0, Lo0/b0;->b:Lokhttp3/MediaType;
+
+    return-object v0
+.end method
+
+.method public writeTo(Lokio/BufferedSink;)V
+    .locals 3
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/b0;->a:Ljava/io/File;
+
+    const-string v1, "$receiver"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Ljava/io/FileInputStream;
+
+    invoke-direct {v2, v0}, Ljava/io/FileInputStream;-><init>(Ljava/io/File;)V
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lp0/m;
+
+    new-instance v1, Lp0/x;
+
+    invoke-direct {v1}, Lp0/x;-><init>()V
+
+    invoke-direct {v0, v2, v1}, Lp0/m;-><init>(Ljava/io/InputStream;Lp0/x;)V
+
+    const/4 v1, 0x0
+
+    :try_start_0
+    invoke-interface {p1, v0}, Lokio/BufferedSink;->i0(Lp0/w;)J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :catchall_1
+    move-exception v1
+
+    invoke-static {v0, p1}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/c.smali b/com.discord/smali_classes2/o0/c.smali
index 710c33056f..831859620d 100644
--- a/com.discord/smali_classes2/o0/c.smali
+++ b/com.discord/smali_classes2/o0/c.smali
@@ -1,304 +1,31 @@
-.class public final Lo0/c;
+.class public interface abstract Lo0/c;
 .super Ljava/lang/Object;
-.source "AsyncTimeout.kt"
-
-# interfaces
-.implements Lo0/u;
+.source "Authenticator.kt"
 
 
-# instance fields
-.field public final synthetic d:Lo0/b;
-
-.field public final synthetic e:Lo0/u;
+# static fields
+.field public static final a:Lo0/c;
 
 
 # direct methods
-.method public constructor <init>(Lo0/b;Lo0/u;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lo0/u;",
-            ")V"
-        }
-    .end annotation
+.method public static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lo0/c;->d:Lo0/b;
+    new-instance v0, Lo0/b$a;
 
-    iput-object p2, p0, Lo0/c;->e:Lo0/u;
+    invoke-direct {v0}, Lo0/b$a;-><init>()V
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    sput-object v0, Lo0/c;->a:Lo0/c;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public close()V
-    .locals 3
-
-    iget-object v0, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v0}, Lo0/b;->i()V
-
-    :try_start_0
-    iget-object v0, p0, Lo0/c;->e:Lo0/u;
-
-    invoke-interface {v0}, Lo0/u;->close()V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v0, 0x1
-
-    iget-object v1, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v1, v0}, Lo0/b;->l(Z)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    :try_start_1
-    iget-object v1, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v1, v0}, Lo0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    throw v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    iget-object v1, p0, Lo0/c;->d:Lo0/b;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2}, Lo0/b;->l(Z)V
-
-    throw v0
-.end method
-
-.method public flush()V
-    .locals 3
-
-    iget-object v0, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v0}, Lo0/b;->i()V
-
-    :try_start_0
-    iget-object v0, p0, Lo0/c;->e:Lo0/u;
-
-    invoke-interface {v0}, Lo0/u;->flush()V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v0, 0x1
-
-    iget-object v1, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v1, v0}, Lo0/b;->l(Z)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    :try_start_1
-    iget-object v1, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v1, v0}, Lo0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    throw v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    iget-object v1, p0, Lo0/c;->d:Lo0/b;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2}, Lo0/b;->l(Z)V
-
-    throw v0
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/c;->d:Lo0/b;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "AsyncTimeout.sink("
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lo0/c;->e:Lo0/u;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 7
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_5
-
-    iget-wide v1, p1, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    move-wide v5, p2
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
-
-    :goto_0
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p2, v1
-
-    if-lez v3, :cond_4
-
-    iget-object v3, p1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v3, :cond_3
-
-    :goto_1
-    const/high16 v4, 0x10000
-
-    int-to-long v4, v4
-
-    cmp-long v6, v1, v4
-
-    if-gez v6, :cond_2
-
-    iget v4, v3, Lo0/r;->c:I
-
-    iget v5, v3, Lo0/r;->b:I
-
-    sub-int/2addr v4, v5
-
-    int-to-long v4, v4
-
-    add-long/2addr v1, v4
-
-    cmp-long v4, v1, p2
-
-    if-ltz v4, :cond_0
-
-    move-wide v1, p2
-
-    goto :goto_2
-
-    :cond_0
-    iget-object v3, v3, Lo0/r;->f:Lo0/r;
-
-    if-eqz v3, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    :goto_2
-    const/4 v3, 0x0
-
-    iget-object v4, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v4}, Lo0/b;->i()V
-
-    :try_start_0
-    iget-object v4, p0, Lo0/c;->e:Lo0/u;
-
-    invoke-interface {v4, p1, v1, v2}, Lo0/u;->write(Lo0/e;J)V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    sub-long/2addr p2, v1
-
-    const/4 v1, 0x1
-
-    iget-object v2, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {v2, v1}, Lo0/b;->l(Z)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_3
-
-    :catch_0
-    move-exception p1
-
-    :try_start_1
-    iget-object p2, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {p2, p1}, Lo0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_3
-    iget-object p2, p0, Lo0/c;->d:Lo0/b;
-
-    invoke-virtual {p2, v3}, Lo0/b;->l(Z)V
-
-    throw p1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    return-void
-
-    :cond_5
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+.method public abstract a(Lo0/e0;Lokhttp3/Response;)Lo0/a0;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali_classes2/o0/c0.smali b/com.discord/smali_classes2/o0/c0.smali
new file mode 100644
index 0000000000..000507d141
--- /dev/null
+++ b/com.discord/smali_classes2/o0/c0.smali
@@ -0,0 +1,61 @@
+.class public final Lo0/c0;
+.super Lokhttp3/RequestBody;
+.source "RequestBody.kt"
+
+
+# instance fields
+.field public final synthetic a:Lokio/ByteString;
+
+.field public final synthetic b:Lokhttp3/MediaType;
+
+
+# direct methods
+.method public constructor <init>(Lokio/ByteString;Lokhttp3/MediaType;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/c0;->a:Lokio/ByteString;
+
+    iput-object p2, p0, Lo0/c0;->b:Lokhttp3/MediaType;
+
+    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public contentLength()J
+    .locals 2
+
+    iget-object v0, p0, Lo0/c0;->a:Lokio/ByteString;
+
+    invoke-virtual {v0}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    int-to-long v0, v0
+
+    return-wide v0
+.end method
+
+.method public contentType()Lokhttp3/MediaType;
+    .locals 1
+
+    iget-object v0, p0, Lo0/c0;->b:Lokhttp3/MediaType;
+
+    return-object v0
+.end method
+
+.method public writeTo(Lokio/BufferedSink;)V
+    .locals 1
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/c0;->a:Lokio/ByteString;
+
+    invoke-interface {p1, v0}, Lokio/BufferedSink;->y0(Lokio/ByteString;)Lokio/BufferedSink;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/d.smali b/com.discord/smali_classes2/o0/d.smali
index ba0878a7b6..04b3ed3d9e 100644
--- a/com.discord/smali_classes2/o0/d.smali
+++ b/com.discord/smali_classes2/o0/d.smali
@@ -1,184 +1,7 @@
 .class public final Lo0/d;
 .super Ljava/lang/Object;
-.source "AsyncTimeout.kt"
+.source "Cache.kt"
 
 # interfaces
-.implements Lo0/w;
-
-
-# instance fields
-.field public final synthetic d:Lo0/b;
-
-.field public final synthetic e:Lo0/w;
-
-
-# direct methods
-.method public constructor <init>(Lo0/b;Lo0/w;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lo0/w;",
-            ")V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lo0/d;->d:Lo0/b;
-
-    iput-object p2, p0, Lo0/d;->e:Lo0/w;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x0
-
-    iget-object v1, p0, Lo0/d;->d:Lo0/b;
-
-    invoke-virtual {v1}, Lo0/b;->i()V
-
-    :try_start_0
-    iget-object v1, p0, Lo0/d;->e:Lo0/w;
-
-    invoke-interface {v1, p1, p2, p3}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 p3, 0x1
-
-    iget-object v0, p0, Lo0/d;->d:Lo0/b;
-
-    invoke-virtual {v0, p3}, Lo0/b;->l(Z)V
-
-    return-wide p1
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    :try_start_1
-    iget-object p2, p0, Lo0/d;->d:Lo0/b;
-
-    invoke-virtual {p2, p1}, Lo0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object p1
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    iget-object p2, p0, Lo0/d;->d:Lo0/b;
-
-    invoke-virtual {p2, v0}, Lo0/b;->l(Z)V
-
-    throw p1
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public close()V
-    .locals 3
-
-    iget-object v0, p0, Lo0/d;->d:Lo0/b;
-
-    invoke-virtual {v0}, Lo0/b;->i()V
-
-    :try_start_0
-    iget-object v0, p0, Lo0/d;->e:Lo0/w;
-
-    invoke-interface {v0}, Lo0/w;->close()V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v0, 0x1
-
-    iget-object v1, p0, Lo0/d;->d:Lo0/b;
-
-    invoke-virtual {v1, v0}, Lo0/b;->l(Z)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    :try_start_1
-    iget-object v1, p0, Lo0/d;->d:Lo0/b;
-
-    invoke-virtual {v1, v0}, Lo0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
-
-    move-result-object v0
-
-    throw v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    iget-object v1, p0, Lo0/d;->d:Lo0/b;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2}, Lo0/b;->l(Z)V
-
-    throw v0
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/d;->d:Lo0/b;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "AsyncTimeout.source("
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lo0/d;->e:Lo0/w;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
+.implements Ljava/io/Closeable;
+.implements Ljava/io/Flushable;
diff --git a/com.discord/smali_classes2/o0/d0.smali b/com.discord/smali_classes2/o0/d0.smali
new file mode 100644
index 0000000000..a29926731d
--- /dev/null
+++ b/com.discord/smali_classes2/o0/d0.smali
@@ -0,0 +1,53 @@
+.class public final Lo0/d0;
+.super Lokhttp3/ResponseBody;
+.source "ResponseBody.kt"
+
+
+# instance fields
+.field public final synthetic f:Lp0/g;
+
+.field public final synthetic g:Lokhttp3/MediaType;
+
+.field public final synthetic h:J
+
+
+# direct methods
+.method public constructor <init>(Lp0/g;Lokhttp3/MediaType;J)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/d0;->f:Lp0/g;
+
+    iput-object p2, p0, Lo0/d0;->g:Lokhttp3/MediaType;
+
+    iput-wide p3, p0, Lo0/d0;->h:J
+
+    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()J
+    .locals 2
+
+    iget-wide v0, p0, Lo0/d0;->h:J
+
+    return-wide v0
+.end method
+
+.method public b()Lokhttp3/MediaType;
+    .locals 1
+
+    iget-object v0, p0, Lo0/d0;->g:Lokhttp3/MediaType;
+
+    return-object v0
+.end method
+
+.method public c()Lp0/g;
+    .locals 1
+
+    iget-object v0, p0, Lo0/d0;->f:Lp0/g;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/e$a.smali b/com.discord/smali_classes2/o0/e$a.smali
index 55388bd912..36af015212 100644
--- a/com.discord/smali_classes2/o0/e$a.smali
+++ b/com.discord/smali_classes2/o0/e$a.smali
@@ -1,9 +1,6 @@
 .class public final Lo0/e$a;
 .super Ljava/lang/Object;
-.source "Buffer.kt"
-
-# interfaces
-.implements Ljava/io/Closeable;
+.source "CacheControl.kt"
 
 
 # annotations
@@ -17,425 +14,529 @@
 .end annotation
 
 
-# instance fields
-.field public d:Lo0/e;
-
-.field public e:Z
-
-.field public f:Lo0/r;
-
-.field public g:J
-
-.field public h:[B
-
-.field public i:I
-
-.field public j:I
-
-
 # direct methods
-.method public constructor <init>()V
-    .locals 2
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const-wide/16 v0, -0x1
-
-    iput-wide v0, p0, Lo0/e$a;->g:J
-
-    const/4 v0, -0x1
-
-    iput v0, p0, Lo0/e$a;->i:I
-
-    iput v0, p0, Lo0/e$a;->j:I
-
     return-void
 .end method
 
 
 # virtual methods
-.method public final a(J)I
-    .locals 17
+.method public final a(Ljava/lang/String;Ljava/lang/String;I)I
+    .locals 4
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    :goto_0
+    if-ge p3, v0, :cond_1
+
+    invoke-virtual {p1, p3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    invoke-static {p2, v1, v2, v3}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    return p3
+
+    :cond_0
+    add-int/lit8 p3, p3, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final b(Lokhttp3/Headers;)Lo0/e;
+    .locals 26
 
     move-object/from16 v0, p0
 
-    move-wide/from16 v1, p1
+    move-object/from16 v1, p1
 
-    iget-object v3, v0, Lo0/e$a;->d:Lo0/e;
+    const-string v2, "headers"
 
-    if-eqz v3, :cond_11
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v4, -0x1
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/Headers;->size()I
 
-    int-to-long v5, v4
+    move-result v2
 
-    cmp-long v7, v1, v5
-
-    if-ltz v7, :cond_10
-
-    iget-wide v5, v3, Lo0/e;->e:J
-
-    cmp-long v7, v1, v5
-
-    if-gtz v7, :cond_10
-
-    const-wide/16 v7, -0x1
-
-    const/4 v9, 0x0
-
-    cmp-long v10, v1, v7
-
-    if-eqz v10, :cond_f
-
-    cmp-long v7, v1, v5
-
-    if-nez v7, :cond_0
-
-    goto/16 :goto_4
-
-    :cond_0
-    const-wide/16 v7, 0x0
-
-    iget-object v4, v3, Lo0/e;->d:Lo0/r;
-
-    iget-object v10, v0, Lo0/e$a;->f:Lo0/r;
-
-    if-eqz v10, :cond_3
-
-    iget-wide v11, v0, Lo0/e$a;->g:J
-
-    iget v13, v0, Lo0/e$a;->i:I
-
-    if-eqz v10, :cond_2
-
-    iget v14, v10, Lo0/r;->b:I
-
-    sub-int/2addr v13, v14
-
-    int-to-long v13, v13
-
-    sub-long/2addr v11, v13
-
-    cmp-long v13, v11, v1
-
-    if-lez v13, :cond_1
-
-    move-wide v5, v11
-
-    goto :goto_0
-
-    :cond_1
-    move-wide v7, v11
-
-    move-object/from16 v16, v10
-
-    move-object v10, v4
-
-    move-object/from16 v4, v16
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_3
-    move-object v10, v4
-
-    :goto_0
-    sub-long v11, v5, v1
-
-    sub-long v13, v1, v7
-
-    cmp-long v15, v11, v13
-
-    if-lez v15, :cond_5
-
-    :goto_1
-    if-eqz v4, :cond_4
-
-    iget v5, v4, Lo0/r;->c:I
-
-    iget v6, v4, Lo0/r;->b:I
-
-    sub-int v10, v5, v6
-
-    int-to-long v10, v10
-
-    add-long/2addr v10, v7
-
-    cmp-long v12, v1, v10
-
-    if-ltz v12, :cond_9
-
-    sub-int/2addr v5, v6
-
-    int-to-long v5, v5
-
-    add-long/2addr v7, v5
-
-    iget-object v4, v4, Lo0/r;->f:Lo0/r;
-
-    goto :goto_1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_5
-    :goto_2
-    cmp-long v4, v5, v1
-
-    if-lez v4, :cond_8
-
-    if-eqz v10, :cond_7
-
-    iget-object v10, v10, Lo0/r;->g:Lo0/r;
-
-    if-eqz v10, :cond_6
-
-    iget v4, v10, Lo0/r;->c:I
-
-    iget v7, v10, Lo0/r;->b:I
-
-    sub-int/2addr v4, v7
-
-    int-to-long v7, v4
-
-    sub-long/2addr v5, v7
-
-    goto :goto_2
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_8
-    move-wide v7, v5
-
-    move-object v4, v10
-
-    :cond_9
-    iget-boolean v5, v0, Lo0/e$a;->e:Z
-
-    if-eqz v5, :cond_d
-
-    if-eqz v4, :cond_c
-
-    iget-boolean v5, v4, Lo0/r;->d:Z
-
-    if-eqz v5, :cond_d
-
-    new-instance v5, Lo0/r;
-
-    iget-object v6, v4, Lo0/r;->a:[B
-
-    array-length v10, v6
-
-    invoke-static {v6, v10}, Ljava/util/Arrays;->copyOf([BI)[B
-
-    move-result-object v11
-
-    const-string v6, "java.util.Arrays.copyOf(this, size)"
-
-    invoke-static {v11, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget v12, v4, Lo0/r;->b:I
-
-    iget v13, v4, Lo0/r;->c:I
-
-    const/4 v14, 0x0
-
-    const/4 v15, 0x1
-
-    move-object v10, v5
-
-    invoke-direct/range {v10 .. v15}, Lo0/r;-><init>([BIIZZ)V
-
-    iget-object v6, v3, Lo0/e;->d:Lo0/r;
-
-    if-ne v6, v4, :cond_a
-
-    iput-object v5, v3, Lo0/e;->d:Lo0/r;
-
-    :cond_a
-    invoke-virtual {v4, v5}, Lo0/r;->b(Lo0/r;)Lo0/r;
-
-    iget-object v3, v5, Lo0/r;->g:Lo0/r;
-
-    if-eqz v3, :cond_b
-
-    invoke-virtual {v3}, Lo0/r;->a()Lo0/r;
-
-    move-object v4, v5
-
-    goto :goto_3
-
-    :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_c
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_d
-    :goto_3
-    iput-object v4, v0, Lo0/e$a;->f:Lo0/r;
-
-    iput-wide v1, v0, Lo0/e$a;->g:J
-
-    if-eqz v4, :cond_e
-
-    iget-object v3, v4, Lo0/r;->a:[B
-
-    iput-object v3, v0, Lo0/e$a;->h:[B
-
-    iget v3, v4, Lo0/r;->b:I
-
-    sub-long/2addr v1, v7
-
-    long-to-int v2, v1
-
-    add-int/2addr v3, v2
-
-    iput v3, v0, Lo0/e$a;->i:I
-
-    iget v1, v4, Lo0/r;->c:I
-
-    iput v1, v0, Lo0/e$a;->j:I
-
-    sub-int/2addr v1, v3
-
-    return v1
-
-    :cond_e
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v9
-
-    :cond_f
-    :goto_4
-    iput-object v9, v0, Lo0/e$a;->f:Lo0/r;
-
-    iput-wide v1, v0, Lo0/e$a;->g:J
-
-    iput-object v9, v0, Lo0/e$a;->h:[B
-
-    iput v4, v0, Lo0/e$a;->i:I
-
-    iput v4, v0, Lo0/e$a;->j:I
-
-    return v4
-
-    :cond_10
-    new-instance v4, Ljava/lang/ArrayIndexOutOfBoundsException;
-
-    const/4 v5, 0x2
-
-    new-array v6, v5, [Ljava/lang/Object;
+    const/4 v6, 0x1
 
     const/4 v7, 0x0
 
-    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    const/4 v8, 0x1
 
-    move-result-object v1
+    const/4 v9, 0x0
 
-    aput-object v1, v6, v7
+    const/4 v10, 0x0
 
-    const/4 v1, 0x1
+    const/4 v11, 0x0
 
-    iget-wide v2, v3, Lo0/e;->e:J
+    const/4 v12, -0x1
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    const/4 v13, -0x1
 
-    move-result-object v2
+    const/4 v14, 0x0
 
-    aput-object v2, v6, v1
+    const/4 v15, 0x0
 
-    const-string v1, "offset=%s > size=%s"
+    const/16 v16, 0x0
 
-    const-string v2, "java.lang.String.format(format, *args)"
+    const/16 v17, -0x1
 
-    invoke-static {v6, v5, v1, v2}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    const/16 v18, -0x1
 
-    move-result-object v1
+    const/16 v19, 0x0
 
-    invoke-direct {v4, v1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+    const/16 v20, 0x0
 
-    throw v4
-
-    :cond_11
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    const-string v2, "not attached to a buffer"
-
-    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public close()V
-    .locals 3
-
-    iget-object v0, p0, Lo0/e$a;->d:Lo0/e;
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
+    const/16 v21, 0x0
 
     :goto_0
-    if-eqz v0, :cond_1
+    if-ge v7, v2, :cond_14
 
-    const/4 v0, 0x0
+    invoke-virtual {v1, v7}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
 
-    iput-object v0, p0, Lo0/e$a;->d:Lo0/e;
+    move-result-object v3
 
-    iput-object v0, p0, Lo0/e$a;->f:Lo0/r;
+    invoke-virtual {v1, v7}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
 
-    const-wide/16 v1, -0x1
+    move-result-object v4
 
-    iput-wide v1, p0, Lo0/e$a;->g:J
+    const-string v5, "Cache-Control"
 
-    iput-object v0, p0, Lo0/e$a;->h:[B
+    invoke-static {v3, v5, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
-    const/4 v0, -0x1
+    move-result v5
 
-    iput v0, p0, Lo0/e$a;->i:I
+    if-eqz v5, :cond_1
 
-    iput v0, p0, Lo0/e$a;->j:I
+    if-eqz v9, :cond_0
 
-    return-void
+    goto :goto_1
+
+    :cond_0
+    move-object v9, v4
+
+    goto :goto_2
 
     :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
+    const-string v5, "Pragma"
 
-    const-string v1, "not attached to a buffer"
+    invoke-static {v3, v5, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_13
+
+    :goto_1
+    const/4 v8, 0x0
+
+    :goto_2
+    const/4 v3, 0x0
+
+    :goto_3
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    if-ge v3, v5, :cond_12
+
+    const-string v5, "=,;"
+
+    invoke-virtual {v0, v4, v5, v3}, Lo0/e$a;->a(Ljava/lang/String;Ljava/lang/String;I)I
+
+    move-result v5
+
+    invoke-virtual {v4, v3, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v6, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v3}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    if-eq v5, v1, :cond_4
+
+    invoke-virtual {v4, v5}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    move/from16 v24, v2
+
+    const/16 v2, 0x2c
+
+    if-eq v1, v2, :cond_5
+
+    invoke-virtual {v4, v5}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v2, 0x3b
+
+    if-ne v1, v2, :cond_2
+
+    goto :goto_4
+
+    :cond_2
+    add-int/lit8 v5, v5, 0x1
+
+    invoke-static {v4, v5}, Lo0/g0/b;->u(Ljava/lang/String;I)I
+
+    move-result v1
+
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    if-ge v1, v2, :cond_3
+
+    invoke-virtual {v4, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    const/16 v5, 0x22
+
+    if-ne v2, v5, :cond_3
+
+    add-int/lit8 v1, v1, 0x1
+
+    const/4 v2, 0x4
+
+    move-object/from16 v25, v9
+
+    const/4 v9, 0x0
+
+    invoke-static {v4, v5, v1, v9, v2}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v2
+
+    invoke-virtual {v4, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x1
+
+    add-int/2addr v2, v5
+
+    goto :goto_5
+
+    :cond_3
+    move-object/from16 v25, v9
+
+    const/4 v9, 0x0
+
+    const-string v2, ",;"
+
+    invoke-virtual {v0, v4, v2, v1}, Lo0/e$a;->a(Ljava/lang/String;Ljava/lang/String;I)I
+
+    move-result v2
+
+    invoke-virtual {v4, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v1
 
     invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+    goto :goto_5
 
-    throw v0
+    :cond_4
+    move/from16 v24, v2
+
+    :cond_5
+    :goto_4
+    move-object/from16 v25, v9
+
+    const/4 v9, 0x0
+
+    add-int/lit8 v5, v5, 0x1
+
+    move v2, v5
+
+    const/4 v1, 0x0
+
+    :goto_5
+    const-string v5, "no-cache"
+
+    const/4 v6, 0x1
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    const/4 v5, -0x1
+
+    const/4 v10, 0x1
+
+    goto/16 :goto_6
+
+    :cond_6
+    const-string v5, "no-store"
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_7
+
+    const/4 v5, -0x1
+
+    const/4 v11, 0x1
+
+    goto/16 :goto_6
+
+    :cond_7
+    const-string v5, "max-age"
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_8
+
+    const/4 v5, -0x1
+
+    invoke-static {v1, v5}, Lo0/g0/b;->G(Ljava/lang/String;I)I
+
+    move-result v12
+
+    goto/16 :goto_6
+
+    :cond_8
+    const/4 v5, -0x1
+
+    const-string v9, "s-maxage"
+
+    invoke-static {v9, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_9
+
+    invoke-static {v1, v5}, Lo0/g0/b;->G(Ljava/lang/String;I)I
+
+    move-result v13
+
+    goto :goto_6
+
+    :cond_9
+    const-string v5, "private"
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_a
+
+    const/4 v5, -0x1
+
+    const/4 v14, 0x1
+
+    goto :goto_6
+
+    :cond_a
+    const-string v5, "public"
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_b
+
+    const/4 v5, -0x1
+
+    const/4 v15, 0x1
+
+    goto :goto_6
+
+    :cond_b
+    const-string v5, "must-revalidate"
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_c
+
+    const/4 v5, -0x1
+
+    const/16 v16, 0x1
+
+    goto :goto_6
+
+    :cond_c
+    const-string v5, "max-stale"
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_d
+
+    const v3, 0x7fffffff
+
+    invoke-static {v1, v3}, Lo0/g0/b;->G(Ljava/lang/String;I)I
+
+    move-result v17
+
+    const/4 v5, -0x1
+
+    goto :goto_6
+
+    :cond_d
+    const-string v5, "min-fresh"
+
+    invoke-static {v5, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_e
+
+    const/4 v5, -0x1
+
+    invoke-static {v1, v5}, Lo0/g0/b;->G(Ljava/lang/String;I)I
+
+    move-result v18
+
+    goto :goto_6
+
+    :cond_e
+    const/4 v5, -0x1
+
+    const-string v1, "only-if-cached"
+
+    invoke-static {v1, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_f
+
+    const/16 v19, 0x1
+
+    goto :goto_6
+
+    :cond_f
+    const-string v1, "no-transform"
+
+    invoke-static {v1, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_10
+
+    const/16 v20, 0x1
+
+    goto :goto_6
+
+    :cond_10
+    const-string v1, "immutable"
+
+    invoke-static {v1, v3, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_11
+
+    const/16 v21, 0x1
+
+    :cond_11
+    :goto_6
+    move-object/from16 v1, p1
+
+    move v3, v2
+
+    move/from16 v2, v24
+
+    move-object/from16 v9, v25
+
+    goto/16 :goto_3
+
+    :cond_12
+    move/from16 v24, v2
+
+    move-object/from16 v25, v9
+
+    goto :goto_7
+
+    :cond_13
+    move/from16 v24, v2
+
+    move-object v3, v9
+
+    :goto_7
+    const/4 v5, -0x1
+
+    add-int/lit8 v7, v7, 0x1
+
+    move-object/from16 v1, p1
+
+    move/from16 v2, v24
+
+    goto/16 :goto_0
+
+    :cond_14
+    move-object v3, v9
+
+    if-nez v8, :cond_15
+
+    const/16 v22, 0x0
+
+    goto :goto_8
+
+    :cond_15
+    move-object/from16 v22, v3
+
+    :goto_8
+    new-instance v1, Lo0/e;
+
+    const/16 v23, 0x0
+
+    move-object v9, v1
+
+    invoke-direct/range {v9 .. v23}, Lo0/e;-><init>(ZZIIZZZIIZZZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v1
 .end method
diff --git a/com.discord/smali_classes2/o0/e$b.smali b/com.discord/smali_classes2/o0/e$b.smali
deleted file mode 100644
index fbff6f0700..0000000000
--- a/com.discord/smali_classes2/o0/e$b.smali
+++ /dev/null
@@ -1,136 +0,0 @@
-.class public final Lo0/e$b;
-.super Ljava/io/InputStream;
-.source "Buffer.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lo0/e;->W0()Ljava/io/InputStream;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lo0/e;
-
-
-# direct methods
-.method public constructor <init>(Lo0/e;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lo0/e$b;->d:Lo0/e;
-
-    invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public available()I
-    .locals 4
-
-    iget-object v0, p0, Lo0/e$b;->d:Lo0/e;
-
-    iget-wide v0, v0, Lo0/e;->e:J
-
-    const v2, 0x7fffffff
-
-    int-to-long v2, v2
-
-    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    return v1
-.end method
-
-.method public close()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public read()I
-    .locals 6
-
-    iget-object v0, p0, Lo0/e$b;->d:Lo0/e;
-
-    iget-wide v1, v0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-lez v5, :cond_0
-
-    invoke-virtual {v0}, Lo0/e;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, -0x1
-
-    :goto_0
-    return v0
-.end method
-
-.method public read([BII)I
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lo0/e$b;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->read([BII)I
-
-    move-result p1
-
-    return p1
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lo0/e$b;->d:Lo0/e;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ".inputStream()"
-
-    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_classes2/o0/e.smali b/com.discord/smali_classes2/o0/e.smali
index 5298afff52..81cbcf4d28 100644
--- a/com.discord/smali_classes2/o0/e.smali
+++ b/com.discord/smali_classes2/o0/e.smali
@@ -1,12 +1,6 @@
 .class public final Lo0/e;
 .super Ljava/lang/Object;
-.source "Buffer.kt"
-
-# interfaces
-.implements Lo0/g;
-.implements Lokio/BufferedSink;
-.implements Ljava/lang/Cloneable;
-.implements Ljava/nio/channels/ByteChannel;
+.source "CacheControl.kt"
 
 
 # annotations
@@ -18,6220 +12,290 @@
 
 
 # static fields
-.field public static final f:[B
+.field public static final n:Lo0/e$a;
 
 
 # instance fields
-.field public d:Lo0/r;
+.field public final a:Z
 
-.field public e:J
+.field public final b:Z
+
+.field public final c:I
+
+.field public final d:I
+
+.field public final e:Z
+
+.field public final f:Z
+
+.field public final g:Z
+
+.field public final h:I
+
+.field public final i:I
+
+.field public final j:Z
+
+.field public final k:Z
+
+.field public final l:Z
+
+.field public m:Ljava/lang/String;
 
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 2
+    .locals 3
 
-    sget-object v0, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    new-instance v0, Lo0/e$a;
 
-    const-string v1, "0123456789abcdef"
+    const/4 v1, 0x0
 
-    invoke-virtual {v1, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+    invoke-direct {v0, v1}, Lo0/e$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    move-result-object v0
+    sput-object v0, Lo0/e;->n:Lo0/e$a;
 
-    const-string v1, "(this as java.lang.String).getBytes(charset)"
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v1, "timeUnit"
 
-    sput-object v0, Lo0/e;->f:[B
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v1, 0x7fffffff
+
+    int-to-long v1, v1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toSeconds(J)J
 
     return-void
 .end method
 
-.method public constructor <init>()V
+.method public constructor <init>(ZZIIZZZIIZZZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iput-boolean p1, p0, Lo0/e;->a:Z
+
+    iput-boolean p2, p0, Lo0/e;->b:Z
+
+    iput p3, p0, Lo0/e;->c:I
+
+    iput p4, p0, Lo0/e;->d:I
+
+    iput-boolean p5, p0, Lo0/e;->e:Z
+
+    iput-boolean p6, p0, Lo0/e;->f:Z
+
+    iput-boolean p7, p0, Lo0/e;->g:Z
+
+    iput p8, p0, Lo0/e;->h:I
+
+    iput p9, p0, Lo0/e;->i:I
+
+    iput-boolean p10, p0, Lo0/e;->j:Z
+
+    iput-boolean p11, p0, Lo0/e;->k:Z
+
+    iput-boolean p12, p0, Lo0/e;->l:Z
+
+    iput-object p13, p0, Lo0/e;->m:Ljava/lang/String;
+
     return-void
 .end method
 
 
 # virtual methods
-.method public final A(Lo0/n;Z)I
-    .locals 17
-
-    move-object/from16 v0, p1
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_14
-
-    move-object/from16 v2, p0
-
-    iget-object v3, v2, Lo0/e;->d:Lo0/r;
-
-    const/4 v4, -0x2
-
-    const/4 v5, -0x1
-
-    if-eqz v3, :cond_12
-
-    iget-object v6, v3, Lo0/r;->a:[B
-
-    iget v7, v3, Lo0/r;->b:I
-
-    iget v8, v3, Lo0/r;->c:I
-
-    iget-object v0, v0, Lo0/n;->e:[I
-
-    const/4 v9, 0x0
-
-    move-object v11, v3
-
-    const/4 v10, 0x0
-
-    const/4 v12, -0x1
-
-    :goto_0
-    add-int/lit8 v13, v10, 0x1
-
-    aget v10, v0, v10
-
-    add-int/lit8 v14, v13, 0x1
-
-    aget v13, v0, v13
-
-    if-eq v13, v5, :cond_0
-
-    move v12, v13
-
-    :cond_0
-    if-nez v11, :cond_1
-
-    goto :goto_3
-
-    :cond_1
-    if-gez v10, :cond_b
-
-    mul-int/lit8 v10, v10, -0x1
-
-    add-int v13, v10, v14
-
-    :goto_1
-    add-int/lit8 v10, v7, 0x1
-
-    aget-byte v7, v6, v7
-
-    and-int/lit16 v7, v7, 0xff
-
-    add-int/lit8 v15, v14, 0x1
-
-    aget v14, v0, v14
-
-    if-eq v7, v14, :cond_2
-
-    return v12
-
-    :cond_2
-    if-ne v15, v13, :cond_3
-
-    const/4 v7, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v7, 0x0
-
-    :goto_2
-    if-ne v10, v8, :cond_9
-
-    if-eqz v11, :cond_8
-
-    iget-object v6, v11, Lo0/r;->f:Lo0/r;
-
-    if-eqz v6, :cond_7
-
-    iget v8, v6, Lo0/r;->b:I
-
-    iget-object v10, v6, Lo0/r;->a:[B
-
-    iget v11, v6, Lo0/r;->c:I
-
-    if-ne v6, v3, :cond_6
-
-    if-nez v7, :cond_5
-
-    :goto_3
-    if-eqz p2, :cond_4
-
-    return v4
-
-    :cond_4
-    return v12
-
-    :cond_5
-    move-object v6, v10
-
-    move-object v10, v1
-
-    goto :goto_4
-
-    :cond_6
-    move-object/from16 v16, v10
-
-    move-object v10, v6
-
-    move-object/from16 v6, v16
-
-    goto :goto_4
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_9
-    move-object/from16 v16, v11
-
-    move v11, v8
-
-    move v8, v10
-
-    move-object/from16 v10, v16
-
-    :goto_4
-    if-eqz v7, :cond_a
-
-    aget v7, v0, v15
-
-    move v4, v8
-
-    move v8, v11
-
-    move-object v11, v10
-
-    goto :goto_6
-
-    :cond_a
-    move v7, v8
-
-    move v8, v11
-
-    move v14, v15
-
-    move-object v11, v10
-
-    goto :goto_1
-
-    :cond_b
-    add-int/lit8 v13, v7, 0x1
-
-    aget-byte v7, v6, v7
-
-    and-int/lit16 v7, v7, 0xff
-
-    add-int v15, v14, v10
-
-    :goto_5
-    if-ne v14, v15, :cond_c
-
-    return v12
-
-    :cond_c
-    aget v4, v0, v14
-
-    if-ne v7, v4, :cond_11
-
-    add-int/2addr v14, v10
-
-    aget v7, v0, v14
-
-    if-ne v13, v8, :cond_e
-
-    iget-object v11, v11, Lo0/r;->f:Lo0/r;
-
-    if-eqz v11, :cond_d
-
-    iget v4, v11, Lo0/r;->b:I
-
-    iget-object v6, v11, Lo0/r;->a:[B
-
-    iget v8, v11, Lo0/r;->c:I
-
-    if-ne v11, v3, :cond_f
-
-    move-object v11, v1
-
-    goto :goto_6
-
-    :cond_d
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_e
-    move v4, v13
-
-    :cond_f
-    :goto_6
-    if-ltz v7, :cond_10
-
-    return v7
-
-    :cond_10
-    neg-int v10, v7
-
-    move v7, v4
-
-    const/4 v4, -0x2
-
-    goto/16 :goto_0
-
-    :cond_11
-    add-int/lit8 v14, v14, 0x1
-
-    const/4 v4, -0x2
-
-    goto :goto_5
-
-    :cond_12
-    if-eqz p2, :cond_13
-
-    const/4 v4, -0x2
-
-    goto :goto_7
-
-    :cond_13
-    const/4 v4, -0x1
-
-    :goto_7
-    return v4
-
-    :cond_14
-    move-object/from16 v2, p0
-
-    const-string v0, "options"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public B0(Lo0/e;J)J
-    .locals 5
-
-    if-eqz p1, :cond_4
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p2, v0
-
-    if-ltz v2, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_3
-
-    iget-wide v2, p0, Lo0/e;->e:J
-
-    cmp-long v4, v2, v0
-
-    if-nez v4, :cond_1
-
-    const-wide/16 p1, -0x1
-
-    return-wide p1
-
-    :cond_1
-    cmp-long v0, p2, v2
-
-    if-lez v0, :cond_2
-
-    move-wide p2, v2
-
-    :cond_2
-    invoke-virtual {p1, p0, p2, p3}, Lo0/e;->write(Lo0/e;J)V
-
-    return-wide p2
-
-    :cond_3
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_4
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final C(I)Lo0/r;
-    .locals 3
-
-    const/16 v0, 0x2000
-
-    const/4 v1, 0x1
-
-    if-lt p1, v1, :cond_0
-
-    if-gt p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_6
-
-    iget-object v1, p0, Lo0/e;->d:Lo0/r;
-
-    if-nez v1, :cond_1
-
-    invoke-static {}, Lo0/s;->b()Lo0/r;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lo0/e;->d:Lo0/r;
-
-    iput-object p1, p1, Lo0/r;->g:Lo0/r;
-
-    iput-object p1, p1, Lo0/r;->f:Lo0/r;
-
-    return-object p1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_5
-
-    iget-object v1, v1, Lo0/r;->g:Lo0/r;
-
-    if-eqz v1, :cond_4
-
-    iget v2, v1, Lo0/r;->c:I
-
-    add-int/2addr v2, p1
-
-    if-gt v2, v0, :cond_2
-
-    iget-boolean p1, v1, Lo0/r;->e:Z
-
-    if-nez p1, :cond_3
-
-    :cond_2
-    invoke-static {}, Lo0/s;->b()Lo0/r;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Lo0/r;->b(Lo0/r;)Lo0/r;
-
-    move-object v1, p1
-
-    :cond_3
-    return-object v1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_6
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "unexpected capacity"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public D(Lokio/ByteString;)Lo0/e;
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1, p0}, Lokio/ByteString;->p(Lo0/e;)V
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "byteString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public E([B)Lo0/e;
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x0
-
-    array-length v1, p1
-
-    invoke-virtual {p0, p1, v0, v1}, Lo0/e;->G([BII)Lo0/e;
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public F0(Lo0/u;)J
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-lez v4, :cond_0
-
-    invoke-interface {p1, p0, v0, v1}, Lo0/u;->write(Lo0/e;J)V
-
-    :cond_0
-    return-wide v0
-.end method
-
-.method public G([BII)Lo0/e;
-    .locals 9
-
-    if-eqz p1, :cond_1
-
-    array-length v0, p1
-
-    int-to-long v1, v0
-
-    int-to-long v3, p2
-
-    int-to-long v7, p3
-
-    move-wide v5, v7
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
-
-    add-int/2addr p3, p2
-
-    :goto_0
-    if-ge p2, p3, :cond_0
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p0, v0}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v0
-
-    sub-int v1, p3, p2
-
-    iget v2, v0, Lo0/r;->c:I
-
-    rsub-int v2, v2, 0x2000
-
-    invoke-static {v1, v2}, Ljava/lang/Math;->min(II)I
-
-    move-result v1
-
-    iget-object v2, v0, Lo0/r;->a:[B
-
-    iget v3, v0, Lo0/r;->c:I
-
-    invoke-static {p1, p2, v2, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    add-int/2addr p2, v1
-
-    iget v2, v0, Lo0/r;->c:I
-
-    add-int/2addr v2, v1
-
-    iput v2, v0, Lo0/r;->c:I
-
-    goto :goto_0
-
-    :cond_0
-    iget-wide p1, p0, Lo0/e;->e:J
-
-    add-long/2addr p1, v7
-
-    iput-wide p1, p0, Lo0/e;->e:J
-
-    return-object p0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public I(I)Lo0/e;
+.method public toString()Ljava/lang/String;
     .locals 4
 
-    const/4 v0, 0x1
+    iget-object v0, p0, Lo0/e;->m:Ljava/lang/String;
 
-    invoke-virtual {p0, v0}, Lo0/e;->C(I)Lo0/r;
+    if-nez v0, :cond_e
 
-    move-result-object v0
+    new-instance v0, Ljava/lang/StringBuilder;
 
-    iget-object v1, v0, Lo0/r;->a:[B
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget v2, v0, Lo0/r;->c:I
+    iget-boolean v1, p0, Lo0/e;->a:Z
 
-    add-int/lit8 v3, v2, 0x1
+    if-eqz v1, :cond_0
 
-    iput v3, v0, Lo0/r;->c:I
+    const-string v1, "no-cache, "
 
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v2
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x1
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    return-object p0
-.end method
-
-.method public J()Z
-    .locals 5
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public K(J)Lo0/e;
-    .locals 12
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-nez v2, :cond_0
-
-    const/16 p1, 0x30
-
-    invoke-virtual {p0, p1}, Lo0/e;->I(I)Lo0/e;
-
-    return-object p0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-gez v2, :cond_2
-
-    neg-long p1, p1
-
-    cmp-long v2, p1, v0
-
-    if-gez v2, :cond_1
-
-    const-string p1, "-9223372036854775808"
-
-    invoke-virtual {p0, p1}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
-
-    return-object p0
-
-    :cond_1
-    const/4 v3, 0x1
-
-    :cond_2
-    const-wide/32 v5, 0x5f5e100
-
-    const/16 v2, 0xa
-
-    cmp-long v7, p1, v5
-
-    if-gez v7, :cond_a
-
-    const-wide/16 v5, 0x2710
-
-    cmp-long v7, p1, v5
-
-    if-gez v7, :cond_6
-
-    const-wide/16 v5, 0x64
-
-    cmp-long v7, p1, v5
-
-    if-gez v7, :cond_4
-
-    const-wide/16 v5, 0xa
-
-    cmp-long v7, p1, v5
-
-    if-gez v7, :cond_3
-
-    goto/16 :goto_0
-
-    :cond_3
-    const/4 v4, 0x2
-
-    goto/16 :goto_0
-
-    :cond_4
-    const-wide/16 v4, 0x3e8
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_5
-
-    const/4 v4, 0x3
-
-    goto/16 :goto_0
-
-    :cond_5
-    const/4 v4, 0x4
-
-    goto/16 :goto_0
-
-    :cond_6
-    const-wide/32 v4, 0xf4240
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_8
-
-    const-wide/32 v4, 0x186a0
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_7
-
-    const/4 v4, 0x5
-
-    goto/16 :goto_0
-
-    :cond_7
-    const/4 v4, 0x6
-
-    goto/16 :goto_0
-
-    :cond_8
-    const-wide/32 v4, 0x989680
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_9
-
-    const/4 v4, 0x7
-
-    goto/16 :goto_0
-
-    :cond_9
-    const/16 v4, 0x8
-
-    goto/16 :goto_0
-
-    :cond_a
-    const-wide v4, 0xe8d4a51000L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_e
-
-    const-wide v4, 0x2540be400L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_c
-
-    const-wide/32 v4, 0x3b9aca00
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_b
-
-    const/16 v4, 0x9
-
-    goto :goto_0
-
-    :cond_b
-    const/16 v4, 0xa
-
-    goto :goto_0
-
-    :cond_c
-    const-wide v4, 0x174876e800L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_d
-
-    const/16 v4, 0xb
-
-    goto :goto_0
-
-    :cond_d
-    const/16 v4, 0xc
-
-    goto :goto_0
-
-    :cond_e
-    const-wide v4, 0x38d7ea4c68000L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_11
-
-    const-wide v4, 0x9184e72a000L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_f
-
-    const/16 v4, 0xd
-
-    goto :goto_0
-
-    :cond_f
-    const-wide v4, 0x5af3107a4000L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_10
-
-    const/16 v4, 0xe
-
-    goto :goto_0
-
-    :cond_10
-    const/16 v4, 0xf
-
-    goto :goto_0
-
-    :cond_11
-    const-wide v4, 0x16345785d8a0000L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_13
-
-    const-wide v4, 0x2386f26fc10000L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_12
-
-    const/16 v4, 0x10
-
-    goto :goto_0
-
-    :cond_12
-    const/16 v4, 0x11
-
-    goto :goto_0
-
-    :cond_13
-    const-wide v4, 0xde0b6b3a7640000L
-
-    cmp-long v6, p1, v4
-
-    if-gez v6, :cond_14
-
-    const/16 v4, 0x12
-
-    goto :goto_0
-
-    :cond_14
-    const/16 v4, 0x13
-
-    :goto_0
-    if-eqz v3, :cond_15
-
-    add-int/lit8 v4, v4, 0x1
-
-    :cond_15
-    invoke-virtual {p0, v4}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v5
-
-    iget-object v6, v5, Lo0/r;->a:[B
-
-    iget v7, v5, Lo0/r;->c:I
-
-    add-int/2addr v7, v4
-
-    :goto_1
-    cmp-long v8, p1, v0
-
-    if-eqz v8, :cond_16
-
-    int-to-long v8, v2
-
-    rem-long v10, p1, v8
-
-    long-to-int v11, v10
-
-    add-int/lit8 v7, v7, -0x1
-
-    sget-object v10, Lo0/e;->f:[B
-
-    aget-byte v10, v10, v11
-
-    aput-byte v10, v6, v7
-
-    div-long/2addr p1, v8
-
-    goto :goto_1
-
-    :cond_16
-    if-eqz v3, :cond_17
-
-    add-int/lit8 v7, v7, -0x1
-
-    const/16 p1, 0x2d
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v6, v7
-
-    :cond_17
-    iget p1, v5, Lo0/r;->c:I
-
-    add-int/2addr p1, v4
-
-    iput p1, v5, Lo0/r;->c:I
-
-    iget-wide p1, p0, Lo0/e;->e:J
-
-    int-to-long v0, v4
-
-    add-long/2addr p1, v0
-
-    iput-wide p1, p0, Lo0/e;->e:J
-
-    return-object p0
-.end method
-
-.method public L(J)Lo0/e;
-    .locals 9
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-nez v2, :cond_0
-
-    const/16 p1, 0x30
-
-    invoke-virtual {p0, p1}, Lo0/e;->I(I)Lo0/e;
-
-    return-object p0
-
-    :cond_0
-    invoke-static {p1, p2}, Ljava/lang/Long;->highestOneBit(J)J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->numberOfTrailingZeros(J)I
-
-    move-result v0
-
-    const/4 v1, 0x4
-
-    div-int/2addr v0, v1
-
-    add-int/lit8 v0, v0, 0x1
-
-    invoke-virtual {p0, v0}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v2
-
-    iget-object v3, v2, Lo0/r;->a:[B
-
-    iget v4, v2, Lo0/r;->c:I
-
-    add-int v5, v4, v0
-
-    add-int/lit8 v5, v5, -0x1
-
-    :goto_0
-    if-lt v5, v4, :cond_1
-
-    sget-object v6, Lo0/e;->f:[B
-
-    const-wide/16 v7, 0xf
-
-    and-long/2addr v7, p1
-
-    long-to-int v8, v7
-
-    aget-byte v6, v6, v8
-
-    aput-byte v6, v3, v5
-
-    ushr-long/2addr p1, v1
-
-    add-int/lit8 v5, v5, -0x1
-
-    goto :goto_0
-
-    :cond_1
-    iget p1, v2, Lo0/r;->c:I
-
-    add-int/2addr p1, v0
-
-    iput p1, v2, Lo0/r;->c:I
-
-    iget-wide p1, p0, Lo0/e;->e:J
-
-    int-to-long v0, v0
-
-    add-long/2addr p1, v0
-
-    iput-wide p1, p0, Lo0/e;->e:J
-
-    return-object p0
-.end method
-
-.method public M(I)Lo0/e;
-    .locals 5
-
-    const/4 v0, 0x4
-
-    invoke-virtual {p0, v0}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v0
-
-    iget-object v1, v0, Lo0/r;->a:[B
-
-    iget v2, v0, Lo0/r;->c:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    ushr-int/lit8 v4, p1, 0x18
-
-    and-int/lit16 v4, v4, 0xff
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    add-int/lit8 v2, v3, 0x1
-
-    ushr-int/lit8 v4, p1, 0x10
-
-    and-int/lit16 v4, v4, 0xff
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v3
-
-    add-int/lit8 v3, v2, 0x1
-
-    ushr-int/lit8 v4, p1, 0x8
-
-    and-int/lit16 v4, v4, 0xff
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    add-int/lit8 v2, v3, 0x1
-
-    and-int/lit16 p1, p1, 0xff
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v3
-
-    iput v2, v0, Lo0/r;->c:I
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x4
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    return-object p0
-.end method
-
-.method public N(I)Lo0/e;
-    .locals 5
-
-    const/4 v0, 0x2
-
-    invoke-virtual {p0, v0}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v0
-
-    iget-object v1, v0, Lo0/r;->a:[B
-
-    iget v2, v0, Lo0/r;->c:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    ushr-int/lit8 v4, p1, 0x8
-
-    and-int/lit16 v4, v4, 0xff
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v1, v2
-
-    add-int/lit8 v2, v3, 0x1
-
-    and-int/lit16 p1, p1, 0xff
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v3
-
-    iput v2, v0, Lo0/r;->c:I
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x2
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    return-object p0
-.end method
-
-.method public O(Ljava/lang/String;)Lo0/e;
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    invoke-virtual {p0, p1, v0, v1}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
-
-    return-object p0
-
-    :cond_0
-    const-string p1, "string"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public P0(J)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    cmp-long v2, v0, p1
-
-    if-ltz v2, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-.end method
-
-.method public Q(Lo0/e;J)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_1
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    cmp-long v2, v0, p2
-
-    if-ltz v2, :cond_0
-
-    invoke-virtual {p1, p0, p2, p3}, Lo0/e;->write(Lo0/e;J)V
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p1, p0, v0, v1}, Lo0/e;->write(Lo0/e;J)V
-
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public bridge synthetic Q0(J)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1, p2}, Lo0/e;->K(J)Lo0/e;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public R(Ljava/lang/String;II)Lo0/e;
-    .locals 10
-
-    if-eqz p1, :cond_10
-
-    const/4 v0, 0x1
-
-    if-ltz p2, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_f
-
-    if-lt p3, p2, :cond_1
-
-    const/4 v1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_e
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    if-gt p3, v1, :cond_2
-
-    const/4 v1, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_2
-    if-eqz v1, :cond_d
-
-    :goto_3
-    if-ge p2, p3, :cond_c
-
-    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v2, 0x80
-
-    if-ge v1, v2, :cond_5
-
-    invoke-virtual {p0, v0}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v3
-
-    iget-object v4, v3, Lo0/r;->a:[B
-
-    iget v5, v3, Lo0/r;->c:I
-
-    sub-int/2addr v5, p2
-
-    rsub-int v6, v5, 0x2000
-
-    invoke-static {p3, v6}, Ljava/lang/Math;->min(II)I
-
-    move-result v6
-
-    add-int/lit8 v7, p2, 0x1
-
-    add-int/2addr p2, v5
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v4, p2
-
-    :goto_4
-    move p2, v7
-
-    if-ge p2, v6, :cond_4
-
-    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    if-lt v1, v2, :cond_3
-
-    goto :goto_5
-
-    :cond_3
-    add-int/lit8 v7, p2, 0x1
-
-    add-int/2addr p2, v5
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v4, p2
-
-    goto :goto_4
-
-    :cond_4
-    :goto_5
-    add-int/2addr v5, p2
-
-    iget v1, v3, Lo0/r;->c:I
-
-    sub-int/2addr v5, v1
-
-    add-int/2addr v1, v5
-
-    iput v1, v3, Lo0/r;->c:I
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    int-to-long v3, v5
-
-    add-long/2addr v1, v3
-
-    iput-wide v1, p0, Lo0/e;->e:J
-
-    goto :goto_3
-
-    :cond_5
-    const/16 v3, 0x800
-
-    if-ge v1, v3, :cond_6
-
-    const/4 v3, 0x2
-
-    invoke-virtual {p0, v3}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v4
-
-    iget-object v5, v4, Lo0/r;->a:[B
-
-    iget v6, v4, Lo0/r;->c:I
-
-    shr-int/lit8 v7, v1, 0x6
-
-    or-int/lit16 v7, v7, 0xc0
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v5, v6
-
-    add-int/lit8 v7, v6, 0x1
-
-    and-int/lit8 v1, v1, 0x3f
-
-    or-int/2addr v1, v2
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v5, v7
-
-    add-int/2addr v6, v3
-
-    iput v6, v4, Lo0/r;->c:I
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x2
-
-    add-long/2addr v1, v3
-
-    iput-wide v1, p0, Lo0/e;->e:J
-
-    goto/16 :goto_9
-
-    :cond_6
-    const v3, 0xd800
-
-    const/16 v4, 0x3f
-
-    if-lt v1, v3, :cond_b
-
-    const v3, 0xdfff
-
-    if-le v1, v3, :cond_7
-
-    goto :goto_8
-
-    :cond_7
-    add-int/lit8 v5, p2, 0x1
-
-    if-ge v5, p3, :cond_8
-
-    invoke-virtual {p1, v5}, Ljava/lang/String;->charAt(I)C
-
-    move-result v6
-
-    goto :goto_6
-
-    :cond_8
-    const/4 v6, 0x0
-
-    :goto_6
-    const v7, 0xdbff
-
-    if-gt v1, v7, :cond_a
-
-    const v7, 0xdc00
-
-    if-gt v7, v6, :cond_a
-
-    if-ge v3, v6, :cond_9
-
-    goto :goto_7
-
-    :cond_9
-    const/high16 v3, 0x10000
-
-    and-int/lit16 v1, v1, 0x3ff
-
-    shl-int/lit8 v1, v1, 0xa
-
-    and-int/lit16 v5, v6, 0x3ff
-
-    or-int/2addr v1, v5
-
-    add-int/2addr v1, v3
-
-    const/4 v3, 0x4
-
-    invoke-virtual {p0, v3}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v5
-
-    iget-object v6, v5, Lo0/r;->a:[B
-
-    iget v7, v5, Lo0/r;->c:I
-
-    shr-int/lit8 v8, v1, 0x12
-
-    or-int/lit16 v8, v8, 0xf0
-
-    int-to-byte v8, v8
-
-    aput-byte v8, v6, v7
-
-    add-int/lit8 v8, v7, 0x1
-
-    shr-int/lit8 v9, v1, 0xc
-
-    and-int/2addr v9, v4
-
-    or-int/2addr v9, v2
-
-    int-to-byte v9, v9
-
-    aput-byte v9, v6, v8
-
-    add-int/lit8 v8, v7, 0x2
-
-    shr-int/lit8 v9, v1, 0x6
-
-    and-int/2addr v9, v4
-
-    or-int/2addr v9, v2
-
-    int-to-byte v9, v9
-
-    aput-byte v9, v6, v8
-
-    add-int/lit8 v8, v7, 0x3
-
-    and-int/2addr v1, v4
-
-    or-int/2addr v1, v2
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v6, v8
-
-    add-int/2addr v7, v3
-
-    iput v7, v5, Lo0/r;->c:I
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x4
-
-    add-long/2addr v1, v3
-
-    iput-wide v1, p0, Lo0/e;->e:J
-
-    add-int/lit8 p2, p2, 0x2
-
-    goto/16 :goto_3
-
-    :cond_a
-    :goto_7
-    invoke-virtual {p0, v4}, Lo0/e;->I(I)Lo0/e;
-
-    move p2, v5
-
-    goto/16 :goto_3
-
-    :cond_b
-    :goto_8
-    const/4 v3, 0x3
-
-    invoke-virtual {p0, v3}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v5
-
-    iget-object v6, v5, Lo0/r;->a:[B
-
-    iget v7, v5, Lo0/r;->c:I
-
-    shr-int/lit8 v8, v1, 0xc
-
-    or-int/lit16 v8, v8, 0xe0
-
-    int-to-byte v8, v8
-
-    aput-byte v8, v6, v7
-
-    add-int/lit8 v8, v7, 0x1
-
-    shr-int/lit8 v9, v1, 0x6
-
-    and-int/2addr v4, v9
-
-    or-int/2addr v4, v2
-
-    int-to-byte v4, v4
-
-    aput-byte v4, v6, v8
-
-    add-int/lit8 v4, v7, 0x2
-
-    and-int/lit8 v1, v1, 0x3f
-
-    or-int/2addr v1, v2
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v6, v4
-
-    add-int/2addr v7, v3
-
-    iput v7, v5, Lo0/r;->c:I
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x3
-
-    add-long/2addr v1, v3
-
-    iput-wide v1, p0, Lo0/e;->e:J
-
-    :goto_9
-    add-int/lit8 p2, p2, 0x1
-
-    goto/16 :goto_3
-
-    :cond_c
-    return-object p0
-
-    :cond_d
-    const-string p2, "endIndex > string.length: "
-
-    const-string v0, " > "
-
-    invoke-static {p2, p3, v0}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result p1
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_e
-    const-string p1, "endIndex < beginIndex: "
-
-    const-string v0, " < "
-
-    invoke-static {p1, p3, v0, p2}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_f
-    const-string p1, "beginIndex < 0: "
-
-    invoke-static {p1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_10
-    const-string p1, "string"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public S(Lokio/ByteString;)J
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    const-wide/16 v0, 0x0
-
-    invoke-virtual {p0, p1, v0, v1}, Lo0/e;->g(Lokio/ByteString;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-
-    :cond_0
-    const-string p1, "targetBytes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public T(J)Ljava/lang/String;
-    .locals 11
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_4
-
-    const-wide/16 v0, 0x1
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    cmp-long v4, p1, v2
-
-    if-nez v4, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    add-long v2, p1, v0
-
-    :goto_1
-    const/16 v4, 0xa
-
-    int-to-byte v10, v4
-
-    const-wide/16 v6, 0x0
-
-    move-object v4, p0
-
-    move v5, v10
-
-    move-wide v8, v2
-
-    invoke-virtual/range {v4 .. v9}, Lo0/e;->f(BJJ)J
-
-    move-result-wide v4
-
-    const-wide/16 v6, -0x1
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_2
-
-    invoke-virtual {p0, v4, v5}, Lo0/e;->z(J)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    iget-wide v4, p0, Lo0/e;->e:J
-
-    cmp-long v6, v2, v4
-
-    if-gez v6, :cond_3
-
-    sub-long v0, v2, v0
-
-    invoke-virtual {p0, v0, v1}, Lo0/e;->e(J)B
-
-    move-result v0
-
-    const/16 v1, 0xd
-
-    int-to-byte v1, v1
-
-    if-ne v0, v1, :cond_3
-
-    invoke-virtual {p0, v2, v3}, Lo0/e;->e(J)B
-
-    move-result v0
-
-    if-ne v0, v10, :cond_3
-
-    invoke-virtual {p0, v2, v3}, Lo0/e;->z(J)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    new-instance v6, Lo0/e;
-
-    invoke-direct {v6}, Lo0/e;-><init>()V
-
-    const-wide/16 v2, 0x0
-
-    const/16 v0, 0x20
-
-    iget-wide v4, p0, Lo0/e;->e:J
-
-    int-to-long v0, v0
-
-    invoke-static {v0, v1, v4, v5}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v4
-
-    move-object v0, p0
-
-    move-object v1, v6
-
-    invoke-virtual/range {v0 .. v5}, Lo0/e;->d(Lo0/e;JJ)Lo0/e;
-
-    new-instance v0, Ljava/io/EOFException;
-
-    const-string v1, "\\n not found: limit="
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-wide v2, p0, Lo0/e;->e:J
-
-    invoke-static {v2, v3, p1, p2}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide p1
-
-    invoke-virtual {v1, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string p1, " content="
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v6}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lo0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 p1, 0x2026
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v0, "limit < 0: "
-
-    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public U(I)Lo0/e;
-    .locals 8
-
-    const/16 v0, 0x80
-
-    if-ge p1, v0, :cond_0
-
-    invoke-virtual {p0, p1}, Lo0/e;->I(I)Lo0/e;
-
-    goto/16 :goto_1
-
-    :cond_0
-    const/16 v1, 0x800
-
-    const/16 v2, 0x3f
-
-    if-ge p1, v1, :cond_1
-
-    const/4 v1, 0x2
-
-    invoke-virtual {p0, v1}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v3
-
-    iget-object v4, v3, Lo0/r;->a:[B
-
-    iget v5, v3, Lo0/r;->c:I
-
-    shr-int/lit8 v6, p1, 0x6
-
-    or-int/lit16 v6, v6, 0xc0
-
-    int-to-byte v6, v6
-
-    aput-byte v6, v4, v5
-
-    add-int/lit8 v6, v5, 0x1
-
-    and-int/2addr p1, v2
-
-    or-int/2addr p1, v0
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v4, v6
-
-    add-int/2addr v5, v1
-
-    iput v5, v3, Lo0/r;->c:I
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x2
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    goto/16 :goto_1
-
-    :cond_1
-    const v1, 0xdfff
-
-    const v3, 0xd800
-
-    if-le v3, p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    if-lt v1, p1, :cond_3
-
-    invoke-virtual {p0, v2}, Lo0/e;->I(I)Lo0/e;
-
-    goto :goto_1
-
-    :cond_3
-    :goto_0
-    const/high16 v1, 0x10000
-
-    if-ge p1, v1, :cond_4
-
-    const/4 v1, 0x3
-
-    invoke-virtual {p0, v1}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v3
-
-    iget-object v4, v3, Lo0/r;->a:[B
-
-    iget v5, v3, Lo0/r;->c:I
-
-    shr-int/lit8 v6, p1, 0xc
-
-    or-int/lit16 v6, v6, 0xe0
-
-    int-to-byte v6, v6
-
-    aput-byte v6, v4, v5
-
-    add-int/lit8 v6, v5, 0x1
-
-    shr-int/lit8 v7, p1, 0x6
-
-    and-int/2addr v7, v2
-
-    or-int/2addr v7, v0
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v4, v6
-
-    add-int/lit8 v6, v5, 0x2
-
-    and-int/2addr p1, v2
-
-    or-int/2addr p1, v0
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v4, v6
-
-    add-int/2addr v5, v1
-
-    iput v5, v3, Lo0/r;->c:I
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x3
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    goto :goto_1
-
-    :cond_4
-    const v1, 0x10ffff
-
-    if-gt p1, v1, :cond_5
-
-    const/4 v1, 0x4
-
-    invoke-virtual {p0, v1}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v3
-
-    iget-object v4, v3, Lo0/r;->a:[B
-
-    iget v5, v3, Lo0/r;->c:I
-
-    shr-int/lit8 v6, p1, 0x12
-
-    or-int/lit16 v6, v6, 0xf0
-
-    int-to-byte v6, v6
-
-    aput-byte v6, v4, v5
-
-    add-int/lit8 v6, v5, 0x1
-
-    shr-int/lit8 v7, p1, 0xc
-
-    and-int/2addr v7, v2
-
-    or-int/2addr v7, v0
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v4, v6
-
-    add-int/lit8 v6, v5, 0x2
-
-    shr-int/lit8 v7, p1, 0x6
-
-    and-int/2addr v7, v2
-
-    or-int/2addr v7, v0
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v4, v6
-
-    add-int/lit8 v6, v5, 0x3
-
-    and-int/2addr p1, v2
-
-    or-int/2addr p1, v0
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v4, v6
-
-    add-int/2addr v5, v1
-
-    iput v5, v3, Lo0/r;->c:I
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x4
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    :goto_1
-    return-object p0
-
-    :cond_5
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "Unexpected code point: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-static {p1}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public U0()J
-    .locals 15
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_a
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    move-wide v4, v2
-
-    :cond_0
-    iget-object v6, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v6, :cond_9
-
-    iget-object v7, v6, Lo0/r;->a:[B
-
-    iget v8, v6, Lo0/r;->b:I
-
-    iget v9, v6, Lo0/r;->c:I
-
-    :goto_0
-    if-ge v8, v9, :cond_6
-
-    aget-byte v10, v7, v8
-
-    const/16 v11, 0x30
-
-    int-to-byte v11, v11
-
-    if-lt v10, v11, :cond_1
-
-    const/16 v12, 0x39
-
-    int-to-byte v12, v12
-
-    if-gt v10, v12, :cond_1
-
-    sub-int v11, v10, v11
-
-    goto :goto_2
-
-    :cond_1
-    const/16 v11, 0x61
-
-    int-to-byte v11, v11
-
-    if-lt v10, v11, :cond_2
-
-    const/16 v12, 0x66
-
-    int-to-byte v12, v12
-
-    if-gt v10, v12, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v11, 0x41
-
-    int-to-byte v11, v11
-
-    if-lt v10, v11, :cond_4
-
-    const/16 v12, 0x46
-
-    int-to-byte v12, v12
-
-    if-gt v10, v12, :cond_4
-
-    :goto_1
-    sub-int v11, v10, v11
-
-    add-int/lit8 v11, v11, 0xa
-
-    :goto_2
-    const-wide/high16 v12, -0x1000000000000000L    # -3.105036184601418E231
-
-    and-long/2addr v12, v4
-
-    cmp-long v14, v12, v2
-
-    if-nez v14, :cond_3
-
-    const/4 v10, 0x4
-
-    shl-long/2addr v4, v10
-
-    int-to-long v10, v11
-
-    or-long/2addr v4, v10
-
-    add-int/lit8 v8, v8, 0x1
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    new-instance v0, Lo0/e;
-
-    invoke-direct {v0}, Lo0/e;-><init>()V
-
-    invoke-virtual {v0, v4, v5}, Lo0/e;->L(J)Lo0/e;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v10}, Lo0/e;->I(I)Lo0/e;
-
-    new-instance v1, Ljava/lang/NumberFormatException;
-
-    const-string v2, "Number too large: "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-virtual {v0}, Lo0/e;->v()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/NumberFormatException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4
-    if-eqz v0, :cond_5
-
-    const/4 v1, 0x1
-
-    goto :goto_3
-
-    :cond_5
-    new-instance v0, Ljava/lang/NumberFormatException;
-
-    const-string v1, "Expected leading [0-9a-fA-F] character but was 0x"
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-static {v10}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/NumberFormatException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_6
-    :goto_3
-    if-ne v8, v9, :cond_7
-
-    invoke-virtual {v6}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v7
-
-    iput-object v7, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v6}, Lo0/s;->a(Lo0/r;)V
-
-    goto :goto_4
-
-    :cond_7
-    iput v8, v6, Lo0/r;->b:I
-
-    :goto_4
-    if-nez v1, :cond_8
-
-    iget-object v6, p0, Lo0/e;->d:Lo0/r;
-
-    if-nez v6, :cond_0
-
-    :cond_8
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    int-to-long v6, v0
-
-    sub-long/2addr v1, v6
-
-    iput-wide v1, p0, Lo0/e;->e:J
-
-    return-wide v4
-
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_a
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-.end method
-
-.method public W0()Ljava/io/InputStream;
-    .locals 1
-
-    new-instance v0, Lo0/e$b;
-
-    invoke-direct {v0, p0}, Lo0/e$b;-><init>(Lo0/e;)V
-
-    return-object v0
-.end method
-
-.method public X0(Lo0/n;)I
-    .locals 3
-
-    if-eqz p1, :cond_1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, v0}, Lo0/e;->A(Lo0/n;Z)I
-
-    move-result v0
-
-    const/4 v1, -0x1
-
-    if-ne v0, v1, :cond_0
-
-    return v1
-
-    :cond_0
-    iget-object p1, p1, Lo0/n;->d:[Lokio/ByteString;
-
-    aget-object p1, p1, v0
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result p1
-
-    int-to-long v1, p1
-
-    invoke-virtual {p0, v1, v2}, Lo0/e;->skip(J)V
-
-    return v0
-
-    :cond_1
-    const-string p1, "options"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public bridge synthetic a0(Ljava/lang/String;)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
-
-    return-object p0
-.end method
-
-.method public b()Lo0/e;
-    .locals 6
-
-    new-instance v0, Lo0/e;
-
-    invoke-direct {v0}, Lo0/e;-><init>()V
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_0
-
-    return-object v0
-
-    :cond_0
-    iget-object v1, p0, Lo0/e;->d:Lo0/r;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_9
-
-    invoke-virtual {v1}, Lo0/r;->c()Lo0/r;
-
-    move-result-object v1
-
-    iput-object v1, v0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v1, :cond_8
-
-    iput-object v1, v1, Lo0/r;->g:Lo0/r;
-
-    if-eqz v1, :cond_7
-
-    if-eqz v1, :cond_6
-
-    iput-object v1, v1, Lo0/r;->f:Lo0/r;
-
-    iget-object v1, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v1, :cond_5
-
-    iget-object v1, v1, Lo0/r;->f:Lo0/r;
-
-    :goto_0
-    iget-object v3, p0, Lo0/e;->d:Lo0/r;
-
-    if-eq v1, v3, :cond_4
-
-    iget-object v3, v0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v3, :cond_3
-
-    iget-object v3, v3, Lo0/r;->g:Lo0/r;
-
-    if-eqz v3, :cond_2
+    iget-boolean v1, p0, Lo0/e;->b:Z
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v1}, Lo0/r;->c()Lo0/r;
+    const-string v1, "no-store, "
 
-    move-result-object v4
-
-    invoke-virtual {v3, v4}, Lo0/r;->b(Lo0/r;)Lo0/r;
-
-    iget-object v1, v1, Lo0/r;->f:Lo0/r;
-
-    goto :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    iget v1, p0, Lo0/e;->c:I
 
-    throw v2
+    const-string v2, ", "
+
+    const/4 v3, -0x1
+
+    if-eq v1, v3, :cond_2
+
+    const-string v1, "max-age="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lo0/e;->c:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    iget v1, p0, Lo0/e;->d:I
 
-    throw v2
+    if-eq v1, v3, :cond_3
+
+    const-string v1, "s-maxage="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lo0/e;->d:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_4
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    iput-wide v1, v0, Lo0/e;->e:J
-
-    return-object v0
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-
-    :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v2
-.end method
-
-.method public b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
-    .locals 2
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    invoke-virtual {p0, v0, v1, p1}, Lo0/e;->t(JLjava/nio/charset/Charset;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final c()J
-    .locals 5
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    return-wide v2
-
-    :cond_0
-    iget-object v2, p0, Lo0/e;->d:Lo0/r;
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_3
-
-    iget-object v2, v2, Lo0/r;->g:Lo0/r;
-
-    if-eqz v2, :cond_2
-
-    iget v3, v2, Lo0/r;->c:I
-
-    const/16 v4, 0x2000
-
-    if-ge v3, v4, :cond_1
-
-    iget-boolean v4, v2, Lo0/r;->e:Z
-
-    if-eqz v4, :cond_1
-
-    iget v2, v2, Lo0/r;->b:I
-
-    sub-int/2addr v3, v2
-
-    int-to-long v2, v3
-
-    sub-long/2addr v0, v2
-
-    :cond_1
-    return-wide v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v3
-.end method
-
-.method public bridge synthetic clone()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/e;->b()Lo0/e;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public close()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final d(Lo0/e;JJ)Lo0/e;
-    .locals 9
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_8
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    move-wide v3, p2
-
-    move-wide v5, p4
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
-
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p4, v1
-
-    if-nez v3, :cond_0
-
-    return-object p0
-
-    :cond_0
-    iget-wide v3, p1, Lo0/e;->e:J
-
-    add-long/2addr v3, p4
-
-    iput-wide v3, p1, Lo0/e;->e:J
-
-    iget-object v3, p0, Lo0/e;->d:Lo0/r;
-
-    :goto_0
-    if-eqz v3, :cond_7
-
-    iget v4, v3, Lo0/r;->c:I
-
-    iget v5, v3, Lo0/r;->b:I
-
-    sub-int v6, v4, v5
-
-    int-to-long v6, v6
-
-    cmp-long v8, p2, v6
-
-    if-ltz v8, :cond_1
-
-    sub-int/2addr v4, v5
-
-    int-to-long v4, v4
-
-    sub-long/2addr p2, v4
-
-    iget-object v3, v3, Lo0/r;->f:Lo0/r;
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    cmp-long v4, p4, v1
-
-    if-lez v4, :cond_6
-
-    if-eqz v3, :cond_5
-
-    invoke-virtual {v3}, Lo0/r;->c()Lo0/r;
-
-    move-result-object v4
-
-    iget v5, v4, Lo0/r;->b:I
-
-    long-to-int p3, p2
-
-    add-int/2addr v5, p3
-
-    iput v5, v4, Lo0/r;->b:I
-
-    long-to-int p2, p4
-
-    add-int/2addr v5, p2
-
-    iget p2, v4, Lo0/r;->c:I
-
-    invoke-static {v5, p2}, Ljava/lang/Math;->min(II)I
-
-    move-result p2
-
-    iput p2, v4, Lo0/r;->c:I
-
-    iget-object p2, p1, Lo0/e;->d:Lo0/r;
-
-    if-nez p2, :cond_2
-
-    iput-object v4, v4, Lo0/r;->g:Lo0/r;
-
-    iput-object v4, v4, Lo0/r;->f:Lo0/r;
-
-    iput-object v4, p1, Lo0/e;->d:Lo0/r;
-
-    goto :goto_2
-
-    :cond_2
-    if-eqz p2, :cond_4
-
-    iget-object p2, p2, Lo0/r;->g:Lo0/r;
-
-    if-eqz p2, :cond_3
-
-    invoke-virtual {p2, v4}, Lo0/r;->b(Lo0/r;)Lo0/r;
-
-    :goto_2
-    iget p2, v4, Lo0/r;->c:I
-
-    iget p3, v4, Lo0/r;->b:I
-
-    sub-int/2addr p2, p3
-
-    int-to-long p2, p2
-
-    sub-long/2addr p4, p2
-
-    iget-object v3, v3, Lo0/r;->f:Lo0/r;
-
-    move-wide p2, v1
-
-    goto :goto_1
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_6
-    return-object p0
-
-    :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_8
-    const-string p1, "out"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final e(J)B
-    .locals 8
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v4, 0x1
-
-    move-wide v2, p1
-
-    invoke-static/range {v0 .. v5}, Lf/n/a/k/a;->t(JJJ)V
-
-    iget-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_5
-
-    iget-wide v2, p0, Lo0/e;->e:J
-
-    sub-long v4, v2, p1
-
-    cmp-long v6, v4, p1
-
-    if-gez v6, :cond_2
-
-    :goto_0
-    cmp-long v4, v2, p1
-
-    if-lez v4, :cond_1
-
-    iget-object v0, v0, Lo0/r;->g:Lo0/r;
-
-    if-eqz v0, :cond_0
-
-    iget v4, v0, Lo0/r;->c:I
-
-    iget v5, v0, Lo0/r;->b:I
-
-    sub-int/2addr v4, v5
-
-    int-to-long v4, v4
-
-    sub-long/2addr v2, v4
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_1
-    iget-object v1, v0, Lo0/r;->a:[B
-
-    iget v0, v0, Lo0/r;->b:I
-
-    int-to-long v4, v0
-
-    add-long/2addr v4, p1
-
-    sub-long/2addr v4, v2
-
-    long-to-int p1, v4
-
-    aget-byte p1, v1, p1
-
-    return p1
-
-    :cond_2
-    const-wide/16 v2, 0x0
-
-    :goto_1
-    iget v4, v0, Lo0/r;->c:I
-
-    iget v5, v0, Lo0/r;->b:I
-
-    sub-int/2addr v4, v5
-
-    int-to-long v6, v4
-
-    add-long/2addr v6, v2
-
-    cmp-long v4, v6, p1
-
-    if-lez v4, :cond_3
-
-    iget-object v0, v0, Lo0/r;->a:[B
-
-    int-to-long v4, v5
-
-    add-long/2addr v4, p1
-
-    sub-long/2addr v4, v2
-
-    long-to-int p1, v4
-
-    aget-byte p1, v0, p1
-
-    return p1
-
-    :cond_3
-    iget-object v0, v0, Lo0/r;->f:Lo0/r;
-
-    if-eqz v0, :cond_4
-
-    move-wide v2, v6
-
-    goto :goto_1
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 18
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    const/4 v2, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    return v2
-
-    :cond_0
-    instance-of v3, v1, Lo0/e;
-
-    const/4 v4, 0x0
-
-    if-nez v3, :cond_1
-
-    return v4
-
-    :cond_1
-    iget-wide v5, v0, Lo0/e;->e:J
-
-    check-cast v1, Lo0/e;
-
-    iget-wide v7, v1, Lo0/e;->e:J
-
-    cmp-long v3, v5, v7
-
-    if-eqz v3, :cond_2
-
-    return v4
-
-    :cond_2
-    const-wide/16 v7, 0x0
-
-    cmp-long v3, v5, v7
-
-    if-nez v3, :cond_3
-
-    return v2
-
-    :cond_3
-    iget-object v3, v0, Lo0/e;->d:Lo0/r;
-
-    const/4 v5, 0x0
-
-    if-eqz v3, :cond_c
-
-    iget-object v1, v1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v1, :cond_b
-
-    iget v6, v3, Lo0/r;->b:I
-
-    iget v9, v1, Lo0/r;->b:I
-
-    move-wide v10, v7
-
-    :goto_0
-    iget-wide v12, v0, Lo0/e;->e:J
-
-    cmp-long v14, v10, v12
-
-    if-gez v14, :cond_a
-
-    iget v12, v3, Lo0/r;->c:I
-
-    sub-int/2addr v12, v6
-
-    iget v13, v1, Lo0/r;->c:I
-
-    sub-int/2addr v13, v9
-
-    invoke-static {v12, v13}, Ljava/lang/Math;->min(II)I
-
-    move-result v12
-
-    int-to-long v12, v12
-
-    move-wide v14, v7
-
-    :goto_1
-    cmp-long v16, v14, v12
-
-    if-gez v16, :cond_5
-
-    iget-object v7, v3, Lo0/r;->a:[B
-
-    add-int/lit8 v8, v6, 0x1
-
-    aget-byte v6, v7, v6
-
-    iget-object v7, v1, Lo0/r;->a:[B
-
-    add-int/lit8 v17, v9, 0x1
-
-    aget-byte v7, v7, v9
-
-    if-eq v6, v7, :cond_4
-
-    return v4
-
-    :cond_4
-    const-wide/16 v6, 0x1
-
-    add-long/2addr v14, v6
-
-    move v6, v8
-
-    move/from16 v9, v17
-
-    const-wide/16 v7, 0x0
-
-    goto :goto_1
-
-    :cond_5
-    iget v7, v3, Lo0/r;->c:I
-
-    if-ne v6, v7, :cond_7
-
-    iget-object v3, v3, Lo0/r;->f:Lo0/r;
-
-    if-eqz v3, :cond_6
-
-    iget v6, v3, Lo0/r;->b:I
-
-    goto :goto_2
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_7
-    :goto_2
-    iget v7, v1, Lo0/r;->c:I
-
-    if-ne v9, v7, :cond_9
-
-    iget-object v1, v1, Lo0/r;->f:Lo0/r;
-
-    if-eqz v1, :cond_8
-
-    iget v7, v1, Lo0/r;->b:I
-
-    move v9, v7
-
-    goto :goto_3
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_9
-    :goto_3
-    add-long/2addr v10, v12
-
-    const-wide/16 v7, 0x0
-
-    goto :goto_0
-
-    :cond_a
-    return v2
-
-    :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-
-    :cond_c
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v5
-.end method
-
-.method public f(BJJ)J
-    .locals 17
-
-    move-object/from16 v0, p0
-
-    move/from16 v1, p1
-
-    move-wide/from16 v2, p2
-
-    move-wide/from16 v4, p4
-
-    const-wide/16 v6, 0x0
-
-    cmp-long v8, v6, v2
-
-    if-lez v8, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    cmp-long v8, v4, v2
-
-    if-ltz v8, :cond_1
-
-    const/4 v8, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 v8, 0x0
-
-    :goto_1
-    if-eqz v8, :cond_12
-
-    iget-wide v8, v0, Lo0/e;->e:J
-
-    cmp-long v10, v4, v8
-
-    if-lez v10, :cond_2
-
-    move-wide v4, v8
-
-    :cond_2
-    const-wide/16 v8, -0x1
-
-    cmp-long v10, v2, v4
-
-    if-nez v10, :cond_3
-
-    return-wide v8
-
-    :cond_3
-    iget-object v10, v0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v10, :cond_11
-
-    iget-wide v11, v0, Lo0/e;->e:J
-
-    sub-long v13, v11, v2
-
-    const/4 v15, 0x0
-
-    cmp-long v16, v13, v2
-
-    if-gez v16, :cond_a
-
-    :goto_2
-    cmp-long v6, v11, v2
-
-    if-lez v6, :cond_5
-
-    iget-object v10, v10, Lo0/r;->g:Lo0/r;
-
-    if-eqz v10, :cond_4
-
-    iget v6, v10, Lo0/r;->c:I
-
-    iget v7, v10, Lo0/r;->b:I
-
-    sub-int/2addr v6, v7
-
-    int-to-long v6, v6
-
-    sub-long/2addr v11, v6
-
-    goto :goto_2
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v15
-
-    :cond_5
-    :goto_3
-    cmp-long v6, v11, v4
-
-    if-gez v6, :cond_9
-
-    iget-object v6, v10, Lo0/r;->a:[B
-
-    iget v7, v10, Lo0/r;->c:I
-
-    int-to-long v7, v7
-
-    iget v9, v10, Lo0/r;->b:I
-
-    int-to-long v13, v9
-
-    add-long/2addr v13, v4
-
-    sub-long/2addr v13, v11
-
-    invoke-static {v7, v8, v13, v14}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v7
-
-    long-to-int v8, v7
-
-    iget v7, v10, Lo0/r;->b:I
-
-    int-to-long v13, v7
-
-    add-long/2addr v13, v2
-
-    sub-long/2addr v13, v11
-
-    long-to-int v2, v13
-
-    :goto_4
-    if-ge v2, v8, :cond_7
-
-    aget-byte v3, v6, v2
-
-    if-ne v3, v1, :cond_6
-
-    iget v1, v10, Lo0/r;->b:I
-
-    sub-int/2addr v2, v1
-
-    int-to-long v1, v2
-
-    add-long/2addr v1, v11
-
-    return-wide v1
-
-    :cond_6
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_4
-
-    :cond_7
-    iget v2, v10, Lo0/r;->c:I
-
-    iget v3, v10, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    int-to-long v2, v2
-
-    add-long/2addr v11, v2
-
-    iget-object v10, v10, Lo0/r;->f:Lo0/r;
-
-    if-eqz v10, :cond_8
-
-    const-wide/16 v8, -0x1
-
-    move-wide v2, v11
-
-    goto :goto_3
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v15
-
-    :cond_9
-    return-wide v8
-
-    :cond_a
-    :goto_5
-    iget v8, v10, Lo0/r;->c:I
-
-    iget v9, v10, Lo0/r;->b:I
-
-    sub-int/2addr v8, v9
-
-    int-to-long v8, v8
-
-    add-long/2addr v8, v6
-
-    cmp-long v11, v8, v2
-
-    if-lez v11, :cond_f
-
-    :goto_6
-    cmp-long v8, v6, v4
-
-    if-gez v8, :cond_e
-
-    iget-object v8, v10, Lo0/r;->a:[B
-
-    iget v9, v10, Lo0/r;->c:I
-
-    int-to-long v11, v9
-
-    iget v9, v10, Lo0/r;->b:I
-
-    int-to-long v13, v9
-
-    add-long/2addr v13, v4
-
-    sub-long/2addr v13, v6
-
-    invoke-static {v11, v12, v13, v14}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v11
-
-    long-to-int v9, v11
-
-    iget v11, v10, Lo0/r;->b:I
-
-    int-to-long v11, v11
-
-    add-long/2addr v11, v2
-
-    sub-long/2addr v11, v6
-
-    long-to-int v2, v11
-
-    :goto_7
-    if-ge v2, v9, :cond_c
-
-    aget-byte v3, v8, v2
-
-    if-ne v3, v1, :cond_b
-
-    iget v1, v10, Lo0/r;->b:I
-
-    sub-int/2addr v2, v1
-
-    int-to-long v1, v2
-
-    add-long/2addr v1, v6
-
-    return-wide v1
-
-    :cond_b
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_7
-
-    :cond_c
-    iget v2, v10, Lo0/r;->c:I
-
-    iget v3, v10, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    int-to-long v2, v2
-
-    add-long/2addr v6, v2
-
-    iget-object v10, v10, Lo0/r;->f:Lo0/r;
-
-    if-eqz v10, :cond_d
-
-    move-wide v2, v6
-
-    goto :goto_6
-
-    :cond_d
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v15
-
-    :cond_e
-    const-wide/16 v1, -0x1
-
-    return-wide v1
-
-    :cond_f
-    iget-object v10, v10, Lo0/r;->f:Lo0/r;
-
-    if-eqz v10, :cond_10
-
-    move-wide v6, v8
-
-    goto :goto_5
-
-    :cond_10
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v15
-
-    :cond_11
-    return-wide v8
-
-    :cond_12
-    const-string v1, "size="
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-wide v6, v0, Lo0/e;->e:J
-
-    invoke-virtual {v1, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v6, " fromIndex="
-
-    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v2, " toIndex="
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-.end method
-
-.method public flush()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public g(Lokio/ByteString;J)J
-    .locals 18
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-wide/from16 v2, p2
-
-    const-wide/16 v4, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
-
-    cmp-long v8, v2, v4
-
-    if-ltz v8, :cond_0
-
-    const/4 v8, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v8, 0x0
-
-    :goto_0
-    if-eqz v8, :cond_1b
-
-    iget-object v8, v0, Lo0/e;->d:Lo0/r;
-
-    const-wide/16 v9, -0x1
-
-    if-eqz v8, :cond_1a
-
-    iget-wide v11, v0, Lo0/e;->e:J
-
-    sub-long v13, v11, v2
-
-    const/4 v15, 0x2
-
-    const/16 v16, 0x0
-
-    cmp-long v17, v13, v2
-
-    if-gez v17, :cond_d
-
-    :goto_1
-    cmp-long v4, v11, v2
-
-    if-lez v4, :cond_2
-
-    iget-object v8, v8, Lo0/r;->g:Lo0/r;
-
-    if-eqz v8, :cond_1
-
-    iget v4, v8, Lo0/r;->c:I
-
-    iget v5, v8, Lo0/r;->b:I
-
-    sub-int/2addr v4, v5
-
-    int-to-long v4, v4
-
-    sub-long/2addr v11, v4
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v16
-
-    :cond_2
-    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->h()I
-
-    move-result v4
-
-    if-ne v4, v15, :cond_7
-
-    invoke-virtual {v1, v6}, Lokio/ByteString;->k(I)B
-
-    move-result v4
-
-    invoke-virtual {v1, v7}, Lokio/ByteString;->k(I)B
-
-    move-result v1
-
-    :goto_2
-    iget-wide v5, v0, Lo0/e;->e:J
-
-    cmp-long v7, v11, v5
-
-    if-gez v7, :cond_c
-
-    iget-object v5, v8, Lo0/r;->a:[B
-
-    iget v6, v8, Lo0/r;->b:I
-
-    int-to-long v6, v6
-
-    add-long/2addr v6, v2
-
-    sub-long/2addr v6, v11
-
-    long-to-int v2, v6
-
-    iget v3, v8, Lo0/r;->c:I
-
-    :goto_3
-    if-ge v2, v3, :cond_5
-
-    aget-byte v6, v5, v2
-
-    if-eq v6, v4, :cond_4
-
-    if-ne v6, v1, :cond_3
-
-    goto :goto_4
-
-    :cond_3
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_3
-
-    :cond_4
-    :goto_4
-    iget v1, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v1
-
-    int-to-long v1, v2
-
-    add-long/2addr v1, v11
-
-    return-wide v1
-
-    :cond_5
-    iget v2, v8, Lo0/r;->c:I
-
-    iget v3, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    int-to-long v2, v2
-
-    add-long/2addr v11, v2
-
-    iget-object v8, v8, Lo0/r;->f:Lo0/r;
-
-    if-eqz v8, :cond_6
-
-    move-wide v2, v11
-
-    goto :goto_2
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v16
-
-    :cond_7
-    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->j()[B
-
-    move-result-object v1
-
-    :goto_5
-    iget-wide v4, v0, Lo0/e;->e:J
-
-    cmp-long v6, v11, v4
-
-    if-gez v6, :cond_c
-
-    iget-object v4, v8, Lo0/r;->a:[B
-
-    iget v5, v8, Lo0/r;->b:I
-
-    int-to-long v5, v5
-
-    add-long/2addr v5, v2
-
-    sub-long/2addr v5, v11
-
-    long-to-int v2, v5
-
-    iget v3, v8, Lo0/r;->c:I
-
-    :goto_6
-    if-ge v2, v3, :cond_a
-
-    aget-byte v5, v4, v2
-
-    array-length v6, v1
-
-    const/4 v7, 0x0
-
-    :goto_7
-    if-ge v7, v6, :cond_9
-
-    aget-byte v13, v1, v7
-
-    if-ne v5, v13, :cond_8
-
-    iget v1, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v1
-
-    int-to-long v1, v2
-
-    add-long/2addr v1, v11
-
-    return-wide v1
-
-    :cond_8
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_7
-
-    :cond_9
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_6
-
-    :cond_a
-    iget v2, v8, Lo0/r;->c:I
-
-    iget v3, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    int-to-long v2, v2
-
-    add-long/2addr v11, v2
-
-    iget-object v8, v8, Lo0/r;->f:Lo0/r;
-
-    if-eqz v8, :cond_b
-
-    move-wide v2, v11
-
-    goto :goto_5
-
-    :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v16
-
-    :cond_c
-    return-wide v9
-
-    :cond_d
-    :goto_8
-    iget v11, v8, Lo0/r;->c:I
-
-    iget v12, v8, Lo0/r;->b:I
-
-    sub-int/2addr v11, v12
-
-    int-to-long v11, v11
-
-    add-long/2addr v11, v4
-
-    cmp-long v13, v11, v2
-
-    if-lez v13, :cond_18
-
-    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->h()I
-
-    move-result v11
-
-    if-ne v11, v15, :cond_12
-
-    invoke-virtual {v1, v6}, Lokio/ByteString;->k(I)B
-
-    move-result v6
-
-    invoke-virtual {v1, v7}, Lokio/ByteString;->k(I)B
-
-    move-result v1
-
-    :goto_9
-    iget-wide v11, v0, Lo0/e;->e:J
-
-    cmp-long v7, v4, v11
-
-    if-gez v7, :cond_17
-
-    iget-object v7, v8, Lo0/r;->a:[B
-
-    iget v11, v8, Lo0/r;->b:I
-
-    int-to-long v11, v11
-
-    add-long/2addr v11, v2
-
-    sub-long/2addr v11, v4
-
-    long-to-int v2, v11
-
-    iget v3, v8, Lo0/r;->c:I
-
-    :goto_a
-    if-ge v2, v3, :cond_10
-
-    aget-byte v11, v7, v2
-
-    if-eq v11, v6, :cond_f
-
-    if-ne v11, v1, :cond_e
-
-    goto :goto_b
-
-    :cond_e
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_a
-
-    :cond_f
-    :goto_b
-    iget v1, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v1
-
-    int-to-long v1, v2
-
-    add-long/2addr v1, v4
-
-    return-wide v1
-
-    :cond_10
-    iget v2, v8, Lo0/r;->c:I
-
-    iget v3, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    int-to-long v2, v2
-
-    add-long/2addr v4, v2
-
-    iget-object v8, v8, Lo0/r;->f:Lo0/r;
-
-    if-eqz v8, :cond_11
-
-    move-wide v2, v4
-
-    goto :goto_9
-
-    :cond_11
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v16
-
-    :cond_12
-    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->j()[B
-
-    move-result-object v1
-
-    :goto_c
-    iget-wide v6, v0, Lo0/e;->e:J
-
-    cmp-long v11, v4, v6
-
-    if-gez v11, :cond_17
-
-    iget-object v6, v8, Lo0/r;->a:[B
-
-    iget v7, v8, Lo0/r;->b:I
-
-    int-to-long v11, v7
-
-    add-long/2addr v11, v2
-
-    sub-long/2addr v11, v4
-
-    long-to-int v2, v11
-
-    iget v3, v8, Lo0/r;->c:I
-
-    :goto_d
-    if-ge v2, v3, :cond_15
-
-    aget-byte v7, v6, v2
-
-    array-length v11, v1
-
-    const/4 v12, 0x0
-
-    :goto_e
-    if-ge v12, v11, :cond_14
-
-    aget-byte v13, v1, v12
-
-    if-ne v7, v13, :cond_13
-
-    iget v1, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v1
-
-    int-to-long v1, v2
-
-    add-long/2addr v1, v4
-
-    return-wide v1
-
-    :cond_13
-    add-int/lit8 v12, v12, 0x1
-
-    goto :goto_e
-
-    :cond_14
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_d
-
-    :cond_15
-    iget v2, v8, Lo0/r;->c:I
-
-    iget v3, v8, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    int-to-long v2, v2
-
-    add-long/2addr v4, v2
-
-    iget-object v8, v8, Lo0/r;->f:Lo0/r;
-
-    if-eqz v8, :cond_16
-
-    move-wide v2, v4
-
-    goto :goto_c
-
-    :cond_16
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v16
-
-    :cond_17
-    return-wide v9
-
-    :cond_18
-    iget-object v8, v8, Lo0/r;->f:Lo0/r;
-
-    if-eqz v8, :cond_19
-
-    move-wide v4, v11
-
-    goto/16 :goto_8
-
-    :cond_19
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v16
-
-    :cond_1a
-    return-wide v9
-
-    :cond_1b
-    const-string v1, "fromIndex < 0: "
-
-    invoke-static {v1, v2, v3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object v1
-
-    new-instance v2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v2
-.end method
-
-.method public h()Lo0/e;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public hashCode()I
-    .locals 5
-
-    iget-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v0, :cond_3
-
-    const/4 v1, 0x1
-
-    :cond_0
-    iget v2, v0, Lo0/r;->b:I
-
-    iget v3, v0, Lo0/r;->c:I
-
-    :goto_0
-    if-ge v2, v3, :cond_1
-
-    mul-int/lit8 v1, v1, 0x1f
-
-    iget-object v4, v0, Lo0/r;->a:[B
-
-    aget-byte v4, v4, v2
-
-    add-int/2addr v1, v4
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, v0, Lo0/r;->f:Lo0/r;
-
-    if-eqz v0, :cond_2
-
-    iget-object v2, p0, Lo0/e;->d:Lo0/r;
-
-    if-ne v0, v2, :cond_0
-
-    return v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_3
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final i(Lo0/e$a;)Lo0/e$a;
-    .locals 2
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p1, Lo0/e$a;->d:Lo0/e;
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iput-object p0, p1, Lo0/e$a;->d:Lo0/e;
-
-    iput-boolean v1, p1, Lo0/e$a;->e:Z
-
-    return-object p1
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "already attached to a buffer"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    const-string p1, "unsafeCursor"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public i0(Lo0/w;)J
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_1
-
-    const-wide/16 v0, 0x0
-
-    :goto_0
-    const/16 v2, 0x2000
-
-    int-to-long v2, v2
-
-    invoke-interface {p1, p0, v2, v3}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v2
-
-    const-wide/16 v4, -0x1
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    return-wide v0
-
-    :cond_0
-    add-long/2addr v0, v2
-
-    goto :goto_0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public isOpen()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public bridge synthetic j0(J)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1, p2}, Lo0/e;->L(J)Lo0/e;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public m(J)Z
-    .locals 3
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    cmp-long v2, v0, p1
-
-    if-ltz v2, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public n()Lokio/ByteString;
-    .locals 3
-
-    new-instance v0, Lokio/ByteString;
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    invoke-virtual {p0, v1, v2}, Lo0/e;->t0(J)[B
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
-
-    return-object v0
-.end method
-
-.method public o0()Ljava/lang/String;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lo0/e;->T(J)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public r()S
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lo0/e;->readShort()S
-
-    move-result v0
-
-    const v1, 0xffff
-
-    and-int/2addr v0, v1
-
-    const v1, 0xff00
-
-    and-int/2addr v1, v0
-
-    ushr-int/lit8 v1, v1, 0x8
-
-    and-int/lit16 v0, v0, 0xff
-
-    shl-int/lit8 v0, v0, 0x8
-
-    or-int/2addr v0, v1
-
-    int-to-short v0, v0
-
-    return v0
-.end method
-
-.method public read(Ljava/nio/ByteBuffer;)I
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
-
-    move-result v1
-
-    iget v2, v0, Lo0/r;->c:I
-
-    iget v3, v0, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    invoke-static {v1, v2}, Ljava/lang/Math;->min(II)I
-
-    move-result v1
-
-    iget-object v2, v0, Lo0/r;->a:[B
-
-    iget v3, v0, Lo0/r;->b:I
-
-    invoke-virtual {p1, v2, v3, v1}, Ljava/nio/ByteBuffer;->put([BII)Ljava/nio/ByteBuffer;
-
-    iget p1, v0, Lo0/r;->b:I
-
-    add-int/2addr p1, v1
-
-    iput p1, v0, Lo0/r;->b:I
-
-    iget-wide v2, p0, Lo0/e;->e:J
-
-    int-to-long v4, v1
-
-    sub-long/2addr v2, v4
-
-    iput-wide v2, p0, Lo0/e;->e:J
-
-    iget v2, v0, Lo0/r;->c:I
-
-    if-ne p1, v2, :cond_0
-
-    invoke-virtual {v0}, Lo0/r;->a()Lo0/r;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v0}, Lo0/s;->a(Lo0/r;)V
-
-    :cond_0
-    return v1
-
-    :cond_1
-    const/4 p1, -0x1
-
-    return p1
-
-    :cond_2
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public read([BII)I
-    .locals 7
-
-    array-length v0, p1
-
-    int-to-long v1, v0
-
-    int-to-long v3, p2
-
-    int-to-long v5, p3
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
-
-    iget-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v0, :cond_1
-
-    iget v1, v0, Lo0/r;->c:I
-
-    iget v2, v0, Lo0/r;->b:I
-
-    sub-int/2addr v1, v2
-
-    invoke-static {p3, v1}, Ljava/lang/Math;->min(II)I
-
-    move-result p3
-
-    iget-object v1, v0, Lo0/r;->a:[B
-
-    iget v2, v0, Lo0/r;->b:I
-
-    invoke-static {v1, v2, p1, p2, p3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget p1, v0, Lo0/r;->b:I
-
-    add-int/2addr p1, p3
-
-    iput p1, v0, Lo0/r;->b:I
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    int-to-long v3, p3
-
-    sub-long/2addr v1, v3
-
-    iput-wide v1, p0, Lo0/e;->e:J
-
-    iget p2, v0, Lo0/r;->c:I
-
-    if-ne p1, p2, :cond_0
-
-    invoke-virtual {v0}, Lo0/r;->a()Lo0/r;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v0}, Lo0/s;->a(Lo0/r;)V
-
-    :cond_0
-    return p3
-
-    :cond_1
-    const/4 p1, -0x1
-
-    return p1
-.end method
-
-.method public readByte()B
-    .locals 9
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_2
-
-    iget-object v2, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v2, :cond_1
-
-    iget v3, v2, Lo0/r;->b:I
-
-    iget v4, v2, Lo0/r;->c:I
-
-    iget-object v5, v2, Lo0/r;->a:[B
-
-    add-int/lit8 v6, v3, 0x1
-
-    aget-byte v3, v5, v3
-
-    const-wide/16 v7, 0x1
-
-    sub-long/2addr v0, v7
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    if-ne v6, v4, :cond_0
-
-    invoke-virtual {v2}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v2}, Lo0/s;->a(Lo0/r;)V
-
-    goto :goto_0
-
-    :cond_0
-    iput v6, v2, Lo0/r;->b:I
-
-    :goto_0
-    return v3
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_2
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-.end method
-
-.method public readFully([B)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    const/4 v0, 0x0
-
-    :goto_0
-    array-length v1, p1
-
-    if-ge v0, v1, :cond_1
-
-    array-length v1, p1
-
-    sub-int/2addr v1, v0
-
-    invoke-virtual {p0, p1, v0, v1}, Lo0/e;->read([BII)I
-
-    move-result v1
-
-    const/4 v2, -0x1
-
-    if-eq v1, v2, :cond_0
-
-    add-int/2addr v0, v1
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    return-void
-
-    :cond_2
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public readInt()I
-    .locals 10
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x4
-
-    cmp-long v4, v0, v2
-
-    if-ltz v4, :cond_3
-
-    iget-object v4, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v4, :cond_2
-
-    iget v5, v4, Lo0/r;->b:I
-
-    iget v6, v4, Lo0/r;->c:I
-
-    sub-int v7, v6, v5
-
-    int-to-long v7, v7
-
-    cmp-long v9, v7, v2
-
-    if-gez v9, :cond_0
-
-    invoke-virtual {p0}, Lo0/e;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    shl-int/lit8 v0, v0, 0x18
-
-    invoke-virtual {p0}, Lo0/e;->readByte()B
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    shl-int/lit8 v1, v1, 0x10
-
-    or-int/2addr v0, v1
-
-    invoke-virtual {p0}, Lo0/e;->readByte()B
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    shl-int/lit8 v1, v1, 0x8
-
-    or-int/2addr v0, v1
-
-    invoke-virtual {p0}, Lo0/e;->readByte()B
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    or-int/2addr v0, v1
-
-    return v0
-
-    :cond_0
-    iget-object v7, v4, Lo0/r;->a:[B
-
-    add-int/lit8 v8, v5, 0x1
-
-    aget-byte v5, v7, v5
-
-    and-int/lit16 v5, v5, 0xff
-
-    shl-int/lit8 v5, v5, 0x18
-
-    add-int/lit8 v9, v8, 0x1
-
-    aget-byte v8, v7, v8
-
-    and-int/lit16 v8, v8, 0xff
-
-    shl-int/lit8 v8, v8, 0x10
-
-    or-int/2addr v5, v8
-
-    add-int/lit8 v8, v9, 0x1
-
-    aget-byte v9, v7, v9
-
-    and-int/lit16 v9, v9, 0xff
-
-    shl-int/lit8 v9, v9, 0x8
-
-    or-int/2addr v5, v9
-
-    add-int/lit8 v9, v8, 0x1
-
-    aget-byte v7, v7, v8
-
-    and-int/lit16 v7, v7, 0xff
-
-    or-int/2addr v5, v7
-
-    sub-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    if-ne v9, v6, :cond_1
-
-    invoke-virtual {v4}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v4}, Lo0/s;->a(Lo0/r;)V
-
-    goto :goto_0
-
-    :cond_1
-    iput v9, v4, Lo0/r;->b:I
-
-    :goto_0
-    return v5
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_3
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-.end method
-
-.method public readLong()J
-    .locals 15
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    move-object v0, p0
-
-    iget-wide v1, v0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x8
-
-    cmp-long v5, v1, v3
-
-    if-ltz v5, :cond_3
-
-    iget-object v5, v0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v5, :cond_2
-
-    iget v6, v5, Lo0/r;->b:I
-
-    iget v7, v5, Lo0/r;->c:I
-
-    sub-int v8, v7, v6
-
-    int-to-long v8, v8
-
-    const/16 v10, 0x20
-
-    cmp-long v11, v8, v3
-
-    if-gez v11, :cond_0
-
-    invoke-virtual {p0}, Lo0/e;->readInt()I
-
-    move-result v1
-
-    int-to-long v1, v1
-
-    const-wide v3, 0xffffffffL
-
-    and-long/2addr v1, v3
-
-    shl-long/2addr v1, v10
-
-    invoke-virtual {p0}, Lo0/e;->readInt()I
-
-    move-result v5
-
-    int-to-long v5, v5
-
-    and-long/2addr v3, v5
-
-    or-long/2addr v1, v3
-
-    return-wide v1
-
-    :cond_0
-    iget-object v8, v5, Lo0/r;->a:[B
-
-    add-int/lit8 v9, v6, 0x1
-
-    aget-byte v6, v8, v6
-
-    int-to-long v11, v6
-
-    const-wide/16 v13, 0xff
-
-    and-long/2addr v11, v13
-
-    const/16 v6, 0x38
-
-    shl-long/2addr v11, v6
-
-    add-int/lit8 v6, v9, 0x1
-
-    aget-byte v9, v8, v9
-
-    int-to-long v3, v9
-
-    and-long/2addr v3, v13
-
-    const/16 v9, 0x30
-
-    shl-long/2addr v3, v9
-
-    or-long/2addr v3, v11
-
-    add-int/lit8 v9, v6, 0x1
-
-    aget-byte v6, v8, v6
-
-    int-to-long v11, v6
-
-    and-long/2addr v11, v13
-
-    const/16 v6, 0x28
-
-    shl-long/2addr v11, v6
-
-    or-long/2addr v3, v11
-
-    add-int/lit8 v6, v9, 0x1
-
-    aget-byte v9, v8, v9
-
-    int-to-long v11, v9
-
-    and-long/2addr v11, v13
-
-    shl-long v9, v11, v10
-
-    or-long/2addr v3, v9
-
-    add-int/lit8 v9, v6, 0x1
-
-    aget-byte v6, v8, v6
-
-    int-to-long v10, v6
-
-    and-long/2addr v10, v13
-
-    const/16 v6, 0x18
-
-    shl-long/2addr v10, v6
-
-    or-long/2addr v3, v10
-
-    add-int/lit8 v6, v9, 0x1
-
-    aget-byte v9, v8, v9
-
-    int-to-long v9, v9
-
-    and-long/2addr v9, v13
-
-    const/16 v11, 0x10
-
-    shl-long/2addr v9, v11
-
-    or-long/2addr v3, v9
-
-    add-int/lit8 v9, v6, 0x1
-
-    aget-byte v6, v8, v6
-
-    int-to-long v10, v6
-
-    and-long/2addr v10, v13
-
-    const/16 v6, 0x8
-
-    shl-long/2addr v10, v6
-
-    or-long/2addr v3, v10
-
-    add-int/lit8 v6, v9, 0x1
-
-    aget-byte v8, v8, v9
-
-    int-to-long v8, v8
-
-    and-long/2addr v8, v13
-
-    or-long/2addr v3, v8
-
-    const-wide/16 v8, 0x8
-
-    sub-long/2addr v1, v8
-
-    iput-wide v1, v0, Lo0/e;->e:J
-
-    if-ne v6, v7, :cond_1
-
-    invoke-virtual {v5}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v1
-
-    iput-object v1, v0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v5}, Lo0/s;->a(Lo0/r;)V
-
-    goto :goto_0
-
-    :cond_1
-    iput v6, v5, Lo0/r;->b:I
-
-    :goto_0
-    return-wide v3
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v1, 0x0
-
-    throw v1
-
-    :cond_3
-    new-instance v1, Ljava/io/EOFException;
-
-    invoke-direct {v1}, Ljava/io/EOFException;-><init>()V
-
-    throw v1
-.end method
-
-.method public readShort()S
-    .locals 10
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x2
-
-    cmp-long v4, v0, v2
-
-    if-ltz v4, :cond_3
-
-    iget-object v4, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v4, :cond_2
-
-    iget v5, v4, Lo0/r;->b:I
-
-    iget v6, v4, Lo0/r;->c:I
-
-    sub-int v7, v6, v5
-
-    const/4 v8, 0x2
-
-    if-ge v7, v8, :cond_0
-
-    invoke-virtual {p0}, Lo0/e;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    shl-int/lit8 v0, v0, 0x8
-
-    invoke-virtual {p0}, Lo0/e;->readByte()B
-
-    move-result v1
-
-    and-int/lit16 v1, v1, 0xff
-
-    or-int/2addr v0, v1
-
-    int-to-short v0, v0
-
-    return v0
-
-    :cond_0
-    iget-object v7, v4, Lo0/r;->a:[B
-
-    add-int/lit8 v8, v5, 0x1
-
-    aget-byte v5, v7, v5
-
-    and-int/lit16 v5, v5, 0xff
-
-    shl-int/lit8 v5, v5, 0x8
-
-    add-int/lit8 v9, v8, 0x1
-
-    aget-byte v7, v7, v8
-
-    and-int/lit16 v7, v7, 0xff
-
-    or-int/2addr v5, v7
-
-    sub-long/2addr v0, v2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    if-ne v9, v6, :cond_1
-
-    invoke-virtual {v4}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v4}, Lo0/s;->a(Lo0/r;)V
-
-    goto :goto_0
-
-    :cond_1
-    iput v9, v4, Lo0/r;->b:I
-
-    :goto_0
-    int-to-short v0, v5
-
-    return v0
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_3
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-.end method
-
-.method public skip(J)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    :cond_0
-    :goto_0
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_2
-
-    iget-object v0, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v0, :cond_1
-
-    iget v1, v0, Lo0/r;->c:I
-
-    iget v2, v0, Lo0/r;->b:I
-
-    sub-int/2addr v1, v2
-
-    int-to-long v1, v1
-
-    invoke-static {p1, p2, v1, v2}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v1
-
-    long-to-int v2, v1
-
-    iget-wide v3, p0, Lo0/e;->e:J
-
-    int-to-long v5, v2
-
-    sub-long/2addr v3, v5
-
-    iput-wide v3, p0, Lo0/e;->e:J
-
-    sub-long/2addr p1, v5
-
-    iget v1, v0, Lo0/r;->b:I
-
-    add-int/2addr v1, v2
-
-    iput v1, v0, Lo0/r;->b:I
-
-    iget v2, v0, Lo0/r;->c:I
-
-    if-ne v1, v2, :cond_0
-
-    invoke-virtual {v0}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v0}, Lo0/s;->a(Lo0/r;)V
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-
-    :cond_2
-    return-void
-.end method
-
-.method public t(JLjava/nio/charset/Charset;)Ljava/lang/String;
-    .locals 7
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p3, :cond_7
-
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p1, v1
-
-    if-ltz v3, :cond_0
-
-    const v1, 0x7fffffff
-
-    int-to-long v1, v1
-
-    cmp-long v4, p1, v1
-
-    if-gtz v4, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_6
-
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    cmp-long v4, v1, p1
-
-    if-ltz v4, :cond_5
-
-    if-nez v3, :cond_1
-
-    const-string p1, ""
-
-    return-object p1
-
-    :cond_1
-    iget-object v1, p0, Lo0/e;->d:Lo0/r;
+    iget-boolean v1, p0, Lo0/e;->e:Z
 
     if-eqz v1, :cond_4
 
-    iget v0, v1, Lo0/r;->b:I
+    const-string v1, "private, "
 
-    int-to-long v2, v0
-
-    add-long/2addr v2, p1
-
-    iget v4, v1, Lo0/r;->c:I
-
-    int-to-long v4, v4
-
-    cmp-long v6, v2, v4
-
-    if-lez v6, :cond_2
-
-    invoke-virtual {p0, p1, p2}, Lo0/e;->t0(J)[B
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/String;
-
-    invoke-direct {p2, p1, p3}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
-
-    return-object p2
-
-    :cond_2
-    iget-object v2, v1, Lo0/r;->a:[B
-
-    long-to-int v3, p1
-
-    new-instance v4, Ljava/lang/String;
-
-    invoke-direct {v4, v2, v0, v3, p3}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
-
-    iget p3, v1, Lo0/r;->b:I
-
-    add-int/2addr p3, v3
-
-    iput p3, v1, Lo0/r;->b:I
-
-    iget-wide v2, p0, Lo0/e;->e:J
-
-    sub-long/2addr v2, p1
-
-    iput-wide v2, p0, Lo0/e;->e:J
-
-    iget p1, v1, Lo0/r;->c:I
-
-    if-ne p3, p1, :cond_3
-
-    invoke-virtual {v1}, Lo0/r;->a()Lo0/r;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v1}, Lo0/s;->a(Lo0/r;)V
-
-    :cond_3
-    return-object v4
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    iget-boolean v1, p0, Lo0/e;->f:Z
 
-    throw v0
+    if-eqz v1, :cond_5
+
+    const-string v1, "public, "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_5
-    new-instance p1, Ljava/io/EOFException;
+    iget-boolean v1, p0, Lo0/e;->g:Z
 
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+    if-eqz v1, :cond_6
 
-    throw p1
+    const-string v1, "must-revalidate, "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_6
-    const-string p3, "byteCount: "
+    iget v1, p0, Lo0/e;->h:I
 
-    invoke-static {p3, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+    if-eq v1, v3, :cond_7
 
-    move-result-object p1
+    const-string v1, "max-stale="
 
-    new-instance p2, Ljava/lang/IllegalArgumentException;
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    iget v1, p0, Lo0/e;->h:I
 
-    move-result-object p1
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_7
-    const-string p1, "charset"
+    iget v1, p0, Lo0/e;->i:I
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    if-eq v1, v3, :cond_8
 
-    throw v0
-.end method
+    const-string v1, "min-fresh="
 
-.method public t0(J)[B
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-wide/16 v0, 0x0
+    iget v1, p0, Lo0/e;->i:I
 
-    cmp-long v2, p1, v0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    if-ltz v2, :cond_0
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const v0, 0x7fffffff
+    :cond_8
+    iget-boolean v1, p0, Lo0/e;->j:Z
 
-    int-to-long v0, v0
+    if-eqz v1, :cond_9
 
-    cmp-long v2, p1, v0
+    const-string v1, "only-if-cached, "
 
-    if-gtz v2, :cond_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const/4 v0, 0x1
+    :cond_9
+    iget-boolean v1, p0, Lo0/e;->k:Z
+
+    if-eqz v1, :cond_a
+
+    const-string v1, "no-transform, "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_a
+    iget-boolean v1, p0, Lo0/e;->l:Z
+
+    if-eqz v1, :cond_b
+
+    const-string v1, "immutable, "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_b
+    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    if-nez v1, :cond_c
+
+    const/4 v1, 0x1
 
     goto :goto_0
 
-    :cond_0
-    const/4 v0, 0x0
+    :cond_c
+    const/4 v1, 0x0
 
     :goto_0
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_d
 
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    cmp-long v2, v0, p1
-
-    if-ltz v2, :cond_1
-
-    long-to-int p2, p1
-
-    new-array p1, p2, [B
-
-    invoke-virtual {p0, p1}, Lo0/e;->readFully([B)V
-
-    return-object p1
-
-    :cond_1
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-
-    :cond_2
-    const-string v0, "byteCount: "
-
-    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    sget-object v0, Lo0/x;->d:Lo0/x;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 12
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const v2, 0x7fffffff
-
-    int-to-long v2, v2
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    cmp-long v6, v0, v2
-
-    if-gtz v6, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_7
-
-    iget-wide v6, p0, Lo0/e;->e:J
-
-    long-to-int v0, v6
-
-    if-nez v0, :cond_1
-
-    sget-object v0, Lokio/ByteString;->f:Lokio/ByteString;
-
-    goto :goto_3
-
-    :cond_1
-    const-wide/16 v8, 0x0
-
-    int-to-long v10, v0
-
-    invoke-static/range {v6 .. v11}, Lf/n/a/k/a;->t(JJJ)V
-
-    iget-object v1, p0, Lo0/e;->d:Lo0/r;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_1
-    const/4 v6, 0x0
-
-    if-ge v2, v0, :cond_4
-
-    if-eqz v1, :cond_3
-
-    iget v6, v1, Lo0/r;->c:I
-
-    iget v7, v1, Lo0/r;->b:I
-
-    if-eq v6, v7, :cond_2
-
-    sub-int/2addr v6, v7
-
-    add-int/2addr v2, v6
-
-    add-int/lit8 v3, v3, 0x1
-
-    iget-object v1, v1, Lo0/r;->f:Lo0/r;
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v0, Ljava/lang/AssertionError;
-
-    const-string v1, "s.limit == s.pos"
-
-    invoke-direct {v0, v1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw v0
-
-    :cond_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v6
-
-    :cond_4
-    new-array v1, v3, [[B
-
-    mul-int/lit8 v2, v3, 0x2
-
-    new-array v2, v2, [I
-
-    iget-object v7, p0, Lo0/e;->d:Lo0/r;
-
-    const/4 v8, 0x0
-
-    :goto_2
-    if-ge v5, v0, :cond_6
-
-    if-eqz v7, :cond_5
-
-    iget-object v9, v7, Lo0/r;->a:[B
-
-    aput-object v9, v1, v8
-
-    iget v9, v7, Lo0/r;->c:I
-
-    iget v10, v7, Lo0/r;->b:I
-
-    sub-int/2addr v9, v10
-
-    add-int/2addr v5, v9
-
-    invoke-static {v5, v0}, Ljava/lang/Math;->min(II)I
-
-    move-result v9
-
-    aput v9, v2, v8
-
-    add-int v9, v8, v3
-
-    iget v10, v7, Lo0/r;->b:I
-
-    aput v10, v2, v9
-
-    iput-boolean v4, v7, Lo0/r;->d:Z
-
-    add-int/2addr v8, v4
-
-    iget-object v7, v7, Lo0/r;->f:Lo0/r;
-
-    goto :goto_2
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v6
-
-    :cond_6
-    new-instance v0, Lo0/t;
-
-    invoke-direct {v0, v1, v2, v6}, Lo0/t;-><init>([[B[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    :goto_3
-    invoke-virtual {v0}, Lokio/ByteString;->toString()Ljava/lang/String;
-
-    move-result-object v0
+    const-string v0, ""
 
     return-object v0
 
-    :cond_7
-    const-string v0, "size > Integer.MAX_VALUE: "
+    :cond_d
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->length()I
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    move-result v1
 
-    move-result-object v0
+    add-int/lit8 v1, v1, -0x2
 
-    iget-wide v1, p0, Lo0/e;->e:J
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->length()I
 
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+    move-result v2
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->delete(II)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
-    new-instance v1, Ljava/lang/IllegalStateException;
+    const-string v1, "StringBuilder().apply(builderAction).toString()"
 
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public u(J)Lokio/ByteString;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    new-instance v0, Lokio/ByteString;
-
-    invoke-virtual {p0, p1, p2}, Lo0/e;->t0(J)[B
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Lokio/ByteString;-><init>([B)V
-
-    return-object v0
-.end method
-
-.method public v()Ljava/lang/String;
-    .locals 3
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    sget-object v2, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    invoke-virtual {p0, v0, v1, v2}, Lo0/e;->t(JLjava/nio/charset/Charset;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public w(J)Ljava/lang/String;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    sget-object v0, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    invoke-virtual {p0, p1, p2, v0}, Lo0/e;->t(JLjava/nio/charset/Charset;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public write(Ljava/nio/ByteBuffer;)I
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
-
-    move-result v0
-
-    move v1, v0
-
-    :goto_0
-    if-lez v1, :cond_0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p0, v2}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v2
-
-    iget v3, v2, Lo0/r;->c:I
-
-    rsub-int v3, v3, 0x2000
-
-    invoke-static {v1, v3}, Ljava/lang/Math;->min(II)I
-
-    move-result v3
-
-    iget-object v4, v2, Lo0/r;->a:[B
-
-    iget v5, v2, Lo0/r;->c:I
-
-    invoke-virtual {p1, v4, v5, v3}, Ljava/nio/ByteBuffer;->get([BII)Ljava/nio/ByteBuffer;
-
-    sub-int/2addr v1, v3
-
-    iget v4, v2, Lo0/r;->c:I
-
-    add-int/2addr v4, v3
-
-    iput v4, v2, Lo0/r;->c:I
-
-    goto :goto_0
-
-    :cond_0
-    iget-wide v1, p0, Lo0/e;->e:J
-
-    int-to-long v3, v0
-
-    add-long/2addr v1, v3
-
-    iput-wide v1, p0, Lo0/e;->e:J
-
-    return v0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public bridge synthetic write([B)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lo0/e;->E([B)Lo0/e;
-
-    return-object p0
-.end method
-
-.method public bridge synthetic write([BII)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1, p2, p3}, Lo0/e;->G([BII)Lo0/e;
-
-    return-object p0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 10
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1c
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eq p1, p0, :cond_0
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_1b
-
-    iget-wide v4, p1, Lo0/e;->e:J
-
-    const-wide/16 v6, 0x0
-
-    move-wide v8, p2
-
-    invoke-static/range {v4 .. v9}, Lf/n/a/k/a;->t(JJJ)V
-
-    :goto_1
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, p2, v3
-
-    if-lez v5, :cond_1a
-
-    iget-object v3, p1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v3, :cond_19
-
-    iget v4, v3, Lo0/r;->c:I
-
-    if-eqz v3, :cond_18
-
-    iget v3, v3, Lo0/r;->b:I
-
-    sub-int/2addr v4, v3
-
-    int-to-long v3, v4
-
-    const/16 v5, 0x2000
-
-    cmp-long v6, p2, v3
-
-    if-gez v6, :cond_c
-
-    iget-object v3, p0, Lo0/e;->d:Lo0/r;
-
-    if-eqz v3, :cond_2
-
-    if-eqz v3, :cond_1
-
-    iget-object v3, v3, Lo0/r;->g:Lo0/r;
-
-    goto :goto_2
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    move-object v3, v0
-
-    :goto_2
-    if-eqz v3, :cond_5
-
-    iget-boolean v4, v3, Lo0/r;->e:Z
-
-    if-eqz v4, :cond_5
-
-    iget v4, v3, Lo0/r;->c:I
-
-    int-to-long v6, v4
-
-    add-long/2addr v6, p2
-
-    iget-boolean v4, v3, Lo0/r;->d:Z
-
-    if-eqz v4, :cond_3
-
-    const/4 v4, 0x0
-
-    goto :goto_3
-
-    :cond_3
-    iget v4, v3, Lo0/r;->b:I
-
-    :goto_3
-    int-to-long v8, v4
-
-    sub-long/2addr v6, v8
-
-    int-to-long v8, v5
-
-    cmp-long v4, v6, v8
-
-    if-gtz v4, :cond_5
-
-    iget-object v1, p1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v1, :cond_4
-
-    long-to-int v0, p2
-
-    invoke-virtual {v1, v3, v0}, Lo0/r;->d(Lo0/r;I)V
-
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    sub-long/2addr v0, p2
-
-    iput-wide v0, p1, Lo0/e;->e:J
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    add-long/2addr v0, p2
-
-    iput-wide v0, p0, Lo0/e;->e:J
-
-    return-void
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_5
-    iget-object v3, p1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v3, :cond_b
-
-    long-to-int v4, p2
-
-    if-eqz v3, :cond_a
-
-    if-lez v4, :cond_6
-
-    iget v6, v3, Lo0/r;->c:I
-
-    iget v7, v3, Lo0/r;->b:I
-
-    sub-int/2addr v6, v7
-
-    if-gt v4, v6, :cond_6
-
-    const/4 v6, 0x1
-
-    goto :goto_4
-
-    :cond_6
-    const/4 v6, 0x0
-
-    :goto_4
-    if-eqz v6, :cond_9
-
-    const/16 v6, 0x400
-
-    if-lt v4, v6, :cond_7
-
-    invoke-virtual {v3}, Lo0/r;->c()Lo0/r;
-
-    move-result-object v6
-
-    goto :goto_5
-
-    :cond_7
-    invoke-static {}, Lo0/s;->b()Lo0/r;
-
-    move-result-object v6
-
-    iget-object v7, v3, Lo0/r;->a:[B
-
-    iget v8, v3, Lo0/r;->b:I
-
-    iget-object v9, v6, Lo0/r;->a:[B
-
-    invoke-static {v7, v8, v9, v2, v4}, Lf/n/a/k/a;->f([BI[BII)V
-
-    :goto_5
-    iget v7, v6, Lo0/r;->b:I
-
-    add-int/2addr v7, v4
-
-    iput v7, v6, Lo0/r;->c:I
-
-    iget v7, v3, Lo0/r;->b:I
-
-    add-int/2addr v7, v4
-
-    iput v7, v3, Lo0/r;->b:I
-
-    iget-object v3, v3, Lo0/r;->g:Lo0/r;
-
-    if-eqz v3, :cond_8
-
-    invoke-virtual {v3, v6}, Lo0/r;->b(Lo0/r;)Lo0/r;
-
-    iput-object v6, p1, Lo0/e;->d:Lo0/r;
-
-    goto :goto_6
-
-    :cond_8
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_9
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "byteCount out of range"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_a
-    throw v0
-
-    :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_c
-    :goto_6
-    iget-object v3, p1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v3, :cond_17
-
-    iget v4, v3, Lo0/r;->c:I
-
-    iget v6, v3, Lo0/r;->b:I
-
-    sub-int/2addr v4, v6
-
-    int-to-long v6, v4
-
-    invoke-virtual {v3}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v4
-
-    iput-object v4, p1, Lo0/e;->d:Lo0/r;
-
-    iget-object v4, p0, Lo0/e;->d:Lo0/r;
-
-    if-nez v4, :cond_d
-
-    iput-object v3, p0, Lo0/e;->d:Lo0/r;
-
-    iput-object v3, v3, Lo0/r;->g:Lo0/r;
-
-    iput-object v3, v3, Lo0/r;->f:Lo0/r;
-
-    goto :goto_9
-
-    :cond_d
-    if-eqz v4, :cond_16
-
-    iget-object v4, v4, Lo0/r;->g:Lo0/r;
-
-    if-eqz v4, :cond_15
-
-    invoke-virtual {v4, v3}, Lo0/r;->b(Lo0/r;)Lo0/r;
-
-    iget-object v4, v3, Lo0/r;->g:Lo0/r;
-
-    if-eq v4, v3, :cond_e
-
-    const/4 v4, 0x1
-
-    goto :goto_7
+    iput-object v0, p0, Lo0/e;->m:Ljava/lang/String;
 
     :cond_e
-    const/4 v4, 0x0
-
-    :goto_7
-    if-eqz v4, :cond_14
-
-    iget-object v4, v3, Lo0/r;->g:Lo0/r;
-
-    if-eqz v4, :cond_13
-
-    iget-boolean v8, v4, Lo0/r;->e:Z
-
-    if-nez v8, :cond_f
-
-    goto :goto_9
-
-    :cond_f
-    iget v8, v3, Lo0/r;->c:I
-
-    iget v9, v3, Lo0/r;->b:I
-
-    sub-int/2addr v8, v9
-
-    iget v9, v4, Lo0/r;->c:I
-
-    sub-int/2addr v5, v9
-
-    iget-boolean v9, v4, Lo0/r;->d:Z
-
-    if-eqz v9, :cond_10
-
-    const/4 v4, 0x0
-
-    goto :goto_8
-
-    :cond_10
-    iget v4, v4, Lo0/r;->b:I
-
-    :goto_8
-    add-int/2addr v5, v4
-
-    if-le v8, v5, :cond_11
-
-    goto :goto_9
-
-    :cond_11
-    iget-object v4, v3, Lo0/r;->g:Lo0/r;
-
-    if-eqz v4, :cond_12
-
-    invoke-virtual {v3, v4, v8}, Lo0/r;->d(Lo0/r;I)V
-
-    invoke-virtual {v3}, Lo0/r;->a()Lo0/r;
-
-    invoke-static {v3}, Lo0/s;->a(Lo0/r;)V
-
-    :goto_9
-    iget-wide v3, p1, Lo0/e;->e:J
-
-    sub-long/2addr v3, v6
-
-    iput-wide v3, p1, Lo0/e;->e:J
-
-    iget-wide v3, p0, Lo0/e;->e:J
-
-    add-long/2addr v3, v6
-
-    iput-wide v3, p0, Lo0/e;->e:J
-
-    sub-long/2addr p2, v6
-
-    goto/16 :goto_1
-
-    :cond_12
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_13
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_14
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "cannot compact"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_15
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_16
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_17
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_18
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_19
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1a
-    return-void
-
-    :cond_1b
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "source == this"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1c
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public bridge synthetic writeByte(I)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lo0/e;->I(I)Lo0/e;
-
-    return-object p0
-.end method
-
-.method public bridge synthetic writeInt(I)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lo0/e;->M(I)Lo0/e;
-
-    return-object p0
-.end method
-
-.method public bridge synthetic writeShort(I)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lo0/e;->N(I)Lo0/e;
-
-    return-object p0
-.end method
-
-.method public x()I
-    .locals 12
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lo0/e;->e:J
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_b
-
-    invoke-virtual {p0, v2, v3}, Lo0/e;->e(J)B
-
-    move-result v0
-
-    and-int/lit16 v1, v0, 0x80
-
-    const/4 v2, 0x1
-
-    const/16 v3, 0x80
-
-    const v4, 0xfffd
-
-    if-nez v1, :cond_0
-
-    and-int/lit8 v1, v0, 0x7f
-
-    const/4 v5, 0x1
-
-    const/4 v6, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    and-int/lit16 v1, v0, 0xe0
-
-    const/16 v5, 0xc0
-
-    if-ne v1, v5, :cond_1
-
-    and-int/lit8 v1, v0, 0x1f
-
-    const/4 v5, 0x2
-
-    const/16 v6, 0x80
-
-    goto :goto_0
-
-    :cond_1
-    and-int/lit16 v1, v0, 0xf0
-
-    const/16 v5, 0xe0
-
-    if-ne v1, v5, :cond_2
-
-    and-int/lit8 v1, v0, 0xf
-
-    const/4 v5, 0x3
-
-    const/16 v6, 0x800
-
-    goto :goto_0
-
-    :cond_2
-    and-int/lit16 v1, v0, 0xf8
-
-    const/16 v5, 0xf0
-
-    if-ne v1, v5, :cond_a
-
-    and-int/lit8 v1, v0, 0x7
-
-    const/4 v5, 0x4
-
-    const/high16 v6, 0x10000
-
-    :goto_0
-    iget-wide v7, p0, Lo0/e;->e:J
-
-    int-to-long v9, v5
-
-    cmp-long v11, v7, v9
-
-    if-ltz v11, :cond_9
-
-    :goto_1
-    if-ge v2, v5, :cond_4
-
-    int-to-long v7, v2
-
-    invoke-virtual {p0, v7, v8}, Lo0/e;->e(J)B
-
-    move-result v0
-
-    and-int/lit16 v11, v0, 0xc0
-
-    if-ne v11, v3, :cond_3
-
-    shl-int/lit8 v1, v1, 0x6
-
-    and-int/lit8 v0, v0, 0x3f
-
-    or-int/2addr v1, v0
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    invoke-virtual {p0, v7, v8}, Lo0/e;->skip(J)V
-
-    return v4
-
-    :cond_4
-    invoke-virtual {p0, v9, v10}, Lo0/e;->skip(J)V
-
-    const v0, 0x10ffff
-
-    if-le v1, v0, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    const v0, 0xdfff
-
-    const v2, 0xd800
-
-    if-le v2, v1, :cond_6
-
-    goto :goto_2
-
-    :cond_6
-    if-lt v0, v1, :cond_7
-
-    goto :goto_3
-
-    :cond_7
-    :goto_2
-    if-ge v1, v6, :cond_8
-
-    goto :goto_3
-
-    :cond_8
-    move v4, v1
-
-    :goto_3
-    return v4
-
-    :cond_9
-    new-instance v1, Ljava/io/EOFException;
-
-    const-string v2, "size < "
-
-    const-string v3, ": "
-
-    invoke-static {v2, v5, v3}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    iget-wide v3, p0, Lo0/e;->e:J
-
-    invoke-virtual {v2, v3, v4}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string v3, " (to read code point prefixed 0x"
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-static {v0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, ")"
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_a
-    const-wide/16 v0, 0x1
-
-    invoke-virtual {p0, v0, v1}, Lo0/e;->skip(J)V
-
-    return v4
-
-    :cond_b
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-.end method
-
-.method public y()Lokio/BufferedSink;
-    .locals 0
-
-    return-object p0
-.end method
-
-.method public bridge synthetic y0(Lokio/ByteString;)Lokio/BufferedSink;
-    .locals 0
-
-    invoke-virtual {p0, p1}, Lo0/e;->D(Lokio/ByteString;)Lo0/e;
-
-    return-object p0
-.end method
-
-.method public final z(J)Ljava/lang/String;
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/EOFException;
-        }
-    .end annotation
-
-    const-wide/16 v0, 0x1
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, p1, v2
-
-    if-lez v4, :cond_0
-
-    sub-long v2, p1, v0
-
-    invoke-virtual {p0, v2, v3}, Lo0/e;->e(J)B
-
-    move-result v4
-
-    const/16 v5, 0xd
-
-    int-to-byte v5, v5
-
-    if-ne v4, v5, :cond_0
-
-    invoke-virtual {p0, v2, v3}, Lo0/e;->w(J)Ljava/lang/String;
-
-    move-result-object p1
-
-    const-wide/16 v0, 0x2
-
-    invoke-virtual {p0, v0, v1}, Lo0/e;->skip(J)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0, p1, p2}, Lo0/e;->w(J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p0, v0, v1}, Lo0/e;->skip(J)V
-
-    :goto_0
-    return-object p1
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/o0/e0.smali b/com.discord/smali_classes2/o0/e0.smali
new file mode 100644
index 0000000000..968209dbd7
--- /dev/null
+++ b/com.discord/smali_classes2/o0/e0.smali
@@ -0,0 +1,179 @@
+.class public final Lo0/e0;
+.super Ljava/lang/Object;
+.source "Route.kt"
+
+
+# instance fields
+.field public final a:Lo0/a;
+
+.field public final b:Ljava/net/Proxy;
+
+.field public final c:Ljava/net/InetSocketAddress;
+
+
+# direct methods
+.method public constructor <init>(Lo0/a;Ljava/net/Proxy;Ljava/net/InetSocketAddress;)V
+    .locals 1
+
+    const-string v0, "address"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "proxy"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "socketAddress"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/e0;->a:Lo0/a;
+
+    iput-object p2, p0, Lo0/e0;->b:Ljava/net/Proxy;
+
+    iput-object p3, p0, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Z
+    .locals 2
+
+    iget-object v0, p0, Lo0/e0;->a:Lo0/a;
+
+    iget-object v0, v0, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v0
+
+    sget-object v1, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    instance-of v0, p1, Lo0/e0;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/e0;
+
+    iget-object v0, p1, Lo0/e0;->a:Lo0/a;
+
+    iget-object v1, p0, Lo0/e0;->a:Lo0/a;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p1, Lo0/e0;->b:Ljava/net/Proxy;
+
+    iget-object v1, p0, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object p1, p1, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    iget-object v0, p0, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    iget-object v0, p0, Lo0/e0;->a:Lo0/a;
+
+    invoke-virtual {v0}, Lo0/a;->hashCode()I
+
+    move-result v0
+
+    add-int/lit16 v0, v0, 0x20f
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v1}, Ljava/net/Proxy;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-object v0, p0, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    invoke-virtual {v0}, Ljava/net/InetSocketAddress;->hashCode()I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "Route{"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x7d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/f$a.smali b/com.discord/smali_classes2/o0/f$a.smali
new file mode 100644
index 0000000000..449081233f
--- /dev/null
+++ b/com.discord/smali_classes2/o0/f$a.smali
@@ -0,0 +1,19 @@
+.class public interface abstract Lo0/f$a;
+.super Ljava/lang/Object;
+.source "Call.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/f;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "a"
+.end annotation
+
+
+# virtual methods
+.method public abstract b(Lo0/a0;)Lo0/f;
+.end method
diff --git a/com.discord/smali_classes2/o0/f.smali b/com.discord/smali_classes2/o0/f.smali
index 1995e15ac7..83d6d21976 100644
--- a/com.discord/smali_classes2/o0/f.smali
+++ b/com.discord/smali_classes2/o0/f.smali
@@ -1,91 +1,36 @@
-.class public final Lo0/f;
-.super Ljava/io/OutputStream;
-.source "Buffer.kt"
+.class public interface abstract Lo0/f;
+.super Ljava/lang/Object;
+.source "Call.kt"
+
+# interfaces
+.implements Ljava/lang/Cloneable;
 
 
-# instance fields
-.field public final synthetic d:Lo0/e;
-
-
-# direct methods
-.method public constructor <init>(Lo0/e;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lo0/f;->d:Lo0/e;
-
-    invoke-direct {p0}, Ljava/io/OutputStream;-><init>()V
-
-    return-void
-.end method
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/f$a;
+    }
+.end annotation
 
 
 # virtual methods
-.method public close()V
-    .locals 0
-
-    return-void
+.method public abstract F(Lo0/g;)V
 .end method
 
-.method public flush()V
-    .locals 0
-
-    return-void
+.method public abstract cancel()V
 .end method
 
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lo0/f;->d:Lo0/e;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ".outputStream()"
-
-    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
+.method public abstract execute()Lokhttp3/Response;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
 .end method
 
-.method public write(I)V
-    .locals 1
-
-    iget-object v0, p0, Lo0/f;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->I(I)Lo0/e;
-
-    return-void
+.method public abstract k()Z
 .end method
 
-.method public write([BII)V
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lo0/f;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->G([BII)Lo0/e;
-
-    return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+.method public abstract p()Lo0/a0;
 .end method
diff --git a/com.discord/smali_classes2/n0/f0$a.smali b/com.discord/smali_classes2/o0/f0$a.smali
similarity index 82%
rename from com.discord/smali_classes2/n0/f0$a.smali
rename to com.discord/smali_classes2/o0/f0$a.smali
index 3d9039ff4a..92384c174e 100644
--- a/com.discord/smali_classes2/n0/f0$a.smali
+++ b/com.discord/smali_classes2/o0/f0$a.smali
@@ -1,11 +1,11 @@
-.class public final Ln0/f0$a;
+.class public final Lo0/f0$a;
 .super Ljava/lang/Object;
 .source "TlsVersion.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/f0;
+    value = Lo0/f0;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,10 +25,12 @@
 
 
 # virtual methods
-.method public final a(Ljava/lang/String;)Ln0/f0;
+.method public final a(Ljava/lang/String;)Lo0/f0;
     .locals 2
 
-    if-eqz p1, :cond_3
+    const-string v0, "javaName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
@@ -55,7 +57,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Ln0/f0;->d:Ln0/f0;
+    sget-object p1, Lo0/f0;->d:Lo0/f0;
 
     goto :goto_0
 
@@ -68,7 +70,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Ln0/f0;->e:Ln0/f0;
+    sget-object p1, Lo0/f0;->e:Lo0/f0;
 
     goto :goto_0
 
@@ -81,7 +83,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Ln0/f0;->f:Ln0/f0;
+    sget-object p1, Lo0/f0;->f:Lo0/f0;
 
     goto :goto_0
 
@@ -94,7 +96,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Ln0/f0;->g:Ln0/f0;
+    sget-object p1, Lo0/f0;->g:Lo0/f0;
 
     goto :goto_0
 
@@ -107,7 +109,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Ln0/f0;->h:Ln0/f0;
+    sget-object p1, Lo0/f0;->h:Lo0/f0;
 
     :goto_0
     return-object p1
@@ -126,15 +128,6 @@
 
     throw v0
 
-    :cond_3
-    const-string p1, "javaName"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-
     :pswitch_data_0
     .packed-switch -0x1dfc3f27
         :pswitch_2
diff --git a/com.discord/smali_classes2/o0/f0.smali b/com.discord/smali_classes2/o0/f0.smali
new file mode 100644
index 0000000000..00b67fde3c
--- /dev/null
+++ b/com.discord/smali_classes2/o0/f0.smali
@@ -0,0 +1,176 @@
+.class public final enum Lo0/f0;
+.super Ljava/lang/Enum;
+.source "TlsVersion.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/f0$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lo0/f0;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lo0/f0;
+
+.field public static final enum e:Lo0/f0;
+
+.field public static final enum f:Lo0/f0;
+
+.field public static final enum g:Lo0/f0;
+
+.field public static final enum h:Lo0/f0;
+
+.field public static final synthetic i:[Lo0/f0;
+
+.field public static final j:Lo0/f0$a;
+
+
+# instance fields
+.field public final javaName:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x5
+
+    new-array v0, v0, [Lo0/f0;
+
+    new-instance v1, Lo0/f0;
+
+    const-string v2, "TLS_1_3"
+
+    const/4 v3, 0x0
+
+    const-string v4, "TLSv1.3"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/f0;->d:Lo0/f0;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/f0;
+
+    const-string v2, "TLS_1_2"
+
+    const/4 v3, 0x1
+
+    const-string v4, "TLSv1.2"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/f0;->e:Lo0/f0;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/f0;
+
+    const-string v2, "TLS_1_1"
+
+    const/4 v3, 0x2
+
+    const-string v4, "TLSv1.1"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/f0;->f:Lo0/f0;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/f0;
+
+    const-string v2, "TLS_1_0"
+
+    const/4 v3, 0x3
+
+    const-string v4, "TLSv1"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/f0;->g:Lo0/f0;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/f0;
+
+    const-string v2, "SSL_3_0"
+
+    const/4 v3, 0x4
+
+    const-string v4, "SSLv3"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/f0;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/f0;->h:Lo0/f0;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lo0/f0;->i:[Lo0/f0;
+
+    new-instance v0, Lo0/f0$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/f0$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/f0;->j:Lo0/f0$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;ILjava/lang/String;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    iput-object p3, p0, Lo0/f0;->javaName:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lo0/f0;
+    .locals 1
+
+    const-class v0, Lo0/f0;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lo0/f0;
+
+    return-object p0
+.end method
+
+.method public static values()[Lo0/f0;
+    .locals 1
+
+    sget-object v0, Lo0/f0;->i:[Lo0/f0;
+
+    invoke-virtual {v0}, [Lo0/f0;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lo0/f0;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g.smali b/com.discord/smali_classes2/o0/g.smali
index f29433c44c..a0cc353da0 100644
--- a/com.discord/smali_classes2/o0/g.smali
+++ b/com.discord/smali_classes2/o0/g.smali
@@ -1,14 +1,10 @@
 .class public interface abstract Lo0/g;
 .super Ljava/lang/Object;
-.source "BufferedSource.kt"
-
-# interfaces
-.implements Lo0/w;
-.implements Ljava/nio/channels/ReadableByteChannel;
+.source "Callback.kt"
 
 
 # virtual methods
-.method public abstract F0(Lo0/u;)J
+.method public abstract a(Lo0/f;Lokhttp3/Response;)V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -16,152 +12,5 @@
     .end annotation
 .end method
 
-.method public abstract J()Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract P0(J)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract Q(Lo0/e;J)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract S(Lokio/ByteString;)J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract T(J)Ljava/lang/String;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract U0()J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract W0()Ljava/io/InputStream;
-.end method
-
-.method public abstract X0(Lo0/n;)I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract h()Lo0/e;
-.end method
-
-.method public abstract m(J)Z
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract o0()Ljava/lang/String;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract readByte()B
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract readFully([B)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract readInt()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract readLong()J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract readShort()S
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract skip(J)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract t0(J)[B
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract u(J)Lokio/ByteString;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+.method public abstract b(Lo0/f;Ljava/io/IOException;)V
 .end method
diff --git a/com.discord/smali_classes2/o0/g0/a.smali b/com.discord/smali_classes2/o0/g0/a.smali
new file mode 100644
index 0000000000..685ab393f6
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/a.smali
@@ -0,0 +1,36 @@
+.class public final Lo0/g0/a;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Lo0/t$b;
+
+
+# instance fields
+.field public final synthetic a:Lo0/t;
+
+
+# direct methods
+.method public constructor <init>(Lo0/t;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/a;->a:Lo0/t;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lo0/f;)Lo0/t;
+    .locals 1
+
+    const-string v0, "call"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lo0/g0/a;->a:Lo0/t;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/b$a.smali b/com.discord/smali_classes2/o0/g0/b$a.smali
new file mode 100644
index 0000000000..4be7962eb3
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/b$a.smali
@@ -0,0 +1,55 @@
+.class public final Lo0/g0/b$a;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/util/concurrent/ThreadFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Z)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/b$a;->d:Ljava/lang/String;
+
+    iput-boolean p2, p0, Lo0/g0/b$a;->e:Z
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+    .locals 2
+
+    new-instance v0, Ljava/lang/Thread;
+
+    iget-object v1, p0, Lo0/g0/b$a;->d:Ljava/lang/String;
+
+    invoke-direct {v0, p1, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
+
+    iget-boolean p1, p0, Lo0/g0/b$a;->e:Z
+
+    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setDaemon(Z)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/b.smali b/com.discord/smali_classes2/o0/g0/b.smali
new file mode 100644
index 0000000000..a9577257c3
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/b.smali
@@ -0,0 +1,2017 @@
+.class public final Lo0/g0/b;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+
+# static fields
+.field public static final a:[B
+
+.field public static final b:Lokhttp3/Headers;
+
+.field public static final c:Lokhttp3/ResponseBody;
+
+.field public static final d:Lp0/n;
+
+.field public static final e:Ljava/util/TimeZone;
+
+.field public static final f:Lkotlin/text/Regex;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 12
+
+    const/4 v0, 0x0
+
+    new-array v1, v0, [B
+
+    sput-object v1, Lo0/g0/b;->a:[B
+
+    sget-object v1, Lokhttp3/Headers;->e:Lokhttp3/Headers$b;
+
+    new-array v2, v0, [Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Lokhttp3/Headers$b;->c([Ljava/lang/String;)Lokhttp3/Headers;
+
+    move-result-object v1
+
+    sput-object v1, Lo0/g0/b;->b:Lokhttp3/Headers;
+
+    sget-object v1, Lo0/g0/b;->a:[B
+
+    const-string v2, "$this$toResponseBody"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lp0/e;
+
+    invoke-direct {v2}, Lp0/e;-><init>()V
+
+    invoke-virtual {v2, v1}, Lp0/e;->E([B)Lp0/e;
+
+    array-length v1, v1
+
+    int-to-long v3, v1
+
+    const-string v1, "$this$asResponseBody"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lo0/d0;
+
+    const/4 v5, 0x0
+
+    invoke-direct {v1, v2, v5, v3, v4}, Lo0/d0;-><init>(Lp0/g;Lokhttp3/MediaType;J)V
+
+    sput-object v1, Lo0/g0/b;->c:Lokhttp3/ResponseBody;
+
+    sget-object v6, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
+
+    sget-object v7, Lo0/g0/b;->a:[B
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x7
+
+    invoke-static/range {v6 .. v11}, Lokhttp3/RequestBody$Companion;->d(Lokhttp3/RequestBody$Companion;[BLokhttp3/MediaType;III)Lokhttp3/RequestBody;
+
+    sget-object v1, Lp0/n;->f:Lp0/n$a;
+
+    const/4 v2, 0x5
+
+    new-array v2, v2, [Lokio/ByteString;
+
+    sget-object v3, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v4, "efbbbf"
+
+    invoke-virtual {v3, v4}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v3
+
+    aput-object v3, v2, v0
+
+    const/4 v0, 0x1
+
+    sget-object v3, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v4, "feff"
+
+    invoke-virtual {v3, v4}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v3
+
+    aput-object v3, v2, v0
+
+    const/4 v0, 0x2
+
+    sget-object v3, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v4, "fffe"
+
+    invoke-virtual {v3, v4}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v3
+
+    aput-object v3, v2, v0
+
+    const/4 v0, 0x3
+
+    sget-object v3, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v4, "0000ffff"
+
+    invoke-virtual {v3, v4}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v3
+
+    aput-object v3, v2, v0
+
+    const/4 v0, 0x4
+
+    sget-object v3, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v4, "ffff0000"
+
+    invoke-virtual {v3, v4}, Lokio/ByteString$a;->a(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v3
+
+    aput-object v3, v2, v0
+
+    invoke-virtual {v1, v2}, Lp0/n$a;->c([Lokio/ByteString;)Lp0/n;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/b;->d:Lp0/n;
+
+    const-string v0, "GMT"
+
+    invoke-static {v0}, Ljava/util/TimeZone;->getTimeZone(Ljava/lang/String;)Ljava/util/TimeZone;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    sput-object v0, Lo0/g0/b;->e:Ljava/util/TimeZone;
+
+    new-instance v0, Lkotlin/text/Regex;
+
+    const-string v1, "([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)"
+
+    invoke-direct {v0, v1}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Lo0/g0/b;->f:Lkotlin/text/Regex;
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+.end method
+
+.method public static final A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lo0/g0/b$a;
+
+    invoke-direct {v0, p0, p1}, Lo0/g0/b$a;-><init>(Ljava/lang/String;Z)V
+
+    return-object v0
+.end method
+
+.method public static final B(Ljava/util/List;)Lokhttp3/Headers;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)",
+            "Lokhttp3/Headers;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toHeaders"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v1, 0x14
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lo0/g0/g/b;
+
+    iget-object v3, v1, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    iget-object v1, v1, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    if-eqz v3, :cond_1
+
+    invoke-static {v3}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v3
+
+    if-eqz v1, :cond_0
+
+    invoke-static {v1}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "name"
+
+    invoke-static {v3, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "value"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-static {v1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    throw v2
+
+    :cond_1
+    throw v2
+
+    :cond_2
+    const/4 p0, 0x0
+
+    new-array p0, p0, [Ljava/lang/String;
+
+    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_3
+
+    check-cast p0, [Ljava/lang/String;
+
+    new-instance v0, Lokhttp3/Headers;
+
+    invoke-direct {v0, p0, v2}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v0
+
+    :cond_3
+    new-instance p0, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p0, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final C(I)Ljava/lang/String;
+    .locals 1
+
+    invoke-static {p0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "Integer.toHexString(this)"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final D(Lo0/w;Z)Ljava/lang/String;
+    .locals 4
+
+    const-string v0, "$this$toHostHeader"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/w;->e:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    const-string v3, ":"
+
+    invoke-static {v0, v3, v1, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/16 v0, 0x5b
+
+    invoke-static {v0}, Lf/e/b/a/a;->B(C)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lo0/w;->e:Ljava/lang/String;
+
+    :goto_0
+    if-nez p1, :cond_4
+
+    iget p1, p0, Lo0/w;->f:I
+
+    iget-object v1, p0, Lo0/w;->b:Ljava/lang/String;
+
+    const-string v2, "scheme"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v2
+
+    const v3, 0x310888    # 4.503E-39f
+
+    if-eq v2, v3, :cond_2
+
+    const v3, 0x5f008eb
+
+    if-eq v2, v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const-string v2, "https"
+
+    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    const/16 v1, 0x1bb
+
+    goto :goto_2
+
+    :cond_2
+    const-string v2, "http"
+
+    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    const/16 v1, 0x50
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    const/4 v1, -0x1
+
+    :goto_2
+    if-eq p1, v1, :cond_5
+
+    :cond_4
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v0, 0x3a
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget p0, p0, Lo0/w;->f:I
+
+    invoke-virtual {p1, p0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :cond_5
+    return-object v0
+.end method
+
+.method public static final E(Ljava/util/List;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/List<",
+            "+TT;>;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toImmutableList"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {p0}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p0
+
+    const-string v0, "Collections.unmodifiableList(toMutableList())"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final F(Ljava/util/Map;)Ljava/util/Map;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<K:",
+            "Ljava/lang/Object;",
+            "V:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Map<",
+            "TK;+TV;>;)",
+            "Ljava/util/Map<",
+            "TK;TV;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toImmutableMap"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object p0, Lk0/j/o;->d:Lk0/j/o;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0, p0}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
+
+    invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object p0
+
+    const-string v0, "Collections.unmodifiableMap(LinkedHashMap(this))"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    return-object p0
+.end method
+
+.method public static final G(Ljava/lang/String;I)I
+    .locals 4
+
+    if-eqz p0, :cond_2
+
+    :try_start_0
+    invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+    move-result-wide p0
+    :try_end_0
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
+
+    const v0, 0x7fffffff
+
+    int-to-long v1, v0
+
+    cmp-long v3, p0, v1
+
+    if-lez v3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p0, v0
+
+    if-gez v2, :cond_1
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    long-to-int v0, p0
+
+    :goto_0
+    return v0
+
+    :catch_0
+    :cond_2
+    return p1
+.end method
+
+.method public static final H(Ljava/lang/String;II)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "$this$trimSubstring"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2}, Lo0/g0/b;->r(Ljava/lang/String;II)I
+
+    move-result p1
+
+    invoke-static {p0, p1, p2}, Lo0/g0/b;->t(Ljava/lang/String;II)I
+
+    move-result p2
+
+    invoke-virtual {p0, p1, p2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final I(Lokio/BufferedSink;I)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "$this$writeMedium"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    ushr-int/lit8 v0, p1, 0x10
+
+    and-int/lit16 v0, v0, 0xff
+
+    invoke-interface {p0, v0}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
+
+    ushr-int/lit8 v0, p1, 0x8
+
+    and-int/lit16 v0, v0, 0xff
+
+    invoke-interface {p0, v0}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
+
+    and-int/lit16 p1, p1, 0xff
+
+    invoke-interface {p0, p1}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
+
+    return-void
+.end method
+
+.method public static final a(BI)I
+    .locals 0
+
+    and-int/2addr p0, p1
+
+    return p0
+.end method
+
+.method public static final b(Ljava/lang/String;)Z
+    .locals 1
+
+    const-string v0, "$this$canParseAsIpAddress"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lo0/g0/b;->f:Lkotlin/text/Regex;
+
+    invoke-virtual {v0, p0}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final c(Lo0/w;Lo0/w;)Z
+    .locals 2
+
+    const-string v0, "$this$canReuseConnectionFor"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v1, p1, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget v0, p0, Lo0/w;->f:I
+
+    iget v1, p1, Lo0/w;->f:I
+
+    if-ne v0, v1, :cond_0
+
+    iget-object p0, p0, Lo0/w;->b:Ljava/lang/String;
+
+    iget-object p1, p1, Lo0/w;->b:Ljava/lang/String;
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_0
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static final d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
+    .locals 7
+
+    const-string v0, "name"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, p1, v2
+
+    if-ltz v4, :cond_0
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v5, 0x0
+
+    :goto_0
+    if-eqz v5, :cond_7
+
+    if-eqz v1, :cond_6
+
+    invoke-virtual {p3, p1, p2}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+
+    move-result-wide p1
+
+    const p3, 0x7fffffff
+
+    int-to-long v5, p3
+
+    cmp-long p3, p1, v5
+
+    if-gtz p3, :cond_1
+
+    const/4 p3, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p3, 0x0
+
+    :goto_1
+    if-eqz p3, :cond_5
+
+    cmp-long p3, p1, v2
+
+    if-nez p3, :cond_2
+
+    if-gtz v4, :cond_3
+
+    :cond_2
+    const/4 v0, 0x1
+
+    :cond_3
+    if-eqz v0, :cond_4
+
+    long-to-int p0, p1
+
+    return p0
+
+    :cond_4
+    const-string p1, " too small."
+
+    invoke-static {p0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    const-string p1, " too large."
+
+    invoke-static {p0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    const-string p1, "unit == null"
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_7
+    const-string p1, " < 0"
+
+    invoke-static {p0, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {p1, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final e(JJJ)V
+    .locals 5
+
+    or-long v0, p2, p4
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-ltz v4, :cond_0
+
+    cmp-long v0, p2, p0
+
+    if-gtz v0, :cond_0
+
+    sub-long/2addr p0, p2
+
+    cmp-long p2, p0, p4
+
+    if-ltz p2, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p0, Ljava/lang/ArrayIndexOutOfBoundsException;
+
+    invoke-direct {p0}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>()V
+
+    throw p0
+.end method
+
+.method public static final f(Ljava/io/Closeable;)V
+    .locals 1
+
+    const-string v0, "$this$closeQuietly"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-interface {p0}, Ljava/io/Closeable;->close()V
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-void
+
+    :catch_1
+    move-exception p0
+
+    throw p0
+.end method
+
+.method public static final g(Ljava/net/Socket;)V
+    .locals 1
+
+    const-string v0, "$this$closeQuietly"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-virtual {p0}, Ljava/net/Socket;->close()V
+    :try_end_0
+    .catch Ljava/lang/AssertionError; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-void
+
+    :catch_1
+    move-exception p0
+
+    throw p0
+
+    :catch_2
+    move-exception p0
+
+    throw p0
+.end method
+
+.method public static final h(Ljava/lang/String;CII)I
+    .locals 1
+
+    const-string v0, "$this$delimiterOffset"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    if-ge p2, p3, :cond_1
+
+    invoke-virtual {p0, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    if-ne v0, p1, :cond_0
+
+    return p2
+
+    :cond_0
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return p3
+.end method
+
+.method public static final i(Ljava/lang/String;Ljava/lang/String;II)I
+    .locals 3
+
+    const-string v0, "$this$delimiterOffset"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "delimiters"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    if-ge p2, p3, :cond_1
+
+    invoke-virtual {p0, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return p2
+
+    :cond_0
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return p3
+.end method
+
+.method public static synthetic j(Ljava/lang/String;CIII)I
+    .locals 1
+
+    and-int/lit8 v0, p4, 0x2
+
+    if-eqz v0, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_1
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result p3
+
+    :cond_1
+    invoke-static {p0, p1, p2, p3}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final k(Lp0/w;ILjava/util/concurrent/TimeUnit;)Z
+    .locals 1
+
+    const-string v0, "$this$discard"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "timeUnit"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-static {p0, p1, p2}, Lo0/g0/b;->z(Lp0/w;ILjava/util/concurrent/TimeUnit;)Z
+
+    move-result p0
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static final varargs l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "format"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "args"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const-string v1, "Locale.US"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v1, p1
+
+    invoke-static {p1, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    array-length v1, p1
+
+    invoke-static {p1, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {v0, p0, p1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "java.lang.String.format(locale, format, *args)"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final m([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)Z
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/String;",
+            "[",
+            "Ljava/lang/String;",
+            "Ljava/util/Comparator<",
+            "-",
+            "Ljava/lang/String;",
+            ">;)Z"
+        }
+    .end annotation
+
+    const-string v0, "$this$hasIntersection"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "comparator"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-nez v0, :cond_5
+
+    if-eqz p1, :cond_5
+
+    array-length v0, p1
+
+    if-nez v0, :cond_1
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_2
+
+    goto :goto_4
+
+    :cond_2
+    array-length v0, p0
+
+    const/4 v3, 0x0
+
+    :goto_2
+    if-ge v3, v0, :cond_5
+
+    aget-object v4, p0, v3
+
+    array-length v5, p1
+
+    const/4 v6, 0x0
+
+    :goto_3
+    if-ge v6, v5, :cond_4
+
+    aget-object v7, p1, v6
+
+    invoke-interface {p2, v4, v7}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+
+    move-result v7
+
+    if-nez v7, :cond_3
+
+    return v2
+
+    :cond_3
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_2
+
+    :cond_5
+    :goto_4
+    return v1
+.end method
+
+.method public static final n(Lokhttp3/Response;)J
+    .locals 2
+
+    const-string v0, "$this$headersContentLength"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p0, p0, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    const-string v0, "Content-Length"
+
+    invoke-virtual {p0, v0}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_0
+
+    const-string v0, "$this$toLongOrDefault"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+    move-result-wide v0
+    :try_end_0
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    :cond_0
+    const-wide/16 v0, -0x1
+
+    :goto_0
+    return-wide v0
+.end method
+
+.method public static final varargs o([Ljava/lang/Object;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">([TT;)",
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+
+    .annotation runtime Ljava/lang/SafeVarargs;
+    .end annotation
+
+    const-string v0, "elements"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->clone()Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, [Ljava/lang/Object;
+
+    array-length v0, p0
+
+    invoke-static {p0, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-static {p0}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p0
+
+    invoke-static {p0}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p0
+
+    const-string v0, "Collections.unmodifiable\u2026sList(*elements.clone()))"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
+
+.method public static final p([Ljava/lang/String;Ljava/lang/String;Ljava/util/Comparator;)I
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Ljava/util/Comparator<",
+            "Ljava/lang/String;",
+            ">;)I"
+        }
+    .end annotation
+
+    const-string v0, "$this$indexOf"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "comparator"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v0, :cond_2
+
+    aget-object v3, p0, v2
+
+    invoke-interface {p2, v3, p1}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+
+    move-result v3
+
+    if-nez v3, :cond_0
+
+    const/4 v3, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_1
+    if-eqz v3, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v2, -0x1
+
+    :goto_2
+    return v2
+.end method
+
+.method public static final q(Ljava/lang/String;)I
+    .locals 4
+
+    const-string v0, "$this$indexOfControlOrNonAscii"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_2
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    const/16 v3, 0x1f
+
+    if-le v2, v3, :cond_1
+
+    const/16 v3, 0x7f
+
+    if-lt v2, v3, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    return v1
+
+    :cond_2
+    const/4 p0, -0x1
+
+    return p0
+.end method
+
+.method public static final r(Ljava/lang/String;II)I
+    .locals 2
+
+    const-string v0, "$this$indexOfFirstNonAsciiWhitespace"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    if-ge p1, p2, :cond_1
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    const/16 v1, 0x9
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0xa
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0xc
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0xd
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0x20
+
+    if-eq v0, v1, :cond_0
+
+    return p1
+
+    :cond_0
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return p2
+.end method
+
+.method public static synthetic s(Ljava/lang/String;III)I
+    .locals 1
+
+    and-int/lit8 v0, p3, 0x1
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x0
+
+    :cond_0
+    and-int/lit8 p3, p3, 0x2
+
+    if-eqz p3, :cond_1
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result p2
+
+    :cond_1
+    invoke-static {p0, p1, p2}, Lo0/g0/b;->r(Ljava/lang/String;II)I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final t(Ljava/lang/String;II)I
+    .locals 2
+
+    const-string v0, "$this$indexOfLastNonAsciiWhitespace"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    add-int/lit8 p2, p2, -0x1
+
+    if-lt p2, p1, :cond_1
+
+    :goto_0
+    invoke-virtual {p0, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    const/16 v1, 0x9
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0xa
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0xc
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0xd
+
+    if-eq v0, v1, :cond_0
+
+    const/16 v1, 0x20
+
+    if-eq v0, v1, :cond_0
+
+    add-int/lit8 p2, p2, 0x1
+
+    return p2
+
+    :cond_0
+    if-eq p2, p1, :cond_1
+
+    add-int/lit8 p2, p2, -0x1
+
+    goto :goto_0
+
+    :cond_1
+    return p1
+.end method
+
+.method public static final u(Ljava/lang/String;I)I
+    .locals 3
+
+    const-string v0, "$this$indexOfNonWhitespace"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    :goto_0
+    if-ge p1, v0, :cond_1
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v2, 0x20
+
+    if-eq v1, v2, :cond_0
+
+    const/16 v2, 0x9
+
+    if-eq v1, v2, :cond_0
+
+    return p1
+
+    :cond_0
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final v([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)[Ljava/lang/String;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/String;",
+            "[",
+            "Ljava/lang/String;",
+            "Ljava/util/Comparator<",
+            "-",
+            "Ljava/lang/String;",
+            ">;)[",
+            "Ljava/lang/String;"
+        }
+    .end annotation
+
+    const-string v0, "$this$intersect"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "comparator"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    array-length v1, p0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_2
+
+    aget-object v4, p0, v3
+
+    array-length v5, p1
+
+    const/4 v6, 0x0
+
+    :goto_1
+    if-ge v6, v5, :cond_1
+
+    aget-object v7, p1, v6
+
+    invoke-interface {p2, v4, v7}, Ljava/util/Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+
+    move-result v7
+
+    if-nez v7, :cond_0
+
+    invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_0
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    :goto_2
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    new-array p0, v2, [Ljava/lang/String;
+
+    invoke-virtual {v0, p0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p0
+
+    if-eqz p0, :cond_3
+
+    check-cast p0, [Ljava/lang/String;
+
+    return-object p0
+
+    :cond_3
+    new-instance p0, Lkotlin/TypeCastException;
+
+    const-string p1, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static final w(C)I
+    .locals 2
+
+    const/16 v0, 0x30
+
+    if-le v0, p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v1, 0x39
+
+    if-lt v1, p0, :cond_1
+
+    sub-int/2addr p0, v0
+
+    goto :goto_4
+
+    :cond_1
+    :goto_0
+    const/16 v0, 0x66
+
+    const/16 v1, 0x61
+
+    if-le v1, p0, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    if-lt v0, p0, :cond_3
+
+    :goto_1
+    sub-int/2addr p0, v1
+
+    add-int/lit8 p0, p0, 0xa
+
+    goto :goto_4
+
+    :cond_3
+    :goto_2
+    const/16 v0, 0x46
+
+    const/16 v1, 0x41
+
+    if-le v1, p0, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    if-lt v0, p0, :cond_5
+
+    goto :goto_1
+
+    :cond_5
+    :goto_3
+    const/4 p0, -0x1
+
+    :goto_4
+    return p0
+.end method
+
+.method public static final x(Lp0/g;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "$this$readBomAsCharset"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "default"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lo0/g0/b;->d:Lp0/n;
+
+    invoke-interface {p0, v0}, Lp0/g;->X0(Lp0/n;)I
+
+    move-result p0
+
+    const/4 v0, -0x1
+
+    if-eq p0, v0, :cond_7
+
+    if-eqz p0, :cond_6
+
+    const/4 p1, 0x1
+
+    if-eq p0, p1, :cond_5
+
+    const/4 p1, 0x2
+
+    if-eq p0, p1, :cond_4
+
+    const/4 p1, 0x3
+
+    if-eq p0, p1, :cond_2
+
+    const/4 p1, 0x4
+
+    if-ne p0, p1, :cond_1
+
+    sget-object p0, Lk0/u/a;->d:Lk0/u/a;
+
+    sget-object p0, Lk0/u/a;->b:Ljava/nio/charset/Charset;
+
+    if-eqz p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p0, "UTF-32LE"
+
+    invoke-static {p0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object p0
+
+    const-string p1, "Charset.forName(\"UTF-32LE\")"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object p0, Lk0/u/a;->b:Ljava/nio/charset/Charset;
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p0, Ljava/lang/AssertionError;
+
+    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p0
+
+    :cond_2
+    sget-object p0, Lk0/u/a;->d:Lk0/u/a;
+
+    sget-object p0, Lk0/u/a;->c:Ljava/nio/charset/Charset;
+
+    if-eqz p0, :cond_3
+
+    :goto_0
+    goto :goto_1
+
+    :cond_3
+    const-string p0, "UTF-32BE"
+
+    invoke-static {p0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object p0
+
+    const-string p1, "Charset.forName(\"UTF-32BE\")"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object p0, Lk0/u/a;->c:Ljava/nio/charset/Charset;
+
+    :goto_1
+    move-object p1, p0
+
+    goto :goto_2
+
+    :cond_4
+    sget-object p1, Ljava/nio/charset/StandardCharsets;->UTF_16LE:Ljava/nio/charset/Charset;
+
+    const-string p0, "UTF_16LE"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_2
+
+    :cond_5
+    sget-object p1, Ljava/nio/charset/StandardCharsets;->UTF_16BE:Ljava/nio/charset/Charset;
+
+    const-string p0, "UTF_16BE"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_2
+
+    :cond_6
+    sget-object p1, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+
+    const-string p0, "UTF_8"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_7
+    :goto_2
+    return-object p1
+.end method
+
+.method public static final y(Lp0/g;)I
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "$this$readMedium"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Lp0/g;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    shl-int/lit8 v0, v0, 0x10
+
+    invoke-interface {p0}, Lp0/g;->readByte()B
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    shl-int/lit8 v1, v1, 0x8
+
+    or-int/2addr v0, v1
+
+    invoke-interface {p0}, Lp0/g;->readByte()B
+
+    move-result p0
+
+    and-int/lit16 p0, p0, 0xff
+
+    or-int/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static final z(Lp0/w;ILjava/util/concurrent/TimeUnit;)Z
+    .locals 11
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "$this$skipAll"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "timeUnit"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v0
+
+    invoke-interface {p0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lp0/x;->e()Z
+
+    move-result v2
+
+    const-wide v3, 0x7fffffffffffffffL
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {p0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lp0/x;->c()J
+
+    move-result-wide v5
+
+    sub-long/2addr v5, v0
+
+    goto :goto_0
+
+    :cond_0
+    move-wide v5, v3
+
+    :goto_0
+    invoke-interface {p0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v2
+
+    int-to-long v7, p1
+
+    invoke-virtual {p2, v7, v8}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide p1
+
+    invoke-static {v5, v6, p1, p2}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p1
+
+    add-long/2addr p1, v0
+
+    invoke-virtual {v2, p1, p2}, Lp0/x;->d(J)Lp0/x;
+
+    :try_start_0
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    :goto_1
+    const-wide/16 v7, 0x2000
+
+    invoke-interface {p0, p1, v7, v8}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v7
+
+    const-wide/16 v9, -0x1
+
+    cmp-long p2, v7, v9
+
+    if-eqz p2, :cond_1
+
+    iget-wide v7, p1, Lp0/e;->e:J
+
+    invoke-virtual {p1, v7, v8}, Lp0/e;->skip(J)V
+    :try_end_0
+    .catch Ljava/io/InterruptedIOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x1
+
+    cmp-long p2, v5, v3
+
+    if-nez p2, :cond_3
+
+    goto :goto_3
+
+    :catchall_0
+    move-exception p1
+
+    cmp-long p2, v5, v3
+
+    if-nez p2, :cond_2
+
+    invoke-interface {p0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Lp0/x;->a()Lp0/x;
+
+    goto :goto_2
+
+    :cond_2
+    invoke-interface {p0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object p0
+
+    add-long/2addr v0, v5
+
+    invoke-virtual {p0, v0, v1}, Lp0/x;->d(J)Lp0/x;
+
+    :goto_2
+    throw p1
+
+    :catch_0
+    nop
+
+    const/4 p1, 0x0
+
+    cmp-long p2, v5, v3
+
+    if-nez p2, :cond_3
+
+    :goto_3
+    invoke-interface {p0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Lp0/x;->a()Lp0/x;
+
+    goto :goto_4
+
+    :cond_3
+    invoke-interface {p0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object p0
+
+    add-long/2addr v0, v5
+
+    invoke-virtual {p0, v0, v1}, Lp0/x;->d(J)Lp0/x;
+
+    :goto_4
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/c/a$a.smali b/com.discord/smali_classes2/o0/g0/c/a$a.smali
new file mode 100644
index 0000000000..46256a722a
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/c/a$a.smali
@@ -0,0 +1,304 @@
+.class public final Lo0/g0/c/a$a;
+.super Ljava/lang/Object;
+.source "CacheInterceptor.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/c/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final a(Lo0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
+    .locals 19
+
+    move-object/from16 v0, p1
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    iget-object v2, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    goto :goto_0
+
+    :cond_0
+    move-object v2, v1
+
+    :goto_0
+    if-eqz v2, :cond_7
+
+    if-eqz v0, :cond_6
+
+    const-string v1, "response"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v3, v0, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v4, v0, Lokhttp3/Response;->e:Lo0/y;
+
+    iget v6, v0, Lokhttp3/Response;->g:I
+
+    iget-object v5, v0, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    iget-object v7, v0, Lokhttp3/Response;->h:Lo0/v;
+
+    iget-object v1, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v1}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v1
+
+    iget-object v10, v0, Lokhttp3/Response;->k:Lokhttp3/Response;
+
+    iget-object v11, v0, Lokhttp3/Response;->l:Lokhttp3/Response;
+
+    iget-object v12, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
+
+    iget-wide v13, v0, Lokhttp3/Response;->n:J
+
+    iget-wide v8, v0, Lokhttp3/Response;->o:J
+
+    iget-object v0, v0, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    const/4 v15, 0x0
+
+    if-ltz v6, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_5
+
+    if-eqz v3, :cond_4
+
+    if-eqz v4, :cond_3
+
+    if-eqz v5, :cond_2
+
+    invoke-virtual {v1}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v1
+
+    new-instance v18, Lokhttp3/Response;
+
+    move-object/from16 v2, v18
+
+    move-wide/from16 v16, v8
+
+    move-object v8, v1
+
+    move-object v9, v15
+
+    move-wide/from16 v15, v16
+
+    move-object/from16 v17, v0
+
+    invoke-direct/range {v2 .. v17}, Lokhttp3/Response;-><init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
+
+    move-object/from16 v0, v18
+
+    goto :goto_2
+
+    :cond_2
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "message == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "protocol == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "request == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_5
+    const-string v0, "code < 0: "
+
+    invoke-static {v0, v6}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_6
+    throw v1
+
+    :cond_7
+    :goto_2
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final b(Ljava/lang/String;)Z
+    .locals 2
+
+    const-string v0, "Content-Length"
+
+    const/4 v1, 0x1
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const-string v0, "Content-Encoding"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    const-string v0, "Content-Type"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :cond_1
+    :goto_0
+    return v1
+.end method
+
+.method public final c(Ljava/lang/String;)Z
+    .locals 2
+
+    const-string v0, "Connection"
+
+    const/4 v1, 0x1
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "Keep-Alive"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "Proxy-Authenticate"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "Proxy-Authorization"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "TE"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "Trailers"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "Transfer-Encoding"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "Upgrade"
+
+    invoke-static {v0, p1, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result p1
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/c/a.smali b/com.discord/smali_classes2/o0/g0/c/a.smali
new file mode 100644
index 0000000000..9a835a4dc5
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/c/a.smali
@@ -0,0 +1,490 @@
+.class public final Lo0/g0/c/a;
+.super Ljava/lang/Object;
+.source "CacheInterceptor.kt"
+
+# interfaces
+.implements Lokhttp3/Interceptor;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/c/a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:Lo0/g0/c/a$a;
+
+
+# instance fields
+.field public final b:Lo0/d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lo0/g0/c/a$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/g0/c/a$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/g0/c/a;->c:Lo0/g0/c/a$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lo0/g0/c/a;->b:Lo0/d;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+    .locals 17
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p1
+
+    const-string v1, "chain"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
+
+    move-result-object v1
+
+    const-string v2, "request"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lo0/g0/c/b;
+
+    const/4 v3, 0x0
+
+    invoke-direct {v2, v1, v3}, Lo0/g0/c/b;-><init>(Lo0/a0;Lokhttp3/Response;)V
+
+    iget-object v4, v2, Lo0/g0/c/b;->a:Lo0/a0;
+
+    if-eqz v4, :cond_0
+
+    invoke-virtual {v1}, Lo0/a0;->a()Lo0/e;
+
+    move-result-object v1
+
+    iget-boolean v1, v1, Lo0/e;->j:Z
+
+    if-eqz v1, :cond_0
+
+    new-instance v2, Lo0/g0/c/b;
+
+    invoke-direct {v2, v3, v3}, Lo0/g0/c/b;-><init>(Lo0/a0;Lokhttp3/Response;)V
+
+    :cond_0
+    iget-object v1, v2, Lo0/g0/c/b;->a:Lo0/a0;
+
+    iget-object v2, v2, Lo0/g0/c/b;->b:Lokhttp3/Response;
+
+    if-nez v1, :cond_1
+
+    if-nez v2, :cond_1
+
+    new-instance v1, Lokhttp3/Response$a;
+
+    invoke-direct {v1}, Lokhttp3/Response$a;-><init>()V
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Lokhttp3/Response$a;->g(Lo0/a0;)Lokhttp3/Response$a;
+
+    sget-object v0, Lo0/y;->e:Lo0/y;
+
+    invoke-virtual {v1, v0}, Lokhttp3/Response$a;->f(Lo0/y;)Lokhttp3/Response$a;
+
+    const/16 v0, 0x1f8
+
+    iput v0, v1, Lokhttp3/Response$a;->c:I
+
+    const-string v0, "Unsatisfiable Request (only-if-cached)"
+
+    invoke-virtual {v1, v0}, Lokhttp3/Response$a;->e(Ljava/lang/String;)Lokhttp3/Response$a;
+
+    sget-object v0, Lo0/g0/b;->c:Lokhttp3/ResponseBody;
+
+    iput-object v0, v1, Lokhttp3/Response$a;->g:Lokhttp3/ResponseBody;
+
+    const-wide/16 v2, -0x1
+
+    iput-wide v2, v1, Lokhttp3/Response$a;->k:J
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v2
+
+    iput-wide v2, v1, Lokhttp3/Response$a;->l:J
+
+    invoke-virtual {v1}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_1
+    if-nez v1, :cond_3
+
+    if-eqz v2, :cond_2
+
+    new-instance v0, Lokhttp3/Response$a;
+
+    invoke-direct {v0, v2}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
+
+    sget-object v1, Lo0/g0/c/a;->c:Lo0/g0/c/a$a;
+
+    invoke-static {v1, v2}, Lo0/g0/c/a$a;->a(Lo0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lokhttp3/Response$a;->b(Lokhttp3/Response;)Lokhttp3/Response$a;
+
+    invoke-virtual {v0}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_3
+    :try_start_0
+    invoke-interface {v0, v1}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const-string v1, "networkResponse"
+
+    if-eqz v2, :cond_e
+
+    if-eqz v0, :cond_d
+
+    iget v4, v0, Lokhttp3/Response;->g:I
+
+    const/16 v5, 0x130
+
+    if-ne v4, v5, :cond_d
+
+    new-instance v4, Lokhttp3/Response$a;
+
+    invoke-direct {v4, v2}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
+
+    sget-object v5, Lo0/g0/c/a;->c:Lo0/g0/c/a$a;
+
+    iget-object v6, v2, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    iget-object v7, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    new-instance v8, Ljava/util/ArrayList;
+
+    const/16 v9, 0x14
+
+    invoke-direct {v8, v9}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v6}, Lokhttp3/Headers;->size()I
+
+    move-result v9
+
+    const/4 v11, 0x0
+
+    :goto_0
+    const-string v12, "value"
+
+    const-string v13, "name"
+
+    if-ge v11, v9, :cond_8
+
+    invoke-virtual {v6, v11}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
+
+    move-result-object v14
+
+    invoke-virtual {v6, v11}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
+
+    move-result-object v15
+
+    const-string v3, "Warning"
+
+    const/4 v10, 0x1
+
+    invoke-static {v3, v14, v10}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_4
+
+    const/4 v3, 0x2
+
+    const-string v10, "1"
+
+    move-object/from16 v16, v6
+
+    const/4 v6, 0x0
+
+    invoke-static {v15, v10, v6, v3}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_5
+
+    goto :goto_1
+
+    :cond_4
+    move-object/from16 v16, v6
+
+    :cond_5
+    invoke-virtual {v5, v14}, Lo0/g0/c/a$a;->b(Ljava/lang/String;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_6
+
+    invoke-virtual {v5, v14}, Lo0/g0/c/a$a;->c(Ljava/lang/String;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_6
+
+    invoke-virtual {v7, v14}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
+    if-nez v3, :cond_7
+
+    :cond_6
+    invoke-static {v14, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v15, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8, v14}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-static {v15}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v8, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_7
+    :goto_1
+    add-int/lit8 v11, v11, 0x1
+
+    move-object/from16 v6, v16
+
+    const/4 v3, 0x0
+
+    goto :goto_0
+
+    :cond_8
+    invoke-virtual {v7}, Lokhttp3/Headers;->size()I
+
+    move-result v3
+
+    const/4 v6, 0x0
+
+    :goto_2
+    if-ge v6, v3, :cond_a
+
+    invoke-virtual {v7, v6}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-virtual {v5, v9}, Lo0/g0/c/a$a;->b(Ljava/lang/String;)Z
+
+    move-result v10
+
+    if-nez v10, :cond_9
+
+    invoke-virtual {v5, v9}, Lo0/g0/c/a$a;->c(Ljava/lang/String;)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_9
+
+    invoke-virtual {v7, v6}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-static {v9, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v10, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-static {v10}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v9
+
+    invoke-virtual {v9}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-virtual {v8, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_9
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_2
+
+    :cond_a
+    const/4 v6, 0x0
+
+    new-array v3, v6, [Ljava/lang/String;
+
+    invoke-virtual {v8, v3}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_c
+
+    check-cast v3, [Ljava/lang/String;
+
+    new-instance v5, Lokhttp3/Headers;
+
+    const/4 v6, 0x0
+
+    invoke-direct {v5, v3, v6}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v4, v5}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
+
+    iget-wide v5, v0, Lokhttp3/Response;->n:J
+
+    iput-wide v5, v4, Lokhttp3/Response$a;->k:J
+
+    iget-wide v5, v0, Lokhttp3/Response;->o:J
+
+    iput-wide v5, v4, Lokhttp3/Response$a;->l:J
+
+    sget-object v3, Lo0/g0/c/a;->c:Lo0/g0/c/a$a;
+
+    invoke-static {v3, v2}, Lo0/g0/c/a$a;->a(Lo0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
+
+    move-result-object v2
+
+    invoke-virtual {v4, v2}, Lokhttp3/Response$a;->b(Lokhttp3/Response;)Lokhttp3/Response$a;
+
+    sget-object v2, Lo0/g0/c/a;->c:Lo0/g0/c/a$a;
+
+    invoke-static {v2, v0}, Lo0/g0/c/a$a;->a(Lo0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
+
+    move-result-object v2
+
+    invoke-virtual {v4, v1, v2}, Lokhttp3/Response$a;->c(Ljava/lang/String;Lokhttp3/Response;)V
+
+    iput-object v2, v4, Lokhttp3/Response$a;->h:Lokhttp3/Response;
+
+    invoke-virtual {v4}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    iget-object v0, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v0, :cond_b
+
+    invoke-virtual {v0}, Lokhttp3/ResponseBody;->close()V
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_b
+    const/4 v0, 0x0
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_c
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_d
+    iget-object v3, v2, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v3, :cond_e
+
+    invoke-static {v3}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_e
+    if-eqz v0, :cond_f
+
+    new-instance v3, Lokhttp3/Response$a;
+
+    invoke-direct {v3, v0}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
+
+    sget-object v4, Lo0/g0/c/a;->c:Lo0/g0/c/a$a;
+
+    invoke-static {v4, v2}, Lo0/g0/c/a$a;->a(Lo0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
+
+    move-result-object v2
+
+    invoke-virtual {v3, v2}, Lokhttp3/Response$a;->b(Lokhttp3/Response;)Lokhttp3/Response$a;
+
+    sget-object v2, Lo0/g0/c/a;->c:Lo0/g0/c/a$a;
+
+    invoke-static {v2, v0}, Lo0/g0/c/a$a;->a(Lo0/g0/c/a$a;Lokhttp3/Response;)Lokhttp3/Response;
+
+    move-result-object v0
+
+    invoke-virtual {v3, v1, v0}, Lokhttp3/Response$a;->c(Ljava/lang/String;Lokhttp3/Response;)V
+
+    iput-object v0, v3, Lokhttp3/Response$a;->h:Lokhttp3/Response;
+
+    invoke-virtual {v3}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_f
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :catchall_0
+    move-exception v0
+
+    move-object v1, v0
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/c/b.smali b/com.discord/smali_classes2/o0/g0/c/b.smali
new file mode 100644
index 0000000000..d1c05d4a2c
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/c/b.smali
@@ -0,0 +1,23 @@
+.class public final Lo0/g0/c/b;
+.super Ljava/lang/Object;
+.source "CacheStrategy.kt"
+
+
+# instance fields
+.field public final a:Lo0/a0;
+
+.field public final b:Lokhttp3/Response;
+
+
+# direct methods
+.method public constructor <init>(Lo0/a0;Lokhttp3/Response;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/c/b;->a:Lo0/a0;
+
+    iput-object p2, p0, Lo0/g0/c/b;->b:Lokhttp3/Response;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/a.smali b/com.discord/smali_classes2/o0/g0/d/a.smali
new file mode 100644
index 0000000000..028994a5b7
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/a.smali
@@ -0,0 +1,265 @@
+.class public final Lo0/g0/d/a;
+.super Ljava/lang/Object;
+.source "ConnectInterceptor.kt"
+
+# interfaces
+.implements Lokhttp3/Interceptor;
+
+
+# static fields
+.field public static final b:Lo0/g0/d/a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/g0/d/a;
+
+    invoke-direct {v0}, Lo0/g0/d/a;-><init>()V
+
+    sput-object v0, Lo0/g0/d/a;->b:Lo0/g0/d/a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+    .locals 17
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p1
+
+    const-string v1, "chain"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v1, v0
+
+    check-cast v1, Lo0/g0/e/g;
+
+    iget-object v2, v1, Lo0/g0/e/g;->f:Lo0/a0;
+
+    iget-object v9, v1, Lo0/g0/e/g;->c:Lo0/g0/d/m;
+
+    iget-object v3, v2, Lo0/a0;->c:Ljava/lang/String;
+
+    const-string v4, "GET"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    const/4 v4, 0x1
+
+    xor-int/lit8 v16, v3, 0x1
+
+    const/4 v3, 0x0
+
+    if-eqz v9, :cond_5
+
+    const-string v5, "chain"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v5, v9, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v5
+
+    :try_start_0
+    iget-boolean v6, v9, Lo0/g0/d/m;->m:Z
+
+    xor-int/2addr v6, v4
+
+    if-eqz v6, :cond_4
+
+    iget-object v6, v9, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    const/4 v8, 0x0
+
+    if-nez v6, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :goto_0
+    if-eqz v4, :cond_3
+
+    monitor-exit v5
+
+    iget-object v4, v9, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    if-eqz v4, :cond_2
+
+    iget-object v5, v9, Lo0/g0/d/m;->n:Lo0/x;
+
+    const-string v6, "client"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "chain"
+
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->e()I
+
+    move-result v11
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->b()I
+
+    move-result v12
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->c()I
+
+    move-result v13
+
+    iget v14, v5, Lo0/x;->E:I
+
+    iget-boolean v15, v5, Lo0/x;->i:Z
+
+    move-object v10, v4
+
+    :try_start_1
+    invoke-virtual/range {v10 .. v16}, Lo0/g0/d/d;->b(IIIIZZ)Lo0/g0/d/i;
+
+    move-result-object v6
+
+    invoke-virtual {v6, v5, v0}, Lo0/g0/d/i;->i(Lo0/x;Lokhttp3/Interceptor$Chain;)Lo0/g0/e/d;
+
+    move-result-object v0
+    :try_end_1
+    .catch Lokhttp3/internal/connection/RouteException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
+
+    new-instance v10, Lo0/g0/d/c;
+
+    iget-object v5, v9, Lo0/g0/d/m;->o:Lo0/f;
+
+    iget-object v6, v9, Lo0/g0/d/m;->b:Lo0/t;
+
+    iget-object v7, v9, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    if-eqz v7, :cond_1
+
+    move-object v3, v10
+
+    move-object v4, v9
+
+    const/4 v11, 0x0
+
+    move-object v8, v0
+
+    invoke-direct/range {v3 .. v8}, Lo0/g0/d/c;-><init>(Lo0/g0/d/m;Lo0/f;Lo0/t;Lo0/g0/d/d;Lo0/g0/e/d;)V
+
+    iget-object v3, v9, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v3
+
+    :try_start_2
+    iput-object v10, v9, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    iput-boolean v11, v9, Lo0/g0/d/m;->i:Z
+
+    iput-boolean v11, v9, Lo0/g0/d/m;->j:Z
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    monitor-exit v3
+
+    invoke-virtual {v1, v2, v9, v10}, Lo0/g0/e/g;->f(Lo0/a0;Lo0/g0/d/m;Lo0/g0/d/c;)Lokhttp3/Response;
+
+    move-result-object v0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v3
+
+    throw v0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :catch_0
+    move-exception v0
+
+    invoke-virtual {v4}, Lo0/g0/d/d;->e()V
+
+    new-instance v1, Lokhttp3/internal/connection/RouteException;
+
+    invoke-direct {v1, v0}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
+
+    throw v1
+
+    :catch_1
+    move-exception v0
+
+    invoke-virtual {v4}, Lo0/g0/d/d;->e()V
+
+    throw v0
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_3
+    :try_start_3
+    const-string v0, "cannot make a new request because the previous response is still open: please call response.close()"
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_4
+    const-string v0, "released"
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit v5
+
+    throw v0
+
+    :cond_5
+    throw v3
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/b.smali b/com.discord/smali_classes2/o0/g0/d/b.smali
new file mode 100644
index 0000000000..67d069ee6b
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/b.smali
@@ -0,0 +1,387 @@
+.class public final Lo0/g0/d/b;
+.super Ljava/lang/Object;
+.source "ConnectionSpecSelector.kt"
+
+
+# instance fields
+.field public a:I
+
+.field public b:Z
+
+.field public c:Z
+
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/m;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lo0/m;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "connectionSpecs"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/b;->d:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljavax/net/ssl/SSLSocket;)Lo0/m;
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v1, p0, Lo0/g0/d/b;->a:I
+
+    iget-object v2, p0, Lo0/g0/d/b;->d:Ljava/util/List;
+
+    invoke-interface {v2}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    :goto_0
+    const/4 v3, 0x0
+
+    if-ge v1, v2, :cond_1
+
+    iget-object v4, p0, Lo0/g0/d/b;->d:Ljava/util/List;
+
+    invoke-interface {v4, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lo0/m;
+
+    invoke-virtual {v4, p1}, Lo0/m;->b(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    add-int/lit8 v1, v1, 0x1
+
+    iput v1, p0, Lo0/g0/d/b;->a:I
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    move-object v4, v3
+
+    :goto_1
+    if-nez v4, :cond_3
+
+    const-string v0, "Unable to find acceptable protocols. isFallback="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-boolean v1, p0, Lo0/g0/d/b;->c:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x2c
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v2, " modes="
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v2, p0, Lo0/g0/d/b;->d:Ljava/util/List;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v1, " supported protocols="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
+
+    move-result-object p1
+
+    if-nez p1, :cond_2
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_2
+    invoke-static {p1}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v1, "java.util.Arrays.toString(this)"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/net/UnknownServiceException;
+
+    invoke-direct {v0, p1}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    iget v1, p0, Lo0/g0/d/b;->a:I
+
+    iget-object v2, p0, Lo0/g0/d/b;->d:Ljava/util/List;
+
+    invoke-interface {v2}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    :goto_2
+    if-ge v1, v2, :cond_5
+
+    iget-object v3, p0, Lo0/g0/d/b;->d:Ljava/util/List;
+
+    invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lo0/m;
+
+    invoke-virtual {v3, p1}, Lo0/m;->b(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_4
+
+    const/4 v1, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_2
+
+    :cond_5
+    const/4 v1, 0x0
+
+    :goto_3
+    iput-boolean v1, p0, Lo0/g0/d/b;->b:Z
+
+    iget-boolean v1, p0, Lo0/g0/d/b;->c:Z
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, v4, Lo0/m;->c:[Ljava/lang/String;
+
+    if-eqz v0, :cond_6
+
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "sslSocket.enabledCipherSuites"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v4, Lo0/m;->c:[Ljava/lang/String;
+
+    sget-object v3, Lo0/j;->t:Lo0/j$b;
+
+    sget-object v3, Lo0/j;->b:Ljava/util/Comparator;
+
+    invoke-static {v0, v2, v3}, Lo0/g0/b;->v([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)[Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_4
+
+    :cond_6
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_4
+    iget-object v2, v4, Lo0/m;->d:[Ljava/lang/String;
+
+    if-eqz v2, :cond_7
+
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "sslSocket.enabledProtocols"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v3, v4, Lo0/m;->d:[Ljava/lang/String;
+
+    sget-object v5, Lk0/k/c;->d:Lk0/k/c;
+
+    invoke-static {v2, v3, v5}, Lo0/g0/b;->v([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)[Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_5
+
+    :cond_7
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
+
+    move-result-object v2
+
+    :goto_5
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getSupportedCipherSuites()[Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v5, "supportedCipherSuites"
+
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v5, Lo0/j;->t:Lo0/j$b;
+
+    sget-object v5, Lo0/j;->b:Ljava/util/Comparator;
+
+    const-string v6, "TLS_FALLBACK_SCSV"
+
+    invoke-static {v3, v6, v5}, Lo0/g0/b;->p([Ljava/lang/String;Ljava/lang/String;Ljava/util/Comparator;)I
+
+    move-result v5
+
+    const-string v6, "cipherSuitesIntersection"
+
+    if-eqz v1, :cond_8
+
+    const/4 v1, -0x1
+
+    if-eq v5, v1, :cond_8
+
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    aget-object v1, v3, v5
+
+    const-string v3, "supportedCipherSuites[indexOfFallbackScsv]"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "$this$concat"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "value"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v3, v0
+
+    add-int/lit8 v3, v3, 0x1
+
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v3, "java.util.Arrays.copyOf(this, newSize)"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, [Ljava/lang/String;
+
+    invoke-static {v0}, Lf/n/a/k/a;->getLastIndex([Ljava/lang/Object;)I
+
+    move-result v3
+
+    aput-object v1, v0, v3
+
+    :cond_8
+    new-instance v1, Lo0/m$a;
+
+    invoke-direct {v1, v4}, Lo0/m$a;-><init>(Lo0/m;)V
+
+    invoke-static {v0, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v3, v0
+
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ljava/lang/String;
+
+    invoke-virtual {v1, v0}, Lo0/m$a;->b([Ljava/lang/String;)Lo0/m$a;
+
+    const-string v0, "tlsVersionsIntersection"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, v2
+
+    invoke-static {v2, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ljava/lang/String;
+
+    invoke-virtual {v1, v0}, Lo0/m$a;->e([Ljava/lang/String;)Lo0/m$a;
+
+    invoke-virtual {v1}, Lo0/m$a;->a()Lo0/m;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lo0/m;->c()Ljava/util/List;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_9
+
+    iget-object v1, v0, Lo0/m;->d:[Ljava/lang/String;
+
+    invoke-virtual {p1, v1}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
+
+    :cond_9
+    invoke-virtual {v0}, Lo0/m;->a()Ljava/util/List;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_a
+
+    iget-object v0, v0, Lo0/m;->c:[Ljava/lang/String;
+
+    invoke-virtual {p1, v0}, Ljavax/net/ssl/SSLSocket;->setEnabledCipherSuites([Ljava/lang/String;)V
+
+    :cond_a
+    return-object v4
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/c$a.smali b/com.discord/smali_classes2/o0/g0/d/c$a.smali
new file mode 100644
index 0000000000..3b19e2d351
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/c$a.smali
@@ -0,0 +1,288 @@
+.class public final Lo0/g0/d/c$a;
+.super Lp0/h;
+.source "Exchange.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/d/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public e:J
+
+.field public f:Z
+
+.field public final g:J
+
+.field public final synthetic h:Lo0/g0/d/c;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/c;Lp0/u;J)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lp0/u;",
+            "J)V"
+        }
+    .end annotation
+
+    const-string v0, "delegate"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/g0/d/c$a;->h:Lo0/g0/d/c;
+
+    invoke-direct {p0, p2}, Lp0/h;-><init>(Lp0/u;)V
+
+    iput-wide p3, p0, Lo0/g0/d/c$a;->g:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/io/IOException;)Ljava/io/IOException;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/io/IOException;",
+            ">(TE;)TE;"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/d/c$a;->d:Z
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/d/c$a;->d:Z
+
+    iget-object v1, p0, Lo0/g0/d/c$a;->h:Lo0/g0/d/c;
+
+    iget-wide v2, p0, Lo0/g0/d/c$a;->e:J
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    move-object v6, p1
+
+    invoke-virtual/range {v1 .. v6}, Lo0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public close()V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/d/c$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/d/c$a;->f:Z
+
+    iget-wide v0, p0, Lo0/g0/d/c$a;->g:J
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_2
+
+    iget-wide v2, p0, Lo0/g0/d/c$a;->e:J
+
+    cmp-long v4, v2, v0
+
+    if-nez v4, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "unexpected end of stream"
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    :goto_0
+    :try_start_0
+    invoke-super {p0}, Lp0/h;->close()V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lo0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    invoke-virtual {p0, v0}, Lo0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    throw v0
+.end method
+
+.method public flush()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :try_start_0
+    invoke-super {p0}, Lp0/h;->flush()V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    invoke-virtual {p0, v0}, Lo0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    throw v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/d/c$a;->f:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_2
+
+    iget-wide v0, p0, Lo0/g0/d/c$a;->g:J
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_1
+
+    iget-wide v2, p0, Lo0/g0/d/c$a;->e:J
+
+    add-long/2addr v2, p2
+
+    cmp-long v4, v2, v0
+
+    if-gtz v4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/net/ProtocolException;
+
+    const-string v0, "expected "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-wide v1, p0, Lo0/g0/d/c$a;->g:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, " bytes but received "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Lo0/g0/d/c$a;->e:J
+
+    add-long/2addr v1, p2
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    :try_start_0
+    invoke-super {p0, p1, p2, p3}, Lp0/h;->write(Lp0/e;J)V
+
+    iget-wide v0, p0, Lo0/g0/d/c$a;->e:J
+
+    add-long/2addr v0, p2
+
+    iput-wide v0, p0, Lo0/g0/d/c$a;->e:J
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    invoke-virtual {p0, p1}, Lo0/g0/d/c$a;->a(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    throw p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/c$b.smali b/com.discord/smali_classes2/o0/g0/d/c$b.smali
new file mode 100644
index 0000000000..7e76e24882
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/c$b.smali
@@ -0,0 +1,269 @@
+.class public final Lo0/g0/d/c$b;
+.super Lp0/i;
+.source "Exchange.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/d/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public e:J
+
+.field public f:Z
+
+.field public g:Z
+
+.field public final h:J
+
+.field public final synthetic i:Lo0/g0/d/c;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/c;Lp0/w;J)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lp0/w;",
+            "J)V"
+        }
+    .end annotation
+
+    const-string v0, "delegate"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/g0/d/c$b;->i:Lo0/g0/d/c;
+
+    invoke-direct {p0, p2}, Lp0/i;-><init>(Lp0/w;)V
+
+    iput-wide p3, p0, Lo0/g0/d/c$b;->h:J
+
+    const-wide/16 p1, 0x0
+
+    cmp-long v0, p3, p1
+
+    if-nez v0, :cond_0
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Lo0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
+
+    :cond_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/d/c$b;->g:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_4
+
+    :try_start_0
+    iget-object v0, p0, Lp0/i;->d:Lp0/w;
+
+    invoke-interface {v0, p1, p2, p3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+
+    const/4 p3, 0x0
+
+    const-wide/16 v0, -0x1
+
+    cmp-long v2, p1, v0
+
+    if-nez v2, :cond_0
+
+    invoke-virtual {p0, p3}, Lo0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
+
+    return-wide v0
+
+    :cond_0
+    iget-wide v2, p0, Lo0/g0/d/c$b;->e:J
+
+    add-long/2addr v2, p1
+
+    iget-wide v4, p0, Lo0/g0/d/c$b;->h:J
+
+    cmp-long v6, v4, v0
+
+    if-eqz v6, :cond_2
+
+    iget-wide v0, p0, Lo0/g0/d/c$b;->h:J
+
+    cmp-long v4, v2, v0
+
+    if-gtz v4, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ljava/net/ProtocolException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string p3, "expected "
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v0, p0, Lo0/g0/d/c$b;->h:J
+
+    invoke-virtual {p2, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string p3, " bytes but received "
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    :goto_0
+    iput-wide v2, p0, Lo0/g0/d/c$b;->e:J
+
+    iget-wide v0, p0, Lo0/g0/d/c$b;->h:J
+
+    cmp-long v4, v2, v0
+
+    if-nez v4, :cond_3
+
+    invoke-virtual {p0, p3}, Lo0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :cond_3
+    return-wide p1
+
+    :catch_0
+    move-exception p1
+
+    invoke-virtual {p0, p1}, Lo0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    throw p1
+
+    :cond_4
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final a(Ljava/io/IOException;)Ljava/io/IOException;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/io/IOException;",
+            ">(TE;)TE;"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/d/c$b;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/d/c$b;->f:Z
+
+    iget-object v1, p0, Lo0/g0/d/c$b;->i:Lo0/g0/d/c;
+
+    iget-wide v2, p0, Lo0/g0/d/c$b;->e:J
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    move-object v6, p1
+
+    invoke-virtual/range {v1 .. v6}, Lo0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public close()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/d/c$b;->g:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/d/c$b;->g:Z
+
+    :try_start_0
+    iget-object v0, p0, Lp0/i;->d:Lp0/w;
+
+    invoke-interface {v0}, Lp0/w;->close()V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lo0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    invoke-virtual {p0, v0}, Lo0/g0/d/c$b;->a(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/c.smali b/com.discord/smali_classes2/o0/g0/d/c.smali
new file mode 100644
index 0000000000..739840e2c9
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/c.smali
@@ -0,0 +1,571 @@
+.class public final Lo0/g0/d/c;
+.super Ljava/lang/Object;
+.source "Exchange.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/d/c$a;,
+        Lo0/g0/d/c$b;
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Z
+
+.field public final b:Lo0/g0/d/m;
+
+.field public final c:Lo0/f;
+
+.field public final d:Lo0/t;
+
+.field public final e:Lo0/g0/d/d;
+
+.field public final f:Lo0/g0/e/d;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/m;Lo0/f;Lo0/t;Lo0/g0/d/d;Lo0/g0/e/d;)V
+    .locals 1
+
+    const-string v0, "transmitter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "call"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "eventListener"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "finder"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "codec"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/c;->b:Lo0/g0/d/m;
+
+    iput-object p2, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    iput-object p3, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iput-object p4, p0, Lo0/g0/d/c;->e:Lo0/g0/d/d;
+
+    iput-object p5, p0, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(JZZLjava/io/IOException;)Ljava/io/IOException;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/io/IOException;",
+            ">(JZZTE;)TE;"
+        }
+    .end annotation
+
+    if-eqz p5, :cond_0
+
+    invoke-virtual {p0, p5}, Lo0/g0/d/c;->g(Ljava/io/IOException;)V
+
+    :cond_0
+    const-string p1, "ioe"
+
+    const-string p2, "call"
+
+    const/4 v0, 0x0
+
+    if-eqz p4, :cond_4
+
+    if-eqz p5, :cond_2
+
+    iget-object v1, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v2, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v1, :cond_1
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p5, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_1
+    throw v0
+
+    :cond_2
+    iget-object v1, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v2, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v1, :cond_3
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_3
+    throw v0
+
+    :cond_4
+    :goto_0
+    if-eqz p3, :cond_8
+
+    if-eqz p5, :cond_6
+
+    iget-object v1, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v2, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v1, :cond_5
+
+    invoke-static {v2, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p5, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_5
+    throw v0
+
+    :cond_6
+    iget-object p1, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v1, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz p1, :cond_7
+
+    invoke-static {v1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_7
+    throw v0
+
+    :cond_8
+    :goto_1
+    iget-object p1, p0, Lo0/g0/d/c;->b:Lo0/g0/d/m;
+
+    invoke-virtual {p1, p0, p4, p3, p5}, Lo0/g0/d/m;->e(Lo0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final b()Lo0/g0/d/i;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v0}, Lo0/g0/e/d;->a()Lo0/g0/d/i;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final c(Lo0/a0;Z)Lp0/u;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "request"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-boolean p2, p0, Lo0/g0/d/c;->a:Z
+
+    iget-object p2, p1, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    const/4 v0, 0x0
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {p2}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v1
+
+    iget-object p2, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v3, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz p2, :cond_0
+
+    const-string p2, "call"
+
+    invoke-static {v3, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p2, p0, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {p2, p1, v1, v2}, Lo0/g0/e/d;->h(Lo0/a0;J)Lp0/u;
+
+    move-result-object p1
+
+    new-instance p2, Lo0/g0/d/c$a;
+
+    invoke-direct {p2, p0, p1, v1, v2}, Lo0/g0/d/c$a;-><init>(Lo0/g0/d/c;Lp0/u;J)V
+
+    return-object p2
+
+    :cond_0
+    throw v0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+.end method
+
+.method public final d()V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v0}, Lo0/g0/e/d;->f()V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    iget-object v1, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v2, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v1, :cond_0
+
+    const-string v1, "call"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "ioe"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, v0}, Lo0/g0/d/c;->g(Ljava/io/IOException;)V
+
+    throw v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public final e()Lo0/g0/k/a$f;
+    .locals 10
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/net/SocketException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/d/c;->b:Lo0/g0/d/m;
+
+    invoke-virtual {v0}, Lo0/g0/d/m;->j()V
+
+    iget-object v0, p0, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v0}, Lo0/g0/e/d;->a()Lo0/g0/d/i;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_4
+
+    if-eqz v0, :cond_3
+
+    const-string v2, "exchange"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v0, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    if-eqz v2, :cond_2
+
+    iget-object v8, v0, Lo0/g0/d/i;->g:Lp0/g;
+
+    if-eqz v8, :cond_1
+
+    iget-object v9, v0, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+
+    if-eqz v9, :cond_0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v2, v1}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    invoke-virtual {v0}, Lo0/g0/d/i;->j()V
+
+    new-instance v0, Lo0/g0/d/h;
+
+    const/4 v7, 0x1
+
+    move-object v3, v0
+
+    move-object v4, p0
+
+    move-object v5, v8
+
+    move-object v6, v9
+
+    invoke-direct/range {v3 .. v9}, Lo0/g0/d/h;-><init>(Lo0/g0/d/c;Lp0/g;Lokio/BufferedSink;ZLp0/g;Lokio/BufferedSink;)V
+
+    return-object v0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_3
+    throw v1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public final f(Z)Lokhttp3/Response$a;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v0, p1}, Lo0/g0/e/d;->e(Z)Lokhttp3/Response$a;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    const-string v0, "deferredTrailers"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p0, p1, Lokhttp3/Response$a;->m:Lo0/g0/d/c;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :cond_0
+    return-object p1
+
+    :catch_0
+    move-exception p1
+
+    iget-object v0, p0, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v1, p0, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v0, :cond_1
+
+    const-string v0, "call"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "ioe"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lo0/g0/d/c;->g(Ljava/io/IOException;)V
+
+    throw p1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public final g(Ljava/io/IOException;)V
+    .locals 5
+
+    iget-object v0, p0, Lo0/g0/d/c;->e:Lo0/g0/d/d;
+
+    invoke-virtual {v0}, Lo0/g0/d/d;->e()V
+
+    iget-object v0, p0, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v0}, Lo0/g0/e/d;->a()Lo0/g0/d/i;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_6
+
+    iget-object v1, v0, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    invoke-static {v1}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    xor-int/2addr v1, v2
+
+    sget-boolean v3, Lk0/i;->a:Z
+
+    if-eqz v3, :cond_1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p1, "Assertion failed"
+
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    iget-object v1, v0, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    monitor-enter v1
+
+    :try_start_0
+    instance-of v3, p1, Lokhttp3/internal/http2/StreamResetException;
+
+    if-eqz v3, :cond_3
+
+    check-cast p1, Lokhttp3/internal/http2/StreamResetException;
+
+    iget-object p1, p1, Lokhttp3/internal/http2/StreamResetException;->errorCode:Lo0/g0/g/a;
+
+    invoke-virtual {p1}, Ljava/lang/Enum;->ordinal()I
+
+    move-result p1
+
+    const/4 v3, 0x4
+
+    if-eq p1, v3, :cond_2
+
+    const/4 v3, 0x5
+
+    if-eq p1, v3, :cond_5
+
+    iput-boolean v2, v0, Lo0/g0/d/i;->i:Z
+
+    iget p1, v0, Lo0/g0/d/i;->j:I
+
+    add-int/2addr p1, v2
+
+    iput p1, v0, Lo0/g0/d/i;->j:I
+
+    goto :goto_1
+
+    :cond_2
+    iget p1, v0, Lo0/g0/d/i;->l:I
+
+    add-int/2addr p1, v2
+
+    iput p1, v0, Lo0/g0/d/i;->l:I
+
+    if-le p1, v2, :cond_5
+
+    iput-boolean v2, v0, Lo0/g0/d/i;->i:Z
+
+    iget p1, v0, Lo0/g0/d/i;->j:I
+
+    add-int/2addr p1, v2
+
+    iput p1, v0, Lo0/g0/d/i;->j:I
+
+    goto :goto_1
+
+    :cond_3
+    invoke-virtual {v0}, Lo0/g0/d/i;->h()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_4
+
+    instance-of v3, p1, Lokhttp3/internal/http2/ConnectionShutdownException;
+
+    if-eqz v3, :cond_5
+
+    :cond_4
+    iput-boolean v2, v0, Lo0/g0/d/i;->i:Z
+
+    iget v3, v0, Lo0/g0/d/i;->k:I
+
+    if-nez v3, :cond_5
+
+    iget-object v3, v0, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    iget-object v4, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    invoke-virtual {v3, v4, p1}, Lo0/g0/d/j;->a(Lo0/e0;Ljava/io/IOException;)V
+
+    iget p1, v0, Lo0/g0/d/i;->j:I
+
+    add-int/2addr p1, v2
+
+    iput p1, v0, Lo0/g0/d/i;->j:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_5
+    :goto_1
+    monitor-exit v1
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v1
+
+    throw p1
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/d.smali b/com.discord/smali_classes2/o0/g0/d/d.smali
new file mode 100644
index 0000000000..5c291b27e9
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/d.smali
@@ -0,0 +1,1503 @@
+.class public final Lo0/g0/d/d;
+.super Ljava/lang/Object;
+.source "ExchangeFinder.kt"
+
+
+# instance fields
+.field public a:Lo0/g0/d/l$a;
+
+.field public final b:Lo0/g0/d/l;
+
+.field public c:Lo0/g0/d/i;
+
+.field public d:Z
+
+.field public e:Lo0/e0;
+
+.field public final f:Lo0/g0/d/m;
+
+.field public final g:Lo0/g0/d/j;
+
+.field public final h:Lo0/a;
+
+.field public final i:Lo0/f;
+
+.field public final j:Lo0/t;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/m;Lo0/g0/d/j;Lo0/a;Lo0/f;Lo0/t;)V
+    .locals 1
+
+    const-string v0, "transmitter"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connectionPool"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "address"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "call"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "eventListener"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iput-object p2, p0, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    iput-object p3, p0, Lo0/g0/d/d;->h:Lo0/a;
+
+    iput-object p4, p0, Lo0/g0/d/d;->i:Lo0/f;
+
+    iput-object p5, p0, Lo0/g0/d/d;->j:Lo0/t;
+
+    new-instance p1, Lo0/g0/d/l;
+
+    iget-object p2, p2, Lo0/g0/d/j;->d:Lo0/g0/d/k;
+
+    invoke-direct {p1, p3, p2, p4, p5}, Lo0/g0/d/l;-><init>(Lo0/a;Lo0/g0/d/k;Lo0/f;Lo0/t;)V
+
+    iput-object p1, p0, Lo0/g0/d/d;->b:Lo0/g0/d/l;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(IIIIZ)Lo0/g0/d/i;
+    .locals 16
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v1, p0
+
+    new-instance v0, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v0}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    iget-object v2, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    monitor-enter v2
+
+    :try_start_0
+    iget-object v3, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    invoke-virtual {v3}, Lo0/g0/d/m;->f()Z
+
+    move-result v3
+
+    if-nez v3, :cond_33
+
+    const/4 v3, 0x0
+
+    iput-boolean v3, v1, Lo0/g0/d/d;->d:Z
+
+    iget-object v4, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v4, v4, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    iput-object v4, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    iget-object v4, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v4, v4, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    const/4 v5, 0x0
+
+    if-eqz v4, :cond_1
+
+    iget-object v4, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v4, v4, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-eqz v4, :cond_0
+
+    iget-boolean v4, v4, Lo0/g0/d/i;->i:Z
+
+    if-eqz v4, :cond_1
+
+    iget-object v4, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    invoke-virtual {v4}, Lo0/g0/d/m;->i()Ljava/net/Socket;
+
+    move-result-object v4
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_3
+
+    throw v5
+
+    :cond_1
+    move-object v4, v5
+
+    :goto_0
+    :try_start_1
+    iget-object v6, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v6, v6, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-eqz v6, :cond_2
+
+    iget-object v6, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v6, v6, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    iput-object v5, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    goto :goto_1
+
+    :cond_2
+    move-object v6, v5
+
+    :goto_1
+    const/4 v7, 0x1
+
+    if-nez v6, :cond_6
+
+    iget-object v8, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    iget-object v9, v1, Lo0/g0/d/d;->h:Lo0/a;
+
+    iget-object v10, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    invoke-virtual {v8, v9, v10, v5, v3}, Lo0/g0/d/j;->d(Lo0/a;Lo0/g0/d/m;Ljava/util/List;Z)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_3
+
+    iget-object v3, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v6, v3, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    const/4 v3, 0x1
+
+    move-object v8, v6
+
+    move-object v6, v5
+
+    goto :goto_3
+
+    :cond_3
+    iget-object v3, v1, Lo0/g0/d/d;->e:Lo0/e0;
+
+    if-eqz v3, :cond_4
+
+    iget-object v3, v1, Lo0/g0/d/d;->e:Lo0/e0;
+
+    iput-object v5, v1, Lo0/g0/d/d;->e:Lo0/e0;
+
+    goto :goto_2
+
+    :cond_4
+    invoke-virtual/range {p0 .. p0}, Lo0/g0/d/d;->d()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_6
+
+    iget-object v3, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v3, v3, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-eqz v3, :cond_5
+
+    iget-object v3, v3, Lo0/g0/d/i;->q:Lo0/e0;
+
+    goto :goto_2
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_3
+
+    throw v5
+
+    :cond_6
+    move-object v3, v5
+
+    :goto_2
+    const/4 v8, 0x0
+
+    move-object v8, v6
+
+    move-object v6, v3
+
+    const/4 v3, 0x0
+
+    :goto_3
+    monitor-exit v2
+
+    if-eqz v4, :cond_7
+
+    invoke-static {v4}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_7
+    iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast v0, Lo0/g0/d/i;
+
+    if-eqz v0, :cond_a
+
+    iget-object v2, v1, Lo0/g0/d/d;->j:Lo0/t;
+
+    iget-object v4, v1, Lo0/g0/d/d;->i:Lo0/f;
+
+    if-eqz v0, :cond_9
+
+    if-eqz v2, :cond_8
+
+    const-string v2, "call"
+
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "connection"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_4
+
+    :cond_8
+    throw v5
+
+    :cond_9
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_a
+    :goto_4
+    if-eqz v3, :cond_d
+
+    iget-object v0, v1, Lo0/g0/d/d;->j:Lo0/t;
+
+    iget-object v2, v1, Lo0/g0/d/d;->i:Lo0/f;
+
+    if-eqz v8, :cond_c
+
+    if-eqz v0, :cond_b
+
+    const-string v0, "call"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connection"
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_5
+
+    :cond_b
+    throw v5
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_d
+    :goto_5
+    if-eqz v8, :cond_e
+
+    return-object v8
+
+    :cond_e
+    if-nez v6, :cond_21
+
+    iget-object v0, v1, Lo0/g0/d/d;->a:Lo0/g0/d/l$a;
+
+    if-eqz v0, :cond_f
+
+    invoke-virtual {v0}, Lo0/g0/d/l$a;->a()Z
+
+    move-result v0
+
+    if-nez v0, :cond_21
+
+    :cond_f
+    iget-object v0, v1, Lo0/g0/d/d;->b:Lo0/g0/d/l;
+
+    invoke-virtual {v0}, Lo0/g0/d/l;->a()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_20
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+
+    :goto_6
+    invoke-virtual {v0}, Lo0/g0/d/l;->b()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1e
+
+    invoke-virtual {v0}, Lo0/g0/d/l;->b()Z
+
+    move-result v4
+
+    const-string v9, "No route to "
+
+    if-eqz v4, :cond_1d
+
+    iget-object v4, v0, Lo0/g0/d/l;->a:Ljava/util/List;
+
+    iget v10, v0, Lo0/g0/d/l;->b:I
+
+    add-int/lit8 v11, v10, 0x1
+
+    iput v11, v0, Lo0/g0/d/l;->b:I
+
+    invoke-interface {v4, v10}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/net/Proxy;
+
+    new-instance v10, Ljava/util/ArrayList;
+
+    invoke-direct {v10}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v10, v0, Lo0/g0/d/l;->c:Ljava/util/List;
+
+    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v11
+
+    sget-object v12, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
+
+    if-eq v11, v12, :cond_13
+
+    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v11
+
+    sget-object v12, Ljava/net/Proxy$Type;->SOCKS:Ljava/net/Proxy$Type;
+
+    if-ne v11, v12, :cond_10
+
+    goto :goto_8
+
+    :cond_10
+    invoke-virtual {v4}, Ljava/net/Proxy;->address()Ljava/net/SocketAddress;
+
+    move-result-object v11
+
+    instance-of v12, v11, Ljava/net/InetSocketAddress;
+
+    if-eqz v12, :cond_12
+
+    check-cast v11, Ljava/net/InetSocketAddress;
+
+    const-string v12, "$this$socketHost"
+
+    invoke-static {v11, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v11}, Ljava/net/InetSocketAddress;->getAddress()Ljava/net/InetAddress;
+
+    move-result-object v12
+
+    if-eqz v12, :cond_11
+
+    invoke-virtual {v12}, Ljava/net/InetAddress;->getHostAddress()Ljava/lang/String;
+
+    move-result-object v12
+
+    const-string v13, "address.hostAddress"
+
+    invoke-static {v12, v13}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_7
+
+    :cond_11
+    invoke-virtual {v11}, Ljava/net/InetSocketAddress;->getHostName()Ljava/lang/String;
+
+    move-result-object v12
+
+    const-string v13, "hostName"
+
+    invoke-static {v12, v13}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_7
+    invoke-virtual {v11}, Ljava/net/InetSocketAddress;->getPort()I
+
+    move-result v11
+
+    goto :goto_9
+
+    :cond_12
+    const-string v0, "Proxy.address() is not an InetSocketAddress: "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {v11}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v2, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_13
+    :goto_8
+    iget-object v11, v0, Lo0/g0/d/l;->e:Lo0/a;
+
+    iget-object v11, v11, Lo0/a;->a:Lo0/w;
+
+    iget-object v12, v11, Lo0/w;->e:Ljava/lang/String;
+
+    iget v11, v11, Lo0/w;->f:I
+
+    :goto_9
+    const v13, 0xffff
+
+    if-gt v7, v11, :cond_1c
+
+    if-lt v13, v11, :cond_1c
+
+    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v9
+
+    sget-object v13, Ljava/net/Proxy$Type;->SOCKS:Ljava/net/Proxy$Type;
+
+    if-ne v9, v13, :cond_14
+
+    invoke-static {v12, v11}, Ljava/net/InetSocketAddress;->createUnresolved(Ljava/lang/String;I)Ljava/net/InetSocketAddress;
+
+    move-result-object v5
+
+    invoke-virtual {v10, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_b
+
+    :cond_14
+    iget-object v9, v0, Lo0/g0/d/l;->h:Lo0/t;
+
+    iget-object v13, v0, Lo0/g0/d/l;->g:Lo0/f;
+
+    if-eqz v9, :cond_1b
+
+    const-string v5, "call"
+
+    invoke-static {v13, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v9, "domainName"
+
+    invoke-static {v12, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v13, v0, Lo0/g0/d/l;->e:Lo0/a;
+
+    iget-object v13, v13, Lo0/a;->d:Lo0/s;
+
+    invoke-interface {v13, v12}, Lo0/s;->a(Ljava/lang/String;)Ljava/util/List;
+
+    move-result-object v13
+
+    invoke-interface {v13}, Ljava/util/List;->isEmpty()Z
+
+    move-result v14
+
+    if-nez v14, :cond_1a
+
+    iget-object v14, v0, Lo0/g0/d/l;->h:Lo0/t;
+
+    iget-object v15, v0, Lo0/g0/d/l;->g:Lo0/f;
+
+    if-eqz v14, :cond_19
+
+    invoke-static {v15, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v12, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "inetAddressList"
+
+    invoke-static {v13, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v13}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v5
+
+    :goto_a
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_15
+
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/net/InetAddress;
+
+    new-instance v12, Ljava/net/InetSocketAddress;
+
+    invoke-direct {v12, v9, v11}, Ljava/net/InetSocketAddress;-><init>(Ljava/net/InetAddress;I)V
+
+    invoke-virtual {v10, v12}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_a
+
+    :cond_15
+    :goto_b
+    iget-object v5, v0, Lo0/g0/d/l;->c:Ljava/util/List;
+
+    invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v5
+
+    :goto_c
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_17
+
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/net/InetSocketAddress;
+
+    new-instance v10, Lo0/e0;
+
+    iget-object v11, v0, Lo0/g0/d/l;->e:Lo0/a;
+
+    invoke-direct {v10, v11, v4, v9}, Lo0/e0;-><init>(Lo0/a;Ljava/net/Proxy;Ljava/net/InetSocketAddress;)V
+
+    iget-object v9, v0, Lo0/g0/d/l;->f:Lo0/g0/d/k;
+
+    monitor-enter v9
+
+    :try_start_2
+    const-string v11, "route"
+
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v11, v9, Lo0/g0/d/k;->a:Ljava/util/Set;
+
+    invoke-interface {v11, v10}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v11
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    monitor-exit v9
+
+    if-eqz v11, :cond_16
+
+    iget-object v9, v0, Lo0/g0/d/l;->d:Ljava/util/List;
+
+    invoke-interface {v9, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_c
+
+    :cond_16
+    invoke-virtual {v2, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_c
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v9
+
+    throw v0
+
+    :cond_17
+    invoke-virtual {v2}, Ljava/util/ArrayList;->isEmpty()Z
+
+    move-result v4
+
+    xor-int/2addr v4, v7
+
+    if-eqz v4, :cond_18
+
+    goto :goto_d
+
+    :cond_18
+    const/4 v5, 0x0
+
+    goto/16 :goto_6
+
+    :cond_19
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_1a
+    new-instance v2, Ljava/net/UnknownHostException;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v0, v0, Lo0/g0/d/l;->e:Lo0/a;
+
+    iget-object v0, v0, Lo0/a;->d:Lo0/s;
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v0, " returned no addresses for "
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v2, v0}, Ljava/net/UnknownHostException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_1b
+    throw v5
+
+    :cond_1c
+    new-instance v0, Ljava/net/SocketException;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v3, 0x3a
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v11}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v3, "; port is out of range"
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v0, v2}, Ljava/net/SocketException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1d
+    new-instance v2, Ljava/net/SocketException;
+
+    invoke-static {v9}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    iget-object v4, v0, Lo0/g0/d/l;->e:Lo0/a;
+
+    iget-object v4, v4, Lo0/a;->a:Lo0/w;
+
+    iget-object v4, v4, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, "; exhausted proxy configurations: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v0, v0, Lo0/g0/d/l;->a:Ljava/util/List;
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v2, v0}, Ljava/net/SocketException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_1e
+    :goto_d
+    invoke-virtual {v2}, Ljava/util/ArrayList;->isEmpty()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1f
+
+    iget-object v4, v0, Lo0/g0/d/l;->d:Ljava/util/List;
+
+    invoke-static {v2, v4}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+
+    iget-object v0, v0, Lo0/g0/d/l;->d:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->clear()V
+
+    :cond_1f
+    new-instance v0, Lo0/g0/d/l$a;
+
+    invoke-direct {v0, v2}, Lo0/g0/d/l$a;-><init>(Ljava/util/List;)V
+
+    iput-object v0, v1, Lo0/g0/d/d;->a:Lo0/g0/d/l$a;
+
+    const/4 v0, 0x1
+
+    goto :goto_e
+
+    :cond_20
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+
+    :cond_21
+    const/4 v0, 0x0
+
+    :goto_e
+    iget-object v2, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    monitor-enter v2
+
+    :try_start_3
+    iget-object v4, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    invoke-virtual {v4}, Lo0/g0/d/m;->f()Z
+
+    move-result v4
+
+    if-nez v4, :cond_32
+
+    if-eqz v0, :cond_23
+
+    iget-object v0, v1, Lo0/g0/d/d;->a:Lo0/g0/d/l$a;
+
+    if-eqz v0, :cond_22
+
+    iget-object v0, v0, Lo0/g0/d/l$a;->b:Ljava/util/List;
+
+    iget-object v4, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    iget-object v5, v1, Lo0/g0/d/d;->h:Lo0/a;
+
+    iget-object v9, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    const/4 v10, 0x0
+
+    invoke-virtual {v4, v5, v9, v0, v10}, Lo0/g0/d/j;->d(Lo0/a;Lo0/g0/d/m;Ljava/util/List;Z)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_24
+
+    iget-object v3, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v8, v3, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    const/4 v3, 0x1
+
+    goto :goto_f
+
+    :cond_22
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_23
+    const/4 v0, 0x0
+
+    :cond_24
+    :goto_f
+    if-nez v3, :cond_29
+
+    if-nez v6, :cond_27
+
+    :try_start_4
+    iget-object v4, v1, Lo0/g0/d/d;->a:Lo0/g0/d/l$a;
+
+    if-eqz v4, :cond_26
+
+    invoke-virtual {v4}, Lo0/g0/d/l$a;->a()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_25
+
+    iget-object v5, v4, Lo0/g0/d/l$a;->b:Ljava/util/List;
+
+    iget v6, v4, Lo0/g0/d/l$a;->a:I
+
+    add-int/lit8 v8, v6, 0x1
+
+    iput v8, v4, Lo0/g0/d/l$a;->a:I
+
+    invoke-interface {v5, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lo0/e0;
+
+    move-object v6, v4
+
+    goto :goto_10
+
+    :cond_25
+    new-instance v0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v0
+
+    :cond_26
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_27
+    :goto_10
+    :try_start_5
+    new-instance v8, Lo0/g0/d/i;
+
+    iget-object v4, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    if-eqz v6, :cond_28
+
+    invoke-direct {v8, v4, v6}, Lo0/g0/d/i;-><init>(Lo0/g0/d/j;Lo0/e0;)V
+
+    iput-object v8, v1, Lo0/g0/d/d;->c:Lo0/g0/d/i;
+
+    goto :goto_11
+
+    :cond_28
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_29
+    :goto_11
+    move-object v4, v8
+
+    monitor-exit v2
+
+    if-eqz v3, :cond_2c
+
+    iget-object v0, v1, Lo0/g0/d/d;->j:Lo0/t;
+
+    iget-object v2, v1, Lo0/g0/d/d;->i:Lo0/f;
+
+    if-eqz v4, :cond_2b
+
+    if-eqz v0, :cond_2a
+
+    const-string v0, "call"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connection"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v4
+
+    :cond_2a
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2b
+    const/4 v0, 0x0
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_2c
+    if-eqz v4, :cond_31
+
+    iget-object v14, v1, Lo0/g0/d/d;->i:Lo0/f;
+
+    iget-object v15, v1, Lo0/g0/d/d;->j:Lo0/t;
+
+    move-object v8, v4
+
+    move/from16 v9, p1
+
+    move/from16 v10, p2
+
+    move/from16 v11, p3
+
+    move/from16 v12, p4
+
+    move/from16 v13, p5
+
+    invoke-virtual/range {v8 .. v15}, Lo0/g0/d/i;->d(IIIIZLo0/f;Lo0/t;)V
+
+    iget-object v2, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    iget-object v2, v2, Lo0/g0/d/j;->d:Lo0/g0/d/k;
+
+    iget-object v3, v4, Lo0/g0/d/i;->q:Lo0/e0;
+
+    invoke-virtual {v2, v3}, Lo0/g0/d/k;->a(Lo0/e0;)V
+
+    iget-object v2, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    monitor-enter v2
+
+    const/4 v3, 0x0
+
+    :try_start_6
+    iput-object v3, v1, Lo0/g0/d/d;->c:Lo0/g0/d/i;
+
+    iget-object v3, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    iget-object v5, v1, Lo0/g0/d/d;->h:Lo0/a;
+
+    iget-object v8, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    invoke-virtual {v3, v5, v8, v0, v7}, Lo0/g0/d/j;->d(Lo0/a;Lo0/g0/d/m;Ljava/util/List;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2d
+
+    iput-boolean v7, v4, Lo0/g0/d/i;->i:Z
+
+    invoke-virtual {v4}, Lo0/g0/d/i;->k()Ljava/net/Socket;
+
+    move-result-object v0
+
+    iget-object v3, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v4, v3, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    iput-object v6, v1, Lo0/g0/d/d;->e:Lo0/e0;
+
+    goto :goto_12
+
+    :cond_2d
+    iget-object v0, v1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    invoke-virtual {v0, v4}, Lo0/g0/d/j;->c(Lo0/g0/d/i;)V
+
+    iget-object v0, v1, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    invoke-virtual {v0, v4}, Lo0/g0/d/m;->a(Lo0/g0/d/i;)V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
+
+    const/4 v0, 0x0
+
+    :goto_12
+    monitor-exit v2
+
+    if-eqz v0, :cond_2e
+
+    invoke-static {v0}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_2e
+    iget-object v0, v1, Lo0/g0/d/d;->j:Lo0/t;
+
+    iget-object v2, v1, Lo0/g0/d/d;->i:Lo0/f;
+
+    if-eqz v4, :cond_30
+
+    if-eqz v0, :cond_2f
+
+    const-string v0, "call"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connection"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v4
+
+    :cond_2f
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_30
+    const/4 v0, 0x0
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit v2
+
+    throw v0
+
+    :cond_31
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_32
+    :try_start_7
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v3, "Canceled"
+
+    invoke-direct {v0, v3}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
+
+    :catchall_2
+    move-exception v0
+
+    monitor-exit v2
+
+    throw v0
+
+    :cond_33
+    :try_start_8
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v3, "Canceled"
+
+    invoke-direct {v0, v3}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_3
+
+    :catchall_3
+    move-exception v0
+
+    monitor-exit v2
+
+    throw v0
+.end method
+
+.method public final b(IIIIZZ)Lo0/g0/d/i;
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :goto_0
+    invoke-virtual/range {p0 .. p5}, Lo0/g0/d/d;->a(IIIIZ)Lo0/g0/d/i;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget v2, v0, Lo0/g0/d/i;->k:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    if-nez v2, :cond_0
+
+    monitor-exit v1
+
+    return-object v0
+
+    :cond_0
+    monitor-exit v1
+
+    iget-object v1, v0, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_7
+
+    iget-object v3, v0, Lo0/g0/d/i;->g:Lp0/g;
+
+    if-eqz v3, :cond_6
+
+    invoke-virtual {v1}, Ljava/net/Socket;->isClosed()Z
+
+    move-result v2
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    if-nez v2, :cond_4
+
+    invoke-virtual {v1}, Ljava/net/Socket;->isInputShutdown()Z
+
+    move-result v2
+
+    if-nez v2, :cond_4
+
+    invoke-virtual {v1}, Ljava/net/Socket;->isOutputShutdown()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v2, v0, Lo0/g0/d/i;->f:Lo0/g0/g/e;
+
+    if-eqz v2, :cond_2
+
+    monitor-enter v2
+
+    :try_start_1
+    iget-boolean v1, v2, Lo0/g0/g/e;->j:Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit v2
+
+    xor-int/lit8 v4, v1, 0x1
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v2
+
+    throw p1
+
+    :cond_2
+    if-eqz p6, :cond_3
+
+    :try_start_2
+    invoke-virtual {v1}, Ljava/net/Socket;->getSoTimeout()I
+
+    move-result v2
+    :try_end_2
+    .catch Ljava/net/SocketTimeoutException; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+
+    :try_start_3
+    invoke-virtual {v1, v5}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    invoke-interface {v3}, Lp0/g;->J()Z
+
+    move-result v3
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    xor-int/2addr v3, v5
+
+    :try_start_4
+    invoke-virtual {v1, v2}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    move v4, v3
+
+    goto :goto_1
+
+    :catchall_1
+    move-exception v3
+
+    invoke-virtual {v1, v2}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    throw v3
+    :try_end_4
+    .catch Ljava/net/SocketTimeoutException; {:try_start_4 .. :try_end_4} :catch_1
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
+
+    :catch_0
+    nop
+
+    goto :goto_1
+
+    :catch_1
+    :cond_3
+    const/4 v4, 0x1
+
+    :cond_4
+    :goto_1
+    if-nez v4, :cond_5
+
+    invoke-virtual {v0}, Lo0/g0/d/i;->j()V
+
+    goto :goto_0
+
+    :cond_5
+    return-object v0
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :catchall_2
+    move-exception p1
+
+    monitor-exit v1
+
+    throw p1
+.end method
+
+.method public final c()Z
+    .locals 4
+
+    iget-object v0, p0, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/d/d;->e:Lo0/e0;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v2, 0x1
+
+    if-eqz v1, :cond_0
+
+    monitor-exit v0
+
+    return v2
+
+    :cond_0
+    :try_start_1
+    invoke-virtual {p0}, Lo0/g0/d/d;->d()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v1, v1, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, v1, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iput-object v1, p0, Lo0/g0/d/d;->e:Lo0/e0;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit v0
+
+    return v2
+
+    :cond_1
+    :try_start_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2
+    :try_start_3
+    iget-object v1, p0, Lo0/g0/d/d;->a:Lo0/g0/d/l$a;
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_3
+
+    invoke-virtual {v1}, Lo0/g0/d/l$a;->a()Z
+
+    move-result v1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v1, 0x0
+
+    :goto_0
+    if-nez v1, :cond_5
+
+    iget-object v1, p0, Lo0/g0/d/d;->b:Lo0/g0/d/l;
+
+    invoke-virtual {v1}, Lo0/g0/d/l;->a()Z
+
+    move-result v1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    if-eqz v1, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :cond_5
+    :goto_1
+    monitor-exit v0
+
+    return v2
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public final d()Z
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/d/d;->f:Lo0/g0/d/m;
+
+    iget-object v0, v0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-eqz v0, :cond_2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    iget v2, v0, Lo0/g0/d/i;->j:I
+
+    if-nez v2, :cond_2
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v0, v0, Lo0/e0;->a:Lo0/a;
+
+    iget-object v0, v0, Lo0/a;->a:Lo0/w;
+
+    iget-object v1, p0, Lo0/g0/d/d;->h:Lo0/a;
+
+    iget-object v1, v1, Lo0/a;->a:Lo0/w;
+
+    invoke-static {v0, v1}, Lo0/g0/b;->c(Lo0/w;Lo0/w;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public final e()V
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    sget-boolean v2, Lk0/i;->a:Z
+
+    if-eqz v2, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "Assertion failed"
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    :try_start_0
+    iput-boolean v1, p0, Lo0/g0/d/d;->d:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/e.smali b/com.discord/smali_classes2/o0/g0/d/e.smali
new file mode 100644
index 0000000000..b0b258cf10
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/e.smali
@@ -0,0 +1,68 @@
+.class public final synthetic Lo0/g0/d/e;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic a:[I
+
+.field public static final synthetic b:[I
+
+
+# direct methods
+.method public static synthetic constructor <clinit>()V
+    .locals 4
+
+    invoke-static {}, Ljava/net/Proxy$Type;->values()[Ljava/net/Proxy$Type;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lo0/g0/d/e;->a:[I
+
+    sget-object v1, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
+
+    invoke-virtual {v1}, Ljava/net/Proxy$Type;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lo0/g0/d/e;->a:[I
+
+    sget-object v1, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
+
+    invoke-virtual {v1}, Ljava/net/Proxy$Type;->ordinal()I
+
+    move-result v1
+
+    const/4 v3, 0x2
+
+    aput v3, v0, v1
+
+    invoke-static {}, Lo0/g0/g/a;->values()[Lo0/g0/g/a;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lo0/g0/d/e;->b:[I
+
+    const/4 v1, 0x4
+
+    aput v2, v0, v1
+
+    sget-object v0, Lo0/g0/d/e;->b:[I
+
+    const/4 v1, 0x5
+
+    aput v3, v0, v1
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/f.smali b/com.discord/smali_classes2/o0/g0/d/f.smali
new file mode 100644
index 0000000000..dee3bd0e82
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/f.smali
@@ -0,0 +1,82 @@
+.class public final Lo0/g0/d/f;
+.super Lk0/o/c/j;
+.source "RealConnection.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/security/cert/Certificate;",
+        ">;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $address:Lo0/a;
+
+.field public final synthetic $certificatePinner:Lo0/h;
+
+.field public final synthetic $unverifiedHandshake:Lo0/v;
+
+
+# direct methods
+.method public constructor <init>(Lo0/h;Lo0/v;Lo0/a;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/d/f;->$certificatePinner:Lo0/h;
+
+    iput-object p2, p0, Lo0/g0/d/f;->$unverifiedHandshake:Lo0/v;
+
+    iput-object p3, p0, Lo0/g0/d/f;->$address:Lo0/a;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke()Ljava/lang/Object;
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/d/f;->$certificatePinner:Lo0/h;
+
+    iget-object v0, v0, Lo0/h;->b:Lo0/g0/j/c;
+
+    if-eqz v0, :cond_0
+
+    iget-object v1, p0, Lo0/g0/d/f;->$unverifiedHandshake:Lo0/v;
+
+    invoke-virtual {v1}, Lo0/v;->b()Ljava/util/List;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/g0/d/f;->$address:Lo0/a;
+
+    iget-object v2, v2, Lo0/a;->a:Lo0/w;
+
+    iget-object v2, v2, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1, v2}, Lo0/g0/j/c;->a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/g.smali b/com.discord/smali_classes2/o0/g0/d/g.smali
new file mode 100644
index 0000000000..d5679ab23e
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/g.smali
@@ -0,0 +1,107 @@
+.class public final Lo0/g0/d/g;
+.super Lk0/o/c/j;
+.source "RealConnection.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/security/cert/X509Certificate;",
+        ">;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lo0/g0/d/i;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/i;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/d/g;->this$0:Lo0/g0/d/i;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke()Ljava/lang/Object;
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/d/g;->this$0:Lo0/g0/d/i;
+
+    iget-object v0, v0, Lo0/g0/d/i;->d:Lo0/v;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lo0/v;->b()Ljava/util/List;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    const/16 v2, 0xa
+
+    invoke-static {v0, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v2
+
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/security/cert/Certificate;
+
+    if-eqz v2, :cond_0
+
+    check-cast v2, Ljava/security/cert/X509Certificate;
+
+    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.security.cert.X509Certificate"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1
+    return-object v1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/h.smali b/com.discord/smali_classes2/o0/g0/d/h.smali
new file mode 100644
index 0000000000..6a0af80ffd
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/h.smali
@@ -0,0 +1,39 @@
+.class public final Lo0/g0/d/h;
+.super Lo0/g0/k/a$f;
+.source "RealConnection.kt"
+
+
+# instance fields
+.field public final synthetic g:Lo0/g0/d/c;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/c;Lp0/g;Lokio/BufferedSink;ZLp0/g;Lokio/BufferedSink;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/d/h;->g:Lo0/g0/d/c;
+
+    invoke-direct {p0, p4, p5, p6}, Lo0/g0/k/a$f;-><init>(ZLp0/g;Lokio/BufferedSink;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 6
+
+    iget-object v0, p0, Lo0/g0/d/h;->g:Lo0/g0/d/c;
+
+    const-wide/16 v1, -0x1
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    invoke-virtual/range {v0 .. v5}, Lo0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/i.smali b/com.discord/smali_classes2/o0/g0/d/i.smali
new file mode 100644
index 0000000000..6899c1d531
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/i.smali
@@ -0,0 +1,2455 @@
+.class public final Lo0/g0/d/i;
+.super Lo0/g0/g/e$c;
+.source "RealConnection.kt"
+
+# interfaces
+.implements Lo0/k;
+
+
+# instance fields
+.field public b:Ljava/net/Socket;
+
+.field public c:Ljava/net/Socket;
+
+.field public d:Lo0/v;
+
+.field public e:Lo0/y;
+
+.field public f:Lo0/g0/g/e;
+
+.field public g:Lp0/g;
+
+.field public h:Lokio/BufferedSink;
+
+.field public i:Z
+
+.field public j:I
+
+.field public k:I
+
+.field public l:I
+
+.field public m:I
+
+.field public final n:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/ref/Reference<",
+            "Lo0/g0/d/m;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field public o:J
+
+.field public final p:Lo0/g0/d/j;
+
+.field public final q:Lo0/e0;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/j;Lo0/e0;)V
+    .locals 1
+
+    const-string v0, "connectionPool"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "route"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lo0/g0/g/e$c;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    iput-object p2, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    const/4 p1, 0x1
+
+    iput p1, p0, Lo0/g0/d/i;->m:I
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    const-wide p1, 0x7fffffffffffffffL
+
+    iput-wide p1, p0, Lo0/g0/d/i;->o:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lo0/y;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/d/i;->e:Lo0/y;
+
+    if-eqz v0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public b(Lo0/g0/g/e;)V
+    .locals 1
+
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    :try_start_0
+    invoke-virtual {p1}, Lo0/g0/g/e;->c()I
+
+    move-result p1
+
+    iput p1, p0, Lo0/g0/d/i;->m:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+.end method
+
+.method public c(Lo0/g0/g/l;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lo0/g0/g/a;->h:Lo0/g0/g/a;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1}, Lo0/g0/g/l;->c(Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    return-void
+.end method
+
+.method public final d(IIIIZLo0/f;Lo0/t;)V
+    .locals 14
+
+    move-object v7, p0
+
+    move-object/from16 v8, p6
+
+    move-object/from16 v9, p7
+
+    const-string v0, "call"
+
+    invoke-static {v8, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "eventListener"
+
+    invoke-static {v9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, v7, Lo0/g0/d/i;->e:Lo0/y;
+
+    const/4 v10, 0x1
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_14
+
+    iget-object v0, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v0, v0, Lo0/e0;->a:Lo0/a;
+
+    iget-object v0, v0, Lo0/a;->c:Ljava/util/List;
+
+    new-instance v11, Lo0/g0/d/b;
+
+    invoke-direct {v11, v0}, Lo0/g0/d/b;-><init>(Ljava/util/List;)V
+
+    iget-object v1, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v1, v1, Lo0/e0;->a:Lo0/a;
+
+    iget-object v2, v1, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    if-nez v2, :cond_3
+
+    sget-object v1, Lo0/m;->h:Lo0/m;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v0, v0, Lo0/e0;->a:Lo0/a;
+
+    iget-object v0, v0, Lo0/a;->a:Lo0/w;
+
+    iget-object v0, v0, Lo0/w;->e:Ljava/lang/String;
+
+    sget-object v1, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {v1, v0}, Lo0/g0/h/f;->j(Ljava/lang/String;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v1, Lokhttp3/internal/connection/RouteException;
+
+    new-instance v2, Ljava/net/UnknownServiceException;
+
+    const-string v3, "CLEARTEXT communication to "
+
+    const-string v4, " not permitted by network security policy"
+
+    invoke-static {v3, v0, v4}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v2, v0}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
+
+    invoke-direct {v1, v2}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
+
+    throw v1
+
+    :cond_2
+    new-instance v0, Lokhttp3/internal/connection/RouteException;
+
+    new-instance v1, Ljava/net/UnknownServiceException;
+
+    const-string v2, "CLEARTEXT communication not enabled for client"
+
+    invoke-direct {v1, v2}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
+
+    invoke-direct {v0, v1}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
+
+    throw v0
+
+    :cond_3
+    iget-object v0, v1, Lo0/a;->b:Ljava/util/List;
+
+    sget-object v1, Lo0/y;->h:Lo0/y;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_13
+
+    :goto_1
+    const/4 v12, 0x0
+
+    move-object v13, v12
+
+    :goto_2
+    :try_start_0
+    iget-object v0, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    invoke-virtual {v0}, Lo0/e0;->a()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    move-object v1, p0
+
+    move v2, p1
+
+    move/from16 v3, p2
+
+    move/from16 v4, p3
+
+    move-object/from16 v5, p6
+
+    move-object/from16 v6, p7
+
+    invoke-virtual/range {v1 .. v6}, Lo0/g0/d/i;->f(IIILo0/f;Lo0/t;)V
+
+    iget-object v0, v7, Lo0/g0/d/i;->b:Ljava/net/Socket;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
+
+    if-nez v0, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    move v1, p1
+
+    move/from16 v2, p2
+
+    goto :goto_3
+
+    :cond_5
+    move v1, p1
+
+    move/from16 v2, p2
+
+    :try_start_1
+    invoke-virtual {p0, p1, v2, v8, v9}, Lo0/g0/d/i;->e(IILo0/f;Lo0/t;)V
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
+
+    :goto_3
+    move/from16 v3, p4
+
+    :try_start_2
+    invoke-virtual {p0, v11, v3, v8, v9}, Lo0/g0/d/i;->g(Lo0/g0/d/b;ILo0/f;Lo0/t;)V
+
+    iget-object v0, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v0, v0, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    iget-object v4, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v4, v4, Lo0/e0;->b:Ljava/net/Proxy;
+
+    const-string v5, "call"
+
+    invoke-static {v8, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "inetSocketAddress"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "proxy"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+
+    :goto_4
+    iget-object v0, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    invoke-virtual {v0}, Lo0/e0;->a()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_7
+
+    iget-object v0, v7, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    if-eqz v0, :cond_6
+
+    goto :goto_5
+
+    :cond_6
+    new-instance v0, Lokhttp3/internal/connection/RouteException;
+
+    new-instance v1, Ljava/net/ProtocolException;
+
+    const-string v2, "Too many tunnel connections attempted: 21"
+
+    invoke-direct {v1, v2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    invoke-direct {v0, v1}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
+
+    throw v0
+
+    :cond_7
+    :goto_5
+    iget-object v0, v7, Lo0/g0/d/i;->f:Lo0/g0/g/e;
+
+    if-eqz v0, :cond_8
+
+    iget-object v1, v7, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    monitor-enter v1
+
+    :try_start_3
+    invoke-virtual {v0}, Lo0/g0/g/e;->c()I
+
+    move-result v0
+
+    iput v0, v7, Lo0/g0/d/i;->m:I
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    monitor-exit v1
+
+    goto :goto_6
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v1
+
+    throw v0
+
+    :cond_8
+    :goto_6
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    goto :goto_8
+
+    :catch_1
+    move-exception v0
+
+    :goto_7
+    move/from16 v3, p4
+
+    goto :goto_8
+
+    :catch_2
+    move-exception v0
+
+    move v1, p1
+
+    move/from16 v2, p2
+
+    goto :goto_7
+
+    :goto_8
+    iget-object v4, v7, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    if-eqz v4, :cond_9
+
+    invoke-static {v4}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_9
+    iget-object v4, v7, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    if-eqz v4, :cond_a
+
+    invoke-static {v4}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_a
+    iput-object v12, v7, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    iput-object v12, v7, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    iput-object v12, v7, Lo0/g0/d/i;->g:Lp0/g;
+
+    iput-object v12, v7, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+
+    iput-object v12, v7, Lo0/g0/d/i;->d:Lo0/v;
+
+    iput-object v12, v7, Lo0/g0/d/i;->e:Lo0/y;
+
+    iput-object v12, v7, Lo0/g0/d/i;->f:Lo0/g0/g/e;
+
+    iget-object v4, v7, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v5, v4, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    iget-object v4, v4, Lo0/e0;->b:Ljava/net/Proxy;
+
+    const-string v6, "call"
+
+    invoke-static {v8, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "inetSocketAddress"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "proxy"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "ioe"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez v13, :cond_b
+
+    new-instance v13, Lokhttp3/internal/connection/RouteException;
+
+    invoke-direct {v13, v0}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
+
+    goto :goto_9
+
+    :cond_b
+    const-string v4, "e"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v4, v13, Lokhttp3/internal/connection/RouteException;->firstConnectException:Ljava/io/IOException;
+
+    invoke-virtual {v4, v0}, Ljava/io/IOException;->addSuppressed(Ljava/lang/Throwable;)V
+
+    iput-object v0, v13, Lokhttp3/internal/connection/RouteException;->lastConnectException:Ljava/io/IOException;
+
+    :goto_9
+    if-eqz p5, :cond_12
+
+    const-string v4, "e"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-boolean v10, v11, Lo0/g0/d/b;->c:Z
+
+    iget-boolean v4, v11, Lo0/g0/d/b;->b:Z
+
+    if-nez v4, :cond_c
+
+    goto :goto_a
+
+    :cond_c
+    instance-of v4, v0, Ljava/net/ProtocolException;
+
+    if-eqz v4, :cond_d
+
+    goto :goto_a
+
+    :cond_d
+    instance-of v4, v0, Ljava/io/InterruptedIOException;
+
+    if-eqz v4, :cond_e
+
+    goto :goto_a
+
+    :cond_e
+    instance-of v4, v0, Ljavax/net/ssl/SSLHandshakeException;
+
+    if-eqz v4, :cond_f
+
+    invoke-virtual {v0}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
+
+    move-result-object v4
+
+    instance-of v4, v4, Ljava/security/cert/CertificateException;
+
+    if-eqz v4, :cond_f
+
+    goto :goto_a
+
+    :cond_f
+    instance-of v4, v0, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    if-eqz v4, :cond_10
+
+    goto :goto_a
+
+    :cond_10
+    instance-of v0, v0, Ljavax/net/ssl/SSLException;
+
+    if-eqz v0, :cond_11
+
+    const/4 v0, 0x1
+
+    goto :goto_b
+
+    :cond_11
+    :goto_a
+    const/4 v0, 0x0
+
+    :goto_b
+    if-eqz v0, :cond_12
+
+    goto/16 :goto_2
+
+    :cond_12
+    throw v13
+
+    :cond_13
+    new-instance v0, Lokhttp3/internal/connection/RouteException;
+
+    new-instance v1, Ljava/net/UnknownServiceException;
+
+    const-string v2, "H2_PRIOR_KNOWLEDGE cannot be used with HTTPS"
+
+    invoke-direct {v1, v2}, Ljava/net/UnknownServiceException;-><init>(Ljava/lang/String;)V
+
+    invoke-direct {v0, v1}, Lokhttp3/internal/connection/RouteException;-><init>(Ljava/io/IOException;)V
+
+    throw v0
+
+    :cond_14
+    const-string v0, "already connected"
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public final e(IILo0/f;Lo0/t;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "$receiver"
+
+    iget-object v1, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v2, v1, Lo0/e0;->b:Ljava/net/Proxy;
+
+    iget-object v1, v1, Lo0/e0;->a:Lo0/a;
+
+    invoke-virtual {v2}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    if-nez v3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v5, Lo0/g0/d/e;->a:[I
+
+    invoke-virtual {v3}, Ljava/net/Proxy$Type;->ordinal()I
+
+    move-result v3
+
+    aget v3, v5, v3
+
+    const/4 v5, 0x1
+
+    if-eq v3, v5, :cond_1
+
+    const/4 v5, 0x2
+
+    if-eq v3, v5, :cond_1
+
+    :goto_0
+    new-instance v1, Ljava/net/Socket;
+
+    invoke-direct {v1, v2}, Ljava/net/Socket;-><init>(Ljava/net/Proxy;)V
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v1, v1, Lo0/a;->e:Ljavax/net/SocketFactory;
+
+    invoke-virtual {v1}, Ljavax/net/SocketFactory;->createSocket()Ljava/net/Socket;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_4
+
+    :goto_1
+    iput-object v1, p0, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    iget-object v3, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v3, v3, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    if-eqz p4, :cond_3
+
+    const-string p4, "call"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p3, "inetSocketAddress"
+
+    invoke-static {v3, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p3, "proxy"
+
+    invoke-static {v2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, p2}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    :try_start_0
+    sget-object p2, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object p2, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    iget-object p3, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object p3, p3, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    invoke-virtual {p2, v1, p3, p1}, Lo0/g0/h/f;->g(Ljava/net/Socket;Ljava/net/InetSocketAddress;I)V
+    :try_end_0
+    .catch Ljava/net/ConnectException; {:try_start_0 .. :try_end_0} :catch_1
+
+    :try_start_1
+    invoke-static {v1}, Lf/n/a/k/a;->U(Ljava/net/Socket;)Lp0/w;
+
+    move-result-object p1
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lp0/q;
+
+    invoke-direct {p2, p1}, Lp0/q;-><init>(Lp0/w;)V
+
+    iput-object p2, p0, Lo0/g0/d/i;->g:Lp0/g;
+
+    invoke-static {v1}, Lf/n/a/k/a;->T(Ljava/net/Socket;)Lp0/u;
+
+    move-result-object p1
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lp0/p;
+
+    invoke-direct {p2, p1}, Lp0/p;-><init>(Lp0/u;)V
+
+    iput-object p2, p0, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+    :try_end_1
+    .catch Ljava/lang/NullPointerException; {:try_start_1 .. :try_end_1} :catch_0
+
+    goto :goto_2
+
+    :catch_0
+    move-exception p1
+
+    invoke-virtual {p1}, Ljava/lang/NullPointerException;->getMessage()Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string p3, "throw with null exception"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-nez p2, :cond_2
+
+    :goto_2
+    return-void
+
+    :cond_2
+    new-instance p2, Ljava/io/IOException;
+
+    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/Throwable;)V
+
+    throw p2
+
+    :catch_1
+    move-exception p1
+
+    new-instance p2, Ljava/net/ConnectException;
+
+    const-string p3, "Failed to connect to "
+
+    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p3
+
+    iget-object p4, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object p4, p4, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    invoke-virtual {p3, p4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-direct {p2, p3}, Ljava/net/ConnectException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p2, p1}, Ljava/net/ConnectException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p2
+
+    :cond_3
+    throw v4
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+.end method
+
+.method public final f(IIILo0/f;Lo0/t;)V
+    .locals 18
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p0
+
+    move/from16 v1, p2
+
+    move-object/from16 v2, p4
+
+    new-instance v3, Lo0/a0$a;
+
+    invoke-direct {v3}, Lo0/a0$a;-><init>()V
+
+    iget-object v4, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v4, v4, Lo0/e0;->a:Lo0/a;
+
+    iget-object v4, v4, Lo0/a;->a:Lo0/w;
+
+    invoke-virtual {v3, v4}, Lo0/a0$a;->g(Lo0/w;)Lo0/a0$a;
+
+    const-string v4, "CONNECT"
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v3, v4, v5}, Lo0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
+
+    iget-object v4, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v4, v4, Lo0/e0;->a:Lo0/a;
+
+    iget-object v4, v4, Lo0/a;->a:Lo0/w;
+
+    const/4 v6, 0x1
+
+    invoke-static {v4, v6}, Lo0/g0/b;->D(Lo0/w;Z)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v7, "Host"
+
+    invoke-virtual {v3, v7, v4}, Lo0/a0$a;->c(Ljava/lang/String;Ljava/lang/String;)Lo0/a0$a;
+
+    const-string v4, "Proxy-Connection"
+
+    const-string v7, "name"
+
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "Keep-Alive"
+
+    const-string v9, "value"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v10, v3, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v10, v4, v8}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    const-string v4, "User-Agent"
+
+    invoke-static {v4, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "okhttp/4.2.1"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v10, v3, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v10, v4, v8}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    invoke-virtual {v3}, Lo0/a0$a;->b()Lo0/a0;
+
+    move-result-object v3
+
+    new-instance v4, Lokhttp3/Response$a;
+
+    invoke-direct {v4}, Lokhttp3/Response$a;-><init>()V
+
+    invoke-virtual {v4, v3}, Lokhttp3/Response$a;->g(Lo0/a0;)Lokhttp3/Response$a;
+
+    sget-object v8, Lo0/y;->e:Lo0/y;
+
+    invoke-virtual {v4, v8}, Lokhttp3/Response$a;->f(Lo0/y;)Lokhttp3/Response$a;
+
+    const/16 v8, 0x197
+
+    iput v8, v4, Lokhttp3/Response$a;->c:I
+
+    const-string v8, "Preemptive Authenticate"
+
+    invoke-virtual {v4, v8}, Lokhttp3/Response$a;->e(Ljava/lang/String;)Lokhttp3/Response$a;
+
+    sget-object v8, Lo0/g0/b;->c:Lokhttp3/ResponseBody;
+
+    iput-object v8, v4, Lokhttp3/Response$a;->g:Lokhttp3/ResponseBody;
+
+    const-wide/16 v10, -0x1
+
+    iput-wide v10, v4, Lokhttp3/Response$a;->k:J
+
+    iput-wide v10, v4, Lokhttp3/Response$a;->l:J
+
+    const-string v8, "Proxy-Authenticate"
+
+    invoke-static {v8, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "OkHttp-Preemptive"
+
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v9, v4, Lokhttp3/Response$a;->f:Lokhttp3/Headers$a;
+
+    invoke-virtual {v9, v8, v7}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    invoke-virtual {v4}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v4
+
+    iget-object v7, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v8, v7, Lo0/e0;->a:Lo0/a;
+
+    iget-object v8, v8, Lo0/a;->i:Lo0/c;
+
+    invoke-interface {v8, v7, v4}, Lo0/c;->a(Lo0/e0;Lokhttp3/Response;)Lo0/a0;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_0
+
+    move-object v3, v4
+
+    :cond_0
+    iget-object v4, v3, Lo0/a0;->b:Lo0/w;
+
+    const/4 v7, 0x0
+
+    :goto_0
+    const/16 v8, 0x15
+
+    if-ge v7, v8, :cond_b
+
+    move/from16 v8, p1
+
+    move-object/from16 v9, p5
+
+    invoke-virtual {v0, v8, v1, v2, v9}, Lo0/g0/d/i;->e(IILo0/f;Lo0/t;)V
+
+    new-instance v10, Ljava/lang/StringBuilder;
+
+    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v11, "CONNECT "
+
+    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-static {v4, v6}, Lo0/g0/b;->D(Lo0/w;Z)Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-virtual {v10, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v6, " HTTP/1.1"
+
+    invoke-virtual {v10, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    :goto_1
+    iget-object v10, v0, Lo0/g0/d/i;->g:Lp0/g;
+
+    if-eqz v10, :cond_a
+
+    iget-object v11, v0, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+
+    if-eqz v11, :cond_9
+
+    new-instance v12, Lo0/g0/f/a;
+
+    invoke-direct {v12, v5, v5, v10, v11}, Lo0/g0/f/a;-><init>(Lo0/x;Lo0/g0/d/i;Lp0/g;Lokio/BufferedSink;)V
+
+    invoke-interface {v10}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v5
+
+    int-to-long v13, v1
+
+    sget-object v15, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v5, v13, v14, v15}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    invoke-interface {v11}, Lp0/u;->timeout()Lp0/x;
+
+    move-result-object v5
+
+    move/from16 v13, p3
+
+    int-to-long v14, v13
+
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v5, v14, v15, v1}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    iget-object v1, v3, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {v12, v1, v6}, Lo0/g0/f/a;->m(Lokhttp3/Headers;Ljava/lang/String;)V
+
+    iget-object v1, v12, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v1}, Lokio/BufferedSink;->flush()V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v12, v1}, Lo0/g0/f/a;->e(Z)Lokhttp3/Response$a;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_8
+
+    invoke-virtual {v1, v3}, Lokhttp3/Response$a;->g(Lo0/a0;)Lokhttp3/Response$a;
+
+    invoke-virtual {v1}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v1
+
+    const-string v3, "response"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lo0/g0/b;->n(Lokhttp3/Response;)J
+
+    move-result-wide v14
+
+    const-wide/16 v16, -0x1
+
+    cmp-long v3, v14, v16
+
+    if-nez v3, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    invoke-virtual {v12, v14, v15}, Lo0/g0/f/a;->j(J)Lp0/w;
+
+    move-result-object v3
+
+    const v5, 0x7fffffff
+
+    sget-object v12, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {v3, v5, v12}, Lo0/g0/b;->z(Lp0/w;ILjava/util/concurrent/TimeUnit;)Z
+
+    check-cast v3, Lo0/g0/f/a$d;
+
+    invoke-virtual {v3}, Lo0/g0/f/a$d;->close()V
+
+    :goto_2
+    iget v3, v1, Lokhttp3/Response;->g:I
+
+    const/16 v5, 0xc8
+
+    if-eq v3, v5, :cond_5
+
+    const/16 v5, 0x197
+
+    if-ne v3, v5, :cond_4
+
+    iget-object v3, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v5, v3, Lo0/e0;->a:Lo0/a;
+
+    iget-object v5, v5, Lo0/a;->i:Lo0/c;
+
+    invoke-interface {v5, v3, v1}, Lo0/c;->a(Lo0/e0;Lokhttp3/Response;)Lo0/a0;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_3
+
+    const/4 v5, 0x2
+
+    const-string v10, "Connection"
+
+    const/4 v11, 0x0
+
+    invoke-static {v1, v10, v11, v5}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v5, "close"
+
+    const/4 v10, 0x1
+
+    invoke-static {v5, v1, v10}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    goto :goto_3
+
+    :cond_2
+    const/4 v5, 0x0
+
+    move/from16 v1, p2
+
+    goto/16 :goto_1
+
+    :cond_3
+    new-instance v1, Ljava/io/IOException;
+
+    const-string v2, "Failed to authenticate with proxy"
+
+    invoke-direct {v1, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_4
+    new-instance v2, Ljava/io/IOException;
+
+    const-string v3, "Unexpected response code for CONNECT: "
+
+    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    iget v1, v1, Lokhttp3/Response;->g:I
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_5
+    invoke-interface {v10}, Lp0/g;->h()Lp0/e;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lp0/e;->J()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    invoke-interface {v11}, Lokio/BufferedSink;->h()Lp0/e;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lp0/e;->J()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    const/4 v1, 0x0
+
+    move-object v3, v1
+
+    :goto_3
+    if-eqz v3, :cond_b
+
+    iget-object v1, v0, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    if-eqz v1, :cond_6
+
+    invoke-static {v1}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_6
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    iput-object v1, v0, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+
+    iput-object v1, v0, Lo0/g0/d/i;->g:Lp0/g;
+
+    iget-object v1, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v5, v1, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    iget-object v1, v1, Lo0/e0;->b:Ljava/net/Proxy;
+
+    const-string v6, "call"
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "inetSocketAddress"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "proxy"
+
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    add-int/lit8 v7, v7, 0x1
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x1
+
+    move/from16 v1, p2
+
+    goto/16 :goto_0
+
+    :cond_7
+    new-instance v1, Ljava/io/IOException;
+
+    const-string v2, "TLS tunnel buffered too many bytes!"
+
+    invoke-direct {v1, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v1, 0x0
+
+    throw v1
+
+    :cond_9
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_a
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_b
+    return-void
+.end method
+
+.method public final g(Lo0/g0/d/b;ILo0/f;Lo0/t;)V
+    .locals 16
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v1, p0
+
+    move/from16 v0, p2
+
+    move-object/from16 v2, p3
+
+    sget-object v3, Lo0/y;->h:Lo0/y;
+
+    sget-object v4, Lo0/y;->e:Lo0/y;
+
+    iget-object v5, v1, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v5, v5, Lo0/e0;->a:Lo0/a;
+
+    iget-object v6, v5, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    if-nez v6, :cond_1
+
+    iget-object v2, v5, Lo0/a;->b:Ljava/util/List;
+
+    invoke-interface {v2, v3}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v1, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    iput-object v2, v1, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    iput-object v3, v1, Lo0/g0/d/i;->e:Lo0/y;
+
+    invoke-virtual {v1, v0}, Lo0/g0/d/i;->l(I)V
+
+    return-void
+
+    :cond_0
+    iget-object v0, v1, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    iput-object v0, v1, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    iput-object v4, v1, Lo0/g0/d/i;->e:Lo0/y;
+
+    return-void
+
+    :cond_1
+    const-string v3, "call"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "$receiver"
+
+    iget-object v6, v1, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v6, v6, Lo0/e0;->a:Lo0/a;
+
+    iget-object v7, v6, Lo0/a;->f:Ljavax/net/ssl/SSLSocketFactory;
+
+    const/4 v8, 0x0
+
+    if-eqz v7, :cond_c
+
+    :try_start_0
+    iget-object v9, v1, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    iget-object v10, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v10, v10, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v11, v6, Lo0/a;->a:Lo0/w;
+
+    iget v11, v11, Lo0/w;->f:I
+
+    const/4 v12, 0x1
+
+    invoke-virtual {v7, v9, v10, v11, v12}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_b
+
+    check-cast v7, Ljavax/net/ssl/SSLSocket;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    move-object/from16 v9, p1
+
+    :try_start_1
+    invoke-virtual {v9, v7}, Lo0/g0/d/b;->a(Ljavax/net/ssl/SSLSocket;)Lo0/m;
+
+    move-result-object v9
+
+    iget-boolean v10, v9, Lo0/m;->b:Z
+
+    if-eqz v10, :cond_2
+
+    sget-object v10, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v10, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    iget-object v11, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v11, v11, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v13, v6, Lo0/a;->b:Ljava/util/List;
+
+    invoke-virtual {v10, v7, v11, v13}, Lo0/g0/h/f;->e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+
+    :cond_2
+    invoke-virtual {v7}, Ljavax/net/ssl/SSLSocket;->startHandshake()V
+
+    invoke-virtual {v7}, Ljavax/net/ssl/SSLSocket;->getSession()Ljavax/net/ssl/SSLSession;
+
+    move-result-object v10
+
+    sget-object v11, Lo0/v;->f:Lo0/v$a;
+
+    const-string v13, "sslSocketSession"
+
+    invoke-static {v10, v13}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v11, v10}, Lo0/v$a;->a(Ljavax/net/ssl/SSLSession;)Lo0/v;
+
+    move-result-object v11
+
+    iget-object v13, v6, Lo0/a;->g:Ljavax/net/ssl/HostnameVerifier;
+
+    if-eqz v13, :cond_a
+
+    iget-object v14, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v14, v14, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-interface {v13, v14, v10}, Ljavax/net/ssl/HostnameVerifier;->verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
+
+    move-result v10
+
+    if-nez v10, :cond_5
+
+    invoke-virtual {v11}, Lo0/v;->b()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v2
+
+    xor-int/2addr v2, v12
+
+    if-eqz v2, :cond_4
+
+    const/4 v2, 0x0
+
+    invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_3
+
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v2, "null cannot be cast to non-null type java.security.cert.X509Certificate"
+
+    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    check-cast v0, Ljava/security/cert/X509Certificate;
+
+    new-instance v2, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "\n              |Hostname "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v4, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v4, v4, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, " not verified:\n              |    certificate: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v4, Lo0/h;->d:Lo0/h$a;
+
+    invoke-virtual {v4, v0}, Lo0/h$a;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, "\n              |    DN: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
+
+    move-result-object v4
+
+    const-string v5, "cert.subjectDN"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v4}, Ljava/security/Principal;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, "\n              |    subjectAltNames: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v4, Lo0/g0/j/d;->a:Lo0/g0/j/d;
+
+    const-string v5, "certificate"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x7
+
+    invoke-virtual {v4, v0, v5}, Lo0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
+
+    move-result-object v5
+
+    const/4 v6, 0x2
+
+    invoke-virtual {v4, v0, v6}, Lo0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-static {v5, v0}, Lk0/j/l;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v0, "\n              "
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0, v8, v12}, Lk0/u/g;->trimMargin$default(Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v2, v0}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_4
+    new-instance v0, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v3, "Hostname "
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v3, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v3, v3, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, " not verified (no certificates)"
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v0, v2}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_5
+    iget-object v10, v6, Lo0/a;->h:Lo0/h;
+
+    if-eqz v10, :cond_9
+
+    new-instance v12, Lo0/v;
+
+    iget-object v13, v11, Lo0/v;->b:Lo0/f0;
+
+    iget-object v14, v11, Lo0/v;->c:Lo0/j;
+
+    iget-object v15, v11, Lo0/v;->d:Ljava/util/List;
+
+    new-instance v8, Lo0/g0/d/f;
+
+    invoke-direct {v8, v10, v11, v6}, Lo0/g0/d/f;-><init>(Lo0/h;Lo0/v;Lo0/a;)V
+
+    invoke-direct {v12, v13, v14, v15, v8}, Lo0/v;-><init>(Lo0/f0;Lo0/j;Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
+
+    iput-object v12, v1, Lo0/g0/d/i;->d:Lo0/v;
+
+    iget-object v6, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v6, v6, Lo0/w;->e:Ljava/lang/String;
+
+    new-instance v8, Lo0/g0/d/g;
+
+    invoke-direct {v8, v1}, Lo0/g0/d/g;-><init>(Lo0/g0/d/i;)V
+
+    invoke-virtual {v10, v6, v8}, Lo0/h;->a(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+
+    iget-boolean v6, v9, Lo0/m;->b:Z
+
+    if-eqz v6, :cond_6
+
+    sget-object v6, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v6, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {v6, v7}, Lo0/g0/h/f;->h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+
+    move-result-object v8
+
+    goto :goto_0
+
+    :cond_6
+    const/4 v8, 0x0
+
+    :goto_0
+    iput-object v7, v1, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    invoke-static {v7}, Lf/n/a/k/a;->U(Ljava/net/Socket;)Lp0/w;
+
+    move-result-object v6
+
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v9, Lp0/q;
+
+    invoke-direct {v9, v6}, Lp0/q;-><init>(Lp0/w;)V
+
+    iput-object v9, v1, Lo0/g0/d/i;->g:Lp0/g;
+
+    invoke-static {v7}, Lf/n/a/k/a;->T(Ljava/net/Socket;)Lp0/u;
+
+    move-result-object v6
+
+    invoke-static {v6, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Lp0/p;
+
+    invoke-direct {v5, v6}, Lp0/p;-><init>(Lp0/u;)V
+
+    iput-object v5, v1, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+
+    if-eqz v8, :cond_7
+
+    sget-object v4, Lo0/y;->k:Lo0/y$a;
+
+    invoke-virtual {v4, v8}, Lo0/y$a;->a(Ljava/lang/String;)Lo0/y;
+
+    move-result-object v4
+
+    :cond_7
+    iput-object v4, v1, Lo0/g0/d/i;->e:Lo0/y;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    sget-object v4, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v4, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {v4, v7}, Lo0/g0/h/f;->a(Ljavax/net/ssl/SSLSocket;)V
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v1, Lo0/g0/d/i;->e:Lo0/y;
+
+    sget-object v3, Lo0/y;->g:Lo0/y;
+
+    if-ne v2, v3, :cond_8
+
+    invoke-virtual {v1, v0}, Lo0/g0/d/i;->l(I)V
+
+    :cond_8
+    return-void
+
+    :cond_9
+    :try_start_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    const/4 v2, 0x0
+
+    throw v2
+
+    :cond_a
+    :try_start_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    const/4 v2, 0x0
+
+    throw v2
+
+    :catchall_0
+    move-exception v0
+
+    move-object v8, v7
+
+    goto :goto_2
+
+    :cond_b
+    :try_start_4
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v2, "null cannot be cast to non-null type javax.net.ssl.SSLSocket"
+
+    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :catchall_1
+    move-exception v0
+
+    move-object v2, v8
+
+    goto :goto_1
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    const/4 v2, 0x0
+
+    throw v2
+
+    :catchall_2
+    move-exception v0
+
+    const/4 v2, 0x0
+
+    :goto_1
+    move-object v8, v2
+
+    :goto_2
+    if-eqz v8, :cond_d
+
+    sget-object v2, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v2, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {v2, v8}, Lo0/g0/h/f;->a(Ljavax/net/ssl/SSLSocket;)V
+
+    :cond_d
+    if-eqz v8, :cond_e
+
+    invoke-static {v8}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_e
+    throw v0
+.end method
+
+.method public final h()Z
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/d/i;->f:Lo0/g0/g/e;
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public final i(Lo0/x;Lokhttp3/Interceptor$Chain;)Lo0/g0/e/d;
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/net/SocketException;
+        }
+    .end annotation
+
+    const-string v0, "client"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "chain"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    iget-object v2, p0, Lo0/g0/d/i;->g:Lp0/g;
+
+    if-eqz v2, :cond_2
+
+    iget-object v3, p0, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+
+    if-eqz v3, :cond_1
+
+    iget-object v1, p0, Lo0/g0/d/i;->f:Lo0/g0/g/e;
+
+    if-eqz v1, :cond_0
+
+    new-instance v0, Lo0/g0/g/j;
+
+    invoke-direct {v0, p1, p0, p2, v1}, Lo0/g0/g/j;-><init>(Lo0/x;Lo0/g0/d/i;Lokhttp3/Interceptor$Chain;Lo0/g0/g/e;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->b()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    invoke-interface {v2}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->b()I
+
+    move-result v1
+
+    int-to-long v4, v1
+
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v4, v5, v1}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    invoke-interface {v3}, Lp0/u;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->c()I
+
+    move-result p2
+
+    int-to-long v4, p2
+
+    sget-object p2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v4, v5, p2}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    new-instance v0, Lo0/g0/f/a;
+
+    invoke-direct {v0, p1, p0, v2, v3}, Lo0/g0/f/a;-><init>(Lo0/x;Lo0/g0/d/i;Lp0/g;Lokio/BufferedSink;)V
+
+    :goto_0
+    return-object v0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public final j()V
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    sget-boolean v2, Lk0/i;->a:Z
+
+    if-eqz v2, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "Assertion failed"
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/d/i;->p:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    :try_start_0
+    iput-boolean v1, p0, Lo0/g0/d/i;->i:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public k()Ljava/net/Socket;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    if-eqz v0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public final l(I)V
+    .locals 9
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/d/i;->c:Ljava/net/Socket;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_c
+
+    iget-object v2, p0, Lo0/g0/d/i;->g:Lp0/g;
+
+    if-eqz v2, :cond_b
+
+    iget-object v3, p0, Lo0/g0/d/i;->h:Lokio/BufferedSink;
+
+    if-eqz v3, :cond_a
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/net/Socket;->setSoTimeout(I)V
+
+    new-instance v4, Lo0/g0/g/e$b;
+
+    const/4 v5, 0x1
+
+    invoke-direct {v4, v5}, Lo0/g0/g/e$b;-><init>(Z)V
+
+    iget-object v6, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v6, v6, Lo0/e0;->a:Lo0/a;
+
+    iget-object v6, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v6, v6, Lo0/w;->e:Ljava/lang/String;
+
+    const-string v7, "socket"
+
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "connectionName"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "source"
+
+    invoke-static {v2, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "sink"
+
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, v4, Lo0/g0/g/e$b;->a:Ljava/net/Socket;
+
+    iput-object v6, v4, Lo0/g0/g/e$b;->b:Ljava/lang/String;
+
+    iput-object v2, v4, Lo0/g0/g/e$b;->c:Lp0/g;
+
+    iput-object v3, v4, Lo0/g0/g/e$b;->d:Lokio/BufferedSink;
+
+    const-string v0, "listener"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p0, v4, Lo0/g0/g/e$b;->e:Lo0/g0/g/e$c;
+
+    iput p1, v4, Lo0/g0/g/e$b;->g:I
+
+    new-instance p1, Lo0/g0/g/e;
+
+    invoke-direct {p1, v4}, Lo0/g0/g/e;-><init>(Lo0/g0/g/e$b;)V
+
+    iput-object p1, p0, Lo0/g0/d/i;->f:Lo0/g0/g/e;
+
+    iget-object v0, p1, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v2, v0, Lo0/g0/g/m;->f:Z
+
+    if-nez v2, :cond_9
+
+    iget-boolean v2, v0, Lo0/g0/g/m;->i:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-nez v2, :cond_0
+
+    monitor-exit v0
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_1
+    sget-object v2, Lo0/g0/g/m;->j:Ljava/util/logging/Logger;
+
+    sget-object v3, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
+
+    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    sget-object v2, Lo0/g0/g/m;->j:Ljava/util/logging/Logger;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, ">> CONNECTION "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v4, Lo0/g0/g/d;->a:Lokio/ByteString;
+
+    invoke-virtual {v4}, Lokio/ByteString;->i()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    new-array v4, v1, [Ljava/lang/Object;
+
+    invoke-static {v3, v4}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
+
+    :cond_1
+    iget-object v2, v0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    sget-object v3, Lo0/g0/g/d;->a:Lokio/ByteString;
+
+    invoke-interface {v2, v3}, Lokio/BufferedSink;->y0(Lokio/ByteString;)Lokio/BufferedSink;
+
+    iget-object v2, v0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {v2}, Lokio/BufferedSink;->flush()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    monitor-exit v0
+
+    :goto_0
+    iget-object v0, p1, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    iget-object v2, p1, Lo0/g0/g/e;->o:Lo0/g0/g/q;
+
+    monitor-enter v0
+
+    :try_start_2
+    const-string v3, "settings"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v3, v0, Lo0/g0/g/m;->f:Z
+
+    if-nez v3, :cond_8
+
+    iget v3, v2, Lo0/g0/g/q;->a:I
+
+    invoke-static {v3}, Ljava/lang/Integer;->bitCount(I)I
+
+    move-result v3
+
+    mul-int/lit8 v3, v3, 0x6
+
+    const/4 v4, 0x4
+
+    invoke-virtual {v0, v1, v3, v4, v1}, Lo0/g0/g/m;->c(IIII)V
+
+    const/16 v3, 0xa
+
+    const/4 v6, 0x0
+
+    :goto_1
+    if-ge v6, v3, :cond_6
+
+    shl-int v7, v5, v6
+
+    iget v8, v2, Lo0/g0/g/q;->a:I
+
+    and-int/2addr v7, v8
+
+    if-eqz v7, :cond_2
+
+    const/4 v7, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v7, 0x0
+
+    :goto_2
+    if-nez v7, :cond_3
+
+    goto :goto_4
+
+    :cond_3
+    if-eq v6, v4, :cond_5
+
+    const/4 v7, 0x7
+
+    if-eq v6, v7, :cond_4
+
+    move v7, v6
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v7, 0x4
+
+    goto :goto_3
+
+    :cond_5
+    const/4 v7, 0x3
+
+    :goto_3
+    iget-object v8, v0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {v8, v7}, Lokio/BufferedSink;->writeShort(I)Lokio/BufferedSink;
+
+    iget-object v7, v0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    iget-object v8, v2, Lo0/g0/g/q;->b:[I
+
+    aget v8, v8, v6
+
+    invoke-interface {v7, v8}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    :goto_4
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_1
+
+    :cond_6
+    iget-object v2, v0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {v2}, Lokio/BufferedSink;->flush()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    monitor-exit v0
+
+    iget-object v0, p1, Lo0/g0/g/e;->o:Lo0/g0/g/q;
+
+    invoke-virtual {v0}, Lo0/g0/g/q;->a()I
+
+    move-result v0
+
+    const v2, 0xffff
+
+    if-eq v0, v2, :cond_7
+
+    iget-object v3, p1, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    sub-int/2addr v0, v2
+
+    int-to-long v4, v0
+
+    invoke-virtual {v3, v1, v4, v5}, Lo0/g0/g/m;->i(IJ)V
+
+    :cond_7
+    new-instance v0, Ljava/lang/Thread;
+
+    iget-object v1, p1, Lo0/g0/g/e;->w:Lo0/g0/g/e$d;
+
+    const-string v2, "OkHttp "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    iget-object p1, p1, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, v1, p1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->start()V
+
+    return-void
+
+    :cond_8
+    :try_start_3
+    new-instance p1, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {p1, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+
+    :cond_9
+    :try_start_4
+    new-instance p1, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {p1, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+
+    :cond_a
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public final m(Lo0/w;)Z
+    .locals 4
+
+    const-string v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v0, v0, Lo0/e0;->a:Lo0/a;
+
+    iget-object v0, v0, Lo0/a;->a:Lo0/w;
+
+    iget v1, p1, Lo0/w;->f:I
+
+    iget v2, v0, Lo0/w;->f:I
+
+    const/4 v3, 0x0
+
+    if-eq v1, v2, :cond_0
+
+    return v3
+
+    :cond_0
+    iget-object v1, p1, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v0, v0, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_1
+
+    return v1
+
+    :cond_1
+    iget-object v0, p0, Lo0/g0/d/i;->d:Lo0/v;
+
+    if-eqz v0, :cond_4
+
+    sget-object v2, Lo0/g0/j/d;->a:Lo0/g0/j/d;
+
+    iget-object p1, p1, Lo0/w;->e:Ljava/lang/String;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {v0}, Lo0/v;->b()Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    check-cast v0, Ljava/security/cert/X509Certificate;
+
+    invoke-virtual {v2, p1, v0}, Lo0/g0/j/d;->b(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type java.security.cert.X509Certificate"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_4
+    :goto_0
+    return v3
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "Connection{"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v1, v1, Lo0/e0;->a:Lo0/a;
+
+    iget-object v1, v1, Lo0/a;->a:Lo0/w;
+
+    iget-object v1, v1, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x3a
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v1, v1, Lo0/e0;->a:Lo0/a;
+
+    iget-object v1, v1, Lo0/a;->a:Lo0/w;
+
+    iget v1, v1, Lo0/w;->f:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x2c
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v1, " proxy="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v1, v1, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, " hostAddress="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v1, v1, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, " cipherSuite="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/d/i;->d:Lo0/v;
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, v1, Lo0/v;->c:Lo0/j;
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "none"
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, " protocol="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/d/i;->e:Lo0/y;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x7d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/j$a.smali b/com.discord/smali_classes2/o0/g0/d/j$a.smali
new file mode 100644
index 0000000000..164575423c
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/j$a.smali
@@ -0,0 +1,368 @@
+.class public final Lo0/g0/d/j$a;
+.super Ljava/lang/Object;
+.source "RealConnectionPool.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/d/j;-><init>(IJLjava/util/concurrent/TimeUnit;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lo0/g0/d/j;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/j;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/d/j$a;->d:Lo0/g0/d/j;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 15
+
+    :cond_0
+    :goto_0
+    iget-object v0, p0, Lo0/g0/d/j$a;->d:Lo0/g0/d/j;
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v1
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v3, v0, Lo0/g0/d/j;->c:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v3}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    const-wide/high16 v4, -0x8000000000000000L
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    move-object v9, v7
+
+    const/4 v8, 0x0
+
+    const/4 v10, 0x0
+
+    :cond_1
+    :goto_1
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_3
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v11
+
+    check-cast v11, Lo0/g0/d/i;
+
+    const-string v12, "connection"
+
+    invoke-static {v11, v12}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v11, v1, v2}, Lo0/g0/d/j;->b(Lo0/g0/d/i;J)I
+
+    move-result v12
+
+    if-lez v12, :cond_2
+
+    add-int/lit8 v10, v10, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    add-int/lit8 v8, v8, 0x1
+
+    iget-wide v12, v11, Lo0/g0/d/i;->o:J
+
+    sub-long v12, v1, v12
+
+    cmp-long v14, v12, v4
+
+    if-lez v14, :cond_1
+
+    move-object v9, v11
+
+    move-wide v4, v12
+
+    goto :goto_1
+
+    :cond_3
+    iget-wide v1, v0, Lo0/g0/d/j;->a:J
+
+    const-wide/16 v11, -0x1
+
+    const-wide/16 v13, 0x0
+
+    cmp-long v3, v4, v1
+
+    if-gez v3, :cond_7
+
+    iget v1, v0, Lo0/g0/d/j;->f:I
+
+    if-le v8, v1, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    if-lez v8, :cond_5
+
+    iget-wide v1, v0, Lo0/g0/d/j;->a:J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    sub-long/2addr v1, v4
+
+    monitor-exit v0
+
+    goto :goto_3
+
+    :cond_5
+    if-lez v10, :cond_6
+
+    :try_start_1
+    iget-wide v1, v0, Lo0/g0/d/j;->a:J
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+
+    monitor-exit v0
+
+    goto :goto_3
+
+    :cond_6
+    :try_start_2
+    iput-boolean v6, v0, Lo0/g0/d/j;->e:Z
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    monitor-exit v0
+
+    move-wide v1, v11
+
+    goto :goto_3
+
+    :cond_7
+    :goto_2
+    :try_start_3
+    iget-object v1, v0, Lo0/g0/d/j;->c:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v1, v9}, Ljava/util/ArrayDeque;->remove(Ljava/lang/Object;)Z
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    monitor-exit v0
+
+    if-eqz v9, :cond_e
+
+    invoke-virtual {v9}, Lo0/g0/d/i;->k()Ljava/net/Socket;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    move-wide v1, v13
+
+    :goto_3
+    cmp-long v0, v1, v11
+
+    if-nez v0, :cond_8
+
+    return-void
+
+    :cond_8
+    :try_start_4
+    iget-object v0, p0, Lo0/g0/d/j$a;->d:Lo0/g0/d/j;
+
+    const-string v3, "$this$lockAndWaitNanos"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/32 v3, 0xf4240
+
+    div-long v5, v1, v3
+    :try_end_4
+    .catch Ljava/lang/InterruptedException; {:try_start_4 .. :try_end_4} :catch_0
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->signum(J)I
+
+    mul-long v3, v3, v5
+
+    sub-long/2addr v1, v3
+
+    :try_start_5
+    monitor-enter v0
+    :try_end_5
+    .catch Ljava/lang/InterruptedException; {:try_start_5 .. :try_end_5} :catch_0
+
+    long-to-int v2, v1
+
+    :try_start_6
+    const-string v1, "$this$waitMillis"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    cmp-long v1, v5, v13
+
+    if-gtz v1, :cond_9
+
+    if-lez v2, :cond_a
+
+    :cond_9
+    invoke-virtual {v0, v5, v6, v2}, Ljava/lang/Object;->wait(JI)V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_0
+
+    :cond_a
+    :try_start_7
+    monitor-exit v0
+
+    goto/16 :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+    :try_end_7
+    .catch Ljava/lang/InterruptedException; {:try_start_7 .. :try_end_7} :catch_0
+
+    :catch_0
+    iget-object v0, p0, Lo0/g0/d/j$a;->d:Lo0/g0/d/j;
+
+    if-eqz v0, :cond_d
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    monitor-enter v0
+
+    :try_start_8
+    iget-object v2, v0, Lo0/g0/d/j;->c:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    const-string v3, "connections.iterator()"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_b
+    :goto_4
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_c
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lo0/g0/d/i;
+
+    iget-object v4, v3, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_b
+
+    const/4 v4, 0x1
+
+    iput-boolean v4, v3, Lo0/g0/d/i;->i:Z
+
+    const-string v4, "connection"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-interface {v2}, Ljava/util/Iterator;->remove()V
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_1
+
+    goto :goto_4
+
+    :cond_c
+    monitor-exit v0
+
+    invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_5
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lo0/g0/d/i;
+
+    invoke-virtual {v1}, Lo0/g0/d/i;->k()Ljava/net/Socket;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    goto :goto_5
+
+    :catchall_1
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+
+    :cond_d
+    throw v7
+
+    :cond_e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v7
+
+    :catchall_2
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/j.smali b/com.discord/smali_classes2/o0/g0/d/j.smali
new file mode 100644
index 0000000000..e8dbe04755
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/j.smali
@@ -0,0 +1,677 @@
+.class public final Lo0/g0/d/j;
+.super Ljava/lang/Object;
+.source "RealConnectionPool.kt"
+
+
+# static fields
+.field public static final g:Ljava/util/concurrent/ThreadPoolExecutor;
+
+
+# instance fields
+.field public final a:J
+
+.field public final b:Lo0/g0/d/j$a;
+
+.field public final c:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Lo0/g0/d/i;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final d:Lo0/g0/d/k;
+
+.field public e:Z
+
+.field public final f:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 9
+
+    new-instance v8, Ljava/util/concurrent/ThreadPoolExecutor;
+
+    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    new-instance v6, Ljava/util/concurrent/SynchronousQueue;
+
+    invoke-direct {v6}, Ljava/util/concurrent/SynchronousQueue;-><init>()V
+
+    const-string v0, "OkHttp ConnectionPool"
+
+    const/4 v1, 0x1
+
+    invoke-static {v0, v1}, Lo0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
+
+    move-result-object v7
+
+    const/4 v1, 0x0
+
+    const v2, 0x7fffffff
+
+    const-wide/16 v3, 0x3c
+
+    move-object v0, v8
+
+    invoke-direct/range {v0 .. v7}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
+
+    sput-object v8, Lo0/g0/d/j;->g:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    return-void
+.end method
+
+.method public constructor <init>(IJLjava/util/concurrent/TimeUnit;)V
+    .locals 2
+
+    const-string v0, "timeUnit"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lo0/g0/d/j;->f:I
+
+    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    iput-wide v0, p0, Lo0/g0/d/j;->a:J
+
+    new-instance p1, Lo0/g0/d/j$a;
+
+    invoke-direct {p1, p0}, Lo0/g0/d/j$a;-><init>(Lo0/g0/d/j;)V
+
+    iput-object p1, p0, Lo0/g0/d/j;->b:Lo0/g0/d/j$a;
+
+    new-instance p1, Ljava/util/ArrayDeque;
+
+    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/j;->c:Ljava/util/ArrayDeque;
+
+    new-instance p1, Lo0/g0/d/k;
+
+    invoke-direct {p1}, Lo0/g0/d/k;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/j;->d:Lo0/g0/d/k;
+
+    const-wide/16 v0, 0x0
+
+    cmp-long p1, p2, v0
+
+    if-lez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
+
+    return-void
+
+    :cond_1
+    const-string p1, "keepAliveDuration <= 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+
+# virtual methods
+.method public final a(Lo0/e0;Ljava/io/IOException;)V
+    .locals 3
+
+    const-string v0, "failedRoute"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "failure"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p1, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v0
+
+    sget-object v1, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
+
+    if-eq v0, v1, :cond_0
+
+    iget-object v0, p1, Lo0/e0;->a:Lo0/a;
+
+    iget-object v1, v0, Lo0/a;->k:Ljava/net/ProxySelector;
+
+    iget-object v0, v0, Lo0/a;->a:Lo0/w;
+
+    invoke-virtual {v0}, Lo0/w;->j()Ljava/net/URI;
+
+    move-result-object v0
+
+    iget-object v2, p1, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v2}, Ljava/net/Proxy;->address()Ljava/net/SocketAddress;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0, v2, p2}, Ljava/net/ProxySelector;->connectFailed(Ljava/net/URI;Ljava/net/SocketAddress;Ljava/io/IOException;)V
+
+    :cond_0
+    iget-object p2, p0, Lo0/g0/d/j;->d:Lo0/g0/d/k;
+
+    monitor-enter p2
+
+    :try_start_0
+    const-string v0, "failedRoute"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p2, Lo0/g0/d/k;->a:Ljava/util/Set;
+
+    invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p2
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p2
+
+    throw p1
+.end method
+
+.method public final b(Lo0/g0/d/i;J)I
+    .locals 6
+
+    iget-object v0, p1, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :cond_0
+    :goto_0
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v3
+
+    if-ge v2, v3, :cond_2
+
+    invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/ref/Reference;
+
+    invoke-virtual {v3}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    check-cast v3, Lo0/g0/d/m$a;
+
+    const-string v4, "A connection to "
+
+    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v4
+
+    iget-object v5, p1, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v5, v5, Lo0/e0;->a:Lo0/a;
+
+    iget-object v5, v5, Lo0/a;->a:Lo0/w;
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v5, " was leaked. "
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v5, "Did you forget to close a response body?"
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
+    sget-object v5, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v5, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    iget-object v3, v3, Lo0/g0/d/m$a;->a:Ljava/lang/Object;
+
+    invoke-virtual {v5, v4, v3}, Lo0/g0/h/f;->l(Ljava/lang/String;Ljava/lang/Object;)V
+
+    invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+
+    const/4 v3, 0x1
+
+    iput-boolean v3, p1, Lo0/g0/d/i;->i:Z
+
+    invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    iget-wide v2, p0, Lo0/g0/d/j;->a:J
+
+    sub-long/2addr p2, v2
+
+    iput-wide p2, p1, Lo0/g0/d/i;->o:J
+
+    return v1
+
+    :cond_2
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final c(Lo0/g0/d/i;)V
+    .locals 2
+
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string v0, "Assertion failed"
+
+    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iget-boolean v0, p0, Lo0/g0/d/j;->e:Z
+
+    if-nez v0, :cond_2
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/d/j;->e:Z
+
+    sget-object v0, Lo0/g0/d/j;->g:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    iget-object v1, p0, Lo0/g0/d/j;->b:Lo0/g0/d/j$a;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/ThreadPoolExecutor;->execute(Ljava/lang/Runnable;)V
+
+    :cond_2
+    iget-object v0, p0, Lo0/g0/d/j;->c:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public final d(Lo0/a;Lo0/g0/d/m;Ljava/util/List;Z)Z
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/a;",
+            "Lo0/g0/d/m;",
+            "Ljava/util/List<",
+            "Lo0/e0;",
+            ">;Z)Z"
+        }
+    .end annotation
+
+    const-string v0, "address"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "transmitter"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    sget-boolean v2, Lk0/i;->a:Z
+
+    if-eqz v2, :cond_1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string p2, "Assertion failed"
+
+    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iget-object v1, p0, Lo0/g0/d/j;->c:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v1}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_1
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_13
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lo0/g0/d/i;
+
+    if-eqz p4, :cond_2
+
+    invoke-virtual {v2}, Lo0/g0/d/i;->h()Z
+
+    move-result v4
+
+    if-nez v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v4, 0x0
+
+    if-eqz v2, :cond_12
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v5, v2, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    invoke-interface {v5}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    iget v6, v2, Lo0/g0/d/i;->m:I
+
+    const/4 v7, 0x1
+
+    if-ge v5, v6, :cond_10
+
+    iget-boolean v5, v2, Lo0/g0/d/i;->i:Z
+
+    if-eqz v5, :cond_3
+
+    goto/16 :goto_6
+
+    :cond_3
+    iget-object v5, v2, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v5, v5, Lo0/e0;->a:Lo0/a;
+
+    invoke-virtual {v5, p1}, Lo0/a;->a(Lo0/a;)Z
+
+    move-result v5
+
+    if-nez v5, :cond_4
+
+    goto/16 :goto_6
+
+    :cond_4
+    iget-object v5, p1, Lo0/a;->a:Lo0/w;
+
+    iget-object v5, v5, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v6, v2, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v6, v6, Lo0/e0;->a:Lo0/a;
+
+    iget-object v6, v6, Lo0/a;->a:Lo0/w;
+
+    iget-object v6, v6, Lo0/w;->e:Ljava/lang/String;
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_5
+
+    :goto_2
+    const/4 v3, 0x1
+
+    goto/16 :goto_6
+
+    :cond_5
+    iget-object v5, v2, Lo0/g0/d/i;->f:Lo0/g0/g/e;
+
+    if-nez v5, :cond_6
+
+    goto/16 :goto_6
+
+    :cond_6
+    if-eqz p3, :cond_10
+
+    invoke-interface {p3}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_7
+
+    goto :goto_4
+
+    :cond_7
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v5
+
+    :cond_8
+    invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_a
+
+    invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Lo0/e0;
+
+    iget-object v8, v6, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v8}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v8
+
+    sget-object v9, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
+
+    if-ne v8, v9, :cond_9
+
+    iget-object v8, v2, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v8, v8, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v8}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v8
+
+    sget-object v9, Ljava/net/Proxy$Type;->DIRECT:Ljava/net/Proxy$Type;
+
+    if-ne v8, v9, :cond_9
+
+    iget-object v8, v2, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v8, v8, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    iget-object v6, v6, Lo0/e0;->c:Ljava/net/InetSocketAddress;
+
+    invoke-static {v8, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_9
+
+    const/4 v6, 0x1
+
+    goto :goto_3
+
+    :cond_9
+    const/4 v6, 0x0
+
+    :goto_3
+    if-eqz v6, :cond_8
+
+    const/4 v5, 0x1
+
+    goto :goto_5
+
+    :cond_a
+    :goto_4
+    const/4 v5, 0x0
+
+    :goto_5
+    if-nez v5, :cond_b
+
+    goto :goto_6
+
+    :cond_b
+    iget-object v5, p1, Lo0/a;->g:Ljavax/net/ssl/HostnameVerifier;
+
+    sget-object v6, Lo0/g0/j/d;->a:Lo0/g0/j/d;
+
+    if-eq v5, v6, :cond_c
+
+    goto :goto_6
+
+    :cond_c
+    iget-object v5, p1, Lo0/a;->a:Lo0/w;
+
+    invoke-virtual {v2, v5}, Lo0/g0/d/i;->m(Lo0/w;)Z
+
+    move-result v5
+
+    if-nez v5, :cond_d
+
+    goto :goto_6
+
+    :cond_d
+    :try_start_0
+    iget-object v5, p1, Lo0/a;->h:Lo0/h;
+
+    if-eqz v5, :cond_f
+
+    iget-object v6, p1, Lo0/a;->a:Lo0/w;
+
+    iget-object v6, v6, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v8, v2, Lo0/g0/d/i;->d:Lo0/v;
+
+    if-eqz v8, :cond_e
+
+    invoke-virtual {v8}, Lo0/v;->b()Ljava/util/List;
+
+    move-result-object v4
+
+    const-string v8, "hostname"
+
+    invoke-static {v6, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "peerCertificates"
+
+    invoke-static {v4, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lo0/i;
+
+    invoke-direct {v8, v5, v4, v6}, Lo0/i;-><init>(Lo0/h;Ljava/util/List;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v6, v8}, Lo0/h;->a(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+
+    goto/16 :goto_2
+
+    :cond_e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_0
+    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_0 .. :try_end_0} :catch_0
+
+    throw v4
+
+    :cond_f
+    :try_start_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_1
+    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_1 .. :try_end_1} :catch_0
+
+    throw v4
+
+    :catch_0
+    :cond_10
+    :goto_6
+    if-nez v3, :cond_11
+
+    goto/16 :goto_1
+
+    :cond_11
+    const-string p1, "connection"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2, v2}, Lo0/g0/d/m;->a(Lo0/g0/d/i;)V
+
+    return v7
+
+    :cond_12
+    throw v4
+
+    :cond_13
+    return v3
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/k.smali b/com.discord/smali_classes2/o0/g0/d/k.smali
new file mode 100644
index 0000000000..949b89788d
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/k.smali
@@ -0,0 +1,61 @@
+.class public final Lo0/g0/d/k;
+.super Ljava/lang/Object;
+.source "RouteDatabase.kt"
+
+
+# instance fields
+.field public final a:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lo0/e0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/LinkedHashSet;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashSet;-><init>()V
+
+    iput-object v0, p0, Lo0/g0/d/k;->a:Ljava/util/Set;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final declared-synchronized a(Lo0/e0;)V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "route"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/d/k;->a:Ljava/util/Set;
+
+    invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/l$a.smali b/com.discord/smali_classes2/o0/g0/d/l$a.smali
new file mode 100644
index 0000000000..4973aa1394
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/l$a.smali
@@ -0,0 +1,78 @@
+.class public final Lo0/g0/d/l$a;
+.super Ljava/lang/Object;
+.source "RouteSelector.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/d/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:I
+
+.field public final b:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/e0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lo0/e0;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "routes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/l$a;->b:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Z
+    .locals 2
+
+    iget v0, p0, Lo0/g0/d/l$a;->a:I
+
+    iget-object v1, p0, Lo0/g0/d/l$a;->b:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    if-ge v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/l.smali b/com.discord/smali_classes2/o0/g0/d/l.smali
new file mode 100644
index 0000000000..4d7e39fd4e
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/l.smali
@@ -0,0 +1,255 @@
+.class public final Lo0/g0/d/l;
+.super Ljava/lang/Object;
+.source "RouteSelector.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/d/l$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "+",
+            "Ljava/net/Proxy;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public b:I
+
+.field public c:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "+",
+            "Ljava/net/InetSocketAddress;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/e0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lo0/a;
+
+.field public final f:Lo0/g0/d/k;
+
+.field public final g:Lo0/f;
+
+.field public final h:Lo0/t;
+
+
+# direct methods
+.method public constructor <init>(Lo0/a;Lo0/g0/d/k;Lo0/f;Lo0/t;)V
+    .locals 4
+
+    const-string v0, "address"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "routeDatabase"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "call"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "eventListener"
+
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/l;->e:Lo0/a;
+
+    iput-object p2, p0, Lo0/g0/d/l;->f:Lo0/g0/d/k;
+
+    iput-object p3, p0, Lo0/g0/d/l;->g:Lo0/f;
+
+    iput-object p4, p0, Lo0/g0/d/l;->h:Lo0/t;
+
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
+
+    iput-object p1, p0, Lo0/g0/d/l;->a:Ljava/util/List;
+
+    iput-object p1, p0, Lo0/g0/d/l;->c:Ljava/util/List;
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/l;->d:Ljava/util/List;
+
+    iget-object p1, p0, Lo0/g0/d/l;->e:Lo0/a;
+
+    iget-object p2, p1, Lo0/a;->a:Lo0/w;
+
+    iget-object p1, p1, Lo0/a;->j:Ljava/net/Proxy;
+
+    iget-object p3, p0, Lo0/g0/d/l;->h:Lo0/t;
+
+    iget-object p4, p0, Lo0/g0/d/l;->g:Lo0/f;
+
+    const/4 v1, 0x0
+
+    if-eqz p3, :cond_3
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p3, "url"
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p4, 0x0
+
+    if-eqz p1, :cond_0
+
+    invoke-static {p1}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Lo0/g0/d/l;->e:Lo0/a;
+
+    iget-object p1, p1, Lo0/a;->k:Ljava/net/ProxySelector;
+
+    invoke-virtual {p2}, Lo0/w;->j()Ljava/net/URI;
+
+    move-result-object v2
+
+    invoke-virtual {p1, v2}, Ljava/net/ProxySelector;->select(Ljava/net/URI;)Ljava/util/List;
+
+    move-result-object p1
+
+    const/4 v2, 0x1
+
+    if-eqz p1, :cond_1
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v2
+
+    if-eqz v3, :cond_1
+
+    invoke-static {p1}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_1
+    new-array p1, v2, [Ljava/net/Proxy;
+
+    sget-object v2, Ljava/net/Proxy;->NO_PROXY:Ljava/net/Proxy;
+
+    aput-object v2, p1, p4
+
+    invoke-static {p1}, Lo0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    :goto_0
+    iput-object p1, p0, Lo0/g0/d/l;->a:Ljava/util/List;
+
+    iput p4, p0, Lo0/g0/d/l;->b:I
+
+    iget-object p4, p0, Lo0/g0/d/l;->h:Lo0/t;
+
+    iget-object v2, p0, Lo0/g0/d/l;->g:Lo0/f;
+
+    if-eqz p4, :cond_2
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "proxies"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+
+    :cond_2
+    throw v1
+
+    :cond_3
+    throw v1
+.end method
+
+
+# virtual methods
+.method public final a()Z
+    .locals 2
+
+    invoke-virtual {p0}, Lo0/g0/d/l;->b()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lo0/g0/d/l;->d:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :cond_1
+    :goto_0
+    return v1
+.end method
+
+.method public final b()Z
+    .locals 2
+
+    iget v0, p0, Lo0/g0/d/l;->b:I
+
+    iget-object v1, p0, Lo0/g0/d/l;->a:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    if-ge v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/m$a.smali b/com.discord/smali_classes2/o0/g0/d/m$a.smali
new file mode 100644
index 0000000000..1c9a3aa3cd
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/m$a.smali
@@ -0,0 +1,42 @@
+.class public final Lo0/g0/d/m$a;
+.super Ljava/lang/ref/WeakReference;
+.source "Transmitter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/d/m;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/ref/WeakReference<",
+        "Lo0/g0/d/m;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/m;Ljava/lang/Object;)V
+    .locals 1
+
+    const-string v0, "referent"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object p2, p0, Lo0/g0/d/m$a;->a:Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/m$b.smali b/com.discord/smali_classes2/o0/g0/d/m$b.smali
new file mode 100644
index 0000000000..e6d00b89f4
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/m$b.smali
@@ -0,0 +1,47 @@
+.class public final Lo0/g0/d/m$b;
+.super Lp0/b;
+.source "Transmitter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/d/m;-><init>(Lo0/x;Lo0/f;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic l:Lo0/g0/d/m;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/d/m;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/d/m$b;->l:Lo0/g0/d/m;
+
+    invoke-direct {p0}, Lp0/b;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public n()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/d/m$b;->l:Lo0/g0/d/m;
+
+    invoke-virtual {v0}, Lo0/g0/d/m;->c()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/d/m.smali b/com.discord/smali_classes2/o0/g0/d/m.smali
new file mode 100644
index 0000000000..03d66a1c23
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/d/m.smali
@@ -0,0 +1,1034 @@
+.class public final Lo0/g0/d/m;
+.super Ljava/lang/Object;
+.source "Transmitter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/d/m$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lo0/g0/d/j;
+
+.field public final b:Lo0/t;
+
+.field public final c:Lo0/g0/d/m$b;
+
+.field public d:Ljava/lang/Object;
+
+.field public e:Lo0/a0;
+
+.field public f:Lo0/g0/d/d;
+
+.field public g:Lo0/g0/d/i;
+
+.field public h:Lo0/g0/d/c;
+
+.field public i:Z
+
+.field public j:Z
+
+.field public k:Z
+
+.field public l:Z
+
+.field public m:Z
+
+.field public final n:Lo0/x;
+
+.field public final o:Lo0/f;
+
+
+# direct methods
+.method public constructor <init>(Lo0/x;Lo0/f;)V
+    .locals 2
+
+    const-string v0, "client"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "call"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/d/m;->n:Lo0/x;
+
+    iput-object p2, p0, Lo0/g0/d/m;->o:Lo0/f;
+
+    iget-object v0, p1, Lo0/x;->e:Lo0/l;
+
+    iget-object v0, v0, Lo0/l;->a:Lo0/g0/d/j;
+
+    iput-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    iget-object p1, p1, Lo0/x;->h:Lo0/t$b;
+
+    invoke-interface {p1, p2}, Lo0/t$b;->a(Lo0/f;)Lo0/t;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/g0/d/m;->b:Lo0/t;
+
+    new-instance p1, Lo0/g0/d/m$b;
+
+    invoke-direct {p1, p0}, Lo0/g0/d/m$b;-><init>(Lo0/g0/d/m;)V
+
+    iget-object p2, p0, Lo0/g0/d/m;->n:Lo0/x;
+
+    iget p2, p2, Lo0/x;->A:I
+
+    int-to-long v0, p2
+
+    sget-object p2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {p1, v0, v1, p2}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    iput-object p1, p0, Lo0/g0/d/m;->c:Lo0/g0/d/m$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lo0/g0/d/i;)V
+    .locals 2
+
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string v0, "Assertion failed"
+
+    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-nez v0, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_3
+
+    iput-object p1, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    iget-object p1, p1, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    new-instance v0, Lo0/g0/d/m$a;
+
+    iget-object v1, p0, Lo0/g0/d/m;->d:Ljava/lang/Object;
+
+    invoke-direct {v0, p0, v1}, Lo0/g0/d/m$a;-><init>(Lo0/g0/d/m;Ljava/lang/Object;)V
+
+    invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    return-void
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Check failed."
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final b()V
+    .locals 2
+
+    sget-object v0, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v0, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    const-string v1, "response.body().close()"
+
+    invoke-virtual {v0, v1}, Lo0/g0/h/f;->i(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lo0/g0/d/m;->d:Ljava/lang/Object;
+
+    iget-object v0, p0, Lo0/g0/d/m;->b:Lo0/t;
+
+    iget-object v1, p0, Lo0/g0/d/m;->o:Lo0/f;
+
+    if-eqz v0, :cond_0
+
+    const-string v0, "call"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public final c()V
+    .locals 5
+
+    iget-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    const/4 v1, 0x1
+
+    :try_start_0
+    iput-boolean v1, p0, Lo0/g0/d/m;->k:Z
+
+    iget-object v1, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    iget-object v2, p0, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    if-eqz v2, :cond_2
+
+    iget-object v3, v2, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    invoke-static {v3}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    sget-boolean v4, Lk0/i;->a:Z
+
+    if-eqz v4, :cond_1
+
+    if-eqz v3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ljava/lang/AssertionError;
+
+    const-string v2, "Assertion failed"
+
+    invoke-direct {v1, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    iget-object v2, v2, Lo0/g0/d/d;->c:Lo0/g0/d/i;
+
+    if-eqz v2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    iget-object v2, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_1
+    monitor-exit v0
+
+    if-eqz v1, :cond_3
+
+    iget-object v0, v1, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v0}, Lo0/g0/e/d;->cancel()V
+
+    goto :goto_2
+
+    :cond_3
+    if-eqz v2, :cond_4
+
+    iget-object v0, v2, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    if-eqz v0, :cond_4
+
+    invoke-static {v0}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_4
+    :goto_2
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public final d()V
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v1, p0, Lo0/g0/d/m;->m:Z
+
+    xor-int/lit8 v1, v1, 0x1
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-void
+
+    :cond_0
+    :try_start_1
+    const-string v1, "Check failed."
+
+    new-instance v2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public final e(Lo0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/io/IOException;",
+            ">(",
+            "Lo0/g0/d/c;",
+            "ZZTE;)TE;"
+        }
+    .end annotation
+
+    const-string v0, "exchange"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr p1, v1
+
+    if-eqz p1, :cond_0
+
+    monitor-exit v0
+
+    return-object p4
+
+    :cond_0
+    const/4 p1, 0x0
+
+    if-eqz p2, :cond_1
+
+    :try_start_1
+    iget-boolean p2, p0, Lo0/g0/d/m;->i:Z
+
+    xor-int/2addr p2, v1
+
+    iput-boolean v1, p0, Lo0/g0/d/m;->i:Z
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_0
+    if-eqz p3, :cond_3
+
+    iget-boolean p3, p0, Lo0/g0/d/m;->j:Z
+
+    if-nez p3, :cond_2
+
+    const/4 p2, 0x1
+
+    :cond_2
+    iput-boolean v1, p0, Lo0/g0/d/m;->j:Z
+
+    :cond_3
+    iget-boolean p3, p0, Lo0/g0/d/m;->i:Z
+
+    if-eqz p3, :cond_6
+
+    iget-boolean p3, p0, Lo0/g0/d/m;->j:Z
+
+    if-eqz p3, :cond_6
+
+    if-eqz p2, :cond_6
+
+    iget-object p2, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    const/4 p3, 0x0
+
+    if-eqz p2, :cond_5
+
+    invoke-virtual {p2}, Lo0/g0/d/c;->b()Lo0/g0/d/i;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_4
+
+    iget v2, p2, Lo0/g0/d/i;->k:I
+
+    add-int/2addr v2, v1
+
+    iput v2, p2, Lo0/g0/d/i;->k:I
+
+    iput-object p3, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    goto :goto_1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p3
+
+    :cond_5
+    :try_start_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    throw p3
+
+    :cond_6
+    const/4 v1, 0x0
+
+    :goto_1
+    monitor-exit v0
+
+    if-eqz v1, :cond_7
+
+    invoke-virtual {p0, p4, p1}, Lo0/g0/d/m;->g(Ljava/io/IOException;Z)Ljava/io/IOException;
+
+    move-result-object p4
+
+    :cond_7
+    return-object p4
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+.end method
+
+.method public final f()Z
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v1, p0, Lo0/g0/d/m;->k:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return v1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public final g(Ljava/io/IOException;Z)Ljava/io/IOException;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/io/IOException;",
+            ">(TE;Z)TE;"
+        }
+    .end annotation
+
+    new-instance v0, Lkotlin/jvm/internal/Ref$ObjectRef;
+
+    invoke-direct {v0}, Lkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+
+    iget-object v1, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-eqz p2, :cond_1
+
+    :try_start_0
+    iget-object v4, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    if-nez v4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    goto/16 :goto_8
+
+    :cond_1
+    :goto_0
+    const/4 v4, 0x1
+
+    :goto_1
+    if-eqz v4, :cond_13
+
+    iget-object v4, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    iput-object v4, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    iget-object v4, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    const/4 v5, 0x0
+
+    if-eqz v4, :cond_3
+
+    iget-object v4, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    if-nez v4, :cond_3
+
+    if-nez p2, :cond_2
+
+    iget-boolean p2, p0, Lo0/g0/d/m;->m:Z
+
+    if-eqz p2, :cond_3
+
+    :cond_2
+    invoke-virtual {p0}, Lo0/g0/d/m;->i()Ljava/net/Socket;
+
+    move-result-object p2
+
+    goto :goto_2
+
+    :cond_3
+    move-object p2, v5
+
+    :goto_2
+    iget-object v4, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-eqz v4, :cond_4
+
+    iput-object v5, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    :cond_4
+    iget-boolean v4, p0, Lo0/g0/d/m;->m:Z
+
+    if-eqz v4, :cond_5
+
+    iget-object v4, p0, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v4, :cond_5
+
+    const/4 v4, 0x1
+
+    goto :goto_3
+
+    :cond_5
+    const/4 v4, 0x0
+
+    :goto_3
+    monitor-exit v1
+
+    if-eqz p2, :cond_6
+
+    invoke-static {p2}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_6
+    iget-object p2, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+    check-cast p2, Lo0/k;
+
+    if-eqz p2, :cond_9
+
+    iget-object v0, p0, Lo0/g0/d/m;->b:Lo0/t;
+
+    iget-object v1, p0, Lo0/g0/d/m;->o:Lo0/f;
+
+    if-eqz p2, :cond_8
+
+    if-eqz v0, :cond_7
+
+    const-string v0, "call"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "connection"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_4
+
+    :cond_7
+    throw v5
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_9
+    :goto_4
+    if-eqz v4, :cond_12
+
+    if-eqz p1, :cond_a
+
+    goto :goto_5
+
+    :cond_a
+    const/4 v2, 0x0
+
+    :goto_5
+    iget-boolean p2, p0, Lo0/g0/d/m;->l:Z
+
+    if-eqz p2, :cond_b
+
+    goto :goto_6
+
+    :cond_b
+    iget-object p2, p0, Lo0/g0/d/m;->c:Lo0/g0/d/m$b;
+
+    invoke-virtual {p2}, Lp0/b;->j()Z
+
+    move-result p2
+
+    if-nez p2, :cond_c
+
+    goto :goto_6
+
+    :cond_c
+    new-instance p2, Ljava/io/InterruptedIOException;
+
+    const-string v0, "timeout"
+
+    invoke-direct {p2, v0}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_d
+
+    invoke-virtual {p2, p1}, Ljava/io/InterruptedIOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    :cond_d
+    move-object p1, p2
+
+    :goto_6
+    if-eqz v2, :cond_10
+
+    iget-object p2, p0, Lo0/g0/d/m;->b:Lo0/t;
+
+    iget-object v0, p0, Lo0/g0/d/m;->o:Lo0/f;
+
+    if-eqz p1, :cond_f
+
+    if-eqz p2, :cond_e
+
+    const-string p2, "call"
+
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "ioe"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_7
+
+    :cond_e
+    throw v5
+
+    :cond_f
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_10
+    iget-object p2, p0, Lo0/g0/d/m;->b:Lo0/t;
+
+    iget-object v0, p0, Lo0/g0/d/m;->o:Lo0/f;
+
+    if-eqz p2, :cond_11
+
+    const-string p2, "call"
+
+    invoke-static {v0, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_7
+
+    :cond_11
+    throw v5
+
+    :cond_12
+    :goto_7
+    return-object p1
+
+    :cond_13
+    :try_start_1
+    const-string p1, "cannot release connection while it is in use"
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_8
+    monitor-exit v1
+
+    throw p1
+.end method
+
+.method public final h(Ljava/io/IOException;)Ljava/io/IOException;
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v0
+
+    const/4 v1, 0x1
+
+    :try_start_0
+    iput-boolean v1, p0, Lo0/g0/d/m;->m:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lo0/g0/d/m;->g(Ljava/io/IOException;Z)Ljava/io/IOException;
+
+    move-result-object p1
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+.end method
+
+.method public final i()Ljava/net/Socket;
+    .locals 8
+
+    iget-object v0, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    const-string v2, "Assertion failed"
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_d
+
+    iget-object v0, v0, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    const/4 v6, -0x1
+
+    if-eqz v5, :cond_3
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/ref/Reference;
+
+    invoke-virtual {v5}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lo0/g0/d/m;
+
+    invoke-static {v5, p0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v4, -0x1
+
+    :goto_2
+    const/4 v0, 0x1
+
+    if-eq v4, v6, :cond_4
+
+    const/4 v5, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v5, 0x0
+
+    :goto_3
+    if-eqz v5, :cond_c
+
+    iget-object v5, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    if-eqz v5, :cond_b
+
+    iget-object v6, v5, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    invoke-interface {v6, v4}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+
+    iput-object v1, p0, Lo0/g0/d/m;->g:Lo0/g0/d/i;
+
+    iget-object v4, v5, Lo0/g0/d/i;->n:Ljava/util/List;
+
+    invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_a
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v6
+
+    iput-wide v6, v5, Lo0/g0/d/i;->o:J
+
+    iget-object v4, p0, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    if-eqz v4, :cond_9
+
+    const-string v6, "connection"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v4}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v6
+
+    sget-boolean v7, Lk0/i;->a:Z
+
+    if-eqz v7, :cond_6
+
+    if-eqz v6, :cond_5
+
+    goto :goto_4
+
+    :cond_5
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_6
+    :goto_4
+    iget-boolean v2, v5, Lo0/g0/d/i;->i:Z
+
+    if-nez v2, :cond_8
+
+    iget v2, v4, Lo0/g0/d/j;->f:I
+
+    if-nez v2, :cond_7
+
+    goto :goto_5
+
+    :cond_7
+    invoke-virtual {v4}, Ljava/lang/Object;->notifyAll()V
+
+    goto :goto_6
+
+    :cond_8
+    :goto_5
+    iget-object v2, v4, Lo0/g0/d/j;->c:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2, v5}, Ljava/util/ArrayDeque;->remove(Ljava/lang/Object;)Z
+
+    const/4 v3, 0x1
+
+    :goto_6
+    if-eqz v3, :cond_a
+
+    invoke-virtual {v5}, Lo0/g0/d/i;->k()Ljava/net/Socket;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_9
+    throw v1
+
+    :cond_a
+    return-object v1
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_c
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Check failed."
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_d
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public final j()V
+    .locals 2
+
+    iget-boolean v0, p0, Lo0/g0/d/m;->l:Z
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, p0, Lo0/g0/d/m;->l:Z
+
+    iget-object v0, p0, Lo0/g0/d/m;->c:Lo0/g0/d/m$b;
+
+    invoke-virtual {v0}, Lp0/b;->j()Z
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Check failed."
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/a.smali b/com.discord/smali_classes2/o0/g0/e/a.smali
new file mode 100644
index 0000000000..9d8b1e3295
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/a.smali
@@ -0,0 +1,510 @@
+.class public final Lo0/g0/e/a;
+.super Ljava/lang/Object;
+.source "BridgeInterceptor.kt"
+
+# interfaces
+.implements Lokhttp3/Interceptor;
+
+
+# instance fields
+.field public final b:Lo0/p;
+
+
+# direct methods
+.method public constructor <init>(Lo0/p;)V
+    .locals 1
+
+    const-string v0, "cookieJar"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/e/a;->b:Lo0/p;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+    .locals 24
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    const-string v2, "chain"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_e
+
+    const-string v4, "request"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v4}, Ljava/util/LinkedHashMap;-><init>()V
+
+    iget-object v6, v2, Lo0/a0;->b:Lo0/w;
+
+    iget-object v7, v2, Lo0/a0;->c:Ljava/lang/String;
+
+    iget-object v9, v2, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    iget-object v4, v2, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-interface {v4}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    new-instance v4, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v4}, Ljava/util/LinkedHashMap;-><init>()V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v4, v2, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-static {v4}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v4
+
+    :goto_0
+    iget-object v5, v2, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {v5}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v5
+
+    iget-object v8, v2, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    const-string v11, "Content-Type"
+
+    const-string v12, "Content-Length"
+
+    const-string v10, "value"
+
+    const-string v13, "name"
+
+    const-wide/16 v14, -0x1
+
+    if-eqz v8, :cond_3
+
+    invoke-virtual {v8}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_1
+
+    iget-object v3, v3, Lokhttp3/MediaType;->a:Ljava/lang/String;
+
+    invoke-static {v11, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v3, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v11, v3}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :cond_1
+    invoke-virtual {v8}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v16
+
+    const-string v3, "Transfer-Encoding"
+
+    cmp-long v8, v16, v14
+
+    if-eqz v8, :cond_2
+
+    invoke-static/range {v16 .. v17}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-static {v12, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v12, v8}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    invoke-static {v3, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v3}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    goto :goto_1
+
+    :cond_2
+    const-string v8, "chunked"
+
+    invoke-static {v3, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v3, v8}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    invoke-static {v12, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v12}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :cond_3
+    :goto_1
+    const-string v3, "Host"
+
+    invoke-virtual {v2, v3}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v8
+
+    const/4 v14, 0x0
+
+    if-nez v8, :cond_4
+
+    iget-object v8, v2, Lo0/a0;->b:Lo0/w;
+
+    invoke-static {v8, v14}, Lo0/g0/b;->D(Lo0/w;Z)Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-static {v3, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v3, v8}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :cond_4
+    const-string v3, "Connection"
+
+    invoke-virtual {v2, v3}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v8
+
+    if-nez v8, :cond_5
+
+    const-string v8, "Keep-Alive"
+
+    invoke-static {v3, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v3, v8}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :cond_5
+    const-string v3, "Accept-Encoding"
+
+    invoke-virtual {v2, v3}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v15, "gzip"
+
+    if-nez v8, :cond_6
+
+    const-string v8, "Range"
+
+    invoke-virtual {v2, v8}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v8
+
+    if-nez v8, :cond_6
+
+    invoke-static {v3, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v15, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v3, v15}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    const/4 v3, 0x1
+
+    goto :goto_2
+
+    :cond_6
+    const/4 v3, 0x0
+
+    :goto_2
+    iget-object v8, v0, Lo0/g0/e/a;->b:Lo0/p;
+
+    iget-object v14, v2, Lo0/a0;->b:Lo0/w;
+
+    invoke-interface {v8, v14}, Lo0/p;->b(Lo0/w;)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-interface {v8}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v14
+
+    const/16 v19, 0x1
+
+    xor-int/lit8 v14, v14, 0x1
+
+    if-eqz v14, :cond_a
+
+    const-string v14, "Cookie"
+
+    move-object/from16 v20, v11
+
+    new-instance v11, Ljava/lang/StringBuilder;
+
+    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-interface {v8}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v8
+
+    const/16 v18, 0x0
+
+    :goto_3
+    invoke-interface {v8}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v21
+
+    if-eqz v21, :cond_9
+
+    invoke-interface {v8}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v21
+
+    add-int/lit8 v22, v18, 0x1
+
+    if-ltz v18, :cond_8
+
+    move-object/from16 v23, v8
+
+    move-object/from16 v8, v21
+
+    check-cast v8, Lo0/n;
+
+    if-lez v18, :cond_7
+
+    move-object/from16 v18, v12
+
+    const-string v12, "; "
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_4
+
+    :cond_7
+    move-object/from16 v18, v12
+
+    :goto_4
+    iget-object v12, v8, Lo0/n;->a:Ljava/lang/String;
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v12, 0x3d
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v8, v8, Lo0/n;->b:Ljava/lang/String;
+
+    invoke-virtual {v11, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-object/from16 v12, v18
+
+    move/from16 v18, v22
+
+    move-object/from16 v8, v23
+
+    goto :goto_3
+
+    :cond_8
+    invoke-static {}, Lf/n/a/k/a;->throwIndexOverflow()V
+
+    const/4 v1, 0x0
+
+    throw v1
+
+    :cond_9
+    move-object/from16 v18, v12
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v11, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {v8, v11}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v14, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v14, v8}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    goto :goto_5
+
+    :cond_a
+    move-object/from16 v20, v11
+
+    move-object/from16 v18, v12
+
+    :goto_5
+    const-string v8, "User-Agent"
+
+    invoke-virtual {v2, v8}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v11
+
+    if-nez v11, :cond_b
+
+    const-string v11, "okhttp/4.2.1"
+
+    invoke-static {v8, v13}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v11, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5, v8, v11}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :cond_b
+    if-eqz v6, :cond_d
+
+    invoke-virtual {v5}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v8
+
+    invoke-static {v4}, Lo0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v10
+
+    new-instance v4, Lo0/a0;
+
+    move-object v5, v4
+
+    invoke-direct/range {v5 .. v10}, Lo0/a0;-><init>(Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+
+    invoke-interface {v1, v4}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
+
+    move-result-object v1
+
+    iget-object v4, v0, Lo0/g0/e/a;->b:Lo0/p;
+
+    iget-object v5, v2, Lo0/a0;->b:Lo0/w;
+
+    iget-object v6, v1, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-static {v4, v5, v6}, Lo0/g0/e/e;->b(Lo0/p;Lo0/w;Lokhttp3/Headers;)V
+
+    new-instance v4, Lokhttp3/Response$a;
+
+    invoke-direct {v4, v1}, Lokhttp3/Response$a;-><init>(Lokhttp3/Response;)V
+
+    invoke-virtual {v4, v2}, Lokhttp3/Response$a;->g(Lo0/a0;)Lokhttp3/Response$a;
+
+    if-eqz v3, :cond_c
+
+    const-string v2, "Content-Encoding"
+
+    const/4 v3, 0x2
+
+    const/4 v5, 0x0
+
+    invoke-static {v1, v2, v5, v3}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v6
+
+    const/4 v5, 0x1
+
+    invoke-static {v15, v6, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_c
+
+    invoke-static {v1}, Lo0/g0/e/e;->a(Lokhttp3/Response;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_c
+
+    iget-object v5, v1, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v5, :cond_c
+
+    new-instance v6, Lp0/k;
+
+    invoke-virtual {v5}, Lokhttp3/ResponseBody;->c()Lp0/g;
+
+    move-result-object v5
+
+    invoke-direct {v6, v5}, Lp0/k;-><init>(Lp0/w;)V
+
+    iget-object v5, v1, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v5}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v2}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    move-object/from16 v2, v18
+
+    invoke-virtual {v5, v2}, Lokhttp3/Headers$a;->d(Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    invoke-virtual {v5}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v2
+
+    invoke-virtual {v4, v2}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
+
+    move-object/from16 v2, v20
+
+    const/4 v5, 0x0
+
+    invoke-static {v1, v2, v5, v3}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Lo0/g0/e/h;
+
+    const-string v3, "$receiver"
+
+    invoke-static {v6, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Lp0/q;
+
+    invoke-direct {v3, v6}, Lp0/q;-><init>(Lp0/w;)V
+
+    const-wide/16 v5, -0x1
+
+    invoke-direct {v2, v1, v5, v6, v3}, Lo0/g0/e/h;-><init>(Ljava/lang/String;JLp0/g;)V
+
+    iput-object v2, v4, Lokhttp3/Response$a;->g:Lokhttp3/ResponseBody;
+
+    :cond_c
+    invoke-virtual {v4}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v1
+
+    return-object v1
+
+    :cond_d
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "url == null"
+
+    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_e
+    const/4 v1, 0x0
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/b.smali b/com.discord/smali_classes2/o0/g0/e/b.smali
new file mode 100644
index 0000000000..f4f5657cc6
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/b.smali
@@ -0,0 +1,1004 @@
+.class public final Lo0/g0/e/b;
+.super Ljava/lang/Object;
+.source "CallServerInterceptor.kt"
+
+# interfaces
+.implements Lokhttp3/Interceptor;
+
+
+# instance fields
+.field public final b:Z
+
+
+# direct methods
+.method public constructor <init>(Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Lo0/g0/e/b;->b:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+    .locals 31
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p1
+
+    const-string v1, "ioe"
+
+    const-string v2, "call"
+
+    const-string v3, "chain"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lo0/g0/e/g;
+
+    iget-object v3, v0, Lo0/g0/e/g;->d:Lo0/g0/d/c;
+
+    const/4 v4, 0x0
+
+    if-eqz v3, :cond_2b
+
+    iget-object v0, v0, Lo0/g0/e/g;->f:Lo0/a0;
+
+    iget-object v5, v0, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v6
+
+    const-string v8, "request"
+
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v9, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v10, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v9, :cond_29
+
+    invoke-static {v10, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v9, v3, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v9, v0}, Lo0/g0/e/d;->c(Lo0/a0;)V
+
+    iget-object v9, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v10, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v9, :cond_28
+
+    invoke-static {v10, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_4
+
+    iget-object v8, v0, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-static {v8}, Lo0/g0/e/f;->a(Ljava/lang/String;)Z
+
+    move-result v8
+
+    const-string v9, "$receiver"
+
+    const/4 v10, 0x1
+
+    const/4 v11, 0x0
+
+    if-eqz v8, :cond_6
+
+    if-eqz v5, :cond_6
+
+    const-string v8, "Expect"
+
+    invoke-virtual {v0, v8}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v12, "100-continue"
+
+    invoke-static {v12, v8, v10}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_1
+
+    invoke-virtual {v3}, Lo0/g0/d/c;->d()V
+
+    iget-object v8, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v12, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v8, :cond_0
+
+    invoke-static {v12, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v10}, Lo0/g0/d/c;->f(Z)Lokhttp3/Response$a;
+
+    move-result-object v8
+
+    const/4 v12, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    throw v4
+
+    :cond_1
+    const/4 v12, 0x0
+
+    move-object v8, v4
+
+    :goto_0
+    if-nez v8, :cond_3
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->isDuplex()Z
+
+    move-result v13
+
+    if-eqz v13, :cond_2
+
+    invoke-virtual {v3}, Lo0/g0/d/c;->d()V
+
+    invoke-virtual {v3, v0, v10}, Lo0/g0/d/c;->c(Lo0/a0;Z)Lp0/u;
+
+    move-result-object v10
+
+    invoke-static {v10, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v13, Lp0/p;
+
+    invoke-direct {v13, v10}, Lp0/p;-><init>(Lp0/u;)V
+
+    invoke-virtual {v5, v13}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {v3, v0, v11}, Lo0/g0/d/c;->c(Lo0/a0;Z)Lp0/u;
+
+    move-result-object v10
+
+    invoke-static {v10, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v13, Lp0/p;
+
+    invoke-direct {v13, v10}, Lp0/p;-><init>(Lp0/u;)V
+
+    invoke-virtual {v5, v13}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
+
+    invoke-virtual {v13}, Lp0/p;->close()V
+
+    goto :goto_1
+
+    :cond_3
+    iget-object v13, v3, Lo0/g0/d/c;->b:Lo0/g0/d/m;
+
+    invoke-virtual {v13, v3, v10, v11, v4}, Lo0/g0/d/m;->e(Lo0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
+
+    invoke-virtual {v3}, Lo0/g0/d/c;->b()Lo0/g0/d/i;
+
+    move-result-object v10
+
+    if-eqz v10, :cond_5
+
+    invoke-virtual {v10}, Lo0/g0/d/i;->h()Z
+
+    move-result v10
+
+    if-nez v10, :cond_7
+
+    iget-object v10, v3, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v10}, Lo0/g0/e/d;->a()Lo0/g0/d/i;
+
+    move-result-object v10
+
+    if-eqz v10, :cond_4
+
+    invoke-virtual {v10}, Lo0/g0/d/i;->j()V
+
+    goto :goto_1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_6
+    iget-object v8, v3, Lo0/g0/d/c;->b:Lo0/g0/d/m;
+
+    invoke-virtual {v8, v3, v10, v11, v4}, Lo0/g0/d/m;->e(Lo0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
+
+    const/4 v12, 0x0
+
+    move-object v8, v4
+
+    :cond_7
+    :goto_1
+    if-eqz v5, :cond_8
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->isDuplex()Z
+
+    move-result v5
+
+    if-nez v5, :cond_9
+
+    :cond_8
+    :try_start_1
+    iget-object v5, v3, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v5}, Lo0/g0/e/d;->b()V
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_2
+
+    :cond_9
+    if-nez v12, :cond_b
+
+    iget-object v5, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v10, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v5, :cond_a
+
+    invoke-static {v10, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_2
+
+    :cond_a
+    throw v4
+
+    :cond_b
+    :goto_2
+    if-nez v8, :cond_d
+
+    invoke-virtual {v3, v11}, Lo0/g0/d/c;->f(Z)Lokhttp3/Response$a;
+
+    move-result-object v8
+
+    if-eqz v8, :cond_c
+
+    goto :goto_3
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_d
+    :goto_3
+    invoke-virtual {v8, v0}, Lokhttp3/Response$a;->g(Lo0/a0;)Lokhttp3/Response$a;
+
+    invoke-virtual {v3}, Lo0/g0/d/c;->b()Lo0/g0/d/i;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_26
+
+    iget-object v5, v5, Lo0/g0/d/i;->d:Lo0/v;
+
+    iput-object v5, v8, Lokhttp3/Response$a;->e:Lo0/v;
+
+    iput-wide v6, v8, Lokhttp3/Response$a;->k:J
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v12
+
+    iput-wide v12, v8, Lokhttp3/Response$a;->l:J
+
+    invoke-virtual {v8}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v5
+
+    iget v8, v5, Lokhttp3/Response;->g:I
+
+    const/16 v10, 0x64
+
+    if-ne v8, v10, :cond_10
+
+    invoke-virtual {v3, v11}, Lo0/g0/d/c;->f(Z)Lokhttp3/Response$a;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_f
+
+    invoke-virtual {v5, v0}, Lokhttp3/Response$a;->g(Lo0/a0;)Lokhttp3/Response$a;
+
+    invoke-virtual {v3}, Lo0/g0/d/c;->b()Lo0/g0/d/i;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_e
+
+    iget-object v0, v0, Lo0/g0/d/i;->d:Lo0/v;
+
+    iput-object v0, v5, Lokhttp3/Response$a;->e:Lo0/v;
+
+    iput-wide v6, v5, Lokhttp3/Response$a;->k:J
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v6
+
+    iput-wide v6, v5, Lokhttp3/Response$a;->l:J
+
+    invoke-virtual {v5}, Lokhttp3/Response$a;->a()Lokhttp3/Response;
+
+    move-result-object v5
+
+    iget v8, v5, Lokhttp3/Response;->g:I
+
+    goto :goto_4
+
+    :cond_e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_f
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_10
+    :goto_4
+    const-string v0, "response"
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v6, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v7, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v6, :cond_25
+
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v6, p0
+
+    iget-boolean v4, v6, Lo0/g0/e/b;->b:Z
+
+    const-string v7, "message == null"
+
+    const-string v10, "protocol == null"
+
+    const-string v11, "request == null"
+
+    const-string v12, "code < 0: "
+
+    if-eqz v4, :cond_16
+
+    const/16 v4, 0x65
+
+    if-ne v8, v4, :cond_16
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v14, v5, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v15, v5, Lokhttp3/Response;->e:Lo0/y;
+
+    iget v0, v5, Lokhttp3/Response;->g:I
+
+    iget-object v1, v5, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    iget-object v2, v5, Lokhttp3/Response;->h:Lo0/v;
+
+    iget-object v4, v5, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v4}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v4
+
+    iget-object v9, v5, Lokhttp3/Response;->k:Lokhttp3/Response;
+
+    iget-object v13, v5, Lokhttp3/Response;->l:Lokhttp3/Response;
+
+    iget-object v6, v5, Lokhttp3/Response;->m:Lokhttp3/Response;
+
+    move-object/from16 p1, v11
+
+    move-object/from16 v16, v12
+
+    iget-wide v11, v5, Lokhttp3/Response;->n:J
+
+    move-object/from16 v17, v7
+
+    move/from16 v29, v8
+
+    iget-wide v7, v5, Lokhttp3/Response;->o:J
+
+    iget-object v5, v5, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    sget-object v20, Lo0/g0/b;->c:Lokhttp3/ResponseBody;
+
+    if-ltz v0, :cond_11
+
+    const/16 v18, 0x1
+
+    goto :goto_5
+
+    :cond_11
+    const/16 v18, 0x0
+
+    :goto_5
+    if-eqz v18, :cond_15
+
+    if-eqz v14, :cond_14
+
+    if-eqz v15, :cond_13
+
+    if-eqz v1, :cond_12
+
+    invoke-virtual {v4}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v19
+
+    new-instance v4, Lokhttp3/Response;
+
+    move-object v10, v13
+
+    move-object v13, v4
+
+    move-object/from16 v16, v1
+
+    move/from16 v17, v0
+
+    move-object/from16 v18, v2
+
+    move-object/from16 v21, v9
+
+    move-object/from16 v22, v10
+
+    move-object/from16 v23, v6
+
+    move-wide/from16 v24, v11
+
+    move-wide/from16 v26, v7
+
+    move-object/from16 v28, v5
+
+    invoke-direct/range {v13 .. v28}, Lokhttp3/Response;-><init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
+
+    goto/16 :goto_7
+
+    :cond_12
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual/range {v17 .. v17}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_13
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v10}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_14
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_15
+    move-object/from16 v4, v16
+
+    invoke-static {v4, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_16
+    move-object/from16 v17, v7
+
+    move/from16 v29, v8
+
+    move-object/from16 p1, v11
+
+    move-object v4, v12
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v6, v5, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v7, v5, Lokhttp3/Response;->e:Lo0/y;
+
+    iget v8, v5, Lokhttp3/Response;->g:I
+
+    iget-object v11, v5, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    iget-object v12, v5, Lokhttp3/Response;->h:Lo0/v;
+
+    iget-object v13, v5, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v13}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v13
+
+    iget-object v14, v5, Lokhttp3/Response;->k:Lokhttp3/Response;
+
+    iget-object v15, v5, Lokhttp3/Response;->l:Lokhttp3/Response;
+
+    move-object/from16 v16, v1
+
+    iget-object v1, v5, Lokhttp3/Response;->m:Lokhttp3/Response;
+
+    move-object/from16 v18, v14
+
+    move-object/from16 v19, v15
+
+    iget-wide v14, v5, Lokhttp3/Response;->n:J
+
+    move-wide/from16 v20, v14
+
+    iget-wide v14, v5, Lokhttp3/Response;->o:J
+
+    move-wide/from16 v22, v14
+
+    iget-object v15, v5, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_2
+    iget-object v0, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v14, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v0, :cond_23
+
+    invoke-static {v14, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "Content-Type"
+
+    const/4 v14, 0x0
+
+    move-object/from16 v24, v15
+
+    const/4 v15, 0x2
+
+    invoke-static {v5, v0, v14, v15}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-object v14, v3, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v14, v5}, Lo0/g0/e/d;->g(Lokhttp3/Response;)J
+
+    move-result-wide v14
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+
+    move-object/from16 v25, v2
+
+    :try_start_3
+    iget-object v2, v3, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v2, v5}, Lo0/g0/e/d;->d(Lokhttp3/Response;)Lp0/w;
+
+    move-result-object v2
+
+    new-instance v5, Lo0/g0/d/c$b;
+
+    invoke-direct {v5, v3, v2, v14, v15}, Lo0/g0/d/c$b;-><init>(Lo0/g0/d/c;Lp0/w;J)V
+
+    new-instance v2, Lo0/g0/e/h;
+
+    invoke-static {v5, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v9, Lp0/q;
+
+    invoke-direct {v9, v5}, Lp0/q;-><init>(Lp0/w;)V
+
+    invoke-direct {v2, v0, v14, v15, v9}, Lo0/g0/e/h;-><init>(Ljava/lang/String;JLp0/g;)V
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_1
+
+    if-ltz v8, :cond_17
+
+    const/4 v0, 0x1
+
+    goto :goto_6
+
+    :cond_17
+    const/4 v0, 0x0
+
+    :goto_6
+    if-eqz v0, :cond_22
+
+    if-eqz v6, :cond_21
+
+    if-eqz v7, :cond_20
+
+    if-eqz v11, :cond_1f
+
+    invoke-virtual {v13}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v10
+
+    new-instance v0, Lokhttp3/Response;
+
+    move-object v4, v0
+
+    move-object v5, v6
+
+    move-object v6, v7
+
+    move-object v7, v11
+
+    move-object v9, v12
+
+    move-object v11, v2
+
+    move-object/from16 v12, v18
+
+    move-object/from16 v13, v19
+
+    move-wide/from16 v15, v20
+
+    move-wide/from16 v17, v22
+
+    move-object v14, v1
+
+    move-object/from16 v1, v24
+
+    move-object/from16 v19, v1
+
+    invoke-direct/range {v4 .. v19}, Lokhttp3/Response;-><init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
+
+    :goto_7
+    iget-object v0, v4, Lokhttp3/Response;->d:Lo0/a0;
+
+    const-string v1, "Connection"
+
+    invoke-virtual {v0, v1}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "close"
+
+    const/4 v5, 0x1
+
+    invoke-static {v2, v0, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-nez v0, :cond_18
+
+    const/4 v0, 0x2
+
+    const/4 v6, 0x0
+
+    invoke-static {v4, v1, v6, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v2, v0, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_19
+
+    :cond_18
+    iget-object v0, v3, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v0}, Lo0/g0/e/d;->a()Lo0/g0/d/i;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1e
+
+    invoke-virtual {v0}, Lo0/g0/d/i;->j()V
+
+    :cond_19
+    const/16 v0, 0xcc
+
+    move/from16 v8, v29
+
+    if-eq v8, v0, :cond_1a
+
+    const/16 v0, 0xcd
+
+    if-ne v8, v0, :cond_1d
+
+    :cond_1a
+    iget-object v0, v4, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v0, :cond_1b
+
+    invoke-virtual {v0}, Lokhttp3/ResponseBody;->a()J
+
+    move-result-wide v0
+
+    goto :goto_8
+
+    :cond_1b
+    const-wide/16 v0, -0x1
+
+    :goto_8
+    const-wide/16 v2, 0x0
+
+    cmp-long v5, v0, v2
+
+    if-lez v5, :cond_1d
+
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "HTTP "
+
+    const-string v2, " had non-zero Content-Length: "
+
+    invoke-static {v1, v8, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, v4, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v2, :cond_1c
+
+    invoke-virtual {v2}, Lokhttp3/ResponseBody;->a()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    goto :goto_9
+
+    :cond_1c
+    const/4 v2, 0x0
+
+    :goto_9
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1d
+    return-object v4
+
+    :cond_1e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_1f
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual/range {v17 .. v17}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_20
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v10}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_21
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_22
+    invoke-static {v4, v8}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :catch_0
+    move-exception v0
+
+    move-object/from16 v25, v2
+
+    goto :goto_a
+
+    :cond_23
+    move-object/from16 v25, v2
+
+    const/4 v0, 0x0
+
+    :try_start_4
+    throw v0
+    :try_end_4
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_1
+
+    :catch_1
+    move-exception v0
+
+    :goto_a
+    iget-object v1, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v2, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v1, :cond_24
+
+    move-object/from16 v1, v25
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v2, v16
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v0}, Lo0/g0/d/c;->g(Ljava/io/IOException;)V
+
+    throw v0
+
+    :cond_24
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_25
+    throw v4
+
+    :cond_26
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :catch_2
+    move-exception v0
+
+    move-object/from16 v30, v2
+
+    move-object v2, v1
+
+    move-object/from16 v1, v30
+
+    iget-object v4, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v5, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v4, :cond_27
+
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v0}, Lo0/g0/d/c;->g(Ljava/io/IOException;)V
+
+    throw v0
+
+    :cond_27
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_28
+    move-object/from16 v30, v2
+
+    move-object v2, v1
+
+    move-object/from16 v1, v30
+
+    :try_start_5
+    throw v4
+
+    :cond_29
+    move-object/from16 v30, v2
+
+    move-object v2, v1
+
+    move-object/from16 v1, v30
+
+    throw v4
+    :try_end_5
+    .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_3
+
+    :catch_3
+    move-exception v0
+
+    goto :goto_b
+
+    :catch_4
+    move-exception v0
+
+    move-object/from16 v30, v2
+
+    move-object v2, v1
+
+    move-object/from16 v1, v30
+
+    :goto_b
+    iget-object v4, v3, Lo0/g0/d/c;->d:Lo0/t;
+
+    iget-object v5, v3, Lo0/g0/d/c;->c:Lo0/f;
+
+    if-eqz v4, :cond_2a
+
+    invoke-static {v5, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v0}, Lo0/g0/d/c;->g(Ljava/io/IOException;)V
+
+    throw v0
+
+    :cond_2a
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/c$a.smali b/com.discord/smali_classes2/o0/g0/e/c$a.smali
new file mode 100644
index 0000000000..7a7870b227
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/c$a.smali
@@ -0,0 +1,56 @@
+.class public final Lo0/g0/e/c$a;
+.super Ljava/lang/ThreadLocal;
+.source "dates.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/e/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/ThreadLocal<",
+        "Ljava/text/DateFormat;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/ThreadLocal;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public initialValue()Ljava/lang/Object;
+    .locals 3
+
+    new-instance v0, Ljava/text/SimpleDateFormat;
+
+    sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const-string v2, "EEE, dd MMM yyyy HH:mm:ss \'GMT\'"
+
+    invoke-direct {v0, v2, v1}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;Ljava/util/Locale;)V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/text/SimpleDateFormat;->setLenient(Z)V
+
+    sget-object v1, Lo0/g0/b;->e:Ljava/util/TimeZone;
+
+    invoke-virtual {v0, v1}, Ljava/text/SimpleDateFormat;->setTimeZone(Ljava/util/TimeZone;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/c.smali b/com.discord/smali_classes2/o0/g0/e/c.smali
new file mode 100644
index 0000000000..e5312a7eae
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/c.smali
@@ -0,0 +1,93 @@
+.class public final Lo0/g0/e/c;
+.super Ljava/lang/Object;
+.source "dates.kt"
+
+
+# static fields
+.field public static final a:Lo0/g0/e/c$a;
+
+.field public static final b:[Ljava/lang/String;
+
+.field public static final c:[Ljava/text/DateFormat;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 16
+
+    new-instance v0, Lo0/g0/e/c$a;
+
+    invoke-direct {v0}, Lo0/g0/e/c$a;-><init>()V
+
+    sput-object v0, Lo0/g0/e/c;->a:Lo0/g0/e/c$a;
+
+    const-string v1, "EEE, dd MMM yyyy HH:mm:ss zzz"
+
+    const-string v2, "EEEE, dd-MMM-yy HH:mm:ss zzz"
+
+    const-string v3, "EEE MMM d HH:mm:ss yyyy"
+
+    const-string v4, "EEE, dd-MMM-yyyy HH:mm:ss z"
+
+    const-string v5, "EEE, dd-MMM-yyyy HH-mm-ss z"
+
+    const-string v6, "EEE, dd MMM yy HH:mm:ss z"
+
+    const-string v7, "EEE dd-MMM-yyyy HH:mm:ss z"
+
+    const-string v8, "EEE dd MMM yyyy HH:mm:ss z"
+
+    const-string v9, "EEE dd-MMM-yyyy HH-mm-ss z"
+
+    const-string v10, "EEE dd-MMM-yy HH:mm:ss z"
+
+    const-string v11, "EEE dd MMM yy HH:mm:ss z"
+
+    const-string v12, "EEE,dd-MMM-yy HH:mm:ss z"
+
+    const-string v13, "EEE,dd-MMM-yyyy HH:mm:ss z"
+
+    const-string v14, "EEE, dd-MM-yyyy HH:mm:ss z"
+
+    const-string v15, "EEE MMM d yyyy HH:mm:ss z"
+
+    filled-new-array/range {v1 .. v15}, [Ljava/lang/String;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/e/c;->b:[Ljava/lang/String;
+
+    array-length v0, v0
+
+    new-array v0, v0, [Ljava/text/DateFormat;
+
+    sput-object v0, Lo0/g0/e/c;->c:[Ljava/text/DateFormat;
+
+    return-void
+.end method
+
+.method public static final a(Ljava/util/Date;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "$this$toHttpDateString"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lo0/g0/e/c;->a:Lo0/g0/e/c$a;
+
+    invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/text/DateFormat;
+
+    invoke-virtual {v0, p0}, Ljava/text/DateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "STANDARD_DATE_FORMAT.get().format(this)"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/d.smali b/com.discord/smali_classes2/o0/g0/e/d.smali
new file mode 100644
index 0000000000..7c3ae63ad4
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/d.smali
@@ -0,0 +1,67 @@
+.class public interface abstract Lo0/g0/e/d;
+.super Ljava/lang/Object;
+.source "ExchangeCode.kt"
+
+
+# virtual methods
+.method public abstract a()Lo0/g0/d/i;
+.end method
+
+.method public abstract b()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract c(Lo0/a0;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract cancel()V
+.end method
+
+.method public abstract d(Lokhttp3/Response;)Lp0/w;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract e(Z)Lokhttp3/Response$a;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract f()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract g(Lokhttp3/Response;)J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract h(Lo0/a0;J)Lp0/u;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/e.smali b/com.discord/smali_classes2/o0/g0/e/e.smali
new file mode 100644
index 0000000000..b958e3c04a
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/e.smali
@@ -0,0 +1,792 @@
+.class public final Lo0/g0/e/e;
+.super Ljava/lang/Object;
+.source "HttpHeaders.kt"
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, "\"\\"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, "\t ,="
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    return-void
+.end method
+
+.method public static final a(Lokhttp3/Response;)Z
+    .locals 8
+
+    const-string v0, "$this$promisesBody"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v0, v0, Lo0/a0;->c:Ljava/lang/String;
+
+    const-string v1, "HEAD"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    iget v0, p0, Lokhttp3/Response;->g:I
+
+    const/16 v2, 0x64
+
+    const/4 v3, 0x1
+
+    if-lt v0, v2, :cond_1
+
+    const/16 v2, 0xc8
+
+    if-lt v0, v2, :cond_2
+
+    :cond_1
+    const/16 v2, 0xcc
+
+    if-eq v0, v2, :cond_2
+
+    const/16 v2, 0x130
+
+    if-eq v0, v2, :cond_2
+
+    return v3
+
+    :cond_2
+    invoke-static {p0}, Lo0/g0/b;->n(Lokhttp3/Response;)J
+
+    move-result-wide v4
+
+    const-wide/16 v6, -0x1
+
+    cmp-long v0, v4, v6
+
+    if-nez v0, :cond_4
+
+    const/4 v0, 0x0
+
+    const/4 v2, 0x2
+
+    const-string v4, "Transfer-Encoding"
+
+    invoke-static {p0, v4, v0, v2}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "chunked"
+
+    invoke-static {v0, p0, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    return v1
+
+    :cond_4
+    :goto_0
+    return v3
+.end method
+
+.method public static final b(Lo0/p;Lo0/w;Lokhttp3/Headers;)V
+    .locals 37
+
+    move-object/from16 v1, p0
+
+    move-object/from16 v2, p1
+
+    move-object/from16 v0, p2
+
+    const-string v3, "$this$receiveHeaders"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "url"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "headers"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v5, Lo0/p;->a:Lo0/p;
+
+    if-ne v1, v5, :cond_0
+
+    return-void
+
+    :cond_0
+    sget-object v5, Lo0/n;->n:Lo0/n$a;
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "Set-Cookie"
+
+    const-string v6, "name"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p2 .. p2}, Lokhttp3/Headers;->size()I
+
+    move-result v6
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    :goto_0
+    const/4 v11, 0x2
+
+    const/4 v12, 0x1
+
+    if-ge v9, v6, :cond_3
+
+    invoke-virtual {v0, v9}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
+
+    move-result-object v13
+
+    invoke-static {v4, v13, v12}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_2
+
+    if-nez v10, :cond_1
+
+    new-instance v10, Ljava/util/ArrayList;
+
+    invoke-direct {v10, v11}, Ljava/util/ArrayList;-><init>(I)V
+
+    :cond_1
+    invoke-virtual {v0, v9}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-interface {v10, v11}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_2
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    if-eqz v10, :cond_4
+
+    invoke-static {v10}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object v0
+
+    const-string v4, "Collections.unmodifiableList(result)"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_4
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
+
+    :goto_1
+    move-object v4, v0
+
+    invoke-interface {v4}, Ljava/util/List;->size()I
+
+    move-result v6
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    :goto_2
+    if-ge v9, v6, :cond_22
+
+    invoke-interface {v4, v9}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v13, v0
+
+    check-cast v13, Ljava/lang/String;
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "setCookie"
+
+    invoke-static {v13, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v14
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v13, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v7, 0x3b
+
+    const/4 v11, 0x6
+
+    invoke-static {v13, v7, v8, v8, v11}, Lo0/g0/b;->j(Ljava/lang/String;CIII)I
+
+    move-result v0
+
+    const/16 v11, 0x3d
+
+    invoke-static {v13, v11, v8, v0}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result v12
+
+    if-ne v12, v0, :cond_6
+
+    :cond_5
+    :goto_3
+    move-object/from16 v36, v3
+
+    const/4 v8, 0x2
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x1
+
+    goto/16 :goto_10
+
+    :cond_6
+    invoke-static {v13, v8, v12}, Lo0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
+
+    move-result-object v17
+
+    invoke-virtual/range {v17 .. v17}, Ljava/lang/String;->length()I
+
+    move-result v16
+
+    if-nez v16, :cond_7
+
+    const/16 v16, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    const/16 v16, 0x0
+
+    :goto_4
+    if-nez v16, :cond_5
+
+    invoke-static/range {v17 .. v17}, Lo0/g0/b;->q(Ljava/lang/String;)I
+
+    move-result v8
+
+    const/4 v11, -0x1
+
+    if-eq v8, v11, :cond_8
+
+    goto :goto_3
+
+    :cond_8
+    add-int/lit8 v12, v12, 0x1
+
+    invoke-static {v13, v12, v0}, Lo0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
+
+    move-result-object v18
+
+    invoke-static/range {v18 .. v18}, Lo0/g0/b;->q(Ljava/lang/String;)I
+
+    move-result v8
+
+    if-eq v8, v11, :cond_9
+
+    goto :goto_3
+
+    :cond_9
+    add-int/lit8 v0, v0, 0x1
+
+    invoke-virtual {v13}, Ljava/lang/String;->length()I
+
+    move-result v8
+
+    const-wide/16 v19, -0x1
+
+    move-wide/from16 v21, v19
+
+    const/16 v23, 0x0
+
+    const/16 v24, 0x0
+
+    const/16 v25, 0x0
+
+    const/16 v26, 0x1
+
+    const-wide v28, 0xe677d21fdbffL
+
+    const/16 v30, 0x0
+
+    const/16 v31, 0x0
+
+    :goto_5
+    const-wide v32, 0x7fffffffffffffffL
+
+    const-wide/high16 v34, -0x8000000000000000L
+
+    if-ge v0, v8, :cond_14
+
+    invoke-static {v13, v7, v0, v8}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result v11
+
+    const/16 v12, 0x3d
+
+    invoke-static {v13, v12, v0, v11}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result v7
+
+    invoke-static {v13, v0, v7}, Lo0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-ge v7, v11, :cond_a
+
+    add-int/lit8 v7, v7, 0x1
+
+    invoke-static {v13, v7, v11}, Lo0/g0/b;->H(Ljava/lang/String;II)Ljava/lang/String;
+
+    move-result-object v7
+
+    goto :goto_6
+
+    :cond_a
+    const-string v7, ""
+
+    :goto_6
+    const-string v12, "expires"
+
+    move-object/from16 v36, v3
+
+    const/4 v3, 0x1
+
+    invoke-static {v0, v12, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_b
+
+    :try_start_0
+    invoke-virtual {v7}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    const/4 v12, 0x0
+
+    invoke-virtual {v5, v7, v12, v0}, Lo0/n$a;->d(Ljava/lang/String;II)J
+
+    move-result-wide v28
+    :try_end_0
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
+
+    goto :goto_8
+
+    :cond_b
+    const-string v12, "max-age"
+
+    invoke-static {v0, v12, v3}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_f
+
+    :try_start_1
+    invoke-static {v7}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+    move-result-wide v21
+    :try_end_1
+    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0
+
+    const-wide/16 v32, 0x0
+
+    cmp-long v0, v21, v32
+
+    if-gtz v0, :cond_c
+
+    goto :goto_7
+
+    :cond_c
+    move-wide/from16 v34, v21
+
+    :goto_7
+    move-wide/from16 v21, v34
+
+    goto :goto_8
+
+    :catch_0
+    move-exception v0
+
+    move-object v3, v0
+
+    :try_start_2
+    new-instance v0, Lkotlin/text/Regex;
+
+    const-string v12, "-?\\d+"
+
+    invoke-direct {v0, v12}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, v7}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_e
+
+    const-string v0, "-"
+
+    const/4 v3, 0x2
+
+    const/4 v12, 0x0
+
+    invoke-static {v7, v0, v12, v3}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_d
+
+    move-wide/from16 v32, v34
+
+    :cond_d
+    move-wide/from16 v21, v32
+
+    :goto_8
+    const/4 v12, 0x1
+
+    const/16 v25, 0x1
+
+    goto :goto_9
+
+    :cond_e
+    throw v3
+    :try_end_2
+    .catch Ljava/lang/NumberFormatException; {:try_start_2 .. :try_end_2} :catch_1
+
+    :catch_1
+    const/4 v12, 0x1
+
+    goto :goto_9
+
+    :cond_f
+    const-string v3, "domain"
+
+    const/4 v12, 0x1
+
+    invoke-static {v0, v3, v12}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_10
+
+    :try_start_3
+    invoke-virtual {v5, v7}, Lo0/n$a;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v30
+    :try_end_3
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_3 .. :try_end_3} :catch_2
+
+    const/16 v26, 0x0
+
+    goto :goto_9
+
+    :cond_10
+    const-string v3, "path"
+
+    invoke-static {v0, v3, v12}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_11
+
+    move-object/from16 v31, v7
+
+    goto :goto_9
+
+    :cond_11
+    const-string v3, "secure"
+
+    invoke-static {v0, v3, v12}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_12
+
+    const/16 v23, 0x1
+
+    goto :goto_9
+
+    :cond_12
+    const-string v3, "httponly"
+
+    invoke-static {v0, v3, v12}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_13
+
+    const/16 v24, 0x1
+
+    :catch_2
+    :cond_13
+    :goto_9
+    add-int/lit8 v0, v11, 0x1
+
+    move-object/from16 v3, v36
+
+    const/16 v7, 0x3b
+
+    goto/16 :goto_5
+
+    :cond_14
+    move-object/from16 v36, v3
+
+    const/4 v12, 0x1
+
+    cmp-long v0, v21, v34
+
+    if-nez v0, :cond_15
+
+    move-wide/from16 v19, v34
+
+    goto :goto_b
+
+    :cond_15
+    cmp-long v0, v21, v19
+
+    if-eqz v0, :cond_19
+
+    const-wide v7, 0x20c49ba5e353f7L
+
+    cmp-long v0, v21, v7
+
+    if-gtz v0, :cond_16
+
+    const/16 v0, 0x3e8
+
+    int-to-long v7, v0
+
+    mul-long v32, v21, v7
+
+    :cond_16
+    add-long v32, v14, v32
+
+    cmp-long v0, v32, v14
+
+    const-wide v7, 0xe677d21fdbffL
+
+    if-ltz v0, :cond_18
+
+    cmp-long v0, v32, v7
+
+    if-lez v0, :cond_17
+
+    goto :goto_a
+
+    :cond_17
+    move-wide/from16 v19, v32
+
+    goto :goto_b
+
+    :cond_18
+    :goto_a
+    move-wide/from16 v19, v7
+
+    goto :goto_b
+
+    :cond_19
+    move-wide/from16 v19, v28
+
+    :goto_b
+    iget-object v0, v2, Lo0/w;->e:Ljava/lang/String;
+
+    move-object/from16 v3, v30
+
+    if-nez v3, :cond_1a
+
+    move-object v3, v0
+
+    goto :goto_c
+
+    :cond_1a
+    invoke-virtual {v5, v0, v3}, Lo0/n$a;->b(Ljava/lang/String;Ljava/lang/String;)Z
+
+    move-result v7
+
+    if-nez v7, :cond_1b
+
+    goto :goto_d
+
+    :cond_1b
+    :goto_c
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-virtual {v3}, Ljava/lang/String;->length()I
+
+    move-result v7
+
+    if-eq v0, v7, :cond_1c
+
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->h:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;
+
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->g:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+
+    invoke-virtual {v0, v3}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1c
+
+    :goto_d
+    const/4 v8, 0x2
+
+    const/4 v11, 0x0
+
+    goto :goto_10
+
+    :cond_1c
+    const-string v0, "/"
+
+    move-object/from16 v7, v31
+
+    const/4 v8, 0x2
+
+    const/4 v11, 0x0
+
+    if-eqz v7, :cond_1e
+
+    invoke-static {v7, v0, v11, v8}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v13
+
+    if-nez v13, :cond_1d
+
+    goto :goto_e
+
+    :cond_1d
+    move-object/from16 v22, v7
+
+    goto :goto_f
+
+    :cond_1e
+    :goto_e
+    invoke-virtual/range {p1 .. p1}, Lo0/w;->b()Ljava/lang/String;
+
+    move-result-object v7
+
+    const/16 v13, 0x2f
+
+    const/4 v14, 0x6
+
+    invoke-static {v7, v13, v11, v11, v14}, Lk0/u/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v13
+
+    if-eqz v13, :cond_1f
+
+    invoke-virtual {v7, v11, v13}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v7, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_1f
+    move-object/from16 v22, v0
+
+    :goto_f
+    new-instance v0, Lo0/n;
+
+    const/16 v27, 0x0
+
+    move-object/from16 v16, v0
+
+    move-object/from16 v21, v3
+
+    invoke-direct/range {v16 .. v27}, Lo0/n;-><init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    goto :goto_11
+
+    :goto_10
+    const/4 v0, 0x0
+
+    :goto_11
+    if-eqz v0, :cond_21
+
+    if-nez v10, :cond_20
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
+
+    move-object v10, v3
+
+    :cond_20
+    invoke-interface {v10, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_21
+    add-int/lit8 v9, v9, 0x1
+
+    move-object/from16 v3, v36
+
+    const/4 v8, 0x0
+
+    const/4 v11, 0x2
+
+    goto/16 :goto_2
+
+    :cond_22
+    if-eqz v10, :cond_23
+
+    invoke-static {v10}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object v0
+
+    const-string v3, "Collections.unmodifiableList(cookies)"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_12
+
+    :cond_23
+    sget-object v0, Lk0/j/n;->d:Lk0/j/n;
+
+    :goto_12
+    invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_24
+
+    return-void
+
+    :cond_24
+    invoke-interface {v1, v2, v0}, Lo0/p;->a(Lo0/w;Ljava/util/List;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/f.smali b/com.discord/smali_classes2/o0/g0/e/f.smali
new file mode 100644
index 0000000000..c5ecf5183c
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/f.smali
@@ -0,0 +1,39 @@
+.class public final Lo0/g0/e/f;
+.super Ljava/lang/Object;
+.source "HttpMethod.kt"
+
+
+# direct methods
+.method public static final a(Ljava/lang/String;)Z
+    .locals 1
+
+    const-string v0, "method"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "GET"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-string v0, "HEAD"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/g.smali b/com.discord/smali_classes2/o0/g0/e/g.smali
new file mode 100644
index 0000000000..d185bc6846
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/g.smali
@@ -0,0 +1,517 @@
+.class public final Lo0/g0/e/g;
+.super Ljava/lang/Object;
+.source "RealInterceptorChain.kt"
+
+# interfaces
+.implements Lokhttp3/Interceptor$Chain;
+
+
+# instance fields
+.field public a:I
+
+.field public final b:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lokhttp3/Interceptor;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Lo0/g0/d/m;
+
+.field public final d:Lo0/g0/d/c;
+
+.field public final e:I
+
+.field public final f:Lo0/a0;
+
+.field public final g:Lo0/f;
+
+.field public final h:I
+
+.field public final i:I
+
+.field public final j:I
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;Lo0/g0/d/m;Lo0/g0/d/c;ILo0/a0;Lo0/f;III)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lokhttp3/Interceptor;",
+            ">;",
+            "Lo0/g0/d/m;",
+            "Lo0/g0/d/c;",
+            "I",
+            "Lo0/a0;",
+            "Lo0/f;",
+            "III)V"
+        }
+    .end annotation
+
+    const-string v0, "interceptors"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "transmitter"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "request"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "call"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/e/g;->b:Ljava/util/List;
+
+    iput-object p2, p0, Lo0/g0/e/g;->c:Lo0/g0/d/m;
+
+    iput-object p3, p0, Lo0/g0/e/g;->d:Lo0/g0/d/c;
+
+    iput p4, p0, Lo0/g0/e/g;->e:I
+
+    iput-object p5, p0, Lo0/g0/e/g;->f:Lo0/a0;
+
+    iput-object p6, p0, Lo0/g0/e/g;->g:Lo0/f;
+
+    iput p7, p0, Lo0/g0/e/g;->h:I
+
+    iput p8, p0, Lo0/g0/e/g;->i:I
+
+    iput p9, p0, Lo0/g0/e/g;->j:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lo0/k;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/e/g;->d:Lo0/g0/d/c;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lo0/g0/d/c;->b()Lo0/g0/d/i;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public b()I
+    .locals 1
+
+    iget v0, p0, Lo0/g0/e/g;->i:I
+
+    return v0
+.end method
+
+.method public c()I
+    .locals 1
+
+    iget v0, p0, Lo0/g0/e/g;->j:I
+
+    return v0
+.end method
+
+.method public d(Lo0/a0;)Lokhttp3/Response;
+    .locals 2
+
+    const-string v0, "request"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/e/g;->c:Lo0/g0/d/m;
+
+    iget-object v1, p0, Lo0/g0/e/g;->d:Lo0/g0/d/c;
+
+    invoke-virtual {p0, p1, v0, v1}, Lo0/g0/e/g;->f(Lo0/a0;Lo0/g0/d/m;Lo0/g0/d/c;)Lokhttp3/Response;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public e()I
+    .locals 1
+
+    iget v0, p0, Lo0/g0/e/g;->h:I
+
+    return v0
+.end method
+
+.method public final f(Lo0/a0;Lo0/g0/d/m;Lo0/g0/d/c;)Lokhttp3/Response;
+    .locals 15
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object v0, p0
+
+    move-object/from16 v6, p1
+
+    const-string v1, "request"
+
+    invoke-static {v6, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "transmitter"
+
+    move-object/from16 v3, p2
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v1, v0, Lo0/g0/e/g;->e:I
+
+    iget-object v2, v0, Lo0/g0/e/g;->b:Ljava/util/List;
+
+    invoke-interface {v2}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    if-ge v1, v2, :cond_d
+
+    iget v1, v0, Lo0/g0/e/g;->a:I
+
+    const/4 v11, 0x1
+
+    add-int/2addr v1, v11
+
+    iput v1, v0, Lo0/g0/e/g;->a:I
+
+    iget-object v1, v0, Lo0/g0/e/g;->d:Lo0/g0/d/c;
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Lo0/g0/d/c;->b()Lo0/g0/d/i;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v2, v6, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v1, v2}, Lo0/g0/d/i;->m(Lo0/w;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v1, 0x0
+
+    throw v1
+
+    :cond_2
+    :goto_0
+    const/4 v1, 0x1
+
+    :goto_1
+    const-string v12, "network interceptor "
+
+    if-eqz v1, :cond_c
+
+    iget-object v1, v0, Lo0/g0/e/g;->d:Lo0/g0/d/c;
+
+    if-eqz v1, :cond_4
+
+    iget v1, v0, Lo0/g0/e/g;->a:I
+
+    if-gt v1, v11, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v1, 0x0
+
+    goto :goto_3
+
+    :cond_4
+    :goto_2
+    const/4 v1, 0x1
+
+    :goto_3
+    const-string v13, " must call proceed() exactly once"
+
+    if-eqz v1, :cond_b
+
+    new-instance v14, Lo0/g0/e/g;
+
+    iget-object v2, v0, Lo0/g0/e/g;->b:Ljava/util/List;
+
+    iget v1, v0, Lo0/g0/e/g;->e:I
+
+    add-int/lit8 v5, v1, 0x1
+
+    iget-object v7, v0, Lo0/g0/e/g;->g:Lo0/f;
+
+    iget v8, v0, Lo0/g0/e/g;->h:I
+
+    iget v9, v0, Lo0/g0/e/g;->i:I
+
+    iget v10, v0, Lo0/g0/e/g;->j:I
+
+    move-object v1, v14
+
+    move-object/from16 v3, p2
+
+    move-object/from16 v4, p3
+
+    move-object/from16 v6, p1
+
+    invoke-direct/range {v1 .. v10}, Lo0/g0/e/g;-><init>(Ljava/util/List;Lo0/g0/d/m;Lo0/g0/d/c;ILo0/a0;Lo0/f;III)V
+
+    iget-object v1, v0, Lo0/g0/e/g;->b:Ljava/util/List;
+
+    iget v2, v0, Lo0/g0/e/g;->e:I
+
+    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lokhttp3/Interceptor;
+
+    invoke-interface {v1, v14}, Lokhttp3/Interceptor;->intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+
+    move-result-object v2
+
+    const-string v3, "interceptor "
+
+    if-eqz v2, :cond_a
+
+    if-eqz p3, :cond_6
+
+    iget v4, v0, Lo0/g0/e/g;->e:I
+
+    add-int/2addr v4, v11
+
+    iget-object v5, v0, Lo0/g0/e/g;->b:Ljava/util/List;
+
+    invoke-interface {v5}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    if-ge v4, v5, :cond_6
+
+    iget v4, v14, Lo0/g0/e/g;->a:I
+
+    if-ne v4, v11, :cond_5
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v4, 0x0
+
+    goto :goto_5
+
+    :cond_6
+    :goto_4
+    const/4 v4, 0x1
+
+    :goto_5
+    if-eqz v4, :cond_9
+
+    iget-object v4, v2, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v4, :cond_7
+
+    goto :goto_6
+
+    :cond_7
+    const/4 v11, 0x0
+
+    :goto_6
+    if-eqz v11, :cond_8
+
+    return-object v2
+
+    :cond_8
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, " returned a response with no body"
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_9
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_a
+    new-instance v2, Ljava/lang/NullPointerException;
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, " returned null"
+
+    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_b
+    invoke-static {v12}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, v0, Lo0/g0/e/g;->b:Ljava/util/List;
+
+    iget v3, v0, Lo0/g0/e/g;->e:I
+
+    sub-int/2addr v3, v11
+
+    invoke-interface {v2, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lokhttp3/Interceptor;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_c
+    invoke-static {v12}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, v0, Lo0/g0/e/g;->b:Ljava/util/List;
+
+    iget v3, v0, Lo0/g0/e/g;->e:I
+
+    sub-int/2addr v3, v11
+
+    invoke-interface {v2, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lokhttp3/Interceptor;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v2, " must retain the same host and port"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_d
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v1
+.end method
+
+.method public p()Lo0/a0;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/e/g;->f:Lo0/a0;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/h.smali b/com.discord/smali_classes2/o0/g0/e/h.smali
new file mode 100644
index 0000000000..0d67d39fb1
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/h.smali
@@ -0,0 +1,71 @@
+.class public final Lo0/g0/e/h;
+.super Lokhttp3/ResponseBody;
+.source "RealResponseBody.kt"
+
+
+# instance fields
+.field public final f:Ljava/lang/String;
+
+.field public final g:J
+
+.field public final h:Lp0/g;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;JLp0/g;)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/e/h;->f:Ljava/lang/String;
+
+    iput-wide p2, p0, Lo0/g0/e/h;->g:J
+
+    iput-object p4, p0, Lo0/g0/e/h;->h:Lp0/g;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()J
+    .locals 2
+
+    iget-wide v0, p0, Lo0/g0/e/h;->g:J
+
+    return-wide v0
+.end method
+
+.method public b()Lokhttp3/MediaType;
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/e/h;->f:Ljava/lang/String;
+
+    if-eqz v0, :cond_0
+
+    sget-object v1, Lokhttp3/MediaType;->g:Lokhttp3/MediaType$a;
+
+    invoke-static {v0}, Lokhttp3/MediaType$a;->b(Ljava/lang/String;)Lokhttp3/MediaType;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public c()Lp0/g;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/e/h;->h:Lp0/g;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/i.smali b/com.discord/smali_classes2/o0/g0/e/i.smali
new file mode 100644
index 0000000000..0105cb5fe1
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/i.smali
@@ -0,0 +1,1456 @@
+.class public final Lo0/g0/e/i;
+.super Ljava/lang/Object;
+.source "RetryAndFollowUpInterceptor.kt"
+
+# interfaces
+.implements Lokhttp3/Interceptor;
+
+
+# instance fields
+.field public final b:Lo0/x;
+
+
+# direct methods
+.method public constructor <init>(Lo0/x;)V
+    .locals 1
+
+    const-string v0, "client"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/e/i;->b:Lo0/x;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lokhttp3/Response;Ljava/lang/String;)Lo0/a0;
+    .locals 6
+
+    iget-object v0, p0, Lo0/g0/e/i;->b:Lo0/x;
+
+    iget-boolean v0, v0, Lo0/x;->k:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return-object v1
+
+    :cond_0
+    const/4 v0, 0x2
+
+    const-string v2, "Location"
+
+    invoke-static {p1, v2, v1, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_a
+
+    iget-object v2, p1, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v2, v2, Lo0/a0;->b:Lo0/w;
+
+    if-eqz v2, :cond_9
+
+    const-string v3, "link"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2, v0}, Lo0/w;->g(Ljava/lang/String;)Lo0/w$a;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lo0/w$a;->b()Lo0/w;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_1
+    move-object v0, v1
+
+    :goto_0
+    if-eqz v0, :cond_8
+
+    iget-object v2, v0, Lo0/w;->b:Ljava/lang/String;
+
+    iget-object v3, p1, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v3, v3, Lo0/a0;->b:Lo0/w;
+
+    iget-object v3, v3, Lo0/w;->b:Ljava/lang/String;
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    iget-object v2, p0, Lo0/g0/e/i;->b:Lo0/x;
+
+    iget-boolean v2, v2, Lo0/x;->l:Z
+
+    if-nez v2, :cond_2
+
+    return-object v1
+
+    :cond_2
+    iget-object v2, p1, Lokhttp3/Response;->d:Lo0/a0;
+
+    if-eqz v2, :cond_7
+
+    new-instance v3, Lo0/a0$a;
+
+    invoke-direct {v3, v2}, Lo0/a0$a;-><init>(Lo0/a0;)V
+
+    invoke-static {p2}, Lo0/g0/e/f;->a(Ljava/lang/String;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_5
+
+    const-string v2, "method"
+
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "PROPFIND"
+
+    invoke-static {p2, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_3
+
+    const-string p2, "GET"
+
+    invoke-virtual {v3, p2, v1}, Lo0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
+
+    goto :goto_1
+
+    :cond_3
+    if-eqz v5, :cond_4
+
+    iget-object v1, p1, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v1, v1, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    :cond_4
+    invoke-virtual {v3, p2, v1}, Lo0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
+
+    :goto_1
+    if-nez v5, :cond_5
+
+    const-string p2, "Transfer-Encoding"
+
+    invoke-virtual {v3, p2}, Lo0/a0$a;->e(Ljava/lang/String;)Lo0/a0$a;
+
+    const-string p2, "Content-Length"
+
+    invoke-virtual {v3, p2}, Lo0/a0$a;->e(Ljava/lang/String;)Lo0/a0$a;
+
+    const-string p2, "Content-Type"
+
+    invoke-virtual {v3, p2}, Lo0/a0$a;->e(Ljava/lang/String;)Lo0/a0$a;
+
+    :cond_5
+    iget-object p1, p1, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object p1, p1, Lo0/a0;->b:Lo0/w;
+
+    invoke-static {p1, v0}, Lo0/g0/b;->c(Lo0/w;Lo0/w;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_6
+
+    const-string p1, "Authorization"
+
+    invoke-virtual {v3, p1}, Lo0/a0$a;->e(Ljava/lang/String;)Lo0/a0$a;
+
+    :cond_6
+    invoke-virtual {v3, v0}, Lo0/a0$a;->g(Lo0/w;)Lo0/a0$a;
+
+    invoke-virtual {v3}, Lo0/a0$a;->b()Lo0/a0;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_7
+    throw v1
+
+    :cond_8
+    return-object v1
+
+    :cond_9
+    throw v1
+
+    :cond_a
+    return-object v1
+.end method
+
+.method public final b(Ljava/io/IOException;Lo0/g0/d/m;ZLo0/a0;)Z
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/e/i;->b:Lo0/x;
+
+    iget-boolean v0, v0, Lo0/x;->i:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    const/4 v0, 0x1
+
+    if-eqz p3, :cond_4
+
+    iget-object p4, p4, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    if-eqz p4, :cond_1
+
+    invoke-virtual {p4}, Lokhttp3/RequestBody;->isOneShot()Z
+
+    move-result p4
+
+    if-nez p4, :cond_2
+
+    :cond_1
+    instance-of p4, p1, Ljava/io/FileNotFoundException;
+
+    if-eqz p4, :cond_3
+
+    :cond_2
+    const/4 p4, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 p4, 0x0
+
+    :goto_0
+    if-eqz p4, :cond_4
+
+    return v1
+
+    :cond_4
+    instance-of p4, p1, Ljava/net/ProtocolException;
+
+    if-eqz p4, :cond_5
+
+    goto :goto_1
+
+    :cond_5
+    instance-of p4, p1, Ljava/io/InterruptedIOException;
+
+    if-eqz p4, :cond_6
+
+    instance-of p1, p1, Ljava/net/SocketTimeoutException;
+
+    if-eqz p1, :cond_8
+
+    if-nez p3, :cond_8
+
+    goto :goto_2
+
+    :cond_6
+    instance-of p3, p1, Ljavax/net/ssl/SSLHandshakeException;
+
+    if-eqz p3, :cond_7
+
+    invoke-virtual {p1}, Ljava/io/IOException;->getCause()Ljava/lang/Throwable;
+
+    move-result-object p3
+
+    instance-of p3, p3, Ljava/security/cert/CertificateException;
+
+    if-eqz p3, :cond_7
+
+    goto :goto_1
+
+    :cond_7
+    instance-of p1, p1, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    if-eqz p1, :cond_9
+
+    :cond_8
+    :goto_1
+    const/4 p1, 0x0
+
+    goto :goto_3
+
+    :cond_9
+    :goto_2
+    const/4 p1, 0x1
+
+    :goto_3
+    if-nez p1, :cond_a
+
+    return v1
+
+    :cond_a
+    iget-object p1, p2, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    const/4 p3, 0x0
+
+    if-eqz p1, :cond_e
+
+    iget-object p4, p1, Lo0/g0/d/d;->g:Lo0/g0/d/j;
+
+    monitor-enter p4
+
+    :try_start_0
+    iget-boolean p1, p1, Lo0/g0/d/d;->d:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p4
+
+    if-eqz p1, :cond_c
+
+    iget-object p1, p2, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    if-eqz p1, :cond_b
+
+    invoke-virtual {p1}, Lo0/g0/d/d;->c()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_c
+
+    const/4 p1, 0x1
+
+    goto :goto_4
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw p3
+
+    :cond_c
+    const/4 p1, 0x0
+
+    :goto_4
+    if-nez p1, :cond_d
+
+    return v1
+
+    :cond_d
+    return v0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p4
+
+    throw p1
+
+    :cond_e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw p3
+.end method
+
+.method public final c(Lokhttp3/Response;I)I
+    .locals 3
+
+    const-string v0, "Retry-After"
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    new-instance p2, Lkotlin/text/Regex;
+
+    const-string v0, "\\d+"
+
+    invoke-direct {p2, v0}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p2, p1}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_0
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(Ljava/lang/String;)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    const-string p2, "Integer.valueOf(header)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    return p1
+
+    :cond_0
+    const p1, 0x7fffffff
+
+    return p1
+
+    :cond_1
+    return p2
+.end method
+
+.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+    .locals 45
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v1, p0
+
+    move-object/from16 v0, p1
+
+    const-string v2, "chain"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
+
+    move-result-object v2
+
+    move-object v3, v0
+
+    check-cast v3, Lo0/g0/e/g;
+
+    iget-object v10, v3, Lo0/g0/e/g;->c:Lo0/g0/d/m;
+
+    const/4 v0, 0x0
+
+    const/4 v4, 0x0
+
+    move-object v11, v2
+
+    const/4 v12, 0x0
+
+    move-object v2, v0
+
+    :goto_0
+    if-eqz v10, :cond_2e
+
+    const-string v4, "request"
+
+    invoke-static {v11, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v4, v10, Lo0/g0/d/m;->e:Lo0/a0;
+
+    const/4 v5, 0x1
+
+    if-eqz v4, :cond_4
+
+    iget-object v4, v4, Lo0/a0;->b:Lo0/w;
+
+    iget-object v6, v11, Lo0/a0;->b:Lo0/w;
+
+    invoke-static {v4, v6}, Lo0/g0/b;->c(Lo0/w;Lo0/w;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    iget-object v4, v10, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    if-eqz v4, :cond_0
+
+    invoke-virtual {v4}, Lo0/g0/d/d;->c()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    move/from16 p1, v12
+
+    goto/16 :goto_4
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_1
+    iget-object v4, v10, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+
+    if-nez v4, :cond_2
+
+    const/4 v4, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v4, 0x0
+
+    :goto_1
+    if-eqz v4, :cond_3
+
+    iget-object v4, v10, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    if-eqz v4, :cond_4
+
+    invoke-virtual {v10, v0, v5}, Lo0/g0/d/m;->g(Ljava/io/IOException;Z)Ljava/io/IOException;
+
+    iput-object v0, v10, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    goto :goto_2
+
+    :cond_3
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v2, "Check failed."
+
+    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    :goto_2
+    iput-object v11, v10, Lo0/g0/d/m;->e:Lo0/a0;
+
+    new-instance v13, Lo0/g0/d/d;
+
+    iget-object v6, v10, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    iget-object v4, v11, Lo0/a0;->b:Lo0/w;
+
+    iget-boolean v5, v4, Lo0/w;->a:Z
+
+    if-eqz v5, :cond_6
+
+    iget-object v0, v10, Lo0/g0/d/m;->n:Lo0/x;
+
+    iget-object v5, v0, Lo0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
+
+    if-eqz v5, :cond_5
+
+    iget-object v7, v0, Lo0/x;->x:Ljavax/net/ssl/HostnameVerifier;
+
+    iget-object v0, v0, Lo0/x;->y:Lo0/h;
+
+    move-object/from16 v21, v0
+
+    move-object/from16 v19, v5
+
+    move-object/from16 v20, v7
+
+    goto :goto_3
+
+    :cond_5
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v2, "CLEARTEXT-only client"
+
+    invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_6
+    move-object/from16 v19, v0
+
+    move-object/from16 v20, v19
+
+    move-object/from16 v21, v20
+
+    :goto_3
+    new-instance v7, Lo0/a;
+
+    iget-object v15, v4, Lo0/w;->e:Ljava/lang/String;
+
+    iget v0, v4, Lo0/w;->f:I
+
+    iget-object v4, v10, Lo0/g0/d/m;->n:Lo0/x;
+
+    iget-object v5, v4, Lo0/x;->o:Lo0/s;
+
+    iget-object v8, v4, Lo0/x;->s:Ljavax/net/SocketFactory;
+
+    iget-object v9, v4, Lo0/x;->r:Lo0/c;
+
+    iget-object v14, v4, Lo0/x;->p:Ljava/net/Proxy;
+
+    move/from16 p1, v12
+
+    iget-object v12, v4, Lo0/x;->w:Ljava/util/List;
+
+    iget-object v1, v4, Lo0/x;->v:Ljava/util/List;
+
+    iget-object v4, v4, Lo0/x;->q:Ljava/net/ProxySelector;
+
+    move-object/from16 v23, v14
+
+    move-object v14, v7
+
+    move/from16 v16, v0
+
+    move-object/from16 v17, v5
+
+    move-object/from16 v18, v8
+
+    move-object/from16 v22, v9
+
+    move-object/from16 v24, v12
+
+    move-object/from16 v25, v1
+
+    move-object/from16 v26, v4
+
+    invoke-direct/range {v14 .. v26}, Lo0/a;-><init>(Ljava/lang/String;ILo0/s;Ljavax/net/SocketFactory;Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/HostnameVerifier;Lo0/h;Lo0/c;Ljava/net/Proxy;Ljava/util/List;Ljava/util/List;Ljava/net/ProxySelector;)V
+
+    iget-object v8, v10, Lo0/g0/d/m;->o:Lo0/f;
+
+    iget-object v9, v10, Lo0/g0/d/m;->b:Lo0/t;
+
+    move-object v4, v13
+
+    move-object v5, v10
+
+    invoke-direct/range {v4 .. v9}, Lo0/g0/d/d;-><init>(Lo0/g0/d/m;Lo0/g0/d/j;Lo0/a;Lo0/f;Lo0/t;)V
+
+    iput-object v13, v10, Lo0/g0/d/m;->f:Lo0/g0/d/d;
+
+    :goto_4
+    invoke-virtual {v10}, Lo0/g0/d/m;->f()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2d
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-virtual {v3, v11, v10, v0}, Lo0/g0/e/g;->f(Lo0/a0;Lo0/g0/d/m;Lo0/g0/d/c;)Lokhttp3/Response;
+
+    move-result-object v0
+    :try_end_0
+    .catch Lokhttp3/internal/connection/RouteException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-eqz v2, :cond_13
+
+    const-string v1, "response"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v12, v0, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v13, v0, Lokhttp3/Response;->e:Lo0/y;
+
+    iget v15, v0, Lokhttp3/Response;->g:I
+
+    iget-object v14, v0, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    iget-object v1, v0, Lokhttp3/Response;->h:Lo0/v;
+
+    iget-object v4, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v4}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v4
+
+    iget-object v5, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    iget-object v6, v0, Lokhttp3/Response;->k:Lokhttp3/Response;
+
+    iget-object v7, v0, Lokhttp3/Response;->l:Lokhttp3/Response;
+
+    iget-wide v8, v0, Lokhttp3/Response;->n:J
+
+    move-wide/from16 v22, v8
+
+    iget-wide v8, v0, Lokhttp3/Response;->o:J
+
+    iget-object v0, v0, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    const-string v11, "response"
+
+    invoke-static {v2, v11}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v11, v2, Lokhttp3/Response;->d:Lo0/a0;
+
+    move-object/from16 v40, v3
+
+    iget-object v3, v2, Lokhttp3/Response;->e:Lo0/y;
+
+    move-object/from16 v41, v10
+
+    iget v10, v2, Lokhttp3/Response;->g:I
+
+    move-object/from16 v42, v0
+
+    iget-object v0, v2, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    move-wide/from16 v43, v8
+
+    iget-object v8, v2, Lokhttp3/Response;->h:Lo0/v;
+
+    iget-object v9, v2, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v9}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v9
+
+    move-object/from16 v20, v7
+
+    iget-object v7, v2, Lokhttp3/Response;->k:Lokhttp3/Response;
+
+    move-object/from16 v19, v6
+
+    iget-object v6, v2, Lokhttp3/Response;->l:Lokhttp3/Response;
+
+    move-object/from16 v18, v5
+
+    iget-object v5, v2, Lokhttp3/Response;->m:Lokhttp3/Response;
+
+    move-object/from16 v16, v13
+
+    move-object/from16 v17, v14
+
+    iget-wide v13, v2, Lokhttp3/Response;->n:J
+
+    move-object/from16 v21, v12
+
+    move-wide/from16 v35, v13
+
+    iget-wide v12, v2, Lokhttp3/Response;->o:J
+
+    iget-object v2, v2, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    const/16 v31, 0x0
+
+    if-ltz v10, :cond_7
+
+    const/4 v14, 0x1
+
+    goto :goto_5
+
+    :cond_7
+    const/4 v14, 0x0
+
+    :goto_5
+    if-eqz v14, :cond_12
+
+    if-eqz v11, :cond_11
+
+    if-eqz v3, :cond_10
+
+    if-eqz v0, :cond_f
+
+    invoke-virtual {v9}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v30
+
+    new-instance v9, Lokhttp3/Response;
+
+    move-object/from16 v24, v9
+
+    move-object/from16 v25, v11
+
+    move-object/from16 v26, v3
+
+    move-object/from16 v27, v0
+
+    move/from16 v28, v10
+
+    move-object/from16 v29, v8
+
+    move-object/from16 v32, v7
+
+    move-object/from16 v33, v6
+
+    move-object/from16 v34, v5
+
+    move-wide/from16 v37, v12
+
+    move-object/from16 v39, v2
+
+    invoke-direct/range {v24 .. v39}, Lokhttp3/Response;-><init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
+
+    iget-object v0, v9, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-nez v0, :cond_8
+
+    const/4 v0, 0x1
+
+    goto :goto_6
+
+    :cond_8
+    const/4 v0, 0x0
+
+    :goto_6
+    if-eqz v0, :cond_e
+
+    if-ltz v15, :cond_9
+
+    const/4 v0, 0x1
+
+    goto :goto_7
+
+    :cond_9
+    const/4 v0, 0x0
+
+    :goto_7
+    if-eqz v0, :cond_d
+
+    if-eqz v21, :cond_c
+
+    if-eqz v16, :cond_b
+
+    if-eqz v17, :cond_a
+
+    invoke-virtual {v4}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v0
+
+    new-instance v2, Lokhttp3/Response;
+
+    move-object v11, v2
+
+    move-object/from16 v12, v21
+
+    move-object/from16 v13, v16
+
+    move-object/from16 v14, v17
+
+    move-object/from16 v16, v1
+
+    move-object/from16 v17, v0
+
+    move-object/from16 v21, v9
+
+    move-wide/from16 v24, v43
+
+    move-object/from16 v26, v42
+
+    invoke-direct/range {v11 .. v26}, Lokhttp3/Response;-><init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
+
+    move-object v0, v2
+
+    goto :goto_8
+
+    :cond_a
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "message == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_b
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "protocol == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_c
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "request == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_d
+    const-string v0, "code < 0: "
+
+    invoke-static {v0, v15}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_e
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "priorResponse.body != null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_f
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "message == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_10
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "protocol == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_11
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "request == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_12
+    const-string v0, "code < 0: "
+
+    invoke-static {v0, v10}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_13
+    move-object/from16 v40, v3
+
+    move-object/from16 v41, v10
+
+    :goto_8
+    iget-object v1, v0, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    if-eqz v1, :cond_14
+
+    invoke-virtual {v1}, Lo0/g0/d/c;->b()Lo0/g0/d/i;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_14
+
+    iget-object v2, v2, Lo0/g0/d/i;->q:Lo0/e0;
+
+    goto :goto_9
+
+    :cond_14
+    const/4 v2, 0x0
+
+    :goto_9
+    iget v3, v0, Lokhttp3/Response;->g:I
+
+    iget-object v4, v0, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v5, v4, Lo0/a0;->c:Ljava/lang/String;
+
+    const/16 v6, 0x133
+
+    if-eq v3, v6, :cond_20
+
+    const/16 v6, 0x134
+
+    if-eq v3, v6, :cond_20
+
+    const/16 v6, 0x191
+
+    if-eq v3, v6, :cond_1f
+
+    const/16 v6, 0x1f7
+
+    if-eq v3, v6, :cond_1d
+
+    const/16 v6, 0x197
+
+    if-eq v3, v6, :cond_1a
+
+    const/16 v2, 0x198
+
+    if-eq v3, v2, :cond_15
+
+    packed-switch v3, :pswitch_data_0
+
+    move-object/from16 v3, p0
+
+    goto/16 :goto_a
+
+    :pswitch_0
+    move-object/from16 v3, p0
+
+    invoke-virtual {v3, v0, v5}, Lo0/g0/e/i;->a(Lokhttp3/Response;Ljava/lang/String;)Lo0/a0;
+
+    move-result-object v2
+
+    goto/16 :goto_b
+
+    :cond_15
+    move-object/from16 v3, p0
+
+    iget-object v5, v3, Lo0/g0/e/i;->b:Lo0/x;
+
+    iget-boolean v5, v5, Lo0/x;->i:Z
+
+    if-nez v5, :cond_16
+
+    goto/16 :goto_a
+
+    :cond_16
+    iget-object v4, v4, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    if-eqz v4, :cond_17
+
+    invoke-virtual {v4}, Lokhttp3/RequestBody;->isOneShot()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_17
+
+    goto/16 :goto_a
+
+    :cond_17
+    iget-object v4, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
+
+    if-eqz v4, :cond_18
+
+    iget v4, v4, Lokhttp3/Response;->g:I
+
+    if-ne v4, v2, :cond_18
+
+    goto/16 :goto_a
+
+    :cond_18
+    const/4 v2, 0x0
+
+    invoke-virtual {v3, v0, v2}, Lo0/g0/e/i;->c(Lokhttp3/Response;I)I
+
+    move-result v2
+
+    if-lez v2, :cond_19
+
+    goto :goto_a
+
+    :cond_19
+    iget-object v2, v0, Lokhttp3/Response;->d:Lo0/a0;
+
+    goto :goto_b
+
+    :cond_1a
+    move-object/from16 v3, p0
+
+    if-eqz v2, :cond_1c
+
+    iget-object v4, v2, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v4}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v4
+
+    sget-object v5, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
+
+    if-ne v4, v5, :cond_1b
+
+    iget-object v4, v3, Lo0/g0/e/i;->b:Lo0/x;
+
+    iget-object v4, v4, Lo0/x;->r:Lo0/c;
+
+    invoke-interface {v4, v2, v0}, Lo0/c;->a(Lo0/e0;Lokhttp3/Response;)Lo0/a0;
+
+    move-result-object v2
+
+    goto :goto_b
+
+    :cond_1b
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Received HTTP_PROXY_AUTH (407) code while not using proxy"
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_1d
+    move-object/from16 v3, p0
+
+    iget-object v2, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
+
+    if-eqz v2, :cond_1e
+
+    iget v2, v2, Lokhttp3/Response;->g:I
+
+    if-ne v2, v6, :cond_1e
+
+    goto :goto_a
+
+    :cond_1e
+    const v2, 0x7fffffff
+
+    invoke-virtual {v3, v0, v2}, Lo0/g0/e/i;->c(Lokhttp3/Response;I)I
+
+    move-result v2
+
+    if-nez v2, :cond_21
+
+    iget-object v2, v0, Lokhttp3/Response;->d:Lo0/a0;
+
+    goto :goto_b
+
+    :cond_1f
+    move-object/from16 v3, p0
+
+    iget-object v4, v3, Lo0/g0/e/i;->b:Lo0/x;
+
+    iget-object v4, v4, Lo0/x;->j:Lo0/c;
+
+    invoke-interface {v4, v2, v0}, Lo0/c;->a(Lo0/e0;Lokhttp3/Response;)Lo0/a0;
+
+    move-result-object v2
+
+    goto :goto_b
+
+    :cond_20
+    move-object/from16 v3, p0
+
+    const-string v2, "GET"
+
+    invoke-static {v5, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_22
+
+    const-string v2, "HEAD"
+
+    invoke-static {v5, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_22
+
+    :cond_21
+    :goto_a
+    const/4 v2, 0x0
+
+    goto :goto_b
+
+    :cond_22
+    invoke-virtual {v3, v0, v5}, Lo0/g0/e/i;->a(Lokhttp3/Response;Ljava/lang/String;)Lo0/a0;
+
+    move-result-object v2
+
+    :goto_b
+    if-nez v2, :cond_24
+
+    if-eqz v1, :cond_23
+
+    iget-boolean v1, v1, Lo0/g0/d/c;->a:Z
+
+    if-eqz v1, :cond_23
+
+    invoke-virtual/range {v41 .. v41}, Lo0/g0/d/m;->j()V
+
+    :cond_23
+    return-object v0
+
+    :cond_24
+    iget-object v4, v2, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    if-eqz v4, :cond_25
+
+    invoke-virtual {v4}, Lokhttp3/RequestBody;->isOneShot()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_25
+
+    return-object v0
+
+    :cond_25
+    iget-object v4, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v4, :cond_26
+
+    invoke-static {v4}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_26
+    move-object/from16 v4, v41
+
+    iget-object v5, v4, Lo0/g0/d/m;->a:Lo0/g0/d/j;
+
+    monitor-enter v5
+
+    :try_start_1
+    iget-object v6, v4, Lo0/g0/d/m;->h:Lo0/g0/d/c;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v6, :cond_27
+
+    const/4 v6, 0x1
+
+    goto :goto_c
+
+    :cond_27
+    const/4 v6, 0x0
+
+    :goto_c
+    monitor-exit v5
+
+    if-eqz v6, :cond_28
+
+    if-eqz v1, :cond_28
+
+    iget-object v5, v1, Lo0/g0/d/c;->f:Lo0/g0/e/d;
+
+    invoke-interface {v5}, Lo0/g0/e/d;->cancel()V
+
+    iget-object v5, v1, Lo0/g0/d/c;->b:Lo0/g0/d/m;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x1
+
+    invoke-virtual {v5, v1, v7, v7, v6}, Lo0/g0/d/m;->e(Lo0/g0/d/c;ZZLjava/io/IOException;)Ljava/io/IOException;
+
+    :cond_28
+    add-int/lit8 v12, p1, 0x1
+
+    const/16 v1, 0x14
+
+    if-gt v12, v1, :cond_29
+
+    move-object v11, v2
+
+    move-object v2, v0
+
+    goto :goto_f
+
+    :cond_29
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Too many follow-up requests: "
+
+    invoke-static {v1, v12}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :catchall_0
+    move-exception v0
+
+    move-object v1, v0
+
+    monitor-exit v5
+
+    throw v1
+
+    :catchall_1
+    move-exception v0
+
+    move-object/from16 v3, p0
+
+    move-object v4, v10
+
+    goto :goto_10
+
+    :catch_0
+    move-exception v0
+
+    move-object/from16 v40, v3
+
+    move-object v4, v10
+
+    move-object/from16 v3, p0
+
+    move-object v1, v0
+
+    :try_start_2
+    nop
+
+    instance-of v0, v1, Lokhttp3/internal/http2/ConnectionShutdownException;
+
+    if-nez v0, :cond_2a
+
+    const/4 v0, 0x1
+
+    goto :goto_d
+
+    :cond_2a
+    const/4 v0, 0x0
+
+    :goto_d
+    invoke-virtual {v3, v1, v4, v0, v11}, Lo0/g0/e/i;->b(Ljava/io/IOException;Lo0/g0/d/m;ZLo0/a0;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2b
+
+    goto :goto_e
+
+    :cond_2b
+    throw v1
+
+    :catch_1
+    move-exception v0
+
+    move-object/from16 v40, v3
+
+    move-object v4, v10
+
+    move-object/from16 v3, p0
+
+    move-object v1, v0
+
+    iget-object v0, v1, Lokhttp3/internal/connection/RouteException;->lastConnectException:Ljava/io/IOException;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v3, v0, v4, v5, v11}, Lo0/g0/e/i;->b(Ljava/io/IOException;Lo0/g0/d/m;ZLo0/a0;)Z
+
+    move-result v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    if-eqz v0, :cond_2c
+
+    :goto_e
+    invoke-virtual {v4}, Lo0/g0/d/m;->d()V
+
+    move/from16 v12, p1
+
+    :goto_f
+    const/4 v0, 0x0
+
+    move-object v1, v3
+
+    move-object v10, v4
+
+    move-object/from16 v3, v40
+
+    goto/16 :goto_0
+
+    :cond_2c
+    :try_start_3
+    iget-object v0, v1, Lokhttp3/internal/connection/RouteException;->firstConnectException:Ljava/io/IOException;
+
+    throw v0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    :catchall_2
+    move-exception v0
+
+    :goto_10
+    invoke-virtual {v4}, Lo0/g0/d/m;->d()V
+
+    throw v0
+
+    :cond_2d
+    move-object/from16 v3, p0
+
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "Canceled"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2e
+    move-object v3, v1
+
+    throw v0
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x12c
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/e/j.smali b/com.discord/smali_classes2/o0/g0/e/j.smali
new file mode 100644
index 0000000000..8e6d138065
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/e/j.smali
@@ -0,0 +1,290 @@
+.class public final Lo0/g0/e/j;
+.super Ljava/lang/Object;
+.source "StatusLine.kt"
+
+
+# instance fields
+.field public final a:Lo0/y;
+
+.field public final b:I
+
+.field public final c:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Lo0/y;ILjava/lang/String;)V
+    .locals 1
+
+    const-string v0, "protocol"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "message"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/e/j;->a:Lo0/y;
+
+    iput p2, p0, Lo0/g0/e/j;->b:I
+
+    iput-object p3, p0, Lo0/g0/e/j;->c:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static final a(Ljava/lang/String;)Lo0/g0/e/j;
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    sget-object v0, Lo0/y;->d:Lo0/y;
+
+    const-string v1, "statusLine"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "HTTP/1."
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    invoke-static {p0, v1, v2, v3}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v1
+
+    const/16 v4, 0x20
+
+    const/16 v5, 0x9
+
+    const-string v6, "Unexpected status line: "
+
+    if-eqz v1, :cond_3
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    if-lt v1, v5, :cond_2
+
+    const/16 v1, 0x8
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    if-ne v1, v4, :cond_2
+
+    const/4 v1, 0x7
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    add-int/lit8 v1, v1, -0x30
+
+    if-nez v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    if-ne v1, v0, :cond_1
+
+    sget-object v0, Lo0/y;->e:Lo0/y;
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ljava/net/ProtocolException;
+
+    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    new-instance v0, Ljava/net/ProtocolException;
+
+    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    const-string v1, "ICY "
+
+    invoke-static {p0, v1, v2, v3}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    const/4 v5, 0x4
+
+    :goto_0
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/lit8 v2, v5, 0x3
+
+    if-lt v1, v2, :cond_6
+
+    :try_start_0
+    invoke-virtual {p0, v5, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v3, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v1
+    :try_end_0
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    if-le v3, v2, :cond_5
+
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    if-ne v2, v4, :cond_4
+
+    add-int/lit8 v5, v5, 0x4
+
+    invoke-virtual {p0, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v2, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_4
+    new-instance v0, Ljava/net/ProtocolException;
+
+    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_5
+    const-string p0, ""
+
+    :goto_1
+    new-instance v2, Lo0/g0/e/j;
+
+    invoke-direct {v2, v0, v1, p0}, Lo0/g0/e/j;-><init>(Lo0/y;ILjava/lang/String;)V
+
+    return-object v2
+
+    :catch_0
+    new-instance v0, Ljava/net/ProtocolException;
+
+    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_6
+    new-instance v0, Ljava/net/ProtocolException;
+
+    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_7
+    new-instance v0, Ljava/net/ProtocolException;
+
+    invoke-static {v6, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lo0/g0/e/j;->a:Lo0/y;
+
+    sget-object v2, Lo0/y;->d:Lo0/y;
+
+    if-ne v1, v2, :cond_0
+
+    const-string v1, "HTTP/1.0"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "HTTP/1.1"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :goto_0
+    const/16 v1, 0x20
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget v2, p0, Lo0/g0/e/j;->b:I
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/e/j;->c:Ljava/lang/String;
+
+    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
+
+    const-string v1, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/f/a$a.smali b/com.discord/smali_classes2/o0/g0/f/a$a.smali
new file mode 100644
index 0000000000..5d1d2b5c12
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/f/a$a.smali
@@ -0,0 +1,159 @@
+.class public abstract Lo0/g0/f/a$a;
+.super Ljava/lang/Object;
+.source "Http1ExchangeCodec.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/f/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x401
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Lp0/j;
+
+.field public e:Z
+
+.field public final synthetic f:Lo0/g0/f/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/f/a;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/f/a$a;->f:Lo0/g0/f/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lp0/j;
+
+    iget-object p1, p1, Lo0/g0/f/a;->f:Lp0/g;
+
+    invoke-interface {p1}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Lp0/j;-><init>(Lp0/x;)V
+
+    iput-object v0, p0, Lo0/g0/f/a$a;->d:Lp0/j;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 1
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/f/a$a;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->f:Lp0/g;
+
+    invoke-interface {v0, p1, p2, p3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-wide p1
+
+    :catch_0
+    move-exception p1
+
+    iget-object p2, p0, Lo0/g0/f/a$a;->f:Lo0/g0/f/a;
+
+    iget-object p2, p2, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-nez p2, :cond_0
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_0
+    invoke-virtual {p2}, Lo0/g0/d/i;->j()V
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    throw p1
+.end method
+
+.method public final a()V
+    .locals 4
+
+    iget-object v0, p0, Lo0/g0/f/a$a;->f:Lo0/g0/f/a;
+
+    iget v1, v0, Lo0/g0/f/a;->a:I
+
+    const/4 v2, 0x6
+
+    if-ne v1, v2, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v3, 0x5
+
+    if-ne v1, v3, :cond_1
+
+    iget-object v1, p0, Lo0/g0/f/a$a;->d:Lp0/j;
+
+    invoke-static {v0, v1}, Lo0/g0/f/a;->i(Lo0/g0/f/a;Lp0/j;)V
+
+    iget-object v0, p0, Lo0/g0/f/a$a;->f:Lo0/g0/f/a;
+
+    iput v2, v0, Lo0/g0/f/a;->a:I
+
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "state: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/g0/f/a$a;->f:Lo0/g0/f/a;
+
+    iget v2, v2, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/f/a$a;->d:Lp0/j;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/f/a$b.smali b/com.discord/smali_classes2/o0/g0/f/a$b.smali
new file mode 100644
index 0000000000..2c2811668d
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/f/a$b.smali
@@ -0,0 +1,222 @@
+.class public final Lo0/g0/f/a$b;
+.super Ljava/lang/Object;
+.source "Http1ExchangeCodec.kt"
+
+# interfaces
+.implements Lp0/u;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/f/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final d:Lp0/j;
+
+.field public e:Z
+
+.field public final synthetic f:Lo0/g0/f/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/f/a;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lp0/j;
+
+    iget-object p1, p1, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lp0/u;->timeout()Lp0/x;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Lp0/j;-><init>(Lp0/x;)V
+
+    iput-object v0, p0, Lo0/g0/f/a$b;->d:Lp0/j;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public declared-synchronized close()V
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/f/a$b;->e:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :try_start_1
+    iput-boolean v0, p0, Lo0/g0/f/a$b;->e:Z
+
+    iget-object v0, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    const-string v1, "0\r\n\r\n"
+
+    invoke-interface {v0, v1}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    iget-object v0, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    iget-object v1, p0, Lo0/g0/f/a$b;->d:Lp0/j;
+
+    invoke-static {v0, v1}, Lo0/g0/f/a;->i(Lo0/g0/f/a;Lp0/j;)V
+
+    iget-object v0, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    const/4 v1, 0x3
+
+    iput v1, v0, Lo0/g0/f/a;->a:I
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public declared-synchronized flush()V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/f/a$b;->e:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    :try_start_1
+    iget-object v0, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/f/a$b;->d:Lp0/j;
+
+    return-object v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 3
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/f/a$b;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_1
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-nez v2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0, p2, p3}, Lokio/BufferedSink;->j0(J)Lokio/BufferedSink;
+
+    iget-object v0, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    const-string v1, "\r\n"
+
+    invoke-interface {v0, v1}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    iget-object v0, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0, p1, p2, p3}, Lp0/u;->write(Lp0/e;J)V
+
+    iget-object p1, p0, Lo0/g0/f/a$b;->f:Lo0/g0/f/a;
+
+    iget-object p1, p1, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {p1, v1}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    return-void
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/f/a$c.smali b/com.discord/smali_classes2/o0/g0/f/a$c.smali
new file mode 100644
index 0000000000..97270da539
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/f/a$c.smali
@@ -0,0 +1,431 @@
+.class public final Lo0/g0/f/a$c;
+.super Lo0/g0/f/a$a;
+.source "Http1ExchangeCodec.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/f/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public g:J
+
+.field public h:Z
+
+.field public final i:Lo0/w;
+
+.field public final synthetic j:Lo0/g0/f/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/f/a;Lo0/w;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/w;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "url"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    invoke-direct {p0, p1}, Lo0/g0/f/a$a;-><init>(Lo0/g0/f/a;)V
+
+    iput-object p2, p0, Lo0/g0/f/a$c;->i:Lo0/w;
+
+    const-wide/16 p1, -0x1
+
+    iput-wide p1, p0, Lo0/g0/f/a$c;->g:J
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Lo0/g0/f/a$c;->h:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 11
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, p2, v2
+
+    if-ltz v4, :cond_0
+
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :goto_0
+    if-eqz v4, :cond_f
+
+    iget-boolean v4, p0, Lo0/g0/f/a$a;->e:Z
+
+    xor-int/2addr v4, v0
+
+    if-eqz v4, :cond_e
+
+    iget-boolean v4, p0, Lo0/g0/f/a$c;->h:Z
+
+    const-wide/16 v5, -0x1
+
+    if-nez v4, :cond_1
+
+    return-wide v5
+
+    :cond_1
+    iget-wide v7, p0, Lo0/g0/f/a$c;->g:J
+
+    const/4 v4, 0x0
+
+    cmp-long v9, v7, v2
+
+    if-eqz v9, :cond_2
+
+    cmp-long v9, v7, v5
+
+    if-nez v9, :cond_9
+
+    :cond_2
+    iget-wide v7, p0, Lo0/g0/f/a$c;->g:J
+
+    cmp-long v9, v7, v5
+
+    if-eqz v9, :cond_3
+
+    iget-object v7, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    iget-object v7, v7, Lo0/g0/f/a;->f:Lp0/g;
+
+    invoke-interface {v7}, Lp0/g;->o0()Ljava/lang/String;
+
+    :cond_3
+    :try_start_0
+    iget-object v7, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    iget-object v7, v7, Lo0/g0/f/a;->f:Lp0/g;
+
+    invoke-interface {v7}, Lp0/g;->U0()J
+
+    move-result-wide v7
+
+    iput-wide v7, p0, Lo0/g0/f/a$c;->g:J
+
+    iget-object v7, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    iget-object v7, v7, Lo0/g0/f/a;->f:Lp0/g;
+
+    invoke-interface {v7}, Lp0/g;->o0()Ljava/lang/String;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_d
+
+    invoke-static {v7}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v7
+
+    invoke-virtual {v7}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v7
+
+    iget-wide v8, p0, Lo0/g0/f/a$c;->g:J
+
+    cmp-long v10, v8, v2
+
+    if-ltz v10, :cond_c
+
+    invoke-virtual {v7}, Ljava/lang/String;->length()I
+
+    move-result v8
+
+    if-lez v8, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_5
+
+    const-string v0, ";"
+
+    const/4 v8, 0x2
+
+    invoke-static {v7, v0, v1, v8}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v0
+    :try_end_0
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eqz v0, :cond_c
+
+    :cond_5
+    iget-wide v7, p0, Lo0/g0/f/a$c;->g:J
+
+    cmp-long v0, v7, v2
+
+    if-nez v0, :cond_8
+
+    iput-boolean v1, p0, Lo0/g0/f/a$c;->h:Z
+
+    iget-object v0, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    invoke-virtual {v0}, Lo0/g0/f/a;->l()Lokhttp3/Headers;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/g0/f/a;->c:Lokhttp3/Headers;
+
+    iget-object v0, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    iget-object v1, v0, Lo0/g0/f/a;->d:Lo0/x;
+
+    if-eqz v1, :cond_7
+
+    iget-object v1, v1, Lo0/x;->m:Lo0/p;
+
+    iget-object v2, p0, Lo0/g0/f/a$c;->i:Lo0/w;
+
+    iget-object v0, v0, Lo0/g0/f/a;->c:Lokhttp3/Headers;
+
+    if-eqz v0, :cond_6
+
+    invoke-static {v1, v2, v0}, Lo0/g0/e/e;->b(Lo0/p;Lo0/w;Lokhttp3/Headers;)V
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    goto :goto_2
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_8
+    :goto_2
+    iget-boolean v0, p0, Lo0/g0/f/a$c;->h:Z
+
+    if-nez v0, :cond_9
+
+    return-wide v5
+
+    :cond_9
+    iget-wide v0, p0, Lo0/g0/f/a$c;->g:J
+
+    invoke-static {p2, p3, v0, v1}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p2
+
+    invoke-super {p0, p1, p2, p3}, Lo0/g0/f/a$a;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+
+    cmp-long p3, p1, v5
+
+    if-nez p3, :cond_b
+
+    iget-object p1, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    iget-object p1, p1, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-nez p1, :cond_a
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v4
+
+    :cond_a
+    invoke-virtual {p1}, Lo0/g0/d/i;->j()V
+
+    new-instance p1, Ljava/net/ProtocolException;
+
+    const-string p2, "unexpected end of stream"
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    throw p1
+
+    :cond_b
+    iget-wide v0, p0, Lo0/g0/f/a$c;->g:J
+
+    sub-long/2addr v0, p1
+
+    iput-wide v0, p0, Lo0/g0/f/a$c;->g:J
+
+    return-wide p1
+
+    :cond_c
+    :try_start_1
+    new-instance p1, Ljava/net/ProtocolException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string p3, "expected chunk size and optional extensions"
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p3, " but was \""
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v0, p0, Lo0/g0/f/a$c;->g:J
+
+    invoke-virtual {p2, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 p3, 0x22
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_d
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.CharSequence"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance p2, Ljava/net/ProtocolException;
+
+    invoke-virtual {p1}, Ljava/lang/NumberFormatException;->getMessage()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_e
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_f
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public close()V
+    .locals 2
+
+    iget-boolean v0, p0, Lo0/g0/f/a$a;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-boolean v0, p0, Lo0/g0/f/a$c;->h:Z
+
+    if-eqz v0, :cond_2
+
+    const/16 v0, 0x64
+
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {p0, v0, v1}, Lo0/g0/b;->k(Lp0/w;ILjava/util/concurrent/TimeUnit;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/f/a$c;->j:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lo0/g0/d/i;->j()V
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2
+    :goto_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/f/a$a;->e:Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/f/a$d.smali b/com.discord/smali_classes2/o0/g0/f/a$d.smali
new file mode 100644
index 0000000000..514db42a8f
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/f/a$d.smali
@@ -0,0 +1,230 @@
+.class public final Lo0/g0/f/a$d;
+.super Lo0/g0/f/a$a;
+.source "Http1ExchangeCodec.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/f/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "d"
+.end annotation
+
+
+# instance fields
+.field public g:J
+
+.field public final synthetic h:Lo0/g0/f/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/f/a;J)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/f/a$d;->h:Lo0/g0/f/a;
+
+    invoke-direct {p0, p1}, Lo0/g0/f/a$a;-><init>(Lo0/g0/f/a;)V
+
+    iput-wide p2, p0, Lo0/g0/f/a$d;->g:J
+
+    const-wide/16 v0, 0x0
+
+    cmp-long p1, p2, v0
+
+    if-nez p1, :cond_0
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    :cond_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 7
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_6
+
+    iget-boolean v2, p0, Lo0/g0/f/a$a;->e:Z
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_5
+
+    iget-wide v2, p0, Lo0/g0/f/a$d;->g:J
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v6, v2, v0
+
+    if-nez v6, :cond_1
+
+    return-wide v4
+
+    :cond_1
+    invoke-static {v2, v3, p2, p3}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p2
+
+    invoke-super {p0, p1, p2, p3}, Lo0/g0/f/a$a;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+
+    cmp-long p3, p1, v4
+
+    if-nez p3, :cond_3
+
+    iget-object p1, p0, Lo0/g0/f/a$d;->h:Lo0/g0/f/a;
+
+    iget-object p1, p1, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-nez p1, :cond_2
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_2
+    invoke-virtual {p1}, Lo0/g0/d/i;->j()V
+
+    new-instance p1, Ljava/net/ProtocolException;
+
+    const-string p2, "unexpected end of stream"
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    throw p1
+
+    :cond_3
+    iget-wide v2, p0, Lo0/g0/f/a$d;->g:J
+
+    sub-long/2addr v2, p1
+
+    iput-wide v2, p0, Lo0/g0/f/a$d;->g:J
+
+    cmp-long p3, v2, v0
+
+    if-nez p3, :cond_4
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    :cond_4
+    return-wide p1
+
+    :cond_5
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public close()V
+    .locals 5
+
+    iget-boolean v0, p0, Lo0/g0/f/a$a;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-wide v0, p0, Lo0/g0/f/a$d;->g:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_2
+
+    const/16 v0, 0x64
+
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {p0, v0, v1}, Lo0/g0/b;->k(Lp0/w;ILjava/util/concurrent/TimeUnit;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/f/a$d;->h:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lo0/g0/d/i;->j()V
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2
+    :goto_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/f/a$a;->e:Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/f/a$e.smali b/com.discord/smali_classes2/o0/g0/f/a$e.smali
new file mode 100644
index 0000000000..7641505d37
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/f/a$e.smali
@@ -0,0 +1,155 @@
+.class public final Lo0/g0/f/a$e;
+.super Ljava/lang/Object;
+.source "Http1ExchangeCodec.kt"
+
+# interfaces
+.implements Lp0/u;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/f/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "e"
+.end annotation
+
+
+# instance fields
+.field public final d:Lp0/j;
+
+.field public e:Z
+
+.field public final synthetic f:Lo0/g0/f/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/f/a;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/f/a$e;->f:Lo0/g0/f/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lp0/j;
+
+    iget-object p1, p1, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lp0/u;->timeout()Lp0/x;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Lp0/j;-><init>(Lp0/x;)V
+
+    iput-object v0, p0, Lo0/g0/f/a$e;->d:Lp0/j;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 2
+
+    iget-boolean v0, p0, Lo0/g0/f/a$e;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/f/a$e;->e:Z
+
+    iget-object v0, p0, Lo0/g0/f/a$e;->f:Lo0/g0/f/a;
+
+    iget-object v1, p0, Lo0/g0/f/a$e;->d:Lp0/j;
+
+    invoke-static {v0, v1}, Lo0/g0/f/a;->i(Lo0/g0/f/a;Lp0/j;)V
+
+    iget-object v0, p0, Lo0/g0/f/a$e;->f:Lo0/g0/f/a;
+
+    const/4 v1, 0x3
+
+    iput v1, v0, Lo0/g0/f/a;->a:I
+
+    return-void
+.end method
+
+.method public flush()V
+    .locals 1
+
+    iget-boolean v0, p0, Lo0/g0/f/a$e;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lo0/g0/f/a$e;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/f/a$e;->d:Lp0/j;
+
+    return-object v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 7
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/f/a$e;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-wide v1, p1, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    move-wide v5, p2
+
+    invoke-static/range {v1 .. v6}, Lo0/g0/b;->e(JJJ)V
+
+    iget-object v0, p0, Lo0/g0/f/a$e;->f:Lo0/g0/f/a;
+
+    iget-object v0, v0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0, p1, p2, p3}, Lp0/u;->write(Lp0/e;J)V
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/f/a$f.smali b/com.discord/smali_classes2/o0/g0/f/a$f.smali
new file mode 100644
index 0000000000..104376dd93
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/f/a$f.smali
@@ -0,0 +1,147 @@
+.class public final Lo0/g0/f/a$f;
+.super Lo0/g0/f/a$a;
+.source "Http1ExchangeCodec.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/f/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "f"
+.end annotation
+
+
+# instance fields
+.field public g:Z
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/f/a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lo0/g0/f/a$a;-><init>(Lo0/g0/f/a;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 4
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    const-wide/16 v1, 0x0
+
+    cmp-long v3, p2, v1
+
+    if-ltz v3, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_4
+
+    iget-boolean v1, p0, Lo0/g0/f/a$a;->e:Z
+
+    xor-int/2addr v1, v0
+
+    if-eqz v1, :cond_3
+
+    iget-boolean v1, p0, Lo0/g0/f/a$f;->g:Z
+
+    const-wide/16 v2, -0x1
+
+    if-eqz v1, :cond_1
+
+    return-wide v2
+
+    :cond_1
+    invoke-super {p0, p1, p2, p3}, Lo0/g0/f/a$a;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+
+    cmp-long p3, p1, v2
+
+    if-nez p3, :cond_2
+
+    iput-boolean v0, p0, Lo0/g0/f/a$f;->g:Z
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    return-wide v2
+
+    :cond_2
+    return-wide p1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public close()V
+    .locals 1
+
+    iget-boolean v0, p0, Lo0/g0/f/a$a;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-boolean v0, p0, Lo0/g0/f/a$f;->g:Z
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p0}, Lo0/g0/f/a$a;->a()V
+
+    :cond_1
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/f/a$a;->e:Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/f/a.smali b/com.discord/smali_classes2/o0/g0/f/a.smali
new file mode 100644
index 0000000000..cf7d066d88
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/f/a.smali
@@ -0,0 +1,1168 @@
+.class public final Lo0/g0/f/a;
+.super Ljava/lang/Object;
+.source "Http1ExchangeCodec.kt"
+
+# interfaces
+.implements Lo0/g0/e/d;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/f/a$e;,
+        Lo0/g0/f/a$b;,
+        Lo0/g0/f/a$a;,
+        Lo0/g0/f/a$d;,
+        Lo0/g0/f/a$c;,
+        Lo0/g0/f/a$f;
+    }
+.end annotation
+
+
+# instance fields
+.field public a:I
+
+.field public b:J
+
+.field public c:Lokhttp3/Headers;
+
+.field public final d:Lo0/x;
+
+.field public final e:Lo0/g0/d/i;
+
+.field public final f:Lp0/g;
+
+.field public final g:Lokio/BufferedSink;
+
+
+# direct methods
+.method public constructor <init>(Lo0/x;Lo0/g0/d/i;Lp0/g;Lokio/BufferedSink;)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sink"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/f/a;->d:Lo0/x;
+
+    iput-object p2, p0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    iput-object p3, p0, Lo0/g0/f/a;->f:Lp0/g;
+
+    iput-object p4, p0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    const/high16 p1, 0x40000
+
+    int-to-long p1, p1
+
+    iput-wide p1, p0, Lo0/g0/f/a;->b:J
+
+    return-void
+.end method
+
+.method public static final i(Lo0/g0/f/a;Lp0/j;)V
+    .locals 2
+
+    if-eqz p0, :cond_0
+
+    iget-object p0, p1, Lp0/j;->e:Lp0/x;
+
+    sget-object v0, Lp0/x;->d:Lp0/x;
+
+    const-string v1, "delegate"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p1, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {p0}, Lp0/x;->a()Lp0/x;
+
+    invoke-virtual {p0}, Lp0/x;->b()Lp0/x;
+
+    return-void
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+
+# virtual methods
+.method public a()Lo0/g0/d/i;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    return-object v0
+.end method
+
+.method public b()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
+
+    return-void
+.end method
+
+.method public c(Lo0/a0;)V
+    .locals 4
+
+    const-string v0, "request"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, v1, Lo0/g0/d/i;->q:Lo0/e0;
+
+    iget-object v1, v1, Lo0/e0;->b:Ljava/net/Proxy;
+
+    invoke-virtual {v1}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
+
+    move-result-object v1
+
+    const-string v2, "realConnection!!.route().proxy.type()"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "proxyType"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v2, p1, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x20
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v2, p1, Lo0/a0;->b:Lo0/w;
+
+    iget-boolean v2, v2, Lo0/w;->a:Z
+
+    if-nez v2, :cond_0
+
+    sget-object v2, Ljava/net/Proxy$Type;->HTTP:Ljava/net/Proxy$Type;
+
+    if-ne v1, v2, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget-object v1, p1, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v1, p1, Lo0/a0;->b:Lo0/w;
+
+    const-string v2, "url"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Lo0/w;->b()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1}, Lo0/w;->d()Ljava/lang/String;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x3f
+
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    :cond_2
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :goto_1
+    const-string v1, " HTTP/1.1"
+
+    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
+
+    const-string v1, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p1, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {p0, p1, v0}, Lo0/g0/f/a;->m(Lokhttp3/Headers;Ljava/lang/String;)V
+
+    return-void
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public cancel()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, v0, Lo0/g0/d/i;->b:Ljava/net/Socket;
+
+    if-eqz v0, :cond_0
+
+    invoke-static {v0}, Lo0/g0/b;->g(Ljava/net/Socket;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public d(Lokhttp3/Response;)Lp0/w;
+    .locals 10
+
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lo0/g0/e/e;->a(Lokhttp3/Response;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-wide/16 v0, 0x0
+
+    invoke-virtual {p0, v0, v1}, Lo0/g0/f/a;->j(J)Lp0/w;
+
+    move-result-object p1
+
+    goto :goto_2
+
+    :cond_0
+    const/4 v0, 0x2
+
+    const-string v1, "Transfer-Encoding"
+
+    const/4 v2, 0x0
+
+    invoke-static {p1, v1, v2, v0}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    const-string v3, "chunked"
+
+    invoke-static {v3, v0, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    const/4 v3, 0x5
+
+    const-string v4, "state: "
+
+    const/4 v5, 0x4
+
+    if-eqz v0, :cond_3
+
+    iget-object p1, p1, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object p1, p1, Lo0/a0;->b:Lo0/w;
+
+    iget v0, p0, Lo0/g0/f/a;->a:I
+
+    if-ne v0, v5, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    iput v3, p0, Lo0/g0/f/a;->a:I
+
+    new-instance v0, Lo0/g0/f/a$c;
+
+    invoke-direct {v0, p0, p1}, Lo0/g0/f/a$c;-><init>(Lo0/g0/f/a;Lo0/w;)V
+
+    move-object p1, v0
+
+    goto :goto_2
+
+    :cond_2
+    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget v0, p0, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    invoke-static {p1}, Lo0/g0/b;->n(Lokhttp3/Response;)J
+
+    move-result-wide v6
+
+    const-wide/16 v8, -0x1
+
+    cmp-long p1, v6, v8
+
+    if-eqz p1, :cond_4
+
+    invoke-virtual {p0, v6, v7}, Lo0/g0/f/a;->j(J)Lp0/w;
+
+    move-result-object p1
+
+    goto :goto_2
+
+    :cond_4
+    iget p1, p0, Lo0/g0/f/a;->a:I
+
+    if-ne p1, v5, :cond_5
+
+    goto :goto_1
+
+    :cond_5
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_7
+
+    iput v3, p0, Lo0/g0/f/a;->a:I
+
+    iget-object p1, p0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-eqz p1, :cond_6
+
+    invoke-virtual {p1}, Lo0/g0/d/i;->j()V
+
+    new-instance p1, Lo0/g0/f/a$f;
+
+    invoke-direct {p1, p0}, Lo0/g0/f/a$f;-><init>(Lo0/g0/f/a;)V
+
+    :goto_2
+    return-object p1
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_7
+    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget v0, p0, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public e(Z)Lokhttp3/Response$a;
+    .locals 4
+
+    iget v0, p0, Lo0/g0/f/a;->a:I
+
+    const/4 v1, 0x3
+
+    const/4 v2, 0x1
+
+    if-eq v0, v2, :cond_1
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :cond_1
+    :goto_0
+    if-eqz v2, :cond_5
+
+    :try_start_0
+    invoke-virtual {p0}, Lo0/g0/f/a;->k()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lo0/g0/e/j;->a(Ljava/lang/String;)Lo0/g0/e/j;
+
+    move-result-object v0
+
+    new-instance v2, Lokhttp3/Response$a;
+
+    invoke-direct {v2}, Lokhttp3/Response$a;-><init>()V
+
+    iget-object v3, v0, Lo0/g0/e/j;->a:Lo0/y;
+
+    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->f(Lo0/y;)Lokhttp3/Response$a;
+
+    iget v3, v0, Lo0/g0/e/j;->b:I
+
+    iput v3, v2, Lokhttp3/Response$a;->c:I
+
+    iget-object v3, v0, Lo0/g0/e/j;->c:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->e(Ljava/lang/String;)Lokhttp3/Response$a;
+
+    invoke-virtual {p0}, Lo0/g0/f/a;->l()Lokhttp3/Headers;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
+
+    const/16 v3, 0x64
+
+    if-eqz p1, :cond_2
+
+    iget p1, v0, Lo0/g0/e/j;->b:I
+
+    if-ne p1, v3, :cond_2
+
+    const/4 v2, 0x0
+
+    goto :goto_1
+
+    :cond_2
+    iget p1, v0, Lo0/g0/e/j;->b:I
+
+    if-ne p1, v3, :cond_3
+
+    iput v1, p0, Lo0/g0/f/a;->a:I
+
+    goto :goto_1
+
+    :cond_3
+    const/4 p1, 0x4
+
+    iput p1, p0, Lo0/g0/f/a;->a:I
+    :try_end_0
+    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :goto_1
+    return-object v2
+
+    :catch_0
+    move-exception p1
+
+    iget-object v0, p0, Lo0/g0/f/a;->e:Lo0/g0/d/i;
+
+    if-eqz v0, :cond_4
+
+    iget-object v0, v0, Lo0/g0/d/i;->q:Lo0/e0;
+
+    if-eqz v0, :cond_4
+
+    iget-object v0, v0, Lo0/e0;->a:Lo0/a;
+
+    if-eqz v0, :cond_4
+
+    iget-object v0, v0, Lo0/a;->a:Lo0/w;
+
+    if-eqz v0, :cond_4
+
+    invoke-virtual {v0}, Lo0/w;->i()Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    const-string v0, "unknown"
+
+    :goto_2
+    new-instance v1, Ljava/io/IOException;
+
+    const-string v2, "unexpected end of stream on "
+
+    invoke-static {v2, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :cond_5
+    const-string p1, "state: "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget v0, p0, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public f()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
+
+    return-void
+.end method
+
+.method public g(Lokhttp3/Response;)J
+    .locals 3
+
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lo0/g0/e/e;->a(Lokhttp3/Response;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const-wide/16 v0, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    const-string v2, "Transfer-Encoding"
+
+    invoke-static {p1, v2, v0, v1}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    const-string v2, "chunked"
+
+    invoke-static {v2, v0, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const-wide/16 v0, -0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {p1}, Lo0/g0/b;->n(Lokhttp3/Response;)J
+
+    move-result-wide v0
+
+    :goto_0
+    return-wide v0
+.end method
+
+.method public h(Lo0/a0;J)Lp0/u;
+    .locals 5
+
+    const-string v0, "request"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p1, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lokhttp3/RequestBody;->isDuplex()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/net/ProtocolException;
+
+    const-string p2, "Duplex connections are not supported for HTTP/1"
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    const-string v0, "Transfer-Encoding"
+
+    invoke-virtual {p1, v0}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const/4 v0, 0x1
+
+    const-string v1, "chunked"
+
+    invoke-static {v1, p1, v0}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result p1
+
+    const/4 v1, 0x2
+
+    const-string v2, "state: "
+
+    if-eqz p1, :cond_4
+
+    iget p1, p0, Lo0/g0/f/a;->a:I
+
+    if-ne p1, v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_3
+
+    iput v1, p0, Lo0/g0/f/a;->a:I
+
+    new-instance p1, Lo0/g0/f/a$b;
+
+    invoke-direct {p1, p0}, Lo0/g0/f/a$b;-><init>(Lo0/g0/f/a;)V
+
+    goto :goto_3
+
+    :cond_3
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_4
+    const-wide/16 v3, -0x1
+
+    cmp-long p1, p2, v3
+
+    if-eqz p1, :cond_7
+
+    iget p1, p0, Lo0/g0/f/a;->a:I
+
+    if-ne p1, v0, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    const/4 v0, 0x0
+
+    :goto_2
+    if-eqz v0, :cond_6
+
+    iput v1, p0, Lo0/g0/f/a;->a:I
+
+    new-instance p1, Lo0/g0/f/a$e;
+
+    invoke-direct {p1, p0}, Lo0/g0/f/a$e;-><init>(Lo0/g0/f/a;)V
+
+    :goto_3
+    return-object p1
+
+    :cond_6
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_7
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "Cannot stream a request body without chunked encoding or a known content length!"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final j(J)Lp0/w;
+    .locals 2
+
+    iget v0, p0, Lo0/g0/f/a;->a:I
+
+    const/4 v1, 0x4
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x5
+
+    iput v0, p0, Lo0/g0/f/a;->a:I
+
+    new-instance v0, Lo0/g0/f/a$d;
+
+    invoke-direct {v0, p0, p1, p2}, Lo0/g0/f/a$d;-><init>(Lo0/g0/f/a;J)V
+
+    return-object v0
+
+    :cond_1
+    const-string p1, "state: "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final k()Ljava/lang/String;
+    .locals 5
+
+    iget-object v0, p0, Lo0/g0/f/a;->f:Lp0/g;
+
+    iget-wide v1, p0, Lo0/g0/f/a;->b:J
+
+    invoke-interface {v0, v1, v2}, Lp0/g;->T(J)Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-wide v1, p0, Lo0/g0/f/a;->b:J
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    int-to-long v3, v3
+
+    sub-long/2addr v1, v3
+
+    iput-wide v1, p0, Lo0/g0/f/a;->b:J
+
+    return-object v0
+.end method
+
+.method public final l()Lokhttp3/Headers;
+    .locals 10
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v1, 0x14
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {p0}, Lo0/g0/f/a;->k()Ljava/lang/String;
+
+    move-result-object v1
+
+    :goto_0
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-lez v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_3
+
+    const-string v2, "line"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v2, 0x3a
+
+    const/4 v5, 0x4
+
+    invoke-static {v1, v2, v3, v4, v5}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v5
+
+    const-string v6, "(this as java.lang.String).substring(startIndex)"
+
+    const/4 v7, -0x1
+
+    const-string v8, "value"
+
+    const-string v9, "name"
+
+    if-eq v5, v7, :cond_1
+
+    invoke-virtual {v1, v4, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    add-int/lit8 v5, v5, 0x1
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v0, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    invoke-static {v1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_1
+    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    const-string v5, ""
+
+    if-ne v4, v2, :cond_2
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v5, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v0, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    invoke-static {v1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_2
+    invoke-static {v5, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v1, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v0, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    invoke-static {v1}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :goto_2
+    invoke-virtual {p0}, Lo0/g0/f/a;->k()Ljava/lang/String;
+
+    move-result-object v1
+
+    goto/16 :goto_0
+
+    :cond_3
+    new-array v1, v4, [Ljava/lang/String;
+
+    invoke-interface {v0, v1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_4
+
+    check-cast v0, [Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    new-instance v2, Lokhttp3/Headers;
+
+    invoke-direct {v2, v0, v1}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v2
+
+    :cond_4
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final m(Lokhttp3/Headers;Ljava/lang/String;)V
+    .locals 5
+
+    const-string v0, "headers"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "requestLine"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v0, p0, Lo0/g0/f/a;->a:I
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {v0, p2}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    move-result-object p2
+
+    const-string v0, "\r\n"
+
+    invoke-interface {p2, v0}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    invoke-virtual {p1}, Lokhttp3/Headers;->size()I
+
+    move-result p2
+
+    :goto_1
+    if-ge v1, p2, :cond_1
+
+    iget-object v3, p0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-virtual {p1, v1}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-interface {v3, v4}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    move-result-object v3
+
+    const-string v4, ": "
+
+    invoke-interface {v3, v4}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    move-result-object v3
+
+    invoke-virtual {p1, v1}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-interface {v3, v4}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    move-result-object v3
+
+    invoke-interface {v3, v0}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    iget-object p1, p0, Lo0/g0/f/a;->g:Lokio/BufferedSink;
+
+    invoke-interface {p1, v0}, Lokio/BufferedSink;->a0(Ljava/lang/String;)Lokio/BufferedSink;
+
+    iput v2, p0, Lo0/g0/f/a;->a:I
+
+    return-void
+
+    :cond_2
+    const-string p1, "state: "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p2, p0, Lo0/g0/f/a;->a:I
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/a$a.smali b/com.discord/smali_classes2/o0/g0/g/a$a.smali
new file mode 100644
index 0000000000..e3d2bb642e
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/a$a.smali
@@ -0,0 +1,24 @@
+.class public final Lo0/g0/g/a$a;
+.super Ljava/lang/Object;
+.source "ErrorCode.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/a.smali b/com.discord/smali_classes2/o0/g0/g/a.smali
new file mode 100644
index 0000000000..b3d45889d0
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/a.smali
@@ -0,0 +1,232 @@
+.class public final enum Lo0/g0/g/a;
+.super Ljava/lang/Enum;
+.source "ErrorCode.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/g/a$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lo0/g0/g/a;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lo0/g0/g/a;
+
+.field public static final enum e:Lo0/g0/g/a;
+
+.field public static final enum f:Lo0/g0/g/a;
+
+.field public static final enum g:Lo0/g0/g/a;
+
+.field public static final enum h:Lo0/g0/g/a;
+
+.field public static final enum i:Lo0/g0/g/a;
+
+.field public static final synthetic j:[Lo0/g0/g/a;
+
+.field public static final k:Lo0/g0/g/a$a;
+
+
+# instance fields
+.field public final httpCode:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 8
+
+    const/16 v0, 0xb
+
+    new-array v1, v0, [Lo0/g0/g/a;
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "NO_ERROR"
+
+    const/4 v4, 0x0
+
+    invoke-direct {v2, v3, v4, v4}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    sput-object v2, Lo0/g0/g/a;->d:Lo0/g0/g/a;
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "PROTOCOL_ERROR"
+
+    const/4 v4, 0x1
+
+    invoke-direct {v2, v3, v4, v4}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    sput-object v2, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "INTERNAL_ERROR"
+
+    const/4 v4, 0x2
+
+    invoke-direct {v2, v3, v4, v4}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    sput-object v2, Lo0/g0/g/a;->f:Lo0/g0/g/a;
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "FLOW_CONTROL_ERROR"
+
+    const/4 v4, 0x3
+
+    invoke-direct {v2, v3, v4, v4}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    sput-object v2, Lo0/g0/g/a;->g:Lo0/g0/g/a;
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "REFUSED_STREAM"
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x7
+
+    invoke-direct {v2, v3, v4, v5}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    sput-object v2, Lo0/g0/g/a;->h:Lo0/g0/g/a;
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "CANCEL"
+
+    const/4 v4, 0x5
+
+    const/16 v6, 0x8
+
+    invoke-direct {v2, v3, v4, v6}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    sput-object v2, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "COMPRESSION_ERROR"
+
+    const/4 v4, 0x6
+
+    const/16 v7, 0x9
+
+    invoke-direct {v2, v3, v4, v7}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "CONNECT_ERROR"
+
+    const/16 v4, 0xa
+
+    invoke-direct {v2, v3, v5, v4}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    aput-object v2, v1, v5
+
+    new-instance v2, Lo0/g0/g/a;
+
+    const-string v3, "ENHANCE_YOUR_CALM"
+
+    invoke-direct {v2, v3, v6, v0}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    aput-object v2, v1, v6
+
+    new-instance v0, Lo0/g0/g/a;
+
+    const-string v2, "INADEQUATE_SECURITY"
+
+    const/16 v3, 0xc
+
+    invoke-direct {v0, v2, v7, v3}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    aput-object v0, v1, v7
+
+    new-instance v0, Lo0/g0/g/a;
+
+    const-string v2, "HTTP_1_1_REQUIRED"
+
+    const/16 v3, 0xd
+
+    invoke-direct {v0, v2, v4, v3}, Lo0/g0/g/a;-><init>(Ljava/lang/String;II)V
+
+    aput-object v0, v1, v4
+
+    sput-object v1, Lo0/g0/g/a;->j:[Lo0/g0/g/a;
+
+    new-instance v0, Lo0/g0/g/a$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/g0/g/a$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/g0/g/a;->k:Lo0/g0/g/a$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;II)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    iput p3, p0, Lo0/g0/g/a;->httpCode:I
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lo0/g0/g/a;
+    .locals 1
+
+    const-class v0, Lo0/g0/g/a;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lo0/g0/g/a;
+
+    return-object p0
+.end method
+
+.method public static values()[Lo0/g0/g/a;
+    .locals 1
+
+    sget-object v0, Lo0/g0/g/a;->j:[Lo0/g0/g/a;
+
+    invoke-virtual {v0}, [Lo0/g0/g/a;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lo0/g0/g/a;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/b.smali b/com.discord/smali_classes2/o0/g0/g/b.smali
new file mode 100644
index 0000000000..31646daf94
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/b.smali
@@ -0,0 +1,307 @@
+.class public final Lo0/g0/g/b;
+.super Ljava/lang/Object;
+.source "Header.kt"
+
+
+# static fields
+.field public static final d:Lokio/ByteString;
+
+.field public static final e:Lokio/ByteString;
+
+.field public static final f:Lokio/ByteString;
+
+.field public static final g:Lokio/ByteString;
+
+.field public static final h:Lokio/ByteString;
+
+.field public static final i:Lokio/ByteString;
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:Lokio/ByteString;
+
+.field public final c:Lokio/ByteString;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, ":"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/b;->d:Lokio/ByteString;
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, ":status"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, ":method"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/b;->f:Lokio/ByteString;
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, ":path"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/b;->g:Lokio/ByteString;
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, ":scheme"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/b;->h:Lokio/ByteString;
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, ":authority"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/b;->i:Lokio/ByteString;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    invoke-virtual {v0, p1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object p1
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    invoke-virtual {v0, p2}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object p2
+
+    invoke-direct {p0, p1, p2}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Lokio/ByteString;Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    invoke-virtual {v0, p2}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object p2
+
+    invoke-direct {p0, p1, p2}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
+
+    return-void
+.end method
+
+.method public constructor <init>(Lokio/ByteString;Lokio/ByteString;)V
+    .locals 1
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    iput-object p2, p0, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result p1
+
+    add-int/lit8 p1, p1, 0x20
+
+    iget-object p2, p0, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    invoke-virtual {p2}, Lokio/ByteString;->h()I
+
+    move-result p2
+
+    add-int/2addr p1, p2
+
+    iput p1, p0, Lo0/g0/g/b;->a:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lo0/g0/g/b;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/g0/g/b;
+
+    iget-object v0, p0, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    iget-object v1, p1, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    iget-object p1, p1, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lokio/ByteString;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Lokio/ByteString;->hashCode()I
+
+    move-result v1
+
+    :cond_1
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    invoke-static {v1}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ": "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    if-eqz v1, :cond_0
+
+    invoke-static {v1}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    throw v2
+
+    :cond_1
+    throw v2
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/c$a.smali b/com.discord/smali_classes2/o0/g0/g/c$a.smali
new file mode 100644
index 0000000000..058f85d550
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/c$a.smali
@@ -0,0 +1,723 @@
+.class public final Lo0/g0/g/c$a;
+.super Ljava/lang/Object;
+.source "Hpack.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Lp0/g;
+
+.field public c:[Lo0/g0/g/b;
+
+.field public d:I
+
+.field public e:I
+
+.field public f:I
+
+.field public final g:I
+
+.field public h:I
+
+
+# direct methods
+.method public constructor <init>(Lp0/w;III)V
+    .locals 0
+
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_0
+
+    move p3, p2
+
+    :cond_0
+    const-string p4, "source"
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p2, p0, Lo0/g0/g/c$a;->g:I
+
+    iput p3, p0, Lo0/g0/g/c$a;->h:I
+
+    new-instance p2, Ljava/util/ArrayList;
+
+    invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object p2, p0, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    const-string p2, "$receiver"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Lp0/q;
+
+    invoke-direct {p2, p1}, Lp0/q;-><init>(Lp0/w;)V
+
+    iput-object p2, p0, Lo0/g0/g/c$a;->b:Lp0/g;
+
+    const/16 p1, 0x8
+
+    new-array p1, p1, [Lo0/g0/g/b;
+
+    iput-object p1, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    const/4 p1, 0x7
+
+    iput p1, p0, Lo0/g0/g/c$a;->d:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 4
+
+    iget-object v0, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    array-length v1, v0
+
+    const-string v2, "$this$fill"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v2, v1, v3}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
+
+    iget-object v0, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    array-length v0, v0
+
+    add-int/lit8 v0, v0, -0x1
+
+    iput v0, p0, Lo0/g0/g/c$a;->d:I
+
+    iput v2, p0, Lo0/g0/g/c$a;->e:I
+
+    iput v2, p0, Lo0/g0/g/c$a;->f:I
+
+    return-void
+.end method
+
+.method public final b(I)I
+    .locals 1
+
+    iget v0, p0, Lo0/g0/g/c$a;->d:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    add-int/2addr v0, p1
+
+    return v0
+.end method
+
+.method public final c(I)I
+    .locals 4
+
+    const/4 v0, 0x0
+
+    if-lez p1, :cond_2
+
+    iget-object v1, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    array-length v1, v1
+
+    add-int/lit8 v1, v1, -0x1
+
+    :goto_0
+    iget v2, p0, Lo0/g0/g/c$a;->d:I
+
+    if-lt v1, v2, :cond_1
+
+    if-lez p1, :cond_1
+
+    iget-object v2, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    aget-object v2, v2, v1
+
+    if-eqz v2, :cond_0
+
+    iget v2, v2, Lo0/g0/g/b;->a:I
+
+    sub-int/2addr p1, v2
+
+    iget v3, p0, Lo0/g0/g/c$a;->f:I
+
+    sub-int/2addr v3, v2
+
+    iput v3, p0, Lo0/g0/g/c$a;->f:I
+
+    iget v2, p0, Lo0/g0/g/c$a;->e:I
+
+    add-int/lit8 v2, v2, -0x1
+
+    iput v2, p0, Lo0/g0/g/c$a;->e:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    add-int/lit8 v1, v1, -0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_1
+    iget-object p1, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    iget v1, p0, Lo0/g0/g/c$a;->d:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    add-int/lit8 v1, v1, 0x1
+
+    add-int/2addr v1, v0
+
+    iget v3, p0, Lo0/g0/g/c$a;->e:I
+
+    invoke-static {p1, v2, p1, v1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget p1, p0, Lo0/g0/g/c$a;->d:I
+
+    add-int/2addr p1, v0
+
+    iput p1, p0, Lo0/g0/g/c$a;->d:I
+
+    :cond_2
+    return v0
+.end method
+
+.method public final d(I)Lokio/ByteString;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    if-ltz p1, :cond_0
+
+    sget-object v0, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v0, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length v0, v0
+
+    add-int/lit8 v0, v0, -0x1
+
+    if-gt p1, v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    sget-object v0, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v0, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    aget-object p1, v0, p1
+
+    iget-object p1, p1, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    goto :goto_1
+
+    :cond_1
+    sget-object v0, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v0, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length v0, v0
+
+    sub-int v0, p1, v0
+
+    invoke-virtual {p0, v0}, Lo0/g0/g/c$a;->b(I)I
+
+    move-result v0
+
+    if-ltz v0, :cond_3
+
+    iget-object v1, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    array-length v2, v1
+
+    if-ge v0, v2, :cond_3
+
+    aget-object p1, v1, v0
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p1, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    :goto_1
+    return-object p1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_3
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "Header index too large "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    add-int/lit8 p1, p1, 0x1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final e(ILo0/g0/g/b;)V
+    .locals 6
+
+    iget-object v0, p0, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    iget v0, p2, Lo0/g0/g/b;->a:I
+
+    const/4 v1, -0x1
+
+    if-eq p1, v1, :cond_1
+
+    iget-object v2, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    iget v3, p0, Lo0/g0/g/c$a;->d:I
+
+    add-int/lit8 v3, v3, 0x1
+
+    add-int/2addr v3, p1
+
+    aget-object v2, v2, v3
+
+    if-eqz v2, :cond_0
+
+    iget v2, v2, Lo0/g0/g/b;->a:I
+
+    sub-int/2addr v0, v2
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iget v2, p0, Lo0/g0/g/c$a;->h:I
+
+    if-le v0, v2, :cond_2
+
+    invoke-virtual {p0}, Lo0/g0/g/c$a;->a()V
+
+    return-void
+
+    :cond_2
+    iget v3, p0, Lo0/g0/g/c$a;->f:I
+
+    add-int/2addr v3, v0
+
+    sub-int/2addr v3, v2
+
+    invoke-virtual {p0, v3}, Lo0/g0/g/c$a;->c(I)I
+
+    move-result v2
+
+    if-ne p1, v1, :cond_4
+
+    iget p1, p0, Lo0/g0/g/c$a;->e:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iget-object v2, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    array-length v3, v2
+
+    if-le p1, v3, :cond_3
+
+    array-length p1, v2
+
+    mul-int/lit8 p1, p1, 0x2
+
+    new-array p1, p1, [Lo0/g0/g/b;
+
+    const/4 v3, 0x0
+
+    array-length v4, v2
+
+    array-length v5, v2
+
+    invoke-static {v2, v3, p1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget-object v2, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    array-length v2, v2
+
+    add-int/2addr v2, v1
+
+    iput v2, p0, Lo0/g0/g/c$a;->d:I
+
+    iput-object p1, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    :cond_3
+    iget p1, p0, Lo0/g0/g/c$a;->d:I
+
+    add-int/lit8 v1, p1, -0x1
+
+    iput v1, p0, Lo0/g0/g/c$a;->d:I
+
+    iget-object v1, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    aput-object p2, v1, p1
+
+    iget p1, p0, Lo0/g0/g/c$a;->e:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Lo0/g0/g/c$a;->e:I
+
+    goto :goto_1
+
+    :cond_4
+    iget v1, p0, Lo0/g0/g/c$a;->d:I
+
+    add-int/lit8 v1, v1, 0x1
+
+    add-int/2addr v1, p1
+
+    add-int/2addr v1, v2
+
+    add-int/2addr v1, p1
+
+    iget-object p1, p0, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    aput-object p2, p1, v1
+
+    :goto_1
+    iget p1, p0, Lo0/g0/g/c$a;->f:I
+
+    add-int/2addr p1, v0
+
+    iput p1, p0, Lo0/g0/g/c$a;->f:I
+
+    return-void
+.end method
+
+.method public final f()Lokio/ByteString;
+    .locals 13
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/c$a;->b:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readByte()B
+
+    move-result v0
+
+    const/16 v1, 0xff
+
+    invoke-static {v0, v1}, Lo0/g0/b;->a(BI)I
+
+    move-result v0
+
+    and-int/lit16 v2, v0, 0x80
+
+    const/16 v3, 0x80
+
+    const/4 v4, 0x0
+
+    if-ne v2, v3, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    const/16 v3, 0x7f
+
+    invoke-virtual {p0, v0, v3}, Lo0/g0/g/c$a;->g(II)I
+
+    move-result v0
+
+    int-to-long v5, v0
+
+    if-eqz v2, :cond_a
+
+    new-instance v0, Lp0/e;
+
+    invoke-direct {v0}, Lp0/e;-><init>()V
+
+    sget-object v2, Lo0/g0/g/n;->d:Lo0/g0/g/n;
+
+    iget-object v2, p0, Lo0/g0/g/c$a;->b:Lp0/g;
+
+    const-string v3, "source"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "sink"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v3, Lo0/g0/g/n;->c:Lo0/g0/g/n$a;
+
+    const-wide/16 v7, 0x0
+
+    move-wide v8, v7
+
+    const/4 v7, 0x0
+
+    :goto_1
+    const/4 v10, 0x0
+
+    cmp-long v11, v8, v5
+
+    if-gez v11, :cond_5
+
+    invoke-interface {v2}, Lp0/g;->readByte()B
+
+    move-result v11
+
+    and-int/2addr v11, v1
+
+    shl-int/lit8 v4, v4, 0x8
+
+    or-int/2addr v4, v11
+
+    add-int/lit8 v7, v7, 0x8
+
+    :goto_2
+    const/16 v11, 0x8
+
+    if-lt v7, v11, :cond_4
+
+    add-int/lit8 v11, v7, -0x8
+
+    ushr-int v12, v4, v11
+
+    and-int/2addr v12, v1
+
+    iget-object v3, v3, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    if-eqz v3, :cond_3
+
+    aget-object v3, v3, v12
+
+    if-eqz v3, :cond_2
+
+    iget-object v12, v3, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    if-nez v12, :cond_1
+
+    iget v11, v3, Lo0/g0/g/n$a;->b:I
+
+    invoke-virtual {v0, v11}, Lp0/e;->I(I)Lp0/e;
+
+    iget v3, v3, Lo0/g0/g/n$a;->c:I
+
+    sub-int/2addr v7, v3
+
+    sget-object v3, Lo0/g0/g/n;->c:Lo0/g0/g/n$a;
+
+    goto :goto_2
+
+    :cond_1
+    move v7, v11
+
+    goto :goto_2
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v10
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v10
+
+    :cond_4
+    const-wide/16 v10, 0x1
+
+    add-long/2addr v8, v10
+
+    goto :goto_1
+
+    :cond_5
+    :goto_3
+    if-lez v7, :cond_9
+
+    rsub-int/lit8 v2, v7, 0x8
+
+    shl-int v2, v4, v2
+
+    and-int/2addr v2, v1
+
+    iget-object v3, v3, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    if-eqz v3, :cond_8
+
+    aget-object v2, v3, v2
+
+    if-eqz v2, :cond_7
+
+    iget-object v3, v2, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    if-nez v3, :cond_9
+
+    iget v3, v2, Lo0/g0/g/n$a;->c:I
+
+    if-le v3, v7, :cond_6
+
+    goto :goto_4
+
+    :cond_6
+    iget v3, v2, Lo0/g0/g/n$a;->b:I
+
+    invoke-virtual {v0, v3}, Lp0/e;->I(I)Lp0/e;
+
+    iget v2, v2, Lo0/g0/g/n$a;->c:I
+
+    sub-int/2addr v7, v2
+
+    sget-object v3, Lo0/g0/g/n;->c:Lo0/g0/g/n$a;
+
+    goto :goto_3
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v10
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v10
+
+    :cond_9
+    :goto_4
+    invoke-virtual {v0}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object v0
+
+    goto :goto_5
+
+    :cond_a
+    iget-object v0, p0, Lo0/g0/g/c$a;->b:Lp0/g;
+
+    invoke-interface {v0, v5, v6}, Lp0/g;->u(J)Lokio/ByteString;
+
+    move-result-object v0
+
+    :goto_5
+    return-object v0
+.end method
+
+.method public final g(II)I
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    and-int/2addr p1, p2
+
+    if-ge p1, p2, :cond_0
+
+    return p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    iget-object v0, p0, Lo0/g0/g/c$a;->b:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readByte()B
+
+    move-result v0
+
+    const/16 v1, 0xff
+
+    invoke-static {v0, v1}, Lo0/g0/b;->a(BI)I
+
+    move-result v0
+
+    and-int/lit16 v1, v0, 0x80
+
+    if-eqz v1, :cond_1
+
+    and-int/lit8 v0, v0, 0x7f
+
+    shl-int/2addr v0, p1
+
+    add-int/2addr p2, v0
+
+    add-int/lit8 p1, p1, 0x7
+
+    goto :goto_0
+
+    :cond_1
+    shl-int p1, v0, p1
+
+    add-int/2addr p2, p1
+
+    return p2
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/c$b.smali b/com.discord/smali_classes2/o0/g0/g/c$b.smali
new file mode 100644
index 0000000000..b7cda0d5ce
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/c$b.smali
@@ -0,0 +1,889 @@
+.class public final Lo0/g0/g/c$b;
+.super Ljava/lang/Object;
+.source "Hpack.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public a:I
+
+.field public b:Z
+
+.field public c:I
+
+.field public d:[Lo0/g0/g/b;
+
+.field public e:I
+
+.field public f:I
+
+.field public g:I
+
+.field public h:I
+
+.field public final i:Z
+
+.field public final j:Lp0/e;
+
+
+# direct methods
+.method public constructor <init>(IZLp0/e;I)V
+    .locals 1
+
+    and-int/lit8 v0, p4, 0x1
+
+    if-eqz v0, :cond_0
+
+    const/16 p1, 0x1000
+
+    :cond_0
+    and-int/lit8 p4, p4, 0x2
+
+    if-eqz p4, :cond_1
+
+    const/4 p2, 0x1
+
+    :cond_1
+    const-string p4, "out"
+
+    invoke-static {p3, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lo0/g0/g/c$b;->h:I
+
+    iput-boolean p2, p0, Lo0/g0/g/c$b;->i:Z
+
+    iput-object p3, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    const p2, 0x7fffffff
+
+    iput p2, p0, Lo0/g0/g/c$b;->a:I
+
+    iput p1, p0, Lo0/g0/g/c$b;->c:I
+
+    const/16 p1, 0x8
+
+    new-array p1, p1, [Lo0/g0/g/b;
+
+    iput-object p1, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    const/4 p1, 0x7
+
+    iput p1, p0, Lo0/g0/g/c$b;->e:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 4
+
+    iget-object v0, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    array-length v1, v0
+
+    const-string v2, "$this$fill"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v2, v1, v3}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
+
+    iget-object v0, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    array-length v0, v0
+
+    add-int/lit8 v0, v0, -0x1
+
+    iput v0, p0, Lo0/g0/g/c$b;->e:I
+
+    iput v2, p0, Lo0/g0/g/c$b;->f:I
+
+    iput v2, p0, Lo0/g0/g/c$b;->g:I
+
+    return-void
+.end method
+
+.method public final b(I)I
+    .locals 5
+
+    const/4 v0, 0x0
+
+    if-lez p1, :cond_3
+
+    iget-object v1, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    array-length v1, v1
+
+    add-int/lit8 v1, v1, -0x1
+
+    :goto_0
+    iget v2, p0, Lo0/g0/g/c$b;->e:I
+
+    const/4 v3, 0x0
+
+    if-lt v1, v2, :cond_2
+
+    if-lez p1, :cond_2
+
+    iget-object v2, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    aget-object v4, v2, v1
+
+    if-eqz v4, :cond_1
+
+    iget v4, v4, Lo0/g0/g/b;->a:I
+
+    sub-int/2addr p1, v4
+
+    iget v4, p0, Lo0/g0/g/c$b;->g:I
+
+    aget-object v2, v2, v1
+
+    if-eqz v2, :cond_0
+
+    iget v2, v2, Lo0/g0/g/b;->a:I
+
+    sub-int/2addr v4, v2
+
+    iput v4, p0, Lo0/g0/g/c$b;->g:I
+
+    iget v2, p0, Lo0/g0/g/c$b;->f:I
+
+    add-int/lit8 v2, v2, -0x1
+
+    iput v2, p0, Lo0/g0/g/c$b;->f:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    add-int/lit8 v1, v1, -0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_2
+    iget-object p1, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    iget v1, p0, Lo0/g0/g/c$b;->e:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    add-int/lit8 v1, v1, 0x1
+
+    add-int/2addr v1, v0
+
+    iget v4, p0, Lo0/g0/g/c$b;->f:I
+
+    invoke-static {p1, v2, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget-object p1, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    iget v1, p0, Lo0/g0/g/c$b;->e:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    add-int/lit8 v1, v1, 0x1
+
+    add-int/2addr v1, v0
+
+    invoke-static {p1, v2, v1, v3}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
+
+    iget p1, p0, Lo0/g0/g/c$b;->e:I
+
+    add-int/2addr p1, v0
+
+    iput p1, p0, Lo0/g0/g/c$b;->e:I
+
+    :cond_3
+    return v0
+.end method
+
+.method public final c(Lo0/g0/g/b;)V
+    .locals 6
+
+    iget v0, p1, Lo0/g0/g/b;->a:I
+
+    iget v1, p0, Lo0/g0/g/c$b;->c:I
+
+    if-le v0, v1, :cond_0
+
+    invoke-virtual {p0}, Lo0/g0/g/c$b;->a()V
+
+    return-void
+
+    :cond_0
+    iget v2, p0, Lo0/g0/g/c$b;->g:I
+
+    add-int/2addr v2, v0
+
+    sub-int/2addr v2, v1
+
+    invoke-virtual {p0, v2}, Lo0/g0/g/c$b;->b(I)I
+
+    iget v1, p0, Lo0/g0/g/c$b;->f:I
+
+    add-int/lit8 v1, v1, 0x1
+
+    iget-object v2, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    array-length v3, v2
+
+    if-le v1, v3, :cond_1
+
+    array-length v1, v2
+
+    mul-int/lit8 v1, v1, 0x2
+
+    new-array v1, v1, [Lo0/g0/g/b;
+
+    const/4 v3, 0x0
+
+    array-length v4, v2
+
+    array-length v5, v2
+
+    invoke-static {v2, v3, v1, v4, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget-object v2, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    array-length v2, v2
+
+    add-int/lit8 v2, v2, -0x1
+
+    iput v2, p0, Lo0/g0/g/c$b;->e:I
+
+    iput-object v1, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    :cond_1
+    iget v1, p0, Lo0/g0/g/c$b;->e:I
+
+    add-int/lit8 v2, v1, -0x1
+
+    iput v2, p0, Lo0/g0/g/c$b;->e:I
+
+    iget-object v2, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    aput-object p1, v2, v1
+
+    iget p1, p0, Lo0/g0/g/c$b;->f:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Lo0/g0/g/c$b;->f:I
+
+    iget p1, p0, Lo0/g0/g/c$b;->g:I
+
+    add-int/2addr p1, v0
+
+    iput p1, p0, Lo0/g0/g/c$b;->g:I
+
+    return-void
+.end method
+
+.method public final d(Lokio/ByteString;)V
+    .locals 11
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/g/c$b;->i:Z
+
+    const/16 v1, 0x7f
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_4
+
+    sget-object v0, Lo0/g0/g/n;->d:Lo0/g0/g/n;
+
+    const-string v0, "bytes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    const-wide/16 v3, 0x0
+
+    move-wide v6, v3
+
+    const/4 v5, 0x0
+
+    :goto_0
+    const/16 v8, 0xff
+
+    if-ge v5, v0, :cond_0
+
+    invoke-virtual {p1, v5}, Lokio/ByteString;->k(I)B
+
+    move-result v9
+
+    invoke-static {v9, v8}, Lo0/g0/b;->a(BI)I
+
+    move-result v8
+
+    sget-object v9, Lo0/g0/g/n;->b:[B
+
+    aget-byte v8, v9, v8
+
+    int-to-long v8, v8
+
+    add-long/2addr v6, v8
+
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x7
+
+    int-to-long v9, v0
+
+    add-long/2addr v6, v9
+
+    const/4 v0, 0x3
+
+    shr-long v5, v6, v0
+
+    long-to-int v0, v5
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v5
+
+    if-ge v0, v5, :cond_4
+
+    new-instance v0, Lp0/e;
+
+    invoke-direct {v0}, Lp0/e;-><init>()V
+
+    sget-object v5, Lo0/g0/g/n;->d:Lo0/g0/g/n;
+
+    const-string v5, "source"
+
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "sink"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v5
+
+    move-wide v6, v3
+
+    const/4 v3, 0x0
+
+    :goto_1
+    if-ge v2, v5, :cond_2
+
+    invoke-virtual {p1, v2}, Lokio/ByteString;->k(I)B
+
+    move-result v4
+
+    invoke-static {v4, v8}, Lo0/g0/b;->a(BI)I
+
+    move-result v4
+
+    sget-object v9, Lo0/g0/g/n;->a:[I
+
+    aget v9, v9, v4
+
+    sget-object v10, Lo0/g0/g/n;->b:[B
+
+    aget-byte v4, v10, v4
+
+    shl-long/2addr v6, v4
+
+    int-to-long v9, v9
+
+    or-long/2addr v6, v9
+
+    add-int/2addr v3, v4
+
+    :goto_2
+    const/16 v4, 0x8
+
+    if-lt v3, v4, :cond_1
+
+    add-int/lit8 v3, v3, -0x8
+
+    shr-long v9, v6, v3
+
+    long-to-int v4, v9
+
+    invoke-interface {v0, v4}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
+
+    goto :goto_2
+
+    :cond_1
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    if-lez v3, :cond_3
+
+    rsub-int/lit8 p1, v3, 0x8
+
+    shl-long v4, v6, p1
+
+    const-wide/16 v6, 0xff
+
+    ushr-long v2, v6, v3
+
+    or-long/2addr v2, v4
+
+    long-to-int p1, v2
+
+    invoke-interface {v0, p1}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
+
+    :cond_3
+    invoke-virtual {v0}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    const/16 v2, 0x80
+
+    invoke-virtual {p0, v0, v1, v2}, Lo0/g0/g/c$b;->f(III)V
+
+    iget-object v0, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->D(Lokio/ByteString;)Lp0/e;
+
+    goto :goto_3
+
+    :cond_4
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    invoke-virtual {p0, v0, v1, v2}, Lo0/g0/g/c$b;->f(III)V
+
+    iget-object v0, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->D(Lokio/ByteString;)Lp0/e;
+
+    :goto_3
+    return-void
+.end method
+
+.method public final e(Ljava/util/List;)V
+    .locals 14
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "headerBlock"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/g/c$b;->b:Z
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_1
+
+    iget v0, p0, Lo0/g0/g/c$b;->a:I
+
+    iget v2, p0, Lo0/g0/g/c$b;->c:I
+
+    const/16 v3, 0x20
+
+    const/16 v4, 0x1f
+
+    if-ge v0, v2, :cond_0
+
+    invoke-virtual {p0, v0, v4, v3}, Lo0/g0/g/c$b;->f(III)V
+
+    :cond_0
+    iput-boolean v1, p0, Lo0/g0/g/c$b;->b:Z
+
+    const v0, 0x7fffffff
+
+    iput v0, p0, Lo0/g0/g/c$b;->a:I
+
+    iget v0, p0, Lo0/g0/g/c$b;->c:I
+
+    invoke-virtual {p0, v0, v4, v3}, Lo0/g0/g/c$b;->f(III)V
+
+    :cond_1
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v0, :cond_f
+
+    invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lo0/g0/g/b;
+
+    iget-object v4, v3, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    invoke-virtual {v4}, Lokio/ByteString;->n()Lokio/ByteString;
+
+    move-result-object v4
+
+    iget-object v5, v3, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    sget-object v6, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v6, Lo0/g0/g/c;->b:Ljava/util/Map;
+
+    invoke-interface {v6, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Ljava/lang/Integer;
+
+    const/4 v7, -0x1
+
+    if-eqz v6, :cond_5
+
+    invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
+
+    move-result v6
+
+    add-int/lit8 v6, v6, 0x1
+
+    const/4 v8, 0x7
+
+    const/4 v9, 0x2
+
+    if-le v9, v6, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    if-lt v8, v6, :cond_4
+
+    sget-object v8, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v8, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    add-int/lit8 v9, v6, -0x1
+
+    aget-object v8, v8, v9
+
+    iget-object v8, v8, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    invoke-static {v8, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_3
+
+    move v8, v6
+
+    goto :goto_2
+
+    :cond_3
+    sget-object v8, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v8, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    aget-object v8, v8, v6
+
+    iget-object v8, v8, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    invoke-static {v8, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_4
+
+    add-int/lit8 v8, v6, 0x1
+
+    move v13, v8
+
+    move v8, v6
+
+    move v6, v13
+
+    goto :goto_2
+
+    :cond_4
+    :goto_1
+    move v8, v6
+
+    const/4 v6, -0x1
+
+    goto :goto_2
+
+    :cond_5
+    const/4 v6, -0x1
+
+    const/4 v8, -0x1
+
+    :goto_2
+    const/4 v9, 0x0
+
+    if-ne v6, v7, :cond_a
+
+    iget v10, p0, Lo0/g0/g/c$b;->e:I
+
+    add-int/lit8 v10, v10, 0x1
+
+    iget-object v11, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    array-length v11, v11
+
+    :goto_3
+    if-ge v10, v11, :cond_a
+
+    iget-object v12, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    aget-object v12, v12, v10
+
+    if-eqz v12, :cond_9
+
+    iget-object v12, v12, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    invoke-static {v12, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_8
+
+    iget-object v12, p0, Lo0/g0/g/c$b;->d:[Lo0/g0/g/b;
+
+    aget-object v12, v12, v10
+
+    if-eqz v12, :cond_7
+
+    iget-object v12, v12, Lo0/g0/g/b;->c:Lokio/ByteString;
+
+    invoke-static {v12, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_6
+
+    iget v6, p0, Lo0/g0/g/c$b;->e:I
+
+    sub-int/2addr v10, v6
+
+    sget-object v6, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v6, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length v6, v6
+
+    add-int/2addr v6, v10
+
+    goto :goto_5
+
+    :cond_6
+    if-ne v8, v7, :cond_8
+
+    iget v8, p0, Lo0/g0/g/c$b;->e:I
+
+    sub-int v8, v10, v8
+
+    sget-object v12, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object v12, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length v12, v12
+
+    add-int/2addr v8, v12
+
+    goto :goto_4
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_8
+    :goto_4
+    add-int/lit8 v10, v10, 0x1
+
+    goto :goto_3
+
+    :cond_9
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_a
+    :goto_5
+    if-eq v6, v7, :cond_b
+
+    const/16 v3, 0x7f
+
+    const/16 v4, 0x80
+
+    invoke-virtual {p0, v6, v3, v4}, Lo0/g0/g/c$b;->f(III)V
+
+    goto :goto_6
+
+    :cond_b
+    const/16 v6, 0x40
+
+    if-ne v8, v7, :cond_c
+
+    iget-object v7, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    invoke-virtual {v7, v6}, Lp0/e;->I(I)Lp0/e;
+
+    invoke-virtual {p0, v4}, Lo0/g0/g/c$b;->d(Lokio/ByteString;)V
+
+    invoke-virtual {p0, v5}, Lo0/g0/g/c$b;->d(Lokio/ByteString;)V
+
+    invoke-virtual {p0, v3}, Lo0/g0/g/c$b;->c(Lo0/g0/g/b;)V
+
+    goto :goto_6
+
+    :cond_c
+    sget-object v7, Lo0/g0/g/b;->d:Lokio/ByteString;
+
+    if-eqz v4, :cond_e
+
+    const-string v9, "prefix"
+
+    invoke-static {v7, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v4, v7}, Lp0/y/a;->n(Lokio/ByteString;Lokio/ByteString;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_d
+
+    sget-object v7, Lo0/g0/g/b;->i:Lokio/ByteString;
+
+    invoke-static {v7, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    xor-int/lit8 v4, v4, 0x1
+
+    if-eqz v4, :cond_d
+
+    const/16 v3, 0xf
+
+    invoke-virtual {p0, v8, v3, v1}, Lo0/g0/g/c$b;->f(III)V
+
+    invoke-virtual {p0, v5}, Lo0/g0/g/c$b;->d(Lokio/ByteString;)V
+
+    goto :goto_6
+
+    :cond_d
+    const/16 v4, 0x3f
+
+    invoke-virtual {p0, v8, v4, v6}, Lo0/g0/g/c$b;->f(III)V
+
+    invoke-virtual {p0, v5}, Lo0/g0/g/c$b;->d(Lokio/ByteString;)V
+
+    invoke-virtual {p0, v3}, Lo0/g0/g/c$b;->c(Lo0/g0/g/b;)V
+
+    :goto_6
+    add-int/lit8 v2, v2, 0x1
+
+    goto/16 :goto_0
+
+    :cond_e
+    throw v9
+
+    :cond_f
+    return-void
+.end method
+
+.method public final f(III)V
+    .locals 1
+
+    if-ge p1, p2, :cond_0
+
+    iget-object p2, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    or-int/2addr p1, p3
+
+    invoke-virtual {p2, p1}, Lp0/e;->I(I)Lp0/e;
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    or-int/2addr p3, p2
+
+    invoke-virtual {v0, p3}, Lp0/e;->I(I)Lp0/e;
+
+    sub-int/2addr p1, p2
+
+    :goto_0
+    const/16 p2, 0x80
+
+    if-lt p1, p2, :cond_1
+
+    and-int/lit8 p3, p1, 0x7f
+
+    iget-object v0, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    or-int/2addr p2, p3
+
+    invoke-virtual {v0, p2}, Lp0/e;->I(I)Lp0/e;
+
+    ushr-int/lit8 p1, p1, 0x7
+
+    goto :goto_0
+
+    :cond_1
+    iget-object p2, p0, Lo0/g0/g/c$b;->j:Lp0/e;
+
+    invoke-virtual {p2, p1}, Lp0/e;->I(I)Lp0/e;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/c.smali b/com.discord/smali_classes2/o0/g0/g/c.smali
new file mode 100644
index 0000000000..c25b9f2c70
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/c.smali
@@ -0,0 +1,826 @@
+.class public final Lo0/g0/g/c;
+.super Ljava/lang/Object;
+.source "Hpack.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/g/c$a;,
+        Lo0/g0/g/c$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:[Lo0/g0/g/b;
+
+.field public static final b:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Lokio/ByteString;",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final c:Lo0/g0/g/c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 6
+
+    new-instance v0, Lo0/g0/g/c;
+
+    invoke-direct {v0}, Lo0/g0/g/c;-><init>()V
+
+    sput-object v0, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    const/16 v0, 0x3d
+
+    new-array v0, v0, [Lo0/g0/g/b;
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v2, Lo0/g0/g/b;->i:Lokio/ByteString;
+
+    const-string v3, ""
+
+    invoke-direct {v1, v2, v3}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->f:Lokio/ByteString;
+
+    const-string v5, "GET"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v4, 0x1
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->f:Lokio/ByteString;
+
+    const-string v5, "POST"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v4, 0x2
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->g:Lokio/ByteString;
+
+    const-string v5, "/"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v4, 0x3
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->g:Lokio/ByteString;
+
+    const-string v5, "/index.html"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v4, 0x4
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->h:Lokio/ByteString;
+
+    const-string v5, "http"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v4, 0x5
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->h:Lokio/ByteString;
+
+    const-string v5, "https"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v4, 0x6
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    const-string v5, "200"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/4 v4, 0x7
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    const-string v5, "204"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/16 v4, 0x8
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    const-string v5, "206"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/16 v4, 0x9
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    const-string v5, "304"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/16 v4, 0xa
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    const-string v5, "400"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/16 v4, 0xb
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    const-string v5, "404"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/16 v4, 0xc
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    sget-object v4, Lo0/g0/g/b;->e:Lokio/ByteString;
+
+    const-string v5, "500"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    const/16 v4, 0xd
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "accept-charset"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0xe
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "accept-encoding"
+
+    const-string v5, "gzip, deflate"
+
+    invoke-direct {v1, v4, v5}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0xf
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "accept-language"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x10
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "accept-ranges"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x11
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "accept"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x12
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "access-control-allow-origin"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x13
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "age"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x14
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "allow"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x15
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "authorization"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x16
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "cache-control"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x17
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "content-disposition"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x18
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "content-encoding"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x19
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "content-language"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x1a
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "content-length"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x1b
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "content-location"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x1c
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "content-range"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x1d
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "content-type"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x1e
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "cookie"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x1f
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "date"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x20
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "etag"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x21
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "expect"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x22
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "expires"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x23
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "from"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x24
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "host"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x25
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "if-match"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x26
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "if-modified-since"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x27
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "if-none-match"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x28
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "if-range"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x29
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "if-unmodified-since"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x2a
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "last-modified"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x2b
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "link"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x2c
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "location"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x2d
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "max-forwards"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x2e
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "proxy-authenticate"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x2f
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "proxy-authorization"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x30
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "range"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x31
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "referer"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x32
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "refresh"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x33
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "retry-after"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x34
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "server"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x35
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "set-cookie"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x36
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "strict-transport-security"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x37
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "transfer-encoding"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x38
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "user-agent"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x39
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "vary"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x3a
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "via"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v4, 0x3b
+
+    aput-object v1, v0, v4
+
+    new-instance v1, Lo0/g0/g/b;
+
+    const-string v4, "www-authenticate"
+
+    invoke-direct {v1, v4, v3}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    const/16 v3, 0x3c
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    sget-object v1, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length v1, v1
+
+    invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(I)V
+
+    sget-object v1, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length v1, v1
+
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    sget-object v3, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    aget-object v3, v3, v2
+
+    iget-object v3, v3, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    invoke-virtual {v0, v3}, Ljava/util/LinkedHashMap;->containsKey(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_0
+
+    sget-object v3, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    aget-object v3, v3, v2
+
+    iget-object v3, v3, Lo0/g0/g/b;->b:Lokio/ByteString;
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-virtual {v0, v3, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v0
+
+    const-string v1, "Collections.unmodifiableMap(result)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object v0, Lo0/g0/g/c;->b:Ljava/util/Map;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lokio/ByteString;)Lokio/ByteString;
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_2
+
+    const/16 v2, 0x41
+
+    int-to-byte v2, v2
+
+    const/16 v3, 0x5a
+
+    int-to-byte v3, v3
+
+    invoke-virtual {p1, v1}, Lokio/ByteString;->k(I)B
+
+    move-result v4
+
+    if-le v2, v4, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    if-ge v3, v4, :cond_1
+
+    :goto_1
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "PROTOCOL_ERROR response malformed: mixed case name: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-static {p1}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/d.smali b/com.discord/smali_classes2/o0/g0/g/d.smali
new file mode 100644
index 0000000000..8cac02bce4
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/d.smali
@@ -0,0 +1,499 @@
+.class public final Lo0/g0/g/d;
+.super Ljava/lang/Object;
+.source "Http2.kt"
+
+
+# static fields
+.field public static final a:Lokio/ByteString;
+
+.field public static final b:[Ljava/lang/String;
+
+.field public static final c:[Ljava/lang/String;
+
+.field public static final d:[Ljava/lang/String;
+
+.field public static final e:Lo0/g0/g/d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 16
+
+    new-instance v0, Lo0/g0/g/d;
+
+    invoke-direct {v0}, Lo0/g0/g/d;-><init>()V
+
+    sput-object v0, Lo0/g0/g/d;->e:Lo0/g0/g/d;
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/d;->a:Lokio/ByteString;
+
+    const-string v1, "DATA"
+
+    const-string v2, "HEADERS"
+
+    const-string v3, "PRIORITY"
+
+    const-string v4, "RST_STREAM"
+
+    const-string v5, "SETTINGS"
+
+    const-string v6, "PUSH_PROMISE"
+
+    const-string v7, "PING"
+
+    const-string v8, "GOAWAY"
+
+    const-string v9, "WINDOW_UPDATE"
+
+    const-string v10, "CONTINUATION"
+
+    filled-new-array/range {v1 .. v10}, [Ljava/lang/String;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/d;->b:[Ljava/lang/String;
+
+    const/16 v0, 0x40
+
+    new-array v0, v0, [Ljava/lang/String;
+
+    sput-object v0, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    const/16 v0, 0x100
+
+    new-array v1, v0, [Ljava/lang/String;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    const/4 v4, 0x4
+
+    const/16 v5, 0x20
+
+    const/4 v6, 0x1
+
+    if-ge v3, v0, :cond_0
+
+    new-array v6, v6, [Ljava/lang/Object;
+
+    invoke-static {v3}, Ljava/lang/Integer;->toBinaryString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "Integer.toBinaryString(it)"
+
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    aput-object v7, v6, v2
+
+    const-string v7, "%8s"
+
+    invoke-static {v7, v6}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v6
+
+    const/16 v7, 0x30
+
+    invoke-static {v6, v5, v7, v2, v4}, Lk0/u/k;->replace$default(Ljava/lang/String;CCZI)Ljava/lang/String;
+
+    move-result-object v4
+
+    aput-object v4, v1, v3
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    sput-object v1, Lo0/g0/g/d;->d:[Ljava/lang/String;
+
+    sget-object v0, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    const-string v1, ""
+
+    aput-object v1, v0, v2
+
+    const-string v1, "END_STREAM"
+
+    aput-object v1, v0, v6
+
+    new-array v1, v6, [I
+
+    aput v6, v1, v2
+
+    const-string v3, "PADDED"
+
+    const/16 v7, 0x8
+
+    aput-object v3, v0, v7
+
+    const/4 v0, 0x0
+
+    :goto_1
+    const-string v3, "|PADDED"
+
+    if-ge v0, v6, :cond_1
+
+    aget v8, v1, v0
+
+    sget-object v9, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    or-int/lit8 v10, v8, 0x8
+
+    aget-object v8, v9, v8
+
+    invoke-static {v8, v3}, Lk0/o/c/i;->stringPlus(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    aput-object v3, v9, v10
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    sget-object v0, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    const-string v8, "END_HEADERS"
+
+    aput-object v8, v0, v4
+
+    const-string v4, "PRIORITY"
+
+    aput-object v4, v0, v5
+
+    const/16 v4, 0x24
+
+    const-string v5, "END_HEADERS|PRIORITY"
+
+    aput-object v5, v0, v4
+
+    const/4 v0, 0x3
+
+    new-array v4, v0, [I
+
+    fill-array-data v4, :array_0
+
+    const/4 v5, 0x0
+
+    :goto_2
+    if-ge v5, v0, :cond_3
+
+    aget v8, v4, v5
+
+    const/4 v9, 0x0
+
+    :goto_3
+    if-ge v9, v6, :cond_2
+
+    aget v10, v1, v9
+
+    sget-object v11, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    or-int v12, v10, v8
+
+    new-instance v13, Ljava/lang/StringBuilder;
+
+    invoke-direct {v13}, Ljava/lang/StringBuilder;-><init>()V
+
+    sget-object v14, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    aget-object v14, v14, v10
+
+    invoke-virtual {v13, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v14, "|"
+
+    invoke-virtual {v13, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v15, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    aget-object v15, v15, v8
+
+    invoke-virtual {v13, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v13}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v13
+
+    aput-object v13, v11, v12
+
+    sget-object v11, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    or-int/2addr v12, v7
+
+    new-instance v13, Ljava/lang/StringBuilder;
+
+    invoke-direct {v13}, Ljava/lang/StringBuilder;-><init>()V
+
+    sget-object v15, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    aget-object v10, v15, v10
+
+    invoke-virtual {v13, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v13, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v10, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    aget-object v10, v10, v8
+
+    invoke-static {v13, v10, v3}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v10
+
+    aput-object v10, v11, v12
+
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_3
+
+    :cond_2
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    sget-object v0, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    array-length v0, v0
+
+    :goto_4
+    if-ge v2, v0, :cond_5
+
+    sget-object v1, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    aget-object v3, v1, v2
+
+    if-nez v3, :cond_4
+
+    sget-object v3, Lo0/g0/g/d;->d:[Ljava/lang/String;
+
+    aget-object v3, v3, v2
+
+    aput-object v3, v1, v2
+
+    :cond_4
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_4
+
+    :cond_5
+    return-void
+
+    :array_0
+    .array-data 4
+        0x4
+        0x20
+        0x24
+    .end array-data
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(ZIIII)Ljava/lang/String;
+    .locals 9
+
+    sget-object v0, Lo0/g0/g/d;->b:[Ljava/lang/String;
+
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-ge p4, v1, :cond_0
+
+    aget-object v0, v0, p4
+
+    goto :goto_0
+
+    :cond_0
+    new-array v0, v3, [Ljava/lang/Object;
+
+    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    aput-object v1, v0, v2
+
+    const-string v1, "0x%02x"
+
+    invoke-static {v1, v0}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_0
+    const/4 v1, 0x5
+
+    const/4 v4, 0x3
+
+    const/4 v5, 0x2
+
+    const/4 v6, 0x4
+
+    if-nez p5, :cond_1
+
+    const-string p4, ""
+
+    goto :goto_2
+
+    :cond_1
+    if-eq p4, v5, :cond_8
+
+    if-eq p4, v4, :cond_8
+
+    if-eq p4, v6, :cond_6
+
+    const/4 v7, 0x6
+
+    if-eq p4, v7, :cond_6
+
+    const/4 v7, 0x7
+
+    if-eq p4, v7, :cond_8
+
+    const/16 v7, 0x8
+
+    if-eq p4, v7, :cond_8
+
+    sget-object v7, Lo0/g0/g/d;->c:[Ljava/lang/String;
+
+    array-length v8, v7
+
+    if-ge p5, v8, :cond_3
+
+    aget-object v7, v7, p5
+
+    if-eqz v7, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_3
+    sget-object v7, Lo0/g0/g/d;->d:[Ljava/lang/String;
+
+    aget-object v7, v7, p5
+
+    :goto_1
+    if-ne p4, v1, :cond_4
+
+    and-int/lit8 v8, p5, 0x4
+
+    if-eqz v8, :cond_4
+
+    const-string p4, "HEADERS"
+
+    const-string p5, "PUSH_PROMISE"
+
+    invoke-static {v7, p4, p5, v2, v6}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object p4
+
+    goto :goto_2
+
+    :cond_4
+    if-nez p4, :cond_5
+
+    and-int/lit8 p4, p5, 0x20
+
+    if-eqz p4, :cond_5
+
+    const-string p4, "PRIORITY"
+
+    const-string p5, "COMPRESSED"
+
+    invoke-static {v7, p4, p5, v2, v6}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object p4
+
+    goto :goto_2
+
+    :cond_5
+    move-object p4, v7
+
+    goto :goto_2
+
+    :cond_6
+    if-ne p5, v3, :cond_7
+
+    const-string p4, "ACK"
+
+    goto :goto_2
+
+    :cond_7
+    sget-object p4, Lo0/g0/g/d;->d:[Ljava/lang/String;
+
+    aget-object p4, p4, p5
+
+    goto :goto_2
+
+    :cond_8
+    sget-object p4, Lo0/g0/g/d;->d:[Ljava/lang/String;
+
+    aget-object p4, p4, p5
+
+    :goto_2
+    if-eqz p1, :cond_9
+
+    const-string p1, "<<"
+
+    goto :goto_3
+
+    :cond_9
+    const-string p1, ">>"
+
+    :goto_3
+    new-array p5, v1, [Ljava/lang/Object;
+
+    aput-object p1, p5, v2
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, p5, v3
+
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, p5, v5
+
+    aput-object v0, p5, v4
+
+    aput-object p4, p5, v6
+
+    const-string p1, "%s 0x%08x %5d %-13s %s"
+
+    invoke-static {p1, p5}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$a.smali b/com.discord/smali_classes2/o0/g0/g/e$a.smali
new file mode 100644
index 0000000000..4800ea20af
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$a.smali
@@ -0,0 +1,89 @@
+.class public final Lo0/g0/g/e$a;
+.super Ljava/lang/Object;
+.source "Http2Connection.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/g/e;-><init>(Lo0/g0/g/e$b;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lo0/g0/g/e;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/g/e;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/e$a;->d:Lo0/g0/g/e;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 4
+
+    const-string v0, "OkHttp "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/g/e$a;->d:Lo0/g0/g/e;
+
+    iget-object v1, v1, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    const-string v2, " ping"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$a;->d:Lo0/g0/g/e;
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v0, v3, v3, v3}, Lo0/g0/g/e;->k(ZII)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$b.smali b/com.discord/smali_classes2/o0/g0/g/e$b.smali
new file mode 100644
index 0000000000..cab88ca78a
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$b.smali
@@ -0,0 +1,52 @@
+.class public final Lo0/g0/g/e$b;
+.super Ljava/lang/Object;
+.source "Http2Connection.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public a:Ljava/net/Socket;
+
+.field public b:Ljava/lang/String;
+
+.field public c:Lp0/g;
+
+.field public d:Lokio/BufferedSink;
+
+.field public e:Lo0/g0/g/e$c;
+
+.field public f:Lo0/g0/g/p;
+
+.field public g:I
+
+.field public h:Z
+
+
+# direct methods
+.method public constructor <init>(Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Lo0/g0/g/e$b;->h:Z
+
+    sget-object p1, Lo0/g0/g/e$c;->a:Lo0/g0/g/e$c;
+
+    iput-object p1, p0, Lo0/g0/g/e$b;->e:Lo0/g0/g/e$c;
+
+    sget-object p1, Lo0/g0/g/p;->a:Lo0/g0/g/p;
+
+    iput-object p1, p0, Lo0/g0/g/e$b;->f:Lo0/g0/g/p;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$c$a.smali b/com.discord/smali_classes2/o0/g0/g/e$c$a.smali
new file mode 100644
index 0000000000..74c65e3018
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$c$a.smali
@@ -0,0 +1,47 @@
+.class public final Lo0/g0/g/e$c$a;
+.super Lo0/g0/g/e$c;
+.source "Http2Connection.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/e$c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lo0/g0/g/e$c;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public c(Lo0/g0/g/l;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "stream"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lo0/g0/g/a;->h:Lo0/g0/g/a;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1}, Lo0/g0/g/l;->c(Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$c.smali b/com.discord/smali_classes2/o0/g0/g/e$c.smali
new file mode 100644
index 0000000000..9c12ff8276
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$c.smali
@@ -0,0 +1,60 @@
+.class public abstract Lo0/g0/g/e$c;
+.super Ljava/lang/Object;
+.source "Http2Connection.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "c"
+.end annotation
+
+
+# static fields
+.field public static final a:Lo0/g0/g/e$c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/g0/g/e$c$a;
+
+    invoke-direct {v0}, Lo0/g0/g/e$c$a;-><init>()V
+
+    sput-object v0, Lo0/g0/g/e$c;->a:Lo0/g0/g/e$c;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public b(Lo0/g0/g/e;)V
+    .locals 1
+
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public abstract c(Lo0/g0/g/l;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$d$a.smali b/com.discord/smali_classes2/o0/g0/g/e$d$a.smali
new file mode 100644
index 0000000000..5ccfa2b6c1
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$d$a.smali
@@ -0,0 +1,85 @@
+.class public final Lo0/g0/g/e$d$a;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/g/e$d;->k(ZLo0/g0/g/q;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e$d;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e$d;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/e$d$a;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/e$d$a;->e:Lo0/g0/g/e$d;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 4
+
+    iget-object v0, p0, Lo0/g0/g/e$d$a;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$d$a;->e:Lo0/g0/g/e$d;
+
+    iget-object v0, v0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->e:Lo0/g0/g/e$c;
+
+    iget-object v3, p0, Lo0/g0/g/e$d$a;->e:Lo0/g0/g/e$d;
+
+    iget-object v3, v3, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v0, v3}, Lo0/g0/g/e$c;->b(Lo0/g0/g/e;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$d$b.smali b/com.discord/smali_classes2/o0/g0/g/e$d$b.smali
new file mode 100644
index 0000000000..9e0f308ec3
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$d$b.smali
@@ -0,0 +1,139 @@
+.class public final Lo0/g0/g/e$d$b;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/g/e$d;->c(ZIILjava/util/List;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/l;
+
+.field public final synthetic f:Lo0/g0/g/e$d;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/l;Lo0/g0/g/e$d;Lo0/g0/g/l;ILjava/util/List;Z)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/e$d$b;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/e$d$b;->e:Lo0/g0/g/l;
+
+    iput-object p3, p0, Lo0/g0/g/e$d$b;->f:Lo0/g0/g/e$d;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 7
+
+    iget-object v0, p0, Lo0/g0/g/e$d$b;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$d$b;->f:Lo0/g0/g/e$d;
+
+    iget-object v0, v0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->e:Lo0/g0/g/e$c;
+
+    iget-object v3, p0, Lo0/g0/g/e$d$b;->e:Lo0/g0/g/l;
+
+    invoke-virtual {v0, v3}, Lo0/g0/g/e$c;->c(Lo0/g0/g/l;)V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v0
+
+    :try_start_1
+    sget-object v3, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v3, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    const/4 v4, 0x4
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v6, "Http2Connection.Listener failure for "
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v6, p0, Lo0/g0/g/e$d$b;->f:Lo0/g0/g/e$d;
+
+    iget-object v6, v6, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v6, v6, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-virtual {v3, v4, v5, v0}, Lo0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    iget-object v3, p0, Lo0/g0/g/e$d$b;->e:Lo0/g0/g/l;
+
+    sget-object v4, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    invoke-virtual {v3, v4, v0}, Lo0/g0/g/l;->c(Lo0/g0/g/a;Ljava/io/IOException;)V
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :catch_1
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :goto_1
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$d$c.smali b/com.discord/smali_classes2/o0/g0/g/e$d$c.smali
new file mode 100644
index 0000000000..63c1f8b1f4
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$d$c.smali
@@ -0,0 +1,93 @@
+.class public final Lo0/g0/g/e$d$c;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/g/e$d;->f(ZII)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e$d;
+
+.field public final synthetic f:I
+
+.field public final synthetic g:I
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e$d;II)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/e$d$c;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/e$d$c;->e:Lo0/g0/g/e$d;
+
+    iput p3, p0, Lo0/g0/g/e$d$c;->f:I
+
+    iput p4, p0, Lo0/g0/g/e$d$c;->g:I
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 6
+
+    iget-object v0, p0, Lo0/g0/g/e$d$c;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$d$c;->e:Lo0/g0/g/e$d;
+
+    iget-object v0, v0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    const/4 v3, 0x1
+
+    iget v4, p0, Lo0/g0/g/e$d$c;->f:I
+
+    iget v5, p0, Lo0/g0/g/e$d$c;->g:I
+
+    invoke-virtual {v0, v3, v4, v5}, Lo0/g0/g/e;->k(ZII)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$d$d.smali b/com.discord/smali_classes2/o0/g0/g/e$d$d.smali
new file mode 100644
index 0000000000..5e3f05630e
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$d$d.smali
@@ -0,0 +1,89 @@
+.class public final Lo0/g0/g/e$d$d;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/g/e$d;->b(ZLo0/g0/g/q;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e$d;
+
+.field public final synthetic f:Z
+
+.field public final synthetic g:Lo0/g0/g/q;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e$d;ZLo0/g0/g/q;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/e$d$d;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/e$d$d;->e:Lo0/g0/g/e$d;
+
+    iput-boolean p3, p0, Lo0/g0/g/e$d$d;->f:Z
+
+    iput-object p4, p0, Lo0/g0/g/e$d$d;->g:Lo0/g0/g/q;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 5
+
+    iget-object v0, p0, Lo0/g0/g/e$d$d;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$d$d;->e:Lo0/g0/g/e$d;
+
+    iget-boolean v3, p0, Lo0/g0/g/e$d$d;->f:Z
+
+    iget-object v4, p0, Lo0/g0/g/e$d$d;->g:Lo0/g0/g/q;
+
+    invoke-virtual {v0, v3, v4}, Lo0/g0/g/e$d;->k(ZLo0/g0/g/q;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$d.smali b/com.discord/smali_classes2/o0/g0/g/e$d.smali
new file mode 100644
index 0000000000..110f837061
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$d.smali
@@ -0,0 +1,1623 @@
+.class public final Lo0/g0/g/e$d;
+.super Ljava/lang/Object;
+.source "Http2Connection.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+.implements Lo0/g0/g/k$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "d"
+.end annotation
+
+
+# instance fields
+.field public final d:Lo0/g0/g/k;
+
+.field public final synthetic e:Lo0/g0/g/e;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/g/e;Lo0/g0/g/k;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/g0/g/k;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "reader"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p2, p0, Lo0/g0/g/e$d;->d:Lo0/g0/g/k;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public b(ZLo0/g0/g/q;)V
+    .locals 4
+
+    const-string v0, "settings"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    const-string v1, "OkHttp "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v2, v2, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    const-string v3, " ACK Settings"
+
+    invoke-static {v1, v2, v3}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    :try_start_0
+    new-instance v2, Lo0/g0/g/e$d$d;
+
+    invoke-direct {v2, v1, p0, p1, p2}, Lo0/g0/g/e$d$d;-><init>(Ljava/lang/String;Lo0/g0/g/e$d;ZLo0/g0/g/q;)V
+
+    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-void
+.end method
+
+.method public c(ZIILjava/util/List;)V
+    .locals 14
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZII",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)V"
+        }
+    .end annotation
+
+    move-object v9, p0
+
+    move/from16 v0, p2
+
+    move-object/from16 v7, p4
+
+    const-string v1, "headerBlock"
+
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v1, v0}, Lo0/g0/g/e;->d(I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v3, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    if-eqz v3, :cond_1
+
+    const-string v1, "requestHeaders"
+
+    invoke-static {v7, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v1, v3, Lo0/g0/g/e;->j:Z
+
+    if-nez v1, :cond_0
+
+    iget-object v8, v3, Lo0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    const-string v1, "OkHttp "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, v3, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " Push Headers["
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x5d
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    :try_start_0
+    new-instance v10, Lo0/g0/g/g;
+
+    move-object v1, v10
+
+    move/from16 v4, p2
+
+    move-object/from16 v5, p4
+
+    move v6, p1
+
+    invoke-direct/range {v1 .. v6}, Lo0/g0/g/g;-><init>(Ljava/lang/String;Lo0/g0/g/e;ILjava/util/List;Z)V
+
+    invoke-interface {v8, v10}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    :cond_0
+    return-void
+
+    :cond_1
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2
+    iget-object v10, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    monitor-enter v10
+
+    :try_start_1
+    iget-object v1, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v1, v0}, Lo0/g0/g/e;->b(I)Lo0/g0/g/l;
+
+    move-result-object v8
+
+    if-nez v8, :cond_6
+
+    iget-object v1, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    monitor-enter v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :try_start_2
+    iget-boolean v2, v1, Lo0/g0/g/e;->j:Z
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :try_start_3
+    monitor-exit v1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    if-eqz v2, :cond_3
+
+    monitor-exit v10
+
+    return-void
+
+    :cond_3
+    :try_start_4
+    iget-object v1, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget v1, v1, Lo0/g0/g/e;->h:I
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    if-gt v0, v1, :cond_4
+
+    monitor-exit v10
+
+    return-void
+
+    :cond_4
+    :try_start_5
+    rem-int/lit8 v1, v0, 0x2
+
+    iget-object v2, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget v2, v2, Lo0/g0/g/e;->i:I
+
+    rem-int/lit8 v2, v2, 0x2
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    if-ne v1, v2, :cond_5
+
+    monitor-exit v10
+
+    return-void
+
+    :cond_5
+    :try_start_6
+    invoke-static/range {p4 .. p4}, Lo0/g0/b;->B(Ljava/util/List;)Lokhttp3/Headers;
+
+    move-result-object v6
+
+    new-instance v11, Lo0/g0/g/l;
+
+    iget-object v3, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    const/4 v4, 0x0
+
+    move-object v1, v11
+
+    move/from16 v2, p2
+
+    move v5, p1
+
+    invoke-direct/range {v1 .. v6}, Lo0/g0/g/l;-><init>(ILo0/g0/g/e;ZZLokhttp3/Headers;)V
+
+    iget-object v1, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iput v0, v1, Lo0/g0/g/e;->h:I
+
+    iget-object v1, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v1, v1, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-static/range {p2 .. p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    invoke-interface {v1, v2, v11}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    sget-object v12, Lo0/g0/g/e;->y:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "OkHttp "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v2, v9, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v2, v2, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " stream "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    new-instance v13, Lo0/g0/g/e$d$b;
+
+    move-object v1, v13
+
+    move-object v3, v11
+
+    move-object v4, p0
+
+    move-object v5, v8
+
+    move/from16 v6, p2
+
+    move-object/from16 v7, p4
+
+    move v8, p1
+
+    invoke-direct/range {v1 .. v8}, Lo0/g0/g/e$d$b;-><init>(Ljava/lang/String;Lo0/g0/g/l;Lo0/g0/g/e$d;Lo0/g0/g/l;ILjava/util/List;Z)V
+
+    invoke-interface {v12, v13}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
+
+    monitor-exit v10
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    move-object v2, v0
+
+    :try_start_7
+    monitor-exit v1
+
+    throw v2
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_1
+
+    :cond_6
+    monitor-exit v10
+
+    invoke-static/range {p4 .. p4}, Lo0/g0/b;->B(Ljava/util/List;)Lokhttp3/Headers;
+
+    move-result-object v0
+
+    move v1, p1
+
+    invoke-virtual {v8, v0, p1}, Lo0/g0/g/l;->j(Lokhttp3/Headers;Z)V
+
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit v10
+
+    throw v0
+.end method
+
+.method public d(IJ)V
+    .locals 3
+
+    if-nez p1, :cond_1
+
+    iget-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    monitor-enter p1
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-wide v1, v0, Lo0/g0/g/e;->t:J
+
+    add-long/2addr v1, p2
+
+    iput-wide v1, v0, Lo0/g0/g/e;->t:J
+
+    iget-object p2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p2}, Ljava/lang/Object;->notifyAll()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p1
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_1
+    new-instance p2, Lkotlin/TypeCastException;
+
+    const-string p3, "null cannot be cast to non-null type java.lang.Object"
+
+    invoke-direct {p2, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p2
+
+    monitor-exit p1
+
+    throw p2
+
+    :cond_1
+    iget-object v0, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v0, p1}, Lo0/g0/g/e;->b(I)Lo0/g0/g/l;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_3
+
+    monitor-enter p1
+
+    :try_start_2
+    iget-wide v0, p1, Lo0/g0/g/l;->d:J
+
+    add-long/2addr v0, p2
+
+    iput-wide v0, p1, Lo0/g0/g/l;->d:J
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-lez v2, :cond_2
+
+    invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    :cond_2
+    monitor-exit p1
+
+    goto :goto_0
+
+    :catchall_1
+    move-exception p2
+
+    monitor-exit p1
+
+    throw p2
+
+    :cond_3
+    :goto_0
+    return-void
+.end method
+
+.method public e(ZILp0/g;I)V
+    .locals 17
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v1, p0
+
+    move/from16 v0, p2
+
+    move-object/from16 v2, p3
+
+    move/from16 v7, p4
+
+    const-string v3, "source"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v3, v1, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v3, v0}, Lo0/g0/g/e;->d(I)Z
+
+    move-result v3
+
+    const/4 v4, 0x0
+
+    if-eqz v3, :cond_2
+
+    iget-object v5, v1, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    if-eqz v5, :cond_1
+
+    const-string v3, "source"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v6, Lp0/e;
+
+    invoke-direct {v6}, Lp0/e;-><init>()V
+
+    int-to-long v3, v7
+
+    invoke-interface {v2, v3, v4}, Lp0/g;->P0(J)V
+
+    invoke-interface {v2, v6, v3, v4}, Lp0/w;->B0(Lp0/e;J)J
+
+    iget-boolean v2, v5, Lo0/g0/g/e;->j:Z
+
+    if-nez v2, :cond_0
+
+    iget-object v9, v5, Lo0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    const-string v2, "OkHttp "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    iget-object v3, v5, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, " Push Data["
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v3, 0x5d
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    new-instance v10, Lo0/g0/g/f;
+
+    move-object v2, v10
+
+    move-object v4, v5
+
+    move/from16 v5, p2
+
+    move/from16 v7, p4
+
+    move/from16 v8, p1
+
+    invoke-direct/range {v2 .. v8}, Lo0/g0/g/f;-><init>(Ljava/lang/String;Lo0/g0/g/e;ILp0/e;IZ)V
+
+    invoke-interface {v9, v10}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+
+    :cond_0
+    return-void
+
+    :cond_1
+    throw v4
+
+    :cond_2
+    iget-object v3, v1, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v3, v0}, Lo0/g0/g/e;->b(I)Lo0/g0/g/l;
+
+    move-result-object v3
+
+    if-nez v3, :cond_3
+
+    iget-object v3, v1, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    sget-object v4, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    invoke-virtual {v3, v0, v4}, Lo0/g0/g/e;->n(ILo0/g0/g/a;)V
+
+    iget-object v0, v1, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    int-to-long v3, v7
+
+    invoke-virtual {v0, v3, v4}, Lo0/g0/g/e;->g(J)V
+
+    invoke-interface {v2, v3, v4}, Lp0/g;->skip(J)V
+
+    return-void
+
+    :cond_3
+    const-string v0, "source"
+
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v3}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v5, 0x1
+
+    xor-int/2addr v0, v5
+
+    sget-boolean v6, Lk0/i;->a:Z
+
+    if-eqz v6, :cond_5
+
+    if-eqz v0, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    const-string v0, "Assertion failed"
+
+    new-instance v2, Ljava/lang/AssertionError;
+
+    invoke-direct {v2, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v2
+
+    :cond_5
+    :goto_0
+    iget-object v0, v3, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    int-to-long v6, v7
+
+    if-eqz v0, :cond_12
+
+    const-string v4, "source"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v4, v0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    invoke-static {v4}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    xor-int/2addr v4, v5
+
+    sget-boolean v8, Lk0/i;->a:Z
+
+    if-eqz v8, :cond_7
+
+    if-eqz v4, :cond_6
+
+    goto :goto_1
+
+    :cond_6
+    const-string v0, "Assertion failed"
+
+    new-instance v2, Ljava/lang/AssertionError;
+
+    invoke-direct {v2, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v2
+
+    :cond_7
+    :goto_1
+    const-wide/16 v8, 0x0
+
+    cmp-long v4, v6, v8
+
+    if-lez v4, :cond_10
+
+    iget-object v4, v0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    monitor-enter v4
+
+    :try_start_0
+    iget-boolean v10, v0, Lo0/g0/g/l$b;->h:Z
+
+    iget-object v11, v0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-wide v11, v11, Lp0/e;->e:J
+
+    add-long/2addr v11, v6
+
+    iget-wide v13, v0, Lo0/g0/g/l$b;->g:J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    const/4 v15, 0x0
+
+    cmp-long v16, v11, v13
+
+    if-lez v16, :cond_8
+
+    const/4 v11, 0x1
+
+    goto :goto_2
+
+    :cond_8
+    const/4 v11, 0x0
+
+    :goto_2
+    monitor-exit v4
+
+    if-eqz v11, :cond_9
+
+    invoke-interface {v2, v6, v7}, Lp0/g;->skip(J)V
+
+    iget-object v0, v0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    sget-object v2, Lo0/g0/g/a;->g:Lo0/g0/g/a;
+
+    invoke-virtual {v0, v2}, Lo0/g0/g/l;->e(Lo0/g0/g/a;)V
+
+    goto :goto_5
+
+    :cond_9
+    if-eqz v10, :cond_a
+
+    invoke-interface {v2, v6, v7}, Lp0/g;->skip(J)V
+
+    goto :goto_5
+
+    :cond_a
+    iget-object v4, v0, Lo0/g0/g/l$b;->d:Lp0/e;
+
+    invoke-interface {v2, v4, v6, v7}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v10
+
+    const-wide/16 v12, -0x1
+
+    cmp-long v4, v10, v12
+
+    if-eqz v4, :cond_f
+
+    sub-long/2addr v6, v10
+
+    iget-object v4, v0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    monitor-enter v4
+
+    :try_start_1
+    iget-boolean v10, v0, Lo0/g0/g/l$b;->f:Z
+
+    if-eqz v10, :cond_b
+
+    iget-object v10, v0, Lo0/g0/g/l$b;->d:Lp0/e;
+
+    iget-wide v10, v10, Lp0/e;->e:J
+
+    iget-object v12, v0, Lo0/g0/g/l$b;->d:Lp0/e;
+
+    iget-wide v13, v12, Lp0/e;->e:J
+
+    invoke-virtual {v12, v13, v14}, Lp0/e;->skip(J)V
+
+    goto :goto_4
+
+    :cond_b
+    iget-object v10, v0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-wide v10, v10, Lp0/e;->e:J
+
+    cmp-long v12, v10, v8
+
+    if-nez v12, :cond_c
+
+    const/4 v15, 0x1
+
+    :cond_c
+    iget-object v10, v0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-object v11, v0, Lo0/g0/g/l$b;->d:Lp0/e;
+
+    invoke-virtual {v10, v11}, Lp0/e;->i0(Lp0/w;)J
+
+    if-eqz v15, :cond_e
+
+    iget-object v10, v0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    if-eqz v10, :cond_d
+
+    invoke-virtual {v10}, Ljava/lang/Object;->notifyAll()V
+
+    goto :goto_3
+
+    :cond_d
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v2, "null cannot be cast to non-null type java.lang.Object"
+
+    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :cond_e
+    :goto_3
+    move-wide v10, v8
+
+    :goto_4
+    monitor-exit v4
+
+    cmp-long v4, v10, v8
+
+    if-lez v4, :cond_7
+
+    invoke-virtual {v0, v10, v11}, Lo0/g0/g/l$b;->a(J)V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v4
+
+    throw v0
+
+    :cond_f
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit v4
+
+    throw v0
+
+    :cond_10
+    :goto_5
+    if-eqz p1, :cond_11
+
+    sget-object v0, Lo0/g0/b;->b:Lokhttp3/Headers;
+
+    invoke-virtual {v3, v0, v5}, Lo0/g0/g/l;->j(Lokhttp3/Headers;Z)V
+
+    :cond_11
+    return-void
+
+    :cond_12
+    throw v4
+.end method
+
+.method public f(ZII)V
+    .locals 3
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    monitor-enter p1
+
+    :try_start_0
+    iget-object p2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    const/4 p3, 0x0
+
+    iput-boolean p3, p2, Lo0/g0/g/e;->n:Z
+
+    iget-object p2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {p2}, Ljava/lang/Object;->notifyAll()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p1
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_1
+    new-instance p2, Lkotlin/TypeCastException;
+
+    const-string p3, "null cannot be cast to non-null type java.lang.Object"
+
+    invoke-direct {p2, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p2
+
+    monitor-exit p1
+
+    throw p2
+
+    :cond_1
+    iget-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object p1, p1, Lo0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    const-string v0, "OkHttp "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v1, v1, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    const-string v2, " ping"
+
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    :try_start_2
+    new-instance v1, Lo0/g0/g/e$d$c;
+
+    invoke-direct {v1, v0, p0, p2, p3}, Lo0/g0/g/e$d$c;-><init>(Ljava/lang/String;Lo0/g0/g/e$d;II)V
+
+    invoke-interface {p1, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_2
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_2 .. :try_end_2} :catch_0
+
+    :catch_0
+    :goto_0
+    return-void
+.end method
+
+.method public g(IIIZ)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public h(ILo0/g0/g/a;)V
+    .locals 4
+
+    const-string v0, "errorCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v1, p1}, Lo0/g0/g/e;->d(I)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    if-eqz v1, :cond_1
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, v1, Lo0/g0/g/e;->j:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, v1, Lo0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    const-string v2, "OkHttp "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    iget-object v3, v1, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, " Push Reset["
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v3, 0x5d
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    new-instance v3, Lo0/g0/g/i;
+
+    invoke-direct {v3, v2, v1, p1, p2}, Lo0/g0/g/i;-><init>(Ljava/lang/String;Lo0/g0/g/e;ILo0/g0/g/a;)V
+
+    invoke-interface {v0, v3}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+
+    :cond_0
+    return-void
+
+    :cond_1
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_2
+    iget-object v0, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v0, p1}, Lo0/g0/g/e;->e(I)Lo0/g0/g/l;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_3
+
+    invoke-virtual {p1, p2}, Lo0/g0/g/l;->k(Lo0/g0/g/a;)V
+
+    :cond_3
+    return-void
+.end method
+
+.method public i(IILjava/util/List;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(II",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p1, "requestHeaders"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    if-eqz p1, :cond_2
+
+    const-string v0, "requestHeaders"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    monitor-enter p1
+
+    :try_start_0
+    iget-object v0, p1, Lo0/g0/g/e;->x:Ljava/util/Set;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object p3, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    invoke-virtual {p1, p2, p3}, Lo0/g0/g/e;->n(ILo0/g0/g/a;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p1
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_1
+    iget-object v0, p1, Lo0/g0/g/e;->x:Ljava/util/Set;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p1
+
+    iget-boolean v0, p1, Lo0/g0/g/e;->j:Z
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p1, Lo0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    const-string v1, "OkHttp "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p1, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " Push Request["
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x5d
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    :try_start_2
+    new-instance v2, Lo0/g0/g/h;
+
+    invoke-direct {v2, v1, p1, p2, p3}, Lo0/g0/g/h;-><init>(Ljava/lang/String;Lo0/g0/g/e;ILjava/util/List;)V
+
+    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_2
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_2 .. :try_end_2} :catch_0
+
+    :catch_0
+    :cond_1
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception p2
+
+    monitor-exit p1
+
+    throw p2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public j(ILo0/g0/g/a;Lokio/ByteString;)V
+    .locals 3
+
+    const-string v0, "errorCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "debugData"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p3}, Lokio/ByteString;->h()I
+
+    move-result p2
+
+    iget-object p2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    monitor-enter p2
+
+    :try_start_0
+    iget-object p3, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object p3, p3, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-interface {p3}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object p3
+
+    const/4 v0, 0x0
+
+    new-array v1, v0, [Lo0/g0/g/l;
+
+    invoke-interface {p3, v1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p3
+
+    if-eqz p3, :cond_2
+
+    check-cast p3, [Lo0/g0/g/l;
+
+    iget-object v1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    const/4 v2, 0x1
+
+    iput-boolean v2, v1, Lo0/g0/g/e;->j:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p2
+
+    array-length p2, p3
+
+    :goto_0
+    if-ge v0, p2, :cond_1
+
+    aget-object v1, p3, v0
+
+    iget v2, v1, Lo0/g0/g/l;->m:I
+
+    if-le v2, p1, :cond_0
+
+    invoke-virtual {v1}, Lo0/g0/g/l;->h()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    sget-object v2, Lo0/g0/g/a;->h:Lo0/g0/g/a;
+
+    invoke-virtual {v1, v2}, Lo0/g0/g/l;->k(Lo0/g0/g/a;)V
+
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget v1, v1, Lo0/g0/g/l;->m:I
+
+    invoke-virtual {v2, v1}, Lo0/g0/g/e;->e(I)Lo0/g0/g/l;
+
+    :cond_0
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+
+    :cond_2
+    :try_start_1
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p3, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p2
+
+    throw p1
+.end method
+
+.method public final k(ZLo0/g0/g/q;)V
+    .locals 9
+
+    const-string v0, "settings"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    monitor-enter v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :try_start_1
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v2, v2, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    invoke-virtual {v2}, Lo0/g0/g/q;->a()I
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object p1, p1, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    iput v3, p1, Lo0/g0/g/q;->a:I
+
+    iget-object p1, p1, Lo0/g0/g/q;->b:[I
+
+    array-length v4, p1
+
+    const-string v5, "$this$fill"
+
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v3, v4, v3}, Ljava/util/Arrays;->fill([IIII)V
+
+    :cond_0
+    iget-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object p1, p1, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    const/4 v4, 0x0
+
+    if-eqz p1, :cond_9
+
+    const-string v5, "other"
+
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x0
+
+    :goto_0
+    const/16 v6, 0xa
+
+    const/4 v7, 0x1
+
+    if-ge v5, v6, :cond_3
+
+    shl-int v6, v7, v5
+
+    iget v8, p2, Lo0/g0/g/q;->a:I
+
+    and-int/2addr v6, v8
+
+    if-eqz v6, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v7, 0x0
+
+    :goto_1
+    if-nez v7, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    iget-object v6, p2, Lo0/g0/g/q;->b:[I
+
+    aget v6, v6, v5
+
+    invoke-virtual {p1, v5, v6}, Lo0/g0/g/q;->b(II)Lo0/g0/g/q;
+
+    :goto_2
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    iget-object p1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object p1, p1, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    invoke-virtual {p1}, Lo0/g0/g/q;->a()I
+
+    move-result p1
+
+    const/4 p2, -0x1
+
+    const-wide/16 v5, 0x0
+
+    if-eq p1, p2, :cond_5
+
+    if-eq p1, v2, :cond_5
+
+    sub-int/2addr p1, v2
+
+    int-to-long p1, p1
+
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v2, v2, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-interface {v2}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v2
+
+    xor-int/2addr v2, v7
+
+    if-eqz v2, :cond_6
+
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v2, v2, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v2
+
+    new-array v4, v3, [Lo0/g0/g/l;
+
+    invoke-interface {v2, v4}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_4
+
+    move-object v4, v2
+
+    check-cast v4, [Lo0/g0/g/l;
+
+    goto :goto_3
+
+    :cond_4
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :cond_5
+    move-wide p1, v5
+
+    :cond_6
+    :goto_3
+    :try_start_2
+    monitor-exit v1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    :try_start_3
+    iget-object v1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v1, v1, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v2, v2, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    invoke-virtual {v1, v2}, Lo0/g0/g/m;->a(Lo0/g0/g/q;)V
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    goto :goto_4
+
+    :catch_0
+    move-exception v1
+
+    :try_start_4
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    sget-object v7, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    invoke-virtual {v2, v7, v7, v1}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    :goto_4
+    monitor-exit v0
+
+    if-eqz v4, :cond_8
+
+    array-length v0, v4
+
+    :goto_5
+    if-ge v3, v0, :cond_8
+
+    aget-object v1, v4, v3
+
+    monitor-enter v1
+
+    :try_start_5
+    iget-wide v7, v1, Lo0/g0/g/l;->d:J
+
+    add-long/2addr v7, p1
+
+    iput-wide v7, v1, Lo0/g0/g/l;->d:J
+
+    cmp-long v2, p1, v5
+
+    if-lez v2, :cond_7
+
+    invoke-virtual {v1}, Ljava/lang/Object;->notifyAll()V
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
+
+    :cond_7
+    monitor-exit v1
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_5
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v1
+
+    throw p1
+
+    :cond_8
+    sget-object p1, Lo0/g0/g/e;->y:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    const-string p2, "OkHttp "
+
+    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    iget-object v0, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    const-string v1, " settings"
+
+    invoke-static {p2, v0, v1}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    new-instance v0, Lo0/g0/g/e$d$a;
+
+    invoke-direct {v0, p2, p0}, Lo0/g0/g/e$d$a;-><init>(Ljava/lang/String;Lo0/g0/g/e$d;)V
+
+    invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+
+    return-void
+
+    :cond_9
+    :try_start_6
+    throw v4
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_7
+    monitor-exit v1
+
+    throw p1
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
+
+    :catchall_2
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+.end method
+
+.method public run()V
+    .locals 5
+
+    sget-object v0, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    sget-object v1, Lo0/g0/g/a;->f:Lo0/g0/g/a;
+
+    const/4 v2, 0x0
+
+    :try_start_0
+    iget-object v3, p0, Lo0/g0/g/e$d;->d:Lo0/g0/g/k;
+
+    invoke-virtual {v3, p0}, Lo0/g0/g/k;->b(Lo0/g0/g/k$b;)V
+
+    :goto_0
+    iget-object v3, p0, Lo0/g0/g/e$d;->d:Lo0/g0/g/k;
+
+    const/4 v4, 0x0
+
+    invoke-virtual {v3, v4, p0}, Lo0/g0/g/k;->a(ZLo0/g0/g/k$b;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v3, Lo0/g0/g/a;->d:Lo0/g0/g/a;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    sget-object v0, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    iget-object v1, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v1, v3, v0, v2}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_2
+
+    :catchall_1
+    move-exception v0
+
+    move-object v3, v1
+
+    goto :goto_2
+
+    :catch_0
+    move-exception v1
+
+    iget-object v2, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v2, v0, v0, v1}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    :goto_1
+    iget-object v0, p0, Lo0/g0/g/e$d;->d:Lo0/g0/g/k;
+
+    invoke-static {v0}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    return-void
+
+    :goto_2
+    iget-object v4, p0, Lo0/g0/g/e$d;->e:Lo0/g0/g/e;
+
+    invoke-virtual {v4, v3, v1, v2}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    iget-object v1, p0, Lo0/g0/g/e$d;->d:Lo0/g0/g/k;
+
+    invoke-static {v1}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$e.smali b/com.discord/smali_classes2/o0/g0/g/e$e.smali
new file mode 100644
index 0000000000..045edc8324
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$e.smali
@@ -0,0 +1,121 @@
+.class public final Lo0/g0/g/e$e;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/g/e;->n(ILo0/g0/g/a;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e;
+
+.field public final synthetic f:I
+
+.field public final synthetic g:Lo0/g0/g/a;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e;ILo0/g0/g/a;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/e$e;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/e$e;->e:Lo0/g0/g/e;
+
+    iput p3, p0, Lo0/g0/g/e$e;->f:I
+
+    iput-object p4, p0, Lo0/g0/g/e$e;->g:Lo0/g0/g/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 6
+
+    iget-object v0, p0, Lo0/g0/g/e$e;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$e;->e:Lo0/g0/g/e;
+
+    iget v3, p0, Lo0/g0/g/e$e;->f:I
+
+    iget-object v4, p0, Lo0/g0/g/e$e;->g:Lo0/g0/g/a;
+
+    if-eqz v0, :cond_0
+
+    const-string v5, "statusCode"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, v0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {v0, v3, v4}, Lo0/g0/g/m;->g(ILo0/g0/g/a;)V
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v0
+
+    :try_start_1
+    iget-object v3, p0, Lo0/g0/g/e$e;->e:Lo0/g0/g/e;
+
+    sget-object v4, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    invoke-virtual {v3, v4, v4, v0}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :goto_1
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e$f.smali b/com.discord/smali_classes2/o0/g0/g/e$f.smali
new file mode 100644
index 0000000000..1cf70b9e86
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e$f.smali
@@ -0,0 +1,110 @@
+.class public final Lo0/g0/g/e$f;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/g/e;->p(IJ)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e;
+
+.field public final synthetic f:I
+
+.field public final synthetic g:J
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e;IJ)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/e$f;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/e$f;->e:Lo0/g0/g/e;
+
+    iput p3, p0, Lo0/g0/g/e$f;->f:I
+
+    iput-wide p4, p0, Lo0/g0/g/e$f;->g:J
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 6
+
+    iget-object v0, p0, Lo0/g0/g/e$f;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e$f;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    iget v3, p0, Lo0/g0/g/e$f;->f:I
+
+    iget-wide v4, p0, Lo0/g0/g/e$f;->g:J
+
+    invoke-virtual {v0, v3, v4, v5}, Lo0/g0/g/m;->i(IJ)V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v0
+
+    :try_start_1
+    iget-object v3, p0, Lo0/g0/g/e$f;->e:Lo0/g0/g/e;
+
+    sget-object v4, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    invoke-virtual {v3, v4, v4, v0}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :goto_1
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/e.smali b/com.discord/smali_classes2/o0/g0/g/e.smali
new file mode 100644
index 0000000000..f415eaee08
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/e.smali
@@ -0,0 +1,1120 @@
+.class public final Lo0/g0/g/e;
+.super Ljava/lang/Object;
+.source "Http2Connection.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/g/e$b;,
+        Lo0/g0/g/e$d;,
+        Lo0/g0/g/e$c;
+    }
+.end annotation
+
+
+# static fields
+.field public static final y:Ljava/util/concurrent/ThreadPoolExecutor;
+
+
+# instance fields
+.field public final d:Z
+
+.field public final e:Lo0/g0/g/e$c;
+
+.field public final f:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Integer;",
+            "Lo0/g0/g/l;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Ljava/lang/String;
+
+.field public h:I
+
+.field public i:I
+
+.field public j:Z
+
+.field public final k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+.field public final l:Ljava/util/concurrent/ThreadPoolExecutor;
+
+.field public final m:Lo0/g0/g/p;
+
+.field public n:Z
+
+.field public final o:Lo0/g0/g/q;
+
+.field public final p:Lo0/g0/g/q;
+
+.field public q:J
+
+.field public r:J
+
+.field public s:J
+
+.field public t:J
+
+.field public final u:Ljava/net/Socket;
+
+.field public final v:Lo0/g0/g/m;
+
+.field public final w:Lo0/g0/g/e$d;
+
+.field public final x:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 9
+
+    new-instance v8, Ljava/util/concurrent/ThreadPoolExecutor;
+
+    sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    new-instance v6, Ljava/util/concurrent/SynchronousQueue;
+
+    invoke-direct {v6}, Ljava/util/concurrent/SynchronousQueue;-><init>()V
+
+    const-string v0, "OkHttp Http2Connection"
+
+    const/4 v1, 0x1
+
+    invoke-static {v0, v1}, Lo0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
+
+    move-result-object v7
+
+    const/4 v1, 0x0
+
+    const v2, 0x7fffffff
+
+    const-wide/16 v3, 0x3c
+
+    move-object v0, v8
+
+    invoke-direct/range {v0 .. v7}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
+
+    sput-object v8, Lo0/g0/g/e;->y:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lo0/g0/g/e$b;)V
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    const-string v2, "builder"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
+
+    iget-boolean v2, v1, Lo0/g0/g/e$b;->h:Z
+
+    iput-boolean v2, v0, Lo0/g0/g/e;->d:Z
+
+    iget-object v2, v1, Lo0/g0/g/e$b;->e:Lo0/g0/g/e$c;
+
+    iput-object v2, v0, Lo0/g0/g/e;->e:Lo0/g0/g/e$c;
+
+    new-instance v2, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v2}, Ljava/util/LinkedHashMap;-><init>()V
+
+    iput-object v2, v0, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    iget-object v2, v1, Lo0/g0/g/e$b;->b:Ljava/lang/String;
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_6
+
+    iput-object v2, v0, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    iget-boolean v2, v1, Lo0/g0/g/e$b;->h:Z
+
+    if-eqz v2, :cond_0
+
+    const/4 v2, 0x3
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x2
+
+    :goto_0
+    iput v2, v0, Lo0/g0/g/e;->i:I
+
+    new-instance v2, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    const/4 v4, 0x1
+
+    new-array v5, v4, [Ljava/lang/Object;
+
+    iget-object v6, v0, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    const/4 v7, 0x0
+
+    aput-object v6, v5, v7
+
+    const-string v6, "OkHttp %s Writer"
+
+    invoke-static {v6, v5}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "name"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lo0/g0/b$a;
+
+    invoke-direct {v8, v5, v7}, Lo0/g0/b$a;-><init>(Ljava/lang/String;Z)V
+
+    invoke-direct {v2, v4, v8}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
+
+    iput-object v2, v0, Lo0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    new-instance v2, Ljava/util/concurrent/ThreadPoolExecutor;
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x1
+
+    const-wide/16 v12, 0x3c
+
+    sget-object v14, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    new-instance v15, Ljava/util/concurrent/LinkedBlockingQueue;
+
+    invoke-direct {v15}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
+
+    new-array v5, v4, [Ljava/lang/Object;
+
+    iget-object v8, v0, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    aput-object v8, v5, v7
+
+    const-string v7, "OkHttp %s Push Observer"
+
+    invoke-static {v7, v5}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v6, Lo0/g0/b$a;
+
+    invoke-direct {v6, v5, v4}, Lo0/g0/b$a;-><init>(Ljava/lang/String;Z)V
+
+    move-object v9, v2
+
+    move-object/from16 v16, v6
+
+    invoke-direct/range {v9 .. v16}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
+
+    iput-object v2, v0, Lo0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    iget-object v2, v1, Lo0/g0/g/e$b;->f:Lo0/g0/g/p;
+
+    iput-object v2, v0, Lo0/g0/g/e;->m:Lo0/g0/g/p;
+
+    new-instance v2, Lo0/g0/g/q;
+
+    invoke-direct {v2}, Lo0/g0/g/q;-><init>()V
+
+    iget-boolean v4, v1, Lo0/g0/g/e$b;->h:Z
+
+    const/4 v5, 0x7
+
+    if-eqz v4, :cond_1
+
+    const/high16 v4, 0x1000000
+
+    invoke-virtual {v2, v5, v4}, Lo0/g0/g/q;->b(II)Lo0/g0/g/q;
+
+    :cond_1
+    iput-object v2, v0, Lo0/g0/g/e;->o:Lo0/g0/g/q;
+
+    new-instance v2, Lo0/g0/g/q;
+
+    invoke-direct {v2}, Lo0/g0/g/q;-><init>()V
+
+    const v4, 0xffff
+
+    invoke-virtual {v2, v5, v4}, Lo0/g0/g/q;->b(II)Lo0/g0/g/q;
+
+    const/4 v4, 0x5
+
+    const/16 v5, 0x4000
+
+    invoke-virtual {v2, v4, v5}, Lo0/g0/g/q;->b(II)Lo0/g0/g/q;
+
+    iput-object v2, v0, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    invoke-virtual {v2}, Lo0/g0/g/q;->a()I
+
+    move-result v2
+
+    int-to-long v4, v2
+
+    iput-wide v4, v0, Lo0/g0/g/e;->t:J
+
+    iget-object v2, v1, Lo0/g0/g/e$b;->a:Ljava/net/Socket;
+
+    if-eqz v2, :cond_5
+
+    iput-object v2, v0, Lo0/g0/g/e;->u:Ljava/net/Socket;
+
+    new-instance v2, Lo0/g0/g/m;
+
+    iget-object v4, v1, Lo0/g0/g/e$b;->d:Lokio/BufferedSink;
+
+    if-eqz v4, :cond_4
+
+    iget-boolean v5, v0, Lo0/g0/g/e;->d:Z
+
+    invoke-direct {v2, v4, v5}, Lo0/g0/g/m;-><init>(Lokio/BufferedSink;Z)V
+
+    iput-object v2, v0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    new-instance v2, Lo0/g0/g/e$d;
+
+    new-instance v4, Lo0/g0/g/k;
+
+    iget-object v5, v1, Lo0/g0/g/e$b;->c:Lp0/g;
+
+    if-eqz v5, :cond_3
+
+    iget-boolean v3, v0, Lo0/g0/g/e;->d:Z
+
+    invoke-direct {v4, v5, v3}, Lo0/g0/g/k;-><init>(Lp0/g;Z)V
+
+    invoke-direct {v2, v0, v4}, Lo0/g0/g/e$d;-><init>(Lo0/g0/g/e;Lo0/g0/g/k;)V
+
+    iput-object v2, v0, Lo0/g0/g/e;->w:Lo0/g0/g/e$d;
+
+    new-instance v2, Ljava/util/LinkedHashSet;
+
+    invoke-direct {v2}, Ljava/util/LinkedHashSet;-><init>()V
+
+    iput-object v2, v0, Lo0/g0/g/e;->x:Ljava/util/Set;
+
+    iget v2, v1, Lo0/g0/g/e$b;->g:I
+
+    if-eqz v2, :cond_2
+
+    iget-object v3, v0, Lo0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    new-instance v4, Lo0/g0/g/e$a;
+
+    invoke-direct {v4, v0}, Lo0/g0/g/e$a;-><init>(Lo0/g0/g/e;)V
+
+    iget v1, v1, Lo0/g0/g/e$b;->g:I
+
+    int-to-long v7, v1
+
+    sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    move-wide v5, v7
+
+    invoke-virtual/range {v3 .. v9}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    :cond_2
+    return-void
+
+    :cond_3
+    const-string v1, "source"
+
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v3
+
+    :cond_4
+    const-string v1, "sink"
+
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v3
+
+    :cond_5
+    const-string v1, "socket"
+
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v3
+
+    :cond_6
+    const-string v1, "connectionName"
+
+    invoke-static {v1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v3
+.end method
+
+
+# virtual methods
+.method public final a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+    .locals 3
+
+    const-string v0, "connectionCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "streamCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p1, "Assertion failed"
+
+    new-instance p2, Ljava/lang/AssertionError;
+
+    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p2
+
+    :cond_1
+    :goto_0
+    :try_start_0
+    invoke-virtual {p0, p1}, Lo0/g0/g/e;->f(Lo0/g0/g/a;)V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    const/4 p1, 0x0
+
+    monitor-enter p0
+
+    :try_start_1
+    iget-object v0, p0, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    iget-object p1, p0, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object p1
+
+    new-array v0, v1, [Lo0/g0/g/l;
+
+    invoke-interface {p1, v0}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_2
+
+    check-cast p1, [Lo0/g0/g/l;
+
+    iget-object v0, p0, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-interface {v0}, Ljava/util/Map;->clear()V
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :cond_3
+    :goto_1
+    monitor-exit p0
+
+    if-eqz p1, :cond_4
+
+    array-length v0, p1
+
+    :goto_2
+    if-ge v1, v0, :cond_4
+
+    aget-object v2, p1, v1
+
+    :try_start_2
+    invoke-virtual {v2, p2, p3}, Lo0/g0/g/l;->c(Lo0/g0/g/a;Ljava/io/IOException;)V
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_1
+
+    :catch_1
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_2
+
+    :cond_4
+    :try_start_3
+    iget-object p1, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {p1}, Lo0/g0/g/m;->close()V
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
+
+    :catch_2
+    :try_start_4
+    iget-object p1, p0, Lo0/g0/g/e;->u:Ljava/net/Socket;
+
+    invoke-virtual {p1}, Ljava/net/Socket;->close()V
+    :try_end_4
+    .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_3
+
+    :catch_3
+    iget-object p1, p0, Lo0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->shutdown()V
+
+    iget-object p1, p0, Lo0/g0/g/e;->l:Ljava/util/concurrent/ThreadPoolExecutor;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/ThreadPoolExecutor;->shutdown()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized b(I)Lo0/g0/g/l;
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lo0/g0/g/l;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized c()I
+    .locals 3
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    const v1, 0x7fffffff
+
+    iget v2, v0, Lo0/g0/g/q;->a:I
+
+    and-int/lit8 v2, v2, 0x10
+
+    if-eqz v2, :cond_0
+
+    iget-object v0, v0, Lo0/g0/g/q;->b:[I
+
+    const/4 v1, 0x4
+
+    aget v1, v0, v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_0
+    monitor-exit p0
+
+    return v1
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public close()V
+    .locals 3
+
+    sget-object v0, Lo0/g0/g/a;->d:Lo0/g0/g/a;
+
+    sget-object v1, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p0, v0, v1, v2}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    return-void
+.end method
+
+.method public final d(I)Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    if-eqz p1, :cond_0
+
+    and-int/2addr p1, v0
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public final declared-synchronized e(I)Lo0/g0/g/l;
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lo0/g0/g/l;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final f(Lo0/g0/g/a;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "statusCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    monitor-enter v0
+
+    :try_start_0
+    monitor-enter p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-boolean v1, p0, Lo0/g0/g/e;->j:Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v1, :cond_0
+
+    :try_start_2
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    monitor-exit v0
+
+    return-void
+
+    :cond_0
+    const/4 v1, 0x1
+
+    :try_start_3
+    iput-boolean v1, p0, Lo0/g0/g/e;->j:Z
+
+    iget v1, p0, Lo0/g0/g/e;->h:I
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :try_start_4
+    monitor-exit p0
+
+    iget-object v2, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    sget-object v3, Lo0/g0/b;->a:[B
+
+    invoke-virtual {v2, v1, p1, v3}, Lo0/g0/g/m;->d(ILo0/g0/g/a;[B)V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_5
+    monitor-exit p0
+
+    throw p1
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+.end method
+
+.method public final flush()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {v0}, Lo0/g0/g/m;->flush()V
+
+    return-void
+.end method
+
+.method public final declared-synchronized g(J)V
+    .locals 3
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-wide v0, p0, Lo0/g0/g/e;->q:J
+
+    add-long/2addr v0, p1
+
+    iput-wide v0, p0, Lo0/g0/g/e;->q:J
+
+    iget-wide p1, p0, Lo0/g0/g/e;->r:J
+
+    sub-long/2addr v0, p1
+
+    iget-object p1, p0, Lo0/g0/g/e;->o:Lo0/g0/g/q;
+
+    invoke-virtual {p1}, Lo0/g0/g/q;->a()I
+
+    move-result p1
+
+    div-int/lit8 p1, p1, 0x2
+
+    int-to-long p1, p1
+
+    cmp-long v2, v0, p1
+
+    if-ltz v2, :cond_0
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1, v0, v1}, Lo0/g0/g/e;->p(IJ)V
+
+    iget-wide p1, p0, Lo0/g0/g/e;->r:J
+
+    add-long/2addr p1, v0
+
+    iput-wide p1, p0, Lo0/g0/g/e;->r:J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_0
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final i(IZLp0/e;J)V
+    .locals 9
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    const-wide/16 v1, 0x0
+
+    cmp-long v3, p4, v1
+
+    if-nez v3, :cond_0
+
+    iget-object p4, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {p4, p2, p1, p3, v0}, Lo0/g0/g/m;->b(ZILp0/e;I)V
+
+    return-void
+
+    :cond_0
+    :goto_0
+    cmp-long v3, p4, v1
+
+    if-lez v3, :cond_4
+
+    new-instance v3, Lkotlin/jvm/internal/Ref$IntRef;
+
+    invoke-direct {v3}, Lkotlin/jvm/internal/Ref$IntRef;-><init>()V
+
+    monitor-enter p0
+
+    :goto_1
+    :try_start_0
+    iget-wide v4, p0, Lo0/g0/g/e;->s:J
+
+    iget-wide v6, p0, Lo0/g0/g/e;->t:J
+
+    cmp-long v8, v4, v6
+
+    if-ltz v8, :cond_2
+
+    iget-object v4, p0, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v5
+
+    invoke-interface {v4, v5}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    invoke-virtual {p0}, Ljava/lang/Object;->wait()V
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "stream closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_2
+    :try_start_1
+    iget-wide v4, p0, Lo0/g0/g/e;->t:J
+
+    iget-wide v6, p0, Lo0/g0/g/e;->s:J
+
+    sub-long/2addr v4, v6
+
+    invoke-static {p4, p5, v4, v5}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v4
+
+    long-to-int v5, v4
+
+    iput v5, v3, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+
+    iget-object v4, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    iget v4, v4, Lo0/g0/g/m;->e:I
+
+    invoke-static {v5, v4}, Ljava/lang/Math;->min(II)I
+
+    move-result v4
+
+    iput v4, v3, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+
+    iget-wide v5, p0, Lo0/g0/g/e;->s:J
+
+    int-to-long v7, v4
+
+    add-long/2addr v5, v7
+
+    iput-wide v5, p0, Lo0/g0/g/e;->s:J
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    int-to-long v4, v4
+
+    sub-long/2addr p4, v4
+
+    iget-object v4, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    if-eqz p2, :cond_3
+
+    cmp-long v5, p4, v1
+
+    if-nez v5, :cond_3
+
+    const/4 v5, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v5, 0x0
+
+    :goto_2
+    iget v3, v3, Lkotlin/jvm/internal/Ref$IntRef;->element:I
+
+    invoke-virtual {v4, v5, p1, p3, v3}, Lo0/g0/g/m;->b(ZILp0/e;I)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    goto :goto_3
+
+    :catch_0
+    :try_start_2
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Thread;->interrupt()V
+
+    new-instance p1, Ljava/io/InterruptedIOException;
+
+    invoke-direct {p1}, Ljava/io/InterruptedIOException;-><init>()V
+
+    throw p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :goto_3
+    monitor-exit p0
+
+    throw p1
+
+    :cond_4
+    return-void
+.end method
+
+.method public final k(ZII)V
+    .locals 3
+
+    sget-object v0, Lo0/g0/g/a;->e:Lo0/g0/g/a;
+
+    if-nez p1, :cond_0
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v1, p0, Lo0/g0/g/e;->n:Z
+
+    const/4 v2, 0x1
+
+    iput-boolean v2, p0, Lo0/g0/g/e;->n:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    if-eqz v1, :cond_0
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, v0, v0, p1}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+
+    :cond_0
+    :try_start_1
+    iget-object v1, p0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {v1, p1, p2, p3}, Lo0/g0/g/m;->f(ZII)V
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    invoke-virtual {p0, v0, v0, p1}, Lo0/g0/g/e;->a(Lo0/g0/g/a;Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public final n(ILo0/g0/g/a;)V
+    .locals 3
+
+    const-string v0, "errorCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    const-string v1, "OkHttp "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " stream "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    :try_start_0
+    new-instance v2, Lo0/g0/g/e$e;
+
+    invoke-direct {v2, v1, p0, p1, p2}, Lo0/g0/g/e$e;-><init>(Ljava/lang/String;Lo0/g0/g/e;ILo0/g0/g/a;)V
+
+    invoke-interface {v0, v2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-void
+.end method
+
+.method public final p(IJ)V
+    .locals 9
+
+    iget-object v0, p0, Lo0/g0/g/e;->k:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    const-string v1, "OkHttp Window Update "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/g0/g/e;->g:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " stream "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
+    :try_start_0
+    new-instance v1, Lo0/g0/g/e$f;
+
+    move-object v3, v1
+
+    move-object v5, p0
+
+    move v6, p1
+
+    move-wide v7, p2
+
+    invoke-direct/range {v3 .. v8}, Lo0/g0/g/e$f;-><init>(Ljava/lang/String;Lo0/g0/g/e;IJ)V
+
+    invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/f.smali b/com.discord/smali_classes2/o0/g0/g/f.smali
new file mode 100644
index 0000000000..1333ae9d75
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/f.smali
@@ -0,0 +1,152 @@
+.class public final Lo0/g0/g/f;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e;
+
+.field public final synthetic f:I
+
+.field public final synthetic g:Lp0/e;
+
+.field public final synthetic h:I
+
+.field public final synthetic i:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e;ILp0/e;IZ)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/f;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/f;->e:Lo0/g0/g/e;
+
+    iput p3, p0, Lo0/g0/g/f;->f:I
+
+    iput-object p4, p0, Lo0/g0/g/f;->g:Lp0/e;
+
+    iput p5, p0, Lo0/g0/g/f;->h:I
+
+    iput-boolean p6, p0, Lo0/g0/g/f;->i:Z
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 7
+
+    iget-object v0, p0, Lo0/g0/g/f;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/f;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->m:Lo0/g0/g/p;
+
+    iget v3, p0, Lo0/g0/g/f;->f:I
+
+    iget-object v4, p0, Lo0/g0/g/f;->g:Lp0/e;
+
+    iget v5, p0, Lo0/g0/g/f;->h:I
+
+    iget-boolean v6, p0, Lo0/g0/g/f;->i:Z
+
+    invoke-interface {v0, v3, v4, v5, v6}, Lo0/g0/g/p;->d(ILp0/g;IZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v3, p0, Lo0/g0/g/f;->e:Lo0/g0/g/e;
+
+    iget-object v3, v3, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    iget v4, p0, Lo0/g0/g/f;->f:I
+
+    sget-object v5, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    invoke-virtual {v3, v4, v5}, Lo0/g0/g/m;->g(ILo0/g0/g/a;)V
+
+    :cond_0
+    if-nez v0, :cond_1
+
+    iget-boolean v0, p0, Lo0/g0/g/f;->i:Z
+
+    if-eqz v0, :cond_2
+
+    :cond_1
+    iget-object v0, p0, Lo0/g0/g/f;->e:Lo0/g0/g/e;
+
+    monitor-enter v0
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v3, p0, Lo0/g0/g/f;->e:Lo0/g0/g/e;
+
+    iget-object v3, v3, Lo0/g0/g/e;->x:Ljava/util/Set;
+
+    iget v4, p0, Lo0/g0/g/f;->f:I
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    monitor-exit v0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v3
+
+    monitor-exit v0
+
+    throw v3
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+
+    :catch_0
+    :cond_2
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/g.smali b/com.discord/smali_classes2/o0/g0/g/g.smali
new file mode 100644
index 0000000000..e8dacfd7aa
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/g.smali
@@ -0,0 +1,149 @@
+.class public final Lo0/g0/g/g;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e;
+
+.field public final synthetic f:I
+
+.field public final synthetic g:Ljava/util/List;
+
+.field public final synthetic h:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e;ILjava/util/List;Z)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/g;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/g;->e:Lo0/g0/g/e;
+
+    iput p3, p0, Lo0/g0/g/g;->f:I
+
+    iput-object p4, p0, Lo0/g0/g/g;->g:Ljava/util/List;
+
+    iput-boolean p5, p0, Lo0/g0/g/g;->h:Z
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 6
+
+    iget-object v0, p0, Lo0/g0/g/g;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/g;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->m:Lo0/g0/g/p;
+
+    iget v3, p0, Lo0/g0/g/g;->f:I
+
+    iget-object v4, p0, Lo0/g0/g/g;->g:Ljava/util/List;
+
+    iget-boolean v5, p0, Lo0/g0/g/g;->h:Z
+
+    invoke-interface {v0, v3, v4, v5}, Lo0/g0/g/p;->b(ILjava/util/List;Z)Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-eqz v0, :cond_0
+
+    :try_start_1
+    iget-object v3, p0, Lo0/g0/g/g;->e:Lo0/g0/g/e;
+
+    iget-object v3, v3, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    iget v4, p0, Lo0/g0/g/g;->f:I
+
+    sget-object v5, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    invoke-virtual {v3, v4, v5}, Lo0/g0/g/m;->g(ILo0/g0/g/a;)V
+
+    :cond_0
+    if-nez v0, :cond_1
+
+    iget-boolean v0, p0, Lo0/g0/g/g;->h:Z
+
+    if-eqz v0, :cond_2
+
+    :cond_1
+    iget-object v0, p0, Lo0/g0/g/g;->e:Lo0/g0/g/e;
+
+    monitor-enter v0
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :try_start_2
+    iget-object v3, p0, Lo0/g0/g/g;->e:Lo0/g0/g/e;
+
+    iget-object v3, v3, Lo0/g0/g/e;->x:Ljava/util/Set;
+
+    iget v4, p0, Lo0/g0/g/g;->f:I
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :try_start_3
+    monitor-exit v0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v3
+
+    monitor-exit v0
+
+    throw v3
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catch_0
+    :cond_2
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/h.smali b/com.discord/smali_classes2/o0/g0/g/h.smali
new file mode 100644
index 0000000000..1141468524
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/h.smali
@@ -0,0 +1,135 @@
+.class public final Lo0/g0/g/h;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e;
+
+.field public final synthetic f:I
+
+.field public final synthetic g:Ljava/util/List;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e;ILjava/util/List;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/h;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/h;->e:Lo0/g0/g/e;
+
+    iput p3, p0, Lo0/g0/g/h;->f:I
+
+    iput-object p4, p0, Lo0/g0/g/h;->g:Ljava/util/List;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 5
+
+    iget-object v0, p0, Lo0/g0/g/h;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/h;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->m:Lo0/g0/g/p;
+
+    iget v3, p0, Lo0/g0/g/h;->f:I
+
+    iget-object v4, p0, Lo0/g0/g/h;->g:Ljava/util/List;
+
+    invoke-interface {v0, v3, v4}, Lo0/g0/g/p;->a(ILjava/util/List;)Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-eqz v0, :cond_0
+
+    :try_start_1
+    iget-object v0, p0, Lo0/g0/g/h;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    iget v3, p0, Lo0/g0/g/h;->f:I
+
+    sget-object v4, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    invoke-virtual {v0, v3, v4}, Lo0/g0/g/m;->g(ILo0/g0/g/a;)V
+
+    iget-object v0, p0, Lo0/g0/g/h;->e:Lo0/g0/g/e;
+
+    monitor-enter v0
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :try_start_2
+    iget-object v3, p0, Lo0/g0/g/h;->e:Lo0/g0/g/e;
+
+    iget-object v3, v3, Lo0/g0/g/e;->x:Ljava/util/Set;
+
+    iget v4, p0, Lo0/g0/g/h;->f:I
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :try_start_3
+    monitor-exit v0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v3
+
+    monitor-exit v0
+
+    throw v3
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catch_0
+    :cond_0
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/i.smali b/com.discord/smali_classes2/o0/g0/g/i.smali
new file mode 100644
index 0000000000..b7a0f8d47e
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/i.smali
@@ -0,0 +1,114 @@
+.class public final Lo0/g0/g/i;
+.super Ljava/lang/Object;
+.source "Util.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/String;
+
+.field public final synthetic e:Lo0/g0/g/e;
+
+.field public final synthetic f:I
+
+.field public final synthetic g:Lo0/g0/g/a;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lo0/g0/g/e;ILo0/g0/g/a;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/g/i;->d:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/g0/g/i;->e:Lo0/g0/g/e;
+
+    iput p3, p0, Lo0/g0/g/i;->f:I
+
+    iput-object p4, p0, Lo0/g0/g/i;->g:Lo0/g0/g/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 5
+
+    iget-object v0, p0, Lo0/g0/g/i;->d:Ljava/lang/String;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/i;->e:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->m:Lo0/g0/g/p;
+
+    iget v3, p0, Lo0/g0/g/i;->f:I
+
+    iget-object v4, p0, Lo0/g0/g/i;->g:Lo0/g0/g/a;
+
+    invoke-interface {v0, v3, v4}, Lo0/g0/g/p;->c(ILo0/g0/g/a;)V
+
+    iget-object v0, p0, Lo0/g0/g/i;->e:Lo0/g0/g/e;
+
+    monitor-enter v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v3, p0, Lo0/g0/g/i;->e:Lo0/g0/g/e;
+
+    iget-object v3, v3, Lo0/g0/g/e;->x:Ljava/util/Set;
+
+    iget v4, p0, Lo0/g0/g/i;->f:I
+
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-interface {v3, v4}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    monitor-exit v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v3
+
+    :try_start_3
+    monitor-exit v0
+
+    throw v3
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/j.smali b/com.discord/smali_classes2/o0/g0/g/j.smali
new file mode 100644
index 0000000000..521524c5ae
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/j.smali
@@ -0,0 +1,1020 @@
+.class public final Lo0/g0/g/j;
+.super Ljava/lang/Object;
+.source "Http2ExchangeCodec.kt"
+
+# interfaces
+.implements Lo0/g0/e/d;
+
+
+# static fields
+.field public static final g:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final h:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public volatile a:Lo0/g0/g/l;
+
+.field public final b:Lo0/y;
+
+.field public volatile c:Z
+
+.field public final d:Lo0/g0/d/i;
+
+.field public final e:Lokhttp3/Interceptor$Chain;
+
+.field public final f:Lo0/g0/g/e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 12
+
+    const-string v0, "connection"
+
+    const-string v1, "host"
+
+    const-string v2, "keep-alive"
+
+    const-string v3, "proxy-connection"
+
+    const-string v4, "te"
+
+    const-string v5, "transfer-encoding"
+
+    const-string v6, "encoding"
+
+    const-string v7, "upgrade"
+
+    const-string v8, ":method"
+
+    const-string v9, ":path"
+
+    const-string v10, ":scheme"
+
+    const-string v11, ":authority"
+
+    filled-new-array/range {v0 .. v11}, [Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lo0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/j;->g:Ljava/util/List;
+
+    const-string v1, "connection"
+
+    const-string v2, "host"
+
+    const-string v3, "keep-alive"
+
+    const-string v4, "proxy-connection"
+
+    const-string v5, "te"
+
+    const-string v6, "transfer-encoding"
+
+    const-string v7, "encoding"
+
+    const-string v8, "upgrade"
+
+    filled-new-array/range {v1 .. v8}, [Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lo0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/j;->h:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lo0/x;Lo0/g0/d/i;Lokhttp3/Interceptor$Chain;Lo0/g0/g/e;)V
+    .locals 2
+
+    sget-object v0, Lo0/y;->h:Lo0/y;
+
+    const-string v1, "client"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "realConnection"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "chain"
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "connection"
+
+    invoke-static {p4, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p2, p0, Lo0/g0/g/j;->d:Lo0/g0/d/i;
+
+    iput-object p3, p0, Lo0/g0/g/j;->e:Lokhttp3/Interceptor$Chain;
+
+    iput-object p4, p0, Lo0/g0/g/j;->f:Lo0/g0/g/e;
+
+    iget-object p1, p1, Lo0/x;->w:Ljava/util/List;
+
+    invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Lo0/y;->g:Lo0/y;
+
+    :goto_0
+    iput-object v0, p0, Lo0/g0/g/j;->b:Lo0/y;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lo0/g0/d/i;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/g/j;->d:Lo0/g0/d/i;
+
+    return-object v0
+.end method
+
+.method public b()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lo0/g0/g/l;->g()Lp0/u;
+
+    move-result-object v0
+
+    check-cast v0, Lo0/g0/g/l$a;
+
+    invoke-virtual {v0}, Lo0/g0/g/l$a;->close()V
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public c(Lo0/a0;)V
+    .locals 18
+
+    move-object/from16 v1, p0
+
+    move-object/from16 v0, p1
+
+    const-string v2, "request"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v1, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-eqz v2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v2, v0, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    const/4 v4, 0x1
+
+    if-eqz v2, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_0
+    const-string v5, "request"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v5, v0, Lo0/a0;->d:Lokhttp3/Headers;
+
+    new-instance v6, Ljava/util/ArrayList;
+
+    invoke-virtual {v5}, Lokhttp3/Headers;->size()I
+
+    move-result v7
+
+    add-int/lit8 v7, v7, 0x4
+
+    invoke-direct {v6, v7}, Ljava/util/ArrayList;-><init>(I)V
+
+    new-instance v7, Lo0/g0/g/b;
+
+    sget-object v8, Lo0/g0/g/b;->f:Lokio/ByteString;
+
+    iget-object v9, v0, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-direct {v7, v8, v9}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    invoke-virtual {v6, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    new-instance v7, Lo0/g0/g/b;
+
+    sget-object v8, Lo0/g0/g/b;->g:Lokio/ByteString;
+
+    iget-object v9, v0, Lo0/a0;->b:Lo0/w;
+
+    const-string v10, "url"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v9}, Lo0/w;->b()Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-virtual {v9}, Lo0/w;->d()Ljava/lang/String;
+
+    move-result-object v9
+
+    if-eqz v9, :cond_2
+
+    new-instance v11, Ljava/lang/StringBuilder;
+
+    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v11, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v10, 0x3f
+
+    invoke-virtual {v11, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v10
+
+    :cond_2
+    invoke-direct {v7, v8, v10}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    invoke-virtual {v6, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    const-string v7, "Host"
+
+    invoke-virtual {v0, v7}, Lo0/a0;->b(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_3
+
+    new-instance v8, Lo0/g0/g/b;
+
+    sget-object v9, Lo0/g0/g/b;->i:Lokio/ByteString;
+
+    invoke-direct {v8, v9, v7}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    invoke-virtual {v6, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_3
+    new-instance v7, Lo0/g0/g/b;
+
+    sget-object v8, Lo0/g0/g/b;->h:Lokio/ByteString;
+
+    iget-object v0, v0, Lo0/a0;->b:Lo0/w;
+
+    iget-object v0, v0, Lo0/w;->b:Ljava/lang/String;
+
+    invoke-direct {v7, v8, v0}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Ljava/lang/String;)V
+
+    invoke-virtual {v6, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-virtual {v5}, Lokhttp3/Headers;->size()I
+
+    move-result v0
+
+    const/4 v7, 0x0
+
+    :goto_1
+    if-ge v7, v0, :cond_7
+
+    invoke-virtual {v5, v7}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    sget-object v9, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const-string v10, "Locale.US"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz v8, :cond_6
+
+    invoke-virtual {v8, v9}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v9, "(this as java.lang.String).toLowerCase(locale)"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v9, Lo0/g0/g/j;->g:Ljava/util/List;
+
+    invoke-interface {v9, v8}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_4
+
+    const-string v9, "te"
+
+    invoke-static {v8, v9}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_5
+
+    invoke-virtual {v5, v7}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, "trailers"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_5
+
+    :cond_4
+    new-instance v9, Lo0/g0/g/b;
+
+    invoke-virtual {v5, v7}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
+
+    move-result-object v10
+
+    invoke-direct {v9, v8, v10}, Lo0/g0/g/b;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-virtual {v6, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_5
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_1
+
+    :cond_6
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v2, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {v0, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_7
+    iget-object v5, v1, Lo0/g0/g/j;->f:Lo0/g0/g/e;
+
+    const/4 v0, 0x0
+
+    if-eqz v5, :cond_12
+
+    const-string v7, "requestHeaders"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    xor-int/lit8 v13, v2, 0x1
+
+    const/4 v11, 0x0
+
+    iget-object v14, v5, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    monitor-enter v14
+
+    :try_start_0
+    monitor-enter v5
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget v7, v5, Lo0/g0/g/e;->i:I
+
+    const v8, 0x3fffffff    # 1.9999999f
+
+    if-le v7, v8, :cond_8
+
+    sget-object v7, Lo0/g0/g/a;->h:Lo0/g0/g/a;
+
+    invoke-virtual {v5, v7}, Lo0/g0/g/e;->f(Lo0/g0/g/a;)V
+
+    :cond_8
+    iget-boolean v7, v5, Lo0/g0/g/e;->j:Z
+
+    if-nez v7, :cond_11
+
+    iget v15, v5, Lo0/g0/g/e;->i:I
+
+    iget v7, v5, Lo0/g0/g/e;->i:I
+
+    add-int/lit8 v7, v7, 0x2
+
+    iput v7, v5, Lo0/g0/g/e;->i:I
+
+    new-instance v12, Lo0/g0/g/l;
+
+    const/16 v16, 0x0
+
+    move-object v7, v12
+
+    move v8, v15
+
+    move-object v9, v5
+
+    move v10, v13
+
+    move-object v3, v12
+
+    move-object/from16 v12, v16
+
+    invoke-direct/range {v7 .. v12}, Lo0/g0/g/l;-><init>(ILo0/g0/g/e;ZZLokhttp3/Headers;)V
+
+    if-eqz v2, :cond_a
+
+    iget-wide v7, v5, Lo0/g0/g/e;->s:J
+
+    iget-wide v9, v5, Lo0/g0/g/e;->t:J
+
+    cmp-long v2, v7, v9
+
+    if-gez v2, :cond_a
+
+    iget-wide v7, v3, Lo0/g0/g/l;->c:J
+
+    iget-wide v9, v3, Lo0/g0/g/l;->d:J
+
+    cmp-long v2, v7, v9
+
+    if-ltz v2, :cond_9
+
+    goto :goto_2
+
+    :cond_9
+    const/16 v17, 0x0
+
+    goto :goto_3
+
+    :cond_a
+    :goto_2
+    const/16 v17, 0x1
+
+    :goto_3
+    invoke-virtual {v3}, Lo0/g0/g/l;->i()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_b
+
+    iget-object v2, v5, Lo0/g0/g/e;->f:Ljava/util/Map;
+
+    invoke-static {v15}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-interface {v2, v4, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :cond_b
+    :try_start_2
+    monitor-exit v5
+
+    iget-object v2, v5, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {v2, v13, v15, v6}, Lo0/g0/g/m;->e(ZILjava/util/List;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    monitor-exit v14
+
+    if-eqz v17, :cond_c
+
+    iget-object v2, v5, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {v2}, Lo0/g0/g/m;->flush()V
+
+    :cond_c
+    iput-object v3, v1, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    iget-boolean v2, v1, Lo0/g0/g/j;->c:Z
+
+    if-eqz v2, :cond_e
+
+    iget-object v2, v1, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-nez v2, :cond_d
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_d
+    sget-object v0, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    invoke-virtual {v2, v0}, Lo0/g0/g/l;->e(Lo0/g0/g/a;)V
+
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v2, "Canceled"
+
+    invoke-direct {v0, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_e
+    iget-object v2, v1, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-eqz v2, :cond_10
+
+    iget-object v2, v2, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    iget-object v3, v1, Lo0/g0/g/j;->e:Lokhttp3/Interceptor$Chain;
+
+    invoke-interface {v3}, Lokhttp3/Interceptor$Chain;->b()I
+
+    move-result v3
+
+    int-to-long v3, v3
+
+    sget-object v5, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v2, v3, v4, v5}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    iget-object v2, v1, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-eqz v2, :cond_f
+
+    iget-object v0, v2, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    iget-object v2, v1, Lo0/g0/g/j;->e:Lokhttp3/Interceptor$Chain;
+
+    invoke-interface {v2}, Lokhttp3/Interceptor$Chain;->c()I
+
+    move-result v2
+
+    int-to-long v2, v2
+
+    sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v2, v3, v4}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    return-void
+
+    :cond_f
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_10
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_11
+    :try_start_3
+    new-instance v0, Lokhttp3/internal/http2/ConnectionShutdownException;
+
+    invoke-direct {v0}, Lokhttp3/internal/http2/ConnectionShutdownException;-><init>()V
+
+    throw v0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_4
+    monitor-exit v5
+
+    throw v0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit v14
+
+    throw v0
+
+    :cond_12
+    throw v0
+.end method
+
+.method public cancel()V
+    .locals 2
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/g/j;->c:Z
+
+    iget-object v0, p0, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-eqz v0, :cond_0
+
+    sget-object v1, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    invoke-virtual {v0, v1}, Lo0/g0/g/l;->e(Lo0/g0/g/a;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public d(Lokhttp3/Response;)Lp0/w;
+    .locals 1
+
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p1, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    return-object p1
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public e(Z)Lokhttp3/Response$a;
+    .locals 11
+
+    iget-object v0, p0, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_a
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v2, v0, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    invoke-virtual {v2}, Lp0/b;->i()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :goto_0
+    :try_start_1
+    iget-object v2, v0, Lo0/g0/g/l;->e:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2}, Ljava/util/ArrayDeque;->isEmpty()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+
+    if-nez v2, :cond_0
+
+    invoke-virtual {v0}, Lo0/g0/g/l;->l()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_2
+    iget-object v2, v0, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    invoke-virtual {v2}, Lo0/g0/g/l$c;->o()V
+
+    iget-object v2, v0, Lo0/g0/g/l;->e:Ljava/util/ArrayDeque;
+
+    invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v2
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_7
+
+    iget-object v2, v0, Lo0/g0/g/l;->e:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2}, Ljava/util/ArrayDeque;->removeFirst()Ljava/lang/Object;
+
+    move-result-object v2
+
+    const-string v3, "headersQueue.removeFirst()"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v2, Lokhttp3/Headers;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    monitor-exit v0
+
+    iget-object v0, p0, Lo0/g0/g/j;->b:Lo0/y;
+
+    const-string v3, "headerBlock"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "protocol"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    const/16 v4, 0x14
+
+    invoke-direct {v3, v4}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v2}, Lokhttp3/Headers;->size()I
+
+    move-result v4
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    move-object v7, v1
+
+    :goto_1
+    if-ge v6, v4, :cond_3
+
+    invoke-virtual {v2, v6}, Lokhttp3/Headers;->h(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-virtual {v2, v6}, Lokhttp3/Headers;->k(I)Ljava/lang/String;
+
+    move-result-object v9
+
+    const-string v10, ":status"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_1
+
+    new-instance v7, Ljava/lang/StringBuilder;
+
+    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v8, "HTTP/1.1 "
+
+    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-static {v7}, Lo0/g0/e/j;->a(Ljava/lang/String;)Lo0/g0/e/j;
+
+    move-result-object v7
+
+    goto :goto_2
+
+    :cond_1
+    sget-object v10, Lo0/g0/g/j;->h:Ljava/util/List;
+
+    invoke-interface {v10, v8}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v10
+
+    if-nez v10, :cond_2
+
+    const-string v10, "name"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "value"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-static {v9}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v8
+
+    invoke-virtual {v8}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-virtual {v3, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_2
+    :goto_2
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    if-eqz v7, :cond_6
+
+    new-instance v2, Lokhttp3/Response$a;
+
+    invoke-direct {v2}, Lokhttp3/Response$a;-><init>()V
+
+    invoke-virtual {v2, v0}, Lokhttp3/Response$a;->f(Lo0/y;)Lokhttp3/Response$a;
+
+    iget v0, v7, Lo0/g0/e/j;->b:I
+
+    iput v0, v2, Lokhttp3/Response$a;->c:I
+
+    iget-object v0, v7, Lo0/g0/e/j;->c:Ljava/lang/String;
+
+    invoke-virtual {v2, v0}, Lokhttp3/Response$a;->e(Ljava/lang/String;)Lokhttp3/Response$a;
+
+    new-array v0, v5, [Ljava/lang/String;
+
+    invoke-virtual {v3, v0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    check-cast v0, [Ljava/lang/String;
+
+    new-instance v3, Lokhttp3/Headers;
+
+    invoke-direct {v3, v0, v1}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v2, v3}, Lokhttp3/Response$a;->d(Lokhttp3/Headers;)Lokhttp3/Response$a;
+
+    if-eqz p1, :cond_4
+
+    iget p1, v2, Lokhttp3/Response$a;->c:I
+
+    const/16 v0, 0x64
+
+    if-ne p1, v0, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    move-object v1, v2
+
+    :goto_3
+    return-object v1
+
+    :cond_5
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    new-instance p1, Ljava/net/ProtocolException;
+
+    const-string v0, "Expected \':status\' header not present"
+
+    invoke-direct {p1, v0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_7
+    :try_start_3
+    iget-object p1, v0, Lo0/g0/g/l;->l:Ljava/io/IOException;
+
+    if-nez p1, :cond_9
+
+    new-instance p1, Lokhttp3/internal/http2/StreamResetException;
+
+    iget-object v2, v0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+
+    if-nez v2, :cond_8
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    throw v1
+
+    :cond_8
+    :try_start_4
+    invoke-direct {p1, v2}, Lokhttp3/internal/http2/StreamResetException;-><init>(Lo0/g0/g/a;)V
+
+    :cond_9
+    throw p1
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v1, v0, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    invoke-virtual {v1}, Lo0/g0/g/l$c;->o()V
+
+    throw p1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+
+    :cond_a
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public f()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/g/j;->f:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {v0}, Lo0/g0/g/m;->flush()V
+
+    return-void
+.end method
+
+.method public g(Lokhttp3/Response;)J
+    .locals 2
+
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lo0/g0/b;->n(Lokhttp3/Response;)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public h(Lo0/a0;J)Lp0/u;
+    .locals 0
+
+    const-string p2, "request"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lo0/g0/g/j;->a:Lo0/g0/g/l;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1}, Lo0/g0/g/l;->g()Lp0/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/k$a.smali b/com.discord/smali_classes2/o0/g0/g/k$a.smali
new file mode 100644
index 0000000000..b748e3bb96
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/k$a.smali
@@ -0,0 +1,258 @@
+.class public final Lo0/g0/g/k$a;
+.super Ljava/lang/Object;
+.source "Http2Reader.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public e:I
+
+.field public f:I
+
+.field public g:I
+
+.field public h:I
+
+.field public final i:Lp0/g;
+
+
+# direct methods
+.method public constructor <init>(Lp0/g;)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 9
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    iget v0, p0, Lo0/g0/g/k$a;->g:I
+
+    const-wide/16 v1, -0x1
+
+    if-nez v0, :cond_4
+
+    iget-object v0, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    iget v3, p0, Lo0/g0/g/k$a;->h:I
+
+    int-to-long v3, v3
+
+    invoke-interface {v0, v3, v4}, Lp0/g;->skip(J)V
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lo0/g0/g/k$a;->h:I
+
+    iget v0, p0, Lo0/g0/g/k$a;->e:I
+
+    and-int/lit8 v0, v0, 0x4
+
+    if-eqz v0, :cond_0
+
+    return-wide v1
+
+    :cond_0
+    iget v0, p0, Lo0/g0/g/k$a;->f:I
+
+    iget-object v1, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    invoke-static {v1}, Lo0/g0/b;->y(Lp0/g;)I
+
+    move-result v1
+
+    iput v1, p0, Lo0/g0/g/k$a;->g:I
+
+    iput v1, p0, Lo0/g0/g/k$a;->d:I
+
+    iget-object v1, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    invoke-interface {v1}, Lp0/g;->readByte()B
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    iget-object v2, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    invoke-interface {v2}, Lp0/g;->readByte()B
+
+    move-result v2
+
+    and-int/lit16 v2, v2, 0xff
+
+    iput v2, p0, Lo0/g0/g/k$a;->e:I
+
+    sget-object v2, Lo0/g0/g/k;->i:Lo0/g0/g/k;
+
+    sget-object v2, Lo0/g0/g/k;->h:Ljava/util/logging/Logger;
+
+    sget-object v3, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
+
+    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    sget-object v2, Lo0/g0/g/k;->i:Lo0/g0/g/k;
+
+    sget-object v8, Lo0/g0/g/k;->h:Ljava/util/logging/Logger;
+
+    sget-object v2, Lo0/g0/g/d;->e:Lo0/g0/g/d;
+
+    const/4 v3, 0x1
+
+    iget v4, p0, Lo0/g0/g/k$a;->f:I
+
+    iget v5, p0, Lo0/g0/g/k$a;->d:I
+
+    iget v7, p0, Lo0/g0/g/k$a;->e:I
+
+    move v6, v1
+
+    invoke-virtual/range {v2 .. v7}, Lo0/g0/g/d;->a(ZIIII)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v8, v2}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
+
+    :cond_1
+    iget-object v2, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    invoke-interface {v2}, Lp0/g;->readInt()I
+
+    move-result v2
+
+    const v3, 0x7fffffff
+
+    and-int/2addr v2, v3
+
+    iput v2, p0, Lo0/g0/g/k$a;->f:I
+
+    const/16 v3, 0x9
+
+    if-ne v1, v3, :cond_3
+
+    if-ne v2, v0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_CONTINUATION streamId changed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/io/IOException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string p3, " != TYPE_CONTINUATION"
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    iget-object v3, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    int-to-long v4, v0
+
+    invoke-static {p2, p3, v4, v5}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p2
+
+    invoke-interface {v3, p1, p2, p3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+
+    cmp-long p3, p1, v1
+
+    if-nez p3, :cond_5
+
+    return-wide v1
+
+    :cond_5
+    iget p3, p0, Lo0/g0/g/k$a;->g:I
+
+    long-to-int v0, p1
+
+    sub-int/2addr p3, v0
+
+    iput p3, p0, Lo0/g0/g/k$a;->g:I
+
+    return-wide p1
+.end method
+
+.method public close()V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/g/k$a;->i:Lp0/g;
+
+    invoke-interface {v0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/k$b.smali b/com.discord/smali_classes2/o0/g0/g/k$b.smali
new file mode 100644
index 0000000000..97dbf6045a
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/k$b.smali
@@ -0,0 +1,73 @@
+.class public interface abstract Lo0/g0/g/k$b;
+.super Ljava/lang/Object;
+.source "Http2Reader.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "b"
+.end annotation
+
+
+# virtual methods
+.method public abstract a()V
+.end method
+
+.method public abstract b(ZLo0/g0/g/q;)V
+.end method
+
+.method public abstract c(ZIILjava/util/List;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZII",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)V"
+        }
+    .end annotation
+.end method
+
+.method public abstract d(IJ)V
+.end method
+
+.method public abstract e(ZILp0/g;I)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract f(ZII)V
+.end method
+
+.method public abstract g(IIIZ)V
+.end method
+
+.method public abstract h(ILo0/g0/g/a;)V
+.end method
+
+.method public abstract i(IILjava/util/List;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(II",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract j(ILo0/g0/g/a;Lokio/ByteString;)V
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/k.smali b/com.discord/smali_classes2/o0/g0/g/k.smali
new file mode 100644
index 0000000000..054377a3b3
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/k.smali
@@ -0,0 +1,1575 @@
+.class public final Lo0/g0/g/k;
+.super Ljava/lang/Object;
+.source "Http2Reader.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/g/k$a;,
+        Lo0/g0/g/k$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final h:Ljava/util/logging/Logger;
+
+.field public static final i:Lo0/g0/g/k;
+
+
+# instance fields
+.field public final d:Lo0/g0/g/k$a;
+
+.field public final e:Lo0/g0/g/c$a;
+
+.field public final f:Lp0/g;
+
+.field public final g:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Lo0/g0/g/d;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
+
+    move-result-object v0
+
+    const-string v1, "Logger.getLogger(Http2::class.java.name)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object v0, Lo0/g0/g/k;->h:Ljava/util/logging/Logger;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lp0/g;Z)V
+    .locals 3
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    iput-boolean p2, p0, Lo0/g0/g/k;->g:Z
+
+    new-instance p2, Lo0/g0/g/k$a;
+
+    invoke-direct {p2, p1}, Lo0/g0/g/k$a;-><init>(Lp0/g;)V
+
+    iput-object p2, p0, Lo0/g0/g/k;->d:Lo0/g0/g/k$a;
+
+    new-instance p1, Lo0/g0/g/c$a;
+
+    const/16 v0, 0x1000
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x4
+
+    invoke-direct {p1, p2, v0, v1, v2}, Lo0/g0/g/c$a;-><init>(Lp0/w;III)V
+
+    iput-object p1, p0, Lo0/g0/g/k;->e:Lo0/g0/g/c$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(ZLo0/g0/g/k$b;)Z
+    .locals 13
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "handler"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    const-wide/16 v2, 0x9
+
+    invoke-interface {v1, v2, v3}, Lp0/g;->P0(J)V
+    :try_end_0
+    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
+
+    iget-object v1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-static {v1}, Lo0/g0/b;->y(Lp0/g;)I
+
+    move-result v1
+
+    const/16 v2, 0x4000
+
+    if-gt v1, v2, :cond_36
+
+    iget-object v2, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v2}, Lp0/g;->readByte()B
+
+    move-result v2
+
+    and-int/lit16 v8, v2, 0xff
+
+    const/4 v9, 0x4
+
+    if-eqz p1, :cond_1
+
+    if-ne v8, v9, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "Expected a SETTINGS frame but was "
+
+    invoke-static {p2, v8}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {p1}, Lp0/g;->readByte()B
+
+    move-result p1
+
+    and-int/lit16 p1, p1, 0xff
+
+    iget-object v2, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v2}, Lp0/g;->readInt()I
+
+    move-result v2
+
+    const v10, 0x7fffffff
+
+    and-int v11, v2, v10
+
+    sget-object v2, Lo0/g0/g/k;->h:Ljava/util/logging/Logger;
+
+    sget-object v3, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
+
+    invoke-virtual {v2, v3}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    sget-object v12, Lo0/g0/g/k;->h:Ljava/util/logging/Logger;
+
+    sget-object v2, Lo0/g0/g/d;->e:Lo0/g0/g/d;
+
+    const/4 v3, 0x1
+
+    move v4, v11
+
+    move v5, v1
+
+    move v6, v8
+
+    move v7, p1
+
+    invoke-virtual/range {v2 .. v7}, Lo0/g0/g/d;->a(ZIIII)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v12, v2}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
+
+    :cond_2
+    const/4 v2, 0x0
+
+    const/4 v3, 0x5
+
+    const-string v4, " > remaining length "
+
+    const-string v5, "PROTOCOL_ERROR padding "
+
+    const/16 v6, 0x8
+
+    const/4 v7, 0x1
+
+    packed-switch v8, :pswitch_data_0
+
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    int-to-long v0, v1
+
+    invoke-interface {p1, v0, v1}, Lp0/g;->skip(J)V
+
+    goto/16 :goto_c
+
+    :pswitch_0
+    if-ne v1, v9, :cond_4
+
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {p1}, Lp0/g;->readInt()I
+
+    move-result p1
+
+    const-wide/32 v0, 0x7fffffff
+
+    int-to-long v2, p1
+
+    and-long/2addr v0, v2
+
+    const-wide/16 v2, 0x0
+
+    cmp-long p1, v0, v2
+
+    if-eqz p1, :cond_3
+
+    invoke-interface {p2, v11, v0, v1}, Lo0/g0/g/k$b;->d(IJ)V
+
+    goto/16 :goto_c
+
+    :cond_3
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "windowSizeIncrement was 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_WINDOW_UPDATE length !=4: "
+
+    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_1
+    if-lt v1, v6, :cond_b
+
+    if-nez v11, :cond_a
+
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {p1}, Lp0/g;->readInt()I
+
+    move-result p1
+
+    iget-object v0, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readInt()I
+
+    move-result v0
+
+    sub-int/2addr v1, v6
+
+    invoke-static {}, Lo0/g0/g/a;->values()[Lo0/g0/g/a;
+
+    move-result-object v3
+
+    array-length v4, v3
+
+    const/4 v5, 0x0
+
+    :goto_1
+    if-ge v5, v4, :cond_7
+
+    aget-object v6, v3, v5
+
+    iget v8, v6, Lo0/g0/g/a;->httpCode:I
+
+    if-ne v8, v0, :cond_5
+
+    const/4 v8, 0x1
+
+    goto :goto_2
+
+    :cond_5
+    const/4 v8, 0x0
+
+    :goto_2
+    if-eqz v8, :cond_6
+
+    move-object v2, v6
+
+    goto :goto_3
+
+    :cond_6
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_1
+
+    :cond_7
+    :goto_3
+    if-eqz v2, :cond_9
+
+    sget-object v0, Lokio/ByteString;->f:Lokio/ByteString;
+
+    if-lez v1, :cond_8
+
+    iget-object v0, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    int-to-long v3, v1
+
+    invoke-interface {v0, v3, v4}, Lp0/g;->u(J)Lokio/ByteString;
+
+    move-result-object v0
+
+    :cond_8
+    invoke-interface {p2, p1, v2, v0}, Lo0/g0/g/k$b;->j(ILo0/g0/g/a;Lokio/ByteString;)V
+
+    goto/16 :goto_c
+
+    :cond_9
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_GOAWAY unexpected error code: "
+
+    invoke-static {p2, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_a
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_GOAWAY streamId != 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_b
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_GOAWAY length < 8: "
+
+    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_2
+    if-ne v1, v6, :cond_e
+
+    if-nez v11, :cond_d
+
+    iget-object v1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v1}, Lp0/g;->readInt()I
+
+    move-result v1
+
+    iget-object v2, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v2}, Lp0/g;->readInt()I
+
+    move-result v2
+
+    and-int/lit8 p1, p1, 0x1
+
+    if-eqz p1, :cond_c
+
+    const/4 v0, 0x1
+
+    :cond_c
+    invoke-interface {p2, v0, v1, v2}, Lo0/g0/g/k$b;->f(ZII)V
+
+    goto/16 :goto_c
+
+    :cond_d
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_PING streamId != 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_e
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_PING length != 8: "
+
+    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_3
+    if-eqz v11, :cond_12
+
+    and-int/lit8 v2, p1, 0x8
+
+    if-eqz v2, :cond_f
+
+    iget-object v0, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    :cond_f
+    iget-object v3, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v3}, Lp0/g;->readInt()I
+
+    move-result v3
+
+    and-int/2addr v3, v10
+
+    add-int/lit8 v1, v1, -0x4
+
+    if-eqz v2, :cond_10
+
+    add-int/lit8 v1, v1, -0x1
+
+    :cond_10
+    if-gt v0, v1, :cond_11
+
+    sub-int/2addr v1, v0
+
+    invoke-virtual {p0, v1, v0, p1, v11}, Lo0/g0/g/k;->c(IIII)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-interface {p2, v11, v3, p1}, Lo0/g0/g/k$b;->i(IILjava/util/List;)V
+
+    goto/16 :goto_c
+
+    :cond_11
+    new-instance p1, Ljava/io/IOException;
+
+    invoke-static {v5, v0, v4, v1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_12
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "PROTOCOL_ERROR: TYPE_PUSH_PROMISE streamId == 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_4
+    if-nez v11, :cond_20
+
+    and-int/lit8 p1, p1, 0x1
+
+    if-eqz p1, :cond_14
+
+    if-nez v1, :cond_13
+
+    invoke-interface {p2}, Lo0/g0/g/k$b;->a()V
+
+    goto/16 :goto_c
+
+    :cond_13
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "FRAME_SIZE_ERROR ack frame should be empty!"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_14
+    rem-int/lit8 p1, v1, 0x6
+
+    if-nez p1, :cond_1f
+
+    new-instance p1, Lo0/g0/g/q;
+
+    invoke-direct {p1}, Lo0/g0/g/q;-><init>()V
+
+    invoke-static {v0, v1}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
+
+    move-result-object v1
+
+    const/4 v2, 0x6
+
+    invoke-static {v1, v2}, Lk0/r/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
+
+    move-result-object v1
+
+    iget v2, v1, Lkotlin/ranges/IntProgression;->d:I
+
+    iget v4, v1, Lkotlin/ranges/IntProgression;->e:I
+
+    iget v1, v1, Lkotlin/ranges/IntProgression;->f:I
+
+    if-ltz v1, :cond_15
+
+    if-gt v2, v4, :cond_1e
+
+    goto :goto_4
+
+    :cond_15
+    if-lt v2, v4, :cond_1e
+
+    :goto_4
+    iget-object v5, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v5}, Lp0/g;->readShort()S
+
+    move-result v5
+
+    const v6, 0xffff
+
+    and-int/2addr v5, v6
+
+    iget-object v6, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v6}, Lp0/g;->readInt()I
+
+    move-result v6
+
+    const/4 v8, 0x2
+
+    if-eq v5, v8, :cond_1b
+
+    const/4 v8, 0x3
+
+    if-eq v5, v8, :cond_1a
+
+    if-eq v5, v9, :cond_18
+
+    const/16 v8, 0x4000
+
+    if-eq v5, v3, :cond_16
+
+    goto :goto_5
+
+    :cond_16
+    if-lt v6, v8, :cond_17
+
+    const v8, 0xffffff
+
+    if-gt v6, v8, :cond_17
+
+    goto :goto_5
+
+    :cond_17
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "PROTOCOL_ERROR SETTINGS_MAX_FRAME_SIZE: "
+
+    invoke-static {p2, v6}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_18
+    const/4 v5, 0x7
+
+    if-ltz v6, :cond_19
+
+    goto :goto_5
+
+    :cond_19
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "PROTOCOL_ERROR SETTINGS_INITIAL_WINDOW_SIZE > 2^31 - 1"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1a
+    const/4 v5, 0x4
+
+    goto :goto_5
+
+    :cond_1b
+    if-eqz v6, :cond_1d
+
+    if-ne v6, v7, :cond_1c
+
+    goto :goto_5
+
+    :cond_1c
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "PROTOCOL_ERROR SETTINGS_ENABLE_PUSH != 0 or 1"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1d
+    :goto_5
+    invoke-virtual {p1, v5, v6}, Lo0/g0/g/q;->b(II)Lo0/g0/g/q;
+
+    if-eq v2, v4, :cond_1e
+
+    add-int/2addr v2, v1
+
+    goto :goto_4
+
+    :cond_1e
+    invoke-interface {p2, v0, p1}, Lo0/g0/g/k$b;->b(ZLo0/g0/g/q;)V
+
+    goto/16 :goto_c
+
+    :cond_1f
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_SETTINGS length % 6 != 0: "
+
+    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_20
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_SETTINGS streamId != 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_5
+    if-ne v1, v9, :cond_26
+
+    if-eqz v11, :cond_25
+
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {p1}, Lp0/g;->readInt()I
+
+    move-result p1
+
+    invoke-static {}, Lo0/g0/g/a;->values()[Lo0/g0/g/a;
+
+    move-result-object v0
+
+    array-length v1, v0
+
+    const/4 v3, 0x0
+
+    :goto_6
+    if-ge v3, v1, :cond_23
+
+    aget-object v4, v0, v3
+
+    iget v5, v4, Lo0/g0/g/a;->httpCode:I
+
+    if-ne v5, p1, :cond_21
+
+    const/4 v5, 0x1
+
+    goto :goto_7
+
+    :cond_21
+    const/4 v5, 0x0
+
+    :goto_7
+    if-eqz v5, :cond_22
+
+    move-object v2, v4
+
+    goto :goto_8
+
+    :cond_22
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_6
+
+    :cond_23
+    :goto_8
+    if-eqz v2, :cond_24
+
+    invoke-interface {p2, v11, v2}, Lo0/g0/g/k$b;->h(ILo0/g0/g/a;)V
+
+    goto/16 :goto_c
+
+    :cond_24
+    new-instance p2, Ljava/io/IOException;
+
+    const-string v0, "TYPE_RST_STREAM unexpected error code: "
+
+    invoke-static {v0, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_25
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_RST_STREAM streamId == 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_26
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_RST_STREAM length: "
+
+    const-string v0, " != 4"
+
+    invoke-static {p2, v1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_6
+    if-ne v1, v3, :cond_28
+
+    if-eqz v11, :cond_27
+
+    invoke-virtual {p0, p2, v11}, Lo0/g0/g/k;->d(Lo0/g0/g/k$b;I)V
+
+    goto/16 :goto_c
+
+    :cond_27
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_PRIORITY streamId == 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_28
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "TYPE_PRIORITY length: "
+
+    const-string v0, " != 5"
+
+    invoke-static {p2, v1, v0}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_7
+    if-eqz v11, :cond_2e
+
+    and-int/lit8 v2, p1, 0x1
+
+    if-eqz v2, :cond_29
+
+    const/4 v2, 0x1
+
+    goto :goto_9
+
+    :cond_29
+    const/4 v2, 0x0
+
+    :goto_9
+    and-int/lit8 v3, p1, 0x8
+
+    if-eqz v3, :cond_2a
+
+    iget-object v0, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    :cond_2a
+    and-int/lit8 v6, p1, 0x20
+
+    if-eqz v6, :cond_2b
+
+    invoke-virtual {p0, p2, v11}, Lo0/g0/g/k;->d(Lo0/g0/g/k$b;I)V
+
+    add-int/lit8 v1, v1, -0x5
+
+    :cond_2b
+    if-eqz v3, :cond_2c
+
+    add-int/lit8 v1, v1, -0x1
+
+    :cond_2c
+    if-gt v0, v1, :cond_2d
+
+    sub-int/2addr v1, v0
+
+    invoke-virtual {p0, v1, v0, p1, v11}, Lo0/g0/g/k;->c(IIII)Ljava/util/List;
+
+    move-result-object p1
+
+    const/4 v0, -0x1
+
+    invoke-interface {p2, v2, v11, v0, p1}, Lo0/g0/g/k$b;->c(ZIILjava/util/List;)V
+
+    goto :goto_c
+
+    :cond_2d
+    new-instance p1, Ljava/io/IOException;
+
+    invoke-static {v5, v0, v4, v1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2e
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "PROTOCOL_ERROR: TYPE_HEADERS streamId == 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :pswitch_8
+    if-eqz v11, :cond_35
+
+    and-int/lit8 v2, p1, 0x1
+
+    if-eqz v2, :cond_2f
+
+    const/4 v2, 0x1
+
+    goto :goto_a
+
+    :cond_2f
+    const/4 v2, 0x0
+
+    :goto_a
+    and-int/lit8 v3, p1, 0x20
+
+    if-eqz v3, :cond_30
+
+    const/4 v3, 0x1
+
+    goto :goto_b
+
+    :cond_30
+    const/4 v3, 0x0
+
+    :goto_b
+    if-nez v3, :cond_34
+
+    and-int/lit8 p1, p1, 0x8
+
+    if-eqz p1, :cond_31
+
+    iget-object v0, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    :cond_31
+    if-eqz p1, :cond_32
+
+    add-int/lit8 v1, v1, -0x1
+
+    :cond_32
+    if-gt v0, v1, :cond_33
+
+    sub-int/2addr v1, v0
+
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {p2, v2, v11, p1, v1}, Lo0/g0/g/k$b;->e(ZILp0/g;I)V
+
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    int-to-long v0, v0
+
+    invoke-interface {p1, v0, v1}, Lp0/g;->skip(J)V
+
+    goto :goto_c
+
+    :cond_33
+    new-instance p1, Ljava/io/IOException;
+
+    invoke-static {v5, v0, v4, v1}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_34
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "PROTOCOL_ERROR: FLAG_COMPRESSED without SETTINGS_COMPRESS_DATA"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_35
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "PROTOCOL_ERROR: TYPE_DATA streamId == 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :goto_c
+    return v7
+
+    :cond_36
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "FRAME_SIZE_ERROR: "
+
+    invoke-static {p2, v1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :catch_0
+    return v0
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public final b(Lo0/g0/g/k$b;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "handler"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/g/k;->g:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p0, v1, p1}, Lo0/g0/g/k;->a(ZLo0/g0/g/k$b;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/io/IOException;
+
+    const-string v0, "Required SETTINGS preface not received"
+
+    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    iget-object p1, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    sget-object v0, Lo0/g0/g/d;->a:Lokio/ByteString;
+
+    invoke-virtual {v0}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    int-to-long v2, v0
+
+    invoke-interface {p1, v2, v3}, Lp0/g;->u(J)Lokio/ByteString;
+
+    move-result-object p1
+
+    sget-object v0, Lo0/g0/g/k;->h:Ljava/util/logging/Logger;
+
+    sget-object v2, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
+
+    invoke-virtual {v0, v2}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    sget-object v0, Lo0/g0/g/k;->h:Ljava/util/logging/Logger;
+
+    const-string v2, "<< CONNECTION "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Lokio/ByteString;->i()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-static {v2, v3}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
+
+    :cond_2
+    sget-object v0, Lo0/g0/g/d;->a:Lokio/ByteString;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_4
+
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "Expected a connection header but was "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    if-eqz p1, :cond_3
+
+    invoke-static {p1}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_4
+    :goto_0
+    return-void
+.end method
+
+.method public final c(IIII)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(IIII)",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/k;->d:Lo0/g0/g/k$a;
+
+    iput p1, v0, Lo0/g0/g/k$a;->g:I
+
+    iput p1, v0, Lo0/g0/g/k$a;->d:I
+
+    iput p2, v0, Lo0/g0/g/k$a;->h:I
+
+    iput p3, v0, Lo0/g0/g/k$a;->e:I
+
+    iput p4, v0, Lo0/g0/g/k$a;->f:I
+
+    iget-object p1, p0, Lo0/g0/g/k;->e:Lo0/g0/g/c$a;
+
+    :cond_0
+    :goto_0
+    iget-object p2, p1, Lo0/g0/g/c$a;->b:Lp0/g;
+
+    invoke-interface {p2}, Lp0/g;->J()Z
+
+    move-result p2
+
+    if-nez p2, :cond_e
+
+    iget-object p2, p1, Lo0/g0/g/c$a;->b:Lp0/g;
+
+    invoke-interface {p2}, Lp0/g;->readByte()B
+
+    move-result p2
+
+    const/16 p3, 0xff
+
+    invoke-static {p2, p3}, Lo0/g0/b;->a(BI)I
+
+    move-result p2
+
+    const/16 p3, 0x80
+
+    if-eq p2, p3, :cond_d
+
+    and-int/lit16 p4, p2, 0x80
+
+    if-ne p4, p3, :cond_5
+
+    const/16 p3, 0x7f
+
+    invoke-virtual {p1, p2, p3}, Lo0/g0/g/c$a;->g(II)I
+
+    move-result p2
+
+    add-int/lit8 p2, p2, -0x1
+
+    if-ltz p2, :cond_1
+
+    sget-object p3, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object p3, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length p3, p3
+
+    add-int/lit8 p3, p3, -0x1
+
+    if-gt p2, p3, :cond_1
+
+    const/4 p3, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p3, 0x0
+
+    :goto_1
+    if-eqz p3, :cond_2
+
+    sget-object p3, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object p3, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    aget-object p2, p3, p2
+
+    iget-object p3, p1, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    invoke-interface {p3, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    sget-object p3, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    sget-object p3, Lo0/g0/g/c;->a:[Lo0/g0/g/b;
+
+    array-length p3, p3
+
+    sub-int p3, p2, p3
+
+    invoke-virtual {p1, p3}, Lo0/g0/g/c$a;->b(I)I
+
+    move-result p3
+
+    if-ltz p3, :cond_4
+
+    iget-object p4, p1, Lo0/g0/g/c$a;->c:[Lo0/g0/g/b;
+
+    array-length v0, p4
+
+    if-ge p3, v0, :cond_4
+
+    iget-object p2, p1, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    aget-object p3, p4, p3
+
+    if-eqz p3, :cond_3
+
+    invoke-interface {p2, p3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_4
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p3, "Header index too large "
+
+    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p3
+
+    add-int/lit8 p2, p2, 0x1
+
+    invoke-virtual {p3, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    const/4 p3, -0x1
+
+    const/16 p4, 0x40
+
+    if-ne p2, p4, :cond_6
+
+    sget-object p2, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    invoke-virtual {p1}, Lo0/g0/g/c$a;->f()Lokio/ByteString;
+
+    move-result-object p4
+
+    invoke-virtual {p2, p4}, Lo0/g0/g/c;->a(Lokio/ByteString;)Lokio/ByteString;
+
+    invoke-virtual {p1}, Lo0/g0/g/c$a;->f()Lokio/ByteString;
+
+    move-result-object p2
+
+    new-instance v0, Lo0/g0/g/b;
+
+    invoke-direct {v0, p4, p2}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
+
+    invoke-virtual {p1, p3, v0}, Lo0/g0/g/c$a;->e(ILo0/g0/g/b;)V
+
+    goto/16 :goto_0
+
+    :cond_6
+    and-int/lit8 v0, p2, 0x40
+
+    if-ne v0, p4, :cond_7
+
+    const/16 p4, 0x3f
+
+    invoke-virtual {p1, p2, p4}, Lo0/g0/g/c$a;->g(II)I
+
+    move-result p2
+
+    add-int/lit8 p2, p2, -0x1
+
+    invoke-virtual {p1, p2}, Lo0/g0/g/c$a;->d(I)Lokio/ByteString;
+
+    move-result-object p2
+
+    invoke-virtual {p1}, Lo0/g0/g/c$a;->f()Lokio/ByteString;
+
+    move-result-object p4
+
+    new-instance v0, Lo0/g0/g/b;
+
+    invoke-direct {v0, p2, p4}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
+
+    invoke-virtual {p1, p3, v0}, Lo0/g0/g/c$a;->e(ILo0/g0/g/b;)V
+
+    goto/16 :goto_0
+
+    :cond_7
+    and-int/lit8 p3, p2, 0x20
+
+    const/16 p4, 0x20
+
+    if-ne p3, p4, :cond_a
+
+    const/16 p3, 0x1f
+
+    invoke-virtual {p1, p2, p3}, Lo0/g0/g/c$a;->g(II)I
+
+    move-result p2
+
+    iput p2, p1, Lo0/g0/g/c$a;->h:I
+
+    if-ltz p2, :cond_9
+
+    iget p3, p1, Lo0/g0/g/c$a;->g:I
+
+    if-gt p2, p3, :cond_9
+
+    iget p3, p1, Lo0/g0/g/c$a;->f:I
+
+    if-ge p2, p3, :cond_0
+
+    if-nez p2, :cond_8
+
+    invoke-virtual {p1}, Lo0/g0/g/c$a;->a()V
+
+    goto/16 :goto_0
+
+    :cond_8
+    sub-int/2addr p3, p2
+
+    invoke-virtual {p1, p3}, Lo0/g0/g/c$a;->c(I)I
+
+    goto/16 :goto_0
+
+    :cond_9
+    new-instance p2, Ljava/io/IOException;
+
+    const-string p3, "Invalid dynamic table size update "
+
+    invoke-static {p3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p3
+
+    iget p1, p1, Lo0/g0/g/c$a;->h:I
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_a
+    const/16 p3, 0x10
+
+    if-eq p2, p3, :cond_c
+
+    if-nez p2, :cond_b
+
+    goto :goto_2
+
+    :cond_b
+    const/16 p3, 0xf
+
+    invoke-virtual {p1, p2, p3}, Lo0/g0/g/c$a;->g(II)I
+
+    move-result p2
+
+    add-int/lit8 p2, p2, -0x1
+
+    invoke-virtual {p1, p2}, Lo0/g0/g/c$a;->d(I)Lokio/ByteString;
+
+    move-result-object p2
+
+    invoke-virtual {p1}, Lo0/g0/g/c$a;->f()Lokio/ByteString;
+
+    move-result-object p3
+
+    iget-object p4, p1, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    new-instance v0, Lo0/g0/g/b;
+
+    invoke-direct {v0, p2, p3}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
+
+    invoke-interface {p4, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto/16 :goto_0
+
+    :cond_c
+    :goto_2
+    sget-object p2, Lo0/g0/g/c;->c:Lo0/g0/g/c;
+
+    invoke-virtual {p1}, Lo0/g0/g/c$a;->f()Lokio/ByteString;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Lo0/g0/g/c;->a(Lokio/ByteString;)Lokio/ByteString;
+
+    invoke-virtual {p1}, Lo0/g0/g/c$a;->f()Lokio/ByteString;
+
+    move-result-object p2
+
+    iget-object p4, p1, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    new-instance v0, Lo0/g0/g/b;
+
+    invoke-direct {v0, p3, p2}, Lo0/g0/g/b;-><init>(Lokio/ByteString;Lokio/ByteString;)V
+
+    invoke-interface {p4, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto/16 :goto_0
+
+    :cond_d
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "index == 0"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_e
+    iget-object p1, p0, Lo0/g0/g/k;->e:Lo0/g0/g/c$a;
+
+    iget-object p2, p1, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    invoke-static {p2}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p2
+
+    iget-object p1, p1, Lo0/g0/g/c$a;->a:Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->clear()V
+
+    return-object p2
+.end method
+
+.method public close()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/w;->close()V
+
+    return-void
+.end method
+
+.method public final d(Lo0/g0/g/k$b;I)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readInt()I
+
+    move-result v0
+
+    const-wide v1, 0x80000000L
+
+    long-to-int v2, v1
+
+    and-int v1, v0, v2
+
+    const/4 v2, 0x1
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    const v3, 0x7fffffff
+
+    and-int/2addr v0, v3
+
+    iget-object v3, p0, Lo0/g0/g/k;->f:Lp0/g;
+
+    invoke-interface {v3}, Lp0/g;->readByte()B
+
+    move-result v3
+
+    const/16 v4, 0xff
+
+    invoke-static {v3, v4}, Lo0/g0/b;->a(BI)I
+
+    move-result v3
+
+    add-int/2addr v3, v2
+
+    invoke-interface {p1, p2, v0, v3, v1}, Lo0/g0/g/k$b;->g(IIIZ)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/l$a.smali b/com.discord/smali_classes2/o0/g0/g/l$a.smali
new file mode 100644
index 0000000000..65ea7f492d
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/l$a.smali
@@ -0,0 +1,550 @@
+.class public final Lo0/g0/g/l$a;
+.super Ljava/lang/Object;
+.source "Http2Stream.kt"
+
+# interfaces
+.implements Lp0/u;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Lp0/e;
+
+.field public e:Z
+
+.field public f:Z
+
+.field public final synthetic g:Lo0/g0/g/l;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/g/l;Z)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(Z)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p2, p0, Lo0/g0/g/l$a;->f:Z
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Z)V
+    .locals 11
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v1, v1, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    invoke-virtual {v1}, Lp0/b;->i()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :goto_0
+    :try_start_1
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-wide v1, v1, Lo0/g0/g/l;->c:J
+
+    iget-object v3, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-wide v3, v3, Lo0/g0/g/l;->d:J
+
+    cmp-long v5, v1, v3
+
+    if-ltz v5, :cond_0
+
+    iget-boolean v1, p0, Lo0/g0/g/l$a;->f:Z
+
+    if-nez v1, :cond_0
+
+    iget-boolean v1, p0, Lo0/g0/g/l$a;->e:Z
+
+    if-nez v1, :cond_0
+
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-virtual {v1}, Lo0/g0/g/l;->f()Lo0/g0/g/a;
+
+    move-result-object v1
+
+    if-nez v1, :cond_0
+
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-virtual {v1}, Lo0/g0/g/l;->l()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_2
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v1, v1, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    invoke-virtual {v1}, Lo0/g0/g/l$c;->o()V
+
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-virtual {v1}, Lo0/g0/g/l;->b()V
+
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-wide v1, v1, Lo0/g0/g/l;->d:J
+
+    iget-object v3, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-wide v3, v3, Lo0/g0/g/l;->c:J
+
+    sub-long/2addr v1, v3
+
+    iget-object v3, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    iget-wide v3, v3, Lp0/e;->e:J
+
+    invoke-static {v1, v2, v3, v4}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v9
+
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-wide v2, v1, Lo0/g0/g/l;->c:J
+
+    add-long/2addr v2, v9
+
+    iput-wide v2, v1, Lo0/g0/g/l;->c:J
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    monitor-exit v0
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    invoke-virtual {v0}, Lp0/b;->i()V
+
+    if-eqz p1, :cond_1
+
+    :try_start_3
+    iget-object p1, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    cmp-long p1, v9, v0
+
+    if-nez p1, :cond_1
+
+    const/4 p1, 0x1
+
+    const/4 v7, 0x1
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    goto :goto_2
+
+    :cond_1
+    const/4 p1, 0x0
+
+    const/4 v7, 0x0
+
+    :goto_1
+    iget-object p1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v5, p1, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget-object p1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget v6, p1, Lo0/g0/g/l;->m:I
+
+    iget-object v8, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    invoke-virtual/range {v5 .. v10}, Lo0/g0/g/e;->i(IZLp0/e;J)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    iget-object p1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object p1, p1, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    invoke-virtual {p1}, Lo0/g0/g/l$c;->o()V
+
+    return-void
+
+    :goto_2
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    invoke-virtual {v0}, Lo0/g0/g/l$c;->o()V
+
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_4
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v1, v1, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    invoke-virtual {v1}, Lo0/g0/g/l$c;->o()V
+
+    throw p1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    :catchall_2
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+.end method
+
+.method public close()V
+    .locals 8
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    sget-boolean v2, Lk0/i;->a:Z
+
+    if-eqz v2, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "Assertion failed"
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v2, p0, Lo0/g0/g/l$a;->e:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-eqz v2, :cond_2
+
+    monitor-exit v0
+
+    return-void
+
+    :cond_2
+    monitor-exit v0
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$a;->f:Z
+
+    if-nez v0, :cond_5
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    iget-wide v2, v0, Lp0/e;->e:J
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v0, v2, v4
+
+    if-lez v0, :cond_3
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_4
+
+    :goto_2
+    iget-object v0, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    iget-wide v2, v0, Lp0/e;->e:J
+
+    cmp-long v0, v2, v4
+
+    if-lez v0, :cond_5
+
+    invoke-virtual {p0, v1}, Lo0/g0/g/l$a;->a(Z)V
+
+    goto :goto_2
+
+    :cond_4
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v2, v0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget v3, v0, Lo0/g0/g/l;->m:I
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    const-wide/16 v6, 0x0
+
+    invoke-virtual/range {v2 .. v7}, Lo0/g0/g/e;->i(IZLp0/e;J)V
+
+    :cond_5
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    monitor-enter v0
+
+    :try_start_1
+    iput-boolean v1, p0, Lo0/g0/g/l$a;->e:Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit v0
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget-object v0, v0, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {v0}, Lo0/g0/g/m;->flush()V
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-virtual {v0}, Lo0/g0/g/l;->a()V
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+
+    :catchall_1
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public flush()V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "Assertion failed"
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-virtual {v1}, Lo0/g0/g/l;->b()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    :goto_1
+    iget-object v0, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    iget-wide v0, v0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-lez v4, :cond_2
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lo0/g0/g/l$a;->a(Z)V
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    invoke-virtual {v0}, Lo0/g0/g/e;->flush()V
+
+    goto :goto_1
+
+    :cond_2
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    return-object v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/g/l$a;->g:Lo0/g0/g/l;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string p2, "Assertion failed"
+
+    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->write(Lp0/e;J)V
+
+    :goto_1
+    iget-object p1, p0, Lo0/g0/g/l$a;->d:Lp0/e;
+
+    iget-wide p1, p1, Lp0/e;->e:J
+
+    const-wide/16 v0, 0x4000
+
+    cmp-long p3, p1, v0
+
+    if-ltz p3, :cond_2
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Lo0/g0/g/l$a;->a(Z)V
+
+    goto :goto_1
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/l$b.smali b/com.discord/smali_classes2/o0/g0/g/l$b.smali
new file mode 100644
index 0000000000..946887de27
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/l$b.smali
@@ -0,0 +1,478 @@
+.class public final Lo0/g0/g/l$b;
+.super Ljava/lang/Object;
+.source "Http2Stream.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final d:Lp0/e;
+
+.field public final e:Lp0/e;
+
+.field public f:Z
+
+.field public final g:J
+
+.field public h:Z
+
+.field public final synthetic i:Lo0/g0/g/l;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/g/l;JZ)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(JZ)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p2, p0, Lo0/g0/g/l$b;->g:J
+
+    iput-boolean p4, p0, Lo0/g0/g/l$b;->h:Z
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/l$b;->d:Lp0/e;
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 11
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_b
+
+    :goto_1
+    iget-object v2, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    monitor-enter v2
+
+    :try_start_0
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v3, v3, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    invoke-virtual {v3}, Lp0/b;->i()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    invoke-virtual {v3}, Lo0/g0/g/l;->f()Lo0/g0/g/a;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    if-eqz v3, :cond_3
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v3, v3, Lo0/g0/g/l;->l:Ljava/io/IOException;
+
+    if-eqz v3, :cond_1
+
+    :goto_2
+    move-object v4, v3
+
+    goto :goto_3
+
+    :cond_1
+    new-instance v3, Lokhttp3/internal/http2/StreamResetException;
+
+    iget-object v5, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    invoke-virtual {v5}, Lo0/g0/g/l;->f()Lo0/g0/g/a;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_2
+
+    invoke-direct {v3, v5}, Lokhttp3/internal/http2/StreamResetException;-><init>(Lo0/g0/g/a;)V
+
+    goto :goto_2
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v4
+
+    :cond_3
+    :goto_3
+    :try_start_2
+    iget-boolean v3, p0, Lo0/g0/g/l$b;->f:Z
+
+    if-nez v3, :cond_a
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-wide v5, v3, Lp0/e;->e:J
+
+    const-wide/16 v7, -0x1
+
+    cmp-long v3, v5, v0
+
+    if-lez v3, :cond_4
+
+    iget-object v0, p0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-object v1, p0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-wide v5, v1, Lp0/e;->e:J
+
+    invoke-static {p2, p3, v5, v6}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v5
+
+    invoke-virtual {v0, p1, v5, v6}, Lp0/e;->B0(Lp0/e;J)J
+
+    move-result-wide v0
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-wide v5, v3, Lo0/g0/g/l;->a:J
+
+    add-long/2addr v5, v0
+
+    iput-wide v5, v3, Lo0/g0/g/l;->a:J
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-wide v5, v3, Lo0/g0/g/l;->a:J
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-wide v9, v3, Lo0/g0/g/l;->b:J
+
+    sub-long/2addr v5, v9
+
+    if-nez v4, :cond_6
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v3, v3, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget-object v3, v3, Lo0/g0/g/e;->o:Lo0/g0/g/q;
+
+    invoke-virtual {v3}, Lo0/g0/g/q;->a()I
+
+    move-result v3
+
+    div-int/lit8 v3, v3, 0x2
+
+    int-to-long v9, v3
+
+    cmp-long v3, v5, v9
+
+    if-ltz v3, :cond_6
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v3, v3, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget-object v9, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget v9, v9, Lo0/g0/g/l;->m:I
+
+    invoke-virtual {v3, v9, v5, v6}, Lo0/g0/g/e;->p(IJ)V
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v5, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-wide v5, v5, Lo0/g0/g/l;->a:J
+
+    iput-wide v5, v3, Lo0/g0/g/l;->b:J
+
+    goto :goto_4
+
+    :cond_4
+    iget-boolean v0, p0, Lo0/g0/g/l$b;->h:Z
+
+    if-nez v0, :cond_5
+
+    if-nez v4, :cond_5
+
+    iget-object v0, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    invoke-virtual {v0}, Lo0/g0/g/l;->l()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    const/4 v0, 0x1
+
+    move-wide v5, v7
+
+    goto :goto_5
+
+    :cond_5
+    move-wide v0, v7
+
+    :cond_6
+    :goto_4
+    const/4 v3, 0x0
+
+    move-wide v5, v0
+
+    const/4 v0, 0x0
+
+    :goto_5
+    :try_start_3
+    iget-object v1, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v1, v1, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    invoke-virtual {v1}, Lo0/g0/g/l$c;->o()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    monitor-exit v2
+
+    if-eqz v0, :cond_7
+
+    const-wide/16 v0, 0x0
+
+    goto/16 :goto_1
+
+    :cond_7
+    cmp-long p1, v5, v7
+
+    if-eqz p1, :cond_8
+
+    invoke-virtual {p0, v5, v6}, Lo0/g0/g/l$b;->a(J)V
+
+    return-wide v5
+
+    :cond_8
+    if-nez v4, :cond_9
+
+    return-wide v7
+
+    :cond_9
+    throw v4
+
+    :cond_a
+    :try_start_4
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "stream closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_5
+    iget-object p2, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object p2, p2, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    invoke-virtual {p2}, Lo0/g0/g/l$c;->o()V
+
+    throw p1
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit v2
+
+    throw p1
+
+    :cond_b
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final a(J)V
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    invoke-static {v0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string p2, "Assertion failed"
+
+    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    invoke-virtual {v0, p1, p2}, Lo0/g0/g/e;->g(J)V
+
+    return-void
+.end method
+
+.method public close()V
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    monitor-enter v0
+
+    const/4 v1, 0x1
+
+    :try_start_0
+    iput-boolean v1, p0, Lo0/g0/g/l$b;->f:Z
+
+    iget-object v1, p0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-wide v1, v1, Lp0/e;->e:J
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->e:Lp0/e;
+
+    iget-wide v4, v3, Lp0/e;->e:J
+
+    invoke-virtual {v3, v4, v5}, Lp0/e;->skip(J)V
+
+    iget-object v3, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    if-eqz v3, :cond_1
+
+    invoke-virtual {v3}, Ljava/lang/Object;->notifyAll()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v0, v1, v3
+
+    if-lez v0, :cond_0
+
+    invoke-virtual {p0, v1, v2}, Lo0/g0/g/l$b;->a(J)V
+
+    :cond_0
+    iget-object v0, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    invoke-virtual {v0}, Lo0/g0/g/l;->a()V
+
+    return-void
+
+    :cond_1
+    :try_start_1
+    new-instance v1, Lkotlin/TypeCastException;
+
+    const-string v2, "null cannot be cast to non-null type java.lang.Object"
+
+    invoke-direct {v1, v2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/g/l$b;->i:Lo0/g0/g/l;
+
+    iget-object v0, v0, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/l$c.smali b/com.discord/smali_classes2/o0/g0/g/l$c.smali
new file mode 100644
index 0000000000..2b3416cf94
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/l$c.smali
@@ -0,0 +1,92 @@
+.class public final Lo0/g0/g/l$c;
+.super Lp0/b;
+.source "Http2Stream.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public final synthetic l:Lo0/g0/g/l;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/g/l;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/g/l$c;->l:Lo0/g0/g/l;
+
+    invoke-direct {p0}, Lp0/b;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(Ljava/io/IOException;)Ljava/io/IOException;
+    .locals 2
+
+    new-instance v0, Ljava/net/SocketTimeoutException;
+
+    const-string v1, "timeout"
+
+    invoke-direct {v0, v1}, Ljava/net/SocketTimeoutException;-><init>(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {v0, p1}, Ljava/net/SocketTimeoutException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public n()V
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/g/l$c;->l:Lo0/g0/g/l;
+
+    sget-object v1, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    invoke-virtual {v0, v1}, Lo0/g0/g/l;->e(Lo0/g0/g/a;)V
+
+    return-void
+.end method
+
+.method public final o()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lp0/b;->j()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lo0/g0/g/l$c;->m(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/l.smali b/com.discord/smali_classes2/o0/g0/g/l.smali
new file mode 100644
index 0000000000..29a7c93069
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/l.smali
@@ -0,0 +1,863 @@
+.class public final Lo0/g0/g/l;
+.super Ljava/lang/Object;
+.source "Http2Stream.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/g/l$b;,
+        Lo0/g0/g/l$a;,
+        Lo0/g0/g/l$c;
+    }
+.end annotation
+
+
+# instance fields
+.field public a:J
+
+.field public b:J
+
+.field public c:J
+
+.field public d:J
+
+.field public final e:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Lokhttp3/Headers;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public f:Z
+
+.field public final g:Lo0/g0/g/l$b;
+
+.field public final h:Lo0/g0/g/l$a;
+
+.field public final i:Lo0/g0/g/l$c;
+
+.field public final j:Lo0/g0/g/l$c;
+
+.field public k:Lo0/g0/g/a;
+
+.field public l:Ljava/io/IOException;
+
+.field public final m:I
+
+.field public final n:Lo0/g0/g/e;
+
+
+# direct methods
+.method public constructor <init>(ILo0/g0/g/e;ZZLokhttp3/Headers;)V
+    .locals 2
+
+    const-string v0, "connection"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lo0/g0/g/l;->m:I
+
+    iput-object p2, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget-object p1, p2, Lo0/g0/g/e;->p:Lo0/g0/g/q;
+
+    invoke-virtual {p1}, Lo0/g0/g/q;->a()I
+
+    move-result p1
+
+    int-to-long p1, p1
+
+    iput-wide p1, p0, Lo0/g0/g/l;->d:J
+
+    new-instance p1, Ljava/util/ArrayDeque;
+
+    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/l;->e:Ljava/util/ArrayDeque;
+
+    new-instance p1, Lo0/g0/g/l$b;
+
+    iget-object p2, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget-object p2, p2, Lo0/g0/g/e;->o:Lo0/g0/g/q;
+
+    invoke-virtual {p2}, Lo0/g0/g/q;->a()I
+
+    move-result p2
+
+    int-to-long v0, p2
+
+    invoke-direct {p1, p0, v0, v1, p4}, Lo0/g0/g/l$b;-><init>(Lo0/g0/g/l;JZ)V
+
+    iput-object p1, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    new-instance p1, Lo0/g0/g/l$a;
+
+    invoke-direct {p1, p0, p3}, Lo0/g0/g/l$a;-><init>(Lo0/g0/g/l;Z)V
+
+    iput-object p1, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    new-instance p1, Lo0/g0/g/l$c;
+
+    invoke-direct {p1, p0}, Lo0/g0/g/l$c;-><init>(Lo0/g0/g/l;)V
+
+    iput-object p1, p0, Lo0/g0/g/l;->i:Lo0/g0/g/l$c;
+
+    new-instance p1, Lo0/g0/g/l$c;
+
+    invoke-direct {p1, p0}, Lo0/g0/g/l$c;-><init>(Lo0/g0/g/l;)V
+
+    iput-object p1, p0, Lo0/g0/g/l;->j:Lo0/g0/g/l$c;
+
+    if-eqz p5, :cond_1
+
+    invoke-virtual {p0}, Lo0/g0/g/l;->h()Z
+
+    move-result p1
+
+    xor-int/lit8 p1, p1, 0x1
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lo0/g0/g/l;->e:Ljava/util/ArrayDeque;
+
+    invoke-interface {p1, p5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "locally-initiated streams shouldn\'t have headers yet"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    invoke-virtual {p0}, Lo0/g0/g/l;->h()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    :goto_0
+    return-void
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "remotely-initiated streams should have headers"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    sget-boolean v2, Lk0/i;->a:Z
+
+    if-eqz v2, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "Assertion failed"
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$b;->h:Z
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$b;->f:Z
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$a;->f:Z
+
+    if-nez v0, :cond_3
+
+    iget-object v0, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$a;->e:Z
+
+    if-eqz v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :cond_3
+    :goto_1
+    invoke-virtual {p0}, Lo0/g0/g/l;->i()Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    if-eqz v1, :cond_4
+
+    sget-object v0, Lo0/g0/g/a;->i:Lo0/g0/g/a;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, v0, v1}, Lo0/g0/g/l;->c(Lo0/g0/g/a;Ljava/io/IOException;)V
+
+    goto :goto_2
+
+    :cond_4
+    if-nez v0, :cond_5
+
+    iget-object v0, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget v1, p0, Lo0/g0/g/l;->m:I
+
+    invoke-virtual {v0, v1}, Lo0/g0/g/e;->e(I)Lo0/g0/g/l;
+
+    :cond_5
+    :goto_2
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final b()V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    iget-boolean v1, v0, Lo0/g0/g/l$a;->e:Z
+
+    if-nez v1, :cond_4
+
+    iget-boolean v0, v0, Lo0/g0/g/l$a;->f:Z
+
+    if-nez v0, :cond_3
+
+    iget-object v0, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/g/l;->l:Ljava/io/IOException;
+
+    if-nez v0, :cond_1
+
+    new-instance v0, Lokhttp3/internal/http2/StreamResetException;
+
+    iget-object v1, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+
+    if-nez v1, :cond_0
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_0
+    invoke-direct {v0, v1}, Lokhttp3/internal/http2/StreamResetException;-><init>(Lo0/g0/g/a;)V
+
+    :cond_1
+    throw v0
+
+    :cond_2
+    return-void
+
+    :cond_3
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "stream finished"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "stream closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final c(Lo0/g0/g/a;Ljava/io/IOException;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "rstStatusCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1, p2}, Lo0/g0/g/l;->d(Lo0/g0/g/a;Ljava/io/IOException;)Z
+
+    move-result p2
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object p2, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget v0, p0, Lo0/g0/g/l;->m:I
+
+    if-eqz p2, :cond_1
+
+    const-string v1, "statusCode"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p2, p2, Lo0/g0/g/e;->v:Lo0/g0/g/m;
+
+    invoke-virtual {p2, v0, p1}, Lo0/g0/g/m;->g(ILo0/g0/g/a;)V
+
+    return-void
+
+    :cond_1
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public final d(Lo0/g0/g/a;Ljava/io/IOException;)Z
+    .locals 3
+
+    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    sget-boolean v2, Lk0/i;->a:Z
+
+    if-eqz v2, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p1, "Assertion failed"
+
+    new-instance p2, Ljava/lang/AssertionError;
+
+    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p2
+
+    :cond_1
+    :goto_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_2
+
+    monitor-exit p0
+
+    return v2
+
+    :cond_2
+    :try_start_1
+    iget-object v0, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$b;->h:Z
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$a;->f:Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v0, :cond_3
+
+    monitor-exit p0
+
+    return v2
+
+    :cond_3
+    :try_start_2
+    iput-object p1, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+
+    iput-object p2, p0, Lo0/g0/g/l;->l:Ljava/io/IOException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    monitor-exit p0
+
+    iget-object p1, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget p2, p0, Lo0/g0/g/l;->m:I
+
+    invoke-virtual {p1, p2}, Lo0/g0/g/e;->e(I)Lo0/g0/g/l;
+
+    return v1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final e(Lo0/g0/g/a;)V
+    .locals 2
+
+    const-string v0, "errorCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lo0/g0/g/l;->d(Lo0/g0/g/a;Ljava/io/IOException;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget v1, p0, Lo0/g0/g/l;->m:I
+
+    invoke-virtual {v0, v1, p1}, Lo0/g0/g/e;->n(ILo0/g0/g/a;)V
+
+    return-void
+.end method
+
+.method public final declared-synchronized f()Lo0/g0/g/a;
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final g()Lp0/u;
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/g/l;->f:Z
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p0}, Lo0/g0/g/l;->h()Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    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-eqz v0, :cond_2
+
+    monitor-exit p0
+
+    iget-object v0, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    return-object v0
+
+    :cond_2
+    :try_start_1
+    const-string v0, "reply before requesting the sink"
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final h()Z
+    .locals 4
+
+    iget v0, p0, Lo0/g0/g/l;->m:I
+
+    const/4 v1, 0x1
+
+    and-int/2addr v0, v1
+
+    const/4 v2, 0x0
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    iget-object v3, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget-boolean v3, v3, Lo0/g0/g/e;->d:Z
+
+    if-ne v3, v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
+    return v1
+.end method
+
+.method public final declared-synchronized i()Z
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return v1
+
+    :cond_0
+    :try_start_1
+    iget-object v0, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$b;->h:Z
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$b;->f:Z
+
+    if-eqz v0, :cond_3
+
+    :cond_1
+    iget-object v0, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$a;->f:Z
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/g/l;->h:Lo0/g0/g/l$a;
+
+    iget-boolean v0, v0, Lo0/g0/g/l$a;->e:Z
+
+    if-eqz v0, :cond_3
+
+    :cond_2
+    iget-boolean v0, p0, Lo0/g0/g/l;->f:Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v0, :cond_3
+
+    monitor-exit p0
+
+    return v1
+
+    :cond_3
+    const/4 v0, 0x1
+
+    monitor-exit p0
+
+    return v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final j(Lokhttp3/Headers;Z)V
+    .locals 3
+
+    const-string v0, "headers"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    sget-boolean v2, Lk0/i;->a:Z
+
+    if-eqz v2, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string p1, "Assertion failed"
+
+    new-instance p2, Ljava/lang/AssertionError;
+
+    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p2
+
+    :cond_1
+    :goto_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/g/l;->f:Z
+
+    if-eqz v0, :cond_4
+
+    if-nez p2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    iget-object p1, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    if-eqz p1, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_4
+    :goto_1
+    iput-boolean v1, p0, Lo0/g0/g/l;->f:Z
+
+    iget-object v0, p0, Lo0/g0/g/l;->e:Ljava/util/ArrayDeque;
+
+    invoke-interface {v0, p1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    :goto_2
+    if-eqz p2, :cond_5
+
+    iget-object p1, p0, Lo0/g0/g/l;->g:Lo0/g0/g/l$b;
+
+    iput-boolean v1, p1, Lo0/g0/g/l$b;->h:Z
+
+    :cond_5
+    invoke-virtual {p0}, Lo0/g0/g/l;->i()Z
+
+    move-result p1
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    if-nez p1, :cond_6
+
+    iget-object p1, p0, Lo0/g0/g/l;->n:Lo0/g0/g/e;
+
+    iget p2, p0, Lo0/g0/g/l;->m:I
+
+    invoke-virtual {p1, p2}, Lo0/g0/g/e;->e(I)Lo0/g0/g/l;
+
+    :cond_6
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized k(Lo0/g0/g/a;)V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "errorCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+
+    if-nez v0, :cond_0
+
+    iput-object p1, p0, Lo0/g0/g/l;->k:Lo0/g0/g/a;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_0
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final l()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/InterruptedIOException;
+        }
+    .end annotation
+
+    :try_start_0
+    invoke-virtual {p0}, Ljava/lang/Object;->wait()V
+    :try_end_0
+    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
+
+    new-instance v0, Ljava/io/InterruptedIOException;
+
+    invoke-direct {v0}, Ljava/io/InterruptedIOException;-><init>()V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/m.smali b/com.discord/smali_classes2/o0/g0/g/m.smali
new file mode 100644
index 0000000000..aed2cebb32
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/m.smali
@@ -0,0 +1,1086 @@
+.class public final Lo0/g0/g/m;
+.super Ljava/lang/Object;
+.source "Http2Writer.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+
+
+# static fields
+.field public static final j:Ljava/util/logging/Logger;
+
+
+# instance fields
+.field public final d:Lp0/e;
+
+.field public e:I
+
+.field public f:Z
+
+.field public final g:Lo0/g0/g/c$b;
+
+.field public final h:Lokio/BufferedSink;
+
+.field public final i:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const-class v0, Lo0/g0/g/d;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/g/m;->j:Ljava/util/logging/Logger;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lokio/BufferedSink;Z)V
+    .locals 2
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    iput-boolean p2, p0, Lo0/g0/g/m;->i:Z
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/g/m;->d:Lp0/e;
+
+    const/16 p2, 0x4000
+
+    iput p2, p0, Lo0/g0/g/m;->e:I
+
+    new-instance p2, Lo0/g0/g/c$b;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x3
+
+    invoke-direct {p2, v0, v0, p1, v1}, Lo0/g0/g/c$b;-><init>(IZLp0/e;I)V
+
+    iput-object p2, p0, Lo0/g0/g/m;->g:Lo0/g0/g/c$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final declared-synchronized a(Lo0/g0/g/q;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "peerSettings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_7
+
+    iget v0, p0, Lo0/g0/g/m;->e:I
+
+    iget v1, p1, Lo0/g0/g/q;->a:I
+
+    and-int/lit8 v1, v1, 0x20
+
+    if-eqz v1, :cond_0
+
+    iget-object v0, p1, Lo0/g0/g/q;->b:[I
+
+    const/4 v1, 0x5
+
+    aget v0, v0, v1
+
+    :cond_0
+    iput v0, p0, Lo0/g0/g/m;->e:I
+
+    iget v0, p1, Lo0/g0/g/q;->a:I
+
+    and-int/lit8 v0, v0, 0x2
+
+    const/4 v1, 0x1
+
+    const/4 v2, -0x1
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lo0/g0/g/q;->b:[I
+
+    aget v0, v0, v1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, -0x1
+
+    :goto_0
+    if-eq v0, v2, :cond_6
+
+    iget-object v0, p0, Lo0/g0/g/m;->g:Lo0/g0/g/c$b;
+
+    iget v3, p1, Lo0/g0/g/q;->a:I
+
+    and-int/lit8 v3, v3, 0x2
+
+    if-eqz v3, :cond_2
+
+    iget-object p1, p1, Lo0/g0/g/q;->b:[I
+
+    aget v2, p1, v1
+
+    :cond_2
+    iput v2, v0, Lo0/g0/g/c$b;->h:I
+
+    const/16 p1, 0x4000
+
+    invoke-static {v2, p1}, Ljava/lang/Math;->min(II)I
+
+    move-result p1
+
+    iget v2, v0, Lo0/g0/g/c$b;->c:I
+
+    if-ne v2, p1, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    if-ge p1, v2, :cond_4
+
+    iget v2, v0, Lo0/g0/g/c$b;->a:I
+
+    invoke-static {v2, p1}, Ljava/lang/Math;->min(II)I
+
+    move-result v2
+
+    iput v2, v0, Lo0/g0/g/c$b;->a:I
+
+    :cond_4
+    iput-boolean v1, v0, Lo0/g0/g/c$b;->b:Z
+
+    iput p1, v0, Lo0/g0/g/c$b;->c:I
+
+    iget v2, v0, Lo0/g0/g/c$b;->g:I
+
+    if-ge p1, v2, :cond_6
+
+    if-nez p1, :cond_5
+
+    invoke-virtual {v0}, Lo0/g0/g/c$b;->a()V
+
+    goto :goto_1
+
+    :cond_5
+    sub-int/2addr v2, p1
+
+    invoke-virtual {v0, v2}, Lo0/g0/g/c$b;->b(I)I
+
+    :cond_6
+    :goto_1
+    const/4 p1, 0x4
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0, v0, p1, v1}, Lo0/g0/g/m;->c(IIII)V
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_7
+    :try_start_1
+    new-instance p1, Ljava/io/IOException;
+
+    const-string v0, "closed"
+
+    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized b(ZILp0/e;I)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_3
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {p0, p2, p4, v0, p1}, Lo0/g0/g/m;->c(IIII)V
+
+    if-lez p4, :cond_2
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    if-eqz p3, :cond_1
+
+    int-to-long v0, p4
+
+    invoke-interface {p1, p3, v0, v1}, Lp0/u;->write(Lp0/e;J)V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_2
+    :goto_1
+    monitor-exit p0
+
+    return-void
+
+    :cond_3
+    :try_start_1
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final c(IIII)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    sget-object v0, Lo0/g0/g/m;->j:Ljava/util/logging/Logger;
+
+    sget-object v1, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
+
+    invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lo0/g0/g/m;->j:Ljava/util/logging/Logger;
+
+    sget-object v1, Lo0/g0/g/d;->e:Lo0/g0/g/d;
+
+    const/4 v2, 0x0
+
+    move v3, p1
+
+    move v4, p2
+
+    move v5, p3
+
+    move v6, p4
+
+    invoke-virtual/range {v1 .. v6}, Lo0/g0/g/d;->a(ZIIII)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
+
+    :cond_0
+    iget v0, p0, Lo0/g0/g/m;->e:I
+
+    const/4 v1, 0x1
+
+    if-gt p2, v0, :cond_1
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_4
+
+    const-wide v2, 0x80000000L
+
+    long-to-int v0, v2
+
+    and-int/2addr v0, p1
+
+    if-nez v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_3
+
+    iget-object v0, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-static {v0, p2}, Lo0/g0/b;->I(Lokio/BufferedSink;I)V
+
+    iget-object p2, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    and-int/lit16 p3, p3, 0xff
+
+    invoke-interface {p2, p3}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
+
+    iget-object p2, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    and-int/lit16 p3, p4, 0xff
+
+    invoke-interface {p2, p3}, Lokio/BufferedSink;->writeByte(I)Lokio/BufferedSink;
+
+    iget-object p2, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    const p3, 0x7fffffff
+
+    and-int/2addr p1, p3
+
+    invoke-interface {p2, p1}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    return-void
+
+    :cond_3
+    const-string p2, "reserved bit set: "
+
+    invoke-static {p2, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_4
+    const-string p1, "FRAME_SIZE_ERROR length > "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget p3, p0, Lo0/g0/g/m;->e:I
+
+    invoke-virtual {p1, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string p3, ": "
+
+    invoke-virtual {p1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public declared-synchronized close()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    const/4 v0, 0x1
+
+    :try_start_0
+    iput-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    iget-object v0, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lp0/u;->close()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final declared-synchronized d(ILo0/g0/g/a;[B)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "errorCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "debugData"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_4
+
+    iget v0, p2, Lo0/g0/g/a;->httpCode:I
+
+    const/4 v1, -0x1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_3
+
+    array-length v0, p3
+
+    add-int/lit8 v0, v0, 0x8
+
+    const/4 v1, 0x7
+
+    invoke-virtual {p0, v2, v0, v1, v2}, Lo0/g0/g/m;->c(IIII)V
+
+    iget-object v0, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {v0, p1}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    iget p2, p2, Lo0/g0/g/a;->httpCode:I
+
+    invoke-interface {p1, p2}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    array-length p1, p3
+
+    if-nez p1, :cond_1
+
+    const/4 v2, 0x1
+
+    :cond_1
+    xor-int/lit8 p1, v2, 0x1
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1, p3}, Lokio/BufferedSink;->write([B)Lokio/BufferedSink;
+
+    :cond_2
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_3
+    :try_start_1
+    const-string p1, "errorCode.httpCode == -1"
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_4
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized e(ZILjava/util/List;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZI",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "headerBlock"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_3
+
+    iget-object v0, p0, Lo0/g0/g/m;->g:Lo0/g0/g/c$b;
+
+    invoke-virtual {v0, p3}, Lo0/g0/g/c$b;->e(Ljava/util/List;)V
+
+    iget-object p3, p0, Lo0/g0/g/m;->d:Lp0/e;
+
+    iget-wide v0, p3, Lp0/e;->e:J
+
+    iget p3, p0, Lo0/g0/g/m;->e:I
+
+    int-to-long v2, p3
+
+    invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v2
+
+    cmp-long p3, v0, v2
+
+    if-nez p3, :cond_0
+
+    const/4 v4, 0x4
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :goto_0
+    if-eqz p1, :cond_1
+
+    or-int/lit8 v4, v4, 0x1
+
+    :cond_1
+    long-to-int p1, v2
+
+    const/4 v5, 0x1
+
+    invoke-virtual {p0, p2, p1, v5, v4}, Lo0/g0/g/m;->c(IIII)V
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    iget-object v4, p0, Lo0/g0/g/m;->d:Lp0/e;
+
+    invoke-interface {p1, v4, v2, v3}, Lp0/u;->write(Lp0/e;J)V
+
+    if-lez p3, :cond_2
+
+    sub-long/2addr v0, v2
+
+    invoke-virtual {p0, p2, v0, v1}, Lo0/g0/g/m;->k(IJ)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_2
+    monitor-exit p0
+
+    return-void
+
+    :cond_3
+    :try_start_1
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized f(ZII)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_1
+
+    const/16 v0, 0x8
+
+    const/4 v1, 0x6
+
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    invoke-virtual {p0, v2, v0, v1, p1}, Lo0/g0/g/m;->c(IIII)V
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1, p2}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1, p3}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    :try_start_1
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized flush()V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lokio/BufferedSink;->flush()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    :try_start_1
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final declared-synchronized g(ILo0/g0/g/a;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "errorCode"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_2
+
+    iget v0, p2, Lo0/g0/g/a;->httpCode:I
+
+    const/4 v1, -0x1
+
+    const/4 v2, 0x0
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x4
+
+    const/4 v1, 0x3
+
+    invoke-virtual {p0, p1, v0, v1, v2}, Lo0/g0/g/m;->c(IIII)V
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    iget p2, p2, Lo0/g0/g/a;->httpCode:I
+
+    invoke-interface {p1, p2}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    :try_start_1
+    const-string p1, "Failed requirement."
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_2
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final declared-synchronized i(IJ)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/g/m;->f:Z
+
+    if-nez v0, :cond_2
+
+    const-wide/16 v0, 0x0
+
+    const/4 v2, 0x0
+
+    cmp-long v3, p2, v0
+
+    if-eqz v3, :cond_0
+
+    const-wide/32 v0, 0x7fffffff
+
+    cmp-long v3, p2, v0
+
+    if-gtz v3, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x4
+
+    const/16 v1, 0x8
+
+    invoke-virtual {p0, p1, v0, v1, v2}, Lo0/g0/g/m;->c(IIII)V
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    long-to-int p3, p2
+
+    invoke-interface {p1, p3}, Lokio/BufferedSink;->writeInt(I)Lokio/BufferedSink;
+
+    iget-object p1, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    :try_start_1
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "windowSizeIncrement == 0 || windowSizeIncrement > 0x7fffffffL: "
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, p2, p3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_2
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final k(IJ)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :goto_0
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-lez v2, :cond_1
+
+    iget v2, p0, Lo0/g0/g/m;->e:I
+
+    int-to-long v2, v2
+
+    invoke-static {v2, v3, p2, p3}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v2
+
+    sub-long/2addr p2, v2
+
+    long-to-int v4, v2
+
+    const/16 v5, 0x9
+
+    cmp-long v6, p2, v0
+
+    if-nez v6, :cond_0
+
+    const/4 v0, 0x4
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_1
+    invoke-virtual {p0, p1, v4, v5, v0}, Lo0/g0/g/m;->c(IIII)V
+
+    iget-object v0, p0, Lo0/g0/g/m;->h:Lokio/BufferedSink;
+
+    iget-object v1, p0, Lo0/g0/g/m;->d:Lp0/e;
+
+    invoke-interface {v0, v1, v2, v3}, Lp0/u;->write(Lp0/e;J)V
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/n$a.smali b/com.discord/smali_classes2/o0/g0/g/n$a.smali
new file mode 100644
index 0000000000..9647d35479
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/n$a.smali
@@ -0,0 +1,67 @@
+.class public final Lo0/g0/g/n$a;
+.super Ljava/lang/Object;
+.source "Huffman.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/n;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:[Lo0/g0/g/n$a;
+
+.field public final b:I
+
+.field public final c:I
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/16 v0, 0x100
+
+    new-array v0, v0, [Lo0/g0/g/n$a;
+
+    iput-object v0, p0, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lo0/g0/g/n$a;->b:I
+
+    iput v0, p0, Lo0/g0/g/n$a;->c:I
+
+    return-void
+.end method
+
+.method public constructor <init>(II)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    iput p1, p0, Lo0/g0/g/n$a;->b:I
+
+    and-int/lit8 p1, p2, 0x7
+
+    if-nez p1, :cond_0
+
+    const/16 p1, 0x8
+
+    :cond_0
+    iput p1, p0, Lo0/g0/g/n$a;->c:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/n.smali b/com.discord/smali_classes2/o0/g0/g/n.smali
new file mode 100644
index 0000000000..e3b2f42f45
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/n.smali
@@ -0,0 +1,688 @@
+.class public final Lo0/g0/g/n;
+.super Ljava/lang/Object;
+.source "Huffman.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/g/n$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:[I
+
+.field public static final b:[B
+
+.field public static final c:Lo0/g0/g/n$a;
+
+.field public static final d:Lo0/g0/g/n;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    new-instance v0, Lo0/g0/g/n;
+
+    invoke-direct {v0}, Lo0/g0/g/n;-><init>()V
+
+    sput-object v0, Lo0/g0/g/n;->d:Lo0/g0/g/n;
+
+    const/16 v1, 0x100
+
+    new-array v2, v1, [I
+
+    fill-array-data v2, :array_0
+
+    sput-object v2, Lo0/g0/g/n;->a:[I
+
+    new-array v1, v1, [B
+
+    fill-array-data v1, :array_1
+
+    sput-object v1, Lo0/g0/g/n;->b:[B
+
+    new-instance v1, Lo0/g0/g/n$a;
+
+    invoke-direct {v1}, Lo0/g0/g/n$a;-><init>()V
+
+    sput-object v1, Lo0/g0/g/n;->c:Lo0/g0/g/n$a;
+
+    sget-object v1, Lo0/g0/g/n;->b:[B
+
+    array-length v1, v1
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_0
+
+    sget-object v3, Lo0/g0/g/n;->a:[I
+
+    aget v3, v3, v2
+
+    sget-object v4, Lo0/g0/g/n;->b:[B
+
+    aget-byte v4, v4, v2
+
+    invoke-virtual {v0, v2, v3, v4}, Lo0/g0/g/n;->a(III)V
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+
+    nop
+
+    :array_0
+    .array-data 4
+        0x1ff8
+        0x7fffd8
+        0xfffffe2
+        0xfffffe3
+        0xfffffe4
+        0xfffffe5
+        0xfffffe6
+        0xfffffe7
+        0xfffffe8
+        0xffffea
+        0x3ffffffc    # 1.9999995f
+        0xfffffe9
+        0xfffffea
+        0x3ffffffd    # 1.9999996f
+        0xfffffeb
+        0xfffffec
+        0xfffffed
+        0xfffffee
+        0xfffffef
+        0xffffff0
+        0xffffff1
+        0xffffff2
+        0x3ffffffe    # 1.9999998f
+        0xffffff3
+        0xffffff4
+        0xffffff5
+        0xffffff6
+        0xffffff7
+        0xffffff8
+        0xffffff9
+        0xffffffa
+        0xffffffb
+        0x14
+        0x3f8
+        0x3f9
+        0xffa
+        0x1ff9
+        0x15
+        0xf8
+        0x7fa
+        0x3fa
+        0x3fb
+        0xf9
+        0x7fb
+        0xfa
+        0x16
+        0x17
+        0x18
+        0x0
+        0x1
+        0x2
+        0x19
+        0x1a
+        0x1b
+        0x1c
+        0x1d
+        0x1e
+        0x1f
+        0x5c
+        0xfb
+        0x7ffc
+        0x20
+        0xffb
+        0x3fc
+        0x1ffa
+        0x21
+        0x5d
+        0x5e
+        0x5f
+        0x60
+        0x61
+        0x62
+        0x63
+        0x64
+        0x65
+        0x66
+        0x67
+        0x68
+        0x69
+        0x6a
+        0x6b
+        0x6c
+        0x6d
+        0x6e
+        0x6f
+        0x70
+        0x71
+        0x72
+        0xfc
+        0x73
+        0xfd
+        0x1ffb
+        0x7fff0
+        0x1ffc
+        0x3ffc
+        0x22
+        0x7ffd
+        0x3
+        0x23
+        0x4
+        0x24
+        0x5
+        0x25
+        0x26
+        0x27
+        0x6
+        0x74
+        0x75
+        0x28
+        0x29
+        0x2a
+        0x7
+        0x2b
+        0x76
+        0x2c
+        0x8
+        0x9
+        0x2d
+        0x77
+        0x78
+        0x79
+        0x7a
+        0x7b
+        0x7ffe
+        0x7fc
+        0x3ffd
+        0x1ffd
+        0xffffffc
+        0xfffe6
+        0x3fffd2
+        0xfffe7
+        0xfffe8
+        0x3fffd3
+        0x3fffd4
+        0x3fffd5
+        0x7fffd9
+        0x3fffd6
+        0x7fffda
+        0x7fffdb
+        0x7fffdc
+        0x7fffdd
+        0x7fffde
+        0xffffeb
+        0x7fffdf
+        0xffffec
+        0xffffed
+        0x3fffd7
+        0x7fffe0
+        0xffffee
+        0x7fffe1
+        0x7fffe2
+        0x7fffe3
+        0x7fffe4
+        0x1fffdc
+        0x3fffd8
+        0x7fffe5
+        0x3fffd9
+        0x7fffe6
+        0x7fffe7
+        0xffffef
+        0x3fffda
+        0x1fffdd
+        0xfffe9
+        0x3fffdb
+        0x3fffdc
+        0x7fffe8
+        0x7fffe9
+        0x1fffde
+        0x7fffea
+        0x3fffdd
+        0x3fffde
+        0xfffff0
+        0x1fffdf
+        0x3fffdf
+        0x7fffeb
+        0x7fffec
+        0x1fffe0
+        0x1fffe1
+        0x3fffe0
+        0x1fffe2
+        0x7fffed
+        0x3fffe1
+        0x7fffee
+        0x7fffef
+        0xfffea
+        0x3fffe2
+        0x3fffe3
+        0x3fffe4
+        0x7ffff0
+        0x3fffe5
+        0x3fffe6
+        0x7ffff1
+        0x3ffffe0
+        0x3ffffe1
+        0xfffeb
+        0x7fff1
+        0x3fffe7
+        0x7ffff2
+        0x3fffe8
+        0x1ffffec
+        0x3ffffe2
+        0x3ffffe3
+        0x3ffffe4
+        0x7ffffde
+        0x7ffffdf
+        0x3ffffe5
+        0xfffff1
+        0x1ffffed
+        0x7fff2
+        0x1fffe3
+        0x3ffffe6
+        0x7ffffe0
+        0x7ffffe1
+        0x3ffffe7
+        0x7ffffe2
+        0xfffff2
+        0x1fffe4
+        0x1fffe5
+        0x3ffffe8
+        0x3ffffe9
+        0xffffffd
+        0x7ffffe3
+        0x7ffffe4
+        0x7ffffe5
+        0xfffec
+        0xfffff3
+        0xfffed
+        0x1fffe6
+        0x3fffe9
+        0x1fffe7
+        0x1fffe8
+        0x7ffff3
+        0x3fffea
+        0x3fffeb
+        0x1ffffee
+        0x1ffffef
+        0xfffff4
+        0xfffff5
+        0x3ffffea
+        0x7ffff4
+        0x3ffffeb
+        0x7ffffe6
+        0x3ffffec
+        0x3ffffed
+        0x7ffffe7
+        0x7ffffe8
+        0x7ffffe9
+        0x7ffffea
+        0x7ffffeb
+        0xffffffe
+        0x7ffffec
+        0x7ffffed
+        0x7ffffee
+        0x7ffffef
+        0x7fffff0
+        0x3ffffee
+    .end array-data
+
+    :array_1
+    .array-data 1
+        0xdt
+        0x17t
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x18t
+        0x1et
+        0x1ct
+        0x1ct
+        0x1et
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1et
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x1ct
+        0x6t
+        0xat
+        0xat
+        0xct
+        0xdt
+        0x6t
+        0x8t
+        0xbt
+        0xat
+        0xat
+        0x8t
+        0xbt
+        0x8t
+        0x6t
+        0x6t
+        0x6t
+        0x5t
+        0x5t
+        0x5t
+        0x6t
+        0x6t
+        0x6t
+        0x6t
+        0x6t
+        0x6t
+        0x6t
+        0x7t
+        0x8t
+        0xft
+        0x6t
+        0xct
+        0xat
+        0xdt
+        0x6t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x8t
+        0x7t
+        0x8t
+        0xdt
+        0x13t
+        0xdt
+        0xet
+        0x6t
+        0xft
+        0x5t
+        0x6t
+        0x5t
+        0x6t
+        0x5t
+        0x6t
+        0x6t
+        0x6t
+        0x5t
+        0x7t
+        0x7t
+        0x6t
+        0x6t
+        0x6t
+        0x5t
+        0x6t
+        0x7t
+        0x6t
+        0x5t
+        0x5t
+        0x6t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0x7t
+        0xft
+        0xbt
+        0xet
+        0xdt
+        0x1ct
+        0x14t
+        0x16t
+        0x14t
+        0x14t
+        0x16t
+        0x16t
+        0x16t
+        0x17t
+        0x16t
+        0x17t
+        0x17t
+        0x17t
+        0x17t
+        0x17t
+        0x18t
+        0x17t
+        0x18t
+        0x18t
+        0x16t
+        0x17t
+        0x18t
+        0x17t
+        0x17t
+        0x17t
+        0x17t
+        0x15t
+        0x16t
+        0x17t
+        0x16t
+        0x17t
+        0x17t
+        0x18t
+        0x16t
+        0x15t
+        0x14t
+        0x16t
+        0x16t
+        0x17t
+        0x17t
+        0x15t
+        0x17t
+        0x16t
+        0x16t
+        0x18t
+        0x15t
+        0x16t
+        0x17t
+        0x17t
+        0x15t
+        0x15t
+        0x16t
+        0x15t
+        0x17t
+        0x16t
+        0x17t
+        0x17t
+        0x14t
+        0x16t
+        0x16t
+        0x16t
+        0x17t
+        0x16t
+        0x16t
+        0x17t
+        0x1at
+        0x1at
+        0x14t
+        0x13t
+        0x16t
+        0x17t
+        0x16t
+        0x19t
+        0x1at
+        0x1at
+        0x1at
+        0x1bt
+        0x1bt
+        0x1at
+        0x18t
+        0x19t
+        0x13t
+        0x15t
+        0x1at
+        0x1bt
+        0x1bt
+        0x1at
+        0x1bt
+        0x18t
+        0x15t
+        0x15t
+        0x1at
+        0x1at
+        0x1ct
+        0x1bt
+        0x1bt
+        0x1bt
+        0x14t
+        0x18t
+        0x14t
+        0x15t
+        0x16t
+        0x15t
+        0x15t
+        0x17t
+        0x16t
+        0x16t
+        0x19t
+        0x19t
+        0x18t
+        0x18t
+        0x1at
+        0x17t
+        0x1at
+        0x1bt
+        0x1at
+        0x1at
+        0x1bt
+        0x1bt
+        0x1bt
+        0x1bt
+        0x1bt
+        0x1ct
+        0x1bt
+        0x1bt
+        0x1bt
+        0x1bt
+        0x1bt
+        0x1at
+    .end array-data
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(III)V
+    .locals 3
+
+    new-instance v0, Lo0/g0/g/n$a;
+
+    invoke-direct {v0, p1, p3}, Lo0/g0/g/n$a;-><init>(II)V
+
+    sget-object p1, Lo0/g0/g/n;->c:Lo0/g0/g/n$a;
+
+    :goto_0
+    const/16 v1, 0x8
+
+    const/4 v2, 0x0
+
+    if-le p3, v1, :cond_2
+
+    add-int/lit8 p3, p3, -0x8
+
+    ushr-int v1, p2, p3
+
+    and-int/lit16 v1, v1, 0xff
+
+    iget-object p1, p1, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    if-eqz p1, :cond_1
+
+    aget-object v2, p1, v1
+
+    if-nez v2, :cond_0
+
+    new-instance v2, Lo0/g0/g/n$a;
+
+    invoke-direct {v2}, Lo0/g0/g/n$a;-><init>()V
+
+    aput-object v2, p1, v1
+
+    :cond_0
+    move-object p1, v2
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_2
+    sub-int/2addr v1, p3
+
+    shl-int/2addr p2, v1
+
+    and-int/lit16 p2, p2, 0xff
+
+    const/4 p3, 0x1
+
+    shl-int/2addr p3, v1
+
+    iget-object p1, p1, Lo0/g0/g/n$a;->a:[Lo0/g0/g/n$a;
+
+    if-eqz p1, :cond_3
+
+    add-int/2addr p3, p2
+
+    const-string v1, "$this$fill"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p2, p3, v0}, Ljava/util/Arrays;->fill([Ljava/lang/Object;IILjava/lang/Object;)V
+
+    return-void
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/o$a.smali b/com.discord/smali_classes2/o0/g0/g/o$a.smali
new file mode 100644
index 0000000000..3ebb611997
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/o$a.smali
@@ -0,0 +1,100 @@
+.class public final Lo0/g0/g/o$a;
+.super Ljava/lang/Object;
+.source "PushObserver.kt"
+
+# interfaces
+.implements Lo0/g0/g/p;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/g/o;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(ILjava/util/List;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)Z"
+        }
+    .end annotation
+
+    const-string p1, "requestHeaders"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public b(ILjava/util/List;Z)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;Z)Z"
+        }
+    .end annotation
+
+    const-string p1, "responseHeaders"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public c(ILo0/g0/g/a;)V
+    .locals 0
+
+    const-string p1, "errorCode"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public d(ILp0/g;IZ)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string p1, "source"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    int-to-long p3, p3
+
+    invoke-interface {p2, p3, p4}, Lp0/g;->skip(J)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/p.smali b/com.discord/smali_classes2/o0/g0/g/p.smali
new file mode 100644
index 0000000000..b7dc208d0a
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/p.smali
@@ -0,0 +1,56 @@
+.class public interface abstract Lo0/g0/g/p;
+.super Ljava/lang/Object;
+.source "PushObserver.kt"
+
+
+# static fields
+.field public static final a:Lo0/g0/g/p;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/g0/g/o$a;
+
+    invoke-direct {v0}, Lo0/g0/g/o$a;-><init>()V
+
+    sput-object v0, Lo0/g0/g/p;->a:Lo0/g0/g/p;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(ILjava/util/List;)Z
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;)Z"
+        }
+    .end annotation
+.end method
+
+.method public abstract b(ILjava/util/List;Z)Z
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I",
+            "Ljava/util/List<",
+            "Lo0/g0/g/b;",
+            ">;Z)Z"
+        }
+    .end annotation
+.end method
+
+.method public abstract c(ILo0/g0/g/a;)V
+.end method
+
+.method public abstract d(ILp0/g;IZ)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/g/q.smali b/com.discord/smali_classes2/o0/g0/g/q.smali
new file mode 100644
index 0000000000..208c7d26f4
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/g/q.smali
@@ -0,0 +1,82 @@
+.class public final Lo0/g0/g/q;
+.super Ljava/lang/Object;
+.source "Settings.kt"
+
+
+# instance fields
+.field public a:I
+
+.field public final b:[I
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/16 v0, 0xa
+
+    new-array v0, v0, [I
+
+    iput-object v0, p0, Lo0/g0/g/q;->b:[I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()I
+    .locals 2
+
+    iget v0, p0, Lo0/g0/g/q;->a:I
+
+    and-int/lit16 v0, v0, 0x80
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/g0/g/q;->b:[I
+
+    const/4 v1, 0x7
+
+    aget v0, v0, v1
+
+    goto :goto_0
+
+    :cond_0
+    const v0, 0xffff
+
+    :goto_0
+    return v0
+.end method
+
+.method public final b(II)Lo0/g0/g/q;
+    .locals 3
+
+    if-ltz p1, :cond_1
+
+    iget-object v0, p0, Lo0/g0/g/q;->b:[I
+
+    array-length v1, v0
+
+    if-lt p1, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x1
+
+    shl-int/2addr v1, p1
+
+    iget v2, p0, Lo0/g0/g/q;->a:I
+
+    or-int/2addr v1, v2
+
+    iput v1, p0, Lo0/g0/g/q;->a:I
+
+    aput p2, v0, p1
+
+    :cond_1
+    :goto_0
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/a$a.smali b/com.discord/smali_classes2/o0/g0/h/a$a.smali
new file mode 100644
index 0000000000..1fd51c1f1d
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/a$a.smali
@@ -0,0 +1,180 @@
+.class public final Lo0/g0/h/a$a;
+.super Lo0/g0/j/c;
+.source "AndroidPlatform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/h/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/Object;
+
+.field public final b:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/reflect/Method;)V
+    .locals 1
+
+    const-string v0, "x509TrustManagerExtensions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "checkServerTrusted"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lo0/g0/j/c;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/a$a;->a:Ljava/lang/Object;
+
+    iput-object p2, p0, Lo0/g0/h/a$a;->b:Ljava/lang/reflect/Method;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/security/cert/Certificate;",
+            ">;",
+            "Ljava/lang/String;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/security/cert/Certificate;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljavax/net/ssl/SSLPeerUnverifiedException;
+        }
+    .end annotation
+
+    const-string v0, "chain"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "hostname"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    new-array v1, v0, [Ljava/security/cert/X509Certificate;
+
+    invoke-interface {p1, v1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, [Ljava/security/cert/X509Certificate;
+
+    iget-object v1, p0, Lo0/g0/h/a$a;->b:Ljava/lang/reflect/Method;
+
+    iget-object v2, p0, Lo0/g0/h/a$a;->a:Ljava/lang/Object;
+
+    const/4 v3, 0x3
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    aput-object p1, v3, v0
+
+    const/4 p1, 0x1
+
+    const-string v0, "RSA"
+
+    aput-object v0, v3, p1
+
+    const/4 p1, 0x2
+
+    aput-object p2, v3, p1
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Ljava/util/List;
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.collections.List<java.security.cert.Certificate>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance p2, Ljava/lang/AssertionError;
+
+    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p2
+
+    :catch_1
+    move-exception p1
+
+    new-instance p2, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getMessage()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p2, v0}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p2
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 0
+
+    instance-of p1, p1, Lo0/g0/h/a$a;
+
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/a$b.smali b/com.discord/smali_classes2/o0/g0/h/a$b.smali
new file mode 100644
index 0000000000..6d011b9b8d
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/a$b.smali
@@ -0,0 +1,24 @@
+.class public final Lo0/g0/h/a$b;
+.super Ljava/lang/Object;
+.source "AndroidPlatform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/h/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/a$c.smali b/com.discord/smali_classes2/o0/g0/h/a$c.smali
new file mode 100644
index 0000000000..2f910e6773
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/a$c.smali
@@ -0,0 +1,223 @@
+.class public final Lo0/g0/h/a$c;
+.super Ljava/lang/Object;
+.source "AndroidPlatform.kt"
+
+# interfaces
+.implements Lo0/g0/j/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/h/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljavax/net/ssl/X509TrustManager;
+
+.field public final b:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public constructor <init>(Ljavax/net/ssl/X509TrustManager;Ljava/lang/reflect/Method;)V
+    .locals 1
+
+    const-string v0, "trustManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "findByIssuerAndSignatureMethod"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
+
+    iput-object p2, p0, Lo0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
+    .locals 4
+
+    const-string v0, "cert"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
+
+    iget-object v1, p0, Lo0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
+
+    const/4 v2, 0x1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    aput-object p1, v2, v3
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Ljava/security/cert/TrustAnchor;
+
+    invoke-virtual {p1}, Ljava/security/cert/TrustAnchor;->getTrustedCert()Ljava/security/cert/X509Certificate;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type java.security.cert.TrustAnchor"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return-object p1
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Ljava/lang/AssertionError;
+
+    const-string v1, "unable to get issues and signature"
+
+    invoke-direct {v0, v1, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lo0/g0/h/a$c;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/g0/h/a$c;
+
+    iget-object v0, p0, Lo0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
+
+    iget-object v1, p1, Lo0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
+
+    iget-object p1, p1, Lo0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lo0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lo0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_1
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "CustomTrustRootIndex(trustManager="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/h/a$c;->a:Ljavax/net/ssl/X509TrustManager;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", findByIssuerAndSignatureMethod="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/h/a$c;->b:Ljava/lang/reflect/Method;
+
+    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_classes2/o0/g0/h/a.smali b/com.discord/smali_classes2/o0/g0/h/a.smali
new file mode 100644
index 0000000000..998f9d7eb1
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/a.smali
@@ -0,0 +1,954 @@
+.class public final Lo0/g0/h/a;
+.super Lo0/g0/h/f;
+.source "AndroidPlatform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/h/a$a;,
+        Lo0/g0/h/a$c;,
+        Lo0/g0/h/a$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:Z
+
+.field public static final g:Lo0/g0/h/a$b;
+
+
+# instance fields
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/g0/h/g/e;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lo0/g0/h/g/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lo0/g0/h/a$b;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/g0/h/a$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/g0/h/a;->g:Lo0/g0/h/a$b;
+
+    const/4 v0, 0x1
+
+    :try_start_0
+    const-string v1, "com.android.org.conscrypt.OpenSSLSocketImpl"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Expected Android API level 21+ but was "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    const/4 v0, 0x0
+
+    :goto_0
+    sput-boolean v0, Lo0/g0/h/a;->f:Z
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 7
+
+    invoke-direct {p0}, Lo0/g0/h/f;-><init>()V
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [Lo0/g0/h/g/e;
+
+    const-string v1, "com.android.org.conscrypt"
+
+    const-string v2, "packageName"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    :try_start_0
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, ".OpenSSLSocketImpl"
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v3}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v3
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v5, ".OpenSSLSocketFactoryImpl"
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-static {v4}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ".SSLParametersImpl"
+
+    invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v1
+
+    new-instance v5, Lo0/g0/h/g/f;
+
+    const-string v6, "paramsClass"
+
+    invoke-static {v1, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v5, v3, v4, v1}, Lo0/g0/h/g/f;-><init>(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v1
+
+    const/4 v3, 0x5
+
+    const-string v4, "unable to load android socket classes"
+
+    invoke-static {v3, v4, v1}, Lf/n/a/k/a;->d(ILjava/lang/String;Ljava/lang/Throwable;)V
+
+    move-object v5, v2
+
+    :goto_0
+    const/4 v1, 0x0
+
+    aput-object v5, v0, v1
+
+    sget-object v3, Lo0/g0/h/b;->f:Lo0/g0/h/b$a;
+
+    sget-boolean v3, Lo0/g0/h/b;->e:Z
+
+    if-eqz v3, :cond_0
+
+    sget-object v3, Lo0/g0/h/g/c;->a:Lo0/g0/h/g/c;
+
+    goto :goto_1
+
+    :cond_0
+    move-object v3, v2
+
+    :goto_1
+    const/4 v4, 0x1
+
+    aput-object v3, v0, v4
+
+    const/4 v3, 0x2
+
+    new-instance v5, Lo0/g0/h/g/d;
+
+    const-string v6, "com.google.android.gms.org.conscrypt"
+
+    invoke-direct {v5, v6}, Lo0/g0/h/g/d;-><init>(Ljava/lang/String;)V
+
+    aput-object v5, v0, v3
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOfNotNull([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_1
+    :goto_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    move-object v6, v5
+
+    check-cast v6, Lo0/g0/h/g/e;
+
+    invoke-interface {v6}, Lo0/g0/h/g/e;->a()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_1
+
+    invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_2
+    iput-object v3, p0, Lo0/g0/h/a;->d:Ljava/util/List;
+
+    :try_start_1
+    const-string v0, "dalvik.system.CloseGuard"
+
+    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v0
+
+    const-string v3, "get"
+
+    new-array v5, v1, [Ljava/lang/Class;
+
+    invoke-virtual {v0, v3, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v3
+
+    const-string v5, "open"
+
+    new-array v4, v4, [Ljava/lang/Class;
+
+    const-class v6, Ljava/lang/String;
+
+    aput-object v6, v4, v1
+
+    invoke-virtual {v0, v5, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v4
+
+    const-string v5, "warnIfOpen"
+
+    new-array v1, v1, [Ljava/lang/Class;
+
+    invoke-virtual {v0, v5, v1}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v2
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+
+    move-object v0, v2
+
+    move-object v2, v3
+
+    goto :goto_3
+
+    :catch_1
+    move-object v0, v2
+
+    move-object v4, v0
+
+    :goto_3
+    new-instance v1, Lo0/g0/h/g/b;
+
+    invoke-direct {v1, v2, v4, v0}, Lo0/g0/h/g/b;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
+
+    iput-object v1, p0, Lo0/g0/h/a;->e:Lo0/g0/h/g/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public b(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/c;
+    .locals 9
+
+    const-class v0, Ljava/lang/String;
+
+    const-string v1, "checkServerTrusted"
+
+    const-string v2, "trustManager"
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    const-string v3, "android.net.http.X509TrustManagerExtensions"
+
+    invoke-static {v3}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v3
+
+    const/4 v4, 0x1
+
+    new-array v5, v4, [Ljava/lang/Class;
+
+    const-class v6, Ljavax/net/ssl/X509TrustManager;
+
+    const/4 v7, 0x0
+
+    aput-object v6, v5, v7
+
+    invoke-virtual {v3, v5}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object v5
+
+    new-array v6, v4, [Ljava/lang/Object;
+
+    aput-object p1, v6, v7
+
+    invoke-virtual {v5, v6}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    const/4 v6, 0x3
+
+    new-array v6, v6, [Ljava/lang/Class;
+
+    const-class v8, [Ljava/security/cert/X509Certificate;
+
+    aput-object v8, v6, v7
+
+    aput-object v0, v6, v4
+
+    const/4 v4, 0x2
+
+    aput-object v0, v6, v4
+
+    invoke-virtual {v3, v1, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    new-instance v3, Lo0/g0/h/a$a;
+
+    const-string v4, "extensions"
+
+    invoke-static {v5, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v3, v5, v0}, Lo0/g0/h/a$a;-><init>(Ljava/lang/Object;Ljava/lang/reflect/Method;)V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    invoke-static {p1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Lo0/g0/j/a;
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/f;->c(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/e;
+
+    move-result-object p1
+
+    invoke-direct {v3, p1}, Lo0/g0/j/a;-><init>(Lo0/g0/j/e;)V
+
+    :goto_0
+    return-object v3
+.end method
+
+.method public c(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/e;
+    .locals 6
+
+    const-string v0, "trustManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    const-string v1, "findTrustAnchorByIssuerAndSignature"
+
+    const/4 v2, 0x1
+
+    new-array v3, v2, [Ljava/lang/Class;
+
+    const/4 v4, 0x0
+
+    const-class v5, Ljava/security/cert/X509Certificate;
+
+    aput-object v5, v3, v4
+
+    invoke-virtual {v0, v1, v3}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    const-string v1, "method"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v2}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+
+    new-instance v1, Lo0/g0/h/a$c;
+
+    invoke-direct {v1, p1, v0}, Lo0/g0/h/a$c;-><init>(Ljavax/net/ssl/X509TrustManager;Ljava/lang/reflect/Method;)V
+    :try_end_0
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    invoke-super {p0, p1}, Lo0/g0/h/f;->c(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/e;
+
+    move-result-object v1
+
+    :goto_0
+    return-object v1
+.end method
+
+.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocols"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/h/a;->d:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v2, v1
+
+    check-cast v2, Lo0/g0/h/g/e;
+
+    invoke-interface {v2, p1}, Lo0/g0/h/g/e;->c(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    check-cast v1, Lo0/g0/h/g/e;
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v1, p1, p2, p3}, Lo0/g0/h/g/e;->d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+
+    :cond_2
+    return-void
+.end method
+
+.method public g(Ljava/net/Socket;Ljava/net/InetSocketAddress;I)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "socket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "address"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-virtual {p1, p2, p3}, Ljava/net/Socket;->connect(Ljava/net/SocketAddress;I)V
+    :try_end_0
+    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 p3, 0x1a
+
+    if-ne p2, p3, :cond_0
+
+    new-instance p2, Ljava/io/IOException;
+
+    const-string p3, "Exception in connect"
+
+    invoke-direct {p2, p3, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p2
+
+    :cond_0
+    throw p1
+.end method
+
+.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 4
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/h/a;->d:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v3, v1
+
+    check-cast v3, Lo0/g0/h/g/e;
+
+    invoke-interface {v3, p1}, Lo0/g0/h/g/e;->c(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    goto :goto_0
+
+    :cond_1
+    move-object v1, v2
+
+    :goto_0
+    check-cast v1, Lo0/g0/h/g/e;
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v1, p1}, Lo0/g0/h/g/e;->b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+
+    move-result-object v2
+
+    :cond_2
+    return-object v2
+.end method
+
+.method public i(Ljava/lang/String;)Ljava/lang/Object;
+    .locals 5
+
+    const-string v0, "closer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lo0/g0/h/a;->e:Lo0/g0/h/g/b;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, v1, Lo0/g0/h/g/b;->a:Ljava/lang/reflect/Method;
+
+    if-eqz v0, :cond_1
+
+    const/4 v3, 0x0
+
+    :try_start_0
+    new-array v4, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v0, v2, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v1, v1, Lo0/g0/h/g/b;->b:Ljava/lang/reflect/Method;
+
+    if-eqz v1, :cond_0
+
+    const/4 v4, 0x1
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    aput-object p1, v4, v3
+
+    invoke-virtual {v1, v0, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-object v2, v0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    throw v2
+
+    :catch_0
+    :cond_1
+    :goto_0
+    return-object v2
+
+    :cond_2
+    throw v2
+.end method
+
+.method public j(Ljava/lang/String;)Z
+    .locals 6
+
+    const-string v0, "unable to determine cleartext support"
+
+    const-string v1, "hostname"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x1
+
+    :try_start_0
+    const-string v2, "android.security.NetworkSecurityPolicy"
+
+    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v2
+
+    const-string v3, "getInstance"
+
+    const/4 v4, 0x0
+
+    new-array v5, v4, [Ljava/lang/Class;
+
+    invoke-virtual {v2, v3, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v3
+
+    const/4 v5, 0x0
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v3, v5, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    const-string v4, "networkPolicyClass"
+
+    invoke-static {v2, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "networkSecurityPolicy"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1, v2, v3}, Lo0/g0/h/a;->o(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;)Z
+
+    move-result v1
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_4
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_2
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_3
+    invoke-super {p0, p1}, Lo0/g0/h/f;->j(Ljava/lang/String;)Z
+
+    goto :goto_0
+
+    :catch_4
+    invoke-super {p0, p1}, Lo0/g0/h/f;->j(Ljava/lang/String;)Z
+
+    :goto_0
+    return v1
+.end method
+
+.method public k(ILjava/lang/String;Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, p2, p3}, Lf/n/a/k/a;->d(ILjava/lang/String;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public l(Ljava/lang/String;Ljava/lang/Object;)V
+    .locals 4
+
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/h/a;->e:Lo0/g0/h/g/b;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    const/4 v2, 0x0
+
+    if-eqz p2, :cond_1
+
+    :try_start_0
+    iget-object v0, v0, Lo0/g0/h/g/b;->c:Ljava/lang/reflect/Method;
+
+    if-eqz v0, :cond_0
+
+    new-array v3, v2, [Ljava/lang/Object;
+
+    invoke-virtual {v0, p2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    throw v1
+
+    :catch_0
+    :cond_1
+    :goto_0
+    if-nez v2, :cond_2
+
+    const/4 p2, 0x5
+
+    invoke-virtual {p0, p2, p1, v1}, Lo0/g0/h/a;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
+
+    :cond_2
+    return-void
+
+    :cond_3
+    throw v1
+.end method
+
+.method public final o(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;)Z
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Object;",
+            ")Z"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/reflect/InvocationTargetException;,
+            Ljava/lang/IllegalAccessException;
+        }
+    .end annotation
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Boolean"
+
+    const-string v1, "isCleartextTrafficPermitted"
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    :try_start_0
+    new-array v4, v3, [Ljava/lang/Class;
+
+    const-class v5, Ljava/lang/String;
+
+    aput-object v5, v4, v2
+
+    invoke-virtual {p2, v1, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v4
+
+    new-array v5, v3, [Ljava/lang/Object;
+
+    aput-object p1, v5, v2
+
+    invoke-virtual {v4, p3, v5}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_0
+
+    check-cast v4, Ljava/lang/Boolean;
+
+    invoke-virtual {v4}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    goto :goto_1
+
+    :cond_0
+    new-instance v4, Lkotlin/TypeCastException;
+
+    invoke-direct {v4, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v4
+    :try_end_0
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    :try_start_1
+    new-array v4, v2, [Ljava/lang/Class;
+
+    invoke-virtual {p2, v1, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p2
+
+    new-array v1, v2, [Ljava/lang/Object;
+
+    invoke-virtual {p2, p3, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_1
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v3
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p2, Lkotlin/TypeCastException;
+
+    invoke-direct {p2, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+    :try_end_1
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_1
+
+    :catch_1
+    invoke-super {p0, p1}, Lo0/g0/h/f;->j(Ljava/lang/String;)Z
+
+    :goto_0
+    move p1, v3
+
+    :goto_1
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/b$a.smali b/com.discord/smali_classes2/o0/g0/h/b$a.smali
new file mode 100644
index 0000000000..4a9f442cdf
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/b$a.smali
@@ -0,0 +1,94 @@
+.class public final Lo0/g0/h/b$a;
+.super Ljava/lang/Object;
+.source "ConscryptPlatform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/h/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(III)Z
+    .locals 4
+
+    invoke-static {}, Lorg/conscrypt/Conscrypt;->version()Lorg/conscrypt/Conscrypt$Version;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->major()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-eq v1, p1, :cond_1
+
+    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->major()I
+
+    move-result p2
+
+    if-le p2, p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    return v2
+
+    :cond_1
+    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->minor()I
+
+    move-result p1
+
+    if-eq p1, p2, :cond_3
+
+    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->minor()I
+
+    move-result p1
+
+    if-le p1, p2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v2, 0x0
+
+    :goto_1
+    return v2
+
+    :cond_3
+    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$Version;->patch()I
+
+    move-result p1
+
+    if-lt p1, p3, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_2
+    return v2
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/b$b.smali b/com.discord/smali_classes2/o0/g0/h/b$b.smali
new file mode 100644
index 0000000000..97b82e6bb6
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/b$b.smali
@@ -0,0 +1,43 @@
+.class public final Lo0/g0/h/b$b;
+.super Ljava/lang/Object;
+.source "ConscryptPlatform.kt"
+
+# interfaces
+.implements Lorg/conscrypt/ConscryptHostnameVerifier;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/h/b;->f(Ljavax/net/ssl/X509TrustManager;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final a:Lo0/g0/h/b$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/g0/h/b$b;
+
+    invoke-direct {v0}, Lo0/g0/h/b$b;-><init>()V
+
+    sput-object v0, Lo0/g0/h/b$b;->a:Lo0/g0/h/b$b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/b.smali b/com.discord/smali_classes2/o0/g0/h/b.smali
new file mode 100644
index 0000000000..6ed4c0d7c9
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/b.smali
@@ -0,0 +1,345 @@
+.class public final Lo0/g0/h/b;
+.super Lo0/g0/h/f;
+.source "ConscryptPlatform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/h/b$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final e:Z
+
+.field public static final f:Lo0/g0/h/b$a;
+
+
+# instance fields
+.field public final d:Ljava/security/Provider;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    new-instance v0, Lo0/g0/h/b$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/g0/h/b$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/g0/h/b;->f:Lo0/g0/h/b$a;
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    const-string v1, "org.conscrypt.Conscrypt$Version"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    invoke-static {}, Lorg/conscrypt/Conscrypt;->isAvailable()Z
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-eqz v1, :cond_0
+
+    sget-object v1, Lo0/g0/h/b;->f:Lo0/g0/h/b$a;
+
+    const/4 v3, 0x2
+
+    invoke-virtual {v1, v3, v2, v0}, Lo0/g0/h/b$a;->a(III)Z
+
+    move-result v1
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eqz v1, :cond_0
+
+    const/4 v0, 0x1
+
+    :catch_0
+    :cond_0
+    sput-boolean v0, Lo0/g0/h/b;->e:Z
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Lo0/g0/h/f;-><init>()V
+
+    invoke-static {}, Lorg/conscrypt/Conscrypt;->newProviderBuilder()Lorg/conscrypt/Conscrypt$ProviderBuilder;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Lorg/conscrypt/Conscrypt$ProviderBuilder;->provideTrustManager(Z)Lorg/conscrypt/Conscrypt$ProviderBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lorg/conscrypt/Conscrypt$ProviderBuilder;->build()Ljava/security/Provider;
+
+    move-result-object v0
+
+    const-string v1, "Conscrypt.newProviderBui\u2026rustManager(true).build()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p0, Lo0/g0/h/b;->d:Ljava/security/Provider;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public d(Ljavax/net/ssl/SSLSocketFactory;)V
+    .locals 1
+
+    const-string v0, "socketFactory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocketFactory;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setUseEngineSocket(Ljavax/net/ssl/SSLSocketFactory;Z)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "protocols"
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_6
+
+    const/4 v0, 0x1
+
+    if-eqz p2, :cond_0
+
+    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setUseSessionTickets(Ljavax/net/ssl/SSLSocket;Z)V
+
+    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setHostname(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;)V
+
+    :cond_0
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Ljava/util/ArrayList;
+
+    invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p3
+
+    :cond_1
+    :goto_0
+    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v3, v1
+
+    check-cast v3, Lo0/y;
+
+    sget-object v4, Lo0/y;->d:Lo0/y;
+
+    if-eq v3, v4, :cond_2
+
+    const/4 v2, 0x1
+
+    :cond_2
+    if-eqz v2, :cond_1
+
+    invoke-virtual {p2, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_3
+    new-instance p3, Ljava/util/ArrayList;
+
+    const/16 v0, 0xa
+
+    invoke-static {p2, v0}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v0
+
+    invoke-direct {p3, v0}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {p2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :goto_1
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lo0/y;
+
+    iget-object v0, v0, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-virtual {p3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_4
+    new-array p2, v2, [Ljava/lang/String;
+
+    invoke-virtual {p3, p2}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_5
+
+    check-cast p2, [Ljava/lang/String;
+
+    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setApplicationProtocols(Ljavax/net/ssl/SSLSocket;[Ljava/lang/String;)V
+
+    goto :goto_2
+
+    :cond_5
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_2
+    return-void
+.end method
+
+.method public f(Ljavax/net/ssl/X509TrustManager;)V
+    .locals 1
+
+    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/TrustManager;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lo0/g0/h/b$b;->a:Lo0/g0/h/b$b;
+
+    check-cast v0, Lorg/conscrypt/ConscryptHostnameVerifier;
+
+    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setHostnameVerifier(Ljavax/net/ssl/TrustManager;Lorg/conscrypt/ConscryptHostnameVerifier;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->getApplicationProtocol(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-super {p0, p1}, Lo0/g0/h/f;->h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+
+    const/4 p1, 0x0
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public m()Ljavax/net/ssl/SSLContext;
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/h/b;->d:Ljava/security/Provider;
+
+    const-string v1, "TLS"
+
+    invoke-static {v1, v0}, Ljavax/net/ssl/SSLContext;->getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljavax/net/ssl/SSLContext;
+
+    move-result-object v0
+
+    const-string v1, "SSLContext.getInstance(\"TLS\", provider)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public n()Ljavax/net/ssl/X509TrustManager;
+    .locals 2
+
+    invoke-static {}, Lorg/conscrypt/Conscrypt;->getDefaultX509TrustManager()Ljavax/net/ssl/X509TrustManager;
+
+    move-result-object v0
+
+    const-string v1, "Conscrypt.getDefaultX509TrustManager()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/c$a.smali b/com.discord/smali_classes2/o0/g0/h/c$a.smali
new file mode 100644
index 0000000000..3572e710f4
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/c$a.smali
@@ -0,0 +1,327 @@
+.class public final Lo0/g0/h/c$a;
+.super Ljava/lang/Object;
+.source "Jdk8WithJettyBootPlatform.kt"
+
+# interfaces
+.implements Ljava/lang/reflect/InvocationHandler;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/h/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Z
+
+.field public b:Ljava/lang/String;
+
+.field public final c:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "protocols"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/c$a;->c:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Throwable;
+        }
+    .end annotation
+
+    const-string v0, "proxy"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "method"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    if-eqz p3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-array p3, p1, [Ljava/lang/Object;
+
+    :goto_0
+    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getReturnType()Ljava/lang/Class;
+
+    move-result-object v1
+
+    const-string v2, "supports"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    sget-object v2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    return-object p1
+
+    :cond_1
+    const-string v2, "unsupported"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-eqz v2, :cond_2
+
+    sget-object v2, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    iput-boolean v4, p0, Lo0/g0/h/c$a;->a:Z
+
+    return-object v3
+
+    :cond_2
+    const-string v2, "protocols"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_4
+
+    array-length v2, p3
+
+    if-nez v2, :cond_3
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_4
+
+    iget-object p1, p0, Lo0/g0/h/c$a;->c:Ljava/util/List;
+
+    return-object p1
+
+    :cond_4
+    const-string v2, "selectProtocol"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    const-string v5, "null cannot be cast to non-null type kotlin.String"
+
+    if-nez v2, :cond_5
+
+    const-string v2, "select"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_a
+
+    :cond_5
+    const-class v2, Ljava/lang/String;
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_a
+
+    array-length v1, p3
+
+    if-ne v1, v4, :cond_a
+
+    aget-object v1, p3, p1
+
+    instance-of v1, v1, Ljava/util/List;
+
+    if-eqz v1, :cond_a
+
+    aget-object p2, p3, p1
+
+    if-eqz p2, :cond_9
+
+    check-cast p2, Ljava/util/List;
+
+    invoke-interface {p2}, Ljava/util/List;->size()I
+
+    move-result p3
+
+    if-ltz p3, :cond_8
+
+    const/4 v0, 0x0
+
+    :goto_2
+    invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_7
+
+    check-cast v1, Ljava/lang/String;
+
+    iget-object v2, p0, Lo0/g0/h/c$a;->c:Ljava/util/List;
+
+    invoke-interface {v2, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_6
+
+    iput-object v1, p0, Lo0/g0/h/c$a;->b:Ljava/lang/String;
+
+    return-object v1
+
+    :cond_6
+    if-eq v0, p3, :cond_8
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_2
+
+    :cond_7
+    new-instance p1, Lkotlin/TypeCastException;
+
+    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_8
+    iget-object p2, p0, Lo0/g0/h/c$a;->c:Ljava/util/List;
+
+    invoke-interface {p2, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    iput-object p1, p0, Lo0/g0/h/c$a;->b:Ljava/lang/String;
+
+    return-object p1
+
+    :cond_9
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.collections.List<*>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_a
+    const-string v1, "protocolSelected"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_b
+
+    const-string v1, "selected"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_d
+
+    :cond_b
+    array-length v0, p3
+
+    if-ne v0, v4, :cond_d
+
+    aget-object p1, p3, p1
+
+    if-eqz p1, :cond_c
+
+    check-cast p1, Ljava/lang/String;
+
+    iput-object p1, p0, Lo0/g0/h/c$a;->b:Ljava/lang/String;
+
+    return-object v3
+
+    :cond_c
+    new-instance p1, Lkotlin/TypeCastException;
+
+    invoke-direct {p1, v5}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_d
+    array-length p1, p3
+
+    invoke-static {p3, p1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p0, p1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/c.smali b/com.discord/smali_classes2/o0/g0/h/c.smali
new file mode 100644
index 0000000000..847278c478
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/c.smali
@@ -0,0 +1,403 @@
+.class public final Lo0/g0/h/c;
+.super Lo0/g0/h/f;
+.source "Jdk8WithJettyBootPlatform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/h/c$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/reflect/Method;
+
+.field public final e:Ljava/lang/reflect/Method;
+
+.field public final f:Ljava/lang/reflect/Method;
+
+.field public final g:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field public final h:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Class;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Method;",
+            "Ljava/lang/reflect/Method;",
+            "Ljava/lang/reflect/Method;",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Class<",
+            "*>;)V"
+        }
+    .end annotation
+
+    const-string v0, "putMethod"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "getMethod"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "removeMethod"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "clientProviderClass"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "serverProviderClass"
+
+    invoke-static {p5, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lo0/g0/h/f;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/c;->d:Ljava/lang/reflect/Method;
+
+    iput-object p2, p0, Lo0/g0/h/c;->e:Ljava/lang/reflect/Method;
+
+    iput-object p3, p0, Lo0/g0/h/c;->f:Ljava/lang/reflect/Method;
+
+    iput-object p4, p0, Lo0/g0/h/c;->g:Ljava/lang/Class;
+
+    iput-object p5, p0, Lo0/g0/h/c;->h:Ljava/lang/Class;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljavax/net/ssl/SSLSocket;)V
+    .locals 5
+
+    const-string v0, "failed to remove ALPN"
+
+    const-string v1, "sslSocket"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/h/c;->f:Ljava/lang/reflect/Method;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    aput-object p1, v3, v4
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
+
+.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p2, "failed to set ALPN"
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocols"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p3
+
+    :cond_0
+    :goto_0
+    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v4, v1
+
+    check-cast v4, Lo0/y;
+
+    sget-object v5, Lo0/y;->d:Lo0/y;
+
+    if-eq v4, v5, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p3, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {p3, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lo0/y;
+
+    iget-object v1, v1, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-virtual {p3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_3
+    :try_start_0
+    const-class v0, Lo0/g0/h/f;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v0
+
+    const/4 v1, 0x2
+
+    new-array v4, v1, [Ljava/lang/Class;
+
+    iget-object v5, p0, Lo0/g0/h/c;->g:Ljava/lang/Class;
+
+    aput-object v5, v4, v3
+
+    iget-object v5, p0, Lo0/g0/h/c;->h:Ljava/lang/Class;
+
+    aput-object v5, v4, v2
+
+    new-instance v5, Lo0/g0/h/c$a;
+
+    invoke-direct {v5, p3}, Lo0/g0/h/c$a;-><init>(Ljava/util/List;)V
+
+    invoke-static {v0, v4, v5}, Ljava/lang/reflect/Proxy;->newProxyInstance(Ljava/lang/ClassLoader;[Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;
+
+    move-result-object p3
+
+    iget-object v0, p0, Lo0/g0/h/c;->d:Ljava/lang/reflect/Method;
+
+    const/4 v4, 0x0
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    aput-object p1, v1, v3
+
+    aput-object p3, v1, v2
+
+    invoke-virtual {v0, v4, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance p3, Ljava/lang/AssertionError;
+
+    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p3
+
+    :catch_1
+    move-exception p1
+
+    new-instance p3, Ljava/lang/AssertionError;
+
+    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p3
+.end method
+
+.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 4
+
+    const-string v0, "failed to get ALPN selected protocol"
+
+    const-string v1, "socket"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/h/c;->e:Ljava/lang/reflect/Method;
+
+    const/4 v2, 0x1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    aput-object p1, v2, v3
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v1, p1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-static {v1}, Ljava/lang/reflect/Proxy;->getInvocationHandler(Ljava/lang/Object;)Ljava/lang/reflect/InvocationHandler;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    check-cast v1, Lo0/g0/h/c$a;
+
+    iget-boolean v2, v1, Lo0/g0/h/c$a;->a:Z
+
+    if-nez v2, :cond_0
+
+    iget-object v2, v1, Lo0/g0/h/c$a;->b:Ljava/lang/String;
+
+    if-nez v2, :cond_0
+
+    sget-object v1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    const/4 v2, 0x4
+
+    const-string v3, "ALPN callback dropped: HTTP/2 is disabled. Is alpn-boot on the boot class path?"
+
+    invoke-virtual {v1, v2, v3, p1}, Lo0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
+
+    return-object p1
+
+    :cond_0
+    iget-boolean v2, v1, Lo0/g0/h/c$a;->a:Z
+
+    if-eqz v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object p1, v1, Lo0/g0/h/c$a;->b:Ljava/lang/String;
+
+    :goto_0
+    return-object p1
+
+    :cond_2
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type okhttp3.internal.platform.Jdk8WithJettyBootPlatform.AlpnProvider"
+
+    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/d.smali b/com.discord/smali_classes2/o0/g0/h/d.smali
new file mode 100644
index 0000000000..3d16682867
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/d.smali
@@ -0,0 +1,257 @@
+.class public final Lo0/g0/h/d;
+.super Lo0/g0/h/f;
+.source "Jdk9Platform.kt"
+
+
+# instance fields
+.field public final d:Ljava/lang/reflect/Method;
+
+.field public final e:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
+    .locals 1
+
+    const-string v0, "setProtocolMethod"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "getProtocolMethod"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lo0/g0/h/f;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/d;->d:Ljava/lang/reflect/Method;
+
+    iput-object p2, p0, Lo0/g0/h/d;->e:Ljava/lang/reflect/Method;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p2, "failed to set SSL parameters"
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocols"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getSSLParameters()Ljavax/net/ssl/SSLParameters;
+
+    move-result-object v1
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p3
+
+    :cond_0
+    :goto_0
+    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    move-object v5, v2
+
+    check-cast v5, Lo0/y;
+
+    sget-object v6, Lo0/y;->d:Lo0/y;
+
+    if-eq v5, v6, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :goto_1
+    if-eqz v3, :cond_0
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p3, Ljava/util/ArrayList;
+
+    const/16 v2, 0xa
+
+    invoke-static {v0, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v2
+
+    invoke-direct {p3, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lo0/y;
+
+    iget-object v2, v2, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-virtual {p3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_3
+    iget-object v0, p0, Lo0/g0/h/d;->d:Ljava/lang/reflect/Method;
+
+    new-array v2, v3, [Ljava/lang/Object;
+
+    new-array v3, v4, [Ljava/lang/String;
+
+    invoke-virtual {p3, v3}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p3
+
+    if-eqz p3, :cond_4
+
+    aput-object p3, v2, v4
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-virtual {p1, v1}, Ljavax/net/ssl/SSLSocket;->setSSLParameters(Ljavax/net/ssl/SSLParameters;)V
+
+    return-void
+
+    :cond_4
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p3, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p3}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance p3, Ljava/lang/AssertionError;
+
+    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p3
+
+    :catch_1
+    move-exception p1
+
+    new-instance p3, Ljava/lang/AssertionError;
+
+    invoke-direct {p3, p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p3
+.end method
+
+.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "failed to get ALPN selected protocol"
+
+    const-string v1, "socket"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v1, p0, Lo0/g0/h/d;->e:Ljava/lang/reflect/Method;
+
+    const/4 v2, 0x0
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-virtual {v1, p1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, ""
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+    :try_end_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eqz v0, :cond_1
+
+    :goto_0
+    const/4 p1, 0x0
+
+    :cond_1
+    return-object p1
+
+    :catch_0
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    move-exception p1
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1, v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/e.smali b/com.discord/smali_classes2/o0/g0/h/e.smali
new file mode 100644
index 0000000000..cfa8a13740
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/e.smali
@@ -0,0 +1,370 @@
+.class public final Lo0/g0/h/e;
+.super Lo0/g0/h/f;
+.source "OpenJSSEPlatform.kt"
+
+
+# static fields
+.field public static final e:Z
+
+.field public static final f:Lo0/g0/h/e;
+
+
+# instance fields
+.field public final d:Ljava/security/Provider;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    :try_start_0
+    const-string v0, "org.openjsse.net.ssl.OpenJSSE"
+
+    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :catch_0
+    const/4 v0, 0x0
+
+    :goto_0
+    sput-boolean v0, Lo0/g0/h/e;->e:Z
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lo0/g0/h/f;-><init>()V
+
+    new-instance v0, Lorg/openjsse/net/ssl/OpenJSSE;
+
+    invoke-direct {v0}, Lorg/openjsse/net/ssl/OpenJSSE;-><init>()V
+
+    check-cast v0, Ljava/security/Provider;
+
+    iput-object v0, p0, Lo0/g0/h/e;->d:Ljava/security/Provider;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p2, "sslSocket"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocols"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v1, p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
+
+    if-eqz v1, :cond_5
+
+    check-cast p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
+
+    invoke-virtual {p1}, Lorg/openjsse/javax/net/ssl/SSLSocket;->getSSLParameters()Ljavax/net/ssl/SSLParameters;
+
+    move-result-object p2
+
+    instance-of v1, p2, Lorg/openjsse/javax/net/ssl/SSLParameters;
+
+    if-eqz v1, :cond_6
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p3
+
+    :cond_0
+    :goto_0
+    invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v3, v1
+
+    check-cast v3, Lo0/y;
+
+    sget-object v4, Lo0/y;->d:Lo0/y;
+
+    if-eq v3, v4, :cond_1
+
+    const/4 v2, 0x1
+
+    :cond_1
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p3, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {p3, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lo0/y;
+
+    iget-object v1, v1, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-virtual {p3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_3
+    move-object v0, p2
+
+    check-cast v0, Lorg/openjsse/javax/net/ssl/SSLParameters;
+
+    new-array v1, v2, [Ljava/lang/String;
+
+    invoke-virtual {p3, v1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p3
+
+    if-eqz p3, :cond_4
+
+    check-cast p3, [Ljava/lang/String;
+
+    invoke-virtual {v0, p3}, Lorg/openjsse/javax/net/ssl/SSLParameters;->setApplicationProtocols([Ljava/lang/String;)V
+
+    invoke-virtual {p1, p2}, Lorg/openjsse/javax/net/ssl/SSLSocket;->setSSLParameters(Ljavax/net/ssl/SSLParameters;)V
+
+    goto :goto_2
+
+    :cond_4
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_6
+    :goto_2
+    return-void
+.end method
+
+.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lorg/openjsse/javax/net/ssl/SSLSocket;
+
+    invoke-virtual {p1}, Lorg/openjsse/javax/net/ssl/SSLSocket;->getApplicationProtocol()Ljava/lang/String;
+
+    move-result-object p1
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, ""
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    goto :goto_0
+
+    :cond_1
+    invoke-super {p0, p1}, Lo0/g0/h/f;->h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+
+    :goto_0
+    const/4 p1, 0x0
+
+    :cond_2
+    return-object p1
+.end method
+
+.method public m()Ljavax/net/ssl/SSLContext;
+    .locals 2
+
+    iget-object v0, p0, Lo0/g0/h/e;->d:Ljava/security/Provider;
+
+    const-string v1, "TLSv1.3"
+
+    invoke-static {v1, v0}, Ljavax/net/ssl/SSLContext;->getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljavax/net/ssl/SSLContext;
+
+    move-result-object v0
+
+    const-string v1, "SSLContext.getInstance(\"TLSv1.3\", provider)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public n()Ljavax/net/ssl/X509TrustManager;
+    .locals 4
+
+    invoke-static {}, Ljavax/net/ssl/TrustManagerFactory;->getDefaultAlgorithm()Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/h/e;->d:Ljava/security/Provider;
+
+    invoke-static {v0, v1}, Ljavax/net/ssl/TrustManagerFactory;->getInstance(Ljava/lang/String;Ljava/security/Provider;)Ljavax/net/ssl/TrustManagerFactory;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
+
+    const-string v2, "factory"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljavax/net/ssl/TrustManagerFactory;->getTrustManagers()[Ljavax/net/ssl/TrustManager;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_3
+
+    array-length v1, v0
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-ne v1, v2, :cond_0
+
+    aget-object v1, v0, v3
+
+    instance-of v1, v1, Ljavax/net/ssl/X509TrustManager;
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_2
+
+    aget-object v0, v0, v3
+
+    if-eqz v0, :cond_1
+
+    check-cast v0, Ljavax/net/ssl/X509TrustManager;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type javax.net.ssl.X509TrustManager"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    const-string v1, "Unexpected default trust managers: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-static {v0}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "java.util.Arrays.toString(this)"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/f$a.smali b/com.discord/smali_classes2/o0/g0/h/f$a.smali
new file mode 100644
index 0000000000..72aa603632
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/f$a.smali
@@ -0,0 +1,188 @@
+.class public final Lo0/g0/h/f$a;
+.super Ljava/lang/Object;
+.source "Platform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/h/f;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/util/List;)Ljava/util/List;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "protocols"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_0
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v2, v1
+
+    check-cast v2, Lo0/y;
+
+    sget-object v3, Lo0/y;->d:Lo0/y;
+
+    if-eq v2, v3, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p1, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {v0, v1}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {p1, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lo0/y;
+
+    iget-object v1, v1, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_3
+    return-object p1
+.end method
+
+.method public final b(Ljava/util/List;)[B
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)[B"
+        }
+    .end annotation
+
+    const-string v0, "protocols"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lp0/e;
+
+    invoke-direct {v0}, Lp0/e;-><init>()V
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/f$a;->a(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/util/ArrayList;
+
+    invoke-virtual {p1}, Ljava/util/ArrayList;->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, Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Lp0/e;->I(I)Lp0/e;
+
+    invoke-virtual {v0, v1}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
+
+    goto :goto_0
+
+    :cond_0
+    iget-wide v1, v0, Lp0/e;->e:J
+
+    invoke-virtual {v0, v1, v2}, Lp0/e;->t0(J)[B
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/f.smali b/com.discord/smali_classes2/o0/g0/h/f.smali
new file mode 100644
index 0000000000..738c5af1fb
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/f.smali
@@ -0,0 +1,725 @@
+.class public Lo0/g0/h/f;
+.super Ljava/lang/Object;
+.source "Platform.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/h/f$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static volatile a:Lo0/g0/h/f;
+
+.field public static final b:Ljava/util/logging/Logger;
+
+.field public static final c:Lo0/g0/h/f$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 12
+
+    new-instance v0, Lo0/g0/h/f$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/g0/h/f$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    if-eqz v0, :cond_9
+
+    sget-object v0, Lo0/g0/h/a;->g:Lo0/g0/h/a$b;
+
+    sget-boolean v0, Lo0/g0/h/a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lo0/g0/h/a;
+
+    invoke-direct {v0}, Lo0/g0/h/a;-><init>()V
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    goto/16 :goto_5
+
+    :cond_1
+    invoke-static {}, Ljava/security/Security;->getProviders()[Ljava/security/Provider;
+
+    move-result-object v0
+
+    const/4 v2, 0x0
+
+    aget-object v0, v0, v2
+
+    const-string v3, "Security.getProviders()[0]"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/security/Provider;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v4, "Conscrypt"
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    sget-object v0, Lo0/g0/h/b;->f:Lo0/g0/h/b$a;
+
+    sget-boolean v0, Lo0/g0/h/b;->e:Z
+
+    if-eqz v0, :cond_2
+
+    new-instance v0, Lo0/g0/h/b;
+
+    invoke-direct {v0}, Lo0/g0/h/b;-><init>()V
+
+    goto :goto_1
+
+    :cond_2
+    move-object v0, v1
+
+    :goto_1
+    if-eqz v0, :cond_3
+
+    goto/16 :goto_5
+
+    :cond_3
+    invoke-static {}, Ljava/security/Security;->getProviders()[Ljava/security/Provider;
+
+    move-result-object v0
+
+    aget-object v0, v0, v2
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/security/Provider;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v3, "OpenJSSE"
+
+    invoke-static {v3, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    sget-object v0, Lo0/g0/h/e;->f:Lo0/g0/h/e;
+
+    sget-boolean v0, Lo0/g0/h/e;->e:Z
+
+    if-eqz v0, :cond_4
+
+    new-instance v0, Lo0/g0/h/e;
+
+    invoke-direct {v0}, Lo0/g0/h/e;-><init>()V
+
+    goto :goto_2
+
+    :cond_4
+    move-object v0, v1
+
+    :goto_2
+    if-eqz v0, :cond_5
+
+    goto/16 :goto_5
+
+    :cond_5
+    const/4 v0, 0x1
+
+    :try_start_0
+    const-class v3, Ljavax/net/ssl/SSLParameters;
+
+    const-string v4, "setApplicationProtocols"
+
+    new-array v5, v0, [Ljava/lang/Class;
+
+    const-class v6, [Ljava/lang/String;
+
+    aput-object v6, v5, v2
+
+    invoke-virtual {v3, v4, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v3
+
+    const-class v4, Ljavax/net/ssl/SSLSocket;
+
+    const-string v5, "getApplicationProtocol"
+
+    new-array v6, v2, [Ljava/lang/Class;
+
+    invoke-virtual {v4, v5, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v4
+
+    new-instance v5, Lo0/g0/h/d;
+
+    const-string v6, "setProtocolMethod"
+
+    invoke-static {v3, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "getProtocolMethod"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v5, v3, v4}, Lo0/g0/h/d;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
+    :try_end_0
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_3
+
+    :catch_0
+    move-object v5, v1
+
+    :goto_3
+    if-eqz v5, :cond_6
+
+    move-object v0, v5
+
+    goto/16 :goto_5
+
+    :cond_6
+    const-string v3, "java.specification.version"
+
+    const-string v4, "unknown"
+
+    invoke-static {v3, v4}, Ljava/lang/System;->getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
+    :try_start_1
+    const-string v4, "jvmVersion"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v3}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v3
+    :try_end_1
+    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_1
+
+    const/16 v4, 0x9
+
+    if-lt v3, v4, :cond_7
+
+    goto :goto_4
+
+    :catch_1
+    :cond_7
+    const-string v3, "org.eclipse.jetty.alpn.ALPN"
+
+    :try_start_2
+    invoke-static {v3, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
+
+    move-result-object v3
+
+    const-string v4, "org.eclipse.jetty.alpn.ALPN$Provider"
+
+    invoke-static {v4, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    const-string v5, "org.eclipse.jetty.alpn.ALPN$ClientProvider"
+
+    invoke-static {v5, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
+
+    move-result-object v10
+
+    const-string v5, "org.eclipse.jetty.alpn.ALPN$ServerProvider"
+
+    invoke-static {v5, v0, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
+
+    move-result-object v11
+
+    const-string v5, "put"
+
+    const/4 v6, 0x2
+
+    new-array v6, v6, [Ljava/lang/Class;
+
+    const-class v7, Ljavax/net/ssl/SSLSocket;
+
+    aput-object v7, v6, v2
+
+    aput-object v4, v6, v0
+
+    invoke-virtual {v3, v5, v6}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v7
+
+    const-string v4, "get"
+
+    new-array v5, v0, [Ljava/lang/Class;
+
+    const-class v6, Ljavax/net/ssl/SSLSocket;
+
+    aput-object v6, v5, v2
+
+    invoke-virtual {v3, v4, v5}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v8
+
+    const-string v4, "remove"
+
+    new-array v0, v0, [Ljava/lang/Class;
+
+    const-class v5, Ljavax/net/ssl/SSLSocket;
+
+    aput-object v5, v0, v2
+
+    invoke-virtual {v3, v4, v0}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v9
+
+    new-instance v0, Lo0/g0/h/c;
+
+    const-string v2, "putMethod"
+
+    invoke-static {v7, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "getMethod"
+
+    invoke-static {v8, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "removeMethod"
+
+    invoke-static {v9, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "clientProviderClass"
+
+    invoke-static {v10, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "serverProviderClass"
+
+    invoke-static {v11, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v6, v0
+
+    invoke-direct/range {v6 .. v11}, Lo0/g0/h/c;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Class;)V
+    :try_end_2
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_2 .. :try_end_2} :catch_2
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_2 .. :try_end_2} :catch_2
+
+    move-object v1, v0
+
+    goto :goto_4
+
+    :catch_2
+    nop
+
+    :goto_4
+    if-eqz v1, :cond_8
+
+    move-object v0, v1
+
+    goto :goto_5
+
+    :cond_8
+    new-instance v0, Lo0/g0/h/f;
+
+    invoke-direct {v0}, Lo0/g0/h/f;-><init>()V
+
+    :goto_5
+    sput-object v0, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    const-class v0, Lo0/x;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/h/f;->b:Ljava/util/logging/Logger;
+
+    return-void
+
+    :cond_9
+    throw v1
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljavax/net/ssl/SSLSocket;)V
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public b(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/c;
+    .locals 1
+
+    const-string v0, "trustManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lo0/g0/j/a;
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/f;->c(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/e;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Lo0/g0/j/a;-><init>(Lo0/g0/j/e;)V
+
+    return-object v0
+.end method
+
+.method public c(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/e;
+    .locals 2
+
+    const-string v0, "trustManager"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lo0/g0/j/b;
+
+    invoke-interface {p1}, Ljavax/net/ssl/X509TrustManager;->getAcceptedIssuers()[Ljava/security/cert/X509Certificate;
+
+    move-result-object p1
+
+    const-string v1, "trustManager.acceptedIssuers"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v1, p1
+
+    invoke-static {p1, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ljava/security/cert/X509Certificate;
+
+    invoke-direct {v0, p1}, Lo0/g0/j/b;-><init>([Ljava/security/cert/X509Certificate;)V
+
+    return-object v0
+.end method
+
+.method public d(Ljavax/net/ssl/SSLSocketFactory;)V
+    .locals 1
+
+    const-string v0, "socketFactory"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public e(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string p2, "sslSocket"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "protocols"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public f(Ljavax/net/ssl/X509TrustManager;)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public g(Ljava/net/Socket;Ljava/net/InetSocketAddress;I)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "socket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "address"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, p2, p3}, Ljava/net/Socket;->connect(Ljava/net/SocketAddress;I)V
+
+    return-void
+.end method
+
+.method public h(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public i(Ljava/lang/String;)Ljava/lang/Object;
+    .locals 2
+
+    const-string v0, "closer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lo0/g0/h/f;->b:Ljava/util/logging/Logger;
+
+    sget-object v1, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
+
+    invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->isLoggable(Ljava/util/logging/Level;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ljava/lang/Throwable;
+
+    invoke-direct {v0, p1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public j(Ljava/lang/String;)Z
+    .locals 1
+
+    const-string v0, "hostname"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public k(ILjava/lang/String;Ljava/lang/Throwable;)V
+    .locals 1
+
+    const-string v0, "message"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x5
+
+    if-ne p1, v0, :cond_0
+
+    sget-object p1, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
+
+    goto :goto_0
+
+    :cond_0
+    sget-object p1, Ljava/util/logging/Level;->INFO:Ljava/util/logging/Level;
+
+    :goto_0
+    sget-object v0, Lo0/g0/h/f;->b:Ljava/util/logging/Logger;
+
+    invoke-virtual {v0, p1, p2, p3}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public l(Ljava/lang/String;Ljava/lang/Object;)V
+    .locals 1
+
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-nez p2, :cond_0
+
+    const-string v0, " To see where this was allocated, set the OkHttpClient logger level to FINE: Logger.getLogger(OkHttpClient.class.getName()).setLevel(Level.FINE);"
+
+    invoke-static {p1, v0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    :cond_0
+    const/4 v0, 0x5
+
+    check-cast p2, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, v0, p1, p2}, Lo0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public m()Ljavax/net/ssl/SSLContext;
+    .locals 2
+
+    const-string v0, "TLS"
+
+    invoke-static {v0}, Ljavax/net/ssl/SSLContext;->getInstance(Ljava/lang/String;)Ljavax/net/ssl/SSLContext;
+
+    move-result-object v0
+
+    const-string v1, "SSLContext.getInstance(\"TLS\")"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public n()Ljavax/net/ssl/X509TrustManager;
+    .locals 4
+
+    invoke-static {}, Ljavax/net/ssl/TrustManagerFactory;->getDefaultAlgorithm()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljavax/net/ssl/TrustManagerFactory;->getInstance(Ljava/lang/String;)Ljavax/net/ssl/TrustManagerFactory;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
+
+    const-string v2, "factory"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljavax/net/ssl/TrustManagerFactory;->getTrustManagers()[Ljavax/net/ssl/TrustManager;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_3
+
+    array-length v1, v0
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-ne v1, v2, :cond_0
+
+    aget-object v1, v0, v3
+
+    instance-of v1, v1, Ljavax/net/ssl/X509TrustManager;
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_2
+
+    aget-object v0, v0, v3
+
+    if-eqz v0, :cond_1
+
+    check-cast v0, Ljavax/net/ssl/X509TrustManager;
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type javax.net.ssl.X509TrustManager"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    const-string v1, "Unexpected default trust managers: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-static {v0}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "java.util.Arrays.toString(this)"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "javaClass.simpleName"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/g/a.smali b/com.discord/smali_classes2/o0/g0/h/g/a.smali
new file mode 100644
index 0000000000..7ef0b54c8b
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/g/a.smali
@@ -0,0 +1,310 @@
+.class public Lo0/g0/h/g/a;
+.super Ljava/lang/Object;
+.source "AndroidSocketAdapter.kt"
+
+# interfaces
+.implements Lo0/g0/h/g/e;
+
+
+# instance fields
+.field public final a:Ljava/lang/reflect/Method;
+
+.field public final b:Ljava/lang/reflect/Method;
+
+.field public final c:Ljava/lang/reflect/Method;
+
+.field public final d:Ljava/lang/reflect/Method;
+
+.field public final e:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "-",
+            "Ljavax/net/ssl/SSLSocket;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "-",
+            "Ljavax/net/ssl/SSLSocket;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "sslSocketClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/g/a;->e:Ljava/lang/Class;
+
+    const/4 v0, 0x1
+
+    new-array v1, v0, [Ljava/lang/Class;
+
+    sget-object v2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    const-string v2, "setUseSessionTickets"
+
+    invoke-virtual {p1, v2, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    const-string v1, "sslSocketClass.getDeclar\u2026:class.javaPrimitiveType)"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/g0/h/g/a;->a:Ljava/lang/reflect/Method;
+
+    iget-object p1, p0, Lo0/g0/h/g/a;->e:Ljava/lang/Class;
+
+    new-array v1, v0, [Ljava/lang/Class;
+
+    const-class v2, Ljava/lang/String;
+
+    aput-object v2, v1, v3
+
+    const-string v2, "setHostname"
+
+    invoke-virtual {p1, v2, v1}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/g0/h/g/a;->b:Ljava/lang/reflect/Method;
+
+    iget-object p1, p0, Lo0/g0/h/g/a;->e:Ljava/lang/Class;
+
+    new-array v1, v3, [Ljava/lang/Class;
+
+    const-string v2, "getAlpnSelectedProtocol"
+
+    invoke-virtual {p1, v2, v1}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/g0/h/g/a;->c:Ljava/lang/reflect/Method;
+
+    iget-object p1, p0, Lo0/g0/h/g/a;->e:Ljava/lang/Class;
+
+    new-array v0, v0, [Ljava/lang/Class;
+
+    const-class v1, [B
+
+    aput-object v1, v0, v3
+
+    const-string v1, "setAlpnProtocols"
+
+    invoke-virtual {p1, v1, v0}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/g0/h/g/a;->d:Ljava/lang/reflect/Method;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 1
+
+    sget-object v0, Lo0/g0/h/a;->g:Lo0/g0/h/a$b;
+
+    sget-boolean v0, Lo0/g0/h/a;->f:Z
+
+    return v0
+.end method
+
+.method public b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/g/a;->c(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return-object v1
+
+    :cond_0
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/h/g/a;->c:Ljava/lang/reflect/Method;
+
+    const/4 v2, 0x0
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-virtual {v0, p1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [B
+
+    if-eqz p1, :cond_1
+
+    sget-object v0, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+
+    const-string v1, "StandardCharsets.UTF_8"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Ljava/lang/String;
+
+    invoke-direct {v1, p1, v0}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
+    :try_end_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :cond_1
+    return-object v1
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+.end method
+
+.method public c(Ljavax/net/ssl/SSLSocket;)Z
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/h/g/a;->e:Ljava/lang/Class;
+
+    invoke-virtual {v0, p1}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocols"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/g/a;->c(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    if-eqz p2, :cond_0
+
+    :try_start_0
+    iget-object v2, p0, Lo0/g0/h/g/a;->a:Ljava/lang/reflect/Method;
+
+    new-array v3, v1, [Ljava/lang/Object;
+
+    sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    aput-object v4, v3, v0
+
+    invoke-virtual {v2, p1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    iget-object v2, p0, Lo0/g0/h/g/a;->b:Ljava/lang/reflect/Method;
+
+    new-array v3, v1, [Ljava/lang/Object;
+
+    aput-object p2, v3, v0
+
+    invoke-virtual {v2, p1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    iget-object p2, p0, Lo0/g0/h/g/a;->d:Ljava/lang/reflect/Method;
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    sget-object v2, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    invoke-virtual {v2, p3}, Lo0/g0/h/f$a;->b(Ljava/util/List;)[B
+
+    move-result-object p3
+
+    aput-object p3, v1, v0
+
+    invoke-virtual {p2, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance p2, Ljava/lang/AssertionError;
+
+    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p2
+
+    :catch_1
+    move-exception p1
+
+    new-instance p2, Ljava/lang/AssertionError;
+
+    invoke-direct {p2, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p2
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/g/b.smali b/com.discord/smali_classes2/o0/g0/h/g/b.smali
new file mode 100644
index 0000000000..a4e197151a
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/g/b.smali
@@ -0,0 +1,27 @@
+.class public final Lo0/g0/h/g/b;
+.super Ljava/lang/Object;
+.source "CloseGuard.kt"
+
+
+# instance fields
+.field public final a:Ljava/lang/reflect/Method;
+
+.field public final b:Ljava/lang/reflect/Method;
+
+.field public final c:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/g/b;->a:Ljava/lang/reflect/Method;
+
+    iput-object p2, p0, Lo0/g0/h/g/b;->b:Ljava/lang/reflect/Method;
+
+    iput-object p3, p0, Lo0/g0/h/g/b;->c:Ljava/lang/reflect/Method;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/g/c.smali b/com.discord/smali_classes2/o0/g0/h/g/c.smali
new file mode 100644
index 0000000000..142c63ed78
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/g/c.smali
@@ -0,0 +1,159 @@
+.class public final Lo0/g0/h/g/c;
+.super Ljava/lang/Object;
+.source "ConscryptSocketAdapter.kt"
+
+# interfaces
+.implements Lo0/g0/h/g/e;
+
+
+# static fields
+.field public static final a:Lo0/g0/h/g/c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/g0/h/g/c;
+
+    invoke-direct {v0}, Lo0/g0/h/g/c;-><init>()V
+
+    sput-object v0, Lo0/g0/h/g/c;->a:Lo0/g0/h/g/c;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 1
+
+    sget-object v0, Lo0/g0/h/b;->f:Lo0/g0/h/b$a;
+
+    sget-boolean v0, Lo0/g0/h/b;->e:Z
+
+    return v0
+.end method
+
+.method public b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/g/c;->c(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->getApplicationProtocol(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public c(Ljavax/net/ssl/SSLSocket;)Z
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lorg/conscrypt/Conscrypt;->isConscrypt(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocols"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/g/c;->c(Ljavax/net/ssl/SSLSocket;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    if-eqz p2, :cond_0
+
+    const/4 v0, 0x1
+
+    invoke-static {p1, v0}, Lorg/conscrypt/Conscrypt;->setUseSessionTickets(Ljavax/net/ssl/SSLSocket;Z)V
+
+    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setHostname(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;)V
+
+    :cond_0
+    sget-object p2, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    invoke-virtual {p2, p3}, Lo0/g0/h/f$a;->a(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p2
+
+    const/4 p3, 0x0
+
+    new-array p3, p3, [Ljava/lang/String;
+
+    check-cast p2, Ljava/util/ArrayList;
+
+    invoke-virtual {p2, p3}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_1
+
+    check-cast p2, [Ljava/lang/String;
+
+    invoke-static {p1, p2}, Lorg/conscrypt/Conscrypt;->setApplicationProtocols(Ljavax/net/ssl/SSLSocket;[Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/g/d.smali b/com.discord/smali_classes2/o0/g0/h/g/d.smali
new file mode 100644
index 0000000000..de54b1b1f9
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/g/d.smali
@@ -0,0 +1,250 @@
+.class public final Lo0/g0/h/g/d;
+.super Ljava/lang/Object;
+.source "DeferredSocketAdapter.kt"
+
+# interfaces
+.implements Lo0/g0/h/g/e;
+
+
+# instance fields
+.field public a:Z
+
+.field public b:Lo0/g0/h/g/e;
+
+.field public final c:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 1
+
+    const-string v0, "socketPackage"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/h/g/d;->c:Ljava/lang/String;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/g/d;->e(Ljavax/net/ssl/SSLSocket;)Lo0/g0/h/g/e;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p1}, Lo0/g0/h/g/e;->b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public c(Ljavax/net/ssl/SSLSocket;)Z
+    .locals 3
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "sslSocket.javaClass.name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/h/g/d;->c:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "sslSocket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "protocols"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0, p1}, Lo0/g0/h/g/d;->e(Ljavax/net/ssl/SSLSocket;)Lo0/g0/h/g/e;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p1, p2, p3}, Lo0/g0/h/g/e;->d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public final declared-synchronized e(Ljavax/net/ssl/SSLSocket;)Lo0/g0/h/g/e;
+    .locals 5
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/h/g/d;->a:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_1
+
+    const/4 v0, 0x1
+
+    :try_start_1
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v3, p0, Lo0/g0/h/g/d;->c:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, ".OpenSSLSocketImpl"
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    xor-int/2addr v1, v0
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
+
+    move-result-object p1
+
+    const-string v1, "possibleClass.superclass"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Lo0/g0/h/g/a;
+
+    invoke-direct {v1, p1}, Lo0/g0/h/g/a;-><init>(Ljava/lang/Class;)V
+
+    iput-object v1, p0, Lo0/g0/h/g/d;->b:Lo0/g0/h/g/e;
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception p1
+
+    :try_start_2
+    sget-object v1, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    const/4 v2, 0x5
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "Failed to initialize DeferredSocketAdapter "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v4, p0, Lo0/g0/h/g/d;->c:Ljava/lang/String;
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v2, v3, p1}, Lo0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
+
+    :goto_1
+    iput-boolean v0, p0, Lo0/g0/h/g/d;->a:Z
+
+    :cond_1
+    iget-object p1, p0, Lo0/g0/h/g/d;->b:Lo0/g0/h/g/e;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    monitor-exit p0
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/g/e.smali b/com.discord/smali_classes2/o0/g0/h/g/e.smali
new file mode 100644
index 0000000000..23ced0e8b3
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/g/e.smali
@@ -0,0 +1,28 @@
+.class public interface abstract Lo0/g0/h/g/e;
+.super Ljava/lang/Object;
+.source "SocketAdapter.kt"
+
+
+# virtual methods
+.method public abstract a()Z
+.end method
+
+.method public abstract b(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+.end method
+
+.method public abstract c(Ljavax/net/ssl/SSLSocket;)Z
+.end method
+
+.method public abstract d(Ljavax/net/ssl/SSLSocket;Ljava/lang/String;Ljava/util/List;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljavax/net/ssl/SSLSocket;",
+            "Ljava/lang/String;",
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;)V"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/g/f$a.smali b/com.discord/smali_classes2/o0/g0/h/g/f$a.smali
new file mode 100644
index 0000000000..f9a5c06bc7
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/g/f$a.smali
@@ -0,0 +1,24 @@
+.class public final Lo0/g0/h/g/f$a;
+.super Ljava/lang/Object;
+.source "StandardAndroidSocketAdapter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/h/g/f;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/h/g/f.smali b/com.discord/smali_classes2/o0/g0/h/g/f.smali
new file mode 100644
index 0000000000..b832324a1a
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/h/g/f.smali
@@ -0,0 +1,66 @@
+.class public final Lo0/g0/h/g/f;
+.super Lo0/g0/h/g/a;
+.source "StandardAndroidSocketAdapter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/h/g/f$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:Lo0/g0/h/g/f$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lo0/g0/h/g/f$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/g0/h/g/f$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/g0/h/g/f;->f:Lo0/g0/h/g/f$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "-",
+            "Ljavax/net/ssl/SSLSocket;",
+            ">;",
+            "Ljava/lang/Class<",
+            "-",
+            "Ljavax/net/ssl/SSLSocketFactory;",
+            ">;",
+            "Ljava/lang/Class<",
+            "*>;)V"
+        }
+    .end annotation
+
+    const-string v0, "sslSocketClass"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sslSocketFactoryClass"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p2, "paramClass"
+
+    invoke-static {p3, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lo0/g0/h/g/a;-><init>(Ljava/lang/Class;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/i/a.smali b/com.discord/smali_classes2/o0/g0/i/a.smali
new file mode 100644
index 0000000000..9573b64318
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/i/a.smali
@@ -0,0 +1,74 @@
+.class public final Lo0/g0/i/a;
+.super Ljava/net/ProxySelector;
+.source "NullProxySelector.kt"
+
+
+# static fields
+.field public static final a:Lo0/g0/i/a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/g0/i/a;
+
+    invoke-direct {v0}, Lo0/g0/i/a;-><init>()V
+
+    sput-object v0, Lo0/g0/i/a;->a:Lo0/g0/i/a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/net/ProxySelector;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public connectFailed(Ljava/net/URI;Ljava/net/SocketAddress;Ljava/io/IOException;)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public select(Ljava/net/URI;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/net/URI;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/net/Proxy;",
+            ">;"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_0
+
+    sget-object p1, Ljava/net/Proxy;->NO_PROXY:Ljava/net/Proxy;
+
+    invoke-static {p1}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "uri must not be null"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/j/a.smali b/com.discord/smali_classes2/o0/g0/j/a.smali
new file mode 100644
index 0000000000..4fb8e9b662
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/j/a.smali
@@ -0,0 +1,332 @@
+.class public final Lo0/g0/j/a;
+.super Lo0/g0/j/c;
+.source "BasicCertificateChainCleaner.kt"
+
+
+# instance fields
+.field public final a:Lo0/g0/j/e;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/j/e;)V
+    .locals 1
+
+    const-string v0, "trustRootIndex"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lo0/g0/j/c;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/j/a;->a:Lo0/g0/j/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/security/cert/Certificate;",
+            ">;",
+            "Ljava/lang/String;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/security/cert/Certificate;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljavax/net/ssl/SSLPeerUnverifiedException;
+        }
+    .end annotation
+
+    const-string v0, "chain"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "hostname"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Ljava/util/ArrayDeque;
+
+    invoke-direct {p2, p1}, Ljava/util/ArrayDeque;-><init>(Ljava/util/Collection;)V
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p2}, Ljava/util/Deque;->removeFirst()Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v1, "queue.removeFirst()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    const/16 v2, 0x9
+
+    if-ge v0, v2, :cond_9
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    sub-int/2addr v2, v3
+
+    invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    const-string v4, "null cannot be cast to non-null type java.security.cert.X509Certificate"
+
+    if-eqz v2, :cond_8
+
+    check-cast v2, Ljava/security/cert/X509Certificate;
+
+    iget-object v5, p0, Lo0/g0/j/a;->a:Lo0/g0/j/e;
+
+    invoke-interface {v5, v2}, Lo0/g0/j/e;->a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_3
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    if-gt v1, v3, :cond_0
+
+    invoke-static {v2, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    xor-int/2addr v1, v3
+
+    if-eqz v1, :cond_1
+
+    :cond_0
+    invoke-interface {p1, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_1
+    invoke-virtual {p0, v5, v5}, Lo0/g0/j/a;->b(Ljava/security/cert/X509Certificate;Ljava/security/cert/X509Certificate;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    return-object p1
+
+    :cond_2
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    invoke-interface {p2}, Ljava/util/Deque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    const-string v5, "queue.iterator()"
+
+    invoke-static {v3, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_4
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_5
+
+    check-cast v5, Ljava/security/cert/X509Certificate;
+
+    invoke-virtual {p0, v2, v5}, Lo0/g0/j/a;->b(Ljava/security/cert/X509Certificate;Ljava/security/cert/X509Certificate;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_4
+
+    invoke-interface {v3}, Ljava/util/Iterator;->remove()V
+
+    invoke-interface {p1, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :goto_1
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    new-instance p1, Lkotlin/TypeCastException;
+
+    invoke-direct {p1, v4}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    if-eqz v1, :cond_7
+
+    return-object p1
+
+    :cond_7
+    new-instance p1, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "Failed to find a trusted cert that signed "
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_8
+    new-instance p1, Lkotlin/TypeCastException;
+
+    invoke-direct {p1, v4}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_9
+    new-instance p2, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "Certificate chain too long: "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final b(Ljava/security/cert/X509Certificate;Ljava/security/cert/X509Certificate;)Z
+    .locals 3
+
+    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getIssuerDN()Ljava/security/Principal;
+
+    move-result-object v0
+
+    invoke-virtual {p2}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_0
+
+    return v2
+
+    :cond_0
+    :try_start_0
+    invoke-virtual {p2}, Ljava/security/cert/X509Certificate;->getPublicKey()Ljava/security/PublicKey;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Ljava/security/cert/X509Certificate;->verify(Ljava/security/PublicKey;)V
+    :try_end_0
+    .catch Ljava/security/GeneralSecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v1, p1, Lo0/g0/j/a;
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lo0/g0/j/a;
+
+    iget-object p1, p1, Lo0/g0/j/a;->a:Lo0/g0/j/e;
+
+    iget-object v1, p0, Lo0/g0/j/a;->a:Lo0/g0/j/e;
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/j/a;->a:Lo0/g0/j/e;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/j/b.smali b/com.discord/smali_classes2/o0/g0/j/b.smali
new file mode 100644
index 0000000000..cfa05993f0
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/j/b.smali
@@ -0,0 +1,199 @@
+.class public final Lo0/g0/j/b;
+.super Ljava/lang/Object;
+.source "BasicTrustRootIndex.kt"
+
+# interfaces
+.implements Lo0/g0/j/e;
+
+
+# instance fields
+.field public final a:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljavax/security/auth/x500/X500Principal;",
+            "Ljava/util/Set<",
+            "Ljava/security/cert/X509Certificate;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public varargs constructor <init>([Ljava/security/cert/X509Certificate;)V
+    .locals 6
+
+    const-string v0, "caCerts"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+
+    array-length v1, p1
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    aget-object v3, p1, v2
+
+    invoke-virtual {v3}, Ljava/security/cert/X509Certificate;->getSubjectX500Principal()Ljavax/security/auth/x500/X500Principal;
+
+    move-result-object v4
+
+    const-string v5, "caCert.subjectX500Principal"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-nez v5, :cond_0
+
+    new-instance v5, Ljava/util/LinkedHashSet;
+
+    invoke-direct {v5}, Ljava/util/LinkedHashSet;-><init>()V
+
+    invoke-interface {v0, v4, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    check-cast v5, Ljava/util/Set;
+
+    invoke-interface {v5, v3}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    iput-object v0, p0, Lo0/g0/j/b;->a:Ljava/util/Map;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
+    .locals 4
+
+    const-string v0, "cert"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getIssuerX500Principal()Ljavax/security/auth/x500/X500Principal;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/j/b;->a:Ljava/util/Map;
+
+    invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/Set;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    move-object v3, v2
+
+    check-cast v3, Ljava/security/cert/X509Certificate;
+
+    :try_start_0
+    invoke-virtual {v3}, Ljava/security/cert/X509Certificate;->getPublicKey()Ljava/security/PublicKey;
+
+    move-result-object v3
+
+    invoke-virtual {p1, v3}, Ljava/security/cert/X509Certificate;->verify(Ljava/security/PublicKey;)V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :catch_0
+    const/4 v3, 0x0
+
+    :goto_0
+    if-eqz v3, :cond_0
+
+    move-object v1, v2
+
+    :cond_1
+    check-cast v1, Ljava/security/cert/X509Certificate;
+
+    :cond_2
+    return-object v1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eq p1, p0, :cond_1
+
+    instance-of v0, p1, Lo0/g0/j/b;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/g0/j/b;
+
+    iget-object p1, p1, Lo0/g0/j/b;->a:Ljava/util/Map;
+
+    iget-object v0, p0, Lo0/g0/j/b;->a:Ljava/util/Map;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    :goto_1
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/j/b;->a:Ljava/util/Map;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/j/c.smali b/com.discord/smali_classes2/o0/g0/j/c.smali
new file mode 100644
index 0000000000..3bebbd6ed6
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/j/c.smali
@@ -0,0 +1,38 @@
+.class public abstract Lo0/g0/j/c;
+.super Ljava/lang/Object;
+.source "CertificateChainCleaner.kt"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/security/cert/Certificate;",
+            ">;",
+            "Ljava/lang/String;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/security/cert/Certificate;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljavax/net/ssl/SSLPeerUnverifiedException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/j/d.smali b/com.discord/smali_classes2/o0/g0/j/d.smali
new file mode 100644
index 0000000000..bdeb51cc62
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/j/d.smali
@@ -0,0 +1,537 @@
+.class public final Lo0/g0/j/d;
+.super Ljava/lang/Object;
+.source "OkHostnameVerifier.kt"
+
+# interfaces
+.implements Ljavax/net/ssl/HostnameVerifier;
+
+
+# static fields
+.field public static final a:Lo0/g0/j/d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/g0/j/d;
+
+    invoke-direct {v0}, Lo0/g0/j/d;-><init>()V
+
+    sput-object v0, Lo0/g0/j/d;->a:Lo0/g0/j/d;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/security/cert/X509Certificate;",
+            "I)",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    :try_start_0
+    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getSubjectAlternativeNames()Ljava/util/Collection;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_0
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/util/List;
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v2
+
+    const/4 v3, 0x2
+
+    if-ge v2, v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v2, 0x0
+
+    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    xor-int/2addr v2, v3
+
+    if-eqz v2, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    invoke-interface {v1, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    check-cast v1, Ljava/lang/String;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_3
+    return-object v0
+
+    :cond_4
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
+    :try_end_0
+    .catch Ljava/security/cert/CertificateParsingException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p1
+
+    :catch_0
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object p1
+.end method
+
+.method public final b(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
+    .locals 12
+
+    const-string v0, "host"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "certificate"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lo0/g0/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x7
+
+    invoke-virtual {p0, p2, v0}, Lo0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
+
+    move-result-object p2
+
+    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto/16 :goto_6
+
+    :cond_0
+    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :cond_1
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_14
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    invoke-static {p1, v0, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    goto/16 :goto_7
+
+    :cond_2
+    sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const-string v3, "Locale.US"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "(this as java.lang.String).toLowerCase(locale)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x2
+
+    invoke-virtual {p0, p2, v4}, Lo0/g0/j/d;->a(Ljava/security/cert/X509Certificate;I)Ljava/util/List;
+
+    move-result-object p2
+
+    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_3
+
+    goto/16 :goto_6
+
+    :cond_3
+    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :cond_4
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_14
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/String;
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v6
+
+    if-nez v6, :cond_5
+
+    const/4 v6, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    const/4 v6, 0x0
+
+    :goto_0
+    if-nez v6, :cond_13
+
+    const-string v6, "."
+
+    invoke-static {p1, v6, v2, v4}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v7
+
+    if-nez v7, :cond_13
+
+    const-string v7, ".."
+
+    invoke-static {p1, v7, v2, v4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_6
+
+    goto/16 :goto_4
+
+    :cond_6
+    if-eqz v5, :cond_8
+
+    invoke-virtual {v5}, Ljava/lang/String;->length()I
+
+    move-result v8
+
+    if-nez v8, :cond_7
+
+    goto :goto_1
+
+    :cond_7
+    const/4 v8, 0x0
+
+    goto :goto_2
+
+    :cond_8
+    :goto_1
+    const/4 v8, 0x1
+
+    :goto_2
+    if-nez v8, :cond_13
+
+    invoke-static {v5, v6, v2, v4}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v8
+
+    if-nez v8, :cond_13
+
+    invoke-static {v5, v7, v2, v4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_9
+
+    goto/16 :goto_4
+
+    :cond_9
+    invoke-static {p1, v6, v2, v4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v7
+
+    if-nez v7, :cond_a
+
+    invoke-static {p1, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v7
+
+    goto :goto_3
+
+    :cond_a
+    move-object v7, p1
+
+    :goto_3
+    invoke-static {v5, v6, v2, v4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v8
+
+    if-nez v8, :cond_b
+
+    invoke-static {v5, v6}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v5
+
+    :cond_b
+    sget-object v6, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    invoke-static {v6, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz v5, :cond_12
+
+    invoke-virtual {v5, v6}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-static {v5, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "*"
+
+    invoke-static {v5, v6, v2, v4}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+
+    move-result v6
+
+    if-nez v6, :cond_c
+
+    invoke-static {v7, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    goto :goto_5
+
+    :cond_c
+    const-string v6, "*."
+
+    invoke-static {v5, v6, v2, v4}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_13
+
+    const/16 v8, 0x2a
+
+    const/4 v9, 0x4
+
+    invoke-static {v5, v8, v1, v2, v9}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v8
+
+    const/4 v10, -0x1
+
+    if-eq v8, v10, :cond_d
+
+    goto :goto_4
+
+    :cond_d
+    invoke-virtual {v7}, Ljava/lang/String;->length()I
+
+    move-result v8
+
+    invoke-virtual {v5}, Ljava/lang/String;->length()I
+
+    move-result v11
+
+    if-ge v8, v11, :cond_e
+
+    goto :goto_4
+
+    :cond_e
+    invoke-static {v6, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_f
+
+    goto :goto_4
+
+    :cond_f
+    invoke-virtual {v5, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {v5, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v7, v5, v2, v4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v6
+
+    if-nez v6, :cond_10
+
+    goto :goto_4
+
+    :cond_10
+    invoke-virtual {v7}, Ljava/lang/String;->length()I
+
+    move-result v6
+
+    invoke-virtual {v5}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    sub-int/2addr v6, v5
+
+    if-lez v6, :cond_11
+
+    const/16 v5, 0x2e
+
+    add-int/lit8 v6, v6, -0x1
+
+    invoke-static {v7, v5, v6, v2, v9}, Lk0/u/p;->lastIndexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v5
+
+    if-eq v5, v10, :cond_11
+
+    goto :goto_4
+
+    :cond_11
+    const/4 v5, 0x1
+
+    goto :goto_5
+
+    :cond_12
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_13
+    :goto_4
+    const/4 v5, 0x0
+
+    :goto_5
+    if-eqz v5, :cond_4
+
+    goto :goto_7
+
+    :cond_14
+    :goto_6
+    const/4 v1, 0x0
+
+    :goto_7
+    return v1
+.end method
+
+.method public verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
+    .locals 1
+
+    const-string v0, "host"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "session"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-interface {p2}, Ljavax/net/ssl/SSLSession;->getPeerCertificates()[Ljava/security/cert/Certificate;
+
+    move-result-object p2
+
+    aget-object p2, p2, v0
+
+    if-eqz p2, :cond_0
+
+    check-cast p2, Ljava/security/cert/X509Certificate;
+
+    invoke-virtual {p0, p1, p2}, Lo0/g0/j/d;->b(Ljava/lang/String;Ljava/security/cert/X509Certificate;)Z
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type java.security.cert.X509Certificate"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_0
+    .catch Ljavax/net/ssl/SSLException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    :goto_0
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/j/e.smali b/com.discord/smali_classes2/o0/g0/j/e.smali
new file mode 100644
index 0000000000..f089091fec
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/j/e.smali
@@ -0,0 +1,8 @@
+.class public interface abstract Lo0/g0/j/e;
+.super Ljava/lang/Object;
+.source "TrustRootIndex.kt"
+
+
+# virtual methods
+.method public abstract a(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509Certificate;
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/a$a.smali b/com.discord/smali_classes2/o0/g0/k/a$a.smali
new file mode 100644
index 0000000000..dff00e8422
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/a$a.smali
@@ -0,0 +1,65 @@
+.class public final Lo0/g0/k/a$a;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/g0/k/a;-><init>(Lo0/a0;Lokhttp3/WebSocketListener;Ljava/util/Random;J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lo0/g0/k/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/k/a;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/g0/k/a$a;->d:Lo0/g0/k/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 3
+
+    :goto_0
+    :try_start_0
+    iget-object v0, p0, Lo0/g0/k/a$a;->d:Lo0/g0/k/a;
+
+    invoke-virtual {v0}, Lo0/g0/k/a;->m()Z
+
+    move-result v0
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    iget-object v1, p0, Lo0/g0/k/a$a;->d:Lo0/g0/k/a;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v0, v2}, Lo0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/a$b.smali b/com.discord/smali_classes2/o0/g0/k/a$b.smali
new file mode 100644
index 0000000000..c81dcdfff5
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/a$b.smali
@@ -0,0 +1,61 @@
+.class public final Lo0/g0/k/a$b;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/k/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lo0/g0/k/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/k/a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/k/a$b;->d:Lo0/g0/k/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/k/a$b;->d:Lo0/g0/k/a;
+
+    iget-object v0, v0, Lo0/g0/k/a;->b:Lo0/f;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lo0/f;->cancel()V
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/a$c.smali b/com.discord/smali_classes2/o0/g0/k/a$c.smali
new file mode 100644
index 0000000000..b64c07d75f
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/a$c.smali
@@ -0,0 +1,38 @@
+.class public final Lo0/g0/k/a$c;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/k/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:Lokio/ByteString;
+
+.field public final c:J
+
+
+# direct methods
+.method public constructor <init>(ILokio/ByteString;J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lo0/g0/k/a$c;->a:I
+
+    iput-object p2, p0, Lo0/g0/k/a$c;->b:Lokio/ByteString;
+
+    iput-wide p3, p0, Lo0/g0/k/a$c;->c:J
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/a$d.smali b/com.discord/smali_classes2/o0/g0/k/a$d.smali
new file mode 100644
index 0000000000..20ac7eb539
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/a$d.smali
@@ -0,0 +1,38 @@
+.class public final Lo0/g0/k/a$d;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/k/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "d"
+.end annotation
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:Lokio/ByteString;
+
+
+# direct methods
+.method public constructor <init>(ILokio/ByteString;)V
+    .locals 1
+
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lo0/g0/k/a$d;->a:I
+
+    iput-object p2, p0, Lo0/g0/k/a$d;->b:Lokio/ByteString;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/a$e.smali b/com.discord/smali_classes2/o0/g0/k/a$e.smali
new file mode 100644
index 0000000000..b50e420278
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/a$e.smali
@@ -0,0 +1,167 @@
+.class public final Lo0/g0/k/a$e;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/k/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "e"
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lo0/g0/k/a;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/k/a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/k/a$e;->d:Lo0/g0/k/a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 8
+
+    iget-object v0, p0, Lo0/g0/k/a$e;->d:Lo0/g0/k/a;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v1, v0, Lo0/g0/k/a;->o:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v1, :cond_0
+
+    monitor-exit v0
+
+    goto :goto_1
+
+    :cond_0
+    :try_start_1
+    iget-object v1, v0, Lo0/g0/k/a;->e:Lo0/g0/k/e;
+
+    iget-boolean v2, v0, Lo0/g0/k/a;->s:Z
+
+    const/4 v3, -0x1
+
+    if-eqz v2, :cond_1
+
+    iget v2, v0, Lo0/g0/k/a;->p:I
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v2, -0x1
+
+    :goto_0
+    iget v4, v0, Lo0/g0/k/a;->p:I
+
+    const/4 v5, 0x1
+
+    add-int/2addr v4, v5
+
+    iput v4, v0, Lo0/g0/k/a;->p:I
+
+    iput-boolean v5, v0, Lo0/g0/k/a;->s:Z
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit v0
+
+    const/4 v4, 0x0
+
+    if-eq v2, v3, :cond_2
+
+    new-instance v1, Ljava/net/SocketTimeoutException;
+
+    const-string v3, "sent ping but didn\'t receive pong within "
+
+    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    iget-wide v6, v0, Lo0/g0/k/a;->w:J
+
+    invoke-virtual {v3, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v6, "ms (after "
+
+    invoke-virtual {v3, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sub-int/2addr v2, v5
+
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v2, " successful ping/pongs)"
+
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Ljava/net/SocketTimeoutException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, v1, v4}, Lo0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
+
+    goto :goto_1
+
+    :cond_2
+    if-eqz v1, :cond_3
+
+    :try_start_2
+    sget-object v2, Lokio/ByteString;->f:Lokio/ByteString;
+
+    const-string v3, "payload"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v3, 0x9
+
+    invoke-virtual {v1, v3, v2}, Lo0/g0/k/e;->a(ILokio/ByteString;)V
+
+    goto :goto_1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+
+    throw v4
+
+    :catch_0
+    move-exception v1
+
+    invoke-virtual {v0, v1, v4}, Lo0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
+
+    :goto_1
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/a$f.smali b/com.discord/smali_classes2/o0/g0/k/a$f.smali
new file mode 100644
index 0000000000..73c620ce66
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/a$f.smali
@@ -0,0 +1,49 @@
+.class public abstract Lo0/g0/k/a$f;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/k/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "f"
+.end annotation
+
+
+# instance fields
+.field public final d:Z
+
+.field public final e:Lp0/g;
+
+.field public final f:Lokio/BufferedSink;
+
+
+# direct methods
+.method public constructor <init>(ZLp0/g;Lokio/BufferedSink;)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "sink"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Lo0/g0/k/a$f;->d:Z
+
+    iput-object p2, p0, Lo0/g0/k/a$f;->e:Lp0/g;
+
+    iput-object p3, p0, Lo0/g0/k/a$f;->f:Lokio/BufferedSink;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/a.smali b/com.discord/smali_classes2/o0/g0/k/a.smali
new file mode 100644
index 0000000000..7fe30cb619
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/a.smali
@@ -0,0 +1,1860 @@
+.class public final Lo0/g0/k/a;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+# interfaces
+.implements Lokhttp3/WebSocket;
+.implements Lo0/g0/k/d$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/k/a$e;,
+        Lo0/g0/k/a$d;,
+        Lo0/g0/k/a$c;,
+        Lo0/g0/k/a$f;,
+        Lo0/g0/k/a$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final x:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/y;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public b:Lo0/f;
+
+.field public final c:Ljava/lang/Runnable;
+
+.field public d:Lo0/g0/k/d;
+
+.field public e:Lo0/g0/k/e;
+
+.field public f:Ljava/util/concurrent/ScheduledExecutorService;
+
+.field public g:Lo0/g0/k/a$f;
+
+.field public final h:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Lokio/ByteString;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final i:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public j:J
+
+.field public k:Z
+
+.field public l:Ljava/util/concurrent/ScheduledFuture;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/ScheduledFuture<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field public m:I
+
+.field public n:Ljava/lang/String;
+
+.field public o:Z
+
+.field public p:I
+
+.field public q:I
+
+.field public r:I
+
+.field public s:Z
+
+.field public final t:Lo0/a0;
+
+.field public final u:Lokhttp3/WebSocketListener;
+
+.field public final v:Ljava/util/Random;
+
+.field public final w:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Lo0/y;->e:Lo0/y;
+
+    invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/g0/k/a;->x:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lo0/a0;Lokhttp3/WebSocketListener;Ljava/util/Random;J)V
+    .locals 1
+
+    const-string v0, "originalRequest"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "listener"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "random"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/k/a;->t:Lo0/a0;
+
+    iput-object p2, p0, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    iput-object p3, p0, Lo0/g0/k/a;->v:Ljava/util/Random;
+
+    iput-wide p4, p0, Lo0/g0/k/a;->w:J
+
+    new-instance p1, Ljava/util/ArrayDeque;
+
+    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/k/a;->h:Ljava/util/ArrayDeque;
+
+    new-instance p1, Ljava/util/ArrayDeque;
+
+    invoke-direct {p1}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/k/a;->i:Ljava/util/ArrayDeque;
+
+    const/4 p1, -0x1
+
+    iput p1, p0, Lo0/g0/k/a;->m:I
+
+    iget-object p1, p0, Lo0/g0/k/a;->t:Lo0/a0;
+
+    iget-object p1, p1, Lo0/a0;->c:Ljava/lang/String;
+
+    const-string p2, "GET"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    sget-object p1, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const/16 p2, 0x10
+
+    new-array p2, p2, [B
+
+    iget-object p3, p0, Lo0/g0/k/a;->v:Ljava/util/Random;
+
+    invoke-virtual {p3, p2}, Ljava/util/Random;->nextBytes([B)V
+
+    const/4 p3, 0x3
+
+    const/4 p4, 0x0
+
+    invoke-static {p1, p2, p4, p4, p3}, Lokio/ByteString$a;->c(Lokio/ByteString$a;[BIII)Lokio/ByteString;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lp0/y/a;->a(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/g0/k/a;->a:Ljava/lang/String;
+
+    new-instance p1, Lo0/g0/k/a$a;
+
+    invoke-direct {p1, p0}, Lo0/g0/k/a$a;-><init>(Lo0/g0/k/a;)V
+
+    iput-object p1, p0, Lo0/g0/k/a;->c:Ljava/lang/Runnable;
+
+    return-void
+
+    :cond_0
+    const-string p1, "Request must be GET: "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget-object p2, p0, Lo0/g0/k/a;->t:Lo0/a0;
+
+    iget-object p2, p2, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/String;)Z
+    .locals 7
+
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    invoke-virtual {v0, p1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object p1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/k/a;->o:Z
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-nez v0, :cond_2
+
+    iget-boolean v0, p0, Lo0/g0/k/a;->k:Z
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-wide v3, p0, Lo0/g0/k/a;->j:J
+
+    invoke-static {p1}, Lp0/y/a;->g(Lokio/ByteString;)I
+
+    move-result v0
+
+    int-to-long v5, v0
+
+    add-long/2addr v3, v5
+
+    const-wide/32 v5, 0x1000000
+
+    cmp-long v0, v3, v5
+
+    if-lez v0, :cond_1
+
+    const/16 p1, 0x3e9
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lo0/g0/k/a;->e(ILjava/lang/String;)Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    goto :goto_1
+
+    :cond_1
+    :try_start_1
+    iget-wide v0, p0, Lo0/g0/k/a;->j:J
+
+    invoke-static {p1}, Lp0/y/a;->g(Lokio/ByteString;)I
+
+    move-result v3
+
+    int-to-long v3, v3
+
+    add-long/2addr v0, v3
+
+    iput-wide v0, p0, Lo0/g0/k/a;->j:J
+
+    iget-object v0, p0, Lo0/g0/k/a;->i:Ljava/util/ArrayDeque;
+
+    new-instance v1, Lo0/g0/k/a$d;
+
+    invoke-direct {v1, v2, p1}, Lo0/g0/k/a$d;-><init>(ILokio/ByteString;)V
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+
+    invoke-virtual {p0}, Lo0/g0/k/a;->l()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    monitor-exit p0
+
+    :goto_1
+    return v1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public b(Lokio/ByteString;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "bytes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
+
+    return-void
+.end method
+
+.method public c(Ljava/lang/String;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "text"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public cancel()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/k/a;->b:Lo0/f;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Lo0/f;->cancel()V
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public declared-synchronized d(Lokio/ByteString;)V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/k/a;->o:Z
+
+    if-nez v0, :cond_1
+
+    iget-boolean v0, p0, Lo0/g0/k/a;->k:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lo0/g0/k/a;->i:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lo0/g0/k/a;->h:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+
+    invoke-virtual {p0}, Lo0/g0/k/a;->l()V
+
+    iget p1, p0, Lo0/g0/k/a;->q:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Lo0/g0/k/a;->q:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    :goto_0
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public e(ILjava/lang/String;)Z
+    .locals 7
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-static {p1}, Lo0/g0/k/c;->c(I)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    if-eqz p2, :cond_2
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    invoke-virtual {v0, p2}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lokio/ByteString;->h()I
+
+    move-result v2
+
+    int-to-long v2, v2
+
+    const-wide/16 v4, 0x7b
+
+    cmp-long v6, v2, v4
+
+    if-gtz v6, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "reason.size() > 123: "
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_2
+    :goto_1
+    iget-boolean p2, p0, Lo0/g0/k/a;->o:Z
+
+    if-nez p2, :cond_4
+
+    iget-boolean p2, p0, Lo0/g0/k/a;->k:Z
+
+    if-eqz p2, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    iput-boolean v1, p0, Lo0/g0/k/a;->k:Z
+
+    iget-object p2, p0, Lo0/g0/k/a;->i:Ljava/util/ArrayDeque;
+
+    new-instance v2, Lo0/g0/k/a$c;
+
+    const-wide/32 v3, 0xea60
+
+    invoke-direct {v2, p1, v0, v3, v4}, Lo0/g0/k/a$c;-><init>(ILokio/ByteString;J)V
+
+    invoke-virtual {p2, v2}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+
+    invoke-virtual {p0}, Lo0/g0/k/a;->l()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    goto :goto_3
+
+    :cond_4
+    :goto_2
+    monitor-exit p0
+
+    const/4 v1, 0x0
+
+    :goto_3
+    return v1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public declared-synchronized f(Lokio/ByteString;)V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "payload"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget p1, p0, Lo0/g0/k/a;->r:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Lo0/g0/k/a;->r:I
+
+    const/4 p1, 0x0
+
+    iput-boolean p1, p0, Lo0/g0/k/a;->s:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public g(ILjava/lang/String;)V
+    .locals 4
+
+    const-string v0, "reason"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    const/4 v2, -0x1
+
+    if-eq p1, v2, :cond_0
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
+    if-eqz v3, :cond_a
+
+    monitor-enter p0
+
+    :try_start_0
+    iget v3, p0, Lo0/g0/k/a;->m:I
+
+    if-ne v3, v2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_9
+
+    iput p1, p0, Lo0/g0/k/a;->m:I
+
+    iput-object p2, p0, Lo0/g0/k/a;->n:Ljava/lang/String;
+
+    iget-boolean v0, p0, Lo0/g0/k/a;->k:Z
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_5
+
+    iget-object v0, p0, Lo0/g0/k/a;->i:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    iget-object v0, p0, Lo0/g0/k/a;->g:Lo0/g0/k/a$f;
+
+    iput-object v2, p0, Lo0/g0/k/a;->g:Lo0/g0/k/a$f;
+
+    iget-object v3, p0, Lo0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
+
+    if-eqz v3, :cond_3
+
+    iget-object v3, p0, Lo0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {v3, v1}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
+
+    goto :goto_2
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    throw v2
+
+    :cond_3
+    :goto_2
+    :try_start_1
+    iget-object v1, p0, Lo0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-eqz v1, :cond_4
+
+    invoke-interface {v1}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
+
+    move-object v2, v0
+
+    goto :goto_3
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    throw v2
+
+    :cond_5
+    :goto_3
+    monitor-exit p0
+
+    :try_start_2
+    iget-object v0, p0, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    invoke-virtual {v0, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosing(Lokhttp3/WebSocket;ILjava/lang/String;)V
+
+    if-eqz v2, :cond_6
+
+    iget-object v0, p0, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    invoke-virtual {v0, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :cond_6
+    if-eqz v2, :cond_7
+
+    invoke-static {v2}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_7
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    if-eqz v2, :cond_8
+
+    invoke-static {v2}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_8
+    throw p1
+
+    :cond_9
+    :try_start_3
+    const-string p1, "already closed"
+
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+
+    :cond_a
+    const-string p1, "Failed requirement."
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final h(Lokhttp3/Response;Lo0/g0/d/c;)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v0, p1, Lokhttp3/Response;->g:I
+
+    const/16 v1, 0x65
+
+    const/16 v2, 0x27
+
+    if-ne v0, v1, :cond_4
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    const-string v3, "Connection"
+
+    invoke-static {p1, v3, v0, v1}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "Upgrade"
+
+    const/4 v5, 0x1
+
+    invoke-static {v4, v3, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_3
+
+    invoke-static {p1, v4, v0, v1}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "websocket"
+
+    invoke-static {v4, v3, v5}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2
+
+    const-string v3, "Sec-WebSocket-Accept"
+
+    invoke-static {p1, v3, v0, v1}, Lokhttp3/Response;->a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v3, p0, Lo0/g0/k/a;->a:Ljava/lang/String;
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    const-string v1, "SHA-1"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString;->f(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lp0/y/a;->a(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    xor-int/2addr v1, v5
+
+    if-nez v1, :cond_1
+
+    if-eqz p2, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/net/ProtocolException;
+
+    const-string p2, "Web Socket exchange missing: bad interceptor?"
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    new-instance p2, Ljava/net/ProtocolException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v3, "Expected \'Sec-WebSocket-Accept\' header value \'"
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "\' but was \'"
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_2
+    new-instance p1, Ljava/net/ProtocolException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "Expected \'Upgrade\' header value \'websocket\' but was \'"
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/net/ProtocolException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "Expected \'Connection\' header value \'Upgrade\' but was \'"
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    new-instance p2, Ljava/net/ProtocolException;
+
+    const-string v0, "Expected HTTP 101 response but was \'"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget v1, p1, Lokhttp3/Response;->g:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x20
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object p1, p1, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final i(Ljava/lang/Exception;Lokhttp3/Response;)V
+    .locals 3
+
+    const-string v0, "e"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/k/a;->o:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :try_start_1
+    iput-boolean v0, p0, Lo0/g0/k/a;->o:Z
+
+    iget-object v0, p0, Lo0/g0/k/a;->g:Lo0/g0/k/a$f;
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Lo0/g0/k/a;->g:Lo0/g0/k/a$f;
+
+    iget-object v1, p0, Lo0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
+
+    if-eqz v1, :cond_1
+
+    const/4 v2, 0x0
+
+    invoke-interface {v1, v2}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
+
+    :cond_1
+    iget-object v1, p0, Lo0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v1}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :cond_2
+    monitor-exit p0
+
+    :try_start_2
+    iget-object v1, p0, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    if-eqz v0, :cond_3
+
+    invoke-static {v0}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_3
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    if-eqz v0, :cond_4
+
+    invoke-static {v0}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_4
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final j(Ljava/lang/String;Lo0/g0/k/a$f;)V
+    .locals 11
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "streams"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    monitor-enter p0
+
+    :try_start_0
+    iput-object p2, p0, Lo0/g0/k/a;->g:Lo0/g0/k/a$f;
+
+    new-instance v0, Lo0/g0/k/e;
+
+    iget-boolean v1, p2, Lo0/g0/k/a$f;->d:Z
+
+    iget-object v2, p2, Lo0/g0/k/a$f;->f:Lokio/BufferedSink;
+
+    iget-object v3, p0, Lo0/g0/k/a;->v:Ljava/util/Random;
+
+    invoke-direct {v0, v1, v2, v3}, Lo0/g0/k/e;-><init>(ZLokio/BufferedSink;Ljava/util/Random;)V
+
+    iput-object v0, p0, Lo0/g0/k/a;->e:Lo0/g0/k/e;
+
+    new-instance v4, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    const/4 v0, 0x0
+
+    invoke-static {p1, v0}, Lo0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
+
+    move-result-object p1
+
+    const/4 v0, 0x1
+
+    invoke-direct {v4, v0, p1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
+
+    iput-object v4, p0, Lo0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
+
+    iget-wide v1, p0, Lo0/g0/k/a;->w:J
+
+    const-wide/16 v5, 0x0
+
+    cmp-long p1, v1, v5
+
+    if-eqz p1, :cond_0
+
+    new-instance v5, Lo0/g0/k/a$e;
+
+    invoke-direct {v5, p0}, Lo0/g0/k/a$e;-><init>(Lo0/g0/k/a;)V
+
+    iget-wide v6, p0, Lo0/g0/k/a;->w:J
+
+    iget-wide v8, p0, Lo0/g0/k/a;->w:J
+
+    sget-object v10, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual/range {v4 .. v10}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    :cond_0
+    iget-object p1, p0, Lo0/g0/k/a;->i:Ljava/util/ArrayDeque;
+
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p1
+
+    xor-int/2addr p1, v0
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p0}, Lo0/g0/k/a;->l()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_1
+    monitor-exit p0
+
+    new-instance p1, Lo0/g0/k/d;
+
+    iget-boolean v0, p2, Lo0/g0/k/a$f;->d:Z
+
+    iget-object p2, p2, Lo0/g0/k/a$f;->e:Lp0/g;
+
+    invoke-direct {p1, v0, p2, p0}, Lo0/g0/k/d;-><init>(ZLp0/g;Lo0/g0/k/d$a;)V
+
+    iput-object p1, p0, Lo0/g0/k/a;->d:Lo0/g0/k/d;
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final k()V
+    .locals 9
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :goto_0
+    iget v0, p0, Lo0/g0/k/a;->m:I
+
+    const/4 v1, -0x1
+
+    if-ne v0, v1, :cond_d
+
+    iget-object v0, p0, Lo0/g0/k/a;->d:Lo0/g0/k/d;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_c
+
+    invoke-virtual {v0}, Lo0/g0/k/d;->b()V
+
+    iget-boolean v2, v0, Lo0/g0/k/d;->e:Z
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v0}, Lo0/g0/k/d;->a()V
+
+    goto :goto_0
+
+    :cond_0
+    iget v2, v0, Lo0/g0/k/d;->b:I
+
+    const/4 v3, 0x1
+
+    if-eq v2, v3, :cond_2
+
+    const/4 v4, 0x2
+
+    if-ne v2, v4, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Unknown opcode: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-static {v2}, Lo0/g0/b;->C(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    :goto_1
+    iget-boolean v4, v0, Lo0/g0/k/d;->a:Z
+
+    if-nez v4, :cond_b
+
+    iget-wide v4, v0, Lo0/g0/k/d;->c:J
+
+    const-wide/16 v6, 0x0
+
+    cmp-long v8, v4, v6
+
+    if-lez v8, :cond_5
+
+    iget-object v6, v0, Lo0/g0/k/d;->k:Lp0/g;
+
+    iget-object v7, v0, Lo0/g0/k/d;->g:Lp0/e;
+
+    invoke-interface {v6, v7, v4, v5}, Lp0/g;->Q(Lp0/e;J)V
+
+    iget-boolean v4, v0, Lo0/g0/k/d;->j:Z
+
+    if-nez v4, :cond_5
+
+    iget-object v4, v0, Lo0/g0/k/d;->g:Lp0/e;
+
+    iget-object v5, v0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    if-eqz v5, :cond_4
+
+    invoke-virtual {v4, v5}, Lp0/e;->i(Lp0/e$a;)Lp0/e$a;
+
+    iget-object v4, v0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    iget-object v5, v0, Lo0/g0/k/d;->g:Lp0/e;
+
+    iget-wide v5, v5, Lp0/e;->e:J
+
+    iget-wide v7, v0, Lo0/g0/k/d;->c:J
+
+    sub-long/2addr v5, v7
+
+    invoke-virtual {v4, v5, v6}, Lp0/e$a;->a(J)I
+
+    iget-object v4, v0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    iget-object v5, v0, Lo0/g0/k/d;->h:[B
+
+    if-eqz v5, :cond_3
+
+    invoke-static {v4, v5}, Lo0/g0/k/c;->b(Lp0/e$a;[B)V
+
+    iget-object v4, v0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    invoke-virtual {v4}, Lp0/e$a;->close()V
+
+    goto :goto_2
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_5
+    :goto_2
+    iget-boolean v4, v0, Lo0/g0/k/d;->d:Z
+
+    if-eqz v4, :cond_7
+
+    if-ne v2, v3, :cond_6
+
+    iget-object v1, v0, Lo0/g0/k/d;->l:Lo0/g0/k/d$a;
+
+    iget-object v0, v0, Lo0/g0/k/d;->g:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->v()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-interface {v1, v0}, Lo0/g0/k/d$a;->c(Ljava/lang/String;)V
+
+    goto/16 :goto_0
+
+    :cond_6
+    iget-object v1, v0, Lo0/g0/k/d;->l:Lo0/g0/k/d$a;
+
+    iget-object v0, v0, Lo0/g0/k/d;->g:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-interface {v1, v0}, Lo0/g0/k/d$a;->b(Lokio/ByteString;)V
+
+    goto/16 :goto_0
+
+    :cond_7
+    :goto_3
+    iget-boolean v4, v0, Lo0/g0/k/d;->a:Z
+
+    if-nez v4, :cond_9
+
+    invoke-virtual {v0}, Lo0/g0/k/d;->b()V
+
+    iget-boolean v4, v0, Lo0/g0/k/d;->e:Z
+
+    if-nez v4, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    invoke-virtual {v0}, Lo0/g0/k/d;->a()V
+
+    goto :goto_3
+
+    :cond_9
+    :goto_4
+    iget v4, v0, Lo0/g0/k/d;->b:I
+
+    if-nez v4, :cond_a
+
+    goto :goto_1
+
+    :cond_a
+    new-instance v1, Ljava/net/ProtocolException;
+
+    const-string v2, "Expected continuation opcode. Got: "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    iget v0, v0, Lo0/g0/k/d;->b:I
+
+    invoke-static {v0}, Lo0/g0/b;->C(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_b
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_d
+    return-void
+.end method
+
+.method public final l()V
+    .locals 2
+
+    invoke-static {p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    sget-boolean v1, Lk0/i;->a:Z
+
+    if-eqz v1, :cond_1
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/lang/AssertionError;
+
+    const-string v1, "Assertion failed"
+
+    invoke-direct {v0, v1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lo0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-eqz v0, :cond_2
+
+    iget-object v1, p0, Lo0/g0/k/a;->c:Ljava/lang/Runnable;
+
+    invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledExecutorService;->execute(Ljava/lang/Runnable;)V
+
+    :cond_2
+    return-void
+.end method
+
+.method public final m()Z
+    .locals 12
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/g0/k/a;->o:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_3
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return v1
+
+    :cond_0
+    :try_start_1
+    iget-object v0, p0, Lo0/g0/k/a;->e:Lo0/g0/k/e;
+
+    iget-object v2, p0, Lo0/g0/k/a;->h:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lokio/ByteString;
+
+    const/4 v3, -0x1
+
+    const/4 v4, 0x0
+
+    if-nez v2, :cond_5
+
+    iget-object v5, p0, Lo0/g0/k/a;->i:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v5}, Ljava/util/ArrayDeque;->poll()Ljava/lang/Object;
+
+    move-result-object v5
+
+    instance-of v6, v5, Lo0/g0/k/a$c;
+
+    if-eqz v6, :cond_4
+
+    iget v6, p0, Lo0/g0/k/a;->m:I
+
+    iget-object v7, p0, Lo0/g0/k/a;->n:Ljava/lang/String;
+
+    if-eq v6, v3, :cond_2
+
+    iget-object v3, p0, Lo0/g0/k/a;->g:Lo0/g0/k/a$f;
+
+    iput-object v4, p0, Lo0/g0/k/a;->g:Lo0/g0/k/a$f;
+
+    iget-object v8, p0, Lo0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-eqz v8, :cond_1
+
+    invoke-interface {v8}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_3
+
+    throw v4
+
+    :cond_2
+    :try_start_2
+    iget-object v3, p0, Lo0/g0/k/a;->f:Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-eqz v3, :cond_3
+
+    new-instance v8, Lo0/g0/k/a$b;
+
+    invoke-direct {v8, p0}, Lo0/g0/k/a$b;-><init>(Lo0/g0/k/a;)V
+
+    move-object v9, v5
+
+    check-cast v9, Lo0/g0/k/a$c;
+
+    iget-wide v9, v9, Lo0/g0/k/a$c;->c:J
+
+    sget-object v11, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-interface {v3, v8, v9, v10, v11}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    move-result-object v3
+
+    iput-object v3, p0, Lo0/g0/k/a;->l:Ljava/util/concurrent/ScheduledFuture;
+
+    move-object v3, v4
+
+    goto :goto_0
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_3
+
+    throw v4
+
+    :cond_4
+    if-nez v5, :cond_6
+
+    monitor-exit p0
+
+    return v1
+
+    :cond_5
+    move-object v5, v4
+
+    :cond_6
+    const/4 v6, -0x1
+
+    move-object v3, v4
+
+    move-object v7, v3
+
+    :goto_0
+    monitor-exit p0
+
+    const/4 v8, 0x1
+
+    if-eqz v2, :cond_9
+
+    if-eqz v0, :cond_8
+
+    if-eqz v0, :cond_7
+
+    :try_start_3
+    const-string v1, "payload"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v1, 0xa
+
+    invoke-virtual {v0, v1, v2}, Lo0/g0/k/e;->a(ILokio/ByteString;)V
+
+    goto/16 :goto_1
+
+    :cond_7
+    throw v4
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    throw v4
+
+    :cond_9
+    :try_start_4
+    instance-of v2, v5, Lo0/g0/k/a$d;
+
+    if-eqz v2, :cond_c
+
+    move-object v2, v5
+
+    check-cast v2, Lo0/g0/k/a$d;
+
+    iget-object v2, v2, Lo0/g0/k/a$d;->b:Lokio/ByteString;
+
+    if-eqz v0, :cond_b
+
+    check-cast v5, Lo0/g0/k/a$d;
+
+    iget v4, v5, Lo0/g0/k/a$d;->a:I
+
+    invoke-virtual {v2}, Lokio/ByteString;->h()I
+
+    move-result v5
+
+    int-to-long v5, v5
+
+    iget-boolean v7, v0, Lo0/g0/k/e;->e:Z
+
+    xor-int/2addr v7, v8
+
+    if-eqz v7, :cond_a
+
+    iput-boolean v8, v0, Lo0/g0/k/e;->e:Z
+
+    iget-object v0, v0, Lo0/g0/k/e;->d:Lo0/g0/k/e$a;
+
+    iput v4, v0, Lo0/g0/k/e$a;->d:I
+
+    iput-wide v5, v0, Lo0/g0/k/e$a;->e:J
+
+    iput-boolean v8, v0, Lo0/g0/k/e$a;->f:Z
+
+    iput-boolean v1, v0, Lo0/g0/k/e$a;->g:Z
+
+    invoke-static {v0}, Lf/n/a/k/a;->m(Lp0/u;)Lokio/BufferedSink;
+
+    move-result-object v0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    check-cast v0, Lp0/p;
+
+    :try_start_5
+    invoke-virtual {v0, v2}, Lp0/p;->y0(Lokio/ByteString;)Lokio/BufferedSink;
+
+    invoke-virtual {v0}, Lp0/p;->close()V
+
+    monitor-enter p0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+
+    :try_start_6
+    iget-wide v0, p0, Lo0/g0/k/a;->j:J
+
+    invoke-virtual {v2}, Lokio/ByteString;->h()I
+
+    move-result v2
+
+    int-to-long v4, v2
+
+    sub-long/2addr v0, v4
+
+    iput-wide v0, p0, Lo0/g0/k/a;->j:J
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_0
+
+    :try_start_7
+    monitor-exit p0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+
+    :cond_a
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Another message writer is active. Did you call close()?"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
+
+    throw v4
+
+    :cond_c
+    :try_start_8
+    instance-of v1, v5, Lo0/g0/k/a$c;
+
+    if-eqz v1, :cond_16
+
+    check-cast v5, Lo0/g0/k/a$c;
+
+    if-eqz v0, :cond_15
+
+    iget v1, v5, Lo0/g0/k/a$c;->a:I
+
+    iget-object v2, v5, Lo0/g0/k/a$c;->b:Lokio/ByteString;
+
+    if-eqz v0, :cond_14
+
+    sget-object v5, Lokio/ByteString;->f:Lokio/ByteString;
+
+    if-nez v1, :cond_d
+
+    if-eqz v2, :cond_10
+
+    :cond_d
+    if-eqz v1, :cond_e
+
+    invoke-static {v1}, Lo0/g0/k/c;->c(I)V
+
+    :cond_e
+    new-instance v5, Lp0/e;
+
+    invoke-direct {v5}, Lp0/e;-><init>()V
+
+    invoke-virtual {v5, v1}, Lp0/e;->N(I)Lp0/e;
+
+    if-eqz v2, :cond_f
+
+    invoke-virtual {v5, v2}, Lp0/e;->D(Lokio/ByteString;)Lp0/e;
+
+    :cond_f
+    invoke-virtual {v5}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object v5
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_2
+
+    :cond_10
+    const/16 v1, 0x8
+
+    :try_start_9
+    invoke-virtual {v0, v1, v5}, Lo0/g0/k/e;->a(ILokio/ByteString;)V
+    :try_end_9
+    .catchall {:try_start_9 .. :try_end_9} :catchall_1
+
+    :try_start_a
+    iput-boolean v8, v0, Lo0/g0/k/e;->b:Z
+
+    if-eqz v3, :cond_12
+
+    iget-object v0, p0, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    if-eqz v7, :cond_11
+
+    invoke-virtual {v0, p0, v6, v7}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
+
+    goto :goto_1
+
+    :cond_11
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_a
+    .catchall {:try_start_a .. :try_end_a} :catchall_2
+
+    throw v4
+
+    :cond_12
+    :goto_1
+    if-eqz v3, :cond_13
+
+    invoke-static {v3}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_13
+    return v8
+
+    :catchall_1
+    move-exception v1
+
+    :try_start_b
+    iput-boolean v8, v0, Lo0/g0/k/e;->b:Z
+
+    throw v1
+
+    :cond_14
+    throw v4
+
+    :cond_15
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_b
+    .catchall {:try_start_b .. :try_end_b} :catchall_2
+
+    throw v4
+
+    :cond_16
+    :try_start_c
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+    :try_end_c
+    .catchall {:try_start_c .. :try_end_c} :catchall_2
+
+    :catchall_2
+    move-exception v0
+
+    if-eqz v3, :cond_17
+
+    invoke-static {v3}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    :cond_17
+    throw v0
+
+    :catchall_3
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/b.smali b/com.discord/smali_classes2/o0/g0/k/b.smali
new file mode 100644
index 0000000000..e33c4d4be4
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/b.smali
@@ -0,0 +1,159 @@
+.class public final Lo0/g0/k/b;
+.super Ljava/lang/Object;
+.source "RealWebSocket.kt"
+
+# interfaces
+.implements Lo0/g;
+
+
+# instance fields
+.field public final synthetic a:Lo0/g0/k/a;
+
+.field public final synthetic b:Lo0/a0;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/k/a;Lo0/a0;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/a0;",
+            ")V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    iput-object p2, p0, Lo0/g0/k/b;->b:Lo0/a0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lo0/f;Lokhttp3/Response;)V
+    .locals 6
+
+    const-string v0, "call"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "response"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p2, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    :try_start_0
+    iget-object p1, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    invoke-virtual {p1, p2, v0}, Lo0/g0/k/a;->h(Lokhttp3/Response;Lo0/g0/d/c;)V
+
+    invoke-virtual {v0}, Lo0/g0/d/c;->e()Lo0/g0/k/a$f;
+
+    move-result-object p1
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_1
+
+    :try_start_1
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "OkHttp WebSocket "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/g0/k/b;->b:Lo0/a0;
+
+    iget-object v1, v1, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v1}, Lo0/w;->i()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    invoke-virtual {v1, v0, p1}, Lo0/g0/k/a;->j(Ljava/lang/String;Lo0/g0/k/a$f;)V
+
+    iget-object p1, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    iget-object p1, p1, Lo0/g0/k/a;->u:Lokhttp3/WebSocketListener;
+
+    iget-object v0, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    invoke-virtual {p1, v0, p2}, Lokhttp3/WebSocketListener;->onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
+
+    iget-object p1, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    invoke-virtual {p1}, Lo0/g0/k/a;->k()V
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    iget-object p2, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p2, p1, v0}, Lo0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
+
+    :goto_0
+    return-void
+
+    :catch_1
+    move-exception p1
+
+    if-eqz v0, :cond_0
+
+    const-wide/16 v1, -0x1
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    invoke-virtual/range {v0 .. v5}, Lo0/g0/d/c;->a(JZZLjava/io/IOException;)Ljava/io/IOException;
+
+    :cond_0
+    iget-object v0, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    invoke-virtual {v0, p1, p2}, Lo0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
+
+    invoke-static {p2}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
+
+    return-void
+.end method
+
+.method public b(Lo0/f;Ljava/io/IOException;)V
+    .locals 1
+
+    const-string v0, "call"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "e"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lo0/g0/k/b;->a:Lo0/g0/k/a;
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, p2, v0}, Lo0/g0/k/a;->i(Ljava/lang/Exception;Lokhttp3/Response;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/c.smali b/com.discord/smali_classes2/o0/g0/k/c.smali
new file mode 100644
index 0000000000..502a4e54b5
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/c.smali
@@ -0,0 +1,233 @@
+.class public final Lo0/g0/k/c;
+.super Ljava/lang/Object;
+.source "WebSocketProtocol.kt"
+
+
+# direct methods
+.method public static final a(I)Ljava/lang/String;
+    .locals 2
+
+    const/16 v0, 0x3e8
+
+    if-lt p0, v0, :cond_5
+
+    const/16 v0, 0x1388
+
+    if-lt p0, v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const/16 v0, 0x3ee
+
+    const/16 v1, 0x3ec
+
+    if-gt v1, p0, :cond_1
+
+    if-ge v0, p0, :cond_3
+
+    :cond_1
+    const/16 v0, 0xbb7
+
+    const/16 v1, 0x3f7
+
+    if-le v1, p0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    if-lt v0, p0, :cond_4
+
+    :cond_3
+    const-string v0, "Code "
+
+    const-string v1, " is reserved and may not be used."
+
+    invoke-static {v0, p0, v1}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    goto :goto_2
+
+    :cond_4
+    :goto_0
+    const/4 p0, 0x0
+
+    goto :goto_2
+
+    :cond_5
+    :goto_1
+    const-string v0, "Code must be in range [1000,5000): "
+
+    invoke-static {v0, p0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p0
+
+    :goto_2
+    return-object p0
+.end method
+
+.method public static final b(Lp0/e$a;[B)V
+    .locals 8
+
+    const-string v0, "cursor"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    :cond_0
+    iget-object v2, p0, Lp0/e$a;->h:[B
+
+    iget v3, p0, Lp0/e$a;->i:I
+
+    iget v4, p0, Lp0/e$a;->j:I
+
+    const/4 v5, 0x1
+
+    if-eqz v2, :cond_1
+
+    :goto_0
+    if-ge v3, v4, :cond_1
+
+    rem-int/2addr v1, v0
+
+    aget-byte v6, v2, v3
+
+    aget-byte v7, p1, v1
+
+    xor-int/2addr v6, v7
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v2, v3
+
+    add-int/lit8 v3, v3, 0x1
+
+    add-int/2addr v1, v5
+
+    goto :goto_0
+
+    :cond_1
+    iget-wide v2, p0, Lp0/e$a;->g:J
+
+    iget-object v4, p0, Lp0/e$a;->d:Lp0/e;
+
+    if-eqz v4, :cond_5
+
+    iget-wide v6, v4, Lp0/e;->e:J
+
+    cmp-long v4, v2, v6
+
+    if-eqz v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v5, 0x0
+
+    :goto_1
+    if-eqz v5, :cond_4
+
+    iget-wide v2, p0, Lp0/e$a;->g:J
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_3
+
+    const-wide/16 v2, 0x0
+
+    goto :goto_2
+
+    :cond_3
+    iget v4, p0, Lp0/e$a;->j:I
+
+    iget v5, p0, Lp0/e$a;->i:I
+
+    sub-int/2addr v4, v5
+
+    int-to-long v4, v4
+
+    add-long/2addr v2, v4
+
+    :goto_2
+    invoke-virtual {p0, v2, v3}, Lp0/e$a;->a(J)I
+
+    move-result v2
+
+    const/4 v3, -0x1
+
+    if-ne v2, v3, :cond_0
+
+    return-void
+
+    :cond_4
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    const-string p1, "no more bytes"
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static final c(I)V
+    .locals 1
+
+    invoke-static {p0}, Lo0/g0/k/c;->a(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    if-nez p0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-nez v0, :cond_2
+
+    if-nez p0, :cond_1
+
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p0, 0x0
+
+    throw p0
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/d$a.smali b/com.discord/smali_classes2/o0/g0/k/d$a.smali
new file mode 100644
index 0000000000..8ea6149bae
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/d$a.smali
@@ -0,0 +1,41 @@
+.class public interface abstract Lo0/g0/k/d$a;
+.super Ljava/lang/Object;
+.source "WebSocketReader.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/k/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "a"
+.end annotation
+
+
+# virtual methods
+.method public abstract b(Lokio/ByteString;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract c(Ljava/lang/String;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract d(Lokio/ByteString;)V
+.end method
+
+.method public abstract f(Lokio/ByteString;)V
+.end method
+
+.method public abstract g(ILjava/lang/String;)V
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/d.smali b/com.discord/smali_classes2/o0/g0/k/d.smali
new file mode 100644
index 0000000000..dccc94753c
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/d.smali
@@ -0,0 +1,710 @@
+.class public final Lo0/g0/k/d;
+.super Ljava/lang/Object;
+.source "WebSocketReader.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/k/d$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Z
+
+.field public b:I
+
+.field public c:J
+
+.field public d:Z
+
+.field public e:Z
+
+.field public final f:Lp0/e;
+
+.field public final g:Lp0/e;
+
+.field public final h:[B
+
+.field public final i:Lp0/e$a;
+
+.field public final j:Z
+
+.field public final k:Lp0/g;
+
+.field public final l:Lo0/g0/k/d$a;
+
+
+# direct methods
+.method public constructor <init>(ZLp0/g;Lo0/g0/k/d$a;)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "frameCallback"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Lo0/g0/k/d;->j:Z
+
+    iput-object p2, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    iput-object p3, p0, Lo0/g0/k/d;->l:Lo0/g0/k/d$a;
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/k/d;->f:Lp0/e;
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/k/d;->g:Lp0/e;
+
+    iget-boolean p1, p0, Lo0/g0/k/d;->j:Z
+
+    const/4 p2, 0x0
+
+    if-eqz p1, :cond_0
+
+    move-object p1, p2
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x4
+
+    new-array p1, p1, [B
+
+    :goto_0
+    iput-object p1, p0, Lo0/g0/k/d;->h:[B
+
+    iget-boolean p1, p0, Lo0/g0/k/d;->j:Z
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p2, Lp0/e$a;
+
+    invoke-direct {p2}, Lp0/e$a;-><init>()V
+
+    :goto_1
+    iput-object p2, p0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 10
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lo0/g0/k/d;->c:J
+
+    const/4 v2, 0x0
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v0, v3
+
+    if-lez v5, :cond_2
+
+    iget-object v5, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    iget-object v6, p0, Lo0/g0/k/d;->f:Lp0/e;
+
+    invoke-interface {v5, v6, v0, v1}, Lp0/g;->Q(Lp0/e;J)V
+
+    iget-boolean v0, p0, Lo0/g0/k/d;->j:Z
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/k/d;->f:Lp0/e;
+
+    iget-object v1, p0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v0, v1}, Lp0/e;->i(Lp0/e$a;)Lp0/e$a;
+
+    iget-object v0, p0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    invoke-virtual {v0, v3, v4}, Lp0/e$a;->a(J)I
+
+    iget-object v0, p0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    iget-object v1, p0, Lo0/g0/k/d;->h:[B
+
+    if-eqz v1, :cond_0
+
+    invoke-static {v0, v1}, Lo0/g0/k/c;->b(Lp0/e$a;[B)V
+
+    iget-object v0, p0, Lo0/g0/k/d;->i:Lp0/e$a;
+
+    invoke-virtual {v0}, Lp0/e$a;->close()V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_2
+    :goto_0
+    iget v0, p0, Lo0/g0/k/d;->b:I
+
+    packed-switch v0, :pswitch_data_0
+
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Unknown control opcode: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget v2, p0, Lo0/g0/k/d;->b:I
+
+    invoke-static {v2}, Lo0/g0/b;->C(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :pswitch_0
+    iget-object v0, p0, Lo0/g0/k/d;->l:Lo0/g0/k/d$a;
+
+    iget-object v1, p0, Lo0/g0/k/d;->f:Lp0/e;
+
+    invoke-virtual {v1}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Lo0/g0/k/d$a;->f(Lokio/ByteString;)V
+
+    goto :goto_4
+
+    :pswitch_1
+    iget-object v0, p0, Lo0/g0/k/d;->l:Lo0/g0/k/d$a;
+
+    iget-object v1, p0, Lo0/g0/k/d;->f:Lp0/e;
+
+    invoke-virtual {v1}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Lo0/g0/k/d$a;->d(Lokio/ByteString;)V
+
+    goto :goto_4
+
+    :pswitch_2
+    const/16 v0, 0x3ed
+
+    iget-object v1, p0, Lo0/g0/k/d;->f:Lp0/e;
+
+    iget-wide v5, v1, Lp0/e;->e:J
+
+    const-wide/16 v7, 0x1
+
+    cmp-long v9, v5, v7
+
+    if-eqz v9, :cond_b
+
+    cmp-long v7, v5, v3
+
+    if-eqz v7, :cond_a
+
+    invoke-virtual {v1}, Lp0/e;->readShort()S
+
+    move-result v0
+
+    iget-object v1, p0, Lo0/g0/k/d;->f:Lp0/e;
+
+    invoke-virtual {v1}, Lp0/e;->v()Ljava/lang/String;
+
+    move-result-object v1
+
+    const/16 v3, 0x3e8
+
+    if-lt v0, v3, :cond_7
+
+    const/16 v3, 0x1388
+
+    if-lt v0, v3, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const/16 v3, 0x3ee
+
+    const/16 v4, 0x3ec
+
+    if-gt v4, v0, :cond_4
+
+    if-ge v3, v0, :cond_6
+
+    :cond_4
+    const/16 v3, 0xbb7
+
+    const/16 v4, 0x3f7
+
+    if-le v4, v0, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    if-lt v3, v0, :cond_8
+
+    :cond_6
+    const-string v2, "Code "
+
+    const-string v3, " is reserved and may not be used."
+
+    invoke-static {v2, v0, v3}, Lf/e/b/a/a;->i(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_2
+
+    :cond_7
+    :goto_1
+    const-string v2, "Code must be in range [1000,5000): "
+
+    invoke-static {v2, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v2
+
+    :cond_8
+    :goto_2
+    if-nez v2, :cond_9
+
+    goto :goto_3
+
+    :cond_9
+    new-instance v0, Ljava/net/ProtocolException;
+
+    invoke-direct {v0, v2}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_a
+    const-string v1, ""
+
+    :goto_3
+    iget-object v2, p0, Lo0/g0/k/d;->l:Lo0/g0/k/d$a;
+
+    invoke-interface {v2, v0, v1}, Lo0/g0/k/d$a;->g(ILjava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/k/d;->a:Z
+
+    :goto_4
+    return-void
+
+    :cond_b
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Malformed close payload length of 1."
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :pswitch_data_0
+    .packed-switch 0x8
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public final b()V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;,
+            Ljava/net/ProtocolException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/k/d;->a:Z
+
+    if-nez v0, :cond_12
+
+    iget-object v0, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lp0/x;->h()J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v2}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lp0/x;->b()Lp0/x;
+
+    :try_start_0
+    iget-object v2, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v2}, Lp0/g;->readByte()B
+
+    move-result v2
+
+    const/16 v3, 0xff
+
+    invoke-static {v2, v3}, Lo0/g0/b;->a(BI)I
+
+    move-result v2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v4, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v4}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v4
+
+    sget-object v5, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v4, v0, v1, v5}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    and-int/lit8 v0, v2, 0xf
+
+    iput v0, p0, Lo0/g0/k/d;->b:I
+
+    and-int/lit16 v0, v2, 0x80
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    iput-boolean v0, p0, Lo0/g0/k/d;->d:Z
+
+    and-int/lit8 v0, v2, 0x8
+
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    iput-boolean v0, p0, Lo0/g0/k/d;->e:Z
+
+    if-eqz v0, :cond_3
+
+    iget-boolean v0, p0, Lo0/g0/k/d;->d:Z
+
+    if-eqz v0, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Control frames must be final."
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    :goto_2
+    and-int/lit8 v0, v2, 0x40
+
+    if-eqz v0, :cond_4
+
+    const/4 v0, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v0, 0x0
+
+    :goto_3
+    and-int/lit8 v4, v2, 0x20
+
+    if-eqz v4, :cond_5
+
+    const/4 v4, 0x1
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v4, 0x0
+
+    :goto_4
+    and-int/lit8 v2, v2, 0x10
+
+    if-eqz v2, :cond_6
+
+    const/4 v2, 0x1
+
+    goto :goto_5
+
+    :cond_6
+    const/4 v2, 0x0
+
+    :goto_5
+    if-nez v0, :cond_11
+
+    if-nez v4, :cond_11
+
+    if-nez v2, :cond_11
+
+    iget-object v0, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readByte()B
+
+    move-result v0
+
+    and-int/2addr v0, v3
+
+    and-int/lit16 v2, v0, 0x80
+
+    if-eqz v2, :cond_7
+
+    const/4 v1, 0x1
+
+    :cond_7
+    iget-boolean v2, p0, Lo0/g0/k/d;->j:Z
+
+    if-ne v1, v2, :cond_9
+
+    new-instance v0, Ljava/net/ProtocolException;
+
+    iget-boolean v1, p0, Lo0/g0/k/d;->j:Z
+
+    if-eqz v1, :cond_8
+
+    const-string v1, "Server-sent frames must not be masked."
+
+    goto :goto_6
+
+    :cond_8
+    const-string v1, "Client-sent frames must be masked."
+
+    :goto_6
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_9
+    const/16 v2, 0x7f
+
+    and-int/2addr v0, v2
+
+    int-to-long v3, v0
+
+    iput-wide v3, p0, Lo0/g0/k/d;->c:J
+
+    const/16 v0, 0x7e
+
+    int-to-long v5, v0
+
+    cmp-long v0, v3, v5
+
+    if-nez v0, :cond_a
+
+    iget-object v0, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readShort()S
+
+    move-result v0
+
+    const v2, 0xffff
+
+    and-int/2addr v0, v2
+
+    int-to-long v2, v0
+
+    iput-wide v2, p0, Lo0/g0/k/d;->c:J
+
+    goto :goto_7
+
+    :cond_a
+    int-to-long v5, v2
+
+    cmp-long v0, v3, v5
+
+    if-nez v0, :cond_c
+
+    iget-object v0, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->readLong()J
+
+    move-result-wide v2
+
+    iput-wide v2, p0, Lo0/g0/k/d;->c:J
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v0, v2, v4
+
+    if-ltz v0, :cond_b
+
+    goto :goto_7
+
+    :cond_b
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Frame length 0x"
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-wide v2, p0, Lo0/g0/k/d;->c:J
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->toHexString(J)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "java.lang.Long.toHexString(this)"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, " > 0x7FFFFFFFFFFFFFFF"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_c
+    :goto_7
+    iget-boolean v0, p0, Lo0/g0/k/d;->e:Z
+
+    if-eqz v0, :cond_e
+
+    iget-wide v2, p0, Lo0/g0/k/d;->c:J
+
+    const-wide/16 v4, 0x7d
+
+    cmp-long v0, v2, v4
+
+    if-gtz v0, :cond_d
+
+    goto :goto_8
+
+    :cond_d
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Control frame must be less than 125B."
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_e
+    :goto_8
+    if-eqz v1, :cond_10
+
+    iget-object v0, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    iget-object v1, p0, Lo0/g0/k/d;->h:[B
+
+    if-eqz v1, :cond_f
+
+    invoke-interface {v0, v1}, Lp0/g;->readFully([B)V
+
+    goto :goto_9
+
+    :cond_f
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_10
+    :goto_9
+    return-void
+
+    :cond_11
+    new-instance v0, Ljava/net/ProtocolException;
+
+    const-string v1, "Reserved flags are unsupported."
+
+    invoke-direct {v0, v1}, Ljava/net/ProtocolException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :catchall_0
+    move-exception v2
+
+    iget-object v3, p0, Lo0/g0/k/d;->k:Lp0/g;
+
+    invoke-interface {v3}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v3
+
+    sget-object v4, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v3, v0, v1, v4}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    throw v2
+
+    :cond_12
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/e$a.smali b/com.discord/smali_classes2/o0/g0/k/e$a.smali
new file mode 100644
index 0000000000..ca9e63bbc5
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/e$a.smali
@@ -0,0 +1,253 @@
+.class public final Lo0/g0/k/e$a;
+.super Ljava/lang/Object;
+.source "WebSocketWriter.kt"
+
+# interfaces
+.implements Lp0/u;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/g0/k/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public e:J
+
+.field public f:Z
+
+.field public g:Z
+
+.field public final synthetic h:Lo0/g0/k/e;
+
+
+# direct methods
+.method public constructor <init>(Lo0/g0/k/e;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/k/e$a;->g:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v1, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    iget v2, p0, Lo0/g0/k/e$a;->d:I
+
+    iget-object v0, v1, Lo0/g0/k/e;->c:Lp0/e;
+
+    iget-wide v3, v0, Lp0/e;->e:J
+
+    iget-boolean v5, p0, Lo0/g0/k/e$a;->f:Z
+
+    const/4 v6, 0x1
+
+    invoke-virtual/range {v1 .. v6}, Lo0/g0/k/e;->b(IJZZ)V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/g0/k/e$a;->g:Z
+
+    iget-object v0, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    const/4 v1, 0x0
+
+    iput-boolean v1, v0, Lo0/g0/k/e;->e:Z
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public flush()V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/k/e$a;->g:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v1, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    iget v2, p0, Lo0/g0/k/e$a;->d:I
+
+    iget-object v0, v1, Lo0/g0/k/e;->c:Lp0/e;
+
+    iget-wide v3, v0, Lp0/e;->e:J
+
+    iget-boolean v5, p0, Lo0/g0/k/e$a;->f:Z
+
+    const/4 v6, 0x0
+
+    invoke-virtual/range {v1 .. v6}, Lo0/g0/k/e;->b(IJZZ)V
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lo0/g0/k/e$a;->f:Z
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    iget-object v0, v0, Lo0/g0/k/e;->i:Lokio/BufferedSink;
+
+    invoke-interface {v0}, Lp0/u;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/g0/k/e$a;->g:Z
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    iget-object v0, v0, Lo0/g0/k/e;->c:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->write(Lp0/e;J)V
+
+    iget-boolean p1, p0, Lo0/g0/k/e$a;->f:Z
+
+    const/4 p2, 0x0
+
+    if-eqz p1, :cond_0
+
+    iget-wide v0, p0, Lo0/g0/k/e$a;->e:J
+
+    const-wide/16 v2, -0x1
+
+    cmp-long p1, v0, v2
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    iget-object p1, p1, Lo0/g0/k/e;->c:Lp0/e;
+
+    iget-wide v2, p1, Lp0/e;->e:J
+
+    const/16 p1, 0x2000
+
+    int-to-long v4, p1
+
+    sub-long/2addr v0, v4
+
+    cmp-long p1, v2, v0
+
+    if-lez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    iget-object p3, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    iget-object p3, p3, Lo0/g0/k/e;->c:Lp0/e;
+
+    invoke-virtual {p3}, Lp0/e;->c()J
+
+    move-result-wide v2
+
+    const-wide/16 v0, 0x0
+
+    cmp-long p3, v2, v0
+
+    if-lez p3, :cond_1
+
+    if-nez p1, :cond_1
+
+    iget-object v0, p0, Lo0/g0/k/e$a;->h:Lo0/g0/k/e;
+
+    iget v1, p0, Lo0/g0/k/e$a;->d:I
+
+    iget-boolean v4, p0, Lo0/g0/k/e$a;->f:Z
+
+    const/4 v5, 0x0
+
+    invoke-virtual/range {v0 .. v5}, Lo0/g0/k/e;->b(IJZZ)V
+
+    iput-boolean p2, p0, Lo0/g0/k/e$a;->f:Z
+
+    :cond_1
+    return-void
+
+    :cond_2
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/g0/k/e.smali b/com.discord/smali_classes2/o0/g0/k/e.smali
new file mode 100644
index 0000000000..f3d6f4d471
--- /dev/null
+++ b/com.discord/smali_classes2/o0/g0/k/e.smali
@@ -0,0 +1,560 @@
+.class public final Lo0/g0/k/e;
+.super Ljava/lang/Object;
+.source "WebSocketWriter.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/g0/k/e$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lp0/e;
+
+.field public b:Z
+
+.field public final c:Lp0/e;
+
+.field public final d:Lo0/g0/k/e$a;
+
+.field public e:Z
+
+.field public final f:[B
+
+.field public final g:Lp0/e$a;
+
+.field public final h:Z
+
+.field public final i:Lokio/BufferedSink;
+
+.field public final j:Ljava/util/Random;
+
+
+# direct methods
+.method public constructor <init>(ZLokio/BufferedSink;Ljava/util/Random;)V
+    .locals 1
+
+    const-string v0, "sink"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "random"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Lo0/g0/k/e;->h:Z
+
+    iput-object p2, p0, Lo0/g0/k/e;->i:Lokio/BufferedSink;
+
+    iput-object p3, p0, Lo0/g0/k/e;->j:Ljava/util/Random;
+
+    invoke-interface {p2}, Lokio/BufferedSink;->h()Lp0/e;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lo0/g0/k/e;->c:Lp0/e;
+
+    new-instance p1, Lo0/g0/k/e$a;
+
+    invoke-direct {p1, p0}, Lo0/g0/k/e$a;-><init>(Lo0/g0/k/e;)V
+
+    iput-object p1, p0, Lo0/g0/k/e;->d:Lo0/g0/k/e$a;
+
+    iget-boolean p1, p0, Lo0/g0/k/e;->h:Z
+
+    const/4 p2, 0x0
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x4
+
+    new-array p1, p1, [B
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, p2
+
+    :goto_0
+    iput-object p1, p0, Lo0/g0/k/e;->f:[B
+
+    iget-boolean p1, p0, Lo0/g0/k/e;->h:Z
+
+    if-eqz p1, :cond_1
+
+    new-instance p2, Lp0/e$a;
+
+    invoke-direct {p2}, Lp0/e$a;-><init>()V
+
+    :cond_1
+    iput-object p2, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(ILokio/ByteString;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/k/e;->b:Z
+
+    if-nez v0, :cond_6
+
+    invoke-virtual {p2}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    int-to-long v1, v0
+
+    const-wide/16 v3, 0x7d
+
+    cmp-long v5, v1, v3
+
+    if-gtz v5, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_5
+
+    or-int/lit16 p1, p1, 0x80
+
+    iget-object v1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {v1, p1}, Lp0/e;->I(I)Lp0/e;
+
+    iget-boolean p1, p0, Lo0/g0/k/e;->h:Z
+
+    if-eqz p1, :cond_3
+
+    or-int/lit16 p1, v0, 0x80
+
+    iget-object v1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {v1, p1}, Lp0/e;->I(I)Lp0/e;
+
+    iget-object p1, p0, Lo0/g0/k/e;->j:Ljava/util/Random;
+
+    iget-object v1, p0, Lo0/g0/k/e;->f:[B
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {p1, v1}, Ljava/util/Random;->nextBytes([B)V
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    iget-object v1, p0, Lo0/g0/k/e;->f:[B
+
+    invoke-virtual {p1, v1}, Lp0/e;->E([B)Lp0/e;
+
+    if-lez v0, :cond_4
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    invoke-virtual {p1, p2}, Lp0/e;->D(Lokio/ByteString;)Lp0/e;
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    iget-object p2, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {p1, p2}, Lp0/e;->i(Lp0/e$a;)Lp0/e$a;
+
+    iget-object p1, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    invoke-virtual {p1, v0, v1}, Lp0/e$a;->a(J)I
+
+    iget-object p1, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    iget-object p2, p0, Lo0/g0/k/e;->f:[B
+
+    invoke-static {p1, p2}, Lo0/g0/k/c;->b(Lp0/e$a;[B)V
+
+    iget-object p1, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    invoke-virtual {p1}, Lp0/e$a;->close()V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_3
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {p1, v0}, Lp0/e;->I(I)Lp0/e;
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {p1, p2}, Lp0/e;->D(Lokio/ByteString;)Lp0/e;
+
+    :cond_4
+    :goto_1
+    iget-object p1, p0, Lo0/g0/k/e;->i:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lokio/BufferedSink;->flush()V
+
+    return-void
+
+    :cond_5
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Payload size must be less than or equal to 125"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final b(IJZZ)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lo0/g0/k/e;->b:Z
+
+    if-nez v0, :cond_9
+
+    const/4 v0, 0x0
+
+    if-eqz p4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    if-eqz p5, :cond_1
+
+    or-int/lit16 p1, p1, 0x80
+
+    :cond_1
+    iget-object p4, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {p4, p1}, Lp0/e;->I(I)Lp0/e;
+
+    iget-boolean p1, p0, Lo0/g0/k/e;->h:Z
+
+    if-eqz p1, :cond_2
+
+    const/16 v0, 0x80
+
+    :cond_2
+    const-wide/16 p4, 0x7d
+
+    cmp-long p1, p2, p4
+
+    if-gtz p1, :cond_3
+
+    long-to-int p1, p2
+
+    or-int/2addr p1, v0
+
+    iget-object p4, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {p4, p1}, Lp0/e;->I(I)Lp0/e;
+
+    goto/16 :goto_1
+
+    :cond_3
+    const-wide/32 p4, 0xffff
+
+    cmp-long p1, p2, p4
+
+    if-gtz p1, :cond_4
+
+    or-int/lit8 p1, v0, 0x7e
+
+    iget-object p4, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {p4, p1}, Lp0/e;->I(I)Lp0/e;
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    long-to-int p4, p2
+
+    invoke-virtual {p1, p4}, Lp0/e;->N(I)Lp0/e;
+
+    goto :goto_1
+
+    :cond_4
+    or-int/lit8 p1, v0, 0x7f
+
+    iget-object p4, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    invoke-virtual {p4, p1}, Lp0/e;->I(I)Lp0/e;
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    const/16 p4, 0x8
+
+    invoke-virtual {p1, p4}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object p5
+
+    iget-object v0, p5, Lp0/r;->a:[B
+
+    iget v1, p5, Lp0/r;->c:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    const/16 v3, 0x38
+
+    ushr-long v3, p2, v3
+
+    const-wide/16 v5, 0xff
+
+    and-long/2addr v3, v5
+
+    long-to-int v4, v3
+
+    int-to-byte v3, v4
+
+    aput-byte v3, v0, v1
+
+    add-int/lit8 v1, v2, 0x1
+
+    const/16 v3, 0x30
+
+    ushr-long v3, p2, v3
+
+    and-long/2addr v3, v5
+
+    long-to-int v4, v3
+
+    int-to-byte v3, v4
+
+    aput-byte v3, v0, v2
+
+    add-int/lit8 v2, v1, 0x1
+
+    const/16 v3, 0x28
+
+    ushr-long v3, p2, v3
+
+    and-long/2addr v3, v5
+
+    long-to-int v4, v3
+
+    int-to-byte v3, v4
+
+    aput-byte v3, v0, v1
+
+    add-int/lit8 v1, v2, 0x1
+
+    const/16 v3, 0x20
+
+    ushr-long v3, p2, v3
+
+    and-long/2addr v3, v5
+
+    long-to-int v4, v3
+
+    int-to-byte v3, v4
+
+    aput-byte v3, v0, v2
+
+    add-int/lit8 v2, v1, 0x1
+
+    const/16 v3, 0x18
+
+    ushr-long v3, p2, v3
+
+    and-long/2addr v3, v5
+
+    long-to-int v4, v3
+
+    int-to-byte v3, v4
+
+    aput-byte v3, v0, v1
+
+    add-int/lit8 v1, v2, 0x1
+
+    const/16 v3, 0x10
+
+    ushr-long v3, p2, v3
+
+    and-long/2addr v3, v5
+
+    long-to-int v4, v3
+
+    int-to-byte v3, v4
+
+    aput-byte v3, v0, v2
+
+    add-int/lit8 v2, v1, 0x1
+
+    ushr-long v3, p2, p4
+
+    and-long/2addr v3, v5
+
+    long-to-int p4, v3
+
+    int-to-byte p4, p4
+
+    aput-byte p4, v0, v1
+
+    add-int/lit8 p4, v2, 0x1
+
+    and-long v3, p2, v5
+
+    long-to-int v1, v3
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v0, v2
+
+    iput p4, p5, Lp0/r;->c:I
+
+    iget-wide p4, p1, Lp0/e;->e:J
+
+    const-wide/16 v0, 0x8
+
+    add-long/2addr p4, v0
+
+    iput-wide p4, p1, Lp0/e;->e:J
+
+    :goto_1
+    iget-boolean p1, p0, Lo0/g0/k/e;->h:Z
+
+    if-eqz p1, :cond_7
+
+    iget-object p1, p0, Lo0/g0/k/e;->j:Ljava/util/Random;
+
+    iget-object p4, p0, Lo0/g0/k/e;->f:[B
+
+    const/4 p5, 0x0
+
+    if-eqz p4, :cond_6
+
+    invoke-virtual {p1, p4}, Ljava/util/Random;->nextBytes([B)V
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    iget-object p4, p0, Lo0/g0/k/e;->f:[B
+
+    invoke-virtual {p1, p4}, Lp0/e;->E([B)Lp0/e;
+
+    const-wide/16 v0, 0x0
+
+    cmp-long p1, p2, v0
+
+    if-lez p1, :cond_8
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    iget-object p4, p0, Lo0/g0/k/e;->c:Lp0/e;
+
+    invoke-virtual {p1, p4, p2, p3}, Lp0/e;->write(Lp0/e;J)V
+
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    iget-object p2, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    if-eqz p2, :cond_5
+
+    invoke-virtual {p1, p2}, Lp0/e;->i(Lp0/e$a;)Lp0/e$a;
+
+    iget-object p1, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    invoke-virtual {p1, v0, v1}, Lp0/e$a;->a(J)I
+
+    iget-object p1, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    iget-object p2, p0, Lo0/g0/k/e;->f:[B
+
+    invoke-static {p1, p2}, Lo0/g0/k/c;->b(Lp0/e$a;[B)V
+
+    iget-object p1, p0, Lo0/g0/k/e;->g:Lp0/e$a;
+
+    invoke-virtual {p1}, Lp0/e$a;->close()V
+
+    goto :goto_2
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw p5
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw p5
+
+    :cond_7
+    iget-object p1, p0, Lo0/g0/k/e;->a:Lp0/e;
+
+    iget-object p4, p0, Lo0/g0/k/e;->c:Lp0/e;
+
+    invoke-virtual {p1, p4, p2, p3}, Lp0/e;->write(Lp0/e;J)V
+
+    :cond_8
+    :goto_2
+    iget-object p1, p0, Lo0/g0/k/e;->i:Lokio/BufferedSink;
+
+    invoke-interface {p1}, Lokio/BufferedSink;->y()Lokio/BufferedSink;
+
+    return-void
+
+    :cond_9
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/h$a.smali b/com.discord/smali_classes2/o0/h$a.smali
new file mode 100644
index 0000000000..2a2a79cebe
--- /dev/null
+++ b/com.discord/smali_classes2/o0/h$a.smali
@@ -0,0 +1,102 @@
+.class public final Lo0/h$a;
+.super Ljava/lang/Object;
+.source "CertificatePinner.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/security/cert/Certificate;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "certificate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "sha256/"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    check-cast p1, Ljava/security/cert/X509Certificate;
+
+    invoke-virtual {p0, p1}, Lo0/h$a;->b(Ljava/security/cert/X509Certificate;)Lokio/ByteString;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lp0/y/a;->a(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final b(Ljava/security/cert/X509Certificate;)Lokio/ByteString;
+    .locals 3
+
+    const-string v0, "$this$toSha256ByteString"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getPublicKey()Ljava/security/PublicKey;
+
+    move-result-object p1
+
+    const-string v1, "publicKey"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljava/security/PublicKey;->getEncoded()[B
+
+    move-result-object p1
+
+    const-string v1, "publicKey.encoded"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x3
+
+    invoke-static {v0, p1, v1, v1, v2}, Lokio/ByteString$a;->c(Lokio/ByteString$a;[BIII)Lokio/ByteString;
+
+    move-result-object p1
+
+    const-string v0, "SHA-256"
+
+    invoke-virtual {p1, v0}, Lokio/ByteString;->f(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/h$b.smali b/com.discord/smali_classes2/o0/h$b.smali
new file mode 100644
index 0000000000..63b01be9a2
--- /dev/null
+++ b/com.discord/smali_classes2/o0/h$b.smali
@@ -0,0 +1,107 @@
+.class public final Lo0/h$b;
+.super Ljava/lang/Object;
+.source "CertificatePinner.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public final b:Ljava/lang/String;
+
+.field public final c:Ljava/lang/String;
+
+.field public final d:Lokio/ByteString;
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    if-eq p0, p1, :cond_1
+
+    instance-of v0, p1, Lo0/h$b;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/h$b;
+
+    iget-object v0, p1, Lo0/h$b;->a:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p1, Lo0/h$b;->b:Ljava/lang/String;
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p1, Lo0/h$b;->c:Ljava/lang/String;
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object p1, p1, Lo0/h$b;->d:Lokio/ByteString;
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/h.smali b/com.discord/smali_classes2/o0/h.smali
index aa9649bd2a..3aedac961a 100644
--- a/com.discord/smali_classes2/o0/h.smali
+++ b/com.discord/smali_classes2/o0/h.smali
@@ -1,155 +1,456 @@
-.class public abstract Lo0/h;
+.class public final Lo0/h;
 .super Ljava/lang/Object;
-.source "ForwardingSink.kt"
+.source "CertificatePinner.kt"
 
-# interfaces
-.implements Lo0/u;
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/h$b;,
+        Lo0/h$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:Lo0/h;
+
+.field public static final d:Lo0/h$a;
 
 
 # instance fields
-.field public final delegate:Lo0/u;
+.field public final a:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lo0/h$b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Lo0/g0/j/c;
 
 
 # direct methods
-.method public constructor <init>(Lo0/u;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 3
 
-    if-eqz p1, :cond_0
+    new-instance v0, Lo0/h$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/h$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/h;->d:Lo0/h$a;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    new-instance v2, Lo0/h;
+
+    invoke-static {v0}, Lk0/j/l;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-direct {v2, v0, v1}, Lo0/h;-><init>(Ljava/util/Set;Lo0/g0/j/c;)V
+
+    sput-object v2, Lo0/h;->c:Lo0/h;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/Set;Lo0/g0/j/c;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Set<",
+            "Lo0/h$b;",
+            ">;",
+            "Lo0/g0/j/c;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "pins"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lo0/h;->delegate:Lo0/u;
+    iput-object p1, p0, Lo0/h;->a:Ljava/util/Set;
+
+    iput-object p2, p0, Lo0/h;->b:Lo0/g0/j/c;
 
     return-void
-
-    :cond_0
-    const-string p1, "delegate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 
 # virtual methods
-.method public final -deprecated_delegate()Lo0/u;
-    .locals 1
-
-    iget-object v0, p0, Lo0/h;->delegate:Lo0/u;
-
-    return-object v0
-.end method
-
-.method public close()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
+.method public final a(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
         value = {
-            Ljava/io/IOException;
+            "(",
+            "Ljava/lang/String;",
+            "Lkotlin/jvm/functions/Function0<",
+            "+",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/security/cert/X509Certificate;",
+            ">;>;)V"
         }
     .end annotation
 
-    iget-object v0, p0, Lo0/h;->delegate:Lo0/u;
+    const-string v0, "hostname"
 
-    invoke-interface {v0}, Lo0/u;->close()V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "cleanedPeerCertificatesFn"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lk0/j/n;->d:Lk0/j/n;
+
+    iget-object v2, p0, Lo0/h;->a:Ljava/util/Set;
+
+    invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :cond_0
+    :goto_0
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    const/4 v4, 0x0
+
+    if-eqz v3, :cond_6
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lo0/h$b;
+
+    if-eqz v3, :cond_5
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x2
+
+    const-string v7, "*."
+
+    invoke-static {v4, v7, v5, v6}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v6
+
+    if-nez v6, :cond_4
+
+    invoke-static {p1, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    :cond_1
+    instance-of v5, v1, Lk0/o/c/w/a;
+
+    if-eqz v5, :cond_3
+
+    instance-of v5, v1, Lk0/o/c/w/c;
+
+    if-eqz v5, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const-string p1, "kotlin.collections.MutableList"
+
+    invoke-static {v1, p1}, Lk0/o/c/v;->throwCce(Ljava/lang/Object;Ljava/lang/String;)V
+
+    throw v4
+
+    :cond_3
+    :goto_1
+    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_4
+    const/16 p2, 0x2e
+
+    const/4 v0, 0x6
+
+    invoke-static {p1, p2, v5, v5, v0}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    throw v4
+
+    :cond_5
+    throw v4
+
+    :cond_6
+    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_7
 
     return-void
-.end method
 
-.method public final delegate()Lo0/u;
-    .locals 1
+    :cond_7
+    invoke-interface {p2}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
-    iget-object v0, p0, Lo0/h;->delegate:Lo0/u;
+    move-result-object p2
 
-    return-object v0
-.end method
+    check-cast p2, Ljava/util/List;
 
-.method public flush()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lo0/h;->delegate:Lo0/u;
-
-    invoke-interface {v0}, Lo0/u;->flush()V
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/h;->delegate:Lo0/u;
-
-    invoke-interface {v0}, Lo0/u;->timeout()Lo0/x;
+    invoke-interface {p2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
 
-    return-object v0
-.end method
+    :cond_8
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-.method public toString()Ljava/lang/String;
-    .locals 2
+    move-result v2
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    if-eqz v2, :cond_a
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    move-result-object v2
 
-    move-result-object v1
+    check-cast v2, Ljava/security/cert/X509Certificate;
 
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
 
-    const/16 v1, 0x28
+    move-result v3
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    if-eqz v3, :cond_8
 
-    iget-object v1, p0, Lo0/h;->delegate:Lo0/u;
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    move-result-object p1
 
-    const/16 v1, 0x29
+    check-cast p1, Lo0/h$b;
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    if-eqz p1, :cond_9
 
+    throw v4
+
+    :cond_9
+    throw v4
+
+    :cond_a
+    const-string v0, "Certificate pinning failure!"
+
+    const-string v2, "\n  Peer certificate chain:"
+
+    invoke-static {v0, v2}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-interface {p2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :goto_2
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    const-string v3, "\n    "
+
+    if-eqz v2, :cond_c
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/security/cert/X509Certificate;
+
+    if-eqz v2, :cond_b
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v3, Lo0/h;->d:Lo0/h$a;
+
+    invoke-virtual {v3, v2}, Lo0/h$a;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, ": "
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
+
+    move-result-object v2
+
+    const-string v3, "x509Certificate.subjectDN"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v2}, Ljava/security/Principal;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :cond_b
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string p2, "null cannot be cast to non-null type java.security.cert.X509Certificate"
+
+    invoke-direct {p1, p2}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_c
+    const-string p2, "\n  Pinned certificates for "
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, ":"
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_3
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_d
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Lo0/h$b;
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    goto :goto_3
+
+    :cond_d
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object p1
 
-    return-object v0
+    const-string p2, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p2, Ljavax/net/ssl/SSLPeerUnverifiedException;
+
+    invoke-direct {p2, p1}, Ljavax/net/ssl/SSLPeerUnverifiedException;-><init>(Ljava/lang/String;)V
+
+    throw p2
 .end method
 
-.method public write(Lo0/e;J)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
+
+    instance-of v0, p1, Lo0/h;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/h;
+
+    iget-object v0, p1, Lo0/h;->a:Ljava/util/Set;
+
+    iget-object v1, p0, Lo0/h;->a:Ljava/util/Set;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object p1, p1, Lo0/h;->b:Lo0/g0/j/c;
+
+    iget-object v0, p0, Lo0/h;->b:Lo0/g0/j/c;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lo0/h;->delegate:Lo0/u;
+    const/4 p1, 0x1
 
-    invoke-interface {v0, p1, p2, p3}, Lo0/u;->write(Lo0/e;J)V
-
-    return-void
+    goto :goto_0
 
     :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 p1, 0x0
 
-    throw p1
+    :goto_0
+    return p1
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    iget-object v0, p0, Lo0/h;->a:Ljava/util/Set;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    add-int/lit16 v0, v0, 0x5ed
+
+    mul-int/lit8 v0, v0, 0x29
+
+    iget-object v1, p0, Lo0/h;->b:Lo0/g0/j/c;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    add-int/2addr v0, v1
+
+    return v0
 .end method
diff --git a/com.discord/smali_classes2/o0/h0/a$a.smali b/com.discord/smali_classes2/o0/h0/a$a.smali
new file mode 100644
index 0000000000..b922ee34c6
--- /dev/null
+++ b/com.discord/smali_classes2/o0/h0/a$a.smali
@@ -0,0 +1,137 @@
+.class public final enum Lo0/h0/a$a;
+.super Ljava/lang/Enum;
+.source "HttpLoggingInterceptor.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/h0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lo0/h0/a$a;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lo0/h0/a$a;
+
+.field public static final enum e:Lo0/h0/a$a;
+
+.field public static final enum f:Lo0/h0/a$a;
+
+.field public static final enum g:Lo0/h0/a$a;
+
+.field public static final synthetic h:[Lo0/h0/a$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Lo0/h0/a$a;
+
+    new-instance v1, Lo0/h0/a$a;
+
+    const-string v2, "NONE"
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3}, Lo0/h0/a$a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lo0/h0/a$a;->d:Lo0/h0/a$a;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/h0/a$a;
+
+    const-string v2, "BASIC"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v1, v2, v3}, Lo0/h0/a$a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lo0/h0/a$a;->e:Lo0/h0/a$a;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/h0/a$a;
+
+    const-string v2, "HEADERS"
+
+    const/4 v3, 0x2
+
+    invoke-direct {v1, v2, v3}, Lo0/h0/a$a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lo0/h0/a$a;->f:Lo0/h0/a$a;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/h0/a$a;
+
+    const-string v2, "BODY"
+
+    const/4 v3, 0x3
+
+    invoke-direct {v1, v2, v3}, Lo0/h0/a$a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v1, Lo0/h0/a$a;->g:Lo0/h0/a$a;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lo0/h0/a$a;->h:[Lo0/h0/a$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lo0/h0/a$a;
+    .locals 1
+
+    const-class v0, Lo0/h0/a$a;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lo0/h0/a$a;
+
+    return-object p0
+.end method
+
+.method public static values()[Lo0/h0/a$a;
+    .locals 1
+
+    sget-object v0, Lo0/h0/a$a;->h:[Lo0/h0/a$a;
+
+    invoke-virtual {v0}, [Lo0/h0/a$a;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lo0/h0/a$a;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/h0/a$b.smali b/com.discord/smali_classes2/o0/h0/a$b.smali
new file mode 100644
index 0000000000..5d2cd1edb6
--- /dev/null
+++ b/com.discord/smali_classes2/o0/h0/a$b.smali
@@ -0,0 +1,19 @@
+.class public interface abstract Lo0/h0/a$b;
+.super Ljava/lang/Object;
+.source "HttpLoggingInterceptor.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/h0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "b"
+.end annotation
+
+
+# virtual methods
+.method public abstract log(Ljava/lang/String;)V
+.end method
diff --git a/com.discord/smali_classes2/o0/h0/a.smali b/com.discord/smali_classes2/o0/h0/a.smali
new file mode 100644
index 0000000000..96d64bef6b
--- /dev/null
+++ b/com.discord/smali_classes2/o0/h0/a.smali
@@ -0,0 +1,1067 @@
+.class public final Lo0/h0/a;
+.super Ljava/lang/Object;
+.source "HttpLoggingInterceptor.kt"
+
+# interfaces
+.implements Lokhttp3/Interceptor;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/h0/a$a;,
+        Lo0/h0/a$b;
+    }
+.end annotation
+
+
+# instance fields
+.field public volatile b:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public volatile c:Lo0/h0/a$a;
+
+.field public final d:Lo0/h0/a$b;
+
+
+# direct methods
+.method public constructor <init>(Lo0/h0/a$b;)V
+    .locals 1
+
+    const-string v0, "logger"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    sget-object p1, Lk0/j/p;->d:Lk0/j/p;
+
+    iput-object p1, p0, Lo0/h0/a;->b:Ljava/util/Set;
+
+    sget-object p1, Lo0/h0/a$a;->d:Lo0/h0/a$a;
+
+    iput-object p1, p0, Lo0/h0/a;->c:Lo0/h0/a$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lokhttp3/Headers;)Z
+    .locals 3
+
+    const-string v0, "Content-Encoding"
+
+    invoke-virtual {p1, v0}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_0
+
+    const-string v1, "identity"
+
+    const/4 v2, 0x1
+
+    invoke-static {p1, v1, v2}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    const-string v1, "gzip"
+
+    invoke-static {p1, v1, v2}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result p1
+
+    if-nez p1, :cond_0
+
+    const/4 v0, 0x1
+
+    :cond_0
+    return v0
+.end method
+
+.method public final b(Lokhttp3/Headers;I)V
+    .locals 3
+
+    iget-object v0, p0, Lo0/h0/a;->b:Ljava/util/Set;
+
+    iget-object v1, p1, Lokhttp3/Headers;->d:[Ljava/lang/String;
+
+    mul-int/lit8 p2, p2, 0x2
+
+    aget-object v1, v1, p2
+
+    invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const-string v0, "\u2588\u2588"
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p1, Lokhttp3/Headers;->d:[Ljava/lang/String;
+
+    add-int/lit8 v1, p2, 0x1
+
+    aget-object v0, v0, v1
+
+    :goto_0
+    iget-object v1, p0, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object p1, p1, Lokhttp3/Headers;->d:[Ljava/lang/String;
+
+    aget-object p1, p1, p2
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, ": "
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-interface {v1, p1}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public intercept(Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+    .locals 21
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v1, p0
+
+    move-object/from16 v0, p1
+
+    const-string v2, "chain"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v1, Lo0/h0/a;->c:Lo0/h0/a$a;
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->p()Lo0/a0;
+
+    move-result-object v3
+
+    sget-object v4, Lo0/h0/a$a;->d:Lo0/h0/a$a;
+
+    if-ne v2, v4, :cond_0
+
+    invoke-interface {v0, v3}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    sget-object v4, Lo0/h0/a$a;->g:Lo0/h0/a$a;
+
+    if-ne v2, v4, :cond_1
+
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v4, 0x0
+
+    :goto_0
+    if-nez v4, :cond_3
+
+    sget-object v5, Lo0/h0/a$a;->f:Lo0/h0/a$a;
+
+    if-ne v2, v5, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v2, 0x0
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    const/4 v2, 0x1
+
+    :goto_2
+    iget-object v5, v3, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->a()Lo0/k;
+
+    move-result-object v6
+
+    const-string v7, "--> "
+
+    invoke-static {v7}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v7
+
+    iget-object v8, v3, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v8, 0x20
+
+    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v8, v3, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v8, ""
+
+    if-eqz v6, :cond_4
+
+    const-string v9, " "
+
+    invoke-static {v9}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v9
+
+    invoke-interface {v6}, Lo0/k;->a()Lo0/y;
+
+    move-result-object v6
+
+    invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    goto :goto_3
+
+    :cond_4
+    move-object v6, v8
+
+    :goto_3
+    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v7, "-byte body)"
+
+    const-string v9, " ("
+
+    if-nez v2, :cond_5
+
+    if-eqz v5, :cond_5
+
+    invoke-static {v6, v9}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v6
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v10
+
+    invoke-virtual {v6, v10, v11}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    :cond_5
+    iget-object v10, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-interface {v10, v6}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    const-string v6, "-byte body omitted)"
+
+    const-string v10, "UTF_8"
+
+    if-eqz v2, :cond_f
+
+    iget-object v11, v3, Lo0/a0;->d:Lokhttp3/Headers;
+
+    if-eqz v5, :cond_7
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
+
+    move-result-object v12
+
+    if-eqz v12, :cond_6
+
+    const-string v13, "Content-Type"
+
+    invoke-virtual {v11, v13}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v13
+
+    if-nez v13, :cond_6
+
+    iget-object v13, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    new-instance v14, Ljava/lang/StringBuilder;
+
+    invoke-direct {v14}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v15, "Content-Type: "
+
+    invoke-virtual {v14, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v14, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v14}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v12
+
+    invoke-interface {v13, v12}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    :cond_6
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v12
+
+    const-wide/16 v14, -0x1
+
+    cmp-long v16, v12, v14
+
+    if-eqz v16, :cond_7
+
+    const-string v12, "Content-Length"
+
+    invoke-virtual {v11, v12}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v12
+
+    if-nez v12, :cond_7
+
+    iget-object v12, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    const-string v13, "Content-Length: "
+
+    invoke-static {v13}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v13
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v14
+
+    invoke-virtual {v13, v14, v15}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v13}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v13
+
+    invoke-interface {v12, v13}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    :cond_7
+    invoke-virtual {v11}, Lokhttp3/Headers;->size()I
+
+    move-result v12
+
+    const/4 v13, 0x0
+
+    :goto_4
+    if-ge v13, v12, :cond_8
+
+    invoke-virtual {v1, v11, v13}, Lo0/h0/a;->b(Lokhttp3/Headers;I)V
+
+    add-int/lit8 v13, v13, 0x1
+
+    goto :goto_4
+
+    :cond_8
+    const-string v11, "--> END "
+
+    if-eqz v4, :cond_e
+
+    if-nez v5, :cond_9
+
+    goto/16 :goto_6
+
+    :cond_9
+    iget-object v12, v3, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {v1, v12}, Lo0/h0/a;->a(Lokhttp3/Headers;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_a
+
+    iget-object v5, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v11
+
+    iget-object v12, v3, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v12, " (encoded body omitted)"
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-interface {v5, v11}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    goto/16 :goto_7
+
+    :cond_a
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->isDuplex()Z
+
+    move-result v12
+
+    if-eqz v12, :cond_b
+
+    iget-object v5, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v11
+
+    iget-object v12, v3, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v12, " (duplex request body omitted)"
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-interface {v5, v11}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    goto/16 :goto_7
+
+    :cond_b
+    new-instance v12, Lp0/e;
+
+    invoke-direct {v12}, Lp0/e;-><init>()V
+
+    invoke-virtual {v5, v12}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
+
+    move-result-object v13
+
+    if-eqz v13, :cond_c
+
+    sget-object v14, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-virtual {v13, v14}, Lokhttp3/MediaType;->a(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
+
+    move-result-object v13
+
+    if-eqz v13, :cond_c
+
+    goto :goto_5
+
+    :cond_c
+    sget-object v13, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-static {v13, v10}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_5
+    iget-object v14, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-interface {v14, v8}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    invoke-static {v12}, Lf/n/a/k/a;->I(Lp0/e;)Z
+
+    move-result v14
+
+    if-eqz v14, :cond_d
+
+    iget-object v14, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-virtual {v12, v13}, Lp0/e;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
+
+    move-result-object v12
+
+    invoke-interface {v14, v12}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    iget-object v12, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v11
+
+    iget-object v13, v3, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v11, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v13
+
+    invoke-virtual {v11, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-interface {v12, v5}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    goto :goto_7
+
+    :cond_d
+    iget-object v12, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v11
+
+    iget-object v13, v3, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v11, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v13, " (binary "
+
+    invoke-virtual {v11, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v13
+
+    invoke-virtual {v11, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-interface {v12, v5}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    goto :goto_7
+
+    :cond_e
+    :goto_6
+    iget-object v5, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-static {v11}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v11
+
+    iget-object v12, v3, Lo0/a0;->c:Ljava/lang/String;
+
+    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-interface {v5, v11}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    :cond_f
+    :goto_7
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v11
+
+    :try_start_0
+    invoke-interface {v0, v3}, Lokhttp3/Interceptor$Chain;->d(Lo0/a0;)Lokhttp3/Response;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    sget-object v3, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v13
+
+    sub-long/2addr v13, v11
+
+    invoke-virtual {v3, v13, v14}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+
+    move-result-wide v11
+
+    iget-object v3, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    if-eqz v3, :cond_1e
+
+    invoke-virtual {v3}, Lokhttp3/ResponseBody;->a()J
+
+    move-result-wide v13
+
+    const-wide/16 v15, -0x1
+
+    cmp-long v5, v13, v15
+
+    if-eqz v5, :cond_10
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v5, v13, v14}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v15, "-byte"
+
+    invoke-virtual {v5, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    goto :goto_8
+
+    :cond_10
+    const-string v5, "unknown-length"
+
+    :goto_8
+    iget-object v15, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    const-string v16, "<-- "
+
+    move-object/from16 v17, v7
+
+    invoke-static/range {v16 .. v16}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v7
+
+    move-wide/from16 v18, v13
+
+    iget v13, v0, Lokhttp3/Response;->g:I
+
+    invoke-virtual {v7, v13}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    iget-object v13, v0, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    invoke-virtual {v13}, Ljava/lang/String;->length()I
+
+    move-result v13
+
+    if-nez v13, :cond_11
+
+    const/4 v13, 0x1
+
+    goto :goto_9
+
+    :cond_11
+    const/4 v13, 0x0
+
+    :goto_9
+    if-eqz v13, :cond_12
+
+    move-object/from16 v20, v6
+
+    move-object v6, v8
+
+    goto :goto_a
+
+    :cond_12
+    iget-object v13, v0, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    new-instance v14, Ljava/lang/StringBuilder;
+
+    invoke-direct {v14}, Ljava/lang/StringBuilder;-><init>()V
+
+    const/16 v16, 0x20
+
+    move-object/from16 v20, v6
+
+    invoke-static/range {v16 .. v16}, Ljava/lang/String;->valueOf(C)Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-virtual {v14, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v14, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v14}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v6
+
+    :goto_a
+    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v6, 0x20
+
+    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v6, v0, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v6, v6, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7, v11, v12}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v6, "ms"
+
+    invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    if-nez v2, :cond_13
+
+    const-string v6, ", "
+
+    const-string v9, " body"
+
+    invoke-static {v6, v5, v9}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v5
+
+    goto :goto_b
+
+    :cond_13
+    move-object v5, v8
+
+    :goto_b
+    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v5, 0x29
+
+    invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-interface {v15, v5}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    if-eqz v2, :cond_1d
+
+    iget-object v2, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v2}, Lokhttp3/Headers;->size()I
+
+    move-result v5
+
+    const/4 v6, 0x0
+
+    :goto_c
+    if-ge v6, v5, :cond_14
+
+    invoke-virtual {v1, v2, v6}, Lo0/h0/a;->b(Lokhttp3/Headers;I)V
+
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_c
+
+    :cond_14
+    if-eqz v4, :cond_1c
+
+    invoke-static {v0}, Lo0/g0/e/e;->a(Lokhttp3/Response;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_15
+
+    goto/16 :goto_f
+
+    :cond_15
+    iget-object v4, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v1, v4}, Lo0/h0/a;->a(Lokhttp3/Headers;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_16
+
+    iget-object v2, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    const-string v3, "<-- END HTTP (encoded body omitted)"
+
+    invoke-interface {v2, v3}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    goto/16 :goto_10
+
+    :cond_16
+    invoke-virtual {v3}, Lokhttp3/ResponseBody;->c()Lp0/g;
+
+    move-result-object v4
+
+    const-wide v5, 0x7fffffffffffffffL
+
+    invoke-interface {v4, v5, v6}, Lp0/g;->m(J)Z
+
+    invoke-interface {v4}, Lp0/g;->h()Lp0/e;
+
+    move-result-object v4
+
+    const-string v5, "Content-Encoding"
+
+    invoke-virtual {v2, v5}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v5, "gzip"
+
+    const/4 v6, 0x1
+
+    invoke-static {v5, v2, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_17
+
+    iget-wide v5, v4, Lp0/e;->e:J
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    new-instance v5, Lp0/k;
+
+    invoke-virtual {v4}, Lp0/e;->b()Lp0/e;
+
+    move-result-object v4
+
+    invoke-direct {v5, v4}, Lp0/k;-><init>(Lp0/w;)V
+
+    :try_start_1
+    new-instance v4, Lp0/e;
+
+    invoke-direct {v4}, Lp0/e;-><init>()V
+
+    invoke-virtual {v4, v5}, Lp0/e;->i0(Lp0/w;)J
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    const/4 v6, 0x0
+
+    invoke-static {v5, v6}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+
+    goto :goto_d
+
+    :catchall_0
+    move-exception v0
+
+    move-object v2, v0
+
+    :try_start_2
+    throw v2
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    move-object v3, v0
+
+    invoke-static {v5, v2}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+
+    throw v3
+
+    :cond_17
+    const/4 v2, 0x0
+
+    :goto_d
+    invoke-virtual {v3}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_18
+
+    sget-object v5, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-virtual {v3, v5}, Lokhttp3/MediaType;->a(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_18
+
+    goto :goto_e
+
+    :cond_18
+    sget-object v3, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-static {v3, v10}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_e
+    invoke-static {v4}, Lf/n/a/k/a;->I(Lp0/e;)Z
+
+    move-result v5
+
+    if-nez v5, :cond_19
+
+    iget-object v2, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-interface {v2, v8}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    iget-object v2, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    const-string v3, "<-- END HTTP (binary "
+
+    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    iget-wide v4, v4, Lp0/e;->e:J
+
+    invoke-virtual {v3, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    move-object/from16 v4, v20
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_19
+    const-wide/16 v5, 0x0
+
+    cmp-long v7, v18, v5
+
+    if-eqz v7, :cond_1a
+
+    iget-object v5, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-interface {v5, v8}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    iget-object v5, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-virtual {v4}, Lp0/e;->b()Lp0/e;
+
+    move-result-object v6
+
+    invoke-virtual {v6, v3}, Lp0/e;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-interface {v5, v3}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    :cond_1a
+    const-string v3, "<-- END HTTP ("
+
+    if-eqz v2, :cond_1b
+
+    iget-object v5, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    iget-wide v6, v4, Lp0/e;->e:J
+
+    invoke-virtual {v3, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v4, "-byte, "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v2, "-gzipped-byte body)"
+
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-interface {v5, v2}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    goto :goto_10
+
+    :cond_1b
+    iget-object v2, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    iget-wide v4, v4, Lp0/e;->e:J
+
+    invoke-virtual {v3, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    move-object/from16 v4, v17
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    goto :goto_10
+
+    :cond_1c
+    :goto_f
+    iget-object v2, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    const-string v3, "<-- END HTTP"
+
+    invoke-interface {v2, v3}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    :cond_1d
+    :goto_10
+    return-object v0
+
+    :cond_1e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :catch_0
+    move-exception v0
+
+    move-object v2, v0
+
+    iget-object v0, v1, Lo0/h0/a;->d:Lo0/h0/a$b;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "<-- HTTP FAILED: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-interface {v0, v3}, Lo0/h0/a$b;->log(Ljava/lang/String;)V
+
+    throw v2
+.end method
diff --git a/com.discord/smali_classes2/o0/i.smali b/com.discord/smali_classes2/o0/i.smali
index 1c527227bb..9f705cbd3c 100644
--- a/com.discord/smali_classes2/o0/i.smali
+++ b/com.discord/smali_classes2/o0/i.smali
@@ -1,126 +1,120 @@
-.class public abstract Lo0/i;
-.super Ljava/lang/Object;
-.source "ForwardingSource.kt"
+.class public final Lo0/i;
+.super Lk0/o/c/j;
+.source "CertificatePinner.kt"
 
 # interfaces
-.implements Lo0/w;
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/security/cert/X509Certificate;",
+        ">;>;"
+    }
+.end annotation
 
 
 # instance fields
-.field public final d:Lo0/w;
+.field public final synthetic $hostname:Ljava/lang/String;
+
+.field public final synthetic $peerCertificates:Ljava/util/List;
+
+.field public final synthetic this$0:Lo0/h;
 
 
 # direct methods
-.method public constructor <init>(Lo0/w;)V
+.method public constructor <init>(Lo0/h;Ljava/util/List;Ljava/lang/String;)V
     .locals 0
 
-    if-eqz p1, :cond_0
+    iput-object p1, p0, Lo0/i;->this$0:Lo0/h;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    iput-object p2, p0, Lo0/i;->$peerCertificates:Ljava/util/List;
 
-    iput-object p1, p0, Lo0/i;->d:Lo0/w;
-
-    return-void
-
-    :cond_0
-    const-string p1, "delegate"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    iput-object p3, p0, Lo0/i;->$hostname:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    throw p1
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
 .end method
 
 
 # virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+.method public invoke()Ljava/lang/Object;
+    .locals 3
 
-    if-eqz p1, :cond_0
+    iget-object v0, p0, Lo0/i;->this$0:Lo0/h;
 
-    iget-object v0, p0, Lo0/i;->d:Lo0/w;
+    iget-object v0, v0, Lo0/h;->b:Lo0/g0/j/c;
 
-    invoke-interface {v0, p1, p2, p3}, Lo0/w;->B0(Lo0/e;J)J
+    if-eqz v0, :cond_0
 
-    move-result-wide p1
+    iget-object v1, p0, Lo0/i;->$peerCertificates:Ljava/util/List;
 
-    return-wide p1
+    iget-object v2, p0, Lo0/i;->$hostname:Ljava/lang/String;
+
+    invoke-virtual {v0, v1, v2}, Lo0/g0/j/c;->a(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
 
     :cond_0
-    const-string p1, "sink"
+    iget-object v0, p0, Lo0/i;->$peerCertificates:Ljava/util/List;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :goto_0
+    new-instance v1, Ljava/util/ArrayList;
 
-    const/4 p1, 0x0
+    const/16 v2, 0xa
 
-    throw p1
-.end method
+    invoke-static {v0, v2}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-.method public close()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+    move-result v2
 
-    iget-object v0, p0, Lo0/i;->d:Lo0/w;
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-interface {v0}, Lo0/w;->close()V
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/i;->d:Lo0/w;
-
-    invoke-interface {v0}, Lo0/w;->timeout()Lo0/x;
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
 
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x28
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lo0/i;->d:Lo0/w;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
+    :goto_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/security/cert/Certificate;
+
+    if-eqz v2, :cond_1
+
+    check-cast v2, Ljava/security/cert/X509Certificate;
+
+    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.security.cert.X509Certificate"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    return-object v1
 .end method
diff --git a/com.discord/smali_classes2/o0/j$a.smali b/com.discord/smali_classes2/o0/j$a.smali
new file mode 100644
index 0000000000..6f907e7a55
--- /dev/null
+++ b/com.discord/smali_classes2/o0/j$a.smali
@@ -0,0 +1,120 @@
+.class public final Lo0/j$a;
+.super Ljava/lang/Object;
+.source "CipherSuite.kt"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/j;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Comparator<",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public compare(Ljava/lang/Object;Ljava/lang/Object;)I
+    .locals 6
+
+    check-cast p1, Ljava/lang/String;
+
+    check-cast p2, Ljava/lang/String;
+
+    const-string v0, "a"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "b"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
+
+    move-result v0
+
+    const/4 v1, 0x4
+
+    :goto_0
+    const/4 v2, -0x1
+
+    const/4 v3, 0x1
+
+    if-ge v1, v0, :cond_2
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    invoke-virtual {p2, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    if-eq v4, v5, :cond_1
+
+    if-ge v4, v5, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p2
+
+    if-eq p1, p2, :cond_3
+
+    if-ge p1, p2, :cond_0
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_1
+    return v2
+.end method
diff --git a/com.discord/smali_classes2/o0/j$b.smali b/com.discord/smali_classes2/o0/j$b.smali
new file mode 100644
index 0000000000..3ac1122138
--- /dev/null
+++ b/com.discord/smali_classes2/o0/j$b.smali
@@ -0,0 +1,174 @@
+.class public final Lo0/j$b;
+.super Ljava/lang/Object;
+.source "CipherSuite.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/j;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+    .locals 0
+
+    const/4 p2, 0x0
+
+    if-eqz p0, :cond_0
+
+    new-instance p0, Lo0/j;
+
+    invoke-direct {p0, p1, p2}, Lo0/j;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sget-object p2, Lo0/j;->c:Ljava/util/Map;
+
+    invoke-interface {p2, p1, p0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-object p0
+
+    :cond_0
+    throw p2
+.end method
+
+
+# virtual methods
+.method public final declared-synchronized b(Ljava/lang/String;)Lo0/j;
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    const-string v0, "javaName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lo0/j;->c:Ljava/util/Map;
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lo0/j;
+
+    if-nez v0, :cond_1
+
+    sget-object v0, Lo0/j;->c:Ljava/util/Map;
+
+    invoke-virtual {p0, p1}, Lo0/j$b;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lo0/j;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Lo0/j;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, p1, v1}, Lo0/j;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    :cond_0
+    sget-object v1, Lo0/j;->c:Ljava/util/Map;
+
+    invoke-interface {v1, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_1
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final c(Ljava/lang/String;)Ljava/lang/String;
+    .locals 7
+
+    const-string v0, "TLS_"
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v3
+
+    const-string v4, "(this as java.lang.String).substring(startIndex)"
+
+    const/4 v5, 0x4
+
+    const-string v6, "SSL_"
+
+    if-eqz v3, :cond_0
+
+    invoke-static {v6}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1, v6, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v5}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    :cond_1
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/j.smali b/com.discord/smali_classes2/o0/j.smali
index 42fba26e3f..ee6297df86 100644
--- a/com.discord/smali_classes2/o0/j.smali
+++ b/com.discord/smali_classes2/o0/j.smali
@@ -1,142 +1,1136 @@
-.class public Lo0/j;
-.super Lo0/x;
-.source "ForwardingTimeout.kt"
+.class public final Lo0/j;
+.super Ljava/lang/Object;
+.source "CipherSuite.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/j$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final b:Ljava/util/Comparator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Comparator<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final c:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Lo0/j;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final d:Lo0/j;
+
+.field public static final e:Lo0/j;
+
+.field public static final f:Lo0/j;
+
+.field public static final g:Lo0/j;
+
+.field public static final h:Lo0/j;
+
+.field public static final i:Lo0/j;
+
+.field public static final j:Lo0/j;
+
+.field public static final k:Lo0/j;
+
+.field public static final l:Lo0/j;
+
+.field public static final m:Lo0/j;
+
+.field public static final n:Lo0/j;
+
+.field public static final o:Lo0/j;
+
+.field public static final p:Lo0/j;
+
+.field public static final q:Lo0/j;
+
+.field public static final r:Lo0/j;
+
+.field public static final s:Lo0/j;
+
+.field public static final t:Lo0/j$b;
 
 
 # instance fields
-.field public e:Lo0/x;
+.field public final a:Ljava/lang/String;
 
 
 # direct methods
-.method public constructor <init>(Lo0/x;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 3
 
-    if-eqz p1, :cond_0
+    new-instance v0, Lo0/j$b;
 
-    invoke-direct {p0}, Lo0/x;-><init>()V
+    const/4 v1, 0x0
 
-    iput-object p1, p0, Lo0/j;->e:Lo0/x;
+    invoke-direct {v0, v1}, Lo0/j$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/j;->t:Lo0/j$b;
+
+    new-instance v0, Lo0/j$a;
+
+    invoke-direct {v0}, Lo0/j$a;-><init>()V
+
+    sput-object v0, Lo0/j;->b:Ljava/util/Comparator;
+
+    new-instance v0, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
+
+    sput-object v0, Lo0/j;->c:Ljava/util/Map;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_WITH_NULL_MD5"
+
+    const/4 v2, 0x1
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_WITH_NULL_SHA"
+
+    const/4 v2, 0x2
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_EXPORT_WITH_RC4_40_MD5"
+
+    const/4 v2, 0x3
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_WITH_RC4_128_MD5"
+
+    const/4 v2, 0x4
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_WITH_RC4_128_SHA"
+
+    const/4 v2, 0x5
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"
+
+    const/16 v2, 0x8
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_WITH_DES_CBC_SHA"
+
+    const/16 v2, 0x9
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
+
+    const/16 v2, 0xa
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->d:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"
+
+    const/16 v2, 0x11
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DHE_DSS_WITH_DES_CBC_SHA"
+
+    const/16 v2, 0x12
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
+
+    const/16 v2, 0x13
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"
+
+    const/16 v2, 0x14
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DHE_RSA_WITH_DES_CBC_SHA"
+
+    const/16 v2, 0x15
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
+
+    const/16 v2, 0x16
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
+
+    const/16 v2, 0x17
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DH_anon_WITH_RC4_128_MD5"
+
+    const/16 v2, 0x18
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
+
+    const/16 v2, 0x19
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DH_anon_WITH_DES_CBC_SHA"
+
+    const/16 v2, 0x1a
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
+
+    const/16 v2, 0x1b
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_WITH_DES_CBC_SHA"
+
+    const/16 v2, 0x1e
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"
+
+    const/16 v2, 0x1f
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_WITH_RC4_128_SHA"
+
+    const/16 v2, 0x20
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_WITH_DES_CBC_MD5"
+
+    const/16 v2, 0x22
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"
+
+    const/16 v2, 0x23
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_WITH_RC4_128_MD5"
+
+    const/16 v2, 0x24
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"
+
+    const/16 v2, 0x26
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"
+
+    const/16 v2, 0x28
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
+
+    const/16 v2, 0x29
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
+
+    const/16 v2, 0x2b
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_AES_128_CBC_SHA"
+
+    const/16 v2, 0x2f
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->e:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
+
+    const/16 v2, 0x32
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
+
+    const/16 v2, 0x33
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DH_anon_WITH_AES_128_CBC_SHA"
+
+    const/16 v2, 0x34
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_AES_256_CBC_SHA"
+
+    const/16 v2, 0x35
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->f:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
+
+    const/16 v2, 0x38
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
+
+    const/16 v2, 0x39
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DH_anon_WITH_AES_256_CBC_SHA"
+
+    const/16 v2, 0x3a
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_NULL_SHA256"
+
+    const/16 v2, 0x3b
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_AES_128_CBC_SHA256"
+
+    const/16 v2, 0x3c
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_AES_256_CBC_SHA256"
+
+    const/16 v2, 0x3d
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
+
+    const/16 v2, 0x40
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
+
+    const/16 v2, 0x41
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
+
+    const/16 v2, 0x44
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
+
+    const/16 v2, 0x45
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
+
+    const/16 v2, 0x67
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
+
+    const/16 v2, 0x6a
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
+
+    const/16 v2, 0x6b
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
+
+    const/16 v2, 0x6c
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
+
+    const/16 v2, 0x6d
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
+
+    const/16 v2, 0x84
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
+
+    const/16 v2, 0x87
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
+
+    const/16 v2, 0x88
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_PSK_WITH_RC4_128_SHA"
+
+    const/16 v2, 0x8a
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
+
+    const/16 v2, 0x8b
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_PSK_WITH_AES_128_CBC_SHA"
+
+    const/16 v2, 0x8c
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_PSK_WITH_AES_256_CBC_SHA"
+
+    const/16 v2, 0x8d
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_SEED_CBC_SHA"
+
+    const/16 v2, 0x96
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_AES_128_GCM_SHA256"
+
+    const/16 v2, 0x9c
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->g:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_RSA_WITH_AES_256_GCM_SHA384"
+
+    const/16 v2, 0x9d
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->h:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
+
+    const/16 v2, 0x9e
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
+
+    const/16 v2, 0x9f
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
+
+    const/16 v2, 0xa2
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
+
+    const/16 v2, 0xa3
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
+
+    const/16 v2, 0xa6
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
+
+    const/16 v2, 0xa7
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
+
+    const/16 v2, 0xff
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_FALLBACK_SCSV"
+
+    const/16 v2, 0x5600
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_NULL_SHA"
+
+    const v2, 0xc001
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"
+
+    const v2, 0xc002
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"
+
+    const v2, 0xc003
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"
+
+    const v2, 0xc004
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"
+
+    const v2, 0xc005
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
+
+    const v2, 0xc006
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
+
+    const v2, 0xc007
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
+
+    const v2, 0xc008
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
+
+    const v2, 0xc009
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
+
+    const v2, 0xc00a
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_NULL_SHA"
+
+    const v2, 0xc00b
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_RC4_128_SHA"
+
+    const v2, 0xc00c
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"
+
+    const v2, 0xc00d
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"
+
+    const v2, 0xc00e
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"
+
+    const v2, 0xc00f
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_NULL_SHA"
+
+    const v2, 0xc010
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
+
+    const v2, 0xc011
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
+
+    const v2, 0xc012
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
+
+    const v2, 0xc013
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->i:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
+
+    const v2, 0xc014
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->j:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_anon_WITH_NULL_SHA"
+
+    const v2, 0xc015
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_anon_WITH_RC4_128_SHA"
+
+    const v2, 0xc016
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
+
+    const v2, 0xc017
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
+
+    const v2, 0xc018
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
+
+    const v2, 0xc019
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
+
+    const v2, 0xc023
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
+
+    const v2, 0xc024
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"
+
+    const v2, 0xc025
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"
+
+    const v2, 0xc026
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+
+    const v2, 0xc027
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
+
+    const v2, 0xc028
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"
+
+    const v2, 0xc029
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"
+
+    const v2, 0xc02a
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
+
+    const v2, 0xc02b
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->k:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
+
+    const v2, 0xc02c
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->l:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"
+
+    const v2, 0xc02d
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"
+
+    const v2, 0xc02e
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
+
+    const v2, 0xc02f
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->m:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
+
+    const v2, 0xc030
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->n:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
+
+    const v2, 0xc031
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"
+
+    const v2, 0xc032
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
+
+    const v2, 0xc035
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
+
+    const v2, 0xc036
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+
+    const v2, 0xcca8
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->o:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
+
+    const v2, 0xcca9
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->p:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+
+    const v2, 0xccaa
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
+
+    const v2, 0xccac
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_AES_128_GCM_SHA256"
+
+    const/16 v2, 0x1301
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->q:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_AES_256_GCM_SHA384"
+
+    const/16 v2, 0x1302
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->r:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_CHACHA20_POLY1305_SHA256"
+
+    const/16 v2, 0x1303
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/j;->s:Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_AES_128_CCM_SHA256"
+
+    const/16 v2, 0x1304
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
+
+    sget-object v0, Lo0/j;->t:Lo0/j$b;
+
+    const-string v1, "TLS_AES_128_CCM_8_SHA256"
+
+    const/16 v2, 0x1305
+
+    invoke-static {v0, v1, v2}, Lo0/j$b;->a(Lo0/j$b;Ljava/lang/String;I)Lo0/j;
 
     return-void
+.end method
 
-    :cond_0
-    const-string p1, "delegate"
+.method public constructor <init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const/4 p1, 0x0
+    iput-object p1, p0, Lo0/j;->a:Ljava/lang/String;
 
-    throw p1
+    return-void
 .end method
 
 
 # virtual methods
-.method public a()Lo0/x;
+.method public toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0}, Lo0/x;->a()Lo0/x;
-
-    move-result-object v0
+    iget-object v0, p0, Lo0/j;->a:Ljava/lang/String;
 
     return-object v0
 .end method
-
-.method public b()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0}, Lo0/x;->b()Lo0/x;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public c()J
-    .locals 2
-
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0}, Lo0/x;->c()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public d(J)Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0, p1, p2}, Lo0/x;->d(J)Lo0/x;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public e()Z
-    .locals 1
-
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0}, Lo0/x;->e()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public f()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0}, Lo0/x;->f()V
-
-    return-void
-.end method
-
-.method public g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-    .locals 1
-
-    if-eqz p3, :cond_0
-
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/x;->g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    const-string p1, "unit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public h()J
-    .locals 2
-
-    iget-object v0, p0, Lo0/j;->e:Lo0/x;
-
-    invoke-virtual {v0}, Lo0/x;->h()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
diff --git a/com.discord/smali_classes2/o0/k.smali b/com.discord/smali_classes2/o0/k.smali
index d075b1f90a..6461eb2d3e 100644
--- a/com.discord/smali_classes2/o0/k.smali
+++ b/com.discord/smali_classes2/o0/k.smali
@@ -1,723 +1,8 @@
-.class public final Lo0/k;
+.class public interface abstract Lo0/k;
 .super Ljava/lang/Object;
-.source "GzipSource.kt"
-
-# interfaces
-.implements Lo0/w;
-
-
-# instance fields
-.field public d:B
-
-.field public final e:Lo0/q;
-
-.field public final f:Ljava/util/zip/Inflater;
-
-.field public final g:Lo0/l;
-
-.field public final h:Ljava/util/zip/CRC32;
-
-
-# direct methods
-.method public constructor <init>(Lo0/w;)V
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lo0/q;
-
-    invoke-direct {v0, p1}, Lo0/q;-><init>(Lo0/w;)V
-
-    iput-object v0, p0, Lo0/k;->e:Lo0/q;
-
-    new-instance p1, Ljava/util/zip/Inflater;
-
-    const/4 v0, 0x1
-
-    invoke-direct {p1, v0}, Ljava/util/zip/Inflater;-><init>(Z)V
-
-    iput-object p1, p0, Lo0/k;->f:Ljava/util/zip/Inflater;
-
-    new-instance v0, Lo0/l;
-
-    iget-object v1, p0, Lo0/k;->e:Lo0/q;
-
-    invoke-direct {v0, v1, p1}, Lo0/l;-><init>(Lo0/g;Ljava/util/zip/Inflater;)V
-
-    iput-object v0, p0, Lo0/k;->g:Lo0/l;
-
-    new-instance p1, Ljava/util/zip/CRC32;
-
-    invoke-direct {p1}, Ljava/util/zip/CRC32;-><init>()V
-
-    iput-object p1, p0, Lo0/k;->h:Ljava/util/zip/CRC32;
-
-    return-void
-
-    :cond_0
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
+.source "Connection.kt"
 
 
 # virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 24
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v6, p0
-
-    move-object/from16 v7, p1
-
-    move-wide/from16 v8, p2
-
-    if-eqz v7, :cond_17
-
-    const-wide/16 v0, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x1
-
-    cmp-long v2, v8, v0
-
-    if-ltz v2, :cond_0
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_0
-    if-eqz v3, :cond_16
-
-    if-nez v2, :cond_1
-
-    return-wide v0
-
-    :cond_1
-    iget-byte v0, v6, Lo0/k;->d:B
-
-    const-wide/16 v12, -0x1
-
-    if-nez v0, :cond_11
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    const-wide/16 v1, 0xa
-
-    invoke-virtual {v0, v1, v2}, Lo0/q;->P0(J)V
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    iget-object v0, v0, Lo0/q;->d:Lo0/e;
-
-    const-wide/16 v1, 0x3
-
-    invoke-virtual {v0, v1, v2}, Lo0/e;->e(J)B
-
-    move-result v14
-
-    shr-int/lit8 v0, v14, 0x1
-
-    and-int/2addr v0, v11
-
-    if-ne v0, v11, :cond_2
-
-    const/4 v0, 0x1
-
-    const/4 v15, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v0, 0x0
-
-    const/4 v15, 0x0
-
-    :goto_1
-    if-eqz v15, :cond_3
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    iget-object v1, v0, Lo0/q;->d:Lo0/e;
-
-    const-wide/16 v2, 0x0
-
-    const-wide/16 v4, 0xa
-
-    move-object/from16 v0, p0
-
-    invoke-virtual/range {v0 .. v5}, Lo0/k;->b(Lo0/e;JJ)V
-
-    :cond_3
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    invoke-virtual {v0}, Lo0/q;->readShort()S
-
-    move-result v0
-
-    const/16 v1, 0x1f8b
-
-    const-string v2, "ID1ID2"
-
-    invoke-virtual {v6, v2, v1, v0}, Lo0/k;->a(Ljava/lang/String;II)V
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    const-wide/16 v1, 0x8
-
-    invoke-virtual {v0, v1, v2}, Lo0/q;->skip(J)V
-
-    shr-int/lit8 v0, v14, 0x2
-
-    and-int/2addr v0, v11
-
-    if-ne v0, v11, :cond_4
-
-    const/4 v0, 0x1
-
-    goto :goto_2
-
-    :cond_4
-    const/4 v0, 0x0
-
-    :goto_2
-    const-wide/16 v1, 0x2
-
-    if-eqz v0, :cond_7
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    invoke-virtual {v0, v1, v2}, Lo0/q;->P0(J)V
-
-    if-eqz v15, :cond_5
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    iget-object v1, v0, Lo0/q;->d:Lo0/e;
-
-    const-wide/16 v2, 0x0
-
-    const-wide/16 v4, 0x2
-
-    move-object/from16 v0, p0
-
-    invoke-virtual/range {v0 .. v5}, Lo0/k;->b(Lo0/e;JJ)V
-
-    :cond_5
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    iget-object v0, v0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->r()S
-
-    move-result v0
-
-    int-to-long v4, v0
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    invoke-virtual {v0, v4, v5}, Lo0/q;->P0(J)V
-
-    if-eqz v15, :cond_6
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    iget-object v1, v0, Lo0/q;->d:Lo0/e;
-
-    const-wide/16 v2, 0x0
-
-    move-object/from16 v0, p0
-
-    move-wide/from16 v16, v4
-
-    invoke-virtual/range {v0 .. v5}, Lo0/k;->b(Lo0/e;JJ)V
-
-    goto :goto_3
-
-    :cond_6
-    move-wide/from16 v16, v4
-
-    :goto_3
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    move-wide/from16 v1, v16
-
-    invoke-virtual {v0, v1, v2}, Lo0/q;->skip(J)V
-
-    :cond_7
-    shr-int/lit8 v0, v14, 0x3
-
-    and-int/2addr v0, v11
-
-    if-ne v0, v11, :cond_8
-
-    const/4 v0, 0x1
-
-    goto :goto_4
-
-    :cond_8
-    const/4 v0, 0x0
-
-    :goto_4
-    const-wide/16 v16, 0x1
-
-    if-eqz v0, :cond_b
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    const/16 v19, 0x0
-
-    const-wide/16 v20, 0x0
-
-    const-wide v22, 0x7fffffffffffffffL
-
-    move-object/from16 v18, v0
-
-    invoke-virtual/range {v18 .. v23}, Lo0/q;->a(BJJ)J
-
-    move-result-wide v18
-
-    cmp-long v0, v18, v12
-
-    if-eqz v0, :cond_a
-
-    if-eqz v15, :cond_9
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    iget-object v1, v0, Lo0/q;->d:Lo0/e;
-
-    const-wide/16 v2, 0x0
-
-    add-long v4, v18, v16
-
-    move-object/from16 v0, p0
-
-    invoke-virtual/range {v0 .. v5}, Lo0/k;->b(Lo0/e;JJ)V
-
-    :cond_9
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    add-long v1, v18, v16
-
-    invoke-virtual {v0, v1, v2}, Lo0/q;->skip(J)V
-
-    goto :goto_5
-
-    :cond_a
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-
-    :cond_b
-    :goto_5
-    shr-int/lit8 v0, v14, 0x4
-
-    and-int/2addr v0, v11
-
-    if-ne v0, v11, :cond_c
-
-    const/4 v10, 0x1
-
-    :cond_c
-    if-eqz v10, :cond_f
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    const-wide v4, 0x7fffffffffffffffL
-
-    invoke-virtual/range {v0 .. v5}, Lo0/q;->a(BJJ)J
-
-    move-result-wide v18
-
-    cmp-long v0, v18, v12
-
-    if-eqz v0, :cond_e
-
-    if-eqz v15, :cond_d
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    iget-object v1, v0, Lo0/q;->d:Lo0/e;
-
-    const-wide/16 v2, 0x0
-
-    add-long v4, v18, v16
-
-    move-object/from16 v0, p0
-
-    invoke-virtual/range {v0 .. v5}, Lo0/k;->b(Lo0/e;JJ)V
-
-    :cond_d
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    add-long v1, v18, v16
-
-    invoke-virtual {v0, v1, v2}, Lo0/q;->skip(J)V
-
-    goto :goto_6
-
-    :cond_e
-    new-instance v0, Ljava/io/EOFException;
-
-    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
-
-    throw v0
-
-    :cond_f
-    :goto_6
-    if-eqz v15, :cond_10
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    const-wide/16 v1, 0x2
-
-    invoke-virtual {v0, v1, v2}, Lo0/q;->P0(J)V
-
-    iget-object v0, v0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->r()S
-
-    move-result v0
-
-    iget-object v1, v6, Lo0/k;->h:Ljava/util/zip/CRC32;
-
-    invoke-virtual {v1}, Ljava/util/zip/CRC32;->getValue()J
-
-    move-result-wide v1
-
-    long-to-int v2, v1
-
-    int-to-short v1, v2
-
-    const-string v2, "FHCRC"
-
-    invoke-virtual {v6, v2, v0, v1}, Lo0/k;->a(Ljava/lang/String;II)V
-
-    iget-object v0, v6, Lo0/k;->h:Ljava/util/zip/CRC32;
-
-    invoke-virtual {v0}, Ljava/util/zip/CRC32;->reset()V
-
-    :cond_10
-    iput-byte v11, v6, Lo0/k;->d:B
-
-    :cond_11
-    iget-byte v0, v6, Lo0/k;->d:B
-
-    const/4 v1, 0x2
-
-    if-ne v0, v11, :cond_13
-
-    iget-wide v2, v7, Lo0/e;->e:J
-
-    iget-object v0, v6, Lo0/k;->g:Lo0/l;
-
-    invoke-virtual {v0, v7, v8, v9}, Lo0/l;->B0(Lo0/e;J)J
-
-    move-result-wide v8
-
-    cmp-long v0, v8, v12
-
-    if-eqz v0, :cond_12
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-wide v4, v8
-
-    invoke-virtual/range {v0 .. v5}, Lo0/k;->b(Lo0/e;JJ)V
-
-    return-wide v8
-
-    :cond_12
-    iput-byte v1, v6, Lo0/k;->d:B
-
-    :cond_13
-    iget-byte v0, v6, Lo0/k;->d:B
-
-    if-ne v0, v1, :cond_15
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    invoke-virtual {v0}, Lo0/q;->b()I
-
-    move-result v0
-
-    iget-object v1, v6, Lo0/k;->h:Ljava/util/zip/CRC32;
-
-    invoke-virtual {v1}, Ljava/util/zip/CRC32;->getValue()J
-
-    move-result-wide v1
-
-    long-to-int v2, v1
-
-    const-string v1, "CRC"
-
-    invoke-virtual {v6, v1, v0, v2}, Lo0/k;->a(Ljava/lang/String;II)V
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    invoke-virtual {v0}, Lo0/q;->b()I
-
-    move-result v0
-
-    iget-object v1, v6, Lo0/k;->f:Ljava/util/zip/Inflater;
-
-    invoke-virtual {v1}, Ljava/util/zip/Inflater;->getBytesWritten()J
-
-    move-result-wide v1
-
-    long-to-int v2, v1
-
-    const-string v1, "ISIZE"
-
-    invoke-virtual {v6, v1, v0, v2}, Lo0/k;->a(Ljava/lang/String;II)V
-
-    const/4 v0, 0x3
-
-    iput-byte v0, v6, Lo0/k;->d:B
-
-    iget-object v0, v6, Lo0/k;->e:Lo0/q;
-
-    invoke-virtual {v0}, Lo0/q;->J()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_14
-
-    goto :goto_7
-
-    :cond_14
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "gzip finished without exhausting source"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_15
-    :goto_7
-    return-wide v12
-
-    :cond_16
-    const-string v0, "byteCount < 0: "
-
-    invoke-static {v0, v8, v9}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_17
-    const-string v0, "sink"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public final a(Ljava/lang/String;II)V
-    .locals 4
-
-    if-ne p3, p2, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/io/IOException;
-
-    const/4 v1, 0x3
-
-    new-array v2, v1, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    aput-object p1, v2, v3
-
-    const/4 p1, 0x1
-
-    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p3
-
-    aput-object p3, v2, p1
-
-    const/4 p1, 0x2
-
-    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p2
-
-    aput-object p2, v2, p1
-
-    const-string p1, "%s: actual 0x%08x != expected 0x%08x"
-
-    const-string p2, "java.lang.String.format(this, *args)"
-
-    invoke-static {v2, v1, p1, p2}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final b(Lo0/e;JJ)V
-    .locals 6
-
-    iget-object p1, p1, Lo0/e;->d:Lo0/r;
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_4
-
-    :goto_0
-    iget v1, p1, Lo0/r;->c:I
-
-    iget v2, p1, Lo0/r;->b:I
-
-    sub-int v3, v1, v2
-
-    int-to-long v3, v3
-
-    cmp-long v5, p2, v3
-
-    if-ltz v5, :cond_1
-
-    sub-int/2addr v1, v2
-
-    int-to-long v1, v1
-
-    sub-long/2addr p2, v1
-
-    iget-object p1, p1, Lo0/r;->f:Lo0/r;
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_1
-    const-wide/16 v1, 0x0
-
-    :goto_1
-    cmp-long v3, p4, v1
-
-    if-lez v3, :cond_3
-
-    iget v3, p1, Lo0/r;->b:I
-
-    int-to-long v3, v3
-
-    add-long/2addr v3, p2
-
-    long-to-int p2, v3
-
-    iget p3, p1, Lo0/r;->c:I
-
-    sub-int/2addr p3, p2
-
-    int-to-long v3, p3
-
-    invoke-static {v3, v4, p4, p5}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v3
-
-    long-to-int p3, v3
-
-    iget-object v3, p0, Lo0/k;->h:Ljava/util/zip/CRC32;
-
-    iget-object v4, p1, Lo0/r;->a:[B
-
-    invoke-virtual {v3, v4, p2, p3}, Ljava/util/zip/CRC32;->update([BII)V
-
-    int-to-long p2, p3
-
-    sub-long/2addr p4, p2
-
-    iget-object p1, p1, Lo0/r;->f:Lo0/r;
-
-    if-eqz p1, :cond_2
-
-    move-wide p2, v1
-
-    goto :goto_1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_3
-    return-void
-
-    :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-.end method
-
-.method public close()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lo0/k;->g:Lo0/l;
-
-    invoke-virtual {v0}, Lo0/l;->close()V
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/k;->e:Lo0/q;
-
-    invoke-virtual {v0}, Lo0/q;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    return-object v0
+.method public abstract a()Lo0/y;
 .end method
diff --git a/com.discord/smali_classes2/o0/l.smali b/com.discord/smali_classes2/o0/l.smali
index 6322e43dd6..6407ce8716 100644
--- a/com.discord/smali_classes2/o0/l.smali
+++ b/com.discord/smali_classes2/o0/l.smali
@@ -1,400 +1,33 @@
 .class public final Lo0/l;
 .super Ljava/lang/Object;
-.source "InflaterSource.kt"
-
-# interfaces
-.implements Lo0/w;
+.source "ConnectionPool.kt"
 
 
 # instance fields
-.field public d:I
-
-.field public e:Z
-
-.field public final f:Lo0/g;
-
-.field public final g:Ljava/util/zip/Inflater;
+.field public final a:Lo0/g0/d/j;
 
 
 # direct methods
-.method public constructor <init>(Lo0/g;Ljava/util/zip/Inflater;)V
-    .locals 0
+.method public constructor <init>()V
+    .locals 5
 
-    if-eqz p1, :cond_0
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
+
+    const-string v1, "timeUnit"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lo0/l;->f:Lo0/g;
+    new-instance v1, Lo0/g0/d/j;
 
-    iput-object p2, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
+    const/4 v2, 0x5
 
-    return-void
+    const-wide/16 v3, 0x5
 
-    :cond_0
-    const-string p1, "source"
+    invoke-direct {v1, v2, v3, v4, v0}, Lo0/g0/d/j;-><init>(IJLjava/util/concurrent/TimeUnit;)V
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 8
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_e
-
-    const-wide/16 v1, 0x0
-
-    const/4 v3, 0x1
-
-    cmp-long v4, p2, v1
-
-    if-ltz v4, :cond_0
-
-    const/4 v5, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    :goto_0
-    if-eqz v5, :cond_d
-
-    iget-boolean v5, p0, Lo0/l;->e:Z
-
-    xor-int/2addr v5, v3
-
-    if-eqz v5, :cond_c
-
-    if-nez v4, :cond_1
-
-    return-wide v1
-
-    :cond_1
-    :goto_1
-    iget-object v1, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    invoke-virtual {v1}, Ljava/util/zip/Inflater;->needsInput()Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    goto :goto_3
-
-    :cond_2
-    invoke-virtual {p0}, Lo0/l;->a()V
-
-    iget-object v1, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    invoke-virtual {v1}, Ljava/util/zip/Inflater;->getRemaining()I
-
-    move-result v1
-
-    if-nez v1, :cond_3
-
-    const/4 v1, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v1, 0x0
-
-    :goto_2
-    if-eqz v1, :cond_b
-
-    iget-object v1, p0, Lo0/l;->f:Lo0/g;
-
-    invoke-interface {v1}, Lo0/g;->J()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    const/4 v1, 0x1
-
-    goto :goto_4
-
-    :cond_4
-    iget-object v1, p0, Lo0/l;->f:Lo0/g;
-
-    invoke-interface {v1}, Lo0/g;->h()Lo0/e;
-
-    move-result-object v1
-
-    iget-object v1, v1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v1, :cond_a
-
-    iget v2, v1, Lo0/r;->c:I
-
-    iget v4, v1, Lo0/r;->b:I
-
-    sub-int/2addr v2, v4
-
-    iput v2, p0, Lo0/l;->d:I
-
-    iget-object v5, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    iget-object v1, v1, Lo0/r;->a:[B
-
-    invoke-virtual {v5, v1, v4, v2}, Ljava/util/zip/Inflater;->setInput([BII)V
-
-    :goto_3
-    const/4 v1, 0x0
-
-    :goto_4
-    :try_start_0
-    invoke-virtual {p1, v3}, Lo0/e;->C(I)Lo0/r;
-
-    move-result-object v2
-
-    iget v4, v2, Lo0/r;->c:I
-
-    rsub-int v4, v4, 0x2000
-
-    int-to-long v4, v4
-
-    invoke-static {p2, p3, v4, v5}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v4
-
-    long-to-int v5, v4
-
-    iget-object v4, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    iget-object v6, v2, Lo0/r;->a:[B
-
-    iget v7, v2, Lo0/r;->c:I
-
-    invoke-virtual {v4, v6, v7, v5}, Ljava/util/zip/Inflater;->inflate([BII)I
-
-    move-result v4
-
-    if-lez v4, :cond_5
-
-    iget p2, v2, Lo0/r;->c:I
-
-    add-int/2addr p2, v4
-
-    iput p2, v2, Lo0/r;->c:I
-
-    iget-wide p2, p1, Lo0/e;->e:J
-
-    int-to-long v0, v4
-
-    add-long/2addr p2, v0
-
-    iput-wide p2, p1, Lo0/e;->e:J
-
-    return-wide v0
-
-    :cond_5
-    iget-object v4, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    invoke-virtual {v4}, Ljava/util/zip/Inflater;->finished()Z
-
-    move-result v4
-
-    if-nez v4, :cond_8
-
-    iget-object v4, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    invoke-virtual {v4}, Ljava/util/zip/Inflater;->needsDictionary()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_6
-
-    goto :goto_5
-
-    :cond_6
-    if-nez v1, :cond_7
-
-    goto :goto_1
-
-    :cond_7
-    new-instance p1, Ljava/io/EOFException;
-
-    const-string p2, "source exhausted prematurely"
-
-    invoke-direct {p1, p2}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    :goto_5
-    invoke-virtual {p0}, Lo0/l;->a()V
-
-    iget p2, v2, Lo0/r;->b:I
-
-    iget p3, v2, Lo0/r;->c:I
-
-    if-ne p2, p3, :cond_9
-
-    invoke-virtual {v2}, Lo0/r;->a()Lo0/r;
-
-    move-result-object p2
-
-    iput-object p2, p1, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v2}, Lo0/s;->a(Lo0/r;)V
-    :try_end_0
-    .catch Ljava/util/zip/DataFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :cond_9
-    const-wide/16 p1, -0x1
-
-    return-wide p1
-
-    :catch_0
-    move-exception p1
-
-    new-instance p2, Ljava/io/IOException;
-
-    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/Throwable;)V
-
-    throw p2
-
-    :cond_a
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_b
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "?"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_c
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_d
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_e
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final a()V
-    .locals 4
-
-    iget v0, p0, Lo0/l;->d:I
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v1, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    invoke-virtual {v1}, Ljava/util/zip/Inflater;->getRemaining()I
-
-    move-result v1
-
-    sub-int/2addr v0, v1
-
-    iget v1, p0, Lo0/l;->d:I
-
-    sub-int/2addr v1, v0
-
-    iput v1, p0, Lo0/l;->d:I
-
-    iget-object v1, p0, Lo0/l;->f:Lo0/g;
-
-    int-to-long v2, v0
-
-    invoke-interface {v1, v2, v3}, Lo0/g;->skip(J)V
+    iput-object v1, p0, Lo0/l;->a:Lo0/g0/d/j;
 
     return-void
 .end method
-
-.method public close()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lo0/l;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lo0/l;->g:Ljava/util/zip/Inflater;
-
-    invoke-virtual {v0}, Ljava/util/zip/Inflater;->end()V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lo0/l;->e:Z
-
-    iget-object v0, p0, Lo0/l;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/w;->close()V
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/l;->f:Lo0/g;
-
-    invoke-interface {v0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/o0/m$a.smali b/com.discord/smali_classes2/o0/m$a.smali
new file mode 100644
index 0000000000..045a535d74
--- /dev/null
+++ b/com.discord/smali_classes2/o0/m$a.smali
@@ -0,0 +1,427 @@
+.class public final Lo0/m$a;
+.super Ljava/lang/Object;
+.source "ConnectionSpec.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/m;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:Z
+
+.field public b:[Ljava/lang/String;
+
+.field public c:[Ljava/lang/String;
+
+.field public d:Z
+
+
+# direct methods
+.method public constructor <init>(Lo0/m;)V
+    .locals 1
+
+    const-string v0, "connectionSpec"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-boolean v0, p1, Lo0/m;->a:Z
+
+    iput-boolean v0, p0, Lo0/m$a;->a:Z
+
+    iget-object v0, p1, Lo0/m;->c:[Ljava/lang/String;
+
+    iput-object v0, p0, Lo0/m$a;->b:[Ljava/lang/String;
+
+    iget-object v0, p1, Lo0/m;->d:[Ljava/lang/String;
+
+    iput-object v0, p0, Lo0/m$a;->c:[Ljava/lang/String;
+
+    iget-boolean p1, p1, Lo0/m;->b:Z
+
+    iput-boolean p1, p0, Lo0/m$a;->d:Z
+
+    return-void
+.end method
+
+.method public constructor <init>(Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Lo0/m$a;->a:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Lo0/m;
+    .locals 5
+
+    new-instance v0, Lo0/m;
+
+    iget-boolean v1, p0, Lo0/m$a;->a:Z
+
+    iget-boolean v2, p0, Lo0/m$a;->d:Z
+
+    iget-object v3, p0, Lo0/m$a;->b:[Ljava/lang/String;
+
+    iget-object v4, p0, Lo0/m$a;->c:[Ljava/lang/String;
+
+    invoke-direct {v0, v1, v2, v3, v4}, Lo0/m;-><init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final varargs b([Ljava/lang/String;)Lo0/m$a;
+    .locals 2
+
+    const-string v0, "cipherSuites"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/m$a;->a:Z
+
+    if-eqz v0, :cond_3
+
+    array-length v0, p1
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p1}, Ljava/lang/Object;->clone()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, [Ljava/lang/String;
+
+    iput-object p1, p0, Lo0/m$a;->b:[Ljava/lang/String;
+
+    return-object p0
+
+    :cond_1
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<kotlin.String>"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "At least one cipher suite is required"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "no cipher suites for cleartext connections"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final varargs c([Lo0/j;)Lo0/m$a;
+    .locals 5
+
+    const-string v0, "cipherSuites"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/m$a;->a:Z
+
+    if-eqz v0, :cond_2
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    array-length v1, p1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    array-length v1, p1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_0
+
+    aget-object v4, p1, v3
+
+    iget-object v4, v4, Lo0/j;->a:Ljava/lang/String;
+
+    invoke-interface {v0, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    new-array p1, v2, [Ljava/lang/String;
+
+    invoke-interface {v0, p1}, Ljava/util/Collection;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, [Ljava/lang/String;
+
+    array-length v0, p1
+
+    invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lo0/m$a;->b([Ljava/lang/String;)Lo0/m$a;
+
+    return-object p0
+
+    :cond_1
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "no cipher suites for cleartext connections"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final d(Z)Lo0/m$a;
+    .locals 1
+
+    iget-boolean v0, p0, Lo0/m$a;->a:Z
+
+    if-eqz v0, :cond_0
+
+    iput-boolean p1, p0, Lo0/m$a;->d:Z
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "no TLS extensions for cleartext connections"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final varargs e([Ljava/lang/String;)Lo0/m$a;
+    .locals 2
+
+    const-string v0, "tlsVersions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/m$a;->a:Z
+
+    if-eqz v0, :cond_3
+
+    array-length v0, p1
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p1}, Ljava/lang/Object;->clone()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, [Ljava/lang/String;
+
+    iput-object p1, p0, Lo0/m$a;->c:[Ljava/lang/String;
+
+    return-object p0
+
+    :cond_1
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<kotlin.String>"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "At least one TLS version is required"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "no TLS versions for cleartext connections"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final varargs f([Lo0/f0;)Lo0/m$a;
+    .locals 5
+
+    const-string v0, "tlsVersions"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/m$a;->a:Z
+
+    if-eqz v0, :cond_2
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    array-length v1, p1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    array-length v1, p1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_0
+
+    aget-object v4, p1, v3
+
+    iget-object v4, v4, Lo0/f0;->javaName:Ljava/lang/String;
+
+    invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    new-array p1, v2, [Ljava/lang/String;
+
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    check-cast p1, [Ljava/lang/String;
+
+    array-length v0, p1
+
+    invoke-static {p1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ljava/lang/String;
+
+    invoke-virtual {p0, p1}, Lo0/m$a;->e([Ljava/lang/String;)Lo0/m$a;
+
+    return-object p0
+
+    :cond_1
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "no TLS versions for cleartext connections"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/m.smali b/com.discord/smali_classes2/o0/m.smali
index 1275b99f5e..934746504e 100644
--- a/com.discord/smali_classes2/o0/m.smali
+++ b/com.discord/smali_classes2/o0/m.smali
@@ -1,193 +1,670 @@
 .class public final Lo0/m;
 .super Ljava/lang/Object;
-.source "Okio.kt"
+.source "ConnectionSpec.kt"
 
-# interfaces
-.implements Lo0/w;
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/m$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final e:[Lo0/j;
+
+.field public static final f:[Lo0/j;
+
+.field public static final g:Lo0/m;
+
+.field public static final h:Lo0/m;
 
 
 # instance fields
-.field public final d:Ljava/io/InputStream;
+.field public final a:Z
 
-.field public final e:Lo0/x;
+.field public final b:Z
+
+.field public final c:[Ljava/lang/String;
+
+.field public final d:[Ljava/lang/String;
 
 
 # direct methods
-.method public constructor <init>(Ljava/io/InputStream;Lo0/x;)V
+.method public static constructor <clinit>()V
+    .locals 14
+
+    sget-object v0, Lo0/f0;->e:Lo0/f0;
+
+    sget-object v1, Lo0/f0;->d:Lo0/f0;
+
+    const/16 v2, 0x9
+
+    new-array v3, v2, [Lo0/j;
+
+    sget-object v4, Lo0/j;->q:Lo0/j;
+
+    const/4 v5, 0x0
+
+    aput-object v4, v3, v5
+
+    sget-object v4, Lo0/j;->r:Lo0/j;
+
+    const/4 v6, 0x1
+
+    aput-object v4, v3, v6
+
+    sget-object v4, Lo0/j;->s:Lo0/j;
+
+    const/4 v7, 0x2
+
+    aput-object v4, v3, v7
+
+    sget-object v4, Lo0/j;->k:Lo0/j;
+
+    const/4 v8, 0x3
+
+    aput-object v4, v3, v8
+
+    sget-object v4, Lo0/j;->m:Lo0/j;
+
+    const/4 v9, 0x4
+
+    aput-object v4, v3, v9
+
+    sget-object v4, Lo0/j;->l:Lo0/j;
+
+    const/4 v10, 0x5
+
+    aput-object v4, v3, v10
+
+    sget-object v4, Lo0/j;->n:Lo0/j;
+
+    const/4 v11, 0x6
+
+    aput-object v4, v3, v11
+
+    sget-object v4, Lo0/j;->p:Lo0/j;
+
+    const/4 v12, 0x7
+
+    aput-object v4, v3, v12
+
+    sget-object v4, Lo0/j;->o:Lo0/j;
+
+    const/16 v13, 0x8
+
+    aput-object v4, v3, v13
+
+    sput-object v3, Lo0/m;->e:[Lo0/j;
+
+    const/16 v3, 0x10
+
+    new-array v3, v3, [Lo0/j;
+
+    sget-object v4, Lo0/j;->q:Lo0/j;
+
+    aput-object v4, v3, v5
+
+    sget-object v4, Lo0/j;->r:Lo0/j;
+
+    aput-object v4, v3, v6
+
+    sget-object v4, Lo0/j;->s:Lo0/j;
+
+    aput-object v4, v3, v7
+
+    sget-object v4, Lo0/j;->k:Lo0/j;
+
+    aput-object v4, v3, v8
+
+    sget-object v4, Lo0/j;->m:Lo0/j;
+
+    aput-object v4, v3, v9
+
+    sget-object v4, Lo0/j;->l:Lo0/j;
+
+    aput-object v4, v3, v10
+
+    sget-object v4, Lo0/j;->n:Lo0/j;
+
+    aput-object v4, v3, v11
+
+    sget-object v4, Lo0/j;->p:Lo0/j;
+
+    aput-object v4, v3, v12
+
+    sget-object v4, Lo0/j;->o:Lo0/j;
+
+    aput-object v4, v3, v13
+
+    sget-object v4, Lo0/j;->i:Lo0/j;
+
+    aput-object v4, v3, v2
+
+    sget-object v2, Lo0/j;->j:Lo0/j;
+
+    const/16 v4, 0xa
+
+    aput-object v2, v3, v4
+
+    sget-object v2, Lo0/j;->g:Lo0/j;
+
+    const/16 v4, 0xb
+
+    aput-object v2, v3, v4
+
+    sget-object v2, Lo0/j;->h:Lo0/j;
+
+    const/16 v4, 0xc
+
+    aput-object v2, v3, v4
+
+    sget-object v2, Lo0/j;->e:Lo0/j;
+
+    const/16 v4, 0xd
+
+    aput-object v2, v3, v4
+
+    sget-object v2, Lo0/j;->f:Lo0/j;
+
+    const/16 v4, 0xe
+
+    aput-object v2, v3, v4
+
+    sget-object v2, Lo0/j;->d:Lo0/j;
+
+    const/16 v4, 0xf
+
+    aput-object v2, v3, v4
+
+    sput-object v3, Lo0/m;->f:[Lo0/j;
+
+    new-instance v2, Lo0/m$a;
+
+    invoke-direct {v2, v6}, Lo0/m$a;-><init>(Z)V
+
+    sget-object v3, Lo0/m;->e:[Lo0/j;
+
+    array-length v4, v3
+
+    invoke-static {v3, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, [Lo0/j;
+
+    invoke-virtual {v2, v3}, Lo0/m$a;->c([Lo0/j;)Lo0/m$a;
+
+    new-array v3, v7, [Lo0/f0;
+
+    aput-object v1, v3, v5
+
+    aput-object v0, v3, v6
+
+    invoke-virtual {v2, v3}, Lo0/m$a;->f([Lo0/f0;)Lo0/m$a;
+
+    invoke-virtual {v2, v6}, Lo0/m$a;->d(Z)Lo0/m$a;
+
+    invoke-virtual {v2}, Lo0/m$a;->a()Lo0/m;
+
+    new-instance v2, Lo0/m$a;
+
+    invoke-direct {v2, v6}, Lo0/m$a;-><init>(Z)V
+
+    sget-object v3, Lo0/m;->f:[Lo0/j;
+
+    array-length v4, v3
+
+    invoke-static {v3, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, [Lo0/j;
+
+    invoke-virtual {v2, v3}, Lo0/m$a;->c([Lo0/j;)Lo0/m$a;
+
+    new-array v3, v7, [Lo0/f0;
+
+    aput-object v1, v3, v5
+
+    aput-object v0, v3, v6
+
+    invoke-virtual {v2, v3}, Lo0/m$a;->f([Lo0/f0;)Lo0/m$a;
+
+    invoke-virtual {v2, v6}, Lo0/m$a;->d(Z)Lo0/m$a;
+
+    invoke-virtual {v2}, Lo0/m$a;->a()Lo0/m;
+
+    move-result-object v2
+
+    sput-object v2, Lo0/m;->g:Lo0/m;
+
+    new-instance v2, Lo0/m$a;
+
+    invoke-direct {v2, v6}, Lo0/m$a;-><init>(Z)V
+
+    sget-object v3, Lo0/m;->f:[Lo0/j;
+
+    array-length v4, v3
+
+    invoke-static {v3, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, [Lo0/j;
+
+    invoke-virtual {v2, v3}, Lo0/m$a;->c([Lo0/j;)Lo0/m$a;
+
+    new-array v3, v9, [Lo0/f0;
+
+    aput-object v1, v3, v5
+
+    aput-object v0, v3, v6
+
+    sget-object v0, Lo0/f0;->f:Lo0/f0;
+
+    aput-object v0, v3, v7
+
+    sget-object v0, Lo0/f0;->g:Lo0/f0;
+
+    aput-object v0, v3, v8
+
+    invoke-virtual {v2, v3}, Lo0/m$a;->f([Lo0/f0;)Lo0/m$a;
+
+    invoke-virtual {v2, v6}, Lo0/m$a;->d(Z)Lo0/m$a;
+
+    invoke-virtual {v2}, Lo0/m$a;->a()Lo0/m;
+
+    new-instance v0, Lo0/m;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v5, v5, v1, v1}, Lo0/m;-><init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
+
+    sput-object v0, Lo0/m;->h:Lo0/m;
+
+    return-void
+.end method
+
+.method public constructor <init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lo0/m;->d:Ljava/io/InputStream;
+    iput-boolean p1, p0, Lo0/m;->a:Z
 
-    iput-object p2, p0, Lo0/m;->e:Lo0/x;
+    iput-boolean p2, p0, Lo0/m;->b:Z
+
+    iput-object p3, p0, Lo0/m;->c:[Ljava/lang/String;
+
+    iput-object p4, p0, Lo0/m;->d:[Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 3
+.method public final a()Ljava/util/List;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lo0/j;",
+            ">;"
+        }
+    .end annotation
 
-    if-eqz p1, :cond_5
+    iget-object v0, p0, Lo0/m;->c:[Ljava/lang/String;
 
-    const-wide/16 v0, 0x0
+    if-eqz v0, :cond_1
 
-    cmp-long v2, p2, v0
+    new-instance v1, Ljava/util/ArrayList;
 
-    if-nez v2, :cond_0
+    array-length v2, v0
 
-    return-wide v0
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    array-length v2, v0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v2, :cond_0
+
+    aget-object v4, v0, v3
+
+    sget-object v5, Lo0/j;->t:Lo0/j$b;
+
+    invoke-virtual {v5, v4}, Lo0/j$b;->b(Ljava/lang/String;)Lo0/j;
+
+    move-result-object v4
+
+    invoke-interface {v1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {v1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    return-object v0
+.end method
+
+.method public final b(Ljavax/net/ssl/SSLSocket;)Z
+    .locals 4
+
+    const-string v0, "socket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/m;->a:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    iget-object v0, p0, Lo0/m;->d:[Ljava/lang/String;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
+
+    move-result-object v2
+
+    sget-object v3, Lk0/k/c;->d:Lk0/k/c;
+
+    invoke-static {v0, v2, v3}, Lo0/g0/b;->m([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    return v1
+
+    :cond_1
+    iget-object v0, p0, Lo0/m;->c:[Ljava/lang/String;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p1}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
+
+    move-result-object p1
+
+    sget-object v2, Lo0/j;->t:Lo0/j$b;
+
+    sget-object v2, Lo0/j;->b:Ljava/util/Comparator;
+
+    invoke-static {v0, p1, v2}, Lo0/g0/b;->m([Ljava/lang/String;[Ljava/lang/String;Ljava/util/Comparator;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_2
+
+    return v1
+
+    :cond_2
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final c()Ljava/util/List;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lo0/f0;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/m;->d:[Ljava/lang/String;
+
+    if-eqz v0, :cond_1
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    array-length v2, v0
+
+    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+
+    array-length v2, v0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v2, :cond_0
+
+    aget-object v4, v0, v3
+
+    sget-object v5, Lo0/f0;->j:Lo0/f0$a;
+
+    invoke-virtual {v5, v4}, Lo0/f0$a;->a(Ljava/lang/String;)Lo0/f0;
+
+    move-result-object v4
+
+    invoke-interface {v1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {v1}, Lk0/j/l;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_1
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    instance-of v0, p1, Lo0/m;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return v1
 
     :cond_0
     const/4 v0, 0x1
 
-    if-ltz v2, :cond_1
+    if-ne p1, p0, :cond_1
 
-    const/4 v1, 0x1
+    return v0
+
+    :cond_1
+    iget-boolean v2, p0, Lo0/m;->a:Z
+
+    check-cast p1, Lo0/m;
+
+    iget-boolean v3, p1, Lo0/m;->a:Z
+
+    if-eq v2, v3, :cond_2
+
+    return v1
+
+    :cond_2
+    if-eqz v2, :cond_5
+
+    iget-object v2, p0, Lo0/m;->c:[Ljava/lang/String;
+
+    iget-object v3, p1, Lo0/m;->c:[Ljava/lang/String;
+
+    invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-nez v2, :cond_3
+
+    return v1
+
+    :cond_3
+    iget-object v2, p0, Lo0/m;->d:[Ljava/lang/String;
+
+    iget-object v3, p1, Lo0/m;->d:[Ljava/lang/String;
+
+    invoke-static {v2, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-nez v2, :cond_4
+
+    return v1
+
+    :cond_4
+    iget-boolean v2, p0, Lo0/m;->b:Z
+
+    iget-boolean p1, p1, Lo0/m;->b:Z
+
+    if-eq v2, p1, :cond_5
+
+    return v1
+
+    :cond_5
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-boolean v0, p0, Lo0/m;->a:Z
+
+    if-eqz v0, :cond_2
+
+    const/16 v0, 0x20f
+
+    iget-object v1, p0, Lo0/m;->c:[Ljava/lang/String;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_0
+
+    invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
+
+    move-result v1
 
     goto :goto_0
 
-    :cond_1
+    :cond_0
     const/4 v1, 0x0
 
     :goto_0
-    if-eqz v1, :cond_4
+    add-int/2addr v0, v1
 
-    :try_start_0
-    iget-object v1, p0, Lo0/m;->e:Lo0/x;
+    mul-int/lit8 v0, v0, 0x1f
 
-    invoke-virtual {v1}, Lo0/x;->f()V
+    iget-object v1, p0, Lo0/m;->d:[Ljava/lang/String;
 
-    invoke-virtual {p1, v0}, Lo0/e;->C(I)Lo0/r;
+    if-eqz v1, :cond_1
 
-    move-result-object v0
+    invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
-    iget v1, v0, Lo0/r;->c:I
+    move-result v2
 
-    rsub-int v1, v1, 0x2000
+    :cond_1
+    add-int/2addr v0, v2
 
-    int-to-long v1, v1
+    mul-int/lit8 v0, v0, 0x1f
 
-    invoke-static {p2, p3, v1, v2}, Ljava/lang/Math;->min(JJ)J
+    iget-boolean v1, p0, Lo0/m;->b:Z
 
-    move-result-wide p2
+    xor-int/lit8 v1, v1, 0x1
 
-    long-to-int p3, p2
+    add-int/2addr v0, v1
 
-    iget-object p2, p0, Lo0/m;->d:Ljava/io/InputStream;
-
-    iget-object v1, v0, Lo0/r;->a:[B
-
-    iget v2, v0, Lo0/r;->c:I
-
-    invoke-virtual {p2, v1, v2, p3}, Ljava/io/InputStream;->read([BII)I
-
-    move-result p2
-
-    const/4 p3, -0x1
-
-    if-ne p2, p3, :cond_2
-
-    const-wide/16 p1, -0x1
-
-    return-wide p1
+    goto :goto_1
 
     :cond_2
-    iget p3, v0, Lo0/r;->c:I
+    const/16 v0, 0x11
 
-    add-int/2addr p3, p2
-
-    iput p3, v0, Lo0/r;->c:I
-
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    int-to-long p2, p2
-
-    add-long/2addr v0, p2
-
-    iput-wide v0, p1, Lo0/e;->e:J
-    :try_end_0
-    .catch Ljava/lang/AssertionError; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-wide p2
-
-    :catch_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->I(Ljava/lang/AssertionError;)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_3
-
-    new-instance p2, Ljava/io/IOException;
-
-    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/Throwable;)V
-
-    throw p2
-
-    :cond_3
-    throw p1
-
-    :cond_4
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_5
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public close()V
-    .locals 1
-
-    iget-object v0, p0, Lo0/m;->d:Ljava/io/InputStream;
-
-    invoke-virtual {v0}, Ljava/io/InputStream;->close()V
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/m;->e:Lo0/x;
-
-    return-object v0
+    :goto_1
+    return v0
 .end method
 
 .method public toString()Ljava/lang/String;
-    .locals 2
+    .locals 4
 
-    const-string v0, "source("
+    iget-boolean v0, p0, Lo0/m;->a:Z
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    if-nez v0, :cond_0
+
+    const-string v0, "ConnectionSpec()"
+
+    return-object v0
+
+    :cond_0
+    const-string v0, "ConnectionSpec("
+
+    const-string v1, "cipherSuites="
+
+    invoke-static {v0, v1}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 
-    iget-object v1, p0, Lo0/m;->d:Ljava/io/InputStream;
+    invoke-virtual {p0}, Lo0/m;->a()Ljava/util/List;
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    move-result-object v1
+
+    const-string v2, "[all enabled]"
+
+    invoke-static {v1, v2}, Ljava/util/Objects;->toString(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, "tlsVersions="
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lo0/m;->c()Ljava/util/List;
+
+    move-result-object v3
+
+    invoke-static {v3, v2}, Ljava/util/Objects;->toString(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "supportsTlsExtensions="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lo0/m;->b:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
     const/16 v1, 0x29
 
diff --git a/com.discord/smali_classes2/o0/n$a.smali b/com.discord/smali_classes2/o0/n$a.smali
index cb3a3617a6..35ffd57b1c 100644
--- a/com.discord/smali_classes2/o0/n$a.smali
+++ b/com.discord/smali_classes2/o0/n$a.smali
@@ -1,6 +1,6 @@
 .class public final Lo0/n$a;
 .super Ljava/lang/Object;
-.source "Options.kt"
+.source "Cookie.kt"
 
 
 # annotations
@@ -25,1023 +25,217 @@
 
 
 # virtual methods
-.method public final a(JLo0/e;ILjava/util/List;IILjava/util/List;)V
-    .locals 19
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J",
-            "Lo0/e;",
-            "I",
-            "Ljava/util/List<",
-            "+",
-            "Lokio/ByteString;",
-            ">;II",
-            "Ljava/util/List<",
-            "Ljava/lang/Integer;",
-            ">;)V"
-        }
-    .end annotation
-
-    move-object/from16 v9, p0
-
-    move-object/from16 v10, p3
-
-    move/from16 v11, p4
-
-    move-object/from16 v12, p5
-
-    move/from16 v0, p6
-
-    move/from16 v13, p7
-
-    move-object/from16 v14, p8
-
-    if-ge v0, v13, :cond_0
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
+.method public final a(Ljava/lang/String;IIZ)I
+    .locals 4
 
     :goto_0
-    const-string v4, "Failed requirement."
+    if-ge p2, p3, :cond_7
 
-    if-eqz v3, :cond_14
+    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
 
-    move v3, v0
+    move-result v0
 
-    :goto_1
-    if-ge v3, v13, :cond_3
-
-    invoke-interface {v12, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lokio/ByteString;
-
-    invoke-virtual {v5}, Lokio/ByteString;->h()I
-
-    move-result v5
-
-    if-lt v5, v11, :cond_1
-
-    const/4 v5, 0x1
-
-    goto :goto_2
-
-    :cond_1
-    const/4 v5, 0x0
-
-    :goto_2
-    if-eqz v5, :cond_2
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v4}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_3
-    invoke-interface/range {p5 .. p6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lokio/ByteString;
-
-    add-int/lit8 v4, v13, -0x1
-
-    invoke-interface {v12, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Lokio/ByteString;
-
-    invoke-virtual {v3}, Lokio/ByteString;->h()I
-
-    move-result v5
-
-    const/4 v15, -0x1
-
-    if-ne v11, v5, :cond_4
-
-    invoke-interface {v14, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/Number;
-
-    invoke-virtual {v3}, Ljava/lang/Number;->intValue()I
-
-    move-result v3
-
-    add-int/lit8 v0, v0, 0x1
-
-    invoke-interface {v12, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Lokio/ByteString;
-
-    move v6, v0
-
-    move v0, v3
-
-    move-object v3, v5
-
-    goto :goto_3
-
-    :cond_4
-    move v6, v0
-
-    const/4 v0, -0x1
-
-    :goto_3
-    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
-
-    move-result v5
-
-    invoke-virtual {v4, v11}, Lokio/ByteString;->k(I)B
-
-    move-result v7
-
-    const/4 v8, 0x2
-
-    if-eq v5, v7, :cond_e
-
-    add-int/lit8 v1, v6, 0x1
+    const/16 v1, 0x20
 
     const/4 v2, 0x1
 
-    :goto_4
-    if-ge v1, v13, :cond_6
+    if-ge v0, v1, :cond_0
 
-    add-int/lit8 v3, v1, -0x1
+    const/16 v1, 0x9
 
-    invoke-interface {v12, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    if-ne v0, v1, :cond_5
 
-    move-result-object v3
+    :cond_0
+    const/16 v1, 0x7f
 
-    check-cast v3, Lokio/ByteString;
+    if-ge v0, v1, :cond_5
 
-    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
+    const/16 v1, 0x39
 
-    move-result v3
+    const/16 v3, 0x30
 
-    invoke-interface {v12, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    if-gt v3, v0, :cond_1
 
-    move-result-object v4
+    if-ge v1, v0, :cond_5
 
-    check-cast v4, Lokio/ByteString;
+    :cond_1
+    const/16 v1, 0x7a
 
-    invoke-virtual {v4, v11}, Lokio/ByteString;->k(I)B
+    const/16 v3, 0x61
 
-    move-result v4
+    if-gt v3, v0, :cond_2
 
-    if-eq v3, v4, :cond_5
+    if-ge v1, v0, :cond_5
 
-    add-int/lit8 v2, v2, 0x1
+    :cond_2
+    const/16 v1, 0x5a
 
-    :cond_5
-    add-int/lit8 v1, v1, 0x1
+    const/16 v3, 0x41
 
-    goto :goto_4
+    if-gt v3, v0, :cond_3
 
-    :cond_6
-    invoke-virtual {v9, v10}, Lo0/n$a;->b(Lo0/e;)J
+    if-ge v1, v0, :cond_5
 
-    move-result-wide v3
+    :cond_3
+    const/16 v1, 0x3a
 
-    add-long v3, v3, p1
+    if-ne v0, v1, :cond_4
 
-    int-to-long v7, v8
-
-    add-long/2addr v3, v7
-
-    mul-int/lit8 v1, v2, 0x2
-
-    int-to-long v7, v1
-
-    add-long v16, v3, v7
-
-    invoke-virtual {v10, v2}, Lo0/e;->M(I)Lo0/e;
-
-    invoke-virtual {v10, v0}, Lo0/e;->M(I)Lo0/e;
-
-    move v0, v6
-
-    :goto_5
-    if-ge v0, v13, :cond_9
-
-    invoke-interface {v12, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lokio/ByteString;
-
-    invoke-virtual {v1, v11}, Lokio/ByteString;->k(I)B
-
-    move-result v1
-
-    if-eq v0, v6, :cond_7
-
-    add-int/lit8 v2, v0, -0x1
-
-    invoke-interface {v12, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lokio/ByteString;
-
-    invoke-virtual {v2, v11}, Lokio/ByteString;->k(I)B
-
-    move-result v2
-
-    if-eq v1, v2, :cond_8
-
-    :cond_7
-    and-int/lit16 v1, v1, 0xff
-
-    invoke-virtual {v10, v1}, Lo0/e;->M(I)Lo0/e;
-
-    :cond_8
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_5
-
-    :cond_9
-    new-instance v8, Lo0/e;
-
-    invoke-direct {v8}, Lo0/e;-><init>()V
-
-    :goto_6
-    if-ge v6, v13, :cond_d
-
-    invoke-interface {v12, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lokio/ByteString;
-
-    invoke-virtual {v0, v11}, Lokio/ByteString;->k(I)B
-
-    move-result v0
-
-    add-int/lit8 v1, v6, 0x1
-
-    move v2, v1
-
-    :goto_7
-    if-ge v2, v13, :cond_b
-
-    invoke-interface {v12, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lokio/ByteString;
-
-    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
-
-    move-result v3
-
-    if-eq v0, v3, :cond_a
-
-    move v7, v2
-
-    goto :goto_8
-
-    :cond_a
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_7
-
-    :cond_b
-    move v7, v13
-
-    :goto_8
-    if-ne v1, v7, :cond_c
-
-    add-int/lit8 v0, v11, 0x1
-
-    invoke-interface {v12, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lokio/ByteString;
-
-    invoke-virtual {v1}, Lokio/ByteString;->h()I
-
-    move-result v1
-
-    if-ne v0, v1, :cond_c
-
-    invoke-interface {v14, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v0
-
-    invoke-virtual {v10, v0}, Lo0/e;->M(I)Lo0/e;
-
-    move/from16 v18, v7
-
-    move-object v15, v8
-
-    goto :goto_9
-
-    :cond_c
-    invoke-virtual {v9, v8}, Lo0/n$a;->b(Lo0/e;)J
-
-    move-result-wide v0
-
-    add-long v0, v0, v16
-
-    long-to-int v1, v0
-
-    mul-int/lit8 v1, v1, -0x1
-
-    invoke-virtual {v10, v1}, Lo0/e;->M(I)Lo0/e;
-
-    add-int/lit8 v4, v11, 0x1
-
-    move-object/from16 v0, p0
-
-    move-wide/from16 v1, v16
-
-    move-object v3, v8
-
-    move-object/from16 v5, p5
-
-    move/from16 v18, v7
-
-    move-object v15, v8
-
-    move-object/from16 v8, p8
-
-    invoke-virtual/range {v0 .. v8}, Lo0/n$a;->a(JLo0/e;ILjava/util/List;IILjava/util/List;)V
-
-    :goto_9
-    move-object v8, v15
-
-    move/from16 v6, v18
-
-    const/4 v15, -0x1
-
-    goto :goto_6
-
-    :cond_d
-    move-object v15, v8
-
-    invoke-virtual {v10, v15}, Lo0/e;->i0(Lo0/w;)J
-
-    goto/16 :goto_d
-
-    :cond_e
-    invoke-virtual {v3}, Lokio/ByteString;->h()I
-
-    move-result v5
-
-    invoke-virtual {v4}, Lokio/ByteString;->h()I
-
-    move-result v7
-
-    invoke-static {v5, v7}, Ljava/lang/Math;->min(II)I
-
-    move-result v5
-
-    move v7, v11
-
-    const/4 v15, 0x0
-
-    :goto_a
-    if-ge v7, v5, :cond_f
-
-    invoke-virtual {v3, v7}, Lokio/ByteString;->k(I)B
-
-    move-result v1
-
-    invoke-virtual {v4, v7}, Lokio/ByteString;->k(I)B
-
-    move-result v2
-
-    if-ne v1, v2, :cond_f
-
-    add-int/lit8 v15, v15, 0x1
-
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_a
-
-    :cond_f
-    invoke-virtual {v9, v10}, Lo0/n$a;->b(Lo0/e;)J
-
-    move-result-wide v1
-
-    add-long v1, v1, p1
-
-    int-to-long v4, v8
-
-    add-long/2addr v1, v4
-
-    int-to-long v4, v15
-
-    add-long/2addr v1, v4
-
-    const-wide/16 v4, 0x1
-
-    add-long/2addr v1, v4
-
-    neg-int v4, v15
-
-    invoke-virtual {v10, v4}, Lo0/e;->M(I)Lo0/e;
-
-    invoke-virtual {v10, v0}, Lo0/e;->M(I)Lo0/e;
-
-    add-int v4, v11, v15
-
-    :goto_b
-    if-ge v11, v4, :cond_10
-
-    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    invoke-virtual {v10, v0}, Lo0/e;->M(I)Lo0/e;
-
-    add-int/lit8 v11, v11, 0x1
-
-    goto :goto_b
-
-    :cond_10
-    add-int/lit8 v0, v6, 0x1
-
-    if-ne v0, v13, :cond_13
-
-    invoke-interface {v12, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lokio/ByteString;
-
-    invoke-virtual {v0}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    if-ne v4, v0, :cond_11
-
-    const/4 v1, 0x1
-
-    goto :goto_c
-
-    :cond_11
-    const/4 v1, 0x0
-
-    :goto_c
-    if-eqz v1, :cond_12
-
-    invoke-interface {v14, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Number;
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v0
-
-    invoke-virtual {v10, v0}, Lo0/e;->M(I)Lo0/e;
-
-    goto :goto_d
-
-    :cond_12
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Check failed."
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_13
-    new-instance v11, Lo0/e;
-
-    invoke-direct {v11}, Lo0/e;-><init>()V
-
-    invoke-virtual {v9, v11}, Lo0/n$a;->b(Lo0/e;)J
-
-    move-result-wide v7
-
-    add-long/2addr v7, v1
-
-    long-to-int v0, v7
-
-    const/4 v3, -0x1
-
-    mul-int/lit8 v0, v0, -0x1
-
-    invoke-virtual {v10, v0}, Lo0/e;->M(I)Lo0/e;
-
-    move-object/from16 v0, p0
-
-    move-object v3, v11
-
-    move-object/from16 v5, p5
-
-    move/from16 v7, p7
-
-    move-object/from16 v8, p8
-
-    invoke-virtual/range {v0 .. v8}, Lo0/n$a;->a(JLo0/e;ILjava/util/List;IILjava/util/List;)V
-
-    invoke-virtual {v10, v11}, Lo0/e;->i0(Lo0/w;)J
-
-    :goto_d
-    return-void
-
-    :cond_14
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v4}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final b(Lo0/e;)J
-    .locals 4
-
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    const/4 p1, 0x4
-
-    int-to-long v2, p1
-
-    div-long/2addr v0, v2
-
-    return-wide v0
-.end method
-
-.method public final varargs c([Lokio/ByteString;)Lo0/n;
-    .locals 14
+    goto :goto_1
 
+    :cond_4
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_15
+    goto :goto_2
 
-    array-length v1, p1
+    :cond_5
+    :goto_1
+    const/4 v0, 0x1
 
-    const/4 v2, 0x0
+    :goto_2
+    xor-int/lit8 v1, p4, 0x1
 
-    if-nez v1, :cond_0
+    if-ne v0, v1, :cond_6
 
-    const/4 v1, 0x1
+    return p2
+
+    :cond_6
+    add-int/lit8 p2, p2, 0x1
 
     goto :goto_0
 
+    :cond_7
+    return p3
+.end method
+
+.method public final b(Ljava/lang/String;Ljava/lang/String;)Z
+    .locals 3
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
     :cond_0
+    const/4 v0, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-static {p1, p2, v2, v0}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p2
+
+    sub-int/2addr v0, p2
+
+    sub-int/2addr v0, v1
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result p2
+
+    const/16 v0, 0x2e
+
+    if-ne p2, v0, :cond_1
+
+    invoke-static {p1}, Lo0/g0/b;->b(Ljava/lang/String;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
     const/4 v1, 0x0
 
     :goto_0
-    if-eqz v1, :cond_1
+    return v1
+.end method
 
-    new-instance p1, Lo0/n;
+.method public final c(Ljava/lang/String;)Ljava/lang/String;
+    .locals 5
 
-    new-array v1, v2, [Lokio/ByteString;
+    const-string v0, "."
+
+    const/4 v1, 0x0
 
     const/4 v2, 0x2
 
-    new-array v2, v2, [I
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
-    fill-array-data v2, :array_0
+    move-result v3
 
-    invoke-direct {p1, v1, v2, v0}, Lo0/n;-><init>([Lokio/ByteString;[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    xor-int/lit8 v3, v3, 0x1
+
+    if-eqz v3, :cond_2
+
+    const-string v3, "$this$removePrefix"
+
+    invoke-static {p1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "prefix"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "$this$startsWith"
+
+    invoke-static {p1, v4}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0, v1, v2}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :cond_0
+    invoke-static {p1}, Lf/n/a/k/a;->d0(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
 
     return-object p1
 
     :cond_1
-    invoke-static {p1}, Lf/n/a/k/a;->toMutableList([Ljava/lang/Object;)Ljava/util/List;
+    new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    move-result-object v8
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
 
-    invoke-static {v8}, Lf/n/a/k/a;->sort(Ljava/util/List;)V
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    array-length v3, p1
-
-    invoke-direct {v1, v3}, Ljava/util/ArrayList;-><init>(I)V
-
-    array-length v3, p1
-
-    const/4 v4, 0x0
-
-    :goto_1
-    if-ge v4, v3, :cond_2
-
-    aget-object v5, p1, v4
-
-    const/4 v5, -0x1
-
-    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
-
-    invoke-virtual {v1, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
+    throw p1
 
     :cond_2
-    new-array v3, v2, [Ljava/lang/Integer;
-
-    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_14
-
-    check-cast v1, [Ljava/lang/Integer;
-
-    array-length v3, v1
-
-    invoke-static {v1, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, [Ljava/lang/Integer;
-
-    invoke-static {v1}, Lf/n/a/k/a;->mutableListOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v11
-
-    array-length v1, p1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_2
-    if-ge v3, v1, :cond_8
-
-    aget-object v5, p1, v3
-
-    add-int/lit8 v6, v4, 0x1
-
-    move-object v7, v8
-
-    check-cast v7, Ljava/util/ArrayList;
-
-    invoke-virtual {v7}, Ljava/util/ArrayList;->size()I
-
-    move-result v9
-
-    invoke-virtual {v7}, Ljava/util/ArrayList;->size()I
-
-    move-result v10
-
-    const-string v12, ")."
-
-    if-ltz v9, :cond_7
-
-    if-gt v9, v10, :cond_6
-
-    add-int/lit8 v9, v9, -0x1
-
-    const/4 v10, 0x0
-
-    :goto_3
-    if-gt v10, v9, :cond_4
-
-    add-int v12, v10, v9
-
-    ushr-int/lit8 v12, v12, 0x1
-
-    invoke-virtual {v7, v12}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v13
-
-    check-cast v13, Ljava/lang/Comparable;
-
-    invoke-static {v13, v5}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
-
-    move-result v13
-
-    if-gez v13, :cond_3
-
-    add-int/lit8 v10, v12, 0x1
-
-    goto :goto_3
-
-    :cond_3
-    if-lez v13, :cond_5
-
-    add-int/lit8 v9, v12, -0x1
-
-    goto :goto_3
-
-    :cond_4
-    add-int/lit8 v10, v10, 0x1
-
-    neg-int v12, v10
-
-    :cond_5
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v4
-
-    invoke-interface {v11, v12, v4}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
-
-    add-int/lit8 v3, v3, 0x1
-
-    move v4, v6
-
-    goto :goto_2
-
-    :cond_6
-    new-instance p1, Ljava/lang/IndexOutOfBoundsException;
-
-    const-string v0, "toIndex ("
-
-    const-string v1, ") is greater than size ("
-
-    invoke-static {v0, v9, v1, v10, v12}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_7
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    const-string v0, "fromIndex ("
-
-    const-string v1, ") is greater than toIndex ("
-
-    invoke-static {v0, v2, v1, v9, v12}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_8
-    move-object v1, v8
-
-    check-cast v1, Ljava/util/ArrayList;
-
-    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lokio/ByteString;
-
-    invoke-virtual {v3}, Lokio/ByteString;->h()I
-
-    move-result v3
-
-    if-lez v3, :cond_9
-
-    const/4 v3, 0x1
-
-    goto :goto_4
-
-    :cond_9
-    const/4 v3, 0x0
-
-    :goto_4
-    if-eqz v3, :cond_13
-
-    const/4 v3, 0x0
-
-    :goto_5
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
-
-    move-result v4
-
-    if-ge v3, v4, :cond_11
-
-    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Lokio/ByteString;
-
-    add-int/lit8 v5, v3, 0x1
-
-    move v6, v5
-
-    :goto_6
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
-
-    move-result v7
-
-    if-ge v6, v7, :cond_10
-
-    invoke-virtual {v1, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Lokio/ByteString;
-
-    if-eqz v7, :cond_f
-
-    if-eqz v4, :cond_e
-
-    invoke-static {v7, v4}, Lo0/y/a;->n(Lokio/ByteString;Lokio/ByteString;)Z
-
-    move-result v9
-
-    if-nez v9, :cond_a
-
-    goto :goto_8
-
-    :cond_a
-    invoke-virtual {v7}, Lokio/ByteString;->h()I
-
-    move-result v9
-
-    invoke-virtual {v4}, Lokio/ByteString;->h()I
-
-    move-result v10
-
-    if-eq v9, v10, :cond_b
-
-    const/4 v9, 0x1
-
-    goto :goto_7
-
-    :cond_b
-    const/4 v9, 0x0
-
-    :goto_7
-    if-eqz v9, :cond_d
-
-    invoke-interface {v11, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v7
-
-    check-cast v7, Ljava/lang/Number;
-
-    invoke-virtual {v7}, Ljava/lang/Number;->intValue()I
-
-    move-result v7
-
-    invoke-interface {v11, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v9
-
-    check-cast v9, Ljava/lang/Number;
-
-    invoke-virtual {v9}, Ljava/lang/Number;->intValue()I
-
-    move-result v9
-
-    if-le v7, v9, :cond_c
-
-    invoke-virtual {v1, v6}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
-
-    invoke-interface {v11, v6}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-
-    goto :goto_6
-
-    :cond_c
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_6
-
-    :cond_d
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v0, "duplicate option: "
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_e
-    const-string p1, "prefix"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_f
-    throw v0
-
-    :cond_10
-    :goto_8
-    move v3, v5
-
-    goto :goto_5
-
-    :cond_11
-    new-instance v12, Lo0/e;
-
-    invoke-direct {v12}, Lo0/e;-><init>()V
-
-    const-wide/16 v4, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v9, 0x0
-
-    invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
-
-    move-result v10
-
-    move-object v3, p0
-
-    move-object v6, v12
-
-    invoke-virtual/range {v3 .. v11}, Lo0/n$a;->a(JLo0/e;ILjava/util/List;IILjava/util/List;)V
-
-    invoke-virtual {p0, v12}, Lo0/n$a;->b(Lo0/e;)J
-
-    move-result-wide v3
-
-    long-to-int v1, v3
-
-    new-array v1, v1, [I
-
-    :goto_9
-    invoke-virtual {v12}, Lo0/e;->J()Z
-
-    move-result v3
-
-    if-nez v3, :cond_12
-
-    add-int/lit8 v3, v2, 0x1
-
-    invoke-virtual {v12}, Lo0/e;->readInt()I
-
-    move-result v4
-
-    aput v4, v1, v2
-
-    move v2, v3
-
-    goto :goto_9
-
-    :cond_12
-    new-instance v2, Lo0/n;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->clone()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Lokio/ByteString;
-
-    invoke-direct {v2, p1, v1, v0}, Lo0/n;-><init>([Lokio/ByteString;[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    return-object v2
-
-    :cond_13
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "the empty byte string is not a supported option"
+    const-string v0, "Failed requirement."
 
     invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
@@ -1050,28 +244,447 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
+.end method
+
+.method public final d(Ljava/lang/String;II)J
+    .locals 12
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, p2, p3, v0}, Lo0/n$a;->a(Ljava/lang/String;IIZ)I
+
+    move-result p2
+
+    sget-object v1, Lo0/n;->m:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v1, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+
+    move-result-object v1
+
+    const/4 v2, -0x1
+
+    const/4 v3, -0x1
+
+    const/4 v4, -0x1
+
+    const/4 v5, -0x1
+
+    const/4 v6, -0x1
+
+    const/4 v7, -0x1
+
+    const/4 v8, -0x1
+
+    :goto_0
+    const/4 v9, 0x2
+
+    const/4 v10, 0x1
+
+    if-ge p2, p3, :cond_4
+
+    add-int/lit8 v11, p2, 0x1
+
+    invoke-virtual {p0, p1, v11, p3, v10}, Lo0/n$a;->a(Ljava/lang/String;IIZ)I
+
+    move-result v11
+
+    invoke-virtual {v1, p2, v11}, Ljava/util/regex/Matcher;->region(II)Ljava/util/regex/Matcher;
+
+    if-ne v4, v2, :cond_0
+
+    sget-object p2, Lo0/n;->m:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_0
+
+    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v4
+
+    invoke-virtual {v1, v9}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v7
+
+    const/4 p2, 0x3
+
+    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v8
+
+    goto :goto_1
+
+    :cond_0
+    if-ne v5, v2, :cond_1
+
+    sget-object p2, Lo0/n;->l:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v5
+
+    goto :goto_1
+
+    :cond_1
+    if-ne v6, v2, :cond_2
+
+    sget-object p2, Lo0/n;->k:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_2
+
+    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string v6, "matcher.group(1)"
+
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v6, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const-string v9, "Locale.US"
+
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2, v6}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string v6, "(this as java.lang.String).toLowerCase(locale)"
+
+    invoke-static {p2, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v6, Lo0/n;->k:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v6}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v9, "MONTH_PATTERN.pattern()"
+
+    invoke-static {v6, v9}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v9, 0x6
+
+    invoke-static {v6, p2, v0, v0, v9}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZI)I
+
+    move-result p2
+
+    div-int/lit8 v6, p2, 0x4
+
+    goto :goto_1
+
+    :cond_2
+    if-ne v3, v2, :cond_3
+
+    sget-object p2, Lo0/n;->j:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v1, p2}, Ljava/util/regex/Matcher;->usePattern(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Ljava/util/regex/Matcher;->matches()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_3
+
+    invoke-virtual {v1, v10}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v3
+
+    :cond_3
+    :goto_1
+    add-int/lit8 v11, v11, 0x1
+
+    invoke-virtual {p0, p1, v11, p3, v0}, Lo0/n$a;->a(Ljava/lang/String;IIZ)I
+
+    move-result p2
+
+    goto/16 :goto_0
+
+    :cond_4
+    const/16 p1, 0x63
+
+    const/16 p2, 0x46
+
+    if-le p2, v3, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    if-lt p1, v3, :cond_6
+
+    add-int/lit16 v3, v3, 0x76c
+
+    :cond_6
+    :goto_2
+    const/16 p1, 0x45
+
+    if-gez v3, :cond_7
+
+    goto :goto_3
+
+    :cond_7
+    if-lt p1, v3, :cond_8
+
+    add-int/lit16 v3, v3, 0x7d0
+
+    :cond_8
+    :goto_3
+    const/16 p1, 0x641
+
+    if-lt v3, p1, :cond_9
+
+    const/4 p1, 0x1
+
+    goto :goto_4
+
+    :cond_9
+    const/4 p1, 0x0
+
+    :goto_4
+    const-string p2, "Failed requirement."
+
+    if-eqz p1, :cond_18
+
+    if-eq v6, v2, :cond_a
+
+    const/4 p1, 0x1
+
+    goto :goto_5
+
+    :cond_a
+    const/4 p1, 0x0
+
+    :goto_5
+    if-eqz p1, :cond_17
+
+    const/16 p1, 0x1f
+
+    if-le v10, v5, :cond_b
+
+    goto :goto_6
+
+    :cond_b
+    if-lt p1, v5, :cond_c
+
+    const/4 p1, 0x1
+
+    goto :goto_7
+
+    :cond_c
+    :goto_6
+    const/4 p1, 0x0
+
+    :goto_7
+    if-eqz p1, :cond_16
+
+    const/16 p1, 0x17
+
+    if-gez v4, :cond_d
+
+    goto :goto_8
+
+    :cond_d
+    if-lt p1, v4, :cond_e
+
+    const/4 p1, 0x1
+
+    goto :goto_9
+
+    :cond_e
+    :goto_8
+    const/4 p1, 0x0
+
+    :goto_9
+    if-eqz p1, :cond_15
+
+    const/16 p1, 0x3b
+
+    if-gez v7, :cond_f
+
+    goto :goto_a
+
+    :cond_f
+    if-lt p1, v7, :cond_10
+
+    const/4 p3, 0x1
+
+    goto :goto_b
+
+    :cond_10
+    :goto_a
+    const/4 p3, 0x0
+
+    :goto_b
+    if-eqz p3, :cond_14
+
+    if-gez v8, :cond_11
+
+    goto :goto_c
+
+    :cond_11
+    if-lt p1, v8, :cond_12
+
+    const/4 p1, 0x1
+
+    goto :goto_d
+
+    :cond_12
+    :goto_c
+    const/4 p1, 0x0
+
+    :goto_d
+    if-eqz p1, :cond_13
+
+    new-instance p1, Ljava/util/GregorianCalendar;
+
+    sget-object p2, Lo0/g0/b;->e:Ljava/util/TimeZone;
+
+    invoke-direct {p1, p2}, Ljava/util/GregorianCalendar;-><init>(Ljava/util/TimeZone;)V
+
+    invoke-virtual {p1, v0}, Ljava/util/GregorianCalendar;->setLenient(Z)V
+
+    invoke-virtual {p1, v10, v3}, Ljava/util/GregorianCalendar;->set(II)V
+
+    sub-int/2addr v6, v10
+
+    invoke-virtual {p1, v9, v6}, Ljava/util/GregorianCalendar;->set(II)V
+
+    const/4 p2, 0x5
+
+    invoke-virtual {p1, p2, v5}, Ljava/util/GregorianCalendar;->set(II)V
+
+    const/16 p2, 0xb
+
+    invoke-virtual {p1, p2, v4}, Ljava/util/GregorianCalendar;->set(II)V
+
+    const/16 p2, 0xc
+
+    invoke-virtual {p1, p2, v7}, Ljava/util/GregorianCalendar;->set(II)V
+
+    const/16 p2, 0xd
+
+    invoke-virtual {p1, p2, v8}, Ljava/util/GregorianCalendar;->set(II)V
+
+    const/16 p2, 0xe
+
+    invoke-virtual {p1, p2, v0}, Ljava/util/GregorianCalendar;->set(II)V
+
+    invoke-virtual {p1}, Ljava/util/GregorianCalendar;->getTimeInMillis()J
+
+    move-result-wide p1
+
+    return-wide p1
+
+    :cond_13
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
 
     :cond_14
-    new-instance p1, Lkotlin/TypeCastException;
+    new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
 
     :cond_15
-    const-string p1, "byteStrings"
+    new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    throw v0
+    move-result-object p2
 
-    nop
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
-    :array_0
-    .array-data 4
-        0x0
-        -0x1
-    .end array-data
+    throw p1
+
+    :cond_16
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_17
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_18
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
 .end method
diff --git a/com.discord/smali_classes2/o0/n.smali b/com.discord/smali_classes2/o0/n.smali
index dbcca90c16..7daa920e59 100644
--- a/com.discord/smali_classes2/o0/n.smali
+++ b/com.discord/smali_classes2/o0/n.smali
@@ -1,9 +1,6 @@
 .class public final Lo0/n;
-.super Ljava/util/AbstractList;
-.source "Options.kt"
-
-# interfaces
-.implements Ljava/util/RandomAccess;
+.super Ljava/lang/Object;
+.source "Cookie.kt"
 
 
 # annotations
@@ -13,24 +10,37 @@
     }
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/util/AbstractList<",
-        "Lokio/ByteString;",
-        ">;",
-        "Ljava/util/RandomAccess;"
-    }
-.end annotation
-
 
 # static fields
-.field public static final f:Lo0/n$a;
+.field public static final j:Ljava/util/regex/Pattern;
+
+.field public static final k:Ljava/util/regex/Pattern;
+
+.field public static final l:Ljava/util/regex/Pattern;
+
+.field public static final m:Ljava/util/regex/Pattern;
+
+.field public static final n:Lo0/n$a;
 
 
 # instance fields
-.field public final d:[Lokio/ByteString;
+.field public final a:Ljava/lang/String;
 
-.field public final e:[I
+.field public final b:Ljava/lang/String;
+
+.field public final c:J
+
+.field public final d:Ljava/lang/String;
+
+.field public final e:Ljava/lang/String;
+
+.field public final f:Z
+
+.field public final g:Z
+
+.field public final h:Z
+
+.field public final i:Z
 
 
 # direct methods
@@ -43,157 +53,514 @@
 
     invoke-direct {v0, v1}, Lo0/n$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lo0/n;->f:Lo0/n$a;
+    sput-object v0, Lo0/n;->n:Lo0/n$a;
+
+    const-string v0, "(\\d{2,4})[^\\d]*"
+
+    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/n;->j:Ljava/util/regex/Pattern;
+
+    const-string v0, "(?i)(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*"
+
+    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/n;->k:Ljava/util/regex/Pattern;
+
+    const-string v0, "(\\d{1,2})[^\\d]*"
+
+    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/n;->l:Ljava/util/regex/Pattern;
+
+    const-string v0, "(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[^\\d]*"
+
+    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/n;->m:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method public constructor <init>([Lokio/ByteString;[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;ZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
     .locals 0
 
-    invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lo0/n;->d:[Lokio/ByteString;
+    iput-object p1, p0, Lo0/n;->a:Ljava/lang/String;
 
-    iput-object p2, p0, Lo0/n;->e:[I
+    iput-object p2, p0, Lo0/n;->b:Ljava/lang/String;
+
+    iput-wide p3, p0, Lo0/n;->c:J
+
+    iput-object p5, p0, Lo0/n;->d:Ljava/lang/String;
+
+    iput-object p6, p0, Lo0/n;->e:Ljava/lang/String;
+
+    iput-boolean p7, p0, Lo0/n;->f:Z
+
+    iput-boolean p8, p0, Lo0/n;->g:Z
+
+    iput-boolean p9, p0, Lo0/n;->h:Z
+
+    iput-boolean p10, p0, Lo0/n;->i:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge contains(Ljava/lang/Object;)Z
-    .locals 1
+.method public final a(Lo0/w;)Z
+    .locals 6
 
-    if-eqz p1, :cond_0
+    const-string v0, "url"
 
-    instance-of v0, p1, Lokio/ByteString;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lo0/n;->i:Z
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p1, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v4, p0, Lo0/n;->d:Ljava/lang/String;
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v0, p1, Lo0/w;->e:Ljava/lang/String;
+
+    iget-object v4, p0, Lo0/n;->d:Ljava/lang/String;
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {v0, v4, v3, v1}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    sub-int/2addr v5, v4
+
+    sub-int/2addr v5, v2
+
+    invoke-virtual {v0, v5}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    const/16 v5, 0x2e
+
+    if-ne v4, v5, :cond_2
+
+    invoke-static {v0}, Lo0/g0/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    :goto_0
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
+    if-nez v0, :cond_3
+
+    return v3
+
+    :cond_3
+    iget-object v0, p0, Lo0/n;->e:Ljava/lang/String;
+
+    invoke-virtual {p1}, Lo0/w;->b()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-static {v4, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    invoke-static {v4, v0, v3, v1}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_6
+
+    const-string v5, "/"
+
+    invoke-static {v0, v5, v3, v1}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-virtual {v4, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    const/16 v1, 0x2f
+
+    if-ne v0, v1, :cond_6
+
+    :goto_2
+    const/4 v0, 0x1
+
+    goto :goto_3
+
+    :cond_6
+    const/4 v0, 0x0
+
+    :goto_3
+    if-nez v0, :cond_7
+
+    return v3
+
+    :cond_7
+    iget-boolean v0, p0, Lo0/n;->f:Z
+
+    if-eqz v0, :cond_9
+
+    iget-boolean p1, p1, Lo0/w;->a:Z
+
+    if-eqz p1, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    const/4 v2, 0x0
+
+    :cond_9
+    :goto_4
+    return v2
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 5
+
+    instance-of v0, p1, Lo0/n;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/n;
+
+    iget-object v0, p1, Lo0/n;->a:Ljava/lang/String;
+
+    iget-object v1, p0, Lo0/n;->a:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p1, Lo0/n;->b:Ljava/lang/String;
+
+    iget-object v1, p0, Lo0/n;->b:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-wide v0, p1, Lo0/n;->c:J
+
+    iget-wide v2, p0, Lo0/n;->c:J
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    iget-object v0, p1, Lo0/n;->d:Ljava/lang/String;
+
+    iget-object v1, p0, Lo0/n;->d:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p1, Lo0/n;->e:Ljava/lang/String;
+
+    iget-object v1, p0, Lo0/n;->e:Ljava/lang/String;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-boolean v0, p1, Lo0/n;->f:Z
+
+    iget-boolean v1, p0, Lo0/n;->f:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-boolean v0, p1, Lo0/n;->g:Z
+
+    iget-boolean v1, p0, Lo0/n;->g:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-boolean v0, p1, Lo0/n;->h:Z
+
+    iget-boolean v1, p0, Lo0/n;->h:Z
+
+    if-ne v0, v1, :cond_0
+
+    iget-boolean p1, p1, Lo0/n;->i:Z
+
+    iget-boolean v0, p0, Lo0/n;->i:Z
+
+    if-ne p1, v0, :cond_0
+
+    const/4 p1, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x1
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lokio/ByteString;
-
-    invoke-super {p0, p1}, Ljava/util/AbstractList;->contains(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    return p1
-
-    :cond_1
     const/4 p1, 0x0
 
-    return p1
-.end method
-
-.method public get(I)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lo0/n;->d:[Lokio/ByteString;
-
-    aget-object p1, v0, p1
-
-    return-object p1
-.end method
-
-.method public final bridge indexOf(Ljava/lang/Object;)I
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    instance-of v0, p1, Lokio/ByteString;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
     :goto_0
-    if-eqz v0, :cond_1
-
-    check-cast p1, Lokio/ByteString;
-
-    invoke-super {p0, p1}, Ljava/util/AbstractList;->indexOf(Ljava/lang/Object;)I
-
-    move-result p1
-
-    return p1
-
-    :cond_1
-    const/4 p1, -0x1
-
     return p1
 .end method
 
-.method public final bridge lastIndexOf(Ljava/lang/Object;)I
-    .locals 1
+.method public hashCode()I
+    .locals 3
+    .annotation build Lorg/codehaus/mojo/animal_sniffer/IgnoreJRERequirement;
+    .end annotation
 
-    if-eqz p1, :cond_0
+    iget-object v0, p0, Lo0/n;->a:Ljava/lang/String;
 
-    instance-of v0, p1, Lokio/ByteString;
+    const/16 v1, 0x20f
 
-    goto :goto_0
+    const/16 v2, 0x1f
 
-    :cond_0
-    const/4 v0, 0x1
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
 
-    :goto_0
-    if-eqz v0, :cond_1
+    move-result v0
 
-    check-cast p1, Lokio/ByteString;
+    iget-object v1, p0, Lo0/n;->b:Ljava/lang/String;
 
-    invoke-super {p0, p1}, Ljava/util/AbstractList;->lastIndexOf(Ljava/lang/Object;)I
+    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
 
-    move-result p1
+    move-result v0
 
-    return p1
+    iget-wide v1, p0, Lo0/n;->c:J
 
-    :cond_1
-    const/4 p1, -0x1
+    invoke-static {v1, v2}, Ld;->a(J)I
 
-    return p1
-.end method
+    move-result v1
 
-.method public final bridge remove(Ljava/lang/Object;)Z
-    .locals 1
+    add-int/2addr v1, v0
 
-    if-eqz p1, :cond_0
+    mul-int/lit8 v1, v1, 0x1f
 
-    instance-of v0, p1, Lokio/ByteString;
+    iget-object v0, p0, Lo0/n;->d:Ljava/lang/String;
 
-    goto :goto_0
+    const/16 v2, 0x1f
 
-    :cond_0
-    const/4 v0, 0x1
+    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
 
-    :goto_0
-    if-eqz v0, :cond_1
+    move-result v0
 
-    check-cast p1, Lokio/ByteString;
+    iget-object v1, p0, Lo0/n;->e:Ljava/lang/String;
 
-    invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
+    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->T(Ljava/lang/String;II)I
 
-    move-result p1
+    move-result v0
 
-    return p1
+    iget-boolean v1, p0, Lo0/n;->f:Z
 
-    :cond_1
-    const/4 p1, 0x0
+    invoke-static {v1}, Lb;->a(Z)I
 
-    return p1
-.end method
+    move-result v1
 
-.method public final size()I
-    .locals 1
+    add-int/2addr v1, v0
 
-    iget-object v0, p0, Lo0/n;->d:[Lokio/ByteString;
+    mul-int/lit8 v1, v1, 0x1f
 
-    array-length v0, v0
+    iget-boolean v0, p0, Lo0/n;->g:Z
+
+    invoke-static {v0}, Lb;->a(Z)I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lo0/n;->h:Z
+
+    invoke-static {v1}, Lb;->a(Z)I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-boolean v0, p0, Lo0/n;->i:Z
+
+    invoke-static {v0}, Lb;->a(Z)I
+
+    move-result v0
+
+    add-int/2addr v0, v1
 
     return v0
 .end method
+
+.method public toString()Ljava/lang/String;
+    .locals 6
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lo0/n;->a:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x3d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/n;->b:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lo0/n;->h:Z
+
+    if-eqz v1, :cond_1
+
+    iget-wide v1, p0, Lo0/n;->c:J
+
+    const-wide/high16 v3, -0x8000000000000000L
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_0
+
+    const-string v1, "; max-age=0"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "; expires="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    new-instance v1, Ljava/util/Date;
+
+    iget-wide v2, p0, Lo0/n;->c:J
+
+    invoke-direct {v1, v2, v3}, Ljava/util/Date;-><init>(J)V
+
+    invoke-static {v1}, Lo0/g0/e/c;->a(Ljava/util/Date;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_1
+    :goto_0
+    iget-boolean v1, p0, Lo0/n;->i:Z
+
+    if-nez v1, :cond_2
+
+    const-string v1, "; domain="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/n;->d:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_2
+    const-string v1, "; path="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/n;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lo0/n;->f:Z
+
+    if-eqz v1, :cond_3
+
+    const-string v1, "; secure"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_3
+    iget-boolean v1, p0, Lo0/n;->g:Z
+
+    if-eqz v1, :cond_4
+
+    const-string v1, "; httponly"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_4
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "toString()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/o$a.smali b/com.discord/smali_classes2/o0/o$a.smali
new file mode 100644
index 0000000000..58fc8aa0ac
--- /dev/null
+++ b/com.discord/smali_classes2/o0/o$a.smali
@@ -0,0 +1,74 @@
+.class public final Lo0/o$a;
+.super Ljava/lang/Object;
+.source "CookieJar.kt"
+
+# interfaces
+.implements Lo0/p;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/o;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lo0/w;Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/w;",
+            "Ljava/util/List<",
+            "Lo0/n;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "cookies"
+
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public b(Lo0/w;)Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/w;",
+            ")",
+            "Ljava/util/List<",
+            "Lo0/n;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "url"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/o0/o.smali b/com.discord/smali_classes2/o0/o.smali
deleted file mode 100644
index a5d1272453..0000000000
--- a/com.discord/smali_classes2/o0/o.smali
+++ /dev/null
@@ -1,179 +0,0 @@
-.class public final Lo0/o;
-.super Ljava/lang/Object;
-.source "Okio.kt"
-
-# interfaces
-.implements Lo0/u;
-
-
-# instance fields
-.field public final d:Ljava/io/OutputStream;
-
-.field public final e:Lo0/x;
-
-
-# direct methods
-.method public constructor <init>(Ljava/io/OutputStream;Lo0/x;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lo0/o;->d:Ljava/io/OutputStream;
-
-    iput-object p2, p0, Lo0/o;->e:Lo0/x;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public close()V
-    .locals 1
-
-    iget-object v0, p0, Lo0/o;->d:Ljava/io/OutputStream;
-
-    invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
-
-    return-void
-.end method
-
-.method public flush()V
-    .locals 1
-
-    iget-object v0, p0, Lo0/o;->d:Ljava/io/OutputStream;
-
-    invoke-virtual {v0}, Ljava/io/OutputStream;->flush()V
-
-    return-void
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/o;->e:Lo0/x;
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "sink("
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lo0/o;->d:Ljava/io/OutputStream;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 7
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    iget-wide v1, p1, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    move-wide v5, p2
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
-
-    :cond_0
-    :goto_0
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p2, v1
-
-    if-lez v3, :cond_2
-
-    iget-object v1, p0, Lo0/o;->e:Lo0/x;
-
-    invoke-virtual {v1}, Lo0/x;->f()V
-
-    iget-object v1, p1, Lo0/e;->d:Lo0/r;
-
-    if-eqz v1, :cond_1
-
-    iget v2, v1, Lo0/r;->c:I
-
-    iget v3, v1, Lo0/r;->b:I
-
-    sub-int/2addr v2, v3
-
-    int-to-long v2, v2
-
-    invoke-static {p2, p3, v2, v3}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v2
-
-    long-to-int v3, v2
-
-    iget-object v2, p0, Lo0/o;->d:Ljava/io/OutputStream;
-
-    iget-object v4, v1, Lo0/r;->a:[B
-
-    iget v5, v1, Lo0/r;->b:I
-
-    invoke-virtual {v2, v4, v5, v3}, Ljava/io/OutputStream;->write([BII)V
-
-    iget v2, v1, Lo0/r;->b:I
-
-    add-int/2addr v2, v3
-
-    iput v2, v1, Lo0/r;->b:I
-
-    int-to-long v3, v3
-
-    sub-long/2addr p2, v3
-
-    iget-wide v5, p1, Lo0/e;->e:J
-
-    sub-long/2addr v5, v3
-
-    iput-wide v5, p1, Lo0/e;->e:J
-
-    iget v3, v1, Lo0/r;->c:I
-
-    if-ne v2, v3, :cond_0
-
-    invoke-virtual {v1}, Lo0/r;->a()Lo0/r;
-
-    move-result-object v2
-
-    iput-object v2, p1, Lo0/e;->d:Lo0/r;
-
-    invoke-static {v1}, Lo0/s;->a(Lo0/r;)V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v0
-
-    :cond_2
-    return-void
-
-    :cond_3
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/o0/p.smali b/com.discord/smali_classes2/o0/p.smali
index f6da2d921c..e1146c0e57 100644
--- a/com.discord/smali_classes2/o0/p.smali
+++ b/com.discord/smali_classes2/o0/p.smali
@@ -1,735 +1,48 @@
-.class public final Lo0/p;
+.class public interface abstract Lo0/p;
 .super Ljava/lang/Object;
-.source "RealBufferedSink.kt"
-
-# interfaces
-.implements Lokio/BufferedSink;
+.source "CookieJar.kt"
 
 
-# instance fields
-.field public final d:Lo0/e;
-
-.field public e:Z
-
-.field public final f:Lo0/u;
+# static fields
+.field public static final a:Lo0/p;
 
 
 # direct methods
-.method public constructor <init>(Lo0/u;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    new-instance v0, Lo0/o$a;
 
-    iput-object p1, p0, Lo0/p;->f:Lo0/u;
+    invoke-direct {v0}, Lo0/o$a;-><init>()V
 
-    new-instance p1, Lo0/e;
-
-    invoke-direct {p1}, Lo0/e;-><init>()V
-
-    iput-object p1, p0, Lo0/p;->d:Lo0/e;
+    sput-object v0, Lo0/p;->a:Lo0/p;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public Q0(J)Lokio/BufferedSink;
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2}, Lo0/e;->K(J)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
+.method public abstract a(Lo0/w;Ljava/util/List;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/w;",
+            "Ljava/util/List<",
+            "Lo0/n;",
+            ">;)V"
+        }
+    .end annotation
 .end method
 
-.method public a()Lokio/BufferedSink;
-    .locals 5
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->c()J
-
-    move-result-wide v0
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-lez v4, :cond_0
-
-    iget-object v2, p0, Lo0/p;->f:Lo0/u;
-
-    iget-object v3, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-interface {v2, v3, v0, v1}, Lo0/u;->write(Lo0/e;J)V
-
-    :cond_0
-    return-object p0
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "closed"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public a0(Ljava/lang/String;)Lokio/BufferedSink;
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->O(Ljava/lang/String;)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "string"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public close()V
-    .locals 6
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :try_start_0
-    iget-object v1, p0, Lo0/p;->d:Lo0/e;
-
-    iget-wide v1, v1, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-lez v5, :cond_1
-
-    iget-object v1, p0, Lo0/p;->f:Lo0/u;
-
-    iget-object v2, p0, Lo0/p;->d:Lo0/e;
-
-    iget-object v3, p0, Lo0/p;->d:Lo0/e;
-
-    iget-wide v3, v3, Lo0/e;->e:J
-
-    invoke-interface {v1, v2, v3, v4}, Lo0/u;->write(Lo0/e;J)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    :cond_1
-    :goto_0
-    :try_start_1
-    iget-object v1, p0, Lo0/p;->f:Lo0/u;
-
-    invoke-interface {v1}, Lo0/u;->close()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception v1
-
-    if-nez v0, :cond_2
-
-    move-object v0, v1
-
-    :cond_2
-    :goto_1
-    const/4 v1, 0x1
-
-    iput-boolean v1, p0, Lo0/p;->e:Z
-
-    if-nez v0, :cond_3
-
-    return-void
-
-    :cond_3
-    throw v0
-.end method
-
-.method public flush()V
-    .locals 6
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    iget-wide v1, v0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-lez v5, :cond_0
-
-    iget-object v3, p0, Lo0/p;->f:Lo0/u;
-
-    invoke-interface {v3, v0, v1, v2}, Lo0/u;->write(Lo0/e;J)V
-
-    :cond_0
-    iget-object v0, p0, Lo0/p;->f:Lo0/u;
-
-    invoke-interface {v0}, Lo0/u;->flush()V
-
-    return-void
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "closed"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public h()Lo0/e;
-    .locals 1
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    return-object v0
-.end method
-
-.method public i0(Lo0/w;)J
-    .locals 7
-
-    const-wide/16 v0, 0x0
-
-    :goto_0
-    iget-object v2, p0, Lo0/p;->d:Lo0/e;
-
-    const/16 v3, 0x2000
-
-    int-to-long v3, v3
-
-    invoke-interface {p1, v2, v3, v4}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v2
-
-    const-wide/16 v4, -0x1
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    return-wide v0
-
-    :cond_0
-    add-long/2addr v0, v2
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    goto :goto_0
-.end method
-
-.method public isOpen()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    return v0
-.end method
-
-.method public j0(J)Lokio/BufferedSink;
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2}, Lo0/e;->L(J)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/p;->f:Lo0/u;
-
-    invoke-interface {v0}, Lo0/u;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "buffer("
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lo0/p;->f:Lo0/u;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public write(Ljava/nio/ByteBuffer;)I
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->write(Ljava/nio/ByteBuffer;)I
-
-    move-result p1
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public write([B)Lokio/BufferedSink;
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->E([B)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public write([BII)Lokio/BufferedSink;
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->G([BII)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public write(Lo0/e;J)V
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->write(Lo0/e;J)V
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public writeByte(I)Lokio/BufferedSink;
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->I(I)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public writeInt(I)Lokio/BufferedSink;
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->M(I)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public writeShort(I)Lokio/BufferedSink;
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->N(I)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public y()Lokio/BufferedSink;
-    .locals 6
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    iget-wide v1, v0, Lo0/e;->e:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-lez v5, :cond_0
-
-    iget-object v3, p0, Lo0/p;->f:Lo0/u;
-
-    invoke-interface {v3, v0, v1, v2}, Lo0/u;->write(Lo0/e;J)V
-
-    :cond_0
-    return-object p0
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "closed"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public y0(Lokio/ByteString;)Lokio/BufferedSink;
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    iget-boolean v0, p0, Lo0/p;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/p;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->D(Lokio/ByteString;)Lo0/e;
-
-    invoke-virtual {p0}, Lo0/p;->a()Lokio/BufferedSink;
-
-    return-object p0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    const-string p1, "byteString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+.method public abstract b(Lo0/w;)Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/w;",
+            ")",
+            "Ljava/util/List<",
+            "Lo0/n;",
+            ">;"
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali_classes2/o0/q$a.smali b/com.discord/smali_classes2/o0/q$a.smali
deleted file mode 100644
index 9c22bc28af..0000000000
--- a/com.discord/smali_classes2/o0/q$a.smali
+++ /dev/null
@@ -1,249 +0,0 @@
-.class public final Lo0/q$a;
-.super Ljava/io/InputStream;
-.source "RealBufferedSource.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lo0/q;->W0()Ljava/io/InputStream;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lo0/q;
-
-
-# direct methods
-.method public constructor <init>(Lo0/q;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lo0/q$a;->d:Lo0/q;
-
-    invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public available()I
-    .locals 4
-
-    iget-object v0, p0, Lo0/q$a;->d:Lo0/q;
-
-    iget-boolean v1, v0, Lo0/q;->e:Z
-
-    if-nez v1, :cond_0
-
-    iget-object v0, v0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v0, v0, Lo0/e;->e:J
-
-    const v2, 0x7fffffff
-
-    int-to-long v2, v2
-
-    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    return v1
-
-    :cond_0
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public close()V
-    .locals 1
-
-    iget-object v0, p0, Lo0/q$a;->d:Lo0/q;
-
-    invoke-virtual {v0}, Lo0/q;->close()V
-
-    return-void
-.end method
-
-.method public read()I
-    .locals 7
-
-    iget-object v0, p0, Lo0/q$a;->d:Lo0/q;
-
-    iget-boolean v1, v0, Lo0/q;->e:Z
-
-    if-nez v1, :cond_1
-
-    iget-object v1, v0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v2, v1, Lo0/e;->e:J
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    iget-object v0, v0, Lo0/q;->f:Lo0/w;
-
-    const/16 v2, 0x2000
-
-    int-to-long v2, v2
-
-    invoke-interface {v0, v1, v2, v3}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v0
-
-    const-wide/16 v2, -0x1
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v0, -0x1
-
-    return v0
-
-    :cond_0
-    iget-object v0, p0, Lo0/q$a;->d:Lo0/q;
-
-    iget-object v0, v0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->readByte()B
-
-    move-result v0
-
-    and-int/lit16 v0, v0, 0xff
-
-    return v0
-
-    :cond_1
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "closed"
-
-    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public read([BII)I
-    .locals 7
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p0, Lo0/q$a;->d:Lo0/q;
-
-    iget-boolean v0, v0, Lo0/q;->e:Z
-
-    if-nez v0, :cond_1
-
-    array-length v0, p1
-
-    int-to-long v1, v0
-
-    int-to-long v3, p2
-
-    int-to-long v5, p3
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
-
-    iget-object v0, p0, Lo0/q$a;->d:Lo0/q;
-
-    iget-object v1, v0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v2, v1, Lo0/e;->e:J
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    iget-object v0, v0, Lo0/q;->f:Lo0/w;
-
-    const/16 v2, 0x2000
-
-    int-to-long v2, v2
-
-    invoke-interface {v0, v1, v2, v3}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v0
-
-    const-wide/16 v2, -0x1
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 p1, -0x1
-
-    return p1
-
-    :cond_0
-    iget-object v0, p0, Lo0/q$a;->d:Lo0/q;
-
-    iget-object v0, v0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->read([BII)I
-
-    move-result p1
-
-    return p1
-
-    :cond_1
-    new-instance p1, Ljava/io/IOException;
-
-    const-string p2, "closed"
-
-    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lo0/q$a;->d:Lo0/q;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ".inputStream()"
-
-    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_classes2/o0/q.smali b/com.discord/smali_classes2/o0/q.smali
index 3c815bd62f..303f7c2e15 100644
--- a/com.discord/smali_classes2/o0/q.smali
+++ b/com.discord/smali_classes2/o0/q.smali
@@ -1,1532 +1,604 @@
 .class public final Lo0/q;
 .super Ljava/lang/Object;
-.source "RealBufferedSource.kt"
-
-# interfaces
-.implements Lo0/g;
+.source "Dispatcher.kt"
 
 
 # instance fields
-.field public final d:Lo0/e;
+.field public a:I
 
-.field public e:Z
+.field public b:I
 
-.field public final f:Lo0/w;
+.field public c:Ljava/util/concurrent/ExecutorService;
+
+.field public final d:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Lo0/z$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Lo0/z$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Ljava/util/ArrayDeque;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayDeque<",
+            "Lo0/z;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method public constructor <init>(Lo0/w;)V
-    .locals 0
+.method public constructor <init>()V
+    .locals 1
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lo0/q;->f:Lo0/w;
+    const/16 v0, 0x40
 
-    new-instance p1, Lo0/e;
+    iput v0, p0, Lo0/q;->a:I
 
-    invoke-direct {p1}, Lo0/e;-><init>()V
+    const/4 v0, 0x5
 
-    iput-object p1, p0, Lo0/q;->d:Lo0/e;
+    iput v0, p0, Lo0/q;->b:I
+
+    new-instance v0, Ljava/util/ArrayDeque;
+
+    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object v0, p0, Lo0/q;->d:Ljava/util/ArrayDeque;
+
+    new-instance v0, Ljava/util/ArrayDeque;
+
+    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object v0, p0, Lo0/q;->e:Ljava/util/ArrayDeque;
+
+    new-instance v0, Ljava/util/ArrayDeque;
+
+    invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
+
+    iput-object v0, p0, Lo0/q;->f:Ljava/util/ArrayDeque;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 6
+.method public final declared-synchronized a()V
+    .locals 2
 
-    if-eqz p1, :cond_4
+    monitor-enter p0
 
-    const-wide/16 v0, 0x0
+    :try_start_0
+    iget-object v0, p0, Lo0/q;->d:Ljava/util/ArrayDeque;
 
-    cmp-long v2, p2, v0
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
 
-    if-ltz v2, :cond_0
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x0
+    move-result-object v0
 
     :goto_0
-    if-eqz v2, :cond_3
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    iget-boolean v2, p0, Lo0/q;->e:Z
+    move-result v1
 
-    xor-int/lit8 v2, v2, 0x1
+    if-eqz v1, :cond_0
 
-    if-eqz v2, :cond_2
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v3, v2, Lo0/e;->e:J
-
-    cmp-long v5, v3, v0
-
-    if-nez v5, :cond_1
-
-    iget-object v0, p0, Lo0/q;->f:Lo0/w;
-
-    const/16 v1, 0x2000
-
-    int-to-long v3, v1
-
-    invoke-interface {v0, v2, v3, v4}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v0
-
-    const-wide/16 v2, -0x1
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_1
-
-    return-wide v2
-
-    :cond_1
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v0, v0, Lo0/e;->e:J
-
-    invoke-static {p2, p3, v0, v1}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide p2
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-
-    return-wide p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "byteCount < 0: "
-
-    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_4
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public F0(Lo0/u;)J
-    .locals 9
-
-    const-wide/16 v0, 0x0
-
-    move-wide v2, v0
-
-    :cond_0
-    :goto_0
-    iget-object v4, p0, Lo0/q;->f:Lo0/w;
-
-    iget-object v5, p0, Lo0/q;->d:Lo0/e;
-
-    const/16 v6, 0x2000
-
-    int-to-long v6, v6
-
-    invoke-interface {v4, v5, v6, v7}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v4
-
-    const-wide/16 v6, -0x1
-
-    cmp-long v8, v4, v6
-
-    if-eqz v8, :cond_1
-
-    iget-object v4, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v4}, Lo0/e;->c()J
-
-    move-result-wide v4
-
-    cmp-long v6, v4, v0
-
-    if-lez v6, :cond_0
-
-    add-long/2addr v2, v4
-
-    iget-object v6, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-interface {p1, v6, v4, v5}, Lo0/u;->write(Lo0/e;J)V
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v4, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v5, v4, Lo0/e;->e:J
-
-    cmp-long v7, v5, v0
-
-    if-lez v7, :cond_2
-
-    add-long/2addr v2, v5
-
-    invoke-interface {p1, v4, v5, v6}, Lo0/u;->write(Lo0/e;J)V
-
-    :cond_2
-    return-wide v2
-.end method
-
-.method public J()Z
-    .locals 6
-
-    iget-boolean v0, p0, Lo0/q;->e:Z
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->J()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/q;->f:Lo0/w;
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    const/16 v3, 0x2000
-
-    int-to-long v3, v3
-
-    invoke-interface {v0, v2, v3, v4}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v2
-
-    const-wide/16 v4, -0x1
-
-    cmp-long v0, v2, v4
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    return v1
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "closed"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v1
 
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+    check-cast v1, Lo0/z$a;
+
+    iget-object v1, v1, Lo0/z$a;->f:Lo0/z;
+
+    invoke-virtual {v1}, Lo0/z;->cancel()V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lo0/q;->e:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lo0/z$a;
+
+    iget-object v1, v1, Lo0/z$a;->f:Lo0/z;
+
+    invoke-virtual {v1}, Lo0/z;->cancel()V
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v0, p0, Lo0/q;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lo0/z;
+
+    invoke-virtual {v1}, Lo0/z;->cancel()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_2
+
+    :cond_2
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
 
     throw v0
 .end method
 
-.method public P0(J)V
+.method public final b(Ljava/util/Deque;Ljava/lang/Object;)V
     .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Deque<",
+            "TT;>;TT;)V"
+        }
+    .end annotation
 
-    invoke-virtual {p0, p1, p2}, Lo0/q;->m(J)Z
+    monitor-enter p0
+
+    :try_start_0
+    invoke-interface {p1, p2}, Ljava/util/Deque;->remove(Ljava/lang/Object;)Z
 
     move-result p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-eqz p1, :cond_0
 
-    return-void
+    monitor-exit p0
 
-    :cond_0
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-.end method
-
-.method public Q(Lo0/e;J)V
-    .locals 1
-
-    if-eqz p1, :cond_1
-
-    :try_start_0
-    invoke-virtual {p0, p2, p3}, Lo0/q;->m(J)Z
-
-    move-result v0
-    :try_end_0
-    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2, p3}, Lo0/e;->Q(Lo0/e;J)V
+    invoke-virtual {p0}, Lo0/q;->d()Z
 
     return-void
 
     :cond_0
     :try_start_1
-    new-instance p2, Ljava/io/EOFException;
+    new-instance p1, Ljava/lang/AssertionError;
 
-    invoke-direct {p2}, Ljava/io/EOFException;-><init>()V
+    const-string p2, "Call wasn\'t in-flight!"
 
-    throw p2
+    invoke-direct {p1, p2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
     :try_end_1
-    .catch Ljava/io/EOFException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    :catch_0
-    move-exception p2
+    :catchall_0
+    move-exception p1
 
-    iget-object p3, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {p1, p3}, Lo0/e;->i0(Lo0/w;)J
-
-    throw p2
-
-    :cond_1
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
+    monitor-exit p0
 
     throw p1
 .end method
 
-.method public S(Lokio/ByteString;)J
-    .locals 10
+.method public final c(Lo0/z$a;)V
+    .locals 1
 
-    if-eqz p1, :cond_3
+    const-string v0, "call"
 
-    const-wide/16 v0, 0x0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v2, p0, Lo0/q;->e:Z
+    iget-object v0, p1, Lo0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    xor-int/lit8 v2, v2, 0x1
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
 
-    if-eqz v2, :cond_2
+    iget-object v0, p0, Lo0/q;->e:Ljava/util/ArrayDeque;
 
-    :goto_0
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
+    invoke-virtual {p0, v0, p1}, Lo0/q;->b(Ljava/util/Deque;Ljava/lang/Object;)V
 
-    invoke-virtual {v2, p1, v0, v1}, Lo0/e;->g(Lokio/ByteString;J)J
-
-    move-result-wide v2
-
-    const-wide/16 v4, -0x1
-
-    cmp-long v6, v2, v4
-
-    if-eqz v6, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v6, v2, Lo0/e;->e:J
-
-    iget-object v3, p0, Lo0/q;->f:Lo0/w;
-
-    const/16 v8, 0x2000
-
-    int-to-long v8, v8
-
-    invoke-interface {v3, v2, v8, v9}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v2
-
-    cmp-long v8, v2, v4
-
-    if-nez v8, :cond_1
-
-    move-wide v2, v4
-
-    :goto_1
-    return-wide v2
-
-    :cond_1
-    invoke-static {v0, v1, v6, v7}, Ljava/lang/Math;->max(JJ)J
-
-    move-result-wide v0
-
-    goto :goto_0
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    const-string p1, "targetBytes"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
+    return-void
 .end method
 
-.method public T(J)Ljava/lang/String;
-    .locals 13
+.method public final d()Z
+    .locals 17
 
-    const-wide/16 v0, 0x0
+    move-object/from16 v1, p0
 
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_4
-
-    const-wide/16 v0, 0x1
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    cmp-long v4, p1, v2
-
-    if-nez v4, :cond_1
-
-    move-wide v4, v2
-
-    goto :goto_1
-
-    :cond_1
-    add-long v4, p1, v0
-
-    :goto_1
-    const/16 v6, 0xa
-
-    int-to-byte v12, v6
-
-    const-wide/16 v8, 0x0
-
-    move-object v6, p0
-
-    move v7, v12
-
-    move-wide v10, v4
-
-    invoke-virtual/range {v6 .. v11}, Lo0/q;->a(BJJ)J
-
-    move-result-wide v6
-
-    const-wide/16 v8, -0x1
-
-    cmp-long v10, v6, v8
-
-    if-eqz v10, :cond_2
-
-    iget-object p1, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {p1, v6, v7}, Lo0/e;->z(J)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    cmp-long v6, v4, v2
-
-    if-gez v6, :cond_3
-
-    invoke-virtual {p0, v4, v5}, Lo0/q;->m(J)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    sub-long v6, v4, v0
-
-    invoke-virtual {v2, v6, v7}, Lo0/e;->e(J)B
-
-    move-result v2
-
-    const/16 v3, 0xd
-
-    int-to-byte v3, v3
-
-    if-ne v2, v3, :cond_3
-
-    add-long/2addr v0, v4
-
-    invoke-virtual {p0, v0, v1}, Lo0/q;->m(J)Z
+    invoke-static/range {p0 .. p0}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, v4, v5}, Lo0/e;->e(J)B
-
-    move-result v0
-
-    if-ne v0, v12, :cond_3
-
-    iget-object p1, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {p1, v4, v5}, Lo0/e;->z(J)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    new-instance v6, Lo0/e;
-
-    invoke-direct {v6}, Lo0/e;-><init>()V
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    const-wide/16 v2, 0x0
-
-    const/16 v1, 0x20
-
-    iget-wide v4, v0, Lo0/e;->e:J
-
-    int-to-long v7, v1
-
-    invoke-static {v7, v8, v4, v5}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v4
-
-    move-object v1, v6
-
-    invoke-virtual/range {v0 .. v5}, Lo0/e;->d(Lo0/e;JJ)Lo0/e;
-
-    new-instance v0, Ljava/io/EOFException;
-
-    const-string v1, "\\n not found: limit="
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v2, v2, Lo0/e;->e:J
-
-    invoke-static {v2, v3, p1, p2}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide p1
-
-    invoke-virtual {v1, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const-string p1, " content="
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v6}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lo0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, "\u2026"
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    const-string v0, "limit < 0: "
-
-    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public U0()J
-    .locals 6
-
-    const-wide/16 v0, 0x1
-
-    invoke-virtual {p0, v0, v1}, Lo0/q;->P0(J)V
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    :goto_0
-    add-int/lit8 v2, v1, 0x1
-
-    int-to-long v3, v2
-
-    invoke-virtual {p0, v3, v4}, Lo0/q;->m(J)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_5
-
-    iget-object v3, p0, Lo0/q;->d:Lo0/e;
-
-    int-to-long v4, v1
-
-    invoke-virtual {v3, v4, v5}, Lo0/e;->e(J)B
-
-    move-result v3
-
-    const/16 v4, 0x30
-
-    int-to-byte v4, v4
-
-    if-lt v3, v4, :cond_0
-
-    const/16 v4, 0x39
-
-    int-to-byte v4, v4
-
-    if-le v3, v4, :cond_2
-
-    :cond_0
-    const/16 v4, 0x61
-
-    int-to-byte v4, v4
-
-    if-lt v3, v4, :cond_1
-
-    const/16 v4, 0x66
-
-    int-to-byte v4, v4
-
-    if-le v3, v4, :cond_2
-
-    :cond_1
-    const/16 v4, 0x41
-
-    int-to-byte v4, v4
-
-    if-lt v3, v4, :cond_3
-
-    const/16 v4, 0x46
-
-    int-to-byte v4, v4
-
-    if-le v3, v4, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    move v1, v2
-
-    goto :goto_0
-
-    :cond_3
-    :goto_1
-    if-eqz v1, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    new-instance v1, Ljava/lang/NumberFormatException;
-
     const/4 v2, 0x1
 
-    new-array v4, v2, [Ljava/lang/Object;
+    xor-int/2addr v0, v2
 
-    invoke-static {v3}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
+    sget-boolean v3, Lk0/i;->a:Z
 
-    move-result-object v3
-
-    aput-object v3, v4, v0
-
-    const-string v0, "Expected leading [0-9a-fA-F] character but was %#x"
-
-    const-string v3, "java.lang.String.format(format, *args)"
-
-    invoke-static {v4, v2, v0, v3}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/NumberFormatException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_5
-    :goto_2
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->U0()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public W0()Ljava/io/InputStream;
-    .locals 1
-
-    new-instance v0, Lo0/q$a;
-
-    invoke-direct {v0, p0}, Lo0/q$a;-><init>(Lo0/q;)V
-
-    return-object v0
-.end method
-
-.method public X0(Lo0/n;)I
-    .locals 8
-
-    if-eqz p1, :cond_4
-
-    iget-boolean v0, p0, Lo0/q;->e:Z
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_3
-
-    :cond_0
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, v1}, Lo0/e;->A(Lo0/n;Z)I
-
-    move-result v0
-
-    const/4 v2, -0x2
-
-    const/4 v3, -0x1
-
-    if-eq v0, v2, :cond_2
-
-    if-eq v0, v3, :cond_1
-
-    iget-object p1, p1, Lo0/n;->d:[Lokio/ByteString;
-
-    aget-object p1, p1, v0
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result p1
-
-    iget-object v1, p0, Lo0/q;->d:Lo0/e;
-
-    int-to-long v2, p1
-
-    invoke-virtual {v1, v2, v3}, Lo0/e;->skip(J)V
-
-    return v0
-
-    :cond_1
-    return v3
-
-    :cond_2
-    iget-object v0, p0, Lo0/q;->f:Lo0/w;
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    const/16 v4, 0x2000
-
-    int-to-long v4, v4
-
-    invoke-interface {v0, v2, v4, v5}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v4
-
-    const-wide/16 v6, -0x1
-
-    cmp-long v0, v4, v6
-
-    if-nez v0, :cond_0
-
-    return v3
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "closed"
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string p1, "options"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public a(BJJ)J
-    .locals 8
-
-    iget-boolean v0, p0, Lo0/q;->e:Z
-
-    const/4 v1, 0x1
-
-    xor-int/2addr v0, v1
-
-    if-eqz v0, :cond_6
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v0, v2, p2
-
-    if-lez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    cmp-long v0, p4, p2
-
-    if-ltz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_5
-
-    :goto_2
-    const-wide/16 v0, -0x1
-
-    cmp-long v2, p2, p4
-
-    if-gez v2, :cond_4
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    move v3, p1
-
-    move-wide v4, p2
-
-    move-wide v6, p4
-
-    invoke-virtual/range {v2 .. v7}, Lo0/e;->f(BJJ)J
-
-    move-result-wide v2
-
-    cmp-long v4, v2, v0
-
-    if-eqz v4, :cond_2
-
-    return-wide v2
-
-    :cond_2
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v3, v2, Lo0/e;->e:J
-
-    cmp-long v5, v3, p4
-
-    if-gez v5, :cond_4
-
-    iget-object v5, p0, Lo0/q;->f:Lo0/w;
-
-    const/16 v6, 0x2000
-
-    int-to-long v6, v6
-
-    invoke-interface {v5, v2, v6, v7}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v5
-
-    cmp-long v2, v5, v0
-
-    if-nez v2, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    invoke-static {p2, p3, v3, v4}, Ljava/lang/Math;->max(JJ)J
-
-    move-result-wide p2
-
-    goto :goto_2
-
-    :cond_4
-    :goto_3
-    return-wide v0
-
-    :cond_5
-    const-string p1, "fromIndex="
-
-    const-string v0, " toIndex="
-
-    invoke-static {p1, p2, p3, v0}, Lf/e/b/a/a;->G(Ljava/lang/String;JLjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p4, p5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_6
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public b()I
-    .locals 3
-
-    const-wide/16 v0, 0x4
-
-    invoke-virtual {p0, v0, v1}, Lo0/q;->P0(J)V
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->readInt()I
-
-    move-result v0
-
-    const/high16 v1, -0x1000000
-
-    and-int/2addr v1, v0
-
-    ushr-int/lit8 v1, v1, 0x18
-
-    const/high16 v2, 0xff0000
-
-    and-int/2addr v2, v0
-
-    ushr-int/lit8 v2, v2, 0x8
-
-    or-int/2addr v1, v2
-
-    const v2, 0xff00
-
-    and-int/2addr v2, v0
-
-    shl-int/lit8 v2, v2, 0x8
-
-    or-int/2addr v1, v2
-
-    and-int/lit16 v0, v0, 0xff
-
-    shl-int/lit8 v0, v0, 0x18
-
-    or-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    iget-object v1, p0, Lo0/q;->f:Lo0/w;
-
-    invoke-virtual {v0, v1}, Lo0/e;->i0(Lo0/w;)J
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, p1}, Lo0/e;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public close()V
-    .locals 3
-
-    iget-boolean v0, p0, Lo0/q;->e:Z
+    if-eqz v3, :cond_1
 
     if-eqz v0, :cond_0
 
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lo0/q;->e:Z
-
-    iget-object v0, p0, Lo0/q;->f:Lo0/w;
-
-    invoke-interface {v0}, Lo0/w;->close()V
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v1, v0, Lo0/e;->e:J
-
-    invoke-virtual {v0, v1, v2}, Lo0/e;->skip(J)V
-
-    return-void
-.end method
-
-.method public h()Lo0/e;
-    .locals 1
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    return-object v0
-.end method
-
-.method public isOpen()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/q;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    return v0
-.end method
-
-.method public m(J)Z
-    .locals 7
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, p1, v2
-
-    if-ltz v4, :cond_0
-
-    const/4 v2, 0x1
-
     goto :goto_0
 
     :cond_0
-    const/4 v2, 0x0
+    const-string v0, "Assertion failed"
 
-    :goto_0
-    if-eqz v2, :cond_4
+    new-instance v2, Ljava/lang/AssertionError;
 
-    iget-boolean v2, p0, Lo0/q;->e:Z
+    invoke-direct {v2, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
 
-    xor-int/2addr v2, v1
-
-    if-eqz v2, :cond_3
+    throw v2
 
     :cond_1
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
+    :goto_0
+    new-instance v3, Ljava/util/ArrayList;
 
-    iget-wide v3, v2, Lo0/e;->e:J
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    cmp-long v5, v3, p1
+    monitor-enter p0
 
-    if-gez v5, :cond_2
+    :try_start_0
+    iget-object v0, v1, Lo0/q;->d:Ljava/util/ArrayDeque;
 
-    iget-object v3, p0, Lo0/q;->f:Lo0/w;
-
-    const/16 v4, 0x2000
-
-    int-to-long v4, v4
-
-    invoke-interface {v3, v2, v4, v5}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v2
-
-    const-wide/16 v4, -0x1
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_1
-
-    return v0
-
-    :cond_2
-    return v1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string v0, "byteCount < 0: "
-
-    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-.end method
-
-.method public o0()Ljava/lang/String;
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lo0/q;->T(J)Ljava/lang/String;
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
 
     move-result-object v0
 
-    return-object v0
-.end method
+    const-string v4, "readyAsyncCalls.iterator()"
 
-.method public read(Ljava/nio/ByteBuffer;)I
-    .locals 6
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p1, :cond_1
+    :goto_1
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
+    move-result v4
 
-    iget-wide v1, v0, Lo0/e;->e:J
+    if-eqz v4, :cond_4
 
-    const-wide/16 v3, 0x0
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    cmp-long v5, v1, v3
+    move-result-object v4
 
-    if-nez v5, :cond_0
+    check-cast v4, Lo0/z$a;
 
-    iget-object v1, p0, Lo0/q;->f:Lo0/w;
+    iget-object v5, v1, Lo0/q;->e:Ljava/util/ArrayDeque;
 
-    const/16 v2, 0x2000
+    invoke-virtual {v5}, Ljava/util/ArrayDeque;->size()I
 
-    int-to-long v2, v2
+    move-result v5
 
-    invoke-interface {v1, v0, v2, v3}, Lo0/w;->B0(Lo0/e;J)J
+    iget v6, v1, Lo0/q;->a:I
 
-    move-result-wide v0
+    if-lt v5, v6, :cond_2
 
-    const-wide/16 v2, -0x1
+    goto :goto_2
 
-    cmp-long v4, v0, v2
+    :cond_2
+    iget-object v5, v4, Lo0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    if-nez v4, :cond_0
+    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
-    const/4 p1, -0x1
+    move-result v5
 
-    return p1
+    iget v6, v1, Lo0/q;->b:I
 
-    :cond_0
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
+    if-lt v5, v6, :cond_3
 
-    invoke-virtual {v0, p1}, Lo0/e;->read(Ljava/nio/ByteBuffer;)I
+    goto :goto_1
 
-    move-result p1
+    :cond_3
+    invoke-interface {v0}, Ljava/util/Iterator;->remove()V
 
-    return p1
+    iget-object v5, v4, Lo0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    :cond_1
-    const-string p1, "sink"
+    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    const-string v5, "asyncCall"
 
-    const/4 p1, 0x0
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p1
-.end method
+    invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-.method public readByte()B
-    .locals 2
+    iget-object v5, v1, Lo0/q;->e:Ljava/util/ArrayDeque;
 
-    const-wide/16 v0, 0x1
+    invoke-virtual {v5, v4}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {p0, v0, v1}, Lo0/q;->P0(J)V
+    goto :goto_1
 
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
+    :cond_4
+    :goto_2
+    monitor-enter p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
-    invoke-virtual {v0}, Lo0/e;->readByte()B
+    :try_start_1
+    iget-object v0, v1, Lo0/q;->e:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v0}, Ljava/util/ArrayDeque;->size()I
 
     move-result v0
 
-    return v0
-.end method
+    iget-object v4, v1, Lo0/q;->f:Ljava/util/ArrayDeque;
 
-.method public readFully([B)V
-    .locals 8
+    invoke-virtual {v4}, Ljava/util/ArrayDeque;->size()I
 
-    if-eqz p1, :cond_2
+    move-result v4
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
-    :try_start_0
-    array-length v0, p1
+    add-int/2addr v0, v4
 
-    int-to-long v0, v0
+    :try_start_2
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_3
 
-    invoke-virtual {p0, v0, v1}, Lo0/q;->P0(J)V
-    :try_end_0
-    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
+    const/4 v4, 0x0
 
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
+    if-lez v0, :cond_5
 
-    invoke-virtual {v0, p1}, Lo0/e;->readFully([B)V
+    const/4 v5, 0x1
 
-    return-void
+    goto :goto_3
+
+    :cond_5
+    const/4 v5, 0x0
+
+    :goto_3
+    monitor-exit p0
+
+    invoke-interface {v3}, Ljava/util/List;->size()I
+
+    move-result v6
+
+    const/4 v7, 0x0
+
+    :goto_4
+    if-ge v7, v6, :cond_c
+
+    invoke-interface {v3, v7}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v8, v0
+
+    check-cast v8, Lo0/z$a;
+
+    monitor-enter p0
+
+    :try_start_3
+    iget-object v0, v1, Lo0/q;->c:Ljava/util/concurrent/ExecutorService;
+
+    if-nez v0, :cond_6
+
+    new-instance v0, Ljava/util/concurrent/ThreadPoolExecutor;
+
+    const/4 v10, 0x0
+
+    const v11, 0x7fffffff
+
+    const-wide/16 v12, 0x3c
+
+    sget-object v14, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    new-instance v15, Ljava/util/concurrent/SynchronousQueue;
+
+    invoke-direct {v15}, Ljava/util/concurrent/SynchronousQueue;-><init>()V
+
+    const-string v9, "OkHttp Dispatcher"
+
+    invoke-static {v9, v4}, Lo0/g0/b;->A(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
+
+    move-result-object v16
+
+    move-object v9, v0
+
+    invoke-direct/range {v9 .. v16}, Ljava/util/concurrent/ThreadPoolExecutor;-><init>(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V
+
+    iput-object v0, v1, Lo0/q;->c:Ljava/util/concurrent/ExecutorService;
+
+    :cond_6
+    iget-object v0, v1, Lo0/q;->c:Ljava/util/concurrent/ExecutorService;
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    const/4 v9, 0x0
+
+    if-eqz v0, :cond_b
+
+    monitor-exit p0
+
+    if-eqz v8, :cond_a
+
+    const-string v10, "executorService"
+
+    invoke-static {v0, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v10, v8, Lo0/z$a;->f:Lo0/z;
+
+    iget-object v10, v10, Lo0/z;->f:Lo0/x;
+
+    iget-object v10, v10, Lo0/x;->d:Lo0/q;
+
+    invoke-static {v10}, Ljava/lang/Thread;->holdsLock(Ljava/lang/Object;)Z
+
+    move-result v10
+
+    xor-int/2addr v10, v2
+
+    sget-boolean v11, Lk0/i;->a:Z
+
+    if-eqz v11, :cond_8
+
+    if-eqz v10, :cond_7
+
+    goto :goto_5
+
+    :cond_7
+    new-instance v0, Ljava/lang/AssertionError;
+
+    const-string v2, "Assertion failed"
+
+    invoke-direct {v0, v2}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_8
+    :goto_5
+    :try_start_4
+    invoke-interface {v0, v8}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
+    :try_end_4
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_4 .. :try_end_4} :catch_0
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+
+    goto :goto_6
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_7
 
     :catch_0
     move-exception v0
 
-    const/4 v1, 0x0
+    move-object v10, v0
 
-    :goto_0
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
+    :try_start_5
+    new-instance v0, Ljava/io/InterruptedIOException;
 
-    iget-wide v3, v2, Lo0/e;->e:J
+    const-string v11, "executor rejected"
 
-    const-wide/16 v5, 0x0
+    invoke-direct {v0, v11}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
 
-    cmp-long v7, v3, v5
+    invoke-virtual {v0, v10}, Ljava/io/InterruptedIOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
-    if-lez v7, :cond_1
+    iget-object v10, v8, Lo0/z$a;->f:Lo0/z;
 
-    long-to-int v4, v3
+    iget-object v10, v10, Lo0/z;->d:Lo0/g0/d/m;
 
-    invoke-virtual {v2, p1, v1, v4}, Lo0/e;->read([BII)I
+    if-eqz v10, :cond_9
 
-    move-result v2
+    invoke-virtual {v10, v0}, Lo0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
 
-    const/4 v3, -0x1
+    iget-object v9, v8, Lo0/z$a;->e:Lo0/g;
 
-    if-eq v2, v3, :cond_0
+    iget-object v10, v8, Lo0/z$a;->f:Lo0/z;
 
-    add-int/2addr v1, v2
+    invoke-interface {v9, v10, v0}, Lo0/g;->b(Lo0/f;Ljava/io/IOException;)V
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    goto :goto_0
+    iget-object v0, v8, Lo0/z$a;->f:Lo0/z;
 
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
+    iget-object v0, v0, Lo0/z;->f:Lo0/x;
 
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+    iget-object v0, v0, Lo0/x;->d:Lo0/q;
 
-    throw p1
+    invoke-virtual {v0, v8}, Lo0/q;->c(Lo0/z$a;)V
+
+    :goto_6
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_4
+
+    :cond_9
+    :try_start_6
+    const-string v0, "transmitter"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_0
+
+    throw v9
+
+    :goto_7
+    iget-object v2, v8, Lo0/z$a;->f:Lo0/z;
+
+    iget-object v2, v2, Lo0/z;->f:Lo0/x;
+
+    iget-object v2, v2, Lo0/x;->d:Lo0/q;
+
+    invoke-virtual {v2, v8}, Lo0/q;->c(Lo0/z$a;)V
 
-    :cond_1
     throw v0
 
-    :cond_2
-    const-string p1, "sink"
+    :cond_a
+    throw v9
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    :cond_b
+    :try_start_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_1
 
-    const/4 p1, 0x0
+    throw v9
 
-    throw p1
-.end method
-
-.method public readInt()I
-    .locals 2
-
-    const-wide/16 v0, 0x4
-
-    invoke-virtual {p0, v0, v1}, Lo0/q;->P0(J)V
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->readInt()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public readLong()J
-    .locals 2
-
-    const-wide/16 v0, 0x8
-
-    invoke-virtual {p0, v0, v1}, Lo0/q;->P0(J)V
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->readLong()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public readShort()S
-    .locals 2
-
-    const-wide/16 v0, 0x2
-
-    invoke-virtual {p0, v0, v1}, Lo0/q;->P0(J)V
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0}, Lo0/e;->readShort()S
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public skip(J)V
-    .locals 6
-
-    iget-boolean v0, p0, Lo0/q;->e:Z
-
-    xor-int/lit8 v0, v0, 0x1
-
-    if-eqz v0, :cond_3
-
-    :goto_0
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_2
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v3, v2, Lo0/e;->e:J
-
-    cmp-long v5, v3, v0
-
-    if-nez v5, :cond_1
-
-    iget-object v0, p0, Lo0/q;->f:Lo0/w;
-
-    const/16 v1, 0x2000
-
-    int-to-long v3, v1
-
-    invoke-interface {v0, v2, v3, v4}, Lo0/w;->B0(Lo0/e;J)J
-
-    move-result-wide v0
-
-    const-wide/16 v2, -0x1
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    :goto_1
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    iget-wide v0, v0, Lo0/e;->e:J
-
-    invoke-static {p1, p2, v0, v1}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v2, v0, v1}, Lo0/e;->skip(J)V
-
-    sub-long/2addr p1, v0
-
-    goto :goto_0
-
-    :cond_2
-    return-void
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "closed"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public t0(J)[B
-    .locals 1
-
-    invoke-virtual {p0, p1, p2}, Lo0/q;->m(J)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2}, Lo0/e;->t0(J)[B
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
-.end method
-
-.method public timeout()Lo0/x;
-    .locals 1
-
-    iget-object v0, p0, Lo0/q;->f:Lo0/w;
-
-    invoke-interface {v0}, Lo0/w;->timeout()Lo0/x;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "buffer("
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lo0/q;->f:Lo0/w;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public u(J)Lokio/ByteString;
-    .locals 1
-
-    invoke-virtual {p0, p1, p2}, Lo0/q;->m(J)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lo0/q;->d:Lo0/e;
-
-    invoke-virtual {v0, p1, p2}, Lo0/e;->u(J)Lokio/ByteString;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/io/EOFException;
-
-    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
-
-    throw p1
+    :catchall_1
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+
+    :cond_c
+    return v5
+
+    :catchall_2
+    move-exception v0
+
+    :try_start_8
+    monitor-exit p0
+
+    throw v0
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_3
+
+    :catchall_3
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
 .end method
diff --git a/com.discord/smali_classes2/o0/r$a.smali b/com.discord/smali_classes2/o0/r$a.smali
new file mode 100644
index 0000000000..7d56e749bc
--- /dev/null
+++ b/com.discord/smali_classes2/o0/r$a.smali
@@ -0,0 +1,81 @@
+.class public final Lo0/r$a;
+.super Ljava/lang/Object;
+.source "Dns.kt"
+
+# interfaces
+.implements Lo0/s;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/r;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/String;)Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/net/InetAddress;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "hostname"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-static {p1}, Ljava/net/InetAddress;->getAllByName(Ljava/lang/String;)[Ljava/net/InetAddress;
+
+    move-result-object v0
+
+    const-string v1, "InetAddress.getAllByName(hostname)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lf/n/a/k/a;->toList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+    :try_end_0
+    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p1
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/net/UnknownHostException;
+
+    const-string v2, "Broken system behaviour for dns lookup of "
+
+    invoke-static {v2, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v1, p1}, Ljava/net/UnknownHostException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v1, v0}, Ljava/net/UnknownHostException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/o0/r.smali b/com.discord/smali_classes2/o0/r.smali
deleted file mode 100644
index 36ead9d7b2..0000000000
--- a/com.discord/smali_classes2/o0/r.smali
+++ /dev/null
@@ -1,285 +0,0 @@
-.class public final Lo0/r;
-.super Ljava/lang/Object;
-.source "Segment.kt"
-
-
-# instance fields
-.field public final a:[B
-
-.field public b:I
-
-.field public c:I
-
-.field public d:Z
-
-.field public e:Z
-
-.field public f:Lo0/r;
-
-.field public g:Lo0/r;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/16 v0, 0x2000
-
-    new-array v0, v0, [B
-
-    iput-object v0, p0, Lo0/r;->a:[B
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lo0/r;->e:Z
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lo0/r;->d:Z
-
-    return-void
-.end method
-
-.method public constructor <init>([BIIZZ)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lo0/r;->a:[B
-
-    iput p2, p0, Lo0/r;->b:I
-
-    iput p3, p0, Lo0/r;->c:I
-
-    iput-boolean p4, p0, Lo0/r;->d:Z
-
-    iput-boolean p5, p0, Lo0/r;->e:Z
-
-    return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public final a()Lo0/r;
-    .locals 4
-
-    iget-object v0, p0, Lo0/r;->f:Lo0/r;
-
-    const/4 v1, 0x0
-
-    if-eq v0, p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, v1
-
-    :goto_0
-    iget-object v2, p0, Lo0/r;->g:Lo0/r;
-
-    if-eqz v2, :cond_2
-
-    iget-object v3, p0, Lo0/r;->f:Lo0/r;
-
-    iput-object v3, v2, Lo0/r;->f:Lo0/r;
-
-    iget-object v3, p0, Lo0/r;->f:Lo0/r;
-
-    if-eqz v3, :cond_1
-
-    iput-object v2, v3, Lo0/r;->g:Lo0/r;
-
-    iput-object v1, p0, Lo0/r;->f:Lo0/r;
-
-    iput-object v1, p0, Lo0/r;->g:Lo0/r;
-
-    return-object v0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-
-    :cond_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v1
-.end method
-
-.method public final b(Lo0/r;)Lo0/r;
-    .locals 1
-
-    iput-object p0, p1, Lo0/r;->g:Lo0/r;
-
-    iget-object v0, p0, Lo0/r;->f:Lo0/r;
-
-    iput-object v0, p1, Lo0/r;->f:Lo0/r;
-
-    iget-object v0, p0, Lo0/r;->f:Lo0/r;
-
-    if-eqz v0, :cond_0
-
-    iput-object p1, v0, Lo0/r;->g:Lo0/r;
-
-    iput-object p1, p0, Lo0/r;->f:Lo0/r;
-
-    return-object p1
-
-    :cond_0
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public final c()Lo0/r;
-    .locals 7
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lo0/r;->d:Z
-
-    new-instance v0, Lo0/r;
-
-    iget-object v2, p0, Lo0/r;->a:[B
-
-    iget v3, p0, Lo0/r;->b:I
-
-    iget v4, p0, Lo0/r;->c:I
-
-    const/4 v5, 0x1
-
-    const/4 v6, 0x0
-
-    move-object v1, v0
-
-    invoke-direct/range {v1 .. v6}, Lo0/r;-><init>([BIIZZ)V
-
-    return-object v0
-.end method
-
-.method public final d(Lo0/r;I)V
-    .locals 4
-
-    if-eqz p1, :cond_4
-
-    iget-boolean v0, p1, Lo0/r;->e:Z
-
-    if-eqz v0, :cond_3
-
-    iget v0, p1, Lo0/r;->c:I
-
-    add-int v1, v0, p2
-
-    const/16 v2, 0x2000
-
-    if-le v1, v2, :cond_2
-
-    iget-boolean v1, p1, Lo0/r;->d:Z
-
-    if-nez v1, :cond_1
-
-    add-int v1, v0, p2
-
-    iget v3, p1, Lo0/r;->b:I
-
-    sub-int/2addr v1, v3
-
-    if-gt v1, v2, :cond_0
-
-    iget-object v1, p1, Lo0/r;->a:[B
-
-    sub-int/2addr v0, v3
-
-    const/4 v2, 0x0
-
-    invoke-static {v1, v3, v1, v2, v0}, Lf/n/a/k/a;->f([BI[BII)V
-
-    iget v0, p1, Lo0/r;->c:I
-
-    iget v1, p1, Lo0/r;->b:I
-
-    sub-int/2addr v0, v1
-
-    iput v0, p1, Lo0/r;->c:I
-
-    iput v2, p1, Lo0/r;->b:I
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :cond_2
-    :goto_0
-    iget-object v0, p0, Lo0/r;->a:[B
-
-    iget v1, p0, Lo0/r;->b:I
-
-    iget-object v2, p1, Lo0/r;->a:[B
-
-    iget v3, p1, Lo0/r;->c:I
-
-    invoke-static {v0, v1, v2, v3, p2}, Lf/n/a/k/a;->f([BI[BII)V
-
-    iget v0, p1, Lo0/r;->c:I
-
-    add-int/2addr v0, p2
-
-    iput v0, p1, Lo0/r;->c:I
-
-    iget p1, p0, Lo0/r;->b:I
-
-    add-int/2addr p1, p2
-
-    iput p1, p0, Lo0/r;->b:I
-
-    return-void
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "only owner can write"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_4
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/o0/s.smali b/com.discord/smali_classes2/o0/s.smali
index d53133f6e0..041e6c33e4 100644
--- a/com.discord/smali_classes2/o0/s.smali
+++ b/com.discord/smali_classes2/o0/s.smali
@@ -1,186 +1,42 @@
-.class public final Lo0/s;
+.class public interface abstract Lo0/s;
 .super Ljava/lang/Object;
-.source "SegmentPool.kt"
+.source "Dns.kt"
 
 
 # static fields
-.field public static a:Lo0/r;
-
-.field public static b:J
-
-.field public static final c:Lo0/s;
+.field public static final a:Lo0/s;
 
 
 # direct methods
 .method public static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lo0/s;
+    new-instance v0, Lo0/r$a;
 
-    invoke-direct {v0}, Lo0/s;-><init>()V
+    invoke-direct {v0}, Lo0/r$a;-><init>()V
 
-    sput-object v0, Lo0/s;->c:Lo0/s;
+    sput-object v0, Lo0/s;->a:Lo0/s;
 
     return-void
 .end method
 
-.method public constructor <init>()V
-    .locals 0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+# virtual methods
+.method public abstract a(Ljava/lang/String;)Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/net/InetAddress;",
+            ">;"
+        }
+    .end annotation
 
-    return-void
-.end method
-
-.method public static final a(Lo0/r;)V
-    .locals 9
-
-    iget-object v0, p0, Lo0/r;->f:Lo0/r;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lo0/r;->g:Lo0/r;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_3
-
-    iget-boolean v0, p0, Lo0/r;->d:Z
-
-    if-eqz v0, :cond_1
-
-    return-void
-
-    :cond_1
-    sget-object v0, Lo0/s;->c:Lo0/s;
-
-    monitor-enter v0
-
-    :try_start_0
-    sget-wide v2, Lo0/s;->b:J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/16 v4, 0x2000
-
-    int-to-long v4, v4
-
-    add-long/2addr v2, v4
-
-    const-wide/32 v6, 0x10000
-
-    cmp-long v8, v2, v6
-
-    if-lez v8, :cond_2
-
-    monitor-exit v0
-
-    return-void
-
-    :cond_2
-    :try_start_1
-    sget-wide v2, Lo0/s;->b:J
-
-    add-long/2addr v2, v4
-
-    sput-wide v2, Lo0/s;->b:J
-
-    sget-object v2, Lo0/s;->a:Lo0/r;
-
-    iput-object v2, p0, Lo0/r;->f:Lo0/r;
-
-    iput v1, p0, Lo0/r;->c:I
-
-    iput v1, p0, Lo0/r;->b:I
-
-    sput-object p0, Lo0/s;->a:Lo0/r;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception p0
-
-    monitor-exit v0
-
-    throw p0
-
-    :cond_3
-    const-string p0, "Failed requirement."
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final b()Lo0/r;
-    .locals 6
-
-    sget-object v0, Lo0/s;->c:Lo0/s;
-
-    monitor-enter v0
-
-    :try_start_0
-    sget-object v1, Lo0/s;->a:Lo0/r;
-
-    if-eqz v1, :cond_0
-
-    iget-object v2, v1, Lo0/r;->f:Lo0/r;
-
-    sput-object v2, Lo0/s;->a:Lo0/r;
-
-    const/4 v2, 0x0
-
-    iput-object v2, v1, Lo0/r;->f:Lo0/r;
-
-    sget-wide v2, Lo0/s;->b:J
-
-    const/16 v4, 0x2000
-
-    int-to-long v4, v4
-
-    sub-long/2addr v2, v4
-
-    sput-wide v2, Lo0/s;->b:J
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return-object v1
-
-    :cond_0
-    monitor-exit v0
-
-    new-instance v0, Lo0/r;
-
-    invoke-direct {v0}, Lo0/r;-><init>()V
-
-    return-object v0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/net/UnknownHostException;
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali_classes2/o0/t$a.smali b/com.discord/smali_classes2/o0/t$a.smali
new file mode 100644
index 0000000000..ee0bcf38f5
--- /dev/null
+++ b/com.discord/smali_classes2/o0/t$a.smali
@@ -0,0 +1,24 @@
+.class public final Lo0/t$a;
+.super Lo0/t;
+.source "EventListener.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/t;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lo0/t;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/t$b.smali b/com.discord/smali_classes2/o0/t$b.smali
new file mode 100644
index 0000000000..1040191faa
--- /dev/null
+++ b/com.discord/smali_classes2/o0/t$b.smali
@@ -0,0 +1,19 @@
+.class public interface abstract Lo0/t$b;
+.super Ljava/lang/Object;
+.source "EventListener.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/t;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "b"
+.end annotation
+
+
+# virtual methods
+.method public abstract a(Lo0/f;)Lo0/t;
+.end method
diff --git a/com.discord/smali_classes2/o0/t.smali b/com.discord/smali_classes2/o0/t.smali
index cb44471c1d..6f21cd3b15 100644
--- a/com.discord/smali_classes2/o0/t.smali
+++ b/com.discord/smali_classes2/o0/t.smali
@@ -1,789 +1,37 @@
-.class public final Lo0/t;
-.super Lokio/ByteString;
-.source "SegmentedByteString.kt"
+.class public abstract Lo0/t;
+.super Ljava/lang/Object;
+.source "EventListener.kt"
 
 
-# instance fields
-.field public final transient h:[[B
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/t$b;
+    }
+.end annotation
 
-.field public final transient i:[I
+
+# static fields
+.field public static final a:Lo0/t;
 
 
 # direct methods
-.method public constructor <init>([[B[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lo0/t$a;
+
+    invoke-direct {v0}, Lo0/t$a;-><init>()V
+
+    sput-object v0, Lo0/t;->a:Lo0/t;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
     .locals 0
 
-    sget-object p3, Lokio/ByteString;->f:Lokio/ByteString;
-
-    iget-object p3, p3, Lokio/ByteString;->data:[B
-
-    invoke-direct {p0, p3}, Lokio/ByteString;-><init>([B)V
-
-    iput-object p1, p0, Lo0/t;->h:[[B
-
-    iput-object p2, p0, Lo0/t;->i:[I
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
-
-.method private final writeReplace()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/t;->s()Lokio/ByteString;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-ne p1, p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v2, p1, Lokio/ByteString;
-
-    if-eqz v2, :cond_1
-
-    check-cast p1, Lokio/ByteString;
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v2
-
-    invoke-virtual {p0}, Lokio/ByteString;->h()I
-
-    move-result v3
-
-    if-ne v2, v3, :cond_1
-
-    invoke-virtual {p0}, Lokio/ByteString;->h()I
-
-    move-result v2
-
-    invoke-virtual {p0, v1, p1, v1, v2}, Lo0/t;->l(ILokio/ByteString;II)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public f(Ljava/lang/String;)Lokio/ByteString;
-    .locals 6
-
-    invoke-static {p1}, Ljava/security/MessageDigest;->getInstance(Ljava/lang/String;)Ljava/security/MessageDigest;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lo0/t;->h:[[B
-
-    array-length v0, v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_0
-
-    iget-object v3, p0, Lo0/t;->i:[I
-
-    add-int v4, v0, v1
-
-    aget v4, v3, v4
-
-    aget v3, v3, v1
-
-    iget-object v5, p0, Lo0/t;->h:[[B
-
-    aget-object v5, v5, v1
-
-    sub-int v2, v3, v2
-
-    invoke-virtual {p1, v5, v4, v2}, Ljava/security/MessageDigest;->update([BII)V
-
-    add-int/lit8 v1, v1, 0x1
-
-    move v2, v3
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lokio/ByteString;
-
-    invoke-virtual {p1}, Ljava/security/MessageDigest;->digest()[B
-
-    move-result-object p1
-
-    const-string v1, "digest.digest()"
-
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v0, p1}, Lokio/ByteString;-><init>([B)V
-
-    return-object v0
-.end method
-
-.method public h()I
-    .locals 2
-
-    iget-object v0, p0, Lo0/t;->i:[I
-
-    iget-object v1, p0, Lo0/t;->h:[[B
-
-    array-length v1, v1
-
-    add-int/lit8 v1, v1, -0x1
-
-    aget v0, v0, v1
-
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 8
-
-    iget v0, p0, Lokio/ByteString;->d:I
-
-    if-eqz v0, :cond_0
-
-    return v0
-
-    :cond_0
-    iget-object v0, p0, Lo0/t;->h:[[B
-
-    array-length v0, v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    :goto_0
-    if-ge v1, v0, :cond_2
-
-    iget-object v4, p0, Lo0/t;->i:[I
-
-    add-int v5, v0, v1
-
-    aget v5, v4, v5
-
-    aget v4, v4, v1
-
-    iget-object v6, p0, Lo0/t;->h:[[B
-
-    aget-object v6, v6, v1
-
-    sub-int v2, v4, v2
-
-    add-int/2addr v2, v5
-
-    :goto_1
-    if-ge v5, v2, :cond_1
-
-    mul-int/lit8 v3, v3, 0x1f
-
-    aget-byte v7, v6, v5
-
-    add-int/2addr v3, v7
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    add-int/lit8 v1, v1, 0x1
-
-    move v2, v4
-
-    goto :goto_0
-
-    :cond_2
-    iput v3, p0, Lokio/ByteString;->d:I
-
-    return v3
-.end method
-
-.method public i()Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/t;->s()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lo0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public j()[B
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/t;->r()[B
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public k(I)B
-    .locals 7
-
-    iget-object v0, p0, Lo0/t;->i:[I
-
-    iget-object v1, p0, Lo0/t;->h:[[B
-
-    array-length v1, v1
-
-    add-int/lit8 v1, v1, -0x1
-
-    aget v0, v0, v1
-
-    int-to-long v1, v0
-
-    int-to-long v3, p1
-
-    const-wide/16 v5, 0x1
-
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
-
-    invoke-virtual {p0, p1}, Lo0/t;->q(I)I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v1, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, p0, Lo0/t;->i:[I
-
-    add-int/lit8 v2, v0, -0x1
-
-    aget v1, v1, v2
-
-    :goto_0
-    iget-object v2, p0, Lo0/t;->i:[I
-
-    iget-object v3, p0, Lo0/t;->h:[[B
-
-    array-length v4, v3
-
-    add-int/2addr v4, v0
-
-    aget v2, v2, v4
-
-    aget-object v0, v3, v0
-
-    sub-int/2addr p1, v1
-
-    add-int/2addr p1, v2
-
-    aget-byte p1, v0, p1
-
-    return p1
-.end method
-
-.method public l(ILokio/ByteString;II)Z
-    .locals 6
-
-    if-eqz p2, :cond_5
-
-    const/4 v0, 0x0
-
-    if-ltz p1, :cond_4
-
-    invoke-virtual {p0}, Lokio/ByteString;->h()I
-
-    move-result v1
-
-    sub-int/2addr v1, p4
-
-    if-le p1, v1, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    add-int/2addr p4, p1
-
-    invoke-virtual {p0, p1}, Lo0/t;->q(I)I
-
-    move-result v1
-
-    :goto_0
-    if-ge p1, p4, :cond_3
-
-    if-nez v1, :cond_1
-
-    const/4 v2, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v2, p0, Lo0/t;->i:[I
-
-    add-int/lit8 v3, v1, -0x1
-
-    aget v2, v2, v3
-
-    :goto_1
-    iget-object v3, p0, Lo0/t;->i:[I
-
-    aget v4, v3, v1
-
-    sub-int/2addr v4, v2
-
-    iget-object v5, p0, Lo0/t;->h:[[B
-
-    array-length v5, v5
-
-    add-int/2addr v5, v1
-
-    aget v3, v3, v5
-
-    add-int/2addr v4, v2
-
-    invoke-static {p4, v4}, Ljava/lang/Math;->min(II)I
-
-    move-result v4
-
-    sub-int/2addr v4, p1
-
-    sub-int v2, p1, v2
-
-    add-int/2addr v2, v3
-
-    iget-object v3, p0, Lo0/t;->h:[[B
-
-    aget-object v3, v3, v1
-
-    invoke-virtual {p2, p3, v3, v2, v4}, Lokio/ByteString;->m(I[BII)Z
-
-    move-result v2
-
-    if-nez v2, :cond_2
-
-    return v0
-
-    :cond_2
-    add-int/2addr p3, v4
-
-    add-int/2addr p1, v4
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_4
-    :goto_2
-    return v0
-
-    :cond_5
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public m(I[BII)Z
-    .locals 6
-
-    if-eqz p2, :cond_5
-
-    const/4 v0, 0x0
-
-    if-ltz p1, :cond_4
-
-    invoke-virtual {p0}, Lokio/ByteString;->h()I
-
-    move-result v1
-
-    sub-int/2addr v1, p4
-
-    if-gt p1, v1, :cond_4
-
-    if-ltz p3, :cond_4
-
-    array-length v1, p2
-
-    sub-int/2addr v1, p4
-
-    if-le p3, v1, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    add-int/2addr p4, p1
-
-    invoke-virtual {p0, p1}, Lo0/t;->q(I)I
-
-    move-result v1
-
-    :goto_0
-    if-ge p1, p4, :cond_3
-
-    if-nez v1, :cond_1
-
-    const/4 v2, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v2, p0, Lo0/t;->i:[I
-
-    add-int/lit8 v3, v1, -0x1
-
-    aget v2, v2, v3
-
-    :goto_1
-    iget-object v3, p0, Lo0/t;->i:[I
-
-    aget v4, v3, v1
-
-    sub-int/2addr v4, v2
-
-    iget-object v5, p0, Lo0/t;->h:[[B
-
-    array-length v5, v5
-
-    add-int/2addr v5, v1
-
-    aget v3, v3, v5
-
-    add-int/2addr v4, v2
-
-    invoke-static {p4, v4}, Ljava/lang/Math;->min(II)I
-
-    move-result v4
-
-    sub-int/2addr v4, p1
-
-    sub-int v2, p1, v2
-
-    add-int/2addr v2, v3
-
-    iget-object v3, p0, Lo0/t;->h:[[B
-
-    aget-object v3, v3, v1
-
-    invoke-static {v3, v2, p2, p3, v4}, Lf/n/a/k/a;->e([BI[BII)Z
-
-    move-result v2
-
-    if-nez v2, :cond_2
-
-    return v0
-
-    :cond_2
-    add-int/2addr p3, v4
-
-    add-int/2addr p1, v4
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_4
-    :goto_2
-    return v0
-
-    :cond_5
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public n()Lokio/ByteString;
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/t;->s()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lo0/y/a;->o(Lokio/ByteString;)Lokio/ByteString;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public o(Ljava/io/OutputStream;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lo0/t;->h:[[B
-
-    array-length v0, v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_0
-
-    iget-object v3, p0, Lo0/t;->i:[I
-
-    add-int v4, v0, v1
-
-    aget v4, v3, v4
-
-    aget v3, v3, v1
-
-    iget-object v5, p0, Lo0/t;->h:[[B
-
-    aget-object v5, v5, v1
-
-    sub-int v2, v3, v2
-
-    invoke-virtual {p1, v5, v4, v2}, Ljava/io/OutputStream;->write([BII)V
-
-    add-int/lit8 v1, v1, 0x1
-
-    move v2, v3
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public p(Lo0/e;)V
-    .locals 11
-
-    iget-object v0, p0, Lo0/t;->h:[[B
-
-    array-length v0, v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_2
-
-    iget-object v3, p0, Lo0/t;->i:[I
-
-    add-int v4, v0, v1
-
-    aget v7, v3, v4
-
-    aget v3, v3, v1
-
-    iget-object v4, p0, Lo0/t;->h:[[B
-
-    aget-object v6, v4, v1
-
-    sub-int v2, v3, v2
-
-    new-instance v4, Lo0/r;
-
-    add-int v8, v7, v2
-
-    const/4 v9, 0x1
-
-    const/4 v10, 0x0
-
-    move-object v5, v4
-
-    invoke-direct/range {v5 .. v10}, Lo0/r;-><init>([BIIZZ)V
-
-    iget-object v2, p1, Lo0/e;->d:Lo0/r;
-
-    if-nez v2, :cond_0
-
-    iput-object v4, v4, Lo0/r;->g:Lo0/r;
-
-    iput-object v4, v4, Lo0/r;->f:Lo0/r;
-
-    iput-object v4, p1, Lo0/e;->d:Lo0/r;
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v2, v2, Lo0/r;->g:Lo0/r;
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v2, v4}, Lo0/r;->b(Lo0/r;)Lo0/r;
-
-    :goto_1
-    add-int/lit8 v1, v1, 0x1
-
-    move v2, v3
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_2
-    iget-wide v0, p1, Lo0/e;->e:J
-
-    invoke-virtual {p0}, Lokio/ByteString;->h()I
-
-    move-result v2
-
-    int-to-long v2, v2
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p1, Lo0/e;->e:J
-
-    return-void
-.end method
-
-.method public final q(I)I
-    .locals 3
-
-    iget-object v0, p0, Lo0/t;->i:[I
-
-    iget-object v1, p0, Lo0/t;->h:[[B
-
-    array-length v1, v1
-
-    add-int/lit8 p1, p1, 0x1
-
-    const/4 v2, 0x0
-
-    invoke-static {v0, v2, v1, p1}, Ljava/util/Arrays;->binarySearch([IIII)I
-
-    move-result p1
-
-    if-ltz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    not-int p1, p1
-
-    :goto_0
-    return p1
-.end method
-
-.method public r()[B
-    .locals 8
-
-    invoke-virtual {p0}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    new-array v0, v0, [B
-
-    iget-object v1, p0, Lo0/t;->h:[[B
-
-    array-length v1, v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_0
-
-    iget-object v5, p0, Lo0/t;->i:[I
-
-    add-int v6, v1, v2
-
-    aget v6, v5, v6
-
-    aget v5, v5, v2
-
-    iget-object v7, p0, Lo0/t;->h:[[B
-
-    aget-object v7, v7, v2
-
-    sub-int v3, v5, v3
-
-    invoke-static {v7, v6, v0, v4, v3}, Lf/n/a/k/a;->f([BI[BII)V
-
-    add-int/2addr v4, v3
-
-    add-int/lit8 v2, v2, 0x1
-
-    move v3, v5
-
-    goto :goto_0
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public final s()Lokio/ByteString;
-    .locals 2
-
-    new-instance v0, Lokio/ByteString;
-
-    invoke-virtual {p0}, Lo0/t;->r()[B
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
-
-    return-object v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0}, Lo0/t;->s()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lo0/y/a;->p(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/o0/u$a.smali b/com.discord/smali_classes2/o0/u$a.smali
new file mode 100644
index 0000000000..a0f76ef32b
--- /dev/null
+++ b/com.discord/smali_classes2/o0/u$a.smali
@@ -0,0 +1,64 @@
+.class public final Lo0/u$a;
+.super Ljava/lang/Object;
+.source "FormBody.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/u;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Ljava/nio/charset/Charset;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v0, p0, Lo0/u$a;->c:Ljava/nio/charset/Charset;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lo0/u$a;->a:Ljava/util/List;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lo0/u$a;->b:Ljava/util/List;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/u.smali b/com.discord/smali_classes2/o0/u.smali
index ecbe7ad9a8..a8899b61cb 100644
--- a/com.discord/smali_classes2/o0/u.smali
+++ b/com.discord/smali_classes2/o0/u.smali
@@ -1,36 +1,225 @@
-.class public interface abstract Lo0/u;
-.super Ljava/lang/Object;
-.source "Sink.kt"
+.class public final Lo0/u;
+.super Lokhttp3/RequestBody;
+.source "FormBody.kt"
 
-# interfaces
-.implements Ljava/io/Closeable;
-.implements Ljava/io/Flushable;
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/u$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:Lokhttp3/MediaType;
+
+
+# instance fields
+.field public final a:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Lokhttp3/MediaType;->g:Lokhttp3/MediaType$a;
+
+    const-string v0, "application/x-www-form-urlencoded"
+
+    invoke-static {v0}, Lokhttp3/MediaType$a;->a(Ljava/lang/String;)Lokhttp3/MediaType;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/u;->c:Lokhttp3/MediaType;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/List;Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "encodedNames"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "encodedValues"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
+
+    invoke-static {p1}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/u;->a:Ljava/util/List;
+
+    invoke-static {p2}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/u;->b:Ljava/util/List;
+
+    return-void
+.end method
 
 
 # virtual methods
-.method public abstract close()V
+.method public final a(Lokio/BufferedSink;Z)J
+    .locals 3
+
+    if-eqz p2, :cond_0
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    goto :goto_0
+
+    :cond_0
+    if-eqz p1, :cond_4
+
+    invoke-interface {p1}, Lokio/BufferedSink;->h()Lp0/e;
+
+    move-result-object p1
+
+    :goto_0
+    const/4 v0, 0x0
+
+    iget-object v1, p0, Lo0/u;->a:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    :goto_1
+    if-ge v0, v1, :cond_2
+
+    if-lez v0, :cond_1
+
+    const/16 v2, 0x26
+
+    invoke-virtual {p1, v2}, Lp0/e;->I(I)Lp0/e;
+
+    :cond_1
+    iget-object v2, p0, Lo0/u;->a:Ljava/util/List;
+
+    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    invoke-virtual {p1, v2}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
+
+    const/16 v2, 0x3d
+
+    invoke-virtual {p1, v2}, Lp0/e;->I(I)Lp0/e;
+
+    iget-object v2, p0, Lo0/u;->b:Ljava/util/List;
+
+    invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    invoke-virtual {p1, v2}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    if-eqz p2, :cond_3
+
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    invoke-virtual {p1, v0, v1}, Lp0/e;->skip(J)V
+
+    goto :goto_2
+
+    :cond_3
+    const-wide/16 v0, 0x0
+
+    :goto_2
+    return-wide v0
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public contentLength()J
+    .locals 2
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v0, v1}, Lo0/u;->a(Lokio/BufferedSink;Z)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public contentType()Lokhttp3/MediaType;
+    .locals 1
+
+    sget-object v0, Lo0/u;->c:Lokhttp3/MediaType;
+
+    return-object v0
+.end method
+
+.method public writeTo(Lokio/BufferedSink;)V
+    .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
         }
     .end annotation
-.end method
 
-.method public abstract flush()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
+    const-string v0, "sink"
 
-.method public abstract timeout()Lo0/x;
-.end method
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-.method public abstract write(Lo0/e;J)V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lo0/u;->a(Lokio/BufferedSink;Z)J
+
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/o0/v$a$a.smali b/com.discord/smali_classes2/o0/v$a$a.smali
new file mode 100644
index 0000000000..b1c6d6d4cd
--- /dev/null
+++ b/com.discord/smali_classes2/o0/v$a$a.smali
@@ -0,0 +1,56 @@
+.class public final Lo0/v$a$a;
+.super Lk0/o/c/j;
+.source "Handshake.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lo0/v$a;->a(Ljavax/net/ssl/SSLSession;)Lo0/v;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lk0/o/c/j;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Ljava/util/List<",
+        "+",
+        "Ljava/security/cert/Certificate;",
+        ">;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $peerCertificatesCopy:Ljava/util/List;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/List;)V
+    .locals 0
+
+    iput-object p1, p0, Lo0/v$a$a;->$peerCertificatesCopy:Ljava/util/List;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lk0/o/c/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lo0/v$a$a;->$peerCertificatesCopy:Ljava/util/List;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/v$a.smali b/com.discord/smali_classes2/o0/v$a.smali
new file mode 100644
index 0000000000..ad16973ba1
--- /dev/null
+++ b/com.discord/smali_classes2/o0/v$a.smali
@@ -0,0 +1,189 @@
+.class public final Lo0/v$a;
+.super Ljava/lang/Object;
+.source "Handshake.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/v;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljavax/net/ssl/SSLSession;)Lo0/v;
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "$this$handshake"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getCipherSuite()Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    const-string v1, "SSL_NULL_WITH_NULL_NULL"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_4
+
+    sget-object v1, Lo0/j;->t:Lo0/j$b;
+
+    invoke-virtual {v1, v0}, Lo0/j$b;->b(Ljava/lang/String;)Lo0/j;
+
+    move-result-object v0
+
+    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getProtocol()Ljava/lang/String;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_3
+
+    const-string v2, "NONE"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    sget-object v2, Lo0/f0;->j:Lo0/f0$a;
+
+    invoke-virtual {v2, v1}, Lo0/f0$a;->a(Ljava/lang/String;)Lo0/f0;
+
+    move-result-object v1
+
+    :try_start_0
+    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getPeerCertificates()[Ljava/security/cert/Certificate;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_0
+
+    array-length v3, v2
+
+    invoke-static {v2, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, [Ljava/security/cert/Certificate;
+
+    invoke-static {v2}, Lo0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v2
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v2, Lk0/j/n;->d:Lk0/j/n;
+    :try_end_0
+    .catch Ljavax/net/ssl/SSLPeerUnverifiedException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    sget-object v2, Lk0/j/n;->d:Lk0/j/n;
+
+    :goto_0
+    new-instance v3, Lo0/v;
+
+    invoke-interface {p1}, Ljavax/net/ssl/SSLSession;->getLocalCertificates()[Ljava/security/cert/Certificate;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    array-length v4, p1
+
+    invoke-static {p1, v4}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ljava/security/cert/Certificate;
+
+    invoke-static {p1}, Lo0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    goto :goto_1
+
+    :cond_1
+    sget-object p1, Lk0/j/n;->d:Lk0/j/n;
+
+    :goto_1
+    new-instance v4, Lo0/v$a$a;
+
+    invoke-direct {v4, v2}, Lo0/v$a$a;-><init>(Ljava/util/List;)V
+
+    invoke-direct {v3, v1, v0, p1, v4}, Lo0/v;-><init>(Lo0/f0;Lo0/j;Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
+
+    return-object v3
+
+    :cond_2
+    new-instance p1, Ljava/io/IOException;
+
+    const-string v0, "tlsVersion == NONE"
+
+    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "tlsVersion == null"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    new-instance p1, Ljava/io/IOException;
+
+    const-string v0, "cipherSuite == SSL_NULL_WITH_NULL_NULL"
+
+    invoke-direct {p1, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "cipherSuite == null"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/o0/v.smali b/com.discord/smali_classes2/o0/v.smali
index f2d0b19860..fdaaed77c6 100644
--- a/com.discord/smali_classes2/o0/v.smali
+++ b/com.discord/smali_classes2/o0/v.smali
@@ -1,120 +1,428 @@
 .class public final Lo0/v;
-.super Lo0/b;
-.source "Okio.kt"
+.super Ljava/lang/Object;
+.source "Handshake.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/v$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final synthetic e:[Lkotlin/reflect/KProperty;
+
+.field public static final f:Lo0/v$a;
 
 
 # instance fields
-.field public final l:Ljava/util/logging/Logger;
+.field public final a:Lkotlin/Lazy;
 
-.field public final m:Ljava/net/Socket;
+.field public final b:Lo0/f0;
+
+.field public final c:Lo0/j;
+
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/security/cert/Certificate;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method public constructor <init>(Ljava/net/Socket;)V
-    .locals 0
+.method public static constructor <clinit>()V
+    .locals 5
 
-    invoke-direct {p0}, Lo0/b;-><init>()V
+    const/4 v0, 0x1
 
-    iput-object p1, p0, Lo0/v;->m:Ljava/net/Socket;
+    new-array v0, v0, [Lkotlin/reflect/KProperty;
 
-    const-string p1, "okio.Okio"
+    new-instance v1, Lk0/o/c/r;
 
-    invoke-static {p1}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
+    const-class v2, Lo0/v;
+
+    invoke-static {v2}, Lk0/o/c/t;->getOrCreateKotlinClass(Ljava/lang/Class;)Lk0/s/b;
+
+    move-result-object v2
+
+    const-string v3, "peerCertificates"
+
+    const-string v4, "peerCertificates()Ljava/util/List;"
+
+    invoke-direct {v1, v2, v3, v4}, Lk0/o/c/r;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lk0/o/c/t;->property1(Lk0/o/c/q;)Lk0/s/d;
+
+    const/4 v2, 0x0
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lo0/v;->e:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lo0/v$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/v$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/v;->f:Lo0/v$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lo0/f0;Lo0/j;Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/f0;",
+            "Lo0/j;",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/security/cert/Certificate;",
+            ">;",
+            "Lkotlin/jvm/functions/Function0<",
+            "+",
+            "Ljava/util/List<",
+            "+",
+            "Ljava/security/cert/Certificate;",
+            ">;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "tlsVersion"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "cipherSuite"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "localCertificates"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "peerCertificatesFn"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/v;->b:Lo0/f0;
+
+    iput-object p2, p0, Lo0/v;->c:Lo0/j;
+
+    iput-object p3, p0, Lo0/v;->d:Ljava/util/List;
+
+    invoke-static {p4}, Lf/n/a/k/a;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
 
     move-result-object p1
 
-    iput-object p1, p0, Lo0/v;->l:Ljava/util/logging/Logger;
+    iput-object p1, p0, Lo0/v;->a:Lkotlin/Lazy;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public m(Ljava/io/IOException;)Ljava/io/IOException;
-    .locals 2
+.method public final a(Ljava/security/cert/Certificate;)Ljava/lang/String;
+    .locals 1
 
-    new-instance v0, Ljava/net/SocketTimeoutException;
+    instance-of v0, p1, Ljava/security/cert/X509Certificate;
 
-    const-string v1, "timeout"
+    if-eqz v0, :cond_0
 
-    invoke-direct {v0, v1}, Ljava/net/SocketTimeoutException;-><init>(Ljava/lang/String;)V
+    check-cast p1, Ljava/security/cert/X509Certificate;
 
-    if-eqz p1, :cond_0
+    invoke-virtual {p1}, Ljava/security/cert/X509Certificate;->getSubjectDN()Ljava/security/Principal;
 
-    invoke-virtual {v0, p1}, Ljava/net/SocketTimeoutException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
 
     :cond_0
+    invoke-virtual {p1}, Ljava/security/cert/Certificate;->getType()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public final b()Ljava/util/List;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/security/cert/Certificate;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/v;->a:Lkotlin/Lazy;
+
+    sget-object v1, Lo0/v;->e:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/List;
+
     return-object v0
 .end method
 
-.method public n()V
-    .locals 5
+.method public equals(Ljava/lang/Object;)Z
+    .locals 2
 
-    const-string v0, "Failed to close timed out socket "
+    instance-of v0, p1, Lo0/v;
 
-    :try_start_0
-    iget-object v1, p0, Lo0/v;->m:Ljava/net/Socket;
+    if-eqz v0, :cond_0
 
-    invoke-virtual {v1}, Ljava/net/Socket;->close()V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/AssertionError; {:try_start_0 .. :try_end_0} :catch_0
+    check-cast p1, Lo0/v;
 
-    goto :goto_0
+    iget-object v0, p1, Lo0/v;->b:Lo0/f0;
 
-    :catch_0
-    move-exception v1
+    iget-object v1, p0, Lo0/v;->b:Lo0/f0;
 
-    invoke-static {v1}, Lf/n/a/k/a;->I(Ljava/lang/AssertionError;)Z
+    if-ne v0, v1, :cond_0
 
-    move-result v2
+    iget-object v0, p1, Lo0/v;->c:Lo0/j;
 
-    if-eqz v2, :cond_0
+    iget-object v1, p0, Lo0/v;->c:Lo0/j;
 
-    iget-object v2, p0, Lo0/v;->l:Ljava/util/logging/Logger;
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
+    move-result v0
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p1}, Lo0/v;->b()Ljava/util/List;
 
     move-result-object v0
 
-    iget-object v4, p0, Lo0/v;->m:Ljava/net/Socket;
+    invoke-virtual {p0}, Lo0/v;->b()Ljava/util/List;
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    move-result-object v1
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result-object v0
+    move-result v0
 
-    invoke-virtual {v2, v3, v0, v1}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
+    if-eqz v0, :cond_0
+
+    iget-object p1, p1, Lo0/v;->d:Ljava/util/List;
+
+    iget-object v0, p0, Lo0/v;->d:Ljava/util/List;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
 
     goto :goto_0
 
     :cond_0
-    throw v1
+    const/4 p1, 0x0
 
-    :catch_1
-    move-exception v1
+    :goto_0
+    return p1
+.end method
 
-    iget-object v2, p0, Lo0/v;->l:Ljava/util/logging/Logger;
+.method public hashCode()I
+    .locals 2
 
-    sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
+    iget-object v0, p0, Lo0/v;->b:Lo0/f0;
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v0}, Ljava/lang/Enum;->hashCode()I
+
+    move-result v0
+
+    add-int/lit16 v0, v0, 0x20f
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/v;->c:Lo0/j;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    invoke-virtual {p0}, Lo0/v;->b()Ljava/util/List;
 
     move-result-object v0
 
-    iget-object v4, p0, Lo0/v;->m:Ljava/net/Socket;
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
-    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lo0/v;->d:Ljava/util/List;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    return v1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 6
+
+    const-string v0, "Handshake{"
+
+    const-string v1, "tlsVersion="
+
+    invoke-static {v0, v1}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/v;->b:Lo0/f0;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x20
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v2, "cipherSuite="
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v2, p0, Lo0/v;->c:Lo0/j;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v2, "peerCertificates="
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lo0/v;->b()Ljava/util/List;
+
+    move-result-object v2
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    const/16 v4, 0xa
+
+    invoke-static {v2, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v5
+
+    invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :goto_0
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/security/cert/Certificate;
+
+    invoke-virtual {p0, v5}, Lo0/v;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    const-string v1, "localCertificates="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/v;->d:Ljava/util/List;
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-static {v1, v4}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v3
+
+    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_1
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/security/cert/Certificate;
+
+    invoke-virtual {p0, v3}, Lo0/v;->a(Ljava/security/cert/Certificate;)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x7d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {v2, v3, v0, v1}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/n0/w$a$a.smali b/com.discord/smali_classes2/o0/w$a$a.smali
similarity index 89%
rename from com.discord/smali_classes2/n0/w$a$a.smali
rename to com.discord/smali_classes2/o0/w$a$a.smali
index 3791c985b8..d4c60df947 100644
--- a/com.discord/smali_classes2/n0/w$a$a.smali
+++ b/com.discord/smali_classes2/o0/w$a$a.smali
@@ -1,11 +1,11 @@
-.class public final Ln0/w$a$a;
+.class public final Lo0/w$a$a;
 .super Ljava/lang/Object;
 .source "HttpUrl.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Ln0/w$a;
+    value = Lo0/w$a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/o0/w$a.smali b/com.discord/smali_classes2/o0/w$a.smali
new file mode 100644
index 0000000000..afa802d804
--- /dev/null
+++ b/com.discord/smali_classes2/o0/w$a.smali
@@ -0,0 +1,2537 @@
+.class public final Lo0/w$a;
+.super Ljava/lang/Object;
+.source "HttpUrl.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/w;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/w$a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final i:Lo0/w$a$a;
+
+
+# instance fields
+.field public a:Ljava/lang/String;
+
+.field public b:Ljava/lang/String;
+
+.field public c:Ljava/lang/String;
+
+.field public d:Ljava/lang/String;
+
+.field public e:I
+
+.field public final f:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public g:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public h:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lo0/w$a$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/w$a$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/w$a;->i:Lo0/w$a$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const-string v0, ""
+
+    iput-object v0, p0, Lo0/w$a;->b:Ljava/lang/String;
+
+    iput-object v0, p0, Lo0/w$a;->c:Ljava/lang/String;
+
+    const/4 v1, -0x1
+
+    iput v1, p0, Lo0/w$a;->e:I
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v1, p0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/lang/String;Ljava/lang/String;)Lo0/w$a;
+    .locals 13
+
+    const-string v0, "encodedName"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lo0/w$a;->g:Ljava/util/List;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lo0/w$a;->g:Ljava/util/List;
+
+    :cond_0
+    iget-object v0, p0, Lo0/w$a;->g:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    sget-object v2, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v7, 0x1
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x1
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/16 v12, 0xd3
+
+    const-string v6, " \"\'<>#&="
+
+    move-object v3, p1
+
+    invoke-static/range {v2 .. v12}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    iget-object p1, p0, Lo0/w$a;->g:Ljava/util/List;
+
+    if-eqz p1, :cond_2
+
+    if-eqz p2, :cond_1
+
+    sget-object v2, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v7, 0x1
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x1
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/16 v12, 0xd3
+
+    const-string v6, " \"\'<>#&="
+
+    move-object v3, p2
+
+    invoke-static/range {v2 .. v12}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    :cond_1
+    invoke-interface {p1, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    return-object p0
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public final b()Lo0/w;
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    new-instance v11, Lo0/w;
+
+    iget-object v2, v0, Lo0/w$a;->a:Ljava/lang/String;
+
+    if-eqz v2, :cond_3
+
+    sget-object v3, Lo0/w;->l:Lo0/w$b;
+
+    iget-object v4, v0, Lo0/w$a;->b:Ljava/lang/String;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x7
+
+    invoke-static/range {v3 .. v8}, Lo0/w$b;->d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+
+    move-result-object v3
+
+    sget-object v4, Lo0/w;->l:Lo0/w$b;
+
+    iget-object v5, v0, Lo0/w$a;->c:Ljava/lang/String;
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x7
+
+    invoke-static/range {v4 .. v9}, Lo0/w$b;->d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+
+    move-result-object v4
+
+    iget-object v5, v0, Lo0/w$a;->d:Ljava/lang/String;
+
+    if-eqz v5, :cond_2
+
+    invoke-virtual/range {p0 .. p0}, Lo0/w$a;->c()I
+
+    move-result v6
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    iget-object v7, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    const/4 v8, 0x0
+
+    invoke-virtual {v1, v7, v8}, Lo0/w$b;->c(Ljava/util/List;Z)Ljava/util/List;
+
+    move-result-object v7
+
+    iget-object v1, v0, Lo0/w$a;->g:Ljava/util/List;
+
+    const/4 v8, 0x0
+
+    if-eqz v1, :cond_0
+
+    sget-object v9, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v10, 0x1
+
+    invoke-virtual {v9, v1, v10}, Lo0/w$b;->c(Ljava/util/List;Z)Ljava/util/List;
+
+    move-result-object v1
+
+    move-object v9, v1
+
+    goto :goto_0
+
+    :cond_0
+    move-object v9, v8
+
+    :goto_0
+    iget-object v13, v0, Lo0/w$a;->h:Ljava/lang/String;
+
+    if-eqz v13, :cond_1
+
+    sget-object v12, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0x7
+
+    invoke-static/range {v12 .. v17}, Lo0/w$b;->d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+
+    move-result-object v1
+
+    move-object v10, v1
+
+    goto :goto_1
+
+    :cond_1
+    move-object v10, v8
+
+    :goto_1
+    invoke-virtual/range {p0 .. p0}, Lo0/w$a;->toString()Ljava/lang/String;
+
+    move-result-object v12
+
+    move-object v1, v11
+
+    move-object v8, v9
+
+    move-object v9, v10
+
+    move-object v10, v12
+
+    invoke-direct/range {v1 .. v10}, Lo0/w;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
+
+    return-object v11
+
+    :cond_2
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "host == null"
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_3
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "scheme == null"
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public final c()I
+    .locals 4
+
+    iget v0, p0, Lo0/w$a;->e:I
+
+    const/4 v1, -0x1
+
+    if-eq v0, v1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v0, p0, Lo0/w$a;->a:Ljava/lang/String;
+
+    if-eqz v0, :cond_4
+
+    const-string v2, "scheme"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v2
+
+    const v3, 0x310888    # 4.503E-39f
+
+    if-eq v2, v3, :cond_2
+
+    const v3, 0x5f008eb
+
+    if-eq v2, v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const-string v2, "https"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    const/16 v0, 0x1bb
+
+    goto :goto_1
+
+    :cond_2
+    const-string v2, "http"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    const/16 v0, 0x50
+
+    goto :goto_1
+
+    :cond_3
+    :goto_0
+    const/4 v0, -0x1
+
+    :goto_1
+    return v0
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public final d(Ljava/lang/String;)Lo0/w$a;
+    .locals 12
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_4
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x1
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0xd3
+
+    const-string v5, " \"\'<>#"
+
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string v1, "$this$toQueryNamesAndValues"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    if-gt v3, v4, :cond_3
+
+    const/16 v4, 0x26
+
+    const/4 v5, 0x4
+
+    invoke-static {p1, v4, v3, v2, v5}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v4
+
+    const/4 v6, -0x1
+
+    if-ne v4, v6, :cond_0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    :cond_0
+    const/16 v7, 0x3d
+
+    invoke-static {p1, v7, v3, v2, v5}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v5
+
+    const-string v7, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    if-eq v5, v6, :cond_2
+
+    if-le v5, v4, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p1, v3, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v5, v5, 0x1
+
+    invoke-virtual {p1, v5, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_2
+    :goto_1
+    invoke-virtual {p1, v3, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v3, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v1, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :goto_2
+    add-int/lit8 v3, v4, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    move-object v0, v1
+
+    :cond_4
+    iput-object v0, p0, Lo0/w$a;->g:Ljava/util/List;
+
+    return-object p0
+.end method
+
+.method public final e(Lo0/w;Ljava/lang/String;)Lo0/w$a;
+    .locals 30
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    move-object/from16 v12, p2
+
+    const-string v2, "input"
+
+    invoke-static {v12, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x3
+
+    invoke-static {v12, v2, v2, v3}, Lo0/g0/b;->s(Ljava/lang/String;III)I
+
+    move-result v3
+
+    invoke-virtual/range {p2 .. p2}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    invoke-static {v12, v3, v4}, Lo0/g0/b;->t(Ljava/lang/String;II)I
+
+    move-result v13
+
+    sub-int v4, v13, v3
+
+    const/4 v5, 0x2
+
+    const/16 v6, 0x3a
+
+    const/4 v7, -0x1
+
+    const/4 v8, 0x1
+
+    if-ge v4, v5, :cond_0
+
+    goto :goto_5
+
+    :cond_0
+    invoke-virtual {v12, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    const/16 v9, 0x5a
+
+    const/16 v10, 0x7a
+
+    const/16 v11, 0x41
+
+    const/16 v14, 0x61
+
+    if-lt v4, v14, :cond_1
+
+    if-le v4, v10, :cond_2
+
+    :cond_1
+    if-lt v4, v11, :cond_c
+
+    if-le v4, v9, :cond_2
+
+    goto :goto_5
+
+    :cond_2
+    move v4, v3
+
+    :goto_0
+    add-int/2addr v4, v8
+
+    if-ge v4, v13, :cond_c
+
+    invoke-virtual {v12, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v15
+
+    if-le v14, v15, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    if-lt v10, v15, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    :goto_1
+    if-le v11, v15, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    if-lt v9, v15, :cond_6
+
+    goto :goto_4
+
+    :cond_6
+    :goto_2
+    const/16 v9, 0x39
+
+    const/16 v10, 0x30
+
+    if-le v10, v15, :cond_7
+
+    goto :goto_3
+
+    :cond_7
+    if-lt v9, v15, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    :goto_3
+    const/16 v9, 0x2b
+
+    if-ne v15, v9, :cond_9
+
+    goto :goto_4
+
+    :cond_9
+    const/16 v9, 0x2d
+
+    if-ne v15, v9, :cond_a
+
+    goto :goto_4
+
+    :cond_a
+    const/16 v9, 0x2e
+
+    if-ne v15, v9, :cond_b
+
+    :goto_4
+    const/16 v9, 0x5a
+
+    const/16 v10, 0x7a
+
+    goto :goto_0
+
+    :cond_b
+    if-ne v15, v6, :cond_c
+
+    goto :goto_6
+
+    :cond_c
+    :goto_5
+    const/4 v4, -0x1
+
+    :goto_6
+    const-string v14, "http"
+
+    const-string v15, "https"
+
+    const-string v11, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    if-eq v4, v7, :cond_f
+
+    const-string v6, "https:"
+
+    invoke-static {v12, v6, v3, v8}, Lk0/u/k;->startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_d
+
+    iput-object v15, v0, Lo0/w$a;->a:Ljava/lang/String;
+
+    add-int/lit8 v3, v3, 0x6
+
+    goto :goto_7
+
+    :cond_d
+    const-string v6, "http:"
+
+    invoke-static {v12, v6, v3, v8}, Lk0/u/k;->startsWith(Ljava/lang/String;Ljava/lang/String;IZ)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_e
+
+    iput-object v14, v0, Lo0/w$a;->a:Ljava/lang/String;
+
+    add-int/lit8 v3, v3, 0x5
+
+    goto :goto_7
+
+    :cond_e
+    const-string v1, "Expected URL scheme \'http\' or \'https\' but was \'"
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-virtual {v12, v2, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v2, v11}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, "\'"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_f
+    if-eqz v1, :cond_3e
+
+    iget-object v2, v1, Lo0/w;->b:Ljava/lang/String;
+
+    iput-object v2, v0, Lo0/w$a;->a:Ljava/lang/String;
+
+    :goto_7
+    const/4 v2, 0x0
+
+    move v4, v3
+
+    :goto_8
+    const/16 v6, 0x2f
+
+    const/16 v9, 0x5c
+
+    if-ge v4, v13, :cond_11
+
+    invoke-virtual {v12, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v10
+
+    if-eq v10, v9, :cond_10
+
+    if-ne v10, v6, :cond_11
+
+    :cond_10
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_8
+
+    :cond_11
+    const/16 v4, 0x23
+
+    if-ge v2, v5, :cond_15
+
+    if-eqz v1, :cond_15
+
+    iget-object v5, v1, Lo0/w;->b:Ljava/lang/String;
+
+    iget-object v10, v0, Lo0/w$a;->a:Ljava/lang/String;
+
+    invoke-static {v5, v10}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    xor-int/2addr v5, v8
+
+    if-eqz v5, :cond_12
+
+    goto :goto_9
+
+    :cond_12
+    invoke-virtual/range {p1 .. p1}, Lo0/w;->e()Ljava/lang/String;
+
+    move-result-object v2
+
+    iput-object v2, v0, Lo0/w$a;->b:Ljava/lang/String;
+
+    invoke-virtual/range {p1 .. p1}, Lo0/w;->a()Ljava/lang/String;
+
+    move-result-object v2
+
+    iput-object v2, v0, Lo0/w$a;->c:Ljava/lang/String;
+
+    iget-object v2, v1, Lo0/w;->e:Ljava/lang/String;
+
+    iput-object v2, v0, Lo0/w$a;->d:Ljava/lang/String;
+
+    iget v2, v1, Lo0/w;->f:I
+
+    iput v2, v0, Lo0/w$a;->e:I
+
+    iget-object v2, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v2}, Ljava/util/List;->clear()V
+
+    iget-object v2, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-virtual/range {p1 .. p1}, Lo0/w;->c()Ljava/util/List;
+
+    move-result-object v5
+
+    invoke-interface {v2, v5}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
+
+    if-eq v3, v13, :cond_13
+
+    invoke-virtual {v12, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    if-ne v2, v4, :cond_14
+
+    :cond_13
+    invoke-virtual/range {p1 .. p1}, Lo0/w;->d()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lo0/w$a;->d(Ljava/lang/String;)Lo0/w$a;
+
+    :cond_14
+    const/4 v1, 0x1
+
+    move/from16 v18, v13
+
+    goto/16 :goto_19
+
+    :cond_15
+    :goto_9
+    add-int/2addr v3, v2
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    move v10, v3
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0x0
+
+    :goto_a
+    const-string v1, "@/\\?#"
+
+    invoke-static {v12, v1, v10, v13}, Lo0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
+
+    move-result v8
+
+    if-eq v8, v13, :cond_16
+
+    invoke-virtual {v12, v8}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    goto :goto_b
+
+    :cond_16
+    const/4 v1, -0x1
+
+    :goto_b
+    if-eq v1, v7, :cond_1b
+
+    if-eq v1, v4, :cond_1b
+
+    if-eq v1, v6, :cond_1b
+
+    if-eq v1, v9, :cond_1b
+
+    const/16 v2, 0x3f
+
+    if-eq v1, v2, :cond_1b
+
+    const/16 v2, 0x40
+
+    if-eq v1, v2, :cond_17
+
+    move/from16 v18, v13
+
+    move-object/from16 v19, v14
+
+    move-object v13, v11
+
+    goto/16 :goto_e
+
+    :cond_17
+    const-string v9, "%40"
+
+    if-nez v16, :cond_1a
+
+    const/16 v1, 0x3a
+
+    invoke-static {v12, v1, v10, v8}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result v7
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v6, 0x1
+
+    const/16 v18, 0x0
+
+    const/16 v19, 0x0
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    const/16 v22, 0xf0
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
+
+    move-object/from16 v2, p2
+
+    move v3, v10
+
+    move v4, v7
+
+    move v10, v7
+
+    move/from16 v7, v18
+
+    move/from16 v23, v8
+
+    move/from16 v8, v19
+
+    move-object/from16 v24, v9
+
+    move/from16 v9, v20
+
+    move/from16 v25, v10
+
+    move-object/from16 v10, v21
+
+    move/from16 v18, v13
+
+    move-object v13, v11
+
+    move/from16 v11, v22
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    if-eqz v17, :cond_18
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v3, v0, Lo0/w$a;->b:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-object/from16 v3, v24
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    :cond_18
+    iput-object v1, v0, Lo0/w$a;->b:Ljava/lang/String;
+
+    move/from16 v11, v23
+
+    move/from16 v1, v25
+
+    if-eq v1, v11, :cond_19
+
+    sget-object v2, Lo0/w;->l:Lo0/w$b;
+
+    add-int/lit8 v3, v1, 0x1
+
+    const/4 v6, 0x1
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v16, 0xf0
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
+
+    move-object v1, v2
+
+    move-object/from16 v2, p2
+
+    move v4, v11
+
+    move/from16 v23, v11
+
+    move/from16 v11, v16
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/w$a;->c:Ljava/lang/String;
+
+    const/16 v16, 0x1
+
+    goto :goto_c
+
+    :cond_19
+    move/from16 v23, v11
+
+    :goto_c
+    const/16 v17, 0x1
+
+    move-object/from16 v19, v14
+
+    goto :goto_d
+
+    :cond_1a
+    move/from16 v23, v8
+
+    move-object v3, v9
+
+    move/from16 v18, v13
+
+    move-object v13, v11
+
+    new-instance v11, Ljava/lang/StringBuilder;
+
+    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, v0, Lo0/w$a;->c:Ljava/lang/String;
+
+    invoke-virtual {v11, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v6, 0x1
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v19, 0x0
+
+    const/16 v20, 0xf0
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
+
+    move-object/from16 v2, p2
+
+    move v3, v10
+
+    move/from16 v4, v23
+
+    move-object/from16 v10, v19
+
+    move-object/from16 v19, v14
+
+    move-object v14, v11
+
+    move/from16 v11, v20
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v14, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v14}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/w$a;->c:Ljava/lang/String;
+
+    :goto_d
+    move/from16 v14, v23
+
+    add-int/lit8 v10, v14, 0x1
+
+    :goto_e
+    const/16 v4, 0x23
+
+    const/16 v6, 0x2f
+
+    const/4 v7, -0x1
+
+    const/16 v9, 0x5c
+
+    move-object v11, v13
+
+    move/from16 v13, v18
+
+    move-object/from16 v14, v19
+
+    goto/16 :goto_a
+
+    :cond_1b
+    move/from16 v18, v13
+
+    move-object/from16 v19, v14
+
+    move v14, v8
+
+    move-object v13, v11
+
+    move v8, v10
+
+    :goto_f
+    if-ge v8, v14, :cond_1f
+
+    invoke-virtual {v12, v8}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v2, 0x3a
+
+    if-eq v1, v2, :cond_1e
+
+    const/16 v2, 0x5b
+
+    if-eq v1, v2, :cond_1c
+
+    goto :goto_10
+
+    :cond_1c
+    add-int/lit8 v8, v8, 0x1
+
+    if-ge v8, v14, :cond_1d
+
+    invoke-virtual {v12, v8}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v2, 0x5d
+
+    if-ne v1, v2, :cond_1c
+
+    :cond_1d
+    :goto_10
+    add-int/lit8 v8, v8, 0x1
+
+    goto :goto_f
+
+    :cond_1e
+    move v11, v8
+
+    goto :goto_11
+
+    :cond_1f
+    move v11, v14
+
+    :goto_11
+    add-int/lit8 v9, v11, 0x1
+
+    if-ge v9, v14, :cond_24
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x4
+
+    move-object/from16 v2, p2
+
+    move v3, v10
+
+    move v4, v11
+
+    invoke-static/range {v1 .. v6}, Lo0/w$b;->d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->d0(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/w$a;->d:Ljava/lang/String;
+
+    :try_start_0
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const-string v5, ""
+    :try_end_0
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_1
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0xf8
+
+    const/4 v4, 0x1
+
+    move-object/from16 v2, p2
+
+    move v3, v9
+
+    move v4, v14
+
+    move/from16 v26, v9
+
+    move v9, v15
+
+    move v15, v10
+
+    move-object/from16 v10, v16
+
+    move/from16 p1, v11
+
+    move/from16 v11, v17
+
+    :try_start_1
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v1
+    :try_end_1
+    .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0
+
+    const v2, 0xffff
+
+    const/4 v3, 0x1
+
+    if-le v3, v1, :cond_20
+
+    goto :goto_12
+
+    :cond_20
+    if-lt v2, v1, :cond_21
+
+    const/4 v4, 0x1
+
+    goto :goto_13
+
+    :catch_0
+    const/4 v3, 0x1
+
+    goto :goto_12
+
+    :catch_1
+    move/from16 v26, v9
+
+    move v15, v10
+
+    move/from16 p1, v11
+
+    :cond_21
+    :goto_12
+    const/4 v4, 0x1
+
+    const/4 v1, -0x1
+
+    :goto_13
+    iput v1, v0, Lo0/w$a;->e:I
+
+    const/4 v2, -0x1
+
+    if-eq v1, v2, :cond_22
+
+    const/4 v1, 0x1
+
+    goto :goto_14
+
+    :cond_22
+    const/4 v1, 0x0
+
+    :goto_14
+    if-eqz v1, :cond_23
+
+    const/16 v1, 0x22
+
+    move v10, v15
+
+    goto/16 :goto_17
+
+    :cond_23
+    const-string v1, "Invalid URL port: \""
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    move/from16 v11, v26
+
+    invoke-virtual {v12, v11, v14}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v2, v13}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v2, 0x22
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_24
+    move/from16 p1, v11
+
+    const/16 v7, 0x22
+
+    const/4 v8, 0x1
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x4
+
+    move-object/from16 v2, p2
+
+    move v3, v10
+
+    move/from16 v4, p1
+
+    invoke-static/range {v1 .. v6}, Lo0/w$b;->d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->d0(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lo0/w$a;->d:Ljava/lang/String;
+
+    iget-object v1, v0, Lo0/w$a;->a:Ljava/lang/String;
+
+    if-eqz v1, :cond_3d
+
+    const-string v2, "scheme"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v2
+
+    const v3, 0x310888    # 4.503E-39f
+
+    if-eq v2, v3, :cond_26
+
+    const v3, 0x5f008eb
+
+    if-eq v2, v3, :cond_25
+
+    goto :goto_15
+
+    :cond_25
+    invoke-virtual {v1, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_27
+
+    const/16 v1, 0x1bb
+
+    goto :goto_16
+
+    :cond_26
+    move-object/from16 v2, v19
+
+    invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_27
+
+    const/16 v1, 0x50
+
+    goto :goto_16
+
+    :cond_27
+    :goto_15
+    const/4 v1, -0x1
+
+    :goto_16
+    iput v1, v0, Lo0/w$a;->e:I
+
+    const/16 v1, 0x22
+
+    const/4 v4, 0x1
+
+    :goto_17
+    iget-object v2, v0, Lo0/w$a;->d:Ljava/lang/String;
+
+    if-eqz v2, :cond_28
+
+    const/4 v2, 0x1
+
+    goto :goto_18
+
+    :cond_28
+    const/4 v2, 0x0
+
+    :goto_18
+    if-eqz v2, :cond_3c
+
+    move v1, v4
+
+    move v3, v14
+
+    :goto_19
+    const-string v2, "?#"
+
+    move/from16 v4, v18
+
+    invoke-static {v12, v2, v3, v4}, Lo0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
+
+    move-result v2
+
+    if-ne v3, v2, :cond_29
+
+    move-object v13, v0
+
+    move v15, v2
+
+    move v14, v4
+
+    move-object v1, v12
+
+    move-object v2, v1
+
+    goto/16 :goto_26
+
+    :cond_29
+    invoke-virtual {v12, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    const-string v6, ""
+
+    const/16 v7, 0x2f
+
+    if-eq v5, v7, :cond_2b
+
+    const/16 v7, 0x5c
+
+    if-ne v5, v7, :cond_2a
+
+    goto :goto_1a
+
+    :cond_2a
+    iget-object v5, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v5}, Ljava/util/List;->size()I
+
+    move-result v7
+
+    sub-int/2addr v7, v1
+
+    invoke-interface {v5, v7, v6}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    move-object v11, v0
+
+    move-object/from16 v16, v11
+
+    move v14, v1
+
+    move v13, v2
+
+    move v15, v13
+
+    move v5, v3
+
+    move/from16 v17, v4
+
+    move-object v1, v12
+
+    move-object v2, v1
+
+    move-object v10, v2
+
+    move-object v12, v6
+
+    goto :goto_1c
+
+    :cond_2b
+    :goto_1a
+    iget-object v5, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v5}, Ljava/util/List;->clear()V
+
+    iget-object v5, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v5, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    move-object v8, v0
+
+    move-object v9, v8
+
+    move v5, v2
+
+    move v13, v4
+
+    move-object v7, v6
+
+    move v4, v5
+
+    move v6, v3
+
+    move-object v2, v12
+
+    move v3, v1
+
+    move-object v1, v2
+
+    :goto_1b
+    add-int/2addr v6, v3
+
+    move v14, v3
+
+    move v15, v4
+
+    move-object/from16 v16, v8
+
+    move-object v11, v9
+
+    move-object v10, v12
+
+    move/from16 v17, v13
+
+    move v13, v5
+
+    move v5, v6
+
+    move-object v12, v7
+
+    :goto_1c
+    if-ge v5, v13, :cond_39
+
+    const-string v3, "/\\"
+
+    invoke-static {v10, v3, v5, v13}, Lo0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
+
+    move-result v9
+
+    if-ge v9, v13, :cond_2c
+
+    const/4 v3, 0x1
+
+    const/16 v18, 0x1
+
+    goto :goto_1d
+
+    :cond_2c
+    const/4 v3, 0x0
+
+    const/16 v18, 0x0
+
+    :goto_1d
+    const/4 v8, 0x1
+
+    sget-object v3, Lo0/w;->l:Lo0/w$b;
+
+    const/16 v19, 0x0
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    const/16 v22, 0x0
+
+    const/16 v23, 0xf0
+
+    const-string v7, " \"<>^`{}|/\\?#"
+
+    move-object v4, v10
+
+    move v6, v9
+
+    move/from16 v24, v9
+
+    move/from16 v9, v19
+
+    move-object/from16 v19, v10
+
+    move/from16 v10, v20
+
+    move-object/from16 v27, v11
+
+    move/from16 v11, v21
+
+    move-object/from16 v28, v12
+
+    move-object/from16 v12, v22
+
+    move/from16 v20, v13
+
+    move/from16 v13, v23
+
+    invoke-static/range {v3 .. v13}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "."
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_2e
+
+    const-string v4, "%2e"
+
+    invoke-static {v3, v4, v14}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2d
+
+    goto :goto_1e
+
+    :cond_2d
+    const/4 v4, 0x0
+
+    goto :goto_1f
+
+    :cond_2e
+    :goto_1e
+    const/4 v4, 0x1
+
+    :goto_1f
+    if-eqz v4, :cond_2f
+
+    move-object/from16 v9, v27
+
+    move-object/from16 v6, v28
+
+    goto/16 :goto_25
+
+    :cond_2f
+    const-string v4, ".."
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_31
+
+    const-string v4, "%2e."
+
+    invoke-static {v3, v4, v14}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v4
+
+    if-nez v4, :cond_31
+
+    const-string v4, ".%2e"
+
+    invoke-static {v3, v4, v14}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v4
+
+    if-nez v4, :cond_31
+
+    const-string v4, "%2e%2e"
+
+    invoke-static {v3, v4, v14}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_30
+
+    goto :goto_20
+
+    :cond_30
+    const/4 v4, 0x0
+
+    goto :goto_21
+
+    :cond_31
+    :goto_20
+    const/4 v4, 0x1
+
+    :goto_21
+    if-eqz v4, :cond_34
+
+    move-object/from16 v9, v27
+
+    iget-object v3, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v3}, Ljava/util/List;->size()I
+
+    move-result v4
+
+    sub-int/2addr v4, v14
+
+    invoke-interface {v3, v4}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    invoke-virtual {v3}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    if-nez v3, :cond_32
+
+    const/4 v3, 0x1
+
+    goto :goto_22
+
+    :cond_32
+    const/4 v3, 0x0
+
+    :goto_22
+    if-eqz v3, :cond_33
+
+    iget-object v3, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v14
+
+    if-eqz v3, :cond_33
+
+    iget-object v3, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v3}, Ljava/util/List;->size()I
+
+    move-result v4
+
+    sub-int/2addr v4, v14
+
+    move-object/from16 v6, v28
+
+    invoke-interface {v3, v4, v6}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_25
+
+    :cond_33
+    move-object/from16 v6, v28
+
+    iget-object v3, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v3, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_25
+
+    :cond_34
+    move-object/from16 v9, v27
+
+    move-object/from16 v6, v28
+
+    iget-object v4, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v4}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    sub-int/2addr v5, v14
+
+    invoke-interface {v4, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/CharSequence;
+
+    invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
+
+    move-result v4
+
+    if-nez v4, :cond_35
+
+    const/4 v4, 0x1
+
+    goto :goto_23
+
+    :cond_35
+    const/4 v4, 0x0
+
+    :goto_23
+    if-eqz v4, :cond_36
+
+    iget-object v4, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v4}, Ljava/util/List;->size()I
+
+    move-result v5
+
+    sub-int/2addr v5, v14
+
+    invoke-interface {v4, v5, v3}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    goto :goto_24
+
+    :cond_36
+    iget-object v4, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v4, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :goto_24
+    if-eqz v18, :cond_37
+
+    iget-object v3, v9, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v3, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_37
+    :goto_25
+    if-eqz v18, :cond_38
+
+    move-object v7, v6
+
+    move v3, v14
+
+    move v4, v15
+
+    move-object/from16 v8, v16
+
+    move/from16 v13, v17
+
+    move-object/from16 v12, v19
+
+    move/from16 v5, v20
+
+    move/from16 v6, v24
+
+    goto/16 :goto_1b
+
+    :cond_38
+    move-object v12, v6
+
+    move-object v11, v9
+
+    move-object/from16 v10, v19
+
+    move/from16 v13, v20
+
+    move/from16 v5, v24
+
+    goto/16 :goto_1c
+
+    :cond_39
+    move-object/from16 v13, v16
+
+    move/from16 v14, v17
+
+    :goto_26
+    if-ge v15, v14, :cond_3a
+
+    invoke-virtual {v2, v15}, Ljava/lang/String;->charAt(I)C
+
+    move-result v3
+
+    const/16 v4, 0x3f
+
+    if-ne v3, v4, :cond_3a
+
+    const/16 v12, 0x23
+
+    invoke-static {v2, v12, v15, v14}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result v16
+
+    sget-object v11, Lo0/w;->l:Lo0/w$b;
+
+    add-int/lit8 v5, v15, 0x1
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x1
+
+    const/4 v15, 0x0
+
+    const/16 v17, 0x0
+
+    const/16 v18, 0xd0
+
+    const-string v7, " \"\'<>#"
+
+    move-object v3, v11
+
+    move-object v4, v1
+
+    move/from16 v6, v16
+
+    move-object/from16 v29, v11
+
+    move v11, v15
+
+    const/16 v15, 0x23
+
+    move-object/from16 v12, v17
+
+    move-object v15, v13
+
+    move/from16 v13, v18
+
+    invoke-static/range {v3 .. v13}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v3
+
+    move-object/from16 v4, v29
+
+    invoke-virtual {v4, v3}, Lo0/w$b;->e(Ljava/lang/String;)Ljava/util/List;
+
+    move-result-object v3
+
+    iput-object v3, v15, Lo0/w$a;->g:Ljava/util/List;
+
+    move/from16 v3, v16
+
+    goto :goto_27
+
+    :cond_3a
+    move v3, v15
+
+    move-object v15, v13
+
+    :goto_27
+    const/16 v12, 0x23
+
+    if-ge v3, v14, :cond_3b
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    if-ne v2, v12, :cond_3b
+
+    sget-object v2, Lo0/w;->l:Lo0/w$b;
+
+    add-int/lit8 v5, v3, 0x1
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x1
+
+    const/4 v12, 0x0
+
+    const/16 v13, 0xb0
+
+    const-string v7, ""
+
+    move-object v3, v2
+
+    move-object v4, v1
+
+    move v6, v14
+
+    invoke-static/range {v3 .. v13}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    iput-object v1, v15, Lo0/w$a;->h:Ljava/lang/String;
+
+    :cond_3b
+    return-object v15
+
+    :cond_3c
+    const-string v2, "Invalid URL host: \""
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    move/from16 v14, p1
+
+    invoke-virtual {v12, v10, v14}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v3, v13}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_3d
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v1, 0x0
+
+    throw v1
+
+    :cond_3e
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "Expected URL scheme \'http\' or \'https\' but no colon was found"
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public final f(Ljava/lang/String;)Lo0/w$a;
+    .locals 12
+
+    const-string v0, "password"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0xfb
+
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/w$a;->c:Ljava/lang/String;
+
+    return-object p0
+.end method
+
+.method public final g(Ljava/lang/String;)Lo0/w$a;
+    .locals 12
+
+    const-string v0, "username"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#"
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0xfb
+
+    move-object v2, p1
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/w$a;->b:Ljava/lang/String;
+
+    return-object p0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 10
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lo0/w$a;->a:Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, "://"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "//"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :goto_0
+    iget-object v1, p0, Lo0/w$a;->b:Ljava/lang/String;
+
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-lez v1, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
+    const/16 v4, 0x3a
+
+    if-nez v1, :cond_3
+
+    iget-object v1, p0, Lo0/w$a;->c:Ljava/lang/String;
+
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    if-lez v1, :cond_2
+
+    const/4 v1, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
+    if-eqz v1, :cond_6
+
+    :cond_3
+    iget-object v1, p0, Lo0/w$a;->b:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/w$a;->c:Ljava/lang/String;
+
+    invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
+
+    move-result v1
+
+    if-lez v1, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v2, 0x0
+
+    :goto_3
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/w$a;->c:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_5
+    const/16 v1, 0x40
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :cond_6
+    iget-object v1, p0, Lo0/w$a;->d:Ljava/lang/String;
+
+    const/4 v2, 0x2
+
+    const/4 v5, 0x0
+
+    if-eqz v1, :cond_9
+
+    if-eqz v1, :cond_8
+
+    invoke-static {v1, v4, v3, v2}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    const/16 v1, 0x5b
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/w$a;->d:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_4
+
+    :cond_7
+    iget-object v1, p0, Lo0/w$a;->d:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    goto :goto_4
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_9
+    :goto_4
+    iget v1, p0, Lo0/w$a;->e:I
+
+    const/4 v6, -0x1
+
+    if-ne v1, v6, :cond_a
+
+    iget-object v1, p0, Lo0/w$a;->a:Ljava/lang/String;
+
+    if-eqz v1, :cond_10
+
+    :cond_a
+    invoke-virtual {p0}, Lo0/w$a;->c()I
+
+    move-result v1
+
+    iget-object v7, p0, Lo0/w$a;->a:Ljava/lang/String;
+
+    if-eqz v7, :cond_f
+
+    if-eqz v7, :cond_e
+
+    const-string v8, "scheme"
+
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v7}, Ljava/lang/String;->hashCode()I
+
+    move-result v8
+
+    const v9, 0x310888    # 4.503E-39f
+
+    if-eq v8, v9, :cond_c
+
+    const v9, 0x5f008eb
+
+    if-eq v8, v9, :cond_b
+
+    goto :goto_5
+
+    :cond_b
+    const-string v8, "https"
+
+    invoke-virtual {v7, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_d
+
+    const/16 v6, 0x1bb
+
+    goto :goto_5
+
+    :cond_c
+    const-string v8, "http"
+
+    invoke-virtual {v7, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_d
+
+    const/16 v6, 0x50
+
+    :cond_d
+    :goto_5
+    if-eq v1, v6, :cond_10
+
+    goto :goto_6
+
+    :cond_e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_f
+    :goto_6
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    :cond_10
+    iget-object v1, p0, Lo0/w$a;->f:Ljava/util/List;
+
+    const-string v4, "$this$toPathString"
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "out"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v6
+
+    const/4 v7, 0x0
+
+    :goto_7
+    if-ge v7, v6, :cond_11
+
+    const/16 v8, 0x2f
+
+    invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-interface {v1, v7}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Ljava/lang/String;
+
+    invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_7
+
+    :cond_11
+    iget-object v1, p0, Lo0/w$a;->g:Ljava/util/List;
+
+    if-eqz v1, :cond_16
+
+    const/16 v1, 0x3f
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/w$a;->g:Ljava/util/List;
+
+    if-eqz v1, :cond_15
+
+    const-string v5, "$this$toQueryString"
+
+    invoke-static {v1, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v4
+
+    invoke-static {v3, v4}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
+
+    move-result-object v3
+
+    invoke-static {v3, v2}, Lk0/r/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
+
+    move-result-object v2
+
+    iget v3, v2, Lkotlin/ranges/IntProgression;->d:I
+
+    iget v4, v2, Lkotlin/ranges/IntProgression;->e:I
+
+    iget v2, v2, Lkotlin/ranges/IntProgression;->f:I
+
+    if-ltz v2, :cond_12
+
+    if-gt v3, v4, :cond_16
+
+    goto :goto_8
+
+    :cond_12
+    if-lt v3, v4, :cond_16
+
+    :goto_8
+    invoke-interface {v1, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Ljava/lang/String;
+
+    add-int/lit8 v6, v3, 0x1
+
+    invoke-interface {v1, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Ljava/lang/String;
+
+    if-lez v3, :cond_13
+
+    const/16 v7, 0x26
+
+    invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :cond_13
+    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    if-eqz v6, :cond_14
+
+    const/16 v5, 0x3d
+
+    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_14
+    if-eq v3, v4, :cond_16
+
+    add-int/2addr v3, v2
+
+    goto :goto_8
+
+    :cond_15
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_16
+    iget-object v1, p0, Lo0/w$a;->h:Ljava/lang/String;
+
+    if-eqz v1, :cond_17
+
+    const/16 v1, 0x23
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/w$a;->h:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_17
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "StringBuilder().apply(builderAction).toString()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/w$b.smali b/com.discord/smali_classes2/o0/w$b.smali
new file mode 100644
index 0000000000..e3ecf0a55e
--- /dev/null
+++ b/com.discord/smali_classes2/o0/w$b.smali
@@ -0,0 +1,958 @@
+.class public final Lo0/w$b;
+.super Ljava/lang/Object;
+.source "HttpUrl.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/w;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+    .locals 16
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    move-object/from16 v2, p4
+
+    move/from16 v3, p10
+
+    and-int/lit8 v4, v3, 0x1
+
+    if-eqz v4, :cond_0
+
+    const/4 v4, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    move/from16 v4, p2
+
+    :goto_0
+    and-int/lit8 v5, v3, 0x2
+
+    if-eqz v5, :cond_1
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
+
+    move-result v5
+
+    goto :goto_1
+
+    :cond_1
+    move/from16 v5, p3
+
+    :goto_1
+    and-int/lit8 v6, v3, 0x8
+
+    if-eqz v6, :cond_2
+
+    const/4 v6, 0x0
+
+    goto :goto_2
+
+    :cond_2
+    move/from16 v6, p5
+
+    :goto_2
+    and-int/lit8 v7, v3, 0x10
+
+    if-eqz v7, :cond_3
+
+    const/4 v7, 0x0
+
+    goto :goto_3
+
+    :cond_3
+    move/from16 v7, p6
+
+    :goto_3
+    and-int/lit8 v8, v3, 0x20
+
+    if-eqz v8, :cond_4
+
+    const/4 v8, 0x0
+
+    goto :goto_4
+
+    :cond_4
+    move/from16 v8, p7
+
+    :goto_4
+    and-int/lit8 v9, v3, 0x40
+
+    if-eqz v9, :cond_5
+
+    const/4 v9, 0x0
+
+    goto :goto_5
+
+    :cond_5
+    move/from16 v9, p8
+
+    :goto_5
+    and-int/lit16 v3, v3, 0x80
+
+    if-eqz v3, :cond_6
+
+    const/4 v3, 0x0
+
+    goto :goto_6
+
+    :cond_6
+    move-object/from16 v3, p9
+
+    :goto_6
+    const-string v10, "$this$canonicalize"
+
+    invoke-static {v1, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v10, "encodeSet"
+
+    invoke-static {v2, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move v10, v4
+
+    :goto_7
+    const-string v11, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    if-ge v10, v5, :cond_1f
+
+    invoke-virtual {v1, v10}, Ljava/lang/String;->codePointAt(I)I
+
+    move-result v12
+
+    const/16 v13, 0x7f
+
+    const/16 v14, 0x20
+
+    const/4 v15, 0x2
+
+    if-lt v12, v14, :cond_a
+
+    if-eq v12, v13, :cond_a
+
+    const/16 v13, 0x80
+
+    if-lt v12, v13, :cond_7
+
+    if-eqz v9, :cond_a
+
+    :cond_7
+    int-to-char v13, v12
+
+    const/4 v14, 0x0
+
+    invoke-static {v2, v13, v14, v15}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
+
+    move-result v13
+
+    if-nez v13, :cond_a
+
+    const/16 v13, 0x25
+
+    if-ne v12, v13, :cond_8
+
+    if-eqz v6, :cond_a
+
+    if-eqz v7, :cond_8
+
+    invoke-virtual {v0, v1, v10, v5}, Lo0/w$b;->b(Ljava/lang/String;II)Z
+
+    move-result v13
+
+    if-eqz v13, :cond_a
+
+    :cond_8
+    const/16 v13, 0x2b
+
+    if-ne v12, v13, :cond_9
+
+    if-eqz v8, :cond_9
+
+    goto :goto_8
+
+    :cond_9
+    invoke-static {v12}, Ljava/lang/Character;->charCount(I)I
+
+    move-result v11
+
+    add-int/2addr v10, v11
+
+    goto :goto_7
+
+    :cond_a
+    :goto_8
+    new-instance v12, Lp0/e;
+
+    invoke-direct {v12}, Lp0/e;-><init>()V
+
+    invoke-virtual {v12, v1, v4, v10}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
+
+    const/4 v4, 0x0
+
+    :goto_9
+    if-ge v10, v5, :cond_1e
+
+    invoke-virtual {v1, v10}, Ljava/lang/String;->codePointAt(I)I
+
+    move-result v13
+
+    if-eqz v6, :cond_b
+
+    const/16 v14, 0x9
+
+    if-eq v13, v14, :cond_d
+
+    const/16 v14, 0xa
+
+    if-eq v13, v14, :cond_d
+
+    const/16 v14, 0xc
+
+    if-eq v13, v14, :cond_d
+
+    const/16 v14, 0xd
+
+    if-eq v13, v14, :cond_d
+
+    :cond_b
+    const/16 v14, 0x2b
+
+    if-ne v13, v14, :cond_e
+
+    if-eqz v8, :cond_e
+
+    if-eqz v6, :cond_c
+
+    const-string v14, "+"
+
+    goto :goto_a
+
+    :cond_c
+    const-string v14, "%2B"
+
+    :goto_a
+    invoke-virtual {v12, v14}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
+
+    :cond_d
+    move/from16 p2, v8
+
+    goto/16 :goto_11
+
+    :cond_e
+    const/16 v14, 0x20
+
+    if-lt v13, v14, :cond_11
+
+    const/16 v14, 0x7f
+
+    if-eq v13, v14, :cond_11
+
+    const/16 v14, 0x80
+
+    if-lt v13, v14, :cond_f
+
+    if-eqz v9, :cond_11
+
+    :cond_f
+    int-to-char v14, v13
+
+    move/from16 p2, v8
+
+    const/4 v8, 0x0
+
+    invoke-static {v2, v14, v8, v15}, Lk0/u/p;->contains$default(Ljava/lang/CharSequence;CZI)Z
+
+    move-result v8
+
+    if-nez v8, :cond_12
+
+    const/16 v8, 0x25
+
+    if-ne v13, v8, :cond_10
+
+    if-eqz v6, :cond_12
+
+    if-eqz v7, :cond_10
+
+    invoke-virtual {v0, v1, v10, v5}, Lo0/w$b;->b(Ljava/lang/String;II)Z
+
+    move-result v8
+
+    if-nez v8, :cond_10
+
+    goto :goto_b
+
+    :cond_10
+    invoke-virtual {v12, v13}, Lp0/e;->U(I)Lp0/e;
+
+    goto/16 :goto_11
+
+    :cond_11
+    move/from16 p2, v8
+
+    :cond_12
+    :goto_b
+    if-nez v4, :cond_13
+
+    new-instance v4, Lp0/e;
+
+    invoke-direct {v4}, Lp0/e;-><init>()V
+
+    :cond_13
+    if-eqz v3, :cond_1c
+
+    sget-object v8, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+
+    invoke-static {v3, v8}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_14
+
+    goto/16 :goto_f
+
+    :cond_14
+    invoke-static {v13}, Ljava/lang/Character;->charCount(I)I
+
+    move-result v8
+
+    add-int/2addr v8, v10
+
+    const-string v14, "string"
+
+    invoke-static {v1, v14}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v14, "charset"
+
+    invoke-static {v3, v14}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v14, 0x1
+
+    if-ltz v10, :cond_15
+
+    const/4 v15, 0x1
+
+    goto :goto_c
+
+    :cond_15
+    const/4 v15, 0x0
+
+    :goto_c
+    if-eqz v15, :cond_1b
+
+    if-lt v8, v10, :cond_16
+
+    const/4 v15, 0x1
+
+    goto :goto_d
+
+    :cond_16
+    const/4 v15, 0x0
+
+    :goto_d
+    if-eqz v15, :cond_1a
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
+
+    move-result v15
+
+    if-gt v8, v15, :cond_17
+
+    goto :goto_e
+
+    :cond_17
+    const/4 v14, 0x0
+
+    :goto_e
+    if-eqz v14, :cond_19
+
+    sget-object v14, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    invoke-static {v3, v14}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v14
+
+    if-eqz v14, :cond_18
+
+    invoke-virtual {v4, v1, v10, v8}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
+
+    goto :goto_10
+
+    :cond_18
+    invoke-virtual {v1, v10, v8}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-static {v8, v11}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8, v3}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+
+    move-result-object v8
+
+    const-string v14, "(this as java.lang.String).getBytes(charset)"
+
+    invoke-static {v8, v14}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v14, v8
+
+    const/4 v15, 0x0
+
+    invoke-virtual {v4, v8, v15, v14}, Lp0/e;->G([BII)Lp0/e;
+
+    goto :goto_10
+
+    :cond_19
+    const-string v0, "endIndex > string.length: "
+
+    const-string v2, " > "
+
+    invoke-static {v0, v8, v2}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1a
+    const-string v0, "endIndex < beginIndex: "
+
+    const-string v1, " < "
+
+    invoke-static {v0, v8, v1, v10}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1b
+    const-string v0, "beginIndex < 0: "
+
+    invoke-static {v0, v10}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1c
+    :goto_f
+    invoke-virtual {v4, v13}, Lp0/e;->U(I)Lp0/e;
+
+    :goto_10
+    invoke-virtual {v4}, Lp0/e;->J()Z
+
+    move-result v8
+
+    if-nez v8, :cond_1d
+
+    invoke-virtual {v4}, Lp0/e;->readByte()B
+
+    move-result v8
+
+    and-int/lit16 v8, v8, 0xff
+
+    const/16 v14, 0x25
+
+    invoke-virtual {v12, v14}, Lp0/e;->I(I)Lp0/e;
+
+    sget-object v14, Lo0/w;->k:[C
+
+    shr-int/lit8 v15, v8, 0x4
+
+    and-int/lit8 v15, v15, 0xf
+
+    aget-char v14, v14, v15
+
+    invoke-virtual {v12, v14}, Lp0/e;->I(I)Lp0/e;
+
+    sget-object v14, Lo0/w;->k:[C
+
+    and-int/lit8 v8, v8, 0xf
+
+    aget-char v8, v14, v8
+
+    invoke-virtual {v12, v8}, Lp0/e;->I(I)Lp0/e;
+
+    goto :goto_10
+
+    :cond_1d
+    :goto_11
+    invoke-static {v13}, Ljava/lang/Character;->charCount(I)I
+
+    move-result v8
+
+    add-int/2addr v10, v8
+
+    const/4 v15, 0x2
+
+    move/from16 v8, p2
+
+    goto/16 :goto_9
+
+    :cond_1e
+    invoke-virtual {v12}, Lp0/e;->v()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_12
+
+    :cond_1f
+    invoke-virtual {v1, v4, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0, v11}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_12
+    return-object v0
+.end method
+
+.method public static d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+    .locals 6
+
+    and-int/lit8 p0, p5, 0x1
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :cond_0
+
+    const/4 p2, 0x0
+
+    :cond_0
+    and-int/lit8 p0, p5, 0x2
+
+    if-eqz p0, :cond_1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p3
+
+    :cond_1
+    and-int/lit8 p0, p5, 0x4
+
+    if-eqz p0, :cond_2
+
+    const/4 p4, 0x0
+
+    :cond_2
+    const-string p0, "$this$percentDecode"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move p0, p2
+
+    :goto_0
+    if-ge p0, p3, :cond_8
+
+    invoke-virtual {p1, p0}, Ljava/lang/String;->charAt(I)C
+
+    move-result p5
+
+    const/16 v0, 0x2b
+
+    const/16 v1, 0x25
+
+    if-eq p5, v1, :cond_4
+
+    if-ne p5, v0, :cond_3
+
+    if-eqz p4, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    add-int/lit8 p0, p0, 0x1
+
+    goto :goto_0
+
+    :cond_4
+    :goto_1
+    new-instance p5, Lp0/e;
+
+    invoke-direct {p5}, Lp0/e;-><init>()V
+
+    invoke-virtual {p5, p1, p2, p0}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
+
+    :goto_2
+    if-ge p0, p3, :cond_7
+
+    invoke-virtual {p1, p0}, Ljava/lang/String;->codePointAt(I)I
+
+    move-result p2
+
+    if-ne p2, v1, :cond_5
+
+    add-int/lit8 v2, p0, 0x2
+
+    if-ge v2, p3, :cond_5
+
+    add-int/lit8 v3, p0, 0x1
+
+    invoke-virtual {p1, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v3
+
+    invoke-static {v3}, Lo0/g0/b;->w(C)I
+
+    move-result v3
+
+    invoke-virtual {p1, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    invoke-static {v4}, Lo0/g0/b;->w(C)I
+
+    move-result v4
+
+    const/4 v5, -0x1
+
+    if-eq v3, v5, :cond_6
+
+    if-eq v4, v5, :cond_6
+
+    shl-int/lit8 p0, v3, 0x4
+
+    add-int/2addr p0, v4
+
+    invoke-virtual {p5, p0}, Lp0/e;->I(I)Lp0/e;
+
+    invoke-static {p2}, Ljava/lang/Character;->charCount(I)I
+
+    move-result p0
+
+    add-int/2addr p0, v2
+
+    goto :goto_2
+
+    :cond_5
+    if-ne p2, v0, :cond_6
+
+    if-eqz p4, :cond_6
+
+    const/16 p2, 0x20
+
+    invoke-virtual {p5, p2}, Lp0/e;->I(I)Lp0/e;
+
+    add-int/lit8 p0, p0, 0x1
+
+    goto :goto_2
+
+    :cond_6
+    invoke-virtual {p5, p2}, Lp0/e;->U(I)Lp0/e;
+
+    invoke-static {p2}, Ljava/lang/Character;->charCount(I)I
+
+    move-result p2
+
+    add-int/2addr p0, p2
+
+    goto :goto_2
+
+    :cond_7
+    invoke-virtual {p5}, Lp0/e;->v()Ljava/lang/String;
+
+    move-result-object p0
+
+    goto :goto_3
+
+    :cond_8
+    invoke-virtual {p1, p2, p3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_3
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final b(Ljava/lang/String;II)Z
+    .locals 3
+
+    add-int/lit8 v0, p2, 0x2
+
+    const/4 v1, 0x1
+
+    if-ge v0, p3, :cond_0
+
+    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result p3
+
+    const/16 v2, 0x25
+
+    if-ne p3, v2, :cond_0
+
+    add-int/2addr p2, v1
+
+    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result p2
+
+    invoke-static {p2}, Lo0/g0/b;->w(C)I
+
+    move-result p2
+
+    const/4 p3, -0x1
+
+    if-eq p2, p3, :cond_0
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result p1
+
+    invoke-static {p1}, Lo0/g0/b;->w(C)I
+
+    move-result p1
+
+    if-eq p1, p3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+.end method
+
+.method public final c(Ljava/util/List;Z)Ljava/util/List;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;Z)",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1, v0}, Ljava/util/ArrayList;-><init>(I)V
+
+    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v3, v0
+
+    check-cast v3, Ljava/lang/String;
+
+    if-eqz v3, :cond_0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v7, 0x3
+
+    move-object v2, p0
+
+    move v6, p2
+
+    invoke-static/range {v2 .. v7}, Lo0/w$b;->d(Lo0/w$b;Ljava/lang/String;IIZI)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_1
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {v1}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    const-string p2, "Collections.unmodifiableList(result)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public final e(Ljava/lang/String;)Ljava/util/List;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "$this$toQueryNamesAndValues"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    if-gt v2, v3, :cond_3
+
+    const/16 v3, 0x26
+
+    const/4 v4, 0x4
+
+    invoke-static {p1, v3, v2, v1, v4}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v3
+
+    const/4 v5, -0x1
+
+    if-ne v3, v5, :cond_0
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    :cond_0
+    const/16 v6, 0x3d
+
+    invoke-static {p1, v6, v2, v1, v4}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v4
+
+    const-string v6, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    if-eq v4, v5, :cond_2
+
+    if-le v4, v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p1, v2, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v4, v4, 0x1
+
+    invoke-virtual {p1, v4, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_2
+    :goto_1
+    invoke-virtual {p1, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-static {v2, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :goto_2
+    add-int/lit8 v2, v3, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/w.smali b/com.discord/smali_classes2/o0/w.smali
index 3b4303e6b3..6b7273a23c 100644
--- a/com.discord/smali_classes2/o0/w.smali
+++ b/com.discord/smali_classes2/o0/w.smali
@@ -1,27 +1,1070 @@
-.class public interface abstract Lo0/w;
+.class public final Lo0/w;
 .super Ljava/lang/Object;
-.source "Source.kt"
+.source "HttpUrl.kt"
 
-# interfaces
-.implements Ljava/io/Closeable;
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/w$a;,
+        Lo0/w$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final k:[C
+
+.field public static final l:Lo0/w$b;
+
+
+# instance fields
+.field public final a:Z
+
+.field public final b:Ljava/lang/String;
+
+.field public final c:Ljava/lang/String;
+
+.field public final d:Ljava/lang/String;
+
+.field public final e:Ljava/lang/String;
+
+.field public final f:I
+
+.field public final g:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final h:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final i:Ljava/lang/String;
+
+.field public final j:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lo0/w$b;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/w$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/w;->l:Lo0/w$b;
+
+    const/16 v0, 0x10
+
+    new-array v0, v0, [C
+
+    fill-array-data v0, :array_0
+
+    sput-object v0, Lo0/w;->k:[C
+
+    return-void
+
+    :array_0
+    .array-data 2
+        0x30s
+        0x31s
+        0x32s
+        0x33s
+        0x34s
+        0x35s
+        0x36s
+        0x37s
+        0x38s
+        0x39s
+        0x41s
+        0x42s
+        0x43s
+        0x44s
+        0x45s
+        0x46s
+    .end array-data
+.end method
+
+.method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            "I",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "scheme"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "username"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "password"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "host"
+
+    invoke-static {p4, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "pathSegments"
+
+    invoke-static {p6, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "url"
+
+    invoke-static {p9, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/w;->b:Ljava/lang/String;
+
+    iput-object p2, p0, Lo0/w;->c:Ljava/lang/String;
+
+    iput-object p3, p0, Lo0/w;->d:Ljava/lang/String;
+
+    iput-object p4, p0, Lo0/w;->e:Ljava/lang/String;
+
+    iput p5, p0, Lo0/w;->f:I
+
+    iput-object p6, p0, Lo0/w;->g:Ljava/util/List;
+
+    iput-object p7, p0, Lo0/w;->h:Ljava/util/List;
+
+    iput-object p8, p0, Lo0/w;->i:Ljava/lang/String;
+
+    iput-object p9, p0, Lo0/w;->j:Ljava/lang/String;
+
+    const-string p2, "https"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    iput-boolean p1, p0, Lo0/w;->a:Z
+
+    return-void
+.end method
+
+.method public static final h(Ljava/lang/String;)Lo0/w;
+    .locals 2
+
+    const-string v0, "$this$toHttpUrlOrNull"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    const-string v1, "$this$toHttpUrl"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lo0/w$a;
+
+    invoke-direct {v1}, Lo0/w$a;-><init>()V
+
+    invoke-virtual {v1, v0, p0}, Lo0/w$a;->e(Lo0/w;Ljava/lang/String;)Lo0/w$a;
+
+    invoke-virtual {v1}, Lo0/w$a;->b()Lo0/w;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-object v0
+.end method
 
 
 # virtual methods
-.method public abstract B0(Lo0/e;J)J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+.method public final a()Ljava/lang/String;
+    .locals 6
+
+    iget-object v0, p0, Lo0/w;->d:Ljava/lang/String;
+
+    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const-string v0, ""
+
+    return-object v0
+
+    :cond_1
+    iget-object v0, p0, Lo0/w;->j:Ljava/lang/String;
+
+    const/16 v3, 0x3a
+
+    iget-object v4, p0, Lo0/w;->b:Ljava/lang/String;
+
+    invoke-virtual {v4}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    add-int/lit8 v4, v4, 0x3
+
+    const/4 v5, 0x4
+
+    invoke-static {v0, v3, v4, v2, v5}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v0
+
+    add-int/2addr v0, v1
+
+    iget-object v1, p0, Lo0/w;->j:Ljava/lang/String;
+
+    const/16 v3, 0x40
+
+    const/4 v4, 0x6
+
+    invoke-static {v1, v3, v2, v2, v4}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v1
+
+    iget-object v2, p0, Lo0/w;->j:Ljava/lang/String;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_2
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
 .end method
 
-.method public abstract close()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+.method public final b()Ljava/lang/String;
+    .locals 5
+
+    iget-object v0, p0, Lo0/w;->j:Ljava/lang/String;
+
+    iget-object v1, p0, Lo0/w;->b:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x3
+
+    const/16 v2, 0x2f
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    invoke-static {v0, v2, v1, v3, v4}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v0
+
+    iget-object v1, p0, Lo0/w;->j:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    const-string v3, "?#"
+
+    invoke-static {v1, v3, v0, v2}, Lo0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
+
+    move-result v1
+
+    iget-object v2, p0, Lo0/w;->j:Ljava/lang/String;
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
 .end method
 
-.method public abstract timeout()Lo0/x;
+.method public final c()Ljava/util/List;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lo0/w;->j:Ljava/lang/String;
+
+    iget-object v1, p0, Lo0/w;->b:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x3
+
+    const/16 v2, 0x2f
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x4
+
+    invoke-static {v0, v2, v1, v3, v4}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v0
+
+    iget-object v1, p0, Lo0/w;->j:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    const-string v4, "?#"
+
+    invoke-static {v1, v4, v0, v3}, Lo0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
+
+    move-result v1
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
+
+    :goto_0
+    if-ge v0, v1, :cond_1
+
+    add-int/lit8 v0, v0, 0x1
+
+    iget-object v4, p0, Lo0/w;->j:Ljava/lang/String;
+
+    invoke-static {v4, v2, v0, v1}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result v4
+
+    iget-object v5, p0, Lo0/w;->j:Ljava/lang/String;
+
+    if-eqz v5, :cond_0
+
+    invoke-virtual {v5, v0, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v5, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v0, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {v3, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    move v0, v4
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1
+    return-object v3
+.end method
+
+.method public final d()Ljava/lang/String;
+    .locals 4
+
+    iget-object v0, p0, Lo0/w;->h:Ljava/util/List;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_0
+    iget-object v0, p0, Lo0/w;->j:Ljava/lang/String;
+
+    const/16 v1, 0x3f
+
+    const/4 v2, 0x6
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v3, v3, v2}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iget-object v1, p0, Lo0/w;->j:Ljava/lang/String;
+
+    const/16 v2, 0x23
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    invoke-static {v1, v2, v0, v3}, Lo0/g0/b;->h(Ljava/lang/String;CII)I
+
+    move-result v1
+
+    iget-object v2, p0, Lo0/w;->j:Ljava/lang/String;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_1
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final e()Ljava/lang/String;
+    .locals 4
+
+    iget-object v0, p0, Lo0/w;->c:Ljava/lang/String;
+
+    invoke-interface {v0}, Ljava/lang/CharSequence;->length()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const-string v0, ""
+
+    return-object v0
+
+    :cond_1
+    iget-object v0, p0, Lo0/w;->b:Ljava/lang/String;
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x3
+
+    iget-object v1, p0, Lo0/w;->j:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v2
+
+    const-string v3, ":@"
+
+    invoke-static {v1, v3, v0, v2}, Lo0/g0/b;->i(Ljava/lang/String;Ljava/lang/String;II)I
+
+    move-result v1
+
+    iget-object v2, p0, Lo0/w;->j:Ljava/lang/String;
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v2, v0, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+
+    :cond_2
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Lo0/w;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lo0/w;
+
+    iget-object p1, p1, Lo0/w;->j:Ljava/lang/String;
+
+    iget-object v0, p0, Lo0/w;->j:Ljava/lang/String;
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public final f()Lo0/w$a;
+    .locals 6
+
+    new-instance v0, Lo0/w$a;
+
+    invoke-direct {v0}, Lo0/w$a;-><init>()V
+
+    iget-object v1, p0, Lo0/w;->b:Ljava/lang/String;
+
+    iput-object v1, v0, Lo0/w$a;->a:Ljava/lang/String;
+
+    invoke-virtual {p0}, Lo0/w;->e()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "<set-?>"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v1, v0, Lo0/w$a;->b:Ljava/lang/String;
+
+    invoke-virtual {p0}, Lo0/w;->a()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v1, v0, Lo0/w$a;->c:Ljava/lang/String;
+
+    iget-object v1, p0, Lo0/w;->e:Ljava/lang/String;
+
+    iput-object v1, v0, Lo0/w$a;->d:Ljava/lang/String;
+
+    iget v1, p0, Lo0/w;->f:I
+
+    iget-object v2, p0, Lo0/w;->b:Ljava/lang/String;
+
+    const-string v3, "scheme"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
+
+    move-result v3
+
+    const/4 v4, -0x1
+
+    const v5, 0x310888    # 4.503E-39f
+
+    if-eq v3, v5, :cond_1
+
+    const v5, 0x5f008eb
+
+    if-eq v3, v5, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v3, "https"
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    const/16 v2, 0x1bb
+
+    goto :goto_1
+
+    :cond_1
+    const-string v3, "http"
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    const/16 v2, 0x50
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    const/4 v2, -0x1
+
+    :goto_1
+    if-eq v1, v2, :cond_3
+
+    iget v4, p0, Lo0/w;->f:I
+
+    :cond_3
+    iput v4, v0, Lo0/w$a;->e:I
+
+    iget-object v1, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->clear()V
+
+    iget-object v1, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-virtual {p0}, Lo0/w;->c()Ljava/util/List;
+
+    move-result-object v2
+
+    invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
+
+    invoke-virtual {p0}, Lo0/w;->d()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lo0/w$a;->d(Ljava/lang/String;)Lo0/w$a;
+
+    iget-object v1, p0, Lo0/w;->i:Ljava/lang/String;
+
+    if-nez v1, :cond_4
+
+    const/4 v1, 0x0
+
+    goto :goto_2
+
+    :cond_4
+    iget-object v1, p0, Lo0/w;->j:Ljava/lang/String;
+
+    const/16 v2, 0x23
+
+    const/4 v3, 0x6
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v4, v4, v3}, Lk0/u/p;->indexOf$default(Ljava/lang/CharSequence;CIZI)I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x1
+
+    iget-object v2, p0, Lo0/w;->j:Ljava/lang/String;
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "(this as java.lang.String).substring(startIndex)"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_2
+    iput-object v1, v0, Lo0/w$a;->h:Ljava/lang/String;
+
+    return-object v0
+
+    :cond_5
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type java.lang.String"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final g(Ljava/lang/String;)Lo0/w$a;
+    .locals 1
+
+    const-string v0, "link"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    new-instance v0, Lo0/w$a;
+
+    invoke-direct {v0}, Lo0/w$a;-><init>()V
+
+    invoke-virtual {v0, p0, p1}, Lo0/w$a;->e(Lo0/w;Ljava/lang/String;)Lo0/w$a;
+    :try_end_0
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lo0/w;->j:Ljava/lang/String;
+
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final i()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "/..."
+
+    invoke-virtual {p0, v0}, Lo0/w;->g(Ljava/lang/String;)Lo0/w$a;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const-string v1, ""
+
+    invoke-virtual {v0, v1}, Lo0/w$a;->g(Ljava/lang/String;)Lo0/w$a;
+
+    invoke-virtual {v0, v1}, Lo0/w$a;->f(Ljava/lang/String;)Lo0/w$a;
+
+    invoke-virtual {v0}, Lo0/w$a;->b()Lo0/w;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lo0/w;->j:Ljava/lang/String;
+
+    return-object v0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public final j()Ljava/net/URI;
+    .locals 17
+
+    invoke-virtual/range {p0 .. p0}, Lo0/w;->f()Lo0/w$a;
+
+    move-result-object v0
+
+    iget-object v1, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_0
+
+    iget-object v4, v0, Lo0/w$a;->f:Ljava/util/List;
+
+    sget-object v5, Lo0/w;->l:Lo0/w$b;
+
+    invoke-interface {v4, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v6
+
+    check-cast v6, Ljava/lang/String;
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v10, 0x1
+
+    const/4 v11, 0x1
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xe3
+
+    const-string v9, "[]"
+
+    invoke-static/range {v5 .. v15}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-interface {v4, v3, v5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, v0, Lo0/w$a;->g:Ljava/util/List;
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v4
+
+    :goto_1
+    if-ge v2, v4, :cond_2
+
+    invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    move-object v7, v5
+
+    check-cast v7, Ljava/lang/String;
+
+    if-eqz v7, :cond_1
+
+    sget-object v6, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v11, 0x1
+
+    const/4 v12, 0x1
+
+    const/4 v13, 0x1
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0xc3
+
+    const-string v10, "\\^`{|}"
+
+    invoke-static/range {v6 .. v16}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v5
+
+    goto :goto_2
+
+    :cond_1
+    move-object v5, v3
+
+    :goto_2
+    invoke-interface {v1, v2, v5}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    iget-object v6, v0, Lo0/w$a;->h:Ljava/lang/String;
+
+    if-eqz v6, :cond_3
+
+    sget-object v5, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v10, 0x1
+
+    const/4 v11, 0x1
+
+    const/4 v12, 0x0
+
+    const/4 v13, 0x1
+
+    const/4 v14, 0x0
+
+    const/16 v15, 0xa3
+
+    const-string v9, " \"#<>\\^`{|}"
+
+    invoke-static/range {v5 .. v15}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v3
+
+    :cond_3
+    iput-object v3, v0, Lo0/w$a;->h:Ljava/lang/String;
+
+    invoke-virtual {v0}, Lo0/w$a;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    :try_start_0
+    new-instance v0, Ljava/net/URI;
+
+    invoke-direct {v0, v1}, Ljava/net/URI;-><init>(Ljava/lang/String;)V
+    :try_end_0
+    .catch Ljava/net/URISyntaxException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_3
+
+    :catch_0
+    move-exception v0
+
+    :try_start_1
+    new-instance v2, Lkotlin/text/Regex;
+
+    const-string v3, "[\\u0000-\\u001F\\u007F-\\u009F\\p{javaWhitespace}]"
+
+    invoke-direct {v2, v3}, Lkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+
+    const-string v3, ""
+
+    invoke-virtual {v2, v1, v3}, Lkotlin/text/Regex;->replace(Ljava/lang/CharSequence;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v1}, Ljava/net/URI;->create(Ljava/lang/String;)Ljava/net/URI;
+
+    move-result-object v1
+
+    const-string v2, "URI.create(stripped)"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_1
+    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1
+
+    move-object v0, v1
+
+    :goto_3
+    return-object v0
+
+    :catch_1
+    new-instance v1, Ljava/lang/RuntimeException;
+
+    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
+
+.method public final k()Ljava/net/URL;
+    .locals 2
+
+    :try_start_0
+    new-instance v0, Ljava/net/URL;
+
+    iget-object v1, p0, Lo0/w;->j:Ljava/lang/String;
+
+    invoke-direct {v0, v1}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
+    :try_end_0
+    .catch Ljava/net/MalformedURLException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/lang/RuntimeException;
+
+    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lo0/w;->j:Ljava/lang/String;
+
+    return-object v0
 .end method
diff --git a/com.discord/smali_classes2/o0/x$a.smali b/com.discord/smali_classes2/o0/x$a.smali
index 4b8821c801..af9306cf77 100644
--- a/com.discord/smali_classes2/o0/x$a.smali
+++ b/com.discord/smali_classes2/o0/x$a.smali
@@ -1,6 +1,6 @@
 .class public final Lo0/x$a;
-.super Lo0/x;
-.source "Timeout.kt"
+.super Ljava/lang/Object;
+.source "OkHttpClient.kt"
 
 
 # annotations
@@ -10,46 +10,254 @@
 
 .annotation system Ldalvik/annotation/InnerClass;
     accessFlags = 0x19
-    name = null
+    name = "a"
 .end annotation
 
 
+# instance fields
+.field public A:I
+
+.field public B:I
+
+.field public a:Lo0/q;
+
+.field public b:Lo0/l;
+
+.field public final c:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lokhttp3/Interceptor;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lokhttp3/Interceptor;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public e:Lo0/t$b;
+
+.field public f:Z
+
+.field public g:Lo0/c;
+
+.field public h:Z
+
+.field public i:Z
+
+.field public j:Lo0/p;
+
+.field public k:Lo0/d;
+
+.field public l:Lo0/s;
+
+.field public m:Ljava/net/Proxy;
+
+.field public n:Ljava/net/ProxySelector;
+
+.field public o:Lo0/c;
+
+.field public p:Ljavax/net/SocketFactory;
+
+.field public q:Ljavax/net/ssl/SSLSocketFactory;
+
+.field public r:Ljavax/net/ssl/X509TrustManager;
+
+.field public s:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/m;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public t:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "+",
+            "Lo0/y;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public u:Ljavax/net/ssl/HostnameVerifier;
+
+.field public v:Lo0/h;
+
+.field public w:Lo0/g0/j/c;
+
+.field public x:I
+
+.field public y:I
+
+.field public z:I
+
+
 # direct methods
 .method public constructor <init>()V
-    .locals 0
+    .locals 2
 
-    invoke-direct {p0}, Lo0/x;-><init>()V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lo0/q;
+
+    invoke-direct {v0}, Lo0/q;-><init>()V
+
+    iput-object v0, p0, Lo0/x$a;->a:Lo0/q;
+
+    new-instance v0, Lo0/l;
+
+    invoke-direct {v0}, Lo0/l;-><init>()V
+
+    iput-object v0, p0, Lo0/x$a;->b:Lo0/l;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lo0/x$a;->c:Ljava/util/List;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Lo0/x$a;->d:Ljava/util/List;
+
+    sget-object v0, Lo0/t;->a:Lo0/t;
+
+    const-string v1, "$this$asFactory"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lo0/g0/a;
+
+    invoke-direct {v1, v0}, Lo0/g0/a;-><init>(Lo0/t;)V
+
+    iput-object v1, p0, Lo0/x$a;->e:Lo0/t$b;
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lo0/x$a;->f:Z
+
+    sget-object v1, Lo0/c;->a:Lo0/c;
+
+    iput-object v1, p0, Lo0/x$a;->g:Lo0/c;
+
+    iput-boolean v0, p0, Lo0/x$a;->h:Z
+
+    iput-boolean v0, p0, Lo0/x$a;->i:Z
+
+    sget-object v0, Lo0/p;->a:Lo0/p;
+
+    iput-object v0, p0, Lo0/x$a;->j:Lo0/p;
+
+    sget-object v0, Lo0/s;->a:Lo0/s;
+
+    iput-object v0, p0, Lo0/x$a;->l:Lo0/s;
+
+    sget-object v0, Lo0/c;->a:Lo0/c;
+
+    iput-object v0, p0, Lo0/x$a;->o:Lo0/c;
+
+    invoke-static {}, Ljavax/net/SocketFactory;->getDefault()Ljavax/net/SocketFactory;
+
+    move-result-object v0
+
+    const-string v1, "SocketFactory.getDefault()"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v0, p0, Lo0/x$a;->p:Ljavax/net/SocketFactory;
+
+    sget-object v0, Lo0/x;->H:Lo0/x$b;
+
+    sget-object v0, Lo0/x;->G:Ljava/util/List;
+
+    iput-object v0, p0, Lo0/x$a;->s:Ljava/util/List;
+
+    sget-object v0, Lo0/x;->H:Lo0/x$b;
+
+    sget-object v0, Lo0/x;->F:Ljava/util/List;
+
+    iput-object v0, p0, Lo0/x$a;->t:Ljava/util/List;
+
+    sget-object v0, Lo0/g0/j/d;->a:Lo0/g0/j/d;
+
+    iput-object v0, p0, Lo0/x$a;->u:Ljavax/net/ssl/HostnameVerifier;
+
+    sget-object v0, Lo0/h;->c:Lo0/h;
+
+    iput-object v0, p0, Lo0/x$a;->v:Lo0/h;
+
+    const/16 v0, 0x2710
+
+    iput v0, p0, Lo0/x$a;->y:I
+
+    iput v0, p0, Lo0/x$a;->z:I
+
+    iput v0, p0, Lo0/x$a;->A:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public d(J)Lo0/x;
-    .locals 0
+.method public final a(JLjava/util/concurrent/TimeUnit;)Lo0/x$a;
+    .locals 1
+
+    const-string v0, "unit"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "timeout"
+
+    invoke-static {v0, p1, p2, p3}, Lo0/g0/b;->d(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
+
+    move-result p1
+
+    iput p1, p0, Lo0/x$a;->z:I
 
     return-object p0
 .end method
 
-.method public f()V
-    .locals 0
+.method public final b(Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/X509TrustManager;)Lo0/x$a;
+    .locals 1
 
-    return-void
-.end method
+    const-string v0, "sslSocketFactory"
 
-.method public g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-    .locals 0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
+    const-string v0, "trustManager"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p1, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object p1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {p1, p2}, Lo0/g0/h/f;->b(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/c;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lo0/x$a;->w:Lo0/g0/j/c;
+
+    iput-object p2, p0, Lo0/x$a;->r:Ljavax/net/ssl/X509TrustManager;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "unit"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/o0/x$b.smali b/com.discord/smali_classes2/o0/x$b.smali
new file mode 100644
index 0000000000..d7223a8045
--- /dev/null
+++ b/com.discord/smali_classes2/o0/x$b.smali
@@ -0,0 +1,24 @@
+.class public final Lo0/x$b;
+.super Ljava/lang/Object;
+.source "OkHttpClient.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/x;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/o0/x.smali b/com.discord/smali_classes2/o0/x.smali
index ac9d5208dd..23e48f6798 100644
--- a/com.discord/smali_classes2/o0/x.smali
+++ b/com.discord/smali_classes2/o0/x.smali
@@ -1,231 +1,1195 @@
 .class public Lo0/x;
 .super Ljava/lang/Object;
-.source "Timeout.kt"
+.source "OkHttpClient.kt"
+
+# interfaces
+.implements Ljava/lang/Cloneable;
+.implements Lo0/f$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/x$a;,
+        Lo0/x$b;
+    }
+.end annotation
 
 
 # static fields
-.field public static final d:Lo0/x;
+.field public static final F:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/y;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final G:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/m;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final H:Lo0/x$b;
 
 
 # instance fields
-.field public a:Z
+.field public final A:I
 
-.field public b:J
+.field public final B:I
 
-.field public c:J
+.field public final C:I
+
+.field public final D:I
+
+.field public final E:I
+
+.field public final d:Lo0/q;
+
+.field public final e:Lo0/l;
+
+.field public final f:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lokhttp3/Interceptor;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lokhttp3/Interceptor;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final h:Lo0/t$b;
+
+.field public final i:Z
+
+.field public final j:Lo0/c;
+
+.field public final k:Z
+
+.field public final l:Z
+
+.field public final m:Lo0/p;
+
+.field public final n:Lo0/d;
+
+.field public final o:Lo0/s;
+
+.field public final p:Ljava/net/Proxy;
+
+.field public final q:Ljava/net/ProxySelector;
+
+.field public final r:Lo0/c;
+
+.field public final s:Ljavax/net/SocketFactory;
+
+.field public final t:Ljavax/net/ssl/SSLSocketFactory;
+
+.field public final u:Ljavax/net/ssl/X509TrustManager;
+
+.field public final v:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/m;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final w:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lo0/y;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final x:Ljavax/net/ssl/HostnameVerifier;
+
+.field public final y:Lo0/h;
+
+.field public final z:Lo0/g0/j/c;
 
 
 # direct methods
 .method public static constructor <clinit>()V
+    .locals 5
+
+    new-instance v0, Lo0/x$b;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/x$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/x;->H:Lo0/x$b;
+
+    const/4 v0, 0x2
+
+    new-array v1, v0, [Lo0/y;
+
+    sget-object v2, Lo0/y;->g:Lo0/y;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    sget-object v2, Lo0/y;->e:Lo0/y;
+
+    const/4 v4, 0x1
+
+    aput-object v2, v1, v4
+
+    invoke-static {v1}, Lo0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    sput-object v1, Lo0/x;->F:Ljava/util/List;
+
+    new-array v0, v0, [Lo0/m;
+
+    sget-object v1, Lo0/m;->g:Lo0/m;
+
+    aput-object v1, v0, v3
+
+    sget-object v1, Lo0/m;->h:Lo0/m;
+
+    aput-object v1, v0, v4
+
+    invoke-static {v0}, Lo0/g0/b;->o([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v0
+
+    sput-object v0, Lo0/x;->G:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
     .locals 1
 
     new-instance v0, Lo0/x$a;
 
     invoke-direct {v0}, Lo0/x$a;-><init>()V
 
-    sput-object v0, Lo0/x;->d:Lo0/x;
+    invoke-direct {p0, v0}, Lo0/x;-><init>(Lo0/x$a;)V
 
     return-void
 .end method
 
-.method public constructor <init>()V
-    .locals 0
+.method public constructor <init>(Lo0/x$a;)V
+    .locals 6
+
+    const-string v0, "builder"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    return-void
-.end method
+    iget-object v0, p1, Lo0/x$a;->a:Lo0/q;
 
+    iput-object v0, p0, Lo0/x;->d:Lo0/q;
 
-# virtual methods
-.method public a()Lo0/x;
-    .locals 1
+    iget-object v0, p1, Lo0/x$a;->b:Lo0/l;
 
-    const/4 v0, 0x0
+    iput-object v0, p0, Lo0/x;->e:Lo0/l;
 
-    iput-boolean v0, p0, Lo0/x;->a:Z
+    iget-object v0, p1, Lo0/x$a;->c:Ljava/util/List;
 
-    return-object p0
-.end method
-
-.method public b()Lo0/x;
-    .locals 2
-
-    const-wide/16 v0, 0x0
-
-    iput-wide v0, p0, Lo0/x;->c:J
-
-    return-object p0
-.end method
-
-.method public c()J
-    .locals 2
-
-    iget-boolean v0, p0, Lo0/x;->a:Z
-
-    if-eqz v0, :cond_0
-
-    iget-wide v0, p0, Lo0/x;->b:J
-
-    return-wide v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "No deadline"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public d(J)Lo0/x;
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lo0/x;->a:Z
-
-    iput-wide p1, p0, Lo0/x;->b:J
-
-    return-object p0
-.end method
-
-.method public e()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lo0/x;->a:Z
-
-    return v0
-.end method
-
-.method public f()V
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-static {}, Ljava/lang/Thread;->interrupted()Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    iget-boolean v0, p0, Lo0/x;->a:Z
-
-    if-eqz v0, :cond_1
-
-    iget-wide v0, p0, Lo0/x;->b:J
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v2
-
-    sub-long/2addr v0, v2
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-lez v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/io/InterruptedIOException;
-
-    const-string v1, "deadline reached"
-
-    invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    return-void
-
-    :cond_2
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+    invoke-static {v0}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
+    iput-object v0, p0, Lo0/x;->f:Ljava/util/List;
 
-    new-instance v0, Ljava/io/InterruptedIOException;
+    iget-object v0, p1, Lo0/x$a;->d:Ljava/util/List;
 
-    const-string v1, "interrupted"
+    invoke-static {v0}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
 
-    invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
+    move-result-object v0
 
-    throw v0
-.end method
+    iput-object v0, p0, Lo0/x;->g:Ljava/util/List;
 
-.method public g(JLjava/util/concurrent/TimeUnit;)Lo0/x;
-    .locals 3
+    iget-object v0, p1, Lo0/x$a;->e:Lo0/t$b;
 
-    if-eqz p3, :cond_2
+    iput-object v0, p0, Lo0/x;->h:Lo0/t$b;
 
-    const-wide/16 v0, 0x0
+    iget-boolean v0, p1, Lo0/x$a;->f:Z
 
-    cmp-long v2, p1, v0
+    iput-boolean v0, p0, Lo0/x;->i:Z
 
-    if-ltz v2, :cond_0
+    iget-object v0, p1, Lo0/x$a;->g:Lo0/c;
 
-    const/4 v0, 0x1
+    iput-object v0, p0, Lo0/x;->j:Lo0/c;
+
+    iget-boolean v0, p1, Lo0/x$a;->h:Z
+
+    iput-boolean v0, p0, Lo0/x;->k:Z
+
+    iget-boolean v0, p1, Lo0/x$a;->i:Z
+
+    iput-boolean v0, p0, Lo0/x;->l:Z
+
+    iget-object v0, p1, Lo0/x$a;->j:Lo0/p;
+
+    iput-object v0, p0, Lo0/x;->m:Lo0/p;
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lo0/x;->n:Lo0/d;
+
+    iget-object v1, p1, Lo0/x$a;->l:Lo0/s;
+
+    iput-object v1, p0, Lo0/x;->o:Lo0/s;
+
+    iget-object v1, p1, Lo0/x$a;->m:Ljava/net/Proxy;
+
+    iput-object v1, p0, Lo0/x;->p:Ljava/net/Proxy;
+
+    if-eqz v1, :cond_0
+
+    sget-object v1, Lo0/g0/i/a;->a:Lo0/g0/i/a;
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v1, p1, Lo0/x$a;->n:Ljava/net/ProxySelector;
+
+    if-eqz v1, :cond_1
 
     goto :goto_0
 
-    :cond_0
-    const/4 v0, 0x0
+    :cond_1
+    invoke-static {}, Ljava/net/ProxySelector;->getDefault()Ljava/net/ProxySelector;
+
+    move-result-object v1
 
     :goto_0
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_2
 
-    invoke-virtual {p3, p1, p2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+    goto :goto_1
 
-    move-result-wide p1
+    :cond_2
+    sget-object v1, Lo0/g0/i/a;->a:Lo0/g0/i/a;
 
-    iput-wide p1, p0, Lo0/x;->c:J
+    :goto_1
+    iput-object v1, p0, Lo0/x;->q:Ljava/net/ProxySelector;
 
-    return-object p0
+    iget-object v1, p1, Lo0/x$a;->o:Lo0/c;
 
-    :cond_1
-    const-string p3, "timeout < 0: "
+    iput-object v1, p0, Lo0/x;->r:Lo0/c;
 
-    invoke-static {p3, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+    iget-object v1, p1, Lo0/x$a;->p:Ljavax/net/SocketFactory;
+
+    iput-object v1, p0, Lo0/x;->s:Ljavax/net/SocketFactory;
+
+    iget-object v1, p1, Lo0/x$a;->s:Ljava/util/List;
+
+    iput-object v1, p0, Lo0/x;->v:Ljava/util/List;
+
+    iget-object v2, p1, Lo0/x$a;->t:Ljava/util/List;
+
+    iput-object v2, p0, Lo0/x;->w:Ljava/util/List;
+
+    iget-object v2, p1, Lo0/x$a;->u:Ljavax/net/ssl/HostnameVerifier;
+
+    iput-object v2, p0, Lo0/x;->x:Ljavax/net/ssl/HostnameVerifier;
+
+    iget v2, p1, Lo0/x$a;->x:I
+
+    iput v2, p0, Lo0/x;->A:I
+
+    iget v2, p1, Lo0/x$a;->y:I
+
+    iput v2, p0, Lo0/x;->B:I
+
+    iget v2, p1, Lo0/x$a;->z:I
+
+    iput v2, p0, Lo0/x;->C:I
+
+    iget v2, p1, Lo0/x$a;->A:I
+
+    iput v2, p0, Lo0/x;->D:I
+
+    iget v2, p1, Lo0/x$a;->B:I
+
+    iput v2, p0, Lo0/x;->E:I
+
+    iget-object v2, p1, Lo0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
+
+    const/4 v3, 0x1
+
+    if-nez v2, :cond_9
+
+    instance-of v2, v1, Ljava/util/Collection;
+
+    const/4 v4, 0x0
+
+    if-eqz v2, :cond_3
+
+    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :cond_4
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_5
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lo0/m;
+
+    iget-boolean v2, v2, Lo0/m;->a:Z
+
+    if-eqz v2, :cond_4
+
+    const/4 v1, 0x0
+
+    goto :goto_3
+
+    :cond_5
+    :goto_2
+    const/4 v1, 0x1
+
+    :goto_3
+    if-eqz v1, :cond_6
+
+    goto :goto_4
+
+    :cond_6
+    sget-object v1, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {v1}, Lo0/g0/h/f;->n()Ljavax/net/ssl/X509TrustManager;
+
+    move-result-object v1
+
+    iput-object v1, p0, Lo0/x;->u:Ljavax/net/ssl/X509TrustManager;
+
+    sget-object v1, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    iget-object v2, p0, Lo0/x;->u:Ljavax/net/ssl/X509TrustManager;
+
+    invoke-virtual {v1, v2}, Lo0/g0/h/f;->f(Ljavax/net/ssl/X509TrustManager;)V
+
+    iget-object v1, p0, Lo0/x;->u:Ljavax/net/ssl/X509TrustManager;
+
+    if-eqz v1, :cond_8
+
+    :try_start_0
+    sget-object v2, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v2, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {v2}, Lo0/g0/h/f;->m()Ljavax/net/ssl/SSLContext;
+
+    move-result-object v2
+
+    new-array v5, v3, [Ljavax/net/ssl/TrustManager;
+
+    aput-object v1, v5, v4
+
+    invoke-virtual {v2, v0, v5, v0}, Ljavax/net/ssl/SSLContext;->init([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;Ljava/security/SecureRandom;)V
+
+    invoke-virtual {v2}, Ljavax/net/ssl/SSLContext;->getSocketFactory()Ljavax/net/ssl/SSLSocketFactory;
+
+    move-result-object v1
+
+    const-string v2, "sslContext.socketFactory"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_0
+    .catch Ljava/security/GeneralSecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    iput-object v1, p0, Lo0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
+
+    iget-object v1, p0, Lo0/x;->u:Ljavax/net/ssl/X509TrustManager;
+
+    if-eqz v1, :cond_7
+
+    const-string v2, "trustManager"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v2, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    invoke-virtual {v2, v1}, Lo0/g0/h/f;->b(Ljavax/net/ssl/X509TrustManager;)Lo0/g0/j/c;
+
+    move-result-object v1
+
+    iput-object v1, p0, Lo0/x;->z:Lo0/g0/j/c;
+
+    goto :goto_5
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Ljava/lang/AssertionError;
+
+    const-string v1, "No System TLS"
+
+    invoke-direct {v0, v1, p1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_9
+    :goto_4
+    iget-object v1, p1, Lo0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
+
+    iput-object v1, p0, Lo0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
+
+    iget-object v1, p1, Lo0/x$a;->w:Lo0/g0/j/c;
+
+    iput-object v1, p0, Lo0/x;->z:Lo0/g0/j/c;
+
+    iget-object v1, p1, Lo0/x$a;->r:Ljavax/net/ssl/X509TrustManager;
+
+    iput-object v1, p0, Lo0/x;->u:Ljavax/net/ssl/X509TrustManager;
+
+    :goto_5
+    iget-object v1, p0, Lo0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
+
+    if-eqz v1, :cond_a
+
+    sget-object v1, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v1, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    iget-object v2, p0, Lo0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
+
+    invoke-virtual {v1, v2}, Lo0/g0/h/f;->d(Ljavax/net/ssl/SSLSocketFactory;)V
+
+    :cond_a
+    iget-object p1, p1, Lo0/x$a;->v:Lo0/h;
+
+    iget-object v1, p0, Lo0/x;->z:Lo0/g0/j/c;
+
+    iget-object v2, p1, Lo0/h;->b:Lo0/g0/j/c;
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_b
+
+    goto :goto_6
+
+    :cond_b
+    new-instance v2, Lo0/h;
+
+    iget-object p1, p1, Lo0/h;->a:Ljava/util/Set;
+
+    invoke-direct {v2, p1, v1}, Lo0/h;-><init>(Ljava/util/Set;Lo0/g0/j/c;)V
+
+    move-object p1, v2
+
+    :goto_6
+    iput-object p1, p0, Lo0/x;->y:Lo0/h;
+
+    iget-object p1, p0, Lo0/x;->f:Ljava/util/List;
+
+    const-string v1, "null cannot be cast to non-null type kotlin.collections.List<okhttp3.Interceptor?>"
+
+    if-eqz p1, :cond_f
+
+    invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    xor-int/2addr p1, v3
+
+    if-eqz p1, :cond_e
+
+    iget-object p1, p0, Lo0/x;->g:Ljava/util/List;
+
+    if-eqz p1, :cond_d
+
+    invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    xor-int/2addr p1, v3
+
+    if-eqz p1, :cond_c
+
+    return-void
+
+    :cond_c
+    const-string p1, "Null network interceptor: "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object p1
 
-    new-instance p2, Ljava/lang/IllegalArgumentException;
+    iget-object v0, p0, Lo0/x;->g:Ljava/util/List;
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
 
     invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
-    throw p2
+    throw v0
 
-    :cond_2
-    const-string p1, "unit"
+    :cond_d
+    new-instance p1, Lkotlin/TypeCastException;
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
 
-    const/4 p1, 0x0
+    throw p1
+
+    :cond_e
+    const-string p1, "Null interceptor: "
+
+    invoke-static {p1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lo0/x;->f:Ljava/util/List;
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_f
+    new-instance p1, Lkotlin/TypeCastException;
+
+    invoke-direct {p1, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
 
     throw p1
 .end method
 
-.method public h()J
-    .locals 2
 
-    iget-wide v0, p0, Lo0/x;->c:J
+# virtual methods
+.method public b(Lo0/a0;)Lo0/f;
+    .locals 3
 
-    return-wide v0
+    const-string v0, "request"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "client"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "originalRequest"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lo0/z;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, p0, p1, v1, v2}, Lo0/z;-><init>(Lo0/x;Lo0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    new-instance p1, Lo0/g0/d/m;
+
+    invoke-direct {p1, p0, v0}, Lo0/g0/d/m;-><init>(Lo0/x;Lo0/f;)V
+
+    iput-object p1, v0, Lo0/z;->d:Lo0/g0/d/m;
+
+    return-object v0
+.end method
+
+.method public c()Lo0/x$a;
+    .locals 3
+
+    new-instance v0, Lo0/x$a;
+
+    const-string v1, "okHttpClient"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0}, Lo0/x$a;-><init>()V
+
+    iget-object v1, p0, Lo0/x;->d:Lo0/q;
+
+    iput-object v1, v0, Lo0/x$a;->a:Lo0/q;
+
+    iget-object v1, p0, Lo0/x;->e:Lo0/l;
+
+    iput-object v1, v0, Lo0/x$a;->b:Lo0/l;
+
+    iget-object v1, v0, Lo0/x$a;->c:Ljava/util/List;
+
+    iget-object v2, p0, Lo0/x;->f:Ljava/util/List;
+
+    invoke-static {v1, v2}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+
+    iget-object v1, v0, Lo0/x$a;->d:Ljava/util/List;
+
+    iget-object v2, p0, Lo0/x;->g:Ljava/util/List;
+
+    invoke-static {v1, v2}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+
+    iget-object v1, p0, Lo0/x;->h:Lo0/t$b;
+
+    iput-object v1, v0, Lo0/x$a;->e:Lo0/t$b;
+
+    iget-boolean v1, p0, Lo0/x;->i:Z
+
+    iput-boolean v1, v0, Lo0/x$a;->f:Z
+
+    iget-object v1, p0, Lo0/x;->j:Lo0/c;
+
+    iput-object v1, v0, Lo0/x$a;->g:Lo0/c;
+
+    iget-boolean v1, p0, Lo0/x;->k:Z
+
+    iput-boolean v1, v0, Lo0/x$a;->h:Z
+
+    iget-boolean v1, p0, Lo0/x;->l:Z
+
+    iput-boolean v1, v0, Lo0/x$a;->i:Z
+
+    iget-object v1, p0, Lo0/x;->m:Lo0/p;
+
+    iput-object v1, v0, Lo0/x$a;->j:Lo0/p;
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lo0/x$a;->k:Lo0/d;
+
+    iget-object v1, p0, Lo0/x;->o:Lo0/s;
+
+    iput-object v1, v0, Lo0/x$a;->l:Lo0/s;
+
+    iget-object v1, p0, Lo0/x;->p:Ljava/net/Proxy;
+
+    iput-object v1, v0, Lo0/x$a;->m:Ljava/net/Proxy;
+
+    iget-object v1, p0, Lo0/x;->q:Ljava/net/ProxySelector;
+
+    iput-object v1, v0, Lo0/x$a;->n:Ljava/net/ProxySelector;
+
+    iget-object v1, p0, Lo0/x;->r:Lo0/c;
+
+    iput-object v1, v0, Lo0/x$a;->o:Lo0/c;
+
+    iget-object v1, p0, Lo0/x;->s:Ljavax/net/SocketFactory;
+
+    iput-object v1, v0, Lo0/x$a;->p:Ljavax/net/SocketFactory;
+
+    iget-object v1, p0, Lo0/x;->t:Ljavax/net/ssl/SSLSocketFactory;
+
+    iput-object v1, v0, Lo0/x$a;->q:Ljavax/net/ssl/SSLSocketFactory;
+
+    iget-object v1, p0, Lo0/x;->u:Ljavax/net/ssl/X509TrustManager;
+
+    iput-object v1, v0, Lo0/x$a;->r:Ljavax/net/ssl/X509TrustManager;
+
+    iget-object v1, p0, Lo0/x;->v:Ljava/util/List;
+
+    iput-object v1, v0, Lo0/x$a;->s:Ljava/util/List;
+
+    iget-object v1, p0, Lo0/x;->w:Ljava/util/List;
+
+    iput-object v1, v0, Lo0/x$a;->t:Ljava/util/List;
+
+    iget-object v1, p0, Lo0/x;->x:Ljavax/net/ssl/HostnameVerifier;
+
+    iput-object v1, v0, Lo0/x$a;->u:Ljavax/net/ssl/HostnameVerifier;
+
+    iget-object v1, p0, Lo0/x;->y:Lo0/h;
+
+    iput-object v1, v0, Lo0/x$a;->v:Lo0/h;
+
+    iget-object v1, p0, Lo0/x;->z:Lo0/g0/j/c;
+
+    iput-object v1, v0, Lo0/x$a;->w:Lo0/g0/j/c;
+
+    iget v1, p0, Lo0/x;->A:I
+
+    iput v1, v0, Lo0/x$a;->x:I
+
+    iget v1, p0, Lo0/x;->B:I
+
+    iput v1, v0, Lo0/x$a;->y:I
+
+    iget v1, p0, Lo0/x;->C:I
+
+    iput v1, v0, Lo0/x$a;->z:I
+
+    iget v1, p0, Lo0/x;->D:I
+
+    iput v1, v0, Lo0/x$a;->A:I
+
+    iget v1, p0, Lo0/x;->E:I
+
+    iput v1, v0, Lo0/x$a;->B:I
+
+    return-object v0
+.end method
+
+.method public clone()Ljava/lang/Object;
+    .locals 1
+
+    invoke-super {p0}, Ljava/lang/Object;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public d(Lo0/a0;Lokhttp3/WebSocketListener;)Lokhttp3/WebSocket;
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    const-string v1, "request"
+
+    move-object/from16 v3, p1
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "listener"
+
+    move-object/from16 v4, p2
+
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v8, Lo0/g0/k/a;
+
+    new-instance v5, Ljava/util/Random;
+
+    invoke-direct {v5}, Ljava/util/Random;-><init>()V
+
+    iget v2, v0, Lo0/x;->E:I
+
+    int-to-long v6, v2
+
+    move-object v2, v8
+
+    invoke-direct/range {v2 .. v7}, Lo0/g0/k/a;-><init>(Lo0/a0;Lokhttp3/WebSocketListener;Ljava/util/Random;J)V
+
+    const-string v2, "client"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lo0/x;->c()Lo0/x$a;
+
+    move-result-object v3
+
+    sget-object v4, Lo0/t;->a:Lo0/t;
+
+    const-string v5, "eventListener"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "$this$asFactory"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v5, Lo0/g0/a;
+
+    invoke-direct {v5, v4}, Lo0/g0/a;-><init>(Lo0/t;)V
+
+    iput-object v5, v3, Lo0/x$a;->e:Lo0/t$b;
+
+    sget-object v4, Lo0/g0/k/a;->x:Ljava/util/List;
+
+    sget-object v5, Lo0/y;->h:Lo0/y;
+
+    const-string v6, "protocols"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v4}, Lk0/j/l;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+
+    move-result-object v6
+
+    move-object v7, v6
+
+    check-cast v7, Ljava/util/ArrayList;
+
+    invoke-virtual {v7, v5}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x1
+
+    if-nez v9, :cond_1
+
+    sget-object v9, Lo0/y;->e:Lo0/y;
+
+    invoke-virtual {v7, v9}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v9, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v9, 0x1
+
+    :goto_1
+    if-eqz v9, :cond_a
+
+    invoke-virtual {v7, v5}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    invoke-virtual {v7}, Ljava/util/ArrayList;->size()I
+
+    move-result v5
+
+    if-gt v5, v11, :cond_3
+
+    :cond_2
+    const/4 v10, 0x1
+
+    :cond_3
+    if-eqz v10, :cond_9
+
+    sget-object v5, Lo0/y;->d:Lo0/y;
+
+    invoke-virtual {v7, v5}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    xor-int/2addr v5, v11
+
+    if-eqz v5, :cond_8
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v7, v5}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z
+
+    move-result v6
+
+    xor-int/2addr v6, v11
+
+    if-eqz v6, :cond_7
+
+    sget-object v6, Lo0/y;->f:Lo0/y;
+
+    invoke-virtual {v7, v6}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
+
+    invoke-static {v4}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object v4
+
+    const-string v6, "Collections.unmodifiableList(protocols)"
+
+    invoke-static {v4, v6}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v4, v3, Lo0/x$a;->t:Ljava/util/List;
+
+    new-instance v4, Lo0/x;
+
+    invoke-direct {v4, v3}, Lo0/x;-><init>(Lo0/x$a;)V
+
+    iget-object v3, v8, Lo0/g0/k/a;->t:Lo0/a0;
+
+    if-eqz v3, :cond_6
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v1}, Ljava/util/LinkedHashMap;-><init>()V
+
+    iget-object v13, v3, Lo0/a0;->b:Lo0/w;
+
+    iget-object v14, v3, Lo0/a0;->c:Ljava/lang/String;
+
+    iget-object v1, v3, Lo0/a0;->e:Lokhttp3/RequestBody;
+
+    iget-object v6, v3, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-interface {v6}, Ljava/util/Map;->isEmpty()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_4
+
+    new-instance v6, Ljava/util/LinkedHashMap;
+
+    invoke-direct {v6}, Ljava/util/LinkedHashMap;-><init>()V
+
+    goto :goto_2
+
+    :cond_4
+    iget-object v6, v3, Lo0/a0;->f:Ljava/util/Map;
+
+    invoke-static {v6}, Lf/n/a/k/a;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v6
+
+    :goto_2
+    iget-object v3, v3, Lo0/a0;->d:Lokhttp3/Headers;
+
+    invoke-virtual {v3}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v3
+
+    const-string v7, "websocket"
+
+    const-string v9, "Upgrade"
+
+    const-string v10, "name"
+
+    invoke-static {v9, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v12, "value"
+
+    invoke-static {v7, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v9, v7}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    const-string v7, "Connection"
+
+    invoke-static {v7, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v9, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v7, v9}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    const-string v7, "Sec-WebSocket-Key"
+
+    iget-object v9, v8, Lo0/g0/k/a;->a:Ljava/lang/String;
+
+    invoke-static {v7, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v9, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v7, v9}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    const-string v7, "Sec-WebSocket-Version"
+
+    const-string v9, "13"
+
+    invoke-static {v7, v10}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v9, v12}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v7, v9}, Lokhttp3/Headers$a;->e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    if-eqz v13, :cond_5
+
+    invoke-virtual {v3}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v15
+
+    invoke-static {v6}, Lo0/g0/b;->F(Ljava/util/Map;)Ljava/util/Map;
+
+    move-result-object v17
+
+    new-instance v3, Lo0/a0;
+
+    move-object v12, v3
+
+    move-object/from16 v16, v1
+
+    invoke-direct/range {v12 .. v17}, Lo0/a0;-><init>(Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/RequestBody;Ljava/util/Map;)V
+
+    invoke-static {v4, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "originalRequest"
+
+    invoke-static {v3, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lo0/z;
+
+    invoke-direct {v1, v4, v3, v11, v5}, Lo0/z;-><init>(Lo0/x;Lo0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    new-instance v2, Lo0/g0/d/m;
+
+    invoke-direct {v2, v4, v1}, Lo0/g0/d/m;-><init>(Lo0/x;Lo0/f;)V
+
+    iput-object v2, v1, Lo0/z;->d:Lo0/g0/d/m;
+
+    iput-object v1, v8, Lo0/g0/k/a;->b:Lo0/f;
+
+    new-instance v2, Lo0/g0/k/b;
+
+    invoke-direct {v2, v8, v3}, Lo0/g0/k/b;-><init>(Lo0/g0/k/a;Lo0/a0;)V
+
+    invoke-virtual {v1, v2}, Lo0/z;->F(Lo0/g;)V
+
+    return-object v8
+
+    :cond_5
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "url == null"
+
+    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_6
+    throw v5
+
+    :cond_7
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "protocols must not contain null"
+
+    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_8
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "protocols must not contain http/1.0: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_9
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "protocols containing h2_prior_knowledge cannot use other protocols: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+
+    :cond_a
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "protocols must contain h2_prior_knowledge or http/1.1: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
 .end method
diff --git a/com.discord/smali_classes2/o0/y$a.smali b/com.discord/smali_classes2/o0/y$a.smali
new file mode 100644
index 0000000000..12d1ebfc88
--- /dev/null
+++ b/com.discord/smali_classes2/o0/y$a.smali
@@ -0,0 +1,140 @@
+.class public final Lo0/y$a;
+.super Ljava/lang/Object;
+.source "Protocol.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/y;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/lang/String;)Lo0/y;
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    sget-object v0, Lo0/y;->i:Lo0/y;
+
+    sget-object v1, Lo0/y;->f:Lo0/y;
+
+    sget-object v2, Lo0/y;->g:Lo0/y;
+
+    sget-object v3, Lo0/y;->h:Lo0/y;
+
+    sget-object v4, Lo0/y;->e:Lo0/y;
+
+    sget-object v5, Lo0/y;->d:Lo0/y;
+
+    const-string v6, "protocol"
+
+    invoke-static {p1, v6}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v6, v5, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-static {p1, v6}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_0
+
+    move-object v0, v5
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v5, v4, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-static {p1, v5}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    move-object v0, v4
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v4, v3, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-static {p1, v4}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2
+
+    move-object v0, v3
+
+    goto :goto_0
+
+    :cond_2
+    iget-object v3, v2, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-static {p1, v3}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_3
+
+    move-object v0, v2
+
+    goto :goto_0
+
+    :cond_3
+    iget-object v2, v1, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-static {p1, v2}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_4
+
+    move-object v0, v1
+
+    goto :goto_0
+
+    :cond_4
+    iget-object v1, v0, Lo0/y;->protocol:Ljava/lang/String;
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    :goto_0
+    return-object v0
+
+    :cond_5
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "Unexpected protocol: "
+
+    invoke-static {v1, p1}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/y.smali b/com.discord/smali_classes2/o0/y.smali
new file mode 100644
index 0000000000..c6db07a731
--- /dev/null
+++ b/com.discord/smali_classes2/o0/y.smali
@@ -0,0 +1,202 @@
+.class public final enum Lo0/y;
+.super Ljava/lang/Enum;
+.source "Protocol.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/y$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lo0/y;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Lo0/y;
+
+.field public static final enum e:Lo0/y;
+
+.field public static final enum f:Lo0/y;
+
+.field public static final enum g:Lo0/y;
+
+.field public static final enum h:Lo0/y;
+
+.field public static final enum i:Lo0/y;
+
+.field public static final synthetic j:[Lo0/y;
+
+.field public static final k:Lo0/y$a;
+
+
+# instance fields
+.field public final protocol:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 5
+
+    const/4 v0, 0x6
+
+    new-array v0, v0, [Lo0/y;
+
+    new-instance v1, Lo0/y;
+
+    const-string v2, "HTTP_1_0"
+
+    const/4 v3, 0x0
+
+    const-string v4, "http/1.0"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/y;->d:Lo0/y;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/y;
+
+    const-string v2, "HTTP_1_1"
+
+    const/4 v3, 0x1
+
+    const-string v4, "http/1.1"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/y;->e:Lo0/y;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/y;
+
+    const-string v2, "SPDY_3"
+
+    const/4 v3, 0x2
+
+    const-string v4, "spdy/3.1"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/y;->f:Lo0/y;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/y;
+
+    const-string v2, "HTTP_2"
+
+    const/4 v3, 0x3
+
+    const-string v4, "h2"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/y;->g:Lo0/y;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/y;
+
+    const-string v2, "H2_PRIOR_KNOWLEDGE"
+
+    const/4 v3, 0x4
+
+    const-string v4, "h2_prior_knowledge"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/y;->h:Lo0/y;
+
+    aput-object v1, v0, v3
+
+    new-instance v1, Lo0/y;
+
+    const-string v2, "QUIC"
+
+    const/4 v3, 0x5
+
+    const-string v4, "quic"
+
+    invoke-direct {v1, v2, v3, v4}, Lo0/y;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+
+    sput-object v1, Lo0/y;->i:Lo0/y;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lo0/y;->j:[Lo0/y;
+
+    new-instance v0, Lo0/y$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lo0/y$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lo0/y;->k:Lo0/y$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;ILjava/lang/String;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    iput-object p3, p0, Lo0/y;->protocol:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lo0/y;
+    .locals 1
+
+    const-class v0, Lo0/y;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lo0/y;
+
+    return-object p0
+.end method
+
+.method public static values()[Lo0/y;
+    .locals 1
+
+    sget-object v0, Lo0/y;->j:[Lo0/y;
+
+    invoke-virtual {v0}, [Lo0/y;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lo0/y;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lo0/y;->protocol:Ljava/lang/String;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/o0/y/a.smali b/com.discord/smali_classes2/o0/y/a.smali
deleted file mode 100644
index 6d41c09163..0000000000
--- a/com.discord/smali_classes2/o0/y/a.smali
+++ /dev/null
@@ -1,1613 +0,0 @@
-.class public final Lo0/y/a;
-.super Ljava/lang/Object;
-.source "ByteString.kt"
-
-
-# static fields
-.field public static final a:[C
-
-.field public static final b:Lokio/ByteString;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/16 v0, 0x10
-
-    new-array v0, v0, [C
-
-    fill-array-data v0, :array_0
-
-    sput-object v0, Lo0/y/a;->a:[C
-
-    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [B
-
-    invoke-static {v0}, Lo0/y/a;->k([B)Lokio/ByteString;
-
-    move-result-object v0
-
-    sput-object v0, Lo0/y/a;->b:Lokio/ByteString;
-
-    return-void
-
-    nop
-
-    :array_0
-    .array-data 2
-        0x30s
-        0x31s
-        0x32s
-        0x33s
-        0x34s
-        0x35s
-        0x36s
-        0x37s
-        0x38s
-        0x39s
-        0x61s
-        0x62s
-        0x63s
-        0x64s
-        0x65s
-        0x66s
-    .end array-data
-.end method
-
-.method public static final a(Lokio/ByteString;)Ljava/lang/String;
-    .locals 2
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    invoke-static {p0, v1, v0}, Lo0/a;->a([B[BI)Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static final b(Lokio/ByteString;Lokio/ByteString;)I
-    .locals 9
-
-    invoke-virtual {p0}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v1
-
-    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
-
-    move-result v2
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_0
-    const/4 v5, -0x1
-
-    const/4 v6, 0x1
-
-    if-ge v4, v2, :cond_2
-
-    invoke-virtual {p0, v4}, Lokio/ByteString;->k(I)B
-
-    move-result v7
-
-    and-int/lit16 v7, v7, 0xff
-
-    invoke-virtual {p1, v4}, Lokio/ByteString;->k(I)B
-
-    move-result v8
-
-    and-int/lit16 v8, v8, 0xff
-
-    if-ne v7, v8, :cond_0
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    if-ge v7, v8, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v5, 0x1
-
-    :goto_1
-    return v5
-
-    :cond_2
-    if-ne v0, v1, :cond_3
-
-    return v3
-
-    :cond_3
-    if-ge v0, v1, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    const/4 v5, 0x1
-
-    :goto_2
-    return v5
-.end method
-
-.method public static final c(Ljava/lang/String;)Lokio/ByteString;
-    .locals 5
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    rem-int/lit8 v0, v0, 0x2
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    div-int/lit8 v0, v0, 0x2
-
-    new-array v2, v0, [B
-
-    :goto_1
-    if-ge v1, v0, :cond_1
-
-    mul-int/lit8 v3, v1, 0x2
-
-    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    invoke-static {v4}, Lo0/y/a;->r(C)I
-
-    move-result v4
-
-    shl-int/lit8 v4, v4, 0x4
-
-    add-int/lit8 v3, v3, 0x1
-
-    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v3
-
-    invoke-static {v3}, Lo0/y/a;->r(C)I
-
-    move-result v3
-
-    add-int/2addr v3, v4
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v2, v1
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p0, Lokio/ByteString;
-
-    invoke-direct {p0, v2}, Lokio/ByteString;-><init>([B)V
-
-    return-object p0
-
-    :cond_2
-    const-string v0, "Unexpected hex string: "
-
-    invoke-static {v0, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static final d(Ljava/lang/String;)Lokio/ByteString;
-    .locals 3
-
-    if-eqz p0, :cond_0
-
-    new-instance v0, Lokio/ByteString;
-
-    sget-object v1, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
-
-    move-result-object v1
-
-    const-string v2, "(this as java.lang.String).getBytes(charset)"
-
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
-
-    iput-object p0, v0, Lokio/ByteString;->e:Ljava/lang/String;
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "$receiver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-.end method
-
-.method public static final e(Lokio/ByteString;Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-ne p1, p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v2, p1, Lokio/ByteString;
-
-    if-eqz v2, :cond_1
-
-    check-cast p1, Lokio/ByteString;
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v2
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    array-length v3, p0
-
-    if-ne v2, v3, :cond_1
-
-    array-length v2, p0
-
-    invoke-virtual {p1, v1, p0, v1, v2}, Lokio/ByteString;->m(I[BII)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public static final f(Lokio/ByteString;I)B
-    .locals 0
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    aget-byte p0, p0, p1
-
-    return p0
-.end method
-
-.method public static final g(Lokio/ByteString;)I
-    .locals 0
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    array-length p0, p0
-
-    return p0
-.end method
-
-.method public static final h(Lokio/ByteString;)I
-    .locals 1
-
-    iget v0, p0, Lokio/ByteString;->d:I
-
-    if-eqz v0, :cond_0
-
-    return v0
-
-    :cond_0
-    iget-object v0, p0, Lokio/ByteString;->data:[B
-
-    invoke-static {v0}, Ljava/util/Arrays;->hashCode([B)I
-
-    move-result v0
-
-    iput v0, p0, Lokio/ByteString;->d:I
-
-    return v0
-.end method
-
-.method public static final i(Lokio/ByteString;)Ljava/lang/String;
-    .locals 8
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    array-length v0, p0
-
-    mul-int/lit8 v0, v0, 0x2
-
-    new-array v0, v0, [C
-
-    array-length v1, p0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_0
-
-    aget-byte v4, p0, v2
-
-    add-int/lit8 v5, v3, 0x1
-
-    sget-object v6, Lo0/y/a;->a:[C
-
-    shr-int/lit8 v7, v4, 0x4
-
-    and-int/lit8 v7, v7, 0xf
-
-    aget-char v7, v6, v7
-
-    aput-char v7, v0, v3
-
-    add-int/lit8 v3, v5, 0x1
-
-    and-int/lit8 v4, v4, 0xf
-
-    aget-char v4, v6, v4
-
-    aput-char v4, v0, v5
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p0, Ljava/lang/String;
-
-    invoke-direct {p0, v0}, Ljava/lang/String;-><init>([C)V
-
-    return-object p0
-.end method
-
-.method public static final j(Lokio/ByteString;)[B
-    .locals 0
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    return-object p0
-.end method
-
-.method public static final k([B)Lokio/ByteString;
-    .locals 2
-
-    new-instance v0, Lokio/ByteString;
-
-    array-length v1, p0
-
-    invoke-static {p0, v1}, Ljava/util/Arrays;->copyOf([BI)[B
-
-    move-result-object p0
-
-    const-string v1, "java.util.Arrays.copyOf(this, size)"
-
-    invoke-static {p0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {v0, p0}, Lokio/ByteString;-><init>([B)V
-
-    return-object v0
-.end method
-
-.method public static final l(Lokio/ByteString;ILokio/ByteString;II)Z
-    .locals 0
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    invoke-virtual {p2, p3, p0, p1, p4}, Lokio/ByteString;->m(I[BII)Z
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static final m(Lokio/ByteString;I[BII)Z
-    .locals 1
-
-    if-ltz p1, :cond_0
-
-    iget-object p0, p0, Lokio/ByteString;->data:[B
-
-    array-length v0, p0
-
-    sub-int/2addr v0, p4
-
-    if-gt p1, v0, :cond_0
-
-    if-ltz p3, :cond_0
-
-    array-length v0, p2
-
-    sub-int/2addr v0, p4
-
-    if-gt p3, v0, :cond_0
-
-    invoke-static {p0, p1, p2, p3, p4}, Lf/n/a/k/a;->e([BI[BII)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-.end method
-
-.method public static final n(Lokio/ByteString;Lokio/ByteString;)Z
-    .locals 2
-
-    invoke-virtual {p1}, Lokio/ByteString;->h()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, v1, p1, v1, v0}, Lokio/ByteString;->l(ILokio/ByteString;II)Z
-
-    move-result p0
-
-    return p0
-.end method
-
-.method public static final o(Lokio/ByteString;)Lokio/ByteString;
-    .locals 5
-
-    const/4 v0, 0x0
-
-    :goto_0
-    iget-object v1, p0, Lokio/ByteString;->data:[B
-
-    array-length v2, v1
-
-    if-ge v0, v2, :cond_5
-
-    aget-byte v2, v1, v0
-
-    const/16 v3, 0x41
-
-    int-to-byte v3, v3
-
-    if-lt v2, v3, :cond_4
-
-    const/16 v4, 0x5a
-
-    int-to-byte v4, v4
-
-    if-le v2, v4, :cond_0
-
-    goto :goto_3
-
-    :cond_0
-    array-length p0, v1
-
-    invoke-static {v1, p0}, Ljava/util/Arrays;->copyOf([BI)[B
-
-    move-result-object p0
-
-    const-string v1, "java.util.Arrays.copyOf(this, size)"
-
-    invoke-static {p0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    add-int/lit8 v1, v0, 0x1
-
-    add-int/lit8 v2, v2, 0x20
-
-    int-to-byte v2, v2
-
-    aput-byte v2, p0, v0
-
-    :goto_1
-    array-length v0, p0
-
-    if-ge v1, v0, :cond_3
-
-    aget-byte v0, p0, v1
-
-    if-lt v0, v3, :cond_2
-
-    if-le v0, v4, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    add-int/lit8 v0, v0, 0x20
-
-    int-to-byte v0, v0
-
-    aput-byte v0, p0, v1
-
-    :cond_2
-    :goto_2
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    new-instance v0, Lokio/ByteString;
-
-    invoke-direct {v0, p0}, Lokio/ByteString;-><init>([B)V
-
-    return-object v0
-
-    :cond_4
-    :goto_3
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_5
-    return-object p0
-.end method
-
-.method public static final p(Lokio/ByteString;)Ljava/lang/String;
-    .locals 16
-
-    move-object/from16 v0, p0
-
-    iget-object v1, v0, Lokio/ByteString;->data:[B
-
-    array-length v1, v1
-
-    if-nez v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    const-string v0, "[size=0]"
-
-    return-object v0
-
-    :cond_1
-    iget-object v1, v0, Lokio/ByteString;->data:[B
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    :cond_2
-    :goto_1
-    const/16 v6, 0x40
-
-    if-ge v3, v2, :cond_47
-
-    aget-byte v7, v1, v3
-
-    const/16 v8, 0xa
-
-    const/16 v9, 0xd
-
-    const/16 v10, 0x7f
-
-    const/16 v11, 0x9f
-
-    const/16 v12, 0x1f
-
-    const v13, 0xfffd
-
-    const/high16 v14, 0x10000
-
-    if-ltz v7, :cond_13
-
-    add-int/lit8 v15, v4, 0x1
-
-    if-ne v4, v6, :cond_3
-
-    goto/16 :goto_1b
-
-    :cond_3
-    if-eq v7, v8, :cond_8
-
-    if-eq v7, v9, :cond_8
-
-    if-ltz v7, :cond_4
-
-    if-ge v12, v7, :cond_6
-
-    :cond_4
-    if-le v10, v7, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    if-lt v11, v7, :cond_7
-
-    :cond_6
-    const/4 v4, 0x1
-
-    goto :goto_3
-
-    :cond_7
-    :goto_2
-    const/4 v4, 0x0
-
-    :goto_3
-    if-nez v4, :cond_46
-
-    :cond_8
-    if-ne v7, v13, :cond_9
-
-    goto/16 :goto_1a
-
-    :cond_9
-    if-ge v7, v14, :cond_a
-
-    const/4 v4, 0x1
-
-    goto :goto_4
-
-    :cond_a
-    const/4 v4, 0x2
-
-    :goto_4
-    add-int/2addr v5, v4
-
-    add-int/lit8 v3, v3, 0x1
-
-    :goto_5
-    move v4, v15
-
-    if-ge v3, v2, :cond_2
-
-    aget-byte v7, v1, v3
-
-    if-ltz v7, :cond_2
-
-    add-int/lit8 v7, v3, 0x1
-
-    aget-byte v3, v1, v3
-
-    add-int/lit8 v15, v4, 0x1
-
-    if-ne v4, v6, :cond_b
-
-    goto/16 :goto_1b
-
-    :cond_b
-    if-eq v3, v8, :cond_10
-
-    if-eq v3, v9, :cond_10
-
-    if-ltz v3, :cond_c
-
-    if-ge v12, v3, :cond_e
-
-    :cond_c
-    if-le v10, v3, :cond_d
-
-    goto :goto_6
-
-    :cond_d
-    if-lt v11, v3, :cond_f
-
-    :cond_e
-    const/4 v4, 0x1
-
-    goto :goto_7
-
-    :cond_f
-    :goto_6
-    const/4 v4, 0x0
-
-    :goto_7
-    if-nez v4, :cond_46
-
-    :cond_10
-    if-ne v3, v13, :cond_11
-
-    goto/16 :goto_1a
-
-    :cond_11
-    if-ge v3, v14, :cond_12
-
-    const/4 v3, 0x1
-
-    goto :goto_8
-
-    :cond_12
-    const/4 v3, 0x2
-
-    :goto_8
-    add-int/2addr v5, v3
-
-    move v3, v7
-
-    goto :goto_5
-
-    :cond_13
-    shr-int/lit8 v13, v7, 0x5
-
-    const/4 v14, -0x2
-
-    const/16 v15, 0x80
-
-    if-ne v13, v14, :cond_20
-
-    add-int/lit8 v7, v3, 0x1
-
-    if-gt v2, v7, :cond_14
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_14
-    aget-byte v13, v1, v3
-
-    aget-byte v7, v1, v7
-
-    and-int/lit16 v14, v7, 0xc0
-
-    if-ne v14, v15, :cond_15
-
-    const/4 v14, 0x1
-
-    goto :goto_9
-
-    :cond_15
-    const/4 v14, 0x0
-
-    :goto_9
-    if-nez v14, :cond_16
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_16
-    xor-int/lit16 v7, v7, 0xf80
-
-    shl-int/lit8 v13, v13, 0x6
-
-    xor-int/2addr v7, v13
-
-    if-ge v7, v15, :cond_17
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_17
-    add-int/lit8 v13, v4, 0x1
-
-    if-ne v4, v6, :cond_18
-
-    goto/16 :goto_1b
-
-    :cond_18
-    if-eq v7, v8, :cond_1d
-
-    if-eq v7, v9, :cond_1d
-
-    if-ltz v7, :cond_19
-
-    if-ge v12, v7, :cond_1b
-
-    :cond_19
-    if-le v10, v7, :cond_1a
-
-    goto :goto_a
-
-    :cond_1a
-    if-lt v11, v7, :cond_1c
-
-    :cond_1b
-    const/4 v4, 0x1
-
-    goto :goto_b
-
-    :cond_1c
-    :goto_a
-    const/4 v4, 0x0
-
-    :goto_b
-    if-nez v4, :cond_46
-
-    :cond_1d
-    const v4, 0xfffd
-
-    if-ne v7, v4, :cond_1e
-
-    goto/16 :goto_1a
-
-    :cond_1e
-    const/high16 v4, 0x10000
-
-    if-ge v7, v4, :cond_1f
-
-    const/4 v15, 0x1
-
-    goto :goto_c
-
-    :cond_1f
-    const/4 v15, 0x2
-
-    :goto_c
-    add-int/2addr v5, v15
-
-    add-int/lit8 v3, v3, 0x2
-
-    move v4, v13
-
-    goto/16 :goto_1
-
-    :cond_20
-    shr-int/lit8 v10, v7, 0x4
-
-    const v11, 0xd800
-
-    const v12, 0xdfff
-
-    if-ne v10, v14, :cond_31
-
-    add-int/lit8 v7, v3, 0x2
-
-    if-gt v2, v7, :cond_21
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_21
-    aget-byte v10, v1, v3
-
-    add-int/lit8 v13, v3, 0x1
-
-    aget-byte v13, v1, v13
-
-    and-int/lit16 v14, v13, 0xc0
-
-    if-ne v14, v15, :cond_22
-
-    const/4 v14, 0x1
-
-    goto :goto_d
-
-    :cond_22
-    const/4 v14, 0x0
-
-    :goto_d
-    if-nez v14, :cond_23
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_23
-    aget-byte v7, v1, v7
-
-    and-int/lit16 v14, v7, 0xc0
-
-    if-ne v14, v15, :cond_24
-
-    const/4 v14, 0x1
-
-    goto :goto_e
-
-    :cond_24
-    const/4 v14, 0x0
-
-    :goto_e
-    if-nez v14, :cond_25
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_25
-    const v14, -0x1e080
-
-    xor-int/2addr v7, v14
-
-    shl-int/lit8 v13, v13, 0x6
-
-    xor-int/2addr v7, v13
-
-    shl-int/lit8 v10, v10, 0xc
-
-    xor-int/2addr v7, v10
-
-    const/16 v10, 0x800
-
-    if-ge v7, v10, :cond_26
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_26
-    if-le v11, v7, :cond_27
-
-    goto :goto_f
-
-    :cond_27
-    if-lt v12, v7, :cond_28
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_28
-    :goto_f
-    add-int/lit8 v10, v4, 0x1
-
-    if-ne v4, v6, :cond_29
-
-    goto/16 :goto_1b
-
-    :cond_29
-    if-eq v7, v8, :cond_2e
-
-    if-eq v7, v9, :cond_2e
-
-    if-ltz v7, :cond_2a
-
-    const/16 v4, 0x1f
-
-    if-ge v4, v7, :cond_2c
-
-    :cond_2a
-    const/16 v4, 0x7f
-
-    if-le v4, v7, :cond_2b
-
-    goto :goto_10
-
-    :cond_2b
-    const/16 v4, 0x9f
-
-    if-lt v4, v7, :cond_2d
-
-    :cond_2c
-    const/4 v4, 0x1
-
-    goto :goto_11
-
-    :cond_2d
-    :goto_10
-    const/4 v4, 0x0
-
-    :goto_11
-    if-nez v4, :cond_46
-
-    :cond_2e
-    const v4, 0xfffd
-
-    if-ne v7, v4, :cond_2f
-
-    goto/16 :goto_1a
-
-    :cond_2f
-    const/high16 v4, 0x10000
-
-    if-ge v7, v4, :cond_30
-
-    const/4 v15, 0x1
-
-    goto :goto_12
-
-    :cond_30
-    const/4 v15, 0x2
-
-    :goto_12
-    add-int/2addr v5, v15
-
-    add-int/lit8 v3, v3, 0x3
-
-    move v4, v10
-
-    goto/16 :goto_1
-
-    :cond_31
-    shr-int/lit8 v7, v7, 0x3
-
-    if-ne v7, v14, :cond_45
-
-    add-int/lit8 v7, v3, 0x3
-
-    if-gt v2, v7, :cond_32
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_32
-    aget-byte v9, v1, v3
-
-    add-int/lit8 v10, v3, 0x1
-
-    aget-byte v10, v1, v10
-
-    and-int/lit16 v13, v10, 0xc0
-
-    if-ne v13, v15, :cond_33
-
-    const/4 v13, 0x1
-
-    goto :goto_13
-
-    :cond_33
-    const/4 v13, 0x0
-
-    :goto_13
-    if-nez v13, :cond_34
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_34
-    add-int/lit8 v13, v3, 0x2
-
-    aget-byte v13, v1, v13
-
-    and-int/lit16 v14, v13, 0xc0
-
-    if-ne v14, v15, :cond_35
-
-    const/4 v14, 0x1
-
-    goto :goto_14
-
-    :cond_35
-    const/4 v14, 0x0
-
-    :goto_14
-    if-nez v14, :cond_36
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_36
-    aget-byte v7, v1, v7
-
-    and-int/lit16 v14, v7, 0xc0
-
-    if-ne v14, v15, :cond_37
-
-    const/4 v14, 0x1
-
-    goto :goto_15
-
-    :cond_37
-    const/4 v14, 0x0
-
-    :goto_15
-    if-nez v14, :cond_38
-
-    if-ne v4, v6, :cond_46
-
-    goto/16 :goto_1b
-
-    :cond_38
-    const v14, 0x381f80
-
-    xor-int/2addr v7, v14
-
-    shl-int/lit8 v13, v13, 0x6
-
-    xor-int/2addr v7, v13
-
-    shl-int/lit8 v10, v10, 0xc
-
-    xor-int/2addr v7, v10
-
-    shl-int/lit8 v9, v9, 0x12
-
-    xor-int/2addr v7, v9
-
-    const v9, 0x10ffff
-
-    if-le v7, v9, :cond_39
-
-    if-ne v4, v6, :cond_46
-
-    goto :goto_1b
-
-    :cond_39
-    if-le v11, v7, :cond_3a
-
-    goto :goto_16
-
-    :cond_3a
-    if-lt v12, v7, :cond_3b
-
-    if-ne v4, v6, :cond_46
-
-    goto :goto_1b
-
-    :cond_3b
-    :goto_16
-    const/high16 v9, 0x10000
-
-    if-ge v7, v9, :cond_3c
-
-    if-ne v4, v6, :cond_46
-
-    goto :goto_1b
-
-    :cond_3c
-    add-int/lit8 v9, v4, 0x1
-
-    if-ne v4, v6, :cond_3d
-
-    goto :goto_1b
-
-    :cond_3d
-    if-eq v7, v8, :cond_42
-
-    const/16 v4, 0xd
-
-    if-eq v7, v4, :cond_42
-
-    if-ltz v7, :cond_3e
-
-    const/16 v4, 0x1f
-
-    if-ge v4, v7, :cond_40
-
-    :cond_3e
-    const/16 v4, 0x7f
-
-    if-le v4, v7, :cond_3f
-
-    goto :goto_17
-
-    :cond_3f
-    const/16 v4, 0x9f
-
-    if-lt v4, v7, :cond_41
-
-    :cond_40
-    const/4 v4, 0x1
-
-    goto :goto_18
-
-    :cond_41
-    :goto_17
-    const/4 v4, 0x0
-
-    :goto_18
-    if-nez v4, :cond_46
-
-    :cond_42
-    const v4, 0xfffd
-
-    if-ne v7, v4, :cond_43
-
-    goto :goto_1a
-
-    :cond_43
-    const/high16 v4, 0x10000
-
-    if-ge v7, v4, :cond_44
-
-    const/4 v15, 0x1
-
-    goto :goto_19
-
-    :cond_44
-    const/4 v15, 0x2
-
-    :goto_19
-    add-int/2addr v5, v15
-
-    add-int/lit8 v3, v3, 0x4
-
-    move v4, v9
-
-    goto/16 :goto_1
-
-    :cond_45
-    if-ne v4, v6, :cond_46
-
-    goto :goto_1b
-
-    :cond_46
-    :goto_1a
-    const/4 v5, -0x1
-
-    :cond_47
-    :goto_1b
-    const/16 v1, 0x5d
-
-    const-string v2, "\u2026]"
-
-    const-string v3, "[size="
-
-    const/4 v4, -0x1
-
-    if-ne v5, v4, :cond_4c
-
-    iget-object v4, v0, Lokio/ByteString;->data:[B
-
-    array-length v4, v4
-
-    if-gt v4, v6, :cond_48
-
-    const-string v2, "[hex="
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-virtual/range {p0 .. p0}, Lokio/ByteString;->i()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_1e
-
-    :cond_48
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v3, v0, Lokio/ByteString;->data:[B
-
-    array-length v3, v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v3, " hex="
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v3, v0, Lokio/ByteString;->data:[B
-
-    array-length v3, v3
-
-    if-gt v6, v3, :cond_49
-
-    const/4 v3, 0x1
-
-    goto :goto_1c
-
-    :cond_49
-    const/4 v3, 0x0
-
-    :goto_1c
-    if-eqz v3, :cond_4b
-
-    iget-object v3, v0, Lokio/ByteString;->data:[B
-
-    array-length v4, v3
-
-    if-ne v6, v4, :cond_4a
-
-    goto :goto_1d
-
-    :cond_4a
-    new-array v0, v6, [B
-
-    const/4 v4, 0x0
-
-    invoke-static {v3, v4, v0, v4, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    new-instance v3, Lokio/ByteString;
-
-    invoke-direct {v3, v0}, Lokio/ByteString;-><init>([B)V
-
-    move-object v0, v3
-
-    :goto_1d
-    invoke-virtual {v0}, Lokio/ByteString;->i()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_1e
-    return-object v0
-
-    :cond_4b
-    const-string v1, "endIndex > length("
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v0, v0, Lokio/ByteString;->data:[B
-
-    array-length v0, v0
-
-    const/16 v2, 0x29
-
-    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_4c
-    invoke-static/range {p0 .. p0}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
-
-    move-result-object v4
-
-    const/4 v6, 0x0
-
-    invoke-virtual {v4, v6, v5}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
-
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v8, "\\"
-
-    const-string v9, "\\\\"
-
-    const/4 v10, 0x4
-
-    invoke-static {v7, v8, v9, v6, v10}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "\n"
-
-    const-string v9, "\\n"
-
-    invoke-static {v7, v8, v9, v6, v10}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "\r"
-
-    const-string v9, "\\r"
-
-    invoke-static {v7, v8, v9, v6, v10}, Lj0/t/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
-
-    move-result-object v6
-
-    invoke-virtual {v4}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    if-ge v5, v4, :cond_4d
-
-    invoke-static {v3}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v0, v0, Lokio/ByteString;->data:[B
-
-    array-length v0, v0
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v0, " text="
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_1f
-
-    :cond_4d
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "[text="
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_1f
-    return-object v0
-.end method
-
-.method public static final q(Lokio/ByteString;)Ljava/lang/String;
-    .locals 3
-
-    iget-object v0, p0, Lokio/ByteString;->e:Ljava/lang/String;
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p0}, Lokio/ByteString;->j()[B
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    sget-object v1, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    new-instance v2, Ljava/lang/String;
-
-    invoke-direct {v2, v0, v1}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
-
-    iput-object v2, p0, Lokio/ByteString;->e:Ljava/lang/String;
-
-    move-object v0, v2
-
-    goto :goto_0
-
-    :cond_0
-    const-string p0, "$receiver"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p0, 0x0
-
-    throw p0
-
-    :cond_1
-    :goto_0
-    return-object v0
-.end method
-
-.method public static final r(C)I
-    .locals 3
-
-    const/16 v0, 0x30
-
-    if-le v0, p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v1, 0x39
-
-    if-lt v1, p0, :cond_1
-
-    sub-int/2addr p0, v0
-
-    goto :goto_3
-
-    :cond_1
-    :goto_0
-    const/16 v0, 0x66
-
-    const/16 v1, 0x61
-
-    if-le v1, p0, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    if-lt v0, p0, :cond_3
-
-    :goto_1
-    sub-int/2addr p0, v1
-
-    add-int/lit8 p0, p0, 0xa
-
-    goto :goto_3
-
-    :cond_3
-    :goto_2
-    const/16 v0, 0x46
-
-    const/16 v1, 0x41
-
-    if-gt v1, p0, :cond_4
-
-    if-lt v0, p0, :cond_4
-
-    goto :goto_1
-
-    :goto_3
-    return p0
-
-    :cond_4
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Unexpected hex digit: "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/o0/z$a.smali b/com.discord/smali_classes2/o0/z$a.smali
new file mode 100644
index 0000000000..76c29edcc5
--- /dev/null
+++ b/com.discord/smali_classes2/o0/z$a.smali
@@ -0,0 +1,264 @@
+.class public final Lo0/z$a;
+.super Ljava/lang/Object;
+.source "RealCall.kt"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lo0/z;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public volatile d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field public final e:Lo0/g;
+
+.field public final synthetic f:Lo0/z;
+
+
+# direct methods
+.method public constructor <init>(Lo0/z;Lo0/g;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/g;",
+            ")V"
+        }
+    .end annotation
+
+    const-string v0, "responseCallback"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lo0/z$a;->f:Lo0/z;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p2, p0, Lo0/z$a;->e:Lo0/g;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    const/4 p2, 0x0
+
+    invoke-direct {p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
+
+    iput-object p1, p0, Lo0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lo0/z$a;->f:Lo0/z;
+
+    iget-object v0, v0, Lo0/z;->g:Lo0/a0;
+
+    iget-object v0, v0, Lo0/a0;->b:Lo0/w;
+
+    iget-object v0, v0, Lo0/w;->e:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public run()V
+    .locals 7
+
+    const-string v0, "OkHttp "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lo0/z$a;->f:Lo0/z;
+
+    iget-object v1, v1, Lo0/z;->g:Lo0/a0;
+
+    iget-object v1, v1, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v1}, Lo0/w;->i()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    const-string v2, "currentThread"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    :try_start_0
+    iget-object v0, p0, Lo0/z$a;->f:Lo0/z;
+
+    iget-object v0, v0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, v0, Lo0/g0/d/m;->c:Lo0/g0/d/m$b;
+
+    invoke-virtual {v0}, Lp0/b;->i()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v0, p0, Lo0/z$a;->f:Lo0/z;
+
+    invoke-virtual {v0}, Lo0/z;->b()Lokhttp3/Response;
+
+    move-result-object v0
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    const/4 v3, 0x1
+
+    :try_start_2
+    iget-object v4, p0, Lo0/z$a;->e:Lo0/g;
+
+    iget-object v5, p0, Lo0/z$a;->f:Lo0/z;
+
+    invoke-interface {v4, v5, v0}, Lo0/g;->a(Lo0/f;Lokhttp3/Response;)V
+    :try_end_2
+    .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :try_start_3
+    iget-object v0, p0, Lo0/z$a;->f:Lo0/z;
+
+    :goto_0
+    iget-object v0, v0, Lo0/z;->f:Lo0/x;
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    goto :goto_3
+
+    :catch_0
+    move-exception v0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_4
+
+    :catch_1
+    move-exception v0
+
+    const/4 v3, 0x0
+
+    :goto_1
+    if-eqz v3, :cond_0
+
+    :try_start_4
+    sget-object v3, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
+
+    sget-object v3, Lo0/g0/h/f;->a:Lo0/g0/h/f;
+
+    const/4 v4, 0x4
+
+    new-instance v5, Ljava/lang/StringBuilder;
+
+    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v6, "Callback failure for "
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v6, p0, Lo0/z$a;->f:Lo0/z;
+
+    invoke-virtual {v6}, Lo0/z;->c()Ljava/lang/String;
+
+    move-result-object v6
+
+    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-virtual {v3, v4, v5, v0}, Lo0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :cond_0
+    iget-object v3, p0, Lo0/z$a;->e:Lo0/g;
+
+    iget-object v4, p0, Lo0/z$a;->f:Lo0/z;
+
+    invoke-interface {v3, v4, v0}, Lo0/g;->b(Lo0/f;Ljava/io/IOException;)V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+
+    :goto_2
+    :try_start_5
+    iget-object v0, p0, Lo0/z$a;->f:Lo0/z;
+
+    goto :goto_0
+
+    :goto_3
+    iget-object v0, v0, Lo0/x;->d:Lo0/q;
+
+    invoke-virtual {v0, p0}, Lo0/q;->c(Lo0/z$a;)V
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-void
+
+    :goto_4
+    :try_start_6
+    iget-object v3, p0, Lo0/z$a;->f:Lo0/z;
+
+    iget-object v3, v3, Lo0/z;->f:Lo0/x;
+
+    iget-object v3, v3, Lo0/x;->d:Lo0/q;
+
+    invoke-virtual {v3, p0}, Lo0/q;->c(Lo0/z$a;)V
+
+    throw v0
+
+    :cond_1
+    const-string v0, "transmitter"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :catchall_1
+    move-exception v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/o0/z.smali b/com.discord/smali_classes2/o0/z.smali
new file mode 100644
index 0000000000..38893dac60
--- /dev/null
+++ b/com.discord/smali_classes2/o0/z.smali
@@ -0,0 +1,787 @@
+.class public final Lo0/z;
+.super Ljava/lang/Object;
+.source "RealCall.kt"
+
+# interfaces
+.implements Lo0/f;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lo0/z$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Lo0/g0/d/m;
+
+.field public e:Z
+
+.field public final f:Lo0/x;
+
+.field public final g:Lo0/a0;
+
+.field public final h:Z
+
+
+# direct methods
+.method public constructor <init>(Lo0/x;Lo0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lo0/z;->f:Lo0/x;
+
+    iput-object p2, p0, Lo0/z;->g:Lo0/a0;
+
+    iput-boolean p3, p0, Lo0/z;->h:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public F(Lo0/g;)V
+    .locals 6
+
+    const-string v0, "responseCallback"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/z;->e:Z
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_7
+
+    iput-boolean v1, p0, Lo0/z;->e:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    monitor-exit p0
+
+    iget-object v0, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_6
+
+    invoke-virtual {v0}, Lo0/g0/d/m;->b()V
+
+    iget-object v0, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v0, v0, Lo0/x;->d:Lo0/q;
+
+    new-instance v2, Lo0/z$a;
+
+    invoke-direct {v2, p0, p1}, Lo0/z$a;-><init>(Lo0/z;Lo0/g;)V
+
+    if-eqz v0, :cond_5
+
+    const-string p1, "call"
+
+    invoke-static {v2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    monitor-enter v0
+
+    :try_start_1
+    iget-object p1, v0, Lo0/q;->d:Ljava/util/ArrayDeque;
+
+    invoke-virtual {p1, v2}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+
+    iget-object p1, v2, Lo0/z$a;->f:Lo0/z;
+
+    iget-boolean p1, p1, Lo0/z;->h:Z
+
+    if-nez p1, :cond_4
+
+    invoke-virtual {v2}, Lo0/z$a;->a()Ljava/lang/String;
+
+    move-result-object p1
+
+    iget-object v3, v0, Lo0/q;->e:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v3}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :cond_0
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lo0/z$a;
+
+    invoke-virtual {v4}, Lo0/z$a;->a()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-static {v5, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    :goto_0
+    move-object v1, v4
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v3, v0, Lo0/q;->d:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v3}, Ljava/util/ArrayDeque;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :cond_2
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_3
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lo0/z$a;
+
+    invoke-virtual {v4}, Lo0/z$a;->a()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-static {v5, p1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    goto :goto_0
+
+    :cond_3
+    :goto_1
+    if-eqz v1, :cond_4
+
+    const-string p1, "other"
+
+    invoke-static {v1, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, v1, Lo0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    iput-object p1, v2, Lo0/z$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :cond_4
+    monitor-exit v0
+
+    invoke-virtual {v0}, Lo0/q;->d()Z
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+
+    :cond_5
+    throw v1
+
+    :cond_6
+    const-string p1, "transmitter"
+
+    invoke-static {p1}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_7
+    :try_start_2
+    const-string p1, "Already Executed"
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
+
+.method public final b()Lokhttp3/Response;
+    .locals 13
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    iget-object v0, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v0, v0, Lo0/x;->f:Ljava/util/List;
+
+    invoke-static {v1, v0}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+
+    new-instance v0, Lo0/g0/e/i;
+
+    iget-object v2, p0, Lo0/z;->f:Lo0/x;
+
+    invoke-direct {v0, v2}, Lo0/g0/e/i;-><init>(Lo0/x;)V
+
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    new-instance v0, Lo0/g0/e/a;
+
+    iget-object v2, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v2, v2, Lo0/x;->m:Lo0/p;
+
+    invoke-direct {v0, v2}, Lo0/g0/e/a;-><init>(Lo0/p;)V
+
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    new-instance v0, Lo0/g0/c/a;
+
+    iget-object v2, p0, Lo0/z;->f:Lo0/x;
+
+    const/4 v10, 0x0
+
+    if-eqz v2, :cond_9
+
+    invoke-direct {v0}, Lo0/g0/c/a;-><init>()V
+
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    sget-object v0, Lo0/g0/d/a;->b:Lo0/g0/d/a;
+
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    iget-boolean v0, p0, Lo0/z;->h:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v0, v0, Lo0/x;->g:Ljava/util/List;
+
+    invoke-static {v1, v0}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+
+    :cond_0
+    new-instance v0, Lo0/g0/e/b;
+
+    iget-boolean v2, p0, Lo0/z;->h:Z
+
+    invoke-direct {v0, v2}, Lo0/g0/e/b;-><init>(Z)V
+
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    new-instance v11, Lo0/g0/e/g;
+
+    iget-object v2, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    const-string v12, "transmitter"
+
+    if-eqz v2, :cond_8
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    iget-object v5, p0, Lo0/z;->g:Lo0/a0;
+
+    iget-object v0, p0, Lo0/z;->f:Lo0/x;
+
+    iget v7, v0, Lo0/x;->B:I
+
+    iget v8, v0, Lo0/x;->C:I
+
+    iget v9, v0, Lo0/x;->D:I
+
+    move-object v0, v11
+
+    move-object v6, p0
+
+    invoke-direct/range {v0 .. v9}, Lo0/g0/e/g;-><init>(Ljava/util/List;Lo0/g0/d/m;Lo0/g0/d/c;ILo0/a0;Lo0/f;III)V
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iget-object v1, p0, Lo0/z;->g:Lo0/a0;
+
+    invoke-virtual {v11, v1}, Lo0/g0/e/g;->d(Lo0/a0;)Lokhttp3/Response;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v2, :cond_3
+
+    invoke-virtual {v2}, Lo0/g0/d/m;->f()Z
+
+    move-result v2
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v2, :cond_2
+
+    iget-object v0, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0, v10}, Lo0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
+
+    return-object v1
+
+    :cond_1
+    invoke-static {v12}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v10
+
+    :cond_2
+    :try_start_1
+    const-string v2, "$this$closeQuietly"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_2
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    invoke-virtual {v1}, Lokhttp3/Response;->close()V
+    :try_end_2
+    .catch Ljava/lang/RuntimeException; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :catch_0
+    :try_start_3
+    new-instance v1, Ljava/io/IOException;
+
+    const-string v2, "Canceled"
+
+    invoke-direct {v1, v2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :catch_1
+    move-exception v1
+
+    throw v1
+
+    :cond_3
+    invoke-static {v12}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    :try_end_3
+    .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_2
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    throw v10
+
+    :catchall_0
+    move-exception v1
+
+    goto :goto_0
+
+    :catch_2
+    move-exception v0
+
+    :try_start_4
+    iget-object v1, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v1, :cond_5
+
+    invoke-virtual {v1, v0}, Lo0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    if-nez v0, :cond_4
+
+    new-instance v0, Lkotlin/TypeCastException;
+
+    const-string v1, "null cannot be cast to non-null type kotlin.Throwable"
+
+    invoke-direct {v0, v1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    throw v0
+
+    :cond_5
+    invoke-static {v12}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    throw v10
+
+    :catchall_1
+    move-exception v0
+
+    move-object v1, v0
+
+    const/4 v0, 0x1
+
+    :goto_0
+    if-nez v0, :cond_7
+
+    iget-object v0, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-nez v0, :cond_6
+
+    invoke-static {v12}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v10
+
+    :cond_6
+    invoke-virtual {v0, v10}, Lo0/g0/d/m;->h(Ljava/io/IOException;)Ljava/io/IOException;
+
+    :cond_7
+    throw v1
+
+    :cond_8
+    invoke-static {v12}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v10
+
+    :cond_9
+    throw v10
+.end method
+
+.method public final c()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Lo0/g0/d/m;->f()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    const-string v1, "canceled "
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, ""
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lo0/z;->h:Z
+
+    if-eqz v1, :cond_1
+
+    const-string v1, "web socket"
+
+    goto :goto_1
+
+    :cond_1
+    const-string v1, "call"
+
+    :goto_1
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " to "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lo0/z;->g:Lo0/a0;
+
+    iget-object v1, v1, Lo0/a0;->b:Lo0/w;
+
+    invoke-virtual {v1}, Lo0/w;->i()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_2
+    const-string v0, "transmitter"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public cancel()V
+    .locals 1
+
+    iget-object v0, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lo0/g0/d/m;->c()V
+
+    return-void
+
+    :cond_0
+    const-string v0, "transmitter"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public clone()Ljava/lang/Object;
+    .locals 5
+
+    iget-object v0, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v1, p0, Lo0/z;->g:Lo0/a0;
+
+    iget-boolean v2, p0, Lo0/z;->h:Z
+
+    const-string v3, "client"
+
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "originalRequest"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v3, Lo0/z;
+
+    const/4 v4, 0x0
+
+    invoke-direct {v3, v0, v1, v2, v4}, Lo0/z;-><init>(Lo0/x;Lo0/a0;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    new-instance v1, Lo0/g0/d/m;
+
+    invoke-direct {v1, v0, v3}, Lo0/g0/d/m;-><init>(Lo0/x;Lo0/f;)V
+
+    iput-object v1, v3, Lo0/z;->d:Lo0/g0/d/m;
+
+    return-object v3
+.end method
+
+.method public execute()Lokhttp3/Response;
+    .locals 3
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lo0/z;->e:Z
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_4
+
+    iput-boolean v1, p0, Lo0/z;->e:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    monitor-exit p0
+
+    iget-object v0, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, v0, Lo0/g0/d/m;->c:Lo0/g0/d/m$b;
+
+    invoke-virtual {v0}, Lp0/b;->i()V
+
+    iget-object v0, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lo0/g0/d/m;->b()V
+
+    :try_start_1
+    iget-object v0, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v0, v0, Lo0/x;->d:Lo0/q;
+
+    monitor-enter v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :try_start_2
+    const-string v2, "call"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v0, Lo0/q;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2, p0}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :try_start_3
+    monitor-exit v0
+
+    invoke-virtual {p0}, Lo0/z;->b()Lokhttp3/Response;
+
+    move-result-object v0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    iget-object v2, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v2, v2, Lo0/x;->d:Lo0/q;
+
+    if-eqz v2, :cond_0
+
+    const-string v1, "call"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v2, Lo0/q;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2, v1, p0}, Lo0/q;->b(Ljava/util/Deque;Ljava/lang/Object;)V
+
+    return-object v0
+
+    :cond_0
+    throw v1
+
+    :catchall_0
+    move-exception v2
+
+    :try_start_4
+    monitor-exit v0
+
+    throw v2
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    iget-object v2, p0, Lo0/z;->f:Lo0/x;
+
+    iget-object v2, v2, Lo0/x;->d:Lo0/q;
+
+    if-eqz v2, :cond_1
+
+    const-string v1, "call"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v2, Lo0/q;->f:Ljava/util/ArrayDeque;
+
+    invoke-virtual {v2, v1, p0}, Lo0/q;->b(Ljava/util/Deque;Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_1
+    throw v1
+
+    :cond_2
+    const-string v0, "transmitter"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_3
+    const-string v0, "transmitter"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_4
+    :try_start_5
+    const-string v0, "Already Executed"
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+
+    :catchall_2
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public k()Z
+    .locals 1
+
+    iget-object v0, p0, Lo0/z;->d:Lo0/g0/d/m;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lo0/g0/d/m;->f()Z
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    const-string v0, "transmitter"
+
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public p()Lo0/a0;
+    .locals 1
+
+    iget-object v0, p0, Lo0/z;->g:Lo0/a0;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/okhttp3/Headers$a.smali b/com.discord/smali_classes2/okhttp3/Headers$a.smali
index 8335b96428..2e0cbd5b97 100644
--- a/com.discord/smali_classes2/okhttp3/Headers$a.smali
+++ b/com.discord/smali_classes2/okhttp3/Headers$a.smali
@@ -48,11 +48,13 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 9
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_c
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_b
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
@@ -136,7 +138,7 @@
 
     const-string p1, "Unexpected char %#04x at %d in header name: %s"
 
-    invoke-static {p1, p2}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, p2}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -219,7 +221,7 @@
 
     const-string p1, "Unexpected char %#04x at %d in %s value: %s"
 
-    invoke-static {p1, v0}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, v0}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -250,26 +252,18 @@
     invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_b
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_c
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final b(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lokhttp3/Headers$a;->a:Ljava/util/List;
 
@@ -277,7 +271,7 @@
 
     iget-object p1, p0, Lokhttp3/Headers$a;->a:Ljava/util/List;
 
-    invoke-static {p2}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p2}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p2
 
@@ -288,15 +282,6 @@
     invoke-interface {p1, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     return-object p0
-
-    :cond_0
-    const-string p1, "value"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final c()Lokhttp3/Headers;
@@ -337,6 +322,10 @@
 .method public final d(Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 3
 
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v0, 0x0
 
     :goto_0
@@ -358,7 +347,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {p1, v1, v2}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {p1, v1, v2}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v1
 
@@ -386,6 +375,14 @@
 .method public final e(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 9
 
+    const-string v0, "name"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "value"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-interface {p1}, Ljava/lang/CharSequence;->length()I
 
     move-result v0
@@ -468,7 +465,7 @@
 
     const-string p1, "Unexpected char %#04x at %d in header name: %s"
 
-    invoke-static {p1, p2}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, p2}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -551,7 +548,7 @@
 
     const-string p1, "Unexpected char %#04x at %d in %s value: %s"
 
-    invoke-static {p1, v0}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, v0}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/okhttp3/Headers$b.smali b/com.discord/smali_classes2/okhttp3/Headers$b.smali
index 5170875d2f..cab6a1bddf 100644
--- a/com.discord/smali_classes2/okhttp3/Headers$b.smali
+++ b/com.discord/smali_classes2/okhttp3/Headers$b.smali
@@ -110,7 +110,7 @@
 
     const-string p1, "Unexpected char %#04x at %d in header name: %s"
 
-    invoke-static {p1, v0}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, v0}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -222,7 +222,7 @@
 
     const-string p1, "Unexpected char %#04x at %d in %s value: %s"
 
-    invoke-static {p1, v0}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, v0}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p1
 
@@ -241,33 +241,33 @@
 .end method
 
 .method public final varargs c([Ljava/lang/String;)Lokhttp3/Headers;
-    .locals 7
+    .locals 6
 
-    const/4 v0, 0x0
+    const-string v0, "namesAndValues"
 
-    if-eqz p1, :cond_9
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    array-length v1, p1
+    array-length v0, p1
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    rem-int/2addr v1, v2
+    rem-int/2addr v0, v1
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    const/4 v1, 0x1
+    const/4 v0, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     :goto_0
-    if-eqz v1, :cond_8
+    if-eqz v0, :cond_8
 
     invoke-virtual {p1}, Ljava/lang/Object;->clone()Ljava/lang/Object;
 
@@ -277,42 +277,42 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    array-length v1, p1
+    array-length v0, p1
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     :goto_1
-    if-ge v5, v1, :cond_4
+    if-ge v4, v0, :cond_4
 
-    aget-object v6, p1, v5
+    aget-object v5, p1, v4
 
-    if-eqz v6, :cond_1
+    if-eqz v5, :cond_1
 
-    const/4 v6, 0x1
+    const/4 v5, 0x1
 
     goto :goto_2
 
     :cond_1
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
     :goto_2
-    if-eqz v6, :cond_3
+    if-eqz v5, :cond_3
 
-    aget-object v6, p1, v5
+    aget-object v5, p1, v4
 
-    if-eqz v6, :cond_2
+    if-eqz v5, :cond_2
 
-    invoke-static {v6}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {v5}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
-    move-result-object v6
+    move-result-object v5
 
-    invoke-virtual {v6}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-virtual {v5}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v5
 
-    aput-object v6, p1, v5
+    aput-object v5, p1, v4
 
-    add-int/lit8 v5, v5, 0x1
+    add-int/lit8 v4, v4, 0x1
 
     goto :goto_1
 
@@ -339,54 +339,56 @@
     throw p1
 
     :cond_4
-    array-length v1, p1
+    array-length v0, p1
 
-    invoke-static {v4, v1}, Lj0/q/f;->until(II)Lkotlin/ranges/IntRange;
+    invoke-static {v3, v0}, Lk0/r/f;->until(II)Lkotlin/ranges/IntRange;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-static {v1, v2}, Lj0/q/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
+    invoke-static {v0, v1}, Lk0/r/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
 
-    move-result-object v1
+    move-result-object v0
 
-    iget v2, v1, Lkotlin/ranges/IntProgression;->d:I
+    iget v1, v0, Lkotlin/ranges/IntProgression;->d:I
 
-    iget v3, v1, Lkotlin/ranges/IntProgression;->e:I
+    iget v2, v0, Lkotlin/ranges/IntProgression;->e:I
 
-    iget v1, v1, Lkotlin/ranges/IntProgression;->f:I
+    iget v0, v0, Lkotlin/ranges/IntProgression;->f:I
 
-    if-ltz v1, :cond_5
+    if-ltz v0, :cond_5
 
-    if-gt v2, v3, :cond_6
+    if-gt v1, v2, :cond_6
 
     goto :goto_3
 
     :cond_5
-    if-lt v2, v3, :cond_6
+    if-lt v1, v2, :cond_6
 
     :goto_3
-    aget-object v4, p1, v2
+    aget-object v3, p1, v1
 
-    add-int/lit8 v5, v2, 0x1
+    add-int/lit8 v4, v1, 0x1
 
-    aget-object v5, p1, v5
+    aget-object v4, p1, v4
 
-    invoke-virtual {p0, v4}, Lokhttp3/Headers$b;->a(Ljava/lang/String;)V
+    invoke-virtual {p0, v3}, Lokhttp3/Headers$b;->a(Ljava/lang/String;)V
 
-    invoke-virtual {p0, v5, v4}, Lokhttp3/Headers$b;->b(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {p0, v4, v3}, Lokhttp3/Headers$b;->b(Ljava/lang/String;Ljava/lang/String;)V
 
-    if-eq v2, v3, :cond_6
+    if-eq v1, v2, :cond_6
 
-    add-int/2addr v2, v1
+    add-int/2addr v1, v0
 
     goto :goto_3
 
     :cond_6
-    new-instance v1, Lokhttp3/Headers;
+    new-instance v0, Lokhttp3/Headers;
 
-    invoke-direct {v1, p1, v0}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const/4 v1, 0x0
 
-    return-object v1
+    invoke-direct {v0, p1, v1}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v0
 
     :cond_7
     new-instance p1, Lkotlin/TypeCastException;
@@ -409,11 +411,4 @@
     invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_9
-    const-string p1, "namesAndValues"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/Headers.smali b/com.discord/smali_classes2/okhttp3/Headers.smali
index 2e1cf76084..b77d612ff1 100644
--- a/com.discord/smali_classes2/okhttp3/Headers.smali
+++ b/com.discord/smali_classes2/okhttp3/Headers.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/lang/Iterable;
-.implements Lj0/n/c/v/a;
+.implements Lk0/o/c/w/a;
 
 
 # annotations
@@ -25,7 +25,7 @@
         "+",
         "Ljava/lang/String;",
         ">;>;",
-        "Lj0/n/c/v/a;"
+        "Lk0/o/c/w/a;"
     }
 .end annotation
 
@@ -68,13 +68,15 @@
 .method public final c(Ljava/lang/String;)Ljava/lang/String;
     .locals 7
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p1, :cond_3
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/Headers;->d:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->d:[Ljava/lang/String;
 
-    array-length v2, v1
+    const/4 v1, 0x0
+
+    array-length v2, v0
 
     const/4 v3, 0x2
 
@@ -82,11 +84,11 @@
 
     const/4 v4, 0x0
 
-    invoke-static {v2, v4}, Lj0/q/f;->downTo(II)Lkotlin/ranges/IntProgression;
+    invoke-static {v2, v4}, Lk0/r/f;->downTo(II)Lkotlin/ranges/IntProgression;
 
     move-result-object v2
 
-    invoke-static {v2, v3}, Lj0/q/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
+    invoke-static {v2, v3}, Lk0/r/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression;
 
     move-result-object v2
 
@@ -106,11 +108,11 @@
     if-lt v3, v4, :cond_2
 
     :goto_0
-    aget-object v5, v1, v3
+    aget-object v5, v0, v3
 
     const/4 v6, 0x1
 
-    invoke-static {p1, v5, v6}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {p1, v5, v6}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v5
 
@@ -118,7 +120,7 @@
 
     add-int/2addr v3, v6
 
-    aget-object v0, v1, v3
+    aget-object v1, v0, v3
 
     goto :goto_1
 
@@ -131,14 +133,7 @@
 
     :cond_2
     :goto_1
-    return-object v0
-
-    :cond_3
-    const-string p1, "name"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-object v1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
@@ -246,7 +241,7 @@
 .end method
 
 .method public final j()Lokhttp3/Headers$a;
-    .locals 3
+    .locals 4
 
     new-instance v0, Lokhttp3/Headers$a;
 
@@ -256,7 +251,19 @@
 
     iget-object v2, p0, Lokhttp3/Headers;->d:[Ljava/lang/String;
 
-    invoke-static {v1, v2}, Lf/n/a/k/a;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
+    const-string v3, "$this$addAll"
+
+    invoke-static {v1, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "elements"
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lf/n/a/k/a;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v2
+
+    invoke-interface {v1, v2}, Ljava/util/Collection;->addAll(Ljava/util/Collection;)Z
 
     return-object v0
 .end method
@@ -334,7 +341,7 @@
 
     const-string v1, "StringBuilder().apply(builderAction).toString()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/Interceptor$Chain.smali b/com.discord/smali_classes2/okhttp3/Interceptor$Chain.smali
index dc12ce77ff..5e7bde2a90 100644
--- a/com.discord/smali_classes2/okhttp3/Interceptor$Chain.smali
+++ b/com.discord/smali_classes2/okhttp3/Interceptor$Chain.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract a()Ln0/k;
+.method public abstract a()Lo0/k;
 .end method
 
 .method public abstract b()I
@@ -24,7 +24,7 @@
 .method public abstract c()I
 .end method
 
-.method public abstract d(Ln0/a0;)Lokhttp3/Response;
+.method public abstract d(Lo0/a0;)Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -35,5 +35,5 @@
 .method public abstract e()I
 .end method
 
-.method public abstract p()Ln0/a0;
+.method public abstract p()Lo0/a0;
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/MediaType$a.smali b/com.discord/smali_classes2/okhttp3/MediaType$a.smali
index 65032205b8..9d0d40147e 100644
--- a/com.discord/smali_classes2/okhttp3/MediaType$a.smali
+++ b/com.discord/smali_classes2/okhttp3/MediaType$a.smali
@@ -16,151 +16,152 @@
 
 # direct methods
 .method public static final a(Ljava/lang/String;)Lokhttp3/MediaType;
-    .locals 13
+    .locals 12
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toMediaType"
 
-    if-eqz p0, :cond_a
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lokhttp3/MediaType;->e:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/MediaType;->e:Ljava/util/regex/Pattern;
 
-    invoke-virtual {v1, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+    invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {v1}, Ljava/util/regex/Matcher;->lookingAt()Z
-
-    move-result v2
-
-    const/16 v3, 0x22
-
-    if-eqz v2, :cond_9
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v1, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "typeSubtype.group(1)"
-
-    invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v5, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    const-string v6, "Locale.US"
-
-    invoke-static {v5, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v4, v5}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object v9
-
-    const-string v4, "(this as java.lang.String).toLowerCase(locale)"
-
-    invoke-static {v9, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v5, 0x2
-
-    invoke-virtual {v1, v5}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "typeSubtype.group(2)"
-
-    invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v8, Ljava/util/Locale;->US:Ljava/util/Locale;
-
-    invoke-static {v8, v6}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v7, v8}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
-
-    move-result-object v10
-
-    invoke-static {v10, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v4, Lokhttp3/MediaType;->f:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v4, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
-
-    move-result-object v4
-
-    invoke-virtual {v1}, Ljava/util/regex/Matcher;->end()I
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->lookingAt()Z
 
     move-result v1
 
+    const/16 v2, 0x22
+
+    if-eqz v1, :cond_9
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "typeSubtype.group(1)"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    const-string v5, "Locale.US"
+
+    invoke-static {v4, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3, v4}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object v8
+
+    const-string v3, "(this as java.lang.String).toLowerCase(locale)"
+
+    invoke-static {v8, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x2
+
+    invoke-virtual {v0, v4}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object v6
+
+    const-string v7, "typeSubtype.group(2)"
+
+    invoke-static {v6, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v7, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+    invoke-static {v7, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v6, v7}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-static {v9, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    sget-object v5, Lokhttp3/MediaType;->f:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v5, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+
+    move-result-object v5
+
+    invoke-virtual {v0}, Ljava/util/regex/Matcher;->end()I
+
+    move-result v0
+
+    move-object v10, v3
+
     :goto_0
-    move-object v11, v0
-
-    :goto_1
     invoke-virtual {p0}, Ljava/lang/String;->length()I
 
-    move-result v0
+    move-result v3
 
-    if-ge v1, v0, :cond_8
+    if-ge v0, v3, :cond_8
 
     invoke-virtual {p0}, Ljava/lang/String;->length()I
 
-    move-result v0
+    move-result v3
 
-    invoke-virtual {v4, v1, v0}, Ljava/util/regex/Matcher;->region(II)Ljava/util/regex/Matcher;
+    invoke-virtual {v5, v0, v3}, Ljava/util/regex/Matcher;->region(II)Ljava/util/regex/Matcher;
 
-    invoke-virtual {v4}, Ljava/util/regex/Matcher;->lookingAt()Z
+    invoke-virtual {v5}, Ljava/util/regex/Matcher;->lookingAt()Z
 
-    move-result v0
+    move-result v3
 
     const-string v6, "\" for: \""
 
-    if-eqz v0, :cond_7
+    if-eqz v3, :cond_7
 
-    invoke-virtual {v4, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {v5, v1}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_6
 
-    const-string v1, "charset"
+    const-string v3, "charset"
 
-    invoke-static {v0, v1, v2}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v3, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    goto :goto_3
+    goto/16 :goto_2
 
     :cond_0
-    invoke-virtual {v4, v5}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {v5, v4}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
     if-nez v0, :cond_1
 
     const/4 v0, 0x3
 
-    invoke-virtual {v4, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+    invoke-virtual {v5, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
 
     move-result-object v0
 
     const-string v7, "parameter.group(3)"
 
-    invoke-static {v0, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_2
+    goto :goto_1
 
     :cond_1
     const-string v7, "\'"
 
-    invoke-static {v0, v7, v1, v5}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v0, v7, v3, v4}, Lk0/u/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
-    move-result v8
+    move-result v11
 
-    if-eqz v8, :cond_2
+    if-eqz v11, :cond_2
 
-    invoke-static {v0, v7, v1, v5}, Lj0/t/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
+    invoke-static {v0, v7, v3, v4}, Lk0/u/k;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
 
     move-result v7
 
@@ -170,41 +171,45 @@
 
     move-result v7
 
-    if-le v7, v5, :cond_2
+    if-le v7, v4, :cond_2
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
     move-result v7
 
-    sub-int/2addr v7, v2
+    sub-int/2addr v7, v1
 
-    invoke-virtual {v0, v2, v7}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+    invoke-virtual {v0, v1, v7}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
     move-result-object v0
 
     const-string v7, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
 
-    invoke-static {v0, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v7}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_2
-    :goto_2
-    if-eqz v11, :cond_3
+    :goto_1
+    if-eqz v10, :cond_3
 
-    invoke-static {v0, v11, v2}, Lj0/t/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v10, v1}, Lk0/u/k;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
     move-result v7
 
     if-eqz v7, :cond_4
 
     :cond_3
-    const/4 v1, 0x1
+    const/4 v3, 0x1
 
     :cond_4
-    if-eqz v1, :cond_5
+    if-eqz v3, :cond_5
 
-    invoke-virtual {v4}, Ljava/util/regex/Matcher;->end()I
+    invoke-virtual {v5}, Ljava/util/regex/Matcher;->end()I
 
-    move-result v1
+    move-result v3
+
+    move-object v10, v0
+
+    move v0, v3
 
     goto :goto_0
 
@@ -213,15 +218,15 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    const-string v2, "Multiple charsets defined: \""
+    const-string v3, "Multiple charsets defined: \""
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v2, "\" and: \""
+    const-string v3, "\" and: \""
 
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -229,7 +234,7 @@
 
     invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -246,37 +251,37 @@
     throw v0
 
     :cond_6
-    :goto_3
-    invoke-virtual {v4}, Ljava/util/regex/Matcher;->end()I
+    :goto_2
+    invoke-virtual {v5}, Ljava/util/regex/Matcher;->end()I
 
-    move-result v1
+    move-result v0
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :cond_7
-    const-string v0, "Parameter is not formatted correctly: \""
+    const-string v1, "Parameter is not formatted correctly: \""
 
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v1
 
-    const-string v2, "(this as java.lang.String).substring(startIndex)"
+    invoke-virtual {p0, v0}, Ljava/lang/String;->substring(I)Ljava/lang/String;
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v0
 
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    const-string v3, "(this as java.lang.String).substring(startIndex)"
 
-    invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p0
 
@@ -293,13 +298,13 @@
     :cond_8
     new-instance v0, Lokhttp3/MediaType;
 
-    const/4 v12, 0x0
+    const/4 v11, 0x0
 
-    move-object v7, v0
+    move-object v6, v0
 
-    move-object v8, p0
+    move-object v7, p0
 
-    invoke-direct/range {v7 .. v12}, Lokhttp3/MediaType;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct/range {v6 .. v11}, Lokhttp3/MediaType;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v0
 
@@ -314,7 +319,7 @@
 
     invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -329,36 +334,27 @@
     invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_a
-    const-string p0, "$this$toMediaType"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public static final b(Ljava/lang/String;)Lokhttp3/MediaType;
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toMediaTypeOrNull"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
     invoke-static {p0}, Lokhttp3/MediaType$a;->a(Ljava/lang/String;)Lokhttp3/MediaType;
 
-    move-result-object v0
+    move-result-object p0
     :try_end_0
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
+    goto :goto_0
+
     :catch_0
-    return-object v0
+    const/4 p0, 0x0
 
-    :cond_0
-    const-string p0, "$this$toMediaTypeOrNull"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    :goto_0
+    return-object p0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/MediaType.smali b/com.discord/smali_classes2/okhttp3/MediaType.smali
index 7db1a0fc73..3348730402 100644
--- a/com.discord/smali_classes2/okhttp3/MediaType.smali
+++ b/com.discord/smali_classes2/okhttp3/MediaType.smali
@@ -128,7 +128,7 @@
 
     iget-object v0, p0, Lokhttp3/MediaType;->a:Ljava/lang/String;
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v0}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/okhttp3/MultipartBody$Part.smali b/com.discord/smali_classes2/okhttp3/MultipartBody$Part.smali
index bf8dd5278c..76024231da 100644
--- a/com.discord/smali_classes2/okhttp3/MultipartBody$Part.smali
+++ b/com.discord/smali_classes2/okhttp3/MultipartBody$Part.smali
@@ -36,6 +36,10 @@
 .method public static final a(Lokhttp3/Headers;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$Part;
     .locals 2
 
+    const-string v0, "body"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string v0, "Content-Type"
 
     invoke-virtual {p0, v0}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
@@ -105,17 +109,23 @@
 .end method
 
 .method public static final b(Ljava/lang/String;Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$Part;
-    .locals 9
+    .locals 10
 
-    const/4 v0, 0x0
+    const-string v0, "name"
 
-    if-eqz p0, :cond_6
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "form-data; name="
+    const-string v1, "body"
 
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v1
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "form-data; name="
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     sget-object v2, Lokhttp3/MultipartBody;->k:Lokhttp3/MultipartBody$b;
 
@@ -138,7 +148,7 @@
 
     const-string p1, "StringBuilder().apply(builderAction).toString()"
 
-    invoke-static {p0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -148,44 +158,50 @@
 
     const-string v1, "Content-Disposition"
 
-    const/16 v2, 0x13
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v3, 0x0
+    const-string v2, "value"
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/16 v3, 0x13
 
     const/4 v4, 0x0
 
+    const/4 v5, 0x0
+
     :goto_0
-    if-ge v4, v2, :cond_4
+    if-ge v5, v3, :cond_4
 
-    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v1, v5}, Ljava/lang/String;->charAt(I)C
 
-    move-result v5
+    move-result v6
 
-    const/16 v6, 0x7e
+    const/16 v7, 0x7e
 
-    const/16 v7, 0x21
+    const/16 v8, 0x21
 
-    const/4 v8, 0x1
+    const/4 v9, 0x1
 
-    if-le v7, v5, :cond_1
+    if-le v8, v6, :cond_1
 
     goto :goto_1
 
     :cond_1
-    if-lt v6, v5, :cond_2
+    if-lt v7, v6, :cond_2
 
-    const/4 v6, 0x1
+    const/4 v7, 0x1
 
     goto :goto_2
 
     :cond_2
     :goto_1
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
     :goto_2
-    if-eqz v6, :cond_3
+    if-eqz v7, :cond_3
 
-    add-int/lit8 v4, v4, 0x1
+    add-int/lit8 v5, v5, 0x1
 
     goto :goto_0
 
@@ -194,17 +210,17 @@
 
     new-array p0, p0, [Ljava/lang/Object;
 
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    aput-object p1, p0, v4
+
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p1
 
-    aput-object p1, p0, v3
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    aput-object p1, p0, v8
+    aput-object p1, p0, v9
 
     const/4 p1, 0x2
 
@@ -212,7 +228,7 @@
 
     const-string p1, "Unexpected char %#04x at %d in header name: %s"
 
-    invoke-static {p1, p0}, Ln0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p1, p0}, Lo0/g0/b;->l(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p0
 
@@ -227,9 +243,13 @@
     throw p1
 
     :cond_4
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    invoke-static {p0}, Lj0/t/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+    invoke-static {p0}, Lk0/u/p;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 
     move-result-object p0
 
@@ -239,7 +259,7 @@
 
     invoke-virtual {p1, p0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    new-array p0, v3, [Ljava/lang/String;
+    new-array p0, v4, [Ljava/lang/String;
 
     invoke-virtual {p1, p0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
@@ -249,11 +269,13 @@
 
     check-cast p0, [Ljava/lang/String;
 
-    new-instance p1, Lokhttp3/Headers;
+    const/4 p1, 0x0
 
-    invoke-direct {p1, p0, v0}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    new-instance v0, Lokhttp3/Headers;
 
-    invoke-static {p1, p2}, Lokhttp3/MultipartBody$Part;->a(Lokhttp3/Headers;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$Part;
+    invoke-direct {v0, p0, p1}, Lokhttp3/Headers;-><init>([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-static {v0, p2}, Lokhttp3/MultipartBody$Part;->a(Lokhttp3/Headers;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$Part;
 
     move-result-object p0
 
@@ -267,11 +289,4 @@
     invoke-direct {p0, p1}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
 
     throw p0
-
-    :cond_6
-    const-string p0, "name"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/MultipartBody$a.smali b/com.discord/smali_classes2/okhttp3/MultipartBody$a.smali
index 46dd7935da..1738ce0905 100644
--- a/com.discord/smali_classes2/okhttp3/MultipartBody$a.smali
+++ b/com.discord/smali_classes2/okhttp3/MultipartBody$a.smali
@@ -44,9 +44,11 @@
 
     const-string v1, "UUID.randomUUID().toString()"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v0, :cond_0
+    const-string v1, "boundary"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,15 +71,6 @@
     iput-object v0, p0, Lokhttp3/MultipartBody$a;->c:Ljava/util/List;
 
     return-void
-
-    :cond_0
-    const-string v0, "boundary"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 v0, 0x0
-
-    throw v0
 .end method
 
 
@@ -85,22 +78,15 @@
 .method public final a(Lokhttp3/MultipartBody$Part;)Lokhttp3/MultipartBody$a;
     .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "part"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lokhttp3/MultipartBody$a;->c:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     return-object p0
-
-    :cond_0
-    const-string p1, "part"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public final b()Lokhttp3/MultipartBody;
@@ -124,7 +110,7 @@
 
     iget-object v3, p0, Lokhttp3/MultipartBody$a;->c:Ljava/util/List;
 
-    invoke-static {v3}, Ln0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
+    invoke-static {v3}, Lo0/g0/b;->E(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v3
 
@@ -149,13 +135,15 @@
 .method public final c(Lokhttp3/MediaType;)Lokhttp3/MultipartBody$a;
     .locals 2
 
-    if-eqz p1, :cond_1
+    const-string v0, "type"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p1, Lokhttp3/MediaType;->b:Ljava/lang/String;
 
     const-string v1, "multipart"
 
-    invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lk0/o/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -189,13 +177,4 @@
     invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/MultipartBody$b.smali b/com.discord/smali_classes2/okhttp3/MultipartBody$b.smali
index b82aa2a42c..7d398378c6 100644
--- a/com.discord/smali_classes2/okhttp3/MultipartBody$b.smali
+++ b/com.discord/smali_classes2/okhttp3/MultipartBody$b.smali
@@ -28,20 +28,28 @@
 .method public final a(Ljava/lang/StringBuilder;Ljava/lang/String;)V
     .locals 5
 
+    const-string v0, "$this$appendQuotedString"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "key"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/16 v0, 0x22
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    const/4 v1, 0x0
-
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
-    move-result v2
+    move-result v1
+
+    const/4 v2, 0x0
 
     :goto_0
-    if-ge v1, v2, :cond_3
+    if-ge v2, v1, :cond_3
 
-    invoke-virtual {p2, v1}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {p2, v2}, Ljava/lang/String;->charAt(I)C
 
     move-result v3
 
@@ -79,7 +87,7 @@
     invoke-virtual {p1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :goto_1
-    add-int/lit8 v1, v1, 0x1
+    add-int/lit8 v2, v2, 0x1
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/okhttp3/MultipartBody.smali b/com.discord/smali_classes2/okhttp3/MultipartBody.smali
index 7380132ece..1ef203a4d8 100644
--- a/com.discord/smali_classes2/okhttp3/MultipartBody.smali
+++ b/com.discord/smali_classes2/okhttp3/MultipartBody.smali
@@ -163,11 +163,17 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const-string v0, "boundaryByteString"
 
-    if-eqz p1, :cond_2
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_1
+    const-string v0, "type"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "parts"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -195,7 +201,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {p2}, Lo0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+    invoke-static {p2}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
 
     move-result-object p2
 
@@ -218,21 +224,9 @@
     return-void
 
     :cond_0
-    throw v0
+    const/4 p1, 0x0
 
-    :cond_1
-    const-string p1, "type"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const-string p1, "boundaryByteString"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    throw p1
 .end method
 
 
@@ -249,9 +243,9 @@
 
     if-eqz p2, :cond_0
 
-    new-instance p1, Lo0/e;
+    new-instance p1, Lp0/e;
 
-    invoke-direct {p1}, Lo0/e;-><init>()V
+    invoke-direct {p1}, Lp0/e;-><init>()V
 
     move-object v1, p1
 
@@ -398,14 +392,14 @@
 
     if-eqz v1, :cond_4
 
-    iget-wide p1, v1, Lo0/e;->e:J
+    iget-wide p1, v1, Lp0/e;->e:J
 
-    invoke-virtual {v1, p1, p2}, Lo0/e;->skip(J)V
+    invoke-virtual {v1, p1, p2}, Lp0/e;->skip(J)V
 
     return-wide v10
 
     :cond_4
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
     throw v0
 
@@ -434,7 +428,7 @@
     goto/16 :goto_1
 
     :cond_7
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
     throw v0
 
@@ -461,16 +455,16 @@
 
     if-eqz v1, :cond_9
 
-    iget-wide p1, v1, Lo0/e;->e:J
+    iget-wide p1, v1, Lp0/e;->e:J
 
     add-long/2addr v4, p1
 
-    invoke-virtual {v1, p1, p2}, Lo0/e;->skip(J)V
+    invoke-virtual {v1, p1, p2}, Lp0/e;->skip(J)V
 
     goto :goto_5
 
     :cond_9
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
     throw v0
 
@@ -479,7 +473,7 @@
     return-wide v4
 
     :cond_b
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
 
     throw v0
 .end method
@@ -530,20 +524,13 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
     invoke-virtual {p0, p1, v0}, Lokhttp3/MultipartBody;->a(Lokio/BufferedSink;Z)J
 
     return-void
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/RequestBody$Companion$a.smali b/com.discord/smali_classes2/okhttp3/RequestBody$Companion$a.smali
index 8650ae58bb..99a8776563 100644
--- a/com.discord/smali_classes2/okhttp3/RequestBody$Companion$a.smali
+++ b/com.discord/smali_classes2/okhttp3/RequestBody$Companion$a.smali
@@ -64,7 +64,9 @@
 .method public writeTo(Lokio/BufferedSink;)V
     .locals 3
 
-    if-eqz p1, :cond_0
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Lokhttp3/RequestBody$Companion$a;->a:[B
 
@@ -75,13 +77,4 @@
     invoke-interface {p1, v0, v1, v2}, Lokio/BufferedSink;->write([BII)Lokio/BufferedSink;
 
     return-void
-
-    :cond_0
-    const-string p1, "sink"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/RequestBody$Companion.smali b/com.discord/smali_classes2/okhttp3/RequestBody$Companion.smali
index 11a2b918ea..ef2ea9f174 100644
--- a/com.discord/smali_classes2/okhttp3/RequestBody$Companion.smali
+++ b/com.discord/smali_classes2/okhttp3/RequestBody$Companion.smali
@@ -48,7 +48,11 @@
     array-length p4, p2
 
     :cond_1
-    if-eqz p2, :cond_2
+    if-eqz p0, :cond_2
+
+    const-string p5, "content"
+
+    invoke-static {p2, p5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p2, p1, p3, p4}, Lokhttp3/RequestBody$Companion;->b([BLokhttp3/MediaType;II)Lokhttp3/RequestBody;
 
@@ -57,10 +61,6 @@
     return-object p0
 
     :cond_2
-    const-string p0, "content"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 p0, 0x0
 
     throw p0
@@ -102,37 +102,39 @@
 .method public final a(Ljava/lang/String;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
     .locals 2
 
-    const/4 v0, 0x0
+    const-string v0, "$this$toRequestBody"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     if-eqz p2, :cond_0
 
+    const/4 v0, 0x0
+
     const/4 v1, 0x1
 
     invoke-static {p2, v0, v1}, Lokhttp3/MediaType;->b(Lokhttp3/MediaType;Ljava/nio/charset/Charset;I)Ljava/nio/charset/Charset;
 
-    move-result-object v1
+    move-result-object v0
 
-    if-nez v1, :cond_0
+    if-nez v0, :cond_0
 
-    sget-object v1, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
-    sget-object v0, Lokhttp3/MediaType;->g:Lokhttp3/MediaType$a;
+    sget-object v1, Lokhttp3/MediaType;->g:Lokhttp3/MediaType$a;
 
-    new-instance v0, Ljava/lang/StringBuilder;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
     const-string p2, "; charset=utf-8"
 
-    invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object p2
 
@@ -141,13 +143,13 @@
     move-result-object p2
 
     :cond_0
-    invoke-virtual {p1, v1}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+    invoke-virtual {p1, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
     move-result-object p1
 
     const-string v0, "(this as java.lang.String).getBytes(charset)"
 
-    invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -158,19 +160,14 @@
     move-result-object p1
 
     return-object p1
-
-    :cond_1
-    const-string p1, "$this$toRequestBody"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 .method public final b([BLokhttp3/MediaType;II)Lokhttp3/RequestBody;
     .locals 7
 
-    if-eqz p1, :cond_0
+    const-string v0, "$this$toRequestBody"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     array-length v0, p1
 
@@ -180,20 +177,11 @@
 
     int-to-long v5, p4
 
-    invoke-static/range {v1 .. v6}, Ln0/g0/b;->e(JJJ)V
+    invoke-static/range {v1 .. v6}, Lo0/g0/b;->e(JJJ)V
 
     new-instance v0, Lokhttp3/RequestBody$Companion$a;
 
     invoke-direct {v0, p1, p2, p4, p3}, Lokhttp3/RequestBody$Companion$a;-><init>([BLokhttp3/MediaType;II)V
 
     return-object v0
-
-    :cond_0
-    const-string p1, "$this$toRequestBody"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/RequestBody.smali b/com.discord/smali_classes2/okhttp3/RequestBody.smali
index 8c253afcb6..efa1915f81 100644
--- a/com.discord/smali_classes2/okhttp3/RequestBody.smali
+++ b/com.discord/smali_classes2/okhttp3/RequestBody.smali
@@ -39,31 +39,26 @@
 .end method
 
 .method public static final create(Ljava/io/File;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
-    .locals 2
+    .locals 1
 
     sget-object v0, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
 
-    const/4 v1, 0x0
+    if-eqz v0, :cond_0
 
-    if-eqz v0, :cond_1
+    const-string v0, "$this$asRequestBody"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ln0/b0;
+    new-instance v0, Lo0/b0;
 
-    invoke-direct {v0, p0, p1}, Ln0/b0;-><init>(Ljava/io/File;Lokhttp3/MediaType;)V
+    invoke-direct {v0, p0, p1}, Lo0/b0;-><init>(Ljava/io/File;Lokhttp3/MediaType;)V
 
     return-object v0
 
     :cond_0
-    const-string p0, "$this$asRequestBody"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    throw v1
+    throw p0
 .end method
 
 .method public static final create(Ljava/lang/String;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
@@ -79,39 +74,42 @@
 .end method
 
 .method public static final create(Lokhttp3/MediaType;Ljava/io/File;)Lokhttp3/RequestBody;
-    .locals 2
-
-    sget-object v0, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Ln0/b0;
-
-    invoke-direct {v0, p1, p0}, Ln0/b0;-><init>(Ljava/io/File;Lokhttp3/MediaType;)V
-
-    return-object v0
-
-    :cond_0
-    const-string p0, "file"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    throw v1
-.end method
-
-.method public static final create(Lokhttp3/MediaType;Ljava/lang/String;)Lokhttp3/RequestBody;
     .locals 1
 
     sget-object v0, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
 
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
+
+    const-string v0, "file"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "$this$asRequestBody"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lo0/b0;
+
+    invoke-direct {v0, p1, p0}, Lo0/b0;-><init>(Ljava/io/File;Lokhttp3/MediaType;)V
+
+    return-object v0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    throw p0
+.end method
+
+.method public static final create(Lokhttp3/MediaType;Ljava/lang/String;)Lokhttp3/RequestBody;
+    .locals 2
+
+    sget-object v0, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "content"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1, p0}, Lokhttp3/RequestBody$Companion;->a(Ljava/lang/String;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
 
@@ -120,41 +118,36 @@
     return-object p0
 
     :cond_0
-    const-string p0, "content"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 p0, 0x0
 
     throw p0
 .end method
 
 .method public static final create(Lokhttp3/MediaType;Lokio/ByteString;)Lokhttp3/RequestBody;
-    .locals 2
+    .locals 1
 
     sget-object v0, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
 
-    const/4 v1, 0x0
+    if-eqz v0, :cond_0
 
-    if-eqz v0, :cond_1
+    const-string v0, "content"
 
-    if-eqz p1, :cond_0
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ln0/c0;
+    const-string v0, "$this$toRequestBody"
 
-    invoke-direct {v0, p1, p0}, Ln0/c0;-><init>(Lokio/ByteString;Lokhttp3/MediaType;)V
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lo0/c0;
+
+    invoke-direct {v0, p1, p0}, Lo0/c0;-><init>(Lokio/ByteString;Lokhttp3/MediaType;)V
 
     return-object v0
 
     :cond_0
-    const-string p0, "content"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    throw v1
+    throw p0
 .end method
 
 .method public static final create(Lokhttp3/MediaType;[B)Lokhttp3/RequestBody;
@@ -202,11 +195,15 @@
 .end method
 
 .method public static final create(Lokhttp3/MediaType;[BII)Lokhttp3/RequestBody;
-    .locals 1
+    .locals 2
 
     sget-object v0, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
 
-    if-eqz p1, :cond_0
+    if-eqz v0, :cond_0
+
+    const-string v1, "content"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, p1, p0, p2, p3}, Lokhttp3/RequestBody$Companion;->b([BLokhttp3/MediaType;II)Lokhttp3/RequestBody;
 
@@ -215,41 +212,32 @@
     return-object p0
 
     :cond_0
-    const-string p0, "content"
-
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
     const/4 p0, 0x0
 
     throw p0
 .end method
 
 .method public static final create(Lokio/ByteString;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
-    .locals 2
+    .locals 1
 
     sget-object v0, Lokhttp3/RequestBody;->Companion:Lokhttp3/RequestBody$Companion;
 
-    const/4 v1, 0x0
+    if-eqz v0, :cond_0
 
-    if-eqz v0, :cond_1
+    const-string v0, "$this$toRequestBody"
 
-    if-eqz p0, :cond_0
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Ln0/c0;
+    new-instance v0, Lo0/c0;
 
-    invoke-direct {v0, p0, p1}, Ln0/c0;-><init>(Lokio/ByteString;Lokhttp3/MediaType;)V
+    invoke-direct {v0, p0, p1}, Lo0/c0;-><init>(Lokio/ByteString;Lokhttp3/MediaType;)V
 
     return-object v0
 
     :cond_0
-    const-string p0, "$this$toRequestBody"
+    const/4 p0, 0x0
 
-    invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    throw v1
+    throw p0
 .end method
 
 .method public static final create([B)Lokhttp3/RequestBody;
diff --git a/com.discord/smali_classes2/okhttp3/Response$a.smali b/com.discord/smali_classes2/okhttp3/Response$a.smali
index 4417774c8e..51dc4c3b67 100644
--- a/com.discord/smali_classes2/okhttp3/Response$a.smali
+++ b/com.discord/smali_classes2/okhttp3/Response$a.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field public a:Ln0/a0;
+.field public a:Lo0/a0;
 
-.field public b:Ln0/y;
+.field public b:Lo0/y;
 
 .field public c:I
 
 .field public d:Ljava/lang/String;
 
-.field public e:Ln0/v;
+.field public e:Lo0/v;
 
 .field public f:Lokhttp3/Headers$a;
 
@@ -39,7 +39,7 @@
 
 .field public l:J
 
-.field public m:Ln0/g0/d/c;
+.field public m:Lo0/g0/d/c;
 
 
 # direct methods
@@ -64,19 +64,23 @@
 .method public constructor <init>(Lokhttp3/Response;)V
     .locals 2
 
+    const-string v0, "response"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 v0, -0x1
 
     iput v0, p0, Lokhttp3/Response$a;->c:I
 
-    iget-object v0, p1, Lokhttp3/Response;->d:Ln0/a0;
+    iget-object v0, p1, Lokhttp3/Response;->d:Lo0/a0;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->a:Ln0/a0;
+    iput-object v0, p0, Lokhttp3/Response$a;->a:Lo0/a0;
 
-    iget-object v0, p1, Lokhttp3/Response;->e:Ln0/y;
+    iget-object v0, p1, Lokhttp3/Response;->e:Lo0/y;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->b:Ln0/y;
+    iput-object v0, p0, Lokhttp3/Response$a;->b:Lo0/y;
 
     iget v0, p1, Lokhttp3/Response;->g:I
 
@@ -86,9 +90,9 @@
 
     iput-object v0, p0, Lokhttp3/Response$a;->d:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/Response;->h:Ln0/v;
+    iget-object v0, p1, Lokhttp3/Response;->h:Lo0/v;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->e:Ln0/v;
+    iput-object v0, p0, Lokhttp3/Response$a;->e:Lo0/v;
 
     iget-object v0, p1, Lokhttp3/Response;->i:Lokhttp3/Headers;
 
@@ -122,9 +126,9 @@
 
     iput-wide v0, p0, Lokhttp3/Response$a;->l:J
 
-    iget-object p1, p1, Lokhttp3/Response;->p:Ln0/g0/d/c;
+    iget-object p1, p1, Lokhttp3/Response;->p:Lo0/g0/d/c;
 
-    iput-object p1, p0, Lokhttp3/Response$a;->m:Ln0/g0/d/c;
+    iput-object p1, p0, Lokhttp3/Response$a;->m:Lo0/g0/d/c;
 
     return-void
 .end method
@@ -150,11 +154,11 @@
     :goto_0
     if-eqz v1, :cond_4
 
-    iget-object v3, v0, Lokhttp3/Response$a;->a:Ln0/a0;
+    iget-object v3, v0, Lokhttp3/Response$a;->a:Lo0/a0;
 
     if-eqz v3, :cond_3
 
-    iget-object v4, v0, Lokhttp3/Response$a;->b:Ln0/y;
+    iget-object v4, v0, Lokhttp3/Response$a;->b:Lo0/y;
 
     if-eqz v4, :cond_2
 
@@ -164,7 +168,7 @@
 
     iget v6, v0, Lokhttp3/Response$a;->c:I
 
-    iget-object v7, v0, Lokhttp3/Response$a;->e:Ln0/v;
+    iget-object v7, v0, Lokhttp3/Response$a;->e:Lo0/v;
 
     iget-object v1, v0, Lokhttp3/Response$a;->f:Lokhttp3/Headers$a;
 
@@ -184,7 +188,7 @@
 
     iget-wide v1, v0, Lokhttp3/Response$a;->l:J
 
-    iget-object v15, v0, Lokhttp3/Response$a;->m:Ln0/g0/d/c;
+    iget-object v15, v0, Lokhttp3/Response$a;->m:Lo0/g0/d/c;
 
     new-instance v18, Lokhttp3/Response;
 
@@ -198,7 +202,7 @@
 
     move-object/from16 v17, v1
 
-    invoke-direct/range {v2 .. v17}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
+    invoke-direct/range {v2 .. v17}, Lokhttp3/Response;-><init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
 
     return-object v18
 
@@ -413,7 +417,11 @@
 .end method
 
 .method public d(Lokhttp3/Headers;)Lokhttp3/Response$a;
-    .locals 0
+    .locals 1
+
+    const-string v0, "headers"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
 
@@ -425,58 +433,37 @@
 .end method
 
 .method public e(Ljava/lang/String;)Lokhttp3/Response$a;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "message"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lokhttp3/Response$a;->d:Ljava/lang/String;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "message"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public f(Ln0/y;)Lokhttp3/Response$a;
-    .locals 0
+.method public f(Lo0/y;)Lokhttp3/Response$a;
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "protocol"
 
-    iput-object p1, p0, Lokhttp3/Response$a;->b:Ln0/y;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lokhttp3/Response$a;->b:Lo0/y;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "protocol"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
-.method public g(Ln0/a0;)Lokhttp3/Response$a;
-    .locals 0
+.method public g(Lo0/a0;)Lokhttp3/Response$a;
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "request"
 
-    iput-object p1, p0, Lokhttp3/Response$a;->a:Ln0/a0;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lokhttp3/Response$a;->a:Lo0/a0;
 
     return-object p0
-
-    :cond_0
-    const-string p1, "request"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/Response.smali b/com.discord/smali_classes2/okhttp3/Response.smali
index b15a493f3f..756717fa0b 100644
--- a/com.discord/smali_classes2/okhttp3/Response.smali
+++ b/com.discord/smali_classes2/okhttp3/Response.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field public final d:Ln0/a0;
+.field public final d:Lo0/a0;
 
-.field public final e:Ln0/y;
+.field public final e:Lo0/y;
 
 .field public final f:Ljava/lang/String;
 
 .field public final g:I
 
-.field public final h:Ln0/v;
+.field public final h:Lo0/v;
 
 .field public final i:Lokhttp3/Headers;
 
@@ -39,11 +39,11 @@
 
 .field public final o:J
 
-.field public final p:Ln0/g0/d/c;
+.field public final p:Lo0/g0/d/c;
 
 
 # direct methods
-.method public constructor <init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
+.method public constructor <init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
     .locals 6
 
     move-object v0, p0
@@ -56,21 +56,27 @@
 
     move-object v4, p6
 
-    const/4 v5, 0x0
+    const-string v5, "request"
 
-    if-eqz v1, :cond_3
+    invoke-static {p1, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v2, :cond_2
+    const-string v5, "protocol"
 
-    if-eqz v3, :cond_1
+    invoke-static {p2, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v4, :cond_0
+    const-string v5, "message"
+
+    invoke-static {p3, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v5, "headers"
+
+    invoke-static {p6, v5}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v1, v0, Lokhttp3/Response;->d:Ln0/a0;
+    iput-object v1, v0, Lokhttp3/Response;->d:Lo0/a0;
 
-    iput-object v2, v0, Lokhttp3/Response;->e:Ln0/y;
+    iput-object v2, v0, Lokhttp3/Response;->e:Lo0/y;
 
     iput-object v3, v0, Lokhttp3/Response;->f:Ljava/lang/String;
 
@@ -80,7 +86,7 @@
 
     move-object v1, p5
 
-    iput-object v1, v0, Lokhttp3/Response;->h:Ln0/v;
+    iput-object v1, v0, Lokhttp3/Response;->h:Lo0/v;
 
     iput-object v4, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
 
@@ -110,37 +116,9 @@
 
     move-object/from16 v1, p15
 
-    iput-object v1, v0, Lokhttp3/Response;->p:Ln0/g0/d/c;
+    iput-object v1, v0, Lokhttp3/Response;->p:Lo0/g0/d/c;
 
     return-void
-
-    :cond_0
-    const-string v1, "headers"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_1
-    const-string v1, "message"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_2
-    const-string v1, "protocol"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
-
-    :cond_3
-    const-string v1, "request"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v5
 .end method
 
 .method public static a(Lokhttp3/Response;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
@@ -150,6 +128,12 @@
 
     const/4 p2, 0x0
 
+    if-eqz p0, :cond_1
+
+    const-string p3, "name"
+
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object p0, p0, Lokhttp3/Response;->i:Lokhttp3/Headers;
 
     invoke-virtual {p0, p1}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
@@ -162,6 +146,9 @@
 
     :cond_0
     return-object p2
+
+    :cond_1
+    throw p2
 .end method
 
 
@@ -228,7 +215,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/Response;->e:Ln0/y;
+    iget-object v1, p0, Lokhttp3/Response;->e:Lo0/y;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -252,9 +239,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/Response;->d:Ln0/a0;
+    iget-object v1, p0, Lokhttp3/Response;->d:Lo0/a0;
 
-    iget-object v1, v1, Ln0/a0;->b:Ln0/w;
+    iget-object v1, v1, Lo0/a0;->b:Lo0/w;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/okhttp3/ResponseBody$a.smali b/com.discord/smali_classes2/okhttp3/ResponseBody$a.smali
index 8eee0bf6cc..5d2d34b1ad 100644
--- a/com.discord/smali_classes2/okhttp3/ResponseBody$a.smali
+++ b/com.discord/smali_classes2/okhttp3/ResponseBody$a.smali
@@ -19,42 +19,30 @@
 
 .field public e:Ljava/io/Reader;
 
-.field public final f:Lo0/g;
+.field public final f:Lp0/g;
 
 .field public final g:Ljava/nio/charset/Charset;
 
 
 # direct methods
-.method public constructor <init>(Lo0/g;Ljava/nio/charset/Charset;)V
+.method public constructor <init>(Lp0/g;Ljava/nio/charset/Charset;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "source"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
+    const-string v0, "charset"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/io/Reader;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/ResponseBody$a;->f:Lo0/g;
+    iput-object p1, p0, Lokhttp3/ResponseBody$a;->f:Lp0/g;
 
     iput-object p2, p0, Lokhttp3/ResponseBody$a;->g:Ljava/nio/charset/Charset;
 
     return-void
-
-    :cond_0
-    const-string p1, "charset"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    const-string p1, "source"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
 .end method
 
 
@@ -80,9 +68,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/ResponseBody$a;->f:Lo0/g;
+    iget-object v0, p0, Lokhttp3/ResponseBody$a;->f:Lp0/g;
 
-    invoke-interface {v0}, Lo0/w;->close()V
+    invoke-interface {v0}, Lp0/w;->close()V
 
     :goto_0
     return-void
@@ -96,7 +84,9 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_2
+    const-string v0, "cbuf"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, Lokhttp3/ResponseBody$a;->d:Z
 
@@ -111,17 +101,17 @@
     :cond_0
     new-instance v0, Ljava/io/InputStreamReader;
 
-    iget-object v1, p0, Lokhttp3/ResponseBody$a;->f:Lo0/g;
+    iget-object v1, p0, Lokhttp3/ResponseBody$a;->f:Lp0/g;
 
-    invoke-interface {v1}, Lo0/g;->W0()Ljava/io/InputStream;
+    invoke-interface {v1}, Lp0/g;->W0()Ljava/io/InputStream;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/ResponseBody$a;->f:Lo0/g;
+    iget-object v2, p0, Lokhttp3/ResponseBody$a;->f:Lp0/g;
 
     iget-object v3, p0, Lokhttp3/ResponseBody$a;->g:Ljava/nio/charset/Charset;
 
-    invoke-static {v2, v3}, Ln0/g0/b;->x(Lo0/g;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
+    invoke-static {v2, v3}, Lo0/g0/b;->x(Lp0/g;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
     move-result-object v2
 
@@ -144,13 +134,4 @@
     invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
     throw p1
-
-    :cond_2
-    const-string p1, "cbuf"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/ResponseBody.smali b/com.discord/smali_classes2/okhttp3/ResponseBody.smali
index 1dcbc9e824..304d4f3ea5 100644
--- a/com.discord/smali_classes2/okhttp3/ResponseBody.smali
+++ b/com.discord/smali_classes2/okhttp3/ResponseBody.smali
@@ -54,17 +54,17 @@
 .method public abstract b()Lokhttp3/MediaType;
 .end method
 
-.method public abstract c()Lo0/g;
+.method public abstract c()Lp0/g;
 .end method
 
 .method public close()V
     .locals 1
 
-    invoke-virtual {p0}, Lokhttp3/ResponseBody;->c()Lo0/g;
+    invoke-virtual {p0}, Lokhttp3/ResponseBody;->c()Lp0/g;
 
     move-result-object v0
 
-    invoke-static {v0}, Ln0/g0/b;->f(Ljava/io/Closeable;)V
+    invoke-static {v0}, Lo0/g0/b;->f(Ljava/io/Closeable;)V
 
     return-void
 .end method
@@ -77,7 +77,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/ResponseBody;->c()Lo0/g;
+    invoke-virtual {p0}, Lokhttp3/ResponseBody;->c()Lp0/g;
 
     move-result-object v0
 
@@ -88,7 +88,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v2, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object v2, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     invoke-virtual {v1, v2}, Lokhttp3/MediaType;->a(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
@@ -99,14 +99,14 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lj0/t/a;->a:Ljava/nio/charset/Charset;
+    sget-object v1, Lk0/u/a;->a:Ljava/nio/charset/Charset;
 
     :goto_0
-    invoke-static {v0, v1}, Ln0/g0/b;->x(Lo0/g;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
+    invoke-static {v0, v1}, Lo0/g0/b;->x(Lp0/g;Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
     move-result-object v1
 
-    invoke-interface {v0, v1}, Lo0/g;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
+    invoke-interface {v0, v1}, Lp0/g;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
 
     move-result-object v1
     :try_end_0
diff --git a/com.discord/smali_classes2/okhttp3/WebSocketListener.smali b/com.discord/smali_classes2/okhttp3/WebSocketListener.smali
index 045f254017..713e1b79b4 100644
--- a/com.discord/smali_classes2/okhttp3/WebSocketListener.smali
+++ b/com.discord/smali_classes2/okhttp3/WebSocketListener.smali
@@ -17,155 +17,83 @@
 .method public onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     .locals 0
 
-    const/4 p2, 0x0
+    const-string p2, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "reason"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p2
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    return-void
 .end method
 
 .method public onClosing(Lokhttp3/WebSocket;ILjava/lang/String;)V
     .locals 0
 
-    const/4 p2, 0x0
+    const-string p2, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p3, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "reason"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p2
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p2
+    return-void
 .end method
 
 .method public onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
     .locals 0
 
-    const/4 p3, 0x0
+    const-string p3, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, p3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "t"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw p3
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw p3
+    return-void
 .end method
 
 .method public onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "text"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "bytes"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
 
 .method public onOpen(Lokhttp3/WebSocket;Lokhttp3/Response;)V
     .locals 1
 
-    const/4 v0, 0x0
+    const-string v0, "webSocket"
 
-    if-eqz p1, :cond_1
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz p2, :cond_0
-
-    return-void
-
-    :cond_0
     const-string p1, "response"
 
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    throw v0
-
-    :cond_1
-    const-string p1, "webSocket"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v0
+    return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/connection/RouteException.smali b/com.discord/smali_classes2/okhttp3/internal/connection/RouteException.smali
index 1e8b687c1d..4cc87289f4 100644
--- a/com.discord/smali_classes2/okhttp3/internal/connection/RouteException.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/connection/RouteException.smali
@@ -11,7 +11,11 @@
 
 # direct methods
 .method public constructor <init>(Ljava/io/IOException;)V
-    .locals 0
+    .locals 1
+
+    const-string v0, "firstConnectException"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/http2/StreamResetException.smali b/com.discord/smali_classes2/okhttp3/internal/http2/StreamResetException.smali
index 10a9ffdece..a437063110 100644
--- a/com.discord/smali_classes2/okhttp3/internal/http2/StreamResetException.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/http2/StreamResetException.smali
@@ -4,14 +4,16 @@
 
 
 # instance fields
-.field public final errorCode:Ln0/g0/g/a;
+.field public final errorCode:Lo0/g0/g/a;
 
 
 # direct methods
-.method public constructor <init>(Ln0/g0/g/a;)V
+.method public constructor <init>(Lo0/g0/g/a;)V
     .locals 2
 
-    if-eqz p1, :cond_0
+    const-string v0, "errorCode"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -29,16 +31,7 @@
 
     invoke-direct {p0, v0}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
 
-    iput-object p1, p0, Lokhttp3/internal/http2/StreamResetException;->errorCode:Ln0/g0/g/a;
+    iput-object p1, p0, Lokhttp3/internal/http2/StreamResetException;->errorCode:Lo0/g0/g/a;
 
     return-void
-
-    :cond_0
-    const-string p1, "errorCode"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase$a.smali b/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase$a.smali
index fc1b65a89d..59c235b1f8 100644
--- a/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase$a.smali
@@ -105,7 +105,7 @@
 
     aget-byte v15, v15, v12
 
-    invoke-static {v15, v14}, Ln0/g0/b;->a(BI)I
+    invoke-static {v15, v14}, Lo0/g0/b;->a(BI)I
 
     move-result v15
 
@@ -120,7 +120,7 @@
 
     aget-byte v3, v0, v16
 
-    invoke-static {v3, v14}, Ln0/g0/b;->a(BI)I
+    invoke-static {v3, v14}, Lo0/g0/b;->a(BI)I
 
     move-result v3
 
@@ -209,7 +209,7 @@
 
     const-string v2, "UTF_8"
 
-    invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v2, Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali b/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
index 44c885e55e..1ea74c8ea0 100644
--- a/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/publicsuffix/PublicSuffixDatabase.smali
@@ -115,33 +115,33 @@
 
     move-object/from16 v2, p1
 
-    const/4 v3, 0x0
+    const-string v0, "domain"
 
-    if-eqz v2, :cond_17
+    invoke-static {v2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static/range {p1 .. p1}, Ljava/net/IDN;->toUnicode(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    const-string v4, "unicodeDomain"
+    const-string v3, "unicodeDomain"
 
-    invoke-static {v0, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
-    new-array v5, v4, [C
+    new-array v4, v3, [C
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    const/16 v7, 0x2e
+    const/16 v6, 0x2e
 
-    aput-char v7, v5, v6
+    aput-char v6, v4, v5
 
-    const/4 v8, 0x6
+    const/4 v7, 0x6
 
-    invoke-static {v0, v5, v6, v6, v8}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {v0, v4, v5, v5, v7}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
-    move-result-object v5
+    move-result-object v4
 
     iget-object v0, v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a:Ljava/util/concurrent/atomic/AtomicBoolean;
 
@@ -153,13 +153,13 @@
 
     iget-object v0, v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->a:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-virtual {v0, v6, v4}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+    invoke-virtual {v0, v5, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     :goto_0
     :try_start_0
@@ -169,7 +169,7 @@
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    if-eqz v9, :cond_2
+    if-eqz v8, :cond_2
 
     :try_start_1
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
@@ -192,19 +192,19 @@
     move-exception v0
 
     :try_start_2
-    sget-object v10, Ln0/g0/h/f;->c:Ln0/g0/h/f$a;
+    sget-object v9, Lo0/g0/h/f;->c:Lo0/g0/h/f$a;
 
-    sget-object v10, Ln0/g0/h/f;->a:Ln0/g0/h/f;
+    sget-object v9, Lo0/g0/h/f;->a:Lo0/g0/h/f;
 
-    const/4 v11, 0x5
+    const/4 v10, 0x5
 
-    const-string v12, "Failed to read public suffix list"
+    const-string v11, "Failed to read public suffix list"
 
-    invoke-virtual {v10, v11, v12, v0}, Ln0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
+    invoke-virtual {v9, v10, v11, v0}, Lo0/g0/h/f;->k(ILjava/lang/String;Ljava/lang/Throwable;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    if-eqz v9, :cond_2
+    if-eqz v8, :cond_2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -220,12 +220,12 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    const/4 v9, 0x1
+    const/4 v8, 0x1
 
     goto :goto_0
 
     :goto_1
-    if-eqz v9, :cond_0
+    if-eqz v8, :cond_0
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
@@ -269,42 +269,42 @@
     :goto_3
     if-eqz v0, :cond_16
 
-    invoke-interface {v5}, Ljava/util/List;->size()I
+    invoke-interface {v4}, Ljava/util/List;->size()I
 
     move-result v0
 
-    new-array v9, v0, [[B
+    new-array v8, v0, [[B
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
     :goto_4
-    if-ge v10, v0, :cond_5
+    if-ge v9, v0, :cond_5
 
-    invoke-interface {v5, v10}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v4, v9}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    move-result-object v11
+    move-result-object v10
 
-    check-cast v11, Ljava/lang/String;
+    check-cast v10, Ljava/lang/String;
 
-    sget-object v12, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
+    sget-object v11, Ljava/nio/charset/StandardCharsets;->UTF_8:Ljava/nio/charset/Charset;
 
-    const-string v13, "UTF_8"
+    const-string v12, "UTF_8"
 
-    invoke-static {v12, v13}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v11, v12}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    if-eqz v11, :cond_4
+    if-eqz v10, :cond_4
 
-    invoke-virtual {v11, v12}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+    invoke-virtual {v10, v11}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
-    move-result-object v11
+    move-result-object v10
 
-    const-string v12, "(this as java.lang.String).getBytes(charset)"
+    const-string v11, "(this as java.lang.String).getBytes(charset)"
 
-    invoke-static {v11, v12}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v11}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    aput-object v11, v9, v10
+    aput-object v10, v8, v9
 
-    add-int/lit8 v10, v10, 0x1
+    add-int/lit8 v9, v9, 0x1
 
     goto :goto_4
 
@@ -318,12 +318,14 @@
     throw v0
 
     :cond_5
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
     :goto_5
-    const-string v11, "publicSuffixListBytes"
+    const-string v10, "publicSuffixListBytes"
 
-    if-ge v10, v0, :cond_8
+    const/4 v11, 0x0
+
+    if-ge v9, v0, :cond_8
 
     sget-object v12, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->h:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;
 
@@ -331,7 +333,7 @@
 
     if-eqz v13, :cond_7
 
-    invoke-static {v12, v13, v9, v10}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;->a(Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;[B[[BI)Ljava/lang/String;
+    invoke-static {v12, v13, v8, v9}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;->a(Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;[B[[BI)Ljava/lang/String;
 
     move-result-object v12
 
@@ -340,30 +342,30 @@
     goto :goto_6
 
     :cond_6
-    add-int/lit8 v10, v10, 0x1
+    add-int/lit8 v9, v9, 0x1
 
     goto :goto_5
 
     :cond_7
-    invoke-static {v11}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v10}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v3
+    throw v11
 
     :cond_8
-    move-object v12, v3
+    move-object v12, v11
 
     :goto_6
-    if-le v0, v4, :cond_b
+    if-le v0, v3, :cond_b
 
-    invoke-virtual {v9}, Ljava/lang/Object;->clone()Ljava/lang/Object;
+    invoke-virtual {v8}, Ljava/lang/Object;->clone()Ljava/lang/Object;
 
-    move-result-object v10
+    move-result-object v9
 
-    check-cast v10, [[B
+    check-cast v9, [[B
 
-    array-length v13, v10
+    array-length v13, v9
 
-    sub-int/2addr v13, v4
+    sub-int/2addr v13, v3
 
     const/4 v14, 0x0
 
@@ -372,235 +374,235 @@
 
     sget-object v15, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->e:[B
 
-    aput-object v15, v10, v14
+    aput-object v15, v9, v14
 
     sget-object v15, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->h:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;
 
-    iget-object v8, v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->c:[B
+    iget-object v7, v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->c:[B
 
-    if-eqz v8, :cond_a
+    if-eqz v7, :cond_a
 
-    invoke-static {v15, v8, v10, v14}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;->a(Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;[B[[BI)Ljava/lang/String;
+    invoke-static {v15, v7, v9, v14}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;->a(Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;[B[[BI)Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    if-eqz v8, :cond_9
+    if-eqz v7, :cond_9
 
     goto :goto_8
 
     :cond_9
     add-int/lit8 v14, v14, 0x1
 
-    const/4 v8, 0x6
+    const/4 v7, 0x6
 
     goto :goto_7
 
     :cond_a
-    invoke-static {v11}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v10}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v3
+    throw v11
 
     :cond_b
-    move-object v8, v3
+    move-object v7, v11
 
     :goto_8
-    if-eqz v8, :cond_e
+    if-eqz v7, :cond_e
 
-    sub-int/2addr v0, v4
+    sub-int/2addr v0, v3
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
     :goto_9
-    if-ge v10, v0, :cond_e
+    if-ge v9, v0, :cond_e
 
-    sget-object v11, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->h:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;
+    sget-object v10, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->h:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;
 
     iget-object v13, v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->d:[B
 
     if-eqz v13, :cond_d
 
-    invoke-static {v11, v13, v9, v10}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;->a(Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;[B[[BI)Ljava/lang/String;
+    invoke-static {v10, v13, v8, v9}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;->a(Lokhttp3/internal/publicsuffix/PublicSuffixDatabase$a;[B[[BI)Ljava/lang/String;
 
-    move-result-object v11
+    move-result-object v10
 
-    if-eqz v11, :cond_c
+    if-eqz v10, :cond_c
 
     goto :goto_a
 
     :cond_c
-    add-int/lit8 v10, v10, 0x1
+    add-int/lit8 v9, v9, 0x1
 
     goto :goto_9
 
     :cond_d
     const-string v0, "publicSuffixExceptionListBytes"
 
-    invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v0}, Lk0/o/c/i;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v3
+    throw v11
 
     :cond_e
-    move-object v11, v3
+    move-object v10, v11
 
     :goto_a
     const/16 v0, 0x21
 
-    if-eqz v11, :cond_f
+    if-eqz v10, :cond_f
 
-    new-instance v8, Ljava/lang/StringBuilder;
+    new-instance v7, Ljava/lang/StringBuilder;
 
-    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
+    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v7, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v8
+    move-result-object v7
 
-    new-array v9, v4, [C
+    new-array v8, v3, [C
 
-    aput-char v7, v9, v6
+    aput-char v6, v8, v5
 
-    const/4 v10, 0x6
+    const/4 v9, 0x6
 
-    invoke-static {v8, v9, v6, v6, v10}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {v7, v8, v5, v5, v9}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
-    move-result-object v8
+    move-result-object v7
 
     goto :goto_d
 
     :cond_f
-    const/4 v10, 0x6
+    const/4 v9, 0x6
 
     if-nez v12, :cond_10
 
-    if-nez v8, :cond_10
+    if-nez v7, :cond_10
 
-    sget-object v8, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->f:Ljava/util/List;
+    sget-object v7, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->f:Ljava/util/List;
 
     goto :goto_d
 
     :cond_10
     if-eqz v12, :cond_11
 
-    new-array v9, v4, [C
+    new-array v8, v3, [C
 
-    aput-char v7, v9, v6
+    aput-char v6, v8, v5
 
-    invoke-static {v12, v9, v6, v6, v10}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {v12, v8, v5, v5, v9}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
-    move-result-object v9
+    move-result-object v8
 
     goto :goto_b
 
     :cond_11
-    sget-object v9, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v8, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_b
-    if-eqz v8, :cond_12
+    if-eqz v7, :cond_12
 
-    new-array v11, v4, [C
+    new-array v10, v3, [C
 
-    aput-char v7, v11, v6
+    aput-char v6, v10, v5
 
-    invoke-static {v8, v11, v6, v6, v10}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {v7, v10, v5, v5, v9}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
-    move-result-object v8
+    move-result-object v7
 
     goto :goto_c
 
     :cond_12
-    sget-object v8, Lj0/i/n;->d:Lj0/i/n;
+    sget-object v7, Lk0/j/n;->d:Lk0/j/n;
 
     :goto_c
-    invoke-interface {v9}, Ljava/util/List;->size()I
+    invoke-interface {v8}, Ljava/util/List;->size()I
+
+    move-result v9
+
+    invoke-interface {v7}, Ljava/util/List;->size()I
 
     move-result v10
 
-    invoke-interface {v8}, Ljava/util/List;->size()I
+    if-le v9, v10, :cond_13
 
-    move-result v11
-
-    if-le v10, v11, :cond_13
-
-    move-object v8, v9
+    move-object v7, v8
 
     :cond_13
     :goto_d
-    invoke-interface {v5}, Ljava/util/List;->size()I
+    invoke-interface {v4}, Ljava/util/List;->size()I
+
+    move-result v8
+
+    invoke-interface {v7}, Ljava/util/List;->size()I
 
     move-result v9
 
-    invoke-interface {v8}, Ljava/util/List;->size()I
+    if-ne v8, v9, :cond_14
 
-    move-result v10
+    invoke-interface {v7, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    if-ne v9, v10, :cond_14
+    move-result-object v8
 
-    invoke-interface {v8, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    check-cast v8, Ljava/lang/String;
 
-    move-result-object v9
+    invoke-virtual {v8, v5}, Ljava/lang/String;->charAt(I)C
 
-    check-cast v9, Ljava/lang/String;
+    move-result v8
 
-    invoke-virtual {v9, v6}, Ljava/lang/String;->charAt(I)C
+    if-eq v8, v0, :cond_14
 
-    move-result v9
-
-    if-eq v9, v0, :cond_14
-
-    return-object v3
+    return-object v11
 
     :cond_14
-    invoke-interface {v8, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    invoke-interface {v7, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v8
 
-    check-cast v3, Ljava/lang/String;
+    check-cast v8, Ljava/lang/String;
 
-    invoke-virtual {v3, v6}, Ljava/lang/String;->charAt(I)C
+    invoke-virtual {v8, v5}, Ljava/lang/String;->charAt(I)C
 
-    move-result v3
+    move-result v8
 
-    if-ne v3, v0, :cond_15
+    if-ne v8, v0, :cond_15
 
-    invoke-interface {v5}, Ljava/util/List;->size()I
+    invoke-interface {v4}, Ljava/util/List;->size()I
 
     move-result v0
 
-    invoke-interface {v8}, Ljava/util/List;->size()I
+    invoke-interface {v7}, Ljava/util/List;->size()I
 
-    move-result v3
+    move-result v4
 
     goto :goto_e
 
     :cond_15
-    invoke-interface {v5}, Ljava/util/List;->size()I
+    invoke-interface {v4}, Ljava/util/List;->size()I
 
     move-result v0
 
-    invoke-interface {v8}, Ljava/util/List;->size()I
+    invoke-interface {v7}, Ljava/util/List;->size()I
 
-    move-result v3
+    move-result v4
 
-    add-int/2addr v3, v4
+    add-int/2addr v4, v3
 
     :goto_e
-    sub-int/2addr v0, v3
+    sub-int/2addr v0, v4
 
-    new-array v3, v4, [C
+    new-array v3, v3, [C
 
-    aput-char v7, v3, v6
+    aput-char v6, v3, v5
 
     const/4 v4, 0x6
 
-    invoke-static {v2, v3, v6, v6, v4}, Lj0/t/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
+    invoke-static {v2, v3, v5, v5, v4}, Lk0/u/p;->split$default(Ljava/lang/CharSequence;[CZII)Ljava/util/List;
 
     move-result-object v2
 
-    invoke-static {v2}, Lj0/i/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
+    invoke-static {v2}, Lk0/j/l;->asSequence(Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
 
     move-result-object v2
 
@@ -640,13 +642,6 @@
     invoke-direct {v0, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
 
     throw v0
-
-    :cond_17
-    const-string v0, "domain"
-
-    invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v3
 .end method
 
 .method public final b()V
@@ -667,36 +662,48 @@
 
     if-eqz v0, :cond_2
 
-    new-instance v1, Lo0/k;
+    new-instance v1, Lp0/k;
 
-    invoke-static {v0}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
+    const-string v2, "$receiver"
 
-    move-result-object v0
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {v1, v0}, Lo0/k;-><init>(Lo0/w;)V
+    new-instance v2, Lp0/m;
 
-    invoke-static {v1}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
+    new-instance v3, Lp0/x;
 
-    move-result-object v0
+    invoke-direct {v3}, Lp0/x;-><init>()V
+
+    invoke-direct {v2, v0, v3}, Lp0/m;-><init>(Ljava/io/InputStream;Lp0/x;)V
+
+    invoke-direct {v1, v2}, Lp0/k;-><init>(Lp0/w;)V
+
+    const-string v0, "$receiver"
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lp0/q;
+
+    invoke-direct {v0, v1}, Lp0/q;-><init>(Lp0/w;)V
 
     :try_start_0
-    invoke-interface {v0}, Lo0/g;->readInt()I
+    invoke-interface {v0}, Lp0/g;->readInt()I
 
     move-result v1
 
     int-to-long v1, v1
 
-    invoke-interface {v0, v1, v2}, Lo0/g;->t0(J)[B
+    invoke-interface {v0, v1, v2}, Lp0/g;->t0(J)[B
 
     move-result-object v1
 
-    invoke-interface {v0}, Lo0/g;->readInt()I
+    invoke-interface {v0}, Lp0/g;->readInt()I
 
     move-result v2
 
     int-to-long v2, v2
 
-    invoke-interface {v0, v2, v3}, Lo0/g;->t0(J)[B
+    invoke-interface {v0, v2, v3}, Lp0/g;->t0(J)[B
 
     move-result-object v2
     :try_end_0
@@ -729,7 +736,7 @@
 
     :cond_0
     :try_start_2
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -742,7 +749,7 @@
 
     :cond_1
     :try_start_3
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
diff --git a/com.discord/smali_classes2/okio/BufferedSink.smali b/com.discord/smali_classes2/okio/BufferedSink.smali
index b318cd069f..bf396fa6ac 100644
--- a/com.discord/smali_classes2/okio/BufferedSink.smali
+++ b/com.discord/smali_classes2/okio/BufferedSink.smali
@@ -3,7 +3,7 @@
 .source "BufferedSink.kt"
 
 # interfaces
-.implements Lo0/u;
+.implements Lp0/u;
 .implements Ljava/nio/channels/WritableByteChannel;
 
 
@@ -32,10 +32,10 @@
     .end annotation
 .end method
 
-.method public abstract h()Lo0/e;
+.method public abstract h()Lp0/e;
 .end method
 
-.method public abstract i0(Lo0/w;)J
+.method public abstract i0(Lp0/w;)J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali_classes2/okio/ByteString$a.smali b/com.discord/smali_classes2/okio/ByteString$a.smali
index 4acc65dc14..5a1a830805 100644
--- a/com.discord/smali_classes2/okio/ByteString$a.smali
+++ b/com.discord/smali_classes2/okio/ByteString$a.smali
@@ -42,6 +42,10 @@
     array-length p3, p1
 
     :cond_1
+    const-string p0, "$receiver"
+
+    invoke-static {p1, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     array-length p0, p1
 
     int-to-long v1, p0
@@ -50,10 +54,18 @@
 
     int-to-long v5, p3
 
-    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->t(JJJ)V
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
 
     new-array p0, p3, [B
 
+    const-string p4, "src"
+
+    invoke-static {p1, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p4, "dest"
+
+    invoke-static {p0, p4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     invoke-static {p1, p2, p0, v0, p3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
     new-instance p1, Lokio/ByteString;
@@ -66,9 +78,13 @@
 
 # virtual methods
 .method public final a(Ljava/lang/String;)Lokio/ByteString;
-    .locals 0
+    .locals 1
 
-    invoke-static {p1}, Lo0/y/a;->c(Ljava/lang/String;)Lokio/ByteString;
+    const-string v0, "$receiver"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lp0/y/a;->c(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p1
 
@@ -76,22 +92,15 @@
 .end method
 
 .method public final b(Ljava/lang/String;)Lokio/ByteString;
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "$receiver"
 
-    invoke-static {p1}, Lo0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lp0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p1
 
     return-object p1
-
-    :cond_0
-    const-string p1, "$receiver"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
diff --git a/com.discord/smali_classes2/okio/ByteString.smali b/com.discord/smali_classes2/okio/ByteString.smali
index d3b3236ba7..9613b49ff3 100644
--- a/com.discord/smali_classes2/okio/ByteString.smali
+++ b/com.discord/smali_classes2/okio/ByteString.smali
@@ -53,7 +53,7 @@
 
     sput-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
 
-    sget-object v0, Lo0/y/a;->b:Lokio/ByteString;
+    sget-object v0, Lp0/y/a;->b:Lokio/ByteString;
 
     sput-object v0, Lokio/ByteString;->f:Lokio/ByteString;
 
@@ -61,30 +61,27 @@
 .end method
 
 .method public constructor <init>([B)V
-    .locals 0
+    .locals 1
 
-    if-eqz p1, :cond_0
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lokio/ByteString;->data:[B
 
     return-void
-
-    :cond_0
-    const-string p1, "data"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public static final g(Ljava/lang/String;)Lokio/ByteString;
-    .locals 0
+    .locals 1
 
-    invoke-static {p0}, Lo0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Lp0/y/a;->d(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p0
 
@@ -103,6 +100,10 @@
 
     move-result v0
 
+    const-string v1, "$receiver"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const/4 v1, 0x1
 
     const/4 v2, 0x0
@@ -160,7 +161,7 @@
 
     const-string v2, "field"
 
-    invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V
 
@@ -212,32 +213,25 @@
 
 # virtual methods
 .method public compareTo(Ljava/lang/Object;)I
-    .locals 0
+    .locals 1
 
     check-cast p1, Lokio/ByteString;
 
-    if-eqz p1, :cond_0
+    const-string v0, "other"
 
-    invoke-static {p0, p1}, Lo0/y/a;->b(Lokio/ByteString;Lokio/ByteString;)I
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1}, Lp0/y/a;->b(Lokio/ByteString;Lokio/ByteString;)I
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-static {p0, p1}, Lo0/y/a;->e(Lokio/ByteString;Ljava/lang/Object;)Z
+    invoke-static {p0, p1}, Lp0/y/a;->e(Lokio/ByteString;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -247,6 +241,10 @@
 .method public f(Ljava/lang/String;)Lokio/ByteString;
     .locals 2
 
+    const-string v0, "algorithm"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lokio/ByteString;
 
     invoke-static {p1}, Ljava/security/MessageDigest;->getInstance(Ljava/lang/String;)Ljava/security/MessageDigest;
@@ -261,7 +259,7 @@
 
     const-string v1, "MessageDigest.getInstance(algorithm).digest(data)"
 
-    invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {v0, p1}, Lokio/ByteString;-><init>([B)V
 
@@ -271,7 +269,7 @@
 .method public h()I
     .locals 1
 
-    invoke-static {p0}, Lo0/y/a;->g(Lokio/ByteString;)I
+    invoke-static {p0}, Lp0/y/a;->g(Lokio/ByteString;)I
 
     move-result v0
 
@@ -281,7 +279,7 @@
 .method public hashCode()I
     .locals 1
 
-    invoke-static {p0}, Lo0/y/a;->h(Lokio/ByteString;)I
+    invoke-static {p0}, Lp0/y/a;->h(Lokio/ByteString;)I
 
     move-result v0
 
@@ -291,7 +289,7 @@
 .method public i()Ljava/lang/String;
     .locals 1
 
-    invoke-static {p0}, Lo0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
+    invoke-static {p0}, Lp0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -301,7 +299,7 @@
 .method public j()[B
     .locals 1
 
-    invoke-static {p0}, Lo0/y/a;->j(Lokio/ByteString;)[B
+    invoke-static {p0}, Lp0/y/a;->j(Lokio/ByteString;)[B
 
     move-result-object v0
 
@@ -311,7 +309,7 @@
 .method public k(I)B
     .locals 0
 
-    invoke-static {p0, p1}, Lo0/y/a;->f(Lokio/ByteString;I)B
+    invoke-static {p0, p1}, Lp0/y/a;->f(Lokio/ByteString;I)B
 
     move-result p1
 
@@ -319,9 +317,13 @@
 .end method
 
 .method public l(ILokio/ByteString;II)Z
-    .locals 0
+    .locals 1
 
-    invoke-static {p0, p1, p2, p3, p4}, Lo0/y/a;->l(Lokio/ByteString;ILokio/ByteString;II)Z
+    const-string v0, "other"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2, p3, p4}, Lp0/y/a;->l(Lokio/ByteString;ILokio/ByteString;II)Z
 
     move-result p1
 
@@ -329,30 +331,23 @@
 .end method
 
 .method public m(I[BII)Z
-    .locals 0
+    .locals 1
 
-    if-eqz p2, :cond_0
+    const-string v0, "other"
 
-    invoke-static {p0, p1, p2, p3, p4}, Lo0/y/a;->m(Lokio/ByteString;I[BII)Z
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0, p1, p2, p3, p4}, Lp0/y/a;->m(Lokio/ByteString;I[BII)Z
 
     move-result p1
 
     return p1
-
-    :cond_0
-    const-string p1, "other"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public n()Lokio/ByteString;
     .locals 1
 
-    invoke-static {p0}, Lo0/y/a;->o(Lokio/ByteString;)Lokio/ByteString;
+    invoke-static {p0}, Lp0/y/a;->o(Lokio/ByteString;)Lokio/ByteString;
 
     move-result-object v0
 
@@ -367,6 +362,10 @@
         }
     .end annotation
 
+    const-string v0, "out"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lokio/ByteString;->data:[B
 
     invoke-virtual {p1, v0}, Ljava/io/OutputStream;->write([B)V
@@ -374,16 +373,20 @@
     return-void
 .end method
 
-.method public p(Lo0/e;)V
+.method public p(Lp0/e;)V
     .locals 3
 
+    const-string v0, "buffer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lokio/ByteString;->data:[B
 
-    const/4 v1, 0x0
+    array-length v1, v0
 
-    array-length v2, v0
+    const/4 v2, 0x0
 
-    invoke-virtual {p1, v0, v1, v2}, Lo0/e;->G([BII)Lo0/e;
+    invoke-virtual {p1, v0, v2, v1}, Lp0/e;->G([BII)Lp0/e;
 
     return-void
 .end method
@@ -391,7 +394,7 @@
 .method public toString()Ljava/lang/String;
     .locals 1
 
-    invoke-static {p0}, Lo0/y/a;->p(Lokio/ByteString;)Ljava/lang/String;
+    invoke-static {p0}, Lp0/y/a;->p(Lokio/ByteString;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/org/webrtc/AndroidVideoDecoder.smali b/com.discord/smali_classes2/org/webrtc/AndroidVideoDecoder.smali
index c38cdd5922..632a838894 100644
--- a/com.discord/smali_classes2/org/webrtc/AndroidVideoDecoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/AndroidVideoDecoder.smali
@@ -1517,7 +1517,7 @@
     .annotation build Lorg/webrtc/CalledByNative;
     .end annotation
 
-    invoke-static {p0}, Lp0/c/k0;->$default$createNativeVideoDecoder(Lorg/webrtc/VideoDecoder;)J
+    invoke-static {p0}, Lq0/c/k0;->$default$createNativeVideoDecoder(Lorg/webrtc/VideoDecoder;)J
 
     move-result-wide v0
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali b/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali
index fc652d3f9d..efba26c504 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Session$2.smali
@@ -68,9 +68,9 @@
 
     move-result-object v0
 
-    new-instance v1, Lp0/c/c;
+    new-instance v1, Lq0/c/c;
 
-    invoke-direct {v1, p0, p1}, Lp0/c/c;-><init>(Lorg/webrtc/Camera1Session$2;[B)V
+    invoke-direct {v1, p0, p1}, Lq0/c/c;-><init>(Lorg/webrtc/Camera1Session$2;[B)V
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -187,9 +187,9 @@
 
     iget v3, v3, Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;->height:I
 
-    new-instance v4, Lp0/c/d;
+    new-instance v4, Lq0/c/d;
 
-    invoke-direct {v4, p0, p1}, Lp0/c/d;-><init>(Lorg/webrtc/Camera1Session$2;[B)V
+    invoke-direct {v4, p0, p1}, Lq0/c/d;-><init>(Lorg/webrtc/Camera1Session$2;[B)V
 
     invoke-direct {p2, p1, v2, v3, v4}, Lorg/webrtc/NV21Buffer;-><init>([BIILjava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera1Session.smali b/com.discord/smali_classes2/org/webrtc/Camera1Session.smali
index b50414c044..bf1dcc5fa2 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera1Session.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera1Session.smali
@@ -583,7 +583,7 @@
 
     iget-object v0, p0, Lorg/webrtc/Camera1Session;->applicationContext:Landroid/content/Context;
 
-    invoke-static {v0}, Lp0/c/g0;->b(Landroid/content/Context;)I
+    invoke-static {v0}, Lq0/c/g0;->b(Landroid/content/Context;)I
 
     move-result v0
 
@@ -626,9 +626,9 @@
 
     iget-object v0, p0, Lorg/webrtc/Camera1Session;->surfaceTextureHelper:Lorg/webrtc/SurfaceTextureHelper;
 
-    new-instance v1, Lp0/c/e;
+    new-instance v1, Lq0/c/e;
 
-    invoke-direct {v1, p0}, Lp0/c/e;-><init>(Lorg/webrtc/Camera1Session;)V
+    invoke-direct {v1, p0}, Lq0/c/e;-><init>(Lorg/webrtc/Camera1Session;)V
 
     invoke-virtual {v0, v1}, Lorg/webrtc/SurfaceTextureHelper;->startListening(Lorg/webrtc/VideoSink;)V
 
@@ -881,7 +881,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-static {v2, v1, v4}, Lp0/c/g0;->a(Lorg/webrtc/TextureBufferImpl;ZI)Lorg/webrtc/VideoFrame$TextureBuffer;
+    invoke-static {v2, v1, v4}, Lq0/c/g0;->a(Lorg/webrtc/TextureBufferImpl;ZI)Lorg/webrtc/VideoFrame$TextureBuffer;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali
index dfb4a52e3f..1786602b13 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session$CaptureSessionCallback.smali
@@ -301,7 +301,7 @@
 
     neg-int v3, v3
 
-    invoke-static {v1, v2, v3}, Lp0/c/g0;->a(Lorg/webrtc/TextureBufferImpl;ZI)Lorg/webrtc/VideoFrame$TextureBuffer;
+    invoke-static {v1, v2, v3}, Lq0/c/g0;->a(Lorg/webrtc/TextureBufferImpl;ZI)Lorg/webrtc/VideoFrame$TextureBuffer;
 
     move-result-object v1
 
@@ -486,9 +486,9 @@
 
     move-result-object p1
 
-    new-instance v1, Lp0/c/f;
+    new-instance v1, Lq0/c/f;
 
-    invoke-direct {v1, p0}, Lp0/c/f;-><init>(Lorg/webrtc/Camera2Session$CaptureSessionCallback;)V
+    invoke-direct {v1, p0}, Lq0/c/f;-><init>(Lorg/webrtc/Camera2Session$CaptureSessionCallback;)V
 
     invoke-virtual {p1, v1}, Lorg/webrtc/SurfaceTextureHelper;->startListening(Lorg/webrtc/VideoSink;)V
 
diff --git a/com.discord/smali_classes2/org/webrtc/Camera2Session.smali b/com.discord/smali_classes2/org/webrtc/Camera2Session.smali
index aeced24bc1..0aa838810e 100644
--- a/com.discord/smali_classes2/org/webrtc/Camera2Session.smali
+++ b/com.discord/smali_classes2/org/webrtc/Camera2Session.smali
@@ -581,7 +581,7 @@
 
     iget-object v0, p0, Lorg/webrtc/Camera2Session;->applicationContext:Landroid/content/Context;
 
-    invoke-static {v0}, Lp0/c/g0;->b(Landroid/content/Context;)I
+    invoke-static {v0}, Lq0/c/g0;->b(Landroid/content/Context;)I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali b/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali
index 68a2b84f5e..636f686a67 100644
--- a/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali
+++ b/com.discord/smali_classes2/org/webrtc/CameraCapturer.smali
@@ -675,7 +675,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {p0, p1, p2}, Lp0/c/h0;->$default$addMediaRecorderToCamera(Lorg/webrtc/CameraVideoCapturer;Landroid/media/MediaRecorder;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
+    invoke-static {p0, p1, p2}, Lq0/c/h0;->$default$addMediaRecorderToCamera(Lorg/webrtc/CameraVideoCapturer;Landroid/media/MediaRecorder;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
 
     return-void
 .end method
@@ -866,7 +866,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {p0, p1}, Lp0/c/h0;->$default$removeMediaRecorderFromCamera(Lorg/webrtc/CameraVideoCapturer;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
+    invoke-static {p0, p1}, Lq0/c/h0;->$default$removeMediaRecorderFromCamera(Lorg/webrtc/CameraVideoCapturer;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali b/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali
index 9439028bf8..e7ff1ff232 100644
--- a/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/DefaultVideoDecoderFactory.smali
@@ -68,7 +68,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {p0, p1}, Lp0/c/l0;->$default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
+    invoke-static {p0, p1}, Lq0/c/l0;->$default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/org/webrtc/EglHelper.smali b/com.discord/smali_classes2/org/webrtc/EglHelper.smali
index c8d28d35ed..759b424058 100644
--- a/com.discord/smali_classes2/org/webrtc/EglHelper.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglHelper.smali
@@ -15,7 +15,7 @@
 .method public static create()Lorg/webrtc/EglBase;
     .locals 1
 
-    invoke-static {}, Lp0/c/i0;->a()Lorg/webrtc/EglBase;
+    invoke-static {}, Lq0/c/i0;->a()Lorg/webrtc/EglBase;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/org/webrtc/EglRenderer.smali b/com.discord/smali_classes2/org/webrtc/EglRenderer.smali
index 5f14adcf51..54121416db 100644
--- a/com.discord/smali_classes2/org/webrtc/EglRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/EglRenderer.smali
@@ -1188,7 +1188,7 @@
 .method public addFrameListener(Lorg/webrtc/EglRenderer$FrameListener;FLorg/webrtc/RendererCommon$GlDrawer;Z)V
     .locals 7
 
-    new-instance v6, Lp0/c/k;
+    new-instance v6, Lq0/c/k;
 
     move-object v0, v6
 
@@ -1202,7 +1202,7 @@
 
     move v5, p4
 
-    invoke-direct/range {v0 .. v5}, Lp0/c/k;-><init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/RendererCommon$GlDrawer;Lorg/webrtc/EglRenderer$FrameListener;FZ)V
+    invoke-direct/range {v0 .. v5}, Lq0/c/k;-><init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/RendererCommon$GlDrawer;Lorg/webrtc/EglRenderer$FrameListener;FZ)V
 
     invoke-direct {p0, v6}, Lorg/webrtc/EglRenderer;->postToRenderThread(Ljava/lang/Runnable;)V
 
@@ -1226,7 +1226,7 @@
 
     invoke-direct {p0, p1}, Lorg/webrtc/EglRenderer;->logD(Ljava/lang/String;)V
 
-    invoke-static {p2}, Lp0/c/i0;->d([I)Lorg/webrtc/EglBase;
+    invoke-static {p2}, Lq0/c/i0;->d([I)Lorg/webrtc/EglBase;
 
     move-result-object p1
 
@@ -1239,7 +1239,7 @@
 
     invoke-direct {p0, v0}, Lorg/webrtc/EglRenderer;->logD(Ljava/lang/String;)V
 
-    invoke-static {p1, p2}, Lp0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
+    invoke-static {p1, p2}, Lq0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
 
     move-result-object p1
 
@@ -1278,7 +1278,7 @@
     :cond_0
     iget-object v1, p0, Lorg/webrtc/EglRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance v8, Lp0/c/m;
+    new-instance v8, Lq0/c/m;
 
     move-object v2, v8
 
@@ -1292,7 +1292,7 @@
 
     move v7, p4
 
-    invoke-direct/range {v2 .. v7}, Lp0/c/m;-><init>(Lorg/webrtc/EglRenderer;FFFF)V
+    invoke-direct/range {v2 .. v7}, Lq0/c/m;-><init>(Lorg/webrtc/EglRenderer;FFFF)V
 
     invoke-virtual {v1, v8}, Landroid/os/Handler;->postAtFrontOfQueue(Ljava/lang/Runnable;)Z
 
@@ -1520,9 +1520,9 @@
 
     iput-object p4, p0, Lorg/webrtc/EglRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance p3, Lp0/c/i;
+    new-instance p3, Lq0/c/i;
 
-    invoke-direct {p3, p0, p1, p2}, Lp0/c/i;-><init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/EglBase$Context;[I)V
+    invoke-direct {p3, p0, p1, p2}, Lq0/c/i;-><init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/EglBase$Context;[I)V
 
     invoke-static {p4, p3}, Lorg/webrtc/ThreadUtils;->invokeAtFrontUninterruptibly(Landroid/os/Handler;Ljava/lang/Runnable;)V
 
@@ -1659,9 +1659,9 @@
 
     iget-object p1, p0, Lorg/webrtc/EglRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance v4, Lp0/c/n;
+    new-instance v4, Lq0/c/n;
 
-    invoke-direct {v4, p0}, Lp0/c/n;-><init>(Lorg/webrtc/EglRenderer;)V
+    invoke-direct {v4, p0}, Lq0/c/n;-><init>(Lorg/webrtc/EglRenderer;)V
 
     invoke-virtual {p1, v4}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -1860,9 +1860,9 @@
 
     iget-object v2, p0, Lorg/webrtc/EglRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance v3, Lp0/c/j;
+    new-instance v3, Lq0/c/j;
 
-    invoke-direct {v3, p0, v0}, Lp0/c/j;-><init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;)V
+    invoke-direct {v3, p0, v0}, Lq0/c/j;-><init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;)V
 
     invoke-virtual {v2, v3}, Landroid/os/Handler;->postAtFrontOfQueue(Ljava/lang/Runnable;)Z
 
@@ -1874,9 +1874,9 @@
 
     iget-object v3, p0, Lorg/webrtc/EglRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance v4, Lp0/c/g;
+    new-instance v4, Lq0/c/g;
 
-    invoke-direct {v4, p0, v2}, Lp0/c/g;-><init>(Lorg/webrtc/EglRenderer;Landroid/os/Looper;)V
+    invoke-direct {v4, p0, v2}, Lq0/c/g;-><init>(Lorg/webrtc/EglRenderer;Landroid/os/Looper;)V
 
     invoke-virtual {v3, v4}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -1963,9 +1963,9 @@
 
     iget-object v1, p0, Lorg/webrtc/EglRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance v2, Lp0/c/l;
+    new-instance v2, Lq0/c/l;
 
-    invoke-direct {v2, p0, p1}, Lp0/c/l;-><init>(Lorg/webrtc/EglRenderer;Ljava/lang/Runnable;)V
+    invoke-direct {v2, p0, p1}, Lq0/c/l;-><init>(Lorg/webrtc/EglRenderer;Ljava/lang/Runnable;)V
 
     invoke-virtual {v1, v2}, Landroid/os/Handler;->postAtFrontOfQueue(Ljava/lang/Runnable;)Z
 
@@ -2032,9 +2032,9 @@
 
     if-eq v2, v3, :cond_1
 
-    new-instance v2, Lp0/c/h;
+    new-instance v2, Lq0/c/h;
 
-    invoke-direct {v2, p0, v0, p1}, Lp0/c/h;-><init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;Lorg/webrtc/EglRenderer$FrameListener;)V
+    invoke-direct {v2, p0, v0, p1}, Lq0/c/h;-><init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;Lorg/webrtc/EglRenderer$FrameListener;)V
 
     invoke-direct {p0, v2}, Lorg/webrtc/EglRenderer;->postToRenderThread(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/org/webrtc/GlGenericDrawer.smali b/com.discord/smali_classes2/org/webrtc/GlGenericDrawer.smali
index 6c23353d81..64b653f612 100644
--- a/com.discord/smali_classes2/org/webrtc/GlGenericDrawer.smali
+++ b/com.discord/smali_classes2/org/webrtc/GlGenericDrawer.smali
@@ -162,7 +162,7 @@
 
     const-string v3, "vec4 sample(vec2 p) {\n"
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string p1, "  float y = texture2D(y_tex, p).r * 1.16438;\n"
 
@@ -172,7 +172,7 @@
 
     const-string v3, "  return vec4(y + 1.59603 * v - 0.874202,\n"
 
-    invoke-static {v0, p1, v1, v2, v3}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p1, v1, v2, v3}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     const-string p1, "    y - 0.391762 * u - 0.812968 * v + 0.531668,\n"
 
@@ -180,7 +180,7 @@
 
     const-string v2, "}\n"
 
-    invoke-static {v0, p1, v1, v2, p0}, Lf/e/b/a/a;->R(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    invoke-static {v0, p1, v1, v2, p0}, Lf/e/b/a/a;->U(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     goto :goto_1
 
diff --git a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali
index b4275d5369..1d0f9c64fc 100644
--- a/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/HardwareVideoEncoder.smali
@@ -963,7 +963,7 @@
     .annotation build Lorg/webrtc/CalledByNative;
     .end annotation
 
-    invoke-static {p0}, Lp0/c/m0;->$default$createNativeVideoEncoder(Lorg/webrtc/VideoEncoder;)J
+    invoke-static {p0}, Lq0/c/m0;->$default$createNativeVideoEncoder(Lorg/webrtc/VideoEncoder;)J
 
     move-result-wide v0
 
@@ -1658,7 +1658,7 @@
     .annotation build Lorg/webrtc/CalledByNative;
     .end annotation
 
-    invoke-static {p0}, Lp0/c/m0;->$default$isHardwareEncoder(Lorg/webrtc/VideoEncoder;)Z
+    invoke-static {p0}, Lq0/c/m0;->$default$isHardwareEncoder(Lorg/webrtc/VideoEncoder;)Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali b/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali
index 2ab2616741..f60ea688ef 100644
--- a/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali
+++ b/com.discord/smali_classes2/org/webrtc/JavaI420Buffer.smali
@@ -124,9 +124,9 @@
 
     new-instance v1, Lorg/webrtc/JavaI420Buffer;
 
-    new-instance v11, Lp0/c/o;
+    new-instance v11, Lq0/c/o;
 
-    invoke-direct {v11, v0}, Lp0/c/o;-><init>(Ljava/nio/ByteBuffer;)V
+    invoke-direct {v11, v0}, Lq0/c/o;-><init>(Ljava/nio/ByteBuffer;)V
 
     move-object v2, v1
 
@@ -275,11 +275,11 @@
 
     invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v11, Lp0/c/f0;
+    new-instance v11, Lq0/c/f0;
 
     move-object/from16 v12, p0
 
-    invoke-direct {v11, v12}, Lp0/c/f0;-><init>(Lorg/webrtc/VideoFrame$I420Buffer;)V
+    invoke-direct {v11, v12}, Lq0/c/f0;-><init>(Lorg/webrtc/VideoFrame$I420Buffer;)V
 
     move/from16 v0, p5
 
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$HwDecoderFactory.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$HwDecoderFactory.smali
index 5a92e40ea0..9ae0b15c24 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$HwDecoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder$HwDecoderFactory.smali
@@ -221,7 +221,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {p0, p1}, Lp0/c/l0;->$default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
+    invoke-static {p0, p1}, Lq0/c/l0;->$default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali
index 0e9b3bd114..2af91afa2c 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoder.smali
@@ -2460,7 +2460,7 @@
     invoke-interface {v0}, Lorg/webrtc/EglBase;->release()V
 
     :cond_0
-    invoke-static {p0}, Lp0/c/i0;->b(Lorg/webrtc/EglBase$Context;)Lorg/webrtc/EglBase;
+    invoke-static {p0}, Lq0/c/i0;->b(Lorg/webrtc/EglBase$Context;)Lorg/webrtc/EglBase;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoderFactory.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoderFactory.smali
index c5617f6cc1..b6b23e2c9a 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoderFactory.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoDecoderFactory.smali
@@ -285,7 +285,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-static {p0, p1}, Lp0/c/l0;->$default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
+    invoke-static {p0, p1}, Lq0/c/l0;->$default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali
index 990e4983fa..54cfe9a928 100644
--- a/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali
+++ b/com.discord/smali_classes2/org/webrtc/MediaCodecVideoEncoder.smali
@@ -1542,7 +1542,7 @@
     invoke-interface {v0}, Lorg/webrtc/EglBase;->release()V
 
     :cond_0
-    invoke-static {p0}, Lp0/c/i0;->b(Lorg/webrtc/EglBase$Context;)Lorg/webrtc/EglBase;
+    invoke-static {p0}, Lq0/c/i0;->b(Lorg/webrtc/EglBase$Context;)Lorg/webrtc/EglBase;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali b/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali
index 3f5bb21842..da01b6e4f0 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceEglRenderer.smali
@@ -473,9 +473,9 @@
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    new-instance v0, Lp0/c/a;
+    new-instance v0, Lq0/c/a;
 
-    invoke-direct {v0, p1}, Lp0/c/a;-><init>(Ljava/util/concurrent/CountDownLatch;)V
+    invoke-direct {v0, p1}, Lq0/c/a;-><init>(Ljava/util/concurrent/CountDownLatch;)V
 
     invoke-virtual {p0, v0}, Lorg/webrtc/EglRenderer;->releaseEglSurface(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali
index f491260f0a..7a19a824df 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceTextureHelper.smali
@@ -89,7 +89,7 @@
 
     sget-object p3, Lorg/webrtc/EglBase;->CONFIG_PIXEL_BUFFER:[I
 
-    invoke-static {p1, p3}, Lp0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
+    invoke-static {p1, p3}, Lq0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
 
     move-result-object p1
 
@@ -120,9 +120,9 @@
 
     iput-object p1, p0, Lorg/webrtc/SurfaceTextureHelper;->surfaceTexture:Landroid/graphics/SurfaceTexture;
 
-    new-instance p3, Lp0/c/p;
+    new-instance p3, Lq0/c/p;
 
-    invoke-direct {p3, p0}, Lp0/c/p;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    invoke-direct {p3, p0}, Lq0/c/p;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
 
     invoke-static {p1, p3, p2}, Lorg/webrtc/SurfaceTextureHelper;->setOnFrameAvailableListener(Landroid/graphics/SurfaceTexture;Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;Landroid/os/Handler;)V
 
@@ -351,9 +351,9 @@
 
     iget-object v0, p0, Lorg/webrtc/SurfaceTextureHelper;->handler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/u;
+    new-instance v1, Lq0/c/u;
 
-    invoke-direct {v1, p0}, Lp0/c/u;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    invoke-direct {v1, p0}, Lq0/c/u;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -464,9 +464,9 @@
 
     iget-object v10, p0, Lorg/webrtc/SurfaceTextureHelper;->yuvConverter:Lorg/webrtc/YuvConverter;
 
-    new-instance v11, Lp0/c/t;
+    new-instance v11, Lq0/c/t;
 
-    invoke-direct {v11, p0}, Lp0/c/t;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    invoke-direct {v11, p0}, Lq0/c/t;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
 
     move-object v3, v12
 
@@ -599,9 +599,9 @@
 
     iget-object v0, p0, Lorg/webrtc/SurfaceTextureHelper;->handler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/s;
+    new-instance v1, Lq0/c/s;
 
-    invoke-direct {v1, p0}, Lp0/c/s;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    invoke-direct {v1, p0}, Lq0/c/s;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
 
     invoke-static {v0, v1}, Lorg/webrtc/ThreadUtils;->invokeAtFrontUninterruptibly(Landroid/os/Handler;Ljava/lang/Runnable;)V
 
@@ -667,9 +667,9 @@
 
     iget-object v0, p0, Lorg/webrtc/SurfaceTextureHelper;->handler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/q;
+    new-instance v1, Lq0/c/q;
 
-    invoke-direct {v1, p0, p1}, Lp0/c/q;-><init>(Lorg/webrtc/SurfaceTextureHelper;I)V
+    invoke-direct {v1, p0, p1}, Lq0/c/q;-><init>(Lorg/webrtc/SurfaceTextureHelper;I)V
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -689,9 +689,9 @@
 
     iget-object v0, p0, Lorg/webrtc/SurfaceTextureHelper;->handler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/v;
+    new-instance v1, Lq0/c/v;
 
-    invoke-direct {v1, p0, p1, p2}, Lp0/c/v;-><init>(Lorg/webrtc/SurfaceTextureHelper;II)V
+    invoke-direct {v1, p0, p1, p2}, Lq0/c/v;-><init>(Lorg/webrtc/SurfaceTextureHelper;II)V
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -772,9 +772,9 @@
 
     iget-object v0, p0, Lorg/webrtc/SurfaceTextureHelper;->handler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/r;
+    new-instance v1, Lq0/c/r;
 
-    invoke-direct {v1, p0}, Lp0/c/r;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    invoke-direct {v1, p0}, Lq0/c/r;-><init>(Lorg/webrtc/SurfaceTextureHelper;)V
 
     invoke-static {v0, v1}, Lorg/webrtc/ThreadUtils;->invokeAtFrontUninterruptibly(Landroid/os/Handler;Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali b/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali
index f4b9a31697..cd6973c093 100644
--- a/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/SurfaceViewRenderer.smali
@@ -538,9 +538,9 @@
     move p1, p2
 
     :cond_4
-    new-instance p2, Lp0/c/w;
+    new-instance p2, Lq0/c/w;
 
-    invoke-direct {p2, p0, v1, p1}, Lp0/c/w;-><init>(Lorg/webrtc/SurfaceViewRenderer;II)V
+    invoke-direct {p2, p0, v1, p1}, Lq0/c/w;-><init>(Lorg/webrtc/SurfaceViewRenderer;II)V
 
     invoke-direct {p0, p2}, Lorg/webrtc/SurfaceViewRenderer;->postOrRun(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali b/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali
index 93289c126f..1f811e1608 100644
--- a/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali
+++ b/com.discord/smali_classes2/org/webrtc/TextureBufferImpl.smali
@@ -120,9 +120,9 @@
 
     iget-object v10, v0, Lorg/webrtc/TextureBufferImpl;->yuvConverter:Lorg/webrtc/YuvConverter;
 
-    new-instance v11, Lp0/c/b;
+    new-instance v11, Lq0/c/b;
 
-    invoke-direct {v11, p0}, Lp0/c/b;-><init>(Lorg/webrtc/TextureBufferImpl;)V
+    invoke-direct {v11, p0}, Lq0/c/b;-><init>(Lorg/webrtc/TextureBufferImpl;)V
 
     move-object v1, v12
 
@@ -353,9 +353,9 @@
 
     iget-object v0, p0, Lorg/webrtc/TextureBufferImpl;->toI420Handler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/x;
+    new-instance v1, Lq0/c/x;
 
-    invoke-direct {v1, p0}, Lp0/c/x;-><init>(Lorg/webrtc/TextureBufferImpl;)V
+    invoke-direct {v1, p0}, Lq0/c/x;-><init>(Lorg/webrtc/TextureBufferImpl;)V
 
     invoke-static {v0, v1}, Lorg/webrtc/ThreadUtils;->invokeAtFrontUninterruptibly(Landroid/os/Handler;Ljava/util/concurrent/Callable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali b/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali
index 1ad077d8f8..b9f51eec3f 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoDecoderWrapper.smali
@@ -25,9 +25,9 @@
     .annotation build Lorg/webrtc/CalledByNative;
     .end annotation
 
-    new-instance v0, Lp0/c/y;
+    new-instance v0, Lq0/c/y;
 
-    invoke-direct {v0, p0, p1}, Lp0/c/y;-><init>(J)V
+    invoke-direct {v0, p0, p1}, Lq0/c/y;-><init>(J)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali b/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali
index d597b7e31c..dddc9ea001 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoEncoderWrapper.smali
@@ -47,9 +47,9 @@
     .annotation build Lorg/webrtc/CalledByNative;
     .end annotation
 
-    new-instance v0, Lp0/c/z;
+    new-instance v0, Lq0/c/z;
 
-    invoke-direct {v0, p0, p1}, Lp0/c/z;-><init>(J)V
+    invoke-direct {v0, p0, p1}, Lq0/c/z;-><init>(J)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali
index 8cfb22a0f1..3688d26529 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer$1.smali
@@ -47,7 +47,7 @@
 
     sget-object v2, Lorg/webrtc/EglBase;->CONFIG_PIXEL_BUFFER:[I
 
-    invoke-static {v1, v2}, Lp0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
+    invoke-static {v1, v2}, Lq0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali
index 838207e3ae..92f2c2dc41 100644
--- a/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali
+++ b/com.discord/smali_classes2/org/webrtc/VideoFileRenderer.smali
@@ -324,9 +324,9 @@
 
     iget-object v0, p0, Lorg/webrtc/VideoFileRenderer;->fileThreadHandler:Landroid/os/Handler;
 
-    new-instance v2, Lp0/c/d0;
+    new-instance v2, Lq0/c/d0;
 
-    invoke-direct {v2, p0, v1, p1}, Lp0/c/d0;-><init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame$I420Buffer;Lorg/webrtc/VideoFrame;)V
+    invoke-direct {v2, p0, v1, p1}, Lq0/c/d0;-><init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame$I420Buffer;Lorg/webrtc/VideoFrame;)V
 
     invoke-virtual {v0, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -548,9 +548,9 @@
 
     iget-object v0, p0, Lorg/webrtc/VideoFileRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/c0;
+    new-instance v1, Lq0/c/c0;
 
-    invoke-direct {v1, p0, p1}, Lp0/c/c0;-><init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame;)V
+    invoke-direct {v1, p0, p1}, Lq0/c/c0;-><init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame;)V
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -568,9 +568,9 @@
 
     iget-object v1, p0, Lorg/webrtc/VideoFileRenderer;->renderThreadHandler:Landroid/os/Handler;
 
-    new-instance v2, Lp0/c/b0;
+    new-instance v2, Lq0/c/b0;
 
-    invoke-direct {v2, p0, v0}, Lp0/c/b0;-><init>(Lorg/webrtc/VideoFileRenderer;Ljava/util/concurrent/CountDownLatch;)V
+    invoke-direct {v2, p0, v0}, Lq0/c/b0;-><init>(Lorg/webrtc/VideoFileRenderer;Ljava/util/concurrent/CountDownLatch;)V
 
     invoke-virtual {v1, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
@@ -578,9 +578,9 @@
 
     iget-object v0, p0, Lorg/webrtc/VideoFileRenderer;->fileThreadHandler:Landroid/os/Handler;
 
-    new-instance v1, Lp0/c/a0;
+    new-instance v1, Lq0/c/a0;
 
-    invoke-direct {v1, p0}, Lp0/c/a0;-><init>(Lorg/webrtc/VideoFileRenderer;)V
+    invoke-direct {v1, p0}, Lq0/c/a0;-><init>(Lorg/webrtc/VideoFileRenderer;)V
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
diff --git a/com.discord/smali_classes2/org/webrtc/YuvConverter.smali b/com.discord/smali_classes2/org/webrtc/YuvConverter.smali
index 241df38d20..8b89780597 100644
--- a/com.discord/smali_classes2/org/webrtc/YuvConverter.smali
+++ b/com.discord/smali_classes2/org/webrtc/YuvConverter.smali
@@ -275,9 +275,9 @@
 
     move-result-object v8
 
-    new-instance v10, Lp0/c/e0;
+    new-instance v10, Lq0/c/e0;
 
-    invoke-direct {v10, v14}, Lp0/c/e0;-><init>(Ljava/nio/ByteBuffer;)V
+    invoke-direct {v10, v14}, Lq0/c/e0;-><init>(Ljava/nio/ByteBuffer;)V
 
     move v2, v1
 
diff --git a/com.discord/smali_classes2/p0/a.smali b/com.discord/smali_classes2/p0/a.smali
new file mode 100644
index 0000000000..23a9fae88f
--- /dev/null
+++ b/com.discord/smali_classes2/p0/a.smali
@@ -0,0 +1,256 @@
+.class public final Lp0/a;
+.super Ljava/lang/Object;
+.source "-Base64.kt"
+
+
+# static fields
+.field public static final a:[B
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lokio/ByteString;->data:[B
+
+    sput-object v0, Lp0/a;->a:[B
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const-string v1, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
+
+    invoke-virtual {v0, v1}, Lokio/ByteString$a;->b(Ljava/lang/String;)Lokio/ByteString;
+
+    return-void
+.end method
+
+.method public static a([B[BI)Ljava/lang/String;
+    .locals 11
+
+    const/4 p1, 0x1
+
+    and-int/2addr p2, p1
+
+    if-eqz p2, :cond_0
+
+    sget-object p2, Lp0/a;->a:[B
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p2, 0x0
+
+    :goto_0
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "map"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v1, p0
+
+    const/4 v2, 0x2
+
+    add-int/2addr v1, v2
+
+    div-int/lit8 v1, v1, 0x3
+
+    mul-int/lit8 v1, v1, 0x4
+
+    new-array v1, v1, [B
+
+    array-length v3, p0
+
+    array-length v4, p0
+
+    rem-int/lit8 v4, v4, 0x3
+
+    sub-int/2addr v3, v4
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    :goto_1
+    if-ge v4, v3, :cond_1
+
+    add-int/lit8 v6, v4, 0x1
+
+    aget-byte v4, p0, v4
+
+    add-int/lit8 v7, v6, 0x1
+
+    aget-byte v6, p0, v6
+
+    add-int/lit8 v8, v7, 0x1
+
+    aget-byte v7, p0, v7
+
+    add-int/lit8 v9, v5, 0x1
+
+    and-int/lit16 v10, v4, 0xff
+
+    shr-int/2addr v10, v2
+
+    aget-byte v10, p2, v10
+
+    aput-byte v10, v1, v5
+
+    add-int/lit8 v5, v9, 0x1
+
+    and-int/lit8 v4, v4, 0x3
+
+    shl-int/lit8 v4, v4, 0x4
+
+    and-int/lit16 v10, v6, 0xff
+
+    shr-int/lit8 v10, v10, 0x4
+
+    or-int/2addr v4, v10
+
+    aget-byte v4, p2, v4
+
+    aput-byte v4, v1, v9
+
+    add-int/lit8 v4, v5, 0x1
+
+    and-int/lit8 v6, v6, 0xf
+
+    shl-int/2addr v6, v2
+
+    and-int/lit16 v9, v7, 0xff
+
+    shr-int/lit8 v9, v9, 0x6
+
+    or-int/2addr v6, v9
+
+    aget-byte v6, p2, v6
+
+    aput-byte v6, v1, v5
+
+    add-int/lit8 v5, v4, 0x1
+
+    and-int/lit8 v6, v7, 0x3f
+
+    aget-byte v6, p2, v6
+
+    aput-byte v6, v1, v4
+
+    move v4, v8
+
+    goto :goto_1
+
+    :cond_1
+    array-length v6, p0
+
+    sub-int/2addr v6, v3
+
+    const/16 v3, 0x3d
+
+    if-eq v6, p1, :cond_3
+
+    if-eq v6, v2, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    add-int/lit8 p1, v4, 0x1
+
+    aget-byte v4, p0, v4
+
+    aget-byte p0, p0, p1
+
+    add-int/lit8 p1, v5, 0x1
+
+    and-int/lit16 v6, v4, 0xff
+
+    shr-int/2addr v6, v2
+
+    aget-byte v6, p2, v6
+
+    aput-byte v6, v1, v5
+
+    add-int/lit8 v5, p1, 0x1
+
+    and-int/lit8 v4, v4, 0x3
+
+    shl-int/lit8 v4, v4, 0x4
+
+    and-int/lit16 v6, p0, 0xff
+
+    shr-int/lit8 v6, v6, 0x4
+
+    or-int/2addr v4, v6
+
+    aget-byte v4, p2, v4
+
+    aput-byte v4, v1, p1
+
+    add-int/lit8 p1, v5, 0x1
+
+    and-int/lit8 p0, p0, 0xf
+
+    shl-int/2addr p0, v2
+
+    aget-byte p0, p2, p0
+
+    aput-byte p0, v1, v5
+
+    int-to-byte p0, v3
+
+    aput-byte p0, v1, p1
+
+    goto :goto_2
+
+    :cond_3
+    aget-byte p0, p0, v4
+
+    add-int/lit8 p1, v5, 0x1
+
+    and-int/lit16 v4, p0, 0xff
+
+    shr-int/lit8 v2, v4, 0x2
+
+    aget-byte v2, p2, v2
+
+    aput-byte v2, v1, v5
+
+    add-int/lit8 v2, p1, 0x1
+
+    and-int/lit8 p0, p0, 0x3
+
+    shl-int/lit8 p0, p0, 0x4
+
+    aget-byte p0, p2, p0
+
+    aput-byte p0, v1, p1
+
+    add-int/lit8 p0, v2, 0x1
+
+    int-to-byte p1, v3
+
+    aput-byte p1, v1, v2
+
+    aput-byte p1, v1, p0
+
+    :goto_2
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    new-instance p1, Ljava/lang/String;
+
+    invoke-direct {p1, v1, p0}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/p0/a/a/a.smali b/com.discord/smali_classes2/p0/a/a/a.smali
deleted file mode 100644
index 5adc15f8eb..0000000000
--- a/com.discord/smali_classes2/p0/a/a/a.smali
+++ /dev/null
@@ -1,898 +0,0 @@
-.class public final Lp0/a/a/a;
-.super Ljava/lang/Object;
-.source "AnnotationWriter.java"
-
-
-# instance fields
-.field public final a:Lp0/a/a/v;
-
-.field public final b:Z
-
-.field public final c:Lp0/a/a/c;
-
-.field public final d:I
-
-.field public e:I
-
-.field public final f:Lp0/a/a/a;
-
-.field public g:Lp0/a/a/a;
-
-
-# direct methods
-.method public constructor <init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    iput-boolean p2, p0, Lp0/a/a/a;->b:Z
-
-    iput-object p3, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget p1, p3, Lp0/a/a/c;->b:I
-
-    if-nez p1, :cond_0
-
-    const/4 p1, -0x1
-
-    goto :goto_0
-
-    :cond_0
-    add-int/lit8 p1, p1, -0x2
-
-    :goto_0
-    iput p1, p0, Lp0/a/a/a;->d:I
-
-    iput-object p4, p0, Lp0/a/a/a;->f:Lp0/a/a/a;
-
-    if-eqz p4, :cond_1
-
-    iput-object p0, p4, Lp0/a/a/a;->g:Lp0/a/a/a;
-
-    :cond_1
-    return-void
-.end method
-
-.method public static b(Ljava/lang/String;[Lp0/a/a/a;I)I
-    .locals 4
-
-    mul-int/lit8 v0, p2, 0x2
-
-    add-int/lit8 v0, v0, 0x7
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, p2, :cond_1
-
-    aget-object v3, p1, v2
-
-    if-nez v3, :cond_0
-
-    const/4 v3, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-virtual {v3, p0}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v3
-
-    add-int/lit8 v3, v3, -0x8
-
-    :goto_1
-    add-int/2addr v0, v3
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return v0
-.end method
-
-.method public static d(I[Lp0/a/a/a;ILp0/a/a/c;)V
-    .locals 6
-
-    mul-int/lit8 v0, p2, 0x2
-
-    add-int/lit8 v0, v0, 0x1
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    const/4 v3, 0x0
-
-    if-ge v2, p2, :cond_1
-
-    aget-object v4, p1, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v3, 0x0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-virtual {v4, v3}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v3
-
-    add-int/lit8 v3, v3, -0x8
-
-    :goto_1
-    add-int/2addr v0, v3
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p3, p0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {p3, v0}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    invoke-virtual {p3, p2}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    const/4 p0, 0x0
-
-    :goto_2
-    if-ge p0, p2, :cond_4
-
-    aget-object v0, p1, p0
-
-    move-object v4, v3
-
-    const/4 v2, 0x0
-
-    :goto_3
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Lp0/a/a/a;->g()V
-
-    add-int/lit8 v2, v2, 0x1
-
-    iget-object v4, v0, Lp0/a/a/a;->f:Lp0/a/a/a;
-
-    move-object v5, v4
-
-    move-object v4, v0
-
-    move-object v0, v5
-
-    goto :goto_3
-
-    :cond_2
-    invoke-virtual {p3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_4
-    if-eqz v4, :cond_3
-
-    iget-object v0, v4, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v2, v0, Lp0/a/a/c;->a:[B
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p3, v2, v1, v0}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget-object v4, v4, Lp0/a/a/a;->g:Lp0/a/a/a;
-
-    goto :goto_4
-
-    :cond_3
-    add-int/lit8 p0, p0, 0x1
-
-    goto :goto_2
-
-    :cond_4
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/String;)I
-    .locals 2
-
-    if-eqz p1, :cond_0
-
-    iget-object v0, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v0, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_0
-    const/16 p1, 0x8
-
-    move-object v0, p0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget-object v1, v0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    add-int/2addr p1, v1
-
-    iget-object v0, v0, Lp0/a/a/a;->f:Lp0/a/a/a;
-
-    goto :goto_0
-
-    :cond_1
-    return p1
-.end method
-
-.method public c(ILp0/a/a/c;)V
-    .locals 6
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x0
-
-    const/4 v4, 0x0
-
-    move-object v3, v2
-
-    move-object v2, p0
-
-    :goto_0
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v2}, Lp0/a/a/a;->g()V
-
-    iget-object v3, v2, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget v3, v3, Lp0/a/a/c;->b:I
-
-    add-int/2addr v1, v3
-
-    add-int/lit8 v4, v4, 0x1
-
-    iget-object v3, v2, Lp0/a/a/a;->f:Lp0/a/a/a;
-
-    move-object v5, v3
-
-    move-object v3, v2
-
-    move-object v2, v5
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p2, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {p2, v1}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    invoke-virtual {p2, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_1
-    if-eqz v3, :cond_1
-
-    iget-object p1, v3, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v1, p1, Lp0/a/a/c;->a:[B
-
-    iget p1, p1, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p2, v1, v0, p1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget-object v3, v3, Lp0/a/a/a;->g:Lp0/a/a/a;
-
-    goto :goto_1
-
-    :cond_1
-    return-void
-.end method
-
-.method public e(Ljava/lang/String;Ljava/lang/Object;)V
-    .locals 8
-
-    iget v0, p0, Lp0/a/a/a;->e:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lp0/a/a/a;->e:I
-
-    iget-boolean v0, p0, Lp0/a/a/a;->b:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v1, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v1, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_0
-    instance-of p1, p2, Ljava/lang/String;
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/16 v0, 0x73
-
-    iget-object v1, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    check-cast p2, Ljava/lang/String;
-
-    invoke-virtual {v1, p2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    invoke-virtual {p1, v0, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto/16 :goto_8
-
-    :cond_1
-    instance-of p1, p2, Ljava/lang/Byte;
-
-    const/16 v0, 0x42
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v1, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    check-cast p2, Ljava/lang/Byte;
-
-    invoke-virtual {p2}, Ljava/lang/Byte;->byteValue()B
-
-    move-result p2
-
-    invoke-virtual {v1, p2}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p2
-
-    iget p2, p2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p1, v0, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto/16 :goto_8
-
-    :cond_2
-    instance-of p1, p2, Ljava/lang/Boolean;
-
-    const/16 v1, 0x5a
-
-    if-eqz p1, :cond_3
-
-    check-cast p2, Ljava/lang/Boolean;
-
-    invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    iget-object p2, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v0, p1}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p1
-
-    iget p1, p1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p2, v1, p1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto/16 :goto_8
-
-    :cond_3
-    instance-of p1, p2, Ljava/lang/Character;
-
-    const/16 v2, 0x43
-
-    if-eqz p1, :cond_4
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    check-cast p2, Ljava/lang/Character;
-
-    invoke-virtual {p2}, Ljava/lang/Character;->charValue()C
-
-    move-result p2
-
-    invoke-virtual {v0, p2}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p2
-
-    iget p2, p2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p1, v2, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto/16 :goto_8
-
-    :cond_4
-    instance-of p1, p2, Ljava/lang/Short;
-
-    const/16 v3, 0x53
-
-    if-eqz p1, :cond_5
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    check-cast p2, Ljava/lang/Short;
-
-    invoke-virtual {p2}, Ljava/lang/Short;->shortValue()S
-
-    move-result p2
-
-    invoke-virtual {v0, p2}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p2
-
-    iget p2, p2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p1, v3, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto/16 :goto_8
-
-    :cond_5
-    instance-of p1, p2, Lp0/a/a/w;
-
-    if-eqz p1, :cond_6
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/16 v0, 0x63
-
-    iget-object v1, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    check-cast p2, Lp0/a/a/w;
-
-    invoke-virtual {p2}, Lp0/a/a/w;->d()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {v1, p2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    invoke-virtual {p1, v0, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto/16 :goto_8
-
-    :cond_6
-    instance-of p1, p2, [B
-
-    const/4 v4, 0x0
-
-    const/16 v5, 0x5b
-
-    if-eqz p1, :cond_7
-
-    check-cast p2, [B
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v1, p2
-
-    invoke-virtual {p1, v5, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_0
-    if-ge v4, p1, :cond_11
-
-    aget-byte v1, p2, v4
-
-    iget-object v2, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v3, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v3, v1}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v2, v0, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_7
-    instance-of p1, p2, [Z
-
-    if-eqz p1, :cond_8
-
-    check-cast p2, [Z
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v0, p2
-
-    invoke-virtual {p1, v5, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_1
-    if-ge v4, p1, :cond_11
-
-    aget-boolean v0, p2, v4
-
-    iget-object v2, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v3, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v3, v0}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v2, v1, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
-
-    :cond_8
-    instance-of p1, p2, [S
-
-    if-eqz p1, :cond_9
-
-    check-cast p2, [S
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v0, p2
-
-    invoke-virtual {p1, v5, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_2
-    if-ge v4, p1, :cond_11
-
-    aget-short v0, p2, v4
-
-    iget-object v1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v2, v0}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v1, v3, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_2
-
-    :cond_9
-    instance-of p1, p2, [C
-
-    if-eqz p1, :cond_a
-
-    check-cast p2, [C
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v0, p2
-
-    invoke-virtual {p1, v5, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_3
-    if-ge v4, p1, :cond_11
-
-    aget-char v0, p2, v4
-
-    iget-object v1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v3, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v3, v0}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v1, v2, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_3
-
-    :cond_a
-    instance-of p1, p2, [I
-
-    if-eqz p1, :cond_b
-
-    check-cast p2, [I
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v0, p2
-
-    invoke-virtual {p1, v5, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_4
-    if-ge v4, p1, :cond_11
-
-    aget v0, p2, v4
-
-    iget-object v1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/16 v2, 0x49
-
-    iget-object v3, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v3, v0}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v1, v2, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_4
-
-    :cond_b
-    instance-of p1, p2, [J
-
-    if-eqz p1, :cond_c
-
-    check-cast p2, [J
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v0, p2
-
-    invoke-virtual {p1, v5, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_5
-    if-ge v4, p1, :cond_11
-
-    aget-wide v0, p2, v4
-
-    iget-object v2, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/16 v3, 0x4a
-
-    iget-object v5, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    const/4 v6, 0x5
-
-    invoke-virtual {v5, v6, v0, v1}, Lp0/a/a/v;->g(IJ)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v2, v3, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_5
-
-    :cond_c
-    instance-of p1, p2, [F
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_e
-
-    check-cast p2, [F
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v1, p2
-
-    invoke-virtual {p1, v5, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_6
-    if-ge v4, p1, :cond_11
-
-    aget v1, p2, v4
-
-    iget-object v2, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/16 v3, 0x46
-
-    iget-object v5, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    if-eqz v5, :cond_d
-
-    invoke-static {v1}, Ljava/lang/Float;->floatToRawIntBits(F)I
-
-    move-result v1
-
-    const/4 v6, 0x4
-
-    invoke-virtual {v5, v6, v1}, Lp0/a/a/v;->f(II)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v2, v3, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_6
-
-    :cond_d
-    throw v0
-
-    :cond_e
-    instance-of p1, p2, [D
-
-    if-eqz p1, :cond_10
-
-    check-cast p2, [D
-
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    array-length v1, p2
-
-    invoke-virtual {p1, v5, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    array-length p1, p2
-
-    :goto_7
-    if-ge v4, p1, :cond_11
-
-    aget-wide v1, p2, v4
-
-    iget-object v3, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/16 v5, 0x44
-
-    iget-object v6, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    if-eqz v6, :cond_f
-
-    invoke-static {v1, v2}, Ljava/lang/Double;->doubleToRawLongBits(D)J
-
-    move-result-wide v1
-
-    const/4 v7, 0x6
-
-    invoke-virtual {v6, v7, v1, v2}, Lp0/a/a/v;->g(IJ)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v3, v5, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_7
-
-    :cond_f
-    throw v0
-
-    :cond_10
-    iget-object p1, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {p1, p2}, Lp0/a/a/v;->b(Ljava/lang/Object;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    iget-object p2, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget v0, p1, Lp0/a/a/u;->b:I
-
-    const-string v1, ".s.IFJDCS"
-
-    invoke-virtual {v1, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    iget p1, p1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p2, v0, p1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    :cond_11
-    :goto_8
-    return-void
-.end method
-
-.method public f(Ljava/lang/String;)Lp0/a/a/a;
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/a;->e:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lp0/a/a/a;->e:I
-
-    iget-boolean v0, p0, Lp0/a/a/a;->b:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v1, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v1, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_0
-    iget-object p1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/16 v0, 0x5b
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p1, v0, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    new-instance p1, Lp0/a/a/a;
-
-    iget-object v0, p0, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    const/4 v3, 0x0
-
-    invoke-direct {p1, v0, v1, v2, v3}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    return-object p1
-.end method
-
-.method public g()V
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/a;->d:I
-
-    const/4 v1, -0x1
-
-    if-eq v0, v1, :cond_0
-
-    iget-object v1, p0, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v1, v1, Lp0/a/a/c;->a:[B
-
-    iget v2, p0, Lp0/a/a/a;->e:I
-
-    ushr-int/lit8 v3, v2, 0x8
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v1, v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    int-to-byte v2, v2
-
-    aput-byte v2, v1, v0
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/b$a.smali b/com.discord/smali_classes2/p0/a/a/b$a.smali
deleted file mode 100644
index aeb48baedd..0000000000
--- a/com.discord/smali_classes2/p0/a/a/b$a.smali
+++ /dev/null
@@ -1,120 +0,0 @@
-.class public final Lp0/a/a/b$a;
-.super Ljava/lang/Object;
-.source "Attribute.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lp0/a/a/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:I
-
-.field public b:[Lp0/a/a/b;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x6
-
-    new-array v0, v0, [Lp0/a/a/b;
-
-    iput-object v0, p0, Lp0/a/a/b$a;->b:[Lp0/a/a/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lp0/a/a/b;)V
-    .locals 4
-
-    :goto_0
-    if-eqz p1, :cond_4
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    :goto_1
-    iget v2, p0, Lp0/a/a/b$a;->a:I
-
-    if-ge v1, v2, :cond_1
-
-    iget-object v2, p0, Lp0/a/a/b$a;->b:[Lp0/a/a/b;
-
-    aget-object v2, v2, v1
-
-    iget-object v2, v2, Lp0/a/a/b;->a:Ljava/lang/String;
-
-    iget-object v3, p1, Lp0/a/a/b;->a:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_2
-
-    :cond_0
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_2
-    if-nez v1, :cond_3
-
-    iget v1, p0, Lp0/a/a/b$a;->a:I
-
-    iget-object v2, p0, Lp0/a/a/b$a;->b:[Lp0/a/a/b;
-
-    array-length v3, v2
-
-    if-lt v1, v3, :cond_2
-
-    array-length v3, v2
-
-    add-int/lit8 v3, v3, 0x6
-
-    new-array v3, v3, [Lp0/a/a/b;
-
-    invoke-static {v2, v0, v3, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v3, p0, Lp0/a/a/b$a;->b:[Lp0/a/a/b;
-
-    :cond_2
-    iget-object v0, p0, Lp0/a/a/b$a;->b:[Lp0/a/a/b;
-
-    iget v1, p0, Lp0/a/a/b$a;->a:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lp0/a/a/b$a;->a:I
-
-    aput-object p1, v0, v1
-
-    :cond_3
-    iget-object p1, p1, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    goto :goto_0
-
-    :cond_4
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/b.smali b/com.discord/smali_classes2/p0/a/a/b.smali
deleted file mode 100644
index 61010176a8..0000000000
--- a/com.discord/smali_classes2/p0/a/a/b.smali
+++ /dev/null
@@ -1,159 +0,0 @@
-.class public Lp0/a/a/b;
-.super Ljava/lang/Object;
-.source "Attribute.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lp0/a/a/b$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public b:[B
-
-.field public c:Lp0/a/a/b;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/b;->a:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Lp0/a/a/v;)I
-    .locals 6
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, -0x1
-
-    const/4 v5, -0x1
-
-    move-object v0, p0
-
-    move-object v1, p1
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/b;->b(Lp0/a/a/v;[BIII)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public final b(Lp0/a/a/v;[BIII)I
-    .locals 0
-
-    iget-object p2, p1, Lp0/a/a/v;->a:Lp0/a/a/f;
-
-    const/4 p2, 0x0
-
-    move-object p3, p0
-
-    :goto_0
-    if-eqz p3, :cond_0
-
-    iget-object p4, p3, Lp0/a/a/b;->a:Ljava/lang/String;
-
-    invoke-virtual {p1, p4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object p4, p3, Lp0/a/a/b;->b:[B
-
-    array-length p4, p4
-
-    add-int/lit8 p4, p4, 0x6
-
-    add-int/2addr p2, p4
-
-    iget-object p3, p3, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    goto :goto_0
-
-    :cond_0
-    return p2
-.end method
-
-.method public final c()I
-    .locals 2
-
-    const/4 v0, 0x0
-
-    move-object v1, p0
-
-    :goto_0
-    if-eqz v1, :cond_0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iget-object v1, v1, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    goto :goto_0
-
-    :cond_0
-    return v0
-.end method
-
-.method public final d(Lp0/a/a/v;Lp0/a/a/c;)V
-    .locals 7
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, -0x1
-
-    const/4 v5, -0x1
-
-    move-object v0, p0
-
-    move-object v1, p1
-
-    move-object v6, p2
-
-    invoke-virtual/range {v0 .. v6}, Lp0/a/a/b;->e(Lp0/a/a/v;[BIIILp0/a/a/c;)V
-
-    return-void
-.end method
-
-.method public final e(Lp0/a/a/v;[BIIILp0/a/a/c;)V
-    .locals 0
-
-    iget-object p2, p1, Lp0/a/a/v;->a:Lp0/a/a/f;
-
-    move-object p2, p0
-
-    :goto_0
-    if-eqz p2, :cond_0
-
-    iget-object p3, p2, Lp0/a/a/b;->b:[B
-
-    array-length p4, p3
-
-    iget-object p5, p2, Lp0/a/a/b;->a:Ljava/lang/String;
-
-    invoke-static {p1, p5, p6, p4}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    const/4 p5, 0x0
-
-    invoke-virtual {p6, p3, p5, p4}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget-object p2, p2, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/c.smali b/com.discord/smali_classes2/p0/a/a/c.smali
deleted file mode 100644
index 6cbe2bd2a7..0000000000
--- a/com.discord/smali_classes2/p0/a/a/c.smali
+++ /dev/null
@@ -1,626 +0,0 @@
-.class public Lp0/a/a/c;
-.super Ljava/lang/Object;
-.source "ByteVector.java"
-
-
-# instance fields
-.field public a:[B
-
-.field public b:I
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/16 v0, 0x40
-
-    new-array v0, v0, [B
-
-    iput-object v0, p0, Lp0/a/a/c;->a:[B
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-array p1, p1, [B
-
-    iput-object p1, p0, Lp0/a/a/c;->a:[B
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Ljava/lang/String;II)Lp0/a/a/c;
-    .locals 8
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    move v1, p2
-
-    move v2, v1
-
-    :goto_0
-    const/16 v3, 0x7f
-
-    const/16 v4, 0x7ff
-
-    const/4 v5, 0x1
-
-    if-ge v1, v0, :cond_2
-
-    invoke-virtual {p1, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v6
-
-    if-lt v6, v5, :cond_0
-
-    if-gt v6, v3, :cond_0
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    if-gt v6, v4, :cond_1
-
-    add-int/lit8 v2, v2, 0x2
-
-    goto :goto_1
-
-    :cond_1
-    add-int/lit8 v2, v2, 0x3
-
-    :goto_1
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    if-gt v2, p3, :cond_8
-
-    iget p3, p0, Lp0/a/a/c;->b:I
-
-    sub-int/2addr p3, p2
-
-    add-int/lit8 p3, p3, -0x2
-
-    if-ltz p3, :cond_3
-
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    ushr-int/lit8 v6, v2, 0x8
-
-    int-to-byte v6, v6
-
-    aput-byte v6, v1, p3
-
-    add-int/2addr p3, v5
-
-    int-to-byte v6, v2
-
-    aput-byte v6, v1, p3
-
-    :cond_3
-    iget p3, p0, Lp0/a/a/c;->b:I
-
-    add-int/2addr p3, v2
-
-    sub-int/2addr p3, p2
-
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    array-length v1, v1
-
-    if-le p3, v1, :cond_4
-
-    sub-int/2addr v2, p2
-
-    invoke-virtual {p0, v2}, Lp0/a/a/c;->b(I)V
-
-    :cond_4
-    iget p3, p0, Lp0/a/a/c;->b:I
-
-    :goto_2
-    if-ge p2, v0, :cond_7
-
-    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    if-lt v1, v5, :cond_5
-
-    if-gt v1, v3, :cond_5
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v6, p3, 0x1
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v2, p3
-
-    goto :goto_3
-
-    :cond_5
-    if-gt v1, v4, :cond_6
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v6, p3, 0x1
-
-    shr-int/lit8 v7, v1, 0x6
-
-    and-int/lit8 v7, v7, 0x1f
-
-    or-int/lit16 v7, v7, 0xc0
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v2, p3
-
-    add-int/lit8 p3, v6, 0x1
-
-    and-int/lit8 v1, v1, 0x3f
-
-    or-int/lit16 v1, v1, 0x80
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v2, v6
-
-    goto :goto_4
-
-    :cond_6
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v6, p3, 0x1
-
-    shr-int/lit8 v7, v1, 0xc
-
-    and-int/lit8 v7, v7, 0xf
-
-    or-int/lit16 v7, v7, 0xe0
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v2, p3
-
-    add-int/lit8 p3, v6, 0x1
-
-    shr-int/lit8 v7, v1, 0x6
-
-    and-int/lit8 v7, v7, 0x3f
-
-    or-int/lit16 v7, v7, 0x80
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v2, v6
-
-    add-int/lit8 v6, p3, 0x1
-
-    and-int/lit8 v1, v1, 0x3f
-
-    or-int/lit16 v1, v1, 0x80
-
-    int-to-byte v1, v1
-
-    aput-byte v1, v2, p3
-
-    :goto_3
-    move p3, v6
-
-    :goto_4
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_2
-
-    :cond_7
-    iput p3, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-
-    :cond_8
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "UTF8 string too large"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final b(I)V
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/c;->a:[B
-
-    array-length v0, v0
-
-    mul-int/lit8 v0, v0, 0x2
-
-    iget v1, p0, Lp0/a/a/c;->b:I
-
-    add-int/2addr v1, p1
-
-    if-le v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move v0, v1
-
-    :goto_0
-    new-array p1, v0, [B
-
-    iget-object v0, p0, Lp0/a/a/c;->a:[B
-
-    iget v1, p0, Lp0/a/a/c;->b:I
-
-    const/4 v2, 0x0
-
-    invoke-static {v0, v2, p1, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object p1, p0, Lp0/a/a/c;->a:[B
-
-    return-void
-.end method
-
-.method public final c(II)Lp0/a/a/c;
-    .locals 3
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v0, 0x2
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v2, v0, 0x1
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v0
-
-    add-int/lit8 p1, v2, 0x1
-
-    int-to-byte p2, p2
-
-    aput-byte p2, v1, v2
-
-    iput p1, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
-
-.method public final d(III)Lp0/a/a/c;
-    .locals 3
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v0, 0x4
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x4
-
-    invoke-virtual {p0, v1}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v2, v0, 0x1
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v0
-
-    add-int/lit8 p1, v2, 0x1
-
-    int-to-byte p2, p2
-
-    aput-byte p2, v1, v2
-
-    add-int/lit8 p2, p1, 0x1
-
-    ushr-int/lit8 v0, p3, 0x8
-
-    int-to-byte v0, v0
-
-    aput-byte v0, v1, p1
-
-    add-int/lit8 p1, p2, 0x1
-
-    int-to-byte p3, p3
-
-    aput-byte p3, v1, p2
-
-    iput p1, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
-
-.method public final e(II)Lp0/a/a/c;
-    .locals 3
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v0, 0x3
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x3
-
-    invoke-virtual {p0, v1}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v2, v0, 0x1
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v0
-
-    add-int/lit8 p1, v2, 0x1
-
-    ushr-int/lit8 v0, p2, 0x8
-
-    int-to-byte v0, v0
-
-    aput-byte v0, v1, v2
-
-    add-int/lit8 v0, p1, 0x1
-
-    int-to-byte p2, p2
-
-    aput-byte p2, v1, p1
-
-    iput v0, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
-
-.method public final f(III)Lp0/a/a/c;
-    .locals 3
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v0, 0x5
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x5
-
-    invoke-virtual {p0, v1}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v2, v0, 0x1
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v0
-
-    add-int/lit8 p1, v2, 0x1
-
-    ushr-int/lit8 v0, p2, 0x8
-
-    int-to-byte v0, v0
-
-    aput-byte v0, v1, v2
-
-    add-int/lit8 v0, p1, 0x1
-
-    int-to-byte p2, p2
-
-    aput-byte p2, v1, p1
-
-    add-int/lit8 p1, v0, 0x1
-
-    ushr-int/lit8 p2, p3, 0x8
-
-    int-to-byte p2, p2
-
-    aput-byte p2, v1, v0
-
-    add-int/lit8 p2, p1, 0x1
-
-    int-to-byte p3, p3
-
-    aput-byte p3, v1, p1
-
-    iput p2, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
-
-.method public g(I)Lp0/a/a/c;
-    .locals 3
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v0, 0x1
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v2, v0
-
-    iput v1, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
-
-.method public h([BII)Lp0/a/a/c;
-    .locals 2
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/2addr v0, p3
-
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    array-length v1, v1
-
-    if-le v0, v1, :cond_0
-
-    invoke-virtual {p0, p3}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    if-eqz p1, :cond_1
-
-    iget-object v0, p0, Lp0/a/a/c;->a:[B
-
-    iget v1, p0, Lp0/a/a/c;->b:I
-
-    invoke-static {p1, p2, v0, v1, p3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    :cond_1
-    iget p1, p0, Lp0/a/a/c;->b:I
-
-    add-int/2addr p1, p3
-
-    iput p1, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
-
-.method public i(I)Lp0/a/a/c;
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v0, 0x4
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x4
-
-    invoke-virtual {p0, v1}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v2, v0, 0x1
-
-    ushr-int/lit8 v3, p1, 0x18
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v1, v0
-
-    add-int/lit8 v0, v2, 0x1
-
-    ushr-int/lit8 v3, p1, 0x10
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v1, v2
-
-    add-int/lit8 v2, v0, 0x1
-
-    ushr-int/lit8 v3, p1, 0x8
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v1, v0
-
-    add-int/lit8 v0, v2, 0x1
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v2
-
-    iput v0, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
-
-.method public j(I)Lp0/a/a/c;
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v0, 0x2
-
-    iget-object v2, p0, Lp0/a/a/c;->a:[B
-
-    array-length v2, v2
-
-    if-le v1, v2, :cond_0
-
-    const/4 v1, 0x2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/c;->b(I)V
-
-    :cond_0
-    iget-object v1, p0, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v2, v0, 0x1
-
-    ushr-int/lit8 v3, p1, 0x8
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v1, v0
-
-    add-int/lit8 v0, v2, 0x1
-
-    int-to-byte p1, p1
-
-    aput-byte p1, v1, v2
-
-    iput v0, p0, Lp0/a/a/c;->b:I
-
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/d.smali b/com.discord/smali_classes2/p0/a/a/d.smali
deleted file mode 100644
index ff51e55361..0000000000
--- a/com.discord/smali_classes2/p0/a/a/d.smali
+++ /dev/null
@@ -1,6878 +0,0 @@
-.class public Lp0/a/a/d;
-.super Ljava/lang/Object;
-.source "ClassReader.java"
-
-
-# instance fields
-.field public final a:[B
-
-.field public final b:[I
-
-.field public final c:[Ljava/lang/String;
-
-.field public final d:[Lp0/a/a/g;
-
-.field public final e:[I
-
-.field public final f:I
-
-.field public final g:I
-
-
-# direct methods
-.method public constructor <init>([BIZ)V
-    .locals 9
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/d;->a:[B
-
-    if-eqz p3, :cond_1
-
-    add-int/lit8 p3, p2, 0x6
-
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->q(I)S
-
-    move-result v0
-
-    const/16 v1, 0x38
-
-    if-gt v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Unsupported class file major version "
-
-    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->q(I)S
-
-    move-result p3
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    add-int/lit8 p3, p2, 0x8
-
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->u(I)I
-
-    move-result p3
-
-    new-array v0, p3, [I
-
-    iput-object v0, p0, Lp0/a/a/d;->b:[I
-
-    new-array v0, p3, [Ljava/lang/String;
-
-    iput-object v0, p0, Lp0/a/a/d;->c:[Ljava/lang/String;
-
-    add-int/lit8 p2, p2, 0xa
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_1
-    const/4 v5, 0x4
-
-    if-ge v1, p3, :cond_3
-
-    iget-object v6, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v7, v1, 0x1
-
-    add-int/lit8 v8, p2, 0x1
-
-    aput v8, v6, v1
-
-    aget-byte v1, p1, p2
-
-    packed-switch v1, :pswitch_data_0
-
-    :pswitch_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :pswitch_1
-    const/4 v4, 0x1
-
-    goto :goto_2
-
-    :pswitch_2
-    const/4 v3, 0x1
-
-    goto :goto_2
-
-    :pswitch_3
-    const/4 v1, 0x3
-
-    goto :goto_4
-
-    :pswitch_4
-    const/16 v5, 0x9
-
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_3
-
-    :goto_2
-    :pswitch_5
-    const/4 v1, 0x5
-
-    goto :goto_4
-
-    :pswitch_6
-    invoke-virtual {p0, v8}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v5, v1, 0x3
-
-    if-le v5, v2, :cond_2
-
-    move v2, v5
-
-    :cond_2
-    :goto_3
-    :pswitch_7
-    move v1, v5
-
-    :goto_4
-    add-int/2addr p2, v1
-
-    move v1, v7
-
-    goto :goto_1
-
-    :cond_3
-    iput v2, p0, Lp0/a/a/d;->f:I
-
-    iput p2, p0, Lp0/a/a/d;->g:I
-
-    const/4 p1, 0x0
-
-    if-eqz v3, :cond_4
-
-    new-array p2, p3, [Lp0/a/a/g;
-
-    goto :goto_5
-
-    :cond_4
-    move-object p2, p1
-
-    :goto_5
-    iput-object p2, p0, Lp0/a/a/d;->d:[Lp0/a/a/g;
-
-    or-int p2, v3, v4
-
-    if-eqz p2, :cond_7
-
-    new-array p2, v2, [C
-
-    invoke-virtual {p0}, Lp0/a/a/d;->c()I
-
-    move-result p3
-
-    add-int/lit8 v1, p3, -0x2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    :goto_6
-    if-lez v1, :cond_7
-
-    invoke-virtual {p0, p3, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v3, p3, 0x2
-
-    invoke-virtual {p0, v3}, Lp0/a/a/d;->l(I)I
-
-    move-result v3
-
-    add-int/lit8 p3, p3, 0x6
-
-    const-string v4, "BootstrapMethods"
-
-    invoke-virtual {v4, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_6
-
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->u(I)I
-
-    move-result p1
-
-    new-array p2, p1, [I
-
-    add-int/lit8 p3, p3, 0x2
-
-    :goto_7
-    if-ge v0, p1, :cond_5
-
-    aput p3, p2, v0
-
-    add-int/lit8 v1, p3, 0x2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    mul-int/lit8 v1, v1, 0x2
-
-    add-int/2addr v1, v5
-
-    add-int/2addr p3, v1
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_7
-
-    :cond_5
-    move-object p1, p2
-
-    goto :goto_8
-
-    :cond_6
-    add-int/2addr p3, v3
-
-    add-int/lit8 v1, v1, -0x1
-
-    goto :goto_6
-
-    :cond_7
-    :goto_8
-    iput-object p1, p0, Lp0/a/a/d;->e:[I
-
-    return-void
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x1
-        :pswitch_6
-        :pswitch_0
-        :pswitch_5
-        :pswitch_5
-        :pswitch_4
-        :pswitch_4
-        :pswitch_3
-        :pswitch_3
-        :pswitch_5
-        :pswitch_5
-        :pswitch_5
-        :pswitch_5
-        :pswitch_0
-        :pswitch_0
-        :pswitch_7
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_3
-        :pswitch_3
-    .end packed-switch
-.end method
-
-
-# virtual methods
-.method public final a(I[Lp0/a/a/p;)V
-    .locals 1
-
-    aget-object v0, p2, p1
-
-    if-nez v0, :cond_1
-
-    aget-object v0, p2, p1
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Lp0/a/a/p;
-
-    invoke-direct {v0}, Lp0/a/a/p;-><init>()V
-
-    aput-object v0, p2, p1
-
-    :cond_0
-    aget-object p1, p2, p1
-
-    iget-short p2, p1, Lp0/a/a/p;->a:S
-
-    or-int/lit8 p2, p2, 0x1
-
-    int-to-short p2, p2
-
-    iput-short p2, p1, Lp0/a/a/p;->a:S
-
-    :cond_1
-    return-void
-.end method
-
-.method public final b(I[Lp0/a/a/p;)Lp0/a/a/p;
-    .locals 1
-
-    aget-object v0, p2, p1
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Lp0/a/a/p;
-
-    invoke-direct {v0}, Lp0/a/a/p;-><init>()V
-
-    aput-object v0, p2, p1
-
-    :cond_0
-    aget-object p1, p2, p1
-
-    iget-short p2, p1, Lp0/a/a/p;->a:S
-
-    and-int/lit8 p2, p2, -0x2
-
-    int-to-short p2, p2
-
-    iput-short p2, p1, Lp0/a/a/p;->a:S
-
-    return-object p1
-.end method
-
-.method public final c()I
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/d;->g:I
-
-    add-int/lit8 v1, v0, 0x8
-
-    add-int/lit8 v0, v0, 0x6
-
-    invoke-virtual {p0, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    mul-int/lit8 v0, v0, 0x2
-
-    add-int/2addr v0, v1
-
-    invoke-virtual {p0, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v0, v0, 0x2
-
-    :goto_0
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_1
-
-    add-int/lit8 v1, v0, 0x6
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v0, v0, 0x8
-
-    :goto_1
-    add-int/lit8 v3, v1, -0x1
-
-    if-lez v1, :cond_0
-
-    add-int/lit8 v1, v0, 0x2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0x6
-
-    add-int/2addr v0, v1
-
-    move v1, v3
-
-    goto :goto_1
-
-    :cond_0
-    move v1, v2
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v0, v0, 0x2
-
-    :goto_2
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_3
-
-    add-int/lit8 v1, v0, 0x6
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v0, v0, 0x8
-
-    :goto_3
-    add-int/lit8 v3, v1, -0x1
-
-    if-lez v1, :cond_2
-
-    add-int/lit8 v1, v0, 0x2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, 0x6
-
-    add-int/2addr v0, v1
-
-    move v1, v3
-
-    goto :goto_3
-
-    :cond_2
-    move v1, v2
-
-    goto :goto_2
-
-    :cond_3
-    add-int/lit8 v0, v0, 0x2
-
-    return v0
-.end method
-
-.method public final d([II)I
-    .locals 2
-
-    if-eqz p1, :cond_1
-
-    array-length v0, p1
-
-    if-ge p2, v0, :cond_1
-
-    aget v0, p1, p2
-
-    invoke-virtual {p0, v0}, Lp0/a/a/d;->f(I)I
-
-    move-result v0
-
-    const/16 v1, 0x43
-
-    if-ge v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    aget p1, p1, p2
-
-    add-int/lit8 p1, p1, 0x1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/d;->u(I)I
-
-    move-result p1
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, -0x1
-
-    return p1
-.end method
-
-.method public final e([Lp0/a/a/b;Ljava/lang/String;II[CI[Lp0/a/a/p;)Lp0/a/a/b;
-    .locals 2
-
-    array-length p5, p1
-
-    const/4 p6, 0x0
-
-    const/4 p7, 0x0
-
-    :goto_0
-    if-ge p7, p5, :cond_1
-
-    aget-object v0, p1, p7
-
-    iget-object v1, v0, Lp0/a/a/b;->a:Ljava/lang/String;
-
-    invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    new-instance p1, Lp0/a/a/b;
-
-    iget-object p2, v0, Lp0/a/a/b;->a:Ljava/lang/String;
-
-    invoke-direct {p1, p2}, Lp0/a/a/b;-><init>(Ljava/lang/String;)V
-
-    new-array p2, p4, [B
-
-    iput-object p2, p1, Lp0/a/a/b;->b:[B
-
-    iget-object p5, p0, Lp0/a/a/d;->a:[B
-
-    invoke-static {p5, p3, p2, p6, p4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    return-object p1
-
-    :cond_0
-    add-int/lit8 p7, p7, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Lp0/a/a/b;
-
-    invoke-direct {p1, p2}, Lp0/a/a/b;-><init>(Ljava/lang/String;)V
-
-    new-array p2, p4, [B
-
-    iput-object p2, p1, Lp0/a/a/b;->b:[B
-
-    iget-object p5, p0, Lp0/a/a/d;->a:[B
-
-    invoke-static {p5, p3, p2, p6, p4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    return-object p1
-.end method
-
-.method public f(I)I
-    .locals 1
-
-    iget-object v0, p0, Lp0/a/a/d;->a:[B
-
-    aget-byte p1, v0, p1
-
-    and-int/lit16 p1, p1, 0xff
-
-    return p1
-.end method
-
-.method public g(I[C)Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {p0, p1}, Lp0/a/a/d;->u(I)I
-
-    move-result p1
-
-    aget p1, v0, p1
-
-    invoke-virtual {p0, p1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final h(Lp0/a/a/q;Lp0/a/a/h;I)V
-    .locals 47
-
-    move-object/from16 v8, p0
-
-    move-object/from16 v9, p1
-
-    move-object/from16 v10, p2
-
-    move/from16 v11, p3
-
-    iget-object v12, v8, Lp0/a/a/d;->a:[B
-
-    iget-object v13, v10, Lp0/a/a/h;->c:[C
-
-    invoke-virtual {v8, v11}, Lp0/a/a/d;->u(I)I
-
-    move-result v14
-
-    add-int/lit8 v0, v11, 0x2
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v15
-
-    add-int/lit8 v0, v11, 0x4
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v7
-
-    add-int/lit8 v16, v11, 0x8
-
-    add-int v6, v16, v7
-
-    add-int/lit8 v0, v7, 0x1
-
-    new-array v5, v0, [Lp0/a/a/p;
-
-    iput-object v5, v10, Lp0/a/a/h;->g:[Lp0/a/a/p;
-
-    move/from16 v0, v16
-
-    :goto_0
-    const/16 v4, 0x84
-
-    const/16 v3, 0xff
-
-    const/4 v1, 0x4
-
-    if-ge v0, v6, :cond_3
-
-    sub-int v18, v0, v16
-
-    aget-byte v2, v12, v0
-
-    and-int/2addr v2, v3
-
-    packed-switch v2, :pswitch_data_0
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw v0
-
-    :pswitch_0
-    add-int/lit8 v1, v0, 0x1
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int v1, v1, v18
-
-    invoke-virtual {v8, v1, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    goto/16 :goto_4
-
-    :pswitch_1
-    add-int/lit8 v1, v0, 0x1
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    add-int v1, v1, v18
-
-    invoke-virtual {v8, v1, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    goto :goto_1
-
-    :pswitch_2
-    add-int/lit8 v1, v0, 0x1
-
-    aget-byte v1, v12, v1
-
-    and-int/2addr v1, v3
-
-    if-eq v1, v4, :cond_1
-
-    const/16 v2, 0xa9
-
-    if-eq v1, v2, :cond_0
-
-    packed-switch v1, :pswitch_data_1
-
-    packed-switch v1, :pswitch_data_2
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw v0
-
-    :cond_0
-    :pswitch_3
-    add-int/lit8 v0, v0, 0x4
-
-    goto :goto_0
-
-    :cond_1
-    add-int/lit8 v0, v0, 0x6
-
-    goto :goto_0
-
-    :goto_1
-    :pswitch_4
-    add-int/lit8 v0, v0, 0x5
-
-    goto :goto_0
-
-    :pswitch_5
-    and-int/lit8 v2, v18, 0x3
-
-    sub-int/2addr v1, v2
-
-    add-int/2addr v1, v0
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    add-int v0, v0, v18
-
-    invoke-virtual {v8, v0, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    add-int/lit8 v0, v1, 0x4
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    const/16 v2, 0x8
-
-    add-int/2addr v1, v2
-
-    :goto_2
-    add-int/lit8 v2, v0, -0x1
-
-    if-lez v0, :cond_2
-
-    add-int/lit8 v0, v1, 0x4
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    add-int v0, v0, v18
-
-    invoke-virtual {v8, v0, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    add-int/lit8 v1, v1, 0x8
-
-    move v0, v2
-
-    goto :goto_2
-
-    :pswitch_6
-    and-int/lit8 v2, v18, 0x3
-
-    sub-int/2addr v1, v2
-
-    add-int/2addr v1, v0
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    add-int v0, v0, v18
-
-    invoke-virtual {v8, v0, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    add-int/lit8 v0, v1, 0x8
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    add-int/lit8 v2, v1, 0x4
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->l(I)I
-
-    move-result v2
-
-    sub-int/2addr v0, v2
-
-    const/4 v2, 0x1
-
-    add-int/2addr v0, v2
-
-    add-int/lit8 v1, v1, 0xc
-
-    :goto_3
-    add-int/lit8 v2, v0, -0x1
-
-    if-lez v0, :cond_2
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    add-int v0, v0, v18
-
-    invoke-virtual {v8, v0, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    add-int/lit8 v1, v1, 0x4
-
-    move v0, v2
-
-    goto :goto_3
-
-    :cond_2
-    move v0, v1
-
-    goto/16 :goto_0
-
-    :pswitch_7
-    add-int/lit8 v1, v0, 0x1
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->q(I)S
-
-    move-result v1
-
-    add-int v1, v1, v18
-
-    invoke-virtual {v8, v1, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    :goto_4
-    :pswitch_8
-    add-int/lit8 v0, v0, 0x3
-
-    goto/16 :goto_0
-
-    :pswitch_9
-    add-int/lit8 v0, v0, 0x2
-
-    goto/16 :goto_0
-
-    :pswitch_a
-    add-int/lit8 v0, v0, 0x1
-
-    goto/16 :goto_0
-
-    :cond_3
-    const/16 v2, 0x8
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v17
-
-    const/4 v1, 0x2
-
-    add-int/2addr v0, v1
-
-    :goto_5
-    add-int/lit8 v20, v17, -0x1
-
-    if-lez v17, :cond_6
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    invoke-virtual {v8, v2, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v24
-
-    add-int/lit8 v2, v0, 0x2
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    invoke-virtual {v8, v2, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v25
-
-    add-int/lit8 v2, v0, 0x4
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    invoke-virtual {v8, v2, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v26
-
-    iget-object v2, v8, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v3, v0, 0x6
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    aget v2, v2, v3
-
-    invoke-virtual {v8, v2, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v0, v0, 0x8
-
-    move-object v3, v9
-
-    check-cast v3, Lp0/a/a/r;
-
-    new-instance v4, Lp0/a/a/o;
-
-    if-eqz v2, :cond_4
-
-    iget-object v1, v3, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    move/from16 v31, v6
-
-    const/4 v6, 0x7
-
-    invoke-virtual {v1, v6, v2}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    move/from16 v27, v1
-
-    goto :goto_6
-
-    :cond_4
-    move/from16 v31, v6
-
-    const/16 v27, 0x0
-
-    :goto_6
-    move-object/from16 v23, v4
-
-    move-object/from16 v28, v2
-
-    invoke-direct/range {v23 .. v28}, Lp0/a/a/o;-><init>(Lp0/a/a/p;Lp0/a/a/p;Lp0/a/a/p;ILjava/lang/String;)V
-
-    iget-object v1, v3, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    if-nez v1, :cond_5
-
-    iput-object v4, v3, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    goto :goto_7
-
-    :cond_5
-    iget-object v1, v3, Lp0/a/a/r;->m:Lp0/a/a/o;
-
-    iput-object v4, v1, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    :goto_7
-    iput-object v4, v3, Lp0/a/a/r;->m:Lp0/a/a/o;
-
-    move/from16 v17, v20
-
-    move/from16 v6, v31
-
-    const/4 v1, 0x2
-
-    const/16 v2, 0x8
-
-    const/16 v3, 0xff
-
-    const/16 v4, 0x84
-
-    goto :goto_5
-
-    :cond_6
-    move/from16 v31, v6
-
-    const/4 v6, 0x7
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    const/4 v3, 0x2
-
-    add-int/2addr v0, v3
-
-    const/4 v3, 0x0
-
-    const/16 v20, 0x1
-
-    const/16 v22, 0x0
-
-    const/16 v32, 0x0
-
-    const/16 v33, 0x0
-
-    const/16 v34, 0x0
-
-    const/16 v35, 0x0
-
-    const/16 v36, 0x0
-
-    :goto_8
-    add-int/lit8 v23, v2, -0x1
-
-    if-lez v2, :cond_14
-
-    invoke-virtual {v8, v0, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v4, v0, 0x2
-
-    invoke-virtual {v8, v4}, Lp0/a/a/d;->l(I)I
-
-    move-result v25
-
-    add-int/lit8 v4, v0, 0x6
-
-    const-string v0, "LocalVariableTable"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_9
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    const/4 v2, 0x2
-
-    and-int/2addr v0, v2
-
-    if-nez v0, :cond_8
-
-    invoke-virtual {v8, v4}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 v2, v4, 0x2
-
-    :goto_9
-    add-int/lit8 v26, v0, -0x1
-
-    if-lez v0, :cond_7
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    invoke-virtual {v8, v0, v5}, Lp0/a/a/d;->a(I[Lp0/a/a/p;)V
-
-    add-int/lit8 v6, v2, 0x2
-
-    invoke-virtual {v8, v6}, Lp0/a/a/d;->u(I)I
-
-    move-result v6
-
-    add-int/2addr v6, v0
-
-    invoke-virtual {v8, v6, v5}, Lp0/a/a/d;->a(I[Lp0/a/a/p;)V
-
-    add-int/lit8 v2, v2, 0xa
-
-    move/from16 v0, v26
-
-    const/4 v6, 0x7
-
-    goto :goto_9
-
-    :cond_7
-    move/from16 v35, v4
-
-    goto :goto_a
-
-    :cond_8
-    move-object/from16 v38, v3
-
-    move-object/from16 v39, v5
-
-    move/from16 v40, v7
-
-    goto/16 :goto_10
-
-    :cond_9
-    const-string v0, "LocalVariableTypeTable"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_a
-
-    move/from16 v36, v4
-
-    :goto_a
-    move-object v0, v3
-
-    move-object/from16 v39, v5
-
-    move/from16 v40, v7
-
-    const/4 v1, 0x0
-
-    const/4 v3, 0x1
-
-    :goto_b
-    const/4 v5, 0x4
-
-    goto/16 :goto_13
-
-    :cond_a
-    const-string v0, "LineNumberTable"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_e
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    const/4 v6, 0x2
-
-    and-int/2addr v0, v6
-
-    if-nez v0, :cond_8
-
-    invoke-virtual {v8, v4}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 v2, v4, 0x2
-
-    :goto_c
-    add-int/lit8 v21, v0, -0x1
-
-    if-lez v0, :cond_8
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 v6, v2, 0x2
-
-    invoke-virtual {v8, v6}, Lp0/a/a/d;->u(I)I
-
-    move-result v6
-
-    const/4 v1, 0x4
-
-    add-int/2addr v2, v1
-
-    invoke-virtual {v8, v0, v5}, Lp0/a/a/d;->a(I[Lp0/a/a/p;)V
-
-    aget-object v0, v5, v0
-
-    iget-short v1, v0, Lp0/a/a/p;->b:S
-
-    if-nez v1, :cond_b
-
-    int-to-short v1, v6
-
-    iput-short v1, v0, Lp0/a/a/p;->b:S
-
-    move/from16 v37, v2
-
-    move-object/from16 v38, v3
-
-    move-object/from16 v39, v5
-
-    move/from16 v40, v7
-
-    goto :goto_f
-
-    :cond_b
-    iget-object v1, v0, Lp0/a/a/p;->c:[I
-
-    if-nez v1, :cond_c
-
-    move/from16 v37, v2
-
-    const/4 v1, 0x4
-
-    new-array v2, v1, [I
-
-    iput-object v2, v0, Lp0/a/a/p;->c:[I
-
-    goto :goto_d
-
-    :cond_c
-    move/from16 v37, v2
-
-    const/4 v1, 0x4
-
-    :goto_d
-    iget-object v2, v0, Lp0/a/a/p;->c:[I
-
-    const/4 v1, 0x0
-
-    aget v28, v2, v1
-
-    move-object/from16 v38, v3
-
-    const/16 v19, 0x1
-
-    add-int/lit8 v3, v28, 0x1
-
-    aput v3, v2, v1
-
-    array-length v1, v2
-
-    if-lt v3, v1, :cond_d
-
-    array-length v1, v2
-
-    const/16 v18, 0x4
-
-    add-int/lit8 v1, v1, 0x4
-
-    new-array v1, v1, [I
-
-    move-object/from16 v39, v5
-
-    array-length v5, v2
-
-    move/from16 v40, v7
-
-    const/4 v7, 0x0
-
-    invoke-static {v2, v7, v1, v7, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v1, v0, Lp0/a/a/p;->c:[I
-
-    goto :goto_e
-
-    :cond_d
-    move-object/from16 v39, v5
-
-    move/from16 v40, v7
-
-    :goto_e
-    iget-object v0, v0, Lp0/a/a/p;->c:[I
-
-    aput v6, v0, v3
-
-    :goto_f
-    move/from16 v0, v21
-
-    move/from16 v2, v37
-
-    move-object/from16 v3, v38
-
-    move-object/from16 v5, v39
-
-    move/from16 v7, v40
-
-    const/4 v6, 0x2
-
-    goto :goto_c
-
-    :goto_10
-    const/4 v1, 0x0
-
-    const/4 v3, 0x1
-
-    goto :goto_11
-
-    :cond_e
-    move-object/from16 v38, v3
-
-    move-object/from16 v39, v5
-
-    move/from16 v40, v7
-
-    const-string v0, "RuntimeVisibleTypeAnnotations"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_f
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v8, v9, v10, v4, v3}, Lp0/a/a/d;->s(Lp0/a/a/q;Lp0/a/a/h;IZ)[I
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    goto/16 :goto_b
-
-    :cond_f
-    const/4 v3, 0x1
-
-    const-string v0, "RuntimeInvisibleTypeAnnotations"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_10
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v8, v9, v10, v4, v1}, Lp0/a/a/d;->s(Lp0/a/a/q;Lp0/a/a/h;IZ)[I
-
-    move-result-object v34
-
-    :goto_11
-    const/4 v5, 0x4
-
-    goto :goto_12
-
-    :cond_10
-    const/4 v1, 0x0
-
-    const-string v0, "StackMapTable"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_11
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    const/4 v5, 0x4
-
-    and-int/2addr v0, v5
-
-    if-nez v0, :cond_12
-
-    add-int/lit8 v22, v4, 0x2
-
-    add-int v33, v4, v25
-
-    goto :goto_12
-
-    :cond_11
-    const/4 v5, 0x4
-
-    const-string v0, "StackMap"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_13
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    and-int/2addr v0, v5
-
-    if-nez v0, :cond_12
-
-    add-int/lit8 v0, v4, 0x2
-
-    add-int v2, v4, v25
-
-    move/from16 v22, v0
-
-    move/from16 v33, v2
-
-    move/from16 v17, v4
-
-    move/from16 v42, v31
-
-    move-object/from16 v3, v38
-
-    move-object/from16 v19, v39
-
-    move/from16 v43, v40
-
-    const/16 v11, 0x8
-
-    const/16 v20, 0x0
-
-    goto :goto_14
-
-    :cond_12
-    :goto_12
-    move-object/from16 v0, v38
-
-    :goto_13
-    move-object v3, v0
-
-    move/from16 v17, v4
-
-    move/from16 v42, v31
-
-    move-object/from16 v19, v39
-
-    move/from16 v43, v40
-
-    const/16 v11, 0x8
-
-    goto :goto_14
-
-    :cond_13
-    iget-object v6, v10, Lp0/a/a/h;->a:[Lp0/a/a/b;
-
-    move-object/from16 v0, p0
-
-    const/4 v5, 0x7
-
-    const/4 v7, 0x0
-
-    const/4 v11, 0x2
-
-    move-object v1, v6
-
-    const/16 v3, 0x8
-
-    const/4 v6, 0x1
-
-    move-object/from16 v41, v38
-
-    const/16 v11, 0x8
-
-    move v3, v4
-
-    move/from16 v17, v4
-
-    move/from16 v4, v25
-
-    move-object/from16 v19, v39
-
-    move-object v5, v13
-
-    move/from16 v42, v31
-
-    move/from16 v6, p3
-
-    move/from16 v43, v40
-
-    move-object/from16 v7, v19
-
-    invoke-virtual/range {v0 .. v7}, Lp0/a/a/d;->e([Lp0/a/a/b;Ljava/lang/String;II[CI[Lp0/a/a/p;)Lp0/a/a/b;
-
-    move-result-object v0
-
-    move-object/from16 v7, v32
-
-    iput-object v7, v0, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    move-object/from16 v32, v0
-
-    move-object/from16 v3, v41
-
-    :goto_14
-    add-int v0, v17, v25
-
-    move/from16 v11, p3
-
-    move-object/from16 v5, v19
-
-    move/from16 v2, v23
-
-    move/from16 v31, v42
-
-    move/from16 v7, v43
-
-    const/4 v6, 0x7
-
-    goto/16 :goto_8
-
-    :cond_14
-    move-object/from16 v41, v3
-
-    move-object/from16 v19, v5
-
-    move/from16 v43, v7
-
-    move/from16 v42, v31
-
-    move-object/from16 v7, v32
-
-    const/16 v11, 0x8
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    and-int/2addr v0, v11
-
-    if-eqz v0, :cond_15
-
-    const/4 v6, 0x1
-
-    goto :goto_15
-
-    :cond_15
-    const/4 v6, 0x0
-
-    :goto_15
-    const/4 v5, -0x1
-
-    if-eqz v22, :cond_25
-
-    iput v5, v10, Lp0/a/a/h;->m:I
-
-    const/4 v4, 0x0
-
-    iput v4, v10, Lp0/a/a/h;->n:I
-
-    iput v4, v10, Lp0/a/a/h;->o:I
-
-    iput v4, v10, Lp0/a/a/h;->p:I
-
-    new-array v0, v15, [Ljava/lang/Object;
-
-    iput-object v0, v10, Lp0/a/a/h;->q:[Ljava/lang/Object;
-
-    iput v4, v10, Lp0/a/a/h;->r:I
-
-    new-array v1, v14, [Ljava/lang/Object;
-
-    iput-object v1, v10, Lp0/a/a/h;->s:[Ljava/lang/Object;
-
-    if-eqz v6, :cond_20
-
-    iget-object v1, v10, Lp0/a/a/h;->f:Ljava/lang/String;
-
-    iget v2, v10, Lp0/a/a/h;->d:I
-
-    and-int/2addr v2, v11
-
-    if-nez v2, :cond_17
-
-    iget-object v2, v10, Lp0/a/a/h;->e:Ljava/lang/String;
-
-    const-string v3, "<init>"
-
-    invoke-virtual {v3, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_16
-
-    sget-object v2, Lp0/a/a/t;->g:Ljava/lang/Integer;
-
-    aput-object v2, v0, v4
-
-    goto :goto_16
-
-    :cond_16
-    iget v2, v8, Lp0/a/a/d;->g:I
-
-    const/4 v3, 0x2
-
-    add-int/2addr v2, v3
-
-    iget-object v3, v10, Lp0/a/a/h;->c:[C
-
-    invoke-virtual {v8, v2, v3}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    aput-object v2, v0, v4
-
-    :goto_16
-    const/4 v2, 0x1
-
-    goto :goto_17
-
-    :cond_17
-    const/4 v2, 0x0
-
-    :goto_17
-    move v3, v2
-
-    const/4 v2, 0x1
-
-    :goto_18
-    add-int/lit8 v4, v2, 0x1
-
-    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    const/16 v11, 0x46
-
-    if-eq v5, v11, :cond_1f
-
-    const/16 v11, 0x4c
-
-    if-eq v5, v11, :cond_1d
-
-    const/16 v11, 0x53
-
-    if-eq v5, v11, :cond_1c
-
-    const/16 v11, 0x49
-
-    if-eq v5, v11, :cond_1c
-
-    const/16 v11, 0x4a
-
-    if-eq v5, v11, :cond_1b
-
-    const/16 v11, 0x5a
-
-    if-eq v5, v11, :cond_1c
-
-    const/16 v11, 0x5b
-
-    if-eq v5, v11, :cond_18
-
-    packed-switch v5, :pswitch_data_3
-
-    iput v3, v10, Lp0/a/a/h;->o:I
-
-    goto/16 :goto_1e
-
-    :pswitch_b
-    add-int/lit8 v2, v3, 0x1
-
-    sget-object v5, Lp0/a/a/t;->d:Ljava/lang/Integer;
-
-    aput-object v5, v0, v3
-
-    goto :goto_1c
-
-    :cond_18
-    :goto_19
-    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    if-ne v5, v11, :cond_19
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_19
-
-    :cond_19
-    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    const/16 v11, 0x4c
-
-    if-ne v5, v11, :cond_1a
-
-    :goto_1a
-    const/4 v11, 0x1
-
-    add-int/2addr v4, v11
-
-    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    const/16 v11, 0x3b
-
-    if-eq v5, v11, :cond_1a
-
-    goto :goto_1a
-
-    :cond_1a
-    add-int/lit8 v5, v3, 0x1
-
-    const/4 v11, 0x1
-
-    add-int/2addr v4, v11
-
-    invoke-virtual {v1, v2, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    aput-object v2, v0, v3
-
-    move v2, v4
-
-    move v3, v5
-
-    goto :goto_1d
-
-    :cond_1b
-    add-int/lit8 v2, v3, 0x1
-
-    sget-object v5, Lp0/a/a/t;->e:Ljava/lang/Integer;
-
-    aput-object v5, v0, v3
-
-    goto :goto_1c
-
-    :cond_1c
-    :pswitch_c
-    add-int/lit8 v2, v3, 0x1
-
-    sget-object v5, Lp0/a/a/t;->b:Ljava/lang/Integer;
-
-    aput-object v5, v0, v3
-
-    goto :goto_1c
-
-    :cond_1d
-    move v2, v4
-
-    :goto_1b
-    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    const/16 v11, 0x3b
-
-    if-eq v5, v11, :cond_1e
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1b
-
-    :cond_1e
-    add-int/lit8 v5, v3, 0x1
-
-    add-int/lit8 v11, v2, 0x1
-
-    invoke-virtual {v1, v4, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v2
-
-    aput-object v2, v0, v3
-
-    move v3, v5
-
-    move v2, v11
-
-    goto :goto_1d
-
-    :cond_1f
-    add-int/lit8 v2, v3, 0x1
-
-    sget-object v5, Lp0/a/a/t;->c:Ljava/lang/Integer;
-
-    aput-object v5, v0, v3
-
-    :goto_1c
-    move v3, v2
-
-    move v2, v4
-
-    :goto_1d
-    const/4 v4, 0x0
-
-    const/4 v5, -0x1
-
-    const/16 v11, 0x8
-
-    goto/16 :goto_18
-
-    :cond_20
-    :goto_1e
-    move/from16 v0, v22
-
-    :goto_1f
-    move/from16 v11, v33
-
-    add-int/lit8 v1, v11, -0x2
-
-    if-ge v0, v1, :cond_24
-
-    aget-byte v1, v12, v0
-
-    const/16 v2, 0x8
-
-    if-ne v1, v2, :cond_23
-
-    add-int/lit8 v1, v0, 0x1
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    if-ltz v1, :cond_23
-
-    move/from16 v5, v43
-
-    if-ge v1, v5, :cond_22
-
-    add-int v2, v16, v1
-
-    aget-byte v2, v12, v2
-
-    const/16 v4, 0xff
-
-    and-int/2addr v2, v4
-
-    const/16 v3, 0xbb
-
-    if-ne v2, v3, :cond_21
-
-    move-object/from16 v3, v19
-
-    invoke-virtual {v8, v1, v3}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    goto :goto_21
-
-    :cond_21
-    move-object/from16 v3, v19
-
-    goto :goto_21
-
-    :cond_22
-    move-object/from16 v3, v19
-
-    goto :goto_20
-
-    :cond_23
-    move-object/from16 v3, v19
-
-    move/from16 v5, v43
-
-    :goto_20
-    const/16 v4, 0xff
-
-    :goto_21
-    add-int/lit8 v0, v0, 0x1
-
-    move-object/from16 v19, v3
-
-    move/from16 v43, v5
-
-    move/from16 v33, v11
-
-    goto :goto_1f
-
-    :cond_24
-    move-object/from16 v3, v19
-
-    goto :goto_22
-
-    :cond_25
-    move-object/from16 v3, v19
-
-    move/from16 v11, v33
-
-    :goto_22
-    move/from16 v5, v43
-
-    const/16 v4, 0xff
-
-    if-eqz v6, :cond_26
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    and-int/lit16 v0, v0, 0x100
-
-    if-eqz v0, :cond_26
-
-    const/4 v1, -0x1
-
-    const/16 v19, 0x0
-
-    const/16 v23, 0x0
-
-    const/16 v24, 0x0
-
-    move-object/from16 v0, p1
-
-    move v2, v15
-
-    move-object/from16 v44, v3
-
-    move-object/from16 v3, v19
-
-    move-object/from16 v19, v7
-
-    const/4 v7, 0x0
-
-    move/from16 v4, v23
-
-    move/from16 v23, v5
-
-    move-object/from16 v5, v24
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-
-    goto :goto_23
-
-    :cond_26
-    move-object/from16 v44, v3
-
-    move/from16 v23, v5
-
-    move-object/from16 v19, v7
-
-    const/4 v7, 0x0
-
-    :goto_23
-    move-object/from16 v5, v41
-
-    invoke-virtual {v8, v5, v7}, Lp0/a/a/d;->d([II)I
-
-    move-result v0
-
-    move-object/from16 v4, v34
-
-    invoke-virtual {v8, v4, v7}, Lp0/a/a/d;->d([II)I
-
-    move-result v1
-
-    iget v2, v10, Lp0/a/a/h;->b:I
-
-    and-int/lit16 v2, v2, 0x100
-
-    if-nez v2, :cond_27
-
-    const/16 v2, 0x21
-
-    const/16 v24, 0x21
-
-    goto :goto_24
-
-    :cond_27
-    const/16 v24, 0x0
-
-    :goto_24
-    move/from16 v27, v1
-
-    move/from16 v3, v16
-
-    move/from16 v1, v22
-
-    const/16 v25, 0x0
-
-    const/16 v26, 0x0
-
-    move/from16 v22, v0
-
-    const/4 v0, 0x0
-
-    :goto_25
-    move/from16 v7, v42
-
-    if-ge v3, v7, :cond_56
-
-    move/from16 v42, v7
-
-    sub-int v7, v3, v16
-
-    move/from16 v29, v14
-
-    move-object/from16 v14, v44
-
-    aget-object v2, v14, v7
-
-    move/from16 v31, v0
-
-    if-eqz v2, :cond_29
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    const/16 v21, 0x2
-
-    and-int/lit8 v0, v0, 0x2
-
-    if-nez v0, :cond_28
-
-    const/4 v0, 0x1
-
-    goto :goto_26
-
-    :cond_28
-    const/4 v0, 0x0
-
-    :goto_26
-    invoke-virtual {v9, v2}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
-
-    if-eqz v0, :cond_29
-
-    iget-short v0, v2, Lp0/a/a/p;->b:S
-
-    if-eqz v0, :cond_29
-
-    const v32, 0xffff
-
-    and-int v0, v0, v32
-
-    invoke-virtual {v9, v0, v2}, Lp0/a/a/q;->k(ILp0/a/a/p;)V
-
-    iget-object v0, v2, Lp0/a/a/p;->c:[I
-
-    if-eqz v0, :cond_29
-
-    move/from16 v32, v1
-
-    const/4 v0, 0x1
-
-    :goto_27
-    iget-object v1, v2, Lp0/a/a/p;->c:[I
-
-    move/from16 v33, v3
-
-    const/16 v28, 0x0
-
-    aget v3, v1, v28
-
-    if-gt v0, v3, :cond_2a
-
-    aget v1, v1, v0
-
-    invoke-virtual {v9, v1, v2}, Lp0/a/a/q;->k(ILp0/a/a/p;)V
-
-    add-int/lit8 v0, v0, 0x1
-
-    move/from16 v3, v33
-
-    goto :goto_27
-
-    :cond_29
-    move/from16 v32, v1
-
-    move/from16 v33, v3
-
-    :cond_2a
-    move/from16 v1, v31
-
-    move/from16 v3, v32
-
-    :goto_28
-    if-eqz v3, :cond_3c
-
-    iget v0, v10, Lp0/a/a/h;->m:I
-
-    const/4 v2, -0x1
-
-    if-eq v0, v7, :cond_2b
-
-    if-ne v0, v2, :cond_3c
-
-    :cond_2b
-    iget v0, v10, Lp0/a/a/h;->m:I
-
-    if-eq v0, v2, :cond_2e
-
-    if-eqz v20, :cond_2d
-
-    if-eqz v6, :cond_2c
-
-    goto :goto_29
-
-    :cond_2c
-    iget v1, v10, Lp0/a/a/h;->n:I
-
-    iget v0, v10, Lp0/a/a/h;->p:I
-
-    move/from16 v31, v3
-
-    iget-object v3, v10, Lp0/a/a/h;->q:[Ljava/lang/Object;
-
-    move-object/from16 v32, v4
-
-    iget v4, v10, Lp0/a/a/h;->r:I
-
-    move-object/from16 v41, v5
-
-    iget-object v5, v10, Lp0/a/a/h;->s:[Ljava/lang/Object;
-
-    move/from16 v34, v0
-
-    move-object/from16 v0, p1
-
-    move/from16 v37, v15
-
-    const/4 v15, -0x1
-
-    move/from16 v2, v34
-
-    move/from16 v15, v31
-
-    move/from16 v31, v33
-
-    move-object/from16 v45, v32
-
-    move-object/from16 v46, v41
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-
-    goto :goto_2a
-
-    :cond_2d
-    :goto_29
-    move-object/from16 v45, v4
-
-    move-object/from16 v46, v5
-
-    move/from16 v37, v15
-
-    move/from16 v31, v33
-
-    move v15, v3
-
-    const/4 v1, -0x1
-
-    iget v2, v10, Lp0/a/a/h;->o:I
-
-    iget-object v3, v10, Lp0/a/a/h;->q:[Ljava/lang/Object;
-
-    iget v4, v10, Lp0/a/a/h;->r:I
-
-    iget-object v5, v10, Lp0/a/a/h;->s:[Ljava/lang/Object;
-
-    move-object/from16 v0, p1
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-
-    :goto_2a
-    const/16 v32, 0x0
-
-    goto :goto_2b
-
-    :cond_2e
-    move-object/from16 v45, v4
-
-    move-object/from16 v46, v5
-
-    move/from16 v37, v15
-
-    move/from16 v31, v33
-
-    move v15, v3
-
-    move/from16 v32, v1
-
-    :goto_2b
-    if-ge v15, v11, :cond_3b
-
-    iget-object v5, v10, Lp0/a/a/h;->c:[C
-
-    iget-object v4, v10, Lp0/a/a/h;->g:[Lp0/a/a/p;
-
-    if-eqz v20, :cond_2f
-
-    iget-object v0, v8, Lp0/a/a/d;->a:[B
-
-    add-int/lit8 v3, v15, 0x1
-
-    aget-byte v0, v0, v15
-
-    const/16 v2, 0xff
-
-    and-int/2addr v0, v2
-
-    move v1, v3
-
-    move v3, v0
-
-    const/4 v0, 0x0
-
-    goto :goto_2c
-
-    :cond_2f
-    const/4 v0, -0x1
-
-    const/16 v2, 0xff
-
-    iput v0, v10, Lp0/a/a/h;->m:I
-
-    move v1, v15
-
-    const/4 v0, 0x0
-
-    const/16 v3, 0xff
-
-    :goto_2c
-    iput v0, v10, Lp0/a/a/h;->p:I
-
-    const/16 v15, 0x40
-
-    if-ge v3, v15, :cond_30
-
-    const/4 v15, 0x3
-
-    iput v15, v10, Lp0/a/a/h;->n:I
-
-    iput v0, v10, Lp0/a/a/h;->r:I
-
-    move v0, v1
-
-    move-object/from16 v33, v4
-
-    move/from16 v34, v11
-
-    goto/16 :goto_33
-
-    :cond_30
-    const/16 v0, 0x80
-
-    if-ge v3, v0, :cond_31
-
-    add-int/lit8 v15, v3, -0x40
-
-    iget-object v3, v10, Lp0/a/a/h;->s:[Ljava/lang/Object;
-
-    const/16 v33, 0x0
-
-    move-object/from16 v0, p0
-
-    move/from16 v34, v11
-
-    const/16 v11, 0xff
-
-    move-object v2, v3
-
-    move/from16 v3, v33
-
-    move-object/from16 v33, v4
-
-    move-object v4, v5
-
-    move-object/from16 v5, v33
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lp0/a/a/p;)I
-
-    move-result v0
-
-    const/4 v1, 0x4
-
-    iput v1, v10, Lp0/a/a/h;->n:I
-
-    const/4 v1, 0x1
-
-    iput v1, v10, Lp0/a/a/h;->r:I
-
-    :goto_2d
-    move v3, v15
-
-    goto/16 :goto_33
-
-    :cond_31
-    move-object/from16 v33, v4
-
-    move/from16 v34, v11
-
-    const/16 v11, 0xff
-
-    const/16 v0, 0xf7
-
-    if-lt v3, v0, :cond_3a
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v15
-
-    add-int/lit8 v1, v1, 0x2
-
-    if-ne v3, v0, :cond_32
-
-    iget-object v2, v10, Lp0/a/a/h;->s:[Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    move-object/from16 v0, p0
-
-    move-object v4, v5
-
-    move-object/from16 v5, v33
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lp0/a/a/p;)I
-
-    move-result v0
-
-    const/4 v1, 0x4
-
-    iput v1, v10, Lp0/a/a/h;->n:I
-
-    const/4 v1, 0x1
-
-    iput v1, v10, Lp0/a/a/h;->r:I
-
-    goto :goto_2d
-
-    :cond_32
-    const/16 v0, 0xf8
-
-    const/16 v2, 0xfb
-
-    if-lt v3, v0, :cond_33
-
-    if-ge v3, v2, :cond_33
-
-    const/4 v0, 0x2
-
-    iput v0, v10, Lp0/a/a/h;->n:I
-
-    rsub-int v0, v3, 0xfb
-
-    iput v0, v10, Lp0/a/a/h;->p:I
-
-    iget v2, v10, Lp0/a/a/h;->o:I
-
-    sub-int/2addr v2, v0
-
-    iput v2, v10, Lp0/a/a/h;->o:I
-
-    const/4 v0, 0x0
-
-    iput v0, v10, Lp0/a/a/h;->r:I
-
-    goto :goto_2e
-
-    :cond_33
-    const/4 v0, 0x0
-
-    if-ne v3, v2, :cond_35
-
-    const/4 v2, 0x3
-
-    iput v2, v10, Lp0/a/a/h;->n:I
-
-    iput v0, v10, Lp0/a/a/h;->r:I
-
-    :cond_34
-    :goto_2e
-    move v0, v1
-
-    goto :goto_2d
-
-    :cond_35
-    if-ge v3, v11, :cond_38
-
-    if-eqz v6, :cond_36
-
-    iget v0, v10, Lp0/a/a/h;->o:I
-
-    goto :goto_2f
-
-    :cond_36
-    const/4 v0, 0x0
-
-    :goto_2f
-    add-int/lit16 v4, v3, -0xfb
-
-    move v3, v0
-
-    move/from16 v38, v4
-
-    :goto_30
-    if-lez v38, :cond_37
-
-    iget-object v2, v10, Lp0/a/a/h;->q:[Ljava/lang/Object;
-
-    add-int/lit8 v39, v3, 0x1
-
-    move-object/from16 v0, p0
-
-    move v11, v4
-
-    move-object v4, v5
-
-    move-object/from16 v40, v5
-
-    move-object/from16 v5, v33
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lp0/a/a/p;)I
-
-    move-result v1
-
-    add-int/lit8 v38, v38, -0x1
-
-    move v4, v11
-
-    move/from16 v3, v39
-
-    move-object/from16 v5, v40
-
-    const/16 v11, 0xff
-
-    goto :goto_30
-
-    :cond_37
-    move v11, v4
-
-    const/4 v0, 0x1
-
-    iput v0, v10, Lp0/a/a/h;->n:I
-
-    iput v11, v10, Lp0/a/a/h;->p:I
-
-    iget v0, v10, Lp0/a/a/h;->o:I
-
-    add-int/2addr v0, v11
-
-    iput v0, v10, Lp0/a/a/h;->o:I
-
-    const/4 v0, 0x0
-
-    iput v0, v10, Lp0/a/a/h;->r:I
-
-    goto :goto_2e
-
-    :cond_38
-    move-object/from16 v40, v5
-
-    const/4 v0, 0x0
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v11
-
-    add-int/lit8 v1, v1, 0x2
-
-    iput v0, v10, Lp0/a/a/h;->n:I
-
-    iput v11, v10, Lp0/a/a/h;->p:I
-
-    iput v11, v10, Lp0/a/a/h;->o:I
-
-    const/4 v5, 0x0
-
-    :goto_31
-    if-ge v5, v11, :cond_39
-
-    iget-object v2, v10, Lp0/a/a/h;->q:[Ljava/lang/Object;
-
-    move-object/from16 v0, p0
-
-    move v3, v5
-
-    move-object/from16 v4, v40
-
-    move/from16 v38, v5
-
-    move-object/from16 v5, v33
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lp0/a/a/p;)I
-
-    move-result v1
-
-    add-int/lit8 v5, v38, 0x1
-
-    goto :goto_31
-
-    :cond_39
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v11
-
-    add-int/lit8 v1, v1, 0x2
-
-    iput v11, v10, Lp0/a/a/h;->r:I
-
-    const/4 v5, 0x0
-
-    :goto_32
-    if-ge v5, v11, :cond_34
-
-    iget-object v2, v10, Lp0/a/a/h;->s:[Ljava/lang/Object;
-
-    move-object/from16 v0, p0
-
-    move v3, v5
-
-    move-object/from16 v4, v40
-
-    move/from16 v38, v5
-
-    move-object/from16 v5, v33
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lp0/a/a/p;)I
-
-    move-result v1
-
-    add-int/lit8 v5, v38, 0x1
-
-    goto :goto_32
-
-    :goto_33
-    iget v1, v10, Lp0/a/a/h;->m:I
-
-    const/4 v2, 0x1
-
-    add-int/2addr v3, v2
-
-    add-int/2addr v3, v1
-
-    iput v3, v10, Lp0/a/a/h;->m:I
-
-    move-object/from16 v1, v33
-
-    invoke-virtual {v8, v3, v1}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move v3, v0
-
-    move/from16 v33, v31
-
-    move/from16 v1, v32
-
-    move/from16 v11, v34
-
-    move/from16 v15, v37
-
-    move-object/from16 v4, v45
-
-    move-object/from16 v5, v46
-
-    goto/16 :goto_28
-
-    :cond_3a
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw v0
-
-    :cond_3b
-    move/from16 v33, v31
-
-    move/from16 v1, v32
-
-    move/from16 v15, v37
-
-    move-object/from16 v4, v45
-
-    move-object/from16 v5, v46
-
-    const/4 v3, 0x0
-
-    goto/16 :goto_28
-
-    :cond_3c
-    move-object/from16 v45, v4
-
-    move-object/from16 v46, v5
-
-    move/from16 v34, v11
-
-    move/from16 v37, v15
-
-    move/from16 v31, v33
-
-    move v15, v3
-
-    if-eqz v1, :cond_3e
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    const/16 v1, 0x8
-
-    and-int/2addr v0, v1
-
-    if-eqz v0, :cond_3d
-
-    const/16 v1, 0x100
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    move-object/from16 v0, p1
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-
-    :cond_3d
-    const/4 v11, 0x0
-
-    goto :goto_34
-
-    :cond_3e
-    move v11, v1
-
-    :goto_34
-    aget-byte v0, v12, v31
-
-    const/16 v1, 0xff
-
-    and-int/lit16 v5, v0, 0xff
-
-    const/16 v0, 0xc8
-
-    packed-switch v5, :pswitch_data_4
-
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :pswitch_d
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    add-int/2addr v1, v7
-
-    aget-object v1, v14, v1
-
-    invoke-virtual {v9, v0, v1}, Lp0/a/a/q;->h(ILp0/a/a/p;)V
-
-    add-int/lit8 v3, v31, 0x5
-
-    move/from16 v32, v6
-
-    move/from16 v39, v15
-
-    move/from16 v4, v22
-
-    move/from16 v5, v25
-
-    move-object/from16 v11, v46
-
-    const/4 v0, 0x1
-
-    :goto_35
-    const/4 v1, 0x4
-
-    const/16 v2, 0xff
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    goto/16 :goto_50
-
-    :pswitch_e
-    const/16 v1, 0xda
-
-    if-ge v5, v1, :cond_3f
-
-    add-int/lit8 v5, v5, -0x31
-
-    goto :goto_36
-
-    :cond_3f
-    add-int/lit8 v5, v5, -0x14
-
-    :goto_36
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/2addr v1, v7
-
-    aget-object v1, v14, v1
-
-    const/16 v2, 0xa7
-
-    if-eq v5, v2, :cond_42
-
-    const/16 v3, 0xa8
-
-    if-ne v5, v3, :cond_40
-
-    goto :goto_38
-
-    :cond_40
-    if-ge v5, v2, :cond_41
-
-    add-int/lit8 v5, v5, 0x1
-
-    const/4 v2, 0x1
-
-    xor-int/lit8 v3, v5, 0x1
-
-    sub-int/2addr v3, v2
-
-    goto :goto_37
-
-    :cond_41
-    xor-int/lit8 v3, v5, 0x1
-
-    :goto_37
-    add-int/lit8 v2, v7, 0x3
-
-    invoke-virtual {v8, v2, v14}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v2
-
-    invoke-virtual {v9, v3, v2}, Lp0/a/a/q;->h(ILp0/a/a/p;)V
-
-    invoke-virtual {v9, v0, v1}, Lp0/a/a/q;->h(ILp0/a/a/p;)V
-
-    const/4 v2, 0x1
-
-    goto :goto_39
-
-    :cond_42
-    :goto_38
-    add-int/lit8 v5, v5, 0x21
-
-    invoke-virtual {v9, v5, v1}, Lp0/a/a/q;->h(ILp0/a/a/p;)V
-
-    move v2, v11
-
-    :goto_39
-    add-int/lit8 v3, v31, 0x3
-
-    move/from16 v32, v6
-
-    goto/16 :goto_42
-
-    :pswitch_f
-    sub-int v5, v5, v24
-
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    add-int/2addr v0, v7
-
-    aget-object v0, v14, v0
-
-    invoke-virtual {v9, v5, v0}, Lp0/a/a/q;->h(ILp0/a/a/p;)V
-
-    add-int/lit8 v3, v31, 0x5
-
-    const/16 v4, 0x84
-
-    goto/16 :goto_3d
-
-    :pswitch_10
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3, v13}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v0
-
-    add-int/lit8 v3, v31, 0x3
-
-    aget-byte v1, v12, v3
-
-    const/16 v2, 0xff
-
-    and-int/2addr v1, v2
-
-    move-object v2, v9
-
-    check-cast v2, Lp0/a/a/r;
-
-    iget-object v3, v2, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v3, v3, Lp0/a/a/c;->b:I
-
-    iput v3, v2, Lp0/a/a/r;->Z:I
-
-    iget-object v3, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const/4 v4, 0x7
-
-    invoke-virtual {v3, v4, v0}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget-object v3, v2, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v5, v0, Lp0/a/a/u;->a:I
-
-    const/16 v4, 0xc5
-
-    invoke-virtual {v3, v4, v5}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v3, v2, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v3, :cond_45
-
-    iget v3, v2, Lp0/a/a/r;->N:I
-
-    const/4 v5, 0x4
-
-    if-eq v3, v5, :cond_44
-
-    const/4 v5, 0x3
-
-    if-ne v3, v5, :cond_43
-
-    goto :goto_3a
-
-    :cond_43
-    iget v0, v2, Lp0/a/a/r;->R:I
-
-    rsub-int/lit8 v1, v1, 0x1
-
-    add-int/2addr v1, v0
-
-    iput v1, v2, Lp0/a/a/r;->R:I
-
-    goto :goto_3b
-
-    :cond_44
-    :goto_3a
-    iget-object v3, v2, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v3, v3, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object v2, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v3, v4, v1, v0, v2}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_45
-    :goto_3b
-    const/16 v4, 0x84
-
-    goto :goto_3c
-
-    :pswitch_11
-    add-int/lit8 v3, v31, 0x1
-
-    aget-byte v0, v12, v3
-
-    const/16 v1, 0xff
-
-    and-int/2addr v0, v1
-
-    const/16 v4, 0x84
-
-    if-ne v0, v4, :cond_46
-
-    add-int/lit8 v3, v31, 0x2
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 v3, v31, 0x4
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->q(I)S
-
-    move-result v1
-
-    invoke-virtual {v9, v0, v1}, Lp0/a/a/q;->d(II)V
-
-    add-int/lit8 v3, v31, 0x6
-
-    goto :goto_3d
-
-    :cond_46
-    add-int/lit8 v3, v31, 0x2
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    invoke-virtual {v9, v0, v1}, Lp0/a/a/q;->t(II)V
-
-    :goto_3c
-    add-int/lit8 v3, v31, 0x4
-
-    goto :goto_3d
-
-    :pswitch_12
-    const/16 v4, 0x84
-
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3, v13}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v9, v5, v0}, Lp0/a/a/q;->s(ILjava/lang/String;)V
-
-    add-int/lit8 v3, v31, 0x3
-
-    :goto_3d
-    move/from16 v32, v6
-
-    goto/16 :goto_41
-
-    :pswitch_13
-    const/16 v4, 0x84
-
-    iget-object v0, v8, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    aget v0, v0, v1
-
-    iget-object v1, v8, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v0, 0x2
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {v8, v1, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    const/4 v3, 0x2
-
-    add-int/2addr v1, v3
-
-    invoke-virtual {v8, v1, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    iget-object v3, v8, Lp0/a/a/d;->e:[I
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    aget v0, v3, v0
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    invoke-virtual {v8, v3, v13}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lp0/a/a/n;
-
-    add-int/lit8 v5, v0, 0x2
-
-    invoke-virtual {v8, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v5
-
-    new-array v4, v5, [Ljava/lang/Object;
-
-    const/16 v18, 0x4
-
-    add-int/lit8 v0, v0, 0x4
-
-    move/from16 v32, v6
-
-    const/4 v6, 0x0
-
-    :goto_3e
-    if-ge v6, v5, :cond_47
-
-    move/from16 v30, v5
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v5
-
-    invoke-virtual {v8, v5, v13}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object v5
-
-    aput-object v5, v4, v6
-
-    const/4 v5, 0x2
-
-    add-int/2addr v0, v5
-
-    add-int/lit8 v6, v6, 0x1
-
-    move/from16 v5, v30
-
-    goto :goto_3e
-
-    :cond_47
-    move-object v0, v9
-
-    check-cast v0, Lp0/a/a/r;
-
-    iget-object v5, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    iput v5, v0, Lp0/a/a/r;->Z:I
-
-    iget-object v5, v0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v5, v3, v4}, Lp0/a/a/v;->a(Lp0/a/a/n;[Ljava/lang/Object;)Lp0/a/a/u;
-
-    move-result-object v3
-
-    iget v3, v3, Lp0/a/a/u;->a:I
-
-    const/16 v4, 0x12
-
-    invoke-virtual {v5, v4, v2, v1, v3}, Lp0/a/a/v;->d(ILjava/lang/String;Ljava/lang/String;I)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget-object v2, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v3, v1, Lp0/a/a/u;->a:I
-
-    const/16 v4, 0xba
-
-    invoke-virtual {v2, v4, v3}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    iget-object v2, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v2, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v2, :cond_4b
-
-    iget v2, v0, Lp0/a/a/r;->N:I
-
-    const/4 v3, 0x4
-
-    if-eq v2, v3, :cond_4a
-
-    const/4 v3, 0x3
-
-    if-ne v2, v3, :cond_48
-
-    goto :goto_3f
-
-    :cond_48
-    invoke-virtual {v1}, Lp0/a/a/u;->a()I
-
-    move-result v1
-
-    and-int/lit8 v2, v1, 0x3
-
-    const/4 v3, 0x2
-
-    shr-int/2addr v1, v3
-
-    sub-int/2addr v2, v1
-
-    const/4 v1, 0x1
-
-    add-int/2addr v2, v1
-
-    iget v1, v0, Lp0/a/a/r;->R:I
-
-    add-int/2addr v1, v2
-
-    iget v2, v0, Lp0/a/a/r;->S:I
-
-    if-le v1, v2, :cond_49
-
-    iput v1, v0, Lp0/a/a/r;->S:I
-
-    :cond_49
-    iput v1, v0, Lp0/a/a/r;->R:I
-
-    goto :goto_40
-
-    :cond_4a
-    :goto_3f
-    iget-object v2, v0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v2, v2, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object v0, v0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v2, v4, v3, v1, v0}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_4b
-    :goto_40
-    add-int/lit8 v3, v31, 0x5
-
-    :goto_41
-    move v2, v11
-
-    :goto_42
-    move v0, v2
-
-    move/from16 v39, v15
-
-    move/from16 v4, v22
-
-    move/from16 v5, v25
-
-    move-object/from16 v11, v46
-
-    goto/16 :goto_35
-
-    :pswitch_14
-    move/from16 v32, v6
-
-    iget-object v0, v8, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    aget v0, v0, v1
-
-    iget-object v1, v8, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v0, 0x2
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {v8, v0, v13}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v8, v1, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    const/4 v4, 0x2
-
-    add-int/2addr v1, v4
-
-    invoke-virtual {v8, v1, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v4
-
-    const/16 v1, 0xb6
-
-    if-ge v5, v1, :cond_4c
-
-    invoke-virtual {v9, v5, v2, v3, v4}, Lp0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-
-    move/from16 v38, v11
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    goto :goto_44
-
-    :cond_4c
-    add-int/lit8 v0, v0, -0x1
-
-    aget-byte v0, v12, v0
-
-    const/16 v1, 0xb
-
-    if-ne v0, v1, :cond_4d
-
-    const/4 v6, 0x1
-
-    goto :goto_43
-
-    :cond_4d
-    const/4 v6, 0x0
-
-    :goto_43
-    move-object/from16 v0, p1
-
-    move v1, v5
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move/from16 v38, v11
-
-    move v11, v5
-
-    move v5, v6
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/q;->p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-
-    :goto_44
-    const/16 v0, 0xb9
-
-    if-ne v11, v0, :cond_4e
-
-    add-int/lit8 v3, v31, 0x5
-
-    goto :goto_45
-
-    :cond_4e
-    add-int/lit8 v3, v31, 0x3
-
-    :goto_45
-    move/from16 v39, v15
-
-    goto/16 :goto_48
-
-    :pswitch_15
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    and-int/lit8 v0, v7, 0x3
-
-    const/4 v1, 0x4
-
-    rsub-int/lit8 v0, v0, 0x4
-
-    add-int v0, v0, v31
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    add-int/2addr v1, v7
-
-    aget-object v1, v14, v1
-
-    add-int/lit8 v2, v0, 0x4
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->l(I)I
-
-    move-result v2
-
-    const/16 v3, 0x8
-
-    add-int/2addr v0, v3
-
-    new-array v4, v2, [I
-
-    new-array v5, v2, [Lp0/a/a/p;
-
-    move v6, v0
-
-    const/4 v0, 0x0
-
-    :goto_46
-    if-ge v0, v2, :cond_4f
-
-    invoke-virtual {v8, v6}, Lp0/a/a/d;->l(I)I
-
-    move-result v11
-
-    aput v11, v4, v0
-
-    add-int/lit8 v11, v6, 0x4
-
-    invoke-virtual {v8, v11}, Lp0/a/a/d;->l(I)I
-
-    move-result v11
-
-    add-int/2addr v11, v7
-
-    aget-object v11, v14, v11
-
-    aput-object v11, v5, v0
-
-    add-int/lit8 v6, v6, 0x8
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_46
-
-    :cond_4f
-    move-object v0, v9
-
-    check-cast v0, Lp0/a/a/r;
-
-    iget-object v11, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v3, v11, Lp0/a/a/c;->b:I
-
-    iput v3, v0, Lp0/a/a/r;->Z:I
-
-    const/16 v3, 0xab
-
-    invoke-virtual {v11, v3}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v3, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v3, v3, Lp0/a/a/c;->b:I
-
-    const/16 v18, 0x4
-
-    rem-int/lit8 v3, v3, 0x4
-
-    rsub-int/lit8 v3, v3, 0x4
-
-    rem-int/lit8 v3, v3, 0x4
-
-    move/from16 v31, v6
-
-    move/from16 v39, v15
-
-    const/4 v6, 0x0
-
-    const/4 v15, 0x0
-
-    invoke-virtual {v11, v15, v6, v3}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget-object v3, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v6, v0, Lp0/a/a/r;->Z:I
-
-    const/4 v11, 0x1
-
-    invoke-virtual {v1, v3, v6, v11}, Lp0/a/a/p;->e(Lp0/a/a/c;IZ)V
-
-    iget-object v3, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    const/4 v3, 0x0
-
-    :goto_47
-    if-ge v3, v2, :cond_50
-
-    iget-object v6, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    aget v15, v4, v3
-
-    invoke-virtual {v6, v15}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    aget-object v6, v5, v3
-
-    iget-object v15, v0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    move/from16 p3, v2
-
-    iget v2, v0, Lp0/a/a/r;->Z:I
-
-    invoke-virtual {v6, v15, v2, v11}, Lp0/a/a/p;->e(Lp0/a/a/c;IZ)V
-
-    add-int/lit8 v3, v3, 0x1
-
-    move/from16 v2, p3
-
-    const/4 v11, 0x1
-
-    const/4 v15, 0x0
-
-    goto :goto_47
-
-    :cond_50
-    invoke-virtual {v0, v1, v5}, Lp0/a/a/r;->B(Lp0/a/a/p;[Lp0/a/a/p;)V
-
-    move/from16 v3, v31
-
-    :goto_48
-    const/4 v1, 0x4
-
-    goto/16 :goto_4c
-
-    :pswitch_16
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    and-int/lit8 v0, v7, 0x3
-
-    const/4 v1, 0x4
-
-    rsub-int/lit8 v0, v0, 0x4
-
-    add-int v0, v0, v31
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v2
-
-    add-int/2addr v2, v7
-
-    aget-object v2, v14, v2
-
-    add-int/lit8 v3, v0, 0x4
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->l(I)I
-
-    move-result v3
-
-    add-int/lit8 v4, v0, 0x8
-
-    invoke-virtual {v8, v4}, Lp0/a/a/d;->l(I)I
-
-    move-result v4
-
-    add-int/lit8 v0, v0, 0xc
-
-    sub-int v5, v4, v3
-
-    const/4 v6, 0x1
-
-    add-int/2addr v5, v6
-
-    new-array v6, v5, [Lp0/a/a/p;
-
-    const/4 v11, 0x0
-
-    :goto_49
-    if-ge v11, v5, :cond_51
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v15
-
-    add-int/2addr v15, v7
-
-    aget-object v15, v14, v15
-
-    aput-object v15, v6, v11
-
-    add-int/lit8 v0, v0, 0x4
-
-    add-int/lit8 v11, v11, 0x1
-
-    goto :goto_49
-
-    :cond_51
-    invoke-virtual {v9, v3, v4, v2, v6}, Lp0/a/a/q;->q(IILp0/a/a/p;[Lp0/a/a/p;)V
-
-    move v3, v0
-
-    goto/16 :goto_4c
-
-    :pswitch_17
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->q(I)S
-
-    move-result v0
-
-    add-int/2addr v0, v7
-
-    aget-object v0, v14, v0
-
-    invoke-virtual {v9, v11, v0}, Lp0/a/a/q;->h(ILp0/a/a/p;)V
-
-    goto/16 :goto_4b
-
-    :pswitch_18
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    add-int/lit8 v3, v31, 0x1
-
-    aget-byte v0, v12, v3
-
-    const/16 v2, 0xff
-
-    and-int/2addr v0, v2
-
-    add-int/lit8 v3, v31, 0x2
-
-    aget-byte v2, v12, v3
-
-    invoke-virtual {v9, v0, v2}, Lp0/a/a/q;->d(II)V
-
-    goto :goto_4b
-
-    :pswitch_19
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    add-int/lit8 v5, v11, -0x3b
-
-    shr-int/lit8 v0, v5, 0x2
-
-    add-int/lit8 v0, v0, 0x36
-
-    const/4 v2, 0x3
-
-    and-int/2addr v2, v5
-
-    invoke-virtual {v9, v0, v2}, Lp0/a/a/q;->t(II)V
-
-    goto :goto_4a
-
-    :pswitch_1a
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/4 v2, 0x3
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    add-int/lit8 v5, v11, -0x1a
-
-    shr-int/lit8 v0, v5, 0x2
-
-    add-int/lit8 v0, v0, 0x15
-
-    and-int/2addr v2, v5
-
-    invoke-virtual {v9, v0, v2}, Lp0/a/a/q;->t(II)V
-
-    :goto_4a
-    add-int/lit8 v3, v31, 0x1
-
-    goto :goto_4c
-
-    :pswitch_1b
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    add-int/lit8 v3, v31, 0x1
-
-    aget-byte v0, v12, v3
-
-    const/16 v2, 0xff
-
-    and-int/2addr v0, v2
-
-    invoke-virtual {v9, v11, v0}, Lp0/a/a/q;->t(II)V
-
-    add-int/lit8 v3, v31, 0x2
-
-    goto :goto_4c
-
-    :pswitch_1c
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    invoke-virtual {v8, v0, v13}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-virtual {v9, v0}, Lp0/a/a/q;->j(Ljava/lang/Object;)V
-
-    :goto_4b
-    add-int/lit8 v3, v31, 0x3
-
-    :goto_4c
-    move/from16 v4, v22
-
-    move/from16 v5, v25
-
-    move/from16 v0, v38
-
-    move-object/from16 v11, v46
-
-    :goto_4d
-    const/16 v2, 0xff
-
-    goto/16 :goto_50
-
-    :pswitch_1d
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    add-int/lit8 v3, v31, 0x1
-
-    aget-byte v0, v12, v3
-
-    const/16 v2, 0xff
-
-    and-int/2addr v0, v2
-
-    invoke-virtual {v8, v0, v13}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-virtual {v9, v0}, Lp0/a/a/q;->j(Ljava/lang/Object;)V
-
-    goto :goto_4e
-
-    :pswitch_1e
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v2, 0xff
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    add-int/lit8 v3, v31, 0x1
-
-    invoke-virtual {v8, v3}, Lp0/a/a/d;->q(I)S
-
-    move-result v0
-
-    invoke-virtual {v9, v11, v0}, Lp0/a/a/q;->g(II)V
-
-    add-int/lit8 v3, v31, 0x3
-
-    goto :goto_4f
-
-    :pswitch_1f
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v2, 0xff
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    add-int/lit8 v3, v31, 0x1
-
-    aget-byte v0, v12, v3
-
-    invoke-virtual {v9, v11, v0}, Lp0/a/a/q;->g(II)V
-
-    :goto_4e
-    add-int/lit8 v3, v31, 0x2
-
-    goto :goto_4f
-
-    :pswitch_20
-    move/from16 v32, v6
-
-    move/from16 v38, v11
-
-    move/from16 v39, v15
-
-    const/4 v1, 0x4
-
-    const/16 v2, 0xff
-
-    const/16 v30, 0x7
-
-    const/16 v33, 0x84
-
-    move v11, v5
-
-    invoke-virtual {v9, v11}, Lp0/a/a/q;->e(I)V
-
-    add-int/lit8 v3, v31, 0x1
-
-    :goto_4f
-    move/from16 v4, v22
-
-    move/from16 v5, v25
-
-    move/from16 v0, v38
-
-    move-object/from16 v11, v46
-
-    :goto_50
-    if-eqz v11, :cond_53
-
-    array-length v6, v11
-
-    if-ge v5, v6, :cond_53
-
-    if-gt v4, v7, :cond_53
-
-    if-ne v4, v7, :cond_52
-
-    aget v4, v11, v5
-
-    invoke-virtual {v8, v10, v4}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v4
-
-    invoke-virtual {v8, v4, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v6
-
-    const/4 v15, 0x2
-
-    add-int/2addr v4, v15
-
-    iget v15, v10, Lp0/a/a/h;->h:I
-
-    iget-object v1, v10, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v9, v15, v1, v6, v2}, Lp0/a/a/q;->f(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v1
-
-    invoke-virtual {v8, v1, v4, v2, v13}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    :cond_52
-    add-int/lit8 v5, v5, 0x1
-
-    invoke-virtual {v8, v11, v5}, Lp0/a/a/d;->d([II)I
-
-    move-result v4
-
-    const/4 v1, 0x4
-
-    goto/16 :goto_4d
-
-    :cond_53
-    move/from16 v1, v26
-
-    move/from16 v2, v27
-
-    move-object/from16 v15, v45
-
-    :goto_51
-    if-eqz v15, :cond_55
-
-    array-length v6, v15
-
-    if-ge v1, v6, :cond_55
-
-    if-gt v2, v7, :cond_55
-
-    if-ne v2, v7, :cond_54
-
-    aget v2, v15, v1
-
-    invoke-virtual {v8, v10, v2}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v2
-
-    invoke-virtual {v8, v2, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v6
-
-    const/16 v21, 0x2
-
-    add-int/lit8 v2, v2, 0x2
-
-    move/from16 p3, v0
-
-    iget v0, v10, Lp0/a/a/h;->h:I
-
-    move/from16 v22, v3
-
-    iget-object v3, v10, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    move/from16 v25, v7
-
-    const/4 v7, 0x0
-
-    invoke-virtual {v9, v0, v3, v6, v7}, Lp0/a/a/q;->f(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v0
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v8, v0, v2, v3, v13}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    goto :goto_52
-
-    :cond_54
-    move/from16 p3, v0
-
-    move/from16 v22, v3
-
-    move/from16 v25, v7
-
-    const/4 v7, 0x0
-
-    :goto_52
-    add-int/lit8 v1, v1, 0x1
-
-    invoke-virtual {v8, v15, v1}, Lp0/a/a/d;->d([II)I
-
-    move-result v2
-
-    move/from16 v0, p3
-
-    move/from16 v3, v22
-
-    move/from16 v7, v25
-
-    goto :goto_51
-
-    :cond_55
-    move/from16 p3, v0
-
-    move/from16 v22, v3
-
-    const/4 v7, 0x0
-
-    move/from16 v0, p3
-
-    move/from16 v26, v1
-
-    move/from16 v27, v2
-
-    move/from16 v25, v5
-
-    move-object v5, v11
-
-    move-object/from16 v44, v14
-
-    move/from16 v3, v22
-
-    move/from16 v14, v29
-
-    move/from16 v6, v32
-
-    move/from16 v11, v34
-
-    move/from16 v1, v39
-
-    move/from16 v22, v4
-
-    move-object v4, v15
-
-    move/from16 v15, v37
-
-    goto/16 :goto_25
-
-    :cond_56
-    move-object v11, v5
-
-    move/from16 v29, v14
-
-    move/from16 v37, v15
-
-    move-object/from16 v14, v44
-
-    const/4 v7, 0x0
-
-    move-object v15, v4
-
-    aget-object v0, v14, v23
-
-    if-eqz v0, :cond_57
-
-    aget-object v0, v14, v23
-
-    invoke-virtual {v9, v0}, Lp0/a/a/q;->i(Lp0/a/a/p;)V
-
-    :cond_57
-    move/from16 v1, v35
-
-    if-eqz v1, :cond_5c
-
-    iget v0, v10, Lp0/a/a/h;->b:I
-
-    const/4 v2, 0x2
-
-    and-int/2addr v0, v2
-
-    if-nez v0, :cond_5c
-
-    move/from16 v0, v36
-
-    if-eqz v0, :cond_59
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    const/4 v4, 0x3
-
-    mul-int/lit8 v3, v3, 0x3
-
-    new-array v4, v3, [I
-
-    add-int/lit8 v36, v0, 0x2
-
-    move/from16 v0, v36
-
-    :goto_53
-    if-lez v3, :cond_58
-
-    add-int/lit8 v3, v3, -0x1
-
-    add-int/lit8 v2, v0, 0x6
-
-    aput v2, v4, v3
-
-    const/4 v2, -0x1
-
-    add-int/2addr v3, v2
-
-    add-int/lit8 v5, v0, 0x8
-
-    invoke-virtual {v8, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v5
-
-    aput v5, v4, v3
-
-    add-int/2addr v3, v2
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v5
-
-    aput v5, v4, v3
-
-    add-int/lit8 v0, v0, 0xa
-
-    goto :goto_53
-
-    :cond_58
-    move-object v12, v4
-
-    goto :goto_54
-
-    :cond_59
-    const/4 v12, 0x0
-
-    :goto_54
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    const/4 v2, 0x2
-
-    add-int/lit8 v35, v1, 0x2
-
-    move/from16 v1, v35
-
-    :goto_55
-    add-int/lit8 v16, v0, -0x1
-
-    if-lez v0, :cond_5c
-
-    invoke-virtual {v8, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 v2, v1, 0x2
-
-    invoke-virtual {v8, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v3, v1, 0x4
-
-    invoke-virtual {v8, v3, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    add-int/lit8 v4, v1, 0x6
-
-    invoke-virtual {v8, v4, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v4
-
-    add-int/lit8 v5, v1, 0x8
-
-    invoke-virtual {v8, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v6
-
-    add-int/lit8 v17, v1, 0xa
-
-    if-eqz v12, :cond_5b
-
-    const/4 v1, 0x0
-
-    :goto_56
-    array-length v5, v12
-
-    if-ge v1, v5, :cond_5b
-
-    aget v5, v12, v1
-
-    if-ne v5, v0, :cond_5a
-
-    add-int/lit8 v5, v1, 0x1
-
-    aget v5, v12, v5
-
-    if-ne v5, v6, :cond_5a
-
-    add-int/lit8 v1, v1, 0x2
-
-    aget v1, v12, v1
-
-    invoke-virtual {v8, v1, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    move-object v5, v1
-
-    goto :goto_57
-
-    :cond_5a
-    add-int/lit8 v1, v1, 0x3
-
-    goto :goto_56
-
-    :cond_5b
-    const/4 v5, 0x0
-
-    :goto_57
-    aget-object v18, v14, v0
-
-    add-int/2addr v0, v2
-
-    aget-object v20, v14, v0
-
-    move-object/from16 v0, p1
-
-    move-object v1, v3
-
-    move-object v2, v4
-
-    move-object v3, v5
-
-    move-object/from16 v4, v18
-
-    move-object/from16 v5, v20
-
-    invoke-virtual/range {v0 .. v6}, Lp0/a/a/q;->l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lp0/a/a/p;Lp0/a/a/p;I)V
-
-    move/from16 v0, v16
-
-    move/from16 v1, v17
-
-    goto :goto_55
-
-    :cond_5c
-    const/16 v12, 0x41
-
-    if-eqz v11, :cond_5f
-
-    array-length v14, v11
-
-    const/4 v6, 0x0
-
-    :goto_58
-    if-ge v6, v14, :cond_5f
-
-    aget v0, v11, v6
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->f(I)I
-
-    move-result v1
-
-    const/16 v2, 0x40
-
-    if-eq v1, v2, :cond_5e
-
-    if-ne v1, v12, :cond_5d
-
-    goto :goto_59
-
-    :cond_5d
-    move/from16 v18, v6
-
-    move-object/from16 v32, v19
-
-    const/16 v16, 0x0
-
-    goto :goto_5a
-
-    :cond_5e
-    :goto_59
-    invoke-virtual {v8, v10, v0}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v0
-
-    invoke-virtual {v8, v0, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v16
-
-    const/4 v1, 0x2
-
-    add-int/lit8 v5, v0, 0x2
-
-    iget v1, v10, Lp0/a/a/h;->h:I
-
-    iget-object v2, v10, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    iget-object v3, v10, Lp0/a/a/h;->j:[Lp0/a/a/p;
-
-    iget-object v4, v10, Lp0/a/a/h;->k:[Lp0/a/a/p;
-
-    iget-object v0, v10, Lp0/a/a/h;->l:[I
-
-    const/16 v17, 0x1
-
-    move-object/from16 v18, v0
-
-    move-object/from16 v0, p1
-
-    move v12, v5
-
-    move-object/from16 v5, v18
-
-    move/from16 v18, v6
-
-    move-object/from16 v6, v16
-
-    move-object/from16 v32, v19
-
-    const/16 v16, 0x0
-
-    move/from16 v7, v17
-
-    invoke-virtual/range {v0 .. v7}, Lp0/a/a/q;->m(ILp0/a/a/x;[Lp0/a/a/p;[Lp0/a/a/p;[ILjava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v8, v0, v12, v1, v13}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    :goto_5a
-    add-int/lit8 v6, v18, 0x1
-
-    move-object/from16 v19, v32
-
-    const/4 v7, 0x0
-
-    const/16 v12, 0x41
-
-    goto :goto_58
-
-    :cond_5f
-    move-object/from16 v32, v19
-
-    const/16 v16, 0x0
-
-    if-eqz v15, :cond_62
-
-    array-length v11, v15
-
-    const/4 v12, 0x0
-
-    :goto_5b
-    if-ge v12, v11, :cond_62
-
-    aget v0, v15, v12
-
-    invoke-virtual {v8, v0}, Lp0/a/a/d;->f(I)I
-
-    move-result v1
-
-    const/16 v14, 0x40
-
-    const/16 v7, 0x41
-
-    if-eq v1, v14, :cond_61
-
-    if-ne v1, v7, :cond_60
-
-    goto :goto_5c
-
-    :cond_60
-    const/4 v1, 0x1
-
-    const/16 v16, 0x2
-
-    const/16 v18, 0x41
-
-    goto :goto_5d
-
-    :cond_61
-    :goto_5c
-    invoke-virtual {v8, v10, v0}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v0
-
-    invoke-virtual {v8, v0, v13}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v6
-
-    const/16 v16, 0x2
-
-    add-int/lit8 v5, v0, 0x2
-
-    iget v1, v10, Lp0/a/a/h;->h:I
-
-    iget-object v2, v10, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    iget-object v3, v10, Lp0/a/a/h;->j:[Lp0/a/a/p;
-
-    iget-object v4, v10, Lp0/a/a/h;->k:[Lp0/a/a/p;
-
-    iget-object v0, v10, Lp0/a/a/h;->l:[I
-
-    const/16 v17, 0x0
-
-    move-object/from16 v18, v0
-
-    move-object/from16 v0, p1
-
-    move v14, v5
-
-    move-object/from16 v5, v18
-
-    const/16 v18, 0x41
-
-    move/from16 v7, v17
-
-    invoke-virtual/range {v0 .. v7}, Lp0/a/a/q;->m(ILp0/a/a/x;[Lp0/a/a/p;[Lp0/a/a/p;[ILjava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v8, v0, v14, v1, v13}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    :goto_5d
-    add-int/lit8 v12, v12, 0x1
-
-    goto :goto_5b
-
-    :cond_62
-    move-object/from16 v0, v32
-
-    :goto_5e
-    if-eqz v0, :cond_63
-
-    iget-object v1, v0, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    const/4 v2, 0x0
-
-    iput-object v2, v0, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    move-object v3, v9
-
-    check-cast v3, Lp0/a/a/r;
-
-    iget-object v4, v3, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    iput-object v4, v0, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iput-object v0, v3, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    move-object v0, v1
-
-    goto :goto_5e
-
-    :cond_63
-    move/from16 v0, v29
-
-    move/from16 v1, v37
-
-    invoke-virtual {v9, v0, v1}, Lp0/a/a/q;->n(II)V
-
-    return-void
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_9
-        :pswitch_8
-        :pswitch_9
-        :pswitch_8
-        :pswitch_8
-        :pswitch_9
-        :pswitch_9
-        :pswitch_9
-        :pswitch_9
-        :pswitch_9
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_9
-        :pswitch_9
-        :pswitch_9
-        :pswitch_9
-        :pswitch_9
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_8
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_7
-        :pswitch_9
-        :pswitch_6
-        :pswitch_5
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_a
-        :pswitch_8
-        :pswitch_8
-        :pswitch_8
-        :pswitch_8
-        :pswitch_8
-        :pswitch_8
-        :pswitch_8
-        :pswitch_4
-        :pswitch_4
-        :pswitch_8
-        :pswitch_9
-        :pswitch_8
-        :pswitch_a
-        :pswitch_a
-        :pswitch_8
-        :pswitch_8
-        :pswitch_a
-        :pswitch_a
-        :pswitch_2
-        :pswitch_3
-        :pswitch_7
-        :pswitch_7
-        :pswitch_1
-        :pswitch_1
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_1
-    .end packed-switch
-
-    :pswitch_data_1
-    .packed-switch 0x15
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-    .end packed-switch
-
-    :pswitch_data_2
-    .packed-switch 0x36
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-    .end packed-switch
-
-    :pswitch_data_3
-    .packed-switch 0x42
-        :pswitch_c
-        :pswitch_c
-        :pswitch_b
-    .end packed-switch
-
-    :pswitch_data_4
-    .packed-switch 0x0
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_1f
-        :pswitch_1e
-        :pswitch_1d
-        :pswitch_1c
-        :pswitch_1c
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_1a
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_1b
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_19
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_18
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_17
-        :pswitch_1b
-        :pswitch_16
-        :pswitch_15
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_20
-        :pswitch_14
-        :pswitch_14
-        :pswitch_14
-        :pswitch_14
-        :pswitch_14
-        :pswitch_14
-        :pswitch_14
-        :pswitch_14
-        :pswitch_13
-        :pswitch_12
-        :pswitch_1f
-        :pswitch_12
-        :pswitch_20
-        :pswitch_20
-        :pswitch_12
-        :pswitch_12
-        :pswitch_20
-        :pswitch_20
-        :pswitch_11
-        :pswitch_10
-        :pswitch_17
-        :pswitch_17
-        :pswitch_f
-        :pswitch_f
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_d
-    .end packed-switch
-.end method
-
-.method public i(I[C)Ljava/lang/Object;
-    .locals 11
-
-    iget-object v0, p0, Lp0/a/a/d;->b:[I
-
-    aget v1, v0, p1
-
-    iget-object v2, p0, Lp0/a/a/d;->a:[B
-
-    add-int/lit8 v3, v1, -0x1
-
-    aget-byte v2, v2, v3
-
-    packed-switch v2, :pswitch_data_0
-
-    const/16 v3, 0xb
-
-    const/4 v4, 0x0
-
-    packed-switch v2, :pswitch_data_1
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    iget-object v1, p0, Lp0/a/a/d;->d:[Lp0/a/a/g;
-
-    aget-object v1, v1, p1
-
-    if-eqz v1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    aget v1, v0, p1
-
-    add-int/lit8 v2, v1, 0x2
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v0, v0, v2
-
-    invoke-virtual {p0, v0, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v0, v0, 0x2
-
-    invoke-virtual {p0, v0, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v0
-
-    iget-object v3, p0, Lp0/a/a/d;->e:[I
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    aget v1, v3, v1
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    invoke-virtual {p0, v3, p2}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lp0/a/a/n;
-
-    add-int/lit8 v5, v1, 0x2
-
-    invoke-virtual {p0, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v5
-
-    new-array v6, v5, [Ljava/lang/Object;
-
-    add-int/lit8 v1, v1, 0x4
-
-    :goto_0
-    if-ge v4, v5, :cond_1
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v7
-
-    invoke-virtual {p0, v7, p2}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object v7
-
-    aput-object v7, v6, v4
-
-    add-int/lit8 v1, v1, 0x2
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object p2, p0, Lp0/a/a/d;->d:[Lp0/a/a/g;
-
-    new-instance v1, Lp0/a/a/g;
-
-    invoke-direct {v1, v2, v0, v3, v6}, Lp0/a/a/g;-><init>(Ljava/lang/String;Ljava/lang/String;Lp0/a/a/n;[Ljava/lang/Object;)V
-
-    aput-object v1, p2, p1
-
-    :goto_1
-    return-object v1
-
-    :pswitch_1
-    invoke-virtual {p0, v1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    new-instance p2, Lp0/a/a/w;
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    invoke-direct {p2, v3, p1, v4, v0}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    return-object p2
-
-    :pswitch_2
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->f(I)I
-
-    move-result v6
-
-    iget-object p1, p0, Lp0/a/a/d;->b:[I
-
-    const/4 v0, 0x1
-
-    add-int/2addr v1, v0
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    aget p1, p1, v1
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, p1, 0x2
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, p1, p2}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-virtual {p0, v1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v8
-
-    add-int/lit8 v1, v1, 0x2
-
-    invoke-virtual {p0, v1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v9
-
-    iget-object p2, p0, Lp0/a/a/d;->a:[B
-
-    sub-int/2addr p1, v0
-
-    aget-byte p1, p2, p1
-
-    if-ne p1, v3, :cond_2
-
-    const/4 v10, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v10, 0x0
-
-    :goto_2
-    new-instance p1, Lp0/a/a/n;
-
-    move-object v5, p1
-
-    invoke-direct/range {v5 .. v10}, Lp0/a/a/n;-><init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-
-    return-object p1
-
-    :pswitch_3
-    invoke-virtual {p0, v1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_4
-    invoke-virtual {p0, v1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lp0/a/a/w;->h(Ljava/lang/String;)Lp0/a/a/w;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_5
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->m(I)J
-
-    move-result-wide p1
-
-    invoke-static {p1, p2}, Ljava/lang/Double;->longBitsToDouble(J)D
-
-    move-result-wide p1
-
-    invoke-static {p1, p2}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_6
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->m(I)J
-
-    move-result-wide p1
-
-    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_7
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Float;->intBitsToFloat(I)F
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_8
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_data_0
-    .packed-switch 0x3
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-    .end packed-switch
-
-    :pswitch_data_1
-    .packed-switch 0xf
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public final j(Lp0/a/a/a;ILjava/lang/String;[C)I
-    .locals 9
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    const/16 v2, 0x5b
-
-    const/4 v3, 0x0
-
-    const/16 v4, 0x65
-
-    const/16 v5, 0x40
-
-    if-nez p1, :cond_3
-
-    iget-object p1, p0, Lp0/a/a/d;->a:[B
-
-    aget-byte p1, p1, p2
-
-    and-int/lit16 p1, p1, 0xff
-
-    if-eq p1, v5, :cond_2
-
-    if-eq p1, v2, :cond_1
-
-    if-eq p1, v4, :cond_0
-
-    add-int/lit8 p2, p2, 0x3
-
-    return p2
-
-    :cond_0
-    add-int/lit8 p2, p2, 0x5
-
-    return p2
-
-    :cond_1
-    add-int/2addr p2, v1
-
-    invoke-virtual {p0, v3, p2, v0, p4}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result p1
-
-    return p1
-
-    :cond_2
-    add-int/lit8 p2, p2, 0x3
-
-    invoke-virtual {p0, v3, p2, v1, p4}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result p1
-
-    return p1
-
-    :cond_3
-    iget-object v6, p0, Lp0/a/a/d;->a:[B
-
-    add-int/lit8 v7, p2, 0x1
-
-    aget-byte p2, v6, p2
-
-    and-int/lit16 p2, p2, 0xff
-
-    if-eq p2, v5, :cond_1c
-
-    const/16 v3, 0x46
-
-    if-eq p2, v3, :cond_1b
-
-    const/16 v5, 0x53
-
-    if-eq p2, v5, :cond_1a
-
-    const/16 v6, 0x63
-
-    if-eq p2, v6, :cond_19
-
-    if-eq p2, v4, :cond_17
-
-    const/16 v4, 0x73
-
-    if-eq p2, v4, :cond_16
-
-    const/16 v4, 0x49
-
-    if-eq p2, v4, :cond_1b
-
-    const/16 v6, 0x4a
-
-    if-eq p2, v6, :cond_1b
-
-    const/16 v8, 0x5a
-
-    if-eq p2, v8, :cond_14
-
-    if-eq p2, v2, :cond_4
-
-    packed-switch p2, :pswitch_data_0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    iget-object p2, p0, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {p0, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result p4
-
-    aget p2, p2, p4
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->l(I)I
-
-    move-result p2
-
-    int-to-char p2, p2
-
-    invoke-static {p2}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p3, p2}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_a
-
-    :pswitch_1
-    iget-object p2, p0, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {p0, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result p4
-
-    aget p2, p2, p4
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->l(I)I
-
-    move-result p2
-
-    int-to-byte p2, p2
-
-    invoke-static {p2}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p3, p2}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_a
-
-    :cond_4
-    invoke-virtual {p0, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result p2
-
-    add-int/lit8 v7, v7, 0x2
-
-    if-nez p2, :cond_5
-
-    invoke-virtual {p1, p3}, Lp0/a/a/a;->f(Ljava/lang/String;)Lp0/a/a/a;
-
-    move-result-object p1
-
-    add-int/lit8 v7, v7, -0x2
-
-    invoke-virtual {p0, p1, v7, v0, p4}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result p1
-
-    return p1
-
-    :cond_5
-    iget-object v2, p0, Lp0/a/a/d;->a:[B
-
-    aget-byte v2, v2, v7
-
-    and-int/lit16 v2, v2, 0xff
-
-    if-eq v2, v3, :cond_12
-
-    if-eq v2, v5, :cond_10
-
-    if-eq v2, v8, :cond_d
-
-    if-eq v2, v4, :cond_b
-
-    if-eq v2, v6, :cond_9
-
-    packed-switch v2, :pswitch_data_1
-
-    invoke-virtual {p1, p3}, Lp0/a/a/a;->f(Ljava/lang/String;)Lp0/a/a/a;
-
-    move-result-object p1
-
-    add-int/lit8 v7, v7, -0x2
-
-    invoke-virtual {p0, p1, v7, v0, p4}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v7
-
-    goto/16 :goto_b
-
-    :pswitch_2
-    new-array p4, p2, [D
-
-    :goto_0
-    if-ge v0, p2, :cond_6
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v7, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->m(I)J
-
-    move-result-wide v1
-
-    invoke-static {v1, v2}, Ljava/lang/Double;->longBitsToDouble(J)D
-
-    move-result-wide v1
-
-    aput-wide v1, p4, v0
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_6
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :pswitch_3
-    new-array p4, p2, [C
-
-    :goto_1
-    if-ge v0, p2, :cond_7
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v7, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    int-to-char v1, v1
-
-    aput-char v1, p4, v0
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_7
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :pswitch_4
-    new-array p4, p2, [B
-
-    :goto_2
-    if-ge v0, p2, :cond_8
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v7, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    int-to-byte v1, v1
-
-    aput-byte v1, p4, v0
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_2
-
-    :cond_8
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :cond_9
-    new-array p4, p2, [J
-
-    :goto_3
-    if-ge v0, p2, :cond_a
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v7, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->m(I)J
-
-    move-result-wide v1
-
-    aput-wide v1, p4, v0
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_3
-
-    :cond_a
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :cond_b
-    new-array p4, p2, [I
-
-    :goto_4
-    if-ge v0, p2, :cond_c
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v7, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    aput v1, p4, v0
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_4
-
-    :cond_c
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :cond_d
-    new-array p4, p2, [Z
-
-    const/4 v2, 0x0
-
-    :goto_5
-    if-ge v2, p2, :cond_f
-
-    iget-object v3, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v4, v7, 0x1
-
-    invoke-virtual {p0, v4}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    aget v3, v3, v4
-
-    invoke-virtual {p0, v3}, Lp0/a/a/d;->l(I)I
-
-    move-result v3
-
-    if-eqz v3, :cond_e
-
-    const/4 v3, 0x1
-
-    goto :goto_6
-
-    :cond_e
-    const/4 v3, 0x0
-
-    :goto_6
-    aput-boolean v3, p4, v2
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_5
-
-    :cond_f
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :cond_10
-    new-array p4, p2, [S
-
-    :goto_7
-    if-ge v0, p2, :cond_11
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v7, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    int-to-short v1, v1
-
-    aput-short v1, p4, v0
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_7
-
-    :cond_11
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :cond_12
-    new-array p4, p2, [F
-
-    :goto_8
-    if-ge v0, p2, :cond_13
-
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    add-int/lit8 v2, v7, 0x1
-
-    invoke-virtual {p0, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->l(I)I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Float;->intBitsToFloat(I)F
-
-    move-result v1
-
-    aput v1, p4, v0
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_8
-
-    :cond_13
-    invoke-virtual {p1, p3, p4}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto/16 :goto_b
-
-    :cond_14
-    iget-object p2, p0, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {p0, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result p4
-
-    aget p2, p2, p4
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->l(I)I
-
-    move-result p2
-
-    if-nez p2, :cond_15
-
-    sget-object p2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    goto :goto_9
-
-    :cond_15
-    sget-object p2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    :goto_9
-    invoke-virtual {p1, p3, p2}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto :goto_a
-
-    :cond_16
-    invoke-virtual {p0, v7, p4}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p3, p2}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto :goto_a
-
-    :cond_17
-    invoke-virtual {p0, v7, p4}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p2
-
-    add-int/lit8 v0, v7, 0x2
-
-    invoke-virtual {p0, v0, p4}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p4
-
-    iget v0, p1, Lp0/a/a/a;->e:I
-
-    add-int/2addr v0, v1
-
-    iput v0, p1, Lp0/a/a/a;->e:I
-
-    iget-boolean v0, p1, Lp0/a/a/a;->b:Z
-
-    if-eqz v0, :cond_18
-
-    iget-object v0, p1, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v1, p1, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v1, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p3
-
-    invoke-virtual {v0, p3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_18
-    iget-object p3, p1, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v0, p1, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v0, p2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    invoke-virtual {p3, v4, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    iget-object p1, p1, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {p1, p4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {p3, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v7, v7, 0x4
-
-    goto :goto_b
-
-    :cond_19
-    invoke-virtual {p0, v7, p4}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Ljava/lang/String;->length()I
-
-    move-result p4
-
-    invoke-static {p2, v0, p4}, Lp0/a/a/w;->k(Ljava/lang/String;II)Lp0/a/a/w;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p3, p2}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto :goto_a
-
-    :cond_1a
-    iget-object p2, p0, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {p0, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result p4
-
-    aget p2, p2, p4
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->l(I)I
-
-    move-result p2
-
-    int-to-short p2, p2
-
-    invoke-static {p2}, Ljava/lang/Short;->valueOf(S)Ljava/lang/Short;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p3, p2}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto :goto_a
-
-    :cond_1b
-    :pswitch_5
-    invoke-virtual {p0, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result p2
-
-    invoke-virtual {p0, p2, p4}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p3, p2}, Lp0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
-
-    :goto_a
-    add-int/lit8 v7, v7, 0x2
-
-    goto :goto_b
-
-    :cond_1c
-    invoke-virtual {p0, v7, p4}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p2
-
-    iget v2, p1, Lp0/a/a/a;->e:I
-
-    add-int/2addr v2, v1
-
-    iput v2, p1, Lp0/a/a/a;->e:I
-
-    iget-boolean v2, p1, Lp0/a/a/a;->b:Z
-
-    if-eqz v2, :cond_1d
-
-    iget-object v2, p1, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v4, p1, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v4, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p3
-
-    invoke-virtual {v2, p3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_1d
-    iget-object p3, p1, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    iget-object v2, p1, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    invoke-virtual {v2, p2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    invoke-virtual {p3, v5, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    invoke-virtual {p3, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p1, Lp0/a/a/a;->a:Lp0/a/a/v;
-
-    iget-object p1, p1, Lp0/a/a/a;->c:Lp0/a/a/c;
-
-    invoke-direct {p2, p3, v1, p1, v3}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    add-int/lit8 v7, v7, 0x2
-
-    invoke-virtual {p0, p2, v7, v1, p4}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v7
-
-    :goto_b
-    return v7
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x42
-        :pswitch_1
-        :pswitch_0
-        :pswitch_5
-    .end packed-switch
-
-    :pswitch_data_1
-    .packed-switch 0x42
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-    .end packed-switch
-.end method
-
-.method public final k(Lp0/a/a/a;IZ[C)I
-    .locals 1
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 p2, p2, 0x2
-
-    if-eqz p3, :cond_0
-
-    :goto_0
-    add-int/lit8 p3, v0, -0x1
-
-    if-lez v0, :cond_1
-
-    invoke-virtual {p0, p2, p4}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v0
-
-    add-int/lit8 p2, p2, 0x2
-
-    invoke-virtual {p0, p1, p2, v0, p4}, Lp0/a/a/d;->j(Lp0/a/a/a;ILjava/lang/String;[C)I
-
-    move-result p2
-
-    move v0, p3
-
-    goto :goto_0
-
-    :cond_0
-    :goto_1
-    add-int/lit8 p3, v0, -0x1
-
-    if-lez v0, :cond_1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, p1, p2, v0, p4}, Lp0/a/a/d;->j(Lp0/a/a/a;ILjava/lang/String;[C)I
-
-    move-result p2
-
-    move v0, p3
-
-    goto :goto_1
-
-    :cond_1
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p1}, Lp0/a/a/a;->g()V
-
-    :cond_2
-    return p2
-.end method
-
-.method public l(I)I
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/d;->a:[B
-
-    aget-byte v1, v0, p1
-
-    and-int/lit16 v1, v1, 0xff
-
-    shl-int/lit8 v1, v1, 0x18
-
-    add-int/lit8 v2, p1, 0x1
-
-    aget-byte v2, v0, v2
-
-    and-int/lit16 v2, v2, 0xff
-
-    shl-int/lit8 v2, v2, 0x10
-
-    or-int/2addr v1, v2
-
-    add-int/lit8 v2, p1, 0x2
-
-    aget-byte v2, v0, v2
-
-    and-int/lit16 v2, v2, 0xff
-
-    shl-int/lit8 v2, v2, 0x8
-
-    or-int/2addr v1, v2
-
-    add-int/lit8 p1, p1, 0x3
-
-    aget-byte p1, v0, p1
-
-    and-int/lit16 p1, p1, 0xff
-
-    or-int/2addr p1, v1
-
-    return p1
-.end method
-
-.method public m(I)J
-    .locals 6
-
-    invoke-virtual {p0, p1}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    int-to-long v0, v0
-
-    add-int/lit8 p1, p1, 0x4
-
-    invoke-virtual {p0, p1}, Lp0/a/a/d;->l(I)I
-
-    move-result p1
-
-    int-to-long v2, p1
-
-    const-wide v4, 0xffffffffL
-
-    and-long/2addr v2, v4
-
-    const/16 p1, 0x20
-
-    shl-long/2addr v0, p1
-
-    or-long/2addr v0, v2
-
-    return-wide v0
-.end method
-
-.method public n(I[C)Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {p0, p1}, Lp0/a/a/d;->u(I)I
-
-    move-result p1
-
-    aget p1, v0, p1
-
-    invoke-virtual {p0, p1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public o(I[C)Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {p0, p1}, Lp0/a/a/d;->u(I)I
-
-    move-result p1
-
-    aget p1, v0, p1
-
-    invoke-virtual {p0, p1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final p(Lp0/a/a/q;Lp0/a/a/h;IZ)V
-    .locals 10
-
-    iget-object v0, p0, Lp0/a/a/d;->a:[B
-
-    add-int/lit8 v1, p3, 0x1
-
-    aget-byte p3, v0, p3
-
-    and-int/lit16 p3, p3, 0xff
-
-    check-cast p1, Lp0/a/a/r;
-
-    if-eqz p4, :cond_0
-
-    iput p3, p1, Lp0/a/a/r;->D:I
-
-    goto :goto_0
-
-    :cond_0
-    iput p3, p1, Lp0/a/a/r;->F:I
-
-    :goto_0
-    iget-object p2, p2, Lp0/a/a/h;->c:[C
-
-    const/4 v0, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_1
-    if-ge v2, p3, :cond_5
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v1, v1, 0x2
-
-    :goto_2
-    add-int/lit8 v4, v3, -0x1
-
-    if-lez v3, :cond_4
-
-    invoke-virtual {p0, v1, p2}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    add-int/lit8 v1, v1, 0x2
-
-    new-instance v5, Lp0/a/a/c;
-
-    invoke-direct {v5}, Lp0/a/a/c;-><init>()V
-
-    iget-object v6, p1, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v6, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v3
-
-    invoke-virtual {v5, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v5, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 v3, 0x1
-
-    if-eqz p4, :cond_2
-
-    iget-object v6, p1, Lp0/a/a/r;->E:[Lp0/a/a/a;
-
-    if-nez v6, :cond_1
-
-    iget-object v6, p1, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    invoke-static {v6}, Lp0/a/a/w;->a(Ljava/lang/String;)[Lp0/a/a/w;
-
-    move-result-object v6
-
-    array-length v6, v6
-
-    new-array v6, v6, [Lp0/a/a/a;
-
-    iput-object v6, p1, Lp0/a/a/r;->E:[Lp0/a/a/a;
-
-    :cond_1
-    iget-object v6, p1, Lp0/a/a/r;->E:[Lp0/a/a/a;
-
-    new-instance v7, Lp0/a/a/a;
-
-    iget-object v8, p1, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    aget-object v9, v6, v2
-
-    invoke-direct {v7, v8, v3, v5, v9}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    aput-object v7, v6, v2
-
-    goto :goto_3
-
-    :cond_2
-    iget-object v6, p1, Lp0/a/a/r;->G:[Lp0/a/a/a;
-
-    if-nez v6, :cond_3
-
-    iget-object v6, p1, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    invoke-static {v6}, Lp0/a/a/w;->a(Ljava/lang/String;)[Lp0/a/a/w;
-
-    move-result-object v6
-
-    array-length v6, v6
-
-    new-array v6, v6, [Lp0/a/a/a;
-
-    iput-object v6, p1, Lp0/a/a/r;->G:[Lp0/a/a/a;
-
-    :cond_3
-    iget-object v6, p1, Lp0/a/a/r;->G:[Lp0/a/a/a;
-
-    new-instance v7, Lp0/a/a/a;
-
-    iget-object v8, p1, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    aget-object v9, v6, v2
-
-    invoke-direct {v7, v8, v3, v5, v9}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    aput-object v7, v6, v2
-
-    :goto_3
-    invoke-virtual {p0, v7, v1, v3, p2}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v1
-
-    move v3, v4
-
-    goto :goto_2
-
-    :cond_4
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    return-void
-.end method
-
-.method public q(I)S
-    .locals 2
-
-    iget-object v0, p0, Lp0/a/a/d;->a:[B
-
-    aget-byte v1, v0, p1
-
-    and-int/lit16 v1, v1, 0xff
-
-    shl-int/lit8 v1, v1, 0x8
-
-    add-int/lit8 p1, p1, 0x1
-
-    aget-byte p1, v0, p1
-
-    and-int/lit16 p1, p1, 0xff
-
-    or-int/2addr p1, v1
-
-    int-to-short p1, p1
-
-    return p1
-.end method
-
-.method public final r(Lp0/a/a/h;I)I
-    .locals 9
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    ushr-int/lit8 v1, v0, 0x18
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_0
-
-    if-eq v1, v2, :cond_0
-
-    const/high16 v3, -0x1000000
-
-    packed-switch v1, :pswitch_data_0
-
-    packed-switch v1, :pswitch_data_1
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    and-int/2addr v0, v3
-
-    add-int/2addr p2, v2
-
-    goto :goto_2
-
-    :pswitch_1
-    const v1, -0xffff01
-
-    and-int/2addr v0, v1
-
-    add-int/lit8 p2, p2, 0x4
-
-    goto :goto_2
-
-    :pswitch_2
-    and-int/2addr v0, v3
-
-    goto :goto_0
-
-    :pswitch_3
-    and-int/lit16 v0, v0, -0x100
-
-    :goto_0
-    add-int/lit8 p2, p2, 0x3
-
-    goto :goto_2
-
-    :pswitch_4
-    and-int/2addr v0, v3
-
-    add-int/lit8 v1, p2, 0x1
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 p2, p2, 0x3
-
-    new-array v3, v1, [Lp0/a/a/p;
-
-    iput-object v3, p1, Lp0/a/a/h;->j:[Lp0/a/a/p;
-
-    new-array v3, v1, [Lp0/a/a/p;
-
-    iput-object v3, p1, Lp0/a/a/h;->k:[Lp0/a/a/p;
-
-    new-array v3, v1, [I
-
-    iput-object v3, p1, Lp0/a/a/h;->l:[I
-
-    const/4 v3, 0x0
-
-    :goto_1
-    if-ge v3, v1, :cond_1
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    add-int/lit8 v5, p2, 0x2
-
-    invoke-virtual {p0, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v5
-
-    add-int/lit8 v6, p2, 0x4
-
-    invoke-virtual {p0, v6}, Lp0/a/a/d;->u(I)I
-
-    move-result v6
-
-    add-int/lit8 p2, p2, 0x6
-
-    iget-object v7, p1, Lp0/a/a/h;->j:[Lp0/a/a/p;
-
-    iget-object v8, p1, Lp0/a/a/h;->g:[Lp0/a/a/p;
-
-    invoke-virtual {p0, v4, v8}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v8
-
-    aput-object v8, v7, v3
-
-    iget-object v7, p1, Lp0/a/a/h;->k:[Lp0/a/a/p;
-
-    add-int/2addr v4, v5
-
-    iget-object v5, p1, Lp0/a/a/h;->g:[Lp0/a/a/p;
-
-    invoke-virtual {p0, v4, v5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v4
-
-    aput-object v4, v7, v3
-
-    iget-object v4, p1, Lp0/a/a/h;->l:[I
-
-    aput v6, v4, v3
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    :pswitch_5
-    const/high16 v1, -0x10000
-
-    and-int/2addr v0, v1
-
-    add-int/lit8 p2, p2, 0x2
-
-    :cond_1
-    :goto_2
-    iput v0, p1, Lp0/a/a/h;->h:I
-
-    invoke-virtual {p0, p2}, Lp0/a/a/d;->f(I)I
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    const/4 v1, 0x0
-
-    goto :goto_3
-
-    :cond_2
-    new-instance v1, Lp0/a/a/x;
-
-    iget-object v3, p0, Lp0/a/a/d;->a:[B
-
-    invoke-direct {v1, v3, p2}, Lp0/a/a/x;-><init>([BI)V
-
-    :goto_3
-    iput-object v1, p1, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    add-int/2addr p2, v2
-
-    mul-int/lit8 v0, v0, 0x2
-
-    add-int/2addr v0, p2
-
-    return v0
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x10
-        :pswitch_3
-        :pswitch_3
-        :pswitch_3
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_5
-        :pswitch_3
-    .end packed-switch
-
-    :pswitch_data_1
-    .packed-switch 0x40
-        :pswitch_4
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-        :pswitch_1
-    .end packed-switch
-.end method
-
-.method public final s(Lp0/a/a/q;Lp0/a/a/h;IZ)[I
-    .locals 11
-
-    iget-object v0, p2, Lp0/a/a/h;->c:[C
-
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    new-array v2, v1, [I
-
-    add-int/lit8 p3, p3, 0x2
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_0
-    if-ge v4, v1, :cond_6
-
-    aput p3, v2, v4
-
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->l(I)I
-
-    move-result v5
-
-    ushr-int/lit8 v6, v5, 0x18
-
-    const/16 v7, 0x17
-
-    if-eq v6, v7, :cond_0
-
-    packed-switch v6, :pswitch_data_0
-
-    packed-switch v6, :pswitch_data_1
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    add-int/lit8 p3, p3, 0x4
-
-    goto :goto_2
-
-    :pswitch_1
-    add-int/lit8 v7, p3, 0x1
-
-    invoke-virtual {p0, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result v7
-
-    add-int/lit8 p3, p3, 0x3
-
-    :goto_1
-    add-int/lit8 v8, v7, -0x1
-
-    if-lez v7, :cond_1
-
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->u(I)I
-
-    move-result v7
-
-    add-int/lit8 v9, p3, 0x2
-
-    invoke-virtual {p0, v9}, Lp0/a/a/d;->u(I)I
-
-    move-result v9
-
-    add-int/lit8 p3, p3, 0x6
-
-    iget-object v10, p2, Lp0/a/a/h;->g:[Lp0/a/a/p;
-
-    invoke-virtual {p0, v7, v10}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    add-int/2addr v7, v9
-
-    iget-object v9, p2, Lp0/a/a/h;->g:[Lp0/a/a/p;
-
-    invoke-virtual {p0, v7, v9}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move v7, v8
-
-    goto :goto_1
-
-    :cond_0
-    :pswitch_2
-    add-int/lit8 p3, p3, 0x3
-
-    :cond_1
-    :goto_2
-    invoke-virtual {p0, p3}, Lp0/a/a/d;->f(I)I
-
-    move-result v7
-
-    const/16 v8, 0x42
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x1
-
-    if-ne v6, v8, :cond_5
-
-    if-nez v7, :cond_2
-
-    move-object v6, v9
-
-    goto :goto_3
-
-    :cond_2
-    new-instance v6, Lp0/a/a/x;
-
-    iget-object v8, p0, Lp0/a/a/d;->a:[B
-
-    invoke-direct {v6, v8, p3}, Lp0/a/a/x;-><init>([BI)V
-
-    :goto_3
-    mul-int/lit8 v7, v7, 0x2
-
-    add-int/2addr v7, v10
-
-    add-int/2addr v7, p3
-
-    invoke-virtual {p0, v7, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object p3
-
-    add-int/lit8 v7, v7, 0x2
-
-    and-int/lit16 v5, v5, -0x100
-
-    move-object v8, p1
-
-    check-cast v8, Lp0/a/a/r;
-
-    if-eqz v8, :cond_4
-
-    new-instance v9, Lp0/a/a/c;
-
-    invoke-direct {v9}, Lp0/a/a/c;-><init>()V
-
-    invoke-static {v5, v9}, Lf/n/a/k/a;->S(ILp0/a/a/c;)V
-
-    invoke-static {v6, v9}, Lp0/a/a/x;->a(Lp0/a/a/x;Lp0/a/a/c;)V
-
-    iget-object v5, v8, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v5, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p3
-
-    invoke-virtual {v9, p3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v9, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    if-eqz p4, :cond_3
-
-    new-instance p3, Lp0/a/a/a;
-
-    iget-object v5, v8, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v6, v8, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    invoke-direct {p3, v5, v10, v9, v6}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p3, v8, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    goto :goto_4
-
-    :cond_3
-    new-instance p3, Lp0/a/a/a;
-
-    iget-object v5, v8, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v6, v8, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    invoke-direct {p3, v5, v10, v9, v6}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p3, v8, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    :goto_4
-    invoke-virtual {p0, p3, v7, v10, v0}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result p3
-
-    goto :goto_5
-
-    :cond_4
-    throw v9
-
-    :cond_5
-    mul-int/lit8 v7, v7, 0x2
-
-    add-int/lit8 v7, v7, 0x3
-
-    add-int/2addr v7, p3
-
-    invoke-virtual {p0, v9, v7, v10, v0}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result p3
-
-    :goto_5
-    add-int/lit8 v4, v4, 0x1
-
-    goto/16 :goto_0
-
-    :cond_6
-    return-object v2
-
-    :pswitch_data_0
-    .packed-switch 0x10
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-    .end packed-switch
-
-    :pswitch_data_1
-    .packed-switch 0x40
-        :pswitch_1
-        :pswitch_1
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public t(I[C)Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    if-eqz p1, :cond_1
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0, v0, p2}, Lp0/a/a/d;->w(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
-
-.method public u(I)I
-    .locals 2
-
-    iget-object v0, p0, Lp0/a/a/d;->a:[B
-
-    aget-byte v1, v0, p1
-
-    and-int/lit16 v1, v1, 0xff
-
-    shl-int/lit8 v1, v1, 0x8
-
-    add-int/lit8 p1, p1, 0x1
-
-    aget-byte p1, v0, p1
-
-    and-int/lit16 p1, p1, 0xff
-
-    or-int/2addr p1, v1
-
-    return p1
-.end method
-
-.method public final v(II[C)Ljava/lang/String;
-    .locals 6
-
-    add-int/2addr p2, p1
-
-    iget-object v0, p0, Lp0/a/a/d;->a:[B
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge p1, p2, :cond_2
-
-    add-int/lit8 v3, p1, 0x1
-
-    aget-byte p1, v0, p1
-
-    and-int/lit16 v4, p1, 0x80
-
-    if-nez v4, :cond_0
-
-    add-int/lit8 v4, v2, 0x1
-
-    and-int/lit8 p1, p1, 0x7f
-
-    int-to-char p1, p1
-
-    aput-char p1, p3, v2
-
-    :goto_1
-    move p1, v3
-
-    move v2, v4
-
-    goto :goto_0
-
-    :cond_0
-    and-int/lit16 v4, p1, 0xe0
-
-    const/16 v5, 0xc0
-
-    if-ne v4, v5, :cond_1
-
-    add-int/lit8 v4, v2, 0x1
-
-    and-int/lit8 p1, p1, 0x1f
-
-    shl-int/lit8 p1, p1, 0x6
-
-    add-int/lit8 v5, v3, 0x1
-
-    aget-byte v3, v0, v3
-
-    and-int/lit8 v3, v3, 0x3f
-
-    add-int/2addr p1, v3
-
-    int-to-char p1, p1
-
-    aput-char p1, p3, v2
-
-    move v2, v4
-
-    move p1, v5
-
-    goto :goto_0
-
-    :cond_1
-    add-int/lit8 v4, v2, 0x1
-
-    and-int/lit8 p1, p1, 0xf
-
-    shl-int/lit8 p1, p1, 0xc
-
-    add-int/lit8 v5, v3, 0x1
-
-    aget-byte v3, v0, v3
-
-    and-int/lit8 v3, v3, 0x3f
-
-    shl-int/lit8 v3, v3, 0x6
-
-    add-int/2addr p1, v3
-
-    add-int/lit8 v3, v5, 0x1
-
-    aget-byte v5, v0, v5
-
-    and-int/lit8 v5, v5, 0x3f
-
-    add-int/2addr p1, v5
-
-    int-to-char p1, p1
-
-    aput-char p1, p3, v2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p1, Ljava/lang/String;
-
-    invoke-direct {p1, p3, v1, v2}, Ljava/lang/String;-><init>([CII)V
-
-    return-object p1
-.end method
-
-.method public final w(I[C)Ljava/lang/String;
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/d;->c:[Ljava/lang/String;
-
-    aget-object v1, v0, p1
-
-    if-eqz v1, :cond_0
-
-    return-object v1
-
-    :cond_0
-    iget-object v1, p0, Lp0/a/a/d;->b:[I
-
-    aget v1, v1, p1
-
-    add-int/lit8 v2, v1, 0x2
-
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    invoke-virtual {p0, v2, v1, p2}, Lp0/a/a/d;->v(II[C)Ljava/lang/String;
-
-    move-result-object p2
-
-    aput-object p2, v0, p1
-
-    return-object p2
-.end method
-
-.method public final x(I[Ljava/lang/Object;I[C[Lp0/a/a/p;)I
-    .locals 2
-
-    iget-object v0, p0, Lp0/a/a/d;->a:[B
-
-    add-int/lit8 v1, p1, 0x1
-
-    aget-byte p1, v0, p1
-
-    and-int/lit16 p1, p1, 0xff
-
-    packed-switch p1, :pswitch_data_0
-
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    invoke-virtual {p0, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result p1
-
-    invoke-virtual {p0, p1, p5}, Lp0/a/a/d;->b(I[Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object p1
-
-    aput-object p1, p2, p3
-
-    goto :goto_0
-
-    :pswitch_1
-    invoke-virtual {p0, v1, p4}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object p1
-
-    aput-object p1, p2, p3
-
-    :goto_0
-    add-int/lit8 v1, v1, 0x2
-
-    goto :goto_1
-
-    :pswitch_2
-    sget-object p1, Lp0/a/a/t;->g:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_3
-    sget-object p1, Lp0/a/a/t;->f:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_4
-    sget-object p1, Lp0/a/a/t;->e:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_5
-    sget-object p1, Lp0/a/a/t;->d:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_6
-    sget-object p1, Lp0/a/a/t;->c:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_7
-    sget-object p1, Lp0/a/a/t;->b:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_8
-    sget-object p1, Lp0/a/a/t;->a:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    :goto_1
-    return v1
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/e.smali b/com.discord/smali_classes2/p0/a/a/e.smali
deleted file mode 100644
index d97a8fc733..0000000000
--- a/com.discord/smali_classes2/p0/a/a/e.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public abstract Lp0/a/a/e;
-.super Ljava/lang/Object;
-.source "ClassVisitor.java"
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/high16 v0, 0x60000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x50000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x40000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x70000
-
-    if-ne p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
-.end method
-
-.method public abstract b(Ljava/lang/String;Z)Lp0/a/a/a;
-.end method
-
-.method public abstract c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
-.end method
-
-.method public abstract d(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/f.smali b/com.discord/smali_classes2/p0/a/a/f.smali
deleted file mode 100644
index 682a5d3dfb..0000000000
--- a/com.discord/smali_classes2/p0/a/a/f.smali
+++ /dev/null
@@ -1,5984 +0,0 @@
-.class public Lp0/a/a/f;
-.super Lp0/a/a/e;
-.source "ClassWriter.java"
-
-
-# instance fields
-.field public A:Lp0/a/a/b;
-
-.field public B:I
-
-.field public a:I
-
-.field public final b:Lp0/a/a/v;
-
-.field public c:I
-
-.field public d:I
-
-.field public e:I
-
-.field public f:I
-
-.field public g:[I
-
-.field public h:Lp0/a/a/l;
-
-.field public i:Lp0/a/a/l;
-
-.field public j:Lp0/a/a/r;
-
-.field public k:Lp0/a/a/r;
-
-.field public l:I
-
-.field public m:Lp0/a/a/c;
-
-.field public n:I
-
-.field public o:I
-
-.field public p:I
-
-.field public q:I
-
-.field public r:Lp0/a/a/c;
-
-.field public s:Lp0/a/a/a;
-
-.field public t:Lp0/a/a/a;
-
-.field public u:Lp0/a/a/a;
-
-.field public v:Lp0/a/a/a;
-
-.field public w:Lp0/a/a/s;
-
-.field public x:I
-
-.field public y:I
-
-.field public z:Lp0/a/a/c;
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 1
-
-    const/high16 v0, 0x70000
-
-    invoke-direct {p0, v0}, Lp0/a/a/e;-><init>(I)V
-
-    new-instance v0, Lp0/a/a/v;
-
-    invoke-direct {v0, p0}, Lp0/a/a/v;-><init>(Lp0/a/a/f;)V
-
-    iput-object v0, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    and-int/lit8 v0, p1, 0x2
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x4
-
-    iput p1, p0, Lp0/a/a/f;->B:I
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    and-int/2addr p1, v0
-
-    if-eqz p1, :cond_1
-
-    iput v0, p0, Lp0/a/a/f;->B:I
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x0
-
-    iput p1, p0, Lp0/a/a/f;->B:I
-
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
-    .locals 1
-
-    iput p1, p0, Lp0/a/a/f;->a:I
-
-    iput p2, p0, Lp0/a/a/f;->c:I
-
-    iget-object p2, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const v0, 0xffff
-
-    and-int/2addr p1, v0
-
-    iput p1, p2, Lp0/a/a/v;->c:I
-
-    iput-object p3, p2, Lp0/a/a/v;->d:Ljava/lang/String;
-
-    const/4 v0, 0x7
-
-    invoke-virtual {p2, v0, p3}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p2
-
-    iget p2, p2, Lp0/a/a/u;->a:I
-
-    iput p2, p0, Lp0/a/a/f;->d:I
-
-    if-eqz p4, :cond_0
-
-    iget-object p2, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {p2, p4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    iput p2, p0, Lp0/a/a/f;->p:I
-
-    :cond_0
-    const/4 p2, 0x0
-
-    if-nez p5, :cond_1
-
-    const/4 p3, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    iget-object p3, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {p3, v0, p5}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p3
-
-    iget p3, p3, Lp0/a/a/u;->a:I
-
-    :goto_0
-    iput p3, p0, Lp0/a/a/f;->e:I
-
-    if-eqz p6, :cond_2
-
-    array-length p3, p6
-
-    if-lez p3, :cond_2
-
-    array-length p3, p6
-
-    iput p3, p0, Lp0/a/a/f;->f:I
-
-    new-array p3, p3, [I
-
-    iput-object p3, p0, Lp0/a/a/f;->g:[I
-
-    :goto_1
-    iget p3, p0, Lp0/a/a/f;->f:I
-
-    if-ge p2, p3, :cond_2
-
-    iget-object p3, p0, Lp0/a/a/f;->g:[I
-
-    iget-object p4, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    aget-object p5, p6, p2
-
-    invoke-virtual {p4, p5}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p4
-
-    iget p4, p4, Lp0/a/a/u;->a:I
-
-    aput p4, p3, p2
-
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    iget p2, p0, Lp0/a/a/f;->B:I
-
-    const/4 p3, 0x1
-
-    if-ne p2, p3, :cond_3
-
-    const/16 p2, 0x33
-
-    if-lt p1, p2, :cond_3
-
-    const/4 p1, 0x2
-
-    iput p1, p0, Lp0/a/a/f;->B:I
-
-    :cond_3
-    return-void
-.end method
-
-.method public final b(Ljava/lang/String;Z)Lp0/a/a/a;
-    .locals 3
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    iget-object v1, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v1, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p2, :cond_0
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object v1, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/f;->s:Lp0/a/a/a;
-
-    invoke-direct {p2, v1, p1, v0, v2}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/f;->s:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_0
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object v1, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/f;->t:Lp0/a/a/a;
-
-    invoke-direct {p2, v1, p1, v0, v2}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/f;->t:Lp0/a/a/a;
-
-    return-object p2
-.end method
-
-.method public final c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
-    .locals 9
-
-    new-instance v8, Lp0/a/a/r;
-
-    iget-object v1, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget v7, p0, Lp0/a/a/f;->B:I
-
-    move-object v0, v8
-
-    move v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    move-object v6, p5
-
-    invoke-direct/range {v0 .. v7}, Lp0/a/a/r;-><init>(Lp0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;I)V
-
-    iget-object p1, p0, Lp0/a/a/f;->j:Lp0/a/a/r;
-
-    if-nez p1, :cond_0
-
-    iput-object v8, p0, Lp0/a/a/f;->j:Lp0/a/a/r;
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p0, Lp0/a/a/f;->k:Lp0/a/a/r;
-
-    iput-object v8, p1, Lp0/a/a/q;->b:Lp0/a/a/q;
-
-    :goto_0
-    iput-object v8, p0, Lp0/a/a/f;->k:Lp0/a/a/r;
-
-    return-object v8
-.end method
-
-.method public final d(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-    .locals 1
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    invoke-static {p1, v0}, Lf/n/a/k/a;->S(ILp0/a/a/c;)V
-
-    invoke-static {p2, v0}, Lp0/a/a/x;->a(Lp0/a/a/x;Lp0/a/a/c;)V
-
-    iget-object p1, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {p1, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p4, :cond_0
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/f;->u:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/f;->u:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_0
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/f;->v:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/f;->v:Lp0/a/a/a;
-
-    return-object p2
-.end method
-
-.method public final e([BZ)[B
-    .locals 57
-
-    move-object/from16 v7, p0
-
-    new-instance v0, Lp0/a/a/b$a;
-
-    invoke-direct {v0}, Lp0/a/a/b$a;-><init>()V
-
-    iget-object v1, v7, Lp0/a/a/f;->A:Lp0/a/a/b;
-
-    invoke-virtual {v0, v1}, Lp0/a/a/b$a;->a(Lp0/a/a/b;)V
-
-    iget-object v1, v7, Lp0/a/a/f;->h:Lp0/a/a/l;
-
-    :goto_0
-    if-eqz v1, :cond_0
-
-    iget-object v2, v1, Lp0/a/a/l;->l:Lp0/a/a/b;
-
-    invoke-virtual {v0, v2}, Lp0/a/a/b$a;->a(Lp0/a/a/b;)V
-
-    iget-object v1, v1, Lp0/a/a/k;->a:Lp0/a/a/k;
-
-    check-cast v1, Lp0/a/a/l;
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, v7, Lp0/a/a/f;->j:Lp0/a/a/r;
-
-    :goto_1
-    if-eqz v1, :cond_1
-
-    iget-object v2, v1, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    invoke-virtual {v0, v2}, Lp0/a/a/b$a;->a(Lp0/a/a/b;)V
-
-    iget-object v2, v1, Lp0/a/a/r;->x:Lp0/a/a/b;
-
-    invoke-virtual {v0, v2}, Lp0/a/a/b$a;->a(Lp0/a/a/b;)V
-
-    iget-object v1, v1, Lp0/a/a/q;->b:Lp0/a/a/q;
-
-    check-cast v1, Lp0/a/a/r;
-
-    goto :goto_1
-
-    :cond_1
-    iget v1, v0, Lp0/a/a/b$a;->a:I
-
-    new-array v2, v1, [Lp0/a/a/b;
-
-    iget-object v0, v0, Lp0/a/a/b$a;->b:[Lp0/a/a/b;
-
-    const/4 v6, 0x0
-
-    invoke-static {v0, v6, v2, v6, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    const/4 v5, 0x0
-
-    iput-object v5, v7, Lp0/a/a/f;->h:Lp0/a/a/l;
-
-    iput-object v5, v7, Lp0/a/a/f;->i:Lp0/a/a/l;
-
-    iput-object v5, v7, Lp0/a/a/f;->j:Lp0/a/a/r;
-
-    iput-object v5, v7, Lp0/a/a/f;->k:Lp0/a/a/r;
-
-    iput-object v5, v7, Lp0/a/a/f;->s:Lp0/a/a/a;
-
-    iput-object v5, v7, Lp0/a/a/f;->t:Lp0/a/a/a;
-
-    iput-object v5, v7, Lp0/a/a/f;->u:Lp0/a/a/a;
-
-    iput-object v5, v7, Lp0/a/a/f;->v:Lp0/a/a/a;
-
-    iput-object v5, v7, Lp0/a/a/f;->w:Lp0/a/a/s;
-
-    iput v6, v7, Lp0/a/a/f;->x:I
-
-    iput v6, v7, Lp0/a/a/f;->y:I
-
-    iput-object v5, v7, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    iput-object v5, v7, Lp0/a/a/f;->A:Lp0/a/a/b;
-
-    if-eqz p2, :cond_2
-
-    const/4 v0, 0x3
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_2
-    iput v0, v7, Lp0/a/a/f;->B:I
-
-    new-instance v4, Lp0/a/a/d;
-
-    move-object/from16 v0, p1
-
-    invoke-direct {v4, v0, v6, v6}, Lp0/a/a/d;-><init>([BIZ)V
-
-    const/16 v0, 0x8
-
-    if-eqz p2, :cond_3
-
-    const/16 v1, 0x8
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v1, 0x0
-
-    :goto_3
-    or-int/lit16 v3, v1, 0x100
-
-    new-instance v1, Lp0/a/a/h;
-
-    invoke-direct {v1}, Lp0/a/a/h;-><init>()V
-
-    iput-object v2, v1, Lp0/a/a/h;->a:[Lp0/a/a/b;
-
-    iput v3, v1, Lp0/a/a/h;->b:I
-
-    iget v8, v4, Lp0/a/a/d;->f:I
-
-    new-array v15, v8, [C
-
-    iput-object v15, v1, Lp0/a/a/h;->c:[C
-
-    iget v8, v4, Lp0/a/a/d;->g:I
-
-    invoke-virtual {v4, v8}, Lp0/a/a/d;->u(I)I
-
-    move-result v9
-
-    add-int/lit8 v10, v8, 0x2
-
-    invoke-virtual {v4, v10, v15}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v16
-
-    add-int/lit8 v10, v8, 0x4
-
-    invoke-virtual {v4, v10, v15}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v17
-
-    add-int/lit8 v10, v8, 0x6
-
-    invoke-virtual {v4, v10}, Lp0/a/a/d;->u(I)I
-
-    move-result v10
-
-    new-array v14, v10, [Ljava/lang/String;
-
-    add-int/2addr v8, v0
-
-    move v0, v8
-
-    const/4 v8, 0x0
-
-    :goto_4
-    if-ge v8, v10, :cond_4
-
-    invoke-virtual {v4, v0, v15}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v11
-
-    aput-object v11, v14, v8
-
-    add-int/lit8 v0, v0, 0x2
-
-    add-int/lit8 v8, v8, 0x1
-
-    goto :goto_4
-
-    :cond_4
-    invoke-virtual {v4}, Lp0/a/a/d;->c()I
-
-    move-result v8
-
-    add-int/lit8 v10, v8, -0x2
-
-    invoke-virtual {v4, v10}, Lp0/a/a/d;->u(I)I
-
-    move-result v10
-
-    move-object v11, v5
-
-    move-object v12, v11
-
-    move-object/from16 v18, v12
-
-    move-object/from16 v20, v18
-
-    move-object/from16 v22, v20
-
-    move v13, v9
-
-    move/from16 v19, v10
-
-    move-object/from16 p1, v14
-
-    const/4 v9, 0x0
-
-    const/16 v21, 0x0
-
-    const/16 v23, 0x0
-
-    const/16 v24, 0x0
-
-    const/16 v25, 0x0
-
-    const/16 v26, 0x0
-
-    const/16 v27, 0x0
-
-    const/16 v28, 0x0
-
-    const/16 v29, 0x0
-
-    move-object/from16 v10, v22
-
-    :goto_5
-    const-string v14, "RuntimeInvisibleTypeAnnotations"
-
-    move-object/from16 p2, v12
-
-    const-string v12, "RuntimeInvisibleAnnotations"
-
-    const/high16 v30, 0x20000
-
-    move-object/from16 v31, v11
-
-    const-string v11, "Synthetic"
-
-    move-object/from16 v32, v10
-
-    const-string v10, "Deprecated"
-
-    move/from16 v33, v9
-
-    const-string v9, "RuntimeVisibleTypeAnnotations"
-
-    const-string v7, "RuntimeVisibleAnnotations"
-
-    const-string v6, "Signature"
-
-    if-lez v19, :cond_16
-
-    invoke-virtual {v4, v8, v15}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v5
-
-    move/from16 v34, v0
-
-    add-int/lit8 v0, v8, 0x2
-
-    invoke-virtual {v4, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v0
-
-    add-int/lit8 v8, v8, 0x6
-
-    move-object/from16 v35, v1
-
-    const-string v1, "SourceFile"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    invoke-virtual {v4, v8, v15}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v11
-
-    move-object/from16 v10, v32
-
-    move/from16 v9, v33
-
-    goto/16 :goto_9
-
-    :cond_5
-    const-string v1, "InnerClasses"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_6
-
-    move/from16 v29, v8
-
-    goto :goto_6
-
-    :cond_6
-    const-string v1, "EnclosingMethod"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    move/from16 v23, v8
-
-    goto :goto_6
-
-    :cond_7
-    const-string v1, "NestHost"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_8
-
-    invoke-virtual {v4, v8, v15}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v22
-
-    :goto_6
-    move/from16 v9, v33
-
-    goto/16 :goto_7
-
-    :cond_8
-    const-string v1, "NestMembers"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_9
-
-    move/from16 v28, v8
-
-    goto :goto_6
-
-    :cond_9
-    invoke-virtual {v6, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_a
-
-    invoke-virtual {v4, v8, v15}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v18
-
-    goto :goto_6
-
-    :cond_a
-    invoke-virtual {v7, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_b
-
-    move/from16 v24, v8
-
-    goto :goto_6
-
-    :cond_b
-    invoke-virtual {v9, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_c
-
-    move/from16 v26, v8
-
-    goto :goto_6
-
-    :cond_c
-    invoke-virtual {v10, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_d
-
-    or-int v13, v13, v30
-
-    goto :goto_6
-
-    :cond_d
-    invoke-virtual {v11, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_e
-
-    or-int/lit16 v13, v13, 0x1000
-
-    goto :goto_6
-
-    :cond_e
-    const-string v1, "SourceDebugExtension"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_f
-
-    new-array v1, v0, [C
-
-    invoke-virtual {v4, v8, v0, v1}, Lp0/a/a/d;->v(II[C)Ljava/lang/String;
-
-    move-result-object v10
-
-    move/from16 v9, v33
-
-    goto :goto_8
-
-    :cond_f
-    invoke-virtual {v12, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_10
-
-    move/from16 v25, v8
-
-    goto :goto_6
-
-    :cond_10
-    invoke-virtual {v14, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_11
-
-    move/from16 v27, v8
-
-    goto :goto_6
-
-    :cond_11
-    const-string v1, "Module"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_12
-
-    move v9, v8
-
-    goto :goto_7
-
-    :cond_12
-    const-string v1, "ModuleMainClass"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_13
-
-    invoke-virtual {v4, v8, v15}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v20
-
-    goto :goto_6
-
-    :cond_13
-    const-string v1, "ModulePackages"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_14
-
-    move/from16 v21, v8
-
-    goto/16 :goto_6
-
-    :goto_7
-    move-object/from16 v10, v32
-
-    :goto_8
-    move-object/from16 v11, v31
-
-    :goto_9
-    move-object/from16 v32, p1
-
-    move-object/from16 v12, p2
-
-    move v6, v8
-
-    move-object v7, v15
-
-    goto :goto_b
-
-    :cond_14
-    const-string v1, "BootstrapMethods"
-
-    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_15
-
-    const/4 v14, -0x1
-
-    const/4 v1, 0x0
-
-    move v6, v8
-
-    move-object v8, v4
-
-    move/from16 v7, v33
-
-    move-object v9, v2
-
-    move-object/from16 v12, v32
-
-    move-object v10, v5
-
-    move-object/from16 v5, v31
-
-    move v11, v6
-
-    move-object/from16 v36, p2
-
-    move-object/from16 v37, v12
-
-    move v12, v0
-
-    move/from16 v31, v13
-
-    move-object v13, v15
-
-    move-object/from16 v32, p1
-
-    move-object v7, v15
-
-    move-object v15, v1
-
-    invoke-virtual/range {v8 .. v15}, Lp0/a/a/d;->e([Lp0/a/a/b;Ljava/lang/String;II[CI[Lp0/a/a/p;)Lp0/a/a/b;
-
-    move-result-object v12
-
-    move-object/from16 v8, v36
-
-    iput-object v8, v12, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    goto :goto_a
-
-    :cond_15
-    move v6, v8
-
-    move-object v7, v15
-
-    move-object/from16 v5, v31
-
-    move-object/from16 v37, v32
-
-    move-object/from16 v32, p1
-
-    move-object/from16 v8, p2
-
-    move/from16 v31, v13
-
-    move-object v12, v8
-
-    :goto_a
-    move-object v11, v5
-
-    move/from16 v13, v31
-
-    move/from16 v9, v33
-
-    move-object/from16 v10, v37
-
-    :goto_b
-    add-int v8, v6, v0
-
-    add-int/lit8 v19, v19, -0x1
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    move-object v15, v7
-
-    move-object/from16 p1, v32
-
-    move/from16 v0, v34
-
-    move-object/from16 v1, v35
-
-    move-object/from16 v7, p0
-
-    goto/16 :goto_5
-
-    :cond_16
-    move-object/from16 v8, p2
-
-    move/from16 v34, v0
-
-    move-object/from16 v35, v1
-
-    move-object/from16 v5, v31
-
-    move-object/from16 v37, v32
-
-    move-object/from16 v32, p1
-
-    move/from16 v31, v13
-
-    move-object v13, v7
-
-    move-object v7, v15
-
-    move/from16 v15, v33
-
-    iget-object v0, v4, Lp0/a/a/d;->b:[I
-
-    const/4 v2, 0x1
-
-    aget v0, v0, v2
-
-    const/4 v1, 0x7
-
-    sub-int/2addr v0, v1
-
-    invoke-virtual {v4, v0}, Lp0/a/a/d;->l(I)I
-
-    move-result v19
-
-    move-object/from16 v36, v8
-
-    move/from16 v8, v34
-
-    move-object/from16 v0, p0
-
-    move-object/from16 p1, v13
-
-    move-object/from16 p2, v14
-
-    move-object/from16 v13, v35
-
-    const/4 v14, 0x7
-
-    move/from16 v1, v19
-
-    move/from16 v2, v31
-
-    move/from16 v19, v3
-
-    move-object/from16 v3, v16
-
-    move-object v14, v4
-
-    move-object/from16 v4, v18
-
-    move-object/from16 v18, v12
-
-    move-object v12, v5
-
-    move-object/from16 v5, v17
-
-    move-object/from16 v38, v6
-
-    move-object/from16 v17, v9
-
-    const/4 v9, 0x0
-
-    move-object/from16 v6, v32
-
-    invoke-virtual/range {v0 .. v6}, Lp0/a/a/e;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
-
-    and-int/lit8 v0, v19, 0x2
-
-    if-nez v0, :cond_17
-
-    move-object/from16 v5, v37
-
-    if-nez v12, :cond_18
-
-    if-eqz v5, :cond_17
-
-    goto :goto_c
-
-    :cond_17
-    move-object/from16 v6, p0
-
-    move-object/from16 v4, p1
-
-    goto :goto_d
-
-    :cond_18
-    :goto_c
-    move-object/from16 v6, p0
-
-    move-object/from16 v4, p1
-
-    if-eqz v12, :cond_19
-
-    iget-object v0, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v0, v12}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v0
-
-    iput v0, v6, Lp0/a/a/f;->q:I
-
-    :cond_19
-    if-eqz v5, :cond_1a
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    const v1, 0x7fffffff
-
-    invoke-virtual {v0, v5, v9, v1}, Lp0/a/a/c;->a(Ljava/lang/String;II)Lp0/a/a/c;
-
-    iput-object v0, v6, Lp0/a/a/f;->r:Lp0/a/a/c;
-
-    :cond_1a
-    :goto_d
-    if-eqz v15, :cond_2d
-
-    iget-object v0, v13, Lp0/a/a/h;->c:[C
-
-    iget-object v1, v14, Lp0/a/a/d;->b:[I
-
-    invoke-virtual {v14, v15}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    aget v1, v1, v2
-
-    invoke-virtual {v14, v1, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v2, v15, 0x2
-
-    invoke-virtual {v14, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v3, v15, 0x4
-
-    invoke-virtual {v14, v3, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    add-int/lit8 v5, v15, 0x6
-
-    new-instance v12, Lp0/a/a/s;
-
-    iget-object v15, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/16 v9, 0x13
-
-    invoke-virtual {v15, v9, v1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    if-nez v3, :cond_1b
-
-    const/4 v3, 0x0
-
-    goto :goto_e
-
-    :cond_1b
-    iget-object v9, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v9, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v3
-
-    :goto_e
-    invoke-direct {v12, v15, v1, v2, v3}, Lp0/a/a/s;-><init>(Lp0/a/a/v;III)V
-
-    iput-object v12, v6, Lp0/a/a/f;->w:Lp0/a/a/s;
-
-    move-object/from16 v1, v20
-
-    if-eqz v1, :cond_1c
-
-    iget-object v2, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    const/4 v3, 0x7
-
-    invoke-virtual {v2, v3, v1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    iput v1, v12, Lp0/a/a/s;->q:I
-
-    :cond_1c
-    const/16 v1, 0x14
-
-    move/from16 v2, v21
-
-    if-eqz v2, :cond_1d
-
-    invoke-virtual {v14, v2}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v21, v2, 0x2
-
-    move/from16 v2, v21
-
-    :goto_f
-    add-int/lit8 v9, v3, -0x1
-
-    if-lez v3, :cond_1d
-
-    invoke-virtual {v14, v2, v0}, Lp0/a/a/d;->o(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    iget-object v15, v12, Lp0/a/a/s;->p:Lp0/a/a/c;
-
-    move/from16 v19, v9
-
-    iget-object v9, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v9, v1, v3}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v3
-
-    iget v3, v3, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v15, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v3, v12, Lp0/a/a/s;->o:I
-
-    const/4 v15, 0x1
-
-    add-int/2addr v3, v15
-
-    iput v3, v12, Lp0/a/a/s;->o:I
-
-    add-int/lit8 v2, v2, 0x2
-
-    move/from16 v3, v19
-
-    goto :goto_f
-
-    :cond_1d
-    const/4 v15, 0x1
-
-    invoke-virtual {v14, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v5, v5, 0x2
-
-    :goto_10
-    add-int/lit8 v3, v2, -0x1
-
-    if-lez v2, :cond_1f
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->n(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v9, v5, 0x2
-
-    invoke-virtual {v14, v9}, Lp0/a/a/d;->u(I)I
-
-    move-result v9
-
-    add-int/lit8 v1, v5, 0x4
-
-    invoke-virtual {v14, v1, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v5, v5, 0x6
-
-    iget-object v15, v12, Lp0/a/a/s;->f:Lp0/a/a/c;
-
-    move/from16 v20, v3
-
-    iget-object v3, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    move-object/from16 v21, v4
-
-    const/16 v4, 0x13
-
-    invoke-virtual {v3, v4, v2}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v2
-
-    iget v2, v2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v15, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v15, v9}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    if-nez v1, :cond_1e
-
-    const/4 v1, 0x0
-
-    goto :goto_11
-
-    :cond_1e
-    iget-object v2, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v2, v1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v1
-
-    :goto_11
-    invoke-virtual {v15, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v1, v12, Lp0/a/a/s;->e:I
-
-    const/4 v2, 0x1
-
-    add-int/2addr v1, v2
-
-    iput v1, v12, Lp0/a/a/s;->e:I
-
-    move/from16 v2, v20
-
-    move-object/from16 v4, v21
-
-    const/16 v1, 0x14
-
-    const/4 v15, 0x1
-
-    goto :goto_10
-
-    :cond_1f
-    move-object/from16 v21, v4
-
-    invoke-virtual {v14, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v5, v5, 0x2
-
-    :goto_12
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_24
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->o(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v3, v5, 0x2
-
-    invoke-virtual {v14, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v4, v5, 0x4
-
-    invoke-virtual {v14, v4}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    add-int/lit8 v5, v5, 0x6
-
-    if-eqz v4, :cond_20
-
-    new-array v9, v4, [Ljava/lang/String;
-
-    const/4 v15, 0x0
-
-    :goto_13
-    if-ge v15, v4, :cond_21
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->n(I[C)Ljava/lang/String;
-
-    move-result-object v20
-
-    aput-object v20, v9, v15
-
-    add-int/lit8 v5, v5, 0x2
-
-    add-int/lit8 v15, v15, 0x1
-
-    goto :goto_13
-
-    :cond_20
-    const/4 v9, 0x0
-
-    :cond_21
-    iget-object v4, v12, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    iget-object v15, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    move/from16 p1, v2
-
-    const/16 v2, 0x14
-
-    invoke-virtual {v15, v2, v1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v4, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v4, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    if-nez v9, :cond_22
-
-    iget-object v1, v12, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_15
-
-    :cond_22
-    iget-object v1, v12, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    array-length v2, v9
-
-    invoke-virtual {v1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    array-length v1, v9
-
-    const/4 v2, 0x0
-
-    :goto_14
-    if-ge v2, v1, :cond_23
-
-    aget-object v3, v9, v2
-
-    iget-object v4, v12, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    iget-object v15, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v15, v3}, Lp0/a/a/v;->j(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v3
-
-    iget v3, v3, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v4, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_14
-
-    :cond_23
-    :goto_15
-    iget v1, v12, Lp0/a/a/s;->g:I
-
-    const/4 v2, 0x1
-
-    add-int/2addr v1, v2
-
-    iput v1, v12, Lp0/a/a/s;->g:I
-
-    move/from16 v1, p1
-
-    goto :goto_12
-
-    :cond_24
-    invoke-virtual {v14, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v5, v5, 0x2
-
-    :goto_16
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_29
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->o(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v3, v5, 0x2
-
-    invoke-virtual {v14, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v4, v5, 0x4
-
-    invoke-virtual {v14, v4}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    add-int/lit8 v5, v5, 0x6
-
-    if-eqz v4, :cond_26
-
-    new-array v9, v4, [Ljava/lang/String;
-
-    const/4 v15, 0x0
-
-    :goto_17
-    if-ge v15, v4, :cond_25
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->n(I[C)Ljava/lang/String;
-
-    move-result-object v20
-
-    aput-object v20, v9, v15
-
-    add-int/lit8 v5, v5, 0x2
-
-    add-int/lit8 v15, v15, 0x1
-
-    goto :goto_17
-
-    :cond_25
-    move v4, v5
-
-    move-object v5, v9
-
-    goto :goto_18
-
-    :cond_26
-    move v4, v5
-
-    const/4 v5, 0x0
-
-    :goto_18
-    iget-object v9, v12, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    iget-object v15, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    move/from16 p1, v2
-
-    const/16 v2, 0x14
-
-    invoke-virtual {v15, v2, v1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v9, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v9, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    if-nez v5, :cond_27
-
-    iget-object v1, v12, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_1a
-
-    :cond_27
-    iget-object v1, v12, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    array-length v3, v5
-
-    invoke-virtual {v1, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    array-length v1, v5
-
-    const/4 v3, 0x0
-
-    :goto_19
-    if-ge v3, v1, :cond_28
-
-    aget-object v9, v5, v3
-
-    iget-object v15, v12, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    iget-object v2, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v2, v9}, Lp0/a/a/v;->j(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v2
-
-    iget v2, v2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v15, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v3, v3, 0x1
-
-    const/16 v2, 0x14
-
-    goto :goto_19
-
-    :cond_28
-    :goto_1a
-    iget v1, v12, Lp0/a/a/s;->i:I
-
-    const/4 v2, 0x1
-
-    add-int/2addr v1, v2
-
-    iput v1, v12, Lp0/a/a/s;->i:I
-
-    move/from16 v1, p1
-
-    move v5, v4
-
-    goto :goto_16
-
-    :cond_29
-    invoke-virtual {v14, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v5, v5, 0x2
-
-    :goto_1b
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_2a
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    iget-object v3, v12, Lp0/a/a/s;->l:Lp0/a/a/c;
-
-    iget-object v4, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    const/4 v9, 0x7
-
-    invoke-virtual {v4, v9, v1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v1, v12, Lp0/a/a/s;->k:I
-
-    const/4 v3, 0x1
-
-    add-int/2addr v1, v3
-
-    iput v1, v12, Lp0/a/a/s;->k:I
-
-    add-int/lit8 v5, v5, 0x2
-
-    move v1, v2
-
-    goto :goto_1b
-
-    :cond_2a
-    invoke-virtual {v14, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v5, v5, 0x2
-
-    :goto_1c
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_2e
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v3, v5, 0x2
-
-    invoke-virtual {v14, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v5, v5, 0x4
-
-    new-array v4, v3, [Ljava/lang/String;
-
-    const/4 v9, 0x0
-
-    :goto_1d
-    if-ge v9, v3, :cond_2b
-
-    invoke-virtual {v14, v5, v0}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v15
-
-    aput-object v15, v4, v9
-
-    add-int/lit8 v5, v5, 0x2
-
-    add-int/lit8 v9, v9, 0x1
-
-    goto :goto_1d
-
-    :cond_2b
-    iget-object v9, v12, Lp0/a/a/s;->n:Lp0/a/a/c;
-
-    iget-object v15, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    move-object/from16 v19, v0
-
-    const/4 v0, 0x7
-
-    invoke-virtual {v15, v0, v1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v0, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v9, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v0, v12, Lp0/a/a/s;->n:Lp0/a/a/c;
-
-    invoke-virtual {v0, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 v0, 0x0
-
-    :goto_1e
-    if-ge v0, v3, :cond_2c
-
-    aget-object v1, v4, v0
-
-    iget-object v9, v12, Lp0/a/a/s;->n:Lp0/a/a/c;
-
-    iget-object v15, v12, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v15, v1}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v9, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1e
-
-    :cond_2c
-    iget v0, v12, Lp0/a/a/s;->m:I
-
-    const/4 v1, 0x1
-
-    add-int/2addr v0, v1
-
-    iput v0, v12, Lp0/a/a/s;->m:I
-
-    move v1, v2
-
-    move-object/from16 v0, v19
-
-    goto :goto_1c
-
-    :cond_2d
-    move-object/from16 v21, v4
-
-    :cond_2e
-    move-object/from16 v5, v22
-
-    if-eqz v5, :cond_2f
-
-    iget-object v0, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v1, 0x7
-
-    invoke-virtual {v0, v1, v5}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    iput v0, v6, Lp0/a/a/f;->x:I
-
-    :cond_2f
-    move/from16 v0, v23
-
-    if-eqz v0, :cond_32
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v0, v0, 0x2
-
-    invoke-virtual {v14, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    if-nez v0, :cond_30
-
-    const/4 v5, 0x0
-
-    goto :goto_1f
-
-    :cond_30
-    iget-object v2, v14, Lp0/a/a/d;->b:[I
-
-    aget v2, v2, v0
-
-    invoke-virtual {v14, v2, v7}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v5
-
-    :goto_1f
-    if-nez v0, :cond_31
-
-    const/4 v0, 0x0
-
-    goto :goto_20
-
-    :cond_31
-    iget-object v2, v14, Lp0/a/a/d;->b:[I
-
-    aget v0, v2, v0
-
-    add-int/lit8 v0, v0, 0x2
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_20
-    iget-object v2, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v3, 0x7
-
-    invoke-virtual {v2, v3, v1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    iput v1, v6, Lp0/a/a/f;->n:I
-
-    if-eqz v5, :cond_32
-
-    if-eqz v0, :cond_32
-
-    iget-object v1, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v1, v5, v0}, Lp0/a/a/v;->k(Ljava/lang/String;Ljava/lang/String;)I
-
-    move-result v0
-
-    iput v0, v6, Lp0/a/a/f;->o:I
-
-    :cond_32
-    move/from16 v0, v24
-
-    if-eqz v0, :cond_33
-
-    invoke-virtual {v14, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v24, v0, 0x2
-
-    move/from16 v0, v24
-
-    :goto_21
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_33
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v0, v0, 0x2
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v6, v1, v3}, Lp0/a/a/e;->b(Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v1
-
-    invoke-virtual {v14, v1, v0, v3, v7}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v0
-
-    move v1, v2
-
-    goto :goto_21
-
-    :cond_33
-    move/from16 v0, v25
-
-    if-eqz v0, :cond_34
-
-    invoke-virtual {v14, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v25, v0, 0x2
-
-    move/from16 v0, v25
-
-    :goto_22
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_34
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v0, v0, 0x2
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v6, v1, v3}, Lp0/a/a/e;->b(Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v1
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v14, v1, v0, v3, v7}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v0
-
-    move v1, v2
-
-    goto :goto_22
-
-    :cond_34
-    move/from16 v0, v26
-
-    if-eqz v0, :cond_35
-
-    invoke-virtual {v14, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v26, v0, 0x2
-
-    move/from16 v0, v26
-
-    :goto_23
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_35
-
-    invoke-virtual {v14, v13, v0}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v0
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v0, v0, 0x2
-
-    iget v3, v13, Lp0/a/a/h;->h:I
-
-    iget-object v4, v13, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    const/4 v5, 0x1
-
-    invoke-virtual {v6, v3, v4, v1, v5}, Lp0/a/a/e;->d(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v1
-
-    invoke-virtual {v14, v1, v0, v5, v7}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v0
-
-    move v1, v2
-
-    goto :goto_23
-
-    :cond_35
-    move/from16 v0, v27
-
-    if-eqz v0, :cond_36
-
-    invoke-virtual {v14, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v1
-
-    add-int/lit8 v27, v0, 0x2
-
-    move/from16 v0, v27
-
-    :goto_24
-    add-int/lit8 v2, v1, -0x1
-
-    if-lez v1, :cond_36
-
-    invoke-virtual {v14, v13, v0}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v0
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v1
-
-    add-int/lit8 v0, v0, 0x2
-
-    iget v3, v13, Lp0/a/a/h;->h:I
-
-    iget-object v4, v13, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v6, v3, v4, v1, v5}, Lp0/a/a/e;->d(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v1
-
-    const/4 v3, 0x1
-
-    invoke-virtual {v14, v1, v0, v3, v7}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v0
-
-    move v1, v2
-
-    goto :goto_24
-
-    :cond_36
-    const/4 v5, 0x0
-
-    move-object/from16 v12, v36
-
-    :goto_25
-    if-eqz v12, :cond_37
-
-    iget-object v0, v12, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    const/4 v1, 0x0
-
-    iput-object v1, v12, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iget-object v2, v6, Lp0/a/a/f;->A:Lp0/a/a/b;
-
-    iput-object v2, v12, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iput-object v12, v6, Lp0/a/a/f;->A:Lp0/a/a/b;
-
-    move-object v12, v0
-
-    goto :goto_25
-
-    :cond_37
-    move/from16 v0, v28
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_39
-
-    invoke-virtual {v14, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v28, v0, 0x2
-
-    move/from16 v0, v28
-
-    :goto_26
-    add-int/lit8 v3, v2, -0x1
-
-    if-lez v2, :cond_39
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    iget-object v4, v6, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    if-nez v4, :cond_38
-
-    new-instance v4, Lp0/a/a/c;
-
-    invoke-direct {v4}, Lp0/a/a/c;-><init>()V
-
-    iput-object v4, v6, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    :cond_38
-    iget v4, v6, Lp0/a/a/f;->y:I
-
-    const/4 v9, 0x1
-
-    add-int/2addr v4, v9
-
-    iput v4, v6, Lp0/a/a/f;->y:I
-
-    iget-object v4, v6, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    iget-object v9, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v12, 0x7
-
-    invoke-virtual {v9, v12, v2}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v2
-
-    iget v2, v2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v4, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v0, v0, 0x2
-
-    move v2, v3
-
-    goto :goto_26
-
-    :cond_39
-    move/from16 v0, v29
-
-    if-eqz v0, :cond_3e
-
-    invoke-virtual {v14, v0}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v29, v0, 0x2
-
-    move/from16 v0, v29
-
-    :goto_27
-    add-int/lit8 v3, v2, -0x1
-
-    if-lez v2, :cond_3e
-
-    invoke-virtual {v14, v0, v7}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v4, v0, 0x2
-
-    invoke-virtual {v14, v4, v7}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v4
-
-    add-int/lit8 v9, v0, 0x4
-
-    invoke-virtual {v14, v9, v7}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v9
-
-    add-int/lit8 v12, v0, 0x6
-
-    invoke-virtual {v14, v12}, Lp0/a/a/d;->u(I)I
-
-    move-result v12
-
-    iget-object v15, v6, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    if-nez v15, :cond_3a
-
-    new-instance v15, Lp0/a/a/c;
-
-    invoke-direct {v15}, Lp0/a/a/c;-><init>()V
-
-    iput-object v15, v6, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    :cond_3a
-    iget-object v15, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v1, 0x7
-
-    invoke-virtual {v15, v1, v2}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v2
-
-    iget v1, v2, Lp0/a/a/u;->g:I
-
-    if-nez v1, :cond_3d
-
-    iget v1, v6, Lp0/a/a/f;->l:I
-
-    const/4 v15, 0x1
-
-    add-int/2addr v1, v15
-
-    iput v1, v6, Lp0/a/a/f;->l:I
-
-    iget-object v1, v6, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    iget v5, v2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v1, v5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v6, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    if-nez v4, :cond_3b
-
-    const/4 v4, 0x0
-
-    const/4 v15, 0x7
-
-    goto :goto_28
-
-    :cond_3b
-    iget-object v5, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v15, 0x7
-
-    invoke-virtual {v5, v15, v4}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v4
-
-    iget v4, v4, Lp0/a/a/u;->a:I
-
-    :goto_28
-    invoke-virtual {v1, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v6, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    if-nez v9, :cond_3c
-
-    const/4 v4, 0x0
-
-    goto :goto_29
-
-    :cond_3c
-    iget-object v4, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v9}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v4
-
-    :goto_29
-    invoke-virtual {v1, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v6, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    invoke-virtual {v1, v12}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v1, v6, Lp0/a/a/f;->l:I
-
-    iput v1, v2, Lp0/a/a/u;->g:I
-
-    goto :goto_2a
-
-    :cond_3d
-    const/4 v15, 0x7
-
-    :goto_2a
-    add-int/lit8 v0, v0, 0x8
-
-    move v2, v3
-
-    const/4 v1, 0x0
-
-    const/4 v5, 0x0
-
-    goto :goto_27
-
-    :cond_3e
-    invoke-virtual {v14, v8}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 v1, v8, 0x2
-
-    :goto_2b
-    add-int/lit8 v2, v0, -0x1
-
-    if-lez v0, :cond_4f
-
-    iget-object v0, v13, Lp0/a/a/h;->c:[C
-
-    invoke-virtual {v14, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v4, v1, 0x2
-
-    invoke-virtual {v14, v4, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v25
-
-    add-int/lit8 v4, v1, 0x4
-
-    invoke-virtual {v14, v4, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v26
-
-    add-int/lit8 v1, v1, 0x6
-
-    invoke-virtual {v14, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    add-int/lit8 v1, v1, 0x2
-
-    move v9, v3
-
-    const/4 v3, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v12, 0x0
-
-    const/4 v15, 0x0
-
-    const/16 v27, 0x0
-
-    const/16 v28, 0x0
-
-    :goto_2c
-    add-int/lit8 v16, v4, -0x1
-
-    if-lez v4, :cond_48
-
-    invoke-virtual {v14, v1, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v4
-
-    add-int/lit8 v8, v1, 0x2
-
-    invoke-virtual {v14, v8}, Lp0/a/a/d;->l(I)I
-
-    move-result v19
-
-    add-int/lit8 v1, v1, 0x6
-
-    const-string v8, "ConstantValue"
-
-    invoke-virtual {v8, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_40
-
-    invoke-virtual {v14, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    if-nez v4, :cond_3f
-
-    move-object/from16 v8, v38
-
-    const/16 v28, 0x0
-
-    goto :goto_2e
-
-    :cond_3f
-    invoke-virtual {v14, v4, v0}, Lp0/a/a/d;->i(I[C)Ljava/lang/Object;
-
-    move-result-object v4
-
-    move-object/from16 v28, v4
-
-    move-object/from16 v8, v38
-
-    goto :goto_2e
-
-    :cond_40
-    move-object/from16 v8, v38
-
-    invoke-virtual {v8, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v20
-
-    if-eqz v20, :cond_41
-
-    invoke-virtual {v14, v1, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v27
-
-    goto :goto_2e
-
-    :cond_41
-    invoke-virtual {v10, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v20
-
-    if-eqz v20, :cond_42
-
-    or-int v4, v9, v30
-
-    :goto_2d
-    move v9, v4
-
-    goto :goto_2e
-
-    :cond_42
-    invoke-virtual {v11, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v20
-
-    if-eqz v20, :cond_43
-
-    or-int/lit16 v4, v9, 0x1000
-
-    goto :goto_2d
-
-    :goto_2e
-    move/from16 v20, v2
-
-    move/from16 p1, v15
-
-    move-object/from16 v15, v21
-
-    move-object/from16 v2, p2
-
-    goto :goto_30
-
-    :cond_43
-    move/from16 p1, v15
-
-    move-object/from16 v15, v21
-
-    invoke-virtual {v15, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v20
-
-    if-eqz v20, :cond_44
-
-    move-object/from16 v44, p2
-
-    move v3, v1
-
-    move/from16 v20, v2
-
-    move-object/from16 v39, v8
-
-    move-object/from16 v21, v10
-
-    move-object/from16 v43, v13
-
-    move-object v4, v14
-
-    move-object/from16 v45, v15
-
-    move-object/from16 v40, v17
-
-    move-object/from16 v41, v18
-
-    const/4 v2, 0x1
-
-    move/from16 v15, p1
-
-    move-object/from16 v18, v11
-
-    goto/16 :goto_32
-
-    :cond_44
-    move/from16 v20, v2
-
-    move-object/from16 v2, v17
-
-    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v17
-
-    if-eqz v17, :cond_45
-
-    move v4, v1
-
-    move-object/from16 v17, v2
-
-    move-object/from16 v2, v18
-
-    goto :goto_2f
-
-    :cond_45
-    move-object/from16 v17, v2
-
-    move-object/from16 v2, v18
-
-    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v18
-
-    if-eqz v18, :cond_46
-
-    move/from16 v4, p1
-
-    move v7, v1
-
-    :goto_2f
-    move-object/from16 v18, v2
-
-    move-object/from16 v2, p2
-
-    goto :goto_31
-
-    :cond_46
-    move-object/from16 v18, v2
-
-    move-object/from16 v2, p2
-
-    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v21
-
-    if-eqz v21, :cond_47
-
-    move v12, v1
-
-    :goto_30
-    move/from16 v4, p1
-
-    :goto_31
-    move-object/from16 v44, v2
-
-    move-object/from16 v39, v8
-
-    move-object/from16 v21, v10
-
-    move-object/from16 v43, v13
-
-    move-object/from16 v45, v15
-
-    move-object/from16 v40, v17
-
-    move-object/from16 v41, v18
-
-    const/4 v2, 0x1
-
-    move v15, v4
-
-    move-object/from16 v18, v11
-
-    move-object v4, v14
-
-    goto :goto_32
-
-    :cond_47
-    move-object/from16 p2, v2
-
-    iget-object v2, v13, Lp0/a/a/h;->a:[Lp0/a/a/b;
-
-    const/16 v21, -0x1
-
-    const/16 v22, 0x0
-
-    move-object/from16 v39, v8
-
-    move-object v8, v14
-
-    move-object/from16 v40, v17
-
-    move/from16 v17, v9
-
-    move-object v9, v2
-
-    move-object v2, v10
-
-    move-object v10, v4
-
-    move-object v4, v11
-
-    move v11, v1
-
-    move/from16 v42, v12
-
-    move-object/from16 v41, v18
-
-    move/from16 v12, v19
-
-    move-object/from16 v43, v13
-
-    move-object v13, v0
-
-    move-object/from16 v44, p2
-
-    move-object/from16 v18, v4
-
-    move-object v4, v14
-
-    move/from16 v14, v21
-
-    move-object/from16 v21, v2
-
-    move-object/from16 v45, v15
-
-    const/4 v2, 0x1
-
-    move-object/from16 v15, v22
-
-    invoke-virtual/range {v8 .. v15}, Lp0/a/a/d;->e([Lp0/a/a/b;Ljava/lang/String;II[CI[Lp0/a/a/p;)Lp0/a/a/b;
-
-    move-result-object v8
-
-    iput-object v5, v8, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    move/from16 v15, p1
-
-    move-object v5, v8
-
-    move/from16 v9, v17
-
-    move/from16 v12, v42
-
-    :goto_32
-    add-int v1, v1, v19
-
-    move-object v14, v4
-
-    move/from16 v4, v16
-
-    move-object/from16 v11, v18
-
-    move/from16 v2, v20
-
-    move-object/from16 v10, v21
-
-    move-object/from16 v38, v39
-
-    move-object/from16 v17, v40
-
-    move-object/from16 v18, v41
-
-    move-object/from16 v13, v43
-
-    move-object/from16 p2, v44
-
-    move-object/from16 v21, v45
-
-    goto/16 :goto_2c
-
-    :cond_48
-    move-object/from16 v44, p2
-
-    move/from16 v20, v2
-
-    move/from16 v42, v12
-
-    move-object/from16 v43, v13
-
-    move-object v4, v14
-
-    move/from16 p1, v15
-
-    move-object/from16 v40, v17
-
-    move-object/from16 v41, v18
-
-    move-object/from16 v45, v21
-
-    move-object/from16 v39, v38
-
-    const/4 v2, 0x1
-
-    move/from16 v17, v9
-
-    move-object/from16 v21, v10
-
-    move-object/from16 v18, v11
-
-    new-instance v8, Lp0/a/a/l;
-
-    iget-object v9, v6, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v22, v8
-
-    move-object/from16 v23, v9
-
-    move/from16 v24, v17
-
-    invoke-direct/range {v22 .. v28}, Lp0/a/a/l;-><init>(Lp0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
-
-    iget-object v9, v6, Lp0/a/a/f;->h:Lp0/a/a/l;
-
-    if-nez v9, :cond_49
-
-    iput-object v8, v6, Lp0/a/a/f;->h:Lp0/a/a/l;
-
-    goto :goto_33
-
-    :cond_49
-    iget-object v9, v6, Lp0/a/a/f;->i:Lp0/a/a/l;
-
-    iput-object v8, v9, Lp0/a/a/k;->a:Lp0/a/a/k;
-
-    :goto_33
-    iput-object v8, v6, Lp0/a/a/f;->i:Lp0/a/a/l;
-
-    if-eqz v3, :cond_4a
-
-    invoke-virtual {v4, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v9
-
-    add-int/lit8 v3, v3, 0x2
-
-    :goto_34
-    add-int/lit8 v10, v9, -0x1
-
-    if-lez v9, :cond_4a
-
-    invoke-virtual {v4, v3, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v9
-
-    add-int/lit8 v3, v3, 0x2
-
-    invoke-virtual {v8, v9, v2}, Lp0/a/a/k;->a(Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v9
-
-    invoke-virtual {v4, v9, v3, v2, v0}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v3
-
-    move v9, v10
-
-    goto :goto_34
-
-    :cond_4a
-    if-eqz v7, :cond_4b
-
-    invoke-virtual {v4, v7}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v7, v7, 0x2
-
-    :goto_35
-    add-int/lit8 v9, v3, -0x1
-
-    if-lez v3, :cond_4b
-
-    invoke-virtual {v4, v7, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    add-int/lit8 v7, v7, 0x2
-
-    const/4 v15, 0x0
-
-    invoke-virtual {v8, v3, v15}, Lp0/a/a/k;->a(Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v3
-
-    invoke-virtual {v4, v3, v7, v2, v0}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v7
-
-    move v3, v9
-
-    goto :goto_35
-
-    :cond_4b
-    const/4 v15, 0x0
-
-    if-eqz p1, :cond_4c
-
-    move/from16 v3, p1
-
-    invoke-virtual {v4, v3}, Lp0/a/a/d;->u(I)I
-
-    move-result v7
-
-    add-int/lit8 v3, v3, 0x2
-
-    :goto_36
-    add-int/lit8 v9, v7, -0x1
-
-    if-lez v7, :cond_4c
-
-    move-object/from16 v7, v43
-
-    invoke-virtual {v4, v7, v3}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v3
-
-    invoke-virtual {v4, v3, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v10
-
-    add-int/lit8 v3, v3, 0x2
-
-    iget v11, v7, Lp0/a/a/h;->h:I
-
-    iget-object v12, v7, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    invoke-virtual {v8, v11, v12, v10, v2}, Lp0/a/a/k;->b(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v10
-
-    invoke-virtual {v4, v10, v3, v2, v0}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v3
-
-    move v7, v9
-
-    goto :goto_36
-
-    :cond_4c
-    move-object/from16 v7, v43
-
-    move/from16 v12, v42
-
-    if-eqz v12, :cond_4d
-
-    invoke-virtual {v4, v12}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    add-int/lit8 v12, v12, 0x2
-
-    :goto_37
-    add-int/lit8 v9, v3, -0x1
-
-    if-lez v3, :cond_4d
-
-    invoke-virtual {v4, v7, v12}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v3
-
-    invoke-virtual {v4, v3, v0}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v10
-
-    add-int/lit8 v3, v3, 0x2
-
-    iget v11, v7, Lp0/a/a/h;->h:I
-
-    iget-object v12, v7, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    invoke-virtual {v8, v11, v12, v10, v15}, Lp0/a/a/k;->b(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v10
-
-    invoke-virtual {v4, v10, v3, v2, v0}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v12
-
-    move v3, v9
-
-    goto :goto_37
-
-    :cond_4d
-    :goto_38
-    if-eqz v5, :cond_4e
-
-    iget-object v0, v5, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    const/4 v3, 0x0
-
-    iput-object v3, v5, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iget-object v9, v8, Lp0/a/a/l;->l:Lp0/a/a/b;
-
-    iput-object v9, v5, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iput-object v5, v8, Lp0/a/a/l;->l:Lp0/a/a/b;
-
-    move-object v5, v0
-
-    goto :goto_38
-
-    :cond_4e
-    move-object v14, v4
-
-    move-object v13, v7
-
-    move-object/from16 v11, v18
-
-    move/from16 v0, v20
-
-    move-object/from16 v10, v21
-
-    move-object/from16 v38, v39
-
-    move-object/from16 v17, v40
-
-    move-object/from16 v18, v41
-
-    move-object/from16 p2, v44
-
-    move-object/from16 v21, v45
-
-    goto/16 :goto_2b
-
-    :cond_4f
-    move-object/from16 v44, p2
-
-    move-object v7, v13
-
-    move-object v4, v14
-
-    move-object/from16 v40, v17
-
-    move-object/from16 v41, v18
-
-    move-object/from16 v45, v21
-
-    move-object/from16 v39, v38
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    const/4 v15, 0x0
-
-    move-object/from16 v21, v10
-
-    move-object/from16 v18, v11
-
-    invoke-virtual {v4, v1}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    add-int/lit8 v1, v1, 0x2
-
-    move v5, v1
-
-    :goto_39
-    add-int/lit8 v16, v0, -0x1
-
-    if-lez v0, :cond_77
-
-    iget-object v1, v7, Lp0/a/a/h;->c:[C
-
-    invoke-virtual {v4, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v0
-
-    iput v0, v7, Lp0/a/a/h;->d:I
-
-    add-int/lit8 v0, v5, 0x2
-
-    invoke-virtual {v4, v0, v1}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v0
-
-    iput-object v0, v7, Lp0/a/a/h;->e:Ljava/lang/String;
-
-    add-int/lit8 v0, v5, 0x4
-
-    invoke-virtual {v4, v0, v1}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v8
-
-    iput-object v8, v7, Lp0/a/a/h;->f:Ljava/lang/String;
-
-    add-int/lit8 v14, v5, 0x6
-
-    invoke-virtual {v4, v14}, Lp0/a/a/d;->u(I)I
-
-    move-result v8
-
-    add-int/lit8 v9, v14, 0x2
-
-    move-object v13, v3
-
-    move-object/from16 v17, v13
-
-    move/from16 v19, v8
-
-    const/4 v8, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/16 v46, 0x0
-
-    const/16 v47, 0x0
-
-    const/16 v48, 0x0
-
-    const/16 v49, 0x0
-
-    const/16 v50, 0x0
-
-    const/16 v51, 0x0
-
-    const/16 v52, 0x0
-
-    const/16 v53, 0x0
-
-    :goto_3a
-    add-int/lit8 v20, v19, -0x1
-
-    if-lez v19, :cond_5f
-
-    invoke-virtual {v4, v9, v1}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    add-int/lit8 v15, v9, 0x2
-
-    invoke-virtual {v4, v15}, Lp0/a/a/d;->l(I)I
-
-    move-result v19
-
-    add-int/lit8 v15, v9, 0x6
-
-    const-string v9, "Code"
-
-    invoke-virtual {v9, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_51
-
-    iget v3, v7, Lp0/a/a/h;->b:I
-
-    and-int/2addr v3, v2
-
-    if-nez v3, :cond_50
-
-    move/from16 p1, v14
-
-    move/from16 v53, v15
-
-    :goto_3b
-    move-object/from16 v9, v21
-
-    move-object/from16 v2, v39
-
-    :goto_3c
-    move-object/from16 v14, v45
-
-    goto :goto_40
-
-    :cond_50
-    move-object/from16 v2, v39
-
-    goto :goto_3e
-
-    :cond_51
-    const-string v9, "Exceptions"
-
-    invoke-virtual {v9, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_53
-
-    invoke-virtual {v4, v15}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    new-array v9, v3, [Ljava/lang/String;
-
-    add-int/lit8 v11, v15, 0x2
-
-    move v2, v11
-
-    const/4 v11, 0x0
-
-    :goto_3d
-    if-ge v11, v3, :cond_52
-
-    invoke-virtual {v4, v2, v1}, Lp0/a/a/d;->g(I[C)Ljava/lang/String;
-
-    move-result-object v17
-
-    aput-object v17, v9, v11
-
-    add-int/lit8 v2, v2, 0x2
-
-    add-int/lit8 v11, v11, 0x1
-
-    goto :goto_3d
-
-    :cond_52
-    move-object/from16 v17, v9
-
-    move/from16 p1, v14
-
-    move v11, v15
-
-    goto :goto_3b
-
-    :cond_53
-    move-object/from16 v2, v39
-
-    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_54
-
-    invoke-virtual {v4, v15}, Lp0/a/a/d;->u(I)I
-
-    move-result v47
-
-    :goto_3e
-    move-object/from16 v9, v21
-
-    goto :goto_3f
-
-    :cond_54
-    move-object/from16 v9, v21
-
-    invoke-virtual {v9, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v21
-
-    if-eqz v21, :cond_55
-
-    iget v3, v7, Lp0/a/a/h;->d:I
-
-    or-int v3, v3, v30
-
-    iput v3, v7, Lp0/a/a/h;->d:I
-
-    :goto_3f
-    move/from16 p1, v14
-
-    goto :goto_3c
-
-    :cond_55
-    move/from16 p1, v14
-
-    move-object/from16 v14, v45
-
-    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v21
-
-    if-eqz v21, :cond_56
-
-    move/from16 v46, v15
-
-    :goto_40
-    move/from16 p2, v0
-
-    move-object/from16 v21, v14
-
-    :goto_41
-    move-object/from16 v14, v44
-
-    goto/16 :goto_44
-
-    :cond_56
-    move-object/from16 v21, v14
-
-    move-object/from16 v14, v40
-
-    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v22
-
-    if-eqz v22, :cond_57
-
-    move/from16 p2, v0
-
-    move/from16 v49, v15
-
-    goto :goto_42
-
-    :cond_57
-    move/from16 p2, v0
-
-    const-string v0, "AnnotationDefault"
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_58
-
-    move v10, v15
-
-    :goto_42
-    move-object/from16 v40, v14
-
-    move-object/from16 v0, v18
-
-    move-object/from16 v14, v41
-
-    goto :goto_43
-
-    :cond_58
-    move-object/from16 v0, v18
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v18
-
-    if-eqz v18, :cond_59
-
-    iget v3, v7, Lp0/a/a/h;->d:I
-
-    or-int/lit16 v3, v3, 0x1000
-
-    iput v3, v7, Lp0/a/a/h;->d:I
-
-    move/from16 v6, p1
-
-    move-object/from16 v18, v0
-
-    move-object/from16 v24, v9
-
-    move-object/from16 v26, v14
-
-    move/from16 v22, v15
-
-    move-object/from16 v27, v21
-
-    move-object/from16 v25, v41
-
-    move-object/from16 v21, v44
-
-    const/4 v12, 0x1
-
-    goto/16 :goto_45
-
-    :cond_59
-    move-object/from16 v40, v14
-
-    move-object/from16 v14, v41
-
-    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v18
-
-    if-eqz v18, :cond_5a
-
-    move/from16 v48, v15
-
-    :goto_43
-    move-object/from16 v18, v0
-
-    move-object/from16 v41, v14
-
-    goto :goto_41
-
-    :cond_5a
-    move-object/from16 v41, v14
-
-    move-object/from16 v14, v44
-
-    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v18
-
-    if-eqz v18, :cond_5b
-
-    move-object/from16 v18, v0
-
-    move/from16 v50, v15
-
-    goto :goto_44
-
-    :cond_5b
-    move-object/from16 v18, v0
-
-    const-string v0, "RuntimeVisibleParameterAnnotations"
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5c
-
-    move/from16 v51, v15
-
-    goto :goto_44
-
-    :cond_5c
-    const-string v0, "RuntimeInvisibleParameterAnnotations"
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5d
-
-    move/from16 v52, v15
-
-    goto :goto_44
-
-    :cond_5d
-    const-string v0, "MethodParameters"
-
-    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5e
-
-    move v8, v15
-
-    :goto_44
-    move/from16 v6, p1
-
-    move-object/from16 v24, v9
-
-    move/from16 v22, v15
-
-    move-object/from16 v27, v21
-
-    move-object/from16 v26, v40
-
-    move-object/from16 v25, v41
-
-    move-object/from16 v21, v14
-
-    goto :goto_45
-
-    :cond_5e
-    iget-object v0, v7, Lp0/a/a/h;->a:[Lp0/a/a/b;
-
-    const/16 v22, -0x1
-
-    const/16 v23, 0x0
-
-    move/from16 v54, v8
-
-    move-object v8, v4
-
-    move-object/from16 v24, v9
-
-    move-object v9, v0
-
-    move v0, v10
-
-    move-object v10, v3
-
-    move v3, v11
-
-    move v11, v15
-
-    move/from16 v55, v12
-
-    move/from16 v12, v19
-
-    move-object/from16 v56, v13
-
-    move-object v13, v1
-
-    move/from16 v6, p1
-
-    move-object/from16 v27, v21
-
-    move-object/from16 v26, v40
-
-    move-object/from16 v25, v41
-
-    move-object/from16 v21, v14
-
-    move/from16 v14, v22
-
-    move/from16 v22, v15
-
-    move-object/from16 v15, v23
-
-    invoke-virtual/range {v8 .. v15}, Lp0/a/a/d;->e([Lp0/a/a/b;Ljava/lang/String;II[CI[Lp0/a/a/p;)Lp0/a/a/b;
-
-    move-result-object v8
-
-    move-object/from16 v10, v56
-
-    iput-object v10, v8, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    move v10, v0
-
-    move v11, v3
-
-    move-object v13, v8
-
-    move/from16 v8, v54
-
-    move/from16 v12, v55
-
-    :goto_45
-    add-int v9, v22, v19
-
-    move/from16 v0, p2
-
-    move-object/from16 v39, v2
-
-    move v14, v6
-
-    move/from16 v19, v20
-
-    move-object/from16 v44, v21
-
-    move-object/from16 v21, v24
-
-    move-object/from16 v41, v25
-
-    move-object/from16 v40, v26
-
-    move-object/from16 v45, v27
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    const/4 v15, 0x0
-
-    move-object/from16 v6, p0
-
-    goto/16 :goto_3a
-
-    :cond_5f
-    move/from16 p2, v0
-
-    move/from16 v54, v8
-
-    move v0, v10
-
-    move v3, v11
-
-    move/from16 v55, v12
-
-    move-object v10, v13
-
-    move v6, v14
-
-    move-object/from16 v24, v21
-
-    move-object/from16 v2, v39
-
-    move-object/from16 v26, v40
-
-    move-object/from16 v25, v41
-
-    move-object/from16 v21, v44
-
-    move-object/from16 v27, v45
-
-    iget v8, v7, Lp0/a/a/h;->d:I
-
-    iget-object v11, v7, Lp0/a/a/h;->e:Ljava/lang/String;
-
-    iget-object v12, v7, Lp0/a/a/h;->f:Ljava/lang/String;
-
-    move/from16 v15, v47
-
-    if-nez v15, :cond_60
-
-    move v14, v0
-
-    move-object/from16 v56, v10
-
-    const/4 v13, 0x0
-
-    goto :goto_46
-
-    :cond_60
-    invoke-virtual {v4, v15, v1}, Lp0/a/a/d;->w(I[C)Ljava/lang/String;
-
-    move-result-object v13
-
-    move v14, v0
-
-    move-object/from16 v56, v10
-
-    :goto_46
-    move/from16 v10, p2
-
-    move-object/from16 v0, p0
-
-    move/from16 p1, v14
-
-    move-object v14, v1
-
-    move v1, v8
-
-    move-object/from16 v19, v2
-
-    const/4 v8, 0x1
-
-    move-object v2, v11
-
-    move v11, v3
-
-    move-object v3, v12
-
-    move-object v12, v4
-
-    move-object/from16 v20, v27
-
-    move-object v4, v13
-
-    move v13, v5
-
-    move-object/from16 v5, v17
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/e;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lp0/a/a/q;
-
-    move-result-object v0
-
-    move-object v1, v0
-
-    check-cast v1, Lp0/a/a/r;
-
-    sub-int v2, v9, v13
-
-    iget v3, v7, Lp0/a/a/h;->d:I
-
-    and-int v3, v3, v30
-
-    if-eqz v3, :cond_61
-
-    const/4 v3, 0x1
-
-    goto :goto_47
-
-    :cond_61
-    const/4 v3, 0x0
-
-    :goto_47
-    invoke-virtual {v12, v10}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    iget-object v5, v1, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v5, v5, Lp0/a/a/v;->b:Lp0/a/a/d;
-
-    if-ne v12, v5, :cond_69
-
-    iget v5, v1, Lp0/a/a/r;->g:I
-
-    if-ne v4, v5, :cond_69
-
-    iget v4, v1, Lp0/a/a/r;->A:I
-
-    if-ne v15, v4, :cond_69
-
-    iget v4, v1, Lp0/a/a/r;->d:I
-
-    and-int v4, v4, v30
-
-    if-eqz v4, :cond_62
-
-    const/4 v4, 0x1
-
-    goto :goto_48
-
-    :cond_62
-    const/4 v4, 0x0
-
-    :goto_48
-    if-eq v3, v4, :cond_63
-
-    goto :goto_4b
-
-    :cond_63
-    iget-object v3, v1, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v3, v3, Lp0/a/a/v;->c:I
-
-    const/16 v4, 0x31
-
-    if-ge v3, v4, :cond_64
-
-    iget v3, v1, Lp0/a/a/r;->d:I
-
-    and-int/lit16 v3, v3, 0x1000
-
-    if-eqz v3, :cond_64
-
-    move/from16 v15, v55
-
-    const/4 v3, 0x1
-
-    goto :goto_49
-
-    :cond_64
-    move/from16 v15, v55
-
-    const/4 v3, 0x0
-
-    :goto_49
-    if-eq v15, v3, :cond_65
-
-    goto :goto_4b
-
-    :cond_65
-    if-nez v11, :cond_66
-
-    iget v3, v1, Lp0/a/a/r;->y:I
-
-    if-eqz v3, :cond_68
-
-    goto :goto_4b
-
-    :cond_66
-    invoke-virtual {v12, v11}, Lp0/a/a/d;->u(I)I
-
-    move-result v3
-
-    iget v4, v1, Lp0/a/a/r;->y:I
-
-    if-ne v3, v4, :cond_68
-
-    add-int/lit8 v11, v11, 0x2
-
-    const/4 v3, 0x0
-
-    :goto_4a
-    iget v4, v1, Lp0/a/a/r;->y:I
-
-    if-ge v3, v4, :cond_68
-
-    invoke-virtual {v12, v11}, Lp0/a/a/d;->u(I)I
-
-    move-result v4
-
-    iget-object v5, v1, Lp0/a/a/r;->z:[I
-
-    aget v5, v5, v3
-
-    if-eq v4, v5, :cond_67
-
-    goto :goto_4b
-
-    :cond_67
-    add-int/lit8 v11, v11, 0x2
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_4a
-
-    :cond_68
-    iput v6, v1, Lp0/a/a/r;->a0:I
-
-    add-int/lit8 v2, v2, -0x6
-
-    iput v2, v1, Lp0/a/a/r;->b0:I
-
-    const/4 v6, 0x1
-
-    goto :goto_4c
-
-    :cond_69
-    :goto_4b
-    const/4 v6, 0x0
-
-    :goto_4c
-    if-eqz v6, :cond_6a
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    goto/16 :goto_55
-
-    :cond_6a
-    move/from16 v15, v54
-
-    if-eqz v15, :cond_6d
-
-    invoke-virtual {v12, v15}, Lp0/a/a/d;->f(I)I
-
-    move-result v2
-
-    add-int/lit8 v3, v15, 0x1
-
-    :goto_4d
-    add-int/lit8 v4, v2, -0x1
-
-    if-lez v2, :cond_6d
-
-    invoke-virtual {v12, v3, v14}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v5, v3, 0x2
-
-    invoke-virtual {v12, v5}, Lp0/a/a/d;->u(I)I
-
-    move-result v5
-
-    iget-object v6, v1, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    if-nez v6, :cond_6b
-
-    new-instance v6, Lp0/a/a/c;
-
-    invoke-direct {v6}, Lp0/a/a/c;-><init>()V
-
-    iput-object v6, v1, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    :cond_6b
-    iget v6, v1, Lp0/a/a/r;->K:I
-
-    add-int/2addr v6, v8
-
-    iput v6, v1, Lp0/a/a/r;->K:I
-
-    iget-object v6, v1, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    if-nez v2, :cond_6c
-
-    const/4 v2, 0x0
-
-    goto :goto_4e
-
-    :cond_6c
-    iget-object v10, v1, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v10, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    :goto_4e
-    invoke-virtual {v6, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v6, v5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v3, v3, 0x4
-
-    move v2, v4
-
-    goto :goto_4d
-
-    :cond_6d
-    if-eqz p1, :cond_6e
-
-    new-instance v2, Lp0/a/a/c;
-
-    invoke-direct {v2}, Lp0/a/a/c;-><init>()V
-
-    iput-object v2, v1, Lp0/a/a/r;->J:Lp0/a/a/c;
-
-    new-instance v3, Lp0/a/a/a;
-
-    iget-object v4, v1, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    invoke-direct {v3, v4, v6, v2, v5}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    move/from16 v15, p1
-
-    invoke-virtual {v12, v3, v15, v5, v14}, Lp0/a/a/d;->j(Lp0/a/a/a;ILjava/lang/String;[C)I
-
-    invoke-virtual {v3}, Lp0/a/a/a;->g()V
-
-    goto :goto_4f
-
-    :cond_6e
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    :goto_4f
-    move/from16 v15, v46
-
-    if-eqz v15, :cond_6f
-
-    invoke-virtual {v12, v15}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v46, v15, 0x2
-
-    move/from16 v3, v46
-
-    :goto_50
-    add-int/lit8 v4, v2, -0x1
-
-    if-lez v2, :cond_6f
-
-    invoke-virtual {v12, v3, v14}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v3, v3, 0x2
-
-    invoke-virtual {v0, v2, v8}, Lp0/a/a/q;->a(Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v2
-
-    invoke-virtual {v12, v2, v3, v8, v14}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v3
-
-    move v2, v4
-
-    goto :goto_50
-
-    :cond_6f
-    move/from16 v15, v48
-
-    if-eqz v15, :cond_70
-
-    invoke-virtual {v12, v15}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v48, v15, 0x2
-
-    move/from16 v3, v48
-
-    :goto_51
-    add-int/lit8 v4, v2, -0x1
-
-    if-lez v2, :cond_70
-
-    invoke-virtual {v12, v3, v14}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v2
-
-    add-int/lit8 v3, v3, 0x2
-
-    invoke-virtual {v0, v2, v6}, Lp0/a/a/q;->a(Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v2
-
-    invoke-virtual {v12, v2, v3, v8, v14}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v3
-
-    move v2, v4
-
-    goto :goto_51
-
-    :cond_70
-    move/from16 v15, v49
-
-    if-eqz v15, :cond_71
-
-    invoke-virtual {v12, v15}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v49, v15, 0x2
-
-    move/from16 v3, v49
-
-    :goto_52
-    add-int/lit8 v4, v2, -0x1
-
-    if-lez v2, :cond_71
-
-    invoke-virtual {v12, v7, v3}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v2
-
-    invoke-virtual {v12, v2, v14}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    add-int/lit8 v2, v2, 0x2
-
-    iget v10, v7, Lp0/a/a/h;->h:I
-
-    iget-object v11, v7, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    invoke-virtual {v0, v10, v11, v3, v8}, Lp0/a/a/q;->r(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v3
-
-    invoke-virtual {v12, v3, v2, v8, v14}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v3
-
-    move v2, v4
-
-    goto :goto_52
-
-    :cond_71
-    move/from16 v15, v50
-
-    if-eqz v15, :cond_72
-
-    invoke-virtual {v12, v15}, Lp0/a/a/d;->u(I)I
-
-    move-result v2
-
-    add-int/lit8 v50, v15, 0x2
-
-    move/from16 v3, v50
-
-    :goto_53
-    add-int/lit8 v4, v2, -0x1
-
-    if-lez v2, :cond_72
-
-    invoke-virtual {v12, v7, v3}, Lp0/a/a/d;->r(Lp0/a/a/h;I)I
-
-    move-result v2
-
-    invoke-virtual {v12, v2, v14}, Lp0/a/a/d;->t(I[C)Ljava/lang/String;
-
-    move-result-object v3
-
-    add-int/lit8 v2, v2, 0x2
-
-    iget v10, v7, Lp0/a/a/h;->h:I
-
-    iget-object v11, v7, Lp0/a/a/h;->i:Lp0/a/a/x;
-
-    invoke-virtual {v0, v10, v11, v3, v6}, Lp0/a/a/q;->r(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-
-    move-result-object v3
-
-    invoke-virtual {v12, v3, v2, v8, v14}, Lp0/a/a/d;->k(Lp0/a/a/a;IZ[C)I
-
-    move-result v3
-
-    move v2, v4
-
-    goto :goto_53
-
-    :cond_72
-    move/from16 v15, v51
-
-    if-eqz v15, :cond_73
-
-    invoke-virtual {v12, v0, v7, v15, v8}, Lp0/a/a/d;->p(Lp0/a/a/q;Lp0/a/a/h;IZ)V
-
-    :cond_73
-    move/from16 v15, v52
-
-    if-eqz v15, :cond_74
-
-    invoke-virtual {v12, v0, v7, v15, v6}, Lp0/a/a/d;->p(Lp0/a/a/q;Lp0/a/a/h;IZ)V
-
-    :cond_74
-    move-object/from16 v13, v56
-
-    :goto_54
-    if-eqz v13, :cond_75
-
-    iget-object v2, v13, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iput-object v5, v13, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iget-object v3, v1, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    iput-object v3, v13, Lp0/a/a/b;->c:Lp0/a/a/b;
-
-    iput-object v13, v1, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    move-object v13, v2
-
-    goto :goto_54
-
-    :cond_75
-    move/from16 v15, v53
-
-    if-eqz v15, :cond_76
-
-    invoke-virtual {v12, v0, v7, v15}, Lp0/a/a/d;->h(Lp0/a/a/q;Lp0/a/a/h;I)V
-
-    :cond_76
-    :goto_55
-    move-object/from16 v6, p0
-
-    move-object v3, v5
-
-    move v5, v9
-
-    move-object v4, v12
-
-    move/from16 v0, v16
-
-    move-object/from16 v39, v19
-
-    move-object/from16 v45, v20
-
-    move-object/from16 v44, v21
-
-    move-object/from16 v21, v24
-
-    move-object/from16 v41, v25
-
-    move-object/from16 v40, v26
-
-    const/4 v2, 0x1
-
-    const/4 v15, 0x0
-
-    goto/16 :goto_39
-
-    :cond_77
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/f;->f()[B
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public f()[B
-    .locals 28
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lorg/objectweb/asm/ClassTooLargeException;,
-            Lorg/objectweb/asm/MethodTooLargeException;
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    iget v1, v0, Lp0/a/a/f;->f:I
-
-    mul-int/lit8 v1, v1, 0x2
-
-    add-int/lit8 v1, v1, 0x18
-
-    iget-object v2, v0, Lp0/a/a/f;->h:Lp0/a/a/l;
-
-    const/4 v3, 0x0
-
-    :goto_0
-    const-string v4, "ConstantValue"
-
-    const-string v5, "RuntimeInvisibleTypeAnnotations"
-
-    const-string v6, "RuntimeVisibleTypeAnnotations"
-
-    const-string v7, "RuntimeInvisibleAnnotations"
-
-    const-string v8, "RuntimeVisibleAnnotations"
-
-    const-string v9, "Deprecated"
-
-    const-string v10, "Synthetic"
-
-    const-string v11, "Signature"
-
-    const/16 v12, 0x10
-
-    const/16 v13, 0x31
-
-    const/high16 v14, 0x20000
-
-    if-eqz v2, :cond_9
-
-    add-int/lit8 v3, v3, 0x1
-
-    iget v15, v2, Lp0/a/a/l;->g:I
-
-    if-eqz v15, :cond_0
-
-    iget-object v15, v2, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v15, v4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    goto :goto_1
-
-    :cond_0
-    const/16 v12, 0x8
-
-    :goto_1
-    iget v4, v2, Lp0/a/a/l;->c:I
-
-    and-int/lit16 v4, v4, 0x1000
-
-    if-eqz v4, :cond_1
-
-    iget-object v4, v2, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    iget v15, v4, Lp0/a/a/v;->c:I
-
-    if-ge v15, v13, :cond_1
-
-    invoke-virtual {v4, v10}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    add-int/lit8 v12, v12, 0x6
-
-    :cond_1
-    iget v4, v2, Lp0/a/a/l;->f:I
-
-    if-eqz v4, :cond_2
-
-    iget-object v4, v2, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v11}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    add-int/lit8 v12, v12, 0x8
-
-    :cond_2
-    iget v4, v2, Lp0/a/a/l;->c:I
-
-    and-int/2addr v4, v14
-
-    if-eqz v4, :cond_3
-
-    iget-object v4, v2, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v9}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    add-int/lit8 v12, v12, 0x6
-
-    :cond_3
-    iget-object v4, v2, Lp0/a/a/l;->h:Lp0/a/a/a;
-
-    if-eqz v4, :cond_4
-
-    invoke-virtual {v4, v8}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v12, v4
-
-    :cond_4
-    iget-object v4, v2, Lp0/a/a/l;->i:Lp0/a/a/a;
-
-    if-eqz v4, :cond_5
-
-    invoke-virtual {v4, v7}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v12, v4
-
-    :cond_5
-    iget-object v4, v2, Lp0/a/a/l;->j:Lp0/a/a/a;
-
-    if-eqz v4, :cond_6
-
-    invoke-virtual {v4, v6}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v12, v4
-
-    :cond_6
-    iget-object v4, v2, Lp0/a/a/l;->k:Lp0/a/a/a;
-
-    if-eqz v4, :cond_7
-
-    invoke-virtual {v4, v5}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v12, v4
-
-    :cond_7
-    iget-object v4, v2, Lp0/a/a/l;->l:Lp0/a/a/b;
-
-    if-eqz v4, :cond_8
-
-    iget-object v5, v2, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v5}, Lp0/a/a/b;->a(Lp0/a/a/v;)I
-
-    move-result v4
-
-    add-int/2addr v12, v4
-
-    :cond_8
-    add-int/2addr v1, v12
-
-    iget-object v2, v2, Lp0/a/a/k;->a:Lp0/a/a/k;
-
-    check-cast v2, Lp0/a/a/l;
-
-    goto/16 :goto_0
-
-    :cond_9
-    iget-object v2, v0, Lp0/a/a/f;->j:Lp0/a/a/r;
-
-    const/4 v13, 0x0
-
-    :goto_2
-    const v15, 0xffff
-
-    const/16 v16, 0x1
-
-    if-eqz v2, :cond_27
-
-    add-int/lit8 v13, v13, 0x1
-
-    iget v14, v2, Lp0/a/a/r;->a0:I
-
-    if-eqz v14, :cond_a
-
-    iget v12, v2, Lp0/a/a/r;->b0:I
-
-    add-int/lit8 v12, v12, 0x6
-
-    move/from16 v26, v3
-
-    move-object/from16 v25, v4
-
-    move/from16 v24, v13
-
-    goto/16 :goto_9
-
-    :cond_a
-    iget-object v14, v2, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v14, v14, Lp0/a/a/c;->b:I
-
-    if-lez v14, :cond_16
-
-    if-gt v14, v15, :cond_15
-
-    iget-object v14, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v15, "Code"
-
-    invoke-virtual {v14, v15}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v14, v2, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v14, v14, Lp0/a/a/c;->b:I
-
-    add-int/2addr v14, v12
-
-    iget-object v12, v2, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    const/4 v15, 0x0
-
-    :goto_3
-    if-eqz v12, :cond_b
-
-    add-int/lit8 v15, v15, 0x1
-
-    iget-object v12, v12, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    goto :goto_3
-
-    :cond_b
-    mul-int/lit8 v15, v15, 0x8
-
-    add-int/lit8 v15, v15, 0x2
-
-    add-int/2addr v15, v14
-
-    add-int/lit8 v15, v15, 0x8
-
-    iget-object v12, v2, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    if-eqz v12, :cond_e
-
-    iget-object v12, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v12, v12, Lp0/a/a/v;->c:I
-
-    const/16 v14, 0x32
-
-    if-lt v12, v14, :cond_c
-
-    const/4 v12, 0x1
-
-    goto :goto_4
-
-    :cond_c
-    const/4 v12, 0x0
-
-    :goto_4
-    iget-object v14, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    if-eqz v12, :cond_d
-
-    const-string v12, "StackMapTable"
-
-    goto :goto_5
-
-    :cond_d
-    const-string v12, "StackMap"
-
-    :goto_5
-    invoke-virtual {v14, v12}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v12, v2, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    iget v12, v12, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v12, v12, 0x8
-
-    add-int/2addr v15, v12
-
-    :cond_e
-    iget-object v12, v2, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    if-eqz v12, :cond_f
-
-    iget-object v12, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v14, "LineNumberTable"
-
-    invoke-virtual {v12, v14}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v12, v2, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    iget v12, v12, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v12, v12, 0x8
-
-    add-int/2addr v15, v12
-
-    :cond_f
-    iget-object v12, v2, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    if-eqz v12, :cond_10
-
-    iget-object v12, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v14, "LocalVariableTable"
-
-    invoke-virtual {v12, v14}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v12, v2, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    iget v12, v12, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v12, v12, 0x8
-
-    add-int/2addr v15, v12
-
-    :cond_10
-    iget-object v12, v2, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    if-eqz v12, :cond_11
-
-    iget-object v12, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v14, "LocalVariableTypeTable"
-
-    invoke-virtual {v12, v14}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v12, v2, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    iget v12, v12, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v12, v12, 0x8
-
-    add-int/2addr v15, v12
-
-    :cond_11
-    iget-object v12, v2, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    if-eqz v12, :cond_12
-
-    invoke-virtual {v12, v6}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v12
-
-    add-int/2addr v15, v12
-
-    :cond_12
-    iget-object v12, v2, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    if-eqz v12, :cond_13
-
-    invoke-virtual {v12, v5}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v12
-
-    add-int/2addr v15, v12
-
-    :cond_13
-    iget-object v12, v2, Lp0/a/a/r;->x:Lp0/a/a/b;
-
-    if-eqz v12, :cond_14
-
-    iget-object v14, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    move/from16 v24, v13
-
-    iget-object v13, v2, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    move-object/from16 v25, v4
-
-    iget-object v4, v13, Lp0/a/a/c;->a:[B
-
-    iget v13, v13, Lp0/a/a/c;->b:I
-
-    move/from16 v26, v3
-
-    iget v3, v2, Lp0/a/a/r;->i:I
-
-    iget v0, v2, Lp0/a/a/r;->j:I
-
-    move-object/from16 v18, v12
-
-    move-object/from16 v19, v14
-
-    move-object/from16 v20, v4
-
-    move/from16 v21, v13
-
-    move/from16 v22, v3
-
-    move/from16 v23, v0
-
-    invoke-virtual/range {v18 .. v23}, Lp0/a/a/b;->b(Lp0/a/a/v;[BIII)I
-
-    move-result v0
-
-    add-int/2addr v15, v0
-
-    goto :goto_6
-
-    :cond_14
-    move/from16 v26, v3
-
-    move-object/from16 v25, v4
-
-    move/from16 v24, v13
-
-    goto :goto_6
-
-    :cond_15
-    new-instance v0, Lorg/objectweb/asm/MethodTooLargeException;
-
-    iget-object v1, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v1, v1, Lp0/a/a/v;->d:Ljava/lang/String;
-
-    iget-object v3, v2, Lp0/a/a/r;->f:Ljava/lang/String;
-
-    iget-object v4, v2, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    iget-object v2, v2, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-direct {v0, v1, v3, v4, v2}, Lorg/objectweb/asm/MethodTooLargeException;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
-
-    throw v0
-
-    :cond_16
-    move/from16 v26, v3
-
-    move-object/from16 v25, v4
-
-    move/from16 v24, v13
-
-    const/16 v15, 0x8
-
-    :goto_6
-    iget v0, v2, Lp0/a/a/r;->y:I
-
-    if-lez v0, :cond_17
-
-    iget-object v0, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v3, "Exceptions"
-
-    invoke-virtual {v0, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget v0, v2, Lp0/a/a/r;->y:I
-
-    mul-int/lit8 v0, v0, 0x2
-
-    add-int/lit8 v0, v0, 0x8
-
-    add-int/2addr v15, v0
-
-    :cond_17
-    iget-object v0, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v0, v0, Lp0/a/a/v;->c:I
-
-    const/16 v3, 0x31
-
-    if-ge v0, v3, :cond_18
-
-    goto :goto_7
-
-    :cond_18
-    const/16 v16, 0x0
-
-    :goto_7
-    iget v0, v2, Lp0/a/a/r;->d:I
-
-    and-int/lit16 v0, v0, 0x1000
-
-    if-eqz v0, :cond_19
-
-    if-eqz v16, :cond_19
-
-    iget-object v0, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, v10}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    add-int/lit8 v15, v15, 0x6
-
-    :cond_19
-    iget v0, v2, Lp0/a/a/r;->A:I
-
-    if-eqz v0, :cond_1a
-
-    iget-object v0, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, v11}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    add-int/lit8 v15, v15, 0x8
-
-    :cond_1a
-    iget v0, v2, Lp0/a/a/r;->d:I
-
-    const/high16 v3, 0x20000
-
-    and-int/2addr v0, v3
-
-    if-eqz v0, :cond_1b
-
-    iget-object v0, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, v9}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    add-int/lit8 v15, v15, 0x6
-
-    :cond_1b
-    iget-object v0, v2, Lp0/a/a/r;->B:Lp0/a/a/a;
-
-    if-eqz v0, :cond_1c
-
-    invoke-virtual {v0, v8}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v0
-
-    add-int/2addr v15, v0
-
-    :cond_1c
-    iget-object v0, v2, Lp0/a/a/r;->C:Lp0/a/a/a;
-
-    if-eqz v0, :cond_1d
-
-    invoke-virtual {v0, v7}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v0
-
-    add-int/2addr v15, v0
-
-    :cond_1d
-    iget-object v0, v2, Lp0/a/a/r;->E:[Lp0/a/a/a;
-
-    if-eqz v0, :cond_1f
-
-    iget v3, v2, Lp0/a/a/r;->D:I
-
-    if-nez v3, :cond_1e
-
-    array-length v3, v0
-
-    :cond_1e
-    const-string v4, "RuntimeVisibleParameterAnnotations"
-
-    invoke-static {v4, v0, v3}, Lp0/a/a/a;->b(Ljava/lang/String;[Lp0/a/a/a;I)I
-
-    move-result v0
-
-    add-int/2addr v15, v0
-
-    :cond_1f
-    iget-object v0, v2, Lp0/a/a/r;->G:[Lp0/a/a/a;
-
-    if-eqz v0, :cond_21
-
-    iget v3, v2, Lp0/a/a/r;->F:I
-
-    if-nez v3, :cond_20
-
-    array-length v3, v0
-
-    :cond_20
-    const-string v4, "RuntimeInvisibleParameterAnnotations"
-
-    invoke-static {v4, v0, v3}, Lp0/a/a/a;->b(Ljava/lang/String;[Lp0/a/a/a;I)I
-
-    move-result v0
-
-    add-int/2addr v15, v0
-
-    :cond_21
-    iget-object v0, v2, Lp0/a/a/r;->H:Lp0/a/a/a;
-
-    if-eqz v0, :cond_22
-
-    invoke-virtual {v0, v6}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v0
-
-    add-int/2addr v15, v0
-
-    :cond_22
-    iget-object v0, v2, Lp0/a/a/r;->I:Lp0/a/a/a;
-
-    if-eqz v0, :cond_23
-
-    invoke-virtual {v0, v5}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v0
-
-    add-int/2addr v15, v0
-
-    :cond_23
-    iget-object v0, v2, Lp0/a/a/r;->J:Lp0/a/a/c;
-
-    if-eqz v0, :cond_24
-
-    iget-object v0, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v3, "AnnotationDefault"
-
-    invoke-virtual {v0, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v0, v2, Lp0/a/a/r;->J:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v0, v0, 0x6
-
-    add-int/2addr v15, v0
-
-    :cond_24
-    iget-object v0, v2, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    if-eqz v0, :cond_25
-
-    iget-object v0, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v3, "MethodParameters"
-
-    invoke-virtual {v0, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v0, v2, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v0, v0, 0x7
-
-    add-int/2addr v0, v15
-
-    move v12, v0
-
-    goto :goto_8
-
-    :cond_25
-    move v12, v15
-
-    :goto_8
-    iget-object v0, v2, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    if-eqz v0, :cond_26
-
-    iget-object v3, v2, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, v3}, Lp0/a/a/b;->a(Lp0/a/a/v;)I
-
-    move-result v0
-
-    add-int/2addr v12, v0
-
-    :cond_26
-    :goto_9
-    add-int/2addr v1, v12
-
-    iget-object v0, v2, Lp0/a/a/q;->b:Lp0/a/a/q;
-
-    move-object v2, v0
-
-    check-cast v2, Lp0/a/a/r;
-
-    const/16 v12, 0x10
-
-    const/high16 v14, 0x20000
-
-    move-object/from16 v0, p0
-
-    move/from16 v13, v24
-
-    move-object/from16 v4, v25
-
-    move/from16 v3, v26
-
-    goto/16 :goto_2
-
-    :cond_27
-    move/from16 v26, v3
-
-    move-object/from16 v25, v4
-
-    iget-object v2, v0, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    const-string v3, "InnerClasses"
-
-    if-eqz v2, :cond_28
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x8
-
-    add-int/2addr v1, v2
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v2, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    const/4 v2, 0x1
-
-    goto :goto_a
-
-    :cond_28
-    const/4 v2, 0x0
-
-    :goto_a
-    iget v4, v0, Lp0/a/a/f;->n:I
-
-    const-string v12, "EnclosingMethod"
-
-    if-eqz v4, :cond_29
-
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/lit8 v1, v1, 0xa
-
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v12}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_29
-    iget v4, v0, Lp0/a/a/f;->c:I
-
-    and-int/lit16 v4, v4, 0x1000
-
-    if-eqz v4, :cond_2a
-
-    iget v4, v0, Lp0/a/a/f;->a:I
-
-    and-int/2addr v4, v15
-
-    const/16 v14, 0x31
-
-    if-ge v4, v14, :cond_2a
-
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/lit8 v1, v1, 0x6
-
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v10}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_2a
-    iget v4, v0, Lp0/a/a/f;->p:I
-
-    if-eqz v4, :cond_2b
-
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/lit8 v1, v1, 0x8
-
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v11}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_2b
-    iget v4, v0, Lp0/a/a/f;->q:I
-
-    const-string v14, "SourceFile"
-
-    if-eqz v4, :cond_2c
-
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/lit8 v1, v1, 0x8
-
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v14}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_2c
-    iget-object v4, v0, Lp0/a/a/f;->r:Lp0/a/a/c;
-
-    const-string v15, "SourceDebugExtension"
-
-    if-eqz v4, :cond_2d
-
-    add-int/lit8 v2, v2, 0x1
-
-    iget v4, v4, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v4, v4, 0x6
-
-    add-int/2addr v1, v4
-
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v15}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_2d
-    iget v4, v0, Lp0/a/a/f;->c:I
-
-    const/high16 v16, 0x20000
-
-    and-int v4, v4, v16
-
-    if-eqz v4, :cond_2e
-
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/lit8 v1, v1, 0x6
-
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v9}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_2e
-    iget-object v4, v0, Lp0/a/a/f;->s:Lp0/a/a/a;
-
-    if-eqz v4, :cond_2f
-
-    add-int/lit8 v2, v2, 0x1
-
-    invoke-virtual {v4, v8}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v1, v4
-
-    :cond_2f
-    iget-object v4, v0, Lp0/a/a/f;->t:Lp0/a/a/a;
-
-    if-eqz v4, :cond_30
-
-    add-int/lit8 v2, v2, 0x1
-
-    invoke-virtual {v4, v7}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v1, v4
-
-    :cond_30
-    iget-object v4, v0, Lp0/a/a/f;->u:Lp0/a/a/a;
-
-    if-eqz v4, :cond_31
-
-    add-int/lit8 v2, v2, 0x1
-
-    invoke-virtual {v4, v6}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v1, v4
-
-    :cond_31
-    iget-object v4, v0, Lp0/a/a/f;->v:Lp0/a/a/a;
-
-    if-eqz v4, :cond_32
-
-    add-int/lit8 v2, v2, 0x1
-
-    invoke-virtual {v4, v5}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v4
-
-    add-int/2addr v1, v4
-
-    :cond_32
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v16, v15
-
-    iget-object v15, v4, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    move-object/from16 v18, v14
-
-    const-string v14, "BootstrapMethods"
-
-    if-eqz v15, :cond_33
-
-    invoke-virtual {v4, v14}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v4, v4, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    iget v4, v4, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v4, v4, 0x8
-
-    goto :goto_b
-
-    :cond_33
-    const/4 v4, 0x0
-
-    :goto_b
-    if-lez v4, :cond_35
-
-    add-int/lit8 v2, v2, 0x1
-
-    iget-object v4, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget-object v15, v4, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    if-eqz v15, :cond_34
-
-    invoke-virtual {v4, v14}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v4, v4, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    iget v4, v4, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v4, v4, 0x8
-
-    goto :goto_c
-
-    :cond_34
-    const/4 v4, 0x0
-
-    :goto_c
-    add-int/2addr v1, v4
-
-    :cond_35
-    iget-object v4, v0, Lp0/a/a/f;->w:Lp0/a/a/s;
-
-    const-string v15, "ModuleMainClass"
-
-    move-object/from16 v19, v14
-
-    const-string v14, "ModulePackages"
-
-    move-object/from16 v20, v12
-
-    const-string v12, "Module"
-
-    if-eqz v4, :cond_3a
-
-    move-object/from16 v21, v3
-
-    iget v3, v4, Lp0/a/a/s;->o:I
-
-    if-lez v3, :cond_36
-
-    const/4 v3, 0x1
-
-    goto :goto_d
-
-    :cond_36
-    const/4 v3, 0x0
-
-    :goto_d
-    add-int/lit8 v3, v3, 0x1
-
-    iget v4, v4, Lp0/a/a/s;->q:I
-
-    if-lez v4, :cond_37
-
-    const/4 v4, 0x1
-
-    goto :goto_e
-
-    :cond_37
-    const/4 v4, 0x0
-
-    :goto_e
-    add-int/2addr v3, v4
-
-    add-int/2addr v2, v3
-
-    iget-object v3, v0, Lp0/a/a/f;->w:Lp0/a/a/s;
-
-    iget-object v4, v3, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v4, v12}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v4, v3, Lp0/a/a/s;->f:Lp0/a/a/c;
-
-    iget v4, v4, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v4, v4, 0x16
-
-    move/from16 v22, v2
-
-    iget-object v2, v3, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/2addr v4, v2
-
-    iget-object v2, v3, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/2addr v4, v2
-
-    iget-object v2, v3, Lp0/a/a/s;->l:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/2addr v4, v2
-
-    iget-object v2, v3, Lp0/a/a/s;->n:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/2addr v4, v2
-
-    iget v2, v3, Lp0/a/a/s;->o:I
-
-    if-lez v2, :cond_38
-
-    iget-object v2, v3, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v2, v14}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    iget-object v2, v3, Lp0/a/a/s;->p:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x8
-
-    add-int/2addr v4, v2
-
-    :cond_38
-    iget v2, v3, Lp0/a/a/s;->q:I
-
-    if-lez v2, :cond_39
-
-    iget-object v2, v3, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    invoke-virtual {v2, v15}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    add-int/lit8 v4, v4, 0x8
-
-    :cond_39
-    add-int/2addr v1, v4
-
-    move/from16 v2, v22
-
-    goto :goto_f
-
-    :cond_3a
-    move-object/from16 v21, v3
-
-    :goto_f
-    iget v3, v0, Lp0/a/a/f;->x:I
-
-    const-string v4, "NestHost"
-
-    if-eqz v3, :cond_3b
-
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/lit8 v1, v1, 0x8
-
-    iget-object v3, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v3, v4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_3b
-    iget-object v3, v0, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    move-object/from16 v22, v4
-
-    const-string v4, "NestMembers"
-
-    if-eqz v3, :cond_3c
-
-    add-int/lit8 v2, v2, 0x1
-
-    iget v3, v3, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v3, v3, 0x8
-
-    add-int/2addr v1, v3
-
-    iget-object v3, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v3, v4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    :cond_3c
-    iget-object v3, v0, Lp0/a/a/f;->A:Lp0/a/a/b;
-
-    if-eqz v3, :cond_3d
-
-    invoke-virtual {v3}, Lp0/a/a/b;->c()I
-
-    move-result v3
-
-    add-int/2addr v2, v3
-
-    iget-object v3, v0, Lp0/a/a/f;->A:Lp0/a/a/b;
-
-    move/from16 v23, v2
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v3, v2}, Lp0/a/a/b;->a(Lp0/a/a/v;)I
-
-    move-result v2
-
-    add-int/2addr v1, v2
-
-    move/from16 v2, v23
-
-    :cond_3d
-    iget-object v3, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v23, v4
-
-    iget-object v4, v3, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    iget v4, v4, Lp0/a/a/c;->b:I
-
-    add-int/2addr v1, v4
-
-    iget v3, v3, Lp0/a/a/v;->g:I
-
-    const v4, 0xffff
-
-    if-gt v3, v4, :cond_69
-
-    new-instance v3, Lp0/a/a/c;
-
-    invoke-direct {v3, v1}, Lp0/a/a/c;-><init>(I)V
-
-    const v1, -0x35014542    # -8346975.0f
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->a:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget v4, v1, Lp0/a/a/v;->g:I
-
-    invoke-virtual {v3, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v1, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    iget-object v4, v1, Lp0/a/a/c;->a:[B
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    move-object/from16 v24, v15
-
-    const/4 v15, 0x0
-
-    invoke-virtual {v3, v4, v15, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->a:I
-
-    const v4, 0xffff
-
-    and-int/2addr v1, v4
-
-    const/16 v4, 0x31
-
-    if-ge v1, v4, :cond_3e
-
-    const/16 v1, 0x1000
-
-    goto :goto_10
-
-    :cond_3e
-    const/4 v1, 0x0
-
-    :goto_10
-    iget v4, v0, Lp0/a/a/f;->c:I
-
-    not-int v1, v1
-
-    and-int/2addr v1, v4
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->d:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->e:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->f:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 v1, 0x0
-
-    :goto_11
-    iget v4, v0, Lp0/a/a/f;->f:I
-
-    if-ge v1, v4, :cond_3f
-
-    iget-object v4, v0, Lp0/a/a/f;->g:[I
-
-    aget v4, v4, v1
-
-    invoke-virtual {v3, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_11
-
-    :cond_3f
-    move/from16 v1, v26
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->h:Lp0/a/a/l;
-
-    :goto_12
-    if-eqz v1, :cond_54
-
-    iget-object v4, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    iget v4, v4, Lp0/a/a/v;->c:I
-
-    const/16 v15, 0x31
-
-    if-ge v4, v15, :cond_40
-
-    const/4 v4, 0x1
-
-    goto :goto_13
-
-    :cond_40
-    const/4 v4, 0x0
-
-    :goto_13
-    if-eqz v4, :cond_41
-
-    const/16 v15, 0x1000
-
-    goto :goto_14
-
-    :cond_41
-    const/4 v15, 0x0
-
-    :goto_14
-    move-object/from16 v26, v14
-
-    iget v14, v1, Lp0/a/a/l;->c:I
-
-    not-int v15, v15
-
-    and-int/2addr v14, v15
-
-    invoke-virtual {v3, v14}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v14, v1, Lp0/a/a/l;->d:I
-
-    invoke-virtual {v3, v14}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v14, v1, Lp0/a/a/l;->e:I
-
-    invoke-virtual {v3, v14}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v14, v1, Lp0/a/a/l;->g:I
-
-    if-eqz v14, :cond_42
-
-    const/4 v14, 0x1
-
-    goto :goto_15
-
-    :cond_42
-    const/4 v14, 0x0
-
-    :goto_15
-    iget v15, v1, Lp0/a/a/l;->c:I
-
-    and-int/lit16 v15, v15, 0x1000
-
-    if-eqz v15, :cond_43
-
-    if-eqz v4, :cond_43
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_43
-    iget v15, v1, Lp0/a/a/l;->f:I
-
-    if-eqz v15, :cond_44
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_44
-    iget v15, v1, Lp0/a/a/l;->c:I
-
-    const/high16 v17, 0x20000
-
-    and-int v15, v15, v17
-
-    if-eqz v15, :cond_45
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_45
-    iget-object v15, v1, Lp0/a/a/l;->h:Lp0/a/a/a;
-
-    if-eqz v15, :cond_46
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_46
-    iget-object v15, v1, Lp0/a/a/l;->i:Lp0/a/a/a;
-
-    if-eqz v15, :cond_47
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_47
-    iget-object v15, v1, Lp0/a/a/l;->j:Lp0/a/a/a;
-
-    if-eqz v15, :cond_48
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_48
-    iget-object v15, v1, Lp0/a/a/l;->k:Lp0/a/a/a;
-
-    if-eqz v15, :cond_49
-
-    add-int/lit8 v14, v14, 0x1
-
-    :cond_49
-    iget-object v15, v1, Lp0/a/a/l;->l:Lp0/a/a/b;
-
-    if-eqz v15, :cond_4a
-
-    invoke-virtual {v15}, Lp0/a/a/b;->c()I
-
-    move-result v15
-
-    add-int/2addr v14, v15
-
-    :cond_4a
-    invoke-virtual {v3, v14}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v14, v1, Lp0/a/a/l;->g:I
-
-    if-eqz v14, :cond_4b
-
-    iget-object v14, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    const/4 v15, 0x2
-
-    move-object/from16 v27, v12
-
-    move-object/from16 v12, v25
-
-    invoke-static {v14, v12, v3, v15}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v14, v1, Lp0/a/a/l;->g:I
-
-    invoke-virtual {v3, v14}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_16
-
-    :cond_4b
-    move-object/from16 v27, v12
-
-    move-object/from16 v12, v25
-
-    :goto_16
-    iget v14, v1, Lp0/a/a/l;->c:I
-
-    and-int/lit16 v14, v14, 0x1000
-
-    if-eqz v14, :cond_4c
-
-    if-eqz v4, :cond_4c
-
-    iget-object v4, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    const/4 v14, 0x0
-
-    invoke-static {v4, v10, v3, v14}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    :cond_4c
-    iget v4, v1, Lp0/a/a/l;->f:I
-
-    if-eqz v4, :cond_4d
-
-    iget-object v4, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    const/4 v14, 0x2
-
-    invoke-static {v4, v11, v3, v14}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v4, v1, Lp0/a/a/l;->f:I
-
-    invoke-virtual {v3, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_4d
-    iget v4, v1, Lp0/a/a/l;->c:I
-
-    const/high16 v14, 0x20000
-
-    and-int/2addr v4, v14
-
-    if-eqz v4, :cond_4e
-
-    iget-object v4, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    const/4 v14, 0x0
-
-    invoke-static {v4, v9, v3, v14}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    :cond_4e
-    iget-object v4, v1, Lp0/a/a/l;->h:Lp0/a/a/a;
-
-    if-eqz v4, :cond_4f
-
-    iget-object v14, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v14, v8}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v14
-
-    invoke-virtual {v4, v14, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_4f
-    iget-object v4, v1, Lp0/a/a/l;->i:Lp0/a/a/a;
-
-    if-eqz v4, :cond_50
-
-    iget-object v14, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v14, v7}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v14
-
-    invoke-virtual {v4, v14, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_50
-    iget-object v4, v1, Lp0/a/a/l;->j:Lp0/a/a/a;
-
-    if-eqz v4, :cond_51
-
-    iget-object v14, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v14, v6}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v14
-
-    invoke-virtual {v4, v14, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_51
-    iget-object v4, v1, Lp0/a/a/l;->k:Lp0/a/a/a;
-
-    if-eqz v4, :cond_52
-
-    iget-object v14, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v14, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v14
-
-    invoke-virtual {v4, v14, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_52
-    iget-object v4, v1, Lp0/a/a/l;->l:Lp0/a/a/b;
-
-    if-eqz v4, :cond_53
-
-    iget-object v14, v1, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v4, v14, v3}, Lp0/a/a/b;->d(Lp0/a/a/v;Lp0/a/a/c;)V
-
-    :cond_53
-    iget-object v1, v1, Lp0/a/a/k;->a:Lp0/a/a/k;
-
-    check-cast v1, Lp0/a/a/l;
-
-    move-object/from16 v25, v12
-
-    move-object/from16 v14, v26
-
-    move-object/from16 v12, v27
-
-    goto/16 :goto_12
-
-    :cond_54
-    move-object/from16 v27, v12
-
-    move-object/from16 v26, v14
-
-    invoke-virtual {v3, v13}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->j:Lp0/a/a/r;
-
-    const/4 v4, 0x0
-
-    const/4 v12, 0x0
-
-    :goto_17
-    if-eqz v1, :cond_56
-
-    iget v13, v1, Lp0/a/a/r;->t:I
-
-    if-lez v13, :cond_55
-
-    const/4 v13, 0x1
-
-    goto :goto_18
-
-    :cond_55
-    const/4 v13, 0x0
-
-    :goto_18
-    or-int/2addr v12, v13
-
-    iget-boolean v13, v1, Lp0/a/a/r;->Y:Z
-
-    or-int/2addr v4, v13
-
-    invoke-virtual {v1, v3}, Lp0/a/a/r;->y(Lp0/a/a/c;)V
-
-    iget-object v1, v1, Lp0/a/a/q;->b:Lp0/a/a/q;
-
-    check-cast v1, Lp0/a/a/r;
-
-    goto :goto_17
-
-    :cond_56
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    if-eqz v1, :cond_57
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v2, v21
-
-    invoke-virtual {v1, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v1
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v1, 0x2
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->l:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->m:Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/c;->a:[B
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    const/4 v13, 0x0
-
-    invoke-virtual {v3, v2, v13, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_57
-    iget v1, v0, Lp0/a/a/f;->n:I
-
-    if-eqz v1, :cond_58
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v2, 0x4
-
-    move-object/from16 v13, v20
-
-    invoke-static {v1, v13, v3, v2}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v1, v0, Lp0/a/a/f;->n:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->o:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_58
-    iget v1, v0, Lp0/a/a/f;->c:I
-
-    and-int/lit16 v1, v1, 0x1000
-
-    if-eqz v1, :cond_59
-
-    iget v1, v0, Lp0/a/a/f;->a:I
-
-    const v2, 0xffff
-
-    and-int/2addr v1, v2
-
-    const/16 v2, 0x31
-
-    if-ge v1, v2, :cond_59
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v2, 0x0
-
-    invoke-static {v1, v10, v3, v2}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    :cond_59
-    iget v1, v0, Lp0/a/a/f;->p:I
-
-    if-eqz v1, :cond_5a
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    const/4 v2, 0x2
-
-    invoke-static {v1, v11, v3, v2}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v1, v0, Lp0/a/a/f;->p:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_19
-
-    :cond_5a
-    const/4 v2, 0x2
-
-    :goto_19
-    iget v1, v0, Lp0/a/a/f;->q:I
-
-    if-eqz v1, :cond_5b
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v10, v18
-
-    invoke-static {v1, v10, v3, v2}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v1, v0, Lp0/a/a/f;->q:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_5b
-    iget-object v1, v0, Lp0/a/a/f;->r:Lp0/a/a/c;
-
-    if-eqz v1, :cond_5c
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v10, v16
-
-    invoke-static {v2, v10, v3, v1}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget-object v2, v0, Lp0/a/a/f;->r:Lp0/a/a/c;
-
-    iget-object v2, v2, Lp0/a/a/c;->a:[B
-
-    const/4 v10, 0x0
-
-    invoke-virtual {v3, v2, v10, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    goto :goto_1a
-
-    :cond_5c
-    const/4 v10, 0x0
-
-    :goto_1a
-    iget v1, v0, Lp0/a/a/f;->c:I
-
-    const/high16 v2, 0x20000
-
-    and-int/2addr v1, v2
-
-    if-eqz v1, :cond_5d
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-static {v1, v9, v3, v10}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    :cond_5d
-    iget-object v1, v0, Lp0/a/a/f;->s:Lp0/a/a/a;
-
-    if-eqz v1, :cond_5e
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v2, v8}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_5e
-    iget-object v1, v0, Lp0/a/a/f;->t:Lp0/a/a/a;
-
-    if-eqz v1, :cond_5f
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v2, v7}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_5f
-    iget-object v1, v0, Lp0/a/a/f;->u:Lp0/a/a/a;
-
-    if-eqz v1, :cond_60
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v2, v6}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_60
-    iget-object v1, v0, Lp0/a/a/f;->v:Lp0/a/a/a;
-
-    if-eqz v1, :cond_61
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v2, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2, v3}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_61
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget-object v2, v1, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    if-eqz v2, :cond_62
-
-    move-object/from16 v2, v19
-
-    invoke-virtual {v1, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x2
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/v;->i:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v1, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/c;->a:[B
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v3, v2, v5, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_62
-    iget-object v1, v0, Lp0/a/a/f;->w:Lp0/a/a/s;
-
-    if-eqz v1, :cond_64
-
-    iget-object v2, v1, Lp0/a/a/s;->f:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x10
-
-    iget-object v5, v1, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    add-int/2addr v2, v5
-
-    iget-object v5, v1, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    add-int/2addr v2, v5
-
-    iget-object v5, v1, Lp0/a/a/s;->l:Lp0/a/a/c;
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    add-int/2addr v2, v5
-
-    iget-object v5, v1, Lp0/a/a/s;->n:Lp0/a/a/c;
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    add-int/2addr v2, v5
-
-    iget-object v5, v1, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    move-object/from16 v6, v27
-
-    invoke-static {v5, v6, v3, v2}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v2, v1, Lp0/a/a/s;->b:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->c:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->d:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->e:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/s;->f:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    const/4 v6, 0x0
-
-    invoke-virtual {v3, v5, v6, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->g:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {v3, v5, v6, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->i:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {v3, v5, v6, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->k:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/s;->l:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {v3, v5, v6, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->m:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/s;->n:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {v3, v5, v6, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->o:I
-
-    if-lez v2, :cond_63
-
-    iget-object v2, v1, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    move-object/from16 v5, v26
-
-    invoke-virtual {v2, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/s;->p:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x2
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/s;->o:I
-
-    invoke-virtual {v3, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/s;->p:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    const/4 v6, 0x0
-
-    invoke-virtual {v3, v5, v6, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_63
-    iget v2, v1, Lp0/a/a/s;->q:I
-
-    if-lez v2, :cond_64
-
-    iget-object v2, v1, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    const/4 v5, 0x2
-
-    move-object/from16 v6, v24
-
-    invoke-static {v2, v6, v3, v5}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v1, v1, Lp0/a/a/s;->q:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_1b
-
-    :cond_64
-    const/4 v5, 0x2
-
-    :goto_1b
-    iget v1, v0, Lp0/a/a/f;->x:I
-
-    if-eqz v1, :cond_65
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v2, v22
-
-    invoke-static {v1, v2, v3, v5}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v1, v0, Lp0/a/a/f;->x:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_65
-    iget-object v1, v0, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    if-eqz v1, :cond_66
-
-    iget-object v1, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    move-object/from16 v2, v23
-
-    invoke-virtual {v1, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v1
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v1, v1, 0x2
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/f;->y:I
-
-    invoke-virtual {v3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/f;->z:Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/c;->a:[B
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    const/4 v5, 0x0
-
-    invoke-virtual {v3, v2, v5, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_66
-    iget-object v1, v0, Lp0/a/a/f;->A:Lp0/a/a/b;
-
-    if-eqz v1, :cond_67
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    invoke-virtual {v1, v2, v3}, Lp0/a/a/b;->d(Lp0/a/a/v;Lp0/a/a/c;)V
-
-    :cond_67
-    if-eqz v4, :cond_68
-
-    iget-object v1, v3, Lp0/a/a/c;->a:[B
-
-    invoke-virtual {v0, v1, v12}, Lp0/a/a/f;->e([BZ)[B
-
-    move-result-object v1
-
-    return-object v1
-
-    :cond_68
-    iget-object v1, v3, Lp0/a/a/c;->a:[B
-
-    return-object v1
-
-    :cond_69
-    new-instance v1, Lorg/objectweb/asm/ClassTooLargeException;
-
-    iget-object v2, v0, Lp0/a/a/f;->b:Lp0/a/a/v;
-
-    iget-object v2, v2, Lp0/a/a/v;->d:Ljava/lang/String;
-
-    invoke-direct {v1, v2, v3}, Lorg/objectweb/asm/ClassTooLargeException;-><init>(Ljava/lang/String;I)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/g.smali b/com.discord/smali_classes2/p0/a/a/g.smali
deleted file mode 100644
index 319d476c5d..0000000000
--- a/com.discord/smali_classes2/p0/a/a/g.smali
+++ /dev/null
@@ -1,201 +0,0 @@
-.class public final Lp0/a/a/g;
-.super Ljava/lang/Object;
-.source "ConstantDynamic.java"
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public final b:Ljava/lang/String;
-
-.field public final c:Lp0/a/a/n;
-
-.field public final d:[Ljava/lang/Object;
-
-
-# direct methods
-.method public varargs constructor <init>(Ljava/lang/String;Ljava/lang/String;Lp0/a/a/n;[Ljava/lang/Object;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/g;->a:Ljava/lang/String;
-
-    iput-object p2, p0, Lp0/a/a/g;->b:Ljava/lang/String;
-
-    iput-object p3, p0, Lp0/a/a/g;->c:Lp0/a/a/n;
-
-    iput-object p4, p0, Lp0/a/a/g;->d:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Lp0/a/a/g;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p1, Lp0/a/a/g;
-
-    iget-object v1, p0, Lp0/a/a/g;->a:Ljava/lang/String;
-
-    iget-object v3, p1, Lp0/a/a/g;->a:Ljava/lang/String;
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lp0/a/a/g;->b:Ljava/lang/String;
-
-    iget-object v3, p1, Lp0/a/a/g;->b:Ljava/lang/String;
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lp0/a/a/g;->c:Lp0/a/a/n;
-
-    iget-object v3, p1, Lp0/a/a/g;->c:Lp0/a/a/n;
-
-    invoke-virtual {v1, v3}, Lp0/a/a/n;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lp0/a/a/g;->d:[Ljava/lang/Object;
-
-    iget-object p1, p1, Lp0/a/a/g;->d:[Ljava/lang/Object;
-
-    invoke-static {v1, p1}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/g;->a:Ljava/lang/String;
-
-    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    iget-object v1, p0, Lp0/a/a/g;->b:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    const/16 v2, 0x8
-
-    invoke-static {v1, v2}, Ljava/lang/Integer;->rotateLeft(II)I
-
-    move-result v1
-
-    xor-int/2addr v0, v1
-
-    iget-object v1, p0, Lp0/a/a/g;->c:Lp0/a/a/n;
-
-    invoke-virtual {v1}, Lp0/a/a/n;->hashCode()I
-
-    move-result v1
-
-    const/16 v2, 0x10
-
-    invoke-static {v1, v2}, Ljava/lang/Integer;->rotateLeft(II)I
-
-    move-result v1
-
-    xor-int/2addr v0, v1
-
-    iget-object v1, p0, Lp0/a/a/g;->d:[Ljava/lang/Object;
-
-    invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
-
-    move-result v1
-
-    const/16 v2, 0x18
-
-    invoke-static {v1, v2}, Ljava/lang/Integer;->rotateLeft(II)I
-
-    move-result v1
-
-    xor-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lp0/a/a/g;->a:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " : "
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lp0/a/a/g;->b:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x20
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v2, p0, Lp0/a/a/g;->c:Lp0/a/a/n;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lp0/a/a/g;->d:[Ljava/lang/Object;
-
-    invoke-static {v1}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/h.smali b/com.discord/smali_classes2/p0/a/a/h.smali
deleted file mode 100644
index 1c29c39e81..0000000000
--- a/com.discord/smali_classes2/p0/a/a/h.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Lp0/a/a/h;
-.super Ljava/lang/Object;
-.source "Context.java"
-
-
-# instance fields
-.field public a:[Lp0/a/a/b;
-
-.field public b:I
-
-.field public c:[C
-
-.field public d:I
-
-.field public e:Ljava/lang/String;
-
-.field public f:Ljava/lang/String;
-
-.field public g:[Lp0/a/a/p;
-
-.field public h:I
-
-.field public i:Lp0/a/a/x;
-
-.field public j:[Lp0/a/a/p;
-
-.field public k:[Lp0/a/a/p;
-
-.field public l:[I
-
-.field public m:I
-
-.field public n:I
-
-.field public o:I
-
-.field public p:I
-
-.field public q:[Ljava/lang/Object;
-
-.field public r:I
-
-.field public s:[Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/i.smali b/com.discord/smali_classes2/p0/a/a/i.smali
deleted file mode 100644
index bf54fea358..0000000000
--- a/com.discord/smali_classes2/p0/a/a/i.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lp0/a/a/i;
-.super Lp0/a/a/m;
-.source "CurrentFrame.java"
-
-
-# direct methods
-.method public constructor <init>(Lp0/a/a/p;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lp0/a/a/m;-><init>(Lp0/a/a/p;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public b(IILp0/a/a/u;Lp0/a/a/v;)V
-    .locals 0
-
-    invoke-super {p0, p1, p2, p3, p4}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    new-instance p1, Lp0/a/a/m;
-
-    const/4 p2, 0x0
-
-    invoke-direct {p1, p2}, Lp0/a/a/m;-><init>(Lp0/a/a/p;)V
-
-    const/4 p2, 0x0
-
-    invoke-virtual {p0, p4, p1, p2}, Lp0/a/a/m;->h(Lp0/a/a/v;Lp0/a/a/m;I)Z
-
-    iget-object p3, p1, Lp0/a/a/m;->b:[I
-
-    iput-object p3, p0, Lp0/a/a/m;->b:[I
-
-    iget-object p3, p1, Lp0/a/a/m;->c:[I
-
-    iput-object p3, p0, Lp0/a/a/m;->c:[I
-
-    iput-short p2, p0, Lp0/a/a/m;->f:S
-
-    iget-object p2, p1, Lp0/a/a/m;->d:[I
-
-    iput-object p2, p0, Lp0/a/a/m;->d:[I
-
-    iget-object p2, p1, Lp0/a/a/m;->e:[I
-
-    iput-object p2, p0, Lp0/a/a/m;->e:[I
-
-    iget-short p2, p1, Lp0/a/a/m;->g:S
-
-    iput-short p2, p0, Lp0/a/a/m;->g:S
-
-    iget p2, p1, Lp0/a/a/m;->h:I
-
-    iput p2, p0, Lp0/a/a/m;->h:I
-
-    iget-object p1, p1, Lp0/a/a/m;->i:[I
-
-    iput-object p1, p0, Lp0/a/a/m;->i:[I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/j.smali b/com.discord/smali_classes2/p0/a/a/j.smali
deleted file mode 100644
index 196b1a17a9..0000000000
--- a/com.discord/smali_classes2/p0/a/a/j.smali
+++ /dev/null
@@ -1,27 +0,0 @@
-.class public final Lp0/a/a/j;
-.super Ljava/lang/Object;
-.source "Edge.java"
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:Lp0/a/a/p;
-
-.field public c:Lp0/a/a/j;
-
-
-# direct methods
-.method public constructor <init>(ILp0/a/a/p;Lp0/a/a/j;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lp0/a/a/j;->a:I
-
-    iput-object p2, p0, Lp0/a/a/j;->b:Lp0/a/a/p;
-
-    iput-object p3, p0, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/k.smali b/com.discord/smali_classes2/p0/a/a/k.smali
deleted file mode 100644
index 783de9d096..0000000000
--- a/com.discord/smali_classes2/p0/a/a/k.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public abstract Lp0/a/a/k;
-.super Ljava/lang/Object;
-.source "FieldVisitor.java"
-
-
-# instance fields
-.field public a:Lp0/a/a/k;
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/high16 v0, 0x60000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x50000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x40000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x70000
-
-    if-ne p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lp0/a/a/k;->a:Lp0/a/a/k;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ljava/lang/String;Z)Lp0/a/a/a;
-.end method
-
-.method public abstract b(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/l.smali b/com.discord/smali_classes2/p0/a/a/l.smali
deleted file mode 100644
index 9fc50ea1dd..0000000000
--- a/com.discord/smali_classes2/p0/a/a/l.smali
+++ /dev/null
@@ -1,179 +0,0 @@
-.class public final Lp0/a/a/l;
-.super Lp0/a/a/k;
-.source "FieldWriter.java"
-
-
-# instance fields
-.field public final b:Lp0/a/a/v;
-
-.field public final c:I
-
-.field public final d:I
-
-.field public final e:I
-
-.field public f:I
-
-.field public g:I
-
-.field public h:Lp0/a/a/a;
-
-.field public i:Lp0/a/a/a;
-
-.field public j:Lp0/a/a/a;
-
-.field public k:Lp0/a/a/a;
-
-.field public l:Lp0/a/a/b;
-
-
-# direct methods
-.method public constructor <init>(Lp0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
-    .locals 1
-
-    const/high16 v0, 0x70000
-
-    invoke-direct {p0, v0}, Lp0/a/a/k;-><init>(I)V
-
-    iput-object p1, p0, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    iput p2, p0, Lp0/a/a/l;->c:I
-
-    invoke-virtual {p1, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    iput p2, p0, Lp0/a/a/l;->d:I
-
-    invoke-virtual {p1, p4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    iput p2, p0, Lp0/a/a/l;->e:I
-
-    if-eqz p5, :cond_0
-
-    invoke-virtual {p1, p5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    iput p2, p0, Lp0/a/a/l;->f:I
-
-    :cond_0
-    if-eqz p6, :cond_1
-
-    invoke-virtual {p1, p6}, Lp0/a/a/v;->b(Ljava/lang/Object;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    iget p1, p1, Lp0/a/a/u;->a:I
-
-    iput p1, p0, Lp0/a/a/l;->g:I
-
-    :cond_1
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/String;Z)Lp0/a/a/a;
-    .locals 3
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    iget-object v1, p0, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {v1, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p2, :cond_0
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object v1, p0, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/l;->h:Lp0/a/a/a;
-
-    invoke-direct {p2, v1, p1, v0, v2}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/l;->h:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_0
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object v1, p0, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/l;->i:Lp0/a/a/a;
-
-    invoke-direct {p2, v1, p1, v0, v2}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/l;->i:Lp0/a/a/a;
-
-    return-object p2
-.end method
-
-.method public b(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-    .locals 1
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    invoke-static {p1, v0}, Lf/n/a/k/a;->S(ILp0/a/a/c;)V
-
-    invoke-static {p2, v0}, Lp0/a/a/x;->a(Lp0/a/a/x;Lp0/a/a/c;)V
-
-    iget-object p1, p0, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    invoke-virtual {p1, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p4, :cond_0
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/l;->j:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/l;->j:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_0
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/l;->b:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/l;->k:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/l;->k:Lp0/a/a/a;
-
-    return-object p2
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/m.smali b/com.discord/smali_classes2/p0/a/a/m.smali
deleted file mode 100644
index 871dbe2d92..0000000000
--- a/com.discord/smali_classes2/p0/a/a/m.smali
+++ /dev/null
@@ -1,2890 +0,0 @@
-.class public Lp0/a/a/m;
-.super Ljava/lang/Object;
-.source "Frame.java"
-
-
-# instance fields
-.field public a:Lp0/a/a/p;
-
-.field public b:[I
-
-.field public c:[I
-
-.field public d:[I
-
-.field public e:[I
-
-.field public f:S
-
-.field public g:S
-
-.field public h:I
-
-.field public i:[I
-
-
-# direct methods
-.method public constructor <init>(Lp0/a/a/p;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/m;->a:Lp0/a/a/p;
-
-    return-void
-.end method
-
-.method public static c(Lp0/a/a/v;Ljava/lang/Object;)I
-    .locals 2
-
-    instance-of v0, p1, Ljava/lang/Integer;
-
-    if-eqz v0, :cond_0
-
-    const/high16 p0, 0x1000000
-
-    check-cast p1, Ljava/lang/Integer;
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    or-int/2addr p0, p1
-
-    return p0
-
-    :cond_0
-    instance-of v0, p1, Ljava/lang/String;
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-static {p1}, Lp0/a/a/w;->h(Ljava/lang/String;)Lp0/a/a/w;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lp0/a/a/w;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    invoke-static {p0, p1, v0}, Lp0/a/a/m;->d(Lp0/a/a/v;Ljava/lang/String;I)I
-
-    move-result p0
-
-    return p0
-
-    :cond_1
-    const/high16 v0, 0x3000000
-
-    check-cast p1, Lp0/a/a/p;
-
-    iget p1, p1, Lp0/a/a/p;->d:I
-
-    const-string v1, ""
-
-    invoke-virtual {p0, v1, p1}, Lp0/a/a/v;->p(Ljava/lang/String;I)I
-
-    move-result p0
-
-    or-int/2addr p0, v0
-
-    return p0
-.end method
-
-.method public static d(Lp0/a/a/v;Ljava/lang/String;I)I
-    .locals 16
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    invoke-virtual/range {p1 .. p2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    const v3, 0x1000002
-
-    const/16 v4, 0x46
-
-    if-eq v2, v4, :cond_c
-
-    const/high16 v5, 0x2000000
-
-    const/16 v6, 0x4c
-
-    if-eq v2, v6, :cond_b
-
-    const v7, 0x1000001
-
-    const/16 v8, 0x53
-
-    if-eq v2, v8, :cond_a
-
-    const/16 v9, 0x56
-
-    if-eq v2, v9, :cond_9
-
-    const/16 v9, 0x49
-
-    if-eq v2, v9, :cond_a
-
-    const v10, 0x1000004
-
-    const/16 v11, 0x4a
-
-    if-eq v2, v11, :cond_8
-
-    const/16 v12, 0x5a
-
-    if-eq v2, v12, :cond_a
-
-    const v13, 0x1000003
-
-    const/16 v14, 0x5b
-
-    if-eq v2, v14, :cond_0
-
-    packed-switch v2, :pswitch_data_0
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw v0
-
-    :pswitch_0
-    return v13
-
-    :cond_0
-    add-int/lit8 v2, p2, 0x1
-
-    :goto_0
-    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v15
-
-    if-ne v15, v14, :cond_1
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v14
-
-    if-eq v14, v4, :cond_7
-
-    if-eq v14, v6, :cond_6
-
-    if-eq v14, v8, :cond_5
-
-    if-eq v14, v12, :cond_4
-
-    if-eq v14, v9, :cond_3
-
-    if-eq v14, v11, :cond_2
-
-    packed-switch v14, :pswitch_data_1
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw v0
-
-    :pswitch_1
-    const v3, 0x1000003
-
-    goto :goto_1
-
-    :pswitch_2
-    const v3, 0x100000b
-
-    goto :goto_1
-
-    :pswitch_3
-    const v3, 0x100000a
-
-    goto :goto_1
-
-    :cond_2
-    const v3, 0x1000004
-
-    goto :goto_1
-
-    :cond_3
-    const v3, 0x1000001
-
-    goto :goto_1
-
-    :cond_4
-    const v3, 0x1000009
-
-    goto :goto_1
-
-    :cond_5
-    const v3, 0x100000c
-
-    goto :goto_1
-
-    :cond_6
-    add-int/lit8 v3, v2, 0x1
-
-    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
-
-    move-result v4
-
-    add-int/lit8 v4, v4, -0x1
-
-    invoke-virtual {v1, v3, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v0
-
-    or-int v3, v0, v5
-
-    :cond_7
-    :goto_1
-    sub-int v2, v2, p2
-
-    shl-int/lit8 v0, v2, 0x1c
-
-    or-int/2addr v0, v3
-
-    return v0
-
-    :cond_8
-    return v10
-
-    :cond_9
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_a
-    :pswitch_4
-    return v7
-
-    :cond_b
-    add-int/lit8 v2, p2, 0x1
-
-    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    add-int/lit8 v3, v3, -0x1
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v0
-
-    or-int/2addr v0, v5
-
-    return v0
-
-    :cond_c
-    return v3
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x42
-        :pswitch_4
-        :pswitch_4
-        :pswitch_0
-    .end packed-switch
-
-    :pswitch_data_1
-    .packed-switch 0x42
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-    .end packed-switch
-.end method
-
-.method public static g(Lp0/a/a/v;I[II)Z
-    .locals 19
-
-    move-object/from16 v0, p0
-
-    move/from16 v1, p1
-
-    aget v2, p2, p3
-
-    const/4 v3, 0x0
-
-    if-ne v2, v1, :cond_0
-
-    return v3
-
-    :cond_0
-    const v4, 0xfffffff
-
-    and-int/2addr v4, v1
-
-    const v5, 0x1000005
-
-    if-ne v4, v5, :cond_2
-
-    if-ne v2, v5, :cond_1
-
-    return v3
-
-    :cond_1
-    const v1, 0x1000005
-
-    :cond_2
-    const/4 v4, 0x1
-
-    if-nez v2, :cond_3
-
-    aput v1, p2, p3
-
-    return v4
-
-    :cond_3
-    const/high16 v6, -0x10000000
-
-    and-int v7, v2, v6
-
-    const/high16 v8, 0x1000000
-
-    const/high16 v9, 0xf000000
-
-    const/high16 v10, 0x2000000
-
-    if-nez v7, :cond_7
-
-    and-int v11, v2, v9
-
-    if-ne v11, v10, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    if-ne v2, v5, :cond_15
-
-    and-int v0, v1, v6
-
-    if-nez v0, :cond_6
-
-    and-int v0, v1, v9
-
-    if-ne v0, v10, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    const/high16 v1, 0x1000000
-
-    :cond_6
-    :goto_0
-    move v8, v1
-
-    goto/16 :goto_6
-
-    :cond_7
-    :goto_1
-    if-ne v1, v5, :cond_8
-
-    return v3
-
-    :cond_8
-    const/high16 v5, -0x1000000
-
-    and-int v11, v1, v5
-
-    and-int/2addr v5, v2
-
-    const-string v12, "java/lang/Object"
-
-    if-ne v11, v5, :cond_11
-
-    and-int v5, v2, v9
-
-    if-ne v5, v10, :cond_10
-
-    and-int v5, v1, v6
-
-    or-int/2addr v5, v10
-
-    const v6, 0xfffff
-
-    and-int/2addr v1, v6
-
-    and-int/2addr v6, v2
-
-    int-to-long v7, v1
-
-    int-to-long v9, v6
-
-    const/16 v11, 0x20
-
-    shl-long/2addr v9, v11
-
-    or-long v16, v7, v9
-
-    add-int v7, v1, v6
-
-    const/16 v8, 0x82
-
-    invoke-static {v8, v7}, Lp0/a/a/v;->r(II)I
-
-    move-result v7
-
-    invoke-virtual {v0, v7}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v9
-
-    :goto_2
-    if-eqz v9, :cond_a
-
-    iget v10, v9, Lp0/a/a/u;->b:I
-
-    if-ne v10, v8, :cond_9
-
-    iget v10, v9, Lp0/a/a/v$a;->h:I
-
-    if-ne v10, v7, :cond_9
-
-    iget-wide v10, v9, Lp0/a/a/u;->f:J
-
-    cmp-long v13, v10, v16
-
-    if-nez v13, :cond_9
-
-    iget v0, v9, Lp0/a/a/u;->g:I
-
-    goto/16 :goto_4
-
-    :cond_9
-    iget-object v9, v9, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_2
-
-    :cond_a
-    iget-object v8, v0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    aget-object v1, v8, v1
-
-    iget-object v1, v1, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    aget-object v6, v8, v6
-
-    iget-object v6, v6, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    iget-object v8, v0, Lp0/a/a/v;->a:Lp0/a/a/f;
-
-    if-eqz v8, :cond_f
-
-    const-class v8, Lp0/a/a/f;
-
-    invoke-virtual {v8}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v8
-
-    const/16 v9, 0x2e
-
-    const/16 v10, 0x2f
-
-    :try_start_0
-    invoke-virtual {v1, v10, v9}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-static {v11, v3, v8}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
-
-    move-result-object v11
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
-
-    :try_start_1
-    invoke-virtual {v6, v10, v9}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
-
-    move-result-object v13
-
-    invoke-static {v13, v3, v8}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
-
-    move-result-object v8
-    :try_end_1
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_0
-
-    invoke-virtual {v11, v8}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v13
-
-    if-eqz v13, :cond_b
-
-    move-object v12, v1
-
-    goto :goto_3
-
-    :cond_b
-    invoke-virtual {v8, v11}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_c
-
-    move-object v12, v6
-
-    goto :goto_3
-
-    :cond_c
-    invoke-virtual {v11}, Ljava/lang/Class;->isInterface()Z
-
-    move-result v1
-
-    if-nez v1, :cond_e
-
-    invoke-virtual {v8}, Ljava/lang/Class;->isInterface()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_d
-
-    goto :goto_3
-
-    :cond_d
-    invoke-virtual {v11}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
-
-    move-result-object v11
-
-    invoke-virtual {v11, v8}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_d
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v9, v10}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
-
-    move-result-object v12
-
-    :cond_e
-    :goto_3
-    invoke-virtual {v0, v12}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v1
-
-    new-instance v6, Lp0/a/a/v$a;
-
-    iget v14, v0, Lp0/a/a/v;->k:I
-
-    const/16 v15, 0x82
-
-    move-object v13, v6
-
-    move/from16 v18, v7
-
-    invoke-direct/range {v13 .. v18}, Lp0/a/a/v$a;-><init>(IIJI)V
-
-    invoke-virtual {v0, v6}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    iput v1, v6, Lp0/a/a/u;->g:I
-
-    move v0, v1
-
-    :goto_4
-    or-int v8, v5, v0
-
-    goto :goto_6
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/lang/TypeNotPresentException;
-
-    invoke-direct {v1, v6, v0}, Ljava/lang/TypeNotPresentException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    move-exception v0
-
-    new-instance v2, Ljava/lang/TypeNotPresentException;
-
-    invoke-direct {v2, v1, v0}, Ljava/lang/TypeNotPresentException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v2
-
-    :cond_f
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_10
-    and-int/2addr v1, v6
-
-    add-int/2addr v1, v6
-
-    or-int/2addr v1, v10
-
-    invoke-virtual {v0, v12}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v0
-
-    :goto_5
-    or-int v8, v1, v0
-
-    goto :goto_6
-
-    :cond_11
-    and-int v5, v1, v6
-
-    if-nez v5, :cond_12
-
-    and-int v11, v1, v9
-
-    if-ne v11, v10, :cond_15
-
-    :cond_12
-    if-eqz v5, :cond_13
-
-    and-int/2addr v1, v9
-
-    if-eq v1, v10, :cond_13
-
-    add-int/2addr v5, v6
-
-    :cond_13
-    if-eqz v7, :cond_14
-
-    and-int v1, v2, v9
-
-    if-eq v1, v10, :cond_14
-
-    add-int/2addr v7, v6
-
-    :cond_14
-    invoke-static {v5, v7}, Ljava/lang/Math;->min(II)I
-
-    move-result v1
-
-    or-int/2addr v1, v10
-
-    invoke-virtual {v0, v12}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v0
-
-    goto :goto_5
-
-    :cond_15
-    :goto_6
-    if-eq v8, v2, :cond_16
-
-    aput v8, p2, p3
-
-    return v4
-
-    :cond_16
-    return v3
-.end method
-
-
-# virtual methods
-.method public final a(Lp0/a/a/r;)V
-    .locals 14
-
-    iget-object v0, p0, Lp0/a/a/m;->b:[I
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    const/4 v4, 0x0
-
-    :goto_1
-    array-length v5, v0
-
-    const v6, 0x1000003
-
-    const v7, 0x1000004
-
-    const/4 v8, 0x2
-
-    const/4 v9, 0x1
-
-    if-ge v2, v5, :cond_3
-
-    aget v5, v0, v2
-
-    if-eq v5, v7, :cond_1
-
-    if-ne v5, v6, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    const/4 v8, 0x1
-
-    :cond_1
-    :goto_2
-    add-int/2addr v2, v8
-
-    const/high16 v6, 0x1000000
-
-    add-int/lit8 v4, v4, 0x1
-
-    if-ne v5, v6, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    add-int/2addr v3, v4
-
-    goto :goto_0
-
-    :cond_3
-    iget-object v2, p0, Lp0/a/a/m;->c:[I
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    :goto_3
-    array-length v10, v2
-
-    if-ge v4, v10, :cond_6
-
-    aget v10, v2, v4
-
-    if-eq v10, v7, :cond_5
-
-    if-ne v10, v6, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    const/4 v10, 0x1
-
-    goto :goto_5
-
-    :cond_5
-    :goto_4
-    const/4 v10, 0x2
-
-    :goto_5
-    add-int/2addr v4, v10
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_3
-
-    :cond_6
-    iget-object v4, p0, Lp0/a/a/m;->a:Lp0/a/a/p;
-
-    iget v4, v4, Lp0/a/a/p;->d:I
-
-    invoke-virtual {p1, v4, v3, v5}, Lp0/a/a/r;->A(III)I
-
-    const/4 v4, 0x3
-
-    const/4 v10, 0x0
-
-    :goto_6
-    add-int/lit8 v11, v3, -0x1
-
-    if-lez v3, :cond_9
-
-    aget v3, v0, v10
-
-    if-eq v3, v7, :cond_8
-
-    if-ne v3, v6, :cond_7
-
-    goto :goto_7
-
-    :cond_7
-    const/4 v12, 0x1
-
-    goto :goto_8
-
-    :cond_8
-    :goto_7
-    const/4 v12, 0x2
-
-    :goto_8
-    add-int/2addr v10, v12
-
-    add-int/lit8 v12, v4, 0x1
-
-    iget-object v13, p1, Lp0/a/a/r;->W:[I
-
-    aput v3, v13, v4
-
-    move v3, v11
-
-    move v4, v12
-
-    goto :goto_6
-
-    :cond_9
-    :goto_9
-    add-int/lit8 v0, v5, -0x1
-
-    if-lez v5, :cond_c
-
-    aget v3, v2, v1
-
-    if-eq v3, v7, :cond_b
-
-    if-ne v3, v6, :cond_a
-
-    goto :goto_a
-
-    :cond_a
-    const/4 v5, 0x1
-
-    goto :goto_b
-
-    :cond_b
-    :goto_a
-    const/4 v5, 0x2
-
-    :goto_b
-    add-int/2addr v1, v5
-
-    add-int/lit8 v5, v4, 0x1
-
-    iget-object v10, p1, Lp0/a/a/r;->W:[I
-
-    aput v3, v10, v4
-
-    move v4, v5
-
-    move v5, v0
-
-    goto :goto_9
-
-    :cond_c
-    invoke-virtual {p1}, Lp0/a/a/r;->z()V
-
-    return-void
-.end method
-
-.method public b(IILp0/a/a/u;Lp0/a/a/v;)V
-    .locals 16
-
-    move-object/from16 v0, p0
-
-    move/from16 v1, p1
-
-    move/from16 v2, p2
-
-    move-object/from16 v3, p3
-
-    move-object/from16 v4, p4
-
-    const v6, 0x1000002
-
-    const/high16 v7, 0x2000000
-
-    const v8, 0x1000001
-
-    const v9, 0x1000003
-
-    const v10, 0x1000004
-
-    const/high16 v11, 0x1000000
-
-    packed-switch v1, :pswitch_data_0
-
-    packed-switch v1, :pswitch_data_1
-
-    const/high16 v12, 0x5000000
-
-    const/high16 v14, 0x4000000
-
-    const/high16 v15, 0xf000000
-
-    const/4 v5, 0x2
-
-    const/4 v13, 0x1
-
-    packed-switch v1, :pswitch_data_2
-
-    const/16 v14, 0x5b
-
-    const/4 v15, 0x0
-
-    const/4 v12, 0x4
-
-    packed-switch v1, :pswitch_data_3
-
-    packed-switch v1, :pswitch_data_4
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw v1
-
-    :pswitch_0
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->j(I)V
-
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :pswitch_1
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    if-ne v2, v14, :cond_0
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :cond_0
-    invoke-virtual {v4, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v1
-
-    or-int/2addr v1, v7
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_2
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    if-ne v2, v14, :cond_1
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v14}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :cond_1
-    const/high16 v2, 0x12000000
-
-    invoke-virtual {v4, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v1
-
-    or-int/2addr v1, v2
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_3
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    packed-switch v2, :pswitch_data_5
-
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {v1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw v1
-
-    :pswitch_4
-    const v1, 0x11000004
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_5
-    const v1, 0x11000001
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_6
-    const v1, 0x1100000c
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_7
-    const v1, 0x1100000a
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_8
-    const v1, 0x11000003
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_9
-    const v1, 0x11000002
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_a
-    const v1, 0x1100000b
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_b
-    const v1, 0x11000009
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_c
-    const/high16 v1, 0x3000000
-
-    iget-object v3, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v4, v3, v2}, Lp0/a/a/v;->p(Ljava/lang/String;I)I
-
-    move-result v2
-
-    or-int/2addr v1, v2
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_d
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->k(Ljava/lang/String;)V
-
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :pswitch_e
-    iget-object v2, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->k(Ljava/lang/String;)V
-
-    const/16 v2, 0xb8
-
-    if-eq v1, v2, :cond_4
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v2
-
-    const/16 v6, 0xb7
-
-    if-ne v1, v6, :cond_4
-
-    iget-object v1, v3, Lp0/a/a/u;->d:Ljava/lang/String;
-
-    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v6, 0x3c
-
-    if-ne v1, v6, :cond_4
-
-    iget-object v1, v0, Lp0/a/a/m;->i:[I
-
-    if-nez v1, :cond_2
-
-    new-array v1, v5, [I
-
-    iput-object v1, v0, Lp0/a/a/m;->i:[I
-
-    :cond_2
-    iget-object v1, v0, Lp0/a/a/m;->i:[I
-
-    array-length v1, v1
-
-    iget v5, v0, Lp0/a/a/m;->h:I
-
-    if-lt v5, v1, :cond_3
-
-    add-int/2addr v5, v13
-
-    mul-int/lit8 v6, v1, 0x2
-
-    invoke-static {v5, v6}, Ljava/lang/Math;->max(II)I
-
-    move-result v5
-
-    new-array v5, v5, [I
-
-    iget-object v6, v0, Lp0/a/a/m;->i:[I
-
-    invoke-static {v6, v15, v5, v15, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v5, v0, Lp0/a/a/m;->i:[I
-
-    :cond_3
-    iget-object v1, v0, Lp0/a/a/m;->i:[I
-
-    iget v5, v0, Lp0/a/a/m;->h:I
-
-    add-int/lit8 v6, v5, 0x1
-
-    iput v6, v0, Lp0/a/a/m;->h:I
-
-    aput v2, v1, v5
-
-    :cond_4
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :pswitch_f
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->k(Ljava/lang/String;)V
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    goto/16 :goto_3
-
-    :pswitch_10
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :pswitch_11
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->k(Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :pswitch_12
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto/16 :goto_3
-
-    :pswitch_13
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    const-string v2, "JSR/RET are not supported with computeFrames option"
-
-    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :pswitch_14
-    invoke-virtual {v0, v12}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v8}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_15
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v8}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_16
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v9}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_17
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v6}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_18
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v10}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_19
-    invoke-virtual {v0, v2, v8}, Lp0/a/a/m;->o(II)V
-
-    goto/16 :goto_3
-
-    :pswitch_1a
-    const/4 v1, 0x3
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v10}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_1b
-    invoke-virtual {v0, v12}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v9}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_1c
-    invoke-virtual {v0, v12}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v10}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_1d
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v2
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_1e
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v2
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v3
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v4
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v4}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v3}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_1f
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v2
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v3
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v3}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_20
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v2
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_21
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v2
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v3
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v3}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_22
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v2
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_23
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_24
-    invoke-virtual {v0, v5}, Lp0/a/a/m;->j(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_25
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_26
-    invoke-virtual {v0, v12}, Lp0/a/a/m;->j(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_27
-    const/4 v1, 0x3
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->j(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_28
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual {v0, v2, v1}, Lp0/a/a/m;->o(II)V
-
-    add-int/lit8 v1, v2, 0x1
-
-    invoke-virtual {v0, v1, v11}, Lp0/a/a/m;->o(II)V
-
-    if-lez v2, :cond_c
-
-    add-int/lit8 v1, v2, -0x1
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->f(I)I
-
-    move-result v2
-
-    if-eq v2, v10, :cond_7
-
-    if-ne v2, v9, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    and-int v3, v2, v15
-
-    if-eq v3, v14, :cond_6
-
-    if-ne v3, v12, :cond_c
-
-    :cond_6
-    const/high16 v3, 0x100000
-
-    or-int/2addr v2, v3
-
-    invoke-virtual {v0, v1, v2}, Lp0/a/a/m;->o(II)V
-
-    goto/16 :goto_3
-
-    :cond_7
-    :goto_0
-    invoke-virtual {v0, v1, v11}, Lp0/a/a/m;->o(II)V
-
-    goto/16 :goto_3
-
-    :pswitch_29
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    invoke-virtual {v0, v2, v1}, Lp0/a/a/m;->o(II)V
-
-    if-lez v2, :cond_c
-
-    add-int/lit8 v1, v2, -0x1
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->f(I)I
-
-    move-result v2
-
-    if-eq v2, v10, :cond_a
-
-    if-ne v2, v9, :cond_8
-
-    goto :goto_1
-
-    :cond_8
-    and-int v3, v2, v15
-
-    if-eq v3, v14, :cond_9
-
-    if-ne v3, v12, :cond_c
-
-    :cond_9
-    const/high16 v3, 0x100000
-
-    or-int/2addr v2, v3
-
-    invoke-virtual {v0, v1, v2}, Lp0/a/a/m;->o(II)V
-
-    goto/16 :goto_3
-
-    :cond_a
-    :goto_1
-    invoke-virtual {v0, v1, v11}, Lp0/a/a/m;->o(II)V
-
-    goto/16 :goto_3
-
-    :pswitch_2a
-    invoke-virtual {v0, v13}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual/range {p0 .. p0}, Lp0/a/a/m;->i()I
-
-    move-result v1
-
-    const v2, 0x1000005
-
-    if-ne v1, v2, :cond_b
-
-    goto :goto_2
-
-    :cond_b
-    const/high16 v2, -0x10000000
-
-    add-int/2addr v1, v2
-
-    :goto_2
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_2b
-    invoke-virtual {v0, v5}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v9}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_2c
-    invoke-virtual {v0, v5}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v6}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_2d
-    invoke-virtual {v0, v5}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v10}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_2e
-    invoke-virtual {v0, v5}, Lp0/a/a/m;->j(I)V
-
-    invoke-virtual {v0, v8}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_2f
-    invoke-virtual {v0, v2}, Lp0/a/a/m;->f(I)I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto/16 :goto_3
-
-    :pswitch_30
-    iget v1, v3, Lp0/a/a/u;->b:I
-
-    packed-switch v1, :pswitch_data_6
-
-    packed-switch v1, :pswitch_data_7
-
-    new-instance v1, Ljava/lang/AssertionError;
-
-    invoke-direct {v1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v1
-
-    :pswitch_31
-    iget-object v1, v3, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v4, v1}, Lp0/a/a/m;->m(Lp0/a/a/v;Ljava/lang/String;)V
-
-    goto :goto_3
-
-    :pswitch_32
-    const-string v1, "java/lang/invoke/MethodType"
-
-    invoke-virtual {v4, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v1
-
-    or-int/2addr v1, v7
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_33
-    const-string v1, "java/lang/invoke/MethodHandle"
-
-    invoke-virtual {v4, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v1
-
-    or-int/2addr v1, v7
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_34
-    const-string v1, "java/lang/String"
-
-    invoke-virtual {v4, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v1
-
-    or-int/2addr v1, v7
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_35
-    const-string v1, "java/lang/Class"
-
-    invoke-virtual {v4, v1}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v1
-
-    or-int/2addr v1, v7
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_36
-    invoke-virtual {v0, v9}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_37
-    invoke-virtual {v0, v10}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_38
-    invoke-virtual {v0, v6}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_39
-    invoke-virtual {v0, v8}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_3a
-    invoke-virtual {v0, v9}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_3b
-    invoke-virtual {v0, v6}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_3c
-    invoke-virtual {v0, v10}, Lp0/a/a/m;->l(I)V
-
-    invoke-virtual {v0, v11}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_3d
-    invoke-virtual {v0, v8}, Lp0/a/a/m;->l(I)V
-
-    goto :goto_3
-
-    :pswitch_3e
-    const v1, 0x1000005
-
-    invoke-virtual {v0, v1}, Lp0/a/a/m;->l(I)V
-
-    :cond_c
-    :goto_3
-    :pswitch_3f
-    return-void
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_3f
-        :pswitch_3e
-        :pswitch_3d
-        :pswitch_3d
-        :pswitch_3d
-        :pswitch_3d
-        :pswitch_3d
-        :pswitch_3d
-        :pswitch_3d
-        :pswitch_3c
-        :pswitch_3c
-        :pswitch_3b
-        :pswitch_3b
-        :pswitch_3b
-        :pswitch_3a
-        :pswitch_3a
-        :pswitch_3d
-        :pswitch_3d
-        :pswitch_30
-    .end packed-switch
-
-    :pswitch_data_1
-    .packed-switch 0x15
-        :pswitch_3d
-        :pswitch_3c
-        :pswitch_3b
-        :pswitch_3a
-        :pswitch_2f
-    .end packed-switch
-
-    :pswitch_data_2
-    .packed-switch 0x2e
-        :pswitch_2e
-        :pswitch_2d
-        :pswitch_2c
-        :pswitch_2b
-        :pswitch_2a
-        :pswitch_2e
-        :pswitch_2e
-        :pswitch_2e
-        :pswitch_29
-        :pswitch_28
-        :pswitch_29
-        :pswitch_28
-        :pswitch_29
-    .end packed-switch
-
-    :pswitch_data_3
-    .packed-switch 0x4f
-        :pswitch_27
-        :pswitch_26
-        :pswitch_27
-        :pswitch_26
-        :pswitch_27
-        :pswitch_27
-        :pswitch_27
-        :pswitch_27
-        :pswitch_25
-        :pswitch_24
-        :pswitch_23
-        :pswitch_22
-        :pswitch_21
-        :pswitch_20
-        :pswitch_1f
-        :pswitch_1e
-        :pswitch_1d
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_2c
-        :pswitch_1b
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_2c
-        :pswitch_1b
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_2c
-        :pswitch_1b
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_2c
-        :pswitch_1b
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_2c
-        :pswitch_1b
-        :pswitch_3f
-        :pswitch_3f
-        :pswitch_3f
-        :pswitch_3f
-        :pswitch_2e
-        :pswitch_1a
-        :pswitch_2e
-        :pswitch_1a
-        :pswitch_2e
-        :pswitch_1a
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_2e
-        :pswitch_1c
-        :pswitch_19
-        :pswitch_18
-        :pswitch_17
-        :pswitch_16
-        :pswitch_2e
-        :pswitch_2c
-        :pswitch_2b
-        :pswitch_15
-        :pswitch_18
-        :pswitch_16
-        :pswitch_2e
-        :pswitch_2d
-        :pswitch_2c
-        :pswitch_3f
-        :pswitch_3f
-        :pswitch_3f
-        :pswitch_14
-        :pswitch_2e
-        :pswitch_2e
-        :pswitch_14
-        :pswitch_14
-        :pswitch_25
-        :pswitch_25
-        :pswitch_25
-        :pswitch_25
-        :pswitch_25
-        :pswitch_25
-        :pswitch_24
-        :pswitch_24
-        :pswitch_24
-        :pswitch_24
-        :pswitch_24
-        :pswitch_24
-        :pswitch_24
-        :pswitch_24
-        :pswitch_3f
-        :pswitch_13
-        :pswitch_13
-        :pswitch_25
-        :pswitch_25
-        :pswitch_25
-        :pswitch_24
-        :pswitch_25
-        :pswitch_24
-        :pswitch_25
-        :pswitch_3f
-        :pswitch_12
-        :pswitch_11
-        :pswitch_10
-        :pswitch_f
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_e
-        :pswitch_d
-        :pswitch_c
-        :pswitch_3
-        :pswitch_2
-        :pswitch_15
-        :pswitch_25
-        :pswitch_1
-        :pswitch_15
-        :pswitch_25
-        :pswitch_25
-    .end packed-switch
-
-    :pswitch_data_4
-    .packed-switch 0xc5
-        :pswitch_0
-        :pswitch_25
-        :pswitch_25
-    .end packed-switch
-
-    :pswitch_data_5
-    .packed-switch 0x4
-        :pswitch_b
-        :pswitch_a
-        :pswitch_9
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-    .end packed-switch
-
-    :pswitch_data_6
-    .packed-switch 0x3
-        :pswitch_39
-        :pswitch_38
-        :pswitch_37
-        :pswitch_36
-        :pswitch_35
-        :pswitch_34
-    .end packed-switch
-
-    :pswitch_data_7
-    .packed-switch 0xf
-        :pswitch_33
-        :pswitch_32
-        :pswitch_31
-    .end packed-switch
-.end method
-
-.method public final e(Lp0/a/a/v;I)I
-    .locals 8
-
-    const v0, 0x1000006
-
-    if-eq p2, v0, :cond_0
-
-    const/high16 v1, -0x1000000
-
-    and-int/2addr v1, p2
-
-    const/high16 v2, 0x3000000
-
-    if-ne v1, v2, :cond_5
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    iget v2, p0, Lp0/a/a/m;->h:I
-
-    if-ge v1, v2, :cond_5
-
-    iget-object v2, p0, Lp0/a/a/m;->i:[I
-
-    aget v2, v2, v1
-
-    const/high16 v3, -0x10000000
-
-    and-int/2addr v3, v2
-
-    const/high16 v4, 0xf000000
-
-    and-int/2addr v4, v2
-
-    const v5, 0xfffff
-
-    and-int v6, v2, v5
-
-    const/high16 v7, 0x4000000
-
-    if-ne v4, v7, :cond_1
-
-    iget-object v2, p0, Lp0/a/a/m;->b:[I
-
-    aget v2, v2, v6
-
-    :goto_1
-    add-int/2addr v2, v3
-
-    goto :goto_2
-
-    :cond_1
-    const/high16 v7, 0x5000000
-
-    if-ne v4, v7, :cond_2
-
-    iget-object v2, p0, Lp0/a/a/m;->c:[I
-
-    array-length v4, v2
-
-    sub-int/2addr v4, v6
-
-    aget v2, v2, v4
-
-    goto :goto_1
-
-    :cond_2
-    :goto_2
-    if-ne p2, v2, :cond_4
-
-    const/high16 v1, 0x2000000
-
-    if-ne p2, v0, :cond_3
-
-    iget-object p2, p1, Lp0/a/a/v;->d:Ljava/lang/String;
-
-    invoke-virtual {p1, p2}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result p1
-
-    :goto_3
-    or-int/2addr p1, v1
-
-    return p1
-
-    :cond_3
-    and-int/2addr p2, v5
-
-    iget-object v0, p1, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    aget-object p2, v0, p2
-
-    iget-object p2, p2, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {p1, p2}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result p1
-
-    goto :goto_3
-
-    :cond_4
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_5
-    return p2
-.end method
-
-.method public final f(I)I
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/m;->d:[I
-
-    const/high16 v1, 0x4000000
-
-    if-eqz v0, :cond_2
-
-    array-length v2, v0
-
-    if-lt p1, v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    aget v2, v0, p1
-
-    if-nez v2, :cond_1
-
-    or-int v2, p1, v1
-
-    aput v2, v0, p1
-
-    :cond_1
-    return v2
-
-    :cond_2
-    :goto_0
-    or-int/2addr p1, v1
-
-    return p1
-.end method
-
-.method public final h(Lp0/a/a/v;Lp0/a/a/m;I)Z
-    .locals 19
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    move-object/from16 v2, p2
-
-    move/from16 v3, p3
-
-    iget-object v4, v0, Lp0/a/a/m;->b:[I
-
-    array-length v4, v4
-
-    iget-object v5, v0, Lp0/a/a/m;->c:[I
-
-    array-length v5, v5
-
-    iget-object v6, v2, Lp0/a/a/m;->b:[I
-
-    if-nez v6, :cond_0
-
-    new-array v6, v4, [I
-
-    iput-object v6, v2, Lp0/a/a/m;->b:[I
-
-    const/4 v6, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v6, 0x0
-
-    :goto_0
-    const/4 v9, 0x0
-
-    :goto_1
-    const/high16 v10, 0x5000000
-
-    const/high16 v11, 0x4000000
-
-    const/high16 v12, 0xf000000
-
-    const/high16 v13, -0x10000000
-
-    const v14, 0x1000003
-
-    const v15, 0x1000004
-
-    const/high16 v16, 0x100000
-
-    const v17, 0xfffff
-
-    if-ge v9, v4, :cond_8
-
-    iget-object v7, v0, Lp0/a/a/m;->d:[I
-
-    if-eqz v7, :cond_6
-
-    array-length v8, v7
-
-    if-ge v9, v8, :cond_6
-
-    aget v7, v7, v9
-
-    if-nez v7, :cond_1
-
-    iget-object v7, v0, Lp0/a/a/m;->b:[I
-
-    aget v15, v7, v9
-
-    goto :goto_3
-
-    :cond_1
-    and-int v8, v7, v13
-
-    and-int/2addr v12, v7
-
-    if-ne v12, v11, :cond_4
-
-    iget-object v10, v0, Lp0/a/a/m;->b:[I
-
-    and-int v11, v7, v17
-
-    aget v10, v10, v11
-
-    add-int/2addr v8, v10
-
-    and-int v7, v7, v16
-
-    if-eqz v7, :cond_3
-
-    if-eq v8, v15, :cond_2
-
-    if-ne v8, v14, :cond_3
-
-    :cond_2
-    :goto_2
-    const/high16 v15, 0x1000000
-
-    goto :goto_3
-
-    :cond_3
-    move v15, v8
-
-    goto :goto_3
-
-    :cond_4
-    if-ne v12, v10, :cond_5
-
-    iget-object v10, v0, Lp0/a/a/m;->c:[I
-
-    and-int v11, v7, v17
-
-    sub-int v11, v5, v11
-
-    aget v10, v10, v11
-
-    add-int/2addr v8, v10
-
-    and-int v7, v7, v16
-
-    if-eqz v7, :cond_3
-
-    if-eq v8, v15, :cond_2
-
-    if-ne v8, v14, :cond_3
-
-    goto :goto_2
-
-    :cond_5
-    move v15, v7
-
-    goto :goto_3
-
-    :cond_6
-    iget-object v7, v0, Lp0/a/a/m;->b:[I
-
-    aget v15, v7, v9
-
-    :goto_3
-    iget-object v7, v0, Lp0/a/a/m;->i:[I
-
-    if-eqz v7, :cond_7
-
-    invoke-virtual {v0, v1, v15}, Lp0/a/a/m;->e(Lp0/a/a/v;I)I
-
-    move-result v15
-
-    :cond_7
-    iget-object v7, v2, Lp0/a/a/m;->b:[I
-
-    invoke-static {v1, v15, v7, v9}, Lp0/a/a/m;->g(Lp0/a/a/v;I[II)Z
-
-    move-result v7
-
-    or-int/2addr v6, v7
-
-    add-int/lit8 v9, v9, 0x1
-
-    goto :goto_1
-
-    :cond_8
-    if-lez v3, :cond_b
-
-    const/4 v5, 0x0
-
-    :goto_4
-    if-ge v5, v4, :cond_9
-
-    iget-object v7, v0, Lp0/a/a/m;->b:[I
-
-    aget v7, v7, v5
-
-    iget-object v8, v2, Lp0/a/a/m;->b:[I
-
-    invoke-static {v1, v7, v8, v5}, Lp0/a/a/m;->g(Lp0/a/a/v;I[II)Z
-
-    move-result v7
-
-    or-int/2addr v6, v7
-
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_4
-
-    :cond_9
-    iget-object v4, v2, Lp0/a/a/m;->c:[I
-
-    if-nez v4, :cond_a
-
-    const/4 v4, 0x1
-
-    new-array v5, v4, [I
-
-    iput-object v5, v2, Lp0/a/a/m;->c:[I
-
-    const/4 v8, 0x1
-
-    goto :goto_5
-
-    :cond_a
-    move v8, v6
-
-    :goto_5
-    iget-object v2, v2, Lp0/a/a/m;->c:[I
-
-    const/4 v7, 0x0
-
-    invoke-static {v1, v3, v2, v7}, Lp0/a/a/m;->g(Lp0/a/a/v;I[II)Z
-
-    move-result v1
-
-    or-int/2addr v1, v8
-
-    return v1
-
-    :cond_b
-    const/4 v4, 0x1
-
-    const/4 v7, 0x0
-
-    iget-object v3, v0, Lp0/a/a/m;->c:[I
-
-    array-length v3, v3
-
-    iget-short v8, v0, Lp0/a/a/m;->f:S
-
-    add-int/2addr v3, v8
-
-    iget-object v8, v2, Lp0/a/a/m;->c:[I
-
-    if-nez v8, :cond_c
-
-    iget-short v6, v0, Lp0/a/a/m;->g:S
-
-    add-int/2addr v6, v3
-
-    new-array v6, v6, [I
-
-    iput-object v6, v2, Lp0/a/a/m;->c:[I
-
-    const/4 v8, 0x1
-
-    goto :goto_6
-
-    :cond_c
-    move v8, v6
-
-    :goto_6
-    const/4 v4, 0x0
-
-    :goto_7
-    if-ge v4, v3, :cond_e
-
-    iget-object v6, v0, Lp0/a/a/m;->c:[I
-
-    aget v6, v6, v4
-
-    iget-object v9, v0, Lp0/a/a/m;->i:[I
-
-    if-eqz v9, :cond_d
-
-    invoke-virtual {v0, v1, v6}, Lp0/a/a/m;->e(Lp0/a/a/v;I)I
-
-    move-result v6
-
-    :cond_d
-    iget-object v9, v2, Lp0/a/a/m;->c:[I
-
-    invoke-static {v1, v6, v9, v4}, Lp0/a/a/m;->g(Lp0/a/a/v;I[II)Z
-
-    move-result v6
-
-    or-int/2addr v8, v6
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_7
-
-    :cond_e
-    :goto_8
-    iget-short v4, v0, Lp0/a/a/m;->g:S
-
-    if-ge v7, v4, :cond_14
-
-    iget-object v4, v0, Lp0/a/a/m;->e:[I
-
-    aget v4, v4, v7
-
-    and-int v6, v4, v13
-
-    and-int v9, v4, v12
-
-    if-ne v9, v11, :cond_11
-
-    iget-object v9, v0, Lp0/a/a/m;->b:[I
-
-    and-int v18, v4, v17
-
-    aget v9, v9, v18
-
-    add-int/2addr v6, v9
-
-    and-int v4, v4, v16
-
-    if-eqz v4, :cond_10
-
-    if-eq v6, v15, :cond_f
-
-    if-ne v6, v14, :cond_10
-
-    :cond_f
-    :goto_9
-    const/high16 v4, 0x1000000
-
-    goto :goto_a
-
-    :cond_10
-    move v4, v6
-
-    goto :goto_a
-
-    :cond_11
-    if-ne v9, v10, :cond_12
-
-    iget-object v9, v0, Lp0/a/a/m;->c:[I
-
-    and-int v18, v4, v17
-
-    sub-int v18, v5, v18
-
-    aget v9, v9, v18
-
-    add-int/2addr v6, v9
-
-    and-int v4, v4, v16
-
-    if-eqz v4, :cond_10
-
-    if-eq v6, v15, :cond_f
-
-    if-ne v6, v14, :cond_10
-
-    goto :goto_9
-
-    :cond_12
-    :goto_a
-    iget-object v6, v0, Lp0/a/a/m;->i:[I
-
-    if-eqz v6, :cond_13
-
-    invoke-virtual {v0, v1, v4}, Lp0/a/a/m;->e(Lp0/a/a/v;I)I
-
-    move-result v4
-
-    :cond_13
-    iget-object v6, v2, Lp0/a/a/m;->c:[I
-
-    add-int v9, v3, v7
-
-    invoke-static {v1, v4, v6, v9}, Lp0/a/a/m;->g(Lp0/a/a/v;I[II)Z
-
-    move-result v4
-
-    or-int/2addr v8, v4
-
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_8
-
-    :cond_14
-    return v8
-.end method
-
-.method public final i()I
-    .locals 2
-
-    iget-short v0, p0, Lp0/a/a/m;->g:S
-
-    if-lez v0, :cond_0
-
-    iget-object v1, p0, Lp0/a/a/m;->e:[I
-
-    add-int/lit8 v0, v0, -0x1
-
-    int-to-short v0, v0
-
-    iput-short v0, p0, Lp0/a/a/m;->g:S
-
-    aget v0, v1, v0
-
-    return v0
-
-    :cond_0
-    const/high16 v0, 0x5000000
-
-    iget-short v1, p0, Lp0/a/a/m;->f:S
-
-    add-int/lit8 v1, v1, -0x1
-
-    int-to-short v1, v1
-
-    iput-short v1, p0, Lp0/a/a/m;->f:S
-
-    neg-int v1, v1
-
-    or-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final j(I)V
-    .locals 2
-
-    iget-short v0, p0, Lp0/a/a/m;->g:S
-
-    if-lt v0, p1, :cond_0
-
-    sub-int/2addr v0, p1
-
-    int-to-short p1, v0
-
-    iput-short p1, p0, Lp0/a/a/m;->g:S
-
-    goto :goto_0
-
-    :cond_0
-    iget-short v1, p0, Lp0/a/a/m;->f:S
-
-    sub-int/2addr p1, v0
-
-    sub-int/2addr v1, p1
-
-    int-to-short p1, v1
-
-    iput-short p1, p0, Lp0/a/a/m;->f:S
-
-    const/4 p1, 0x0
-
-    iput-short p1, p0, Lp0/a/a/m;->g:S
-
-    :goto_0
-    return-void
-.end method
-
-.method public final k(Ljava/lang/String;)V
-    .locals 4
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x2
-
-    const/16 v3, 0x28
-
-    if-ne v0, v3, :cond_0
-
-    invoke-static {p1}, Lp0/a/a/w;->b(Ljava/lang/String;)I
-
-    move-result p1
-
-    shr-int/2addr p1, v2
-
-    sub-int/2addr p1, v1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/m;->j(I)V
-
-    goto :goto_1
-
-    :cond_0
-    const/16 p1, 0x4a
-
-    if-eq v0, p1, :cond_2
-
-    const/16 p1, 0x44
-
-    if-ne v0, p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0, v1}, Lp0/a/a/m;->j(I)V
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    invoke-virtual {p0, v2}, Lp0/a/a/m;->j(I)V
-
-    :goto_1
-    return-void
-.end method
-
-.method public final l(I)V
-    .locals 4
-
-    iget-object v0, p0, Lp0/a/a/m;->e:[I
-
-    if-nez v0, :cond_0
-
-    const/16 v0, 0xa
-
-    new-array v0, v0, [I
-
-    iput-object v0, p0, Lp0/a/a/m;->e:[I
-
-    :cond_0
-    iget-object v0, p0, Lp0/a/a/m;->e:[I
-
-    array-length v0, v0
-
-    iget-short v1, p0, Lp0/a/a/m;->g:S
-
-    if-lt v1, v0, :cond_1
-
-    add-int/lit8 v1, v1, 0x1
-
-    mul-int/lit8 v2, v0, 0x2
-
-    invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
-
-    move-result v1
-
-    new-array v1, v1, [I
-
-    iget-object v2, p0, Lp0/a/a/m;->e:[I
-
-    const/4 v3, 0x0
-
-    invoke-static {v2, v3, v1, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v1, p0, Lp0/a/a/m;->e:[I
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/m;->e:[I
-
-    iget-short v1, p0, Lp0/a/a/m;->g:S
-
-    add-int/lit8 v2, v1, 0x1
-
-    int-to-short v2, v2
-
-    iput-short v2, p0, Lp0/a/a/m;->g:S
-
-    aput p1, v0, v1
-
-    iget-short p1, p0, Lp0/a/a/m;->f:S
-
-    add-int/2addr p1, v2
-
-    int-to-short p1, p1
-
-    iget-object v0, p0, Lp0/a/a/m;->a:Lp0/a/a/p;
-
-    iget-short v1, v0, Lp0/a/a/p;->h:S
-
-    if-le p1, v1, :cond_2
-
-    iput-short p1, v0, Lp0/a/a/p;->h:S
-
-    :cond_2
-    return-void
-.end method
-
-.method public final m(Lp0/a/a/v;Ljava/lang/String;)V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p2, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v2, 0x28
-
-    if-ne v1, v2, :cond_0
-
-    const/16 v0, 0x29
-
-    invoke-virtual {p2, v0}, Ljava/lang/String;->indexOf(I)I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    :cond_0
-    invoke-static {p1, p2, v0}, Lp0/a/a/m;->d(Lp0/a/a/v;Ljava/lang/String;I)I
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0, p1}, Lp0/a/a/m;->l(I)V
-
-    const p2, 0x1000004
-
-    if-eq p1, p2, :cond_1
-
-    const p2, 0x1000003
-
-    if-ne p1, p2, :cond_2
-
-    :cond_1
-    const/high16 p1, 0x1000000
-
-    invoke-virtual {p0, p1}, Lp0/a/a/m;->l(I)V
-
-    :cond_2
-    return-void
-.end method
-
-.method public final n(Lp0/a/a/v;ILjava/lang/String;I)V
-    .locals 7
-
-    new-array v0, p4, [I
-
-    iput-object v0, p0, Lp0/a/a/m;->b:[I
-
-    const/4 v1, 0x0
-
-    new-array v2, v1, [I
-
-    iput-object v2, p0, Lp0/a/a/m;->c:[I
-
-    and-int/lit8 v2, p2, 0x8
-
-    const/4 v3, 0x1
-
-    if-nez v2, :cond_1
-
-    const/high16 v2, 0x40000
-
-    and-int/2addr p2, v2
-
-    if-nez p2, :cond_0
-
-    const/high16 p2, 0x2000000
-
-    iget-object v2, p1, Lp0/a/a/v;->d:Ljava/lang/String;
-
-    invoke-virtual {p1, v2}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v2
-
-    or-int/2addr p2, v2
-
-    aput p2, v0, v1
-
-    goto :goto_0
-
-    :cond_0
-    const p2, 0x1000006
-
-    aput p2, v0, v1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v3, 0x0
-
-    :goto_0
-    invoke-static {p3}, Lp0/a/a/w;->a(Ljava/lang/String;)[Lp0/a/a/w;
-
-    move-result-object p2
-
-    array-length p3, p2
-
-    const/4 v0, 0x0
-
-    :goto_1
-    const/high16 v2, 0x1000000
-
-    if-ge v0, p3, :cond_4
-
-    aget-object v4, p2, v0
-
-    invoke-virtual {v4}, Lp0/a/a/w;->d()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-static {p1, v4, v1}, Lp0/a/a/m;->d(Lp0/a/a/v;Ljava/lang/String;I)I
-
-    move-result v4
-
-    iget-object v5, p0, Lp0/a/a/m;->b:[I
-
-    add-int/lit8 v6, v3, 0x1
-
-    aput v4, v5, v3
-
-    const v3, 0x1000004
-
-    if-eq v4, v3, :cond_3
-
-    const v3, 0x1000003
-
-    if-ne v4, v3, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    move v3, v6
-
-    goto :goto_3
-
-    :cond_3
-    :goto_2
-    iget-object v3, p0, Lp0/a/a/m;->b:[I
-
-    add-int/lit8 v4, v6, 0x1
-
-    aput v2, v3, v6
-
-    move v3, v4
-
-    :goto_3
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    :goto_4
-    if-ge v3, p4, :cond_5
-
-    iget-object p1, p0, Lp0/a/a/m;->b:[I
-
-    add-int/lit8 p2, v3, 0x1
-
-    aput v2, p1, v3
-
-    move v3, p2
-
-    goto :goto_4
-
-    :cond_5
-    return-void
-.end method
-
-.method public final o(II)V
-    .locals 4
-
-    iget-object v0, p0, Lp0/a/a/m;->d:[I
-
-    if-nez v0, :cond_0
-
-    const/16 v0, 0xa
-
-    new-array v0, v0, [I
-
-    iput-object v0, p0, Lp0/a/a/m;->d:[I
-
-    :cond_0
-    iget-object v0, p0, Lp0/a/a/m;->d:[I
-
-    array-length v0, v0
-
-    if-lt p1, v0, :cond_1
-
-    add-int/lit8 v1, p1, 0x1
-
-    mul-int/lit8 v2, v0, 0x2
-
-    invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
-
-    move-result v1
-
-    new-array v1, v1, [I
-
-    iget-object v2, p0, Lp0/a/a/m;->d:[I
-
-    const/4 v3, 0x0
-
-    invoke-static {v2, v3, v1, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v1, p0, Lp0/a/a/m;->d:[I
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/m;->d:[I
-
-    aput p2, v0, p1
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/n.smali b/com.discord/smali_classes2/p0/a/a/n.smali
deleted file mode 100644
index 49d6acf396..0000000000
--- a/com.discord/smali_classes2/p0/a/a/n.smali
+++ /dev/null
@@ -1,211 +0,0 @@
-.class public final Lp0/a/a/n;
-.super Ljava/lang/Object;
-.source "Handle.java"
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:Ljava/lang/String;
-
-.field public final c:Ljava/lang/String;
-
-.field public final d:Ljava/lang/String;
-
-.field public final e:Z
-
-
-# direct methods
-.method public constructor <init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lp0/a/a/n;->a:I
-
-    iput-object p2, p0, Lp0/a/a/n;->b:Ljava/lang/String;
-
-    iput-object p3, p0, Lp0/a/a/n;->c:Ljava/lang/String;
-
-    iput-object p4, p0, Lp0/a/a/n;->d:Ljava/lang/String;
-
-    iput-boolean p5, p0, Lp0/a/a/n;->e:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Lp0/a/a/n;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p1, Lp0/a/a/n;
-
-    iget v1, p0, Lp0/a/a/n;->a:I
-
-    iget v3, p1, Lp0/a/a/n;->a:I
-
-    if-ne v1, v3, :cond_2
-
-    iget-boolean v1, p0, Lp0/a/a/n;->e:Z
-
-    iget-boolean v3, p1, Lp0/a/a/n;->e:Z
-
-    if-ne v1, v3, :cond_2
-
-    iget-object v1, p0, Lp0/a/a/n;->b:Ljava/lang/String;
-
-    iget-object v3, p1, Lp0/a/a/n;->b:Ljava/lang/String;
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lp0/a/a/n;->c:Ljava/lang/String;
-
-    iget-object v3, p1, Lp0/a/a/n;->c:Ljava/lang/String;
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, p0, Lp0/a/a/n;->d:Ljava/lang/String;
-
-    iget-object p1, p1, Lp0/a/a/n;->d:Ljava/lang/String;
-
-    invoke-virtual {v1, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget v0, p0, Lp0/a/a/n;->a:I
-
-    iget-boolean v1, p0, Lp0/a/a/n;->e:Z
-
-    if-eqz v1, :cond_0
-
-    const/16 v1, 0x40
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    add-int/2addr v0, v1
-
-    iget-object v1, p0, Lp0/a/a/n;->b:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    iget-object v2, p0, Lp0/a/a/n;->c:Ljava/lang/String;
-
-    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
-
-    move-result v2
-
-    mul-int v2, v2, v1
-
-    iget-object v1, p0, Lp0/a/a/n;->d:Ljava/lang/String;
-
-    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    mul-int v1, v1, v2
-
-    add-int/2addr v1, v0
-
-    return v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lp0/a/a/n;->b:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x2e
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lp0/a/a/n;->c:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lp0/a/a/n;->d:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " ("
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lp0/a/a/n;->a:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lp0/a/a/n;->e:Z
-
-    if-eqz v1, :cond_0
-
-    const-string v1, " itf"
-
-    goto :goto_0
-
-    :cond_0
-    const-string v1, ""
-
-    :goto_0
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x29
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/o.smali b/com.discord/smali_classes2/p0/a/a/o.smali
deleted file mode 100644
index 95cd9d8f68..0000000000
--- a/com.discord/smali_classes2/p0/a/a/o.smali
+++ /dev/null
@@ -1,160 +0,0 @@
-.class public final Lp0/a/a/o;
-.super Ljava/lang/Object;
-.source "Handler.java"
-
-
-# instance fields
-.field public final a:Lp0/a/a/p;
-
-.field public final b:Lp0/a/a/p;
-
-.field public final c:Lp0/a/a/p;
-
-.field public final d:I
-
-.field public final e:Ljava/lang/String;
-
-.field public f:Lp0/a/a/o;
-
-
-# direct methods
-.method public constructor <init>(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)V
-    .locals 3
-
-    iget-object v0, p1, Lp0/a/a/o;->c:Lp0/a/a/p;
-
-    iget v1, p1, Lp0/a/a/o;->d:I
-
-    iget-object v2, p1, Lp0/a/a/o;->e:Ljava/lang/String;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p2, p0, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    iput-object p3, p0, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    iput-object v0, p0, Lp0/a/a/o;->c:Lp0/a/a/p;
-
-    iput v1, p0, Lp0/a/a/o;->d:I
-
-    iput-object v2, p0, Lp0/a/a/o;->e:Ljava/lang/String;
-
-    iget-object p1, p1, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    iput-object p1, p0, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lp0/a/a/p;Lp0/a/a/p;Lp0/a/a/p;ILjava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    iput-object p2, p0, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    iput-object p3, p0, Lp0/a/a/o;->c:Lp0/a/a/p;
-
-    iput p4, p0, Lp0/a/a/o;->d:I
-
-    iput-object p5, p0, Lp0/a/a/o;->e:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static a(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)Lp0/a/a/o;
-    .locals 4
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    iget-object v0, p0, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    invoke-static {v0, p1, p2}, Lp0/a/a/o;->a(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)Lp0/a/a/o;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    iget-object v0, p0, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    iget v0, v0, Lp0/a/a/p;->d:I
-
-    iget-object v1, p0, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    iget v1, v1, Lp0/a/a/p;->d:I
-
-    iget v2, p1, Lp0/a/a/p;->d:I
-
-    if-nez p2, :cond_1
-
-    const v3, 0x7fffffff
-
-    goto :goto_0
-
-    :cond_1
-    iget v3, p2, Lp0/a/a/p;->d:I
-
-    :goto_0
-    if-ge v2, v1, :cond_6
-
-    if-gt v3, v0, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    if-gt v2, v0, :cond_4
-
-    if-lt v3, v1, :cond_3
-
-    iget-object p0, p0, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    return-object p0
-
-    :cond_3
-    new-instance p1, Lp0/a/a/o;
-
-    iget-object v0, p0, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    invoke-direct {p1, p0, p2, v0}, Lp0/a/a/o;-><init>(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)V
-
-    return-object p1
-
-    :cond_4
-    if-lt v3, v1, :cond_5
-
-    new-instance p2, Lp0/a/a/o;
-
-    iget-object v0, p0, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    invoke-direct {p2, p0, v0, p1}, Lp0/a/a/o;-><init>(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)V
-
-    return-object p2
-
-    :cond_5
-    new-instance v0, Lp0/a/a/o;
-
-    iget-object v1, p0, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    invoke-direct {v0, p0, p2, v1}, Lp0/a/a/o;-><init>(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)V
-
-    iput-object v0, p0, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    new-instance p2, Lp0/a/a/o;
-
-    iget-object v0, p0, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    invoke-direct {p2, p0, v0, p1}, Lp0/a/a/o;-><init>(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)V
-
-    return-object p2
-
-    :cond_6
-    :goto_1
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/p.smali b/com.discord/smali_classes2/p0/a/a/p.smali
deleted file mode 100644
index 921e1db5d3..0000000000
--- a/com.discord/smali_classes2/p0/a/a/p.smali
+++ /dev/null
@@ -1,438 +0,0 @@
-.class public Lp0/a/a/p;
-.super Ljava/lang/Object;
-.source "Label.java"
-
-
-# static fields
-.field public static final n:Lp0/a/a/p;
-
-
-# instance fields
-.field public a:S
-
-.field public b:S
-
-.field public c:[I
-
-.field public d:I
-
-.field public e:[I
-
-.field public f:S
-
-.field public g:S
-
-.field public h:S
-
-.field public i:S
-
-.field public j:Lp0/a/a/m;
-
-.field public k:Lp0/a/a/p;
-
-.field public l:Lp0/a/a/j;
-
-.field public m:Lp0/a/a/p;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lp0/a/a/p;
-
-    invoke-direct {v0}, Lp0/a/a/p;-><init>()V
-
-    sput-object v0, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(III)V
-    .locals 6
-
-    iget-object v0, p0, Lp0/a/a/p;->e:[I
-
-    const/4 v1, 0x6
-
-    if-nez v0, :cond_0
-
-    new-array v0, v1, [I
-
-    iput-object v0, p0, Lp0/a/a/p;->e:[I
-
-    :cond_0
-    iget-object v0, p0, Lp0/a/a/p;->e:[I
-
-    const/4 v2, 0x0
-
-    aget v3, v0, v2
-
-    add-int/lit8 v4, v3, 0x2
-
-    array-length v5, v0
-
-    if-lt v4, v5, :cond_1
-
-    array-length v4, v0
-
-    add-int/2addr v4, v1
-
-    new-array v1, v4, [I
-
-    array-length v4, v0
-
-    invoke-static {v0, v2, v1, v2, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v1, p0, Lp0/a/a/p;->e:[I
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/p;->e:[I
-
-    add-int/lit8 v3, v3, 0x1
-
-    aput p1, v0, v3
-
-    add-int/lit8 v3, v3, 0x1
-
-    or-int p1, p2, p3
-
-    aput p1, v0, v3
-
-    aput v3, v0, v2
-
-    return-void
-.end method
-
-.method public final b()Lp0/a/a/p;
-    .locals 1
-
-    iget-object v0, p0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    if-nez v0, :cond_0
-
-    move-object v0, p0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, v0, Lp0/a/a/m;->a:Lp0/a/a/p;
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public final c(S)V
-    .locals 3
-
-    sget-object v0, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    iput-object v0, p0, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    move-object v0, p0
-
-    :goto_0
-    sget-object v1, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    if-eq v0, v1, :cond_1
-
-    iget-object v1, v0, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    const/4 v2, 0x0
-
-    iput-object v2, v0, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iget-short v2, v0, Lp0/a/a/p;->i:S
-
-    if-nez v2, :cond_0
-
-    iput-short p1, v0, Lp0/a/a/p;->i:S
-
-    invoke-virtual {v0, v1}, Lp0/a/a/p;->d(Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, v1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public final d(Lp0/a/a/p;)Lp0/a/a/p;
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    :goto_0
-    if-eqz v0, :cond_2
-
-    iget-short v1, p0, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v1, v1, 0x10
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    iget-object v1, v1, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_1
-    if-nez v1, :cond_1
-
-    iget-object v1, v0, Lp0/a/a/j;->b:Lp0/a/a/p;
-
-    iget-object v2, v1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    if-nez v2, :cond_1
-
-    iput-object p1, v1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    move-object p1, v1
-
-    :cond_1
-    iget-object v0, v0, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    goto :goto_0
-
-    :cond_2
-    return-object p1
-.end method
-
-.method public final e(Lp0/a/a/c;IZ)V
-    .locals 2
-
-    iget-short v0, p0, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v0, v0, 0x4
-
-    if-nez v0, :cond_1
-
-    const/4 v0, -0x1
-
-    if-eqz p3, :cond_0
-
-    const/high16 p3, 0x20000000
-
-    iget v1, p1, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p0, p2, p3, v1}, Lp0/a/a/p;->a(III)V
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    goto :goto_0
-
-    :cond_0
-    const/high16 p3, 0x10000000
-
-    iget v1, p1, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p0, p2, p3, v1}, Lp0/a/a/p;->a(III)V
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_0
-
-    :cond_1
-    if-eqz p3, :cond_2
-
-    iget p3, p0, Lp0/a/a/p;->d:I
-
-    sub-int/2addr p3, p2
-
-    invoke-virtual {p1, p3}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    goto :goto_0
-
-    :cond_2
-    iget p3, p0, Lp0/a/a/p;->d:I
-
-    sub-int/2addr p3, p2
-
-    invoke-virtual {p1, p3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_0
-    return-void
-.end method
-
-.method public final f([BI)Z
-    .locals 7
-
-    iget-short v0, p0, Lp0/a/a/p;->a:S
-
-    or-int/lit8 v0, v0, 0x4
-
-    int-to-short v0, v0
-
-    iput-short v0, p0, Lp0/a/a/p;->a:S
-
-    iput p2, p0, Lp0/a/a/p;->d:I
-
-    iget-object v0, p0, Lp0/a/a/p;->e:[I
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    return v1
-
-    :cond_0
-    aget v0, v0, v1
-
-    :goto_0
-    if-lez v0, :cond_5
-
-    iget-object v2, p0, Lp0/a/a/p;->e:[I
-
-    add-int/lit8 v3, v0, -0x1
-
-    aget v3, v2, v3
-
-    aget v2, v2, v0
-
-    sub-int v4, p2, v3
-
-    const v5, 0xfffffff
-
-    and-int/2addr v5, v2
-
-    const/high16 v6, -0x10000000
-
-    and-int/2addr v2, v6
-
-    const/high16 v6, 0x10000000
-
-    if-ne v2, v6, :cond_4
-
-    const/16 v2, -0x8000
-
-    if-lt v4, v2, :cond_1
-
-    const/16 v2, 0x7fff
-
-    if-le v4, v2, :cond_3
-
-    :cond_1
-    aget-byte v1, p1, v3
-
-    and-int/lit16 v1, v1, 0xff
-
-    const/16 v2, 0xc6
-
-    if-ge v1, v2, :cond_2
-
-    add-int/lit8 v1, v1, 0x31
-
-    int-to-byte v1, v1
-
-    aput-byte v1, p1, v3
-
-    goto :goto_1
-
-    :cond_2
-    add-int/lit8 v1, v1, 0x14
-
-    int-to-byte v1, v1
-
-    aput-byte v1, p1, v3
-
-    :goto_1
-    const/4 v1, 0x1
-
-    :cond_3
-    add-int/lit8 v2, v5, 0x1
-
-    ushr-int/lit8 v3, v4, 0x8
-
-    int-to-byte v3, v3
-
-    aput-byte v3, p1, v5
-
-    int-to-byte v3, v4
-
-    aput-byte v3, p1, v2
-
-    goto :goto_2
-
-    :cond_4
-    add-int/lit8 v2, v5, 0x1
-
-    ushr-int/lit8 v3, v4, 0x18
-
-    int-to-byte v3, v3
-
-    aput-byte v3, p1, v5
-
-    add-int/lit8 v3, v2, 0x1
-
-    ushr-int/lit8 v5, v4, 0x10
-
-    int-to-byte v5, v5
-
-    aput-byte v5, p1, v2
-
-    add-int/lit8 v2, v3, 0x1
-
-    ushr-int/lit8 v5, v4, 0x8
-
-    int-to-byte v5, v5
-
-    aput-byte v5, p1, v3
-
-    int-to-byte v3, v4
-
-    aput-byte v3, p1, v2
-
-    :goto_2
-    add-int/lit8 v0, v0, -0x2
-
-    goto :goto_0
-
-    :cond_5
-    return v1
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "L"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/q.smali b/com.discord/smali_classes2/p0/a/a/q.smali
deleted file mode 100644
index ac02f8c29f..0000000000
--- a/com.discord/smali_classes2/p0/a/a/q.smali
+++ /dev/null
@@ -1,163 +0,0 @@
-.class public abstract Lp0/a/a/q;
-.super Ljava/lang/Object;
-.source "MethodVisitor.java"
-
-
-# instance fields
-.field public final a:I
-
-.field public b:Lp0/a/a/q;
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/high16 v0, 0x60000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x50000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x40000
-
-    if-eq p1, v0, :cond_1
-
-    const/high16 v0, 0x70000
-
-    if-ne p1, v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    iput p1, p0, Lp0/a/a/q;->a:I
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lp0/a/a/q;->b:Lp0/a/a/q;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ljava/lang/String;Z)Lp0/a/a/a;
-.end method
-
-.method public abstract b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-.end method
-
-.method public abstract c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-.end method
-
-.method public abstract d(II)V
-.end method
-
-.method public abstract e(I)V
-.end method
-
-.method public abstract f(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-.end method
-
-.method public abstract g(II)V
-.end method
-
-.method public abstract h(ILp0/a/a/p;)V
-.end method
-
-.method public abstract i(Lp0/a/a/p;)V
-.end method
-
-.method public abstract j(Ljava/lang/Object;)V
-.end method
-
-.method public abstract k(ILp0/a/a/p;)V
-.end method
-
-.method public abstract l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lp0/a/a/p;Lp0/a/a/p;I)V
-.end method
-
-.method public abstract m(ILp0/a/a/x;[Lp0/a/a/p;[Lp0/a/a/p;[ILjava/lang/String;Z)Lp0/a/a/a;
-.end method
-
-.method public abstract n(II)V
-.end method
-
-.method public o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 7
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-
-    iget v0, p0, Lp0/a/a/q;->a:I
-
-    const/high16 v1, 0x50000
-
-    if-lt v0, v1, :cond_1
-
-    const/16 v0, 0xb9
-
-    if-ne p1, v0, :cond_0
-
-    const/4 v0, 0x1
-
-    const/4 v6, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    const/4 v6, 0x0
-
-    :goto_0
-    move-object v1, p0
-
-    move v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    invoke-virtual/range {v1 .. v6}, Lp0/a/a/q;->p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/q;->b:Lp0/a/a/q;
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0, p1, p2, p3, p4}, Lp0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_2
-    return-void
-.end method
-
-.method public abstract p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-.end method
-
-.method public varargs abstract q(IILp0/a/a/p;[Lp0/a/a/p;)V
-.end method
-
-.method public abstract r(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-.end method
-
-.method public abstract s(ILjava/lang/String;)V
-.end method
-
-.method public abstract t(II)V
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/r.smali b/com.discord/smali_classes2/p0/a/a/r.smali
deleted file mode 100644
index 456cbddf96..0000000000
--- a/com.discord/smali_classes2/p0/a/a/r.smali
+++ /dev/null
@@ -1,5341 +0,0 @@
-.class public final Lp0/a/a/r;
-.super Lp0/a/a/q;
-.source "MethodWriter.java"
-
-
-# static fields
-.field public static final c0:[I
-
-
-# instance fields
-.field public final A:I
-
-.field public B:Lp0/a/a/a;
-
-.field public C:Lp0/a/a/a;
-
-.field public D:I
-
-.field public E:[Lp0/a/a/a;
-
-.field public F:I
-
-.field public G:[Lp0/a/a/a;
-
-.field public H:Lp0/a/a/a;
-
-.field public I:Lp0/a/a/a;
-
-.field public J:Lp0/a/a/c;
-
-.field public K:I
-
-.field public L:Lp0/a/a/c;
-
-.field public M:Lp0/a/a/b;
-
-.field public final N:I
-
-.field public O:Lp0/a/a/p;
-
-.field public P:Lp0/a/a/p;
-
-.field public Q:Lp0/a/a/p;
-
-.field public R:I
-
-.field public S:I
-
-.field public T:I
-
-.field public U:I
-
-.field public V:[I
-
-.field public W:[I
-
-.field public X:Z
-
-.field public Y:Z
-
-.field public Z:I
-
-.field public a0:I
-
-.field public b0:I
-
-.field public final c:Lp0/a/a/v;
-
-.field public final d:I
-
-.field public final e:I
-
-.field public final f:Ljava/lang/String;
-
-.field public final g:I
-
-.field public final h:Ljava/lang/String;
-
-.field public i:I
-
-.field public j:I
-
-.field public final k:Lp0/a/a/c;
-
-.field public l:Lp0/a/a/o;
-
-.field public m:Lp0/a/a/o;
-
-.field public n:I
-
-.field public o:Lp0/a/a/c;
-
-.field public p:I
-
-.field public q:Lp0/a/a/c;
-
-.field public r:I
-
-.field public s:Lp0/a/a/c;
-
-.field public t:I
-
-.field public u:Lp0/a/a/c;
-
-.field public v:Lp0/a/a/a;
-
-.field public w:Lp0/a/a/a;
-
-.field public x:Lp0/a/a/b;
-
-.field public final y:I
-
-.field public final z:[I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/16 v0, 0xca
-
-    new-array v0, v0, [I
-
-    fill-array-data v0, :array_0
-
-    sput-object v0, Lp0/a/a/r;->c0:[I
-
-    return-void
-
-    :array_0
-    .array-data 4
-        0x0
-        0x1
-        0x1
-        0x1
-        0x1
-        0x1
-        0x1
-        0x1
-        0x1
-        0x2
-        0x2
-        0x1
-        0x1
-        0x1
-        0x2
-        0x2
-        0x1
-        0x1
-        0x1
-        0x0
-        0x0
-        0x1
-        0x2
-        0x1
-        0x2
-        0x1
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        -0x1
-        0x0
-        -0x1
-        0x0
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        -0x3
-        -0x4
-        -0x3
-        -0x4
-        -0x3
-        -0x3
-        -0x3
-        -0x3
-        -0x1
-        -0x2
-        0x1
-        0x1
-        0x1
-        0x2
-        0x2
-        0x2
-        0x0
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        0x0
-        0x0
-        0x0
-        0x0
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        0x0
-        0x1
-        0x0
-        0x1
-        -0x1
-        -0x1
-        0x0
-        0x0
-        0x1
-        0x1
-        -0x1
-        0x0
-        -0x1
-        0x0
-        0x0
-        0x0
-        -0x3
-        -0x1
-        -0x1
-        -0x3
-        -0x3
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x1
-        -0x2
-        -0x2
-        -0x2
-        -0x2
-        -0x2
-        -0x2
-        -0x2
-        -0x2
-        0x0
-        0x1
-        0x0
-        -0x1
-        -0x1
-        -0x1
-        -0x2
-        -0x1
-        -0x2
-        -0x1
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x1
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        0x0
-        -0x1
-        -0x1
-        0x0
-        0x0
-        -0x1
-        -0x1
-        0x0
-        0x0
-    .end array-data
-.end method
-
-.method public constructor <init>(Lp0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;I)V
-    .locals 1
-
-    const/high16 v0, 0x70000
-
-    invoke-direct {p0, v0}, Lp0/a/a/q;-><init>(I)V
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    iput-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iput-object p1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v0, "<init>"
-
-    invoke-virtual {v0, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/high16 v0, 0x40000
-
-    or-int/2addr v0, p2
-
-    goto :goto_0
-
-    :cond_0
-    move v0, p2
-
-    :goto_0
-    iput v0, p0, Lp0/a/a/r;->d:I
-
-    invoke-virtual {p1, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v0
-
-    iput v0, p0, Lp0/a/a/r;->e:I
-
-    iput-object p3, p0, Lp0/a/a/r;->f:Ljava/lang/String;
-
-    invoke-virtual {p1, p4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p3
-
-    iput p3, p0, Lp0/a/a/r;->g:I
-
-    iput-object p4, p0, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    const/4 p3, 0x0
-
-    if-nez p5, :cond_1
-
-    const/4 p5, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p1, p5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p5
-
-    :goto_1
-    iput p5, p0, Lp0/a/a/r;->A:I
-
-    if-eqz p6, :cond_2
-
-    array-length p5, p6
-
-    if-lez p5, :cond_2
-
-    array-length p5, p6
-
-    iput p5, p0, Lp0/a/a/r;->y:I
-
-    new-array p5, p5, [I
-
-    iput-object p5, p0, Lp0/a/a/r;->z:[I
-
-    :goto_2
-    iget p5, p0, Lp0/a/a/r;->y:I
-
-    if-ge p3, p5, :cond_3
-
-    iget-object p5, p0, Lp0/a/a/r;->z:[I
-
-    aget-object v0, p6, p3
-
-    invoke-virtual {p1, v0}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    aput v0, p5, p3
-
-    add-int/lit8 p3, p3, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    iput p3, p0, Lp0/a/a/r;->y:I
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lp0/a/a/r;->z:[I
-
-    :cond_3
-    iput p7, p0, Lp0/a/a/r;->N:I
-
-    if-eqz p7, :cond_5
-
-    invoke-static {p4}, Lp0/a/a/w;->b(Ljava/lang/String;)I
-
-    move-result p1
-
-    shr-int/lit8 p1, p1, 0x2
-
-    and-int/lit8 p2, p2, 0x8
-
-    if-eqz p2, :cond_4
-
-    add-int/lit8 p1, p1, -0x1
-
-    :cond_4
-    iput p1, p0, Lp0/a/a/r;->j:I
-
-    iput p1, p0, Lp0/a/a/r;->T:I
-
-    new-instance p1, Lp0/a/a/p;
-
-    invoke-direct {p1}, Lp0/a/a/p;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    invoke-virtual {p0, p1}, Lp0/a/a/r;->i(Lp0/a/a/p;)V
-
-    :cond_5
-    return-void
-.end method
-
-
-# virtual methods
-.method public A(III)I
-    .locals 2
-
-    add-int/lit8 v0, p2, 0x3
-
-    add-int/2addr v0, p3
-
-    iget-object v1, p0, Lp0/a/a/r;->W:[I
-
-    if-eqz v1, :cond_0
-
-    array-length v1, v1
-
-    if-ge v1, v0, :cond_1
-
-    :cond_0
-    new-array v0, v0, [I
-
-    iput-object v0, p0, Lp0/a/a/r;->W:[I
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/r;->W:[I
-
-    const/4 v1, 0x0
-
-    aput p1, v0, v1
-
-    const/4 p1, 0x1
-
-    aput p2, v0, p1
-
-    const/4 p1, 0x2
-
-    aput p3, v0, p1
-
-    const/4 p1, 0x3
-
-    return p1
-.end method
-
-.method public final B(Lp0/a/a/p;[Lp0/a/a/p;)V
-    .locals 4
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v0, :cond_2
-
-    iget v1, p0, Lp0/a/a/r;->N:I
-
-    const/4 v2, 0x4
-
-    const/4 v3, 0x0
-
-    if-ne v1, v2, :cond_0
-
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    const/16 v1, 0xab
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, v1, v3, v2, v2}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    invoke-virtual {p0, v3, p1}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    invoke-virtual {p1}, Lp0/a/a/p;->b()Lp0/a/a/p;
-
-    move-result-object p1
-
-    iget-short v0, p1, Lp0/a/a/p;->a:S
-
-    or-int/lit8 v0, v0, 0x2
-
-    int-to-short v0, v0
-
-    iput-short v0, p1, Lp0/a/a/p;->a:S
-
-    array-length p1, p2
-
-    const/4 v0, 0x0
-
-    :goto_0
-    if-ge v0, p1, :cond_1
-
-    aget-object v1, p2, v0
-
-    invoke-virtual {p0, v3, v1}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    invoke-virtual {v1}, Lp0/a/a/p;->b()Lp0/a/a/p;
-
-    move-result-object v1
-
-    iget-short v2, v1, Lp0/a/a/p;->a:S
-
-    or-int/lit8 v2, v2, 0x2
-
-    int-to-short v2, v2
-
-    iput-short v2, v1, Lp0/a/a/p;->a:S
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    if-ne v1, v0, :cond_1
-
-    iget v1, p0, Lp0/a/a/r;->R:I
-
-    sub-int/2addr v1, v0
-
-    iput v1, p0, Lp0/a/a/r;->R:I
-
-    invoke-virtual {p0, v1, p1}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    array-length p1, p2
-
-    :goto_1
-    if-ge v3, p1, :cond_1
-
-    aget-object v0, p2, v3
-
-    iget v1, p0, Lp0/a/a/r;->R:I
-
-    invoke-virtual {p0, v1, v0}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {p0}, Lp0/a/a/r;->v()V
-
-    :cond_2
-    return-void
-.end method
-
-.method public a(Ljava/lang/String;Z)Lp0/a/a/a;
-    .locals 3
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v1, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p2, :cond_0
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/r;->B:Lp0/a/a/a;
-
-    invoke-direct {p2, v1, p1, v0, v2}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->B:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_0
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/r;->C:Lp0/a/a/a;
-
-    invoke-direct {p2, v1, p1, v0, v2}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->C:Lp0/a/a/a;
-
-    return-object p2
-.end method
-
-.method public b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    iput v0, p0, Lp0/a/a/r;->Z:I
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const/16 v1, 0x9
-
-    invoke-virtual {v0, v1, p2, p3, p4}, Lp0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lp0/a/a/v$a;
-
-    move-result-object p2
-
-    iget-object p3, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, p2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p3, p1, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    iget-object p3, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz p3, :cond_a
-
-    iget p3, p0, Lp0/a/a/r;->N:I
-
-    const/4 v0, 0x4
-
-    const/4 v1, 0x0
-
-    if-eq p3, v0, :cond_9
-
-    const/4 v0, 0x3
-
-    if-ne p3, v0, :cond_0
-
-    goto :goto_3
-
-    :cond_0
-    invoke-virtual {p4, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result p2
-
-    const/4 p3, -0x2
-
-    const/16 p4, 0x4a
-
-    const/16 v0, 0x44
-
-    const/4 v2, 0x1
-
-    packed-switch p1, :pswitch_data_0
-
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    if-eq p2, v0, :cond_6
-
-    if-ne p2, p4, :cond_7
-
-    goto :goto_0
-
-    :pswitch_0
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    if-eq p2, v0, :cond_1
-
-    if-ne p2, p4, :cond_2
-
-    :cond_1
-    const/4 v1, 0x1
-
-    :cond_2
-    add-int/2addr p1, v1
-
-    goto :goto_2
-
-    :pswitch_1
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    if-eq p2, v0, :cond_7
-
-    if-ne p2, p4, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const/4 p3, -0x1
-
-    goto :goto_1
-
-    :pswitch_2
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    if-eq p2, v0, :cond_4
-
-    if-ne p2, p4, :cond_5
-
-    :cond_4
-    const/4 v2, 0x2
-
-    :cond_5
-    add-int/2addr p1, v2
-
-    goto :goto_2
-
-    :cond_6
-    :goto_0
-    const/4 p3, -0x3
-
-    :cond_7
-    :goto_1
-    add-int/2addr p1, p3
-
-    :goto_2
-    iget p2, p0, Lp0/a/a/r;->S:I
-
-    if-le p1, p2, :cond_8
-
-    iput p1, p0, Lp0/a/a/r;->S:I
-
-    :cond_8
-    iput p1, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_4
-
-    :cond_9
-    :goto_3
-    iget-object p3, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object p3, p3, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object p4, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {p3, p1, v1, p2, p4}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_a
-    :goto_4
-    return-void
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0xb2
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
-    .locals 10
-
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    const/4 v1, 0x4
-
-    if-ne v0, v1, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v2, -0x1
-
-    const/4 v3, 0x2
-
-    const/4 v4, 0x3
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x1
-
-    if-ne v0, v4, :cond_d
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v1, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    if-nez v1, :cond_1
-
-    new-instance p1, Lp0/a/a/i;
-
-    invoke-direct {p1, v0}, Lp0/a/a/i;-><init>(Lp0/a/a/p;)V
-
-    iput-object p1, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object p1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object p1, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object p3, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v0, p0, Lp0/a/a/r;->d:I
-
-    iget-object v1, p0, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    invoke-virtual {p1, p3, v0, v1, p2}, Lp0/a/a/m;->n(Lp0/a/a/v;ILjava/lang/String;I)V
-
-    iget-object p1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object p1, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    invoke-virtual {p1, p0}, Lp0/a/a/m;->a(Lp0/a/a/r;)V
-
-    goto/16 :goto_10
-
-    :cond_1
-    if-ne p1, v2, :cond_c
-
-    iget-object p1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const/4 v0, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    const/high16 v4, 0x1000000
-
-    if-ge v0, p2, :cond_4
-
-    iget-object v7, v1, Lp0/a/a/m;->b:[I
-
-    add-int/lit8 v8, v2, 0x1
-
-    aget-object v9, p3, v0
-
-    invoke-static {p1, v9}, Lp0/a/a/m;->c(Lp0/a/a/v;Ljava/lang/Object;)I
-
-    move-result v9
-
-    aput v9, v7, v2
-
-    aget-object v2, p3, v0
-
-    sget-object v7, Lp0/a/a/t;->e:Ljava/lang/Integer;
-
-    if-eq v2, v7, :cond_3
-
-    aget-object v2, p3, v0
-
-    sget-object v7, Lp0/a/a/t;->d:Ljava/lang/Integer;
-
-    if-ne v2, v7, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    move v2, v8
-
-    goto :goto_2
-
-    :cond_3
-    :goto_1
-    iget-object v2, v1, Lp0/a/a/m;->b:[I
-
-    add-int/lit8 v7, v8, 0x1
-
-    aput v4, v2, v8
-
-    move v2, v7
-
-    :goto_2
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_4
-    :goto_3
-    iget-object p2, v1, Lp0/a/a/m;->b:[I
-
-    array-length p3, p2
-
-    if-ge v2, p3, :cond_5
-
-    add-int/lit8 p3, v2, 0x1
-
-    aput v4, p2, v2
-
-    move v2, p3
-
-    goto :goto_3
-
-    :cond_5
-    const/4 p2, 0x0
-
-    const/4 p3, 0x0
-
-    :goto_4
-    if-ge p2, p4, :cond_8
-
-    aget-object v0, p5, p2
-
-    sget-object v2, Lp0/a/a/t;->e:Ljava/lang/Integer;
-
-    if-eq v0, v2, :cond_6
-
-    aget-object v0, p5, p2
-
-    sget-object v2, Lp0/a/a/t;->d:Ljava/lang/Integer;
-
-    if-ne v0, v2, :cond_7
-
-    :cond_6
-    add-int/lit8 p3, p3, 0x1
-
-    :cond_7
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_4
-
-    :cond_8
-    add-int/2addr p3, p4
-
-    new-array p2, p3, [I
-
-    iput-object p2, v1, Lp0/a/a/m;->c:[I
-
-    const/4 p2, 0x0
-
-    const/4 p3, 0x0
-
-    :goto_5
-    if-ge p2, p4, :cond_b
-
-    iget-object v0, v1, Lp0/a/a/m;->c:[I
-
-    add-int/lit8 v2, p3, 0x1
-
-    aget-object v7, p5, p2
-
-    invoke-static {p1, v7}, Lp0/a/a/m;->c(Lp0/a/a/v;Ljava/lang/Object;)I
-
-    move-result v7
-
-    aput v7, v0, p3
-
-    aget-object p3, p5, p2
-
-    sget-object v0, Lp0/a/a/t;->e:Ljava/lang/Integer;
-
-    if-eq p3, v0, :cond_a
-
-    aget-object p3, p5, p2
-
-    sget-object v0, Lp0/a/a/t;->d:Ljava/lang/Integer;
-
-    if-ne p3, v0, :cond_9
-
-    goto :goto_6
-
-    :cond_9
-    move p3, v2
-
-    goto :goto_7
-
-    :cond_a
-    :goto_6
-    iget-object p3, v1, Lp0/a/a/m;->c:[I
-
-    add-int/lit8 v0, v2, 0x1
-
-    aput v4, p3, v2
-
-    move p3, v0
-
-    :goto_7
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_5
-
-    :cond_b
-    iput-short v5, v1, Lp0/a/a/m;->g:S
-
-    iput v5, v1, Lp0/a/a/m;->h:I
-
-    :cond_c
-    iget-object p1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object p1, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    invoke-virtual {p1, p0}, Lp0/a/a/m;->a(Lp0/a/a/r;)V
-
-    goto/16 :goto_10
-
-    :cond_d
-    if-ne p1, v2, :cond_11
-
-    iget-object p1, p0, Lp0/a/a/r;->V:[I
-
-    if-nez p1, :cond_e
-
-    iget-object p1, p0, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    invoke-static {p1}, Lp0/a/a/w;->b(Ljava/lang/String;)I
-
-    move-result p1
-
-    shr-int/2addr p1, v3
-
-    new-instance v0, Lp0/a/a/m;
-
-    new-instance v1, Lp0/a/a/p;
-
-    invoke-direct {v1}, Lp0/a/a/p;-><init>()V
-
-    invoke-direct {v0, v1}, Lp0/a/a/m;-><init>(Lp0/a/a/p;)V
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v2, p0, Lp0/a/a/r;->d:I
-
-    iget-object v7, p0, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    invoke-virtual {v0, v1, v2, v7, p1}, Lp0/a/a/m;->n(Lp0/a/a/v;ILjava/lang/String;I)V
-
-    invoke-virtual {v0, p0}, Lp0/a/a/m;->a(Lp0/a/a/r;)V
-
-    :cond_e
-    iput p2, p0, Lp0/a/a/r;->T:I
-
-    iget-object p1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget p1, p1, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p0, p1, p2, p4}, Lp0/a/a/r;->A(III)I
-
-    const/4 p1, 0x0
-
-    :goto_8
-    if-ge p1, p2, :cond_f
-
-    iget-object v0, p0, Lp0/a/a/r;->W:[I
-
-    add-int/lit8 v1, v4, 0x1
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    aget-object v7, p3, p1
-
-    invoke-static {v2, v7}, Lp0/a/a/m;->c(Lp0/a/a/v;Ljava/lang/Object;)I
-
-    move-result v2
-
-    aput v2, v0, v4
-
-    add-int/lit8 p1, p1, 0x1
-
-    move v4, v1
-
-    goto :goto_8
-
-    :cond_f
-    const/4 p1, 0x0
-
-    :goto_9
-    if-ge p1, p4, :cond_10
-
-    iget-object p2, p0, Lp0/a/a/r;->W:[I
-
-    add-int/lit8 p3, v4, 0x1
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    aget-object v1, p5, p1
-
-    invoke-static {v0, v1}, Lp0/a/a/m;->c(Lp0/a/a/v;Ljava/lang/Object;)I
-
-    move-result v0
-
-    aput v0, p2, v4
-
-    add-int/lit8 p1, p1, 0x1
-
-    move v4, p3
-
-    goto :goto_9
-
-    :cond_10
-    invoke-virtual {p0}, Lp0/a/a/r;->z()V
-
-    goto/16 :goto_10
-
-    :cond_11
-    iget-object v0, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    if-nez v0, :cond_12
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    iput-object v0, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    goto :goto_a
-
-    :cond_12
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    iget v2, p0, Lp0/a/a/r;->U:I
-
-    sub-int/2addr v0, v2
-
-    sub-int/2addr v0, v6
-
-    if-gez v0, :cond_14
-
-    if-ne p1, v4, :cond_13
-
-    return-void
-
-    :cond_13
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalStateException;-><init>()V
-
-    throw p1
-
-    :cond_14
-    :goto_a
-    if-eqz p1, :cond_1b
-
-    if-eq p1, v6, :cond_1a
-
-    const/16 p3, 0xfb
-
-    if-eq p1, v3, :cond_19
-
-    const/16 p2, 0x40
-
-    if-eq p1, v4, :cond_17
-
-    if-ne p1, v1, :cond_16
-
-    if-ge v0, p2, :cond_15
-
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    add-int/2addr v0, p2
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    goto :goto_b
-
-    :cond_15
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    const/16 p2, 0xf7
-
-    invoke-virtual {p1, p2}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_b
-    aget-object p1, p5, v5
-
-    invoke-virtual {p0, p1}, Lp0/a/a/r;->x(Ljava/lang/Object;)V
-
-    goto :goto_f
-
-    :cond_16
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p1
-
-    :cond_17
-    if-ge v0, p2, :cond_18
-
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    goto :goto_f
-
-    :cond_18
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {p1, p3}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_f
-
-    :cond_19
-    iget p1, p0, Lp0/a/a/r;->T:I
-
-    sub-int/2addr p1, p2
-
-    iput p1, p0, Lp0/a/a/r;->T:I
-
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    sub-int/2addr p3, p2
-
-    invoke-virtual {p1, p3}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_f
-
-    :cond_1a
-    iget p1, p0, Lp0/a/a/r;->T:I
-
-    add-int/2addr p1, p2
-
-    iput p1, p0, Lp0/a/a/r;->T:I
-
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    add-int/lit16 v1, p2, 0xfb
-
-    invoke-virtual {p1, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    :goto_c
-    if-ge p1, p2, :cond_1d
-
-    aget-object v0, p3, p1
-
-    invoke-virtual {p0, v0}, Lp0/a/a/r;->x(Ljava/lang/Object;)V
-
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_c
-
-    :cond_1b
-    iput p2, p0, Lp0/a/a/r;->T:I
-
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    const/16 v1, 0xff
-
-    invoke-virtual {p1, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {p1, p2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    :goto_d
-    if-ge p1, p2, :cond_1c
-
-    aget-object v0, p3, p1
-
-    invoke-virtual {p0, v0}, Lp0/a/a/r;->x(Ljava/lang/Object;)V
-
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_d
-
-    :cond_1c
-    iget-object p1, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {p1, p4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    :goto_e
-    if-ge p1, p4, :cond_1d
-
-    aget-object p2, p5, p1
-
-    invoke-virtual {p0, p2}, Lp0/a/a/r;->x(Ljava/lang/Object;)V
-
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_e
-
-    :cond_1d
-    :goto_f
-    iget-object p1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget p1, p1, Lp0/a/a/c;->b:I
-
-    iput p1, p0, Lp0/a/a/r;->U:I
-
-    iget p1, p0, Lp0/a/a/r;->t:I
-
-    add-int/2addr p1, v6
-
-    iput p1, p0, Lp0/a/a/r;->t:I
-
-    :goto_10
-    iget p1, p0, Lp0/a/a/r;->N:I
-
-    if-ne p1, v3, :cond_21
-
-    iput p4, p0, Lp0/a/a/r;->R:I
-
-    :goto_11
-    if-ge v5, p4, :cond_20
-
-    aget-object p1, p5, v5
-
-    sget-object p2, Lp0/a/a/t;->e:Ljava/lang/Integer;
-
-    if-eq p1, p2, :cond_1e
-
-    aget-object p1, p5, v5
-
-    sget-object p2, Lp0/a/a/t;->d:Ljava/lang/Integer;
-
-    if-ne p1, p2, :cond_1f
-
-    :cond_1e
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    add-int/2addr p1, v6
-
-    iput p1, p0, Lp0/a/a/r;->R:I
-
-    :cond_1f
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_11
-
-    :cond_20
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    iget p2, p0, Lp0/a/a/r;->S:I
-
-    if-le p1, p2, :cond_21
-
-    iput p1, p0, Lp0/a/a/r;->S:I
-
-    :cond_21
-    iget p1, p0, Lp0/a/a/r;->i:I
-
-    invoke-static {p1, p4}, Ljava/lang/Math;->max(II)I
-
-    move-result p1
-
-    iput p1, p0, Lp0/a/a/r;->i:I
-
-    iget p1, p0, Lp0/a/a/r;->j:I
-
-    iget p2, p0, Lp0/a/a/r;->T:I
-
-    invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
-
-    move-result p1
-
-    iput p1, p0, Lp0/a/a/r;->j:I
-
-    return-void
-.end method
-
-.method public d(II)V
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/c;->b:I
-
-    iput v1, p0, Lp0/a/a/r;->Z:I
-
-    const/16 v1, 0x84
-
-    const/16 v2, 0xff
-
-    if-gt p1, v2, :cond_1
-
-    const/16 v2, 0x7f
-
-    if-gt p2, v2, :cond_1
-
-    const/16 v2, -0x80
-
-    if-ge p2, v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v0, p1, p2}, Lp0/a/a/c;->c(II)Lp0/a/a/c;
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    const/16 v2, 0xc4
-
-    invoke-virtual {v0, v2}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v0, v1, p1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    invoke-virtual {v0, p2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_1
-    iget-object p2, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz p2, :cond_3
-
-    iget p2, p0, Lp0/a/a/r;->N:I
-
-    const/4 v0, 0x4
-
-    if-eq p2, v0, :cond_2
-
-    const/4 v0, 0x3
-
-    if-ne p2, v0, :cond_3
-
-    :cond_2
-    iget-object p2, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object p2, p2, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p2, v1, p1, v0, v0}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_3
-    iget p2, p0, Lp0/a/a/r;->N:I
-
-    if-eqz p2, :cond_4
-
-    add-int/lit8 p1, p1, 0x1
-
-    iget p2, p0, Lp0/a/a/r;->j:I
-
-    if-le p1, p2, :cond_4
-
-    iput p1, p0, Lp0/a/a/r;->j:I
-
-    :cond_4
-    return-void
-.end method
-
-.method public e(I)V
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/c;->b:I
-
-    iput v1, p0, Lp0/a/a/r;->Z:I
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v0, :cond_5
-
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    const/4 v1, 0x4
-
-    if-eq v0, v1, :cond_2
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget v0, p0, Lp0/a/a/r;->R:I
-
-    sget-object v1, Lp0/a/a/r;->c0:[I
-
-    aget v1, v1, p1
-
-    add-int/2addr v0, v1
-
-    iget v1, p0, Lp0/a/a/r;->S:I
-
-    if-le v0, v1, :cond_1
-
-    iput v0, p0, Lp0/a/a/r;->S:I
-
-    :cond_1
-    iput v0, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, p1, v1, v2, v2}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :goto_1
-    const/16 v0, 0xac
-
-    if-lt p1, v0, :cond_3
-
-    const/16 v0, 0xb1
-
-    if-le p1, v0, :cond_4
-
-    :cond_3
-    const/16 v0, 0xbf
-
-    if-ne p1, v0, :cond_5
-
-    :cond_4
-    invoke-virtual {p0}, Lp0/a/a/r;->v()V
-
-    :cond_5
-    return-void
-.end method
-
-.method public f(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-    .locals 2
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    const v1, -0xffff01
-
-    and-int/2addr p1, v1
-
-    iget v1, p0, Lp0/a/a/r;->Z:I
-
-    shl-int/lit8 v1, v1, 0x8
-
-    or-int/2addr p1, v1
-
-    invoke-static {p1, v0}, Lf/n/a/k/a;->S(ILp0/a/a/c;)V
-
-    invoke-static {p2, v0}, Lp0/a/a/x;->a(Lp0/a/a/x;Lp0/a/a/c;)V
-
-    iget-object p1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {p1, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p4, :cond_0
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_0
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    return-object p2
-.end method
-
-.method public g(II)V
-    .locals 2
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/c;->b:I
-
-    iput v1, p0, Lp0/a/a/r;->Z:I
-
-    const/16 v1, 0x11
-
-    if-ne p1, v1, :cond_0
-
-    invoke-virtual {v0, p1, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, p1, p2}, Lp0/a/a/c;->c(II)Lp0/a/a/c;
-
-    :goto_0
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v0, :cond_4
-
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    const/4 v1, 0x4
-
-    if-eq v0, v1, :cond_3
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/16 p2, 0xbc
-
-    if-eq p1, p2, :cond_4
-
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iget p2, p0, Lp0/a/a/r;->S:I
-
-    if-le p1, p2, :cond_2
-
-    iput p1, p0, Lp0/a/a/r;->S:I
-
-    :cond_2
-    iput p1, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_2
-
-    :cond_3
-    :goto_1
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, p1, p2, v1, v1}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_4
-    :goto_2
-    return-void
-.end method
-
-.method public h(ILp0/a/a/p;)V
-    .locals 10
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    iput v0, p0, Lp0/a/a/r;->Z:I
-
-    const/16 v0, 0xc8
-
-    if-lt p1, v0, :cond_0
-
-    add-int/lit8 v1, p1, -0x21
-
-    goto :goto_0
-
-    :cond_0
-    move v1, p1
-
-    :goto_0
-    iget-short v2, p2, Lp0/a/a/p;->a:S
-
-    const/4 v3, 0x4
-
-    and-int/2addr v2, v3
-
-    const/16 v4, 0xa8
-
-    const/16 v5, 0xa7
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
-
-    if-eqz v2, :cond_4
-
-    iget v2, p2, Lp0/a/a/p;->d:I
-
-    iget-object v8, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v9, v8, Lp0/a/a/c;->b:I
-
-    sub-int/2addr v2, v9
-
-    const/16 v9, -0x8000
-
-    if-ge v2, v9, :cond_4
-
-    if-ne v1, v5, :cond_1
-
-    invoke-virtual {v8, v0}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    goto :goto_1
-
-    :cond_1
-    if-ne v1, v4, :cond_2
-
-    const/16 p1, 0xc9
-
-    invoke-virtual {v8, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    :goto_1
-    const/4 p1, 0x0
-
-    goto :goto_3
-
-    :cond_2
-    const/16 p1, 0xc6
-
-    if-lt v1, p1, :cond_3
-
-    xor-int/lit8 p1, v1, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    add-int/lit8 p1, v1, 0x1
-
-    xor-int/2addr p1, v7
-
-    sub-int/2addr p1, v7
-
-    :goto_2
-    invoke-virtual {v8, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object p1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    const/16 v0, 0x8
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object p1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    const/16 v0, 0xdc
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iput-boolean v7, p0, Lp0/a/a/r;->Y:Z
-
-    const/4 p1, 0x1
-
-    :goto_3
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v2, v0, Lp0/a/a/c;->b:I
-
-    sub-int/2addr v2, v7
-
-    invoke-virtual {p2, v0, v2, v7}, Lp0/a/a/p;->e(Lp0/a/a/c;IZ)V
-
-    goto :goto_5
-
-    :cond_4
-    if-eq v1, p1, :cond_5
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object p1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, p1, Lp0/a/a/c;->b:I
-
-    sub-int/2addr v0, v7
-
-    invoke-virtual {p2, p1, v0, v7}, Lp0/a/a/p;->e(Lp0/a/a/c;IZ)V
-
-    goto :goto_4
-
-    :cond_5
-    iget-object p1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    invoke-virtual {p1, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object p1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, p1, Lp0/a/a/c;->b:I
-
-    sub-int/2addr v0, v7
-
-    invoke-virtual {p2, p1, v0, v6}, Lp0/a/a/p;->e(Lp0/a/a/c;IZ)V
-
-    :goto_4
-    const/4 p1, 0x0
-
-    :goto_5
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v0, :cond_e
-
-    iget v2, p0, Lp0/a/a/r;->N:I
-
-    const/4 v8, 0x2
-
-    const/4 v9, 0x0
-
-    if-ne v2, v3, :cond_6
-
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    invoke-virtual {v0, v1, v6, v9, v9}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    invoke-virtual {p2}, Lp0/a/a/p;->b()Lp0/a/a/p;
-
-    move-result-object v0
-
-    iget-short v2, v0, Lp0/a/a/p;->a:S
-
-    or-int/2addr v2, v8
-
-    int-to-short v2, v2
-
-    iput-short v2, v0, Lp0/a/a/p;->a:S
-
-    invoke-virtual {p0, v6, p2}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    if-eq v1, v5, :cond_b
-
-    new-instance v9, Lp0/a/a/p;
-
-    invoke-direct {v9}, Lp0/a/a/p;-><init>()V
-
-    goto :goto_6
-
-    :cond_6
-    const/4 v3, 0x3
-
-    if-ne v2, v3, :cond_7
-
-    iget-object p2, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    invoke-virtual {p2, v1, v6, v9, v9}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    goto :goto_6
-
-    :cond_7
-    if-ne v2, v8, :cond_8
-
-    iget p2, p0, Lp0/a/a/r;->R:I
-
-    sget-object v0, Lp0/a/a/r;->c0:[I
-
-    aget v0, v0, v1
-
-    add-int/2addr p2, v0
-
-    iput p2, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_6
-
-    :cond_8
-    if-ne v1, v4, :cond_a
-
-    iget-short v0, p2, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v2, v0, 0x20
-
-    if-nez v2, :cond_9
-
-    or-int/lit8 v0, v0, 0x20
-
-    int-to-short v0, v0
-
-    iput-short v0, p2, Lp0/a/a/p;->a:S
-
-    iput-boolean v7, p0, Lp0/a/a/r;->X:Z
-
-    :cond_9
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-short v2, v0, Lp0/a/a/p;->a:S
-
-    or-int/lit8 v2, v2, 0x10
-
-    int-to-short v2, v2
-
-    iput-short v2, v0, Lp0/a/a/p;->a:S
-
-    iget v0, p0, Lp0/a/a/r;->R:I
-
-    add-int/2addr v0, v7
-
-    invoke-virtual {p0, v0, p2}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    new-instance v9, Lp0/a/a/p;
-
-    invoke-direct {v9}, Lp0/a/a/p;-><init>()V
-
-    goto :goto_6
-
-    :cond_a
-    iget v0, p0, Lp0/a/a/r;->R:I
-
-    sget-object v2, Lp0/a/a/r;->c0:[I
-
-    aget v2, v2, v1
-
-    add-int/2addr v0, v2
-
-    iput v0, p0, Lp0/a/a/r;->R:I
-
-    invoke-virtual {p0, v0, p2}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    :cond_b
-    :goto_6
-    if-eqz v9, :cond_d
-
-    if-eqz p1, :cond_c
-
-    iget-short p1, v9, Lp0/a/a/p;->a:S
-
-    or-int/2addr p1, v8
-
-    int-to-short p1, p1
-
-    iput-short p1, v9, Lp0/a/a/p;->a:S
-
-    :cond_c
-    invoke-virtual {p0, v9}, Lp0/a/a/r;->i(Lp0/a/a/p;)V
-
-    :cond_d
-    if-ne v1, v5, :cond_e
-
-    invoke-virtual {p0}, Lp0/a/a/r;->v()V
-
-    :cond_e
-    return-void
-.end method
-
-.method public i(Lp0/a/a/p;)V
-    .locals 6
-
-    iget-boolean v0, p0, Lp0/a/a/r;->Y:Z
-
-    iget-object v1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget-object v2, v1, Lp0/a/a/c;->a:[B
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v2, v1}, Lp0/a/a/p;->f([BI)Z
-
-    move-result v1
-
-    or-int/2addr v0, v1
-
-    iput-boolean v0, p0, Lp0/a/a/r;->Y:Z
-
-    iget-short v0, p1, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v1, v0, 0x1
-
-    if-eqz v1, :cond_0
-
-    return-void
-
-    :cond_0
-    iget v1, p0, Lp0/a/a/r;->N:I
-
-    const/4 v2, 0x4
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x2
-
-    if-ne v1, v2, :cond_5
-
-    iget-object v1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v1, :cond_2
-
-    iget v2, p1, Lp0/a/a/p;->d:I
-
-    iget v5, v1, Lp0/a/a/p;->d:I
-
-    if-ne v2, v5, :cond_1
-
-    iget-short v2, v1, Lp0/a/a/p;->a:S
-
-    and-int/2addr v0, v4
-
-    or-int/2addr v0, v2
-
-    int-to-short v0, v0
-
-    iput-short v0, v1, Lp0/a/a/p;->a:S
-
-    iget-object v0, v1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iput-object v0, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    return-void
-
-    :cond_1
-    invoke-virtual {p0, v3, p1}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    :cond_2
-    iget-object v0, p0, Lp0/a/a/r;->P:Lp0/a/a/p;
-
-    if-eqz v0, :cond_4
-
-    iget v1, p1, Lp0/a/a/p;->d:I
-
-    iget v2, v0, Lp0/a/a/p;->d:I
-
-    if-ne v1, v2, :cond_3
-
-    iget-short v1, v0, Lp0/a/a/p;->a:S
-
-    iget-short v2, p1, Lp0/a/a/p;->a:S
-
-    and-int/2addr v2, v4
-
-    or-int/2addr v1, v2
-
-    int-to-short v1, v1
-
-    iput-short v1, v0, Lp0/a/a/p;->a:S
-
-    iget-object v1, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iput-object v1, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iput-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    return-void
-
-    :cond_3
-    iput-object p1, v0, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    :cond_4
-    iput-object p1, p0, Lp0/a/a/r;->P:Lp0/a/a/p;
-
-    iput-object p1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    new-instance v0, Lp0/a/a/m;
-
-    invoke-direct {v0, p1}, Lp0/a/a/m;-><init>(Lp0/a/a/p;)V
-
-    iput-object v0, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    goto :goto_0
-
-    :cond_5
-    const/4 v0, 0x3
-
-    if-ne v1, v0, :cond_7
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-nez v0, :cond_6
-
-    iput-object p1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    goto :goto_0
-
-    :cond_6
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iput-object p1, v0, Lp0/a/a/m;->a:Lp0/a/a/p;
-
-    goto :goto_0
-
-    :cond_7
-    const/4 v0, 0x1
-
-    if-ne v1, v0, :cond_a
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v0, :cond_8
-
-    iget v1, p0, Lp0/a/a/r;->S:I
-
-    int-to-short v1, v1
-
-    iput-short v1, v0, Lp0/a/a/p;->h:S
-
-    iget v0, p0, Lp0/a/a/r;->R:I
-
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/r;->u(ILp0/a/a/p;)V
-
-    :cond_8
-    iput-object p1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iput v3, p0, Lp0/a/a/r;->R:I
-
-    iput v3, p0, Lp0/a/a/r;->S:I
-
-    iget-object v0, p0, Lp0/a/a/r;->P:Lp0/a/a/p;
-
-    if-eqz v0, :cond_9
-
-    iput-object p1, v0, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    :cond_9
-    iput-object p1, p0, Lp0/a/a/r;->P:Lp0/a/a/p;
-
-    goto :goto_0
-
-    :cond_a
-    if-ne v1, v4, :cond_b
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-nez v0, :cond_b
-
-    iput-object p1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    :cond_b
-    :goto_0
-    return-void
-.end method
-
-.method public j(Ljava/lang/Object;)V
-    .locals 7
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    iput v0, p0, Lp0/a/a/r;->Z:I
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, p1}, Lp0/a/a/v;->b(Ljava/lang/Object;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    iget v0, p1, Lp0/a/a/u;->a:I
-
-    iget v1, p1, Lp0/a/a/u;->b:I
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x5
-
-    if-eq v1, v4, :cond_1
-
-    const/4 v4, 0x6
-
-    if-eq v1, v4, :cond_1
-
-    const/16 v4, 0x11
-
-    if-ne v1, v4, :cond_0
-
-    iget-object v1, p1, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v4, 0x4a
-
-    if-eq v1, v4, :cond_1
-
-    const/16 v4, 0x44
-
-    if-ne v1, v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 v1, 0x1
-
-    :goto_1
-    const/16 v4, 0x12
-
-    if-eqz v1, :cond_2
-
-    iget-object v5, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    const/16 v6, 0x14
-
-    invoke-virtual {v5, v6, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto :goto_2
-
-    :cond_2
-    const/16 v5, 0x100
-
-    if-lt v0, v5, :cond_3
-
-    iget-object v5, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    const/16 v6, 0x13
-
-    invoke-virtual {v5, v6, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto :goto_2
-
-    :cond_3
-    iget-object v5, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    invoke-virtual {v5, v4, v0}, Lp0/a/a/c;->c(II)Lp0/a/a/c;
-
-    :goto_2
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v0, :cond_8
-
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    const/4 v5, 0x4
-
-    if-eq v0, v5, :cond_7
-
-    const/4 v5, 0x3
-
-    if-ne v0, v5, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    if-eqz v1, :cond_5
-
-    const/4 v2, 0x2
-
-    :cond_5
-    add-int/2addr p1, v2
-
-    iget v0, p0, Lp0/a/a/r;->S:I
-
-    if-le p1, v0, :cond_6
-
-    iput p1, p0, Lp0/a/a/r;->S:I
-
-    :cond_6
-    iput p1, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_4
-
-    :cond_7
-    :goto_3
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, v4, v3, p1, v1}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_8
-    :goto_4
-    return-void
-.end method
-
-.method public k(ILp0/a/a/p;)V
-    .locals 1
-
-    iget-object v0, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    iput-object v0, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    :cond_0
-    iget v0, p0, Lp0/a/a/r;->n:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lp0/a/a/r;->n:I
-
-    iget-object v0, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    iget p2, p2, Lp0/a/a/p;->d:I
-
-    invoke-virtual {v0, p2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object p2, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    invoke-virtual {p2, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    return-void
-.end method
-
-.method public l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lp0/a/a/p;Lp0/a/a/p;I)V
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-eqz p3, :cond_1
-
-    iget-object v1, p0, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    if-nez v1, :cond_0
-
-    new-instance v1, Lp0/a/a/c;
-
-    invoke-direct {v1}, Lp0/a/a/c;-><init>()V
-
-    iput-object v1, p0, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    :cond_0
-    iget v1, p0, Lp0/a/a/r;->r:I
-
-    add-int/2addr v1, v0
-
-    iput v1, p0, Lp0/a/a/r;->r:I
-
-    iget-object v1, p0, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    iget v2, p4, Lp0/a/a/p;->d:I
-
-    invoke-virtual {v1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v2, p5, Lp0/a/a/p;->d:I
-
-    iget v3, p4, Lp0/a/a/p;->d:I
-
-    sub-int/2addr v2, v3
-
-    invoke-virtual {v1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v2, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v2, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p3
-
-    invoke-virtual {v1, p3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v1, p6}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_1
-    iget-object p3, p0, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    if-nez p3, :cond_2
-
-    new-instance p3, Lp0/a/a/c;
-
-    invoke-direct {p3}, Lp0/a/a/c;-><init>()V
-
-    iput-object p3, p0, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    :cond_2
-    iget p3, p0, Lp0/a/a/r;->p:I
-
-    add-int/2addr p3, v0
-
-    iput p3, p0, Lp0/a/a/r;->p:I
-
-    iget-object p3, p0, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    iget v1, p4, Lp0/a/a/p;->d:I
-
-    invoke-virtual {p3, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget p5, p5, Lp0/a/a/p;->d:I
-
-    iget p4, p4, Lp0/a/a/p;->d:I
-
-    sub-int/2addr p5, p4
-
-    invoke-virtual {p3, p5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object p4, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {p4, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {p3, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object p1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {p1, p2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {p3, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {p3, p6}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget p1, p0, Lp0/a/a/r;->N:I
-
-    if-eqz p1, :cond_5
-
-    const/4 p1, 0x0
-
-    invoke-virtual {p2, p1}, Ljava/lang/String;->charAt(I)C
-
-    move-result p1
-
-    const/16 p2, 0x4a
-
-    if-eq p1, p2, :cond_3
-
-    const/16 p2, 0x44
-
-    if-ne p1, p2, :cond_4
-
-    :cond_3
-    const/4 v0, 0x2
-
-    :cond_4
-    add-int/2addr p6, v0
-
-    iget p1, p0, Lp0/a/a/r;->j:I
-
-    if-le p6, p1, :cond_5
-
-    iput p6, p0, Lp0/a/a/r;->j:I
-
-    :cond_5
-    return-void
-.end method
-
-.method public m(ILp0/a/a/x;[Lp0/a/a/p;[Lp0/a/a/p;[ILjava/lang/String;Z)Lp0/a/a/a;
-    .locals 4
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    ushr-int/lit8 p1, p1, 0x18
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    array-length p1, p3
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    const/4 v1, 0x0
-
-    :goto_0
-    array-length v2, p3
-
-    if-ge v1, v2, :cond_0
-
-    aget-object v2, p3, v1
-
-    iget v2, v2, Lp0/a/a/p;->d:I
-
-    invoke-virtual {v0, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    aget-object v2, p4, v1
-
-    iget v2, v2, Lp0/a/a/p;->d:I
-
-    aget-object v3, p3, v1
-
-    iget v3, v3, Lp0/a/a/p;->d:I
-
-    sub-int/2addr v2, v3
-
-    invoke-virtual {v0, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    aget v2, p5, v1
-
-    invoke-virtual {v0, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p2, v0}, Lp0/a/a/x;->a(Lp0/a/a/x;Lp0/a/a/c;)V
-
-    iget-object p2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {p2, p6}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p2
-
-    invoke-virtual {v0, p2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p7, :cond_1
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_1
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    return-object p2
-.end method
-
-.method public n(II)V
-    .locals 13
-
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x4
-
-    if-ne v0, v4, :cond_c
-
-    iget-object p1, p0, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    :goto_0
-    const/high16 p2, 0x2000000
-
-    const-string v0, "java/lang/Throwable"
-
-    if-eqz p1, :cond_2
-
-    iget-object v4, p1, Lp0/a/a/o;->e:Ljava/lang/String;
-
-    if-nez v4, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    move-object v0, v4
-
-    :goto_1
-    iget-object v4, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v4, v0}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v0
-
-    or-int/2addr p2, v0
-
-    iget-object v0, p1, Lp0/a/a/o;->c:Lp0/a/a/p;
-
-    invoke-virtual {v0}, Lp0/a/a/p;->b()Lp0/a/a/p;
-
-    move-result-object v0
-
-    iget-short v4, v0, Lp0/a/a/p;->a:S
-
-    or-int/2addr v4, v1
-
-    int-to-short v4, v4
-
-    iput-short v4, v0, Lp0/a/a/p;->a:S
-
-    iget-object v4, p1, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    invoke-virtual {v4}, Lp0/a/a/p;->b()Lp0/a/a/p;
-
-    move-result-object v4
-
-    iget-object v5, p1, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    invoke-virtual {v5}, Lp0/a/a/p;->b()Lp0/a/a/p;
-
-    move-result-object v5
-
-    :goto_2
-    if-eq v4, v5, :cond_1
-
-    new-instance v6, Lp0/a/a/j;
-
-    iget-object v7, v4, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    invoke-direct {v6, p2, v0, v7}, Lp0/a/a/j;-><init>(ILp0/a/a/p;Lp0/a/a/j;)V
-
-    iput-object v6, v4, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    iget-object v4, v4, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    goto :goto_2
-
-    :cond_1
-    iget-object p1, p1, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    goto :goto_0
-
-    :cond_2
-    iget-object p1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    iget-object p1, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v4, p0, Lp0/a/a/r;->d:I
-
-    iget-object v5, p0, Lp0/a/a/r;->h:Ljava/lang/String;
-
-    iget v6, p0, Lp0/a/a/r;->j:I
-
-    invoke-virtual {p1, v1, v4, v5, v6}, Lp0/a/a/m;->n(Lp0/a/a/v;ILjava/lang/String;I)V
-
-    invoke-virtual {p1, p0}, Lp0/a/a/m;->a(Lp0/a/a/r;)V
-
-    iget-object p1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    sget-object v1, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    iput-object v1, p1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    const/4 v1, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_3
-    sget-object v5, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    if-eq p1, v5, :cond_6
-
-    iget-object v5, p1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iput-object v2, p1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iget-short v6, p1, Lp0/a/a/p;->a:S
-
-    or-int/lit8 v6, v6, 0x8
-
-    int-to-short v6, v6
-
-    iput-short v6, p1, Lp0/a/a/p;->a:S
-
-    iget-object v6, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object v6, v6, Lp0/a/a/m;->c:[I
-
-    array-length v6, v6
-
-    iget-short v7, p1, Lp0/a/a/p;->h:S
-
-    add-int/2addr v6, v7
-
-    if-le v6, v4, :cond_3
-
-    move v4, v6
-
-    :cond_3
-    iget-object v6, p1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    :goto_4
-    if-eqz v6, :cond_5
-
-    iget-object v7, v6, Lp0/a/a/j;->b:Lp0/a/a/p;
-
-    invoke-virtual {v7}, Lp0/a/a/p;->b()Lp0/a/a/p;
-
-    move-result-object v7
-
-    iget-object v8, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object v9, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v10, v7, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget v11, v6, Lp0/a/a/j;->a:I
-
-    invoke-virtual {v8, v9, v10, v11}, Lp0/a/a/m;->h(Lp0/a/a/v;Lp0/a/a/m;I)Z
-
-    move-result v8
-
-    if-eqz v8, :cond_4
-
-    iget-object v8, v7, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    if-nez v8, :cond_4
-
-    iput-object v5, v7, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    move-object v5, v7
-
-    :cond_4
-    iget-object v6, v6, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    goto :goto_4
-
-    :cond_5
-    move-object p1, v5
-
-    goto :goto_3
-
-    :cond_6
-    iget-object p1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    :goto_5
-    if-eqz p1, :cond_b
-
-    iget-short v2, p1, Lp0/a/a/p;->a:S
-
-    const/16 v5, 0xa
-
-    and-int/2addr v2, v5
-
-    if-ne v2, v5, :cond_7
-
-    iget-object v2, p1, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    invoke-virtual {v2, p0}, Lp0/a/a/m;->a(Lp0/a/a/r;)V
-
-    :cond_7
-    iget-short v2, p1, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v2, v2, 0x8
-
-    if-nez v2, :cond_a
-
-    iget-object v2, p1, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    iget v5, p1, Lp0/a/a/p;->d:I
-
-    if-nez v2, :cond_8
-
-    iget-object v6, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v6, v6, Lp0/a/a/c;->b:I
-
-    goto :goto_6
-
-    :cond_8
-    iget v6, v2, Lp0/a/a/p;->d:I
-
-    :goto_6
-    sub-int/2addr v6, v3
-
-    if-lt v6, v5, :cond_a
-
-    move v7, v5
-
-    :goto_7
-    if-ge v7, v6, :cond_9
-
-    iget-object v8, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget-object v8, v8, Lp0/a/a/c;->a:[B
-
-    aput-byte v1, v8, v7
-
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_7
-
-    :cond_9
-    iget-object v7, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget-object v7, v7, Lp0/a/a/c;->a:[B
-
-    const/16 v8, -0x41
-
-    aput-byte v8, v7, v6
-
-    invoke-virtual {p0, v5, v1, v3}, Lp0/a/a/r;->A(III)I
-
-    const/4 v5, 0x3
-
-    iget-object v6, p0, Lp0/a/a/r;->W:[I
-
-    iget-object v7, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v7, v0}, Lp0/a/a/v;->n(Ljava/lang/String;)I
-
-    move-result v7
-
-    or-int/2addr v7, p2
-
-    aput v7, v6, v5
-
-    invoke-virtual {p0}, Lp0/a/a/r;->z()V
-
-    iget-object v5, p0, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    invoke-static {v5, p1, v2}, Lp0/a/a/o;->a(Lp0/a/a/o;Lp0/a/a/p;Lp0/a/a/p;)Lp0/a/a/o;
-
-    move-result-object v2
-
-    iput-object v2, p0, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    invoke-static {v4, v3}, Ljava/lang/Math;->max(II)I
-
-    move-result v2
-
-    move v4, v2
-
-    :cond_a
-    iget-object p1, p1, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    goto :goto_5
-
-    :cond_b
-    iput v4, p0, Lp0/a/a/r;->i:I
-
-    goto/16 :goto_12
-
-    :cond_c
-    if-ne v0, v3, :cond_1d
-
-    iget-object p1, p0, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    :goto_8
-    const p2, 0x7fffffff
-
-    if-eqz p1, :cond_f
-
-    iget-object v0, p1, Lp0/a/a/o;->c:Lp0/a/a/p;
-
-    iget-object v1, p1, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    iget-object v4, p1, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    :goto_9
-    if-eq v1, v4, :cond_e
-
-    iget-short v5, v1, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v5, v5, 0x10
-
-    if-nez v5, :cond_d
-
-    new-instance v5, Lp0/a/a/j;
-
-    iget-object v6, v1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    invoke-direct {v5, p2, v0, v6}, Lp0/a/a/j;-><init>(ILp0/a/a/p;Lp0/a/a/j;)V
-
-    iput-object v5, v1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    goto :goto_a
-
-    :cond_d
-    iget-object v5, v1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    iget-object v5, v5, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    new-instance v6, Lp0/a/a/j;
-
-    iget-object v7, v5, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    invoke-direct {v6, p2, v0, v7}, Lp0/a/a/j;-><init>(ILp0/a/a/p;Lp0/a/a/j;)V
-
-    iput-object v6, v5, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    :goto_a
-    iget-object v1, v1, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    goto :goto_9
-
-    :cond_e
-    iget-object p1, p1, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    goto :goto_8
-
-    :cond_f
-    iget-boolean p1, p0, Lp0/a/a/r;->X:Z
-
-    if-eqz p1, :cond_16
-
-    iget-object p1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    invoke-virtual {p1, v3}, Lp0/a/a/p;->c(S)V
-
-    const/4 p1, 0x1
-
-    const/4 v0, 0x1
-
-    :goto_b
-    if-gt p1, v0, :cond_12
-
-    iget-object v1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    :goto_c
-    if-eqz v1, :cond_11
-
-    iget-short v4, v1, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v4, v4, 0x10
-
-    if-eqz v4, :cond_10
-
-    iget-short v4, v1, Lp0/a/a/p;->i:S
-
-    if-ne v4, p1, :cond_10
-
-    iget-object v4, v1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    iget-object v4, v4, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    iget-object v4, v4, Lp0/a/a/j;->b:Lp0/a/a/p;
-
-    iget-short v5, v4, Lp0/a/a/p;->i:S
-
-    if-nez v5, :cond_10
-
-    add-int/lit8 v0, v0, 0x1
-
-    int-to-short v0, v0
-
-    invoke-virtual {v4, v0}, Lp0/a/a/p;->c(S)V
-
-    :cond_10
-    iget-object v1, v1, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    goto :goto_c
-
-    :cond_11
-    add-int/lit8 p1, p1, 0x1
-
-    int-to-short p1, p1
-
-    goto :goto_b
-
-    :cond_12
-    iget-object p1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    :goto_d
-    if-eqz p1, :cond_16
-
-    iget-short v0, p1, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v0, v0, 0x10
-
-    if-eqz v0, :cond_15
-
-    iget-object v0, p1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    iget-object v0, v0, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    iget-object v0, v0, Lp0/a/a/j;->b:Lp0/a/a/p;
-
-    sget-object v1, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    iput-object v1, v0, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    :goto_e
-    sget-object v4, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    if-eq v0, v4, :cond_14
-
-    iget-object v4, v0, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iput-object v1, v0, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iget-short v1, v0, Lp0/a/a/p;->a:S
-
-    and-int/lit8 v1, v1, 0x40
-
-    if-eqz v1, :cond_13
-
-    iget-short v1, v0, Lp0/a/a/p;->i:S
-
-    iget-short v5, p1, Lp0/a/a/p;->i:S
-
-    if-eq v1, v5, :cond_13
-
-    new-instance v1, Lp0/a/a/j;
-
-    iget-short v5, v0, Lp0/a/a/p;->g:S
-
-    iget-object v6, p1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    iget-object v6, v6, Lp0/a/a/j;->b:Lp0/a/a/p;
-
-    iget-object v7, v0, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    invoke-direct {v1, v5, v6, v7}, Lp0/a/a/j;-><init>(ILp0/a/a/p;Lp0/a/a/j;)V
-
-    iput-object v1, v0, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    :cond_13
-    invoke-virtual {v0, v4}, Lp0/a/a/p;->d(Lp0/a/a/p;)Lp0/a/a/p;
-
-    move-result-object v1
-
-    move-object v12, v1
-
-    move-object v1, v0
-
-    move-object v0, v12
-
-    goto :goto_e
-
-    :cond_14
-    :goto_f
-    sget-object v0, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    if-eq v1, v0, :cond_15
-
-    iget-object v0, v1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iput-object v2, v1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    move-object v1, v0
-
-    goto :goto_f
-
-    :cond_15
-    iget-object p1, p1, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    goto :goto_d
-
-    :cond_16
-    iget-object p1, p0, Lp0/a/a/r;->O:Lp0/a/a/p;
-
-    sget-object v0, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    iput-object v0, p1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iget v0, p0, Lp0/a/a/r;->i:I
-
-    :cond_17
-    sget-object v1, Lp0/a/a/p;->n:Lp0/a/a/p;
-
-    if-eq p1, v1, :cond_1c
-
-    iget-object v1, p1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    iget-short v2, p1, Lp0/a/a/p;->f:S
-
-    iget-short v4, p1, Lp0/a/a/p;->h:S
-
-    add-int/2addr v4, v2
-
-    if-le v4, v0, :cond_18
-
-    move v0, v4
-
-    :cond_18
-    iget-object v4, p1, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    iget-short p1, p1, Lp0/a/a/p;->a:S
-
-    and-int/lit8 p1, p1, 0x10
-
-    if-eqz p1, :cond_19
-
-    iget-object v4, v4, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    :cond_19
-    move-object p1, v1
-
-    :goto_10
-    if-eqz v4, :cond_17
-
-    iget-object v1, v4, Lp0/a/a/j;->b:Lp0/a/a/p;
-
-    iget-object v5, v1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    if-nez v5, :cond_1b
-
-    iget v5, v4, Lp0/a/a/j;->a:I
-
-    if-ne v5, p2, :cond_1a
-
-    const/4 v5, 0x1
-
-    goto :goto_11
-
-    :cond_1a
-    add-int/2addr v5, v2
-
-    :goto_11
-    int-to-short v5, v5
-
-    iput-short v5, v1, Lp0/a/a/p;->f:S
-
-    iput-object p1, v1, Lp0/a/a/p;->m:Lp0/a/a/p;
-
-    move-object p1, v1
-
-    :cond_1b
-    iget-object v4, v4, Lp0/a/a/j;->c:Lp0/a/a/j;
-
-    goto :goto_10
-
-    :cond_1c
-    iput v0, p0, Lp0/a/a/r;->i:I
-
-    goto :goto_12
-
-    :cond_1d
-    if-ne v0, v1, :cond_1e
-
-    iget p1, p0, Lp0/a/a/r;->S:I
-
-    iput p1, p0, Lp0/a/a/r;->i:I
-
-    goto :goto_12
-
-    :cond_1e
-    iput p1, p0, Lp0/a/a/r;->i:I
-
-    iput p2, p0, Lp0/a/a/r;->j:I
-
-    :goto_12
-    return-void
-.end method
-
-.method public p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-    .locals 1
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    iput v0, p0, Lp0/a/a/r;->Z:I
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    if-eqz p5, :cond_0
-
-    const/16 p5, 0xb
-
-    goto :goto_0
-
-    :cond_0
-    const/16 p5, 0xa
-
-    :goto_0
-    invoke-virtual {v0, p5, p2, p3, p4}, Lp0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lp0/a/a/v$a;
-
-    move-result-object p2
-
-    const/4 p3, 0x0
-
-    const/16 p4, 0xb9
-
-    if-ne p1, p4, :cond_1
-
-    iget-object p5, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, p2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p5, p4, v0}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    invoke-virtual {p2}, Lp0/a/a/u;->a()I
-
-    move-result p4
-
-    shr-int/lit8 p4, p4, 0x2
-
-    invoke-virtual {p5, p4, p3}, Lp0/a/a/c;->c(II)Lp0/a/a/c;
-
-    goto :goto_1
-
-    :cond_1
-    iget-object p4, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget p5, p2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p4, p1, p5}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    :goto_1
-    iget-object p4, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz p4, :cond_6
-
-    iget p4, p0, Lp0/a/a/r;->N:I
-
-    const/4 p5, 0x4
-
-    if-eq p4, p5, :cond_5
-
-    const/4 p5, 0x3
-
-    if-ne p4, p5, :cond_2
-
-    goto :goto_3
-
-    :cond_2
-    invoke-virtual {p2}, Lp0/a/a/u;->a()I
-
-    move-result p2
-
-    and-int/lit8 p3, p2, 0x3
-
-    shr-int/lit8 p2, p2, 0x2
-
-    sub-int/2addr p3, p2
-
-    const/16 p2, 0xb8
-
-    if-ne p1, p2, :cond_3
-
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    add-int/2addr p1, p3
-
-    add-int/lit8 p1, p1, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    add-int/2addr p1, p3
-
-    :goto_2
-    iget p2, p0, Lp0/a/a/r;->S:I
-
-    if-le p1, p2, :cond_4
-
-    iput p1, p0, Lp0/a/a/r;->S:I
-
-    :cond_4
-    iput p1, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_4
-
-    :cond_5
-    :goto_3
-    iget-object p4, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object p4, p4, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object p5, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {p4, p1, p3, p2, p5}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_6
-    :goto_4
-    return-void
-.end method
-
-.method public varargs q(IILp0/a/a/p;[Lp0/a/a/p;)V
-    .locals 4
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, v0, Lp0/a/a/c;->b:I
-
-    iput v1, p0, Lp0/a/a/r;->Z:I
-
-    const/16 v1, 0xaa
-
-    invoke-virtual {v0, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v1, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, v1, Lp0/a/a/c;->b:I
-
-    rem-int/lit8 v1, v1, 0x4
-
-    rsub-int/lit8 v1, v1, 0x4
-
-    rem-int/lit8 v1, v1, 0x4
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v0, v2, v3, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, p0, Lp0/a/a/r;->Z:I
-
-    const/4 v2, 0x1
-
-    invoke-virtual {p3, v0, v1, v2}, Lp0/a/a/p;->e(Lp0/a/a/c;IZ)V
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    invoke-virtual {v0, p2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    array-length p1, p4
-
-    :goto_0
-    if-ge v3, p1, :cond_0
-
-    aget-object p2, p4, v3
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, p0, Lp0/a/a/r;->Z:I
-
-    invoke-virtual {p2, v0, v1, v2}, Lp0/a/a/p;->e(Lp0/a/a/c;IZ)V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0, p3, p4}, Lp0/a/a/r;->B(Lp0/a/a/p;[Lp0/a/a/p;)V
-
-    return-void
-.end method
-
-.method public r(ILp0/a/a/x;Ljava/lang/String;Z)Lp0/a/a/a;
-    .locals 1
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    invoke-static {p1, v0}, Lf/n/a/k/a;->S(ILp0/a/a/c;)V
-
-    invoke-static {p2, v0}, Lp0/a/a/x;->a(Lp0/a/a/x;Lp0/a/a/c;)V
-
-    iget-object p1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {p1, p3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 p1, 0x1
-
-    if-eqz p4, :cond_0
-
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/r;->H:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->H:Lp0/a/a/a;
-
-    return-object p2
-
-    :cond_0
-    new-instance p2, Lp0/a/a/a;
-
-    iget-object p3, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object p4, p0, Lp0/a/a/r;->I:Lp0/a/a/a;
-
-    invoke-direct {p2, p3, p1, v0, p4}, Lp0/a/a/a;-><init>(Lp0/a/a/v;ZLp0/a/a/c;Lp0/a/a/a;)V
-
-    iput-object p2, p0, Lp0/a/a/r;->I:Lp0/a/a/a;
-
-    return-object p2
-.end method
-
-.method public s(ILjava/lang/String;)V
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    iput v0, p0, Lp0/a/a/r;->Z:I
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const/4 v1, 0x7
-
-    invoke-virtual {v0, v1, p2}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p2
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v1, p2, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v0, p1, v1}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v0, :cond_3
-
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    const/4 v1, 0x4
-
-    if-eq v0, v1, :cond_2
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/16 p2, 0xbb
-
-    if-ne p1, p2, :cond_3
-
-    iget p1, p0, Lp0/a/a/r;->R:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iget p2, p0, Lp0/a/a/r;->S:I
-
-    if-le p1, p2, :cond_1
-
-    iput p1, p0, Lp0/a/a/r;->S:I
-
-    :cond_1
-    iput p1, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget v1, p0, Lp0/a/a/r;->Z:I
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, p1, v1, p2, v2}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_3
-    :goto_1
-    return-void
-.end method
-
-.method public t(II)V
-    .locals 6
-
-    iget-object v0, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    iput v0, p0, Lp0/a/a/r;->Z:I
-
-    const/16 v0, 0xa9
-
-    const/16 v1, 0x36
-
-    const/4 v2, 0x4
-
-    if-ge p2, v2, :cond_1
-
-    if-eq p1, v0, :cond_1
-
-    if-ge p1, v1, :cond_0
-
-    add-int/lit8 v3, p1, -0x15
-
-    shl-int/lit8 v3, v3, 0x2
-
-    add-int/lit8 v3, v3, 0x1a
-
-    goto :goto_0
-
-    :cond_0
-    add-int/lit8 v3, p1, -0x36
-
-    shl-int/lit8 v3, v3, 0x2
-
-    add-int/lit8 v3, v3, 0x3b
-
-    :goto_0
-    add-int/2addr v3, p2
-
-    iget-object v4, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    invoke-virtual {v4, v3}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    goto :goto_1
-
-    :cond_1
-    const/16 v3, 0x100
-
-    if-lt p2, v3, :cond_2
-
-    iget-object v3, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    const/16 v4, 0xc4
-
-    invoke-virtual {v3, v4}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v3, p1, p2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    goto :goto_1
-
-    :cond_2
-    iget-object v3, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    invoke-virtual {v3, p1, p2}, Lp0/a/a/c;->c(II)Lp0/a/a/c;
-
-    :goto_1
-    iget-object v3, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    if-eqz v3, :cond_7
-
-    iget v4, p0, Lp0/a/a/r;->N:I
-
-    if-eq v4, v2, :cond_6
-
-    const/4 v5, 0x3
-
-    if-ne v4, v5, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    if-ne p1, v0, :cond_4
-
-    iget-short v0, v3, Lp0/a/a/p;->a:S
-
-    or-int/lit8 v0, v0, 0x40
-
-    int-to-short v0, v0
-
-    iput-short v0, v3, Lp0/a/a/p;->a:S
-
-    iget v0, p0, Lp0/a/a/r;->R:I
-
-    int-to-short v0, v0
-
-    iput-short v0, v3, Lp0/a/a/p;->g:S
-
-    invoke-virtual {p0}, Lp0/a/a/r;->v()V
-
-    goto :goto_3
-
-    :cond_4
-    iget v0, p0, Lp0/a/a/r;->R:I
-
-    sget-object v3, Lp0/a/a/r;->c0:[I
-
-    aget v3, v3, p1
-
-    add-int/2addr v0, v3
-
-    iget v3, p0, Lp0/a/a/r;->S:I
-
-    if-le v0, v3, :cond_5
-
-    iput v0, p0, Lp0/a/a/r;->S:I
-
-    :cond_5
-    iput v0, p0, Lp0/a/a/r;->R:I
-
-    goto :goto_3
-
-    :cond_6
-    :goto_2
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget-object v0, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v0, p1, p2, v3, v3}, Lp0/a/a/m;->b(IILp0/a/a/u;Lp0/a/a/v;)V
-
-    :cond_7
-    :goto_3
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    if-eqz v0, :cond_a
-
-    const/16 v0, 0x16
-
-    if-eq p1, v0, :cond_9
-
-    const/16 v0, 0x18
-
-    if-eq p1, v0, :cond_9
-
-    const/16 v0, 0x37
-
-    if-eq p1, v0, :cond_9
-
-    const/16 v0, 0x39
-
-    if-ne p1, v0, :cond_8
-
-    goto :goto_4
-
-    :cond_8
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_5
-
-    :cond_9
-    :goto_4
-    add-int/lit8 p2, p2, 0x2
-
-    :goto_5
-    iget v0, p0, Lp0/a/a/r;->j:I
-
-    if-le p2, v0, :cond_a
-
-    iput p2, p0, Lp0/a/a/r;->j:I
-
-    :cond_a
-    if-lt p1, v1, :cond_b
-
-    iget p1, p0, Lp0/a/a/r;->N:I
-
-    if-ne p1, v2, :cond_b
-
-    iget-object p1, p0, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    if-eqz p1, :cond_b
-
-    new-instance p1, Lp0/a/a/p;
-
-    invoke-direct {p1}, Lp0/a/a/p;-><init>()V
-
-    invoke-virtual {p0, p1}, Lp0/a/a/r;->i(Lp0/a/a/p;)V
-
-    :cond_b
-    return-void
-.end method
-
-.method public final u(ILp0/a/a/p;)V
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    new-instance v1, Lp0/a/a/j;
-
-    iget-object v2, v0, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    invoke-direct {v1, p1, p2, v2}, Lp0/a/a/j;-><init>(ILp0/a/a/p;Lp0/a/a/j;)V
-
-    iput-object v1, v0, Lp0/a/a/p;->l:Lp0/a/a/j;
-
-    return-void
-.end method
-
-.method public final v()V
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/r;->N:I
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x4
-
-    if-ne v0, v2, :cond_0
-
-    new-instance v0, Lp0/a/a/p;
-
-    invoke-direct {v0}, Lp0/a/a/p;-><init>()V
-
-    new-instance v2, Lp0/a/a/m;
-
-    invoke-direct {v2, v0}, Lp0/a/a/m;-><init>(Lp0/a/a/p;)V
-
-    iput-object v2, v0, Lp0/a/a/p;->j:Lp0/a/a/m;
-
-    iget-object v2, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget-object v3, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {v0, v3, v2}, Lp0/a/a/p;->f([BI)Z
-
-    iget-object v2, p0, Lp0/a/a/r;->P:Lp0/a/a/p;
-
-    iput-object v0, v2, Lp0/a/a/p;->k:Lp0/a/a/p;
-
-    iput-object v0, p0, Lp0/a/a/r;->P:Lp0/a/a/p;
-
-    iput-object v1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v2, 0x1
-
-    if-ne v0, v2, :cond_1
-
-    iget-object v0, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    iget v2, p0, Lp0/a/a/r;->S:I
-
-    int-to-short v2, v2
-
-    iput-short v2, v0, Lp0/a/a/p;->h:S
-
-    iput-object v1, p0, Lp0/a/a/r;->Q:Lp0/a/a/p;
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public final w(II)V
-    .locals 10
-
-    :goto_0
-    if-ge p1, p2, :cond_a
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v1, p0, Lp0/a/a/r;->W:[I
-
-    aget v1, v1, p1
-
-    iget-object v2, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    const/high16 v3, -0x10000000
-
-    and-int/2addr v3, v1
-
-    shr-int/lit8 v3, v3, 0x1c
-
-    const/4 v4, 0x7
-
-    const/high16 v5, 0x2000000
-
-    const/high16 v6, 0xf000000
-
-    const v7, 0xfffff
-
-    if-nez v3, :cond_3
-
-    and-int v3, v1, v7
-
-    and-int/2addr v1, v6
-
-    const/high16 v6, 0x1000000
-
-    if-eq v1, v6, :cond_2
-
-    if-eq v1, v5, :cond_1
-
-    const/high16 v4, 0x3000000
-
-    if-ne v1, v4, :cond_0
-
-    const/16 v1, 0x8
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v0, v0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    aget-object v0, v0, v3
-
-    iget-wide v0, v0, Lp0/a/a/u;->f:J
-
-    long-to-int v1, v0
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto/16 :goto_3
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_1
-    invoke-virtual {v2, v4}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v1, v0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    aget-object v1, v1, v3
-
-    iget-object v1, v1, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v2, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto/16 :goto_3
-
-    :cond_2
-    invoke-virtual {v2, v3}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    goto/16 :goto_3
-
-    :cond_3
-    new-instance v8, Ljava/lang/StringBuilder;
-
-    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
-
-    :goto_1
-    add-int/lit8 v9, v3, -0x1
-
-    if-lez v3, :cond_4
-
-    const/16 v3, 0x5b
-
-    invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    move v3, v9
-
-    goto :goto_1
-
-    :cond_4
-    and-int v3, v1, v6
-
-    if-ne v3, v5, :cond_5
-
-    const/16 v3, 0x4c
-
-    invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    and-int/2addr v1, v7
-
-    iget-object v3, v0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    aget-object v1, v3, v1
-
-    iget-object v1, v1, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x3b
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :cond_5
-    and-int/2addr v1, v7
-
-    const/4 v3, 0x1
-
-    if-eq v1, v3, :cond_9
-
-    const/4 v3, 0x2
-
-    if-eq v1, v3, :cond_8
-
-    const/4 v3, 0x3
-
-    if-eq v1, v3, :cond_7
-
-    const/4 v3, 0x4
-
-    if-eq v1, v3, :cond_6
-
-    packed-switch v1, :pswitch_data_0
-
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :pswitch_0
-    const/16 v1, 0x53
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :pswitch_1
-    const/16 v1, 0x43
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :pswitch_2
-    const/16 v1, 0x42
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :pswitch_3
-    const/16 v1, 0x5a
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :cond_6
-    const/16 v1, 0x4a
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :cond_7
-    const/16 v1, 0x44
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :cond_8
-    const/16 v1, 0x46
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_2
-
-    :cond_9
-    const/16 v1, 0x49
-
-    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :goto_2
-    invoke-virtual {v2, v4}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v0
-
-    iget v0, v0, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v2, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_3
-    add-int/lit8 p1, p1, 0x1
-
-    goto/16 :goto_0
-
-    :cond_a
-    return-void
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x9
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public final x(Ljava/lang/Object;)V
-    .locals 2
-
-    instance-of v0, p1, Ljava/lang/Integer;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    check-cast p1, Ljava/lang/Integer;
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v0, p1, Ljava/lang/String;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    const/4 v1, 0x7
-
-    invoke-virtual {v0, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    check-cast p1, Ljava/lang/String;
-
-    invoke-virtual {v1, p1}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    iget p1, p1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    const/16 v1, 0x8
-
-    invoke-virtual {v0, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    check-cast p1, Lp0/a/a/p;
-
-    iget p1, p1, Lp0/a/a/p;->d:I
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_0
-    return-void
-.end method
-
-.method public y(Lp0/a/a/c;)V
-    .locals 13
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v0, v0, Lp0/a/a/v;->c:I
-
-    const/4 v1, 0x0
-
-    const/16 v2, 0x31
-
-    if-ge v0, v2, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    const/16 v2, 0x1000
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    iget v3, p0, Lp0/a/a/r;->d:I
-
-    not-int v2, v2
-
-    and-int/2addr v2, v3
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v2, p0, Lp0/a/a/r;->e:I
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v2, p0, Lp0/a/a/r;->g:I
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v2, p0, Lp0/a/a/r;->a0:I
-
-    if-eqz v2, :cond_2
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v0, v0, Lp0/a/a/v;->b:Lp0/a/a/d;
-
-    iget-object v0, v0, Lp0/a/a/d;->a:[B
-
-    iget v1, p0, Lp0/a/a/r;->b0:I
-
-    invoke-virtual {p1, v0, v2, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    return-void
-
-    :cond_2
-    iget-object v2, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    if-lez v2, :cond_3
-
-    const/4 v2, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_2
-    iget v3, p0, Lp0/a/a/r;->y:I
-
-    if-lez v3, :cond_4
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_4
-    iget v3, p0, Lp0/a/a/r;->d:I
-
-    and-int/lit16 v3, v3, 0x1000
-
-    if-eqz v3, :cond_5
-
-    if-eqz v0, :cond_5
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_5
-    iget v3, p0, Lp0/a/a/r;->A:I
-
-    if-eqz v3, :cond_6
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_6
-    iget v3, p0, Lp0/a/a/r;->d:I
-
-    const/high16 v4, 0x20000
-
-    and-int/2addr v3, v4
-
-    if-eqz v3, :cond_7
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_7
-    iget-object v3, p0, Lp0/a/a/r;->B:Lp0/a/a/a;
-
-    if-eqz v3, :cond_8
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_8
-    iget-object v3, p0, Lp0/a/a/r;->C:Lp0/a/a/a;
-
-    if-eqz v3, :cond_9
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_9
-    iget-object v3, p0, Lp0/a/a/r;->E:[Lp0/a/a/a;
-
-    if-eqz v3, :cond_a
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_a
-    iget-object v3, p0, Lp0/a/a/r;->G:[Lp0/a/a/a;
-
-    if-eqz v3, :cond_b
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_b
-    iget-object v3, p0, Lp0/a/a/r;->H:Lp0/a/a/a;
-
-    if-eqz v3, :cond_c
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_c
-    iget-object v3, p0, Lp0/a/a/r;->I:Lp0/a/a/a;
-
-    if-eqz v3, :cond_d
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_d
-    iget-object v3, p0, Lp0/a/a/r;->J:Lp0/a/a/c;
-
-    if-eqz v3, :cond_e
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_e
-    iget-object v3, p0, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    if-eqz v3, :cond_f
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_f
-    iget-object v3, p0, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    if-eqz v3, :cond_10
-
-    invoke-virtual {v3}, Lp0/a/a/b;->c()I
-
-    move-result v3
-
-    add-int/2addr v2, v3
-
-    :cond_10
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    const-string v3, "RuntimeInvisibleTypeAnnotations"
-
-    const-string v4, "RuntimeVisibleTypeAnnotations"
-
-    if-lez v2, :cond_23
-
-    add-int/lit8 v2, v2, 0xa
-
-    iget-object v5, p0, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    const/4 v6, 0x0
-
-    :goto_3
-    if-eqz v5, :cond_11
-
-    add-int/lit8 v6, v6, 0x1
-
-    iget-object v5, v5, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    goto :goto_3
-
-    :cond_11
-    mul-int/lit8 v6, v6, 0x8
-
-    add-int/lit8 v6, v6, 0x2
-
-    add-int/2addr v6, v2
-
-    iget-object v2, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    if-eqz v2, :cond_12
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x8
-
-    add-int/2addr v6, v2
-
-    const/4 v2, 0x1
-
-    goto :goto_4
-
-    :cond_12
-    const/4 v2, 0x0
-
-    :goto_4
-    iget-object v5, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    if-eqz v5, :cond_13
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v5, v5, 0x8
-
-    add-int/2addr v6, v5
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_13
-    iget-object v5, p0, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    if-eqz v5, :cond_14
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v5, v5, 0x8
-
-    add-int/2addr v6, v5
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_14
-    iget-object v5, p0, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    if-eqz v5, :cond_15
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v5, v5, 0x8
-
-    add-int/2addr v6, v5
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_15
-    iget-object v5, p0, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    if-eqz v5, :cond_16
-
-    invoke-virtual {v5, v4}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v5
-
-    add-int/2addr v6, v5
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_16
-    iget-object v5, p0, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    if-eqz v5, :cond_17
-
-    invoke-virtual {v5, v3}, Lp0/a/a/a;->a(Ljava/lang/String;)I
-
-    move-result v5
-
-    add-int/2addr v6, v5
-
-    add-int/lit8 v2, v2, 0x1
-
-    :cond_17
-    iget-object v7, p0, Lp0/a/a/r;->x:Lp0/a/a/b;
-
-    if-eqz v7, :cond_18
-
-    iget-object v8, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v5, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget-object v9, v5, Lp0/a/a/c;->a:[B
-
-    iget v10, v5, Lp0/a/a/c;->b:I
-
-    iget v11, p0, Lp0/a/a/r;->i:I
-
-    iget v12, p0, Lp0/a/a/r;->j:I
-
-    invoke-virtual/range {v7 .. v12}, Lp0/a/a/b;->b(Lp0/a/a/v;[BIII)I
-
-    move-result v5
-
-    add-int/2addr v6, v5
-
-    iget-object v5, p0, Lp0/a/a/r;->x:Lp0/a/a/b;
-
-    invoke-virtual {v5}, Lp0/a/a/b;->c()I
-
-    move-result v5
-
-    add-int/2addr v2, v5
-
-    :cond_18
-    iget-object v5, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v7, "Code"
-
-    invoke-static {v5, v7, p1, v6}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v5, p0, Lp0/a/a/r;->i:I
-
-    invoke-virtual {p1, v5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v5, p0, Lp0/a/a/r;->j:I
-
-    invoke-virtual {p1, v5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v5, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v5}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget-object v5, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget-object v6, v5, Lp0/a/a/c;->a:[B
-
-    iget v5, v5, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v6, v1, v5}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    iget-object v5, p0, Lp0/a/a/r;->l:Lp0/a/a/o;
-
-    const/4 v6, 0x0
-
-    move-object v7, v5
-
-    :goto_5
-    if-eqz v7, :cond_19
-
-    add-int/lit8 v6, v6, 0x1
-
-    iget-object v7, v7, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    goto :goto_5
-
-    :cond_19
-    invoke-virtual {p1, v6}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :goto_6
-    if-eqz v5, :cond_1a
-
-    iget-object v6, v5, Lp0/a/a/o;->a:Lp0/a/a/p;
-
-    iget v6, v6, Lp0/a/a/p;->d:I
-
-    invoke-virtual {p1, v6}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v6, v5, Lp0/a/a/o;->b:Lp0/a/a/p;
-
-    iget v6, v6, Lp0/a/a/p;->d:I
-
-    invoke-virtual {p1, v6}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v6, v5, Lp0/a/a/o;->c:Lp0/a/a/p;
-
-    iget v6, v6, Lp0/a/a/p;->d:I
-
-    invoke-virtual {p1, v6}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v6, v5, Lp0/a/a/o;->d:I
-
-    invoke-virtual {p1, v6}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v5, v5, Lp0/a/a/o;->f:Lp0/a/a/o;
-
-    goto :goto_6
-
-    :cond_1a
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    if-eqz v2, :cond_1d
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v2, v2, Lp0/a/a/v;->c:I
-
-    const/16 v5, 0x32
-
-    if-lt v2, v5, :cond_1b
-
-    const/4 v2, 0x1
-
-    goto :goto_7
-
-    :cond_1b
-    const/4 v2, 0x0
-
-    :goto_7
-    iget-object v5, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    if-eqz v2, :cond_1c
-
-    const-string v2, "StackMapTable"
-
-    goto :goto_8
-
-    :cond_1c
-    const-string v2, "StackMap"
-
-    :goto_8
-    invoke-virtual {v5, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v2, p0, Lp0/a/a/r;->t:I
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v5, v1, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_1d
-    iget-object v2, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    if-eqz v2, :cond_1e
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v5, "LineNumberTable"
-
-    invoke-virtual {v2, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v2, p0, Lp0/a/a/r;->n:I
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->o:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v5, v1, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_1e
-    iget-object v2, p0, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    if-eqz v2, :cond_1f
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v5, "LocalVariableTable"
-
-    invoke-virtual {v2, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v2, p0, Lp0/a/a/r;->p:I
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->q:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v5, v1, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_1f
-    iget-object v2, p0, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    if-eqz v2, :cond_20
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v5, "LocalVariableTypeTable"
-
-    invoke-virtual {v2, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v2, v2, 0x2
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v2, p0, Lp0/a/a/r;->r:I
-
-    invoke-virtual {p1, v2}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v2, p0, Lp0/a/a/r;->s:Lp0/a/a/c;
-
-    iget-object v5, v2, Lp0/a/a/c;->a:[B
-
-    iget v2, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v5, v1, v2}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_20
-    iget-object v2, p0, Lp0/a/a/r;->v:Lp0/a/a/a;
-
-    if-eqz v2, :cond_21
-
-    iget-object v5, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v5, v4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v5
-
-    invoke-virtual {v2, v5, p1}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_21
-    iget-object v2, p0, Lp0/a/a/r;->w:Lp0/a/a/a;
-
-    if-eqz v2, :cond_22
-
-    iget-object v5, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v5, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v5
-
-    invoke-virtual {v2, v5, p1}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_22
-    iget-object v6, p0, Lp0/a/a/r;->x:Lp0/a/a/b;
-
-    if-eqz v6, :cond_23
-
-    iget-object v7, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget-object v2, p0, Lp0/a/a/r;->k:Lp0/a/a/c;
-
-    iget-object v8, v2, Lp0/a/a/c;->a:[B
-
-    iget v9, v2, Lp0/a/a/c;->b:I
-
-    iget v10, p0, Lp0/a/a/r;->i:I
-
-    iget v11, p0, Lp0/a/a/r;->j:I
-
-    const/4 v2, 0x2
-
-    move-object v12, p1
-
-    invoke-virtual/range {v6 .. v12}, Lp0/a/a/b;->e(Lp0/a/a/v;[BIIILp0/a/a/c;)V
-
-    goto :goto_9
-
-    :cond_23
-    const/4 v2, 0x2
-
-    :goto_9
-    iget v5, p0, Lp0/a/a/r;->y:I
-
-    if-lez v5, :cond_24
-
-    iget-object v5, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v6, "Exceptions"
-
-    invoke-virtual {v5, v6}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v5
-
-    invoke-virtual {p1, v5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget v5, p0, Lp0/a/a/r;->y:I
-
-    mul-int/lit8 v5, v5, 0x2
-
-    add-int/2addr v5, v2
-
-    invoke-virtual {p1, v5}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v5, p0, Lp0/a/a/r;->y:I
-
-    invoke-virtual {p1, v5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v5, p0, Lp0/a/a/r;->z:[I
-
-    array-length v6, v5
-
-    const/4 v7, 0x0
-
-    :goto_a
-    if-ge v7, v6, :cond_24
-
-    aget v8, v5, v7
-
-    invoke-virtual {p1, v8}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_a
-
-    :cond_24
-    iget v5, p0, Lp0/a/a/r;->d:I
-
-    and-int/lit16 v5, v5, 0x1000
-
-    if-eqz v5, :cond_25
-
-    if-eqz v0, :cond_25
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v5, "Synthetic"
-
-    invoke-static {v0, v5, p1, v1}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    :cond_25
-    iget v0, p0, Lp0/a/a/r;->A:I
-
-    if-eqz v0, :cond_26
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v5, "Signature"
-
-    invoke-static {v0, v5, p1, v2}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    iget v0, p0, Lp0/a/a/r;->A:I
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    :cond_26
-    iget v0, p0, Lp0/a/a/r;->d:I
-
-    const/high16 v2, 0x20000
-
-    and-int/2addr v0, v2
-
-    if-eqz v0, :cond_27
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v2, "Deprecated"
-
-    invoke-static {v0, v2, p1, v1}, Lf/e/b/a/a;->U(Lp0/a/a/v;Ljava/lang/String;Lp0/a/a/c;I)V
-
-    :cond_27
-    iget-object v0, p0, Lp0/a/a/r;->B:Lp0/a/a/a;
-
-    if-eqz v0, :cond_28
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v5, "RuntimeVisibleAnnotations"
-
-    invoke-virtual {v2, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v0, v2, p1}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_28
-    iget-object v0, p0, Lp0/a/a/r;->C:Lp0/a/a/a;
-
-    if-eqz v0, :cond_29
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v5, "RuntimeInvisibleAnnotations"
-
-    invoke-virtual {v2, v5}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v0, v2, p1}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_29
-    iget-object v0, p0, Lp0/a/a/r;->E:[Lp0/a/a/a;
-
-    if-eqz v0, :cond_2b
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v2, "RuntimeVisibleParameterAnnotations"
-
-    invoke-virtual {v0, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v0
-
-    iget-object v2, p0, Lp0/a/a/r;->E:[Lp0/a/a/a;
-
-    iget v5, p0, Lp0/a/a/r;->D:I
-
-    if-nez v5, :cond_2a
-
-    array-length v5, v2
-
-    :cond_2a
-    invoke-static {v0, v2, v5, p1}, Lp0/a/a/a;->d(I[Lp0/a/a/a;ILp0/a/a/c;)V
-
-    :cond_2b
-    iget-object v0, p0, Lp0/a/a/r;->G:[Lp0/a/a/a;
-
-    if-eqz v0, :cond_2d
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v2, "RuntimeInvisibleParameterAnnotations"
-
-    invoke-virtual {v0, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v0
-
-    iget-object v2, p0, Lp0/a/a/r;->G:[Lp0/a/a/a;
-
-    iget v5, p0, Lp0/a/a/r;->F:I
-
-    if-nez v5, :cond_2c
-
-    array-length v5, v2
-
-    :cond_2c
-    invoke-static {v0, v2, v5, p1}, Lp0/a/a/a;->d(I[Lp0/a/a/a;ILp0/a/a/c;)V
-
-    :cond_2d
-    iget-object v0, p0, Lp0/a/a/r;->H:Lp0/a/a/a;
-
-    if-eqz v0, :cond_2e
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v2, v4}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v0, v2, p1}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_2e
-    iget-object v0, p0, Lp0/a/a/r;->I:Lp0/a/a/a;
-
-    if-eqz v0, :cond_2f
-
-    iget-object v2, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v2, v3}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v0, v2, p1}, Lp0/a/a/a;->c(ILp0/a/a/c;)V
-
-    :cond_2f
-    iget-object v0, p0, Lp0/a/a/r;->J:Lp0/a/a/c;
-
-    if-eqz v0, :cond_30
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v2, "AnnotationDefault"
-
-    invoke-virtual {v0, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->J:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->J:Lp0/a/a/c;
-
-    iget-object v2, v0, Lp0/a/a/c;->a:[B
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v2, v1, v0}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_30
-    iget-object v0, p0, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    if-eqz v0, :cond_31
-
-    iget-object v0, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    const-string v2, "MethodParameters"
-
-    invoke-virtual {v0, v2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    iget v0, p0, Lp0/a/a/r;->K:I
-
-    invoke-virtual {p1, v0}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget-object v0, p0, Lp0/a/a/r;->L:Lp0/a/a/c;
-
-    iget-object v2, v0, Lp0/a/a/c;->a:[B
-
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    invoke-virtual {p1, v2, v1, v0}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :cond_31
-    iget-object v0, p0, Lp0/a/a/r;->M:Lp0/a/a/b;
-
-    if-eqz v0, :cond_32
-
-    iget-object v1, p0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    invoke-virtual {v0, v1, p1}, Lp0/a/a/b;->d(Lp0/a/a/v;Lp0/a/a/c;)V
-
-    :cond_32
-    return-void
-.end method
-
-.method public z()V
-    .locals 17
-
-    move-object/from16 v0, p0
-
-    iget-object v1, v0, Lp0/a/a/r;->V:[I
-
-    if-eqz v1, :cond_f
-
-    iget-object v1, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    if-nez v1, :cond_0
-
-    new-instance v1, Lp0/a/a/c;
-
-    invoke-direct {v1}, Lp0/a/a/c;-><init>()V
-
-    iput-object v1, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    :cond_0
-    iget-object v1, v0, Lp0/a/a/r;->W:[I
-
-    const/4 v2, 0x1
-
-    aget v3, v1, v2
-
-    const/4 v4, 0x2
-
-    aget v4, v1, v4
-
-    iget-object v5, v0, Lp0/a/a/r;->c:Lp0/a/a/v;
-
-    iget v5, v5, Lp0/a/a/v;->c:I
-
-    const/16 v6, 0x32
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x3
-
-    if-ge v5, v6, :cond_1
-
-    iget-object v5, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    aget v1, v1, v7
-
-    invoke-virtual {v5, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v5, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/2addr v3, v8
-
-    invoke-virtual {v0, v8, v3}, Lp0/a/a/r;->w(II)V
-
-    iget-object v1, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {v1, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/2addr v4, v3
-
-    invoke-virtual {v0, v3, v4}, Lp0/a/a/r;->w(II)V
-
-    goto/16 :goto_5
-
-    :cond_1
-    iget v5, v0, Lp0/a/a/r;->t:I
-
-    if-nez v5, :cond_2
-
-    aget v1, v1, v7
-
-    goto :goto_0
-
-    :cond_2
-    aget v1, v1, v7
-
-    iget-object v5, v0, Lp0/a/a/r;->V:[I
-
-    aget v5, v5, v7
-
-    sub-int/2addr v1, v5
-
-    sub-int/2addr v1, v2
-
-    :goto_0
-    iget-object v5, v0, Lp0/a/a/r;->V:[I
-
-    aget v5, v5, v2
-
-    sub-int v6, v3, v5
-
-    const/16 v9, 0xfb
-
-    const/16 v10, 0x40
-
-    const/16 v11, 0xf7
-
-    const/16 v12, 0xf8
-
-    const/16 v13, 0xfc
-
-    const/16 v14, 0xff
-
-    if-nez v4, :cond_4
-
-    packed-switch v6, :pswitch_data_0
-
-    goto :goto_1
-
-    :pswitch_0
-    const/16 v15, 0xfc
-
-    goto :goto_2
-
-    :pswitch_1
-    if-ge v1, v10, :cond_3
-
-    const/4 v15, 0x0
-
-    goto :goto_2
-
-    :cond_3
-    const/16 v15, 0xfb
-
-    goto :goto_2
-
-    :pswitch_2
-    const/16 v15, 0xf8
-
-    goto :goto_2
-
-    :cond_4
-    if-nez v6, :cond_6
-
-    if-ne v4, v2, :cond_6
-
-    const/16 v15, 0x3f
-
-    if-ge v1, v15, :cond_5
-
-    const/16 v15, 0x40
-
-    goto :goto_2
-
-    :cond_5
-    const/16 v15, 0xf7
-
-    goto :goto_2
-
-    :cond_6
-    :goto_1
-    const/16 v15, 0xff
-
-    :goto_2
-    if-eq v15, v14, :cond_8
-
-    const/16 v16, 0x3
-
-    :goto_3
-    if-ge v7, v5, :cond_8
-
-    if-ge v7, v3, :cond_8
-
-    iget-object v2, v0, Lp0/a/a/r;->W:[I
-
-    aget v2, v2, v16
-
-    iget-object v8, v0, Lp0/a/a/r;->V:[I
-
-    aget v8, v8, v16
-
-    if-eq v2, v8, :cond_7
-
-    const/16 v15, 0xff
-
-    goto :goto_4
-
-    :cond_7
-    add-int/lit8 v16, v16, 0x1
-
-    add-int/lit8 v7, v7, 0x1
-
-    const/4 v2, 0x1
-
-    const/4 v8, 0x3
-
-    goto :goto_3
-
-    :cond_8
-    :goto_4
-    if-eqz v15, :cond_e
-
-    if-eq v15, v10, :cond_d
-
-    if-eq v15, v11, :cond_c
-
-    if-eq v15, v12, :cond_b
-
-    if-eq v15, v9, :cond_a
-
-    if-eq v15, v13, :cond_9
-
-    iget-object v2, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {v2, v14}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    invoke-virtual {v2, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    const/4 v2, 0x3
-
-    add-int/2addr v3, v2
-
-    invoke-virtual {v0, v2, v3}, Lp0/a/a/r;->w(II)V
-
-    iget-object v1, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {v1, v4}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/2addr v4, v3
-
-    invoke-virtual {v0, v3, v4}, Lp0/a/a/r;->w(II)V
-
-    goto :goto_5
-
-    :cond_9
-    const/4 v2, 0x3
-
-    iget-object v4, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    add-int/2addr v6, v9
-
-    invoke-virtual {v4, v6}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v4, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/2addr v5, v2
-
-    add-int/2addr v3, v2
-
-    invoke-virtual {v0, v5, v3}, Lp0/a/a/r;->w(II)V
-
-    goto :goto_5
-
-    :cond_a
-    iget-object v2, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {v2, v9}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_5
-
-    :cond_b
-    iget-object v2, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    add-int/2addr v6, v9
-
-    invoke-virtual {v2, v6}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    goto :goto_5
-
-    :cond_c
-    iget-object v2, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {v2, v11}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v1, v3, 0x3
-
-    add-int/lit8 v3, v3, 0x4
-
-    invoke-virtual {v0, v1, v3}, Lp0/a/a/r;->w(II)V
-
-    goto :goto_5
-
-    :cond_d
-    iget-object v2, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    add-int/2addr v1, v10
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    add-int/lit8 v1, v3, 0x3
-
-    add-int/lit8 v3, v3, 0x4
-
-    invoke-virtual {v0, v1, v3}, Lp0/a/a/r;->w(II)V
-
-    goto :goto_5
-
-    :cond_e
-    iget-object v2, v0, Lp0/a/a/r;->u:Lp0/a/a/c;
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    :goto_5
-    iget v1, v0, Lp0/a/a/r;->t:I
-
-    const/4 v2, 0x1
-
-    add-int/2addr v1, v2
-
-    iput v1, v0, Lp0/a/a/r;->t:I
-
-    :cond_f
-    iget-object v1, v0, Lp0/a/a/r;->W:[I
-
-    iput-object v1, v0, Lp0/a/a/r;->V:[I
-
-    const/4 v1, 0x0
-
-    iput-object v1, v0, Lp0/a/a/r;->W:[I
-
-    return-void
-
-    :pswitch_data_0
-    .packed-switch -0x3
-        :pswitch_2
-        :pswitch_2
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-        :pswitch_0
-        :pswitch_0
-    .end packed-switch
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/s.smali b/com.discord/smali_classes2/p0/a/a/s.smali
deleted file mode 100644
index 7997f02484..0000000000
--- a/com.discord/smali_classes2/p0/a/a/s.smali
+++ /dev/null
@@ -1,93 +0,0 @@
-.class public final Lp0/a/a/s;
-.super Ljava/lang/Object;
-.source "ModuleWriter.java"
-
-
-# instance fields
-.field public final a:Lp0/a/a/v;
-
-.field public final b:I
-
-.field public final c:I
-
-.field public final d:I
-
-.field public e:I
-
-.field public final f:Lp0/a/a/c;
-
-.field public g:I
-
-.field public final h:Lp0/a/a/c;
-
-.field public i:I
-
-.field public final j:Lp0/a/a/c;
-
-.field public k:I
-
-.field public final l:Lp0/a/a/c;
-
-.field public m:I
-
-.field public final n:Lp0/a/a/c;
-
-.field public o:I
-
-.field public final p:Lp0/a/a/c;
-
-.field public q:I
-
-
-# direct methods
-.method public constructor <init>(Lp0/a/a/v;III)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/s;->a:Lp0/a/a/v;
-
-    iput p2, p0, Lp0/a/a/s;->b:I
-
-    iput p3, p0, Lp0/a/a/s;->c:I
-
-    iput p4, p0, Lp0/a/a/s;->d:I
-
-    new-instance p1, Lp0/a/a/c;
-
-    invoke-direct {p1}, Lp0/a/a/c;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/s;->f:Lp0/a/a/c;
-
-    new-instance p1, Lp0/a/a/c;
-
-    invoke-direct {p1}, Lp0/a/a/c;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/s;->h:Lp0/a/a/c;
-
-    new-instance p1, Lp0/a/a/c;
-
-    invoke-direct {p1}, Lp0/a/a/c;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/s;->j:Lp0/a/a/c;
-
-    new-instance p1, Lp0/a/a/c;
-
-    invoke-direct {p1}, Lp0/a/a/c;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/s;->l:Lp0/a/a/c;
-
-    new-instance p1, Lp0/a/a/c;
-
-    invoke-direct {p1}, Lp0/a/a/c;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/s;->n:Lp0/a/a/c;
-
-    new-instance p1, Lp0/a/a/c;
-
-    invoke-direct {p1}, Lp0/a/a/c;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/s;->p:Lp0/a/a/c;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/t.smali b/com.discord/smali_classes2/p0/a/a/t.smali
deleted file mode 100644
index 78b712a063..0000000000
--- a/com.discord/smali_classes2/p0/a/a/t.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public interface abstract Lp0/a/a/t;
-.super Ljava/lang/Object;
-.source "Opcodes.java"
-
-
-# static fields
-.field public static final a:Ljava/lang/Integer;
-
-.field public static final b:Ljava/lang/Integer;
-
-.field public static final c:Ljava/lang/Integer;
-
-.field public static final d:Ljava/lang/Integer;
-
-.field public static final e:Ljava/lang/Integer;
-
-.field public static final f:Ljava/lang/Integer;
-
-.field public static final g:Ljava/lang/Integer;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/a/a/t;->a:Ljava/lang/Integer;
-
-    const/4 v0, 0x1
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/a/a/t;->b:Ljava/lang/Integer;
-
-    const/4 v0, 0x2
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/a/a/t;->c:Ljava/lang/Integer;
-
-    const/4 v0, 0x3
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/a/a/t;->d:Ljava/lang/Integer;
-
-    const/4 v0, 0x4
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/a/a/t;->e:Ljava/lang/Integer;
-
-    const/4 v0, 0x5
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/a/a/t;->f:Ljava/lang/Integer;
-
-    const/4 v0, 0x6
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/a/a/t;->g:Ljava/lang/Integer;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/u.smali b/com.discord/smali_classes2/p0/a/a/u.smali
deleted file mode 100644
index 1b0014e255..0000000000
--- a/com.discord/smali_classes2/p0/a/a/u.smali
+++ /dev/null
@@ -1,64 +0,0 @@
-.class public abstract Lp0/a/a/u;
-.super Ljava/lang/Object;
-.source "Symbol.java"
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:I
-
-.field public final c:Ljava/lang/String;
-
-.field public final d:Ljava/lang/String;
-
-.field public final e:Ljava/lang/String;
-
-.field public final f:J
-
-.field public g:I
-
-
-# direct methods
-.method public constructor <init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lp0/a/a/u;->a:I
-
-    iput p2, p0, Lp0/a/a/u;->b:I
-
-    iput-object p3, p0, Lp0/a/a/u;->c:Ljava/lang/String;
-
-    iput-object p4, p0, Lp0/a/a/u;->d:Ljava/lang/String;
-
-    iput-object p5, p0, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    iput-wide p6, p0, Lp0/a/a/u;->f:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()I
-    .locals 1
-
-    iget v0, p0, Lp0/a/a/u;->g:I
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-static {v0}, Lp0/a/a/w;->b(Ljava/lang/String;)I
-
-    move-result v0
-
-    iput v0, p0, Lp0/a/a/u;->g:I
-
-    :cond_0
-    iget v0, p0, Lp0/a/a/u;->g:I
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/v$a.smali b/com.discord/smali_classes2/p0/a/a/v$a.smali
deleted file mode 100644
index e6f8d1da87..0000000000
--- a/com.discord/smali_classes2/p0/a/a/v$a.smali
+++ /dev/null
@@ -1,128 +0,0 @@
-.class public Lp0/a/a/v$a;
-.super Lp0/a/a/u;
-.source "SymbolTable.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lp0/a/a/v;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final h:I
-
-.field public i:Lp0/a/a/v$a;
-
-
-# direct methods
-.method public constructor <init>(IIJI)V
-    .locals 8
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    move-object v0, p0
-
-    move v1, p1
-
-    move v2, p2
-
-    move-wide v6, p3
-
-    invoke-direct/range {v0 .. v7}, Lp0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
-
-    iput p5, p0, Lp0/a/a/v$a;->h:I
-
-    return-void
-.end method
-
-.method public constructor <init>(IILjava/lang/String;I)V
-    .locals 8
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const-wide/16 v6, 0x0
-
-    move-object v0, p0
-
-    move v1, p1
-
-    move v2, p2
-
-    move-object v5, p3
-
-    invoke-direct/range {v0 .. v7}, Lp0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
-
-    iput p4, p0, Lp0/a/a/v$a;->h:I
-
-    return-void
-.end method
-
-.method public constructor <init>(IILjava/lang/String;JI)V
-    .locals 8
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    move-object v0, p0
-
-    move v1, p1
-
-    move v2, p2
-
-    move-object v5, p3
-
-    move-wide v6, p4
-
-    invoke-direct/range {v0 .. v7}, Lp0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
-
-    iput p6, p0, Lp0/a/a/v$a;->h:I
-
-    return-void
-.end method
-
-.method public constructor <init>(IILjava/lang/String;Ljava/lang/String;I)V
-    .locals 8
-
-    const/4 v3, 0x0
-
-    const-wide/16 v6, 0x0
-
-    move-object v0, p0
-
-    move v1, p1
-
-    move v2, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    invoke-direct/range {v0 .. v7}, Lp0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
-
-    iput p5, p0, Lp0/a/a/v$a;->h:I
-
-    return-void
-.end method
-
-.method public constructor <init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
-    .locals 0
-
-    invoke-direct/range {p0 .. p7}, Lp0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
-
-    iput p8, p0, Lp0/a/a/v$a;->h:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/v.smali b/com.discord/smali_classes2/p0/a/a/v.smali
deleted file mode 100644
index 46aa795f20..0000000000
--- a/com.discord/smali_classes2/p0/a/a/v.smali
+++ /dev/null
@@ -1,1854 +0,0 @@
-.class public final Lp0/a/a/v;
-.super Ljava/lang/Object;
-.source "SymbolTable.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lp0/a/a/v$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lp0/a/a/f;
-
-.field public final b:Lp0/a/a/d;
-
-.field public c:I
-
-.field public d:Ljava/lang/String;
-
-.field public e:I
-
-.field public f:[Lp0/a/a/v$a;
-
-.field public g:I
-
-.field public h:Lp0/a/a/c;
-
-.field public i:I
-
-.field public j:Lp0/a/a/c;
-
-.field public k:I
-
-.field public l:[Lp0/a/a/v$a;
-
-
-# direct methods
-.method public constructor <init>(Lp0/a/a/f;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/v;->a:Lp0/a/a/f;
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lp0/a/a/v;->b:Lp0/a/a/d;
-
-    const/16 p1, 0x100
-
-    new-array p1, p1, [Lp0/a/a/v$a;
-
-    iput-object p1, p0, Lp0/a/a/v;->f:[Lp0/a/a/v$a;
-
-    const/4 p1, 0x1
-
-    iput p1, p0, Lp0/a/a/v;->g:I
-
-    new-instance p1, Lp0/a/a/c;
-
-    invoke-direct {p1}, Lp0/a/a/c;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    return-void
-.end method
-
-.method public static r(II)I
-    .locals 0
-
-    add-int/2addr p0, p1
-
-    const p1, 0x7fffffff
-
-    and-int/2addr p0, p1
-
-    return p0
-.end method
-
-.method public static s(ILjava/lang/String;Ljava/lang/String;I)I
-    .locals 0
-
-    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
-
-    move-result p1
-
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
-
-    move-result p2
-
-    mul-int p2, p2, p1
-
-    add-int/lit8 p3, p3, 0x1
-
-    mul-int p3, p3, p2
-
-    add-int/2addr p3, p0
-
-    const p0, 0x7fffffff
-
-    and-int/2addr p0, p3
-
-    return p0
-.end method
-
-.method public static t(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
-    .locals 0
-
-    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
-
-    move-result p1
-
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
-
-    move-result p2
-
-    mul-int p2, p2, p1
-
-    invoke-virtual {p3}, Ljava/lang/String;->hashCode()I
-
-    move-result p1
-
-    mul-int p1, p1, p2
-
-    add-int/2addr p1, p0
-
-    const p0, 0x7fffffff
-
-    and-int/2addr p0, p1
-
-    return p0
-.end method
-
-.method public static u(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)I
-    .locals 0
-
-    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
-
-    move-result p1
-
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
-
-    move-result p2
-
-    mul-int p2, p2, p1
-
-    invoke-virtual {p3}, Ljava/lang/String;->hashCode()I
-
-    move-result p1
-
-    mul-int p1, p1, p2
-
-    mul-int p1, p1, p4
-
-    add-int/2addr p1, p0
-
-    const p0, 0x7fffffff
-
-    and-int/2addr p0, p1
-
-    return p0
-.end method
-
-
-# virtual methods
-.method public varargs a(Lp0/a/a/n;[Ljava/lang/Object;)Lp0/a/a/u;
-    .locals 9
-
-    iget-object v0, p0, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Lp0/a/a/c;
-
-    invoke-direct {v0}, Lp0/a/a/c;-><init>()V
-
-    iput-object v0, p0, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    :cond_0
-    array-length v1, p2
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_1
-
-    aget-object v4, p2, v3
-
-    invoke-virtual {p0, v4}, Lp0/a/a/v;->b(Ljava/lang/Object;)Lp0/a/a/u;
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    iget v1, v0, Lp0/a/a/c;->b:I
-
-    iget v4, p1, Lp0/a/a/n;->a:I
-
-    iget-object v5, p1, Lp0/a/a/n;->b:Ljava/lang/String;
-
-    iget-object v6, p1, Lp0/a/a/n;->c:Ljava/lang/String;
-
-    iget-object v7, p1, Lp0/a/a/n;->d:Ljava/lang/String;
-
-    iget-boolean v8, p1, Lp0/a/a/n;->e:Z
-
-    move-object v3, p0
-
-    invoke-virtual/range {v3 .. v8}, Lp0/a/a/v;->i(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lp0/a/a/u;
-
-    move-result-object v3
-
-    iget v3, v3, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v0, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    array-length v3, p2
-
-    invoke-virtual {v0, v3}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    array-length v3, p2
-
-    const/4 v4, 0x0
-
-    :goto_1
-    if-ge v4, v3, :cond_2
-
-    aget-object v5, p2, v4
-
-    invoke-virtual {p0, v5}, Lp0/a/a/v;->b(Ljava/lang/Object;)Lp0/a/a/u;
-
-    move-result-object v5
-
-    iget v5, v5, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v0, v5}, Lp0/a/a/c;->j(I)Lp0/a/a/c;
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    iget v0, v0, Lp0/a/a/c;->b:I
-
-    sub-int/2addr v0, v1
-
-    invoke-virtual {p1}, Lp0/a/a/n;->hashCode()I
-
-    move-result p1
-
-    array-length v3, p2
-
-    const/4 v4, 0x0
-
-    :goto_2
-    if-ge v4, v3, :cond_3
-
-    aget-object v5, p2, v4
-
-    invoke-virtual {v5}, Ljava/lang/Object;->hashCode()I
-
-    move-result v5
-
-    xor-int/2addr p1, v5
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const p2, 0x7fffffff
-
-    and-int v8, p1, p2
-
-    iget-object p1, p0, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    iget-object p1, p1, Lp0/a/a/c;->a:[B
-
-    iget-object p2, p0, Lp0/a/a/v;->f:[Lp0/a/a/v$a;
-
-    array-length v3, p2
-
-    rem-int v3, v8, v3
-
-    aget-object p2, p2, v3
-
-    :goto_3
-    if-eqz p2, :cond_7
-
-    iget v3, p2, Lp0/a/a/u;->b:I
-
-    const/16 v4, 0x40
-
-    if-ne v3, v4, :cond_6
-
-    iget v3, p2, Lp0/a/a/v$a;->h:I
-
-    if-ne v3, v8, :cond_6
-
-    iget-wide v3, p2, Lp0/a/a/u;->f:J
-
-    long-to-int v4, v3
-
-    const/4 v3, 0x0
-
-    :goto_4
-    if-ge v3, v0, :cond_5
-
-    add-int v5, v1, v3
-
-    aget-byte v5, p1, v5
-
-    add-int v6, v4, v3
-
-    aget-byte v6, p1, v6
-
-    if-eq v5, v6, :cond_4
-
-    const/4 v3, 0x0
-
-    goto :goto_5
-
-    :cond_4
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_4
-
-    :cond_5
-    const/4 v3, 0x1
-
-    :goto_5
-    if-eqz v3, :cond_6
-
-    iget-object p1, p0, Lp0/a/a/v;->j:Lp0/a/a/c;
-
-    iput v1, p1, Lp0/a/a/c;->b:I
-
-    goto :goto_6
-
-    :cond_6
-    iget-object p2, p2, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_3
-
-    :cond_7
-    new-instance p2, Lp0/a/a/v$a;
-
-    iget v4, p0, Lp0/a/a/v;->i:I
-
-    add-int/lit8 p1, v4, 0x1
-
-    iput p1, p0, Lp0/a/a/v;->i:I
-
-    const/16 v5, 0x40
-
-    int-to-long v6, v1
-
-    move-object v3, p2
-
-    invoke-direct/range {v3 .. v8}, Lp0/a/a/v$a;-><init>(IIJI)V
-
-    invoke-virtual {p0, p2}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    :goto_6
-    return-object p2
-.end method
-
-.method public b(Ljava/lang/Object;)Lp0/a/a/u;
-    .locals 6
-
-    instance-of v0, p1, Ljava/lang/Integer;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/lang/Integer;
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    instance-of v0, p1, Ljava/lang/Byte;
-
-    if-eqz v0, :cond_1
-
-    check-cast p1, Ljava/lang/Byte;
-
-    invoke-virtual {p1}, Ljava/lang/Byte;->intValue()I
-
-    move-result p1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_1
-    instance-of v0, p1, Ljava/lang/Character;
-
-    if-eqz v0, :cond_2
-
-    check-cast p1, Ljava/lang/Character;
-
-    invoke-virtual {p1}, Ljava/lang/Character;->charValue()C
-
-    move-result p1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_2
-    instance-of v0, p1, Ljava/lang/Short;
-
-    if-eqz v0, :cond_3
-
-    check-cast p1, Ljava/lang/Short;
-
-    invoke-virtual {p1}, Ljava/lang/Short;->intValue()I
-
-    move-result p1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_3
-    instance-of v0, p1, Ljava/lang/Boolean;
-
-    if-eqz v0, :cond_4
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->e(I)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_4
-    instance-of v0, p1, Ljava/lang/Float;
-
-    if-eqz v0, :cond_5
-
-    check-cast p1, Ljava/lang/Float;
-
-    invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Float;->floatToRawIntBits(F)I
-
-    move-result p1
-
-    const/4 v0, 0x4
-
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/v;->f(II)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_5
-    instance-of v0, p1, Ljava/lang/Long;
-
-    if-eqz v0, :cond_6
-
-    check-cast p1, Ljava/lang/Long;
-
-    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    const/4 p1, 0x5
-
-    invoke-virtual {p0, p1, v0, v1}, Lp0/a/a/v;->g(IJ)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_6
-    instance-of v0, p1, Ljava/lang/Double;
-
-    if-eqz v0, :cond_7
-
-    check-cast p1, Ljava/lang/Double;
-
-    invoke-virtual {p1}, Ljava/lang/Double;->doubleValue()D
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Double;->doubleToRawLongBits(D)J
-
-    move-result-wide v0
-
-    const/4 p1, 0x6
-
-    invoke-virtual {p0, p1, v0, v1}, Lp0/a/a/v;->g(IJ)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_7
-    instance-of v0, p1, Ljava/lang/String;
-
-    if-eqz v0, :cond_8
-
-    check-cast p1, Ljava/lang/String;
-
-    const/16 v0, 0x8
-
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_8
-    instance-of v0, p1, Lp0/a/a/w;
-
-    if-eqz v0, :cond_b
-
-    check-cast p1, Lp0/a/a/w;
-
-    invoke-virtual {p1}, Lp0/a/a/w;->i()I
-
-    move-result v0
-
-    const/16 v1, 0xa
-
-    if-ne v0, v1, :cond_9
-
-    invoke-virtual {p1}, Lp0/a/a/w;->g()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_9
-    const/16 v1, 0xb
-
-    if-ne v0, v1, :cond_a
-
-    invoke-virtual {p1}, Lp0/a/a/w;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    const/16 v0, 0x10
-
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_a
-    invoke-virtual {p1}, Lp0/a/a/w;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->c(Ljava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_b
-    instance-of v0, p1, Lp0/a/a/n;
-
-    if-eqz v0, :cond_c
-
-    check-cast p1, Lp0/a/a/n;
-
-    iget v1, p1, Lp0/a/a/n;->a:I
-
-    iget-object v2, p1, Lp0/a/a/n;->b:Ljava/lang/String;
-
-    iget-object v3, p1, Lp0/a/a/n;->c:Ljava/lang/String;
-
-    iget-object v4, p1, Lp0/a/a/n;->d:Ljava/lang/String;
-
-    iget-boolean v5, p1, Lp0/a/a/n;->e:Z
-
-    move-object v0, p0
-
-    invoke-virtual/range {v0 .. v5}, Lp0/a/a/v;->i(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_c
-    instance-of v0, p1, Lp0/a/a/g;
-
-    if-eqz v0, :cond_d
-
-    check-cast p1, Lp0/a/a/g;
-
-    iget-object v0, p1, Lp0/a/a/g;->a:Ljava/lang/String;
-
-    iget-object v1, p1, Lp0/a/a/g;->b:Ljava/lang/String;
-
-    iget-object v2, p1, Lp0/a/a/g;->c:Lp0/a/a/n;
-
-    iget-object p1, p1, Lp0/a/a/g;->d:[Ljava/lang/Object;
-
-    invoke-virtual {p0, v2, p1}, Lp0/a/a/v;->a(Lp0/a/a/n;[Ljava/lang/Object;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    iget p1, p1, Lp0/a/a/u;->a:I
-
-    const/16 v2, 0x11
-
-    invoke-virtual {p0, v2, v0, v1, p1}, Lp0/a/a/v;->d(ILjava/lang/String;Ljava/lang/String;I)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_d
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "value "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public c(Ljava/lang/String;)Lp0/a/a/u;
-    .locals 1
-
-    const/4 v0, 0x7
-
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final d(ILjava/lang/String;Ljava/lang/String;I)Lp0/a/a/u;
-    .locals 10
-
-    invoke-static {p1, p2, p3, p4}, Lp0/a/a/v;->s(ILjava/lang/String;Ljava/lang/String;I)I
-
-    move-result v8
-
-    invoke-virtual {p0, v8}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget v1, v0, Lp0/a/a/u;->b:I
-
-    if-ne v1, p1, :cond_0
-
-    iget v1, v0, Lp0/a/a/v$a;->h:I
-
-    if-ne v1, v8, :cond_0
-
-    iget-wide v1, v0, Lp0/a/a/u;->f:J
-
-    int-to-long v3, p4
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_0
-
-    iget-object v1, v0, Lp0/a/a/u;->d:Ljava/lang/String;
-
-    invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, v0, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v1, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    iget-object v0, v0, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    invoke-virtual {p0, p2, p3}, Lp0/a/a/v;->k(Ljava/lang/String;Ljava/lang/String;)I
-
-    move-result v1
-
-    invoke-virtual {v0, p1, p4, v1}, Lp0/a/a/c;->f(III)Lp0/a/a/c;
-
-    new-instance v9, Lp0/a/a/v$a;
-
-    iget v1, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v0, v1, 0x1
-
-    iput v0, p0, Lp0/a/a/v;->g:I
-
-    const/4 v3, 0x0
-
-    int-to-long v6, p4
-
-    move-object v0, v9
-
-    move v2, p1
-
-    move-object v4, p2
-
-    move-object v5, p3
-
-    invoke-direct/range {v0 .. v8}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
-
-    invoke-virtual {p0, v9}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    return-object v9
-.end method
-
-.method public e(I)Lp0/a/a/u;
-    .locals 1
-
-    const/4 v0, 0x3
-
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/v;->f(II)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final f(II)Lp0/a/a/u;
-    .locals 7
-
-    invoke-static {p1, p2}, Lp0/a/a/v;->r(II)I
-
-    move-result v5
-
-    invoke-virtual {p0, v5}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget v1, v0, Lp0/a/a/u;->b:I
-
-    if-ne v1, p1, :cond_0
-
-    iget v1, v0, Lp0/a/a/v$a;->h:I
-
-    if-ne v1, v5, :cond_0
-
-    iget-wide v1, v0, Lp0/a/a/u;->f:J
-
-    int-to-long v3, p2
-
-    cmp-long v6, v1, v3
-
-    if-nez v6, :cond_0
-
-    return-object v0
-
-    :cond_0
-    iget-object v0, v0, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    invoke-virtual {v0, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {v0, p2}, Lp0/a/a/c;->i(I)Lp0/a/a/c;
-
-    new-instance v6, Lp0/a/a/v$a;
-
-    iget v1, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v0, v1, 0x1
-
-    iput v0, p0, Lp0/a/a/v;->g:I
-
-    int-to-long v3, p2
-
-    move-object v0, v6
-
-    move v2, p1
-
-    invoke-direct/range {v0 .. v5}, Lp0/a/a/v$a;-><init>(IIJI)V
-
-    invoke-virtual {p0, v6}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    return-object v6
-.end method
-
-.method public final g(IJ)Lp0/a/a/u;
-    .locals 10
-
-    long-to-int v0, p2
-
-    add-int v1, p1, v0
-
-    const/16 v2, 0x20
-
-    ushr-long v2, p2, v2
-
-    long-to-int v3, v2
-
-    add-int/2addr v1, v3
-
-    const v2, 0x7fffffff
-
-    and-int v9, v1, v2
-
-    invoke-virtual {p0, v9}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v1
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    iget v2, v1, Lp0/a/a/u;->b:I
-
-    if-ne v2, p1, :cond_0
-
-    iget v2, v1, Lp0/a/a/v$a;->h:I
-
-    if-ne v2, v9, :cond_0
-
-    iget-wide v4, v1, Lp0/a/a/u;->f:J
-
-    cmp-long v2, v4, p2
-
-    if-nez v2, :cond_0
-
-    return-object v1
-
-    :cond_0
-    iget-object v1, v1, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    iget v5, p0, Lp0/a/a/v;->g:I
-
-    iget-object v1, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    invoke-virtual {v1, p1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    iget v2, v1, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v4, v2, 0x8
-
-    iget-object v6, v1, Lp0/a/a/c;->a:[B
-
-    array-length v6, v6
-
-    if-le v4, v6, :cond_2
-
-    const/16 v4, 0x8
-
-    invoke-virtual {v1, v4}, Lp0/a/a/c;->b(I)V
-
-    :cond_2
-    iget-object v4, v1, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v6, v2, 0x1
-
-    ushr-int/lit8 v7, v3, 0x18
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v4, v2
-
-    add-int/lit8 v2, v6, 0x1
-
-    ushr-int/lit8 v7, v3, 0x10
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v4, v6
-
-    add-int/lit8 v6, v2, 0x1
-
-    ushr-int/lit8 v7, v3, 0x8
-
-    int-to-byte v7, v7
-
-    aput-byte v7, v4, v2
-
-    add-int/lit8 v2, v6, 0x1
-
-    int-to-byte v3, v3
-
-    aput-byte v3, v4, v6
-
-    add-int/lit8 v3, v2, 0x1
-
-    ushr-int/lit8 v6, v0, 0x18
-
-    int-to-byte v6, v6
-
-    aput-byte v6, v4, v2
-
-    add-int/lit8 v2, v3, 0x1
-
-    ushr-int/lit8 v6, v0, 0x10
-
-    int-to-byte v6, v6
-
-    aput-byte v6, v4, v3
-
-    add-int/lit8 v3, v2, 0x1
-
-    ushr-int/lit8 v6, v0, 0x8
-
-    int-to-byte v6, v6
-
-    aput-byte v6, v4, v2
-
-    add-int/lit8 v2, v3, 0x1
-
-    int-to-byte v0, v0
-
-    aput-byte v0, v4, v3
-
-    iput v2, v1, Lp0/a/a/c;->b:I
-
-    iget v0, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v0, v0, 0x2
-
-    iput v0, p0, Lp0/a/a/v;->g:I
-
-    new-instance v0, Lp0/a/a/v$a;
-
-    move-object v4, v0
-
-    move v6, p1
-
-    move-wide v7, p2
-
-    invoke-direct/range {v4 .. v9}, Lp0/a/a/v$a;-><init>(IIJI)V
-
-    invoke-virtual {p0, v0}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    return-object v0
-.end method
-
-.method public final h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lp0/a/a/v$a;
-    .locals 10
-
-    invoke-static {p1, p2, p3, p4}, Lp0/a/a/v;->t(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
-
-    move-result v8
-
-    invoke-virtual {p0, v8}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget v1, v0, Lp0/a/a/u;->b:I
-
-    if-ne v1, p1, :cond_0
-
-    iget v1, v0, Lp0/a/a/v$a;->h:I
-
-    if-ne v1, v8, :cond_0
-
-    iget-object v1, v0, Lp0/a/a/u;->c:Ljava/lang/String;
-
-    invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, v0, Lp0/a/a/u;->d:Ljava/lang/String;
-
-    invoke-virtual {v1, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, v0, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v1, p4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    return-object v0
-
-    :cond_0
-    iget-object v0, v0, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    const/4 v1, 0x7
-
-    invoke-virtual {p0, v1, p2}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p0, p3, p4}, Lp0/a/a/v;->k(Ljava/lang/String;Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v0, p1, v1, v2}, Lp0/a/a/c;->f(III)Lp0/a/a/c;
-
-    new-instance v9, Lp0/a/a/v$a;
-
-    iget v1, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v0, v1, 0x1
-
-    iput v0, p0, Lp0/a/a/v;->g:I
-
-    const-wide/16 v6, 0x0
-
-    move-object v0, v9
-
-    move v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    invoke-direct/range {v0 .. v8}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
-
-    invoke-virtual {p0, v9}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    return-object v9
-.end method
-
-.method public i(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lp0/a/a/u;
-    .locals 10
-
-    const/16 v0, 0xf
-
-    invoke-static {v0, p2, p3, p4, p1}, Lp0/a/a/v;->u(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)I
-
-    move-result v9
-
-    invoke-virtual {p0, v9}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v1
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    iget v2, v1, Lp0/a/a/u;->b:I
-
-    if-ne v2, v0, :cond_0
-
-    iget v2, v1, Lp0/a/a/v$a;->h:I
-
-    if-ne v2, v9, :cond_0
-
-    iget-wide v2, v1, Lp0/a/a/u;->f:J
-
-    int-to-long v4, p1
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    iget-object v2, v1, Lp0/a/a/u;->c:Ljava/lang/String;
-
-    invoke-virtual {v2, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iget-object v2, v1, Lp0/a/a/u;->d:Ljava/lang/String;
-
-    invoke-virtual {v2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iget-object v2, v1, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v2, p4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    return-object v1
-
-    :cond_0
-    iget-object v1, v1, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x4
-
-    if-gt p1, v1, :cond_2
-
-    iget-object p5, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    const/16 v1, 0x9
-
-    invoke-virtual {p0, v1, p2, p3, p4}, Lp0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lp0/a/a/v$a;
-
-    move-result-object v1
-
-    iget v1, v1, Lp0/a/a/u;->a:I
-
-    invoke-virtual {p5, v0, p1, v1}, Lp0/a/a/c;->d(III)Lp0/a/a/c;
-
-    goto :goto_2
-
-    :cond_2
-    iget-object v1, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    if-eqz p5, :cond_3
-
-    const/16 p5, 0xb
-
-    goto :goto_1
-
-    :cond_3
-    const/16 p5, 0xa
-
-    :goto_1
-    invoke-virtual {p0, p5, p2, p3, p4}, Lp0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lp0/a/a/v$a;
-
-    move-result-object p5
-
-    iget p5, p5, Lp0/a/a/u;->a:I
-
-    invoke-virtual {v1, v0, p1, p5}, Lp0/a/a/c;->d(III)Lp0/a/a/c;
-
-    :goto_2
-    new-instance p5, Lp0/a/a/v$a;
-
-    iget v2, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v0, v2, 0x1
-
-    iput v0, p0, Lp0/a/a/v;->g:I
-
-    const/16 v3, 0xf
-
-    int-to-long v7, p1
-
-    move-object v1, p5
-
-    move-object v4, p2
-
-    move-object v5, p3
-
-    move-object v6, p4
-
-    invoke-direct/range {v1 .. v9}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
-
-    invoke-virtual {p0, p5}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    return-object p5
-.end method
-
-.method public j(Ljava/lang/String;)Lp0/a/a/u;
-    .locals 1
-
-    const/16 v0, 0x13
-
-    invoke-virtual {p0, v0, p1}, Lp0/a/a/v;->m(ILjava/lang/String;)Lp0/a/a/u;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public k(Ljava/lang/String;Ljava/lang/String;)I
-    .locals 9
-
-    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
-
-    move-result v1
-
-    mul-int v1, v1, v0
-
-    const/16 v0, 0xc
-
-    add-int/2addr v1, v0
-
-    const v2, 0x7fffffff
-
-    and-int v8, v1, v2
-
-    invoke-virtual {p0, v8}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v1
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    iget v2, v1, Lp0/a/a/u;->b:I
-
-    if-ne v2, v0, :cond_0
-
-    iget v2, v1, Lp0/a/a/v$a;->h:I
-
-    if-ne v2, v8, :cond_0
-
-    iget-object v2, v1, Lp0/a/a/u;->d:Ljava/lang/String;
-
-    invoke-virtual {v2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iget-object v2, v1, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v2, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iget p1, v1, Lp0/a/a/u;->a:I
-
-    return p1
-
-    :cond_0
-    iget-object v1, v1, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v1, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {p0, p2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v3
-
-    invoke-virtual {v1, v0, v2, v3}, Lp0/a/a/c;->f(III)Lp0/a/a/c;
-
-    new-instance v0, Lp0/a/a/v$a;
-
-    iget v4, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v1, v4, 0x1
-
-    iput v1, p0, Lp0/a/a/v;->g:I
-
-    const/16 v5, 0xc
-
-    move-object v3, v0
-
-    move-object v6, p1
-
-    move-object v7, p2
-
-    invoke-direct/range {v3 .. v8}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;I)V
-
-    invoke-virtual {p0, v0}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    iget p1, v0, Lp0/a/a/u;->a:I
-
-    return p1
-.end method
-
-.method public l(Ljava/lang/String;)I
-    .locals 10
-
-    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    add-int/2addr v0, v1
-
-    const v2, 0x7fffffff
-
-    and-int/2addr v0, v2
-
-    invoke-virtual {p0, v0}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v2
-
-    :goto_0
-    if-eqz v2, :cond_1
-
-    iget v3, v2, Lp0/a/a/u;->b:I
-
-    if-ne v3, v1, :cond_0
-
-    iget v3, v2, Lp0/a/a/v$a;->h:I
-
-    if-ne v3, v0, :cond_0
-
-    iget-object v3, v2, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v3, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    iget p1, v2, Lp0/a/a/u;->a:I
-
-    return p1
-
-    :cond_0
-    iget-object v2, v2, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v2, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    invoke-virtual {v2, v1}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    const v4, 0xffff
-
-    if-gt v3, v4, :cond_5
-
-    iget v5, v2, Lp0/a/a/c;->b:I
-
-    add-int/lit8 v6, v5, 0x2
-
-    add-int/2addr v6, v3
-
-    iget-object v7, v2, Lp0/a/a/c;->a:[B
-
-    array-length v7, v7
-
-    if-le v6, v7, :cond_2
-
-    add-int/lit8 v6, v3, 0x2
-
-    invoke-virtual {v2, v6}, Lp0/a/a/c;->b(I)V
-
-    :cond_2
-    iget-object v6, v2, Lp0/a/a/c;->a:[B
-
-    add-int/lit8 v7, v5, 0x1
-
-    ushr-int/lit8 v8, v3, 0x8
-
-    int-to-byte v8, v8
-
-    aput-byte v8, v6, v5
-
-    add-int/lit8 v5, v7, 0x1
-
-    int-to-byte v8, v3
-
-    aput-byte v8, v6, v7
-
-    const/4 v7, 0x0
-
-    :goto_1
-    if-ge v7, v3, :cond_4
-
-    invoke-virtual {p1, v7}, Ljava/lang/String;->charAt(I)C
-
-    move-result v8
-
-    if-lt v8, v1, :cond_3
-
-    const/16 v9, 0x7f
-
-    if-gt v8, v9, :cond_3
-
-    add-int/lit8 v9, v5, 0x1
-
-    int-to-byte v8, v8
-
-    aput-byte v8, v6, v5
-
-    add-int/lit8 v7, v7, 0x1
-
-    move v5, v9
-
-    goto :goto_1
-
-    :cond_3
-    iput v5, v2, Lp0/a/a/c;->b:I
-
-    invoke-virtual {v2, p1, v7, v4}, Lp0/a/a/c;->a(Ljava/lang/String;II)Lp0/a/a/c;
-
-    goto :goto_2
-
-    :cond_4
-    iput v5, v2, Lp0/a/a/c;->b:I
-
-    :goto_2
-    new-instance v2, Lp0/a/a/v$a;
-
-    iget v3, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v4, v3, 0x1
-
-    iput v4, p0, Lp0/a/a/v;->g:I
-
-    invoke-direct {v2, v3, v1, p1, v0}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;I)V
-
-    invoke-virtual {p0, v2}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    iget p1, v2, Lp0/a/a/u;->a:I
-
-    return p1
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "UTF8 string too large"
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final m(ILjava/lang/String;)Lp0/a/a/u;
-    .locals 4
-
-    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    add-int/2addr v0, p1
-
-    const v1, 0x7fffffff
-
-    and-int/2addr v0, v1
-
-    invoke-virtual {p0, v0}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v1
-
-    :goto_0
-    if-eqz v1, :cond_1
-
-    iget v2, v1, Lp0/a/a/u;->b:I
-
-    if-ne v2, p1, :cond_0
-
-    iget v2, v1, Lp0/a/a/v$a;->h:I
-
-    if-ne v2, v0, :cond_0
-
-    iget-object v2, v1, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v2, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    return-object v1
-
-    :cond_0
-    iget-object v1, v1, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v1, p0, Lp0/a/a/v;->h:Lp0/a/a/c;
-
-    invoke-virtual {p0, p2}, Lp0/a/a/v;->l(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v1, p1, v2}, Lp0/a/a/c;->e(II)Lp0/a/a/c;
-
-    new-instance v1, Lp0/a/a/v$a;
-
-    iget v2, p0, Lp0/a/a/v;->g:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    iput v3, p0, Lp0/a/a/v;->g:I
-
-    invoke-direct {v1, v2, p1, p2, v0}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;I)V
-
-    invoke-virtual {p0, v1}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    return-object v1
-.end method
-
-.method public n(Ljava/lang/String;)I
-    .locals 4
-
-    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    const/16 v1, 0x80
-
-    add-int/2addr v0, v1
-
-    const v2, 0x7fffffff
-
-    and-int/2addr v0, v2
-
-    invoke-virtual {p0, v0}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v2
-
-    :goto_0
-    if-eqz v2, :cond_1
-
-    iget v3, v2, Lp0/a/a/u;->b:I
-
-    if-ne v3, v1, :cond_0
-
-    iget v3, v2, Lp0/a/a/v$a;->h:I
-
-    if-ne v3, v0, :cond_0
-
-    iget-object v3, v2, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v3, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    iget p1, v2, Lp0/a/a/u;->a:I
-
-    return p1
-
-    :cond_0
-    iget-object v2, v2, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v2, Lp0/a/a/v$a;
-
-    iget v3, p0, Lp0/a/a/v;->k:I
-
-    invoke-direct {v2, v3, v1, p1, v0}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;I)V
-
-    invoke-virtual {p0, v2}, Lp0/a/a/v;->o(Lp0/a/a/v$a;)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public final o(Lp0/a/a/v$a;)I
-    .locals 4
-
-    iget-object v0, p0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    if-nez v0, :cond_0
-
-    const/16 v0, 0x10
-
-    new-array v0, v0, [Lp0/a/a/v$a;
-
-    iput-object v0, p0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    :cond_0
-    iget v0, p0, Lp0/a/a/v;->k:I
-
-    iget-object v1, p0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    array-length v2, v1
-
-    if-ne v0, v2, :cond_1
-
-    array-length v0, v1
-
-    mul-int/lit8 v0, v0, 0x2
-
-    new-array v0, v0, [Lp0/a/a/v$a;
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v0, p0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/v;->l:[Lp0/a/a/v$a;
-
-    iget v1, p0, Lp0/a/a/v;->k:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lp0/a/a/v;->k:I
-
-    aput-object p1, v0, v1
-
-    invoke-virtual {p0, p1}, Lp0/a/a/v;->v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-
-    iget p1, p1, Lp0/a/a/u;->a:I
-
-    return p1
-.end method
-
-.method public p(Ljava/lang/String;I)I
-    .locals 10
-
-    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
-
-    move-result v0
-
-    const/16 v1, 0x81
-
-    add-int/2addr v0, v1
-
-    add-int/2addr v0, p2
-
-    const v2, 0x7fffffff
-
-    and-int v9, v0, v2
-
-    invoke-virtual {p0, v9}, Lp0/a/a/v;->q(I)Lp0/a/a/v$a;
-
-    move-result-object v0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget v2, v0, Lp0/a/a/u;->b:I
-
-    if-ne v2, v1, :cond_0
-
-    iget v2, v0, Lp0/a/a/v$a;->h:I
-
-    if-ne v2, v9, :cond_0
-
-    iget-wide v2, v0, Lp0/a/a/u;->f:J
-
-    int-to-long v4, p2
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    iget-object v2, v0, Lp0/a/a/u;->e:Ljava/lang/String;
-
-    invoke-virtual {v2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iget p1, v0, Lp0/a/a/u;->a:I
-
-    return p1
-
-    :cond_0
-    iget-object v0, v0, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Lp0/a/a/v$a;
-
-    iget v4, p0, Lp0/a/a/v;->k:I
-
-    const/16 v5, 0x81
-
-    int-to-long v7, p2
-
-    move-object v3, v0
-
-    move-object v6, p1
-
-    invoke-direct/range {v3 .. v9}, Lp0/a/a/v$a;-><init>(IILjava/lang/String;JI)V
-
-    invoke-virtual {p0, v0}, Lp0/a/a/v;->o(Lp0/a/a/v$a;)I
-
-    move-result p1
-
-    return p1
-.end method
-
-.method public final q(I)Lp0/a/a/v$a;
-    .locals 2
-
-    iget-object v0, p0, Lp0/a/a/v;->f:[Lp0/a/a/v$a;
-
-    array-length v1, v0
-
-    rem-int/2addr p1, v1
-
-    aget-object p1, v0, p1
-
-    return-object p1
-.end method
-
-.method public final v(Lp0/a/a/v$a;)Lp0/a/a/v$a;
-    .locals 7
-
-    iget v0, p0, Lp0/a/a/v;->e:I
-
-    iget-object v1, p0, Lp0/a/a/v;->f:[Lp0/a/a/v$a;
-
-    array-length v2, v1
-
-    mul-int/lit8 v2, v2, 0x3
-
-    div-int/lit8 v2, v2, 0x4
-
-    if-le v0, v2, :cond_2
-
-    array-length v0, v1
-
-    mul-int/lit8 v1, v0, 0x2
-
-    add-int/lit8 v1, v1, 0x1
-
-    new-array v2, v1, [Lp0/a/a/v$a;
-
-    add-int/lit8 v0, v0, -0x1
-
-    :goto_0
-    if-ltz v0, :cond_1
-
-    iget-object v3, p0, Lp0/a/a/v;->f:[Lp0/a/a/v$a;
-
-    aget-object v3, v3, v0
-
-    :goto_1
-    if-eqz v3, :cond_0
-
-    iget v4, v3, Lp0/a/a/v$a;->h:I
-
-    rem-int/2addr v4, v1
-
-    iget-object v5, v3, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    aget-object v6, v2, v4
-
-    iput-object v6, v3, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    aput-object v3, v2, v4
-
-    move-object v3, v5
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v0, v0, -0x1
-
-    goto :goto_0
-
-    :cond_1
-    iput-object v2, p0, Lp0/a/a/v;->f:[Lp0/a/a/v$a;
-
-    :cond_2
-    iget v0, p0, Lp0/a/a/v;->e:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lp0/a/a/v;->e:I
-
-    iget v0, p1, Lp0/a/a/v$a;->h:I
-
-    iget-object v1, p0, Lp0/a/a/v;->f:[Lp0/a/a/v$a;
-
-    array-length v2, v1
-
-    rem-int/2addr v0, v2
-
-    aget-object v2, v1, v0
-
-    iput-object v2, p1, Lp0/a/a/v$a;->i:Lp0/a/a/v$a;
-
-    aput-object p1, v1, v0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/w.smali b/com.discord/smali_classes2/p0/a/a/w.smali
deleted file mode 100644
index bcca2fb271..0000000000
--- a/com.discord/smali_classes2/p0/a/a/w.smali
+++ /dev/null
@@ -1,1257 +0,0 @@
-.class public final Lp0/a/a/w;
-.super Ljava/lang/Object;
-.source "Type.java"
-
-
-# static fields
-.field public static final e:Lp0/a/a/w;
-
-.field public static final f:Lp0/a/a/w;
-
-.field public static final g:Lp0/a/a/w;
-
-.field public static final h:Lp0/a/a/w;
-
-.field public static final i:Lp0/a/a/w;
-
-.field public static final j:Lp0/a/a/w;
-
-.field public static final k:Lp0/a/a/w;
-
-.field public static final l:Lp0/a/a/w;
-
-.field public static final m:Lp0/a/a/w;
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:Ljava/lang/String;
-
-.field public final c:I
-
-.field public final d:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v1, 0x0
-
-    const-string v2, "VZCBSIFJD"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v0, v1, v2, v1, v3}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->e:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v1, 0x2
-
-    invoke-direct {v0, v3, v2, v3, v1}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->f:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v3, 0x3
-
-    invoke-direct {v0, v1, v2, v1, v3}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->g:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v1, 0x4
-
-    invoke-direct {v0, v3, v2, v3, v1}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->h:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v3, 0x5
-
-    invoke-direct {v0, v1, v2, v1, v3}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->i:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v1, 0x6
-
-    invoke-direct {v0, v3, v2, v3, v1}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->j:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v3, 0x7
-
-    invoke-direct {v0, v1, v2, v1, v3}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->k:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/16 v1, 0x8
-
-    invoke-direct {v0, v3, v2, v3, v1}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->l:Lp0/a/a/w;
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/16 v3, 0x9
-
-    invoke-direct {v0, v1, v2, v1, v3}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    sput-object v0, Lp0/a/a/w;->m:Lp0/a/a/w;
-
-    return-void
-.end method
-
-.method public constructor <init>(ILjava/lang/String;II)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lp0/a/a/w;->a:I
-
-    iput-object p2, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iput p3, p0, Lp0/a/a/w;->c:I
-
-    iput p4, p0, Lp0/a/a/w;->d:I
-
-    return-void
-.end method
-
-.method public static a(Ljava/lang/String;)[Lp0/a/a/w;
-    .locals 10
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    :goto_0
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    const/16 v5, 0x3b
-
-    const/16 v6, 0x4c
-
-    const/16 v7, 0x5b
-
-    const/16 v8, 0x29
-
-    if-eq v4, v8, :cond_2
-
-    :goto_1
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    if-ne v4, v7, :cond_0
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v4, v2, 0x1
-
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    if-ne v2, v6, :cond_1
-
-    invoke-virtual {p0, v5, v4}, Ljava/lang/String;->indexOf(II)I
-
-    move-result v2
-
-    add-int/2addr v2, v1
-
-    goto :goto_2
-
-    :cond_1
-    move v2, v4
-
-    :goto_2
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    new-array v2, v3, [Lp0/a/a/w;
-
-    const/4 v3, 0x1
-
-    :goto_3
-    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    if-eq v4, v8, :cond_5
-
-    move v4, v3
-
-    :goto_4
-    invoke-virtual {p0, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v9
-
-    if-ne v9, v7, :cond_3
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_4
-
-    :cond_3
-    add-int/lit8 v9, v4, 0x1
-
-    invoke-virtual {p0, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v4
-
-    if-ne v4, v6, :cond_4
-
-    invoke-virtual {p0, v5, v9}, Ljava/lang/String;->indexOf(II)I
-
-    move-result v4
-
-    add-int/lit8 v9, v4, 0x1
-
-    :cond_4
-    add-int/lit8 v4, v0, 0x1
-
-    invoke-static {p0, v3, v9}, Lp0/a/a/w;->k(Ljava/lang/String;II)Lp0/a/a/w;
-
-    move-result-object v3
-
-    aput-object v3, v2, v0
-
-    move v0, v4
-
-    move v3, v9
-
-    goto :goto_3
-
-    :cond_5
-    return-object v2
-.end method
-
-.method public static b(Ljava/lang/String;)I
-    .locals 7
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p0, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x1
-
-    :goto_0
-    const/16 v4, 0x29
-
-    const/16 v5, 0x44
-
-    const/16 v6, 0x4a
-
-    if-eq v1, v4, :cond_4
-
-    if-eq v1, v6, :cond_3
-
-    if-ne v1, v5, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    :goto_1
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v4, 0x5b
-
-    if-ne v1, v4, :cond_1
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    add-int/lit8 v1, v2, 0x1
-
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    const/16 v4, 0x4c
-
-    if-ne v2, v4, :cond_2
-
-    const/16 v2, 0x3b
-
-    invoke-virtual {p0, v2, v1}, Ljava/lang/String;->indexOf(II)I
-
-    move-result v1
-
-    add-int/2addr v1, v0
-
-    :cond_2
-    add-int/lit8 v3, v3, 0x1
-
-    move v2, v1
-
-    goto :goto_3
-
-    :cond_3
-    :goto_2
-    add-int/lit8 v2, v2, 0x1
-
-    add-int/lit8 v3, v3, 0x2
-
-    :goto_3
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    goto :goto_0
-
-    :cond_4
-    add-int/2addr v2, v0
-
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result p0
-
-    const/16 v1, 0x56
-
-    const/4 v2, 0x2
-
-    if-ne p0, v1, :cond_5
-
-    shl-int/lit8 p0, v3, 0x2
-
-    return p0
-
-    :cond_5
-    if-eq p0, v6, :cond_6
-
-    if-ne p0, v5, :cond_7
-
-    :cond_6
-    const/4 v0, 0x2
-
-    :cond_7
-    shl-int/lit8 p0, v3, 0x2
-
-    or-int/2addr p0, v0
-
-    return p0
-.end method
-
-.method public static e(Ljava/lang/Class;)Ljava/lang/String;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;)",
-            "Ljava/lang/String;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    :goto_0
-    invoke-virtual {p0}, Ljava/lang/Class;->isArray()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    const/16 v1, 0x5b
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/lang/Class;->isPrimitive()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_a
-
-    sget-object v1, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_1
-
-    const/16 p0, 0x49
-
-    goto :goto_1
-
-    :cond_1
-    sget-object v1, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_2
-
-    const/16 p0, 0x56
-
-    goto :goto_1
-
-    :cond_2
-    sget-object v1, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_3
-
-    const/16 p0, 0x5a
-
-    goto :goto_1
-
-    :cond_3
-    sget-object v1, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_4
-
-    const/16 p0, 0x42
-
-    goto :goto_1
-
-    :cond_4
-    sget-object v1, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_5
-
-    const/16 p0, 0x43
-
-    goto :goto_1
-
-    :cond_5
-    sget-object v1, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_6
-
-    const/16 p0, 0x53
-
-    goto :goto_1
-
-    :cond_6
-    sget-object v1, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_7
-
-    const/16 p0, 0x44
-
-    goto :goto_1
-
-    :cond_7
-    sget-object v1, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_8
-
-    const/16 p0, 0x46
-
-    goto :goto_1
-
-    :cond_8
-    sget-object v1, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v1, :cond_9
-
-    const/16 p0, 0x4a
-
-    :goto_1
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_3
-
-    :cond_9
-    new-instance p0, Ljava/lang/AssertionError;
-
-    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p0
-
-    :cond_a
-    const/16 v1, 0x4c
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    :goto_2
-    if-ge v2, v1, :cond_c
-
-    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v3
-
-    const/16 v4, 0x2e
-
-    if-ne v3, v4, :cond_b
-
-    const/16 v3, 0x2f
-
-    :cond_b
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_2
-
-    :cond_c
-    const/16 p0, 0x3b
-
-    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :goto_3
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static h(Ljava/lang/String;)Lp0/a/a/w;
-    .locals 4
-
-    new-instance v0, Lp0/a/a/w;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v2
-
-    const/16 v3, 0x5b
-
-    if-ne v2, v3, :cond_0
-
-    const/16 v2, 0x9
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v2, 0xc
-
-    :goto_0
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    invoke-direct {v0, v2, p0, v1, v3}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    return-object v0
-.end method
-
-.method public static j(Ljava/lang/Class;)Lp0/a/a/w;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;)",
-            "Lp0/a/a/w;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/lang/Class;->isPrimitive()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_9
-
-    sget-object v0, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_0
-
-    sget-object p0, Lp0/a/a/w;->j:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_0
-    sget-object v0, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_1
-
-    sget-object p0, Lp0/a/a/w;->e:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_1
-    sget-object v0, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_2
-
-    sget-object p0, Lp0/a/a/w;->f:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_2
-    sget-object v0, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_3
-
-    sget-object p0, Lp0/a/a/w;->h:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_3
-    sget-object v0, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_4
-
-    sget-object p0, Lp0/a/a/w;->g:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_4
-    sget-object v0, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_5
-
-    sget-object p0, Lp0/a/a/w;->i:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_5
-    sget-object v0, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_6
-
-    sget-object p0, Lp0/a/a/w;->m:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_6
-    sget-object v0, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_7
-
-    sget-object p0, Lp0/a/a/w;->k:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_7
-    sget-object v0, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
-
-    if-ne p0, v0, :cond_8
-
-    sget-object p0, Lp0/a/a/w;->l:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_8
-    new-instance p0, Ljava/lang/AssertionError;
-
-    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p0
-
-    :cond_9
-    invoke-static {p0}, Lp0/a/a/w;->e(Ljava/lang/Class;)Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    invoke-static {p0, v1, v0}, Lp0/a/a/w;->k(Ljava/lang/String;II)Lp0/a/a/w;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static k(Ljava/lang/String;II)Lp0/a/a/w;
-    .locals 2
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v0
-
-    const/16 v1, 0x28
-
-    if-eq v0, v1, :cond_8
-
-    const/16 v1, 0x46
-
-    if-eq v0, v1, :cond_7
-
-    const/16 v1, 0x4c
-
-    if-eq v0, v1, :cond_6
-
-    const/16 v1, 0x53
-
-    if-eq v0, v1, :cond_5
-
-    const/16 v1, 0x56
-
-    if-eq v0, v1, :cond_4
-
-    const/16 v1, 0x49
-
-    if-eq v0, v1, :cond_3
-
-    const/16 v1, 0x4a
-
-    if-eq v0, v1, :cond_2
-
-    const/16 v1, 0x5a
-
-    if-eq v0, v1, :cond_1
-
-    const/16 v1, 0x5b
-
-    if-eq v0, v1, :cond_0
-
-    packed-switch v0, :pswitch_data_0
-
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p0
-
-    :pswitch_0
-    sget-object p0, Lp0/a/a/w;->m:Lp0/a/a/w;
-
-    return-object p0
-
-    :pswitch_1
-    sget-object p0, Lp0/a/a/w;->g:Lp0/a/a/w;
-
-    return-object p0
-
-    :pswitch_2
-    sget-object p0, Lp0/a/a/w;->h:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_0
-    new-instance v0, Lp0/a/a/w;
-
-    const/16 v1, 0x9
-
-    invoke-direct {v0, v1, p0, p1, p2}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    return-object v0
-
-    :cond_1
-    sget-object p0, Lp0/a/a/w;->f:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_2
-    sget-object p0, Lp0/a/a/w;->l:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_3
-    sget-object p0, Lp0/a/a/w;->j:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_4
-    sget-object p0, Lp0/a/a/w;->e:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_5
-    sget-object p0, Lp0/a/a/w;->i:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_6
-    new-instance v0, Lp0/a/a/w;
-
-    const/16 v1, 0xa
-
-    add-int/lit8 p1, p1, 0x1
-
-    add-int/lit8 p2, p2, -0x1
-
-    invoke-direct {v0, v1, p0, p1, p2}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    return-object v0
-
-    :cond_7
-    sget-object p0, Lp0/a/a/w;->k:Lp0/a/a/w;
-
-    return-object p0
-
-    :cond_8
-    new-instance v0, Lp0/a/a/w;
-
-    const/16 v1, 0xb
-
-    invoke-direct {v0, v1, p0, p1, p2}, Lp0/a/a/w;-><init>(ILjava/lang/String;II)V
-
-    return-object v0
-
-    :pswitch_data_0
-    .packed-switch 0x42
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-
-# virtual methods
-.method public c()Ljava/lang/String;
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/w;->a:I
-
-    packed-switch v0, :pswitch_data_0
-
-    :pswitch_0
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :pswitch_1
-    iget-object v0, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iget v1, p0, Lp0/a/a/w;->c:I
-
-    iget v2, p0, Lp0/a/a/w;->d:I
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/16 v1, 0x2f
-
-    const/16 v2, 0x2e
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :pswitch_2
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lp0/a/a/w;->f()I
-
-    move-result v1
-
-    iget-object v2, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iget v3, p0, Lp0/a/a/w;->c:I
-
-    add-int/2addr v3, v1
-
-    iget v1, p0, Lp0/a/a/w;->d:I
-
-    invoke-static {v2, v3, v1}, Lp0/a/a/w;->k(Ljava/lang/String;II)Lp0/a/a/w;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lp0/a/a/w;->c()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Lp0/a/a/w;->f()I
-
-    move-result v1
-
-    :goto_0
-    if-lez v1, :cond_0
-
-    const-string v2, "[]"
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v1, v1, -0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :pswitch_3
-    const-string v0, "double"
-
-    return-object v0
-
-    :pswitch_4
-    const-string v0, "long"
-
-    return-object v0
-
-    :pswitch_5
-    const-string v0, "float"
-
-    return-object v0
-
-    :pswitch_6
-    const-string v0, "int"
-
-    return-object v0
-
-    :pswitch_7
-    const-string v0, "short"
-
-    return-object v0
-
-    :pswitch_8
-    const-string v0, "byte"
-
-    return-object v0
-
-    :pswitch_9
-    const-string v0, "char"
-
-    return-object v0
-
-    :pswitch_a
-    const-string v0, "boolean"
-
-    return-object v0
-
-    :pswitch_b
-    const-string v0, "void"
-
-    return-object v0
-
-    :pswitch_data_0
-    .packed-switch 0x0
-        :pswitch_b
-        :pswitch_a
-        :pswitch_9
-        :pswitch_8
-        :pswitch_7
-        :pswitch_6
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-        :pswitch_1
-    .end packed-switch
-.end method
-
-.method public d()Ljava/lang/String;
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/w;->a:I
-
-    const/16 v1, 0xa
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iget v1, p0, Lp0/a/a/w;->c:I
-
-    add-int/lit8 v1, v1, -0x1
-
-    iget v2, p0, Lp0/a/a/w;->d:I
-
-    add-int/lit8 v2, v2, 0x1
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    const/16 v1, 0xc
-
-    if-ne v0, v1, :cond_1
-
-    const/16 v0, 0x4c
-
-    invoke-static {v0}, Lf/e/b/a/a;->B(C)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iget v2, p0, Lp0/a/a/w;->c:I
-
-    iget v3, p0, Lp0/a/a/w;->d:I
-
-    invoke-virtual {v0, v1, v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x3b
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_1
-    iget-object v0, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iget v1, p0, Lp0/a/a/w;->c:I
-
-    iget v2, p0, Lp0/a/a/w;->d:I
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 7
-
-    const/4 v0, 0x1
-
-    if-ne p0, p1, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Lp0/a/a/w;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p1, Lp0/a/a/w;
-
-    iget v1, p0, Lp0/a/a/w;->a:I
-
-    const/16 v3, 0xa
-
-    const/16 v4, 0xc
-
-    if-ne v1, v4, :cond_2
-
-    const/16 v1, 0xa
-
-    :cond_2
-    iget v5, p1, Lp0/a/a/w;->a:I
-
-    if-ne v5, v4, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    move v3, v5
-
-    :goto_0
-    if-eq v1, v3, :cond_4
-
-    return v2
-
-    :cond_4
-    iget v1, p0, Lp0/a/a/w;->c:I
-
-    iget v3, p0, Lp0/a/a/w;->d:I
-
-    iget v4, p1, Lp0/a/a/w;->c:I
-
-    iget v5, p1, Lp0/a/a/w;->d:I
-
-    sub-int v6, v3, v1
-
-    sub-int/2addr v5, v4
-
-    if-eq v6, v5, :cond_5
-
-    return v2
-
-    :cond_5
-    :goto_1
-    if-ge v1, v3, :cond_7
-
-    iget-object v5, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    invoke-virtual {v5, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v5
-
-    iget-object v6, p1, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    invoke-virtual {v6, v4}, Ljava/lang/String;->charAt(I)C
-
-    move-result v6
-
-    if-eq v5, v6, :cond_6
-
-    return v2
-
-    :cond_6
-    add-int/lit8 v1, v1, 0x1
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
-
-    :cond_7
-    return v0
-.end method
-
-.method public f()I
-    .locals 3
-
-    const/4 v0, 0x1
-
-    :goto_0
-    iget-object v1, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iget v2, p0, Lp0/a/a/w;->c:I
-
-    add-int/2addr v2, v0
-
-    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
-
-    move-result v1
-
-    const/16 v2, 0x5b
-
-    if-ne v1, v2, :cond_0
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return v0
-.end method
-
-.method public g()Ljava/lang/String;
-    .locals 3
-
-    iget-object v0, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    iget v1, p0, Lp0/a/a/w;->c:I
-
-    iget v2, p0, Lp0/a/a/w;->d:I
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public hashCode()I
-    .locals 4
-
-    iget v0, p0, Lp0/a/a/w;->a:I
-
-    const/16 v1, 0xc
-
-    if-ne v0, v1, :cond_0
-
-    const/16 v0, 0xa
-
-    :cond_0
-    mul-int/lit8 v0, v0, 0xd
-
-    iget v1, p0, Lp0/a/a/w;->a:I
-
-    const/16 v2, 0x9
-
-    if-lt v1, v2, :cond_1
-
-    iget v1, p0, Lp0/a/a/w;->c:I
-
-    iget v2, p0, Lp0/a/a/w;->d:I
-
-    :goto_0
-    if-ge v1, v2, :cond_1
-
-    iget-object v3, p0, Lp0/a/a/w;->b:Ljava/lang/String;
-
-    invoke-virtual {v3, v1}, Ljava/lang/String;->charAt(I)C
-
-    move-result v3
-
-    add-int/2addr v3, v0
-
-    mul-int/lit8 v0, v3, 0x11
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return v0
-.end method
-
-.method public i()I
-    .locals 2
-
-    iget v0, p0, Lp0/a/a/w;->a:I
-
-    const/16 v1, 0xc
-
-    if-ne v0, v1, :cond_0
-
-    const/16 v0, 0xa
-
-    :cond_0
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0}, Lp0/a/a/w;->d()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/a/a/x.smali b/com.discord/smali_classes2/p0/a/a/x.smali
deleted file mode 100644
index 2cb7ec4040..0000000000
--- a/com.discord/smali_classes2/p0/a/a/x.smali
+++ /dev/null
@@ -1,152 +0,0 @@
-.class public final Lp0/a/a/x;
-.super Ljava/lang/Object;
-.source "TypePath.java"
-
-
-# instance fields
-.field public final a:[B
-
-.field public final b:I
-
-
-# direct methods
-.method public constructor <init>([BI)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/a/a/x;->a:[B
-
-    iput p2, p0, Lp0/a/a/x;->b:I
-
-    return-void
-.end method
-
-.method public static a(Lp0/a/a/x;Lp0/a/a/c;)V
-    .locals 2
-
-    if-nez p0, :cond_0
-
-    const/4 p0, 0x0
-
-    invoke-virtual {p1, p0}, Lp0/a/a/c;->g(I)Lp0/a/a/c;
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lp0/a/a/x;->a:[B
-
-    iget p0, p0, Lp0/a/a/x;->b:I
-
-    aget-byte v1, v0, p0
-
-    mul-int/lit8 v1, v1, 0x2
-
-    add-int/lit8 v1, v1, 0x1
-
-    invoke-virtual {p1, v0, p0, v1}, Lp0/a/a/c;->h([BII)Lp0/a/a/c;
-
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 9
-
-    iget-object v0, p0, Lp0/a/a/x;->a:[B
-
-    iget v1, p0, Lp0/a/a/x;->b:I
-
-    aget-byte v0, v0, v1
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    mul-int/lit8 v2, v0, 0x2
-
-    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v0, :cond_4
-
-    iget-object v3, p0, Lp0/a/a/x;->a:[B
-
-    iget v4, p0, Lp0/a/a/x;->b:I
-
-    mul-int/lit8 v5, v2, 0x2
-
-    add-int v6, v5, v4
-
-    const/4 v7, 0x1
-
-    add-int/2addr v6, v7
-
-    aget-byte v6, v3, v6
-
-    if-eqz v6, :cond_3
-
-    if-eq v6, v7, :cond_2
-
-    const/4 v7, 0x2
-
-    if-eq v6, v7, :cond_1
-
-    const/4 v8, 0x3
-
-    if-ne v6, v8, :cond_0
-
-    add-int/2addr v5, v4
-
-    add-int/2addr v5, v7
-
-    aget-byte v3, v3, v5
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const/16 v3, 0x3b
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_1
-
-    :cond_0
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-
-    :cond_1
-    const/16 v3, 0x2a
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v3, 0x2e
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    goto :goto_1
-
-    :cond_3
-    const/16 v3, 0x5b
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    :goto_1
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_4
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/b$a.smali b/com.discord/smali_classes2/p0/b$a.smali
new file mode 100644
index 0000000000..f05ee52a26
--- /dev/null
+++ b/com.discord/smali_classes2/p0/b$a.smali
@@ -0,0 +1,137 @@
+.class public final Lp0/b$a;
+.super Ljava/lang/Object;
+.source "AsyncTimeout.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lp0/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Lp0/b;
+    .locals 9
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/InterruptedException;
+        }
+    .end annotation
+
+    const-class v0, Lp0/b;
+
+    sget-object v1, Lp0/b;->j:Lp0/b;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_5
+
+    iget-object v1, v1, Lp0/b;->f:Lp0/b;
+
+    if-nez v1, :cond_2
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v3
+
+    sget-wide v5, Lp0/b;->h:J
+
+    invoke-virtual {v0, v5, v6}, Ljava/lang/Object;->wait(J)V
+
+    sget-object v0, Lp0/b;->j:Lp0/b;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, v0, Lp0/b;->f:Lp0/b;
+
+    if-nez v0, :cond_0
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v0
+
+    sub-long/2addr v0, v3
+
+    sget-wide v3, Lp0/b;->i:J
+
+    cmp-long v5, v0, v3
+
+    if-ltz v5, :cond_0
+
+    sget-object v2, Lp0/b;->j:Lp0/b;
+
+    :cond_0
+    return-object v2
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_2
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v3
+
+    iget-wide v5, v1, Lp0/b;->g:J
+
+    sub-long/2addr v5, v3
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v7, v5, v3
+
+    if-lez v7, :cond_3
+
+    const-wide/32 v3, 0xf4240
+
+    div-long v7, v5, v3
+
+    mul-long v3, v3, v7
+
+    sub-long/2addr v5, v3
+
+    long-to-int v1, v5
+
+    invoke-virtual {v0, v7, v8, v1}, Ljava/lang/Object;->wait(JI)V
+
+    return-object v2
+
+    :cond_3
+    sget-object v0, Lp0/b;->j:Lp0/b;
+
+    if-eqz v0, :cond_4
+
+    iget-object v3, v1, Lp0/b;->f:Lp0/b;
+
+    iput-object v3, v0, Lp0/b;->f:Lp0/b;
+
+    iput-object v2, v1, Lp0/b;->f:Lp0/b;
+
+    return-object v1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+.end method
diff --git a/com.discord/smali_classes2/p0/b$b.smali b/com.discord/smali_classes2/p0/b$b.smali
new file mode 100644
index 0000000000..38964bb6ce
--- /dev/null
+++ b/com.discord/smali_classes2/p0/b$b.smali
@@ -0,0 +1,86 @@
+.class public final Lp0/b$b;
+.super Ljava/lang/Thread;
+.source "AsyncTimeout.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lp0/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    const-string v0, "Okio Watchdog"
+
+    invoke-direct {p0, v0}, Ljava/lang/Thread;-><init>(Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0}, Ljava/lang/Thread;->setDaemon(Z)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 3
+
+    :catch_0
+    :cond_0
+    :goto_0
+    :try_start_0
+    const-class v0, Lp0/b;
+
+    monitor-enter v0
+    :try_end_0
+    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :try_start_1
+    sget-object v1, Lp0/b;->k:Lp0/b$a;
+
+    invoke-virtual {v1}, Lp0/b$a;->a()Lp0/b;
+
+    move-result-object v1
+
+    sget-object v2, Lp0/b;->j:Lp0/b;
+
+    if-ne v1, v2, :cond_1
+
+    const/4 v1, 0x0
+
+    sput-object v1, Lp0/b;->j:Lp0/b;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    monitor-exit v0
+
+    return-void
+
+    :cond_1
+    monitor-exit v0
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Lp0/b;->n()V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+    :try_end_2
+    .catch Ljava/lang/InterruptedException; {:try_start_2 .. :try_end_2} :catch_0
+.end method
diff --git a/com.discord/smali_classes2/p0/b.smali b/com.discord/smali_classes2/p0/b.smali
new file mode 100644
index 0000000000..78d34b4e41
--- /dev/null
+++ b/com.discord/smali_classes2/p0/b.smali
@@ -0,0 +1,421 @@
+.class public Lp0/b;
+.super Lp0/x;
+.source "AsyncTimeout.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lp0/b$b;,
+        Lp0/b$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final h:J
+
+.field public static final i:J
+
+.field public static j:Lp0/b;
+
+.field public static final k:Lp0/b$a;
+
+
+# instance fields
+.field public e:Z
+
+.field public f:Lp0/b;
+
+.field public g:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Lp0/b$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lp0/b$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lp0/b;->k:Lp0/b$a;
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v1, 0x3c
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+
+    move-result-wide v0
+
+    sput-wide v0, Lp0/b;->h:J
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    sget-wide v1, Lp0/b;->h:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    sput-wide v0, Lp0/b;->i:J
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lp0/x;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final i()V
+    .locals 10
+
+    iget-boolean v0, p0, Lp0/b;->e:Z
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_b
+
+    iget-wide v2, p0, Lp0/x;->c:J
+
+    iget-boolean v0, p0, Lp0/x;->a:Z
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iput-boolean v1, p0, Lp0/b;->e:Z
+
+    const-class v1, Lp0/b;
+
+    monitor-enter v1
+
+    :try_start_0
+    sget-object v4, Lp0/b;->j:Lp0/b;
+
+    if-nez v4, :cond_1
+
+    new-instance v4, Lp0/b;
+
+    invoke-direct {v4}, Lp0/b;-><init>()V
+
+    sput-object v4, Lp0/b;->j:Lp0/b;
+
+    new-instance v4, Lp0/b$b;
+
+    invoke-direct {v4}, Lp0/b$b;-><init>()V
+
+    invoke-virtual {v4}, Ljava/lang/Thread;->start()V
+
+    :cond_1
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v4
+
+    if-eqz v6, :cond_2
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p0}, Lp0/x;->c()J
+
+    move-result-wide v6
+
+    sub-long/2addr v6, v4
+
+    invoke-static {v2, v3, v6, v7}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v2
+
+    add-long/2addr v2, v4
+
+    iput-wide v2, p0, Lp0/b;->g:J
+
+    goto :goto_0
+
+    :cond_2
+    if-eqz v6, :cond_3
+
+    add-long/2addr v2, v4
+
+    iput-wide v2, p0, Lp0/b;->g:J
+
+    goto :goto_0
+
+    :cond_3
+    if-eqz v0, :cond_a
+
+    invoke-virtual {p0}, Lp0/x;->c()J
+
+    move-result-wide v2
+
+    iput-wide v2, p0, Lp0/b;->g:J
+
+    :goto_0
+    iget-wide v2, p0, Lp0/b;->g:J
+
+    sub-long/2addr v2, v4
+
+    sget-object v0, Lp0/b;->j:Lp0/b;
+
+    const/4 v6, 0x0
+
+    if-eqz v0, :cond_9
+
+    :goto_1
+    iget-object v7, v0, Lp0/b;->f:Lp0/b;
+
+    if-eqz v7, :cond_7
+
+    iget-object v7, v0, Lp0/b;->f:Lp0/b;
+
+    if-eqz v7, :cond_6
+
+    iget-wide v7, v7, Lp0/b;->g:J
+
+    sub-long/2addr v7, v4
+
+    cmp-long v9, v2, v7
+
+    if-gez v9, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    iget-object v0, v0, Lp0/b;->f:Lp0/b;
+
+    if-eqz v0, :cond_5
+
+    goto :goto_1
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v6
+
+    :cond_6
+    :try_start_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v6
+
+    :cond_7
+    :goto_2
+    :try_start_2
+    iget-object v2, v0, Lp0/b;->f:Lp0/b;
+
+    iput-object v2, p0, Lp0/b;->f:Lp0/b;
+
+    iput-object p0, v0, Lp0/b;->f:Lp0/b;
+
+    sget-object v2, Lp0/b;->j:Lp0/b;
+
+    if-ne v0, v2, :cond_8
+
+    invoke-virtual {v1}, Ljava/lang/Object;->notify()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :cond_8
+    monitor-exit v1
+
+    return-void
+
+    :cond_9
+    :try_start_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    throw v6
+
+    :cond_a
+    :try_start_4
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v1
+
+    throw v0
+
+    :cond_b
+    const-string v0, "Unbalanced enter/exit"
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public final j()Z
+    .locals 5
+
+    iget-boolean v0, p0, Lp0/b;->e:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    iput-boolean v1, p0, Lp0/b;->e:Z
+
+    const/4 v0, 0x0
+
+    const-class v2, Lp0/b;
+
+    monitor-enter v2
+
+    :try_start_0
+    sget-object v3, Lp0/b;->j:Lp0/b;
+
+    :goto_0
+    if-eqz v3, :cond_2
+
+    iget-object v4, v3, Lp0/b;->f:Lp0/b;
+
+    if-ne v4, p0, :cond_1
+
+    iget-object v4, p0, Lp0/b;->f:Lp0/b;
+
+    iput-object v4, v3, Lp0/b;->f:Lp0/b;
+
+    iput-object v0, p0, Lp0/b;->f:Lp0/b;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v2
+
+    goto :goto_1
+
+    :cond_1
+    :try_start_1
+    iget-object v3, v3, Lp0/b;->f:Lp0/b;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v1, 0x1
+
+    monitor-exit v2
+
+    :goto_1
+    return v1
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v2
+
+    throw v0
+.end method
+
+.method public final k(Ljava/io/IOException;)Ljava/io/IOException;
+    .locals 1
+
+    const-string v0, "cause"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lp0/b;->j()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lp0/b;->m(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public final l(Z)V
+    .locals 1
+
+    invoke-virtual {p0}, Lp0/b;->j()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    if-nez p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Lp0/b;->m(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public m(Ljava/io/IOException;)Ljava/io/IOException;
+    .locals 2
+
+    new-instance v0, Ljava/io/InterruptedIOException;
+
+    const-string v1, "timeout"
+
+    invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {v0, p1}, Ljava/io/InterruptedIOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public n()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/p0/b/a/a.smali b/com.discord/smali_classes2/p0/b/a/a.smali
deleted file mode 100644
index fab2ba26a3..0000000000
--- a/com.discord/smali_classes2/p0/b/a/a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public interface abstract Lp0/b/a/a;
-.super Ljava/lang/Object;
-.source "ObjectInstantiator.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract newInstance()Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/b/a.smali b/com.discord/smali_classes2/p0/b/a/b/a.smali
deleted file mode 100644
index 9eb2e48d89..0000000000
--- a/com.discord/smali_classes2/p0/b/a/b/a.smali
+++ /dev/null
@@ -1,156 +0,0 @@
-.class public Lp0/b/a/b/a;
-.super Ljava/lang/Object;
-.source "Android10Instantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/lang/reflect/Method;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/b/a/b/a;->a:Ljava/lang/Class;
-
-    :try_start_0
-    const-class p1, Ljava/io/ObjectInputStream;
-
-    const-string v0, "newInstance"
-
-    const/4 v1, 0x2
-
-    new-array v1, v1, [Ljava/lang/Class;
-
-    const/4 v2, 0x0
-
-    const-class v3, Ljava/lang/Class;
-
-    aput-object v3, v1, v2
-
-    const-class v2, Ljava/lang/Class;
-
-    const/4 v3, 0x1
-
-    aput-object v2, v1, v3
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    invoke-virtual {p1, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
-    iput-object p1, p0, Lp0/b/a/b/a;->b:Ljava/lang/reflect/Method;
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/b/a;->a:Ljava/lang/Class;
-
-    iget-object v1, p0, Lp0/b/a/b/a;->b:Ljava/lang/reflect/Method;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    const/4 v4, 0x0
-
-    iget-object v5, p0, Lp0/b/a/b/a;->a:Ljava/lang/Class;
-
-    aput-object v5, v3, v4
-
-    const/4 v4, 0x1
-
-    const-class v5, Ljava/lang/Object;
-
-    aput-object v5, v3, v4
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/b/b.smali b/com.discord/smali_classes2/p0/b/a/b/b.smali
deleted file mode 100644
index 1438f77742..0000000000
--- a/com.discord/smali_classes2/p0/b/a/b/b.smali
+++ /dev/null
@@ -1,232 +0,0 @@
-.class public Lp0/b/a/b/b;
-.super Ljava/lang/Object;
-.source "Android17Instantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/lang/reflect/Method;
-
-.field public final c:Ljava/lang/Integer;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/b/a/b/b;->a:Ljava/lang/Class;
-
-    :try_start_0
-    const-class p1, Ljava/io/ObjectStreamClass;
-
-    const-string v0, "newInstance"
-
-    const/4 v1, 0x2
-
-    new-array v1, v1, [Ljava/lang/Class;
-
-    const-class v2, Ljava/lang/Class;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    sget-object v2, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    const/4 v4, 0x1
-
-    aput-object v2, v1, v4
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_5
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_4
-
-    iput-object p1, p0, Lp0/b/a/b/b;->b:Ljava/lang/reflect/Method;
-
-    :try_start_1
-    const-class p1, Ljava/io/ObjectStreamClass;
-
-    const-string v0, "getConstructorId"
-
-    new-array v1, v4, [Ljava/lang/Class;
-
-    const-class v2, Ljava/lang/Class;
-
-    aput-object v2, v1, v3
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-
-    const/4 v0, 0x0
-
-    new-array v1, v4, [Ljava/lang/Object;
-
-    const-class v2, Ljava/lang/Object;
-
-    aput-object v2, v1, v3
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Integer;
-    :try_end_1
-    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_3
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_2
-    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_1 .. :try_end_1} :catch_0
-
-    iput-object p1, p0, Lp0/b/a/b/b;->c:Ljava/lang/Integer;
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_2
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_3
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_4
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_5
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/b/b;->a:Ljava/lang/Class;
-
-    iget-object v1, p0, Lp0/b/a/b/b;->b:Ljava/lang/reflect/Method;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    const/4 v4, 0x0
-
-    iget-object v5, p0, Lp0/b/a/b/b;->a:Ljava/lang/Class;
-
-    aput-object v5, v3, v4
-
-    const/4 v4, 0x1
-
-    iget-object v5, p0, Lp0/b/a/b/b;->c:Ljava/lang/Integer;
-
-    aput-object v5, v3, v4
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/b/c.smali b/com.discord/smali_classes2/p0/b/a/b/c.smali
deleted file mode 100644
index d457513f67..0000000000
--- a/com.discord/smali_classes2/p0/b/a/b/c.smali
+++ /dev/null
@@ -1,232 +0,0 @@
-.class public Lp0/b/a/b/c;
-.super Ljava/lang/Object;
-.source "Android18Instantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/lang/reflect/Method;
-
-.field public final c:Ljava/lang/Long;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/b/a/b/c;->a:Ljava/lang/Class;
-
-    :try_start_0
-    const-class p1, Ljava/io/ObjectStreamClass;
-
-    const-string v0, "newInstance"
-
-    const/4 v1, 0x2
-
-    new-array v1, v1, [Ljava/lang/Class;
-
-    const-class v2, Ljava/lang/Class;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    sget-object v2, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
-
-    const/4 v4, 0x1
-
-    aput-object v2, v1, v4
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_5
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_4
-
-    iput-object p1, p0, Lp0/b/a/b/c;->b:Ljava/lang/reflect/Method;
-
-    :try_start_1
-    const-class p1, Ljava/io/ObjectStreamClass;
-
-    const-string v0, "getConstructorId"
-
-    new-array v1, v4, [Ljava/lang/Class;
-
-    const-class v2, Ljava/lang/Class;
-
-    aput-object v2, v1, v3
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-
-    const/4 v0, 0x0
-
-    new-array v1, v4, [Ljava/lang/Object;
-
-    const-class v2, Ljava/lang/Object;
-
-    aput-object v2, v1, v3
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Long;
-    :try_end_1
-    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_3
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_2
-    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_1 .. :try_end_1} :catch_0
-
-    iput-object p1, p0, Lp0/b/a/b/c;->c:Ljava/lang/Long;
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_2
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_3
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_4
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_5
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/b/c;->a:Ljava/lang/Class;
-
-    iget-object v1, p0, Lp0/b/a/b/c;->b:Ljava/lang/reflect/Method;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    const/4 v4, 0x0
-
-    iget-object v5, p0, Lp0/b/a/b/c;->a:Ljava/lang/Class;
-
-    aput-object v5, v3, v4
-
-    const/4 v4, 0x1
-
-    iget-object v5, p0, Lp0/b/a/b/c;->c:Ljava/lang/Long;
-
-    aput-object v5, v3, v4
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/c/a.smali b/com.discord/smali_classes2/p0/b/a/c/a.smali
deleted file mode 100644
index 2ce956d776..0000000000
--- a/com.discord/smali_classes2/p0/b/a/c/a.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public Lp0/b/a/c/a;
-.super Ljava/lang/Object;
-.source "AccessibleInstantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lp0/b/a/c/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Ljava/lang/reflect/Constructor;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/reflect/Constructor<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    invoke-virtual {p1, v0}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lp0/b/a/c/a;->a:Ljava/lang/reflect/Constructor;
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    if-eqz p1, :cond_0
-
-    const/4 v0, 0x1
-
-    invoke-virtual {p1, v0}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
-
-    :cond_0
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/c/a;->a:Ljava/lang/reflect/Constructor;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/c/b$a.smali b/com.discord/smali_classes2/p0/b/a/c/b$a.smali
deleted file mode 100644
index f5a8fc93af..0000000000
--- a/com.discord/smali_classes2/p0/b/a/c/b$a.smali
+++ /dev/null
@@ -1,391 +0,0 @@
-.class public Lp0/b/a/c/b$a;
-.super Ljava/io/InputStream;
-.source "ObjectInputStreamInstantiator.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lp0/b/a/c/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final i:[I
-
-.field public static j:[B
-
-.field public static k:[B
-
-
-# instance fields
-.field public d:I
-
-.field public e:[B
-
-.field public f:I
-
-.field public g:[[B
-
-.field public final h:[B
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const/4 v0, 0x3
-
-    new-array v0, v0, [I
-
-    fill-array-data v0, :array_0
-
-    sput-object v0, Lp0/b/a/c/b$a;->i:[I
-
-    :try_start_0
-    new-instance v0, Ljava/io/ByteArrayOutputStream;
-
-    invoke-direct {v0}, Ljava/io/ByteArrayOutputStream;-><init>()V
-
-    new-instance v1, Ljava/io/DataOutputStream;
-
-    invoke-direct {v1, v0}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
-
-    const/16 v2, -0x5313
-
-    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeShort(I)V
-
-    const/4 v2, 0x5
-
-    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeShort(I)V
-
-    invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
-
-    move-result-object v0
-
-    sput-object v0, Lp0/b/a/c/b$a;->j:[B
-
-    new-instance v0, Ljava/io/ByteArrayOutputStream;
-
-    invoke-direct {v0}, Ljava/io/ByteArrayOutputStream;-><init>()V
-
-    new-instance v1, Ljava/io/DataOutputStream;
-
-    invoke-direct {v1, v0}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
-
-    const/16 v2, 0x73
-
-    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeByte(I)V
-
-    const/16 v2, 0x71
-
-    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeByte(I)V
-
-    const/high16 v2, 0x7e0000
-
-    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeInt(I)V
-
-    invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
-
-    move-result-object v0
-
-    sput-object v0, Lp0/b/a/c/b$a;->k:[B
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/lang/Error;
-
-    const-string v2, "IOException: "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-virtual {v0}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    nop
-
-    :array_0
-    .array-data 4
-        0x1
-        0x2
-        0x2
-    .end array-data
-.end method
-
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lp0/b/a/c/b$a;->d:I
-
-    iput v0, p0, Lp0/b/a/c/b$a;->f:I
-
-    sget-object v1, Lp0/b/a/c/b$a;->j:[B
-
-    iput-object v1, p0, Lp0/b/a/c/b$a;->e:[B
-
-    new-instance v1, Ljava/io/ByteArrayOutputStream;
-
-    invoke-direct {v1}, Ljava/io/ByteArrayOutputStream;-><init>()V
-
-    new-instance v2, Ljava/io/DataOutputStream;
-
-    invoke-direct {v2, v1}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
-
-    const/16 v3, 0x73
-
-    :try_start_0
-    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
-
-    const/16 v3, 0x72
-
-    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeUTF(Ljava/lang/String;)V
-
-    invoke-static {p1}, Ljava/io/ObjectStreamClass;->lookup(Ljava/lang/Class;)Ljava/io/ObjectStreamClass;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/io/ObjectStreamClass;->getSerialVersionUID()J
-
-    move-result-wide v3
-
-    invoke-virtual {v2, v3, v4}, Ljava/io/DataOutputStream;->writeLong(J)V
-
-    const/4 p1, 0x2
-
-    invoke-virtual {v2, p1}, Ljava/io/DataOutputStream;->writeByte(I)V
-
-    invoke-virtual {v2, v0}, Ljava/io/DataOutputStream;->writeShort(I)V
-
-    const/16 v3, 0x78
-
-    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
-
-    const/16 v3, 0x70
-
-    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    invoke-virtual {v1}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
-
-    move-result-object v1
-
-    iput-object v1, p0, Lp0/b/a/c/b$a;->h:[B
-
-    const/4 v2, 0x3
-
-    new-array v2, v2, [[B
-
-    sget-object v3, Lp0/b/a/c/b$a;->j:[B
-
-    aput-object v3, v2, v0
-
-    const/4 v0, 0x1
-
-    aput-object v1, v2, v0
-
-    sget-object v0, Lp0/b/a/c/b$a;->k:[B
-
-    aput-object v0, v2, p1
-
-    iput-object v2, p0, Lp0/b/a/c/b$a;->g:[[B
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Ljava/lang/Error;
-
-    const-string v1, "IOException: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public available()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    const v0, 0x7fffffff
-
-    return v0
-.end method
-
-.method public read()I
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lp0/b/a/c/b$a;->e:[B
-
-    iget v1, p0, Lp0/b/a/c/b$a;->d:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lp0/b/a/c/b$a;->d:I
-
-    aget-byte v1, v0, v1
-
-    array-length v0, v0
-
-    if-lt v2, v0, :cond_0
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lp0/b/a/c/b$a;->d:I
-
-    sget-object v0, Lp0/b/a/c/b$a;->i:[I
-
-    iget v2, p0, Lp0/b/a/c/b$a;->f:I
-
-    aget v0, v0, v2
-
-    iput v0, p0, Lp0/b/a/c/b$a;->f:I
-
-    iget-object v2, p0, Lp0/b/a/c/b$a;->g:[[B
-
-    aget-object v0, v2, v0
-
-    iput-object v0, p0, Lp0/b/a/c/b$a;->e:[B
-
-    :cond_0
-    return v1
-.end method
-
-.method public read([BII)I
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lp0/b/a/c/b$a;->e:[B
-
-    array-length v0, v0
-
-    iget v1, p0, Lp0/b/a/c/b$a;->d:I
-
-    sub-int/2addr v0, v1
-
-    move v1, p3
-
-    :goto_0
-    if-gt v0, v1, :cond_0
-
-    iget-object v2, p0, Lp0/b/a/c/b$a;->e:[B
-
-    iget v3, p0, Lp0/b/a/c/b$a;->d:I
-
-    invoke-static {v2, v3, p1, p2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    add-int/2addr p2, v0
-
-    sub-int/2addr v1, v0
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lp0/b/a/c/b$a;->d:I
-
-    sget-object v2, Lp0/b/a/c/b$a;->i:[I
-
-    iget v3, p0, Lp0/b/a/c/b$a;->f:I
-
-    aget v2, v2, v3
-
-    iput v2, p0, Lp0/b/a/c/b$a;->f:I
-
-    iget-object v3, p0, Lp0/b/a/c/b$a;->g:[[B
-
-    aget-object v2, v3, v2
-
-    iput-object v2, p0, Lp0/b/a/c/b$a;->e:[B
-
-    array-length v2, v2
-
-    add-int/2addr v0, v2
-
-    goto :goto_0
-
-    :cond_0
-    if-lez v1, :cond_1
-
-    iget-object v0, p0, Lp0/b/a/c/b$a;->e:[B
-
-    iget v2, p0, Lp0/b/a/c/b$a;->d:I
-
-    invoke-static {v0, v2, p1, p2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget p1, p0, Lp0/b/a/c/b$a;->d:I
-
-    add-int/2addr p1, v1
-
-    iput p1, p0, Lp0/b/a/c/b$a;->d:I
-
-    :cond_1
-    return p3
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/c/b.smali b/com.discord/smali_classes2/p0/b/a/c/b.smali
deleted file mode 100644
index da1b53e497..0000000000
--- a/com.discord/smali_classes2/p0/b/a/c/b.smali
+++ /dev/null
@@ -1,174 +0,0 @@
-.class public Lp0/b/a/c/b;
-.super Ljava/lang/Object;
-.source "ObjectInputStreamInstantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lp0/b/a/c/b$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public a:Ljava/io/ObjectInputStream;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const-class v0, Ljava/io/Serializable;
-
-    invoke-virtual {v0, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    new-instance v0, Ljava/io/ObjectInputStream;
-
-    new-instance v1, Lp0/b/a/c/b$a;
-
-    invoke-direct {v1, p1}, Lp0/b/a/c/b$a;-><init>(Ljava/lang/Class;)V
-
-    invoke-direct {v0, v1}, Ljava/io/ObjectInputStream;-><init>(Ljava/io/InputStream;)V
-
-    iput-object v0, p0, Lp0/b/a/c/b;->a:Ljava/io/ObjectInputStream;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Ljava/lang/Error;
-
-    const-string v1, "IOException: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_0
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    new-instance v1, Ljava/io/NotSerializableException;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, " not serializable"
-
-    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v1, p1}, Ljava/io/NotSerializableException;-><init>(Ljava/lang/String;)V
-
-    invoke-direct {v0, v1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/c/b;->a:Ljava/io/ObjectInputStream;
-
-    invoke-virtual {v0}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    move-exception v0
-
-    new-instance v1, Ljava/lang/Error;
-
-    const-string v2, "ClassNotFoundException: "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-virtual {v0}, Ljava/lang/ClassNotFoundException;->getMessage()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/d/a.smali b/com.discord/smali_classes2/p0/b/a/d/a.smali
deleted file mode 100644
index d8a4d01b94..0000000000
--- a/com.discord/smali_classes2/p0/b/a/d/a.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public Lp0/b/a/d/a;
-.super Lp0/b/a/d/b;
-.source "GCJInstantiator.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lp0/b/a/d/b<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lp0/b/a/d/b;-><init>(Ljava/lang/Class;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/d/b;->a:Ljava/lang/Class;
-
-    sget-object v1, Lp0/b/a/d/b;->b:Ljava/lang/reflect/Method;
-
-    sget-object v2, Lp0/b/a/d/b;->c:Ljava/io/ObjectInputStream;
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    const/4 v4, 0x0
-
-    iget-object v5, p0, Lp0/b/a/d/b;->a:Ljava/lang/Class;
-
-    aput-object v5, v3, v4
-
-    const/4 v4, 0x1
-
-    const-class v5, Ljava/lang/Object;
-
-    aput-object v5, v3, v4
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_2
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/d/b$a.smali b/com.discord/smali_classes2/p0/b/a/d/b$a.smali
deleted file mode 100644
index 246ea8ac2c..0000000000
--- a/com.discord/smali_classes2/p0/b/a/d/b$a.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public Lp0/b/a/d/b$a;
-.super Ljava/io/ObjectInputStream;
-.source "GCJInstantiatorBase.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lp0/b/a/d/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/io/ObjectInputStream;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/d/b.smali b/com.discord/smali_classes2/p0/b/a/d/b.smali
deleted file mode 100644
index 16cfb1021f..0000000000
--- a/com.discord/smali_classes2/p0/b/a/d/b.smali
+++ /dev/null
@@ -1,135 +0,0 @@
-.class public abstract Lp0/b/a/d/b;
-.super Ljava/lang/Object;
-.source "GCJInstantiatorBase.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lp0/b/a/d/b$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static b:Ljava/lang/reflect/Method;
-
-.field public static c:Ljava/io/ObjectInputStream;
-
-
-# instance fields
-.field public final a:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/b/a/d/b;->a:Ljava/lang/Class;
-
-    sget-object p1, Lp0/b/a/d/b;->b:Ljava/lang/reflect/Method;
-
-    if-nez p1, :cond_0
-
-    :try_start_0
-    const-class p1, Ljava/io/ObjectInputStream;
-
-    const-string v0, "newObject"
-
-    const/4 v1, 0x2
-
-    new-array v1, v1, [Ljava/lang/Class;
-
-    const/4 v2, 0x0
-
-    const-class v3, Ljava/lang/Class;
-
-    aput-object v3, v1, v2
-
-    const-class v2, Ljava/lang/Class;
-
-    const/4 v3, 0x1
-
-    aput-object v2, v1, v3
-
-    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    sput-object p1, Lp0/b/a/d/b;->b:Ljava/lang/reflect/Method;
-
-    invoke-virtual {p1, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-
-    new-instance p1, Lp0/b/a/d/b$a;
-
-    invoke-direct {p1}, Lp0/b/a/d/b$a;-><init>()V
-
-    sput-object p1, Lp0/b/a/d/b;->c:Ljava/io/ObjectInputStream;
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_2
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/e/a.smali b/com.discord/smali_classes2/p0/b/a/e/a.smali
deleted file mode 100644
index 9eb70e3e5e..0000000000
--- a/com.discord/smali_classes2/p0/b/a/e/a.smali
+++ /dev/null
@@ -1,141 +0,0 @@
-.class public Lp0/b/a/e/a;
-.super Ljava/lang/Object;
-.source "PercInstantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/reflect/Method;
-
-.field public final b:[Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x2
-
-    new-array v1, v0, [Ljava/lang/Object;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    const/4 v4, 0x1
-
-    aput-object v2, v1, v4
-
-    iput-object v1, p0, Lp0/b/a/e/a;->b:[Ljava/lang/Object;
-
-    aput-object p1, v1, v3
-
-    :try_start_0
-    const-class p1, Ljava/io/ObjectInputStream;
-
-    const-string v1, "newInstance"
-
-    new-array v0, v0, [Ljava/lang/Class;
-
-    const-class v2, Ljava/lang/Class;
-
-    aput-object v2, v0, v3
-
-    sget-object v2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    aput-object v2, v0, v4
-
-    invoke-virtual {p1, v1, v0}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lp0/b/a/e/a;->a:Ljava/lang/reflect/Method;
-
-    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/e/a;->a:Ljava/lang/reflect/Method;
-
-    const/4 v1, 0x0
-
-    iget-object v2, p0, Lp0/b/a/e/a;->b:[Ljava/lang/Object;
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/f/a.smali b/com.discord/smali_classes2/p0/b/a/f/a.smali
deleted file mode 100644
index 1c72c740ba..0000000000
--- a/com.discord/smali_classes2/p0/b/a/f/a.smali
+++ /dev/null
@@ -1,256 +0,0 @@
-.class public Lp0/b/a/f/a;
-.super Ljava/lang/Object;
-.source "SunReflectionFactoryInstantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/reflect/Constructor;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/reflect/Constructor<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    :try_start_0
-    const-class v0, Ljava/lang/Object;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_9
-
-    :try_start_1
-    const-string v2, "sun.reflect.ReflectionFactory"
-
-    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v2
-    :try_end_1
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_8
-
-    :try_start_2
-    const-string v3, "getReflectionFactory"
-
-    const/4 v4, 0x0
-
-    new-array v5, v4, [Ljava/lang/Class;
-
-    invoke-virtual {v2, v3, v5}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v3
-
-    new-array v5, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v3, v1, v5}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-    :try_end_2
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_2 .. :try_end_2} :catch_7
-    .catch Ljava/lang/IllegalAccessException; {:try_start_2 .. :try_end_2} :catch_6
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_2 .. :try_end_2} :catch_5
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_2 .. :try_end_2} :catch_4
-
-    :try_start_3
-    const-string v3, "newConstructorForSerialization"
-
-    const/4 v5, 0x2
-
-    new-array v6, v5, [Ljava/lang/Class;
-
-    const-class v7, Ljava/lang/Class;
-
-    aput-object v7, v6, v4
-
-    const-class v7, Ljava/lang/reflect/Constructor;
-
-    const/4 v8, 0x1
-
-    aput-object v7, v6, v8
-
-    invoke-virtual {v2, v3, v6}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
-    move-result-object v2
-    :try_end_3
-    .catch Ljava/lang/NoSuchMethodException; {:try_start_3 .. :try_end_3} :catch_3
-
-    :try_start_4
-    new-array v3, v5, [Ljava/lang/Object;
-
-    aput-object p1, v3, v4
-
-    aput-object v0, v3, v8
-
-    invoke-virtual {v2, v1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/reflect/Constructor;
-    :try_end_4
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_4 .. :try_end_4} :catch_2
-    .catch Ljava/lang/IllegalAccessException; {:try_start_4 .. :try_end_4} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_4 .. :try_end_4} :catch_0
-
-    iput-object p1, p0, Lp0/b/a/f/a;->a:Ljava/lang/reflect/Constructor;
-
-    invoke-virtual {p1, v8}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_2
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_3
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_4
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_5
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_6
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_7
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_8
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_9
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/f/a;->a:Ljava/lang/reflect/Constructor;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/a/f/b.smali b/com.discord/smali_classes2/p0/b/a/f/b.smali
deleted file mode 100644
index c19d70649f..0000000000
--- a/com.discord/smali_classes2/p0/b/a/f/b.smali
+++ /dev/null
@@ -1,146 +0,0 @@
-.class public Lp0/b/a/f/b;
-.super Ljava/lang/Object;
-.source "UnsafeFactoryInstantiator.java"
-
-# interfaces
-.implements Lp0/b/a/a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lp0/b/a/a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static b:Lsun/misc/Unsafe;
-
-
-# instance fields
-.field public final a:Ljava/lang/Class;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Class<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Class;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lp0/b/a/f/b;->b:Lsun/misc/Unsafe;
-
-    if-nez v0, :cond_0
-
-    :try_start_0
-    const-class v0, Lsun/misc/Unsafe;
-
-    const-string v1, "theUnsafe"
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_1
-
-    const/4 v1, 0x1
-
-    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V
-
-    const/4 v1, 0x0
-
-    :try_start_1
-    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lsun/misc/Unsafe;
-
-    sput-object v0, Lp0/b/a/f/b;->b:Lsun/misc/Unsafe;
-    :try_end_1
-    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catch_1
-    move-exception p1
-
-    new-instance v0, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_0
-    :goto_0
-    iput-object p1, p0, Lp0/b/a/f/b;->a:Ljava/lang/Class;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public newInstance()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lp0/b/a/f/b;->a:Ljava/lang/Class;
-
-    sget-object v1, Lp0/b/a/f/b;->b:Lsun/misc/Unsafe;
-
-    iget-object v2, p0, Lp0/b/a/f/b;->a:Ljava/lang/Class;
-
-    invoke-virtual {v1, v2}, Lsun/misc/Unsafe;->allocateInstance(Ljava/lang/Class;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/p0/b/b/a.smali b/com.discord/smali_classes2/p0/b/b/a.smali
deleted file mode 100644
index bf37359df9..0000000000
--- a/com.discord/smali_classes2/p0/b/b/a.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public interface abstract Lp0/b/b/a;
-.super Ljava/lang/Object;
-.source "InstantiatorStrategy.java"
-
-
-# virtual methods
-.method public abstract newInstantiatorOf(Ljava/lang/Class;)Lp0/b/a/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Class<",
-            "TT;>;)",
-            "Lp0/b/a/a<",
-            "TT;>;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/p0/b/b/b.smali b/com.discord/smali_classes2/p0/b/b/b.smali
deleted file mode 100644
index 9656a29f75..0000000000
--- a/com.discord/smali_classes2/p0/b/b/b.smali
+++ /dev/null
@@ -1,226 +0,0 @@
-.class public final Lp0/b/b/b;
-.super Ljava/lang/Object;
-.source "PlatformDescription.java"
-
-
-# static fields
-.field public static final a:Ljava/lang/String;
-
-.field public static final b:I
-
-.field public static final c:Z
-
-.field public static final d:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-string v0, "java.specification.version"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    const-string v0, "java.runtime.version"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    const-string v0, "java.vm.info"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    const-string v0, "java.vm.version"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    const-string v0, "java.vm.vendor"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    const-string v0, "java.vm.name"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/b/b/b;->a:Ljava/lang/String;
-
-    invoke-static {}, Lp0/b/b/b;->a()I
-
-    move-result v0
-
-    sput v0, Lp0/b/b/b;->b:I
-
-    invoke-static {}, Lp0/b/b/b;->a()I
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "java.boot.class.path"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v2, "core-oj.jar"
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    const/4 v1, 0x1
-
-    :cond_1
-    :goto_0
-    sput-boolean v1, Lp0/b/b/b;->c:Z
-
-    const-string v0, "com.google.appengine.runtime.version"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Lp0/b/b/b;->d:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public static a()I
-    .locals 3
-
-    const-string v0, "Dalvik"
-
-    invoke-static {v0}, Lp0/b/b/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_0
-    :try_start_0
-    const-string v0, "android.os.Build$VERSION"
-
-    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_4
-
-    const/4 v1, 0x0
-
-    :try_start_1
-    const-string v2, "SDK_INT"
-
-    invoke-virtual {v0, v2}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v0
-    :try_end_1
-    .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_1
-
-    :try_start_2
-    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-    :try_end_2
-    .catch Ljava/lang/IllegalAccessException; {:try_start_2 .. :try_end_2} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/lang/RuntimeException;
-
-    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_1
-    :try_start_3
-    const-string v2, "SDK"
-
-    invoke-virtual {v0, v2}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v0
-    :try_end_3
-    .catch Ljava/lang/NoSuchFieldException; {:try_start_3 .. :try_end_3} :catch_3
-
-    :try_start_4
-    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-    :try_end_4
-    .catch Ljava/lang/IllegalAccessException; {:try_start_4 .. :try_end_4} :catch_2
-
-    invoke-static {v0}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v0
-
-    :goto_0
-    return v0
-
-    :catch_2
-    move-exception v0
-
-    new-instance v1, Ljava/lang/RuntimeException;
-
-    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_3
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catch_4
-    move-exception v0
-
-    new-instance v1, Lorg/objenesis/ObjenesisException;
-
-    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
-
-.method public static b(Ljava/lang/String;)Z
-    .locals 1
-
-    sget-object v0, Lp0/b/b/b;->a:Ljava/lang/String;
-
-    invoke-virtual {v0, p0}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result p0
-
-    return p0
-.end method
diff --git a/com.discord/smali_classes2/p0/b/b/c.smali b/com.discord/smali_classes2/p0/b/b/c.smali
deleted file mode 100644
index e1930cdd34..0000000000
--- a/com.discord/smali_classes2/p0/b/b/c.smali
+++ /dev/null
@@ -1,197 +0,0 @@
-.class public Lp0/b/b/c;
-.super Ljava/lang/Object;
-.source "StdInstantiatorStrategy.java"
-
-# interfaces
-.implements Lp0/b/b/a;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public newInstantiatorOf(Ljava/lang/Class;)Lp0/b/a/a;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Class<",
-            "TT;>;)",
-            "Lp0/b/a/a<",
-            "TT;>;"
-        }
-    .end annotation
-
-    const-string v0, "Java HotSpot"
-
-    invoke-static {v0}, Lp0/b/b/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_8
-
-    const-string v0, "OpenJDK"
-
-    invoke-static {v0}, Lp0/b/b/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const-string v0, "Dalvik"
-
-    invoke-static {v0}, Lp0/b/b/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_4
-
-    sget-boolean v0, Lp0/b/b/b;->c:Z
-
-    if-eqz v0, :cond_1
-
-    new-instance v0, Lp0/b/a/f/b;
-
-    invoke-direct {v0, p1}, Lp0/b/a/f/b;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_1
-    sget v0, Lp0/b/b/b;->b:I
-
-    const/16 v1, 0xa
-
-    if-gt v0, v1, :cond_2
-
-    new-instance v0, Lp0/b/a/b/a;
-
-    invoke-direct {v0, p1}, Lp0/b/a/b/a;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_2
-    const/16 v1, 0x11
-
-    if-gt v0, v1, :cond_3
-
-    new-instance v0, Lp0/b/a/b/b;
-
-    invoke-direct {v0, p1}, Lp0/b/a/b/b;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_3
-    new-instance v0, Lp0/b/a/b/c;
-
-    invoke-direct {v0, p1}, Lp0/b/a/b/c;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_4
-    const-string v0, "BEA"
-
-    invoke-static {v0}, Lp0/b/b/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    new-instance v0, Lp0/b/a/f/a;
-
-    invoke-direct {v0, p1}, Lp0/b/a/f/a;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_5
-    const-string v0, "GNU libgcj"
-
-    invoke-static {v0}, Lp0/b/b/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    new-instance v0, Lp0/b/a/d/a;
-
-    invoke-direct {v0, p1}, Lp0/b/a/d/a;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_6
-    const-string v0, "PERC"
-
-    invoke-static {v0}, Lp0/b/b/b;->b(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_7
-
-    new-instance v0, Lp0/b/a/e/a;
-
-    invoke-direct {v0, p1}, Lp0/b/a/e/a;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_7
-    new-instance v0, Lp0/b/a/f/b;
-
-    invoke-direct {v0, p1}, Lp0/b/a/f/b;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_8
-    :goto_0
-    sget-object v0, Lp0/b/b/b;->d:Ljava/lang/String;
-
-    if-eqz v0, :cond_9
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_9
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_b
-
-    const-class v0, Ljava/io/Serializable;
-
-    invoke-virtual {v0, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_a
-
-    new-instance v0, Lp0/b/a/c/b;
-
-    invoke-direct {v0, p1}, Lp0/b/a/c/b;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_a
-    new-instance v0, Lp0/b/a/c/a;
-
-    invoke-direct {v0, p1}, Lp0/b/a/c/a;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-
-    :cond_b
-    new-instance v0, Lp0/b/a/f/a;
-
-    invoke-direct {v0, p1}, Lp0/b/a/f/a;-><init>(Ljava/lang/Class;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/c.smali b/com.discord/smali_classes2/p0/c.smali
new file mode 100644
index 0000000000..e292ac78d2
--- /dev/null
+++ b/com.discord/smali_classes2/p0/c.smali
@@ -0,0 +1,299 @@
+.class public final Lp0/c;
+.super Ljava/lang/Object;
+.source "AsyncTimeout.kt"
+
+# interfaces
+.implements Lp0/u;
+
+
+# instance fields
+.field public final synthetic d:Lp0/b;
+
+.field public final synthetic e:Lp0/u;
+
+
+# direct methods
+.method public constructor <init>(Lp0/b;Lp0/u;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lp0/u;",
+            ")V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lp0/c;->d:Lp0/b;
+
+    iput-object p2, p0, Lp0/c;->e:Lp0/u;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 3
+
+    iget-object v0, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v0}, Lp0/b;->i()V
+
+    :try_start_0
+    iget-object v0, p0, Lp0/c;->e:Lp0/u;
+
+    invoke-interface {v0}, Lp0/u;->close()V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v0, 0x1
+
+    iget-object v1, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v1, v0}, Lp0/b;->l(Z)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    :try_start_1
+    iget-object v1, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v1, v0}, Lp0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    throw v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    iget-object v1, p0, Lp0/c;->d:Lp0/b;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2}, Lp0/b;->l(Z)V
+
+    throw v0
+.end method
+
+.method public flush()V
+    .locals 3
+
+    iget-object v0, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v0}, Lp0/b;->i()V
+
+    :try_start_0
+    iget-object v0, p0, Lp0/c;->e:Lp0/u;
+
+    invoke-interface {v0}, Lp0/u;->flush()V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v0, 0x1
+
+    iget-object v1, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v1, v0}, Lp0/b;->l(Z)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    :try_start_1
+    iget-object v1, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v1, v0}, Lp0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    throw v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    iget-object v1, p0, Lp0/c;->d:Lp0/b;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2}, Lp0/b;->l(Z)V
+
+    throw v0
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/c;->d:Lp0/b;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "AsyncTimeout.sink("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lp0/c;->e:Lp0/u;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 7
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v1, p1, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    move-wide v5, p2
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
+
+    :goto_0
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-lez v2, :cond_4
+
+    iget-object v2, p1, Lp0/e;->d:Lp0/r;
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_3
+
+    :goto_1
+    const/high16 v4, 0x10000
+
+    int-to-long v4, v4
+
+    cmp-long v6, v0, v4
+
+    if-gez v6, :cond_2
+
+    iget v4, v2, Lp0/r;->c:I
+
+    iget v5, v2, Lp0/r;->b:I
+
+    sub-int/2addr v4, v5
+
+    int-to-long v4, v4
+
+    add-long/2addr v0, v4
+
+    cmp-long v4, v0, p2
+
+    if-ltz v4, :cond_0
+
+    move-wide v0, p2
+
+    goto :goto_2
+
+    :cond_0
+    iget-object v2, v2, Lp0/r;->f:Lp0/r;
+
+    if-eqz v2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_2
+    :goto_2
+    const/4 v2, 0x0
+
+    iget-object v3, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v3}, Lp0/b;->i()V
+
+    :try_start_0
+    iget-object v3, p0, Lp0/c;->e:Lp0/u;
+
+    invoke-interface {v3, p1, v0, v1}, Lp0/u;->write(Lp0/e;J)V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    sub-long/2addr p2, v0
+
+    const/4 v0, 0x1
+
+    iget-object v1, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {v1, v0}, Lp0/b;->l(Z)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    goto :goto_3
+
+    :catch_0
+    move-exception p1
+
+    :try_start_1
+    iget-object p2, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {p2, p1}, Lp0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_3
+    iget-object p2, p0, Lp0/c;->d:Lp0/b;
+
+    invoke-virtual {p2, v2}, Lp0/b;->l(Z)V
+
+    throw p1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_4
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/p0/c/a.smali b/com.discord/smali_classes2/p0/c/a.smali
deleted file mode 100644
index 1d7aa41aca..0000000000
--- a/com.discord/smali_classes2/p0/c/a.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/a;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/concurrent/CountDownLatch;
-
-
-# direct methods
-.method public synthetic constructor <init>(Ljava/util/concurrent/CountDownLatch;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/a;->d:Ljava/util/concurrent/CountDownLatch;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/a;->d:Ljava/util/concurrent/CountDownLatch;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/a0.smali b/com.discord/smali_classes2/p0/c/a0.smali
deleted file mode 100644
index f946b4dc22..0000000000
--- a/com.discord/smali_classes2/p0/c/a0.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/a0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/a0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/a0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    invoke-virtual {v0}, Lorg/webrtc/VideoFileRenderer;->c()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/b.smali b/com.discord/smali_classes2/p0/c/b.smali
deleted file mode 100644
index e64be23308..0000000000
--- a/com.discord/smali_classes2/p0/c/b.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/b;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/TextureBufferImpl;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/TextureBufferImpl;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/b;->d:Lorg/webrtc/TextureBufferImpl;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/b;->d:Lorg/webrtc/TextureBufferImpl;
-
-    invoke-virtual {v0}, Lorg/webrtc/TextureBufferImpl;->release()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/b0.smali b/com.discord/smali_classes2/p0/c/b0.smali
deleted file mode 100644
index 8d83cf88f4..0000000000
--- a/com.discord/smali_classes2/p0/c/b0.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/b0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
-
-.field public final synthetic e:Ljava/util/concurrent/CountDownLatch;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;Ljava/util/concurrent/CountDownLatch;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/b0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    iput-object p2, p0, Lp0/c/b0;->e:Ljava/util/concurrent/CountDownLatch;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/b0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    iget-object v1, p0, Lp0/c/b0;->e:Ljava/util/concurrent/CountDownLatch;
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/VideoFileRenderer;->b(Ljava/util/concurrent/CountDownLatch;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/c.smali b/com.discord/smali_classes2/p0/c/c.smali
deleted file mode 100644
index b5fde99c76..0000000000
--- a/com.discord/smali_classes2/p0/c/c.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/c;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/Camera1Session$2;
-
-.field public final synthetic e:[B
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/Camera1Session$2;[B)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/c;->d:Lorg/webrtc/Camera1Session$2;
-
-    iput-object p2, p0, Lp0/c/c;->e:[B
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/c;->d:Lorg/webrtc/Camera1Session$2;
-
-    iget-object v1, p0, Lp0/c/c;->e:[B
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/Camera1Session$2;->a([B)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/c0.smali b/com.discord/smali_classes2/p0/c/c0.smali
deleted file mode 100644
index 33a80cc022..0000000000
--- a/com.discord/smali_classes2/p0/c/c0.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/c0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
-
-.field public final synthetic e:Lorg/webrtc/VideoFrame;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/c0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    iput-object p2, p0, Lp0/c/c0;->e:Lorg/webrtc/VideoFrame;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/c0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    iget-object v1, p0, Lp0/c/c0;->e:Lorg/webrtc/VideoFrame;
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/VideoFileRenderer;->a(Lorg/webrtc/VideoFrame;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/d.smali b/com.discord/smali_classes2/p0/c/d.smali
deleted file mode 100644
index 268c35220f..0000000000
--- a/com.discord/smali_classes2/p0/c/d.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/d;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/Camera1Session$2;
-
-.field public final synthetic e:[B
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/Camera1Session$2;[B)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/d;->d:Lorg/webrtc/Camera1Session$2;
-
-    iput-object p2, p0, Lp0/c/d;->e:[B
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/d;->d:Lorg/webrtc/Camera1Session$2;
-
-    iget-object v1, p0, Lp0/c/d;->e:[B
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/Camera1Session$2;->b([B)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/d0.smali b/com.discord/smali_classes2/p0/c/d0.smali
deleted file mode 100644
index e9f63674c6..0000000000
--- a/com.discord/smali_classes2/p0/c/d0.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lp0/c/d0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
-
-.field public final synthetic e:Lorg/webrtc/VideoFrame$I420Buffer;
-
-.field public final synthetic f:Lorg/webrtc/VideoFrame;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame$I420Buffer;Lorg/webrtc/VideoFrame;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/d0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    iput-object p2, p0, Lp0/c/d0;->e:Lorg/webrtc/VideoFrame$I420Buffer;
-
-    iput-object p3, p0, Lp0/c/d0;->f:Lorg/webrtc/VideoFrame;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 3
-
-    iget-object v0, p0, Lp0/c/d0;->d:Lorg/webrtc/VideoFileRenderer;
-
-    iget-object v1, p0, Lp0/c/d0;->e:Lorg/webrtc/VideoFrame$I420Buffer;
-
-    iget-object v2, p0, Lp0/c/d0;->f:Lorg/webrtc/VideoFrame;
-
-    invoke-virtual {v0, v1, v2}, Lorg/webrtc/VideoFileRenderer;->d(Lorg/webrtc/VideoFrame$I420Buffer;Lorg/webrtc/VideoFrame;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/e.smali b/com.discord/smali_classes2/p0/c/e.smali
deleted file mode 100644
index bceed1297a..0000000000
--- a/com.discord/smali_classes2/p0/c/e.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/e;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lorg/webrtc/VideoSink;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/Camera1Session;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/Camera1Session;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/e;->d:Lorg/webrtc/Camera1Session;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onFrame(Lorg/webrtc/VideoFrame;)V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/e;->d:Lorg/webrtc/Camera1Session;
-
-    invoke-virtual {v0, p1}, Lorg/webrtc/Camera1Session;->a(Lorg/webrtc/VideoFrame;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/e0.smali b/com.discord/smali_classes2/p0/c/e0.smali
deleted file mode 100644
index d7d1026aca..0000000000
--- a/com.discord/smali_classes2/p0/c/e0.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/e0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Ljava/nio/ByteBuffer;
-
-
-# direct methods
-.method public synthetic constructor <init>(Ljava/nio/ByteBuffer;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/e0;->d:Ljava/nio/ByteBuffer;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/e0;->d:Ljava/nio/ByteBuffer;
-
-    invoke-static {v0}, Lorg/webrtc/JniCommon;->nativeFreeByteBuffer(Ljava/nio/ByteBuffer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/f.smali b/com.discord/smali_classes2/p0/c/f.smali
deleted file mode 100644
index 3525b7e291..0000000000
--- a/com.discord/smali_classes2/p0/c/f.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/f;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lorg/webrtc/VideoSink;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/Camera2Session$CaptureSessionCallback;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/Camera2Session$CaptureSessionCallback;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/f;->d:Lorg/webrtc/Camera2Session$CaptureSessionCallback;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onFrame(Lorg/webrtc/VideoFrame;)V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/f;->d:Lorg/webrtc/Camera2Session$CaptureSessionCallback;
-
-    invoke-virtual {v0, p1}, Lorg/webrtc/Camera2Session$CaptureSessionCallback;->a(Lorg/webrtc/VideoFrame;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/f0.smali b/com.discord/smali_classes2/p0/c/f0.smali
deleted file mode 100644
index ec0c3d1fd9..0000000000
--- a/com.discord/smali_classes2/p0/c/f0.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/f0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/VideoFrame$I420Buffer;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/VideoFrame$I420Buffer;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/f0;->d:Lorg/webrtc/VideoFrame$I420Buffer;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/f0;->d:Lorg/webrtc/VideoFrame$I420Buffer;
-
-    invoke-interface {v0}, Lorg/webrtc/VideoFrame$Buffer;->release()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/g.smali b/com.discord/smali_classes2/p0/c/g.smali
deleted file mode 100644
index 00db92a918..0000000000
--- a/com.discord/smali_classes2/p0/c/g.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/g;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-.field public final synthetic e:Landroid/os/Looper;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Landroid/os/Looper;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/g;->d:Lorg/webrtc/EglRenderer;
-
-    iput-object p2, p0, Lp0/c/g;->e:Landroid/os/Looper;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/g;->d:Lorg/webrtc/EglRenderer;
-
-    iget-object v1, p0, Lp0/c/g;->e:Landroid/os/Looper;
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/EglRenderer;->e(Landroid/os/Looper;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/g0.smali b/com.discord/smali_classes2/p0/c/g0.smali
deleted file mode 100644
index 305b4461d0..0000000000
--- a/com.discord/smali_classes2/p0/c/g0.smali
+++ /dev/null
@@ -1,99 +0,0 @@
-.class public final synthetic Lp0/c/g0;
-.super Ljava/lang/Object;
-.source "CameraSession.java"
-
-
-# direct methods
-.method public static a(Lorg/webrtc/TextureBufferImpl;ZI)Lorg/webrtc/VideoFrame$TextureBuffer;
-    .locals 2
-
-    new-instance v0, Landroid/graphics/Matrix;
-
-    invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
-
-    const/high16 v1, 0x3f000000    # 0.5f
-
-    invoke-virtual {v0, v1, v1}, Landroid/graphics/Matrix;->preTranslate(FF)Z
-
-    if-eqz p1, :cond_0
-
-    const/high16 p1, -0x40800000    # -1.0f
-
-    const/high16 v1, 0x3f800000    # 1.0f
-
-    invoke-virtual {v0, p1, v1}, Landroid/graphics/Matrix;->preScale(FF)Z
-
-    :cond_0
-    int-to-float p1, p2
-
-    invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->preRotate(F)Z
-
-    const/high16 p1, -0x41000000    # -0.5f
-
-    invoke-virtual {v0, p1, p1}, Landroid/graphics/Matrix;->preTranslate(FF)Z
-
-    invoke-virtual {p0}, Lorg/webrtc/TextureBufferImpl;->getWidth()I
-
-    move-result p1
-
-    invoke-virtual {p0}, Lorg/webrtc/TextureBufferImpl;->getHeight()I
-
-    move-result p2
-
-    invoke-virtual {p0, v0, p1, p2}, Lorg/webrtc/TextureBufferImpl;->applyTransformMatrix(Landroid/graphics/Matrix;II)Lorg/webrtc/TextureBufferImpl;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static b(Landroid/content/Context;)I
-    .locals 1
-
-    const-string v0, "window"
-
-    invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Landroid/view/WindowManager;
-
-    invoke-interface {p0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Landroid/view/Display;->getRotation()I
-
-    move-result p0
-
-    const/4 v0, 0x1
-
-    if-eq p0, v0, :cond_2
-
-    const/4 v0, 0x2
-
-    if-eq p0, v0, :cond_1
-
-    const/4 v0, 0x3
-
-    if-eq p0, v0, :cond_0
-
-    const/4 p0, 0x0
-
-    return p0
-
-    :cond_0
-    const/16 p0, 0x10e
-
-    return p0
-
-    :cond_1
-    const/16 p0, 0xb4
-
-    return p0
-
-    :cond_2
-    const/16 p0, 0x5a
-
-    return p0
-.end method
diff --git a/com.discord/smali_classes2/p0/c/h.smali b/com.discord/smali_classes2/p0/c/h.smali
deleted file mode 100644
index 4566289675..0000000000
--- a/com.discord/smali_classes2/p0/c/h.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lp0/c/h;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-.field public final synthetic e:Ljava/util/concurrent/CountDownLatch;
-
-.field public final synthetic f:Lorg/webrtc/EglRenderer$FrameListener;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;Lorg/webrtc/EglRenderer$FrameListener;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/h;->d:Lorg/webrtc/EglRenderer;
-
-    iput-object p2, p0, Lp0/c/h;->e:Ljava/util/concurrent/CountDownLatch;
-
-    iput-object p3, p0, Lp0/c/h;->f:Lorg/webrtc/EglRenderer$FrameListener;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 3
-
-    iget-object v0, p0, Lp0/c/h;->d:Lorg/webrtc/EglRenderer;
-
-    iget-object v1, p0, Lp0/c/h;->e:Ljava/util/concurrent/CountDownLatch;
-
-    iget-object v2, p0, Lp0/c/h;->f:Lorg/webrtc/EglRenderer$FrameListener;
-
-    invoke-virtual {v0, v1, v2}, Lorg/webrtc/EglRenderer;->g(Ljava/util/concurrent/CountDownLatch;Lorg/webrtc/EglRenderer$FrameListener;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/h0.smali b/com.discord/smali_classes2/p0/c/h0.smali
deleted file mode 100644
index 6edf03a8ad..0000000000
--- a/com.discord/smali_classes2/p0/c/h0.smali
+++ /dev/null
@@ -1,35 +0,0 @@
-.class public final synthetic Lp0/c/h0;
-.super Ljava/lang/Object;
-.source "CameraVideoCapturer.java"
-
-
-# direct methods
-.method public static $default$addMediaRecorderToCamera(Lorg/webrtc/CameraVideoCapturer;Landroid/media/MediaRecorder;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
-    .locals 0
-    .param p0, "_this"    # Lorg/webrtc/CameraVideoCapturer;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string p2, "Deprecated and not implemented."
-
-    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static $default$removeMediaRecorderFromCamera(Lorg/webrtc/CameraVideoCapturer;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
-    .locals 1
-    .param p0, "_this"    # Lorg/webrtc/CameraVideoCapturer;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Deprecated and not implemented."
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/p0/c/i.smali b/com.discord/smali_classes2/p0/c/i.smali
deleted file mode 100644
index a9d5c23aab..0000000000
--- a/com.discord/smali_classes2/p0/c/i.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lp0/c/i;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-.field public final synthetic e:Lorg/webrtc/EglBase$Context;
-
-.field public final synthetic f:[I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/EglBase$Context;[I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/i;->d:Lorg/webrtc/EglRenderer;
-
-    iput-object p2, p0, Lp0/c/i;->e:Lorg/webrtc/EglBase$Context;
-
-    iput-object p3, p0, Lp0/c/i;->f:[I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 3
-
-    iget-object v0, p0, Lp0/c/i;->d:Lorg/webrtc/EglRenderer;
-
-    iget-object v1, p0, Lp0/c/i;->e:Lorg/webrtc/EglBase$Context;
-
-    iget-object v2, p0, Lp0/c/i;->f:[I
-
-    invoke-virtual {v0, v1, v2}, Lorg/webrtc/EglRenderer;->c(Lorg/webrtc/EglBase$Context;[I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/i0.smali b/com.discord/smali_classes2/p0/c/i0.smali
deleted file mode 100644
index d14168c2ea..0000000000
--- a/com.discord/smali_classes2/p0/c/i0.smali
+++ /dev/null
@@ -1,78 +0,0 @@
-.class public final synthetic Lp0/c/i0;
-.super Ljava/lang/Object;
-.source "EglBase.java"
-
-
-# direct methods
-.method public static a()Lorg/webrtc/EglBase;
-    .locals 2
-
-    sget-object v0, Lorg/webrtc/EglBase;->CONFIG_PLAIN:[I
-
-    const/4 v1, 0x0
-
-    invoke-static {v1, v0}, Lp0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public static b(Lorg/webrtc/EglBase$Context;)Lorg/webrtc/EglBase;
-    .locals 1
-
-    sget-object v0, Lorg/webrtc/EglBase;->CONFIG_PLAIN:[I
-
-    invoke-static {p0, v0}, Lp0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
-    .locals 1
-
-    invoke-static {}, Lorg/webrtc/EglBase14;->isEGL14Supported()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    if-eqz p0, :cond_0
-
-    instance-of v0, p0, Lorg/webrtc/EglBase14$Context;
-
-    if-eqz v0, :cond_1
-
-    :cond_0
-    new-instance v0, Lorg/webrtc/EglBase14;
-
-    check-cast p0, Lorg/webrtc/EglBase14$Context;
-
-    invoke-direct {v0, p0, p1}, Lorg/webrtc/EglBase14;-><init>(Lorg/webrtc/EglBase14$Context;[I)V
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Lorg/webrtc/EglBase10;
-
-    check-cast p0, Lorg/webrtc/EglBase10$Context;
-
-    invoke-direct {v0, p0, p1}, Lorg/webrtc/EglBase10;-><init>(Lorg/webrtc/EglBase10$Context;[I)V
-
-    :goto_0
-    return-object v0
-.end method
-
-.method public static d([I)Lorg/webrtc/EglBase;
-    .locals 2
-
-    new-instance v0, Lorg/webrtc/EglBase10;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1, p0}, Lorg/webrtc/EglBase10;-><init>(Lorg/webrtc/EglBase10$Context;[I)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/c/j.smali b/com.discord/smali_classes2/p0/c/j.smali
deleted file mode 100644
index 6c9127db51..0000000000
--- a/com.discord/smali_classes2/p0/c/j.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/j;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-.field public final synthetic e:Ljava/util/concurrent/CountDownLatch;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/j;->d:Lorg/webrtc/EglRenderer;
-
-    iput-object p2, p0, Lp0/c/j;->e:Ljava/util/concurrent/CountDownLatch;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/j;->d:Lorg/webrtc/EglRenderer;
-
-    iget-object v1, p0, Lp0/c/j;->e:Ljava/util/concurrent/CountDownLatch;
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/EglRenderer;->d(Ljava/util/concurrent/CountDownLatch;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/j0.smali b/com.discord/smali_classes2/p0/c/j0.smali
deleted file mode 100644
index 20dad1f950..0000000000
--- a/com.discord/smali_classes2/p0/c/j0.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-.class public final synthetic Lp0/c/j0;
-.super Ljava/lang/Object;
-.source "PeerConnection.java"
-
-
-# direct methods
-.method public static $default$onConnectionChange(Lorg/webrtc/PeerConnection$Observer;Lorg/webrtc/PeerConnection$PeerConnectionState;)V
-    .locals 0
-    .annotation build Lorg/webrtc/CalledByNative;
-        value = "Observer"
-    .end annotation
-
-    return-void
-.end method
-
-.method public static $default$onTrack(Lorg/webrtc/PeerConnection$Observer;Lorg/webrtc/RtpTransceiver;)V
-    .locals 0
-    .annotation build Lorg/webrtc/CalledByNative;
-        value = "Observer"
-    .end annotation
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/k.smali b/com.discord/smali_classes2/p0/c/k.smali
deleted file mode 100644
index cbe1d9f78d..0000000000
--- a/com.discord/smali_classes2/p0/c/k.smali
+++ /dev/null
@@ -1,58 +0,0 @@
-.class public final synthetic Lp0/c/k;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-.field public final synthetic e:Lorg/webrtc/RendererCommon$GlDrawer;
-
-.field public final synthetic f:Lorg/webrtc/EglRenderer$FrameListener;
-
-.field public final synthetic g:F
-
-.field public final synthetic h:Z
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/RendererCommon$GlDrawer;Lorg/webrtc/EglRenderer$FrameListener;FZ)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/k;->d:Lorg/webrtc/EglRenderer;
-
-    iput-object p2, p0, Lp0/c/k;->e:Lorg/webrtc/RendererCommon$GlDrawer;
-
-    iput-object p3, p0, Lp0/c/k;->f:Lorg/webrtc/EglRenderer$FrameListener;
-
-    iput p4, p0, Lp0/c/k;->g:F
-
-    iput-boolean p5, p0, Lp0/c/k;->h:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 5
-
-    iget-object v0, p0, Lp0/c/k;->d:Lorg/webrtc/EglRenderer;
-
-    iget-object v1, p0, Lp0/c/k;->e:Lorg/webrtc/RendererCommon$GlDrawer;
-
-    iget-object v2, p0, Lp0/c/k;->f:Lorg/webrtc/EglRenderer$FrameListener;
-
-    iget v3, p0, Lp0/c/k;->g:F
-
-    iget-boolean v4, p0, Lp0/c/k;->h:Z
-
-    invoke-virtual {v0, v1, v2, v3, v4}, Lorg/webrtc/EglRenderer;->a(Lorg/webrtc/RendererCommon$GlDrawer;Lorg/webrtc/EglRenderer$FrameListener;FZ)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/k0.smali b/com.discord/smali_classes2/p0/c/k0.smali
deleted file mode 100644
index 587603feaf..0000000000
--- a/com.discord/smali_classes2/p0/c/k0.smali
+++ /dev/null
@@ -1,15 +0,0 @@
-.class public final synthetic Lp0/c/k0;
-.super Ljava/lang/Object;
-.source "VideoDecoder.java"
-
-
-# direct methods
-.method public static $default$createNativeVideoDecoder(Lorg/webrtc/VideoDecoder;)J
-    .locals 2
-    .annotation build Lorg/webrtc/CalledByNative;
-    .end annotation
-
-    const-wide/16 v0, 0x0
-
-    return-wide v0
-.end method
diff --git a/com.discord/smali_classes2/p0/c/l.smali b/com.discord/smali_classes2/p0/c/l.smali
deleted file mode 100644
index 6561d117a3..0000000000
--- a/com.discord/smali_classes2/p0/c/l.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/l;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-.field public final synthetic e:Ljava/lang/Runnable;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Ljava/lang/Runnable;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/l;->d:Lorg/webrtc/EglRenderer;
-
-    iput-object p2, p0, Lp0/c/l;->e:Ljava/lang/Runnable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/l;->d:Lorg/webrtc/EglRenderer;
-
-    iget-object v1, p0, Lp0/c/l;->e:Ljava/lang/Runnable;
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/EglRenderer;->f(Ljava/lang/Runnable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/l0.smali b/com.discord/smali_classes2/p0/c/l0.smali
deleted file mode 100644
index 2fddae6e8b..0000000000
--- a/com.discord/smali_classes2/p0/c/l0.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class public final synthetic Lp0/c/l0;
-.super Ljava/lang/Object;
-.source "VideoDecoderFactory.java"
-
-
-# direct methods
-.method public static $default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
-    .locals 1
-    .param p0, "_this"    # Lorg/webrtc/VideoDecoderFactory;
-    .annotation runtime Ljava/lang/Deprecated;
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    const-string v0, "Deprecated and not implemented."
-
-    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public static $default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Lorg/webrtc/VideoCodecInfo;)Lorg/webrtc/VideoDecoder;
-    .locals 0
-    .param p0, "_this"    # Lorg/webrtc/VideoDecoderFactory;
-    .annotation build Lorg/webrtc/CalledByNative;
-    .end annotation
-
-    invoke-virtual {p1}, Lorg/webrtc/VideoCodecInfo;->getName()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-interface {p0, p1}, Lorg/webrtc/VideoDecoderFactory;->createDecoder(Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public static $default$getSupportedCodecs(Lorg/webrtc/VideoDecoderFactory;)[Lorg/webrtc/VideoCodecInfo;
-    .locals 1
-    .annotation build Lorg/webrtc/CalledByNative;
-    .end annotation
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Lorg/webrtc/VideoCodecInfo;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/c/m.smali b/com.discord/smali_classes2/p0/c/m.smali
deleted file mode 100644
index a0fb46de91..0000000000
--- a/com.discord/smali_classes2/p0/c/m.smali
+++ /dev/null
@@ -1,58 +0,0 @@
-.class public final synthetic Lp0/c/m;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-.field public final synthetic e:F
-
-.field public final synthetic f:F
-
-.field public final synthetic g:F
-
-.field public final synthetic h:F
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;FFFF)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/m;->d:Lorg/webrtc/EglRenderer;
-
-    iput p2, p0, Lp0/c/m;->e:F
-
-    iput p3, p0, Lp0/c/m;->f:F
-
-    iput p4, p0, Lp0/c/m;->g:F
-
-    iput p5, p0, Lp0/c/m;->h:F
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 5
-
-    iget-object v0, p0, Lp0/c/m;->d:Lorg/webrtc/EglRenderer;
-
-    iget v1, p0, Lp0/c/m;->e:F
-
-    iget v2, p0, Lp0/c/m;->f:F
-
-    iget v3, p0, Lp0/c/m;->g:F
-
-    iget v4, p0, Lp0/c/m;->h:F
-
-    invoke-virtual {v0, v1, v2, v3, v4}, Lorg/webrtc/EglRenderer;->b(FFFF)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/m0.smali b/com.discord/smali_classes2/p0/c/m0.smali
deleted file mode 100644
index 1c75070b74..0000000000
--- a/com.discord/smali_classes2/p0/c/m0.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public final synthetic Lp0/c/m0;
-.super Ljava/lang/Object;
-.source "VideoEncoder.java"
-
-
-# direct methods
-.method public static $default$createNativeVideoEncoder(Lorg/webrtc/VideoEncoder;)J
-    .locals 2
-    .annotation build Lorg/webrtc/CalledByNative;
-    .end annotation
-
-    const-wide/16 v0, 0x0
-
-    return-wide v0
-.end method
-
-.method public static $default$isHardwareEncoder(Lorg/webrtc/VideoEncoder;)Z
-    .locals 1
-    .annotation build Lorg/webrtc/CalledByNative;
-    .end annotation
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/p0/c/n.smali b/com.discord/smali_classes2/p0/c/n.smali
deleted file mode 100644
index 0b93408476..0000000000
--- a/com.discord/smali_classes2/p0/c/n.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/n;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/EglRenderer;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/n;->d:Lorg/webrtc/EglRenderer;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/n;->d:Lorg/webrtc/EglRenderer;
-
-    invoke-static {v0}, Lorg/webrtc/EglRenderer;->h(Lorg/webrtc/EglRenderer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/o.smali b/com.discord/smali_classes2/p0/c/o.smali
deleted file mode 100644
index 0d26fc4481..0000000000
--- a/com.discord/smali_classes2/p0/c/o.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/o;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Ljava/nio/ByteBuffer;
-
-
-# direct methods
-.method public synthetic constructor <init>(Ljava/nio/ByteBuffer;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/o;->d:Ljava/nio/ByteBuffer;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/o;->d:Ljava/nio/ByteBuffer;
-
-    invoke-static {v0}, Lorg/webrtc/JavaI420Buffer;->a(Ljava/nio/ByteBuffer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/p.smali b/com.discord/smali_classes2/p0/c/p.smali
deleted file mode 100644
index 2066fa769a..0000000000
--- a/com.discord/smali_classes2/p0/c/p.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/p;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/p;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onFrameAvailable(Landroid/graphics/SurfaceTexture;)V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/p;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    invoke-virtual {v0, p1}, Lorg/webrtc/SurfaceTextureHelper;->c(Landroid/graphics/SurfaceTexture;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/q.smali b/com.discord/smali_classes2/p0/c/q.smali
deleted file mode 100644
index 716dba6972..0000000000
--- a/com.discord/smali_classes2/p0/c/q.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lp0/c/q;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
-
-.field public final synthetic e:I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/q;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    iput p2, p0, Lp0/c/q;->e:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 2
-
-    iget-object v0, p0, Lp0/c/q;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    iget v1, p0, Lp0/c/q;->e:I
-
-    invoke-virtual {v0, v1}, Lorg/webrtc/SurfaceTextureHelper;->e(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/r.smali b/com.discord/smali_classes2/p0/c/r.smali
deleted file mode 100644
index dc51fea33d..0000000000
--- a/com.discord/smali_classes2/p0/c/r.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/r;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/r;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/r;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->g()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/s.smali b/com.discord/smali_classes2/p0/c/s.smali
deleted file mode 100644
index 222b42de1b..0000000000
--- a/com.discord/smali_classes2/p0/c/s.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/s;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/s;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/s;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->a()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/t.smali b/com.discord/smali_classes2/p0/c/t.smali
deleted file mode 100644
index 67f78dc297..0000000000
--- a/com.discord/smali_classes2/p0/c/t.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/t;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/t;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/t;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    invoke-static {v0}, Lorg/webrtc/SurfaceTextureHelper;->b(Lorg/webrtc/SurfaceTextureHelper;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/u.smali b/com.discord/smali_classes2/p0/c/u.smali
deleted file mode 100644
index 44292eb16b..0000000000
--- a/com.discord/smali_classes2/p0/c/u.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/u;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/u;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/u;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->d()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/v.smali b/com.discord/smali_classes2/p0/c/v.smali
deleted file mode 100644
index 02c7ee06ff..0000000000
--- a/com.discord/smali_classes2/p0/c/v.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lp0/c/v;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
-
-.field public final synthetic e:I
-
-.field public final synthetic f:I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;II)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/v;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    iput p2, p0, Lp0/c/v;->e:I
-
-    iput p3, p0, Lp0/c/v;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 3
-
-    iget-object v0, p0, Lp0/c/v;->d:Lorg/webrtc/SurfaceTextureHelper;
-
-    iget v1, p0, Lp0/c/v;->e:I
-
-    iget v2, p0, Lp0/c/v;->f:I
-
-    invoke-virtual {v0, v1, v2}, Lorg/webrtc/SurfaceTextureHelper;->f(II)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/w.smali b/com.discord/smali_classes2/p0/c/w.smali
deleted file mode 100644
index 883d44ce71..0000000000
--- a/com.discord/smali_classes2/p0/c/w.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lp0/c/w;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/SurfaceViewRenderer;
-
-.field public final synthetic e:I
-
-.field public final synthetic f:I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/SurfaceViewRenderer;II)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/w;->d:Lorg/webrtc/SurfaceViewRenderer;
-
-    iput p2, p0, Lp0/c/w;->e:I
-
-    iput p3, p0, Lp0/c/w;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final run()V
-    .locals 3
-
-    iget-object v0, p0, Lp0/c/w;->d:Lorg/webrtc/SurfaceViewRenderer;
-
-    iget v1, p0, Lp0/c/w;->e:I
-
-    iget v2, p0, Lp0/c/w;->f:I
-
-    invoke-virtual {v0, v1, v2}, Lorg/webrtc/SurfaceViewRenderer;->a(II)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/x.smali b/com.discord/smali_classes2/p0/c/x.smali
deleted file mode 100644
index 47e7faeca4..0000000000
--- a/com.discord/smali_classes2/p0/c/x.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lp0/c/x;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Ljava/util/concurrent/Callable;
-
-
-# instance fields
-.field public final synthetic d:Lorg/webrtc/TextureBufferImpl;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lorg/webrtc/TextureBufferImpl;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lp0/c/x;->d:Lorg/webrtc/TextureBufferImpl;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call()Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lp0/c/x;->d:Lorg/webrtc/TextureBufferImpl;
-
-    invoke-virtual {v0}, Lorg/webrtc/TextureBufferImpl;->a()Lorg/webrtc/VideoFrame$I420Buffer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/p0/c/y.smali b/com.discord/smali_classes2/p0/c/y.smali
deleted file mode 100644
index fbb45eb376..0000000000
--- a/com.discord/smali_classes2/p0/c/y.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/y;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lorg/webrtc/VideoDecoder$Callback;
-
-
-# instance fields
-.field public final synthetic a:J
-
-
-# direct methods
-.method public synthetic constructor <init>(J)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lp0/c/y;->a:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onDecodedFrame(Lorg/webrtc/VideoFrame;Ljava/lang/Integer;Ljava/lang/Integer;)V
-    .locals 2
-
-    iget-wide v0, p0, Lp0/c/y;->a:J
-
-    invoke-static {v0, v1, p1, p2, p3}, Lorg/webrtc/VideoDecoderWrapper;->a(JLorg/webrtc/VideoFrame;Ljava/lang/Integer;Ljava/lang/Integer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/c/z.smali b/com.discord/smali_classes2/p0/c/z.smali
deleted file mode 100644
index 7ed4eb2340..0000000000
--- a/com.discord/smali_classes2/p0/c/z.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lp0/c/z;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lorg/webrtc/VideoEncoder$Callback;
-
-
-# instance fields
-.field public final synthetic a:J
-
-
-# direct methods
-.method public synthetic constructor <init>(J)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lp0/c/z;->a:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onEncodedFrame(Lorg/webrtc/EncodedImage;Lorg/webrtc/VideoEncoder$CodecSpecificInfo;)V
-    .locals 2
-
-    iget-wide v0, p0, Lp0/c/z;->a:J
-
-    invoke-static {v0, v1, p1, p2}, Lorg/webrtc/VideoEncoderWrapper;->a(JLorg/webrtc/EncodedImage;Lorg/webrtc/VideoEncoder$CodecSpecificInfo;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/p0/d.smali b/com.discord/smali_classes2/p0/d.smali
new file mode 100644
index 0000000000..a8397b207a
--- /dev/null
+++ b/com.discord/smali_classes2/p0/d.smali
@@ -0,0 +1,177 @@
+.class public final Lp0/d;
+.super Ljava/lang/Object;
+.source "AsyncTimeout.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# instance fields
+.field public final synthetic d:Lp0/b;
+
+.field public final synthetic e:Lp0/w;
+
+
+# direct methods
+.method public constructor <init>(Lp0/b;Lp0/w;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lp0/w;",
+            ")V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lp0/d;->d:Lp0/b;
+
+    iput-object p2, p0, Lp0/d;->e:Lp0/w;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 1
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/d;->d:Lp0/b;
+
+    invoke-virtual {v0}, Lp0/b;->i()V
+
+    :try_start_0
+    iget-object v0, p0, Lp0/d;->e:Lp0/w;
+
+    invoke-interface {v0, p1, p2, p3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 p3, 0x1
+
+    iget-object v0, p0, Lp0/d;->d:Lp0/b;
+
+    invoke-virtual {v0, p3}, Lp0/b;->l(Z)V
+
+    return-wide p1
+
+    :catchall_0
+    move-exception p1
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    :try_start_1
+    iget-object p2, p0, Lp0/d;->d:Lp0/b;
+
+    invoke-virtual {p2, p1}, Lp0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object p1
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    iget-object p2, p0, Lp0/d;->d:Lp0/b;
+
+    const/4 p3, 0x0
+
+    invoke-virtual {p2, p3}, Lp0/b;->l(Z)V
+
+    throw p1
+.end method
+
+.method public close()V
+    .locals 3
+
+    iget-object v0, p0, Lp0/d;->d:Lp0/b;
+
+    invoke-virtual {v0}, Lp0/b;->i()V
+
+    :try_start_0
+    iget-object v0, p0, Lp0/d;->e:Lp0/w;
+
+    invoke-interface {v0}, Lp0/w;->close()V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v0, 0x1
+
+    iget-object v1, p0, Lp0/d;->d:Lp0/b;
+
+    invoke-virtual {v1, v0}, Lp0/b;->l(Z)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    :try_start_1
+    iget-object v1, p0, Lp0/d;->d:Lp0/b;
+
+    invoke-virtual {v1, v0}, Lp0/b;->k(Ljava/io/IOException;)Ljava/io/IOException;
+
+    move-result-object v0
+
+    throw v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    iget-object v1, p0, Lp0/d;->d:Lp0/b;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2}, Lp0/b;->l(Z)V
+
+    throw v0
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/d;->d:Lp0/b;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "AsyncTimeout.source("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lp0/d;->e:Lp0/w;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/p0/e$a.smali b/com.discord/smali_classes2/p0/e$a.smali
new file mode 100644
index 0000000000..0bf6a594a5
--- /dev/null
+++ b/com.discord/smali_classes2/p0/e$a.smali
@@ -0,0 +1,447 @@
+.class public final Lp0/e$a;
+.super Ljava/lang/Object;
+.source "Buffer.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lp0/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public d:Lp0/e;
+
+.field public e:Z
+
+.field public f:Lp0/r;
+
+.field public g:J
+
+.field public h:[B
+
+.field public i:I
+
+.field public j:I
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const-wide/16 v0, -0x1
+
+    iput-wide v0, p0, Lp0/e$a;->g:J
+
+    const/4 v0, -0x1
+
+    iput v0, p0, Lp0/e$a;->i:I
+
+    iput v0, p0, Lp0/e$a;->j:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(J)I
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    move-wide/from16 v1, p1
+
+    iget-object v3, v0, Lp0/e$a;->d:Lp0/e;
+
+    if-eqz v3, :cond_11
+
+    const/4 v4, -0x1
+
+    int-to-long v5, v4
+
+    cmp-long v7, v1, v5
+
+    if-ltz v7, :cond_10
+
+    iget-wide v5, v3, Lp0/e;->e:J
+
+    cmp-long v7, v1, v5
+
+    if-gtz v7, :cond_10
+
+    const-wide/16 v7, -0x1
+
+    const/4 v9, 0x0
+
+    cmp-long v10, v1, v7
+
+    if-eqz v10, :cond_f
+
+    cmp-long v7, v1, v5
+
+    if-nez v7, :cond_0
+
+    goto/16 :goto_4
+
+    :cond_0
+    const-wide/16 v7, 0x0
+
+    iget-object v4, v3, Lp0/e;->d:Lp0/r;
+
+    iget-object v10, v0, Lp0/e$a;->f:Lp0/r;
+
+    if-eqz v10, :cond_3
+
+    iget-wide v11, v0, Lp0/e$a;->g:J
+
+    iget v13, v0, Lp0/e$a;->i:I
+
+    if-eqz v10, :cond_2
+
+    iget v14, v10, Lp0/r;->b:I
+
+    sub-int/2addr v13, v14
+
+    int-to-long v13, v13
+
+    sub-long/2addr v11, v13
+
+    cmp-long v13, v11, v1
+
+    if-lez v13, :cond_1
+
+    move-wide v5, v11
+
+    move-object/from16 v17, v10
+
+    move-object v10, v4
+
+    move-object/from16 v4, v17
+
+    goto :goto_0
+
+    :cond_1
+    move-wide v7, v11
+
+    goto :goto_0
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_3
+    move-object v10, v4
+
+    :goto_0
+    sub-long v11, v5, v1
+
+    sub-long v13, v1, v7
+
+    cmp-long v15, v11, v13
+
+    if-lez v15, :cond_5
+
+    :goto_1
+    if-eqz v10, :cond_4
+
+    iget v4, v10, Lp0/r;->c:I
+
+    iget v5, v10, Lp0/r;->b:I
+
+    sub-int v6, v4, v5
+
+    int-to-long v11, v6
+
+    add-long/2addr v11, v7
+
+    cmp-long v6, v1, v11
+
+    if-ltz v6, :cond_9
+
+    sub-int/2addr v4, v5
+
+    int-to-long v4, v4
+
+    add-long/2addr v7, v4
+
+    iget-object v10, v10, Lp0/r;->f:Lp0/r;
+
+    goto :goto_1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_5
+    :goto_2
+    cmp-long v7, v5, v1
+
+    if-lez v7, :cond_8
+
+    if-eqz v4, :cond_7
+
+    iget-object v4, v4, Lp0/r;->g:Lp0/r;
+
+    if-eqz v4, :cond_6
+
+    iget v7, v4, Lp0/r;->c:I
+
+    iget v8, v4, Lp0/r;->b:I
+
+    sub-int/2addr v7, v8
+
+    int-to-long v7, v7
+
+    sub-long/2addr v5, v7
+
+    goto :goto_2
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_8
+    move-object v10, v4
+
+    move-wide v7, v5
+
+    :cond_9
+    iget-boolean v4, v0, Lp0/e$a;->e:Z
+
+    if-eqz v4, :cond_d
+
+    if-eqz v10, :cond_c
+
+    iget-boolean v4, v10, Lp0/r;->d:Z
+
+    if-eqz v4, :cond_d
+
+    new-instance v4, Lp0/r;
+
+    iget-object v5, v10, Lp0/r;->a:[B
+
+    array-length v6, v5
+
+    invoke-static {v5, v6}, Ljava/util/Arrays;->copyOf([BI)[B
+
+    move-result-object v12
+
+    const-string v5, "java.util.Arrays.copyOf(this, size)"
+
+    invoke-static {v12, v5}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v13, v10, Lp0/r;->b:I
+
+    iget v14, v10, Lp0/r;->c:I
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x1
+
+    move-object v11, v4
+
+    invoke-direct/range {v11 .. v16}, Lp0/r;-><init>([BIIZZ)V
+
+    iget-object v5, v3, Lp0/e;->d:Lp0/r;
+
+    if-ne v5, v10, :cond_a
+
+    iput-object v4, v3, Lp0/e;->d:Lp0/r;
+
+    :cond_a
+    invoke-virtual {v10, v4}, Lp0/r;->b(Lp0/r;)Lp0/r;
+
+    iget-object v3, v4, Lp0/r;->g:Lp0/r;
+
+    if-eqz v3, :cond_b
+
+    invoke-virtual {v3}, Lp0/r;->a()Lp0/r;
+
+    move-object v10, v4
+
+    goto :goto_3
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_d
+    :goto_3
+    iput-object v10, v0, Lp0/e$a;->f:Lp0/r;
+
+    iput-wide v1, v0, Lp0/e$a;->g:J
+
+    if-eqz v10, :cond_e
+
+    iget-object v3, v10, Lp0/r;->a:[B
+
+    iput-object v3, v0, Lp0/e$a;->h:[B
+
+    iget v3, v10, Lp0/r;->b:I
+
+    sub-long/2addr v1, v7
+
+    long-to-int v2, v1
+
+    add-int/2addr v3, v2
+
+    iput v3, v0, Lp0/e$a;->i:I
+
+    iget v1, v10, Lp0/r;->c:I
+
+    iput v1, v0, Lp0/e$a;->j:I
+
+    sub-int/2addr v1, v3
+
+    return v1
+
+    :cond_e
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v9
+
+    :cond_f
+    :goto_4
+    iput-object v9, v0, Lp0/e$a;->f:Lp0/r;
+
+    iput-wide v1, v0, Lp0/e$a;->g:J
+
+    iput-object v9, v0, Lp0/e$a;->h:[B
+
+    iput v4, v0, Lp0/e$a;->i:I
+
+    iput v4, v0, Lp0/e$a;->j:I
+
+    return v4
+
+    :cond_10
+    new-instance v4, Ljava/lang/ArrayIndexOutOfBoundsException;
+
+    const/4 v5, 0x2
+
+    new-array v6, v5, [Ljava/lang/Object;
+
+    const/4 v7, 0x0
+
+    invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    aput-object v1, v6, v7
+
+    const/4 v1, 0x1
+
+    iget-wide v2, v3, Lp0/e;->e:J
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v2
+
+    aput-object v2, v6, v1
+
+    invoke-static {v6, v5}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v1
+
+    const-string v2, "offset=%s > size=%s"
+
+    invoke-static {v2, v1}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "java.lang.String.format(format, *args)"
+
+    invoke-static {v1, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v4, v1}, Ljava/lang/ArrayIndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw v4
+
+    :cond_11
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "not attached to a buffer"
+
+    invoke-virtual {v2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public close()V
+    .locals 3
+
+    iget-object v0, p0, Lp0/e$a;->d:Lp0/e;
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lp0/e$a;->d:Lp0/e;
+
+    iput-object v0, p0, Lp0/e$a;->f:Lp0/r;
+
+    const-wide/16 v1, -0x1
+
+    iput-wide v1, p0, Lp0/e$a;->g:J
+
+    iput-object v0, p0, Lp0/e$a;->h:[B
+
+    const/4 v0, -0x1
+
+    iput v0, p0, Lp0/e$a;->i:I
+
+    iput v0, p0, Lp0/e$a;->j:I
+
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "not attached to a buffer"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/p0/e$b.smali b/com.discord/smali_classes2/p0/e$b.smali
new file mode 100644
index 0000000000..52d94a2d8b
--- /dev/null
+++ b/com.discord/smali_classes2/p0/e$b.smali
@@ -0,0 +1,129 @@
+.class public final Lp0/e$b;
+.super Ljava/io/InputStream;
+.source "Buffer.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lp0/e;->W0()Ljava/io/InputStream;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lp0/e;
+
+
+# direct methods
+.method public constructor <init>(Lp0/e;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lp0/e$b;->d:Lp0/e;
+
+    invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public available()I
+    .locals 4
+
+    iget-object v0, p0, Lp0/e$b;->d:Lp0/e;
+
+    iget-wide v0, v0, Lp0/e;->e:J
+
+    const v2, 0x7fffffff
+
+    int-to-long v2, v2
+
+    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    return v1
+.end method
+
+.method public close()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public read()I
+    .locals 6
+
+    iget-object v0, p0, Lp0/e$b;->d:Lp0/e;
+
+    iget-wide v1, v0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-lez v5, :cond_0
+
+    invoke-virtual {v0}, Lp0/e;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, -0x1
+
+    :goto_0
+    return v0
+.end method
+
+.method public read([BII)I
+    .locals 1
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/e$b;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->read([BII)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lp0/e$b;->d:Lp0/e;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ".inputStream()"
+
+    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_classes2/p0/e.smali b/com.discord/smali_classes2/p0/e.smali
new file mode 100644
index 0000000000..e447605cc3
--- /dev/null
+++ b/com.discord/smali_classes2/p0/e.smali
@@ -0,0 +1,6141 @@
+.class public final Lp0/e;
+.super Ljava/lang/Object;
+.source "Buffer.kt"
+
+# interfaces
+.implements Lp0/g;
+.implements Lokio/BufferedSink;
+.implements Ljava/lang/Cloneable;
+.implements Ljava/nio/channels/ByteChannel;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lp0/e$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:[B
+
+
+# instance fields
+.field public d:Lp0/r;
+
+.field public e:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    sget-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    const-string v1, "0123456789abcdef"
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+
+    move-result-object v0
+
+    const-string v1, "(this as java.lang.String).getBytes(charset)"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sput-object v0, Lp0/e;->f:[B
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final A(Lp0/n;Z)I
+    .locals 17
+
+    move-object/from16 v0, p1
+
+    const-string v1, "options"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v1, p0
+
+    iget-object v2, v1, Lp0/e;->d:Lp0/r;
+
+    const/4 v3, -0x2
+
+    const/4 v4, -0x1
+
+    if-eqz v2, :cond_12
+
+    iget-object v5, v2, Lp0/r;->a:[B
+
+    iget v6, v2, Lp0/r;->b:I
+
+    iget v7, v2, Lp0/r;->c:I
+
+    iget-object v0, v0, Lp0/n;->e:[I
+
+    const/4 v8, 0x0
+
+    move-object v10, v2
+
+    const/4 v9, 0x0
+
+    const/4 v11, -0x1
+
+    :goto_0
+    add-int/lit8 v12, v9, 0x1
+
+    aget v9, v0, v9
+
+    add-int/lit8 v13, v12, 0x1
+
+    aget v12, v0, v12
+
+    if-eq v12, v4, :cond_0
+
+    move v11, v12
+
+    :cond_0
+    if-nez v10, :cond_1
+
+    goto :goto_3
+
+    :cond_1
+    const/4 v12, 0x0
+
+    if-gez v9, :cond_b
+
+    mul-int/lit8 v9, v9, -0x1
+
+    add-int v14, v9, v13
+
+    :goto_1
+    add-int/lit8 v9, v6, 0x1
+
+    aget-byte v6, v5, v6
+
+    and-int/lit16 v6, v6, 0xff
+
+    add-int/lit8 v15, v13, 0x1
+
+    aget v13, v0, v13
+
+    if-eq v6, v13, :cond_2
+
+    return v11
+
+    :cond_2
+    if-ne v15, v14, :cond_3
+
+    const/4 v6, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v6, 0x0
+
+    :goto_2
+    if-ne v9, v7, :cond_9
+
+    if-eqz v10, :cond_8
+
+    iget-object v5, v10, Lp0/r;->f:Lp0/r;
+
+    if-eqz v5, :cond_7
+
+    iget v7, v5, Lp0/r;->b:I
+
+    iget-object v9, v5, Lp0/r;->a:[B
+
+    iget v10, v5, Lp0/r;->c:I
+
+    if-ne v5, v2, :cond_6
+
+    if-nez v6, :cond_5
+
+    :goto_3
+    if-eqz p2, :cond_4
+
+    return v3
+
+    :cond_4
+    return v11
+
+    :cond_5
+    move-object v5, v9
+
+    move-object v9, v12
+
+    goto :goto_4
+
+    :cond_6
+    move-object/from16 v16, v9
+
+    move-object v9, v5
+
+    move-object/from16 v5, v16
+
+    goto :goto_4
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v12
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v12
+
+    :cond_9
+    move-object/from16 v16, v10
+
+    move v10, v7
+
+    move v7, v9
+
+    move-object/from16 v9, v16
+
+    :goto_4
+    if-eqz v6, :cond_a
+
+    aget v6, v0, v15
+
+    move v3, v7
+
+    move v7, v10
+
+    move-object v10, v9
+
+    goto :goto_6
+
+    :cond_a
+    move v6, v7
+
+    move v7, v10
+
+    move v13, v15
+
+    move-object v10, v9
+
+    goto :goto_1
+
+    :cond_b
+    add-int/lit8 v14, v6, 0x1
+
+    aget-byte v6, v5, v6
+
+    and-int/lit16 v6, v6, 0xff
+
+    add-int v15, v13, v9
+
+    :goto_5
+    if-ne v13, v15, :cond_c
+
+    return v11
+
+    :cond_c
+    aget v3, v0, v13
+
+    if-ne v6, v3, :cond_11
+
+    add-int/2addr v13, v9
+
+    aget v6, v0, v13
+
+    if-ne v14, v7, :cond_e
+
+    iget-object v10, v10, Lp0/r;->f:Lp0/r;
+
+    if-eqz v10, :cond_d
+
+    iget v3, v10, Lp0/r;->b:I
+
+    iget-object v5, v10, Lp0/r;->a:[B
+
+    iget v7, v10, Lp0/r;->c:I
+
+    if-ne v10, v2, :cond_f
+
+    move-object v10, v12
+
+    goto :goto_6
+
+    :cond_d
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v12
+
+    :cond_e
+    move v3, v14
+
+    :cond_f
+    :goto_6
+    if-ltz v6, :cond_10
+
+    return v6
+
+    :cond_10
+    neg-int v9, v6
+
+    move v6, v3
+
+    const/4 v3, -0x2
+
+    goto/16 :goto_0
+
+    :cond_11
+    add-int/lit8 v13, v13, 0x1
+
+    const/4 v3, -0x2
+
+    goto :goto_5
+
+    :cond_12
+    if-eqz p2, :cond_13
+
+    const/4 v3, -0x2
+
+    goto :goto_7
+
+    :cond_13
+    const/4 v3, -0x1
+
+    :goto_7
+    return v3
+.end method
+
+.method public B0(Lp0/e;J)J
+    .locals 5
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_3
+
+    iget-wide v2, p0, Lp0/e;->e:J
+
+    cmp-long v4, v2, v0
+
+    if-nez v4, :cond_1
+
+    const-wide/16 p1, -0x1
+
+    return-wide p1
+
+    :cond_1
+    cmp-long v0, p2, v2
+
+    if-lez v0, :cond_2
+
+    move-wide p2, v2
+
+    :cond_2
+    invoke-virtual {p1, p0, p2, p3}, Lp0/e;->write(Lp0/e;J)V
+
+    return-wide p2
+
+    :cond_3
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final C(I)Lp0/r;
+    .locals 3
+
+    const/16 v0, 0x2000
+
+    const/4 v1, 0x1
+
+    if-lt p1, v1, :cond_0
+
+    if-gt p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_6
+
+    iget-object v1, p0, Lp0/e;->d:Lp0/r;
+
+    if-nez v1, :cond_1
+
+    invoke-static {}, Lp0/s;->b()Lp0/r;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lp0/e;->d:Lp0/r;
+
+    iput-object p1, p1, Lp0/r;->g:Lp0/r;
+
+    iput-object p1, p1, Lp0/r;->f:Lp0/r;
+
+    return-object p1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_5
+
+    iget-object v1, v1, Lp0/r;->g:Lp0/r;
+
+    if-eqz v1, :cond_4
+
+    iget v2, v1, Lp0/r;->c:I
+
+    add-int/2addr v2, p1
+
+    if-gt v2, v0, :cond_2
+
+    iget-boolean p1, v1, Lp0/r;->e:Z
+
+    if-nez p1, :cond_3
+
+    :cond_2
+    invoke-static {}, Lp0/s;->b()Lp0/r;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Lp0/r;->b(Lp0/r;)Lp0/r;
+
+    move-object v1, p1
+
+    :cond_3
+    return-object v1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_6
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "unexpected capacity"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public D(Lokio/ByteString;)Lp0/e;
+    .locals 1
+
+    const-string v0, "byteString"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, p0}, Lokio/ByteString;->p(Lp0/e;)V
+
+    return-object p0
+.end method
+
+.method public E([B)Lp0/e;
+    .locals 2
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, p1, v1, v0}, Lp0/e;->G([BII)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public F0(Lp0/u;)J
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-lez v4, :cond_0
+
+    invoke-interface {p1, p0, v0, v1}, Lp0/u;->write(Lp0/e;J)V
+
+    :cond_0
+    return-wide v0
+.end method
+
+.method public G([BII)Lp0/e;
+    .locals 9
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p1
+
+    int-to-long v1, v0
+
+    int-to-long v3, p2
+
+    int-to-long v7, p3
+
+    move-wide v5, v7
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
+
+    add-int/2addr p3, p2
+
+    :goto_0
+    if-ge p2, p3, :cond_0
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v0
+
+    sub-int v1, p3, p2
+
+    iget v2, v0, Lp0/r;->c:I
+
+    rsub-int v2, v2, 0x2000
+
+    invoke-static {v1, v2}, Ljava/lang/Math;->min(II)I
+
+    move-result v1
+
+    iget-object v2, v0, Lp0/r;->a:[B
+
+    iget v3, v0, Lp0/r;->c:I
+
+    invoke-static {p1, p2, v2, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    add-int/2addr p2, v1
+
+    iget v2, v0, Lp0/r;->c:I
+
+    add-int/2addr v2, v1
+
+    iput v2, v0, Lp0/r;->c:I
+
+    goto :goto_0
+
+    :cond_0
+    iget-wide p1, p0, Lp0/e;->e:J
+
+    add-long/2addr p1, v7
+
+    iput-wide p1, p0, Lp0/e;->e:J
+
+    return-object p0
+.end method
+
+.method public I(I)Lp0/e;
+    .locals 4
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v0
+
+    iget-object v1, v0, Lp0/r;->a:[B
+
+    iget v2, v0, Lp0/r;->c:I
+
+    add-int/lit8 v3, v2, 0x1
+
+    iput v3, v0, Lp0/r;->c:I
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v2
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x1
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    return-object p0
+.end method
+
+.method public J()Z
+    .locals 5
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public K(J)Lp0/e;
+    .locals 12
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-nez v2, :cond_0
+
+    const/16 p1, 0x30
+
+    invoke-virtual {p0, p1}, Lp0/e;->I(I)Lp0/e;
+
+    return-object p0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-gez v2, :cond_2
+
+    neg-long p1, p1
+
+    cmp-long v2, p1, v0
+
+    if-gez v2, :cond_1
+
+    const-string p1, "-9223372036854775808"
+
+    invoke-virtual {p0, p1}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
+
+    return-object p0
+
+    :cond_1
+    const/4 v3, 0x1
+
+    :cond_2
+    const-wide/32 v5, 0x5f5e100
+
+    const/16 v2, 0xa
+
+    cmp-long v7, p1, v5
+
+    if-gez v7, :cond_a
+
+    const-wide/16 v5, 0x2710
+
+    cmp-long v7, p1, v5
+
+    if-gez v7, :cond_6
+
+    const-wide/16 v5, 0x64
+
+    cmp-long v7, p1, v5
+
+    if-gez v7, :cond_4
+
+    const-wide/16 v5, 0xa
+
+    cmp-long v7, p1, v5
+
+    if-gez v7, :cond_3
+
+    goto/16 :goto_0
+
+    :cond_3
+    const/4 v4, 0x2
+
+    goto/16 :goto_0
+
+    :cond_4
+    const-wide/16 v4, 0x3e8
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_5
+
+    const/4 v4, 0x3
+
+    goto/16 :goto_0
+
+    :cond_5
+    const/4 v4, 0x4
+
+    goto/16 :goto_0
+
+    :cond_6
+    const-wide/32 v4, 0xf4240
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_8
+
+    const-wide/32 v4, 0x186a0
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_7
+
+    const/4 v4, 0x5
+
+    goto/16 :goto_0
+
+    :cond_7
+    const/4 v4, 0x6
+
+    goto/16 :goto_0
+
+    :cond_8
+    const-wide/32 v4, 0x989680
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_9
+
+    const/4 v4, 0x7
+
+    goto/16 :goto_0
+
+    :cond_9
+    const/16 v4, 0x8
+
+    goto/16 :goto_0
+
+    :cond_a
+    const-wide v4, 0xe8d4a51000L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_e
+
+    const-wide v4, 0x2540be400L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_c
+
+    const-wide/32 v4, 0x3b9aca00
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_b
+
+    const/16 v4, 0x9
+
+    goto :goto_0
+
+    :cond_b
+    const/16 v4, 0xa
+
+    goto :goto_0
+
+    :cond_c
+    const-wide v4, 0x174876e800L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_d
+
+    const/16 v4, 0xb
+
+    goto :goto_0
+
+    :cond_d
+    const/16 v4, 0xc
+
+    goto :goto_0
+
+    :cond_e
+    const-wide v4, 0x38d7ea4c68000L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_11
+
+    const-wide v4, 0x9184e72a000L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_f
+
+    const/16 v4, 0xd
+
+    goto :goto_0
+
+    :cond_f
+    const-wide v4, 0x5af3107a4000L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_10
+
+    const/16 v4, 0xe
+
+    goto :goto_0
+
+    :cond_10
+    const/16 v4, 0xf
+
+    goto :goto_0
+
+    :cond_11
+    const-wide v4, 0x16345785d8a0000L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_13
+
+    const-wide v4, 0x2386f26fc10000L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_12
+
+    const/16 v4, 0x10
+
+    goto :goto_0
+
+    :cond_12
+    const/16 v4, 0x11
+
+    goto :goto_0
+
+    :cond_13
+    const-wide v4, 0xde0b6b3a7640000L
+
+    cmp-long v6, p1, v4
+
+    if-gez v6, :cond_14
+
+    const/16 v4, 0x12
+
+    goto :goto_0
+
+    :cond_14
+    const/16 v4, 0x13
+
+    :goto_0
+    if-eqz v3, :cond_15
+
+    add-int/lit8 v4, v4, 0x1
+
+    :cond_15
+    invoke-virtual {p0, v4}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v5
+
+    iget-object v6, v5, Lp0/r;->a:[B
+
+    iget v7, v5, Lp0/r;->c:I
+
+    add-int/2addr v7, v4
+
+    :goto_1
+    cmp-long v8, p1, v0
+
+    if-eqz v8, :cond_16
+
+    int-to-long v8, v2
+
+    rem-long v10, p1, v8
+
+    long-to-int v11, v10
+
+    add-int/lit8 v7, v7, -0x1
+
+    sget-object v10, Lp0/e;->f:[B
+
+    aget-byte v10, v10, v11
+
+    aput-byte v10, v6, v7
+
+    div-long/2addr p1, v8
+
+    goto :goto_1
+
+    :cond_16
+    if-eqz v3, :cond_17
+
+    add-int/lit8 v7, v7, -0x1
+
+    const/16 p1, 0x2d
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v6, v7
+
+    :cond_17
+    iget p1, v5, Lp0/r;->c:I
+
+    add-int/2addr p1, v4
+
+    iput p1, v5, Lp0/r;->c:I
+
+    iget-wide p1, p0, Lp0/e;->e:J
+
+    int-to-long v0, v4
+
+    add-long/2addr p1, v0
+
+    iput-wide p1, p0, Lp0/e;->e:J
+
+    return-object p0
+.end method
+
+.method public L(J)Lp0/e;
+    .locals 9
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-nez v2, :cond_0
+
+    const/16 p1, 0x30
+
+    invoke-virtual {p0, p1}, Lp0/e;->I(I)Lp0/e;
+
+    return-object p0
+
+    :cond_0
+    invoke-static {p1, p2}, Ljava/lang/Long;->highestOneBit(J)J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->numberOfTrailingZeros(J)I
+
+    move-result v0
+
+    const/4 v1, 0x4
+
+    div-int/2addr v0, v1
+
+    add-int/lit8 v0, v0, 0x1
+
+    invoke-virtual {p0, v0}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v2
+
+    iget-object v3, v2, Lp0/r;->a:[B
+
+    iget v4, v2, Lp0/r;->c:I
+
+    add-int v5, v4, v0
+
+    add-int/lit8 v5, v5, -0x1
+
+    :goto_0
+    if-lt v5, v4, :cond_1
+
+    sget-object v6, Lp0/e;->f:[B
+
+    const-wide/16 v7, 0xf
+
+    and-long/2addr v7, p1
+
+    long-to-int v8, v7
+
+    aget-byte v6, v6, v8
+
+    aput-byte v6, v3, v5
+
+    ushr-long/2addr p1, v1
+
+    add-int/lit8 v5, v5, -0x1
+
+    goto :goto_0
+
+    :cond_1
+    iget p1, v2, Lp0/r;->c:I
+
+    add-int/2addr p1, v0
+
+    iput p1, v2, Lp0/r;->c:I
+
+    iget-wide p1, p0, Lp0/e;->e:J
+
+    int-to-long v0, v0
+
+    add-long/2addr p1, v0
+
+    iput-wide p1, p0, Lp0/e;->e:J
+
+    return-object p0
+.end method
+
+.method public M(I)Lp0/e;
+    .locals 5
+
+    const/4 v0, 0x4
+
+    invoke-virtual {p0, v0}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v0
+
+    iget-object v1, v0, Lp0/r;->a:[B
+
+    iget v2, v0, Lp0/r;->c:I
+
+    add-int/lit8 v3, v2, 0x1
+
+    ushr-int/lit8 v4, p1, 0x18
+
+    and-int/lit16 v4, v4, 0xff
+
+    int-to-byte v4, v4
+
+    aput-byte v4, v1, v2
+
+    add-int/lit8 v2, v3, 0x1
+
+    ushr-int/lit8 v4, p1, 0x10
+
+    and-int/lit16 v4, v4, 0xff
+
+    int-to-byte v4, v4
+
+    aput-byte v4, v1, v3
+
+    add-int/lit8 v3, v2, 0x1
+
+    ushr-int/lit8 v4, p1, 0x8
+
+    and-int/lit16 v4, v4, 0xff
+
+    int-to-byte v4, v4
+
+    aput-byte v4, v1, v2
+
+    add-int/lit8 v2, v3, 0x1
+
+    and-int/lit16 p1, p1, 0xff
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v3
+
+    iput v2, v0, Lp0/r;->c:I
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x4
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    return-object p0
+.end method
+
+.method public N(I)Lp0/e;
+    .locals 5
+
+    const/4 v0, 0x2
+
+    invoke-virtual {p0, v0}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v0
+
+    iget-object v1, v0, Lp0/r;->a:[B
+
+    iget v2, v0, Lp0/r;->c:I
+
+    add-int/lit8 v3, v2, 0x1
+
+    ushr-int/lit8 v4, p1, 0x8
+
+    and-int/lit16 v4, v4, 0xff
+
+    int-to-byte v4, v4
+
+    aput-byte v4, v1, v2
+
+    add-int/lit8 v2, v3, 0x1
+
+    and-int/lit16 p1, p1, 0xff
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v3
+
+    iput v2, v0, Lp0/r;->c:I
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x2
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    return-object p0
+.end method
+
+.method public O(Ljava/lang/String;)Lp0/e;
+    .locals 2
+
+    const-string v0, "string"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, p1, v1, v0}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public P0(J)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    cmp-long v2, v0, p1
+
+    if-ltz v2, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+.end method
+
+.method public Q(Lp0/e;J)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    cmp-long v2, v0, p2
+
+    if-ltz v2, :cond_0
+
+    invoke-virtual {p1, p0, p2, p3}, Lp0/e;->write(Lp0/e;J)V
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p1, p0, v0, v1}, Lp0/e;->write(Lp0/e;J)V
+
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+.end method
+
+.method public bridge synthetic Q0(J)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1, p2}, Lp0/e;->K(J)Lp0/e;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public R(Ljava/lang/String;II)Lp0/e;
+    .locals 10
+
+    const-string v0, "string"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    if-ltz p2, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_f
+
+    if-lt p3, p2, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_e
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    if-gt p3, v1, :cond_2
+
+    const/4 v1, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_2
+    if-eqz v1, :cond_d
+
+    :goto_3
+    if-ge p2, p3, :cond_c
+
+    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v2, 0x80
+
+    if-ge v1, v2, :cond_5
+
+    invoke-virtual {p0, v0}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v3
+
+    iget-object v4, v3, Lp0/r;->a:[B
+
+    iget v5, v3, Lp0/r;->c:I
+
+    sub-int/2addr v5, p2
+
+    rsub-int v6, v5, 0x2000
+
+    invoke-static {p3, v6}, Ljava/lang/Math;->min(II)I
+
+    move-result v6
+
+    add-int/lit8 v7, p2, 0x1
+
+    add-int/2addr p2, v5
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v4, p2
+
+    :goto_4
+    move p2, v7
+
+    if-ge p2, v6, :cond_4
+
+    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    if-lt v1, v2, :cond_3
+
+    goto :goto_5
+
+    :cond_3
+    add-int/lit8 v7, p2, 0x1
+
+    add-int/2addr p2, v5
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v4, p2
+
+    goto :goto_4
+
+    :cond_4
+    :goto_5
+    add-int/2addr v5, p2
+
+    iget v1, v3, Lp0/r;->c:I
+
+    sub-int/2addr v5, v1
+
+    add-int/2addr v1, v5
+
+    iput v1, v3, Lp0/r;->c:I
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    int-to-long v3, v5
+
+    add-long/2addr v1, v3
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    goto :goto_3
+
+    :cond_5
+    const/16 v3, 0x800
+
+    if-ge v1, v3, :cond_6
+
+    const/4 v3, 0x2
+
+    invoke-virtual {p0, v3}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v4
+
+    iget-object v5, v4, Lp0/r;->a:[B
+
+    iget v6, v4, Lp0/r;->c:I
+
+    shr-int/lit8 v7, v1, 0x6
+
+    or-int/lit16 v7, v7, 0xc0
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v5, v6
+
+    add-int/lit8 v7, v6, 0x1
+
+    and-int/lit8 v1, v1, 0x3f
+
+    or-int/2addr v1, v2
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v5, v7
+
+    add-int/2addr v6, v3
+
+    iput v6, v4, Lp0/r;->c:I
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x2
+
+    add-long/2addr v1, v3
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    goto/16 :goto_9
+
+    :cond_6
+    const v3, 0xd800
+
+    const/16 v4, 0x3f
+
+    if-lt v1, v3, :cond_b
+
+    const v3, 0xdfff
+
+    if-le v1, v3, :cond_7
+
+    goto :goto_8
+
+    :cond_7
+    add-int/lit8 v5, p2, 0x1
+
+    if-ge v5, p3, :cond_8
+
+    invoke-virtual {p1, v5}, Ljava/lang/String;->charAt(I)C
+
+    move-result v6
+
+    goto :goto_6
+
+    :cond_8
+    const/4 v6, 0x0
+
+    :goto_6
+    const v7, 0xdbff
+
+    if-gt v1, v7, :cond_a
+
+    const v7, 0xdc00
+
+    if-gt v7, v6, :cond_a
+
+    if-ge v3, v6, :cond_9
+
+    goto :goto_7
+
+    :cond_9
+    const/high16 v3, 0x10000
+
+    and-int/lit16 v1, v1, 0x3ff
+
+    shl-int/lit8 v1, v1, 0xa
+
+    and-int/lit16 v5, v6, 0x3ff
+
+    or-int/2addr v1, v5
+
+    add-int/2addr v1, v3
+
+    const/4 v3, 0x4
+
+    invoke-virtual {p0, v3}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v5
+
+    iget-object v6, v5, Lp0/r;->a:[B
+
+    iget v7, v5, Lp0/r;->c:I
+
+    shr-int/lit8 v8, v1, 0x12
+
+    or-int/lit16 v8, v8, 0xf0
+
+    int-to-byte v8, v8
+
+    aput-byte v8, v6, v7
+
+    add-int/lit8 v8, v7, 0x1
+
+    shr-int/lit8 v9, v1, 0xc
+
+    and-int/2addr v9, v4
+
+    or-int/2addr v9, v2
+
+    int-to-byte v9, v9
+
+    aput-byte v9, v6, v8
+
+    add-int/lit8 v8, v7, 0x2
+
+    shr-int/lit8 v9, v1, 0x6
+
+    and-int/2addr v9, v4
+
+    or-int/2addr v9, v2
+
+    int-to-byte v9, v9
+
+    aput-byte v9, v6, v8
+
+    add-int/lit8 v8, v7, 0x3
+
+    and-int/2addr v1, v4
+
+    or-int/2addr v1, v2
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v6, v8
+
+    add-int/2addr v7, v3
+
+    iput v7, v5, Lp0/r;->c:I
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x4
+
+    add-long/2addr v1, v3
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    add-int/lit8 p2, p2, 0x2
+
+    goto/16 :goto_3
+
+    :cond_a
+    :goto_7
+    invoke-virtual {p0, v4}, Lp0/e;->I(I)Lp0/e;
+
+    move p2, v5
+
+    goto/16 :goto_3
+
+    :cond_b
+    :goto_8
+    const/4 v3, 0x3
+
+    invoke-virtual {p0, v3}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v5
+
+    iget-object v6, v5, Lp0/r;->a:[B
+
+    iget v7, v5, Lp0/r;->c:I
+
+    shr-int/lit8 v8, v1, 0xc
+
+    or-int/lit16 v8, v8, 0xe0
+
+    int-to-byte v8, v8
+
+    aput-byte v8, v6, v7
+
+    add-int/lit8 v8, v7, 0x1
+
+    shr-int/lit8 v9, v1, 0x6
+
+    and-int/2addr v4, v9
+
+    or-int/2addr v4, v2
+
+    int-to-byte v4, v4
+
+    aput-byte v4, v6, v8
+
+    add-int/lit8 v4, v7, 0x2
+
+    and-int/lit8 v1, v1, 0x3f
+
+    or-int/2addr v1, v2
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v6, v4
+
+    add-int/2addr v7, v3
+
+    iput v7, v5, Lp0/r;->c:I
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x3
+
+    add-long/2addr v1, v3
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    :goto_9
+    add-int/lit8 p2, p2, 0x1
+
+    goto/16 :goto_3
+
+    :cond_c
+    return-object p0
+
+    :cond_d
+    const-string p2, "endIndex > string.length: "
+
+    const-string v0, " > "
+
+    invoke-static {p2, p3, v0}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p1
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_e
+    const-string p1, "endIndex < beginIndex: "
+
+    const-string v0, " < "
+
+    invoke-static {p1, p3, v0, p2}, Lf/e/b/a/a;->j(Ljava/lang/String;ILjava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_f
+    const-string p1, "beginIndex < 0: "
+
+    invoke-static {p1, p2}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public S(Lokio/ByteString;)J
+    .locals 2
+
+    const-string v0, "targetBytes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    invoke-virtual {p0, p1, v0, v1}, Lp0/e;->g(Lokio/ByteString;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public T(J)Ljava/lang/String;
+    .locals 11
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_4
+
+    const-wide/16 v0, 0x1
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    cmp-long v4, p1, v2
+
+    if-nez v4, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    add-long v2, p1, v0
+
+    :goto_1
+    const/16 v4, 0xa
+
+    int-to-byte v10, v4
+
+    const-wide/16 v6, 0x0
+
+    move-object v4, p0
+
+    move v5, v10
+
+    move-wide v8, v2
+
+    invoke-virtual/range {v4 .. v9}, Lp0/e;->f(BJJ)J
+
+    move-result-wide v4
+
+    const-wide/16 v6, -0x1
+
+    cmp-long v8, v4, v6
+
+    if-eqz v8, :cond_2
+
+    invoke-virtual {p0, v4, v5}, Lp0/e;->z(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_2
+    iget-wide v4, p0, Lp0/e;->e:J
+
+    cmp-long v6, v2, v4
+
+    if-gez v6, :cond_3
+
+    sub-long v0, v2, v0
+
+    invoke-virtual {p0, v0, v1}, Lp0/e;->e(J)B
+
+    move-result v0
+
+    const/16 v1, 0xd
+
+    int-to-byte v1, v1
+
+    if-ne v0, v1, :cond_3
+
+    invoke-virtual {p0, v2, v3}, Lp0/e;->e(J)B
+
+    move-result v0
+
+    if-ne v0, v10, :cond_3
+
+    invoke-virtual {p0, v2, v3}, Lp0/e;->z(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_3
+    new-instance v6, Lp0/e;
+
+    invoke-direct {v6}, Lp0/e;-><init>()V
+
+    const-wide/16 v2, 0x0
+
+    const/16 v0, 0x20
+
+    iget-wide v4, p0, Lp0/e;->e:J
+
+    int-to-long v0, v0
+
+    invoke-static {v0, v1, v4, v5}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v4
+
+    move-object v0, p0
+
+    move-object v1, v6
+
+    invoke-virtual/range {v0 .. v5}, Lp0/e;->d(Lp0/e;JJ)Lp0/e;
+
+    new-instance v0, Ljava/io/EOFException;
+
+    const-string v1, "\\n not found: limit="
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-wide v2, p0, Lp0/e;->e:J
+
+    invoke-static {v2, v3, p1, p2}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p1
+
+    invoke-virtual {v1, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string p1, " content="
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lp0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 p1, 0x2026
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    const-string v0, "limit < 0: "
+
+    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public U(I)Lp0/e;
+    .locals 8
+
+    const/16 v0, 0x80
+
+    if-ge p1, v0, :cond_0
+
+    invoke-virtual {p0, p1}, Lp0/e;->I(I)Lp0/e;
+
+    goto/16 :goto_1
+
+    :cond_0
+    const/16 v1, 0x800
+
+    const/16 v2, 0x3f
+
+    if-ge p1, v1, :cond_1
+
+    const/4 v1, 0x2
+
+    invoke-virtual {p0, v1}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v3
+
+    iget-object v4, v3, Lp0/r;->a:[B
+
+    iget v5, v3, Lp0/r;->c:I
+
+    shr-int/lit8 v6, p1, 0x6
+
+    or-int/lit16 v6, v6, 0xc0
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v4, v5
+
+    add-int/lit8 v6, v5, 0x1
+
+    and-int/2addr p1, v2
+
+    or-int/2addr p1, v0
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v4, v6
+
+    add-int/2addr v5, v1
+
+    iput v5, v3, Lp0/r;->c:I
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x2
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    goto/16 :goto_1
+
+    :cond_1
+    const v1, 0xdfff
+
+    const v3, 0xd800
+
+    if-le v3, p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    if-lt v1, p1, :cond_3
+
+    invoke-virtual {p0, v2}, Lp0/e;->I(I)Lp0/e;
+
+    goto :goto_1
+
+    :cond_3
+    :goto_0
+    const/high16 v1, 0x10000
+
+    if-ge p1, v1, :cond_4
+
+    const/4 v1, 0x3
+
+    invoke-virtual {p0, v1}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v3
+
+    iget-object v4, v3, Lp0/r;->a:[B
+
+    iget v5, v3, Lp0/r;->c:I
+
+    shr-int/lit8 v6, p1, 0xc
+
+    or-int/lit16 v6, v6, 0xe0
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v4, v5
+
+    add-int/lit8 v6, v5, 0x1
+
+    shr-int/lit8 v7, p1, 0x6
+
+    and-int/2addr v7, v2
+
+    or-int/2addr v7, v0
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v4, v6
+
+    add-int/lit8 v6, v5, 0x2
+
+    and-int/2addr p1, v2
+
+    or-int/2addr p1, v0
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v4, v6
+
+    add-int/2addr v5, v1
+
+    iput v5, v3, Lp0/r;->c:I
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x3
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    goto :goto_1
+
+    :cond_4
+    const v1, 0x10ffff
+
+    if-gt p1, v1, :cond_5
+
+    const/4 v1, 0x4
+
+    invoke-virtual {p0, v1}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v3
+
+    iget-object v4, v3, Lp0/r;->a:[B
+
+    iget v5, v3, Lp0/r;->c:I
+
+    shr-int/lit8 v6, p1, 0x12
+
+    or-int/lit16 v6, v6, 0xf0
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v4, v5
+
+    add-int/lit8 v6, v5, 0x1
+
+    shr-int/lit8 v7, p1, 0xc
+
+    and-int/2addr v7, v2
+
+    or-int/2addr v7, v0
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v4, v6
+
+    add-int/lit8 v6, v5, 0x2
+
+    shr-int/lit8 v7, p1, 0x6
+
+    and-int/2addr v7, v2
+
+    or-int/2addr v7, v0
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v4, v6
+
+    add-int/lit8 v6, v5, 0x3
+
+    and-int/2addr p1, v2
+
+    or-int/2addr p1, v0
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v4, v6
+
+    add-int/2addr v5, v1
+
+    iput v5, v3, Lp0/r;->c:I
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x4
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    :goto_1
+    return-object p0
+
+    :cond_5
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "Unexpected code point: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-static {p1}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public U0()J
+    .locals 15
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_a
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    move-wide v4, v2
+
+    :cond_0
+    iget-object v6, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v6, :cond_9
+
+    iget-object v7, v6, Lp0/r;->a:[B
+
+    iget v8, v6, Lp0/r;->b:I
+
+    iget v9, v6, Lp0/r;->c:I
+
+    :goto_0
+    if-ge v8, v9, :cond_6
+
+    aget-byte v10, v7, v8
+
+    const/16 v11, 0x30
+
+    int-to-byte v11, v11
+
+    if-lt v10, v11, :cond_1
+
+    const/16 v12, 0x39
+
+    int-to-byte v12, v12
+
+    if-gt v10, v12, :cond_1
+
+    sub-int v11, v10, v11
+
+    goto :goto_2
+
+    :cond_1
+    const/16 v11, 0x61
+
+    int-to-byte v11, v11
+
+    if-lt v10, v11, :cond_2
+
+    const/16 v12, 0x66
+
+    int-to-byte v12, v12
+
+    if-gt v10, v12, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/16 v11, 0x41
+
+    int-to-byte v11, v11
+
+    if-lt v10, v11, :cond_4
+
+    const/16 v12, 0x46
+
+    int-to-byte v12, v12
+
+    if-gt v10, v12, :cond_4
+
+    :goto_1
+    sub-int v11, v10, v11
+
+    add-int/lit8 v11, v11, 0xa
+
+    :goto_2
+    const-wide/high16 v12, -0x1000000000000000L    # -3.105036184601418E231
+
+    and-long/2addr v12, v4
+
+    cmp-long v14, v12, v2
+
+    if-nez v14, :cond_3
+
+    const/4 v10, 0x4
+
+    shl-long/2addr v4, v10
+
+    int-to-long v10, v11
+
+    or-long/2addr v4, v10
+
+    add-int/lit8 v8, v8, 0x1
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    new-instance v0, Lp0/e;
+
+    invoke-direct {v0}, Lp0/e;-><init>()V
+
+    invoke-virtual {v0, v4, v5}, Lp0/e;->L(J)Lp0/e;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v10}, Lp0/e;->I(I)Lp0/e;
+
+    new-instance v1, Ljava/lang/NumberFormatException;
+
+    const-string v2, "Number too large: "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Lp0/e;->v()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/NumberFormatException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_4
+    if-eqz v0, :cond_5
+
+    const/4 v1, 0x1
+
+    goto :goto_3
+
+    :cond_5
+    new-instance v0, Ljava/lang/NumberFormatException;
+
+    const-string v1, "Expected leading [0-9a-fA-F] character but was 0x"
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-static {v10}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/NumberFormatException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_6
+    :goto_3
+    if-ne v8, v9, :cond_7
+
+    invoke-virtual {v6}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v7
+
+    iput-object v7, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v6}, Lp0/s;->a(Lp0/r;)V
+
+    goto :goto_4
+
+    :cond_7
+    iput v8, v6, Lp0/r;->b:I
+
+    :goto_4
+    if-nez v1, :cond_8
+
+    iget-object v6, p0, Lp0/e;->d:Lp0/r;
+
+    if-nez v6, :cond_0
+
+    :cond_8
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    int-to-long v6, v0
+
+    sub-long/2addr v1, v6
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    return-wide v4
+
+    :cond_9
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_a
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+.end method
+
+.method public W0()Ljava/io/InputStream;
+    .locals 1
+
+    new-instance v0, Lp0/e$b;
+
+    invoke-direct {v0, p0}, Lp0/e$b;-><init>(Lp0/e;)V
+
+    return-object v0
+.end method
+
+.method public X0(Lp0/n;)I
+    .locals 3
+
+    const-string v0, "options"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, v0}, Lp0/e;->A(Lp0/n;Z)I
+
+    move-result v0
+
+    const/4 v1, -0x1
+
+    if-ne v0, v1, :cond_0
+
+    return v1
+
+    :cond_0
+    iget-object p1, p1, Lp0/n;->d:[Lokio/ByteString;
+
+    aget-object p1, p1, v0
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result p1
+
+    int-to-long v1, p1
+
+    invoke-virtual {p0, v1, v2}, Lp0/e;->skip(J)V
+
+    return v0
+.end method
+
+.method public bridge synthetic a0(Ljava/lang/String;)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public b()Lp0/e;
+    .locals 6
+
+    new-instance v0, Lp0/e;
+
+    invoke-direct {v0}, Lp0/e;-><init>()V
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v1, p0, Lp0/e;->d:Lp0/r;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_9
+
+    invoke-virtual {v1}, Lp0/r;->c()Lp0/r;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v1, :cond_8
+
+    iput-object v1, v1, Lp0/r;->g:Lp0/r;
+
+    if-eqz v1, :cond_7
+
+    if-eqz v1, :cond_6
+
+    iput-object v1, v1, Lp0/r;->f:Lp0/r;
+
+    iget-object v1, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v1, :cond_5
+
+    iget-object v1, v1, Lp0/r;->f:Lp0/r;
+
+    :goto_0
+    iget-object v3, p0, Lp0/e;->d:Lp0/r;
+
+    if-eq v1, v3, :cond_4
+
+    iget-object v3, v0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v3, :cond_3
+
+    iget-object v3, v3, Lp0/r;->g:Lp0/r;
+
+    if-eqz v3, :cond_2
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v1}, Lp0/r;->c()Lp0/r;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Lp0/r;->b(Lp0/r;)Lp0/r;
+
+    iget-object v1, v1, Lp0/r;->f:Lp0/r;
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_4
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    iput-wide v1, v0, Lp0/e;->e:J
+
+    return-object v0
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+
+    :cond_9
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v2
+.end method
+
+.method public b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "charset"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    invoke-virtual {p0, v0, v1, p1}, Lp0/e;->t(JLjava/nio/charset/Charset;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final c()J
+    .locals 5
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    return-wide v2
+
+    :cond_0
+    iget-object v2, p0, Lp0/e;->d:Lp0/r;
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_3
+
+    iget-object v2, v2, Lp0/r;->g:Lp0/r;
+
+    if-eqz v2, :cond_2
+
+    iget v3, v2, Lp0/r;->c:I
+
+    const/16 v4, 0x2000
+
+    if-ge v3, v4, :cond_1
+
+    iget-boolean v4, v2, Lp0/r;->e:Z
+
+    if-eqz v4, :cond_1
+
+    iget v2, v2, Lp0/r;->b:I
+
+    sub-int/2addr v3, v2
+
+    int-to-long v2, v3
+
+    sub-long/2addr v0, v2
+
+    :cond_1
+    return-wide v0
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+.end method
+
+.method public bridge synthetic clone()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lp0/e;->b()Lp0/e;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public close()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final d(Lp0/e;JJ)Lp0/e;
+    .locals 9
+
+    const-string v0, "out"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    move-wide v3, p2
+
+    move-wide v5, p4
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p4, v0
+
+    if-nez v2, :cond_0
+
+    return-object p0
+
+    :cond_0
+    iget-wide v2, p1, Lp0/e;->e:J
+
+    add-long/2addr v2, p4
+
+    iput-wide v2, p1, Lp0/e;->e:J
+
+    iget-object v2, p0, Lp0/e;->d:Lp0/r;
+
+    :goto_0
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_7
+
+    iget v4, v2, Lp0/r;->c:I
+
+    iget v5, v2, Lp0/r;->b:I
+
+    sub-int v6, v4, v5
+
+    int-to-long v6, v6
+
+    cmp-long v8, p2, v6
+
+    if-ltz v8, :cond_1
+
+    sub-int/2addr v4, v5
+
+    int-to-long v3, v4
+
+    sub-long/2addr p2, v3
+
+    iget-object v2, v2, Lp0/r;->f:Lp0/r;
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    cmp-long v4, p4, v0
+
+    if-lez v4, :cond_6
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2}, Lp0/r;->c()Lp0/r;
+
+    move-result-object v4
+
+    iget v5, v4, Lp0/r;->b:I
+
+    long-to-int p3, p2
+
+    add-int/2addr v5, p3
+
+    iput v5, v4, Lp0/r;->b:I
+
+    long-to-int p2, p4
+
+    add-int/2addr v5, p2
+
+    iget p2, v4, Lp0/r;->c:I
+
+    invoke-static {v5, p2}, Ljava/lang/Math;->min(II)I
+
+    move-result p2
+
+    iput p2, v4, Lp0/r;->c:I
+
+    iget-object p2, p1, Lp0/e;->d:Lp0/r;
+
+    if-nez p2, :cond_2
+
+    iput-object v4, v4, Lp0/r;->g:Lp0/r;
+
+    iput-object v4, v4, Lp0/r;->f:Lp0/r;
+
+    iput-object v4, p1, Lp0/e;->d:Lp0/r;
+
+    goto :goto_2
+
+    :cond_2
+    if-eqz p2, :cond_4
+
+    iget-object p2, p2, Lp0/r;->g:Lp0/r;
+
+    if-eqz p2, :cond_3
+
+    invoke-virtual {p2, v4}, Lp0/r;->b(Lp0/r;)Lp0/r;
+
+    :goto_2
+    iget p2, v4, Lp0/r;->c:I
+
+    iget p3, v4, Lp0/r;->b:I
+
+    sub-int/2addr p2, p3
+
+    int-to-long p2, p2
+
+    sub-long/2addr p4, p2
+
+    iget-object v2, v2, Lp0/r;->f:Lp0/r;
+
+    move-wide p2, v0
+
+    goto :goto_1
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_6
+    return-object p0
+
+    :cond_7
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+.end method
+
+.method public final e(J)B
+    .locals 8
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v4, 0x1
+
+    move-wide v2, p1
+
+    invoke-static/range {v0 .. v5}, Lf/n/a/k/a;->q(JJJ)V
+
+    iget-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_5
+
+    iget-wide v2, p0, Lp0/e;->e:J
+
+    sub-long v4, v2, p1
+
+    cmp-long v6, v4, p1
+
+    if-gez v6, :cond_2
+
+    :goto_0
+    cmp-long v4, v2, p1
+
+    if-lez v4, :cond_1
+
+    iget-object v0, v0, Lp0/r;->g:Lp0/r;
+
+    if-eqz v0, :cond_0
+
+    iget v4, v0, Lp0/r;->c:I
+
+    iget v5, v0, Lp0/r;->b:I
+
+    sub-int/2addr v4, v5
+
+    int-to-long v4, v4
+
+    sub-long/2addr v2, v4
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_1
+    iget-object v1, v0, Lp0/r;->a:[B
+
+    iget v0, v0, Lp0/r;->b:I
+
+    int-to-long v4, v0
+
+    add-long/2addr v4, p1
+
+    sub-long/2addr v4, v2
+
+    long-to-int p1, v4
+
+    aget-byte p1, v1, p1
+
+    return p1
+
+    :cond_2
+    const-wide/16 v2, 0x0
+
+    :goto_1
+    iget v4, v0, Lp0/r;->c:I
+
+    iget v5, v0, Lp0/r;->b:I
+
+    sub-int/2addr v4, v5
+
+    int-to-long v6, v4
+
+    add-long/2addr v6, v2
+
+    cmp-long v4, v6, p1
+
+    if-lez v4, :cond_3
+
+    iget-object v0, v0, Lp0/r;->a:[B
+
+    int-to-long v4, v5
+
+    add-long/2addr v4, p1
+
+    sub-long/2addr v4, v2
+
+    long-to-int p1, v4
+
+    aget-byte p1, v0, p1
+
+    return p1
+
+    :cond_3
+    iget-object v0, v0, Lp0/r;->f:Lp0/r;
+
+    if-eqz v0, :cond_4
+
+    move-wide v2, v6
+
+    goto :goto_1
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    const/4 v2, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    return v2
+
+    :cond_0
+    instance-of v3, v1, Lp0/e;
+
+    const/4 v4, 0x0
+
+    if-nez v3, :cond_1
+
+    return v4
+
+    :cond_1
+    iget-wide v5, v0, Lp0/e;->e:J
+
+    check-cast v1, Lp0/e;
+
+    iget-wide v7, v1, Lp0/e;->e:J
+
+    cmp-long v3, v5, v7
+
+    if-eqz v3, :cond_2
+
+    return v4
+
+    :cond_2
+    const-wide/16 v7, 0x0
+
+    cmp-long v3, v5, v7
+
+    if-nez v3, :cond_3
+
+    return v2
+
+    :cond_3
+    iget-object v3, v0, Lp0/e;->d:Lp0/r;
+
+    const/4 v5, 0x0
+
+    if-eqz v3, :cond_c
+
+    iget-object v1, v1, Lp0/e;->d:Lp0/r;
+
+    if-eqz v1, :cond_b
+
+    iget v6, v3, Lp0/r;->b:I
+
+    iget v9, v1, Lp0/r;->b:I
+
+    move-wide v10, v7
+
+    :goto_0
+    iget-wide v12, v0, Lp0/e;->e:J
+
+    cmp-long v14, v10, v12
+
+    if-gez v14, :cond_a
+
+    iget v12, v3, Lp0/r;->c:I
+
+    sub-int/2addr v12, v6
+
+    iget v13, v1, Lp0/r;->c:I
+
+    sub-int/2addr v13, v9
+
+    invoke-static {v12, v13}, Ljava/lang/Math;->min(II)I
+
+    move-result v12
+
+    int-to-long v12, v12
+
+    move-wide v14, v7
+
+    :goto_1
+    cmp-long v16, v14, v12
+
+    if-gez v16, :cond_5
+
+    iget-object v7, v3, Lp0/r;->a:[B
+
+    add-int/lit8 v8, v6, 0x1
+
+    aget-byte v6, v7, v6
+
+    iget-object v7, v1, Lp0/r;->a:[B
+
+    add-int/lit8 v17, v9, 0x1
+
+    aget-byte v7, v7, v9
+
+    if-eq v6, v7, :cond_4
+
+    return v4
+
+    :cond_4
+    const-wide/16 v6, 0x1
+
+    add-long/2addr v14, v6
+
+    move v6, v8
+
+    move/from16 v9, v17
+
+    const-wide/16 v7, 0x0
+
+    goto :goto_1
+
+    :cond_5
+    iget v7, v3, Lp0/r;->c:I
+
+    if-ne v6, v7, :cond_7
+
+    iget-object v3, v3, Lp0/r;->f:Lp0/r;
+
+    if-eqz v3, :cond_6
+
+    iget v6, v3, Lp0/r;->b:I
+
+    goto :goto_2
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_7
+    :goto_2
+    iget v7, v1, Lp0/r;->c:I
+
+    if-ne v9, v7, :cond_9
+
+    iget-object v1, v1, Lp0/r;->f:Lp0/r;
+
+    if-eqz v1, :cond_8
+
+    iget v7, v1, Lp0/r;->b:I
+
+    move v9, v7
+
+    goto :goto_3
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_9
+    :goto_3
+    add-long/2addr v10, v12
+
+    const-wide/16 v7, 0x0
+
+    goto :goto_0
+
+    :cond_a
+    return v2
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+
+    :cond_c
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v5
+.end method
+
+.method public f(BJJ)J
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    move/from16 v1, p1
+
+    move-wide/from16 v2, p2
+
+    move-wide/from16 v4, p4
+
+    const-wide/16 v6, 0x0
+
+    cmp-long v8, v6, v2
+
+    if-lez v8, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    cmp-long v8, v4, v2
+
+    if-ltz v8, :cond_1
+
+    const/4 v8, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v8, 0x0
+
+    :goto_1
+    if-eqz v8, :cond_12
+
+    iget-wide v8, v0, Lp0/e;->e:J
+
+    cmp-long v10, v4, v8
+
+    if-lez v10, :cond_2
+
+    move-wide v4, v8
+
+    :cond_2
+    const-wide/16 v8, -0x1
+
+    cmp-long v10, v2, v4
+
+    if-nez v10, :cond_3
+
+    return-wide v8
+
+    :cond_3
+    iget-object v10, v0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v10, :cond_11
+
+    iget-wide v11, v0, Lp0/e;->e:J
+
+    sub-long v13, v11, v2
+
+    const/4 v15, 0x0
+
+    cmp-long v16, v13, v2
+
+    if-gez v16, :cond_a
+
+    :goto_2
+    cmp-long v6, v11, v2
+
+    if-lez v6, :cond_5
+
+    iget-object v10, v10, Lp0/r;->g:Lp0/r;
+
+    if-eqz v10, :cond_4
+
+    iget v6, v10, Lp0/r;->c:I
+
+    iget v7, v10, Lp0/r;->b:I
+
+    sub-int/2addr v6, v7
+
+    int-to-long v6, v6
+
+    sub-long/2addr v11, v6
+
+    goto :goto_2
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v15
+
+    :cond_5
+    :goto_3
+    cmp-long v6, v11, v4
+
+    if-gez v6, :cond_9
+
+    iget-object v6, v10, Lp0/r;->a:[B
+
+    iget v7, v10, Lp0/r;->c:I
+
+    int-to-long v7, v7
+
+    iget v9, v10, Lp0/r;->b:I
+
+    int-to-long v13, v9
+
+    add-long/2addr v13, v4
+
+    sub-long/2addr v13, v11
+
+    invoke-static {v7, v8, v13, v14}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v7
+
+    long-to-int v8, v7
+
+    iget v7, v10, Lp0/r;->b:I
+
+    int-to-long v13, v7
+
+    add-long/2addr v13, v2
+
+    sub-long/2addr v13, v11
+
+    long-to-int v2, v13
+
+    :goto_4
+    if-ge v2, v8, :cond_7
+
+    aget-byte v3, v6, v2
+
+    if-ne v3, v1, :cond_6
+
+    iget v1, v10, Lp0/r;->b:I
+
+    sub-int/2addr v2, v1
+
+    int-to-long v1, v2
+
+    add-long/2addr v1, v11
+
+    return-wide v1
+
+    :cond_6
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    iget v2, v10, Lp0/r;->c:I
+
+    iget v3, v10, Lp0/r;->b:I
+
+    sub-int/2addr v2, v3
+
+    int-to-long v2, v2
+
+    add-long/2addr v11, v2
+
+    iget-object v10, v10, Lp0/r;->f:Lp0/r;
+
+    if-eqz v10, :cond_8
+
+    const-wide/16 v8, -0x1
+
+    move-wide v2, v11
+
+    goto :goto_3
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v15
+
+    :cond_9
+    return-wide v8
+
+    :cond_a
+    :goto_5
+    iget v8, v10, Lp0/r;->c:I
+
+    iget v9, v10, Lp0/r;->b:I
+
+    sub-int/2addr v8, v9
+
+    int-to-long v8, v8
+
+    add-long/2addr v8, v6
+
+    cmp-long v11, v8, v2
+
+    if-lez v11, :cond_f
+
+    :goto_6
+    cmp-long v8, v6, v4
+
+    if-gez v8, :cond_e
+
+    iget-object v8, v10, Lp0/r;->a:[B
+
+    iget v9, v10, Lp0/r;->c:I
+
+    int-to-long v11, v9
+
+    iget v9, v10, Lp0/r;->b:I
+
+    int-to-long v13, v9
+
+    add-long/2addr v13, v4
+
+    sub-long/2addr v13, v6
+
+    invoke-static {v11, v12, v13, v14}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v11
+
+    long-to-int v9, v11
+
+    iget v11, v10, Lp0/r;->b:I
+
+    int-to-long v11, v11
+
+    add-long/2addr v11, v2
+
+    sub-long/2addr v11, v6
+
+    long-to-int v2, v11
+
+    :goto_7
+    if-ge v2, v9, :cond_c
+
+    aget-byte v3, v8, v2
+
+    if-ne v3, v1, :cond_b
+
+    iget v1, v10, Lp0/r;->b:I
+
+    sub-int/2addr v2, v1
+
+    int-to-long v1, v2
+
+    add-long/2addr v1, v6
+
+    return-wide v1
+
+    :cond_b
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_7
+
+    :cond_c
+    iget v2, v10, Lp0/r;->c:I
+
+    iget v3, v10, Lp0/r;->b:I
+
+    sub-int/2addr v2, v3
+
+    int-to-long v2, v2
+
+    add-long/2addr v6, v2
+
+    iget-object v10, v10, Lp0/r;->f:Lp0/r;
+
+    if-eqz v10, :cond_d
+
+    move-wide v2, v6
+
+    goto :goto_6
+
+    :cond_d
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v15
+
+    :cond_e
+    const-wide/16 v1, -0x1
+
+    return-wide v1
+
+    :cond_f
+    iget-object v10, v10, Lp0/r;->f:Lp0/r;
+
+    if-eqz v10, :cond_10
+
+    move-wide v6, v8
+
+    goto :goto_5
+
+    :cond_10
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v15
+
+    :cond_11
+    return-wide v8
+
+    :cond_12
+    const-string v1, "size="
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-wide v6, v0, Lp0/e;->e:J
+
+    invoke-virtual {v1, v6, v7}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v6, " fromIndex="
+
+    invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v2, " toIndex="
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+.end method
+
+.method public flush()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public g(Lokio/ByteString;J)J
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    move-wide/from16 v2, p2
+
+    const-string v4, "targetBytes"
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    const-wide/16 v6, 0x0
+
+    cmp-long v8, v2, v6
+
+    if-ltz v8, :cond_0
+
+    const/4 v8, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v8, 0x0
+
+    :goto_0
+    if-eqz v8, :cond_1b
+
+    iget-object v8, v0, Lp0/e;->d:Lp0/r;
+
+    const-wide/16 v9, -0x1
+
+    if-eqz v8, :cond_1a
+
+    iget-wide v11, v0, Lp0/e;->e:J
+
+    sub-long v13, v11, v2
+
+    const/4 v15, 0x2
+
+    const/16 v16, 0x0
+
+    cmp-long v17, v13, v2
+
+    if-gez v17, :cond_d
+
+    :goto_1
+    cmp-long v6, v11, v2
+
+    if-lez v6, :cond_2
+
+    iget-object v8, v8, Lp0/r;->g:Lp0/r;
+
+    if-eqz v8, :cond_1
+
+    iget v6, v8, Lp0/r;->c:I
+
+    iget v7, v8, Lp0/r;->b:I
+
+    sub-int/2addr v6, v7
+
+    int-to-long v6, v6
+
+    sub-long/2addr v11, v6
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v16
+
+    :cond_2
+    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->h()I
+
+    move-result v6
+
+    if-ne v6, v15, :cond_7
+
+    invoke-virtual {v1, v4}, Lokio/ByteString;->k(I)B
+
+    move-result v4
+
+    invoke-virtual {v1, v5}, Lokio/ByteString;->k(I)B
+
+    move-result v1
+
+    :goto_2
+    iget-wide v5, v0, Lp0/e;->e:J
+
+    cmp-long v7, v11, v5
+
+    if-gez v7, :cond_c
+
+    iget-object v5, v8, Lp0/r;->a:[B
+
+    iget v6, v8, Lp0/r;->b:I
+
+    int-to-long v6, v6
+
+    add-long/2addr v6, v2
+
+    sub-long/2addr v6, v11
+
+    long-to-int v2, v6
+
+    iget v3, v8, Lp0/r;->c:I
+
+    :goto_3
+    if-ge v2, v3, :cond_5
+
+    aget-byte v6, v5, v2
+
+    if-eq v6, v4, :cond_4
+
+    if-ne v6, v1, :cond_3
+
+    goto :goto_4
+
+    :cond_3
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_3
+
+    :cond_4
+    :goto_4
+    iget v1, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v1
+
+    int-to-long v1, v2
+
+    add-long/2addr v1, v11
+
+    return-wide v1
+
+    :cond_5
+    iget v2, v8, Lp0/r;->c:I
+
+    iget v3, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v3
+
+    int-to-long v2, v2
+
+    add-long/2addr v11, v2
+
+    iget-object v8, v8, Lp0/r;->f:Lp0/r;
+
+    if-eqz v8, :cond_6
+
+    move-wide v2, v11
+
+    goto :goto_2
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v16
+
+    :cond_7
+    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->j()[B
+
+    move-result-object v1
+
+    :goto_5
+    iget-wide v4, v0, Lp0/e;->e:J
+
+    cmp-long v6, v11, v4
+
+    if-gez v6, :cond_c
+
+    iget-object v4, v8, Lp0/r;->a:[B
+
+    iget v5, v8, Lp0/r;->b:I
+
+    int-to-long v5, v5
+
+    add-long/2addr v5, v2
+
+    sub-long/2addr v5, v11
+
+    long-to-int v2, v5
+
+    iget v3, v8, Lp0/r;->c:I
+
+    :goto_6
+    if-ge v2, v3, :cond_a
+
+    aget-byte v5, v4, v2
+
+    array-length v6, v1
+
+    const/4 v7, 0x0
+
+    :goto_7
+    if-ge v7, v6, :cond_9
+
+    aget-byte v13, v1, v7
+
+    if-ne v5, v13, :cond_8
+
+    iget v1, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v1
+
+    int-to-long v1, v2
+
+    add-long/2addr v1, v11
+
+    return-wide v1
+
+    :cond_8
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_7
+
+    :cond_9
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_6
+
+    :cond_a
+    iget v2, v8, Lp0/r;->c:I
+
+    iget v3, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v3
+
+    int-to-long v2, v2
+
+    add-long/2addr v11, v2
+
+    iget-object v8, v8, Lp0/r;->f:Lp0/r;
+
+    if-eqz v8, :cond_b
+
+    move-wide v2, v11
+
+    goto :goto_5
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v16
+
+    :cond_c
+    return-wide v9
+
+    :cond_d
+    :goto_8
+    iget v11, v8, Lp0/r;->c:I
+
+    iget v12, v8, Lp0/r;->b:I
+
+    sub-int/2addr v11, v12
+
+    int-to-long v11, v11
+
+    add-long/2addr v11, v6
+
+    cmp-long v13, v11, v2
+
+    if-lez v13, :cond_18
+
+    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->h()I
+
+    move-result v11
+
+    if-ne v11, v15, :cond_12
+
+    invoke-virtual {v1, v4}, Lokio/ByteString;->k(I)B
+
+    move-result v4
+
+    invoke-virtual {v1, v5}, Lokio/ByteString;->k(I)B
+
+    move-result v1
+
+    :goto_9
+    iget-wide v11, v0, Lp0/e;->e:J
+
+    cmp-long v5, v6, v11
+
+    if-gez v5, :cond_17
+
+    iget-object v5, v8, Lp0/r;->a:[B
+
+    iget v11, v8, Lp0/r;->b:I
+
+    int-to-long v11, v11
+
+    add-long/2addr v11, v2
+
+    sub-long/2addr v11, v6
+
+    long-to-int v2, v11
+
+    iget v3, v8, Lp0/r;->c:I
+
+    :goto_a
+    if-ge v2, v3, :cond_10
+
+    aget-byte v11, v5, v2
+
+    if-eq v11, v4, :cond_f
+
+    if-ne v11, v1, :cond_e
+
+    goto :goto_b
+
+    :cond_e
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_a
+
+    :cond_f
+    :goto_b
+    iget v1, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v1
+
+    int-to-long v1, v2
+
+    add-long/2addr v1, v6
+
+    return-wide v1
+
+    :cond_10
+    iget v2, v8, Lp0/r;->c:I
+
+    iget v3, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v3
+
+    int-to-long v2, v2
+
+    add-long/2addr v6, v2
+
+    iget-object v8, v8, Lp0/r;->f:Lp0/r;
+
+    if-eqz v8, :cond_11
+
+    move-wide v2, v6
+
+    goto :goto_9
+
+    :cond_11
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v16
+
+    :cond_12
+    invoke-virtual/range {p1 .. p1}, Lokio/ByteString;->j()[B
+
+    move-result-object v1
+
+    :goto_c
+    iget-wide v4, v0, Lp0/e;->e:J
+
+    cmp-long v11, v6, v4
+
+    if-gez v11, :cond_17
+
+    iget-object v4, v8, Lp0/r;->a:[B
+
+    iget v5, v8, Lp0/r;->b:I
+
+    int-to-long v11, v5
+
+    add-long/2addr v11, v2
+
+    sub-long/2addr v11, v6
+
+    long-to-int v2, v11
+
+    iget v3, v8, Lp0/r;->c:I
+
+    :goto_d
+    if-ge v2, v3, :cond_15
+
+    aget-byte v5, v4, v2
+
+    array-length v11, v1
+
+    const/4 v12, 0x0
+
+    :goto_e
+    if-ge v12, v11, :cond_14
+
+    aget-byte v13, v1, v12
+
+    if-ne v5, v13, :cond_13
+
+    iget v1, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v1
+
+    int-to-long v1, v2
+
+    add-long/2addr v1, v6
+
+    return-wide v1
+
+    :cond_13
+    add-int/lit8 v12, v12, 0x1
+
+    goto :goto_e
+
+    :cond_14
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_d
+
+    :cond_15
+    iget v2, v8, Lp0/r;->c:I
+
+    iget v3, v8, Lp0/r;->b:I
+
+    sub-int/2addr v2, v3
+
+    int-to-long v2, v2
+
+    add-long/2addr v6, v2
+
+    iget-object v8, v8, Lp0/r;->f:Lp0/r;
+
+    if-eqz v8, :cond_16
+
+    move-wide v2, v6
+
+    goto :goto_c
+
+    :cond_16
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v16
+
+    :cond_17
+    return-wide v9
+
+    :cond_18
+    iget-object v8, v8, Lp0/r;->f:Lp0/r;
+
+    if-eqz v8, :cond_19
+
+    move-wide v6, v11
+
+    goto/16 :goto_8
+
+    :cond_19
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v16
+
+    :cond_1a
+    return-wide v9
+
+    :cond_1b
+    const-string v1, "fromIndex < 0: "
+
+    invoke-static {v1, v2, v3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object v1
+
+    new-instance v2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v2, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v2
+.end method
+
+.method public h()Lp0/e;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public hashCode()I
+    .locals 5
+
+    iget-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_3
+
+    const/4 v1, 0x1
+
+    :cond_0
+    iget v2, v0, Lp0/r;->b:I
+
+    iget v3, v0, Lp0/r;->c:I
+
+    :goto_0
+    if-ge v2, v3, :cond_1
+
+    mul-int/lit8 v1, v1, 0x1f
+
+    iget-object v4, v0, Lp0/r;->a:[B
+
+    aget-byte v4, v4, v2
+
+    add-int/2addr v1, v4
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, v0, Lp0/r;->f:Lp0/r;
+
+    if-eqz v0, :cond_2
+
+    iget-object v2, p0, Lp0/e;->d:Lp0/r;
+
+    if-ne v0, v2, :cond_0
+
+    return v1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_3
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final i(Lp0/e$a;)Lp0/e$a;
+    .locals 2
+
+    const-string v0, "unsafeCursor"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p1, Lp0/e$a;->d:Lp0/e;
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iput-object p0, p1, Lp0/e$a;->d:Lp0/e;
+
+    iput-boolean v1, p1, Lp0/e$a;->e:Z
+
+    return-object p1
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "already attached to a buffer"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public i0(Lp0/w;)J
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    :goto_0
+    const/16 v2, 0x2000
+
+    int-to-long v2, v2
+
+    invoke-interface {p1, p0, v2, v3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v2
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    return-wide v0
+
+    :cond_0
+    add-long/2addr v0, v2
+
+    goto :goto_0
+.end method
+
+.method public isOpen()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public bridge synthetic j0(J)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1, p2}, Lp0/e;->L(J)Lp0/e;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public m(J)Z
+    .locals 3
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    cmp-long v2, v0, p1
+
+    if-ltz v2, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public n()Lokio/ByteString;
+    .locals 3
+
+    new-instance v0, Lokio/ByteString;
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    invoke-virtual {p0, v1, v2}, Lp0/e;->t0(J)[B
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
+
+    return-object v0
+.end method
+
+.method public o0()Ljava/lang/String;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lp0/e;->T(J)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public r()S
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lp0/e;->readShort()S
+
+    move-result v0
+
+    const v1, 0xffff
+
+    and-int/2addr v0, v1
+
+    const v1, 0xff00
+
+    and-int/2addr v1, v0
+
+    ushr-int/lit8 v1, v1, 0x8
+
+    and-int/lit16 v0, v0, 0xff
+
+    shl-int/lit8 v0, v0, 0x8
+
+    or-int/2addr v0, v1
+
+    int-to-short v0, v0
+
+    return v0
+.end method
+
+.method public read(Ljava/nio/ByteBuffer;)I
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
+
+    move-result v1
+
+    iget v2, v0, Lp0/r;->c:I
+
+    iget v3, v0, Lp0/r;->b:I
+
+    sub-int/2addr v2, v3
+
+    invoke-static {v1, v2}, Ljava/lang/Math;->min(II)I
+
+    move-result v1
+
+    iget-object v2, v0, Lp0/r;->a:[B
+
+    iget v3, v0, Lp0/r;->b:I
+
+    invoke-virtual {p1, v2, v3, v1}, Ljava/nio/ByteBuffer;->put([BII)Ljava/nio/ByteBuffer;
+
+    iget p1, v0, Lp0/r;->b:I
+
+    add-int/2addr p1, v1
+
+    iput p1, v0, Lp0/r;->b:I
+
+    iget-wide v2, p0, Lp0/e;->e:J
+
+    int-to-long v4, v1
+
+    sub-long/2addr v2, v4
+
+    iput-wide v2, p0, Lp0/e;->e:J
+
+    iget v2, v0, Lp0/r;->c:I
+
+    if-ne p1, v2, :cond_0
+
+    invoke-virtual {v0}, Lp0/r;->a()Lp0/r;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v0}, Lp0/s;->a(Lp0/r;)V
+
+    :cond_0
+    return v1
+
+    :cond_1
+    const/4 p1, -0x1
+
+    return p1
+.end method
+
+.method public read([BII)I
+    .locals 7
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p1
+
+    int-to-long v1, v0
+
+    int-to-long v3, p2
+
+    int-to-long v5, p3
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
+
+    iget-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_1
+
+    iget v1, v0, Lp0/r;->c:I
+
+    iget v2, v0, Lp0/r;->b:I
+
+    sub-int/2addr v1, v2
+
+    invoke-static {p3, v1}, Ljava/lang/Math;->min(II)I
+
+    move-result p3
+
+    iget-object v1, v0, Lp0/r;->a:[B
+
+    iget v2, v0, Lp0/r;->b:I
+
+    invoke-static {v1, v2, p1, p2, p3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget p1, v0, Lp0/r;->b:I
+
+    add-int/2addr p1, p3
+
+    iput p1, v0, Lp0/r;->b:I
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    int-to-long v3, p3
+
+    sub-long/2addr v1, v3
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    iget p2, v0, Lp0/r;->c:I
+
+    if-ne p1, p2, :cond_0
+
+    invoke-virtual {v0}, Lp0/r;->a()Lp0/r;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v0}, Lp0/s;->a(Lp0/r;)V
+
+    :cond_0
+    return p3
+
+    :cond_1
+    const/4 p1, -0x1
+
+    return p1
+.end method
+
+.method public readByte()B
+    .locals 9
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_2
+
+    iget-object v2, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v2, :cond_1
+
+    iget v3, v2, Lp0/r;->b:I
+
+    iget v4, v2, Lp0/r;->c:I
+
+    iget-object v5, v2, Lp0/r;->a:[B
+
+    add-int/lit8 v6, v3, 0x1
+
+    aget-byte v3, v5, v3
+
+    const-wide/16 v7, 0x1
+
+    sub-long/2addr v0, v7
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    if-ne v6, v4, :cond_0
+
+    invoke-virtual {v2}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v2}, Lp0/s;->a(Lp0/r;)V
+
+    goto :goto_0
+
+    :cond_0
+    iput v6, v2, Lp0/r;->b:I
+
+    :goto_0
+    return v3
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_2
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+.end method
+
+.method public readFully([B)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    :goto_0
+    array-length v1, p1
+
+    if-ge v0, v1, :cond_1
+
+    array-length v1, p1
+
+    sub-int/2addr v1, v0
+
+    invoke-virtual {p0, p1, v0, v1}, Lp0/e;->read([BII)I
+
+    move-result v1
+
+    const/4 v2, -0x1
+
+    if-eq v1, v2, :cond_0
+
+    add-int/2addr v0, v1
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+
+    :cond_1
+    return-void
+.end method
+
+.method public readInt()I
+    .locals 10
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x4
+
+    cmp-long v4, v0, v2
+
+    if-ltz v4, :cond_3
+
+    iget-object v4, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v4, :cond_2
+
+    iget v5, v4, Lp0/r;->b:I
+
+    iget v6, v4, Lp0/r;->c:I
+
+    sub-int v7, v6, v5
+
+    int-to-long v7, v7
+
+    cmp-long v9, v7, v2
+
+    if-gez v9, :cond_0
+
+    invoke-virtual {p0}, Lp0/e;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    shl-int/lit8 v0, v0, 0x18
+
+    invoke-virtual {p0}, Lp0/e;->readByte()B
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    shl-int/lit8 v1, v1, 0x10
+
+    or-int/2addr v0, v1
+
+    invoke-virtual {p0}, Lp0/e;->readByte()B
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    shl-int/lit8 v1, v1, 0x8
+
+    or-int/2addr v0, v1
+
+    invoke-virtual {p0}, Lp0/e;->readByte()B
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    or-int/2addr v0, v1
+
+    return v0
+
+    :cond_0
+    iget-object v7, v4, Lp0/r;->a:[B
+
+    add-int/lit8 v8, v5, 0x1
+
+    aget-byte v5, v7, v5
+
+    and-int/lit16 v5, v5, 0xff
+
+    shl-int/lit8 v5, v5, 0x18
+
+    add-int/lit8 v9, v8, 0x1
+
+    aget-byte v8, v7, v8
+
+    and-int/lit16 v8, v8, 0xff
+
+    shl-int/lit8 v8, v8, 0x10
+
+    or-int/2addr v5, v8
+
+    add-int/lit8 v8, v9, 0x1
+
+    aget-byte v9, v7, v9
+
+    and-int/lit16 v9, v9, 0xff
+
+    shl-int/lit8 v9, v9, 0x8
+
+    or-int/2addr v5, v9
+
+    add-int/lit8 v9, v8, 0x1
+
+    aget-byte v7, v7, v8
+
+    and-int/lit16 v7, v7, 0xff
+
+    or-int/2addr v5, v7
+
+    sub-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    if-ne v9, v6, :cond_1
+
+    invoke-virtual {v4}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v4}, Lp0/s;->a(Lp0/r;)V
+
+    goto :goto_0
+
+    :cond_1
+    iput v9, v4, Lp0/r;->b:I
+
+    :goto_0
+    return v5
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_3
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+.end method
+
+.method public readLong()J
+    .locals 15
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    move-object v0, p0
+
+    iget-wide v1, v0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x8
+
+    cmp-long v5, v1, v3
+
+    if-ltz v5, :cond_3
+
+    iget-object v5, v0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v5, :cond_2
+
+    iget v6, v5, Lp0/r;->b:I
+
+    iget v7, v5, Lp0/r;->c:I
+
+    sub-int v8, v7, v6
+
+    int-to-long v8, v8
+
+    const/16 v10, 0x20
+
+    cmp-long v11, v8, v3
+
+    if-gez v11, :cond_0
+
+    invoke-virtual {p0}, Lp0/e;->readInt()I
+
+    move-result v1
+
+    int-to-long v1, v1
+
+    const-wide v3, 0xffffffffL
+
+    and-long/2addr v1, v3
+
+    shl-long/2addr v1, v10
+
+    invoke-virtual {p0}, Lp0/e;->readInt()I
+
+    move-result v5
+
+    int-to-long v5, v5
+
+    and-long/2addr v3, v5
+
+    or-long/2addr v1, v3
+
+    return-wide v1
+
+    :cond_0
+    iget-object v8, v5, Lp0/r;->a:[B
+
+    add-int/lit8 v9, v6, 0x1
+
+    aget-byte v6, v8, v6
+
+    int-to-long v11, v6
+
+    const-wide/16 v13, 0xff
+
+    and-long/2addr v11, v13
+
+    const/16 v6, 0x38
+
+    shl-long/2addr v11, v6
+
+    add-int/lit8 v6, v9, 0x1
+
+    aget-byte v9, v8, v9
+
+    int-to-long v3, v9
+
+    and-long/2addr v3, v13
+
+    const/16 v9, 0x30
+
+    shl-long/2addr v3, v9
+
+    or-long/2addr v3, v11
+
+    add-int/lit8 v9, v6, 0x1
+
+    aget-byte v6, v8, v6
+
+    int-to-long v11, v6
+
+    and-long/2addr v11, v13
+
+    const/16 v6, 0x28
+
+    shl-long/2addr v11, v6
+
+    or-long/2addr v3, v11
+
+    add-int/lit8 v6, v9, 0x1
+
+    aget-byte v9, v8, v9
+
+    int-to-long v11, v9
+
+    and-long/2addr v11, v13
+
+    shl-long v9, v11, v10
+
+    or-long/2addr v3, v9
+
+    add-int/lit8 v9, v6, 0x1
+
+    aget-byte v6, v8, v6
+
+    int-to-long v10, v6
+
+    and-long/2addr v10, v13
+
+    const/16 v6, 0x18
+
+    shl-long/2addr v10, v6
+
+    or-long/2addr v3, v10
+
+    add-int/lit8 v6, v9, 0x1
+
+    aget-byte v9, v8, v9
+
+    int-to-long v9, v9
+
+    and-long/2addr v9, v13
+
+    const/16 v11, 0x10
+
+    shl-long/2addr v9, v11
+
+    or-long/2addr v3, v9
+
+    add-int/lit8 v9, v6, 0x1
+
+    aget-byte v6, v8, v6
+
+    int-to-long v10, v6
+
+    and-long/2addr v10, v13
+
+    const/16 v6, 0x8
+
+    shl-long/2addr v10, v6
+
+    or-long/2addr v3, v10
+
+    add-int/lit8 v6, v9, 0x1
+
+    aget-byte v8, v8, v9
+
+    int-to-long v8, v8
+
+    and-long/2addr v8, v13
+
+    or-long/2addr v3, v8
+
+    const-wide/16 v8, 0x8
+
+    sub-long/2addr v1, v8
+
+    iput-wide v1, v0, Lp0/e;->e:J
+
+    if-ne v6, v7, :cond_1
+
+    invoke-virtual {v5}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v5}, Lp0/s;->a(Lp0/r;)V
+
+    goto :goto_0
+
+    :cond_1
+    iput v6, v5, Lp0/r;->b:I
+
+    :goto_0
+    return-wide v3
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v1, 0x0
+
+    throw v1
+
+    :cond_3
+    new-instance v1, Ljava/io/EOFException;
+
+    invoke-direct {v1}, Ljava/io/EOFException;-><init>()V
+
+    throw v1
+.end method
+
+.method public readShort()S
+    .locals 10
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x2
+
+    cmp-long v4, v0, v2
+
+    if-ltz v4, :cond_3
+
+    iget-object v4, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v4, :cond_2
+
+    iget v5, v4, Lp0/r;->b:I
+
+    iget v6, v4, Lp0/r;->c:I
+
+    sub-int v7, v6, v5
+
+    const/4 v8, 0x2
+
+    if-ge v7, v8, :cond_0
+
+    invoke-virtual {p0}, Lp0/e;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    shl-int/lit8 v0, v0, 0x8
+
+    invoke-virtual {p0}, Lp0/e;->readByte()B
+
+    move-result v1
+
+    and-int/lit16 v1, v1, 0xff
+
+    or-int/2addr v0, v1
+
+    int-to-short v0, v0
+
+    return v0
+
+    :cond_0
+    iget-object v7, v4, Lp0/r;->a:[B
+
+    add-int/lit8 v8, v5, 0x1
+
+    aget-byte v5, v7, v5
+
+    and-int/lit16 v5, v5, 0xff
+
+    shl-int/lit8 v5, v5, 0x8
+
+    add-int/lit8 v9, v8, 0x1
+
+    aget-byte v7, v7, v8
+
+    and-int/lit16 v7, v7, 0xff
+
+    or-int/2addr v5, v7
+
+    sub-long/2addr v0, v2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    if-ne v9, v6, :cond_1
+
+    invoke-virtual {v4}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v4}, Lp0/s;->a(Lp0/r;)V
+
+    goto :goto_0
+
+    :cond_1
+    iput v9, v4, Lp0/r;->b:I
+
+    :goto_0
+    int-to-short v0, v5
+
+    return v0
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_3
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+.end method
+
+.method public skip(J)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    :cond_0
+    :goto_0
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_2
+
+    iget-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_1
+
+    iget v1, v0, Lp0/r;->c:I
+
+    iget v2, v0, Lp0/r;->b:I
+
+    sub-int/2addr v1, v2
+
+    int-to-long v1, v1
+
+    invoke-static {p1, p2, v1, v2}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v1
+
+    long-to-int v2, v1
+
+    iget-wide v3, p0, Lp0/e;->e:J
+
+    int-to-long v5, v2
+
+    sub-long/2addr v3, v5
+
+    iput-wide v3, p0, Lp0/e;->e:J
+
+    sub-long/2addr p1, v5
+
+    iget v1, v0, Lp0/r;->b:I
+
+    add-int/2addr v1, v2
+
+    iput v1, v0, Lp0/r;->b:I
+
+    iget v2, v0, Lp0/r;->c:I
+
+    if-ne v1, v2, :cond_0
+
+    invoke-virtual {v0}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v1
+
+    iput-object v1, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v0}, Lp0/s;->a(Lp0/r;)V
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+
+    :cond_2
+    return-void
+.end method
+
+.method public t(JLjava/nio/charset/Charset;)Ljava/lang/String;
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    const-string v0, "charset"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_0
+
+    const v0, 0x7fffffff
+
+    int-to-long v0, v0
+
+    cmp-long v3, p1, v0
+
+    if-gtz v3, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_6
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    cmp-long v3, v0, p1
+
+    if-ltz v3, :cond_5
+
+    if-nez v2, :cond_1
+
+    const-string p1, ""
+
+    return-object p1
+
+    :cond_1
+    iget-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_4
+
+    iget v1, v0, Lp0/r;->b:I
+
+    int-to-long v2, v1
+
+    add-long/2addr v2, p1
+
+    iget v4, v0, Lp0/r;->c:I
+
+    int-to-long v4, v4
+
+    cmp-long v6, v2, v4
+
+    if-lez v6, :cond_2
+
+    invoke-virtual {p0, p1, p2}, Lp0/e;->t0(J)[B
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/String;
+
+    invoke-direct {p2, p1, p3}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
+
+    return-object p2
+
+    :cond_2
+    iget-object v2, v0, Lp0/r;->a:[B
+
+    long-to-int v3, p1
+
+    new-instance v4, Ljava/lang/String;
+
+    invoke-direct {v4, v2, v1, v3, p3}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
+
+    iget p3, v0, Lp0/r;->b:I
+
+    add-int/2addr p3, v3
+
+    iput p3, v0, Lp0/r;->b:I
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    sub-long/2addr v1, p1
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    iget p1, v0, Lp0/r;->c:I
+
+    if-ne p3, p1, :cond_3
+
+    invoke-virtual {v0}, Lp0/r;->a()Lp0/r;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v0}, Lp0/s;->a(Lp0/r;)V
+
+    :cond_3
+    return-object v4
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_5
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+
+    :cond_6
+    const-string p3, "byteCount: "
+
+    invoke-static {p3, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public t0(J)[B
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_0
+
+    const v0, 0x7fffffff
+
+    int-to-long v0, v0
+
+    cmp-long v2, p1, v0
+
+    if-gtz v2, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    cmp-long v2, v0, p1
+
+    if-ltz v2, :cond_1
+
+    long-to-int p2, p1
+
+    new-array p1, p2, [B
+
+    invoke-virtual {p0, p1}, Lp0/e;->readFully([B)V
+
+    return-object p1
+
+    :cond_1
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+
+    :cond_2
+    const-string v0, "byteCount: "
+
+    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    sget-object v0, Lp0/x;->d:Lp0/x;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 12
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const v2, 0x7fffffff
+
+    int-to-long v2, v2
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    cmp-long v6, v0, v2
+
+    if-gtz v6, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_7
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    long-to-int v1, v0
+
+    if-nez v1, :cond_1
+
+    sget-object v0, Lokio/ByteString;->f:Lokio/ByteString;
+
+    goto :goto_3
+
+    :cond_1
+    const-string v0, "buffer"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v6, p0, Lp0/e;->e:J
+
+    const-wide/16 v8, 0x0
+
+    int-to-long v10, v1
+
+    invoke-static/range {v6 .. v11}, Lf/n/a/k/a;->q(JJJ)V
+
+    iget-object v0, p0, Lp0/e;->d:Lp0/r;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_1
+    const/4 v6, 0x0
+
+    if-ge v2, v1, :cond_4
+
+    if-eqz v0, :cond_3
+
+    iget v6, v0, Lp0/r;->c:I
+
+    iget v7, v0, Lp0/r;->b:I
+
+    if-eq v6, v7, :cond_2
+
+    sub-int/2addr v6, v7
+
+    add-int/2addr v2, v6
+
+    add-int/lit8 v3, v3, 0x1
+
+    iget-object v0, v0, Lp0/r;->f:Lp0/r;
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v0, Ljava/lang/AssertionError;
+
+    const-string v1, "s.limit == s.pos"
+
+    invoke-direct {v0, v1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw v0
+
+    :cond_3
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v6
+
+    :cond_4
+    new-array v0, v3, [[B
+
+    mul-int/lit8 v2, v3, 0x2
+
+    new-array v2, v2, [I
+
+    iget-object v7, p0, Lp0/e;->d:Lp0/r;
+
+    const/4 v8, 0x0
+
+    :goto_2
+    if-ge v5, v1, :cond_6
+
+    if-eqz v7, :cond_5
+
+    iget-object v9, v7, Lp0/r;->a:[B
+
+    aput-object v9, v0, v8
+
+    iget v9, v7, Lp0/r;->c:I
+
+    iget v10, v7, Lp0/r;->b:I
+
+    sub-int/2addr v9, v10
+
+    add-int/2addr v5, v9
+
+    invoke-static {v5, v1}, Ljava/lang/Math;->min(II)I
+
+    move-result v9
+
+    aput v9, v2, v8
+
+    add-int v9, v8, v3
+
+    iget v10, v7, Lp0/r;->b:I
+
+    aput v10, v2, v9
+
+    iput-boolean v4, v7, Lp0/r;->d:Z
+
+    add-int/2addr v8, v4
+
+    iget-object v7, v7, Lp0/r;->f:Lp0/r;
+
+    goto :goto_2
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v6
+
+    :cond_6
+    new-instance v1, Lp0/t;
+
+    invoke-direct {v1, v0, v2, v6}, Lp0/t;-><init>([[B[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    move-object v0, v1
+
+    :goto_3
+    invoke-virtual {v0}, Lokio/ByteString;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_7
+    const-string v0, "size > Integer.MAX_VALUE: "
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public u(J)Lokio/ByteString;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    new-instance v0, Lokio/ByteString;
+
+    invoke-virtual {p0, p1, p2}, Lp0/e;->t0(J)[B
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Lokio/ByteString;-><init>([B)V
+
+    return-object v0
+.end method
+
+.method public v()Ljava/lang/String;
+    .locals 3
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    sget-object v2, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    invoke-virtual {p0, v0, v1, v2}, Lp0/e;->t(JLjava/nio/charset/Charset;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public w(J)Ljava/lang/String;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    sget-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    invoke-virtual {p0, p1, p2, v0}, Lp0/e;->t(JLjava/nio/charset/Charset;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public write(Ljava/nio/ByteBuffer;)I
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Ljava/nio/ByteBuffer;->remaining()I
+
+    move-result v0
+
+    move v1, v0
+
+    :goto_0
+    if-lez v1, :cond_0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {p0, v2}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v2
+
+    iget v3, v2, Lp0/r;->c:I
+
+    rsub-int v3, v3, 0x2000
+
+    invoke-static {v1, v3}, Ljava/lang/Math;->min(II)I
+
+    move-result v3
+
+    iget-object v4, v2, Lp0/r;->a:[B
+
+    iget v5, v2, Lp0/r;->c:I
+
+    invoke-virtual {p1, v4, v5, v3}, Ljava/nio/ByteBuffer;->get([BII)Ljava/nio/ByteBuffer;
+
+    sub-int/2addr v1, v3
+
+    iget v4, v2, Lp0/r;->c:I
+
+    add-int/2addr v4, v3
+
+    iput v4, v2, Lp0/r;->c:I
+
+    goto :goto_0
+
+    :cond_0
+    iget-wide v1, p0, Lp0/e;->e:J
+
+    int-to-long v3, v0
+
+    add-long/2addr v1, v3
+
+    iput-wide v1, p0, Lp0/e;->e:J
+
+    return v0
+.end method
+
+.method public bridge synthetic write([B)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lp0/e;->E([B)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public bridge synthetic write([BII)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1, p2, p3}, Lp0/e;->G([BII)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 10
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-eq p1, p0, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_1b
+
+    iget-wide v3, p1, Lp0/e;->e:J
+
+    const-wide/16 v5, 0x0
+
+    move-wide v7, p2
+
+    invoke-static/range {v3 .. v8}, Lf/n/a/k/a;->q(JJJ)V
+
+    :goto_1
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, p2, v2
+
+    if-lez v4, :cond_1a
+
+    iget-object v2, p1, Lp0/e;->d:Lp0/r;
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_19
+
+    iget v4, v2, Lp0/r;->c:I
+
+    if-eqz v2, :cond_18
+
+    iget v2, v2, Lp0/r;->b:I
+
+    sub-int/2addr v4, v2
+
+    int-to-long v4, v4
+
+    const/16 v2, 0x2000
+
+    cmp-long v6, p2, v4
+
+    if-gez v6, :cond_c
+
+    iget-object v4, p0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v4, :cond_2
+
+    if-eqz v4, :cond_1
+
+    iget-object v4, v4, Lp0/r;->g:Lp0/r;
+
+    goto :goto_2
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_2
+    move-object v4, v3
+
+    :goto_2
+    if-eqz v4, :cond_5
+
+    iget-boolean v5, v4, Lp0/r;->e:Z
+
+    if-eqz v5, :cond_5
+
+    iget v5, v4, Lp0/r;->c:I
+
+    int-to-long v5, v5
+
+    add-long/2addr v5, p2
+
+    iget-boolean v7, v4, Lp0/r;->d:Z
+
+    if-eqz v7, :cond_3
+
+    const/4 v7, 0x0
+
+    goto :goto_3
+
+    :cond_3
+    iget v7, v4, Lp0/r;->b:I
+
+    :goto_3
+    int-to-long v7, v7
+
+    sub-long/2addr v5, v7
+
+    int-to-long v7, v2
+
+    cmp-long v9, v5, v7
+
+    if-gtz v9, :cond_5
+
+    iget-object v0, p1, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_4
+
+    long-to-int v1, p2
+
+    invoke-virtual {v0, v4, v1}, Lp0/r;->d(Lp0/r;I)V
+
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    sub-long/2addr v0, p2
+
+    iput-wide v0, p1, Lp0/e;->e:J
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    add-long/2addr v0, p2
+
+    iput-wide v0, p0, Lp0/e;->e:J
+
+    return-void
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_5
+    iget-object v4, p1, Lp0/e;->d:Lp0/r;
+
+    if-eqz v4, :cond_b
+
+    long-to-int v5, p2
+
+    if-eqz v4, :cond_a
+
+    if-lez v5, :cond_6
+
+    iget v6, v4, Lp0/r;->c:I
+
+    iget v7, v4, Lp0/r;->b:I
+
+    sub-int/2addr v6, v7
+
+    if-gt v5, v6, :cond_6
+
+    const/4 v6, 0x1
+
+    goto :goto_4
+
+    :cond_6
+    const/4 v6, 0x0
+
+    :goto_4
+    if-eqz v6, :cond_9
+
+    const/16 v6, 0x400
+
+    if-lt v5, v6, :cond_7
+
+    invoke-virtual {v4}, Lp0/r;->c()Lp0/r;
+
+    move-result-object v6
+
+    goto :goto_5
+
+    :cond_7
+    invoke-static {}, Lp0/s;->b()Lp0/r;
+
+    move-result-object v6
+
+    iget-object v7, v4, Lp0/r;->a:[B
+
+    iget v8, v4, Lp0/r;->b:I
+
+    iget-object v9, v6, Lp0/r;->a:[B
+
+    invoke-static {v7, v8, v9, v1, v5}, Lf/n/a/k/a;->f([BI[BII)V
+
+    :goto_5
+    iget v7, v6, Lp0/r;->b:I
+
+    add-int/2addr v7, v5
+
+    iput v7, v6, Lp0/r;->c:I
+
+    iget v7, v4, Lp0/r;->b:I
+
+    add-int/2addr v7, v5
+
+    iput v7, v4, Lp0/r;->b:I
+
+    iget-object v4, v4, Lp0/r;->g:Lp0/r;
+
+    if-eqz v4, :cond_8
+
+    invoke-virtual {v4, v6}, Lp0/r;->b(Lp0/r;)Lp0/r;
+
+    iput-object v6, p1, Lp0/e;->d:Lp0/r;
+
+    goto :goto_6
+
+    :cond_8
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_9
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "byteCount out of range"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_a
+    throw v3
+
+    :cond_b
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_c
+    :goto_6
+    iget-object v4, p1, Lp0/e;->d:Lp0/r;
+
+    if-eqz v4, :cond_17
+
+    iget v5, v4, Lp0/r;->c:I
+
+    iget v6, v4, Lp0/r;->b:I
+
+    sub-int/2addr v5, v6
+
+    int-to-long v5, v5
+
+    invoke-virtual {v4}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v7
+
+    iput-object v7, p1, Lp0/e;->d:Lp0/r;
+
+    iget-object v7, p0, Lp0/e;->d:Lp0/r;
+
+    if-nez v7, :cond_d
+
+    iput-object v4, p0, Lp0/e;->d:Lp0/r;
+
+    iput-object v4, v4, Lp0/r;->g:Lp0/r;
+
+    iput-object v4, v4, Lp0/r;->f:Lp0/r;
+
+    goto :goto_9
+
+    :cond_d
+    if-eqz v7, :cond_16
+
+    iget-object v7, v7, Lp0/r;->g:Lp0/r;
+
+    if-eqz v7, :cond_15
+
+    invoke-virtual {v7, v4}, Lp0/r;->b(Lp0/r;)Lp0/r;
+
+    iget-object v7, v4, Lp0/r;->g:Lp0/r;
+
+    if-eq v7, v4, :cond_e
+
+    const/4 v7, 0x1
+
+    goto :goto_7
+
+    :cond_e
+    const/4 v7, 0x0
+
+    :goto_7
+    if-eqz v7, :cond_14
+
+    iget-object v7, v4, Lp0/r;->g:Lp0/r;
+
+    if-eqz v7, :cond_13
+
+    iget-boolean v8, v7, Lp0/r;->e:Z
+
+    if-nez v8, :cond_f
+
+    goto :goto_9
+
+    :cond_f
+    iget v8, v4, Lp0/r;->c:I
+
+    iget v9, v4, Lp0/r;->b:I
+
+    sub-int/2addr v8, v9
+
+    iget v9, v7, Lp0/r;->c:I
+
+    sub-int/2addr v2, v9
+
+    iget-boolean v9, v7, Lp0/r;->d:Z
+
+    if-eqz v9, :cond_10
+
+    const/4 v7, 0x0
+
+    goto :goto_8
+
+    :cond_10
+    iget v7, v7, Lp0/r;->b:I
+
+    :goto_8
+    add-int/2addr v2, v7
+
+    if-le v8, v2, :cond_11
+
+    goto :goto_9
+
+    :cond_11
+    iget-object v2, v4, Lp0/r;->g:Lp0/r;
+
+    if-eqz v2, :cond_12
+
+    invoke-virtual {v4, v2, v8}, Lp0/r;->d(Lp0/r;I)V
+
+    invoke-virtual {v4}, Lp0/r;->a()Lp0/r;
+
+    invoke-static {v4}, Lp0/s;->a(Lp0/r;)V
+
+    :goto_9
+    iget-wide v2, p1, Lp0/e;->e:J
+
+    sub-long/2addr v2, v5
+
+    iput-wide v2, p1, Lp0/e;->e:J
+
+    iget-wide v2, p0, Lp0/e;->e:J
+
+    add-long/2addr v2, v5
+
+    iput-wide v2, p0, Lp0/e;->e:J
+
+    sub-long/2addr p2, v5
+
+    goto/16 :goto_1
+
+    :cond_12
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_13
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_14
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "cannot compact"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_15
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_16
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_17
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_18
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_19
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v3
+
+    :cond_1a
+    return-void
+
+    :cond_1b
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "source == this"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public bridge synthetic writeByte(I)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lp0/e;->I(I)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public bridge synthetic writeInt(I)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lp0/e;->M(I)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public bridge synthetic writeShort(I)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lp0/e;->N(I)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public x()I
+    .locals 12
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    iget-wide v0, p0, Lp0/e;->e:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_b
+
+    invoke-virtual {p0, v2, v3}, Lp0/e;->e(J)B
+
+    move-result v0
+
+    and-int/lit16 v1, v0, 0x80
+
+    const/4 v2, 0x1
+
+    const/16 v3, 0x80
+
+    const v4, 0xfffd
+
+    if-nez v1, :cond_0
+
+    and-int/lit8 v1, v0, 0x7f
+
+    const/4 v5, 0x1
+
+    const/4 v6, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    and-int/lit16 v1, v0, 0xe0
+
+    const/16 v5, 0xc0
+
+    if-ne v1, v5, :cond_1
+
+    and-int/lit8 v1, v0, 0x1f
+
+    const/4 v5, 0x2
+
+    const/16 v6, 0x80
+
+    goto :goto_0
+
+    :cond_1
+    and-int/lit16 v1, v0, 0xf0
+
+    const/16 v5, 0xe0
+
+    if-ne v1, v5, :cond_2
+
+    and-int/lit8 v1, v0, 0xf
+
+    const/4 v5, 0x3
+
+    const/16 v6, 0x800
+
+    goto :goto_0
+
+    :cond_2
+    and-int/lit16 v1, v0, 0xf8
+
+    const/16 v5, 0xf0
+
+    if-ne v1, v5, :cond_a
+
+    and-int/lit8 v1, v0, 0x7
+
+    const/4 v5, 0x4
+
+    const/high16 v6, 0x10000
+
+    :goto_0
+    iget-wide v7, p0, Lp0/e;->e:J
+
+    int-to-long v9, v5
+
+    cmp-long v11, v7, v9
+
+    if-ltz v11, :cond_9
+
+    :goto_1
+    if-ge v2, v5, :cond_4
+
+    int-to-long v7, v2
+
+    invoke-virtual {p0, v7, v8}, Lp0/e;->e(J)B
+
+    move-result v0
+
+    and-int/lit16 v11, v0, 0xc0
+
+    if-ne v11, v3, :cond_3
+
+    shl-int/lit8 v1, v1, 0x6
+
+    and-int/lit8 v0, v0, 0x3f
+
+    or-int/2addr v1, v0
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    invoke-virtual {p0, v7, v8}, Lp0/e;->skip(J)V
+
+    return v4
+
+    :cond_4
+    invoke-virtual {p0, v9, v10}, Lp0/e;->skip(J)V
+
+    const v0, 0x10ffff
+
+    if-le v1, v0, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    const v0, 0xdfff
+
+    const v2, 0xd800
+
+    if-le v2, v1, :cond_6
+
+    goto :goto_2
+
+    :cond_6
+    if-lt v0, v1, :cond_7
+
+    goto :goto_3
+
+    :cond_7
+    :goto_2
+    if-ge v1, v6, :cond_8
+
+    goto :goto_3
+
+    :cond_8
+    move v4, v1
+
+    :goto_3
+    return v4
+
+    :cond_9
+    new-instance v1, Ljava/io/EOFException;
+
+    const-string v2, "size < "
+
+    const-string v3, ": "
+
+    invoke-static {v2, v5, v3}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    iget-wide v3, p0, Lp0/e;->e:J
+
+    invoke-virtual {v2, v3, v4}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v3, " (to read code point prefixed 0x"
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-static {v0}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, ")"
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_a
+    const-wide/16 v0, 0x1
+
+    invoke-virtual {p0, v0, v1}, Lp0/e;->skip(J)V
+
+    return v4
+
+    :cond_b
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+.end method
+
+.method public y()Lokio/BufferedSink;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public bridge synthetic y0(Lokio/ByteString;)Lokio/BufferedSink;
+    .locals 0
+
+    invoke-virtual {p0, p1}, Lp0/e;->D(Lokio/ByteString;)Lp0/e;
+
+    return-object p0
+.end method
+
+.method public final z(J)Ljava/lang/String;
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/EOFException;
+        }
+    .end annotation
+
+    const-wide/16 v0, 0x1
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, p1, v2
+
+    if-lez v4, :cond_0
+
+    sub-long v2, p1, v0
+
+    invoke-virtual {p0, v2, v3}, Lp0/e;->e(J)B
+
+    move-result v4
+
+    const/16 v5, 0xd
+
+    int-to-byte v5, v5
+
+    if-ne v4, v5, :cond_0
+
+    invoke-virtual {p0, v2, v3}, Lp0/e;->w(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-wide/16 v0, 0x2
+
+    invoke-virtual {p0, v0, v1}, Lp0/e;->skip(J)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0, p1, p2}, Lp0/e;->w(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p0, v0, v1}, Lp0/e;->skip(J)V
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/p0/f.smali b/com.discord/smali_classes2/p0/f.smali
new file mode 100644
index 0000000000..8cd6e0bab7
--- /dev/null
+++ b/com.discord/smali_classes2/p0/f.smali
@@ -0,0 +1,84 @@
+.class public final Lp0/f;
+.super Ljava/io/OutputStream;
+.source "Buffer.kt"
+
+
+# instance fields
+.field public final synthetic d:Lp0/e;
+
+
+# direct methods
+.method public constructor <init>(Lp0/e;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lp0/f;->d:Lp0/e;
+
+    invoke-direct {p0}, Ljava/io/OutputStream;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public flush()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lp0/f;->d:Lp0/e;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ".outputStream()"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public write(I)V
+    .locals 1
+
+    iget-object v0, p0, Lp0/f;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->I(I)Lp0/e;
+
+    return-void
+.end method
+
+.method public write([BII)V
+    .locals 1
+
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/f;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->G([BII)Lp0/e;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/p0/g.smali b/com.discord/smali_classes2/p0/g.smali
new file mode 100644
index 0000000000..f3d4d8aaf1
--- /dev/null
+++ b/com.discord/smali_classes2/p0/g.smali
@@ -0,0 +1,167 @@
+.class public interface abstract Lp0/g;
+.super Ljava/lang/Object;
+.source "BufferedSource.kt"
+
+# interfaces
+.implements Lp0/w;
+.implements Ljava/nio/channels/ReadableByteChannel;
+
+
+# virtual methods
+.method public abstract F0(Lp0/u;)J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract J()Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract P0(J)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract Q(Lp0/e;J)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract S(Lokio/ByteString;)J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract T(J)Ljava/lang/String;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract U0()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract W0()Ljava/io/InputStream;
+.end method
+
+.method public abstract X0(Lp0/n;)I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract h()Lp0/e;
+.end method
+
+.method public abstract m(J)Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract o0()Ljava/lang/String;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract readByte()B
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract readFully([B)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract readInt()I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract readLong()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract readShort()S
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract skip(J)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract t0(J)[B
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract u(J)Lokio/ByteString;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/p0/h.smali b/com.discord/smali_classes2/p0/h.smali
new file mode 100644
index 0000000000..80795c18c1
--- /dev/null
+++ b/com.discord/smali_classes2/p0/h.smali
@@ -0,0 +1,141 @@
+.class public abstract Lp0/h;
+.super Ljava/lang/Object;
+.source "ForwardingSink.kt"
+
+# interfaces
+.implements Lp0/u;
+
+
+# instance fields
+.field public final delegate:Lp0/u;
+
+
+# direct methods
+.method public constructor <init>(Lp0/u;)V
+    .locals 1
+
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/h;->delegate:Lp0/u;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final -deprecated_delegate()Lp0/u;
+    .locals 1
+
+    iget-object v0, p0, Lp0/h;->delegate:Lp0/u;
+
+    return-object v0
+.end method
+
+.method public close()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lp0/h;->delegate:Lp0/u;
+
+    invoke-interface {v0}, Lp0/u;->close()V
+
+    return-void
+.end method
+
+.method public final delegate()Lp0/u;
+    .locals 1
+
+    iget-object v0, p0, Lp0/h;->delegate:Lp0/u;
+
+    return-object v0
+.end method
+
+.method public flush()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lp0/h;->delegate:Lp0/u;
+
+    invoke-interface {v0}, Lp0/u;->flush()V
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/h;->delegate:Lp0/u;
+
+    invoke-interface {v0}, Lp0/u;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x28
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lp0/h;->delegate:Lp0/u;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/h;->delegate:Lp0/u;
+
+    invoke-interface {v0, p1, p2, p3}, Lp0/u;->write(Lp0/e;J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/p0/i.smali b/com.discord/smali_classes2/p0/i.smali
new file mode 100644
index 0000000000..4ff82d4b02
--- /dev/null
+++ b/com.discord/smali_classes2/p0/i.smali
@@ -0,0 +1,112 @@
+.class public abstract Lp0/i;
+.super Ljava/lang/Object;
+.source "ForwardingSource.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# instance fields
+.field public final d:Lp0/w;
+
+
+# direct methods
+.method public constructor <init>(Lp0/w;)V
+    .locals 1
+
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/i;->d:Lp0/w;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/i;->d:Lp0/w;
+
+    invoke-interface {v0, p1, p2, p3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+
+    return-wide p1
+.end method
+
+.method public close()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lp0/i;->d:Lp0/w;
+
+    invoke-interface {v0}, Lp0/w;->close()V
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/i;->d:Lp0/w;
+
+    invoke-interface {v0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x28
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lp0/i;->d:Lp0/w;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/p0/j.smali b/com.discord/smali_classes2/p0/j.smali
new file mode 100644
index 0000000000..18d1ccf574
--- /dev/null
+++ b/com.discord/smali_classes2/p0/j.smali
@@ -0,0 +1,128 @@
+.class public Lp0/j;
+.super Lp0/x;
+.source "ForwardingTimeout.kt"
+
+
+# instance fields
+.field public e:Lp0/x;
+
+
+# direct methods
+.method public constructor <init>(Lp0/x;)V
+    .locals 1
+
+    const-string v0, "delegate"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lp0/x;-><init>()V
+
+    iput-object p1, p0, Lp0/j;->e:Lp0/x;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0}, Lp0/x;->a()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public b()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0}, Lp0/x;->b()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public c()J
+    .locals 2
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0}, Lp0/x;->c()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public d(J)Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0, p1, p2}, Lp0/x;->d(J)Lp0/x;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public e()Z
+    .locals 1
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0}, Lp0/x;->e()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public f()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0}, Lp0/x;->f()V
+
+    return-void
+.end method
+
+.method public g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+    .locals 1
+
+    const-string v0, "unit"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/x;->g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public h()J
+    .locals 2
+
+    iget-object v0, p0, Lp0/j;->e:Lp0/x;
+
+    invoke-virtual {v0}, Lp0/x;->h()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/p0/k.smali b/com.discord/smali_classes2/p0/k.smali
new file mode 100644
index 0000000000..88dc86846f
--- /dev/null
+++ b/com.discord/smali_classes2/p0/k.smali
@@ -0,0 +1,715 @@
+.class public final Lp0/k;
+.super Ljava/lang/Object;
+.source "GzipSource.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# instance fields
+.field public d:B
+
+.field public final e:Lp0/q;
+
+.field public final f:Ljava/util/zip/Inflater;
+
+.field public final g:Lp0/l;
+
+.field public final h:Ljava/util/zip/CRC32;
+
+
+# direct methods
+.method public constructor <init>(Lp0/w;)V
+    .locals 2
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lp0/q;
+
+    invoke-direct {v0, p1}, Lp0/q;-><init>(Lp0/w;)V
+
+    iput-object v0, p0, Lp0/k;->e:Lp0/q;
+
+    new-instance p1, Ljava/util/zip/Inflater;
+
+    const/4 v0, 0x1
+
+    invoke-direct {p1, v0}, Ljava/util/zip/Inflater;-><init>(Z)V
+
+    iput-object p1, p0, Lp0/k;->f:Ljava/util/zip/Inflater;
+
+    new-instance v0, Lp0/l;
+
+    iget-object v1, p0, Lp0/k;->e:Lp0/q;
+
+    invoke-direct {v0, v1, p1}, Lp0/l;-><init>(Lp0/g;Ljava/util/zip/Inflater;)V
+
+    iput-object v0, p0, Lp0/k;->g:Lp0/l;
+
+    new-instance p1, Ljava/util/zip/CRC32;
+
+    invoke-direct {p1}, Ljava/util/zip/CRC32;-><init>()V
+
+    iput-object p1, p0, Lp0/k;->h:Ljava/util/zip/CRC32;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 24
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v6, p0
+
+    move-object/from16 v7, p1
+
+    move-wide/from16 v8, p2
+
+    const-string v0, "sink"
+
+    invoke-static {v7, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x1
+
+    cmp-long v2, v8, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
+    if-eqz v3, :cond_16
+
+    if-nez v2, :cond_1
+
+    return-wide v0
+
+    :cond_1
+    iget-byte v0, v6, Lp0/k;->d:B
+
+    const-wide/16 v12, -0x1
+
+    if-nez v0, :cond_11
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    const-wide/16 v1, 0xa
+
+    invoke-virtual {v0, v1, v2}, Lp0/q;->P0(J)V
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    iget-object v0, v0, Lp0/q;->d:Lp0/e;
+
+    const-wide/16 v1, 0x3
+
+    invoke-virtual {v0, v1, v2}, Lp0/e;->e(J)B
+
+    move-result v14
+
+    shr-int/lit8 v0, v14, 0x1
+
+    and-int/2addr v0, v11
+
+    if-ne v0, v11, :cond_2
+
+    const/4 v0, 0x1
+
+    const/4 v15, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v0, 0x0
+
+    const/4 v15, 0x0
+
+    :goto_1
+    if-eqz v15, :cond_3
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    iget-object v1, v0, Lp0/q;->d:Lp0/e;
+
+    const-wide/16 v2, 0x0
+
+    const-wide/16 v4, 0xa
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {v0 .. v5}, Lp0/k;->b(Lp0/e;JJ)V
+
+    :cond_3
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    invoke-virtual {v0}, Lp0/q;->readShort()S
+
+    move-result v0
+
+    const/16 v1, 0x1f8b
+
+    const-string v2, "ID1ID2"
+
+    invoke-virtual {v6, v2, v1, v0}, Lp0/k;->a(Ljava/lang/String;II)V
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    const-wide/16 v1, 0x8
+
+    invoke-virtual {v0, v1, v2}, Lp0/q;->skip(J)V
+
+    shr-int/lit8 v0, v14, 0x2
+
+    and-int/2addr v0, v11
+
+    if-ne v0, v11, :cond_4
+
+    const/4 v0, 0x1
+
+    goto :goto_2
+
+    :cond_4
+    const/4 v0, 0x0
+
+    :goto_2
+    const-wide/16 v1, 0x2
+
+    if-eqz v0, :cond_7
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    invoke-virtual {v0, v1, v2}, Lp0/q;->P0(J)V
+
+    if-eqz v15, :cond_5
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    iget-object v1, v0, Lp0/q;->d:Lp0/e;
+
+    const-wide/16 v2, 0x0
+
+    const-wide/16 v4, 0x2
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {v0 .. v5}, Lp0/k;->b(Lp0/e;JJ)V
+
+    :cond_5
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    iget-object v0, v0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->r()S
+
+    move-result v0
+
+    int-to-long v4, v0
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    invoke-virtual {v0, v4, v5}, Lp0/q;->P0(J)V
+
+    if-eqz v15, :cond_6
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    iget-object v1, v0, Lp0/q;->d:Lp0/e;
+
+    const-wide/16 v2, 0x0
+
+    move-object/from16 v0, p0
+
+    move-wide/from16 v16, v4
+
+    invoke-virtual/range {v0 .. v5}, Lp0/k;->b(Lp0/e;JJ)V
+
+    goto :goto_3
+
+    :cond_6
+    move-wide/from16 v16, v4
+
+    :goto_3
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    move-wide/from16 v1, v16
+
+    invoke-virtual {v0, v1, v2}, Lp0/q;->skip(J)V
+
+    :cond_7
+    shr-int/lit8 v0, v14, 0x3
+
+    and-int/2addr v0, v11
+
+    if-ne v0, v11, :cond_8
+
+    const/4 v0, 0x1
+
+    goto :goto_4
+
+    :cond_8
+    const/4 v0, 0x0
+
+    :goto_4
+    const-wide/16 v16, 0x1
+
+    if-eqz v0, :cond_b
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    const/16 v19, 0x0
+
+    const-wide/16 v20, 0x0
+
+    const-wide v22, 0x7fffffffffffffffL
+
+    move-object/from16 v18, v0
+
+    invoke-virtual/range {v18 .. v23}, Lp0/q;->a(BJJ)J
+
+    move-result-wide v18
+
+    cmp-long v0, v18, v12
+
+    if-eqz v0, :cond_a
+
+    if-eqz v15, :cond_9
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    iget-object v1, v0, Lp0/q;->d:Lp0/e;
+
+    const-wide/16 v2, 0x0
+
+    add-long v4, v18, v16
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {v0 .. v5}, Lp0/k;->b(Lp0/e;JJ)V
+
+    :cond_9
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    add-long v1, v18, v16
+
+    invoke-virtual {v0, v1, v2}, Lp0/q;->skip(J)V
+
+    goto :goto_5
+
+    :cond_a
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+
+    :cond_b
+    :goto_5
+    shr-int/lit8 v0, v14, 0x4
+
+    and-int/2addr v0, v11
+
+    if-ne v0, v11, :cond_c
+
+    const/4 v10, 0x1
+
+    :cond_c
+    if-eqz v10, :cond_f
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    const-wide v4, 0x7fffffffffffffffL
+
+    invoke-virtual/range {v0 .. v5}, Lp0/q;->a(BJJ)J
+
+    move-result-wide v18
+
+    cmp-long v0, v18, v12
+
+    if-eqz v0, :cond_e
+
+    if-eqz v15, :cond_d
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    iget-object v1, v0, Lp0/q;->d:Lp0/e;
+
+    const-wide/16 v2, 0x0
+
+    add-long v4, v18, v16
+
+    move-object/from16 v0, p0
+
+    invoke-virtual/range {v0 .. v5}, Lp0/k;->b(Lp0/e;JJ)V
+
+    :cond_d
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    add-long v1, v18, v16
+
+    invoke-virtual {v0, v1, v2}, Lp0/q;->skip(J)V
+
+    goto :goto_6
+
+    :cond_e
+    new-instance v0, Ljava/io/EOFException;
+
+    invoke-direct {v0}, Ljava/io/EOFException;-><init>()V
+
+    throw v0
+
+    :cond_f
+    :goto_6
+    if-eqz v15, :cond_10
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    const-wide/16 v1, 0x2
+
+    invoke-virtual {v0, v1, v2}, Lp0/q;->P0(J)V
+
+    iget-object v0, v0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->r()S
+
+    move-result v0
+
+    iget-object v1, v6, Lp0/k;->h:Ljava/util/zip/CRC32;
+
+    invoke-virtual {v1}, Ljava/util/zip/CRC32;->getValue()J
+
+    move-result-wide v1
+
+    long-to-int v2, v1
+
+    int-to-short v1, v2
+
+    const-string v2, "FHCRC"
+
+    invoke-virtual {v6, v2, v0, v1}, Lp0/k;->a(Ljava/lang/String;II)V
+
+    iget-object v0, v6, Lp0/k;->h:Ljava/util/zip/CRC32;
+
+    invoke-virtual {v0}, Ljava/util/zip/CRC32;->reset()V
+
+    :cond_10
+    iput-byte v11, v6, Lp0/k;->d:B
+
+    :cond_11
+    iget-byte v0, v6, Lp0/k;->d:B
+
+    const/4 v1, 0x2
+
+    if-ne v0, v11, :cond_13
+
+    iget-wide v2, v7, Lp0/e;->e:J
+
+    iget-object v0, v6, Lp0/k;->g:Lp0/l;
+
+    invoke-virtual {v0, v7, v8, v9}, Lp0/l;->B0(Lp0/e;J)J
+
+    move-result-wide v8
+
+    cmp-long v0, v8, v12
+
+    if-eqz v0, :cond_12
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    move-wide v4, v8
+
+    invoke-virtual/range {v0 .. v5}, Lp0/k;->b(Lp0/e;JJ)V
+
+    return-wide v8
+
+    :cond_12
+    iput-byte v1, v6, Lp0/k;->d:B
+
+    :cond_13
+    iget-byte v0, v6, Lp0/k;->d:B
+
+    if-ne v0, v1, :cond_15
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    invoke-virtual {v0}, Lp0/q;->b()I
+
+    move-result v0
+
+    iget-object v1, v6, Lp0/k;->h:Ljava/util/zip/CRC32;
+
+    invoke-virtual {v1}, Ljava/util/zip/CRC32;->getValue()J
+
+    move-result-wide v1
+
+    long-to-int v2, v1
+
+    const-string v1, "CRC"
+
+    invoke-virtual {v6, v1, v0, v2}, Lp0/k;->a(Ljava/lang/String;II)V
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    invoke-virtual {v0}, Lp0/q;->b()I
+
+    move-result v0
+
+    iget-object v1, v6, Lp0/k;->f:Ljava/util/zip/Inflater;
+
+    invoke-virtual {v1}, Ljava/util/zip/Inflater;->getBytesWritten()J
+
+    move-result-wide v1
+
+    long-to-int v2, v1
+
+    const-string v1, "ISIZE"
+
+    invoke-virtual {v6, v1, v0, v2}, Lp0/k;->a(Ljava/lang/String;II)V
+
+    const/4 v0, 0x3
+
+    iput-byte v0, v6, Lp0/k;->d:B
+
+    iget-object v0, v6, Lp0/k;->e:Lp0/q;
+
+    invoke-virtual {v0}, Lp0/q;->J()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_14
+
+    goto :goto_7
+
+    :cond_14
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "gzip finished without exhausting source"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_15
+    :goto_7
+    return-wide v12
+
+    :cond_16
+    const-string v0, "byteCount < 0: "
+
+    invoke-static {v0, v8, v9}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public final a(Ljava/lang/String;II)V
+    .locals 4
+
+    if-ne p3, p2, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/io/IOException;
+
+    const/4 v1, 0x3
+
+    new-array v2, v1, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    aput-object p1, v2, v3
+
+    const/4 p1, 0x1
+
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p3
+
+    aput-object p3, v2, p1
+
+    const/4 p1, 0x2
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    aput-object p2, v2, p1
+
+    invoke-static {v2, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    const-string p2, "%s: actual 0x%08x != expected 0x%08x"
+
+    invoke-static {p2, p1}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "java.lang.String.format(this, *args)"
+
+    invoke-static {p1, p2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final b(Lp0/e;JJ)V
+    .locals 6
+
+    iget-object p1, p1, Lp0/e;->d:Lp0/r;
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_4
+
+    :goto_0
+    iget v1, p1, Lp0/r;->c:I
+
+    iget v2, p1, Lp0/r;->b:I
+
+    sub-int v3, v1, v2
+
+    int-to-long v3, v3
+
+    cmp-long v5, p2, v3
+
+    if-ltz v5, :cond_1
+
+    sub-int/2addr v1, v2
+
+    int-to-long v1, v1
+
+    sub-long/2addr p2, v1
+
+    iget-object p1, p1, Lp0/r;->f:Lp0/r;
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_1
+    const-wide/16 v1, 0x0
+
+    :goto_1
+    cmp-long v3, p4, v1
+
+    if-lez v3, :cond_3
+
+    iget v3, p1, Lp0/r;->b:I
+
+    int-to-long v3, v3
+
+    add-long/2addr v3, p2
+
+    long-to-int p2, v3
+
+    iget p3, p1, Lp0/r;->c:I
+
+    sub-int/2addr p3, p2
+
+    int-to-long v3, p3
+
+    invoke-static {v3, v4, p4, p5}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v3
+
+    long-to-int p3, v3
+
+    iget-object v3, p0, Lp0/k;->h:Ljava/util/zip/CRC32;
+
+    iget-object v4, p1, Lp0/r;->a:[B
+
+    invoke-virtual {v3, v4, p2, p3}, Ljava/util/zip/CRC32;->update([BII)V
+
+    int-to-long p2, p3
+
+    sub-long/2addr p4, p2
+
+    iget-object p1, p1, Lp0/r;->f:Lp0/r;
+
+    if-eqz p1, :cond_2
+
+    move-wide p2, v1
+
+    goto :goto_1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+
+    :cond_3
+    return-void
+
+    :cond_4
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v0
+.end method
+
+.method public close()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lp0/k;->g:Lp0/l;
+
+    invoke-virtual {v0}, Lp0/l;->close()V
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/k;->e:Lp0/q;
+
+    invoke-virtual {v0}, Lp0/q;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/p0/l.smali b/com.discord/smali_classes2/p0/l.smali
new file mode 100644
index 0000000000..944b557567
--- /dev/null
+++ b/com.discord/smali_classes2/p0/l.smali
@@ -0,0 +1,392 @@
+.class public final Lp0/l;
+.super Ljava/lang/Object;
+.source "InflaterSource.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# instance fields
+.field public d:I
+
+.field public e:Z
+
+.field public final f:Lp0/g;
+
+.field public final g:Ljava/util/zip/Inflater;
+
+
+# direct methods
+.method public constructor <init>(Lp0/g;Ljava/util/zip/Inflater;)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inflater"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/l;->f:Lp0/g;
+
+    iput-object p2, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 7
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    const/4 v2, 0x1
+
+    cmp-long v3, p2, v0
+
+    if-ltz v3, :cond_0
+
+    const/4 v4, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v4, 0x0
+
+    :goto_0
+    if-eqz v4, :cond_d
+
+    iget-boolean v4, p0, Lp0/l;->e:Z
+
+    xor-int/2addr v4, v2
+
+    if-eqz v4, :cond_c
+
+    if-nez v3, :cond_1
+
+    return-wide v0
+
+    :cond_1
+    :goto_1
+    iget-object v0, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    invoke-virtual {v0}, Ljava/util/zip/Inflater;->needsInput()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    goto :goto_3
+
+    :cond_2
+    invoke-virtual {p0}, Lp0/l;->a()V
+
+    iget-object v0, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    invoke-virtual {v0}, Ljava/util/zip/Inflater;->getRemaining()I
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    const/4 v0, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :goto_2
+    if-eqz v0, :cond_b
+
+    iget-object v0, p0, Lp0/l;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->J()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    const/4 v0, 0x1
+
+    goto :goto_4
+
+    :cond_4
+    iget-object v0, p0, Lp0/l;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/g;->h()Lp0/e;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_a
+
+    iget v1, v0, Lp0/r;->c:I
+
+    iget v3, v0, Lp0/r;->b:I
+
+    sub-int/2addr v1, v3
+
+    iput v1, p0, Lp0/l;->d:I
+
+    iget-object v4, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    iget-object v0, v0, Lp0/r;->a:[B
+
+    invoke-virtual {v4, v0, v3, v1}, Ljava/util/zip/Inflater;->setInput([BII)V
+
+    :goto_3
+    const/4 v0, 0x0
+
+    :goto_4
+    :try_start_0
+    invoke-virtual {p1, v2}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v1
+
+    iget v3, v1, Lp0/r;->c:I
+
+    rsub-int v3, v3, 0x2000
+
+    int-to-long v3, v3
+
+    invoke-static {p2, p3, v3, v4}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v3
+
+    long-to-int v4, v3
+
+    iget-object v3, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    iget-object v5, v1, Lp0/r;->a:[B
+
+    iget v6, v1, Lp0/r;->c:I
+
+    invoke-virtual {v3, v5, v6, v4}, Ljava/util/zip/Inflater;->inflate([BII)I
+
+    move-result v3
+
+    if-lez v3, :cond_5
+
+    iget p2, v1, Lp0/r;->c:I
+
+    add-int/2addr p2, v3
+
+    iput p2, v1, Lp0/r;->c:I
+
+    iget-wide p2, p1, Lp0/e;->e:J
+
+    int-to-long v0, v3
+
+    add-long/2addr p2, v0
+
+    iput-wide p2, p1, Lp0/e;->e:J
+
+    return-wide v0
+
+    :cond_5
+    iget-object v3, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    invoke-virtual {v3}, Ljava/util/zip/Inflater;->finished()Z
+
+    move-result v3
+
+    if-nez v3, :cond_8
+
+    iget-object v3, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    invoke-virtual {v3}, Ljava/util/zip/Inflater;->needsDictionary()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_6
+
+    goto :goto_5
+
+    :cond_6
+    if-nez v0, :cond_7
+
+    goto :goto_1
+
+    :cond_7
+    new-instance p1, Ljava/io/EOFException;
+
+    const-string p2, "source exhausted prematurely"
+
+    invoke-direct {p1, p2}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_8
+    :goto_5
+    invoke-virtual {p0}, Lp0/l;->a()V
+
+    iget p2, v1, Lp0/r;->b:I
+
+    iget p3, v1, Lp0/r;->c:I
+
+    if-ne p2, p3, :cond_9
+
+    invoke-virtual {v1}, Lp0/r;->a()Lp0/r;
+
+    move-result-object p2
+
+    iput-object p2, p1, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v1}, Lp0/s;->a(Lp0/r;)V
+    :try_end_0
+    .catch Ljava/util/zip/DataFormatException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :cond_9
+    const-wide/16 p1, -0x1
+
+    return-wide p1
+
+    :catch_0
+    move-exception p1
+
+    new-instance p2, Ljava/io/IOException;
+
+    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/Throwable;)V
+
+    throw p2
+
+    :cond_a
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_b
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "?"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_c
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_d
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public final a()V
+    .locals 4
+
+    iget v0, p0, Lp0/l;->d:I
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v1, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    invoke-virtual {v1}, Ljava/util/zip/Inflater;->getRemaining()I
+
+    move-result v1
+
+    sub-int/2addr v0, v1
+
+    iget v1, p0, Lp0/l;->d:I
+
+    sub-int/2addr v1, v0
+
+    iput v1, p0, Lp0/l;->d:I
+
+    iget-object v1, p0, Lp0/l;->f:Lp0/g;
+
+    int-to-long v2, v0
+
+    invoke-interface {v1, v2, v3}, Lp0/g;->skip(J)V
+
+    return-void
+.end method
+
+.method public close()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lp0/l;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lp0/l;->g:Ljava/util/zip/Inflater;
+
+    invoke-virtual {v0}, Ljava/util/zip/Inflater;->end()V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lp0/l;->e:Z
+
+    iget-object v0, p0, Lp0/l;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/w;->close()V
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/l;->f:Lp0/g;
+
+    invoke-interface {v0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/p0/m.smali b/com.discord/smali_classes2/p0/m.smali
new file mode 100644
index 0000000000..ecea085705
--- /dev/null
+++ b/com.discord/smali_classes2/p0/m.smali
@@ -0,0 +1,202 @@
+.class public final Lp0/m;
+.super Ljava/lang/Object;
+.source "Okio.kt"
+
+# interfaces
+.implements Lp0/w;
+
+
+# instance fields
+.field public final d:Ljava/io/InputStream;
+
+.field public final e:Lp0/x;
+
+
+# direct methods
+.method public constructor <init>(Ljava/io/InputStream;Lp0/x;)V
+    .locals 1
+
+    const-string v0, "input"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "timeout"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/m;->d:Ljava/io/InputStream;
+
+    iput-object p2, p0, Lp0/m;->e:Lp0/x;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 3
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-nez v2, :cond_0
+
+    return-wide v0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    if-ltz v2, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_4
+
+    :try_start_0
+    iget-object v1, p0, Lp0/m;->e:Lp0/x;
+
+    invoke-virtual {v1}, Lp0/x;->f()V
+
+    invoke-virtual {p1, v0}, Lp0/e;->C(I)Lp0/r;
+
+    move-result-object v0
+
+    iget v1, v0, Lp0/r;->c:I
+
+    rsub-int v1, v1, 0x2000
+
+    int-to-long v1, v1
+
+    invoke-static {p2, p3, v1, v2}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p2
+
+    long-to-int p3, p2
+
+    iget-object p2, p0, Lp0/m;->d:Ljava/io/InputStream;
+
+    iget-object v1, v0, Lp0/r;->a:[B
+
+    iget v2, v0, Lp0/r;->c:I
+
+    invoke-virtual {p2, v1, v2, p3}, Ljava/io/InputStream;->read([BII)I
+
+    move-result p2
+
+    const/4 p3, -0x1
+
+    if-ne p2, p3, :cond_2
+
+    const-wide/16 p1, -0x1
+
+    return-wide p1
+
+    :cond_2
+    iget p3, v0, Lp0/r;->c:I
+
+    add-int/2addr p3, p2
+
+    iput p3, v0, Lp0/r;->c:I
+
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    int-to-long p2, p2
+
+    add-long/2addr v0, p2
+
+    iput-wide v0, p1, Lp0/e;->e:J
+    :try_end_0
+    .catch Ljava/lang/AssertionError; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-wide p2
+
+    :catch_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->F(Ljava/lang/AssertionError;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_3
+
+    new-instance p2, Ljava/io/IOException;
+
+    invoke-direct {p2, p1}, Ljava/io/IOException;-><init>(Ljava/lang/Throwable;)V
+
+    throw p2
+
+    :cond_3
+    throw p1
+
+    :cond_4
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public close()V
+    .locals 1
+
+    iget-object v0, p0, Lp0/m;->d:Ljava/io/InputStream;
+
+    invoke-virtual {v0}, Ljava/io/InputStream;->close()V
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/m;->e:Lp0/x;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "source("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lp0/m;->d:Ljava/io/InputStream;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/p0/n$a.smali b/com.discord/smali_classes2/p0/n$a.smali
new file mode 100644
index 0000000000..a7e93d4bf3
--- /dev/null
+++ b/com.discord/smali_classes2/p0/n$a.smali
@@ -0,0 +1,1069 @@
+.class public final Lp0/n$a;
+.super Ljava/lang/Object;
+.source "Options.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lp0/n;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(JLp0/e;ILjava/util/List;IILjava/util/List;)V
+    .locals 19
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Lp0/e;",
+            "I",
+            "Ljava/util/List<",
+            "+",
+            "Lokio/ByteString;",
+            ">;II",
+            "Ljava/util/List<",
+            "Ljava/lang/Integer;",
+            ">;)V"
+        }
+    .end annotation
+
+    move-object/from16 v9, p0
+
+    move-object/from16 v10, p3
+
+    move/from16 v11, p4
+
+    move-object/from16 v12, p5
+
+    move/from16 v0, p6
+
+    move/from16 v13, p7
+
+    move-object/from16 v14, p8
+
+    if-ge v0, v13, :cond_0
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
+    const-string v4, "Failed requirement."
+
+    if-eqz v3, :cond_14
+
+    move v3, v0
+
+    :goto_1
+    if-ge v3, v13, :cond_3
+
+    invoke-interface {v12, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lokio/ByteString;
+
+    invoke-virtual {v5}, Lokio/ByteString;->h()I
+
+    move-result v5
+
+    if-lt v5, v11, :cond_1
+
+    const/4 v5, 0x1
+
+    goto :goto_2
+
+    :cond_1
+    const/4 v5, 0x0
+
+    :goto_2
+    if-eqz v5, :cond_2
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v4}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_3
+    invoke-interface/range {p5 .. p6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lokio/ByteString;
+
+    add-int/lit8 v4, v13, -0x1
+
+    invoke-interface {v12, v4}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lokio/ByteString;
+
+    invoke-virtual {v3}, Lokio/ByteString;->h()I
+
+    move-result v5
+
+    const/4 v15, -0x1
+
+    if-ne v11, v5, :cond_4
+
+    invoke-interface {v14, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Number;
+
+    invoke-virtual {v3}, Ljava/lang/Number;->intValue()I
+
+    move-result v3
+
+    add-int/lit8 v0, v0, 0x1
+
+    invoke-interface {v12, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v5
+
+    check-cast v5, Lokio/ByteString;
+
+    move v6, v0
+
+    move v0, v3
+
+    move-object v3, v5
+
+    goto :goto_3
+
+    :cond_4
+    move v6, v0
+
+    const/4 v0, -0x1
+
+    :goto_3
+    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v5
+
+    invoke-virtual {v4, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v7
+
+    const/4 v8, 0x2
+
+    if-eq v5, v7, :cond_e
+
+    add-int/lit8 v1, v6, 0x1
+
+    const/4 v2, 0x1
+
+    :goto_4
+    if-ge v1, v13, :cond_6
+
+    add-int/lit8 v3, v1, -0x1
+
+    invoke-interface {v12, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lokio/ByteString;
+
+    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v3
+
+    invoke-interface {v12, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lokio/ByteString;
+
+    invoke-virtual {v4, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v4
+
+    if-eq v3, v4, :cond_5
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_5
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_4
+
+    :cond_6
+    invoke-virtual {v9, v10}, Lp0/n$a;->b(Lp0/e;)J
+
+    move-result-wide v3
+
+    add-long v3, v3, p1
+
+    int-to-long v7, v8
+
+    add-long/2addr v3, v7
+
+    mul-int/lit8 v1, v2, 0x2
+
+    int-to-long v7, v1
+
+    add-long v16, v3, v7
+
+    invoke-virtual {v10, v2}, Lp0/e;->M(I)Lp0/e;
+
+    invoke-virtual {v10, v0}, Lp0/e;->M(I)Lp0/e;
+
+    move v0, v6
+
+    :goto_5
+    if-ge v0, v13, :cond_9
+
+    invoke-interface {v12, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lokio/ByteString;
+
+    invoke-virtual {v1, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v1
+
+    if-eq v0, v6, :cond_7
+
+    add-int/lit8 v2, v0, -0x1
+
+    invoke-interface {v12, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lokio/ByteString;
+
+    invoke-virtual {v2, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v2
+
+    if-eq v1, v2, :cond_8
+
+    :cond_7
+    and-int/lit16 v1, v1, 0xff
+
+    invoke-virtual {v10, v1}, Lp0/e;->M(I)Lp0/e;
+
+    :cond_8
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_5
+
+    :cond_9
+    new-instance v8, Lp0/e;
+
+    invoke-direct {v8}, Lp0/e;-><init>()V
+
+    :goto_6
+    if-ge v6, v13, :cond_d
+
+    invoke-interface {v12, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lokio/ByteString;
+
+    invoke-virtual {v0, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v0
+
+    add-int/lit8 v1, v6, 0x1
+
+    move v2, v1
+
+    :goto_7
+    if-ge v2, v13, :cond_b
+
+    invoke-interface {v12, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lokio/ByteString;
+
+    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v3
+
+    if-eq v0, v3, :cond_a
+
+    move v7, v2
+
+    goto :goto_8
+
+    :cond_a
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_7
+
+    :cond_b
+    move v7, v13
+
+    :goto_8
+    if-ne v1, v7, :cond_c
+
+    add-int/lit8 v0, v11, 0x1
+
+    invoke-interface {v12, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lokio/ByteString;
+
+    invoke-virtual {v1}, Lokio/ByteString;->h()I
+
+    move-result v1
+
+    if-ne v0, v1, :cond_c
+
+    invoke-interface {v14, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v0
+
+    invoke-virtual {v10, v0}, Lp0/e;->M(I)Lp0/e;
+
+    move/from16 v18, v7
+
+    move-object v15, v8
+
+    goto :goto_9
+
+    :cond_c
+    invoke-virtual {v9, v8}, Lp0/n$a;->b(Lp0/e;)J
+
+    move-result-wide v0
+
+    add-long v0, v0, v16
+
+    long-to-int v1, v0
+
+    mul-int/lit8 v1, v1, -0x1
+
+    invoke-virtual {v10, v1}, Lp0/e;->M(I)Lp0/e;
+
+    add-int/lit8 v4, v11, 0x1
+
+    move-object/from16 v0, p0
+
+    move-wide/from16 v1, v16
+
+    move-object v3, v8
+
+    move-object/from16 v5, p5
+
+    move/from16 v18, v7
+
+    move-object v15, v8
+
+    move-object/from16 v8, p8
+
+    invoke-virtual/range {v0 .. v8}, Lp0/n$a;->a(JLp0/e;ILjava/util/List;IILjava/util/List;)V
+
+    :goto_9
+    move-object v8, v15
+
+    move/from16 v6, v18
+
+    const/4 v15, -0x1
+
+    goto :goto_6
+
+    :cond_d
+    move-object v15, v8
+
+    invoke-virtual {v10, v15}, Lp0/e;->i0(Lp0/w;)J
+
+    goto/16 :goto_d
+
+    :cond_e
+    invoke-virtual {v3}, Lokio/ByteString;->h()I
+
+    move-result v5
+
+    invoke-virtual {v4}, Lokio/ByteString;->h()I
+
+    move-result v7
+
+    invoke-static {v5, v7}, Ljava/lang/Math;->min(II)I
+
+    move-result v5
+
+    move v7, v11
+
+    const/4 v15, 0x0
+
+    :goto_a
+    if-ge v7, v5, :cond_f
+
+    invoke-virtual {v3, v7}, Lokio/ByteString;->k(I)B
+
+    move-result v1
+
+    invoke-virtual {v4, v7}, Lokio/ByteString;->k(I)B
+
+    move-result v2
+
+    if-ne v1, v2, :cond_f
+
+    add-int/lit8 v15, v15, 0x1
+
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_a
+
+    :cond_f
+    invoke-virtual {v9, v10}, Lp0/n$a;->b(Lp0/e;)J
+
+    move-result-wide v1
+
+    add-long v1, v1, p1
+
+    int-to-long v4, v8
+
+    add-long/2addr v1, v4
+
+    int-to-long v4, v15
+
+    add-long/2addr v1, v4
+
+    const-wide/16 v4, 0x1
+
+    add-long/2addr v1, v4
+
+    neg-int v4, v15
+
+    invoke-virtual {v10, v4}, Lp0/e;->M(I)Lp0/e;
+
+    invoke-virtual {v10, v0}, Lp0/e;->M(I)Lp0/e;
+
+    add-int v4, v11, v15
+
+    :goto_b
+    if-ge v11, v4, :cond_10
+
+    invoke-virtual {v3, v11}, Lokio/ByteString;->k(I)B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    invoke-virtual {v10, v0}, Lp0/e;->M(I)Lp0/e;
+
+    add-int/lit8 v11, v11, 0x1
+
+    goto :goto_b
+
+    :cond_10
+    add-int/lit8 v0, v6, 0x1
+
+    if-ne v0, v13, :cond_13
+
+    invoke-interface {v12, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lokio/ByteString;
+
+    invoke-virtual {v0}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    if-ne v4, v0, :cond_11
+
+    const/4 v1, 0x1
+
+    goto :goto_c
+
+    :cond_11
+    const/4 v1, 0x0
+
+    :goto_c
+    if-eqz v1, :cond_12
+
+    invoke-interface {v14, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v0
+
+    invoke-virtual {v10, v0}, Lp0/e;->M(I)Lp0/e;
+
+    goto :goto_d
+
+    :cond_12
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Check failed."
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_13
+    new-instance v11, Lp0/e;
+
+    invoke-direct {v11}, Lp0/e;-><init>()V
+
+    invoke-virtual {v9, v11}, Lp0/n$a;->b(Lp0/e;)J
+
+    move-result-wide v7
+
+    add-long/2addr v7, v1
+
+    long-to-int v0, v7
+
+    const/4 v3, -0x1
+
+    mul-int/lit8 v0, v0, -0x1
+
+    invoke-virtual {v10, v0}, Lp0/e;->M(I)Lp0/e;
+
+    move-object/from16 v0, p0
+
+    move-object v3, v11
+
+    move-object/from16 v5, p5
+
+    move/from16 v7, p7
+
+    move-object/from16 v8, p8
+
+    invoke-virtual/range {v0 .. v8}, Lp0/n$a;->a(JLp0/e;ILjava/util/List;IILjava/util/List;)V
+
+    invoke-virtual {v10, v11}, Lp0/e;->i0(Lp0/w;)J
+
+    :goto_d
+    return-void
+
+    :cond_14
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v4}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final b(Lp0/e;)J
+    .locals 4
+
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    const/4 p1, 0x4
+
+    int-to-long v2, p1
+
+    div-long/2addr v0, v2
+
+    return-wide v0
+.end method
+
+.method public final varargs c([Lokio/ByteString;)Lp0/n;
+    .locals 14
+
+    const-string v0, "byteStrings"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
+
+    new-instance p1, Lp0/n;
+
+    new-array v0, v1, [Lokio/ByteString;
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [I
+
+    fill-array-data v1, :array_0
+
+    invoke-direct {p1, v0, v1, v2}, Lp0/n;-><init>([Lokio/ByteString;[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object p1
+
+    :cond_1
+    invoke-static {p1}, Lf/n/a/k/a;->toMutableList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v8
+
+    invoke-static {v8}, Lf/n/a/k/a;->sort(Ljava/util/List;)V
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    array-length v3, p1
+
+    invoke-direct {v0, v3}, Ljava/util/ArrayList;-><init>(I)V
+
+    array-length v3, p1
+
+    const/4 v4, 0x0
+
+    :goto_1
+    if-ge v4, v3, :cond_2
+
+    aget-object v5, p1, v4
+
+    const/4 v5, -0x1
+
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v5
+
+    invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    new-array v3, v1, [Ljava/lang/Integer;
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_13
+
+    check-cast v0, [Ljava/lang/Integer;
+
+    array-length v3, v0
+
+    invoke-static {v0, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ljava/lang/Integer;
+
+    invoke-static {v0}, Lf/n/a/k/a;->mutableListOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v11
+
+    array-length v0, p1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_2
+    if-ge v3, v0, :cond_8
+
+    aget-object v5, p1, v3
+
+    add-int/lit8 v6, v4, 0x1
+
+    move-object v7, v8
+
+    check-cast v7, Ljava/util/ArrayList;
+
+    invoke-virtual {v7}, Ljava/util/ArrayList;->size()I
+
+    move-result v9
+
+    const-string v10, "$this$binarySearch"
+
+    invoke-static {v8, v10}, Lk0/o/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v7}, Ljava/util/ArrayList;->size()I
+
+    move-result v10
+
+    const-string v12, ")."
+
+    if-ltz v9, :cond_7
+
+    if-gt v9, v10, :cond_6
+
+    add-int/lit8 v9, v9, -0x1
+
+    const/4 v10, 0x0
+
+    :goto_3
+    if-gt v10, v9, :cond_4
+
+    add-int v12, v10, v9
+
+    ushr-int/lit8 v12, v12, 0x1
+
+    invoke-virtual {v7, v12}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v13
+
+    check-cast v13, Ljava/lang/Comparable;
+
+    invoke-static {v13, v5}, Lf/n/a/k/a;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
+
+    move-result v13
+
+    if-gez v13, :cond_3
+
+    add-int/lit8 v10, v12, 0x1
+
+    goto :goto_3
+
+    :cond_3
+    if-lez v13, :cond_5
+
+    add-int/lit8 v9, v12, -0x1
+
+    goto :goto_3
+
+    :cond_4
+    add-int/lit8 v10, v10, 0x1
+
+    neg-int v12, v10
+
+    :cond_5
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    invoke-interface {v11, v12, v4}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
+
+    add-int/lit8 v3, v3, 0x1
+
+    move v4, v6
+
+    goto :goto_2
+
+    :cond_6
+    new-instance p1, Ljava/lang/IndexOutOfBoundsException;
+
+    const-string v0, "toIndex ("
+
+    const-string v1, ") is greater than size ("
+
+    invoke-static {v0, v9, v1, v10, v12}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IndexOutOfBoundsException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_7
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "fromIndex ("
+
+    const-string v2, ") is greater than toIndex ("
+
+    invoke-static {v0, v1, v2, v9, v12}, Lf/e/b/a/a;->k(Ljava/lang/String;ILjava/lang/String;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_8
+    move-object v0, v8
+
+    check-cast v0, Ljava/util/ArrayList;
+
+    invoke-virtual {v0, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lokio/ByteString;
+
+    invoke-virtual {v3}, Lokio/ByteString;->h()I
+
+    move-result v3
+
+    if-lez v3, :cond_9
+
+    const/4 v3, 0x1
+
+    goto :goto_4
+
+    :cond_9
+    const/4 v3, 0x0
+
+    :goto_4
+    if-eqz v3, :cond_12
+
+    const/4 v3, 0x0
+
+    :goto_5
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+    move-result v4
+
+    if-ge v3, v4, :cond_10
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lokio/ByteString;
+
+    add-int/lit8 v5, v3, 0x1
+
+    move v6, v5
+
+    :goto_6
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+    move-result v7
+
+    if-ge v6, v7, :cond_f
+
+    invoke-virtual {v0, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Lokio/ByteString;
+
+    if-eqz v7, :cond_e
+
+    const-string v9, "prefix"
+
+    invoke-static {v4, v9}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v7, v4}, Lp0/y/a;->n(Lokio/ByteString;Lokio/ByteString;)Z
+
+    move-result v9
+
+    if-nez v9, :cond_a
+
+    goto :goto_8
+
+    :cond_a
+    invoke-virtual {v7}, Lokio/ByteString;->h()I
+
+    move-result v9
+
+    invoke-virtual {v4}, Lokio/ByteString;->h()I
+
+    move-result v10
+
+    if-eq v9, v10, :cond_b
+
+    const/4 v9, 0x1
+
+    goto :goto_7
+
+    :cond_b
+    const/4 v9, 0x0
+
+    :goto_7
+    if-eqz v9, :cond_d
+
+    invoke-interface {v11, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v7
+
+    check-cast v7, Ljava/lang/Number;
+
+    invoke-virtual {v7}, Ljava/lang/Number;->intValue()I
+
+    move-result v7
+
+    invoke-interface {v11, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v9
+
+    check-cast v9, Ljava/lang/Number;
+
+    invoke-virtual {v9}, Ljava/lang/Number;->intValue()I
+
+    move-result v9
+
+    if-le v7, v9, :cond_c
+
+    invoke-virtual {v0, v6}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
+
+    invoke-interface {v11, v6}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+
+    goto :goto_6
+
+    :cond_c
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_6
+
+    :cond_d
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v0, "duplicate option: "
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_e
+    throw v2
+
+    :cond_f
+    :goto_8
+    move v3, v5
+
+    goto :goto_5
+
+    :cond_10
+    new-instance v12, Lp0/e;
+
+    invoke-direct {v12}, Lp0/e;-><init>()V
+
+    const-wide/16 v4, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v9, 0x0
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+    move-result v10
+
+    move-object v3, p0
+
+    move-object v6, v12
+
+    invoke-virtual/range {v3 .. v11}, Lp0/n$a;->a(JLp0/e;ILjava/util/List;IILjava/util/List;)V
+
+    invoke-virtual {p0, v12}, Lp0/n$a;->b(Lp0/e;)J
+
+    move-result-wide v3
+
+    long-to-int v0, v3
+
+    new-array v0, v0, [I
+
+    :goto_9
+    invoke-virtual {v12}, Lp0/e;->J()Z
+
+    move-result v3
+
+    if-nez v3, :cond_11
+
+    add-int/lit8 v3, v1, 0x1
+
+    invoke-virtual {v12}, Lp0/e;->readInt()I
+
+    move-result v4
+
+    aput v4, v0, v1
+
+    move v1, v3
+
+    goto :goto_9
+
+    :cond_11
+    new-instance v1, Lp0/n;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->clone()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Lokio/ByteString;
+
+    invoke-direct {v1, p1, v0, v2}, Lp0/n;-><init>([Lokio/ByteString;[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    return-object v1
+
+    :cond_12
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "the empty byte string is not a supported option"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_13
+    new-instance p1, Lkotlin/TypeCastException;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Array<T>"
+
+    invoke-direct {p1, v0}, Lkotlin/TypeCastException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :array_0
+    .array-data 4
+        0x0
+        -0x1
+    .end array-data
+.end method
diff --git a/com.discord/smali_classes2/p0/n.smali b/com.discord/smali_classes2/p0/n.smali
new file mode 100644
index 0000000000..63445b55e7
--- /dev/null
+++ b/com.discord/smali_classes2/p0/n.smali
@@ -0,0 +1,199 @@
+.class public final Lp0/n;
+.super Ljava/util/AbstractList;
+.source "Options.kt"
+
+# interfaces
+.implements Ljava/util/RandomAccess;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lp0/n$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/util/AbstractList<",
+        "Lokio/ByteString;",
+        ">;",
+        "Ljava/util/RandomAccess;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:Lp0/n$a;
+
+
+# instance fields
+.field public final d:[Lokio/ByteString;
+
+.field public final e:[I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lp0/n$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lp0/n$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lp0/n;->f:Lp0/n$a;
+
+    return-void
+.end method
+
+.method public constructor <init>([Lokio/ByteString;[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
+
+    iput-object p1, p0, Lp0/n;->d:[Lokio/ByteString;
+
+    iput-object p2, p0, Lp0/n;->e:[I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bridge contains(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    instance-of v0, p1, Lokio/ByteString;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lokio/ByteString;
+
+    invoke-super {p0, p1}, Ljava/util/AbstractList;->contains(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public get(I)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lp0/n;->d:[Lokio/ByteString;
+
+    aget-object p1, v0, p1
+
+    return-object p1
+.end method
+
+.method public final bridge indexOf(Ljava/lang/Object;)I
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    instance-of v0, p1, Lokio/ByteString;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lokio/ByteString;
+
+    invoke-super {p0, p1}, Ljava/util/AbstractList;->indexOf(Ljava/lang/Object;)I
+
+    move-result p1
+
+    return p1
+
+    :cond_1
+    const/4 p1, -0x1
+
+    return p1
+.end method
+
+.method public final bridge lastIndexOf(Ljava/lang/Object;)I
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    instance-of v0, p1, Lokio/ByteString;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lokio/ByteString;
+
+    invoke-super {p0, p1}, Ljava/util/AbstractList;->lastIndexOf(Ljava/lang/Object;)I
+
+    move-result p1
+
+    return p1
+
+    :cond_1
+    const/4 p1, -0x1
+
+    return p1
+.end method
+
+.method public final bridge remove(Ljava/lang/Object;)Z
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    instance-of v0, p1, Lokio/ByteString;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    check-cast p1, Lokio/ByteString;
+
+    invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    return p1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public final size()I
+    .locals 1
+
+    iget-object v0, p0, Lp0/n;->d:[Lokio/ByteString;
+
+    array-length v0, v0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/p0/o.smali b/com.discord/smali_classes2/p0/o.smali
new file mode 100644
index 0000000000..abc41ee285
--- /dev/null
+++ b/com.discord/smali_classes2/p0/o.smali
@@ -0,0 +1,182 @@
+.class public final Lp0/o;
+.super Ljava/lang/Object;
+.source "Okio.kt"
+
+# interfaces
+.implements Lp0/u;
+
+
+# instance fields
+.field public final d:Ljava/io/OutputStream;
+
+.field public final e:Lp0/x;
+
+
+# direct methods
+.method public constructor <init>(Ljava/io/OutputStream;Lp0/x;)V
+    .locals 1
+
+    const-string v0, "out"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "timeout"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/o;->d:Ljava/io/OutputStream;
+
+    iput-object p2, p0, Lp0/o;->e:Lp0/x;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public close()V
+    .locals 1
+
+    iget-object v0, p0, Lp0/o;->d:Ljava/io/OutputStream;
+
+    invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
+
+    return-void
+.end method
+
+.method public flush()V
+    .locals 1
+
+    iget-object v0, p0, Lp0/o;->d:Ljava/io/OutputStream;
+
+    invoke-virtual {v0}, Ljava/io/OutputStream;->flush()V
+
+    return-void
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/o;->e:Lp0/x;
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "sink("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lp0/o;->d:Ljava/io/OutputStream;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 7
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-wide v1, p1, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    move-wide v5, p2
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
+
+    :cond_0
+    :goto_0
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-lez v2, :cond_2
+
+    iget-object v0, p0, Lp0/o;->e:Lp0/x;
+
+    invoke-virtual {v0}, Lp0/x;->f()V
+
+    iget-object v0, p1, Lp0/e;->d:Lp0/r;
+
+    if-eqz v0, :cond_1
+
+    iget v1, v0, Lp0/r;->c:I
+
+    iget v2, v0, Lp0/r;->b:I
+
+    sub-int/2addr v1, v2
+
+    int-to-long v1, v1
+
+    invoke-static {p2, p3, v1, v2}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v1
+
+    long-to-int v2, v1
+
+    iget-object v1, p0, Lp0/o;->d:Ljava/io/OutputStream;
+
+    iget-object v3, v0, Lp0/r;->a:[B
+
+    iget v4, v0, Lp0/r;->b:I
+
+    invoke-virtual {v1, v3, v4, v2}, Ljava/io/OutputStream;->write([BII)V
+
+    iget v1, v0, Lp0/r;->b:I
+
+    add-int/2addr v1, v2
+
+    iput v1, v0, Lp0/r;->b:I
+
+    int-to-long v2, v2
+
+    sub-long/2addr p2, v2
+
+    iget-wide v4, p1, Lp0/e;->e:J
+
+    sub-long/2addr v4, v2
+
+    iput-wide v4, p1, Lp0/e;->e:J
+
+    iget v2, v0, Lp0/r;->c:I
+
+    if-ne v1, v2, :cond_0
+
+    invoke-virtual {v0}, Lp0/r;->a()Lp0/r;
+
+    move-result-object v1
+
+    iput-object v1, p1, Lp0/e;->d:Lp0/r;
+
+    invoke-static {v0}, Lp0/s;->a(Lp0/r;)V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/p0/p.smali b/com.discord/smali_classes2/p0/p.smali
new file mode 100644
index 0000000000..de905f9e36
--- /dev/null
+++ b/com.discord/smali_classes2/p0/p.smali
@@ -0,0 +1,701 @@
+.class public final Lp0/p;
+.super Ljava/lang/Object;
+.source "RealBufferedSink.kt"
+
+# interfaces
+.implements Lokio/BufferedSink;
+
+
+# instance fields
+.field public final d:Lp0/e;
+
+.field public e:Z
+
+.field public final f:Lp0/u;
+
+
+# direct methods
+.method public constructor <init>(Lp0/u;)V
+    .locals 1
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/p;->f:Lp0/u;
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lp0/p;->d:Lp0/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public Q0(J)Lokio/BufferedSink;
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2}, Lp0/e;->K(J)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public a()Lokio/BufferedSink;
+    .locals 5
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->c()J
+
+    move-result-wide v0
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-lez v4, :cond_0
+
+    iget-object v2, p0, Lp0/p;->f:Lp0/u;
+
+    iget-object v3, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-interface {v2, v3, v0, v1}, Lp0/u;->write(Lp0/e;J)V
+
+    :cond_0
+    return-object p0
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "closed"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public a0(Ljava/lang/String;)Lokio/BufferedSink;
+    .locals 1
+
+    const-string v0, "string"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->O(Ljava/lang/String;)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public close()V
+    .locals 6
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :try_start_0
+    iget-object v1, p0, Lp0/p;->d:Lp0/e;
+
+    iget-wide v1, v1, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-lez v5, :cond_1
+
+    iget-object v1, p0, Lp0/p;->f:Lp0/u;
+
+    iget-object v2, p0, Lp0/p;->d:Lp0/e;
+
+    iget-object v3, p0, Lp0/p;->d:Lp0/e;
+
+    iget-wide v3, v3, Lp0/e;->e:J
+
+    invoke-interface {v1, v2, v3, v4}, Lp0/u;->write(Lp0/e;J)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    :cond_1
+    :goto_0
+    :try_start_1
+    iget-object v1, p0, Lp0/p;->f:Lp0/u;
+
+    invoke-interface {v1}, Lp0/u;->close()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    goto :goto_1
+
+    :catchall_1
+    move-exception v1
+
+    if-nez v0, :cond_2
+
+    move-object v0, v1
+
+    :cond_2
+    :goto_1
+    const/4 v1, 0x1
+
+    iput-boolean v1, p0, Lp0/p;->e:Z
+
+    if-nez v0, :cond_3
+
+    return-void
+
+    :cond_3
+    throw v0
+.end method
+
+.method public flush()V
+    .locals 6
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    iget-wide v1, v0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-lez v5, :cond_0
+
+    iget-object v3, p0, Lp0/p;->f:Lp0/u;
+
+    invoke-interface {v3, v0, v1, v2}, Lp0/u;->write(Lp0/e;J)V
+
+    :cond_0
+    iget-object v0, p0, Lp0/p;->f:Lp0/u;
+
+    invoke-interface {v0}, Lp0/u;->flush()V
+
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "closed"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public h()Lp0/e;
+    .locals 1
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    return-object v0
+.end method
+
+.method public i0(Lp0/w;)J
+    .locals 7
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    :goto_0
+    iget-object v2, p0, Lp0/p;->d:Lp0/e;
+
+    const/16 v3, 0x2000
+
+    int-to-long v3, v3
+
+    invoke-interface {p1, v2, v3, v4}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v2
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    return-wide v0
+
+    :cond_0
+    add-long/2addr v0, v2
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    goto :goto_0
+.end method
+
+.method public isOpen()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    return v0
+.end method
+
+.method public j0(J)Lokio/BufferedSink;
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2}, Lp0/e;->L(J)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/p;->f:Lp0/u;
+
+    invoke-interface {v0}, Lp0/u;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "buffer("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lp0/p;->f:Lp0/u;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public write(Ljava/nio/ByteBuffer;)I
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->write(Ljava/nio/ByteBuffer;)I
+
+    move-result p1
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public write([B)Lokio/BufferedSink;
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->E([B)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public write([BII)Lokio/BufferedSink;
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->G([BII)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public write(Lp0/e;J)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->write(Lp0/e;J)V
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public writeByte(I)Lokio/BufferedSink;
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->I(I)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public writeInt(I)Lokio/BufferedSink;
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->M(I)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public writeShort(I)Lokio/BufferedSink;
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->N(I)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public y()Lokio/BufferedSink;
+    .locals 6
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    iget-wide v1, v0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-lez v5, :cond_0
+
+    iget-object v3, p0, Lp0/p;->f:Lp0/u;
+
+    invoke-interface {v3, v0, v1, v2}, Lp0/u;->write(Lp0/e;J)V
+
+    :cond_0
+    return-object p0
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "closed"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public y0(Lokio/ByteString;)Lokio/BufferedSink;
+    .locals 1
+
+    const-string v0, "byteString"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/p;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/p;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->D(Lokio/ByteString;)Lp0/e;
+
+    invoke-virtual {p0}, Lp0/p;->a()Lokio/BufferedSink;
+
+    return-object p0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/p0/q$a.smali b/com.discord/smali_classes2/p0/q$a.smali
new file mode 100644
index 0000000000..00161189b7
--- /dev/null
+++ b/com.discord/smali_classes2/p0/q$a.smali
@@ -0,0 +1,242 @@
+.class public final Lp0/q$a;
+.super Ljava/io/InputStream;
+.source "RealBufferedSource.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lp0/q;->W0()Ljava/io/InputStream;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lp0/q;
+
+
+# direct methods
+.method public constructor <init>(Lp0/q;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lp0/q$a;->d:Lp0/q;
+
+    invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public available()I
+    .locals 4
+
+    iget-object v0, p0, Lp0/q$a;->d:Lp0/q;
+
+    iget-boolean v1, v0, Lp0/q;->e:Z
+
+    if-nez v1, :cond_0
+
+    iget-object v0, v0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v0, v0, Lp0/e;->e:J
+
+    const v2, 0x7fffffff
+
+    int-to-long v2, v2
+
+    invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    return v1
+
+    :cond_0
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public close()V
+    .locals 1
+
+    iget-object v0, p0, Lp0/q$a;->d:Lp0/q;
+
+    invoke-virtual {v0}, Lp0/q;->close()V
+
+    return-void
+.end method
+
+.method public read()I
+    .locals 7
+
+    iget-object v0, p0, Lp0/q$a;->d:Lp0/q;
+
+    iget-boolean v1, v0, Lp0/q;->e:Z
+
+    if-nez v1, :cond_1
+
+    iget-object v1, v0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v2, v1, Lp0/e;->e:J
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    iget-object v0, v0, Lp0/q;->f:Lp0/w;
+
+    const/16 v2, 0x2000
+
+    int-to-long v2, v2
+
+    invoke-interface {v0, v1, v2, v3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v0
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, -0x1
+
+    return v0
+
+    :cond_0
+    iget-object v0, p0, Lp0/q$a;->d:Lp0/q;
+
+    iget-object v0, v0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->readByte()B
+
+    move-result v0
+
+    and-int/lit16 v0, v0, 0xff
+
+    return v0
+
+    :cond_1
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "closed"
+
+    invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public read([BII)I
+    .locals 7
+
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/q$a;->d:Lp0/q;
+
+    iget-boolean v0, v0, Lp0/q;->e:Z
+
+    if-nez v0, :cond_1
+
+    array-length v0, p1
+
+    int-to-long v1, v0
+
+    int-to-long v3, p2
+
+    int-to-long v5, p3
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
+
+    iget-object v0, p0, Lp0/q$a;->d:Lp0/q;
+
+    iget-object v1, v0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v2, v1, Lp0/e;->e:J
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    iget-object v0, v0, Lp0/q;->f:Lp0/w;
+
+    const/16 v2, 0x2000
+
+    int-to-long v2, v2
+
+    invoke-interface {v0, v1, v2, v3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v0
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 p1, -0x1
+
+    return p1
+
+    :cond_0
+    iget-object v0, p0, Lp0/q$a;->d:Lp0/q;
+
+    iget-object v0, v0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->read([BII)I
+
+    move-result p1
+
+    return p1
+
+    :cond_1
+    new-instance p1, Ljava/io/IOException;
+
+    const-string p2, "closed"
+
+    invoke-direct {p1, p2}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lp0/q$a;->d:Lp0/q;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ".inputStream()"
+
+    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_classes2/p0/q.smali b/com.discord/smali_classes2/p0/q.smali
new file mode 100644
index 0000000000..c3c0824d1b
--- /dev/null
+++ b/com.discord/smali_classes2/p0/q.smali
@@ -0,0 +1,1510 @@
+.class public final Lp0/q;
+.super Ljava/lang/Object;
+.source "RealBufferedSource.kt"
+
+# interfaces
+.implements Lp0/g;
+
+
+# instance fields
+.field public final d:Lp0/e;
+
+.field public e:Z
+
+.field public final f:Lp0/w;
+
+
+# direct methods
+.method public constructor <init>(Lp0/w;)V
+    .locals 1
+
+    const-string v0, "source"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/q;->f:Lp0/w;
+
+    new-instance p1, Lp0/e;
+
+    invoke-direct {p1}, Lp0/e;-><init>()V
+
+    iput-object p1, p0, Lp0/q;->d:Lp0/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 6
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_3
+
+    iget-boolean v2, p0, Lp0/q;->e:Z
+
+    xor-int/lit8 v2, v2, 0x1
+
+    if-eqz v2, :cond_2
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v3, v2, Lp0/e;->e:J
+
+    cmp-long v5, v3, v0
+
+    if-nez v5, :cond_1
+
+    iget-object v0, p0, Lp0/q;->f:Lp0/w;
+
+    const/16 v1, 0x2000
+
+    int-to-long v3, v1
+
+    invoke-interface {v0, v2, v3, v4}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v0
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_1
+
+    return-wide v2
+
+    :cond_1
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v0, v0, Lp0/e;->e:J
+
+    invoke-static {p2, p3, v0, v1}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p2
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+
+    return-wide p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    const-string p1, "byteCount < 0: "
+
+    invoke-static {p1, p2, p3}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public F0(Lp0/u;)J
+    .locals 9
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    move-wide v2, v0
+
+    :cond_0
+    :goto_0
+    iget-object v4, p0, Lp0/q;->f:Lp0/w;
+
+    iget-object v5, p0, Lp0/q;->d:Lp0/e;
+
+    const/16 v6, 0x2000
+
+    int-to-long v6, v6
+
+    invoke-interface {v4, v5, v6, v7}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v4
+
+    const-wide/16 v6, -0x1
+
+    cmp-long v8, v4, v6
+
+    if-eqz v8, :cond_1
+
+    iget-object v4, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v4}, Lp0/e;->c()J
+
+    move-result-wide v4
+
+    cmp-long v6, v4, v0
+
+    if-lez v6, :cond_0
+
+    add-long/2addr v2, v4
+
+    iget-object v6, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-interface {p1, v6, v4, v5}, Lp0/u;->write(Lp0/e;J)V
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v4, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v5, v4, Lp0/e;->e:J
+
+    cmp-long v7, v5, v0
+
+    if-lez v7, :cond_2
+
+    add-long/2addr v2, v5
+
+    invoke-interface {p1, v4, v5, v6}, Lp0/u;->write(Lp0/e;J)V
+
+    :cond_2
+    return-wide v2
+.end method
+
+.method public J()Z
+    .locals 6
+
+    iget-boolean v0, p0, Lp0/q;->e:Z
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->J()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/q;->f:Lp0/w;
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    const/16 v3, 0x2000
+
+    int-to-long v3, v3
+
+    invoke-interface {v0, v2, v3, v4}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v2
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v0, v2, v4
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    return v1
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "closed"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public P0(J)V
+    .locals 0
+
+    invoke-virtual {p0, p1, p2}, Lp0/q;->m(J)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+.end method
+
+.method public Q(Lp0/e;J)V
+    .locals 1
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    invoke-virtual {p0, p2, p3}, Lp0/q;->m(J)Z
+
+    move-result v0
+    :try_end_0
+    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2, p3}, Lp0/e;->Q(Lp0/e;J)V
+
+    return-void
+
+    :cond_0
+    :try_start_1
+    new-instance p2, Ljava/io/EOFException;
+
+    invoke-direct {p2}, Ljava/io/EOFException;-><init>()V
+
+    throw p2
+    :try_end_1
+    .catch Ljava/io/EOFException; {:try_start_1 .. :try_end_1} :catch_0
+
+    :catch_0
+    move-exception p2
+
+    iget-object p3, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {p1, p3}, Lp0/e;->i0(Lp0/w;)J
+
+    throw p2
+.end method
+
+.method public S(Lokio/ByteString;)J
+    .locals 10
+
+    const-string v0, "targetBytes"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/q;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_2
+
+    const-wide/16 v0, 0x0
+
+    :goto_0
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v2, p1, v0, v1}, Lp0/e;->g(Lokio/ByteString;J)J
+
+    move-result-wide v2
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v6, v2, v4
+
+    if-eqz v6, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v6, v2, Lp0/e;->e:J
+
+    iget-object v3, p0, Lp0/q;->f:Lp0/w;
+
+    const/16 v8, 0x2000
+
+    int-to-long v8, v8
+
+    invoke-interface {v3, v2, v8, v9}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v2
+
+    cmp-long v8, v2, v4
+
+    if-nez v8, :cond_1
+
+    move-wide v2, v4
+
+    :goto_1
+    return-wide v2
+
+    :cond_1
+    invoke-static {v0, v1, v6, v7}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v0
+
+    goto :goto_0
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public T(J)Ljava/lang/String;
+    .locals 13
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_4
+
+    const-wide/16 v0, 0x1
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    cmp-long v4, p1, v2
+
+    if-nez v4, :cond_1
+
+    move-wide v4, v2
+
+    goto :goto_1
+
+    :cond_1
+    add-long v4, p1, v0
+
+    :goto_1
+    const/16 v6, 0xa
+
+    int-to-byte v12, v6
+
+    const-wide/16 v8, 0x0
+
+    move-object v6, p0
+
+    move v7, v12
+
+    move-wide v10, v4
+
+    invoke-virtual/range {v6 .. v11}, Lp0/q;->a(BJJ)J
+
+    move-result-wide v6
+
+    const-wide/16 v8, -0x1
+
+    cmp-long v10, v6, v8
+
+    if-eqz v10, :cond_2
+
+    iget-object p1, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {p1, v6, v7}, Lp0/e;->z(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_2
+    cmp-long v6, v4, v2
+
+    if-gez v6, :cond_3
+
+    invoke-virtual {p0, v4, v5}, Lp0/q;->m(J)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    sub-long v6, v4, v0
+
+    invoke-virtual {v2, v6, v7}, Lp0/e;->e(J)B
+
+    move-result v2
+
+    const/16 v3, 0xd
+
+    int-to-byte v3, v3
+
+    if-ne v2, v3, :cond_3
+
+    add-long/2addr v0, v4
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->m(J)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, v4, v5}, Lp0/e;->e(J)B
+
+    move-result v0
+
+    if-ne v0, v12, :cond_3
+
+    iget-object p1, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {p1, v4, v5}, Lp0/e;->z(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_3
+    new-instance v6, Lp0/e;
+
+    invoke-direct {v6}, Lp0/e;-><init>()V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    const-wide/16 v2, 0x0
+
+    const/16 v1, 0x20
+
+    iget-wide v4, v0, Lp0/e;->e:J
+
+    int-to-long v7, v1
+
+    invoke-static {v7, v8, v4, v5}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v4
+
+    move-object v1, v6
+
+    invoke-virtual/range {v0 .. v5}, Lp0/e;->d(Lp0/e;JJ)Lp0/e;
+
+    new-instance v0, Ljava/io/EOFException;
+
+    const-string v1, "\\n not found: limit="
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v2, v2, Lp0/e;->e:J
+
+    invoke-static {v2, v3, p1, p2}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide p1
+
+    invoke-virtual {v1, p1, p2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string p1, " content="
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v6}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lp0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "\u2026"
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/io/EOFException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    const-string v0, "limit < 0: "
+
+    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public U0()J
+    .locals 6
+
+    const-wide/16 v0, 0x1
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->P0(J)V
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    add-int/lit8 v2, v1, 0x1
+
+    int-to-long v3, v2
+
+    invoke-virtual {p0, v3, v4}, Lp0/q;->m(J)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_5
+
+    iget-object v3, p0, Lp0/q;->d:Lp0/e;
+
+    int-to-long v4, v1
+
+    invoke-virtual {v3, v4, v5}, Lp0/e;->e(J)B
+
+    move-result v3
+
+    const/16 v4, 0x30
+
+    int-to-byte v4, v4
+
+    if-lt v3, v4, :cond_0
+
+    const/16 v4, 0x39
+
+    int-to-byte v4, v4
+
+    if-le v3, v4, :cond_2
+
+    :cond_0
+    const/16 v4, 0x61
+
+    int-to-byte v4, v4
+
+    if-lt v3, v4, :cond_1
+
+    const/16 v4, 0x66
+
+    int-to-byte v4, v4
+
+    if-le v3, v4, :cond_2
+
+    :cond_1
+    const/16 v4, 0x41
+
+    int-to-byte v4, v4
+
+    if-lt v3, v4, :cond_3
+
+    const/16 v4, 0x46
+
+    int-to-byte v4, v4
+
+    if-le v3, v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    move v1, v2
+
+    goto :goto_0
+
+    :cond_3
+    :goto_1
+    if-eqz v1, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    new-instance v1, Ljava/lang/NumberFormatException;
+
+    const/4 v2, 0x1
+
+    new-array v4, v2, [Ljava/lang/Object;
+
+    invoke-static {v3}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
+
+    move-result-object v3
+
+    aput-object v3, v4, v0
+
+    invoke-static {v4, v2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v2, "Expected leading [0-9a-fA-F] character but was %#x"
+
+    invoke-static {v2, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "java.lang.String.format(format, *args)"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v1, v0}, Ljava/lang/NumberFormatException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_5
+    :goto_2
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->U0()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public W0()Ljava/io/InputStream;
+    .locals 1
+
+    new-instance v0, Lp0/q$a;
+
+    invoke-direct {v0, p0}, Lp0/q$a;-><init>(Lp0/q;)V
+
+    return-object v0
+.end method
+
+.method public X0(Lp0/n;)I
+    .locals 8
+
+    const-string v0, "options"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p0, Lp0/q;->e:Z
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_3
+
+    :cond_0
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, v1}, Lp0/e;->A(Lp0/n;Z)I
+
+    move-result v0
+
+    const/4 v2, -0x2
+
+    const/4 v3, -0x1
+
+    if-eq v0, v2, :cond_2
+
+    if-eq v0, v3, :cond_1
+
+    iget-object p1, p1, Lp0/n;->d:[Lokio/ByteString;
+
+    aget-object p1, p1, v0
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result p1
+
+    iget-object v1, p0, Lp0/q;->d:Lp0/e;
+
+    int-to-long v2, p1
+
+    invoke-virtual {v1, v2, v3}, Lp0/e;->skip(J)V
+
+    return v0
+
+    :cond_1
+    return v3
+
+    :cond_2
+    iget-object v0, p0, Lp0/q;->f:Lp0/w;
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    const/16 v4, 0x2000
+
+    int-to-long v4, v4
+
+    invoke-interface {v0, v2, v4, v5}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v4
+
+    const-wide/16 v6, -0x1
+
+    cmp-long v0, v4, v6
+
+    if-nez v0, :cond_0
+
+    return v3
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "closed"
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public a(BJJ)J
+    .locals 8
+
+    iget-boolean v0, p0, Lp0/q;->e:Z
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_6
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v0, v2, p2
+
+    if-lez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    cmp-long v0, p4, p2
+
+    if-ltz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v1, :cond_5
+
+    :goto_2
+    const-wide/16 v0, -0x1
+
+    cmp-long v2, p2, p4
+
+    if-gez v2, :cond_4
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    move v3, p1
+
+    move-wide v4, p2
+
+    move-wide v6, p4
+
+    invoke-virtual/range {v2 .. v7}, Lp0/e;->f(BJJ)J
+
+    move-result-wide v2
+
+    cmp-long v4, v2, v0
+
+    if-eqz v4, :cond_2
+
+    return-wide v2
+
+    :cond_2
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v3, v2, Lp0/e;->e:J
+
+    cmp-long v5, v3, p4
+
+    if-gez v5, :cond_4
+
+    iget-object v5, p0, Lp0/q;->f:Lp0/w;
+
+    const/16 v6, 0x2000
+
+    int-to-long v6, v6
+
+    invoke-interface {v5, v2, v6, v7}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v5
+
+    cmp-long v2, v5, v0
+
+    if-nez v2, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    invoke-static {p2, p3, v3, v4}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide p2
+
+    goto :goto_2
+
+    :cond_4
+    :goto_3
+    return-wide v0
+
+    :cond_5
+    const-string p1, "fromIndex="
+
+    const-string v0, " toIndex="
+
+    invoke-static {p1, p2, p3, v0}, Lf/e/b/a/a;->G(Ljava/lang/String;JLjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p1
+
+    invoke-virtual {p1, p4, p5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_6
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public b()I
+    .locals 3
+
+    const-wide/16 v0, 0x4
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->P0(J)V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->readInt()I
+
+    move-result v0
+
+    const/high16 v1, -0x1000000
+
+    and-int/2addr v1, v0
+
+    ushr-int/lit8 v1, v1, 0x18
+
+    const/high16 v2, 0xff0000
+
+    and-int/2addr v2, v0
+
+    ushr-int/lit8 v2, v2, 0x8
+
+    or-int/2addr v1, v2
+
+    const v2, 0xff00
+
+    and-int/2addr v2, v0
+
+    shl-int/lit8 v2, v2, 0x8
+
+    or-int/2addr v1, v2
+
+    and-int/lit16 v0, v0, 0xff
+
+    shl-int/lit8 v0, v0, 0x18
+
+    or-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "charset"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    iget-object v1, p0, Lp0/q;->f:Lp0/w;
+
+    invoke-virtual {v0, v1}, Lp0/e;->i0(Lp0/w;)J
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->b0(Ljava/nio/charset/Charset;)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public close()V
+    .locals 3
+
+    iget-boolean v0, p0, Lp0/q;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lp0/q;->e:Z
+
+    iget-object v0, p0, Lp0/q;->f:Lp0/w;
+
+    invoke-interface {v0}, Lp0/w;->close()V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v1, v0, Lp0/e;->e:J
+
+    invoke-virtual {v0, v1, v2}, Lp0/e;->skip(J)V
+
+    return-void
+.end method
+
+.method public h()Lp0/e;
+    .locals 1
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    return-object v0
+.end method
+
+.method public isOpen()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/q;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    return v0
+.end method
+
+.method public m(J)Z
+    .locals 7
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, p1, v2
+
+    if-ltz v4, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_4
+
+    iget-boolean v2, p0, Lp0/q;->e:Z
+
+    xor-int/2addr v2, v1
+
+    if-eqz v2, :cond_3
+
+    :cond_1
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v3, v2, Lp0/e;->e:J
+
+    cmp-long v5, v3, p1
+
+    if-gez v5, :cond_2
+
+    iget-object v3, p0, Lp0/q;->f:Lp0/w;
+
+    const/16 v4, 0x2000
+
+    int-to-long v4, v4
+
+    invoke-interface {v3, v2, v4, v5}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v2
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_1
+
+    return v0
+
+    :cond_2
+    return v1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_4
+    const-string v0, "byteCount < 0: "
+
+    invoke-static {v0, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public o0()Ljava/lang/String;
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->T(J)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public read(Ljava/nio/ByteBuffer;)I
+    .locals 6
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v1, v0, Lp0/e;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_0
+
+    iget-object v1, p0, Lp0/q;->f:Lp0/w;
+
+    const/16 v2, 0x2000
+
+    int-to-long v2, v2
+
+    invoke-interface {v1, v0, v2, v3}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v0
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 p1, -0x1
+
+    return p1
+
+    :cond_0
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->read(Ljava/nio/ByteBuffer;)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public readByte()B
+    .locals 2
+
+    const-wide/16 v0, 0x1
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->P0(J)V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->readByte()B
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public readFully([B)V
+    .locals 8
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :try_start_0
+    array-length v0, p1
+
+    int-to-long v0, v0
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->P0(J)V
+    :try_end_0
+    .catch Ljava/io/EOFException; {:try_start_0 .. :try_end_0} :catch_0
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1}, Lp0/e;->readFully([B)V
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v3, v2, Lp0/e;->e:J
+
+    const-wide/16 v5, 0x0
+
+    cmp-long v7, v3, v5
+
+    if-lez v7, :cond_1
+
+    long-to-int v4, v3
+
+    invoke-virtual {v2, p1, v1, v4}, Lp0/e;->read([BII)I
+
+    move-result v2
+
+    const/4 v3, -0x1
+
+    if-eq v2, v3, :cond_0
+
+    add-int/2addr v1, v2
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_1
+    throw v0
+.end method
+
+.method public readInt()I
+    .locals 2
+
+    const-wide/16 v0, 0x4
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->P0(J)V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->readInt()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public readLong()J
+    .locals 2
+
+    const-wide/16 v0, 0x8
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->P0(J)V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->readLong()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public readShort()S
+    .locals 2
+
+    const-wide/16 v0, 0x2
+
+    invoke-virtual {p0, v0, v1}, Lp0/q;->P0(J)V
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0}, Lp0/e;->readShort()S
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public skip(J)V
+    .locals 6
+
+    iget-boolean v0, p0, Lp0/q;->e:Z
+
+    xor-int/lit8 v0, v0, 0x1
+
+    if-eqz v0, :cond_3
+
+    :goto_0
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_2
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v3, v2, Lp0/e;->e:J
+
+    cmp-long v5, v3, v0
+
+    if-nez v5, :cond_1
+
+    iget-object v0, p0, Lp0/q;->f:Lp0/w;
+
+    const/16 v1, 0x2000
+
+    int-to-long v3, v1
+
+    invoke-interface {v0, v2, v3, v4}, Lp0/w;->B0(Lp0/e;J)J
+
+    move-result-wide v0
+
+    const-wide/16 v2, -0x1
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+
+    :cond_1
+    :goto_1
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    iget-wide v0, v0, Lp0/e;->e:J
+
+    invoke-static {p1, p2, v0, v1}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v2, v0, v1}, Lp0/e;->skip(J)V
+
+    sub-long/2addr p1, v0
+
+    goto :goto_0
+
+    :cond_2
+    return-void
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "closed"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public t0(J)[B
+    .locals 1
+
+    invoke-virtual {p0, p1, p2}, Lp0/q;->m(J)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2}, Lp0/e;->t0(J)[B
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+.end method
+
+.method public timeout()Lp0/x;
+    .locals 1
+
+    iget-object v0, p0, Lp0/q;->f:Lp0/w;
+
+    invoke-interface {v0}, Lp0/w;->timeout()Lp0/x;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "buffer("
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lp0/q;->f:Lp0/w;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public u(J)Lokio/ByteString;
+    .locals 1
+
+    invoke-virtual {p0, p1, p2}, Lp0/q;->m(J)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lp0/q;->d:Lp0/e;
+
+    invoke-virtual {v0, p1, p2}, Lp0/e;->u(J)Lokio/ByteString;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/io/EOFException;
+
+    invoke-direct {p1}, Ljava/io/EOFException;-><init>()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/p0/r.smali b/com.discord/smali_classes2/p0/r.smali
new file mode 100644
index 0000000000..e3fa9096f2
--- /dev/null
+++ b/com.discord/smali_classes2/p0/r.smali
@@ -0,0 +1,275 @@
+.class public final Lp0/r;
+.super Ljava/lang/Object;
+.source "Segment.kt"
+
+
+# instance fields
+.field public final a:[B
+
+.field public b:I
+
+.field public c:I
+
+.field public d:Z
+
+.field public e:Z
+
+.field public f:Lp0/r;
+
+.field public g:Lp0/r;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/16 v0, 0x2000
+
+    new-array v0, v0, [B
+
+    iput-object v0, p0, Lp0/r;->a:[B
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lp0/r;->e:Z
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lp0/r;->d:Z
+
+    return-void
+.end method
+
+.method public constructor <init>([BIIZZ)V
+    .locals 1
+
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lp0/r;->a:[B
+
+    iput p2, p0, Lp0/r;->b:I
+
+    iput p3, p0, Lp0/r;->c:I
+
+    iput-boolean p4, p0, Lp0/r;->d:Z
+
+    iput-boolean p5, p0, Lp0/r;->e:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()Lp0/r;
+    .locals 4
+
+    iget-object v0, p0, Lp0/r;->f:Lp0/r;
+
+    const/4 v1, 0x0
+
+    if-eq v0, p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    :goto_0
+    iget-object v2, p0, Lp0/r;->g:Lp0/r;
+
+    if-eqz v2, :cond_2
+
+    iget-object v3, p0, Lp0/r;->f:Lp0/r;
+
+    iput-object v3, v2, Lp0/r;->f:Lp0/r;
+
+    iget-object v3, p0, Lp0/r;->f:Lp0/r;
+
+    if-eqz v3, :cond_1
+
+    iput-object v2, v3, Lp0/r;->g:Lp0/r;
+
+    iput-object v1, p0, Lp0/r;->f:Lp0/r;
+
+    iput-object v1, p0, Lp0/r;->g:Lp0/r;
+
+    return-object v0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+
+    :cond_2
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v1
+.end method
+
+.method public final b(Lp0/r;)Lp0/r;
+    .locals 1
+
+    const-string v0, "segment"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p0, p1, Lp0/r;->g:Lp0/r;
+
+    iget-object v0, p0, Lp0/r;->f:Lp0/r;
+
+    iput-object v0, p1, Lp0/r;->f:Lp0/r;
+
+    iget-object v0, p0, Lp0/r;->f:Lp0/r;
+
+    if-eqz v0, :cond_0
+
+    iput-object p1, v0, Lp0/r;->g:Lp0/r;
+
+    iput-object p1, p0, Lp0/r;->f:Lp0/r;
+
+    return-object p1
+
+    :cond_0
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public final c()Lp0/r;
+    .locals 7
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lp0/r;->d:Z
+
+    new-instance v0, Lp0/r;
+
+    iget-object v2, p0, Lp0/r;->a:[B
+
+    iget v3, p0, Lp0/r;->b:I
+
+    iget v4, p0, Lp0/r;->c:I
+
+    const/4 v5, 0x1
+
+    const/4 v6, 0x0
+
+    move-object v1, v0
+
+    invoke-direct/range {v1 .. v6}, Lp0/r;-><init>([BIIZZ)V
+
+    return-object v0
+.end method
+
+.method public final d(Lp0/r;I)V
+    .locals 4
+
+    const-string v0, "sink"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v0, p1, Lp0/r;->e:Z
+
+    if-eqz v0, :cond_3
+
+    iget v0, p1, Lp0/r;->c:I
+
+    add-int v1, v0, p2
+
+    const/16 v2, 0x2000
+
+    if-le v1, v2, :cond_2
+
+    iget-boolean v1, p1, Lp0/r;->d:Z
+
+    if-nez v1, :cond_1
+
+    add-int v1, v0, p2
+
+    iget v3, p1, Lp0/r;->b:I
+
+    sub-int/2addr v1, v3
+
+    if-gt v1, v2, :cond_0
+
+    iget-object v1, p1, Lp0/r;->a:[B
+
+    sub-int/2addr v0, v3
+
+    const/4 v2, 0x0
+
+    invoke-static {v1, v3, v1, v2, v0}, Lf/n/a/k/a;->f([BI[BII)V
+
+    iget v0, p1, Lp0/r;->c:I
+
+    iget v1, p1, Lp0/r;->b:I
+
+    sub-int/2addr v0, v1
+
+    iput v0, p1, Lp0/r;->c:I
+
+    iput v2, p1, Lp0/r;->b:I
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :cond_2
+    :goto_0
+    iget-object v0, p0, Lp0/r;->a:[B
+
+    iget v1, p0, Lp0/r;->b:I
+
+    iget-object v2, p1, Lp0/r;->a:[B
+
+    iget v3, p1, Lp0/r;->c:I
+
+    invoke-static {v0, v1, v2, v3, p2}, Lf/n/a/k/a;->f([BI[BII)V
+
+    iget v0, p1, Lp0/r;->c:I
+
+    add-int/2addr v0, p2
+
+    iput v0, p1, Lp0/r;->c:I
+
+    iget p1, p0, Lp0/r;->b:I
+
+    add-int/2addr p1, p2
+
+    iput p1, p0, Lp0/r;->b:I
+
+    return-void
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "only owner can write"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/p0/s.smali b/com.discord/smali_classes2/p0/s.smali
new file mode 100644
index 0000000000..c0b8b162bf
--- /dev/null
+++ b/com.discord/smali_classes2/p0/s.smali
@@ -0,0 +1,190 @@
+.class public final Lp0/s;
+.super Ljava/lang/Object;
+.source "SegmentPool.kt"
+
+
+# static fields
+.field public static a:Lp0/r;
+
+.field public static b:J
+
+.field public static final c:Lp0/s;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lp0/s;
+
+    invoke-direct {v0}, Lp0/s;-><init>()V
+
+    sput-object v0, Lp0/s;->c:Lp0/s;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static final a(Lp0/r;)V
+    .locals 9
+
+    const-string v0, "segment"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/r;->f:Lp0/r;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lp0/r;->g:Lp0/r;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_3
+
+    iget-boolean v0, p0, Lp0/r;->d:Z
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    sget-object v0, Lp0/s;->c:Lp0/s;
+
+    monitor-enter v0
+
+    :try_start_0
+    sget-wide v2, Lp0/s;->b:J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/16 v4, 0x2000
+
+    int-to-long v4, v4
+
+    add-long/2addr v2, v4
+
+    const-wide/32 v6, 0x10000
+
+    cmp-long v8, v2, v6
+
+    if-lez v8, :cond_2
+
+    monitor-exit v0
+
+    return-void
+
+    :cond_2
+    :try_start_1
+    sget-wide v2, Lp0/s;->b:J
+
+    add-long/2addr v2, v4
+
+    sput-wide v2, Lp0/s;->b:J
+
+    sget-object v2, Lp0/s;->a:Lp0/r;
+
+    iput-object v2, p0, Lp0/r;->f:Lp0/r;
+
+    iput v1, p0, Lp0/r;->c:I
+
+    iput v1, p0, Lp0/r;->b:I
+
+    sput-object p0, Lp0/s;->a:Lp0/r;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception p0
+
+    monitor-exit v0
+
+    throw p0
+
+    :cond_3
+    const-string p0, "Failed requirement."
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static final b()Lp0/r;
+    .locals 6
+
+    sget-object v0, Lp0/s;->c:Lp0/s;
+
+    monitor-enter v0
+
+    :try_start_0
+    sget-object v1, Lp0/s;->a:Lp0/r;
+
+    if-eqz v1, :cond_0
+
+    iget-object v2, v1, Lp0/r;->f:Lp0/r;
+
+    sput-object v2, Lp0/s;->a:Lp0/r;
+
+    const/4 v2, 0x0
+
+    iput-object v2, v1, Lp0/r;->f:Lp0/r;
+
+    sget-wide v2, Lp0/s;->b:J
+
+    const/16 v4, 0x2000
+
+    int-to-long v4, v4
+
+    sub-long/2addr v2, v4
+
+    sput-wide v2, Lp0/s;->b:J
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-object v1
+
+    :cond_0
+    monitor-exit v0
+
+    new-instance v0, Lp0/r;
+
+    invoke-direct {v0}, Lp0/r;-><init>()V
+
+    return-object v0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/p0/t.smali b/com.discord/smali_classes2/p0/t.smali
new file mode 100644
index 0000000000..506d840bd1
--- /dev/null
+++ b/com.discord/smali_classes2/p0/t.smali
@@ -0,0 +1,787 @@
+.class public final Lp0/t;
+.super Lokio/ByteString;
+.source "SegmentedByteString.kt"
+
+
+# instance fields
+.field public final transient h:[[B
+
+.field public final transient i:[I
+
+
+# direct methods
+.method public constructor <init>([[B[ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    sget-object p3, Lokio/ByteString;->f:Lokio/ByteString;
+
+    iget-object p3, p3, Lokio/ByteString;->data:[B
+
+    invoke-direct {p0, p3}, Lokio/ByteString;-><init>([B)V
+
+    iput-object p1, p0, Lp0/t;->h:[[B
+
+    iput-object p2, p0, Lp0/t;->i:[I
+
+    return-void
+.end method
+
+.method private final writeReplace()Ljava/lang/Object;
+    .locals 1
+
+    invoke-virtual {p0}, Lp0/t;->s()Lokio/ByteString;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-ne p1, p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v2, p1, Lokio/ByteString;
+
+    if-eqz v2, :cond_1
+
+    check-cast p1, Lokio/ByteString;
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v2
+
+    invoke-virtual {p0}, Lokio/ByteString;->h()I
+
+    move-result v3
+
+    if-ne v2, v3, :cond_1
+
+    invoke-virtual {p0}, Lokio/ByteString;->h()I
+
+    move-result v2
+
+    invoke-virtual {p0, v1, p1, v1, v2}, Lp0/t;->l(ILokio/ByteString;II)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public f(Ljava/lang/String;)Lokio/ByteString;
+    .locals 6
+
+    const-string v0, "algorithm"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/security/MessageDigest;->getInstance(Ljava/lang/String;)Ljava/security/MessageDigest;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lp0/t;->h:[[B
+
+    array-length v0, v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_0
+
+    iget-object v3, p0, Lp0/t;->i:[I
+
+    add-int v4, v0, v1
+
+    aget v4, v3, v4
+
+    aget v3, v3, v1
+
+    iget-object v5, p0, Lp0/t;->h:[[B
+
+    aget-object v5, v5, v1
+
+    sub-int v2, v3, v2
+
+    invoke-virtual {p1, v5, v4, v2}, Ljava/security/MessageDigest;->update([BII)V
+
+    add-int/lit8 v1, v1, 0x1
+
+    move v2, v3
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lokio/ByteString;
+
+    invoke-virtual {p1}, Ljava/security/MessageDigest;->digest()[B
+
+    move-result-object p1
+
+    const-string v1, "digest.digest()"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, p1}, Lokio/ByteString;-><init>([B)V
+
+    return-object v0
+.end method
+
+.method public h()I
+    .locals 2
+
+    iget-object v0, p0, Lp0/t;->i:[I
+
+    iget-object v1, p0, Lp0/t;->h:[[B
+
+    array-length v1, v1
+
+    add-int/lit8 v1, v1, -0x1
+
+    aget v0, v0, v1
+
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 8
+
+    iget v0, p0, Lokio/ByteString;->d:I
+
+    if-eqz v0, :cond_0
+
+    return v0
+
+    :cond_0
+    iget-object v0, p0, Lp0/t;->h:[[B
+
+    array-length v0, v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    :goto_0
+    if-ge v1, v0, :cond_2
+
+    iget-object v4, p0, Lp0/t;->i:[I
+
+    add-int v5, v0, v1
+
+    aget v5, v4, v5
+
+    aget v4, v4, v1
+
+    iget-object v6, p0, Lp0/t;->h:[[B
+
+    aget-object v6, v6, v1
+
+    sub-int v2, v4, v2
+
+    add-int/2addr v2, v5
+
+    :goto_1
+    if-ge v5, v2, :cond_1
+
+    mul-int/lit8 v3, v3, 0x1f
+
+    aget-byte v7, v6, v5
+
+    add-int/2addr v3, v7
+
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    add-int/lit8 v1, v1, 0x1
+
+    move v2, v4
+
+    goto :goto_0
+
+    :cond_2
+    iput v3, p0, Lokio/ByteString;->d:I
+
+    return v3
+.end method
+
+.method public i()Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p0}, Lp0/t;->s()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lp0/y/a;->i(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public j()[B
+    .locals 1
+
+    invoke-virtual {p0}, Lp0/t;->r()[B
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public k(I)B
+    .locals 7
+
+    iget-object v0, p0, Lp0/t;->i:[I
+
+    iget-object v1, p0, Lp0/t;->h:[[B
+
+    array-length v1, v1
+
+    add-int/lit8 v1, v1, -0x1
+
+    aget v0, v0, v1
+
+    int-to-long v1, v0
+
+    int-to-long v3, p1
+
+    const-wide/16 v5, 0x1
+
+    invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->q(JJJ)V
+
+    invoke-virtual {p0, p1}, Lp0/t;->q(I)I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v1, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, p0, Lp0/t;->i:[I
+
+    add-int/lit8 v2, v0, -0x1
+
+    aget v1, v1, v2
+
+    :goto_0
+    iget-object v2, p0, Lp0/t;->i:[I
+
+    iget-object v3, p0, Lp0/t;->h:[[B
+
+    array-length v4, v3
+
+    add-int/2addr v4, v0
+
+    aget v2, v2, v4
+
+    aget-object v0, v3, v0
+
+    sub-int/2addr p1, v1
+
+    add-int/2addr p1, v2
+
+    aget-byte p1, v0, p1
+
+    return p1
+.end method
+
+.method public l(ILokio/ByteString;II)Z
+    .locals 6
+
+    const-string v0, "other"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    if-ltz p1, :cond_4
+
+    invoke-virtual {p0}, Lokio/ByteString;->h()I
+
+    move-result v1
+
+    sub-int/2addr v1, p4
+
+    if-le p1, v1, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    add-int/2addr p4, p1
+
+    invoke-virtual {p0, p1}, Lp0/t;->q(I)I
+
+    move-result v1
+
+    :goto_0
+    if-ge p1, p4, :cond_3
+
+    if-nez v1, :cond_1
+
+    const/4 v2, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v2, p0, Lp0/t;->i:[I
+
+    add-int/lit8 v3, v1, -0x1
+
+    aget v2, v2, v3
+
+    :goto_1
+    iget-object v3, p0, Lp0/t;->i:[I
+
+    aget v4, v3, v1
+
+    sub-int/2addr v4, v2
+
+    iget-object v5, p0, Lp0/t;->h:[[B
+
+    array-length v5, v5
+
+    add-int/2addr v5, v1
+
+    aget v3, v3, v5
+
+    add-int/2addr v4, v2
+
+    invoke-static {p4, v4}, Ljava/lang/Math;->min(II)I
+
+    move-result v4
+
+    sub-int/2addr v4, p1
+
+    sub-int v2, p1, v2
+
+    add-int/2addr v2, v3
+
+    iget-object v3, p0, Lp0/t;->h:[[B
+
+    aget-object v3, v3, v1
+
+    invoke-virtual {p2, p3, v3, v2, v4}, Lokio/ByteString;->m(I[BII)Z
+
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    return v0
+
+    :cond_2
+    add-int/2addr p3, v4
+
+    add-int/2addr p1, v4
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_4
+    :goto_2
+    return v0
+.end method
+
+.method public m(I[BII)Z
+    .locals 6
+
+    const-string v0, "other"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    if-ltz p1, :cond_4
+
+    invoke-virtual {p0}, Lokio/ByteString;->h()I
+
+    move-result v1
+
+    sub-int/2addr v1, p4
+
+    if-gt p1, v1, :cond_4
+
+    if-ltz p3, :cond_4
+
+    array-length v1, p2
+
+    sub-int/2addr v1, p4
+
+    if-le p3, v1, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    add-int/2addr p4, p1
+
+    invoke-virtual {p0, p1}, Lp0/t;->q(I)I
+
+    move-result v1
+
+    :goto_0
+    if-ge p1, p4, :cond_3
+
+    if-nez v1, :cond_1
+
+    const/4 v2, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v2, p0, Lp0/t;->i:[I
+
+    add-int/lit8 v3, v1, -0x1
+
+    aget v2, v2, v3
+
+    :goto_1
+    iget-object v3, p0, Lp0/t;->i:[I
+
+    aget v4, v3, v1
+
+    sub-int/2addr v4, v2
+
+    iget-object v5, p0, Lp0/t;->h:[[B
+
+    array-length v5, v5
+
+    add-int/2addr v5, v1
+
+    aget v3, v3, v5
+
+    add-int/2addr v4, v2
+
+    invoke-static {p4, v4}, Ljava/lang/Math;->min(II)I
+
+    move-result v4
+
+    sub-int/2addr v4, p1
+
+    sub-int v2, p1, v2
+
+    add-int/2addr v2, v3
+
+    iget-object v3, p0, Lp0/t;->h:[[B
+
+    aget-object v3, v3, v1
+
+    invoke-static {v3, v2, p2, p3, v4}, Lf/n/a/k/a;->e([BI[BII)Z
+
+    move-result v2
+
+    if-nez v2, :cond_2
+
+    return v0
+
+    :cond_2
+    add-int/2addr p3, v4
+
+    add-int/2addr p1, v4
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_4
+    :goto_2
+    return v0
+.end method
+
+.method public n()Lokio/ByteString;
+    .locals 1
+
+    invoke-virtual {p0}, Lp0/t;->s()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lp0/y/a;->o(Lokio/ByteString;)Lokio/ByteString;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public o(Ljava/io/OutputStream;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const-string v0, "out"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/t;->h:[[B
+
+    array-length v0, v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_0
+
+    iget-object v3, p0, Lp0/t;->i:[I
+
+    add-int v4, v0, v1
+
+    aget v4, v3, v4
+
+    aget v3, v3, v1
+
+    iget-object v5, p0, Lp0/t;->h:[[B
+
+    aget-object v5, v5, v1
+
+    sub-int v2, v3, v2
+
+    invoke-virtual {p1, v5, v4, v2}, Ljava/io/OutputStream;->write([BII)V
+
+    add-int/lit8 v1, v1, 0x1
+
+    move v2, v3
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public p(Lp0/e;)V
+    .locals 11
+
+    const-string v0, "buffer"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lp0/t;->h:[[B
+
+    array-length v0, v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_2
+
+    iget-object v3, p0, Lp0/t;->i:[I
+
+    add-int v4, v0, v1
+
+    aget v7, v3, v4
+
+    aget v3, v3, v1
+
+    iget-object v4, p0, Lp0/t;->h:[[B
+
+    aget-object v6, v4, v1
+
+    sub-int v2, v3, v2
+
+    new-instance v4, Lp0/r;
+
+    add-int v8, v7, v2
+
+    const/4 v9, 0x1
+
+    const/4 v10, 0x0
+
+    move-object v5, v4
+
+    invoke-direct/range {v5 .. v10}, Lp0/r;-><init>([BIIZZ)V
+
+    iget-object v2, p1, Lp0/e;->d:Lp0/r;
+
+    if-nez v2, :cond_0
+
+    iput-object v4, v4, Lp0/r;->g:Lp0/r;
+
+    iput-object v4, v4, Lp0/r;->f:Lp0/r;
+
+    iput-object v4, p1, Lp0/e;->d:Lp0/r;
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v2, v2, Lp0/r;->g:Lp0/r;
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2, v4}, Lp0/r;->b(Lp0/r;)Lp0/r;
+
+    :goto_1
+    add-int/lit8 v1, v1, 0x1
+
+    move v2, v3
+
+    goto :goto_0
+
+    :cond_1
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_2
+    iget-wide v0, p1, Lp0/e;->e:J
+
+    invoke-virtual {p0}, Lokio/ByteString;->h()I
+
+    move-result v2
+
+    int-to-long v2, v2
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p1, Lp0/e;->e:J
+
+    return-void
+.end method
+
+.method public final q(I)I
+    .locals 3
+
+    iget-object v0, p0, Lp0/t;->i:[I
+
+    iget-object v1, p0, Lp0/t;->h:[[B
+
+    array-length v1, v1
+
+    add-int/lit8 p1, p1, 0x1
+
+    const/4 v2, 0x0
+
+    invoke-static {v0, v2, v1, p1}, Ljava/util/Arrays;->binarySearch([IIII)I
+
+    move-result p1
+
+    if-ltz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    not-int p1, p1
+
+    :goto_0
+    return p1
+.end method
+
+.method public r()[B
+    .locals 8
+
+    invoke-virtual {p0}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    new-array v0, v0, [B
+
+    iget-object v1, p0, Lp0/t;->h:[[B
+
+    array-length v1, v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_0
+
+    iget-object v5, p0, Lp0/t;->i:[I
+
+    add-int v6, v1, v2
+
+    aget v6, v5, v6
+
+    aget v5, v5, v2
+
+    iget-object v7, p0, Lp0/t;->h:[[B
+
+    aget-object v7, v7, v2
+
+    sub-int v3, v5, v3
+
+    invoke-static {v7, v6, v0, v4, v3}, Lf/n/a/k/a;->f([BI[BII)V
+
+    add-int/2addr v4, v3
+
+    add-int/lit8 v2, v2, 0x1
+
+    move v3, v5
+
+    goto :goto_0
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public final s()Lokio/ByteString;
+    .locals 2
+
+    new-instance v0, Lokio/ByteString;
+
+    invoke-virtual {p0}, Lp0/t;->r()[B
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
+
+    return-object v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p0}, Lp0/t;->s()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lp0/y/a;->p(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/p0/u.smali b/com.discord/smali_classes2/p0/u.smali
new file mode 100644
index 0000000000..dad60b4102
--- /dev/null
+++ b/com.discord/smali_classes2/p0/u.smali
@@ -0,0 +1,36 @@
+.class public interface abstract Lp0/u;
+.super Ljava/lang/Object;
+.source "Sink.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+.implements Ljava/io/Flushable;
+
+
+# virtual methods
+.method public abstract close()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract flush()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract timeout()Lp0/x;
+.end method
+
+.method public abstract write(Lp0/e;J)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/p0/v.smali b/com.discord/smali_classes2/p0/v.smali
new file mode 100644
index 0000000000..b68f511a0c
--- /dev/null
+++ b/com.discord/smali_classes2/p0/v.smali
@@ -0,0 +1,124 @@
+.class public final Lp0/v;
+.super Lp0/b;
+.source "Okio.kt"
+
+
+# instance fields
+.field public final l:Ljava/util/logging/Logger;
+
+.field public final m:Ljava/net/Socket;
+
+
+# direct methods
+.method public constructor <init>(Ljava/net/Socket;)V
+    .locals 1
+
+    const-string v0, "socket"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lp0/b;-><init>()V
+
+    iput-object p1, p0, Lp0/v;->m:Ljava/net/Socket;
+
+    const-string p1, "okio.Okio"
+
+    invoke-static {p1}, Ljava/util/logging/Logger;->getLogger(Ljava/lang/String;)Ljava/util/logging/Logger;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lp0/v;->l:Ljava/util/logging/Logger;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(Ljava/io/IOException;)Ljava/io/IOException;
+    .locals 2
+
+    new-instance v0, Ljava/net/SocketTimeoutException;
+
+    const-string v1, "timeout"
+
+    invoke-direct {v0, v1}, Ljava/net/SocketTimeoutException;-><init>(Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {v0, p1}, Ljava/net/SocketTimeoutException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public n()V
+    .locals 5
+
+    const-string v0, "Failed to close timed out socket "
+
+    :try_start_0
+    iget-object v1, p0, Lp0/v;->m:Ljava/net/Socket;
+
+    invoke-virtual {v1}, Ljava/net/Socket;->close()V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/AssertionError; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->F(Ljava/lang/AssertionError;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, p0, Lp0/v;->l:Ljava/util/logging/Logger;
+
+    sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v4, p0, Lp0/v;->m:Ljava/net/Socket;
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v3, v0, v1}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    throw v1
+
+    :catch_1
+    move-exception v1
+
+    iget-object v2, p0, Lp0/v;->l:Ljava/util/logging/Logger;
+
+    sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v4, p0, Lp0/v;->m:Ljava/net/Socket;
+
+    invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v3, v0, v1}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/p0/w.smali b/com.discord/smali_classes2/p0/w.smali
new file mode 100644
index 0000000000..ebf864094b
--- /dev/null
+++ b/com.discord/smali_classes2/p0/w.smali
@@ -0,0 +1,27 @@
+.class public interface abstract Lp0/w;
+.super Ljava/lang/Object;
+.source "Source.kt"
+
+# interfaces
+.implements Ljava/io/Closeable;
+
+
+# virtual methods
+.method public abstract B0(Lp0/e;J)J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract close()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract timeout()Lp0/x;
+.end method
diff --git a/com.discord/smali_classes2/p0/x$a.smali b/com.discord/smali_classes2/p0/x$a.smali
new file mode 100644
index 0000000000..e8d9f9ce61
--- /dev/null
+++ b/com.discord/smali_classes2/p0/x$a.smali
@@ -0,0 +1,48 @@
+.class public final Lp0/x$a;
+.super Lp0/x;
+.source "Timeout.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lp0/x;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lp0/x;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public d(J)Lp0/x;
+    .locals 0
+
+    return-object p0
+.end method
+
+.method public f()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+    .locals 0
+
+    const-string p1, "unit"
+
+    invoke-static {p3, p1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/p0/x.smali b/com.discord/smali_classes2/p0/x.smali
new file mode 100644
index 0000000000..34424d95cf
--- /dev/null
+++ b/com.discord/smali_classes2/p0/x.smali
@@ -0,0 +1,224 @@
+.class public Lp0/x;
+.super Ljava/lang/Object;
+.source "Timeout.kt"
+
+
+# static fields
+.field public static final d:Lp0/x;
+
+
+# instance fields
+.field public a:Z
+
+.field public b:J
+
+.field public c:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lp0/x$a;
+
+    invoke-direct {v0}, Lp0/x$a;-><init>()V
+
+    sput-object v0, Lp0/x;->d:Lp0/x;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lp0/x;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lp0/x;->a:Z
+
+    return-object p0
+.end method
+
+.method public b()Lp0/x;
+    .locals 2
+
+    const-wide/16 v0, 0x0
+
+    iput-wide v0, p0, Lp0/x;->c:J
+
+    return-object p0
+.end method
+
+.method public c()J
+    .locals 2
+
+    iget-boolean v0, p0, Lp0/x;->a:Z
+
+    if-eqz v0, :cond_0
+
+    iget-wide v0, p0, Lp0/x;->b:J
+
+    return-wide v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "No deadline"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public d(J)Lp0/x;
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lp0/x;->a:Z
+
+    iput-wide p1, p0, Lp0/x;->b:J
+
+    return-object p0
+.end method
+
+.method public e()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lp0/x;->a:Z
+
+    return v0
+.end method
+
+.method public f()V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-static {}, Ljava/lang/Thread;->interrupted()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    iget-boolean v0, p0, Lp0/x;->a:Z
+
+    if-eqz v0, :cond_1
+
+    iget-wide v0, p0, Lp0/x;->b:J
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v2
+
+    sub-long/2addr v0, v2
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-lez v4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/io/InterruptedIOException;
+
+    const-string v1, "deadline reached"
+
+    invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    return-void
+
+    :cond_2
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
+
+    new-instance v0, Ljava/io/InterruptedIOException;
+
+    const-string v1, "interrupted"
+
+    invoke-direct {v0, v1}, Ljava/io/InterruptedIOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public g(JLjava/util/concurrent/TimeUnit;)Lp0/x;
+    .locals 3
+
+    const-string v0, "unit"
+
+    invoke-static {p3, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p3, p1, p2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide p1
+
+    iput-wide p1, p0, Lp0/x;->c:J
+
+    return-object p0
+
+    :cond_1
+    const-string p3, "timeout < 0: "
+
+    invoke-static {p3, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+.end method
+
+.method public h()J
+    .locals 2
+
+    iget-wide v0, p0, Lp0/x;->c:J
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/p0/y/a.smali b/com.discord/smali_classes2/p0/y/a.smali
new file mode 100644
index 0000000000..d501872bcb
--- /dev/null
+++ b/com.discord/smali_classes2/p0/y/a.smali
@@ -0,0 +1,1677 @@
+.class public final Lp0/y/a;
+.super Ljava/lang/Object;
+.source "ByteString.kt"
+
+
+# static fields
+.field public static final a:[C
+
+.field public static final b:Lokio/ByteString;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const/16 v0, 0x10
+
+    new-array v0, v0, [C
+
+    fill-array-data v0, :array_0
+
+    sput-object v0, Lp0/y/a;->a:[C
+
+    sget-object v0, Lokio/ByteString;->g:Lokio/ByteString$a;
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [B
+
+    const-string v1, "data"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lp0/y/a;->k([B)Lokio/ByteString;
+
+    move-result-object v0
+
+    sput-object v0, Lp0/y/a;->b:Lokio/ByteString;
+
+    return-void
+
+    :array_0
+    .array-data 2
+        0x30s
+        0x31s
+        0x32s
+        0x33s
+        0x34s
+        0x35s
+        0x36s
+        0x37s
+        0x38s
+        0x39s
+        0x61s
+        0x62s
+        0x63s
+        0x64s
+        0x65s
+        0x66s
+    .end array-data
+.end method
+
+.method public static final a(Lokio/ByteString;)Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-static {p0, v0, v1}, Lp0/a;->a([B[BI)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final b(Lokio/ByteString;Lokio/ByteString;)I
+    .locals 9
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v1
+
+    invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_0
+    const/4 v5, -0x1
+
+    const/4 v6, 0x1
+
+    if-ge v4, v2, :cond_2
+
+    invoke-virtual {p0, v4}, Lokio/ByteString;->k(I)B
+
+    move-result v7
+
+    and-int/lit16 v7, v7, 0xff
+
+    invoke-virtual {p1, v4}, Lokio/ByteString;->k(I)B
+
+    move-result v8
+
+    and-int/lit16 v8, v8, 0xff
+
+    if-ne v7, v8, :cond_0
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    if-ge v7, v8, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v5, 0x1
+
+    :goto_1
+    return v5
+
+    :cond_2
+    if-ne v0, v1, :cond_3
+
+    return v3
+
+    :cond_3
+    if-ge v0, v1, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    const/4 v5, 0x1
+
+    :goto_2
+    return v5
+.end method
+
+.method public static final c(Ljava/lang/String;)Lokio/ByteString;
+    .locals 5
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    rem-int/lit8 v0, v0, 0x2
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    div-int/lit8 v0, v0, 0x2
+
+    new-array v2, v0, [B
+
+    :goto_1
+    if-ge v1, v0, :cond_1
+
+    mul-int/lit8 v3, v1, 0x2
+
+    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    invoke-static {v4}, Lp0/y/a;->r(C)I
+
+    move-result v4
+
+    shl-int/lit8 v4, v4, 0x4
+
+    add-int/lit8 v3, v3, 0x1
+
+    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v3
+
+    invoke-static {v3}, Lp0/y/a;->r(C)I
+
+    move-result v3
+
+    add-int/2addr v3, v4
+
+    int-to-byte v3, v3
+
+    aput-byte v3, v2, v1
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p0, Lokio/ByteString;
+
+    invoke-direct {p0, v2}, Lokio/ByteString;-><init>([B)V
+
+    return-object p0
+
+    :cond_2
+    const-string v0, "Unexpected hex string: "
+
+    invoke-static {v0, p0}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static final d(Ljava/lang/String;)Lokio/ByteString;
+    .locals 3
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lokio/ByteString;
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
+
+    move-result-object v0
+
+    const-string v2, "(this as java.lang.String).getBytes(charset)"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v1, v0}, Lokio/ByteString;-><init>([B)V
+
+    iput-object p0, v1, Lokio/ByteString;->e:Ljava/lang/String;
+
+    return-object v1
+.end method
+
+.method public static final e(Lokio/ByteString;Ljava/lang/Object;)Z
+    .locals 3
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    if-ne p1, p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v1, p1, Lokio/ByteString;
+
+    if-eqz v1, :cond_1
+
+    check-cast p1, Lokio/ByteString;
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v1
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    array-length v2, p0
+
+    if-ne v1, v2, :cond_1
+
+    array-length v1, p0
+
+    invoke-virtual {p1, v0, p0, v0, v1}, Lokio/ByteString;->m(I[BII)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_1
+
+    :goto_0
+    const/4 v0, 0x1
+
+    :cond_1
+    return v0
+.end method
+
+.method public static final f(Lokio/ByteString;I)B
+    .locals 1
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    aget-byte p0, p0, p1
+
+    return p0
+.end method
+
+.method public static final g(Lokio/ByteString;)I
+    .locals 1
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    array-length p0, p0
+
+    return p0
+.end method
+
+.method public static final h(Lokio/ByteString;)I
+    .locals 1
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v0, p0, Lokio/ByteString;->d:I
+
+    if-eqz v0, :cond_0
+
+    return v0
+
+    :cond_0
+    iget-object v0, p0, Lokio/ByteString;->data:[B
+
+    invoke-static {v0}, Ljava/util/Arrays;->hashCode([B)I
+
+    move-result v0
+
+    iput v0, p0, Lokio/ByteString;->d:I
+
+    return v0
+.end method
+
+.method public static final i(Lokio/ByteString;)Ljava/lang/String;
+    .locals 8
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    array-length v0, p0
+
+    mul-int/lit8 v0, v0, 0x2
+
+    new-array v0, v0, [C
+
+    array-length v1, p0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_0
+
+    aget-byte v4, p0, v2
+
+    add-int/lit8 v5, v3, 0x1
+
+    sget-object v6, Lp0/y/a;->a:[C
+
+    shr-int/lit8 v7, v4, 0x4
+
+    and-int/lit8 v7, v7, 0xf
+
+    aget-char v7, v6, v7
+
+    aput-char v7, v0, v3
+
+    add-int/lit8 v3, v5, 0x1
+
+    and-int/lit8 v4, v4, 0xf
+
+    aget-char v4, v6, v4
+
+    aput-char v4, v0, v5
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p0, Ljava/lang/String;
+
+    invoke-direct {p0, v0}, Ljava/lang/String;-><init>([C)V
+
+    return-object p0
+.end method
+
+.method public static final j(Lokio/ByteString;)[B
+    .locals 1
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    return-object p0
+.end method
+
+.method public static final k([B)Lokio/ByteString;
+    .locals 2
+
+    const-string v0, "data"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lokio/ByteString;
+
+    array-length v1, p0
+
+    invoke-static {p0, v1}, Ljava/util/Arrays;->copyOf([BI)[B
+
+    move-result-object p0
+
+    const-string v1, "java.util.Arrays.copyOf(this, size)"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, p0}, Lokio/ByteString;-><init>([B)V
+
+    return-object v0
+.end method
+
+.method public static final l(Lokio/ByteString;ILokio/ByteString;II)Z
+    .locals 1
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    invoke-virtual {p2, p3, p0, p1, p4}, Lokio/ByteString;->m(I[BII)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final m(Lokio/ByteString;I[BII)Z
+    .locals 1
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "other"
+
+    invoke-static {p2, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-ltz p1, :cond_0
+
+    iget-object p0, p0, Lokio/ByteString;->data:[B
+
+    array-length v0, p0
+
+    sub-int/2addr v0, p4
+
+    if-gt p1, v0, :cond_0
+
+    if-ltz p3, :cond_0
+
+    array-length v0, p2
+
+    sub-int/2addr v0, p4
+
+    if-gt p3, v0, :cond_0
+
+    invoke-static {p0, p1, p2, p3, p4}, Lf/n/a/k/a;->e([BI[BII)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_0
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static final n(Lokio/ByteString;Lokio/ByteString;)Z
+    .locals 2
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "prefix"
+
+    invoke-static {p1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lokio/ByteString;->h()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, v1, p1, v1, v0}, Lokio/ByteString;->l(ILokio/ByteString;II)Z
+
+    move-result p0
+
+    return p0
+.end method
+
+.method public static final o(Lokio/ByteString;)Lokio/ByteString;
+    .locals 5
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v0, 0x0
+
+    :goto_0
+    iget-object v1, p0, Lokio/ByteString;->data:[B
+
+    array-length v2, v1
+
+    if-ge v0, v2, :cond_5
+
+    aget-byte v2, v1, v0
+
+    const/16 v3, 0x41
+
+    int-to-byte v3, v3
+
+    if-lt v2, v3, :cond_4
+
+    const/16 v4, 0x5a
+
+    int-to-byte v4, v4
+
+    if-le v2, v4, :cond_0
+
+    goto :goto_3
+
+    :cond_0
+    array-length p0, v1
+
+    invoke-static {v1, p0}, Ljava/util/Arrays;->copyOf([BI)[B
+
+    move-result-object p0
+
+    const-string v1, "java.util.Arrays.copyOf(this, size)"
+
+    invoke-static {p0, v1}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    add-int/lit8 v1, v0, 0x1
+
+    add-int/lit8 v2, v2, 0x20
+
+    int-to-byte v2, v2
+
+    aput-byte v2, p0, v0
+
+    :goto_1
+    array-length v0, p0
+
+    if-ge v1, v0, :cond_3
+
+    aget-byte v0, p0, v1
+
+    if-lt v0, v3, :cond_2
+
+    if-le v0, v4, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    add-int/lit8 v0, v0, 0x20
+
+    int-to-byte v0, v0
+
+    aput-byte v0, p0, v1
+
+    :cond_2
+    :goto_2
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    new-instance v0, Lokio/ByteString;
+
+    invoke-direct {v0, p0}, Lokio/ByteString;-><init>([B)V
+
+    return-object v0
+
+    :cond_4
+    :goto_3
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    return-object p0
+.end method
+
+.method public static final p(Lokio/ByteString;)Ljava/lang/String;
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    const-string v1, "$receiver"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v2, v0, Lokio/ByteString;->data:[B
+
+    array-length v2, v2
+
+    if-nez v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_1
+
+    const-string v0, "[size=0]"
+
+    return-object v0
+
+    :cond_1
+    iget-object v2, v0, Lokio/ByteString;->data:[B
+
+    array-length v3, v2
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    :cond_2
+    :goto_1
+    const/16 v7, 0x40
+
+    if-ge v4, v3, :cond_47
+
+    aget-byte v8, v2, v4
+
+    const/16 v9, 0xa
+
+    const/16 v10, 0x7f
+
+    const/16 v11, 0x1f
+
+    const/16 v12, 0xd
+
+    const/16 v13, 0x9f
+
+    const v14, 0xfffd
+
+    const/high16 v15, 0x10000
+
+    const/16 v16, 0x2
+
+    if-ltz v8, :cond_13
+
+    add-int/lit8 v16, v5, 0x1
+
+    if-ne v5, v7, :cond_3
+
+    goto/16 :goto_18
+
+    :cond_3
+    if-eq v8, v9, :cond_8
+
+    if-eq v8, v12, :cond_8
+
+    if-ltz v8, :cond_4
+
+    if-ge v11, v8, :cond_6
+
+    :cond_4
+    if-le v10, v8, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    if-lt v13, v8, :cond_7
+
+    :cond_6
+    const/4 v5, 0x1
+
+    goto :goto_3
+
+    :cond_7
+    :goto_2
+    const/4 v5, 0x0
+
+    :goto_3
+    if-nez v5, :cond_46
+
+    :cond_8
+    if-ne v8, v14, :cond_9
+
+    goto/16 :goto_17
+
+    :cond_9
+    if-ge v8, v15, :cond_a
+
+    const/4 v5, 0x1
+
+    goto :goto_4
+
+    :cond_a
+    const/4 v5, 0x2
+
+    :goto_4
+    add-int/2addr v6, v5
+
+    add-int/lit8 v4, v4, 0x1
+
+    :goto_5
+    move/from16 v5, v16
+
+    if-ge v4, v3, :cond_2
+
+    aget-byte v8, v2, v4
+
+    if-ltz v8, :cond_2
+
+    add-int/lit8 v8, v4, 0x1
+
+    aget-byte v4, v2, v4
+
+    add-int/lit8 v16, v5, 0x1
+
+    if-ne v5, v7, :cond_b
+
+    goto/16 :goto_18
+
+    :cond_b
+    if-eq v4, v9, :cond_10
+
+    if-eq v4, v12, :cond_10
+
+    if-ltz v4, :cond_c
+
+    if-ge v11, v4, :cond_e
+
+    :cond_c
+    if-le v10, v4, :cond_d
+
+    goto :goto_6
+
+    :cond_d
+    if-lt v13, v4, :cond_f
+
+    :cond_e
+    const/4 v5, 0x1
+
+    goto :goto_7
+
+    :cond_f
+    :goto_6
+    const/4 v5, 0x0
+
+    :goto_7
+    if-nez v5, :cond_46
+
+    :cond_10
+    if-ne v4, v14, :cond_11
+
+    goto/16 :goto_17
+
+    :cond_11
+    if-ge v4, v15, :cond_12
+
+    const/4 v4, 0x1
+
+    goto :goto_8
+
+    :cond_12
+    const/4 v4, 0x2
+
+    :goto_8
+    add-int/2addr v6, v4
+
+    move v4, v8
+
+    goto :goto_5
+
+    :cond_13
+    shr-int/lit8 v13, v8, 0x5
+
+    const/4 v14, -0x2
+
+    const/16 v15, 0x80
+
+    if-ne v13, v14, :cond_20
+
+    add-int/lit8 v8, v4, 0x1
+
+    if-gt v3, v8, :cond_14
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_14
+    aget-byte v13, v2, v4
+
+    aget-byte v8, v2, v8
+
+    and-int/lit16 v14, v8, 0xc0
+
+    if-ne v14, v15, :cond_15
+
+    const/4 v14, 0x1
+
+    goto :goto_9
+
+    :cond_15
+    const/4 v14, 0x0
+
+    :goto_9
+    if-nez v14, :cond_16
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_16
+    xor-int/lit16 v8, v8, 0xf80
+
+    shl-int/lit8 v13, v13, 0x6
+
+    xor-int/2addr v8, v13
+
+    if-ge v8, v15, :cond_17
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_17
+    add-int/lit8 v13, v5, 0x1
+
+    if-ne v5, v7, :cond_18
+
+    goto/16 :goto_18
+
+    :cond_18
+    if-eq v8, v9, :cond_1d
+
+    if-eq v8, v12, :cond_1d
+
+    if-ltz v8, :cond_19
+
+    if-ge v11, v8, :cond_1b
+
+    :cond_19
+    if-le v10, v8, :cond_1a
+
+    goto :goto_a
+
+    :cond_1a
+    const/16 v5, 0x9f
+
+    if-lt v5, v8, :cond_1c
+
+    :cond_1b
+    const/4 v5, 0x1
+
+    goto :goto_b
+
+    :cond_1c
+    :goto_a
+    const/4 v5, 0x0
+
+    :goto_b
+    if-nez v5, :cond_46
+
+    :cond_1d
+    const v5, 0xfffd
+
+    if-ne v8, v5, :cond_1e
+
+    goto/16 :goto_17
+
+    :cond_1e
+    const/high16 v5, 0x10000
+
+    if-ge v8, v5, :cond_1f
+
+    const/16 v16, 0x1
+
+    :cond_1f
+    add-int v6, v6, v16
+
+    add-int/lit8 v4, v4, 0x2
+
+    move v5, v13
+
+    goto/16 :goto_1
+
+    :cond_20
+    shr-int/lit8 v10, v8, 0x4
+
+    const v11, 0xd800
+
+    const v12, 0xdfff
+
+    if-ne v10, v14, :cond_31
+
+    add-int/lit8 v8, v4, 0x2
+
+    if-gt v3, v8, :cond_21
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_21
+    aget-byte v10, v2, v4
+
+    add-int/lit8 v13, v4, 0x1
+
+    aget-byte v13, v2, v13
+
+    and-int/lit16 v14, v13, 0xc0
+
+    if-ne v14, v15, :cond_22
+
+    const/4 v14, 0x1
+
+    goto :goto_c
+
+    :cond_22
+    const/4 v14, 0x0
+
+    :goto_c
+    if-nez v14, :cond_23
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_23
+    aget-byte v8, v2, v8
+
+    and-int/lit16 v14, v8, 0xc0
+
+    if-ne v14, v15, :cond_24
+
+    const/4 v14, 0x1
+
+    goto :goto_d
+
+    :cond_24
+    const/4 v14, 0x0
+
+    :goto_d
+    if-nez v14, :cond_25
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_25
+    const v14, -0x1e080
+
+    xor-int/2addr v8, v14
+
+    shl-int/lit8 v13, v13, 0x6
+
+    xor-int/2addr v8, v13
+
+    shl-int/lit8 v10, v10, 0xc
+
+    xor-int/2addr v8, v10
+
+    const/16 v10, 0x800
+
+    if-ge v8, v10, :cond_26
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_26
+    if-le v11, v8, :cond_27
+
+    goto :goto_e
+
+    :cond_27
+    if-lt v12, v8, :cond_28
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_28
+    :goto_e
+    add-int/lit8 v10, v5, 0x1
+
+    if-ne v5, v7, :cond_29
+
+    goto/16 :goto_18
+
+    :cond_29
+    if-eq v8, v9, :cond_2e
+
+    const/16 v5, 0xd
+
+    if-eq v8, v5, :cond_2e
+
+    if-ltz v8, :cond_2a
+
+    const/16 v5, 0x1f
+
+    if-ge v5, v8, :cond_2c
+
+    :cond_2a
+    const/16 v5, 0x7f
+
+    if-le v5, v8, :cond_2b
+
+    goto :goto_f
+
+    :cond_2b
+    const/16 v5, 0x9f
+
+    if-lt v5, v8, :cond_2d
+
+    :cond_2c
+    const/4 v5, 0x1
+
+    goto :goto_10
+
+    :cond_2d
+    :goto_f
+    const/4 v5, 0x0
+
+    :goto_10
+    if-nez v5, :cond_46
+
+    :cond_2e
+    const v5, 0xfffd
+
+    if-ne v8, v5, :cond_2f
+
+    goto/16 :goto_17
+
+    :cond_2f
+    const/high16 v5, 0x10000
+
+    if-ge v8, v5, :cond_30
+
+    const/16 v16, 0x1
+
+    :cond_30
+    add-int v6, v6, v16
+
+    add-int/lit8 v4, v4, 0x3
+
+    move v5, v10
+
+    goto/16 :goto_1
+
+    :cond_31
+    shr-int/lit8 v8, v8, 0x3
+
+    if-ne v8, v14, :cond_45
+
+    add-int/lit8 v8, v4, 0x3
+
+    if-gt v3, v8, :cond_32
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_32
+    aget-byte v9, v2, v4
+
+    add-int/lit8 v10, v4, 0x1
+
+    aget-byte v10, v2, v10
+
+    and-int/lit16 v13, v10, 0xc0
+
+    if-ne v13, v15, :cond_33
+
+    const/4 v13, 0x1
+
+    goto :goto_11
+
+    :cond_33
+    const/4 v13, 0x0
+
+    :goto_11
+    if-nez v13, :cond_34
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_34
+    add-int/lit8 v13, v4, 0x2
+
+    aget-byte v13, v2, v13
+
+    and-int/lit16 v14, v13, 0xc0
+
+    if-ne v14, v15, :cond_35
+
+    const/4 v14, 0x1
+
+    goto :goto_12
+
+    :cond_35
+    const/4 v14, 0x0
+
+    :goto_12
+    if-nez v14, :cond_36
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_36
+    aget-byte v8, v2, v8
+
+    and-int/lit16 v14, v8, 0xc0
+
+    if-ne v14, v15, :cond_37
+
+    const/4 v14, 0x1
+
+    goto :goto_13
+
+    :cond_37
+    const/4 v14, 0x0
+
+    :goto_13
+    if-nez v14, :cond_38
+
+    if-ne v5, v7, :cond_46
+
+    goto/16 :goto_18
+
+    :cond_38
+    const v14, 0x381f80
+
+    xor-int/2addr v8, v14
+
+    shl-int/lit8 v13, v13, 0x6
+
+    xor-int/2addr v8, v13
+
+    shl-int/lit8 v10, v10, 0xc
+
+    xor-int/2addr v8, v10
+
+    shl-int/lit8 v9, v9, 0x12
+
+    xor-int/2addr v8, v9
+
+    const v9, 0x10ffff
+
+    if-le v8, v9, :cond_39
+
+    if-ne v5, v7, :cond_46
+
+    goto :goto_18
+
+    :cond_39
+    if-le v11, v8, :cond_3a
+
+    goto :goto_14
+
+    :cond_3a
+    if-lt v12, v8, :cond_3b
+
+    if-ne v5, v7, :cond_46
+
+    goto :goto_18
+
+    :cond_3b
+    :goto_14
+    const/high16 v9, 0x10000
+
+    if-ge v8, v9, :cond_3c
+
+    if-ne v5, v7, :cond_46
+
+    goto :goto_18
+
+    :cond_3c
+    add-int/lit8 v9, v5, 0x1
+
+    if-ne v5, v7, :cond_3d
+
+    goto :goto_18
+
+    :cond_3d
+    const/16 v5, 0xa
+
+    if-eq v8, v5, :cond_42
+
+    const/16 v5, 0xd
+
+    if-eq v8, v5, :cond_42
+
+    if-ltz v8, :cond_3e
+
+    const/16 v5, 0x1f
+
+    if-ge v5, v8, :cond_40
+
+    :cond_3e
+    const/16 v5, 0x7f
+
+    if-le v5, v8, :cond_3f
+
+    goto :goto_15
+
+    :cond_3f
+    const/16 v5, 0x9f
+
+    if-lt v5, v8, :cond_41
+
+    :cond_40
+    const/4 v5, 0x1
+
+    goto :goto_16
+
+    :cond_41
+    :goto_15
+    const/4 v5, 0x0
+
+    :goto_16
+    if-nez v5, :cond_46
+
+    :cond_42
+    const v5, 0xfffd
+
+    if-ne v8, v5, :cond_43
+
+    goto :goto_17
+
+    :cond_43
+    const/high16 v5, 0x10000
+
+    if-ge v8, v5, :cond_44
+
+    const/16 v16, 0x1
+
+    :cond_44
+    add-int v6, v6, v16
+
+    add-int/lit8 v4, v4, 0x4
+
+    move v5, v9
+
+    goto/16 :goto_1
+
+    :cond_45
+    if-ne v5, v7, :cond_46
+
+    goto :goto_18
+
+    :cond_46
+    :goto_17
+    const/4 v6, -0x1
+
+    :cond_47
+    :goto_18
+    const/16 v2, 0x5d
+
+    const-string v3, "\u2026]"
+
+    const-string v4, "[size="
+
+    const/4 v5, -0x1
+
+    if-ne v6, v5, :cond_4c
+
+    iget-object v5, v0, Lokio/ByteString;->data:[B
+
+    array-length v5, v5
+
+    if-gt v5, v7, :cond_48
+
+    const-string v1, "[hex="
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-virtual/range {p0 .. p0}, Lokio/ByteString;->i()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_1b
+
+    :cond_48
+    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    iget-object v4, v0, Lokio/ByteString;->data:[B
+
+    array-length v4, v4
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v4, " hex="
+
+    invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v0, Lokio/ByteString;->data:[B
+
+    array-length v1, v1
+
+    if-gt v7, v1, :cond_49
+
+    const/4 v1, 0x1
+
+    goto :goto_19
+
+    :cond_49
+    const/4 v1, 0x0
+
+    :goto_19
+    if-eqz v1, :cond_4b
+
+    iget-object v1, v0, Lokio/ByteString;->data:[B
+
+    array-length v4, v1
+
+    if-ne v7, v4, :cond_4a
+
+    goto :goto_1a
+
+    :cond_4a
+    new-array v0, v7, [B
+
+    const-string v4, "src"
+
+    invoke-static {v1, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "dest"
+
+    invoke-static {v0, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v4, v0, v4, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    new-instance v1, Lokio/ByteString;
+
+    invoke-direct {v1, v0}, Lokio/ByteString;-><init>([B)V
+
+    move-object v0, v1
+
+    :goto_1a
+    invoke-virtual {v0}, Lokio/ByteString;->i()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_1b
+    return-object v0
+
+    :cond_4b
+    const-string v1, "endIndex > length("
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v0, v0, Lokio/ByteString;->data:[B
+
+    array-length v0, v0
+
+    const/16 v2, 0x29
+
+    invoke-static {v1, v0, v2}, Lf/e/b/a/a;->r(Ljava/lang/StringBuilder;IC)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_4c
+    invoke-static/range {p0 .. p0}, Lp0/y/a;->q(Lokio/ByteString;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v1, v5, v6}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "(this as java.lang.Strin\u2026ing(startIndex, endIndex)"
+
+    invoke-static {v7, v8}, Lk0/o/c/i;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v8, "\\"
+
+    const-string v9, "\\\\"
+
+    const/4 v10, 0x4
+
+    invoke-static {v7, v8, v9, v5, v10}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "\n"
+
+    const-string v9, "\\n"
+
+    invoke-static {v7, v8, v9, v5, v10}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "\r"
+
+    const-string v9, "\\r"
+
+    invoke-static {v7, v8, v9, v5, v10}, Lk0/u/k;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    if-ge v6, v1, :cond_4d
+
+    invoke-static {v4}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v0, v0, Lokio/ByteString;->data:[B
+
+    array-length v0, v0
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v0, " text="
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_1c
+
+    :cond_4d
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v1, "[text="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_1c
+    return-object v0
+.end method
+
+.method public static final q(Lokio/ByteString;)Ljava/lang/String;
+    .locals 3
+
+    const-string v0, "$receiver"
+
+    invoke-static {p0, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lokio/ByteString;->e:Ljava/lang/String;
+
+    if-nez v1, :cond_0
+
+    invoke-virtual {p0}, Lokio/ByteString;->j()[B
+
+    move-result-object v1
+
+    invoke-static {v1, v0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    new-instance v2, Ljava/lang/String;
+
+    invoke-direct {v2, v1, v0}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
+
+    iput-object v2, p0, Lokio/ByteString;->e:Ljava/lang/String;
+
+    move-object v1, v2
+
+    :cond_0
+    return-object v1
+.end method
+
+.method public static final r(C)I
+    .locals 3
+
+    const/16 v0, 0x30
+
+    if-le v0, p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v1, 0x39
+
+    if-lt v1, p0, :cond_1
+
+    sub-int/2addr p0, v0
+
+    goto :goto_3
+
+    :cond_1
+    :goto_0
+    const/16 v0, 0x66
+
+    const/16 v1, 0x61
+
+    if-le v1, p0, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    if-lt v0, p0, :cond_3
+
+    :goto_1
+    sub-int/2addr p0, v1
+
+    add-int/lit8 p0, p0, 0xa
+
+    goto :goto_3
+
+    :cond_3
+    :goto_2
+    const/16 v0, 0x46
+
+    const/16 v1, 0x41
+
+    if-gt v1, p0, :cond_4
+
+    if-lt v0, p0, :cond_4
+
+    goto :goto_1
+
+    :goto_3
+    return p0
+
+    :cond_4
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Unexpected hex digit: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/q0/a$a.smali b/com.discord/smali_classes2/q0/a$a.smali
deleted file mode 100644
index 6cd1c15089..0000000000
--- a/com.discord/smali_classes2/q0/a$a.smali
+++ /dev/null
@@ -1,84 +0,0 @@
-.class public final Lq0/a$a;
-.super Ljava/lang/Object;
-.source "BuiltInConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Lokhttp3/ResponseBody;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/a$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/a$a;
-
-    invoke-direct {v0}, Lq0/a$a;-><init>()V
-
-    sput-object v0, Lq0/a$a;->a:Lq0/a$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    :try_start_0
-    invoke-static {p1}, Lq0/r;->a(Lokhttp3/ResponseBody;)Lokhttp3/ResponseBody;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/q0/a$b.smali b/com.discord/smali_classes2/q0/a$b.smali
deleted file mode 100644
index c771ddcb0d..0000000000
--- a/com.discord/smali_classes2/q0/a$b.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public final Lq0/a$b;
-.super Ljava/lang/Object;
-.source "BuiltInConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/RequestBody;",
-        "Lokhttp3/RequestBody;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/a$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/a$b;
-
-    invoke-direct {v0}, Lq0/a$b;-><init>()V
-
-    sput-object v0, Lq0/a$b;->a:Lq0/a$b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/RequestBody;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/a$c.smali b/com.discord/smali_classes2/q0/a$c.smali
deleted file mode 100644
index 770c6d8362..0000000000
--- a/com.discord/smali_classes2/q0/a$c.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public final Lq0/a$c;
-.super Ljava/lang/Object;
-.source "BuiltInConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Lokhttp3/ResponseBody;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/a$c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/a$c;
-
-    invoke-direct {v0}, Lq0/a$c;-><init>()V
-
-    sput-object v0, Lq0/a$c;->a:Lq0/a$c;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/a$d.smali b/com.discord/smali_classes2/q0/a$d.smali
deleted file mode 100644
index b748d8ddcc..0000000000
--- a/com.discord/smali_classes2/q0/a$d.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lq0/a$d;
-.super Ljava/lang/Object;
-.source "BuiltInConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "d"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Ljava/lang/Object;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/a$d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/a$d;
-
-    invoke-direct {v0}, Lq0/a$d;-><init>()V
-
-    sput-object v0, Lq0/a$d;->a:Lq0/a$d;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/a$e.smali b/com.discord/smali_classes2/q0/a$e.smali
deleted file mode 100644
index 9d8906b9df..0000000000
--- a/com.discord/smali_classes2/q0/a$e.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public final Lq0/a$e;
-.super Ljava/lang/Object;
-.source "BuiltInConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "e"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Void;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/a$e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/a$e;
-
-    invoke-direct {v0}, Lq0/a$e;-><init>()V
-
-    sput-object v0, Lq0/a$e;->a:Lq0/a$e;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
-
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/a.smali b/com.discord/smali_classes2/q0/a.smali
deleted file mode 100644
index d4e858b2f4..0000000000
--- a/com.discord/smali_classes2/q0/a.smali
+++ /dev/null
@@ -1,145 +0,0 @@
-.class public final Lq0/a;
-.super Lq0/e$a;
-.source "BuiltInConverters.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/a$d;,
-        Lq0/a$a;,
-        Lq0/a$c;,
-        Lq0/a$b;,
-        Lq0/a$e;
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/e$a;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "*",
-            "Lokhttp3/RequestBody;",
-            ">;"
-        }
-    .end annotation
-
-    const-class p2, Lokhttp3/RequestBody;
-
-    invoke-static {p1}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object p1
-
-    invoke-virtual {p2, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    sget-object p1, Lq0/a$b;->a:Lq0/a$b;
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
-
-.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "Lokhttp3/ResponseBody;",
-            "*>;"
-        }
-    .end annotation
-
-    const-class p3, Lokhttp3/ResponseBody;
-
-    if-ne p1, p3, :cond_3
-
-    const-class p1, Lq0/u/u;
-
-    array-length p3, p2
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x0
-
-    :goto_0
-    if-ge v1, p3, :cond_1
-
-    aget-object v2, p2, v1
-
-    invoke-virtual {p1, v2}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    if-eqz v0, :cond_2
-
-    sget-object p1, Lq0/a$c;->a:Lq0/a$c;
-
-    goto :goto_2
-
-    :cond_2
-    sget-object p1, Lq0/a$a;->a:Lq0/a$a;
-
-    :goto_2
-    return-object p1
-
-    :cond_3
-    const-class p2, Ljava/lang/Void;
-
-    if-ne p1, p2, :cond_4
-
-    sget-object p1, Lq0/a$e;->a:Lq0/a$e;
-
-    return-object p1
-
-    :cond_4
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/a/a/a.smali b/com.discord/smali_classes2/q0/a/a/a.smali
new file mode 100644
index 0000000000..c198aee885
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/a.smali
@@ -0,0 +1,898 @@
+.class public final Lq0/a/a/a;
+.super Ljava/lang/Object;
+.source "AnnotationWriter.java"
+
+
+# instance fields
+.field public final a:Lq0/a/a/v;
+
+.field public final b:Z
+
+.field public final c:Lq0/a/a/c;
+
+.field public final d:I
+
+.field public e:I
+
+.field public final f:Lq0/a/a/a;
+
+.field public g:Lq0/a/a/a;
+
+
+# direct methods
+.method public constructor <init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    iput-boolean p2, p0, Lq0/a/a/a;->b:Z
+
+    iput-object p3, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget p1, p3, Lq0/a/a/c;->b:I
+
+    if-nez p1, :cond_0
+
+    const/4 p1, -0x1
+
+    goto :goto_0
+
+    :cond_0
+    add-int/lit8 p1, p1, -0x2
+
+    :goto_0
+    iput p1, p0, Lq0/a/a/a;->d:I
+
+    iput-object p4, p0, Lq0/a/a/a;->f:Lq0/a/a/a;
+
+    if-eqz p4, :cond_1
+
+    iput-object p0, p4, Lq0/a/a/a;->g:Lq0/a/a/a;
+
+    :cond_1
+    return-void
+.end method
+
+.method public static b(Ljava/lang/String;[Lq0/a/a/a;I)I
+    .locals 4
+
+    mul-int/lit8 v0, p2, 0x2
+
+    add-int/lit8 v0, v0, 0x7
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, p2, :cond_1
+
+    aget-object v3, p1, v2
+
+    if-nez v3, :cond_0
+
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {v3, p0}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v3
+
+    add-int/lit8 v3, v3, -0x8
+
+    :goto_1
+    add-int/2addr v0, v3
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return v0
+.end method
+
+.method public static d(I[Lq0/a/a/a;ILq0/a/a/c;)V
+    .locals 6
+
+    mul-int/lit8 v0, p2, 0x2
+
+    add-int/lit8 v0, v0, 0x1
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    const/4 v3, 0x0
+
+    if-ge v2, p2, :cond_1
+
+    aget-object v4, p1, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v3, 0x0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {v4, v3}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v3
+
+    add-int/lit8 v3, v3, -0x8
+
+    :goto_1
+    add-int/2addr v0, v3
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p3, p0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {p3, v0}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    invoke-virtual {p3, p2}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    const/4 p0, 0x0
+
+    :goto_2
+    if-ge p0, p2, :cond_4
+
+    aget-object v0, p1, p0
+
+    move-object v4, v3
+
+    const/4 v2, 0x0
+
+    :goto_3
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lq0/a/a/a;->g()V
+
+    add-int/lit8 v2, v2, 0x1
+
+    iget-object v4, v0, Lq0/a/a/a;->f:Lq0/a/a/a;
+
+    move-object v5, v4
+
+    move-object v4, v0
+
+    move-object v0, v5
+
+    goto :goto_3
+
+    :cond_2
+    invoke-virtual {p3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_4
+    if-eqz v4, :cond_3
+
+    iget-object v0, v4, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v2, v0, Lq0/a/a/c;->a:[B
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p3, v2, v1, v0}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget-object v4, v4, Lq0/a/a/a;->g:Lq0/a/a/a;
+
+    goto :goto_4
+
+    :cond_3
+    add-int/lit8 p0, p0, 0x1
+
+    goto :goto_2
+
+    :cond_4
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/String;)I
+    .locals 2
+
+    if-eqz p1, :cond_0
+
+    iget-object v0, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v0, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_0
+    const/16 p1, 0x8
+
+    move-object v0, p0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget-object v1, v0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    add-int/2addr p1, v1
+
+    iget-object v0, v0, Lq0/a/a/a;->f:Lq0/a/a/a;
+
+    goto :goto_0
+
+    :cond_1
+    return p1
+.end method
+
+.method public c(ILq0/a/a/c;)V
+    .locals 6
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    const/4 v4, 0x0
+
+    move-object v3, v2
+
+    move-object v2, p0
+
+    :goto_0
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v2}, Lq0/a/a/a;->g()V
+
+    iget-object v3, v2, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget v3, v3, Lq0/a/a/c;->b:I
+
+    add-int/2addr v1, v3
+
+    add-int/lit8 v4, v4, 0x1
+
+    iget-object v3, v2, Lq0/a/a/a;->f:Lq0/a/a/a;
+
+    move-object v5, v3
+
+    move-object v3, v2
+
+    move-object v2, v5
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p2, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {p2, v1}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    invoke-virtual {p2, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_1
+    if-eqz v3, :cond_1
+
+    iget-object p1, v3, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v1, p1, Lq0/a/a/c;->a:[B
+
+    iget p1, p1, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p2, v1, v0, p1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget-object v3, v3, Lq0/a/a/a;->g:Lq0/a/a/a;
+
+    goto :goto_1
+
+    :cond_1
+    return-void
+.end method
+
+.method public e(Ljava/lang/String;Ljava/lang/Object;)V
+    .locals 8
+
+    iget v0, p0, Lq0/a/a/a;->e:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lq0/a/a/a;->e:I
+
+    iget-boolean v0, p0, Lq0/a/a/a;->b:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v1, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v1, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_0
+    instance-of p1, p2, Ljava/lang/String;
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/16 v0, 0x73
+
+    iget-object v1, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    check-cast p2, Ljava/lang/String;
+
+    invoke-virtual {v1, p2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    invoke-virtual {p1, v0, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto/16 :goto_8
+
+    :cond_1
+    instance-of p1, p2, Ljava/lang/Byte;
+
+    const/16 v0, 0x42
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v1, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    check-cast p2, Ljava/lang/Byte;
+
+    invoke-virtual {p2}, Ljava/lang/Byte;->byteValue()B
+
+    move-result p2
+
+    invoke-virtual {v1, p2}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p2
+
+    iget p2, p2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p1, v0, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto/16 :goto_8
+
+    :cond_2
+    instance-of p1, p2, Ljava/lang/Boolean;
+
+    const/16 v1, 0x5a
+
+    if-eqz p1, :cond_3
+
+    check-cast p2, Ljava/lang/Boolean;
+
+    invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    iget-object p2, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v0, p1}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p1
+
+    iget p1, p1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p2, v1, p1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto/16 :goto_8
+
+    :cond_3
+    instance-of p1, p2, Ljava/lang/Character;
+
+    const/16 v2, 0x43
+
+    if-eqz p1, :cond_4
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    check-cast p2, Ljava/lang/Character;
+
+    invoke-virtual {p2}, Ljava/lang/Character;->charValue()C
+
+    move-result p2
+
+    invoke-virtual {v0, p2}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p2
+
+    iget p2, p2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p1, v2, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto/16 :goto_8
+
+    :cond_4
+    instance-of p1, p2, Ljava/lang/Short;
+
+    const/16 v3, 0x53
+
+    if-eqz p1, :cond_5
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    check-cast p2, Ljava/lang/Short;
+
+    invoke-virtual {p2}, Ljava/lang/Short;->shortValue()S
+
+    move-result p2
+
+    invoke-virtual {v0, p2}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p2
+
+    iget p2, p2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p1, v3, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto/16 :goto_8
+
+    :cond_5
+    instance-of p1, p2, Lq0/a/a/w;
+
+    if-eqz p1, :cond_6
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/16 v0, 0x63
+
+    iget-object v1, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    check-cast p2, Lq0/a/a/w;
+
+    invoke-virtual {p2}, Lq0/a/a/w;->d()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {v1, p2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    invoke-virtual {p1, v0, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto/16 :goto_8
+
+    :cond_6
+    instance-of p1, p2, [B
+
+    const/4 v4, 0x0
+
+    const/16 v5, 0x5b
+
+    if-eqz p1, :cond_7
+
+    check-cast p2, [B
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v1, p2
+
+    invoke-virtual {p1, v5, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_0
+    if-ge v4, p1, :cond_11
+
+    aget-byte v1, p2, v4
+
+    iget-object v2, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v3, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v3, v1}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v2, v0, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_7
+    instance-of p1, p2, [Z
+
+    if-eqz p1, :cond_8
+
+    check-cast p2, [Z
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v0, p2
+
+    invoke-virtual {p1, v5, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_1
+    if-ge v4, p1, :cond_11
+
+    aget-boolean v0, p2, v4
+
+    iget-object v2, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v3, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v3, v0}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v2, v1, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_1
+
+    :cond_8
+    instance-of p1, p2, [S
+
+    if-eqz p1, :cond_9
+
+    check-cast p2, [S
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v0, p2
+
+    invoke-virtual {p1, v5, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_2
+    if-ge v4, p1, :cond_11
+
+    aget-short v0, p2, v4
+
+    iget-object v1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v2, v0}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v1, v3, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_2
+
+    :cond_9
+    instance-of p1, p2, [C
+
+    if-eqz p1, :cond_a
+
+    check-cast p2, [C
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v0, p2
+
+    invoke-virtual {p1, v5, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_3
+    if-ge v4, p1, :cond_11
+
+    aget-char v0, p2, v4
+
+    iget-object v1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v3, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v3, v0}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v1, v2, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_3
+
+    :cond_a
+    instance-of p1, p2, [I
+
+    if-eqz p1, :cond_b
+
+    check-cast p2, [I
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v0, p2
+
+    invoke-virtual {p1, v5, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_4
+    if-ge v4, p1, :cond_11
+
+    aget v0, p2, v4
+
+    iget-object v1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/16 v2, 0x49
+
+    iget-object v3, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v3, v0}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v1, v2, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_4
+
+    :cond_b
+    instance-of p1, p2, [J
+
+    if-eqz p1, :cond_c
+
+    check-cast p2, [J
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v0, p2
+
+    invoke-virtual {p1, v5, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_5
+    if-ge v4, p1, :cond_11
+
+    aget-wide v0, p2, v4
+
+    iget-object v2, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/16 v3, 0x4a
+
+    iget-object v5, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    const/4 v6, 0x5
+
+    invoke-virtual {v5, v6, v0, v1}, Lq0/a/a/v;->g(IJ)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v2, v3, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_5
+
+    :cond_c
+    instance-of p1, p2, [F
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_e
+
+    check-cast p2, [F
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v1, p2
+
+    invoke-virtual {p1, v5, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_6
+    if-ge v4, p1, :cond_11
+
+    aget v1, p2, v4
+
+    iget-object v2, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/16 v3, 0x46
+
+    iget-object v5, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    if-eqz v5, :cond_d
+
+    invoke-static {v1}, Ljava/lang/Float;->floatToRawIntBits(F)I
+
+    move-result v1
+
+    const/4 v6, 0x4
+
+    invoke-virtual {v5, v6, v1}, Lq0/a/a/v;->f(II)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v2, v3, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_6
+
+    :cond_d
+    throw v0
+
+    :cond_e
+    instance-of p1, p2, [D
+
+    if-eqz p1, :cond_10
+
+    check-cast p2, [D
+
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    array-length v1, p2
+
+    invoke-virtual {p1, v5, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    array-length p1, p2
+
+    :goto_7
+    if-ge v4, p1, :cond_11
+
+    aget-wide v1, p2, v4
+
+    iget-object v3, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/16 v5, 0x44
+
+    iget-object v6, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    if-eqz v6, :cond_f
+
+    invoke-static {v1, v2}, Ljava/lang/Double;->doubleToRawLongBits(D)J
+
+    move-result-wide v1
+
+    const/4 v7, 0x6
+
+    invoke-virtual {v6, v7, v1, v2}, Lq0/a/a/v;->g(IJ)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v3, v5, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_7
+
+    :cond_f
+    throw v0
+
+    :cond_10
+    iget-object p1, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {p1, p2}, Lq0/a/a/v;->b(Ljava/lang/Object;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    iget-object p2, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget v0, p1, Lq0/a/a/u;->b:I
+
+    const-string v1, ".s.IFJDCS"
+
+    invoke-virtual {v1, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    iget p1, p1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p2, v0, p1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    :cond_11
+    :goto_8
+    return-void
+.end method
+
+.method public f(Ljava/lang/String;)Lq0/a/a/a;
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/a;->e:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lq0/a/a/a;->e:I
+
+    iget-boolean v0, p0, Lq0/a/a/a;->b:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v1, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v1, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_0
+    iget-object p1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/16 v0, 0x5b
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    new-instance p1, Lq0/a/a/a;
+
+    iget-object v0, p0, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    const/4 v3, 0x0
+
+    invoke-direct {p1, v0, v1, v2, v3}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    return-object p1
+.end method
+
+.method public g()V
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/a;->d:I
+
+    const/4 v1, -0x1
+
+    if-eq v0, v1, :cond_0
+
+    iget-object v1, p0, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v1, v1, Lq0/a/a/c;->a:[B
+
+    iget v2, p0, Lq0/a/a/a;->e:I
+
+    ushr-int/lit8 v3, v2, 0x8
+
+    int-to-byte v3, v3
+
+    aput-byte v3, v1, v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    int-to-byte v2, v2
+
+    aput-byte v2, v1, v0
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/b$a.smali b/com.discord/smali_classes2/q0/a/a/b$a.smali
new file mode 100644
index 0000000000..09e8656ecd
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/b$a.smali
@@ -0,0 +1,120 @@
+.class public final Lq0/a/a/b$a;
+.super Ljava/lang/Object;
+.source "Attribute.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lq0/a/a/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:I
+
+.field public b:[Lq0/a/a/b;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x6
+
+    new-array v0, v0, [Lq0/a/a/b;
+
+    iput-object v0, p0, Lq0/a/a/b$a;->b:[Lq0/a/a/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lq0/a/a/b;)V
+    .locals 4
+
+    :goto_0
+    if-eqz p1, :cond_4
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    :goto_1
+    iget v2, p0, Lq0/a/a/b$a;->a:I
+
+    if-ge v1, v2, :cond_1
+
+    iget-object v2, p0, Lq0/a/a/b$a;->b:[Lq0/a/a/b;
+
+    aget-object v2, v2, v1
+
+    iget-object v2, v2, Lq0/a/a/b;->a:Ljava/lang/String;
+
+    iget-object v3, p1, Lq0/a/a/b;->a:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_2
+
+    :cond_0
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_2
+    if-nez v1, :cond_3
+
+    iget v1, p0, Lq0/a/a/b$a;->a:I
+
+    iget-object v2, p0, Lq0/a/a/b$a;->b:[Lq0/a/a/b;
+
+    array-length v3, v2
+
+    if-lt v1, v3, :cond_2
+
+    array-length v3, v2
+
+    add-int/lit8 v3, v3, 0x6
+
+    new-array v3, v3, [Lq0/a/a/b;
+
+    invoke-static {v2, v0, v3, v0, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v3, p0, Lq0/a/a/b$a;->b:[Lq0/a/a/b;
+
+    :cond_2
+    iget-object v0, p0, Lq0/a/a/b$a;->b:[Lq0/a/a/b;
+
+    iget v1, p0, Lq0/a/a/b$a;->a:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Lq0/a/a/b$a;->a:I
+
+    aput-object p1, v0, v1
+
+    :cond_3
+    iget-object p1, p1, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    goto :goto_0
+
+    :cond_4
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/b.smali b/com.discord/smali_classes2/q0/a/a/b.smali
new file mode 100644
index 0000000000..b73a7683f5
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/b.smali
@@ -0,0 +1,159 @@
+.class public Lq0/a/a/b;
+.super Ljava/lang/Object;
+.source "Attribute.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lq0/a/a/b$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public b:[B
+
+.field public c:Lq0/a/a/b;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/b;->a:Ljava/lang/String;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lq0/a/a/v;)I
+    .locals 6
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, -0x1
+
+    const/4 v5, -0x1
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/b;->b(Lq0/a/a/v;[BIII)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final b(Lq0/a/a/v;[BIII)I
+    .locals 0
+
+    iget-object p2, p1, Lq0/a/a/v;->a:Lq0/a/a/f;
+
+    const/4 p2, 0x0
+
+    move-object p3, p0
+
+    :goto_0
+    if-eqz p3, :cond_0
+
+    iget-object p4, p3, Lq0/a/a/b;->a:Ljava/lang/String;
+
+    invoke-virtual {p1, p4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object p4, p3, Lq0/a/a/b;->b:[B
+
+    array-length p4, p4
+
+    add-int/lit8 p4, p4, 0x6
+
+    add-int/2addr p2, p4
+
+    iget-object p3, p3, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    goto :goto_0
+
+    :cond_0
+    return p2
+.end method
+
+.method public final c()I
+    .locals 2
+
+    const/4 v0, 0x0
+
+    move-object v1, p0
+
+    :goto_0
+    if-eqz v1, :cond_0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iget-object v1, v1, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    goto :goto_0
+
+    :cond_0
+    return v0
+.end method
+
+.method public final d(Lq0/a/a/v;Lq0/a/a/c;)V
+    .locals 7
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, -0x1
+
+    const/4 v5, -0x1
+
+    move-object v0, p0
+
+    move-object v1, p1
+
+    move-object v6, p2
+
+    invoke-virtual/range {v0 .. v6}, Lq0/a/a/b;->e(Lq0/a/a/v;[BIIILq0/a/a/c;)V
+
+    return-void
+.end method
+
+.method public final e(Lq0/a/a/v;[BIIILq0/a/a/c;)V
+    .locals 0
+
+    iget-object p2, p1, Lq0/a/a/v;->a:Lq0/a/a/f;
+
+    move-object p2, p0
+
+    :goto_0
+    if-eqz p2, :cond_0
+
+    iget-object p3, p2, Lq0/a/a/b;->b:[B
+
+    array-length p4, p3
+
+    iget-object p5, p2, Lq0/a/a/b;->a:Ljava/lang/String;
+
+    invoke-static {p1, p5, p6, p4}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    const/4 p5, 0x0
+
+    invoke-virtual {p6, p3, p5, p4}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget-object p2, p2, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/c.smali b/com.discord/smali_classes2/q0/a/a/c.smali
new file mode 100644
index 0000000000..713446f5a8
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/c.smali
@@ -0,0 +1,626 @@
+.class public Lq0/a/a/c;
+.super Ljava/lang/Object;
+.source "ByteVector.java"
+
+
+# instance fields
+.field public a:[B
+
+.field public b:I
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/16 v0, 0x40
+
+    new-array v0, v0, [B
+
+    iput-object v0, p0, Lq0/a/a/c;->a:[B
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-array p1, p1, [B
+
+    iput-object p1, p0, Lq0/a/a/c;->a:[B
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Ljava/lang/String;II)Lq0/a/a/c;
+    .locals 8
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    move v1, p2
+
+    move v2, v1
+
+    :goto_0
+    const/16 v3, 0x7f
+
+    const/16 v4, 0x7ff
+
+    const/4 v5, 0x1
+
+    if-ge v1, v0, :cond_2
+
+    invoke-virtual {p1, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v6
+
+    if-lt v6, v5, :cond_0
+
+    if-gt v6, v3, :cond_0
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    if-gt v6, v4, :cond_1
+
+    add-int/lit8 v2, v2, 0x2
+
+    goto :goto_1
+
+    :cond_1
+    add-int/lit8 v2, v2, 0x3
+
+    :goto_1
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    if-gt v2, p3, :cond_8
+
+    iget p3, p0, Lq0/a/a/c;->b:I
+
+    sub-int/2addr p3, p2
+
+    add-int/lit8 p3, p3, -0x2
+
+    if-ltz p3, :cond_3
+
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    ushr-int/lit8 v6, v2, 0x8
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v1, p3
+
+    add-int/2addr p3, v5
+
+    int-to-byte v6, v2
+
+    aput-byte v6, v1, p3
+
+    :cond_3
+    iget p3, p0, Lq0/a/a/c;->b:I
+
+    add-int/2addr p3, v2
+
+    sub-int/2addr p3, p2
+
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    array-length v1, v1
+
+    if-le p3, v1, :cond_4
+
+    sub-int/2addr v2, p2
+
+    invoke-virtual {p0, v2}, Lq0/a/a/c;->b(I)V
+
+    :cond_4
+    iget p3, p0, Lq0/a/a/c;->b:I
+
+    :goto_2
+    if-ge p2, v0, :cond_7
+
+    invoke-virtual {p1, p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    if-lt v1, v5, :cond_5
+
+    if-gt v1, v3, :cond_5
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v6, p3, 0x1
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v2, p3
+
+    goto :goto_3
+
+    :cond_5
+    if-gt v1, v4, :cond_6
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v6, p3, 0x1
+
+    shr-int/lit8 v7, v1, 0x6
+
+    and-int/lit8 v7, v7, 0x1f
+
+    or-int/lit16 v7, v7, 0xc0
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v2, p3
+
+    add-int/lit8 p3, v6, 0x1
+
+    and-int/lit8 v1, v1, 0x3f
+
+    or-int/lit16 v1, v1, 0x80
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v2, v6
+
+    goto :goto_4
+
+    :cond_6
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v6, p3, 0x1
+
+    shr-int/lit8 v7, v1, 0xc
+
+    and-int/lit8 v7, v7, 0xf
+
+    or-int/lit16 v7, v7, 0xe0
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v2, p3
+
+    add-int/lit8 p3, v6, 0x1
+
+    shr-int/lit8 v7, v1, 0x6
+
+    and-int/lit8 v7, v7, 0x3f
+
+    or-int/lit16 v7, v7, 0x80
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v2, v6
+
+    add-int/lit8 v6, p3, 0x1
+
+    and-int/lit8 v1, v1, 0x3f
+
+    or-int/lit16 v1, v1, 0x80
+
+    int-to-byte v1, v1
+
+    aput-byte v1, v2, p3
+
+    :goto_3
+    move p3, v6
+
+    :goto_4
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_2
+
+    :cond_7
+    iput p3, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+
+    :cond_8
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "UTF8 string too large"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final b(I)V
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/c;->a:[B
+
+    array-length v0, v0
+
+    mul-int/lit8 v0, v0, 0x2
+
+    iget v1, p0, Lq0/a/a/c;->b:I
+
+    add-int/2addr v1, p1
+
+    if-le v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    move v0, v1
+
+    :goto_0
+    new-array p1, v0, [B
+
+    iget-object v0, p0, Lq0/a/a/c;->a:[B
+
+    iget v1, p0, Lq0/a/a/c;->b:I
+
+    const/4 v2, 0x0
+
+    invoke-static {v0, v2, p1, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object p1, p0, Lq0/a/a/c;->a:[B
+
+    return-void
+.end method
+
+.method public final c(II)Lq0/a/a/c;
+    .locals 3
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v0, 0x2
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v2, v0, 0x1
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v0
+
+    add-int/lit8 p1, v2, 0x1
+
+    int-to-byte p2, p2
+
+    aput-byte p2, v1, v2
+
+    iput p1, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
+
+.method public final d(III)Lq0/a/a/c;
+    .locals 3
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v0, 0x4
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x4
+
+    invoke-virtual {p0, v1}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v2, v0, 0x1
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v0
+
+    add-int/lit8 p1, v2, 0x1
+
+    int-to-byte p2, p2
+
+    aput-byte p2, v1, v2
+
+    add-int/lit8 p2, p1, 0x1
+
+    ushr-int/lit8 v0, p3, 0x8
+
+    int-to-byte v0, v0
+
+    aput-byte v0, v1, p1
+
+    add-int/lit8 p1, p2, 0x1
+
+    int-to-byte p3, p3
+
+    aput-byte p3, v1, p2
+
+    iput p1, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
+
+.method public final e(II)Lq0/a/a/c;
+    .locals 3
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v0, 0x3
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x3
+
+    invoke-virtual {p0, v1}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v2, v0, 0x1
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v0
+
+    add-int/lit8 p1, v2, 0x1
+
+    ushr-int/lit8 v0, p2, 0x8
+
+    int-to-byte v0, v0
+
+    aput-byte v0, v1, v2
+
+    add-int/lit8 v0, p1, 0x1
+
+    int-to-byte p2, p2
+
+    aput-byte p2, v1, p1
+
+    iput v0, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
+
+.method public final f(III)Lq0/a/a/c;
+    .locals 3
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v0, 0x5
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x5
+
+    invoke-virtual {p0, v1}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v2, v0, 0x1
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v0
+
+    add-int/lit8 p1, v2, 0x1
+
+    ushr-int/lit8 v0, p2, 0x8
+
+    int-to-byte v0, v0
+
+    aput-byte v0, v1, v2
+
+    add-int/lit8 v0, p1, 0x1
+
+    int-to-byte p2, p2
+
+    aput-byte p2, v1, p1
+
+    add-int/lit8 p1, v0, 0x1
+
+    ushr-int/lit8 p2, p3, 0x8
+
+    int-to-byte p2, p2
+
+    aput-byte p2, v1, v0
+
+    add-int/lit8 p2, p1, 0x1
+
+    int-to-byte p3, p3
+
+    aput-byte p3, v1, p1
+
+    iput p2, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
+
+.method public g(I)Lq0/a/a/c;
+    .locals 3
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v0, 0x1
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v2, v0
+
+    iput v1, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
+
+.method public h([BII)Lq0/a/a/c;
+    .locals 2
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/2addr v0, p3
+
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    array-length v1, v1
+
+    if-le v0, v1, :cond_0
+
+    invoke-virtual {p0, p3}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    if-eqz p1, :cond_1
+
+    iget-object v0, p0, Lq0/a/a/c;->a:[B
+
+    iget v1, p0, Lq0/a/a/c;->b:I
+
+    invoke-static {p1, p2, v0, v1, p3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    :cond_1
+    iget p1, p0, Lq0/a/a/c;->b:I
+
+    add-int/2addr p1, p3
+
+    iput p1, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
+
+.method public i(I)Lq0/a/a/c;
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v0, 0x4
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x4
+
+    invoke-virtual {p0, v1}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v2, v0, 0x1
+
+    ushr-int/lit8 v3, p1, 0x18
+
+    int-to-byte v3, v3
+
+    aput-byte v3, v1, v0
+
+    add-int/lit8 v0, v2, 0x1
+
+    ushr-int/lit8 v3, p1, 0x10
+
+    int-to-byte v3, v3
+
+    aput-byte v3, v1, v2
+
+    add-int/lit8 v2, v0, 0x1
+
+    ushr-int/lit8 v3, p1, 0x8
+
+    int-to-byte v3, v3
+
+    aput-byte v3, v1, v0
+
+    add-int/lit8 v0, v2, 0x1
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v2
+
+    iput v0, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
+
+.method public j(I)Lq0/a/a/c;
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v0, 0x2
+
+    iget-object v2, p0, Lq0/a/a/c;->a:[B
+
+    array-length v2, v2
+
+    if-le v1, v2, :cond_0
+
+    const/4 v1, 0x2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/c;->b(I)V
+
+    :cond_0
+    iget-object v1, p0, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v2, v0, 0x1
+
+    ushr-int/lit8 v3, p1, 0x8
+
+    int-to-byte v3, v3
+
+    aput-byte v3, v1, v0
+
+    add-int/lit8 v0, v2, 0x1
+
+    int-to-byte p1, p1
+
+    aput-byte p1, v1, v2
+
+    iput v0, p0, Lq0/a/a/c;->b:I
+
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/d.smali b/com.discord/smali_classes2/q0/a/a/d.smali
new file mode 100644
index 0000000000..8d8ec813fc
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/d.smali
@@ -0,0 +1,6878 @@
+.class public Lq0/a/a/d;
+.super Ljava/lang/Object;
+.source "ClassReader.java"
+
+
+# instance fields
+.field public final a:[B
+
+.field public final b:[I
+
+.field public final c:[Ljava/lang/String;
+
+.field public final d:[Lq0/a/a/g;
+
+.field public final e:[I
+
+.field public final f:I
+
+.field public final g:I
+
+
+# direct methods
+.method public constructor <init>([BIZ)V
+    .locals 9
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/d;->a:[B
+
+    if-eqz p3, :cond_1
+
+    add-int/lit8 p3, p2, 0x6
+
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->q(I)S
+
+    move-result v0
+
+    const/16 v1, 0x38
+
+    if-gt v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Unsupported class file major version "
+
+    invoke-static {p2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->q(I)S
+
+    move-result p3
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    add-int/lit8 p3, p2, 0x8
+
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->u(I)I
+
+    move-result p3
+
+    new-array v0, p3, [I
+
+    iput-object v0, p0, Lq0/a/a/d;->b:[I
+
+    new-array v0, p3, [Ljava/lang/String;
+
+    iput-object v0, p0, Lq0/a/a/d;->c:[Ljava/lang/String;
+
+    add-int/lit8 p2, p2, 0xa
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_1
+    const/4 v5, 0x4
+
+    if-ge v1, p3, :cond_3
+
+    iget-object v6, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v7, v1, 0x1
+
+    add-int/lit8 v8, p2, 0x1
+
+    aput v8, v6, v1
+
+    aget-byte v1, p1, p2
+
+    packed-switch v1, :pswitch_data_0
+
+    :pswitch_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :pswitch_1
+    const/4 v4, 0x1
+
+    goto :goto_2
+
+    :pswitch_2
+    const/4 v3, 0x1
+
+    goto :goto_2
+
+    :pswitch_3
+    const/4 v1, 0x3
+
+    goto :goto_4
+
+    :pswitch_4
+    const/16 v5, 0x9
+
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_3
+
+    :goto_2
+    :pswitch_5
+    const/4 v1, 0x5
+
+    goto :goto_4
+
+    :pswitch_6
+    invoke-virtual {p0, v8}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v5, v1, 0x3
+
+    if-le v5, v2, :cond_2
+
+    move v2, v5
+
+    :cond_2
+    :goto_3
+    :pswitch_7
+    move v1, v5
+
+    :goto_4
+    add-int/2addr p2, v1
+
+    move v1, v7
+
+    goto :goto_1
+
+    :cond_3
+    iput v2, p0, Lq0/a/a/d;->f:I
+
+    iput p2, p0, Lq0/a/a/d;->g:I
+
+    const/4 p1, 0x0
+
+    if-eqz v3, :cond_4
+
+    new-array p2, p3, [Lq0/a/a/g;
+
+    goto :goto_5
+
+    :cond_4
+    move-object p2, p1
+
+    :goto_5
+    iput-object p2, p0, Lq0/a/a/d;->d:[Lq0/a/a/g;
+
+    or-int p2, v3, v4
+
+    if-eqz p2, :cond_7
+
+    new-array p2, v2, [C
+
+    invoke-virtual {p0}, Lq0/a/a/d;->c()I
+
+    move-result p3
+
+    add-int/lit8 v1, p3, -0x2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    :goto_6
+    if-lez v1, :cond_7
+
+    invoke-virtual {p0, p3, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v3, p3, 0x2
+
+    invoke-virtual {p0, v3}, Lq0/a/a/d;->l(I)I
+
+    move-result v3
+
+    add-int/lit8 p3, p3, 0x6
+
+    const-string v4, "BootstrapMethods"
+
+    invoke-virtual {v4, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_6
+
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->u(I)I
+
+    move-result p1
+
+    new-array p2, p1, [I
+
+    add-int/lit8 p3, p3, 0x2
+
+    :goto_7
+    if-ge v0, p1, :cond_5
+
+    aput p3, p2, v0
+
+    add-int/lit8 v1, p3, 0x2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    mul-int/lit8 v1, v1, 0x2
+
+    add-int/2addr v1, v5
+
+    add-int/2addr p3, v1
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_7
+
+    :cond_5
+    move-object p1, p2
+
+    goto :goto_8
+
+    :cond_6
+    add-int/2addr p3, v3
+
+    add-int/lit8 v1, v1, -0x1
+
+    goto :goto_6
+
+    :cond_7
+    :goto_8
+    iput-object p1, p0, Lq0/a/a/d;->e:[I
+
+    return-void
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x1
+        :pswitch_6
+        :pswitch_0
+        :pswitch_5
+        :pswitch_5
+        :pswitch_4
+        :pswitch_4
+        :pswitch_3
+        :pswitch_3
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_5
+        :pswitch_0
+        :pswitch_0
+        :pswitch_7
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_3
+        :pswitch_3
+    .end packed-switch
+.end method
+
+
+# virtual methods
+.method public final a(I[Lq0/a/a/p;)V
+    .locals 1
+
+    aget-object v0, p2, p1
+
+    if-nez v0, :cond_1
+
+    aget-object v0, p2, p1
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Lq0/a/a/p;
+
+    invoke-direct {v0}, Lq0/a/a/p;-><init>()V
+
+    aput-object v0, p2, p1
+
+    :cond_0
+    aget-object p1, p2, p1
+
+    iget-short p2, p1, Lq0/a/a/p;->a:S
+
+    or-int/lit8 p2, p2, 0x1
+
+    int-to-short p2, p2
+
+    iput-short p2, p1, Lq0/a/a/p;->a:S
+
+    :cond_1
+    return-void
+.end method
+
+.method public final b(I[Lq0/a/a/p;)Lq0/a/a/p;
+    .locals 1
+
+    aget-object v0, p2, p1
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Lq0/a/a/p;
+
+    invoke-direct {v0}, Lq0/a/a/p;-><init>()V
+
+    aput-object v0, p2, p1
+
+    :cond_0
+    aget-object p1, p2, p1
+
+    iget-short p2, p1, Lq0/a/a/p;->a:S
+
+    and-int/lit8 p2, p2, -0x2
+
+    int-to-short p2, p2
+
+    iput-short p2, p1, Lq0/a/a/p;->a:S
+
+    return-object p1
+.end method
+
+.method public final c()I
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/d;->g:I
+
+    add-int/lit8 v1, v0, 0x8
+
+    add-int/lit8 v0, v0, 0x6
+
+    invoke-virtual {p0, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    mul-int/lit8 v0, v0, 0x2
+
+    add-int/2addr v0, v1
+
+    invoke-virtual {p0, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v0, v0, 0x2
+
+    :goto_0
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_1
+
+    add-int/lit8 v1, v0, 0x6
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v0, v0, 0x8
+
+    :goto_1
+    add-int/lit8 v3, v1, -0x1
+
+    if-lez v1, :cond_0
+
+    add-int/lit8 v1, v0, 0x2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x6
+
+    add-int/2addr v0, v1
+
+    move v1, v3
+
+    goto :goto_1
+
+    :cond_0
+    move v1, v2
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v0, v0, 0x2
+
+    :goto_2
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_3
+
+    add-int/lit8 v1, v0, 0x6
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v0, v0, 0x8
+
+    :goto_3
+    add-int/lit8 v3, v1, -0x1
+
+    if-lez v1, :cond_2
+
+    add-int/lit8 v1, v0, 0x2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    add-int/lit8 v1, v1, 0x6
+
+    add-int/2addr v0, v1
+
+    move v1, v3
+
+    goto :goto_3
+
+    :cond_2
+    move v1, v2
+
+    goto :goto_2
+
+    :cond_3
+    add-int/lit8 v0, v0, 0x2
+
+    return v0
+.end method
+
+.method public final d([II)I
+    .locals 2
+
+    if-eqz p1, :cond_1
+
+    array-length v0, p1
+
+    if-ge p2, v0, :cond_1
+
+    aget v0, p1, p2
+
+    invoke-virtual {p0, v0}, Lq0/a/a/d;->f(I)I
+
+    move-result v0
+
+    const/16 v1, 0x43
+
+    if-ge v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    aget p1, p1, p2
+
+    add-int/lit8 p1, p1, 0x1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/d;->u(I)I
+
+    move-result p1
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, -0x1
+
+    return p1
+.end method
+
+.method public final e([Lq0/a/a/b;Ljava/lang/String;II[CI[Lq0/a/a/p;)Lq0/a/a/b;
+    .locals 2
+
+    array-length p5, p1
+
+    const/4 p6, 0x0
+
+    const/4 p7, 0x0
+
+    :goto_0
+    if-ge p7, p5, :cond_1
+
+    aget-object v0, p1, p7
+
+    iget-object v1, v0, Lq0/a/a/b;->a:Ljava/lang/String;
+
+    invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    new-instance p1, Lq0/a/a/b;
+
+    iget-object p2, v0, Lq0/a/a/b;->a:Ljava/lang/String;
+
+    invoke-direct {p1, p2}, Lq0/a/a/b;-><init>(Ljava/lang/String;)V
+
+    new-array p2, p4, [B
+
+    iput-object p2, p1, Lq0/a/a/b;->b:[B
+
+    iget-object p5, p0, Lq0/a/a/d;->a:[B
+
+    invoke-static {p5, p3, p2, p6, p4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    return-object p1
+
+    :cond_0
+    add-int/lit8 p7, p7, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Lq0/a/a/b;
+
+    invoke-direct {p1, p2}, Lq0/a/a/b;-><init>(Ljava/lang/String;)V
+
+    new-array p2, p4, [B
+
+    iput-object p2, p1, Lq0/a/a/b;->b:[B
+
+    iget-object p5, p0, Lq0/a/a/d;->a:[B
+
+    invoke-static {p5, p3, p2, p6, p4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    return-object p1
+.end method
+
+.method public f(I)I
+    .locals 1
+
+    iget-object v0, p0, Lq0/a/a/d;->a:[B
+
+    aget-byte p1, v0, p1
+
+    and-int/lit16 p1, p1, 0xff
+
+    return p1
+.end method
+
+.method public g(I[C)Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {p0, p1}, Lq0/a/a/d;->u(I)I
+
+    move-result p1
+
+    aget p1, v0, p1
+
+    invoke-virtual {p0, p1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final h(Lq0/a/a/q;Lq0/a/a/h;I)V
+    .locals 47
+
+    move-object/from16 v8, p0
+
+    move-object/from16 v9, p1
+
+    move-object/from16 v10, p2
+
+    move/from16 v11, p3
+
+    iget-object v12, v8, Lq0/a/a/d;->a:[B
+
+    iget-object v13, v10, Lq0/a/a/h;->c:[C
+
+    invoke-virtual {v8, v11}, Lq0/a/a/d;->u(I)I
+
+    move-result v14
+
+    add-int/lit8 v0, v11, 0x2
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v15
+
+    add-int/lit8 v0, v11, 0x4
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v7
+
+    add-int/lit8 v16, v11, 0x8
+
+    add-int v6, v16, v7
+
+    add-int/lit8 v0, v7, 0x1
+
+    new-array v5, v0, [Lq0/a/a/p;
+
+    iput-object v5, v10, Lq0/a/a/h;->g:[Lq0/a/a/p;
+
+    move/from16 v0, v16
+
+    :goto_0
+    const/16 v4, 0x84
+
+    const/16 v3, 0xff
+
+    const/4 v1, 0x4
+
+    if-ge v0, v6, :cond_3
+
+    sub-int v18, v0, v16
+
+    aget-byte v2, v12, v0
+
+    and-int/2addr v2, v3
+
+    packed-switch v2, :pswitch_data_0
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw v0
+
+    :pswitch_0
+    add-int/lit8 v1, v0, 0x1
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int v1, v1, v18
+
+    invoke-virtual {v8, v1, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    goto/16 :goto_4
+
+    :pswitch_1
+    add-int/lit8 v1, v0, 0x1
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    add-int v1, v1, v18
+
+    invoke-virtual {v8, v1, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    goto :goto_1
+
+    :pswitch_2
+    add-int/lit8 v1, v0, 0x1
+
+    aget-byte v1, v12, v1
+
+    and-int/2addr v1, v3
+
+    if-eq v1, v4, :cond_1
+
+    const/16 v2, 0xa9
+
+    if-eq v1, v2, :cond_0
+
+    packed-switch v1, :pswitch_data_1
+
+    packed-switch v1, :pswitch_data_2
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw v0
+
+    :cond_0
+    :pswitch_3
+    add-int/lit8 v0, v0, 0x4
+
+    goto :goto_0
+
+    :cond_1
+    add-int/lit8 v0, v0, 0x6
+
+    goto :goto_0
+
+    :goto_1
+    :pswitch_4
+    add-int/lit8 v0, v0, 0x5
+
+    goto :goto_0
+
+    :pswitch_5
+    and-int/lit8 v2, v18, 0x3
+
+    sub-int/2addr v1, v2
+
+    add-int/2addr v1, v0
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    add-int v0, v0, v18
+
+    invoke-virtual {v8, v0, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    add-int/lit8 v0, v1, 0x4
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    const/16 v2, 0x8
+
+    add-int/2addr v1, v2
+
+    :goto_2
+    add-int/lit8 v2, v0, -0x1
+
+    if-lez v0, :cond_2
+
+    add-int/lit8 v0, v1, 0x4
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    add-int v0, v0, v18
+
+    invoke-virtual {v8, v0, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    add-int/lit8 v1, v1, 0x8
+
+    move v0, v2
+
+    goto :goto_2
+
+    :pswitch_6
+    and-int/lit8 v2, v18, 0x3
+
+    sub-int/2addr v1, v2
+
+    add-int/2addr v1, v0
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    add-int v0, v0, v18
+
+    invoke-virtual {v8, v0, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    add-int/lit8 v0, v1, 0x8
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    add-int/lit8 v2, v1, 0x4
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->l(I)I
+
+    move-result v2
+
+    sub-int/2addr v0, v2
+
+    const/4 v2, 0x1
+
+    add-int/2addr v0, v2
+
+    add-int/lit8 v1, v1, 0xc
+
+    :goto_3
+    add-int/lit8 v2, v0, -0x1
+
+    if-lez v0, :cond_2
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    add-int v0, v0, v18
+
+    invoke-virtual {v8, v0, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    add-int/lit8 v1, v1, 0x4
+
+    move v0, v2
+
+    goto :goto_3
+
+    :cond_2
+    move v0, v1
+
+    goto/16 :goto_0
+
+    :pswitch_7
+    add-int/lit8 v1, v0, 0x1
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->q(I)S
+
+    move-result v1
+
+    add-int v1, v1, v18
+
+    invoke-virtual {v8, v1, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    :goto_4
+    :pswitch_8
+    add-int/lit8 v0, v0, 0x3
+
+    goto/16 :goto_0
+
+    :pswitch_9
+    add-int/lit8 v0, v0, 0x2
+
+    goto/16 :goto_0
+
+    :pswitch_a
+    add-int/lit8 v0, v0, 0x1
+
+    goto/16 :goto_0
+
+    :cond_3
+    const/16 v2, 0x8
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v17
+
+    const/4 v1, 0x2
+
+    add-int/2addr v0, v1
+
+    :goto_5
+    add-int/lit8 v20, v17, -0x1
+
+    if-lez v17, :cond_6
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    invoke-virtual {v8, v2, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v24
+
+    add-int/lit8 v2, v0, 0x2
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    invoke-virtual {v8, v2, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v25
+
+    add-int/lit8 v2, v0, 0x4
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    invoke-virtual {v8, v2, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v26
+
+    iget-object v2, v8, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v3, v0, 0x6
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    aget v2, v2, v3
+
+    invoke-virtual {v8, v2, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v0, v0, 0x8
+
+    move-object v3, v9
+
+    check-cast v3, Lq0/a/a/r;
+
+    new-instance v4, Lq0/a/a/o;
+
+    if-eqz v2, :cond_4
+
+    iget-object v1, v3, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    move/from16 v31, v6
+
+    const/4 v6, 0x7
+
+    invoke-virtual {v1, v6, v2}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    move/from16 v27, v1
+
+    goto :goto_6
+
+    :cond_4
+    move/from16 v31, v6
+
+    const/16 v27, 0x0
+
+    :goto_6
+    move-object/from16 v23, v4
+
+    move-object/from16 v28, v2
+
+    invoke-direct/range {v23 .. v28}, Lq0/a/a/o;-><init>(Lq0/a/a/p;Lq0/a/a/p;Lq0/a/a/p;ILjava/lang/String;)V
+
+    iget-object v1, v3, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    if-nez v1, :cond_5
+
+    iput-object v4, v3, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    goto :goto_7
+
+    :cond_5
+    iget-object v1, v3, Lq0/a/a/r;->m:Lq0/a/a/o;
+
+    iput-object v4, v1, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    :goto_7
+    iput-object v4, v3, Lq0/a/a/r;->m:Lq0/a/a/o;
+
+    move/from16 v17, v20
+
+    move/from16 v6, v31
+
+    const/4 v1, 0x2
+
+    const/16 v2, 0x8
+
+    const/16 v3, 0xff
+
+    const/16 v4, 0x84
+
+    goto :goto_5
+
+    :cond_6
+    move/from16 v31, v6
+
+    const/4 v6, 0x7
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    const/4 v3, 0x2
+
+    add-int/2addr v0, v3
+
+    const/4 v3, 0x0
+
+    const/16 v20, 0x1
+
+    const/16 v22, 0x0
+
+    const/16 v32, 0x0
+
+    const/16 v33, 0x0
+
+    const/16 v34, 0x0
+
+    const/16 v35, 0x0
+
+    const/16 v36, 0x0
+
+    :goto_8
+    add-int/lit8 v23, v2, -0x1
+
+    if-lez v2, :cond_14
+
+    invoke-virtual {v8, v0, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v4, v0, 0x2
+
+    invoke-virtual {v8, v4}, Lq0/a/a/d;->l(I)I
+
+    move-result v25
+
+    add-int/lit8 v4, v0, 0x6
+
+    const-string v0, "LocalVariableTable"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_9
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    const/4 v2, 0x2
+
+    and-int/2addr v0, v2
+
+    if-nez v0, :cond_8
+
+    invoke-virtual {v8, v4}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 v2, v4, 0x2
+
+    :goto_9
+    add-int/lit8 v26, v0, -0x1
+
+    if-lez v0, :cond_7
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    invoke-virtual {v8, v0, v5}, Lq0/a/a/d;->a(I[Lq0/a/a/p;)V
+
+    add-int/lit8 v6, v2, 0x2
+
+    invoke-virtual {v8, v6}, Lq0/a/a/d;->u(I)I
+
+    move-result v6
+
+    add-int/2addr v6, v0
+
+    invoke-virtual {v8, v6, v5}, Lq0/a/a/d;->a(I[Lq0/a/a/p;)V
+
+    add-int/lit8 v2, v2, 0xa
+
+    move/from16 v0, v26
+
+    const/4 v6, 0x7
+
+    goto :goto_9
+
+    :cond_7
+    move/from16 v35, v4
+
+    goto :goto_a
+
+    :cond_8
+    move-object/from16 v38, v3
+
+    move-object/from16 v39, v5
+
+    move/from16 v40, v7
+
+    goto/16 :goto_10
+
+    :cond_9
+    const-string v0, "LocalVariableTypeTable"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_a
+
+    move/from16 v36, v4
+
+    :goto_a
+    move-object v0, v3
+
+    move-object/from16 v39, v5
+
+    move/from16 v40, v7
+
+    const/4 v1, 0x0
+
+    const/4 v3, 0x1
+
+    :goto_b
+    const/4 v5, 0x4
+
+    goto/16 :goto_13
+
+    :cond_a
+    const-string v0, "LineNumberTable"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_e
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    const/4 v6, 0x2
+
+    and-int/2addr v0, v6
+
+    if-nez v0, :cond_8
+
+    invoke-virtual {v8, v4}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 v2, v4, 0x2
+
+    :goto_c
+    add-int/lit8 v21, v0, -0x1
+
+    if-lez v0, :cond_8
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 v6, v2, 0x2
+
+    invoke-virtual {v8, v6}, Lq0/a/a/d;->u(I)I
+
+    move-result v6
+
+    const/4 v1, 0x4
+
+    add-int/2addr v2, v1
+
+    invoke-virtual {v8, v0, v5}, Lq0/a/a/d;->a(I[Lq0/a/a/p;)V
+
+    aget-object v0, v5, v0
+
+    iget-short v1, v0, Lq0/a/a/p;->b:S
+
+    if-nez v1, :cond_b
+
+    int-to-short v1, v6
+
+    iput-short v1, v0, Lq0/a/a/p;->b:S
+
+    move/from16 v37, v2
+
+    move-object/from16 v38, v3
+
+    move-object/from16 v39, v5
+
+    move/from16 v40, v7
+
+    goto :goto_f
+
+    :cond_b
+    iget-object v1, v0, Lq0/a/a/p;->c:[I
+
+    if-nez v1, :cond_c
+
+    move/from16 v37, v2
+
+    const/4 v1, 0x4
+
+    new-array v2, v1, [I
+
+    iput-object v2, v0, Lq0/a/a/p;->c:[I
+
+    goto :goto_d
+
+    :cond_c
+    move/from16 v37, v2
+
+    const/4 v1, 0x4
+
+    :goto_d
+    iget-object v2, v0, Lq0/a/a/p;->c:[I
+
+    const/4 v1, 0x0
+
+    aget v28, v2, v1
+
+    move-object/from16 v38, v3
+
+    const/16 v19, 0x1
+
+    add-int/lit8 v3, v28, 0x1
+
+    aput v3, v2, v1
+
+    array-length v1, v2
+
+    if-lt v3, v1, :cond_d
+
+    array-length v1, v2
+
+    const/16 v18, 0x4
+
+    add-int/lit8 v1, v1, 0x4
+
+    new-array v1, v1, [I
+
+    move-object/from16 v39, v5
+
+    array-length v5, v2
+
+    move/from16 v40, v7
+
+    const/4 v7, 0x0
+
+    invoke-static {v2, v7, v1, v7, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v1, v0, Lq0/a/a/p;->c:[I
+
+    goto :goto_e
+
+    :cond_d
+    move-object/from16 v39, v5
+
+    move/from16 v40, v7
+
+    :goto_e
+    iget-object v0, v0, Lq0/a/a/p;->c:[I
+
+    aput v6, v0, v3
+
+    :goto_f
+    move/from16 v0, v21
+
+    move/from16 v2, v37
+
+    move-object/from16 v3, v38
+
+    move-object/from16 v5, v39
+
+    move/from16 v7, v40
+
+    const/4 v6, 0x2
+
+    goto :goto_c
+
+    :goto_10
+    const/4 v1, 0x0
+
+    const/4 v3, 0x1
+
+    goto :goto_11
+
+    :cond_e
+    move-object/from16 v38, v3
+
+    move-object/from16 v39, v5
+
+    move/from16 v40, v7
+
+    const-string v0, "RuntimeVisibleTypeAnnotations"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_f
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v8, v9, v10, v4, v3}, Lq0/a/a/d;->s(Lq0/a/a/q;Lq0/a/a/h;IZ)[I
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    goto/16 :goto_b
+
+    :cond_f
+    const/4 v3, 0x1
+
+    const-string v0, "RuntimeInvisibleTypeAnnotations"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_10
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v8, v9, v10, v4, v1}, Lq0/a/a/d;->s(Lq0/a/a/q;Lq0/a/a/h;IZ)[I
+
+    move-result-object v34
+
+    :goto_11
+    const/4 v5, 0x4
+
+    goto :goto_12
+
+    :cond_10
+    const/4 v1, 0x0
+
+    const-string v0, "StackMapTable"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_11
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    const/4 v5, 0x4
+
+    and-int/2addr v0, v5
+
+    if-nez v0, :cond_12
+
+    add-int/lit8 v22, v4, 0x2
+
+    add-int v33, v4, v25
+
+    goto :goto_12
+
+    :cond_11
+    const/4 v5, 0x4
+
+    const-string v0, "StackMap"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_13
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    and-int/2addr v0, v5
+
+    if-nez v0, :cond_12
+
+    add-int/lit8 v0, v4, 0x2
+
+    add-int v2, v4, v25
+
+    move/from16 v22, v0
+
+    move/from16 v33, v2
+
+    move/from16 v17, v4
+
+    move/from16 v42, v31
+
+    move-object/from16 v3, v38
+
+    move-object/from16 v19, v39
+
+    move/from16 v43, v40
+
+    const/16 v11, 0x8
+
+    const/16 v20, 0x0
+
+    goto :goto_14
+
+    :cond_12
+    :goto_12
+    move-object/from16 v0, v38
+
+    :goto_13
+    move-object v3, v0
+
+    move/from16 v17, v4
+
+    move/from16 v42, v31
+
+    move-object/from16 v19, v39
+
+    move/from16 v43, v40
+
+    const/16 v11, 0x8
+
+    goto :goto_14
+
+    :cond_13
+    iget-object v6, v10, Lq0/a/a/h;->a:[Lq0/a/a/b;
+
+    move-object/from16 v0, p0
+
+    const/4 v5, 0x7
+
+    const/4 v7, 0x0
+
+    const/4 v11, 0x2
+
+    move-object v1, v6
+
+    const/16 v3, 0x8
+
+    const/4 v6, 0x1
+
+    move-object/from16 v41, v38
+
+    const/16 v11, 0x8
+
+    move v3, v4
+
+    move/from16 v17, v4
+
+    move/from16 v4, v25
+
+    move-object/from16 v19, v39
+
+    move-object v5, v13
+
+    move/from16 v42, v31
+
+    move/from16 v6, p3
+
+    move/from16 v43, v40
+
+    move-object/from16 v7, v19
+
+    invoke-virtual/range {v0 .. v7}, Lq0/a/a/d;->e([Lq0/a/a/b;Ljava/lang/String;II[CI[Lq0/a/a/p;)Lq0/a/a/b;
+
+    move-result-object v0
+
+    move-object/from16 v7, v32
+
+    iput-object v7, v0, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    move-object/from16 v32, v0
+
+    move-object/from16 v3, v41
+
+    :goto_14
+    add-int v0, v17, v25
+
+    move/from16 v11, p3
+
+    move-object/from16 v5, v19
+
+    move/from16 v2, v23
+
+    move/from16 v31, v42
+
+    move/from16 v7, v43
+
+    const/4 v6, 0x7
+
+    goto/16 :goto_8
+
+    :cond_14
+    move-object/from16 v41, v3
+
+    move-object/from16 v19, v5
+
+    move/from16 v43, v7
+
+    move/from16 v42, v31
+
+    move-object/from16 v7, v32
+
+    const/16 v11, 0x8
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    and-int/2addr v0, v11
+
+    if-eqz v0, :cond_15
+
+    const/4 v6, 0x1
+
+    goto :goto_15
+
+    :cond_15
+    const/4 v6, 0x0
+
+    :goto_15
+    const/4 v5, -0x1
+
+    if-eqz v22, :cond_25
+
+    iput v5, v10, Lq0/a/a/h;->m:I
+
+    const/4 v4, 0x0
+
+    iput v4, v10, Lq0/a/a/h;->n:I
+
+    iput v4, v10, Lq0/a/a/h;->o:I
+
+    iput v4, v10, Lq0/a/a/h;->p:I
+
+    new-array v0, v15, [Ljava/lang/Object;
+
+    iput-object v0, v10, Lq0/a/a/h;->q:[Ljava/lang/Object;
+
+    iput v4, v10, Lq0/a/a/h;->r:I
+
+    new-array v1, v14, [Ljava/lang/Object;
+
+    iput-object v1, v10, Lq0/a/a/h;->s:[Ljava/lang/Object;
+
+    if-eqz v6, :cond_20
+
+    iget-object v1, v10, Lq0/a/a/h;->f:Ljava/lang/String;
+
+    iget v2, v10, Lq0/a/a/h;->d:I
+
+    and-int/2addr v2, v11
+
+    if-nez v2, :cond_17
+
+    iget-object v2, v10, Lq0/a/a/h;->e:Ljava/lang/String;
+
+    const-string v3, "<init>"
+
+    invoke-virtual {v3, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_16
+
+    sget-object v2, Lq0/a/a/t;->g:Ljava/lang/Integer;
+
+    aput-object v2, v0, v4
+
+    goto :goto_16
+
+    :cond_16
+    iget v2, v8, Lq0/a/a/d;->g:I
+
+    const/4 v3, 0x2
+
+    add-int/2addr v2, v3
+
+    iget-object v3, v10, Lq0/a/a/h;->c:[C
+
+    invoke-virtual {v8, v2, v3}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    aput-object v2, v0, v4
+
+    :goto_16
+    const/4 v2, 0x1
+
+    goto :goto_17
+
+    :cond_17
+    const/4 v2, 0x0
+
+    :goto_17
+    move v3, v2
+
+    const/4 v2, 0x1
+
+    :goto_18
+    add-int/lit8 v4, v2, 0x1
+
+    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    const/16 v11, 0x46
+
+    if-eq v5, v11, :cond_1f
+
+    const/16 v11, 0x4c
+
+    if-eq v5, v11, :cond_1d
+
+    const/16 v11, 0x53
+
+    if-eq v5, v11, :cond_1c
+
+    const/16 v11, 0x49
+
+    if-eq v5, v11, :cond_1c
+
+    const/16 v11, 0x4a
+
+    if-eq v5, v11, :cond_1b
+
+    const/16 v11, 0x5a
+
+    if-eq v5, v11, :cond_1c
+
+    const/16 v11, 0x5b
+
+    if-eq v5, v11, :cond_18
+
+    packed-switch v5, :pswitch_data_3
+
+    iput v3, v10, Lq0/a/a/h;->o:I
+
+    goto/16 :goto_1e
+
+    :pswitch_b
+    add-int/lit8 v2, v3, 0x1
+
+    sget-object v5, Lq0/a/a/t;->d:Ljava/lang/Integer;
+
+    aput-object v5, v0, v3
+
+    goto :goto_1c
+
+    :cond_18
+    :goto_19
+    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    if-ne v5, v11, :cond_19
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_19
+
+    :cond_19
+    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    const/16 v11, 0x4c
+
+    if-ne v5, v11, :cond_1a
+
+    :goto_1a
+    const/4 v11, 0x1
+
+    add-int/2addr v4, v11
+
+    invoke-virtual {v1, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    const/16 v11, 0x3b
+
+    if-eq v5, v11, :cond_1a
+
+    goto :goto_1a
+
+    :cond_1a
+    add-int/lit8 v5, v3, 0x1
+
+    const/4 v11, 0x1
+
+    add-int/2addr v4, v11
+
+    invoke-virtual {v1, v2, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    aput-object v2, v0, v3
+
+    move v2, v4
+
+    move v3, v5
+
+    goto :goto_1d
+
+    :cond_1b
+    add-int/lit8 v2, v3, 0x1
+
+    sget-object v5, Lq0/a/a/t;->e:Ljava/lang/Integer;
+
+    aput-object v5, v0, v3
+
+    goto :goto_1c
+
+    :cond_1c
+    :pswitch_c
+    add-int/lit8 v2, v3, 0x1
+
+    sget-object v5, Lq0/a/a/t;->b:Ljava/lang/Integer;
+
+    aput-object v5, v0, v3
+
+    goto :goto_1c
+
+    :cond_1d
+    move v2, v4
+
+    :goto_1b
+    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    const/16 v11, 0x3b
+
+    if-eq v5, v11, :cond_1e
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1b
+
+    :cond_1e
+    add-int/lit8 v5, v3, 0x1
+
+    add-int/lit8 v11, v2, 0x1
+
+    invoke-virtual {v1, v4, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v2
+
+    aput-object v2, v0, v3
+
+    move v3, v5
+
+    move v2, v11
+
+    goto :goto_1d
+
+    :cond_1f
+    add-int/lit8 v2, v3, 0x1
+
+    sget-object v5, Lq0/a/a/t;->c:Ljava/lang/Integer;
+
+    aput-object v5, v0, v3
+
+    :goto_1c
+    move v3, v2
+
+    move v2, v4
+
+    :goto_1d
+    const/4 v4, 0x0
+
+    const/4 v5, -0x1
+
+    const/16 v11, 0x8
+
+    goto/16 :goto_18
+
+    :cond_20
+    :goto_1e
+    move/from16 v0, v22
+
+    :goto_1f
+    move/from16 v11, v33
+
+    add-int/lit8 v1, v11, -0x2
+
+    if-ge v0, v1, :cond_24
+
+    aget-byte v1, v12, v0
+
+    const/16 v2, 0x8
+
+    if-ne v1, v2, :cond_23
+
+    add-int/lit8 v1, v0, 0x1
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    if-ltz v1, :cond_23
+
+    move/from16 v5, v43
+
+    if-ge v1, v5, :cond_22
+
+    add-int v2, v16, v1
+
+    aget-byte v2, v12, v2
+
+    const/16 v4, 0xff
+
+    and-int/2addr v2, v4
+
+    const/16 v3, 0xbb
+
+    if-ne v2, v3, :cond_21
+
+    move-object/from16 v3, v19
+
+    invoke-virtual {v8, v1, v3}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    goto :goto_21
+
+    :cond_21
+    move-object/from16 v3, v19
+
+    goto :goto_21
+
+    :cond_22
+    move-object/from16 v3, v19
+
+    goto :goto_20
+
+    :cond_23
+    move-object/from16 v3, v19
+
+    move/from16 v5, v43
+
+    :goto_20
+    const/16 v4, 0xff
+
+    :goto_21
+    add-int/lit8 v0, v0, 0x1
+
+    move-object/from16 v19, v3
+
+    move/from16 v43, v5
+
+    move/from16 v33, v11
+
+    goto :goto_1f
+
+    :cond_24
+    move-object/from16 v3, v19
+
+    goto :goto_22
+
+    :cond_25
+    move-object/from16 v3, v19
+
+    move/from16 v11, v33
+
+    :goto_22
+    move/from16 v5, v43
+
+    const/16 v4, 0xff
+
+    if-eqz v6, :cond_26
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    and-int/lit16 v0, v0, 0x100
+
+    if-eqz v0, :cond_26
+
+    const/4 v1, -0x1
+
+    const/16 v19, 0x0
+
+    const/16 v23, 0x0
+
+    const/16 v24, 0x0
+
+    move-object/from16 v0, p1
+
+    move v2, v15
+
+    move-object/from16 v44, v3
+
+    move-object/from16 v3, v19
+
+    move-object/from16 v19, v7
+
+    const/4 v7, 0x0
+
+    move/from16 v4, v23
+
+    move/from16 v23, v5
+
+    move-object/from16 v5, v24
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+
+    goto :goto_23
+
+    :cond_26
+    move-object/from16 v44, v3
+
+    move/from16 v23, v5
+
+    move-object/from16 v19, v7
+
+    const/4 v7, 0x0
+
+    :goto_23
+    move-object/from16 v5, v41
+
+    invoke-virtual {v8, v5, v7}, Lq0/a/a/d;->d([II)I
+
+    move-result v0
+
+    move-object/from16 v4, v34
+
+    invoke-virtual {v8, v4, v7}, Lq0/a/a/d;->d([II)I
+
+    move-result v1
+
+    iget v2, v10, Lq0/a/a/h;->b:I
+
+    and-int/lit16 v2, v2, 0x100
+
+    if-nez v2, :cond_27
+
+    const/16 v2, 0x21
+
+    const/16 v24, 0x21
+
+    goto :goto_24
+
+    :cond_27
+    const/16 v24, 0x0
+
+    :goto_24
+    move/from16 v27, v1
+
+    move/from16 v3, v16
+
+    move/from16 v1, v22
+
+    const/16 v25, 0x0
+
+    const/16 v26, 0x0
+
+    move/from16 v22, v0
+
+    const/4 v0, 0x0
+
+    :goto_25
+    move/from16 v7, v42
+
+    if-ge v3, v7, :cond_56
+
+    move/from16 v42, v7
+
+    sub-int v7, v3, v16
+
+    move/from16 v29, v14
+
+    move-object/from16 v14, v44
+
+    aget-object v2, v14, v7
+
+    move/from16 v31, v0
+
+    if-eqz v2, :cond_29
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    const/16 v21, 0x2
+
+    and-int/lit8 v0, v0, 0x2
+
+    if-nez v0, :cond_28
+
+    const/4 v0, 0x1
+
+    goto :goto_26
+
+    :cond_28
+    const/4 v0, 0x0
+
+    :goto_26
+    invoke-virtual {v9, v2}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
+
+    if-eqz v0, :cond_29
+
+    iget-short v0, v2, Lq0/a/a/p;->b:S
+
+    if-eqz v0, :cond_29
+
+    const v32, 0xffff
+
+    and-int v0, v0, v32
+
+    invoke-virtual {v9, v0, v2}, Lq0/a/a/q;->k(ILq0/a/a/p;)V
+
+    iget-object v0, v2, Lq0/a/a/p;->c:[I
+
+    if-eqz v0, :cond_29
+
+    move/from16 v32, v1
+
+    const/4 v0, 0x1
+
+    :goto_27
+    iget-object v1, v2, Lq0/a/a/p;->c:[I
+
+    move/from16 v33, v3
+
+    const/16 v28, 0x0
+
+    aget v3, v1, v28
+
+    if-gt v0, v3, :cond_2a
+
+    aget v1, v1, v0
+
+    invoke-virtual {v9, v1, v2}, Lq0/a/a/q;->k(ILq0/a/a/p;)V
+
+    add-int/lit8 v0, v0, 0x1
+
+    move/from16 v3, v33
+
+    goto :goto_27
+
+    :cond_29
+    move/from16 v32, v1
+
+    move/from16 v33, v3
+
+    :cond_2a
+    move/from16 v1, v31
+
+    move/from16 v3, v32
+
+    :goto_28
+    if-eqz v3, :cond_3c
+
+    iget v0, v10, Lq0/a/a/h;->m:I
+
+    const/4 v2, -0x1
+
+    if-eq v0, v7, :cond_2b
+
+    if-ne v0, v2, :cond_3c
+
+    :cond_2b
+    iget v0, v10, Lq0/a/a/h;->m:I
+
+    if-eq v0, v2, :cond_2e
+
+    if-eqz v20, :cond_2d
+
+    if-eqz v6, :cond_2c
+
+    goto :goto_29
+
+    :cond_2c
+    iget v1, v10, Lq0/a/a/h;->n:I
+
+    iget v0, v10, Lq0/a/a/h;->p:I
+
+    move/from16 v31, v3
+
+    iget-object v3, v10, Lq0/a/a/h;->q:[Ljava/lang/Object;
+
+    move-object/from16 v32, v4
+
+    iget v4, v10, Lq0/a/a/h;->r:I
+
+    move-object/from16 v41, v5
+
+    iget-object v5, v10, Lq0/a/a/h;->s:[Ljava/lang/Object;
+
+    move/from16 v34, v0
+
+    move-object/from16 v0, p1
+
+    move/from16 v37, v15
+
+    const/4 v15, -0x1
+
+    move/from16 v2, v34
+
+    move/from16 v15, v31
+
+    move/from16 v31, v33
+
+    move-object/from16 v45, v32
+
+    move-object/from16 v46, v41
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+
+    goto :goto_2a
+
+    :cond_2d
+    :goto_29
+    move-object/from16 v45, v4
+
+    move-object/from16 v46, v5
+
+    move/from16 v37, v15
+
+    move/from16 v31, v33
+
+    move v15, v3
+
+    const/4 v1, -0x1
+
+    iget v2, v10, Lq0/a/a/h;->o:I
+
+    iget-object v3, v10, Lq0/a/a/h;->q:[Ljava/lang/Object;
+
+    iget v4, v10, Lq0/a/a/h;->r:I
+
+    iget-object v5, v10, Lq0/a/a/h;->s:[Ljava/lang/Object;
+
+    move-object/from16 v0, p1
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+
+    :goto_2a
+    const/16 v32, 0x0
+
+    goto :goto_2b
+
+    :cond_2e
+    move-object/from16 v45, v4
+
+    move-object/from16 v46, v5
+
+    move/from16 v37, v15
+
+    move/from16 v31, v33
+
+    move v15, v3
+
+    move/from16 v32, v1
+
+    :goto_2b
+    if-ge v15, v11, :cond_3b
+
+    iget-object v5, v10, Lq0/a/a/h;->c:[C
+
+    iget-object v4, v10, Lq0/a/a/h;->g:[Lq0/a/a/p;
+
+    if-eqz v20, :cond_2f
+
+    iget-object v0, v8, Lq0/a/a/d;->a:[B
+
+    add-int/lit8 v3, v15, 0x1
+
+    aget-byte v0, v0, v15
+
+    const/16 v2, 0xff
+
+    and-int/2addr v0, v2
+
+    move v1, v3
+
+    move v3, v0
+
+    const/4 v0, 0x0
+
+    goto :goto_2c
+
+    :cond_2f
+    const/4 v0, -0x1
+
+    const/16 v2, 0xff
+
+    iput v0, v10, Lq0/a/a/h;->m:I
+
+    move v1, v15
+
+    const/4 v0, 0x0
+
+    const/16 v3, 0xff
+
+    :goto_2c
+    iput v0, v10, Lq0/a/a/h;->p:I
+
+    const/16 v15, 0x40
+
+    if-ge v3, v15, :cond_30
+
+    const/4 v15, 0x3
+
+    iput v15, v10, Lq0/a/a/h;->n:I
+
+    iput v0, v10, Lq0/a/a/h;->r:I
+
+    move v0, v1
+
+    move-object/from16 v33, v4
+
+    move/from16 v34, v11
+
+    goto/16 :goto_33
+
+    :cond_30
+    const/16 v0, 0x80
+
+    if-ge v3, v0, :cond_31
+
+    add-int/lit8 v15, v3, -0x40
+
+    iget-object v3, v10, Lq0/a/a/h;->s:[Ljava/lang/Object;
+
+    const/16 v33, 0x0
+
+    move-object/from16 v0, p0
+
+    move/from16 v34, v11
+
+    const/16 v11, 0xff
+
+    move-object v2, v3
+
+    move/from16 v3, v33
+
+    move-object/from16 v33, v4
+
+    move-object v4, v5
+
+    move-object/from16 v5, v33
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lq0/a/a/p;)I
+
+    move-result v0
+
+    const/4 v1, 0x4
+
+    iput v1, v10, Lq0/a/a/h;->n:I
+
+    const/4 v1, 0x1
+
+    iput v1, v10, Lq0/a/a/h;->r:I
+
+    :goto_2d
+    move v3, v15
+
+    goto/16 :goto_33
+
+    :cond_31
+    move-object/from16 v33, v4
+
+    move/from16 v34, v11
+
+    const/16 v11, 0xff
+
+    const/16 v0, 0xf7
+
+    if-lt v3, v0, :cond_3a
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v15
+
+    add-int/lit8 v1, v1, 0x2
+
+    if-ne v3, v0, :cond_32
+
+    iget-object v2, v10, Lq0/a/a/h;->s:[Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    move-object/from16 v0, p0
+
+    move-object v4, v5
+
+    move-object/from16 v5, v33
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lq0/a/a/p;)I
+
+    move-result v0
+
+    const/4 v1, 0x4
+
+    iput v1, v10, Lq0/a/a/h;->n:I
+
+    const/4 v1, 0x1
+
+    iput v1, v10, Lq0/a/a/h;->r:I
+
+    goto :goto_2d
+
+    :cond_32
+    const/16 v0, 0xf8
+
+    const/16 v2, 0xfb
+
+    if-lt v3, v0, :cond_33
+
+    if-ge v3, v2, :cond_33
+
+    const/4 v0, 0x2
+
+    iput v0, v10, Lq0/a/a/h;->n:I
+
+    rsub-int v0, v3, 0xfb
+
+    iput v0, v10, Lq0/a/a/h;->p:I
+
+    iget v2, v10, Lq0/a/a/h;->o:I
+
+    sub-int/2addr v2, v0
+
+    iput v2, v10, Lq0/a/a/h;->o:I
+
+    const/4 v0, 0x0
+
+    iput v0, v10, Lq0/a/a/h;->r:I
+
+    goto :goto_2e
+
+    :cond_33
+    const/4 v0, 0x0
+
+    if-ne v3, v2, :cond_35
+
+    const/4 v2, 0x3
+
+    iput v2, v10, Lq0/a/a/h;->n:I
+
+    iput v0, v10, Lq0/a/a/h;->r:I
+
+    :cond_34
+    :goto_2e
+    move v0, v1
+
+    goto :goto_2d
+
+    :cond_35
+    if-ge v3, v11, :cond_38
+
+    if-eqz v6, :cond_36
+
+    iget v0, v10, Lq0/a/a/h;->o:I
+
+    goto :goto_2f
+
+    :cond_36
+    const/4 v0, 0x0
+
+    :goto_2f
+    add-int/lit16 v4, v3, -0xfb
+
+    move v3, v0
+
+    move/from16 v38, v4
+
+    :goto_30
+    if-lez v38, :cond_37
+
+    iget-object v2, v10, Lq0/a/a/h;->q:[Ljava/lang/Object;
+
+    add-int/lit8 v39, v3, 0x1
+
+    move-object/from16 v0, p0
+
+    move v11, v4
+
+    move-object v4, v5
+
+    move-object/from16 v40, v5
+
+    move-object/from16 v5, v33
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lq0/a/a/p;)I
+
+    move-result v1
+
+    add-int/lit8 v38, v38, -0x1
+
+    move v4, v11
+
+    move/from16 v3, v39
+
+    move-object/from16 v5, v40
+
+    const/16 v11, 0xff
+
+    goto :goto_30
+
+    :cond_37
+    move v11, v4
+
+    const/4 v0, 0x1
+
+    iput v0, v10, Lq0/a/a/h;->n:I
+
+    iput v11, v10, Lq0/a/a/h;->p:I
+
+    iget v0, v10, Lq0/a/a/h;->o:I
+
+    add-int/2addr v0, v11
+
+    iput v0, v10, Lq0/a/a/h;->o:I
+
+    const/4 v0, 0x0
+
+    iput v0, v10, Lq0/a/a/h;->r:I
+
+    goto :goto_2e
+
+    :cond_38
+    move-object/from16 v40, v5
+
+    const/4 v0, 0x0
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v11
+
+    add-int/lit8 v1, v1, 0x2
+
+    iput v0, v10, Lq0/a/a/h;->n:I
+
+    iput v11, v10, Lq0/a/a/h;->p:I
+
+    iput v11, v10, Lq0/a/a/h;->o:I
+
+    const/4 v5, 0x0
+
+    :goto_31
+    if-ge v5, v11, :cond_39
+
+    iget-object v2, v10, Lq0/a/a/h;->q:[Ljava/lang/Object;
+
+    move-object/from16 v0, p0
+
+    move v3, v5
+
+    move-object/from16 v4, v40
+
+    move/from16 v38, v5
+
+    move-object/from16 v5, v33
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lq0/a/a/p;)I
+
+    move-result v1
+
+    add-int/lit8 v5, v38, 0x1
+
+    goto :goto_31
+
+    :cond_39
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v11
+
+    add-int/lit8 v1, v1, 0x2
+
+    iput v11, v10, Lq0/a/a/h;->r:I
+
+    const/4 v5, 0x0
+
+    :goto_32
+    if-ge v5, v11, :cond_34
+
+    iget-object v2, v10, Lq0/a/a/h;->s:[Ljava/lang/Object;
+
+    move-object/from16 v0, p0
+
+    move v3, v5
+
+    move-object/from16 v4, v40
+
+    move/from16 v38, v5
+
+    move-object/from16 v5, v33
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/d;->x(I[Ljava/lang/Object;I[C[Lq0/a/a/p;)I
+
+    move-result v1
+
+    add-int/lit8 v5, v38, 0x1
+
+    goto :goto_32
+
+    :goto_33
+    iget v1, v10, Lq0/a/a/h;->m:I
+
+    const/4 v2, 0x1
+
+    add-int/2addr v3, v2
+
+    add-int/2addr v3, v1
+
+    iput v3, v10, Lq0/a/a/h;->m:I
+
+    move-object/from16 v1, v33
+
+    invoke-virtual {v8, v3, v1}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move v3, v0
+
+    move/from16 v33, v31
+
+    move/from16 v1, v32
+
+    move/from16 v11, v34
+
+    move/from16 v15, v37
+
+    move-object/from16 v4, v45
+
+    move-object/from16 v5, v46
+
+    goto/16 :goto_28
+
+    :cond_3a
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw v0
+
+    :cond_3b
+    move/from16 v33, v31
+
+    move/from16 v1, v32
+
+    move/from16 v15, v37
+
+    move-object/from16 v4, v45
+
+    move-object/from16 v5, v46
+
+    const/4 v3, 0x0
+
+    goto/16 :goto_28
+
+    :cond_3c
+    move-object/from16 v45, v4
+
+    move-object/from16 v46, v5
+
+    move/from16 v34, v11
+
+    move/from16 v37, v15
+
+    move/from16 v31, v33
+
+    move v15, v3
+
+    if-eqz v1, :cond_3e
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    const/16 v1, 0x8
+
+    and-int/2addr v0, v1
+
+    if-eqz v0, :cond_3d
+
+    const/16 v1, 0x100
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    move-object/from16 v0, p1
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/q;->c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+
+    :cond_3d
+    const/4 v11, 0x0
+
+    goto :goto_34
+
+    :cond_3e
+    move v11, v1
+
+    :goto_34
+    aget-byte v0, v12, v31
+
+    const/16 v1, 0xff
+
+    and-int/lit16 v5, v0, 0xff
+
+    const/16 v0, 0xc8
+
+    packed-switch v5, :pswitch_data_4
+
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :pswitch_d
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    add-int/2addr v1, v7
+
+    aget-object v1, v14, v1
+
+    invoke-virtual {v9, v0, v1}, Lq0/a/a/q;->h(ILq0/a/a/p;)V
+
+    add-int/lit8 v3, v31, 0x5
+
+    move/from16 v32, v6
+
+    move/from16 v39, v15
+
+    move/from16 v4, v22
+
+    move/from16 v5, v25
+
+    move-object/from16 v11, v46
+
+    const/4 v0, 0x1
+
+    :goto_35
+    const/4 v1, 0x4
+
+    const/16 v2, 0xff
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    goto/16 :goto_50
+
+    :pswitch_e
+    const/16 v1, 0xda
+
+    if-ge v5, v1, :cond_3f
+
+    add-int/lit8 v5, v5, -0x31
+
+    goto :goto_36
+
+    :cond_3f
+    add-int/lit8 v5, v5, -0x14
+
+    :goto_36
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/2addr v1, v7
+
+    aget-object v1, v14, v1
+
+    const/16 v2, 0xa7
+
+    if-eq v5, v2, :cond_42
+
+    const/16 v3, 0xa8
+
+    if-ne v5, v3, :cond_40
+
+    goto :goto_38
+
+    :cond_40
+    if-ge v5, v2, :cond_41
+
+    add-int/lit8 v5, v5, 0x1
+
+    const/4 v2, 0x1
+
+    xor-int/lit8 v3, v5, 0x1
+
+    sub-int/2addr v3, v2
+
+    goto :goto_37
+
+    :cond_41
+    xor-int/lit8 v3, v5, 0x1
+
+    :goto_37
+    add-int/lit8 v2, v7, 0x3
+
+    invoke-virtual {v8, v2, v14}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v2
+
+    invoke-virtual {v9, v3, v2}, Lq0/a/a/q;->h(ILq0/a/a/p;)V
+
+    invoke-virtual {v9, v0, v1}, Lq0/a/a/q;->h(ILq0/a/a/p;)V
+
+    const/4 v2, 0x1
+
+    goto :goto_39
+
+    :cond_42
+    :goto_38
+    add-int/lit8 v5, v5, 0x21
+
+    invoke-virtual {v9, v5, v1}, Lq0/a/a/q;->h(ILq0/a/a/p;)V
+
+    move v2, v11
+
+    :goto_39
+    add-int/lit8 v3, v31, 0x3
+
+    move/from16 v32, v6
+
+    goto/16 :goto_42
+
+    :pswitch_f
+    sub-int v5, v5, v24
+
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    add-int/2addr v0, v7
+
+    aget-object v0, v14, v0
+
+    invoke-virtual {v9, v5, v0}, Lq0/a/a/q;->h(ILq0/a/a/p;)V
+
+    add-int/lit8 v3, v31, 0x5
+
+    const/16 v4, 0x84
+
+    goto/16 :goto_3d
+
+    :pswitch_10
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3, v13}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v0
+
+    add-int/lit8 v3, v31, 0x3
+
+    aget-byte v1, v12, v3
+
+    const/16 v2, 0xff
+
+    and-int/2addr v1, v2
+
+    move-object v2, v9
+
+    check-cast v2, Lq0/a/a/r;
+
+    iget-object v3, v2, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v3, v3, Lq0/a/a/c;->b:I
+
+    iput v3, v2, Lq0/a/a/r;->Z:I
+
+    iget-object v3, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const/4 v4, 0x7
+
+    invoke-virtual {v3, v4, v0}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget-object v3, v2, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v5, v0, Lq0/a/a/u;->a:I
+
+    const/16 v4, 0xc5
+
+    invoke-virtual {v3, v4, v5}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v3, v2, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v3, :cond_45
+
+    iget v3, v2, Lq0/a/a/r;->N:I
+
+    const/4 v5, 0x4
+
+    if-eq v3, v5, :cond_44
+
+    const/4 v5, 0x3
+
+    if-ne v3, v5, :cond_43
+
+    goto :goto_3a
+
+    :cond_43
+    iget v0, v2, Lq0/a/a/r;->R:I
+
+    rsub-int/lit8 v1, v1, 0x1
+
+    add-int/2addr v1, v0
+
+    iput v1, v2, Lq0/a/a/r;->R:I
+
+    goto :goto_3b
+
+    :cond_44
+    :goto_3a
+    iget-object v3, v2, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v3, v3, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object v2, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v3, v4, v1, v0, v2}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_45
+    :goto_3b
+    const/16 v4, 0x84
+
+    goto :goto_3c
+
+    :pswitch_11
+    add-int/lit8 v3, v31, 0x1
+
+    aget-byte v0, v12, v3
+
+    const/16 v1, 0xff
+
+    and-int/2addr v0, v1
+
+    const/16 v4, 0x84
+
+    if-ne v0, v4, :cond_46
+
+    add-int/lit8 v3, v31, 0x2
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 v3, v31, 0x4
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->q(I)S
+
+    move-result v1
+
+    invoke-virtual {v9, v0, v1}, Lq0/a/a/q;->d(II)V
+
+    add-int/lit8 v3, v31, 0x6
+
+    goto :goto_3d
+
+    :cond_46
+    add-int/lit8 v3, v31, 0x2
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    invoke-virtual {v9, v0, v1}, Lq0/a/a/q;->t(II)V
+
+    :goto_3c
+    add-int/lit8 v3, v31, 0x4
+
+    goto :goto_3d
+
+    :pswitch_12
+    const/16 v4, 0x84
+
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3, v13}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v9, v5, v0}, Lq0/a/a/q;->s(ILjava/lang/String;)V
+
+    add-int/lit8 v3, v31, 0x3
+
+    :goto_3d
+    move/from16 v32, v6
+
+    goto/16 :goto_41
+
+    :pswitch_13
+    const/16 v4, 0x84
+
+    iget-object v0, v8, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    aget v0, v0, v1
+
+    iget-object v1, v8, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v0, 0x2
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {v8, v1, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    const/4 v3, 0x2
+
+    add-int/2addr v1, v3
+
+    invoke-virtual {v8, v1, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    iget-object v3, v8, Lq0/a/a/d;->e:[I
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    aget v0, v3, v0
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    invoke-virtual {v8, v3, v13}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lq0/a/a/n;
+
+    add-int/lit8 v5, v0, 0x2
+
+    invoke-virtual {v8, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v5
+
+    new-array v4, v5, [Ljava/lang/Object;
+
+    const/16 v18, 0x4
+
+    add-int/lit8 v0, v0, 0x4
+
+    move/from16 v32, v6
+
+    const/4 v6, 0x0
+
+    :goto_3e
+    if-ge v6, v5, :cond_47
+
+    move/from16 v30, v5
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v5
+
+    invoke-virtual {v8, v5, v13}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object v5
+
+    aput-object v5, v4, v6
+
+    const/4 v5, 0x2
+
+    add-int/2addr v0, v5
+
+    add-int/lit8 v6, v6, 0x1
+
+    move/from16 v5, v30
+
+    goto :goto_3e
+
+    :cond_47
+    move-object v0, v9
+
+    check-cast v0, Lq0/a/a/r;
+
+    iget-object v5, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    iput v5, v0, Lq0/a/a/r;->Z:I
+
+    iget-object v5, v0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v5, v3, v4}, Lq0/a/a/v;->a(Lq0/a/a/n;[Ljava/lang/Object;)Lq0/a/a/u;
+
+    move-result-object v3
+
+    iget v3, v3, Lq0/a/a/u;->a:I
+
+    const/16 v4, 0x12
+
+    invoke-virtual {v5, v4, v2, v1, v3}, Lq0/a/a/v;->d(ILjava/lang/String;Ljava/lang/String;I)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget-object v2, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v3, v1, Lq0/a/a/u;->a:I
+
+    const/16 v4, 0xba
+
+    invoke-virtual {v2, v4, v3}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    iget-object v2, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v2, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v2, :cond_4b
+
+    iget v2, v0, Lq0/a/a/r;->N:I
+
+    const/4 v3, 0x4
+
+    if-eq v2, v3, :cond_4a
+
+    const/4 v3, 0x3
+
+    if-ne v2, v3, :cond_48
+
+    goto :goto_3f
+
+    :cond_48
+    invoke-virtual {v1}, Lq0/a/a/u;->a()I
+
+    move-result v1
+
+    and-int/lit8 v2, v1, 0x3
+
+    const/4 v3, 0x2
+
+    shr-int/2addr v1, v3
+
+    sub-int/2addr v2, v1
+
+    const/4 v1, 0x1
+
+    add-int/2addr v2, v1
+
+    iget v1, v0, Lq0/a/a/r;->R:I
+
+    add-int/2addr v1, v2
+
+    iget v2, v0, Lq0/a/a/r;->S:I
+
+    if-le v1, v2, :cond_49
+
+    iput v1, v0, Lq0/a/a/r;->S:I
+
+    :cond_49
+    iput v1, v0, Lq0/a/a/r;->R:I
+
+    goto :goto_40
+
+    :cond_4a
+    :goto_3f
+    iget-object v2, v0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v2, v2, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object v0, v0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v2, v4, v3, v1, v0}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_4b
+    :goto_40
+    add-int/lit8 v3, v31, 0x5
+
+    :goto_41
+    move v2, v11
+
+    :goto_42
+    move v0, v2
+
+    move/from16 v39, v15
+
+    move/from16 v4, v22
+
+    move/from16 v5, v25
+
+    move-object/from16 v11, v46
+
+    goto/16 :goto_35
+
+    :pswitch_14
+    move/from16 v32, v6
+
+    iget-object v0, v8, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    aget v0, v0, v1
+
+    iget-object v1, v8, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v0, 0x2
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {v8, v0, v13}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v8, v1, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v4, 0x2
+
+    add-int/2addr v1, v4
+
+    invoke-virtual {v8, v1, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v4
+
+    const/16 v1, 0xb6
+
+    if-ge v5, v1, :cond_4c
+
+    invoke-virtual {v9, v5, v2, v3, v4}, Lq0/a/a/q;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    move/from16 v38, v11
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    goto :goto_44
+
+    :cond_4c
+    add-int/lit8 v0, v0, -0x1
+
+    aget-byte v0, v12, v0
+
+    const/16 v1, 0xb
+
+    if-ne v0, v1, :cond_4d
+
+    const/4 v6, 0x1
+
+    goto :goto_43
+
+    :cond_4d
+    const/4 v6, 0x0
+
+    :goto_43
+    move-object/from16 v0, p1
+
+    move v1, v5
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move/from16 v38, v11
+
+    move v11, v5
+
+    move v5, v6
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/q;->p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+
+    :goto_44
+    const/16 v0, 0xb9
+
+    if-ne v11, v0, :cond_4e
+
+    add-int/lit8 v3, v31, 0x5
+
+    goto :goto_45
+
+    :cond_4e
+    add-int/lit8 v3, v31, 0x3
+
+    :goto_45
+    move/from16 v39, v15
+
+    goto/16 :goto_48
+
+    :pswitch_15
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    and-int/lit8 v0, v7, 0x3
+
+    const/4 v1, 0x4
+
+    rsub-int/lit8 v0, v0, 0x4
+
+    add-int v0, v0, v31
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    add-int/2addr v1, v7
+
+    aget-object v1, v14, v1
+
+    add-int/lit8 v2, v0, 0x4
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->l(I)I
+
+    move-result v2
+
+    const/16 v3, 0x8
+
+    add-int/2addr v0, v3
+
+    new-array v4, v2, [I
+
+    new-array v5, v2, [Lq0/a/a/p;
+
+    move v6, v0
+
+    const/4 v0, 0x0
+
+    :goto_46
+    if-ge v0, v2, :cond_4f
+
+    invoke-virtual {v8, v6}, Lq0/a/a/d;->l(I)I
+
+    move-result v11
+
+    aput v11, v4, v0
+
+    add-int/lit8 v11, v6, 0x4
+
+    invoke-virtual {v8, v11}, Lq0/a/a/d;->l(I)I
+
+    move-result v11
+
+    add-int/2addr v11, v7
+
+    aget-object v11, v14, v11
+
+    aput-object v11, v5, v0
+
+    add-int/lit8 v6, v6, 0x8
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_46
+
+    :cond_4f
+    move-object v0, v9
+
+    check-cast v0, Lq0/a/a/r;
+
+    iget-object v11, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v3, v11, Lq0/a/a/c;->b:I
+
+    iput v3, v0, Lq0/a/a/r;->Z:I
+
+    const/16 v3, 0xab
+
+    invoke-virtual {v11, v3}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v3, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v3, v3, Lq0/a/a/c;->b:I
+
+    const/16 v18, 0x4
+
+    rem-int/lit8 v3, v3, 0x4
+
+    rsub-int/lit8 v3, v3, 0x4
+
+    rem-int/lit8 v3, v3, 0x4
+
+    move/from16 v31, v6
+
+    move/from16 v39, v15
+
+    const/4 v6, 0x0
+
+    const/4 v15, 0x0
+
+    invoke-virtual {v11, v15, v6, v3}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget-object v3, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v6, v0, Lq0/a/a/r;->Z:I
+
+    const/4 v11, 0x1
+
+    invoke-virtual {v1, v3, v6, v11}, Lq0/a/a/p;->e(Lq0/a/a/c;IZ)V
+
+    iget-object v3, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    const/4 v3, 0x0
+
+    :goto_47
+    if-ge v3, v2, :cond_50
+
+    iget-object v6, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    aget v15, v4, v3
+
+    invoke-virtual {v6, v15}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    aget-object v6, v5, v3
+
+    iget-object v15, v0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    move/from16 p3, v2
+
+    iget v2, v0, Lq0/a/a/r;->Z:I
+
+    invoke-virtual {v6, v15, v2, v11}, Lq0/a/a/p;->e(Lq0/a/a/c;IZ)V
+
+    add-int/lit8 v3, v3, 0x1
+
+    move/from16 v2, p3
+
+    const/4 v11, 0x1
+
+    const/4 v15, 0x0
+
+    goto :goto_47
+
+    :cond_50
+    invoke-virtual {v0, v1, v5}, Lq0/a/a/r;->B(Lq0/a/a/p;[Lq0/a/a/p;)V
+
+    move/from16 v3, v31
+
+    :goto_48
+    const/4 v1, 0x4
+
+    goto/16 :goto_4c
+
+    :pswitch_16
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    and-int/lit8 v0, v7, 0x3
+
+    const/4 v1, 0x4
+
+    rsub-int/lit8 v0, v0, 0x4
+
+    add-int v0, v0, v31
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v2
+
+    add-int/2addr v2, v7
+
+    aget-object v2, v14, v2
+
+    add-int/lit8 v3, v0, 0x4
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->l(I)I
+
+    move-result v3
+
+    add-int/lit8 v4, v0, 0x8
+
+    invoke-virtual {v8, v4}, Lq0/a/a/d;->l(I)I
+
+    move-result v4
+
+    add-int/lit8 v0, v0, 0xc
+
+    sub-int v5, v4, v3
+
+    const/4 v6, 0x1
+
+    add-int/2addr v5, v6
+
+    new-array v6, v5, [Lq0/a/a/p;
+
+    const/4 v11, 0x0
+
+    :goto_49
+    if-ge v11, v5, :cond_51
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v15
+
+    add-int/2addr v15, v7
+
+    aget-object v15, v14, v15
+
+    aput-object v15, v6, v11
+
+    add-int/lit8 v0, v0, 0x4
+
+    add-int/lit8 v11, v11, 0x1
+
+    goto :goto_49
+
+    :cond_51
+    invoke-virtual {v9, v3, v4, v2, v6}, Lq0/a/a/q;->q(IILq0/a/a/p;[Lq0/a/a/p;)V
+
+    move v3, v0
+
+    goto/16 :goto_4c
+
+    :pswitch_17
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->q(I)S
+
+    move-result v0
+
+    add-int/2addr v0, v7
+
+    aget-object v0, v14, v0
+
+    invoke-virtual {v9, v11, v0}, Lq0/a/a/q;->h(ILq0/a/a/p;)V
+
+    goto/16 :goto_4b
+
+    :pswitch_18
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    add-int/lit8 v3, v31, 0x1
+
+    aget-byte v0, v12, v3
+
+    const/16 v2, 0xff
+
+    and-int/2addr v0, v2
+
+    add-int/lit8 v3, v31, 0x2
+
+    aget-byte v2, v12, v3
+
+    invoke-virtual {v9, v0, v2}, Lq0/a/a/q;->d(II)V
+
+    goto :goto_4b
+
+    :pswitch_19
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    add-int/lit8 v5, v11, -0x3b
+
+    shr-int/lit8 v0, v5, 0x2
+
+    add-int/lit8 v0, v0, 0x36
+
+    const/4 v2, 0x3
+
+    and-int/2addr v2, v5
+
+    invoke-virtual {v9, v0, v2}, Lq0/a/a/q;->t(II)V
+
+    goto :goto_4a
+
+    :pswitch_1a
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/4 v2, 0x3
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    add-int/lit8 v5, v11, -0x1a
+
+    shr-int/lit8 v0, v5, 0x2
+
+    add-int/lit8 v0, v0, 0x15
+
+    and-int/2addr v2, v5
+
+    invoke-virtual {v9, v0, v2}, Lq0/a/a/q;->t(II)V
+
+    :goto_4a
+    add-int/lit8 v3, v31, 0x1
+
+    goto :goto_4c
+
+    :pswitch_1b
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    add-int/lit8 v3, v31, 0x1
+
+    aget-byte v0, v12, v3
+
+    const/16 v2, 0xff
+
+    and-int/2addr v0, v2
+
+    invoke-virtual {v9, v11, v0}, Lq0/a/a/q;->t(II)V
+
+    add-int/lit8 v3, v31, 0x2
+
+    goto :goto_4c
+
+    :pswitch_1c
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    invoke-virtual {v8, v0, v13}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {v9, v0}, Lq0/a/a/q;->j(Ljava/lang/Object;)V
+
+    :goto_4b
+    add-int/lit8 v3, v31, 0x3
+
+    :goto_4c
+    move/from16 v4, v22
+
+    move/from16 v5, v25
+
+    move/from16 v0, v38
+
+    move-object/from16 v11, v46
+
+    :goto_4d
+    const/16 v2, 0xff
+
+    goto/16 :goto_50
+
+    :pswitch_1d
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    add-int/lit8 v3, v31, 0x1
+
+    aget-byte v0, v12, v3
+
+    const/16 v2, 0xff
+
+    and-int/2addr v0, v2
+
+    invoke-virtual {v8, v0, v13}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-virtual {v9, v0}, Lq0/a/a/q;->j(Ljava/lang/Object;)V
+
+    goto :goto_4e
+
+    :pswitch_1e
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v2, 0xff
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    add-int/lit8 v3, v31, 0x1
+
+    invoke-virtual {v8, v3}, Lq0/a/a/d;->q(I)S
+
+    move-result v0
+
+    invoke-virtual {v9, v11, v0}, Lq0/a/a/q;->g(II)V
+
+    add-int/lit8 v3, v31, 0x3
+
+    goto :goto_4f
+
+    :pswitch_1f
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v2, 0xff
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    add-int/lit8 v3, v31, 0x1
+
+    aget-byte v0, v12, v3
+
+    invoke-virtual {v9, v11, v0}, Lq0/a/a/q;->g(II)V
+
+    :goto_4e
+    add-int/lit8 v3, v31, 0x2
+
+    goto :goto_4f
+
+    :pswitch_20
+    move/from16 v32, v6
+
+    move/from16 v38, v11
+
+    move/from16 v39, v15
+
+    const/4 v1, 0x4
+
+    const/16 v2, 0xff
+
+    const/16 v30, 0x7
+
+    const/16 v33, 0x84
+
+    move v11, v5
+
+    invoke-virtual {v9, v11}, Lq0/a/a/q;->e(I)V
+
+    add-int/lit8 v3, v31, 0x1
+
+    :goto_4f
+    move/from16 v4, v22
+
+    move/from16 v5, v25
+
+    move/from16 v0, v38
+
+    move-object/from16 v11, v46
+
+    :goto_50
+    if-eqz v11, :cond_53
+
+    array-length v6, v11
+
+    if-ge v5, v6, :cond_53
+
+    if-gt v4, v7, :cond_53
+
+    if-ne v4, v7, :cond_52
+
+    aget v4, v11, v5
+
+    invoke-virtual {v8, v10, v4}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v4
+
+    invoke-virtual {v8, v4, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v6
+
+    const/4 v15, 0x2
+
+    add-int/2addr v4, v15
+
+    iget v15, v10, Lq0/a/a/h;->h:I
+
+    iget-object v1, v10, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v9, v15, v1, v6, v2}, Lq0/a/a/q;->f(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v1
+
+    invoke-virtual {v8, v1, v4, v2, v13}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    :cond_52
+    add-int/lit8 v5, v5, 0x1
+
+    invoke-virtual {v8, v11, v5}, Lq0/a/a/d;->d([II)I
+
+    move-result v4
+
+    const/4 v1, 0x4
+
+    goto/16 :goto_4d
+
+    :cond_53
+    move/from16 v1, v26
+
+    move/from16 v2, v27
+
+    move-object/from16 v15, v45
+
+    :goto_51
+    if-eqz v15, :cond_55
+
+    array-length v6, v15
+
+    if-ge v1, v6, :cond_55
+
+    if-gt v2, v7, :cond_55
+
+    if-ne v2, v7, :cond_54
+
+    aget v2, v15, v1
+
+    invoke-virtual {v8, v10, v2}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v2
+
+    invoke-virtual {v8, v2, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v6
+
+    const/16 v21, 0x2
+
+    add-int/lit8 v2, v2, 0x2
+
+    move/from16 p3, v0
+
+    iget v0, v10, Lq0/a/a/h;->h:I
+
+    move/from16 v22, v3
+
+    iget-object v3, v10, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    move/from16 v25, v7
+
+    const/4 v7, 0x0
+
+    invoke-virtual {v9, v0, v3, v6, v7}, Lq0/a/a/q;->f(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v0
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v8, v0, v2, v3, v13}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    goto :goto_52
+
+    :cond_54
+    move/from16 p3, v0
+
+    move/from16 v22, v3
+
+    move/from16 v25, v7
+
+    const/4 v7, 0x0
+
+    :goto_52
+    add-int/lit8 v1, v1, 0x1
+
+    invoke-virtual {v8, v15, v1}, Lq0/a/a/d;->d([II)I
+
+    move-result v2
+
+    move/from16 v0, p3
+
+    move/from16 v3, v22
+
+    move/from16 v7, v25
+
+    goto :goto_51
+
+    :cond_55
+    move/from16 p3, v0
+
+    move/from16 v22, v3
+
+    const/4 v7, 0x0
+
+    move/from16 v0, p3
+
+    move/from16 v26, v1
+
+    move/from16 v27, v2
+
+    move/from16 v25, v5
+
+    move-object v5, v11
+
+    move-object/from16 v44, v14
+
+    move/from16 v3, v22
+
+    move/from16 v14, v29
+
+    move/from16 v6, v32
+
+    move/from16 v11, v34
+
+    move/from16 v1, v39
+
+    move/from16 v22, v4
+
+    move-object v4, v15
+
+    move/from16 v15, v37
+
+    goto/16 :goto_25
+
+    :cond_56
+    move-object v11, v5
+
+    move/from16 v29, v14
+
+    move/from16 v37, v15
+
+    move-object/from16 v14, v44
+
+    const/4 v7, 0x0
+
+    move-object v15, v4
+
+    aget-object v0, v14, v23
+
+    if-eqz v0, :cond_57
+
+    aget-object v0, v14, v23
+
+    invoke-virtual {v9, v0}, Lq0/a/a/q;->i(Lq0/a/a/p;)V
+
+    :cond_57
+    move/from16 v1, v35
+
+    if-eqz v1, :cond_5c
+
+    iget v0, v10, Lq0/a/a/h;->b:I
+
+    const/4 v2, 0x2
+
+    and-int/2addr v0, v2
+
+    if-nez v0, :cond_5c
+
+    move/from16 v0, v36
+
+    if-eqz v0, :cond_59
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    const/4 v4, 0x3
+
+    mul-int/lit8 v3, v3, 0x3
+
+    new-array v4, v3, [I
+
+    add-int/lit8 v36, v0, 0x2
+
+    move/from16 v0, v36
+
+    :goto_53
+    if-lez v3, :cond_58
+
+    add-int/lit8 v3, v3, -0x1
+
+    add-int/lit8 v2, v0, 0x6
+
+    aput v2, v4, v3
+
+    const/4 v2, -0x1
+
+    add-int/2addr v3, v2
+
+    add-int/lit8 v5, v0, 0x8
+
+    invoke-virtual {v8, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v5
+
+    aput v5, v4, v3
+
+    add-int/2addr v3, v2
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v5
+
+    aput v5, v4, v3
+
+    add-int/lit8 v0, v0, 0xa
+
+    goto :goto_53
+
+    :cond_58
+    move-object v12, v4
+
+    goto :goto_54
+
+    :cond_59
+    const/4 v12, 0x0
+
+    :goto_54
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    const/4 v2, 0x2
+
+    add-int/lit8 v35, v1, 0x2
+
+    move/from16 v1, v35
+
+    :goto_55
+    add-int/lit8 v16, v0, -0x1
+
+    if-lez v0, :cond_5c
+
+    invoke-virtual {v8, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 v2, v1, 0x2
+
+    invoke-virtual {v8, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v3, v1, 0x4
+
+    invoke-virtual {v8, v3, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    add-int/lit8 v4, v1, 0x6
+
+    invoke-virtual {v8, v4, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v4
+
+    add-int/lit8 v5, v1, 0x8
+
+    invoke-virtual {v8, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v6
+
+    add-int/lit8 v17, v1, 0xa
+
+    if-eqz v12, :cond_5b
+
+    const/4 v1, 0x0
+
+    :goto_56
+    array-length v5, v12
+
+    if-ge v1, v5, :cond_5b
+
+    aget v5, v12, v1
+
+    if-ne v5, v0, :cond_5a
+
+    add-int/lit8 v5, v1, 0x1
+
+    aget v5, v12, v5
+
+    if-ne v5, v6, :cond_5a
+
+    add-int/lit8 v1, v1, 0x2
+
+    aget v1, v12, v1
+
+    invoke-virtual {v8, v1, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    move-object v5, v1
+
+    goto :goto_57
+
+    :cond_5a
+    add-int/lit8 v1, v1, 0x3
+
+    goto :goto_56
+
+    :cond_5b
+    const/4 v5, 0x0
+
+    :goto_57
+    aget-object v18, v14, v0
+
+    add-int/2addr v0, v2
+
+    aget-object v20, v14, v0
+
+    move-object/from16 v0, p1
+
+    move-object v1, v3
+
+    move-object v2, v4
+
+    move-object v3, v5
+
+    move-object/from16 v4, v18
+
+    move-object/from16 v5, v20
+
+    invoke-virtual/range {v0 .. v6}, Lq0/a/a/q;->l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lq0/a/a/p;Lq0/a/a/p;I)V
+
+    move/from16 v0, v16
+
+    move/from16 v1, v17
+
+    goto :goto_55
+
+    :cond_5c
+    const/16 v12, 0x41
+
+    if-eqz v11, :cond_5f
+
+    array-length v14, v11
+
+    const/4 v6, 0x0
+
+    :goto_58
+    if-ge v6, v14, :cond_5f
+
+    aget v0, v11, v6
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->f(I)I
+
+    move-result v1
+
+    const/16 v2, 0x40
+
+    if-eq v1, v2, :cond_5e
+
+    if-ne v1, v12, :cond_5d
+
+    goto :goto_59
+
+    :cond_5d
+    move/from16 v18, v6
+
+    move-object/from16 v32, v19
+
+    const/16 v16, 0x0
+
+    goto :goto_5a
+
+    :cond_5e
+    :goto_59
+    invoke-virtual {v8, v10, v0}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v0
+
+    invoke-virtual {v8, v0, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v16
+
+    const/4 v1, 0x2
+
+    add-int/lit8 v5, v0, 0x2
+
+    iget v1, v10, Lq0/a/a/h;->h:I
+
+    iget-object v2, v10, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    iget-object v3, v10, Lq0/a/a/h;->j:[Lq0/a/a/p;
+
+    iget-object v4, v10, Lq0/a/a/h;->k:[Lq0/a/a/p;
+
+    iget-object v0, v10, Lq0/a/a/h;->l:[I
+
+    const/16 v17, 0x1
+
+    move-object/from16 v18, v0
+
+    move-object/from16 v0, p1
+
+    move v12, v5
+
+    move-object/from16 v5, v18
+
+    move/from16 v18, v6
+
+    move-object/from16 v6, v16
+
+    move-object/from16 v32, v19
+
+    const/16 v16, 0x0
+
+    move/from16 v7, v17
+
+    invoke-virtual/range {v0 .. v7}, Lq0/a/a/q;->m(ILq0/a/a/x;[Lq0/a/a/p;[Lq0/a/a/p;[ILjava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v8, v0, v12, v1, v13}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    :goto_5a
+    add-int/lit8 v6, v18, 0x1
+
+    move-object/from16 v19, v32
+
+    const/4 v7, 0x0
+
+    const/16 v12, 0x41
+
+    goto :goto_58
+
+    :cond_5f
+    move-object/from16 v32, v19
+
+    const/16 v16, 0x0
+
+    if-eqz v15, :cond_62
+
+    array-length v11, v15
+
+    const/4 v12, 0x0
+
+    :goto_5b
+    if-ge v12, v11, :cond_62
+
+    aget v0, v15, v12
+
+    invoke-virtual {v8, v0}, Lq0/a/a/d;->f(I)I
+
+    move-result v1
+
+    const/16 v14, 0x40
+
+    const/16 v7, 0x41
+
+    if-eq v1, v14, :cond_61
+
+    if-ne v1, v7, :cond_60
+
+    goto :goto_5c
+
+    :cond_60
+    const/4 v1, 0x1
+
+    const/16 v16, 0x2
+
+    const/16 v18, 0x41
+
+    goto :goto_5d
+
+    :cond_61
+    :goto_5c
+    invoke-virtual {v8, v10, v0}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v0
+
+    invoke-virtual {v8, v0, v13}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v6
+
+    const/16 v16, 0x2
+
+    add-int/lit8 v5, v0, 0x2
+
+    iget v1, v10, Lq0/a/a/h;->h:I
+
+    iget-object v2, v10, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    iget-object v3, v10, Lq0/a/a/h;->j:[Lq0/a/a/p;
+
+    iget-object v4, v10, Lq0/a/a/h;->k:[Lq0/a/a/p;
+
+    iget-object v0, v10, Lq0/a/a/h;->l:[I
+
+    const/16 v17, 0x0
+
+    move-object/from16 v18, v0
+
+    move-object/from16 v0, p1
+
+    move v14, v5
+
+    move-object/from16 v5, v18
+
+    const/16 v18, 0x41
+
+    move/from16 v7, v17
+
+    invoke-virtual/range {v0 .. v7}, Lq0/a/a/q;->m(ILq0/a/a/x;[Lq0/a/a/p;[Lq0/a/a/p;[ILjava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v8, v0, v14, v1, v13}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    :goto_5d
+    add-int/lit8 v12, v12, 0x1
+
+    goto :goto_5b
+
+    :cond_62
+    move-object/from16 v0, v32
+
+    :goto_5e
+    if-eqz v0, :cond_63
+
+    iget-object v1, v0, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    const/4 v2, 0x0
+
+    iput-object v2, v0, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    move-object v3, v9
+
+    check-cast v3, Lq0/a/a/r;
+
+    iget-object v4, v3, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    iput-object v4, v0, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iput-object v0, v3, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    move-object v0, v1
+
+    goto :goto_5e
+
+    :cond_63
+    move/from16 v0, v29
+
+    move/from16 v1, v37
+
+    invoke-virtual {v9, v0, v1}, Lq0/a/a/q;->n(II)V
+
+    return-void
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_9
+        :pswitch_8
+        :pswitch_9
+        :pswitch_8
+        :pswitch_8
+        :pswitch_9
+        :pswitch_9
+        :pswitch_9
+        :pswitch_9
+        :pswitch_9
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_9
+        :pswitch_9
+        :pswitch_9
+        :pswitch_9
+        :pswitch_9
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_8
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_7
+        :pswitch_9
+        :pswitch_6
+        :pswitch_5
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_a
+        :pswitch_8
+        :pswitch_8
+        :pswitch_8
+        :pswitch_8
+        :pswitch_8
+        :pswitch_8
+        :pswitch_8
+        :pswitch_4
+        :pswitch_4
+        :pswitch_8
+        :pswitch_9
+        :pswitch_8
+        :pswitch_a
+        :pswitch_a
+        :pswitch_8
+        :pswitch_8
+        :pswitch_a
+        :pswitch_a
+        :pswitch_2
+        :pswitch_3
+        :pswitch_7
+        :pswitch_7
+        :pswitch_1
+        :pswitch_1
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_1
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0x15
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+    .end packed-switch
+
+    :pswitch_data_2
+    .packed-switch 0x36
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+    .end packed-switch
+
+    :pswitch_data_3
+    .packed-switch 0x42
+        :pswitch_c
+        :pswitch_c
+        :pswitch_b
+    .end packed-switch
+
+    :pswitch_data_4
+    .packed-switch 0x0
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_1f
+        :pswitch_1e
+        :pswitch_1d
+        :pswitch_1c
+        :pswitch_1c
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_1a
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_1b
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_19
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_18
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_17
+        :pswitch_1b
+        :pswitch_16
+        :pswitch_15
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_20
+        :pswitch_14
+        :pswitch_14
+        :pswitch_14
+        :pswitch_14
+        :pswitch_14
+        :pswitch_14
+        :pswitch_14
+        :pswitch_14
+        :pswitch_13
+        :pswitch_12
+        :pswitch_1f
+        :pswitch_12
+        :pswitch_20
+        :pswitch_20
+        :pswitch_12
+        :pswitch_12
+        :pswitch_20
+        :pswitch_20
+        :pswitch_11
+        :pswitch_10
+        :pswitch_17
+        :pswitch_17
+        :pswitch_f
+        :pswitch_f
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_d
+    .end packed-switch
+.end method
+
+.method public i(I[C)Ljava/lang/Object;
+    .locals 11
+
+    iget-object v0, p0, Lq0/a/a/d;->b:[I
+
+    aget v1, v0, p1
+
+    iget-object v2, p0, Lq0/a/a/d;->a:[B
+
+    add-int/lit8 v3, v1, -0x1
+
+    aget-byte v2, v2, v3
+
+    packed-switch v2, :pswitch_data_0
+
+    const/16 v3, 0xb
+
+    const/4 v4, 0x0
+
+    packed-switch v2, :pswitch_data_1
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    iget-object v1, p0, Lq0/a/a/d;->d:[Lq0/a/a/g;
+
+    aget-object v1, v1, p1
+
+    if-eqz v1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    aget v1, v0, p1
+
+    add-int/lit8 v2, v1, 0x2
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v0, v0, v2
+
+    invoke-virtual {p0, v0, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v0, v0, 0x2
+
+    invoke-virtual {p0, v0, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-object v3, p0, Lq0/a/a/d;->e:[I
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    aget v1, v3, v1
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    invoke-virtual {p0, v3, p2}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lq0/a/a/n;
+
+    add-int/lit8 v5, v1, 0x2
+
+    invoke-virtual {p0, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v5
+
+    new-array v6, v5, [Ljava/lang/Object;
+
+    add-int/lit8 v1, v1, 0x4
+
+    :goto_0
+    if-ge v4, v5, :cond_1
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v7
+
+    invoke-virtual {p0, v7, p2}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object v7
+
+    aput-object v7, v6, v4
+
+    add-int/lit8 v1, v1, 0x2
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object p2, p0, Lq0/a/a/d;->d:[Lq0/a/a/g;
+
+    new-instance v1, Lq0/a/a/g;
+
+    invoke-direct {v1, v2, v0, v3, v6}, Lq0/a/a/g;-><init>(Ljava/lang/String;Ljava/lang/String;Lq0/a/a/n;[Ljava/lang/Object;)V
+
+    aput-object v1, p2, p1
+
+    :goto_1
+    return-object v1
+
+    :pswitch_1
+    invoke-virtual {p0, v1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    new-instance p2, Lq0/a/a/w;
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    invoke-direct {p2, v3, p1, v4, v0}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    return-object p2
+
+    :pswitch_2
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->f(I)I
+
+    move-result v6
+
+    iget-object p1, p0, Lq0/a/a/d;->b:[I
+
+    const/4 v0, 0x1
+
+    add-int/2addr v1, v0
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    aget p1, p1, v1
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, p1, 0x2
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, p1, p2}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-virtual {p0, v1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v8
+
+    add-int/lit8 v1, v1, 0x2
+
+    invoke-virtual {p0, v1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v9
+
+    iget-object p2, p0, Lq0/a/a/d;->a:[B
+
+    sub-int/2addr p1, v0
+
+    aget-byte p1, p2, p1
+
+    if-ne p1, v3, :cond_2
+
+    const/4 v10, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v10, 0x0
+
+    :goto_2
+    new-instance p1, Lq0/a/a/n;
+
+    move-object v5, p1
+
+    invoke-direct/range {v5 .. v10}, Lq0/a/a/n;-><init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+
+    return-object p1
+
+    :pswitch_3
+    invoke-virtual {p0, v1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :pswitch_4
+    invoke-virtual {p0, v1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lq0/a/a/w;->h(Ljava/lang/String;)Lq0/a/a/w;
+
+    move-result-object p1
+
+    return-object p1
+
+    :pswitch_5
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->m(I)J
+
+    move-result-wide p1
+
+    invoke-static {p1, p2}, Ljava/lang/Double;->longBitsToDouble(J)D
+
+    move-result-wide p1
+
+    invoke-static {p1, p2}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
+
+    move-result-object p1
+
+    return-object p1
+
+    :pswitch_6
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->m(I)J
+
+    move-result-wide p1
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+
+    :pswitch_7
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Float;->intBitsToFloat(I)F
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object p1
+
+    return-object p1
+
+    :pswitch_8
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+
+    :pswitch_data_0
+    .packed-switch 0x3
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0xf
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public final j(Lq0/a/a/a;ILjava/lang/String;[C)I
+    .locals 9
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const/16 v2, 0x5b
+
+    const/4 v3, 0x0
+
+    const/16 v4, 0x65
+
+    const/16 v5, 0x40
+
+    if-nez p1, :cond_3
+
+    iget-object p1, p0, Lq0/a/a/d;->a:[B
+
+    aget-byte p1, p1, p2
+
+    and-int/lit16 p1, p1, 0xff
+
+    if-eq p1, v5, :cond_2
+
+    if-eq p1, v2, :cond_1
+
+    if-eq p1, v4, :cond_0
+
+    add-int/lit8 p2, p2, 0x3
+
+    return p2
+
+    :cond_0
+    add-int/lit8 p2, p2, 0x5
+
+    return p2
+
+    :cond_1
+    add-int/2addr p2, v1
+
+    invoke-virtual {p0, v3, p2, v0, p4}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result p1
+
+    return p1
+
+    :cond_2
+    add-int/lit8 p2, p2, 0x3
+
+    invoke-virtual {p0, v3, p2, v1, p4}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result p1
+
+    return p1
+
+    :cond_3
+    iget-object v6, p0, Lq0/a/a/d;->a:[B
+
+    add-int/lit8 v7, p2, 0x1
+
+    aget-byte p2, v6, p2
+
+    and-int/lit16 p2, p2, 0xff
+
+    if-eq p2, v5, :cond_1c
+
+    const/16 v3, 0x46
+
+    if-eq p2, v3, :cond_1b
+
+    const/16 v5, 0x53
+
+    if-eq p2, v5, :cond_1a
+
+    const/16 v6, 0x63
+
+    if-eq p2, v6, :cond_19
+
+    if-eq p2, v4, :cond_17
+
+    const/16 v4, 0x73
+
+    if-eq p2, v4, :cond_16
+
+    const/16 v4, 0x49
+
+    if-eq p2, v4, :cond_1b
+
+    const/16 v6, 0x4a
+
+    if-eq p2, v6, :cond_1b
+
+    const/16 v8, 0x5a
+
+    if-eq p2, v8, :cond_14
+
+    if-eq p2, v2, :cond_4
+
+    packed-switch p2, :pswitch_data_0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    iget-object p2, p0, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {p0, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result p4
+
+    aget p2, p2, p4
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->l(I)I
+
+    move-result p2
+
+    int-to-char p2, p2
+
+    invoke-static {p2}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p3, p2}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_a
+
+    :pswitch_1
+    iget-object p2, p0, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {p0, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result p4
+
+    aget p2, p2, p4
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->l(I)I
+
+    move-result p2
+
+    int-to-byte p2, p2
+
+    invoke-static {p2}, Ljava/lang/Byte;->valueOf(B)Ljava/lang/Byte;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p3, p2}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_a
+
+    :cond_4
+    invoke-virtual {p0, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result p2
+
+    add-int/lit8 v7, v7, 0x2
+
+    if-nez p2, :cond_5
+
+    invoke-virtual {p1, p3}, Lq0/a/a/a;->f(Ljava/lang/String;)Lq0/a/a/a;
+
+    move-result-object p1
+
+    add-int/lit8 v7, v7, -0x2
+
+    invoke-virtual {p0, p1, v7, v0, p4}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result p1
+
+    return p1
+
+    :cond_5
+    iget-object v2, p0, Lq0/a/a/d;->a:[B
+
+    aget-byte v2, v2, v7
+
+    and-int/lit16 v2, v2, 0xff
+
+    if-eq v2, v3, :cond_12
+
+    if-eq v2, v5, :cond_10
+
+    if-eq v2, v8, :cond_d
+
+    if-eq v2, v4, :cond_b
+
+    if-eq v2, v6, :cond_9
+
+    packed-switch v2, :pswitch_data_1
+
+    invoke-virtual {p1, p3}, Lq0/a/a/a;->f(Ljava/lang/String;)Lq0/a/a/a;
+
+    move-result-object p1
+
+    add-int/lit8 v7, v7, -0x2
+
+    invoke-virtual {p0, p1, v7, v0, p4}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v7
+
+    goto/16 :goto_b
+
+    :pswitch_2
+    new-array p4, p2, [D
+
+    :goto_0
+    if-ge v0, p2, :cond_6
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v7, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->m(I)J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Double;->longBitsToDouble(J)D
+
+    move-result-wide v1
+
+    aput-wide v1, p4, v0
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_6
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :pswitch_3
+    new-array p4, p2, [C
+
+    :goto_1
+    if-ge v0, p2, :cond_7
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v7, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    int-to-char v1, v1
+
+    aput-char v1, p4, v0
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_7
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :pswitch_4
+    new-array p4, p2, [B
+
+    :goto_2
+    if-ge v0, p2, :cond_8
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v7, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    int-to-byte v1, v1
+
+    aput-byte v1, p4, v0
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_2
+
+    :cond_8
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :cond_9
+    new-array p4, p2, [J
+
+    :goto_3
+    if-ge v0, p2, :cond_a
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v7, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->m(I)J
+
+    move-result-wide v1
+
+    aput-wide v1, p4, v0
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_3
+
+    :cond_a
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :cond_b
+    new-array p4, p2, [I
+
+    :goto_4
+    if-ge v0, p2, :cond_c
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v7, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    aput v1, p4, v0
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_4
+
+    :cond_c
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :cond_d
+    new-array p4, p2, [Z
+
+    const/4 v2, 0x0
+
+    :goto_5
+    if-ge v2, p2, :cond_f
+
+    iget-object v3, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v4, v7, 0x1
+
+    invoke-virtual {p0, v4}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    aget v3, v3, v4
+
+    invoke-virtual {p0, v3}, Lq0/a/a/d;->l(I)I
+
+    move-result v3
+
+    if-eqz v3, :cond_e
+
+    const/4 v3, 0x1
+
+    goto :goto_6
+
+    :cond_e
+    const/4 v3, 0x0
+
+    :goto_6
+    aput-boolean v3, p4, v2
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_5
+
+    :cond_f
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :cond_10
+    new-array p4, p2, [S
+
+    :goto_7
+    if-ge v0, p2, :cond_11
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v7, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    int-to-short v1, v1
+
+    aput-short v1, p4, v0
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_7
+
+    :cond_11
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :cond_12
+    new-array p4, p2, [F
+
+    :goto_8
+    if-ge v0, p2, :cond_13
+
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    add-int/lit8 v2, v7, 0x1
+
+    invoke-virtual {p0, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->l(I)I
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Float;->intBitsToFloat(I)F
+
+    move-result v1
+
+    aput v1, p4, v0
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_8
+
+    :cond_13
+    invoke-virtual {p1, p3, p4}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto/16 :goto_b
+
+    :cond_14
+    iget-object p2, p0, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {p0, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result p4
+
+    aget p2, p2, p4
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->l(I)I
+
+    move-result p2
+
+    if-nez p2, :cond_15
+
+    sget-object p2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    goto :goto_9
+
+    :cond_15
+    sget-object p2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    :goto_9
+    invoke-virtual {p1, p3, p2}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto :goto_a
+
+    :cond_16
+    invoke-virtual {p0, v7, p4}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p3, p2}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto :goto_a
+
+    :cond_17
+    invoke-virtual {p0, v7, p4}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p2
+
+    add-int/lit8 v0, v7, 0x2
+
+    invoke-virtual {p0, v0, p4}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p4
+
+    iget v0, p1, Lq0/a/a/a;->e:I
+
+    add-int/2addr v0, v1
+
+    iput v0, p1, Lq0/a/a/a;->e:I
+
+    iget-boolean v0, p1, Lq0/a/a/a;->b:Z
+
+    if-eqz v0, :cond_18
+
+    iget-object v0, p1, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v1, p1, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v1, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p3
+
+    invoke-virtual {v0, p3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_18
+    iget-object p3, p1, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v0, p1, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v0, p2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    invoke-virtual {p3, v4, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    iget-object p1, p1, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {p1, p4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {p3, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v7, v7, 0x4
+
+    goto :goto_b
+
+    :cond_19
+    invoke-virtual {p0, v7, p4}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p4
+
+    invoke-static {p2, v0, p4}, Lq0/a/a/w;->k(Ljava/lang/String;II)Lq0/a/a/w;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p3, p2}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto :goto_a
+
+    :cond_1a
+    iget-object p2, p0, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {p0, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result p4
+
+    aget p2, p2, p4
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->l(I)I
+
+    move-result p2
+
+    int-to-short p2, p2
+
+    invoke-static {p2}, Ljava/lang/Short;->valueOf(S)Ljava/lang/Short;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p3, p2}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto :goto_a
+
+    :cond_1b
+    :pswitch_5
+    invoke-virtual {p0, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result p2
+
+    invoke-virtual {p0, p2, p4}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p3, p2}, Lq0/a/a/a;->e(Ljava/lang/String;Ljava/lang/Object;)V
+
+    :goto_a
+    add-int/lit8 v7, v7, 0x2
+
+    goto :goto_b
+
+    :cond_1c
+    invoke-virtual {p0, v7, p4}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p2
+
+    iget v2, p1, Lq0/a/a/a;->e:I
+
+    add-int/2addr v2, v1
+
+    iput v2, p1, Lq0/a/a/a;->e:I
+
+    iget-boolean v2, p1, Lq0/a/a/a;->b:Z
+
+    if-eqz v2, :cond_1d
+
+    iget-object v2, p1, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v4, p1, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v4, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p3
+
+    invoke-virtual {v2, p3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_1d
+    iget-object p3, p1, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    iget-object v2, p1, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    invoke-virtual {v2, p2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    invoke-virtual {p3, v5, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    invoke-virtual {p3, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p1, Lq0/a/a/a;->a:Lq0/a/a/v;
+
+    iget-object p1, p1, Lq0/a/a/a;->c:Lq0/a/a/c;
+
+    invoke-direct {p2, p3, v1, p1, v3}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    add-int/lit8 v7, v7, 0x2
+
+    invoke-virtual {p0, p2, v7, v1, p4}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v7
+
+    :goto_b
+    return v7
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x42
+        :pswitch_1
+        :pswitch_0
+        :pswitch_5
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0x42
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+    .end packed-switch
+.end method
+
+.method public final k(Lq0/a/a/a;IZ[C)I
+    .locals 1
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 p2, p2, 0x2
+
+    if-eqz p3, :cond_0
+
+    :goto_0
+    add-int/lit8 p3, v0, -0x1
+
+    if-lez v0, :cond_1
+
+    invoke-virtual {p0, p2, p4}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v0
+
+    add-int/lit8 p2, p2, 0x2
+
+    invoke-virtual {p0, p1, p2, v0, p4}, Lq0/a/a/d;->j(Lq0/a/a/a;ILjava/lang/String;[C)I
+
+    move-result p2
+
+    move v0, p3
+
+    goto :goto_0
+
+    :cond_0
+    :goto_1
+    add-int/lit8 p3, v0, -0x1
+
+    if-lez v0, :cond_1
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, p1, p2, v0, p4}, Lq0/a/a/d;->j(Lq0/a/a/a;ILjava/lang/String;[C)I
+
+    move-result p2
+
+    move v0, p3
+
+    goto :goto_1
+
+    :cond_1
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p1}, Lq0/a/a/a;->g()V
+
+    :cond_2
+    return p2
+.end method
+
+.method public l(I)I
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/d;->a:[B
+
+    aget-byte v1, v0, p1
+
+    and-int/lit16 v1, v1, 0xff
+
+    shl-int/lit8 v1, v1, 0x18
+
+    add-int/lit8 v2, p1, 0x1
+
+    aget-byte v2, v0, v2
+
+    and-int/lit16 v2, v2, 0xff
+
+    shl-int/lit8 v2, v2, 0x10
+
+    or-int/2addr v1, v2
+
+    add-int/lit8 v2, p1, 0x2
+
+    aget-byte v2, v0, v2
+
+    and-int/lit16 v2, v2, 0xff
+
+    shl-int/lit8 v2, v2, 0x8
+
+    or-int/2addr v1, v2
+
+    add-int/lit8 p1, p1, 0x3
+
+    aget-byte p1, v0, p1
+
+    and-int/lit16 p1, p1, 0xff
+
+    or-int/2addr p1, v1
+
+    return p1
+.end method
+
+.method public m(I)J
+    .locals 6
+
+    invoke-virtual {p0, p1}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    int-to-long v0, v0
+
+    add-int/lit8 p1, p1, 0x4
+
+    invoke-virtual {p0, p1}, Lq0/a/a/d;->l(I)I
+
+    move-result p1
+
+    int-to-long v2, p1
+
+    const-wide v4, 0xffffffffL
+
+    and-long/2addr v2, v4
+
+    const/16 p1, 0x20
+
+    shl-long/2addr v0, p1
+
+    or-long/2addr v0, v2
+
+    return-wide v0
+.end method
+
+.method public n(I[C)Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {p0, p1}, Lq0/a/a/d;->u(I)I
+
+    move-result p1
+
+    aget p1, v0, p1
+
+    invoke-virtual {p0, p1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public o(I[C)Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {p0, p1}, Lq0/a/a/d;->u(I)I
+
+    move-result p1
+
+    aget p1, v0, p1
+
+    invoke-virtual {p0, p1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final p(Lq0/a/a/q;Lq0/a/a/h;IZ)V
+    .locals 10
+
+    iget-object v0, p0, Lq0/a/a/d;->a:[B
+
+    add-int/lit8 v1, p3, 0x1
+
+    aget-byte p3, v0, p3
+
+    and-int/lit16 p3, p3, 0xff
+
+    check-cast p1, Lq0/a/a/r;
+
+    if-eqz p4, :cond_0
+
+    iput p3, p1, Lq0/a/a/r;->D:I
+
+    goto :goto_0
+
+    :cond_0
+    iput p3, p1, Lq0/a/a/r;->F:I
+
+    :goto_0
+    iget-object p2, p2, Lq0/a/a/h;->c:[C
+
+    const/4 v0, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_1
+    if-ge v2, p3, :cond_5
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v1, v1, 0x2
+
+    :goto_2
+    add-int/lit8 v4, v3, -0x1
+
+    if-lez v3, :cond_4
+
+    invoke-virtual {p0, v1, p2}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    add-int/lit8 v1, v1, 0x2
+
+    new-instance v5, Lq0/a/a/c;
+
+    invoke-direct {v5}, Lq0/a/a/c;-><init>()V
+
+    iget-object v6, p1, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v6, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v3
+
+    invoke-virtual {v5, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v5, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 v3, 0x1
+
+    if-eqz p4, :cond_2
+
+    iget-object v6, p1, Lq0/a/a/r;->E:[Lq0/a/a/a;
+
+    if-nez v6, :cond_1
+
+    iget-object v6, p1, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    invoke-static {v6}, Lq0/a/a/w;->a(Ljava/lang/String;)[Lq0/a/a/w;
+
+    move-result-object v6
+
+    array-length v6, v6
+
+    new-array v6, v6, [Lq0/a/a/a;
+
+    iput-object v6, p1, Lq0/a/a/r;->E:[Lq0/a/a/a;
+
+    :cond_1
+    iget-object v6, p1, Lq0/a/a/r;->E:[Lq0/a/a/a;
+
+    new-instance v7, Lq0/a/a/a;
+
+    iget-object v8, p1, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    aget-object v9, v6, v2
+
+    invoke-direct {v7, v8, v3, v5, v9}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    aput-object v7, v6, v2
+
+    goto :goto_3
+
+    :cond_2
+    iget-object v6, p1, Lq0/a/a/r;->G:[Lq0/a/a/a;
+
+    if-nez v6, :cond_3
+
+    iget-object v6, p1, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    invoke-static {v6}, Lq0/a/a/w;->a(Ljava/lang/String;)[Lq0/a/a/w;
+
+    move-result-object v6
+
+    array-length v6, v6
+
+    new-array v6, v6, [Lq0/a/a/a;
+
+    iput-object v6, p1, Lq0/a/a/r;->G:[Lq0/a/a/a;
+
+    :cond_3
+    iget-object v6, p1, Lq0/a/a/r;->G:[Lq0/a/a/a;
+
+    new-instance v7, Lq0/a/a/a;
+
+    iget-object v8, p1, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    aget-object v9, v6, v2
+
+    invoke-direct {v7, v8, v3, v5, v9}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    aput-object v7, v6, v2
+
+    :goto_3
+    invoke-virtual {p0, v7, v1, v3, p2}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v1
+
+    move v3, v4
+
+    goto :goto_2
+
+    :cond_4
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_5
+    return-void
+.end method
+
+.method public q(I)S
+    .locals 2
+
+    iget-object v0, p0, Lq0/a/a/d;->a:[B
+
+    aget-byte v1, v0, p1
+
+    and-int/lit16 v1, v1, 0xff
+
+    shl-int/lit8 v1, v1, 0x8
+
+    add-int/lit8 p1, p1, 0x1
+
+    aget-byte p1, v0, p1
+
+    and-int/lit16 p1, p1, 0xff
+
+    or-int/2addr p1, v1
+
+    int-to-short p1, p1
+
+    return p1
+.end method
+
+.method public final r(Lq0/a/a/h;I)I
+    .locals 9
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    ushr-int/lit8 v1, v0, 0x18
+
+    const/4 v2, 0x1
+
+    if-eqz v1, :cond_0
+
+    if-eq v1, v2, :cond_0
+
+    const/high16 v3, -0x1000000
+
+    packed-switch v1, :pswitch_data_0
+
+    packed-switch v1, :pswitch_data_1
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    and-int/2addr v0, v3
+
+    add-int/2addr p2, v2
+
+    goto :goto_2
+
+    :pswitch_1
+    const v1, -0xffff01
+
+    and-int/2addr v0, v1
+
+    add-int/lit8 p2, p2, 0x4
+
+    goto :goto_2
+
+    :pswitch_2
+    and-int/2addr v0, v3
+
+    goto :goto_0
+
+    :pswitch_3
+    and-int/lit16 v0, v0, -0x100
+
+    :goto_0
+    add-int/lit8 p2, p2, 0x3
+
+    goto :goto_2
+
+    :pswitch_4
+    and-int/2addr v0, v3
+
+    add-int/lit8 v1, p2, 0x1
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 p2, p2, 0x3
+
+    new-array v3, v1, [Lq0/a/a/p;
+
+    iput-object v3, p1, Lq0/a/a/h;->j:[Lq0/a/a/p;
+
+    new-array v3, v1, [Lq0/a/a/p;
+
+    iput-object v3, p1, Lq0/a/a/h;->k:[Lq0/a/a/p;
+
+    new-array v3, v1, [I
+
+    iput-object v3, p1, Lq0/a/a/h;->l:[I
+
+    const/4 v3, 0x0
+
+    :goto_1
+    if-ge v3, v1, :cond_1
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    add-int/lit8 v5, p2, 0x2
+
+    invoke-virtual {p0, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v5
+
+    add-int/lit8 v6, p2, 0x4
+
+    invoke-virtual {p0, v6}, Lq0/a/a/d;->u(I)I
+
+    move-result v6
+
+    add-int/lit8 p2, p2, 0x6
+
+    iget-object v7, p1, Lq0/a/a/h;->j:[Lq0/a/a/p;
+
+    iget-object v8, p1, Lq0/a/a/h;->g:[Lq0/a/a/p;
+
+    invoke-virtual {p0, v4, v8}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v8
+
+    aput-object v8, v7, v3
+
+    iget-object v7, p1, Lq0/a/a/h;->k:[Lq0/a/a/p;
+
+    add-int/2addr v4, v5
+
+    iget-object v5, p1, Lq0/a/a/h;->g:[Lq0/a/a/p;
+
+    invoke-virtual {p0, v4, v5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v4
+
+    aput-object v4, v7, v3
+
+    iget-object v4, p1, Lq0/a/a/h;->l:[I
+
+    aput v6, v4, v3
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    :pswitch_5
+    const/high16 v1, -0x10000
+
+    and-int/2addr v0, v1
+
+    add-int/lit8 p2, p2, 0x2
+
+    :cond_1
+    :goto_2
+    iput v0, p1, Lq0/a/a/h;->h:I
+
+    invoke-virtual {p0, p2}, Lq0/a/a/d;->f(I)I
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    const/4 v1, 0x0
+
+    goto :goto_3
+
+    :cond_2
+    new-instance v1, Lq0/a/a/x;
+
+    iget-object v3, p0, Lq0/a/a/d;->a:[B
+
+    invoke-direct {v1, v3, p2}, Lq0/a/a/x;-><init>([BI)V
+
+    :goto_3
+    iput-object v1, p1, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    add-int/2addr p2, v2
+
+    mul-int/lit8 v0, v0, 0x2
+
+    add-int/2addr v0, p2
+
+    return v0
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x10
+        :pswitch_3
+        :pswitch_3
+        :pswitch_3
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_5
+        :pswitch_3
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0x40
+        :pswitch_4
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+        :pswitch_1
+    .end packed-switch
+.end method
+
+.method public final s(Lq0/a/a/q;Lq0/a/a/h;IZ)[I
+    .locals 11
+
+    iget-object v0, p2, Lq0/a/a/h;->c:[C
+
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    new-array v2, v1, [I
+
+    add-int/lit8 p3, p3, 0x2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_0
+    if-ge v4, v1, :cond_6
+
+    aput p3, v2, v4
+
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->l(I)I
+
+    move-result v5
+
+    ushr-int/lit8 v6, v5, 0x18
+
+    const/16 v7, 0x17
+
+    if-eq v6, v7, :cond_0
+
+    packed-switch v6, :pswitch_data_0
+
+    packed-switch v6, :pswitch_data_1
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    add-int/lit8 p3, p3, 0x4
+
+    goto :goto_2
+
+    :pswitch_1
+    add-int/lit8 v7, p3, 0x1
+
+    invoke-virtual {p0, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result v7
+
+    add-int/lit8 p3, p3, 0x3
+
+    :goto_1
+    add-int/lit8 v8, v7, -0x1
+
+    if-lez v7, :cond_1
+
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->u(I)I
+
+    move-result v7
+
+    add-int/lit8 v9, p3, 0x2
+
+    invoke-virtual {p0, v9}, Lq0/a/a/d;->u(I)I
+
+    move-result v9
+
+    add-int/lit8 p3, p3, 0x6
+
+    iget-object v10, p2, Lq0/a/a/h;->g:[Lq0/a/a/p;
+
+    invoke-virtual {p0, v7, v10}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    add-int/2addr v7, v9
+
+    iget-object v9, p2, Lq0/a/a/h;->g:[Lq0/a/a/p;
+
+    invoke-virtual {p0, v7, v9}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move v7, v8
+
+    goto :goto_1
+
+    :cond_0
+    :pswitch_2
+    add-int/lit8 p3, p3, 0x3
+
+    :cond_1
+    :goto_2
+    invoke-virtual {p0, p3}, Lq0/a/a/d;->f(I)I
+
+    move-result v7
+
+    const/16 v8, 0x42
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x1
+
+    if-ne v6, v8, :cond_5
+
+    if-nez v7, :cond_2
+
+    move-object v6, v9
+
+    goto :goto_3
+
+    :cond_2
+    new-instance v6, Lq0/a/a/x;
+
+    iget-object v8, p0, Lq0/a/a/d;->a:[B
+
+    invoke-direct {v6, v8, p3}, Lq0/a/a/x;-><init>([BI)V
+
+    :goto_3
+    mul-int/lit8 v7, v7, 0x2
+
+    add-int/2addr v7, v10
+
+    add-int/2addr v7, p3
+
+    invoke-virtual {p0, v7, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object p3
+
+    add-int/lit8 v7, v7, 0x2
+
+    and-int/lit16 v5, v5, -0x100
+
+    move-object v8, p1
+
+    check-cast v8, Lq0/a/a/r;
+
+    if-eqz v8, :cond_4
+
+    new-instance v9, Lq0/a/a/c;
+
+    invoke-direct {v9}, Lq0/a/a/c;-><init>()V
+
+    invoke-static {v5, v9}, Lf/n/a/k/a;->P(ILq0/a/a/c;)V
+
+    invoke-static {v6, v9}, Lq0/a/a/x;->a(Lq0/a/a/x;Lq0/a/a/c;)V
+
+    iget-object v5, v8, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v5, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p3
+
+    invoke-virtual {v9, p3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v9, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    if-eqz p4, :cond_3
+
+    new-instance p3, Lq0/a/a/a;
+
+    iget-object v5, v8, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v6, v8, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    invoke-direct {p3, v5, v10, v9, v6}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p3, v8, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    goto :goto_4
+
+    :cond_3
+    new-instance p3, Lq0/a/a/a;
+
+    iget-object v5, v8, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v6, v8, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    invoke-direct {p3, v5, v10, v9, v6}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p3, v8, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    :goto_4
+    invoke-virtual {p0, p3, v7, v10, v0}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result p3
+
+    goto :goto_5
+
+    :cond_4
+    throw v9
+
+    :cond_5
+    mul-int/lit8 v7, v7, 0x2
+
+    add-int/lit8 v7, v7, 0x3
+
+    add-int/2addr v7, p3
+
+    invoke-virtual {p0, v9, v7, v10, v0}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result p3
+
+    :goto_5
+    add-int/lit8 v4, v4, 0x1
+
+    goto/16 :goto_0
+
+    :cond_6
+    return-object v2
+
+    :pswitch_data_0
+    .packed-switch 0x10
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0x40
+        :pswitch_1
+        :pswitch_1
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public t(I[C)Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    if-eqz p1, :cond_1
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0, v0, p2}, Lq0/a/a/d;->w(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public u(I)I
+    .locals 2
+
+    iget-object v0, p0, Lq0/a/a/d;->a:[B
+
+    aget-byte v1, v0, p1
+
+    and-int/lit16 v1, v1, 0xff
+
+    shl-int/lit8 v1, v1, 0x8
+
+    add-int/lit8 p1, p1, 0x1
+
+    aget-byte p1, v0, p1
+
+    and-int/lit16 p1, p1, 0xff
+
+    or-int/2addr p1, v1
+
+    return p1
+.end method
+
+.method public final v(II[C)Ljava/lang/String;
+    .locals 6
+
+    add-int/2addr p2, p1
+
+    iget-object v0, p0, Lq0/a/a/d;->a:[B
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge p1, p2, :cond_2
+
+    add-int/lit8 v3, p1, 0x1
+
+    aget-byte p1, v0, p1
+
+    and-int/lit16 v4, p1, 0x80
+
+    if-nez v4, :cond_0
+
+    add-int/lit8 v4, v2, 0x1
+
+    and-int/lit8 p1, p1, 0x7f
+
+    int-to-char p1, p1
+
+    aput-char p1, p3, v2
+
+    :goto_1
+    move p1, v3
+
+    move v2, v4
+
+    goto :goto_0
+
+    :cond_0
+    and-int/lit16 v4, p1, 0xe0
+
+    const/16 v5, 0xc0
+
+    if-ne v4, v5, :cond_1
+
+    add-int/lit8 v4, v2, 0x1
+
+    and-int/lit8 p1, p1, 0x1f
+
+    shl-int/lit8 p1, p1, 0x6
+
+    add-int/lit8 v5, v3, 0x1
+
+    aget-byte v3, v0, v3
+
+    and-int/lit8 v3, v3, 0x3f
+
+    add-int/2addr p1, v3
+
+    int-to-char p1, p1
+
+    aput-char p1, p3, v2
+
+    move v2, v4
+
+    move p1, v5
+
+    goto :goto_0
+
+    :cond_1
+    add-int/lit8 v4, v2, 0x1
+
+    and-int/lit8 p1, p1, 0xf
+
+    shl-int/lit8 p1, p1, 0xc
+
+    add-int/lit8 v5, v3, 0x1
+
+    aget-byte v3, v0, v3
+
+    and-int/lit8 v3, v3, 0x3f
+
+    shl-int/lit8 v3, v3, 0x6
+
+    add-int/2addr p1, v3
+
+    add-int/lit8 v3, v5, 0x1
+
+    aget-byte v5, v0, v5
+
+    and-int/lit8 v5, v5, 0x3f
+
+    add-int/2addr p1, v5
+
+    int-to-char p1, p1
+
+    aput-char p1, p3, v2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p1, Ljava/lang/String;
+
+    invoke-direct {p1, p3, v1, v2}, Ljava/lang/String;-><init>([CII)V
+
+    return-object p1
+.end method
+
+.method public final w(I[C)Ljava/lang/String;
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/d;->c:[Ljava/lang/String;
+
+    aget-object v1, v0, p1
+
+    if-eqz v1, :cond_0
+
+    return-object v1
+
+    :cond_0
+    iget-object v1, p0, Lq0/a/a/d;->b:[I
+
+    aget v1, v1, p1
+
+    add-int/lit8 v2, v1, 0x2
+
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    invoke-virtual {p0, v2, v1, p2}, Lq0/a/a/d;->v(II[C)Ljava/lang/String;
+
+    move-result-object p2
+
+    aput-object p2, v0, p1
+
+    return-object p2
+.end method
+
+.method public final x(I[Ljava/lang/Object;I[C[Lq0/a/a/p;)I
+    .locals 2
+
+    iget-object v0, p0, Lq0/a/a/d;->a:[B
+
+    add-int/lit8 v1, p1, 0x1
+
+    aget-byte p1, v0, p1
+
+    and-int/lit16 p1, p1, 0xff
+
+    packed-switch p1, :pswitch_data_0
+
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    invoke-virtual {p0, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result p1
+
+    invoke-virtual {p0, p1, p5}, Lq0/a/a/d;->b(I[Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object p1
+
+    aput-object p1, p2, p3
+
+    goto :goto_0
+
+    :pswitch_1
+    invoke-virtual {p0, v1, p4}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object p1
+
+    aput-object p1, p2, p3
+
+    :goto_0
+    add-int/lit8 v1, v1, 0x2
+
+    goto :goto_1
+
+    :pswitch_2
+    sget-object p1, Lq0/a/a/t;->g:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_3
+    sget-object p1, Lq0/a/a/t;->f:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_4
+    sget-object p1, Lq0/a/a/t;->e:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_5
+    sget-object p1, Lq0/a/a/t;->d:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_6
+    sget-object p1, Lq0/a/a/t;->c:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_7
+    sget-object p1, Lq0/a/a/t;->b:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_8
+    sget-object p1, Lq0/a/a/t;->a:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    :goto_1
+    return v1
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/e.smali b/com.discord/smali_classes2/q0/a/a/e.smali
new file mode 100644
index 0000000000..c848ded749
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/e.smali
@@ -0,0 +1,54 @@
+.class public abstract Lq0/a/a/e;
+.super Ljava/lang/Object;
+.source "ClassVisitor.java"
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/high16 v0, 0x60000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x50000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x40000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x70000
+
+    if-ne p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+.end method
+
+.method public abstract b(Ljava/lang/String;Z)Lq0/a/a/a;
+.end method
+
+.method public abstract c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
+.end method
+
+.method public abstract d(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/f.smali b/com.discord/smali_classes2/q0/a/a/f.smali
new file mode 100644
index 0000000000..c3de5039bb
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/f.smali
@@ -0,0 +1,5984 @@
+.class public Lq0/a/a/f;
+.super Lq0/a/a/e;
+.source "ClassWriter.java"
+
+
+# instance fields
+.field public A:Lq0/a/a/b;
+
+.field public B:I
+
+.field public a:I
+
+.field public final b:Lq0/a/a/v;
+
+.field public c:I
+
+.field public d:I
+
+.field public e:I
+
+.field public f:I
+
+.field public g:[I
+
+.field public h:Lq0/a/a/l;
+
+.field public i:Lq0/a/a/l;
+
+.field public j:Lq0/a/a/r;
+
+.field public k:Lq0/a/a/r;
+
+.field public l:I
+
+.field public m:Lq0/a/a/c;
+
+.field public n:I
+
+.field public o:I
+
+.field public p:I
+
+.field public q:I
+
+.field public r:Lq0/a/a/c;
+
+.field public s:Lq0/a/a/a;
+
+.field public t:Lq0/a/a/a;
+
+.field public u:Lq0/a/a/a;
+
+.field public v:Lq0/a/a/a;
+
+.field public w:Lq0/a/a/s;
+
+.field public x:I
+
+.field public y:I
+
+.field public z:Lq0/a/a/c;
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    const/high16 v0, 0x70000
+
+    invoke-direct {p0, v0}, Lq0/a/a/e;-><init>(I)V
+
+    new-instance v0, Lq0/a/a/v;
+
+    invoke-direct {v0, p0}, Lq0/a/a/v;-><init>(Lq0/a/a/f;)V
+
+    iput-object v0, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    and-int/lit8 v0, p1, 0x2
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x4
+
+    iput p1, p0, Lq0/a/a/f;->B:I
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    and-int/2addr p1, v0
+
+    if-eqz p1, :cond_1
+
+    iput v0, p0, Lq0/a/a/f;->B:I
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x0
+
+    iput p1, p0, Lq0/a/a/f;->B:I
+
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+    .locals 1
+
+    iput p1, p0, Lq0/a/a/f;->a:I
+
+    iput p2, p0, Lq0/a/a/f;->c:I
+
+    iget-object p2, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const v0, 0xffff
+
+    and-int/2addr p1, v0
+
+    iput p1, p2, Lq0/a/a/v;->c:I
+
+    iput-object p3, p2, Lq0/a/a/v;->d:Ljava/lang/String;
+
+    const/4 v0, 0x7
+
+    invoke-virtual {p2, v0, p3}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p2
+
+    iget p2, p2, Lq0/a/a/u;->a:I
+
+    iput p2, p0, Lq0/a/a/f;->d:I
+
+    if-eqz p4, :cond_0
+
+    iget-object p2, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {p2, p4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    iput p2, p0, Lq0/a/a/f;->p:I
+
+    :cond_0
+    const/4 p2, 0x0
+
+    if-nez p5, :cond_1
+
+    const/4 p3, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    iget-object p3, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {p3, v0, p5}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p3
+
+    iget p3, p3, Lq0/a/a/u;->a:I
+
+    :goto_0
+    iput p3, p0, Lq0/a/a/f;->e:I
+
+    if-eqz p6, :cond_2
+
+    array-length p3, p6
+
+    if-lez p3, :cond_2
+
+    array-length p3, p6
+
+    iput p3, p0, Lq0/a/a/f;->f:I
+
+    new-array p3, p3, [I
+
+    iput-object p3, p0, Lq0/a/a/f;->g:[I
+
+    :goto_1
+    iget p3, p0, Lq0/a/a/f;->f:I
+
+    if-ge p2, p3, :cond_2
+
+    iget-object p3, p0, Lq0/a/a/f;->g:[I
+
+    iget-object p4, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    aget-object p5, p6, p2
+
+    invoke-virtual {p4, p5}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p4
+
+    iget p4, p4, Lq0/a/a/u;->a:I
+
+    aput p4, p3, p2
+
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    iget p2, p0, Lq0/a/a/f;->B:I
+
+    const/4 p3, 0x1
+
+    if-ne p2, p3, :cond_3
+
+    const/16 p2, 0x33
+
+    if-lt p1, p2, :cond_3
+
+    const/4 p1, 0x2
+
+    iput p1, p0, Lq0/a/a/f;->B:I
+
+    :cond_3
+    return-void
+.end method
+
+.method public final b(Ljava/lang/String;Z)Lq0/a/a/a;
+    .locals 3
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    iget-object v1, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v1, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p2, :cond_0
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object v1, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/f;->s:Lq0/a/a/a;
+
+    invoke-direct {p2, v1, p1, v0, v2}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/f;->s:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_0
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object v1, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/f;->t:Lq0/a/a/a;
+
+    invoke-direct {p2, v1, p1, v0, v2}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/f;->t:Lq0/a/a/a;
+
+    return-object p2
+.end method
+
+.method public final c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
+    .locals 9
+
+    new-instance v8, Lq0/a/a/r;
+
+    iget-object v1, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget v7, p0, Lq0/a/a/f;->B:I
+
+    move-object v0, v8
+
+    move v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    invoke-direct/range {v0 .. v7}, Lq0/a/a/r;-><init>(Lq0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;I)V
+
+    iget-object p1, p0, Lq0/a/a/f;->j:Lq0/a/a/r;
+
+    if-nez p1, :cond_0
+
+    iput-object v8, p0, Lq0/a/a/f;->j:Lq0/a/a/r;
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Lq0/a/a/f;->k:Lq0/a/a/r;
+
+    iput-object v8, p1, Lq0/a/a/q;->b:Lq0/a/a/q;
+
+    :goto_0
+    iput-object v8, p0, Lq0/a/a/f;->k:Lq0/a/a/r;
+
+    return-object v8
+.end method
+
+.method public final d(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+    .locals 1
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    invoke-static {p1, v0}, Lf/n/a/k/a;->P(ILq0/a/a/c;)V
+
+    invoke-static {p2, v0}, Lq0/a/a/x;->a(Lq0/a/a/x;Lq0/a/a/c;)V
+
+    iget-object p1, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {p1, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p4, :cond_0
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/f;->u:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/f;->u:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_0
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/f;->v:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/f;->v:Lq0/a/a/a;
+
+    return-object p2
+.end method
+
+.method public final e([BZ)[B
+    .locals 57
+
+    move-object/from16 v7, p0
+
+    new-instance v0, Lq0/a/a/b$a;
+
+    invoke-direct {v0}, Lq0/a/a/b$a;-><init>()V
+
+    iget-object v1, v7, Lq0/a/a/f;->A:Lq0/a/a/b;
+
+    invoke-virtual {v0, v1}, Lq0/a/a/b$a;->a(Lq0/a/a/b;)V
+
+    iget-object v1, v7, Lq0/a/a/f;->h:Lq0/a/a/l;
+
+    :goto_0
+    if-eqz v1, :cond_0
+
+    iget-object v2, v1, Lq0/a/a/l;->l:Lq0/a/a/b;
+
+    invoke-virtual {v0, v2}, Lq0/a/a/b$a;->a(Lq0/a/a/b;)V
+
+    iget-object v1, v1, Lq0/a/a/k;->a:Lq0/a/a/k;
+
+    check-cast v1, Lq0/a/a/l;
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, v7, Lq0/a/a/f;->j:Lq0/a/a/r;
+
+    :goto_1
+    if-eqz v1, :cond_1
+
+    iget-object v2, v1, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    invoke-virtual {v0, v2}, Lq0/a/a/b$a;->a(Lq0/a/a/b;)V
+
+    iget-object v2, v1, Lq0/a/a/r;->x:Lq0/a/a/b;
+
+    invoke-virtual {v0, v2}, Lq0/a/a/b$a;->a(Lq0/a/a/b;)V
+
+    iget-object v1, v1, Lq0/a/a/q;->b:Lq0/a/a/q;
+
+    check-cast v1, Lq0/a/a/r;
+
+    goto :goto_1
+
+    :cond_1
+    iget v1, v0, Lq0/a/a/b$a;->a:I
+
+    new-array v2, v1, [Lq0/a/a/b;
+
+    iget-object v0, v0, Lq0/a/a/b$a;->b:[Lq0/a/a/b;
+
+    const/4 v6, 0x0
+
+    invoke-static {v0, v6, v2, v6, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    const/4 v5, 0x0
+
+    iput-object v5, v7, Lq0/a/a/f;->h:Lq0/a/a/l;
+
+    iput-object v5, v7, Lq0/a/a/f;->i:Lq0/a/a/l;
+
+    iput-object v5, v7, Lq0/a/a/f;->j:Lq0/a/a/r;
+
+    iput-object v5, v7, Lq0/a/a/f;->k:Lq0/a/a/r;
+
+    iput-object v5, v7, Lq0/a/a/f;->s:Lq0/a/a/a;
+
+    iput-object v5, v7, Lq0/a/a/f;->t:Lq0/a/a/a;
+
+    iput-object v5, v7, Lq0/a/a/f;->u:Lq0/a/a/a;
+
+    iput-object v5, v7, Lq0/a/a/f;->v:Lq0/a/a/a;
+
+    iput-object v5, v7, Lq0/a/a/f;->w:Lq0/a/a/s;
+
+    iput v6, v7, Lq0/a/a/f;->x:I
+
+    iput v6, v7, Lq0/a/a/f;->y:I
+
+    iput-object v5, v7, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    iput-object v5, v7, Lq0/a/a/f;->A:Lq0/a/a/b;
+
+    if-eqz p2, :cond_2
+
+    const/4 v0, 0x3
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_2
+    iput v0, v7, Lq0/a/a/f;->B:I
+
+    new-instance v4, Lq0/a/a/d;
+
+    move-object/from16 v0, p1
+
+    invoke-direct {v4, v0, v6, v6}, Lq0/a/a/d;-><init>([BIZ)V
+
+    const/16 v0, 0x8
+
+    if-eqz p2, :cond_3
+
+    const/16 v1, 0x8
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v1, 0x0
+
+    :goto_3
+    or-int/lit16 v3, v1, 0x100
+
+    new-instance v1, Lq0/a/a/h;
+
+    invoke-direct {v1}, Lq0/a/a/h;-><init>()V
+
+    iput-object v2, v1, Lq0/a/a/h;->a:[Lq0/a/a/b;
+
+    iput v3, v1, Lq0/a/a/h;->b:I
+
+    iget v8, v4, Lq0/a/a/d;->f:I
+
+    new-array v15, v8, [C
+
+    iput-object v15, v1, Lq0/a/a/h;->c:[C
+
+    iget v8, v4, Lq0/a/a/d;->g:I
+
+    invoke-virtual {v4, v8}, Lq0/a/a/d;->u(I)I
+
+    move-result v9
+
+    add-int/lit8 v10, v8, 0x2
+
+    invoke-virtual {v4, v10, v15}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v16
+
+    add-int/lit8 v10, v8, 0x4
+
+    invoke-virtual {v4, v10, v15}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v17
+
+    add-int/lit8 v10, v8, 0x6
+
+    invoke-virtual {v4, v10}, Lq0/a/a/d;->u(I)I
+
+    move-result v10
+
+    new-array v14, v10, [Ljava/lang/String;
+
+    add-int/2addr v8, v0
+
+    move v0, v8
+
+    const/4 v8, 0x0
+
+    :goto_4
+    if-ge v8, v10, :cond_4
+
+    invoke-virtual {v4, v0, v15}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v11
+
+    aput-object v11, v14, v8
+
+    add-int/lit8 v0, v0, 0x2
+
+    add-int/lit8 v8, v8, 0x1
+
+    goto :goto_4
+
+    :cond_4
+    invoke-virtual {v4}, Lq0/a/a/d;->c()I
+
+    move-result v8
+
+    add-int/lit8 v10, v8, -0x2
+
+    invoke-virtual {v4, v10}, Lq0/a/a/d;->u(I)I
+
+    move-result v10
+
+    move-object v11, v5
+
+    move-object v12, v11
+
+    move-object/from16 v18, v12
+
+    move-object/from16 v20, v18
+
+    move-object/from16 v22, v20
+
+    move v13, v9
+
+    move/from16 v19, v10
+
+    move-object/from16 p1, v14
+
+    const/4 v9, 0x0
+
+    const/16 v21, 0x0
+
+    const/16 v23, 0x0
+
+    const/16 v24, 0x0
+
+    const/16 v25, 0x0
+
+    const/16 v26, 0x0
+
+    const/16 v27, 0x0
+
+    const/16 v28, 0x0
+
+    const/16 v29, 0x0
+
+    move-object/from16 v10, v22
+
+    :goto_5
+    const-string v14, "RuntimeInvisibleTypeAnnotations"
+
+    move-object/from16 p2, v12
+
+    const-string v12, "RuntimeInvisibleAnnotations"
+
+    const/high16 v30, 0x20000
+
+    move-object/from16 v31, v11
+
+    const-string v11, "Synthetic"
+
+    move-object/from16 v32, v10
+
+    const-string v10, "Deprecated"
+
+    move/from16 v33, v9
+
+    const-string v9, "RuntimeVisibleTypeAnnotations"
+
+    const-string v7, "RuntimeVisibleAnnotations"
+
+    const-string v6, "Signature"
+
+    if-lez v19, :cond_16
+
+    invoke-virtual {v4, v8, v15}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v5
+
+    move/from16 v34, v0
+
+    add-int/lit8 v0, v8, 0x2
+
+    invoke-virtual {v4, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v0
+
+    add-int/lit8 v8, v8, 0x6
+
+    move-object/from16 v35, v1
+
+    const-string v1, "SourceFile"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    invoke-virtual {v4, v8, v15}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v11
+
+    move-object/from16 v10, v32
+
+    move/from16 v9, v33
+
+    goto/16 :goto_9
+
+    :cond_5
+    const-string v1, "InnerClasses"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_6
+
+    move/from16 v29, v8
+
+    goto :goto_6
+
+    :cond_6
+    const-string v1, "EnclosingMethod"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    move/from16 v23, v8
+
+    goto :goto_6
+
+    :cond_7
+    const-string v1, "NestHost"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_8
+
+    invoke-virtual {v4, v8, v15}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v22
+
+    :goto_6
+    move/from16 v9, v33
+
+    goto/16 :goto_7
+
+    :cond_8
+    const-string v1, "NestMembers"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_9
+
+    move/from16 v28, v8
+
+    goto :goto_6
+
+    :cond_9
+    invoke-virtual {v6, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_a
+
+    invoke-virtual {v4, v8, v15}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v18
+
+    goto :goto_6
+
+    :cond_a
+    invoke-virtual {v7, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_b
+
+    move/from16 v24, v8
+
+    goto :goto_6
+
+    :cond_b
+    invoke-virtual {v9, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_c
+
+    move/from16 v26, v8
+
+    goto :goto_6
+
+    :cond_c
+    invoke-virtual {v10, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_d
+
+    or-int v13, v13, v30
+
+    goto :goto_6
+
+    :cond_d
+    invoke-virtual {v11, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_e
+
+    or-int/lit16 v13, v13, 0x1000
+
+    goto :goto_6
+
+    :cond_e
+    const-string v1, "SourceDebugExtension"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_f
+
+    new-array v1, v0, [C
+
+    invoke-virtual {v4, v8, v0, v1}, Lq0/a/a/d;->v(II[C)Ljava/lang/String;
+
+    move-result-object v10
+
+    move/from16 v9, v33
+
+    goto :goto_8
+
+    :cond_f
+    invoke-virtual {v12, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_10
+
+    move/from16 v25, v8
+
+    goto :goto_6
+
+    :cond_10
+    invoke-virtual {v14, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_11
+
+    move/from16 v27, v8
+
+    goto :goto_6
+
+    :cond_11
+    const-string v1, "Module"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_12
+
+    move v9, v8
+
+    goto :goto_7
+
+    :cond_12
+    const-string v1, "ModuleMainClass"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_13
+
+    invoke-virtual {v4, v8, v15}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v20
+
+    goto :goto_6
+
+    :cond_13
+    const-string v1, "ModulePackages"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_14
+
+    move/from16 v21, v8
+
+    goto/16 :goto_6
+
+    :goto_7
+    move-object/from16 v10, v32
+
+    :goto_8
+    move-object/from16 v11, v31
+
+    :goto_9
+    move-object/from16 v32, p1
+
+    move-object/from16 v12, p2
+
+    move v6, v8
+
+    move-object v7, v15
+
+    goto :goto_b
+
+    :cond_14
+    const-string v1, "BootstrapMethods"
+
+    invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_15
+
+    const/4 v14, -0x1
+
+    const/4 v1, 0x0
+
+    move v6, v8
+
+    move-object v8, v4
+
+    move/from16 v7, v33
+
+    move-object v9, v2
+
+    move-object/from16 v12, v32
+
+    move-object v10, v5
+
+    move-object/from16 v5, v31
+
+    move v11, v6
+
+    move-object/from16 v36, p2
+
+    move-object/from16 v37, v12
+
+    move v12, v0
+
+    move/from16 v31, v13
+
+    move-object v13, v15
+
+    move-object/from16 v32, p1
+
+    move-object v7, v15
+
+    move-object v15, v1
+
+    invoke-virtual/range {v8 .. v15}, Lq0/a/a/d;->e([Lq0/a/a/b;Ljava/lang/String;II[CI[Lq0/a/a/p;)Lq0/a/a/b;
+
+    move-result-object v12
+
+    move-object/from16 v8, v36
+
+    iput-object v8, v12, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    goto :goto_a
+
+    :cond_15
+    move v6, v8
+
+    move-object v7, v15
+
+    move-object/from16 v5, v31
+
+    move-object/from16 v37, v32
+
+    move-object/from16 v32, p1
+
+    move-object/from16 v8, p2
+
+    move/from16 v31, v13
+
+    move-object v12, v8
+
+    :goto_a
+    move-object v11, v5
+
+    move/from16 v13, v31
+
+    move/from16 v9, v33
+
+    move-object/from16 v10, v37
+
+    :goto_b
+    add-int v8, v6, v0
+
+    add-int/lit8 v19, v19, -0x1
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    move-object v15, v7
+
+    move-object/from16 p1, v32
+
+    move/from16 v0, v34
+
+    move-object/from16 v1, v35
+
+    move-object/from16 v7, p0
+
+    goto/16 :goto_5
+
+    :cond_16
+    move-object/from16 v8, p2
+
+    move/from16 v34, v0
+
+    move-object/from16 v35, v1
+
+    move-object/from16 v5, v31
+
+    move-object/from16 v37, v32
+
+    move-object/from16 v32, p1
+
+    move/from16 v31, v13
+
+    move-object v13, v7
+
+    move-object v7, v15
+
+    move/from16 v15, v33
+
+    iget-object v0, v4, Lq0/a/a/d;->b:[I
+
+    const/4 v2, 0x1
+
+    aget v0, v0, v2
+
+    const/4 v1, 0x7
+
+    sub-int/2addr v0, v1
+
+    invoke-virtual {v4, v0}, Lq0/a/a/d;->l(I)I
+
+    move-result v19
+
+    move-object/from16 v36, v8
+
+    move/from16 v8, v34
+
+    move-object/from16 v0, p0
+
+    move-object/from16 p1, v13
+
+    move-object/from16 p2, v14
+
+    move-object/from16 v13, v35
+
+    const/4 v14, 0x7
+
+    move/from16 v1, v19
+
+    move/from16 v2, v31
+
+    move/from16 v19, v3
+
+    move-object/from16 v3, v16
+
+    move-object v14, v4
+
+    move-object/from16 v4, v18
+
+    move-object/from16 v18, v12
+
+    move-object v12, v5
+
+    move-object/from16 v5, v17
+
+    move-object/from16 v38, v6
+
+    move-object/from16 v17, v9
+
+    const/4 v9, 0x0
+
+    move-object/from16 v6, v32
+
+    invoke-virtual/range {v0 .. v6}, Lq0/a/a/e;->a(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+
+    and-int/lit8 v0, v19, 0x2
+
+    if-nez v0, :cond_17
+
+    move-object/from16 v5, v37
+
+    if-nez v12, :cond_18
+
+    if-eqz v5, :cond_17
+
+    goto :goto_c
+
+    :cond_17
+    move-object/from16 v6, p0
+
+    move-object/from16 v4, p1
+
+    goto :goto_d
+
+    :cond_18
+    :goto_c
+    move-object/from16 v6, p0
+
+    move-object/from16 v4, p1
+
+    if-eqz v12, :cond_19
+
+    iget-object v0, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v0, v12}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v0
+
+    iput v0, v6, Lq0/a/a/f;->q:I
+
+    :cond_19
+    if-eqz v5, :cond_1a
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    const v1, 0x7fffffff
+
+    invoke-virtual {v0, v5, v9, v1}, Lq0/a/a/c;->a(Ljava/lang/String;II)Lq0/a/a/c;
+
+    iput-object v0, v6, Lq0/a/a/f;->r:Lq0/a/a/c;
+
+    :cond_1a
+    :goto_d
+    if-eqz v15, :cond_2d
+
+    iget-object v0, v13, Lq0/a/a/h;->c:[C
+
+    iget-object v1, v14, Lq0/a/a/d;->b:[I
+
+    invoke-virtual {v14, v15}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    aget v1, v1, v2
+
+    invoke-virtual {v14, v1, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v2, v15, 0x2
+
+    invoke-virtual {v14, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v3, v15, 0x4
+
+    invoke-virtual {v14, v3, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    add-int/lit8 v5, v15, 0x6
+
+    new-instance v12, Lq0/a/a/s;
+
+    iget-object v15, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/16 v9, 0x13
+
+    invoke-virtual {v15, v9, v1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    if-nez v3, :cond_1b
+
+    const/4 v3, 0x0
+
+    goto :goto_e
+
+    :cond_1b
+    iget-object v9, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v9, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v3
+
+    :goto_e
+    invoke-direct {v12, v15, v1, v2, v3}, Lq0/a/a/s;-><init>(Lq0/a/a/v;III)V
+
+    iput-object v12, v6, Lq0/a/a/f;->w:Lq0/a/a/s;
+
+    move-object/from16 v1, v20
+
+    if-eqz v1, :cond_1c
+
+    iget-object v2, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    const/4 v3, 0x7
+
+    invoke-virtual {v2, v3, v1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    iput v1, v12, Lq0/a/a/s;->q:I
+
+    :cond_1c
+    const/16 v1, 0x14
+
+    move/from16 v2, v21
+
+    if-eqz v2, :cond_1d
+
+    invoke-virtual {v14, v2}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v21, v2, 0x2
+
+    move/from16 v2, v21
+
+    :goto_f
+    add-int/lit8 v9, v3, -0x1
+
+    if-lez v3, :cond_1d
+
+    invoke-virtual {v14, v2, v0}, Lq0/a/a/d;->o(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    iget-object v15, v12, Lq0/a/a/s;->p:Lq0/a/a/c;
+
+    move/from16 v19, v9
+
+    iget-object v9, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v9, v1, v3}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v3
+
+    iget v3, v3, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v15, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v3, v12, Lq0/a/a/s;->o:I
+
+    const/4 v15, 0x1
+
+    add-int/2addr v3, v15
+
+    iput v3, v12, Lq0/a/a/s;->o:I
+
+    add-int/lit8 v2, v2, 0x2
+
+    move/from16 v3, v19
+
+    goto :goto_f
+
+    :cond_1d
+    const/4 v15, 0x1
+
+    invoke-virtual {v14, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v5, v5, 0x2
+
+    :goto_10
+    add-int/lit8 v3, v2, -0x1
+
+    if-lez v2, :cond_1f
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->n(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v9, v5, 0x2
+
+    invoke-virtual {v14, v9}, Lq0/a/a/d;->u(I)I
+
+    move-result v9
+
+    add-int/lit8 v1, v5, 0x4
+
+    invoke-virtual {v14, v1, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v5, v5, 0x6
+
+    iget-object v15, v12, Lq0/a/a/s;->f:Lq0/a/a/c;
+
+    move/from16 v20, v3
+
+    iget-object v3, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    move-object/from16 v21, v4
+
+    const/16 v4, 0x13
+
+    invoke-virtual {v3, v4, v2}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v2
+
+    iget v2, v2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v15, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v15, v9}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    if-nez v1, :cond_1e
+
+    const/4 v1, 0x0
+
+    goto :goto_11
+
+    :cond_1e
+    iget-object v2, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v2, v1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v1
+
+    :goto_11
+    invoke-virtual {v15, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v1, v12, Lq0/a/a/s;->e:I
+
+    const/4 v2, 0x1
+
+    add-int/2addr v1, v2
+
+    iput v1, v12, Lq0/a/a/s;->e:I
+
+    move/from16 v2, v20
+
+    move-object/from16 v4, v21
+
+    const/16 v1, 0x14
+
+    const/4 v15, 0x1
+
+    goto :goto_10
+
+    :cond_1f
+    move-object/from16 v21, v4
+
+    invoke-virtual {v14, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v5, v5, 0x2
+
+    :goto_12
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_24
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->o(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v3, v5, 0x2
+
+    invoke-virtual {v14, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v4, v5, 0x4
+
+    invoke-virtual {v14, v4}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    add-int/lit8 v5, v5, 0x6
+
+    if-eqz v4, :cond_20
+
+    new-array v9, v4, [Ljava/lang/String;
+
+    const/4 v15, 0x0
+
+    :goto_13
+    if-ge v15, v4, :cond_21
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->n(I[C)Ljava/lang/String;
+
+    move-result-object v20
+
+    aput-object v20, v9, v15
+
+    add-int/lit8 v5, v5, 0x2
+
+    add-int/lit8 v15, v15, 0x1
+
+    goto :goto_13
+
+    :cond_20
+    const/4 v9, 0x0
+
+    :cond_21
+    iget-object v4, v12, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    iget-object v15, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    move/from16 p1, v2
+
+    const/16 v2, 0x14
+
+    invoke-virtual {v15, v2, v1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v4, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v4, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    if-nez v9, :cond_22
+
+    iget-object v1, v12, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_15
+
+    :cond_22
+    iget-object v1, v12, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    array-length v2, v9
+
+    invoke-virtual {v1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    array-length v1, v9
+
+    const/4 v2, 0x0
+
+    :goto_14
+    if-ge v2, v1, :cond_23
+
+    aget-object v3, v9, v2
+
+    iget-object v4, v12, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    iget-object v15, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v15, v3}, Lq0/a/a/v;->j(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v3
+
+    iget v3, v3, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v4, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_14
+
+    :cond_23
+    :goto_15
+    iget v1, v12, Lq0/a/a/s;->g:I
+
+    const/4 v2, 0x1
+
+    add-int/2addr v1, v2
+
+    iput v1, v12, Lq0/a/a/s;->g:I
+
+    move/from16 v1, p1
+
+    goto :goto_12
+
+    :cond_24
+    invoke-virtual {v14, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v5, v5, 0x2
+
+    :goto_16
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_29
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->o(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v3, v5, 0x2
+
+    invoke-virtual {v14, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v4, v5, 0x4
+
+    invoke-virtual {v14, v4}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    add-int/lit8 v5, v5, 0x6
+
+    if-eqz v4, :cond_26
+
+    new-array v9, v4, [Ljava/lang/String;
+
+    const/4 v15, 0x0
+
+    :goto_17
+    if-ge v15, v4, :cond_25
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->n(I[C)Ljava/lang/String;
+
+    move-result-object v20
+
+    aput-object v20, v9, v15
+
+    add-int/lit8 v5, v5, 0x2
+
+    add-int/lit8 v15, v15, 0x1
+
+    goto :goto_17
+
+    :cond_25
+    move v4, v5
+
+    move-object v5, v9
+
+    goto :goto_18
+
+    :cond_26
+    move v4, v5
+
+    const/4 v5, 0x0
+
+    :goto_18
+    iget-object v9, v12, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    iget-object v15, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    move/from16 p1, v2
+
+    const/16 v2, 0x14
+
+    invoke-virtual {v15, v2, v1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v9, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v9, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    if-nez v5, :cond_27
+
+    iget-object v1, v12, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v1, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_1a
+
+    :cond_27
+    iget-object v1, v12, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    array-length v3, v5
+
+    invoke-virtual {v1, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    array-length v1, v5
+
+    const/4 v3, 0x0
+
+    :goto_19
+    if-ge v3, v1, :cond_28
+
+    aget-object v9, v5, v3
+
+    iget-object v15, v12, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    iget-object v2, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v2, v9}, Lq0/a/a/v;->j(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v2
+
+    iget v2, v2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v15, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v3, v3, 0x1
+
+    const/16 v2, 0x14
+
+    goto :goto_19
+
+    :cond_28
+    :goto_1a
+    iget v1, v12, Lq0/a/a/s;->i:I
+
+    const/4 v2, 0x1
+
+    add-int/2addr v1, v2
+
+    iput v1, v12, Lq0/a/a/s;->i:I
+
+    move/from16 v1, p1
+
+    move v5, v4
+
+    goto :goto_16
+
+    :cond_29
+    invoke-virtual {v14, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v5, v5, 0x2
+
+    :goto_1b
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_2a
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    iget-object v3, v12, Lq0/a/a/s;->l:Lq0/a/a/c;
+
+    iget-object v4, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    const/4 v9, 0x7
+
+    invoke-virtual {v4, v9, v1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v1, v12, Lq0/a/a/s;->k:I
+
+    const/4 v3, 0x1
+
+    add-int/2addr v1, v3
+
+    iput v1, v12, Lq0/a/a/s;->k:I
+
+    add-int/lit8 v5, v5, 0x2
+
+    move v1, v2
+
+    goto :goto_1b
+
+    :cond_2a
+    invoke-virtual {v14, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v5, v5, 0x2
+
+    :goto_1c
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_2e
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v3, v5, 0x2
+
+    invoke-virtual {v14, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v5, v5, 0x4
+
+    new-array v4, v3, [Ljava/lang/String;
+
+    const/4 v9, 0x0
+
+    :goto_1d
+    if-ge v9, v3, :cond_2b
+
+    invoke-virtual {v14, v5, v0}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v15
+
+    aput-object v15, v4, v9
+
+    add-int/lit8 v5, v5, 0x2
+
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_1d
+
+    :cond_2b
+    iget-object v9, v12, Lq0/a/a/s;->n:Lq0/a/a/c;
+
+    iget-object v15, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    move-object/from16 v19, v0
+
+    const/4 v0, 0x7
+
+    invoke-virtual {v15, v0, v1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v0, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v9, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v0, v12, Lq0/a/a/s;->n:Lq0/a/a/c;
+
+    invoke-virtual {v0, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 v0, 0x0
+
+    :goto_1e
+    if-ge v0, v3, :cond_2c
+
+    aget-object v1, v4, v0
+
+    iget-object v9, v12, Lq0/a/a/s;->n:Lq0/a/a/c;
+
+    iget-object v15, v12, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v15, v1}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v9, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1e
+
+    :cond_2c
+    iget v0, v12, Lq0/a/a/s;->m:I
+
+    const/4 v1, 0x1
+
+    add-int/2addr v0, v1
+
+    iput v0, v12, Lq0/a/a/s;->m:I
+
+    move v1, v2
+
+    move-object/from16 v0, v19
+
+    goto :goto_1c
+
+    :cond_2d
+    move-object/from16 v21, v4
+
+    :cond_2e
+    move-object/from16 v5, v22
+
+    if-eqz v5, :cond_2f
+
+    iget-object v0, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v1, 0x7
+
+    invoke-virtual {v0, v1, v5}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    iput v0, v6, Lq0/a/a/f;->x:I
+
+    :cond_2f
+    move/from16 v0, v23
+
+    if-eqz v0, :cond_32
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v0, v0, 0x2
+
+    invoke-virtual {v14, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    if-nez v0, :cond_30
+
+    const/4 v5, 0x0
+
+    goto :goto_1f
+
+    :cond_30
+    iget-object v2, v14, Lq0/a/a/d;->b:[I
+
+    aget v2, v2, v0
+
+    invoke-virtual {v14, v2, v7}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v5
+
+    :goto_1f
+    if-nez v0, :cond_31
+
+    const/4 v0, 0x0
+
+    goto :goto_20
+
+    :cond_31
+    iget-object v2, v14, Lq0/a/a/d;->b:[I
+
+    aget v0, v2, v0
+
+    add-int/lit8 v0, v0, 0x2
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_20
+    iget-object v2, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v3, 0x7
+
+    invoke-virtual {v2, v3, v1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    iput v1, v6, Lq0/a/a/f;->n:I
+
+    if-eqz v5, :cond_32
+
+    if-eqz v0, :cond_32
+
+    iget-object v1, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v1, v5, v0}, Lq0/a/a/v;->k(Ljava/lang/String;Ljava/lang/String;)I
+
+    move-result v0
+
+    iput v0, v6, Lq0/a/a/f;->o:I
+
+    :cond_32
+    move/from16 v0, v24
+
+    if-eqz v0, :cond_33
+
+    invoke-virtual {v14, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v24, v0, 0x2
+
+    move/from16 v0, v24
+
+    :goto_21
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_33
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v0, v0, 0x2
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v6, v1, v3}, Lq0/a/a/e;->b(Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v1
+
+    invoke-virtual {v14, v1, v0, v3, v7}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v0
+
+    move v1, v2
+
+    goto :goto_21
+
+    :cond_33
+    move/from16 v0, v25
+
+    if-eqz v0, :cond_34
+
+    invoke-virtual {v14, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v25, v0, 0x2
+
+    move/from16 v0, v25
+
+    :goto_22
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_34
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v0, v0, 0x2
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v6, v1, v3}, Lq0/a/a/e;->b(Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v1
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v14, v1, v0, v3, v7}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v0
+
+    move v1, v2
+
+    goto :goto_22
+
+    :cond_34
+    move/from16 v0, v26
+
+    if-eqz v0, :cond_35
+
+    invoke-virtual {v14, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v26, v0, 0x2
+
+    move/from16 v0, v26
+
+    :goto_23
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_35
+
+    invoke-virtual {v14, v13, v0}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v0
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v0, v0, 0x2
+
+    iget v3, v13, Lq0/a/a/h;->h:I
+
+    iget-object v4, v13, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    const/4 v5, 0x1
+
+    invoke-virtual {v6, v3, v4, v1, v5}, Lq0/a/a/e;->d(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v1
+
+    invoke-virtual {v14, v1, v0, v5, v7}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v0
+
+    move v1, v2
+
+    goto :goto_23
+
+    :cond_35
+    move/from16 v0, v27
+
+    if-eqz v0, :cond_36
+
+    invoke-virtual {v14, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v1
+
+    add-int/lit8 v27, v0, 0x2
+
+    move/from16 v0, v27
+
+    :goto_24
+    add-int/lit8 v2, v1, -0x1
+
+    if-lez v1, :cond_36
+
+    invoke-virtual {v14, v13, v0}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v0
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v1
+
+    add-int/lit8 v0, v0, 0x2
+
+    iget v3, v13, Lq0/a/a/h;->h:I
+
+    iget-object v4, v13, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v6, v3, v4, v1, v5}, Lq0/a/a/e;->d(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v1
+
+    const/4 v3, 0x1
+
+    invoke-virtual {v14, v1, v0, v3, v7}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v0
+
+    move v1, v2
+
+    goto :goto_24
+
+    :cond_36
+    const/4 v5, 0x0
+
+    move-object/from16 v12, v36
+
+    :goto_25
+    if-eqz v12, :cond_37
+
+    iget-object v0, v12, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    const/4 v1, 0x0
+
+    iput-object v1, v12, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iget-object v2, v6, Lq0/a/a/f;->A:Lq0/a/a/b;
+
+    iput-object v2, v12, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iput-object v12, v6, Lq0/a/a/f;->A:Lq0/a/a/b;
+
+    move-object v12, v0
+
+    goto :goto_25
+
+    :cond_37
+    move/from16 v0, v28
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_39
+
+    invoke-virtual {v14, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v28, v0, 0x2
+
+    move/from16 v0, v28
+
+    :goto_26
+    add-int/lit8 v3, v2, -0x1
+
+    if-lez v2, :cond_39
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    iget-object v4, v6, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    if-nez v4, :cond_38
+
+    new-instance v4, Lq0/a/a/c;
+
+    invoke-direct {v4}, Lq0/a/a/c;-><init>()V
+
+    iput-object v4, v6, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    :cond_38
+    iget v4, v6, Lq0/a/a/f;->y:I
+
+    const/4 v9, 0x1
+
+    add-int/2addr v4, v9
+
+    iput v4, v6, Lq0/a/a/f;->y:I
+
+    iget-object v4, v6, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    iget-object v9, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v12, 0x7
+
+    invoke-virtual {v9, v12, v2}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v2
+
+    iget v2, v2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v4, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v0, v0, 0x2
+
+    move v2, v3
+
+    goto :goto_26
+
+    :cond_39
+    move/from16 v0, v29
+
+    if-eqz v0, :cond_3e
+
+    invoke-virtual {v14, v0}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v29, v0, 0x2
+
+    move/from16 v0, v29
+
+    :goto_27
+    add-int/lit8 v3, v2, -0x1
+
+    if-lez v2, :cond_3e
+
+    invoke-virtual {v14, v0, v7}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v4, v0, 0x2
+
+    invoke-virtual {v14, v4, v7}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v4
+
+    add-int/lit8 v9, v0, 0x4
+
+    invoke-virtual {v14, v9, v7}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v9
+
+    add-int/lit8 v12, v0, 0x6
+
+    invoke-virtual {v14, v12}, Lq0/a/a/d;->u(I)I
+
+    move-result v12
+
+    iget-object v15, v6, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    if-nez v15, :cond_3a
+
+    new-instance v15, Lq0/a/a/c;
+
+    invoke-direct {v15}, Lq0/a/a/c;-><init>()V
+
+    iput-object v15, v6, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    :cond_3a
+    iget-object v15, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v1, 0x7
+
+    invoke-virtual {v15, v1, v2}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v2
+
+    iget v1, v2, Lq0/a/a/u;->g:I
+
+    if-nez v1, :cond_3d
+
+    iget v1, v6, Lq0/a/a/f;->l:I
+
+    const/4 v15, 0x1
+
+    add-int/2addr v1, v15
+
+    iput v1, v6, Lq0/a/a/f;->l:I
+
+    iget-object v1, v6, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    iget v5, v2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v1, v5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v6, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    if-nez v4, :cond_3b
+
+    const/4 v4, 0x0
+
+    const/4 v15, 0x7
+
+    goto :goto_28
+
+    :cond_3b
+    iget-object v5, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v15, 0x7
+
+    invoke-virtual {v5, v15, v4}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v4
+
+    iget v4, v4, Lq0/a/a/u;->a:I
+
+    :goto_28
+    invoke-virtual {v1, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v6, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    if-nez v9, :cond_3c
+
+    const/4 v4, 0x0
+
+    goto :goto_29
+
+    :cond_3c
+    iget-object v4, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v9}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v4
+
+    :goto_29
+    invoke-virtual {v1, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v6, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    invoke-virtual {v1, v12}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v1, v6, Lq0/a/a/f;->l:I
+
+    iput v1, v2, Lq0/a/a/u;->g:I
+
+    goto :goto_2a
+
+    :cond_3d
+    const/4 v15, 0x7
+
+    :goto_2a
+    add-int/lit8 v0, v0, 0x8
+
+    move v2, v3
+
+    const/4 v1, 0x0
+
+    const/4 v5, 0x0
+
+    goto :goto_27
+
+    :cond_3e
+    invoke-virtual {v14, v8}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 v1, v8, 0x2
+
+    :goto_2b
+    add-int/lit8 v2, v0, -0x1
+
+    if-lez v0, :cond_4f
+
+    iget-object v0, v13, Lq0/a/a/h;->c:[C
+
+    invoke-virtual {v14, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v4, v1, 0x2
+
+    invoke-virtual {v14, v4, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v25
+
+    add-int/lit8 v4, v1, 0x4
+
+    invoke-virtual {v14, v4, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v26
+
+    add-int/lit8 v1, v1, 0x6
+
+    invoke-virtual {v14, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    add-int/lit8 v1, v1, 0x2
+
+    move v9, v3
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v12, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v27, 0x0
+
+    const/16 v28, 0x0
+
+    :goto_2c
+    add-int/lit8 v16, v4, -0x1
+
+    if-lez v4, :cond_48
+
+    invoke-virtual {v14, v1, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v4
+
+    add-int/lit8 v8, v1, 0x2
+
+    invoke-virtual {v14, v8}, Lq0/a/a/d;->l(I)I
+
+    move-result v19
+
+    add-int/lit8 v1, v1, 0x6
+
+    const-string v8, "ConstantValue"
+
+    invoke-virtual {v8, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_40
+
+    invoke-virtual {v14, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    if-nez v4, :cond_3f
+
+    move-object/from16 v8, v38
+
+    const/16 v28, 0x0
+
+    goto :goto_2e
+
+    :cond_3f
+    invoke-virtual {v14, v4, v0}, Lq0/a/a/d;->i(I[C)Ljava/lang/Object;
+
+    move-result-object v4
+
+    move-object/from16 v28, v4
+
+    move-object/from16 v8, v38
+
+    goto :goto_2e
+
+    :cond_40
+    move-object/from16 v8, v38
+
+    invoke-virtual {v8, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v20
+
+    if-eqz v20, :cond_41
+
+    invoke-virtual {v14, v1, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v27
+
+    goto :goto_2e
+
+    :cond_41
+    invoke-virtual {v10, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v20
+
+    if-eqz v20, :cond_42
+
+    or-int v4, v9, v30
+
+    :goto_2d
+    move v9, v4
+
+    goto :goto_2e
+
+    :cond_42
+    invoke-virtual {v11, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v20
+
+    if-eqz v20, :cond_43
+
+    or-int/lit16 v4, v9, 0x1000
+
+    goto :goto_2d
+
+    :goto_2e
+    move/from16 v20, v2
+
+    move/from16 p1, v15
+
+    move-object/from16 v15, v21
+
+    move-object/from16 v2, p2
+
+    goto :goto_30
+
+    :cond_43
+    move/from16 p1, v15
+
+    move-object/from16 v15, v21
+
+    invoke-virtual {v15, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v20
+
+    if-eqz v20, :cond_44
+
+    move-object/from16 v44, p2
+
+    move v3, v1
+
+    move/from16 v20, v2
+
+    move-object/from16 v39, v8
+
+    move-object/from16 v21, v10
+
+    move-object/from16 v43, v13
+
+    move-object v4, v14
+
+    move-object/from16 v45, v15
+
+    move-object/from16 v40, v17
+
+    move-object/from16 v41, v18
+
+    const/4 v2, 0x1
+
+    move/from16 v15, p1
+
+    move-object/from16 v18, v11
+
+    goto/16 :goto_32
+
+    :cond_44
+    move/from16 v20, v2
+
+    move-object/from16 v2, v17
+
+    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v17
+
+    if-eqz v17, :cond_45
+
+    move v4, v1
+
+    move-object/from16 v17, v2
+
+    move-object/from16 v2, v18
+
+    goto :goto_2f
+
+    :cond_45
+    move-object/from16 v17, v2
+
+    move-object/from16 v2, v18
+
+    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v18
+
+    if-eqz v18, :cond_46
+
+    move/from16 v4, p1
+
+    move v7, v1
+
+    :goto_2f
+    move-object/from16 v18, v2
+
+    move-object/from16 v2, p2
+
+    goto :goto_31
+
+    :cond_46
+    move-object/from16 v18, v2
+
+    move-object/from16 v2, p2
+
+    invoke-virtual {v2, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v21
+
+    if-eqz v21, :cond_47
+
+    move v12, v1
+
+    :goto_30
+    move/from16 v4, p1
+
+    :goto_31
+    move-object/from16 v44, v2
+
+    move-object/from16 v39, v8
+
+    move-object/from16 v21, v10
+
+    move-object/from16 v43, v13
+
+    move-object/from16 v45, v15
+
+    move-object/from16 v40, v17
+
+    move-object/from16 v41, v18
+
+    const/4 v2, 0x1
+
+    move v15, v4
+
+    move-object/from16 v18, v11
+
+    move-object v4, v14
+
+    goto :goto_32
+
+    :cond_47
+    move-object/from16 p2, v2
+
+    iget-object v2, v13, Lq0/a/a/h;->a:[Lq0/a/a/b;
+
+    const/16 v21, -0x1
+
+    const/16 v22, 0x0
+
+    move-object/from16 v39, v8
+
+    move-object v8, v14
+
+    move-object/from16 v40, v17
+
+    move/from16 v17, v9
+
+    move-object v9, v2
+
+    move-object v2, v10
+
+    move-object v10, v4
+
+    move-object v4, v11
+
+    move v11, v1
+
+    move/from16 v42, v12
+
+    move-object/from16 v41, v18
+
+    move/from16 v12, v19
+
+    move-object/from16 v43, v13
+
+    move-object v13, v0
+
+    move-object/from16 v44, p2
+
+    move-object/from16 v18, v4
+
+    move-object v4, v14
+
+    move/from16 v14, v21
+
+    move-object/from16 v21, v2
+
+    move-object/from16 v45, v15
+
+    const/4 v2, 0x1
+
+    move-object/from16 v15, v22
+
+    invoke-virtual/range {v8 .. v15}, Lq0/a/a/d;->e([Lq0/a/a/b;Ljava/lang/String;II[CI[Lq0/a/a/p;)Lq0/a/a/b;
+
+    move-result-object v8
+
+    iput-object v5, v8, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    move/from16 v15, p1
+
+    move-object v5, v8
+
+    move/from16 v9, v17
+
+    move/from16 v12, v42
+
+    :goto_32
+    add-int v1, v1, v19
+
+    move-object v14, v4
+
+    move/from16 v4, v16
+
+    move-object/from16 v11, v18
+
+    move/from16 v2, v20
+
+    move-object/from16 v10, v21
+
+    move-object/from16 v38, v39
+
+    move-object/from16 v17, v40
+
+    move-object/from16 v18, v41
+
+    move-object/from16 v13, v43
+
+    move-object/from16 p2, v44
+
+    move-object/from16 v21, v45
+
+    goto/16 :goto_2c
+
+    :cond_48
+    move-object/from16 v44, p2
+
+    move/from16 v20, v2
+
+    move/from16 v42, v12
+
+    move-object/from16 v43, v13
+
+    move-object v4, v14
+
+    move/from16 p1, v15
+
+    move-object/from16 v40, v17
+
+    move-object/from16 v41, v18
+
+    move-object/from16 v45, v21
+
+    move-object/from16 v39, v38
+
+    const/4 v2, 0x1
+
+    move/from16 v17, v9
+
+    move-object/from16 v21, v10
+
+    move-object/from16 v18, v11
+
+    new-instance v8, Lq0/a/a/l;
+
+    iget-object v9, v6, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v22, v8
+
+    move-object/from16 v23, v9
+
+    move/from16 v24, v17
+
+    invoke-direct/range {v22 .. v28}, Lq0/a/a/l;-><init>(Lq0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
+
+    iget-object v9, v6, Lq0/a/a/f;->h:Lq0/a/a/l;
+
+    if-nez v9, :cond_49
+
+    iput-object v8, v6, Lq0/a/a/f;->h:Lq0/a/a/l;
+
+    goto :goto_33
+
+    :cond_49
+    iget-object v9, v6, Lq0/a/a/f;->i:Lq0/a/a/l;
+
+    iput-object v8, v9, Lq0/a/a/k;->a:Lq0/a/a/k;
+
+    :goto_33
+    iput-object v8, v6, Lq0/a/a/f;->i:Lq0/a/a/l;
+
+    if-eqz v3, :cond_4a
+
+    invoke-virtual {v4, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v9
+
+    add-int/lit8 v3, v3, 0x2
+
+    :goto_34
+    add-int/lit8 v10, v9, -0x1
+
+    if-lez v9, :cond_4a
+
+    invoke-virtual {v4, v3, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v9
+
+    add-int/lit8 v3, v3, 0x2
+
+    invoke-virtual {v8, v9, v2}, Lq0/a/a/k;->a(Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v9
+
+    invoke-virtual {v4, v9, v3, v2, v0}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v3
+
+    move v9, v10
+
+    goto :goto_34
+
+    :cond_4a
+    if-eqz v7, :cond_4b
+
+    invoke-virtual {v4, v7}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v7, v7, 0x2
+
+    :goto_35
+    add-int/lit8 v9, v3, -0x1
+
+    if-lez v3, :cond_4b
+
+    invoke-virtual {v4, v7, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    add-int/lit8 v7, v7, 0x2
+
+    const/4 v15, 0x0
+
+    invoke-virtual {v8, v3, v15}, Lq0/a/a/k;->a(Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v3
+
+    invoke-virtual {v4, v3, v7, v2, v0}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v7
+
+    move v3, v9
+
+    goto :goto_35
+
+    :cond_4b
+    const/4 v15, 0x0
+
+    if-eqz p1, :cond_4c
+
+    move/from16 v3, p1
+
+    invoke-virtual {v4, v3}, Lq0/a/a/d;->u(I)I
+
+    move-result v7
+
+    add-int/lit8 v3, v3, 0x2
+
+    :goto_36
+    add-int/lit8 v9, v7, -0x1
+
+    if-lez v7, :cond_4c
+
+    move-object/from16 v7, v43
+
+    invoke-virtual {v4, v7, v3}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v3
+
+    invoke-virtual {v4, v3, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v10
+
+    add-int/lit8 v3, v3, 0x2
+
+    iget v11, v7, Lq0/a/a/h;->h:I
+
+    iget-object v12, v7, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    invoke-virtual {v8, v11, v12, v10, v2}, Lq0/a/a/k;->b(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v10
+
+    invoke-virtual {v4, v10, v3, v2, v0}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v3
+
+    move v7, v9
+
+    goto :goto_36
+
+    :cond_4c
+    move-object/from16 v7, v43
+
+    move/from16 v12, v42
+
+    if-eqz v12, :cond_4d
+
+    invoke-virtual {v4, v12}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    add-int/lit8 v12, v12, 0x2
+
+    :goto_37
+    add-int/lit8 v9, v3, -0x1
+
+    if-lez v3, :cond_4d
+
+    invoke-virtual {v4, v7, v12}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v3
+
+    invoke-virtual {v4, v3, v0}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v10
+
+    add-int/lit8 v3, v3, 0x2
+
+    iget v11, v7, Lq0/a/a/h;->h:I
+
+    iget-object v12, v7, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    invoke-virtual {v8, v11, v12, v10, v15}, Lq0/a/a/k;->b(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v10
+
+    invoke-virtual {v4, v10, v3, v2, v0}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v12
+
+    move v3, v9
+
+    goto :goto_37
+
+    :cond_4d
+    :goto_38
+    if-eqz v5, :cond_4e
+
+    iget-object v0, v5, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    const/4 v3, 0x0
+
+    iput-object v3, v5, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iget-object v9, v8, Lq0/a/a/l;->l:Lq0/a/a/b;
+
+    iput-object v9, v5, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iput-object v5, v8, Lq0/a/a/l;->l:Lq0/a/a/b;
+
+    move-object v5, v0
+
+    goto :goto_38
+
+    :cond_4e
+    move-object v14, v4
+
+    move-object v13, v7
+
+    move-object/from16 v11, v18
+
+    move/from16 v0, v20
+
+    move-object/from16 v10, v21
+
+    move-object/from16 v38, v39
+
+    move-object/from16 v17, v40
+
+    move-object/from16 v18, v41
+
+    move-object/from16 p2, v44
+
+    move-object/from16 v21, v45
+
+    goto/16 :goto_2b
+
+    :cond_4f
+    move-object/from16 v44, p2
+
+    move-object v7, v13
+
+    move-object v4, v14
+
+    move-object/from16 v40, v17
+
+    move-object/from16 v41, v18
+
+    move-object/from16 v45, v21
+
+    move-object/from16 v39, v38
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    const/4 v15, 0x0
+
+    move-object/from16 v21, v10
+
+    move-object/from16 v18, v11
+
+    invoke-virtual {v4, v1}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    add-int/lit8 v1, v1, 0x2
+
+    move v5, v1
+
+    :goto_39
+    add-int/lit8 v16, v0, -0x1
+
+    if-lez v0, :cond_77
+
+    iget-object v1, v7, Lq0/a/a/h;->c:[C
+
+    invoke-virtual {v4, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v0
+
+    iput v0, v7, Lq0/a/a/h;->d:I
+
+    add-int/lit8 v0, v5, 0x2
+
+    invoke-virtual {v4, v0, v1}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v0
+
+    iput-object v0, v7, Lq0/a/a/h;->e:Ljava/lang/String;
+
+    add-int/lit8 v0, v5, 0x4
+
+    invoke-virtual {v4, v0, v1}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v8
+
+    iput-object v8, v7, Lq0/a/a/h;->f:Ljava/lang/String;
+
+    add-int/lit8 v14, v5, 0x6
+
+    invoke-virtual {v4, v14}, Lq0/a/a/d;->u(I)I
+
+    move-result v8
+
+    add-int/lit8 v9, v14, 0x2
+
+    move-object v13, v3
+
+    move-object/from16 v17, v13
+
+    move/from16 v19, v8
+
+    const/4 v8, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/16 v46, 0x0
+
+    const/16 v47, 0x0
+
+    const/16 v48, 0x0
+
+    const/16 v49, 0x0
+
+    const/16 v50, 0x0
+
+    const/16 v51, 0x0
+
+    const/16 v52, 0x0
+
+    const/16 v53, 0x0
+
+    :goto_3a
+    add-int/lit8 v20, v19, -0x1
+
+    if-lez v19, :cond_5f
+
+    invoke-virtual {v4, v9, v1}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    add-int/lit8 v15, v9, 0x2
+
+    invoke-virtual {v4, v15}, Lq0/a/a/d;->l(I)I
+
+    move-result v19
+
+    add-int/lit8 v15, v9, 0x6
+
+    const-string v9, "Code"
+
+    invoke-virtual {v9, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_51
+
+    iget v3, v7, Lq0/a/a/h;->b:I
+
+    and-int/2addr v3, v2
+
+    if-nez v3, :cond_50
+
+    move/from16 p1, v14
+
+    move/from16 v53, v15
+
+    :goto_3b
+    move-object/from16 v9, v21
+
+    move-object/from16 v2, v39
+
+    :goto_3c
+    move-object/from16 v14, v45
+
+    goto :goto_40
+
+    :cond_50
+    move-object/from16 v2, v39
+
+    goto :goto_3e
+
+    :cond_51
+    const-string v9, "Exceptions"
+
+    invoke-virtual {v9, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_53
+
+    invoke-virtual {v4, v15}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    new-array v9, v3, [Ljava/lang/String;
+
+    add-int/lit8 v11, v15, 0x2
+
+    move v2, v11
+
+    const/4 v11, 0x0
+
+    :goto_3d
+    if-ge v11, v3, :cond_52
+
+    invoke-virtual {v4, v2, v1}, Lq0/a/a/d;->g(I[C)Ljava/lang/String;
+
+    move-result-object v17
+
+    aput-object v17, v9, v11
+
+    add-int/lit8 v2, v2, 0x2
+
+    add-int/lit8 v11, v11, 0x1
+
+    goto :goto_3d
+
+    :cond_52
+    move-object/from16 v17, v9
+
+    move/from16 p1, v14
+
+    move v11, v15
+
+    goto :goto_3b
+
+    :cond_53
+    move-object/from16 v2, v39
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_54
+
+    invoke-virtual {v4, v15}, Lq0/a/a/d;->u(I)I
+
+    move-result v47
+
+    :goto_3e
+    move-object/from16 v9, v21
+
+    goto :goto_3f
+
+    :cond_54
+    move-object/from16 v9, v21
+
+    invoke-virtual {v9, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v21
+
+    if-eqz v21, :cond_55
+
+    iget v3, v7, Lq0/a/a/h;->d:I
+
+    or-int v3, v3, v30
+
+    iput v3, v7, Lq0/a/a/h;->d:I
+
+    :goto_3f
+    move/from16 p1, v14
+
+    goto :goto_3c
+
+    :cond_55
+    move/from16 p1, v14
+
+    move-object/from16 v14, v45
+
+    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v21
+
+    if-eqz v21, :cond_56
+
+    move/from16 v46, v15
+
+    :goto_40
+    move/from16 p2, v0
+
+    move-object/from16 v21, v14
+
+    :goto_41
+    move-object/from16 v14, v44
+
+    goto/16 :goto_44
+
+    :cond_56
+    move-object/from16 v21, v14
+
+    move-object/from16 v14, v40
+
+    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v22
+
+    if-eqz v22, :cond_57
+
+    move/from16 p2, v0
+
+    move/from16 v49, v15
+
+    goto :goto_42
+
+    :cond_57
+    move/from16 p2, v0
+
+    const-string v0, "AnnotationDefault"
+
+    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_58
+
+    move v10, v15
+
+    :goto_42
+    move-object/from16 v40, v14
+
+    move-object/from16 v0, v18
+
+    move-object/from16 v14, v41
+
+    goto :goto_43
+
+    :cond_58
+    move-object/from16 v0, v18
+
+    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v18
+
+    if-eqz v18, :cond_59
+
+    iget v3, v7, Lq0/a/a/h;->d:I
+
+    or-int/lit16 v3, v3, 0x1000
+
+    iput v3, v7, Lq0/a/a/h;->d:I
+
+    move/from16 v6, p1
+
+    move-object/from16 v18, v0
+
+    move-object/from16 v24, v9
+
+    move-object/from16 v26, v14
+
+    move/from16 v22, v15
+
+    move-object/from16 v27, v21
+
+    move-object/from16 v25, v41
+
+    move-object/from16 v21, v44
+
+    const/4 v12, 0x1
+
+    goto/16 :goto_45
+
+    :cond_59
+    move-object/from16 v40, v14
+
+    move-object/from16 v14, v41
+
+    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v18
+
+    if-eqz v18, :cond_5a
+
+    move/from16 v48, v15
+
+    :goto_43
+    move-object/from16 v18, v0
+
+    move-object/from16 v41, v14
+
+    goto :goto_41
+
+    :cond_5a
+    move-object/from16 v41, v14
+
+    move-object/from16 v14, v44
+
+    invoke-virtual {v14, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v18
+
+    if-eqz v18, :cond_5b
+
+    move-object/from16 v18, v0
+
+    move/from16 v50, v15
+
+    goto :goto_44
+
+    :cond_5b
+    move-object/from16 v18, v0
+
+    const-string v0, "RuntimeVisibleParameterAnnotations"
+
+    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5c
+
+    move/from16 v51, v15
+
+    goto :goto_44
+
+    :cond_5c
+    const-string v0, "RuntimeInvisibleParameterAnnotations"
+
+    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5d
+
+    move/from16 v52, v15
+
+    goto :goto_44
+
+    :cond_5d
+    const-string v0, "MethodParameters"
+
+    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5e
+
+    move v8, v15
+
+    :goto_44
+    move/from16 v6, p1
+
+    move-object/from16 v24, v9
+
+    move/from16 v22, v15
+
+    move-object/from16 v27, v21
+
+    move-object/from16 v26, v40
+
+    move-object/from16 v25, v41
+
+    move-object/from16 v21, v14
+
+    goto :goto_45
+
+    :cond_5e
+    iget-object v0, v7, Lq0/a/a/h;->a:[Lq0/a/a/b;
+
+    const/16 v22, -0x1
+
+    const/16 v23, 0x0
+
+    move/from16 v54, v8
+
+    move-object v8, v4
+
+    move-object/from16 v24, v9
+
+    move-object v9, v0
+
+    move v0, v10
+
+    move-object v10, v3
+
+    move v3, v11
+
+    move v11, v15
+
+    move/from16 v55, v12
+
+    move/from16 v12, v19
+
+    move-object/from16 v56, v13
+
+    move-object v13, v1
+
+    move/from16 v6, p1
+
+    move-object/from16 v27, v21
+
+    move-object/from16 v26, v40
+
+    move-object/from16 v25, v41
+
+    move-object/from16 v21, v14
+
+    move/from16 v14, v22
+
+    move/from16 v22, v15
+
+    move-object/from16 v15, v23
+
+    invoke-virtual/range {v8 .. v15}, Lq0/a/a/d;->e([Lq0/a/a/b;Ljava/lang/String;II[CI[Lq0/a/a/p;)Lq0/a/a/b;
+
+    move-result-object v8
+
+    move-object/from16 v10, v56
+
+    iput-object v10, v8, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    move v10, v0
+
+    move v11, v3
+
+    move-object v13, v8
+
+    move/from16 v8, v54
+
+    move/from16 v12, v55
+
+    :goto_45
+    add-int v9, v22, v19
+
+    move/from16 v0, p2
+
+    move-object/from16 v39, v2
+
+    move v14, v6
+
+    move/from16 v19, v20
+
+    move-object/from16 v44, v21
+
+    move-object/from16 v21, v24
+
+    move-object/from16 v41, v25
+
+    move-object/from16 v40, v26
+
+    move-object/from16 v45, v27
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    const/4 v15, 0x0
+
+    move-object/from16 v6, p0
+
+    goto/16 :goto_3a
+
+    :cond_5f
+    move/from16 p2, v0
+
+    move/from16 v54, v8
+
+    move v0, v10
+
+    move v3, v11
+
+    move/from16 v55, v12
+
+    move-object v10, v13
+
+    move v6, v14
+
+    move-object/from16 v24, v21
+
+    move-object/from16 v2, v39
+
+    move-object/from16 v26, v40
+
+    move-object/from16 v25, v41
+
+    move-object/from16 v21, v44
+
+    move-object/from16 v27, v45
+
+    iget v8, v7, Lq0/a/a/h;->d:I
+
+    iget-object v11, v7, Lq0/a/a/h;->e:Ljava/lang/String;
+
+    iget-object v12, v7, Lq0/a/a/h;->f:Ljava/lang/String;
+
+    move/from16 v15, v47
+
+    if-nez v15, :cond_60
+
+    move v14, v0
+
+    move-object/from16 v56, v10
+
+    const/4 v13, 0x0
+
+    goto :goto_46
+
+    :cond_60
+    invoke-virtual {v4, v15, v1}, Lq0/a/a/d;->w(I[C)Ljava/lang/String;
+
+    move-result-object v13
+
+    move v14, v0
+
+    move-object/from16 v56, v10
+
+    :goto_46
+    move/from16 v10, p2
+
+    move-object/from16 v0, p0
+
+    move/from16 p1, v14
+
+    move-object v14, v1
+
+    move v1, v8
+
+    move-object/from16 v19, v2
+
+    const/4 v8, 0x1
+
+    move-object v2, v11
+
+    move v11, v3
+
+    move-object v3, v12
+
+    move-object v12, v4
+
+    move-object/from16 v20, v27
+
+    move-object v4, v13
+
+    move v13, v5
+
+    move-object/from16 v5, v17
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/e;->c(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lq0/a/a/q;
+
+    move-result-object v0
+
+    move-object v1, v0
+
+    check-cast v1, Lq0/a/a/r;
+
+    sub-int v2, v9, v13
+
+    iget v3, v7, Lq0/a/a/h;->d:I
+
+    and-int v3, v3, v30
+
+    if-eqz v3, :cond_61
+
+    const/4 v3, 0x1
+
+    goto :goto_47
+
+    :cond_61
+    const/4 v3, 0x0
+
+    :goto_47
+    invoke-virtual {v12, v10}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    iget-object v5, v1, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v5, v5, Lq0/a/a/v;->b:Lq0/a/a/d;
+
+    if-ne v12, v5, :cond_69
+
+    iget v5, v1, Lq0/a/a/r;->g:I
+
+    if-ne v4, v5, :cond_69
+
+    iget v4, v1, Lq0/a/a/r;->A:I
+
+    if-ne v15, v4, :cond_69
+
+    iget v4, v1, Lq0/a/a/r;->d:I
+
+    and-int v4, v4, v30
+
+    if-eqz v4, :cond_62
+
+    const/4 v4, 0x1
+
+    goto :goto_48
+
+    :cond_62
+    const/4 v4, 0x0
+
+    :goto_48
+    if-eq v3, v4, :cond_63
+
+    goto :goto_4b
+
+    :cond_63
+    iget-object v3, v1, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v3, v3, Lq0/a/a/v;->c:I
+
+    const/16 v4, 0x31
+
+    if-ge v3, v4, :cond_64
+
+    iget v3, v1, Lq0/a/a/r;->d:I
+
+    and-int/lit16 v3, v3, 0x1000
+
+    if-eqz v3, :cond_64
+
+    move/from16 v15, v55
+
+    const/4 v3, 0x1
+
+    goto :goto_49
+
+    :cond_64
+    move/from16 v15, v55
+
+    const/4 v3, 0x0
+
+    :goto_49
+    if-eq v15, v3, :cond_65
+
+    goto :goto_4b
+
+    :cond_65
+    if-nez v11, :cond_66
+
+    iget v3, v1, Lq0/a/a/r;->y:I
+
+    if-eqz v3, :cond_68
+
+    goto :goto_4b
+
+    :cond_66
+    invoke-virtual {v12, v11}, Lq0/a/a/d;->u(I)I
+
+    move-result v3
+
+    iget v4, v1, Lq0/a/a/r;->y:I
+
+    if-ne v3, v4, :cond_68
+
+    add-int/lit8 v11, v11, 0x2
+
+    const/4 v3, 0x0
+
+    :goto_4a
+    iget v4, v1, Lq0/a/a/r;->y:I
+
+    if-ge v3, v4, :cond_68
+
+    invoke-virtual {v12, v11}, Lq0/a/a/d;->u(I)I
+
+    move-result v4
+
+    iget-object v5, v1, Lq0/a/a/r;->z:[I
+
+    aget v5, v5, v3
+
+    if-eq v4, v5, :cond_67
+
+    goto :goto_4b
+
+    :cond_67
+    add-int/lit8 v11, v11, 0x2
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_4a
+
+    :cond_68
+    iput v6, v1, Lq0/a/a/r;->a0:I
+
+    add-int/lit8 v2, v2, -0x6
+
+    iput v2, v1, Lq0/a/a/r;->b0:I
+
+    const/4 v6, 0x1
+
+    goto :goto_4c
+
+    :cond_69
+    :goto_4b
+    const/4 v6, 0x0
+
+    :goto_4c
+    if-eqz v6, :cond_6a
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    goto/16 :goto_55
+
+    :cond_6a
+    move/from16 v15, v54
+
+    if-eqz v15, :cond_6d
+
+    invoke-virtual {v12, v15}, Lq0/a/a/d;->f(I)I
+
+    move-result v2
+
+    add-int/lit8 v3, v15, 0x1
+
+    :goto_4d
+    add-int/lit8 v4, v2, -0x1
+
+    if-lez v2, :cond_6d
+
+    invoke-virtual {v12, v3, v14}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v5, v3, 0x2
+
+    invoke-virtual {v12, v5}, Lq0/a/a/d;->u(I)I
+
+    move-result v5
+
+    iget-object v6, v1, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    if-nez v6, :cond_6b
+
+    new-instance v6, Lq0/a/a/c;
+
+    invoke-direct {v6}, Lq0/a/a/c;-><init>()V
+
+    iput-object v6, v1, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    :cond_6b
+    iget v6, v1, Lq0/a/a/r;->K:I
+
+    add-int/2addr v6, v8
+
+    iput v6, v1, Lq0/a/a/r;->K:I
+
+    iget-object v6, v1, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    if-nez v2, :cond_6c
+
+    const/4 v2, 0x0
+
+    goto :goto_4e
+
+    :cond_6c
+    iget-object v10, v1, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v10, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    :goto_4e
+    invoke-virtual {v6, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v6, v5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v3, v3, 0x4
+
+    move v2, v4
+
+    goto :goto_4d
+
+    :cond_6d
+    if-eqz p1, :cond_6e
+
+    new-instance v2, Lq0/a/a/c;
+
+    invoke-direct {v2}, Lq0/a/a/c;-><init>()V
+
+    iput-object v2, v1, Lq0/a/a/r;->J:Lq0/a/a/c;
+
+    new-instance v3, Lq0/a/a/a;
+
+    iget-object v4, v1, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    invoke-direct {v3, v4, v6, v2, v5}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    move/from16 v15, p1
+
+    invoke-virtual {v12, v3, v15, v5, v14}, Lq0/a/a/d;->j(Lq0/a/a/a;ILjava/lang/String;[C)I
+
+    invoke-virtual {v3}, Lq0/a/a/a;->g()V
+
+    goto :goto_4f
+
+    :cond_6e
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    :goto_4f
+    move/from16 v15, v46
+
+    if-eqz v15, :cond_6f
+
+    invoke-virtual {v12, v15}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v46, v15, 0x2
+
+    move/from16 v3, v46
+
+    :goto_50
+    add-int/lit8 v4, v2, -0x1
+
+    if-lez v2, :cond_6f
+
+    invoke-virtual {v12, v3, v14}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v3, v3, 0x2
+
+    invoke-virtual {v0, v2, v8}, Lq0/a/a/q;->a(Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v2
+
+    invoke-virtual {v12, v2, v3, v8, v14}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v3
+
+    move v2, v4
+
+    goto :goto_50
+
+    :cond_6f
+    move/from16 v15, v48
+
+    if-eqz v15, :cond_70
+
+    invoke-virtual {v12, v15}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v48, v15, 0x2
+
+    move/from16 v3, v48
+
+    :goto_51
+    add-int/lit8 v4, v2, -0x1
+
+    if-lez v2, :cond_70
+
+    invoke-virtual {v12, v3, v14}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v2
+
+    add-int/lit8 v3, v3, 0x2
+
+    invoke-virtual {v0, v2, v6}, Lq0/a/a/q;->a(Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v2
+
+    invoke-virtual {v12, v2, v3, v8, v14}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v3
+
+    move v2, v4
+
+    goto :goto_51
+
+    :cond_70
+    move/from16 v15, v49
+
+    if-eqz v15, :cond_71
+
+    invoke-virtual {v12, v15}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v49, v15, 0x2
+
+    move/from16 v3, v49
+
+    :goto_52
+    add-int/lit8 v4, v2, -0x1
+
+    if-lez v2, :cond_71
+
+    invoke-virtual {v12, v7, v3}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v2
+
+    invoke-virtual {v12, v2, v14}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    add-int/lit8 v2, v2, 0x2
+
+    iget v10, v7, Lq0/a/a/h;->h:I
+
+    iget-object v11, v7, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    invoke-virtual {v0, v10, v11, v3, v8}, Lq0/a/a/q;->r(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v3
+
+    invoke-virtual {v12, v3, v2, v8, v14}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v3
+
+    move v2, v4
+
+    goto :goto_52
+
+    :cond_71
+    move/from16 v15, v50
+
+    if-eqz v15, :cond_72
+
+    invoke-virtual {v12, v15}, Lq0/a/a/d;->u(I)I
+
+    move-result v2
+
+    add-int/lit8 v50, v15, 0x2
+
+    move/from16 v3, v50
+
+    :goto_53
+    add-int/lit8 v4, v2, -0x1
+
+    if-lez v2, :cond_72
+
+    invoke-virtual {v12, v7, v3}, Lq0/a/a/d;->r(Lq0/a/a/h;I)I
+
+    move-result v2
+
+    invoke-virtual {v12, v2, v14}, Lq0/a/a/d;->t(I[C)Ljava/lang/String;
+
+    move-result-object v3
+
+    add-int/lit8 v2, v2, 0x2
+
+    iget v10, v7, Lq0/a/a/h;->h:I
+
+    iget-object v11, v7, Lq0/a/a/h;->i:Lq0/a/a/x;
+
+    invoke-virtual {v0, v10, v11, v3, v6}, Lq0/a/a/q;->r(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+
+    move-result-object v3
+
+    invoke-virtual {v12, v3, v2, v8, v14}, Lq0/a/a/d;->k(Lq0/a/a/a;IZ[C)I
+
+    move-result v3
+
+    move v2, v4
+
+    goto :goto_53
+
+    :cond_72
+    move/from16 v15, v51
+
+    if-eqz v15, :cond_73
+
+    invoke-virtual {v12, v0, v7, v15, v8}, Lq0/a/a/d;->p(Lq0/a/a/q;Lq0/a/a/h;IZ)V
+
+    :cond_73
+    move/from16 v15, v52
+
+    if-eqz v15, :cond_74
+
+    invoke-virtual {v12, v0, v7, v15, v6}, Lq0/a/a/d;->p(Lq0/a/a/q;Lq0/a/a/h;IZ)V
+
+    :cond_74
+    move-object/from16 v13, v56
+
+    :goto_54
+    if-eqz v13, :cond_75
+
+    iget-object v2, v13, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iput-object v5, v13, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iget-object v3, v1, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    iput-object v3, v13, Lq0/a/a/b;->c:Lq0/a/a/b;
+
+    iput-object v13, v1, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    move-object v13, v2
+
+    goto :goto_54
+
+    :cond_75
+    move/from16 v15, v53
+
+    if-eqz v15, :cond_76
+
+    invoke-virtual {v12, v0, v7, v15}, Lq0/a/a/d;->h(Lq0/a/a/q;Lq0/a/a/h;I)V
+
+    :cond_76
+    :goto_55
+    move-object/from16 v6, p0
+
+    move-object v3, v5
+
+    move v5, v9
+
+    move-object v4, v12
+
+    move/from16 v0, v16
+
+    move-object/from16 v39, v19
+
+    move-object/from16 v45, v20
+
+    move-object/from16 v44, v21
+
+    move-object/from16 v21, v24
+
+    move-object/from16 v41, v25
+
+    move-object/from16 v40, v26
+
+    const/4 v2, 0x1
+
+    const/4 v15, 0x0
+
+    goto/16 :goto_39
+
+    :cond_77
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/f;->f()[B
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public f()[B
+    .locals 28
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lorg/objectweb/asm/ClassTooLargeException;,
+            Lorg/objectweb/asm/MethodTooLargeException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p0
+
+    iget v1, v0, Lq0/a/a/f;->f:I
+
+    mul-int/lit8 v1, v1, 0x2
+
+    add-int/lit8 v1, v1, 0x18
+
+    iget-object v2, v0, Lq0/a/a/f;->h:Lq0/a/a/l;
+
+    const/4 v3, 0x0
+
+    :goto_0
+    const-string v4, "ConstantValue"
+
+    const-string v5, "RuntimeInvisibleTypeAnnotations"
+
+    const-string v6, "RuntimeVisibleTypeAnnotations"
+
+    const-string v7, "RuntimeInvisibleAnnotations"
+
+    const-string v8, "RuntimeVisibleAnnotations"
+
+    const-string v9, "Deprecated"
+
+    const-string v10, "Synthetic"
+
+    const-string v11, "Signature"
+
+    const/16 v12, 0x10
+
+    const/16 v13, 0x31
+
+    const/high16 v14, 0x20000
+
+    if-eqz v2, :cond_9
+
+    add-int/lit8 v3, v3, 0x1
+
+    iget v15, v2, Lq0/a/a/l;->g:I
+
+    if-eqz v15, :cond_0
+
+    iget-object v15, v2, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v15, v4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    goto :goto_1
+
+    :cond_0
+    const/16 v12, 0x8
+
+    :goto_1
+    iget v4, v2, Lq0/a/a/l;->c:I
+
+    and-int/lit16 v4, v4, 0x1000
+
+    if-eqz v4, :cond_1
+
+    iget-object v4, v2, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    iget v15, v4, Lq0/a/a/v;->c:I
+
+    if-ge v15, v13, :cond_1
+
+    invoke-virtual {v4, v10}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    add-int/lit8 v12, v12, 0x6
+
+    :cond_1
+    iget v4, v2, Lq0/a/a/l;->f:I
+
+    if-eqz v4, :cond_2
+
+    iget-object v4, v2, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v11}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    add-int/lit8 v12, v12, 0x8
+
+    :cond_2
+    iget v4, v2, Lq0/a/a/l;->c:I
+
+    and-int/2addr v4, v14
+
+    if-eqz v4, :cond_3
+
+    iget-object v4, v2, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v9}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    add-int/lit8 v12, v12, 0x6
+
+    :cond_3
+    iget-object v4, v2, Lq0/a/a/l;->h:Lq0/a/a/a;
+
+    if-eqz v4, :cond_4
+
+    invoke-virtual {v4, v8}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v12, v4
+
+    :cond_4
+    iget-object v4, v2, Lq0/a/a/l;->i:Lq0/a/a/a;
+
+    if-eqz v4, :cond_5
+
+    invoke-virtual {v4, v7}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v12, v4
+
+    :cond_5
+    iget-object v4, v2, Lq0/a/a/l;->j:Lq0/a/a/a;
+
+    if-eqz v4, :cond_6
+
+    invoke-virtual {v4, v6}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v12, v4
+
+    :cond_6
+    iget-object v4, v2, Lq0/a/a/l;->k:Lq0/a/a/a;
+
+    if-eqz v4, :cond_7
+
+    invoke-virtual {v4, v5}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v12, v4
+
+    :cond_7
+    iget-object v4, v2, Lq0/a/a/l;->l:Lq0/a/a/b;
+
+    if-eqz v4, :cond_8
+
+    iget-object v5, v2, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v5}, Lq0/a/a/b;->a(Lq0/a/a/v;)I
+
+    move-result v4
+
+    add-int/2addr v12, v4
+
+    :cond_8
+    add-int/2addr v1, v12
+
+    iget-object v2, v2, Lq0/a/a/k;->a:Lq0/a/a/k;
+
+    check-cast v2, Lq0/a/a/l;
+
+    goto/16 :goto_0
+
+    :cond_9
+    iget-object v2, v0, Lq0/a/a/f;->j:Lq0/a/a/r;
+
+    const/4 v13, 0x0
+
+    :goto_2
+    const v15, 0xffff
+
+    const/16 v16, 0x1
+
+    if-eqz v2, :cond_27
+
+    add-int/lit8 v13, v13, 0x1
+
+    iget v14, v2, Lq0/a/a/r;->a0:I
+
+    if-eqz v14, :cond_a
+
+    iget v12, v2, Lq0/a/a/r;->b0:I
+
+    add-int/lit8 v12, v12, 0x6
+
+    move/from16 v26, v3
+
+    move-object/from16 v25, v4
+
+    move/from16 v24, v13
+
+    goto/16 :goto_9
+
+    :cond_a
+    iget-object v14, v2, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v14, v14, Lq0/a/a/c;->b:I
+
+    if-lez v14, :cond_16
+
+    if-gt v14, v15, :cond_15
+
+    iget-object v14, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v15, "Code"
+
+    invoke-virtual {v14, v15}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v14, v2, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v14, v14, Lq0/a/a/c;->b:I
+
+    add-int/2addr v14, v12
+
+    iget-object v12, v2, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    const/4 v15, 0x0
+
+    :goto_3
+    if-eqz v12, :cond_b
+
+    add-int/lit8 v15, v15, 0x1
+
+    iget-object v12, v12, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    goto :goto_3
+
+    :cond_b
+    mul-int/lit8 v15, v15, 0x8
+
+    add-int/lit8 v15, v15, 0x2
+
+    add-int/2addr v15, v14
+
+    add-int/lit8 v15, v15, 0x8
+
+    iget-object v12, v2, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    if-eqz v12, :cond_e
+
+    iget-object v12, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v12, v12, Lq0/a/a/v;->c:I
+
+    const/16 v14, 0x32
+
+    if-lt v12, v14, :cond_c
+
+    const/4 v12, 0x1
+
+    goto :goto_4
+
+    :cond_c
+    const/4 v12, 0x0
+
+    :goto_4
+    iget-object v14, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    if-eqz v12, :cond_d
+
+    const-string v12, "StackMapTable"
+
+    goto :goto_5
+
+    :cond_d
+    const-string v12, "StackMap"
+
+    :goto_5
+    invoke-virtual {v14, v12}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v12, v2, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    iget v12, v12, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v12, v12, 0x8
+
+    add-int/2addr v15, v12
+
+    :cond_e
+    iget-object v12, v2, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    if-eqz v12, :cond_f
+
+    iget-object v12, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v14, "LineNumberTable"
+
+    invoke-virtual {v12, v14}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v12, v2, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    iget v12, v12, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v12, v12, 0x8
+
+    add-int/2addr v15, v12
+
+    :cond_f
+    iget-object v12, v2, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    if-eqz v12, :cond_10
+
+    iget-object v12, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v14, "LocalVariableTable"
+
+    invoke-virtual {v12, v14}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v12, v2, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    iget v12, v12, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v12, v12, 0x8
+
+    add-int/2addr v15, v12
+
+    :cond_10
+    iget-object v12, v2, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    if-eqz v12, :cond_11
+
+    iget-object v12, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v14, "LocalVariableTypeTable"
+
+    invoke-virtual {v12, v14}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v12, v2, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    iget v12, v12, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v12, v12, 0x8
+
+    add-int/2addr v15, v12
+
+    :cond_11
+    iget-object v12, v2, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    if-eqz v12, :cond_12
+
+    invoke-virtual {v12, v6}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v12
+
+    add-int/2addr v15, v12
+
+    :cond_12
+    iget-object v12, v2, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    if-eqz v12, :cond_13
+
+    invoke-virtual {v12, v5}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v12
+
+    add-int/2addr v15, v12
+
+    :cond_13
+    iget-object v12, v2, Lq0/a/a/r;->x:Lq0/a/a/b;
+
+    if-eqz v12, :cond_14
+
+    iget-object v14, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    move/from16 v24, v13
+
+    iget-object v13, v2, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    move-object/from16 v25, v4
+
+    iget-object v4, v13, Lq0/a/a/c;->a:[B
+
+    iget v13, v13, Lq0/a/a/c;->b:I
+
+    move/from16 v26, v3
+
+    iget v3, v2, Lq0/a/a/r;->i:I
+
+    iget v0, v2, Lq0/a/a/r;->j:I
+
+    move-object/from16 v18, v12
+
+    move-object/from16 v19, v14
+
+    move-object/from16 v20, v4
+
+    move/from16 v21, v13
+
+    move/from16 v22, v3
+
+    move/from16 v23, v0
+
+    invoke-virtual/range {v18 .. v23}, Lq0/a/a/b;->b(Lq0/a/a/v;[BIII)I
+
+    move-result v0
+
+    add-int/2addr v15, v0
+
+    goto :goto_6
+
+    :cond_14
+    move/from16 v26, v3
+
+    move-object/from16 v25, v4
+
+    move/from16 v24, v13
+
+    goto :goto_6
+
+    :cond_15
+    new-instance v0, Lorg/objectweb/asm/MethodTooLargeException;
+
+    iget-object v1, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v1, v1, Lq0/a/a/v;->d:Ljava/lang/String;
+
+    iget-object v3, v2, Lq0/a/a/r;->f:Ljava/lang/String;
+
+    iget-object v4, v2, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    iget-object v2, v2, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-direct {v0, v1, v3, v4, v2}, Lorg/objectweb/asm/MethodTooLargeException;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+
+    throw v0
+
+    :cond_16
+    move/from16 v26, v3
+
+    move-object/from16 v25, v4
+
+    move/from16 v24, v13
+
+    const/16 v15, 0x8
+
+    :goto_6
+    iget v0, v2, Lq0/a/a/r;->y:I
+
+    if-lez v0, :cond_17
+
+    iget-object v0, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v3, "Exceptions"
+
+    invoke-virtual {v0, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget v0, v2, Lq0/a/a/r;->y:I
+
+    mul-int/lit8 v0, v0, 0x2
+
+    add-int/lit8 v0, v0, 0x8
+
+    add-int/2addr v15, v0
+
+    :cond_17
+    iget-object v0, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v0, v0, Lq0/a/a/v;->c:I
+
+    const/16 v3, 0x31
+
+    if-ge v0, v3, :cond_18
+
+    goto :goto_7
+
+    :cond_18
+    const/16 v16, 0x0
+
+    :goto_7
+    iget v0, v2, Lq0/a/a/r;->d:I
+
+    and-int/lit16 v0, v0, 0x1000
+
+    if-eqz v0, :cond_19
+
+    if-eqz v16, :cond_19
+
+    iget-object v0, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, v10}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    add-int/lit8 v15, v15, 0x6
+
+    :cond_19
+    iget v0, v2, Lq0/a/a/r;->A:I
+
+    if-eqz v0, :cond_1a
+
+    iget-object v0, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, v11}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    add-int/lit8 v15, v15, 0x8
+
+    :cond_1a
+    iget v0, v2, Lq0/a/a/r;->d:I
+
+    const/high16 v3, 0x20000
+
+    and-int/2addr v0, v3
+
+    if-eqz v0, :cond_1b
+
+    iget-object v0, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, v9}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    add-int/lit8 v15, v15, 0x6
+
+    :cond_1b
+    iget-object v0, v2, Lq0/a/a/r;->B:Lq0/a/a/a;
+
+    if-eqz v0, :cond_1c
+
+    invoke-virtual {v0, v8}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v0
+
+    add-int/2addr v15, v0
+
+    :cond_1c
+    iget-object v0, v2, Lq0/a/a/r;->C:Lq0/a/a/a;
+
+    if-eqz v0, :cond_1d
+
+    invoke-virtual {v0, v7}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v0
+
+    add-int/2addr v15, v0
+
+    :cond_1d
+    iget-object v0, v2, Lq0/a/a/r;->E:[Lq0/a/a/a;
+
+    if-eqz v0, :cond_1f
+
+    iget v3, v2, Lq0/a/a/r;->D:I
+
+    if-nez v3, :cond_1e
+
+    array-length v3, v0
+
+    :cond_1e
+    const-string v4, "RuntimeVisibleParameterAnnotations"
+
+    invoke-static {v4, v0, v3}, Lq0/a/a/a;->b(Ljava/lang/String;[Lq0/a/a/a;I)I
+
+    move-result v0
+
+    add-int/2addr v15, v0
+
+    :cond_1f
+    iget-object v0, v2, Lq0/a/a/r;->G:[Lq0/a/a/a;
+
+    if-eqz v0, :cond_21
+
+    iget v3, v2, Lq0/a/a/r;->F:I
+
+    if-nez v3, :cond_20
+
+    array-length v3, v0
+
+    :cond_20
+    const-string v4, "RuntimeInvisibleParameterAnnotations"
+
+    invoke-static {v4, v0, v3}, Lq0/a/a/a;->b(Ljava/lang/String;[Lq0/a/a/a;I)I
+
+    move-result v0
+
+    add-int/2addr v15, v0
+
+    :cond_21
+    iget-object v0, v2, Lq0/a/a/r;->H:Lq0/a/a/a;
+
+    if-eqz v0, :cond_22
+
+    invoke-virtual {v0, v6}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v0
+
+    add-int/2addr v15, v0
+
+    :cond_22
+    iget-object v0, v2, Lq0/a/a/r;->I:Lq0/a/a/a;
+
+    if-eqz v0, :cond_23
+
+    invoke-virtual {v0, v5}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v0
+
+    add-int/2addr v15, v0
+
+    :cond_23
+    iget-object v0, v2, Lq0/a/a/r;->J:Lq0/a/a/c;
+
+    if-eqz v0, :cond_24
+
+    iget-object v0, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v3, "AnnotationDefault"
+
+    invoke-virtual {v0, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v0, v2, Lq0/a/a/r;->J:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v0, v0, 0x6
+
+    add-int/2addr v15, v0
+
+    :cond_24
+    iget-object v0, v2, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    if-eqz v0, :cond_25
+
+    iget-object v0, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v3, "MethodParameters"
+
+    invoke-virtual {v0, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v0, v2, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v0, v0, 0x7
+
+    add-int/2addr v0, v15
+
+    move v12, v0
+
+    goto :goto_8
+
+    :cond_25
+    move v12, v15
+
+    :goto_8
+    iget-object v0, v2, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    if-eqz v0, :cond_26
+
+    iget-object v3, v2, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, v3}, Lq0/a/a/b;->a(Lq0/a/a/v;)I
+
+    move-result v0
+
+    add-int/2addr v12, v0
+
+    :cond_26
+    :goto_9
+    add-int/2addr v1, v12
+
+    iget-object v0, v2, Lq0/a/a/q;->b:Lq0/a/a/q;
+
+    move-object v2, v0
+
+    check-cast v2, Lq0/a/a/r;
+
+    const/16 v12, 0x10
+
+    const/high16 v14, 0x20000
+
+    move-object/from16 v0, p0
+
+    move/from16 v13, v24
+
+    move-object/from16 v4, v25
+
+    move/from16 v3, v26
+
+    goto/16 :goto_2
+
+    :cond_27
+    move/from16 v26, v3
+
+    move-object/from16 v25, v4
+
+    iget-object v2, v0, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    const-string v3, "InnerClasses"
+
+    if-eqz v2, :cond_28
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x8
+
+    add-int/2addr v1, v2
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v2, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    const/4 v2, 0x1
+
+    goto :goto_a
+
+    :cond_28
+    const/4 v2, 0x0
+
+    :goto_a
+    iget v4, v0, Lq0/a/a/f;->n:I
+
+    const-string v12, "EnclosingMethod"
+
+    if-eqz v4, :cond_29
+
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v1, v1, 0xa
+
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v12}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_29
+    iget v4, v0, Lq0/a/a/f;->c:I
+
+    and-int/lit16 v4, v4, 0x1000
+
+    if-eqz v4, :cond_2a
+
+    iget v4, v0, Lq0/a/a/f;->a:I
+
+    and-int/2addr v4, v15
+
+    const/16 v14, 0x31
+
+    if-ge v4, v14, :cond_2a
+
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v1, v1, 0x6
+
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v10}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_2a
+    iget v4, v0, Lq0/a/a/f;->p:I
+
+    if-eqz v4, :cond_2b
+
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v1, v1, 0x8
+
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v11}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_2b
+    iget v4, v0, Lq0/a/a/f;->q:I
+
+    const-string v14, "SourceFile"
+
+    if-eqz v4, :cond_2c
+
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v1, v1, 0x8
+
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v14}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_2c
+    iget-object v4, v0, Lq0/a/a/f;->r:Lq0/a/a/c;
+
+    const-string v15, "SourceDebugExtension"
+
+    if-eqz v4, :cond_2d
+
+    add-int/lit8 v2, v2, 0x1
+
+    iget v4, v4, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v4, v4, 0x6
+
+    add-int/2addr v1, v4
+
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v15}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_2d
+    iget v4, v0, Lq0/a/a/f;->c:I
+
+    const/high16 v16, 0x20000
+
+    and-int v4, v4, v16
+
+    if-eqz v4, :cond_2e
+
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v1, v1, 0x6
+
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v9}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_2e
+    iget-object v4, v0, Lq0/a/a/f;->s:Lq0/a/a/a;
+
+    if-eqz v4, :cond_2f
+
+    add-int/lit8 v2, v2, 0x1
+
+    invoke-virtual {v4, v8}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v1, v4
+
+    :cond_2f
+    iget-object v4, v0, Lq0/a/a/f;->t:Lq0/a/a/a;
+
+    if-eqz v4, :cond_30
+
+    add-int/lit8 v2, v2, 0x1
+
+    invoke-virtual {v4, v7}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v1, v4
+
+    :cond_30
+    iget-object v4, v0, Lq0/a/a/f;->u:Lq0/a/a/a;
+
+    if-eqz v4, :cond_31
+
+    add-int/lit8 v2, v2, 0x1
+
+    invoke-virtual {v4, v6}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v1, v4
+
+    :cond_31
+    iget-object v4, v0, Lq0/a/a/f;->v:Lq0/a/a/a;
+
+    if-eqz v4, :cond_32
+
+    add-int/lit8 v2, v2, 0x1
+
+    invoke-virtual {v4, v5}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v4
+
+    add-int/2addr v1, v4
+
+    :cond_32
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v16, v15
+
+    iget-object v15, v4, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    move-object/from16 v18, v14
+
+    const-string v14, "BootstrapMethods"
+
+    if-eqz v15, :cond_33
+
+    invoke-virtual {v4, v14}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v4, v4, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    iget v4, v4, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v4, v4, 0x8
+
+    goto :goto_b
+
+    :cond_33
+    const/4 v4, 0x0
+
+    :goto_b
+    if-lez v4, :cond_35
+
+    add-int/lit8 v2, v2, 0x1
+
+    iget-object v4, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget-object v15, v4, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    if-eqz v15, :cond_34
+
+    invoke-virtual {v4, v14}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v4, v4, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    iget v4, v4, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v4, v4, 0x8
+
+    goto :goto_c
+
+    :cond_34
+    const/4 v4, 0x0
+
+    :goto_c
+    add-int/2addr v1, v4
+
+    :cond_35
+    iget-object v4, v0, Lq0/a/a/f;->w:Lq0/a/a/s;
+
+    const-string v15, "ModuleMainClass"
+
+    move-object/from16 v19, v14
+
+    const-string v14, "ModulePackages"
+
+    move-object/from16 v20, v12
+
+    const-string v12, "Module"
+
+    if-eqz v4, :cond_3a
+
+    move-object/from16 v21, v3
+
+    iget v3, v4, Lq0/a/a/s;->o:I
+
+    if-lez v3, :cond_36
+
+    const/4 v3, 0x1
+
+    goto :goto_d
+
+    :cond_36
+    const/4 v3, 0x0
+
+    :goto_d
+    add-int/lit8 v3, v3, 0x1
+
+    iget v4, v4, Lq0/a/a/s;->q:I
+
+    if-lez v4, :cond_37
+
+    const/4 v4, 0x1
+
+    goto :goto_e
+
+    :cond_37
+    const/4 v4, 0x0
+
+    :goto_e
+    add-int/2addr v3, v4
+
+    add-int/2addr v2, v3
+
+    iget-object v3, v0, Lq0/a/a/f;->w:Lq0/a/a/s;
+
+    iget-object v4, v3, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v4, v12}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v4, v3, Lq0/a/a/s;->f:Lq0/a/a/c;
+
+    iget v4, v4, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v4, v4, 0x16
+
+    move/from16 v22, v2
+
+    iget-object v2, v3, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/2addr v4, v2
+
+    iget-object v2, v3, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/2addr v4, v2
+
+    iget-object v2, v3, Lq0/a/a/s;->l:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/2addr v4, v2
+
+    iget-object v2, v3, Lq0/a/a/s;->n:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/2addr v4, v2
+
+    iget v2, v3, Lq0/a/a/s;->o:I
+
+    if-lez v2, :cond_38
+
+    iget-object v2, v3, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v2, v14}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    iget-object v2, v3, Lq0/a/a/s;->p:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x8
+
+    add-int/2addr v4, v2
+
+    :cond_38
+    iget v2, v3, Lq0/a/a/s;->q:I
+
+    if-lez v2, :cond_39
+
+    iget-object v2, v3, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    invoke-virtual {v2, v15}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    add-int/lit8 v4, v4, 0x8
+
+    :cond_39
+    add-int/2addr v1, v4
+
+    move/from16 v2, v22
+
+    goto :goto_f
+
+    :cond_3a
+    move-object/from16 v21, v3
+
+    :goto_f
+    iget v3, v0, Lq0/a/a/f;->x:I
+
+    const-string v4, "NestHost"
+
+    if-eqz v3, :cond_3b
+
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v1, v1, 0x8
+
+    iget-object v3, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v3, v4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_3b
+    iget-object v3, v0, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    move-object/from16 v22, v4
+
+    const-string v4, "NestMembers"
+
+    if-eqz v3, :cond_3c
+
+    add-int/lit8 v2, v2, 0x1
+
+    iget v3, v3, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v3, v3, 0x8
+
+    add-int/2addr v1, v3
+
+    iget-object v3, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v3, v4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    :cond_3c
+    iget-object v3, v0, Lq0/a/a/f;->A:Lq0/a/a/b;
+
+    if-eqz v3, :cond_3d
+
+    invoke-virtual {v3}, Lq0/a/a/b;->c()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    iget-object v3, v0, Lq0/a/a/f;->A:Lq0/a/a/b;
+
+    move/from16 v23, v2
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v3, v2}, Lq0/a/a/b;->a(Lq0/a/a/v;)I
+
+    move-result v2
+
+    add-int/2addr v1, v2
+
+    move/from16 v2, v23
+
+    :cond_3d
+    iget-object v3, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v23, v4
+
+    iget-object v4, v3, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    iget v4, v4, Lq0/a/a/c;->b:I
+
+    add-int/2addr v1, v4
+
+    iget v3, v3, Lq0/a/a/v;->g:I
+
+    const v4, 0xffff
+
+    if-gt v3, v4, :cond_69
+
+    new-instance v3, Lq0/a/a/c;
+
+    invoke-direct {v3, v1}, Lq0/a/a/c;-><init>(I)V
+
+    const v1, -0x35014542    # -8346975.0f
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->a:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget v4, v1, Lq0/a/a/v;->g:I
+
+    invoke-virtual {v3, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v1, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    iget-object v4, v1, Lq0/a/a/c;->a:[B
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    move-object/from16 v24, v15
+
+    const/4 v15, 0x0
+
+    invoke-virtual {v3, v4, v15, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->a:I
+
+    const v4, 0xffff
+
+    and-int/2addr v1, v4
+
+    const/16 v4, 0x31
+
+    if-ge v1, v4, :cond_3e
+
+    const/16 v1, 0x1000
+
+    goto :goto_10
+
+    :cond_3e
+    const/4 v1, 0x0
+
+    :goto_10
+    iget v4, v0, Lq0/a/a/f;->c:I
+
+    not-int v1, v1
+
+    and-int/2addr v1, v4
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->d:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->e:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->f:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 v1, 0x0
+
+    :goto_11
+    iget v4, v0, Lq0/a/a/f;->f:I
+
+    if-ge v1, v4, :cond_3f
+
+    iget-object v4, v0, Lq0/a/a/f;->g:[I
+
+    aget v4, v4, v1
+
+    invoke-virtual {v3, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_11
+
+    :cond_3f
+    move/from16 v1, v26
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->h:Lq0/a/a/l;
+
+    :goto_12
+    if-eqz v1, :cond_54
+
+    iget-object v4, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    iget v4, v4, Lq0/a/a/v;->c:I
+
+    const/16 v15, 0x31
+
+    if-ge v4, v15, :cond_40
+
+    const/4 v4, 0x1
+
+    goto :goto_13
+
+    :cond_40
+    const/4 v4, 0x0
+
+    :goto_13
+    if-eqz v4, :cond_41
+
+    const/16 v15, 0x1000
+
+    goto :goto_14
+
+    :cond_41
+    const/4 v15, 0x0
+
+    :goto_14
+    move-object/from16 v26, v14
+
+    iget v14, v1, Lq0/a/a/l;->c:I
+
+    not-int v15, v15
+
+    and-int/2addr v14, v15
+
+    invoke-virtual {v3, v14}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v14, v1, Lq0/a/a/l;->d:I
+
+    invoke-virtual {v3, v14}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v14, v1, Lq0/a/a/l;->e:I
+
+    invoke-virtual {v3, v14}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v14, v1, Lq0/a/a/l;->g:I
+
+    if-eqz v14, :cond_42
+
+    const/4 v14, 0x1
+
+    goto :goto_15
+
+    :cond_42
+    const/4 v14, 0x0
+
+    :goto_15
+    iget v15, v1, Lq0/a/a/l;->c:I
+
+    and-int/lit16 v15, v15, 0x1000
+
+    if-eqz v15, :cond_43
+
+    if-eqz v4, :cond_43
+
+    add-int/lit8 v14, v14, 0x1
+
+    :cond_43
+    iget v15, v1, Lq0/a/a/l;->f:I
+
+    if-eqz v15, :cond_44
+
+    add-int/lit8 v14, v14, 0x1
+
+    :cond_44
+    iget v15, v1, Lq0/a/a/l;->c:I
+
+    const/high16 v17, 0x20000
+
+    and-int v15, v15, v17
+
+    if-eqz v15, :cond_45
+
+    add-int/lit8 v14, v14, 0x1
+
+    :cond_45
+    iget-object v15, v1, Lq0/a/a/l;->h:Lq0/a/a/a;
+
+    if-eqz v15, :cond_46
+
+    add-int/lit8 v14, v14, 0x1
+
+    :cond_46
+    iget-object v15, v1, Lq0/a/a/l;->i:Lq0/a/a/a;
+
+    if-eqz v15, :cond_47
+
+    add-int/lit8 v14, v14, 0x1
+
+    :cond_47
+    iget-object v15, v1, Lq0/a/a/l;->j:Lq0/a/a/a;
+
+    if-eqz v15, :cond_48
+
+    add-int/lit8 v14, v14, 0x1
+
+    :cond_48
+    iget-object v15, v1, Lq0/a/a/l;->k:Lq0/a/a/a;
+
+    if-eqz v15, :cond_49
+
+    add-int/lit8 v14, v14, 0x1
+
+    :cond_49
+    iget-object v15, v1, Lq0/a/a/l;->l:Lq0/a/a/b;
+
+    if-eqz v15, :cond_4a
+
+    invoke-virtual {v15}, Lq0/a/a/b;->c()I
+
+    move-result v15
+
+    add-int/2addr v14, v15
+
+    :cond_4a
+    invoke-virtual {v3, v14}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v14, v1, Lq0/a/a/l;->g:I
+
+    if-eqz v14, :cond_4b
+
+    iget-object v14, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    const/4 v15, 0x2
+
+    move-object/from16 v27, v12
+
+    move-object/from16 v12, v25
+
+    invoke-static {v14, v12, v3, v15}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v14, v1, Lq0/a/a/l;->g:I
+
+    invoke-virtual {v3, v14}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_16
+
+    :cond_4b
+    move-object/from16 v27, v12
+
+    move-object/from16 v12, v25
+
+    :goto_16
+    iget v14, v1, Lq0/a/a/l;->c:I
+
+    and-int/lit16 v14, v14, 0x1000
+
+    if-eqz v14, :cond_4c
+
+    if-eqz v4, :cond_4c
+
+    iget-object v4, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    const/4 v14, 0x0
+
+    invoke-static {v4, v10, v3, v14}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    :cond_4c
+    iget v4, v1, Lq0/a/a/l;->f:I
+
+    if-eqz v4, :cond_4d
+
+    iget-object v4, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    const/4 v14, 0x2
+
+    invoke-static {v4, v11, v3, v14}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v4, v1, Lq0/a/a/l;->f:I
+
+    invoke-virtual {v3, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_4d
+    iget v4, v1, Lq0/a/a/l;->c:I
+
+    const/high16 v14, 0x20000
+
+    and-int/2addr v4, v14
+
+    if-eqz v4, :cond_4e
+
+    iget-object v4, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    const/4 v14, 0x0
+
+    invoke-static {v4, v9, v3, v14}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    :cond_4e
+    iget-object v4, v1, Lq0/a/a/l;->h:Lq0/a/a/a;
+
+    if-eqz v4, :cond_4f
+
+    iget-object v14, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v14, v8}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v14
+
+    invoke-virtual {v4, v14, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_4f
+    iget-object v4, v1, Lq0/a/a/l;->i:Lq0/a/a/a;
+
+    if-eqz v4, :cond_50
+
+    iget-object v14, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v14, v7}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v14
+
+    invoke-virtual {v4, v14, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_50
+    iget-object v4, v1, Lq0/a/a/l;->j:Lq0/a/a/a;
+
+    if-eqz v4, :cond_51
+
+    iget-object v14, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v14, v6}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v14
+
+    invoke-virtual {v4, v14, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_51
+    iget-object v4, v1, Lq0/a/a/l;->k:Lq0/a/a/a;
+
+    if-eqz v4, :cond_52
+
+    iget-object v14, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v14, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v14
+
+    invoke-virtual {v4, v14, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_52
+    iget-object v4, v1, Lq0/a/a/l;->l:Lq0/a/a/b;
+
+    if-eqz v4, :cond_53
+
+    iget-object v14, v1, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v4, v14, v3}, Lq0/a/a/b;->d(Lq0/a/a/v;Lq0/a/a/c;)V
+
+    :cond_53
+    iget-object v1, v1, Lq0/a/a/k;->a:Lq0/a/a/k;
+
+    check-cast v1, Lq0/a/a/l;
+
+    move-object/from16 v25, v12
+
+    move-object/from16 v14, v26
+
+    move-object/from16 v12, v27
+
+    goto/16 :goto_12
+
+    :cond_54
+    move-object/from16 v27, v12
+
+    move-object/from16 v26, v14
+
+    invoke-virtual {v3, v13}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->j:Lq0/a/a/r;
+
+    const/4 v4, 0x0
+
+    const/4 v12, 0x0
+
+    :goto_17
+    if-eqz v1, :cond_56
+
+    iget v13, v1, Lq0/a/a/r;->t:I
+
+    if-lez v13, :cond_55
+
+    const/4 v13, 0x1
+
+    goto :goto_18
+
+    :cond_55
+    const/4 v13, 0x0
+
+    :goto_18
+    or-int/2addr v12, v13
+
+    iget-boolean v13, v1, Lq0/a/a/r;->Y:Z
+
+    or-int/2addr v4, v13
+
+    invoke-virtual {v1, v3}, Lq0/a/a/r;->y(Lq0/a/a/c;)V
+
+    iget-object v1, v1, Lq0/a/a/q;->b:Lq0/a/a/q;
+
+    check-cast v1, Lq0/a/a/r;
+
+    goto :goto_17
+
+    :cond_56
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    if-eqz v1, :cond_57
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v2, v21
+
+    invoke-virtual {v1, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v1
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v1, 0x2
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->l:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->m:Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/c;->a:[B
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    const/4 v13, 0x0
+
+    invoke-virtual {v3, v2, v13, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_57
+    iget v1, v0, Lq0/a/a/f;->n:I
+
+    if-eqz v1, :cond_58
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v2, 0x4
+
+    move-object/from16 v13, v20
+
+    invoke-static {v1, v13, v3, v2}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v1, v0, Lq0/a/a/f;->n:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->o:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_58
+    iget v1, v0, Lq0/a/a/f;->c:I
+
+    and-int/lit16 v1, v1, 0x1000
+
+    if-eqz v1, :cond_59
+
+    iget v1, v0, Lq0/a/a/f;->a:I
+
+    const v2, 0xffff
+
+    and-int/2addr v1, v2
+
+    const/16 v2, 0x31
+
+    if-ge v1, v2, :cond_59
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v2, 0x0
+
+    invoke-static {v1, v10, v3, v2}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    :cond_59
+    iget v1, v0, Lq0/a/a/f;->p:I
+
+    if-eqz v1, :cond_5a
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    const/4 v2, 0x2
+
+    invoke-static {v1, v11, v3, v2}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v1, v0, Lq0/a/a/f;->p:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_19
+
+    :cond_5a
+    const/4 v2, 0x2
+
+    :goto_19
+    iget v1, v0, Lq0/a/a/f;->q:I
+
+    if-eqz v1, :cond_5b
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v10, v18
+
+    invoke-static {v1, v10, v3, v2}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v1, v0, Lq0/a/a/f;->q:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_5b
+    iget-object v1, v0, Lq0/a/a/f;->r:Lq0/a/a/c;
+
+    if-eqz v1, :cond_5c
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v10, v16
+
+    invoke-static {v2, v10, v3, v1}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget-object v2, v0, Lq0/a/a/f;->r:Lq0/a/a/c;
+
+    iget-object v2, v2, Lq0/a/a/c;->a:[B
+
+    const/4 v10, 0x0
+
+    invoke-virtual {v3, v2, v10, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    goto :goto_1a
+
+    :cond_5c
+    const/4 v10, 0x0
+
+    :goto_1a
+    iget v1, v0, Lq0/a/a/f;->c:I
+
+    const/high16 v2, 0x20000
+
+    and-int/2addr v1, v2
+
+    if-eqz v1, :cond_5d
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-static {v1, v9, v3, v10}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    :cond_5d
+    iget-object v1, v0, Lq0/a/a/f;->s:Lq0/a/a/a;
+
+    if-eqz v1, :cond_5e
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v2, v8}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_5e
+    iget-object v1, v0, Lq0/a/a/f;->t:Lq0/a/a/a;
+
+    if-eqz v1, :cond_5f
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v2, v7}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_5f
+    iget-object v1, v0, Lq0/a/a/f;->u:Lq0/a/a/a;
+
+    if-eqz v1, :cond_60
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v2, v6}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_60
+    iget-object v1, v0, Lq0/a/a/f;->v:Lq0/a/a/a;
+
+    if-eqz v1, :cond_61
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v2, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2, v3}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_61
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget-object v2, v1, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    if-eqz v2, :cond_62
+
+    move-object/from16 v2, v19
+
+    invoke-virtual {v1, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x2
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/v;->i:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v1, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/c;->a:[B
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v3, v2, v5, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_62
+    iget-object v1, v0, Lq0/a/a/f;->w:Lq0/a/a/s;
+
+    if-eqz v1, :cond_64
+
+    iget-object v2, v1, Lq0/a/a/s;->f:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x10
+
+    iget-object v5, v1, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    add-int/2addr v2, v5
+
+    iget-object v5, v1, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    add-int/2addr v2, v5
+
+    iget-object v5, v1, Lq0/a/a/s;->l:Lq0/a/a/c;
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    add-int/2addr v2, v5
+
+    iget-object v5, v1, Lq0/a/a/s;->n:Lq0/a/a/c;
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    add-int/2addr v2, v5
+
+    iget-object v5, v1, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    move-object/from16 v6, v27
+
+    invoke-static {v5, v6, v3, v2}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v2, v1, Lq0/a/a/s;->b:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->c:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->d:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->e:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/s;->f:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    const/4 v6, 0x0
+
+    invoke-virtual {v3, v5, v6, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->g:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {v3, v5, v6, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->i:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {v3, v5, v6, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->k:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/s;->l:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {v3, v5, v6, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->m:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/s;->n:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {v3, v5, v6, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->o:I
+
+    if-lez v2, :cond_63
+
+    iget-object v2, v1, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    move-object/from16 v5, v26
+
+    invoke-virtual {v2, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/s;->p:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x2
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/s;->o:I
+
+    invoke-virtual {v3, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/s;->p:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    const/4 v6, 0x0
+
+    invoke-virtual {v3, v5, v6, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_63
+    iget v2, v1, Lq0/a/a/s;->q:I
+
+    if-lez v2, :cond_64
+
+    iget-object v2, v1, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    const/4 v5, 0x2
+
+    move-object/from16 v6, v24
+
+    invoke-static {v2, v6, v3, v5}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v1, v1, Lq0/a/a/s;->q:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_1b
+
+    :cond_64
+    const/4 v5, 0x2
+
+    :goto_1b
+    iget v1, v0, Lq0/a/a/f;->x:I
+
+    if-eqz v1, :cond_65
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v2, v22
+
+    invoke-static {v1, v2, v3, v5}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v1, v0, Lq0/a/a/f;->x:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_65
+    iget-object v1, v0, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    if-eqz v1, :cond_66
+
+    iget-object v1, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    move-object/from16 v2, v23
+
+    invoke-virtual {v1, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v1
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v1, v1, 0x2
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/f;->y:I
+
+    invoke-virtual {v3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/f;->z:Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/c;->a:[B
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    const/4 v5, 0x0
+
+    invoke-virtual {v3, v2, v5, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_66
+    iget-object v1, v0, Lq0/a/a/f;->A:Lq0/a/a/b;
+
+    if-eqz v1, :cond_67
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    invoke-virtual {v1, v2, v3}, Lq0/a/a/b;->d(Lq0/a/a/v;Lq0/a/a/c;)V
+
+    :cond_67
+    if-eqz v4, :cond_68
+
+    iget-object v1, v3, Lq0/a/a/c;->a:[B
+
+    invoke-virtual {v0, v1, v12}, Lq0/a/a/f;->e([BZ)[B
+
+    move-result-object v1
+
+    return-object v1
+
+    :cond_68
+    iget-object v1, v3, Lq0/a/a/c;->a:[B
+
+    return-object v1
+
+    :cond_69
+    new-instance v1, Lorg/objectweb/asm/ClassTooLargeException;
+
+    iget-object v2, v0, Lq0/a/a/f;->b:Lq0/a/a/v;
+
+    iget-object v2, v2, Lq0/a/a/v;->d:Ljava/lang/String;
+
+    invoke-direct {v1, v2, v3}, Lorg/objectweb/asm/ClassTooLargeException;-><init>(Ljava/lang/String;I)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/g.smali b/com.discord/smali_classes2/q0/a/a/g.smali
new file mode 100644
index 0000000000..6ad78a9339
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/g.smali
@@ -0,0 +1,201 @@
+.class public final Lq0/a/a/g;
+.super Ljava/lang/Object;
+.source "ConstantDynamic.java"
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public final b:Ljava/lang/String;
+
+.field public final c:Lq0/a/a/n;
+
+.field public final d:[Ljava/lang/Object;
+
+
+# direct methods
+.method public varargs constructor <init>(Ljava/lang/String;Ljava/lang/String;Lq0/a/a/n;[Ljava/lang/Object;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/g;->a:Ljava/lang/String;
+
+    iput-object p2, p0, Lq0/a/a/g;->b:Ljava/lang/String;
+
+    iput-object p3, p0, Lq0/a/a/g;->c:Lq0/a/a/n;
+
+    iput-object p4, p0, Lq0/a/a/g;->d:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lq0/a/a/g;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_1
+
+    return v2
+
+    :cond_1
+    check-cast p1, Lq0/a/a/g;
+
+    iget-object v1, p0, Lq0/a/a/g;->a:Ljava/lang/String;
+
+    iget-object v3, p1, Lq0/a/a/g;->a:Ljava/lang/String;
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lq0/a/a/g;->b:Ljava/lang/String;
+
+    iget-object v3, p1, Lq0/a/a/g;->b:Ljava/lang/String;
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lq0/a/a/g;->c:Lq0/a/a/n;
+
+    iget-object v3, p1, Lq0/a/a/g;->c:Lq0/a/a/n;
+
+    invoke-virtual {v1, v3}, Lq0/a/a/n;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lq0/a/a/g;->d:[Ljava/lang/Object;
+
+    iget-object p1, p1, Lq0/a/a/g;->d:[Ljava/lang/Object;
+
+    invoke-static {v1, p1}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/g;->a:Ljava/lang/String;
+
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    iget-object v1, p0, Lq0/a/a/g;->b:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    const/16 v2, 0x8
+
+    invoke-static {v1, v2}, Ljava/lang/Integer;->rotateLeft(II)I
+
+    move-result v1
+
+    xor-int/2addr v0, v1
+
+    iget-object v1, p0, Lq0/a/a/g;->c:Lq0/a/a/n;
+
+    invoke-virtual {v1}, Lq0/a/a/n;->hashCode()I
+
+    move-result v1
+
+    const/16 v2, 0x10
+
+    invoke-static {v1, v2}, Ljava/lang/Integer;->rotateLeft(II)I
+
+    move-result v1
+
+    xor-int/2addr v0, v1
+
+    iget-object v1, p0, Lq0/a/a/g;->d:[Ljava/lang/Object;
+
+    invoke-static {v1}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
+
+    move-result v1
+
+    const/16 v2, 0x18
+
+    invoke-static {v1, v2}, Ljava/lang/Integer;->rotateLeft(II)I
+
+    move-result v1
+
+    xor-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lq0/a/a/g;->a:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " : "
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lq0/a/a/g;->b:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x20
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v2, p0, Lq0/a/a/g;->c:Lq0/a/a/n;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lq0/a/a/g;->d:[Ljava/lang/Object;
+
+    invoke-static {v1}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/h.smali b/com.discord/smali_classes2/q0/a/a/h.smali
new file mode 100644
index 0000000000..e7aa8bffe9
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/h.smali
@@ -0,0 +1,53 @@
+.class public final Lq0/a/a/h;
+.super Ljava/lang/Object;
+.source "Context.java"
+
+
+# instance fields
+.field public a:[Lq0/a/a/b;
+
+.field public b:I
+
+.field public c:[C
+
+.field public d:I
+
+.field public e:Ljava/lang/String;
+
+.field public f:Ljava/lang/String;
+
+.field public g:[Lq0/a/a/p;
+
+.field public h:I
+
+.field public i:Lq0/a/a/x;
+
+.field public j:[Lq0/a/a/p;
+
+.field public k:[Lq0/a/a/p;
+
+.field public l:[I
+
+.field public m:I
+
+.field public n:I
+
+.field public o:I
+
+.field public p:I
+
+.field public q:[Ljava/lang/Object;
+
+.field public r:I
+
+.field public s:[Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/i.smali b/com.discord/smali_classes2/q0/a/a/i.smali
new file mode 100644
index 0000000000..622d15dab5
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/i.smali
@@ -0,0 +1,63 @@
+.class public final Lq0/a/a/i;
+.super Lq0/a/a/m;
+.source "CurrentFrame.java"
+
+
+# direct methods
+.method public constructor <init>(Lq0/a/a/p;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Lq0/a/a/m;-><init>(Lq0/a/a/p;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public b(IILq0/a/a/u;Lq0/a/a/v;)V
+    .locals 0
+
+    invoke-super {p0, p1, p2, p3, p4}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    new-instance p1, Lq0/a/a/m;
+
+    const/4 p2, 0x0
+
+    invoke-direct {p1, p2}, Lq0/a/a/m;-><init>(Lq0/a/a/p;)V
+
+    const/4 p2, 0x0
+
+    invoke-virtual {p0, p4, p1, p2}, Lq0/a/a/m;->h(Lq0/a/a/v;Lq0/a/a/m;I)Z
+
+    iget-object p3, p1, Lq0/a/a/m;->b:[I
+
+    iput-object p3, p0, Lq0/a/a/m;->b:[I
+
+    iget-object p3, p1, Lq0/a/a/m;->c:[I
+
+    iput-object p3, p0, Lq0/a/a/m;->c:[I
+
+    iput-short p2, p0, Lq0/a/a/m;->f:S
+
+    iget-object p2, p1, Lq0/a/a/m;->d:[I
+
+    iput-object p2, p0, Lq0/a/a/m;->d:[I
+
+    iget-object p2, p1, Lq0/a/a/m;->e:[I
+
+    iput-object p2, p0, Lq0/a/a/m;->e:[I
+
+    iget-short p2, p1, Lq0/a/a/m;->g:S
+
+    iput-short p2, p0, Lq0/a/a/m;->g:S
+
+    iget p2, p1, Lq0/a/a/m;->h:I
+
+    iput p2, p0, Lq0/a/a/m;->h:I
+
+    iget-object p1, p1, Lq0/a/a/m;->i:[I
+
+    iput-object p1, p0, Lq0/a/a/m;->i:[I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/j.smali b/com.discord/smali_classes2/q0/a/a/j.smali
new file mode 100644
index 0000000000..9769ff2016
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/j.smali
@@ -0,0 +1,27 @@
+.class public final Lq0/a/a/j;
+.super Ljava/lang/Object;
+.source "Edge.java"
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:Lq0/a/a/p;
+
+.field public c:Lq0/a/a/j;
+
+
+# direct methods
+.method public constructor <init>(ILq0/a/a/p;Lq0/a/a/j;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lq0/a/a/j;->a:I
+
+    iput-object p2, p0, Lq0/a/a/j;->b:Lq0/a/a/p;
+
+    iput-object p3, p0, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/k.smali b/com.discord/smali_classes2/q0/a/a/k.smali
new file mode 100644
index 0000000000..ff91ad7a79
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/k.smali
@@ -0,0 +1,56 @@
+.class public abstract Lq0/a/a/k;
+.super Ljava/lang/Object;
+.source "FieldVisitor.java"
+
+
+# instance fields
+.field public a:Lq0/a/a/k;
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/high16 v0, 0x60000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x50000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x40000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x70000
+
+    if-ne p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lq0/a/a/k;->a:Lq0/a/a/k;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(Ljava/lang/String;Z)Lq0/a/a/a;
+.end method
+
+.method public abstract b(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/l.smali b/com.discord/smali_classes2/q0/a/a/l.smali
new file mode 100644
index 0000000000..a34fc2abf8
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/l.smali
@@ -0,0 +1,179 @@
+.class public final Lq0/a/a/l;
+.super Lq0/a/a/k;
+.source "FieldWriter.java"
+
+
+# instance fields
+.field public final b:Lq0/a/a/v;
+
+.field public final c:I
+
+.field public final d:I
+
+.field public final e:I
+
+.field public f:I
+
+.field public g:I
+
+.field public h:Lq0/a/a/a;
+
+.field public i:Lq0/a/a/a;
+
+.field public j:Lq0/a/a/a;
+
+.field public k:Lq0/a/a/a;
+
+.field public l:Lq0/a/a/b;
+
+
+# direct methods
+.method public constructor <init>(Lq0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
+    .locals 1
+
+    const/high16 v0, 0x70000
+
+    invoke-direct {p0, v0}, Lq0/a/a/k;-><init>(I)V
+
+    iput-object p1, p0, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    iput p2, p0, Lq0/a/a/l;->c:I
+
+    invoke-virtual {p1, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    iput p2, p0, Lq0/a/a/l;->d:I
+
+    invoke-virtual {p1, p4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    iput p2, p0, Lq0/a/a/l;->e:I
+
+    if-eqz p5, :cond_0
+
+    invoke-virtual {p1, p5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    iput p2, p0, Lq0/a/a/l;->f:I
+
+    :cond_0
+    if-eqz p6, :cond_1
+
+    invoke-virtual {p1, p6}, Lq0/a/a/v;->b(Ljava/lang/Object;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    iget p1, p1, Lq0/a/a/u;->a:I
+
+    iput p1, p0, Lq0/a/a/l;->g:I
+
+    :cond_1
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/String;Z)Lq0/a/a/a;
+    .locals 3
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    iget-object v1, p0, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {v1, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p2, :cond_0
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object v1, p0, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/l;->h:Lq0/a/a/a;
+
+    invoke-direct {p2, v1, p1, v0, v2}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/l;->h:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_0
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object v1, p0, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/l;->i:Lq0/a/a/a;
+
+    invoke-direct {p2, v1, p1, v0, v2}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/l;->i:Lq0/a/a/a;
+
+    return-object p2
+.end method
+
+.method public b(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+    .locals 1
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    invoke-static {p1, v0}, Lf/n/a/k/a;->P(ILq0/a/a/c;)V
+
+    invoke-static {p2, v0}, Lq0/a/a/x;->a(Lq0/a/a/x;Lq0/a/a/c;)V
+
+    iget-object p1, p0, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    invoke-virtual {p1, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p4, :cond_0
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/l;->j:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/l;->j:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_0
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/l;->b:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/l;->k:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/l;->k:Lq0/a/a/a;
+
+    return-object p2
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/m.smali b/com.discord/smali_classes2/q0/a/a/m.smali
new file mode 100644
index 0000000000..b919593e78
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/m.smali
@@ -0,0 +1,2890 @@
+.class public Lq0/a/a/m;
+.super Ljava/lang/Object;
+.source "Frame.java"
+
+
+# instance fields
+.field public a:Lq0/a/a/p;
+
+.field public b:[I
+
+.field public c:[I
+
+.field public d:[I
+
+.field public e:[I
+
+.field public f:S
+
+.field public g:S
+
+.field public h:I
+
+.field public i:[I
+
+
+# direct methods
+.method public constructor <init>(Lq0/a/a/p;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/m;->a:Lq0/a/a/p;
+
+    return-void
+.end method
+
+.method public static c(Lq0/a/a/v;Ljava/lang/Object;)I
+    .locals 2
+
+    instance-of v0, p1, Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    const/high16 p0, 0x1000000
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    or-int/2addr p0, p1
+
+    return p0
+
+    :cond_0
+    instance-of v0, p1, Ljava/lang/String;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-static {p1}, Lq0/a/a/w;->h(Ljava/lang/String;)Lq0/a/a/w;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lq0/a/a/w;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    invoke-static {p0, p1, v0}, Lq0/a/a/m;->d(Lq0/a/a/v;Ljava/lang/String;I)I
+
+    move-result p0
+
+    return p0
+
+    :cond_1
+    const/high16 v0, 0x3000000
+
+    check-cast p1, Lq0/a/a/p;
+
+    iget p1, p1, Lq0/a/a/p;->d:I
+
+    const-string v1, ""
+
+    invoke-virtual {p0, v1, p1}, Lq0/a/a/v;->p(Ljava/lang/String;I)I
+
+    move-result p0
+
+    or-int/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static d(Lq0/a/a/v;Ljava/lang/String;I)I
+    .locals 16
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    invoke-virtual/range {p1 .. p2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    const v3, 0x1000002
+
+    const/16 v4, 0x46
+
+    if-eq v2, v4, :cond_c
+
+    const/high16 v5, 0x2000000
+
+    const/16 v6, 0x4c
+
+    if-eq v2, v6, :cond_b
+
+    const v7, 0x1000001
+
+    const/16 v8, 0x53
+
+    if-eq v2, v8, :cond_a
+
+    const/16 v9, 0x56
+
+    if-eq v2, v9, :cond_9
+
+    const/16 v9, 0x49
+
+    if-eq v2, v9, :cond_a
+
+    const v10, 0x1000004
+
+    const/16 v11, 0x4a
+
+    if-eq v2, v11, :cond_8
+
+    const/16 v12, 0x5a
+
+    if-eq v2, v12, :cond_a
+
+    const v13, 0x1000003
+
+    const/16 v14, 0x5b
+
+    if-eq v2, v14, :cond_0
+
+    packed-switch v2, :pswitch_data_0
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw v0
+
+    :pswitch_0
+    return v13
+
+    :cond_0
+    add-int/lit8 v2, p2, 0x1
+
+    :goto_0
+    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v15
+
+    if-ne v15, v14, :cond_1
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v14
+
+    if-eq v14, v4, :cond_7
+
+    if-eq v14, v6, :cond_6
+
+    if-eq v14, v8, :cond_5
+
+    if-eq v14, v12, :cond_4
+
+    if-eq v14, v9, :cond_3
+
+    if-eq v14, v11, :cond_2
+
+    packed-switch v14, :pswitch_data_1
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw v0
+
+    :pswitch_1
+    const v3, 0x1000003
+
+    goto :goto_1
+
+    :pswitch_2
+    const v3, 0x100000b
+
+    goto :goto_1
+
+    :pswitch_3
+    const v3, 0x100000a
+
+    goto :goto_1
+
+    :cond_2
+    const v3, 0x1000004
+
+    goto :goto_1
+
+    :cond_3
+    const v3, 0x1000001
+
+    goto :goto_1
+
+    :cond_4
+    const v3, 0x1000009
+
+    goto :goto_1
+
+    :cond_5
+    const v3, 0x100000c
+
+    goto :goto_1
+
+    :cond_6
+    add-int/lit8 v3, v2, 0x1
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
+
+    move-result v4
+
+    add-int/lit8 v4, v4, -0x1
+
+    invoke-virtual {v1, v3, v4}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v0
+
+    or-int v3, v0, v5
+
+    :cond_7
+    :goto_1
+    sub-int v2, v2, p2
+
+    shl-int/lit8 v0, v2, 0x1c
+
+    or-int/2addr v0, v3
+
+    return v0
+
+    :cond_8
+    return v10
+
+    :cond_9
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_a
+    :pswitch_4
+    return v7
+
+    :cond_b
+    add-int/lit8 v2, p2, 0x1
+
+    invoke-virtual/range {p1 .. p1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    add-int/lit8 v3, v3, -0x1
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v0
+
+    or-int/2addr v0, v5
+
+    return v0
+
+    :cond_c
+    return v3
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x42
+        :pswitch_4
+        :pswitch_4
+        :pswitch_0
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0x42
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+    .end packed-switch
+.end method
+
+.method public static g(Lq0/a/a/v;I[II)Z
+    .locals 19
+
+    move-object/from16 v0, p0
+
+    move/from16 v1, p1
+
+    aget v2, p2, p3
+
+    const/4 v3, 0x0
+
+    if-ne v2, v1, :cond_0
+
+    return v3
+
+    :cond_0
+    const v4, 0xfffffff
+
+    and-int/2addr v4, v1
+
+    const v5, 0x1000005
+
+    if-ne v4, v5, :cond_2
+
+    if-ne v2, v5, :cond_1
+
+    return v3
+
+    :cond_1
+    const v1, 0x1000005
+
+    :cond_2
+    const/4 v4, 0x1
+
+    if-nez v2, :cond_3
+
+    aput v1, p2, p3
+
+    return v4
+
+    :cond_3
+    const/high16 v6, -0x10000000
+
+    and-int v7, v2, v6
+
+    const/high16 v8, 0x1000000
+
+    const/high16 v9, 0xf000000
+
+    const/high16 v10, 0x2000000
+
+    if-nez v7, :cond_7
+
+    and-int v11, v2, v9
+
+    if-ne v11, v10, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    if-ne v2, v5, :cond_15
+
+    and-int v0, v1, v6
+
+    if-nez v0, :cond_6
+
+    and-int v0, v1, v9
+
+    if-ne v0, v10, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    const/high16 v1, 0x1000000
+
+    :cond_6
+    :goto_0
+    move v8, v1
+
+    goto/16 :goto_6
+
+    :cond_7
+    :goto_1
+    if-ne v1, v5, :cond_8
+
+    return v3
+
+    :cond_8
+    const/high16 v5, -0x1000000
+
+    and-int v11, v1, v5
+
+    and-int/2addr v5, v2
+
+    const-string v12, "java/lang/Object"
+
+    if-ne v11, v5, :cond_11
+
+    and-int v5, v2, v9
+
+    if-ne v5, v10, :cond_10
+
+    and-int v5, v1, v6
+
+    or-int/2addr v5, v10
+
+    const v6, 0xfffff
+
+    and-int/2addr v1, v6
+
+    and-int/2addr v6, v2
+
+    int-to-long v7, v1
+
+    int-to-long v9, v6
+
+    const/16 v11, 0x20
+
+    shl-long/2addr v9, v11
+
+    or-long v16, v7, v9
+
+    add-int v7, v1, v6
+
+    const/16 v8, 0x82
+
+    invoke-static {v8, v7}, Lq0/a/a/v;->r(II)I
+
+    move-result v7
+
+    invoke-virtual {v0, v7}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v9
+
+    :goto_2
+    if-eqz v9, :cond_a
+
+    iget v10, v9, Lq0/a/a/u;->b:I
+
+    if-ne v10, v8, :cond_9
+
+    iget v10, v9, Lq0/a/a/v$a;->h:I
+
+    if-ne v10, v7, :cond_9
+
+    iget-wide v10, v9, Lq0/a/a/u;->f:J
+
+    cmp-long v13, v10, v16
+
+    if-nez v13, :cond_9
+
+    iget v0, v9, Lq0/a/a/u;->g:I
+
+    goto/16 :goto_4
+
+    :cond_9
+    iget-object v9, v9, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_2
+
+    :cond_a
+    iget-object v8, v0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    aget-object v1, v8, v1
+
+    iget-object v1, v1, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    aget-object v6, v8, v6
+
+    iget-object v6, v6, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    iget-object v8, v0, Lq0/a/a/v;->a:Lq0/a/a/f;
+
+    if-eqz v8, :cond_f
+
+    const-class v8, Lq0/a/a/f;
+
+    invoke-virtual {v8}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v8
+
+    const/16 v9, 0x2e
+
+    const/16 v10, 0x2f
+
+    :try_start_0
+    invoke-virtual {v1, v10, v9}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-static {v11, v3, v8}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
+
+    move-result-object v11
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
+
+    :try_start_1
+    invoke-virtual {v6, v10, v9}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
+
+    move-result-object v13
+
+    invoke-static {v13, v3, v8}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
+
+    move-result-object v8
+    :try_end_1
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_0
+
+    invoke-virtual {v11, v8}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v13
+
+    if-eqz v13, :cond_b
+
+    move-object v12, v1
+
+    goto :goto_3
+
+    :cond_b
+    invoke-virtual {v8, v11}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_c
+
+    move-object v12, v6
+
+    goto :goto_3
+
+    :cond_c
+    invoke-virtual {v11}, Ljava/lang/Class;->isInterface()Z
+
+    move-result v1
+
+    if-nez v1, :cond_e
+
+    invoke-virtual {v8}, Ljava/lang/Class;->isInterface()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_d
+
+    goto :goto_3
+
+    :cond_d
+    invoke-virtual {v11}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
+
+    move-result-object v11
+
+    invoke-virtual {v11, v8}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_d
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v9, v10}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
+
+    move-result-object v12
+
+    :cond_e
+    :goto_3
+    invoke-virtual {v0, v12}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v1
+
+    new-instance v6, Lq0/a/a/v$a;
+
+    iget v14, v0, Lq0/a/a/v;->k:I
+
+    const/16 v15, 0x82
+
+    move-object v13, v6
+
+    move/from16 v18, v7
+
+    invoke-direct/range {v13 .. v18}, Lq0/a/a/v$a;-><init>(IIJI)V
+
+    invoke-virtual {v0, v6}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    iput v1, v6, Lq0/a/a/u;->g:I
+
+    move v0, v1
+
+    :goto_4
+    or-int v8, v5, v0
+
+    goto :goto_6
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/lang/TypeNotPresentException;
+
+    invoke-direct {v1, v6, v0}, Ljava/lang/TypeNotPresentException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    move-exception v0
+
+    new-instance v2, Ljava/lang/TypeNotPresentException;
+
+    invoke-direct {v2, v1, v0}, Ljava/lang/TypeNotPresentException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v2
+
+    :cond_f
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_10
+    and-int/2addr v1, v6
+
+    add-int/2addr v1, v6
+
+    or-int/2addr v1, v10
+
+    invoke-virtual {v0, v12}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v0
+
+    :goto_5
+    or-int v8, v1, v0
+
+    goto :goto_6
+
+    :cond_11
+    and-int v5, v1, v6
+
+    if-nez v5, :cond_12
+
+    and-int v11, v1, v9
+
+    if-ne v11, v10, :cond_15
+
+    :cond_12
+    if-eqz v5, :cond_13
+
+    and-int/2addr v1, v9
+
+    if-eq v1, v10, :cond_13
+
+    add-int/2addr v5, v6
+
+    :cond_13
+    if-eqz v7, :cond_14
+
+    and-int v1, v2, v9
+
+    if-eq v1, v10, :cond_14
+
+    add-int/2addr v7, v6
+
+    :cond_14
+    invoke-static {v5, v7}, Ljava/lang/Math;->min(II)I
+
+    move-result v1
+
+    or-int/2addr v1, v10
+
+    invoke-virtual {v0, v12}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v0
+
+    goto :goto_5
+
+    :cond_15
+    :goto_6
+    if-eq v8, v2, :cond_16
+
+    aput v8, p2, p3
+
+    return v4
+
+    :cond_16
+    return v3
+.end method
+
+
+# virtual methods
+.method public final a(Lq0/a/a/r;)V
+    .locals 14
+
+    iget-object v0, p0, Lq0/a/a/m;->b:[I
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    const/4 v4, 0x0
+
+    :goto_1
+    array-length v5, v0
+
+    const v6, 0x1000003
+
+    const v7, 0x1000004
+
+    const/4 v8, 0x2
+
+    const/4 v9, 0x1
+
+    if-ge v2, v5, :cond_3
+
+    aget v5, v0, v2
+
+    if-eq v5, v7, :cond_1
+
+    if-ne v5, v6, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    const/4 v8, 0x1
+
+    :cond_1
+    :goto_2
+    add-int/2addr v2, v8
+
+    const/high16 v6, 0x1000000
+
+    add-int/lit8 v4, v4, 0x1
+
+    if-ne v5, v6, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    add-int/2addr v3, v4
+
+    goto :goto_0
+
+    :cond_3
+    iget-object v2, p0, Lq0/a/a/m;->c:[I
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    :goto_3
+    array-length v10, v2
+
+    if-ge v4, v10, :cond_6
+
+    aget v10, v2, v4
+
+    if-eq v10, v7, :cond_5
+
+    if-ne v10, v6, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    const/4 v10, 0x1
+
+    goto :goto_5
+
+    :cond_5
+    :goto_4
+    const/4 v10, 0x2
+
+    :goto_5
+    add-int/2addr v4, v10
+
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_3
+
+    :cond_6
+    iget-object v4, p0, Lq0/a/a/m;->a:Lq0/a/a/p;
+
+    iget v4, v4, Lq0/a/a/p;->d:I
+
+    invoke-virtual {p1, v4, v3, v5}, Lq0/a/a/r;->A(III)I
+
+    const/4 v4, 0x3
+
+    const/4 v10, 0x0
+
+    :goto_6
+    add-int/lit8 v11, v3, -0x1
+
+    if-lez v3, :cond_9
+
+    aget v3, v0, v10
+
+    if-eq v3, v7, :cond_8
+
+    if-ne v3, v6, :cond_7
+
+    goto :goto_7
+
+    :cond_7
+    const/4 v12, 0x1
+
+    goto :goto_8
+
+    :cond_8
+    :goto_7
+    const/4 v12, 0x2
+
+    :goto_8
+    add-int/2addr v10, v12
+
+    add-int/lit8 v12, v4, 0x1
+
+    iget-object v13, p1, Lq0/a/a/r;->W:[I
+
+    aput v3, v13, v4
+
+    move v3, v11
+
+    move v4, v12
+
+    goto :goto_6
+
+    :cond_9
+    :goto_9
+    add-int/lit8 v0, v5, -0x1
+
+    if-lez v5, :cond_c
+
+    aget v3, v2, v1
+
+    if-eq v3, v7, :cond_b
+
+    if-ne v3, v6, :cond_a
+
+    goto :goto_a
+
+    :cond_a
+    const/4 v5, 0x1
+
+    goto :goto_b
+
+    :cond_b
+    :goto_a
+    const/4 v5, 0x2
+
+    :goto_b
+    add-int/2addr v1, v5
+
+    add-int/lit8 v5, v4, 0x1
+
+    iget-object v10, p1, Lq0/a/a/r;->W:[I
+
+    aput v3, v10, v4
+
+    move v4, v5
+
+    move v5, v0
+
+    goto :goto_9
+
+    :cond_c
+    invoke-virtual {p1}, Lq0/a/a/r;->z()V
+
+    return-void
+.end method
+
+.method public b(IILq0/a/a/u;Lq0/a/a/v;)V
+    .locals 16
+
+    move-object/from16 v0, p0
+
+    move/from16 v1, p1
+
+    move/from16 v2, p2
+
+    move-object/from16 v3, p3
+
+    move-object/from16 v4, p4
+
+    const v6, 0x1000002
+
+    const/high16 v7, 0x2000000
+
+    const v8, 0x1000001
+
+    const v9, 0x1000003
+
+    const v10, 0x1000004
+
+    const/high16 v11, 0x1000000
+
+    packed-switch v1, :pswitch_data_0
+
+    packed-switch v1, :pswitch_data_1
+
+    const/high16 v12, 0x5000000
+
+    const/high16 v14, 0x4000000
+
+    const/high16 v15, 0xf000000
+
+    const/4 v5, 0x2
+
+    const/4 v13, 0x1
+
+    packed-switch v1, :pswitch_data_2
+
+    const/16 v14, 0x5b
+
+    const/4 v15, 0x0
+
+    const/4 v12, 0x4
+
+    packed-switch v1, :pswitch_data_3
+
+    packed-switch v1, :pswitch_data_4
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw v1
+
+    :pswitch_0
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->j(I)V
+
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :pswitch_1
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    if-ne v2, v14, :cond_0
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :cond_0
+    invoke-virtual {v4, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v1
+
+    or-int/2addr v1, v7
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_2
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    if-ne v2, v14, :cond_1
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v14}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :cond_1
+    const/high16 v2, 0x12000000
+
+    invoke-virtual {v4, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v1
+
+    or-int/2addr v1, v2
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_3
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    packed-switch v2, :pswitch_data_5
+
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {v1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw v1
+
+    :pswitch_4
+    const v1, 0x11000004
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_5
+    const v1, 0x11000001
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_6
+    const v1, 0x1100000c
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_7
+    const v1, 0x1100000a
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_8
+    const v1, 0x11000003
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_9
+    const v1, 0x11000002
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_a
+    const v1, 0x1100000b
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_b
+    const v1, 0x11000009
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_c
+    const/high16 v1, 0x3000000
+
+    iget-object v3, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v4, v3, v2}, Lq0/a/a/v;->p(Ljava/lang/String;I)I
+
+    move-result v2
+
+    or-int/2addr v1, v2
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_d
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->k(Ljava/lang/String;)V
+
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :pswitch_e
+    iget-object v2, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->k(Ljava/lang/String;)V
+
+    const/16 v2, 0xb8
+
+    if-eq v1, v2, :cond_4
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v2
+
+    const/16 v6, 0xb7
+
+    if-ne v1, v6, :cond_4
+
+    iget-object v1, v3, Lq0/a/a/u;->d:Ljava/lang/String;
+
+    invoke-virtual {v1, v15}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v6, 0x3c
+
+    if-ne v1, v6, :cond_4
+
+    iget-object v1, v0, Lq0/a/a/m;->i:[I
+
+    if-nez v1, :cond_2
+
+    new-array v1, v5, [I
+
+    iput-object v1, v0, Lq0/a/a/m;->i:[I
+
+    :cond_2
+    iget-object v1, v0, Lq0/a/a/m;->i:[I
+
+    array-length v1, v1
+
+    iget v5, v0, Lq0/a/a/m;->h:I
+
+    if-lt v5, v1, :cond_3
+
+    add-int/2addr v5, v13
+
+    mul-int/lit8 v6, v1, 0x2
+
+    invoke-static {v5, v6}, Ljava/lang/Math;->max(II)I
+
+    move-result v5
+
+    new-array v5, v5, [I
+
+    iget-object v6, v0, Lq0/a/a/m;->i:[I
+
+    invoke-static {v6, v15, v5, v15, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v5, v0, Lq0/a/a/m;->i:[I
+
+    :cond_3
+    iget-object v1, v0, Lq0/a/a/m;->i:[I
+
+    iget v5, v0, Lq0/a/a/m;->h:I
+
+    add-int/lit8 v6, v5, 0x1
+
+    iput v6, v0, Lq0/a/a/m;->h:I
+
+    aput v2, v1, v5
+
+    :cond_4
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :pswitch_f
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->k(Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    goto/16 :goto_3
+
+    :pswitch_10
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :pswitch_11
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->k(Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :pswitch_12
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto/16 :goto_3
+
+    :pswitch_13
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "JSR/RET are not supported with computeFrames option"
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :pswitch_14
+    invoke-virtual {v0, v12}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v8}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_15
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v8}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_16
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v9}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_17
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v6}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_18
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v10}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_19
+    invoke-virtual {v0, v2, v8}, Lq0/a/a/m;->o(II)V
+
+    goto/16 :goto_3
+
+    :pswitch_1a
+    const/4 v1, 0x3
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v10}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_1b
+    invoke-virtual {v0, v12}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v9}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_1c
+    invoke-virtual {v0, v12}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v10}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_1d
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v2
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_1e
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v2
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v3
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v4
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v4}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v3}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_1f
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v2
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v3
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v3}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_20
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v2
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_21
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v2
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v3
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v3}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_22
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v2
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_23
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_24
+    invoke-virtual {v0, v5}, Lq0/a/a/m;->j(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_25
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_26
+    invoke-virtual {v0, v12}, Lq0/a/a/m;->j(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_27
+    const/4 v1, 0x3
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->j(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_28
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual {v0, v2, v1}, Lq0/a/a/m;->o(II)V
+
+    add-int/lit8 v1, v2, 0x1
+
+    invoke-virtual {v0, v1, v11}, Lq0/a/a/m;->o(II)V
+
+    if-lez v2, :cond_c
+
+    add-int/lit8 v1, v2, -0x1
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->f(I)I
+
+    move-result v2
+
+    if-eq v2, v10, :cond_7
+
+    if-ne v2, v9, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    and-int v3, v2, v15
+
+    if-eq v3, v14, :cond_6
+
+    if-ne v3, v12, :cond_c
+
+    :cond_6
+    const/high16 v3, 0x100000
+
+    or-int/2addr v2, v3
+
+    invoke-virtual {v0, v1, v2}, Lq0/a/a/m;->o(II)V
+
+    goto/16 :goto_3
+
+    :cond_7
+    :goto_0
+    invoke-virtual {v0, v1, v11}, Lq0/a/a/m;->o(II)V
+
+    goto/16 :goto_3
+
+    :pswitch_29
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    invoke-virtual {v0, v2, v1}, Lq0/a/a/m;->o(II)V
+
+    if-lez v2, :cond_c
+
+    add-int/lit8 v1, v2, -0x1
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->f(I)I
+
+    move-result v2
+
+    if-eq v2, v10, :cond_a
+
+    if-ne v2, v9, :cond_8
+
+    goto :goto_1
+
+    :cond_8
+    and-int v3, v2, v15
+
+    if-eq v3, v14, :cond_9
+
+    if-ne v3, v12, :cond_c
+
+    :cond_9
+    const/high16 v3, 0x100000
+
+    or-int/2addr v2, v3
+
+    invoke-virtual {v0, v1, v2}, Lq0/a/a/m;->o(II)V
+
+    goto/16 :goto_3
+
+    :cond_a
+    :goto_1
+    invoke-virtual {v0, v1, v11}, Lq0/a/a/m;->o(II)V
+
+    goto/16 :goto_3
+
+    :pswitch_2a
+    invoke-virtual {v0, v13}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual/range {p0 .. p0}, Lq0/a/a/m;->i()I
+
+    move-result v1
+
+    const v2, 0x1000005
+
+    if-ne v1, v2, :cond_b
+
+    goto :goto_2
+
+    :cond_b
+    const/high16 v2, -0x10000000
+
+    add-int/2addr v1, v2
+
+    :goto_2
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_2b
+    invoke-virtual {v0, v5}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v9}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_2c
+    invoke-virtual {v0, v5}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v6}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_2d
+    invoke-virtual {v0, v5}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v10}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_2e
+    invoke-virtual {v0, v5}, Lq0/a/a/m;->j(I)V
+
+    invoke-virtual {v0, v8}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_2f
+    invoke-virtual {v0, v2}, Lq0/a/a/m;->f(I)I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto/16 :goto_3
+
+    :pswitch_30
+    iget v1, v3, Lq0/a/a/u;->b:I
+
+    packed-switch v1, :pswitch_data_6
+
+    packed-switch v1, :pswitch_data_7
+
+    new-instance v1, Ljava/lang/AssertionError;
+
+    invoke-direct {v1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v1
+
+    :pswitch_31
+    iget-object v1, v3, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v4, v1}, Lq0/a/a/m;->m(Lq0/a/a/v;Ljava/lang/String;)V
+
+    goto :goto_3
+
+    :pswitch_32
+    const-string v1, "java/lang/invoke/MethodType"
+
+    invoke-virtual {v4, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v1
+
+    or-int/2addr v1, v7
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_33
+    const-string v1, "java/lang/invoke/MethodHandle"
+
+    invoke-virtual {v4, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v1
+
+    or-int/2addr v1, v7
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_34
+    const-string v1, "java/lang/String"
+
+    invoke-virtual {v4, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v1
+
+    or-int/2addr v1, v7
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_35
+    const-string v1, "java/lang/Class"
+
+    invoke-virtual {v4, v1}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v1
+
+    or-int/2addr v1, v7
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_36
+    invoke-virtual {v0, v9}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_37
+    invoke-virtual {v0, v10}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_38
+    invoke-virtual {v0, v6}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_39
+    invoke-virtual {v0, v8}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_3a
+    invoke-virtual {v0, v9}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_3b
+    invoke-virtual {v0, v6}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_3c
+    invoke-virtual {v0, v10}, Lq0/a/a/m;->l(I)V
+
+    invoke-virtual {v0, v11}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_3d
+    invoke-virtual {v0, v8}, Lq0/a/a/m;->l(I)V
+
+    goto :goto_3
+
+    :pswitch_3e
+    const v1, 0x1000005
+
+    invoke-virtual {v0, v1}, Lq0/a/a/m;->l(I)V
+
+    :cond_c
+    :goto_3
+    :pswitch_3f
+    return-void
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_3f
+        :pswitch_3e
+        :pswitch_3d
+        :pswitch_3d
+        :pswitch_3d
+        :pswitch_3d
+        :pswitch_3d
+        :pswitch_3d
+        :pswitch_3d
+        :pswitch_3c
+        :pswitch_3c
+        :pswitch_3b
+        :pswitch_3b
+        :pswitch_3b
+        :pswitch_3a
+        :pswitch_3a
+        :pswitch_3d
+        :pswitch_3d
+        :pswitch_30
+    .end packed-switch
+
+    :pswitch_data_1
+    .packed-switch 0x15
+        :pswitch_3d
+        :pswitch_3c
+        :pswitch_3b
+        :pswitch_3a
+        :pswitch_2f
+    .end packed-switch
+
+    :pswitch_data_2
+    .packed-switch 0x2e
+        :pswitch_2e
+        :pswitch_2d
+        :pswitch_2c
+        :pswitch_2b
+        :pswitch_2a
+        :pswitch_2e
+        :pswitch_2e
+        :pswitch_2e
+        :pswitch_29
+        :pswitch_28
+        :pswitch_29
+        :pswitch_28
+        :pswitch_29
+    .end packed-switch
+
+    :pswitch_data_3
+    .packed-switch 0x4f
+        :pswitch_27
+        :pswitch_26
+        :pswitch_27
+        :pswitch_26
+        :pswitch_27
+        :pswitch_27
+        :pswitch_27
+        :pswitch_27
+        :pswitch_25
+        :pswitch_24
+        :pswitch_23
+        :pswitch_22
+        :pswitch_21
+        :pswitch_20
+        :pswitch_1f
+        :pswitch_1e
+        :pswitch_1d
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_2c
+        :pswitch_1b
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_2c
+        :pswitch_1b
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_2c
+        :pswitch_1b
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_2c
+        :pswitch_1b
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_2c
+        :pswitch_1b
+        :pswitch_3f
+        :pswitch_3f
+        :pswitch_3f
+        :pswitch_3f
+        :pswitch_2e
+        :pswitch_1a
+        :pswitch_2e
+        :pswitch_1a
+        :pswitch_2e
+        :pswitch_1a
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_2e
+        :pswitch_1c
+        :pswitch_19
+        :pswitch_18
+        :pswitch_17
+        :pswitch_16
+        :pswitch_2e
+        :pswitch_2c
+        :pswitch_2b
+        :pswitch_15
+        :pswitch_18
+        :pswitch_16
+        :pswitch_2e
+        :pswitch_2d
+        :pswitch_2c
+        :pswitch_3f
+        :pswitch_3f
+        :pswitch_3f
+        :pswitch_14
+        :pswitch_2e
+        :pswitch_2e
+        :pswitch_14
+        :pswitch_14
+        :pswitch_25
+        :pswitch_25
+        :pswitch_25
+        :pswitch_25
+        :pswitch_25
+        :pswitch_25
+        :pswitch_24
+        :pswitch_24
+        :pswitch_24
+        :pswitch_24
+        :pswitch_24
+        :pswitch_24
+        :pswitch_24
+        :pswitch_24
+        :pswitch_3f
+        :pswitch_13
+        :pswitch_13
+        :pswitch_25
+        :pswitch_25
+        :pswitch_25
+        :pswitch_24
+        :pswitch_25
+        :pswitch_24
+        :pswitch_25
+        :pswitch_3f
+        :pswitch_12
+        :pswitch_11
+        :pswitch_10
+        :pswitch_f
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_e
+        :pswitch_d
+        :pswitch_c
+        :pswitch_3
+        :pswitch_2
+        :pswitch_15
+        :pswitch_25
+        :pswitch_1
+        :pswitch_15
+        :pswitch_25
+        :pswitch_25
+    .end packed-switch
+
+    :pswitch_data_4
+    .packed-switch 0xc5
+        :pswitch_0
+        :pswitch_25
+        :pswitch_25
+    .end packed-switch
+
+    :pswitch_data_5
+    .packed-switch 0x4
+        :pswitch_b
+        :pswitch_a
+        :pswitch_9
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+    .end packed-switch
+
+    :pswitch_data_6
+    .packed-switch 0x3
+        :pswitch_39
+        :pswitch_38
+        :pswitch_37
+        :pswitch_36
+        :pswitch_35
+        :pswitch_34
+    .end packed-switch
+
+    :pswitch_data_7
+    .packed-switch 0xf
+        :pswitch_33
+        :pswitch_32
+        :pswitch_31
+    .end packed-switch
+.end method
+
+.method public final e(Lq0/a/a/v;I)I
+    .locals 8
+
+    const v0, 0x1000006
+
+    if-eq p2, v0, :cond_0
+
+    const/high16 v1, -0x1000000
+
+    and-int/2addr v1, p2
+
+    const/high16 v2, 0x3000000
+
+    if-ne v1, v2, :cond_5
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    iget v2, p0, Lq0/a/a/m;->h:I
+
+    if-ge v1, v2, :cond_5
+
+    iget-object v2, p0, Lq0/a/a/m;->i:[I
+
+    aget v2, v2, v1
+
+    const/high16 v3, -0x10000000
+
+    and-int/2addr v3, v2
+
+    const/high16 v4, 0xf000000
+
+    and-int/2addr v4, v2
+
+    const v5, 0xfffff
+
+    and-int v6, v2, v5
+
+    const/high16 v7, 0x4000000
+
+    if-ne v4, v7, :cond_1
+
+    iget-object v2, p0, Lq0/a/a/m;->b:[I
+
+    aget v2, v2, v6
+
+    :goto_1
+    add-int/2addr v2, v3
+
+    goto :goto_2
+
+    :cond_1
+    const/high16 v7, 0x5000000
+
+    if-ne v4, v7, :cond_2
+
+    iget-object v2, p0, Lq0/a/a/m;->c:[I
+
+    array-length v4, v2
+
+    sub-int/2addr v4, v6
+
+    aget v2, v2, v4
+
+    goto :goto_1
+
+    :cond_2
+    :goto_2
+    if-ne p2, v2, :cond_4
+
+    const/high16 v1, 0x2000000
+
+    if-ne p2, v0, :cond_3
+
+    iget-object p2, p1, Lq0/a/a/v;->d:Ljava/lang/String;
+
+    invoke-virtual {p1, p2}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result p1
+
+    :goto_3
+    or-int/2addr p1, v1
+
+    return p1
+
+    :cond_3
+    and-int/2addr p2, v5
+
+    iget-object v0, p1, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    aget-object p2, v0, p2
+
+    iget-object p2, p2, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {p1, p2}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result p1
+
+    goto :goto_3
+
+    :cond_4
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_5
+    return p2
+.end method
+
+.method public final f(I)I
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/m;->d:[I
+
+    const/high16 v1, 0x4000000
+
+    if-eqz v0, :cond_2
+
+    array-length v2, v0
+
+    if-lt p1, v2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    aget v2, v0, p1
+
+    if-nez v2, :cond_1
+
+    or-int v2, p1, v1
+
+    aput v2, v0, p1
+
+    :cond_1
+    return v2
+
+    :cond_2
+    :goto_0
+    or-int/2addr p1, v1
+
+    return p1
+.end method
+
+.method public final h(Lq0/a/a/v;Lq0/a/a/m;I)Z
+    .locals 19
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    move-object/from16 v2, p2
+
+    move/from16 v3, p3
+
+    iget-object v4, v0, Lq0/a/a/m;->b:[I
+
+    array-length v4, v4
+
+    iget-object v5, v0, Lq0/a/a/m;->c:[I
+
+    array-length v5, v5
+
+    iget-object v6, v2, Lq0/a/a/m;->b:[I
+
+    if-nez v6, :cond_0
+
+    new-array v6, v4, [I
+
+    iput-object v6, v2, Lq0/a/a/m;->b:[I
+
+    const/4 v6, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v6, 0x0
+
+    :goto_0
+    const/4 v9, 0x0
+
+    :goto_1
+    const/high16 v10, 0x5000000
+
+    const/high16 v11, 0x4000000
+
+    const/high16 v12, 0xf000000
+
+    const/high16 v13, -0x10000000
+
+    const v14, 0x1000003
+
+    const v15, 0x1000004
+
+    const/high16 v16, 0x100000
+
+    const v17, 0xfffff
+
+    if-ge v9, v4, :cond_8
+
+    iget-object v7, v0, Lq0/a/a/m;->d:[I
+
+    if-eqz v7, :cond_6
+
+    array-length v8, v7
+
+    if-ge v9, v8, :cond_6
+
+    aget v7, v7, v9
+
+    if-nez v7, :cond_1
+
+    iget-object v7, v0, Lq0/a/a/m;->b:[I
+
+    aget v15, v7, v9
+
+    goto :goto_3
+
+    :cond_1
+    and-int v8, v7, v13
+
+    and-int/2addr v12, v7
+
+    if-ne v12, v11, :cond_4
+
+    iget-object v10, v0, Lq0/a/a/m;->b:[I
+
+    and-int v11, v7, v17
+
+    aget v10, v10, v11
+
+    add-int/2addr v8, v10
+
+    and-int v7, v7, v16
+
+    if-eqz v7, :cond_3
+
+    if-eq v8, v15, :cond_2
+
+    if-ne v8, v14, :cond_3
+
+    :cond_2
+    :goto_2
+    const/high16 v15, 0x1000000
+
+    goto :goto_3
+
+    :cond_3
+    move v15, v8
+
+    goto :goto_3
+
+    :cond_4
+    if-ne v12, v10, :cond_5
+
+    iget-object v10, v0, Lq0/a/a/m;->c:[I
+
+    and-int v11, v7, v17
+
+    sub-int v11, v5, v11
+
+    aget v10, v10, v11
+
+    add-int/2addr v8, v10
+
+    and-int v7, v7, v16
+
+    if-eqz v7, :cond_3
+
+    if-eq v8, v15, :cond_2
+
+    if-ne v8, v14, :cond_3
+
+    goto :goto_2
+
+    :cond_5
+    move v15, v7
+
+    goto :goto_3
+
+    :cond_6
+    iget-object v7, v0, Lq0/a/a/m;->b:[I
+
+    aget v15, v7, v9
+
+    :goto_3
+    iget-object v7, v0, Lq0/a/a/m;->i:[I
+
+    if-eqz v7, :cond_7
+
+    invoke-virtual {v0, v1, v15}, Lq0/a/a/m;->e(Lq0/a/a/v;I)I
+
+    move-result v15
+
+    :cond_7
+    iget-object v7, v2, Lq0/a/a/m;->b:[I
+
+    invoke-static {v1, v15, v7, v9}, Lq0/a/a/m;->g(Lq0/a/a/v;I[II)Z
+
+    move-result v7
+
+    or-int/2addr v6, v7
+
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_1
+
+    :cond_8
+    if-lez v3, :cond_b
+
+    const/4 v5, 0x0
+
+    :goto_4
+    if-ge v5, v4, :cond_9
+
+    iget-object v7, v0, Lq0/a/a/m;->b:[I
+
+    aget v7, v7, v5
+
+    iget-object v8, v2, Lq0/a/a/m;->b:[I
+
+    invoke-static {v1, v7, v8, v5}, Lq0/a/a/m;->g(Lq0/a/a/v;I[II)Z
+
+    move-result v7
+
+    or-int/2addr v6, v7
+
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_4
+
+    :cond_9
+    iget-object v4, v2, Lq0/a/a/m;->c:[I
+
+    if-nez v4, :cond_a
+
+    const/4 v4, 0x1
+
+    new-array v5, v4, [I
+
+    iput-object v5, v2, Lq0/a/a/m;->c:[I
+
+    const/4 v8, 0x1
+
+    goto :goto_5
+
+    :cond_a
+    move v8, v6
+
+    :goto_5
+    iget-object v2, v2, Lq0/a/a/m;->c:[I
+
+    const/4 v7, 0x0
+
+    invoke-static {v1, v3, v2, v7}, Lq0/a/a/m;->g(Lq0/a/a/v;I[II)Z
+
+    move-result v1
+
+    or-int/2addr v1, v8
+
+    return v1
+
+    :cond_b
+    const/4 v4, 0x1
+
+    const/4 v7, 0x0
+
+    iget-object v3, v0, Lq0/a/a/m;->c:[I
+
+    array-length v3, v3
+
+    iget-short v8, v0, Lq0/a/a/m;->f:S
+
+    add-int/2addr v3, v8
+
+    iget-object v8, v2, Lq0/a/a/m;->c:[I
+
+    if-nez v8, :cond_c
+
+    iget-short v6, v0, Lq0/a/a/m;->g:S
+
+    add-int/2addr v6, v3
+
+    new-array v6, v6, [I
+
+    iput-object v6, v2, Lq0/a/a/m;->c:[I
+
+    const/4 v8, 0x1
+
+    goto :goto_6
+
+    :cond_c
+    move v8, v6
+
+    :goto_6
+    const/4 v4, 0x0
+
+    :goto_7
+    if-ge v4, v3, :cond_e
+
+    iget-object v6, v0, Lq0/a/a/m;->c:[I
+
+    aget v6, v6, v4
+
+    iget-object v9, v0, Lq0/a/a/m;->i:[I
+
+    if-eqz v9, :cond_d
+
+    invoke-virtual {v0, v1, v6}, Lq0/a/a/m;->e(Lq0/a/a/v;I)I
+
+    move-result v6
+
+    :cond_d
+    iget-object v9, v2, Lq0/a/a/m;->c:[I
+
+    invoke-static {v1, v6, v9, v4}, Lq0/a/a/m;->g(Lq0/a/a/v;I[II)Z
+
+    move-result v6
+
+    or-int/2addr v8, v6
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_7
+
+    :cond_e
+    :goto_8
+    iget-short v4, v0, Lq0/a/a/m;->g:S
+
+    if-ge v7, v4, :cond_14
+
+    iget-object v4, v0, Lq0/a/a/m;->e:[I
+
+    aget v4, v4, v7
+
+    and-int v6, v4, v13
+
+    and-int v9, v4, v12
+
+    if-ne v9, v11, :cond_11
+
+    iget-object v9, v0, Lq0/a/a/m;->b:[I
+
+    and-int v18, v4, v17
+
+    aget v9, v9, v18
+
+    add-int/2addr v6, v9
+
+    and-int v4, v4, v16
+
+    if-eqz v4, :cond_10
+
+    if-eq v6, v15, :cond_f
+
+    if-ne v6, v14, :cond_10
+
+    :cond_f
+    :goto_9
+    const/high16 v4, 0x1000000
+
+    goto :goto_a
+
+    :cond_10
+    move v4, v6
+
+    goto :goto_a
+
+    :cond_11
+    if-ne v9, v10, :cond_12
+
+    iget-object v9, v0, Lq0/a/a/m;->c:[I
+
+    and-int v18, v4, v17
+
+    sub-int v18, v5, v18
+
+    aget v9, v9, v18
+
+    add-int/2addr v6, v9
+
+    and-int v4, v4, v16
+
+    if-eqz v4, :cond_10
+
+    if-eq v6, v15, :cond_f
+
+    if-ne v6, v14, :cond_10
+
+    goto :goto_9
+
+    :cond_12
+    :goto_a
+    iget-object v6, v0, Lq0/a/a/m;->i:[I
+
+    if-eqz v6, :cond_13
+
+    invoke-virtual {v0, v1, v4}, Lq0/a/a/m;->e(Lq0/a/a/v;I)I
+
+    move-result v4
+
+    :cond_13
+    iget-object v6, v2, Lq0/a/a/m;->c:[I
+
+    add-int v9, v3, v7
+
+    invoke-static {v1, v4, v6, v9}, Lq0/a/a/m;->g(Lq0/a/a/v;I[II)Z
+
+    move-result v4
+
+    or-int/2addr v8, v4
+
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_8
+
+    :cond_14
+    return v8
+.end method
+
+.method public final i()I
+    .locals 2
+
+    iget-short v0, p0, Lq0/a/a/m;->g:S
+
+    if-lez v0, :cond_0
+
+    iget-object v1, p0, Lq0/a/a/m;->e:[I
+
+    add-int/lit8 v0, v0, -0x1
+
+    int-to-short v0, v0
+
+    iput-short v0, p0, Lq0/a/a/m;->g:S
+
+    aget v0, v1, v0
+
+    return v0
+
+    :cond_0
+    const/high16 v0, 0x5000000
+
+    iget-short v1, p0, Lq0/a/a/m;->f:S
+
+    add-int/lit8 v1, v1, -0x1
+
+    int-to-short v1, v1
+
+    iput-short v1, p0, Lq0/a/a/m;->f:S
+
+    neg-int v1, v1
+
+    or-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final j(I)V
+    .locals 2
+
+    iget-short v0, p0, Lq0/a/a/m;->g:S
+
+    if-lt v0, p1, :cond_0
+
+    sub-int/2addr v0, p1
+
+    int-to-short p1, v0
+
+    iput-short p1, p0, Lq0/a/a/m;->g:S
+
+    goto :goto_0
+
+    :cond_0
+    iget-short v1, p0, Lq0/a/a/m;->f:S
+
+    sub-int/2addr p1, v0
+
+    sub-int/2addr v1, p1
+
+    int-to-short p1, v1
+
+    iput-short p1, p0, Lq0/a/a/m;->f:S
+
+    const/4 p1, 0x0
+
+    iput-short p1, p0, Lq0/a/a/m;->g:S
+
+    :goto_0
+    return-void
+.end method
+
+.method public final k(Ljava/lang/String;)V
+    .locals 4
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x2
+
+    const/16 v3, 0x28
+
+    if-ne v0, v3, :cond_0
+
+    invoke-static {p1}, Lq0/a/a/w;->b(Ljava/lang/String;)I
+
+    move-result p1
+
+    shr-int/2addr p1, v2
+
+    sub-int/2addr p1, v1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/m;->j(I)V
+
+    goto :goto_1
+
+    :cond_0
+    const/16 p1, 0x4a
+
+    if-eq v0, p1, :cond_2
+
+    const/16 p1, 0x44
+
+    if-ne v0, p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0, v1}, Lq0/a/a/m;->j(I)V
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    invoke-virtual {p0, v2}, Lq0/a/a/m;->j(I)V
+
+    :goto_1
+    return-void
+.end method
+
+.method public final l(I)V
+    .locals 4
+
+    iget-object v0, p0, Lq0/a/a/m;->e:[I
+
+    if-nez v0, :cond_0
+
+    const/16 v0, 0xa
+
+    new-array v0, v0, [I
+
+    iput-object v0, p0, Lq0/a/a/m;->e:[I
+
+    :cond_0
+    iget-object v0, p0, Lq0/a/a/m;->e:[I
+
+    array-length v0, v0
+
+    iget-short v1, p0, Lq0/a/a/m;->g:S
+
+    if-lt v1, v0, :cond_1
+
+    add-int/lit8 v1, v1, 0x1
+
+    mul-int/lit8 v2, v0, 0x2
+
+    invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
+
+    move-result v1
+
+    new-array v1, v1, [I
+
+    iget-object v2, p0, Lq0/a/a/m;->e:[I
+
+    const/4 v3, 0x0
+
+    invoke-static {v2, v3, v1, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v1, p0, Lq0/a/a/m;->e:[I
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/m;->e:[I
+
+    iget-short v1, p0, Lq0/a/a/m;->g:S
+
+    add-int/lit8 v2, v1, 0x1
+
+    int-to-short v2, v2
+
+    iput-short v2, p0, Lq0/a/a/m;->g:S
+
+    aput p1, v0, v1
+
+    iget-short p1, p0, Lq0/a/a/m;->f:S
+
+    add-int/2addr p1, v2
+
+    int-to-short p1, p1
+
+    iget-object v0, p0, Lq0/a/a/m;->a:Lq0/a/a/p;
+
+    iget-short v1, v0, Lq0/a/a/p;->h:S
+
+    if-le p1, v1, :cond_2
+
+    iput-short p1, v0, Lq0/a/a/p;->h:S
+
+    :cond_2
+    return-void
+.end method
+
+.method public final m(Lq0/a/a/v;Ljava/lang/String;)V
+    .locals 3
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p2, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v2, 0x28
+
+    if-ne v1, v2, :cond_0
+
+    const/16 v0, 0x29
+
+    invoke-virtual {p2, v0}, Ljava/lang/String;->indexOf(I)I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    :cond_0
+    invoke-static {p1, p2, v0}, Lq0/a/a/m;->d(Lq0/a/a/v;Ljava/lang/String;I)I
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p0, p1}, Lq0/a/a/m;->l(I)V
+
+    const p2, 0x1000004
+
+    if-eq p1, p2, :cond_1
+
+    const p2, 0x1000003
+
+    if-ne p1, p2, :cond_2
+
+    :cond_1
+    const/high16 p1, 0x1000000
+
+    invoke-virtual {p0, p1}, Lq0/a/a/m;->l(I)V
+
+    :cond_2
+    return-void
+.end method
+
+.method public final n(Lq0/a/a/v;ILjava/lang/String;I)V
+    .locals 7
+
+    new-array v0, p4, [I
+
+    iput-object v0, p0, Lq0/a/a/m;->b:[I
+
+    const/4 v1, 0x0
+
+    new-array v2, v1, [I
+
+    iput-object v2, p0, Lq0/a/a/m;->c:[I
+
+    and-int/lit8 v2, p2, 0x8
+
+    const/4 v3, 0x1
+
+    if-nez v2, :cond_1
+
+    const/high16 v2, 0x40000
+
+    and-int/2addr p2, v2
+
+    if-nez p2, :cond_0
+
+    const/high16 p2, 0x2000000
+
+    iget-object v2, p1, Lq0/a/a/v;->d:Ljava/lang/String;
+
+    invoke-virtual {p1, v2}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v2
+
+    or-int/2addr p2, v2
+
+    aput p2, v0, v1
+
+    goto :goto_0
+
+    :cond_0
+    const p2, 0x1000006
+
+    aput p2, v0, v1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :goto_0
+    invoke-static {p3}, Lq0/a/a/w;->a(Ljava/lang/String;)[Lq0/a/a/w;
+
+    move-result-object p2
+
+    array-length p3, p2
+
+    const/4 v0, 0x0
+
+    :goto_1
+    const/high16 v2, 0x1000000
+
+    if-ge v0, p3, :cond_4
+
+    aget-object v4, p2, v0
+
+    invoke-virtual {v4}, Lq0/a/a/w;->d()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-static {p1, v4, v1}, Lq0/a/a/m;->d(Lq0/a/a/v;Ljava/lang/String;I)I
+
+    move-result v4
+
+    iget-object v5, p0, Lq0/a/a/m;->b:[I
+
+    add-int/lit8 v6, v3, 0x1
+
+    aput v4, v5, v3
+
+    const v3, 0x1000004
+
+    if-eq v4, v3, :cond_3
+
+    const v3, 0x1000003
+
+    if-ne v4, v3, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    move v3, v6
+
+    goto :goto_3
+
+    :cond_3
+    :goto_2
+    iget-object v3, p0, Lq0/a/a/m;->b:[I
+
+    add-int/lit8 v4, v6, 0x1
+
+    aput v2, v3, v6
+
+    move v3, v4
+
+    :goto_3
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    :goto_4
+    if-ge v3, p4, :cond_5
+
+    iget-object p1, p0, Lq0/a/a/m;->b:[I
+
+    add-int/lit8 p2, v3, 0x1
+
+    aput v2, p1, v3
+
+    move v3, p2
+
+    goto :goto_4
+
+    :cond_5
+    return-void
+.end method
+
+.method public final o(II)V
+    .locals 4
+
+    iget-object v0, p0, Lq0/a/a/m;->d:[I
+
+    if-nez v0, :cond_0
+
+    const/16 v0, 0xa
+
+    new-array v0, v0, [I
+
+    iput-object v0, p0, Lq0/a/a/m;->d:[I
+
+    :cond_0
+    iget-object v0, p0, Lq0/a/a/m;->d:[I
+
+    array-length v0, v0
+
+    if-lt p1, v0, :cond_1
+
+    add-int/lit8 v1, p1, 0x1
+
+    mul-int/lit8 v2, v0, 0x2
+
+    invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
+
+    move-result v1
+
+    new-array v1, v1, [I
+
+    iget-object v2, p0, Lq0/a/a/m;->d:[I
+
+    const/4 v3, 0x0
+
+    invoke-static {v2, v3, v1, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v1, p0, Lq0/a/a/m;->d:[I
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/m;->d:[I
+
+    aput p2, v0, p1
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/n.smali b/com.discord/smali_classes2/q0/a/a/n.smali
new file mode 100644
index 0000000000..3f5925aa60
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/n.smali
@@ -0,0 +1,211 @@
+.class public final Lq0/a/a/n;
+.super Ljava/lang/Object;
+.source "Handle.java"
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:Ljava/lang/String;
+
+.field public final c:Ljava/lang/String;
+
+.field public final d:Ljava/lang/String;
+
+.field public final e:Z
+
+
+# direct methods
+.method public constructor <init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lq0/a/a/n;->a:I
+
+    iput-object p2, p0, Lq0/a/a/n;->b:Ljava/lang/String;
+
+    iput-object p3, p0, Lq0/a/a/n;->c:Ljava/lang/String;
+
+    iput-object p4, p0, Lq0/a/a/n;->d:Ljava/lang/String;
+
+    iput-boolean p5, p0, Lq0/a/a/n;->e:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lq0/a/a/n;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_1
+
+    return v2
+
+    :cond_1
+    check-cast p1, Lq0/a/a/n;
+
+    iget v1, p0, Lq0/a/a/n;->a:I
+
+    iget v3, p1, Lq0/a/a/n;->a:I
+
+    if-ne v1, v3, :cond_2
+
+    iget-boolean v1, p0, Lq0/a/a/n;->e:Z
+
+    iget-boolean v3, p1, Lq0/a/a/n;->e:Z
+
+    if-ne v1, v3, :cond_2
+
+    iget-object v1, p0, Lq0/a/a/n;->b:Ljava/lang/String;
+
+    iget-object v3, p1, Lq0/a/a/n;->b:Ljava/lang/String;
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lq0/a/a/n;->c:Ljava/lang/String;
+
+    iget-object v3, p1, Lq0/a/a/n;->c:Ljava/lang/String;
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, p0, Lq0/a/a/n;->d:Ljava/lang/String;
+
+    iget-object p1, p1, Lq0/a/a/n;->d:Ljava/lang/String;
+
+    invoke-virtual {v1, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 3
+
+    iget v0, p0, Lq0/a/a/n;->a:I
+
+    iget-boolean v1, p0, Lq0/a/a/n;->e:Z
+
+    if-eqz v1, :cond_0
+
+    const/16 v1, 0x40
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    add-int/2addr v0, v1
+
+    iget-object v1, p0, Lq0/a/a/n;->b:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    iget-object v2, p0, Lq0/a/a/n;->c:Ljava/lang/String;
+
+    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
+
+    move-result v2
+
+    mul-int v2, v2, v1
+
+    iget-object v1, p0, Lq0/a/a/n;->d:Ljava/lang/String;
+
+    invoke-virtual {v1}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    mul-int v1, v1, v2
+
+    add-int/2addr v1, v0
+
+    return v1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lq0/a/a/n;->b:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x2e
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lq0/a/a/n;->c:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lq0/a/a/n;->d:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " ("
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget v1, p0, Lq0/a/a/n;->a:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lq0/a/a/n;->e:Z
+
+    if-eqz v1, :cond_0
+
+    const-string v1, " itf"
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, ""
+
+    :goto_0
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x29
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/o.smali b/com.discord/smali_classes2/q0/a/a/o.smali
new file mode 100644
index 0000000000..9b9f1be463
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/o.smali
@@ -0,0 +1,160 @@
+.class public final Lq0/a/a/o;
+.super Ljava/lang/Object;
+.source "Handler.java"
+
+
+# instance fields
+.field public final a:Lq0/a/a/p;
+
+.field public final b:Lq0/a/a/p;
+
+.field public final c:Lq0/a/a/p;
+
+.field public final d:I
+
+.field public final e:Ljava/lang/String;
+
+.field public f:Lq0/a/a/o;
+
+
+# direct methods
+.method public constructor <init>(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)V
+    .locals 3
+
+    iget-object v0, p1, Lq0/a/a/o;->c:Lq0/a/a/p;
+
+    iget v1, p1, Lq0/a/a/o;->d:I
+
+    iget-object v2, p1, Lq0/a/a/o;->e:Ljava/lang/String;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p2, p0, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    iput-object p3, p0, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    iput-object v0, p0, Lq0/a/a/o;->c:Lq0/a/a/p;
+
+    iput v1, p0, Lq0/a/a/o;->d:I
+
+    iput-object v2, p0, Lq0/a/a/o;->e:Ljava/lang/String;
+
+    iget-object p1, p1, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    iput-object p1, p0, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lq0/a/a/p;Lq0/a/a/p;Lq0/a/a/p;ILjava/lang/String;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    iput-object p2, p0, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    iput-object p3, p0, Lq0/a/a/o;->c:Lq0/a/a/p;
+
+    iput p4, p0, Lq0/a/a/o;->d:I
+
+    iput-object p5, p0, Lq0/a/a/o;->e:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static a(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)Lq0/a/a/o;
+    .locals 4
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    iget-object v0, p0, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    invoke-static {v0, p1, p2}, Lq0/a/a/o;->a(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)Lq0/a/a/o;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    iget-object v0, p0, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    iget v0, v0, Lq0/a/a/p;->d:I
+
+    iget-object v1, p0, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    iget v1, v1, Lq0/a/a/p;->d:I
+
+    iget v2, p1, Lq0/a/a/p;->d:I
+
+    if-nez p2, :cond_1
+
+    const v3, 0x7fffffff
+
+    goto :goto_0
+
+    :cond_1
+    iget v3, p2, Lq0/a/a/p;->d:I
+
+    :goto_0
+    if-ge v2, v1, :cond_6
+
+    if-gt v3, v0, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    if-gt v2, v0, :cond_4
+
+    if-lt v3, v1, :cond_3
+
+    iget-object p0, p0, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    return-object p0
+
+    :cond_3
+    new-instance p1, Lq0/a/a/o;
+
+    iget-object v0, p0, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    invoke-direct {p1, p0, p2, v0}, Lq0/a/a/o;-><init>(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)V
+
+    return-object p1
+
+    :cond_4
+    if-lt v3, v1, :cond_5
+
+    new-instance p2, Lq0/a/a/o;
+
+    iget-object v0, p0, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    invoke-direct {p2, p0, v0, p1}, Lq0/a/a/o;-><init>(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)V
+
+    return-object p2
+
+    :cond_5
+    new-instance v0, Lq0/a/a/o;
+
+    iget-object v1, p0, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    invoke-direct {v0, p0, p2, v1}, Lq0/a/a/o;-><init>(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)V
+
+    iput-object v0, p0, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    new-instance p2, Lq0/a/a/o;
+
+    iget-object v0, p0, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    invoke-direct {p2, p0, v0, p1}, Lq0/a/a/o;-><init>(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)V
+
+    return-object p2
+
+    :cond_6
+    :goto_1
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/p.smali b/com.discord/smali_classes2/q0/a/a/p.smali
new file mode 100644
index 0000000000..16b0da1432
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/p.smali
@@ -0,0 +1,438 @@
+.class public Lq0/a/a/p;
+.super Ljava/lang/Object;
+.source "Label.java"
+
+
+# static fields
+.field public static final n:Lq0/a/a/p;
+
+
+# instance fields
+.field public a:S
+
+.field public b:S
+
+.field public c:[I
+
+.field public d:I
+
+.field public e:[I
+
+.field public f:S
+
+.field public g:S
+
+.field public h:S
+
+.field public i:S
+
+.field public j:Lq0/a/a/m;
+
+.field public k:Lq0/a/a/p;
+
+.field public l:Lq0/a/a/j;
+
+.field public m:Lq0/a/a/p;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lq0/a/a/p;
+
+    invoke-direct {v0}, Lq0/a/a/p;-><init>()V
+
+    sput-object v0, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(III)V
+    .locals 6
+
+    iget-object v0, p0, Lq0/a/a/p;->e:[I
+
+    const/4 v1, 0x6
+
+    if-nez v0, :cond_0
+
+    new-array v0, v1, [I
+
+    iput-object v0, p0, Lq0/a/a/p;->e:[I
+
+    :cond_0
+    iget-object v0, p0, Lq0/a/a/p;->e:[I
+
+    const/4 v2, 0x0
+
+    aget v3, v0, v2
+
+    add-int/lit8 v4, v3, 0x2
+
+    array-length v5, v0
+
+    if-lt v4, v5, :cond_1
+
+    array-length v4, v0
+
+    add-int/2addr v4, v1
+
+    new-array v1, v4, [I
+
+    array-length v4, v0
+
+    invoke-static {v0, v2, v1, v2, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v1, p0, Lq0/a/a/p;->e:[I
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/p;->e:[I
+
+    add-int/lit8 v3, v3, 0x1
+
+    aput p1, v0, v3
+
+    add-int/lit8 v3, v3, 0x1
+
+    or-int p1, p2, p3
+
+    aput p1, v0, v3
+
+    aput v3, v0, v2
+
+    return-void
+.end method
+
+.method public final b()Lq0/a/a/p;
+    .locals 1
+
+    iget-object v0, p0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    if-nez v0, :cond_0
+
+    move-object v0, p0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, v0, Lq0/a/a/m;->a:Lq0/a/a/p;
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public final c(S)V
+    .locals 3
+
+    sget-object v0, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    iput-object v0, p0, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    move-object v0, p0
+
+    :goto_0
+    sget-object v1, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    if-eq v0, v1, :cond_1
+
+    iget-object v1, v0, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    const/4 v2, 0x0
+
+    iput-object v2, v0, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iget-short v2, v0, Lq0/a/a/p;->i:S
+
+    if-nez v2, :cond_0
+
+    iput-short p1, v0, Lq0/a/a/p;->i:S
+
+    invoke-virtual {v0, v1}, Lq0/a/a/p;->d(Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
+
+.method public final d(Lq0/a/a/p;)Lq0/a/a/p;
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    iget-short v1, p0, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v1, v1, 0x10
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, p0, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    iget-object v1, v1, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_1
+    if-nez v1, :cond_1
+
+    iget-object v1, v0, Lq0/a/a/j;->b:Lq0/a/a/p;
+
+    iget-object v2, v1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    if-nez v2, :cond_1
+
+    iput-object p1, v1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    move-object p1, v1
+
+    :cond_1
+    iget-object v0, v0, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    goto :goto_0
+
+    :cond_2
+    return-object p1
+.end method
+
+.method public final e(Lq0/a/a/c;IZ)V
+    .locals 2
+
+    iget-short v0, p0, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v0, v0, 0x4
+
+    if-nez v0, :cond_1
+
+    const/4 v0, -0x1
+
+    if-eqz p3, :cond_0
+
+    const/high16 p3, 0x20000000
+
+    iget v1, p1, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p0, p2, p3, v1}, Lq0/a/a/p;->a(III)V
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    goto :goto_0
+
+    :cond_0
+    const/high16 p3, 0x10000000
+
+    iget v1, p1, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p0, p2, p3, v1}, Lq0/a/a/p;->a(III)V
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_0
+
+    :cond_1
+    if-eqz p3, :cond_2
+
+    iget p3, p0, Lq0/a/a/p;->d:I
+
+    sub-int/2addr p3, p2
+
+    invoke-virtual {p1, p3}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    goto :goto_0
+
+    :cond_2
+    iget p3, p0, Lq0/a/a/p;->d:I
+
+    sub-int/2addr p3, p2
+
+    invoke-virtual {p1, p3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_0
+    return-void
+.end method
+
+.method public final f([BI)Z
+    .locals 7
+
+    iget-short v0, p0, Lq0/a/a/p;->a:S
+
+    or-int/lit8 v0, v0, 0x4
+
+    int-to-short v0, v0
+
+    iput-short v0, p0, Lq0/a/a/p;->a:S
+
+    iput p2, p0, Lq0/a/a/p;->d:I
+
+    iget-object v0, p0, Lq0/a/a/p;->e:[I
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    return v1
+
+    :cond_0
+    aget v0, v0, v1
+
+    :goto_0
+    if-lez v0, :cond_5
+
+    iget-object v2, p0, Lq0/a/a/p;->e:[I
+
+    add-int/lit8 v3, v0, -0x1
+
+    aget v3, v2, v3
+
+    aget v2, v2, v0
+
+    sub-int v4, p2, v3
+
+    const v5, 0xfffffff
+
+    and-int/2addr v5, v2
+
+    const/high16 v6, -0x10000000
+
+    and-int/2addr v2, v6
+
+    const/high16 v6, 0x10000000
+
+    if-ne v2, v6, :cond_4
+
+    const/16 v2, -0x8000
+
+    if-lt v4, v2, :cond_1
+
+    const/16 v2, 0x7fff
+
+    if-le v4, v2, :cond_3
+
+    :cond_1
+    aget-byte v1, p1, v3
+
+    and-int/lit16 v1, v1, 0xff
+
+    const/16 v2, 0xc6
+
+    if-ge v1, v2, :cond_2
+
+    add-int/lit8 v1, v1, 0x31
+
+    int-to-byte v1, v1
+
+    aput-byte v1, p1, v3
+
+    goto :goto_1
+
+    :cond_2
+    add-int/lit8 v1, v1, 0x14
+
+    int-to-byte v1, v1
+
+    aput-byte v1, p1, v3
+
+    :goto_1
+    const/4 v1, 0x1
+
+    :cond_3
+    add-int/lit8 v2, v5, 0x1
+
+    ushr-int/lit8 v3, v4, 0x8
+
+    int-to-byte v3, v3
+
+    aput-byte v3, p1, v5
+
+    int-to-byte v3, v4
+
+    aput-byte v3, p1, v2
+
+    goto :goto_2
+
+    :cond_4
+    add-int/lit8 v2, v5, 0x1
+
+    ushr-int/lit8 v3, v4, 0x18
+
+    int-to-byte v3, v3
+
+    aput-byte v3, p1, v5
+
+    add-int/lit8 v3, v2, 0x1
+
+    ushr-int/lit8 v5, v4, 0x10
+
+    int-to-byte v5, v5
+
+    aput-byte v5, p1, v2
+
+    add-int/lit8 v2, v3, 0x1
+
+    ushr-int/lit8 v5, v4, 0x8
+
+    int-to-byte v5, v5
+
+    aput-byte v5, p1, v3
+
+    int-to-byte v3, v4
+
+    aput-byte v3, p1, v2
+
+    :goto_2
+    add-int/lit8 v0, v0, -0x2
+
+    goto :goto_0
+
+    :cond_5
+    return v1
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "L"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/q.smali b/com.discord/smali_classes2/q0/a/a/q.smali
new file mode 100644
index 0000000000..2792cfd6b3
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/q.smali
@@ -0,0 +1,163 @@
+.class public abstract Lq0/a/a/q;
+.super Ljava/lang/Object;
+.source "MethodVisitor.java"
+
+
+# instance fields
+.field public final a:I
+
+.field public b:Lq0/a/a/q;
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/high16 v0, 0x60000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x50000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x40000
+
+    if-eq p1, v0, :cond_1
+
+    const/high16 v0, 0x70000
+
+    if-ne p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    iput p1, p0, Lq0/a/a/q;->a:I
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lq0/a/a/q;->b:Lq0/a/a/q;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(Ljava/lang/String;Z)Lq0/a/a/a;
+.end method
+
+.method public abstract b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+.end method
+
+.method public abstract c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+.end method
+
+.method public abstract d(II)V
+.end method
+
+.method public abstract e(I)V
+.end method
+
+.method public abstract f(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+.end method
+
+.method public abstract g(II)V
+.end method
+
+.method public abstract h(ILq0/a/a/p;)V
+.end method
+
+.method public abstract i(Lq0/a/a/p;)V
+.end method
+
+.method public abstract j(Ljava/lang/Object;)V
+.end method
+
+.method public abstract k(ILq0/a/a/p;)V
+.end method
+
+.method public abstract l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lq0/a/a/p;Lq0/a/a/p;I)V
+.end method
+
+.method public abstract m(ILq0/a/a/x;[Lq0/a/a/p;[Lq0/a/a/p;[ILjava/lang/String;Z)Lq0/a/a/a;
+.end method
+
+.method public abstract n(II)V
+.end method
+
+.method public o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 7
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
+
+    iget v0, p0, Lq0/a/a/q;->a:I
+
+    const/high16 v1, 0x50000
+
+    if-lt v0, v1, :cond_1
+
+    const/16 v0, 0xb9
+
+    if-ne p1, v0, :cond_0
+
+    const/4 v0, 0x1
+
+    const/4 v6, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    const/4 v6, 0x0
+
+    :goto_0
+    move-object v1, p0
+
+    move v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    invoke-virtual/range {v1 .. v6}, Lq0/a/a/q;->p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/q;->b:Lq0/a/a/q;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0, p1, p2, p3, p4}, Lq0/a/a/q;->o(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_2
+    return-void
+.end method
+
+.method public abstract p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+.end method
+
+.method public varargs abstract q(IILq0/a/a/p;[Lq0/a/a/p;)V
+.end method
+
+.method public abstract r(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+.end method
+
+.method public abstract s(ILjava/lang/String;)V
+.end method
+
+.method public abstract t(II)V
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/r.smali b/com.discord/smali_classes2/q0/a/a/r.smali
new file mode 100644
index 0000000000..38b8babd06
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/r.smali
@@ -0,0 +1,5341 @@
+.class public final Lq0/a/a/r;
+.super Lq0/a/a/q;
+.source "MethodWriter.java"
+
+
+# static fields
+.field public static final c0:[I
+
+
+# instance fields
+.field public final A:I
+
+.field public B:Lq0/a/a/a;
+
+.field public C:Lq0/a/a/a;
+
+.field public D:I
+
+.field public E:[Lq0/a/a/a;
+
+.field public F:I
+
+.field public G:[Lq0/a/a/a;
+
+.field public H:Lq0/a/a/a;
+
+.field public I:Lq0/a/a/a;
+
+.field public J:Lq0/a/a/c;
+
+.field public K:I
+
+.field public L:Lq0/a/a/c;
+
+.field public M:Lq0/a/a/b;
+
+.field public final N:I
+
+.field public O:Lq0/a/a/p;
+
+.field public P:Lq0/a/a/p;
+
+.field public Q:Lq0/a/a/p;
+
+.field public R:I
+
+.field public S:I
+
+.field public T:I
+
+.field public U:I
+
+.field public V:[I
+
+.field public W:[I
+
+.field public X:Z
+
+.field public Y:Z
+
+.field public Z:I
+
+.field public a0:I
+
+.field public b0:I
+
+.field public final c:Lq0/a/a/v;
+
+.field public final d:I
+
+.field public final e:I
+
+.field public final f:Ljava/lang/String;
+
+.field public final g:I
+
+.field public final h:Ljava/lang/String;
+
+.field public i:I
+
+.field public j:I
+
+.field public final k:Lq0/a/a/c;
+
+.field public l:Lq0/a/a/o;
+
+.field public m:Lq0/a/a/o;
+
+.field public n:I
+
+.field public o:Lq0/a/a/c;
+
+.field public p:I
+
+.field public q:Lq0/a/a/c;
+
+.field public r:I
+
+.field public s:Lq0/a/a/c;
+
+.field public t:I
+
+.field public u:Lq0/a/a/c;
+
+.field public v:Lq0/a/a/a;
+
+.field public w:Lq0/a/a/a;
+
+.field public x:Lq0/a/a/b;
+
+.field public final y:I
+
+.field public final z:[I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/16 v0, 0xca
+
+    new-array v0, v0, [I
+
+    fill-array-data v0, :array_0
+
+    sput-object v0, Lq0/a/a/r;->c0:[I
+
+    return-void
+
+    :array_0
+    .array-data 4
+        0x0
+        0x1
+        0x1
+        0x1
+        0x1
+        0x1
+        0x1
+        0x1
+        0x1
+        0x2
+        0x2
+        0x1
+        0x1
+        0x1
+        0x2
+        0x2
+        0x1
+        0x1
+        0x1
+        0x0
+        0x0
+        0x1
+        0x2
+        0x1
+        0x2
+        0x1
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        -0x1
+        0x0
+        -0x1
+        0x0
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        -0x3
+        -0x4
+        -0x3
+        -0x4
+        -0x3
+        -0x3
+        -0x3
+        -0x3
+        -0x1
+        -0x2
+        0x1
+        0x1
+        0x1
+        0x2
+        0x2
+        0x2
+        0x0
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        0x0
+        0x0
+        0x0
+        0x0
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        0x0
+        0x1
+        0x0
+        0x1
+        -0x1
+        -0x1
+        0x0
+        0x0
+        0x1
+        0x1
+        -0x1
+        0x0
+        -0x1
+        0x0
+        0x0
+        0x0
+        -0x3
+        -0x1
+        -0x1
+        -0x3
+        -0x3
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x1
+        -0x2
+        -0x2
+        -0x2
+        -0x2
+        -0x2
+        -0x2
+        -0x2
+        -0x2
+        0x0
+        0x1
+        0x0
+        -0x1
+        -0x1
+        -0x1
+        -0x2
+        -0x1
+        -0x2
+        -0x1
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x1
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        0x0
+        -0x1
+        -0x1
+        0x0
+        0x0
+        -0x1
+        -0x1
+        0x0
+        0x0
+    .end array-data
+.end method
+
+.method public constructor <init>(Lq0/a/a/v;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;I)V
+    .locals 1
+
+    const/high16 v0, 0x70000
+
+    invoke-direct {p0, v0}, Lq0/a/a/q;-><init>(I)V
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    iput-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iput-object p1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v0, "<init>"
+
+    invoke-virtual {v0, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/high16 v0, 0x40000
+
+    or-int/2addr v0, p2
+
+    goto :goto_0
+
+    :cond_0
+    move v0, p2
+
+    :goto_0
+    iput v0, p0, Lq0/a/a/r;->d:I
+
+    invoke-virtual {p1, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v0
+
+    iput v0, p0, Lq0/a/a/r;->e:I
+
+    iput-object p3, p0, Lq0/a/a/r;->f:Ljava/lang/String;
+
+    invoke-virtual {p1, p4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p3
+
+    iput p3, p0, Lq0/a/a/r;->g:I
+
+    iput-object p4, p0, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    const/4 p3, 0x0
+
+    if-nez p5, :cond_1
+
+    const/4 p5, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p1, p5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p5
+
+    :goto_1
+    iput p5, p0, Lq0/a/a/r;->A:I
+
+    if-eqz p6, :cond_2
+
+    array-length p5, p6
+
+    if-lez p5, :cond_2
+
+    array-length p5, p6
+
+    iput p5, p0, Lq0/a/a/r;->y:I
+
+    new-array p5, p5, [I
+
+    iput-object p5, p0, Lq0/a/a/r;->z:[I
+
+    :goto_2
+    iget p5, p0, Lq0/a/a/r;->y:I
+
+    if-ge p3, p5, :cond_3
+
+    iget-object p5, p0, Lq0/a/a/r;->z:[I
+
+    aget-object v0, p6, p3
+
+    invoke-virtual {p1, v0}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    aput v0, p5, p3
+
+    add-int/lit8 p3, p3, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    iput p3, p0, Lq0/a/a/r;->y:I
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lq0/a/a/r;->z:[I
+
+    :cond_3
+    iput p7, p0, Lq0/a/a/r;->N:I
+
+    if-eqz p7, :cond_5
+
+    invoke-static {p4}, Lq0/a/a/w;->b(Ljava/lang/String;)I
+
+    move-result p1
+
+    shr-int/lit8 p1, p1, 0x2
+
+    and-int/lit8 p2, p2, 0x8
+
+    if-eqz p2, :cond_4
+
+    add-int/lit8 p1, p1, -0x1
+
+    :cond_4
+    iput p1, p0, Lq0/a/a/r;->j:I
+
+    iput p1, p0, Lq0/a/a/r;->T:I
+
+    new-instance p1, Lq0/a/a/p;
+
+    invoke-direct {p1}, Lq0/a/a/p;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    invoke-virtual {p0, p1}, Lq0/a/a/r;->i(Lq0/a/a/p;)V
+
+    :cond_5
+    return-void
+.end method
+
+
+# virtual methods
+.method public A(III)I
+    .locals 2
+
+    add-int/lit8 v0, p2, 0x3
+
+    add-int/2addr v0, p3
+
+    iget-object v1, p0, Lq0/a/a/r;->W:[I
+
+    if-eqz v1, :cond_0
+
+    array-length v1, v1
+
+    if-ge v1, v0, :cond_1
+
+    :cond_0
+    new-array v0, v0, [I
+
+    iput-object v0, p0, Lq0/a/a/r;->W:[I
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/r;->W:[I
+
+    const/4 v1, 0x0
+
+    aput p1, v0, v1
+
+    const/4 p1, 0x1
+
+    aput p2, v0, p1
+
+    const/4 p1, 0x2
+
+    aput p3, v0, p1
+
+    const/4 p1, 0x3
+
+    return p1
+.end method
+
+.method public final B(Lq0/a/a/p;[Lq0/a/a/p;)V
+    .locals 4
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v0, :cond_2
+
+    iget v1, p0, Lq0/a/a/r;->N:I
+
+    const/4 v2, 0x4
+
+    const/4 v3, 0x0
+
+    if-ne v1, v2, :cond_0
+
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    const/16 v1, 0xab
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, v1, v3, v2, v2}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    invoke-virtual {p0, v3, p1}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    invoke-virtual {p1}, Lq0/a/a/p;->b()Lq0/a/a/p;
+
+    move-result-object p1
+
+    iget-short v0, p1, Lq0/a/a/p;->a:S
+
+    or-int/lit8 v0, v0, 0x2
+
+    int-to-short v0, v0
+
+    iput-short v0, p1, Lq0/a/a/p;->a:S
+
+    array-length p1, p2
+
+    const/4 v0, 0x0
+
+    :goto_0
+    if-ge v0, p1, :cond_1
+
+    aget-object v1, p2, v0
+
+    invoke-virtual {p0, v3, v1}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    invoke-virtual {v1}, Lq0/a/a/p;->b()Lq0/a/a/p;
+
+    move-result-object v1
+
+    iget-short v2, v1, Lq0/a/a/p;->a:S
+
+    or-int/lit8 v2, v2, 0x2
+
+    int-to-short v2, v2
+
+    iput-short v2, v1, Lq0/a/a/p;->a:S
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    if-ne v1, v0, :cond_1
+
+    iget v1, p0, Lq0/a/a/r;->R:I
+
+    sub-int/2addr v1, v0
+
+    iput v1, p0, Lq0/a/a/r;->R:I
+
+    invoke-virtual {p0, v1, p1}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    array-length p1, p2
+
+    :goto_1
+    if-ge v3, p1, :cond_1
+
+    aget-object v0, p2, v3
+
+    iget v1, p0, Lq0/a/a/r;->R:I
+
+    invoke-virtual {p0, v1, v0}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {p0}, Lq0/a/a/r;->v()V
+
+    :cond_2
+    return-void
+.end method
+
+.method public a(Ljava/lang/String;Z)Lq0/a/a/a;
+    .locals 3
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v1, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p2, :cond_0
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/r;->B:Lq0/a/a/a;
+
+    invoke-direct {p2, v1, p1, v0, v2}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->B:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_0
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/r;->C:Lq0/a/a/a;
+
+    invoke-direct {p2, v1, p1, v0, v2}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->C:Lq0/a/a/a;
+
+    return-object p2
+.end method
+
+.method public b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    iput v0, p0, Lq0/a/a/r;->Z:I
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const/16 v1, 0x9
+
+    invoke-virtual {v0, v1, p2, p3, p4}, Lq0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lq0/a/a/v$a;
+
+    move-result-object p2
+
+    iget-object p3, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, p2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p3, p1, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    iget-object p3, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz p3, :cond_a
+
+    iget p3, p0, Lq0/a/a/r;->N:I
+
+    const/4 v0, 0x4
+
+    const/4 v1, 0x0
+
+    if-eq p3, v0, :cond_9
+
+    const/4 v0, 0x3
+
+    if-ne p3, v0, :cond_0
+
+    goto :goto_3
+
+    :cond_0
+    invoke-virtual {p4, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result p2
+
+    const/4 p3, -0x2
+
+    const/16 p4, 0x4a
+
+    const/16 v0, 0x44
+
+    const/4 v2, 0x1
+
+    packed-switch p1, :pswitch_data_0
+
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    if-eq p2, v0, :cond_6
+
+    if-ne p2, p4, :cond_7
+
+    goto :goto_0
+
+    :pswitch_0
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    if-eq p2, v0, :cond_1
+
+    if-ne p2, p4, :cond_2
+
+    :cond_1
+    const/4 v1, 0x1
+
+    :cond_2
+    add-int/2addr p1, v1
+
+    goto :goto_2
+
+    :pswitch_1
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    if-eq p2, v0, :cond_7
+
+    if-ne p2, p4, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const/4 p3, -0x1
+
+    goto :goto_1
+
+    :pswitch_2
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    if-eq p2, v0, :cond_4
+
+    if-ne p2, p4, :cond_5
+
+    :cond_4
+    const/4 v2, 0x2
+
+    :cond_5
+    add-int/2addr p1, v2
+
+    goto :goto_2
+
+    :cond_6
+    :goto_0
+    const/4 p3, -0x3
+
+    :cond_7
+    :goto_1
+    add-int/2addr p1, p3
+
+    :goto_2
+    iget p2, p0, Lq0/a/a/r;->S:I
+
+    if-le p1, p2, :cond_8
+
+    iput p1, p0, Lq0/a/a/r;->S:I
+
+    :cond_8
+    iput p1, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_4
+
+    :cond_9
+    :goto_3
+    iget-object p3, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object p3, p3, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object p4, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {p3, p1, v1, p2, p4}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_a
+    :goto_4
+    return-void
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0xb2
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public c(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
+    .locals 10
+
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    const/4 v1, 0x4
+
+    if-ne v0, v1, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v2, -0x1
+
+    const/4 v3, 0x2
+
+    const/4 v4, 0x3
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x1
+
+    if-ne v0, v4, :cond_d
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v1, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    if-nez v1, :cond_1
+
+    new-instance p1, Lq0/a/a/i;
+
+    invoke-direct {p1, v0}, Lq0/a/a/i;-><init>(Lq0/a/a/p;)V
+
+    iput-object p1, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object p1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object p1, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object p3, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v0, p0, Lq0/a/a/r;->d:I
+
+    iget-object v1, p0, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    invoke-virtual {p1, p3, v0, v1, p2}, Lq0/a/a/m;->n(Lq0/a/a/v;ILjava/lang/String;I)V
+
+    iget-object p1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object p1, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    invoke-virtual {p1, p0}, Lq0/a/a/m;->a(Lq0/a/a/r;)V
+
+    goto/16 :goto_10
+
+    :cond_1
+    if-ne p1, v2, :cond_c
+
+    iget-object p1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const/4 v0, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    const/high16 v4, 0x1000000
+
+    if-ge v0, p2, :cond_4
+
+    iget-object v7, v1, Lq0/a/a/m;->b:[I
+
+    add-int/lit8 v8, v2, 0x1
+
+    aget-object v9, p3, v0
+
+    invoke-static {p1, v9}, Lq0/a/a/m;->c(Lq0/a/a/v;Ljava/lang/Object;)I
+
+    move-result v9
+
+    aput v9, v7, v2
+
+    aget-object v2, p3, v0
+
+    sget-object v7, Lq0/a/a/t;->e:Ljava/lang/Integer;
+
+    if-eq v2, v7, :cond_3
+
+    aget-object v2, p3, v0
+
+    sget-object v7, Lq0/a/a/t;->d:Ljava/lang/Integer;
+
+    if-ne v2, v7, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    move v2, v8
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    iget-object v2, v1, Lq0/a/a/m;->b:[I
+
+    add-int/lit8 v7, v8, 0x1
+
+    aput v4, v2, v8
+
+    move v2, v7
+
+    :goto_2
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_4
+    :goto_3
+    iget-object p2, v1, Lq0/a/a/m;->b:[I
+
+    array-length p3, p2
+
+    if-ge v2, p3, :cond_5
+
+    add-int/lit8 p3, v2, 0x1
+
+    aput v4, p2, v2
+
+    move v2, p3
+
+    goto :goto_3
+
+    :cond_5
+    const/4 p2, 0x0
+
+    const/4 p3, 0x0
+
+    :goto_4
+    if-ge p2, p4, :cond_8
+
+    aget-object v0, p5, p2
+
+    sget-object v2, Lq0/a/a/t;->e:Ljava/lang/Integer;
+
+    if-eq v0, v2, :cond_6
+
+    aget-object v0, p5, p2
+
+    sget-object v2, Lq0/a/a/t;->d:Ljava/lang/Integer;
+
+    if-ne v0, v2, :cond_7
+
+    :cond_6
+    add-int/lit8 p3, p3, 0x1
+
+    :cond_7
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_4
+
+    :cond_8
+    add-int/2addr p3, p4
+
+    new-array p2, p3, [I
+
+    iput-object p2, v1, Lq0/a/a/m;->c:[I
+
+    const/4 p2, 0x0
+
+    const/4 p3, 0x0
+
+    :goto_5
+    if-ge p2, p4, :cond_b
+
+    iget-object v0, v1, Lq0/a/a/m;->c:[I
+
+    add-int/lit8 v2, p3, 0x1
+
+    aget-object v7, p5, p2
+
+    invoke-static {p1, v7}, Lq0/a/a/m;->c(Lq0/a/a/v;Ljava/lang/Object;)I
+
+    move-result v7
+
+    aput v7, v0, p3
+
+    aget-object p3, p5, p2
+
+    sget-object v0, Lq0/a/a/t;->e:Ljava/lang/Integer;
+
+    if-eq p3, v0, :cond_a
+
+    aget-object p3, p5, p2
+
+    sget-object v0, Lq0/a/a/t;->d:Ljava/lang/Integer;
+
+    if-ne p3, v0, :cond_9
+
+    goto :goto_6
+
+    :cond_9
+    move p3, v2
+
+    goto :goto_7
+
+    :cond_a
+    :goto_6
+    iget-object p3, v1, Lq0/a/a/m;->c:[I
+
+    add-int/lit8 v0, v2, 0x1
+
+    aput v4, p3, v2
+
+    move p3, v0
+
+    :goto_7
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_5
+
+    :cond_b
+    iput-short v5, v1, Lq0/a/a/m;->g:S
+
+    iput v5, v1, Lq0/a/a/m;->h:I
+
+    :cond_c
+    iget-object p1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object p1, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    invoke-virtual {p1, p0}, Lq0/a/a/m;->a(Lq0/a/a/r;)V
+
+    goto/16 :goto_10
+
+    :cond_d
+    if-ne p1, v2, :cond_11
+
+    iget-object p1, p0, Lq0/a/a/r;->V:[I
+
+    if-nez p1, :cond_e
+
+    iget-object p1, p0, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    invoke-static {p1}, Lq0/a/a/w;->b(Ljava/lang/String;)I
+
+    move-result p1
+
+    shr-int/2addr p1, v3
+
+    new-instance v0, Lq0/a/a/m;
+
+    new-instance v1, Lq0/a/a/p;
+
+    invoke-direct {v1}, Lq0/a/a/p;-><init>()V
+
+    invoke-direct {v0, v1}, Lq0/a/a/m;-><init>(Lq0/a/a/p;)V
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v2, p0, Lq0/a/a/r;->d:I
+
+    iget-object v7, p0, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    invoke-virtual {v0, v1, v2, v7, p1}, Lq0/a/a/m;->n(Lq0/a/a/v;ILjava/lang/String;I)V
+
+    invoke-virtual {v0, p0}, Lq0/a/a/m;->a(Lq0/a/a/r;)V
+
+    :cond_e
+    iput p2, p0, Lq0/a/a/r;->T:I
+
+    iget-object p1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget p1, p1, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p0, p1, p2, p4}, Lq0/a/a/r;->A(III)I
+
+    const/4 p1, 0x0
+
+    :goto_8
+    if-ge p1, p2, :cond_f
+
+    iget-object v0, p0, Lq0/a/a/r;->W:[I
+
+    add-int/lit8 v1, v4, 0x1
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    aget-object v7, p3, p1
+
+    invoke-static {v2, v7}, Lq0/a/a/m;->c(Lq0/a/a/v;Ljava/lang/Object;)I
+
+    move-result v2
+
+    aput v2, v0, v4
+
+    add-int/lit8 p1, p1, 0x1
+
+    move v4, v1
+
+    goto :goto_8
+
+    :cond_f
+    const/4 p1, 0x0
+
+    :goto_9
+    if-ge p1, p4, :cond_10
+
+    iget-object p2, p0, Lq0/a/a/r;->W:[I
+
+    add-int/lit8 p3, v4, 0x1
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    aget-object v1, p5, p1
+
+    invoke-static {v0, v1}, Lq0/a/a/m;->c(Lq0/a/a/v;Ljava/lang/Object;)I
+
+    move-result v0
+
+    aput v0, p2, v4
+
+    add-int/lit8 p1, p1, 0x1
+
+    move v4, p3
+
+    goto :goto_9
+
+    :cond_10
+    invoke-virtual {p0}, Lq0/a/a/r;->z()V
+
+    goto/16 :goto_10
+
+    :cond_11
+    iget-object v0, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    if-nez v0, :cond_12
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    iput-object v0, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    goto :goto_a
+
+    :cond_12
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    iget v2, p0, Lq0/a/a/r;->U:I
+
+    sub-int/2addr v0, v2
+
+    sub-int/2addr v0, v6
+
+    if-gez v0, :cond_14
+
+    if-ne p1, v4, :cond_13
+
+    return-void
+
+    :cond_13
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalStateException;-><init>()V
+
+    throw p1
+
+    :cond_14
+    :goto_a
+    if-eqz p1, :cond_1b
+
+    if-eq p1, v6, :cond_1a
+
+    const/16 p3, 0xfb
+
+    if-eq p1, v3, :cond_19
+
+    const/16 p2, 0x40
+
+    if-eq p1, v4, :cond_17
+
+    if-ne p1, v1, :cond_16
+
+    if-ge v0, p2, :cond_15
+
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    add-int/2addr v0, p2
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    goto :goto_b
+
+    :cond_15
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    const/16 p2, 0xf7
+
+    invoke-virtual {p1, p2}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_b
+    aget-object p1, p5, v5
+
+    invoke-virtual {p0, p1}, Lq0/a/a/r;->x(Ljava/lang/Object;)V
+
+    goto :goto_f
+
+    :cond_16
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p1}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p1
+
+    :cond_17
+    if-ge v0, p2, :cond_18
+
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    goto :goto_f
+
+    :cond_18
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {p1, p3}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_f
+
+    :cond_19
+    iget p1, p0, Lq0/a/a/r;->T:I
+
+    sub-int/2addr p1, p2
+
+    iput p1, p0, Lq0/a/a/r;->T:I
+
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    sub-int/2addr p3, p2
+
+    invoke-virtual {p1, p3}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_f
+
+    :cond_1a
+    iget p1, p0, Lq0/a/a/r;->T:I
+
+    add-int/2addr p1, p2
+
+    iput p1, p0, Lq0/a/a/r;->T:I
+
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    add-int/lit16 v1, p2, 0xfb
+
+    invoke-virtual {p1, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    :goto_c
+    if-ge p1, p2, :cond_1d
+
+    aget-object v0, p3, p1
+
+    invoke-virtual {p0, v0}, Lq0/a/a/r;->x(Ljava/lang/Object;)V
+
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_c
+
+    :cond_1b
+    iput p2, p0, Lq0/a/a/r;->T:I
+
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    const/16 v1, 0xff
+
+    invoke-virtual {p1, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {p1, p2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    :goto_d
+    if-ge p1, p2, :cond_1c
+
+    aget-object v0, p3, p1
+
+    invoke-virtual {p0, v0}, Lq0/a/a/r;->x(Ljava/lang/Object;)V
+
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_d
+
+    :cond_1c
+    iget-object p1, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {p1, p4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    :goto_e
+    if-ge p1, p4, :cond_1d
+
+    aget-object p2, p5, p1
+
+    invoke-virtual {p0, p2}, Lq0/a/a/r;->x(Ljava/lang/Object;)V
+
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_e
+
+    :cond_1d
+    :goto_f
+    iget-object p1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget p1, p1, Lq0/a/a/c;->b:I
+
+    iput p1, p0, Lq0/a/a/r;->U:I
+
+    iget p1, p0, Lq0/a/a/r;->t:I
+
+    add-int/2addr p1, v6
+
+    iput p1, p0, Lq0/a/a/r;->t:I
+
+    :goto_10
+    iget p1, p0, Lq0/a/a/r;->N:I
+
+    if-ne p1, v3, :cond_21
+
+    iput p4, p0, Lq0/a/a/r;->R:I
+
+    :goto_11
+    if-ge v5, p4, :cond_20
+
+    aget-object p1, p5, v5
+
+    sget-object p2, Lq0/a/a/t;->e:Ljava/lang/Integer;
+
+    if-eq p1, p2, :cond_1e
+
+    aget-object p1, p5, v5
+
+    sget-object p2, Lq0/a/a/t;->d:Ljava/lang/Integer;
+
+    if-ne p1, p2, :cond_1f
+
+    :cond_1e
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    add-int/2addr p1, v6
+
+    iput p1, p0, Lq0/a/a/r;->R:I
+
+    :cond_1f
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_11
+
+    :cond_20
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    iget p2, p0, Lq0/a/a/r;->S:I
+
+    if-le p1, p2, :cond_21
+
+    iput p1, p0, Lq0/a/a/r;->S:I
+
+    :cond_21
+    iget p1, p0, Lq0/a/a/r;->i:I
+
+    invoke-static {p1, p4}, Ljava/lang/Math;->max(II)I
+
+    move-result p1
+
+    iput p1, p0, Lq0/a/a/r;->i:I
+
+    iget p1, p0, Lq0/a/a/r;->j:I
+
+    iget p2, p0, Lq0/a/a/r;->T:I
+
+    invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
+
+    move-result p1
+
+    iput p1, p0, Lq0/a/a/r;->j:I
+
+    return-void
+.end method
+
+.method public d(II)V
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/c;->b:I
+
+    iput v1, p0, Lq0/a/a/r;->Z:I
+
+    const/16 v1, 0x84
+
+    const/16 v2, 0xff
+
+    if-gt p1, v2, :cond_1
+
+    const/16 v2, 0x7f
+
+    if-gt p2, v2, :cond_1
+
+    const/16 v2, -0x80
+
+    if-ge p2, v2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v0, p1, p2}, Lq0/a/a/c;->c(II)Lq0/a/a/c;
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    const/16 v2, 0xc4
+
+    invoke-virtual {v0, v2}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v0, v1, p1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    invoke-virtual {v0, p2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_1
+    iget-object p2, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz p2, :cond_3
+
+    iget p2, p0, Lq0/a/a/r;->N:I
+
+    const/4 v0, 0x4
+
+    if-eq p2, v0, :cond_2
+
+    const/4 v0, 0x3
+
+    if-ne p2, v0, :cond_3
+
+    :cond_2
+    iget-object p2, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object p2, p2, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p2, v1, p1, v0, v0}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_3
+    iget p2, p0, Lq0/a/a/r;->N:I
+
+    if-eqz p2, :cond_4
+
+    add-int/lit8 p1, p1, 0x1
+
+    iget p2, p0, Lq0/a/a/r;->j:I
+
+    if-le p1, p2, :cond_4
+
+    iput p1, p0, Lq0/a/a/r;->j:I
+
+    :cond_4
+    return-void
+.end method
+
+.method public e(I)V
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/c;->b:I
+
+    iput v1, p0, Lq0/a/a/r;->Z:I
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v0, :cond_5
+
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    const/4 v1, 0x4
+
+    if-eq v0, v1, :cond_2
+
+    const/4 v1, 0x3
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget v0, p0, Lq0/a/a/r;->R:I
+
+    sget-object v1, Lq0/a/a/r;->c0:[I
+
+    aget v1, v1, p1
+
+    add-int/2addr v0, v1
+
+    iget v1, p0, Lq0/a/a/r;->S:I
+
+    if-le v0, v1, :cond_1
+
+    iput v0, p0, Lq0/a/a/r;->S:I
+
+    :cond_1
+    iput v0, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, p1, v1, v2, v2}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :goto_1
+    const/16 v0, 0xac
+
+    if-lt p1, v0, :cond_3
+
+    const/16 v0, 0xb1
+
+    if-le p1, v0, :cond_4
+
+    :cond_3
+    const/16 v0, 0xbf
+
+    if-ne p1, v0, :cond_5
+
+    :cond_4
+    invoke-virtual {p0}, Lq0/a/a/r;->v()V
+
+    :cond_5
+    return-void
+.end method
+
+.method public f(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+    .locals 2
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    const v1, -0xffff01
+
+    and-int/2addr p1, v1
+
+    iget v1, p0, Lq0/a/a/r;->Z:I
+
+    shl-int/lit8 v1, v1, 0x8
+
+    or-int/2addr p1, v1
+
+    invoke-static {p1, v0}, Lf/n/a/k/a;->P(ILq0/a/a/c;)V
+
+    invoke-static {p2, v0}, Lq0/a/a/x;->a(Lq0/a/a/x;Lq0/a/a/c;)V
+
+    iget-object p1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {p1, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p4, :cond_0
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_0
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    return-object p2
+.end method
+
+.method public g(II)V
+    .locals 2
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/c;->b:I
+
+    iput v1, p0, Lq0/a/a/r;->Z:I
+
+    const/16 v1, 0x11
+
+    if-ne p1, v1, :cond_0
+
+    invoke-virtual {v0, p1, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, p1, p2}, Lq0/a/a/c;->c(II)Lq0/a/a/c;
+
+    :goto_0
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v0, :cond_4
+
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    const/4 v1, 0x4
+
+    if-eq v0, v1, :cond_3
+
+    const/4 v1, 0x3
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/16 p2, 0xbc
+
+    if-eq p1, p2, :cond_4
+
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iget p2, p0, Lq0/a/a/r;->S:I
+
+    if-le p1, p2, :cond_2
+
+    iput p1, p0, Lq0/a/a/r;->S:I
+
+    :cond_2
+    iput p1, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_2
+
+    :cond_3
+    :goto_1
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, p1, p2, v1, v1}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_4
+    :goto_2
+    return-void
+.end method
+
+.method public h(ILq0/a/a/p;)V
+    .locals 10
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    iput v0, p0, Lq0/a/a/r;->Z:I
+
+    const/16 v0, 0xc8
+
+    if-lt p1, v0, :cond_0
+
+    add-int/lit8 v1, p1, -0x21
+
+    goto :goto_0
+
+    :cond_0
+    move v1, p1
+
+    :goto_0
+    iget-short v2, p2, Lq0/a/a/p;->a:S
+
+    const/4 v3, 0x4
+
+    and-int/2addr v2, v3
+
+    const/16 v4, 0xa8
+
+    const/16 v5, 0xa7
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x1
+
+    if-eqz v2, :cond_4
+
+    iget v2, p2, Lq0/a/a/p;->d:I
+
+    iget-object v8, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v9, v8, Lq0/a/a/c;->b:I
+
+    sub-int/2addr v2, v9
+
+    const/16 v9, -0x8000
+
+    if-ge v2, v9, :cond_4
+
+    if-ne v1, v5, :cond_1
+
+    invoke-virtual {v8, v0}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    goto :goto_1
+
+    :cond_1
+    if-ne v1, v4, :cond_2
+
+    const/16 p1, 0xc9
+
+    invoke-virtual {v8, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    :goto_1
+    const/4 p1, 0x0
+
+    goto :goto_3
+
+    :cond_2
+    const/16 p1, 0xc6
+
+    if-lt v1, p1, :cond_3
+
+    xor-int/lit8 p1, v1, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    add-int/lit8 p1, v1, 0x1
+
+    xor-int/2addr p1, v7
+
+    sub-int/2addr p1, v7
+
+    :goto_2
+    invoke-virtual {v8, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object p1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    const/16 v0, 0x8
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object p1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    const/16 v0, 0xdc
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iput-boolean v7, p0, Lq0/a/a/r;->Y:Z
+
+    const/4 p1, 0x1
+
+    :goto_3
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v2, v0, Lq0/a/a/c;->b:I
+
+    sub-int/2addr v2, v7
+
+    invoke-virtual {p2, v0, v2, v7}, Lq0/a/a/p;->e(Lq0/a/a/c;IZ)V
+
+    goto :goto_5
+
+    :cond_4
+    if-eq v1, p1, :cond_5
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object p1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, p1, Lq0/a/a/c;->b:I
+
+    sub-int/2addr v0, v7
+
+    invoke-virtual {p2, p1, v0, v7}, Lq0/a/a/p;->e(Lq0/a/a/c;IZ)V
+
+    goto :goto_4
+
+    :cond_5
+    iget-object p1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    invoke-virtual {p1, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object p1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, p1, Lq0/a/a/c;->b:I
+
+    sub-int/2addr v0, v7
+
+    invoke-virtual {p2, p1, v0, v6}, Lq0/a/a/p;->e(Lq0/a/a/c;IZ)V
+
+    :goto_4
+    const/4 p1, 0x0
+
+    :goto_5
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v0, :cond_e
+
+    iget v2, p0, Lq0/a/a/r;->N:I
+
+    const/4 v8, 0x2
+
+    const/4 v9, 0x0
+
+    if-ne v2, v3, :cond_6
+
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    invoke-virtual {v0, v1, v6, v9, v9}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    invoke-virtual {p2}, Lq0/a/a/p;->b()Lq0/a/a/p;
+
+    move-result-object v0
+
+    iget-short v2, v0, Lq0/a/a/p;->a:S
+
+    or-int/2addr v2, v8
+
+    int-to-short v2, v2
+
+    iput-short v2, v0, Lq0/a/a/p;->a:S
+
+    invoke-virtual {p0, v6, p2}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    if-eq v1, v5, :cond_b
+
+    new-instance v9, Lq0/a/a/p;
+
+    invoke-direct {v9}, Lq0/a/a/p;-><init>()V
+
+    goto :goto_6
+
+    :cond_6
+    const/4 v3, 0x3
+
+    if-ne v2, v3, :cond_7
+
+    iget-object p2, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    invoke-virtual {p2, v1, v6, v9, v9}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    goto :goto_6
+
+    :cond_7
+    if-ne v2, v8, :cond_8
+
+    iget p2, p0, Lq0/a/a/r;->R:I
+
+    sget-object v0, Lq0/a/a/r;->c0:[I
+
+    aget v0, v0, v1
+
+    add-int/2addr p2, v0
+
+    iput p2, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_6
+
+    :cond_8
+    if-ne v1, v4, :cond_a
+
+    iget-short v0, p2, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v2, v0, 0x20
+
+    if-nez v2, :cond_9
+
+    or-int/lit8 v0, v0, 0x20
+
+    int-to-short v0, v0
+
+    iput-short v0, p2, Lq0/a/a/p;->a:S
+
+    iput-boolean v7, p0, Lq0/a/a/r;->X:Z
+
+    :cond_9
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-short v2, v0, Lq0/a/a/p;->a:S
+
+    or-int/lit8 v2, v2, 0x10
+
+    int-to-short v2, v2
+
+    iput-short v2, v0, Lq0/a/a/p;->a:S
+
+    iget v0, p0, Lq0/a/a/r;->R:I
+
+    add-int/2addr v0, v7
+
+    invoke-virtual {p0, v0, p2}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    new-instance v9, Lq0/a/a/p;
+
+    invoke-direct {v9}, Lq0/a/a/p;-><init>()V
+
+    goto :goto_6
+
+    :cond_a
+    iget v0, p0, Lq0/a/a/r;->R:I
+
+    sget-object v2, Lq0/a/a/r;->c0:[I
+
+    aget v2, v2, v1
+
+    add-int/2addr v0, v2
+
+    iput v0, p0, Lq0/a/a/r;->R:I
+
+    invoke-virtual {p0, v0, p2}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    :cond_b
+    :goto_6
+    if-eqz v9, :cond_d
+
+    if-eqz p1, :cond_c
+
+    iget-short p1, v9, Lq0/a/a/p;->a:S
+
+    or-int/2addr p1, v8
+
+    int-to-short p1, p1
+
+    iput-short p1, v9, Lq0/a/a/p;->a:S
+
+    :cond_c
+    invoke-virtual {p0, v9}, Lq0/a/a/r;->i(Lq0/a/a/p;)V
+
+    :cond_d
+    if-ne v1, v5, :cond_e
+
+    invoke-virtual {p0}, Lq0/a/a/r;->v()V
+
+    :cond_e
+    return-void
+.end method
+
+.method public i(Lq0/a/a/p;)V
+    .locals 6
+
+    iget-boolean v0, p0, Lq0/a/a/r;->Y:Z
+
+    iget-object v1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget-object v2, v1, Lq0/a/a/c;->a:[B
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v2, v1}, Lq0/a/a/p;->f([BI)Z
+
+    move-result v1
+
+    or-int/2addr v0, v1
+
+    iput-boolean v0, p0, Lq0/a/a/r;->Y:Z
+
+    iget-short v0, p1, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v1, v0, 0x1
+
+    if-eqz v1, :cond_0
+
+    return-void
+
+    :cond_0
+    iget v1, p0, Lq0/a/a/r;->N:I
+
+    const/4 v2, 0x4
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    if-ne v1, v2, :cond_5
+
+    iget-object v1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v1, :cond_2
+
+    iget v2, p1, Lq0/a/a/p;->d:I
+
+    iget v5, v1, Lq0/a/a/p;->d:I
+
+    if-ne v2, v5, :cond_1
+
+    iget-short v2, v1, Lq0/a/a/p;->a:S
+
+    and-int/2addr v0, v4
+
+    or-int/2addr v0, v2
+
+    int-to-short v0, v0
+
+    iput-short v0, v1, Lq0/a/a/p;->a:S
+
+    iget-object v0, v1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iput-object v0, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    return-void
+
+    :cond_1
+    invoke-virtual {p0, v3, p1}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    :cond_2
+    iget-object v0, p0, Lq0/a/a/r;->P:Lq0/a/a/p;
+
+    if-eqz v0, :cond_4
+
+    iget v1, p1, Lq0/a/a/p;->d:I
+
+    iget v2, v0, Lq0/a/a/p;->d:I
+
+    if-ne v1, v2, :cond_3
+
+    iget-short v1, v0, Lq0/a/a/p;->a:S
+
+    iget-short v2, p1, Lq0/a/a/p;->a:S
+
+    and-int/2addr v2, v4
+
+    or-int/2addr v1, v2
+
+    int-to-short v1, v1
+
+    iput-short v1, v0, Lq0/a/a/p;->a:S
+
+    iget-object v1, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iput-object v1, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iput-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    return-void
+
+    :cond_3
+    iput-object p1, v0, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    :cond_4
+    iput-object p1, p0, Lq0/a/a/r;->P:Lq0/a/a/p;
+
+    iput-object p1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    new-instance v0, Lq0/a/a/m;
+
+    invoke-direct {v0, p1}, Lq0/a/a/m;-><init>(Lq0/a/a/p;)V
+
+    iput-object v0, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    goto :goto_0
+
+    :cond_5
+    const/4 v0, 0x3
+
+    if-ne v1, v0, :cond_7
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-nez v0, :cond_6
+
+    iput-object p1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    goto :goto_0
+
+    :cond_6
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iput-object p1, v0, Lq0/a/a/m;->a:Lq0/a/a/p;
+
+    goto :goto_0
+
+    :cond_7
+    const/4 v0, 0x1
+
+    if-ne v1, v0, :cond_a
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v0, :cond_8
+
+    iget v1, p0, Lq0/a/a/r;->S:I
+
+    int-to-short v1, v1
+
+    iput-short v1, v0, Lq0/a/a/p;->h:S
+
+    iget v0, p0, Lq0/a/a/r;->R:I
+
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/r;->u(ILq0/a/a/p;)V
+
+    :cond_8
+    iput-object p1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iput v3, p0, Lq0/a/a/r;->R:I
+
+    iput v3, p0, Lq0/a/a/r;->S:I
+
+    iget-object v0, p0, Lq0/a/a/r;->P:Lq0/a/a/p;
+
+    if-eqz v0, :cond_9
+
+    iput-object p1, v0, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    :cond_9
+    iput-object p1, p0, Lq0/a/a/r;->P:Lq0/a/a/p;
+
+    goto :goto_0
+
+    :cond_a
+    if-ne v1, v4, :cond_b
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-nez v0, :cond_b
+
+    iput-object p1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    :cond_b
+    :goto_0
+    return-void
+.end method
+
+.method public j(Ljava/lang/Object;)V
+    .locals 7
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    iput v0, p0, Lq0/a/a/r;->Z:I
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, p1}, Lq0/a/a/v;->b(Ljava/lang/Object;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    iget v0, p1, Lq0/a/a/u;->a:I
+
+    iget v1, p1, Lq0/a/a/u;->b:I
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x5
+
+    if-eq v1, v4, :cond_1
+
+    const/4 v4, 0x6
+
+    if-eq v1, v4, :cond_1
+
+    const/16 v4, 0x11
+
+    if-ne v1, v4, :cond_0
+
+    iget-object v1, p1, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v4, 0x4a
+
+    if-eq v1, v4, :cond_1
+
+    const/16 v4, 0x44
+
+    if-ne v1, v4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 v1, 0x1
+
+    :goto_1
+    const/16 v4, 0x12
+
+    if-eqz v1, :cond_2
+
+    iget-object v5, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    const/16 v6, 0x14
+
+    invoke-virtual {v5, v6, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto :goto_2
+
+    :cond_2
+    const/16 v5, 0x100
+
+    if-lt v0, v5, :cond_3
+
+    iget-object v5, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    const/16 v6, 0x13
+
+    invoke-virtual {v5, v6, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto :goto_2
+
+    :cond_3
+    iget-object v5, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    invoke-virtual {v5, v4, v0}, Lq0/a/a/c;->c(II)Lq0/a/a/c;
+
+    :goto_2
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v0, :cond_8
+
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    const/4 v5, 0x4
+
+    if-eq v0, v5, :cond_7
+
+    const/4 v5, 0x3
+
+    if-ne v0, v5, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    if-eqz v1, :cond_5
+
+    const/4 v2, 0x2
+
+    :cond_5
+    add-int/2addr p1, v2
+
+    iget v0, p0, Lq0/a/a/r;->S:I
+
+    if-le p1, v0, :cond_6
+
+    iput p1, p0, Lq0/a/a/r;->S:I
+
+    :cond_6
+    iput p1, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_4
+
+    :cond_7
+    :goto_3
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, v4, v3, p1, v1}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_8
+    :goto_4
+    return-void
+.end method
+
+.method public k(ILq0/a/a/p;)V
+    .locals 1
+
+    iget-object v0, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    iput-object v0, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    :cond_0
+    iget v0, p0, Lq0/a/a/r;->n:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lq0/a/a/r;->n:I
+
+    iget-object v0, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    iget p2, p2, Lq0/a/a/p;->d:I
+
+    invoke-virtual {v0, p2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object p2, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    invoke-virtual {p2, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    return-void
+.end method
+
+.method public l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lq0/a/a/p;Lq0/a/a/p;I)V
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-eqz p3, :cond_1
+
+    iget-object v1, p0, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    if-nez v1, :cond_0
+
+    new-instance v1, Lq0/a/a/c;
+
+    invoke-direct {v1}, Lq0/a/a/c;-><init>()V
+
+    iput-object v1, p0, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    :cond_0
+    iget v1, p0, Lq0/a/a/r;->r:I
+
+    add-int/2addr v1, v0
+
+    iput v1, p0, Lq0/a/a/r;->r:I
+
+    iget-object v1, p0, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    iget v2, p4, Lq0/a/a/p;->d:I
+
+    invoke-virtual {v1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v2, p5, Lq0/a/a/p;->d:I
+
+    iget v3, p4, Lq0/a/a/p;->d:I
+
+    sub-int/2addr v2, v3
+
+    invoke-virtual {v1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v2, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v2, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p3
+
+    invoke-virtual {v1, p3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v1, p6}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_1
+    iget-object p3, p0, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    if-nez p3, :cond_2
+
+    new-instance p3, Lq0/a/a/c;
+
+    invoke-direct {p3}, Lq0/a/a/c;-><init>()V
+
+    iput-object p3, p0, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    :cond_2
+    iget p3, p0, Lq0/a/a/r;->p:I
+
+    add-int/2addr p3, v0
+
+    iput p3, p0, Lq0/a/a/r;->p:I
+
+    iget-object p3, p0, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    iget v1, p4, Lq0/a/a/p;->d:I
+
+    invoke-virtual {p3, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget p5, p5, Lq0/a/a/p;->d:I
+
+    iget p4, p4, Lq0/a/a/p;->d:I
+
+    sub-int/2addr p5, p4
+
+    invoke-virtual {p3, p5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object p4, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {p4, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {p3, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object p1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {p1, p2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {p3, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {p3, p6}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget p1, p0, Lq0/a/a/r;->N:I
+
+    if-eqz p1, :cond_5
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p2, p1}, Ljava/lang/String;->charAt(I)C
+
+    move-result p1
+
+    const/16 p2, 0x4a
+
+    if-eq p1, p2, :cond_3
+
+    const/16 p2, 0x44
+
+    if-ne p1, p2, :cond_4
+
+    :cond_3
+    const/4 v0, 0x2
+
+    :cond_4
+    add-int/2addr p6, v0
+
+    iget p1, p0, Lq0/a/a/r;->j:I
+
+    if-le p6, p1, :cond_5
+
+    iput p6, p0, Lq0/a/a/r;->j:I
+
+    :cond_5
+    return-void
+.end method
+
+.method public m(ILq0/a/a/x;[Lq0/a/a/p;[Lq0/a/a/p;[ILjava/lang/String;Z)Lq0/a/a/a;
+    .locals 4
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    ushr-int/lit8 p1, p1, 0x18
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    array-length p1, p3
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    array-length v2, p3
+
+    if-ge v1, v2, :cond_0
+
+    aget-object v2, p3, v1
+
+    iget v2, v2, Lq0/a/a/p;->d:I
+
+    invoke-virtual {v0, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    aget-object v2, p4, v1
+
+    iget v2, v2, Lq0/a/a/p;->d:I
+
+    aget-object v3, p3, v1
+
+    iget v3, v3, Lq0/a/a/p;->d:I
+
+    sub-int/2addr v2, v3
+
+    invoke-virtual {v0, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    aget v2, p5, v1
+
+    invoke-virtual {v0, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p2, v0}, Lq0/a/a/x;->a(Lq0/a/a/x;Lq0/a/a/c;)V
+
+    iget-object p2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {p2, p6}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p2
+
+    invoke-virtual {v0, p2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p7, :cond_1
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_1
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    return-object p2
+.end method
+
+.method public n(II)V
+    .locals 13
+
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x4
+
+    if-ne v0, v4, :cond_c
+
+    iget-object p1, p0, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    :goto_0
+    const/high16 p2, 0x2000000
+
+    const-string v0, "java/lang/Throwable"
+
+    if-eqz p1, :cond_2
+
+    iget-object v4, p1, Lq0/a/a/o;->e:Ljava/lang/String;
+
+    if-nez v4, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    move-object v0, v4
+
+    :goto_1
+    iget-object v4, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v4, v0}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v0
+
+    or-int/2addr p2, v0
+
+    iget-object v0, p1, Lq0/a/a/o;->c:Lq0/a/a/p;
+
+    invoke-virtual {v0}, Lq0/a/a/p;->b()Lq0/a/a/p;
+
+    move-result-object v0
+
+    iget-short v4, v0, Lq0/a/a/p;->a:S
+
+    or-int/2addr v4, v1
+
+    int-to-short v4, v4
+
+    iput-short v4, v0, Lq0/a/a/p;->a:S
+
+    iget-object v4, p1, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    invoke-virtual {v4}, Lq0/a/a/p;->b()Lq0/a/a/p;
+
+    move-result-object v4
+
+    iget-object v5, p1, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    invoke-virtual {v5}, Lq0/a/a/p;->b()Lq0/a/a/p;
+
+    move-result-object v5
+
+    :goto_2
+    if-eq v4, v5, :cond_1
+
+    new-instance v6, Lq0/a/a/j;
+
+    iget-object v7, v4, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    invoke-direct {v6, p2, v0, v7}, Lq0/a/a/j;-><init>(ILq0/a/a/p;Lq0/a/a/j;)V
+
+    iput-object v6, v4, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    iget-object v4, v4, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    goto :goto_2
+
+    :cond_1
+    iget-object p1, p1, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    goto :goto_0
+
+    :cond_2
+    iget-object p1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    iget-object p1, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v4, p0, Lq0/a/a/r;->d:I
+
+    iget-object v5, p0, Lq0/a/a/r;->h:Ljava/lang/String;
+
+    iget v6, p0, Lq0/a/a/r;->j:I
+
+    invoke-virtual {p1, v1, v4, v5, v6}, Lq0/a/a/m;->n(Lq0/a/a/v;ILjava/lang/String;I)V
+
+    invoke-virtual {p1, p0}, Lq0/a/a/m;->a(Lq0/a/a/r;)V
+
+    iget-object p1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    sget-object v1, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    iput-object v1, p1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    const/4 v1, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_3
+    sget-object v5, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    if-eq p1, v5, :cond_6
+
+    iget-object v5, p1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iput-object v2, p1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iget-short v6, p1, Lq0/a/a/p;->a:S
+
+    or-int/lit8 v6, v6, 0x8
+
+    int-to-short v6, v6
+
+    iput-short v6, p1, Lq0/a/a/p;->a:S
+
+    iget-object v6, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object v6, v6, Lq0/a/a/m;->c:[I
+
+    array-length v6, v6
+
+    iget-short v7, p1, Lq0/a/a/p;->h:S
+
+    add-int/2addr v6, v7
+
+    if-le v6, v4, :cond_3
+
+    move v4, v6
+
+    :cond_3
+    iget-object v6, p1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    :goto_4
+    if-eqz v6, :cond_5
+
+    iget-object v7, v6, Lq0/a/a/j;->b:Lq0/a/a/p;
+
+    invoke-virtual {v7}, Lq0/a/a/p;->b()Lq0/a/a/p;
+
+    move-result-object v7
+
+    iget-object v8, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object v9, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v10, v7, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget v11, v6, Lq0/a/a/j;->a:I
+
+    invoke-virtual {v8, v9, v10, v11}, Lq0/a/a/m;->h(Lq0/a/a/v;Lq0/a/a/m;I)Z
+
+    move-result v8
+
+    if-eqz v8, :cond_4
+
+    iget-object v8, v7, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    if-nez v8, :cond_4
+
+    iput-object v5, v7, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    move-object v5, v7
+
+    :cond_4
+    iget-object v6, v6, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    goto :goto_4
+
+    :cond_5
+    move-object p1, v5
+
+    goto :goto_3
+
+    :cond_6
+    iget-object p1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    :goto_5
+    if-eqz p1, :cond_b
+
+    iget-short v2, p1, Lq0/a/a/p;->a:S
+
+    const/16 v5, 0xa
+
+    and-int/2addr v2, v5
+
+    if-ne v2, v5, :cond_7
+
+    iget-object v2, p1, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    invoke-virtual {v2, p0}, Lq0/a/a/m;->a(Lq0/a/a/r;)V
+
+    :cond_7
+    iget-short v2, p1, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v2, v2, 0x8
+
+    if-nez v2, :cond_a
+
+    iget-object v2, p1, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    iget v5, p1, Lq0/a/a/p;->d:I
+
+    if-nez v2, :cond_8
+
+    iget-object v6, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v6, v6, Lq0/a/a/c;->b:I
+
+    goto :goto_6
+
+    :cond_8
+    iget v6, v2, Lq0/a/a/p;->d:I
+
+    :goto_6
+    sub-int/2addr v6, v3
+
+    if-lt v6, v5, :cond_a
+
+    move v7, v5
+
+    :goto_7
+    if-ge v7, v6, :cond_9
+
+    iget-object v8, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget-object v8, v8, Lq0/a/a/c;->a:[B
+
+    aput-byte v1, v8, v7
+
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_7
+
+    :cond_9
+    iget-object v7, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget-object v7, v7, Lq0/a/a/c;->a:[B
+
+    const/16 v8, -0x41
+
+    aput-byte v8, v7, v6
+
+    invoke-virtual {p0, v5, v1, v3}, Lq0/a/a/r;->A(III)I
+
+    const/4 v5, 0x3
+
+    iget-object v6, p0, Lq0/a/a/r;->W:[I
+
+    iget-object v7, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v7, v0}, Lq0/a/a/v;->n(Ljava/lang/String;)I
+
+    move-result v7
+
+    or-int/2addr v7, p2
+
+    aput v7, v6, v5
+
+    invoke-virtual {p0}, Lq0/a/a/r;->z()V
+
+    iget-object v5, p0, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    invoke-static {v5, p1, v2}, Lq0/a/a/o;->a(Lq0/a/a/o;Lq0/a/a/p;Lq0/a/a/p;)Lq0/a/a/o;
+
+    move-result-object v2
+
+    iput-object v2, p0, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    invoke-static {v4, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v2
+
+    move v4, v2
+
+    :cond_a
+    iget-object p1, p1, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    goto :goto_5
+
+    :cond_b
+    iput v4, p0, Lq0/a/a/r;->i:I
+
+    goto/16 :goto_12
+
+    :cond_c
+    if-ne v0, v3, :cond_1d
+
+    iget-object p1, p0, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    :goto_8
+    const p2, 0x7fffffff
+
+    if-eqz p1, :cond_f
+
+    iget-object v0, p1, Lq0/a/a/o;->c:Lq0/a/a/p;
+
+    iget-object v1, p1, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    iget-object v4, p1, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    :goto_9
+    if-eq v1, v4, :cond_e
+
+    iget-short v5, v1, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v5, v5, 0x10
+
+    if-nez v5, :cond_d
+
+    new-instance v5, Lq0/a/a/j;
+
+    iget-object v6, v1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    invoke-direct {v5, p2, v0, v6}, Lq0/a/a/j;-><init>(ILq0/a/a/p;Lq0/a/a/j;)V
+
+    iput-object v5, v1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    goto :goto_a
+
+    :cond_d
+    iget-object v5, v1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    iget-object v5, v5, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    new-instance v6, Lq0/a/a/j;
+
+    iget-object v7, v5, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    invoke-direct {v6, p2, v0, v7}, Lq0/a/a/j;-><init>(ILq0/a/a/p;Lq0/a/a/j;)V
+
+    iput-object v6, v5, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    :goto_a
+    iget-object v1, v1, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    goto :goto_9
+
+    :cond_e
+    iget-object p1, p1, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    goto :goto_8
+
+    :cond_f
+    iget-boolean p1, p0, Lq0/a/a/r;->X:Z
+
+    if-eqz p1, :cond_16
+
+    iget-object p1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    invoke-virtual {p1, v3}, Lq0/a/a/p;->c(S)V
+
+    const/4 p1, 0x1
+
+    const/4 v0, 0x1
+
+    :goto_b
+    if-gt p1, v0, :cond_12
+
+    iget-object v1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    :goto_c
+    if-eqz v1, :cond_11
+
+    iget-short v4, v1, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v4, v4, 0x10
+
+    if-eqz v4, :cond_10
+
+    iget-short v4, v1, Lq0/a/a/p;->i:S
+
+    if-ne v4, p1, :cond_10
+
+    iget-object v4, v1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    iget-object v4, v4, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    iget-object v4, v4, Lq0/a/a/j;->b:Lq0/a/a/p;
+
+    iget-short v5, v4, Lq0/a/a/p;->i:S
+
+    if-nez v5, :cond_10
+
+    add-int/lit8 v0, v0, 0x1
+
+    int-to-short v0, v0
+
+    invoke-virtual {v4, v0}, Lq0/a/a/p;->c(S)V
+
+    :cond_10
+    iget-object v1, v1, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    goto :goto_c
+
+    :cond_11
+    add-int/lit8 p1, p1, 0x1
+
+    int-to-short p1, p1
+
+    goto :goto_b
+
+    :cond_12
+    iget-object p1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    :goto_d
+    if-eqz p1, :cond_16
+
+    iget-short v0, p1, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v0, v0, 0x10
+
+    if-eqz v0, :cond_15
+
+    iget-object v0, p1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    iget-object v0, v0, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    iget-object v0, v0, Lq0/a/a/j;->b:Lq0/a/a/p;
+
+    sget-object v1, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    iput-object v1, v0, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    :goto_e
+    sget-object v4, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    if-eq v0, v4, :cond_14
+
+    iget-object v4, v0, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iput-object v1, v0, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iget-short v1, v0, Lq0/a/a/p;->a:S
+
+    and-int/lit8 v1, v1, 0x40
+
+    if-eqz v1, :cond_13
+
+    iget-short v1, v0, Lq0/a/a/p;->i:S
+
+    iget-short v5, p1, Lq0/a/a/p;->i:S
+
+    if-eq v1, v5, :cond_13
+
+    new-instance v1, Lq0/a/a/j;
+
+    iget-short v5, v0, Lq0/a/a/p;->g:S
+
+    iget-object v6, p1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    iget-object v6, v6, Lq0/a/a/j;->b:Lq0/a/a/p;
+
+    iget-object v7, v0, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    invoke-direct {v1, v5, v6, v7}, Lq0/a/a/j;-><init>(ILq0/a/a/p;Lq0/a/a/j;)V
+
+    iput-object v1, v0, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    :cond_13
+    invoke-virtual {v0, v4}, Lq0/a/a/p;->d(Lq0/a/a/p;)Lq0/a/a/p;
+
+    move-result-object v1
+
+    move-object v12, v1
+
+    move-object v1, v0
+
+    move-object v0, v12
+
+    goto :goto_e
+
+    :cond_14
+    :goto_f
+    sget-object v0, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    if-eq v1, v0, :cond_15
+
+    iget-object v0, v1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iput-object v2, v1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    move-object v1, v0
+
+    goto :goto_f
+
+    :cond_15
+    iget-object p1, p1, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    goto :goto_d
+
+    :cond_16
+    iget-object p1, p0, Lq0/a/a/r;->O:Lq0/a/a/p;
+
+    sget-object v0, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    iput-object v0, p1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iget v0, p0, Lq0/a/a/r;->i:I
+
+    :cond_17
+    sget-object v1, Lq0/a/a/p;->n:Lq0/a/a/p;
+
+    if-eq p1, v1, :cond_1c
+
+    iget-object v1, p1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    iget-short v2, p1, Lq0/a/a/p;->f:S
+
+    iget-short v4, p1, Lq0/a/a/p;->h:S
+
+    add-int/2addr v4, v2
+
+    if-le v4, v0, :cond_18
+
+    move v0, v4
+
+    :cond_18
+    iget-object v4, p1, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    iget-short p1, p1, Lq0/a/a/p;->a:S
+
+    and-int/lit8 p1, p1, 0x10
+
+    if-eqz p1, :cond_19
+
+    iget-object v4, v4, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    :cond_19
+    move-object p1, v1
+
+    :goto_10
+    if-eqz v4, :cond_17
+
+    iget-object v1, v4, Lq0/a/a/j;->b:Lq0/a/a/p;
+
+    iget-object v5, v1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    if-nez v5, :cond_1b
+
+    iget v5, v4, Lq0/a/a/j;->a:I
+
+    if-ne v5, p2, :cond_1a
+
+    const/4 v5, 0x1
+
+    goto :goto_11
+
+    :cond_1a
+    add-int/2addr v5, v2
+
+    :goto_11
+    int-to-short v5, v5
+
+    iput-short v5, v1, Lq0/a/a/p;->f:S
+
+    iput-object p1, v1, Lq0/a/a/p;->m:Lq0/a/a/p;
+
+    move-object p1, v1
+
+    :cond_1b
+    iget-object v4, v4, Lq0/a/a/j;->c:Lq0/a/a/j;
+
+    goto :goto_10
+
+    :cond_1c
+    iput v0, p0, Lq0/a/a/r;->i:I
+
+    goto :goto_12
+
+    :cond_1d
+    if-ne v0, v1, :cond_1e
+
+    iget p1, p0, Lq0/a/a/r;->S:I
+
+    iput p1, p0, Lq0/a/a/r;->i:I
+
+    goto :goto_12
+
+    :cond_1e
+    iput p1, p0, Lq0/a/a/r;->i:I
+
+    iput p2, p0, Lq0/a/a/r;->j:I
+
+    :goto_12
+    return-void
+.end method
+
+.method public p(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+    .locals 1
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    iput v0, p0, Lq0/a/a/r;->Z:I
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    if-eqz p5, :cond_0
+
+    const/16 p5, 0xb
+
+    goto :goto_0
+
+    :cond_0
+    const/16 p5, 0xa
+
+    :goto_0
+    invoke-virtual {v0, p5, p2, p3, p4}, Lq0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lq0/a/a/v$a;
+
+    move-result-object p2
+
+    const/4 p3, 0x0
+
+    const/16 p4, 0xb9
+
+    if-ne p1, p4, :cond_1
+
+    iget-object p5, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, p2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p5, p4, v0}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    invoke-virtual {p2}, Lq0/a/a/u;->a()I
+
+    move-result p4
+
+    shr-int/lit8 p4, p4, 0x2
+
+    invoke-virtual {p5, p4, p3}, Lq0/a/a/c;->c(II)Lq0/a/a/c;
+
+    goto :goto_1
+
+    :cond_1
+    iget-object p4, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget p5, p2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p4, p1, p5}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    :goto_1
+    iget-object p4, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz p4, :cond_6
+
+    iget p4, p0, Lq0/a/a/r;->N:I
+
+    const/4 p5, 0x4
+
+    if-eq p4, p5, :cond_5
+
+    const/4 p5, 0x3
+
+    if-ne p4, p5, :cond_2
+
+    goto :goto_3
+
+    :cond_2
+    invoke-virtual {p2}, Lq0/a/a/u;->a()I
+
+    move-result p2
+
+    and-int/lit8 p3, p2, 0x3
+
+    shr-int/lit8 p2, p2, 0x2
+
+    sub-int/2addr p3, p2
+
+    const/16 p2, 0xb8
+
+    if-ne p1, p2, :cond_3
+
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    add-int/2addr p1, p3
+
+    add-int/lit8 p1, p1, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    add-int/2addr p1, p3
+
+    :goto_2
+    iget p2, p0, Lq0/a/a/r;->S:I
+
+    if-le p1, p2, :cond_4
+
+    iput p1, p0, Lq0/a/a/r;->S:I
+
+    :cond_4
+    iput p1, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_4
+
+    :cond_5
+    :goto_3
+    iget-object p4, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object p4, p4, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object p5, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {p4, p1, p3, p2, p5}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_6
+    :goto_4
+    return-void
+.end method
+
+.method public varargs q(IILq0/a/a/p;[Lq0/a/a/p;)V
+    .locals 4
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, v0, Lq0/a/a/c;->b:I
+
+    iput v1, p0, Lq0/a/a/r;->Z:I
+
+    const/16 v1, 0xaa
+
+    invoke-virtual {v0, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v1, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, v1, Lq0/a/a/c;->b:I
+
+    rem-int/lit8 v1, v1, 0x4
+
+    rsub-int/lit8 v1, v1, 0x4
+
+    rem-int/lit8 v1, v1, 0x4
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v0, v2, v3, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, p0, Lq0/a/a/r;->Z:I
+
+    const/4 v2, 0x1
+
+    invoke-virtual {p3, v0, v1, v2}, Lq0/a/a/p;->e(Lq0/a/a/c;IZ)V
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    invoke-virtual {v0, p2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    array-length p1, p4
+
+    :goto_0
+    if-ge v3, p1, :cond_0
+
+    aget-object p2, p4, v3
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, p0, Lq0/a/a/r;->Z:I
+
+    invoke-virtual {p2, v0, v1, v2}, Lq0/a/a/p;->e(Lq0/a/a/c;IZ)V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0, p3, p4}, Lq0/a/a/r;->B(Lq0/a/a/p;[Lq0/a/a/p;)V
+
+    return-void
+.end method
+
+.method public r(ILq0/a/a/x;Ljava/lang/String;Z)Lq0/a/a/a;
+    .locals 1
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    invoke-static {p1, v0}, Lf/n/a/k/a;->P(ILq0/a/a/c;)V
+
+    invoke-static {p2, v0}, Lq0/a/a/x;->a(Lq0/a/a/x;Lq0/a/a/c;)V
+
+    iget-object p1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {p1, p3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 p1, 0x1
+
+    if-eqz p4, :cond_0
+
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/r;->H:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->H:Lq0/a/a/a;
+
+    return-object p2
+
+    :cond_0
+    new-instance p2, Lq0/a/a/a;
+
+    iget-object p3, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object p4, p0, Lq0/a/a/r;->I:Lq0/a/a/a;
+
+    invoke-direct {p2, p3, p1, v0, p4}, Lq0/a/a/a;-><init>(Lq0/a/a/v;ZLq0/a/a/c;Lq0/a/a/a;)V
+
+    iput-object p2, p0, Lq0/a/a/r;->I:Lq0/a/a/a;
+
+    return-object p2
+.end method
+
+.method public s(ILjava/lang/String;)V
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    iput v0, p0, Lq0/a/a/r;->Z:I
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const/4 v1, 0x7
+
+    invoke-virtual {v0, v1, p2}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p2
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v1, p2, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v0, p1, v1}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v0, :cond_3
+
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    const/4 v1, 0x4
+
+    if-eq v0, v1, :cond_2
+
+    const/4 v1, 0x3
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 p2, 0xbb
+
+    if-ne p1, p2, :cond_3
+
+    iget p1, p0, Lq0/a/a/r;->R:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iget p2, p0, Lq0/a/a/r;->S:I
+
+    if-le p1, p2, :cond_1
+
+    iput p1, p0, Lq0/a/a/r;->S:I
+
+    :cond_1
+    iput p1, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget v1, p0, Lq0/a/a/r;->Z:I
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, p1, v1, p2, v2}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_3
+    :goto_1
+    return-void
+.end method
+
+.method public t(II)V
+    .locals 6
+
+    iget-object v0, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    iput v0, p0, Lq0/a/a/r;->Z:I
+
+    const/16 v0, 0xa9
+
+    const/16 v1, 0x36
+
+    const/4 v2, 0x4
+
+    if-ge p2, v2, :cond_1
+
+    if-eq p1, v0, :cond_1
+
+    if-ge p1, v1, :cond_0
+
+    add-int/lit8 v3, p1, -0x15
+
+    shl-int/lit8 v3, v3, 0x2
+
+    add-int/lit8 v3, v3, 0x1a
+
+    goto :goto_0
+
+    :cond_0
+    add-int/lit8 v3, p1, -0x36
+
+    shl-int/lit8 v3, v3, 0x2
+
+    add-int/lit8 v3, v3, 0x3b
+
+    :goto_0
+    add-int/2addr v3, p2
+
+    iget-object v4, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    invoke-virtual {v4, v3}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    goto :goto_1
+
+    :cond_1
+    const/16 v3, 0x100
+
+    if-lt p2, v3, :cond_2
+
+    iget-object v3, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    const/16 v4, 0xc4
+
+    invoke-virtual {v3, v4}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v3, p1, p2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    goto :goto_1
+
+    :cond_2
+    iget-object v3, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    invoke-virtual {v3, p1, p2}, Lq0/a/a/c;->c(II)Lq0/a/a/c;
+
+    :goto_1
+    iget-object v3, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    if-eqz v3, :cond_7
+
+    iget v4, p0, Lq0/a/a/r;->N:I
+
+    if-eq v4, v2, :cond_6
+
+    const/4 v5, 0x3
+
+    if-ne v4, v5, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    if-ne p1, v0, :cond_4
+
+    iget-short v0, v3, Lq0/a/a/p;->a:S
+
+    or-int/lit8 v0, v0, 0x40
+
+    int-to-short v0, v0
+
+    iput-short v0, v3, Lq0/a/a/p;->a:S
+
+    iget v0, p0, Lq0/a/a/r;->R:I
+
+    int-to-short v0, v0
+
+    iput-short v0, v3, Lq0/a/a/p;->g:S
+
+    invoke-virtual {p0}, Lq0/a/a/r;->v()V
+
+    goto :goto_3
+
+    :cond_4
+    iget v0, p0, Lq0/a/a/r;->R:I
+
+    sget-object v3, Lq0/a/a/r;->c0:[I
+
+    aget v3, v3, p1
+
+    add-int/2addr v0, v3
+
+    iget v3, p0, Lq0/a/a/r;->S:I
+
+    if-le v0, v3, :cond_5
+
+    iput v0, p0, Lq0/a/a/r;->S:I
+
+    :cond_5
+    iput v0, p0, Lq0/a/a/r;->R:I
+
+    goto :goto_3
+
+    :cond_6
+    :goto_2
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget-object v0, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v0, p1, p2, v3, v3}, Lq0/a/a/m;->b(IILq0/a/a/u;Lq0/a/a/v;)V
+
+    :cond_7
+    :goto_3
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    if-eqz v0, :cond_a
+
+    const/16 v0, 0x16
+
+    if-eq p1, v0, :cond_9
+
+    const/16 v0, 0x18
+
+    if-eq p1, v0, :cond_9
+
+    const/16 v0, 0x37
+
+    if-eq p1, v0, :cond_9
+
+    const/16 v0, 0x39
+
+    if-ne p1, v0, :cond_8
+
+    goto :goto_4
+
+    :cond_8
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_5
+
+    :cond_9
+    :goto_4
+    add-int/lit8 p2, p2, 0x2
+
+    :goto_5
+    iget v0, p0, Lq0/a/a/r;->j:I
+
+    if-le p2, v0, :cond_a
+
+    iput p2, p0, Lq0/a/a/r;->j:I
+
+    :cond_a
+    if-lt p1, v1, :cond_b
+
+    iget p1, p0, Lq0/a/a/r;->N:I
+
+    if-ne p1, v2, :cond_b
+
+    iget-object p1, p0, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    if-eqz p1, :cond_b
+
+    new-instance p1, Lq0/a/a/p;
+
+    invoke-direct {p1}, Lq0/a/a/p;-><init>()V
+
+    invoke-virtual {p0, p1}, Lq0/a/a/r;->i(Lq0/a/a/p;)V
+
+    :cond_b
+    return-void
+.end method
+
+.method public final u(ILq0/a/a/p;)V
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    new-instance v1, Lq0/a/a/j;
+
+    iget-object v2, v0, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    invoke-direct {v1, p1, p2, v2}, Lq0/a/a/j;-><init>(ILq0/a/a/p;Lq0/a/a/j;)V
+
+    iput-object v1, v0, Lq0/a/a/p;->l:Lq0/a/a/j;
+
+    return-void
+.end method
+
+.method public final v()V
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/r;->N:I
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x4
+
+    if-ne v0, v2, :cond_0
+
+    new-instance v0, Lq0/a/a/p;
+
+    invoke-direct {v0}, Lq0/a/a/p;-><init>()V
+
+    new-instance v2, Lq0/a/a/m;
+
+    invoke-direct {v2, v0}, Lq0/a/a/m;-><init>(Lq0/a/a/p;)V
+
+    iput-object v2, v0, Lq0/a/a/p;->j:Lq0/a/a/m;
+
+    iget-object v2, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget-object v3, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {v0, v3, v2}, Lq0/a/a/p;->f([BI)Z
+
+    iget-object v2, p0, Lq0/a/a/r;->P:Lq0/a/a/p;
+
+    iput-object v0, v2, Lq0/a/a/p;->k:Lq0/a/a/p;
+
+    iput-object v0, p0, Lq0/a/a/r;->P:Lq0/a/a/p;
+
+    iput-object v1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v2, 0x1
+
+    if-ne v0, v2, :cond_1
+
+    iget-object v0, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    iget v2, p0, Lq0/a/a/r;->S:I
+
+    int-to-short v2, v2
+
+    iput-short v2, v0, Lq0/a/a/p;->h:S
+
+    iput-object v1, p0, Lq0/a/a/r;->Q:Lq0/a/a/p;
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public final w(II)V
+    .locals 10
+
+    :goto_0
+    if-ge p1, p2, :cond_a
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v1, p0, Lq0/a/a/r;->W:[I
+
+    aget v1, v1, p1
+
+    iget-object v2, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    const/high16 v3, -0x10000000
+
+    and-int/2addr v3, v1
+
+    shr-int/lit8 v3, v3, 0x1c
+
+    const/4 v4, 0x7
+
+    const/high16 v5, 0x2000000
+
+    const/high16 v6, 0xf000000
+
+    const v7, 0xfffff
+
+    if-nez v3, :cond_3
+
+    and-int v3, v1, v7
+
+    and-int/2addr v1, v6
+
+    const/high16 v6, 0x1000000
+
+    if-eq v1, v6, :cond_2
+
+    if-eq v1, v5, :cond_1
+
+    const/high16 v4, 0x3000000
+
+    if-ne v1, v4, :cond_0
+
+    const/16 v1, 0x8
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v0, v0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    aget-object v0, v0, v3
+
+    iget-wide v0, v0, Lq0/a/a/u;->f:J
+
+    long-to-int v1, v0
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto/16 :goto_3
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_1
+    invoke-virtual {v2, v4}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v1, v0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    aget-object v1, v1, v3
+
+    iget-object v1, v1, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v2, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto/16 :goto_3
+
+    :cond_2
+    invoke-virtual {v2, v3}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    goto/16 :goto_3
+
+    :cond_3
+    new-instance v8, Ljava/lang/StringBuilder;
+
+    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
+
+    :goto_1
+    add-int/lit8 v9, v3, -0x1
+
+    if-lez v3, :cond_4
+
+    const/16 v3, 0x5b
+
+    invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    move v3, v9
+
+    goto :goto_1
+
+    :cond_4
+    and-int v3, v1, v6
+
+    if-ne v3, v5, :cond_5
+
+    const/16 v3, 0x4c
+
+    invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    and-int/2addr v1, v7
+
+    iget-object v3, v0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    aget-object v1, v3, v1
+
+    iget-object v1, v1, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x3b
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :cond_5
+    and-int/2addr v1, v7
+
+    const/4 v3, 0x1
+
+    if-eq v1, v3, :cond_9
+
+    const/4 v3, 0x2
+
+    if-eq v1, v3, :cond_8
+
+    const/4 v3, 0x3
+
+    if-eq v1, v3, :cond_7
+
+    const/4 v3, 0x4
+
+    if-eq v1, v3, :cond_6
+
+    packed-switch v1, :pswitch_data_0
+
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :pswitch_0
+    const/16 v1, 0x53
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :pswitch_1
+    const/16 v1, 0x43
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :pswitch_2
+    const/16 v1, 0x42
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :pswitch_3
+    const/16 v1, 0x5a
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :cond_6
+    const/16 v1, 0x4a
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :cond_7
+    const/16 v1, 0x44
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :cond_8
+    const/16 v1, 0x46
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_2
+
+    :cond_9
+    const/16 v1, 0x49
+
+    invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :goto_2
+    invoke-virtual {v2, v4}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v0
+
+    iget v0, v0, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v2, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_3
+    add-int/lit8 p1, p1, 0x1
+
+    goto/16 :goto_0
+
+    :cond_a
+    return-void
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x9
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+.method public final x(Ljava/lang/Object;)V
+    .locals 2
+
+    instance-of v0, p1, Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    goto :goto_0
+
+    :cond_0
+    instance-of v0, p1, Ljava/lang/String;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    const/4 v1, 0x7
+
+    invoke-virtual {v0, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    check-cast p1, Ljava/lang/String;
+
+    invoke-virtual {v1, p1}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    iget p1, p1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    const/16 v1, 0x8
+
+    invoke-virtual {v0, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    check-cast p1, Lq0/a/a/p;
+
+    iget p1, p1, Lq0/a/a/p;->d:I
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_0
+    return-void
+.end method
+
+.method public y(Lq0/a/a/c;)V
+    .locals 13
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v0, v0, Lq0/a/a/v;->c:I
+
+    const/4 v1, 0x0
+
+    const/16 v2, 0x31
+
+    if-ge v0, v2, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    const/16 v2, 0x1000
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    iget v3, p0, Lq0/a/a/r;->d:I
+
+    not-int v2, v2
+
+    and-int/2addr v2, v3
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v2, p0, Lq0/a/a/r;->e:I
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v2, p0, Lq0/a/a/r;->g:I
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v2, p0, Lq0/a/a/r;->a0:I
+
+    if-eqz v2, :cond_2
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v0, v0, Lq0/a/a/v;->b:Lq0/a/a/d;
+
+    iget-object v0, v0, Lq0/a/a/d;->a:[B
+
+    iget v1, p0, Lq0/a/a/r;->b0:I
+
+    invoke-virtual {p1, v0, v2, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    return-void
+
+    :cond_2
+    iget-object v2, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    if-lez v2, :cond_3
+
+    const/4 v2, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_2
+    iget v3, p0, Lq0/a/a/r;->y:I
+
+    if-lez v3, :cond_4
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_4
+    iget v3, p0, Lq0/a/a/r;->d:I
+
+    and-int/lit16 v3, v3, 0x1000
+
+    if-eqz v3, :cond_5
+
+    if-eqz v0, :cond_5
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_5
+    iget v3, p0, Lq0/a/a/r;->A:I
+
+    if-eqz v3, :cond_6
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_6
+    iget v3, p0, Lq0/a/a/r;->d:I
+
+    const/high16 v4, 0x20000
+
+    and-int/2addr v3, v4
+
+    if-eqz v3, :cond_7
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_7
+    iget-object v3, p0, Lq0/a/a/r;->B:Lq0/a/a/a;
+
+    if-eqz v3, :cond_8
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_8
+    iget-object v3, p0, Lq0/a/a/r;->C:Lq0/a/a/a;
+
+    if-eqz v3, :cond_9
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_9
+    iget-object v3, p0, Lq0/a/a/r;->E:[Lq0/a/a/a;
+
+    if-eqz v3, :cond_a
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_a
+    iget-object v3, p0, Lq0/a/a/r;->G:[Lq0/a/a/a;
+
+    if-eqz v3, :cond_b
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_b
+    iget-object v3, p0, Lq0/a/a/r;->H:Lq0/a/a/a;
+
+    if-eqz v3, :cond_c
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_c
+    iget-object v3, p0, Lq0/a/a/r;->I:Lq0/a/a/a;
+
+    if-eqz v3, :cond_d
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_d
+    iget-object v3, p0, Lq0/a/a/r;->J:Lq0/a/a/c;
+
+    if-eqz v3, :cond_e
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_e
+    iget-object v3, p0, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    if-eqz v3, :cond_f
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_f
+    iget-object v3, p0, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    if-eqz v3, :cond_10
+
+    invoke-virtual {v3}, Lq0/a/a/b;->c()I
+
+    move-result v3
+
+    add-int/2addr v2, v3
+
+    :cond_10
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    const-string v3, "RuntimeInvisibleTypeAnnotations"
+
+    const-string v4, "RuntimeVisibleTypeAnnotations"
+
+    if-lez v2, :cond_23
+
+    add-int/lit8 v2, v2, 0xa
+
+    iget-object v5, p0, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    const/4 v6, 0x0
+
+    :goto_3
+    if-eqz v5, :cond_11
+
+    add-int/lit8 v6, v6, 0x1
+
+    iget-object v5, v5, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    goto :goto_3
+
+    :cond_11
+    mul-int/lit8 v6, v6, 0x8
+
+    add-int/lit8 v6, v6, 0x2
+
+    add-int/2addr v6, v2
+
+    iget-object v2, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    if-eqz v2, :cond_12
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x8
+
+    add-int/2addr v6, v2
+
+    const/4 v2, 0x1
+
+    goto :goto_4
+
+    :cond_12
+    const/4 v2, 0x0
+
+    :goto_4
+    iget-object v5, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    if-eqz v5, :cond_13
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v5, v5, 0x8
+
+    add-int/2addr v6, v5
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_13
+    iget-object v5, p0, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    if-eqz v5, :cond_14
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v5, v5, 0x8
+
+    add-int/2addr v6, v5
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_14
+    iget-object v5, p0, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    if-eqz v5, :cond_15
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v5, v5, 0x8
+
+    add-int/2addr v6, v5
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_15
+    iget-object v5, p0, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    if-eqz v5, :cond_16
+
+    invoke-virtual {v5, v4}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v5
+
+    add-int/2addr v6, v5
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_16
+    iget-object v5, p0, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    if-eqz v5, :cond_17
+
+    invoke-virtual {v5, v3}, Lq0/a/a/a;->a(Ljava/lang/String;)I
+
+    move-result v5
+
+    add-int/2addr v6, v5
+
+    add-int/lit8 v2, v2, 0x1
+
+    :cond_17
+    iget-object v7, p0, Lq0/a/a/r;->x:Lq0/a/a/b;
+
+    if-eqz v7, :cond_18
+
+    iget-object v8, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v5, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget-object v9, v5, Lq0/a/a/c;->a:[B
+
+    iget v10, v5, Lq0/a/a/c;->b:I
+
+    iget v11, p0, Lq0/a/a/r;->i:I
+
+    iget v12, p0, Lq0/a/a/r;->j:I
+
+    invoke-virtual/range {v7 .. v12}, Lq0/a/a/b;->b(Lq0/a/a/v;[BIII)I
+
+    move-result v5
+
+    add-int/2addr v6, v5
+
+    iget-object v5, p0, Lq0/a/a/r;->x:Lq0/a/a/b;
+
+    invoke-virtual {v5}, Lq0/a/a/b;->c()I
+
+    move-result v5
+
+    add-int/2addr v2, v5
+
+    :cond_18
+    iget-object v5, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v7, "Code"
+
+    invoke-static {v5, v7, p1, v6}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v5, p0, Lq0/a/a/r;->i:I
+
+    invoke-virtual {p1, v5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v5, p0, Lq0/a/a/r;->j:I
+
+    invoke-virtual {p1, v5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v5, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v5}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget-object v5, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget-object v6, v5, Lq0/a/a/c;->a:[B
+
+    iget v5, v5, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v6, v1, v5}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    iget-object v5, p0, Lq0/a/a/r;->l:Lq0/a/a/o;
+
+    const/4 v6, 0x0
+
+    move-object v7, v5
+
+    :goto_5
+    if-eqz v7, :cond_19
+
+    add-int/lit8 v6, v6, 0x1
+
+    iget-object v7, v7, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    goto :goto_5
+
+    :cond_19
+    invoke-virtual {p1, v6}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :goto_6
+    if-eqz v5, :cond_1a
+
+    iget-object v6, v5, Lq0/a/a/o;->a:Lq0/a/a/p;
+
+    iget v6, v6, Lq0/a/a/p;->d:I
+
+    invoke-virtual {p1, v6}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v6, v5, Lq0/a/a/o;->b:Lq0/a/a/p;
+
+    iget v6, v6, Lq0/a/a/p;->d:I
+
+    invoke-virtual {p1, v6}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v6, v5, Lq0/a/a/o;->c:Lq0/a/a/p;
+
+    iget v6, v6, Lq0/a/a/p;->d:I
+
+    invoke-virtual {p1, v6}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v6, v5, Lq0/a/a/o;->d:I
+
+    invoke-virtual {p1, v6}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v5, v5, Lq0/a/a/o;->f:Lq0/a/a/o;
+
+    goto :goto_6
+
+    :cond_1a
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    if-eqz v2, :cond_1d
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v2, v2, Lq0/a/a/v;->c:I
+
+    const/16 v5, 0x32
+
+    if-lt v2, v5, :cond_1b
+
+    const/4 v2, 0x1
+
+    goto :goto_7
+
+    :cond_1b
+    const/4 v2, 0x0
+
+    :goto_7
+    iget-object v5, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    if-eqz v2, :cond_1c
+
+    const-string v2, "StackMapTable"
+
+    goto :goto_8
+
+    :cond_1c
+    const-string v2, "StackMap"
+
+    :goto_8
+    invoke-virtual {v5, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v2, p0, Lq0/a/a/r;->t:I
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v5, v1, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_1d
+    iget-object v2, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    if-eqz v2, :cond_1e
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v5, "LineNumberTable"
+
+    invoke-virtual {v2, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v2, p0, Lq0/a/a/r;->n:I
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->o:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v5, v1, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_1e
+    iget-object v2, p0, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    if-eqz v2, :cond_1f
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v5, "LocalVariableTable"
+
+    invoke-virtual {v2, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v2, p0, Lq0/a/a/r;->p:I
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->q:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v5, v1, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_1f
+    iget-object v2, p0, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    if-eqz v2, :cond_20
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v5, "LocalVariableTypeTable"
+
+    invoke-virtual {v2, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v2, v2, 0x2
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v2, p0, Lq0/a/a/r;->r:I
+
+    invoke-virtual {p1, v2}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v2, p0, Lq0/a/a/r;->s:Lq0/a/a/c;
+
+    iget-object v5, v2, Lq0/a/a/c;->a:[B
+
+    iget v2, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v5, v1, v2}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_20
+    iget-object v2, p0, Lq0/a/a/r;->v:Lq0/a/a/a;
+
+    if-eqz v2, :cond_21
+
+    iget-object v5, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v5, v4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v5
+
+    invoke-virtual {v2, v5, p1}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_21
+    iget-object v2, p0, Lq0/a/a/r;->w:Lq0/a/a/a;
+
+    if-eqz v2, :cond_22
+
+    iget-object v5, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v5, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v5
+
+    invoke-virtual {v2, v5, p1}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_22
+    iget-object v6, p0, Lq0/a/a/r;->x:Lq0/a/a/b;
+
+    if-eqz v6, :cond_23
+
+    iget-object v7, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget-object v2, p0, Lq0/a/a/r;->k:Lq0/a/a/c;
+
+    iget-object v8, v2, Lq0/a/a/c;->a:[B
+
+    iget v9, v2, Lq0/a/a/c;->b:I
+
+    iget v10, p0, Lq0/a/a/r;->i:I
+
+    iget v11, p0, Lq0/a/a/r;->j:I
+
+    const/4 v2, 0x2
+
+    move-object v12, p1
+
+    invoke-virtual/range {v6 .. v12}, Lq0/a/a/b;->e(Lq0/a/a/v;[BIIILq0/a/a/c;)V
+
+    goto :goto_9
+
+    :cond_23
+    const/4 v2, 0x2
+
+    :goto_9
+    iget v5, p0, Lq0/a/a/r;->y:I
+
+    if-lez v5, :cond_24
+
+    iget-object v5, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v6, "Exceptions"
+
+    invoke-virtual {v5, v6}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v5
+
+    invoke-virtual {p1, v5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget v5, p0, Lq0/a/a/r;->y:I
+
+    mul-int/lit8 v5, v5, 0x2
+
+    add-int/2addr v5, v2
+
+    invoke-virtual {p1, v5}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v5, p0, Lq0/a/a/r;->y:I
+
+    invoke-virtual {p1, v5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v5, p0, Lq0/a/a/r;->z:[I
+
+    array-length v6, v5
+
+    const/4 v7, 0x0
+
+    :goto_a
+    if-ge v7, v6, :cond_24
+
+    aget v8, v5, v7
+
+    invoke-virtual {p1, v8}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_a
+
+    :cond_24
+    iget v5, p0, Lq0/a/a/r;->d:I
+
+    and-int/lit16 v5, v5, 0x1000
+
+    if-eqz v5, :cond_25
+
+    if-eqz v0, :cond_25
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v5, "Synthetic"
+
+    invoke-static {v0, v5, p1, v1}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    :cond_25
+    iget v0, p0, Lq0/a/a/r;->A:I
+
+    if-eqz v0, :cond_26
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v5, "Signature"
+
+    invoke-static {v0, v5, p1, v2}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    iget v0, p0, Lq0/a/a/r;->A:I
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    :cond_26
+    iget v0, p0, Lq0/a/a/r;->d:I
+
+    const/high16 v2, 0x20000
+
+    and-int/2addr v0, v2
+
+    if-eqz v0, :cond_27
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v2, "Deprecated"
+
+    invoke-static {v0, v2, p1, v1}, Lf/e/b/a/a;->W(Lq0/a/a/v;Ljava/lang/String;Lq0/a/a/c;I)V
+
+    :cond_27
+    iget-object v0, p0, Lq0/a/a/r;->B:Lq0/a/a/a;
+
+    if-eqz v0, :cond_28
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v5, "RuntimeVisibleAnnotations"
+
+    invoke-virtual {v2, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v0, v2, p1}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_28
+    iget-object v0, p0, Lq0/a/a/r;->C:Lq0/a/a/a;
+
+    if-eqz v0, :cond_29
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v5, "RuntimeInvisibleAnnotations"
+
+    invoke-virtual {v2, v5}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v0, v2, p1}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_29
+    iget-object v0, p0, Lq0/a/a/r;->E:[Lq0/a/a/a;
+
+    if-eqz v0, :cond_2b
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v2, "RuntimeVisibleParameterAnnotations"
+
+    invoke-virtual {v0, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v0
+
+    iget-object v2, p0, Lq0/a/a/r;->E:[Lq0/a/a/a;
+
+    iget v5, p0, Lq0/a/a/r;->D:I
+
+    if-nez v5, :cond_2a
+
+    array-length v5, v2
+
+    :cond_2a
+    invoke-static {v0, v2, v5, p1}, Lq0/a/a/a;->d(I[Lq0/a/a/a;ILq0/a/a/c;)V
+
+    :cond_2b
+    iget-object v0, p0, Lq0/a/a/r;->G:[Lq0/a/a/a;
+
+    if-eqz v0, :cond_2d
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v2, "RuntimeInvisibleParameterAnnotations"
+
+    invoke-virtual {v0, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v0
+
+    iget-object v2, p0, Lq0/a/a/r;->G:[Lq0/a/a/a;
+
+    iget v5, p0, Lq0/a/a/r;->F:I
+
+    if-nez v5, :cond_2c
+
+    array-length v5, v2
+
+    :cond_2c
+    invoke-static {v0, v2, v5, p1}, Lq0/a/a/a;->d(I[Lq0/a/a/a;ILq0/a/a/c;)V
+
+    :cond_2d
+    iget-object v0, p0, Lq0/a/a/r;->H:Lq0/a/a/a;
+
+    if-eqz v0, :cond_2e
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v2, v4}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v0, v2, p1}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_2e
+    iget-object v0, p0, Lq0/a/a/r;->I:Lq0/a/a/a;
+
+    if-eqz v0, :cond_2f
+
+    iget-object v2, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v2, v3}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v0, v2, p1}, Lq0/a/a/a;->c(ILq0/a/a/c;)V
+
+    :cond_2f
+    iget-object v0, p0, Lq0/a/a/r;->J:Lq0/a/a/c;
+
+    if-eqz v0, :cond_30
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v2, "AnnotationDefault"
+
+    invoke-virtual {v0, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->J:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->J:Lq0/a/a/c;
+
+    iget-object v2, v0, Lq0/a/a/c;->a:[B
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v2, v1, v0}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_30
+    iget-object v0, p0, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    if-eqz v0, :cond_31
+
+    iget-object v0, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    const-string v2, "MethodParameters"
+
+    invoke-virtual {v0, v2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    iget v0, p0, Lq0/a/a/r;->K:I
+
+    invoke-virtual {p1, v0}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget-object v0, p0, Lq0/a/a/r;->L:Lq0/a/a/c;
+
+    iget-object v2, v0, Lq0/a/a/c;->a:[B
+
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    invoke-virtual {p1, v2, v1, v0}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :cond_31
+    iget-object v0, p0, Lq0/a/a/r;->M:Lq0/a/a/b;
+
+    if-eqz v0, :cond_32
+
+    iget-object v1, p0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    invoke-virtual {v0, v1, p1}, Lq0/a/a/b;->d(Lq0/a/a/v;Lq0/a/a/c;)V
+
+    :cond_32
+    return-void
+.end method
+
+.method public z()V
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    iget-object v1, v0, Lq0/a/a/r;->V:[I
+
+    if-eqz v1, :cond_f
+
+    iget-object v1, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    if-nez v1, :cond_0
+
+    new-instance v1, Lq0/a/a/c;
+
+    invoke-direct {v1}, Lq0/a/a/c;-><init>()V
+
+    iput-object v1, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    :cond_0
+    iget-object v1, v0, Lq0/a/a/r;->W:[I
+
+    const/4 v2, 0x1
+
+    aget v3, v1, v2
+
+    const/4 v4, 0x2
+
+    aget v4, v1, v4
+
+    iget-object v5, v0, Lq0/a/a/r;->c:Lq0/a/a/v;
+
+    iget v5, v5, Lq0/a/a/v;->c:I
+
+    const/16 v6, 0x32
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x3
+
+    if-ge v5, v6, :cond_1
+
+    iget-object v5, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    aget v1, v1, v7
+
+    invoke-virtual {v5, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v5, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/2addr v3, v8
+
+    invoke-virtual {v0, v8, v3}, Lq0/a/a/r;->w(II)V
+
+    iget-object v1, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {v1, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/2addr v4, v3
+
+    invoke-virtual {v0, v3, v4}, Lq0/a/a/r;->w(II)V
+
+    goto/16 :goto_5
+
+    :cond_1
+    iget v5, v0, Lq0/a/a/r;->t:I
+
+    if-nez v5, :cond_2
+
+    aget v1, v1, v7
+
+    goto :goto_0
+
+    :cond_2
+    aget v1, v1, v7
+
+    iget-object v5, v0, Lq0/a/a/r;->V:[I
+
+    aget v5, v5, v7
+
+    sub-int/2addr v1, v5
+
+    sub-int/2addr v1, v2
+
+    :goto_0
+    iget-object v5, v0, Lq0/a/a/r;->V:[I
+
+    aget v5, v5, v2
+
+    sub-int v6, v3, v5
+
+    const/16 v9, 0xfb
+
+    const/16 v10, 0x40
+
+    const/16 v11, 0xf7
+
+    const/16 v12, 0xf8
+
+    const/16 v13, 0xfc
+
+    const/16 v14, 0xff
+
+    if-nez v4, :cond_4
+
+    packed-switch v6, :pswitch_data_0
+
+    goto :goto_1
+
+    :pswitch_0
+    const/16 v15, 0xfc
+
+    goto :goto_2
+
+    :pswitch_1
+    if-ge v1, v10, :cond_3
+
+    const/4 v15, 0x0
+
+    goto :goto_2
+
+    :cond_3
+    const/16 v15, 0xfb
+
+    goto :goto_2
+
+    :pswitch_2
+    const/16 v15, 0xf8
+
+    goto :goto_2
+
+    :cond_4
+    if-nez v6, :cond_6
+
+    if-ne v4, v2, :cond_6
+
+    const/16 v15, 0x3f
+
+    if-ge v1, v15, :cond_5
+
+    const/16 v15, 0x40
+
+    goto :goto_2
+
+    :cond_5
+    const/16 v15, 0xf7
+
+    goto :goto_2
+
+    :cond_6
+    :goto_1
+    const/16 v15, 0xff
+
+    :goto_2
+    if-eq v15, v14, :cond_8
+
+    const/16 v16, 0x3
+
+    :goto_3
+    if-ge v7, v5, :cond_8
+
+    if-ge v7, v3, :cond_8
+
+    iget-object v2, v0, Lq0/a/a/r;->W:[I
+
+    aget v2, v2, v16
+
+    iget-object v8, v0, Lq0/a/a/r;->V:[I
+
+    aget v8, v8, v16
+
+    if-eq v2, v8, :cond_7
+
+    const/16 v15, 0xff
+
+    goto :goto_4
+
+    :cond_7
+    add-int/lit8 v16, v16, 0x1
+
+    add-int/lit8 v7, v7, 0x1
+
+    const/4 v2, 0x1
+
+    const/4 v8, 0x3
+
+    goto :goto_3
+
+    :cond_8
+    :goto_4
+    if-eqz v15, :cond_e
+
+    if-eq v15, v10, :cond_d
+
+    if-eq v15, v11, :cond_c
+
+    if-eq v15, v12, :cond_b
+
+    if-eq v15, v9, :cond_a
+
+    if-eq v15, v13, :cond_9
+
+    iget-object v2, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {v2, v14}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    invoke-virtual {v2, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    const/4 v2, 0x3
+
+    add-int/2addr v3, v2
+
+    invoke-virtual {v0, v2, v3}, Lq0/a/a/r;->w(II)V
+
+    iget-object v1, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {v1, v4}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/2addr v4, v3
+
+    invoke-virtual {v0, v3, v4}, Lq0/a/a/r;->w(II)V
+
+    goto :goto_5
+
+    :cond_9
+    const/4 v2, 0x3
+
+    iget-object v4, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    add-int/2addr v6, v9
+
+    invoke-virtual {v4, v6}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v4, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/2addr v5, v2
+
+    add-int/2addr v3, v2
+
+    invoke-virtual {v0, v5, v3}, Lq0/a/a/r;->w(II)V
+
+    goto :goto_5
+
+    :cond_a
+    iget-object v2, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {v2, v9}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_5
+
+    :cond_b
+    iget-object v2, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    add-int/2addr v6, v9
+
+    invoke-virtual {v2, v6}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    goto :goto_5
+
+    :cond_c
+    iget-object v2, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {v2, v11}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v1, v3, 0x3
+
+    add-int/lit8 v3, v3, 0x4
+
+    invoke-virtual {v0, v1, v3}, Lq0/a/a/r;->w(II)V
+
+    goto :goto_5
+
+    :cond_d
+    iget-object v2, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    add-int/2addr v1, v10
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    add-int/lit8 v1, v3, 0x3
+
+    add-int/lit8 v3, v3, 0x4
+
+    invoke-virtual {v0, v1, v3}, Lq0/a/a/r;->w(II)V
+
+    goto :goto_5
+
+    :cond_e
+    iget-object v2, v0, Lq0/a/a/r;->u:Lq0/a/a/c;
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    :goto_5
+    iget v1, v0, Lq0/a/a/r;->t:I
+
+    const/4 v2, 0x1
+
+    add-int/2addr v1, v2
+
+    iput v1, v0, Lq0/a/a/r;->t:I
+
+    :cond_f
+    iget-object v1, v0, Lq0/a/a/r;->W:[I
+
+    iput-object v1, v0, Lq0/a/a/r;->V:[I
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Lq0/a/a/r;->W:[I
+
+    return-void
+
+    :pswitch_data_0
+    .packed-switch -0x3
+        :pswitch_2
+        :pswitch_2
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+        :pswitch_0
+        :pswitch_0
+    .end packed-switch
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/s.smali b/com.discord/smali_classes2/q0/a/a/s.smali
new file mode 100644
index 0000000000..3f7a42cd9b
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/s.smali
@@ -0,0 +1,93 @@
+.class public final Lq0/a/a/s;
+.super Ljava/lang/Object;
+.source "ModuleWriter.java"
+
+
+# instance fields
+.field public final a:Lq0/a/a/v;
+
+.field public final b:I
+
+.field public final c:I
+
+.field public final d:I
+
+.field public e:I
+
+.field public final f:Lq0/a/a/c;
+
+.field public g:I
+
+.field public final h:Lq0/a/a/c;
+
+.field public i:I
+
+.field public final j:Lq0/a/a/c;
+
+.field public k:I
+
+.field public final l:Lq0/a/a/c;
+
+.field public m:I
+
+.field public final n:Lq0/a/a/c;
+
+.field public o:I
+
+.field public final p:Lq0/a/a/c;
+
+.field public q:I
+
+
+# direct methods
+.method public constructor <init>(Lq0/a/a/v;III)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/s;->a:Lq0/a/a/v;
+
+    iput p2, p0, Lq0/a/a/s;->b:I
+
+    iput p3, p0, Lq0/a/a/s;->c:I
+
+    iput p4, p0, Lq0/a/a/s;->d:I
+
+    new-instance p1, Lq0/a/a/c;
+
+    invoke-direct {p1}, Lq0/a/a/c;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/s;->f:Lq0/a/a/c;
+
+    new-instance p1, Lq0/a/a/c;
+
+    invoke-direct {p1}, Lq0/a/a/c;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/s;->h:Lq0/a/a/c;
+
+    new-instance p1, Lq0/a/a/c;
+
+    invoke-direct {p1}, Lq0/a/a/c;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/s;->j:Lq0/a/a/c;
+
+    new-instance p1, Lq0/a/a/c;
+
+    invoke-direct {p1}, Lq0/a/a/c;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/s;->l:Lq0/a/a/c;
+
+    new-instance p1, Lq0/a/a/c;
+
+    invoke-direct {p1}, Lq0/a/a/c;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/s;->n:Lq0/a/a/c;
+
+    new-instance p1, Lq0/a/a/c;
+
+    invoke-direct {p1}, Lq0/a/a/c;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/s;->p:Lq0/a/a/c;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/t.smali b/com.discord/smali_classes2/q0/a/a/t.smali
new file mode 100644
index 0000000000..deb34f0faa
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/t.smali
@@ -0,0 +1,83 @@
+.class public interface abstract Lq0/a/a/t;
+.super Ljava/lang/Object;
+.source "Opcodes.java"
+
+
+# static fields
+.field public static final a:Ljava/lang/Integer;
+
+.field public static final b:Ljava/lang/Integer;
+
+.field public static final c:Ljava/lang/Integer;
+
+.field public static final d:Ljava/lang/Integer;
+
+.field public static final e:Ljava/lang/Integer;
+
+.field public static final f:Ljava/lang/Integer;
+
+.field public static final g:Ljava/lang/Integer;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/a/a/t;->a:Ljava/lang/Integer;
+
+    const/4 v0, 0x1
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/a/a/t;->b:Ljava/lang/Integer;
+
+    const/4 v0, 0x2
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/a/a/t;->c:Ljava/lang/Integer;
+
+    const/4 v0, 0x3
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/a/a/t;->d:Ljava/lang/Integer;
+
+    const/4 v0, 0x4
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/a/a/t;->e:Ljava/lang/Integer;
+
+    const/4 v0, 0x5
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/a/a/t;->f:Ljava/lang/Integer;
+
+    const/4 v0, 0x6
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/a/a/t;->g:Ljava/lang/Integer;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/u.smali b/com.discord/smali_classes2/q0/a/a/u.smali
new file mode 100644
index 0000000000..6ee015a836
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/u.smali
@@ -0,0 +1,64 @@
+.class public abstract Lq0/a/a/u;
+.super Ljava/lang/Object;
+.source "Symbol.java"
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:I
+
+.field public final c:Ljava/lang/String;
+
+.field public final d:Ljava/lang/String;
+
+.field public final e:Ljava/lang/String;
+
+.field public final f:J
+
+.field public g:I
+
+
+# direct methods
+.method public constructor <init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lq0/a/a/u;->a:I
+
+    iput p2, p0, Lq0/a/a/u;->b:I
+
+    iput-object p3, p0, Lq0/a/a/u;->c:Ljava/lang/String;
+
+    iput-object p4, p0, Lq0/a/a/u;->d:Ljava/lang/String;
+
+    iput-object p5, p0, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    iput-wide p6, p0, Lq0/a/a/u;->f:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()I
+    .locals 1
+
+    iget v0, p0, Lq0/a/a/u;->g:I
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-static {v0}, Lq0/a/a/w;->b(Ljava/lang/String;)I
+
+    move-result v0
+
+    iput v0, p0, Lq0/a/a/u;->g:I
+
+    :cond_0
+    iget v0, p0, Lq0/a/a/u;->g:I
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/v$a.smali b/com.discord/smali_classes2/q0/a/a/v$a.smali
new file mode 100644
index 0000000000..9b8a53ee40
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/v$a.smali
@@ -0,0 +1,128 @@
+.class public Lq0/a/a/v$a;
+.super Lq0/a/a/u;
+.source "SymbolTable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lq0/a/a/v;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final h:I
+
+.field public i:Lq0/a/a/v$a;
+
+
+# direct methods
+.method public constructor <init>(IIJI)V
+    .locals 8
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x0
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move v2, p2
+
+    move-wide v6, p3
+
+    invoke-direct/range {v0 .. v7}, Lq0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
+
+    iput p5, p0, Lq0/a/a/v$a;->h:I
+
+    return-void
+.end method
+
+.method public constructor <init>(IILjava/lang/String;I)V
+    .locals 8
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const-wide/16 v6, 0x0
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move v2, p2
+
+    move-object v5, p3
+
+    invoke-direct/range {v0 .. v7}, Lq0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
+
+    iput p4, p0, Lq0/a/a/v$a;->h:I
+
+    return-void
+.end method
+
+.method public constructor <init>(IILjava/lang/String;JI)V
+    .locals 8
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move v2, p2
+
+    move-object v5, p3
+
+    move-wide v6, p4
+
+    invoke-direct/range {v0 .. v7}, Lq0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
+
+    iput p6, p0, Lq0/a/a/v$a;->h:I
+
+    return-void
+.end method
+
+.method public constructor <init>(IILjava/lang/String;Ljava/lang/String;I)V
+    .locals 8
+
+    const/4 v3, 0x0
+
+    const-wide/16 v6, 0x0
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move v2, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    invoke-direct/range {v0 .. v7}, Lq0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
+
+    iput p5, p0, Lq0/a/a/v$a;->h:I
+
+    return-void
+.end method
+
+.method public constructor <init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
+    .locals 0
+
+    invoke-direct/range {p0 .. p7}, Lq0/a/a/u;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
+
+    iput p8, p0, Lq0/a/a/v$a;->h:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/v.smali b/com.discord/smali_classes2/q0/a/a/v.smali
new file mode 100644
index 0000000000..1cb54b2c07
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/v.smali
@@ -0,0 +1,1854 @@
+.class public final Lq0/a/a/v;
+.super Ljava/lang/Object;
+.source "SymbolTable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lq0/a/a/v$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lq0/a/a/f;
+
+.field public final b:Lq0/a/a/d;
+
+.field public c:I
+
+.field public d:Ljava/lang/String;
+
+.field public e:I
+
+.field public f:[Lq0/a/a/v$a;
+
+.field public g:I
+
+.field public h:Lq0/a/a/c;
+
+.field public i:I
+
+.field public j:Lq0/a/a/c;
+
+.field public k:I
+
+.field public l:[Lq0/a/a/v$a;
+
+
+# direct methods
+.method public constructor <init>(Lq0/a/a/f;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/v;->a:Lq0/a/a/f;
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lq0/a/a/v;->b:Lq0/a/a/d;
+
+    const/16 p1, 0x100
+
+    new-array p1, p1, [Lq0/a/a/v$a;
+
+    iput-object p1, p0, Lq0/a/a/v;->f:[Lq0/a/a/v$a;
+
+    const/4 p1, 0x1
+
+    iput p1, p0, Lq0/a/a/v;->g:I
+
+    new-instance p1, Lq0/a/a/c;
+
+    invoke-direct {p1}, Lq0/a/a/c;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    return-void
+.end method
+
+.method public static r(II)I
+    .locals 0
+
+    add-int/2addr p0, p1
+
+    const p1, 0x7fffffff
+
+    and-int/2addr p0, p1
+
+    return p0
+.end method
+
+.method public static s(ILjava/lang/String;Ljava/lang/String;I)I
+    .locals 0
+
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+
+    move-result p2
+
+    mul-int p2, p2, p1
+
+    add-int/lit8 p3, p3, 0x1
+
+    mul-int p3, p3, p2
+
+    add-int/2addr p3, p0
+
+    const p0, 0x7fffffff
+
+    and-int/2addr p0, p3
+
+    return p0
+.end method
+
+.method public static t(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+    .locals 0
+
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+
+    move-result p2
+
+    mul-int p2, p2, p1
+
+    invoke-virtual {p3}, Ljava/lang/String;->hashCode()I
+
+    move-result p1
+
+    mul-int p1, p1, p2
+
+    add-int/2addr p1, p0
+
+    const p0, 0x7fffffff
+
+    and-int/2addr p0, p1
+
+    return p0
+.end method
+
+.method public static u(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)I
+    .locals 0
+
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result p1
+
+    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+
+    move-result p2
+
+    mul-int p2, p2, p1
+
+    invoke-virtual {p3}, Ljava/lang/String;->hashCode()I
+
+    move-result p1
+
+    mul-int p1, p1, p2
+
+    mul-int p1, p1, p4
+
+    add-int/2addr p1, p0
+
+    const p0, 0x7fffffff
+
+    and-int/2addr p0, p1
+
+    return p0
+.end method
+
+
+# virtual methods
+.method public varargs a(Lq0/a/a/n;[Ljava/lang/Object;)Lq0/a/a/u;
+    .locals 9
+
+    iget-object v0, p0, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Lq0/a/a/c;
+
+    invoke-direct {v0}, Lq0/a/a/c;-><init>()V
+
+    iput-object v0, p0, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    :cond_0
+    array-length v1, p2
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_1
+
+    aget-object v4, p2, v3
+
+    invoke-virtual {p0, v4}, Lq0/a/a/v;->b(Ljava/lang/Object;)Lq0/a/a/u;
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    iget v1, v0, Lq0/a/a/c;->b:I
+
+    iget v4, p1, Lq0/a/a/n;->a:I
+
+    iget-object v5, p1, Lq0/a/a/n;->b:Ljava/lang/String;
+
+    iget-object v6, p1, Lq0/a/a/n;->c:Ljava/lang/String;
+
+    iget-object v7, p1, Lq0/a/a/n;->d:Ljava/lang/String;
+
+    iget-boolean v8, p1, Lq0/a/a/n;->e:Z
+
+    move-object v3, p0
+
+    invoke-virtual/range {v3 .. v8}, Lq0/a/a/v;->i(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lq0/a/a/u;
+
+    move-result-object v3
+
+    iget v3, v3, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v0, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    array-length v3, p2
+
+    invoke-virtual {v0, v3}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    array-length v3, p2
+
+    const/4 v4, 0x0
+
+    :goto_1
+    if-ge v4, v3, :cond_2
+
+    aget-object v5, p2, v4
+
+    invoke-virtual {p0, v5}, Lq0/a/a/v;->b(Ljava/lang/Object;)Lq0/a/a/u;
+
+    move-result-object v5
+
+    iget v5, v5, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v0, v5}, Lq0/a/a/c;->j(I)Lq0/a/a/c;
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    iget v0, v0, Lq0/a/a/c;->b:I
+
+    sub-int/2addr v0, v1
+
+    invoke-virtual {p1}, Lq0/a/a/n;->hashCode()I
+
+    move-result p1
+
+    array-length v3, p2
+
+    const/4 v4, 0x0
+
+    :goto_2
+    if-ge v4, v3, :cond_3
+
+    aget-object v5, p2, v4
+
+    invoke-virtual {v5}, Ljava/lang/Object;->hashCode()I
+
+    move-result v5
+
+    xor-int/2addr p1, v5
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const p2, 0x7fffffff
+
+    and-int v8, p1, p2
+
+    iget-object p1, p0, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    iget-object p1, p1, Lq0/a/a/c;->a:[B
+
+    iget-object p2, p0, Lq0/a/a/v;->f:[Lq0/a/a/v$a;
+
+    array-length v3, p2
+
+    rem-int v3, v8, v3
+
+    aget-object p2, p2, v3
+
+    :goto_3
+    if-eqz p2, :cond_7
+
+    iget v3, p2, Lq0/a/a/u;->b:I
+
+    const/16 v4, 0x40
+
+    if-ne v3, v4, :cond_6
+
+    iget v3, p2, Lq0/a/a/v$a;->h:I
+
+    if-ne v3, v8, :cond_6
+
+    iget-wide v3, p2, Lq0/a/a/u;->f:J
+
+    long-to-int v4, v3
+
+    const/4 v3, 0x0
+
+    :goto_4
+    if-ge v3, v0, :cond_5
+
+    add-int v5, v1, v3
+
+    aget-byte v5, p1, v5
+
+    add-int v6, v4, v3
+
+    aget-byte v6, p1, v6
+
+    if-eq v5, v6, :cond_4
+
+    const/4 v3, 0x0
+
+    goto :goto_5
+
+    :cond_4
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_4
+
+    :cond_5
+    const/4 v3, 0x1
+
+    :goto_5
+    if-eqz v3, :cond_6
+
+    iget-object p1, p0, Lq0/a/a/v;->j:Lq0/a/a/c;
+
+    iput v1, p1, Lq0/a/a/c;->b:I
+
+    goto :goto_6
+
+    :cond_6
+    iget-object p2, p2, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_3
+
+    :cond_7
+    new-instance p2, Lq0/a/a/v$a;
+
+    iget v4, p0, Lq0/a/a/v;->i:I
+
+    add-int/lit8 p1, v4, 0x1
+
+    iput p1, p0, Lq0/a/a/v;->i:I
+
+    const/16 v5, 0x40
+
+    int-to-long v6, v1
+
+    move-object v3, p2
+
+    invoke-direct/range {v3 .. v8}, Lq0/a/a/v$a;-><init>(IIJI)V
+
+    invoke-virtual {p0, p2}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    :goto_6
+    return-object p2
+.end method
+
+.method public b(Ljava/lang/Object;)Lq0/a/a/u;
+    .locals 6
+
+    instance-of v0, p1, Ljava/lang/Integer;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    instance-of v0, p1, Ljava/lang/Byte;
+
+    if-eqz v0, :cond_1
+
+    check-cast p1, Ljava/lang/Byte;
+
+    invoke-virtual {p1}, Ljava/lang/Byte;->intValue()I
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_1
+    instance-of v0, p1, Ljava/lang/Character;
+
+    if-eqz v0, :cond_2
+
+    check-cast p1, Ljava/lang/Character;
+
+    invoke-virtual {p1}, Ljava/lang/Character;->charValue()C
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_2
+    instance-of v0, p1, Ljava/lang/Short;
+
+    if-eqz v0, :cond_3
+
+    check-cast p1, Ljava/lang/Short;
+
+    invoke-virtual {p1}, Ljava/lang/Short;->intValue()I
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_3
+    instance-of v0, p1, Ljava/lang/Boolean;
+
+    if-eqz v0, :cond_4
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->e(I)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_4
+    instance-of v0, p1, Ljava/lang/Float;
+
+    if-eqz v0, :cond_5
+
+    check-cast p1, Ljava/lang/Float;
+
+    invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Float;->floatToRawIntBits(F)I
+
+    move-result p1
+
+    const/4 v0, 0x4
+
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/v;->f(II)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_5
+    instance-of v0, p1, Ljava/lang/Long;
+
+    if-eqz v0, :cond_6
+
+    check-cast p1, Ljava/lang/Long;
+
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    const/4 p1, 0x5
+
+    invoke-virtual {p0, p1, v0, v1}, Lq0/a/a/v;->g(IJ)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_6
+    instance-of v0, p1, Ljava/lang/Double;
+
+    if-eqz v0, :cond_7
+
+    check-cast p1, Ljava/lang/Double;
+
+    invoke-virtual {p1}, Ljava/lang/Double;->doubleValue()D
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Double;->doubleToRawLongBits(D)J
+
+    move-result-wide v0
+
+    const/4 p1, 0x6
+
+    invoke-virtual {p0, p1, v0, v1}, Lq0/a/a/v;->g(IJ)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_7
+    instance-of v0, p1, Ljava/lang/String;
+
+    if-eqz v0, :cond_8
+
+    check-cast p1, Ljava/lang/String;
+
+    const/16 v0, 0x8
+
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_8
+    instance-of v0, p1, Lq0/a/a/w;
+
+    if-eqz v0, :cond_b
+
+    check-cast p1, Lq0/a/a/w;
+
+    invoke-virtual {p1}, Lq0/a/a/w;->i()I
+
+    move-result v0
+
+    const/16 v1, 0xa
+
+    if-ne v0, v1, :cond_9
+
+    invoke-virtual {p1}, Lq0/a/a/w;->g()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_9
+    const/16 v1, 0xb
+
+    if-ne v0, v1, :cond_a
+
+    invoke-virtual {p1}, Lq0/a/a/w;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    const/16 v0, 0x10
+
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_a
+    invoke-virtual {p1}, Lq0/a/a/w;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->c(Ljava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_b
+    instance-of v0, p1, Lq0/a/a/n;
+
+    if-eqz v0, :cond_c
+
+    check-cast p1, Lq0/a/a/n;
+
+    iget v1, p1, Lq0/a/a/n;->a:I
+
+    iget-object v2, p1, Lq0/a/a/n;->b:Ljava/lang/String;
+
+    iget-object v3, p1, Lq0/a/a/n;->c:Ljava/lang/String;
+
+    iget-object v4, p1, Lq0/a/a/n;->d:Ljava/lang/String;
+
+    iget-boolean v5, p1, Lq0/a/a/n;->e:Z
+
+    move-object v0, p0
+
+    invoke-virtual/range {v0 .. v5}, Lq0/a/a/v;->i(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_c
+    instance-of v0, p1, Lq0/a/a/g;
+
+    if-eqz v0, :cond_d
+
+    check-cast p1, Lq0/a/a/g;
+
+    iget-object v0, p1, Lq0/a/a/g;->a:Ljava/lang/String;
+
+    iget-object v1, p1, Lq0/a/a/g;->b:Ljava/lang/String;
+
+    iget-object v2, p1, Lq0/a/a/g;->c:Lq0/a/a/n;
+
+    iget-object p1, p1, Lq0/a/a/g;->d:[Ljava/lang/Object;
+
+    invoke-virtual {p0, v2, p1}, Lq0/a/a/v;->a(Lq0/a/a/n;[Ljava/lang/Object;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    iget p1, p1, Lq0/a/a/u;->a:I
+
+    const/16 v2, 0x11
+
+    invoke-virtual {p0, v2, v0, v1, p1}, Lq0/a/a/v;->d(ILjava/lang/String;Ljava/lang/String;I)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_d
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "value "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public c(Ljava/lang/String;)Lq0/a/a/u;
+    .locals 1
+
+    const/4 v0, 0x7
+
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final d(ILjava/lang/String;Ljava/lang/String;I)Lq0/a/a/u;
+    .locals 10
+
+    invoke-static {p1, p2, p3, p4}, Lq0/a/a/v;->s(ILjava/lang/String;Ljava/lang/String;I)I
+
+    move-result v8
+
+    invoke-virtual {p0, v8}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget v1, v0, Lq0/a/a/u;->b:I
+
+    if-ne v1, p1, :cond_0
+
+    iget v1, v0, Lq0/a/a/v$a;->h:I
+
+    if-ne v1, v8, :cond_0
+
+    iget-wide v1, v0, Lq0/a/a/u;->f:J
+
+    int-to-long v3, p4
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_0
+
+    iget-object v1, v0, Lq0/a/a/u;->d:Ljava/lang/String;
+
+    invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, v0, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v1, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v0, v0, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    invoke-virtual {p0, p2, p3}, Lq0/a/a/v;->k(Ljava/lang/String;Ljava/lang/String;)I
+
+    move-result v1
+
+    invoke-virtual {v0, p1, p4, v1}, Lq0/a/a/c;->f(III)Lq0/a/a/c;
+
+    new-instance v9, Lq0/a/a/v$a;
+
+    iget v1, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v0, v1, 0x1
+
+    iput v0, p0, Lq0/a/a/v;->g:I
+
+    const/4 v3, 0x0
+
+    int-to-long v6, p4
+
+    move-object v0, v9
+
+    move v2, p1
+
+    move-object v4, p2
+
+    move-object v5, p3
+
+    invoke-direct/range {v0 .. v8}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
+
+    invoke-virtual {p0, v9}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    return-object v9
+.end method
+
+.method public e(I)Lq0/a/a/u;
+    .locals 1
+
+    const/4 v0, 0x3
+
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/v;->f(II)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final f(II)Lq0/a/a/u;
+    .locals 7
+
+    invoke-static {p1, p2}, Lq0/a/a/v;->r(II)I
+
+    move-result v5
+
+    invoke-virtual {p0, v5}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget v1, v0, Lq0/a/a/u;->b:I
+
+    if-ne v1, p1, :cond_0
+
+    iget v1, v0, Lq0/a/a/v$a;->h:I
+
+    if-ne v1, v5, :cond_0
+
+    iget-wide v1, v0, Lq0/a/a/u;->f:J
+
+    int-to-long v3, p2
+
+    cmp-long v6, v1, v3
+
+    if-nez v6, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v0, v0, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    invoke-virtual {v0, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {v0, p2}, Lq0/a/a/c;->i(I)Lq0/a/a/c;
+
+    new-instance v6, Lq0/a/a/v$a;
+
+    iget v1, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v0, v1, 0x1
+
+    iput v0, p0, Lq0/a/a/v;->g:I
+
+    int-to-long v3, p2
+
+    move-object v0, v6
+
+    move v2, p1
+
+    invoke-direct/range {v0 .. v5}, Lq0/a/a/v$a;-><init>(IIJI)V
+
+    invoke-virtual {p0, v6}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    return-object v6
+.end method
+
+.method public final g(IJ)Lq0/a/a/u;
+    .locals 10
+
+    long-to-int v0, p2
+
+    add-int v1, p1, v0
+
+    const/16 v2, 0x20
+
+    ushr-long v2, p2, v2
+
+    long-to-int v3, v2
+
+    add-int/2addr v1, v3
+
+    const v2, 0x7fffffff
+
+    and-int v9, v1, v2
+
+    invoke-virtual {p0, v9}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v1
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget v2, v1, Lq0/a/a/u;->b:I
+
+    if-ne v2, p1, :cond_0
+
+    iget v2, v1, Lq0/a/a/v$a;->h:I
+
+    if-ne v2, v9, :cond_0
+
+    iget-wide v4, v1, Lq0/a/a/u;->f:J
+
+    cmp-long v2, v4, p2
+
+    if-nez v2, :cond_0
+
+    return-object v1
+
+    :cond_0
+    iget-object v1, v1, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    iget v5, p0, Lq0/a/a/v;->g:I
+
+    iget-object v1, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    invoke-virtual {v1, p1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    iget v2, v1, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v4, v2, 0x8
+
+    iget-object v6, v1, Lq0/a/a/c;->a:[B
+
+    array-length v6, v6
+
+    if-le v4, v6, :cond_2
+
+    const/16 v4, 0x8
+
+    invoke-virtual {v1, v4}, Lq0/a/a/c;->b(I)V
+
+    :cond_2
+    iget-object v4, v1, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v6, v2, 0x1
+
+    ushr-int/lit8 v7, v3, 0x18
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v4, v2
+
+    add-int/lit8 v2, v6, 0x1
+
+    ushr-int/lit8 v7, v3, 0x10
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v4, v6
+
+    add-int/lit8 v6, v2, 0x1
+
+    ushr-int/lit8 v7, v3, 0x8
+
+    int-to-byte v7, v7
+
+    aput-byte v7, v4, v2
+
+    add-int/lit8 v2, v6, 0x1
+
+    int-to-byte v3, v3
+
+    aput-byte v3, v4, v6
+
+    add-int/lit8 v3, v2, 0x1
+
+    ushr-int/lit8 v6, v0, 0x18
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v4, v2
+
+    add-int/lit8 v2, v3, 0x1
+
+    ushr-int/lit8 v6, v0, 0x10
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v4, v3
+
+    add-int/lit8 v3, v2, 0x1
+
+    ushr-int/lit8 v6, v0, 0x8
+
+    int-to-byte v6, v6
+
+    aput-byte v6, v4, v2
+
+    add-int/lit8 v2, v3, 0x1
+
+    int-to-byte v0, v0
+
+    aput-byte v0, v4, v3
+
+    iput v2, v1, Lq0/a/a/c;->b:I
+
+    iget v0, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v0, v0, 0x2
+
+    iput v0, p0, Lq0/a/a/v;->g:I
+
+    new-instance v0, Lq0/a/a/v$a;
+
+    move-object v4, v0
+
+    move v6, p1
+
+    move-wide v7, p2
+
+    invoke-direct/range {v4 .. v9}, Lq0/a/a/v$a;-><init>(IIJI)V
+
+    invoke-virtual {p0, v0}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    return-object v0
+.end method
+
+.method public final h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lq0/a/a/v$a;
+    .locals 10
+
+    invoke-static {p1, p2, p3, p4}, Lq0/a/a/v;->t(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+
+    move-result v8
+
+    invoke-virtual {p0, v8}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget v1, v0, Lq0/a/a/u;->b:I
+
+    if-ne v1, p1, :cond_0
+
+    iget v1, v0, Lq0/a/a/v$a;->h:I
+
+    if-ne v1, v8, :cond_0
+
+    iget-object v1, v0, Lq0/a/a/u;->c:Ljava/lang/String;
+
+    invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, v0, Lq0/a/a/u;->d:Ljava/lang/String;
+
+    invoke-virtual {v1, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, v0, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v1, p4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v0, v0, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    const/4 v1, 0x7
+
+    invoke-virtual {p0, v1, p2}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p0, p3, p4}, Lq0/a/a/v;->k(Ljava/lang/String;Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v0, p1, v1, v2}, Lq0/a/a/c;->f(III)Lq0/a/a/c;
+
+    new-instance v9, Lq0/a/a/v$a;
+
+    iget v1, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v0, v1, 0x1
+
+    iput v0, p0, Lq0/a/a/v;->g:I
+
+    const-wide/16 v6, 0x0
+
+    move-object v0, v9
+
+    move v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    invoke-direct/range {v0 .. v8}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
+
+    invoke-virtual {p0, v9}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    return-object v9
+.end method
+
+.method public i(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lq0/a/a/u;
+    .locals 10
+
+    const/16 v0, 0xf
+
+    invoke-static {v0, p2, p3, p4, p1}, Lq0/a/a/v;->u(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)I
+
+    move-result v9
+
+    invoke-virtual {p0, v9}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v1
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget v2, v1, Lq0/a/a/u;->b:I
+
+    if-ne v2, v0, :cond_0
+
+    iget v2, v1, Lq0/a/a/v$a;->h:I
+
+    if-ne v2, v9, :cond_0
+
+    iget-wide v2, v1, Lq0/a/a/u;->f:J
+
+    int-to-long v4, p1
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    iget-object v2, v1, Lq0/a/a/u;->c:Ljava/lang/String;
+
+    invoke-virtual {v2, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v1, Lq0/a/a/u;->d:Ljava/lang/String;
+
+    invoke-virtual {v2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v1, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v2, p4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    return-object v1
+
+    :cond_0
+    iget-object v1, v1, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x4
+
+    if-gt p1, v1, :cond_2
+
+    iget-object p5, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    const/16 v1, 0x9
+
+    invoke-virtual {p0, v1, p2, p3, p4}, Lq0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lq0/a/a/v$a;
+
+    move-result-object v1
+
+    iget v1, v1, Lq0/a/a/u;->a:I
+
+    invoke-virtual {p5, v0, p1, v1}, Lq0/a/a/c;->d(III)Lq0/a/a/c;
+
+    goto :goto_2
+
+    :cond_2
+    iget-object v1, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    if-eqz p5, :cond_3
+
+    const/16 p5, 0xb
+
+    goto :goto_1
+
+    :cond_3
+    const/16 p5, 0xa
+
+    :goto_1
+    invoke-virtual {p0, p5, p2, p3, p4}, Lq0/a/a/v;->h(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lq0/a/a/v$a;
+
+    move-result-object p5
+
+    iget p5, p5, Lq0/a/a/u;->a:I
+
+    invoke-virtual {v1, v0, p1, p5}, Lq0/a/a/c;->d(III)Lq0/a/a/c;
+
+    :goto_2
+    new-instance p5, Lq0/a/a/v$a;
+
+    iget v2, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v0, v2, 0x1
+
+    iput v0, p0, Lq0/a/a/v;->g:I
+
+    const/16 v3, 0xf
+
+    int-to-long v7, p1
+
+    move-object v1, p5
+
+    move-object v4, p2
+
+    move-object v5, p3
+
+    move-object v6, p4
+
+    invoke-direct/range {v1 .. v9}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V
+
+    invoke-virtual {p0, p5}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    return-object p5
+.end method
+
+.method public j(Ljava/lang/String;)Lq0/a/a/u;
+    .locals 1
+
+    const/16 v0, 0x13
+
+    invoke-virtual {p0, v0, p1}, Lq0/a/a/v;->m(ILjava/lang/String;)Lq0/a/a/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public k(Ljava/lang/String;Ljava/lang/String;)I
+    .locals 9
+
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    mul-int v1, v1, v0
+
+    const/16 v0, 0xc
+
+    add-int/2addr v1, v0
+
+    const v2, 0x7fffffff
+
+    and-int v8, v1, v2
+
+    invoke-virtual {p0, v8}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v1
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget v2, v1, Lq0/a/a/u;->b:I
+
+    if-ne v2, v0, :cond_0
+
+    iget v2, v1, Lq0/a/a/v$a;->h:I
+
+    if-ne v2, v8, :cond_0
+
+    iget-object v2, v1, Lq0/a/a/u;->d:Ljava/lang/String;
+
+    invoke-virtual {v2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v1, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v2, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget p1, v1, Lq0/a/a/u;->a:I
+
+    return p1
+
+    :cond_0
+    iget-object v1, v1, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v1, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {p0, p2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v3
+
+    invoke-virtual {v1, v0, v2, v3}, Lq0/a/a/c;->f(III)Lq0/a/a/c;
+
+    new-instance v0, Lq0/a/a/v$a;
+
+    iget v4, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v1, v4, 0x1
+
+    iput v1, p0, Lq0/a/a/v;->g:I
+
+    const/16 v5, 0xc
+
+    move-object v3, v0
+
+    move-object v6, p1
+
+    move-object v7, p2
+
+    invoke-direct/range {v3 .. v8}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;Ljava/lang/String;I)V
+
+    invoke-virtual {p0, v0}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    iget p1, v0, Lq0/a/a/u;->a:I
+
+    return p1
+.end method
+
+.method public l(Ljava/lang/String;)I
+    .locals 10
+
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    add-int/2addr v0, v1
+
+    const v2, 0x7fffffff
+
+    and-int/2addr v0, v2
+
+    invoke-virtual {p0, v0}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v2
+
+    :goto_0
+    if-eqz v2, :cond_1
+
+    iget v3, v2, Lq0/a/a/u;->b:I
+
+    if-ne v3, v1, :cond_0
+
+    iget v3, v2, Lq0/a/a/v$a;->h:I
+
+    if-ne v3, v0, :cond_0
+
+    iget-object v3, v2, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v3, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    iget p1, v2, Lq0/a/a/u;->a:I
+
+    return p1
+
+    :cond_0
+    iget-object v2, v2, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v2, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    invoke-virtual {v2, v1}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    const v4, 0xffff
+
+    if-gt v3, v4, :cond_5
+
+    iget v5, v2, Lq0/a/a/c;->b:I
+
+    add-int/lit8 v6, v5, 0x2
+
+    add-int/2addr v6, v3
+
+    iget-object v7, v2, Lq0/a/a/c;->a:[B
+
+    array-length v7, v7
+
+    if-le v6, v7, :cond_2
+
+    add-int/lit8 v6, v3, 0x2
+
+    invoke-virtual {v2, v6}, Lq0/a/a/c;->b(I)V
+
+    :cond_2
+    iget-object v6, v2, Lq0/a/a/c;->a:[B
+
+    add-int/lit8 v7, v5, 0x1
+
+    ushr-int/lit8 v8, v3, 0x8
+
+    int-to-byte v8, v8
+
+    aput-byte v8, v6, v5
+
+    add-int/lit8 v5, v7, 0x1
+
+    int-to-byte v8, v3
+
+    aput-byte v8, v6, v7
+
+    const/4 v7, 0x0
+
+    :goto_1
+    if-ge v7, v3, :cond_4
+
+    invoke-virtual {p1, v7}, Ljava/lang/String;->charAt(I)C
+
+    move-result v8
+
+    if-lt v8, v1, :cond_3
+
+    const/16 v9, 0x7f
+
+    if-gt v8, v9, :cond_3
+
+    add-int/lit8 v9, v5, 0x1
+
+    int-to-byte v8, v8
+
+    aput-byte v8, v6, v5
+
+    add-int/lit8 v7, v7, 0x1
+
+    move v5, v9
+
+    goto :goto_1
+
+    :cond_3
+    iput v5, v2, Lq0/a/a/c;->b:I
+
+    invoke-virtual {v2, p1, v7, v4}, Lq0/a/a/c;->a(Ljava/lang/String;II)Lq0/a/a/c;
+
+    goto :goto_2
+
+    :cond_4
+    iput v5, v2, Lq0/a/a/c;->b:I
+
+    :goto_2
+    new-instance v2, Lq0/a/a/v$a;
+
+    iget v3, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v4, v3, 0x1
+
+    iput v4, p0, Lq0/a/a/v;->g:I
+
+    invoke-direct {v2, v3, v1, p1, v0}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;I)V
+
+    invoke-virtual {p0, v2}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    iget p1, v2, Lq0/a/a/u;->a:I
+
+    return p1
+
+    :cond_5
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "UTF8 string too large"
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final m(ILjava/lang/String;)Lq0/a/a/u;
+    .locals 4
+
+    invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    add-int/2addr v0, p1
+
+    const v1, 0x7fffffff
+
+    and-int/2addr v0, v1
+
+    invoke-virtual {p0, v0}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v1
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget v2, v1, Lq0/a/a/u;->b:I
+
+    if-ne v2, p1, :cond_0
+
+    iget v2, v1, Lq0/a/a/v$a;->h:I
+
+    if-ne v2, v0, :cond_0
+
+    iget-object v2, v1, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v2, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    return-object v1
+
+    :cond_0
+    iget-object v1, v1, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v1, p0, Lq0/a/a/v;->h:Lq0/a/a/c;
+
+    invoke-virtual {p0, p2}, Lq0/a/a/v;->l(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v1, p1, v2}, Lq0/a/a/c;->e(II)Lq0/a/a/c;
+
+    new-instance v1, Lq0/a/a/v$a;
+
+    iget v2, p0, Lq0/a/a/v;->g:I
+
+    add-int/lit8 v3, v2, 0x1
+
+    iput v3, p0, Lq0/a/a/v;->g:I
+
+    invoke-direct {v1, v2, p1, p2, v0}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;I)V
+
+    invoke-virtual {p0, v1}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    return-object v1
+.end method
+
+.method public n(Ljava/lang/String;)I
+    .locals 4
+
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    const/16 v1, 0x80
+
+    add-int/2addr v0, v1
+
+    const v2, 0x7fffffff
+
+    and-int/2addr v0, v2
+
+    invoke-virtual {p0, v0}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v2
+
+    :goto_0
+    if-eqz v2, :cond_1
+
+    iget v3, v2, Lq0/a/a/u;->b:I
+
+    if-ne v3, v1, :cond_0
+
+    iget v3, v2, Lq0/a/a/v$a;->h:I
+
+    if-ne v3, v0, :cond_0
+
+    iget-object v3, v2, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v3, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    iget p1, v2, Lq0/a/a/u;->a:I
+
+    return p1
+
+    :cond_0
+    iget-object v2, v2, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v2, Lq0/a/a/v$a;
+
+    iget v3, p0, Lq0/a/a/v;->k:I
+
+    invoke-direct {v2, v3, v1, p1, v0}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;I)V
+
+    invoke-virtual {p0, v2}, Lq0/a/a/v;->o(Lq0/a/a/v$a;)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final o(Lq0/a/a/v$a;)I
+    .locals 4
+
+    iget-object v0, p0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    if-nez v0, :cond_0
+
+    const/16 v0, 0x10
+
+    new-array v0, v0, [Lq0/a/a/v$a;
+
+    iput-object v0, p0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    :cond_0
+    iget v0, p0, Lq0/a/a/v;->k:I
+
+    iget-object v1, p0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    array-length v2, v1
+
+    if-ne v0, v2, :cond_1
+
+    array-length v0, v1
+
+    mul-int/lit8 v0, v0, 0x2
+
+    new-array v0, v0, [Lq0/a/a/v$a;
+
+    array-length v2, v1
+
+    const/4 v3, 0x0
+
+    invoke-static {v1, v3, v0, v3, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v0, p0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/v;->l:[Lq0/a/a/v$a;
+
+    iget v1, p0, Lq0/a/a/v;->k:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Lq0/a/a/v;->k:I
+
+    aput-object p1, v0, v1
+
+    invoke-virtual {p0, p1}, Lq0/a/a/v;->v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+
+    iget p1, p1, Lq0/a/a/u;->a:I
+
+    return p1
+.end method
+
+.method public p(Ljava/lang/String;I)I
+    .locals 10
+
+    invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
+
+    move-result v0
+
+    const/16 v1, 0x81
+
+    add-int/2addr v0, v1
+
+    add-int/2addr v0, p2
+
+    const v2, 0x7fffffff
+
+    and-int v9, v0, v2
+
+    invoke-virtual {p0, v9}, Lq0/a/a/v;->q(I)Lq0/a/a/v$a;
+
+    move-result-object v0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget v2, v0, Lq0/a/a/u;->b:I
+
+    if-ne v2, v1, :cond_0
+
+    iget v2, v0, Lq0/a/a/v$a;->h:I
+
+    if-ne v2, v9, :cond_0
+
+    iget-wide v2, v0, Lq0/a/a/u;->f:J
+
+    int-to-long v4, p2
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    iget-object v2, v0, Lq0/a/a/u;->e:Ljava/lang/String;
+
+    invoke-virtual {v2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget p1, v0, Lq0/a/a/u;->a:I
+
+    return p1
+
+    :cond_0
+    iget-object v0, v0, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Lq0/a/a/v$a;
+
+    iget v4, p0, Lq0/a/a/v;->k:I
+
+    const/16 v5, 0x81
+
+    int-to-long v7, p2
+
+    move-object v3, v0
+
+    move-object v6, p1
+
+    invoke-direct/range {v3 .. v9}, Lq0/a/a/v$a;-><init>(IILjava/lang/String;JI)V
+
+    invoke-virtual {p0, v0}, Lq0/a/a/v;->o(Lq0/a/a/v$a;)I
+
+    move-result p1
+
+    return p1
+.end method
+
+.method public final q(I)Lq0/a/a/v$a;
+    .locals 2
+
+    iget-object v0, p0, Lq0/a/a/v;->f:[Lq0/a/a/v$a;
+
+    array-length v1, v0
+
+    rem-int/2addr p1, v1
+
+    aget-object p1, v0, p1
+
+    return-object p1
+.end method
+
+.method public final v(Lq0/a/a/v$a;)Lq0/a/a/v$a;
+    .locals 7
+
+    iget v0, p0, Lq0/a/a/v;->e:I
+
+    iget-object v1, p0, Lq0/a/a/v;->f:[Lq0/a/a/v$a;
+
+    array-length v2, v1
+
+    mul-int/lit8 v2, v2, 0x3
+
+    div-int/lit8 v2, v2, 0x4
+
+    if-le v0, v2, :cond_2
+
+    array-length v0, v1
+
+    mul-int/lit8 v1, v0, 0x2
+
+    add-int/lit8 v1, v1, 0x1
+
+    new-array v2, v1, [Lq0/a/a/v$a;
+
+    add-int/lit8 v0, v0, -0x1
+
+    :goto_0
+    if-ltz v0, :cond_1
+
+    iget-object v3, p0, Lq0/a/a/v;->f:[Lq0/a/a/v$a;
+
+    aget-object v3, v3, v0
+
+    :goto_1
+    if-eqz v3, :cond_0
+
+    iget v4, v3, Lq0/a/a/v$a;->h:I
+
+    rem-int/2addr v4, v1
+
+    iget-object v5, v3, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    aget-object v6, v2, v4
+
+    iput-object v6, v3, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    aput-object v3, v2, v4
+
+    move-object v3, v5
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v0, v0, -0x1
+
+    goto :goto_0
+
+    :cond_1
+    iput-object v2, p0, Lq0/a/a/v;->f:[Lq0/a/a/v$a;
+
+    :cond_2
+    iget v0, p0, Lq0/a/a/v;->e:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lq0/a/a/v;->e:I
+
+    iget v0, p1, Lq0/a/a/v$a;->h:I
+
+    iget-object v1, p0, Lq0/a/a/v;->f:[Lq0/a/a/v$a;
+
+    array-length v2, v1
+
+    rem-int/2addr v0, v2
+
+    aget-object v2, v1, v0
+
+    iput-object v2, p1, Lq0/a/a/v$a;->i:Lq0/a/a/v$a;
+
+    aput-object p1, v1, v0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/w.smali b/com.discord/smali_classes2/q0/a/a/w.smali
new file mode 100644
index 0000000000..9a08ba3f06
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/w.smali
@@ -0,0 +1,1257 @@
+.class public final Lq0/a/a/w;
+.super Ljava/lang/Object;
+.source "Type.java"
+
+
+# static fields
+.field public static final e:Lq0/a/a/w;
+
+.field public static final f:Lq0/a/a/w;
+
+.field public static final g:Lq0/a/a/w;
+
+.field public static final h:Lq0/a/a/w;
+
+.field public static final i:Lq0/a/a/w;
+
+.field public static final j:Lq0/a/a/w;
+
+.field public static final k:Lq0/a/a/w;
+
+.field public static final l:Lq0/a/a/w;
+
+.field public static final m:Lq0/a/a/w;
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:Ljava/lang/String;
+
+.field public final c:I
+
+.field public final d:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v1, 0x0
+
+    const-string v2, "VZCBSIFJD"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v0, v1, v2, v1, v3}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->e:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v1, 0x2
+
+    invoke-direct {v0, v3, v2, v3, v1}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->f:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v3, 0x3
+
+    invoke-direct {v0, v1, v2, v1, v3}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->g:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v1, 0x4
+
+    invoke-direct {v0, v3, v2, v3, v1}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->h:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v3, 0x5
+
+    invoke-direct {v0, v1, v2, v1, v3}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->i:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v1, 0x6
+
+    invoke-direct {v0, v3, v2, v3, v1}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->j:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v3, 0x7
+
+    invoke-direct {v0, v1, v2, v1, v3}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->k:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/16 v1, 0x8
+
+    invoke-direct {v0, v3, v2, v3, v1}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->l:Lq0/a/a/w;
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/16 v3, 0x9
+
+    invoke-direct {v0, v1, v2, v1, v3}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    sput-object v0, Lq0/a/a/w;->m:Lq0/a/a/w;
+
+    return-void
+.end method
+
+.method public constructor <init>(ILjava/lang/String;II)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Lq0/a/a/w;->a:I
+
+    iput-object p2, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iput p3, p0, Lq0/a/a/w;->c:I
+
+    iput p4, p0, Lq0/a/a/w;->d:I
+
+    return-void
+.end method
+
+.method public static a(Ljava/lang/String;)[Lq0/a/a/w;
+    .locals 10
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    :goto_0
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    const/16 v5, 0x3b
+
+    const/16 v6, 0x4c
+
+    const/16 v7, 0x5b
+
+    const/16 v8, 0x29
+
+    if-eq v4, v8, :cond_2
+
+    :goto_1
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    if-ne v4, v7, :cond_0
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v4, v2, 0x1
+
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    if-ne v2, v6, :cond_1
+
+    invoke-virtual {p0, v5, v4}, Ljava/lang/String;->indexOf(II)I
+
+    move-result v2
+
+    add-int/2addr v2, v1
+
+    goto :goto_2
+
+    :cond_1
+    move v2, v4
+
+    :goto_2
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    new-array v2, v3, [Lq0/a/a/w;
+
+    const/4 v3, 0x1
+
+    :goto_3
+    invoke-virtual {p0, v3}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    if-eq v4, v8, :cond_5
+
+    move v4, v3
+
+    :goto_4
+    invoke-virtual {p0, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v9
+
+    if-ne v9, v7, :cond_3
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_4
+
+    :cond_3
+    add-int/lit8 v9, v4, 0x1
+
+    invoke-virtual {p0, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v4
+
+    if-ne v4, v6, :cond_4
+
+    invoke-virtual {p0, v5, v9}, Ljava/lang/String;->indexOf(II)I
+
+    move-result v4
+
+    add-int/lit8 v9, v4, 0x1
+
+    :cond_4
+    add-int/lit8 v4, v0, 0x1
+
+    invoke-static {p0, v3, v9}, Lq0/a/a/w;->k(Ljava/lang/String;II)Lq0/a/a/w;
+
+    move-result-object v3
+
+    aput-object v3, v2, v0
+
+    move v0, v4
+
+    move v3, v9
+
+    goto :goto_3
+
+    :cond_5
+    return-object v2
+.end method
+
+.method public static b(Ljava/lang/String;)I
+    .locals 7
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p0, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x1
+
+    :goto_0
+    const/16 v4, 0x29
+
+    const/16 v5, 0x44
+
+    const/16 v6, 0x4a
+
+    if-eq v1, v4, :cond_4
+
+    if-eq v1, v6, :cond_3
+
+    if-ne v1, v5, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    :goto_1
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v4, 0x5b
+
+    if-ne v1, v4, :cond_1
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    add-int/lit8 v1, v2, 0x1
+
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    const/16 v4, 0x4c
+
+    if-ne v2, v4, :cond_2
+
+    const/16 v2, 0x3b
+
+    invoke-virtual {p0, v2, v1}, Ljava/lang/String;->indexOf(II)I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    :cond_2
+    add-int/lit8 v3, v3, 0x1
+
+    move v2, v1
+
+    goto :goto_3
+
+    :cond_3
+    :goto_2
+    add-int/lit8 v2, v2, 0x1
+
+    add-int/lit8 v3, v3, 0x2
+
+    :goto_3
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    goto :goto_0
+
+    :cond_4
+    add-int/2addr v2, v0
+
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result p0
+
+    const/16 v1, 0x56
+
+    const/4 v2, 0x2
+
+    if-ne p0, v1, :cond_5
+
+    shl-int/lit8 p0, v3, 0x2
+
+    return p0
+
+    :cond_5
+    if-eq p0, v6, :cond_6
+
+    if-ne p0, v5, :cond_7
+
+    :cond_6
+    const/4 v0, 0x2
+
+    :cond_7
+    shl-int/lit8 p0, v3, 0x2
+
+    or-int/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static e(Ljava/lang/Class;)Ljava/lang/String;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/String;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    :goto_0
+    invoke-virtual {p0}, Ljava/lang/Class;->isArray()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    const/16 v1, 0x5b
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/lang/Class;->isPrimitive()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_a
+
+    sget-object v1, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_1
+
+    const/16 p0, 0x49
+
+    goto :goto_1
+
+    :cond_1
+    sget-object v1, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_2
+
+    const/16 p0, 0x56
+
+    goto :goto_1
+
+    :cond_2
+    sget-object v1, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_3
+
+    const/16 p0, 0x5a
+
+    goto :goto_1
+
+    :cond_3
+    sget-object v1, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_4
+
+    const/16 p0, 0x42
+
+    goto :goto_1
+
+    :cond_4
+    sget-object v1, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_5
+
+    const/16 p0, 0x43
+
+    goto :goto_1
+
+    :cond_5
+    sget-object v1, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_6
+
+    const/16 p0, 0x53
+
+    goto :goto_1
+
+    :cond_6
+    sget-object v1, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_7
+
+    const/16 p0, 0x44
+
+    goto :goto_1
+
+    :cond_7
+    sget-object v1, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_8
+
+    const/16 p0, 0x46
+
+    goto :goto_1
+
+    :cond_8
+    sget-object v1, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v1, :cond_9
+
+    const/16 p0, 0x4a
+
+    :goto_1
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_3
+
+    :cond_9
+    new-instance p0, Ljava/lang/AssertionError;
+
+    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p0
+
+    :cond_a
+    const/16 v1, 0x4c
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    :goto_2
+    if-ge v2, v1, :cond_c
+
+    invoke-virtual {p0, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v3
+
+    const/16 v4, 0x2e
+
+    if-ne v3, v4, :cond_b
+
+    const/16 v3, 0x2f
+
+    :cond_b
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_2
+
+    :cond_c
+    const/16 p0, 0x3b
+
+    invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :goto_3
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static h(Ljava/lang/String;)Lq0/a/a/w;
+    .locals 4
+
+    new-instance v0, Lq0/a/a/w;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v2
+
+    const/16 v3, 0x5b
+
+    if-ne v2, v3, :cond_0
+
+    const/16 v2, 0x9
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v2, 0xc
+
+    :goto_0
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    invoke-direct {v0, v2, p0, v1, v3}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    return-object v0
+.end method
+
+.method public static j(Ljava/lang/Class;)Lq0/a/a/w;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Lq0/a/a/w;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/lang/Class;->isPrimitive()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_9
+
+    sget-object v0, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_0
+
+    sget-object p0, Lq0/a/a/w;->j:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_0
+    sget-object v0, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_1
+
+    sget-object p0, Lq0/a/a/w;->e:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_1
+    sget-object v0, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_2
+
+    sget-object p0, Lq0/a/a/w;->f:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_2
+    sget-object v0, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_3
+
+    sget-object p0, Lq0/a/a/w;->h:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_3
+    sget-object v0, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_4
+
+    sget-object p0, Lq0/a/a/w;->g:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_4
+    sget-object v0, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_5
+
+    sget-object p0, Lq0/a/a/w;->i:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_5
+    sget-object v0, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_6
+
+    sget-object p0, Lq0/a/a/w;->m:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_6
+    sget-object v0, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_7
+
+    sget-object p0, Lq0/a/a/w;->k:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_7
+    sget-object v0, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    if-ne p0, v0, :cond_8
+
+    sget-object p0, Lq0/a/a/w;->l:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_8
+    new-instance p0, Ljava/lang/AssertionError;
+
+    invoke-direct {p0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p0
+
+    :cond_9
+    invoke-static {p0}, Lq0/a/a/w;->e(Ljava/lang/Class;)Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    invoke-static {p0, v1, v0}, Lq0/a/a/w;->k(Ljava/lang/String;II)Lq0/a/a/w;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static k(Ljava/lang/String;II)Lq0/a/a/w;
+    .locals 2
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v0
+
+    const/16 v1, 0x28
+
+    if-eq v0, v1, :cond_8
+
+    const/16 v1, 0x46
+
+    if-eq v0, v1, :cond_7
+
+    const/16 v1, 0x4c
+
+    if-eq v0, v1, :cond_6
+
+    const/16 v1, 0x53
+
+    if-eq v0, v1, :cond_5
+
+    const/16 v1, 0x56
+
+    if-eq v0, v1, :cond_4
+
+    const/16 v1, 0x49
+
+    if-eq v0, v1, :cond_3
+
+    const/16 v1, 0x4a
+
+    if-eq v0, v1, :cond_2
+
+    const/16 v1, 0x5a
+
+    if-eq v0, v1, :cond_1
+
+    const/16 v1, 0x5b
+
+    if-eq v0, v1, :cond_0
+
+    packed-switch v0, :pswitch_data_0
+
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p0
+
+    :pswitch_0
+    sget-object p0, Lq0/a/a/w;->m:Lq0/a/a/w;
+
+    return-object p0
+
+    :pswitch_1
+    sget-object p0, Lq0/a/a/w;->g:Lq0/a/a/w;
+
+    return-object p0
+
+    :pswitch_2
+    sget-object p0, Lq0/a/a/w;->h:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_0
+    new-instance v0, Lq0/a/a/w;
+
+    const/16 v1, 0x9
+
+    invoke-direct {v0, v1, p0, p1, p2}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    return-object v0
+
+    :cond_1
+    sget-object p0, Lq0/a/a/w;->f:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_2
+    sget-object p0, Lq0/a/a/w;->l:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_3
+    sget-object p0, Lq0/a/a/w;->j:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_4
+    sget-object p0, Lq0/a/a/w;->e:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_5
+    sget-object p0, Lq0/a/a/w;->i:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_6
+    new-instance v0, Lq0/a/a/w;
+
+    const/16 v1, 0xa
+
+    add-int/lit8 p1, p1, 0x1
+
+    add-int/lit8 p2, p2, -0x1
+
+    invoke-direct {v0, v1, p0, p1, p2}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    return-object v0
+
+    :cond_7
+    sget-object p0, Lq0/a/a/w;->k:Lq0/a/a/w;
+
+    return-object p0
+
+    :cond_8
+    new-instance v0, Lq0/a/a/w;
+
+    const/16 v1, 0xb
+
+    invoke-direct {v0, v1, p0, p1, p2}, Lq0/a/a/w;-><init>(ILjava/lang/String;II)V
+
+    return-object v0
+
+    :pswitch_data_0
+    .packed-switch 0x42
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
+.end method
+
+
+# virtual methods
+.method public c()Ljava/lang/String;
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/w;->a:I
+
+    packed-switch v0, :pswitch_data_0
+
+    :pswitch_0
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :pswitch_1
+    iget-object v0, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iget v1, p0, Lq0/a/a/w;->c:I
+
+    iget v2, p0, Lq0/a/a/w;->d:I
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/16 v1, 0x2f
+
+    const/16 v2, 0x2e
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->replace(CC)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :pswitch_2
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lq0/a/a/w;->f()I
+
+    move-result v1
+
+    iget-object v2, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iget v3, p0, Lq0/a/a/w;->c:I
+
+    add-int/2addr v3, v1
+
+    iget v1, p0, Lq0/a/a/w;->d:I
+
+    invoke-static {v2, v3, v1}, Lq0/a/a/w;->k(Ljava/lang/String;II)Lq0/a/a/w;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lq0/a/a/w;->c()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lq0/a/a/w;->f()I
+
+    move-result v1
+
+    :goto_0
+    if-lez v1, :cond_0
+
+    const-string v2, "[]"
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v1, v1, -0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :pswitch_3
+    const-string v0, "double"
+
+    return-object v0
+
+    :pswitch_4
+    const-string v0, "long"
+
+    return-object v0
+
+    :pswitch_5
+    const-string v0, "float"
+
+    return-object v0
+
+    :pswitch_6
+    const-string v0, "int"
+
+    return-object v0
+
+    :pswitch_7
+    const-string v0, "short"
+
+    return-object v0
+
+    :pswitch_8
+    const-string v0, "byte"
+
+    return-object v0
+
+    :pswitch_9
+    const-string v0, "char"
+
+    return-object v0
+
+    :pswitch_a
+    const-string v0, "boolean"
+
+    return-object v0
+
+    :pswitch_b
+    const-string v0, "void"
+
+    return-object v0
+
+    :pswitch_data_0
+    .packed-switch 0x0
+        :pswitch_b
+        :pswitch_a
+        :pswitch_9
+        :pswitch_8
+        :pswitch_7
+        :pswitch_6
+        :pswitch_5
+        :pswitch_4
+        :pswitch_3
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+        :pswitch_1
+    .end packed-switch
+.end method
+
+.method public d()Ljava/lang/String;
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/w;->a:I
+
+    const/16 v1, 0xa
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iget v1, p0, Lq0/a/a/w;->c:I
+
+    add-int/lit8 v1, v1, -0x1
+
+    iget v2, p0, Lq0/a/a/w;->d:I
+
+    add-int/lit8 v2, v2, 0x1
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    const/16 v1, 0xc
+
+    if-ne v0, v1, :cond_1
+
+    const/16 v0, 0x4c
+
+    invoke-static {v0}, Lf/e/b/a/a;->B(C)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iget v2, p0, Lq0/a/a/w;->c:I
+
+    iget v3, p0, Lq0/a/a/w;->d:I
+
+    invoke-virtual {v0, v1, v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x3b
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_1
+    iget-object v0, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iget v1, p0, Lq0/a/a/w;->c:I
+
+    iget v2, p0, Lq0/a/a/w;->d:I
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 7
+
+    const/4 v0, 0x1
+
+    if-ne p0, p1, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lq0/a/a/w;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_1
+
+    return v2
+
+    :cond_1
+    check-cast p1, Lq0/a/a/w;
+
+    iget v1, p0, Lq0/a/a/w;->a:I
+
+    const/16 v3, 0xa
+
+    const/16 v4, 0xc
+
+    if-ne v1, v4, :cond_2
+
+    const/16 v1, 0xa
+
+    :cond_2
+    iget v5, p1, Lq0/a/a/w;->a:I
+
+    if-ne v5, v4, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    move v3, v5
+
+    :goto_0
+    if-eq v1, v3, :cond_4
+
+    return v2
+
+    :cond_4
+    iget v1, p0, Lq0/a/a/w;->c:I
+
+    iget v3, p0, Lq0/a/a/w;->d:I
+
+    iget v4, p1, Lq0/a/a/w;->c:I
+
+    iget v5, p1, Lq0/a/a/w;->d:I
+
+    sub-int v6, v3, v1
+
+    sub-int/2addr v5, v4
+
+    if-eq v6, v5, :cond_5
+
+    return v2
+
+    :cond_5
+    :goto_1
+    if-ge v1, v3, :cond_7
+
+    iget-object v5, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    invoke-virtual {v5, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v5
+
+    iget-object v6, p1, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    invoke-virtual {v6, v4}, Ljava/lang/String;->charAt(I)C
+
+    move-result v6
+
+    if-eq v5, v6, :cond_6
+
+    return v2
+
+    :cond_6
+    add-int/lit8 v1, v1, 0x1
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_1
+
+    :cond_7
+    return v0
+.end method
+
+.method public f()I
+    .locals 3
+
+    const/4 v0, 0x1
+
+    :goto_0
+    iget-object v1, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iget v2, p0, Lq0/a/a/w;->c:I
+
+    add-int/2addr v2, v0
+
+    invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C
+
+    move-result v1
+
+    const/16 v2, 0x5b
+
+    if-ne v1, v2, :cond_0
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return v0
+.end method
+
+.method public g()Ljava/lang/String;
+    .locals 3
+
+    iget-object v0, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    iget v1, p0, Lq0/a/a/w;->c:I
+
+    iget v2, p0, Lq0/a/a/w;->d:I
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 4
+
+    iget v0, p0, Lq0/a/a/w;->a:I
+
+    const/16 v1, 0xc
+
+    if-ne v0, v1, :cond_0
+
+    const/16 v0, 0xa
+
+    :cond_0
+    mul-int/lit8 v0, v0, 0xd
+
+    iget v1, p0, Lq0/a/a/w;->a:I
+
+    const/16 v2, 0x9
+
+    if-lt v1, v2, :cond_1
+
+    iget v1, p0, Lq0/a/a/w;->c:I
+
+    iget v2, p0, Lq0/a/a/w;->d:I
+
+    :goto_0
+    if-ge v1, v2, :cond_1
+
+    iget-object v3, p0, Lq0/a/a/w;->b:Ljava/lang/String;
+
+    invoke-virtual {v3, v1}, Ljava/lang/String;->charAt(I)C
+
+    move-result v3
+
+    add-int/2addr v3, v0
+
+    mul-int/lit8 v0, v3, 0x11
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return v0
+.end method
+
+.method public i()I
+    .locals 2
+
+    iget v0, p0, Lq0/a/a/w;->a:I
+
+    const/16 v1, 0xc
+
+    if-ne v0, v1, :cond_0
+
+    const/16 v0, 0xa
+
+    :cond_0
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p0}, Lq0/a/a/w;->d()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/a/a/x.smali b/com.discord/smali_classes2/q0/a/a/x.smali
new file mode 100644
index 0000000000..b44bc2d26d
--- /dev/null
+++ b/com.discord/smali_classes2/q0/a/a/x.smali
@@ -0,0 +1,152 @@
+.class public final Lq0/a/a/x;
+.super Ljava/lang/Object;
+.source "TypePath.java"
+
+
+# instance fields
+.field public final a:[B
+
+.field public final b:I
+
+
+# direct methods
+.method public constructor <init>([BI)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/a/a/x;->a:[B
+
+    iput p2, p0, Lq0/a/a/x;->b:I
+
+    return-void
+.end method
+
+.method public static a(Lq0/a/a/x;Lq0/a/a/c;)V
+    .locals 2
+
+    if-nez p0, :cond_0
+
+    const/4 p0, 0x0
+
+    invoke-virtual {p1, p0}, Lq0/a/a/c;->g(I)Lq0/a/a/c;
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lq0/a/a/x;->a:[B
+
+    iget p0, p0, Lq0/a/a/x;->b:I
+
+    aget-byte v1, v0, p0
+
+    mul-int/lit8 v1, v1, 0x2
+
+    add-int/lit8 v1, v1, 0x1
+
+    invoke-virtual {p1, v0, p0, v1}, Lq0/a/a/c;->h([BII)Lq0/a/a/c;
+
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 9
+
+    iget-object v0, p0, Lq0/a/a/x;->a:[B
+
+    iget v1, p0, Lq0/a/a/x;->b:I
+
+    aget-byte v0, v0, v1
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    mul-int/lit8 v2, v0, 0x2
+
+    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v0, :cond_4
+
+    iget-object v3, p0, Lq0/a/a/x;->a:[B
+
+    iget v4, p0, Lq0/a/a/x;->b:I
+
+    mul-int/lit8 v5, v2, 0x2
+
+    add-int v6, v5, v4
+
+    const/4 v7, 0x1
+
+    add-int/2addr v6, v7
+
+    aget-byte v6, v3, v6
+
+    if-eqz v6, :cond_3
+
+    if-eq v6, v7, :cond_2
+
+    const/4 v7, 0x2
+
+    if-eq v6, v7, :cond_1
+
+    const/4 v8, 0x3
+
+    if-ne v6, v8, :cond_0
+
+    add-int/2addr v5, v4
+
+    add-int/2addr v5, v7
+
+    aget-byte v3, v3, v5
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const/16 v3, 0x3b
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_1
+
+    :cond_0
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+
+    :cond_1
+    const/16 v3, 0x2a
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_1
+
+    :cond_2
+    const/16 v3, 0x2e
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    goto :goto_1
+
+    :cond_3
+    const/16 v3, 0x5b
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    :goto_1
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_4
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/b.smali b/com.discord/smali_classes2/q0/b.smali
deleted file mode 100644
index 2e8e9934b8..0000000000
--- a/com.discord/smali_classes2/q0/b.smali
+++ /dev/null
@@ -1,62 +0,0 @@
-.class public interface abstract Lq0/b;
-.super Ljava/lang/Object;
-.source "Call.java"
-
-# interfaces
-.implements Ljava/lang/Cloneable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Cloneable;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract Z(Lq0/d;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/d<",
-            "TT;>;)V"
-        }
-    .end annotation
-.end method
-
-.method public abstract cancel()V
-.end method
-
-.method public abstract e0()Lq0/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lq0/b<",
-            "TT;>;"
-        }
-    .end annotation
-.end method
-
-.method public abstract execute()Lq0/n;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lq0/n<",
-            "TT;>;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract k()Z
-.end method
diff --git a/com.discord/smali_classes2/q0/b/a/a.smali b/com.discord/smali_classes2/q0/b/a/a.smali
new file mode 100644
index 0000000000..4084ca60f0
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/a.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Lq0/b/a/a;
+.super Ljava/lang/Object;
+.source "ObjectInstantiator.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract newInstance()Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/b/a.smali b/com.discord/smali_classes2/q0/b/a/b/a.smali
new file mode 100644
index 0000000000..df44d94579
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/b/a.smali
@@ -0,0 +1,156 @@
+.class public Lq0/b/a/b/a;
+.super Ljava/lang/Object;
+.source "Android10Instantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/b/a/b/a;->a:Ljava/lang/Class;
+
+    :try_start_0
+    const-class p1, Ljava/io/ObjectInputStream;
+
+    const-string v0, "newInstance"
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Ljava/lang/Class;
+
+    const/4 v2, 0x0
+
+    const-class v3, Ljava/lang/Class;
+
+    aput-object v3, v1, v2
+
+    const-class v2, Ljava/lang/Class;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+    iput-object p1, p0, Lq0/b/a/b/a;->b:Ljava/lang/reflect/Method;
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/b/a;->a:Ljava/lang/Class;
+
+    iget-object v1, p0, Lq0/b/a/b/a;->b:Ljava/lang/reflect/Method;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    iget-object v5, p0, Lq0/b/a/b/a;->a:Ljava/lang/Class;
+
+    aput-object v5, v3, v4
+
+    const/4 v4, 0x1
+
+    const-class v5, Ljava/lang/Object;
+
+    aput-object v5, v3, v4
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/b/b.smali b/com.discord/smali_classes2/q0/b/a/b/b.smali
new file mode 100644
index 0000000000..4389098b10
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/b/b.smali
@@ -0,0 +1,232 @@
+.class public Lq0/b/a/b/b;
+.super Ljava/lang/Object;
+.source "Android17Instantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/lang/reflect/Method;
+
+.field public final c:Ljava/lang/Integer;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/b/a/b/b;->a:Ljava/lang/Class;
+
+    :try_start_0
+    const-class p1, Ljava/io/ObjectStreamClass;
+
+    const-string v0, "newInstance"
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Ljava/lang/Class;
+
+    const-class v2, Ljava/lang/Class;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    sget-object v2, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    const/4 v4, 0x1
+
+    aput-object v2, v1, v4
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_5
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_4
+
+    iput-object p1, p0, Lq0/b/a/b/b;->b:Ljava/lang/reflect/Method;
+
+    :try_start_1
+    const-class p1, Ljava/io/ObjectStreamClass;
+
+    const-string v0, "getConstructorId"
+
+    new-array v1, v4, [Ljava/lang/Class;
+
+    const-class v2, Ljava/lang/Class;
+
+    aput-object v2, v1, v3
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+
+    const/4 v0, 0x0
+
+    new-array v1, v4, [Ljava/lang/Object;
+
+    const-class v2, Ljava/lang/Object;
+
+    aput-object v2, v1, v3
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Integer;
+    :try_end_1
+    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_3
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_2
+    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_1 .. :try_end_1} :catch_0
+
+    iput-object p1, p0, Lq0/b/a/b/b;->c:Ljava/lang/Integer;
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_2
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_3
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_4
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_5
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/b/b;->a:Ljava/lang/Class;
+
+    iget-object v1, p0, Lq0/b/a/b/b;->b:Ljava/lang/reflect/Method;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    iget-object v5, p0, Lq0/b/a/b/b;->a:Ljava/lang/Class;
+
+    aput-object v5, v3, v4
+
+    const/4 v4, 0x1
+
+    iget-object v5, p0, Lq0/b/a/b/b;->c:Ljava/lang/Integer;
+
+    aput-object v5, v3, v4
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/b/c.smali b/com.discord/smali_classes2/q0/b/a/b/c.smali
new file mode 100644
index 0000000000..c534e9da26
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/b/c.smali
@@ -0,0 +1,232 @@
+.class public Lq0/b/a/b/c;
+.super Ljava/lang/Object;
+.source "Android18Instantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/lang/reflect/Method;
+
+.field public final c:Ljava/lang/Long;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/b/a/b/c;->a:Ljava/lang/Class;
+
+    :try_start_0
+    const-class p1, Ljava/io/ObjectStreamClass;
+
+    const-string v0, "newInstance"
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Ljava/lang/Class;
+
+    const-class v2, Ljava/lang/Class;
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    sget-object v2, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    const/4 v4, 0x1
+
+    aput-object v2, v1, v4
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_5
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_4
+
+    iput-object p1, p0, Lq0/b/a/b/c;->b:Ljava/lang/reflect/Method;
+
+    :try_start_1
+    const-class p1, Ljava/io/ObjectStreamClass;
+
+    const-string v0, "getConstructorId"
+
+    new-array v1, v4, [Ljava/lang/Class;
+
+    const-class v2, Ljava/lang/Class;
+
+    aput-object v2, v1, v3
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+
+    const/4 v0, 0x0
+
+    new-array v1, v4, [Ljava/lang/Object;
+
+    const-class v2, Ljava/lang/Object;
+
+    aput-object v2, v1, v3
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Long;
+    :try_end_1
+    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_3
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_2
+    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_1 .. :try_end_1} :catch_0
+
+    iput-object p1, p0, Lq0/b/a/b/c;->c:Ljava/lang/Long;
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_2
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_3
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_4
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_5
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/b/c;->a:Ljava/lang/Class;
+
+    iget-object v1, p0, Lq0/b/a/b/c;->b:Ljava/lang/reflect/Method;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    iget-object v5, p0, Lq0/b/a/b/c;->a:Ljava/lang/Class;
+
+    aput-object v5, v3, v4
+
+    const/4 v4, 0x1
+
+    iget-object v5, p0, Lq0/b/a/b/c;->c:Ljava/lang/Long;
+
+    aput-object v5, v3, v4
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/c/a.smali b/com.discord/smali_classes2/q0/b/a/c/a.smali
new file mode 100644
index 0000000000..dd573e9bad
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/c/a.smali
@@ -0,0 +1,101 @@
+.class public Lq0/b/a/c/a;
+.super Ljava/lang/Object;
+.source "AccessibleInstantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lq0/b/a/c/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Ljava/lang/reflect/Constructor;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/reflect/Constructor<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-virtual {p1, v0}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lq0/b/a/c/a;->a:Ljava/lang/reflect/Constructor;
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    if-eqz p1, :cond_0
+
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
+
+    :cond_0
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/c/a;->a:Ljava/lang/reflect/Constructor;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/c/b$a.smali b/com.discord/smali_classes2/q0/b/a/c/b$a.smali
new file mode 100644
index 0000000000..ac619870e2
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/c/b$a.smali
@@ -0,0 +1,391 @@
+.class public Lq0/b/a/c/b$a;
+.super Ljava/io/InputStream;
+.source "ObjectInputStreamInstantiator.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lq0/b/a/c/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final i:[I
+
+.field public static j:[B
+
+.field public static k:[B
+
+
+# instance fields
+.field public d:I
+
+.field public e:[B
+
+.field public f:I
+
+.field public g:[[B
+
+.field public final h:[B
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [I
+
+    fill-array-data v0, :array_0
+
+    sput-object v0, Lq0/b/a/c/b$a;->i:[I
+
+    :try_start_0
+    new-instance v0, Ljava/io/ByteArrayOutputStream;
+
+    invoke-direct {v0}, Ljava/io/ByteArrayOutputStream;-><init>()V
+
+    new-instance v1, Ljava/io/DataOutputStream;
+
+    invoke-direct {v1, v0}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
+
+    const/16 v2, -0x5313
+
+    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeShort(I)V
+
+    const/4 v2, 0x5
+
+    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeShort(I)V
+
+    invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
+
+    move-result-object v0
+
+    sput-object v0, Lq0/b/a/c/b$a;->j:[B
+
+    new-instance v0, Ljava/io/ByteArrayOutputStream;
+
+    invoke-direct {v0}, Ljava/io/ByteArrayOutputStream;-><init>()V
+
+    new-instance v1, Ljava/io/DataOutputStream;
+
+    invoke-direct {v1, v0}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
+
+    const/16 v2, 0x73
+
+    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeByte(I)V
+
+    const/16 v2, 0x71
+
+    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeByte(I)V
+
+    const/high16 v2, 0x7e0000
+
+    invoke-virtual {v1, v2}, Ljava/io/DataOutputStream;->writeInt(I)V
+
+    invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
+
+    move-result-object v0
+
+    sput-object v0, Lq0/b/a/c/b$a;->k:[B
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/lang/Error;
+
+    const-string v2, "IOException: "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    nop
+
+    :array_0
+    .array-data 4
+        0x1
+        0x2
+        0x2
+    .end array-data
+.end method
+
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lq0/b/a/c/b$a;->d:I
+
+    iput v0, p0, Lq0/b/a/c/b$a;->f:I
+
+    sget-object v1, Lq0/b/a/c/b$a;->j:[B
+
+    iput-object v1, p0, Lq0/b/a/c/b$a;->e:[B
+
+    new-instance v1, Ljava/io/ByteArrayOutputStream;
+
+    invoke-direct {v1}, Ljava/io/ByteArrayOutputStream;-><init>()V
+
+    new-instance v2, Ljava/io/DataOutputStream;
+
+    invoke-direct {v2, v1}, Ljava/io/DataOutputStream;-><init>(Ljava/io/OutputStream;)V
+
+    const/16 v3, 0x73
+
+    :try_start_0
+    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
+
+    const/16 v3, 0x72
+
+    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeUTF(Ljava/lang/String;)V
+
+    invoke-static {p1}, Ljava/io/ObjectStreamClass;->lookup(Ljava/lang/Class;)Ljava/io/ObjectStreamClass;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/io/ObjectStreamClass;->getSerialVersionUID()J
+
+    move-result-wide v3
+
+    invoke-virtual {v2, v3, v4}, Ljava/io/DataOutputStream;->writeLong(J)V
+
+    const/4 p1, 0x2
+
+    invoke-virtual {v2, p1}, Ljava/io/DataOutputStream;->writeByte(I)V
+
+    invoke-virtual {v2, v0}, Ljava/io/DataOutputStream;->writeShort(I)V
+
+    const/16 v3, 0x78
+
+    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
+
+    const/16 v3, 0x70
+
+    invoke-virtual {v2, v3}, Ljava/io/DataOutputStream;->writeByte(I)V
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    invoke-virtual {v1}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
+
+    move-result-object v1
+
+    iput-object v1, p0, Lq0/b/a/c/b$a;->h:[B
+
+    const/4 v2, 0x3
+
+    new-array v2, v2, [[B
+
+    sget-object v3, Lq0/b/a/c/b$a;->j:[B
+
+    aput-object v3, v2, v0
+
+    const/4 v0, 0x1
+
+    aput-object v1, v2, v0
+
+    sget-object v0, Lq0/b/a/c/b$a;->k:[B
+
+    aput-object v0, v2, p1
+
+    iput-object v2, p0, Lq0/b/a/c/b$a;->g:[[B
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Ljava/lang/Error;
+
+    const-string v1, "IOException: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public available()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    const v0, 0x7fffffff
+
+    return v0
+.end method
+
+.method public read()I
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lq0/b/a/c/b$a;->e:[B
+
+    iget v1, p0, Lq0/b/a/c/b$a;->d:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Lq0/b/a/c/b$a;->d:I
+
+    aget-byte v1, v0, v1
+
+    array-length v0, v0
+
+    if-lt v2, v0, :cond_0
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lq0/b/a/c/b$a;->d:I
+
+    sget-object v0, Lq0/b/a/c/b$a;->i:[I
+
+    iget v2, p0, Lq0/b/a/c/b$a;->f:I
+
+    aget v0, v0, v2
+
+    iput v0, p0, Lq0/b/a/c/b$a;->f:I
+
+    iget-object v2, p0, Lq0/b/a/c/b$a;->g:[[B
+
+    aget-object v0, v2, v0
+
+    iput-object v0, p0, Lq0/b/a/c/b$a;->e:[B
+
+    :cond_0
+    return v1
+.end method
+
+.method public read([BII)I
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lq0/b/a/c/b$a;->e:[B
+
+    array-length v0, v0
+
+    iget v1, p0, Lq0/b/a/c/b$a;->d:I
+
+    sub-int/2addr v0, v1
+
+    move v1, p3
+
+    :goto_0
+    if-gt v0, v1, :cond_0
+
+    iget-object v2, p0, Lq0/b/a/c/b$a;->e:[B
+
+    iget v3, p0, Lq0/b/a/c/b$a;->d:I
+
+    invoke-static {v2, v3, p1, p2, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    add-int/2addr p2, v0
+
+    sub-int/2addr v1, v0
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lq0/b/a/c/b$a;->d:I
+
+    sget-object v2, Lq0/b/a/c/b$a;->i:[I
+
+    iget v3, p0, Lq0/b/a/c/b$a;->f:I
+
+    aget v2, v2, v3
+
+    iput v2, p0, Lq0/b/a/c/b$a;->f:I
+
+    iget-object v3, p0, Lq0/b/a/c/b$a;->g:[[B
+
+    aget-object v2, v3, v2
+
+    iput-object v2, p0, Lq0/b/a/c/b$a;->e:[B
+
+    array-length v2, v2
+
+    add-int/2addr v0, v2
+
+    goto :goto_0
+
+    :cond_0
+    if-lez v1, :cond_1
+
+    iget-object v0, p0, Lq0/b/a/c/b$a;->e:[B
+
+    iget v2, p0, Lq0/b/a/c/b$a;->d:I
+
+    invoke-static {v0, v2, p1, p2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget p1, p0, Lq0/b/a/c/b$a;->d:I
+
+    add-int/2addr p1, v1
+
+    iput p1, p0, Lq0/b/a/c/b$a;->d:I
+
+    :cond_1
+    return p3
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/c/b.smali b/com.discord/smali_classes2/q0/b/a/c/b.smali
new file mode 100644
index 0000000000..2102eae380
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/c/b.smali
@@ -0,0 +1,174 @@
+.class public Lq0/b/a/c/b;
+.super Ljava/lang/Object;
+.source "ObjectInputStreamInstantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lq0/b/a/c/b$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public a:Ljava/io/ObjectInputStream;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const-class v0, Ljava/io/Serializable;
+
+    invoke-virtual {v0, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    :try_start_0
+    new-instance v0, Ljava/io/ObjectInputStream;
+
+    new-instance v1, Lq0/b/a/c/b$a;
+
+    invoke-direct {v1, p1}, Lq0/b/a/c/b$a;-><init>(Ljava/lang/Class;)V
+
+    invoke-direct {v0, v1}, Ljava/io/ObjectInputStream;-><init>(Ljava/io/InputStream;)V
+
+    iput-object v0, p0, Lq0/b/a/c/b;->a:Ljava/io/ObjectInputStream;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Ljava/lang/Error;
+
+    const-string v1, "IOException: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Ljava/io/IOException;->getMessage()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_0
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    new-instance v1, Ljava/io/NotSerializableException;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, " not serializable"
+
+    invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v1, p1}, Ljava/io/NotSerializableException;-><init>(Ljava/lang/String;)V
+
+    invoke-direct {v0, v1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/c/b;->a:Ljava/io/ObjectInputStream;
+
+    invoke-virtual {v0}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    move-exception v0
+
+    new-instance v1, Ljava/lang/Error;
+
+    const-string v2, "ClassNotFoundException: "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Ljava/lang/ClassNotFoundException;->getMessage()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/Error;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/d/a.smali b/com.discord/smali_classes2/q0/b/a/d/a.smali
new file mode 100644
index 0000000000..17a13fec3b
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/d/a.smali
@@ -0,0 +1,107 @@
+.class public Lq0/b/a/d/a;
+.super Lq0/b/a/d/b;
+.source "GCJInstantiator.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lq0/b/a/d/b<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lq0/b/a/d/b;-><init>(Ljava/lang/Class;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/d/b;->a:Ljava/lang/Class;
+
+    sget-object v1, Lq0/b/a/d/b;->b:Ljava/lang/reflect/Method;
+
+    sget-object v2, Lq0/b/a/d/b;->c:Ljava/io/ObjectInputStream;
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    iget-object v5, p0, Lq0/b/a/d/b;->a:Ljava/lang/Class;
+
+    aput-object v5, v3, v4
+
+    const/4 v4, 0x1
+
+    const-class v5, Ljava/lang/Object;
+
+    aput-object v5, v3, v4
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_2
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/d/b$a.smali b/com.discord/smali_classes2/q0/b/a/d/b$a.smali
new file mode 100644
index 0000000000..16ac21abb5
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/d/b$a.smali
@@ -0,0 +1,29 @@
+.class public Lq0/b/a/d/b$a;
+.super Ljava/io/ObjectInputStream;
+.source "GCJInstantiatorBase.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lq0/b/a/d/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/io/ObjectInputStream;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/d/b.smali b/com.discord/smali_classes2/q0/b/a/d/b.smali
new file mode 100644
index 0000000000..6c98386e83
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/d/b.smali
@@ -0,0 +1,135 @@
+.class public abstract Lq0/b/a/d/b;
+.super Ljava/lang/Object;
+.source "GCJInstantiatorBase.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lq0/b/a/d/b$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static b:Ljava/lang/reflect/Method;
+
+.field public static c:Ljava/io/ObjectInputStream;
+
+
+# instance fields
+.field public final a:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/b/a/d/b;->a:Ljava/lang/Class;
+
+    sget-object p1, Lq0/b/a/d/b;->b:Ljava/lang/reflect/Method;
+
+    if-nez p1, :cond_0
+
+    :try_start_0
+    const-class p1, Ljava/io/ObjectInputStream;
+
+    const-string v0, "newObject"
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [Ljava/lang/Class;
+
+    const/4 v2, 0x0
+
+    const-class v3, Ljava/lang/Class;
+
+    aput-object v3, v1, v2
+
+    const-class v2, Ljava/lang/Class;
+
+    const/4 v3, 0x1
+
+    aput-object v2, v1, v3
+
+    invoke-virtual {p1, v0, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    sput-object p1, Lq0/b/a/d/b;->b:Ljava/lang/reflect/Method;
+
+    invoke-virtual {p1, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+
+    new-instance p1, Lq0/b/a/d/b$a;
+
+    invoke-direct {p1}, Lq0/b/a/d/b$a;-><init>()V
+
+    sput-object p1, Lq0/b/a/d/b;->c:Ljava/io/ObjectInputStream;
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_2
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/e/a.smali b/com.discord/smali_classes2/q0/b/a/e/a.smali
new file mode 100644
index 0000000000..e53440a6b6
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/e/a.smali
@@ -0,0 +1,141 @@
+.class public Lq0/b/a/e/a;
+.super Ljava/lang/Object;
+.source "PercInstantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/reflect/Method;
+
+.field public final b:[Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x2
+
+    new-array v1, v0, [Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    aput-object v2, v1, v3
+
+    sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    const/4 v4, 0x1
+
+    aput-object v2, v1, v4
+
+    iput-object v1, p0, Lq0/b/a/e/a;->b:[Ljava/lang/Object;
+
+    aput-object p1, v1, v3
+
+    :try_start_0
+    const-class p1, Ljava/io/ObjectInputStream;
+
+    const-string v1, "newInstance"
+
+    new-array v0, v0, [Ljava/lang/Class;
+
+    const-class v2, Ljava/lang/Class;
+
+    aput-object v2, v0, v3
+
+    sget-object v2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    aput-object v2, v0, v4
+
+    invoke-virtual {p1, v1, v0}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lq0/b/a/e/a;->a:Ljava/lang/reflect/Method;
+
+    invoke-virtual {p1, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/e/a;->a:Ljava/lang/reflect/Method;
+
+    const/4 v1, 0x0
+
+    iget-object v2, p0, Lq0/b/a/e/a;->b:[Ljava/lang/Object;
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/f/a.smali b/com.discord/smali_classes2/q0/b/a/f/a.smali
new file mode 100644
index 0000000000..1a24760042
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/f/a.smali
@@ -0,0 +1,256 @@
+.class public Lq0/b/a/f/a;
+.super Ljava/lang/Object;
+.source "SunReflectionFactoryInstantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/reflect/Constructor;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/reflect/Constructor<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    :try_start_0
+    const-class v0, Ljava/lang/Object;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_9
+
+    :try_start_1
+    const-string v2, "sun.reflect.ReflectionFactory"
+
+    invoke-static {v2}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v2
+    :try_end_1
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_8
+
+    :try_start_2
+    const-string v3, "getReflectionFactory"
+
+    const/4 v4, 0x0
+
+    new-array v5, v4, [Ljava/lang/Class;
+
+    invoke-virtual {v2, v3, v5}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v3
+
+    new-array v5, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v3, v1, v5}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+    :try_end_2
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_2 .. :try_end_2} :catch_7
+    .catch Ljava/lang/IllegalAccessException; {:try_start_2 .. :try_end_2} :catch_6
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_2 .. :try_end_2} :catch_5
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_2 .. :try_end_2} :catch_4
+
+    :try_start_3
+    const-string v3, "newConstructorForSerialization"
+
+    const/4 v5, 0x2
+
+    new-array v6, v5, [Ljava/lang/Class;
+
+    const-class v7, Ljava/lang/Class;
+
+    aput-object v7, v6, v4
+
+    const-class v7, Ljava/lang/reflect/Constructor;
+
+    const/4 v8, 0x1
+
+    aput-object v7, v6, v8
+
+    invoke-virtual {v2, v3, v6}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+    move-result-object v2
+    :try_end_3
+    .catch Ljava/lang/NoSuchMethodException; {:try_start_3 .. :try_end_3} :catch_3
+
+    :try_start_4
+    new-array v3, v5, [Ljava/lang/Object;
+
+    aput-object p1, v3, v4
+
+    aput-object v0, v3, v8
+
+    invoke-virtual {v2, v1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/reflect/Constructor;
+    :try_end_4
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_4 .. :try_end_4} :catch_2
+    .catch Ljava/lang/IllegalAccessException; {:try_start_4 .. :try_end_4} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_4 .. :try_end_4} :catch_0
+
+    iput-object p1, p0, Lq0/b/a/f/a;->a:Ljava/lang/reflect/Constructor;
+
+    invoke-virtual {p1, v8}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_2
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_3
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_4
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_5
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_6
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_7
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_8
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_9
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/f/a;->a:Ljava/lang/reflect/Constructor;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/a/f/b.smali b/com.discord/smali_classes2/q0/b/a/f/b.smali
new file mode 100644
index 0000000000..d9e417a65e
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/a/f/b.smali
@@ -0,0 +1,146 @@
+.class public Lq0/b/a/f/b;
+.super Ljava/lang/Object;
+.source "UnsafeFactoryInstantiator.java"
+
+# interfaces
+.implements Lq0/b/a/a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lq0/b/a/a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static b:Lsun/misc/Unsafe;
+
+
+# instance fields
+.field public final a:Ljava/lang/Class;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Class<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Class;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Lq0/b/a/f/b;->b:Lsun/misc/Unsafe;
+
+    if-nez v0, :cond_0
+
+    :try_start_0
+    const-class v0, Lsun/misc/Unsafe;
+
+    const-string v1, "theUnsafe"
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_1
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V
+
+    const/4 v1, 0x0
+
+    :try_start_1
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lsun/misc/Unsafe;
+
+    sput-object v0, Lq0/b/a/f/b;->b:Lsun/misc/Unsafe;
+    :try_end_1
+    .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catch_1
+    move-exception p1
+
+    new-instance v0, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v0, p1}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_0
+    :goto_0
+    iput-object p1, p0, Lq0/b/a/f/b;->a:Ljava/lang/Class;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public newInstance()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Lq0/b/a/f/b;->a:Ljava/lang/Class;
+
+    sget-object v1, Lq0/b/a/f/b;->b:Lsun/misc/Unsafe;
+
+    iget-object v2, p0, Lq0/b/a/f/b;->a:Ljava/lang/Class;
+
+    invoke-virtual {v1, v2}, Lsun/misc/Unsafe;->allocateInstance(Ljava/lang/Class;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/q0/b/b/a.smali b/com.discord/smali_classes2/q0/b/b/a.smali
new file mode 100644
index 0000000000..df699d8b45
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/b/a.smali
@@ -0,0 +1,19 @@
+.class public interface abstract Lq0/b/b/a;
+.super Ljava/lang/Object;
+.source "InstantiatorStrategy.java"
+
+
+# virtual methods
+.method public abstract newInstantiatorOf(Ljava/lang/Class;)Lq0/b/a/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;)",
+            "Lq0/b/a/a<",
+            "TT;>;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/q0/b/b/b.smali b/com.discord/smali_classes2/q0/b/b/b.smali
new file mode 100644
index 0000000000..e72b7db38a
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/b/b.smali
@@ -0,0 +1,226 @@
+.class public final Lq0/b/b/b;
+.super Ljava/lang/Object;
+.source "PlatformDescription.java"
+
+
+# static fields
+.field public static final a:Ljava/lang/String;
+
+.field public static final b:I
+
+.field public static final c:Z
+
+.field public static final d:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-string v0, "java.specification.version"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    const-string v0, "java.runtime.version"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    const-string v0, "java.vm.info"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    const-string v0, "java.vm.version"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    const-string v0, "java.vm.vendor"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    const-string v0, "java.vm.name"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/b/b/b;->a:Ljava/lang/String;
+
+    invoke-static {}, Lq0/b/b/b;->a()I
+
+    move-result v0
+
+    sput v0, Lq0/b/b/b;->b:I
+
+    invoke-static {}, Lq0/b/b/b;->a()I
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "java.boot.class.path"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Ljava/lang/String;->toLowerCase()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v2, "core-oj.jar"
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    const/4 v1, 0x1
+
+    :cond_1
+    :goto_0
+    sput-boolean v1, Lq0/b/b/b;->c:Z
+
+    const-string v0, "com.google.appengine.runtime.version"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    sput-object v0, Lq0/b/b/b;->d:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public static a()I
+    .locals 3
+
+    const-string v0, "Dalvik"
+
+    invoke-static {v0}, Lq0/b/b/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_0
+    :try_start_0
+    const-string v0, "android.os.Build$VERSION"
+
+    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_4
+
+    const/4 v1, 0x0
+
+    :try_start_1
+    const-string v2, "SDK_INT"
+
+    invoke-virtual {v0, v2}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v0
+    :try_end_1
+    .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_1
+
+    :try_start_2
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+    :try_end_2
+    .catch Ljava/lang/IllegalAccessException; {:try_start_2 .. :try_end_2} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/lang/RuntimeException;
+
+    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_1
+    :try_start_3
+    const-string v2, "SDK"
+
+    invoke-virtual {v0, v2}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v0
+    :try_end_3
+    .catch Ljava/lang/NoSuchFieldException; {:try_start_3 .. :try_end_3} :catch_3
+
+    :try_start_4
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+    :try_end_4
+    .catch Ljava/lang/IllegalAccessException; {:try_start_4 .. :try_end_4} :catch_2
+
+    invoke-static {v0}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v0
+
+    :goto_0
+    return v0
+
+    :catch_2
+    move-exception v0
+
+    new-instance v1, Ljava/lang/RuntimeException;
+
+    invoke-direct {v1, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_3
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catch_4
+    move-exception v0
+
+    new-instance v1, Lorg/objenesis/ObjenesisException;
+
+    invoke-direct {v1, v0}, Lorg/objenesis/ObjenesisException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
+
+.method public static b(Ljava/lang/String;)Z
+    .locals 1
+
+    sget-object v0, Lq0/b/b/b;->a:Ljava/lang/String;
+
+    invoke-virtual {v0, p0}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result p0
+
+    return p0
+.end method
diff --git a/com.discord/smali_classes2/q0/b/b/c.smali b/com.discord/smali_classes2/q0/b/b/c.smali
new file mode 100644
index 0000000000..31421cec54
--- /dev/null
+++ b/com.discord/smali_classes2/q0/b/b/c.smali
@@ -0,0 +1,197 @@
+.class public Lq0/b/b/c;
+.super Ljava/lang/Object;
+.source "StdInstantiatorStrategy.java"
+
+# interfaces
+.implements Lq0/b/b/a;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public newInstantiatorOf(Ljava/lang/Class;)Lq0/b/a/a;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;)",
+            "Lq0/b/a/a<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "Java HotSpot"
+
+    invoke-static {v0}, Lq0/b/b/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_8
+
+    const-string v0, "OpenJDK"
+
+    invoke-static {v0}, Lq0/b/b/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "Dalvik"
+
+    invoke-static {v0}, Lq0/b/b/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    sget-boolean v0, Lq0/b/b/b;->c:Z
+
+    if-eqz v0, :cond_1
+
+    new-instance v0, Lq0/b/a/f/b;
+
+    invoke-direct {v0, p1}, Lq0/b/a/f/b;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_1
+    sget v0, Lq0/b/b/b;->b:I
+
+    const/16 v1, 0xa
+
+    if-gt v0, v1, :cond_2
+
+    new-instance v0, Lq0/b/a/b/a;
+
+    invoke-direct {v0, p1}, Lq0/b/a/b/a;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_2
+    const/16 v1, 0x11
+
+    if-gt v0, v1, :cond_3
+
+    new-instance v0, Lq0/b/a/b/b;
+
+    invoke-direct {v0, p1}, Lq0/b/a/b/b;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_3
+    new-instance v0, Lq0/b/a/b/c;
+
+    invoke-direct {v0, p1}, Lq0/b/a/b/c;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_4
+    const-string v0, "BEA"
+
+    invoke-static {v0}, Lq0/b/b/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    new-instance v0, Lq0/b/a/f/a;
+
+    invoke-direct {v0, p1}, Lq0/b/a/f/a;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_5
+    const-string v0, "GNU libgcj"
+
+    invoke-static {v0}, Lq0/b/b/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    new-instance v0, Lq0/b/a/d/a;
+
+    invoke-direct {v0, p1}, Lq0/b/a/d/a;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_6
+    const-string v0, "PERC"
+
+    invoke-static {v0}, Lq0/b/b/b;->b(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_7
+
+    new-instance v0, Lq0/b/a/e/a;
+
+    invoke-direct {v0, p1}, Lq0/b/a/e/a;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_7
+    new-instance v0, Lq0/b/a/f/b;
+
+    invoke-direct {v0, p1}, Lq0/b/a/f/b;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_8
+    :goto_0
+    sget-object v0, Lq0/b/b/b;->d:Ljava/lang/String;
+
+    if-eqz v0, :cond_9
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_9
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_b
+
+    const-class v0, Ljava/io/Serializable;
+
+    invoke-virtual {v0, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_a
+
+    new-instance v0, Lq0/b/a/c/b;
+
+    invoke-direct {v0, p1}, Lq0/b/a/c/b;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_a
+    new-instance v0, Lq0/b/a/c/a;
+
+    invoke-direct {v0, p1}, Lq0/b/a/c/a;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+
+    :cond_b
+    new-instance v0, Lq0/b/a/f/a;
+
+    invoke-direct {v0, p1}, Lq0/b/a/f/a;-><init>(Ljava/lang/Class;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/c$a.smali b/com.discord/smali_classes2/q0/c$a.smali
deleted file mode 100644
index 16d5b16b45..0000000000
--- a/com.discord/smali_classes2/q0/c$a.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public abstract Lq0/c$a;
-.super Ljava/lang/Object;
-.source "CallAdapter.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/c<",
-            "**>;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/q0/c.smali b/com.discord/smali_classes2/q0/c.smali
deleted file mode 100644
index 3dc7d260b9..0000000000
--- a/com.discord/smali_classes2/q0/c.smali
+++ /dev/null
@@ -1,37 +0,0 @@
-.class public interface abstract Lq0/c;
-.super Ljava/lang/Object;
-.source "CallAdapter.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/c$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        "T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract a()Ljava/lang/reflect/Type;
-.end method
-
-.method public abstract b(Lq0/b;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TR;>;)TT;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/q0/c/a.smali b/com.discord/smali_classes2/q0/c/a.smali
new file mode 100644
index 0000000000..1f43e33cc1
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/a.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/a;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/concurrent/CountDownLatch;
+
+
+# direct methods
+.method public synthetic constructor <init>(Ljava/util/concurrent/CountDownLatch;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/a;->d:Ljava/util/concurrent/CountDownLatch;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/a;->d:Ljava/util/concurrent/CountDownLatch;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/a0.smali b/com.discord/smali_classes2/q0/c/a0.smali
new file mode 100644
index 0000000000..b2c541bef4
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/a0.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/a0;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/a0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/a0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    invoke-virtual {v0}, Lorg/webrtc/VideoFileRenderer;->c()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/b.smali b/com.discord/smali_classes2/q0/c/b.smali
new file mode 100644
index 0000000000..11be477112
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/b.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/b;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/TextureBufferImpl;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/TextureBufferImpl;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/b;->d:Lorg/webrtc/TextureBufferImpl;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/b;->d:Lorg/webrtc/TextureBufferImpl;
+
+    invoke-virtual {v0}, Lorg/webrtc/TextureBufferImpl;->release()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/b0.smali b/com.discord/smali_classes2/q0/c/b0.smali
new file mode 100644
index 0000000000..5c1f5c027c
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/b0.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/b0;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
+
+.field public final synthetic e:Ljava/util/concurrent/CountDownLatch;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;Ljava/util/concurrent/CountDownLatch;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/b0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    iput-object p2, p0, Lq0/c/b0;->e:Ljava/util/concurrent/CountDownLatch;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/b0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    iget-object v1, p0, Lq0/c/b0;->e:Ljava/util/concurrent/CountDownLatch;
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/VideoFileRenderer;->b(Ljava/util/concurrent/CountDownLatch;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/c.smali b/com.discord/smali_classes2/q0/c/c.smali
new file mode 100644
index 0000000000..832b07cc70
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/c.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/c;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/Camera1Session$2;
+
+.field public final synthetic e:[B
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/Camera1Session$2;[B)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/c;->d:Lorg/webrtc/Camera1Session$2;
+
+    iput-object p2, p0, Lq0/c/c;->e:[B
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/c;->d:Lorg/webrtc/Camera1Session$2;
+
+    iget-object v1, p0, Lq0/c/c;->e:[B
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/Camera1Session$2;->a([B)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/c0.smali b/com.discord/smali_classes2/q0/c/c0.smali
new file mode 100644
index 0000000000..fe1f42a34c
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/c0.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/c0;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
+
+.field public final synthetic e:Lorg/webrtc/VideoFrame;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/c0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    iput-object p2, p0, Lq0/c/c0;->e:Lorg/webrtc/VideoFrame;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/c0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    iget-object v1, p0, Lq0/c/c0;->e:Lorg/webrtc/VideoFrame;
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/VideoFileRenderer;->a(Lorg/webrtc/VideoFrame;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/d.smali b/com.discord/smali_classes2/q0/c/d.smali
new file mode 100644
index 0000000000..6bb011f874
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/d.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/d;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/Camera1Session$2;
+
+.field public final synthetic e:[B
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/Camera1Session$2;[B)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/d;->d:Lorg/webrtc/Camera1Session$2;
+
+    iput-object p2, p0, Lq0/c/d;->e:[B
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/d;->d:Lorg/webrtc/Camera1Session$2;
+
+    iget-object v1, p0, Lq0/c/d;->e:[B
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/Camera1Session$2;->b([B)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/d0.smali b/com.discord/smali_classes2/q0/c/d0.smali
new file mode 100644
index 0000000000..7ef3983b64
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/d0.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lq0/c/d0;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/VideoFileRenderer;
+
+.field public final synthetic e:Lorg/webrtc/VideoFrame$I420Buffer;
+
+.field public final synthetic f:Lorg/webrtc/VideoFrame;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/VideoFileRenderer;Lorg/webrtc/VideoFrame$I420Buffer;Lorg/webrtc/VideoFrame;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/d0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    iput-object p2, p0, Lq0/c/d0;->e:Lorg/webrtc/VideoFrame$I420Buffer;
+
+    iput-object p3, p0, Lq0/c/d0;->f:Lorg/webrtc/VideoFrame;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 3
+
+    iget-object v0, p0, Lq0/c/d0;->d:Lorg/webrtc/VideoFileRenderer;
+
+    iget-object v1, p0, Lq0/c/d0;->e:Lorg/webrtc/VideoFrame$I420Buffer;
+
+    iget-object v2, p0, Lq0/c/d0;->f:Lorg/webrtc/VideoFrame;
+
+    invoke-virtual {v0, v1, v2}, Lorg/webrtc/VideoFileRenderer;->d(Lorg/webrtc/VideoFrame$I420Buffer;Lorg/webrtc/VideoFrame;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/e.smali b/com.discord/smali_classes2/q0/c/e.smali
new file mode 100644
index 0000000000..a4d9438b76
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/e.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/e;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lorg/webrtc/VideoSink;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/Camera1Session;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/Camera1Session;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/e;->d:Lorg/webrtc/Camera1Session;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onFrame(Lorg/webrtc/VideoFrame;)V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/e;->d:Lorg/webrtc/Camera1Session;
+
+    invoke-virtual {v0, p1}, Lorg/webrtc/Camera1Session;->a(Lorg/webrtc/VideoFrame;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/e0.smali b/com.discord/smali_classes2/q0/c/e0.smali
new file mode 100644
index 0000000000..e88bed6feb
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/e0.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/e0;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Ljava/nio/ByteBuffer;
+
+
+# direct methods
+.method public synthetic constructor <init>(Ljava/nio/ByteBuffer;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/e0;->d:Ljava/nio/ByteBuffer;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/e0;->d:Ljava/nio/ByteBuffer;
+
+    invoke-static {v0}, Lorg/webrtc/JniCommon;->nativeFreeByteBuffer(Ljava/nio/ByteBuffer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/f.smali b/com.discord/smali_classes2/q0/c/f.smali
new file mode 100644
index 0000000000..6aedefb154
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/f.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/f;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lorg/webrtc/VideoSink;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/Camera2Session$CaptureSessionCallback;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/Camera2Session$CaptureSessionCallback;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/f;->d:Lorg/webrtc/Camera2Session$CaptureSessionCallback;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onFrame(Lorg/webrtc/VideoFrame;)V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/f;->d:Lorg/webrtc/Camera2Session$CaptureSessionCallback;
+
+    invoke-virtual {v0, p1}, Lorg/webrtc/Camera2Session$CaptureSessionCallback;->a(Lorg/webrtc/VideoFrame;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/f0.smali b/com.discord/smali_classes2/q0/c/f0.smali
new file mode 100644
index 0000000000..0b9e4238a5
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/f0.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/f0;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/VideoFrame$I420Buffer;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/VideoFrame$I420Buffer;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/f0;->d:Lorg/webrtc/VideoFrame$I420Buffer;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/f0;->d:Lorg/webrtc/VideoFrame$I420Buffer;
+
+    invoke-interface {v0}, Lorg/webrtc/VideoFrame$Buffer;->release()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/g.smali b/com.discord/smali_classes2/q0/c/g.smali
new file mode 100644
index 0000000000..ead7d8ac08
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/g.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/g;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+.field public final synthetic e:Landroid/os/Looper;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Landroid/os/Looper;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/g;->d:Lorg/webrtc/EglRenderer;
+
+    iput-object p2, p0, Lq0/c/g;->e:Landroid/os/Looper;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/g;->d:Lorg/webrtc/EglRenderer;
+
+    iget-object v1, p0, Lq0/c/g;->e:Landroid/os/Looper;
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/EglRenderer;->e(Landroid/os/Looper;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/g0.smali b/com.discord/smali_classes2/q0/c/g0.smali
new file mode 100644
index 0000000000..c598692b79
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/g0.smali
@@ -0,0 +1,99 @@
+.class public final synthetic Lq0/c/g0;
+.super Ljava/lang/Object;
+.source "CameraSession.java"
+
+
+# direct methods
+.method public static a(Lorg/webrtc/TextureBufferImpl;ZI)Lorg/webrtc/VideoFrame$TextureBuffer;
+    .locals 2
+
+    new-instance v0, Landroid/graphics/Matrix;
+
+    invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
+
+    const/high16 v1, 0x3f000000    # 0.5f
+
+    invoke-virtual {v0, v1, v1}, Landroid/graphics/Matrix;->preTranslate(FF)Z
+
+    if-eqz p1, :cond_0
+
+    const/high16 p1, -0x40800000    # -1.0f
+
+    const/high16 v1, 0x3f800000    # 1.0f
+
+    invoke-virtual {v0, p1, v1}, Landroid/graphics/Matrix;->preScale(FF)Z
+
+    :cond_0
+    int-to-float p1, p2
+
+    invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->preRotate(F)Z
+
+    const/high16 p1, -0x41000000    # -0.5f
+
+    invoke-virtual {v0, p1, p1}, Landroid/graphics/Matrix;->preTranslate(FF)Z
+
+    invoke-virtual {p0}, Lorg/webrtc/TextureBufferImpl;->getWidth()I
+
+    move-result p1
+
+    invoke-virtual {p0}, Lorg/webrtc/TextureBufferImpl;->getHeight()I
+
+    move-result p2
+
+    invoke-virtual {p0, v0, p1, p2}, Lorg/webrtc/TextureBufferImpl;->applyTransformMatrix(Landroid/graphics/Matrix;II)Lorg/webrtc/TextureBufferImpl;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static b(Landroid/content/Context;)I
+    .locals 1
+
+    const-string v0, "window"
+
+    invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Landroid/view/WindowManager;
+
+    invoke-interface {p0}, Landroid/view/WindowManager;->getDefaultDisplay()Landroid/view/Display;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Landroid/view/Display;->getRotation()I
+
+    move-result p0
+
+    const/4 v0, 0x1
+
+    if-eq p0, v0, :cond_2
+
+    const/4 v0, 0x2
+
+    if-eq p0, v0, :cond_1
+
+    const/4 v0, 0x3
+
+    if-eq p0, v0, :cond_0
+
+    const/4 p0, 0x0
+
+    return p0
+
+    :cond_0
+    const/16 p0, 0x10e
+
+    return p0
+
+    :cond_1
+    const/16 p0, 0xb4
+
+    return p0
+
+    :cond_2
+    const/16 p0, 0x5a
+
+    return p0
+.end method
diff --git a/com.discord/smali_classes2/q0/c/h.smali b/com.discord/smali_classes2/q0/c/h.smali
new file mode 100644
index 0000000000..c9f4d451c9
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/h.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lq0/c/h;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+.field public final synthetic e:Ljava/util/concurrent/CountDownLatch;
+
+.field public final synthetic f:Lorg/webrtc/EglRenderer$FrameListener;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;Lorg/webrtc/EglRenderer$FrameListener;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/h;->d:Lorg/webrtc/EglRenderer;
+
+    iput-object p2, p0, Lq0/c/h;->e:Ljava/util/concurrent/CountDownLatch;
+
+    iput-object p3, p0, Lq0/c/h;->f:Lorg/webrtc/EglRenderer$FrameListener;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 3
+
+    iget-object v0, p0, Lq0/c/h;->d:Lorg/webrtc/EglRenderer;
+
+    iget-object v1, p0, Lq0/c/h;->e:Ljava/util/concurrent/CountDownLatch;
+
+    iget-object v2, p0, Lq0/c/h;->f:Lorg/webrtc/EglRenderer$FrameListener;
+
+    invoke-virtual {v0, v1, v2}, Lorg/webrtc/EglRenderer;->g(Ljava/util/concurrent/CountDownLatch;Lorg/webrtc/EglRenderer$FrameListener;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/h0.smali b/com.discord/smali_classes2/q0/c/h0.smali
new file mode 100644
index 0000000000..8349da3768
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/h0.smali
@@ -0,0 +1,35 @@
+.class public final synthetic Lq0/c/h0;
+.super Ljava/lang/Object;
+.source "CameraVideoCapturer.java"
+
+
+# direct methods
+.method public static $default$addMediaRecorderToCamera(Lorg/webrtc/CameraVideoCapturer;Landroid/media/MediaRecorder;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
+    .locals 0
+    .param p0, "_this"    # Lorg/webrtc/CameraVideoCapturer;
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string p2, "Deprecated and not implemented."
+
+    invoke-direct {p1, p2}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static $default$removeMediaRecorderFromCamera(Lorg/webrtc/CameraVideoCapturer;Lorg/webrtc/CameraVideoCapturer$MediaRecorderHandler;)V
+    .locals 1
+    .param p0, "_this"    # Lorg/webrtc/CameraVideoCapturer;
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Deprecated and not implemented."
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/q0/c/i.smali b/com.discord/smali_classes2/q0/c/i.smali
new file mode 100644
index 0000000000..decbd00851
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/i.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lq0/c/i;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+.field public final synthetic e:Lorg/webrtc/EglBase$Context;
+
+.field public final synthetic f:[I
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/EglBase$Context;[I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/i;->d:Lorg/webrtc/EglRenderer;
+
+    iput-object p2, p0, Lq0/c/i;->e:Lorg/webrtc/EglBase$Context;
+
+    iput-object p3, p0, Lq0/c/i;->f:[I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 3
+
+    iget-object v0, p0, Lq0/c/i;->d:Lorg/webrtc/EglRenderer;
+
+    iget-object v1, p0, Lq0/c/i;->e:Lorg/webrtc/EglBase$Context;
+
+    iget-object v2, p0, Lq0/c/i;->f:[I
+
+    invoke-virtual {v0, v1, v2}, Lorg/webrtc/EglRenderer;->c(Lorg/webrtc/EglBase$Context;[I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/i0.smali b/com.discord/smali_classes2/q0/c/i0.smali
new file mode 100644
index 0000000000..7bed3efc19
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/i0.smali
@@ -0,0 +1,78 @@
+.class public final synthetic Lq0/c/i0;
+.super Ljava/lang/Object;
+.source "EglBase.java"
+
+
+# direct methods
+.method public static a()Lorg/webrtc/EglBase;
+    .locals 2
+
+    sget-object v0, Lorg/webrtc/EglBase;->CONFIG_PLAIN:[I
+
+    const/4 v1, 0x0
+
+    invoke-static {v1, v0}, Lq0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static b(Lorg/webrtc/EglBase$Context;)Lorg/webrtc/EglBase;
+    .locals 1
+
+    sget-object v0, Lorg/webrtc/EglBase;->CONFIG_PLAIN:[I
+
+    invoke-static {p0, v0}, Lq0/c/i0;->c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static c(Lorg/webrtc/EglBase$Context;[I)Lorg/webrtc/EglBase;
+    .locals 1
+
+    invoke-static {}, Lorg/webrtc/EglBase14;->isEGL14Supported()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    if-eqz p0, :cond_0
+
+    instance-of v0, p0, Lorg/webrtc/EglBase14$Context;
+
+    if-eqz v0, :cond_1
+
+    :cond_0
+    new-instance v0, Lorg/webrtc/EglBase14;
+
+    check-cast p0, Lorg/webrtc/EglBase14$Context;
+
+    invoke-direct {v0, p0, p1}, Lorg/webrtc/EglBase14;-><init>(Lorg/webrtc/EglBase14$Context;[I)V
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Lorg/webrtc/EglBase10;
+
+    check-cast p0, Lorg/webrtc/EglBase10$Context;
+
+    invoke-direct {v0, p0, p1}, Lorg/webrtc/EglBase10;-><init>(Lorg/webrtc/EglBase10$Context;[I)V
+
+    :goto_0
+    return-object v0
+.end method
+
+.method public static d([I)Lorg/webrtc/EglBase;
+    .locals 2
+
+    new-instance v0, Lorg/webrtc/EglBase10;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1, p0}, Lorg/webrtc/EglBase10;-><init>(Lorg/webrtc/EglBase10$Context;[I)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/c/j.smali b/com.discord/smali_classes2/q0/c/j.smali
new file mode 100644
index 0000000000..5efcac0bc6
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/j.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/j;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+.field public final synthetic e:Ljava/util/concurrent/CountDownLatch;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Ljava/util/concurrent/CountDownLatch;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/j;->d:Lorg/webrtc/EglRenderer;
+
+    iput-object p2, p0, Lq0/c/j;->e:Ljava/util/concurrent/CountDownLatch;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/j;->d:Lorg/webrtc/EglRenderer;
+
+    iget-object v1, p0, Lq0/c/j;->e:Ljava/util/concurrent/CountDownLatch;
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/EglRenderer;->d(Ljava/util/concurrent/CountDownLatch;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/j0.smali b/com.discord/smali_classes2/q0/c/j0.smali
new file mode 100644
index 0000000000..974f5295cf
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/j0.smali
@@ -0,0 +1,23 @@
+.class public final synthetic Lq0/c/j0;
+.super Ljava/lang/Object;
+.source "PeerConnection.java"
+
+
+# direct methods
+.method public static $default$onConnectionChange(Lorg/webrtc/PeerConnection$Observer;Lorg/webrtc/PeerConnection$PeerConnectionState;)V
+    .locals 0
+    .annotation build Lorg/webrtc/CalledByNative;
+        value = "Observer"
+    .end annotation
+
+    return-void
+.end method
+
+.method public static $default$onTrack(Lorg/webrtc/PeerConnection$Observer;Lorg/webrtc/RtpTransceiver;)V
+    .locals 0
+    .annotation build Lorg/webrtc/CalledByNative;
+        value = "Observer"
+    .end annotation
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/k.smali b/com.discord/smali_classes2/q0/c/k.smali
new file mode 100644
index 0000000000..e7fc6a3316
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/k.smali
@@ -0,0 +1,58 @@
+.class public final synthetic Lq0/c/k;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+.field public final synthetic e:Lorg/webrtc/RendererCommon$GlDrawer;
+
+.field public final synthetic f:Lorg/webrtc/EglRenderer$FrameListener;
+
+.field public final synthetic g:F
+
+.field public final synthetic h:Z
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Lorg/webrtc/RendererCommon$GlDrawer;Lorg/webrtc/EglRenderer$FrameListener;FZ)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/k;->d:Lorg/webrtc/EglRenderer;
+
+    iput-object p2, p0, Lq0/c/k;->e:Lorg/webrtc/RendererCommon$GlDrawer;
+
+    iput-object p3, p0, Lq0/c/k;->f:Lorg/webrtc/EglRenderer$FrameListener;
+
+    iput p4, p0, Lq0/c/k;->g:F
+
+    iput-boolean p5, p0, Lq0/c/k;->h:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 5
+
+    iget-object v0, p0, Lq0/c/k;->d:Lorg/webrtc/EglRenderer;
+
+    iget-object v1, p0, Lq0/c/k;->e:Lorg/webrtc/RendererCommon$GlDrawer;
+
+    iget-object v2, p0, Lq0/c/k;->f:Lorg/webrtc/EglRenderer$FrameListener;
+
+    iget v3, p0, Lq0/c/k;->g:F
+
+    iget-boolean v4, p0, Lq0/c/k;->h:Z
+
+    invoke-virtual {v0, v1, v2, v3, v4}, Lorg/webrtc/EglRenderer;->a(Lorg/webrtc/RendererCommon$GlDrawer;Lorg/webrtc/EglRenderer$FrameListener;FZ)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/k0.smali b/com.discord/smali_classes2/q0/c/k0.smali
new file mode 100644
index 0000000000..cddc6e2a64
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/k0.smali
@@ -0,0 +1,15 @@
+.class public final synthetic Lq0/c/k0;
+.super Ljava/lang/Object;
+.source "VideoDecoder.java"
+
+
+# direct methods
+.method public static $default$createNativeVideoDecoder(Lorg/webrtc/VideoDecoder;)J
+    .locals 2
+    .annotation build Lorg/webrtc/CalledByNative;
+    .end annotation
+
+    const-wide/16 v0, 0x0
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali_classes2/q0/c/l.smali b/com.discord/smali_classes2/q0/c/l.smali
new file mode 100644
index 0000000000..44faf9c555
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/l.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/l;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+.field public final synthetic e:Ljava/lang/Runnable;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;Ljava/lang/Runnable;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/l;->d:Lorg/webrtc/EglRenderer;
+
+    iput-object p2, p0, Lq0/c/l;->e:Ljava/lang/Runnable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/l;->d:Lorg/webrtc/EglRenderer;
+
+    iget-object v1, p0, Lq0/c/l;->e:Ljava/lang/Runnable;
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/EglRenderer;->f(Ljava/lang/Runnable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/l0.smali b/com.discord/smali_classes2/q0/c/l0.smali
new file mode 100644
index 0000000000..39f32d3422
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/l0.smali
@@ -0,0 +1,49 @@
+.class public final synthetic Lq0/c/l0;
+.super Ljava/lang/Object;
+.source "VideoDecoderFactory.java"
+
+
+# direct methods
+.method public static $default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
+    .locals 1
+    .param p0, "_this"    # Lorg/webrtc/VideoDecoderFactory;
+    .annotation runtime Ljava/lang/Deprecated;
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    const-string v0, "Deprecated and not implemented."
+
+    invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static $default$createDecoder(Lorg/webrtc/VideoDecoderFactory;Lorg/webrtc/VideoCodecInfo;)Lorg/webrtc/VideoDecoder;
+    .locals 0
+    .param p0, "_this"    # Lorg/webrtc/VideoDecoderFactory;
+    .annotation build Lorg/webrtc/CalledByNative;
+    .end annotation
+
+    invoke-virtual {p1}, Lorg/webrtc/VideoCodecInfo;->getName()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-interface {p0, p1}, Lorg/webrtc/VideoDecoderFactory;->createDecoder(Ljava/lang/String;)Lorg/webrtc/VideoDecoder;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public static $default$getSupportedCodecs(Lorg/webrtc/VideoDecoderFactory;)[Lorg/webrtc/VideoCodecInfo;
+    .locals 1
+    .annotation build Lorg/webrtc/CalledByNative;
+    .end annotation
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Lorg/webrtc/VideoCodecInfo;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/c/m.smali b/com.discord/smali_classes2/q0/c/m.smali
new file mode 100644
index 0000000000..212da62975
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/m.smali
@@ -0,0 +1,58 @@
+.class public final synthetic Lq0/c/m;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+.field public final synthetic e:F
+
+.field public final synthetic f:F
+
+.field public final synthetic g:F
+
+.field public final synthetic h:F
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;FFFF)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/m;->d:Lorg/webrtc/EglRenderer;
+
+    iput p2, p0, Lq0/c/m;->e:F
+
+    iput p3, p0, Lq0/c/m;->f:F
+
+    iput p4, p0, Lq0/c/m;->g:F
+
+    iput p5, p0, Lq0/c/m;->h:F
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 5
+
+    iget-object v0, p0, Lq0/c/m;->d:Lorg/webrtc/EglRenderer;
+
+    iget v1, p0, Lq0/c/m;->e:F
+
+    iget v2, p0, Lq0/c/m;->f:F
+
+    iget v3, p0, Lq0/c/m;->g:F
+
+    iget v4, p0, Lq0/c/m;->h:F
+
+    invoke-virtual {v0, v1, v2, v3, v4}, Lorg/webrtc/EglRenderer;->b(FFFF)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/m0.smali b/com.discord/smali_classes2/q0/c/m0.smali
new file mode 100644
index 0000000000..0458e2a327
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/m0.smali
@@ -0,0 +1,25 @@
+.class public final synthetic Lq0/c/m0;
+.super Ljava/lang/Object;
+.source "VideoEncoder.java"
+
+
+# direct methods
+.method public static $default$createNativeVideoEncoder(Lorg/webrtc/VideoEncoder;)J
+    .locals 2
+    .annotation build Lorg/webrtc/CalledByNative;
+    .end annotation
+
+    const-wide/16 v0, 0x0
+
+    return-wide v0
+.end method
+
+.method public static $default$isHardwareEncoder(Lorg/webrtc/VideoEncoder;)Z
+    .locals 1
+    .annotation build Lorg/webrtc/CalledByNative;
+    .end annotation
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/q0/c/n.smali b/com.discord/smali_classes2/q0/c/n.smali
new file mode 100644
index 0000000000..cb484368b0
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/n.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/n;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/EglRenderer;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/EglRenderer;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/n;->d:Lorg/webrtc/EglRenderer;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/n;->d:Lorg/webrtc/EglRenderer;
+
+    invoke-static {v0}, Lorg/webrtc/EglRenderer;->h(Lorg/webrtc/EglRenderer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/o.smali b/com.discord/smali_classes2/q0/c/o.smali
new file mode 100644
index 0000000000..dcb96fc2fc
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/o.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/o;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Ljava/nio/ByteBuffer;
+
+
+# direct methods
+.method public synthetic constructor <init>(Ljava/nio/ByteBuffer;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/o;->d:Ljava/nio/ByteBuffer;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/o;->d:Ljava/nio/ByteBuffer;
+
+    invoke-static {v0}, Lorg/webrtc/JavaI420Buffer;->a(Ljava/nio/ByteBuffer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/p.smali b/com.discord/smali_classes2/q0/c/p.smali
new file mode 100644
index 0000000000..59eeaa2ad2
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/p.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/p;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/p;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onFrameAvailable(Landroid/graphics/SurfaceTexture;)V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/p;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    invoke-virtual {v0, p1}, Lorg/webrtc/SurfaceTextureHelper;->c(Landroid/graphics/SurfaceTexture;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/q.smali b/com.discord/smali_classes2/q0/c/q.smali
new file mode 100644
index 0000000000..b766663cc4
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/q.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lq0/c/q;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
+
+.field public final synthetic e:I
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/q;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    iput p2, p0, Lq0/c/q;->e:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 2
+
+    iget-object v0, p0, Lq0/c/q;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    iget v1, p0, Lq0/c/q;->e:I
+
+    invoke-virtual {v0, v1}, Lorg/webrtc/SurfaceTextureHelper;->e(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/r.smali b/com.discord/smali_classes2/q0/c/r.smali
new file mode 100644
index 0000000000..67ceb133bd
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/r.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/r;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/r;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/r;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->g()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/s.smali b/com.discord/smali_classes2/q0/c/s.smali
new file mode 100644
index 0000000000..d576bb08d2
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/s.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/s;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/s;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/s;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->a()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/t.smali b/com.discord/smali_classes2/q0/c/t.smali
new file mode 100644
index 0000000000..5370e15897
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/t.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/t;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/t;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/t;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    invoke-static {v0}, Lorg/webrtc/SurfaceTextureHelper;->b(Lorg/webrtc/SurfaceTextureHelper;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/u.smali b/com.discord/smali_classes2/q0/c/u.smali
new file mode 100644
index 0000000000..303c469b9d
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/u.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/u;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/u;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/u;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    invoke-virtual {v0}, Lorg/webrtc/SurfaceTextureHelper;->d()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/v.smali b/com.discord/smali_classes2/q0/c/v.smali
new file mode 100644
index 0000000000..7d13a31623
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/v.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lq0/c/v;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceTextureHelper;
+
+.field public final synthetic e:I
+
+.field public final synthetic f:I
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceTextureHelper;II)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/v;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    iput p2, p0, Lq0/c/v;->e:I
+
+    iput p3, p0, Lq0/c/v;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 3
+
+    iget-object v0, p0, Lq0/c/v;->d:Lorg/webrtc/SurfaceTextureHelper;
+
+    iget v1, p0, Lq0/c/v;->e:I
+
+    iget v2, p0, Lq0/c/v;->f:I
+
+    invoke-virtual {v0, v1, v2}, Lorg/webrtc/SurfaceTextureHelper;->f(II)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/w.smali b/com.discord/smali_classes2/q0/c/w.smali
new file mode 100644
index 0000000000..9d02a72f3e
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/w.smali
@@ -0,0 +1,46 @@
+.class public final synthetic Lq0/c/w;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/SurfaceViewRenderer;
+
+.field public final synthetic e:I
+
+.field public final synthetic f:I
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/SurfaceViewRenderer;II)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/w;->d:Lorg/webrtc/SurfaceViewRenderer;
+
+    iput p2, p0, Lq0/c/w;->e:I
+
+    iput p3, p0, Lq0/c/w;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final run()V
+    .locals 3
+
+    iget-object v0, p0, Lq0/c/w;->d:Lorg/webrtc/SurfaceViewRenderer;
+
+    iget v1, p0, Lq0/c/w;->e:I
+
+    iget v2, p0, Lq0/c/w;->f:I
+
+    invoke-virtual {v0, v1, v2}, Lorg/webrtc/SurfaceViewRenderer;->a(II)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/x.smali b/com.discord/smali_classes2/q0/c/x.smali
new file mode 100644
index 0000000000..cd64516d8f
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/x.smali
@@ -0,0 +1,36 @@
+.class public final synthetic Lq0/c/x;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Ljava/util/concurrent/Callable;
+
+
+# instance fields
+.field public final synthetic d:Lorg/webrtc/TextureBufferImpl;
+
+
+# direct methods
+.method public synthetic constructor <init>(Lorg/webrtc/TextureBufferImpl;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lq0/c/x;->d:Lorg/webrtc/TextureBufferImpl;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call()Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lq0/c/x;->d:Lorg/webrtc/TextureBufferImpl;
+
+    invoke-virtual {v0}, Lorg/webrtc/TextureBufferImpl;->a()Lorg/webrtc/VideoFrame$I420Buffer;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/q0/c/y.smali b/com.discord/smali_classes2/q0/c/y.smali
new file mode 100644
index 0000000000..4749e0b42a
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/y.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/y;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lorg/webrtc/VideoDecoder$Callback;
+
+
+# instance fields
+.field public final synthetic a:J
+
+
+# direct methods
+.method public synthetic constructor <init>(J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Lq0/c/y;->a:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onDecodedFrame(Lorg/webrtc/VideoFrame;Ljava/lang/Integer;Ljava/lang/Integer;)V
+    .locals 2
+
+    iget-wide v0, p0, Lq0/c/y;->a:J
+
+    invoke-static {v0, v1, p1, p2, p3}, Lorg/webrtc/VideoDecoderWrapper;->a(JLorg/webrtc/VideoFrame;Ljava/lang/Integer;Ljava/lang/Integer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/c/z.smali b/com.discord/smali_classes2/q0/c/z.smali
new file mode 100644
index 0000000000..481fa714ed
--- /dev/null
+++ b/com.discord/smali_classes2/q0/c/z.smali
@@ -0,0 +1,34 @@
+.class public final synthetic Lq0/c/z;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lorg/webrtc/VideoEncoder$Callback;
+
+
+# instance fields
+.field public final synthetic a:J
+
+
+# direct methods
+.method public synthetic constructor <init>(J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Lq0/c/z;->a:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onEncodedFrame(Lorg/webrtc/EncodedImage;Lorg/webrtc/VideoEncoder$CodecSpecificInfo;)V
+    .locals 2
+
+    iget-wide v0, p0, Lq0/c/z;->a:J
+
+    invoke-static {v0, v1, p1, p2}, Lorg/webrtc/VideoEncoderWrapper;->a(JLorg/webrtc/EncodedImage;Lorg/webrtc/VideoEncoder$CodecSpecificInfo;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/d.smali b/com.discord/smali_classes2/q0/d.smali
deleted file mode 100644
index 96cdd2bcca..0000000000
--- a/com.discord/smali_classes2/q0/d.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public interface abstract Lq0/d;
-.super Ljava/lang/Object;
-.source "Callback.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract a(Lq0/b;Ljava/lang/Throwable;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;",
-            "Ljava/lang/Throwable;",
-            ")V"
-        }
-    .end annotation
-.end method
-
-.method public abstract b(Lq0/b;Lq0/n;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;",
-            "Lq0/n<",
-            "TT;>;)V"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/q0/e$a.smali b/com.discord/smali_classes2/q0/e$a.smali
deleted file mode 100644
index 62555ca607..0000000000
--- a/com.discord/smali_classes2/q0/e$a.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public abstract Lq0/e$a;
-.super Ljava/lang/Object;
-.source "Converter.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "*",
-            "Lokhttp3/RequestBody;",
-            ">;"
-        }
-    .end annotation
-
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
-
-.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "Lokhttp3/ResponseBody;",
-            "*>;"
-        }
-    .end annotation
-
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/e.smali b/com.discord/smali_classes2/q0/e.smali
deleted file mode 100644
index ff454c49b0..0000000000
--- a/com.discord/smali_classes2/q0/e.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public interface abstract Lq0/e;
-.super Ljava/lang/Object;
-.source "Converter.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/e$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<F:",
-        "Ljava/lang/Object;",
-        "T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract a(Ljava/lang/Object;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TF;)TT;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/q0/f$a.smali b/com.discord/smali_classes2/q0/f$a.smali
deleted file mode 100644
index 7a7271b628..0000000000
--- a/com.discord/smali_classes2/q0/f$a.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public Lq0/f$a;
-.super Ljava/lang/Object;
-.source "DefaultCallAdapterFactory.java"
-
-# interfaces
-.implements Lq0/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lq0/f;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/c<",
-        "Ljava/lang/Object;",
-        "Lq0/b<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Ljava/lang/reflect/Type;
-
-
-# direct methods
-.method public constructor <init>(Lq0/f;Ljava/lang/reflect/Type;)V
-    .locals 0
-
-    iput-object p2, p0, Lq0/f$a;->a:Ljava/lang/reflect/Type;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Ljava/lang/reflect/Type;
-    .locals 1
-
-    iget-object v0, p0, Lq0/f$a;->a:Ljava/lang/reflect/Type;
-
-    return-object v0
-.end method
-
-.method public b(Lq0/b;)Ljava/lang/Object;
-    .locals 0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/f.smali b/com.discord/smali_classes2/q0/f.smali
deleted file mode 100644
index c0bdca6689..0000000000
--- a/com.discord/smali_classes2/q0/f.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lq0/f;
-.super Lq0/c$a;
-.source "DefaultCallAdapterFactory.java"
-
-
-# static fields
-.field public static final a:Lq0/c$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/f;
-
-    invoke-direct {v0}, Lq0/f;-><init>()V
-
-    sput-object v0, Lq0/f;->a:Lq0/c$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/c$a;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/c;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/c<",
-            "**>;"
-        }
-    .end annotation
-
-    invoke-static {p1}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object p2
-
-    const-class p3, Lq0/b;
-
-    if-eq p2, p3, :cond_0
-
-    const/4 p1, 0x0
-
-    return-object p1
-
-    :cond_0
-    invoke-static {p1}, Lq0/r;->e(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    new-instance p2, Lq0/f$a;
-
-    invoke-direct {p2, p0, p1}, Lq0/f$a;-><init>(Lq0/f;Ljava/lang/reflect/Type;)V
-
-    return-object p2
-.end method
diff --git a/com.discord/smali_classes2/q0/g$a.smali b/com.discord/smali_classes2/q0/g$a.smali
deleted file mode 100644
index 4c983c9c7f..0000000000
--- a/com.discord/smali_classes2/q0/g$a.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public Lq0/g$a;
-.super Ljava/lang/Object;
-.source "ExecutorCallAdapterFactory.java"
-
-# interfaces
-.implements Lq0/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lq0/g;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/c<",
-        "Ljava/lang/Object;",
-        "Lq0/b<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Ljava/lang/reflect/Type;
-
-.field public final synthetic b:Lq0/g;
-
-
-# direct methods
-.method public constructor <init>(Lq0/g;Ljava/lang/reflect/Type;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/g$a;->b:Lq0/g;
-
-    iput-object p2, p0, Lq0/g$a;->a:Ljava/lang/reflect/Type;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Ljava/lang/reflect/Type;
-    .locals 1
-
-    iget-object v0, p0, Lq0/g$a;->a:Ljava/lang/reflect/Type;
-
-    return-object v0
-.end method
-
-.method public b(Lq0/b;)Ljava/lang/Object;
-    .locals 2
-
-    new-instance v0, Lq0/g$b;
-
-    iget-object v1, p0, Lq0/g$a;->b:Lq0/g;
-
-    iget-object v1, v1, Lq0/g;->a:Ljava/util/concurrent/Executor;
-
-    invoke-direct {v0, v1, p1}, Lq0/g$b;-><init>(Ljava/util/concurrent/Executor;Lq0/b;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/q0/g$b$a$a.smali b/com.discord/smali_classes2/q0/g$b$a$a.smali
deleted file mode 100644
index 6ba22298f3..0000000000
--- a/com.discord/smali_classes2/q0/g$b$a$a.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public Lq0/g$b$a$a;
-.super Ljava/lang/Object;
-.source "ExecutorCallAdapterFactory.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lq0/g$b$a;->b(Lq0/b;Lq0/n;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lq0/n;
-
-.field public final synthetic e:Lq0/g$b$a;
-
-
-# direct methods
-.method public constructor <init>(Lq0/g$b$a;Lq0/n;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/g$b$a$a;->e:Lq0/g$b$a;
-
-    iput-object p2, p0, Lq0/g$b$a$a;->d:Lq0/n;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 4
-
-    iget-object v0, p0, Lq0/g$b$a$a;->e:Lq0/g$b$a;
-
-    iget-object v0, v0, Lq0/g$b$a;->b:Lq0/g$b;
-
-    iget-object v0, v0, Lq0/g$b;->e:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->k()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lq0/g$b$a$a;->e:Lq0/g$b$a;
-
-    iget-object v1, v0, Lq0/g$b$a;->a:Lq0/d;
-
-    iget-object v0, v0, Lq0/g$b$a;->b:Lq0/g$b;
-
-    new-instance v2, Ljava/io/IOException;
-
-    const-string v3, "Canceled"
-
-    invoke-direct {v2, v3}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    invoke-interface {v1, v0, v2}, Lq0/d;->a(Lq0/b;Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lq0/g$b$a$a;->e:Lq0/g$b$a;
-
-    iget-object v1, v0, Lq0/g$b$a;->a:Lq0/d;
-
-    iget-object v0, v0, Lq0/g$b$a;->b:Lq0/g$b;
-
-    iget-object v2, p0, Lq0/g$b$a$a;->d:Lq0/n;
-
-    invoke-interface {v1, v0, v2}, Lq0/d;->b(Lq0/b;Lq0/n;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/g$b$a$b.smali b/com.discord/smali_classes2/q0/g$b$a$b.smali
deleted file mode 100644
index 12a77a852a..0000000000
--- a/com.discord/smali_classes2/q0/g$b$a$b.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class public Lq0/g$b$a$b;
-.super Ljava/lang/Object;
-.source "ExecutorCallAdapterFactory.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lq0/g$b$a;->a(Lq0/b;Ljava/lang/Throwable;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/Throwable;
-
-.field public final synthetic e:Lq0/g$b$a;
-
-
-# direct methods
-.method public constructor <init>(Lq0/g$b$a;Ljava/lang/Throwable;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/g$b$a$b;->e:Lq0/g$b$a;
-
-    iput-object p2, p0, Lq0/g$b$a$b;->d:Ljava/lang/Throwable;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 3
-
-    iget-object v0, p0, Lq0/g$b$a$b;->e:Lq0/g$b$a;
-
-    iget-object v1, v0, Lq0/g$b$a;->a:Lq0/d;
-
-    iget-object v0, v0, Lq0/g$b$a;->b:Lq0/g$b;
-
-    iget-object v2, p0, Lq0/g$b$a$b;->d:Ljava/lang/Throwable;
-
-    invoke-interface {v1, v0, v2}, Lq0/d;->a(Lq0/b;Ljava/lang/Throwable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/g$b$a.smali b/com.discord/smali_classes2/q0/g$b$a.smali
deleted file mode 100644
index 20e45a5da1..0000000000
--- a/com.discord/smali_classes2/q0/g$b$a.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.class public Lq0/g$b$a;
-.super Ljava/lang/Object;
-.source "ExecutorCallAdapterFactory.java"
-
-# interfaces
-.implements Lq0/d;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lq0/g$b;->Z(Lq0/d;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/d<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lq0/d;
-
-.field public final synthetic b:Lq0/g$b;
-
-
-# direct methods
-.method public constructor <init>(Lq0/g$b;Lq0/d;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/g$b$a;->b:Lq0/g$b;
-
-    iput-object p2, p0, Lq0/g$b$a;->a:Lq0/d;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/b;Ljava/lang/Throwable;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;",
-            "Ljava/lang/Throwable;",
-            ")V"
-        }
-    .end annotation
-
-    iget-object p1, p0, Lq0/g$b$a;->b:Lq0/g$b;
-
-    iget-object p1, p1, Lq0/g$b;->d:Ljava/util/concurrent/Executor;
-
-    new-instance v0, Lq0/g$b$a$b;
-
-    invoke-direct {v0, p0, p2}, Lq0/g$b$a$b;-><init>(Lq0/g$b$a;Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-
-    return-void
-.end method
-
-.method public b(Lq0/b;Lq0/n;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;",
-            "Lq0/n<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    iget-object p1, p0, Lq0/g$b$a;->b:Lq0/g$b;
-
-    iget-object p1, p1, Lq0/g$b;->d:Ljava/util/concurrent/Executor;
-
-    new-instance v0, Lq0/g$b$a$a;
-
-    invoke-direct {v0, p0, p2}, Lq0/g$b$a$a;-><init>(Lq0/g$b$a;Lq0/n;)V
-
-    invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/g$b.smali b/com.discord/smali_classes2/q0/g$b.smali
deleted file mode 100644
index d7a635c98c..0000000000
--- a/com.discord/smali_classes2/q0/g$b.smali
+++ /dev/null
@@ -1,177 +0,0 @@
-.class public final Lq0/g$b;
-.super Ljava/lang/Object;
-.source "ExecutorCallAdapterFactory.java"
-
-# interfaces
-.implements Lq0/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/g;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lq0/b<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/Executor;
-
-.field public final e:Lq0/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/b<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/Executor;Lq0/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/Executor;",
-            "Lq0/b<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/g$b;->d:Ljava/util/concurrent/Executor;
-
-    iput-object p2, p0, Lq0/g$b;->e:Lq0/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public Z(Lq0/d;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/d<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    const-string v0, "callback == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iget-object v0, p0, Lq0/g$b;->e:Lq0/b;
-
-    new-instance v1, Lq0/g$b$a;
-
-    invoke-direct {v1, p0, p1}, Lq0/g$b$a;-><init>(Lq0/g$b;Lq0/d;)V
-
-    invoke-interface {v0, v1}, Lq0/b;->Z(Lq0/d;)V
-
-    return-void
-.end method
-
-.method public cancel()V
-    .locals 1
-
-    iget-object v0, p0, Lq0/g$b;->e:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->cancel()V
-
-    return-void
-.end method
-
-.method public bridge synthetic clone()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lq0/g$b;->e0()Lq0/b;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public e0()Lq0/b;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lq0/b<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lq0/g$b;
-
-    iget-object v1, p0, Lq0/g$b;->d:Ljava/util/concurrent/Executor;
-
-    iget-object v2, p0, Lq0/g$b;->e:Lq0/b;
-
-    invoke-interface {v2}, Lq0/b;->e0()Lq0/b;
-
-    move-result-object v2
-
-    invoke-direct {v0, v1, v2}, Lq0/g$b;-><init>(Ljava/util/concurrent/Executor;Lq0/b;)V
-
-    return-object v0
-.end method
-
-.method public execute()Lq0/n;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lq0/n<",
-            "TT;>;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lq0/g$b;->e:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->execute()Lq0/n;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public k()Z
-    .locals 1
-
-    iget-object v0, p0, Lq0/g$b;->e:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->k()Z
-
-    move-result v0
-
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/q0/g.smali b/com.discord/smali_classes2/q0/g.smali
deleted file mode 100644
index e91c84cd2a..0000000000
--- a/com.discord/smali_classes2/q0/g.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public final Lq0/g;
-.super Lq0/c$a;
-.source "ExecutorCallAdapterFactory.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/g$b;
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/Executor;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/Executor;)V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/c$a;-><init>()V
-
-    iput-object p1, p0, Lq0/g;->a:Ljava/util/concurrent/Executor;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/c;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/c<",
-            "**>;"
-        }
-    .end annotation
-
-    invoke-static {p1}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object p2
-
-    const-class p3, Lq0/b;
-
-    if-eq p2, p3, :cond_0
-
-    const/4 p1, 0x0
-
-    return-object p1
-
-    :cond_0
-    invoke-static {p1}, Lq0/r;->e(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    new-instance p2, Lq0/g$a;
-
-    invoke-direct {p2, p0, p1}, Lq0/g$a;-><init>(Lq0/g;Ljava/lang/reflect/Type;)V
-
-    return-object p2
-.end method
diff --git a/com.discord/smali_classes2/q0/h$a.smali b/com.discord/smali_classes2/q0/h$a.smali
deleted file mode 100644
index 92678b5f40..0000000000
--- a/com.discord/smali_classes2/q0/h$a.smali
+++ /dev/null
@@ -1,121 +0,0 @@
-.class public Lq0/h$a;
-.super Ljava/lang/Object;
-.source "OkHttpCall.java"
-
-# interfaces
-.implements Ln0/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lq0/h;->Z(Lq0/d;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lq0/d;
-
-.field public final synthetic b:Lq0/h;
-
-
-# direct methods
-.method public constructor <init>(Lq0/h;Lq0/d;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/h$a;->b:Lq0/h;
-
-    iput-object p2, p0, Lq0/h$a;->a:Lq0/d;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ln0/f;Lokhttp3/Response;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object p1, p0, Lq0/h$a;->b:Lq0/h;
-
-    invoke-virtual {p1, p2}, Lq0/h;->c(Lokhttp3/Response;)Lq0/n;
-
-    move-result-object p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object p2, p0, Lq0/h$a;->a:Lq0/d;
-
-    iget-object v0, p0, Lq0/h$a;->b:Lq0/h;
-
-    invoke-interface {p2, v0, p1}, Lq0/d;->b(Lq0/b;Lq0/n;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {p1}, Ljava/lang/Throwable;->printStackTrace()V
-
-    :goto_0
-    return-void
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_2
-    iget-object p2, p0, Lq0/h$a;->a:Lq0/d;
-
-    iget-object v0, p0, Lq0/h$a;->b:Lq0/h;
-
-    invoke-interface {p2, v0, p1}, Lq0/d;->a(Lq0/b;Ljava/lang/Throwable;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    goto :goto_1
-
-    :catchall_2
-    move-exception p1
-
-    invoke-virtual {p1}, Ljava/lang/Throwable;->printStackTrace()V
-
-    :goto_1
-    return-void
-.end method
-
-.method public b(Ln0/f;Ljava/io/IOException;)V
-    .locals 1
-
-    :try_start_0
-    iget-object p1, p0, Lq0/h$a;->a:Lq0/d;
-
-    iget-object v0, p0, Lq0/h$a;->b:Lq0/h;
-
-    invoke-interface {p1, v0, p2}, Lq0/d;->a(Lq0/b;Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {p1}, Ljava/lang/Throwable;->printStackTrace()V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/h$b$a.smali b/com.discord/smali_classes2/q0/h$b$a.smali
deleted file mode 100644
index d0708a8813..0000000000
--- a/com.discord/smali_classes2/q0/h$b$a.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public Lq0/h$b$a;
-.super Lo0/i;
-.source "OkHttpCall.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lq0/h$b;->c()Lo0/g;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic e:Lq0/h$b;
-
-
-# direct methods
-.method public constructor <init>(Lq0/h$b;Lo0/w;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/h$b$a;->e:Lq0/h$b;
-
-    invoke-direct {p0, p2}, Lo0/i;-><init>(Lo0/w;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public B0(Lo0/e;J)J
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    :try_start_0
-    invoke-super {p0, p1, p2, p3}, Lo0/i;->B0(Lo0/e;J)J
-
-    move-result-wide p1
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-wide p1
-
-    :catch_0
-    move-exception p1
-
-    iget-object p2, p0, Lq0/h$b$a;->e:Lq0/h$b;
-
-    iput-object p1, p2, Lq0/h$b;->g:Ljava/io/IOException;
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/q0/h$b.smali b/com.discord/smali_classes2/q0/h$b.smali
deleted file mode 100644
index 567d569a92..0000000000
--- a/com.discord/smali_classes2/q0/h$b.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.class public final Lq0/h$b;
-.super Lokhttp3/ResponseBody;
-.source "OkHttpCall.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final f:Lokhttp3/ResponseBody;
-
-.field public g:Ljava/io/IOException;
-
-
-# direct methods
-.method public constructor <init>(Lokhttp3/ResponseBody;)V
-    .locals 0
-
-    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
-
-    iput-object p1, p0, Lq0/h$b;->f:Lokhttp3/ResponseBody;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()J
-    .locals 2
-
-    iget-object v0, p0, Lq0/h$b;->f:Lokhttp3/ResponseBody;
-
-    invoke-virtual {v0}, Lokhttp3/ResponseBody;->a()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public b()Lokhttp3/MediaType;
-    .locals 1
-
-    iget-object v0, p0, Lq0/h$b;->f:Lokhttp3/ResponseBody;
-
-    invoke-virtual {v0}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public c()Lo0/g;
-    .locals 2
-
-    new-instance v0, Lq0/h$b$a;
-
-    iget-object v1, p0, Lq0/h$b;->f:Lokhttp3/ResponseBody;
-
-    invoke-virtual {v1}, Lokhttp3/ResponseBody;->c()Lo0/g;
-
-    move-result-object v1
-
-    invoke-direct {v0, p0, v1}, Lq0/h$b$a;-><init>(Lq0/h$b;Lo0/w;)V
-
-    invoke-static {v0}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public close()V
-    .locals 1
-
-    iget-object v0, p0, Lq0/h$b;->f:Lokhttp3/ResponseBody;
-
-    invoke-virtual {v0}, Lokhttp3/ResponseBody;->close()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/h$c.smali b/com.discord/smali_classes2/q0/h$c.smali
deleted file mode 100644
index fe0ed710a8..0000000000
--- a/com.discord/smali_classes2/q0/h$c.smali
+++ /dev/null
@@ -1,64 +0,0 @@
-.class public final Lq0/h$c;
-.super Lokhttp3/ResponseBody;
-.source "OkHttpCall.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public final f:Lokhttp3/MediaType;
-
-.field public final g:J
-
-
-# direct methods
-.method public constructor <init>(Lokhttp3/MediaType;J)V
-    .locals 0
-
-    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
-
-    iput-object p1, p0, Lq0/h$c;->f:Lokhttp3/MediaType;
-
-    iput-wide p2, p0, Lq0/h$c;->g:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()J
-    .locals 2
-
-    iget-wide v0, p0, Lq0/h$c;->g:J
-
-    return-wide v0
-.end method
-
-.method public b()Lokhttp3/MediaType;
-    .locals 1
-
-    iget-object v0, p0, Lq0/h$c;->f:Lokhttp3/MediaType;
-
-    return-object v0
-.end method
-
-.method public c()Lo0/g;
-    .locals 2
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Cannot read raw response body of a converted body."
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/q0/h.smali b/com.discord/smali_classes2/q0/h.smali
deleted file mode 100644
index 6ed3e3211e..0000000000
--- a/com.discord/smali_classes2/q0/h.smali
+++ /dev/null
@@ -1,966 +0,0 @@
-.class public final Lq0/h;
-.super Ljava/lang/Object;
-.source "OkHttpCall.java"
-
-# interfaces
-.implements Lq0/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/h$b;,
-        Lq0/h$c;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lq0/b<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lq0/q;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/q<",
-            "TT;*>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:[Ljava/lang/Object;
-
-.field public volatile f:Z
-
-.field public g:Ln0/f;
-
-.field public h:Ljava/lang/Throwable;
-
-.field public i:Z
-
-
-# direct methods
-.method public constructor <init>(Lq0/q;[Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/q<",
-            "TT;*>;[",
-            "Ljava/lang/Object;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/h;->d:Lq0/q;
-
-    iput-object p2, p0, Lq0/h;->e:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public Z(Lq0/d;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/d<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    const-string v0, "callback == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lq0/h;->i:Z
-
-    if-nez v0, :cond_3
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lq0/h;->i:Z
-
-    iget-object v0, p0, Lq0/h;->g:Ln0/f;
-
-    iget-object v1, p0, Lq0/h;->h:Ljava/lang/Throwable;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-nez v0, :cond_0
-
-    if-nez v1, :cond_0
-
-    :try_start_1
-    invoke-virtual {p0}, Lq0/h;->b()Ln0/f;
-
-    move-result-object v2
-
-    iput-object v2, p0, Lq0/h;->g:Ln0/f;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    move-object v0, v2
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    :try_start_2
-    iput-object v1, p0, Lq0/h;->h:Ljava/lang/Throwable;
-
-    :cond_0
-    :goto_0
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {p1, p0, v1}, Lq0/d;->a(Lq0/b;Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_1
-    iget-boolean v1, p0, Lq0/h;->f:Z
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v0}, Ln0/f;->cancel()V
-
-    :cond_2
-    new-instance v1, Lq0/h$a;
-
-    invoke-direct {v1, p0, p1}, Lq0/h$a;-><init>(Lq0/h;Lq0/d;)V
-
-    invoke-interface {v0, v1}, Ln0/f;->F(Ln0/g;)V
-
-    return-void
-
-    :cond_3
-    :try_start_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Already executed."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    throw p1
-.end method
-
-.method public final b()Ln0/f;
-    .locals 12
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lq0/h;->d:Lq0/q;
-
-    iget-object v1, p0, Lq0/h;->e:[Ljava/lang/Object;
-
-    new-instance v11, Lq0/m;
-
-    iget-object v3, v0, Lq0/q;->e:Ljava/lang/String;
-
-    iget-object v4, v0, Lq0/q;->c:Ln0/w;
-
-    iget-object v5, v0, Lq0/q;->f:Ljava/lang/String;
-
-    iget-object v6, v0, Lq0/q;->g:Lokhttp3/Headers;
-
-    iget-object v7, v0, Lq0/q;->h:Lokhttp3/MediaType;
-
-    iget-boolean v8, v0, Lq0/q;->i:Z
-
-    iget-boolean v9, v0, Lq0/q;->j:Z
-
-    iget-boolean v10, v0, Lq0/q;->k:Z
-
-    move-object v2, v11
-
-    invoke-direct/range {v2 .. v10}, Lq0/m;-><init>(Ljava/lang/String;Ln0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/MediaType;ZZZ)V
-
-    iget-object v0, v0, Lq0/q;->l:[Lq0/k;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_0
-
-    array-length v3, v1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_0
-    array-length v4, v0
-
-    if-ne v3, v4, :cond_a
-
-    const/4 v4, 0x0
-
-    :goto_1
-    if-ge v4, v3, :cond_1
-
-    aget-object v5, v0, v4
-
-    aget-object v6, v1, v4
-
-    invoke-virtual {v5, v11, v6}, Lq0/k;->a(Lq0/m;Ljava/lang/Object;)V
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v0, v11, Lq0/m;->d:Ln0/w$a;
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Ln0/w$a;->b()Ln0/w;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_2
-    iget-object v0, v11, Lq0/m;->b:Ln0/w;
-
-    iget-object v1, v11, Lq0/m;->c:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ln0/w;->j(Ljava/lang/String;)Ln0/w;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_9
-
-    :goto_2
-    iget-object v1, v11, Lq0/m;->j:Lokhttp3/RequestBody;
-
-    if-nez v1, :cond_5
-
-    iget-object v3, v11, Lq0/m;->i:Ln0/u$a;
-
-    const/4 v4, 0x0
-
-    if-eqz v3, :cond_3
-
-    new-instance v1, Ln0/u;
-
-    iget-object v2, v3, Ln0/u$a;->a:Ljava/util/List;
-
-    iget-object v3, v3, Ln0/u$a;->b:Ljava/util/List;
-
-    invoke-direct {v1, v2, v3}, Ln0/u;-><init>(Ljava/util/List;Ljava/util/List;)V
-
-    goto :goto_3
-
-    :cond_3
-    iget-object v3, v11, Lq0/m;->h:Lokhttp3/MultipartBody$a;
-
-    if-eqz v3, :cond_4
-
-    invoke-virtual {v3}, Lokhttp3/MultipartBody$a;->b()Lokhttp3/MultipartBody;
-
-    move-result-object v1
-
-    goto :goto_3
-
-    :cond_4
-    iget-boolean v3, v11, Lq0/m;->g:Z
-
-    if-eqz v3, :cond_5
-
-    new-array v1, v2, [B
-
-    invoke-static {v4, v1}, Lokhttp3/RequestBody;->create(Lokhttp3/MediaType;[B)Lokhttp3/RequestBody;
-
-    move-result-object v1
-
-    :cond_5
-    :goto_3
-    iget-object v2, v11, Lq0/m;->f:Lokhttp3/MediaType;
-
-    if-eqz v2, :cond_7
-
-    if-eqz v1, :cond_6
-
-    new-instance v3, Lq0/m$a;
-
-    invoke-direct {v3, v1, v2}, Lq0/m$a;-><init>(Lokhttp3/RequestBody;Lokhttp3/MediaType;)V
-
-    move-object v1, v3
-
-    goto :goto_4
-
-    :cond_6
-    iget-object v3, v11, Lq0/m;->e:Ln0/a0$a;
-
-    iget-object v2, v2, Lokhttp3/MediaType;->a:Ljava/lang/String;
-
-    const-string v4, "Content-Type"
-
-    invoke-virtual {v3, v4, v2}, Ln0/a0$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    :cond_7
-    :goto_4
-    iget-object v2, v11, Lq0/m;->e:Ln0/a0$a;
-
-    iput-object v0, v2, Ln0/a0$a;->a:Ln0/w;
-
-    iget-object v0, v11, Lq0/m;->a:Ljava/lang/String;
-
-    invoke-virtual {v2, v0, v1}, Ln0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Ln0/a0$a;
-
-    invoke-virtual {v2}, Ln0/a0$a;->b()Ln0/a0;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lq0/h;->d:Lq0/q;
-
-    iget-object v1, v1, Lq0/q;->a:Ln0/f$a;
-
-    invoke-interface {v1, v0}, Ln0/f$a;->b(Ln0/a0;)Ln0/f;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_8
-
-    return-object v0
-
-    :cond_8
-    new-instance v0, Ljava/lang/NullPointerException;
-
-    const-string v1, "Call.Factory returned null."
-
-    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "Malformed URL. Base: "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    iget-object v2, v11, Lq0/m;->b:Ln0/w;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v2, ", Relative: "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v2, v11, Lq0/m;->c:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    const-string v2, "Argument count ("
-
-    const-string v4, ") doesn\'t match expected count ("
-
-    invoke-static {v2, v3, v4}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    array-length v0, v0
-
-    const-string v3, ")"
-
-    invoke-static {v2, v0, v3}, Lf/e/b/a/a;->s(Ljava/lang/StringBuilder;ILjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public c(Lokhttp3/Response;)Lq0/n;
-    .locals 20
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lokhttp3/Response;",
-            ")",
-            "Lq0/n<",
-            "TT;>;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    move-object/from16 v0, p1
-
-    iget-object v1, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    iget-object v3, v0, Lokhttp3/Response;->d:Ln0/a0;
-
-    iget-object v4, v0, Lokhttp3/Response;->e:Ln0/y;
-
-    iget v6, v0, Lokhttp3/Response;->g:I
-
-    iget-object v5, v0, Lokhttp3/Response;->f:Ljava/lang/String;
-
-    iget-object v7, v0, Lokhttp3/Response;->h:Ln0/v;
-
-    iget-object v2, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
-
-    invoke-virtual {v2}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object v2
-
-    iget-object v8, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
-
-    iget-object v10, v0, Lokhttp3/Response;->k:Lokhttp3/Response;
-
-    iget-object v11, v0, Lokhttp3/Response;->l:Lokhttp3/Response;
-
-    iget-object v12, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
-
-    iget-wide v13, v0, Lokhttp3/Response;->n:J
-
-    iget-wide v8, v0, Lokhttp3/Response;->o:J
-
-    iget-object v0, v0, Lokhttp3/Response;->p:Ln0/g0/d/c;
-
-    new-instance v15, Lq0/h$c;
-
-    move-wide/from16 v16, v8
-
-    invoke-virtual {v1}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
-
-    move-result-object v8
-
-    move-wide/from16 v18, v13
-
-    invoke-virtual {v1}, Lokhttp3/ResponseBody;->a()J
-
-    move-result-wide v13
-
-    invoke-direct {v15, v8, v13, v14}, Lq0/h$c;-><init>(Lokhttp3/MediaType;J)V
-
-    if-ltz v6, :cond_0
-
-    const/4 v8, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v8, 0x0
-
-    :goto_0
-    if-eqz v8, :cond_a
-
-    if-eqz v3, :cond_9
-
-    if-eqz v4, :cond_8
-
-    if-eqz v5, :cond_7
-
-    invoke-virtual {v2}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v8
-
-    new-instance v13, Lokhttp3/Response;
-
-    move-object v2, v13
-
-    move-object v9, v15
-
-    move-object v15, v13
-
-    move-wide/from16 v13, v18
-
-    move-object/from16 v18, v1
-
-    move-object v1, v15
-
-    move-wide/from16 v15, v16
-
-    move-object/from16 v17, v0
-
-    invoke-direct/range {v2 .. v17}, Lokhttp3/Response;-><init>(Ln0/a0;Ln0/y;Ljava/lang/String;ILn0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLn0/g0/d/c;)V
-
-    iget v0, v1, Lokhttp3/Response;->g:I
-
-    const/16 v2, 0xc8
-
-    const/4 v3, 0x0
-
-    if-lt v0, v2, :cond_5
-
-    const/16 v2, 0x12c
-
-    if-lt v0, v2, :cond_1
-
-    goto :goto_2
-
-    :cond_1
-    const/16 v2, 0xcc
-
-    if-eq v0, v2, :cond_4
-
-    const/16 v2, 0xcd
-
-    if-ne v0, v2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v2, Lq0/h$b;
-
-    move-object/from16 v4, v18
-
-    invoke-direct {v2, v4}, Lq0/h$b;-><init>(Lokhttp3/ResponseBody;)V
-
-    move-object/from16 v5, p0
-
-    :try_start_0
-    iget-object v0, v5, Lq0/h;->d:Lq0/q;
-
-    iget-object v0, v0, Lq0/q;->d:Lq0/e;
-
-    invoke-interface {v0, v2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-static {v0, v1}, Lq0/n;->a(Ljava/lang/Object;Lokhttp3/Response;)Lq0/n;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v0
-
-    :catch_0
-    move-exception v0
-
-    iget-object v1, v2, Lq0/h$b;->g:Ljava/io/IOException;
-
-    if-nez v1, :cond_3
-
-    throw v0
-
-    :cond_3
-    throw v1
-
-    :cond_4
-    :goto_1
-    move-object/from16 v5, p0
-
-    move-object/from16 v4, v18
-
-    invoke-virtual {v4}, Lokhttp3/ResponseBody;->close()V
-
-    invoke-static {v3, v1}, Lq0/n;->a(Ljava/lang/Object;Lokhttp3/Response;)Lq0/n;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_5
-    :goto_2
-    move-object/from16 v5, p0
-
-    move-object/from16 v4, v18
-
-    :try_start_1
-    invoke-static {v4}, Lq0/r;->a(Lokhttp3/ResponseBody;)Lokhttp3/ResponseBody;
-
-    move-result-object v0
-
-    const-string v2, "body == null"
-
-    invoke-static {v0, v2}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    const-string v2, "rawResponse == null"
-
-    invoke-static {v1, v2}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    invoke-virtual {v1}, Lokhttp3/Response;->b()Z
-
-    move-result v2
-
-    if-nez v2, :cond_6
-
-    new-instance v2, Lq0/n;
-
-    invoke-direct {v2, v1, v3, v0}, Lq0/n;-><init>(Lokhttp3/Response;Ljava/lang/Object;Lokhttp3/ResponseBody;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    invoke-virtual {v4}, Lokhttp3/ResponseBody;->close()V
-
-    return-object v2
-
-    :cond_6
-    :try_start_2
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "rawResponse should not be successful response"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {v4}, Lokhttp3/ResponseBody;->close()V
-
-    throw v0
-
-    :cond_7
-    move-object/from16 v5, p0
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "message == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_8
-    move-object/from16 v5, p0
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "protocol == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_9
-    move-object/from16 v5, p0
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "request == null"
-
-    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_a
-    move-object/from16 v5, p0
-
-    const-string v0, "code < 0: "
-
-    invoke-static {v0, v6}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public cancel()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lq0/h;->f:Z
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lq0/h;->g:Ln0/f;
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Ln0/f;->cancel()V
-
-    :cond_0
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-.end method
-
-.method public clone()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/CloneNotSupportedException;
-        }
-    .end annotation
-
-    new-instance v0, Lq0/h;
-
-    iget-object v1, p0, Lq0/h;->d:Lq0/q;
-
-    iget-object v2, p0, Lq0/h;->e:[Ljava/lang/Object;
-
-    invoke-direct {v0, v1, v2}, Lq0/h;-><init>(Lq0/q;[Ljava/lang/Object;)V
-
-    return-object v0
-.end method
-
-.method public e0()Lq0/b;
-    .locals 3
-
-    new-instance v0, Lq0/h;
-
-    iget-object v1, p0, Lq0/h;->d:Lq0/q;
-
-    iget-object v2, p0, Lq0/h;->e:[Ljava/lang/Object;
-
-    invoke-direct {v0, v1, v2}, Lq0/h;-><init>(Lq0/q;[Ljava/lang/Object;)V
-
-    return-object v0
-.end method
-
-.method public execute()Lq0/n;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lq0/n<",
-            "TT;>;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lq0/h;->i:Z
-
-    if-nez v0, :cond_4
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lq0/h;->i:Z
-
-    iget-object v0, p0, Lq0/h;->h:Ljava/lang/Throwable;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lq0/h;->h:Ljava/lang/Throwable;
-
-    instance-of v0, v0, Ljava/io/IOException;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lq0/h;->h:Ljava/lang/Throwable;
-
-    check-cast v0, Ljava/io/IOException;
-
-    throw v0
-
-    :cond_0
-    iget-object v0, p0, Lq0/h;->h:Ljava/lang/Throwable;
-
-    check-cast v0, Ljava/lang/RuntimeException;
-
-    throw v0
-
-    :cond_1
-    iget-object v0, p0, Lq0/h;->g:Ln0/f;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_2
-
-    :try_start_1
-    invoke-virtual {p0}, Lq0/h;->b()Ln0/f;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lq0/h;->g:Ln0/f;
-    :try_end_1
-    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
-    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    goto :goto_0
-
-    :catch_1
-    move-exception v0
-
-    :goto_0
-    :try_start_2
-    iput-object v0, p0, Lq0/h;->h:Ljava/lang/Throwable;
-
-    throw v0
-
-    :cond_2
-    :goto_1
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    iget-boolean v1, p0, Lq0/h;->f:Z
-
-    if-eqz v1, :cond_3
-
-    invoke-interface {v0}, Ln0/f;->cancel()V
-
-    :cond_3
-    invoke-interface {v0}, Ln0/f;->execute()Lokhttp3/Response;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Lq0/h;->c(Lokhttp3/Response;)Lq0/n;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_4
-    :try_start_3
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Already executed."
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw v0
-.end method
-
-.method public k()Z
-    .locals 2
-
-    iget-boolean v0, p0, Lq0/h;->f:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lq0/h;->g:Ln0/f;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lq0/h;->g:Ln0/f;
-
-    invoke-interface {v0}, Ln0/f;->k()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_0
-    monitor-exit p0
-
-    return v1
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/q0/i.smali b/com.discord/smali_classes2/q0/i.smali
deleted file mode 100644
index 84a83de44f..0000000000
--- a/com.discord/smali_classes2/q0/i.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class public Lq0/i;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lq0/k<",
-        "Ljava/lang/Iterable<",
-        "TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lq0/k;
-
-
-# direct methods
-.method public constructor <init>(Lq0/k;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/i;->a:Lq0/k;
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p2, Ljava/lang/Iterable;
-
-    if-nez p2, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :goto_0
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lq0/i;->a:Lq0/k;
-
-    invoke-virtual {v1, p1, v0}, Lq0/k;->a(Lq0/m;Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_1
-    :goto_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/j.smali b/com.discord/smali_classes2/q0/j.smali
deleted file mode 100644
index f9ed27956d..0000000000
--- a/com.discord/smali_classes2/q0/j.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.class public Lq0/j;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lq0/k<",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lq0/k;
-
-
-# direct methods
-.method public constructor <init>(Lq0/k;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/j;->a:Lq0/k;
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-nez p2, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    invoke-static {p2}, Ljava/lang/reflect/Array;->getLength(Ljava/lang/Object;)I
-
-    move-result v1
-
-    :goto_0
-    if-ge v0, v1, :cond_1
-
-    iget-object v2, p0, Lq0/j;->a:Lq0/k;
-
-    invoke-static {p2, v0}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-virtual {v2, p1, v3}, Lq0/k;->a(Lq0/m;Ljava/lang/Object;)V
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/k$a.smali b/com.discord/smali_classes2/q0/k$a.smali
deleted file mode 100644
index 914a1d4b7d..0000000000
--- a/com.discord/smali_classes2/q0/k$a.smali
+++ /dev/null
@@ -1,124 +0,0 @@
-.class public final Lq0/k$a;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lq0/k<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "TT;",
-            "Lokhttp3/RequestBody;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lq0/e;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/e<",
-            "TT;",
-            "Lokhttp3/RequestBody;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    iput-object p1, p0, Lq0/k$a;->a:Lq0/e;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/m;",
-            "TT;)V"
-        }
-    .end annotation
-
-    if-eqz p2, :cond_0
-
-    :try_start_0
-    iget-object v0, p0, Lq0/k$a;->a:Lq0/e;
-
-    invoke-interface {v0, p2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lokhttp3/RequestBody;
-    :try_end_0
-    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
-
-    iput-object v0, p1, Lq0/m;->j:Lokhttp3/RequestBody;
-
-    return-void
-
-    :catch_0
-    move-exception p1
-
-    new-instance v0, Ljava/lang/RuntimeException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Unable to convert "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p2, " to RequestBody"
-
-    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {v0, p2, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Body parameter value must not be null."
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/q0/k$b.smali b/com.discord/smali_classes2/q0/k$b.smali
deleted file mode 100644
index cb6c939a43..0000000000
--- a/com.discord/smali_classes2/q0/k$b.smali
+++ /dev/null
@@ -1,116 +0,0 @@
-.class public final Lq0/k$b;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lq0/k<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public final b:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Lq0/e;Z)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;Z)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    const-string v0, "name == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iput-object p1, p0, Lq0/k$b;->a:Ljava/lang/String;
-
-    iput-object p2, p0, Lq0/k$b;->b:Lq0/e;
-
-    iput-boolean p3, p0, Lq0/k$b;->c:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/m;",
-            "TT;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-nez p2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lq0/k$b;->b:Lq0/e;
-
-    invoke-interface {v0, p2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/String;
-
-    if-nez p2, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Lq0/k$b;->a:Ljava/lang/String;
-
-    iget-boolean v1, p0, Lq0/k$b;->c:Z
-
-    invoke-virtual {p1, v0, p2, v1}, Lq0/m;->a(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/k$c.smali b/com.discord/smali_classes2/q0/k$c.smali
deleted file mode 100644
index 92b244908c..0000000000
--- a/com.discord/smali_classes2/q0/k$c.smali
+++ /dev/null
@@ -1,211 +0,0 @@
-.class public final Lq0/k$c;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lq0/k<",
-        "Ljava/util/Map<",
-        "Ljava/lang/String;",
-        "TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Z
-
-
-# direct methods
-.method public constructor <init>(Lq0/e;Z)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;Z)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    iput-object p1, p0, Lq0/k$c;->a:Lq0/e;
-
-    iput-boolean p2, p0, Lq0/k$c;->b:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p2, Ljava/util/Map;
-
-    if-eqz p2, :cond_4
-
-    invoke-interface {p2}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
-    move-result-object p2
-
-    invoke-interface {p2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object p2
-
-    :goto_0
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    invoke-interface {p2}, 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
-
-    check-cast v1, Ljava/lang/String;
-
-    if-eqz v1, :cond_2
-
-    invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v0
-
-    const-string v2, "\'."
-
-    if-eqz v0, :cond_1
-
-    iget-object v3, p0, Lq0/k$c;->a:Lq0/e;
-
-    invoke-interface {v3, v0}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/lang/String;
-
-    if-eqz v3, :cond_0
-
-    iget-boolean v0, p0, Lq0/k$c;->b:Z
-
-    invoke-virtual {p1, v1, v3, v0}, Lq0/m;->a(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v3, "Field map value \'"
-
-    invoke-virtual {p2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v0, "\' converted to null by "
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v0, p0, Lq0/k$c;->a:Lq0/e;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, " for key \'"
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Field map contained null value for key \'"
-
-    invoke-static {p2, v1, v2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Field map contained null key."
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_3
-    return-void
-
-    :cond_4
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Field map was null."
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/q0/k$d.smali b/com.discord/smali_classes2/q0/k$d.smali
deleted file mode 100644
index 462c5b107a..0000000000
--- a/com.discord/smali_classes2/q0/k$d.smali
+++ /dev/null
@@ -1,110 +0,0 @@
-.class public final Lq0/k$d;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "d"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lq0/k<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public final b:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Lq0/e;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    const-string v0, "name == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iput-object p1, p0, Lq0/k$d;->a:Ljava/lang/String;
-
-    iput-object p2, p0, Lq0/k$d;->b:Lq0/e;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/m;",
-            "TT;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-nez p2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lq0/k$d;->b:Lq0/e;
-
-    invoke-interface {v0, p2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/String;
-
-    if-nez p2, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Lq0/k$d;->a:Ljava/lang/String;
-
-    invoke-virtual {p1, v0, p2}, Lq0/m;->b(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/k$h.smali b/com.discord/smali_classes2/q0/k$h.smali
deleted file mode 100644
index f1e3e175c5..0000000000
--- a/com.discord/smali_classes2/q0/k$h.smali
+++ /dev/null
@@ -1,116 +0,0 @@
-.class public final Lq0/k$h;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "h"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lq0/k<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public final b:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;Lq0/e;Z)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/String;",
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;Z)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    const-string v0, "name == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iput-object p1, p0, Lq0/k$h;->a:Ljava/lang/String;
-
-    iput-object p2, p0, Lq0/k$h;->b:Lq0/e;
-
-    iput-boolean p3, p0, Lq0/k$h;->c:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/m;",
-            "TT;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-nez p2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lq0/k$h;->b:Lq0/e;
-
-    invoke-interface {v0, p2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/String;
-
-    if-nez p2, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Lq0/k$h;->a:Ljava/lang/String;
-
-    iget-boolean v1, p0, Lq0/k$h;->c:Z
-
-    invoke-virtual {p1, v0, p2, v1}, Lq0/m;->d(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/k$j.smali b/com.discord/smali_classes2/q0/k$j.smali
deleted file mode 100644
index d5f60fcf8f..0000000000
--- a/com.discord/smali_classes2/q0/k$j.smali
+++ /dev/null
@@ -1,102 +0,0 @@
-.class public final Lq0/k$j;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "j"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lq0/k<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Z
-
-
-# direct methods
-.method public constructor <init>(Lq0/e;Z)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;Z)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    iput-object p1, p0, Lq0/k$j;->a:Lq0/e;
-
-    iput-boolean p2, p0, Lq0/k$j;->b:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/m;",
-            "TT;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    if-nez p2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lq0/k$j;->a:Lq0/e;
-
-    invoke-interface {v0, p2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/lang/String;
-
-    const/4 v0, 0x0
-
-    iget-boolean v1, p0, Lq0/k$j;->b:Z
-
-    invoke-virtual {p1, p2, v0, v1}, Lq0/m;->d(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/k$k.smali b/com.discord/smali_classes2/q0/k$k.smali
deleted file mode 100644
index f6839e8252..0000000000
--- a/com.discord/smali_classes2/q0/k$k.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lq0/k$k;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "k"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lq0/k<",
-        "Lokhttp3/MultipartBody$Part;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/k$k;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/k$k;
-
-    invoke-direct {v0}, Lq0/k$k;-><init>()V
-
-    sput-object v0, Lq0/k$k;->a:Lq0/k$k;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p2, Lokhttp3/MultipartBody$Part;
-
-    if-eqz p2, :cond_0
-
-    iget-object p1, p1, Lq0/m;->h:Lokhttp3/MultipartBody$a;
-
-    invoke-virtual {p1, p2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/MultipartBody$Part;)Lokhttp3/MultipartBody$a;
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/k$l.smali b/com.discord/smali_classes2/q0/k$l.smali
deleted file mode 100644
index eadcfee2e9..0000000000
--- a/com.discord/smali_classes2/q0/k$l.smali
+++ /dev/null
@@ -1,57 +0,0 @@
-.class public final Lq0/k$l;
-.super Lq0/k;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "l"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lq0/k<",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/k;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
-    .locals 1
-
-    const-string v0, "@Url parameter is null."
-
-    invoke-static {p2, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    iput-object p2, p1, Lq0/m;->c:Ljava/lang/String;
-
-    return-void
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/q0/k.smali b/com.discord/smali_classes2/q0/k.smali
deleted file mode 100644
index 3975e78fdb..0000000000
--- a/com.discord/smali_classes2/q0/k.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public abstract Lq0/k;
-.super Ljava/lang/Object;
-.source "ParameterHandler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/k$a;,
-        Lq0/k$f;,
-        Lq0/k$k;,
-        Lq0/k$e;,
-        Lq0/k$c;,
-        Lq0/k$b;,
-        Lq0/k$i;,
-        Lq0/k$j;,
-        Lq0/k$h;,
-        Lq0/k$g;,
-        Lq0/k$d;,
-        Lq0/k$l;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract a(Lq0/m;Ljava/lang/Object;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/m;",
-            "TT;)V"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/q0/l$a$a.smali b/com.discord/smali_classes2/q0/l$a$a.smali
deleted file mode 100644
index c0ccbae58b..0000000000
--- a/com.discord/smali_classes2/q0/l$a$a.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public Lq0/l$a$a;
-.super Ljava/lang/Object;
-.source "Platform.java"
-
-# interfaces
-.implements Ljava/util/concurrent/Executor;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/l$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Landroid/os/Handler;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Landroid/os/Handler;
-
-    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
-
-    iput-object v0, p0, Lq0/l$a$a;->d:Landroid/os/Handler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public execute(Ljava/lang/Runnable;)V
-    .locals 1
-
-    iget-object v0, p0, Lq0/l$a$a;->d:Landroid/os/Handler;
-
-    invoke-virtual {v0, p1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/l$a.smali b/com.discord/smali_classes2/q0/l$a.smali
deleted file mode 100644
index 440d6a0a84..0000000000
--- a/com.discord/smali_classes2/q0/l$a.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class public Lq0/l$a;
-.super Lq0/l;
-.source "Platform.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/l$a$a;
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/l;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/util/concurrent/Executor;)Lq0/c$a;
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Lq0/g;
-
-    invoke-direct {v0, p1}, Lq0/g;-><init>(Ljava/util/concurrent/Executor;)V
-
-    return-object v0
-
-    :cond_0
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-.end method
-
-.method public b()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    new-instance v0, Lq0/l$a$a;
-
-    invoke-direct {v0}, Lq0/l$a$a;-><init>()V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/q0/l$b.smali b/com.discord/smali_classes2/q0/l$b.smali
deleted file mode 100644
index cd7f9b3ca2..0000000000
--- a/com.discord/smali_classes2/q0/l$b.smali
+++ /dev/null
@@ -1,118 +0,0 @@
-.class public Lq0/l$b;
-.super Lq0/l;
-.source "Platform.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "b"
-.end annotation
-
-.annotation build Lorg/codehaus/mojo/animal_sniffer/IgnoreJRERequirement;
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/l;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs c(Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Method;",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Object;",
-            "[",
-            "Ljava/lang/Object;",
-            ")",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Throwable;
-        }
-    .end annotation
-
-    const-class v0, Ljava/lang/invoke/MethodHandles$Lookup;
-
-    const/4 v1, 0x2
-
-    new-array v2, v1, [Ljava/lang/Class;
-
-    const-class v3, Ljava/lang/Class;
-
-    const/4 v4, 0x0
-
-    aput-object v3, v2, v4
-
-    sget-object v3, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    const/4 v5, 0x1
-
-    aput-object v3, v2, v5
-
-    invoke-virtual {v0, v2}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v5}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    aput-object p2, v1, v4
-
-    const/4 v2, -0x1
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    aput-object v2, v1, v5
-
-    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/invoke/MethodHandles$Lookup;
-
-    invoke-virtual {v0, p1, p2}, Ljava/lang/invoke/MethodHandles$Lookup;->unreflectSpecial(Ljava/lang/reflect/Method;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p3}, Ljava/lang/invoke/MethodHandle;->bindTo(Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p4}, Ljava/lang/invoke/MethodHandle;->invokeWithArguments([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public d(Ljava/lang/reflect/Method;)Z
-    .locals 0
-
-    invoke-virtual {p1}, Ljava/lang/reflect/Method;->isDefault()Z
-
-    move-result p1
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/q0/l.smali b/com.discord/smali_classes2/q0/l.smali
deleted file mode 100644
index 536b9f2cb8..0000000000
--- a/com.discord/smali_classes2/q0/l.smali
+++ /dev/null
@@ -1,131 +0,0 @@
-.class public Lq0/l;
-.super Ljava/lang/Object;
-.source "Platform.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/l$a;,
-        Lq0/l$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/l;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    :try_start_0
-    const-string v0, "android.os.Build"
-
-    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    new-instance v0, Lq0/l$a;
-
-    invoke-direct {v0}, Lq0/l$a;-><init>()V
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    :try_start_1
-    const-string v0, "java.util.Optional"
-
-    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    new-instance v0, Lq0/l$b;
-
-    invoke-direct {v0}, Lq0/l$b;-><init>()V
-    :try_end_1
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
-
-    goto :goto_0
-
-    :catch_1
-    new-instance v0, Lq0/l;
-
-    invoke-direct {v0}, Lq0/l;-><init>()V
-
-    :goto_0
-    sput-object v0, Lq0/l;->a:Lq0/l;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/util/concurrent/Executor;)Lq0/c$a;
-    .locals 1
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Lq0/g;
-
-    invoke-direct {v0, p1}, Lq0/g;-><init>(Ljava/util/concurrent/Executor;)V
-
-    return-object v0
-
-    :cond_0
-    sget-object p1, Lq0/f;->a:Lq0/c$a;
-
-    return-object p1
-.end method
-
-.method public b()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public varargs c(Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Method;",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Object;",
-            "[",
-            "Ljava/lang/Object;",
-            ")",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Throwable;
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public d(Ljava/lang/reflect/Method;)Z
-    .locals 0
-
-    const/4 p1, 0x0
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/q0/m$a.smali b/com.discord/smali_classes2/q0/m$a.smali
deleted file mode 100644
index 354d063443..0000000000
--- a/com.discord/smali_classes2/q0/m$a.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public Lq0/m$a;
-.super Lokhttp3/RequestBody;
-.source "RequestBuilder.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/m;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:Lokhttp3/RequestBody;
-
-.field public final b:Lokhttp3/MediaType;
-
-
-# direct methods
-.method public constructor <init>(Lokhttp3/RequestBody;Lokhttp3/MediaType;)V
-    .locals 0
-
-    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
-
-    iput-object p1, p0, Lq0/m$a;->a:Lokhttp3/RequestBody;
-
-    iput-object p2, p0, Lq0/m$a;->b:Lokhttp3/MediaType;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public contentLength()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lq0/m$a;->a:Lokhttp3/RequestBody;
-
-    invoke-virtual {v0}, Lokhttp3/RequestBody;->contentLength()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public contentType()Lokhttp3/MediaType;
-    .locals 1
-
-    iget-object v0, p0, Lq0/m$a;->b:Lokhttp3/MediaType;
-
-    return-object v0
-.end method
-
-.method public writeTo(Lokio/BufferedSink;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    iget-object v0, p0, Lq0/m$a;->a:Lokhttp3/RequestBody;
-
-    invoke-virtual {v0, p1}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/m.smali b/com.discord/smali_classes2/q0/m.smali
deleted file mode 100644
index c9fd61adb8..0000000000
--- a/com.discord/smali_classes2/q0/m.smali
+++ /dev/null
@@ -1,615 +0,0 @@
-.class public final Lq0/m;
-.super Ljava/lang/Object;
-.source "RequestBuilder.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/m$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final k:[C
-
-
-# instance fields
-.field public final a:Ljava/lang/String;
-
-.field public final b:Ln0/w;
-
-.field public c:Ljava/lang/String;
-
-.field public d:Ln0/w$a;
-
-.field public final e:Ln0/a0$a;
-
-.field public f:Lokhttp3/MediaType;
-
-.field public final g:Z
-
-.field public h:Lokhttp3/MultipartBody$a;
-
-.field public i:Ln0/u$a;
-
-.field public j:Lokhttp3/RequestBody;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/16 v0, 0x10
-
-    new-array v0, v0, [C
-
-    fill-array-data v0, :array_0
-
-    sput-object v0, Lq0/m;->k:[C
-
-    return-void
-
-    :array_0
-    .array-data 2
-        0x30s
-        0x31s
-        0x32s
-        0x33s
-        0x34s
-        0x35s
-        0x36s
-        0x37s
-        0x38s
-        0x39s
-        0x41s
-        0x42s
-        0x43s
-        0x44s
-        0x45s
-        0x46s
-    .end array-data
-.end method
-
-.method public constructor <init>(Ljava/lang/String;Ln0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/MediaType;ZZZ)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/m;->a:Ljava/lang/String;
-
-    iput-object p2, p0, Lq0/m;->b:Ln0/w;
-
-    iput-object p3, p0, Lq0/m;->c:Ljava/lang/String;
-
-    new-instance p1, Ln0/a0$a;
-
-    invoke-direct {p1}, Ln0/a0$a;-><init>()V
-
-    iput-object p1, p0, Lq0/m;->e:Ln0/a0$a;
-
-    iput-object p5, p0, Lq0/m;->f:Lokhttp3/MediaType;
-
-    iput-boolean p6, p0, Lq0/m;->g:Z
-
-    if-eqz p4, :cond_0
-
-    invoke-virtual {p4}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
-
-    move-result-object p2
-
-    iput-object p2, p1, Ln0/a0$a;->c:Lokhttp3/Headers$a;
-
-    :cond_0
-    if-eqz p7, :cond_1
-
-    new-instance p1, Ln0/u$a;
-
-    invoke-direct {p1}, Ln0/u$a;-><init>()V
-
-    iput-object p1, p0, Lq0/m;->i:Ln0/u$a;
-
-    goto :goto_0
-
-    :cond_1
-    if-eqz p8, :cond_2
-
-    new-instance p1, Lokhttp3/MultipartBody$a;
-
-    invoke-direct {p1}, Lokhttp3/MultipartBody$a;-><init>()V
-
-    iput-object p1, p0, Lq0/m;->h:Lokhttp3/MultipartBody$a;
-
-    sget-object p2, Lokhttp3/MultipartBody;->g:Lokhttp3/MediaType;
-
-    invoke-virtual {p1, p2}, Lokhttp3/MultipartBody$a;->c(Lokhttp3/MediaType;)Lokhttp3/MultipartBody$a;
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/String;Ljava/lang/String;Z)V
-    .locals 25
-
-    move-object/from16 v0, p0
-
-    const/4 v1, 0x0
-
-    const-string v2, "name"
-
-    if-eqz p3, :cond_1
-
-    iget-object v12, v0, Lq0/m;->i:Ln0/u$a;
-
-    if-eqz p1, :cond_0
-
-    iget-object v13, v12, Ln0/u$a;->a:Ljava/util/List;
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/16 v17, 0x0
-
-    const/4 v4, 0x0
-
-    const/16 v19, 0x1
-
-    const/16 v20, 0x0
-
-    const/16 v21, 0x1
-
-    const/16 v22, 0x0
-
-    iget-object v10, v12, Ln0/u$a;->c:Ljava/nio/charset/Charset;
-
-    const/16 v24, 0x53
-
-    const/16 v16, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/16 v11, 0x53
-
-    const-string v5, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
-
-    move-object/from16 v2, p1
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-interface {v13, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    iget-object v1, v12, Ln0/u$a;->b:Ljava/util/List;
-
-    sget-object v14, Ln0/w;->l:Ln0/w$b;
-
-    iget-object v2, v12, Ln0/u$a;->c:Ljava/nio/charset/Charset;
-
-    const-string v18, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
-
-    move-object/from16 v15, p2
-
-    move-object/from16 v23, v2
-
-    invoke-static/range {v14 .. v24}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    iget-object v12, v0, Lq0/m;->i:Ln0/u$a;
-
-    if-eqz p1, :cond_2
-
-    iget-object v13, v12, Ln0/u$a;->a:Ljava/util/List;
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/16 v17, 0x0
-
-    const/4 v4, 0x0
-
-    const/16 v20, 0x0
-
-    const/4 v7, 0x0
-
-    const/16 v21, 0x1
-
-    const/16 v22, 0x0
-
-    iget-object v10, v12, Ln0/u$a;->c:Ljava/nio/charset/Charset;
-
-    const/16 v24, 0x5b
-
-    const/16 v16, 0x0
-
-    const/16 v19, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/16 v11, 0x5b
-
-    const-string v5, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
-
-    move-object/from16 v2, p1
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-interface {v13, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    iget-object v1, v12, Ln0/u$a;->b:Ljava/util/List;
-
-    sget-object v14, Ln0/w;->l:Ln0/w$b;
-
-    iget-object v2, v12, Ln0/u$a;->c:Ljava/nio/charset/Charset;
-
-    const-string v18, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
-
-    move-object/from16 v15, p2
-
-    move-object/from16 v23, v2
-
-    invoke-static/range {v14 .. v24}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    :goto_0
-    return-void
-
-    :cond_2
-    invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public b(Ljava/lang/String;Ljava/lang/String;)V
-    .locals 1
-
-    const-string v0, "Content-Type"
-
-    invoke-virtual {v0, p1}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-static {p2}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    iput-object p1, p0, Lq0/m;->f:Lokhttp3/MediaType;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Malformed content type: "
-
-    invoke-static {v0, p2}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    iget-object v0, p0, Lq0/m;->e:Ln0/a0$a;
-
-    invoke-virtual {v0, p1, p2}, Ln0/a0$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/a0$a;
-
-    :goto_0
-    return-void
-.end method
-
-.method public c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
-    .locals 5
-
-    iget-object v0, p0, Lq0/m;->h:Lokhttp3/MultipartBody$a;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_7
-
-    if-eqz p2, :cond_6
-
-    if-eqz p1, :cond_0
-
-    const-string v2, "Content-Type"
-
-    invoke-virtual {p1, v2}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    goto :goto_0
-
-    :cond_0
-    move-object v2, v1
-
-    :goto_0
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-nez v2, :cond_1
-
-    const/4 v2, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_5
-
-    if-eqz p1, :cond_2
-
-    const-string v2, "Content-Length"
-
-    invoke-virtual {p1, v2}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v2
-
-    goto :goto_2
-
-    :cond_2
-    move-object v2, v1
-
-    :goto_2
-    if-nez v2, :cond_3
-
-    const/4 v3, 0x1
-
-    :cond_3
-    if-eqz v3, :cond_4
-
-    new-instance v2, Lokhttp3/MultipartBody$Part;
-
-    invoke-direct {v2, p1, p2, v1}, Lokhttp3/MultipartBody$Part;-><init>(Lokhttp3/Headers;Lokhttp3/RequestBody;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-virtual {v0, v2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/MultipartBody$Part;)Lokhttp3/MultipartBody$a;
-
-    return-void
-
-    :cond_4
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Unexpected header: Content-Length"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_5
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "Unexpected header: Content-Type"
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_6
-    const-string p1, "body"
-
-    invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_7
-    throw v1
-.end method
-
-.method public d(Ljava/lang/String;Ljava/lang/String;Z)V
-    .locals 16
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v2, p1
-
-    move-object/from16 v12, p2
-
-    iget-object v1, v0, Lq0/m;->c:Ljava/lang/String;
-
-    const/4 v13, 0x0
-
-    if-eqz v1, :cond_1
-
-    iget-object v3, v0, Lq0/m;->b:Ln0/w;
-
-    invoke-virtual {v3, v1}, Ln0/w;->g(Ljava/lang/String;)Ln0/w$a;
-
-    move-result-object v1
-
-    iput-object v1, v0, Lq0/m;->d:Ln0/w$a;
-
-    if-eqz v1, :cond_0
-
-    iput-object v13, v0, Lq0/m;->c:Ljava/lang/String;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    const-string v2, "Malformed URL. Base: "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    iget-object v3, v0, Lq0/m;->b:Ln0/w;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v3, ", Relative: "
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v3, v0, Lq0/m;->c:Ljava/lang/String;
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    if-eqz p3, :cond_2
-
-    iget-object v1, v0, Lq0/m;->d:Ln0/w$a;
-
-    invoke-virtual {v1, v2, v12}, Ln0/w$a;->a(Ljava/lang/String;Ljava/lang/String;)Ln0/w$a;
-
-    goto :goto_1
-
-    :cond_2
-    iget-object v14, v0, Lq0/m;->d:Ln0/w$a;
-
-    if-eqz v2, :cond_7
-
-    iget-object v1, v14, Ln0/w$a;->g:Ljava/util/List;
-
-    if-nez v1, :cond_3
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v1, v14, Ln0/w$a;->g:Ljava/util/List;
-
-    :cond_3
-    iget-object v15, v14, Ln0/w$a;->g:Ljava/util/List;
-
-    if-eqz v15, :cond_6
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/16 v11, 0xdb
-
-    const-string v5, " !\"#$&\'(),/:;<=>?@[]\\^`{|}~"
-
-    move-object/from16 v2, p1
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-interface {v15, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    iget-object v14, v14, Ln0/w$a;->g:Ljava/util/List;
-
-    if-eqz v14, :cond_5
-
-    if-eqz v12, :cond_4
-
-    sget-object v1, Ln0/w;->l:Ln0/w$b;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x1
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/16 v11, 0xdb
-
-    const-string v5, " !\"#$&\'(),/:;<=>?@[]\\^`{|}~"
-
-    move-object/from16 v2, p2
-
-    invoke-static/range {v1 .. v11}, Ln0/w$b;->a(Ln0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
-
-    move-result-object v13
-
-    :cond_4
-    invoke-interface {v14, v13}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :goto_1
-    return-void
-
-    :cond_5
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v13
-
-    :cond_6
-    invoke-static {}, Lj0/n/c/h;->throwNpe()V
-
-    throw v13
-
-    :cond_7
-    const-string v1, "name"
-
-    invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
-    throw v13
-.end method
diff --git a/com.discord/smali_classes2/q0/n.smali b/com.discord/smali_classes2/q0/n.smali
deleted file mode 100644
index 95a3f8aec9..0000000000
--- a/com.discord/smali_classes2/q0/n.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lq0/n;
-.super Ljava/lang/Object;
-.source "Response.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lokhttp3/Response;
-
-.field public final b:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Lokhttp3/ResponseBody;
-
-
-# direct methods
-.method public constructor <init>(Lokhttp3/Response;Ljava/lang/Object;Lokhttp3/ResponseBody;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lokhttp3/Response;",
-            "TT;",
-            "Lokhttp3/ResponseBody;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/n;->a:Lokhttp3/Response;
-
-    iput-object p2, p0, Lq0/n;->b:Ljava/lang/Object;
-
-    iput-object p3, p0, Lq0/n;->c:Lokhttp3/ResponseBody;
-
-    return-void
-.end method
-
-.method public static a(Ljava/lang/Object;Lokhttp3/Response;)Lq0/n;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(TT;",
-            "Lokhttp3/Response;",
-            ")",
-            "Lq0/n<",
-            "TT;>;"
-        }
-    .end annotation
-
-    const-string v0, "rawResponse == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lokhttp3/Response;->b()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lq0/n;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, p1, p0, v1}, Lq0/n;-><init>(Lokhttp3/Response;Ljava/lang/Object;Lokhttp3/ResponseBody;)V
-
-    return-object v0
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string p1, "rawResponse must be successful response"
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lq0/n;->a:Lokhttp3/Response;
-
-    invoke-virtual {v0}, Lokhttp3/Response;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/q0/o.smali b/com.discord/smali_classes2/q0/o.smali
deleted file mode 100644
index 11940b2e71..0000000000
--- a/com.discord/smali_classes2/q0/o.smali
+++ /dev/null
@@ -1,95 +0,0 @@
-.class public Lq0/o;
-.super Ljava/lang/Object;
-.source "Retrofit.java"
-
-# interfaces
-.implements Ljava/lang/reflect/InvocationHandler;
-
-
-# instance fields
-.field public final a:Lq0/l;
-
-.field public final synthetic b:Ljava/lang/Class;
-
-.field public final synthetic c:Lq0/p;
-
-
-# direct methods
-.method public constructor <init>(Lq0/p;Ljava/lang/Class;)V
-    .locals 0
-
-    iput-object p1, p0, Lq0/o;->c:Lq0/p;
-
-    iput-object p2, p0, Lq0/o;->b:Ljava/lang/Class;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object p1, Lq0/l;->a:Lq0/l;
-
-    iput-object p1, p0, Lq0/o;->a:Lq0/l;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public invoke(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/lang/Throwable;
-        }
-    .end annotation
-
-    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getDeclaringClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    const-class v1, Ljava/lang/Object;
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p2, p0, p3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    iget-object v0, p0, Lq0/o;->a:Lq0/l;
-
-    invoke-virtual {v0, p2}, Lq0/l;->d(Ljava/lang/reflect/Method;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lq0/o;->a:Lq0/l;
-
-    iget-object v1, p0, Lq0/o;->b:Ljava/lang/Class;
-
-    invoke-virtual {v0, p2, v1, p1, p3}, Lq0/l;->c(Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_1
-    iget-object p1, p0, Lq0/o;->c:Lq0/p;
-
-    invoke-virtual {p1, p2}, Lq0/p;->b(Ljava/lang/reflect/Method;)Lq0/q;
-
-    move-result-object p1
-
-    new-instance p2, Lq0/h;
-
-    invoke-direct {p2, p1, p3}, Lq0/h;-><init>(Lq0/q;[Ljava/lang/Object;)V
-
-    iget-object p1, p1, Lq0/q;->b:Lq0/c;
-
-    invoke-interface {p1, p2}, Lq0/c;->b(Lq0/b;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/p.smali b/com.discord/smali_classes2/q0/p.smali
deleted file mode 100644
index fb9d03ec73..0000000000
--- a/com.discord/smali_classes2/q0/p.smali
+++ /dev/null
@@ -1,619 +0,0 @@
-.class public final Lq0/p;
-.super Ljava/lang/Object;
-.source "Retrofit.java"
-
-
-# instance fields
-.field public final a:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/reflect/Method;",
-            "Lq0/q<",
-            "**>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ln0/f$a;
-
-.field public final c:Ln0/w;
-
-.field public final d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lq0/e$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lq0/c$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Z
-
-
-# direct methods
-.method public constructor <init>(Ln0/f$a;Ln0/w;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;Z)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ln0/f$a;",
-            "Ln0/w;",
-            "Ljava/util/List<",
-            "Lq0/e$a;",
-            ">;",
-            "Ljava/util/List<",
-            "Lq0/c$a;",
-            ">;",
-            "Ljava/util/concurrent/Executor;",
-            "Z)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance p5, Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-direct {p5}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
-
-    iput-object p5, p0, Lq0/p;->a:Ljava/util/Map;
-
-    iput-object p1, p0, Lq0/p;->b:Ln0/f$a;
-
-    iput-object p2, p0, Lq0/p;->c:Ln0/w;
-
-    invoke-static {p3}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-static {p4}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lq0/p;->e:Ljava/util/List;
-
-    iput-boolean p6, p0, Lq0/p;->f:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/c;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            ")",
-            "Lq0/c<",
-            "**>;"
-        }
-    .end annotation
-
-    const-string v0, "returnType == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    const-string v0, "annotations == null"
-
-    invoke-static {p2, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iget-object v0, p0, Lq0/p;->e:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iget-object v1, p0, Lq0/p;->e:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    move v2, v0
-
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    iget-object v3, p0, Lq0/p;->e:Ljava/util/List;
-
-    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lq0/c$a;
-
-    invoke-virtual {v3, p1, p2, p0}, Lq0/c$a;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/c;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_0
-
-    return-object v3
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    const-string v1, "Could not locate call adapter for "
-
-    invoke-direct {p2, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ".\n"
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, "  Tried:"
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object p1, p0, Lq0/p;->e:Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result p1
-
-    :goto_1
-    if-ge v0, p1, :cond_2
-
-    const-string v1, "\n   * "
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lq0/p;->e:Ljava/util/List;
-
-    invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lq0/c$a;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public b(Ljava/lang/reflect/Method;)Lq0/q;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Method;",
-            ")",
-            "Lq0/q<",
-            "**>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lq0/p;->a:Ljava/util/Map;
-
-    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lq0/q;
-
-    if-eqz v0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    iget-object v0, p0, Lq0/p;->a:Ljava/util/Map;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Lq0/p;->a:Ljava/util/Map;
-
-    invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lq0/q;
-
-    if-nez v1, :cond_1
-
-    new-instance v1, Lq0/q$a;
-
-    invoke-direct {v1, p0, p1}, Lq0/q$a;-><init>(Lq0/p;Ljava/lang/reflect/Method;)V
-
-    invoke-virtual {v1}, Lq0/q$a;->a()Lq0/q;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lq0/p;->a:Ljava/util/Map;
-
-    invoke-interface {v2, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    :cond_1
-    monitor-exit v0
-
-    return-object v1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-.end method
-
-.method public c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lq0/e;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            ")",
-            "Lq0/e<",
-            "TT;",
-            "Lokhttp3/RequestBody;",
-            ">;"
-        }
-    .end annotation
-
-    const-string v0, "type == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    const-string v0, "parameterAnnotations == null"
-
-    invoke-static {p2, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    const-string v0, "methodAnnotations == null"
-
-    invoke-static {p3, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iget-object v0, p0, Lq0/p;->d:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iget-object v1, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    move v2, v0
-
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    iget-object v3, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lq0/e$a;
-
-    invoke-virtual {v3, p1, p2, p3, p0}, Lq0/e$a;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_0
-
-    return-object v3
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    const-string p3, "Could not locate RequestBody converter for "
-
-    invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ".\n"
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, "  Tried:"
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object p1, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result p1
-
-    :goto_1
-    if-ge v0, p1, :cond_2
-
-    const-string p3, "\n   * "
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object p3, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {p3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p3
-
-    check-cast p3, Lq0/e$a;
-
-    invoke-virtual {p3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p3
-
-    invoke-virtual {p3}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public d(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            ")",
-            "Lq0/e<",
-            "Lokhttp3/ResponseBody;",
-            "TT;>;"
-        }
-    .end annotation
-
-    const-string v0, "type == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    const-string v0, "annotations == null"
-
-    invoke-static {p2, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iget-object v0, p0, Lq0/p;->d:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
-
-    move-result v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iget-object v1, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    move v2, v0
-
-    :goto_0
-    if-ge v2, v1, :cond_1
-
-    iget-object v3, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lq0/e$a;
-
-    invoke-virtual {v3, p1, p2, p0}, Lq0/e$a;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_0
-
-    return-object v3
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p2, Ljava/lang/StringBuilder;
-
-    const-string v1, "Could not locate ResponseBody converter for "
-
-    invoke-direct {p2, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p1, ".\n"
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, "  Tried:"
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object p1, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result p1
-
-    :goto_1
-    if-ge v0, p1, :cond_2
-
-    const-string v1, "\n   * "
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lq0/e$a;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            ")",
-            "Lq0/e<",
-            "TT;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    const-string v0, "type == null"
-
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    const-string p1, "annotations == null"
-
-    invoke-static {p2, p1}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    iget-object p1, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result p1
-
-    const/4 p2, 0x0
-
-    :goto_0
-    if-ge p2, p1, :cond_1
-
-    iget-object v0, p0, Lq0/p;->d:Ljava/util/List;
-
-    invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lq0/e$a;
-
-    if-eqz v0, :cond_0
-
-    add-int/lit8 p2, p2, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    sget-object p1, Lq0/a$d;->a:Lq0/a$d;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/q$a.smali b/com.discord/smali_classes2/q0/q$a.smali
deleted file mode 100644
index 332203b4e2..0000000000
--- a/com.discord/smali_classes2/q0/q$a.smali
+++ /dev/null
@@ -1,3001 +0,0 @@
-.class public final Lq0/q$a;
-.super Ljava/lang/Object;
-.source "ServiceMethod.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/q;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lq0/p;
-
-.field public final b:Ljava/lang/reflect/Method;
-
-.field public final c:[Ljava/lang/annotation/Annotation;
-
-.field public final d:[[Ljava/lang/annotation/Annotation;
-
-.field public final e:[Ljava/lang/reflect/Type;
-
-.field public f:Ljava/lang/reflect/Type;
-
-.field public g:Z
-
-.field public h:Z
-
-.field public i:Z
-
-.field public j:Z
-
-.field public k:Z
-
-.field public l:Z
-
-.field public m:Ljava/lang/String;
-
-.field public n:Z
-
-.field public o:Z
-
-.field public p:Z
-
-.field public q:Ljava/lang/String;
-
-.field public r:Lokhttp3/Headers;
-
-.field public s:Lokhttp3/MediaType;
-
-.field public t:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public u:[Lq0/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lq0/k<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field public v:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "Lokhttp3/ResponseBody;",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public w:Lq0/c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/c<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lq0/p;Ljava/lang/reflect/Method;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/q$a;->a:Lq0/p;
-
-    iput-object p2, p0, Lq0/q$a;->b:Ljava/lang/reflect/Method;
-
-    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lq0/q$a;->c:[Ljava/lang/annotation/Annotation;
-
-    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getGenericParameterTypes()[Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lq0/q$a;->e:[Ljava/lang/reflect/Type;
-
-    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getParameterAnnotations()[[Ljava/lang/annotation/Annotation;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lq0/q$a;->d:[[Ljava/lang/annotation/Annotation;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lq0/q;
-    .locals 19
-
-    move-object/from16 v1, p0
-
-    iget-object v0, v1, Lq0/q$a;->b:Ljava/lang/reflect/Method;
-
-    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getGenericReturnType()Ljava/lang/reflect/Type;
-
-    move-result-object v2
-
-    invoke-static {v2}, Lq0/r;->j(Ljava/lang/reflect/Type;)Z
-
-    move-result v0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    if-nez v0, :cond_66
-
-    sget-object v0, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
-
-    if-eq v2, v0, :cond_65
-
-    iget-object v0, v1, Lq0/q$a;->b:Ljava/lang/reflect/Method;
-
-    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
-
-    move-result-object v0
-
-    :try_start_0
-    iget-object v6, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v6, v2, v0}, Lq0/p;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/c;
-
-    move-result-object v0
-    :try_end_0
-    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_2
-
-    iput-object v0, v1, Lq0/q$a;->w:Lq0/c;
-
-    invoke-interface {v0}, Lq0/c;->a()Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    iput-object v0, v1, Lq0/q$a;->f:Ljava/lang/reflect/Type;
-
-    const-class v2, Lq0/n;
-
-    if-eq v0, v2, :cond_64
-
-    const-class v2, Lokhttp3/Response;
-
-    if-eq v0, v2, :cond_64
-
-    iget-object v0, v1, Lq0/q$a;->b:Ljava/lang/reflect/Method;
-
-    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
-
-    move-result-object v0
-
-    :try_start_1
-    iget-object v2, v1, Lq0/q$a;->a:Lq0/p;
-
-    iget-object v6, v1, Lq0/q$a;->f:Ljava/lang/reflect/Type;
-
-    invoke-virtual {v2, v6, v0}, Lq0/p;->d(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v0
-    :try_end_1
-    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_1
-
-    iput-object v0, v1, Lq0/q$a;->v:Lq0/e;
-
-    iget-object v0, v1, Lq0/q$a;->c:[Ljava/lang/annotation/Annotation;
-
-    array-length v2, v0
-
-    const/4 v6, 0x0
-
-    :goto_0
-    if-ge v6, v2, :cond_11
-
-    aget-object v7, v0, v6
-
-    instance-of v8, v7, Lq0/u/b;
-
-    if-eqz v8, :cond_0
-
-    check-cast v7, Lq0/u/b;
-
-    invoke-interface {v7}, Lq0/u/b;->value()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "DELETE"
-
-    invoke-virtual {v1, v8, v7, v5}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto/16 :goto_3
-
-    :cond_0
-    instance-of v8, v7, Lq0/u/e;
-
-    if-eqz v8, :cond_1
-
-    check-cast v7, Lq0/u/e;
-
-    invoke-interface {v7}, Lq0/u/e;->value()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "GET"
-
-    invoke-virtual {v1, v8, v7, v5}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto/16 :goto_3
-
-    :cond_1
-    instance-of v8, v7, Lq0/u/f;
-
-    if-eqz v8, :cond_3
-
-    check-cast v7, Lq0/u/f;
-
-    invoke-interface {v7}, Lq0/u/f;->value()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "HEAD"
-
-    invoke-virtual {v1, v8, v7, v5}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    const-class v7, Ljava/lang/Void;
-
-    iget-object v8, v1, Lq0/q$a;->f:Ljava/lang/reflect/Type;
-
-    invoke-virtual {v7, v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_2
-
-    goto/16 :goto_3
-
-    :cond_2
-    new-array v0, v5, [Ljava/lang/Object;
-
-    const-string v2, "HEAD method must use Void as response type."
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_3
-    instance-of v8, v7, Lq0/u/l;
-
-    if-eqz v8, :cond_4
-
-    check-cast v7, Lq0/u/l;
-
-    invoke-interface {v7}, Lq0/u/l;->value()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "PATCH"
-
-    invoke-virtual {v1, v8, v7, v4}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto/16 :goto_3
-
-    :cond_4
-    instance-of v8, v7, Lq0/u/m;
-
-    if-eqz v8, :cond_5
-
-    check-cast v7, Lq0/u/m;
-
-    invoke-interface {v7}, Lq0/u/m;->value()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "POST"
-
-    invoke-virtual {v1, v8, v7, v4}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto/16 :goto_3
-
-    :cond_5
-    instance-of v8, v7, Lq0/u/n;
-
-    if-eqz v8, :cond_6
-
-    check-cast v7, Lq0/u/n;
-
-    invoke-interface {v7}, Lq0/u/n;->value()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "PUT"
-
-    invoke-virtual {v1, v8, v7, v4}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto/16 :goto_3
-
-    :cond_6
-    instance-of v8, v7, Lq0/u/k;
-
-    if-eqz v8, :cond_7
-
-    check-cast v7, Lq0/u/k;
-
-    invoke-interface {v7}, Lq0/u/k;->value()Ljava/lang/String;
-
-    move-result-object v7
-
-    const-string v8, "OPTIONS"
-
-    invoke-virtual {v1, v8, v7, v5}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto/16 :goto_3
-
-    :cond_7
-    instance-of v8, v7, Lq0/u/g;
-
-    if-eqz v8, :cond_8
-
-    check-cast v7, Lq0/u/g;
-
-    invoke-interface {v7}, Lq0/u/g;->method()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-interface {v7}, Lq0/u/g;->path()Ljava/lang/String;
-
-    move-result-object v9
-
-    invoke-interface {v7}, Lq0/u/g;->hasBody()Z
-
-    move-result v7
-
-    invoke-virtual {v1, v8, v9, v7}, Lq0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
-
-    goto/16 :goto_3
-
-    :cond_8
-    instance-of v8, v7, Lq0/u/i;
-
-    if-eqz v8, :cond_e
-
-    check-cast v7, Lq0/u/i;
-
-    invoke-interface {v7}, Lq0/u/i;->value()[Ljava/lang/String;
-
-    move-result-object v7
-
-    array-length v8, v7
-
-    if-eqz v8, :cond_d
-
-    new-instance v8, Lokhttp3/Headers$a;
-
-    invoke-direct {v8}, Lokhttp3/Headers$a;-><init>()V
-
-    array-length v9, v7
-
-    const/4 v10, 0x0
-
-    :goto_1
-    if-ge v10, v9, :cond_c
-
-    aget-object v11, v7, v10
-
-    const/16 v12, 0x3a
-
-    invoke-virtual {v11, v12}, Ljava/lang/String;->indexOf(I)I
-
-    move-result v12
-
-    const/4 v13, -0x1
-
-    if-eq v12, v13, :cond_b
-
-    if-eqz v12, :cond_b
-
-    invoke-virtual {v11}, Ljava/lang/String;->length()I
-
-    move-result v13
-
-    sub-int/2addr v13, v4
-
-    if-eq v12, v13, :cond_b
-
-    invoke-virtual {v11, v5, v12}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v13
-
-    add-int/lit8 v12, v12, 0x1
-
-    invoke-virtual {v11, v12}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-virtual {v11}, Ljava/lang/String;->trim()Ljava/lang/String;
-
-    move-result-object v11
-
-    const-string v12, "Content-Type"
-
-    invoke-virtual {v12, v13}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_a
-
-    invoke-static {v11}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
-
-    move-result-object v12
-
-    if-eqz v12, :cond_9
-
-    iput-object v12, v1, Lq0/q$a;->s:Lokhttp3/MediaType;
-
-    goto :goto_2
-
-    :cond_9
-    new-array v0, v4, [Ljava/lang/Object;
-
-    aput-object v11, v0, v5
-
-    const-string v2, "Malformed content type: %s"
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_a
-    invoke-virtual {v8, v13, v11}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
-
-    :goto_2
-    add-int/lit8 v10, v10, 0x1
-
-    goto :goto_1
-
-    :cond_b
-    new-array v0, v4, [Ljava/lang/Object;
-
-    aput-object v11, v0, v5
-
-    const-string v2, "@Headers value must be in the form \"Name: Value\". Found: \"%s\""
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_c
-    invoke-virtual {v8}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
-
-    move-result-object v7
-
-    iput-object v7, v1, Lq0/q$a;->r:Lokhttp3/Headers;
-
-    goto :goto_3
-
-    :cond_d
-    new-array v0, v5, [Ljava/lang/Object;
-
-    const-string v2, "@Headers annotation is empty."
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_e
-    instance-of v7, v7, Lq0/u/j;
-
-    if-eqz v7, :cond_10
-
-    iget-boolean v7, v1, Lq0/q$a;->o:Z
-
-    if-nez v7, :cond_f
-
-    iput-boolean v4, v1, Lq0/q$a;->p:Z
-
-    goto :goto_3
-
-    :cond_f
-    new-array v0, v5, [Ljava/lang/Object;
-
-    const-string v2, "Only one encoding annotation is allowed."
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_10
-    :goto_3
-    add-int/lit8 v6, v6, 0x1
-
-    goto/16 :goto_0
-
-    :cond_11
-    iget-object v0, v1, Lq0/q$a;->m:Ljava/lang/String;
-
-    if-eqz v0, :cond_63
-
-    iget-boolean v0, v1, Lq0/q$a;->n:Z
-
-    if-nez v0, :cond_14
-
-    iget-boolean v0, v1, Lq0/q$a;->p:Z
-
-    if-nez v0, :cond_13
-
-    iget-boolean v0, v1, Lq0/q$a;->o:Z
-
-    if-nez v0, :cond_12
-
-    goto :goto_4
-
-    :cond_12
-    new-array v0, v5, [Ljava/lang/Object;
-
-    const-string v2, "FormUrlEncoded can only be specified on HTTP methods with request body (e.g., @POST)."
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_13
-    new-array v0, v5, [Ljava/lang/Object;
-
-    const-string v2, "Multipart can only be specified on HTTP methods with request body (e.g., @POST)."
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_14
-    :goto_4
-    iget-object v0, v1, Lq0/q$a;->d:[[Ljava/lang/annotation/Annotation;
-
-    array-length v0, v0
-
-    new-array v2, v0, [Lq0/k;
-
-    iput-object v2, v1, Lq0/q$a;->u:[Lq0/k;
-
-    const/4 v2, 0x0
-
-    :goto_5
-    if-ge v2, v0, :cond_5a
-
-    iget-object v5, v1, Lq0/q$a;->e:[Ljava/lang/reflect/Type;
-
-    aget-object v5, v5, v2
-
-    invoke-static {v5}, Lq0/r;->j(Ljava/lang/reflect/Type;)Z
-
-    move-result v6
-
-    if-nez v6, :cond_59
-
-    iget-object v6, v1, Lq0/q$a;->d:[[Ljava/lang/annotation/Annotation;
-
-    aget-object v6, v6, v2
-
-    const-string v7, "No Retrofit annotation found."
-
-    if-eqz v6, :cond_58
-
-    iget-object v8, v1, Lq0/q$a;->u:[Lq0/k;
-
-    array-length v9, v6
-
-    const/4 v10, 0x0
-
-    :goto_6
-    if-ge v10, v9, :cond_56
-
-    aget-object v11, v6, v10
-
-    const-class v12, Ljava/lang/String;
-
-    const-class v13, Lokhttp3/MultipartBody$Part;
-
-    instance-of v14, v11, Lq0/u/v;
-
-    const-string v15, "@Path parameters may not be used with @Url."
-
-    if-eqz v14, :cond_1b
-
-    iget-boolean v11, v1, Lq0/q$a;->l:Z
-
-    if-nez v11, :cond_1a
-
-    iget-boolean v11, v1, Lq0/q$a;->j:Z
-
-    if-nez v11, :cond_19
-
-    iget-boolean v11, v1, Lq0/q$a;->k:Z
-
-    if-nez v11, :cond_18
-
-    iget-object v11, v1, Lq0/q$a;->q:Ljava/lang/String;
-
-    if-nez v11, :cond_17
-
-    iput-boolean v4, v1, Lq0/q$a;->l:Z
-
-    const-class v4, Ln0/w;
-
-    if-eq v5, v4, :cond_16
-
-    if-eq v5, v12, :cond_16
-
-    const-class v4, Ljava/net/URI;
-
-    if-eq v5, v4, :cond_16
-
-    instance-of v4, v5, Ljava/lang/Class;
-
-    if-eqz v4, :cond_15
-
-    const-string v4, "android.net.Uri"
-
-    move-object v11, v5
-
-    check-cast v11, Ljava/lang/Class;
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v11
-
-    invoke-virtual {v4, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_15
-
-    goto :goto_7
-
-    :cond_15
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@Url must be okhttp3.HttpUrl, String, java.net.URI, or android.net.Uri type."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_16
-    :goto_7
-    new-instance v4, Lq0/k$l;
-
-    invoke-direct {v4}, Lq0/k$l;-><init>()V
-
-    goto/16 :goto_8
-
-    :cond_17
-    new-array v0, v4, [Ljava/lang/Object;
-
-    iget-object v3, v1, Lq0/q$a;->m:Ljava/lang/String;
-
-    const/4 v4, 0x0
-
-    aput-object v3, v0, v4
-
-    const-string v3, "@Url cannot be used with @%s URL"
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_18
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "A @Url parameter must not come after a @Query"
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_19
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v15, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_1a
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "Multiple @Url method annotations found."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_1b
-    instance-of v4, v11, Lq0/u/q;
-
-    const/4 v14, 0x2
-
-    if-eqz v4, :cond_21
-
-    iget-boolean v4, v1, Lq0/q$a;->k:Z
-
-    if-nez v4, :cond_20
-
-    iget-boolean v4, v1, Lq0/q$a;->l:Z
-
-    if-nez v4, :cond_1f
-
-    iget-object v4, v1, Lq0/q$a;->q:Ljava/lang/String;
-
-    if-eqz v4, :cond_1e
-
-    const/4 v4, 0x1
-
-    iput-boolean v4, v1, Lq0/q$a;->j:Z
-
-    check-cast v11, Lq0/u/q;
-
-    invoke-interface {v11}, Lq0/u/q;->value()Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v12, Lq0/q;->n:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v12, v4}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
-
-    move-result-object v12
-
-    invoke-virtual {v12}, Ljava/util/regex/Matcher;->matches()Z
-
-    move-result v12
-
-    if-eqz v12, :cond_1d
-
-    iget-object v12, v1, Lq0/q$a;->t:Ljava/util/Set;
-
-    invoke-interface {v12, v4}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_1c
-
-    iget-object v12, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v12, v5, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v12
-
-    new-instance v13, Lq0/k$g;
-
-    invoke-interface {v11}, Lq0/u/q;->encoded()Z
-
-    move-result v11
-
-    invoke-direct {v13, v4, v12, v11}, Lq0/k$g;-><init>(Ljava/lang/String;Lq0/e;Z)V
-
-    goto/16 :goto_9
-
-    :cond_1c
-    new-array v0, v14, [Ljava/lang/Object;
-
-    iget-object v3, v1, Lq0/q$a;->q:Ljava/lang/String;
-
-    const/4 v5, 0x0
-
-    aput-object v3, v0, v5
-
-    const/4 v3, 0x1
-
-    aput-object v4, v0, v3
-
-    const-string v3, "URL \"%s\" does not contain \"{%s}\"."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_1d
-    const/4 v0, 0x1
-
-    const/4 v3, 0x0
-
-    new-array v5, v14, [Ljava/lang/Object;
-
-    sget-object v6, Lq0/q;->m:Ljava/util/regex/Pattern;
-
-    invoke-virtual {v6}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
-
-    move-result-object v6
-
-    aput-object v6, v5, v3
-
-    aput-object v4, v5, v0
-
-    const-string v0, "@Path parameter name must match %s. Found: %s"
-
-    invoke-virtual {v1, v2, v0, v5}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_1e
-    const/4 v0, 0x1
-
-    const/4 v3, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    iget-object v4, v1, Lq0/q$a;->m:Ljava/lang/String;
-
-    aput-object v4, v0, v3
-
-    const-string v3, "@Path can only be used with relative url on @%s"
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_1f
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v15, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_20
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "A @Path parameter must not come after a @Query."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_21
-    instance-of v4, v11, Lq0/u/r;
-
-    const-string v14, "<String>)"
-
-    const-string v15, " must include generic type (e.g., "
-
-    if-eqz v4, :cond_25
-
-    check-cast v11, Lq0/u/r;
-
-    invoke-interface {v11}, Lq0/u/r;->value()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-interface {v11}, Lq0/u/r;->encoded()Z
-
-    move-result v11
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v12
-
-    const/4 v13, 0x1
-
-    iput-boolean v13, v1, Lq0/q$a;->k:Z
-
-    const-class v13, Ljava/lang/Iterable;
-
-    invoke-virtual {v13, v12}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v13
-
-    if-eqz v13, :cond_23
-
-    instance-of v13, v5, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v13, :cond_22
-
-    move-object v12, v5
-
-    check-cast v12, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v13, 0x0
-
-    invoke-static {v13, v12}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v12
-
-    iget-object v13, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v13, v12, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v12
-
-    new-instance v13, Lq0/k$h;
-
-    invoke-direct {v13, v4, v12, v11}, Lq0/k$h;-><init>(Ljava/lang/String;Lq0/e;Z)V
-
-    new-instance v4, Lq0/i;
-
-    invoke-direct {v4, v13}, Lq0/i;-><init>(Lq0/k;)V
-
-    goto/16 :goto_8
-
-    :cond_22
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v12}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v12}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_23
-    invoke-virtual {v12}, Ljava/lang/Class;->isArray()Z
-
-    move-result v13
-
-    if-eqz v13, :cond_24
-
-    invoke-virtual {v12}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object v12
-
-    invoke-static {v12}, Lq0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
-
-    move-result-object v12
-
-    iget-object v13, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v13, v12, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v12
-
-    new-instance v13, Lq0/k$h;
-
-    invoke-direct {v13, v4, v12, v11}, Lq0/k$h;-><init>(Ljava/lang/String;Lq0/e;Z)V
-
-    new-instance v4, Lq0/j;
-
-    invoke-direct {v4, v13}, Lq0/j;-><init>(Lq0/k;)V
-
-    goto/16 :goto_8
-
-    :cond_24
-    iget-object v12, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v12, v5, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v12
-
-    new-instance v13, Lq0/k$h;
-
-    invoke-direct {v13, v4, v12, v11}, Lq0/k$h;-><init>(Ljava/lang/String;Lq0/e;Z)V
-
-    goto/16 :goto_9
-
-    :cond_25
-    instance-of v4, v11, Lq0/u/t;
-
-    if-eqz v4, :cond_29
-
-    check-cast v11, Lq0/u/t;
-
-    invoke-interface {v11}, Lq0/u/t;->encoded()Z
-
-    move-result v4
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v11
-
-    const/4 v12, 0x1
-
-    iput-boolean v12, v1, Lq0/q$a;->k:Z
-
-    const-class v12, Ljava/lang/Iterable;
-
-    invoke-virtual {v12, v11}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_27
-
-    instance-of v12, v5, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v12, :cond_26
-
-    move-object v11, v5
-
-    check-cast v11, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v12, 0x0
-
-    invoke-static {v12, v11}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v11
-
-    iget-object v12, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v12, v11, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v11
-
-    new-instance v12, Lq0/k$j;
-
-    invoke-direct {v12, v11, v4}, Lq0/k$j;-><init>(Lq0/e;Z)V
-
-    new-instance v4, Lq0/i;
-
-    invoke-direct {v4, v12}, Lq0/i;-><init>(Lq0/k;)V
-
-    goto :goto_8
-
-    :cond_26
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_27
-    invoke-virtual {v11}, Ljava/lang/Class;->isArray()Z
-
-    move-result v12
-
-    if-eqz v12, :cond_28
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object v11
-
-    invoke-static {v11}, Lq0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
-
-    move-result-object v11
-
-    iget-object v12, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v12, v11, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v11
-
-    new-instance v12, Lq0/k$j;
-
-    invoke-direct {v12, v11, v4}, Lq0/k$j;-><init>(Lq0/e;Z)V
-
-    new-instance v4, Lq0/j;
-
-    invoke-direct {v4, v12}, Lq0/j;-><init>(Lq0/k;)V
-
-    :goto_8
-    move/from16 v16, v0
-
-    goto/16 :goto_b
-
-    :cond_28
-    iget-object v11, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v11, v5, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v11
-
-    new-instance v13, Lq0/k$j;
-
-    invoke-direct {v13, v11, v4}, Lq0/k$j;-><init>(Lq0/e;Z)V
-
-    :goto_9
-    move/from16 v16, v0
-
-    move-object v4, v13
-
-    goto/16 :goto_b
-
-    :cond_29
-    instance-of v4, v11, Lq0/u/s;
-
-    move/from16 v16, v0
-
-    const-string v0, "Map must include generic types (e.g., Map<String, String>)"
-
-    if-eqz v4, :cond_2d
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    const-class v13, Ljava/util/Map;
-
-    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v13
-
-    if-eqz v13, :cond_2c
-
-    const-class v13, Ljava/util/Map;
-
-    invoke-static {v5, v4, v13}, Lq0/r;->i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-
-    move-result-object v4
-
-    instance-of v13, v4, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v13, :cond_2b
-
-    check-cast v4, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v0, 0x0
-
-    invoke-static {v0, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    if-ne v12, v0, :cond_2a
-
-    const/4 v0, 0x1
-
-    invoke-static {v0, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    iget-object v4, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v4, v0, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v0
-
-    new-instance v4, Lq0/k$i;
-
-    check-cast v11, Lq0/u/s;
-
-    invoke-interface {v11}, Lq0/u/s;->encoded()Z
-
-    move-result v11
-
-    invoke-direct {v4, v0, v11}, Lq0/k$i;-><init>(Lq0/e;Z)V
-
-    goto/16 :goto_b
-
-    :cond_2a
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v4, "@QueryMap keys must be of type String: "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_2b
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_2c
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@QueryMap parameter type must be Map."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_2d
-    instance-of v4, v11, Lq0/u/h;
-
-    if-eqz v4, :cond_31
-
-    check-cast v11, Lq0/u/h;
-
-    invoke-interface {v11}, Lq0/u/h;->value()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    const-class v11, Ljava/lang/Iterable;
-
-    invoke-virtual {v11, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v11
-
-    if-eqz v11, :cond_2f
-
-    instance-of v11, v5, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v11, :cond_2e
-
-    move-object v4, v5
-
-    check-cast v4, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v11, 0x0
-
-    invoke-static {v11, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v4
-
-    iget-object v11, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v11, v4, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v4
-
-    new-instance v11, Lq0/k$d;
-
-    invoke-direct {v11, v0, v4}, Lq0/k$d;-><init>(Ljava/lang/String;Lq0/e;)V
-
-    new-instance v0, Lq0/i;
-
-    invoke-direct {v0, v11}, Lq0/i;-><init>(Lq0/k;)V
-
-    goto/16 :goto_a
-
-    :cond_2e
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_2f
-    invoke-virtual {v4}, Ljava/lang/Class;->isArray()Z
-
-    move-result v11
-
-    if-eqz v11, :cond_30
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object v4
-
-    invoke-static {v4}, Lq0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    iget-object v11, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v11, v4, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v4
-
-    new-instance v11, Lq0/k$d;
-
-    invoke-direct {v11, v0, v4}, Lq0/k$d;-><init>(Ljava/lang/String;Lq0/e;)V
-
-    new-instance v0, Lq0/j;
-
-    invoke-direct {v0, v11}, Lq0/j;-><init>(Lq0/k;)V
-
-    goto/16 :goto_a
-
-    :cond_30
-    iget-object v4, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v4, v5, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v4
-
-    new-instance v11, Lq0/k$d;
-
-    invoke-direct {v11, v0, v4}, Lq0/k$d;-><init>(Ljava/lang/String;Lq0/e;)V
-
-    move-object v4, v11
-
-    goto/16 :goto_b
-
-    :cond_31
-    instance-of v4, v11, Lq0/u/c;
-
-    if-eqz v4, :cond_36
-
-    iget-boolean v0, v1, Lq0/q$a;->o:Z
-
-    if-eqz v0, :cond_35
-
-    check-cast v11, Lq0/u/c;
-
-    invoke-interface {v11}, Lq0/u/c;->value()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-interface {v11}, Lq0/u/c;->encoded()Z
-
-    move-result v4
-
-    const/4 v11, 0x1
-
-    iput-boolean v11, v1, Lq0/q$a;->g:Z
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v11
-
-    const-class v12, Ljava/lang/Iterable;
-
-    invoke-virtual {v12, v11}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_33
-
-    instance-of v12, v5, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v12, :cond_32
-
-    move-object v11, v5
-
-    check-cast v11, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v12, 0x0
-
-    invoke-static {v12, v11}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v11
-
-    iget-object v12, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v12, v11, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v11
-
-    new-instance v12, Lq0/k$b;
-
-    invoke-direct {v12, v0, v11, v4}, Lq0/k$b;-><init>(Ljava/lang/String;Lq0/e;Z)V
-
-    new-instance v0, Lq0/i;
-
-    invoke-direct {v0, v12}, Lq0/i;-><init>(Lq0/k;)V
-
-    goto/16 :goto_a
-
-    :cond_32
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_33
-    invoke-virtual {v11}, Ljava/lang/Class;->isArray()Z
-
-    move-result v12
-
-    if-eqz v12, :cond_34
-
-    invoke-virtual {v11}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object v11
-
-    invoke-static {v11}, Lq0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
-
-    move-result-object v11
-
-    iget-object v12, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v12, v11, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v11
-
-    new-instance v12, Lq0/k$b;
-
-    invoke-direct {v12, v0, v11, v4}, Lq0/k$b;-><init>(Ljava/lang/String;Lq0/e;Z)V
-
-    new-instance v0, Lq0/j;
-
-    invoke-direct {v0, v12}, Lq0/j;-><init>(Lq0/k;)V
-
-    goto :goto_a
-
-    :cond_34
-    iget-object v11, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v11, v5, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v11
-
-    new-instance v12, Lq0/k$b;
-
-    invoke-direct {v12, v0, v11, v4}, Lq0/k$b;-><init>(Ljava/lang/String;Lq0/e;Z)V
-
-    move-object v4, v12
-
-    goto/16 :goto_b
-
-    :cond_35
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@Field parameters can only be used with form encoding."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_36
-    instance-of v4, v11, Lq0/u/d;
-
-    if-eqz v4, :cond_3b
-
-    iget-boolean v4, v1, Lq0/q$a;->o:Z
-
-    if-eqz v4, :cond_3a
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    const-class v13, Ljava/util/Map;
-
-    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v13
-
-    if-eqz v13, :cond_39
-
-    const-class v13, Ljava/util/Map;
-
-    invoke-static {v5, v4, v13}, Lq0/r;->i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-
-    move-result-object v4
-
-    instance-of v13, v4, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v13, :cond_38
-
-    check-cast v4, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v0, 0x0
-
-    invoke-static {v0, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    if-ne v12, v0, :cond_37
-
-    const/4 v0, 0x1
-
-    invoke-static {v0, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v4
-
-    iget-object v12, v1, Lq0/q$a;->a:Lq0/p;
-
-    invoke-virtual {v12, v4, v6}, Lq0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v4
-
-    iput-boolean v0, v1, Lq0/q$a;->g:Z
-
-    new-instance v0, Lq0/k$c;
-
-    check-cast v11, Lq0/u/d;
-
-    invoke-interface {v11}, Lq0/u/d;->encoded()Z
-
-    move-result v11
-
-    invoke-direct {v0, v4, v11}, Lq0/k$c;-><init>(Lq0/e;Z)V
-
-    :goto_a
-    move-object v4, v0
-
-    goto/16 :goto_b
-
-    :cond_37
-    new-instance v3, Ljava/lang/StringBuilder;
-
-    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v4, "@FieldMap keys must be of type String: "
-
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_38
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_39
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@FieldMap parameter type must be Map."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_3a
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@FieldMap parameters can only be used with form encoding."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_3b
-    instance-of v4, v11, Lq0/u/o;
-
-    if-eqz v4, :cond_4a
-
-    iget-boolean v0, v1, Lq0/q$a;->p:Z
-
-    if-eqz v0, :cond_49
-
-    check-cast v11, Lq0/u/o;
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, v1, Lq0/q$a;->h:Z
-
-    invoke-interface {v11}, Lq0/u/o;->value()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    invoke-virtual {v0}, Ljava/lang/String;->isEmpty()Z
-
-    move-result v12
-
-    if-eqz v12, :cond_42
-
-    const-class v0, Ljava/lang/Iterable;
-
-    invoke-virtual {v0, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v0
-
-    const-string v11, "@Part annotation must supply a name or use MultipartBody.Part parameter type."
-
-    if-eqz v0, :cond_3e
-
-    instance-of v0, v5, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v0, :cond_3d
-
-    move-object v0, v5
-
-    check-cast v0, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v4, 0x0
-
-    invoke-static {v4, v0}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v13, v0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3c
-
-    sget-object v0, Lq0/k$k;->a:Lq0/k$k;
-
-    new-instance v4, Lq0/i;
-
-    invoke-direct {v4, v0}, Lq0/i;-><init>(Lq0/k;)V
-
-    goto :goto_b
-
-    :cond_3c
-    new-array v0, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v11, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_3d
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_3e
-    invoke-virtual {v4}, Ljava/lang/Class;->isArray()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_40
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v13, v0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3f
-
-    sget-object v0, Lq0/k$k;->a:Lq0/k$k;
-
-    new-instance v4, Lq0/j;
-
-    invoke-direct {v4, v0}, Lq0/j;-><init>(Lq0/k;)V
-
-    goto :goto_b
-
-    :cond_3f
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v11, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_40
-    const/4 v0, 0x0
-
-    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_41
-
-    sget-object v0, Lq0/k$k;->a:Lq0/k$k;
-
-    goto/16 :goto_a
-
-    :goto_b
-    move-object/from16 v18, v7
-
-    move/from16 v17, v9
-
-    goto/16 :goto_d
-
-    :cond_41
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v11, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_42
-    const/4 v12, 0x4
-
-    new-array v12, v12, [Ljava/lang/String;
-
-    const-string v17, "Content-Disposition"
-
-    const/16 v18, 0x0
-
-    aput-object v17, v12, v18
-
-    move/from16 v17, v9
-
-    const-string v9, "form-data; name=\""
-
-    move-object/from16 v18, v7
-
-    const-string v7, "\""
-
-    invoke-static {v9, v0, v7}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v7, 0x1
-
-    aput-object v0, v12, v7
-
-    const-string v0, "Content-Transfer-Encoding"
-
-    const/4 v7, 0x2
-
-    aput-object v0, v12, v7
-
-    const/4 v0, 0x3
-
-    invoke-interface {v11}, Lq0/u/o;->encoding()Ljava/lang/String;
-
-    move-result-object v7
-
-    aput-object v7, v12, v0
-
-    sget-object v0, Lokhttp3/Headers;->e:Lokhttp3/Headers$b;
-
-    invoke-virtual {v0, v12}, Lokhttp3/Headers$b;->c([Ljava/lang/String;)Lokhttp3/Headers;
-
-    move-result-object v0
-
-    const-class v7, Ljava/lang/Iterable;
-
-    invoke-virtual {v7, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v7
-
-    const-string v9, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation."
-
-    if-eqz v7, :cond_45
-
-    instance-of v7, v5, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v7, :cond_44
-
-    move-object v4, v5
-
-    check-cast v4, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v7, 0x0
-
-    invoke-static {v7, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v4
-
-    invoke-static {v4}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v7
-
-    invoke-virtual {v13, v7}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v7
-
-    if-nez v7, :cond_43
-
-    iget-object v7, v1, Lq0/q$a;->a:Lq0/p;
-
-    iget-object v9, v1, Lq0/q$a;->c:[Ljava/lang/annotation/Annotation;
-
-    invoke-virtual {v7, v4, v6, v9}, Lq0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v4
-
-    new-instance v7, Lq0/k$e;
-
-    invoke-direct {v7, v0, v4}, Lq0/k$e;-><init>(Lokhttp3/Headers;Lq0/e;)V
-
-    new-instance v0, Lq0/i;
-
-    invoke-direct {v0, v7}, Lq0/i;-><init>(Lq0/k;)V
-
-    goto :goto_c
-
-    :cond_43
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v9, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_44
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_45
-    invoke-virtual {v4}, Ljava/lang/Class;->isArray()Z
-
-    move-result v7
-
-    if-eqz v7, :cond_47
-
-    invoke-virtual {v4}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object v4
-
-    invoke-static {v4}, Lq0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v7
-
-    if-nez v7, :cond_46
-
-    iget-object v7, v1, Lq0/q$a;->a:Lq0/p;
-
-    iget-object v9, v1, Lq0/q$a;->c:[Ljava/lang/annotation/Annotation;
-
-    invoke-virtual {v7, v4, v6, v9}, Lq0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v4
-
-    new-instance v7, Lq0/k$e;
-
-    invoke-direct {v7, v0, v4}, Lq0/k$e;-><init>(Lokhttp3/Headers;Lq0/e;)V
-
-    new-instance v0, Lq0/j;
-
-    invoke-direct {v0, v7}, Lq0/j;-><init>(Lq0/k;)V
-
-    :goto_c
-    move-object v4, v0
-
-    goto/16 :goto_d
-
-    :cond_46
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v9, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_47
-    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v4
-
-    if-nez v4, :cond_48
-
-    iget-object v4, v1, Lq0/q$a;->a:Lq0/p;
-
-    iget-object v7, v1, Lq0/q$a;->c:[Ljava/lang/annotation/Annotation;
-
-    invoke-virtual {v4, v5, v6, v7}, Lq0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v4
-
-    new-instance v7, Lq0/k$e;
-
-    invoke-direct {v7, v0, v4}, Lq0/k$e;-><init>(Lokhttp3/Headers;Lq0/e;)V
-
-    move-object v4, v7
-
-    goto/16 :goto_d
-
-    :cond_48
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v9, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_49
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@Part parameters can only be used with multipart encoding."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_4a
-    move-object/from16 v18, v7
-
-    move/from16 v17, v9
-
-    instance-of v4, v11, Lq0/u/p;
-
-    if-eqz v4, :cond_50
-
-    iget-boolean v4, v1, Lq0/q$a;->p:Z
-
-    if-eqz v4, :cond_4f
-
-    const/4 v4, 0x1
-
-    iput-boolean v4, v1, Lq0/q$a;->h:Z
-
-    invoke-static {v5}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    const-class v7, Ljava/util/Map;
-
-    invoke-virtual {v7, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v7
-
-    if-eqz v7, :cond_4e
-
-    const-class v7, Ljava/util/Map;
-
-    invoke-static {v5, v4, v7}, Lq0/r;->i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-
-    move-result-object v4
-
-    instance-of v7, v4, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v7, :cond_4d
-
-    check-cast v4, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v0, 0x0
-
-    invoke-static {v0, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    if-ne v12, v0, :cond_4c
-
-    const/4 v0, 0x1
-
-    invoke-static {v0, v4}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v4
-
-    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v4
-
-    if-nez v4, :cond_4b
-
-    iget-object v4, v1, Lq0/q$a;->a:Lq0/p;
-
-    iget-object v7, v1, Lq0/q$a;->c:[Ljava/lang/annotation/Annotation;
-
-    invoke-virtual {v4, v0, v6, v7}, Lq0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v0
-
-    check-cast v11, Lq0/u/p;
-
-    new-instance v4, Lq0/k$f;
-
-    invoke-interface {v11}, Lq0/u/p;->encoding()Ljava/lang/String;
-
-    move-result-object v7
-
-    invoke-direct {v4, v0, v7}, Lq0/k$f;-><init>(Lq0/e;Ljava/lang/String;)V
-
-    goto/16 :goto_d
-
-    :cond_4b
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@PartMap values cannot be MultipartBody.Part. Use @Part List<Part> or a different value type instead."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_4c
-    const/4 v3, 0x0
-
-    new-instance v4, Ljava/lang/StringBuilder;
-
-    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v5, "@PartMap keys must be of type String: "
-
-    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_4d
-    const/4 v3, 0x0
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_4e
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@PartMap parameter type must be Map."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_4f
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@PartMap parameters can only be used with multipart encoding."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_50
-    instance-of v0, v11, Lq0/u/a;
-
-    if-eqz v0, :cond_53
-
-    iget-boolean v0, v1, Lq0/q$a;->o:Z
-
-    if-nez v0, :cond_52
-
-    iget-boolean v0, v1, Lq0/q$a;->p:Z
-
-    if-nez v0, :cond_52
-
-    iget-boolean v0, v1, Lq0/q$a;->i:Z
-
-    if-nez v0, :cond_51
-
-    :try_start_2
-    iget-object v0, v1, Lq0/q$a;->a:Lq0/p;
-
-    iget-object v4, v1, Lq0/q$a;->c:[Ljava/lang/annotation/Annotation;
-
-    invoke-virtual {v0, v5, v6, v4}, Lq0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lq0/e;
-
-    move-result-object v0
-    :try_end_2
-    .catch Ljava/lang/RuntimeException; {:try_start_2 .. :try_end_2} :catch_0
-
-    const/4 v4, 0x1
-
-    iput-boolean v4, v1, Lq0/q$a;->i:Z
-
-    new-instance v4, Lq0/k$a;
-
-    invoke-direct {v4, v0}, Lq0/k$a;-><init>(Lq0/e;)V
-
-    goto :goto_d
-
-    :catch_0
-    move-exception v0
-
-    const/4 v3, 0x1
-
-    new-array v4, v3, [Ljava/lang/Object;
-
-    const/4 v6, 0x0
-
-    aput-object v5, v4, v6
-
-    const-string v5, "Unable to create @Body converter for %s"
-
-    const-string v6, " (parameter #"
-
-    invoke-static {v5, v6}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v5
-
-    add-int/2addr v2, v3
-
-    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v2, ")"
-
-    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v0, v2, v4}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_51
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "Multiple @Body method annotations found."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_52
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "@Body parameters cannot be used with form or multi-part encoding."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_53
-    const/4 v4, 0x0
-
-    :goto_d
-    if-nez v4, :cond_54
-
-    goto :goto_e
-
-    :cond_54
-    if-nez v3, :cond_55
-
-    move-object v3, v4
-
-    :goto_e
-    add-int/lit8 v10, v10, 0x1
-
-    const/4 v4, 0x1
-
-    move/from16 v0, v16
-
-    move/from16 v9, v17
-
-    move-object/from16 v7, v18
-
-    goto/16 :goto_6
-
-    :cond_55
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v3, "Multiple Retrofit annotations found, only one allowed."
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_56
-    move/from16 v16, v0
-
-    move-object/from16 v18, v7
-
-    const/4 v0, 0x0
-
-    if-eqz v3, :cond_57
-
-    aput-object v3, v8, v2
-
-    add-int/lit8 v2, v2, 0x1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    move/from16 v0, v16
-
-    goto/16 :goto_5
-
-    :cond_57
-    new-array v0, v0, [Ljava/lang/Object;
-
-    move-object/from16 v3, v18
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_58
-    move-object v3, v7
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v2, v3, v0}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_59
-    const/4 v0, 0x0
-
-    new-array v3, v4, [Ljava/lang/Object;
-
-    aput-object v5, v3, v0
-
-    const-string v0, "Parameter type must not include a type variable or wildcard: %s"
-
-    invoke-virtual {v1, v2, v0, v3}, Lq0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_5a
-    const/4 v0, 0x0
-
-    iget-object v2, v1, Lq0/q$a;->q:Ljava/lang/String;
-
-    if-nez v2, :cond_5c
-
-    iget-boolean v2, v1, Lq0/q$a;->l:Z
-
-    if-eqz v2, :cond_5b
-
-    goto :goto_f
-
-    :cond_5b
-    new-array v2, v4, [Ljava/lang/Object;
-
-    iget-object v3, v1, Lq0/q$a;->m:Ljava/lang/String;
-
-    aput-object v3, v2, v0
-
-    const-string v0, "Missing either @%s URL or @Url parameter."
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v3, v0, v2}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_5c
-    :goto_f
-    iget-boolean v0, v1, Lq0/q$a;->o:Z
-
-    if-nez v0, :cond_5e
-
-    iget-boolean v0, v1, Lq0/q$a;->p:Z
-
-    if-nez v0, :cond_5e
-
-    iget-boolean v0, v1, Lq0/q$a;->n:Z
-
-    if-nez v0, :cond_5e
-
-    iget-boolean v0, v1, Lq0/q$a;->i:Z
-
-    if-nez v0, :cond_5d
-
-    goto :goto_10
-
-    :cond_5d
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v2, "Non-body HTTP method cannot contain @Body."
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_5e
-    :goto_10
-    iget-boolean v0, v1, Lq0/q$a;->o:Z
-
-    if-eqz v0, :cond_60
-
-    iget-boolean v0, v1, Lq0/q$a;->g:Z
-
-    if-eqz v0, :cond_5f
-
-    goto :goto_11
-
-    :cond_5f
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v2, "Form-encoded method must contain at least one @Field."
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_60
-    :goto_11
-    iget-boolean v0, v1, Lq0/q$a;->p:Z
-
-    if-eqz v0, :cond_62
-
-    iget-boolean v0, v1, Lq0/q$a;->h:Z
-
-    if-eqz v0, :cond_61
-
-    goto :goto_12
-
-    :cond_61
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v2, "Multipart method must contain at least one @Part."
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_62
-    :goto_12
-    new-instance v0, Lq0/q;
-
-    invoke-direct {v0, v1}, Lq0/q;-><init>(Lq0/q$a;)V
-
-    return-object v0
-
-    :cond_63
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v2, "HTTP method annotation is required (e.g., @GET, @POST, etc.)."
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :catch_1
-    move-exception v0
-
-    const/4 v2, 0x1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    iget-object v3, v1, Lq0/q$a;->f:Ljava/lang/reflect/Type;
-
-    const/4 v4, 0x0
-
-    aput-object v3, v2, v4
-
-    const-string v3, "Unable to create converter for %s"
-
-    invoke-virtual {v1, v0, v3, v2}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_64
-    const-string v0, "\'"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v2, v1, Lq0/q$a;->f:Ljava/lang/reflect/Type;
-
-    invoke-static {v2}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v2, "\' is not a valid response body type. Did you mean ResponseBody?"
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v2, 0x0
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    invoke-virtual {v1, v0, v2}, Lq0/q$a;->b(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :catch_2
-    move-exception v0
-
-    const/4 v3, 0x0
-
-    new-array v4, v4, [Ljava/lang/Object;
-
-    aput-object v2, v4, v3
-
-    const-string v2, "Unable to create call adapter for %s"
-
-    invoke-virtual {v1, v0, v2, v4}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_65
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    const-string v2, "Service methods cannot return void."
-
-    const/4 v3, 0x0
-
-    invoke-virtual {v1, v3, v2, v0}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-
-    :cond_66
-    const/4 v0, 0x0
-
-    new-array v4, v4, [Ljava/lang/Object;
-
-    aput-object v2, v4, v0
-
-    const-string v0, "Method return type must not include a type variable or wildcard: %s"
-
-    invoke-virtual {v1, v3, v0, v4}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object v0
-
-    throw v0
-.end method
-
-.method public final varargs b(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0, p1, p2}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final varargs c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-    .locals 1
-
-    invoke-static {p2, p3}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p2
-
-    new-instance p3, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "\n    for method "
-
-    invoke-static {p2, v0}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    iget-object v0, p0, Lq0/q$a;->b:Ljava/lang/reflect/Method;
-
-    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getDeclaringClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "."
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v0, p0, Lq0/q$a;->b:Ljava/lang/reflect/Method;
-
-    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p3, p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    return-object p3
-.end method
-
-.method public final varargs d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-    .locals 1
-
-    const-string v0, " (parameter #"
-
-    invoke-static {p2, v0}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p2
-
-    add-int/lit8 p1, p1, 0x1
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string p1, ")"
-
-    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1, p3}, Lq0/q$a;->b(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final e(Ljava/lang/String;Ljava/lang/String;Z)V
-    .locals 4
-
-    iget-object v0, p0, Lq0/q$a;->m:Ljava/lang/String;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-nez v0, :cond_4
-
-    iput-object p1, p0, Lq0/q$a;->m:Ljava/lang/String;
-
-    iput-boolean p3, p0, Lq0/q$a;->n:Z
-
-    invoke-virtual {p2}, Ljava/lang/String;->isEmpty()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const/16 p1, 0x3f
-
-    invoke-virtual {p2, p1}, Ljava/lang/String;->indexOf(I)I
-
-    move-result p1
-
-    const/4 p3, -0x1
-
-    if-eq p1, p3, :cond_2
-
-    invoke-virtual {p2}, Ljava/lang/String;->length()I
-
-    move-result p3
-
-    sub-int/2addr p3, v3
-
-    if-ge p1, p3, :cond_2
-
-    add-int/2addr p1, v3
-
-    invoke-virtual {p2, p1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    sget-object p3, Lq0/q;->m:Ljava/util/regex/Pattern;
-
-    invoke-virtual {p3, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
-
-    move-result-object p3
-
-    invoke-virtual {p3}, Ljava/util/regex/Matcher;->find()Z
-
-    move-result p3
-
-    if-nez p3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-array p2, v3, [Ljava/lang/Object;
-
-    aput-object p1, p2, v2
-
-    const-string p1, "URL query string \"%s\" must not have replace block. For dynamic query parameters use @Query."
-
-    invoke-virtual {p0, v1, p1, p2}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object p1
-
-    throw p1
-
-    :cond_2
-    :goto_0
-    iput-object p2, p0, Lq0/q$a;->q:Ljava/lang/String;
-
-    sget-object p1, Lq0/q;->m:Ljava/util/regex/Pattern;
-
-    invoke-virtual {p1, p2}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
-
-    move-result-object p1
-
-    new-instance p2, Ljava/util/LinkedHashSet;
-
-    invoke-direct {p2}, Ljava/util/LinkedHashSet;-><init>()V
-
-    :goto_1
-    invoke-virtual {p1}, Ljava/util/regex/Matcher;->find()Z
-
-    move-result p3
-
-    if-eqz p3, :cond_3
-
-    invoke-virtual {p1, v3}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
-
-    move-result-object p3
-
-    invoke-virtual {p2, p3}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_3
-    iput-object p2, p0, Lq0/q$a;->t:Ljava/util/Set;
-
-    return-void
-
-    :cond_4
-    const/4 p2, 0x2
-
-    new-array p2, p2, [Ljava/lang/Object;
-
-    aput-object v0, p2, v2
-
-    aput-object p1, p2, v3
-
-    const-string p1, "Only one HTTP method is allowed. Found: %s and %s."
-
-    invoke-virtual {p0, v1, p1, p2}, Lq0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
-
-    move-result-object p1
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/q0/q.smali b/com.discord/smali_classes2/q0/q.smali
deleted file mode 100644
index be94a4b7d7..0000000000
--- a/com.discord/smali_classes2/q0/q.smali
+++ /dev/null
@@ -1,251 +0,0 @@
-.class public final Lq0/q;
-.super Ljava/lang/Object;
-.source "ServiceMethod.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/q$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        "T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final m:Ljava/util/regex/Pattern;
-
-.field public static final n:Ljava/util/regex/Pattern;
-
-
-# instance fields
-.field public final a:Ln0/f$a;
-
-.field public final b:Lq0/c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/c<",
-            "TR;TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Ln0/w;
-
-.field public final d:Lq0/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/e<",
-            "Lokhttp3/ResponseBody;",
-            "TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/lang/String;
-
-.field public final f:Ljava/lang/String;
-
-.field public final g:Lokhttp3/Headers;
-
-.field public final h:Lokhttp3/MediaType;
-
-.field public final i:Z
-
-.field public final j:Z
-
-.field public final k:Z
-
-.field public final l:[Lq0/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lq0/k<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const-string v0, "\\{([a-zA-Z][a-zA-Z0-9_-]*)\\}"
-
-    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
-
-    move-result-object v0
-
-    sput-object v0, Lq0/q;->m:Ljava/util/regex/Pattern;
-
-    const-string v0, "[a-zA-Z][a-zA-Z0-9_-]*"
-
-    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
-
-    move-result-object v0
-
-    sput-object v0, Lq0/q;->n:Ljava/util/regex/Pattern;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lq0/q$a;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/q$a<",
-            "TR;TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-object v0, p1, Lq0/q$a;->a:Lq0/p;
-
-    iget-object v1, v0, Lq0/p;->b:Ln0/f$a;
-
-    iput-object v1, p0, Lq0/q;->a:Ln0/f$a;
-
-    iget-object v1, p1, Lq0/q$a;->w:Lq0/c;
-
-    iput-object v1, p0, Lq0/q;->b:Lq0/c;
-
-    iget-object v0, v0, Lq0/p;->c:Ln0/w;
-
-    iput-object v0, p0, Lq0/q;->c:Ln0/w;
-
-    iget-object v0, p1, Lq0/q$a;->v:Lq0/e;
-
-    iput-object v0, p0, Lq0/q;->d:Lq0/e;
-
-    iget-object v0, p1, Lq0/q$a;->m:Ljava/lang/String;
-
-    iput-object v0, p0, Lq0/q;->e:Ljava/lang/String;
-
-    iget-object v0, p1, Lq0/q$a;->q:Ljava/lang/String;
-
-    iput-object v0, p0, Lq0/q;->f:Ljava/lang/String;
-
-    iget-object v0, p1, Lq0/q$a;->r:Lokhttp3/Headers;
-
-    iput-object v0, p0, Lq0/q;->g:Lokhttp3/Headers;
-
-    iget-object v0, p1, Lq0/q$a;->s:Lokhttp3/MediaType;
-
-    iput-object v0, p0, Lq0/q;->h:Lokhttp3/MediaType;
-
-    iget-boolean v0, p1, Lq0/q$a;->n:Z
-
-    iput-boolean v0, p0, Lq0/q;->i:Z
-
-    iget-boolean v0, p1, Lq0/q$a;->o:Z
-
-    iput-boolean v0, p0, Lq0/q;->j:Z
-
-    iget-boolean v0, p1, Lq0/q$a;->p:Z
-
-    iput-boolean v0, p0, Lq0/q;->k:Z
-
-    iget-object p1, p1, Lq0/q$a;->u:[Lq0/k;
-
-    iput-object p1, p0, Lq0/q;->l:[Lq0/k;
-
-    return-void
-.end method
-
-.method public static a(Ljava/lang/Class;)Ljava/lang/Class;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;)",
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-
-    sget-object v0, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_0
-
-    const-class p0, Ljava/lang/Boolean;
-
-    return-object p0
-
-    :cond_0
-    sget-object v0, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_1
-
-    const-class p0, Ljava/lang/Byte;
-
-    return-object p0
-
-    :cond_1
-    sget-object v0, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_2
-
-    const-class p0, Ljava/lang/Character;
-
-    return-object p0
-
-    :cond_2
-    sget-object v0, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_3
-
-    const-class p0, Ljava/lang/Double;
-
-    return-object p0
-
-    :cond_3
-    sget-object v0, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_4
-
-    const-class p0, Ljava/lang/Float;
-
-    return-object p0
-
-    :cond_4
-    sget-object v0, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_5
-
-    const-class p0, Ljava/lang/Integer;
-
-    return-object p0
-
-    :cond_5
-    sget-object v0, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_6
-
-    const-class p0, Ljava/lang/Long;
-
-    return-object p0
-
-    :cond_6
-    sget-object v0, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
-
-    if-ne v0, p0, :cond_7
-
-    const-class p0, Ljava/lang/Short;
-
-    :cond_7
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/q0/r$a.smali b/com.discord/smali_classes2/q0/r$a.smali
deleted file mode 100644
index 30bad33057..0000000000
--- a/com.discord/smali_classes2/q0/r$a.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public final Lq0/r$a;
-.super Ljava/lang/Object;
-.source "Utils.java"
-
-# interfaces
-.implements Ljava/lang/reflect/GenericArrayType;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/r;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/reflect/Type;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Type;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/r$a;->d:Ljava/lang/reflect/Type;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public equals(Ljava/lang/Object;)Z
-    .locals 1
-
-    instance-of v0, p1, Ljava/lang/reflect/GenericArrayType;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/lang/reflect/GenericArrayType;
-
-    invoke-static {p0, p1}, Lq0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 p1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    return p1
-.end method
-
-.method public getGenericComponentType()Ljava/lang/reflect/Type;
-    .locals 1
-
-    iget-object v0, p0, Lq0/r$a;->d:Ljava/lang/reflect/Type;
-
-    return-object v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Lq0/r$a;->d:Ljava/lang/reflect/Type;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v1, p0, Lq0/r$a;->d:Ljava/lang/reflect/Type;
-
-    invoke-static {v1}, Lq0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)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_classes2/q0/r.smali b/com.discord/smali_classes2/q0/r.smali
deleted file mode 100644
index c72230332b..0000000000
--- a/com.discord/smali_classes2/q0/r.smali
+++ /dev/null
@@ -1,1232 +0,0 @@
-.class public final Lq0/r;
-.super Ljava/lang/Object;
-.source "Utils.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/r$c;,
-        Lq0/r$a;,
-        Lq0/r$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:[Ljava/lang/reflect/Type;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/reflect/Type;
-
-    sput-object v0, Lq0/r;->a:[Ljava/lang/reflect/Type;
-
-    return-void
-.end method
-
-.method public static a(Lokhttp3/ResponseBody;)Lokhttp3/ResponseBody;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Lo0/e;
-
-    invoke-direct {v0}, Lo0/e;-><init>()V
-
-    invoke-virtual {p0}, Lokhttp3/ResponseBody;->c()Lo0/g;
-
-    move-result-object v1
-
-    invoke-interface {v1, v0}, Lo0/g;->F0(Lo0/u;)J
-
-    invoke-virtual {p0}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
-
-    move-result-object v1
-
-    invoke-virtual {p0}, Lokhttp3/ResponseBody;->a()J
-
-    move-result-wide v2
-
-    new-instance p0, Ln0/d0;
-
-    invoke-direct {p0, v0, v1, v2, v3}, Ln0/d0;-><init>(Lo0/g;Lokhttp3/MediaType;J)V
-
-    return-object p0
-.end method
-
-.method public static b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(TT;",
-            "Ljava/lang/String;",
-            ")TT;"
-        }
-    .end annotation
-
-    if-eqz p0, :cond_0
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Ljava/lang/NullPointerException;
-
-    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static c(Ljava/lang/reflect/Type;)V
-    .locals 1
-
-    instance-of v0, p0, Ljava/lang/Class;
-
-    if-eqz v0, :cond_1
-
-    check-cast p0, Ljava/lang/Class;
-
-    invoke-virtual {p0}, Ljava/lang/Class;->isPrimitive()Z
-
-    move-result p0
-
-    if-nez p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p0
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public static d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
-    .locals 4
-
-    const/4 v0, 0x1
-
-    if-ne p0, p1, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p0, Ljava/lang/Class;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_1
-    instance-of v1, p0, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_6
-
-    instance-of v1, p1, Ljava/lang/reflect/ParameterizedType;
-
-    if-nez v1, :cond_2
-
-    return v2
-
-    :cond_2
-    check-cast p0, Ljava/lang/reflect/ParameterizedType;
-
-    check-cast p1, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getOwnerType()Ljava/lang/reflect/Type;
-
-    move-result-object v1
-
-    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getOwnerType()Ljava/lang/reflect/Type;
-
-    move-result-object v3
-
-    if-eq v1, v3, :cond_4
-
-    if-eqz v1, :cond_3
-
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v1, 0x0
-
-    goto :goto_1
-
-    :cond_4
-    :goto_0
-    const/4 v1, 0x1
-
-    :goto_1
-    if-eqz v1, :cond_5
-
-    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
-
-    move-result-object v1
-
-    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
-
-    move-result-object v3
-
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_5
-
-    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    const/4 v0, 0x0
-
-    :goto_2
-    return v0
-
-    :cond_6
-    instance-of v1, p0, Ljava/lang/reflect/GenericArrayType;
-
-    if-eqz v1, :cond_8
-
-    instance-of v0, p1, Ljava/lang/reflect/GenericArrayType;
-
-    if-nez v0, :cond_7
-
-    return v2
-
-    :cond_7
-    check-cast p0, Ljava/lang/reflect/GenericArrayType;
-
-    check-cast p1, Ljava/lang/reflect/GenericArrayType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    invoke-interface {p1}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Lq0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_8
-    instance-of v1, p0, Ljava/lang/reflect/WildcardType;
-
-    if-eqz v1, :cond_b
-
-    instance-of v1, p1, Ljava/lang/reflect/WildcardType;
-
-    if-nez v1, :cond_9
-
-    return v2
-
-    :cond_9
-    check-cast p0, Ljava/lang/reflect/WildcardType;
-
-    check-cast p1, Ljava/lang/reflect/WildcardType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object v1
-
-    invoke-interface {p1}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object v3
-
-    invoke-static {v1, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_a
-
-    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getLowerBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    invoke-interface {p1}, Ljava/lang/reflect/WildcardType;->getLowerBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_a
-
-    goto :goto_3
-
-    :cond_a
-    const/4 v0, 0x0
-
-    :goto_3
-    return v0
-
-    :cond_b
-    instance-of v1, p0, Ljava/lang/reflect/TypeVariable;
-
-    if-eqz v1, :cond_e
-
-    instance-of v1, p1, Ljava/lang/reflect/TypeVariable;
-
-    if-nez v1, :cond_c
-
-    return v2
-
-    :cond_c
-    check-cast p0, Ljava/lang/reflect/TypeVariable;
-
-    check-cast p1, Ljava/lang/reflect/TypeVariable;
-
-    invoke-interface {p0}, Ljava/lang/reflect/TypeVariable;->getGenericDeclaration()Ljava/lang/reflect/GenericDeclaration;
-
-    move-result-object v1
-
-    invoke-interface {p1}, Ljava/lang/reflect/TypeVariable;->getGenericDeclaration()Ljava/lang/reflect/GenericDeclaration;
-
-    move-result-object v3
-
-    if-ne v1, v3, :cond_d
-
-    invoke-interface {p0}, Ljava/lang/reflect/TypeVariable;->getName()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-interface {p1}, Ljava/lang/reflect/TypeVariable;->getName()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_d
-
-    goto :goto_4
-
-    :cond_d
-    const/4 v0, 0x0
-
-    :goto_4
-    return v0
-
-    :cond_e
-    return v2
-.end method
-
-.method public static e(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-    .locals 1
-
-    instance-of v0, p0, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x0
-
-    check-cast p0, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-static {v0, p0}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Call return type must be parameterized as Call<Foo> or Call<? extends Foo>"
-
-    invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Class<",
-            "*>;)",
-            "Ljava/lang/reflect/Type;"
-        }
-    .end annotation
-
-    if-ne p2, p1, :cond_0
-
-    return-object p0
-
-    :cond_0
-    invoke-virtual {p2}, Ljava/lang/Class;->isInterface()Z
-
-    move-result p0
-
-    if-eqz p0, :cond_3
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getInterfaces()[Ljava/lang/Class;
-
-    move-result-object p0
-
-    const/4 v0, 0x0
-
-    array-length v1, p0
-
-    :goto_0
-    if-ge v0, v1, :cond_3
-
-    aget-object v2, p0, v0
-
-    if-ne v2, p2, :cond_1
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getGenericInterfaces()[Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    aget-object p0, p0, v0
-
-    return-object p0
-
-    :cond_1
-    aget-object v2, p0, v0
-
-    invoke-virtual {p2, v2}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getGenericInterfaces()[Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    aget-object p1, p1, v0
-
-    aget-object p0, p0, v0
-
-    invoke-static {p1, p0, p2}, Lq0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_2
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    invoke-virtual {p1}, Ljava/lang/Class;->isInterface()Z
-
-    move-result p0
-
-    if-nez p0, :cond_6
-
-    :goto_1
-    const-class p0, Ljava/lang/Object;
-
-    if-eq p1, p0, :cond_6
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    if-ne p0, p2, :cond_4
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getGenericSuperclass()Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_4
-    invoke-virtual {p2, p0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getGenericSuperclass()Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    invoke-static {p1, p0, p2}, Lq0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_5
-    move-object p1, p0
-
-    goto :goto_1
-
-    :cond_6
-    return-object p2
-.end method
-
-.method public static g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-    .locals 4
-
-    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    if-ltz p0, :cond_1
-
-    array-length v1, v0
-
-    if-ge p0, v1, :cond_1
-
-    aget-object p0, v0, p0
-
-    instance-of p1, p0, Ljava/lang/reflect/WildcardType;
-
-    if-eqz p1, :cond_0
-
-    check-cast p0, Ljava/lang/reflect/WildcardType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    const/4 p1, 0x0
-
-    aget-object p0, p0, p1
-
-    :cond_0
-    return-object p0
-
-    :cond_1
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    const-string v2, "Index "
-
-    const-string v3, " not in range [0,"
-
-    invoke-static {v2, p0, v3}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object p0
-
-    array-length v0, v0
-
-    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v0, ") for "
-
-    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public static h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            ")",
-            "Ljava/lang/Class<",
-            "*>;"
-        }
-    .end annotation
-
-    const-string v0, "type == null"
-
-    invoke-static {p0, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
-
-    instance-of v0, p0, Ljava/lang/Class;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/lang/Class;
-
-    return-object p0
-
-    :cond_0
-    instance-of v0, p0, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v0, :cond_2
-
-    check-cast p0, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    instance-of v0, p0, Ljava/lang/Class;
-
-    if-eqz v0, :cond_1
-
-    check-cast p0, Ljava/lang/Class;
-
-    return-object p0
-
-    :cond_1
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p0
-
-    :cond_2
-    instance-of v0, p0, Ljava/lang/reflect/GenericArrayType;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_3
-
-    check-cast p0, Ljava/lang/reflect/GenericArrayType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object p0
-
-    invoke-static {p0, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;I)Ljava/lang/Object;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_3
-    instance-of v0, p0, Ljava/lang/reflect/TypeVariable;
-
-    if-eqz v0, :cond_4
-
-    const-class p0, Ljava/lang/Object;
-
-    return-object p0
-
-    :cond_4
-    instance-of v0, p0, Ljava/lang/reflect/WildcardType;
-
-    if-eqz v0, :cond_5
-
-    check-cast p0, Ljava/lang/reflect/WildcardType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    aget-object p0, p0, v1
-
-    invoke-static {p0}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_5
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Expected a Class, ParameterizedType, or GenericArrayType, but <"
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v2, "> is of type "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public static i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/Class<",
-            "*>;)",
-            "Ljava/lang/reflect/Type;"
-        }
-    .end annotation
-
-    invoke-virtual {p2, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0, p1, p2}, Lq0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-
-    move-result-object p2
-
-    invoke-static {p0, p1, p2}, Lq0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    return-object p0
-
-    :cond_0
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
-
-    throw p0
-.end method
-
-.method public static j(Ljava/lang/reflect/Type;)Z
-    .locals 5
-
-    instance-of v0, p0, Ljava/lang/Class;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    instance-of v0, p0, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_3
-
-    check-cast p0, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    array-length v0, p0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v0, :cond_2
-
-    aget-object v4, p0, v3
-
-    invoke-static {v4}, Lq0/r;->j(Ljava/lang/reflect/Type;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    return v2
-
-    :cond_1
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    return v1
-
-    :cond_3
-    instance-of v0, p0, Ljava/lang/reflect/GenericArrayType;
-
-    if-eqz v0, :cond_4
-
-    check-cast p0, Ljava/lang/reflect/GenericArrayType;
-
-    invoke-interface {p0}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lq0/r;->j(Ljava/lang/reflect/Type;)Z
-
-    move-result p0
-
-    return p0
-
-    :cond_4
-    instance-of v0, p0, Ljava/lang/reflect/TypeVariable;
-
-    if-eqz v0, :cond_5
-
-    return v2
-
-    :cond_5
-    instance-of v0, p0, Ljava/lang/reflect/WildcardType;
-
-    if-eqz v0, :cond_6
-
-    return v2
-
-    :cond_6
-    if-nez p0, :cond_7
-
-    const-string v0, "null"
-
-    goto :goto_1
-
-    :cond_7
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_1
-    new-instance v1, Ljava/lang/IllegalArgumentException;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v3, "Expected a Class, ParameterizedType, or GenericArrayType, but <"
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string p0, "> is of type "
-
-    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v1
-.end method
-
-.method public static k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/reflect/Type;",
-            ")",
-            "Ljava/lang/reflect/Type;"
-        }
-    .end annotation
-
-    :goto_0
-    instance-of v0, p2, Ljava/lang/reflect/TypeVariable;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_6
-
-    check-cast p2, Ljava/lang/reflect/TypeVariable;
-
-    invoke-interface {p2}, Ljava/lang/reflect/TypeVariable;->getGenericDeclaration()Ljava/lang/reflect/GenericDeclaration;
-
-    move-result-object v0
-
-    instance-of v2, v0, Ljava/lang/Class;
-
-    if-eqz v2, :cond_0
-
-    check-cast v0, Ljava/lang/Class;
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_1
-    if-nez v0, :cond_1
-
-    goto :goto_3
-
-    :cond_1
-    invoke-static {p0, p1, v0}, Lq0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
-
-    move-result-object v2
-
-    instance-of v3, v2, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz v3, :cond_4
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getTypeParameters()[Ljava/lang/reflect/TypeVariable;
-
-    move-result-object v0
-
-    :goto_2
-    array-length v3, v0
-
-    if-ge v1, v3, :cond_3
-
-    aget-object v3, v0, v1
-
-    invoke-virtual {p2, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    check-cast v2, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-interface {v2}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    aget-object v0, v0, v1
-
-    goto :goto_4
-
-    :cond_2
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    new-instance p0, Ljava/util/NoSuchElementException;
-
-    invoke-direct {p0}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw p0
-
-    :cond_4
-    :goto_3
-    move-object v0, p2
-
-    :goto_4
-    if-ne v0, p2, :cond_5
-
-    return-object v0
-
-    :cond_5
-    move-object p2, v0
-
-    goto :goto_0
-
-    :cond_6
-    instance-of v0, p2, Ljava/lang/Class;
-
-    if-eqz v0, :cond_8
-
-    move-object v0, p2
-
-    check-cast v0, Ljava/lang/Class;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->isArray()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_8
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
-
-    move-result-object p2
-
-    invoke-static {p0, p1, p2}, Lq0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    if-ne p2, p0, :cond_7
-
-    goto :goto_5
-
-    :cond_7
-    new-instance v0, Lq0/r$a;
-
-    invoke-direct {v0, p0}, Lq0/r$a;-><init>(Ljava/lang/reflect/Type;)V
-
-    :goto_5
-    return-object v0
-
-    :cond_8
-    instance-of v0, p2, Ljava/lang/reflect/GenericArrayType;
-
-    if-eqz v0, :cond_a
-
-    check-cast p2, Ljava/lang/reflect/GenericArrayType;
-
-    invoke-interface {p2}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    invoke-static {p0, p1, v0}, Lq0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    if-ne v0, p0, :cond_9
-
-    goto :goto_6
-
-    :cond_9
-    new-instance p2, Lq0/r$a;
-
-    invoke-direct {p2, p0}, Lq0/r$a;-><init>(Ljava/lang/reflect/Type;)V
-
-    :goto_6
-    return-object p2
-
-    :cond_a
-    instance-of v0, p2, Ljava/lang/reflect/ParameterizedType;
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_10
-
-    check-cast p2, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-interface {p2}, Ljava/lang/reflect/ParameterizedType;->getOwnerType()Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    invoke-static {p0, p1, v0}, Lq0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object v3
-
-    if-eq v3, v0, :cond_b
-
-    const/4 v0, 0x1
-
-    goto :goto_7
-
-    :cond_b
-    const/4 v0, 0x0
-
-    :goto_7
-    invoke-interface {p2}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
-
-    move-result-object v4
-
-    array-length v5, v4
-
-    :goto_8
-    if-ge v1, v5, :cond_e
-
-    aget-object v6, v4, v1
-
-    invoke-static {p0, p1, v6}, Lq0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object v6
-
-    aget-object v7, v4, v1
-
-    if-eq v6, v7, :cond_d
-
-    if-nez v0, :cond_c
-
-    invoke-virtual {v4}, [Ljava/lang/reflect/Type;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v4, v0
-
-    check-cast v4, [Ljava/lang/reflect/Type;
-
-    const/4 v0, 0x1
-
-    :cond_c
-    aput-object v6, v4, v1
-
-    :cond_d
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_8
-
-    :cond_e
-    if-eqz v0, :cond_f
-
-    new-instance p0, Lq0/r$b;
-
-    invoke-interface {p2}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    invoke-direct {p0, v3, p1, v4}, Lq0/r$b;-><init>(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
-
-    move-object p2, p0
-
-    :cond_f
-    return-object p2
-
-    :cond_10
-    instance-of v0, p2, Ljava/lang/reflect/WildcardType;
-
-    if-eqz v0, :cond_12
-
-    check-cast p2, Ljava/lang/reflect/WildcardType;
-
-    invoke-interface {p2}, Ljava/lang/reflect/WildcardType;->getLowerBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object v0
-
-    invoke-interface {p2}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
-
-    move-result-object v3
-
-    array-length v4, v0
-
-    if-ne v4, v2, :cond_11
-
-    aget-object v3, v0, v1
-
-    invoke-static {p0, p1, v3}, Lq0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-
-    aget-object p1, v0, v1
-
-    if-eq p0, p1, :cond_12
-
-    new-instance p1, Lq0/r$c;
-
-    new-array p2, v2, [Ljava/lang/reflect/Type;
-
-    const-class v0, Ljava/lang/Object;
-
-    aput-object v0, p2, v1
-
-    new-array v0, v2, [Ljava/lang/reflect/Type;
-
-    aput-object p0, v0, v1
-
-    invoke-direct {p1, p2, v0}, Lq0/r$c;-><init>([Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
-
-    return-object p1
-
-    :cond_11
-    array-length v0, v3
-
-    if-ne v0, v2, :cond_12
-
-    aget-object v0, v3, v1
-
-    :try_start_0
-    invoke-static {p0, p1, v0}, Lq0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
-
-    move-result-object p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    aget-object p1, v3, v1
-
-    if-eq p0, p1, :cond_12
-
-    new-instance p1, Lq0/r$c;
-
-    new-array p2, v2, [Ljava/lang/reflect/Type;
-
-    aput-object p0, p2, v1
-
-    sget-object p0, Lq0/r;->a:[Ljava/lang/reflect/Type;
-
-    invoke-direct {p1, p2, p0}, Lq0/r$c;-><init>([Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
-
-    return-object p1
-
-    :catchall_0
-    move-exception p0
-
-    throw p0
-
-    :cond_12
-    return-object p2
-.end method
-
-.method public static l(Ljava/lang/reflect/Type;)Ljava/lang/String;
-    .locals 1
-
-    instance-of v0, p0, Ljava/lang/Class;
-
-    if-eqz v0, :cond_0
-
-    check-cast p0, Ljava/lang/Class;
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    :goto_0
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/a$a.smali b/com.discord/smali_classes2/q0/s/a/a$a.smali
deleted file mode 100644
index 3df8f00a79..0000000000
--- a/com.discord/smali_classes2/q0/s/a/a$a.smali
+++ /dev/null
@@ -1,207 +0,0 @@
-.class public Lq0/s/a/a$a;
-.super Lrx/Subscriber;
-.source "BodyOnSubscribe.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/s/a/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "Lq0/n<",
-        "TR;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    iput-object p1, p0, Lq0/s/a/a$a;->d:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lq0/s/a/a$a;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lq0/s/a/a$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 2
-
-    iget-boolean v0, p0, Lq0/s/a/a$a;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lq0/s/a/a$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/lang/AssertionError;
-
-    const-string v1, "This should never happen! Report as a Retrofit bug with the full stacktrace."
-
-    invoke-direct {v0, v1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    invoke-virtual {v0, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    :goto_0
-    return-void
-
-    :cond_1
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 6
-
-    check-cast p1, Lq0/n;
-
-    iget-object v0, p1, Lq0/n;->a:Lokhttp3/Response;
-
-    invoke-virtual {v0}, Lokhttp3/Response;->b()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lq0/s/a/a$a;->d:Lrx/Subscriber;
-
-    iget-object p1, p1, Lq0/n;->b:Ljava/lang/Object;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lq0/s/a/a$a;->e:Z
-
-    new-instance v1, Lretrofit2/adapter/rxjava/HttpException;
-
-    invoke-direct {v1, p1}, Lretrofit2/adapter/rxjava/HttpException;-><init>(Lq0/n;)V
-
-    const/4 p1, 0x0
-
-    :try_start_0
-    iget-object v2, p0, Lq0/s/a/a$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v2, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v2
-
-    invoke-static {v2}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    new-instance v3, Lrx/exceptions/CompositeException;
-
-    const/4 v4, 0x2
-
-    new-array v4, v4, [Ljava/lang/Throwable;
-
-    const/4 v5, 0x0
-
-    aput-object v1, v4, v5
-
-    aput-object v2, v4, v0
-
-    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    throw p1
-
-    :catch_0
-    nop
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    :goto_0
-    return-void
-
-    :cond_2
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/a.smali b/com.discord/smali_classes2/q0/s/a/a.smali
deleted file mode 100644
index e8e6d01304..0000000000
--- a/com.discord/smali_classes2/q0/s/a/a.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lq0/s/a/a;
-.super Ljava/lang/Object;
-.source "BodyOnSubscribe.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/s/a/a$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable$a<",
-            "Lq0/n<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable$a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable$a<",
-            "Lq0/n<",
-            "TT;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/s/a/a;->d:Lrx/Observable$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lq0/s/a/a;->d:Lrx/Observable$a;
-
-    new-instance v1, Lq0/s/a/a$a;
-
-    invoke-direct {v1, p1}, Lq0/s/a/a$a;-><init>(Lrx/Subscriber;)V
-
-    invoke-interface {v0, v1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/b.smali b/com.discord/smali_classes2/q0/s/a/b.smali
deleted file mode 100644
index 3b0882bbe2..0000000000
--- a/com.discord/smali_classes2/q0/s/a/b.smali
+++ /dev/null
@@ -1,489 +0,0 @@
-.class public final Lq0/s/a/b;
-.super Ljava/util/concurrent/atomic/AtomicInteger;
-.source "CallArbiter.java"
-
-# interfaces
-.implements Lrx/Subscription;
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicInteger;",
-        "Lrx/Subscription;",
-        "Lrx/Producer;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final call:Lq0/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/b<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public volatile response:Lq0/n;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/n<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final subscriber:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-",
-            "Lq0/n<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lq0/b;Lrx/Subscriber;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;",
-            "Lrx/Subscriber<",
-            "-",
-            "Lq0/n<",
-            "TT;>;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
-
-    iput-object p1, p0, Lq0/s/a/b;->call:Lq0/b;
-
-    iput-object p2, p0, Lq0/s/a/b;->subscriber:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a(Lq0/n;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/n<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    invoke-virtual {p0}, Lq0/s/a/b;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    iget-object v1, p0, Lq0/s/a/b;->subscriber:Lrx/Subscriber;
-
-    invoke-interface {v1, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_2
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :cond_0
-    :try_start_1
-    invoke-virtual {p0}, Lq0/s/a/b;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-nez p1, :cond_2
-
-    iget-object p1, p0, Lq0/s/a/b;->subscriber:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-    :try_end_1
-    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_1 .. :try_end_1} :catch_0
-    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_1 .. :try_end_1} :catch_0
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    throw v0
-
-    :catch_0
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_3
-
-    :cond_2
-    :goto_0
-    return-void
-
-    :cond_3
-    throw v0
-
-    :catchall_1
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    :try_start_2
-    iget-object v1, p0, Lq0/s/a/b;->subscriber:Lrx/Subscriber;
-
-    invoke-interface {v1, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_2
-    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_2 .. :try_end_2} :catch_1
-    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_2 .. :try_end_2} :catch_1
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_2 .. :try_end_2} :catch_1
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    goto :goto_1
-
-    :catchall_2
-    move-exception v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    new-instance v2, Lrx/exceptions/CompositeException;
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Throwable;
-
-    const/4 v4, 0x0
-
-    aput-object p1, v3, v4
-
-    const/4 p1, 0x1
-
-    aput-object v1, v3, p1
-
-    invoke-direct {v2, v3}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
-
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    throw v0
-
-    :catch_1
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_5
-
-    :goto_1
-    return-void
-
-    :cond_5
-    throw v0
-
-    :catch_2
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_6
-
-    return-void
-
-    :cond_6
-    throw v0
-.end method
-
-.method public b(Ljava/lang/Throwable;)V
-    .locals 5
-
-    const/4 v0, 0x3
-
-    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicInteger;->set(I)V
-
-    invoke-virtual {p0}, Lq0/s/a/b;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iget-object v1, p0, Lq0/s/a/b;->subscriber:Lrx/Subscriber;
-
-    invoke-interface {v1, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    new-instance v2, Lrx/exceptions/CompositeException;
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Throwable;
-
-    const/4 v4, 0x0
-
-    aput-object p1, v3, v4
-
-    const/4 p1, 0x1
-
-    aput-object v1, v3, p1
-
-    invoke-direct {v2, v3}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
-
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    throw v0
-
-    :catch_0
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    throw v0
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
-
-.method public c(Lq0/n;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/n<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
-
-    move-result v0
-
-    const/4 v1, 0x2
-
-    if-eqz v0, :cond_3
-
-    const/4 v2, 0x3
-
-    const/4 v3, 0x1
-
-    if-eq v0, v3, :cond_2
-
-    if-eq v0, v1, :cond_1
-
-    if-eq v0, v2, :cond_1
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Unknown state: "
-
-    invoke-static {v1, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_1
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-
-    :cond_2
-    invoke-virtual {p0, v3, v2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0, p1}, Lq0/s/a/b;->a(Lq0/n;)V
-
-    return-void
-
-    :cond_3
-    iput-object p1, p0, Lq0/s/a/b;->response:Lq0/n;
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lq0/s/a/b;->call:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->k()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public m(J)V
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-nez v2, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
-
-    move-result p1
-
-    const/4 p2, 0x1
-
-    if-eqz p1, :cond_4
-
-    if-eq p1, p2, :cond_3
-
-    const/4 p2, 0x3
-
-    const/4 v0, 0x2
-
-    if-eq p1, v0, :cond_2
-
-    if-ne p1, p2, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Unknown state: "
-
-    invoke-static {v0, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_2
-    invoke-virtual {p0, v0, p2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lq0/s/a/b;->response:Lq0/n;
-
-    invoke-virtual {p0, p1}, Lq0/s/a/b;->a(Lq0/n;)V
-
-    :cond_3
-    :goto_0
-    return-void
-
-    :cond_4
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    return-void
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lq0/s/a/b;->call:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->cancel()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/c.smali b/com.discord/smali_classes2/q0/s/a/c.smali
deleted file mode 100644
index 953fe5fc49..0000000000
--- a/com.discord/smali_classes2/q0/s/a/c.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class public Lq0/s/a/c;
-.super Ljava/lang/Object;
-.source "CallEnqueueOnSubscribe.java"
-
-# interfaces
-.implements Lq0/d;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/d<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lq0/s/a/b;
-
-
-# direct methods
-.method public constructor <init>(Lq0/s/a/d;Lq0/s/a/b;)V
-    .locals 0
-
-    iput-object p2, p0, Lq0/s/a/c;->a:Lq0/s/a/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lq0/b;Ljava/lang/Throwable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;",
-            "Ljava/lang/Throwable;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-static {p2}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iget-object p1, p0, Lq0/s/a/c;->a:Lq0/s/a/b;
-
-    invoke-virtual {p1, p2}, Lq0/s/a/b;->b(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public b(Lq0/b;Lq0/n;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;",
-            "Lq0/n<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    iget-object p1, p0, Lq0/s/a/c;->a:Lq0/s/a/b;
-
-    invoke-virtual {p1, p2}, Lq0/s/a/b;->c(Lq0/n;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/d.smali b/com.discord/smali_classes2/q0/s/a/d.smali
deleted file mode 100644
index 51936fa4c3..0000000000
--- a/com.discord/smali_classes2/q0/s/a/d.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public final Lq0/s/a/d;
-.super Ljava/lang/Object;
-.source "CallEnqueueOnSubscribe.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "Lq0/n<",
-        "TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lq0/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/b<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lq0/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/s/a/d;->d:Lq0/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lq0/s/a/d;->d:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->e0()Lq0/b;
-
-    move-result-object v0
-
-    new-instance v1, Lq0/s/a/b;
-
-    invoke-direct {v1, v0, p1}, Lq0/s/a/b;-><init>(Lq0/b;Lrx/Subscriber;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    new-instance p1, Lq0/s/a/c;
-
-    invoke-direct {p1, p0, v1}, Lq0/s/a/c;-><init>(Lq0/s/a/d;Lq0/s/a/b;)V
-
-    invoke-interface {v0, p1}, Lq0/b;->Z(Lq0/d;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/e.smali b/com.discord/smali_classes2/q0/s/a/e.smali
deleted file mode 100644
index c1c078943a..0000000000
--- a/com.discord/smali_classes2/q0/s/a/e.smali
+++ /dev/null
@@ -1,93 +0,0 @@
-.class public final Lq0/s/a/e;
-.super Ljava/lang/Object;
-.source "CallExecuteOnSubscribe.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "Lq0/n<",
-        "TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lq0/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/b<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lq0/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/s/a/e;->d:Lq0/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lq0/s/a/e;->d:Lq0/b;
-
-    invoke-interface {v0}, Lq0/b;->e0()Lq0/b;
-
-    move-result-object v0
-
-    new-instance v1, Lq0/s/a/b;
-
-    invoke-direct {v1, v0, p1}, Lq0/s/a/b;-><init>(Lq0/b;Lrx/Subscriber;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    :try_start_0
-    invoke-interface {v0}, Lq0/b;->execute()Lq0/n;
-
-    move-result-object p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v1, p1}, Lq0/s/a/b;->c(Lq0/n;)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {v1, p1}, Lq0/s/a/b;->b(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/f.smali b/com.discord/smali_classes2/q0/s/a/f.smali
deleted file mode 100644
index 7548cb9f5a..0000000000
--- a/com.discord/smali_classes2/q0/s/a/f.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final Lq0/s/a/f;
-.super Ljava/lang/Object;
-.source "Result.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lq0/n;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/n<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/lang/Throwable;
-
-
-# direct methods
-.method public constructor <init>(Lq0/n;Ljava/lang/Throwable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/n<",
-            "TT;>;",
-            "Ljava/lang/Throwable;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/s/a/f;->a:Lq0/n;
-
-    iput-object p2, p0, Lq0/s/a/f;->b:Ljava/lang/Throwable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    iget-object v0, p0, Lq0/s/a/f;->b:Ljava/lang/Throwable;
-
-    if-eqz v0, :cond_0
-
-    const-string v0, "Result{isError=true, error=\""
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lq0/s/a/f;->b:Ljava/lang/Throwable;
-
-    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
-
-    :cond_0
-    const-string v0, "Result{isError=false, response="
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lq0/s/a/f;->a:Lq0/n;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x7d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/g$a.smali b/com.discord/smali_classes2/q0/s/a/g$a.smali
deleted file mode 100644
index 72da4f52bc..0000000000
--- a/com.discord/smali_classes2/q0/s/a/g$a.smali
+++ /dev/null
@@ -1,204 +0,0 @@
-.class public Lq0/s/a/g$a;
-.super Lrx/Subscriber;
-.source "ResultOnSubscribe.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/s/a/g;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "Lq0/n<",
-        "TR;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-",
-            "Lq0/s/a/f<",
-            "TR;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-",
-            "Lq0/s/a/f<",
-            "TR;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    iput-object p1, p0, Lq0/s/a/g$a;->d:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lq0/s/a/g$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 5
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iget-object v1, p0, Lq0/s/a/g$a;->d:Lrx/Subscriber;
-
-    if-eqz p1, :cond_0
-
-    new-instance v2, Lq0/s/a/f;
-
-    invoke-direct {v2, v0, p1}, Lq0/s/a/f;-><init>(Lq0/n;Ljava/lang/Throwable;)V
-
-    invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object p1, p0, Lq0/s/a/g$a;->d:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_1
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v1, "error == null"
-
-    invoke-direct {p1, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :goto_0
-    :try_start_2
-    iget-object v1, p0, Lq0/s/a/g$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v1, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_2
-    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_2 .. :try_end_2} :catch_0
-    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_2 .. :try_end_2} :catch_0
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    goto :goto_1
-
-    :catchall_1
-    move-exception v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    new-instance v2, Lrx/exceptions/CompositeException;
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Throwable;
-
-    const/4 v4, 0x0
-
-    aput-object p1, v3, v4
-
-    const/4 p1, 0x1
-
-    aput-object v1, v3, p1
-
-    invoke-direct {v2, v3}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
-
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    throw v0
-
-    :catch_0
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_2
-
-    :goto_1
-    return-void
-
-    :cond_2
-    throw v0
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 3
-
-    check-cast p1, Lq0/n;
-
-    iget-object v0, p0, Lq0/s/a/g$a;->d:Lrx/Subscriber;
-
-    if-eqz p1, :cond_0
-
-    new-instance v1, Lq0/s/a/f;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v1, p1, v2}, Lq0/s/a/f;-><init>(Lq0/n;Ljava/lang/Throwable;)V
-
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "response == null"
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/g.smali b/com.discord/smali_classes2/q0/s/a/g.smali
deleted file mode 100644
index 0e9fe85ac3..0000000000
--- a/com.discord/smali_classes2/q0/s/a/g.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lq0/s/a/g;
-.super Ljava/lang/Object;
-.source "ResultOnSubscribe.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lq0/s/a/g$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "Lq0/s/a/f<",
-        "TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable$a<",
-            "Lq0/n<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable$a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable$a<",
-            "Lq0/n<",
-            "TT;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/s/a/g;->d:Lrx/Observable$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lq0/s/a/g;->d:Lrx/Observable$a;
-
-    new-instance v1, Lq0/s/a/g$a;
-
-    invoke-direct {v1, p1}, Lq0/s/a/g$a;-><init>(Lrx/Subscriber;)V
-
-    invoke-interface {v0, v1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/h.smali b/com.discord/smali_classes2/q0/s/a/h.smali
deleted file mode 100644
index 37e98b81be..0000000000
--- a/com.discord/smali_classes2/q0/s/a/h.smali
+++ /dev/null
@@ -1,198 +0,0 @@
-.class public final Lq0/s/a/h;
-.super Ljava/lang/Object;
-.source "RxJavaCallAdapter.java"
-
-# interfaces
-.implements Lq0/c;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lq0/c<",
-        "TR;",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/lang/reflect/Type;
-
-.field public final b:Lrx/Scheduler;
-
-.field public final c:Z
-
-.field public final d:Z
-
-.field public final e:Z
-
-.field public final f:Z
-
-.field public final g:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/reflect/Type;Lrx/Scheduler;ZZZZZ)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/s/a/h;->a:Ljava/lang/reflect/Type;
-
-    iput-object p2, p0, Lq0/s/a/h;->b:Lrx/Scheduler;
-
-    iput-boolean p3, p0, Lq0/s/a/h;->c:Z
-
-    iput-boolean p4, p0, Lq0/s/a/h;->d:Z
-
-    iput-boolean p5, p0, Lq0/s/a/h;->e:Z
-
-    iput-boolean p6, p0, Lq0/s/a/h;->f:Z
-
-    iput-boolean p7, p0, Lq0/s/a/h;->g:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Ljava/lang/reflect/Type;
-    .locals 1
-
-    iget-object v0, p0, Lq0/s/a/h;->a:Ljava/lang/reflect/Type;
-
-    return-object v0
-.end method
-
-.method public b(Lq0/b;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lq0/b<",
-            "TR;>;)",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lq0/s/a/h;->c:Z
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lq0/s/a/d;
-
-    invoke-direct {v0, p1}, Lq0/s/a/d;-><init>(Lq0/b;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lq0/s/a/e;
-
-    invoke-direct {v0, p1}, Lq0/s/a/e;-><init>(Lq0/b;)V
-
-    :goto_0
-    iget-boolean p1, p0, Lq0/s/a/h;->d:Z
-
-    if-eqz p1, :cond_1
-
-    new-instance p1, Lq0/s/a/g;
-
-    invoke-direct {p1, v0}, Lq0/s/a/g;-><init>(Lrx/Observable$a;)V
-
-    :goto_1
-    move-object v0, p1
-
-    goto :goto_2
-
-    :cond_1
-    iget-boolean p1, p0, Lq0/s/a/h;->e:Z
-
-    if-eqz p1, :cond_2
-
-    new-instance p1, Lq0/s/a/a;
-
-    invoke-direct {p1, v0}, Lq0/s/a/a;-><init>(Lrx/Observable$a;)V
-
-    goto :goto_1
-
-    :cond_2
-    :goto_2
-    new-instance p1, Lrx/Observable;
-
-    invoke-static {v0}, Lr0/o/l;->a(Lrx/Observable$a;)Lrx/Observable$a;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
-
-    iget-object v0, p0, Lq0/s/a/h;->b:Lrx/Scheduler;
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->T(Lrx/Scheduler;)Lrx/Observable;
-
-    move-result-object p1
-
-    :cond_3
-    iget-boolean v0, p0, Lq0/s/a/h;->f:Z
-
-    if-eqz v0, :cond_4
-
-    new-instance v0, Lr0/h;
-
-    new-instance v1, Lr0/l/a/h0;
-
-    invoke-direct {v1, p1}, Lr0/l/a/h0;-><init>(Lrx/Observable;)V
-
-    invoke-direct {v0, v1}, Lr0/h;-><init>(Lr0/h$a;)V
-
-    return-object v0
-
-    :cond_4
-    iget-boolean v0, p0, Lq0/s/a/h;->g:Z
-
-    if-eqz v0, :cond_5
-
-    new-instance v0, Lr0/c;
-
-    invoke-direct {v0, p1}, Lr0/c;-><init>(Lrx/Observable;)V
-
-    :try_start_0
-    new-instance p1, Lr0/d;
-
-    invoke-direct {p1, v0}, Lr0/d;-><init>(Lr0/d$a;)V
-    :try_end_0
-    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    return-object p1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    new-instance v0, Ljava/lang/NullPointerException;
-
-    const-string v1, "Actually not, but can\'t pass out an exception otherwise..."
-
-    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Ljava/lang/NullPointerException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw v0
-
-    :catch_0
-    move-exception p1
-
-    throw p1
-
-    :cond_5
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/s/a/i.smali b/com.discord/smali_classes2/q0/s/a/i.smali
deleted file mode 100644
index c86868b92e..0000000000
--- a/com.discord/smali_classes2/q0/s/a/i.smali
+++ /dev/null
@@ -1,252 +0,0 @@
-.class public final Lq0/s/a/i;
-.super Lq0/c$a;
-.source "RxJavaCallAdapterFactory.java"
-
-
-# instance fields
-.field public final a:Lrx/Scheduler;
-
-.field public final b:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Scheduler;Z)V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/c$a;-><init>()V
-
-    const/4 p1, 0x0
-
-    iput-object p1, p0, Lq0/s/a/i;->a:Lrx/Scheduler;
-
-    iput-boolean p2, p0, Lq0/s/a/i;->b:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/c;
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/c<",
-            "**>;"
-        }
-    .end annotation
-
-    invoke-static {p1}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object p2
-
-    const-class p3, Lr0/h;
-
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-ne p2, p3, :cond_0
-
-    const/4 v8, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v8, 0x0
-
-    :goto_0
-    const-class p3, Lr0/d;
-
-    if-ne p2, p3, :cond_1
-
-    const/4 p3, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p3, 0x0
-
-    :goto_1
-    const-class v2, Lrx/Observable;
-
-    if-eq p2, v2, :cond_2
-
-    if-nez v8, :cond_2
-
-    if-nez p3, :cond_2
-
-    const/4 p1, 0x0
-
-    return-object p1
-
-    :cond_2
-    if-eqz p3, :cond_3
-
-    new-instance p1, Lq0/s/a/h;
-
-    const-class v1, Ljava/lang/Void;
-
-    iget-object v2, p0, Lq0/s/a/i;->a:Lrx/Scheduler;
-
-    iget-boolean v3, p0, Lq0/s/a/i;->b:Z
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x1
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
-
-    move-object v0, p1
-
-    invoke-direct/range {v0 .. v7}, Lq0/s/a/h;-><init>(Ljava/lang/reflect/Type;Lrx/Scheduler;ZZZZZ)V
-
-    return-object p1
-
-    :cond_3
-    instance-of p2, p1, Ljava/lang/reflect/ParameterizedType;
-
-    if-nez p2, :cond_5
-
-    if-eqz v8, :cond_4
-
-    const-string p1, "Single"
-
-    goto :goto_2
-
-    :cond_4
-    const-string p1, "Observable"
-
-    :goto_2
-    new-instance p2, Ljava/lang/IllegalStateException;
-
-    new-instance p3, Ljava/lang/StringBuilder;
-
-    invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, " return type must be parameterized as "
-
-    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, "<Foo> or "
-
-    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string p1, "<? extends Foo>"
-
-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p2
-
-    :cond_5
-    check-cast p1, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-static {v1, p1}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lq0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
-
-    move-result-object p2
-
-    const-class p3, Lq0/n;
-
-    if-ne p2, p3, :cond_7
-
-    instance-of p2, p1, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz p2, :cond_6
-
-    check-cast p1, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-static {v1, p1}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    goto :goto_3
-
-    :cond_6
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "Response must be parameterized as Response<Foo> or Response<? extends Foo>"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_7
-    const-class p3, Lq0/s/a/f;
-
-    if-ne p2, p3, :cond_9
-
-    instance-of p2, p1, Ljava/lang/reflect/ParameterizedType;
-
-    if-eqz p2, :cond_8
-
-    check-cast p1, Ljava/lang/reflect/ParameterizedType;
-
-    invoke-static {v1, p1}, Lq0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
-
-    move-result-object p1
-
-    :goto_3
-    move-object v3, p1
-
-    move v6, v0
-
-    const/4 v7, 0x0
-
-    goto :goto_4
-
-    :cond_8
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "Result must be parameterized as Result<Foo> or Result<? extends Foo>"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_9
-    move-object v3, p1
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x1
-
-    :goto_4
-    new-instance p1, Lq0/s/a/h;
-
-    iget-object v4, p0, Lq0/s/a/i;->a:Lrx/Scheduler;
-
-    iget-boolean v5, p0, Lq0/s/a/i;->b:Z
-
-    const/4 v9, 0x0
-
-    move-object v2, p1
-
-    invoke-direct/range {v2 .. v9}, Lq0/s/a/h;-><init>(Ljava/lang/reflect/Type;Lrx/Scheduler;ZZZZZ)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/a/a.smali b/com.discord/smali_classes2/q0/t/a/a.smali
deleted file mode 100644
index 24d0a0f568..0000000000
--- a/com.discord/smali_classes2/q0/t/a/a.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.class public final Lq0/t/a/a;
-.super Lq0/e$a;
-.source "GsonConverterFactory.java"
-
-
-# instance fields
-.field public final a:Lcom/google/gson/Gson;
-
-
-# direct methods
-.method public constructor <init>(Lcom/google/gson/Gson;)V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/e$a;-><init>()V
-
-    iput-object p1, p0, Lq0/t/a/a;->a:Lcom/google/gson/Gson;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "*",
-            "Lokhttp3/RequestBody;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object p2, p0, Lq0/t/a/a;->a:Lcom/google/gson/Gson;
-
-    invoke-static {p1}, Lcom/google/gson/reflect/TypeToken;->get(Ljava/lang/reflect/Type;)Lcom/google/gson/reflect/TypeToken;
-
-    move-result-object p1
-
-    invoke-virtual {p2, p1}, Lcom/google/gson/Gson;->g(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;
-
-    move-result-object p1
-
-    new-instance p2, Lq0/t/a/b;
-
-    iget-object p3, p0, Lq0/t/a/a;->a:Lcom/google/gson/Gson;
-
-    invoke-direct {p2, p3, p1}, Lq0/t/a/b;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
-
-    return-object p2
-.end method
-
-.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "Lokhttp3/ResponseBody;",
-            "*>;"
-        }
-    .end annotation
-
-    iget-object p2, p0, Lq0/t/a/a;->a:Lcom/google/gson/Gson;
-
-    invoke-static {p1}, Lcom/google/gson/reflect/TypeToken;->get(Ljava/lang/reflect/Type;)Lcom/google/gson/reflect/TypeToken;
-
-    move-result-object p1
-
-    invoke-virtual {p2, p1}, Lcom/google/gson/Gson;->g(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;
-
-    move-result-object p1
-
-    new-instance p2, Lq0/t/a/c;
-
-    iget-object p3, p0, Lq0/t/a/a;->a:Lcom/google/gson/Gson;
-
-    invoke-direct {p2, p3, p1}, Lq0/t/a/c;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
-
-    return-object p2
-.end method
diff --git a/com.discord/smali_classes2/q0/t/a/b.smali b/com.discord/smali_classes2/q0/t/a/b.smali
deleted file mode 100644
index 46aeef40da..0000000000
--- a/com.discord/smali_classes2/q0/t/a/b.smali
+++ /dev/null
@@ -1,133 +0,0 @@
-.class public final Lq0/t/a/b;
-.super Ljava/lang/Object;
-.source "GsonRequestBodyConverter.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "TT;",
-        "Lokhttp3/RequestBody;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:Lokhttp3/MediaType;
-
-.field public static final d:Ljava/nio/charset/Charset;
-
-
-# instance fields
-.field public final a:Lcom/google/gson/Gson;
-
-.field public final b:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const-string v0, "application/json; charset=UTF-8"
-
-    invoke-static {v0}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
-
-    move-result-object v0
-
-    sput-object v0, Lq0/t/a/b;->c:Lokhttp3/MediaType;
-
-    const-string v0, "UTF-8"
-
-    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
-
-    move-result-object v0
-
-    sput-object v0, Lq0/t/a/b;->d:Ljava/nio/charset/Charset;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/google/gson/Gson;",
-            "Lcom/google/gson/TypeAdapter<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/t/a/b;->a:Lcom/google/gson/Gson;
-
-    iput-object p2, p0, Lq0/t/a/b;->b:Lcom/google/gson/TypeAdapter;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    new-instance v0, Lo0/e;
-
-    invoke-direct {v0}, Lo0/e;-><init>()V
-
-    new-instance v1, Ljava/io/OutputStreamWriter;
-
-    new-instance v2, Lo0/f;
-
-    invoke-direct {v2, v0}, Lo0/f;-><init>(Lo0/e;)V
-
-    sget-object v3, Lq0/t/a/b;->d:Ljava/nio/charset/Charset;
-
-    invoke-direct {v1, v2, v3}, Ljava/io/OutputStreamWriter;-><init>(Ljava/io/OutputStream;Ljava/nio/charset/Charset;)V
-
-    iget-object v2, p0, Lq0/t/a/b;->a:Lcom/google/gson/Gson;
-
-    invoke-virtual {v2, v1}, Lcom/google/gson/Gson;->j(Ljava/io/Writer;)Lcom/google/gson/stream/JsonWriter;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lq0/t/a/b;->b:Lcom/google/gson/TypeAdapter;
-
-    invoke-virtual {v2, v1, p1}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
-
-    invoke-virtual {v1}, Lcom/google/gson/stream/JsonWriter;->close()V
-
-    sget-object p1, Lq0/t/a/b;->c:Lokhttp3/MediaType;
-
-    invoke-virtual {v0}, Lo0/e;->n()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-static {p1, v0}, Lokhttp3/RequestBody;->create(Lokhttp3/MediaType;Lokio/ByteString;)Lokhttp3/RequestBody;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/a/c.smali b/com.discord/smali_classes2/q0/t/a/c.smali
deleted file mode 100644
index 97bd15c56f..0000000000
--- a/com.discord/smali_classes2/q0/t/a/c.smali
+++ /dev/null
@@ -1,132 +0,0 @@
-.class public final Lq0/t/a/c;
-.super Ljava/lang/Object;
-.source "GsonResponseBodyConverter.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lcom/google/gson/Gson;
-
-.field public final b:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/google/gson/Gson;",
-            "Lcom/google/gson/TypeAdapter<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lq0/t/a/c;->a:Lcom/google/gson/Gson;
-
-    iput-object p2, p0, Lq0/t/a/c;->b:Lcom/google/gson/TypeAdapter;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 5
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    iget-object v0, p0, Lq0/t/a/c;->a:Lcom/google/gson/Gson;
-
-    iget-object v1, p1, Lokhttp3/ResponseBody;->d:Ljava/io/Reader;
-
-    if-eqz v1, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    new-instance v1, Lokhttp3/ResponseBody$a;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->c()Lo0/g;
-
-    move-result-object v2
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_1
-
-    sget-object v4, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    invoke-virtual {v3, v4}, Lokhttp3/MediaType;->a(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v3, Lj0/t/a;->a:Ljava/nio/charset/Charset;
-
-    :goto_0
-    invoke-direct {v1, v2, v3}, Lokhttp3/ResponseBody$a;-><init>(Lo0/g;Ljava/nio/charset/Charset;)V
-
-    iput-object v1, p1, Lokhttp3/ResponseBody;->d:Ljava/io/Reader;
-
-    :goto_1
-    invoke-virtual {v0, v1}, Lcom/google/gson/Gson;->i(Ljava/io/Reader;)Lcom/google/gson/stream/JsonReader;
-
-    move-result-object v0
-
-    :try_start_0
-    iget-object v1, p0, Lq0/t/a/c;->b:Lcom/google/gson/TypeAdapter;
-
-    invoke-virtual {v1, v0}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/a.smali b/com.discord/smali_classes2/q0/t/b/a.smali
deleted file mode 100644
index 4c02ec77c1..0000000000
--- a/com.discord/smali_classes2/q0/t/b/a.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.class public final Lq0/t/b/a;
-.super Ljava/lang/Object;
-.source "ScalarRequestBodyConverter.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "TT;",
-        "Lokhttp3/RequestBody;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lq0/t/b/a<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final b:Lokhttp3/MediaType;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/a;
-
-    invoke-direct {v0}, Lq0/t/b/a;-><init>()V
-
-    sput-object v0, Lq0/t/b/a;->a:Lq0/t/b/a;
-
-    const-string v0, "text/plain; charset=UTF-8"
-
-    invoke-static {v0}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
-
-    move-result-object v0
-
-    sput-object v0, Lq0/t/b/a;->b:Lokhttp3/MediaType;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    sget-object v0, Lq0/t/b/a;->b:Lokhttp3/MediaType;
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {v0, p1}, Lokhttp3/RequestBody;->create(Lokhttp3/MediaType;Ljava/lang/String;)Lokhttp3/RequestBody;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/b.smali b/com.discord/smali_classes2/q0/t/b/b.smali
deleted file mode 100644
index 84f80938e2..0000000000
--- a/com.discord/smali_classes2/q0/t/b/b.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lq0/t/b/b;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/b;
-
-    invoke-direct {v0}, Lq0/t/b/b;-><init>()V
-
-    sput-object v0, Lq0/t/b/b;->a:Lq0/t/b/b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Ljava/lang/String;)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/c.smali b/com.discord/smali_classes2/q0/t/b/c.smali
deleted file mode 100644
index 66ab7afd21..0000000000
--- a/com.discord/smali_classes2/q0/t/b/c.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lq0/t/b/c;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Byte;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/c;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/c;
-
-    invoke-direct {v0}, Lq0/t/b/c;-><init>()V
-
-    sput-object v0, Lq0/t/b/c;->a:Lq0/t/b/c;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ljava/lang/Byte;->valueOf(Ljava/lang/String;)Ljava/lang/Byte;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/d.smali b/com.discord/smali_classes2/q0/t/b/d.smali
deleted file mode 100644
index 32af2adbf1..0000000000
--- a/com.discord/smali_classes2/q0/t/b/d.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final Lq0/t/b/d;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Character;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/d;
-
-    invoke-direct {v0}, Lq0/t/b/d;-><init>()V
-
-    sput-object v0, Lq0/t/b/d;->a:Lq0/t/b/d;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance v0, Ljava/io/IOException;
-
-    const-string v1, "Expected body of length 1 for Character conversion but was "
-
-    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Ljava/lang/String;->length()I
-
-    move-result p1
-
-    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/e.smali b/com.discord/smali_classes2/q0/t/b/e.smali
deleted file mode 100644
index bc8687eddd..0000000000
--- a/com.discord/smali_classes2/q0/t/b/e.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lq0/t/b/e;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Double;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/e;
-
-    invoke-direct {v0}, Lq0/t/b/e;-><init>()V
-
-    sput-object v0, Lq0/t/b/e;->a:Lq0/t/b/e;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ljava/lang/Double;->valueOf(Ljava/lang/String;)Ljava/lang/Double;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/f.smali b/com.discord/smali_classes2/q0/t/b/f.smali
deleted file mode 100644
index 03ce3ae484..0000000000
--- a/com.discord/smali_classes2/q0/t/b/f.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lq0/t/b/f;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Float;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/f;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/f;
-
-    invoke-direct {v0}, Lq0/t/b/f;-><init>()V
-
-    sput-object v0, Lq0/t/b/f;->a:Lq0/t/b/f;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ljava/lang/Float;->valueOf(Ljava/lang/String;)Ljava/lang/Float;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/g.smali b/com.discord/smali_classes2/q0/t/b/g.smali
deleted file mode 100644
index d205d9b2c9..0000000000
--- a/com.discord/smali_classes2/q0/t/b/g.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lq0/t/b/g;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Integer;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/g;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/g;
-
-    invoke-direct {v0}, Lq0/t/b/g;-><init>()V
-
-    sput-object v0, Lq0/t/b/g;->a:Lq0/t/b/g;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(Ljava/lang/String;)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/h.smali b/com.discord/smali_classes2/q0/t/b/h.smali
deleted file mode 100644
index 6a91c97f8b..0000000000
--- a/com.discord/smali_classes2/q0/t/b/h.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lq0/t/b/h;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Long;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/h;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/h;
-
-    invoke-direct {v0}, Lq0/t/b/h;-><init>()V
-
-    sput-object v0, Lq0/t/b/h;->a:Lq0/t/b/h;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ljava/lang/Long;->valueOf(Ljava/lang/String;)Ljava/lang/Long;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/i.smali b/com.discord/smali_classes2/q0/t/b/i.smali
deleted file mode 100644
index 3a45aaba8f..0000000000
--- a/com.discord/smali_classes2/q0/t/b/i.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public final Lq0/t/b/i;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/Short;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/i;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/i;
-
-    invoke-direct {v0}, Lq0/t/b/i;-><init>()V
-
-    sput-object v0, Lq0/t/b/i;->a:Lq0/t/b/i;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1}, Ljava/lang/Short;->valueOf(Ljava/lang/String;)Ljava/lang/Short;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/j.smali b/com.discord/smali_classes2/q0/t/b/j.smali
deleted file mode 100644
index 3f4d7c5ffe..0000000000
--- a/com.discord/smali_classes2/q0/t/b/j.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lq0/t/b/j;
-.super Ljava/lang/Object;
-.source "ScalarResponseBodyConverters.java"
-
-# interfaces
-.implements Lq0/e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lq0/e<",
-        "Lokhttp3/ResponseBody;",
-        "Ljava/lang/String;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lq0/t/b/j;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lq0/t/b/j;
-
-    invoke-direct {v0}, Lq0/t/b/j;-><init>()V
-
-    sput-object v0, Lq0/t/b/j;->a:Lq0/t/b/j;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    check-cast p1, Lokhttp3/ResponseBody;
-
-    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/t/b/k.smali b/com.discord/smali_classes2/q0/t/b/k.smali
deleted file mode 100644
index ad75a4ecba..0000000000
--- a/com.discord/smali_classes2/q0/t/b/k.smali
+++ /dev/null
@@ -1,282 +0,0 @@
-.class public final Lq0/t/b/k;
-.super Lq0/e$a;
-.source "ScalarsConverterFactory.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lq0/e$a;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "*",
-            "Lokhttp3/RequestBody;",
-            ">;"
-        }
-    .end annotation
-
-    const-class p2, Ljava/lang/String;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Boolean;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Byte;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Character;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Double;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Float;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Integer;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Long;
-
-    if-eq p1, p2, :cond_1
-
-    sget-object p2, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
-
-    if-eq p1, p2, :cond_1
-
-    const-class p2, Ljava/lang/Short;
-
-    if-ne p1, p2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return-object p1
-
-    :cond_1
-    :goto_0
-    sget-object p1, Lq0/t/b/a;->a:Lq0/t/b/a;
-
-    return-object p1
-.end method
-
-.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lq0/p;)Lq0/e;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/reflect/Type;",
-            "[",
-            "Ljava/lang/annotation/Annotation;",
-            "Lq0/p;",
-            ")",
-            "Lq0/e<",
-            "Lokhttp3/ResponseBody;",
-            "*>;"
-        }
-    .end annotation
-
-    const-class p2, Ljava/lang/String;
-
-    if-ne p1, p2, :cond_0
-
-    sget-object p1, Lq0/t/b/j;->a:Lq0/t/b/j;
-
-    return-object p1
-
-    :cond_0
-    const-class p2, Ljava/lang/Boolean;
-
-    if-eq p1, p2, :cond_10
-
-    sget-object p2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_1
-
-    goto :goto_7
-
-    :cond_1
-    const-class p2, Ljava/lang/Byte;
-
-    if-eq p1, p2, :cond_f
-
-    sget-object p2, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_2
-
-    goto :goto_6
-
-    :cond_2
-    const-class p2, Ljava/lang/Character;
-
-    if-eq p1, p2, :cond_e
-
-    sget-object p2, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_3
-
-    goto :goto_5
-
-    :cond_3
-    const-class p2, Ljava/lang/Double;
-
-    if-eq p1, p2, :cond_d
-
-    sget-object p2, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    const-class p2, Ljava/lang/Float;
-
-    if-eq p1, p2, :cond_c
-
-    sget-object p2, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    const-class p2, Ljava/lang/Integer;
-
-    if-eq p1, p2, :cond_b
-
-    sget-object p2, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_6
-
-    goto :goto_2
-
-    :cond_6
-    const-class p2, Ljava/lang/Long;
-
-    if-eq p1, p2, :cond_a
-
-    sget-object p2, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_7
-
-    goto :goto_1
-
-    :cond_7
-    const-class p2, Ljava/lang/Short;
-
-    if-eq p1, p2, :cond_9
-
-    sget-object p2, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
-
-    if-ne p1, p2, :cond_8
-
-    goto :goto_0
-
-    :cond_8
-    const/4 p1, 0x0
-
-    return-object p1
-
-    :cond_9
-    :goto_0
-    sget-object p1, Lq0/t/b/i;->a:Lq0/t/b/i;
-
-    return-object p1
-
-    :cond_a
-    :goto_1
-    sget-object p1, Lq0/t/b/h;->a:Lq0/t/b/h;
-
-    return-object p1
-
-    :cond_b
-    :goto_2
-    sget-object p1, Lq0/t/b/g;->a:Lq0/t/b/g;
-
-    return-object p1
-
-    :cond_c
-    :goto_3
-    sget-object p1, Lq0/t/b/f;->a:Lq0/t/b/f;
-
-    return-object p1
-
-    :cond_d
-    :goto_4
-    sget-object p1, Lq0/t/b/e;->a:Lq0/t/b/e;
-
-    return-object p1
-
-    :cond_e
-    :goto_5
-    sget-object p1, Lq0/t/b/d;->a:Lq0/t/b/d;
-
-    return-object p1
-
-    :cond_f
-    :goto_6
-    sget-object p1, Lq0/t/b/c;->a:Lq0/t/b/c;
-
-    return-object p1
-
-    :cond_10
-    :goto_7
-    sget-object p1, Lq0/t/b/b;->a:Lq0/t/b/b;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/q0/u/a.smali b/com.discord/smali_classes2/q0/u/a.smali
deleted file mode 100644
index bd9516621a..0000000000
--- a/com.discord/smali_classes2/q0/u/a.smali
+++ /dev/null
@@ -1,21 +0,0 @@
-.class public interface abstract annotation Lq0/u/a;
-.super Ljava/lang/Object;
-.source "Body.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/q0/u/b.smali b/com.discord/smali_classes2/q0/u/b.smali
deleted file mode 100644
index 1892ee2a31..0000000000
--- a/com.discord/smali_classes2/q0/u/b.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/b;
-.super Ljava/lang/Object;
-.source "DELETE.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/b;
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/c.smali b/com.discord/smali_classes2/q0/u/c.smali
deleted file mode 100644
index f52305bd5b..0000000000
--- a/com.discord/smali_classes2/q0/u/c.smali
+++ /dev/null
@@ -1,35 +0,0 @@
-.class public interface abstract annotation Lq0/u/c;
-.super Ljava/lang/Object;
-.source "Field.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/c;
-        encoded = false
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoded()Z
-.end method
-
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/d.smali b/com.discord/smali_classes2/q0/u/d.smali
deleted file mode 100644
index 5e961ab431..0000000000
--- a/com.discord/smali_classes2/q0/u/d.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/d;
-.super Ljava/lang/Object;
-.source "FieldMap.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/d;
-        encoded = false
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoded()Z
-.end method
diff --git a/com.discord/smali_classes2/q0/u/e.smali b/com.discord/smali_classes2/q0/u/e.smali
deleted file mode 100644
index 36ae008d74..0000000000
--- a/com.discord/smali_classes2/q0/u/e.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/e;
-.super Ljava/lang/Object;
-.source "GET.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/e;
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/f.smali b/com.discord/smali_classes2/q0/u/f.smali
deleted file mode 100644
index fd48d874ef..0000000000
--- a/com.discord/smali_classes2/q0/u/f.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/f;
-.super Ljava/lang/Object;
-.source "HEAD.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/f;
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/g.smali b/com.discord/smali_classes2/q0/u/g.smali
deleted file mode 100644
index 7ea57e42cf..0000000000
--- a/com.discord/smali_classes2/q0/u/g.smali
+++ /dev/null
@@ -1,39 +0,0 @@
-.class public interface abstract annotation Lq0/u/g;
-.super Ljava/lang/Object;
-.source "HTTP.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/g;
-        hasBody = false
-        path = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract hasBody()Z
-.end method
-
-.method public abstract method()Ljava/lang/String;
-.end method
-
-.method public abstract path()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/h.smali b/com.discord/smali_classes2/q0/u/h.smali
deleted file mode 100644
index 03b200e5ac..0000000000
--- a/com.discord/smali_classes2/q0/u/h.smali
+++ /dev/null
@@ -1,26 +0,0 @@
-.class public interface abstract annotation Lq0/u/h;
-.super Ljava/lang/Object;
-.source "Header.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/i.smali b/com.discord/smali_classes2/q0/u/i.smali
deleted file mode 100644
index 295c71b683..0000000000
--- a/com.discord/smali_classes2/q0/u/i.smali
+++ /dev/null
@@ -1,26 +0,0 @@
-.class public interface abstract annotation Lq0/u/i;
-.super Ljava/lang/Object;
-.source "Headers.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()[Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/j.smali b/com.discord/smali_classes2/q0/u/j.smali
deleted file mode 100644
index 77bbeec450..0000000000
--- a/com.discord/smali_classes2/q0/u/j.smali
+++ /dev/null
@@ -1,21 +0,0 @@
-.class public interface abstract annotation Lq0/u/j;
-.super Ljava/lang/Object;
-.source "Multipart.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/q0/u/k.smali b/com.discord/smali_classes2/q0/u/k.smali
deleted file mode 100644
index e3483684d1..0000000000
--- a/com.discord/smali_classes2/q0/u/k.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/k;
-.super Ljava/lang/Object;
-.source "OPTIONS.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/k;
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/l.smali b/com.discord/smali_classes2/q0/u/l.smali
deleted file mode 100644
index 57a795d327..0000000000
--- a/com.discord/smali_classes2/q0/u/l.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/l;
-.super Ljava/lang/Object;
-.source "PATCH.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/l;
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/m.smali b/com.discord/smali_classes2/q0/u/m.smali
deleted file mode 100644
index ebf37c891a..0000000000
--- a/com.discord/smali_classes2/q0/u/m.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/m;
-.super Ljava/lang/Object;
-.source "POST.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/m;
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/n.smali b/com.discord/smali_classes2/q0/u/n.smali
deleted file mode 100644
index 1cbb4b74c2..0000000000
--- a/com.discord/smali_classes2/q0/u/n.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/n;
-.super Ljava/lang/Object;
-.source "PUT.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/n;
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/o.smali b/com.discord/smali_classes2/q0/u/o.smali
deleted file mode 100644
index 183add3cb1..0000000000
--- a/com.discord/smali_classes2/q0/u/o.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public interface abstract annotation Lq0/u/o;
-.super Ljava/lang/Object;
-.source "Part.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/o;
-        encoding = "binary"
-        value = ""
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoding()Ljava/lang/String;
-.end method
-
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/p.smali b/com.discord/smali_classes2/q0/u/p.smali
deleted file mode 100644
index f566108304..0000000000
--- a/com.discord/smali_classes2/q0/u/p.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/p;
-.super Ljava/lang/Object;
-.source "PartMap.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/p;
-        encoding = "binary"
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoding()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/q.smali b/com.discord/smali_classes2/q0/u/q.smali
deleted file mode 100644
index 0b507f0146..0000000000
--- a/com.discord/smali_classes2/q0/u/q.smali
+++ /dev/null
@@ -1,35 +0,0 @@
-.class public interface abstract annotation Lq0/u/q;
-.super Ljava/lang/Object;
-.source "Path.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/q;
-        encoded = false
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoded()Z
-.end method
-
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/r.smali b/com.discord/smali_classes2/q0/u/r.smali
deleted file mode 100644
index 31364db147..0000000000
--- a/com.discord/smali_classes2/q0/u/r.smali
+++ /dev/null
@@ -1,35 +0,0 @@
-.class public interface abstract annotation Lq0/u/r;
-.super Ljava/lang/Object;
-.source "Query.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/r;
-        encoded = false
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoded()Z
-.end method
-
-.method public abstract value()Ljava/lang/String;
-.end method
diff --git a/com.discord/smali_classes2/q0/u/s.smali b/com.discord/smali_classes2/q0/u/s.smali
deleted file mode 100644
index 91d9acc672..0000000000
--- a/com.discord/smali_classes2/q0/u/s.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/s;
-.super Ljava/lang/Object;
-.source "QueryMap.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/s;
-        encoded = false
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoded()Z
-.end method
diff --git a/com.discord/smali_classes2/q0/u/t.smali b/com.discord/smali_classes2/q0/u/t.smali
deleted file mode 100644
index 40b1df343d..0000000000
--- a/com.discord/smali_classes2/q0/u/t.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public interface abstract annotation Lq0/u/t;
-.super Ljava/lang/Object;
-.source "QueryName.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation system Ldalvik/annotation/AnnotationDefault;
-    value = .subannotation Lq0/u/t;
-        encoded = false
-    .end subannotation
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract encoded()Z
-.end method
diff --git a/com.discord/smali_classes2/q0/u/u.smali b/com.discord/smali_classes2/q0/u/u.smali
deleted file mode 100644
index 9318495052..0000000000
--- a/com.discord/smali_classes2/q0/u/u.smali
+++ /dev/null
@@ -1,21 +0,0 @@
-.class public interface abstract annotation Lq0/u/u;
-.super Ljava/lang/Object;
-.source "Streaming.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/q0/u/v.smali b/com.discord/smali_classes2/q0/u/v.smali
deleted file mode 100644
index 8fb4bcdd97..0000000000
--- a/com.discord/smali_classes2/q0/u/v.smali
+++ /dev/null
@@ -1,21 +0,0 @@
-.class public interface abstract annotation Lq0/u/v;
-.super Ljava/lang/Object;
-.source "Url.java"
-
-# interfaces
-.implements Ljava/lang/annotation/Annotation;
-
-
-# annotations
-.annotation runtime Ljava/lang/annotation/Documented;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Retention;
-    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
-.end annotation
-
-.annotation runtime Ljava/lang/annotation/Target;
-    value = {
-        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/r0/a$a.smali b/com.discord/smali_classes2/r0/a$a.smali
index c5b9dfc685..b60c7034d8 100644
--- a/com.discord/smali_classes2/r0/a$a.smali
+++ b/com.discord/smali_classes2/r0/a$a.smali
@@ -1,9 +1,9 @@
 .class public final Lr0/a$a;
 .super Ljava/lang/Object;
-.source "BackpressureOverflow.java"
+.source "BuiltInConverters.java"
 
 # interfaces
-.implements Lr0/a$b;
+.implements Lr0/e;
 
 
 # annotations
@@ -16,6 +16,16 @@
     name = "a"
 .end annotation
 
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Lokhttp3/ResponseBody;",
+        ">;"
+    }
+.end annotation
+
 
 # static fields
 .field public static final a:Lr0/a$a;
@@ -44,19 +54,31 @@
 
 
 # virtual methods
-.method public a()Z
-    .locals 2
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
-            Lrx/exceptions/MissingBackpressureException;
+            Ljava/io/IOException;
         }
     .end annotation
 
-    new-instance v0, Lrx/exceptions/MissingBackpressureException;
+    check-cast p1, Lokhttp3/ResponseBody;
 
-    const-string v1, "Overflowed buffer"
+    :try_start_0
+    invoke-static {p1}, Lr0/r;->a(Lokhttp3/ResponseBody;)Lokhttp3/ResponseBody;
 
-    invoke-direct {v0, v1}, Lrx/exceptions/MissingBackpressureException;-><init>(Ljava/lang/String;)V
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
 
     throw v0
 .end method
diff --git a/com.discord/smali_classes2/r0/a$b.smali b/com.discord/smali_classes2/r0/a$b.smali
index 70ceb99b0b..bb63d2a21d 100644
--- a/com.discord/smali_classes2/r0/a$b.smali
+++ b/com.discord/smali_classes2/r0/a$b.smali
@@ -1,6 +1,9 @@
-.class public interface abstract Lr0/a$b;
+.class public final Lr0/a$b;
 .super Ljava/lang/Object;
-.source "BackpressureOverflow.java"
+.source "BuiltInConverters.java"
+
+# interfaces
+.implements Lr0/e;
 
 
 # annotations
@@ -9,16 +12,57 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
+    accessFlags = 0x19
     name = "b"
 .end annotation
 
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/RequestBody;",
+        "Lokhttp3/RequestBody;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/a$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/a$b;
+
+    invoke-direct {v0}, Lr0/a$b;-><init>()V
+
+    sput-object v0, Lr0/a$b;->a:Lr0/a$b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
 
 # virtual methods
-.method public abstract a()Z
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
-            Lrx/exceptions/MissingBackpressureException;
+            Ljava/io/IOException;
         }
     .end annotation
+
+    check-cast p1, Lokhttp3/RequestBody;
+
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/r0/a$c.smali b/com.discord/smali_classes2/r0/a$c.smali
new file mode 100644
index 0000000000..0131723b38
--- /dev/null
+++ b/com.discord/smali_classes2/r0/a$c.smali
@@ -0,0 +1,68 @@
+.class public final Lr0/a$c;
+.super Ljava/lang/Object;
+.source "BuiltInConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Lokhttp3/ResponseBody;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/a$c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/a$c;
+
+    invoke-direct {v0}, Lr0/a$c;-><init>()V
+
+    sput-object v0, Lr0/a$c;->a:Lr0/a$c;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/a$d.smali b/com.discord/smali_classes2/r0/a$d.smali
new file mode 100644
index 0000000000..90d8c3d465
--- /dev/null
+++ b/com.discord/smali_classes2/r0/a$d.smali
@@ -0,0 +1,70 @@
+.class public final Lr0/a$d;
+.super Ljava/lang/Object;
+.source "BuiltInConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "d"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Ljava/lang/Object;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/a$d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/a$d;
+
+    invoke-direct {v0}, Lr0/a$d;-><init>()V
+
+    sput-object v0, Lr0/a$d;->a:Lr0/a$d;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/a$e.smali b/com.discord/smali_classes2/r0/a$e.smali
new file mode 100644
index 0000000000..bca010b33e
--- /dev/null
+++ b/com.discord/smali_classes2/r0/a$e.smali
@@ -0,0 +1,72 @@
+.class public final Lr0/a$e;
+.super Ljava/lang/Object;
+.source "BuiltInConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "e"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Void;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/a$e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/a$e;
+
+    invoke-direct {v0}, Lr0/a$e;-><init>()V
+
+    sput-object v0, Lr0/a$e;->a:Lr0/a$e;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/a.smali b/com.discord/smali_classes2/r0/a.smali
index 9b364b2ab1..8af4f393bc 100644
--- a/com.discord/smali_classes2/r0/a.smali
+++ b/com.discord/smali_classes2/r0/a.smali
@@ -1,32 +1,145 @@
 .class public final Lr0/a;
-.super Ljava/lang/Object;
-.source "BackpressureOverflow.java"
+.super Lr0/e$a;
+.source "BuiltInConverters.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lr0/a$d;,
         Lr0/a$a;,
-        Lr0/a$b;
+        Lr0/a$c;,
+        Lr0/a$b;,
+        Lr0/a$e;
     }
 .end annotation
 
 
-# static fields
-.field public static final a:Lr0/a$b;
-
-.field public static final b:Lr0/a$b;
-
-
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 1
+.method public constructor <init>()V
+    .locals 0
 
-    sget-object v0, Lr0/a$a;->a:Lr0/a$a;
-
-    sput-object v0, Lr0/a;->a:Lr0/a$b;
-
-    sput-object v0, Lr0/a;->b:Lr0/a$b;
+    invoke-direct {p0}, Lr0/e$a;-><init>()V
 
     return-void
 .end method
+
+
+# virtual methods
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "*",
+            "Lokhttp3/RequestBody;",
+            ">;"
+        }
+    .end annotation
+
+    const-class p2, Lokhttp3/RequestBody;
+
+    invoke-static {p1}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    sget-object p1, Lr0/a$b;->a:Lr0/a$b;
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "Lokhttp3/ResponseBody;",
+            "*>;"
+        }
+    .end annotation
+
+    const-class p3, Lokhttp3/ResponseBody;
+
+    if-ne p1, p3, :cond_3
+
+    const-class p1, Lr0/u/u;
+
+    array-length p3, p2
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, p3, :cond_1
+
+    aget-object v2, p2, v1
+
+    invoke-virtual {p1, v2}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
+    if-eqz v0, :cond_2
+
+    sget-object p1, Lr0/a$c;->a:Lr0/a$c;
+
+    goto :goto_2
+
+    :cond_2
+    sget-object p1, Lr0/a$a;->a:Lr0/a$a;
+
+    :goto_2
+    return-object p1
+
+    :cond_3
+    const-class p2, Ljava/lang/Void;
+
+    if-ne p1, p2, :cond_4
+
+    sget-object p1, Lr0/a$e;->a:Lr0/a$e;
+
+    return-object p1
+
+    :cond_4
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/b.smali b/com.discord/smali_classes2/r0/b.smali
index 31fdb03dd3..7bc98c49e2 100644
--- a/com.discord/smali_classes2/r0/b.smali
+++ b/com.discord/smali_classes2/r0/b.smali
@@ -1,57 +1,62 @@
-.class public Lr0/b;
-.super Lrx/Subscriber;
-.source "Completable.java"
+.class public interface abstract Lr0/b;
+.super Ljava/lang/Object;
+.source "Call.java"
+
+# interfaces
+.implements Ljava/lang/Cloneable;
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lrx/Subscriber<",
+        "<T:",
         "Ljava/lang/Object;",
-        ">;"
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Cloneable;"
     }
 .end annotation
 
 
-# instance fields
-.field public final synthetic d:Lr0/e;
-
-
-# direct methods
-.method public constructor <init>(Lr0/c;Lr0/e;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/b;->d:Lr0/e;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
 # virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/b;->d:Lr0/e;
-
-    invoke-interface {v0}, Lr0/e;->onCompleted()V
-
-    return-void
+.method public abstract Z(Lr0/d;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/d<",
+            "TT;>;)V"
+        }
+    .end annotation
 .end method
 
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/b;->d:Lr0/e;
-
-    invoke-interface {v0, p1}, Lr0/e;->onError(Ljava/lang/Throwable;)V
-
-    return-void
+.method public abstract cancel()V
 .end method
 
-.method public onNext(Ljava/lang/Object;)V
-    .locals 0
-
-    return-void
+.method public abstract e0()Lr0/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lr0/b<",
+            "TT;>;"
+        }
+    .end annotation
+.end method
+
+.method public abstract execute()Lr0/n;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lr0/n<",
+            "TT;>;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract k()Z
 .end method
diff --git a/com.discord/smali_classes2/r0/c$a.smali b/com.discord/smali_classes2/r0/c$a.smali
new file mode 100644
index 0000000000..0069011410
--- /dev/null
+++ b/com.discord/smali_classes2/r0/c$a.smali
@@ -0,0 +1,41 @@
+.class public abstract Lr0/c$a;
+.super Ljava/lang/Object;
+.source "CallAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/c<",
+            "**>;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/r0/c.smali b/com.discord/smali_classes2/r0/c.smali
index 2e447c5ad8..92cf7bc8f7 100644
--- a/com.discord/smali_classes2/r0/c.smali
+++ b/com.discord/smali_classes2/r0/c.smali
@@ -1,42 +1,37 @@
-.class public final Lr0/c;
+.class public interface abstract Lr0/c;
 .super Ljava/lang/Object;
-.source "Completable.java"
-
-# interfaces
-.implements Lr0/d$a;
+.source "CallAdapter.java"
 
 
-# instance fields
-.field public final synthetic d:Lrx/Observable;
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/c$a;
+    }
+.end annotation
 
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/c;->d:Lrx/Observable;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        "T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
 
 
 # virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 1
-
-    check-cast p1, Lr0/e;
-
-    new-instance v0, Lr0/b;
-
-    invoke-direct {v0, p0, p1}, Lr0/b;-><init>(Lr0/c;Lr0/e;)V
-
-    invoke-interface {p1, v0}, Lr0/e;->a(Lrx/Subscription;)V
-
-    iget-object p1, p0, Lr0/c;->d:Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
+.method public abstract a()Ljava/lang/reflect/Type;
+.end method
+
+.method public abstract b(Lr0/b;)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TR;>;)TT;"
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali_classes2/r0/d$a.smali b/com.discord/smali_classes2/r0/d$a.smali
deleted file mode 100644
index 6ffe71c915..0000000000
--- a/com.discord/smali_classes2/r0/d$a.smali
+++ /dev/null
@@ -1,26 +0,0 @@
-.class public interface abstract Lr0/d$a;
-.super Ljava/lang/Object;
-.source "Completable.java"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Lr0/e;",
-        ">;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/r0/d.smali b/com.discord/smali_classes2/r0/d.smali
index 459e8325b1..d0a81d3518 100644
--- a/com.discord/smali_classes2/r0/d.smali
+++ b/com.discord/smali_classes2/r0/d.smali
@@ -1,32 +1,40 @@
-.class public Lr0/d;
+.class public interface abstract Lr0/d;
 .super Ljava/lang/Object;
-.source "Completable.java"
+.source "Callback.java"
 
 
 # annotations
-.annotation system Ldalvik/annotation/MemberClasses;
+.annotation system Ldalvik/annotation/Signature;
     value = {
-        Lr0/d$a;
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
     }
 .end annotation
 
 
-# direct methods
-.method public constructor <init>(Lr0/d$a;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lr0/o/l;->d:Lr0/k/b;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lr0/d$a;
-
-    :cond_0
-    return-void
+# virtual methods
+.method public abstract a(Lr0/b;Ljava/lang/Throwable;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;",
+            "Ljava/lang/Throwable;",
+            ")V"
+        }
+    .end annotation
+.end method
+
+.method public abstract b(Lr0/b;Lr0/n;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;",
+            "Lr0/n<",
+            "TT;>;)V"
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali_classes2/r0/e$a.smali b/com.discord/smali_classes2/r0/e$a.smali
new file mode 100644
index 0000000000..47bbb7c410
--- /dev/null
+++ b/com.discord/smali_classes2/r0/e$a.smali
@@ -0,0 +1,71 @@
+.class public abstract Lr0/e$a;
+.super Ljava/lang/Object;
+.source "Converter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "*",
+            "Lokhttp3/RequestBody;",
+            ">;"
+        }
+    .end annotation
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
+
+.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "Lokhttp3/ResponseBody;",
+            "*>;"
+        }
+    .end annotation
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/e.smali b/com.discord/smali_classes2/r0/e.smali
index d61ad412fc..c75a48d875 100644
--- a/com.discord/smali_classes2/r0/e.smali
+++ b/com.discord/smali_classes2/r0/e.smali
@@ -1,14 +1,38 @@
 .class public interface abstract Lr0/e;
 .super Ljava/lang/Object;
-.source "CompletableSubscriber.java"
+.source "Converter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/e$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<F:",
+        "Ljava/lang/Object;",
+        "T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
 
 
 # virtual methods
-.method public abstract a(Lrx/Subscription;)V
-.end method
+.method public abstract a(Ljava/lang/Object;)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TF;)TT;"
+        }
+    .end annotation
 
-.method public abstract onCompleted()V
-.end method
-
-.method public abstract onError(Ljava/lang/Throwable;)V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
 .end method
diff --git a/com.discord/smali_classes2/r0/f$a.smali b/com.discord/smali_classes2/r0/f$a.smali
index 207c29b958..b670976168 100644
--- a/com.discord/smali_classes2/r0/f$a.smali
+++ b/com.discord/smali_classes2/r0/f$a.smali
@@ -1,127 +1,59 @@
-.class public final enum Lr0/f$a;
-.super Ljava/lang/Enum;
-.source "Notification.java"
+.class public Lr0/f$a;
+.super Ljava/lang/Object;
+.source "DefaultCallAdapterFactory.java"
+
+# interfaces
+.implements Lr0/c;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/f;
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lr0/f;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/c;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x4019
-    name = "a"
+    accessFlags = 0x1
+    name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ljava/lang/Enum<",
-        "Lr0/f$a;",
-        ">;"
+        "Ljava/lang/Object;",
+        "Lr0/c<",
+        "Ljava/lang/Object;",
+        "Lr0/b<",
+        "*>;>;"
     }
 .end annotation
 
 
-# static fields
-.field public static final enum d:Lr0/f$a;
-
-.field public static final enum e:Lr0/f$a;
-
-.field public static final enum f:Lr0/f$a;
-
-.field public static final synthetic g:[Lr0/f$a;
+# instance fields
+.field public final synthetic a:Ljava/lang/reflect/Type;
 
 
 # direct methods
-.method public static constructor <clinit>()V
-    .locals 6
-
-    new-instance v0, Lr0/f$a;
-
-    const-string v1, "OnNext"
-
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v1, v2}, Lr0/f$a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v0, Lr0/f$a;->d:Lr0/f$a;
-
-    new-instance v0, Lr0/f$a;
-
-    const-string v1, "OnError"
-
-    const/4 v3, 0x1
-
-    invoke-direct {v0, v1, v3}, Lr0/f$a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v0, Lr0/f$a;->e:Lr0/f$a;
-
-    new-instance v0, Lr0/f$a;
-
-    const-string v1, "OnCompleted"
-
-    const/4 v4, 0x2
-
-    invoke-direct {v0, v1, v4}, Lr0/f$a;-><init>(Ljava/lang/String;I)V
-
-    sput-object v0, Lr0/f$a;->f:Lr0/f$a;
-
-    const/4 v1, 0x3
-
-    new-array v1, v1, [Lr0/f$a;
-
-    sget-object v5, Lr0/f$a;->d:Lr0/f$a;
-
-    aput-object v5, v1, v2
-
-    sget-object v2, Lr0/f$a;->e:Lr0/f$a;
-
-    aput-object v2, v1, v3
-
-    aput-object v0, v1, v4
-
-    sput-object v1, Lr0/f$a;->g:[Lr0/f$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
+.method public constructor <init>(Lr0/f;Ljava/lang/reflect/Type;)V
     .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
 
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+    iput-object p2, p0, Lr0/f$a;->a:Ljava/lang/reflect/Type;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method public static valueOf(Ljava/lang/String;)Lr0/f$a;
+
+# virtual methods
+.method public a()Ljava/lang/reflect/Type;
     .locals 1
 
-    const-class v0, Lr0/f$a;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/f$a;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/f$a;
-    .locals 1
-
-    sget-object v0, Lr0/f$a;->g:[Lr0/f$a;
-
-    invoke-virtual {v0}, [Lr0/f$a;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/f$a;
+    iget-object v0, p0, Lr0/f$a;->a:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
+
+.method public b(Lr0/b;)Ljava/lang/Object;
+    .locals 0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/f.smali b/com.discord/smali_classes2/r0/f.smali
index 96aa3ae65a..b87c0a0906 100644
--- a/com.discord/smali_classes2/r0/f.smali
+++ b/com.discord/smali_classes2/r0/f.smali
@@ -1,344 +1,70 @@
 .class public final Lr0/f;
-.super Ljava/lang/Object;
-.source "Notification.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/f$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
+.super Lr0/c$a;
+.source "DefaultCallAdapterFactory.java"
 
 
 # static fields
-.field public static final d:Lr0/f;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/f<",
-            "Ljava/lang/Void;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public final a:Lr0/f$a;
-
-.field public final b:Ljava/lang/Throwable;
-
-.field public final c:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
+.field public static final a:Lr0/c$a;
 
 
 # direct methods
 .method public static constructor <clinit>()V
-    .locals 3
+    .locals 1
 
     new-instance v0, Lr0/f;
 
-    sget-object v1, Lr0/f$a;->f:Lr0/f$a;
+    invoke-direct {v0}, Lr0/f;-><init>()V
 
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v1, v2, v2}, Lr0/f;-><init>(Lr0/f$a;Ljava/lang/Object;Ljava/lang/Throwable;)V
-
-    sput-object v0, Lr0/f;->d:Lr0/f;
+    sput-object v0, Lr0/f;->a:Lr0/c$a;
 
     return-void
 .end method
 
-.method public constructor <init>(Lr0/f$a;Ljava/lang/Object;Ljava/lang/Throwable;)V
+.method public constructor <init>()V
     .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/f$a;",
-            "TT;",
-            "Ljava/lang/Throwable;",
-            ")V"
-        }
-    .end annotation
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p2, p0, Lr0/f;->c:Ljava/lang/Object;
-
-    iput-object p3, p0, Lr0/f;->b:Ljava/lang/Throwable;
-
-    iput-object p1, p0, Lr0/f;->a:Lr0/f$a;
+    invoke-direct {p0}, Lr0/c$a;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public a()Z
-    .locals 4
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/c;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/c<",
+            "**>;"
+        }
+    .end annotation
 
-    iget-object v0, p0, Lr0/f;->a:Lr0/f$a;
+    invoke-static {p1}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
 
-    sget-object v1, Lr0/f$a;->e:Lr0/f$a;
+    move-result-object p2
 
-    const/4 v2, 0x0
+    const-class p3, Lr0/b;
 
-    const/4 v3, 0x1
+    if-eq p2, p3, :cond_0
 
-    if-ne v0, v1, :cond_0
+    const/4 p1, 0x0
 
-    const/4 v0, 0x1
-
-    goto :goto_0
+    return-object p1
 
     :cond_0
-    const/4 v0, 0x0
+    invoke-static {p1}, Lr0/r;->e(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
 
-    :goto_0
-    if-eqz v0, :cond_1
+    move-result-object p1
 
-    iget-object v0, p0, Lr0/f;->b:Ljava/lang/Throwable;
+    new-instance p2, Lr0/f$a;
 
-    if-eqz v0, :cond_1
+    invoke-direct {p2, p0, p1}, Lr0/f$a;-><init>(Lr0/f;Ljava/lang/reflect/Type;)V
 
-    const/4 v2, 0x1
-
-    :cond_1
-    return v2
-.end method
-
-.method public b()Z
-    .locals 4
-
-    iget-object v0, p0, Lr0/f;->a:Lr0/f$a;
-
-    sget-object v1, Lr0/f$a;->d:Lr0/f$a;
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/f;->c:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    return v2
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-nez p1, :cond_0
-
-    return v0
-
-    :cond_0
-    const/4 v1, 0x1
-
-    if-ne p0, p1, :cond_1
-
-    return v1
-
-    :cond_1
-    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    const-class v3, Lr0/f;
-
-    if-eq v2, v3, :cond_2
-
-    return v0
-
-    :cond_2
-    check-cast p1, Lr0/f;
-
-    iget-object v2, p1, Lr0/f;->a:Lr0/f$a;
-
-    iget-object v3, p0, Lr0/f;->a:Lr0/f$a;
-
-    if-ne v2, v3, :cond_5
-
-    iget-object v2, p0, Lr0/f;->c:Ljava/lang/Object;
-
-    iget-object v3, p1, Lr0/f;->c:Ljava/lang/Object;
-
-    if-eq v2, v3, :cond_3
-
-    if-eqz v2, :cond_5
-
-    invoke-virtual {v2, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_5
-
-    :cond_3
-    iget-object v2, p0, Lr0/f;->b:Ljava/lang/Throwable;
-
-    iget-object p1, p1, Lr0/f;->b:Ljava/lang/Throwable;
-
-    if-eq v2, p1, :cond_4
-
-    if-eqz v2, :cond_5
-
-    invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_5
-
-    :cond_4
-    const/4 v0, 0x1
-
-    :cond_5
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Lr0/f;->a:Lr0/f$a;
-
-    invoke-virtual {v0}, Ljava/lang/Enum;->hashCode()I
-
-    move-result v0
-
-    invoke-virtual {p0}, Lr0/f;->b()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Lr0/f;->c:Ljava/lang/Object;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v0, v1
-
-    :cond_0
-    invoke-virtual {p0}, Lr0/f;->a()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Lr0/f;->b:Ljava/lang/Throwable;
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    add-int/2addr v0, v1
-
-    :cond_1
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x40
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
-
-    const/16 v1, 0x5b
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-super {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const/16 v1, 0x20
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v2, p0, Lr0/f;->a:Lr0/f$a;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lr0/f;->b()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v2, p0, Lr0/f;->c:Ljava/lang/Object;
-
-    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    :cond_0
-    invoke-virtual {p0}, Lr0/f;->a()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lr0/f;->b:Ljava/lang/Throwable;
-
-    invoke-virtual {v1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    :cond_1
-    const/16 v1, 0x5d
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
+    return-object p2
 .end method
diff --git a/com.discord/smali_classes2/r0/g$a.smali b/com.discord/smali_classes2/r0/g$a.smali
new file mode 100644
index 0000000000..004aa3aee7
--- /dev/null
+++ b/com.discord/smali_classes2/r0/g$a.smali
@@ -0,0 +1,71 @@
+.class public Lr0/g$a;
+.super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
+
+# interfaces
+.implements Lr0/c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lr0/g;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/c<",
+        "Ljava/lang/Object;",
+        "Lr0/b<",
+        "*>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Ljava/lang/reflect/Type;
+
+.field public final synthetic b:Lr0/g;
+
+
+# direct methods
+.method public constructor <init>(Lr0/g;Ljava/lang/reflect/Type;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/g$a;->b:Lr0/g;
+
+    iput-object p2, p0, Lr0/g$a;->a:Ljava/lang/reflect/Type;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Ljava/lang/reflect/Type;
+    .locals 1
+
+    iget-object v0, p0, Lr0/g$a;->a:Ljava/lang/reflect/Type;
+
+    return-object v0
+.end method
+
+.method public b(Lr0/b;)Ljava/lang/Object;
+    .locals 2
+
+    new-instance v0, Lr0/g$b;
+
+    iget-object v1, p0, Lr0/g$a;->b:Lr0/g;
+
+    iget-object v1, v1, Lr0/g;->a:Ljava/util/concurrent/Executor;
+
+    invoke-direct {v0, v1, p1}, Lr0/g$b;-><init>(Ljava/util/concurrent/Executor;Lr0/b;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/g$b$a$a.smali b/com.discord/smali_classes2/r0/g$b$a$a.smali
new file mode 100644
index 0000000000..6d38f44b25
--- /dev/null
+++ b/com.discord/smali_classes2/r0/g$b$a$a.smali
@@ -0,0 +1,85 @@
+.class public Lr0/g$b$a$a;
+.super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lr0/g$b$a;->b(Lr0/b;Lr0/n;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lr0/n;
+
+.field public final synthetic e:Lr0/g$b$a;
+
+
+# direct methods
+.method public constructor <init>(Lr0/g$b$a;Lr0/n;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/g$b$a$a;->e:Lr0/g$b$a;
+
+    iput-object p2, p0, Lr0/g$b$a$a;->d:Lr0/n;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 4
+
+    iget-object v0, p0, Lr0/g$b$a$a;->e:Lr0/g$b$a;
+
+    iget-object v0, v0, Lr0/g$b$a;->b:Lr0/g$b;
+
+    iget-object v0, v0, Lr0/g$b;->e:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->k()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lr0/g$b$a$a;->e:Lr0/g$b$a;
+
+    iget-object v1, v0, Lr0/g$b$a;->a:Lr0/d;
+
+    iget-object v0, v0, Lr0/g$b$a;->b:Lr0/g$b;
+
+    new-instance v2, Ljava/io/IOException;
+
+    const-string v3, "Canceled"
+
+    invoke-direct {v2, v3}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    invoke-interface {v1, v0, v2}, Lr0/d;->a(Lr0/b;Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lr0/g$b$a$a;->e:Lr0/g$b$a;
+
+    iget-object v1, v0, Lr0/g$b$a;->a:Lr0/d;
+
+    iget-object v0, v0, Lr0/g$b$a;->b:Lr0/g$b;
+
+    iget-object v2, p0, Lr0/g$b$a$a;->d:Lr0/n;
+
+    invoke-interface {v1, v0, v2}, Lr0/d;->b(Lr0/b;Lr0/n;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/g$b$a$b.smali b/com.discord/smali_classes2/r0/g$b$a$b.smali
new file mode 100644
index 0000000000..4e02343baa
--- /dev/null
+++ b/com.discord/smali_classes2/r0/g$b$a$b.smali
@@ -0,0 +1,55 @@
+.class public Lr0/g$b$a$b;
+.super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lr0/g$b$a;->a(Lr0/b;Ljava/lang/Throwable;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/Throwable;
+
+.field public final synthetic e:Lr0/g$b$a;
+
+
+# direct methods
+.method public constructor <init>(Lr0/g$b$a;Ljava/lang/Throwable;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/g$b$a$b;->e:Lr0/g$b$a;
+
+    iput-object p2, p0, Lr0/g$b$a$b;->d:Ljava/lang/Throwable;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 3
+
+    iget-object v0, p0, Lr0/g$b$a$b;->e:Lr0/g$b$a;
+
+    iget-object v1, v0, Lr0/g$b$a;->a:Lr0/d;
+
+    iget-object v0, v0, Lr0/g$b$a;->b:Lr0/g$b;
+
+    iget-object v2, p0, Lr0/g$b$a$b;->d:Ljava/lang/Throwable;
+
+    invoke-interface {v1, v0, v2}, Lr0/d;->a(Lr0/b;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/g$b$a.smali b/com.discord/smali_classes2/r0/g$b$a.smali
new file mode 100644
index 0000000000..582bb2c537
--- /dev/null
+++ b/com.discord/smali_classes2/r0/g$b$a.smali
@@ -0,0 +1,97 @@
+.class public Lr0/g$b$a;
+.super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
+
+# interfaces
+.implements Lr0/d;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lr0/g$b;->Z(Lr0/d;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/d<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lr0/d;
+
+.field public final synthetic b:Lr0/g$b;
+
+
+# direct methods
+.method public constructor <init>(Lr0/g$b;Lr0/d;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/g$b$a;->b:Lr0/g$b;
+
+    iput-object p2, p0, Lr0/g$b$a;->a:Lr0/d;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/b;Ljava/lang/Throwable;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;",
+            "Ljava/lang/Throwable;",
+            ")V"
+        }
+    .end annotation
+
+    iget-object p1, p0, Lr0/g$b$a;->b:Lr0/g$b;
+
+    iget-object p1, p1, Lr0/g$b;->d:Ljava/util/concurrent/Executor;
+
+    new-instance v0, Lr0/g$b$a$b;
+
+    invoke-direct {v0, p0, p2}, Lr0/g$b$a$b;-><init>(Lr0/g$b$a;Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+
+    return-void
+.end method
+
+.method public b(Lr0/b;Lr0/n;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;",
+            "Lr0/n<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    iget-object p1, p0, Lr0/g$b$a;->b:Lr0/g$b;
+
+    iget-object p1, p1, Lr0/g$b;->d:Ljava/util/concurrent/Executor;
+
+    new-instance v0, Lr0/g$b$a$a;
+
+    invoke-direct {v0, p0, p2}, Lr0/g$b$a$a;-><init>(Lr0/g$b$a;Lr0/n;)V
+
+    invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/g$b.smali b/com.discord/smali_classes2/r0/g$b.smali
new file mode 100644
index 0000000000..77861ae1bf
--- /dev/null
+++ b/com.discord/smali_classes2/r0/g$b.smali
@@ -0,0 +1,177 @@
+.class public final Lr0/g$b;
+.super Ljava/lang/Object;
+.source "ExecutorCallAdapterFactory.java"
+
+# interfaces
+.implements Lr0/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/g;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lr0/b<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/Executor;
+
+.field public final e:Lr0/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/b<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/Executor;Lr0/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/Executor;",
+            "Lr0/b<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/g$b;->d:Ljava/util/concurrent/Executor;
+
+    iput-object p2, p0, Lr0/g$b;->e:Lr0/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public Z(Lr0/d;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/d<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "callback == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iget-object v0, p0, Lr0/g$b;->e:Lr0/b;
+
+    new-instance v1, Lr0/g$b$a;
+
+    invoke-direct {v1, p0, p1}, Lr0/g$b$a;-><init>(Lr0/g$b;Lr0/d;)V
+
+    invoke-interface {v0, v1}, Lr0/b;->Z(Lr0/d;)V
+
+    return-void
+.end method
+
+.method public cancel()V
+    .locals 1
+
+    iget-object v0, p0, Lr0/g$b;->e:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->cancel()V
+
+    return-void
+.end method
+
+.method public bridge synthetic clone()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lr0/g$b;->e0()Lr0/b;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public e0()Lr0/b;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lr0/b<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Lr0/g$b;
+
+    iget-object v1, p0, Lr0/g$b;->d:Ljava/util/concurrent/Executor;
+
+    iget-object v2, p0, Lr0/g$b;->e:Lr0/b;
+
+    invoke-interface {v2}, Lr0/b;->e0()Lr0/b;
+
+    move-result-object v2
+
+    invoke-direct {v0, v1, v2}, Lr0/g$b;-><init>(Ljava/util/concurrent/Executor;Lr0/b;)V
+
+    return-object v0
+.end method
+
+.method public execute()Lr0/n;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lr0/n<",
+            "TT;>;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lr0/g$b;->e:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->execute()Lr0/n;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public k()Z
+    .locals 1
+
+    iget-object v0, p0, Lr0/g$b;->e:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->k()Z
+
+    move-result v0
+
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/r0/g.smali b/com.discord/smali_classes2/r0/g.smali
index 27b481d9fa..1cef12872b 100644
--- a/com.discord/smali_classes2/r0/g.smali
+++ b/com.discord/smali_classes2/r0/g.smali
@@ -1,30 +1,68 @@
-.class public interface abstract Lr0/g;
-.super Ljava/lang/Object;
-.source "Observer.java"
+.class public final Lr0/g;
+.super Lr0/c$a;
+.source "ExecutorCallAdapterFactory.java"
 
 
 # annotations
-.annotation system Ldalvik/annotation/Signature;
+.annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
+        Lr0/g$b;
     }
 .end annotation
 
 
+# instance fields
+.field public final a:Ljava/util/concurrent/Executor;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/Executor;)V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/c$a;-><init>()V
+
+    iput-object p1, p0, Lr0/g;->a:Ljava/util/concurrent/Executor;
+
+    return-void
+.end method
+
+
 # virtual methods
-.method public abstract onCompleted()V
-.end method
-
-.method public abstract onError(Ljava/lang/Throwable;)V
-.end method
-
-.method public abstract onNext(Ljava/lang/Object;)V
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/c;
+    .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(TT;)V"
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/c<",
+            "**>;"
         }
     .end annotation
+
+    invoke-static {p1}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object p2
+
+    const-class p3, Lr0/b;
+
+    if-eq p2, p3, :cond_0
+
+    const/4 p1, 0x0
+
+    return-object p1
+
+    :cond_0
+    invoke-static {p1}, Lr0/r;->e(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    new-instance p2, Lr0/g$a;
+
+    invoke-direct {p2, p0, p1}, Lr0/g$a;-><init>(Lr0/g;Ljava/lang/reflect/Type;)V
+
+    return-object p2
 .end method
diff --git a/com.discord/smali_classes2/r0/h$a.smali b/com.discord/smali_classes2/r0/h$a.smali
index e38bb1b5eb..99f9bb9ce4 100644
--- a/com.discord/smali_classes2/r0/h$a.smali
+++ b/com.discord/smali_classes2/r0/h$a.smali
@@ -1,29 +1,121 @@
-.class public interface abstract Lr0/h$a;
+.class public Lr0/h$a;
 .super Ljava/lang/Object;
-.source "Single.java"
+.source "OkHttpCall.java"
 
 # interfaces
-.implements Lrx/functions/Action1;
+.implements Lo0/g;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/h;
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lr0/h;->Z(Lr0/d;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "a"
+    accessFlags = 0x1
+    name = null
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Lr0/i<",
-        "-TT;>;>;"
-    }
-.end annotation
+
+# instance fields
+.field public final synthetic a:Lr0/d;
+
+.field public final synthetic b:Lr0/h;
+
+
+# direct methods
+.method public constructor <init>(Lr0/h;Lr0/d;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/h$a;->b:Lr0/h;
+
+    iput-object p2, p0, Lr0/h$a;->a:Lr0/d;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lo0/f;Lokhttp3/Response;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object p1, p0, Lr0/h$a;->b:Lr0/h;
+
+    invoke-virtual {p1, p2}, Lr0/h;->c(Lokhttp3/Response;)Lr0/n;
+
+    move-result-object p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object p2, p0, Lr0/h$a;->a:Lr0/d;
+
+    iget-object v0, p0, Lr0/h$a;->b:Lr0/h;
+
+    invoke-interface {p2, v0, p1}, Lr0/d;->b(Lr0/b;Lr0/n;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p1}, Ljava/lang/Throwable;->printStackTrace()V
+
+    :goto_0
+    return-void
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_2
+    iget-object p2, p0, Lr0/h$a;->a:Lr0/d;
+
+    iget-object v0, p0, Lr0/h$a;->b:Lr0/h;
+
+    invoke-interface {p2, v0, p1}, Lr0/d;->a(Lr0/b;Ljava/lang/Throwable;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    goto :goto_1
+
+    :catchall_2
+    move-exception p1
+
+    invoke-virtual {p1}, Ljava/lang/Throwable;->printStackTrace()V
+
+    :goto_1
+    return-void
+.end method
+
+.method public b(Lo0/f;Ljava/io/IOException;)V
+    .locals 1
+
+    :try_start_0
+    iget-object p1, p0, Lr0/h$a;->a:Lr0/d;
+
+    iget-object v0, p0, Lr0/h$a;->b:Lr0/h;
+
+    invoke-interface {p1, v0, p2}, Lr0/d;->a(Lr0/b;Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p1}, Ljava/lang/Throwable;->printStackTrace()V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/h$b$a.smali b/com.discord/smali_classes2/r0/h$b$a.smali
new file mode 100644
index 0000000000..862b75e5ef
--- /dev/null
+++ b/com.discord/smali_classes2/r0/h$b$a.smali
@@ -0,0 +1,59 @@
+.class public Lr0/h$b$a;
+.super Lp0/i;
+.source "OkHttpCall.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lr0/h$b;->c()Lp0/g;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic e:Lr0/h$b;
+
+
+# direct methods
+.method public constructor <init>(Lr0/h$b;Lp0/w;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/h$b$a;->e:Lr0/h$b;
+
+    invoke-direct {p0, p2}, Lp0/i;-><init>(Lp0/w;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public B0(Lp0/e;J)J
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    :try_start_0
+    invoke-super {p0, p1, p2, p3}, Lp0/i;->B0(Lp0/e;J)J
+
+    move-result-wide p1
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-wide p1
+
+    :catch_0
+    move-exception p1
+
+    iget-object p2, p0, Lr0/h$b$a;->e:Lr0/h$b;
+
+    iput-object p1, p2, Lr0/h$b;->g:Ljava/io/IOException;
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/h$b.smali b/com.discord/smali_classes2/r0/h$b.smali
new file mode 100644
index 0000000000..65b4e8e5d6
--- /dev/null
+++ b/com.discord/smali_classes2/r0/h$b.smali
@@ -0,0 +1,92 @@
+.class public final Lr0/h$b;
+.super Lokhttp3/ResponseBody;
+.source "OkHttpCall.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final f:Lokhttp3/ResponseBody;
+
+.field public g:Ljava/io/IOException;
+
+
+# direct methods
+.method public constructor <init>(Lokhttp3/ResponseBody;)V
+    .locals 0
+
+    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
+
+    iput-object p1, p0, Lr0/h$b;->f:Lokhttp3/ResponseBody;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()J
+    .locals 2
+
+    iget-object v0, p0, Lr0/h$b;->f:Lokhttp3/ResponseBody;
+
+    invoke-virtual {v0}, Lokhttp3/ResponseBody;->a()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public b()Lokhttp3/MediaType;
+    .locals 1
+
+    iget-object v0, p0, Lr0/h$b;->f:Lokhttp3/ResponseBody;
+
+    invoke-virtual {v0}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public c()Lp0/g;
+    .locals 2
+
+    new-instance v0, Lr0/h$b$a;
+
+    iget-object v1, p0, Lr0/h$b;->f:Lokhttp3/ResponseBody;
+
+    invoke-virtual {v1}, Lokhttp3/ResponseBody;->c()Lp0/g;
+
+    move-result-object v1
+
+    invoke-direct {v0, p0, v1}, Lr0/h$b$a;-><init>(Lr0/h$b;Lp0/w;)V
+
+    const-string v1, "$receiver"
+
+    invoke-static {v0, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v1, Lp0/q;
+
+    invoke-direct {v1, v0}, Lp0/q;-><init>(Lp0/w;)V
+
+    return-object v1
+.end method
+
+.method public close()V
+    .locals 1
+
+    iget-object v0, p0, Lr0/h$b;->f:Lokhttp3/ResponseBody;
+
+    invoke-virtual {v0}, Lokhttp3/ResponseBody;->close()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/h$c.smali b/com.discord/smali_classes2/r0/h$c.smali
new file mode 100644
index 0000000000..1421560b87
--- /dev/null
+++ b/com.discord/smali_classes2/r0/h$c.smali
@@ -0,0 +1,64 @@
+.class public final Lr0/h$c;
+.super Lokhttp3/ResponseBody;
+.source "OkHttpCall.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public final f:Lokhttp3/MediaType;
+
+.field public final g:J
+
+
+# direct methods
+.method public constructor <init>(Lokhttp3/MediaType;J)V
+    .locals 0
+
+    invoke-direct {p0}, Lokhttp3/ResponseBody;-><init>()V
+
+    iput-object p1, p0, Lr0/h$c;->f:Lokhttp3/MediaType;
+
+    iput-wide p2, p0, Lr0/h$c;->g:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()J
+    .locals 2
+
+    iget-wide v0, p0, Lr0/h$c;->g:J
+
+    return-wide v0
+.end method
+
+.method public b()Lokhttp3/MediaType;
+    .locals 1
+
+    iget-object v0, p0, Lr0/h$c;->f:Lokhttp3/MediaType;
+
+    return-object v0
+.end method
+
+.method public c()Lp0/g;
+    .locals 2
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Cannot read raw response body of a converted body."
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/r0/h.smali b/com.discord/smali_classes2/r0/h.smali
index cc0b1eb6e5..81324e4e3b 100644
--- a/com.discord/smali_classes2/r0/h.smali
+++ b/com.discord/smali_classes2/r0/h.smali
@@ -1,12 +1,16 @@
-.class public Lr0/h;
+.class public final Lr0/h;
 .super Ljava/lang/Object;
-.source "Single.java"
+.source "OkHttpCall.java"
+
+# interfaces
+.implements Lr0/b;
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lr0/h$a;
+        Lr0/h$b;,
+        Lr0/h$c;
     }
 .end annotation
 
@@ -15,34 +19,959 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Ljava/lang/Object;"
+        "Ljava/lang/Object;",
+        "Lr0/b<",
+        "TT;>;"
     }
 .end annotation
 
 
+# instance fields
+.field public final d:Lr0/q;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/q<",
+            "TT;*>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:[Ljava/lang/Object;
+
+.field public volatile f:Z
+
+.field public g:Lo0/f;
+
+.field public h:Ljava/lang/Throwable;
+
+.field public i:Z
+
+
 # direct methods
-.method public constructor <init>(Lr0/h$a;)V
-    .locals 1
+.method public constructor <init>(Lr0/q;[Ljava/lang/Object;)V
+    .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/h$a<",
-            "TT;>;)V"
+            "Lr0/q<",
+            "TT;*>;[",
+            "Ljava/lang/Object;",
+            ")V"
         }
     .end annotation
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lr0/o/l;->c:Lr0/k/b;
+    iput-object p1, p0, Lr0/h;->d:Lr0/q;
+
+    iput-object p2, p0, Lr0/h;->e:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public Z(Lr0/d;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/d<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    const-string v0, "callback == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lr0/h;->i:Z
+
+    if-nez v0, :cond_3
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lr0/h;->i:Z
+
+    iget-object v0, p0, Lr0/h;->g:Lo0/f;
+
+    iget-object v1, p0, Lr0/h;->h:Ljava/lang/Throwable;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-nez v0, :cond_0
+
+    if-nez v1, :cond_0
+
+    :try_start_1
+    invoke-virtual {p0}, Lr0/h;->b()Lo0/f;
+
+    move-result-object v2
+
+    iput-object v2, p0, Lr0/h;->g:Lo0/f;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    move-object v0, v2
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    :try_start_2
+    iput-object v1, p0, Lr0/h;->h:Ljava/lang/Throwable;
+
+    :cond_0
+    :goto_0
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {p1, p0, v1}, Lr0/d;->a(Lr0/b;Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_1
+    iget-boolean v1, p0, Lr0/h;->f:Z
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v0}, Lo0/f;->cancel()V
+
+    :cond_2
+    new-instance v1, Lr0/h$a;
+
+    invoke-direct {v1, p0, p1}, Lr0/h$a;-><init>(Lr0/h;Lr0/d;)V
+
+    invoke-interface {v0, v1}, Lo0/f;->F(Lo0/g;)V
+
+    return-void
+
+    :cond_3
+    :try_start_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Already executed."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    throw p1
+.end method
+
+.method public final b()Lo0/f;
+    .locals 12
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lr0/h;->d:Lr0/q;
+
+    iget-object v1, p0, Lr0/h;->e:[Ljava/lang/Object;
+
+    new-instance v11, Lr0/m;
+
+    iget-object v3, v0, Lr0/q;->e:Ljava/lang/String;
+
+    iget-object v4, v0, Lr0/q;->c:Lo0/w;
+
+    iget-object v5, v0, Lr0/q;->f:Ljava/lang/String;
+
+    iget-object v6, v0, Lr0/q;->g:Lokhttp3/Headers;
+
+    iget-object v7, v0, Lr0/q;->h:Lokhttp3/MediaType;
+
+    iget-boolean v8, v0, Lr0/q;->i:Z
+
+    iget-boolean v9, v0, Lr0/q;->j:Z
+
+    iget-boolean v10, v0, Lr0/q;->k:Z
+
+    move-object v2, v11
+
+    invoke-direct/range {v2 .. v10}, Lr0/m;-><init>(Ljava/lang/String;Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/MediaType;ZZZ)V
+
+    iget-object v0, v0, Lr0/q;->l:[Lr0/k;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_0
+
+    array-length v3, v1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
+    array-length v4, v0
+
+    if-ne v3, v4, :cond_c
+
+    const/4 v4, 0x0
+
+    :goto_1
+    if-ge v4, v3, :cond_1
+
+    aget-object v5, v0, v4
+
+    aget-object v6, v1, v4
+
+    invoke-virtual {v5, v11, v6}, Lr0/k;->a(Lr0/m;Ljava/lang/Object;)V
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v0, v11, Lr0/m;->d:Lo0/w$a;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lo0/w$a;->b()Lo0/w;
+
+    move-result-object v0
+
+    goto :goto_3
+
+    :cond_2
+    iget-object v0, v11, Lr0/m;->b:Lo0/w;
+
+    iget-object v3, v11, Lr0/m;->c:Ljava/lang/String;
+
+    if-eqz v0, :cond_b
+
+    const-string v4, "link"
+
+    invoke-static {v3, v4}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v3}, Lo0/w;->g(Ljava/lang/String;)Lo0/w$a;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {v0}, Lo0/w$a;->b()Lo0/w;
+
+    move-result-object v0
+
+    goto :goto_2
+
+    :cond_3
+    move-object v0, v1
+
+    :goto_2
+    if-eqz v0, :cond_a
+
+    :goto_3
+    iget-object v3, v11, Lr0/m;->j:Lokhttp3/RequestBody;
+
+    if-nez v3, :cond_6
+
+    iget-object v4, v11, Lr0/m;->i:Lo0/u$a;
+
+    if-eqz v4, :cond_4
+
+    new-instance v3, Lo0/u;
+
+    iget-object v1, v4, Lo0/u$a;->a:Ljava/util/List;
+
+    iget-object v2, v4, Lo0/u$a;->b:Ljava/util/List;
+
+    invoke-direct {v3, v1, v2}, Lo0/u;-><init>(Ljava/util/List;Ljava/util/List;)V
+
+    goto :goto_4
+
+    :cond_4
+    iget-object v4, v11, Lr0/m;->h:Lokhttp3/MultipartBody$a;
+
+    if-eqz v4, :cond_5
+
+    invoke-virtual {v4}, Lokhttp3/MultipartBody$a;->b()Lokhttp3/MultipartBody;
+
+    move-result-object v3
+
+    goto :goto_4
+
+    :cond_5
+    iget-boolean v4, v11, Lr0/m;->g:Z
+
+    if-eqz v4, :cond_6
+
+    new-array v2, v2, [B
+
+    invoke-static {v1, v2}, Lokhttp3/RequestBody;->create(Lokhttp3/MediaType;[B)Lokhttp3/RequestBody;
+
+    move-result-object v3
+
+    :cond_6
+    :goto_4
+    iget-object v1, v11, Lr0/m;->f:Lokhttp3/MediaType;
+
+    if-eqz v1, :cond_8
+
+    if-eqz v3, :cond_7
+
+    new-instance v2, Lr0/m$a;
+
+    invoke-direct {v2, v3, v1}, Lr0/m$a;-><init>(Lokhttp3/RequestBody;Lokhttp3/MediaType;)V
+
+    move-object v3, v2
+
+    goto :goto_5
+
+    :cond_7
+    iget-object v2, v11, Lr0/m;->e:Lo0/a0$a;
+
+    iget-object v1, v1, Lokhttp3/MediaType;->a:Ljava/lang/String;
+
+    const-string v4, "Content-Type"
+
+    invoke-virtual {v2, v4, v1}, Lo0/a0$a;->a(Ljava/lang/String;Ljava/lang/String;)Lo0/a0$a;
+
+    :cond_8
+    :goto_5
+    iget-object v1, v11, Lr0/m;->e:Lo0/a0$a;
+
+    invoke-virtual {v1, v0}, Lo0/a0$a;->g(Lo0/w;)Lo0/a0$a;
+
+    iget-object v0, v11, Lr0/m;->a:Ljava/lang/String;
+
+    invoke-virtual {v1, v0, v3}, Lo0/a0$a;->d(Ljava/lang/String;Lokhttp3/RequestBody;)Lo0/a0$a;
+
+    invoke-virtual {v1}, Lo0/a0$a;->b()Lo0/a0;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lr0/h;->d:Lr0/q;
+
+    iget-object v1, v1, Lr0/q;->a:Lo0/f$a;
+
+    invoke-interface {v1, v0}, Lo0/f$a;->b(Lo0/a0;)Lo0/f;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_9
+
+    return-object v0
+
+    :cond_9
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "Call.Factory returned null."
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_a
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "Malformed URL. Base: "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    iget-object v2, v11, Lr0/m;->b:Lo0/w;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v2, ", Relative: "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v2, v11, Lr0/m;->c:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_b
+    throw v1
+
+    :cond_c
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "Argument count ("
+
+    const-string v4, ") doesn\'t match expected count ("
+
+    invoke-static {v2, v3, v4}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    array-length v0, v0
+
+    const-string v3, ")"
+
+    invoke-static {v2, v0, v3}, Lf/e/b/a/a;->s(Ljava/lang/StringBuilder;ILjava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public c(Lokhttp3/Response;)Lr0/n;
+    .locals 21
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lokhttp3/Response;",
+            ")",
+            "Lr0/n<",
+            "TT;>;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    move-object/from16 v0, p1
+
+    iget-object v1, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    const-string v2, "response"
+
+    invoke-static {v0, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v4, v0, Lokhttp3/Response;->d:Lo0/a0;
+
+    iget-object v5, v0, Lokhttp3/Response;->e:Lo0/y;
+
+    iget v7, v0, Lokhttp3/Response;->g:I
+
+    iget-object v6, v0, Lokhttp3/Response;->f:Ljava/lang/String;
+
+    iget-object v8, v0, Lokhttp3/Response;->h:Lo0/v;
+
+    iget-object v2, v0, Lokhttp3/Response;->i:Lokhttp3/Headers;
+
+    invoke-virtual {v2}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object v2
+
+    iget-object v3, v0, Lokhttp3/Response;->j:Lokhttp3/ResponseBody;
+
+    iget-object v11, v0, Lokhttp3/Response;->k:Lokhttp3/Response;
+
+    iget-object v12, v0, Lokhttp3/Response;->l:Lokhttp3/Response;
+
+    iget-object v13, v0, Lokhttp3/Response;->m:Lokhttp3/Response;
+
+    iget-wide v14, v0, Lokhttp3/Response;->n:J
+
+    iget-wide v9, v0, Lokhttp3/Response;->o:J
+
+    iget-object v0, v0, Lokhttp3/Response;->p:Lo0/g0/d/c;
+
+    new-instance v3, Lr0/h$c;
+
+    move-wide/from16 v16, v9
+
+    invoke-virtual {v1}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
+
+    move-result-object v9
+
+    move-wide/from16 v19, v14
+
+    invoke-virtual {v1}, Lokhttp3/ResponseBody;->a()J
+
+    move-result-wide v14
+
+    invoke-direct {v3, v9, v14, v15}, Lr0/h$c;-><init>(Lokhttp3/MediaType;J)V
+
+    if-ltz v7, :cond_0
+
+    const/4 v9, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v9, 0x0
+
+    :goto_0
+    if-eqz v9, :cond_a
+
+    if-eqz v4, :cond_9
+
+    if-eqz v5, :cond_8
+
+    if-eqz v6, :cond_7
+
+    invoke-virtual {v2}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v9
+
+    new-instance v2, Lokhttp3/Response;
+
+    move-object v10, v3
+
+    move-object v3, v2
+
+    move-wide/from16 v14, v19
+
+    move-object/from16 v18, v0
+
+    invoke-direct/range {v3 .. v18}, Lokhttp3/Response;-><init>(Lo0/a0;Lo0/y;Ljava/lang/String;ILo0/v;Lokhttp3/Headers;Lokhttp3/ResponseBody;Lokhttp3/Response;Lokhttp3/Response;Lokhttp3/Response;JJLo0/g0/d/c;)V
+
+    iget v0, v2, Lokhttp3/Response;->g:I
+
+    const/16 v3, 0xc8
+
+    const/4 v4, 0x0
+
+    if-lt v0, v3, :cond_5
+
+    const/16 v3, 0x12c
+
+    if-lt v0, v3, :cond_1
+
+    goto :goto_2
+
+    :cond_1
+    const/16 v3, 0xcc
+
+    if-eq v0, v3, :cond_4
+
+    const/16 v3, 0xcd
+
+    if-ne v0, v3, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v3, Lr0/h$b;
+
+    invoke-direct {v3, v1}, Lr0/h$b;-><init>(Lokhttp3/ResponseBody;)V
+
+    move-object/from16 v5, p0
+
+    :try_start_0
+    iget-object v0, v5, Lr0/h;->d:Lr0/q;
+
+    iget-object v0, v0, Lr0/q;->d:Lr0/e;
+
+    invoke-interface {v0, v3}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-static {v0, v2}, Lr0/n;->a(Ljava/lang/Object;Lokhttp3/Response;)Lr0/n;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v0
+
+    :catch_0
+    move-exception v0
+
+    iget-object v1, v3, Lr0/h$b;->g:Ljava/io/IOException;
+
+    if-nez v1, :cond_3
+
+    throw v0
+
+    :cond_3
+    throw v1
+
+    :cond_4
+    :goto_1
+    move-object/from16 v5, p0
+
+    invoke-virtual {v1}, Lokhttp3/ResponseBody;->close()V
+
+    invoke-static {v4, v2}, Lr0/n;->a(Ljava/lang/Object;Lokhttp3/Response;)Lr0/n;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_5
+    :goto_2
+    move-object/from16 v5, p0
+
+    :try_start_1
+    invoke-static {v1}, Lr0/r;->a(Lokhttp3/ResponseBody;)Lokhttp3/ResponseBody;
+
+    move-result-object v0
+
+    const-string v3, "body == null"
+
+    invoke-static {v0, v3}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    const-string v3, "rawResponse == null"
+
+    invoke-static {v2, v3}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    invoke-virtual {v2}, Lokhttp3/Response;->b()Z
+
+    move-result v3
+
+    if-nez v3, :cond_6
+
+    new-instance v3, Lr0/n;
+
+    invoke-direct {v3, v2, v4, v0}, Lr0/n;-><init>(Lokhttp3/Response;Ljava/lang/Object;Lokhttp3/ResponseBody;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    invoke-virtual {v1}, Lokhttp3/ResponseBody;->close()V
+
+    return-object v3
+
+    :cond_6
+    :try_start_2
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "rawResponse should not be successful response"
+
+    invoke-direct {v0, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {v1}, Lokhttp3/ResponseBody;->close()V
+
+    throw v0
+
+    :cond_7
+    move-object/from16 v5, p0
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "message == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_8
+    move-object/from16 v5, p0
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "protocol == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_9
+    move-object/from16 v5, p0
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "request == null"
+
+    invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_a
+    move-object/from16 v5, p0
+
+    const-string v0, "code < 0: "
+
+    invoke-static {v0, v7}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public cancel()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lr0/h;->f:Z
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lr0/h;->g:Lo0/f;
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lr0/h$a;
+    invoke-interface {v0}, Lo0/f;->cancel()V
 
     :cond_0
     return-void
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v0
+.end method
+
+.method public clone()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/CloneNotSupportedException;
+        }
+    .end annotation
+
+    new-instance v0, Lr0/h;
+
+    iget-object v1, p0, Lr0/h;->d:Lr0/q;
+
+    iget-object v2, p0, Lr0/h;->e:[Ljava/lang/Object;
+
+    invoke-direct {v0, v1, v2}, Lr0/h;-><init>(Lr0/q;[Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+.method public e0()Lr0/b;
+    .locals 3
+
+    new-instance v0, Lr0/h;
+
+    iget-object v1, p0, Lr0/h;->d:Lr0/q;
+
+    iget-object v2, p0, Lr0/h;->e:[Ljava/lang/Object;
+
+    invoke-direct {v0, v1, v2}, Lr0/h;-><init>(Lr0/q;[Ljava/lang/Object;)V
+
+    return-object v0
+.end method
+
+.method public execute()Lr0/n;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lr0/n<",
+            "TT;>;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lr0/h;->i:Z
+
+    if-nez v0, :cond_4
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lr0/h;->i:Z
+
+    iget-object v0, p0, Lr0/h;->h:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lr0/h;->h:Ljava/lang/Throwable;
+
+    instance-of v0, v0, Ljava/io/IOException;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lr0/h;->h:Ljava/lang/Throwable;
+
+    check-cast v0, Ljava/io/IOException;
+
+    throw v0
+
+    :cond_0
+    iget-object v0, p0, Lr0/h;->h:Ljava/lang/Throwable;
+
+    check-cast v0, Ljava/lang/RuntimeException;
+
+    throw v0
+
+    :cond_1
+    iget-object v0, p0, Lr0/h;->g:Lo0/f;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_2
+
+    :try_start_1
+    invoke-virtual {p0}, Lr0/h;->b()Lo0/f;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lr0/h;->g:Lo0/f;
+    :try_end_1
+    .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_1
+    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v0
+
+    goto :goto_0
+
+    :catch_1
+    move-exception v0
+
+    :goto_0
+    :try_start_2
+    iput-object v0, p0, Lr0/h;->h:Ljava/lang/Throwable;
+
+    throw v0
+
+    :cond_2
+    :goto_1
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    iget-boolean v1, p0, Lr0/h;->f:Z
+
+    if-eqz v1, :cond_3
+
+    invoke-interface {v0}, Lo0/f;->cancel()V
+
+    :cond_3
+    invoke-interface {v0}, Lo0/f;->execute()Lokhttp3/Response;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Lr0/h;->c(Lokhttp3/Response;)Lr0/n;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_4
+    :try_start_3
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Already executed."
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    throw v0
+.end method
+
+.method public k()Z
+    .locals 2
+
+    iget-boolean v0, p0, Lr0/h;->f:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lr0/h;->g:Lo0/f;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lr0/h;->g:Lo0/f;
+
+    invoke-interface {v0}, Lo0/f;->k()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    monitor-exit p0
+
+    return v1
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v0
 .end method
diff --git a/com.discord/smali_classes2/r0/i.smali b/com.discord/smali_classes2/r0/i.smali
index 1e44a69ea3..013c5ed567 100644
--- a/com.discord/smali_classes2/r0/i.smali
+++ b/com.discord/smali_classes2/r0/i.smali
@@ -1,60 +1,72 @@
-.class public abstract Lr0/i;
-.super Ljava/lang/Object;
-.source "SingleSubscriber.java"
-
-# interfaces
-.implements Lrx/Subscription;
+.class public Lr0/i;
+.super Lr0/k;
+.source "ParameterHandler.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Subscription;"
+        "Lr0/k<",
+        "Ljava/lang/Iterable<",
+        "TT;>;>;"
     }
 .end annotation
 
 
 # instance fields
-.field public final d:Lrx/internal/util/SubscriptionList;
+.field public final synthetic a:Lr0/k;
 
 
 # direct methods
-.method public constructor <init>()V
-    .locals 1
+.method public constructor <init>(Lr0/k;)V
+    .locals 0
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    iput-object p1, p0, Lr0/i;->a:Lr0/k;
 
-    new-instance v0, Lrx/internal/util/SubscriptionList;
-
-    invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
-
-    iput-object v0, p0, Lr0/i;->d:Lrx/internal/util/SubscriptionList;
+    invoke-direct {p0}, Lr0/k;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final isUnsubscribed()Z
-    .locals 1
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
 
-    iget-object v0, p0, Lr0/i;->d:Lrx/internal/util/SubscriptionList;
+    check-cast p2, Ljava/lang/Iterable;
 
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+    if-nez p2, :cond_0
 
-    return v0
-.end method
+    goto :goto_1
 
-.method public final unsubscribe()V
-    .locals 1
+    :cond_0
+    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    iget-object v0, p0, Lr0/i;->d:Lrx/internal/util/SubscriptionList;
+    move-result-object p2
 
-    invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
+    :goto_0
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lr0/i;->a:Lr0/k;
+
+    invoke-virtual {v1, p1, v0}, Lr0/k;->a(Lr0/m;Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_1
+    :goto_1
     return-void
 .end method
diff --git a/com.discord/smali_classes2/r0/j.smali b/com.discord/smali_classes2/r0/j.smali
new file mode 100644
index 0000000000..9cf2240801
--- /dev/null
+++ b/com.discord/smali_classes2/r0/j.smali
@@ -0,0 +1,69 @@
+.class public Lr0/j;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lr0/k<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lr0/k;
+
+
+# direct methods
+.method public constructor <init>(Lr0/k;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/j;->a:Lr0/k;
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    invoke-static {p2}, Ljava/lang/reflect/Array;->getLength(Ljava/lang/Object;)I
+
+    move-result v1
+
+    :goto_0
+    if-ge v0, v1, :cond_1
+
+    iget-object v2, p0, Lr0/j;->a:Lr0/k;
+
+    invoke-static {p2, v0}, Ljava/lang/reflect/Array;->get(Ljava/lang/Object;I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {v2, p1, v3}, Lr0/k;->a(Lr0/m;Ljava/lang/Object;)V
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/j/a/a.smali b/com.discord/smali_classes2/r0/j/a/a.smali
deleted file mode 100644
index 8b9578189c..0000000000
--- a/com.discord/smali_classes2/r0/j/a/a.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public final Lr0/j/a/a;
-.super Ljava/lang/Object;
-.source "RxAndroidPlugins.java"
-
-
-# static fields
-.field public static final b:Lr0/j/a/a;
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/j/a/b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/j/a/a;
-
-    invoke-direct {v0}, Lr0/j/a/a;-><init>()V
-
-    sput-object v0, Lr0/j/a/a;->b:Lr0/j/a/a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lr0/j/a/b;
-    .locals 3
-
-    iget-object v0, p0, Lr0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v1, 0x0
-
-    sget-object v2, Lr0/j/a/b;->a:Lr0/j/a/b;
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :cond_0
-    iget-object v0, p0, Lr0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/j/a/b;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/j/a/b.smali b/com.discord/smali_classes2/r0/j/a/b.smali
deleted file mode 100644
index 92162912ae..0000000000
--- a/com.discord/smali_classes2/r0/j/a/b.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public Lr0/j/a/b;
-.super Ljava/lang/Object;
-.source "RxAndroidSchedulersHook.java"
-
-
-# static fields
-.field public static final a:Lr0/j/a/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/j/a/b;
-
-    invoke-direct {v0}, Lr0/j/a/b;-><init>()V
-
-    sput-object v0, Lr0/j/a/b;->a:Lr0/j/a/b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/j/b/a.smali b/com.discord/smali_classes2/r0/j/b/a.smali
deleted file mode 100644
index 3fbc7bb412..0000000000
--- a/com.discord/smali_classes2/r0/j/b/a.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final Lr0/j/b/a;
-.super Ljava/lang/Object;
-.source "AndroidSchedulers.java"
-
-
-# static fields
-.field public static final b:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/j/b/a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public final a:Lrx/Scheduler;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    sput-object v0, Lr0/j/b/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lr0/j/a/a;->b:Lr0/j/a/a;
-
-    invoke-virtual {v0}, Lr0/j/a/a;->a()Lr0/j/a/b;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lr0/j/b/b;
-
-    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lr0/j/b/b;-><init>(Landroid/os/Looper;)V
-
-    iput-object v0, p0, Lr0/j/b/a;->a:Lrx/Scheduler;
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public static a()Lrx/Scheduler;
-    .locals 3
-
-    :cond_0
-    sget-object v0, Lr0/j/b/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/j/b/a;
-
-    if-eqz v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Lr0/j/b/a;
-
-    invoke-direct {v0}, Lr0/j/b/a;-><init>()V
-
-    sget-object v1, Lr0/j/b/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    :goto_0
-    iget-object v0, v0, Lr0/j/b/a;->a:Lrx/Scheduler;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/j/b/b$a.smali b/com.discord/smali_classes2/r0/j/b/b$a.smali
deleted file mode 100644
index 41d0fda229..0000000000
--- a/com.discord/smali_classes2/r0/j/b/b$a.smali
+++ /dev/null
@@ -1,139 +0,0 @@
-.class public Lr0/j/b/b$a;
-.super Lrx/Scheduler$Worker;
-.source "LooperScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/j/b/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Landroid/os/Handler;
-
-.field public final e:Lr0/j/a/b;
-
-.field public volatile f:Z
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/Handler;)V
-    .locals 0
-
-    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
-
-    iput-object p1, p0, Lr0/j/b/b$a;->d:Landroid/os/Handler;
-
-    sget-object p1, Lr0/j/a/a;->b:Lr0/j/a/a;
-
-    invoke-virtual {p1}, Lr0/j/a/a;->a()Lr0/j/a/b;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lr0/j/b/b$a;->e:Lr0/j/a/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lrx/functions/Action0;)Lrx/Subscription;
-    .locals 3
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v1, 0x0
-
-    invoke-virtual {p0, p1, v1, v2, v0}, Lr0/j/b/b$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-    .locals 2
-
-    iget-boolean v0, p0, Lr0/j/b/b$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_0
-    iget-object v0, p0, Lr0/j/b/b$a;->e:Lr0/j/a/b;
-
-    if-eqz v0, :cond_2
-
-    new-instance v0, Lr0/j/b/b$b;
-
-    iget-object v1, p0, Lr0/j/b/b$a;->d:Landroid/os/Handler;
-
-    invoke-direct {v0, p1, v1}, Lr0/j/b/b$b;-><init>(Lrx/functions/Action0;Landroid/os/Handler;)V
-
-    iget-object p1, p0, Lr0/j/b/b$a;->d:Landroid/os/Handler;
-
-    invoke-static {p1, v0}, Landroid/os/Message;->obtain(Landroid/os/Handler;Ljava/lang/Runnable;)Landroid/os/Message;
-
-    move-result-object p1
-
-    iput-object p0, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
-
-    iget-object v1, p0, Lr0/j/b/b$a;->d:Landroid/os/Handler;
-
-    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
-
-    move-result-wide p2
-
-    invoke-virtual {v1, p1, p2, p3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
-
-    iget-boolean p1, p0, Lr0/j/b/b$a;->f:Z
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lr0/j/b/b$a;->d:Landroid/os/Handler;
-
-    invoke-virtual {p1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_1
-    return-object v0
-
-    :cond_2
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/j/b/b$a;->f:Z
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/j/b/b$a;->f:Z
-
-    iget-object v0, p0, Lr0/j/b/b$a;->d:Landroid/os/Handler;
-
-    invoke-virtual {v0, p0}, Landroid/os/Handler;->removeCallbacksAndMessages(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/j/b/b$b.smali b/com.discord/smali_classes2/r0/j/b/b$b.smali
deleted file mode 100644
index abfa78d59e..0000000000
--- a/com.discord/smali_classes2/r0/j/b/b$b.smali
+++ /dev/null
@@ -1,126 +0,0 @@
-.class public final Lr0/j/b/b$b;
-.super Ljava/lang/Object;
-.source "LooperScheduler.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/j/b/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action0;
-
-.field public final e:Landroid/os/Handler;
-
-.field public volatile f:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action0;Landroid/os/Handler;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/j/b/b$b;->d:Lrx/functions/Action0;
-
-    iput-object p2, p0, Lr0/j/b/b$b;->e:Landroid/os/Handler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/j/b/b$b;->f:Z
-
-    return v0
-.end method
-
-.method public run()V
-    .locals 3
-
-    :try_start_0
-    iget-object v0, p0, Lr0/j/b/b$b;->d:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v0
-
-    instance-of v1, v0, Lrx/exceptions/OnErrorNotImplementedException;
-
-    if-eqz v1, :cond_0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    const-string v2, "Exception thrown on Scheduler.Worker thread. Add `onError` handling."
-
-    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    const-string v2, "Fatal Exception thrown on Scheduler.Worker thread."
-
-    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    :goto_0
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v2
-
-    invoke-interface {v2, v0, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-
-    :goto_1
-    return-void
-
-    :cond_1
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/j/b/b$b;->f:Z
-
-    iget-object v0, p0, Lr0/j/b/b$b;->e:Landroid/os/Handler;
-
-    invoke-virtual {v0, p0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/j/b/b.smali b/com.discord/smali_classes2/r0/j/b/b.smali
deleted file mode 100644
index dfa4100fed..0000000000
--- a/com.discord/smali_classes2/r0/j/b/b.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public Lr0/j/b/b;
-.super Lrx/Scheduler;
-.source "LooperScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/j/b/b$b;,
-        Lr0/j/b/b$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Landroid/os/Handler;
-
-
-# direct methods
-.method public constructor <init>(Landroid/os/Looper;)V
-    .locals 1
-
-    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
-
-    new-instance v0, Landroid/os/Handler;
-
-    invoke-direct {v0, p1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
-
-    iput-object v0, p0, Lr0/j/b/b;->a:Landroid/os/Handler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lrx/Scheduler$Worker;
-    .locals 2
-
-    new-instance v0, Lr0/j/b/b$a;
-
-    iget-object v1, p0, Lr0/j/b/b;->a:Landroid/os/Handler;
-
-    invoke-direct {v0, v1}, Lr0/j/b/b$a;-><init>(Landroid/os/Handler;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/k$a.smali b/com.discord/smali_classes2/r0/k$a.smali
new file mode 100644
index 0000000000..c0309abbf8
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$a.smali
@@ -0,0 +1,124 @@
+.class public final Lr0/k$a;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lr0/k<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "TT;",
+            "Lokhttp3/RequestBody;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lr0/e;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/e<",
+            "TT;",
+            "Lokhttp3/RequestBody;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    iput-object p1, p0, Lr0/k$a;->a:Lr0/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/m;",
+            "TT;)V"
+        }
+    .end annotation
+
+    if-eqz p2, :cond_0
+
+    :try_start_0
+    iget-object v0, p0, Lr0/k$a;->a:Lr0/e;
+
+    invoke-interface {v0, p2}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lokhttp3/RequestBody;
+    :try_end_0
+    .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+    iput-object v0, p1, Lr0/m;->j:Lokhttp3/RequestBody;
+
+    return-void
+
+    :catch_0
+    move-exception p1
+
+    new-instance v0, Ljava/lang/RuntimeException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Unable to convert "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p2, " to RequestBody"
+
+    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {v0, p2, p1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Body parameter value must not be null."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/k$b.smali b/com.discord/smali_classes2/r0/k$b.smali
new file mode 100644
index 0000000000..5114f8065f
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$b.smali
@@ -0,0 +1,116 @@
+.class public final Lr0/k$b;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lr0/k<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public final b:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lr0/e;Z)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;Z)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    const-string v0, "name == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iput-object p1, p0, Lr0/k$b;->a:Ljava/lang/String;
+
+    iput-object p2, p0, Lr0/k$b;->b:Lr0/e;
+
+    iput-boolean p3, p0, Lr0/k$b;->c:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/m;",
+            "TT;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lr0/k$b;->b:Lr0/e;
+
+    invoke-interface {v0, p2}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/String;
+
+    if-nez p2, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lr0/k$b;->a:Ljava/lang/String;
+
+    iget-boolean v1, p0, Lr0/k$b;->c:Z
+
+    invoke-virtual {p1, v0, p2, v1}, Lr0/m;->a(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/k$c.smali b/com.discord/smali_classes2/r0/k$c.smali
new file mode 100644
index 0000000000..2c9c779d0a
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$c.smali
@@ -0,0 +1,211 @@
+.class public final Lr0/k$c;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lr0/k<",
+        "Ljava/util/Map<",
+        "Ljava/lang/String;",
+        "TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Z
+
+
+# direct methods
+.method public constructor <init>(Lr0/e;Z)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;Z)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    iput-object p1, p0, Lr0/k$c;->a:Lr0/e;
+
+    iput-boolean p2, p0, Lr0/k$c;->b:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p2, Ljava/util/Map;
+
+    if-eqz p2, :cond_4
+
+    invoke-interface {p2}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+    move-result-object p2
+
+    invoke-interface {p2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :goto_0
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    invoke-interface {p2}, 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
+
+    check-cast v1, Ljava/lang/String;
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-string v2, "\'."
+
+    if-eqz v0, :cond_1
+
+    iget-object v3, p0, Lr0/k$c;->a:Lr0/e;
+
+    invoke-interface {v3, v0}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/String;
+
+    if-eqz v3, :cond_0
+
+    iget-boolean v0, p0, Lr0/k$c;->b:Z
+
+    invoke-virtual {p1, v1, v3, v0}, Lr0/m;->a(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v3, "Field map value \'"
+
+    invoke-virtual {p2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v0, "\' converted to null by "
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v0, p0, Lr0/k$c;->a:Lr0/e;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, " for key \'"
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Field map contained null value for key \'"
+
+    invoke-static {p2, v1, v2}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Field map contained null key."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_3
+    return-void
+
+    :cond_4
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Field map was null."
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/k$d.smali b/com.discord/smali_classes2/r0/k$d.smali
new file mode 100644
index 0000000000..48441521ce
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$d.smali
@@ -0,0 +1,110 @@
+.class public final Lr0/k$d;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "d"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lr0/k<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public final b:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lr0/e;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    const-string v0, "name == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iput-object p1, p0, Lr0/k$d;->a:Ljava/lang/String;
+
+    iput-object p2, p0, Lr0/k$d;->b:Lr0/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/m;",
+            "TT;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lr0/k$d;->b:Lr0/e;
+
+    invoke-interface {v0, p2}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/String;
+
+    if-nez p2, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lr0/k$d;->a:Ljava/lang/String;
+
+    invoke-virtual {p1, v0, p2}, Lr0/m;->b(Ljava/lang/String;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/k$e.smali b/com.discord/smali_classes2/r0/k$e.smali
similarity index 77%
rename from com.discord/smali_classes2/q0/k$e.smali
rename to com.discord/smali_classes2/r0/k$e.smali
index 904a02c090..d4352e6b9c 100644
--- a/com.discord/smali_classes2/q0/k$e.smali
+++ b/com.discord/smali_classes2/r0/k$e.smali
@@ -1,11 +1,11 @@
-.class public final Lq0/k$e;
-.super Lq0/k;
+.class public final Lr0/k$e;
+.super Lr0/k;
 .source "ParameterHandler.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
+    value = Lr0/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lq0/k<",
+        "Lr0/k<",
         "TT;>;"
     }
 .end annotation
@@ -27,10 +27,10 @@
 # instance fields
 .field public final a:Lokhttp3/Headers;
 
-.field public final b:Lq0/e;
+.field public final b:Lr0/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Lokhttp3/RequestBody;",
             ">;"
@@ -40,36 +40,36 @@
 
 
 # direct methods
-.method public constructor <init>(Lokhttp3/Headers;Lq0/e;)V
+.method public constructor <init>(Lokhttp3/Headers;Lr0/e;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lokhttp3/Headers;",
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Lokhttp3/RequestBody;",
             ">;)V"
         }
     .end annotation
 
-    invoke-direct {p0}, Lq0/k;-><init>()V
+    invoke-direct {p0}, Lr0/k;-><init>()V
 
-    iput-object p1, p0, Lq0/k$e;->a:Lokhttp3/Headers;
+    iput-object p1, p0, Lr0/k$e;->a:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lq0/k$e;->b:Lq0/e;
+    iput-object p2, p0, Lr0/k$e;->b:Lr0/e;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
+.method public a(Lr0/m;Ljava/lang/Object;)V
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lq0/m;",
+            "Lr0/m;",
             "TT;)V"
         }
     .end annotation
@@ -80,9 +80,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lq0/k$e;->b:Lq0/e;
+    iget-object v0, p0, Lr0/k$e;->b:Lr0/e;
 
-    invoke-interface {v0, p2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p2}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -90,9 +90,9 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    iget-object p2, p0, Lq0/k$e;->a:Lokhttp3/Headers;
+    iget-object p2, p0, Lr0/k$e;->a:Lokhttp3/Headers;
 
-    invoke-virtual {p1, p2, v0}, Lq0/m;->c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
+    invoke-virtual {p1, p2, v0}, Lr0/m;->c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
 
     return-void
 
diff --git a/com.discord/smali_classes2/q0/k$f.smali b/com.discord/smali_classes2/r0/k$f.smali
similarity index 85%
rename from com.discord/smali_classes2/q0/k$f.smali
rename to com.discord/smali_classes2/r0/k$f.smali
index 474cf43705..3f15a51a76 100644
--- a/com.discord/smali_classes2/q0/k$f.smali
+++ b/com.discord/smali_classes2/r0/k$f.smali
@@ -1,11 +1,11 @@
-.class public final Lq0/k$f;
-.super Lq0/k;
+.class public final Lr0/k$f;
+.super Lr0/k;
 .source "ParameterHandler.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
+    value = Lr0/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lq0/k<",
+        "Lr0/k<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
         "TT;>;>;"
@@ -27,10 +27,10 @@
 
 
 # instance fields
-.field public final a:Lq0/e;
+.field public final a:Lr0/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Lokhttp3/RequestBody;",
             ">;"
@@ -42,12 +42,12 @@
 
 
 # direct methods
-.method public constructor <init>(Lq0/e;Ljava/lang/String;)V
+.method public constructor <init>(Lr0/e;Ljava/lang/String;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Lokhttp3/RequestBody;",
             ">;",
@@ -56,18 +56,18 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lq0/k;-><init>()V
+    invoke-direct {p0}, Lr0/k;-><init>()V
 
-    iput-object p1, p0, Lq0/k$f;->a:Lq0/e;
+    iput-object p1, p0, Lr0/k$f;->a:Lr0/e;
 
-    iput-object p2, p0, Lq0/k$f;->b:Ljava/lang/String;
+    iput-object p2, p0, Lr0/k$f;->b:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
+.method public a(Lr0/m;Ljava/lang/Object;)V
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -144,7 +144,7 @@
 
     const/4 v1, 0x3
 
-    iget-object v3, p0, Lq0/k$f;->b:Ljava/lang/String;
+    iget-object v3, p0, Lr0/k$f;->b:Ljava/lang/String;
 
     aput-object v3, v2, v1
 
@@ -154,15 +154,15 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lq0/k$f;->a:Lq0/e;
+    iget-object v2, p0, Lr0/k$f;->a:Lr0/e;
 
-    invoke-interface {v2, v0}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v2, v0}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lokhttp3/RequestBody;
 
-    invoke-virtual {p1, v1, v0}, Lq0/m;->c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
+    invoke-virtual {p1, v1, v0}, Lr0/m;->c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/q0/k$g.smali b/com.discord/smali_classes2/r0/k$g.smali
similarity index 75%
rename from com.discord/smali_classes2/q0/k$g.smali
rename to com.discord/smali_classes2/r0/k$g.smali
index c2fafdbdd2..afdb67664a 100644
--- a/com.discord/smali_classes2/q0/k$g.smali
+++ b/com.discord/smali_classes2/r0/k$g.smali
@@ -1,11 +1,11 @@
-.class public final Lq0/k$g;
-.super Lq0/k;
+.class public final Lr0/k$g;
+.super Lr0/k;
 .source "ParameterHandler.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
+    value = Lr0/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lq0/k<",
+        "Lr0/k<",
         "TT;>;"
     }
 .end annotation
@@ -27,10 +27,10 @@
 # instance fields
 .field public final a:Ljava/lang/String;
 
-.field public final b:Lq0/e;
+.field public final b:Lr0/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Ljava/lang/String;",
             ">;"
@@ -42,42 +42,42 @@
 
 
 # direct methods
-.method public constructor <init>(Ljava/lang/String;Lq0/e;Z)V
+.method public constructor <init>(Ljava/lang/String;Lr0/e;Z)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/lang/String;",
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Ljava/lang/String;",
             ">;Z)V"
         }
     .end annotation
 
-    invoke-direct {p0}, Lq0/k;-><init>()V
+    invoke-direct {p0}, Lr0/k;-><init>()V
 
     const-string v0, "name == null"
 
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iput-object p1, p0, Lq0/k$g;->a:Ljava/lang/String;
+    iput-object p1, p0, Lr0/k$g;->a:Ljava/lang/String;
 
-    iput-object p2, p0, Lq0/k$g;->b:Lq0/e;
+    iput-object p2, p0, Lr0/k$g;->b:Lr0/e;
 
-    iput-boolean p3, p0, Lq0/k$g;->c:Z
+    iput-boolean p3, p0, Lr0/k$g;->c:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
+.method public a(Lr0/m;Ljava/lang/Object;)V
     .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lq0/m;",
+            "Lr0/m;",
             "TT;)V"
         }
     .end annotation
@@ -96,19 +96,19 @@
 
     if-eqz v2, :cond_a
 
-    iget-object v3, v0, Lq0/k$g;->a:Ljava/lang/String;
+    iget-object v3, v0, Lr0/k$g;->a:Ljava/lang/String;
 
-    iget-object v4, v0, Lq0/k$g;->b:Lq0/e;
+    iget-object v4, v0, Lr0/k$g;->b:Lr0/e;
 
-    invoke-interface {v4, v2}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v2}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v2
 
     check-cast v2, Ljava/lang/String;
 
-    iget-boolean v4, v0, Lq0/k$g;->c:Z
+    iget-boolean v4, v0, Lr0/k$g;->c:Z
 
-    iget-object v5, v1, Lq0/m;->c:Ljava/lang/String;
+    iget-object v5, v1, Lr0/m;->c:Ljava/lang/String;
 
     if-eqz v5, :cond_9
 
@@ -176,11 +176,11 @@
 
     :cond_1
     :goto_1
-    new-instance v9, Lo0/e;
+    new-instance v9, Lp0/e;
 
-    invoke-direct {v9}, Lo0/e;-><init>()V
+    invoke-direct {v9}, Lp0/e;-><init>()V
 
-    invoke-virtual {v9, v2, v7, v8}, Lo0/e;->R(Ljava/lang/String;II)Lo0/e;
+    invoke-virtual {v9, v2, v7, v8}, Lp0/e;->R(Ljava/lang/String;II)Lp0/e;
 
     const/4 v7, 0x0
 
@@ -235,7 +235,7 @@
     goto :goto_3
 
     :cond_3
-    invoke-virtual {v9, v12}, Lo0/e;->U(I)Lo0/e;
+    invoke-virtual {v9, v12}, Lp0/e;->U(I)Lp0/e;
 
     goto :goto_5
 
@@ -243,21 +243,21 @@
     :goto_3
     if-nez v7, :cond_5
 
-    new-instance v7, Lo0/e;
+    new-instance v7, Lp0/e;
 
-    invoke-direct {v7}, Lo0/e;-><init>()V
+    invoke-direct {v7}, Lp0/e;-><init>()V
 
     :cond_5
-    invoke-virtual {v7, v12}, Lo0/e;->U(I)Lo0/e;
+    invoke-virtual {v7, v12}, Lp0/e;->U(I)Lp0/e;
 
     :goto_4
-    invoke-virtual {v7}, Lo0/e;->J()Z
+    invoke-virtual {v7}, Lp0/e;->J()Z
 
     move-result v10
 
     if-nez v10, :cond_6
 
-    invoke-virtual {v7}, Lo0/e;->readByte()B
+    invoke-virtual {v7}, Lp0/e;->readByte()B
 
     move-result v10
 
@@ -265,9 +265,9 @@
 
     const/16 v13, 0x25
 
-    invoke-virtual {v9, v13}, Lo0/e;->I(I)Lo0/e;
+    invoke-virtual {v9, v13}, Lp0/e;->I(I)Lp0/e;
 
-    sget-object v13, Lq0/m;->k:[C
+    sget-object v13, Lr0/m;->k:[C
 
     shr-int/lit8 v16, v10, 0x4
 
@@ -275,15 +275,15 @@
 
     aget-char v13, v13, v16
 
-    invoke-virtual {v9, v13}, Lo0/e;->I(I)Lo0/e;
+    invoke-virtual {v9, v13}, Lp0/e;->I(I)Lp0/e;
 
-    sget-object v13, Lq0/m;->k:[C
+    sget-object v13, Lr0/m;->k:[C
 
     and-int/lit8 v10, v10, 0xf
 
     aget-char v10, v13, v10
 
-    invoke-virtual {v9, v10}, Lo0/e;->I(I)Lo0/e;
+    invoke-virtual {v9, v10}, Lp0/e;->I(I)Lp0/e;
 
     goto :goto_4
 
@@ -300,7 +300,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v9}, Lo0/e;->v()Ljava/lang/String;
+    invoke-virtual {v9}, Lp0/e;->v()Ljava/lang/String;
 
     move-result-object v2
 
@@ -309,7 +309,7 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lq0/m;->c:Ljava/lang/String;
+    iput-object v2, v1, Lr0/m;->c:Ljava/lang/String;
 
     return-void
 
@@ -329,7 +329,7 @@
 
     move-result-object v2
 
-    iget-object v3, v0, Lq0/k$g;->a:Ljava/lang/String;
+    iget-object v3, v0, Lr0/k$g;->a:Ljava/lang/String;
 
     const-string v4, "\" value must not be null."
 
diff --git a/com.discord/smali_classes2/r0/k$h.smali b/com.discord/smali_classes2/r0/k$h.smali
new file mode 100644
index 0000000000..475622c54b
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$h.smali
@@ -0,0 +1,116 @@
+.class public final Lr0/k$h;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "h"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lr0/k<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public final b:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;Lr0/e;Z)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/String;",
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;Z)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    const-string v0, "name == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iput-object p1, p0, Lr0/k$h;->a:Ljava/lang/String;
+
+    iput-object p2, p0, Lr0/k$h;->b:Lr0/e;
+
+    iput-boolean p3, p0, Lr0/k$h;->c:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/m;",
+            "TT;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lr0/k$h;->b:Lr0/e;
+
+    invoke-interface {v0, p2}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/String;
+
+    if-nez p2, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lr0/k$h;->a:Ljava/lang/String;
+
+    iget-boolean v1, p0, Lr0/k$h;->c:Z
+
+    invoke-virtual {p1, v0, p2, v1}, Lr0/m;->d(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/q0/k$i.smali b/com.discord/smali_classes2/r0/k$i.smali
similarity index 87%
rename from com.discord/smali_classes2/q0/k$i.smali
rename to com.discord/smali_classes2/r0/k$i.smali
index 0ee0a95363..2b3f0de95e 100644
--- a/com.discord/smali_classes2/q0/k$i.smali
+++ b/com.discord/smali_classes2/r0/k$i.smali
@@ -1,11 +1,11 @@
-.class public final Lq0/k$i;
-.super Lq0/k;
+.class public final Lr0/k$i;
+.super Lr0/k;
 .source "ParameterHandler.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/k;
+    value = Lr0/k;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lq0/k<",
+        "Lr0/k<",
         "Ljava/util/Map<",
         "Ljava/lang/String;",
         "TT;>;>;"
@@ -27,10 +27,10 @@
 
 
 # instance fields
-.field public final a:Lq0/e;
+.field public final a:Lr0/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Ljava/lang/String;",
             ">;"
@@ -42,30 +42,30 @@
 
 
 # direct methods
-.method public constructor <init>(Lq0/e;Z)V
+.method public constructor <init>(Lr0/e;Z)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lq0/e<",
+            "Lr0/e<",
             "TT;",
             "Ljava/lang/String;",
             ">;Z)V"
         }
     .end annotation
 
-    invoke-direct {p0}, Lq0/k;-><init>()V
+    invoke-direct {p0}, Lr0/k;-><init>()V
 
-    iput-object p1, p0, Lq0/k$i;->a:Lq0/e;
+    iput-object p1, p0, Lr0/k$i;->a:Lr0/e;
 
-    iput-boolean p2, p0, Lq0/k$i;->b:Z
+    iput-boolean p2, p0, Lr0/k$i;->b:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public a(Lq0/m;Ljava/lang/Object;)V
+.method public a(Lr0/m;Ljava/lang/Object;)V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -114,9 +114,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lq0/k$i;->a:Lq0/e;
+    iget-object v3, p0, Lr0/k$i;->a:Lr0/e;
 
-    invoke-interface {v3, v0}, Lq0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v3, v0}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v3
 
@@ -124,9 +124,9 @@
 
     if-eqz v3, :cond_0
 
-    iget-boolean v0, p0, Lq0/k$i;->b:Z
+    iget-boolean v0, p0, Lr0/k$i;->b:Z
 
-    invoke-virtual {p1, v1, v3, v0}, Lq0/m;->d(Ljava/lang/String;Ljava/lang/String;Z)V
+    invoke-virtual {p1, v1, v3, v0}, Lr0/m;->d(Ljava/lang/String;Ljava/lang/String;Z)V
 
     goto :goto_0
 
@@ -147,7 +147,7 @@
 
     invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lq0/k$i;->a:Lq0/e;
+    iget-object v0, p0, Lr0/k$i;->a:Lr0/e;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
diff --git a/com.discord/smali_classes2/r0/k$j.smali b/com.discord/smali_classes2/r0/k$j.smali
new file mode 100644
index 0000000000..ec4cc7695a
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$j.smali
@@ -0,0 +1,102 @@
+.class public final Lr0/k$j;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "j"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lr0/k<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Z
+
+
+# direct methods
+.method public constructor <init>(Lr0/e;Z)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;Z)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    iput-object p1, p0, Lr0/k$j;->a:Lr0/e;
+
+    iput-boolean p2, p0, Lr0/k$j;->b:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/m;",
+            "TT;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Lr0/k$j;->a:Lr0/e;
+
+    invoke-interface {v0, p2}, Lr0/e;->a(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/lang/String;
+
+    const/4 v0, 0x0
+
+    iget-boolean v1, p0, Lr0/k$j;->b:Z
+
+    invoke-virtual {p1, p2, v0, v1}, Lr0/m;->d(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/k$k.smali b/com.discord/smali_classes2/r0/k$k.smali
new file mode 100644
index 0000000000..193b622b03
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$k.smali
@@ -0,0 +1,70 @@
+.class public final Lr0/k$k;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "k"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lr0/k<",
+        "Lokhttp3/MultipartBody$Part;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/k$k;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/k$k;
+
+    invoke-direct {v0}, Lr0/k$k;-><init>()V
+
+    sput-object v0, Lr0/k$k;->a:Lr0/k$k;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p2, Lokhttp3/MultipartBody$Part;
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p1, Lr0/m;->h:Lokhttp3/MultipartBody$a;
+
+    invoke-virtual {p1, p2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/MultipartBody$Part;)Lokhttp3/MultipartBody$a;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/k$l.smali b/com.discord/smali_classes2/r0/k$l.smali
new file mode 100644
index 0000000000..44535bbfa1
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k$l.smali
@@ -0,0 +1,57 @@
+.class public final Lr0/k$l;
+.super Lr0/k;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "l"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lr0/k<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/k;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/m;Ljava/lang/Object;)V
+    .locals 1
+
+    const-string v0, "@Url parameter is null."
+
+    invoke-static {p2, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    iput-object p2, p1, Lr0/m;->c:Ljava/lang/String;
+
+    return-void
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/k.smali b/com.discord/smali_classes2/r0/k.smali
new file mode 100644
index 0000000000..3f3f87d8ea
--- /dev/null
+++ b/com.discord/smali_classes2/r0/k.smali
@@ -0,0 +1,59 @@
+.class public abstract Lr0/k;
+.super Ljava/lang/Object;
+.source "ParameterHandler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/k$a;,
+        Lr0/k$f;,
+        Lr0/k$k;,
+        Lr0/k$e;,
+        Lr0/k$c;,
+        Lr0/k$b;,
+        Lr0/k$i;,
+        Lr0/k$j;,
+        Lr0/k$h;,
+        Lr0/k$g;,
+        Lr0/k$d;,
+        Lr0/k$l;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract a(Lr0/m;Ljava/lang/Object;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/m;",
+            "TT;)V"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/r0/k/a$a.smali b/com.discord/smali_classes2/r0/k/a$a.smali
deleted file mode 100644
index 842191469f..0000000000
--- a/com.discord/smali_classes2/r0/k/a$a.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class public final Lr0/k/a$a;
-.super Ljava/lang/Object;
-.source "Actions.java"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/k/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action0;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action0;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/k/a$a;->d:Lrx/functions/Action0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object p1, p0, Lr0/k/a$a;->d:Lrx/functions/Action0;
-
-    invoke-interface {p1}, Lrx/functions/Action0;->call()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/k/a$b.smali b/com.discord/smali_classes2/r0/k/a$b.smali
deleted file mode 100644
index 7133bb1211..0000000000
--- a/com.discord/smali_classes2/r0/k/a$b.smali
+++ /dev/null
@@ -1,116 +0,0 @@
-.class public final Lr0/k/a$b;
-.super Ljava/lang/Object;
-.source "Actions.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-.implements Lrx/functions/Action1;
-.implements Lrx/functions/Action2;
-.implements Lrx/functions/Action3;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/k/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T0:",
-        "Ljava/lang/Object;",
-        "T1:",
-        "Ljava/lang/Object;",
-        "T2:",
-        "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
-        "T4:",
-        "Ljava/lang/Object;",
-        "T5:",
-        "Ljava/lang/Object;",
-        "T6:",
-        "Ljava/lang/Object;",
-        "T7:",
-        "Ljava/lang/Object;",
-        "T8:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action0;",
-        "Lrx/functions/Action1<",
-        "TT0;>;",
-        "Lrx/functions/Action2<",
-        "TT0;TT1;>;",
-        "Lrx/functions/Action3<",
-        "TT0;TT1;TT2;>;",
-        "Ljava/lang/Object<",
-        "TT0;TT1;TT2;TT3;>;",
-        "Ljava/lang/Object<",
-        "TT0;TT1;TT2;TT3;TT4;>;",
-        "Ljava/lang/Object<",
-        "TT0;TT1;TT2;TT3;TT4;TT5;>;",
-        "Ljava/lang/Object<",
-        "TT0;TT1;TT2;TT3;TT4;TT5;TT6;>;",
-        "Ljava/lang/Object<",
-        "TT0;TT1;TT2;TT3;TT4;TT5;TT6;TT7;>;",
-        "Ljava/lang/Object<",
-        "TT0;TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;>;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public call(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT0;)V"
-        }
-    .end annotation
-
-    return-void
-.end method
-
-.method public call(Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT0;TT1;)V"
-        }
-    .end annotation
-
-    return-void
-.end method
-
-.method public call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT0;TT1;TT2;)V"
-        }
-    .end annotation
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/k/a.smali b/com.discord/smali_classes2/r0/k/a.smali
deleted file mode 100644
index af2e732290..0000000000
--- a/com.discord/smali_classes2/r0/k/a.smali
+++ /dev/null
@@ -1,30 +0,0 @@
-.class public final Lr0/k/a;
-.super Ljava/lang/Object;
-.source "Actions.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/k/a$a;,
-        Lr0/k/a$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/k/a$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/k/a$b;
-
-    invoke-direct {v0}, Lr0/k/a$b;-><init>()V
-
-    sput-object v0, Lr0/k/a;->a:Lr0/k/a$b;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/k/b.smali b/com.discord/smali_classes2/r0/k/b.smali
deleted file mode 100644
index f9ebcfd772..0000000000
--- a/com.discord/smali_classes2/r0/k/b.smali
+++ /dev/null
@@ -1,27 +0,0 @@
-.class public interface abstract Lr0/k/b;
-.super Ljava/lang/Object;
-.source "Func1.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract call(Ljava/lang/Object;)Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)TR;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/r0/k/c.smali b/com.discord/smali_classes2/r0/k/c.smali
deleted file mode 100644
index 57a7280a5d..0000000000
--- a/com.discord/smali_classes2/r0/k/c.smali
+++ /dev/null
@@ -1,104 +0,0 @@
-.class public final Lr0/k/c;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func9;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func9;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/c;->a:Lrx/functions/Func9;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 12
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/16 v1, 0x9
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v2, p0, Lr0/k/c;->a:Lrx/functions/Func9;
-
-    const/4 v0, 0x0
-
-    aget-object v3, p1, v0
-
-    const/4 v0, 0x1
-
-    aget-object v4, p1, v0
-
-    const/4 v0, 0x2
-
-    aget-object v5, p1, v0
-
-    const/4 v0, 0x3
-
-    aget-object v6, p1, v0
-
-    const/4 v0, 0x4
-
-    aget-object v7, p1, v0
-
-    const/4 v0, 0x5
-
-    aget-object v8, p1, v0
-
-    const/4 v0, 0x6
-
-    aget-object v9, p1, v0
-
-    const/4 v0, 0x7
-
-    aget-object v10, p1, v0
-
-    const/16 v0, 0x8
-
-    aget-object v11, p1, v0
-
-    invoke-interface/range {v2 .. v11}, Lrx/functions/Func9;->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;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func9 expecting 9 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/k/d.smali b/com.discord/smali_classes2/r0/k/d.smali
deleted file mode 100644
index 1e133b60ce..0000000000
--- a/com.discord/smali_classes2/r0/k/d.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lr0/k/d;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func2;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func2;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/d;->a:Lrx/functions/Func2;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/4 v1, 0x2
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lr0/k/d;->a:Lrx/functions/Func2;
-
-    const/4 v1, 0x0
-
-    aget-object v1, p1, v1
-
-    const/4 v2, 0x1
-
-    aget-object p1, p1, v2
-
-    invoke-interface {v0, v1, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func2 expecting 2 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/k/e.smali b/com.discord/smali_classes2/r0/k/e.smali
deleted file mode 100644
index 44282802fb..0000000000
--- a/com.discord/smali_classes2/r0/k/e.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public final Lr0/k/e;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func3;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func3;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/e;->a:Lrx/functions/Func3;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lr0/k/e;->a:Lrx/functions/Func3;
-
-    const/4 v1, 0x0
-
-    aget-object v1, p1, v1
-
-    const/4 v2, 0x1
-
-    aget-object v2, p1, v2
-
-    const/4 v3, 0x2
-
-    aget-object p1, p1, v3
-
-    invoke-interface {v0, v1, v2, p1}, Lrx/functions/Func3;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func3 expecting 3 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/k/f.smali b/com.discord/smali_classes2/r0/k/f.smali
deleted file mode 100644
index cd484e6371..0000000000
--- a/com.discord/smali_classes2/r0/k/f.smali
+++ /dev/null
@@ -1,84 +0,0 @@
-.class public final Lr0/k/f;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func4;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func4;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/f;->a:Lrx/functions/Func4;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/4 v1, 0x4
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lr0/k/f;->a:Lrx/functions/Func4;
-
-    const/4 v1, 0x0
-
-    aget-object v1, p1, v1
-
-    const/4 v2, 0x1
-
-    aget-object v2, p1, v2
-
-    const/4 v3, 0x2
-
-    aget-object v3, p1, v3
-
-    const/4 v4, 0x3
-
-    aget-object p1, p1, v4
-
-    invoke-interface {v0, v1, v2, v3, p1}, Lrx/functions/Func4;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func4 expecting 4 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/k/g.smali b/com.discord/smali_classes2/r0/k/g.smali
deleted file mode 100644
index e99972bb11..0000000000
--- a/com.discord/smali_classes2/r0/k/g.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.class public final Lr0/k/g;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func5;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func5;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/g;->a:Lrx/functions/Func5;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/4 v1, 0x5
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v2, p0, Lr0/k/g;->a:Lrx/functions/Func5;
-
-    const/4 v0, 0x0
-
-    aget-object v3, p1, v0
-
-    const/4 v0, 0x1
-
-    aget-object v4, p1, v0
-
-    const/4 v0, 0x2
-
-    aget-object v5, p1, v0
-
-    const/4 v0, 0x3
-
-    aget-object v6, p1, v0
-
-    const/4 v0, 0x4
-
-    aget-object v7, p1, v0
-
-    invoke-interface/range {v2 .. v7}, Lrx/functions/Func5;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func5 expecting 5 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/k/h.smali b/com.discord/smali_classes2/r0/k/h.smali
deleted file mode 100644
index ae3294542e..0000000000
--- a/com.discord/smali_classes2/r0/k/h.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class public final Lr0/k/h;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func6;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func6;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/h;->a:Lrx/functions/Func6;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/4 v1, 0x6
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v2, p0, Lr0/k/h;->a:Lrx/functions/Func6;
-
-    const/4 v0, 0x0
-
-    aget-object v3, p1, v0
-
-    const/4 v0, 0x1
-
-    aget-object v4, p1, v0
-
-    const/4 v0, 0x2
-
-    aget-object v5, p1, v0
-
-    const/4 v0, 0x3
-
-    aget-object v6, p1, v0
-
-    const/4 v0, 0x4
-
-    aget-object v7, p1, v0
-
-    const/4 v0, 0x5
-
-    aget-object v8, p1, v0
-
-    invoke-interface/range {v2 .. v8}, Lrx/functions/Func6;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func6 expecting 6 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/k/i.smali b/com.discord/smali_classes2/r0/k/i.smali
deleted file mode 100644
index e94694e37c..0000000000
--- a/com.discord/smali_classes2/r0/k/i.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public final Lr0/k/i;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func7;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func7;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/i;->a:Lrx/functions/Func7;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/4 v1, 0x7
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v2, p0, Lr0/k/i;->a:Lrx/functions/Func7;
-
-    const/4 v0, 0x0
-
-    aget-object v3, p1, v0
-
-    const/4 v0, 0x1
-
-    aget-object v4, p1, v0
-
-    const/4 v0, 0x2
-
-    aget-object v5, p1, v0
-
-    const/4 v0, 0x3
-
-    aget-object v6, p1, v0
-
-    const/4 v0, 0x4
-
-    aget-object v7, p1, v0
-
-    const/4 v0, 0x5
-
-    aget-object v8, p1, v0
-
-    const/4 v0, 0x6
-
-    aget-object v9, p1, v0
-
-    invoke-interface/range {v2 .. v9}, Lrx/functions/Func7;->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;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func7 expecting 7 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/k/j.smali b/com.discord/smali_classes2/r0/k/j.smali
deleted file mode 100644
index 837d5542cd..0000000000
--- a/com.discord/smali_classes2/r0/k/j.smali
+++ /dev/null
@@ -1,100 +0,0 @@
-.class public final Lr0/k/j;
-.super Ljava/lang/Object;
-.source "Functions.java"
-
-# interfaces
-.implements Lrx/functions/FuncN;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/FuncN<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic a:Lrx/functions/Func8;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func8;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/k/j;->a:Lrx/functions/Func8;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 11
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([",
-            "Ljava/lang/Object;",
-            ")TR;"
-        }
-    .end annotation
-
-    array-length v0, p1
-
-    const/16 v1, 0x8
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v2, p0, Lr0/k/j;->a:Lrx/functions/Func8;
-
-    const/4 v0, 0x0
-
-    aget-object v3, p1, v0
-
-    const/4 v0, 0x1
-
-    aget-object v4, p1, v0
-
-    const/4 v0, 0x2
-
-    aget-object v5, p1, v0
-
-    const/4 v0, 0x3
-
-    aget-object v6, p1, v0
-
-    const/4 v0, 0x4
-
-    aget-object v7, p1, v0
-
-    const/4 v0, 0x5
-
-    aget-object v8, p1, v0
-
-    const/4 v0, 0x6
-
-    aget-object v9, p1, v0
-
-    const/4 v0, 0x7
-
-    aget-object v10, p1, v0
-
-    invoke-interface/range {v2 .. v10}, Lrx/functions/Func8;->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;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string v0, "Func8 expecting 8 arguments."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l$a$a.smali b/com.discord/smali_classes2/r0/l$a$a.smali
new file mode 100644
index 0000000000..6b667b1fa0
--- /dev/null
+++ b/com.discord/smali_classes2/r0/l$a$a.smali
@@ -0,0 +1,53 @@
+.class public Lr0/l$a$a;
+.super Ljava/lang/Object;
+.source "Platform.java"
+
+# interfaces
+.implements Ljava/util/concurrent/Executor;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/l$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Landroid/os/Handler;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Landroid/os/Handler;
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    iput-object v0, p0, Lr0/l$a$a;->d:Landroid/os/Handler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public execute(Ljava/lang/Runnable;)V
+    .locals 1
+
+    iget-object v0, p0, Lr0/l$a$a;->d:Landroid/os/Handler;
+
+    invoke-virtual {v0, p1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l$a.smali b/com.discord/smali_classes2/r0/l$a.smali
new file mode 100644
index 0000000000..1a7b5121d3
--- /dev/null
+++ b/com.discord/smali_classes2/r0/l$a.smali
@@ -0,0 +1,61 @@
+.class public Lr0/l$a;
+.super Lr0/l;
+.source "Platform.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/l$a$a;
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/l;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/util/concurrent/Executor;)Lr0/c$a;
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    new-instance v0, Lr0/g;
+
+    invoke-direct {v0, p1}, Lr0/g;-><init>(Ljava/util/concurrent/Executor;)V
+
+    return-object v0
+
+    :cond_0
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+.end method
+
+.method public b()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    new-instance v0, Lr0/l$a$a;
+
+    invoke-direct {v0}, Lr0/l$a$a;-><init>()V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/l$b.smali b/com.discord/smali_classes2/r0/l$b.smali
new file mode 100644
index 0000000000..cc6c6f3a9d
--- /dev/null
+++ b/com.discord/smali_classes2/r0/l$b.smali
@@ -0,0 +1,118 @@
+.class public Lr0/l$b;
+.super Lr0/l;
+.source "Platform.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "b"
+.end annotation
+
+.annotation build Lorg/codehaus/mojo/animal_sniffer/IgnoreJRERequirement;
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/l;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs c(Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Method;",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Object;",
+            "[",
+            "Ljava/lang/Object;",
+            ")",
+            "Ljava/lang/Object;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Throwable;
+        }
+    .end annotation
+
+    const-class v0, Ljava/lang/invoke/MethodHandles$Lookup;
+
+    const/4 v1, 0x2
+
+    new-array v2, v1, [Ljava/lang/Class;
+
+    const-class v3, Ljava/lang/Class;
+
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
+
+    sget-object v3, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    const/4 v5, 0x1
+
+    aput-object v3, v2, v5
+
+    invoke-virtual {v0, v2}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+
+    move-result-object v0
+
+    invoke-virtual {v0, v5}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    aput-object p2, v1, v4
+
+    const/4 v2, -0x1
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    aput-object v2, v1, v5
+
+    invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/invoke/MethodHandles$Lookup;
+
+    invoke-virtual {v0, p1, p2}, Ljava/lang/invoke/MethodHandles$Lookup;->unreflectSpecial(Ljava/lang/reflect/Method;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;
+
+    move-result-object p1
+
+    invoke-virtual {p1, p3}, Ljava/lang/invoke/MethodHandle;->bindTo(Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;
+
+    move-result-object p1
+
+    invoke-virtual {p1, p4}, Ljava/lang/invoke/MethodHandle;->invokeWithArguments([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public d(Ljava/lang/reflect/Method;)Z
+    .locals 0
+
+    invoke-virtual {p1}, Ljava/lang/reflect/Method;->isDefault()Z
+
+    move-result p1
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/r0/l.smali b/com.discord/smali_classes2/r0/l.smali
new file mode 100644
index 0000000000..b7d83b4b20
--- /dev/null
+++ b/com.discord/smali_classes2/r0/l.smali
@@ -0,0 +1,131 @@
+.class public Lr0/l;
+.super Ljava/lang/Object;
+.source "Platform.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/l$a;,
+        Lr0/l$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/l;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    :try_start_0
+    const-string v0, "android.os.Build"
+
+    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    new-instance v0, Lr0/l$a;
+
+    invoke-direct {v0}, Lr0/l$a;-><init>()V
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    :try_start_1
+    const-string v0, "java.util.Optional"
+
+    invoke-static {v0}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    new-instance v0, Lr0/l$b;
+
+    invoke-direct {v0}, Lr0/l$b;-><init>()V
+    :try_end_1
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
+
+    goto :goto_0
+
+    :catch_1
+    new-instance v0, Lr0/l;
+
+    invoke-direct {v0}, Lr0/l;-><init>()V
+
+    :goto_0
+    sput-object v0, Lr0/l;->a:Lr0/l;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/util/concurrent/Executor;)Lr0/c$a;
+    .locals 1
+
+    if-eqz p1, :cond_0
+
+    new-instance v0, Lr0/g;
+
+    invoke-direct {v0, p1}, Lr0/g;-><init>(Ljava/util/concurrent/Executor;)V
+
+    return-object v0
+
+    :cond_0
+    sget-object p1, Lr0/f;->a:Lr0/c$a;
+
+    return-object p1
+.end method
+
+.method public b()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public varargs c(Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Method;",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Object;",
+            "[",
+            "Ljava/lang/Object;",
+            ")",
+            "Ljava/lang/Object;"
+        }
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Throwable;
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public d(Ljava/lang/reflect/Method;)Z
+    .locals 0
+
+    const/4 p1, 0x0
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a.smali b/com.discord/smali_classes2/r0/l/a/a.smali
deleted file mode 100644
index 8bf01877d6..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Lr0/l/a/a;
-.super Ljava/lang/Object;
-.source "BlockingOperatorMostRecent.java"
-
-# interfaces
-.implements Ljava/lang/Iterable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/lang/Iterable<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/Object;
-
-.field public final synthetic e:Lrx/Observable;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;Lrx/Observable;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/a;->d:Ljava/lang/Object;
-
-    iput-object p2, p0, Lr0/l/a/a;->e:Lrx/Observable;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public iterator()Ljava/util/Iterator;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lr0/l/a/c;
-
-    iget-object v1, p0, Lr0/l/a/a;->d:Ljava/lang/Object;
-
-    invoke-direct {v0, v1}, Lr0/l/a/c;-><init>(Ljava/lang/Object;)V
-
-    iget-object v1, p0, Lr0/l/a/a;->e:Lrx/Observable;
-
-    invoke-virtual {v1, v0}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
-
-    new-instance v1, Lr0/l/a/b;
-
-    invoke-direct {v1, v0}, Lr0/l/a/b;-><init>(Lr0/l/a/c;)V
-
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a0.smali b/com.discord/smali_classes2/r0/l/a/a0.smali
deleted file mode 100644
index c50dc7d279..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a0.smali
+++ /dev/null
@@ -1,79 +0,0 @@
-.class public Lr0/l/a/a0;
-.super Ljava/lang/Object;
-.source "OnSubscribeRedo.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final synthetic e:Lr0/l/b/a;
-
-.field public final synthetic f:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field public final synthetic g:Lrx/Scheduler$Worker;
-
-.field public final synthetic h:Lrx/functions/Action0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/b0;Ljava/util/concurrent/atomic/AtomicLong;Lr0/l/b/a;Ljava/util/concurrent/atomic/AtomicBoolean;Lrx/Scheduler$Worker;Lrx/functions/Action0;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/a0;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iput-object p3, p0, Lr0/l/a/a0;->e:Lr0/l/b/a;
-
-    iput-object p4, p0, Lr0/l/a/a0;->f:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    iput-object p5, p0, Lr0/l/a/a0;->g:Lrx/Scheduler$Worker;
-
-    iput-object p6, p0, Lr0/l/a/a0;->h:Lrx/functions/Action0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/a0;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    iget-object v0, p0, Lr0/l/a/a0;->e:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1, p2}, Lr0/l/b/a;->m(J)V
-
-    iget-object p1, p0, Lr0/l/a/a0;->f:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    const/4 p2, 0x1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, p2, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    iget-object p1, p0, Lr0/l/a/a0;->g:Lrx/Scheduler$Worker;
-
-    iget-object p2, p0, Lr0/l/a/a0;->h:Lrx/functions/Action0;
-
-    invoke-virtual {p1, p2}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a1$a.smali b/com.discord/smali_classes2/r0/l/a/a1$a.smali
deleted file mode 100644
index ccc426e895..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a1$a.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public final Lr0/l/a/a1$a;
-.super Ljava/lang/Object;
-.source "OperatorMerge.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/a1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/a1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/a1<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lr0/l/a/a1;
-
-    const/4 v1, 0x1
-
-    const v2, 0x7fffffff
-
-    invoke-direct {v0, v1, v2}, Lr0/l/a/a1;-><init>(ZI)V
-
-    sput-object v0, Lr0/l/a/a1$a;->a:Lr0/l/a/a1;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a1$b.smali b/com.discord/smali_classes2/r0/l/a/a1$b.smali
deleted file mode 100644
index 6a25ddc52c..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a1$b.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public final Lr0/l/a/a1$b;
-.super Ljava/lang/Object;
-.source "OperatorMerge.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/a1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/a1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/a1<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lr0/l/a/a1;
-
-    const/4 v1, 0x0
-
-    const v2, 0x7fffffff
-
-    invoke-direct {v0, v1, v2}, Lr0/l/a/a1;-><init>(ZI)V
-
-    sput-object v0, Lr0/l/a/a1$b;->a:Lr0/l/a/a1;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a1$c.smali b/com.discord/smali_classes2/r0/l/a/a1$c.smali
deleted file mode 100644
index f55628fe67..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a1$c.smali
+++ /dev/null
@@ -1,414 +0,0 @@
-.class public final Lr0/l/a/a1$c;
-.super Lrx/Subscriber;
-.source "OperatorMerge.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/a1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final i:I
-
-
-# instance fields
-.field public final d:Lr0/l/a/a1$e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/a1$e<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:J
-
-.field public volatile f:Z
-
-.field public volatile g:Lr0/l/e/h;
-
-.field public h:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    sget v0, Lr0/l/e/h;->f:I
-
-    div-int/lit8 v0, v0, 0x4
-
-    sput v0, Lr0/l/a/a1$c;->i:I
-
-    return-void
-.end method
-
-.method public constructor <init>(Lr0/l/a/a1$e;J)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/a1$e<",
-            "TT;>;J)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/a1$c;->d:Lr0/l/a/a1$e;
-
-    iput-wide p2, p0, Lr0/l/a/a1$c;->e:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(J)V
-    .locals 1
-
-    iget v0, p0, Lr0/l/a/a1$c;->h:I
-
-    long-to-int p2, p1
-
-    sub-int/2addr v0, p2
-
-    sget p1, Lr0/l/a/a1$c;->i:I
-
-    if-le v0, p1, :cond_0
-
-    iput v0, p0, Lr0/l/a/a1$c;->h:I
-
-    return-void
-
-    :cond_0
-    sget p1, Lr0/l/e/h;->f:I
-
-    iput p1, p0, Lr0/l/a/a1$c;->h:I
-
-    sub-int/2addr p1, v0
-
-    if-lez p1, :cond_1
-
-    int-to-long p1, p1
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    :cond_1
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/a1$c;->f:Z
-
-    iget-object v0, p0, Lr0/l/a/a1$c;->d:Lr0/l/a/a1$e;
-
-    invoke-virtual {v0}, Lr0/l/a/a1$e;->b()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/a1$c;->f:Z
-
-    iget-object v0, p0, Lr0/l/a/a1$c;->d:Lr0/l/a/a1$e;
-
-    invoke-virtual {v0}, Lr0/l/a/a1$e;->d()Ljava/util/Queue;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    iget-object p1, p0, Lr0/l/a/a1$c;->d:Lr0/l/a/a1$e;
-
-    invoke-virtual {p1}, Lr0/l/a/a1$e;->b()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/a1$c;->d:Lr0/l/a/a1$e;
-
-    iget-object v1, v0, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    const-wide/16 v3, 0x0
-
-    const/4 v5, 0x1
-
-    const/4 v6, 0x0
-
-    cmp-long v7, v1, v3
-
-    if-eqz v7, :cond_1
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, v0, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    iget-boolean v7, v0, Lr0/l/a/a1$e;->l:Z
-
-    if-nez v7, :cond_0
-
-    cmp-long v7, v1, v3
-
-    if-eqz v7, :cond_0
-
-    iput-boolean v5, v0, Lr0/l/a/a1$e;->l:Z
-
-    const/4 v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v3, 0x0
-
-    :goto_0
-    monitor-exit v0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-
-    :cond_1
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eqz v3, :cond_a
-
-    iget-object v3, p0, Lr0/l/a/a1$c;->g:Lr0/l/e/h;
-
-    if-eqz v3, :cond_5
-
-    iget-object v3, v3, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    if-eqz v3, :cond_3
-
-    invoke-interface {v3}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v3, 0x0
-
-    goto :goto_3
-
-    :cond_3
-    :goto_2
-    const/4 v3, 0x1
-
-    :goto_3
-    if-eqz v3, :cond_4
-
-    goto :goto_4
-
-    :cond_4
-    invoke-virtual {v0, p0, p1}, Lr0/l/a/a1$e;->f(Lr0/l/a/a1$c;Ljava/lang/Object;)V
-
-    invoke-virtual {v0}, Lr0/l/a/a1$e;->c()V
-
-    goto :goto_8
-
-    :cond_5
-    :goto_4
-    :try_start_1
-    iget-object v3, v0, Lr0/l/a/a1$e;->d:Lrx/Subscriber;
-
-    invoke-interface {v3, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    goto :goto_5
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_2
-    iget-boolean v3, v0, Lr0/l/a/a1$e;->e:Z
-
-    if-nez v3, :cond_6
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_4
-
-    :try_start_3
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-virtual {p0, p1}, Lr0/l/a/a1$c;->onError(Ljava/lang/Throwable;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    goto :goto_8
-
-    :catchall_2
-    move-exception p1
-
-    goto :goto_6
-
-    :cond_6
-    :try_start_4
-    invoke-virtual {v0}, Lr0/l/a/a1$e;->d()Ljava/util/Queue;
-
-    move-result-object v3
-
-    invoke-interface {v3, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    :goto_5
-    const-wide v3, 0x7fffffffffffffffL
-
-    cmp-long p1, v1, v3
-
-    if-eqz p1, :cond_7
-
-    iget-object p1, v0, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {p1, v5}, Lr0/l/a/a1$d;->a(I)J
-
-    :cond_7
-    const-wide/16 v1, 0x1
-
-    invoke-virtual {p0, v1, v2}, Lr0/l/a/a1$c;->a(J)V
-
-    monitor-enter v0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_4
-
-    :try_start_5
-    iget-boolean p1, v0, Lr0/l/a/a1$e;->m:Z
-
-    if-nez p1, :cond_8
-
-    iput-boolean v6, v0, Lr0/l/a/a1$e;->l:Z
-
-    monitor-exit v0
-
-    goto :goto_8
-
-    :cond_8
-    iput-boolean v6, v0, Lr0/l/a/a1$e;->m:Z
-
-    monitor-exit v0
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_3
-
-    invoke-virtual {v0}, Lr0/l/a/a1$e;->c()V
-
-    goto :goto_8
-
-    :catchall_3
-    move-exception p1
-
-    :try_start_6
-    monitor-exit v0
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_3
-
-    :try_start_7
-    throw p1
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
-
-    :catchall_4
-    move-exception p1
-
-    const/4 v5, 0x0
-
-    :goto_6
-    if-nez v5, :cond_9
-
-    monitor-enter v0
-
-    :try_start_8
-    iput-boolean v6, v0, Lr0/l/a/a1$e;->l:Z
-
-    monitor-exit v0
-
-    goto :goto_7
-
-    :catchall_5
-    move-exception p1
-
-    monitor-exit v0
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_5
-
-    throw p1
-
-    :cond_9
-    :goto_7
-    throw p1
-
-    :cond_a
-    invoke-virtual {v0, p0, p1}, Lr0/l/a/a1$e;->f(Lr0/l/a/a1$c;Ljava/lang/Object;)V
-
-    invoke-virtual {v0}, Lr0/l/a/a1$e;->b()V
-
-    :goto_8
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    sget v0, Lr0/l/e/h;->f:I
-
-    iput v0, p0, Lr0/l/a/a1$c;->h:I
-
-    int-to-long v0, v0
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a1$e.smali b/com.discord/smali_classes2/r0/l/a/a1$e.smali
deleted file mode 100644
index 78f9464a39..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a1$e.smali
+++ /dev/null
@@ -1,1746 +0,0 @@
-.class public final Lr0/l/a/a1$e;
-.super Lrx/Subscriber;
-.source "OperatorMerge.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/a1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "e"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "Lrx/Observable<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final u:[Lr0/l/a/a1$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lr0/l/a/a1$c<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Z
-
-.field public final f:I
-
-.field public g:Lr0/l/a/a1$d;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/a1$d<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public volatile h:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public volatile i:Lrx/subscriptions/CompositeSubscription;
-
-.field public volatile j:Ljava/util/concurrent/ConcurrentLinkedQueue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public volatile k:Z
-
-.field public l:Z
-
-.field public m:Z
-
-.field public final n:Ljava/lang/Object;
-
-.field public volatile o:[Lr0/l/a/a1$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lr0/l/a/a1$c<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field public p:J
-
-.field public q:J
-
-.field public r:I
-
-.field public final s:I
-
-.field public t:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Lr0/l/a/a1$c;
-
-    sput-object v0, Lr0/l/a/a1$e;->u:[Lr0/l/a/a1$c;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/Subscriber;ZI)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;ZI)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/a1$e;->d:Lrx/Subscriber;
-
-    iput-boolean p2, p0, Lr0/l/a/a1$e;->e:Z
-
-    iput p3, p0, Lr0/l/a/a1$e;->f:I
-
-    new-instance p1, Ljava/lang/Object;
-
-    invoke-direct {p1}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/a1$e;->n:Ljava/lang/Object;
-
-    sget-object p1, Lr0/l/a/a1$e;->u:[Lr0/l/a/a1$c;
-
-    iput-object p1, p0, Lr0/l/a/a1$e;->o:[Lr0/l/a/a1$c;
-
-    const p1, 0x7fffffff
-
-    if-ne p3, p1, :cond_0
-
-    iput p1, p0, Lr0/l/a/a1$e;->s:I
-
-    const-wide p1, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    goto :goto_0
-
-    :cond_0
-    shr-int/lit8 p1, p3, 0x1
-
-    const/4 p2, 0x1
-
-    invoke-static {p2, p1}, Ljava/lang/Math;->max(II)I
-
-    move-result p1
-
-    iput p1, p0, Lr0/l/a/a1$e;->s:I
-
-    int-to-long p1, p3
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Z
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/a/a1$e;->d:Lrx/Subscriber;
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    iget-boolean v2, p0, Lr0/l/a/a1$e;->e:Z
-
-    if-nez v2, :cond_1
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    :try_start_0
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->h()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return v1
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw v0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public b()V
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/a1$e;->l:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, p0, Lr0/l/a/a1$e;->m:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    iput-boolean v1, p0, Lr0/l/a/a1$e;->l:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->c()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-.end method
-
-.method public c()V
-    .locals 23
-
-    move-object/from16 v1, p0
-
-    :try_start_0
-    iget-object v4, v1, Lr0/l/a/a1$e;->d:Lrx/Subscriber;
-
-    :goto_0
-    invoke-virtual/range {p0 .. p0}, Lr0/l/a/a1$e;->a()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v5, v1, Lr0/l/a/a1$e;->h:Ljava/util/Queue;
-
-    iget-object v0, v1, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v6
-
-    const-wide v8, 0x7fffffffffffffffL
-
-    cmp-long v0, v6, v8
-
-    if-nez v0, :cond_1
-
-    const/4 v10, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v10, 0x0
-
-    :goto_1
-    const-wide/16 v11, 0x0
-
-    const-wide/16 v14, 0x1
-
-    if-eqz v5, :cond_9
-
-    const/4 v0, 0x0
-
-    :goto_2
-    move-wide/from16 v16, v6
-
-    const/4 v7, 0x0
-
-    move v6, v0
-
-    const/4 v0, 0x0
-
-    :goto_3
-    cmp-long v18, v16, v11
-
-    if-lez v18, :cond_5
-
-    invoke-interface {v5}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v18
-
-    invoke-virtual/range {p0 .. p0}, Lr0/l/a/a1$e;->a()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    return-void
-
-    :cond_2
-    if-nez v18, :cond_3
-
-    move-object/from16 v0, v18
-
-    goto :goto_5
-
-    :cond_3
-    invoke-static/range {v18 .. v18}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_8
-
-    :try_start_1
-    invoke-interface {v4, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_4
-
-    :catchall_0
-    move-exception v0
-
-    move-object/from16 v19, v0
-
-    :try_start_2
-    iget-boolean v0, v1, Lr0/l/a/a1$e;->e:Z
-
-    if-nez v0, :cond_4
-
-    invoke-static/range {v19 .. v19}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_8
-
-    :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lrx/Subscriber;->unsubscribe()V
-
-    move-object/from16 v5, v19
-
-    invoke-interface {v4, v5}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    goto/16 :goto_f
-
-    :cond_4
-    move-object/from16 v2, v19
-
-    :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lr0/l/a/a1$e;->d()Ljava/util/Queue;
-
-    move-result-object v0
-
-    invoke-interface {v0, v2}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    :goto_4
-    add-int/lit8 v6, v6, 0x1
-
-    add-int/lit8 v7, v7, 0x1
-
-    sub-long v16, v16, v14
-
-    move-object/from16 v0, v18
-
-    goto :goto_3
-
-    :cond_5
-    :goto_5
-    if-lez v7, :cond_7
-
-    if-eqz v10, :cond_6
-
-    move-wide/from16 v16, v8
-
-    goto :goto_6
-
-    :cond_6
-    iget-object v2, v1, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {v2, v7}, Lr0/l/a/a1$d;->a(I)J
-
-    move-result-wide v16
-
-    :cond_7
-    :goto_6
-    cmp-long v2, v16, v11
-
-    if-eqz v2, :cond_a
-
-    if-nez v0, :cond_8
-
-    goto :goto_7
-
-    :cond_8
-    move v0, v6
-
-    move-wide/from16 v6, v16
-
-    goto :goto_2
-
-    :cond_9
-    move-wide/from16 v16, v6
-
-    const/4 v6, 0x0
-
-    :cond_a
-    :goto_7
-    iget-boolean v0, v1, Lr0/l/a/a1$e;->k:Z
-
-    iget-object v2, v1, Lr0/l/a/a1$e;->h:Ljava/util/Queue;
-
-    iget-object v5, v1, Lr0/l/a/a1$e;->o:[Lr0/l/a/a1$c;
-
-    array-length v7, v5
-
-    if-eqz v0, :cond_e
-
-    if-eqz v2, :cond_b
-
-    invoke-interface {v2}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_e
-
-    :cond_b
-    if-nez v7, :cond_e
-
-    iget-object v0, v1, Lr0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    if-eqz v0, :cond_d
-
-    invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_c
-
-    goto :goto_8
-
-    :cond_c
-    invoke-virtual/range {p0 .. p0}, Lr0/l/a/a1$e;->h()V
-
-    goto :goto_9
-
-    :cond_d
-    :goto_8
-    invoke-interface {v4}, Lr0/g;->onCompleted()V
-
-    :goto_9
-    return-void
-
-    :cond_e
-    if-lez v7, :cond_26
-
-    iget-wide v8, v1, Lr0/l/a/a1$e;->q:J
-
-    iget v0, v1, Lr0/l/a/a1$e;->r:I
-
-    if-le v7, v0, :cond_f
-
-    aget-object v2, v5, v0
-
-    iget-wide v13, v2, Lr0/l/a/a1$c;->e:J
-
-    cmp-long v2, v13, v8
-
-    if-eqz v2, :cond_14
-
-    :cond_f
-    if-gt v7, v0, :cond_10
-
-    const/4 v0, 0x0
-
-    :cond_10
-    const/4 v2, 0x0
-
-    :goto_a
-    if-ge v2, v7, :cond_13
-
-    aget-object v13, v5, v0
-
-    iget-wide v13, v13, Lr0/l/a/a1$c;->e:J
-
-    cmp-long v15, v13, v8
-
-    if-nez v15, :cond_11
-
-    goto :goto_b
-
-    :cond_11
-    add-int/lit8 v0, v0, 0x1
-
-    if-ne v0, v7, :cond_12
-
-    const/4 v0, 0x0
-
-    :cond_12
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_a
-
-    :cond_13
-    :goto_b
-    iput v0, v1, Lr0/l/a/a1$e;->r:I
-
-    aget-object v2, v5, v0
-
-    iget-wide v8, v2, Lr0/l/a/a1$c;->e:J
-
-    iput-wide v8, v1, Lr0/l/a/a1$e;->q:J
-
-    :cond_14
-    const/4 v2, 0x0
-
-    const/4 v8, 0x0
-
-    :goto_c
-    if-ge v2, v7, :cond_25
-
-    invoke-virtual/range {p0 .. p0}, Lr0/l/a/a1$e;->a()Z
-
-    move-result v9
-
-    if-eqz v9, :cond_15
-
-    return-void
-
-    :cond_15
-    aget-object v9, v5, v0
-
-    const/4 v13, 0x0
-
-    :goto_d
-    const/4 v14, 0x0
-
-    :goto_e
-    cmp-long v15, v16, v11
-
-    if-lez v15, :cond_19
-
-    invoke-virtual/range {p0 .. p0}, Lr0/l/a/a1$e;->a()Z
-
-    move-result v15
-
-    if-eqz v15, :cond_16
-
-    return-void
-
-    :cond_16
-    iget-object v15, v9, Lr0/l/a/a1$c;->g:Lr0/l/e/h;
-
-    if-nez v15, :cond_17
-
-    goto :goto_10
-
-    :cond_17
-    invoke-virtual {v15}, Lr0/l/e/h;->d()Ljava/lang/Object;
-
-    move-result-object v13
-
-    if-nez v13, :cond_18
-
-    goto :goto_10
-
-    :cond_18
-    invoke-static {v13}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v15
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_8
-
-    :try_start_5
-    invoke-interface {v4, v15}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_2
-
-    const-wide/16 v20, 0x1
-
-    sub-long v16, v16, v20
-
-    add-int/lit8 v14, v14, 0x1
-
-    goto :goto_e
-
-    :catchall_2
-    move-exception v0
-
-    move-object v2, v0
-
-    :try_start_6
-    invoke-static {v2}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_1
-
-    :try_start_7
-    invoke-interface {v4, v2}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_3
-
-    :try_start_8
-    invoke-virtual/range {p0 .. p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-
-    :catchall_3
-    move-exception v0
-
-    move-object v2, v0
-
-    invoke-virtual/range {p0 .. p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw v2
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_1
-
-    :goto_f
-    const/4 v2, 0x1
-
-    goto/16 :goto_1a
-
-    :cond_19
-    :goto_10
-    const-wide/16 v20, 0x1
-
-    if-lez v14, :cond_1b
-
-    if-nez v10, :cond_1a
-
-    :try_start_9
-    iget-object v15, v1, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {v15, v14}, Lr0/l/a/a1$d;->a(I)J
-
-    move-result-wide v15
-
-    move-object/from16 v22, v4
-
-    goto :goto_11
-
-    :cond_1a
-    move-object/from16 v22, v4
-
-    const-wide v15, 0x7fffffffffffffffL
-
-    :goto_11
-    int-to-long v3, v14
-
-    invoke-virtual {v9, v3, v4}, Lr0/l/a/a1$c;->a(J)V
-
-    move-wide/from16 v16, v15
-
-    goto :goto_12
-
-    :cond_1b
-    move-object/from16 v22, v4
-
-    :goto_12
-    cmp-long v3, v16, v11
-
-    if-eqz v3, :cond_1d
-
-    if-nez v13, :cond_1c
-
-    goto :goto_13
-
-    :cond_1c
-    move-object/from16 v4, v22
-
-    goto :goto_d
-
-    :cond_1d
-    :goto_13
-    iget-boolean v4, v9, Lr0/l/a/a1$c;->f:Z
-
-    iget-object v13, v9, Lr0/l/a/a1$c;->g:Lr0/l/e/h;
-
-    if-eqz v4, :cond_22
-
-    if-eqz v13, :cond_20
-
-    iget-object v4, v13, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    if-eqz v4, :cond_1f
-
-    invoke-interface {v4}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1e
-
-    goto :goto_14
-
-    :cond_1e
-    const/4 v4, 0x0
-
-    goto :goto_15
-
-    :cond_1f
-    :goto_14
-    const/4 v4, 0x1
-
-    :goto_15
-    if-eqz v4, :cond_22
-
-    :cond_20
-    invoke-virtual {v1, v9}, Lr0/l/a/a1$e;->g(Lr0/l/a/a1$c;)V
-
-    invoke-virtual/range {p0 .. p0}, Lr0/l/a/a1$e;->a()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_21
-
-    return-void
-
-    :cond_21
-    add-int/lit8 v6, v6, 0x1
-
-    const/4 v8, 0x1
-
-    :cond_22
-    if-nez v3, :cond_23
-
-    goto :goto_16
-
-    :cond_23
-    add-int/lit8 v0, v0, 0x1
-
-    if-ne v0, v7, :cond_24
-
-    const/4 v0, 0x0
-
-    :cond_24
-    add-int/lit8 v2, v2, 0x1
-
-    move-object/from16 v4, v22
-
-    goto/16 :goto_c
-
-    :cond_25
-    move-object/from16 v22, v4
-
-    :goto_16
-    iput v0, v1, Lr0/l/a/a1$e;->r:I
-
-    aget-object v0, v5, v0
-
-    iget-wide v2, v0, Lr0/l/a/a1$c;->e:J
-
-    iput-wide v2, v1, Lr0/l/a/a1$e;->q:J
-
-    goto :goto_17
-
-    :cond_26
-    move-object/from16 v22, v4
-
-    const/4 v8, 0x0
-
-    :goto_17
-    if-lez v6, :cond_27
-
-    int-to-long v2, v6
-
-    invoke-virtual {v1, v2, v3}, Lrx/Subscriber;->request(J)V
-
-    :cond_27
-    if-eqz v8, :cond_28
-
-    :goto_18
-    move-object/from16 v4, v22
-
-    goto/16 :goto_0
-
-    :cond_28
-    monitor-enter p0
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_8
-
-    :try_start_a
-    iget-boolean v0, v1, Lr0/l/a/a1$e;->m:Z
-    :try_end_a
-    .catchall {:try_start_a .. :try_end_a} :catchall_5
-
-    if-nez v0, :cond_29
-
-    const/4 v2, 0x0
-
-    :try_start_b
-    iput-boolean v2, v1, Lr0/l/a/a1$e;->l:Z
-
-    monitor-exit p0
-    :try_end_b
-    .catchall {:try_start_b .. :try_end_b} :catchall_4
-
-    return-void
-
-    :catchall_4
-    move-exception v0
-
-    const/4 v2, 0x1
-
-    goto :goto_19
-
-    :cond_29
-    const/4 v2, 0x0
-
-    :try_start_c
-    iput-boolean v2, v1, Lr0/l/a/a1$e;->m:Z
-
-    monitor-exit p0
-    :try_end_c
-    .catchall {:try_start_c .. :try_end_c} :catchall_5
-
-    goto :goto_18
-
-    :catchall_5
-    move-exception v0
-
-    const/4 v2, 0x0
-
-    :goto_19
-    :try_start_d
-    monitor-exit p0
-    :try_end_d
-    .catchall {:try_start_d .. :try_end_d} :catchall_7
-
-    :try_start_e
-    throw v0
-    :try_end_e
-    .catchall {:try_start_e .. :try_end_e} :catchall_6
-
-    :catchall_6
-    move-exception v0
-
-    goto :goto_1a
-
-    :catchall_7
-    move-exception v0
-
-    goto :goto_19
-
-    :catchall_8
-    move-exception v0
-
-    const/4 v2, 0x0
-
-    :goto_1a
-    if-nez v2, :cond_2a
-
-    monitor-enter p0
-
-    const/4 v2, 0x0
-
-    :try_start_f
-    iput-boolean v2, v1, Lr0/l/a/a1$e;->l:Z
-
-    monitor-exit p0
-
-    goto :goto_1b
-
-    :catchall_9
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_f
-    .catchall {:try_start_f .. :try_end_f} :catchall_9
-
-    throw v0
-
-    :cond_2a
-    :goto_1b
-    throw v0
-.end method
-
-.method public d()Ljava/util/Queue;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Queue<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    if-nez v0, :cond_1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    :cond_0
-    monitor-exit p0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    return-object v0
-.end method
-
-.method public e(Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/a1$e;->h:Ljava/util/Queue;
-
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_4
-
-    iget v0, p0, Lr0/l/a/a1$e;->f:I
-
-    const v2, 0x7fffffff
-
-    if-ne v0, v2, :cond_0
-
-    new-instance v0, Lr0/l/e/m/g;
-
-    sget v2, Lr0/l/e/h;->f:I
-
-    invoke-direct {v0, v2}, Lr0/l/e/m/g;-><init>(I)V
-
-    goto :goto_2
-
-    :cond_0
-    add-int/lit8 v2, v0, -0x1
-
-    and-int/2addr v2, v0
-
-    if-nez v2, :cond_1
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eqz v2, :cond_3
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    new-instance v2, Lr0/l/e/n/n;
-
-    invoke-direct {v2, v0}, Lr0/l/e/n/n;-><init>(I)V
-
-    goto :goto_1
-
-    :cond_2
-    new-instance v2, Lr0/l/e/m/c;
-
-    invoke-direct {v2, v0}, Lr0/l/e/m/c;-><init>(I)V
-
-    goto :goto_1
-
-    :cond_3
-    new-instance v2, Lr0/l/e/m/d;
-
-    invoke-direct {v2, v0}, Lr0/l/e/m/d;-><init>(I)V
-
-    :goto_1
-    move-object v0, v2
-
-    :goto_2
-    iput-object v0, p0, Lr0/l/a/a1$e;->h:Ljava/util/Queue;
-
-    :cond_4
-    if-nez p1, :cond_5
-
-    sget-object v2, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    goto :goto_3
-
-    :cond_5
-    move-object v2, p1
-
-    :goto_3
-    invoke-interface {v0, v2}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_6
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    new-instance v0, Lrx/exceptions/MissingBackpressureException;
-
-    invoke-direct {v0}, Lrx/exceptions/MissingBackpressureException;-><init>()V
-
-    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->d()Ljava/util/Queue;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    iput-boolean v1, p0, Lr0/l/a/a1$e;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->b()V
-
-    :cond_6
-    return-void
-.end method
-
-.method public f(Lr0/l/a/a1$c;Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/a1$c<",
-            "TT;>;TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p1, Lr0/l/a/a1$c;->g:Lr0/l/e/h;
-
-    if-nez v0, :cond_1
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lr0/l/e/h;
-
-    const/4 v1, 0x0
-
-    sget v2, Lr0/l/e/h;->f:I
-
-    invoke-direct {v0, v1, v2}, Lr0/l/e/h;-><init>(ZI)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lr0/l/e/h;
-
-    invoke-direct {v0}, Lr0/l/e/h;-><init>()V
-
-    :goto_0
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iput-object v0, p1, Lr0/l/a/a1$c;->g:Lr0/l/e/h;
-
-    :cond_1
-    if-nez p2, :cond_2
-
-    :try_start_0
-    sget-object p2, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_2
-    invoke-virtual {v0, p2}, Lr0/l/e/h;->b(Ljava/lang/Object;)V
-    :try_end_0
-    .catch Lrx/exceptions/MissingBackpressureException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception p2
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-virtual {p1, p2}, Lr0/l/a/a1$c;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :catch_1
-    move-exception p2
-
-    invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-virtual {p1, p2}, Lr0/l/a/a1$c;->onError(Ljava/lang/Throwable;)V
-
-    :cond_3
-    :goto_1
-    return-void
-.end method
-
-.method public g(Lr0/l/a/a1$c;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/a1$c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    iget-object v0, p1, Lr0/l/a/a1$c;->g:Lr0/l/e/h;
-
-    if-eqz v0, :cond_0
-
-    monitor-enter v0
-
-    monitor-exit v0
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
-
-    iget-object v0, p0, Lr0/l/a/a1$e;->n:Ljava/lang/Object;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/a1$e;->o:[Lr0/l/a/a1$c;
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_0
-    if-ge v4, v2, :cond_2
-
-    aget-object v5, v1, v4
-
-    invoke-virtual {p1, v5}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v4, -0x1
-
-    :goto_1
-    if-gez v4, :cond_3
-
-    monitor-exit v0
-
-    return-void
-
-    :cond_3
-    const/4 p1, 0x1
-
-    if-ne v2, p1, :cond_4
-
-    sget-object p1, Lr0/l/a/a1$e;->u:[Lr0/l/a/a1$c;
-
-    iput-object p1, p0, Lr0/l/a/a1$e;->o:[Lr0/l/a/a1$c;
-
-    monitor-exit v0
-
-    return-void
-
-    :cond_4
-    add-int/lit8 v5, v2, -0x1
-
-    new-array v5, v5, [Lr0/l/a/a1$c;
-
-    invoke-static {v1, v3, v5, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    add-int/lit8 v3, v4, 0x1
-
-    sub-int/2addr v2, v4
-
-    sub-int/2addr v2, p1
-
-    invoke-static {v1, v3, v5, v4, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v5, p0, Lr0/l/a/a1$e;->o:[Lr0/l/a/a1$c;
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-.end method
-
-.method public final h()V
-    .locals 3
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    iget-object v1, p0, Lr0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    if-ne v1, v2, :cond_0
-
-    iget-object v1, p0, Lr0/l/a/a1$e;->d:Lrx/Subscriber;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    invoke-interface {v1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, p0, Lr0/l/a/a1$e;->d:Lrx/Subscriber;
-
-    new-instance v2, Lrx/exceptions/CompositeException;
-
-    invoke-direct {v2, v0}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    invoke-interface {v1, v2}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/a1$e;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->b()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->d()Ljava/util/Queue;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/a1$e;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->b()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 7
-
-    check-cast p1, Lrx/Observable;
-
-    if-nez p1, :cond_0
-
-    goto/16 :goto_9
-
-    :cond_0
-    sget-object v0, Lr0/l/a/f;->e:Lrx/Observable;
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-ne p1, v0, :cond_2
-
-    iget p1, p0, Lr0/l/a/a1$e;->t:I
-
-    add-int/2addr p1, v1
-
-    iget v0, p0, Lr0/l/a/a1$e;->s:I
-
-    if-ne p1, v0, :cond_1
-
-    iput v2, p0, Lr0/l/a/a1$e;->t:I
-
-    int-to-long v0, p1
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    goto/16 :goto_9
-
-    :cond_1
-    iput p1, p0, Lr0/l/a/a1$e;->t:I
-
-    goto/16 :goto_9
-
-    :cond_2
-    instance-of v0, p1, Lr0/l/e/j;
-
-    if-eqz v0, :cond_d
-
-    check-cast p1, Lr0/l/e/j;
-
-    iget-object p1, p1, Lr0/l/e/j;->e:Ljava/lang/Object;
-
-    iget-object v0, p0, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    const-wide/16 v5, 0x0
-
-    cmp-long v0, v3, v5
-
-    if-eqz v0, :cond_4
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    iget-boolean v0, p0, Lr0/l/a/a1$e;->l:Z
-
-    if-nez v0, :cond_3
-
-    cmp-long v0, v3, v5
-
-    if-eqz v0, :cond_3
-
-    iput-boolean v1, p0, Lr0/l/a/a1$e;->l:Z
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v0, 0x0
-
-    :goto_0
-    monitor-exit p0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-
-    :cond_4
-    const/4 v0, 0x0
-
-    :goto_1
-    if-eqz v0, :cond_c
-
-    iget-object v0, p0, Lr0/l/a/a1$e;->h:Ljava/util/Queue;
-
-    if-eqz v0, :cond_6
-
-    invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    invoke-virtual {p0, p1}, Lr0/l/a/a1$e;->e(Ljava/lang/Object;)V
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->c()V
-
-    goto/16 :goto_9
-
-    :cond_6
-    :goto_2
-    :try_start_1
-    iget-object v0, p0, Lr0/l/a/a1$e;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    goto :goto_3
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_2
-    iget-boolean v0, p0, Lr0/l/a/a1$e;->e:Z
-
-    if-nez v0, :cond_7
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_4
-
-    :try_start_3
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->d()Ljava/util/Queue;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    iput-boolean v1, p0, Lr0/l/a/a1$e;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->b()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    goto/16 :goto_9
-
-    :catchall_2
-    move-exception p1
-
-    goto :goto_5
-
-    :cond_7
-    :try_start_4
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->d()Ljava/util/Queue;
-
-    move-result-object v0
-
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    :goto_3
-    const-wide v5, 0x7fffffffffffffffL
-
-    cmp-long p1, v3, v5
-
-    if-eqz p1, :cond_8
-
-    iget-object p1, p0, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {p1, v1}, Lr0/l/a/a1$d;->a(I)J
-
-    :cond_8
-    iget p1, p0, Lr0/l/a/a1$e;->t:I
-
-    add-int/2addr p1, v1
-
-    iget v0, p0, Lr0/l/a/a1$e;->s:I
-
-    if-ne p1, v0, :cond_9
-
-    iput v2, p0, Lr0/l/a/a1$e;->t:I
-
-    int-to-long v3, p1
-
-    invoke-virtual {p0, v3, v4}, Lrx/Subscriber;->request(J)V
-
-    goto :goto_4
-
-    :cond_9
-    iput p1, p0, Lr0/l/a/a1$e;->t:I
-
-    :goto_4
-    monitor-enter p0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_4
-
-    :try_start_5
-    iget-boolean p1, p0, Lr0/l/a/a1$e;->m:Z
-
-    if-nez p1, :cond_a
-
-    iput-boolean v2, p0, Lr0/l/a/a1$e;->l:Z
-
-    monitor-exit p0
-
-    goto :goto_9
-
-    :cond_a
-    iput-boolean v2, p0, Lr0/l/a/a1$e;->m:Z
-
-    monitor-exit p0
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_3
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->c()V
-
-    goto :goto_9
-
-    :catchall_3
-    move-exception p1
-
-    :try_start_6
-    monitor-exit p0
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_3
-
-    :try_start_7
-    throw p1
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_2
-
-    :catchall_4
-    move-exception p1
-
-    const/4 v1, 0x0
-
-    :goto_5
-    if-nez v1, :cond_b
-
-    monitor-enter p0
-
-    :try_start_8
-    iput-boolean v2, p0, Lr0/l/a/a1$e;->l:Z
-
-    monitor-exit p0
-
-    goto :goto_6
-
-    :catchall_5
-    move-exception p1
-
-    monitor-exit p0
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_5
-
-    throw p1
-
-    :cond_b
-    :goto_6
-    throw p1
-
-    :cond_c
-    invoke-virtual {p0, p1}, Lr0/l/a/a1$e;->e(Ljava/lang/Object;)V
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->b()V
-
-    goto :goto_9
-
-    :cond_d
-    new-instance v0, Lr0/l/a/a1$c;
-
-    iget-wide v3, p0, Lr0/l/a/a1$e;->p:J
-
-    const-wide/16 v5, 0x1
-
-    add-long/2addr v5, v3
-
-    iput-wide v5, p0, Lr0/l/a/a1$e;->p:J
-
-    invoke-direct {v0, p0, v3, v4}, Lr0/l/a/a1$c;-><init>(Lr0/l/a/a1$e;J)V
-
-    iget-object v3, p0, Lr0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
-
-    if-nez v3, :cond_f
-
-    monitor-enter p0
-
-    :try_start_9
-    iget-object v3, p0, Lr0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
-
-    if-nez v3, :cond_e
-
-    new-instance v3, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v3}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object v3, p0, Lr0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
-
-    goto :goto_7
-
-    :cond_e
-    const/4 v1, 0x0
-
-    :goto_7
-    monitor-exit p0
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_6
-
-    if-eqz v1, :cond_f
-
-    invoke-virtual {p0, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    goto :goto_8
-
-    :catchall_6
-    move-exception p1
-
-    :try_start_a
-    monitor-exit p0
-    :try_end_a
-    .catchall {:try_start_a .. :try_end_a} :catchall_6
-
-    throw p1
-
-    :cond_f
-    :goto_8
-    invoke-virtual {v3, v0}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    iget-object v1, p0, Lr0/l/a/a1$e;->n:Ljava/lang/Object;
-
-    monitor-enter v1
-
-    :try_start_b
-    iget-object v3, p0, Lr0/l/a/a1$e;->o:[Lr0/l/a/a1$c;
-
-    array-length v4, v3
-
-    add-int/lit8 v5, v4, 0x1
-
-    new-array v5, v5, [Lr0/l/a/a1$c;
-
-    invoke-static {v3, v2, v5, v2, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    aput-object v0, v5, v4
-
-    iput-object v5, p0, Lr0/l/a/a1$e;->o:[Lr0/l/a/a1$c;
-
-    monitor-exit v1
-    :try_end_b
-    .catchall {:try_start_b .. :try_end_b} :catchall_7
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    invoke-virtual {p0}, Lr0/l/a/a1$e;->b()V
-
-    :goto_9
-    return-void
-
-    :catchall_7
-    move-exception p1
-
-    :try_start_c
-    monitor-exit v1
-    :try_end_c
-    .catchall {:try_start_c .. :try_end_c} :catchall_7
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a1.smali b/com.discord/smali_classes2/r0/l/a/a1.smali
deleted file mode 100644
index d782027160..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a1.smali
+++ /dev/null
@@ -1,79 +0,0 @@
-.class public final Lr0/l/a/a1;
-.super Ljava/lang/Object;
-.source "OperatorMerge.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/a1$c;,
-        Lr0/l/a/a1$e;,
-        Lr0/l/a/a1$d;,
-        Lr0/l/a/a1$a;,
-        Lr0/l/a/a1$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Z
-
-.field public final e:I
-
-
-# direct methods
-.method public constructor <init>(ZI)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Lr0/l/a/a1;->d:Z
-
-    iput p2, p0, Lr0/l/a/a1;->e:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/a1$e;
-
-    iget-boolean v1, p0, Lr0/l/a/a1;->d:Z
-
-    iget v2, p0, Lr0/l/a/a1;->e:I
-
-    invoke-direct {v0, p1, v1, v2}, Lr0/l/a/a1$e;-><init>(Lrx/Subscriber;ZI)V
-
-    new-instance v1, Lr0/l/a/a1$d;
-
-    invoke-direct {v1, v0}, Lr0/l/a/a1$d;-><init>(Lr0/l/a/a1$e;)V
-
-    iput-object v1, v0, Lr0/l/a/a1$e;->g:Lr0/l/a/a1$d;
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a2$a$a$a.smali b/com.discord/smali_classes2/r0/l/a/a2$a$a$a.smali
deleted file mode 100644
index f3c8988d00..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a2$a$a$a.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public Lr0/l/a/a2$a$a$a;
-.super Ljava/lang/Object;
-.source "OperatorSubscribeOn.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/a2$a$a;->m(J)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:J
-
-.field public final synthetic e:Lr0/l/a/a2$a$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/a2$a$a;J)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/a2$a$a$a;->e:Lr0/l/a/a2$a$a;
-
-    iput-wide p2, p0, Lr0/l/a/a2$a$a$a;->d:J
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/a/a2$a$a$a;->e:Lr0/l/a/a2$a$a;
-
-    iget-object v0, v0, Lr0/l/a/a2$a$a;->d:Lrx/Producer;
-
-    iget-wide v1, p0, Lr0/l/a/a2$a$a$a;->d:J
-
-    invoke-interface {v0, v1, v2}, Lrx/Producer;->m(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a2$a$a.smali b/com.discord/smali_classes2/r0/l/a/a2$a$a.smali
deleted file mode 100644
index 5044426cf6..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a2$a$a.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public Lr0/l/a/a2$a$a;
-.super Ljava/lang/Object;
-.source "OperatorSubscribeOn.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/a2$a;->setProducer(Lrx/Producer;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Producer;
-
-.field public final synthetic e:Lr0/l/a/a2$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/a2$a;Lrx/Producer;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/a2$a$a;->e:Lr0/l/a/a2$a;
-
-    iput-object p2, p0, Lr0/l/a/a2$a$a;->d:Lrx/Producer;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/a2$a$a;->e:Lr0/l/a/a2$a;
-
-    iget-object v0, v0, Lr0/l/a/a2$a;->h:Ljava/lang/Thread;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    if-eq v0, v1, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/a2$a$a;->e:Lr0/l/a/a2$a;
-
-    iget-boolean v1, v0, Lr0/l/a/a2$a;->e:Z
-
-    if-nez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, v0, Lr0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
-
-    new-instance v1, Lr0/l/a/a2$a$a$a;
-
-    invoke-direct {v1, p0, p1, p2}, Lr0/l/a/a2$a$a$a;-><init>(Lr0/l/a/a2$a$a;J)V
-
-    invoke-virtual {v0, v1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lr0/l/a/a2$a$a;->d:Lrx/Producer;
-
-    invoke-interface {v0, p1, p2}, Lrx/Producer;->m(J)V
-
-    :goto_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a2$a.smali b/com.discord/smali_classes2/r0/l/a/a2$a.smali
deleted file mode 100644
index 9b1c86770d..0000000000
--- a/com.discord/smali_classes2/r0/l/a/a2$a.smali
+++ /dev/null
@@ -1,185 +0,0 @@
-.class public final Lr0/l/a/a2$a;
-.super Lrx/Subscriber;
-.source "OperatorSubscribeOn.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/a2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;",
-        "Lrx/functions/Action0;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Z
-
-.field public final f:Lrx/Scheduler$Worker;
-
-.field public g:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public h:Ljava/lang/Thread;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;ZLrx/Scheduler$Worker;Lrx/Observable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;Z",
-            "Lrx/Scheduler$Worker;",
-            "Lrx/Observable<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/a2$a;->d:Lrx/Subscriber;
-
-    iput-boolean p2, p0, Lr0/l/a/a2$a;->e:Z
-
-    iput-object p3, p0, Lr0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
-
-    iput-object p4, p0, Lr0/l/a/a2$a;->g:Lrx/Observable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/a2$a;->g:Lrx/Observable;
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lr0/l/a/a2$a;->g:Lrx/Observable;
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lr0/l/a/a2$a;->h:Ljava/lang/Thread;
-
-    invoke-virtual {v0, p0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/a2$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
-
-    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
-
-    throw v0
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/a2$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object p1, p0, Lr0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
-
-    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v0, p0, Lr0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    throw p1
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/a2$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/a2$a;->d:Lrx/Subscriber;
-
-    new-instance v1, Lr0/l/a/a2$a$a;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/a/a2$a$a;-><init>(Lr0/l/a/a2$a;Lrx/Producer;)V
-
-    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/b.smali b/com.discord/smali_classes2/r0/l/a/b.smali
deleted file mode 100644
index 29ea136bbd..0000000000
--- a/com.discord/smali_classes2/r0/l/a/b.smali
+++ /dev/null
@@ -1,146 +0,0 @@
-.class public Lr0/l/a/b;
-.super Ljava/lang/Object;
-.source "BlockingOperatorMostRecent.java"
-
-# interfaces
-.implements Ljava/util/Iterator;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/util/Iterator<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Ljava/lang/Object;
-
-.field public final synthetic e:Lr0/l/a/c;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/c;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/b;->e:Lr0/l/a/c;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public hasNext()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/b;->e:Lr0/l/a/c;
-
-    iget-object v0, v0, Lr0/l/a/c;->d:Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    invoke-static {v0}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    xor-int/lit8 v0, v0, 0x1
-
-    return v0
-.end method
-
-.method public next()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    if-nez v1, :cond_0
-
-    iget-object v1, p0, Lr0/l/a/b;->e:Lr0/l/a/c;
-
-    iget-object v1, v1, Lr0/l/a/c;->d:Ljava/lang/Object;
-
-    iput-object v1, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    :cond_0
-    iget-object v1, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    invoke-static {v1}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    iget-object v1, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    instance-of v1, v1, Lr0/l/a/h$c;
-
-    if-nez v1, :cond_1
-
-    iget-object v1, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    invoke-static {v1}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iput-object v0, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    return-object v1
-
-    :cond_1
-    :try_start_1
-    iget-object v1, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    check-cast v1, Lr0/l/a/h$c;
-
-    iget-object v1, v1, Lr0/l/a/h$c;->e:Ljava/lang/Throwable;
-
-    invoke-static {v1}, Lf/n/a/k/a;->R(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-
-    :cond_2
-    :try_start_2
-    new-instance v1, Ljava/util/NoSuchElementException;
-
-    invoke-direct {v1}, Ljava/util/NoSuchElementException;-><init>()V
-
-    throw v1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :catchall_0
-    move-exception v1
-
-    iput-object v0, p0, Lr0/l/a/b;->d:Ljava/lang/Object;
-
-    throw v1
-.end method
-
-.method public remove()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    const-string v1, "Read only iterator"
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/b0.smali b/com.discord/smali_classes2/r0/l/a/b0.smali
deleted file mode 100644
index 146e961333..0000000000
--- a/com.discord/smali_classes2/r0/l/a/b0.smali
+++ /dev/null
@@ -1,232 +0,0 @@
-.class public final Lr0/l/a/b0;
-.super Ljava/lang/Object;
-.source "OnSubscribeRedo.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-",
-            "Lrx/Observable<",
-            "+",
-            "Lr0/f<",
-            "*>;>;+",
-            "Lrx/Observable<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Z
-
-.field public final g:Z
-
-.field public final h:Lrx/Scheduler;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;Lr0/k/b;ZZLrx/Scheduler;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "TT;>;",
-            "Lr0/k/b<",
-            "-",
-            "Lrx/Observable<",
-            "+",
-            "Lr0/f<",
-            "*>;>;+",
-            "Lrx/Observable<",
-            "*>;>;ZZ",
-            "Lrx/Scheduler;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/b0;->d:Lrx/Observable;
-
-    iput-object p2, p0, Lr0/l/a/b0;->e:Lr0/k/b;
-
-    iput-boolean p3, p0, Lr0/l/a/b0;->f:Z
-
-    iput-boolean p4, p0, Lr0/l/a/b0;->g:Z
-
-    iput-object p5, p0, Lr0/l/a/b0;->h:Lrx/Scheduler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 14
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v8, Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    const/4 v0, 0x1
-
-    invoke-direct {v8, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
-
-    new-instance v9, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {v9}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iget-object v0, p0, Lr0/l/a/b0;->h:Lrx/Scheduler;
-
-    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v10
-
-    invoke-virtual {p1, v10}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v6, Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {v6}, Lrx/subscriptions/SerialSubscription;-><init>()V
-
-    invoke-virtual {p1, v6}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->g0()Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    const-class v1, Lrx/subjects/BehaviorSubject;
-
-    const-class v2, Lrx/subjects/SerializedSubject;
-
-    if-ne v1, v2, :cond_0
-
-    check-cast v0, Lrx/subjects/SerializedSubject;
-
-    move-object v7, v0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lrx/subjects/SerializedSubject;
-
-    invoke-direct {v1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
-
-    move-object v7, v1
-
-    :goto_0
-    sget-object v0, Lr0/n/a;->a:Lr0/g;
-
-    new-instance v1, Lr0/n/d;
-
-    invoke-direct {v1, v0}, Lr0/n/d;-><init>(Lr0/g;)V
-
-    invoke-virtual {v7, v1}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
-
-    new-instance v11, Lr0/l/b/a;
-
-    invoke-direct {v11}, Lr0/l/b/a;-><init>()V
-
-    new-instance v12, Lr0/l/a/w;
-
-    move-object v0, v12
-
-    move-object v1, p0
-
-    move-object v2, p1
-
-    move-object v3, v7
-
-    move-object v4, v11
-
-    move-object v5, v9
-
-    invoke-direct/range {v0 .. v6}, Lr0/l/a/w;-><init>(Lr0/l/a/b0;Lrx/Subscriber;Lrx/subjects/Subject;Lr0/l/b/a;Ljava/util/concurrent/atomic/AtomicLong;Lrx/subscriptions/SerialSubscription;)V
-
-    iget-object v0, p0, Lr0/l/a/b0;->e:Lr0/k/b;
-
-    new-instance v1, Lr0/l/a/y;
-
-    invoke-direct {v1, p0}, Lr0/l/a/y;-><init>(Lr0/l/a/b0;)V
-
-    new-instance v2, Lr0/l/a/u;
-
-    iget-object v3, v7, Lrx/Observable;->d:Lrx/Observable$a;
-
-    invoke-direct {v2, v3, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
-
-    invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v2, v0
-
-    check-cast v2, Lrx/Observable;
-
-    new-instance v13, Lr0/l/a/z;
-
-    move-object v0, v13
-
-    move-object v1, p0
-
-    move-object v3, p1
-
-    move-object v4, v9
-
-    move-object v5, v10
-
-    move-object v6, v12
-
-    move-object v7, v8
-
-    invoke-direct/range {v0 .. v7}, Lr0/l/a/z;-><init>(Lr0/l/a/b0;Lrx/Observable;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicLong;Lrx/Scheduler$Worker;Lrx/functions/Action0;Ljava/util/concurrent/atomic/AtomicBoolean;)V
-
-    invoke-virtual {v10, v13}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    new-instance v7, Lr0/l/a/a0;
-
-    move-object v0, v7
-
-    move-object v2, v9
-
-    move-object v3, v11
-
-    move-object v4, v8
-
-    invoke-direct/range {v0 .. v6}, Lr0/l/a/a0;-><init>(Lr0/l/a/b0;Ljava/util/concurrent/atomic/AtomicLong;Lr0/l/b/a;Ljava/util/concurrent/atomic/AtomicBoolean;Lrx/Scheduler$Worker;Lrx/functions/Action0;)V
-
-    invoke-virtual {p1, v7}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/b1.smali b/com.discord/smali_classes2/r0/l/a/b1.smali
deleted file mode 100644
index 9ac7fabf10..0000000000
--- a/com.discord/smali_classes2/r0/l/a/b1.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class public Lr0/l/a/b1;
-.super Ljava/lang/Object;
-.source "OperatorObserveOn.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/c1$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/c1$a;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/b1;->d:Lr0/l/a/c1$a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/b1;->d:Lr0/l/a/c1$a;
-
-    iget-object v0, v0, Lr0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    iget-object p1, p0, Lr0/l/a/b1;->d:Lr0/l/a/c1$a;
-
-    invoke-virtual {p1}, Lr0/l/a/c1$a;->b()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/b2$a.smali b/com.discord/smali_classes2/r0/l/a/b2$a.smali
deleted file mode 100644
index 0b011d2881..0000000000
--- a/com.discord/smali_classes2/r0/l/a/b2$a.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lr0/l/a/b2$a;
-.super Ljava/lang/Object;
-.source "OperatorSwitch.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/b2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/b2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/b2<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lr0/l/a/b2;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lr0/l/a/b2;-><init>(Z)V
-
-    sput-object v0, Lr0/l/a/b2$a;->a:Lr0/l/a/b2;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/b2$b.smali b/com.discord/smali_classes2/r0/l/a/b2$b.smali
deleted file mode 100644
index fb10ffa638..0000000000
--- a/com.discord/smali_classes2/r0/l/a/b2$b.smali
+++ /dev/null
@@ -1,286 +0,0 @@
-.class public final Lr0/l/a/b2$b;
-.super Lrx/Subscriber;
-.source "OperatorSwitch.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/b2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:Lr0/l/a/b2$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/b2$c<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(JLr0/l/a/b2$c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J",
-            "Lr0/l/a/b2$c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-wide p1, p0, Lr0/l/a/b2$b;->d:J
-
-    iput-object p3, p0, Lr0/l/a/b2$b;->e:Lr0/l/a/b2$c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/b2$b;->e:Lr0/l/a/b2$c;
-
-    iget-wide v1, p0, Lr0/l/a/b2$b;->d:J
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v3, v0, Lr0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    cmp-long v5, v3, v1
-
-    if-eqz v5, :cond_0
-
-    monitor-exit v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    iput-boolean v1, v0, Lr0/l/a/b2$c;->o:Z
-
-    const/4 v1, 0x0
-
-    iput-object v1, v0, Lr0/l/a/b2$c;->l:Lrx/Producer;
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Lr0/l/a/b2$c;->b()V
-
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    :try_start_1
-    monitor-exit v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/b2$b;->e:Lr0/l/a/b2$c;
-
-    iget-wide v1, p0, Lr0/l/a/b2$b;->d:J
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v3, v0, Lr0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    cmp-long v5, v3, v1
-
-    if-nez v5, :cond_0
-
-    invoke-virtual {v0, p1}, Lr0/l/a/b2$c;->c(Ljava/lang/Throwable;)Z
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    iput-boolean v2, v0, Lr0/l/a/b2$c;->o:Z
-
-    const/4 v2, 0x0
-
-    iput-object v2, v0, Lr0/l/a/b2$c;->l:Lrx/Producer;
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x1
-
-    :goto_0
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v0}, Lr0/l/a/b2$c;->b()V
-
-    goto :goto_1
-
-    :cond_1
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :goto_1
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/b2$b;->e:Lr0/l/a/b2$c;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, v0, Lr0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    iget-wide v3, p0, Lr0/l/a/b2$b;->d:J
-
-    cmp-long v5, v1, v3
-
-    if-eqz v5, :cond_0
-
-    monitor-exit v0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, v0, Lr0/l/a/b2$c;->h:Lr0/l/e/m/e;
-
-    if-nez p1, :cond_1
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_1
-    invoke-virtual {v1, p0, p1}, Lr0/l/e/m/e;->j(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Lr0/l/a/b2$c;->b()V
-
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/b2$b;->e:Lr0/l/a/b2$c;
-
-    iget-wide v1, p0, Lr0/l/a/b2$b;->d:J
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v3, v0, Lr0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    cmp-long v5, v3, v1
-
-    if-eqz v5, :cond_0
-
-    monitor-exit v0
-
-    goto :goto_0
-
-    :cond_0
-    iget-wide v1, v0, Lr0/l/a/b2$c;->k:J
-
-    iput-object p1, v0, Lr0/l/a/b2$c;->l:Lrx/Producer;
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-interface {p1, v1, v2}, Lrx/Producer;->m(J)V
-
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/b2$c.smali b/com.discord/smali_classes2/r0/l/a/b2$c.smali
deleted file mode 100644
index bef0245895..0000000000
--- a/com.discord/smali_classes2/r0/l/a/b2$c.smali
+++ /dev/null
@@ -1,632 +0,0 @@
-.class public final Lr0/l/a/b2$c;
-.super Lrx/Subscriber;
-.source "OperatorSwitch.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/b2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "Lrx/Observable<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final p:Ljava/lang/Throwable;
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/subscriptions/SerialSubscription;
-
-.field public final f:Z
-
-.field public final g:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final h:Lr0/l/e/m/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/e/m/e<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public i:Z
-
-.field public j:Z
-
-.field public k:J
-
-.field public l:Lrx/Producer;
-
-.field public volatile m:Z
-
-.field public n:Ljava/lang/Throwable;
-
-.field public o:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/Throwable;
-
-    const-string v1, "Terminal error"
-
-    invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lr0/l/a/b2$c;->p:Ljava/lang/Throwable;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/Subscriber;Z)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;Z)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/b2$c;->d:Lrx/Subscriber;
-
-    new-instance p1, Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
-
-    iput-boolean p2, p0, Lr0/l/a/b2$c;->f:Z
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance p1, Lr0/l/e/m/e;
-
-    sget p2, Lr0/l/e/h;->f:I
-
-    invoke-direct {p1, p2}, Lr0/l/e/m/e;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/b2$c;->h:Lr0/l/e/m/e;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(ZZLjava/lang/Throwable;Lr0/l/e/m/e;Lrx/Subscriber;Z)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Ljava/lang/Throwable;",
-            "Lr0/l/e/m/e<",
-            "Ljava/lang/Object;",
-            ">;",
-            "Lrx/Subscriber<",
-            "-TT;>;Z)Z"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/b2$c;->f:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_1
-
-    if-eqz p1, :cond_3
-
-    if-nez p2, :cond_3
-
-    if-eqz p6, :cond_3
-
-    if-eqz p3, :cond_0
-
-    invoke-interface {p5, p3}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {p5}, Lr0/g;->onCompleted()V
-
-    :goto_0
-    return v1
-
-    :cond_1
-    if-eqz p3, :cond_2
-
-    invoke-virtual {p4}, Lr0/l/e/m/e;->clear()V
-
-    invoke-interface {p5, p3}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return v1
-
-    :cond_2
-    if-eqz p1, :cond_3
-
-    if-nez p2, :cond_3
-
-    if-eqz p6, :cond_3
-
-    invoke-interface {p5}, Lr0/g;->onCompleted()V
-
-    return v1
-
-    :cond_3
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public b()V
-    .locals 20
-
-    move-object/from16 v8, p0
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, v8, Lr0/l/a/b2$c;->i:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, v8, Lr0/l/a/b2$c;->j:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    iput-boolean v1, v8, Lr0/l/a/b2$c;->i:Z
-
-    iget-boolean v0, v8, Lr0/l/a/b2$c;->o:Z
-
-    iget-wide v1, v8, Lr0/l/a/b2$c;->k:J
-
-    iget-object v3, v8, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    if-eqz v3, :cond_1
-
-    sget-object v4, Lr0/l/a/b2$c;->p:Ljava/lang/Throwable;
-
-    if-eq v3, v4, :cond_1
-
-    iget-boolean v4, v8, Lr0/l/a/b2$c;->f:Z
-
-    if-nez v4, :cond_1
-
-    sget-object v4, Lr0/l/a/b2$c;->p:Ljava/lang/Throwable;
-
-    iput-object v4, v8, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    :cond_1
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    iget-object v9, v8, Lr0/l/a/b2$c;->h:Lr0/l/e/m/e;
-
-    iget-object v10, v8, Lr0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iget-object v11, v8, Lr0/l/a/b2$c;->d:Lrx/Subscriber;
-
-    iget-boolean v4, v8, Lr0/l/a/b2$c;->m:Z
-
-    move-wide v12, v1
-
-    move-object v14, v3
-
-    move v15, v4
-
-    :goto_0
-    const-wide/16 v1, 0x0
-
-    move-wide/from16 v16, v1
-
-    :cond_2
-    :goto_1
-    cmp-long v18, v16, v12
-
-    if-eqz v18, :cond_6
-
-    invoke-virtual {v11}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    return-void
-
-    :cond_3
-    invoke-virtual {v9}, Lr0/l/e/m/e;->isEmpty()Z
-
-    move-result v19
-
-    move-object/from16 v1, p0
-
-    move v2, v15
-
-    move v3, v0
-
-    move-object v4, v14
-
-    move-object v5, v9
-
-    move-object v6, v11
-
-    move/from16 v7, v19
-
-    invoke-virtual/range {v1 .. v7}, Lr0/l/a/b2$c;->a(ZZLjava/lang/Throwable;Lr0/l/e/m/e;Lrx/Subscriber;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    return-void
-
-    :cond_4
-    if-eqz v19, :cond_5
-
-    goto :goto_2
-
-    :cond_5
-    invoke-virtual {v9}, Lr0/l/e/m/e;->poll()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lr0/l/a/b2$b;
-
-    invoke-virtual {v9}, Lr0/l/e/m/e;->poll()Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-static {v2}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    invoke-virtual {v10}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    iget-wide v5, v1, Lr0/l/a/b2$b;->d:J
-
-    cmp-long v1, v3, v5
-
-    if-nez v1, :cond_2
-
-    invoke-interface {v11, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    const-wide/16 v1, 0x1
-
-    add-long v16, v16, v1
-
-    goto :goto_1
-
-    :cond_6
-    :goto_2
-    if-nez v18, :cond_8
-
-    invoke-virtual {v11}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_7
-
-    return-void
-
-    :cond_7
-    iget-boolean v2, v8, Lr0/l/a/b2$c;->m:Z
-
-    invoke-virtual {v9}, Lr0/l/e/m/e;->isEmpty()Z
-
-    move-result v7
-
-    move-object/from16 v1, p0
-
-    move v3, v0
-
-    move-object v4, v14
-
-    move-object v5, v9
-
-    move-object v6, v11
-
-    invoke-virtual/range {v1 .. v7}, Lr0/l/a/b2$c;->a(ZZLjava/lang/Throwable;Lr0/l/e/m/e;Lrx/Subscriber;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_8
-
-    return-void
-
-    :cond_8
-    monitor-enter p0
-
-    :try_start_1
-    iget-wide v0, v8, Lr0/l/a/b2$c;->k:J
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_9
-
-    sub-long v0, v0, v16
-
-    iput-wide v0, v8, Lr0/l/a/b2$c;->k:J
-
-    :cond_9
-    move-wide v12, v0
-
-    iget-boolean v0, v8, Lr0/l/a/b2$c;->j:Z
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_a
-
-    iput-boolean v1, v8, Lr0/l/a/b2$c;->i:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_a
-    iput-boolean v1, v8, Lr0/l/a/b2$c;->j:Z
-
-    iget-boolean v15, v8, Lr0/l/a/b2$c;->m:Z
-
-    iget-boolean v0, v8, Lr0/l/a/b2$c;->o:Z
-
-    iget-object v14, v8, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    if-eqz v14, :cond_b
-
-    sget-object v1, Lr0/l/a/b2$c;->p:Ljava/lang/Throwable;
-
-    if-eq v14, v1, :cond_b
-
-    iget-boolean v1, v8, Lr0/l/a/b2$c;->f:Z
-
-    if-nez v1, :cond_b
-
-    sget-object v1, Lr0/l/a/b2$c;->p:Ljava/lang/Throwable;
-
-    iput-object v1, v8, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    :cond_b
-    monitor-exit p0
-
-    goto/16 :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-
-    :catchall_1
-    move-exception v0
-
-    :try_start_2
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v0
-.end method
-
-.method public c(Ljava/lang/Throwable;)Z
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    sget-object v1, Lr0/l/a/b2$c;->p:Ljava/lang/Throwable;
-
-    const/4 v2, 0x0
-
-    if-ne v0, v1, :cond_0
-
-    return v2
-
-    :cond_0
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_1
-
-    iput-object p1, p0, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_1
-    instance-of v3, v0, Lrx/exceptions/CompositeException;
-
-    if-eqz v3, :cond_2
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    check-cast v0, Lrx/exceptions/CompositeException;
-
-    iget-object v0, v0, Lrx/exceptions/CompositeException;->exceptions:Ljava/util/List;
-
-    invoke-direct {v2, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    invoke-virtual {v2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    new-instance p1, Lrx/exceptions/CompositeException;
-
-    invoke-direct {p1, v2}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    iput-object p1, p0, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v3, Lrx/exceptions/CompositeException;
-
-    const/4 v4, 0x2
-
-    new-array v4, v4, [Ljava/lang/Throwable;
-
-    aput-object v0, v4, v2
-
-    aput-object p1, v4, v1
-
-    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
-
-    iput-object v3, p0, Lr0/l/a/b2$c;->n:Ljava/lang/Throwable;
-
-    :goto_0
-    return v1
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/b2$c;->m:Z
-
-    invoke-virtual {p0}, Lr0/l/a/b2$c;->b()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-virtual {p0, p1}, Lr0/l/a/b2$c;->c(Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/b2$c;->m:Z
-
-    invoke-virtual {p0}, Lr0/l/a/b2$c;->b()V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 3
-
-    check-cast p1, Lrx/Observable;
-
-    iget-object v0, p0, Lr0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Lr0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
-
-    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->d:Lr0/l/d/a;
-
-    invoke-virtual {v2}, Lr0/l/d/a;->a()Lrx/Subscription;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_0
-
-    invoke-interface {v2}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    new-instance v2, Lr0/l/a/b2$b;
-
-    invoke-direct {v2, v0, v1, p0}, Lr0/l/a/b2$b;-><init>(JLr0/l/a/b2$c;)V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/b2$c;->o:Z
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lr0/l/a/b2$c;->l:Lrx/Producer;
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v0, v2}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v2}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/b2.smali b/com.discord/smali_classes2/r0/l/a/b2.smali
deleted file mode 100644
index 44b5af3230..0000000000
--- a/com.discord/smali_classes2/r0/l/a/b2.smali
+++ /dev/null
@@ -1,89 +0,0 @@
-.class public final Lr0/l/a/b2;
-.super Ljava/lang/Object;
-.source "OperatorSwitch.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/b2$b;,
-        Lr0/l/a/b2$c;,
-        Lr0/l/a/b2$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;",
-        "Lrx/Observable<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Z
-
-
-# direct methods
-.method public constructor <init>(Z)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Lr0/l/a/b2;->d:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/b2$c;
-
-    iget-boolean v1, p0, Lr0/l/a/b2;->d:Z
-
-    invoke-direct {v0, p1, v1}, Lr0/l/a/b2$c;-><init>(Lrx/Subscriber;Z)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object p1, v0, Lr0/l/a/b2$c;->d:Lrx/Subscriber;
-
-    iget-object v1, v0, Lr0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object p1, v0, Lr0/l/a/b2$c;->d:Lrx/Subscriber;
-
-    new-instance v1, Lr0/l/a/c2;
-
-    invoke-direct {v1, v0}, Lr0/l/a/c2;-><init>(Lr0/l/a/b2$c;)V
-
-    new-instance v2, Lr0/r/a;
-
-    invoke-direct {v2, v1}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object p1, v0, Lr0/l/a/b2$c;->d:Lrx/Subscriber;
-
-    new-instance v1, Lr0/l/a/d2;
-
-    invoke-direct {v1, v0}, Lr0/l/a/d2;-><init>(Lr0/l/a/b2$c;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/c.smali b/com.discord/smali_classes2/r0/l/a/c.smali
deleted file mode 100644
index 079c156c70..0000000000
--- a/com.discord/smali_classes2/r0/l/a/c.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public final Lr0/l/a/c;
-.super Lrx/Subscriber;
-.source "BlockingOperatorMostRecent.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public volatile d:Ljava/lang/Object;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    iput-object p1, p0, Lr0/l/a/c;->d:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    sget-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/a/c;->d:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/h$c;
-
-    invoke-direct {v0, p1}, Lr0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
-
-    iput-object v0, p0, Lr0/l/a/c;->d:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    iput-object p1, p0, Lr0/l/a/c;->d:Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/c0.smali b/com.discord/smali_classes2/r0/l/a/c0.smali
deleted file mode 100644
index d5559ca66f..0000000000
--- a/com.discord/smali_classes2/r0/l/a/c0.smali
+++ /dev/null
@@ -1,123 +0,0 @@
-.class public Lr0/l/a/c0;
-.super Ljava/lang/Object;
-.source "OnSubscribeRefCount.java"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Lrx/Subscription;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-.field public final synthetic e:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field public final synthetic f:Lr0/l/a/f0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/f0;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicBoolean;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/c0;->f:Lr0/l/a/f0;
-
-    iput-object p2, p0, Lr0/l/a/c0;->d:Lrx/Subscriber;
-
-    iput-object p3, p0, Lr0/l/a/c0;->e:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 5
-
-    check-cast p1, Lrx/Subscription;
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/c0;->f:Lr0/l/a/f0;
-
-    iget-object v1, v1, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v1, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    iget-object p1, p0, Lr0/l/a/c0;->f:Lr0/l/a/f0;
-
-    iget-object v1, p0, Lr0/l/a/c0;->d:Lrx/Subscriber;
-
-    iget-object v2, p0, Lr0/l/a/c0;->f:Lr0/l/a/f0;
-
-    iget-object v2, v2, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    if-eqz p1, :cond_0
-
-    new-instance v3, Lr0/l/a/e0;
-
-    invoke-direct {v3, p1, v2}, Lr0/l/a/e0;-><init>(Lr0/l/a/f0;Lrx/subscriptions/CompositeSubscription;)V
-
-    new-instance v4, Lr0/r/a;
-
-    invoke-direct {v4, v3}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {v1, v4}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v3, p1, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    new-instance v4, Lr0/l/a/d0;
-
-    invoke-direct {v4, p1, v1, v1, v2}, Lr0/l/a/d0;-><init>(Lr0/l/a/f0;Lrx/Subscriber;Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
-
-    invoke-virtual {v3, v4}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object p1, p0, Lr0/l/a/c0;->f:Lr0/l/a/f0;
-
-    iget-object p1, p1, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    iget-object p1, p0, Lr0/l/a/c0;->e:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
-
-    return-void
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :try_start_1
-    throw p1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v1, p0, Lr0/l/a/c0;->f:Lr0/l/a/f0;
-
-    iget-object v1, v1, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    iget-object v1, p0, Lr0/l/a/c0;->e:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/c1$a.smali b/com.discord/smali_classes2/r0/l/a/c1$a.smali
deleted file mode 100644
index 710f206c5b..0000000000
--- a/com.discord/smali_classes2/r0/l/a/c1$a.smali
+++ /dev/null
@@ -1,529 +0,0 @@
-.class public final Lr0/l/a/c1$a;
-.super Lrx/Subscriber;
-.source "OperatorObserveOn.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/c1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;",
-        "Lrx/functions/Action0;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/Scheduler$Worker;
-
-.field public final f:Z
-
-.field public final g:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final h:I
-
-.field public volatile i:Z
-
-.field public final j:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final k:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public l:Ljava/lang/Throwable;
-
-.field public m:J
-
-
-# direct methods
-.method public constructor <init>(Lrx/Scheduler;Lrx/Subscriber;ZI)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Scheduler;",
-            "Lrx/Subscriber<",
-            "-TT;>;ZI)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/c1$a;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iput-object p2, p0, Lr0/l/a/c1$a;->d:Lrx/Subscriber;
-
-    invoke-virtual {p1}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    iput-boolean p3, p0, Lr0/l/a/c1$a;->f:Z
-
-    if-lez p4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget p4, Lr0/l/e/h;->f:I
-
-    :goto_0
-    shr-int/lit8 p1, p4, 0x2
-
-    sub-int p1, p4, p1
-
-    iput p1, p0, Lr0/l/a/c1$a;->h:I
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    new-instance p1, Lr0/l/e/n/n;
-
-    invoke-direct {p1, p4}, Lr0/l/e/n/n;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/c1$a;->g:Ljava/util/Queue;
-
-    goto :goto_1
-
-    :cond_1
-    new-instance p1, Lr0/l/e/m/c;
-
-    invoke-direct {p1, p4}, Lr0/l/e/m/c;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/c1$a;->g:Ljava/util/Queue;
-
-    :goto_1
-    int-to-long p1, p4
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Lrx/Subscriber<",
-            "-TT;>;",
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;)Z"
-        }
-    .end annotation
-
-    invoke-virtual {p3}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p4}, Ljava/util/Queue;->clear()V
-
-    return v1
-
-    :cond_0
-    if-eqz p1, :cond_4
-
-    iget-boolean p1, p0, Lr0/l/a/c1$a;->f:Z
-
-    if-eqz p1, :cond_2
-
-    if-eqz p2, :cond_4
-
-    iget-object p1, p0, Lr0/l/a/c1$a;->l:Ljava/lang/Throwable;
-
-    if-eqz p1, :cond_1
-
-    :try_start_0
-    invoke-interface {p3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {p3}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :goto_0
-    iget-object p1, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    iget-object p2, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {p2}, Lrx/Subscription;->unsubscribe()V
-
-    throw p1
-
-    :cond_2
-    iget-object p1, p0, Lr0/l/a/c1$a;->l:Ljava/lang/Throwable;
-
-    if-eqz p1, :cond_3
-
-    invoke-interface {p4}, Ljava/util/Queue;->clear()V
-
-    :try_start_1
-    invoke-interface {p3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    iget-object p1, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
-
-    return v1
-
-    :catchall_1
-    move-exception p1
-
-    iget-object p2, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {p2}, Lrx/Subscription;->unsubscribe()V
-
-    throw p1
-
-    :cond_3
-    if-eqz p2, :cond_4
-
-    :try_start_2
-    invoke-interface {p3}, Lr0/g;->onCompleted()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    iget-object p1, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
-
-    return v1
-
-    :catchall_2
-    move-exception p1
-
-    iget-object p2, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {p2}, Lrx/Subscription;->unsubscribe()V
-
-    throw p1
-
-    :cond_4
-    :goto_1
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public b()V
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/a/c1$a;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
-
-    move-result-wide v0
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-virtual {v0, p0}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    :cond_0
-    return-void
-.end method
-
-.method public call()V
-    .locals 17
-
-    move-object/from16 v0, p0
-
-    iget-wide v1, v0, Lr0/l/a/c1$a;->m:J
-
-    iget-object v3, v0, Lr0/l/a/c1$a;->g:Ljava/util/Queue;
-
-    iget-object v4, v0, Lr0/l/a/c1$a;->d:Lrx/Subscriber;
-
-    const-wide/16 v5, 0x1
-
-    move-wide v7, v5
-
-    :cond_0
-    iget-object v9, v0, Lr0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v9}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v9
-
-    :cond_1
-    :goto_0
-    cmp-long v13, v9, v1
-
-    if-eqz v13, :cond_5
-
-    iget-boolean v14, v0, Lr0/l/a/c1$a;->i:Z
-
-    invoke-interface {v3}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v15
-
-    if-nez v15, :cond_2
-
-    const/16 v16, 0x1
-
-    const/4 v11, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/16 v16, 0x0
-
-    const/4 v11, 0x0
-
-    :goto_1
-    invoke-virtual {v0, v14, v11, v4, v3}, Lr0/l/a/c1$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_3
-
-    return-void
-
-    :cond_3
-    if-eqz v11, :cond_4
-
-    goto :goto_2
-
-    :cond_4
-    invoke-static {v15}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v11
-
-    invoke-interface {v4, v11}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    add-long/2addr v1, v5
-
-    iget v11, v0, Lr0/l/a/c1$a;->h:I
-
-    int-to-long v11, v11
-
-    cmp-long v13, v1, v11
-
-    if-nez v13, :cond_1
-
-    iget-object v9, v0, Lr0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v9, v1, v2}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    move-result-wide v9
-
-    invoke-virtual {v0, v1, v2}, Lrx/Subscriber;->request(J)V
-
-    const-wide/16 v1, 0x0
-
-    goto :goto_0
-
-    :cond_5
-    :goto_2
-    if-nez v13, :cond_6
-
-    iget-boolean v9, v0, Lr0/l/a/c1$a;->i:Z
-
-    invoke-interface {v3}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v10
-
-    invoke-virtual {v0, v9, v10, v4, v3}, Lr0/l/a/c1$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_6
-
-    return-void
-
-    :cond_6
-    iput-wide v1, v0, Lr0/l/a/c1$a;->m:J
-
-    iget-object v9, v0, Lr0/l/a/c1$a;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    neg-long v7, v7
-
-    invoke-virtual {v9, v7, v8}, Ljava/util/concurrent/atomic/AtomicLong;->addAndGet(J)J
-
-    move-result-wide v7
-
-    const-wide/16 v9, 0x0
-
-    cmp-long v11, v7, v9
-
-    if-nez v11, :cond_0
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget-boolean v0, p0, Lr0/l/a/c1$a;->i:Z
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/c1$a;->i:Z
-
-    invoke-virtual {p0}, Lr0/l/a/c1$a;->b()V
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget-boolean v0, p0, Lr0/l/a/c1$a;->i:Z
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iput-object p1, p0, Lr0/l/a/c1$a;->l:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/c1$a;->i:Z
-
-    invoke-virtual {p0}, Lr0/l/a/c1$a;->b()V
-
-    return-void
-
-    :cond_1
-    :goto_0
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    iget-boolean v0, p0, Lr0/l/a/c1$a;->i:Z
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/c1$a;->g:Ljava/util/Queue;
-
-    if-nez p1, :cond_1
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_1
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_2
-
-    new-instance p1, Lrx/exceptions/MissingBackpressureException;
-
-    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
-
-    invoke-virtual {p0, p1}, Lr0/l/a/c1$a;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_2
-    invoke-virtual {p0}, Lr0/l/a/c1$a;->b()V
-
-    :cond_3
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/c1.smali b/com.discord/smali_classes2/r0/l/a/c1.smali
deleted file mode 100644
index 4be01a44a9..0000000000
--- a/com.discord/smali_classes2/r0/l/a/c1.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final Lr0/l/a/c1;
-.super Ljava/lang/Object;
-.source "OperatorObserveOn.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/c1$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Scheduler;
-
-.field public final e:Z
-
-.field public final f:I
-
-
-# direct methods
-.method public constructor <init>(Lrx/Scheduler;ZI)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/c1;->d:Lrx/Scheduler;
-
-    iput-boolean p2, p0, Lr0/l/a/c1;->e:Z
-
-    if-lez p3, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    sget p3, Lr0/l/e/h;->f:I
-
-    :goto_0
-    iput p3, p0, Lr0/l/a/c1;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/c1;->d:Lrx/Scheduler;
-
-    instance-of v1, v0, Lr0/l/c/l;
-
-    if-eqz v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lr0/l/a/c1$a;
-
-    iget-boolean v2, p0, Lr0/l/a/c1;->e:Z
-
-    iget v3, p0, Lr0/l/a/c1;->f:I
-
-    invoke-direct {v1, v0, p1, v2, v3}, Lr0/l/a/c1$a;-><init>(Lrx/Scheduler;Lrx/Subscriber;ZI)V
-
-    iget-object p1, v1, Lr0/l/a/c1$a;->d:Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/b1;
-
-    invoke-direct {v0, v1}, Lr0/l/a/b1;-><init>(Lr0/l/a/c1$a;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    iget-object v0, v1, Lr0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    move-object p1, v1
-
-    :goto_0
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/c2.smali b/com.discord/smali_classes2/r0/l/a/c2.smali
deleted file mode 100644
index df0a498ea4..0000000000
--- a/com.discord/smali_classes2/r0/l/a/c2.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public Lr0/l/a/c2;
-.super Ljava/lang/Object;
-.source "OperatorSwitch.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/b2$c;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/b2$c;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/c2;->d:Lr0/l/a/b2$c;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/c2;->d:Lr0/l/a/b2$c;
-
-    monitor-enter v0
-
-    const/4 v1, 0x0
-
-    :try_start_0
-    iput-object v1, v0, Lr0/l/a/b2$c;->l:Lrx/Producer;
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/d$a.smali b/com.discord/smali_classes2/r0/l/a/d$a.smali
deleted file mode 100644
index 8ba2d087b1..0000000000
--- a/com.discord/smali_classes2/r0/l/a/d$a.smali
+++ /dev/null
@@ -1,150 +0,0 @@
-.class public final Lr0/l/a/d$a;
-.super Ljava/lang/Object;
-.source "DeferredScalarSubscriber.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/d;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/l/a/d;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/d<",
-            "**>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/d;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/d<",
-            "**>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/d$a;->d:Lr0/l/a/d;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 4
-
-    iget-object v0, p0, Lr0/l/a/d$a;->d:Lr0/l/a/d;
-
-    if-eqz v0, :cond_5
-
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p1, v1
-
-    if-ltz v3, :cond_4
-
-    if-eqz v3, :cond_3
-
-    iget-object p1, v0, Lr0/l/a/d;->d:Lrx/Subscriber;
-
-    :cond_0
-    iget-object p2, v0, Lr0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
-
-    move-result p2
-
-    const/4 v1, 0x1
-
-    if-eq p2, v1, :cond_3
-
-    const/4 v2, 0x3
-
-    if-eq p2, v2, :cond_3
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v3, 0x2
-
-    if-ne p2, v3, :cond_2
-
-    iget-object p2, v0, Lr0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {p2, v3, v2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_3
-
-    iget-object p2, v0, Lr0/l/a/d;->f:Ljava/lang/Object;
-
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p2
-
-    if-nez p2, :cond_3
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    goto :goto_0
-
-    :cond_2
-    iget-object p2, v0, Lr0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p2, v2, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result p2
-
-    if-eqz p2, :cond_0
-
-    :cond_3
-    :goto_0
-    return-void
-
-    :cond_4
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "n >= 0 required but it was "
-
-    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_5
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/d.smali b/com.discord/smali_classes2/r0/l/a/d.smali
deleted file mode 100644
index 77855b21c6..0000000000
--- a/com.discord/smali_classes2/r0/l/a/d.smali
+++ /dev/null
@@ -1,164 +0,0 @@
-.class public abstract Lr0/l/a/d;
-.super Lrx/Subscriber;
-.source "DeferredScalarSubscriber.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/d$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-.field public f:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TR;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/d;->d:Lrx/Subscriber;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 6
-
-    iget-boolean v0, p0, Lr0/l/a/d;->e:Z
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lr0/l/a/d;->f:Ljava/lang/Object;
-
-    iget-object v1, p0, Lr0/l/a/d;->d:Lrx/Subscriber;
-
-    :cond_0
-    iget-object v2, p0, Lr0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
-
-    move-result v2
-
-    const/4 v3, 0x2
-
-    if-eq v2, v3, :cond_5
-
-    const/4 v4, 0x3
-
-    if-eq v2, v4, :cond_5
-
-    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v5, 0x1
-
-    if-ne v2, v5, :cond_3
-
-    invoke-interface {v1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    invoke-interface {v1}, Lr0/g;->onCompleted()V
-
-    :cond_2
-    iget-object v0, p0, Lr0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->lazySet(I)V
-
-    goto :goto_0
-
-    :cond_3
-    iput-object v0, p0, Lr0/l/a/d;->f:Ljava/lang/Object;
-
-    iget-object v2, p0, Lr0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    const/4 v4, 0x0
-
-    invoke-virtual {v2, v4, v3}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    goto :goto_0
-
-    :cond_4
-    iget-object v0, p0, Lr0/l/a/d;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    :cond_5
-    :goto_0
-    return-void
-.end method
-
-.method public final setProducer(Lrx/Producer;)V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/d0.smali b/com.discord/smali_classes2/r0/l/a/d0.smali
deleted file mode 100644
index 9c4c122c60..0000000000
--- a/com.discord/smali_classes2/r0/l/a/d0.smali
+++ /dev/null
@@ -1,157 +0,0 @@
-.class public Lr0/l/a/d0;
-.super Lrx/Subscriber;
-.source "OnSubscribeRefCount.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-.field public final synthetic e:Lrx/subscriptions/CompositeSubscription;
-
-.field public final synthetic f:Lr0/l/a/f0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/f0;Lrx/Subscriber;Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iput-object p3, p0, Lr0/l/a/d0;->d:Lrx/Subscriber;
-
-    iput-object p4, p0, Lr0/l/a/d0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-object v1, p0, Lr0/l/a/d0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    if-ne v0, v1, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    instance-of v0, v0, Lrx/Subscription;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    check-cast v0, Lrx/Subscription;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    new-instance v1, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object v1, v0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->set(I)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_1
-    iget-object v0, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/d0;->f:Lr0/l/a/f0;
-
-    iget-object v1, v1, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    throw v0
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    invoke-virtual {p0}, Lr0/l/a/d0;->a()V
-
-    iget-object v0, p0, Lr0/l/a/d0;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    invoke-virtual {p0}, Lr0/l/a/d0;->a()V
-
-    iget-object v0, p0, Lr0/l/a/d0;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/d0;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/d1$a.smali b/com.discord/smali_classes2/r0/l/a/d1$a.smali
deleted file mode 100644
index 9c110047d5..0000000000
--- a/com.discord/smali_classes2/r0/l/a/d1$a.smali
+++ /dev/null
@@ -1,349 +0,0 @@
-.class public final Lr0/l/a/d1$a;
-.super Lrx/Subscriber;
-.source "OperatorOnBackpressureBuffer.java"
-
-# interfaces
-.implements Lr0/l/e/c$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/d1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;",
-        "Lr0/l/e/c$a;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final f:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field public final h:Lr0/l/e/c;
-
-.field public final i:Lrx/functions/Action0;
-
-.field public final j:Lr0/a$b;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Ljava/lang/Long;Lrx/functions/Action0;Lr0/a$b;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;",
-            "Ljava/lang/Long;",
-            "Lrx/functions/Action0;",
-            "Lr0/a$b;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
-
-    iput-object v0, p0, Lr0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    iput-object p1, p0, Lr0/l/a/d1$a;->f:Lrx/Subscriber;
-
-    if-eqz p2, :cond_0
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    invoke-direct {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    iput-object p1, p0, Lr0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iput-object p3, p0, Lr0/l/a/d1$a;->i:Lrx/functions/Action0;
-
-    new-instance p1, Lr0/l/e/c;
-
-    invoke-direct {p1, p0}, Lr0/l/e/c;-><init>(Lr0/l/e/c$a;)V
-
-    iput-object p1, p0, Lr0/l/a/d1$a;->h:Lr0/l/e/c;
-
-    iput-object p4, p0, Lr0/l/a/d1$a;->j:Lr0/a$b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/d1$a;->h:Lr0/l/e/c;
-
-    const/4 v1, 0x1
-
-    iput-boolean v1, v0, Lr0/l/e/c;->terminated:Z
-
-    invoke-virtual {v0}, Lr0/l/e/c;->a()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/d1$a;->h:Lr0/l/e/c;
-
-    iget-boolean v1, v0, Lr0/l/e/c;->terminated:Z
-
-    if-nez v1, :cond_0
-
-    iput-object p1, v0, Lr0/l/e/c;->exception:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, v0, Lr0/l/e/c;->terminated:Z
-
-    invoke-virtual {v0}, Lr0/l/e/c;->a()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-nez v0, :cond_0
-
-    :goto_0
-    const/4 v1, 0x1
-
-    goto :goto_3
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    const-wide/16 v5, 0x0
-
-    cmp-long v0, v3, v5
-
-    if-gtz v0, :cond_4
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/d1$a;->j:Lr0/a$b;
-
-    invoke-interface {v0}, Lr0/a$b;->a()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lr0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v5, p0, Lr0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
-
-    if-eqz v5, :cond_1
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
-    :try_end_0
-    .catch Lrx/exceptions/MissingBackpressureException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :cond_1
-    if-eqz v0, :cond_2
-
-    const/4 v0, 0x1
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v0
-
-    iget-object v5, p0, Lr0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v5, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    iget-object v5, p0, Lr0/l/a/d1$a;->f:Lrx/Subscriber;
-
-    invoke-interface {v5, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_2
-    const/4 v0, 0x0
-
-    :goto_1
-    iget-object v5, p0, Lr0/l/a/d1$a;->i:Lrx/functions/Action0;
-
-    if-eqz v5, :cond_3
-
-    :try_start_1
-    invoke-interface {v5}, Lrx/functions/Action0;->call()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iget-object v3, p0, Lr0/l/a/d1$a;->h:Lr0/l/e/c;
-
-    iget-boolean v4, v3, Lr0/l/e/c;->terminated:Z
-
-    if-nez v4, :cond_5
-
-    iput-object v0, v3, Lr0/l/e/c;->exception:Ljava/lang/Throwable;
-
-    iput-boolean v2, v3, Lr0/l/e/c;->terminated:Z
-
-    invoke-virtual {v3}, Lr0/l/e/c;->a()V
-
-    goto :goto_3
-
-    :cond_3
-    :goto_2
-    if-nez v0, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    iget-object v0, p0, Lr0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide/16 v5, 0x1
-
-    sub-long v5, v3, v5
-
-    invoke-virtual {v0, v3, v4, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_5
-    :goto_3
-    if-nez v1, :cond_6
-
-    return-void
-
-    :cond_6
-    iget-object v0, p0, Lr0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    if-nez p1, :cond_7
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_7
-    invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
-
-    iget-object p1, p0, Lr0/l/a/d1$a;->h:Lr0/l/e/c;
-
-    invoke-virtual {p1}, Lr0/l/e/c;->a()V
-
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/d1$b.smali b/com.discord/smali_classes2/r0/l/a/d1$b.smali
deleted file mode 100644
index dd001ef133..0000000000
--- a/com.discord/smali_classes2/r0/l/a/d1$b.smali
+++ /dev/null
@@ -1,39 +0,0 @@
-.class public final Lr0/l/a/d1$b;
-.super Ljava/lang/Object;
-.source "OperatorOnBackpressureBuffer.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/d1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/d1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/d1<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/d1;
-
-    invoke-direct {v0}, Lr0/l/a/d1;-><init>()V
-
-    sput-object v0, Lr0/l/a/d1$b;->a:Lr0/l/a/d1;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/d1.smali b/com.discord/smali_classes2/r0/l/a/d1.smali
deleted file mode 100644
index b50aba3ec1..0000000000
--- a/com.discord/smali_classes2/r0/l/a/d1.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public Lr0/l/a/d1;
-.super Ljava/lang/Object;
-.source "OperatorOnBackpressureBuffer.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/d1$a;,
-        Lr0/l/a/d1$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/Long;
-
-.field public final e:Lrx/functions/Action0;
-
-.field public final f:Lr0/a$b;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lr0/l/a/d1;->d:Ljava/lang/Long;
-
-    iput-object v0, p0, Lr0/l/a/d1;->e:Lrx/functions/Action0;
-
-    sget-object v0, Lr0/a;->b:Lr0/a$b;
-
-    iput-object v0, p0, Lr0/l/a/d1;->f:Lr0/a$b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/d1$a;
-
-    iget-object v1, p0, Lr0/l/a/d1;->d:Ljava/lang/Long;
-
-    iget-object v2, p0, Lr0/l/a/d1;->e:Lrx/functions/Action0;
-
-    iget-object v3, p0, Lr0/l/a/d1;->f:Lr0/a$b;
-
-    invoke-direct {v0, p1, v1, v2, v3}, Lr0/l/a/d1$a;-><init>(Lrx/Subscriber;Ljava/lang/Long;Lrx/functions/Action0;Lr0/a$b;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v1, v0, Lr0/l/a/d1$a;->h:Lr0/l/e/c;
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e.smali b/com.discord/smali_classes2/r0/l/a/e.smali
deleted file mode 100644
index 8f28da0e65..0000000000
--- a/com.discord/smali_classes2/r0/l/a/e.smali
+++ /dev/null
@@ -1,87 +0,0 @@
-.class public abstract Lr0/l/a/e;
-.super Lr0/l/a/d;
-.source "DeferredScalarSubscriberSafe.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/a/d<",
-        "TT;TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public h:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/l/a/d;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/e;->h:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/e;->h:Z
-
-    invoke-super {p0}, Lr0/l/a/d;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/e;->h:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/e;->h:Z
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lr0/l/a/d;->f:Ljava/lang/Object;
-
-    iget-object v0, p0, Lr0/l/a/d;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e0.smali b/com.discord/smali_classes2/r0/l/a/e0.smali
deleted file mode 100644
index 234fce488e..0000000000
--- a/com.discord/smali_classes2/r0/l/a/e0.smali
+++ /dev/null
@@ -1,110 +0,0 @@
-.class public Lr0/l/a/e0;
-.super Ljava/lang/Object;
-.source "OnSubscribeRefCount.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lrx/subscriptions/CompositeSubscription;
-
-.field public final synthetic e:Lr0/l/a/f0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/f0;Lrx/subscriptions/CompositeSubscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iput-object p2, p0, Lr0/l/a/e0;->d:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-object v1, p0, Lr0/l/a/e0;->d:Lrx/subscriptions/CompositeSubscription;
-
-    if-ne v0, v1, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    instance-of v0, v0, Lrx/Subscription;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    check-cast v0, Lrx/Subscription;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    new-instance v1, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object v1, v0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_1
-    iget-object v0, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v0, v0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/e0;->e:Lr0/l/a/f0;
-
-    iget-object v1, v1, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e1$a.smali b/com.discord/smali_classes2/r0/l/a/e1$a.smali
deleted file mode 100644
index c738b88688..0000000000
--- a/com.discord/smali_classes2/r0/l/a/e1$a.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final Lr0/l/a/e1$a;
-.super Ljava/lang/Object;
-.source "OperatorOnBackpressureLatest.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/e1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/e1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/e1<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/e1;
-
-    invoke-direct {v0}, Lr0/l/a/e1;-><init>()V
-
-    sput-object v0, Lr0/l/a/e1$a;->a:Lr0/l/a/e1;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e1$c.smali b/com.discord/smali_classes2/r0/l/a/e1$c.smali
deleted file mode 100644
index 8e8a438ca8..0000000000
--- a/com.discord/smali_classes2/r0/l/a/e1$c.smali
+++ /dev/null
@@ -1,111 +0,0 @@
-.class public final Lr0/l/a/e1$c;
-.super Lrx/Subscriber;
-.source "OperatorOnBackpressureLatest.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/e1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/l/a/e1$b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/e1$b<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/e1$b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/e1$b<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/e1$c;->d:Lr0/l/a/e1$b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/e1$c;->d:Lr0/l/a/e1$b;
-
-    invoke-virtual {v0}, Lr0/l/a/e1$b;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/e1$c;->d:Lr0/l/a/e1$b;
-
-    iput-object p1, v0, Lr0/l/a/e1$b;->terminal:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, v0, Lr0/l/a/e1$b;->done:Z
-
-    invoke-virtual {v0}, Lr0/l/a/e1$b;->a()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/e1$c;->d:Lr0/l/a/e1$b;
-
-    iget-object v1, v0, Lr0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    invoke-virtual {v0}, Lr0/l/a/e1$b;->a()V
-
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide/16 v0, 0x0
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e1.smali b/com.discord/smali_classes2/r0/l/a/e1.smali
deleted file mode 100644
index b07d9deb29..0000000000
--- a/com.discord/smali_classes2/r0/l/a/e1.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class public final Lr0/l/a/e1;
-.super Ljava/lang/Object;
-.source "OperatorOnBackpressureLatest.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/e1$c;,
-        Lr0/l/a/e1$b;,
-        Lr0/l/a/e1$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/e1$b;
-
-    invoke-direct {v0, p1}, Lr0/l/a/e1$b;-><init>(Lrx/Subscriber;)V
-
-    new-instance v1, Lr0/l/a/e1$c;
-
-    invoke-direct {v1, v0}, Lr0/l/a/e1$c;-><init>(Lr0/l/a/e1$b;)V
-
-    iput-object v1, v0, Lr0/l/a/e1$b;->parent:Lr0/l/a/e1$c;
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e2$a.smali b/com.discord/smali_classes2/r0/l/a/e2$a.smali
deleted file mode 100644
index 17c0147bfa..0000000000
--- a/com.discord/smali_classes2/r0/l/a/e2$a.smali
+++ /dev/null
@@ -1,111 +0,0 @@
-.class public Lr0/l/a/e2$a;
-.super Ljava/lang/Object;
-.source "OperatorTake.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/e2;->setProducer(Lrx/Producer;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final synthetic e:Lrx/Producer;
-
-.field public final synthetic f:Lr0/l/a/e2;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/e2;Lrx/Producer;)V
-    .locals 2
-
-    iput-object p1, p0, Lr0/l/a/e2$a;->f:Lr0/l/a/e2;
-
-    iput-object p2, p0, Lr0/l/a/e2$a;->e:Lrx/Producer;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide/16 v0, 0x0
-
-    invoke-direct {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
-
-    iput-object p1, p0, Lr0/l/a/e2$a;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 9
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_2
-
-    iget-object v2, p0, Lr0/l/a/e2$a;->f:Lr0/l/a/e2;
-
-    iget-boolean v2, v2, Lr0/l/a/e2;->e:Z
-
-    if-nez v2, :cond_2
-
-    :cond_0
-    iget-object v2, p0, Lr0/l/a/e2$a;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    iget-object v4, p0, Lr0/l/a/e2$a;->f:Lr0/l/a/e2;
-
-    iget-object v4, v4, Lr0/l/a/e2;->g:Lr0/l/a/f2;
-
-    iget v4, v4, Lr0/l/a/f2;->d:I
-
-    int-to-long v4, v4
-
-    sub-long/2addr v4, v2
-
-    invoke-static {p1, p2, v4, v5}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v4
-
-    cmp-long v6, v4, v0
-
-    if-nez v6, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v6, p0, Lr0/l/a/e2$a;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    add-long v7, v2, v4
-
-    invoke-virtual {v6, v2, v3, v7, v8}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    iget-object p1, p0, Lr0/l/a/e2$a;->e:Lrx/Producer;
-
-    invoke-interface {p1, v4, v5}, Lrx/Producer;->m(J)V
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e2.smali b/com.discord/smali_classes2/r0/l/a/e2.smali
deleted file mode 100644
index 79b3df0a9c..0000000000
--- a/com.discord/smali_classes2/r0/l/a/e2.smali
+++ /dev/null
@@ -1,178 +0,0 @@
-.class public Lr0/l/a/e2;
-.super Lrx/Subscriber;
-.source "OperatorTake.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public e:Z
-
-.field public final synthetic f:Lrx/Subscriber;
-
-.field public final synthetic g:Lr0/l/a/f2;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/f2;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/e2;->g:Lr0/l/a/f2;
-
-    iput-object p2, p0, Lr0/l/a/e2;->f:Lrx/Subscriber;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/e2;->e:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/e2;->e:Z
-
-    iget-object v0, p0, Lr0/l/a/e2;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/e2;->e:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/e2;->e:Z
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/e2;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw p1
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget v0, p0, Lr0/l/a/e2;->d:I
-
-    add-int/lit8 v1, v0, 0x1
-
-    iput v1, p0, Lr0/l/a/e2;->d:I
-
-    iget-object v2, p0, Lr0/l/a/e2;->g:Lr0/l/a/f2;
-
-    iget v2, v2, Lr0/l/a/f2;->d:I
-
-    if-ge v0, v2, :cond_1
-
-    const/4 v0, 0x1
-
-    if-ne v1, v2, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    iget-object v2, p0, Lr0/l/a/e2;->f:Lrx/Subscriber;
-
-    invoke-interface {v2, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    if-eqz v1, :cond_1
-
-    iget-boolean p1, p0, Lr0/l/a/e2;->e:Z
-
-    if-nez p1, :cond_1
-
-    iput-boolean v0, p0, Lr0/l/a/e2;->e:Z
-
-    :try_start_0
-    iget-object p1, p0, Lr0/l/a/e2;->f:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw p1
-
-    :cond_1
-    :goto_1
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/e2;->f:Lrx/Subscriber;
-
-    new-instance v1, Lr0/l/a/e2$a;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/a/e2$a;-><init>(Lr0/l/a/e2;Lrx/Producer;)V
-
-    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/f.smali b/com.discord/smali_classes2/r0/l/a/f.smali
deleted file mode 100644
index 0ab8be9b92..0000000000
--- a/com.discord/smali_classes2/r0/l/a/f.smali
+++ /dev/null
@@ -1,120 +0,0 @@
-.class public final enum Lr0/l/a/f;
-.super Ljava/lang/Enum;
-.source "EmptyObservableHolder.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lr0/l/a/f;",
-        ">;",
-        "Lrx/Observable$a<",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lr0/l/a/f;
-
-.field public static final e:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final synthetic f:[Lr0/l/a/f;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lr0/l/a/f;
-
-    const-string v1, "INSTANCE"
-
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v1, v2}, Lr0/l/a/f;-><init>(Ljava/lang/String;I)V
-
-    sput-object v0, Lr0/l/a/f;->d:Lr0/l/a/f;
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Lr0/l/a/f;
-
-    aput-object v0, v1, v2
-
-    sput-object v1, Lr0/l/a/f;->f:[Lr0/l/a/f;
-
-    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
-
-    move-result-object v0
-
-    sput-object v0, Lr0/l/a/f;->e:Lrx/Observable;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lr0/l/a/f;
-    .locals 1
-
-    const-class v0, Lr0/l/a/f;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/l/a/f;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/l/a/f;
-    .locals 1
-
-    sget-object v0, Lr0/l/a/f;->f:[Lr0/l/a/f;
-
-    invoke-virtual {v0}, [Lr0/l/a/f;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/l/a/f;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/f0.smali b/com.discord/smali_classes2/r0/l/a/f0.smali
deleted file mode 100644
index c390f84ad5..0000000000
--- a/com.discord/smali_classes2/r0/l/a/f0.smali
+++ /dev/null
@@ -1,181 +0,0 @@
-.class public final Lr0/l/a/f0;
-.super Ljava/lang/Object;
-.source "OnSubscribeRefCount.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/m/c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/m/c<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public volatile e:Lrx/subscriptions/CompositeSubscription;
-
-.field public final f:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field public final g:Ljava/util/concurrent/locks/ReentrantLock;
-
-
-# direct methods
-.method public constructor <init>(Lr0/m/c;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/m/c<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
-
-    iput-object v0, p0, Lr0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    new-instance v0, Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantLock;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    iput-object p1, p0, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
-
-    iget-object v0, p0, Lr0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_1
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    new-instance v2, Lr0/l/a/c0;
-
-    invoke-direct {v2, p0, p1, v0}, Lr0/l/a/c0;-><init>(Lr0/l/a/f0;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicBoolean;)V
-
-    invoke-virtual {v1, v2}, Lr0/m/c;->g0(Lrx/functions/Action1;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    :cond_0
-    throw p1
-
-    :cond_1
-    :try_start_1
-    iget-object v0, p0, Lr0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
-
-    new-instance v1, Lr0/l/a/e0;
-
-    invoke-direct {v1, p0, v0}, Lr0/l/a/e0;-><init>(Lr0/l/a/f0;Lrx/subscriptions/CompositeSubscription;)V
-
-    new-instance v2, Lr0/r/a;
-
-    invoke-direct {v2, v1}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v1, p0, Lr0/l/a/f0;->d:Lr0/m/c;
-
-    new-instance v2, Lr0/l/a/d0;
-
-    invoke-direct {v2, p0, p1, p1, v0}, Lr0/l/a/d0;-><init>(Lr0/l/a/f0;Lrx/Subscriber;Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
-
-    invoke-virtual {v1, v2}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    iget-object p1, p0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    :cond_2
-    :goto_0
-    return-void
-
-    :catchall_1
-    move-exception p1
-
-    iget-object v0, p0, Lr0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/f1.smali b/com.discord/smali_classes2/r0/l/a/f1.smali
deleted file mode 100644
index 3f81559f21..0000000000
--- a/com.discord/smali_classes2/r0/l/a/f1.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public final Lr0/l/a/f1;
-.super Ljava/lang/Object;
-.source "OperatorOnErrorResumeNextViaFunction.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Ljava/lang/Throwable;",
-        "Lrx/Observable<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/k/b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/f1;->d:Lr0/k/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    iget-object v0, p0, Lr0/l/a/f1;->d:Lr0/k/b;
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    new-instance v0, Lr0/l/e/j;
-
-    invoke-direct {v0, p1}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/g.smali b/com.discord/smali_classes2/r0/l/a/g.smali
deleted file mode 100644
index 1766ccfd46..0000000000
--- a/com.discord/smali_classes2/r0/l/a/g.smali
+++ /dev/null
@@ -1,118 +0,0 @@
-.class public final enum Lr0/l/a/g;
-.super Ljava/lang/Enum;
-.source "NeverObservableHolder.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lr0/l/a/g;",
-        ">;",
-        "Lrx/Observable$a<",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lr0/l/a/g;
-
-.field public static final e:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final synthetic f:[Lr0/l/a/g;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lr0/l/a/g;
-
-    const-string v1, "INSTANCE"
-
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v1, v2}, Lr0/l/a/g;-><init>(Ljava/lang/String;I)V
-
-    sput-object v0, Lr0/l/a/g;->d:Lr0/l/a/g;
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Lr0/l/a/g;
-
-    aput-object v0, v1, v2
-
-    sput-object v1, Lr0/l/a/g;->f:[Lr0/l/a/g;
-
-    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
-
-    move-result-object v0
-
-    sput-object v0, Lr0/l/a/g;->e:Lrx/Observable;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lr0/l/a/g;
-    .locals 1
-
-    const-class v0, Lr0/l/a/g;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/l/a/g;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/l/a/g;
-    .locals 1
-
-    sget-object v0, Lr0/l/a/g;->f:[Lr0/l/a/g;
-
-    invoke-virtual {v0}, [Lr0/l/a/g;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/l/a/g;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Lrx/Subscriber;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/g0.smali b/com.discord/smali_classes2/r0/l/a/g0.smali
deleted file mode 100644
index 385534831e..0000000000
--- a/com.discord/smali_classes2/r0/l/a/g0.smali
+++ /dev/null
@@ -1,162 +0,0 @@
-.class public Lr0/l/a/g0;
-.super Lrx/Subscriber;
-.source "OnSubscribeSingle.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public e:Z
-
-.field public f:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic g:Lr0/i;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/h0;Lr0/i;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/g0;->g:Lr0/i;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 4
-
-    iget-boolean v0, p0, Lr0/l/a/g0;->d:Z
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-boolean v0, p0, Lr0/l/a/g0;->e:Z
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/g0;->g:Lr0/i;
-
-    iget-object v1, p0, Lr0/l/a/g0;->f:Ljava/lang/Object;
-
-    check-cast v0, Lr0/l/a/u2;
-
-    iget-object v2, v0, Lr0/l/a/u2;->e:Lrx/Subscriber;
-
-    new-instance v3, Lr0/l/b/c;
-
-    iget-object v0, v0, Lr0/l/a/u2;->e:Lrx/Subscriber;
-
-    invoke-direct {v3, v0, v1}, Lr0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    invoke-virtual {v2, v3}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lr0/l/a/g0;->g:Lr0/i;
-
-    new-instance v1, Ljava/util/NoSuchElementException;
-
-    const-string v2, "Observable emitted no items"
-
-    invoke-direct {v1, v2}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    check-cast v0, Lr0/l/a/u2;
-
-    iget-object v0, v0, Lr0/l/a/u2;->e:Lrx/Subscriber;
-
-    invoke-interface {v0, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/g0;->g:Lr0/i;
-
-    check-cast v0, Lr0/l/a/u2;
-
-    iget-object v0, v0, Lr0/l/a/u2;->e:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/g0;->e:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, p0, Lr0/l/a/g0;->d:Z
-
-    iget-object p1, p0, Lr0/l/a/g0;->g:Lr0/i;
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "Observable emitted too many elements"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    check-cast p1, Lr0/l/a/u2;
-
-    iget-object p1, p1, Lr0/l/a/u2;->e:Lrx/Subscriber;
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    goto :goto_0
-
-    :cond_0
-    iput-boolean v1, p0, Lr0/l/a/g0;->e:Z
-
-    iput-object p1, p0, Lr0/l/a/g0;->f:Ljava/lang/Object;
-
-    :goto_0
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide/16 v0, 0x2
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/g1.smali b/com.discord/smali_classes2/r0/l/a/g1.smali
deleted file mode 100644
index 3369d4b804..0000000000
--- a/com.discord/smali_classes2/r0/l/a/g1.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final Lr0/l/a/g1;
-.super Ljava/lang/Object;
-.source "OperatorOnErrorResumeNextViaFunction.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Ljava/lang/Throwable;",
-        "Lrx/Observable<",
-        "+TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Observable;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/g1;->d:Lrx/Observable;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    iget-object p1, p0, Lr0/l/a/g1;->d:Lrx/Observable;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/g2.smali b/com.discord/smali_classes2/r0/l/a/g2.smali
deleted file mode 100644
index 348fab65b7..0000000000
--- a/com.discord/smali_classes2/r0/l/a/g2.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.class public Lr0/l/a/g2;
-.super Lrx/Subscriber;
-.source "OperatorTakeUntil.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/i2;Lrx/Subscriber;ZLrx/Subscriber;)V
-    .locals 0
-
-    iput-object p4, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-direct {p0, p2, p3}, Lrx/Subscriber;-><init>(Lrx/Subscriber;Z)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-virtual {v1}, Lrx/Subscriber;->unsubscribe()V
-
-    throw v0
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object p1, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v0, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw p1
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/g2;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h$a.smali b/com.discord/smali_classes2/r0/l/a/h$a.smali
deleted file mode 100644
index ae4f6e8630..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h$a.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public final Lr0/l/a/h$a;
-.super Ljava/lang/Object;
-.source "NotificationLite.java"
-
-# interfaces
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x1L
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "Notification=>Completed"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h$b.smali b/com.discord/smali_classes2/r0/l/a/h$b.smali
deleted file mode 100644
index eb876f2168..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h$b.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public final Lr0/l/a/h$b;
-.super Ljava/lang/Object;
-.source "NotificationLite.java"
-
-# interfaces
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x2L
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "Notification=>NULL"
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h$c.smali b/com.discord/smali_classes2/r0/l/a/h$c.smali
deleted file mode 100644
index 7cad8a4025..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h$c.smali
+++ /dev/null
@@ -1,59 +0,0 @@
-.class public final Lr0/l/a/h$c;
-.super Ljava/lang/Object;
-.source "NotificationLite.java"
-
-# interfaces
-.implements Ljava/io/Serializable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x3L
-
-
-# instance fields
-.field public final e:Ljava/lang/Throwable;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Throwable;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/h$c;->e:Ljava/lang/Throwable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    const-string v0, "Notification=>Error:"
-
-    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lr0/l/a/h$c;->e:Ljava/lang/Throwable;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h.smali b/com.discord/smali_classes2/r0/l/a/h.smali
deleted file mode 100644
index fb9e7e67d8..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h.smali
+++ /dev/null
@@ -1,148 +0,0 @@
-.class public final Lr0/l/a/h;
-.super Ljava/lang/Object;
-.source "NotificationLite.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/h$c;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Ljava/lang/Object;
-
-.field public static final b:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/h$a;
-
-    invoke-direct {v0}, Lr0/l/a/h$a;-><init>()V
-
-    sput-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    new-instance v0, Lr0/l/a/h$b;
-
-    invoke-direct {v0}, Lr0/l/a/h$b;-><init>()V
-
-    sput-object v0, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public static a(Lr0/g;Ljava/lang/Object;)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lr0/g<",
-            "-TT;>;",
-            "Ljava/lang/Object;",
-            ")Z"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    const/4 v1, 0x1
-
-    if-ne p1, v0, :cond_0
-
-    invoke-interface {p0}, Lr0/g;->onCompleted()V
-
-    return v1
-
-    :cond_0
-    sget-object v0, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    const/4 v2, 0x0
-
-    if-ne p1, v0, :cond_1
-
-    const/4 p1, 0x0
-
-    invoke-interface {p0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return v2
-
-    :cond_1
-    if-eqz p1, :cond_3
-
-    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v0
-
-    const-class v3, Lr0/l/a/h$c;
-
-    if-ne v0, v3, :cond_2
-
-    check-cast p1, Lr0/l/a/h$c;
-
-    iget-object p1, p1, Lr0/l/a/h$c;->e:Ljava/lang/Throwable;
-
-    invoke-interface {p0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return v1
-
-    :cond_2
-    invoke-interface {p0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return v2
-
-    :cond_3
-    new-instance p0, Ljava/lang/IllegalArgumentException;
-
-    const-string p1, "The lite notification can not be null"
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-.end method
-
-.method public static b(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Object;",
-            ")TT;"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    if-ne p0, v0, :cond_0
-
-    const/4 p0, 0x0
-
-    :cond_0
-    return-object p0
-.end method
-
-.method public static c(Ljava/lang/Object;)Z
-    .locals 1
-
-    sget-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    if-ne p0, v0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h0.smali b/com.discord/smali_classes2/r0/l/a/h0.smali
deleted file mode 100644
index 175c225513..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h0.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public Lr0/l/a/h0;
-.super Ljava/lang/Object;
-.source "OnSubscribeSingle.java"
-
-# interfaces
-.implements Lr0/h$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/h$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/h0;->d:Lrx/Observable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 1
-
-    check-cast p1, Lr0/i;
-
-    new-instance v0, Lr0/l/a/g0;
-
-    invoke-direct {v0, p0, p1}, Lr0/l/a/g0;-><init>(Lr0/l/a/h0;Lr0/i;)V
-
-    iget-object p1, p1, Lr0/i;->d:Lrx/internal/util/SubscriptionList;
-
-    invoke-virtual {p1, v0}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
-
-    iget-object p1, p0, Lr0/l/a/h0;->d:Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h1$a.smali b/com.discord/smali_classes2/r0/l/a/h1$a.smali
deleted file mode 100644
index cfe232a545..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h1$a.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class public Lr0/l/a/h1$a;
-.super Lrx/Subscriber;
-.source "OperatorOnErrorResumeNextViaFunction.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/h1;->onError(Ljava/lang/Throwable;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/h1;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/h1;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/h1$a;->d:Lr0/l/a/h1;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/h1$a;->d:Lr0/l/a/h1;
-
-    iget-object v0, v0, Lr0/l/a/h1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/h1$a;->d:Lr0/l/a/h1;
-
-    iget-object v0, v0, Lr0/l/a/h1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/h1$a;->d:Lr0/l/a/h1;
-
-    iget-object v0, v0, Lr0/l/a/h1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/h1$a;->d:Lr0/l/a/h1;
-
-    iget-object v0, v0, Lr0/l/a/h1;->g:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1}, Lr0/l/b/a;->c(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h1.smali b/com.discord/smali_classes2/r0/l/a/h1.smali
deleted file mode 100644
index 8d3d376bc7..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h1.smali
+++ /dev/null
@@ -1,178 +0,0 @@
-.class public Lr0/l/a/h1;
-.super Lrx/Subscriber;
-.source "OperatorOnErrorResumeNextViaFunction.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public e:J
-
-.field public final synthetic f:Lrx/Subscriber;
-
-.field public final synthetic g:Lr0/l/b/a;
-
-.field public final synthetic h:Lrx/subscriptions/SerialSubscription;
-
-.field public final synthetic i:Lr0/l/a/i1;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/i1;Lrx/Subscriber;Lr0/l/b/a;Lrx/subscriptions/SerialSubscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/h1;->i:Lr0/l/a/i1;
-
-    iput-object p2, p0, Lr0/l/a/h1;->f:Lrx/Subscriber;
-
-    iput-object p3, p0, Lr0/l/a/h1;->g:Lr0/l/b/a;
-
-    iput-object p4, p0, Lr0/l/a/h1;->h:Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/h1;->d:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/h1;->d:Z
-
-    iget-object v0, p0, Lr0/l/a/h1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 6
-
-    iget-boolean v0, p0, Lr0/l/a/h1;->d:Z
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/h1;->d:Z
-
-    :try_start_0
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    new-instance v0, Lr0/l/a/h1$a;
-
-    invoke-direct {v0, p0}, Lr0/l/a/h1$a;-><init>(Lr0/l/a/h1;)V
-
-    iget-object v1, p0, Lr0/l/a/h1;->h:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
-
-    iget-wide v1, p0, Lr0/l/a/h1;->e:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-eqz v5, :cond_1
-
-    iget-object v3, p0, Lr0/l/a/h1;->g:Lr0/l/b/a;
-
-    invoke-virtual {v3, v1, v2}, Lr0/l/b/a;->b(J)V
-
-    :cond_1
-    iget-object v1, p0, Lr0/l/a/h1;->i:Lr0/l/a/i1;
-
-    iget-object v1, v1, Lr0/l/a/i1;->d:Lr0/k/b;
-
-    invoke-interface {v1, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v0, p0, Lr0/l/a/h1;->f:Lrx/Subscriber;
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/h1;->d:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-wide v0, p0, Lr0/l/a/h1;->e:J
-
-    const-wide/16 v2, 0x1
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lr0/l/a/h1;->e:J
-
-    iget-object v0, p0, Lr0/l/a/h1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/h1;->g:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1}, Lr0/l/b/a;->c(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/h2.smali b/com.discord/smali_classes2/r0/l/a/h2.smali
deleted file mode 100644
index ca0385dd79..0000000000
--- a/com.discord/smali_classes2/r0/l/a/h2.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public Lr0/l/a/h2;
-.super Lrx/Subscriber;
-.source "OperatorTakeUntil.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/i2;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/h2;->d:Lrx/Subscriber;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/h2;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/h2;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)V"
-        }
-    .end annotation
-
-    iget-object p1, p0, Lr0/l/a/h2;->d:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/i$a.smali b/com.discord/smali_classes2/r0/l/a/i$a.smali
deleted file mode 100644
index 5aeb34a9a1..0000000000
--- a/com.discord/smali_classes2/r0/l/a/i$a.smali
+++ /dev/null
@@ -1,217 +0,0 @@
-.class public final Lr0/l/a/i$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeCombineLatest.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/i;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/l/a/i$b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/i$b<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:I
-
-.field public f:Z
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/i$b;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/i$b<",
-            "TT;TR;>;I)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/i$a;->d:Lr0/l/a/i$b;
-
-    iput p2, p0, Lr0/l/a/i$a;->e:I
-
-    iget p1, p1, Lr0/l/a/i$b;->bufferSize:I
-
-    int-to-long p1, p1
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 3
-
-    iget-boolean v0, p0, Lr0/l/a/i$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/i$a;->f:Z
-
-    iget-object v0, p0, Lr0/l/a/i$a;->d:Lr0/l/a/i$b;
-
-    const/4 v1, 0x0
-
-    iget v2, p0, Lr0/l/a/i$a;->e:I
-
-    invoke-virtual {v0, v1, v2}, Lr0/l/a/i$b;->c(Ljava/lang/Object;I)V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 6
-
-    iget-boolean v0, p0, Lr0/l/a/i$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/i$a;->d:Lr0/l/a/i$b;
-
-    iget-object v0, v0, Lr0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
-
-    :cond_1
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Throwable;
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_3
-
-    instance-of v3, v1, Lrx/exceptions/CompositeException;
-
-    if-eqz v3, :cond_2
-
-    move-object v3, v1
-
-    check-cast v3, Lrx/exceptions/CompositeException;
-
-    new-instance v4, Ljava/util/ArrayList;
-
-    iget-object v3, v3, Lrx/exceptions/CompositeException;->exceptions:Ljava/util/List;
-
-    invoke-direct {v4, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    invoke-virtual {v4, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    new-instance v3, Lrx/exceptions/CompositeException;
-
-    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v3, Lrx/exceptions/CompositeException;
-
-    const/4 v4, 0x2
-
-    new-array v4, v4, [Ljava/lang/Throwable;
-
-    const/4 v5, 0x0
-
-    aput-object v1, v4, v5
-
-    aput-object p1, v4, v2
-
-    invoke-static {v4}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v4
-
-    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    goto :goto_0
-
-    :cond_3
-    move-object v3, p1
-
-    :goto_0
-    invoke-virtual {v0, v1, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iput-boolean v2, p0, Lr0/l/a/i$a;->f:Z
-
-    iget-object p1, p0, Lr0/l/a/i$a;->d:Lr0/l/a/i$b;
-
-    const/4 v0, 0x0
-
-    iget v1, p0, Lr0/l/a/i$a;->e:I
-
-    invoke-virtual {p1, v0, v1}, Lr0/l/a/i$b;->c(Ljava/lang/Object;I)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/i$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/i$a;->d:Lr0/l/a/i$b;
-
-    if-nez p1, :cond_1
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_1
-    iget v1, p0, Lr0/l/a/i$a;->e:I
-
-    invoke-virtual {v0, p1, v1}, Lr0/l/a/i$b;->c(Ljava/lang/Object;I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/i$b.smali b/com.discord/smali_classes2/r0/l/a/i$b.smali
deleted file mode 100644
index 4229c110d6..0000000000
--- a/com.discord/smali_classes2/r0/l/a/i$b.smali
+++ /dev/null
@@ -1,705 +0,0 @@
-.class public final Lr0/l/a/i$b;
-.super Ljava/util/concurrent/atomic/AtomicInteger;
-.source "OnSubscribeCombineLatest.java"
-
-# interfaces
-.implements Lrx/Producer;
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/i;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicInteger;",
-        "Lrx/Producer;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ljava/lang/Object;
-
-.field public static final serialVersionUID:J = 0x76e7117251786db1L
-
-
-# instance fields
-.field public active:I
-
-.field public final actual:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final bufferSize:I
-
-.field public volatile cancelled:Z
-
-.field public final combiner:Lrx/functions/FuncN;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/FuncN<",
-            "+TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public complete:I
-
-.field public final delayError:Z
-
-.field public volatile done:Z
-
-.field public final error:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final latest:[Ljava/lang/Object;
-
-.field public final queue:Lr0/l/e/m/e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/e/m/e<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final subscribers:[Lr0/l/a/i$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lr0/l/a/i$a<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    sput-object v0, Lr0/l/a/i$b;->d:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/Subscriber;Lrx/functions/FuncN;IIZ)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;",
-            "Lrx/functions/FuncN<",
-            "+TR;>;IIZ)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/i$b;->actual:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/i$b;->combiner:Lrx/functions/FuncN;
-
-    iput p4, p0, Lr0/l/a/i$b;->bufferSize:I
-
-    iput-boolean p5, p0, Lr0/l/a/i$b;->delayError:Z
-
-    new-array p1, p3, [Ljava/lang/Object;
-
-    iput-object p1, p0, Lr0/l/a/i$b;->latest:[Ljava/lang/Object;
-
-    sget-object p2, Lr0/l/a/i$b;->d:Ljava/lang/Object;
-
-    invoke-static {p1, p2}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V
-
-    new-array p1, p3, [Lr0/l/a/i$a;
-
-    iput-object p1, p0, Lr0/l/a/i$b;->subscribers:[Lr0/l/a/i$a;
-
-    new-instance p1, Lr0/l/e/m/e;
-
-    invoke-direct {p1, p4}, Lr0/l/e/m/e;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/i$b;->queue:Lr0/l/e/m/e;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/i$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/util/Queue;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Queue<",
-            "*>;)V"
-        }
-    .end annotation
-
-    invoke-interface {p1}, Ljava/util/Queue;->clear()V
-
-    iget-object p1, p0, Lr0/l/a/i$b;->subscribers:[Lr0/l/a/i$a;
-
-    array-length v0, p1
-
-    const/4 v1, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_0
-
-    aget-object v2, p1, v1
-
-    invoke-virtual {v2}, Lrx/Subscriber;->unsubscribe()V
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public b(ZZLrx/Subscriber;Ljava/util/Queue;Z)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Lrx/Subscriber<",
-            "*>;",
-            "Ljava/util/Queue<",
-            "*>;Z)Z"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/i$b;->cancelled:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0, p4}, Lr0/l/a/i$b;->a(Ljava/util/Queue;)V
-
-    return v1
-
-    :cond_0
-    if-eqz p1, :cond_4
-
-    if-eqz p5, :cond_2
-
-    if-eqz p2, :cond_4
-
-    iget-object p1, p0, Lr0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-interface {p3}, Lr0/g;->onCompleted()V
-
-    :goto_0
-    return v1
-
-    :cond_2
-    iget-object p1, p0, Lr0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    if-eqz p1, :cond_3
-
-    invoke-virtual {p0, p4}, Lr0/l/a/i$b;->a(Ljava/util/Queue;)V
-
-    invoke-interface {p3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return v1
-
-    :cond_3
-    if-eqz p2, :cond_4
-
-    invoke-interface {p3}, Lr0/g;->onCompleted()V
-
-    return v1
-
-    :cond_4
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public c(Ljava/lang/Object;I)V
-    .locals 7
-
-    iget-object v0, p0, Lr0/l/a/i$b;->subscribers:[Lr0/l/a/i$a;
-
-    aget-object v0, v0, p2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/i$b;->latest:[Ljava/lang/Object;
-
-    array-length v1, v1
-
-    iget-object v2, p0, Lr0/l/a/i$b;->latest:[Ljava/lang/Object;
-
-    aget-object v2, v2, p2
-
-    iget v3, p0, Lr0/l/a/i$b;->active:I
-
-    sget-object v4, Lr0/l/a/i$b;->d:Ljava/lang/Object;
-
-    if-ne v2, v4, :cond_0
-
-    add-int/lit8 v3, v3, 0x1
-
-    iput v3, p0, Lr0/l/a/i$b;->active:I
-
-    :cond_0
-    iget v4, p0, Lr0/l/a/i$b;->complete:I
-
-    if-nez p1, :cond_1
-
-    add-int/lit8 v4, v4, 0x1
-
-    iput v4, p0, Lr0/l/a/i$b;->complete:I
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v5, p0, Lr0/l/a/i$b;->latest:[Ljava/lang/Object;
-
-    invoke-static {p1}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v6
-
-    aput-object v6, v5, p2
-
-    :goto_0
-    const/4 p2, 0x0
-
-    const/4 v5, 0x1
-
-    if-ne v3, v1, :cond_2
-
-    const/4 v3, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v3, 0x0
-
-    :goto_1
-    if-eq v4, v1, :cond_3
-
-    if-nez p1, :cond_4
-
-    sget-object v1, Lr0/l/a/i$b;->d:Ljava/lang/Object;
-
-    if-ne v2, v1, :cond_4
-
-    :cond_3
-    const/4 p2, 0x1
-
-    :cond_4
-    if-nez p2, :cond_7
-
-    if-eqz p1, :cond_5
-
-    if-eqz v3, :cond_5
-
-    iget-object p2, p0, Lr0/l/a/i$b;->queue:Lr0/l/e/m/e;
-
-    iget-object v1, p0, Lr0/l/a/i$b;->latest:[Ljava/lang/Object;
-
-    invoke-virtual {v1}, [Ljava/lang/Object;->clone()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {p2, v0, v1}, Lr0/l/e/m/e;->j(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_2
-
-    :cond_5
-    if-nez p1, :cond_8
-
-    iget-object p2, p0, Lr0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p2
-
-    if-eqz p2, :cond_8
-
-    sget-object p2, Lr0/l/a/i$b;->d:Ljava/lang/Object;
-
-    if-eq v2, p2, :cond_6
-
-    iget-boolean p2, p0, Lr0/l/a/i$b;->delayError:Z
-
-    if-nez p2, :cond_8
-
-    :cond_6
-    iput-boolean v5, p0, Lr0/l/a/i$b;->done:Z
-
-    goto :goto_2
-
-    :cond_7
-    iput-boolean v5, p0, Lr0/l/a/i$b;->done:Z
-
-    :cond_8
-    :goto_2
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v3, :cond_9
-
-    if-eqz p1, :cond_9
-
-    const-wide/16 p1, 0x1
-
-    invoke-virtual {v0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-
-    :cond_9
-    invoke-virtual {p0}, Lr0/l/a/i$b;->d()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public d()V
-    .locals 19
-
-    move-object/from16 v7, p0
-
-    invoke-virtual/range {p0 .. p0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v8, v7, Lr0/l/a/i$b;->queue:Lr0/l/e/m/e;
-
-    iget-object v9, v7, Lr0/l/a/i$b;->actual:Lrx/Subscriber;
-
-    iget-boolean v0, v7, Lr0/l/a/i$b;->delayError:Z
-
-    iget-object v10, v7, Lr0/l/a/i$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const/4 v11, 0x1
-
-    const/4 v12, 0x1
-
-    :cond_1
-    iget-boolean v2, v7, Lr0/l/a/i$b;->done:Z
-
-    invoke-virtual {v8}, Lr0/l/e/m/e;->isEmpty()Z
-
-    move-result v3
-
-    move-object/from16 v1, p0
-
-    move-object v4, v9
-
-    move-object v5, v8
-
-    move v6, v0
-
-    invoke-virtual/range {v1 .. v6}, Lr0/l/a/i$b;->b(ZZLrx/Subscriber;Ljava/util/Queue;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-virtual {v10}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v13
-
-    const-wide/16 v5, 0x0
-
-    :goto_0
-    cmp-long v1, v5, v13
-
-    if-eqz v1, :cond_7
-
-    iget-boolean v2, v7, Lr0/l/a/i$b;->done:Z
-
-    invoke-virtual {v8}, Lr0/l/e/m/e;->peek()Ljava/lang/Object;
-
-    move-result-object v1
-
-    move-object v4, v1
-
-    check-cast v4, Lr0/l/a/i$a;
-
-    if-nez v4, :cond_3
-
-    const/16 v16, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v1, 0x0
-
-    const/16 v16, 0x0
-
-    :goto_1
-    move-object/from16 v1, p0
-
-    move/from16 v3, v16
-
-    move-object v15, v4
-
-    move-object v4, v9
-
-    move-wide/from16 v17, v5
-
-    move-object v5, v8
-
-    move v6, v0
-
-    invoke-virtual/range {v1 .. v6}, Lr0/l/a/i$b;->b(ZZLrx/Subscriber;Ljava/util/Queue;Z)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_4
-
-    return-void
-
-    :cond_4
-    if-eqz v16, :cond_5
-
-    move-wide/from16 v3, v17
-
-    goto :goto_2
-
-    :cond_5
-    invoke-virtual {v8}, Lr0/l/e/m/e;->poll()Ljava/lang/Object;
-
-    invoke-virtual {v8}, Lr0/l/e/m/e;->poll()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, [Ljava/lang/Object;
-
-    if-nez v1, :cond_6
-
-    iput-boolean v11, v7, Lr0/l/a/i$b;->cancelled:Z
-
-    invoke-virtual {v7, v8}, Lr0/l/a/i$b;->a(Ljava/util/Queue;)V
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Broken queue?! Sender received but not the array."
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    invoke-interface {v9, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_6
-    :try_start_0
-    iget-object v2, v7, Lr0/l/a/i$b;->combiner:Lrx/functions/FuncN;
-
-    invoke-interface {v2, v1}, Lrx/functions/FuncN;->call([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-interface {v9, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    const-wide/16 v1, 0x1
-
-    invoke-virtual {v15, v1, v2}, Lrx/Subscriber;->request(J)V
-
-    move-wide/from16 v3, v17
-
-    add-long v5, v3, v1
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    iput-boolean v11, v7, Lr0/l/a/i$b;->cancelled:Z
-
-    invoke-virtual {v7, v8}, Lr0/l/a/i$b;->a(Ljava/util/Queue;)V
-
-    invoke-interface {v9, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_7
-    move-wide v3, v5
-
-    :goto_2
-    const-wide/16 v1, 0x0
-
-    cmp-long v5, v3, v1
-
-    if-eqz v5, :cond_8
-
-    const-wide v1, 0x7fffffffffffffffL
-
-    cmp-long v5, v13, v1
-
-    if-eqz v5, :cond_8
-
-    invoke-static {v10, v3, v4}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    :cond_8
-    neg-int v1, v12
-
-    invoke-virtual {v7, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
-
-    move-result v12
-
-    if-nez v12, :cond_1
-
-    return-void
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/i$b;->cancelled:Z
-
-    return v0
-.end method
-
-.method public m(J)V
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_1
-
-    if-eqz v2, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/i$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    invoke-virtual {p0}, Lr0/l/a/i$b;->d()V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "n >= required but it was "
-
-    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/i$b;->cancelled:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/i$b;->cancelled:Z
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/i$b;->queue:Lr0/l/e/m/e;
-
-    invoke-virtual {p0, v0}, Lr0/l/a/i$b;->a(Ljava/util/Queue;)V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/i.smali b/com.discord/smali_classes2/r0/l/a/i.smali
deleted file mode 100644
index 9be3f6bed8..0000000000
--- a/com.discord/smali_classes2/r0/l/a/i.smali
+++ /dev/null
@@ -1,275 +0,0 @@
-.class public final Lr0/l/a/i;
-.super Ljava/lang/Object;
-.source "OnSubscribeCombineLatest.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/i$a;,
-        Lr0/l/a/i$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:[Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/lang/Iterable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Iterable<",
-            "+",
-            "Lrx/Observable<",
-            "+TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Lrx/functions/FuncN;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/FuncN<",
-            "+TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final g:I
-
-.field public final h:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Iterable;Lrx/functions/FuncN;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Iterable<",
-            "+",
-            "Lrx/Observable<",
-            "+TT;>;>;",
-            "Lrx/functions/FuncN<",
-            "+TR;>;)V"
-        }
-    .end annotation
-
-    sget v0, Lr0/l/e/h;->f:I
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lr0/l/a/i;->d:[Lrx/Observable;
-
-    iput-object p1, p0, Lr0/l/a/i;->e:Ljava/lang/Iterable;
-
-    iput-object p2, p0, Lr0/l/a/i;->f:Lrx/functions/FuncN;
-
-    iput v0, p0, Lr0/l/a/i;->g:I
-
-    const/4 p1, 0x0
-
-    iput-boolean p1, p0, Lr0/l/a/i;->h:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 8
-
-    move-object v1, p1
-
-    check-cast v1, Lrx/Subscriber;
-
-    iget-object p1, p0, Lr0/l/a/i;->d:[Lrx/Observable;
-
-    const/4 v6, 0x0
-
-    if-nez p1, :cond_3
-
-    iget-object p1, p0, Lr0/l/a/i;->e:Ljava/lang/Iterable;
-
-    instance-of v0, p1, Ljava/util/List;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    new-array v0, v0, [Lrx/Observable;
-
-    invoke-interface {p1, v0}, Ljava/util/List;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Lrx/Observable;
-
-    array-length v0, p1
-
-    goto :goto_1
-
-    :cond_0
-    const/16 v0, 0x8
-
-    new-array v0, v0, [Lrx/Observable;
-
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    const/4 v2, 0x0
-
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lrx/Observable;
-
-    array-length v4, v0
-
-    if-ne v2, v4, :cond_1
-
-    shr-int/lit8 v4, v2, 0x2
-
-    add-int/2addr v4, v2
-
-    new-array v4, v4, [Lrx/Observable;
-
-    invoke-static {v0, v6, v4, v6, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    move-object v0, v4
-
-    :cond_1
-    add-int/lit8 v4, v2, 0x1
-
-    aput-object v3, v0, v2
-
-    move v2, v4
-
-    goto :goto_0
-
-    :cond_2
-    move-object p1, v0
-
-    move v3, v2
-
-    goto :goto_2
-
-    :cond_3
-    array-length v0, p1
-
-    :goto_1
-    move v3, v0
-
-    :goto_2
-    if-nez v3, :cond_4
-
-    invoke-interface {v1}, Lr0/g;->onCompleted()V
-
-    goto :goto_5
-
-    :cond_4
-    new-instance v7, Lr0/l/a/i$b;
-
-    iget-object v2, p0, Lr0/l/a/i;->f:Lrx/functions/FuncN;
-
-    iget v4, p0, Lr0/l/a/i;->g:I
-
-    iget-boolean v5, p0, Lr0/l/a/i;->h:Z
-
-    move-object v0, v7
-
-    invoke-direct/range {v0 .. v5}, Lr0/l/a/i$b;-><init>(Lrx/Subscriber;Lrx/functions/FuncN;IIZ)V
-
-    iget-object v0, v7, Lr0/l/a/i$b;->subscribers:[Lr0/l/a/i$a;
-
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    :goto_3
-    if-ge v2, v1, :cond_5
-
-    new-instance v3, Lr0/l/a/i$a;
-
-    invoke-direct {v3, v7, v2}, Lr0/l/a/i$a;-><init>(Lr0/l/a/i$b;I)V
-
-    aput-object v3, v0, v2
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_3
-
-    :cond_5
-    invoke-virtual {v7, v6}, Ljava/util/concurrent/atomic/AtomicInteger;->lazySet(I)V
-
-    iget-object v2, v7, Lr0/l/a/i$b;->actual:Lrx/Subscriber;
-
-    invoke-virtual {v2, v7}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v2, v7, Lr0/l/a/i$b;->actual:Lrx/Subscriber;
-
-    invoke-virtual {v2, v7}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    :goto_4
-    if-ge v6, v1, :cond_7
-
-    iget-boolean v2, v7, Lr0/l/a/i$b;->cancelled:Z
-
-    if-eqz v2, :cond_6
-
-    goto :goto_5
-
-    :cond_6
-    aget-object v2, p1, v6
-
-    aget-object v3, v0, v6
-
-    invoke-virtual {v2, v3}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
-
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_4
-
-    :cond_7
-    :goto_5
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/i0.smali b/com.discord/smali_classes2/r0/l/a/i0.smali
deleted file mode 100644
index 332f3ba98b..0000000000
--- a/com.discord/smali_classes2/r0/l/a/i0.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class public final Lr0/l/a/i0;
-.super Ljava/lang/Object;
-.source "OnSubscribeThrow.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/Throwable;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Throwable;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/i0;->d:Ljava/lang/Throwable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 1
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/i0;->d:Ljava/lang/Throwable;
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/i1.smali b/com.discord/smali_classes2/r0/l/a/i1.smali
deleted file mode 100644
index f3a5e6bfa6..0000000000
--- a/com.discord/smali_classes2/r0/l/a/i1.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public final Lr0/l/a/i1;
-.super Ljava/lang/Object;
-.source "OperatorOnErrorResumeNextViaFunction.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "+",
-            "Lrx/Observable<",
-            "+TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/k/b<",
-            "-",
-            "Ljava/lang/Throwable;",
-            "+",
-            "Lrx/Observable<",
-            "+TT;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/i1;->d:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/b/a;
-
-    invoke-direct {v0}, Lr0/l/b/a;-><init>()V
-
-    new-instance v1, Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {v1}, Lrx/subscriptions/SerialSubscription;-><init>()V
-
-    new-instance v2, Lr0/l/a/h1;
-
-    invoke-direct {v2, p0, p1, v0, v1}, Lr0/l/a/h1;-><init>(Lr0/l/a/i1;Lrx/Subscriber;Lr0/l/b/a;Lrx/subscriptions/SerialSubscription;)V
-
-    invoke-virtual {v1, v2}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v2
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/j.smali b/com.discord/smali_classes2/r0/l/a/j.smali
deleted file mode 100644
index 8e00dc6cd8..0000000000
--- a/com.discord/smali_classes2/r0/l/a/j.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public Lr0/l/a/j;
-.super Ljava/lang/Object;
-.source "OnSubscribeConcatMap.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/k$c;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/k;Lr0/l/a/k$c;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/j;->d:Lr0/l/a/k$c;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 4
-
-    iget-object v0, p0, Lr0/l/a/j;->d:Lr0/l/a/k$c;
-
-    if-eqz v0, :cond_2
-
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p1, v1
-
-    if-lez v3, :cond_0
-
-    iget-object v0, v0, Lr0/l/a/k$c;->g:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1, p2}, Lr0/l/b/a;->m(J)V
-
-    goto :goto_0
-
-    :cond_0
-    if-ltz v3, :cond_1
-
-    :goto_0
-    return-void
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "n >= 0 required but it was "
-
-    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/j0$a.smali b/com.discord/smali_classes2/r0/l/a/j0$a.smali
deleted file mode 100644
index e71c952532..0000000000
--- a/com.discord/smali_classes2/r0/l/a/j0$a.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public final Lr0/l/a/j0$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeTimeoutTimedWithFallback.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/j0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/l/b/a;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lr0/l/b/a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;",
-            "Lr0/l/b/a;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/j0$a;->d:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/j0$a;->e:Lr0/l/b/a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/j0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/j0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/j0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/j0$a;->e:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1}, Lr0/l/b/a;->c(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/j0$b$a.smali b/com.discord/smali_classes2/r0/l/a/j0$b$a.smali
deleted file mode 100644
index 518f5558af..0000000000
--- a/com.discord/smali_classes2/r0/l/a/j0$b$a.smali
+++ /dev/null
@@ -1,114 +0,0 @@
-.class public final Lr0/l/a/j0$b$a;
-.super Ljava/lang/Object;
-.source "OnSubscribeTimeoutTimedWithFallback.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/j0$b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final synthetic e:Lr0/l/a/j0$b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/j0$b;J)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/j0$b$a;->e:Lr0/l/a/j0$b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p2, p0, Lr0/l/a/j0$b$a;->d:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/j0$b$a;->e:Lr0/l/a/j0$b;
-
-    iget-wide v1, p0, Lr0/l/a/j0$b$a;->d:J
-
-    iget-object v3, v0, Lr0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide v4, 0x7fffffffffffffffL
-
-    invoke-virtual {v3, v1, v2, v4, v5}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
-
-    move-result v1
-
-    if-nez v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
-
-    iget-object v1, v0, Lr0/l/a/j0$b;->h:Lrx/Observable;
-
-    if-nez v1, :cond_1
-
-    iget-object v0, v0, Lr0/l/a/j0$b;->d:Lrx/Subscriber;
-
-    new-instance v1, Ljava/util/concurrent/TimeoutException;
-
-    invoke-direct {v1}, Ljava/util/concurrent/TimeoutException;-><init>()V
-
-    invoke-interface {v0, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_1
-    iget-wide v1, v0, Lr0/l/a/j0$b;->m:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-eqz v5, :cond_2
-
-    iget-object v3, v0, Lr0/l/a/j0$b;->i:Lr0/l/b/a;
-
-    invoke-virtual {v3, v1, v2}, Lr0/l/b/a;->b(J)V
-
-    :cond_2
-    new-instance v1, Lr0/l/a/j0$a;
-
-    iget-object v2, v0, Lr0/l/a/j0$b;->d:Lrx/Subscriber;
-
-    iget-object v3, v0, Lr0/l/a/j0$b;->i:Lr0/l/b/a;
-
-    invoke-direct {v1, v2, v3}, Lr0/l/a/j0$a;-><init>(Lrx/Subscriber;Lr0/l/b/a;)V
-
-    iget-object v2, v0, Lr0/l/a/j0$b;->l:Lr0/l/d/a;
-
-    invoke-virtual {v2, v1}, Lr0/l/d/a;->b(Lrx/Subscription;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    iget-object v0, v0, Lr0/l/a/j0$b;->h:Lrx/Observable;
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
-
-    :cond_3
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/j0$b.smali b/com.discord/smali_classes2/r0/l/a/j0$b.smali
deleted file mode 100644
index c5e6745184..0000000000
--- a/com.discord/smali_classes2/r0/l/a/j0$b.smali
+++ /dev/null
@@ -1,287 +0,0 @@
-.class public final Lr0/l/a/j0$b;
-.super Lrx/Subscriber;
-.source "OnSubscribeTimeoutTimedWithFallback.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/j0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/j0$b$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:J
-
-.field public final f:Ljava/util/concurrent/TimeUnit;
-
-.field public final g:Lrx/Scheduler$Worker;
-
-.field public final h:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final i:Lr0/l/b/a;
-
-.field public final j:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final k:Lr0/l/d/a;
-
-.field public final l:Lr0/l/d/a;
-
-.field public m:J
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler$Worker;Lrx/Observable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;J",
-            "Ljava/util/concurrent/TimeUnit;",
-            "Lrx/Scheduler$Worker;",
-            "Lrx/Observable<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/j0$b;->d:Lrx/Subscriber;
-
-    iput-wide p2, p0, Lr0/l/a/j0$b;->e:J
-
-    iput-object p4, p0, Lr0/l/a/j0$b;->f:Ljava/util/concurrent/TimeUnit;
-
-    iput-object p5, p0, Lr0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
-
-    iput-object p6, p0, Lr0/l/a/j0$b;->h:Lrx/Observable;
-
-    new-instance p1, Lr0/l/b/a;
-
-    invoke-direct {p1}, Lr0/l/b/a;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/j0$b;->i:Lr0/l/b/a;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance p1, Lr0/l/d/a;
-
-    invoke-direct {p1}, Lr0/l/d/a;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/j0$b;->k:Lr0/l/d/a;
-
-    new-instance p1, Lr0/l/d/a;
-
-    invoke-direct {p1, p0}, Lr0/l/d/a;-><init>(Lrx/Subscription;)V
-
-    iput-object p1, p0, Lr0/l/a/j0$b;->l:Lr0/l/d/a;
-
-    invoke-virtual {p0, p5}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object p1, p0, Lr0/l/a/j0$b;->k:Lr0/l/d/a;
-
-    invoke-virtual {p0, p1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide v1, 0x7fffffffffffffffL
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->getAndSet(J)J
-
-    move-result-wide v3
-
-    cmp-long v0, v3, v1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->k:Lr0/l/d/a;
-
-    invoke-virtual {v0}, Lr0/l/d/a;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide v1, 0x7fffffffffffffffL
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->getAndSet(J)J
-
-    move-result-wide v3
-
-    cmp-long v0, v3, v1
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->k:Lr0/l/d/a;
-
-    invoke-virtual {v0}, Lr0/l/d/a;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    iget-object p1, p0, Lr0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
-
-    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    cmp-long v4, v0, v2
-
-    if-eqz v4, :cond_2
-
-    iget-object v2, p0, Lr0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide/16 v3, 0x1
-
-    add-long v5, v0, v3
-
-    invoke-virtual {v2, v0, v1, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/j0$b;->k:Lr0/l/d/a;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Subscription;
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_1
-    iget-wide v0, p0, Lr0/l/a/j0$b;->m:J
-
-    add-long/2addr v0, v3
-
-    iput-wide v0, p0, Lr0/l/a/j0$b;->m:J
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/a/j0$b;->k:Lr0/l/d/a;
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
-
-    new-instance v1, Lr0/l/a/j0$b$a;
-
-    invoke-direct {v1, p0, v5, v6}, Lr0/l/a/j0$b$a;-><init>(Lr0/l/a/j0$b;J)V
-
-    iget-wide v2, p0, Lr0/l/a/j0$b;->e:J
-
-    iget-object v4, p0, Lr0/l/a/j0$b;->f:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v1, v2, v3, v4}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lr0/l/d/a;->b(Lrx/Subscription;)Z
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/j0$b;->i:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1}, Lr0/l/b/a;->c(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/j0.smali b/com.discord/smali_classes2/r0/l/a/j0.smali
deleted file mode 100644
index 844e98cf4a..0000000000
--- a/com.discord/smali_classes2/r0/l/a/j0.smali
+++ /dev/null
@@ -1,145 +0,0 @@
-.class public final Lr0/l/a/j0;
-.super Ljava/lang/Object;
-.source "OnSubscribeTimeoutTimedWithFallback.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/j0$a;,
-        Lr0/l/a/j0$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:J
-
-.field public final f:Ljava/util/concurrent/TimeUnit;
-
-.field public final g:Lrx/Scheduler;
-
-.field public final h:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;Lrx/Observable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "TT;>;J",
-            "Ljava/util/concurrent/TimeUnit;",
-            "Lrx/Scheduler;",
-            "Lrx/Observable<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/j0;->d:Lrx/Observable;
-
-    iput-wide p2, p0, Lr0/l/a/j0;->e:J
-
-    iput-object p4, p0, Lr0/l/a/j0;->f:Ljava/util/concurrent/TimeUnit;
-
-    iput-object p5, p0, Lr0/l/a/j0;->g:Lrx/Scheduler;
-
-    iput-object p6, p0, Lr0/l/a/j0;->h:Lrx/Observable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 8
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v7, Lr0/l/a/j0$b;
-
-    iget-wide v2, p0, Lr0/l/a/j0;->e:J
-
-    iget-object v4, p0, Lr0/l/a/j0;->f:Ljava/util/concurrent/TimeUnit;
-
-    iget-object v0, p0, Lr0/l/a/j0;->g:Lrx/Scheduler;
-
-    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v5
-
-    iget-object v6, p0, Lr0/l/a/j0;->h:Lrx/Observable;
-
-    move-object v0, v7
-
-    move-object v1, p1
-
-    invoke-direct/range {v0 .. v6}, Lr0/l/a/j0$b;-><init>(Lrx/Subscriber;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler$Worker;Lrx/Observable;)V
-
-    iget-object v0, v7, Lr0/l/a/j0$b;->l:Lr0/l/d/a;
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v0, v7, Lr0/l/a/j0$b;->i:Lr0/l/b/a;
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    iget-object p1, v7, Lr0/l/a/j0$b;->k:Lr0/l/d/a;
-
-    iget-object v0, v7, Lr0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
-
-    new-instance v1, Lr0/l/a/j0$b$a;
-
-    const-wide/16 v2, 0x0
-
-    invoke-direct {v1, v7, v2, v3}, Lr0/l/a/j0$b$a;-><init>(Lr0/l/a/j0$b;J)V
-
-    iget-wide v2, v7, Lr0/l/a/j0$b;->e:J
-
-    iget-object v4, v7, Lr0/l/a/j0$b;->f:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v1, v2, v3, v4}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lr0/l/d/a;->b(Lrx/Subscription;)Z
-
-    iget-object p1, p0, Lr0/l/a/j0;->d:Lrx/Observable;
-
-    invoke-virtual {p1, v7}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/j1.smali b/com.discord/smali_classes2/r0/l/a/j1.smali
deleted file mode 100644
index c949562fea..0000000000
--- a/com.discord/smali_classes2/r0/l/a/j1.smali
+++ /dev/null
@@ -1,140 +0,0 @@
-.class public final Lr0/l/a/j1;
-.super Ljava/lang/Object;
-.source "OperatorPublish.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicReference;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 6
-
-    check-cast p1, Lrx/Subscriber;
-
-    :cond_0
-    :goto_0
-    iget-object v0, p0, Lr0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/a/k1$b;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    :cond_1
-    new-instance v1, Lr0/l/a/k1$b;
-
-    iget-object v2, p0, Lr0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v1, v2}, Lr0/l/a/k1$b;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
-
-    new-instance v2, Lr0/l/a/l1;
-
-    invoke-direct {v2, v1}, Lr0/l/a/l1;-><init>(Lr0/l/a/k1$b;)V
-
-    new-instance v3, Lr0/r/a;
-
-    invoke-direct {v3, v2}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v2, p0, Lr0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    move-object v0, v1
-
-    :cond_3
-    new-instance v1, Lr0/l/a/k1$a;
-
-    invoke-direct {v1, v0, p1}, Lr0/l/a/k1$a;-><init>(Lr0/l/a/k1$b;Lrx/Subscriber;)V
-
-    :cond_4
-    iget-object v2, v0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, [Lr0/l/a/k1$a;
-
-    sget-object v3, Lr0/l/a/k1$b;->l:[Lr0/l/a/k1$a;
-
-    const/4 v4, 0x0
-
-    if-ne v2, v3, :cond_5
-
-    goto :goto_1
-
-    :cond_5
-    array-length v3, v2
-
-    add-int/lit8 v5, v3, 0x1
-
-    new-array v5, v5, [Lr0/l/a/k1$a;
-
-    invoke-static {v2, v4, v5, v4, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    aput-object v1, v5, v3
-
-    iget-object v3, v0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v3, v2, v5}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    const/4 v4, 0x1
-
-    :goto_1
-    if-eqz v4, :cond_0
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/j2.smali b/com.discord/smali_classes2/r0/l/a/j2.smali
deleted file mode 100644
index 66c0d497f0..0000000000
--- a/com.discord/smali_classes2/r0/l/a/j2.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public Lr0/l/a/j2;
-.super Ljava/lang/Object;
-.source "OperatorTakeUntilPredicate.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/k2$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/k2;Lr0/l/a/k2$a;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/j2;->d:Lr0/l/a/k2$a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/j2;->d:Lr0/l/a/k2$a;
-
-    invoke-virtual {v0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k$a.smali b/com.discord/smali_classes2/r0/l/a/k$a.smali
deleted file mode 100644
index bd501cde58..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k$a.smali
+++ /dev/null
@@ -1,114 +0,0 @@
-.class public final Lr0/l/a/k$a;
-.super Ljava/lang/Object;
-.source "OnSubscribeConcatMap.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Producer;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TR;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/l/a/k$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/k$c<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public f:Z
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;Lr0/l/a/k$c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TR;",
-            "Lr0/l/a/k$c<",
-            "TT;TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k$a;->d:Ljava/lang/Object;
-
-    iput-object p2, p0, Lr0/l/a/k$a;->e:Lr0/l/a/k$c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 3
-
-    iget-boolean v0, p0, Lr0/l/a/k$a;->f:Z
-
-    if-nez v0, :cond_0
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_0
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/k$a;->f:Z
-
-    iget-object p1, p0, Lr0/l/a/k$a;->e:Lr0/l/a/k$c;
-
-    iget-object p2, p0, Lr0/l/a/k$a;->d:Ljava/lang/Object;
-
-    iget-object v0, p1, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    const-wide/16 v0, 0x1
-
-    iget-object p2, p1, Lr0/l/a/k$c;->g:Lr0/l/b/a;
-
-    invoke-virtual {p2, v0, v1}, Lr0/l/b/a;->b(J)V
-
-    const/4 p2, 0x0
-
-    iput-boolean p2, p1, Lr0/l/a/k$c;->m:Z
-
-    invoke-virtual {p1}, Lr0/l/a/k$c;->a()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k$b.smali b/com.discord/smali_classes2/r0/l/a/k$b.smali
deleted file mode 100644
index 58cf0bf12b..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k$b.smali
+++ /dev/null
@@ -1,191 +0,0 @@
-.class public final Lr0/l/a/k$b;
-.super Lrx/Subscriber;
-.source "OnSubscribeConcatMap.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/l/a/k$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/k$c<",
-            "TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:J
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/k$c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/k$c<",
-            "TT;TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k$b;->d:Lr0/l/a/k$c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/k$b;->d:Lr0/l/a/k$c;
-
-    iget-wide v1, p0, Lr0/l/a/k$b;->e:J
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-eqz v5, :cond_0
-
-    iget-object v3, v0, Lr0/l/a/k$c;->g:Lr0/l/b/a;
-
-    invoke-virtual {v3, v1, v2}, Lr0/l/b/a;->b(J)V
-
-    :cond_0
-    const/4 v1, 0x0
-
-    iput-boolean v1, v0, Lr0/l/a/k$c;->m:Z
-
-    invoke-virtual {v0}, Lr0/l/a/k$c;->a()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/a/k$b;->d:Lr0/l/a/k$c;
-
-    iget-wide v1, p0, Lr0/l/a/k$b;->e:J
-
-    iget-object v3, v0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {v3, p1}, Lr0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
-
-    move-result v3
-
-    if-nez v3, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget p1, v0, Lr0/l/a/k$c;->f:I
-
-    if-nez p1, :cond_2
-
-    iget-object p1, v0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {p1}, Lr0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lr0/l/e/d;->g(Ljava/lang/Throwable;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    iget-object v1, v0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v1, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_1
-    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
-
-    goto :goto_0
-
-    :cond_2
-    const-wide/16 v3, 0x0
-
-    cmp-long p1, v1, v3
-
-    if-eqz p1, :cond_3
-
-    iget-object p1, v0, Lr0/l/a/k$c;->g:Lr0/l/b/a;
-
-    invoke-virtual {p1, v1, v2}, Lr0/l/b/a;->b(J)V
-
-    :cond_3
-    const/4 p1, 0x0
-
-    iput-boolean p1, v0, Lr0/l/a/k$c;->m:Z
-
-    invoke-virtual {v0}, Lr0/l/a/k$c;->a()V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TR;)V"
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lr0/l/a/k$b;->e:J
-
-    const-wide/16 v2, 0x1
-
-    add-long/2addr v0, v2
-
-    iput-wide v0, p0, Lr0/l/a/k$b;->e:J
-
-    iget-object v0, p0, Lr0/l/a/k$b;->d:Lr0/l/a/k$c;
-
-    iget-object v0, v0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/k$b;->d:Lr0/l/a/k$c;
-
-    iget-object v0, v0, Lr0/l/a/k$c;->g:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1}, Lr0/l/b/a;->c(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k$c.smali b/com.discord/smali_classes2/r0/l/a/k$c.smali
deleted file mode 100644
index cb7c4acb97..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k$c.smali
+++ /dev/null
@@ -1,529 +0,0 @@
-.class public final Lr0/l/a/k$c;
-.super Lrx/Subscriber;
-.source "OnSubscribeConcatMap.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/k;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+",
-            "Lrx/Observable<",
-            "+TR;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:I
-
-.field public final g:Lr0/l/b/a;
-
-.field public final h:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final i:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field public final j:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final k:Lrx/subscriptions/SerialSubscription;
-
-.field public volatile l:Z
-
-.field public volatile m:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lr0/k/b;II)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;",
-            "Lr0/k/b<",
-            "-TT;+",
-            "Lrx/Observable<",
-            "+TR;>;>;II)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/k$c;->e:Lr0/k/b;
-
-    iput p4, p0, Lr0/l/a/k$c;->f:I
-
-    new-instance p1, Lr0/l/b/a;
-
-    invoke-direct {p1}, Lr0/l/b/a;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k$c;->g:Lr0/l/b/a;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k$c;->i:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    new-instance p1, Lr0/l/e/n/n;
-
-    invoke-direct {p1, p3}, Lr0/l/e/n/n;-><init>(I)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lr0/l/e/m/c;
-
-    invoke-direct {p1, p3}, Lr0/l/e/m/c;-><init>(I)V
-
-    :goto_0
-    iput-object p1, p0, Lr0/l/a/k$c;->h:Ljava/util/Queue;
-
-    new-instance p1, Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
-
-    int-to-long p1, p3
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 7
-
-    iget-object v0, p0, Lr0/l/a/k$c;->i:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget v0, p0, Lr0/l/a/k$c;->f:I
-
-    :cond_1
-    :goto_0
-    iget-object v1, p0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    return-void
-
-    :cond_2
-    iget-boolean v1, p0, Lr0/l/a/k$c;->m:Z
-
-    if-nez v1, :cond_d
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_4
-
-    iget-object v2, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_4
-
-    iget-object v0, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {v0}, Lr0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lr0/l/e/d;->g(Ljava/lang/Throwable;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_3
-
-    iget-object v1, p0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_3
-    return-void
-
-    :cond_4
-    iget-boolean v2, p0, Lr0/l/a/k$c;->l:Z
-
-    iget-object v3, p0, Lr0/l/a/k$c;->h:Ljava/util/Queue;
-
-    invoke-interface {v3}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v3
-
-    if-nez v3, :cond_5
-
-    const/4 v4, 0x1
-
-    goto :goto_1
-
-    :cond_5
-    const/4 v4, 0x0
-
-    :goto_1
-    if-eqz v2, :cond_8
-
-    if-eqz v4, :cond_8
-
-    iget-object v0, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {v0}, Lr0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
-
-    move-result-object v0
-
-    if-nez v0, :cond_6
-
-    iget-object v0, p0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    goto :goto_2
-
-    :cond_6
-    invoke-static {v0}, Lr0/l/e/d;->g(Ljava/lang/Throwable;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_7
-
-    iget-object v1, p0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_7
-    :goto_2
-    return-void
-
-    :cond_8
-    if-nez v4, :cond_d
-
-    :try_start_0
-    iget-object v2, p0, Lr0/l/a/k$c;->e:Lr0/k/b;
-
-    invoke-static {v3}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-interface {v2, v3}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lrx/Observable;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v2, :cond_9
-
-    new-instance v0, Ljava/lang/NullPointerException;
-
-    const-string v1, "The source returned by the mapper was null"
-
-    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0, v0}, Lr0/l/a/k$c;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_9
-    sget-object v3, Lr0/l/a/f;->e:Lrx/Observable;
-
-    const-wide/16 v4, 0x1
-
-    if-eq v2, v3, :cond_c
-
-    instance-of v3, v2, Lr0/l/e/j;
-
-    if-eqz v3, :cond_a
-
-    check-cast v2, Lr0/l/e/j;
-
-    iput-boolean v1, p0, Lr0/l/a/k$c;->m:Z
-
-    iget-object v1, p0, Lr0/l/a/k$c;->g:Lr0/l/b/a;
-
-    new-instance v3, Lr0/l/a/k$a;
-
-    iget-object v2, v2, Lr0/l/e/j;->e:Ljava/lang/Object;
-
-    invoke-direct {v3, v2, p0}, Lr0/l/a/k$a;-><init>(Ljava/lang/Object;Lr0/l/a/k$c;)V
-
-    invoke-virtual {v1, v3}, Lr0/l/b/a;->c(Lrx/Producer;)V
-
-    goto :goto_3
-
-    :cond_a
-    new-instance v3, Lr0/l/a/k$b;
-
-    invoke-direct {v3, p0}, Lr0/l/a/k$b;-><init>(Lr0/l/a/k$c;)V
-
-    iget-object v6, p0, Lr0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v6, v3}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
-
-    invoke-virtual {v3}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v6
-
-    if-nez v6, :cond_b
-
-    iput-boolean v1, p0, Lr0/l/a/k$c;->m:Z
-
-    invoke-virtual {v2, v3}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    :goto_3
-    invoke-virtual {p0, v4, v5}, Lrx/Subscriber;->request(J)V
-
-    goto :goto_4
-
-    :cond_b
-    return-void
-
-    :cond_c
-    invoke-virtual {p0, v4, v5}, Lrx/Subscriber;->request(J)V
-
-    goto/16 :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v0}, Lr0/l/a/k$c;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_d
-    :goto_4
-    iget-object v1, p0, Lr0/l/a/k$c;->i:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    return-void
-.end method
-
-.method public b(Ljava/lang/Throwable;)V
-    .locals 1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {v0, p1}, Lr0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object p1, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {p1}, Lr0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lr0/l/e/d;->g(Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/k$c;->l:Z
-
-    invoke-virtual {p0}, Lr0/l/a/k$c;->a()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {v0, p1}, Lr0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/k$c;->l:Z
-
-    iget p1, p0, Lr0/l/a/k$c;->f:I
-
-    if-nez p1, :cond_1
-
-    iget-object p1, p0, Lr0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {p1}, Lr0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lr0/l/e/d;->g(Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/k$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_0
-    iget-object p1, p0, Lr0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
-
-    iget-object p1, p1, Lrx/subscriptions/SerialSubscription;->d:Lr0/l/d/a;
-
-    invoke-virtual {p1}, Lr0/l/d/a;->unsubscribe()V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Lr0/l/a/k$c;->a()V
-
-    goto :goto_0
-
-    :cond_2
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/k$c;->h:Ljava/util/Queue;
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    new-instance p1, Lrx/exceptions/MissingBackpressureException;
-
-    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
-
-    invoke-virtual {p0, p1}, Lr0/l/a/k$c;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Lr0/l/a/k$c;->a()V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k.smali b/com.discord/smali_classes2/r0/l/a/k.smali
deleted file mode 100644
index af6220860f..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k.smali
+++ /dev/null
@@ -1,141 +0,0 @@
-.class public final Lr0/l/a/k;
-.super Ljava/lang/Object;
-.source "OnSubscribeConcatMap.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/k$a;,
-        Lr0/l/a/k$b;,
-        Lr0/l/a/k$c;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+",
-            "Lrx/Observable<",
-            "+TR;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:I
-
-.field public final g:I
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;Lr0/k/b;II)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "+TT;>;",
-            "Lr0/k/b<",
-            "-TT;+",
-            "Lrx/Observable<",
-            "+TR;>;>;II)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k;->d:Lrx/Observable;
-
-    iput-object p2, p0, Lr0/l/a/k;->e:Lr0/k/b;
-
-    iput p3, p0, Lr0/l/a/k;->f:I
-
-    iput p4, p0, Lr0/l/a/k;->g:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 5
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget v0, p0, Lr0/l/a/k;->g:I
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Lrx/observers/SerializedSubscriber;
-
-    invoke-direct {v0, p1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, p1
-
-    :goto_0
-    new-instance v1, Lr0/l/a/k$c;
-
-    iget-object v2, p0, Lr0/l/a/k;->e:Lr0/k/b;
-
-    iget v3, p0, Lr0/l/a/k;->f:I
-
-    iget v4, p0, Lr0/l/a/k;->g:I
-
-    invoke-direct {v1, v0, v2, v3, v4}, Lr0/l/a/k$c;-><init>(Lrx/Subscriber;Lr0/k/b;II)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v0, v1, Lr0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v0, Lr0/l/a/j;
-
-    invoke-direct {v0, p0, v1}, Lr0/l/a/j;-><init>(Lr0/l/a/k;Lr0/l/a/k$c;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    iget-object p1, p0, Lr0/l/a/k;->d:Lrx/Observable;
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    :cond_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k0.smali b/com.discord/smali_classes2/r0/l/a/k0.smali
deleted file mode 100644
index 98e86f7e4e..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k0.smali
+++ /dev/null
@@ -1,58 +0,0 @@
-.class public Lr0/l/a/k0;
-.super Ljava/lang/Object;
-.source "OnSubscribeTimerOnce.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/l0;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/k0;->d:Lrx/Subscriber;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 3
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/k0;->d:Lrx/Subscriber;
-
-    const-wide/16 v1, 0x0
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/k0;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/k0;->d:Lrx/Subscriber;
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k1$b.smali b/com.discord/smali_classes2/r0/l/a/k1$b.smali
deleted file mode 100644
index ac267f03af..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k1$b.smali
+++ /dev/null
@@ -1,734 +0,0 @@
-.class public final Lr0/l/a/k1$b;
-.super Lrx/Subscriber;
-.source "OperatorPublish.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/k1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final k:[Lr0/l/a/k1$a;
-
-.field public static final l:[Lr0/l/a/k1$a;
-
-
-# instance fields
-.field public final d:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/a/k1$b<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public volatile f:Ljava/lang/Object;
-
-.field public final g:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "[",
-            "Lr0/l/a/k1$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final h:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field public i:Z
-
-.field public j:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    new-array v1, v0, [Lr0/l/a/k1$a;
-
-    sput-object v1, Lr0/l/a/k1$b;->k:[Lr0/l/a/k1$a;
-
-    new-array v0, v0, [Lr0/l/a/k1$a;
-
-    sput-object v0, Lr0/l/a/k1$b;->l:[Lr0/l/a/k1$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/a/k1$b<",
-            "TT;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lr0/l/e/n/n;
-
-    sget v1, Lr0/l/e/h;->f:I
-
-    invoke-direct {v0, v1}, Lr0/l/e/n/n;-><init>(I)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lr0/l/e/m/c;
-
-    sget v1, Lr0/l/e/h;->f:I
-
-    invoke-direct {v0, v1}, Lr0/l/e/m/c;-><init>(I)V
-
-    :goto_0
-    iput-object v0, p0, Lr0/l/a/k1$b;->d:Ljava/util/Queue;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/a/k1$b;->k:[Lr0/l/a/k1$a;
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
-
-    iput-object p1, p0, Lr0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k1$b;->h:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;Z)Z
-    .locals 4
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_3
-
-    invoke-static {p1}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-eqz v1, :cond_1
-
-    if-eqz p2, :cond_3
-
-    iget-object p1, p0, Lr0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p1, p0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :try_start_0
-    iget-object p1, p0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object p2, Lr0/l/a/k1$b;->l:[Lr0/l/a/k1$a;
-
-    invoke-virtual {p1, p2}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Lr0/l/a/k1$a;
-
-    array-length p2, p1
-
-    :goto_0
-    if-ge v0, p2, :cond_0
-
-    aget-object v1, p1, v0
-
-    iget-object v1, v1, Lr0/l/a/k1$a;->child:Lrx/Subscriber;
-
-    invoke-interface {v1}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return v3
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw p1
-
-    :cond_1
-    check-cast p1, Lr0/l/a/h$c;
-
-    iget-object p1, p1, Lr0/l/a/h$c;->e:Ljava/lang/Throwable;
-
-    iget-object p2, p0, Lr0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p2, p0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :try_start_1
-    iget-object p2, p0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/a/k1$b;->l:[Lr0/l/a/k1$a;
-
-    invoke-virtual {p2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, [Lr0/l/a/k1$a;
-
-    array-length v1, p2
-
-    :goto_1
-    if-ge v0, v1, :cond_2
-
-    aget-object v2, p2, v0
-
-    iget-object v2, v2, Lr0/l/a/k1$a;->child:Lrx/Subscriber;
-
-    invoke-interface {v2, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return v3
-
-    :catchall_1
-    move-exception p1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw p1
-
-    :cond_3
-    return v0
-.end method
-
-.method public b()V
-    .locals 18
-
-    move-object/from16 v1, p0
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, v1, Lr0/l/a/k1$b;->i:Z
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v2, v1, Lr0/l/a/k1$b;->j:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    iput-boolean v2, v1, Lr0/l/a/k1$b;->i:Z
-
-    const/4 v3, 0x0
-
-    iput-boolean v3, v1, Lr0/l/a/k1$b;->j:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_7
-
-    :goto_0
-    :try_start_1
-    iget-object v0, v1, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    iget-object v4, v1, Lr0/l/a/k1$b;->d:Ljava/util/Queue;
-
-    invoke-interface {v4}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v4
-
-    invoke-virtual {v1, v0, v4}, Lr0/l/a/k1$b;->a(Ljava/lang/Object;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    return-void
-
-    :cond_1
-    if-nez v4, :cond_f
-
-    iget-object v0, v1, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    move-object v5, v0
-
-    check-cast v5, [Lr0/l/a/k1$a;
-
-    array-length v0, v5
-
-    const-wide v6, 0x7fffffffffffffffL
-
-    array-length v8, v5
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    :goto_1
-    const-wide/16 v11, 0x0
-
-    if-ge v9, v8, :cond_4
-
-    aget-object v13, v5, v9
-
-    invoke-virtual {v13}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v13
-
-    cmp-long v15, v13, v11
-
-    if-ltz v15, :cond_2
-
-    invoke-static {v6, v7, v13, v14}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v6
-
-    goto :goto_2
-
-    :cond_2
-    const-wide/high16 v11, -0x8000000000000000L
-
-    cmp-long v15, v13, v11
-
-    if-nez v15, :cond_3
-
-    add-int/lit8 v10, v10, 0x1
-
-    :cond_3
-    :goto_2
-    add-int/lit8 v9, v9, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    const-wide/16 v8, 0x1
-
-    if-ne v0, v10, :cond_7
-
-    iget-object v0, v1, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    iget-object v4, v1, Lr0/l/a/k1$b;->d:Ljava/util/Queue;
-
-    invoke-interface {v4}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v4
-
-    if-nez v4, :cond_5
-
-    const/4 v4, 0x1
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v4, 0x0
-
-    :goto_3
-    invoke-virtual {v1, v0, v4}, Lr0/l/a/k1$b;->a(Ljava/lang/Object;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    return-void
-
-    :cond_6
-    invoke-virtual {v1, v8, v9}, Lrx/Subscriber;->request(J)V
-
-    goto :goto_0
-
-    :cond_7
-    const/4 v10, 0x0
-
-    :goto_4
-    int-to-long v13, v10
-
-    cmp-long v0, v13, v6
-
-    if-gez v0, :cond_d
-
-    iget-object v0, v1, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    iget-object v4, v1, Lr0/l/a/k1$b;->d:Ljava/util/Queue;
-
-    invoke-interface {v4}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v4
-
-    if-nez v4, :cond_8
-
-    const/4 v15, 0x1
-
-    goto :goto_5
-
-    :cond_8
-    const/4 v15, 0x0
-
-    :goto_5
-    invoke-virtual {v1, v0, v15}, Lr0/l/a/k1$b;->a(Ljava/lang/Object;Z)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_9
-
-    return-void
-
-    :cond_9
-    if-eqz v15, :cond_a
-
-    move v4, v15
-
-    goto :goto_8
-
-    :cond_a
-    invoke-static {v4}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    array-length v13, v5
-
-    const/4 v14, 0x0
-
-    :goto_6
-    if-ge v14, v13, :cond_c
-
-    aget-object v2, v5, v14
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v16
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_5
-
-    cmp-long v0, v16, v11
-
-    if-lez v0, :cond_b
-
-    :try_start_2
-    iget-object v0, v2, Lr0/l/a/k1$a;->child:Lrx/Subscriber;
-
-    invoke-interface {v0, v4}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :try_start_3
-    invoke-virtual {v2, v8, v9}, Lr0/l/a/k1$a;->a(J)J
-
-    goto :goto_7
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {v2}, Lr0/l/a/k1$a;->unsubscribe()V
-
-    iget-object v2, v2, Lr0/l/a/k1$a;->child:Lrx/Subscriber;
-
-    invoke-static {v0, v2, v4}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    :cond_b
-    :goto_7
-    add-int/lit8 v14, v14, 0x1
-
-    const/4 v2, 0x1
-
-    goto :goto_6
-
-    :cond_c
-    add-int/lit8 v10, v10, 0x1
-
-    move v4, v15
-
-    const/4 v2, 0x1
-
-    goto :goto_4
-
-    :cond_d
-    :goto_8
-    if-lez v10, :cond_e
-
-    invoke-virtual {v1, v13, v14}, Lrx/Subscriber;->request(J)V
-
-    :cond_e
-    cmp-long v0, v6, v11
-
-    if-eqz v0, :cond_f
-
-    if-nez v4, :cond_f
-
-    goto :goto_9
-
-    :cond_f
-    monitor-enter p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_5
-
-    :try_start_4
-    iget-boolean v0, v1, Lr0/l/a/k1$b;->j:Z
-
-    if-nez v0, :cond_10
-
-    iput-boolean v3, v1, Lr0/l/a/k1$b;->i:Z
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    :try_start_5
-    monitor-exit p0
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    const/4 v2, 0x1
-
-    goto :goto_a
-
-    :cond_10
-    :try_start_6
-    iput-boolean v3, v1, Lr0/l/a/k1$b;->j:Z
-
-    monitor-exit p0
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_2
-
-    :goto_9
-    const/4 v2, 0x1
-
-    goto/16 :goto_0
-
-    :catchall_2
-    move-exception v0
-
-    const/4 v2, 0x0
-
-    :goto_a
-    :try_start_7
-    monitor-exit p0
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_4
-
-    :try_start_8
-    throw v0
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_3
-
-    :catchall_3
-    move-exception v0
-
-    goto :goto_b
-
-    :catchall_4
-    move-exception v0
-
-    goto :goto_a
-
-    :catchall_5
-    move-exception v0
-
-    const/4 v2, 0x0
-
-    :goto_b
-    if-nez v2, :cond_11
-
-    monitor-enter p0
-
-    :try_start_9
-    iput-boolean v3, v1, Lr0/l/a/k1$b;->i:Z
-
-    monitor-exit p0
-
-    goto :goto_c
-
-    :catchall_6
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_6
-
-    throw v0
-
-    :cond_11
-    :goto_c
-    throw v0
-
-    :catchall_7
-    move-exception v0
-
-    :try_start_a
-    monitor-exit p0
-    :try_end_a
-    .catchall {:try_start_a .. :try_end_a} :catchall_7
-
-    throw v0
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    if-nez v0, :cond_0
-
-    sget-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    invoke-virtual {p0}, Lr0/l/a/k1$b;->b()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Lr0/l/a/h$c;
-
-    invoke-direct {v0, p1}, Lr0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
-
-    iput-object v0, p0, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    invoke-virtual {p0}, Lr0/l/a/k1$b;->b()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/k1$b;->d:Ljava/util/Queue;
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    new-instance p1, Lrx/exceptions/MissingBackpressureException;
-
-    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
-
-    iget-object v0, p0, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    if-nez v0, :cond_2
-
-    new-instance v0, Lr0/l/a/h$c;
-
-    invoke-direct {v0, p1}, Lr0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
-
-    iput-object v0, p0, Lr0/l/a/k1$b;->f:Ljava/lang/Object;
-
-    invoke-virtual {p0}, Lr0/l/a/k1$b;->b()V
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0}, Lr0/l/a/k1$b;->b()V
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    sget v0, Lr0/l/e/h;->f:I
-
-    int-to-long v0, v0
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k1.smali b/com.discord/smali_classes2/r0/l/a/k1.smali
deleted file mode 100644
index 5a88e2abc3..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k1.smali
+++ /dev/null
@@ -1,169 +0,0 @@
-.class public final Lr0/l/a/k1;
-.super Lr0/m/c;
-.source "OperatorPublish.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/k1$a;,
-        Lr0/l/a/k1$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/m/c<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final e:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/a/k1$b<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable$a<",
-            "TT;>;",
-            "Lrx/Observable<",
-            "+TT;>;",
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/a/k1$b<",
-            "TT;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/m/c;-><init>(Lrx/Observable$a;)V
-
-    iput-object p2, p0, Lr0/l/a/k1;->e:Lrx/Observable;
-
-    iput-object p3, p0, Lr0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public g0(Lrx/functions/Action1;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Action1<",
-            "-",
-            "Lrx/Subscription;",
-            ">;)V"
-        }
-    .end annotation
-
-    :goto_0
-    iget-object v0, p0, Lr0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/a/k1$b;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    :cond_0
-    new-instance v1, Lr0/l/a/k1$b;
-
-    iget-object v2, p0, Lr0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v1, v2}, Lr0/l/a/k1$b;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
-
-    new-instance v2, Lr0/l/a/l1;
-
-    invoke-direct {v2, v1}, Lr0/l/a/l1;-><init>(Lr0/l/a/k1$b;)V
-
-    new-instance v3, Lr0/r/a;
-
-    invoke-direct {v3, v2}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v2, p0, Lr0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v0, v1
-
-    :cond_2
-    iget-object v1, v0, Lr0/l/a/k1$b;->h:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-nez v1, :cond_3
-
-    iget-object v1, v0, Lr0/l/a/k1$b;->h:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_1
-    invoke-interface {p1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    if-eqz v2, :cond_4
-
-    iget-object p1, p0, Lr0/l/a/k1;->e:Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    :cond_4
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k2$a.smali b/com.discord/smali_classes2/r0/l/a/k2$a.smali
deleted file mode 100644
index f109e09d01..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k2$a.smali
+++ /dev/null
@@ -1,147 +0,0 @@
-.class public final Lr0/l/a/k2$a;
-.super Lrx/Subscriber;
-.source "OperatorTakeUntilPredicate.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/k2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-.field public final synthetic f:Lr0/l/a/k2;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/k2;Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lr0/l/a/k2$a;->f:Lr0/l/a/k2;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p2, p0, Lr0/l/a/k2$a;->d:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/k2$a;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/k2$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/k2$a;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/k2$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/k2$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    const/4 v0, 0x1
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/k2$a;->f:Lr0/l/a/k2;
-
-    iget-object v1, v1, Lr0/l/a/k2;->d:Lr0/k/b;
-
-    invoke-interface {v1, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Boolean;
-
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p1, :cond_0
-
-    iput-boolean v0, p0, Lr0/l/a/k2$a;->e:Z
-
-    iget-object p1, p0, Lr0/l/a/k2$a;->d:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    :cond_0
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    iput-boolean v0, p0, Lr0/l/a/k2$a;->e:Z
-
-    iget-object v0, p0, Lr0/l/a/k2$a;->d:Lrx/Subscriber;
-
-    invoke-static {v1, v0, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k2.smali b/com.discord/smali_classes2/r0/l/a/k2.smali
deleted file mode 100644
index 847859da36..0000000000
--- a/com.discord/smali_classes2/r0/l/a/k2.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public final Lr0/l/a/k2;
-.super Ljava/lang/Object;
-.source "OperatorTakeUntilPredicate.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/k2$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/k/b<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/k2;->d:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/k2$a;
-
-    invoke-direct {v0, p0, p1}, Lr0/l/a/k2$a;-><init>(Lr0/l/a/k2;Lrx/Subscriber;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v1, Lr0/l/a/j2;
-
-    invoke-direct {v1, p0, v0}, Lr0/l/a/j2;-><init>(Lr0/l/a/k2;Lr0/l/a/k2$a;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l$a.smali b/com.discord/smali_classes2/r0/l/a/l$a.smali
deleted file mode 100644
index 22b06d5770..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l$a.smali
+++ /dev/null
@@ -1,205 +0,0 @@
-.class public abstract Lr0/l/a/l$a;
-.super Ljava/util/concurrent/atomic/AtomicLong;
-.source "OnSubscribeCreate.java"
-
-# interfaces
-.implements Lrx/Emitter;
-.implements Lrx/Producer;
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x409
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicLong;",
-        "Lrx/Emitter<",
-        "TT;>;",
-        "Lrx/Producer;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x65ac35ee8a56a4bfL
-
-
-# instance fields
-.field public final actual:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final serial:Lrx/subscriptions/SerialSubscription;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
-
-    new-instance p1, Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public b()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->isUnsubscribed()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final m(J)V
-    .locals 1
-
-    invoke-static {p1, p2}, Lf/n/a/k/a;->n0(J)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    invoke-virtual {p0}, Lr0/l/a/l$a;->a()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
-
-    throw v0
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object p1, p0, Lr0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {p1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v0, p0, Lr0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
-
-    throw p1
-.end method
-
-.method public final unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
-
-    iget-object v0, v0, Lrx/subscriptions/SerialSubscription;->d:Lr0/l/d/a;
-
-    invoke-virtual {v0}, Lr0/l/d/a;->unsubscribe()V
-
-    invoke-virtual {p0}, Lr0/l/a/l$a;->b()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l$b.smali b/com.discord/smali_classes2/r0/l/a/l$b.smali
deleted file mode 100644
index 0b07994ed9..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l$b.smali
+++ /dev/null
@@ -1,325 +0,0 @@
-.class public final Lr0/l/a/l$b;
-.super Lr0/l/a/l$a;
-.source "OnSubscribeCreate.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/a/l$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x21aef8f9f7f1cbc3L
-
-
-# instance fields
-.field public volatile done:Z
-
-.field public error:Ljava/lang/Throwable;
-
-.field public final queue:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;I)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/l/a/l$a;-><init>(Lrx/Subscriber;)V
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    new-instance p1, Lr0/l/e/n/t;
-
-    invoke-direct {p1, p2}, Lr0/l/e/n/t;-><init>(I)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lr0/l/e/m/g;
-
-    invoke-direct {p1, p2}, Lr0/l/e/m/g;-><init>(I)V
-
-    :goto_0
-    iput-object p1, p0, Lr0/l/a/l$b;->queue:Ljava/util/Queue;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 0
-
-    invoke-virtual {p0}, Lr0/l/a/l$b;->c()V
-
-    return-void
-.end method
-
-.method public b()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/l$b;->queue:Ljava/util/Queue;
-
-    invoke-interface {v0}, Ljava/util/Queue;->clear()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public c()V
-    .locals 14
-
-    iget-object v0, p0, Lr0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
-
-    iget-object v1, p0, Lr0/l/a/l$b;->queue:Ljava/util/Queue;
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x1
-
-    :cond_1
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v4
-
-    const-wide/16 v6, 0x0
-
-    move-wide v8, v6
-
-    :goto_0
-    cmp-long v10, v8, v4
-
-    if-eqz v10, :cond_7
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v11
-
-    if-eqz v11, :cond_2
-
-    invoke-interface {v1}, Ljava/util/Queue;->clear()V
-
-    return-void
-
-    :cond_2
-    iget-boolean v11, p0, Lr0/l/a/l$b;->done:Z
-
-    invoke-interface {v1}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v12
-
-    if-nez v12, :cond_3
-
-    const/4 v13, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v13, 0x0
-
-    :goto_1
-    if-eqz v11, :cond_5
-
-    if-eqz v13, :cond_5
-
-    iget-object v0, p0, Lr0/l/a/l$b;->error:Ljava/lang/Throwable;
-
-    if-eqz v0, :cond_4
-
-    invoke-super {p0, v0}, Lr0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :cond_4
-    invoke-super {p0}, Lr0/l/a/l$a;->onCompleted()V
-
-    :goto_2
-    return-void
-
-    :cond_5
-    if-eqz v13, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    invoke-static {v12}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v10
-
-    invoke-interface {v0, v10}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    const-wide/16 v10, 0x1
-
-    add-long/2addr v8, v10
-
-    goto :goto_0
-
-    :cond_7
-    :goto_3
-    if-nez v10, :cond_a
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_8
-
-    invoke-interface {v1}, Ljava/util/Queue;->clear()V
-
-    return-void
-
-    :cond_8
-    iget-boolean v4, p0, Lr0/l/a/l$b;->done:Z
-
-    invoke-interface {v1}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v5
-
-    if-eqz v4, :cond_a
-
-    if-eqz v5, :cond_a
-
-    iget-object v0, p0, Lr0/l/a/l$b;->error:Ljava/lang/Throwable;
-
-    if-eqz v0, :cond_9
-
-    invoke-super {p0, v0}, Lr0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_4
-
-    :cond_9
-    invoke-super {p0}, Lr0/l/a/l$a;->onCompleted()V
-
-    :goto_4
-    return-void
-
-    :cond_a
-    cmp-long v4, v8, v6
-
-    if-eqz v4, :cond_b
-
-    invoke-static {p0, v8, v9}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    :cond_b
-    iget-object v4, p0, Lr0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    neg-int v3, v3
-
-    invoke-virtual {v4, v3}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
-
-    move-result v3
-
-    if-nez v3, :cond_1
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/l$b;->done:Z
-
-    invoke-virtual {p0}, Lr0/l/a/l$b;->c()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/l$b;->error:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/l$b;->done:Z
-
-    invoke-virtual {p0}, Lr0/l/a/l$b;->c()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/l$b;->queue:Ljava/util/Queue;
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    invoke-virtual {p0}, Lr0/l/a/l$b;->c()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l$c.smali b/com.discord/smali_classes2/r0/l/a/l$c.smali
deleted file mode 100644
index f05d01b408..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l$c.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Lr0/l/a/l$c;
-.super Lr0/l/a/l$f;
-.source "OnSubscribeCreate.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/a/l$f<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x7404e4d77326a273L
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/l/a/l$f;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public c()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l$d.smali b/com.discord/smali_classes2/r0/l/a/l$d.smali
deleted file mode 100644
index 3ee7577e04..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l$d.smali
+++ /dev/null
@@ -1,125 +0,0 @@
-.class public final Lr0/l/a/l$d;
-.super Lr0/l/a/l$f;
-.source "OnSubscribeCreate.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "d"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/a/l$f<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x4b43427a9c2e580L
-
-
-# instance fields
-.field public done:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/l/a/l$f;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public c()V
-    .locals 2
-
-    new-instance v0, Lrx/exceptions/MissingBackpressureException;
-
-    const-string v1, "create: could not emit value due to lack of requests"
-
-    invoke-direct {v0, v1}, Lrx/exceptions/MissingBackpressureException;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p0, v0}, Lr0/l/a/l$d;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/l$d;->done:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/l$d;->done:Z
-
-    invoke-super {p0}, Lr0/l/a/l$a;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/l$d;->done:Z
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/l$d;->done:Z
-
-    invoke-super {p0, p1}, Lr0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/l$d;->done:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-super {p0, p1}, Lr0/l/a/l$f;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l$e.smali b/com.discord/smali_classes2/r0/l/a/l$e.smali
deleted file mode 100644
index f2e823525a..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l$e.smali
+++ /dev/null
@@ -1,324 +0,0 @@
-.class public final Lr0/l/a/l$e;
-.super Lr0/l/a/l$a;
-.source "OnSubscribeCreate.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "e"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/a/l$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x37d61f4a35bdda6fL
-
-
-# instance fields
-.field public volatile done:Z
-
-.field public error:Ljava/lang/Throwable;
-
-.field public final queue:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/l/a/l$a;-><init>(Lrx/Subscriber;)V
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 0
-
-    invoke-virtual {p0}, Lr0/l/a/l$e;->c()V
-
-    return-void
-.end method
-
-.method public b()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public c()V
-    .locals 17
-
-    move-object/from16 v0, p0
-
-    iget-object v1, v0, Lr0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v1, v0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
-
-    iget-object v2, v0, Lr0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x1
-
-    :cond_1
-    invoke-virtual/range {p0 .. p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v5
-
-    const-wide/16 v7, 0x0
-
-    move-wide v9, v7
-
-    :goto_0
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    cmp-long v13, v9, v5
-
-    if-eqz v13, :cond_7
-
-    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v14
-
-    if-eqz v14, :cond_2
-
-    invoke-virtual {v2, v12}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_2
-    iget-boolean v14, v0, Lr0/l/a/l$e;->done:Z
-
-    invoke-virtual {v2, v12}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v15
-
-    if-nez v15, :cond_3
-
-    const/16 v16, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/16 v16, 0x0
-
-    :goto_1
-    if-eqz v14, :cond_5
-
-    if-eqz v16, :cond_5
-
-    iget-object v1, v0, Lr0/l/a/l$e;->error:Ljava/lang/Throwable;
-
-    if-eqz v1, :cond_4
-
-    invoke-super {v0, v1}, Lr0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :cond_4
-    invoke-super/range {p0 .. p0}, Lr0/l/a/l$a;->onCompleted()V
-
-    :goto_2
-    return-void
-
-    :cond_5
-    if-eqz v16, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    invoke-static {v15}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v11
-
-    invoke-interface {v1, v11}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    const-wide/16 v11, 0x1
-
-    add-long/2addr v9, v11
-
-    goto :goto_0
-
-    :cond_7
-    :goto_3
-    if-nez v13, :cond_b
-
-    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_8
-
-    invoke-virtual {v2, v12}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_8
-    iget-boolean v5, v0, Lr0/l/a/l$e;->done:Z
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v6
-
-    if-nez v6, :cond_9
-
-    const/4 v11, 0x1
-
-    :cond_9
-    if-eqz v5, :cond_b
-
-    if-eqz v11, :cond_b
-
-    iget-object v1, v0, Lr0/l/a/l$e;->error:Ljava/lang/Throwable;
-
-    if-eqz v1, :cond_a
-
-    invoke-super {v0, v1}, Lr0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_4
-
-    :cond_a
-    invoke-super/range {p0 .. p0}, Lr0/l/a/l$a;->onCompleted()V
-
-    :goto_4
-    return-void
-
-    :cond_b
-    cmp-long v5, v9, v7
-
-    if-eqz v5, :cond_c
-
-    invoke-static {v0, v9, v10}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    :cond_c
-    iget-object v5, v0, Lr0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    neg-int v4, v4
-
-    invoke-virtual {v5, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
-
-    move-result v4
-
-    if-nez v4, :cond_1
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/l$e;->done:Z
-
-    invoke-virtual {p0}, Lr0/l/a/l$e;->c()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/l$e;->error:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/l$e;->done:Z
-
-    invoke-virtual {p0}, Lr0/l/a/l$e;->c()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    invoke-virtual {p0}, Lr0/l/a/l$e;->c()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l.smali b/com.discord/smali_classes2/r0/l/a/l.smali
deleted file mode 100644
index a5c818c4c9..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l.smali
+++ /dev/null
@@ -1,142 +0,0 @@
-.class public final Lr0/l/a/l;
-.super Ljava/lang/Object;
-.source "OnSubscribeCreate.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/l$e;,
-        Lr0/l/a/l$b;,
-        Lr0/l/a/l$d;,
-        Lr0/l/a/l$c;,
-        Lr0/l/a/l$f;,
-        Lr0/l/a/l$g;,
-        Lr0/l/a/l$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "Lrx/Emitter<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/Emitter$BackpressureMode;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Action1<",
-            "Lrx/Emitter<",
-            "TT;>;>;",
-            "Lrx/Emitter$BackpressureMode;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/l;->d:Lrx/functions/Action1;
-
-    iput-object p2, p0, Lr0/l/a/l;->e:Lrx/Emitter$BackpressureMode;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/l;->e:Lrx/Emitter$BackpressureMode;
-
-    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    const/4 v1, 0x1
-
-    if-eq v0, v1, :cond_2
-
-    const/4 v1, 0x3
-
-    if-eq v0, v1, :cond_1
-
-    const/4 v1, 0x4
-
-    if-eq v0, v1, :cond_0
-
-    new-instance v0, Lr0/l/a/l$b;
-
-    sget v1, Lr0/l/e/h;->f:I
-
-    invoke-direct {v0, p1, v1}, Lr0/l/a/l$b;-><init>(Lrx/Subscriber;I)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lr0/l/a/l$e;
-
-    invoke-direct {v0, p1}, Lr0/l/a/l$e;-><init>(Lrx/Subscriber;)V
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Lr0/l/a/l$c;
-
-    invoke-direct {v0, p1}, Lr0/l/a/l$c;-><init>(Lrx/Subscriber;)V
-
-    goto :goto_0
-
-    :cond_2
-    new-instance v0, Lr0/l/a/l$d;
-
-    invoke-direct {v0, p1}, Lr0/l/a/l$d;-><init>(Lrx/Subscriber;)V
-
-    goto :goto_0
-
-    :cond_3
-    new-instance v0, Lr0/l/a/l$g;
-
-    invoke-direct {v0, p1}, Lr0/l/a/l$g;-><init>(Lrx/Subscriber;)V
-
-    :goto_0
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    iget-object p1, p0, Lr0/l/a/l;->d:Lrx/functions/Action1;
-
-    invoke-interface {p1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l0.smali b/com.discord/smali_classes2/r0/l/a/l0.smali
deleted file mode 100644
index 366cb5279f..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l0.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.class public final Lr0/l/a/l0;
-.super Ljava/lang/Object;
-.source "OnSubscribeTimerOnce.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "Ljava/lang/Long;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:Ljava/util/concurrent/TimeUnit;
-
-.field public final f:Lrx/Scheduler;
-
-
-# direct methods
-.method public constructor <init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lr0/l/a/l0;->d:J
-
-    iput-object p3, p0, Lr0/l/a/l0;->e:Ljava/util/concurrent/TimeUnit;
-
-    iput-object p4, p0, Lr0/l/a/l0;->f:Lrx/Scheduler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 4
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/l0;->f:Lrx/Scheduler;
-
-    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v1, Lr0/l/a/k0;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/a/k0;-><init>(Lr0/l/a/l0;Lrx/Subscriber;)V
-
-    iget-wide v2, p0, Lr0/l/a/l0;->d:J
-
-    iget-object p1, p0, Lr0/l/a/l0;->e:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v1, v2, v3, p1}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l1.smali b/com.discord/smali_classes2/r0/l/a/l1.smali
deleted file mode 100644
index ba95a07373..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l1.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public Lr0/l/a/l1;
-.super Ljava/lang/Object;
-.source "OperatorPublish.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/k1$b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/k1$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/l1;->d:Lr0/l/a/k1$b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/a/l1;->d:Lr0/l/a/k1$b;
-
-    iget-object v0, v0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/a/k1$b;->l:[Lr0/l/a/k1$a;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    iget-object v0, p0, Lr0/l/a/l1;->d:Lr0/l/a/k1$b;
-
-    iget-object v1, v0, Lr0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l2$a.smali b/com.discord/smali_classes2/r0/l/a/l2$a.smali
deleted file mode 100644
index bfcedc492f..0000000000
--- a/com.discord/smali_classes2/r0/l/a/l2$a.smali
+++ /dev/null
@@ -1,62 +0,0 @@
-.class public Lr0/l/a/l2$a;
-.super Ljava/lang/Object;
-.source "OperatorTakeWhile.java"
-
-# interfaces
-.implements Lrx/functions/Func2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/l2;-><init>(Lr0/k/b;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func2<",
-        "TT;",
-        "Ljava/lang/Integer;",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/k/b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/l2$a;->d:Lr0/k/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p2, Ljava/lang/Integer;
-
-    iget-object p2, p0, Lr0/l/a/l2$a;->d:Lr0/k/b;
-
-    invoke-interface {p2, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m.smali b/com.discord/smali_classes2/r0/l/a/m.smali
deleted file mode 100644
index 58340fcc2c..0000000000
--- a/com.discord/smali_classes2/r0/l/a/m.smali
+++ /dev/null
@@ -1,90 +0,0 @@
-.class public final Lr0/l/a/m;
-.super Ljava/lang/Object;
-.source "OnSubscribeDefer.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Func0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Func0<",
-            "+",
-            "Lrx/Observable<",
-            "+TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func0;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Func0<",
-            "+",
-            "Lrx/Observable<",
-            "+TT;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/m;->d:Lrx/functions/Func0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/m;->d:Lrx/functions/Func0;
-
-    invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    new-instance v1, Lr0/n/e;
-
-    invoke-direct {v1, p1, p1}, Lr0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m0.smali b/com.discord/smali_classes2/r0/l/a/m0.smali
deleted file mode 100644
index a659dedee0..0000000000
--- a/com.discord/smali_classes2/r0/l/a/m0.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public Lr0/l/a/m0;
-.super Ljava/lang/Object;
-.source "OnSubscribeTimerPeriodically.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public d:J
-
-.field public final synthetic e:Lrx/Subscriber;
-
-.field public final synthetic f:Lrx/Scheduler$Worker;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/n0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/m0;->e:Lrx/Subscriber;
-
-    iput-object p3, p0, Lr0/l/a/m0;->f:Lrx/Scheduler$Worker;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 5
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/m0;->e:Lrx/Subscriber;
-
-    iget-wide v1, p0, Lr0/l/a/m0;->d:J
-
-    const-wide/16 v3, 0x1
-
-    add-long/2addr v3, v1
-
-    iput-wide v3, p0, Lr0/l/a/m0;->d:J
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_1
-    iget-object v1, p0, Lr0/l/a/m0;->f:Lrx/Scheduler$Worker;
-
-    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    iget-object v1, p0, Lr0/l/a/m0;->e:Lrx/Subscriber;
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-
-    :catchall_1
-    move-exception v1
-
-    iget-object v2, p0, Lr0/l/a/m0;->e:Lrx/Subscriber;
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v2, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1$b.smali b/com.discord/smali_classes2/r0/l/a/m1$b.smali
deleted file mode 100644
index e4228dad05..0000000000
--- a/com.discord/smali_classes2/r0/l/a/m1$b.smali
+++ /dev/null
@@ -1,403 +0,0 @@
-.class public Lr0/l/a/m1$b;
-.super Ljava/util/concurrent/atomic/AtomicReference;
-.source "OperatorReplay.java"
-
-# interfaces
-.implements Lr0/l/a/m1$e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicReference<",
-        "Lr0/l/a/m1$d;",
-        ">;",
-        "Lr0/l/a/m1$e<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x2090aef8efde5e9eL
-
-
-# instance fields
-.field public index:J
-
-.field public size:I
-
-.field public tail:Lr0/l/a/m1$d;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 4
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    new-instance v0, Lr0/l/a/m1$d;
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    invoke-direct {v0, v1, v2, v3}, Lr0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
-
-    iput-object v0, p0, Lr0/l/a/m1$b;->tail:Lr0/l/a/m1$d;
-
-    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final c(Ljava/lang/Object;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    new-instance v0, Lr0/l/a/m1$d;
-
-    iget-wide v1, p0, Lr0/l/a/m1$b;->index:J
-
-    const-wide/16 v3, 0x1
-
-    add-long/2addr v1, v3
-
-    iput-wide v1, p0, Lr0/l/a/m1$b;->index:J
-
-    invoke-direct {v0, p1, v1, v2}, Lr0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
-
-    iget-object p1, p0, Lr0/l/a/m1$b;->tail:Lr0/l/a/m1$d;
-
-    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Lr0/l/a/m1$b;->tail:Lr0/l/a/m1$d;
-
-    iget p1, p0, Lr0/l/a/m1$b;->size:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lr0/l/a/m1$b;->size:I
-
-    invoke-virtual {p0}, Lr0/l/a/m1$b;->a()V
-
-    return-void
-.end method
-
-.method public final complete()V
-    .locals 6
-
-    sget-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    new-instance v1, Lr0/l/a/m1$d;
-
-    iget-wide v2, p0, Lr0/l/a/m1$b;->index:J
-
-    const-wide/16 v4, 0x1
-
-    add-long/2addr v2, v4
-
-    iput-wide v2, p0, Lr0/l/a/m1$b;->index:J
-
-    invoke-direct {v1, v0, v2, v3}, Lr0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
-
-    iget-object v0, p0, Lr0/l/a/m1$b;->tail:Lr0/l/a/m1$d;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    iput-object v1, p0, Lr0/l/a/m1$b;->tail:Lr0/l/a/m1$d;
-
-    iget v0, p0, Lr0/l/a/m1$b;->size:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lr0/l/a/m1$b;->size:I
-
-    return-void
-.end method
-
-.method public final h(Lr0/l/a/m1$c;)V
-    .locals 11
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/m1$c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    monitor-enter p1
-
-    :try_start_0
-    iget-boolean v0, p1, Lr0/l/a/m1$c;->emitting:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, p1, Lr0/l/a/m1$c;->missed:Z
-
-    monitor-exit p1
-
-    return-void
-
-    :cond_0
-    iput-boolean v1, p1, Lr0/l/a/m1$c;->emitting:Z
-
-    monitor-exit p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :goto_0
-    invoke-virtual {p1}, Lr0/l/a/m1$c;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v0, p1, Lr0/l/a/m1$c;->index:Ljava/lang/Object;
-
-    check-cast v0, Lr0/l/a/m1$d;
-
-    if-nez v0, :cond_2
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/a/m1$d;
-
-    iput-object v0, p1, Lr0/l/a/m1$c;->index:Ljava/lang/Object;
-
-    iget-wide v1, v0, Lr0/l/a/m1$d;->index:J
-
-    invoke-virtual {p1, v1, v2}, Lr0/l/a/m1$c;->a(J)V
-
-    :cond_2
-    invoke-virtual {p1}, Lr0/l/a/m1$c;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    return-void
-
-    :cond_3
-    iget-object v1, p1, Lr0/l/a/m1$c;->child:Lrx/Subscriber;
-
-    if-nez v1, :cond_4
-
-    return-void
-
-    :cond_4
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    const-wide/16 v4, 0x0
-
-    move-wide v6, v4
-
-    :goto_1
-    cmp-long v8, v6, v2
-
-    if-eqz v8, :cond_8
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v8
-
-    check-cast v8, Lr0/l/a/m1$d;
-
-    if-eqz v8, :cond_8
-
-    iget-object v0, v8, Lr0/l/a/m1$d;->value:Ljava/lang/Object;
-
-    const/4 v9, 0x0
-
-    :try_start_1
-    invoke-static {v1, v0}, Lr0/l/a/h;->a(Lr0/g;Ljava/lang/Object;)Z
-
-    move-result v10
-
-    if-eqz v10, :cond_5
-
-    iput-object v9, p1, Lr0/l/a/m1$c;->index:Ljava/lang/Object;
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    return-void
-
-    :cond_5
-    const-wide/16 v9, 0x1
-
-    add-long/2addr v6, v9
-
-    invoke-virtual {p1}, Lr0/l/a/m1$c;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    return-void
-
-    :cond_6
-    move-object v0, v8
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v2
-
-    iput-object v9, p1, Lr0/l/a/m1$c;->index:Ljava/lang/Object;
-
-    invoke-static {v2}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p1}, Lr0/l/a/m1$c;->unsubscribe()V
-
-    instance-of p1, v0, Lr0/l/a/h$c;
-
-    if-nez p1, :cond_7
-
-    invoke-static {v0}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_7
-
-    invoke-static {v0}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-static {v2, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-interface {v1, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_7
-    return-void
-
-    :cond_8
-    cmp-long v1, v6, v4
-
-    if-eqz v1, :cond_9
-
-    iput-object v0, p1, Lr0/l/a/m1$c;->index:Ljava/lang/Object;
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    cmp-long v4, v2, v0
-
-    if-eqz v4, :cond_9
-
-    invoke-virtual {p1, v6, v7}, Lr0/l/a/m1$c;->b(J)J
-
-    :cond_9
-    monitor-enter p1
-
-    :try_start_2
-    iget-boolean v0, p1, Lr0/l/a/m1$c;->missed:Z
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_a
-
-    iput-boolean v1, p1, Lr0/l/a/m1$c;->emitting:Z
-
-    monitor-exit p1
-
-    return-void
-
-    :cond_a
-    iput-boolean v1, p1, Lr0/l/a/m1$c;->missed:Z
-
-    monitor-exit p1
-
-    goto/16 :goto_0
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v0
-
-    :catchall_2
-    move-exception v0
-
-    :try_start_3
-    monitor-exit p1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    throw v0
-.end method
-
-.method public final j(Ljava/lang/Throwable;)V
-    .locals 5
-
-    new-instance v0, Lr0/l/a/h$c;
-
-    invoke-direct {v0, p1}, Lr0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
-
-    new-instance p1, Lr0/l/a/m1$d;
-
-    iget-wide v1, p0, Lr0/l/a/m1$b;->index:J
-
-    const-wide/16 v3, 0x1
-
-    add-long/2addr v1, v3
-
-    iput-wide v1, p0, Lr0/l/a/m1$b;->index:J
-
-    invoke-direct {p1, v0, v1, v2}, Lr0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
-
-    iget-object v0, p0, Lr0/l/a/m1$b;->tail:Lr0/l/a/m1$d;
-
-    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    iput-object p1, p0, Lr0/l/a/m1$b;->tail:Lr0/l/a/m1$d;
-
-    iget p1, p0, Lr0/l/a/m1$b;->size:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lr0/l/a/m1$b;->size:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1$f.smali b/com.discord/smali_classes2/r0/l/a/m1$f.smali
deleted file mode 100644
index ea7f4851a7..0000000000
--- a/com.discord/smali_classes2/r0/l/a/m1$f.smali
+++ /dev/null
@@ -1,712 +0,0 @@
-.class public final Lr0/l/a/m1$f;
-.super Lrx/Subscriber;
-.source "OperatorReplay.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "f"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final s:[Lr0/l/a/m1$c;
-
-
-# instance fields
-.field public final d:Lr0/l/a/m1$e;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/m1$e<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-.field public volatile f:Z
-
-.field public final g:Lr0/l/e/f;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/e/f<",
-            "Lr0/l/a/m1$c<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public h:[Lr0/l/a/m1$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[",
-            "Lr0/l/a/m1$c<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public volatile i:J
-
-.field public j:J
-
-.field public final k:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field public l:Z
-
-.field public m:Z
-
-.field public n:J
-
-.field public o:J
-
-.field public volatile p:Lrx/Producer;
-
-.field public q:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lr0/l/a/m1$c<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public r:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Lr0/l/a/m1$c;
-
-    sput-object v0, Lr0/l/a/m1$f;->s:[Lr0/l/a/m1$c;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lr0/l/a/m1$e;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/m1$e<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/m1$f;->d:Lr0/l/a/m1$e;
-
-    new-instance p1, Lr0/l/e/f;
-
-    invoke-direct {p1}, Lr0/l/e/f;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    sget-object p1, Lr0/l/a/m1$f;->s:[Lr0/l/a/m1$c;
-
-    iput-object p1, p0, Lr0/l/a/m1$f;->h:[Lr0/l/a/m1$c;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/m1$f;->k:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    const-wide/16 v0, 0x0
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()[Lr0/l/a/m1$c;
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()[",
-            "Lr0/l/a/m1$c<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    iget-object v1, v1, Lr0/l/e/f;->e:[Ljava/lang/Object;
-
-    array-length v2, v1
-
-    new-array v3, v2, [Lr0/l/a/m1$c;
-
-    const/4 v4, 0x0
-
-    invoke-static {v1, v4, v3, v4, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    monitor-exit v0
-
-    return-object v3
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v1
-.end method
-
-.method public b(JJ)V
-    .locals 6
-
-    iget-wide v0, p0, Lr0/l/a/m1$f;->o:J
-
-    iget-object v2, p0, Lr0/l/a/m1$f;->p:Lrx/Producer;
-
-    sub-long p3, p1, p3
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, p3, v3
-
-    if-eqz v5, :cond_3
-
-    iput-wide p1, p0, Lr0/l/a/m1$f;->n:J
-
-    if-eqz v2, :cond_1
-
-    cmp-long p1, v0, v3
-
-    if-eqz p1, :cond_0
-
-    iput-wide v3, p0, Lr0/l/a/m1$f;->o:J
-
-    add-long/2addr v0, p3
-
-    invoke-interface {v2, v0, v1}, Lrx/Producer;->m(J)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {v2, p3, p4}, Lrx/Producer;->m(J)V
-
-    goto :goto_0
-
-    :cond_1
-    add-long/2addr v0, p3
-
-    cmp-long p1, v0, v3
-
-    if-gez p1, :cond_2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    :cond_2
-    iput-wide v0, p0, Lr0/l/a/m1$f;->o:J
-
-    goto :goto_0
-
-    :cond_3
-    cmp-long p1, v0, v3
-
-    if-eqz p1, :cond_4
-
-    if-eqz v2, :cond_4
-
-    iput-wide v3, p0, Lr0/l/a/m1$f;->o:J
-
-    invoke-interface {v2, v0, v1}, Lrx/Producer;->m(J)V
-
-    :cond_4
-    :goto_0
-    return-void
-.end method
-
-.method public c(Lr0/l/a/m1$c;)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/m1$c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/m1$f;->l:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_3
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p0, Lr0/l/a/m1$f;->q:Ljava/util/List;
-
-    if-nez v0, :cond_1
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/m1$f;->q:Ljava/util/List;
-
-    :cond_1
-    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    iput-boolean v1, p0, Lr0/l/a/m1$f;->r:Z
-
-    :goto_0
-    iput-boolean v1, p0, Lr0/l/a/m1$f;->m:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_3
-    iput-boolean v1, p0, Lr0/l/a/m1$f;->l:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    iget-wide v0, p0, Lr0/l/a/m1$f;->n:J
-
-    const/4 v2, 0x0
-
-    if-eqz p1, :cond_4
-
-    iget-object p1, p1, Lr0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    invoke-static {v0, v1, v3, v4}, Ljava/lang/Math;->max(JJ)J
-
-    move-result-wide v3
-
-    goto :goto_2
-
-    :cond_4
-    invoke-virtual {p0}, Lr0/l/a/m1$f;->a()[Lr0/l/a/m1$c;
-
-    move-result-object p1
-
-    array-length v3, p1
-
-    move-wide v4, v0
-
-    const/4 v6, 0x0
-
-    :goto_1
-    if-ge v6, v3, :cond_6
-
-    aget-object v7, p1, v6
-
-    if-eqz v7, :cond_5
-
-    iget-object v7, v7, Lr0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v7}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v7
-
-    invoke-static {v4, v5, v7, v8}, Ljava/lang/Math;->max(JJ)J
-
-    move-result-wide v4
-
-    :cond_5
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_1
-
-    :cond_6
-    move-wide v3, v4
-
-    :goto_2
-    invoke-virtual {p0, v3, v4, v0, v1}, Lr0/l/a/m1$f;->b(JJ)V
-
-    :goto_3
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_7
-
-    return-void
-
-    :cond_7
-    monitor-enter p0
-
-    :try_start_1
-    iget-boolean p1, p0, Lr0/l/a/m1$f;->m:Z
-
-    if-nez p1, :cond_8
-
-    iput-boolean v2, p0, Lr0/l/a/m1$f;->l:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_8
-    iput-boolean v2, p0, Lr0/l/a/m1$f;->m:Z
-
-    iget-object p1, p0, Lr0/l/a/m1$f;->q:Ljava/util/List;
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lr0/l/a/m1$f;->q:Ljava/util/List;
-
-    iget-boolean v0, p0, Lr0/l/a/m1$f;->r:Z
-
-    iput-boolean v2, p0, Lr0/l/a/m1$f;->r:Z
-
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    iget-wide v3, p0, Lr0/l/a/m1$f;->n:J
-
-    if-eqz p1, :cond_9
-
-    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    move-wide v5, v3
-
-    :goto_4
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_a
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lr0/l/a/m1$c;
-
-    iget-object v1, v1, Lr0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v7
-
-    invoke-static {v5, v6, v7, v8}, Ljava/lang/Math;->max(JJ)J
-
-    move-result-wide v5
-
-    goto :goto_4
-
-    :cond_9
-    move-wide v5, v3
-
-    :cond_a
-    if-eqz v0, :cond_c
-
-    invoke-virtual {p0}, Lr0/l/a/m1$f;->a()[Lr0/l/a/m1$c;
-
-    move-result-object p1
-
-    array-length v0, p1
-
-    const/4 v1, 0x0
-
-    :goto_5
-    if-ge v1, v0, :cond_c
-
-    aget-object v7, p1, v1
-
-    if-eqz v7, :cond_b
-
-    iget-object v7, v7, Lr0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v7}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v7
-
-    invoke-static {v5, v6, v7, v8}, Ljava/lang/Math;->max(JJ)J
-
-    move-result-wide v5
-
-    :cond_b
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_5
-
-    :cond_c
-    invoke-virtual {p0, v5, v6, v3, v4}, Lr0/l/a/m1$f;->b(JJ)V
-
-    goto :goto_3
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_2
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_3
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    throw p1
-.end method
-
-.method public d()V
-    .locals 7
-
-    iget-object v0, p0, Lr0/l/a/m1$f;->h:[Lr0/l/a/m1$c;
-
-    iget-wide v1, p0, Lr0/l/a/m1$f;->j:J
-
-    iget-wide v3, p0, Lr0/l/a/m1$f;->i:J
-
-    const/4 v5, 0x0
-
-    cmp-long v6, v1, v3
-
-    if-eqz v6, :cond_1
-
-    iget-object v1, p0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/m1$f;->h:[Lr0/l/a/m1$c;
-
-    iget-object v2, p0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    iget-object v2, v2, Lr0/l/e/f;->e:[Ljava/lang/Object;
-
-    array-length v3, v2
-
-    array-length v4, v0
-
-    if-eq v4, v3, :cond_0
-
-    new-array v0, v3, [Lr0/l/a/m1$c;
-
-    iput-object v0, p0, Lr0/l/a/m1$f;->h:[Lr0/l/a/m1$c;
-
-    :cond_0
-    invoke-static {v2, v5, v0, v5, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iget-wide v2, p0, Lr0/l/a/m1$f;->i:J
-
-    iput-wide v2, p0, Lr0/l/a/m1$f;->j:J
-
-    monitor-exit v1
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    iget-object v1, p0, Lr0/l/a/m1$f;->d:Lr0/l/a/m1$e;
-
-    array-length v2, v0
-
-    :goto_1
-    if-ge v5, v2, :cond_3
-
-    aget-object v3, v0, v5
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {v1, v3}, Lr0/l/a/m1$e;->h(Lr0/l/a/m1$c;)V
-
-    :cond_2
-    add-int/lit8 v5, v5, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/m1$f;->e:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/m1$f;->e:Z
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/m1$f;->d:Lr0/l/a/m1$e;
-
-    invoke-interface {v0}, Lr0/l/a/m1$e;->complete()V
-
-    invoke-virtual {p0}, Lr0/l/a/m1$f;->d()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw v0
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/m1$f;->e:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/m1$f;->e:Z
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/m1$f;->d:Lr0/l/a/m1$e;
-
-    invoke-interface {v0, p1}, Lr0/l/a/m1$e;->j(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lr0/l/a/m1$f;->d()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    throw p1
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/m1$f;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/m1$f;->d:Lr0/l/a/m1$e;
-
-    invoke-interface {v0, p1}, Lr0/l/a/m1$e;->c(Ljava/lang/Object;)V
-
-    invoke-virtual {p0}, Lr0/l/a/m1$f;->d()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/m1$f;->p:Lrx/Producer;
-
-    if-nez v0, :cond_0
-
-    iput-object p1, p0, Lr0/l/a/m1$f;->p:Lrx/Producer;
-
-    const/4 p1, 0x0
-
-    invoke-virtual {p0, p1}, Lr0/l/a/m1$f;->c(Lr0/l/a/m1$c;)V
-
-    invoke-virtual {p0}, Lr0/l/a/m1$f;->d()V
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Only a single producer can be set on a Subscriber."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1$h.smali b/com.discord/smali_classes2/r0/l/a/m1$h.smali
deleted file mode 100644
index b75d6e6159..0000000000
--- a/com.discord/smali_classes2/r0/l/a/m1$h.smali
+++ /dev/null
@@ -1,315 +0,0 @@
-.class public final Lr0/l/a/m1$h;
-.super Ljava/util/ArrayList;
-.source "OperatorReplay.java"
-
-# interfaces
-.implements Lr0/l/a/m1$e;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "h"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/ArrayList<",
-        "Ljava/lang/Object;",
-        ">;",
-        "Lr0/l/a/m1$e<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x62057d556fa2a2d8L
-
-
-# instance fields
-.field public volatile size:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Ljava/util/ArrayList;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public c(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-virtual {p0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    iget p1, p0, Lr0/l/a/m1$h;->size:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lr0/l/a/m1$h;->size:I
-
-    return-void
-.end method
-
-.method public complete()V
-    .locals 1
-
-    sget-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    invoke-virtual {p0, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    iget v0, p0, Lr0/l/a/m1$h;->size:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lr0/l/a/m1$h;->size:I
-
-    return-void
-.end method
-
-.method public h(Lr0/l/a/m1$c;)V
-    .locals 12
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/m1$c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    monitor-enter p1
-
-    :try_start_0
-    iget-boolean v0, p1, Lr0/l/a/m1$c;->emitting:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, p1, Lr0/l/a/m1$c;->missed:Z
-
-    monitor-exit p1
-
-    return-void
-
-    :cond_0
-    iput-boolean v1, p1, Lr0/l/a/m1$c;->emitting:Z
-
-    monitor-exit p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :goto_0
-    invoke-virtual {p1}, Lr0/l/a/m1$c;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    return-void
-
-    :cond_1
-    iget v0, p0, Lr0/l/a/m1$h;->size:I
-
-    iget-object v1, p1, Lr0/l/a/m1$c;->index:Ljava/lang/Object;
-
-    check-cast v1, Ljava/lang/Integer;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_1
-    iget-object v3, p1, Lr0/l/a/m1$c;->child:Lrx/Subscriber;
-
-    if-nez v3, :cond_3
-
-    return-void
-
-    :cond_3
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v4
-
-    const-wide/16 v6, 0x0
-
-    move-wide v8, v6
-
-    :goto_2
-    cmp-long v10, v8, v4
-
-    if-eqz v10, :cond_7
-
-    if-ge v1, v0, :cond_7
-
-    invoke-virtual {p0, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
-
-    move-result-object v10
-
-    :try_start_1
-    invoke-static {v3, v10}, Lr0/l/a/h;->a(Lr0/g;Ljava/lang/Object;)Z
-
-    move-result v10
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-eqz v10, :cond_4
-
-    return-void
-
-    :cond_4
-    invoke-virtual {p1}, Lr0/l/a/m1$c;->isUnsubscribed()Z
-
-    move-result v10
-
-    if-eqz v10, :cond_5
-
-    return-void
-
-    :cond_5
-    add-int/lit8 v1, v1, 0x1
-
-    const-wide/16 v10, 0x1
-
-    add-long/2addr v8, v10
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p1}, Lr0/l/a/m1$c;->unsubscribe()V
-
-    instance-of p1, v10, Lr0/l/a/h$c;
-
-    if-nez p1, :cond_6
-
-    invoke-static {v10}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_6
-
-    invoke-static {v10}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-interface {v3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_6
-    return-void
-
-    :cond_7
-    cmp-long v0, v8, v6
-
-    if-eqz v0, :cond_8
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    iput-object v0, p1, Lr0/l/a/m1$c;->index:Ljava/lang/Object;
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    cmp-long v3, v4, v0
-
-    if-eqz v3, :cond_8
-
-    invoke-virtual {p1, v8, v9}, Lr0/l/a/m1$c;->b(J)J
-
-    :cond_8
-    monitor-enter p1
-
-    :try_start_2
-    iget-boolean v0, p1, Lr0/l/a/m1$c;->missed:Z
-
-    if-nez v0, :cond_9
-
-    iput-boolean v2, p1, Lr0/l/a/m1$c;->emitting:Z
-
-    monitor-exit p1
-
-    return-void
-
-    :cond_9
-    iput-boolean v2, p1, Lr0/l/a/m1$c;->missed:Z
-
-    monitor-exit p1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit p1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v0
-
-    :catchall_2
-    move-exception v0
-
-    :try_start_3
-    monitor-exit p1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    throw v0
-.end method
-
-.method public j(Ljava/lang/Throwable;)V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/h$c;
-
-    invoke-direct {v0, p1}, Lr0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    iget p1, p0, Lr0/l/a/m1$h;->size:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    iput p1, p0, Lr0/l/a/m1$h;->size:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1.smali b/com.discord/smali_classes2/r0/l/a/m1.smali
deleted file mode 100644
index dcf026e2f5..0000000000
--- a/com.discord/smali_classes2/r0/l/a/m1.smali
+++ /dev/null
@@ -1,263 +0,0 @@
-.class public final Lr0/l/a/m1;
-.super Lr0/m/c;
-.source "OperatorReplay.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/m1$g;,
-        Lr0/l/a/m1$b;,
-        Lr0/l/a/m1$d;,
-        Lr0/l/a/m1$h;,
-        Lr0/l/a/m1$e;,
-        Lr0/l/a/m1$c;,
-        Lr0/l/a/m1$f;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/m/c<",
-        "TT;>;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final h:Lrx/functions/Func0;
-
-
-# instance fields
-.field public final e:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/a/m1$f<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Lrx/functions/Func0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Func0<",
-            "+",
-            "Lr0/l/a/m1$e<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/m1$a;
-
-    invoke-direct {v0}, Lr0/l/a/m1$a;-><init>()V
-
-    sput-object v0, Lr0/l/a/m1;->h:Lrx/functions/Func0;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable$a<",
-            "TT;>;",
-            "Lrx/Observable<",
-            "+TT;>;",
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/a/m1$f<",
-            "TT;>;>;",
-            "Lrx/functions/Func0<",
-            "+",
-            "Lr0/l/a/m1$e<",
-            "TT;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/m/c;-><init>(Lrx/Observable$a;)V
-
-    iput-object p2, p0, Lr0/l/a/m1;->e:Lrx/Observable;
-
-    iput-object p3, p0, Lr0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    iput-object p4, p0, Lr0/l/a/m1;->g:Lrx/functions/Func0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public g0(Lrx/functions/Action1;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Action1<",
-            "-",
-            "Lrx/Subscription;",
-            ">;)V"
-        }
-    .end annotation
-
-    :goto_0
-    iget-object v0, p0, Lr0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/a/m1$f;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    :cond_0
-    new-instance v1, Lr0/l/a/m1$f;
-
-    iget-object v2, p0, Lr0/l/a/m1;->g:Lrx/functions/Func0;
-
-    invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lr0/l/a/m1$e;
-
-    invoke-direct {v1, v2}, Lr0/l/a/m1$f;-><init>(Lr0/l/a/m1$e;)V
-
-    new-instance v2, Lr0/l/a/p1;
-
-    invoke-direct {v2, v1}, Lr0/l/a/p1;-><init>(Lr0/l/a/m1$f;)V
-
-    new-instance v3, Lr0/r/a;
-
-    invoke-direct {v3, v2}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v2, p0, Lr0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v0, v1
-
-    :cond_2
-    iget-object v1, v0, Lr0/l/a/m1$f;->k:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
-    if-nez v1, :cond_3
-
-    iget-object v1, v0, Lr0/l/a/m1$f;->k:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_3
-
-    goto :goto_1
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_1
-    invoke-interface {p1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    if-eqz v2, :cond_4
-
-    iget-object p1, p0, Lr0/l/a/m1;->e:Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    :cond_4
-    return-void
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/a/m1$f;
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()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
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m2.smali b/com.discord/smali_classes2/r0/l/a/m2.smali
deleted file mode 100644
index fd31abaaf4..0000000000
--- a/com.discord/smali_classes2/r0/l/a/m2.smali
+++ /dev/null
@@ -1,139 +0,0 @@
-.class public Lr0/l/a/m2;
-.super Lrx/Subscriber;
-.source "OperatorTakeWhile.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public e:Z
-
-.field public final synthetic f:Lrx/Subscriber;
-
-.field public final synthetic g:Lr0/l/a/l2;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/l2;Lrx/Subscriber;ZLrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/m2;->g:Lr0/l/a/l2;
-
-    iput-object p4, p0, Lr0/l/a/m2;->f:Lrx/Subscriber;
-
-    invoke-direct {p0, p2, p3}, Lrx/Subscriber;-><init>(Lrx/Subscriber;Z)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/m2;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/m2;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/m2;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/m2;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    const/4 v0, 0x1
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/m2;->g:Lr0/l/a/l2;
-
-    iget-object v1, v1, Lr0/l/a/l2;->d:Lrx/functions/Func2;
-
-    iget v2, p0, Lr0/l/a/m2;->d:I
-
-    add-int/lit8 v3, v2, 0x1
-
-    iput v3, p0, Lr0/l/a/m2;->d:I
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-interface {v1, p1, v2}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Boolean;
-
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v1, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/m2;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    iput-boolean v0, p0, Lr0/l/a/m2;->e:Z
-
-    iget-object p1, p0, Lr0/l/a/m2;->f:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    iput-boolean v0, p0, Lr0/l/a/m2;->e:Z
-
-    iget-object v0, p0, Lr0/l/a/m2;->f:Lrx/Subscriber;
-
-    invoke-static {v1, v0, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/n$a.smali b/com.discord/smali_classes2/r0/l/a/n$a.smali
deleted file mode 100644
index 59dafa35cf..0000000000
--- a/com.discord/smali_classes2/r0/l/a/n$a.smali
+++ /dev/null
@@ -1,203 +0,0 @@
-.class public final Lr0/l/a/n$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeDoOnEach.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/n;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/g<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public f:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lr0/g;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;",
-            "Lr0/g<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    iput-object p1, p0, Lr0/l/a/n$a;->d:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/n$a;->e:Lr0/g;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/n$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/n$a;->e:Lr0/g;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/n$a;->f:Z
-
-    iget-object v0, p0, Lr0/l/a/n$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v0}, Lr0/l/a/n$a;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 6
-
-    iget-boolean v0, p0, Lr0/l/a/n$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/n$a;->f:Z
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/n$a;->e:Lr0/g;
-
-    invoke-interface {v1, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/n$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iget-object v2, p0, Lr0/l/a/n$a;->d:Lrx/Subscriber;
-
-    new-instance v3, Lrx/exceptions/CompositeException;
-
-    const/4 v4, 0x2
-
-    new-array v4, v4, [Ljava/lang/Throwable;
-
-    const/4 v5, 0x0
-
-    aput-object p1, v4, v5
-
-    aput-object v1, v4, v0
-
-    invoke-static {v4}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-direct {v3, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    invoke-interface {v2, v3}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/n$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/n$a;->e:Lr0/g;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/n$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0, p0, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/n.smali b/com.discord/smali_classes2/r0/l/a/n.smali
deleted file mode 100644
index 1c92e9aca3..0000000000
--- a/com.discord/smali_classes2/r0/l/a/n.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.class public Lr0/l/a/n;
-.super Ljava/lang/Object;
-.source "OnSubscribeDoOnEach.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/n$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/g<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;Lr0/g;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "TT;>;",
-            "Lr0/g<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/n;->e:Lrx/Observable;
-
-    iput-object p2, p0, Lr0/l/a/n;->d:Lr0/g;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/n;->e:Lrx/Observable;
-
-    new-instance v1, Lr0/l/a/n$a;
-
-    iget-object v2, p0, Lr0/l/a/n;->d:Lr0/g;
-
-    invoke-direct {v1, p1, v2}, Lr0/l/a/n$a;-><init>(Lrx/Subscriber;Lr0/g;)V
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/n0.smali b/com.discord/smali_classes2/r0/l/a/n0.smali
deleted file mode 100644
index f723fc6781..0000000000
--- a/com.discord/smali_classes2/r0/l/a/n0.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lr0/l/a/n0;
-.super Ljava/lang/Object;
-.source "OnSubscribeTimerPeriodically.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "Ljava/lang/Long;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:J
-
-.field public final f:Ljava/util/concurrent/TimeUnit;
-
-.field public final g:Lrx/Scheduler;
-
-
-# direct methods
-.method public constructor <init>(JJLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lr0/l/a/n0;->d:J
-
-    iput-wide p3, p0, Lr0/l/a/n0;->e:J
-
-    iput-object p5, p0, Lr0/l/a/n0;->f:Ljava/util/concurrent/TimeUnit;
-
-    iput-object p6, p0, Lr0/l/a/n0;->g:Lrx/Scheduler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 8
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/n0;->g:Lrx/Scheduler;
-
-    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v1
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v2, Lr0/l/a/m0;
-
-    invoke-direct {v2, p0, p1, v1}, Lr0/l/a/m0;-><init>(Lr0/l/a/n0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
-
-    iget-wide v3, p0, Lr0/l/a/n0;->d:J
-
-    iget-wide v5, p0, Lr0/l/a/n0;->e:J
-
-    iget-object v7, p0, Lr0/l/a/n0;->f:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual/range {v1 .. v7}, Lrx/Scheduler$Worker;->c(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/n1.smali b/com.discord/smali_classes2/r0/l/a/n1.smali
deleted file mode 100644
index 391fa5a4b7..0000000000
--- a/com.discord/smali_classes2/r0/l/a/n1.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class public final Lr0/l/a/n1;
-.super Ljava/lang/Object;
-.source "OperatorReplay.java"
-
-# interfaces
-.implements Lrx/functions/Func0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func0<",
-        "Lr0/l/a/m1$e<",
-        "TT;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    iput p1, p0, Lr0/l/a/n1;->d:I
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()Ljava/lang/Object;
-    .locals 2
-
-    new-instance v0, Lr0/l/a/m1$g;
-
-    iget v1, p0, Lr0/l/a/n1;->d:I
-
-    invoke-direct {v0, v1}, Lr0/l/a/m1$g;-><init>(I)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/n2.smali b/com.discord/smali_classes2/r0/l/a/n2.smali
deleted file mode 100644
index c7c62ed95e..0000000000
--- a/com.discord/smali_classes2/r0/l/a/n2.smali
+++ /dev/null
@@ -1,126 +0,0 @@
-.class public Lr0/l/a/n2;
-.super Lrx/Subscriber;
-.source "OperatorThrottleFirst.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:J
-
-.field public final synthetic e:Lrx/Subscriber;
-
-.field public final synthetic f:Lr0/l/a/o2;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/o2;Lrx/Subscriber;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/n2;->f:Lr0/l/a/o2;
-
-    iput-object p3, p0, Lr0/l/a/n2;->e:Lrx/Subscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    const-wide/16 p1, -0x1
-
-    iput-wide p1, p0, Lr0/l/a/n2;->d:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/n2;->e:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/n2;->e:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/n2;->f:Lr0/l/a/o2;
-
-    iget-object v0, v0, Lr0/l/a/o2;->e:Lrx/Scheduler;
-
-    if-eqz v0, :cond_2
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v0
-
-    iget-wide v2, p0, Lr0/l/a/n2;->d:J
-
-    const-wide/16 v4, -0x1
-
-    cmp-long v6, v2, v4
-
-    if-eqz v6, :cond_0
-
-    cmp-long v4, v0, v2
-
-    if-ltz v4, :cond_0
-
-    sub-long v2, v0, v2
-
-    iget-object v4, p0, Lr0/l/a/n2;->f:Lr0/l/a/o2;
-
-    iget-wide v4, v4, Lr0/l/a/o2;->d:J
-
-    cmp-long v6, v2, v4
-
-    if-ltz v6, :cond_1
-
-    :cond_0
-    iput-wide v0, p0, Lr0/l/a/n2;->d:J
-
-    iget-object v0, p0, Lr0/l/a/n2;->e:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :cond_1
-    return-void
-
-    :cond_2
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/o$a.smali b/com.discord/smali_classes2/r0/l/a/o$a.smali
deleted file mode 100644
index e350fc3efa..0000000000
--- a/com.discord/smali_classes2/r0/l/a/o$a.smali
+++ /dev/null
@@ -1,186 +0,0 @@
-.class public final Lr0/l/a/o$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeFilter.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/o;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public f:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;",
-            "Lr0/k/b<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/o$a;->d:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/o$a;->e:Lr0/k/b;
-
-    const-wide/16 p1, 0x0
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/o$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/o$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/o$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/o$a;->f:Z
-
-    iget-object v0, p0, Lr0/l/a/o$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/o$a;->e:Lr0/k/b;
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/o$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    const-wide/16 v0, 0x1
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lr0/l/a/o$a;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    invoke-super {p0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    iget-object v0, p0, Lr0/l/a/o$a;->d:Lrx/Subscriber;
-
-    invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/o.smali b/com.discord/smali_classes2/r0/l/a/o.smali
deleted file mode 100644
index 0e9926865f..0000000000
--- a/com.discord/smali_classes2/r0/l/a/o.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.class public final Lr0/l/a/o;
-.super Ljava/lang/Object;
-.source "OnSubscribeFilter.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/o$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "TT;>;",
-            "Lr0/k/b<",
-            "-TT;",
-            "Ljava/lang/Boolean;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/o;->d:Lrx/Observable;
-
-    iput-object p2, p0, Lr0/l/a/o;->e:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/o$a;
-
-    iget-object v1, p0, Lr0/l/a/o;->e:Lr0/k/b;
-
-    invoke-direct {v0, p1, v1}, Lr0/l/a/o$a;-><init>(Lrx/Subscriber;Lr0/k/b;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object p1, p0, Lr0/l/a/o;->d:Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/o0$a.smali b/com.discord/smali_classes2/r0/l/a/o0$a.smali
deleted file mode 100644
index 5680a5fc49..0000000000
--- a/com.discord/smali_classes2/r0/l/a/o0$a.smali
+++ /dev/null
@@ -1,148 +0,0 @@
-.class public final Lr0/l/a/o0$a;
-.super Lr0/l/a/e;
-.source "OnSubscribeToMap.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/o0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "K:",
-        "Ljava/lang/Object;",
-        "V:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/a/e<",
-        "TT;",
-        "Ljava/util/Map<",
-        "TK;TV;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final i:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+TK;>;"
-        }
-    .end annotation
-.end field
-
-.field public final j:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+TV;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Ljava/util/Map;Lr0/k/b;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-",
-            "Ljava/util/Map<",
-            "TK;TV;>;>;",
-            "Ljava/util/Map<",
-            "TK;TV;>;",
-            "Lr0/k/b<",
-            "-TT;+TK;>;",
-            "Lr0/k/b<",
-            "-TT;+TV;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lr0/l/a/e;-><init>(Lrx/Subscriber;)V
-
-    iput-object p2, p0, Lr0/l/a/d;->f:Ljava/lang/Object;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/d;->e:Z
-
-    iput-object p3, p0, Lr0/l/a/o0$a;->i:Lr0/k/b;
-
-    iput-object p4, p0, Lr0/l/a/o0$a;->j:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/e;->h:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/o0$a;->i:Lr0/k/b;
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lr0/l/a/o0$a;->j:Lr0/k/b;
-
-    invoke-interface {v1, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    iget-object v1, p0, Lr0/l/a/d;->f:Ljava/lang/Object;
-
-    check-cast v1, Ljava/util/Map;
-
-    invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-virtual {p0, p1}, Lr0/l/a/e;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/o0.smali b/com.discord/smali_classes2/r0/l/a/o0.smali
deleted file mode 100644
index b4c2d937c4..0000000000
--- a/com.discord/smali_classes2/r0/l/a/o0.smali
+++ /dev/null
@@ -1,166 +0,0 @@
-.class public final Lr0/l/a/o0;
-.super Ljava/lang/Object;
-.source "OnSubscribeToMap.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-.implements Lrx/functions/Func0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/o0$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "K:",
-        "Ljava/lang/Object;",
-        "V:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "Ljava/util/Map<",
-        "TK;TV;>;>;",
-        "Lrx/functions/Func0<",
-        "Ljava/util/Map<",
-        "TK;TV;>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+TK;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+TV;>;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Lrx/functions/Func0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Func0<",
-            "+",
-            "Ljava/util/Map<",
-            "TK;TV;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;Lr0/k/b;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "TT;>;",
-            "Lr0/k/b<",
-            "-TT;+TK;>;",
-            "Lr0/k/b<",
-            "-TT;+TV;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/o0;->d:Lrx/Observable;
-
-    iput-object p2, p0, Lr0/l/a/o0;->e:Lr0/k/b;
-
-    iput-object p3, p0, Lr0/l/a/o0;->f:Lr0/k/b;
-
-    iput-object p0, p0, Lr0/l/a/o0;->g:Lrx/functions/Func0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Ljava/util/HashMap;
-
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
-
-    return-object v0
-.end method
-
-.method public call(Ljava/lang/Object;)V
-    .locals 4
-
-    check-cast p1, Lrx/Subscriber;
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/o0;->g:Lrx/functions/Func0;
-
-    invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/Map;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    new-instance v1, Lr0/l/a/o0$a;
-
-    iget-object v2, p0, Lr0/l/a/o0;->e:Lr0/k/b;
-
-    iget-object v3, p0, Lr0/l/a/o0;->f:Lr0/k/b;
-
-    invoke-direct {v1, p1, v0, v2, v3}, Lr0/l/a/o0$a;-><init>(Lrx/Subscriber;Ljava/util/Map;Lr0/k/b;Lr0/k/b;)V
-
-    iget-object p1, p0, Lr0/l/a/o0;->d:Lrx/Observable;
-
-    iget-object v0, v1, Lr0/l/a/d;->d:Lrx/Subscriber;
-
-    invoke-virtual {v0, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v2, Lr0/l/a/d$a;
-
-    invoke-direct {v2, v1}, Lr0/l/a/d$a;-><init>(Lr0/l/a/d;)V
-
-    invoke-virtual {v0, v2}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/o1.smali b/com.discord/smali_classes2/r0/l/a/o1.smali
deleted file mode 100644
index e1e2b21dcd..0000000000
--- a/com.discord/smali_classes2/r0/l/a/o1.smali
+++ /dev/null
@@ -1,153 +0,0 @@
-.class public final Lr0/l/a/o1;
-.super Ljava/lang/Object;
-.source "OperatorReplay.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicReference;
-
-.field public final synthetic e:Lrx/functions/Func0;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/o1;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    iput-object p2, p0, Lr0/l/a/o1;->e:Lrx/functions/Func0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 7
-
-    check-cast p1, Lrx/Subscriber;
-
-    :goto_0
-    iget-object v0, p0, Lr0/l/a/o1;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/a/m1$f;
-
-    if-nez v0, :cond_1
-
-    new-instance v1, Lr0/l/a/m1$f;
-
-    iget-object v2, p0, Lr0/l/a/o1;->e:Lrx/functions/Func0;
-
-    invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lr0/l/a/m1$e;
-
-    invoke-direct {v1, v2}, Lr0/l/a/m1$f;-><init>(Lr0/l/a/m1$e;)V
-
-    new-instance v2, Lr0/l/a/p1;
-
-    invoke-direct {v2, v1}, Lr0/l/a/p1;-><init>(Lr0/l/a/m1$f;)V
-
-    new-instance v3, Lr0/r/a;
-
-    invoke-direct {v3, v2}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v2, p0, Lr0/l/a/o1;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, v1
-
-    :cond_1
-    new-instance v1, Lr0/l/a/m1$c;
-
-    invoke-direct {v1, v0, p1}, Lr0/l/a/m1$c;-><init>(Lr0/l/a/m1$f;Lrx/Subscriber;)V
-
-    iget-boolean v2, v0, Lr0/l/a/m1$f;->f:Z
-
-    if-eqz v2, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    iget-object v2, v0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    monitor-enter v2
-
-    :try_start_0
-    iget-boolean v3, v0, Lr0/l/a/m1$f;->f:Z
-
-    if-eqz v3, :cond_3
-
-    monitor-exit v2
-
-    goto :goto_1
-
-    :cond_3
-    iget-object v3, v0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    invoke-virtual {v3, v1}, Lr0/l/e/f;->a(Ljava/lang/Object;)Z
-
-    iget-wide v3, v0, Lr0/l/a/m1$f;->i:J
-
-    const-wide/16 v5, 0x1
-
-    add-long/2addr v3, v5
-
-    iput-wide v3, v0, Lr0/l/a/m1$f;->i:J
-
-    monitor-exit v2
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :goto_1
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v0, v0, Lr0/l/a/m1$f;->d:Lr0/l/a/m1$e;
-
-    invoke-interface {v0, v1}, Lr0/l/a/m1$e;->h(Lr0/l/a/m1$c;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit v2
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/p.smali b/com.discord/smali_classes2/r0/l/a/p.smali
deleted file mode 100644
index 4fe166def4..0000000000
--- a/com.discord/smali_classes2/r0/l/a/p.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public Lr0/l/a/p;
-.super Ljava/lang/Object;
-.source "OnSubscribeFlattenIterable.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/q$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/q;Lr0/l/a/q$a;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/p;->d:Lr0/l/a/q$a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 4
-
-    iget-object v0, p0, Lr0/l/a/p;->d:Lr0/l/a/q$a;
-
-    if-eqz v0, :cond_2
-
-    const-wide/16 v1, 0x0
-
-    cmp-long v3, p1, v1
-
-    if-lez v3, :cond_0
-
-    iget-object v1, v0, Lr0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v1, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    invoke-virtual {v0}, Lr0/l/a/q$a;->b()V
-
-    goto :goto_0
-
-    :cond_0
-    if-ltz v3, :cond_1
-
-    :goto_0
-    return-void
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "n >= 0 required but it was "
-
-    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_2
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/p0.smali b/com.discord/smali_classes2/r0/l/a/p0.smali
deleted file mode 100644
index 4af497e9c8..0000000000
--- a/com.discord/smali_classes2/r0/l/a/p0.smali
+++ /dev/null
@@ -1,83 +0,0 @@
-.class public Lr0/l/a/p0;
-.super Ljava/lang/Object;
-.source "OperatorBufferWithTime.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/q0$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/q0$a;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/p0;->d:Lr0/l/a/q0$a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/a/p0;->d:Lr0/l/a/q0$a;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v1, v0, Lr0/l/a/q0$a;->g:Z
-
-    if-eqz v1, :cond_0
-
-    monitor-exit v0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v1, v0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v2, v0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-object v2, v0, Lr0/l/a/q0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v2, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {v0, v1}, Lr0/l/a/q0$a;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-
-    :catchall_1
-    move-exception v1
-
-    :try_start_2
-    monitor-exit v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/p1.smali b/com.discord/smali_classes2/r0/l/a/p1.smali
deleted file mode 100644
index 4f19ee8e1c..0000000000
--- a/com.discord/smali_classes2/r0/l/a/p1.smali
+++ /dev/null
@@ -1,93 +0,0 @@
-.class public Lr0/l/a/p1;
-.super Ljava/lang/Object;
-.source "OperatorReplay.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/m1$f;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/m1$f;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/p1;->d:Lr0/l/a/m1$f;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/p1;->d:Lr0/l/a/m1$f;
-
-    iget-boolean v0, v0, Lr0/l/a/m1$f;->f:Z
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/p1;->d:Lr0/l/a/m1$f;
-
-    iget-object v0, v0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/p1;->d:Lr0/l/a/m1$f;
-
-    iget-boolean v1, v1, Lr0/l/a/m1$f;->f:Z
-
-    if-nez v1, :cond_0
-
-    iget-object v1, p0, Lr0/l/a/p1;->d:Lr0/l/a/m1$f;
-
-    iget-object v1, v1, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
-
-    const/4 v2, 0x0
-
-    iput v2, v1, Lr0/l/e/f;->c:I
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    iput-object v2, v1, Lr0/l/e/f;->e:[Ljava/lang/Object;
-
-    iget-object v1, p0, Lr0/l/a/p1;->d:Lr0/l/a/m1$f;
-
-    iget-wide v2, v1, Lr0/l/a/m1$f;->i:J
-
-    const-wide/16 v4, 0x1
-
-    add-long/2addr v2, v4
-
-    iput-wide v2, v1, Lr0/l/a/m1$f;->i:J
-
-    iget-object v1, p0, Lr0/l/a/p1;->d:Lr0/l/a/m1$f;
-
-    const/4 v2, 0x1
-
-    iput-boolean v2, v1, Lr0/l/a/m1$f;->f:Z
-
-    :cond_0
-    monitor-exit v0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/p2.smali b/com.discord/smali_classes2/r0/l/a/p2.smali
deleted file mode 100644
index f063058d2a..0000000000
--- a/com.discord/smali_classes2/r0/l/a/p2.smali
+++ /dev/null
@@ -1,133 +0,0 @@
-.class public Lr0/l/a/p2;
-.super Lrx/Subscriber;
-.source "OperatorToObservableList.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public e:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic f:Lr0/l/b/b;
-
-.field public final synthetic g:Lrx/Subscriber;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/q2;Lr0/l/b/b;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/p2;->f:Lr0/l/b/b;
-
-    iput-object p3, p0, Lr0/l/a/p2;->g:Lrx/Subscriber;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    new-instance p1, Ljava/util/LinkedList;
-
-    invoke-direct {p1}, Ljava/util/LinkedList;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/p2;->e:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    iget-boolean v0, p0, Lr0/l/a/p2;->d:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/p2;->d:Z
-
-    :try_start_0
-    new-instance v0, Ljava/util/ArrayList;
-
-    iget-object v1, p0, Lr0/l/a/p2;->e:Ljava/util/List;
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lr0/l/a/p2;->e:Ljava/util/List;
-
-    iget-object v1, p0, Lr0/l/a/p2;->f:Lr0/l/b/b;
-
-    invoke-virtual {v1, v0}, Lr0/l/b/b;->b(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v0}, Lr0/l/a/p2;->onError(Ljava/lang/Throwable;)V
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/p2;->g:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/p2;->d:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/p2;->e:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_0
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q$a.smali b/com.discord/smali_classes2/r0/l/a/q$a.smali
deleted file mode 100644
index 70981f947a..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q$a.smali
+++ /dev/null
@@ -1,605 +0,0 @@
-.class public final Lr0/l/a/q$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeFlattenIterable.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/q;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+",
-            "Ljava/lang/Iterable<",
-            "+TR;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:J
-
-.field public final g:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final h:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final i:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final j:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field public volatile k:Z
-
-.field public l:J
-
-.field public m:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "+TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lr0/k/b;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;",
-            "Lr0/k/b<",
-            "-TT;+",
-            "Ljava/lang/Iterable<",
-            "+TR;>;>;I)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/q$a;->d:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/q$a;->e:Lr0/k/b;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/q$a;->j:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const p1, 0x7fffffff
-
-    if-ne p3, p1, :cond_0
-
-    const-wide p1, 0x7fffffffffffffffL
-
-    iput-wide p1, p0, Lr0/l/a/q$a;->f:J
-
-    new-instance p1, Lr0/l/e/m/e;
-
-    sget p2, Lr0/l/e/h;->f:I
-
-    invoke-direct {p1, p2}, Lr0/l/e/m/e;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/q$a;->g:Ljava/util/Queue;
-
-    goto :goto_0
-
-    :cond_0
-    shr-int/lit8 p1, p3, 0x2
-
-    sub-int p1, p3, p1
-
-    int-to-long p1, p1
-
-    iput-wide p1, p0, Lr0/l/a/q$a;->f:J
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    new-instance p1, Lr0/l/e/n/n;
-
-    invoke-direct {p1, p3}, Lr0/l/e/n/n;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/q$a;->g:Ljava/util/Queue;
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Lr0/l/e/m/c;
-
-    invoke-direct {p1, p3}, Lr0/l/e/m/c;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/q$a;->g:Ljava/util/Queue;
-
-    :goto_0
-    int-to-long p1, p3
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Lrx/Subscriber<",
-            "*>;",
-            "Ljava/util/Queue<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    invoke-virtual {p3}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {p4}, Ljava/util/Queue;->clear()V
-
-    iput-object v1, p0, Lr0/l/a/q$a;->m:Ljava/util/Iterator;
-
-    return v2
-
-    :cond_0
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Lr0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lr0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {p1}, Lr0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-interface {p4}, Ljava/util/Queue;->clear()V
-
-    iput-object v1, p0, Lr0/l/a/q$a;->m:Ljava/util/Iterator;
-
-    invoke-interface {p3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return v2
-
-    :cond_1
-    if-eqz p2, :cond_2
-
-    invoke-interface {p3}, Lr0/g;->onCompleted()V
-
-    return v2
-
-    :cond_2
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public b()V
-    .locals 17
-
-    move-object/from16 v1, p0
-
-    iget-object v0, v1, Lr0/l/a/q$a;->j:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v2, v1, Lr0/l/a/q$a;->d:Lrx/Subscriber;
-
-    iget-object v3, v1, Lr0/l/a/q$a;->g:Ljava/util/Queue;
-
-    const/4 v5, 0x1
-
-    :cond_1
-    :goto_0
-    iget-object v0, v1, Lr0/l/a/q$a;->m:Ljava/util/Iterator;
-
-    const-wide/16 v6, 0x1
-
-    const-wide/16 v8, 0x0
-
-    const/4 v10, 0x0
-
-    if-nez v0, :cond_6
-
-    iget-boolean v11, v1, Lr0/l/a/q$a;->k:Z
-
-    invoke-interface {v3}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v12
-
-    if-nez v12, :cond_2
-
-    const/4 v13, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v13, 0x0
-
-    :goto_1
-    invoke-virtual {v1, v11, v13, v2, v3}, Lr0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-
-    move-result v11
-
-    if-eqz v11, :cond_3
-
-    return-void
-
-    :cond_3
-    if-nez v13, :cond_6
-
-    iget-wide v13, v1, Lr0/l/a/q$a;->l:J
-
-    add-long/2addr v13, v6
-
-    move v15, v5
-
-    iget-wide v4, v1, Lr0/l/a/q$a;->f:J
-
-    cmp-long v0, v13, v4
-
-    if-nez v0, :cond_4
-
-    iput-wide v8, v1, Lr0/l/a/q$a;->l:J
-
-    invoke-virtual {v1, v13, v14}, Lrx/Subscriber;->request(J)V
-
-    goto :goto_2
-
-    :cond_4
-    iput-wide v13, v1, Lr0/l/a/q$a;->l:J
-
-    :goto_2
-    :try_start_0
-    iget-object v0, v1, Lr0/l/a/q$a;->e:Lr0/k/b;
-
-    invoke-static {v12}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-interface {v0, v4}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Iterable;
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v4, :cond_5
-
-    goto/16 :goto_5
-
-    :cond_5
-    iput-object v0, v1, Lr0/l/a/q$a;->m:Ljava/util/Iterator;
-
-    goto :goto_3
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {v1, v0}, Lr0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
-
-    goto/16 :goto_5
-
-    :cond_6
-    move v15, v5
-
-    :goto_3
-    if-eqz v0, :cond_e
-
-    iget-object v4, v1, Lr0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v4
-
-    move-wide v12, v8
-
-    :cond_7
-    const/4 v14, 0x0
-
-    cmp-long v16, v12, v4
-
-    if-eqz v16, :cond_a
-
-    iget-boolean v11, v1, Lr0/l/a/q$a;->k:Z
-
-    invoke-virtual {v1, v11, v10, v2, v3}, Lr0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-
-    move-result v11
-
-    if-eqz v11, :cond_8
-
-    return-void
-
-    :cond_8
-    :try_start_1
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v11
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
-
-    invoke-interface {v2, v11}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    iget-boolean v11, v1, Lr0/l/a/q$a;->k:Z
-
-    invoke-virtual {v1, v11, v10, v2, v3}, Lr0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-
-    move-result v11
-
-    if-eqz v11, :cond_9
-
-    return-void
-
-    :cond_9
-    add-long/2addr v12, v6
-
-    :try_start_2
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v11
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    if-nez v11, :cond_7
-
-    iput-object v14, v1, Lr0/l/a/q$a;->m:Ljava/util/Iterator;
-
-    goto :goto_4
-
-    :catchall_1
-    move-exception v0
-
-    move-object v6, v0
-
-    invoke-static {v6}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iput-object v14, v1, Lr0/l/a/q$a;->m:Ljava/util/Iterator;
-
-    invoke-virtual {v1, v6}, Lr0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_4
-
-    :catchall_2
-    move-exception v0
-
-    move-object v6, v0
-
-    invoke-static {v6}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iput-object v14, v1, Lr0/l/a/q$a;->m:Ljava/util/Iterator;
-
-    invoke-virtual {v1, v6}, Lr0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
-
-    :goto_4
-    move-object v0, v14
-
-    :cond_a
-    cmp-long v6, v12, v4
-
-    if-nez v6, :cond_c
-
-    iget-boolean v4, v1, Lr0/l/a/q$a;->k:Z
-
-    invoke-interface {v3}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_b
-
-    if-nez v0, :cond_b
-
-    const/4 v10, 0x1
-
-    :cond_b
-    invoke-virtual {v1, v4, v10, v2, v3}, Lr0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_c
-
-    return-void
-
-    :cond_c
-    cmp-long v4, v12, v8
-
-    if-eqz v4, :cond_d
-
-    iget-object v4, v1, Lr0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v4, v12, v13}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    :cond_d
-    if-nez v0, :cond_e
-
-    :goto_5
-    move v5, v15
-
-    goto/16 :goto_0
-
-    :cond_e
-    iget-object v0, v1, Lr0/l/a/q$a;->j:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    neg-int v4, v15
-
-    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
-
-    move-result v5
-
-    if-nez v5, :cond_1
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/q$a;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/q$a;->b()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {v0, p1}, Lr0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/q$a;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/q$a;->b()V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/q$a;->g:Ljava/util/Queue;
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    new-instance p1, Lrx/exceptions/MissingBackpressureException;
-
-    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
-
-    invoke-virtual {p0, p1}, Lr0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_1
-    invoke-virtual {p0}, Lr0/l/a/q$a;->b()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q$b.smali b/com.discord/smali_classes2/r0/l/a/q$b.smali
deleted file mode 100644
index 5671aed904..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q$b.smali
+++ /dev/null
@@ -1,128 +0,0 @@
-.class public final Lr0/l/a/q$b;
-.super Ljava/lang/Object;
-.source "OnSubscribeFlattenIterable.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/q;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+",
-            "Ljava/lang/Iterable<",
-            "+TR;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;",
-            "Lr0/k/b<",
-            "-TT;+",
-            "Ljava/lang/Iterable<",
-            "+TR;>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/q$b;->d:Ljava/lang/Object;
-
-    iput-object p2, p0, Lr0/l/a/q$b;->e:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/q$b;->e:Lr0/k/b;
-
-    iget-object v1, p0, Lr0/l/a/q$b;->d:Ljava/lang/Object;
-
-    invoke-interface {v0, v1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Iterable;
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v1, :cond_0
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lr0/l/a/t$a;
-
-    invoke-direct {v1, p1, v0}, Lr0/l/a/t$a;-><init>(Lrx/Subscriber;Ljava/util/Iterator;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/q$b;->d:Ljava/lang/Object;
-
-    invoke-static {v0, p1, v1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q.smali b/com.discord/smali_classes2/r0/l/a/q.smali
deleted file mode 100644
index aa41665341..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lr0/l/a/q;
-.super Ljava/lang/Object;
-.source "OnSubscribeFlattenIterable.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/q$b;,
-        Lr0/l/a/q$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+",
-            "Ljava/lang/Iterable<",
-            "+TR;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:I
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;Lr0/k/b;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "+TT;>;",
-            "Lr0/k/b<",
-            "-TT;+",
-            "Ljava/lang/Iterable<",
-            "+TR;>;>;I)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/q;->d:Lrx/Observable;
-
-    iput-object p2, p0, Lr0/l/a/q;->e:Lr0/k/b;
-
-    iput p3, p0, Lr0/l/a/q;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/q$a;
-
-    iget-object v1, p0, Lr0/l/a/q;->e:Lr0/k/b;
-
-    iget v2, p0, Lr0/l/a/q;->f:I
-
-    invoke-direct {v0, p1, v1, v2}, Lr0/l/a/q$a;-><init>(Lrx/Subscriber;Lr0/k/b;I)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v1, Lr0/l/a/p;
-
-    invoke-direct {v1, p0, v0}, Lr0/l/a/p;-><init>(Lr0/l/a/q;Lr0/l/a/q$a;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    iget-object p1, p0, Lr0/l/a/q;->d:Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q0$a.smali b/com.discord/smali_classes2/r0/l/a/q0$a.smali
deleted file mode 100644
index 39a8ca5620..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q0$a.smali
+++ /dev/null
@@ -1,280 +0,0 @@
-.class public final Lr0/l/a/q0$a;
-.super Lrx/Subscriber;
-.source "OperatorBufferWithTime.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/q0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-",
-            "Ljava/util/List<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/Scheduler$Worker;
-
-.field public f:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public g:Z
-
-.field public final synthetic h:Lr0/l/a/q0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-",
-            "Ljava/util/List<",
-            "TT;>;>;",
-            "Lrx/Scheduler$Worker;",
-            ")V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lr0/l/a/q0$a;->h:Lr0/l/a/q0;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p2, p0, Lr0/l/a/q0$a;->d:Lrx/Subscriber;
-
-    iput-object p3, p0, Lr0/l/a/q0$a;->e:Lrx/Scheduler$Worker;
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/q0$a;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    monitor-enter p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    iget-boolean v0, p0, Lr0/l/a/q0$a;->g:Z
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/q0$a;->g:Z
-
-    iget-object v0, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    :try_start_2
-    iget-object v1, p0, Lr0/l/a/q0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    iget-object v0, p0, Lr0/l/a/q0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_3
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    :try_start_4
-    throw v0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/q0$a;->d:Lrx/Subscriber;
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/q0$a;->g:Z
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/q0$a;->g:Z
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/q0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/q0$a;->g:Z
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    iget-object p1, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    invoke-interface {p1}, Ljava/util/List;->size()I
-
-    move-result p1
-
-    iget-object v0, p0, Lr0/l/a/q0$a;->h:Lr0/l/a/q0;
-
-    iget v0, v0, Lr0/l/a/q0;->g:I
-
-    if-ne p1, v0, :cond_1
-
-    iget-object p1, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/q0$a;->f:Ljava/util/List;
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_0
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p0, Lr0/l/a/q0$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :cond_2
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q0$b$a.smali b/com.discord/smali_classes2/r0/l/a/q0$b$a.smali
deleted file mode 100644
index e776761c9c..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q0$b$a.smali
+++ /dev/null
@@ -1,126 +0,0 @@
-.class public Lr0/l/a/q0$b$a;
-.super Ljava/lang/Object;
-.source "OperatorBufferWithTime.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/q0$b;->a()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/List;
-
-.field public final synthetic e:Lr0/l/a/q0$b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/q0$b;Ljava/util/List;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/q0$b$a;->e:Lr0/l/a/q0$b;
-
-    iput-object p2, p0, Lr0/l/a/q0$b$a;->d:Ljava/util/List;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 4
-
-    iget-object v0, p0, Lr0/l/a/q0$b$a;->e:Lr0/l/a/q0$b;
-
-    iget-object v1, p0, Lr0/l/a/q0$b$a;->d:Ljava/util/List;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v2, v0, Lr0/l/a/q0$b;->g:Z
-
-    if-eqz v2, :cond_0
-
-    monitor-exit v0
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v2, v0, Lr0/l/a/q0$b;->f:Ljava/util/List;
-
-    invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :cond_1
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/List;
-
-    if-ne v3, v1, :cond_1
-
-    invoke-interface {v2}, Ljava/util/Iterator;->remove()V
-
-    const/4 v2, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 v2, 0x0
-
-    :goto_0
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v2, :cond_3
-
-    :try_start_1
-    iget-object v2, v0, Lr0/l/a/q0$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v2, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v1
-
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {v0, v1}, Lr0/l/a/q0$b;->onError(Ljava/lang/Throwable;)V
-
-    :cond_3
-    :goto_1
-    return-void
-
-    :catchall_1
-    move-exception v1
-
-    :try_start_2
-    monitor-exit v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q0.smali b/com.discord/smali_classes2/r0/l/a/q0.smali
deleted file mode 100644
index 96e6a79f50..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q0.smali
+++ /dev/null
@@ -1,141 +0,0 @@
-.class public final Lr0/l/a/q0;
-.super Ljava/lang/Object;
-.source "OperatorBufferWithTime.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/q0$a;,
-        Lr0/l/a/q0$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "Ljava/util/List<",
-        "TT;>;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:J
-
-.field public final f:Ljava/util/concurrent/TimeUnit;
-
-.field public final g:I
-
-.field public final h:Lrx/Scheduler;
-
-
-# direct methods
-.method public constructor <init>(JJLjava/util/concurrent/TimeUnit;ILrx/Scheduler;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lr0/l/a/q0;->d:J
-
-    iput-wide p3, p0, Lr0/l/a/q0;->e:J
-
-    iput-object p5, p0, Lr0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
-
-    iput p6, p0, Lr0/l/a/q0;->g:I
-
-    iput-object p7, p0, Lr0/l/a/q0;->h:Lrx/Scheduler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 10
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/q0;->h:Lrx/Scheduler;
-
-    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v0
-
-    new-instance v1, Lrx/observers/SerializedSubscriber;
-
-    invoke-direct {v1, p1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
-
-    iget-wide v2, p0, Lr0/l/a/q0;->d:J
-
-    iget-wide v4, p0, Lr0/l/a/q0;->e:J
-
-    cmp-long v6, v2, v4
-
-    if-nez v6, :cond_0
-
-    new-instance v2, Lr0/l/a/q0$a;
-
-    invoke-direct {v2, p0, v1, v0}, Lr0/l/a/q0$a;-><init>(Lr0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
-
-    invoke-virtual {v2, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v3, v2, Lr0/l/a/q0$a;->e:Lrx/Scheduler$Worker;
-
-    new-instance v4, Lr0/l/a/p0;
-
-    invoke-direct {v4, v2}, Lr0/l/a/p0;-><init>(Lr0/l/a/q0$a;)V
-
-    iget-object p1, v2, Lr0/l/a/q0$a;->h:Lr0/l/a/q0;
-
-    iget-wide v7, p1, Lr0/l/a/q0;->d:J
-
-    iget-object v9, p1, Lr0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
-
-    move-wide v5, v7
-
-    invoke-virtual/range {v3 .. v9}, Lrx/Scheduler$Worker;->c(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v2, Lr0/l/a/q0$b;
-
-    invoke-direct {v2, p0, v1, v0}, Lr0/l/a/q0$b;-><init>(Lr0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
-
-    invoke-virtual {v2, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {v2}, Lr0/l/a/q0$b;->a()V
-
-    iget-object v3, v2, Lr0/l/a/q0$b;->e:Lrx/Scheduler$Worker;
-
-    new-instance v4, Lr0/l/a/r0;
-
-    invoke-direct {v4, v2}, Lr0/l/a/r0;-><init>(Lr0/l/a/q0$b;)V
-
-    iget-object p1, v2, Lr0/l/a/q0$b;->h:Lr0/l/a/q0;
-
-    iget-wide v7, p1, Lr0/l/a/q0;->e:J
-
-    iget-object v9, p1, Lr0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
-
-    move-wide v5, v7
-
-    invoke-virtual/range {v3 .. v9}, Lrx/Scheduler$Worker;->c(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    :goto_0
-    return-object v2
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q1$a.smali b/com.discord/smali_classes2/r0/l/a/q1$a.smali
deleted file mode 100644
index 9246afac35..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q1$a.smali
+++ /dev/null
@@ -1,189 +0,0 @@
-.class public final Lr0/l/a/q1$a;
-.super Lrx/Subscriber;
-.source "OperatorSampleWithTime.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/q1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;",
-        "Lrx/functions/Action0;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:Ljava/lang/Object;
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    sput-object v0, Lr0/l/a/q1$a;->f:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/a/q1$a;->f:Ljava/lang/Object;
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Lr0/l/a/q1$a;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    iput-object p1, p0, Lr0/l/a/q1$a;->d:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final a()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/q1$a;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/a/q1$a;->f:Ljava/lang/Object;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    sget-object v1, Lr0/l/a/q1$a;->f:Ljava/lang/Object;
-
-    if-eq v0, v1, :cond_0
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/q1$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v0}, Lr0/l/a/q1$a;->onError(Ljava/lang/Throwable;)V
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public call()V
-    .locals 0
-
-    invoke-virtual {p0}, Lr0/l/a/q1$a;->a()V
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    invoke-virtual {p0}, Lr0/l/a/q1$a;->a()V
-
-    iget-object v0, p0, Lr0/l/a/q1$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/q1$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/q1$a;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q2$a.smali b/com.discord/smali_classes2/r0/l/a/q2$a.smali
deleted file mode 100644
index a7e38fa7ff..0000000000
--- a/com.discord/smali_classes2/r0/l/a/q2$a.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final Lr0/l/a/q2$a;
-.super Ljava/lang/Object;
-.source "OperatorToObservableList.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/q2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/q2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/q2<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/q2;
-
-    invoke-direct {v0}, Lr0/l/a/q2;-><init>()V
-
-    sput-object v0, Lr0/l/a/q2$a;->a:Lr0/l/a/q2;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r$a.smali b/com.discord/smali_classes2/r0/l/a/r$a.smali
deleted file mode 100644
index 024a3a6201..0000000000
--- a/com.discord/smali_classes2/r0/l/a/r$a.smali
+++ /dev/null
@@ -1,245 +0,0 @@
-.class public final Lr0/l/a/r$a;
-.super Ljava/util/concurrent/atomic/AtomicLong;
-.source "OnSubscribeFromArray.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/r;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicLong;",
-        "Lrx/Producer;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x310c1171070674b3L
-
-
-# instance fields
-.field public final array:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TT;"
-        }
-    .end annotation
-.end field
-
-.field public final child:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public index:I
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;[Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;[TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/r$a;->child:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/r$a;->array:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 10
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_a
-
-    const-wide v3, 0x7fffffffffffffffL
-
-    cmp-long v5, p1, v3
-
-    if-nez v5, :cond_3
-
-    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    move-result-wide p1
-
-    cmp-long v2, p1, v0
-
-    if-nez v2, :cond_9
-
-    iget-object p1, p0, Lr0/l/a/r$a;->child:Lrx/Subscriber;
-
-    iget-object p2, p0, Lr0/l/a/r$a;->array:[Ljava/lang/Object;
-
-    array-length v0, p2
-
-    const/4 v1, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_1
-
-    aget-object v2, p2, v1
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    invoke-interface {p1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_2
-
-    goto :goto_2
-
-    :cond_2
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    goto :goto_2
-
-    :cond_3
-    if-eqz v2, :cond_9
-
-    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    move-result-wide v2
-
-    cmp-long v4, v2, v0
-
-    if-nez v4, :cond_9
-
-    iget-object v2, p0, Lr0/l/a/r$a;->child:Lrx/Subscriber;
-
-    iget-object v3, p0, Lr0/l/a/r$a;->array:[Ljava/lang/Object;
-
-    array-length v4, v3
-
-    iget v5, p0, Lr0/l/a/r$a;->index:I
-
-    :cond_4
-    move-wide v6, v0
-
-    :cond_5
-    :goto_1
-    cmp-long v8, p1, v0
-
-    if-eqz v8, :cond_8
-
-    if-eq v5, v4, :cond_8
-
-    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_6
-
-    goto :goto_2
-
-    :cond_6
-    aget-object v8, v3, v5
-
-    invoke-interface {v2, v8}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    add-int/lit8 v5, v5, 0x1
-
-    if-ne v5, v4, :cond_7
-
-    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-nez p1, :cond_9
-
-    invoke-interface {v2}, Lr0/g;->onCompleted()V
-
-    goto :goto_2
-
-    :cond_7
-    const-wide/16 v8, 0x1
-
-    sub-long/2addr p1, v8
-
-    sub-long/2addr v6, v8
-
-    goto :goto_1
-
-    :cond_8
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide p1
-
-    add-long/2addr p1, v6
-
-    cmp-long v8, p1, v0
-
-    if-nez v8, :cond_5
-
-    iput v5, p0, Lr0/l/a/r$a;->index:I
-
-    invoke-virtual {p0, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->addAndGet(J)J
-
-    move-result-wide p1
-
-    cmp-long v6, p1, v0
-
-    if-nez v6, :cond_4
-
-    :cond_9
-    :goto_2
-    return-void
-
-    :cond_a
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "n >= 0 required but it was "
-
-    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r.smali b/com.discord/smali_classes2/r0/l/a/r.smali
deleted file mode 100644
index b852695fb1..0000000000
--- a/com.discord/smali_classes2/r0/l/a/r.smali
+++ /dev/null
@@ -1,70 +0,0 @@
-.class public final Lr0/l/a/r;
-.super Ljava/lang/Object;
-.source "OnSubscribeFromArray.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/r$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>([Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/r;->d:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/r$a;
-
-    iget-object v1, p0, Lr0/l/a/r;->d:[Ljava/lang/Object;
-
-    invoke-direct {v0, p1, v1}, Lr0/l/a/r$a;-><init>(Lrx/Subscriber;[Ljava/lang/Object;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r0.smali b/com.discord/smali_classes2/r0/l/a/r0.smali
deleted file mode 100644
index 44cacd79ea..0000000000
--- a/com.discord/smali_classes2/r0/l/a/r0.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public Lr0/l/a/r0;
-.super Ljava/lang/Object;
-.source "OperatorBufferWithTime.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/q0$b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/q0$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/r0;->d:Lr0/l/a/q0$b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/r0;->d:Lr0/l/a/q0$b;
-
-    invoke-virtual {v0}, Lr0/l/a/q0$b;->a()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r1$b.smali b/com.discord/smali_classes2/r0/l/a/r1$b.smali
deleted file mode 100644
index 6d4b51bd1b..0000000000
--- a/com.discord/smali_classes2/r0/l/a/r1$b.smali
+++ /dev/null
@@ -1,459 +0,0 @@
-.class public final Lr0/l/a/r1$b;
-.super Ljava/lang/Object;
-.source "OperatorScan.java"
-
-# interfaces
-.implements Lrx/Producer;
-.implements Lr0/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/r1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Producer;",
-        "Lr0/g<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public f:Z
-
-.field public g:Z
-
-.field public h:J
-
-.field public final i:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public volatile j:Lrx/Producer;
-
-.field public volatile k:Z
-
-.field public l:Ljava/lang/Throwable;
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TR;",
-            "Lrx/Subscriber<",
-            "-TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p2, p0, Lr0/l/a/r1$b;->d:Lrx/Subscriber;
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_0
-
-    new-instance p2, Lr0/l/e/n/s;
-
-    invoke-direct {p2}, Lr0/l/e/n/s;-><init>()V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p2, Lr0/l/e/m/f;
-
-    invoke-direct {p2}, Lr0/l/e/m/f;-><init>()V
-
-    :goto_0
-    iput-object p2, p0, Lr0/l/a/r1$b;->e:Ljava/util/Queue;
-
-    if-nez p1, :cond_1
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_1
-    invoke-interface {p2, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(ZZLrx/Subscriber;)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(ZZ",
-            "Lrx/Subscriber<",
-            "-TR;>;)Z"
-        }
-    .end annotation
-
-    invoke-virtual {p3}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    return v1
-
-    :cond_0
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Lr0/l/a/r1$b;->l:Ljava/lang/Throwable;
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return v1
-
-    :cond_1
-    if-eqz p2, :cond_2
-
-    invoke-interface {p3}, Lr0/g;->onCompleted()V
-
-    return v1
-
-    :cond_2
-    const/4 p1, 0x0
-
-    return p1
-.end method
-
-.method public b()V
-    .locals 14
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/r1$b;->f:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, p0, Lr0/l/a/r1$b;->g:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    iput-boolean v1, p0, Lr0/l/a/r1$b;->f:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    iget-object v0, p0, Lr0/l/a/r1$b;->d:Lrx/Subscriber;
-
-    iget-object v2, p0, Lr0/l/a/r1$b;->e:Ljava/util/Queue;
-
-    iget-object v3, p0, Lr0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v4
-
-    :goto_0
-    iget-boolean v6, p0, Lr0/l/a/r1$b;->k:Z
-
-    invoke-interface {v2}, Ljava/util/Queue;->isEmpty()Z
-
-    move-result v7
-
-    invoke-virtual {p0, v6, v7, v0}, Lr0/l/a/r1$b;->a(ZZLrx/Subscriber;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_1
-
-    goto :goto_4
-
-    :cond_1
-    const-wide/16 v6, 0x0
-
-    move-wide v8, v6
-
-    :goto_1
-    const/4 v10, 0x0
-
-    cmp-long v11, v8, v4
-
-    if-eqz v11, :cond_5
-
-    iget-boolean v11, p0, Lr0/l/a/r1$b;->k:Z
-
-    invoke-interface {v2}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v12
-
-    if-nez v12, :cond_2
-
-    const/4 v13, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v13, 0x0
-
-    :goto_2
-    invoke-virtual {p0, v11, v13, v0}, Lr0/l/a/r1$b;->a(ZZLrx/Subscriber;)Z
-
-    move-result v11
-
-    if-eqz v11, :cond_3
-
-    goto :goto_4
-
-    :cond_3
-    if-eqz v13, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    invoke-static {v12}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v10
-
-    :try_start_1
-    invoke-interface {v0, v10}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    const-wide/16 v10, 0x1
-
-    add-long/2addr v8, v10
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v1
-
-    invoke-static {v1, v0, v10}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    goto :goto_4
-
-    :cond_5
-    :goto_3
-    cmp-long v11, v8, v6
-
-    if-eqz v11, :cond_6
-
-    const-wide v6, 0x7fffffffffffffffL
-
-    cmp-long v11, v4, v6
-
-    if-eqz v11, :cond_6
-
-    invoke-static {v3, v8, v9}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    move-result-wide v4
-
-    :cond_6
-    monitor-enter p0
-
-    :try_start_2
-    iget-boolean v6, p0, Lr0/l/a/r1$b;->g:Z
-
-    if-nez v6, :cond_7
-
-    iput-boolean v10, p0, Lr0/l/a/r1$b;->f:Z
-
-    monitor-exit p0
-
-    :goto_4
-    return-void
-
-    :cond_7
-    iput-boolean v10, p0, Lr0/l/a/r1$b;->g:Z
-
-    monitor-exit p0
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v0
-
-    :catchall_2
-    move-exception v0
-
-    :try_start_3
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    throw v0
-.end method
-
-.method public m(J)V
-    .locals 4
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_4
-
-    if-eqz v2, :cond_3
-
-    iget-object v0, p0, Lr0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    iget-object v0, p0, Lr0/l/a/r1$b;->j:Lrx/Producer;
-
-    if-nez v0, :cond_1
-
-    iget-object v1, p0, Lr0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/r1$b;->j:Lrx/Producer;
-
-    if-nez v0, :cond_0
-
-    iget-wide v2, p0, Lr0/l/a/r1$b;->h:J
-
-    invoke-static {v2, v3, p1, p2}, Lf/n/a/k/a;->c(JJ)J
-
-    move-result-wide v2
-
-    iput-wide v2, p0, Lr0/l/a/r1$b;->h:J
-
-    :cond_0
-    monitor-exit v1
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    if-eqz v0, :cond_2
-
-    invoke-interface {v0, p1, p2}, Lrx/Producer;->m(J)V
-
-    :cond_2
-    invoke-virtual {p0}, Lr0/l/a/r1$b;->b()V
-
-    :cond_3
-    return-void
-
-    :cond_4
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "n >= required but it was "
-
-    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/r1$b;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/r1$b;->b()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/r1$b;->l:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/r1$b;->k:Z
-
-    invoke-virtual {p0}, Lr0/l/a/r1$b;->b()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TR;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/r1$b;->e:Ljava/util/Queue;
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    invoke-virtual {p0}, Lr0/l/a/r1$b;->b()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r1.smali b/com.discord/smali_classes2/r0/l/a/r1.smali
deleted file mode 100644
index 1472236f91..0000000000
--- a/com.discord/smali_classes2/r0/l/a/r1.smali
+++ /dev/null
@@ -1,130 +0,0 @@
-.class public final Lr0/l/a/r1;
-.super Ljava/lang/Object;
-.source "OperatorScan.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/r1$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        "T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TR;TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:Ljava/lang/Object;
-
-
-# instance fields
-.field public final d:Lrx/functions/Func0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Func0<",
-            "TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/functions/Func2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Func2<",
-            "TR;-TT;TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    sput-object v0, Lr0/l/a/r1;->f:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;Lrx/functions/Func2;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TR;",
-            "Lrx/functions/Func2<",
-            "TR;-TT;TR;>;)V"
-        }
-    .end annotation
-
-    new-instance v0, Lr0/l/a/r1$a;
-
-    invoke-direct {v0, p1}, Lr0/l/a/r1$a;-><init>(Ljava/lang/Object;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/r1;->d:Lrx/functions/Func0;
-
-    iput-object p2, p0, Lr0/l/a/r1;->e:Lrx/functions/Func2;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/r1;->d:Lrx/functions/Func0;
-
-    invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
-
-    move-result-object v0
-
-    sget-object v1, Lr0/l/a/r1;->f:Ljava/lang/Object;
-
-    if-ne v0, v1, :cond_0
-
-    new-instance v0, Lr0/l/a/s1;
-
-    invoke-direct {v0, p0, p1, p1}, Lr0/l/a/s1;-><init>(Lr0/l/a/r1;Lrx/Subscriber;Lrx/Subscriber;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lr0/l/a/r1$b;
-
-    invoke-direct {v1, v0, p1}, Lr0/l/a/r1$b;-><init>(Ljava/lang/Object;Lrx/Subscriber;)V
-
-    new-instance v2, Lr0/l/a/t1;
-
-    invoke-direct {v2, p0, v0, v1}, Lr0/l/a/t1;-><init>(Lr0/l/a/r1;Ljava/lang/Object;Lr0/l/a/r1$b;)V
-
-    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    move-object v0, v2
-
-    :goto_0
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r2.smali b/com.discord/smali_classes2/r0/l/a/r2.smali
deleted file mode 100644
index 7039ff50fd..0000000000
--- a/com.discord/smali_classes2/r0/l/a/r2.smali
+++ /dev/null
@@ -1,118 +0,0 @@
-.class public final Lr0/l/a/r2;
-.super Ljava/lang/Object;
-.source "OperatorToObservableSortedList.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/r2$b;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "Ljava/util/List<",
-        "TT;>;TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:Ljava/util/Comparator;
-
-
-# instance fields
-.field public final d:Ljava/util/Comparator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Comparator<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/r2$b;
-
-    invoke-direct {v0}, Lr0/l/a/r2$b;-><init>()V
-
-    sput-object v0, Lr0/l/a/r2;->f:Ljava/util/Comparator;
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lr0/l/a/r2;->f:Ljava/util/Comparator;
-
-    iput-object v0, p0, Lr0/l/a/r2;->d:Ljava/util/Comparator;
-
-    iput p1, p0, Lr0/l/a/r2;->e:I
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/functions/Func2;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Func2<",
-            "-TT;-TT;",
-            "Ljava/lang/Integer;",
-            ">;I)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p2, p0, Lr0/l/a/r2;->e:I
-
-    new-instance p2, Lr0/l/a/r2$a;
-
-    invoke-direct {p2, p0, p1}, Lr0/l/a/r2$a;-><init>(Lr0/l/a/r2;Lrx/functions/Func2;)V
-
-    iput-object p2, p0, Lr0/l/a/r2;->d:Ljava/util/Comparator;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/b/b;
-
-    invoke-direct {v0, p1}, Lr0/l/b/b;-><init>(Lrx/Subscriber;)V
-
-    new-instance v1, Lr0/l/a/s2;
-
-    invoke-direct {v1, p0, v0, p1}, Lr0/l/a/s2;-><init>(Lr0/l/a/r2;Lr0/l/b/b;Lrx/Subscriber;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/s.smali b/com.discord/smali_classes2/r0/l/a/s.smali
deleted file mode 100644
index 266679c525..0000000000
--- a/com.discord/smali_classes2/r0/l/a/s.smali
+++ /dev/null
@@ -1,86 +0,0 @@
-.class public final Lr0/l/a/s;
-.super Ljava/lang/Object;
-.source "OnSubscribeFromCallable.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/Callable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/Callable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/Callable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/Callable<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/s;->d:Ljava/util/concurrent/Callable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/b/b;
-
-    invoke-direct {v0, p1}, Lr0/l/b/b;-><init>(Lrx/Subscriber;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/s;->d:Ljava/util/concurrent/Callable;
-
-    invoke-interface {v1}, Ljava/util/concurrent/Callable;->call()Ljava/lang/Object;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lr0/l/b/b;->b(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/s0$a.smali b/com.discord/smali_classes2/r0/l/a/s0$a.smali
deleted file mode 100644
index 1837d5c82b..0000000000
--- a/com.discord/smali_classes2/r0/l/a/s0$a.smali
+++ /dev/null
@@ -1,150 +0,0 @@
-.class public Lr0/l/a/s0$a;
-.super Ljava/lang/Object;
-.source "OperatorDebounceWithTime.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/s0;->onNext(Ljava/lang/Object;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:I
-
-.field public final synthetic e:Lr0/l/a/s0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/s0;I)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/s0$a;->e:Lr0/l/a/s0;
-
-    iput p2, p0, Lr0/l/a/s0$a;->d:I
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/s0$a;->e:Lr0/l/a/s0;
-
-    iget-object v1, v0, Lr0/l/a/s0;->d:Lr0/l/a/t0$a;
-
-    iget v2, p0, Lr0/l/a/s0$a;->d:I
-
-    iget-object v3, v0, Lr0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
-
-    iget-object v0, v0, Lr0/l/a/s0;->e:Lrx/Subscriber;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget-boolean v4, v1, Lr0/l/a/t0$a;->e:Z
-
-    if-nez v4, :cond_2
-
-    iget-boolean v4, v1, Lr0/l/a/t0$a;->c:Z
-
-    if-eqz v4, :cond_2
-
-    iget v4, v1, Lr0/l/a/t0$a;->a:I
-
-    if-eq v2, v4, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v2, v1, Lr0/l/a/t0$a;->b:Ljava/lang/Object;
-
-    const/4 v4, 0x0
-
-    iput-object v4, v1, Lr0/l/a/t0$a;->b:Ljava/lang/Object;
-
-    const/4 v4, 0x0
-
-    iput-boolean v4, v1, Lr0/l/a/t0$a;->c:Z
-
-    const/4 v5, 0x1
-
-    iput-boolean v5, v1, Lr0/l/a/t0$a;->e:Z
-
-    monitor-exit v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :try_start_1
-    invoke-interface {v3, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    monitor-enter v1
-
-    :try_start_2
-    iget-boolean v0, v1, Lr0/l/a/t0$a;->d:Z
-
-    if-nez v0, :cond_1
-
-    iput-boolean v4, v1, Lr0/l/a/t0$a;->e:Z
-
-    monitor-exit v1
-
-    goto :goto_1
-
-    :cond_1
-    monitor-exit v1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    invoke-interface {v3}, Lr0/g;->onCompleted()V
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_3
-    monitor-exit v1
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    throw v0
-
-    :catchall_1
-    move-exception v1
-
-    invoke-static {v1, v0, v2}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_2
-    :goto_0
-    :try_start_4
-    monitor-exit v1
-
-    :goto_1
-    return-void
-
-    :catchall_2
-    move-exception v0
-
-    monitor-exit v1
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/s0.smali b/com.discord/smali_classes2/r0/l/a/s0.smali
deleted file mode 100644
index b055bdb60a..0000000000
--- a/com.discord/smali_classes2/r0/l/a/s0.smali
+++ /dev/null
@@ -1,256 +0,0 @@
-.class public Lr0/l/a/s0;
-.super Lrx/Subscriber;
-.source "OperatorDebounceWithTime.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/l/a/t0$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/t0$a<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic f:Lrx/subscriptions/SerialSubscription;
-
-.field public final synthetic g:Lrx/Scheduler$Worker;
-
-.field public final synthetic h:Lrx/observers/SerializedSubscriber;
-
-.field public final synthetic i:Lr0/l/a/t0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/t0;Lrx/Subscriber;Lrx/subscriptions/SerialSubscription;Lrx/Scheduler$Worker;Lrx/observers/SerializedSubscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/s0;->i:Lr0/l/a/t0;
-
-    iput-object p3, p0, Lr0/l/a/s0;->f:Lrx/subscriptions/SerialSubscription;
-
-    iput-object p4, p0, Lr0/l/a/s0;->g:Lrx/Scheduler$Worker;
-
-    iput-object p5, p0, Lr0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    new-instance p1, Lr0/l/a/t0$a;
-
-    invoke-direct {p1}, Lr0/l/a/t0$a;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/s0;->d:Lr0/l/a/t0$a;
-
-    iput-object p0, p0, Lr0/l/a/s0;->e:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/a/s0;->d:Lr0/l/a/t0$a;
-
-    iget-object v1, p0, Lr0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-boolean v2, v0, Lr0/l/a/t0$a;->e:Z
-
-    const/4 v3, 0x1
-
-    if-eqz v2, :cond_0
-
-    iput-boolean v3, v0, Lr0/l/a/t0$a;->d:Z
-
-    monitor-exit v0
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v2, v0, Lr0/l/a/t0$a;->b:Ljava/lang/Object;
-
-    iget-boolean v4, v0, Lr0/l/a/t0$a;->c:Z
-
-    const/4 v5, 0x0
-
-    iput-object v5, v0, Lr0/l/a/t0$a;->b:Ljava/lang/Object;
-
-    const/4 v5, 0x0
-
-    iput-boolean v5, v0, Lr0/l/a/t0$a;->c:Z
-
-    iput-boolean v3, v0, Lr0/l/a/t0$a;->e:Z
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    if-eqz v4, :cond_1
-
-    :try_start_1
-    invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0, p0, v2}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    invoke-interface {v1}, Lr0/g;->onCompleted()V
-
-    :goto_1
-    return-void
-
-    :catchall_1
-    move-exception v1
-
-    :try_start_2
-    monitor-exit v0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw v1
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
-
-    iget-object v0, v0, Lrx/observers/SerializedSubscriber;->d:Lr0/g;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    iget-object p1, p0, Lr0/l/a/s0;->d:Lr0/l/a/t0$a;
-
-    monitor-enter p1
-
-    :try_start_0
-    iget v0, p1, Lr0/l/a/t0$a;->a:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p1, Lr0/l/a/t0$a;->a:I
-
-    const/4 v0, 0x0
-
-    iput-object v0, p1, Lr0/l/a/t0$a;->b:Ljava/lang/Object;
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p1, Lr0/l/a/t0$a;->c:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p1
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p1
-
-    throw v0
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/s0;->d:Lr0/l/a/t0$a;
-
-    monitor-enter v0
-
-    :try_start_0
-    iput-object p1, v0, Lr0/l/a/t0$a;->b:Ljava/lang/Object;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, v0, Lr0/l/a/t0$a;->c:Z
-
-    iget v1, v0, Lr0/l/a/t0$a;->a:I
-
-    add-int/2addr v1, p1
-
-    iput v1, v0, Lr0/l/a/t0$a;->a:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    iget-object p1, p0, Lr0/l/a/s0;->f:Lrx/subscriptions/SerialSubscription;
-
-    iget-object v0, p0, Lr0/l/a/s0;->g:Lrx/Scheduler$Worker;
-
-    new-instance v2, Lr0/l/a/s0$a;
-
-    invoke-direct {v2, p0, v1}, Lr0/l/a/s0$a;-><init>(Lr0/l/a/s0;I)V
-
-    iget-object v1, p0, Lr0/l/a/s0;->i:Lr0/l/a/t0;
-
-    iget-wide v3, v1, Lr0/l/a/t0;->d:J
-
-    iget-object v1, v1, Lr0/l/a/t0;->e:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v2, v3, v4, v1}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v0
-
-    throw p1
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/s1.smali b/com.discord/smali_classes2/r0/l/a/s1.smali
deleted file mode 100644
index ccf3df00be..0000000000
--- a/com.discord/smali_classes2/r0/l/a/s1.smali
+++ /dev/null
@@ -1,115 +0,0 @@
-.class public Lr0/l/a/s1;
-.super Lrx/Subscriber;
-.source "OperatorScan.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public e:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TR;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic f:Lrx/Subscriber;
-
-.field public final synthetic g:Lr0/l/a/r1;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/r1;Lrx/Subscriber;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/s1;->g:Lr0/l/a/r1;
-
-    iput-object p3, p0, Lr0/l/a/s1;->f:Lrx/Subscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/s1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/s1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/s1;->d:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/s1;->d:Z
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/s1;->e:Ljava/lang/Object;
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/s1;->g:Lr0/l/a/r1;
-
-    iget-object v1, v1, Lr0/l/a/r1;->e:Lrx/functions/Func2;
-
-    invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :goto_0
-    iput-object p1, p0, Lr0/l/a/s1;->e:Ljava/lang/Object;
-
-    iget-object v0, p0, Lr0/l/a/s1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/s1;->f:Lrx/Subscriber;
-
-    invoke-static {v0, v1, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/s2.smali b/com.discord/smali_classes2/r0/l/a/s2.smali
deleted file mode 100644
index 28cf541c28..0000000000
--- a/com.discord/smali_classes2/r0/l/a/s2.smali
+++ /dev/null
@@ -1,143 +0,0 @@
-.class public Lr0/l/a/s2;
-.super Lrx/Subscriber;
-.source "OperatorToObservableSortedList.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-.field public final synthetic f:Lr0/l/b/b;
-
-.field public final synthetic g:Lrx/Subscriber;
-
-.field public final synthetic h:Lr0/l/a/r2;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/r2;Lr0/l/b/b;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/s2;->h:Lr0/l/a/r2;
-
-    iput-object p2, p0, Lr0/l/a/s2;->f:Lr0/l/b/b;
-
-    iput-object p3, p0, Lr0/l/a/s2;->g:Lrx/Subscriber;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    iget-object p2, p0, Lr0/l/a/s2;->h:Lr0/l/a/r2;
-
-    iget p2, p2, Lr0/l/a/r2;->e:I
-
-    invoke-direct {p1, p2}, Ljava/util/ArrayList;-><init>(I)V
-
-    iput-object p1, p0, Lr0/l/a/s2;->d:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    iget-boolean v0, p0, Lr0/l/a/s2;->e:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/s2;->e:Z
-
-    iget-object v0, p0, Lr0/l/a/s2;->d:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    iput-object v1, p0, Lr0/l/a/s2;->d:Ljava/util/List;
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/s2;->h:Lr0/l/a/r2;
-
-    iget-object v1, v1, Lr0/l/a/r2;->d:Ljava/util/Comparator;
-
-    invoke-static {v0, v1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v1, p0, Lr0/l/a/s2;->f:Lr0/l/b/b;
-
-    invoke-virtual {v1, v0}, Lr0/l/b/b;->b(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, v0}, Lr0/l/a/s2;->onError(Ljava/lang/Throwable;)V
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/s2;->g:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/s2;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/s2;->d:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :cond_0
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t$a.smali b/com.discord/smali_classes2/r0/l/a/t$a.smali
deleted file mode 100644
index 9685c7c849..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t$a.smali
+++ /dev/null
@@ -1,292 +0,0 @@
-.class public final Lr0/l/a/t$a;
-.super Ljava/util/concurrent/atomic/AtomicLong;
-.source "OnSubscribeFromIterable.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/t;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicLong;",
-        "Lrx/Producer;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = -0x7928e15851eba4daL
-
-
-# instance fields
-.field public final it:Ljava/util/Iterator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Iterator<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final o:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Ljava/util/Iterator;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;",
-            "Ljava/util/Iterator<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/t$a;->o:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/t$a;->it:Ljava/util/Iterator;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 8
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    return-void
-
-    :cond_0
-    const-wide/16 v0, 0x0
-
-    cmp-long v4, p1, v2
-
-    if-nez v4, :cond_4
-
-    invoke-virtual {p0, v0, v1, v2, v3}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    iget-object p1, p0, Lr0/l/a/t$a;->o:Lrx/Subscriber;
-
-    iget-object p2, p0, Lr0/l/a/t$a;->it:Ljava/util/Iterator;
-
-    :cond_1
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    goto/16 :goto_1
-
-    :cond_2
-    :try_start_0
-    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    goto/16 :goto_1
-
-    :cond_3
-    :try_start_1
-    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p2
-
-    if-nez p2, :cond_b
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    goto/16 :goto_1
-
-    :catchall_0
-    move-exception p2
-
-    invoke-static {p2}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, p2}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto/16 :goto_1
-
-    :catchall_1
-    move-exception p2
-
-    invoke-static {p2}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, p2}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :cond_4
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_b
-
-    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    move-result-wide v2
-
-    cmp-long v4, v2, v0
-
-    if-nez v4, :cond_b
-
-    iget-object v2, p0, Lr0/l/a/t$a;->o:Lrx/Subscriber;
-
-    iget-object v3, p0, Lr0/l/a/t$a;->it:Ljava/util/Iterator;
-
-    :cond_5
-    move-wide v4, v0
-
-    :cond_6
-    :goto_0
-    cmp-long v6, v4, p1
-
-    if-eqz v6, :cond_a
-
-    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_7
-
-    goto :goto_1
-
-    :cond_7
-    :try_start_2
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v6
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_3
-
-    invoke-interface {v2, v6}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_8
-
-    goto :goto_1
-
-    :cond_8
-    :try_start_3
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v6
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_2
-
-    if-nez v6, :cond_9
-
-    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-nez p1, :cond_b
-
-    invoke-interface {v2}, Lr0/g;->onCompleted()V
-
-    goto :goto_1
-
-    :cond_9
-    const-wide/16 v6, 0x1
-
-    add-long/2addr v4, v6
-
-    goto :goto_0
-
-    :catchall_2
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v2, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :catchall_3
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v2, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :cond_a
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide p1
-
-    cmp-long v6, v4, p1
-
-    if-nez v6, :cond_6
-
-    invoke-static {p0, v4, v5}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    move-result-wide p1
-
-    cmp-long v4, p1, v0
-
-    if-nez v4, :cond_5
-
-    :cond_b
-    :goto_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t.smali b/com.discord/smali_classes2/r0/l/a/t.smali
deleted file mode 100644
index b9f7e6d80c..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t.smali
+++ /dev/null
@@ -1,119 +0,0 @@
-.class public final Lr0/l/a/t;
-.super Ljava/lang/Object;
-.source "OnSubscribeFromIterable.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/t$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/Iterable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/Iterable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Iterable;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Iterable<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    if-eqz p1, :cond_0
-
-    iput-object p1, p0, Lr0/l/a/t;->d:Ljava/lang/Iterable;
-
-    return-void
-
-    :cond_0
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "iterable must not be null"
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/t;->d:Ljava/lang/Iterable;
-
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v2
-
-    if-nez v2, :cond_1
-
-    if-nez v1, :cond_0
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lr0/l/a/t$a;
-
-    invoke-direct {v1, p1, v0}, Lr0/l/a/t$a;-><init>(Lrx/Subscriber;Ljava/util/Iterator;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t0.smali b/com.discord/smali_classes2/r0/l/a/t0.smali
deleted file mode 100644
index 83500703f4..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t0.smali
+++ /dev/null
@@ -1,87 +0,0 @@
-.class public final Lr0/l/a/t0;
-.super Ljava/lang/Object;
-.source "OperatorDebounceWithTime.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/t0$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:Ljava/util/concurrent/TimeUnit;
-
-.field public final f:Lrx/Scheduler;
-
-
-# direct methods
-.method public constructor <init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lr0/l/a/t0;->d:J
-
-    iput-object p3, p0, Lr0/l/a/t0;->e:Ljava/util/concurrent/TimeUnit;
-
-    iput-object p4, p0, Lr0/l/a/t0;->f:Lrx/Scheduler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 6
-
-    move-object v2, p1
-
-    check-cast v2, Lrx/Subscriber;
-
-    iget-object p1, p0, Lr0/l/a/t0;->f:Lrx/Scheduler;
-
-    invoke-virtual {p1}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v4
-
-    new-instance v5, Lrx/observers/SerializedSubscriber;
-
-    invoke-direct {v5, v2}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
-
-    new-instance v3, Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {v3}, Lrx/subscriptions/SerialSubscription;-><init>()V
-
-    invoke-virtual {v5, v4}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {v5, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance p1, Lr0/l/a/s0;
-
-    move-object v0, p1
-
-    move-object v1, p0
-
-    invoke-direct/range {v0 .. v5}, Lr0/l/a/s0;-><init>(Lr0/l/a/t0;Lrx/Subscriber;Lrx/subscriptions/SerialSubscription;Lrx/Scheduler$Worker;Lrx/observers/SerializedSubscriber;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t1.smali b/com.discord/smali_classes2/r0/l/a/t1.smali
deleted file mode 100644
index 5fb9af8f3d..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t1.smali
+++ /dev/null
@@ -1,188 +0,0 @@
-.class public Lr0/l/a/t1;
-.super Lrx/Subscriber;
-.source "OperatorScan.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TR;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic e:Ljava/lang/Object;
-
-.field public final synthetic f:Lr0/l/a/r1$b;
-
-.field public final synthetic g:Lr0/l/a/r1;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/r1;Ljava/lang/Object;Lr0/l/a/r1$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/t1;->g:Lr0/l/a/r1;
-
-    iput-object p2, p0, Lr0/l/a/t1;->e:Ljava/lang/Object;
-
-    iput-object p3, p0, Lr0/l/a/t1;->f:Lr0/l/a/r1$b;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iget-object p1, p0, Lr0/l/a/t1;->e:Ljava/lang/Object;
-
-    iput-object p1, p0, Lr0/l/a/t1;->d:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/t1;->f:Lr0/l/a/r1$b;
-
-    invoke-virtual {v0}, Lr0/l/a/r1$b;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/t1;->f:Lr0/l/a/r1$b;
-
-    iput-object p1, v0, Lr0/l/a/r1$b;->l:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, v0, Lr0/l/a/r1$b;->k:Z
-
-    invoke-virtual {v0}, Lr0/l/a/r1$b;->b()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/t1;->d:Ljava/lang/Object;
-
-    :try_start_0
-    iget-object v1, p0, Lr0/l/a/t1;->g:Lr0/l/a/r1;
-
-    iget-object v1, v1, Lr0/l/a/r1;->e:Lrx/functions/Func2;
-
-    invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iput-object p1, p0, Lr0/l/a/t1;->d:Ljava/lang/Object;
-
-    iget-object v0, p0, Lr0/l/a/t1;->f:Lr0/l/a/r1$b;
-
-    invoke-virtual {v0, p1}, Lr0/l/a/r1$b;->onNext(Ljava/lang/Object;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0, p0, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 7
-
-    iget-object v0, p0, Lr0/l/a/t1;->f:Lr0/l/a/r1$b;
-
-    if-eqz p1, :cond_3
-
-    iget-object v1, v0, Lr0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget-object v2, v0, Lr0/l/a/r1$b;->j:Lrx/Producer;
-
-    if-nez v2, :cond_2
-
-    iget-wide v2, v0, Lr0/l/a/r1$b;->h:J
-
-    const-wide v4, 0x7fffffffffffffffL
-
-    cmp-long v6, v2, v4
-
-    if-eqz v6, :cond_0
-
-    const-wide/16 v4, 0x1
-
-    sub-long/2addr v2, v4
-
-    :cond_0
-    const-wide/16 v4, 0x0
-
-    iput-wide v4, v0, Lr0/l/a/r1$b;->h:J
-
-    iput-object p1, v0, Lr0/l/a/r1$b;->j:Lrx/Producer;
-
-    monitor-exit v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    cmp-long v1, v2, v4
-
-    if-lez v1, :cond_1
-
-    invoke-interface {p1, v2, v3}, Lrx/Producer;->m(J)V
-
-    :cond_1
-    invoke-virtual {v0}, Lr0/l/a/r1$b;->b()V
-
-    return-void
-
-    :cond_2
-    :try_start_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "Can\'t set more than one Producer!"
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit v1
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-
-    :cond_3
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t2$a$a.smali b/com.discord/smali_classes2/r0/l/a/t2$a$a.smali
deleted file mode 100644
index f9c0503702..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t2$a$a.smali
+++ /dev/null
@@ -1,114 +0,0 @@
-.class public final Lr0/l/a/t2$a$a;
-.super Lrx/Subscriber;
-.source "OperatorZip.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/t2$a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/l/e/h;
-
-.field public final synthetic e:Lr0/l/a/t2$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/t2$a;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/t2$a$a;->e:Lr0/l/a/t2$a;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    invoke-static {}, Lr0/l/e/h;->a()Lr0/l/e/h;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lr0/l/a/t2$a$a;->d:Lr0/l/e/h;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/t2$a$a;->d:Lr0/l/e/h;
-
-    iget-object v1, v0, Lr0/l/e/h;->e:Ljava/lang/Object;
-
-    if-nez v1, :cond_0
-
-    sget-object v1, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    iput-object v1, v0, Lr0/l/e/h;->e:Ljava/lang/Object;
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/t2$a$a;->e:Lr0/l/a/t2$a;
-
-    invoke-virtual {v0}, Lr0/l/a/t2$a;->a()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/t2$a$a;->e:Lr0/l/a/t2$a;
-
-    iget-object v0, v0, Lr0/l/a/t2$a;->child:Lr0/g;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/t2$a$a;->d:Lr0/l/e/h;
-
-    invoke-virtual {v0, p1}, Lr0/l/e/h;->b(Ljava/lang/Object;)V
-    :try_end_0
-    .catch Lrx/exceptions/MissingBackpressureException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    iget-object v0, p0, Lr0/l/a/t2$a$a;->e:Lr0/l/a/t2$a;
-
-    iget-object v0, v0, Lr0/l/a/t2$a;->child:Lr0/g;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    iget-object p1, p0, Lr0/l/a/t2$a$a;->e:Lr0/l/a/t2$a;
-
-    invoke-virtual {p1}, Lr0/l/a/t2$a;->a()V
-
-    return-void
-.end method
-
-.method public onStart()V
-    .locals 2
-
-    sget v0, Lr0/l/e/h;->f:I
-
-    int-to-long v0, v0
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t2$a.smali b/com.discord/smali_classes2/r0/l/a/t2$a.smali
deleted file mode 100644
index db57cead40..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t2$a.smali
+++ /dev/null
@@ -1,319 +0,0 @@
-.class public final Lr0/l/a/t2$a;
-.super Ljava/util/concurrent/atomic/AtomicLong;
-.source "OperatorZip.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/t2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/t2$a$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicLong;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:I
-
-.field public static final serialVersionUID:J = 0x53337eae55d8937dL
-
-
-# instance fields
-.field public final child:Lr0/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/g<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final childSubscription:Lrx/subscriptions/CompositeSubscription;
-
-.field public emitted:I
-
-.field public requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public volatile subscribers:[Ljava/lang/Object;
-
-.field public final zipFunction:Lrx/functions/FuncN;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/FuncN<",
-            "+TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    sget v0, Lr0/l/e/h;->f:I
-
-    int-to-double v0, v0
-
-    const-wide v2, 0x3fe6666666666666L    # 0.7
-
-    mul-double v0, v0, v2
-
-    double-to-int v0, v0
-
-    sput v0, Lr0/l/a/t2$a;->d:I
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/Subscriber;Lrx/functions/FuncN;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;",
-            "Lrx/functions/FuncN<",
-            "+TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    new-instance v0, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object v0, p0, Lr0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
-
-    iput-object p1, p0, Lr0/l/a/t2$a;->child:Lr0/g;
-
-    iput-object p2, p0, Lr0/l/a/t2$a;->zipFunction:Lrx/functions/FuncN;
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 13
-
-    iget-object v0, p0, Lr0/l/a/t2$a;->subscribers:[Ljava/lang/Object;
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
-
-    move-result-wide v1
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_9
-
-    array-length v1, v0
-
-    iget-object v2, p0, Lr0/l/a/t2$a;->child:Lr0/g;
-
-    iget-object v5, p0, Lr0/l/a/t2$a;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    :cond_1
-    :goto_0
-    new-array v6, v1, [Ljava/lang/Object;
-
-    const/4 v7, 0x1
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x1
-
-    :goto_1
-    if-ge v9, v1, :cond_4
-
-    aget-object v11, v0, v9
-
-    check-cast v11, Lr0/l/a/t2$a$a;
-
-    iget-object v11, v11, Lr0/l/a/t2$a$a;->d:Lr0/l/e/h;
-
-    invoke-virtual {v11}, Lr0/l/e/h;->c()Ljava/lang/Object;
-
-    move-result-object v11
-
-    if-nez v11, :cond_2
-
-    const/4 v10, 0x0
-
-    goto :goto_2
-
-    :cond_2
-    invoke-static {v11}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
-
-    move-result v12
-
-    if-eqz v12, :cond_3
-
-    invoke-interface {v2}, Lr0/g;->onCompleted()V
-
-    iget-object v0, p0, Lr0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    return-void
-
-    :cond_3
-    invoke-static {v11}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v11
-
-    aput-object v11, v6, v9
-
-    :goto_2
-    add-int/lit8 v9, v9, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    if-eqz v10, :cond_8
-
-    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v9
-
-    cmp-long v11, v9, v3
-
-    if-lez v11, :cond_8
-
-    :try_start_0
-    iget-object v9, p0, Lr0/l/a/t2$a;->zipFunction:Lrx/functions/FuncN;
-
-    invoke-interface {v9, v6}, Lrx/functions/FuncN;->call([Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v9
-
-    invoke-interface {v2, v9}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicLong;->decrementAndGet()J
-
-    iget v9, p0, Lr0/l/a/t2$a;->emitted:I
-
-    add-int/2addr v9, v7
-
-    iput v9, p0, Lr0/l/a/t2$a;->emitted:I
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    array-length v6, v0
-
-    const/4 v7, 0x0
-
-    :goto_3
-    if-ge v7, v6, :cond_6
-
-    aget-object v9, v0, v7
-
-    check-cast v9, Lr0/l/a/t2$a$a;
-
-    iget-object v9, v9, Lr0/l/a/t2$a$a;->d:Lr0/l/e/h;
-
-    invoke-virtual {v9}, Lr0/l/e/h;->d()Ljava/lang/Object;
-
-    invoke-virtual {v9}, Lr0/l/e/h;->c()Ljava/lang/Object;
-
-    move-result-object v9
-
-    invoke-static {v9}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
-
-    move-result v9
-
-    if-eqz v9, :cond_5
-
-    invoke-interface {v2}, Lr0/g;->onCompleted()V
-
-    iget-object v0, p0, Lr0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    return-void
-
-    :cond_5
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_3
-
-    :cond_6
-    iget v6, p0, Lr0/l/a/t2$a;->emitted:I
-
-    sget v7, Lr0/l/a/t2$a;->d:I
-
-    if-le v6, v7, :cond_1
-
-    array-length v6, v0
-
-    const/4 v7, 0x0
-
-    :goto_4
-    if-ge v7, v6, :cond_7
-
-    aget-object v9, v0, v7
-
-    check-cast v9, Lr0/l/a/t2$a$a;
-
-    iget v10, p0, Lr0/l/a/t2$a;->emitted:I
-
-    int-to-long v10, v10
-
-    invoke-virtual {v9, v10, v11}, Lrx/Subscriber;->request(J)V
-
-    add-int/lit8 v7, v7, 0x1
-
-    goto :goto_4
-
-    :cond_7
-    iput v8, p0, Lr0/l/a/t2$a;->emitted:I
-
-    goto/16 :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0, v2, v6}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_8
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->decrementAndGet()J
-
-    move-result-wide v6
-
-    cmp-long v8, v6, v3
-
-    if-gtz v8, :cond_1
-
-    :cond_9
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t2$b.smali b/com.discord/smali_classes2/r0/l/a/t2$b.smali
deleted file mode 100644
index 35ac46a943..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t2$b.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public final Lr0/l/a/t2$b;
-.super Ljava/util/concurrent/atomic/AtomicLong;
-.source "OperatorZip.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/t2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicLong;",
-        "Lrx/Producer;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = -0x10e280be328ab0acL
-
-
-# instance fields
-.field public final zipper:Lr0/l/a/t2$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/t2$a<",
-            "TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/t2$a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/l/a/t2$a<",
-            "TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/t2$b;->zipper:Lr0/l/a/t2$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 0
-
-    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    iget-object p1, p0, Lr0/l/a/t2$b;->zipper:Lr0/l/a/t2$a;
-
-    invoke-virtual {p1}, Lr0/l/a/t2$a;->a()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t2$c.smali b/com.discord/smali_classes2/r0/l/a/t2$c.smali
deleted file mode 100644
index ef61ae3d89..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t2$c.smali
+++ /dev/null
@@ -1,196 +0,0 @@
-.class public final Lr0/l/a/t2$c;
-.super Lrx/Subscriber;
-.source "OperatorZip.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/t2;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "[",
-        "Lrx/Observable;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/l/a/t2$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/t2$a<",
-            "TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Lr0/l/a/t2$b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/t2$b<",
-            "TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public g:Z
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/t2;Lrx/Subscriber;Lr0/l/a/t2$a;Lr0/l/a/t2$b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;",
-            "Lr0/l/a/t2$a<",
-            "TR;>;",
-            "Lr0/l/a/t2$b<",
-            "TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p2, p0, Lr0/l/a/t2$c;->d:Lrx/Subscriber;
-
-    iput-object p3, p0, Lr0/l/a/t2$c;->e:Lr0/l/a/t2$a;
-
-    iput-object p4, p0, Lr0/l/a/t2$c;->f:Lr0/l/a/t2$b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/t2$c;->g:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/t2$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/t2$c;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 7
-
-    check-cast p1, [Lrx/Observable;
-
-    if-eqz p1, :cond_3
-
-    array-length v0, p1
-
-    if-nez v0, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/t2$c;->g:Z
-
-    iget-object v0, p0, Lr0/l/a/t2$c;->e:Lr0/l/a/t2$a;
-
-    iget-object v1, p0, Lr0/l/a/t2$c;->f:Lr0/l/a/t2$b;
-
-    if-eqz v0, :cond_2
-
-    array-length v2, p1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x0
-
-    :goto_0
-    array-length v5, p1
-
-    if-ge v4, v5, :cond_1
-
-    new-instance v5, Lr0/l/a/t2$a$a;
-
-    invoke-direct {v5, v0}, Lr0/l/a/t2$a$a;-><init>(Lr0/l/a/t2$a;)V
-
-    aput-object v5, v2, v4
-
-    iget-object v6, v0, Lr0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v6, v5}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    add-int/lit8 v4, v4, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    iput-object v1, v0, Lr0/l/a/t2$a;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iput-object v2, v0, Lr0/l/a/t2$a;->subscribers:[Ljava/lang/Object;
-
-    :goto_1
-    array-length v0, p1
-
-    if-ge v3, v0, :cond_4
-
-    aget-object v0, p1, v3
-
-    aget-object v1, v2, v3
-
-    check-cast v1, Lr0/l/a/t2$a$a;
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_3
-    :goto_2
-    iget-object p1, p0, Lr0/l/a/t2$c;->d:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    :cond_4
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t2.smali b/com.discord/smali_classes2/r0/l/a/t2.smali
deleted file mode 100644
index 781099db74..0000000000
--- a/com.discord/smali_classes2/r0/l/a/t2.smali
+++ /dev/null
@@ -1,84 +0,0 @@
-.class public final Lr0/l/a/t2;
-.super Ljava/lang/Object;
-.source "OperatorZip.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/t2$a;,
-        Lr0/l/a/t2$b;,
-        Lr0/l/a/t2$c;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TR;[",
-        "Lrx/Observable<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/FuncN;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/FuncN<",
-            "+TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Func2;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lr0/k/d;
-
-    invoke-direct {v0, p1}, Lr0/k/d;-><init>(Lrx/functions/Func2;)V
-
-    iput-object v0, p0, Lr0/l/a/t2;->d:Lrx/functions/FuncN;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/t2$a;
-
-    iget-object v1, p0, Lr0/l/a/t2;->d:Lrx/functions/FuncN;
-
-    invoke-direct {v0, p1, v1}, Lr0/l/a/t2$a;-><init>(Lrx/Subscriber;Lrx/functions/FuncN;)V
-
-    new-instance v1, Lr0/l/a/t2$b;
-
-    invoke-direct {v1, v0}, Lr0/l/a/t2$b;-><init>(Lr0/l/a/t2$a;)V
-
-    new-instance v2, Lr0/l/a/t2$c;
-
-    invoke-direct {v2, p0, p1, v0, v1}, Lr0/l/a/t2$c;-><init>(Lr0/l/a/t2;Lrx/Subscriber;Lr0/l/a/t2$a;Lr0/l/a/t2$b;)V
-
-    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-object v2
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u.smali b/com.discord/smali_classes2/r0/l/a/u.smali
deleted file mode 100644
index 6a4be1ec14..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u.smali
+++ /dev/null
@@ -1,127 +0,0 @@
-.class public final Lr0/l/a/u;
-.super Ljava/lang/Object;
-.source "OnSubscribeLift.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable$a<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/Observable$b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable$b<",
-            "+TR;-TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable$a;Lrx/Observable$b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable$a<",
-            "TT;>;",
-            "Lrx/Observable$b<",
-            "+TR;-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/u;->d:Lrx/Observable$a;
-
-    iput-object p2, p0, Lr0/l/a/u;->e:Lrx/Observable$b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/u;->e:Lrx/Observable$b;
-
-    sget-object v1, Lr0/o/l;->i:Lr0/k/b;
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v1, v0}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable$b;
-
-    :cond_0
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Subscriber;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-virtual {v0}, Lrx/Subscriber;->onStart()V
-
-    iget-object v1, p0, Lr0/l/a/u;->d:Lrx/Observable$a;
-
-    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    :try_start_2
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {v0, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    goto :goto_0
-
-    :catchall_1
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u0$a.smali b/com.discord/smali_classes2/r0/l/a/u0$a.smali
deleted file mode 100644
index 163c89a8c2..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u0$a.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.class public Lr0/l/a/u0$a;
-.super Ljava/lang/Object;
-.source "OperatorDelay.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/u0;->onCompleted()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/u0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/u0;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/u0$a;->d:Lr0/l/a/u0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/u0$a;->d:Lr0/l/a/u0;
-
-    iget-boolean v1, v0, Lr0/l/a/u0;->d:Z
-
-    if-nez v1, :cond_0
-
-    const/4 v1, 0x1
-
-    iput-boolean v1, v0, Lr0/l/a/u0;->d:Z
-
-    iget-object v0, v0, Lr0/l/a/u0;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u0$b.smali b/com.discord/smali_classes2/r0/l/a/u0$b.smali
deleted file mode 100644
index b12f7ba5e9..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u0$b.smali
+++ /dev/null
@@ -1,68 +0,0 @@
-.class public Lr0/l/a/u0$b;
-.super Ljava/lang/Object;
-.source "OperatorDelay.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/u0;->onError(Ljava/lang/Throwable;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/Throwable;
-
-.field public final synthetic e:Lr0/l/a/u0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/u0;Ljava/lang/Throwable;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/u0$b;->e:Lr0/l/a/u0;
-
-    iput-object p2, p0, Lr0/l/a/u0$b;->d:Ljava/lang/Throwable;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/u0$b;->e:Lr0/l/a/u0;
-
-    iget-boolean v1, v0, Lr0/l/a/u0;->d:Z
-
-    if-nez v1, :cond_0
-
-    const/4 v1, 0x1
-
-    iput-boolean v1, v0, Lr0/l/a/u0;->d:Z
-
-    iget-object v0, v0, Lr0/l/a/u0;->f:Lrx/Subscriber;
-
-    iget-object v1, p0, Lr0/l/a/u0$b;->d:Ljava/lang/Throwable;
-
-    invoke-interface {v0, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    iget-object v0, p0, Lr0/l/a/u0$b;->e:Lr0/l/a/u0;
-
-    iget-object v0, v0, Lr0/l/a/u0;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u0$c.smali b/com.discord/smali_classes2/r0/l/a/u0$c.smali
deleted file mode 100644
index 8e88e50d58..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u0$c.smali
+++ /dev/null
@@ -1,58 +0,0 @@
-.class public Lr0/l/a/u0$c;
-.super Ljava/lang/Object;
-.source "OperatorDelay.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/u0;->onNext(Ljava/lang/Object;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/lang/Object;
-
-.field public final synthetic e:Lr0/l/a/u0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/u0;Ljava/lang/Object;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/u0$c;->e:Lr0/l/a/u0;
-
-    iput-object p2, p0, Lr0/l/a/u0$c;->d:Ljava/lang/Object;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/u0$c;->e:Lr0/l/a/u0;
-
-    iget-boolean v1, v0, Lr0/l/a/u0;->d:Z
-
-    if-nez v1, :cond_0
-
-    iget-object v0, v0, Lr0/l/a/u0;->f:Lrx/Subscriber;
-
-    iget-object v1, p0, Lr0/l/a/u0$c;->d:Ljava/lang/Object;
-
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u0.smali b/com.discord/smali_classes2/r0/l/a/u0.smali
deleted file mode 100644
index 6546f0f884..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u0.smali
+++ /dev/null
@@ -1,99 +0,0 @@
-.class public Lr0/l/a/u0;
-.super Lrx/Subscriber;
-.source "OperatorDelay.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public final synthetic e:Lrx/Scheduler$Worker;
-
-.field public final synthetic f:Lrx/Subscriber;
-
-.field public final synthetic g:Lr0/l/a/v0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/v0;Lrx/Subscriber;Lrx/Scheduler$Worker;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/u0;->g:Lr0/l/a/v0;
-
-    iput-object p3, p0, Lr0/l/a/u0;->e:Lrx/Scheduler$Worker;
-
-    iput-object p4, p0, Lr0/l/a/u0;->f:Lrx/Subscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/a/u0;->e:Lrx/Scheduler$Worker;
-
-    new-instance v1, Lr0/l/a/u0$a;
-
-    invoke-direct {v1, p0}, Lr0/l/a/u0$a;-><init>(Lr0/l/a/u0;)V
-
-    iget-object v2, p0, Lr0/l/a/u0;->g:Lr0/l/a/v0;
-
-    iget-wide v3, v2, Lr0/l/a/v0;->d:J
-
-    iget-object v2, v2, Lr0/l/a/v0;->e:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v1, v3, v4, v2}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/u0;->e:Lrx/Scheduler$Worker;
-
-    new-instance v1, Lr0/l/a/u0$b;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/a/u0$b;-><init>(Lr0/l/a/u0;Ljava/lang/Throwable;)V
-
-    invoke-virtual {v0, v1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/a/u0;->e:Lrx/Scheduler$Worker;
-
-    new-instance v1, Lr0/l/a/u0$c;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/a/u0$c;-><init>(Lr0/l/a/u0;Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/a/u0;->g:Lr0/l/a/v0;
-
-    iget-wide v2, p1, Lr0/l/a/v0;->d:J
-
-    iget-object p1, p1, Lr0/l/a/v0;->e:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v0, v1, v2, v3, p1}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u1$a.smali b/com.discord/smali_classes2/r0/l/a/u1$a.smali
deleted file mode 100644
index 3e62a5b931..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u1$a.smali
+++ /dev/null
@@ -1,39 +0,0 @@
-.class public final Lr0/l/a/u1$a;
-.super Ljava/lang/Object;
-.source "OperatorSingle.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/u1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/u1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/u1<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/a/u1;
-
-    invoke-direct {v0}, Lr0/l/a/u1;-><init>()V
-
-    sput-object v0, Lr0/l/a/u1$a;->a:Lr0/l/a/u1;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u1$b.smali b/com.discord/smali_classes2/r0/l/a/u1$b.smali
deleted file mode 100644
index 5e07a1727e..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u1$b.smali
+++ /dev/null
@@ -1,209 +0,0 @@
-.class public final Lr0/l/a/u1$b;
-.super Lrx/Subscriber;
-.source "OperatorSingle.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/u1;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Z
-
-.field public final f:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public g:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public h:Z
-
-.field public i:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;ZLjava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;ZTT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    iput-boolean p2, p0, Lr0/l/a/u1$b;->e:Z
-
-    iput-object p3, p0, Lr0/l/a/u1$b;->f:Ljava/lang/Object;
-
-    const-wide/16 p1, 0x2
-
-    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 4
-
-    iget-boolean v0, p0, Lr0/l/a/u1$b;->i:Z
-
-    if-nez v0, :cond_2
-
-    iget-boolean v0, p0, Lr0/l/a/u1$b;->h:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    new-instance v1, Lr0/l/b/c;
-
-    iget-object v2, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    iget-object v3, p0, Lr0/l/a/u1$b;->g:Ljava/lang/Object;
-
-    invoke-direct {v1, v2, v3}, Lr0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-boolean v0, p0, Lr0/l/a/u1$b;->e:Z
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    new-instance v1, Lr0/l/b/c;
-
-    iget-object v2, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    iget-object v3, p0, Lr0/l/a/u1$b;->f:Ljava/lang/Object;
-
-    invoke-direct {v1, v2, v3}, Lr0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v0, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    new-instance v1, Ljava/util/NoSuchElementException;
-
-    const-string v2, "Sequence contains no elements"
-
-    invoke-direct {v1, v2}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
-
-    invoke-interface {v0, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    :cond_2
-    :goto_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/u1$b;->i:Z
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/u1$b;->i:Z
-
-    if-nez v0, :cond_1
-
-    iget-boolean v0, p0, Lr0/l/a/u1$b;->h:Z
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    iput-boolean v1, p0, Lr0/l/a/u1$b;->i:Z
-
-    iget-object p1, p0, Lr0/l/a/u1$b;->d:Lrx/Subscriber;
-
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "Sequence contains too many elements"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    goto :goto_0
-
-    :cond_0
-    iput-object p1, p0, Lr0/l/a/u1$b;->g:Ljava/lang/Object;
-
-    iput-boolean v1, p0, Lr0/l/a/u1$b;->h:Z
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u1.smali b/com.discord/smali_classes2/r0/l/a/u1.smali
deleted file mode 100644
index e6f264dc7a..0000000000
--- a/com.discord/smali_classes2/r0/l/a/u1.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lr0/l/a/u1;
-.super Ljava/lang/Object;
-.source "OperatorSingle.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/u1$b;,
-        Lr0/l/a/u1$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Z
-
-.field public final e:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lr0/l/a/u1;->d:Z
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lr0/l/a/u1;->e:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/u1$b;
-
-    iget-boolean v1, p0, Lr0/l/a/u1;->d:Z
-
-    iget-object v2, p0, Lr0/l/a/u1;->e:Ljava/lang/Object;
-
-    invoke-direct {v0, p1, v1, v2}, Lr0/l/a/u1$b;-><init>(Lrx/Subscriber;ZLjava/lang/Object;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/v$a.smali b/com.discord/smali_classes2/r0/l/a/v$a.smali
deleted file mode 100644
index a01efaf8ef..0000000000
--- a/com.discord/smali_classes2/r0/l/a/v$a.smali
+++ /dev/null
@@ -1,162 +0,0 @@
-.class public final Lr0/l/a/v$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeMap.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/v;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+TR;>;"
-        }
-    .end annotation
-.end field
-
-.field public f:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TR;>;",
-            "Lr0/k/b<",
-            "-TT;+TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/v$a;->d:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/a/v$a;->e:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/v$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/a/v$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/a/v$a;->f:Z
-
-    if-eqz v0, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/v$a;->f:Z
-
-    iget-object v0, p0, Lr0/l/a/v$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/v$a;->e:Lr0/k/b;
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/a/v$a;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lr0/l/a/v$a;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/v$a;->d:Lrx/Subscriber;
-
-    invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/v.smali b/com.discord/smali_classes2/r0/l/a/v.smali
deleted file mode 100644
index 59d844d67c..0000000000
--- a/com.discord/smali_classes2/r0/l/a/v.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class public final Lr0/l/a/v;
-.super Ljava/lang/Object;
-.source "OnSubscribeMap.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/v$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+TR;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "TT;>;",
-            "Lr0/k/b<",
-            "-TT;+TR;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/v;->d:Lrx/Observable;
-
-    iput-object p2, p0, Lr0/l/a/v;->e:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/v$a;
-
-    iget-object v1, p0, Lr0/l/a/v;->e:Lr0/k/b;
-
-    invoke-direct {v0, p1, v1}, Lr0/l/a/v$a;-><init>(Lrx/Subscriber;Lr0/k/b;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object p1, p0, Lr0/l/a/v;->d:Lrx/Observable;
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/v0.smali b/com.discord/smali_classes2/r0/l/a/v0.smali
deleted file mode 100644
index 66de1baf8e..0000000000
--- a/com.discord/smali_classes2/r0/l/a/v0.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Lr0/l/a/v0;
-.super Ljava/lang/Object;
-.source "OperatorDelay.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:Ljava/util/concurrent/TimeUnit;
-
-.field public final f:Lrx/Scheduler;
-
-
-# direct methods
-.method public constructor <init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-wide p1, p0, Lr0/l/a/v0;->d:J
-
-    iput-object p3, p0, Lr0/l/a/v0;->e:Ljava/util/concurrent/TimeUnit;
-
-    iput-object p4, p0, Lr0/l/a/v0;->f:Lrx/Scheduler;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/v0;->f:Lrx/Scheduler;
-
-    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v1, Lr0/l/a/u0;
-
-    invoke-direct {v1, p0, p1, v0, p1}, Lr0/l/a/u0;-><init>(Lr0/l/a/v0;Lrx/Subscriber;Lrx/Scheduler$Worker;Lrx/Subscriber;)V
-
-    return-object v1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/v1.smali b/com.discord/smali_classes2/r0/l/a/v1.smali
deleted file mode 100644
index 7907f51499..0000000000
--- a/com.discord/smali_classes2/r0/l/a/v1.smali
+++ /dev/null
@@ -1,105 +0,0 @@
-.class public Lr0/l/a/v1;
-.super Lrx/Subscriber;
-.source "OperatorSkip.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public final synthetic e:Lrx/Subscriber;
-
-.field public final synthetic f:Lr0/l/a/w1;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/w1;Lrx/Subscriber;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/v1;->f:Lr0/l/a/w1;
-
-    iput-object p3, p0, Lr0/l/a/v1;->e:Lrx/Subscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/v1;->e:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/v1;->e:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget v0, p0, Lr0/l/a/v1;->d:I
-
-    iget-object v1, p0, Lr0/l/a/v1;->f:Lr0/l/a/w1;
-
-    iget v1, v1, Lr0/l/a/w1;->d:I
-
-    if-lt v0, v1, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/v1;->e:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lr0/l/a/v1;->d:I
-
-    :goto_0
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/v1;->e:Lrx/Subscriber;
-
-    invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    iget-object v0, p0, Lr0/l/a/v1;->f:Lr0/l/a/w1;
-
-    iget v0, v0, Lr0/l/a/w1;->d:I
-
-    int-to-long v0, v0
-
-    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/w$a.smali b/com.discord/smali_classes2/r0/l/a/w$a.smali
deleted file mode 100644
index 9714f2ac4f..0000000000
--- a/com.discord/smali_classes2/r0/l/a/w$a.smali
+++ /dev/null
@@ -1,167 +0,0 @@
-.class public Lr0/l/a/w$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeRedo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/w;->call()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public final synthetic e:Lr0/l/a/w;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/w;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    iget-boolean v0, p0, Lr0/l/a/w$a;->d:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/w$a;->d:Z
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    iget-object v0, v0, Lr0/l/a/w;->e:Lrx/subjects/Subject;
-
-    sget-object v1, Lr0/f;->d:Lr0/f;
-
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 4
-
-    iget-boolean v0, p0, Lr0/l/a/w$a;->d:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/w$a;->d:Z
-
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    iget-object v0, v0, Lr0/l/a/w;->e:Lrx/subjects/Subject;
-
-    new-instance v1, Lr0/f;
-
-    sget-object v2, Lr0/f$a;->e:Lr0/f$a;
-
-    const/4 v3, 0x0
-
-    invoke-direct {v1, v2, v3, p1}, Lr0/f;-><init>(Lr0/f$a;Ljava/lang/Object;Ljava/lang/Throwable;)V
-
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/w$a;->d:Z
-
-    if-nez v0, :cond_2
-
-    iget-object v0, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    iget-object v0, v0, Lr0/l/a/w;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :cond_0
-    iget-object p1, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    iget-object p1, p1, Lr0/l/a/w;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    const-wide/16 v4, 0x1
-
-    cmp-long p1, v0, v2
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    iget-object p1, p1, Lr0/l/a/w;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    sub-long v2, v0, v4
-
-    invoke-virtual {p1, v0, v1, v2, v3}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    :cond_1
-    iget-object p1, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    iget-object p1, p1, Lr0/l/a/w;->f:Lr0/l/b/a;
-
-    invoke-virtual {p1, v4, v5}, Lr0/l/b/a;->b(J)V
-
-    :cond_2
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/w$a;->e:Lr0/l/a/w;
-
-    iget-object v0, v0, Lr0/l/a/w;->f:Lr0/l/b/a;
-
-    invoke-virtual {v0, p1}, Lr0/l/b/a;->c(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/w.smali b/com.discord/smali_classes2/r0/l/a/w.smali
deleted file mode 100644
index 41018eba21..0000000000
--- a/com.discord/smali_classes2/r0/l/a/w.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public Lr0/l/a/w;
-.super Ljava/lang/Object;
-.source "OnSubscribeRedo.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-.field public final synthetic e:Lrx/subjects/Subject;
-
-.field public final synthetic f:Lr0/l/b/a;
-
-.field public final synthetic g:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final synthetic h:Lrx/subscriptions/SerialSubscription;
-
-.field public final synthetic i:Lr0/l/a/b0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/b0;Lrx/Subscriber;Lrx/subjects/Subject;Lr0/l/b/a;Ljava/util/concurrent/atomic/AtomicLong;Lrx/subscriptions/SerialSubscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/w;->i:Lr0/l/a/b0;
-
-    iput-object p2, p0, Lr0/l/a/w;->d:Lrx/Subscriber;
-
-    iput-object p3, p0, Lr0/l/a/w;->e:Lrx/subjects/Subject;
-
-    iput-object p4, p0, Lr0/l/a/w;->f:Lr0/l/b/a;
-
-    iput-object p5, p0, Lr0/l/a/w;->g:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iput-object p6, p0, Lr0/l/a/w;->h:Lrx/subscriptions/SerialSubscription;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/a/w;->d:Lrx/Subscriber;
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance v0, Lr0/l/a/w$a;
-
-    invoke-direct {v0, p0}, Lr0/l/a/w$a;-><init>(Lr0/l/a/w;)V
-
-    iget-object v1, p0, Lr0/l/a/w;->h:Lrx/subscriptions/SerialSubscription;
-
-    invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
-
-    iget-object v1, p0, Lr0/l/a/w;->i:Lr0/l/a/b0;
-
-    iget-object v1, v1, Lr0/l/a/b0;->d:Lrx/Observable;
-
-    invoke-virtual {v1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/w0.smali b/com.discord/smali_classes2/r0/l/a/w0.smali
deleted file mode 100644
index ae0ee95b75..0000000000
--- a/com.discord/smali_classes2/r0/l/a/w0.smali
+++ /dev/null
@@ -1,154 +0,0 @@
-.class public Lr0/l/a/w0;
-.super Lrx/Subscriber;
-.source "OperatorDistinctUntilChanged.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TU;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-.field public final synthetic f:Lrx/Subscriber;
-
-.field public final synthetic g:Lr0/l/a/x0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/x0;Lrx/Subscriber;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/w0;->g:Lr0/l/a/x0;
-
-    iput-object p3, p0, Lr0/l/a/w0;->f:Lrx/Subscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/w0;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/w0;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/w0;->g:Lr0/l/a/x0;
-
-    iget-object v0, v0, Lr0/l/a/x0;->d:Lr0/k/b;
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    iget-object v1, p0, Lr0/l/a/w0;->d:Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/a/w0;->d:Ljava/lang/Object;
-
-    iget-boolean v2, p0, Lr0/l/a/w0;->e:Z
-
-    if-eqz v2, :cond_1
-
-    :try_start_1
-    iget-object v2, p0, Lr0/l/a/w0;->g:Lr0/l/a/x0;
-
-    iget-object v2, v2, Lr0/l/a/x0;->e:Lrx/functions/Func2;
-
-    invoke-interface {v2, v1, v0}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Boolean;
-
-    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/w0;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    const-wide/16 v0, 0x1
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    iget-object v1, p0, Lr0/l/a/w0;->f:Lrx/Subscriber;
-
-    invoke-static {p1, v1, v0}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-
-    :cond_1
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/a/w0;->e:Z
-
-    iget-object v0, p0, Lr0/l/a/w0;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :goto_0
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/w0;->f:Lrx/Subscriber;
-
-    invoke-static {v0, v1, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/x.smali b/com.discord/smali_classes2/r0/l/a/x.smali
deleted file mode 100644
index f22564b938..0000000000
--- a/com.discord/smali_classes2/r0/l/a/x.smali
+++ /dev/null
@@ -1,141 +0,0 @@
-.class public Lr0/l/a/x;
-.super Lrx/Subscriber;
-.source "OnSubscribeRedo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "Lr0/f<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-.field public final synthetic e:Lr0/l/a/y;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/y;Lrx/Subscriber;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/x;->e:Lr0/l/a/y;
-
-    iput-object p3, p0, Lr0/l/a/x;->d:Lrx/Subscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/x;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/x;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 4
-
-    check-cast p1, Lr0/f;
-
-    iget-object v0, p1, Lr0/f;->a:Lr0/f$a;
-
-    sget-object v1, Lr0/f$a;->f:Lr0/f$a;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/a/x;->e:Lr0/l/a/y;
-
-    iget-object v0, v0, Lr0/l/a/y;->d:Lr0/l/a/b0;
-
-    iget-boolean v0, v0, Lr0/l/a/b0;->f:Z
-
-    if-eqz v0, :cond_1
-
-    iget-object p1, p0, Lr0/l/a/x;->d:Lrx/Subscriber;
-
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    goto :goto_1
-
-    :cond_1
-    iget-object v0, p1, Lr0/f;->a:Lr0/f$a;
-
-    sget-object v1, Lr0/f$a;->e:Lr0/f$a;
-
-    if-ne v0, v1, :cond_2
-
-    const/4 v2, 0x1
-
-    :cond_2
-    if-eqz v2, :cond_3
-
-    iget-object v0, p0, Lr0/l/a/x;->e:Lr0/l/a/y;
-
-    iget-object v0, v0, Lr0/l/a/y;->d:Lr0/l/a/b0;
-
-    iget-boolean v0, v0, Lr0/l/a/b0;->g:Z
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lr0/l/a/x;->d:Lrx/Subscriber;
-
-    iget-object p1, p1, Lr0/f;->b:Ljava/lang/Throwable;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_1
-
-    :cond_3
-    iget-object v0, p0, Lr0/l/a/x;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    :goto_1
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/x0$a.smali b/com.discord/smali_classes2/r0/l/a/x0$a.smali
deleted file mode 100644
index 0027783b33..0000000000
--- a/com.discord/smali_classes2/r0/l/a/x0$a.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public final Lr0/l/a/x0$a;
-.super Ljava/lang/Object;
-.source "OperatorDistinctUntilChanged.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/x0;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/a/x0;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/a/x0<",
-            "**>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lr0/l/a/x0;
-
-    sget-object v1, Lr0/l/e/l;->d:Lr0/l/e/l;
-
-    invoke-direct {v0, v1}, Lr0/l/a/x0;-><init>(Lr0/k/b;)V
-
-    sput-object v0, Lr0/l/a/x0$a;->a:Lr0/l/a/x0;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/x0.smali b/com.discord/smali_classes2/r0/l/a/x0.smali
deleted file mode 100644
index 2533cff3b4..0000000000
--- a/com.discord/smali_classes2/r0/l/a/x0.smali
+++ /dev/null
@@ -1,144 +0,0 @@
-.class public final Lr0/l/a/x0;
-.super Ljava/lang/Object;
-.source "OperatorDistinctUntilChanged.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-.implements Lrx/functions/Func2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/a/x0$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "U:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;",
-        "Lrx/functions/Func2<",
-        "TU;TU;",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-TT;+TU;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/functions/Func2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Func2<",
-            "-TU;-TU;",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/k/b<",
-            "-TT;+TU;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/x0;->d:Lr0/k/b;
-
-    iput-object p0, p0, Lr0/l/a/x0;->e:Lrx/functions/Func2;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/functions/Func2;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Func2<",
-            "-TU;-TU;",
-            "Ljava/lang/Boolean;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lr0/l/e/l;->d:Lr0/l/e/l;
-
-    iput-object v0, p0, Lr0/l/a/x0;->d:Lr0/k/b;
-
-    iput-object p1, p0, Lr0/l/a/x0;->e:Lrx/functions/Func2;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/w0;
-
-    invoke-direct {v0, p0, p1, p1}, Lr0/l/a/w0;-><init>(Lr0/l/a/x0;Lrx/Subscriber;Lrx/Subscriber;)V
-
-    return-object v0
-.end method
-
-.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    if-eq p1, p2, :cond_1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1, p2}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    :goto_1
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/x1.smali b/com.discord/smali_classes2/r0/l/a/x1.smali
deleted file mode 100644
index b413cb2dc9..0000000000
--- a/com.discord/smali_classes2/r0/l/a/x1.smali
+++ /dev/null
@@ -1,138 +0,0 @@
-.class public Lr0/l/a/x1;
-.super Lrx/Subscriber;
-.source "OperatorSkipWhile.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:Z
-
-.field public e:I
-
-.field public final synthetic f:Lrx/Subscriber;
-
-.field public final synthetic g:Lr0/l/a/z1;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/z1;Lrx/Subscriber;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/x1;->g:Lr0/l/a/z1;
-
-    iput-object p3, p0, Lr0/l/a/x1;->f:Lrx/Subscriber;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lr0/l/a/x1;->d:Z
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/x1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/x1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/l/a/x1;->d:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/a/x1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Lr0/l/a/x1;->g:Lr0/l/a/z1;
-
-    iget-object v0, v0, Lr0/l/a/z1;->d:Lrx/functions/Func2;
-
-    iget v1, p0, Lr0/l/a/x1;->e:I
-
-    add-int/lit8 v2, v1, 0x1
-
-    iput v2, p0, Lr0/l/a/x1;->e:I
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-interface {v0, p1, v1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lr0/l/a/x1;->d:Z
-
-    iget-object v0, p0, Lr0/l/a/x1;->f:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_1
-    const-wide/16 v0, 0x1
-
-    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
-
-    :goto_0
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/a/x1;->f:Lrx/Subscriber;
-
-    invoke-static {v0, v1, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/y.smali b/com.discord/smali_classes2/r0/l/a/y.smali
deleted file mode 100644
index 7f09f5a013..0000000000
--- a/com.discord/smali_classes2/r0/l/a/y.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class public Lr0/l/a/y;
-.super Ljava/lang/Object;
-.source "OnSubscribeRedo.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "Lr0/f<",
-        "*>;",
-        "Lr0/f<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/b0;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/b0;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/y;->d:Lr0/l/a/b0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/a/x;
-
-    invoke-direct {v0, p0, p1, p1}, Lr0/l/a/x;-><init>(Lr0/l/a/y;Lrx/Subscriber;Lrx/Subscriber;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/y0.smali b/com.discord/smali_classes2/r0/l/a/y0.smali
deleted file mode 100644
index 14de2ea4c9..0000000000
--- a/com.discord/smali_classes2/r0/l/a/y0.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public Lr0/l/a/y0;
-.super Ljava/lang/Object;
-.source "OperatorDoOnSubscribe.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action0;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action0;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/y0;->d:Lrx/functions/Action0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/y0;->d:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    new-instance v0, Lr0/n/e;
-
-    invoke-direct {v0, p1, p1}, Lr0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/y1.smali b/com.discord/smali_classes2/r0/l/a/y1.smali
deleted file mode 100644
index e799f8e1d7..0000000000
--- a/com.discord/smali_classes2/r0/l/a/y1.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public final Lr0/l/a/y1;
-.super Ljava/lang/Object;
-.source "OperatorSkipWhile.java"
-
-# interfaces
-.implements Lrx/functions/Func2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func2<",
-        "TT;",
-        "Ljava/lang/Integer;",
-        "Ljava/lang/Boolean;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/k/b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/y1;->d:Lr0/k/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p2, Ljava/lang/Integer;
-
-    iget-object p2, p0, Lr0/l/a/y1;->d:Lr0/k/b;
-
-    invoke-interface {p2, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Boolean;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/z$a.smali b/com.discord/smali_classes2/r0/l/a/z$a.smali
deleted file mode 100644
index 91c7cd29ec..0000000000
--- a/com.discord/smali_classes2/r0/l/a/z$a.smali
+++ /dev/null
@@ -1,127 +0,0 @@
-.class public Lr0/l/a/z$a;
-.super Lrx/Subscriber;
-.source "OnSubscribeRedo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/z;->call()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/a/z;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/z;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/a/z$a;->d:Lr0/l/a/z;
-
-    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/z$a;->d:Lr0/l/a/z;
-
-    iget-object v0, v0, Lr0/l/a/z;->e:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/a/z$a;->d:Lr0/l/a/z;
-
-    iget-object v0, v0, Lr0/l/a/z;->e:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 4
-
-    iget-object p1, p0, Lr0/l/a/z$a;->d:Lr0/l/a/z;
-
-    iget-object p1, p1, Lr0/l/a/z;->e:Lrx/Subscriber;
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    iget-object p1, p0, Lr0/l/a/z$a;->d:Lr0/l/a/z;
-
-    iget-object p1, p1, Lr0/l/a/z;->f:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    const-wide/16 v2, 0x0
-
-    cmp-long p1, v0, v2
-
-    if-lez p1, :cond_0
-
-    iget-object p1, p0, Lr0/l/a/z$a;->d:Lr0/l/a/z;
-
-    iget-object v0, p1, Lr0/l/a/z;->g:Lrx/Scheduler$Worker;
-
-    iget-object p1, p1, Lr0/l/a/z;->h:Lrx/functions/Action0;
-
-    invoke-virtual {v0, p1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p0, Lr0/l/a/z$a;->d:Lr0/l/a/z;
-
-    iget-object p1, p1, Lr0/l/a/z;->i:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public setProducer(Lrx/Producer;)V
-    .locals 2
-
-    const-wide v0, 0x7fffffffffffffffL
-
-    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/z.smali b/com.discord/smali_classes2/r0/l/a/z.smali
deleted file mode 100644
index b6d4186fac..0000000000
--- a/com.discord/smali_classes2/r0/l/a/z.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class public Lr0/l/a/z;
-.super Ljava/lang/Object;
-.source "OnSubscribeRedo.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lrx/Observable;
-
-.field public final synthetic e:Lrx/Subscriber;
-
-.field public final synthetic f:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final synthetic g:Lrx/Scheduler$Worker;
-
-.field public final synthetic h:Lrx/functions/Action0;
-
-.field public final synthetic i:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/a/b0;Lrx/Observable;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicLong;Lrx/Scheduler$Worker;Lrx/functions/Action0;Ljava/util/concurrent/atomic/AtomicBoolean;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/a/z;->d:Lrx/Observable;
-
-    iput-object p3, p0, Lr0/l/a/z;->e:Lrx/Subscriber;
-
-    iput-object p4, p0, Lr0/l/a/z;->f:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iput-object p5, p0, Lr0/l/a/z;->g:Lrx/Scheduler$Worker;
-
-    iput-object p6, p0, Lr0/l/a/z;->h:Lrx/functions/Action0;
-
-    iput-object p7, p0, Lr0/l/a/z;->i:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/a/z;->d:Lrx/Observable;
-
-    new-instance v1, Lr0/l/a/z$a;
-
-    iget-object v2, p0, Lr0/l/a/z;->e:Lrx/Subscriber;
-
-    invoke-direct {v1, p0, v2}, Lr0/l/a/z$a;-><init>(Lr0/l/a/z;Lrx/Subscriber;)V
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/a/z0.smali b/com.discord/smali_classes2/r0/l/a/z0.smali
deleted file mode 100644
index 3760e368f1..0000000000
--- a/com.discord/smali_classes2/r0/l/a/z0.smali
+++ /dev/null
@@ -1,57 +0,0 @@
-.class public Lr0/l/a/z0;
-.super Ljava/lang/Object;
-.source "OperatorDoOnUnsubscribe.java"
-
-# interfaces
-.implements Lrx/Observable$b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$b<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action0;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action0;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/a/z0;->d:Lrx/functions/Action0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/a/z0;->d:Lrx/functions/Action0;
-
-    new-instance v1, Lr0/r/a;
-
-    invoke-direct {v1, v0}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    new-instance v0, Lr0/n/e;
-
-    invoke-direct {v0, p1, p1}, Lr0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/b/a$a.smali b/com.discord/smali_classes2/r0/l/b/a$a.smali
deleted file mode 100644
index f8b2f50343..0000000000
--- a/com.discord/smali_classes2/r0/l/b/a$a.smali
+++ /dev/null
@@ -1,35 +0,0 @@
-.class public final Lr0/l/b/a$a;
-.super Ljava/lang/Object;
-.source "ProducerArbiter.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/b/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/b/a.smali b/com.discord/smali_classes2/r0/l/b/a.smali
deleted file mode 100644
index 4eb7b03798..0000000000
--- a/com.discord/smali_classes2/r0/l/b/a.smali
+++ /dev/null
@@ -1,495 +0,0 @@
-.class public final Lr0/l/b/a;
-.super Ljava/lang/Object;
-.source "ProducerArbiter.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# static fields
-.field public static final j:Lrx/Producer;
-
-
-# instance fields
-.field public d:J
-
-.field public e:Lrx/Producer;
-
-.field public f:Z
-
-.field public g:J
-
-.field public h:J
-
-.field public i:Lrx/Producer;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/b/a$a;
-
-    invoke-direct {v0}, Lr0/l/b/a$a;-><init>()V
-
-    sput-object v0, Lr0/l/b/a;->j:Lrx/Producer;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 14
-
-    :cond_0
-    :goto_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-wide v0, p0, Lr0/l/b/a;->g:J
-
-    iget-wide v2, p0, Lr0/l/b/a;->h:J
-
-    iget-object v4, p0, Lr0/l/b/a;->i:Lrx/Producer;
-
-    const-wide/16 v5, 0x0
-
-    cmp-long v7, v0, v5
-
-    if-nez v7, :cond_1
-
-    cmp-long v8, v2, v5
-
-    if-nez v8, :cond_1
-
-    if-nez v4, :cond_1
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lr0/l/b/a;->f:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    iput-wide v5, p0, Lr0/l/b/a;->g:J
-
-    iput-wide v5, p0, Lr0/l/b/a;->h:J
-
-    const/4 v8, 0x0
-
-    iput-object v8, p0, Lr0/l/b/a;->i:Lrx/Producer;
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-wide v9, p0, Lr0/l/b/a;->d:J
-
-    const-wide v11, 0x7fffffffffffffffL
-
-    cmp-long v13, v9, v11
-
-    if-eqz v13, :cond_5
-
-    add-long/2addr v9, v0
-
-    cmp-long v13, v9, v5
-
-    if-ltz v13, :cond_4
-
-    cmp-long v13, v9, v11
-
-    if-nez v13, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    sub-long/2addr v9, v2
-
-    cmp-long v2, v9, v5
-
-    if-ltz v2, :cond_3
-
-    iput-wide v9, p0, Lr0/l/b/a;->d:J
-
-    goto :goto_2
-
-    :cond_3
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "more produced than requested"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_4
-    :goto_1
-    iput-wide v11, p0, Lr0/l/b/a;->d:J
-
-    move-wide v9, v11
-
-    :cond_5
-    :goto_2
-    if-eqz v4, :cond_7
-
-    sget-object v0, Lr0/l/b/a;->j:Lrx/Producer;
-
-    if-ne v4, v0, :cond_6
-
-    iput-object v8, p0, Lr0/l/b/a;->e:Lrx/Producer;
-
-    goto :goto_0
-
-    :cond_6
-    iput-object v4, p0, Lr0/l/b/a;->e:Lrx/Producer;
-
-    invoke-interface {v4, v9, v10}, Lrx/Producer;->m(J)V
-
-    goto :goto_0
-
-    :cond_7
-    iget-object v2, p0, Lr0/l/b/a;->e:Lrx/Producer;
-
-    if-eqz v2, :cond_0
-
-    if-eqz v7, :cond_0
-
-    invoke-interface {v2, v0, v1}, Lrx/Producer;->m(J)V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-.end method
-
-.method public b(J)V
-    .locals 7
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_3
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v2, p0, Lr0/l/b/a;->f:Z
-
-    if-eqz v2, :cond_0
-
-    iget-wide v0, p0, Lr0/l/b/a;->h:J
-
-    add-long/2addr v0, p1
-
-    iput-wide v0, p0, Lr0/l/b/a;->h:J
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v2, 0x1
-
-    iput-boolean v2, p0, Lr0/l/b/a;->f:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :try_start_1
-    iget-wide v2, p0, Lr0/l/b/a;->d:J
-
-    const-wide v4, 0x7fffffffffffffffL
-
-    cmp-long v6, v2, v4
-
-    if-eqz v6, :cond_2
-
-    sub-long/2addr v2, p1
-
-    cmp-long p1, v2, v0
-
-    if-ltz p1, :cond_1
-
-    iput-wide v2, p0, Lr0/l/b/a;->d:J
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string p2, "more items arrived than were requested"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :cond_2
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/b/a;->a()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-enter p0
-
-    const/4 p2, 0x0
-
-    :try_start_2
-    iput-boolean p2, p0, Lr0/l/b/a;->f:Z
-
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_3
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    throw p1
-
-    :catchall_2
-    move-exception p1
-
-    :try_start_4
-    monitor-exit p0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "n > 0 required"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public c(Lrx/Producer;)V
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/l/b/a;->f:Z
-
-    if-eqz v0, :cond_1
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/b/a;->j:Lrx/Producer;
-
-    :cond_0
-    iput-object p1, p0, Lr0/l/b/a;->i:Lrx/Producer;
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/b/a;->f:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :try_start_1
-    iput-object p1, p0, Lr0/l/b/a;->e:Lrx/Producer;
-
-    if-eqz p1, :cond_2
-
-    iget-wide v0, p0, Lr0/l/b/a;->d:J
-
-    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
-
-    :cond_2
-    invoke-virtual {p0}, Lr0/l/b/a;->a()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-enter p0
-
-    const/4 v0, 0x0
-
-    :try_start_2
-    iput-boolean v0, p0, Lr0/l/b/a;->f:Z
-
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_3
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    throw p1
-
-    :catchall_2
-    move-exception p1
-
-    :try_start_4
-    monitor-exit p0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    throw p1
-.end method
-
-.method public m(J)V
-    .locals 5
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_4
-
-    if-nez v2, :cond_0
-
-    return-void
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v2, p0, Lr0/l/b/a;->f:Z
-
-    if-eqz v2, :cond_1
-
-    iget-wide v0, p0, Lr0/l/b/a;->g:J
-
-    add-long/2addr v0, p1
-
-    iput-wide v0, p0, Lr0/l/b/a;->g:J
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    const/4 v2, 0x1
-
-    iput-boolean v2, p0, Lr0/l/b/a;->f:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_2
-
-    :try_start_1
-    iget-wide v2, p0, Lr0/l/b/a;->d:J
-
-    add-long/2addr v2, p1
-
-    cmp-long v4, v2, v0
-
-    if-gez v4, :cond_2
-
-    const-wide v2, 0x7fffffffffffffffL
-
-    :cond_2
-    iput-wide v2, p0, Lr0/l/b/a;->d:J
-
-    iget-object v0, p0, Lr0/l/b/a;->e:Lrx/Producer;
-
-    if-eqz v0, :cond_3
-
-    invoke-interface {v0, p1, p2}, Lrx/Producer;->m(J)V
-
-    :cond_3
-    invoke-virtual {p0}, Lr0/l/b/a;->a()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-enter p0
-
-    const/4 p2, 0x0
-
-    :try_start_2
-    iput-boolean p2, p0, Lr0/l/b/a;->f:Z
-
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    throw p1
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_3
-    monitor-exit p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    throw p1
-
-    :catchall_2
-    move-exception p1
-
-    :try_start_4
-    monitor-exit p0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    throw p1
-
-    :cond_4
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "n >= 0 required"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/b/b.smali b/com.discord/smali_classes2/r0/l/b/b.smali
deleted file mode 100644
index 21fe037f6d..0000000000
--- a/com.discord/smali_classes2/r0/l/b/b.smali
+++ /dev/null
@@ -1,224 +0,0 @@
-.class public final Lr0/l/b/b;
-.super Ljava/util/concurrent/atomic/AtomicInteger;
-.source "SingleDelayedProducer.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicInteger;",
-        "Lrx/Producer;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = -0x27e09bdfa51658b2L
-
-
-# instance fields
-.field public final child:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public value:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/b/b;->child:Lrx/Subscriber;
-
-    return-void
-.end method
-
-.method public static a(Lrx/Subscriber;Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lrx/Subscriber<",
-            "-TT;>;TT;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    :try_start_0
-    invoke-interface {p0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    return-void
-
-    :cond_1
-    invoke-interface {p0}, Lr0/g;->onCompleted()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0, p0, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public b(Ljava/lang/Object;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    :goto_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iput-object p1, p0, Lr0/l/b/b;->value:Ljava/lang/Object;
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x2
-
-    if-ne v0, v1, :cond_1
-
-    const/4 v0, 0x3
-
-    invoke-virtual {p0, v1, v0}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/b/b;->child:Lrx/Subscriber;
-
-    invoke-static {v0, p1}, Lr0/l/b/b;->a(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    :cond_1
-    return-void
-.end method
-
-.method public m(J)V
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_3
-
-    if-nez v2, :cond_0
-
-    return-void
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    const/4 p1, 0x0
-
-    const/4 p2, 0x2
-
-    invoke-virtual {p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result p1
-
-    if-nez p1, :cond_2
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p2, 0x1
-
-    if-ne p1, p2, :cond_2
-
-    const/4 p1, 0x3
-
-    invoke-virtual {p0, p2, p1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Lr0/l/b/b;->child:Lrx/Subscriber;
-
-    iget-object p2, p0, Lr0/l/b/b;->value:Ljava/lang/Object;
-
-    invoke-static {p1, p2}, Lr0/l/b/b;->a(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    :cond_2
-    return-void
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "n >= 0 required"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/b/c.smali b/com.discord/smali_classes2/r0/l/b/c.smali
deleted file mode 100644
index 9cb7e1a0fc..0000000000
--- a/com.discord/smali_classes2/r0/l/b/c.smali
+++ /dev/null
@@ -1,138 +0,0 @@
-.class public final Lr0/l/b/c;
-.super Ljava/util/concurrent/atomic/AtomicBoolean;
-.source "SingleProducer.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicBoolean;",
-        "Lrx/Producer;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = -0x2e8a53b866dafe2cL
-
-
-# instance fields
-.field public final child:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final value:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;TT;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
-
-    iput-object p1, p0, Lr0/l/b/c;->child:Lrx/Subscriber;
-
-    iput-object p2, p0, Lr0/l/b/c;->value:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public m(J)V
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-ltz v2, :cond_4
-
-    if-nez v2, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 p1, 0x0
-
-    const/4 p2, 0x1
-
-    invoke-virtual {p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    iget-object p1, p0, Lr0/l/b/c;->child:Lrx/Subscriber;
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object p2, p0, Lr0/l/b/c;->value:Ljava/lang/Object;
-
-    :try_start_0
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_2
-
-    return-void
-
-    :cond_2
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    :cond_3
-    :goto_0
-    return-void
-
-    :cond_4
-    new-instance p1, Ljava/lang/IllegalArgumentException;
-
-    const-string p2, "n >= 0 required"
-
-    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/a$a$a.smali b/com.discord/smali_classes2/r0/l/c/a$a$a.smali
deleted file mode 100644
index acf53f9eb3..0000000000
--- a/com.discord/smali_classes2/r0/l/c/a$a$a.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public Lr0/l/c/a$a$a;
-.super Ljava/lang/Object;
-.source "CachedThreadScheduler.java"
-
-# interfaces
-.implements Ljava/util/concurrent/ThreadFactory;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/concurrent/ThreadFactory;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/a$a;Ljava/util/concurrent/ThreadFactory;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/c/a$a$a;->d:Ljava/util/concurrent/ThreadFactory;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/c/a$a$a;->d:Ljava/util/concurrent/ThreadFactory;
-
-    invoke-interface {v0, p1}, Ljava/util/concurrent/ThreadFactory;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
-
-    move-result-object p1
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, " (Evictor)"
-
-    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
-
-    invoke-virtual {p1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/a$a$b.smali b/com.discord/smali_classes2/r0/l/c/a$a$b.smali
deleted file mode 100644
index e499332b58..0000000000
--- a/com.discord/smali_classes2/r0/l/c/a$a$b.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public Lr0/l/c/a$a$b;
-.super Ljava/lang/Object;
-.source "CachedThreadScheduler.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/c/a$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/a$a;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/c/a$a$b;->d:Lr0/l/c/a$a;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 8
-
-    iget-object v0, p0, Lr0/l/c/a$a$b;->d:Lr0/l/c/a$a;
-
-    iget-object v1, v0, Lr0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v1
-
-    iget-object v3, v0, Lr0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v3}, Ljava/util/concurrent/ConcurrentLinkedQueue;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :cond_0
-    :goto_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_1
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Lr0/l/c/a$c;
-
-    iget-wide v5, v4, Lr0/l/c/a$c;->l:J
-
-    cmp-long v7, v5, v1
-
-    if-gtz v7, :cond_1
-
-    iget-object v5, v0, Lr0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v5, v4}, Ljava/util/concurrent/ConcurrentLinkedQueue;->remove(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_0
-
-    iget-object v5, v0, Lr0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v5, v4}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/a$a.smali b/com.discord/smali_classes2/r0/l/c/a$a.smali
deleted file mode 100644
index fdd2374161..0000000000
--- a/com.discord/smali_classes2/r0/l/c/a$a.smali
+++ /dev/null
@@ -1,167 +0,0 @@
-.class public final Lr0/l/c/a$a;
-.super Ljava/lang/Object;
-.source "CachedThreadScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/ThreadFactory;
-
-.field public final b:J
-
-.field public final c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
-            "Lr0/l/c/a$c;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final d:Lrx/subscriptions/CompositeSubscription;
-
-.field public final e:Ljava/util/concurrent/ScheduledExecutorService;
-
-.field public final f:Ljava/util/concurrent/Future;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/Future<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
-    .locals 7
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/a$a;->a:Ljava/util/concurrent/ThreadFactory;
-
-    if-eqz p4, :cond_0
-
-    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide p2
-
-    goto :goto_0
-
-    :cond_0
-    const-wide/16 p2, 0x0
-
-    :goto_0
-    iput-wide p2, p0, Lr0/l/c/a$a;->b:J
-
-    new-instance p2, Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-direct {p2}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
-
-    iput-object p2, p0, Lr0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    new-instance p2, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {p2}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object p2, p0, Lr0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
-
-    const/4 p2, 0x0
-
-    if-eqz p4, :cond_1
-
-    const/4 p2, 0x1
-
-    new-instance p3, Lr0/l/c/a$a$a;
-
-    invoke-direct {p3, p0, p1}, Lr0/l/c/a$a$a;-><init>(Lr0/l/c/a$a;Ljava/util/concurrent/ThreadFactory;)V
-
-    invoke-static {p2, p3}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
-
-    move-result-object p2
-
-    invoke-static {p2}, Lr0/l/c/g;->g(Ljava/util/concurrent/ScheduledExecutorService;)Z
-
-    new-instance v1, Lr0/l/c/a$a$b;
-
-    invoke-direct {v1, p0}, Lr0/l/c/a$a$b;-><init>(Lr0/l/c/a$a;)V
-
-    iget-wide v4, p0, Lr0/l/c/a$a;->b:J
-
-    sget-object v6, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
-
-    move-object v0, p2
-
-    move-wide v2, v4
-
-    invoke-interface/range {v0 .. v6}, Ljava/util/concurrent/ScheduledExecutorService;->scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    move-result-object p1
-
-    goto :goto_1
-
-    :cond_1
-    move-object p1, p2
-
-    :goto_1
-    iput-object p2, p0, Lr0/l/c/a$a;->e:Ljava/util/concurrent/ScheduledExecutorService;
-
-    iput-object p1, p0, Lr0/l/c/a$a;->f:Ljava/util/concurrent/Future;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/c/a$a;->f:Ljava/util/concurrent/Future;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/c/a$a;->f:Ljava/util/concurrent/Future;
-
-    const/4 v1, 0x1
-
-    invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/a$a;->e:Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/c/a$a;->e:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_1
-    iget-object v0, p0, Lr0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v1}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/a$b$a.smali b/com.discord/smali_classes2/r0/l/c/a$b$a.smali
deleted file mode 100644
index d44721f020..0000000000
--- a/com.discord/smali_classes2/r0/l/c/a$b$a.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class public Lr0/l/c/a$b$a;
-.super Ljava/lang/Object;
-.source "CachedThreadScheduler.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/a$b;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/functions/Action0;
-
-.field public final synthetic e:Lr0/l/c/a$b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/a$b;Lrx/functions/Action0;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/c/a$b$a;->e:Lr0/l/c/a$b;
-
-    iput-object p2, p0, Lr0/l/c/a$b$a;->d:Lrx/functions/Action0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/a$b$a;->e:Lr0/l/c/a$b;
-
-    iget-object v0, v0, Lr0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/a$b$a;->d:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/a$b.smali b/com.discord/smali_classes2/r0/l/c/a$b.smali
deleted file mode 100644
index 99fad2b2a6..0000000000
--- a/com.discord/smali_classes2/r0/l/c/a$b.smali
+++ /dev/null
@@ -1,224 +0,0 @@
-.class public final Lr0/l/c/a$b;
-.super Lrx/Scheduler$Worker;
-.source "CachedThreadScheduler.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/subscriptions/CompositeSubscription;
-
-.field public final e:Lr0/l/c/a$a;
-
-.field public final f:Lr0/l/c/a$c;
-
-.field public final g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/a$a;)V
-    .locals 2
-
-    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
-
-    new-instance v0, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
-
-    iput-object p1, p0, Lr0/l/c/a$b;->e:Lr0/l/c/a$a;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/a$b;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    iget-object v0, p1, Lr0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/l/c/a;->e:Lr0/l/c/a$c;
-
-    goto :goto_1
-
-    :cond_0
-    iget-object v0, p1, Lr0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p1, Lr0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/c/a$c;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_1
-    new-instance v0, Lr0/l/c/a$c;
-
-    iget-object v1, p1, Lr0/l/c/a$a;->a:Ljava/util/concurrent/ThreadFactory;
-
-    invoke-direct {v0, v1}, Lr0/l/c/a$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    iget-object p1, p1, Lr0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    :goto_0
-    move-object p1, v0
-
-    :goto_1
-    iput-object p1, p0, Lr0/l/c/a$b;->f:Lr0/l/c/a$c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lrx/functions/Action0;)Lrx/Subscription;
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p0, p1, v0, v1, v2}, Lr0/l/c/a$b;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/a$b;->f:Lr0/l/c/a$c;
-
-    new-instance v1, Lr0/l/c/a$b$a;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/c/a$b$a;-><init>(Lr0/l/c/a$b;Lrx/functions/Action0;)V
-
-    invoke-virtual {v0, v1, p2, p3, p4}, Lr0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lr0/l/c/i;
-
-    move-result-object p1
-
-    iget-object p2, p0, Lr0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {p2, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    iget-object p2, p0, Lr0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
-
-    iget-object p3, p1, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    new-instance p4, Lr0/l/c/i$c;
-
-    invoke-direct {p4, p1, p2}, Lr0/l/c/i$c;-><init>(Lr0/l/c/i;Lrx/subscriptions/CompositeSubscription;)V
-
-    invoke-virtual {p3, p4}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
-
-    return-object p1
-.end method
-
-.method public call()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/c/a$b;->e:Lr0/l/c/a$a;
-
-    iget-object v1, p0, Lr0/l/c/a$b;->f:Lr0/l/c/a$c;
-
-    if-eqz v0, :cond_0
-
-    invoke-static {}, Ljava/lang/System;->nanoTime()J
-
-    move-result-wide v2
-
-    iget-wide v4, v0, Lr0/l/c/a$a;->b:J
-
-    add-long/2addr v2, v4
-
-    iput-wide v2, v1, Lr0/l/c/a$c;->l:J
-
-    iget-object v0, v0, Lr0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/c/a$b;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/c/a$b;->f:Lr0/l/c/a$c;
-
-    invoke-virtual {v0, p0}, Lr0/l/c/g;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/a$c.smali b/com.discord/smali_classes2/r0/l/c/a$c.smali
deleted file mode 100644
index 51e376179c..0000000000
--- a/com.discord/smali_classes2/r0/l/c/a$c.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public final Lr0/l/c/a$c;
-.super Lr0/l/c/g;
-.source "CachedThreadScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public l:J
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
-    .locals 2
-
-    invoke-direct {p0, p1}, Lr0/l/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    const-wide/16 v0, 0x0
-
-    iput-wide v0, p0, Lr0/l/c/a$c;->l:J
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/a.smali b/com.discord/smali_classes2/r0/l/c/a.smali
deleted file mode 100644
index b68244c150..0000000000
--- a/com.discord/smali_classes2/r0/l/c/a.smali
+++ /dev/null
@@ -1,183 +0,0 @@
-.class public final Lr0/l/c/a;
-.super Lrx/Scheduler;
-.source "CachedThreadScheduler.java"
-
-# interfaces
-.implements Lr0/l/c/j;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/c/a$c;,
-        Lr0/l/c/a$b;,
-        Lr0/l/c/a$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:J
-
-.field public static final d:Ljava/util/concurrent/TimeUnit;
-
-.field public static final e:Lr0/l/c/a$c;
-
-.field public static final f:Lr0/l/c/a$a;
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/ThreadFactory;
-
-.field public final b:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/c/a$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
-    sput-object v0, Lr0/l/c/a;->d:Ljava/util/concurrent/TimeUnit;
-
-    new-instance v0, Lr0/l/c/a$c;
-
-    sget-object v1, Lr0/l/e/i;->d:Ljava/util/concurrent/ThreadFactory;
-
-    invoke-direct {v0, v1}, Lr0/l/c/a$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    sput-object v0, Lr0/l/c/a;->e:Lr0/l/c/a$c;
-
-    invoke-virtual {v0}, Lr0/l/c/g;->unsubscribe()V
-
-    new-instance v0, Lr0/l/c/a$a;
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x0
-
-    invoke-direct {v0, v1, v2, v3, v1}, Lr0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
-
-    sput-object v0, Lr0/l/c/a;->f:Lr0/l/c/a$a;
-
-    invoke-virtual {v0}, Lr0/l/c/a$a;->a()V
-
-    const-string v0, "rx.io-scheduler.keepalive"
-
-    const/16 v1, 0x3c
-
-    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    int-to-long v0, v0
-
-    sput-wide v0, Lr0/l/c/a;->c:J
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
-    .locals 4
-
-    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/a;->a:Ljava/util/concurrent/ThreadFactory;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v0, Lr0/l/c/a;->f:Lr0/l/c/a$a;
-
-    invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object p1, p0, Lr0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance p1, Lr0/l/c/a$a;
-
-    iget-object v0, p0, Lr0/l/c/a;->a:Ljava/util/concurrent/ThreadFactory;
-
-    sget-wide v1, Lr0/l/c/a;->c:J
-
-    sget-object v3, Lr0/l/c/a;->d:Ljava/util/concurrent/TimeUnit;
-
-    invoke-direct {p1, v0, v1, v2, v3}, Lr0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
-
-    iget-object v0, p0, Lr0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/c/a;->f:Lr0/l/c/a$a;
-
-    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p1}, Lr0/l/c/a$a;->a()V
-
-    :cond_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lrx/Scheduler$Worker;
-    .locals 2
-
-    new-instance v0, Lr0/l/c/a$b;
-
-    iget-object v1, p0, Lr0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lr0/l/c/a$a;
-
-    invoke-direct {v0, v1}, Lr0/l/c/a$b;-><init>(Lr0/l/c/a$a;)V
-
-    return-object v0
-.end method
-
-.method public shutdown()V
-    .locals 3
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/c/a$a;
-
-    sget-object v1, Lr0/l/c/a;->f:Lr0/l/c/a$a;
-
-    if-ne v0, v1, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v2, p0, Lr0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v0}, Lr0/l/c/a$a;->a()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/b$a$a.smali b/com.discord/smali_classes2/r0/l/c/b$a$a.smali
deleted file mode 100644
index f76eebe1ae..0000000000
--- a/com.discord/smali_classes2/r0/l/c/b$a$a.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class public Lr0/l/c/b$a$a;
-.super Ljava/lang/Object;
-.source "EventLoopsScheduler.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/b$a;->a(Lrx/functions/Action0;)Lrx/Subscription;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/functions/Action0;
-
-.field public final synthetic e:Lr0/l/c/b$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/b$a;Lrx/functions/Action0;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/c/b$a$a;->e:Lr0/l/c/b$a;
-
-    iput-object p2, p0, Lr0/l/c/b$a$a;->d:Lrx/functions/Action0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/b$a$a;->e:Lr0/l/c/b$a;
-
-    iget-object v0, v0, Lr0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/b$a$a;->d:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/b$a$b.smali b/com.discord/smali_classes2/r0/l/c/b$a$b.smali
deleted file mode 100644
index 7abf9bce47..0000000000
--- a/com.discord/smali_classes2/r0/l/c/b$a$b.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class public Lr0/l/c/b$a$b;
-.super Ljava/lang/Object;
-.source "EventLoopsScheduler.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/b$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/functions/Action0;
-
-.field public final synthetic e:Lr0/l/c/b$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/b$a;Lrx/functions/Action0;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/c/b$a$b;->e:Lr0/l/c/b$a;
-
-    iput-object p2, p0, Lr0/l/c/b$a$b;->d:Lrx/functions/Action0;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/b$a$b;->e:Lr0/l/c/b$a;
-
-    iget-object v0, v0, Lr0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/b$a$b;->d:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/b$a.smali b/com.discord/smali_classes2/r0/l/c/b$a.smali
deleted file mode 100644
index 47dfd7a7e1..0000000000
--- a/com.discord/smali_classes2/r0/l/c/b$a.smali
+++ /dev/null
@@ -1,206 +0,0 @@
-.class public final Lr0/l/c/b$a;
-.super Lrx/Scheduler$Worker;
-.source "EventLoopsScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/internal/util/SubscriptionList;
-
-.field public final e:Lrx/subscriptions/CompositeSubscription;
-
-.field public final f:Lrx/internal/util/SubscriptionList;
-
-.field public final g:Lr0/l/c/b$c;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/b$c;)V
-    .locals 5
-
-    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
-
-    new-instance v0, Lrx/internal/util/SubscriptionList;
-
-    invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/b$a;->d:Lrx/internal/util/SubscriptionList;
-
-    new-instance v0, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/b$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    new-instance v1, Lrx/internal/util/SubscriptionList;
-
-    const/4 v2, 0x2
-
-    new-array v2, v2, [Lrx/Subscription;
-
-    iget-object v3, p0, Lr0/l/c/b$a;->d:Lrx/internal/util/SubscriptionList;
-
-    const/4 v4, 0x0
-
-    aput-object v3, v2, v4
-
-    const/4 v3, 0x1
-
-    aput-object v0, v2, v3
-
-    invoke-direct {v1, v2}, Lrx/internal/util/SubscriptionList;-><init>([Lrx/Subscription;)V
-
-    iput-object v1, p0, Lr0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
-
-    iput-object p1, p0, Lr0/l/c/b$a;->g:Lr0/l/c/b$c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lrx/functions/Action0;)Lrx/Subscription;
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/b$a;->g:Lr0/l/c/b$c;
-
-    new-instance v1, Lr0/l/c/b$a$a;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/c/b$a$a;-><init>(Lr0/l/c/b$a;Lrx/functions/Action0;)V
-
-    iget-object p1, p0, Lr0/l/c/b$a;->d:Lrx/internal/util/SubscriptionList;
-
-    if-eqz v0, :cond_1
-
-    invoke-static {v1}, Lr0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
-
-    move-result-object v1
-
-    new-instance v2, Lr0/l/c/i;
-
-    invoke-direct {v2, v1, p1}, Lr0/l/c/i;-><init>(Lrx/functions/Action0;Lrx/internal/util/SubscriptionList;)V
-
-    invoke-virtual {p1, v2}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
-
-    iget-object p1, v0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {p1, v2}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
-
-    move-result-object p1
-
-    invoke-virtual {v2, p1}, Lr0/l/c/i;->a(Ljava/util/concurrent/Future;)V
-
-    return-object v2
-
-    :cond_1
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/b$a;->g:Lr0/l/c/b$c;
-
-    new-instance v1, Lr0/l/c/b$a$b;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/c/b$a$b;-><init>(Lr0/l/c/b$a;Lrx/functions/Action0;)V
-
-    iget-object p1, p0, Lr0/l/c/b$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    if-eqz v0, :cond_2
-
-    invoke-static {v1}, Lr0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
-
-    move-result-object v1
-
-    new-instance v2, Lr0/l/c/i;
-
-    invoke-direct {v2, v1, p1}, Lr0/l/c/i;-><init>(Lrx/functions/Action0;Lrx/subscriptions/CompositeSubscription;)V
-
-    invoke-virtual {p1, v2}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    const-wide/16 v3, 0x0
-
-    cmp-long p1, p2, v3
-
-    if-gtz p1, :cond_1
-
-    iget-object p1, v0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {p1, v2}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_1
-    iget-object p1, v0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {p1, v2, p2, p3, p4}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    move-result-object p1
-
-    :goto_0
-    invoke-virtual {v2, p1}, Lr0/l/c/i;->a(Ljava/util/concurrent/Future;)V
-
-    return-object v2
-
-    :cond_2
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
-
-    invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/b$b.smali b/com.discord/smali_classes2/r0/l/c/b$b.smali
deleted file mode 100644
index ac7c2483c3..0000000000
--- a/com.discord/smali_classes2/r0/l/c/b$b.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.class public final Lr0/l/c/b$b;
-.super Ljava/lang/Object;
-.source "EventLoopsScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field public final a:I
-
-.field public final b:[Lr0/l/c/b$c;
-
-.field public c:J
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;I)V
-    .locals 3
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p2, p0, Lr0/l/c/b$b;->a:I
-
-    new-array v0, p2, [Lr0/l/c/b$c;
-
-    iput-object v0, p0, Lr0/l/c/b$b;->b:[Lr0/l/c/b$c;
-
-    const/4 v0, 0x0
-
-    :goto_0
-    if-ge v0, p2, :cond_0
-
-    iget-object v1, p0, Lr0/l/c/b$b;->b:[Lr0/l/c/b$c;
-
-    new-instance v2, Lr0/l/c/b$c;
-
-    invoke-direct {v2, p1}, Lr0/l/c/b$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    aput-object v2, v1, v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lr0/l/c/b$c;
-    .locals 6
-
-    iget v0, p0, Lr0/l/c/b$b;->a:I
-
-    if-nez v0, :cond_0
-
-    sget-object v0, Lr0/l/c/b;->d:Lr0/l/c/b$c;
-
-    return-object v0
-
-    :cond_0
-    iget-object v1, p0, Lr0/l/c/b$b;->b:[Lr0/l/c/b$c;
-
-    iget-wide v2, p0, Lr0/l/c/b$b;->c:J
-
-    const-wide/16 v4, 0x1
-
-    add-long/2addr v4, v2
-
-    iput-wide v4, p0, Lr0/l/c/b$b;->c:J
-
-    int-to-long v4, v0
-
-    rem-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    aget-object v0, v1, v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/b$c.smali b/com.discord/smali_classes2/r0/l/c/b$c.smali
deleted file mode 100644
index 6b39ba17d5..0000000000
--- a/com.discord/smali_classes2/r0/l/c/b$c.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Lr0/l/c/b$c;
-.super Lr0/l/c/g;
-.source "EventLoopsScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/b;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/b.smali b/com.discord/smali_classes2/r0/l/c/b.smali
deleted file mode 100644
index fcc60e42b5..0000000000
--- a/com.discord/smali_classes2/r0/l/c/b.smali
+++ /dev/null
@@ -1,220 +0,0 @@
-.class public final Lr0/l/c/b;
-.super Lrx/Scheduler;
-.source "EventLoopsScheduler.java"
-
-# interfaces
-.implements Lr0/l/c/j;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/c/b$c;,
-        Lr0/l/c/b$a;,
-        Lr0/l/c/b$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:I
-
-.field public static final d:Lr0/l/c/b$c;
-
-.field public static final e:Lr0/l/c/b$b;
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/ThreadFactory;
-
-.field public final b:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/c/b$b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-string v0, "rx.scheduler.max-computation-threads"
-
-    const/4 v1, 0x0
-
-    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Runtime;->availableProcessors()I
-
-    move-result v2
-
-    if-lez v0, :cond_0
-
-    if-le v0, v2, :cond_1
-
-    :cond_0
-    move v0, v2
-
-    :cond_1
-    sput v0, Lr0/l/c/b;->c:I
-
-    new-instance v0, Lr0/l/c/b$c;
-
-    sget-object v2, Lr0/l/e/i;->d:Ljava/util/concurrent/ThreadFactory;
-
-    invoke-direct {v0, v2}, Lr0/l/c/b$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    sput-object v0, Lr0/l/c/b;->d:Lr0/l/c/b$c;
-
-    invoke-virtual {v0}, Lr0/l/c/g;->unsubscribe()V
-
-    new-instance v0, Lr0/l/c/b$b;
-
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v2, v1}, Lr0/l/c/b$b;-><init>(Ljava/util/concurrent/ThreadFactory;I)V
-
-    sput-object v0, Lr0/l/c/b;->e:Lr0/l/c/b$b;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
-    .locals 3
-
-    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/b;->a:Ljava/util/concurrent/ThreadFactory;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v0, Lr0/l/c/b;->e:Lr0/l/c/b$b;
-
-    invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object p1, p0, Lr0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance p1, Lr0/l/c/b$b;
-
-    iget-object v0, p0, Lr0/l/c/b;->a:Ljava/util/concurrent/ThreadFactory;
-
-    sget v1, Lr0/l/c/b;->c:I
-
-    invoke-direct {p1, v0, v1}, Lr0/l/c/b$b;-><init>(Ljava/util/concurrent/ThreadFactory;I)V
-
-    iget-object v0, p0, Lr0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/c/b;->e:Lr0/l/c/b$b;
-
-    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object p1, p1, Lr0/l/c/b$b;->b:[Lr0/l/c/b$c;
-
-    array-length v0, p1
-
-    const/4 v1, 0x0
-
-    :goto_0
-    if-ge v1, v0, :cond_0
-
-    aget-object v2, p1, v1
-
-    invoke-virtual {v2}, Lr0/l/c/g;->unsubscribe()V
-
-    add-int/lit8 v1, v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lrx/Scheduler$Worker;
-    .locals 2
-
-    new-instance v0, Lr0/l/c/b$a;
-
-    iget-object v1, p0, Lr0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lr0/l/c/b$b;
-
-    invoke-virtual {v1}, Lr0/l/c/b$b;->a()Lr0/l/c/b$c;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Lr0/l/c/b$a;-><init>(Lr0/l/c/b$c;)V
-
-    return-object v0
-.end method
-
-.method public shutdown()V
-    .locals 4
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/c/b$b;
-
-    sget-object v1, Lr0/l/c/b;->e:Lr0/l/c/b$b;
-
-    if-ne v0, v1, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v2, p0, Lr0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iget-object v0, v0, Lr0/l/c/b$b;->b:[Lr0/l/c/b$c;
-
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_2
-
-    aget-object v3, v0, v2
-
-    invoke-virtual {v3}, Lr0/l/c/g;->unsubscribe()V
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/c$a$a.smali b/com.discord/smali_classes2/r0/l/c/c$a$a.smali
deleted file mode 100644
index 3c59ad7e3e..0000000000
--- a/com.discord/smali_classes2/r0/l/c/c$a$a.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public Lr0/l/c/c$a$a;
-.super Ljava/lang/Object;
-.source "ExecutorScheduler.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/c$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/r/b;
-
-.field public final synthetic e:Lr0/l/c/c$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/c$a;Lr0/r/b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/c/c$a$a;->e:Lr0/l/c/c$a;
-
-    iput-object p2, p0, Lr0/l/c/c$a$a;->d:Lr0/r/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/c/c$a$a;->e:Lr0/l/c/c$a;
-
-    iget-object v0, v0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-object v1, p0, Lr0/l/c/c$a$a;->d:Lr0/r/b;
-
-    invoke-virtual {v0, v1}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/c$a$b.smali b/com.discord/smali_classes2/r0/l/c/c$a$b.smali
deleted file mode 100644
index e46d6024b4..0000000000
--- a/com.discord/smali_classes2/r0/l/c/c$a$b.smali
+++ /dev/null
@@ -1,93 +0,0 @@
-.class public Lr0/l/c/c$a$b;
-.super Ljava/lang/Object;
-.source "ExecutorScheduler.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/c$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/r/b;
-
-.field public final synthetic e:Lrx/functions/Action0;
-
-.field public final synthetic f:Lrx/Subscription;
-
-.field public final synthetic g:Lr0/l/c/c$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/c$a;Lr0/r/b;Lrx/functions/Action0;Lrx/Subscription;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/c/c$a$b;->g:Lr0/l/c/c$a;
-
-    iput-object p2, p0, Lr0/l/c/c$a$b;->d:Lr0/r/b;
-
-    iput-object p3, p0, Lr0/l/c/c$a$b;->e:Lrx/functions/Action0;
-
-    iput-object p4, p0, Lr0/l/c/c$a$b;->f:Lrx/Subscription;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 3
-
-    iget-object v0, p0, Lr0/l/c/c$a$b;->d:Lr0/r/b;
-
-    invoke-virtual {v0}, Lr0/r/b;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/c$a$b;->g:Lr0/l/c/c$a;
-
-    iget-object v1, p0, Lr0/l/c/c$a$b;->e:Lrx/functions/Action0;
-
-    invoke-virtual {v0, v1}, Lr0/l/c/c$a;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lr0/l/c/c$a$b;->d:Lr0/r/b;
-
-    invoke-virtual {v1, v0}, Lr0/r/b;->a(Lrx/Subscription;)V
-
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    const-class v2, Lr0/l/c/i;
-
-    if-ne v1, v2, :cond_1
-
-    check-cast v0, Lr0/l/c/i;
-
-    iget-object v1, p0, Lr0/l/c/c$a$b;->f:Lrx/Subscription;
-
-    iget-object v0, v0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    invoke-virtual {v0, v1}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
-
-    :cond_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/c$a.smali b/com.discord/smali_classes2/r0/l/c/c$a.smali
deleted file mode 100644
index 25b7efd978..0000000000
--- a/com.discord/smali_classes2/r0/l/c/c$a.smali
+++ /dev/null
@@ -1,349 +0,0 @@
-.class public final Lr0/l/c/c$a;
-.super Lrx/Scheduler$Worker;
-.source "ExecutorScheduler.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/Executor;
-
-.field public final e:Lrx/subscriptions/CompositeSubscription;
-
-.field public final f:Ljava/util/concurrent/ConcurrentLinkedQueue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
-            "Lr0/l/c/i;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field public final h:Ljava/util/concurrent/ScheduledExecutorService;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/Executor;)V
-    .locals 2
-
-    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/c$a;->d:Ljava/util/concurrent/Executor;
-
-    new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    new-instance p1, Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {p1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    sget-object p1, Lr0/l/c/d;->d:Lr0/l/c/d;
-
-    iget-object p1, p1, Lr0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Ljava/util/concurrent/ScheduledExecutorService;
-
-    sget-object v0, Lr0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-ne p1, v0, :cond_0
-
-    sget-object p1, Lr0/l/c/d;->c:Ljava/util/concurrent/ScheduledExecutorService;
-
-    goto :goto_0
-
-    :cond_0
-    sget v0, Lr0/l/c/d;->e:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    array-length v1, p1
-
-    if-lt v0, v1, :cond_1
-
-    const/4 v0, 0x0
-
-    :cond_1
-    sput v0, Lr0/l/c/d;->e:I
-
-    aget-object p1, p1, v0
-
-    :goto_0
-    iput-object p1, p0, Lr0/l/c/c$a;->h:Ljava/util/concurrent/ScheduledExecutorService;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lrx/functions/Action0;)Lrx/Subscription;
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_0
-    invoke-static {p1}, Lr0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
-
-    move-result-object p1
-
-    new-instance v0, Lr0/l/c/i;
-
-    iget-object v1, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-direct {v0, p1, v1}, Lr0/l/c/i;-><init>(Lrx/functions/Action0;Lrx/subscriptions/CompositeSubscription;)V
-
-    iget-object p1, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    iget-object p1, p0, Lr0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {p1, v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
-
-    iget-object p1, p0, Lr0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result p1
-
-    if-nez p1, :cond_1
-
-    :try_start_0
-    iget-object p1, p0, Lr0/l/c/c$a;->d:Ljava/util/concurrent/Executor;
-
-    invoke-interface {p1, p0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception p1
-
-    iget-object v1, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v1, v0}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
-
-    iget-object v0, p0, Lr0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-object v0
-.end method
-
-.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-    .locals 5
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p2, v0
-
-    if-gtz v2, :cond_0
-
-    invoke-virtual {p0, p1}, Lr0/l/c/c$a;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    move-result-object p1
-
-    return-object p1
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    if-eqz v0, :cond_1
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_1
-    invoke-static {p1}, Lr0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
-
-    move-result-object p1
-
-    new-instance v0, Lr0/r/b;
-
-    invoke-direct {v0}, Lr0/r/b;-><init>()V
-
-    new-instance v1, Lr0/r/b;
-
-    invoke-direct {v1}, Lr0/r/b;-><init>()V
-
-    invoke-virtual {v1, v0}, Lr0/r/b;->a(Lrx/Subscription;)V
-
-    iget-object v2, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v2, v1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
-
-    new-instance v2, Lr0/l/c/c$a$a;
-
-    invoke-direct {v2, p0, v1}, Lr0/l/c/c$a$a;-><init>(Lr0/l/c/c$a;Lr0/r/b;)V
-
-    new-instance v3, Lr0/r/a;
-
-    invoke-direct {v3, v2}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    new-instance v2, Lr0/l/c/i;
-
-    new-instance v4, Lr0/l/c/c$a$b;
-
-    invoke-direct {v4, p0, v1, p1, v3}, Lr0/l/c/c$a$b;-><init>(Lr0/l/c/c$a;Lr0/r/b;Lrx/functions/Action0;Lrx/Subscription;)V
-
-    invoke-direct {v2, v4}, Lr0/l/c/i;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {v0, v2}, Lr0/r/b;->a(Lrx/Subscription;)V
-
-    :try_start_0
-    iget-object p1, p0, Lr0/l/c/c$a;->h:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {p1, v2, p2, p3, p4}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    move-result-object p1
-
-    invoke-virtual {v2, p1}, Lr0/l/c/i;->a(Ljava/util/concurrent/Future;)V
-    :try_end_0
-    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object v3
-
-    :catch_0
-    move-exception p1
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    throw p1
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    return v0
-.end method
-
-.method public run()V
-    .locals 2
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
-
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Lr0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/c/i;
-
-    if-nez v0, :cond_2
-
-    return-void
-
-    :cond_2
-    iget-object v1, v0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v1, v1, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-nez v1, :cond_4
-
-    iget-object v1, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    iget-boolean v1, v1, Lrx/subscriptions/CompositeSubscription;->e:Z
-
-    if-nez v1, :cond_3
-
-    invoke-virtual {v0}, Lr0/l/c/i;->run()V
-
-    goto :goto_0
-
-    :cond_3
-    iget-object v0, p0, Lr0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
-
-    return-void
-
-    :cond_4
-    :goto_0
-    iget-object v0, p0, Lr0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-void
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
-
-    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
-
-    iget-object v0, p0, Lr0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/c.smali b/com.discord/smali_classes2/r0/l/c/c.smali
deleted file mode 100644
index 3ef5e769fa..0000000000
--- a/com.discord/smali_classes2/r0/l/c/c.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public final Lr0/l/c/c;
-.super Lrx/Scheduler;
-.source "ExecutorScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/c/c$a;
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/Executor;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/Executor;)V
-    .locals 0
-
-    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/c;->a:Ljava/util/concurrent/Executor;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lrx/Scheduler$Worker;
-    .locals 2
-
-    new-instance v0, Lr0/l/c/c$a;
-
-    iget-object v1, p0, Lr0/l/c/c;->a:Ljava/util/concurrent/Executor;
-
-    invoke-direct {v0, v1}, Lr0/l/c/c$a;-><init>(Ljava/util/concurrent/Executor;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/d.smali b/com.discord/smali_classes2/r0/l/c/d.smali
deleted file mode 100644
index ef6733f6a1..0000000000
--- a/com.discord/smali_classes2/r0/l/c/d.smali
+++ /dev/null
@@ -1,218 +0,0 @@
-.class public final Lr0/l/c/d;
-.super Ljava/lang/Object;
-.source "GenericScheduledExecutorService.java"
-
-# interfaces
-.implements Lr0/l/c/j;
-
-
-# static fields
-.field public static final b:[Ljava/util/concurrent/ScheduledExecutorService;
-
-.field public static final c:Ljava/util/concurrent/ScheduledExecutorService;
-
-.field public static final d:Lr0/l/c/d;
-
-.field public static e:I
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "[",
-            "Ljava/util/concurrent/ScheduledExecutorService;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    new-array v1, v0, [Ljava/util/concurrent/ScheduledExecutorService;
-
-    sput-object v1, Lr0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-static {v0}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(I)Ljava/util/concurrent/ScheduledExecutorService;
-
-    move-result-object v0
-
-    sput-object v0, Lr0/l/c/d;->c:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
-
-    new-instance v0, Lr0/l/c/d;
-
-    invoke-direct {v0}, Lr0/l/c/d;-><init>()V
-
-    sput-object v0, Lr0/l/c/d;->d:Lr0/l/c/d;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 6
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v1, Lr0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Lr0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
-
-    move-result v0
-
-    const/4 v1, 0x4
-
-    if-le v0, v1, :cond_0
-
-    div-int/lit8 v0, v0, 0x2
-
-    :cond_0
-    const/16 v1, 0x8
-
-    if-le v0, v1, :cond_1
-
-    const/16 v0, 0x8
-
-    :cond_1
-    new-array v1, v0, [Ljava/util/concurrent/ScheduledExecutorService;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v0, :cond_2
-
-    sget-object v4, Lr0/l/c/e;->d:Lr0/l/e/i;
-
-    const/4 v5, 0x1
-
-    invoke-static {v5, v4}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
-
-    move-result-object v4
-
-    aput-object v4, v1, v3
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    iget-object v3, p0, Lr0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v4, Lr0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-virtual {v3, v4, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_4
-
-    :goto_1
-    if-ge v2, v0, :cond_5
-
-    aget-object v3, v1, v2
-
-    invoke-static {v3}, Lr0/l/c/g;->g(Ljava/util/concurrent/ScheduledExecutorService;)Z
-
-    move-result v4
-
-    if-nez v4, :cond_3
-
-    instance-of v4, v3, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    if-eqz v4, :cond_3
-
-    check-cast v3, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    invoke-static {v3}, Lr0/l/c/g;->e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
-
-    :cond_3
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    :goto_2
-    if-ge v2, v0, :cond_5
-
-    aget-object v3, v1, v2
-
-    invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_2
-
-    :cond_5
-    return-void
-.end method
-
-
-# virtual methods
-.method public shutdown()V
-    .locals 5
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Ljava/util/concurrent/ScheduledExecutorService;
-
-    sget-object v1, Lr0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-ne v0, v1, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v2, p0, Lr0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v1, :cond_2
-
-    aget-object v3, v0, v2
-
-    sget-object v4, Lr0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-virtual {v4, v3}, Ljava/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
-
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/e.smali b/com.discord/smali_classes2/r0/l/c/e.smali
deleted file mode 100644
index 05b480a00e..0000000000
--- a/com.discord/smali_classes2/r0/l/c/e.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.class public final enum Lr0/l/c/e;
-.super Ljava/lang/Enum;
-.source "GenericScheduledExecutorServiceFactory.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lr0/l/c/e;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lr0/l/e/i;
-
-.field public static final synthetic e:[Lr0/l/c/e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Lr0/l/c/e;
-
-    sput-object v0, Lr0/l/c/e;->e:[Lr0/l/c/e;
-
-    new-instance v0, Lr0/l/e/i;
-
-    const-string v1, "RxScheduledExecutorPool-"
-
-    invoke-direct {v0, v1}, Lr0/l/e/i;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lr0/l/c/e;->d:Lr0/l/e/i;
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lr0/l/c/e;
-    .locals 1
-
-    const-class v0, Lr0/l/c/e;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/l/c/e;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/l/c/e;
-    .locals 1
-
-    sget-object v0, Lr0/l/c/e;->e:[Lr0/l/c/e;
-
-    invoke-virtual {v0}, [Lr0/l/c/e;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/l/c/e;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/f.smali b/com.discord/smali_classes2/r0/l/c/f.smali
deleted file mode 100644
index c2fd6a6d28..0000000000
--- a/com.discord/smali_classes2/r0/l/c/f.smali
+++ /dev/null
@@ -1,33 +0,0 @@
-.class public final Lr0/l/c/f;
-.super Lrx/Scheduler;
-.source "NewThreadScheduler.java"
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/ThreadFactory;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
-    .locals 0
-
-    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/f;->a:Ljava/util/concurrent/ThreadFactory;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lrx/Scheduler$Worker;
-    .locals 2
-
-    new-instance v0, Lr0/l/c/g;
-
-    iget-object v1, p0, Lr0/l/c/f;->a:Ljava/util/concurrent/ThreadFactory;
-
-    invoke-direct {v0, v1}, Lr0/l/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/g$a.smali b/com.discord/smali_classes2/r0/l/c/g$a.smali
deleted file mode 100644
index 2453cf49a5..0000000000
--- a/com.discord/smali_classes2/r0/l/c/g$a.smali
+++ /dev/null
@@ -1,84 +0,0 @@
-.class public final Lr0/l/c/g$a;
-.super Ljava/lang/Object;
-.source "NewThreadWorker.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/g;->e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 3
-
-    :try_start_0
-    sget-object v0, Lr0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
-
-    move-result-object v0
-
-    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->isShutdown()Z
-
-    move-result v2
-
-    if-nez v2, :cond_0
-
-    invoke-virtual {v1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->purge()V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {v0}, Ljava/util/Iterator;->remove()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-static {v0}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :cond_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/g.smali b/com.discord/smali_classes2/r0/l/c/g.smali
deleted file mode 100644
index 17d127f6b2..0000000000
--- a/com.discord/smali_classes2/r0/l/c/g.smali
+++ /dev/null
@@ -1,479 +0,0 @@
-.class public Lr0/l/c/g;
-.super Lrx/Scheduler$Worker;
-.source "NewThreadWorker.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# static fields
-.field public static final f:Z
-
-.field public static final g:I
-
-.field public static final h:Ljava/util/concurrent/ConcurrentHashMap;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/ConcurrentHashMap<",
-            "Ljava/util/concurrent/ScheduledThreadPoolExecutor;",
-            "Ljava/util/concurrent/ScheduledThreadPoolExecutor;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final i:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/util/concurrent/ScheduledExecutorService;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile j:Ljava/lang/Object;
-
-.field public static final k:Ljava/lang/Object;
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/ScheduledExecutorService;
-
-.field public volatile e:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    sput-object v0, Lr0/l/c/g;->k:Ljava/lang/Object;
-
-    new-instance v0, Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
-
-    sput-object v0, Lr0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    sput-object v0, Lr0/l/c/g;->i:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const-string v0, "rx.scheduler.jdk6.purge-frequency-millis"
-
-    const/16 v1, 0x3e8
-
-    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    sput v0, Lr0/l/c/g;->g:I
-
-    const-string v0, "rx.scheduler.jdk6.purge-force"
-
-    invoke-static {v0}, Ljava/lang/Boolean;->getBoolean(Ljava/lang/String;)Z
-
-    move-result v0
-
-    sget v1, Lr0/l/e/g;->a:I
-
-    if-nez v0, :cond_1
-
-    if-eqz v1, :cond_0
-
-    const/16 v0, 0x15
-
-    if-lt v1, v0, :cond_1
-
-    :cond_0
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_0
-    sput-boolean v0, Lr0/l/c/g;->f:Z
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
-    .locals 1
-
-    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
-
-    const/4 v0, 0x1
-
-    invoke-static {v0, p1}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lr0/l/c/g;->g(Ljava/util/concurrent/ScheduledExecutorService;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    instance-of v0, p1, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    if-eqz v0, :cond_0
-
-    move-object v0, p1
-
-    check-cast v0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    invoke-static {v0}, Lr0/l/c/g;->e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
-
-    :cond_0
-    iput-object p1, p0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    return-void
-.end method
-
-.method public static d(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/lang/reflect/Method;
-    .locals 7
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getMethods()[Ljava/lang/reflect/Method;
-
-    move-result-object p0
-
-    array-length v0, p0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-ge v2, v0, :cond_1
-
-    aget-object v3, p0, v2
-
-    invoke-virtual {v3}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "setRemoveOnCancelPolicy"
-
-    invoke-virtual {v4, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-virtual {v3}, Ljava/lang/reflect/Method;->getParameterTypes()[Ljava/lang/Class;
-
-    move-result-object v4
-
-    array-length v5, v4
-
-    const/4 v6, 0x1
-
-    if-ne v5, v6, :cond_0
-
-    aget-object v4, v4, v1
-
-    sget-object v5, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
-    if-ne v4, v5, :cond_0
-
-    return-object v3
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
-.method public static e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
-    .locals 10
-
-    :goto_0
-    sget-object v0, Lr0/l/c/g;->i:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/concurrent/ScheduledExecutorService;
-
-    if-eqz v0, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v0, 0x1
-
-    new-instance v1, Lr0/l/e/i;
-
-    const-string v2, "RxSchedulerPurge-"
-
-    invoke-direct {v1, v2}, Lr0/l/e/i;-><init>(Ljava/lang/String;)V
-
-    invoke-static {v0, v1}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
-
-    move-result-object v3
-
-    sget-object v0, Lr0/l/c/g;->i:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    new-instance v4, Lr0/l/c/g$a;
-
-    invoke-direct {v4}, Lr0/l/c/g$a;-><init>()V
-
-    sget v0, Lr0/l/c/g;->g:I
-
-    int-to-long v5, v0
-
-    int-to-long v7, v0
-
-    sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-interface/range {v3 .. v9}, Ljava/util/concurrent/ScheduledExecutorService;->scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    :goto_1
-    sget-object v0, Lr0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-virtual {v0, p0, p0}, Ljava/util/concurrent/ConcurrentHashMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-
-    :cond_1
-    invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
-
-    goto :goto_0
-.end method
-
-.method public static g(Ljava/util/concurrent/ScheduledExecutorService;)Z
-    .locals 5
-
-    sget-boolean v0, Lr0/l/c/g;->f:Z
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_4
-
-    instance-of v0, p0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
-
-    if-eqz v0, :cond_3
-
-    sget-object v0, Lr0/l/c/g;->j:Ljava/lang/Object;
-
-    sget-object v2, Lr0/l/c/g;->k:Ljava/lang/Object;
-
-    if-ne v0, v2, :cond_0
-
-    return v1
-
-    :cond_0
-    if-nez v0, :cond_2
-
-    invoke-static {p0}, Lr0/l/c/g;->d(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    move-object v2, v0
-
-    goto :goto_0
-
-    :cond_1
-    sget-object v2, Lr0/l/c/g;->k:Ljava/lang/Object;
-
-    :goto_0
-    sput-object v2, Lr0/l/c/g;->j:Ljava/lang/Object;
-
-    goto :goto_1
-
-    :cond_2
-    check-cast v0, Ljava/lang/reflect/Method;
-
-    goto :goto_1
-
-    :cond_3
-    invoke-static {p0}, Lr0/l/c/g;->d(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    :goto_1
-    if-eqz v0, :cond_4
-
-    const/4 v2, 0x1
-
-    :try_start_0
-    new-array v3, v2, [Ljava/lang/Object;
-
-    sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    aput-object v4, v3, v1
-
-    invoke-virtual {v0, p0, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return v2
-
-    :catch_0
-    move-exception p0
-
-    invoke-static {p0}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :catch_1
-    move-exception p0
-
-    invoke-static {p0}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :catch_2
-    move-exception p0
-
-    invoke-static {p0}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :cond_4
-    :goto_2
-    return v1
-.end method
-
-
-# virtual methods
-.method public a(Lrx/functions/Action0;)Lrx/Subscription;
-    .locals 3
-
-    iget-boolean v0, p0, Lr0/l/c/g;->e:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    goto :goto_0
-
-    :cond_0
-    const-wide/16 v0, 0x0
-
-    const/4 v2, 0x0
-
-    invoke-virtual {p0, p1, v0, v1, v2}, Lr0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lr0/l/c/i;
-
-    move-result-object p1
-
-    :goto_0
-    return-object p1
-.end method
-
-.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/c/g;->e:Z
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_0
-    invoke-virtual {p0, p1, p2, p3, p4}, Lr0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lr0/l/c/i;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lr0/l/c/i;
-    .locals 3
-
-    invoke-static {p1}, Lr0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
-
-    move-result-object p1
-
-    new-instance v0, Lr0/l/c/i;
-
-    invoke-direct {v0, p1}, Lr0/l/c/i;-><init>(Lrx/functions/Action0;)V
-
-    const-wide/16 v1, 0x0
-
-    cmp-long p1, p2, v1
-
-    if-gtz p1, :cond_0
-
-    iget-object p1, p0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {p1, v0}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
-
-    move-result-object p1
-
-    goto :goto_0
-
-    :cond_0
-    iget-object p1, p0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {p1, v0, p2, p3, p4}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
-
-    move-result-object p1
-
-    :goto_0
-    invoke-virtual {v0, p1}, Lr0/l/c/i;->a(Ljava/util/concurrent/Future;)V
-
-    return-object v0
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/l/c/g;->e:Z
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 2
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/c/g;->e:Z
-
-    iget-object v0, p0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
-
-    iget-object v0, p0, Lr0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
-
-    sget-object v1, Lr0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-virtual {v1, v0}, Ljava/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/h$a.smali b/com.discord/smali_classes2/r0/l/c/h$a.smali
deleted file mode 100644
index cfc22270ca..0000000000
--- a/com.discord/smali_classes2/r0/l/c/h$a.smali
+++ /dev/null
@@ -1,200 +0,0 @@
-.class public final Lr0/l/c/h$a;
-.super Ljava/lang/Object;
-.source "SchedulePeriodicHelper.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/h;->a(Lrx/Scheduler$Worker;Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;Lr0/l/c/h$b;)Lrx/Subscription;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# instance fields
-.field public d:J
-
-.field public e:J
-
-.field public f:J
-
-.field public final synthetic g:J
-
-.field public final synthetic h:J
-
-.field public final synthetic i:Lrx/functions/Action0;
-
-.field public final synthetic j:Lr0/l/d/a;
-
-.field public final synthetic k:Lr0/l/c/h$b;
-
-.field public final synthetic l:Lrx/Scheduler$Worker;
-
-.field public final synthetic m:J
-
-
-# direct methods
-.method public constructor <init>(JJLrx/functions/Action0;Lr0/l/d/a;Lr0/l/c/h$b;Lrx/Scheduler$Worker;J)V
-    .locals 0
-
-    iput-wide p1, p0, Lr0/l/c/h$a;->g:J
-
-    iput-wide p3, p0, Lr0/l/c/h$a;->h:J
-
-    iput-object p5, p0, Lr0/l/c/h$a;->i:Lrx/functions/Action0;
-
-    iput-object p6, p0, Lr0/l/c/h$a;->j:Lr0/l/d/a;
-
-    iput-object p7, p0, Lr0/l/c/h$a;->k:Lr0/l/c/h$b;
-
-    iput-object p8, p0, Lr0/l/c/h$a;->l:Lrx/Scheduler$Worker;
-
-    iput-wide p9, p0, Lr0/l/c/h$a;->m:J
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iget-wide p1, p0, Lr0/l/c/h$a;->g:J
-
-    iput-wide p1, p0, Lr0/l/c/h$a;->e:J
-
-    iget-wide p1, p0, Lr0/l/c/h$a;->h:J
-
-    iput-wide p1, p0, Lr0/l/c/h$a;->f:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 11
-
-    iget-object v0, p0, Lr0/l/c/h$a;->i:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    iget-object v0, p0, Lr0/l/c/h$a;->j:Lr0/l/d/a;
-
-    invoke-virtual {v0}, Lr0/l/d/a;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-nez v0, :cond_4
-
-    iget-object v0, p0, Lr0/l/c/h$a;->k:Lr0/l/c/h$b;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0}, Lr0/l/c/h$b;->a()J
-
-    move-result-wide v0
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    iget-object v1, p0, Lr0/l/c/h$a;->l:Lrx/Scheduler$Worker;
-
-    if-eqz v1, :cond_3
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    :goto_0
-    sget-wide v2, Lr0/l/c/h;->a:J
-
-    add-long v4, v0, v2
-
-    iget-wide v6, p0, Lr0/l/c/h$a;->e:J
-
-    const-wide/16 v8, 0x1
-
-    cmp-long v10, v4, v6
-
-    if-ltz v10, :cond_2
-
-    iget-wide v4, p0, Lr0/l/c/h$a;->m:J
-
-    add-long/2addr v6, v4
-
-    add-long/2addr v6, v2
-
-    cmp-long v2, v0, v6
-
-    if-ltz v2, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    iget-wide v2, p0, Lr0/l/c/h$a;->f:J
-
-    iget-wide v6, p0, Lr0/l/c/h$a;->d:J
-
-    add-long/2addr v6, v8
-
-    iput-wide v6, p0, Lr0/l/c/h$a;->d:J
-
-    mul-long v6, v6, v4
-
-    add-long/2addr v6, v2
-
-    goto :goto_2
-
-    :cond_2
-    :goto_1
-    iget-wide v2, p0, Lr0/l/c/h$a;->m:J
-
-    add-long v6, v0, v2
-
-    iget-wide v4, p0, Lr0/l/c/h$a;->d:J
-
-    add-long/2addr v4, v8
-
-    iput-wide v4, p0, Lr0/l/c/h$a;->d:J
-
-    mul-long v2, v2, v4
-
-    sub-long v2, v6, v2
-
-    iput-wide v2, p0, Lr0/l/c/h$a;->f:J
-
-    :goto_2
-    iput-wide v0, p0, Lr0/l/c/h$a;->e:J
-
-    sub-long/2addr v6, v0
-
-    iget-object v0, p0, Lr0/l/c/h$a;->j:Lr0/l/d/a;
-
-    iget-object v1, p0, Lr0/l/c/h$a;->l:Lrx/Scheduler$Worker;
-
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-virtual {v1, p0, v6, v7, v2}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lr0/l/d/a;->b(Lrx/Subscription;)Z
-
-    goto :goto_3
-
-    :cond_3
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_4
-    :goto_3
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/h$b.smali b/com.discord/smali_classes2/r0/l/c/h$b.smali
deleted file mode 100644
index 5501cb95e7..0000000000
--- a/com.discord/smali_classes2/r0/l/c/h$b.smali
+++ /dev/null
@@ -1,19 +0,0 @@
-.class public interface abstract Lr0/l/c/h$b;
-.super Ljava/lang/Object;
-.source "SchedulePeriodicHelper.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/h;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "b"
-.end annotation
-
-
-# virtual methods
-.method public abstract a()J
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/h.smali b/com.discord/smali_classes2/r0/l/c/h.smali
deleted file mode 100644
index f7b86fa6dc..0000000000
--- a/com.discord/smali_classes2/r0/l/c/h.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lr0/l/c/h;
-.super Ljava/lang/Object;
-.source "SchedulePeriodicHelper.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/c/h$b;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
-
-    const-string v1, "rx.scheduler.drift-tolerance"
-
-    const-wide/16 v2, 0xf
-
-    invoke-static {v1, v2, v3}, Ljava/lang/Long;->getLong(Ljava/lang/String;J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v1
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/c/h;->a:J
-
-    return-void
-.end method
-
-.method public static a(Lrx/Scheduler$Worker;Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;Lr0/l/c/h$b;)Lrx/Subscription;
-    .locals 17
-
-    move-wide/from16 v0, p2
-
-    move-object/from16 v2, p6
-
-    move-wide/from16 v3, p4
-
-    invoke-virtual {v2, v3, v4}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v12
-
-    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v4
-
-    invoke-virtual {v3, v4, v5}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v4
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
-
-    move-result-wide v6
-
-    add-long/2addr v6, v4
-
-    new-instance v14, Lr0/l/d/a;
-
-    invoke-direct {v14}, Lr0/l/d/a;-><init>()V
-
-    new-instance v15, Lr0/l/d/a;
-
-    invoke-direct {v15, v14}, Lr0/l/d/a;-><init>(Lrx/Subscription;)V
-
-    new-instance v11, Lr0/l/c/h$a;
-
-    const/4 v10, 0x0
-
-    move-object v3, v11
-
-    move-object/from16 v8, p1
-
-    move-object v9, v15
-
-    move-object/from16 v16, v11
-
-    move-object/from16 v11, p0
-
-    invoke-direct/range {v3 .. v13}, Lr0/l/c/h$a;-><init>(JJLrx/functions/Action0;Lr0/l/d/a;Lr0/l/c/h$b;Lrx/Scheduler$Worker;J)V
-
-    move-object/from16 v3, p0
-
-    move-object/from16 v4, v16
-
-    invoke-virtual {v3, v4, v0, v1, v2}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-
-    move-result-object v0
-
-    invoke-virtual {v14, v0}, Lr0/l/d/a;->b(Lrx/Subscription;)Z
-
-    return-object v15
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/i$a.smali b/com.discord/smali_classes2/r0/l/c/i$a.smali
deleted file mode 100644
index a62459a9a5..0000000000
--- a/com.discord/smali_classes2/r0/l/c/i$a.smali
+++ /dev/null
@@ -1,99 +0,0 @@
-.class public final Lr0/l/c/i$a;
-.super Ljava/lang/Object;
-.source "ScheduledAction.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/i;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/Future;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/Future<",
-            "*>;"
-        }
-    .end annotation
-.end field
-
-.field public final synthetic e:Lr0/l/c/i;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/i;Ljava/util/concurrent/Future;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/Future<",
-            "*>;)V"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lr0/l/c/i$a;->e:Lr0/l/c/i;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p2, p0, Lr0/l/c/i$a;->d:Ljava/util/concurrent/Future;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/i$a;->d:Ljava/util/concurrent/Future;
-
-    invoke-interface {v0}, Ljava/util/concurrent/Future;->isCancelled()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/c/i$a;->e:Lr0/l/c/i;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    if-eq v0, v1, :cond_0
-
-    iget-object v0, p0, Lr0/l/c/i$a;->d:Ljava/util/concurrent/Future;
-
-    const/4 v1, 0x1
-
-    invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lr0/l/c/i$a;->d:Ljava/util/concurrent/Future;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
-
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/i$b.smali b/com.discord/smali_classes2/r0/l/c/i$b.smali
deleted file mode 100644
index 534998988e..0000000000
--- a/com.discord/smali_classes2/r0/l/c/i$b.smali
+++ /dev/null
@@ -1,125 +0,0 @@
-.class public final Lr0/l/c/i$b;
-.super Ljava/util/concurrent/atomic/AtomicBoolean;
-.source "ScheduledAction.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/i;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x36e5888d681586eL
-
-
-# instance fields
-.field public final parent:Lrx/internal/util/SubscriptionList;
-
-.field public final s:Lr0/l/c/i;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/i;Lrx/internal/util/SubscriptionList;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/i$b;->s:Lr0/l/c/i;
-
-    iput-object p2, p0, Lr0/l/c/i$b;->parent:Lrx/internal/util/SubscriptionList;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/i$b;->s:Lr0/l/c/i;
-
-    iget-object v0, v0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 4
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lr0/l/c/i$b;->parent:Lrx/internal/util/SubscriptionList;
-
-    iget-object v1, p0, Lr0/l/c/i$b;->s:Lr0/l/c/i;
-
-    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-nez v2, :cond_2
-
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v2, v0, Lrx/internal/util/SubscriptionList;->d:Ljava/util/List;
-
-    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-nez v3, :cond_1
-
-    if-nez v2, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-interface {v2, v1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
-
-    move-result v2
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v1}, Lr0/l/c/i;->unsubscribe()V
-
-    goto :goto_1
-
-    :cond_1
-    :goto_0
-    :try_start_1
-    monitor-exit v0
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v1
-
-    :cond_2
-    :goto_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/i$c.smali b/com.discord/smali_classes2/r0/l/c/i$c.smali
deleted file mode 100644
index bccd407fbd..0000000000
--- a/com.discord/smali_classes2/r0/l/c/i$c.smali
+++ /dev/null
@@ -1,78 +0,0 @@
-.class public final Lr0/l/c/i$c;
-.super Ljava/util/concurrent/atomic/AtomicBoolean;
-.source "ScheduledAction.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/i;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x36e5888d681586eL
-
-
-# instance fields
-.field public final parent:Lrx/subscriptions/CompositeSubscription;
-
-.field public final s:Lr0/l/c/i;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/i;Lrx/subscriptions/CompositeSubscription;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/i$c;->s:Lr0/l/c/i;
-
-    iput-object p2, p0, Lr0/l/c/i$c;->parent:Lrx/subscriptions/CompositeSubscription;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/i$c;->s:Lr0/l/c/i;
-
-    iget-object v0, v0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    const/4 v1, 0x1
-
-    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/c/i$c;->parent:Lrx/subscriptions/CompositeSubscription;
-
-    iget-object v1, p0, Lr0/l/c/i$c;->s:Lr0/l/c/i;
-
-    invoke-virtual {v0, v1}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/i.smali b/com.discord/smali_classes2/r0/l/c/i.smali
deleted file mode 100644
index 9fd1a5653d..0000000000
--- a/com.discord/smali_classes2/r0/l/c/i.smali
+++ /dev/null
@@ -1,224 +0,0 @@
-.class public final Lr0/l/c/i;
-.super Ljava/util/concurrent/atomic/AtomicReference;
-.source "ScheduledAction.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/c/i$b;,
-        Lr0/l/c/i$c;,
-        Lr0/l/c/i$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/util/concurrent/atomic/AtomicReference<",
-        "Ljava/lang/Thread;",
-        ">;",
-        "Ljava/lang/Runnable;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = -0x36fd4556f787c9b1L
-
-
-# instance fields
-.field public final action:Lrx/functions/Action0;
-
-.field public final cancel:Lrx/internal/util/SubscriptionList;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action0;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/i;->action:Lrx/functions/Action0;
-
-    new-instance p1, Lrx/internal/util/SubscriptionList;
-
-    invoke-direct {p1}, Lrx/internal/util/SubscriptionList;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/functions/Action0;Lrx/internal/util/SubscriptionList;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/i;->action:Lrx/functions/Action0;
-
-    new-instance p1, Lrx/internal/util/SubscriptionList;
-
-    new-instance v0, Lr0/l/c/i$b;
-
-    invoke-direct {v0, p0, p2}, Lr0/l/c/i$b;-><init>(Lr0/l/c/i;Lrx/internal/util/SubscriptionList;)V
-
-    invoke-direct {p1, v0}, Lrx/internal/util/SubscriptionList;-><init>(Lrx/Subscription;)V
-
-    iput-object p1, p0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/functions/Action0;Lrx/subscriptions/CompositeSubscription;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/i;->action:Lrx/functions/Action0;
-
-    new-instance p1, Lrx/internal/util/SubscriptionList;
-
-    new-instance v0, Lr0/l/c/i$c;
-
-    invoke-direct {v0, p0, p2}, Lr0/l/c/i$c;-><init>(Lr0/l/c/i;Lrx/subscriptions/CompositeSubscription;)V
-
-    invoke-direct {p1, v0}, Lrx/internal/util/SubscriptionList;-><init>(Lrx/Subscription;)V
-
-    iput-object p1, p0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/util/concurrent/Future;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/Future<",
-            "*>;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    new-instance v1, Lr0/l/c/i$a;
-
-    invoke-direct {v1, p0, p1}, Lr0/l/c/i$a;-><init>(Lr0/l/c/i;Ljava/util/concurrent/Future;)V
-
-    invoke-virtual {v0, v1}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
-
-    return-void
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    return v0
-.end method
-
-.method public run()V
-    .locals 3
-
-    :try_start_0
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    iget-object v0, p0, Lr0/l/c/i;->action:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-    :try_end_0
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_1
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    const-string v2, "Fatal Exception thrown on Scheduler.Worker thread."
-
-    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-static {v1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v2
-
-    invoke-interface {v2, v0, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/lang/IllegalStateException;
-
-    const-string v2, "Exception thrown on Scheduler.Worker thread. Add `onError` handling."
-
-    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    invoke-static {v1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v2
-
-    invoke-interface {v2, v0, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_1
-
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/c/i;->unsubscribe()V
-
-    return-void
-
-    :catchall_1
-    move-exception v0
-
-    invoke-virtual {p0}, Lr0/l/c/i;->unsubscribe()V
-
-    throw v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
-
-    invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/j.smali b/com.discord/smali_classes2/r0/l/c/j.smali
deleted file mode 100644
index 47f370f651..0000000000
--- a/com.discord/smali_classes2/r0/l/c/j.smali
+++ /dev/null
@@ -1,8 +0,0 @@
-.class public interface abstract Lr0/l/c/j;
-.super Ljava/lang/Object;
-.source "SchedulerLifecycle.java"
-
-
-# virtual methods
-.method public abstract shutdown()V
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/k.smali b/com.discord/smali_classes2/r0/l/c/k.smali
deleted file mode 100644
index eba1b13efa..0000000000
--- a/com.discord/smali_classes2/r0/l/c/k.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public Lr0/l/c/k;
-.super Ljava/lang/Object;
-.source "SleepingAction.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final d:Lrx/functions/Action0;
-
-.field public final e:Lrx/Scheduler$Worker;
-
-.field public final f:J
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action0;Lrx/Scheduler$Worker;J)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/k;->d:Lrx/functions/Action0;
-
-    iput-object p2, p0, Lr0/l/c/k;->e:Lrx/Scheduler$Worker;
-
-    iput-wide p3, p0, Lr0/l/c/k;->f:J
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/l/c/k;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-wide v0, p0, Lr0/l/c/k;->f:J
-
-    iget-object v2, p0, Lr0/l/c/k;->e:Lrx/Scheduler$Worker;
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_3
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v4
-
-    sub-long/2addr v0, v4
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v2, v0, v4
-
-    if-lez v2, :cond_1
-
-    :try_start_0
-    invoke-static {v0, v1}, Ljava/lang/Thread;->sleep(J)V
-    :try_end_0
-    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v0
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->interrupt()V
-
-    invoke-static {v0}, Lf/n/a/k/a;->R(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
-
-    throw v3
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lr0/l/c/k;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    return-void
-
-    :cond_2
-    iget-object v0, p0, Lr0/l/c/k;->d:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    return-void
-
-    :cond_3
-    throw v3
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/l$a$a.smali b/com.discord/smali_classes2/r0/l/c/l$a$a.smali
deleted file mode 100644
index 98aed63c4c..0000000000
--- a/com.discord/smali_classes2/r0/l/c/l$a$a.smali
+++ /dev/null
@@ -1,53 +0,0 @@
-.class public Lr0/l/c/l$a$a;
-.super Ljava/lang/Object;
-.source "TrampolineScheduler.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/c/l$a;->d(Lrx/functions/Action0;J)Lrx/Subscription;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/c/l$b;
-
-.field public final synthetic e:Lr0/l/c/l$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/c/l$a;Lr0/l/c/l$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/c/l$a$a;->e:Lr0/l/c/l$a;
-
-    iput-object p2, p0, Lr0/l/c/l$a$a;->d:Lr0/l/c/l$b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/c/l$a$a;->e:Lr0/l/c/l$a;
-
-    iget-object v0, v0, Lr0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
-
-    iget-object v1, p0, Lr0/l/c/l$a$a;->d:Lr0/l/c/l$b;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/PriorityBlockingQueue;->remove(Ljava/lang/Object;)Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/l$a.smali b/com.discord/smali_classes2/r0/l/c/l$a.smali
deleted file mode 100644
index 05a5379bfd..0000000000
--- a/com.discord/smali_classes2/r0/l/c/l$a.smali
+++ /dev/null
@@ -1,213 +0,0 @@
-.class public final Lr0/l/c/l$a;
-.super Lrx/Scheduler$Worker;
-.source "TrampolineScheduler.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field public final e:Ljava/util/concurrent/PriorityBlockingQueue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/PriorityBlockingQueue<",
-            "Lr0/l/c/l$b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Lr0/r/a;
-
-.field public final g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/l$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    new-instance v0, Ljava/util/concurrent/PriorityBlockingQueue;
-
-    invoke-direct {v0}, Ljava/util/concurrent/PriorityBlockingQueue;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
-
-    new-instance v0, Lr0/r/a;
-
-    invoke-direct {v0}, Lr0/r/a;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/l$a;->f:Lr0/r/a;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object v0, p0, Lr0/l/c/l$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lrx/functions/Action0;)Lrx/Subscription;
-    .locals 2
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0, p1, v0, v1}, Lr0/l/c/l$a;->d(Lrx/functions/Action0;J)Lrx/Subscription;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
-    .locals 2
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v0
-
-    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
-
-    move-result-wide p2
-
-    add-long/2addr p2, v0
-
-    new-instance p4, Lr0/l/c/k;
-
-    invoke-direct {p4, p1, p0, p2, p3}, Lr0/l/c/k;-><init>(Lrx/functions/Action0;Lrx/Scheduler$Worker;J)V
-
-    invoke-virtual {p0, p4, p2, p3}, Lr0/l/c/l$a;->d(Lrx/functions/Action0;J)Lrx/Subscription;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final d(Lrx/functions/Action0;J)Lrx/Subscription;
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/l$a;->f:Lr0/r/a;
-
-    invoke-virtual {v0}, Lr0/r/a;->isUnsubscribed()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_0
-    new-instance v0, Lr0/l/c/l$b;
-
-    invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object p2
-
-    iget-object p3, p0, Lr0/l/c/l$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {p3}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
-
-    move-result p3
-
-    invoke-direct {v0, p1, p2, p3}, Lr0/l/c/l$b;-><init>(Lrx/functions/Action0;Ljava/lang/Long;I)V
-
-    iget-object p1, p0, Lr0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
-
-    invoke-virtual {p1, v0}, Ljava/util/concurrent/PriorityBlockingQueue;->add(Ljava/lang/Object;)Z
-
-    iget-object p1, p0, Lr0/l/c/l$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result p1
-
-    if-nez p1, :cond_3
-
-    :cond_1
-    iget-object p1, p0, Lr0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/PriorityBlockingQueue;->poll()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lr0/l/c/l$b;
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p1, Lr0/l/c/l$b;->d:Lrx/functions/Action0;
-
-    invoke-interface {p1}, Lrx/functions/Action0;->call()V
-
-    :cond_2
-    iget-object p1, p0, Lr0/l/c/l$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
-
-    move-result p1
-
-    if-gtz p1, :cond_1
-
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-object p1
-
-    :cond_3
-    new-instance p1, Lr0/l/c/l$a$a;
-
-    invoke-direct {p1, p0, v0}, Lr0/l/c/l$a$a;-><init>(Lr0/l/c/l$a;Lr0/l/c/l$b;)V
-
-    new-instance p2, Lr0/r/a;
-
-    invoke-direct {p2, p1}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    return-object p2
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/l$a;->f:Lr0/r/a;
-
-    invoke-virtual {v0}, Lr0/r/a;->isUnsubscribed()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/c/l$a;->f:Lr0/r/a;
-
-    invoke-virtual {v0}, Lr0/r/a;->unsubscribe()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/l$b.smali b/com.discord/smali_classes2/r0/l/c/l$b.smali
deleted file mode 100644
index 3ada585124..0000000000
--- a/com.discord/smali_classes2/r0/l/c/l$b.smali
+++ /dev/null
@@ -1,98 +0,0 @@
-.class public final Lr0/l/c/l$b;
-.super Ljava/lang/Object;
-.source "TrampolineScheduler.java"
-
-# interfaces
-.implements Ljava/lang/Comparable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/c/l;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Ljava/lang/Comparable<",
-        "Lr0/l/c/l$b;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action0;
-
-.field public final e:Ljava/lang/Long;
-
-.field public final f:I
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action0;Ljava/lang/Long;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/c/l$b;->d:Lrx/functions/Action0;
-
-    iput-object p2, p0, Lr0/l/c/l$b;->e:Ljava/lang/Long;
-
-    iput p3, p0, Lr0/l/c/l$b;->f:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public compareTo(Ljava/lang/Object;)I
-    .locals 2
-
-    check-cast p1, Lr0/l/c/l$b;
-
-    iget-object v0, p0, Lr0/l/c/l$b;->e:Ljava/lang/Long;
-
-    iget-object v1, p1, Lr0/l/c/l$b;->e:Ljava/lang/Long;
-
-    invoke-virtual {v0, v1}, Ljava/lang/Long;->compareTo(Ljava/lang/Long;)I
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    iget v0, p0, Lr0/l/c/l$b;->f:I
-
-    iget p1, p1, Lr0/l/c/l$b;->f:I
-
-    if-ge v0, p1, :cond_0
-
-    const/4 p1, -0x1
-
-    const/4 v0, -0x1
-
-    goto :goto_0
-
-    :cond_0
-    if-ne v0, p1, :cond_1
-
-    const/4 p1, 0x0
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x1
-
-    const/4 v0, 0x1
-
-    :cond_2
-    :goto_0
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/c/l.smali b/com.discord/smali_classes2/r0/l/c/l.smali
deleted file mode 100644
index 691d376093..0000000000
--- a/com.discord/smali_classes2/r0/l/c/l.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public final Lr0/l/c/l;
-.super Lrx/Scheduler;
-.source "TrampolineScheduler.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/c/l$b;,
-        Lr0/l/c/l$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/l/c/l;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/c/l;
-
-    invoke-direct {v0}, Lr0/l/c/l;-><init>()V
-
-    sput-object v0, Lr0/l/c/l;->a:Lr0/l/c/l;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lrx/Scheduler$Worker;
-    .locals 1
-
-    new-instance v0, Lr0/l/c/l$a;
-
-    invoke-direct {v0}, Lr0/l/c/l$a;-><init>()V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/d/a.smali b/com.discord/smali_classes2/r0/l/d/a.smali
deleted file mode 100644
index fd5ec6619b..0000000000
--- a/com.discord/smali_classes2/r0/l/d/a.smali
+++ /dev/null
@@ -1,148 +0,0 @@
-.class public final Lr0/l/d/a;
-.super Ljava/util/concurrent/atomic/AtomicReference;
-.source "SequentialSubscription.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/util/concurrent/atomic/AtomicReference<",
-        "Lrx/Subscription;",
-        ">;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0xdcfadb4b3205d9dL
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/Subscription;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    invoke-virtual {p0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lrx/Subscription;
-    .locals 2
-
-    invoke-super {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Subscription;
-
-    sget-object v1, Lr0/l/d/b;->d:Lr0/l/d/b;
-
-    if-ne v0, v1, :cond_0
-
-    sget-object v0, Lr0/r/c;->a:Lr0/r/c$a;
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public b(Lrx/Subscription;)Z
-    .locals 2
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Subscription;
-
-    sget-object v1, Lr0/l/d/b;->d:Lr0/l/d/b;
-
-    if-ne v0, v1, :cond_2
-
-    if-eqz p1, :cond_1
-
-    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_1
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_2
-    invoke-virtual {p0, v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 2
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    sget-object v1, Lr0/l/d/b;->d:Lr0/l/d/b;
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 2
-
-    sget-object v0, Lr0/l/d/b;->d:Lr0/l/d/b;
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lrx/Subscription;
-
-    if-eq v1, v0, :cond_0
-
-    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lrx/Subscription;
-
-    if-eqz v1, :cond_0
-
-    if-eq v1, v0, :cond_0
-
-    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/d/b.smali b/com.discord/smali_classes2/r0/l/d/b.smali
deleted file mode 100644
index 7920eaba4f..0000000000
--- a/com.discord/smali_classes2/r0/l/d/b.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.class public final enum Lr0/l/d/b;
-.super Ljava/lang/Enum;
-.source "Unsubscribed.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lr0/l/d/b;",
-        ">;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lr0/l/d/b;
-
-.field public static final synthetic e:[Lr0/l/d/b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lr0/l/d/b;
-
-    const-string v1, "INSTANCE"
-
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v1, v2}, Lr0/l/d/b;-><init>(Ljava/lang/String;I)V
-
-    sput-object v0, Lr0/l/d/b;->d:Lr0/l/d/b;
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Lr0/l/d/b;
-
-    aput-object v0, v1, v2
-
-    sput-object v1, Lr0/l/d/b;->e:[Lr0/l/d/b;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lr0/l/d/b;
-    .locals 1
-
-    const-class v0, Lr0/l/d/b;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/l/d/b;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/l/d/b;
-    .locals 1
-
-    sget-object v0, Lr0/l/d/b;->e:[Lr0/l/d/b;
-
-    invoke-virtual {v0}, [Lr0/l/d/b;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/l/d/b;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/a.smali b/com.discord/smali_classes2/r0/l/e/a.smali
deleted file mode 100644
index 33115bbf75..0000000000
--- a/com.discord/smali_classes2/r0/l/e/a.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.class public final Lr0/l/e/a;
-.super Ljava/lang/Object;
-.source "ActionObserver.java"
-
-# interfaces
-.implements Lr0/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/g<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Lrx/functions/Action0;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Action1<",
-            "-TT;>;",
-            "Lrx/functions/Action1<",
-            "-",
-            "Ljava/lang/Throwable;",
-            ">;",
-            "Lrx/functions/Action0;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/a;->d:Lrx/functions/Action1;
-
-    iput-object p2, p0, Lr0/l/e/a;->e:Lrx/functions/Action1;
-
-    iput-object p3, p0, Lr0/l/e/a;->f:Lrx/functions/Action0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/e/a;->f:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/e/a;->e:Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/a;->d:Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/b.smali b/com.discord/smali_classes2/r0/l/e/b.smali
deleted file mode 100644
index 5fa2daee18..0000000000
--- a/com.discord/smali_classes2/r0/l/e/b.smali
+++ /dev/null
@@ -1,103 +0,0 @@
-.class public final Lr0/l/e/b;
-.super Lrx/Subscriber;
-.source "ActionSubscriber.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final f:Lrx/functions/Action0;
-
-
-# direct methods
-.method public constructor <init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Action1<",
-            "-TT;>;",
-            "Lrx/functions/Action1<",
-            "Ljava/lang/Throwable;",
-            ">;",
-            "Lrx/functions/Action0;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/b;->d:Lrx/functions/Action1;
-
-    iput-object p2, p0, Lr0/l/e/b;->e:Lrx/functions/Action1;
-
-    iput-object p3, p0, Lr0/l/e/b;->f:Lrx/functions/Action0;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/e/b;->f:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/e/b;->e:Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/b;->d:Lrx/functions/Action1;
-
-    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/c$a.smali b/com.discord/smali_classes2/r0/l/e/c$a.smali
deleted file mode 100644
index fe687f3720..0000000000
--- a/com.discord/smali_classes2/r0/l/e/c$a.smali
+++ /dev/null
@@ -1,14 +0,0 @@
-.class public interface abstract Lr0/l/e/c$a;
-.super Ljava/lang/Object;
-.source "BackpressureDrainManager.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "a"
-.end annotation
diff --git a/com.discord/smali_classes2/r0/l/e/c.smali b/com.discord/smali_classes2/r0/l/e/c.smali
deleted file mode 100644
index aa121d0f27..0000000000
--- a/com.discord/smali_classes2/r0/l/e/c.smali
+++ /dev/null
@@ -1,463 +0,0 @@
-.class public final Lr0/l/e/c;
-.super Ljava/util/concurrent/atomic/AtomicLong;
-.source "BackpressureDrainManager.java"
-
-# interfaces
-.implements Lrx/Producer;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/e/c$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x2738d34f11cd4869L
-
-
-# instance fields
-.field public final actual:Lr0/l/e/c$a;
-
-.field public emitting:Z
-
-.field public exception:Ljava/lang/Throwable;
-
-.field public volatile terminated:Z
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/e/c$a;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/c;->actual:Lr0/l/e/c$a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()V
-    .locals 14
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/l/e/c;->emitting:Z
-
-    if-eqz v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/l/e/c;->emitting:Z
-
-    iget-boolean v1, p0, Lr0/l/e/c;->terminated:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_7
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    const/4 v4, 0x0
-
-    :try_start_1
-    iget-object v5, p0, Lr0/l/e/c;->actual:Lr0/l/e/c$a;
-
-    :goto_0
-    const/4 v6, 0x0
-
-    :goto_1
-    const-wide/16 v7, 0x0
-
-    cmp-long v9, v2, v7
-
-    if-gtz v9, :cond_1
-
-    if-eqz v1, :cond_6
-
-    :cond_1
-    if-eqz v1, :cond_4
-
-    move-object v10, v5
-
-    check-cast v10, Lr0/l/a/d1$a;
-
-    iget-object v10, v10, Lr0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v10}, Ljava/util/concurrent/ConcurrentLinkedQueue;->peek()Ljava/lang/Object;
-
-    move-result-object v10
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_5
-
-    if-nez v10, :cond_3
-
-    :try_start_2
-    iget-object v1, p0, Lr0/l/e/c;->exception:Ljava/lang/Throwable;
-
-    check-cast v5, Lr0/l/a/d1$a;
-
-    if-eqz v1, :cond_2
-
-    iget-object v2, v5, Lr0/l/a/d1$a;->f:Lrx/Subscriber;
-
-    invoke-interface {v2, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :cond_2
-    iget-object v1, v5, Lr0/l/a/d1$a;->f:Lrx/Subscriber;
-
-    invoke-interface {v1}, Lr0/g;->onCompleted()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    :goto_2
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    move-object v2, p0
-
-    goto/16 :goto_8
-
-    :cond_3
-    if-nez v9, :cond_4
-
-    goto :goto_3
-
-    :cond_4
-    :try_start_3
-    move-object v9, v5
-
-    check-cast v9, Lr0/l/a/d1$a;
-
-    iget-object v10, v9, Lr0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v10}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
-
-    move-result-object v10
-
-    iget-object v9, v9, Lr0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
-
-    if-eqz v9, :cond_5
-
-    if-eqz v10, :cond_5
-
-    invoke-virtual {v9}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
-
-    :cond_5
-    if-nez v10, :cond_d
-
-    :cond_6
-    :goto_3
-    monitor-enter p0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_5
-
-    :try_start_4
-    iget-boolean v1, p0, Lr0/l/e/c;->terminated:Z
-
-    move-object v2, v5
-
-    check-cast v2, Lr0/l/a/d1$a;
-
-    iget-object v2, v2, Lr0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/ConcurrentLinkedQueue;->peek()Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_7
-
-    const/4 v2, 0x1
-
-    goto :goto_4
-
-    :cond_7
-    const/4 v2, 0x0
-
-    :goto_4
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v9
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_2
-
-    const-wide v11, 0x7fffffffffffffffL
-
-    cmp-long v3, v9, v11
-
-    if-nez v3, :cond_9
-
-    if-nez v2, :cond_8
-
-    if-nez v1, :cond_8
-
-    :try_start_5
-    iput-boolean v4, p0, Lr0/l/e/c;->emitting:Z
-
-    monitor-exit p0
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_1
-
-    return-void
-
-    :catchall_1
-    move-exception v1
-
-    move-object v2, p0
-
-    move-object v0, v1
-
-    const/4 v1, 0x1
-
-    goto :goto_7
-
-    :cond_8
-    move-wide v2, v11
-
-    goto :goto_5
-
-    :cond_9
-    neg-int v3, v6
-
-    int-to-long v9, v3
-
-    :try_start_6
-    invoke-virtual {p0, v9, v10}, Ljava/util/concurrent/atomic/AtomicLong;->addAndGet(J)J
-
-    move-result-wide v9
-
-    cmp-long v3, v9, v7
-
-    if-eqz v3, :cond_a
-
-    if-nez v2, :cond_b
-
-    :cond_a
-    if-eqz v1, :cond_c
-
-    if-eqz v2, :cond_b
-
-    goto :goto_6
-
-    :cond_b
-    move-wide v2, v9
-
-    :goto_5
-    monitor-exit p0
-    :try_end_6
-    .catchall {:try_start_6 .. :try_end_6} :catchall_2
-
-    goto/16 :goto_0
-
-    :cond_c
-    :goto_6
-    :try_start_7
-    iput-boolean v4, p0, Lr0/l/e/c;->emitting:Z
-
-    monitor-exit p0
-    :try_end_7
-    .catchall {:try_start_7 .. :try_end_7} :catchall_1
-
-    return-void
-
-    :catchall_2
-    move-exception v0
-
-    const/4 v1, 0x0
-
-    move-object v2, p0
-
-    :goto_7
-    :try_start_8
-    monitor-exit v2
-    :try_end_8
-    .catchall {:try_start_8 .. :try_end_8} :catchall_4
-
-    :try_start_9
-    throw v0
-    :try_end_9
-    .catchall {:try_start_9 .. :try_end_9} :catchall_3
-
-    :catchall_3
-    move-exception v0
-
-    move v13, v1
-
-    move-object v1, v0
-
-    move v0, v13
-
-    goto :goto_8
-
-    :catchall_4
-    move-exception v0
-
-    goto :goto_7
-
-    :cond_d
-    :try_start_a
-    move-object v7, v5
-
-    check-cast v7, Lr0/l/a/d1$a;
-
-    iget-object v7, v7, Lr0/l/a/d1$a;->f:Lrx/Subscriber;
-
-    invoke-static {v7, v10}, Lr0/l/a/h;->a(Lr0/g;Ljava/lang/Object;)Z
-
-    move-result v7
-    :try_end_a
-    .catchall {:try_start_a .. :try_end_a} :catchall_5
-
-    if-eqz v7, :cond_e
-
-    return-void
-
-    :cond_e
-    const-wide/16 v7, 0x1
-
-    sub-long/2addr v2, v7
-
-    add-int/lit8 v6, v6, 0x1
-
-    goto/16 :goto_1
-
-    :catchall_5
-    move-exception v0
-
-    move-object v1, v0
-
-    move-object v2, p0
-
-    const/4 v0, 0x0
-
-    :goto_8
-    if-nez v0, :cond_f
-
-    monitor-enter v2
-
-    :try_start_b
-    iput-boolean v4, v2, Lr0/l/e/c;->emitting:Z
-
-    monitor-exit v2
-
-    goto :goto_9
-
-    :catchall_6
-    move-exception v0
-
-    monitor-exit v2
-    :try_end_b
-    .catchall {:try_start_b .. :try_end_b} :catchall_6
-
-    throw v0
-
-    :cond_f
-    :goto_9
-    throw v1
-
-    :catchall_7
-    move-exception v0
-
-    :try_start_c
-    monitor-exit p0
-    :try_end_c
-    .catchall {:try_start_c .. :try_end_c} :catchall_7
-
-    throw v0
-.end method
-
-.method public m(J)V
-    .locals 10
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-nez v2, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    const/4 v4, 0x1
-
-    cmp-long v5, v2, v0
-
-    if-nez v5, :cond_1
-
-    const/4 v5, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v5, 0x0
-
-    :goto_0
-    const-wide v6, 0x7fffffffffffffffL
-
-    cmp-long v8, v2, v6
-
-    if-nez v8, :cond_2
-
-    goto :goto_3
-
-    :cond_2
-    cmp-long v8, p1, v6
-
-    if-nez v8, :cond_3
-
-    move-wide v6, p1
-
-    goto :goto_2
-
-    :cond_3
-    sub-long v8, v6, p1
-
-    cmp-long v4, v2, v8
-
-    if-lez v4, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    add-long v6, v2, p1
-
-    :goto_1
-    move v4, v5
-
-    :goto_2
-    invoke-virtual {p0, v2, v3, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    move v5, v4
-
-    :goto_3
-    if-eqz v5, :cond_5
-
-    invoke-virtual {p0}, Lr0/l/e/c;->a()V
-
-    :cond_5
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/d.smali b/com.discord/smali_classes2/r0/l/e/d.smali
deleted file mode 100644
index a534be251d..0000000000
--- a/com.discord/smali_classes2/r0/l/e/d.smali
+++ /dev/null
@@ -1,204 +0,0 @@
-.class public final enum Lr0/l/e/d;
-.super Ljava/lang/Enum;
-.source "ExceptionsUtils.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lr0/l/e/d;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Ljava/lang/Throwable;
-
-.field public static final synthetic e:[Lr0/l/e/d;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Lr0/l/e/d;
-
-    sput-object v0, Lr0/l/e/d;->e:[Lr0/l/e/d;
-
-    new-instance v0, Ljava/lang/Throwable;
-
-    const-string v1, "Terminated"
-
-    invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
-
-    sput-object v0, Lr0/l/e/d;->d:Ljava/lang/Throwable;
-
-    return-void
-.end method
-
-.method public static f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
-    .locals 5
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/lang/Throwable;",
-            ">;",
-            "Ljava/lang/Throwable;",
-            ")Z"
-        }
-    .end annotation
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    sget-object v1, Lr0/l/e/d;->d:Ljava/lang/Throwable;
-
-    const/4 v2, 0x0
-
-    if-ne v0, v1, :cond_1
-
-    return v2
-
-    :cond_1
-    const/4 v1, 0x1
-
-    if-nez v0, :cond_2
-
-    move-object v3, p1
-
-    goto :goto_0
-
-    :cond_2
-    instance-of v3, v0, Lrx/exceptions/CompositeException;
-
-    if-eqz v3, :cond_3
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    move-object v3, v0
-
-    check-cast v3, Lrx/exceptions/CompositeException;
-
-    iget-object v3, v3, Lrx/exceptions/CompositeException;->exceptions:Ljava/util/List;
-
-    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
-
-    invoke-virtual {v2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    new-instance v3, Lrx/exceptions/CompositeException;
-
-    invoke-direct {v3, v2}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    goto :goto_0
-
-    :cond_3
-    new-instance v3, Lrx/exceptions/CompositeException;
-
-    const/4 v4, 0x2
-
-    new-array v4, v4, [Ljava/lang/Throwable;
-
-    aput-object v0, v4, v2
-
-    aput-object p1, v4, v1
-
-    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
-
-    :goto_0
-    invoke-virtual {p0, v0, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return v1
-.end method
-
-.method public static g(Ljava/lang/Throwable;)Z
-    .locals 1
-
-    sget-object v0, Lr0/l/e/d;->d:Ljava/lang/Throwable;
-
-    if-ne p0, v0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    return p0
-.end method
-
-.method public static h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Ljava/lang/Throwable;",
-            ">;)",
-            "Ljava/lang/Throwable;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    sget-object v1, Lr0/l/e/d;->d:Ljava/lang/Throwable;
-
-    if-eq v0, v1, :cond_0
-
-    invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    :cond_0
-    return-object v0
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lr0/l/e/d;
-    .locals 1
-
-    const-class v0, Lr0/l/e/d;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/l/e/d;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/l/e/d;
-    .locals 1
-
-    sget-object v0, Lr0/l/e/d;->e:[Lr0/l/e/d;
-
-    invoke-virtual {v0}, [Lr0/l/e/d;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/l/e/d;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/e$a.smali b/com.discord/smali_classes2/r0/l/e/e$a.smali
deleted file mode 100644
index 5dff2f09e0..0000000000
--- a/com.discord/smali_classes2/r0/l/e/e$a.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public final Lr0/l/e/e$a;
-.super Ljava/lang/Object;
-.source "InternalObservableUtils.java"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    new-instance v0, Lrx/exceptions/OnErrorNotImplementedException;
-
-    invoke-direct {v0, p1}, Lrx/exceptions/OnErrorNotImplementedException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/e$b.smali b/com.discord/smali_classes2/r0/l/e/e$b.smali
deleted file mode 100644
index de2ff2bfe6..0000000000
--- a/com.discord/smali_classes2/r0/l/e/e$b.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public final Lr0/l/e/e$b;
-.super Ljava/lang/Object;
-.source "InternalObservableUtils.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lr0/f<",
-        "*>;",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lr0/f;
-
-    iget-object p1, p1, Lr0/f;->b:Ljava/lang/Throwable;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/e$c.smali b/com.discord/smali_classes2/r0/l/e/e$c.smali
deleted file mode 100644
index c2e3504da5..0000000000
--- a/com.discord/smali_classes2/r0/l/e/e$c.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public final Lr0/l/e/e$c;
-.super Ljava/lang/Object;
-.source "InternalObservableUtils.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/Observable<",
-        "+",
-        "Lr0/f<",
-        "*>;>;",
-        "Lrx/Observable<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-",
-            "Lrx/Observable<",
-            "+",
-            "Ljava/lang/Void;",
-            ">;+",
-            "Lrx/Observable<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/k/b<",
-            "-",
-            "Lrx/Observable<",
-            "+",
-            "Ljava/lang/Void;",
-            ">;+",
-            "Lrx/Observable<",
-            "*>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/e$c;->d:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/Observable;
-
-    iget-object v0, p0, Lr0/l/e/e$c;->d:Lr0/k/b;
-
-    sget-object v1, Lr0/l/e/e;->d:Lr0/l/e/e$e;
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lrx/Observable;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/e$d.smali b/com.discord/smali_classes2/r0/l/e/e$d.smali
deleted file mode 100644
index 333b6dab68..0000000000
--- a/com.discord/smali_classes2/r0/l/e/e$d.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public final Lr0/l/e/e$d;
-.super Ljava/lang/Object;
-.source "InternalObservableUtils.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "d"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/Observable<",
-        "+",
-        "Lr0/f<",
-        "*>;>;",
-        "Lrx/Observable<",
-        "*>;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "-",
-            "Lrx/Observable<",
-            "+",
-            "Ljava/lang/Throwable;",
-            ">;+",
-            "Lrx/Observable<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/k/b<",
-            "-",
-            "Lrx/Observable<",
-            "+",
-            "Ljava/lang/Throwable;",
-            ">;+",
-            "Lrx/Observable<",
-            "*>;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/e$d;->d:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/Observable;
-
-    iget-object v0, p0, Lr0/l/e/e$d;->d:Lr0/k/b;
-
-    sget-object v1, Lr0/l/e/e;->e:Lr0/l/e/e$b;
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lrx/Observable;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/e$e.smali b/com.discord/smali_classes2/r0/l/e/e$e.smali
deleted file mode 100644
index 264d312387..0000000000
--- a/com.discord/smali_classes2/r0/l/e/e$e.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.class public final Lr0/l/e/e$e;
-.super Ljava/lang/Object;
-.source "InternalObservableUtils.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/e;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "e"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Void;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    const/4 p1, 0x0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/e.smali b/com.discord/smali_classes2/r0/l/e/e.smali
deleted file mode 100644
index 1b8cf8c28e..0000000000
--- a/com.discord/smali_classes2/r0/l/e/e.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final enum Lr0/l/e/e;
-.super Ljava/lang/Enum;
-.source "InternalObservableUtils.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/e/e$a;,
-        Lr0/l/e/e$b;,
-        Lr0/l/e/e$d;,
-        Lr0/l/e/e$e;,
-        Lr0/l/e/e$c;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lr0/l/e/e;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:Lr0/l/e/e$e;
-
-.field public static final e:Lr0/l/e/e$b;
-
-.field public static final f:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final synthetic g:[Lr0/l/e/e;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Lr0/l/e/e;
-
-    sput-object v0, Lr0/l/e/e;->g:[Lr0/l/e/e;
-
-    new-instance v0, Lr0/l/e/e$e;
-
-    invoke-direct {v0}, Lr0/l/e/e$e;-><init>()V
-
-    sput-object v0, Lr0/l/e/e;->d:Lr0/l/e/e$e;
-
-    new-instance v0, Lr0/l/e/e$b;
-
-    invoke-direct {v0}, Lr0/l/e/e$b;-><init>()V
-
-    sput-object v0, Lr0/l/e/e;->e:Lr0/l/e/e$b;
-
-    new-instance v0, Lr0/l/e/e$a;
-
-    invoke-direct {v0}, Lr0/l/e/e$a;-><init>()V
-
-    sput-object v0, Lr0/l/e/e;->f:Lrx/functions/Action1;
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lr0/l/e/e;
-    .locals 1
-
-    const-class v0, Lr0/l/e/e;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/l/e/e;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/l/e/e;
-    .locals 1
-
-    sget-object v0, Lr0/l/e/e;->g:[Lr0/l/e/e;
-
-    invoke-virtual {v0}, [Lr0/l/e/e;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/l/e/e;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/f.smali b/com.discord/smali_classes2/r0/l/e/f.smali
deleted file mode 100644
index e77f79261a..0000000000
--- a/com.discord/smali_classes2/r0/l/e/f.smali
+++ /dev/null
@@ -1,304 +0,0 @@
-.class public final Lr0/l/e/f;
-.super Ljava/lang/Object;
-.source "OpenHashSet.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:F
-
-.field public b:I
-
-.field public c:I
-
-.field public d:I
-
-.field public e:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 3
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/high16 v0, 0x3f400000    # 0.75f
-
-    iput v0, p0, Lr0/l/e/f;->a:F
-
-    const/16 v1, 0x10
-
-    invoke-static {v1}, Lf/n/a/k/a;->V(I)I
-
-    move-result v1
-
-    add-int/lit8 v2, v1, -0x1
-
-    iput v2, p0, Lr0/l/e/f;->b:I
-
-    int-to-float v2, v1
-
-    mul-float v0, v0, v2
-
-    float-to-int v0, v0
-
-    iput v0, p0, Lr0/l/e/f;->d:I
-
-    new-array v0, v1, [Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/e/f;->e:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public static b(I)I
-    .locals 1
-
-    const v0, -0x61c88647
-
-    mul-int p0, p0, v0
-
-    ushr-int/lit8 v0, p0, 0x10
-
-    xor-int/2addr p0, v0
-
-    return p0
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)Z
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/f;->e:[Ljava/lang/Object;
-
-    iget v1, p0, Lr0/l/e/f;->b:I
-
-    invoke-virtual {p1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    invoke-static {v2}, Lr0/l/e/f;->b(I)I
-
-    move-result v2
-
-    and-int/2addr v2, v1
-
-    aget-object v3, v0, v2
-
-    const/4 v4, 0x1
-
-    if-eqz v3, :cond_2
-
-    invoke-virtual {v3, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    const/4 v5, 0x0
-
-    if-eqz v3, :cond_0
-
-    return v5
-
-    :cond_0
-    add-int/2addr v2, v4
-
-    and-int/2addr v2, v1
-
-    aget-object v3, v0, v2
-
-    if-nez v3, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {v3, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_0
-
-    return v5
-
-    :cond_2
-    :goto_0
-    aput-object p1, v0, v2
-
-    iget p1, p0, Lr0/l/e/f;->c:I
-
-    add-int/2addr p1, v4
-
-    iput p1, p0, Lr0/l/e/f;->c:I
-
-    iget v0, p0, Lr0/l/e/f;->d:I
-
-    if-lt p1, v0, :cond_7
-
-    iget-object v0, p0, Lr0/l/e/f;->e:[Ljava/lang/Object;
-
-    array-length v1, v0
-
-    shl-int/lit8 v2, v1, 0x1
-
-    add-int/lit8 v3, v2, -0x1
-
-    new-array v5, v2, [Ljava/lang/Object;
-
-    :goto_1
-    add-int/lit8 v6, p1, -0x1
-
-    if-eqz p1, :cond_6
-
-    :goto_2
-    add-int/lit8 v1, v1, -0x1
-
-    aget-object p1, v0, v1
-
-    if-nez p1, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    aget-object p1, v0, v1
-
-    invoke-virtual {p1}, Ljava/lang/Object;->hashCode()I
-
-    move-result p1
-
-    invoke-static {p1}, Lr0/l/e/f;->b(I)I
-
-    move-result p1
-
-    and-int/2addr p1, v3
-
-    aget-object v7, v5, p1
-
-    if-eqz v7, :cond_5
-
-    :cond_4
-    add-int/2addr p1, v4
-
-    and-int/2addr p1, v3
-
-    aget-object v7, v5, p1
-
-    if-nez v7, :cond_4
-
-    :cond_5
-    aget-object v7, v0, v1
-
-    aput-object v7, v5, p1
-
-    move p1, v6
-
-    goto :goto_1
-
-    :cond_6
-    iput v3, p0, Lr0/l/e/f;->b:I
-
-    int-to-float p1, v2
-
-    iget v0, p0, Lr0/l/e/f;->a:F
-
-    mul-float p1, p1, v0
-
-    float-to-int p1, p1
-
-    iput p1, p0, Lr0/l/e/f;->d:I
-
-    iput-object v5, p0, Lr0/l/e/f;->e:[Ljava/lang/Object;
-
-    :cond_7
-    return v4
-.end method
-
-.method public c(I[Ljava/lang/Object;I)Z
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(I[TT;I)Z"
-        }
-    .end annotation
-
-    iget v0, p0, Lr0/l/e/f;->c:I
-
-    const/4 v1, 0x1
-
-    sub-int/2addr v0, v1
-
-    iput v0, p0, Lr0/l/e/f;->c:I
-
-    :goto_0
-    add-int/lit8 v0, p1, 0x1
-
-    :goto_1
-    and-int/2addr v0, p3
-
-    aget-object v2, p2, v0
-
-    if-nez v2, :cond_0
-
-    const/4 p3, 0x0
-
-    aput-object p3, p2, p1
-
-    return v1
-
-    :cond_0
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v3
-
-    invoke-static {v3}, Lr0/l/e/f;->b(I)I
-
-    move-result v3
-
-    and-int/2addr v3, p3
-
-    if-gt p1, v0, :cond_1
-
-    if-ge p1, v3, :cond_2
-
-    if-le v3, v0, :cond_3
-
-    goto :goto_2
-
-    :cond_1
-    if-lt p1, v3, :cond_3
-
-    if-le v3, v0, :cond_3
-
-    :cond_2
-    :goto_2
-    aput-object v2, p2, p1
-
-    move p1, v0
-
-    goto :goto_0
-
-    :cond_3
-    add-int/lit8 v0, v0, 0x1
-
-    goto :goto_1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/g.smali b/com.discord/smali_classes2/r0/l/e/g.smali
deleted file mode 100644
index a8c5e2cc39..0000000000
--- a/com.discord/smali_classes2/r0/l/e/g.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class public final Lr0/l/e/g;
-.super Ljava/lang/Object;
-.source "PlatformDependent.java"
-
-
-# static fields
-.field public static final a:I
-
-.field public static final b:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    const-string v1, "android.os.Build$VERSION"
-
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object v1
-
-    const-string v2, "SDK_INT"
-
-    invoke-virtual {v1, v2}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Integer;
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    const/4 v1, 0x0
-
-    :goto_0
-    sput v1, Lr0/l/e/g;->a:I
-
-    if-eqz v1, :cond_0
-
-    const/4 v0, 0x1
-
-    :cond_0
-    sput-boolean v0, Lr0/l/e/g;->b:Z
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/h.smali b/com.discord/smali_classes2/r0/l/e/h.smali
deleted file mode 100644
index cb6d56197c..0000000000
--- a/com.discord/smali_classes2/r0/l/e/h.smali
+++ /dev/null
@@ -1,361 +0,0 @@
-.class public Lr0/l/e/h;
-.super Ljava/lang/Object;
-.source "RxRingBuffer.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# static fields
-.field public static final f:I
-
-
-# instance fields
-.field public d:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public volatile e:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 6
-
-    sget-boolean v0, Lr0/l/e/g;->b:Z
-
-    if-eqz v0, :cond_0
-
-    const/16 v0, 0x10
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v0, 0x80
-
-    :goto_0
-    const-string v1, "rx.ring-buffer.size"
-
-    invoke-static {v1}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    :try_start_0
-    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v0
-    :try_end_0
-    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_1
-
-    :catch_0
-    move-exception v2
-
-    sget-object v3, Ljava/lang/System;->err:Ljava/io/PrintStream;
-
-    const-string v4, "Failed to set \'rx.buffer.size\' with value "
-
-    const-string v5, " => "
-
-    invoke-static {v4, v1, v5}, Lf/e/b/a/a;->J(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v1
-
-    invoke-virtual {v2}, Ljava/lang/NumberFormatException;->getMessage()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {v3, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
-
-    :cond_1
-    :goto_1
-    sput v0, Lr0/l/e/h;->f:I
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    new-instance v0, Lr0/l/e/m/c;
-
-    sget v1, Lr0/l/e/h;->f:I
-
-    invoke-direct {v0, v1}, Lr0/l/e/m/c;-><init>(I)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object v0, p0, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    return-void
-.end method
-
-.method public constructor <init>(ZI)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    if-eqz p1, :cond_0
-
-    new-instance p1, Lr0/l/e/n/h;
-
-    invoke-direct {p1, p2}, Lr0/l/e/n/h;-><init>(I)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance p1, Lr0/l/e/n/n;
-
-    invoke-direct {p1, p2}, Lr0/l/e/n/n;-><init>(I)V
-
-    :goto_0
-    iput-object p1, p0, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    return-void
-.end method
-
-.method public static a()Lr0/l/e/h;
-    .locals 3
-
-    invoke-static {}, Lr0/l/e/n/y;->b()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lr0/l/e/h;
-
-    const/4 v1, 0x1
-
-    sget v2, Lr0/l/e/h;->f:I
-
-    invoke-direct {v0, v1, v2}, Lr0/l/e/h;-><init>(ZI)V
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Lr0/l/e/h;
-
-    invoke-direct {v0}, Lr0/l/e/h;-><init>()V
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public b(Ljava/lang/Object;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Lrx/exceptions/MissingBackpressureException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    const/4 v1, 0x1
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_1
-
-    if-nez p1, :cond_0
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_0
-    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    xor-int/2addr p1, v1
-
-    move v2, p1
-
-    const/4 v1, 0x0
-
-    :cond_1
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v1, :cond_3
-
-    if-nez v2, :cond_2
-
-    return-void
-
-    :cond_2
-    new-instance p1, Lrx/exceptions/MissingBackpressureException;
-
-    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
-
-    throw p1
-
-    :cond_3
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v0, "This instance has been unsubscribed and the queue is no longer usable."
-
-    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public c()Ljava/lang/Object;
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    monitor-exit p0
-
-    return-object v0
-
-    :cond_0
-    invoke-interface {v0}, Ljava/util/Queue;->peek()Ljava/lang/Object;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lr0/l/e/h;->e:Ljava/lang/Object;
-
-    if-nez v1, :cond_1
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Queue;->peek()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    move-object v1, v2
-
-    :cond_1
-    monitor-exit p0
-
-    return-object v1
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-.end method
-
-.method public d()Ljava/lang/Object;
-    .locals 4
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    monitor-exit p0
-
-    return-object v1
-
-    :cond_0
-    invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lr0/l/e/h;->e:Ljava/lang/Object;
-
-    if-nez v2, :cond_1
-
-    if-eqz v3, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Queue;->peek()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    iput-object v1, p0, Lr0/l/e/h;->e:Ljava/lang/Object;
-
-    move-object v2, v3
-
-    :cond_1
-    monitor-exit p0
-
-    return-object v2
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/l/e/h;->d:Ljava/util/Queue;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 0
-
-    monitor-enter p0
-
-    monitor-exit p0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/i$a.smali b/com.discord/smali_classes2/r0/l/e/i$a.smali
deleted file mode 100644
index 7066ddc32f..0000000000
--- a/com.discord/smali_classes2/r0/l/e/i$a.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public final Lr0/l/e/i$a;
-.super Ljava/lang/Object;
-.source "RxThreadFactory.java"
-
-# interfaces
-.implements Ljava/util/concurrent/ThreadFactory;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/i;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
-    .locals 1
-
-    new-instance p1, Ljava/lang/AssertionError;
-
-    const-string v0, "No threads allowed."
-
-    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/i.smali b/com.discord/smali_classes2/r0/l/e/i.smali
deleted file mode 100644
index 39932cd249..0000000000
--- a/com.discord/smali_classes2/r0/l/e/i.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.class public final Lr0/l/e/i;
-.super Ljava/util/concurrent/atomic/AtomicLong;
-.source "RxThreadFactory.java"
-
-# interfaces
-.implements Ljava/util/concurrent/ThreadFactory;
-
-
-# static fields
-.field public static final d:Ljava/util/concurrent/ThreadFactory;
-
-.field public static final serialVersionUID:J = -0x7ab1e491ecc1649fL
-
-
-# instance fields
-.field public final prefix:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/l/e/i$a;
-
-    invoke-direct {v0}, Lr0/l/e/i$a;-><init>()V
-
-    sput-object v0, Lr0/l/e/i;->d:Ljava/util/concurrent/ThreadFactory;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/i;->prefix:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
-    .locals 4
-
-    new-instance v0, Ljava/lang/Thread;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    iget-object v2, p0, Lr0/l/e/i;->prefix:Ljava/lang/String;
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
-
-    move-result-wide v2
-
-    invoke-virtual {v1, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, p1, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
-
-    const/4 p1, 0x1
-
-    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setDaemon(Z)V
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/j$a.smali b/com.discord/smali_classes2/r0/l/e/j$a.smali
deleted file mode 100644
index e0c17836eb..0000000000
--- a/com.discord/smali_classes2/r0/l/e/j$a.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class public Lr0/l/e/j$a;
-.super Ljava/lang/Object;
-.source "ScalarSynchronousObservable.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/functions/Action0;",
-        "Lrx/Subscription;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/l/c/b;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/e/j;Lr0/l/c/b;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/e/j$a;->d:Lr0/l/c/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
-
-    check-cast p1, Lrx/functions/Action0;
-
-    iget-object v0, p0, Lr0/l/e/j$a;->d:Lr0/l/c/b;
-
-    iget-object v0, v0, Lr0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/c/b$b;
-
-    invoke-virtual {v0}, Lr0/l/c/b$b;->a()Lr0/l/c/b$c;
-
-    move-result-object v0
-
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const-wide/16 v2, -0x1
-
-    invoke-virtual {v0, p1, v2, v3, v1}, Lr0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lr0/l/c/i;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/j$b.smali b/com.discord/smali_classes2/r0/l/e/j$b.smali
deleted file mode 100644
index 3cdf126dfa..0000000000
--- a/com.discord/smali_classes2/r0/l/e/j$b.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public Lr0/l/e/j$b;
-.super Ljava/lang/Object;
-.source "ScalarSynchronousObservable.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/functions/Action0;",
-        "Lrx/Subscription;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Scheduler;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/e/j;Lrx/Scheduler;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/e/j$b;->d:Lrx/Scheduler;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
-
-    check-cast p1, Lrx/functions/Action0;
-
-    iget-object v0, p0, Lr0/l/e/j$b;->d:Lrx/Scheduler;
-
-    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
-
-    move-result-object v0
-
-    new-instance v1, Lr0/l/e/k;
-
-    invoke-direct {v1, p0, p1, v0}, Lr0/l/e/k;-><init>(Lr0/l/e/j$b;Lrx/functions/Action0;Lrx/Scheduler$Worker;)V
-
-    invoke-virtual {v0, v1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/j$c.smali b/com.discord/smali_classes2/r0/l/e/j$c.smali
deleted file mode 100644
index 9875678bb7..0000000000
--- a/com.discord/smali_classes2/r0/l/e/j$c.smali
+++ /dev/null
@@ -1,103 +0,0 @@
-.class public Lr0/l/e/j$c;
-.super Ljava/lang/Object;
-.source "ScalarSynchronousObservable.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/e/j;->g0(Lr0/k/b;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TR;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/k/b;
-
-.field public final synthetic e:Lr0/l/e/j;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/e/j;Lr0/k/b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/l/e/j$c;->e:Lr0/l/e/j;
-
-    iput-object p2, p0, Lr0/l/e/j$c;->d:Lr0/k/b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 2
-
-    check-cast p1, Lrx/Subscriber;
-
-    iget-object v0, p0, Lr0/l/e/j$c;->d:Lr0/k/b;
-
-    iget-object v1, p0, Lr0/l/e/j$c;->e:Lr0/l/e/j;
-
-    iget-object v1, v1, Lr0/l/e/j;->e:Ljava/lang/Object;
-
-    invoke-interface {v0, v1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable;
-
-    instance-of v1, v0, Lr0/l/e/j;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Lr0/l/e/j;
-
-    iget-object v0, v0, Lr0/l/e/j;->e:Ljava/lang/Object;
-
-    sget-boolean v1, Lr0/l/e/j;->f:Z
-
-    if-eqz v1, :cond_0
-
-    new-instance v1, Lr0/l/b/c;
-
-    invoke-direct {v1, p1, v0}, Lr0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v1, Lr0/l/e/j$g;
-
-    invoke-direct {v1, p1, v0}, Lr0/l/e/j$g;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
-
-    :goto_0
-    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    goto :goto_1
-
-    :cond_1
-    new-instance v1, Lr0/n/e;
-
-    invoke-direct {v1, p1, p1}, Lr0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
-
-    :goto_1
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/j$e.smali b/com.discord/smali_classes2/r0/l/e/j$e.smali
deleted file mode 100644
index 504918f42a..0000000000
--- a/com.discord/smali_classes2/r0/l/e/j$e.smali
+++ /dev/null
@@ -1,92 +0,0 @@
-.class public final Lr0/l/e/j$e;
-.super Ljava/lang/Object;
-.source "ScalarSynchronousObservable.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/j;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "e"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Lrx/functions/Action0;",
-            "Lrx/Subscription;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/Object;Lr0/k/b;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;",
-            "Lr0/k/b<",
-            "Lrx/functions/Action0;",
-            "Lrx/Subscription;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/j$e;->d:Ljava/lang/Object;
-
-    iput-object p2, p0, Lr0/l/e/j$e;->e:Lr0/k/b;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 3
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/l/e/j$f;
-
-    iget-object v1, p0, Lr0/l/e/j$e;->d:Ljava/lang/Object;
-
-    iget-object v2, p0, Lr0/l/e/j$e;->e:Lr0/k/b;
-
-    invoke-direct {v0, p1, v1, v2}, Lr0/l/e/j$f;-><init>(Lrx/Subscriber;Ljava/lang/Object;Lr0/k/b;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/j.smali b/com.discord/smali_classes2/r0/l/e/j.smali
deleted file mode 100644
index 80d4d7d8f2..0000000000
--- a/com.discord/smali_classes2/r0/l/e/j.smali
+++ /dev/null
@@ -1,159 +0,0 @@
-.class public final Lr0/l/e/j;
-.super Lrx/Observable;
-.source "ScalarSynchronousObservable.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/l/e/j$g;,
-        Lr0/l/e/j$f;,
-        Lr0/l/e/j$e;,
-        Lr0/l/e/j$d;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Observable<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:Z
-
-
-# instance fields
-.field public final e:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TT;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-string v0, "rx.just.strong-mode"
-
-    const-string v1, "false"
-
-    invoke-static {v0, v1}, Ljava/lang/System;->getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Ljava/lang/String;)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    sput-boolean v0, Lr0/l/e/j;->f:Z
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    new-instance v0, Lr0/l/e/j$d;
-
-    invoke-direct {v0, p1}, Lr0/l/e/j$d;-><init>(Ljava/lang/Object;)V
-
-    invoke-static {v0}, Lr0/o/l;->a(Lrx/Observable$a;)Lrx/Observable$a;
-
-    move-result-object v0
-
-    invoke-direct {p0, v0}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
-
-    iput-object p1, p0, Lr0/l/e/j;->e:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public g0(Lr0/k/b;)Lrx/Observable;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<R:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lr0/k/b<",
-            "-TT;+",
-            "Lrx/Observable<",
-            "+TR;>;>;)",
-            "Lrx/Observable<",
-            "TR;>;"
-        }
-    .end annotation
-
-    new-instance v0, Lr0/l/e/j$c;
-
-    invoke-direct {v0, p0, p1}, Lr0/l/e/j$c;-><init>(Lr0/l/e/j;Lr0/k/b;)V
-
-    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public h0(Lrx/Scheduler;)Lrx/Observable;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Scheduler;",
-            ")",
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-
-    instance-of v0, p1, Lr0/l/c/b;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lr0/l/c/b;
-
-    new-instance v0, Lr0/l/e/j$a;
-
-    invoke-direct {v0, p0, p1}, Lr0/l/e/j$a;-><init>(Lr0/l/e/j;Lr0/l/c/b;)V
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lr0/l/e/j$b;
-
-    invoke-direct {v0, p0, p1}, Lr0/l/e/j$b;-><init>(Lr0/l/e/j;Lrx/Scheduler;)V
-
-    :goto_0
-    new-instance p1, Lr0/l/e/j$e;
-
-    iget-object v1, p0, Lr0/l/e/j;->e:Ljava/lang/Object;
-
-    invoke-direct {p1, v1, v0}, Lr0/l/e/j$e;-><init>(Ljava/lang/Object;Lr0/k/b;)V
-
-    invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/k.smali b/com.discord/smali_classes2/r0/l/e/k.smali
deleted file mode 100644
index 2e978ab9f4..0000000000
--- a/com.discord/smali_classes2/r0/l/e/k.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public Lr0/l/e/k;
-.super Ljava/lang/Object;
-.source "ScalarSynchronousObservable.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lrx/functions/Action0;
-
-.field public final synthetic e:Lrx/Scheduler$Worker;
-
-
-# direct methods
-.method public constructor <init>(Lr0/l/e/j$b;Lrx/functions/Action0;Lrx/Scheduler$Worker;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/l/e/k;->d:Lrx/functions/Action0;
-
-    iput-object p3, p0, Lr0/l/e/k;->e:Lrx/Scheduler$Worker;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    :try_start_0
-    iget-object v0, p0, Lr0/l/e/k;->d:Lrx/functions/Action0;
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/l/e/k;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lr0/l/e/k;->e:Lrx/Scheduler$Worker;
-
-    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/l.smali b/com.discord/smali_classes2/r0/l/e/l.smali
deleted file mode 100644
index 20f0b5425b..0000000000
--- a/com.discord/smali_classes2/r0/l/e/l.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final enum Lr0/l/e/l;
-.super Ljava/lang/Enum;
-.source "UtilityFunctions.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Enum<",
-        "Lr0/l/e/l;",
-        ">;",
-        "Lr0/k/b<",
-        "Ljava/lang/Object;",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final enum d:Lr0/l/e/l;
-
-.field public static final synthetic e:[Lr0/l/e/l;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    new-instance v0, Lr0/l/e/l;
-
-    const-string v1, "INSTANCE"
-
-    const/4 v2, 0x0
-
-    invoke-direct {v0, v1, v2}, Lr0/l/e/l;-><init>(Ljava/lang/String;I)V
-
-    sput-object v0, Lr0/l/e/l;->d:Lr0/l/e/l;
-
-    const/4 v1, 0x1
-
-    new-array v1, v1, [Lr0/l/e/l;
-
-    aput-object v0, v1, v2
-
-    sput-object v1, Lr0/l/e/l;->e:[Lr0/l/e/l;
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/String;I)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
-
-    return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lr0/l/e/l;
-    .locals 1
-
-    const-class v0, Lr0/l/e/l;
-
-    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
-    move-result-object p0
-
-    check-cast p0, Lr0/l/e/l;
-
-    return-object p0
-.end method
-
-.method public static values()[Lr0/l/e/l;
-    .locals 1
-
-    sget-object v0, Lr0/l/e/l;->e:[Lr0/l/e/l;
-
-    invoke-virtual {v0}, [Lr0/l/e/l;->clone()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/l/e/l;
-
-    return-object v0
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    return-object p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/m/a.smali b/com.discord/smali_classes2/r0/l/e/m/a.smali
deleted file mode 100644
index 7f8715f405..0000000000
--- a/com.discord/smali_classes2/r0/l/e/m/a.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.class public abstract Lr0/l/e/m/a;
-.super Ljava/util/AbstractQueue;
-.source "AtomicReferenceArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/AbstractQueue<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-            "TE;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:I
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
-
-    invoke-static {p1}, Lf/n/a/k/a;->V(I)I
-
-    move-result p1
-
-    add-int/lit8 v0, p1, -0x1
-
-    iput v0, p0, Lr0/l/e/m/a;->e:I
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object v0, p0, Lr0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public clear()V
-    .locals 1
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0}, Ljava/util/AbstractQueue;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Ljava/util/AbstractQueue;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/m/b.smali b/com.discord/smali_classes2/r0/l/e/m/b.smali
deleted file mode 100644
index 375588d285..0000000000
--- a/com.discord/smali_classes2/r0/l/e/m/b.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lr0/l/e/m/b;
-.super Ljava/util/concurrent/atomic/AtomicReference;
-.source "LinkedQueueNode.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicReference<",
-        "Lr0/l/e/m/b<",
-        "TE;>;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x215dab4a52b27c94L
-
-
-# instance fields
-.field public value:Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "TE;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    return-void
-.end method
-
-.method public constructor <init>(Ljava/lang/Object;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/m/b;->value:Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Lr0/l/e/m/b;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lr0/l/e/m/b<",
-            "TE;>;"
-        }
-    .end annotation
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/e/m/b;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/m/c.smali b/com.discord/smali_classes2/r0/l/e/m/c.smali
deleted file mode 100644
index 420d7077a8..0000000000
--- a/com.discord/smali_classes2/r0/l/e/m/c.smali
+++ /dev/null
@@ -1,319 +0,0 @@
-.class public final Lr0/l/e/m/c;
-.super Lr0/l/e/m/a;
-.source "SpscAtomicArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/m/a<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final j:Ljava/lang/Integer;
-
-
-# instance fields
-.field public final f:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public g:J
-
-.field public final h:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final i:I
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-string v0, "jctools.spsc.max.lookahead.step"
-
-    const/16 v1, 0x1000
-
-    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lr0/l/e/m/c;->j:Ljava/lang/Integer;
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Lr0/l/e/m/a;-><init>(I)V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object v0, p0, Lr0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object v0, p0, Lr0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
-
-    div-int/lit8 p1, p1, 0x4
-
-    sget-object v0, Lr0/l/e/m/c;->j:Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
-
-    move-result p1
-
-    iput p1, p0, Lr0/l/e/m/c;->i:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final c()J
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public isEmpty()Z
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0}, Lr0/l/e/m/c;->c()J
-
-    move-result-wide v2
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p0, Lr0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget v1, p0, Lr0/l/e/m/a;->e:I
-
-    iget-object v2, p0, Lr0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    long-to-int v4, v2
-
-    and-int/2addr v4, v1
-
-    iget-wide v5, p0, Lr0/l/e/m/c;->g:J
-
-    cmp-long v7, v2, v5
-
-    if-ltz v7, :cond_1
-
-    iget v5, p0, Lr0/l/e/m/c;->i:I
-
-    int-to-long v5, v5
-
-    add-long/2addr v5, v2
-
-    long-to-int v7, v5
-
-    and-int/2addr v1, v7
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-nez v1, :cond_0
-
-    iput-wide v5, p0, Lr0/l/e/m/c;->g:J
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    const-wide/16 v0, 0x1
-
-    add-long/2addr v2, v0
-
-    iget-object p1, p0, Lr0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v2, v3}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "Null is not a valid element"
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    iget v0, p0, Lr0/l/e/m/a;->e:I
-
-    and-int/2addr v0, v1
-
-    iget-object v1, p0, Lr0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    long-to-int v2, v0
-
-    iget v3, p0, Lr0/l/e/m/a;->e:I
-
-    and-int/2addr v2, v3
-
-    iget-object v3, p0, Lr0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    const/4 v5, 0x0
-
-    if-nez v4, :cond_0
-
-    return-object v5
-
-    :cond_0
-    invoke-virtual {v3, v2, v5}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    const-wide/16 v2, 0x1
-
-    add-long/2addr v0, v2
-
-    iget-object v2, p0, Lr0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    return-object v4
-.end method
-
-.method public size()I
-    .locals 7
-
-    invoke-virtual {p0}, Lr0/l/e/m/c;->c()J
-
-    move-result-wide v0
-
-    :goto_0
-    iget-object v2, p0, Lr0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    invoke-virtual {p0}, Lr0/l/e/m/c;->c()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_0
-
-    sub-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    return v0
-
-    :cond_0
-    move-wide v0, v4
-
-    goto :goto_0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/m/d.smali b/com.discord/smali_classes2/r0/l/e/m/d.smali
deleted file mode 100644
index 87317c3287..0000000000
--- a/com.discord/smali_classes2/r0/l/e/m/d.smali
+++ /dev/null
@@ -1,466 +0,0 @@
-.class public final Lr0/l/e/m/d;
-.super Ljava/util/concurrent/atomic/AtomicReferenceArray;
-.source "SpscExactAtomicArrayQueue.java"
-
-# interfaces
-.implements Ljava/util/Queue;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-        "TT;>;",
-        "Ljava/util/Queue<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x5631d997036b8b85L
-
-
-# instance fields
-.field public final capacitySkip:I
-
-.field public final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final mask:I
-
-.field public final producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 2
-
-    invoke-static {p1}, Lf/n/a/k/a;->V(I)I
-
-    move-result v0
-
-    invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v0
-
-    add-int/lit8 v1, v0, -0x1
-
-    iput v1, p0, Lr0/l/e/m/d;->mask:I
-
-    sub-int/2addr v0, p1
-
-    iput v0, p0, Lr0/l/e/m/d;->capacitySkip:I
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public add(Ljava/lang/Object;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public addAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+TT;>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public clear()V
-    .locals 1
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/e/m/d;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lr0/l/e/m/d;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public contains(Ljava/lang/Object;)Z
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public containsAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public element()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public isEmpty()Z
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iget-object v1, p0, Lr0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_1
-
-    iget-object v0, p0, Lr0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    iget v2, p0, Lr0/l/e/m/d;->mask:I
-
-    iget v3, p0, Lr0/l/e/m/d;->capacitySkip:I
-
-    int-to-long v3, v3
-
-    add-long/2addr v3, v0
-
-    long-to-int v4, v3
-
-    and-int v3, v4, v2
-
-    invoke-virtual {p0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    if-eqz v3, :cond_0
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_0
-    long-to-int v3, v0
-
-    and-int/2addr v2, v3
-
-    iget-object v3, p0, Lr0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide/16 v4, 0x1
-
-    add-long/2addr v0, v4
-
-    invoke-virtual {v3, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_1
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    iget v0, p0, Lr0/l/e/m/d;->mask:I
-
-    and-int/2addr v0, v1
-
-    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    long-to-int v2, v0
-
-    iget v3, p0, Lr0/l/e/m/d;->mask:I
-
-    and-int/2addr v2, v3
-
-    invoke-virtual {p0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    if-nez v3, :cond_0
-
-    return-object v4
-
-    :cond_0
-    iget-object v5, p0, Lr0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    const-wide/16 v6, 0x1
-
-    add-long/2addr v0, v6
-
-    invoke-virtual {v5, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {p0, v2, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    return-object v3
-.end method
-
-.method public remove()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove(Ljava/lang/Object;)Z
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public removeAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public retainAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public size()I
-    .locals 7
-
-    iget-object v0, p0, Lr0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    :goto_0
-    iget-object v2, p0, Lr0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    iget-object v4, p0, Lr0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_0
-
-    sub-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    return v0
-
-    :cond_0
-    move-wide v0, v4
-
-    goto :goto_0
-.end method
-
-.method public toArray()[Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Object;",
-            ">([TE;)[TE;"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/m/e.smali b/com.discord/smali_classes2/r0/l/e/m/e.smali
deleted file mode 100644
index 8c141cdcd2..0000000000
--- a/com.discord/smali_classes2/r0/l/e/m/e.smali
+++ /dev/null
@@ -1,801 +0,0 @@
-.class public final Lr0/l/e/m/e;
-.super Ljava/lang/Object;
-.source "SpscLinkedArrayQueue.java"
-
-# interfaces
-.implements Ljava/util/Queue;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Queue<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final l:I
-
-.field public static final m:Ljava/lang/Object;
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public e:I
-
-.field public f:J
-
-.field public g:I
-
-.field public h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public i:I
-
-.field public j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final k:Ljava/util/concurrent/atomic/AtomicLong;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-string v0, "jctools.spsc.max.lookahead.step"
-
-    const/16 v1, 0x1000
-
-    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    sput v0, Lr0/l/e/m/e;->l:I
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    sput-object v0, Lr0/l/e/m/e;->m:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 3
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    invoke-static {p1}, Lf/n/a/k/a;->V(I)I
-
-    move-result p1
-
-    add-int/lit8 v0, p1, -0x1
-
-    new-instance v1, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    add-int/lit8 v2, p1, 0x1
-
-    invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object v1, p0, Lr0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput v0, p0, Lr0/l/e/m/e;->g:I
-
-    div-int/lit8 p1, p1, 0x4
-
-    sget v2, Lr0/l/e/m/e;->l:I
-
-    invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
-
-    move-result p1
-
-    iput p1, p0, Lr0/l/e/m/e;->e:I
-
-    iput-object v1, p0, Lr0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput v0, p0, Lr0/l/e/m/e;->i:I
-
-    add-int/lit8 v0, v0, -0x1
-
-    int-to-long v0, v0
-
-    iput-wide v0, p0, Lr0/l/e/m/e;->f:J
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public add(Ljava/lang/Object;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public addAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+TT;>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public final c()J
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public clear()V
-    .locals 1
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/e/m/e;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lr0/l/e/m/e;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public contains(Ljava/lang/Object;)Z
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public containsAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public element()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final h()J
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public isEmpty()Z
-    .locals 5
-
-    invoke-virtual {p0}, Lr0/l/e/m/e;->h()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0}, Lr0/l/e/m/e;->c()J
-
-    move-result-wide v2
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public j(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;TT;)Z"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {p0}, Lr0/l/e/m/e;->h()J
-
-    move-result-wide v1
-
-    iget v3, p0, Lr0/l/e/m/e;->g:I
-
-    const-wide/16 v4, 0x2
-
-    add-long/2addr v4, v1
-
-    long-to-int v6, v4
-
-    and-int/2addr v6, v3
-
-    invoke-virtual {v0, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v6
-
-    if-nez v6, :cond_0
-
-    long-to-int v2, v1
-
-    and-int v1, v2, v3
-
-    add-int/lit8 v2, v1, 0x1
-
-    invoke-virtual {v0, v2, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v4, v5}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v6
-
-    new-instance v7, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-direct {v7, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object v7, p0, Lr0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    long-to-int v2, v1
-
-    and-int v1, v2, v3
-
-    add-int/lit8 v2, v1, 0x1
-
-    invoke-virtual {v7, v2, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    invoke-virtual {v7, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result p1
-
-    add-int/lit8 p1, p1, -0x1
-
-    invoke-virtual {v0, p1, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    sget-object p1, Lr0/l/e/m/e;->m:Ljava/lang/Object;
-
-    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v4, v5}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 13
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget-object v1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    iget v3, p0, Lr0/l/e/m/e;->g:I
-
-    long-to-int v4, v1
-
-    and-int/2addr v4, v3
-
-    iget-wide v5, p0, Lr0/l/e/m/e;->f:J
-
-    const/4 v7, 0x1
-
-    const-wide/16 v8, 0x1
-
-    cmp-long v10, v1, v5
-
-    if-gez v10, :cond_0
-
-    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    add-long/2addr v1, v8
-
-    iget-object p1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    return v7
-
-    :cond_0
-    iget v5, p0, Lr0/l/e/m/e;->e:I
-
-    int-to-long v5, v5
-
-    add-long/2addr v5, v1
-
-    long-to-int v10, v5
-
-    and-int/2addr v10, v3
-
-    invoke-virtual {v0, v10}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v10
-
-    if-nez v10, :cond_1
-
-    sub-long/2addr v5, v8
-
-    iput-wide v5, p0, Lr0/l/e/m/e;->f:J
-
-    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    add-long/2addr v1, v8
-
-    iget-object p1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    return v7
-
-    :cond_1
-    add-long v5, v1, v8
-
-    long-to-int v10, v5
-
-    and-int/2addr v10, v3
-
-    invoke-virtual {v0, v10}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v10
-
-    if-nez v10, :cond_2
-
-    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    return v7
-
-    :cond_2
-    int-to-long v10, v3
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v3
-
-    new-instance v12, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-direct {v12, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object v12, p0, Lr0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    add-long/2addr v10, v1
-
-    sub-long/2addr v10, v8
-
-    iput-wide v10, p0, Lr0/l/e/m/e;->f:J
-
-    invoke-virtual {v12, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result p1
-
-    add-int/lit8 p1, p1, -0x1
-
-    invoke-virtual {v0, p1, v12}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    sget-object p1, Lr0/l/e/m/e;->m:Ljava/lang/Object;
-
-    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    return v7
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget-object v1, p0, Lr0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    iget v3, p0, Lr0/l/e/m/e;->i:I
-
-    long-to-int v2, v1
-
-    and-int v1, v2, v3
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    sget-object v3, Lr0/l/e/m/e;->m:Ljava/lang/Object;
-
-    if-ne v2, v3, :cond_0
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v2
-
-    add-int/lit8 v2, v2, -0x1
-
-    invoke-virtual {v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput-object v0, p0, Lr0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    return-object v2
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget-object v1, p0, Lr0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    iget v3, p0, Lr0/l/e/m/e;->i:I
-
-    long-to-int v4, v1
-
-    and-int/2addr v3, v4
-
-    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    sget-object v5, Lr0/l/e/m/e;->m:Ljava/lang/Object;
-
-    if-ne v4, v5, :cond_0
-
-    const/4 v5, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    :goto_0
-    const-wide/16 v6, 0x1
-
-    const/4 v8, 0x0
-
-    if-eqz v4, :cond_1
-
-    if-nez v5, :cond_1
-
-    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    add-long/2addr v1, v6
-
-    iget-object v0, p0, Lr0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    return-object v4
-
-    :cond_1
-    if-eqz v5, :cond_3
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v4
-
-    add-int/lit8 v4, v4, -0x1
-
-    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput-object v0, p0, Lr0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    if-nez v4, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    add-long/2addr v1, v6
-
-    iget-object v0, p0, Lr0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    move-object v8, v4
-
-    :cond_3
-    :goto_1
-    return-object v8
-.end method
-
-.method public remove()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove(Ljava/lang/Object;)Z
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public removeAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public retainAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public size()I
-    .locals 7
-
-    invoke-virtual {p0}, Lr0/l/e/m/e;->c()J
-
-    move-result-wide v0
-
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/e/m/e;->h()J
-
-    move-result-wide v2
-
-    invoke-virtual {p0}, Lr0/l/e/m/e;->c()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_0
-
-    sub-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    return v0
-
-    :cond_0
-    move-wide v0, v4
-
-    goto :goto_0
-.end method
-
-.method public toArray()[Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Object;",
-            ">([TE;)[TE;"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/m/f.smali b/com.discord/smali_classes2/r0/l/e/m/f.smali
deleted file mode 100644
index 0a783431a5..0000000000
--- a/com.discord/smali_classes2/r0/l/e/m/f.smali
+++ /dev/null
@@ -1,279 +0,0 @@
-.class public final Lr0/l/e/m/f;
-.super Ljava/util/AbstractQueue;
-.source "SpscLinkedAtomicQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/m/f<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/e/m/b<",
-            "TE;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/l/e/m/b<",
-            "TE;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance v0, Lr0/l/e/m/b;
-
-    invoke-direct {v0}, Lr0/l/e/m/b;-><init>()V
-
-    iget-object v1, p0, Lr0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    iget-object v1, p0, Lr0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final isEmpty()Z
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/e/m/b;
-
-    iget-object v1, p0, Lr0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lr0/l/e/m/b;
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public final iterator()Ljava/util/Iterator;
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Lr0/l/e/m/b;
-
-    invoke-direct {v0, p1}, Lr0/l/e/m/b;-><init>(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lr0/l/e/m/b;
-
-    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "null elements not allowed"
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/e/m/b;
-
-    invoke-virtual {v0}, Lr0/l/e/m/b;->a()Lr0/l/e/m/b;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, v0, Lr0/l/e/m/b;->value:Ljava/lang/Object;
-
-    return-object v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/e/m/b;
-
-    invoke-virtual {v0}, Lr0/l/e/m/b;->a()Lr0/l/e/m/b;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    iget-object v2, v0, Lr0/l/e/m/b;->value:Ljava/lang/Object;
-
-    iput-object v1, v0, Lr0/l/e/m/b;->value:Ljava/lang/Object;
-
-    iget-object v1, p0, Lr0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-object v2
-
-    :cond_0
-    return-object v1
-.end method
-
-.method public final size()I
-    .locals 4
-
-    iget-object v0, p0, Lr0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/e/m/b;
-
-    iget-object v1, p0, Lr0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lr0/l/e/m/b;
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eq v0, v1, :cond_1
-
-    const v3, 0x7fffffff
-
-    if-ge v2, v3, :cond_1
-
-    :goto_1
-    invoke-virtual {v0}, Lr0/l/e/m/b;->a()Lr0/l/e/m/b;
-
-    move-result-object v3
-
-    if-nez v3, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    move-object v0, v3
-
-    goto :goto_0
-
-    :cond_1
-    return v2
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/m/g.smali b/com.discord/smali_classes2/r0/l/e/m/g.smali
deleted file mode 100644
index fc4742b7f4..0000000000
--- a/com.discord/smali_classes2/r0/l/e/m/g.smali
+++ /dev/null
@@ -1,747 +0,0 @@
-.class public final Lr0/l/e/m/g;
-.super Ljava/lang/Object;
-.source "SpscUnboundedAtomicArrayQueue.java"
-
-# interfaces
-.implements Ljava/util/Queue;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Ljava/util/Queue<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final l:I
-
-.field public static final m:Ljava/lang/Object;
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public e:I
-
-.field public f:J
-
-.field public g:I
-
-.field public h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public i:I
-
-.field public j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final k:Ljava/util/concurrent/atomic/AtomicLong;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-string v0, "jctools.spsc.max.lookahead.step"
-
-    const/16 v1, 0x1000
-
-    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    sput v0, Lr0/l/e/m/g;->l:I
-
-    new-instance v0, Ljava/lang/Object;
-
-    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-
-    sput-object v0, Lr0/l/e/m/g;->m:Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 3
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/16 v0, 0x8
-
-    invoke-static {v0, p1}, Ljava/lang/Math;->max(II)I
-
-    move-result p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->V(I)I
-
-    move-result p1
-
-    add-int/lit8 v0, p1, -0x1
-
-    new-instance v1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object v1, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance v1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object v1, p0, Lr0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    new-instance v1, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    add-int/lit8 v2, p1, 0x1
-
-    invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object v1, p0, Lr0/l/e/m/g;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput v0, p0, Lr0/l/e/m/g;->g:I
-
-    div-int/lit8 p1, p1, 0x4
-
-    sget v2, Lr0/l/e/m/g;->l:I
-
-    invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
-
-    move-result p1
-
-    iput p1, p0, Lr0/l/e/m/g;->e:I
-
-    iput-object v1, p0, Lr0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput v0, p0, Lr0/l/e/m/g;->i:I
-
-    add-int/lit8 v0, v0, -0x1
-
-    int-to-long v0, v0
-
-    iput-wide v0, p0, Lr0/l/e/m/g;->f:J
-
-    const-wide/16 v0, 0x0
-
-    iget-object p1, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public add(Ljava/lang/Object;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public addAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "+TT;>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public final c()J
-    .locals 2
-
-    iget-object v0, p0, Lr0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public clear()V
-    .locals 1
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/e/m/g;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lr0/l/e/m/g;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public contains(Ljava/lang/Object;)Z
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public containsAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public element()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final h(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/lang/Object;JI)Z
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
-            "Ljava/lang/Object;",
-            ">;TT;JI)Z"
-        }
-    .end annotation
-
-    const-wide/16 v0, 0x1
-
-    add-long/2addr p3, v0
-
-    iget-object v0, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0, p3, p4}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {p1, p5, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public isEmpty()Z
-    .locals 5
-
-    iget-object v0, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0}, Lr0/l/e/m/g;->c()J
-
-    move-result-wide v2
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TT;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 13
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_3
-
-    iget-object v1, p0, Lr0/l/e/m/g;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget-object v0, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v3
-
-    iget v0, p0, Lr0/l/e/m/g;->g:I
-
-    long-to-int v2, v3
-
-    and-int v5, v2, v0
-
-    iget-wide v6, p0, Lr0/l/e/m/g;->f:J
-
-    const/4 v8, 0x1
-
-    cmp-long v2, v3, v6
-
-    if-gez v2, :cond_0
-
-    move-object v0, p0
-
-    move-object v2, p1
-
-    invoke-virtual/range {v0 .. v5}, Lr0/l/e/m/g;->h(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/lang/Object;JI)Z
-
-    return v8
-
-    :cond_0
-    iget v2, p0, Lr0/l/e/m/g;->e:I
-
-    int-to-long v6, v2
-
-    add-long/2addr v6, v3
-
-    long-to-int v2, v6
-
-    and-int/2addr v2, v0
-
-    invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    const-wide/16 v9, 0x1
-
-    if-nez v2, :cond_1
-
-    sub-long/2addr v6, v9
-
-    iput-wide v6, p0, Lr0/l/e/m/g;->f:J
-
-    add-long/2addr v3, v9
-
-    iget-object v0, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0, v3, v4}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    return v8
-
-    :cond_1
-    add-long v6, v3, v9
-
-    long-to-int v2, v6
-
-    and-int/2addr v2, v0
-
-    invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_2
-
-    iget-object v0, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    return v8
-
-    :cond_2
-    int-to-long v11, v0
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v0
-
-    new-instance v2, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-direct {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
-
-    iput-object v2, p0, Lr0/l/e/m/g;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    add-long/2addr v11, v3
-
-    sub-long/2addr v11, v9
-
-    iput-wide v11, p0, Lr0/l/e/m/g;->f:J
-
-    iget-object v0, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v0, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {v2, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result p1
-
-    add-int/lit8 p1, p1, -0x1
-
-    invoke-virtual {v1, p1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    sget-object p1, Lr0/l/e/m/g;->m:Ljava/lang/Object;
-
-    invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    return v8
-
-    :cond_3
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget-object v1, p0, Lr0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    iget v3, p0, Lr0/l/e/m/g;->i:I
-
-    long-to-int v2, v1
-
-    and-int v1, v2, v3
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v2
-
-    sget-object v3, Lr0/l/e/m/g;->m:Ljava/lang/Object;
-
-    if-ne v2, v3, :cond_0
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v2
-
-    add-int/lit8 v2, v2, -0x1
-
-    invoke-virtual {v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput-object v0, p0, Lr0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    return-object v2
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iget-object v1, p0, Lr0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v1
-
-    iget v3, p0, Lr0/l/e/m/g;->i:I
-
-    long-to-int v4, v1
-
-    and-int/2addr v3, v4
-
-    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    sget-object v5, Lr0/l/e/m/g;->m:Ljava/lang/Object;
-
-    if-ne v4, v5, :cond_0
-
-    const/4 v5, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    :goto_0
-    const-wide/16 v6, 0x1
-
-    const/4 v8, 0x0
-
-    if-eqz v4, :cond_1
-
-    if-nez v5, :cond_1
-
-    add-long/2addr v1, v6
-
-    iget-object v5, p0, Lr0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v5, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    return-object v4
-
-    :cond_1
-    if-eqz v5, :cond_3
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
-
-    move-result v4
-
-    add-int/lit8 v4, v4, -0x1
-
-    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    iput-object v0, p0, Lr0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
-
-    move-result-object v4
-
-    if-nez v4, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    add-long/2addr v1, v6
-
-    iget-object v5, p0, Lr0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v5, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
-
-    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
-
-    move-object v8, v4
-
-    :cond_3
-    :goto_1
-    return-object v8
-.end method
-
-.method public remove()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public remove(Ljava/lang/Object;)Z
-    .locals 0
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public removeAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public retainAll(Ljava/util/Collection;)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/Collection<",
-            "*>;)Z"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
-
-.method public size()I
-    .locals 7
-
-    invoke-virtual {p0}, Lr0/l/e/m/g;->c()J
-
-    move-result-wide v0
-
-    :goto_0
-    iget-object v2, p0, Lr0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v2
-
-    invoke-virtual {p0}, Lr0/l/e/m/g;->c()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_0
-
-    sub-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    return v0
-
-    :cond_0
-    move-wide v0, v4
-
-    goto :goto_0
-.end method
-
-.method public toArray()[Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Object;",
-            ">([TE;)[TE;"
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/a.smali b/com.discord/smali_classes2/r0/l/e/n/a.smali
deleted file mode 100644
index aac3c3f042..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/a.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public abstract Lr0/l/e/n/a;
-.super Lr0/l/e/n/c;
-.source "BaseLinkedQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/c<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final e:J
-
-
-# instance fields
-.field public consumerNode:Lr0/l/e/m/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/e/m/b<",
-            "TE;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lr0/l/e/n/a;
-
-    const-string v1, "consumerNode"
-
-    invoke-static {v0, v1}, Lr0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/a;->e:J
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/l/e/n/c;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final h()Lr0/l/e/m/b;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lr0/l/e/m/b<",
-            "TE;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v1, Lr0/l/e/n/a;->e:J
-
-    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/e/m/b;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/b.smali b/com.discord/smali_classes2/r0/l/e/n/b.smali
deleted file mode 100644
index 87f7700cda..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/b.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public abstract Lr0/l/e/n/b;
-.super Ljava/util/AbstractQueue;
-.source "BaseLinkedQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/AbstractQueue<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/c.smali b/com.discord/smali_classes2/r0/l/e/n/c.smali
deleted file mode 100644
index aa9bd7d061..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/c.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public abstract Lr0/l/e/n/c;
-.super Lr0/l/e/n/d;
-.source "BaseLinkedQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/d<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/l/e/n/d;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/d.smali b/com.discord/smali_classes2/r0/l/e/n/d.smali
deleted file mode 100644
index ec5ef82525..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/d.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class public abstract Lr0/l/e/n/d;
-.super Lr0/l/e/n/b;
-.source "BaseLinkedQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/b<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:J
-
-
-# instance fields
-.field public producerNode:Lr0/l/e/m/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/l/e/m/b<",
-            "TE;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lr0/l/e/n/d;
-
-    const-string v1, "producerNode"
-
-    invoke-static {v0, v1}, Lr0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/d;->d:J
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/l/e/n/b;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final c()Lr0/l/e/m/b;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lr0/l/e/m/b<",
-            "TE;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v1, Lr0/l/e/n/d;->d:J
-
-    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/l/e/m/b;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/e.smali b/com.discord/smali_classes2/r0/l/e/n/e.smali
deleted file mode 100644
index e8f28685de..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/e.smali
+++ /dev/null
@@ -1,272 +0,0 @@
-.class public abstract Lr0/l/e/n/e;
-.super Lr0/l/e/n/f;
-.source "ConcurrentCircularArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/f<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:I
-
-.field public static final g:J
-
-.field public static final h:I
-
-
-# instance fields
-.field public final d:J
-
-.field public final e:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TE;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const-class v0, [Ljava/lang/Object;
-
-    const-string v1, "sparse.shift"
-
-    const/4 v2, 0x0
-
-    invoke-static {v1, v2}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
-
-    sput v1, Lr0/l/e/n/e;->f:I
-
-    sget-object v1, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayIndexScale(Ljava/lang/Class;)I
-
-    move-result v1
-
-    const/4 v2, 0x4
-
-    if-ne v2, v1, :cond_0
-
-    sget v1, Lr0/l/e/n/e;->f:I
-
-    add-int/lit8 v1, v1, 0x2
-
-    sput v1, Lr0/l/e/n/e;->h:I
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v2, 0x8
-
-    if-ne v2, v1, :cond_1
-
-    sget v1, Lr0/l/e/n/e;->f:I
-
-    add-int/lit8 v1, v1, 0x3
-
-    sput v1, Lr0/l/e/n/e;->h:I
-
-    :goto_0
-    sget-object v1, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayBaseOffset(Ljava/lang/Class;)I
-
-    move-result v0
-
-    const/16 v1, 0x20
-
-    sget v2, Lr0/l/e/n/e;->h:I
-
-    sget v3, Lr0/l/e/n/e;->f:I
-
-    sub-int/2addr v2, v3
-
-    shl-int/2addr v1, v2
-
-    add-int/2addr v0, v1
-
-    int-to-long v0, v0
-
-    sput-wide v0, Lr0/l/e/n/e;->g:J
-
-    return-void
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Unknown pointer size"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public constructor <init>(I)V
-    .locals 2
-
-    invoke-direct {p0}, Lr0/l/e/n/f;-><init>()V
-
-    invoke-static {p1}, Lf/n/a/k/a;->V(I)I
-
-    move-result p1
-
-    add-int/lit8 v0, p1, -0x1
-
-    int-to-long v0, v0
-
-    iput-wide v0, p0, Lr0/l/e/n/e;->d:J
-
-    sget v0, Lr0/l/e/n/e;->f:I
-
-    shl-int/2addr p1, v0
-
-    add-int/lit8 p1, p1, 0x40
-
-    new-array p1, p1, [Ljava/lang/Object;
-
-    iput-object p1, p0, Lr0/l/e/n/e;->e:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final c(J)J
-    .locals 4
-
-    iget-wide v0, p0, Lr0/l/e/n/e;->d:J
-
-    sget-wide v2, Lr0/l/e/n/e;->g:J
-
-    and-long/2addr p1, v0
-
-    sget v0, Lr0/l/e/n/e;->h:I
-
-    shl-long/2addr p1, v0
-
-    add-long/2addr v2, p1
-
-    return-wide v2
-.end method
-
-.method public clear()V
-    .locals 1
-
-    :cond_0
-    :goto_0
-    invoke-interface {p0}, Lr0/l/e/n/g;->poll()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Ljava/util/AbstractQueue;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    return-void
-.end method
-
-.method public final h([Ljava/lang/Object;J)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TE;J)TE;"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final j([Ljava/lang/Object;J)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TE;J)TE;"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public final k([Ljava/lang/Object;JLjava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TE;JTE;)V"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putOrderedObject(Ljava/lang/Object;JLjava/lang/Object;)V
-
-    return-void
-.end method
-
-.method public final l([Ljava/lang/Object;JLjava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TE;JTE;)V"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/f.smali b/com.discord/smali_classes2/r0/l/e/n/f.smali
deleted file mode 100644
index 290b75e6be..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/f.smali
+++ /dev/null
@@ -1,30 +0,0 @@
-.class public abstract Lr0/l/e/n/f;
-.super Ljava/util/AbstractQueue;
-.source "ConcurrentCircularArrayQueue.java"
-
-# interfaces
-.implements Lr0/l/e/n/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/AbstractQueue<",
-        "TE;>;",
-        "Lr0/l/e/n/g<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/g.smali b/com.discord/smali_classes2/r0/l/e/n/g.smali
deleted file mode 100644
index e21bcce73a..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/g.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public interface abstract Lr0/l/e/n/g;
-.super Ljava/lang/Object;
-.source "MessagePassingQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<M:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# virtual methods
-.method public abstract poll()Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TM;"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/h.smali b/com.discord/smali_classes2/r0/l/e/n/h.smali
deleted file mode 100644
index d951c8b955..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/h.smali
+++ /dev/null
@@ -1,248 +0,0 @@
-.class public final Lr0/l/e/n/h;
-.super Lr0/l/e/n/m;
-.source "SpmcArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/h<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/m;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isEmpty()Z
-    .locals 5
-
-    iget-wide v0, p0, Lr0/l/e/n/i;->consumerIndex:J
-
-    iget-wide v2, p0, Lr0/l/e/n/l;->producerIndex:J
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_2
-
-    iget-object v0, p0, Lr0/l/e/n/e;->e:[Ljava/lang/Object;
-
-    iget-wide v1, p0, Lr0/l/e/n/e;->d:J
-
-    iget-wide v3, p0, Lr0/l/e/n/l;->producerIndex:J
-
-    invoke-virtual {p0, v3, v4}, Lr0/l/e/n/e;->c(J)J
-
-    move-result-wide v5
-
-    invoke-virtual {p0, v0, v5, v6}, Lr0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_1
-
-    iget-wide v7, p0, Lr0/l/e/n/i;->consumerIndex:J
-
-    sub-long v7, v3, v7
-
-    cmp-long v9, v7, v1
-
-    if-lez v9, :cond_0
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_0
-    :goto_0
-    invoke-virtual {p0, v0, v5, v6}, Lr0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p0, v0, v5, v6, p1}, Lr0/l/e/n/e;->l([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    const-wide/16 v0, 0x1
-
-    add-long/2addr v3, v0
-
-    invoke-virtual {p0, v3, v4}, Lr0/l/e/n/l;->m(J)V
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_2
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "Null is not a valid element"
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lr0/l/e/n/m;->k:J
-
-    :cond_0
-    iget-wide v2, p0, Lr0/l/e/n/i;->consumerIndex:J
-
-    cmp-long v4, v2, v0
-
-    if-ltz v4, :cond_2
-
-    iget-wide v4, p0, Lr0/l/e/n/l;->producerIndex:J
-
-    cmp-long v6, v2, v4
-
-    if-ltz v6, :cond_1
-
-    const/4 v0, 0x0
-
-    return-object v0
-
-    :cond_1
-    iput-wide v4, p0, Lr0/l/e/n/m;->k:J
-
-    :cond_2
-    invoke-virtual {p0, v2, v3}, Lr0/l/e/n/e;->c(J)J
-
-    move-result-wide v2
-
-    iget-object v4, p0, Lr0/l/e/n/e;->e:[Ljava/lang/Object;
-
-    invoke-virtual {p0, v4, v2, v3}, Lr0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_0
-
-    return-object v2
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 8
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lr0/l/e/n/m;->k:J
-
-    :cond_0
-    iget-wide v2, p0, Lr0/l/e/n/i;->consumerIndex:J
-
-    const/4 v4, 0x0
-
-    cmp-long v5, v2, v0
-
-    if-ltz v5, :cond_2
-
-    iget-wide v5, p0, Lr0/l/e/n/l;->producerIndex:J
-
-    cmp-long v7, v2, v5
-
-    if-ltz v7, :cond_1
-
-    return-object v4
-
-    :cond_1
-    iput-wide v5, p0, Lr0/l/e/n/m;->k:J
-
-    :cond_2
-    const-wide/16 v5, 0x1
-
-    add-long/2addr v5, v2
-
-    invoke-virtual {p0, v2, v3, v5, v6}, Lr0/l/e/n/i;->o(JJ)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_0
-
-    invoke-virtual {p0, v2, v3}, Lr0/l/e/n/e;->c(J)J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Lr0/l/e/n/e;->e:[Ljava/lang/Object;
-
-    invoke-virtual {p0, v2, v0, v1}, Lr0/l/e/n/e;->h([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v3
-
-    invoke-virtual {p0, v2, v0, v1, v4}, Lr0/l/e/n/e;->k([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    return-object v3
-.end method
-
-.method public size()I
-    .locals 7
-
-    iget-wide v0, p0, Lr0/l/e/n/i;->consumerIndex:J
-
-    :goto_0
-    iget-wide v2, p0, Lr0/l/e/n/l;->producerIndex:J
-
-    iget-wide v4, p0, Lr0/l/e/n/i;->consumerIndex:J
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_0
-
-    sub-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    return v0
-
-    :cond_0
-    move-wide v0, v4
-
-    goto :goto_0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/i.smali b/com.discord/smali_classes2/r0/l/e/n/i.smali
deleted file mode 100644
index 76a749a2be..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/i.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.class public abstract Lr0/l/e/n/i;
-.super Lr0/l/e/n/k;
-.source "SpmcArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/k<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final j:J
-
-
-# instance fields
-.field public volatile consumerIndex:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lr0/l/e/n/i;
-
-    const-string v1, "consumerIndex"
-
-    invoke-static {v0, v1}, Lr0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/i;->j:J
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/k;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final o(JJ)Z
-    .locals 8
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v2, Lr0/l/e/n/i;->j:J
-
-    move-object v1, p0
-
-    move-wide v4, p1
-
-    move-wide v6, p3
-
-    invoke-virtual/range {v0 .. v7}, Lsun/misc/Unsafe;->compareAndSwapLong(Ljava/lang/Object;JJJ)Z
-
-    move-result p1
-
-    return p1
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/j.smali b/com.discord/smali_classes2/r0/l/e/n/j.smali
deleted file mode 100644
index 74342ef639..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/j.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public abstract Lr0/l/e/n/j;
-.super Lr0/l/e/n/e;
-.source "SpmcArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/e<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/e;-><init>(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/k.smali b/com.discord/smali_classes2/r0/l/e/n/k.smali
deleted file mode 100644
index 24366efff0..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/k.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public abstract Lr0/l/e/n/k;
-.super Lr0/l/e/n/l;
-.source "SpmcArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/l<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/l;-><init>(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/l.smali b/com.discord/smali_classes2/r0/l/e/n/l.smali
deleted file mode 100644
index 82342bacfc..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/l.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.class public abstract Lr0/l/e/n/l;
-.super Lr0/l/e/n/j;
-.source "SpmcArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/j<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final i:J
-
-
-# instance fields
-.field public volatile producerIndex:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lr0/l/e/n/l;
-
-    const-string v1, "producerIndex"
-
-    invoke-static {v0, v1}, Lr0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/l;->i:J
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/j;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final m(J)V
-    .locals 6
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v2, Lr0/l/e/n/l;->i:J
-
-    move-object v1, p0
-
-    move-wide v4, p1
-
-    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/m.smali b/com.discord/smali_classes2/r0/l/e/n/m.smali
deleted file mode 100644
index 6ab768ac54..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/m.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public abstract Lr0/l/e/n/m;
-.super Lr0/l/e/n/i;
-.source "SpmcArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/m<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public volatile k:J
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/i;-><init>(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/n.smali b/com.discord/smali_classes2/r0/l/e/n/n.smali
deleted file mode 100644
index 7d434517a9..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/n.smali
+++ /dev/null
@@ -1,257 +0,0 @@
-.class public final Lr0/l/e/n/n;
-.super Lr0/l/e/n/o;
-.source "SpscArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/n<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/o;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isEmpty()Z
-    .locals 5
-
-    invoke-virtual {p0}, Lr0/l/e/n/n;->o()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0}, Lr0/l/e/n/n;->m()J
-
-    move-result-wide v2
-
-    cmp-long v4, v0, v2
-
-    if-nez v4, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public final m()J
-    .locals 3
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v1, Lr0/l/e/n/o;->k:J
-
-    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final o()J
-    .locals 3
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v1, Lr0/l/e/n/r;->j:J
-
-    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_1
-
-    iget-object v0, p0, Lr0/l/e/n/e;->e:[Ljava/lang/Object;
-
-    iget-wide v1, p0, Lr0/l/e/n/r;->producerIndex:J
-
-    invoke-virtual {p0, v1, v2}, Lr0/l/e/n/e;->c(J)J
-
-    move-result-wide v3
-
-    invoke-virtual {p0, v0, v3, v4}, Lr0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_0
-
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_0
-    invoke-virtual {p0, v0, v3, v4, p1}, Lr0/l/e/n/e;->k([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    const-wide/16 v3, 0x1
-
-    add-long/2addr v1, v3
-
-    invoke-virtual {p0, v1, v2}, Lr0/l/e/n/n;->q(J)V
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_1
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "null elements not allowed"
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final p(J)V
-    .locals 6
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v2, Lr0/l/e/n/o;->k:J
-
-    move-object v1, p0
-
-    move-wide v4, p1
-
-    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
-
-    return-void
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lr0/l/e/n/o;->consumerIndex:J
-
-    invoke-virtual {p0, v0, v1}, Lr0/l/e/n/e;->c(J)J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Lr0/l/e/n/e;->e:[Ljava/lang/Object;
-
-    invoke-virtual {p0, v2, v0, v1}, Lr0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-wide v0, p0, Lr0/l/e/n/o;->consumerIndex:J
-
-    invoke-virtual {p0, v0, v1}, Lr0/l/e/n/e;->c(J)J
-
-    move-result-wide v2
-
-    iget-object v4, p0, Lr0/l/e/n/e;->e:[Ljava/lang/Object;
-
-    invoke-virtual {p0, v4, v2, v3}, Lr0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v5
-
-    const/4 v6, 0x0
-
-    if-nez v5, :cond_0
-
-    return-object v6
-
-    :cond_0
-    invoke-virtual {p0, v4, v2, v3, v6}, Lr0/l/e/n/e;->k([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    const-wide/16 v2, 0x1
-
-    add-long/2addr v0, v2
-
-    invoke-virtual {p0, v0, v1}, Lr0/l/e/n/n;->p(J)V
-
-    return-object v5
-.end method
-
-.method public final q(J)V
-    .locals 6
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v2, Lr0/l/e/n/r;->j:J
-
-    move-object v1, p0
-
-    move-wide v4, p1
-
-    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
-
-    return-void
-.end method
-
-.method public size()I
-    .locals 7
-
-    invoke-virtual {p0}, Lr0/l/e/n/n;->m()J
-
-    move-result-wide v0
-
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/e/n/n;->o()J
-
-    move-result-wide v2
-
-    invoke-virtual {p0}, Lr0/l/e/n/n;->m()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_0
-
-    sub-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    return v0
-
-    :cond_0
-    move-wide v0, v4
-
-    goto :goto_0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/o.smali b/com.discord/smali_classes2/r0/l/e/n/o.smali
deleted file mode 100644
index fef9a97055..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/o.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class public abstract Lr0/l/e/n/o;
-.super Lr0/l/e/n/q;
-.source "SpscArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/q<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final k:J
-
-
-# instance fields
-.field public consumerIndex:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lr0/l/e/n/o;
-
-    const-string v1, "consumerIndex"
-
-    invoke-static {v0, v1}, Lr0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/o;->k:J
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/q;-><init>(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/p.smali b/com.discord/smali_classes2/r0/l/e/n/p.smali
deleted file mode 100644
index 4af2a654e3..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/p.smali
+++ /dev/null
@@ -1,55 +0,0 @@
-.class public abstract Lr0/l/e/n/p;
-.super Lr0/l/e/n/e;
-.source "SpscArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/p<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final i:Ljava/lang/Integer;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-string v0, "jctools.spsc.max.lookahead.step"
-
-    const/16 v1, 0x1000
-
-    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    sput-object v0, Lr0/l/e/n/p;->i:Ljava/lang/Integer;
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 1
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/e;-><init>(I)V
-
-    div-int/lit8 p1, p1, 0x4
-
-    sget-object v0, Lr0/l/e/n/p;->i:Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/q.smali b/com.discord/smali_classes2/r0/l/e/n/q.smali
deleted file mode 100644
index 118caaaf28..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/q.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public abstract Lr0/l/e/n/q;
-.super Lr0/l/e/n/r;
-.source "SpscArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/r<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/r;-><init>(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/r.smali b/com.discord/smali_classes2/r0/l/e/n/r.smali
deleted file mode 100644
index 136a6495bd..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/r.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.class public abstract Lr0/l/e/n/r;
-.super Lr0/l/e/n/p;
-.source "SpscArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/p<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final j:J
-
-
-# instance fields
-.field public producerIndex:J
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const-class v0, Lr0/l/e/n/r;
-
-    const-string v1, "producerIndex"
-
-    invoke-static {v0, v1}, Lr0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/r;->j:J
-
-    return-void
-.end method
-
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lr0/l/e/n/p;-><init>(I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/s.smali b/com.discord/smali_classes2/r0/l/e/n/s.smali
deleted file mode 100644
index 160931fbbd..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/s.smali
+++ /dev/null
@@ -1,203 +0,0 @@
-.class public final Lr0/l/e/n/s;
-.super Lr0/l/e/n/a;
-.source "SpscLinkedQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/s<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Lr0/l/e/n/a;-><init>()V
-
-    new-instance v0, Lr0/l/e/m/b;
-
-    invoke-direct {v0}, Lr0/l/e/m/b;-><init>()V
-
-    iput-object v0, p0, Lr0/l/e/n/d;->producerNode:Lr0/l/e/m/b;
-
-    iput-object v0, p0, Lr0/l/e/n/a;->consumerNode:Lr0/l/e/m/b;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final isEmpty()Z
-    .locals 2
-
-    invoke-virtual {p0}, Lr0/l/e/n/a;->h()Lr0/l/e/m/b;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lr0/l/e/n/d;->c()Lr0/l/e/m/b;
-
-    move-result-object v1
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public final iterator()Ljava/util/Iterator;
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public offer(Ljava/lang/Object;)Z
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    if-eqz p1, :cond_0
-
-    new-instance v0, Lr0/l/e/m/b;
-
-    invoke-direct {v0, p1}, Lr0/l/e/m/b;-><init>(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/l/e/n/d;->producerNode:Lr0/l/e/m/b;
-
-    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Lr0/l/e/n/d;->producerNode:Lr0/l/e/m/b;
-
-    const/4 p1, 0x1
-
-    return p1
-
-    :cond_0
-    new-instance p1, Ljava/lang/NullPointerException;
-
-    const-string v0, "null elements not allowed"
-
-    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public peek()Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/n/a;->consumerNode:Lr0/l/e/m/b;
-
-    invoke-virtual {v0}, Lr0/l/e/m/b;->a()Lr0/l/e/m/b;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, v0, Lr0/l/e/m/b;->value:Ljava/lang/Object;
-
-    return-object v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return-object v0
-.end method
-
-.method public poll()Ljava/lang/Object;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/n/a;->consumerNode:Lr0/l/e/m/b;
-
-    invoke-virtual {v0}, Lr0/l/e/m/b;->a()Lr0/l/e/m/b;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    iget-object v2, v0, Lr0/l/e/m/b;->value:Ljava/lang/Object;
-
-    iput-object v1, v0, Lr0/l/e/m/b;->value:Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/e/n/a;->consumerNode:Lr0/l/e/m/b;
-
-    return-object v2
-
-    :cond_0
-    return-object v1
-.end method
-
-.method public final size()I
-    .locals 4
-
-    invoke-virtual {p0}, Lr0/l/e/n/a;->h()Lr0/l/e/m/b;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lr0/l/e/n/d;->c()Lr0/l/e/m/b;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    :goto_0
-    if-eq v0, v1, :cond_1
-
-    const v3, 0x7fffffff
-
-    if-ge v2, v3, :cond_1
-
-    :goto_1
-    invoke-virtual {v0}, Lr0/l/e/m/b;->a()Lr0/l/e/m/b;
-
-    move-result-object v3
-
-    if-nez v3, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    add-int/lit8 v2, v2, 0x1
-
-    move-object v0, v3
-
-    goto :goto_0
-
-    :cond_1
-    return v2
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/t.smali b/com.discord/smali_classes2/r0/l/e/n/t.smali
deleted file mode 100644
index f1b9960cb8..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/t.smali
+++ /dev/null
@@ -1,701 +0,0 @@
-.class public Lr0/l/e/n/t;
-.super Lr0/l/e/n/v;
-.source "SpscUnboundedArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/v<",
-        "TE;>;",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final j:I
-
-.field public static final k:J
-
-.field public static final l:J
-
-.field public static final m:J
-
-.field public static final n:I
-
-.field public static final o:Ljava/lang/Object;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 3
-
-    const-class v0, [Ljava/lang/Object;
-
-    const-string v1, "jctools.spsc.max.lookahead.step"
-
-    const/16 v2, 0x1000
-
-    invoke-static {v1, v2}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
-
-    sput v1, Lr0/l/e/n/t;->j:I
-
-    new-instance v1, Ljava/lang/Object;
-
-    invoke-direct {v1}, Ljava/lang/Object;-><init>()V
-
-    sput-object v1, Lr0/l/e/n/t;->o:Ljava/lang/Object;
-
-    sget-object v1, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayIndexScale(Ljava/lang/Class;)I
-
-    move-result v1
-
-    const/4 v2, 0x4
-
-    if-ne v2, v1, :cond_0
-
-    const/4 v1, 0x2
-
-    sput v1, Lr0/l/e/n/t;->n:I
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v2, 0x8
-
-    if-ne v2, v1, :cond_1
-
-    const/4 v1, 0x3
-
-    sput v1, Lr0/l/e/n/t;->n:I
-
-    :goto_0
-    sget-object v1, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayBaseOffset(Ljava/lang/Class;)I
-
-    move-result v0
-
-    int-to-long v0, v0
-
-    sput-wide v0, Lr0/l/e/n/t;->m:J
-
-    :try_start_0
-    const-class v0, Lr0/l/e/n/x;
-
-    const-string v1, "producerIndex"
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v0
-
-    sget-object v1, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/t;->k:J
-    :try_end_0
-    .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_1
-
-    :try_start_1
-    const-class v0, Lr0/l/e/n/v;
-
-    const-string v1, "consumerIndex"
-
-    invoke-virtual {v0, v1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v0
-
-    sget-object v1, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
-
-    move-result-wide v0
-
-    sput-wide v0, Lr0/l/e/n/t;->l:J
-    :try_end_1
-    .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_0
-
-    return-void
-
-    :catch_0
-    move-exception v0
-
-    new-instance v1, Ljava/lang/InternalError;
-
-    invoke-direct {v1}, Ljava/lang/InternalError;-><init>()V
-
-    invoke-virtual {v1, v0}, Ljava/lang/InternalError;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw v1
-
-    :catch_1
-    move-exception v0
-
-    new-instance v1, Ljava/lang/InternalError;
-
-    invoke-direct {v1}, Ljava/lang/InternalError;-><init>()V
-
-    invoke-virtual {v1, v0}, Ljava/lang/InternalError;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw v1
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Unknown pointer size"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public constructor <init>(I)V
-    .locals 4
-
-    invoke-direct {p0}, Lr0/l/e/n/v;-><init>()V
-
-    invoke-static {p1}, Lf/n/a/k/a;->V(I)I
-
-    move-result p1
-
-    add-int/lit8 v0, p1, -0x1
-
-    int-to-long v0, v0
-
-    add-int/lit8 v2, p1, 0x1
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    iput-object v2, p0, Lr0/l/e/n/w;->g:[Ljava/lang/Object;
-
-    iput-wide v0, p0, Lr0/l/e/n/w;->f:J
-
-    div-int/lit8 p1, p1, 0x4
-
-    sget v3, Lr0/l/e/n/t;->j:I
-
-    invoke-static {p1, v3}, Ljava/lang/Math;->min(II)I
-
-    move-result p1
-
-    iput p1, p0, Lr0/l/e/n/w;->d:I
-
-    iput-object v2, p0, Lr0/l/e/n/u;->i:[Ljava/lang/Object;
-
-    iput-wide v0, p0, Lr0/l/e/n/u;->h:J
-
-    const-wide/16 v2, 0x1
-
-    sub-long/2addr v0, v2
-
-    iput-wide v0, p0, Lr0/l/e/n/w;->e:J
-
-    const-wide/16 v0, 0x0
-
-    invoke-virtual {p0, v0, v1}, Lr0/l/e/n/t;->p(J)V
-
-    return-void
-.end method
-
-.method public static c(J)J
-    .locals 3
-
-    sget-wide v0, Lr0/l/e/n/t;->m:J
-
-    sget v2, Lr0/l/e/n/t;->n:I
-
-    shl-long/2addr p0, v2
-
-    add-long/2addr v0, p0
-
-    return-wide v0
-.end method
-
-.method public static h(JJ)J
-    .locals 0
-
-    and-long/2addr p0, p2
-
-    invoke-static {p0, p1}, Lr0/l/e/n/t;->c(J)J
-
-    move-result-wide p0
-
-    return-wide p0
-.end method
-
-.method public static k([Ljava/lang/Object;J)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<E:",
-            "Ljava/lang/Object;",
-            ">([TE;J)",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v0, p0, p1, p2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method public static o([Ljava/lang/Object;JLjava/lang/Object;)V
-    .locals 1
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {v0, p0, p1, p2, p3}, Lsun/misc/Unsafe;->putOrderedObject(Ljava/lang/Object;JLjava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final iterator()Ljava/util/Iterator;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Iterator<",
-            "TE;>;"
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final j()J
-    .locals 3
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v1, Lr0/l/e/n/t;->l:J
-
-    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final l()J
-    .locals 3
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v1, Lr0/l/e/n/t;->k:J
-
-    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final m(J)V
-    .locals 6
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v2, Lr0/l/e/n/t;->l:J
-
-    move-object v1, p0
-
-    move-wide v4, p1
-
-    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
-
-    return-void
-.end method
-
-.method public final offer(Ljava/lang/Object;)Z
-    .locals 15
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TE;)Z"
-        }
-    .end annotation
-
-    move-object v7, p0
-
-    move-object/from16 v2, p1
-
-    if-eqz v2, :cond_3
-
-    iget-object v1, v7, Lr0/l/e/n/w;->g:[Ljava/lang/Object;
-
-    iget-wide v3, v7, Lr0/l/e/n/x;->producerIndex:J
-
-    iget-wide v5, v7, Lr0/l/e/n/w;->f:J
-
-    invoke-static {v3, v4, v5, v6}, Lr0/l/e/n/t;->h(JJ)J
-
-    move-result-wide v8
-
-    iget-wide v10, v7, Lr0/l/e/n/w;->e:J
-
-    const/4 v12, 0x1
-
-    cmp-long v0, v3, v10
-
-    if-gez v0, :cond_0
-
-    move-object v0, p0
-
-    move-object/from16 v2, p1
-
-    move-wide v5, v8
-
-    invoke-virtual/range {v0 .. v6}, Lr0/l/e/n/t;->q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
-
-    return v12
-
-    :cond_0
-    iget v0, v7, Lr0/l/e/n/w;->d:I
-
-    int-to-long v10, v0
-
-    add-long/2addr v10, v3
-
-    invoke-static {v10, v11, v5, v6}, Lr0/l/e/n/t;->h(JJ)J
-
-    move-result-wide v13
-
-    invoke-static {v1, v13, v14}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    const-wide/16 v13, 0x1
-
-    if-nez v0, :cond_1
-
-    sub-long/2addr v10, v13
-
-    iput-wide v10, v7, Lr0/l/e/n/w;->e:J
-
-    move-object v0, p0
-
-    move-object/from16 v2, p1
-
-    move-wide v5, v8
-
-    invoke-virtual/range {v0 .. v6}, Lr0/l/e/n/t;->q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
-
-    return v12
-
-    :cond_1
-    add-long v10, v3, v13
-
-    invoke-static {v10, v11, v5, v6}, Lr0/l/e/n/t;->h(JJ)J
-
-    move-result-wide v13
-
-    invoke-static {v1, v13, v14}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    move-object v0, p0
-
-    move-object/from16 v2, p1
-
-    move-wide v5, v8
-
-    invoke-virtual/range {v0 .. v6}, Lr0/l/e/n/t;->q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
-
-    return v12
-
-    :cond_2
-    array-length v0, v1
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    iput-object v0, v7, Lr0/l/e/n/w;->g:[Ljava/lang/Object;
-
-    add-long/2addr v5, v3
-
-    const-wide/16 v3, 0x1
-
-    sub-long/2addr v5, v3
-
-    iput-wide v5, v7, Lr0/l/e/n/w;->e:J
-
-    invoke-static {v0, v8, v9, v2}, Lr0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    array-length v2, v1
-
-    add-int/lit8 v2, v2, -0x1
-
-    int-to-long v2, v2
-
-    invoke-static {v2, v3}, Lr0/l/e/n/t;->c(J)J
-
-    move-result-wide v2
-
-    invoke-static {v1, v2, v3, v0}, Lr0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    sget-object v0, Lr0/l/e/n/t;->o:Ljava/lang/Object;
-
-    invoke-static {v1, v8, v9, v0}, Lr0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    invoke-virtual {p0, v10, v11}, Lr0/l/e/n/t;->p(J)V
-
-    return v12
-
-    :cond_3
-    new-instance v0, Ljava/lang/NullPointerException;
-
-    const-string v1, "Null is not a valid element"
-
-    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final p(J)V
-    .locals 6
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    sget-wide v2, Lr0/l/e/n/t;->k:J
-
-    move-object v1, p0
-
-    move-wide v4, p1
-
-    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
-
-    return-void
-.end method
-
-.method public final peek()Ljava/lang/Object;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/n/u;->i:[Ljava/lang/Object;
-
-    iget-wide v1, p0, Lr0/l/e/n/v;->consumerIndex:J
-
-    iget-wide v3, p0, Lr0/l/e/n/u;->h:J
-
-    invoke-static {v1, v2, v3, v4}, Lr0/l/e/n/t;->h(JJ)J
-
-    move-result-wide v5
-
-    invoke-static {v0, v5, v6}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v5
-
-    sget-object v6, Lr0/l/e/n/t;->o:Ljava/lang/Object;
-
-    if-ne v5, v6, :cond_0
-
-    array-length v5, v0
-
-    add-int/lit8 v5, v5, -0x1
-
-    int-to-long v5, v5
-
-    invoke-static {v5, v6}, Lr0/l/e/n/t;->c(J)J
-
-    move-result-wide v5
-
-    invoke-static {v0, v5, v6}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/e/n/u;->i:[Ljava/lang/Object;
-
-    invoke-static {v1, v2, v3, v4}, Lr0/l/e/n/t;->h(JJ)J
-
-    move-result-wide v1
-
-    invoke-static {v0, v1, v2}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_0
-    return-object v5
-.end method
-
-.method public final poll()Ljava/lang/Object;
-    .locals 12
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TE;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/l/e/n/u;->i:[Ljava/lang/Object;
-
-    iget-wide v1, p0, Lr0/l/e/n/v;->consumerIndex:J
-
-    iget-wide v3, p0, Lr0/l/e/n/u;->h:J
-
-    invoke-static {v1, v2, v3, v4}, Lr0/l/e/n/t;->h(JJ)J
-
-    move-result-wide v5
-
-    invoke-static {v0, v5, v6}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v7
-
-    sget-object v8, Lr0/l/e/n/t;->o:Ljava/lang/Object;
-
-    if-ne v7, v8, :cond_0
-
-    const/4 v8, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v8, 0x0
-
-    :goto_0
-    const-wide/16 v9, 0x1
-
-    const/4 v11, 0x0
-
-    if-eqz v7, :cond_1
-
-    if-nez v8, :cond_1
-
-    invoke-static {v0, v5, v6, v11}, Lr0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    add-long/2addr v1, v9
-
-    invoke-virtual {p0, v1, v2}, Lr0/l/e/n/t;->m(J)V
-
-    return-object v7
-
-    :cond_1
-    if-eqz v8, :cond_3
-
-    array-length v5, v0
-
-    add-int/lit8 v5, v5, -0x1
-
-    int-to-long v5, v5
-
-    invoke-static {v5, v6}, Lr0/l/e/n/t;->c(J)J
-
-    move-result-wide v5
-
-    invoke-static {v0, v5, v6}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Ljava/lang/Object;
-
-    iput-object v0, p0, Lr0/l/e/n/u;->i:[Ljava/lang/Object;
-
-    invoke-static {v1, v2, v3, v4}, Lr0/l/e/n/t;->h(JJ)J
-
-    move-result-wide v3
-
-    invoke-static {v0, v3, v4}, Lr0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
-
-    move-result-object v5
-
-    if-nez v5, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    invoke-static {v0, v3, v4, v11}, Lr0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    add-long/2addr v1, v9
-
-    invoke-virtual {p0, v1, v2}, Lr0/l/e/n/t;->m(J)V
-
-    move-object v11, v5
-
-    :cond_3
-    :goto_1
-    return-object v11
-.end method
-
-.method public final q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "([TE;TE;JJ)Z"
-        }
-    .end annotation
-
-    invoke-static {p1, p5, p6, p2}, Lr0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
-
-    const-wide/16 p1, 0x1
-
-    add-long/2addr p3, p1
-
-    invoke-virtual {p0, p3, p4}, Lr0/l/e/n/t;->p(J)V
-
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public final size()I
-    .locals 7
-
-    invoke-virtual {p0}, Lr0/l/e/n/t;->j()J
-
-    move-result-wide v0
-
-    :goto_0
-    invoke-virtual {p0}, Lr0/l/e/n/t;->l()J
-
-    move-result-wide v2
-
-    invoke-virtual {p0}, Lr0/l/e/n/t;->j()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_0
-
-    sub-long/2addr v2, v4
-
-    long-to-int v0, v2
-
-    return v0
-
-    :cond_0
-    move-wide v0, v4
-
-    goto :goto_0
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/u.smali b/com.discord/smali_classes2/r0/l/e/n/u.smali
deleted file mode 100644
index b7fb4c30fd..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/u.smali
+++ /dev/null
@@ -1,37 +0,0 @@
-.class public abstract Lr0/l/e/n/u;
-.super Lr0/l/e/n/w;
-.source "SpscUnboundedArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/u<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public h:J
-
-.field public i:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TE;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/l/e/n/w;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/v.smali b/com.discord/smali_classes2/r0/l/e/n/v.smali
deleted file mode 100644
index 18f012d9dc..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/v.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public abstract Lr0/l/e/n/v;
-.super Lr0/l/e/n/u;
-.source "SpscUnboundedArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/u<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public consumerIndex:J
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/l/e/n/u;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/w.smali b/com.discord/smali_classes2/r0/l/e/n/w.smali
deleted file mode 100644
index 45b6a48001..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/w.smali
+++ /dev/null
@@ -1,41 +0,0 @@
-.class public abstract Lr0/l/e/n/w;
-.super Lr0/l/e/n/x;
-.source "SpscUnboundedArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lr0/l/e/n/x<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public d:I
-
-.field public e:J
-
-.field public f:J
-
-.field public g:[Ljava/lang/Object;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "[TE;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/l/e/n/x;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/x.smali b/com.discord/smali_classes2/r0/l/e/n/x.smali
deleted file mode 100644
index f700bdce63..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/x.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public abstract Lr0/l/e/n/x;
-.super Ljava/util/AbstractQueue;
-.source "SpscUnboundedArrayQueue.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<E:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/AbstractQueue<",
-        "TE;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public producerIndex:J
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/l/e/n/y.smali b/com.discord/smali_classes2/r0/l/e/n/y.smali
deleted file mode 100644
index 6ede9c773d..0000000000
--- a/com.discord/smali_classes2/r0/l/e/n/y.smali
+++ /dev/null
@@ -1,124 +0,0 @@
-.class public final Lr0/l/e/n/y;
-.super Ljava/lang/Object;
-.source "UnsafeAccess.java"
-
-
-# static fields
-.field public static final a:Lsun/misc/Unsafe;
-
-.field public static final b:Z
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const-string v0, "rx.unsafe-disable"
-
-    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v1, 0x1
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    sput-boolean v0, Lr0/l/e/n/y;->b:Z
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    const-class v2, Lsun/misc/Unsafe;
-
-    const-string v3, "theUnsafe"
-
-    invoke-virtual {v2, v3}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object v2
-
-    invoke-virtual {v2, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V
-
-    invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lsun/misc/Unsafe;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    move-object v0, v1
-
-    :catchall_0
-    sput-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    return-void
-.end method
-
-.method public static a(Ljava/lang/Class;Ljava/lang/String;)J
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/lang/String;",
-            ")J"
-        }
-    .end annotation
-
-    :try_start_0
-    invoke-virtual {p0, p1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
-    move-result-object p0
-
-    sget-object p1, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    invoke-virtual {p1, p0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
-
-    move-result-wide p0
-    :try_end_0
-    .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-wide p0
-
-    :catch_0
-    move-exception p0
-
-    new-instance p1, Ljava/lang/InternalError;
-
-    invoke-direct {p1}, Ljava/lang/InternalError;-><init>()V
-
-    invoke-virtual {p1, p0}, Ljava/lang/InternalError;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-
-    throw p1
-.end method
-
-.method public static b()Z
-    .locals 1
-
-    sget-object v0, Lr0/l/e/n/y;->a:Lsun/misc/Unsafe;
-
-    if-eqz v0, :cond_0
-
-    sget-boolean v0, Lr0/l/e/n/y;->b:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
diff --git a/com.discord/smali_classes2/r0/m$a.smali b/com.discord/smali_classes2/r0/m$a.smali
new file mode 100644
index 0000000000..bc0f28df8c
--- /dev/null
+++ b/com.discord/smali_classes2/r0/m$a.smali
@@ -0,0 +1,76 @@
+.class public Lr0/m$a;
+.super Lokhttp3/RequestBody;
+.source "RequestBuilder.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/m;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:Lokhttp3/RequestBody;
+
+.field public final b:Lokhttp3/MediaType;
+
+
+# direct methods
+.method public constructor <init>(Lokhttp3/RequestBody;Lokhttp3/MediaType;)V
+    .locals 0
+
+    invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
+
+    iput-object p1, p0, Lr0/m$a;->a:Lokhttp3/RequestBody;
+
+    iput-object p2, p0, Lr0/m$a;->b:Lokhttp3/MediaType;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public contentLength()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lr0/m$a;->a:Lokhttp3/RequestBody;
+
+    invoke-virtual {v0}, Lokhttp3/RequestBody;->contentLength()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public contentType()Lokhttp3/MediaType;
+    .locals 1
+
+    iget-object v0, p0, Lr0/m$a;->b:Lokhttp3/MediaType;
+
+    return-object v0
+.end method
+
+.method public writeTo(Lokio/BufferedSink;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    iget-object v0, p0, Lr0/m$a;->a:Lokhttp3/RequestBody;
+
+    invoke-virtual {v0, p1}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/m.smali b/com.discord/smali_classes2/r0/m.smali
new file mode 100644
index 0000000000..dd03bddd6a
--- /dev/null
+++ b/com.discord/smali_classes2/r0/m.smali
@@ -0,0 +1,667 @@
+.class public final Lr0/m;
+.super Ljava/lang/Object;
+.source "RequestBuilder.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/m$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final k:[C
+
+
+# instance fields
+.field public final a:Ljava/lang/String;
+
+.field public final b:Lo0/w;
+
+.field public c:Ljava/lang/String;
+
+.field public d:Lo0/w$a;
+
+.field public final e:Lo0/a0$a;
+
+.field public f:Lokhttp3/MediaType;
+
+.field public final g:Z
+
+.field public h:Lokhttp3/MultipartBody$a;
+
+.field public i:Lo0/u$a;
+
+.field public j:Lokhttp3/RequestBody;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/16 v0, 0x10
+
+    new-array v0, v0, [C
+
+    fill-array-data v0, :array_0
+
+    sput-object v0, Lr0/m;->k:[C
+
+    return-void
+
+    :array_0
+    .array-data 2
+        0x30s
+        0x31s
+        0x32s
+        0x33s
+        0x34s
+        0x35s
+        0x36s
+        0x37s
+        0x38s
+        0x39s
+        0x41s
+        0x42s
+        0x43s
+        0x44s
+        0x45s
+        0x46s
+    .end array-data
+.end method
+
+.method public constructor <init>(Ljava/lang/String;Lo0/w;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/MediaType;ZZZ)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/m;->a:Ljava/lang/String;
+
+    iput-object p2, p0, Lr0/m;->b:Lo0/w;
+
+    iput-object p3, p0, Lr0/m;->c:Ljava/lang/String;
+
+    new-instance p1, Lo0/a0$a;
+
+    invoke-direct {p1}, Lo0/a0$a;-><init>()V
+
+    iput-object p1, p0, Lr0/m;->e:Lo0/a0$a;
+
+    iput-object p5, p0, Lr0/m;->f:Lokhttp3/MediaType;
+
+    iput-boolean p6, p0, Lr0/m;->g:Z
+
+    if-eqz p4, :cond_0
+
+    const-string p2, "headers"
+
+    invoke-static {p4, p2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p4}, Lokhttp3/Headers;->j()Lokhttp3/Headers$a;
+
+    move-result-object p2
+
+    iput-object p2, p1, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    :cond_0
+    if-eqz p7, :cond_1
+
+    new-instance p1, Lo0/u$a;
+
+    invoke-direct {p1}, Lo0/u$a;-><init>()V
+
+    iput-object p1, p0, Lr0/m;->i:Lo0/u$a;
+
+    goto :goto_0
+
+    :cond_1
+    if-eqz p8, :cond_2
+
+    new-instance p1, Lokhttp3/MultipartBody$a;
+
+    invoke-direct {p1}, Lokhttp3/MultipartBody$a;-><init>()V
+
+    iput-object p1, p0, Lr0/m;->h:Lokhttp3/MultipartBody$a;
+
+    sget-object p2, Lokhttp3/MultipartBody;->g:Lokhttp3/MediaType;
+
+    invoke-virtual {p1, p2}, Lokhttp3/MultipartBody$a;->c(Lokhttp3/MediaType;)Lokhttp3/MultipartBody$a;
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/String;Ljava/lang/String;Z)V
+    .locals 22
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v2, p1
+
+    move-object/from16 v12, p2
+
+    const-string v1, "value"
+
+    const-string v3, "name"
+
+    const/4 v4, 0x0
+
+    if-eqz p3, :cond_1
+
+    iget-object v13, v0, Lr0/m;->i:Lo0/u$a;
+
+    if-eqz v13, :cond_0
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v14, v13, Lo0/u$a;->a:Ljava/util/List;
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    iget-object v10, v13, Lo0/u$a;->c:Ljava/nio/charset/Charset;
+
+    const/4 v15, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v16, 0x1
+
+    const/16 v17, 0x0
+
+    const/16 v18, 0x1
+
+    const/16 v19, 0x0
+
+    const/16 v20, 0x53
+
+    const/16 v21, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v6, 0x1
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    const/16 v11, 0x53
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
+
+    move-object/from16 v2, p1
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v14, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    iget-object v14, v13, Lo0/u$a;->b:Ljava/util/List;
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    iget-object v10, v13, Lo0/u$a;->c:Ljava/nio/charset/Charset;
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
+
+    move-object/from16 v2, p2
+
+    move/from16 v3, v21
+
+    move v4, v15
+
+    move/from16 v6, v16
+
+    move/from16 v7, v17
+
+    move/from16 v8, v18
+
+    move/from16 v9, v19
+
+    move/from16 v11, v20
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v14, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    throw v4
+
+    :cond_1
+    iget-object v13, v0, Lr0/m;->i:Lo0/u$a;
+
+    if-eqz v13, :cond_2
+
+    invoke-static {v2, v3}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v12, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v14, v13, Lo0/u$a;->a:Ljava/util/List;
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    iget-object v10, v13, Lo0/u$a;->c:Ljava/nio/charset/Charset;
+
+    const/4 v15, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v16, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v17, 0x1
+
+    const/16 v18, 0x0
+
+    const/16 v19, 0x5b
+
+    const/16 v20, 0x0
+
+    const/16 v21, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    const/16 v11, 0x5b
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
+
+    move-object/from16 v2, p1
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v14, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    iget-object v14, v13, Lo0/u$a;->b:Ljava/util/List;
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    iget-object v10, v13, Lo0/u$a;->c:Ljava/nio/charset/Charset;
+
+    const-string v5, " \"\':;<=>@[]^`{}|/\\?#&!$(),~"
+
+    move-object/from16 v2, p2
+
+    move/from16 v3, v20
+
+    move v4, v15
+
+    move/from16 v6, v21
+
+    move/from16 v7, v16
+
+    move/from16 v8, v17
+
+    move/from16 v9, v18
+
+    move/from16 v11, v19
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v14, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    :goto_0
+    return-void
+
+    :cond_2
+    throw v4
+.end method
+
+.method public b(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 2
+
+    const-string v0, "Content-Type"
+
+    invoke-virtual {v0, p1}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-static {p2}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    iput-object p1, p0, Lr0/m;->f:Lokhttp3/MediaType;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Malformed content type: "
+
+    invoke-static {v0, p2}, Lf/e/b/a/a;->p(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    iget-object v0, p0, Lr0/m;->e:Lo0/a0$a;
+
+    if-eqz v0, :cond_2
+
+    const-string v1, "name"
+
+    invoke-static {p1, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "value"
+
+    invoke-static {p2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, v0, Lo0/a0$a;->c:Lokhttp3/Headers$a;
+
+    invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :goto_0
+    return-void
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
+    .locals 5
+
+    iget-object v0, p0, Lr0/m;->h:Lokhttp3/MultipartBody$a;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_6
+
+    const-string v2, "body"
+
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2, v2}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p1, :cond_0
+
+    const-string v2, "Content-Type"
+
+    invoke-virtual {p1, v2}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_0
+
+    :cond_0
+    move-object v2, v1
+
+    :goto_0
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-nez v2, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_5
+
+    if-eqz p1, :cond_2
+
+    const-string v2, "Content-Length"
+
+    invoke-virtual {p1, v2}, Lokhttp3/Headers;->c(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_2
+
+    :cond_2
+    move-object v2, v1
+
+    :goto_2
+    if-nez v2, :cond_3
+
+    const/4 v3, 0x1
+
+    :cond_3
+    if-eqz v3, :cond_4
+
+    new-instance v2, Lokhttp3/MultipartBody$Part;
+
+    invoke-direct {v2, p1, p2, v1}, Lokhttp3/MultipartBody$Part;-><init>(Lokhttp3/Headers;Lokhttp3/RequestBody;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-virtual {v0, v2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/MultipartBody$Part;)Lokhttp3/MultipartBody$a;
+
+    return-void
+
+    :cond_4
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Unexpected header: Content-Length"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_5
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "Unexpected header: Content-Type"
+
+    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_6
+    throw v1
+.end method
+
+.method public d(Ljava/lang/String;Ljava/lang/String;Z)V
+    .locals 16
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v2, p1
+
+    move-object/from16 v12, p2
+
+    iget-object v1, v0, Lr0/m;->c:Ljava/lang/String;
+
+    const/4 v13, 0x0
+
+    if-eqz v1, :cond_1
+
+    iget-object v3, v0, Lr0/m;->b:Lo0/w;
+
+    invoke-virtual {v3, v1}, Lo0/w;->g(Ljava/lang/String;)Lo0/w$a;
+
+    move-result-object v1
+
+    iput-object v1, v0, Lr0/m;->d:Lo0/w$a;
+
+    if-eqz v1, :cond_0
+
+    iput-object v13, v0, Lr0/m;->c:Ljava/lang/String;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "Malformed URL. Base: "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    iget-object v3, v0, Lr0/m;->b:Lo0/w;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v3, ", Relative: "
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v3, v0, Lr0/m;->c:Ljava/lang/String;
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    if-eqz p3, :cond_2
+
+    iget-object v1, v0, Lr0/m;->d:Lo0/w$a;
+
+    invoke-virtual {v1, v2, v12}, Lo0/w$a;->a(Ljava/lang/String;Ljava/lang/String;)Lo0/w$a;
+
+    goto :goto_1
+
+    :cond_2
+    iget-object v14, v0, Lr0/m;->d:Lo0/w$a;
+
+    if-eqz v14, :cond_7
+
+    const-string v1, "name"
+
+    invoke-static {v2, v1}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, v14, Lo0/w$a;->g:Ljava/util/List;
+
+    if-nez v1, :cond_3
+
+    new-instance v1, Ljava/util/ArrayList;
+
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v1, v14, Lo0/w$a;->g:Ljava/util/List;
+
+    :cond_3
+    iget-object v15, v14, Lo0/w$a;->g:Ljava/util/List;
+
+    if-eqz v15, :cond_6
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0xdb
+
+    const-string v5, " !\"#$&\'(),/:;<=>?@[]\\^`{|}~"
+
+    move-object/from16 v2, p1
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-interface {v15, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    iget-object v14, v14, Lo0/w$a;->g:Ljava/util/List;
+
+    if-eqz v14, :cond_5
+
+    if-eqz v12, :cond_4
+
+    sget-object v1, Lo0/w;->l:Lo0/w$b;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x1
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0xdb
+
+    const-string v5, " !\"#$&\'(),/:;<=>?@[]\\^`{|}~"
+
+    move-object/from16 v2, p2
+
+    invoke-static/range {v1 .. v11}, Lo0/w$b;->a(Lo0/w$b;Ljava/lang/String;IILjava/lang/String;ZZZZLjava/nio/charset/Charset;I)Ljava/lang/String;
+
+    move-result-object v13
+
+    :cond_4
+    invoke-interface {v14, v13}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :goto_1
+    return-void
+
+    :cond_5
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v13
+
+    :cond_6
+    invoke-static {}, Lk0/o/c/i;->throwNpe()V
+
+    throw v13
+
+    :cond_7
+    throw v13
+.end method
diff --git a/com.discord/smali_classes2/r0/m/a.smali b/com.discord/smali_classes2/r0/m/a.smali
deleted file mode 100644
index 6527466f63..0000000000
--- a/com.discord/smali_classes2/r0/m/a.smali
+++ /dev/null
@@ -1,77 +0,0 @@
-.class public Lr0/m/a;
-.super Lrx/Subscriber;
-.source "BlockingObservable.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Ljava/util/concurrent/CountDownLatch;
-
-.field public final synthetic e:Ljava/util/concurrent/atomic/AtomicReference;
-
-.field public final synthetic f:Ljava/util/concurrent/atomic/AtomicReference;
-
-
-# direct methods
-.method public constructor <init>(Lr0/m/b;Ljava/util/concurrent/CountDownLatch;Ljava/util/concurrent/atomic/AtomicReference;Ljava/util/concurrent/atomic/AtomicReference;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/m/a;->d:Ljava/util/concurrent/CountDownLatch;
-
-    iput-object p3, p0, Lr0/m/a;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    iput-object p4, p0, Lr0/m/a;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/m/a;->d:Ljava/util/concurrent/CountDownLatch;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/m/a;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    iget-object p1, p0, Lr0/m/a;->d:Ljava/util/concurrent/CountDownLatch;
-
-    invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/m/a;->f:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/m/b.smali b/com.discord/smali_classes2/r0/m/b.smali
deleted file mode 100644
index b9c0012d8f..0000000000
--- a/com.discord/smali_classes2/r0/m/b.smali
+++ /dev/null
@@ -1,154 +0,0 @@
-.class public final Lr0/m/b;
-.super Ljava/lang/Object;
-.source "BlockingObservable.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "+TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable<",
-            "+TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/m/b;->a:Lrx/Observable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a()Ljava/lang/Object;
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/m/b;->a:Lrx/Observable;
-
-    sget-object v1, Lr0/l/a/u1$a;->a:Lr0/l/a/u1;
-
-    new-instance v2, Lr0/l/a/u;
-
-    iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
-
-    invoke-direct {v2, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
-
-    invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    new-instance v2, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v2}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    new-instance v3, Ljava/util/concurrent/CountDownLatch;
-
-    const/4 v4, 0x1
-
-    invoke-direct {v3, v4}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
-
-    new-instance v4, Lr0/m/a;
-
-    invoke-direct {v4, p0, v3, v2, v1}, Lr0/m/a;-><init>(Lr0/m/b;Ljava/util/concurrent/CountDownLatch;Ljava/util/concurrent/atomic/AtomicReference;Ljava/util/concurrent/atomic/AtomicReference;)V
-
-    invoke-virtual {v0, v4}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
-
-    move-result-object v0
-
-    invoke-virtual {v3}, Ljava/util/concurrent/CountDownLatch;->getCount()J
-
-    move-result-wide v4
-
-    const-wide/16 v6, 0x0
-
-    cmp-long v8, v4, v6
-
-    if-nez v8, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_0
-    invoke-virtual {v3}, Ljava/util/concurrent/CountDownLatch;->await()V
-    :try_end_0
-    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :goto_0
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    return-object v0
-
-    :cond_1
-    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Throwable;
-
-    invoke-static {v0}, Lf/n/a/k/a;->R(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
-
-    const/4 v0, 0x0
-
-    throw v0
-
-    :catch_0
-    move-exception v1
-
-    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v2, "Interrupted while waiting for subscription to complete."
-
-    invoke-direct {v0, v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/r0/m/c.smali b/com.discord/smali_classes2/r0/m/c.smali
deleted file mode 100644
index ea30429ca4..0000000000
--- a/com.discord/smali_classes2/r0/m/c.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public abstract Lr0/m/c;
-.super Lrx/Observable;
-.source "ConnectableObservable.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Observable<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lrx/Observable$a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Observable$a<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public abstract g0(Lrx/functions/Action1;)V
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/functions/Action1<",
-            "-",
-            "Lrx/Subscription;",
-            ">;)V"
-        }
-    .end annotation
-.end method
diff --git a/com.discord/smali_classes2/r0/n.smali b/com.discord/smali_classes2/r0/n.smali
new file mode 100644
index 0000000000..f4228440b1
--- /dev/null
+++ b/com.discord/smali_classes2/r0/n.smali
@@ -0,0 +1,109 @@
+.class public final Lr0/n;
+.super Ljava/lang/Object;
+.source "Response.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lokhttp3/Response;
+
+.field public final b:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Lokhttp3/ResponseBody;
+
+
+# direct methods
+.method public constructor <init>(Lokhttp3/Response;Ljava/lang/Object;Lokhttp3/ResponseBody;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lokhttp3/Response;",
+            "TT;",
+            "Lokhttp3/ResponseBody;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/n;->a:Lokhttp3/Response;
+
+    iput-object p2, p0, Lr0/n;->b:Ljava/lang/Object;
+
+    iput-object p3, p0, Lr0/n;->c:Lokhttp3/ResponseBody;
+
+    return-void
+.end method
+
+.method public static a(Ljava/lang/Object;Lokhttp3/Response;)Lr0/n;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(TT;",
+            "Lokhttp3/Response;",
+            ")",
+            "Lr0/n<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "rawResponse == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lokhttp3/Response;->b()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lr0/n;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, p1, p0, v1}, Lr0/n;-><init>(Lokhttp3/Response;Ljava/lang/Object;Lokhttp3/ResponseBody;)V
+
+    return-object v0
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string p1, "rawResponse must be successful response"
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lr0/n;->a:Lokhttp3/Response;
+
+    invoke-virtual {v0}, Lokhttp3/Response;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/n/a$a.smali b/com.discord/smali_classes2/r0/n/a$a.smali
deleted file mode 100644
index ec8ce3821b..0000000000
--- a/com.discord/smali_classes2/r0/n/a$a.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class public final Lr0/n/a$a;
-.super Ljava/lang/Object;
-.source "Observers.java"
-
-# interfaces
-.implements Lr0/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/n/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/g<",
-        "Ljava/lang/Object;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onCompleted()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public final onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    new-instance v0, Lrx/exceptions/OnErrorNotImplementedException;
-
-    invoke-direct {v0, p1}, Lrx/exceptions/OnErrorNotImplementedException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-.method public final onNext(Ljava/lang/Object;)V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/n/a.smali b/com.discord/smali_classes2/r0/n/a.smali
deleted file mode 100644
index 871ee2cf6f..0000000000
--- a/com.discord/smali_classes2/r0/n/a.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lr0/n/a;
-.super Ljava/lang/Object;
-.source "Observers.java"
-
-
-# static fields
-.field public static final a:Lr0/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/g<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/n/a$a;
-
-    invoke-direct {v0}, Lr0/n/a$a;-><init>()V
-
-    sput-object v0, Lr0/n/a;->a:Lr0/g;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/n/b.smali b/com.discord/smali_classes2/r0/n/b.smali
deleted file mode 100644
index 9efbdde905..0000000000
--- a/com.discord/smali_classes2/r0/n/b.smali
+++ /dev/null
@@ -1,333 +0,0 @@
-.class public Lr0/n/b;
-.super Lrx/Subscriber;
-.source "SafeSubscriber.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    iput-object p1, p0, Lr0/n/b;->d:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 3
-
-    iget-boolean v0, p0, Lr0/n/b;->e:Z
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/n/b;->e:Z
-
-    :try_start_0
-    iget-object v0, p0, Lr0/n/b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    invoke-static {v0}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    new-instance v1, Lrx/exceptions/UnsubscribeFailedException;
-
-    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2, v0}, Lrx/exceptions/UnsubscribeFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :catchall_1
-    move-exception v0
-
-    :try_start_2
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-static {v0}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    new-instance v1, Lrx/exceptions/OnCompletedFailedException;
-
-    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2, v0}, Lrx/exceptions/OnCompletedFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    :catchall_2
-    move-exception v0
-
-    :try_start_3
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_3
-
-    throw v0
-
-    :catchall_3
-    move-exception v0
-
-    invoke-static {v0}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    new-instance v1, Lrx/exceptions/UnsubscribeFailedException;
-
-    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2, v0}, Lrx/exceptions/UnsubscribeFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v1
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 8
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iget-boolean v0, p0, Lr0/n/b;->e:Z
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/n/b;->e:Z
-
-    sget-object v1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x2
-
-    :try_start_0
-    iget-object v3, p0, Lr0/n/b;->d:Lrx/Subscriber;
-
-    invoke-interface {v3, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-    :try_end_0
-    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_1
-
-    :try_start_1
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    new-instance v0, Lrx/exceptions/OnErrorFailedException;
-
-    invoke-direct {v0, p1}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-
-    :catchall_1
-    move-exception v3
-
-    invoke-static {v3}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    :try_start_2
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_2
-
-    new-instance v4, Lrx/exceptions/OnErrorFailedException;
-
-    new-instance v5, Lrx/exceptions/CompositeException;
-
-    new-array v2, v2, [Ljava/lang/Throwable;
-
-    aput-object p1, v2, v1
-
-    aput-object v3, v2, v0
-
-    invoke-static {v2}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-direct {v5, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    const-string p1, "Error occurred when trying to propagate error to Observer.onError"
-
-    invoke-direct {v4, p1, v5}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v4
-
-    :catchall_2
-    move-exception v4
-
-    invoke-static {v4}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    new-instance v5, Lrx/exceptions/OnErrorFailedException;
-
-    new-instance v6, Lrx/exceptions/CompositeException;
-
-    const/4 v7, 0x3
-
-    new-array v7, v7, [Ljava/lang/Throwable;
-
-    aput-object p1, v7, v1
-
-    aput-object v3, v7, v0
-
-    aput-object v4, v7, v2
-
-    invoke-static {v7}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-direct {v6, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    const-string p1, "Error occurred when trying to propagate error to Observer.onError and during unsubscription."
-
-    invoke-direct {v5, p1, v6}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v5
-
-    :catch_0
-    move-exception v3
-
-    :try_start_3
-    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_3
-
-    throw v3
-
-    :catchall_3
-    move-exception v3
-
-    invoke-static {v3}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    new-instance v4, Lrx/exceptions/OnErrorNotImplementedException;
-
-    new-instance v5, Lrx/exceptions/CompositeException;
-
-    new-array v2, v2, [Ljava/lang/Throwable;
-
-    aput-object p1, v2, v1
-
-    aput-object v3, v2, v0
-
-    invoke-static {v2}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-direct {v5, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
-
-    const-string p1, "Observer.onError not implemented and error while unsubscribing."
-
-    invoke-direct {v4, p1, v5}, Lrx/exceptions/OnErrorNotImplementedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw v4
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-
-    :cond_1
-    :goto_0
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/n/b;->e:Z
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/n/b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    invoke-virtual {p0, p1}, Lr0/n/b;->onError(Ljava/lang/Throwable;)V
-
-    :cond_0
-    :goto_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/n/c$a.smali b/com.discord/smali_classes2/r0/n/c$a.smali
deleted file mode 100644
index 9004319be1..0000000000
--- a/com.discord/smali_classes2/r0/n/c$a.smali
+++ /dev/null
@@ -1,79 +0,0 @@
-.class public final Lr0/n/c$a;
-.super Ljava/lang/Object;
-.source "SerializedObserver.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/n/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# instance fields
-.field public a:[Ljava/lang/Object;
-
-.field public b:I
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)V
-    .locals 4
-
-    iget v0, p0, Lr0/n/c$a;->b:I
-
-    iget-object v1, p0, Lr0/n/c$a;->a:[Ljava/lang/Object;
-
-    if-nez v1, :cond_0
-
-    const/16 v1, 0x10
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    iput-object v1, p0, Lr0/n/c$a;->a:[Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_0
-    array-length v2, v1
-
-    if-ne v0, v2, :cond_1
-
-    shr-int/lit8 v2, v0, 0x2
-
-    add-int/2addr v2, v0
-
-    new-array v2, v2, [Ljava/lang/Object;
-
-    const/4 v3, 0x0
-
-    invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    iput-object v2, p0, Lr0/n/c$a;->a:[Ljava/lang/Object;
-
-    move-object v1, v2
-
-    :cond_1
-    :goto_0
-    aput-object p1, v1, v0
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lr0/n/c$a;->b:I
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/n/c.smali b/com.discord/smali_classes2/r0/n/c.smali
deleted file mode 100644
index 118e7d0547..0000000000
--- a/com.discord/smali_classes2/r0/n/c.smali
+++ /dev/null
@@ -1,391 +0,0 @@
-.class public Lr0/n/c;
-.super Ljava/lang/Object;
-.source "SerializedObserver.java"
-
-# interfaces
-.implements Lr0/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/n/c$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/g<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lr0/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/g<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-.field public volatile f:Z
-
-.field public g:Lr0/n/c$a;
-
-
-# direct methods
-.method public constructor <init>(Lr0/g;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/g<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lr0/n/c;->d:Lr0/g;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 2
-
-    iget-boolean v0, p0, Lr0/n/c;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/n/c;->f:Z
-
-    if-eqz v0, :cond_1
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/n/c;->f:Z
-
-    iget-boolean v1, p0, Lr0/n/c;->e:Z
-
-    if-eqz v1, :cond_3
-
-    iget-object v0, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    if-nez v0, :cond_2
-
-    new-instance v0, Lr0/n/c$a;
-
-    invoke-direct {v0}, Lr0/n/c$a;-><init>()V
-
-    iput-object v0, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    :cond_2
-    sget-object v1, Lr0/l/a/h;->a:Ljava/lang/Object;
-
-    invoke-virtual {v0, v1}, Lr0/n/c$a;->a(Ljava/lang/Object;)V
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_3
-    iput-boolean v0, p0, Lr0/n/c;->e:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/n/c;->d:Lr0/g;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 2
-
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iget-boolean v0, p0, Lr0/n/c;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/n/c;->f:Z
-
-    if-eqz v0, :cond_1
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/n/c;->f:Z
-
-    iget-boolean v1, p0, Lr0/n/c;->e:Z
-
-    if-eqz v1, :cond_3
-
-    iget-object v0, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    if-nez v0, :cond_2
-
-    new-instance v0, Lr0/n/c$a;
-
-    invoke-direct {v0}, Lr0/n/c$a;-><init>()V
-
-    iput-object v0, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    :cond_2
-    new-instance v1, Lr0/l/a/h$c;
-
-    invoke-direct {v1, p1}, Lr0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
-
-    invoke-virtual {v0, v1}, Lr0/n/c$a;->a(Ljava/lang/Object;)V
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_3
-    iput-boolean v0, p0, Lr0/n/c;->e:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lr0/n/c;->d:Lr0/g;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-boolean v0, p0, Lr0/n/c;->f:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lr0/n/c;->f:Z
-
-    if-eqz v0, :cond_1
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    iget-boolean v0, p0, Lr0/n/c;->e:Z
-
-    if-eqz v0, :cond_4
-
-    iget-object v0, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    if-nez v0, :cond_2
-
-    new-instance v0, Lr0/n/c$a;
-
-    invoke-direct {v0}, Lr0/n/c$a;-><init>()V
-
-    iput-object v0, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    :cond_2
-    if-nez p1, :cond_3
-
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
-
-    :cond_3
-    invoke-virtual {v0, p1}, Lr0/n/c$a;->a(Ljava/lang/Object;)V
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_4
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/n/c;->e:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_3
-
-    :try_start_1
-    iget-object v1, p0, Lr0/n/c;->d:Lr0/g;
-
-    invoke-interface {v1, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_2
-
-    :cond_5
-    :goto_0
-    monitor-enter p0
-
-    :try_start_2
-    iget-object v1, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_6
-
-    iput-boolean v2, p0, Lr0/n/c;->e:Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_6
-    const/4 v3, 0x0
-
-    iput-object v3, p0, Lr0/n/c;->g:Lr0/n/c$a;
-
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    iget-object v1, v1, Lr0/n/c$a;->a:[Ljava/lang/Object;
-
-    array-length v3, v1
-
-    :goto_1
-    if-ge v2, v3, :cond_5
-
-    aget-object v4, v1, v2
-
-    if-nez v4, :cond_7
-
-    goto :goto_0
-
-    :cond_7
-    :try_start_3
-    iget-object v5, p0, Lr0/n/c;->d:Lr0/g;
-
-    invoke-static {v5, v4}, Lr0/l/a/h;->a(Lr0/g;Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_8
-
-    iput-boolean v0, p0, Lr0/n/c;->f:Z
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_0
-
-    return-void
-
-    :cond_8
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :catchall_0
-    move-exception v1
-
-    iput-boolean v0, p0, Lr0/n/c;->f:Z
-
-    invoke-static {v1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
-
-    iget-object v0, p0, Lr0/n/c;->d:Lr0/g;
-
-    invoke-static {v1, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
-
-    move-result-object p1
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-
-    :catchall_1
-    move-exception p1
-
-    :try_start_4
-    monitor-exit p0
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_1
-
-    throw p1
-
-    :catchall_2
-    move-exception v1
-
-    iput-boolean v0, p0, Lr0/n/c;->f:Z
-
-    iget-object v0, p0, Lr0/n/c;->d:Lr0/g;
-
-    invoke-static {v1, v0, p1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
-
-    return-void
-
-    :catchall_3
-    move-exception p1
-
-    :try_start_5
-    monitor-exit p0
-    :try_end_5
-    .catchall {:try_start_5 .. :try_end_5} :catchall_3
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/n/d.smali b/com.discord/smali_classes2/r0/n/d.smali
deleted file mode 100644
index ddbe371c7f..0000000000
--- a/com.discord/smali_classes2/r0/n/d.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Lr0/n/d;
-.super Lrx/Subscriber;
-.source "Subscribers.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lr0/g;
-
-
-# direct methods
-.method public constructor <init>(Lr0/g;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/n/d;->d:Lr0/g;
-
-    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/n/d;->d:Lr0/g;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/n/d;->d:Lr0/g;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/n/d;->d:Lr0/g;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/n/e.smali b/com.discord/smali_classes2/r0/n/e.smali
deleted file mode 100644
index a3667662b3..0000000000
--- a/com.discord/smali_classes2/r0/n/e.smali
+++ /dev/null
@@ -1,65 +0,0 @@
-.class public final Lr0/n/e;
-.super Lrx/Subscriber;
-.source "Subscribers.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lrx/Subscriber<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic d:Lrx/Subscriber;
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lrx/Subscriber;)V
-    .locals 0
-
-    iput-object p2, p0, Lr0/n/e;->d:Lrx/Subscriber;
-
-    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/n/e;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/n/e;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/n/e;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o.smali b/com.discord/smali_classes2/r0/o.smali
new file mode 100644
index 0000000000..20b092b881
--- /dev/null
+++ b/com.discord/smali_classes2/r0/o.smali
@@ -0,0 +1,95 @@
+.class public Lr0/o;
+.super Ljava/lang/Object;
+.source "Retrofit.java"
+
+# interfaces
+.implements Ljava/lang/reflect/InvocationHandler;
+
+
+# instance fields
+.field public final a:Lr0/l;
+
+.field public final synthetic b:Ljava/lang/Class;
+
+.field public final synthetic c:Lr0/p;
+
+
+# direct methods
+.method public constructor <init>(Lr0/p;Ljava/lang/Class;)V
+    .locals 0
+
+    iput-object p1, p0, Lr0/o;->c:Lr0/p;
+
+    iput-object p2, p0, Lr0/o;->b:Ljava/lang/Class;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object p1, Lr0/l;->a:Lr0/l;
+
+    iput-object p1, p0, Lr0/o;->a:Lr0/l;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public invoke(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/lang/Throwable;
+        }
+    .end annotation
+
+    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getDeclaringClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    const-class v1, Ljava/lang/Object;
+
+    if-ne v0, v1, :cond_0
+
+    invoke-virtual {p2, p0, p3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Lr0/o;->a:Lr0/l;
+
+    invoke-virtual {v0, p2}, Lr0/l;->d(Ljava/lang/reflect/Method;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lr0/o;->a:Lr0/l;
+
+    iget-object v1, p0, Lr0/o;->b:Ljava/lang/Class;
+
+    invoke-virtual {v0, p2, v1, p1, p3}, Lr0/l;->c(Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_1
+    iget-object p1, p0, Lr0/o;->c:Lr0/p;
+
+    invoke-virtual {p1, p2}, Lr0/p;->b(Ljava/lang/reflect/Method;)Lr0/q;
+
+    move-result-object p1
+
+    new-instance p2, Lr0/h;
+
+    invoke-direct {p2, p1, p3}, Lr0/h;-><init>(Lr0/q;[Ljava/lang/Object;)V
+
+    iget-object p1, p1, Lr0/q;->b:Lr0/c;
+
+    invoke-interface {p1, p2}, Lr0/c;->b(Lr0/b;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/o/a.smali b/com.discord/smali_classes2/r0/o/a.smali
deleted file mode 100644
index 0b5bbddcaa..0000000000
--- a/com.discord/smali_classes2/r0/o/a.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public abstract Lr0/o/a;
-.super Ljava/lang/Object;
-.source "RxJavaCompletableExecutionHook.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/b.smali b/com.discord/smali_classes2/r0/o/b.smali
deleted file mode 100644
index 42a506bf98..0000000000
--- a/com.discord/smali_classes2/r0/o/b.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public abstract Lr0/o/b;
-.super Ljava/lang/Object;
-.source "RxJavaErrorHandler.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/c.smali b/com.discord/smali_classes2/r0/o/c.smali
deleted file mode 100644
index 903ce6ddda..0000000000
--- a/com.discord/smali_classes2/r0/o/c.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lr0/o/c;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/Observable$a;",
-        "Lrx/Observable$a;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Observable$a;
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->c()Lr0/o/m;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/d.smali b/com.discord/smali_classes2/r0/o/d.smali
deleted file mode 100644
index dbed6d433e..0000000000
--- a/com.discord/smali_classes2/r0/o/d.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lr0/o/d;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lr0/h$a;",
-        "Lr0/h$a;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lr0/h$a;
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->f()Lr0/o/q;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/e.smali b/com.discord/smali_classes2/r0/o/e.smali
deleted file mode 100644
index 8b0380f3bf..0000000000
--- a/com.discord/smali_classes2/r0/o/e.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lr0/o/e;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lr0/d$a;",
-        "Lr0/d$a;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lr0/d$a;
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->a()Lr0/o/a;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/f.smali b/com.discord/smali_classes2/r0/o/f.smali
deleted file mode 100644
index 9f78b5391b..0000000000
--- a/com.discord/smali_classes2/r0/o/f.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public final Lr0/o/f;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Action1<",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->b()Lr0/o/b;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/g.smali b/com.discord/smali_classes2/r0/o/g.smali
deleted file mode 100644
index caa8a8dd09..0000000000
--- a/com.discord/smali_classes2/r0/o/g.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public final Lr0/o/g;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lrx/functions/Func2;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lrx/functions/Func2<",
-        "Lrx/Observable;",
-        "Lrx/Observable$a;",
-        "Lrx/Observable$a;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lrx/Observable;
-
-    check-cast p2, Lrx/Observable$a;
-
-    sget-object p1, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {p1}, Lr0/o/o;->c()Lr0/o/m;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    return-object p2
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/h.smali b/com.discord/smali_classes2/r0/o/h.smali
deleted file mode 100644
index 0a7d469753..0000000000
--- a/com.discord/smali_classes2/r0/o/h.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lr0/o/h;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/Subscription;",
-        "Lrx/Subscription;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Subscription;
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->c()Lr0/o/m;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/i.smali b/com.discord/smali_classes2/r0/o/i.smali
deleted file mode 100644
index f0f11ec3ea..0000000000
--- a/com.discord/smali_classes2/r0/o/i.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lr0/o/i;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/functions/Action0;",
-        "Lrx/functions/Action0;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/functions/Action0;
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->e()Lr0/o/p;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/j.smali b/com.discord/smali_classes2/r0/o/j.smali
deleted file mode 100644
index 4e080ae307..0000000000
--- a/com.discord/smali_classes2/r0/o/j.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lr0/o/j;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Ljava/lang/Throwable;",
-        "Ljava/lang/Throwable;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Ljava/lang/Throwable;
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->c()Lr0/o/m;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/k.smali b/com.discord/smali_classes2/r0/o/k.smali
deleted file mode 100644
index a138f63b2c..0000000000
--- a/com.discord/smali_classes2/r0/o/k.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.class public final Lr0/o/k;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ljava/lang/Object;",
-        "Lr0/k/b<",
-        "Lrx/Observable$b;",
-        "Lrx/Observable$b;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    check-cast p1, Lrx/Observable$b;
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->c()Lr0/o/m;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    return-object p1
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
-.end method
diff --git a/com.discord/smali_classes2/r0/o/l.smali b/com.discord/smali_classes2/r0/o/l.smali
deleted file mode 100644
index fd95dc15fe..0000000000
--- a/com.discord/smali_classes2/r0/o/l.smali
+++ /dev/null
@@ -1,291 +0,0 @@
-.class public final Lr0/o/l;
-.super Ljava/lang/Object;
-.source "RxJavaHooks.java"
-
-
-# static fields
-.field public static volatile a:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile b:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Lrx/Observable$a;",
-            "Lrx/Observable$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile c:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Lr0/h$a;",
-            "Lr0/h$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile d:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Lr0/d$a;",
-            "Lr0/d$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile e:Lrx/functions/Func2;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Func2<",
-            "Lrx/Observable;",
-            "Lrx/Observable$a;",
-            "Lrx/Observable$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile f:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Lrx/functions/Action0;",
-            "Lrx/functions/Action0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile g:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Lrx/Subscription;",
-            "Lrx/Subscription;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile h:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Ljava/lang/Throwable;",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static volatile i:Lr0/k/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/k/b<",
-            "Lrx/Observable$b;",
-            "Lrx/Observable$b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/o/f;
-
-    invoke-direct {v0}, Lr0/o/f;-><init>()V
-
-    sput-object v0, Lr0/o/l;->a:Lrx/functions/Action1;
-
-    new-instance v0, Lr0/o/g;
-
-    invoke-direct {v0}, Lr0/o/g;-><init>()V
-
-    sput-object v0, Lr0/o/l;->e:Lrx/functions/Func2;
-
-    new-instance v0, Lr0/o/h;
-
-    invoke-direct {v0}, Lr0/o/h;-><init>()V
-
-    sput-object v0, Lr0/o/l;->g:Lr0/k/b;
-
-    new-instance v0, Lr0/o/i;
-
-    invoke-direct {v0}, Lr0/o/i;-><init>()V
-
-    sput-object v0, Lr0/o/l;->f:Lr0/k/b;
-
-    new-instance v0, Lr0/o/j;
-
-    invoke-direct {v0}, Lr0/o/j;-><init>()V
-
-    sput-object v0, Lr0/o/l;->h:Lr0/k/b;
-
-    new-instance v0, Lr0/o/k;
-
-    invoke-direct {v0}, Lr0/o/k;-><init>()V
-
-    sput-object v0, Lr0/o/l;->i:Lr0/k/b;
-
-    new-instance v0, Lr0/o/c;
-
-    invoke-direct {v0}, Lr0/o/c;-><init>()V
-
-    sput-object v0, Lr0/o/l;->b:Lr0/k/b;
-
-    new-instance v0, Lr0/o/d;
-
-    invoke-direct {v0}, Lr0/o/d;-><init>()V
-
-    sput-object v0, Lr0/o/l;->c:Lr0/k/b;
-
-    new-instance v0, Lr0/o/e;
-
-    invoke-direct {v0}, Lr0/o/e;-><init>()V
-
-    sput-object v0, Lr0/o/l;->d:Lr0/k/b;
-
-    return-void
-.end method
-
-.method public static a(Lrx/Observable$a;)Lrx/Observable$a;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Lrx/Observable$a<",
-            "TT;>;)",
-            "Lrx/Observable$a<",
-            "TT;>;"
-        }
-    .end annotation
-
-    sget-object v0, Lr0/o/l;->b:Lr0/k/b;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0, p0}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Lrx/Observable$a;
-
-    :cond_0
-    return-object p0
-.end method
-
-.method public static b(Ljava/lang/Throwable;)V
-    .locals 4
-
-    sget-object v0, Lr0/o/l;->a:Lrx/functions/Action1;
-
-    if-eqz v0, :cond_0
-
-    :try_start_0
-    invoke-interface {v0, p0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    sget-object v1, Ljava/lang/System;->err:Ljava/io/PrintStream;
-
-    const-string v2, "The onError handler threw an Exception. It shouldn\'t. => "
-
-    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v2
-
-    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
-
-    invoke-virtual {v0}, Ljava/lang/Throwable;->printStackTrace()V
-
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v2
-
-    invoke-interface {v2, v1, v0}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-
-    :cond_0
-    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
-
-    move-result-object v1
-
-    invoke-interface {v1, v0, p0}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public static c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
-    .locals 1
-
-    sget-object v0, Lr0/o/l;->h:Lr0/k/b;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0, p0}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Ljava/lang/Throwable;
-
-    :cond_0
-    return-object p0
-.end method
-
-.method public static d(Lrx/functions/Action0;)Lrx/functions/Action0;
-    .locals 1
-
-    sget-object v0, Lr0/o/l;->f:Lr0/k/b;
-
-    if-eqz v0, :cond_0
-
-    invoke-interface {v0, p0}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p0
-
-    check-cast p0, Lrx/functions/Action0;
-
-    :cond_0
-    return-object p0
-.end method
diff --git a/com.discord/smali_classes2/r0/o/m.smali b/com.discord/smali_classes2/r0/o/m.smali
deleted file mode 100644
index 1c909f0f42..0000000000
--- a/com.discord/smali_classes2/r0/o/m.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public abstract Lr0/o/m;
-.super Ljava/lang/Object;
-.source "RxJavaObservableExecutionHook.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/n.smali b/com.discord/smali_classes2/r0/o/n.smali
deleted file mode 100644
index f3ba2e0bf6..0000000000
--- a/com.discord/smali_classes2/r0/o/n.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lr0/o/n;
-.super Lr0/o/m;
-.source "RxJavaObservableExecutionHookDefault.java"
-
-
-# static fields
-.field public static final a:Lr0/o/n;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/o/n;
-
-    invoke-direct {v0}, Lr0/o/n;-><init>()V
-
-    sput-object v0, Lr0/o/n;->a:Lr0/o/n;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/o/m;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/o$a.smali b/com.discord/smali_classes2/r0/o/o$a.smali
deleted file mode 100644
index 5e8197ca49..0000000000
--- a/com.discord/smali_classes2/r0/o/o$a.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public final Lr0/o/o$a;
-.super Lr0/o/b;
-.source "RxJavaPlugins.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/o/o;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/o/b;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/o$b.smali b/com.discord/smali_classes2/r0/o/o$b.smali
deleted file mode 100644
index b436e5e76e..0000000000
--- a/com.discord/smali_classes2/r0/o/o$b.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public Lr0/o/o$b;
-.super Lr0/o/a;
-.source "RxJavaPlugins.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/o/o;->a()Lr0/o/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Lr0/o/o;)V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/o/a;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/o.smali b/com.discord/smali_classes2/r0/o/o.smali
deleted file mode 100644
index bc70a70ae0..0000000000
--- a/com.discord/smali_classes2/r0/o/o.smali
+++ /dev/null
@@ -1,659 +0,0 @@
-.class public Lr0/o/o;
-.super Ljava/lang/Object;
-.source "RxJavaPlugins.java"
-
-
-# static fields
-.field public static final f:Lr0/o/o;
-
-.field public static final g:Lr0/o/b;
-
-
-# instance fields
-.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/o/b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final b:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/o/m;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final c:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/o/q;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final d:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/o/a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/o/p;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/o/o;
-
-    invoke-direct {v0}, Lr0/o/o;-><init>()V
-
-    sput-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    new-instance v0, Lr0/o/o$a;
-
-    invoke-direct {v0}, Lr0/o/o$a;-><init>()V
-
-    sput-object v0, Lr0/o/o;->g:Lr0/o/b;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-.method public static d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Class<",
-            "*>;",
-            "Ljava/util/Properties;",
-            ")",
-            "Ljava/lang/Object;"
-        }
-    .end annotation
-
-    invoke-virtual {p1}, Ljava/util/Properties;->clone()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/util/Properties;
-
-    invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v0
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "rxjava.plugin."
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, ".implementation"
-
-    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1, v1}, Ljava/util/Properties;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    if-nez v1, :cond_2
-
-    invoke-virtual {p1}, Ljava/util/Properties;->entrySet()Ljava/util/Set;
-
-    move-result-object v3
-
-    invoke-interface {v3}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :cond_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_2
-
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/util/Map$Entry;
-
-    invoke-interface {v4}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
-    move-result-object v5
-
-    invoke-virtual {v5}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v5
-
-    invoke-virtual {v5, v2}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_0
-
-    const-string v6, ".class"
-
-    invoke-virtual {v5, v6}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
-
-    move-result v6
-
-    if-eqz v6, :cond_0
-
-    invoke-interface {v4}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v4
-
-    invoke-virtual {v0, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v5}, Ljava/lang/String;->length()I
-
-    move-result v3
-
-    add-int/lit8 v3, v3, -0x6
-
-    invoke-virtual {v5, v1, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
-
-    move-result-object v1
-
-    const/16 v3, 0xe
-
-    invoke-virtual {v1, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v3, ".impl"
-
-    invoke-static {v2, v1, v3}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1, v1}, Ljava/util/Properties;->getProperty(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    move-object v1, p1
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p0, Ljava/lang/IllegalStateException;
-
-    new-instance p1, Ljava/lang/StringBuilder;
-
-    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Implementing class declaration for "
-
-    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, " missing: "
-
-    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw p0
-
-    :cond_2
-    :goto_0
-    if-eqz v1, :cond_3
-
-    :try_start_0
-    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
-
-    move-result-object p1
-
-    invoke-virtual {p1, p0}, Ljava/lang/Class;->asSubclass(Ljava/lang/Class;)Ljava/lang/Class;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
-
-    move-result-object p0
-    :try_end_0
-    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_3
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_2
-    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    move-exception p0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v2, " implementation not able to be accessed: "
-
-    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p1
-
-    :catch_1
-    move-exception p0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v2, " implementation not able to be instantiated: "
-
-    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p1
-
-    :catch_2
-    move-exception p0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    const-string v2, " implementation class not found: "
-
-    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p1
-
-    :catch_3
-    move-exception p0
-
-    new-instance p1, Ljava/lang/IllegalStateException;
-
-    new-instance v2, Ljava/lang/StringBuilder;
-
-    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v3, " implementation is not an instance of "
-
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v0, ": "
-
-    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    throw p1
-
-    :cond_3
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public a()Lr0/o/a;
-    .locals 3
-
-    iget-object v0, p0, Lr0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    const-class v0, Lr0/o/a;
-
-    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lr0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    new-instance v2, Lr0/o/o$b;
-
-    invoke-direct {v2, p0}, Lr0/o/o$b;-><init>(Lr0/o/o;)V
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v2, p0, Lr0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    check-cast v0, Lr0/o/a;
-
-    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lr0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/o/a;
-
-    return-object v0
-.end method
-
-.method public b()Lr0/o/b;
-    .locals 3
-
-    iget-object v0, p0, Lr0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    const-class v0, Lr0/o/b;
-
-    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lr0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v2, Lr0/o/o;->g:Lr0/o/b;
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v2, p0, Lr0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    check-cast v0, Lr0/o/b;
-
-    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lr0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/o/b;
-
-    return-object v0
-.end method
-
-.method public c()Lr0/o/m;
-    .locals 3
-
-    iget-object v0, p0, Lr0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    const-class v0, Lr0/o/m;
-
-    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lr0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v2, Lr0/o/n;->a:Lr0/o/n;
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v2, p0, Lr0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    check-cast v0, Lr0/o/m;
-
-    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lr0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/o/m;
-
-    return-object v0
-.end method
-
-.method public e()Lr0/o/p;
-    .locals 3
-
-    iget-object v0, p0, Lr0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    const-class v0, Lr0/o/p;
-
-    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lr0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v2, Lr0/o/p;->a:Lr0/o/p;
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v2, p0, Lr0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    check-cast v0, Lr0/o/p;
-
-    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lr0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/o/p;
-
-    return-object v0
-.end method
-
-.method public f()Lr0/o/q;
-    .locals 3
-
-    iget-object v0, p0, Lr0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    const-class v0, Lr0/o/q;
-
-    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lr0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lr0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
-
-    sget-object v2, Lr0/o/r;->a:Lr0/o/r;
-
-    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v2, p0, Lr0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
-
-    check-cast v0, Lr0/o/q;
-
-    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    :cond_1
-    :goto_0
-    iget-object v0, p0, Lr0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/o/q;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/o/p.smali b/com.discord/smali_classes2/r0/o/p.smali
deleted file mode 100644
index b465c81fea..0000000000
--- a/com.discord/smali_classes2/r0/o/p.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public Lr0/o/p;
-.super Ljava/lang/Object;
-.source "RxJavaSchedulersHook.java"
-
-
-# static fields
-.field public static final a:Lr0/o/p;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/o/p;
-
-    invoke-direct {v0}, Lr0/o/p;-><init>()V
-
-    sput-object v0, Lr0/o/p;->a:Lr0/o/p;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/q.smali b/com.discord/smali_classes2/r0/o/q.smali
deleted file mode 100644
index c198fd9a4b..0000000000
--- a/com.discord/smali_classes2/r0/o/q.smali
+++ /dev/null
@@ -1,13 +0,0 @@
-.class public abstract Lr0/o/q;
-.super Ljava/lang/Object;
-.source "RxJavaSingleExecutionHook.java"
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/o/r.smali b/com.discord/smali_classes2/r0/o/r.smali
deleted file mode 100644
index 3833c93b7d..0000000000
--- a/com.discord/smali_classes2/r0/o/r.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lr0/o/r;
-.super Lr0/o/q;
-.source "RxJavaSingleExecutionHookDefault.java"
-
-
-# static fields
-.field public static final a:Lr0/o/r;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/o/r;
-
-    invoke-direct {v0}, Lr0/o/r;-><init>()V
-
-    sput-object v0, Lr0/o/r;->a:Lr0/o/r;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lr0/o/q;-><init>()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/p.smali b/com.discord/smali_classes2/r0/p.smali
new file mode 100644
index 0000000000..3e2c002039
--- /dev/null
+++ b/com.discord/smali_classes2/r0/p.smali
@@ -0,0 +1,619 @@
+.class public final Lr0/p;
+.super Ljava/lang/Object;
+.source "Retrofit.java"
+
+
+# instance fields
+.field public final a:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/reflect/Method;",
+            "Lr0/q<",
+            "**>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Lo0/f$a;
+
+.field public final c:Lo0/w;
+
+.field public final d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lr0/e$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lr0/c$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Z
+
+
+# direct methods
+.method public constructor <init>(Lo0/f$a;Lo0/w;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;Z)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lo0/f$a;",
+            "Lo0/w;",
+            "Ljava/util/List<",
+            "Lr0/e$a;",
+            ">;",
+            "Ljava/util/List<",
+            "Lr0/c$a;",
+            ">;",
+            "Ljava/util/concurrent/Executor;",
+            "Z)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance p5, Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-direct {p5}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
+
+    iput-object p5, p0, Lr0/p;->a:Ljava/util/Map;
+
+    iput-object p1, p0, Lr0/p;->b:Lo0/f$a;
+
+    iput-object p2, p0, Lr0/p;->c:Lo0/w;
+
+    invoke-static {p3}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-static {p4}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lr0/p;->e:Ljava/util/List;
+
+    iput-boolean p6, p0, Lr0/p;->f:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/c;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            ")",
+            "Lr0/c<",
+            "**>;"
+        }
+    .end annotation
+
+    const-string v0, "returnType == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    const-string v0, "annotations == null"
+
+    invoke-static {p2, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iget-object v0, p0, Lr0/p;->e:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iget-object v1, p0, Lr0/p;->e:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    move v2, v0
+
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    iget-object v3, p0, Lr0/p;->e:Ljava/util/List;
+
+    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lr0/c$a;
+
+    invoke-virtual {v3, p1, p2, p0}, Lr0/c$a;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/c;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    return-object v3
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    const-string v1, "Could not locate call adapter for "
+
+    invoke-direct {p2, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ".\n"
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "  Tried:"
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object p1, p0, Lr0/p;->e:Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result p1
+
+    :goto_1
+    if-ge v0, p1, :cond_2
+
+    const-string v1, "\n   * "
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lr0/p;->e:Ljava/util/List;
+
+    invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lr0/c$a;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public b(Ljava/lang/reflect/Method;)Lr0/q;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Method;",
+            ")",
+            "Lr0/q<",
+            "**>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lr0/p;->a:Ljava/util/Map;
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lr0/q;
+
+    if-eqz v0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    iget-object v0, p0, Lr0/p;->a:Ljava/util/Map;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Lr0/p;->a:Ljava/util/Map;
+
+    invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lr0/q;
+
+    if-nez v1, :cond_1
+
+    new-instance v1, Lr0/q$a;
+
+    invoke-direct {v1, p0, p1}, Lr0/q$a;-><init>(Lr0/p;Ljava/lang/reflect/Method;)V
+
+    invoke-virtual {v1}, Lr0/q$a;->a()Lr0/q;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lr0/p;->a:Ljava/util/Map;
+
+    invoke-interface {v2, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_1
+    monitor-exit v0
+
+    return-object v1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+.end method
+
+.method public c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lr0/e;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            ")",
+            "Lr0/e<",
+            "TT;",
+            "Lokhttp3/RequestBody;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "type == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    const-string v0, "parameterAnnotations == null"
+
+    invoke-static {p2, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    const-string v0, "methodAnnotations == null"
+
+    invoke-static {p3, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iget-object v0, p0, Lr0/p;->d:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iget-object v1, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    move v2, v0
+
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    iget-object v3, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lr0/e$a;
+
+    invoke-virtual {v3, p1, p2, p3, p0}, Lr0/e$a;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    return-object v3
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    const-string p3, "Could not locate RequestBody converter for "
+
+    invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ".\n"
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "  Tried:"
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object p1, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result p1
+
+    :goto_1
+    if-ge v0, p1, :cond_2
+
+    const-string p3, "\n   * "
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object p3, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {p3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p3
+
+    check-cast p3, Lr0/e$a;
+
+    invoke-virtual {p3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p3
+
+    invoke-virtual {p3}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public d(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            ")",
+            "Lr0/e<",
+            "Lokhttp3/ResponseBody;",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "type == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    const-string v0, "annotations == null"
+
+    invoke-static {p2, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iget-object v0, p0, Lr0/p;->d:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iget-object v1, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    move v2, v0
+
+    :goto_0
+    if-ge v2, v1, :cond_1
+
+    iget-object v3, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lr0/e$a;
+
+    invoke-virtual {v3, p1, p2, p0}, Lr0/e$a;->b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    return-object v3
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p2, Ljava/lang/StringBuilder;
+
+    const-string v1, "Could not locate ResponseBody converter for "
+
+    invoke-direct {p2, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p1, ".\n"
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "  Tried:"
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object p1, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result p1
+
+    :goto_1
+    if-ge v0, p1, :cond_2
+
+    const-string v1, "\n   * "
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lr0/e$a;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            ")",
+            "Lr0/e<",
+            "TT;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "type == null"
+
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    const-string p1, "annotations == null"
+
+    invoke-static {p2, p1}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    iget-object p1, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result p1
+
+    const/4 p2, 0x0
+
+    :goto_0
+    if-ge p2, p1, :cond_1
+
+    iget-object v0, p0, Lr0/p;->d:Ljava/util/List;
+
+    invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lr0/e$a;
+
+    if-eqz v0, :cond_0
+
+    add-int/lit8 p2, p2, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_1
+    sget-object p1, Lr0/a$d;->a:Lr0/a$d;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/p/a.smali b/com.discord/smali_classes2/r0/p/a.smali
deleted file mode 100644
index 313d15f1ee..0000000000
--- a/com.discord/smali_classes2/r0/p/a.smali
+++ /dev/null
@@ -1,226 +0,0 @@
-.class public final Lr0/p/a;
-.super Ljava/lang/Object;
-.source "Schedulers.java"
-
-
-# static fields
-.field public static final d:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lr0/p/a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# instance fields
-.field public final a:Lrx/Scheduler;
-
-.field public final b:Lrx/Scheduler;
-
-.field public final c:Lrx/Scheduler;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    sput-object v0, Lr0/p/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 2
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    sget-object v0, Lr0/o/o;->f:Lr0/o/o;
-
-    invoke-virtual {v0}, Lr0/o/o;->e()Lr0/o/p;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    new-instance v0, Lr0/l/e/i;
-
-    const-string v1, "RxComputationScheduler-"
-
-    invoke-direct {v0, v1}, Lr0/l/e/i;-><init>(Ljava/lang/String;)V
-
-    new-instance v1, Lr0/l/c/b;
-
-    invoke-direct {v1, v0}, Lr0/l/c/b;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    iput-object v1, p0, Lr0/p/a;->a:Lrx/Scheduler;
-
-    new-instance v0, Lr0/l/e/i;
-
-    const-string v1, "RxIoScheduler-"
-
-    invoke-direct {v0, v1}, Lr0/l/e/i;-><init>(Ljava/lang/String;)V
-
-    new-instance v1, Lr0/l/c/a;
-
-    invoke-direct {v1, v0}, Lr0/l/c/a;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    iput-object v1, p0, Lr0/p/a;->b:Lrx/Scheduler;
-
-    new-instance v0, Lr0/l/e/i;
-
-    const-string v1, "RxNewThreadScheduler-"
-
-    invoke-direct {v0, v1}, Lr0/l/e/i;-><init>(Ljava/lang/String;)V
-
-    new-instance v1, Lr0/l/c/f;
-
-    invoke-direct {v1, v0}, Lr0/l/c/f;-><init>(Ljava/util/concurrent/ThreadFactory;)V
-
-    iput-object v1, p0, Lr0/p/a;->c:Lrx/Scheduler;
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    throw v0
-.end method
-
-.method public static a()Lrx/Scheduler;
-    .locals 1
-
-    invoke-static {}, Lr0/p/a;->c()Lr0/p/a;
-
-    move-result-object v0
-
-    iget-object v0, v0, Lr0/p/a;->a:Lrx/Scheduler;
-
-    return-object v0
-.end method
-
-.method public static b(Ljava/util/concurrent/Executor;)Lrx/Scheduler;
-    .locals 1
-
-    new-instance v0, Lr0/l/c/c;
-
-    invoke-direct {v0, p0}, Lr0/l/c/c;-><init>(Ljava/util/concurrent/Executor;)V
-
-    return-object v0
-.end method
-
-.method public static c()Lr0/p/a;
-    .locals 3
-
-    :goto_0
-    sget-object v0, Lr0/p/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/p/a;
-
-    if-eqz v0, :cond_0
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Lr0/p/a;
-
-    invoke-direct {v0}, Lr0/p/a;-><init>()V
-
-    sget-object v1, Lr0/p/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    return-object v0
-
-    :cond_1
-    monitor-enter v0
-
-    :try_start_0
-    iget-object v1, v0, Lr0/p/a;->a:Lrx/Scheduler;
-
-    instance-of v1, v1, Lr0/l/c/j;
-
-    if-eqz v1, :cond_2
-
-    iget-object v1, v0, Lr0/p/a;->a:Lrx/Scheduler;
-
-    check-cast v1, Lr0/l/c/j;
-
-    invoke-interface {v1}, Lr0/l/c/j;->shutdown()V
-
-    :cond_2
-    iget-object v1, v0, Lr0/p/a;->b:Lrx/Scheduler;
-
-    instance-of v1, v1, Lr0/l/c/j;
-
-    if-eqz v1, :cond_3
-
-    iget-object v1, v0, Lr0/p/a;->b:Lrx/Scheduler;
-
-    check-cast v1, Lr0/l/c/j;
-
-    invoke-interface {v1}, Lr0/l/c/j;->shutdown()V
-
-    :cond_3
-    iget-object v1, v0, Lr0/p/a;->c:Lrx/Scheduler;
-
-    instance-of v1, v1, Lr0/l/c/j;
-
-    if-eqz v1, :cond_4
-
-    iget-object v1, v0, Lr0/p/a;->c:Lrx/Scheduler;
-
-    check-cast v1, Lr0/l/c/j;
-
-    invoke-interface {v1}, Lr0/l/c/j;->shutdown()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    :cond_4
-    monitor-exit v0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    throw v1
-.end method
-
-.method public static d()Lrx/Scheduler;
-    .locals 1
-
-    invoke-static {}, Lr0/p/a;->c()Lr0/p/a;
-
-    move-result-object v0
-
-    iget-object v0, v0, Lr0/p/a;->b:Lrx/Scheduler;
-
-    return-object v0
-.end method
-
-.method public static e()Lrx/Scheduler;
-    .locals 1
-
-    sget-object v0, Lr0/l/c/l;->a:Lr0/l/c/l;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali_classes2/r0/q$a.smali b/com.discord/smali_classes2/r0/q$a.smali
new file mode 100644
index 0000000000..efea8add94
--- /dev/null
+++ b/com.discord/smali_classes2/r0/q$a.smali
@@ -0,0 +1,3001 @@
+.class public final Lr0/q$a;
+.super Ljava/lang/Object;
+.source "ServiceMethod.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/q;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lr0/p;
+
+.field public final b:Ljava/lang/reflect/Method;
+
+.field public final c:[Ljava/lang/annotation/Annotation;
+
+.field public final d:[[Ljava/lang/annotation/Annotation;
+
+.field public final e:[Ljava/lang/reflect/Type;
+
+.field public f:Ljava/lang/reflect/Type;
+
+.field public g:Z
+
+.field public h:Z
+
+.field public i:Z
+
+.field public j:Z
+
+.field public k:Z
+
+.field public l:Z
+
+.field public m:Ljava/lang/String;
+
+.field public n:Z
+
+.field public o:Z
+
+.field public p:Z
+
+.field public q:Ljava/lang/String;
+
+.field public r:Lokhttp3/Headers;
+
+.field public s:Lokhttp3/MediaType;
+
+.field public t:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public u:[Lr0/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Lr0/k<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field public v:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "Lokhttp3/ResponseBody;",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public w:Lr0/c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/c<",
+            "TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lr0/p;Ljava/lang/reflect/Method;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/q$a;->a:Lr0/p;
+
+    iput-object p2, p0, Lr0/q$a;->b:Ljava/lang/reflect/Method;
+
+    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lr0/q$a;->c:[Ljava/lang/annotation/Annotation;
+
+    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getGenericParameterTypes()[Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lr0/q$a;->e:[Ljava/lang/reflect/Type;
+
+    invoke-virtual {p2}, Ljava/lang/reflect/Method;->getParameterAnnotations()[[Ljava/lang/annotation/Annotation;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lr0/q$a;->d:[[Ljava/lang/annotation/Annotation;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lr0/q;
+    .locals 19
+
+    move-object/from16 v1, p0
+
+    iget-object v0, v1, Lr0/q$a;->b:Ljava/lang/reflect/Method;
+
+    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getGenericReturnType()Ljava/lang/reflect/Type;
+
+    move-result-object v2
+
+    invoke-static {v2}, Lr0/r;->j(Ljava/lang/reflect/Type;)Z
+
+    move-result v0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    if-nez v0, :cond_66
+
+    sget-object v0, Ljava/lang/Void;->TYPE:Ljava/lang/Class;
+
+    if-eq v2, v0, :cond_65
+
+    iget-object v0, v1, Lr0/q$a;->b:Ljava/lang/reflect/Method;
+
+    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
+
+    move-result-object v0
+
+    :try_start_0
+    iget-object v6, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v6, v2, v0}, Lr0/p;->a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/c;
+
+    move-result-object v0
+    :try_end_0
+    .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_2
+
+    iput-object v0, v1, Lr0/q$a;->w:Lr0/c;
+
+    invoke-interface {v0}, Lr0/c;->a()Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    iput-object v0, v1, Lr0/q$a;->f:Ljava/lang/reflect/Type;
+
+    const-class v2, Lr0/n;
+
+    if-eq v0, v2, :cond_64
+
+    const-class v2, Lokhttp3/Response;
+
+    if-eq v0, v2, :cond_64
+
+    iget-object v0, v1, Lr0/q$a;->b:Ljava/lang/reflect/Method;
+
+    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getAnnotations()[Ljava/lang/annotation/Annotation;
+
+    move-result-object v0
+
+    :try_start_1
+    iget-object v2, v1, Lr0/q$a;->a:Lr0/p;
+
+    iget-object v6, v1, Lr0/q$a;->f:Ljava/lang/reflect/Type;
+
+    invoke-virtual {v2, v6, v0}, Lr0/p;->d(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v0
+    :try_end_1
+    .catch Ljava/lang/RuntimeException; {:try_start_1 .. :try_end_1} :catch_1
+
+    iput-object v0, v1, Lr0/q$a;->v:Lr0/e;
+
+    iget-object v0, v1, Lr0/q$a;->c:[Ljava/lang/annotation/Annotation;
+
+    array-length v2, v0
+
+    const/4 v6, 0x0
+
+    :goto_0
+    if-ge v6, v2, :cond_11
+
+    aget-object v7, v0, v6
+
+    instance-of v8, v7, Lr0/u/b;
+
+    if-eqz v8, :cond_0
+
+    check-cast v7, Lr0/u/b;
+
+    invoke-interface {v7}, Lr0/u/b;->value()Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "DELETE"
+
+    invoke-virtual {v1, v8, v7, v5}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_3
+
+    :cond_0
+    instance-of v8, v7, Lr0/u/e;
+
+    if-eqz v8, :cond_1
+
+    check-cast v7, Lr0/u/e;
+
+    invoke-interface {v7}, Lr0/u/e;->value()Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "GET"
+
+    invoke-virtual {v1, v8, v7, v5}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_3
+
+    :cond_1
+    instance-of v8, v7, Lr0/u/f;
+
+    if-eqz v8, :cond_3
+
+    check-cast v7, Lr0/u/f;
+
+    invoke-interface {v7}, Lr0/u/f;->value()Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "HEAD"
+
+    invoke-virtual {v1, v8, v7, v5}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    const-class v7, Ljava/lang/Void;
+
+    iget-object v8, v1, Lr0/q$a;->f:Ljava/lang/reflect/Type;
+
+    invoke-virtual {v7, v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_2
+
+    goto/16 :goto_3
+
+    :cond_2
+    new-array v0, v5, [Ljava/lang/Object;
+
+    const-string v2, "HEAD method must use Void as response type."
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_3
+    instance-of v8, v7, Lr0/u/l;
+
+    if-eqz v8, :cond_4
+
+    check-cast v7, Lr0/u/l;
+
+    invoke-interface {v7}, Lr0/u/l;->value()Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "PATCH"
+
+    invoke-virtual {v1, v8, v7, v4}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_3
+
+    :cond_4
+    instance-of v8, v7, Lr0/u/m;
+
+    if-eqz v8, :cond_5
+
+    check-cast v7, Lr0/u/m;
+
+    invoke-interface {v7}, Lr0/u/m;->value()Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "POST"
+
+    invoke-virtual {v1, v8, v7, v4}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_3
+
+    :cond_5
+    instance-of v8, v7, Lr0/u/n;
+
+    if-eqz v8, :cond_6
+
+    check-cast v7, Lr0/u/n;
+
+    invoke-interface {v7}, Lr0/u/n;->value()Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "PUT"
+
+    invoke-virtual {v1, v8, v7, v4}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_3
+
+    :cond_6
+    instance-of v8, v7, Lr0/u/k;
+
+    if-eqz v8, :cond_7
+
+    check-cast v7, Lr0/u/k;
+
+    invoke-interface {v7}, Lr0/u/k;->value()Ljava/lang/String;
+
+    move-result-object v7
+
+    const-string v8, "OPTIONS"
+
+    invoke-virtual {v1, v8, v7, v5}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_3
+
+    :cond_7
+    instance-of v8, v7, Lr0/u/g;
+
+    if-eqz v8, :cond_8
+
+    check-cast v7, Lr0/u/g;
+
+    invoke-interface {v7}, Lr0/u/g;->method()Ljava/lang/String;
+
+    move-result-object v8
+
+    invoke-interface {v7}, Lr0/u/g;->path()Ljava/lang/String;
+
+    move-result-object v9
+
+    invoke-interface {v7}, Lr0/u/g;->hasBody()Z
+
+    move-result v7
+
+    invoke-virtual {v1, v8, v9, v7}, Lr0/q$a;->e(Ljava/lang/String;Ljava/lang/String;Z)V
+
+    goto/16 :goto_3
+
+    :cond_8
+    instance-of v8, v7, Lr0/u/i;
+
+    if-eqz v8, :cond_e
+
+    check-cast v7, Lr0/u/i;
+
+    invoke-interface {v7}, Lr0/u/i;->value()[Ljava/lang/String;
+
+    move-result-object v7
+
+    array-length v8, v7
+
+    if-eqz v8, :cond_d
+
+    new-instance v8, Lokhttp3/Headers$a;
+
+    invoke-direct {v8}, Lokhttp3/Headers$a;-><init>()V
+
+    array-length v9, v7
+
+    const/4 v10, 0x0
+
+    :goto_1
+    if-ge v10, v9, :cond_c
+
+    aget-object v11, v7, v10
+
+    const/16 v12, 0x3a
+
+    invoke-virtual {v11, v12}, Ljava/lang/String;->indexOf(I)I
+
+    move-result v12
+
+    const/4 v13, -0x1
+
+    if-eq v12, v13, :cond_b
+
+    if-eqz v12, :cond_b
+
+    invoke-virtual {v11}, Ljava/lang/String;->length()I
+
+    move-result v13
+
+    sub-int/2addr v13, v4
+
+    if-eq v12, v13, :cond_b
+
+    invoke-virtual {v11, v5, v12}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v13
+
+    add-int/lit8 v12, v12, 0x1
+
+    invoke-virtual {v11, v12}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-virtual {v11}, Ljava/lang/String;->trim()Ljava/lang/String;
+
+    move-result-object v11
+
+    const-string v12, "Content-Type"
+
+    invoke-virtual {v12, v13}, Ljava/lang/String;->equalsIgnoreCase(Ljava/lang/String;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_a
+
+    invoke-static {v11}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
+
+    move-result-object v12
+
+    if-eqz v12, :cond_9
+
+    iput-object v12, v1, Lr0/q$a;->s:Lokhttp3/MediaType;
+
+    goto :goto_2
+
+    :cond_9
+    new-array v0, v4, [Ljava/lang/Object;
+
+    aput-object v11, v0, v5
+
+    const-string v2, "Malformed content type: %s"
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_a
+    invoke-virtual {v8, v13, v11}, Lokhttp3/Headers$a;->a(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
+
+    :goto_2
+    add-int/lit8 v10, v10, 0x1
+
+    goto :goto_1
+
+    :cond_b
+    new-array v0, v4, [Ljava/lang/Object;
+
+    aput-object v11, v0, v5
+
+    const-string v2, "@Headers value must be in the form \"Name: Value\". Found: \"%s\""
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_c
+    invoke-virtual {v8}, Lokhttp3/Headers$a;->c()Lokhttp3/Headers;
+
+    move-result-object v7
+
+    iput-object v7, v1, Lr0/q$a;->r:Lokhttp3/Headers;
+
+    goto :goto_3
+
+    :cond_d
+    new-array v0, v5, [Ljava/lang/Object;
+
+    const-string v2, "@Headers annotation is empty."
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_e
+    instance-of v7, v7, Lr0/u/j;
+
+    if-eqz v7, :cond_10
+
+    iget-boolean v7, v1, Lr0/q$a;->o:Z
+
+    if-nez v7, :cond_f
+
+    iput-boolean v4, v1, Lr0/q$a;->p:Z
+
+    goto :goto_3
+
+    :cond_f
+    new-array v0, v5, [Ljava/lang/Object;
+
+    const-string v2, "Only one encoding annotation is allowed."
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_10
+    :goto_3
+    add-int/lit8 v6, v6, 0x1
+
+    goto/16 :goto_0
+
+    :cond_11
+    iget-object v0, v1, Lr0/q$a;->m:Ljava/lang/String;
+
+    if-eqz v0, :cond_63
+
+    iget-boolean v0, v1, Lr0/q$a;->n:Z
+
+    if-nez v0, :cond_14
+
+    iget-boolean v0, v1, Lr0/q$a;->p:Z
+
+    if-nez v0, :cond_13
+
+    iget-boolean v0, v1, Lr0/q$a;->o:Z
+
+    if-nez v0, :cond_12
+
+    goto :goto_4
+
+    :cond_12
+    new-array v0, v5, [Ljava/lang/Object;
+
+    const-string v2, "FormUrlEncoded can only be specified on HTTP methods with request body (e.g., @POST)."
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_13
+    new-array v0, v5, [Ljava/lang/Object;
+
+    const-string v2, "Multipart can only be specified on HTTP methods with request body (e.g., @POST)."
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_14
+    :goto_4
+    iget-object v0, v1, Lr0/q$a;->d:[[Ljava/lang/annotation/Annotation;
+
+    array-length v0, v0
+
+    new-array v2, v0, [Lr0/k;
+
+    iput-object v2, v1, Lr0/q$a;->u:[Lr0/k;
+
+    const/4 v2, 0x0
+
+    :goto_5
+    if-ge v2, v0, :cond_5a
+
+    iget-object v5, v1, Lr0/q$a;->e:[Ljava/lang/reflect/Type;
+
+    aget-object v5, v5, v2
+
+    invoke-static {v5}, Lr0/r;->j(Ljava/lang/reflect/Type;)Z
+
+    move-result v6
+
+    if-nez v6, :cond_59
+
+    iget-object v6, v1, Lr0/q$a;->d:[[Ljava/lang/annotation/Annotation;
+
+    aget-object v6, v6, v2
+
+    const-string v7, "No Retrofit annotation found."
+
+    if-eqz v6, :cond_58
+
+    iget-object v8, v1, Lr0/q$a;->u:[Lr0/k;
+
+    array-length v9, v6
+
+    const/4 v10, 0x0
+
+    :goto_6
+    if-ge v10, v9, :cond_56
+
+    aget-object v11, v6, v10
+
+    const-class v12, Ljava/lang/String;
+
+    const-class v13, Lokhttp3/MultipartBody$Part;
+
+    instance-of v14, v11, Lr0/u/v;
+
+    const-string v15, "@Path parameters may not be used with @Url."
+
+    if-eqz v14, :cond_1b
+
+    iget-boolean v11, v1, Lr0/q$a;->l:Z
+
+    if-nez v11, :cond_1a
+
+    iget-boolean v11, v1, Lr0/q$a;->j:Z
+
+    if-nez v11, :cond_19
+
+    iget-boolean v11, v1, Lr0/q$a;->k:Z
+
+    if-nez v11, :cond_18
+
+    iget-object v11, v1, Lr0/q$a;->q:Ljava/lang/String;
+
+    if-nez v11, :cond_17
+
+    iput-boolean v4, v1, Lr0/q$a;->l:Z
+
+    const-class v4, Lo0/w;
+
+    if-eq v5, v4, :cond_16
+
+    if-eq v5, v12, :cond_16
+
+    const-class v4, Ljava/net/URI;
+
+    if-eq v5, v4, :cond_16
+
+    instance-of v4, v5, Ljava/lang/Class;
+
+    if-eqz v4, :cond_15
+
+    const-string v4, "android.net.Uri"
+
+    move-object v11, v5
+
+    check-cast v11, Ljava/lang/Class;
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v11
+
+    invoke-virtual {v4, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_15
+
+    goto :goto_7
+
+    :cond_15
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@Url must be okhttp3.HttpUrl, String, java.net.URI, or android.net.Uri type."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_16
+    :goto_7
+    new-instance v4, Lr0/k$l;
+
+    invoke-direct {v4}, Lr0/k$l;-><init>()V
+
+    goto/16 :goto_8
+
+    :cond_17
+    new-array v0, v4, [Ljava/lang/Object;
+
+    iget-object v3, v1, Lr0/q$a;->m:Ljava/lang/String;
+
+    const/4 v4, 0x0
+
+    aput-object v3, v0, v4
+
+    const-string v3, "@Url cannot be used with @%s URL"
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_18
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "A @Url parameter must not come after a @Query"
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_19
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v15, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_1a
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "Multiple @Url method annotations found."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_1b
+    instance-of v4, v11, Lr0/u/q;
+
+    const/4 v14, 0x2
+
+    if-eqz v4, :cond_21
+
+    iget-boolean v4, v1, Lr0/q$a;->k:Z
+
+    if-nez v4, :cond_20
+
+    iget-boolean v4, v1, Lr0/q$a;->l:Z
+
+    if-nez v4, :cond_1f
+
+    iget-object v4, v1, Lr0/q$a;->q:Ljava/lang/String;
+
+    if-eqz v4, :cond_1e
+
+    const/4 v4, 0x1
+
+    iput-boolean v4, v1, Lr0/q$a;->j:Z
+
+    check-cast v11, Lr0/u/q;
+
+    invoke-interface {v11}, Lr0/u/q;->value()Ljava/lang/String;
+
+    move-result-object v4
+
+    sget-object v12, Lr0/q;->n:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v12, v4}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+
+    move-result-object v12
+
+    invoke-virtual {v12}, Ljava/util/regex/Matcher;->matches()Z
+
+    move-result v12
+
+    if-eqz v12, :cond_1d
+
+    iget-object v12, v1, Lr0/q$a;->t:Ljava/util/Set;
+
+    invoke-interface {v12, v4}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_1c
+
+    iget-object v12, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v12, v5, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v12
+
+    new-instance v13, Lr0/k$g;
+
+    invoke-interface {v11}, Lr0/u/q;->encoded()Z
+
+    move-result v11
+
+    invoke-direct {v13, v4, v12, v11}, Lr0/k$g;-><init>(Ljava/lang/String;Lr0/e;Z)V
+
+    goto/16 :goto_9
+
+    :cond_1c
+    new-array v0, v14, [Ljava/lang/Object;
+
+    iget-object v3, v1, Lr0/q$a;->q:Ljava/lang/String;
+
+    const/4 v5, 0x0
+
+    aput-object v3, v0, v5
+
+    const/4 v3, 0x1
+
+    aput-object v4, v0, v3
+
+    const-string v3, "URL \"%s\" does not contain \"{%s}\"."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_1d
+    const/4 v0, 0x1
+
+    const/4 v3, 0x0
+
+    new-array v5, v14, [Ljava/lang/Object;
+
+    sget-object v6, Lr0/q;->m:Ljava/util/regex/Pattern;
+
+    invoke-virtual {v6}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String;
+
+    move-result-object v6
+
+    aput-object v6, v5, v3
+
+    aput-object v4, v5, v0
+
+    const-string v0, "@Path parameter name must match %s. Found: %s"
+
+    invoke-virtual {v1, v2, v0, v5}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_1e
+    const/4 v0, 0x1
+
+    const/4 v3, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    iget-object v4, v1, Lr0/q$a;->m:Ljava/lang/String;
+
+    aput-object v4, v0, v3
+
+    const-string v3, "@Path can only be used with relative url on @%s"
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_1f
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v15, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_20
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "A @Path parameter must not come after a @Query."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_21
+    instance-of v4, v11, Lr0/u/r;
+
+    const-string v14, "<String>)"
+
+    const-string v15, " must include generic type (e.g., "
+
+    if-eqz v4, :cond_25
+
+    check-cast v11, Lr0/u/r;
+
+    invoke-interface {v11}, Lr0/u/r;->value()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-interface {v11}, Lr0/u/r;->encoded()Z
+
+    move-result v11
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v12
+
+    const/4 v13, 0x1
+
+    iput-boolean v13, v1, Lr0/q$a;->k:Z
+
+    const-class v13, Ljava/lang/Iterable;
+
+    invoke-virtual {v13, v12}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v13
+
+    if-eqz v13, :cond_23
+
+    instance-of v13, v5, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v13, :cond_22
+
+    move-object v12, v5
+
+    check-cast v12, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v13, 0x0
+
+    invoke-static {v13, v12}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v12
+
+    iget-object v13, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v13, v12, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v12
+
+    new-instance v13, Lr0/k$h;
+
+    invoke-direct {v13, v4, v12, v11}, Lr0/k$h;-><init>(Ljava/lang/String;Lr0/e;Z)V
+
+    new-instance v4, Lr0/i;
+
+    invoke-direct {v4, v13}, Lr0/i;-><init>(Lr0/k;)V
+
+    goto/16 :goto_8
+
+    :cond_22
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v12}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v12}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_23
+    invoke-virtual {v12}, Ljava/lang/Class;->isArray()Z
+
+    move-result v13
+
+    if-eqz v13, :cond_24
+
+    invoke-virtual {v12}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object v12
+
+    invoke-static {v12}, Lr0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
+
+    move-result-object v12
+
+    iget-object v13, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v13, v12, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v12
+
+    new-instance v13, Lr0/k$h;
+
+    invoke-direct {v13, v4, v12, v11}, Lr0/k$h;-><init>(Ljava/lang/String;Lr0/e;Z)V
+
+    new-instance v4, Lr0/j;
+
+    invoke-direct {v4, v13}, Lr0/j;-><init>(Lr0/k;)V
+
+    goto/16 :goto_8
+
+    :cond_24
+    iget-object v12, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v12, v5, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v12
+
+    new-instance v13, Lr0/k$h;
+
+    invoke-direct {v13, v4, v12, v11}, Lr0/k$h;-><init>(Ljava/lang/String;Lr0/e;Z)V
+
+    goto/16 :goto_9
+
+    :cond_25
+    instance-of v4, v11, Lr0/u/t;
+
+    if-eqz v4, :cond_29
+
+    check-cast v11, Lr0/u/t;
+
+    invoke-interface {v11}, Lr0/u/t;->encoded()Z
+
+    move-result v4
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v11
+
+    const/4 v12, 0x1
+
+    iput-boolean v12, v1, Lr0/q$a;->k:Z
+
+    const-class v12, Ljava/lang/Iterable;
+
+    invoke-virtual {v12, v11}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_27
+
+    instance-of v12, v5, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v12, :cond_26
+
+    move-object v11, v5
+
+    check-cast v11, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v12, 0x0
+
+    invoke-static {v12, v11}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v11
+
+    iget-object v12, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v12, v11, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v11
+
+    new-instance v12, Lr0/k$j;
+
+    invoke-direct {v12, v11, v4}, Lr0/k$j;-><init>(Lr0/e;Z)V
+
+    new-instance v4, Lr0/i;
+
+    invoke-direct {v4, v12}, Lr0/i;-><init>(Lr0/k;)V
+
+    goto :goto_8
+
+    :cond_26
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_27
+    invoke-virtual {v11}, Ljava/lang/Class;->isArray()Z
+
+    move-result v12
+
+    if-eqz v12, :cond_28
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object v11
+
+    invoke-static {v11}, Lr0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
+
+    move-result-object v11
+
+    iget-object v12, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v12, v11, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v11
+
+    new-instance v12, Lr0/k$j;
+
+    invoke-direct {v12, v11, v4}, Lr0/k$j;-><init>(Lr0/e;Z)V
+
+    new-instance v4, Lr0/j;
+
+    invoke-direct {v4, v12}, Lr0/j;-><init>(Lr0/k;)V
+
+    :goto_8
+    move/from16 v16, v0
+
+    goto/16 :goto_b
+
+    :cond_28
+    iget-object v11, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v11, v5, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v11
+
+    new-instance v13, Lr0/k$j;
+
+    invoke-direct {v13, v11, v4}, Lr0/k$j;-><init>(Lr0/e;Z)V
+
+    :goto_9
+    move/from16 v16, v0
+
+    move-object v4, v13
+
+    goto/16 :goto_b
+
+    :cond_29
+    instance-of v4, v11, Lr0/u/s;
+
+    move/from16 v16, v0
+
+    const-string v0, "Map must include generic types (e.g., Map<String, String>)"
+
+    if-eqz v4, :cond_2d
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    const-class v13, Ljava/util/Map;
+
+    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v13
+
+    if-eqz v13, :cond_2c
+
+    const-class v13, Ljava/util/Map;
+
+    invoke-static {v5, v4, v13}, Lr0/r;->i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+
+    move-result-object v4
+
+    instance-of v13, v4, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v13, :cond_2b
+
+    check-cast v4, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v0, 0x0
+
+    invoke-static {v0, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    if-ne v12, v0, :cond_2a
+
+    const/4 v0, 0x1
+
+    invoke-static {v0, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    iget-object v4, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v4, v0, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v0
+
+    new-instance v4, Lr0/k$i;
+
+    check-cast v11, Lr0/u/s;
+
+    invoke-interface {v11}, Lr0/u/s;->encoded()Z
+
+    move-result v11
+
+    invoke-direct {v4, v0, v11}, Lr0/k$i;-><init>(Lr0/e;Z)V
+
+    goto/16 :goto_b
+
+    :cond_2a
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "@QueryMap keys must be of type String: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_2b
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_2c
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@QueryMap parameter type must be Map."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_2d
+    instance-of v4, v11, Lr0/u/h;
+
+    if-eqz v4, :cond_31
+
+    check-cast v11, Lr0/u/h;
+
+    invoke-interface {v11}, Lr0/u/h;->value()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    const-class v11, Ljava/lang/Iterable;
+
+    invoke-virtual {v11, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v11
+
+    if-eqz v11, :cond_2f
+
+    instance-of v11, v5, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v11, :cond_2e
+
+    move-object v4, v5
+
+    check-cast v4, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v11, 0x0
+
+    invoke-static {v11, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v4
+
+    iget-object v11, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v11, v4, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v4
+
+    new-instance v11, Lr0/k$d;
+
+    invoke-direct {v11, v0, v4}, Lr0/k$d;-><init>(Ljava/lang/String;Lr0/e;)V
+
+    new-instance v0, Lr0/i;
+
+    invoke-direct {v0, v11}, Lr0/i;-><init>(Lr0/k;)V
+
+    goto/16 :goto_a
+
+    :cond_2e
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_2f
+    invoke-virtual {v4}, Ljava/lang/Class;->isArray()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_30
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-static {v4}, Lr0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    iget-object v11, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v11, v4, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v4
+
+    new-instance v11, Lr0/k$d;
+
+    invoke-direct {v11, v0, v4}, Lr0/k$d;-><init>(Ljava/lang/String;Lr0/e;)V
+
+    new-instance v0, Lr0/j;
+
+    invoke-direct {v0, v11}, Lr0/j;-><init>(Lr0/k;)V
+
+    goto/16 :goto_a
+
+    :cond_30
+    iget-object v4, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v4, v5, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v4
+
+    new-instance v11, Lr0/k$d;
+
+    invoke-direct {v11, v0, v4}, Lr0/k$d;-><init>(Ljava/lang/String;Lr0/e;)V
+
+    move-object v4, v11
+
+    goto/16 :goto_b
+
+    :cond_31
+    instance-of v4, v11, Lr0/u/c;
+
+    if-eqz v4, :cond_36
+
+    iget-boolean v0, v1, Lr0/q$a;->o:Z
+
+    if-eqz v0, :cond_35
+
+    check-cast v11, Lr0/u/c;
+
+    invoke-interface {v11}, Lr0/u/c;->value()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-interface {v11}, Lr0/u/c;->encoded()Z
+
+    move-result v4
+
+    const/4 v11, 0x1
+
+    iput-boolean v11, v1, Lr0/q$a;->g:Z
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v11
+
+    const-class v12, Ljava/lang/Iterable;
+
+    invoke-virtual {v12, v11}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_33
+
+    instance-of v12, v5, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v12, :cond_32
+
+    move-object v11, v5
+
+    check-cast v11, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v12, 0x0
+
+    invoke-static {v12, v11}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v11
+
+    iget-object v12, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v12, v11, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v11
+
+    new-instance v12, Lr0/k$b;
+
+    invoke-direct {v12, v0, v11, v4}, Lr0/k$b;-><init>(Ljava/lang/String;Lr0/e;Z)V
+
+    new-instance v0, Lr0/i;
+
+    invoke-direct {v0, v12}, Lr0/i;-><init>(Lr0/k;)V
+
+    goto/16 :goto_a
+
+    :cond_32
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_33
+    invoke-virtual {v11}, Ljava/lang/Class;->isArray()Z
+
+    move-result v12
+
+    if-eqz v12, :cond_34
+
+    invoke-virtual {v11}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object v11
+
+    invoke-static {v11}, Lr0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
+
+    move-result-object v11
+
+    iget-object v12, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v12, v11, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v11
+
+    new-instance v12, Lr0/k$b;
+
+    invoke-direct {v12, v0, v11, v4}, Lr0/k$b;-><init>(Ljava/lang/String;Lr0/e;Z)V
+
+    new-instance v0, Lr0/j;
+
+    invoke-direct {v0, v12}, Lr0/j;-><init>(Lr0/k;)V
+
+    goto :goto_a
+
+    :cond_34
+    iget-object v11, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v11, v5, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v11
+
+    new-instance v12, Lr0/k$b;
+
+    invoke-direct {v12, v0, v11, v4}, Lr0/k$b;-><init>(Ljava/lang/String;Lr0/e;Z)V
+
+    move-object v4, v12
+
+    goto/16 :goto_b
+
+    :cond_35
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@Field parameters can only be used with form encoding."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_36
+    instance-of v4, v11, Lr0/u/d;
+
+    if-eqz v4, :cond_3b
+
+    iget-boolean v4, v1, Lr0/q$a;->o:Z
+
+    if-eqz v4, :cond_3a
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    const-class v13, Ljava/util/Map;
+
+    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v13
+
+    if-eqz v13, :cond_39
+
+    const-class v13, Ljava/util/Map;
+
+    invoke-static {v5, v4, v13}, Lr0/r;->i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+
+    move-result-object v4
+
+    instance-of v13, v4, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v13, :cond_38
+
+    check-cast v4, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v0, 0x0
+
+    invoke-static {v0, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    if-ne v12, v0, :cond_37
+
+    const/4 v0, 0x1
+
+    invoke-static {v0, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v4
+
+    iget-object v12, v1, Lr0/q$a;->a:Lr0/p;
+
+    invoke-virtual {v12, v4, v6}, Lr0/p;->e(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v4
+
+    iput-boolean v0, v1, Lr0/q$a;->g:Z
+
+    new-instance v0, Lr0/k$c;
+
+    check-cast v11, Lr0/u/d;
+
+    invoke-interface {v11}, Lr0/u/d;->encoded()Z
+
+    move-result v11
+
+    invoke-direct {v0, v4, v11}, Lr0/k$c;-><init>(Lr0/e;Z)V
+
+    :goto_a
+    move-object v4, v0
+
+    goto/16 :goto_b
+
+    :cond_37
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "@FieldMap keys must be of type String: "
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_38
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_39
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@FieldMap parameter type must be Map."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_3a
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@FieldMap parameters can only be used with form encoding."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_3b
+    instance-of v4, v11, Lr0/u/o;
+
+    if-eqz v4, :cond_4a
+
+    iget-boolean v0, v1, Lr0/q$a;->p:Z
+
+    if-eqz v0, :cond_49
+
+    check-cast v11, Lr0/u/o;
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, v1, Lr0/q$a;->h:Z
+
+    invoke-interface {v11}, Lr0/u/o;->value()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-virtual {v0}, Ljava/lang/String;->isEmpty()Z
+
+    move-result v12
+
+    if-eqz v12, :cond_42
+
+    const-class v0, Ljava/lang/Iterable;
+
+    invoke-virtual {v0, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v0
+
+    const-string v11, "@Part annotation must supply a name or use MultipartBody.Part parameter type."
+
+    if-eqz v0, :cond_3e
+
+    instance-of v0, v5, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v0, :cond_3d
+
+    move-object v0, v5
+
+    check-cast v0, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v4, 0x0
+
+    invoke-static {v4, v0}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v13, v0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3c
+
+    sget-object v0, Lr0/k$k;->a:Lr0/k$k;
+
+    new-instance v4, Lr0/i;
+
+    invoke-direct {v4, v0}, Lr0/i;-><init>(Lr0/k;)V
+
+    goto :goto_b
+
+    :cond_3c
+    new-array v0, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v11, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_3d
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_3e
+    invoke-virtual {v4}, Ljava/lang/Class;->isArray()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_40
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v13, v0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3f
+
+    sget-object v0, Lr0/k$k;->a:Lr0/k$k;
+
+    new-instance v4, Lr0/j;
+
+    invoke-direct {v4, v0}, Lr0/j;-><init>(Lr0/k;)V
+
+    goto :goto_b
+
+    :cond_3f
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v11, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_40
+    const/4 v0, 0x0
+
+    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_41
+
+    sget-object v0, Lr0/k$k;->a:Lr0/k$k;
+
+    goto/16 :goto_a
+
+    :goto_b
+    move-object/from16 v18, v7
+
+    move/from16 v17, v9
+
+    goto/16 :goto_d
+
+    :cond_41
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v11, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_42
+    const/4 v12, 0x4
+
+    new-array v12, v12, [Ljava/lang/String;
+
+    const-string v17, "Content-Disposition"
+
+    const/16 v18, 0x0
+
+    aput-object v17, v12, v18
+
+    move/from16 v17, v9
+
+    const-string v9, "form-data; name=\""
+
+    move-object/from16 v18, v7
+
+    const-string v7, "\""
+
+    invoke-static {v9, v0, v7}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v7, 0x1
+
+    aput-object v0, v12, v7
+
+    const-string v0, "Content-Transfer-Encoding"
+
+    const/4 v7, 0x2
+
+    aput-object v0, v12, v7
+
+    const/4 v0, 0x3
+
+    invoke-interface {v11}, Lr0/u/o;->encoding()Ljava/lang/String;
+
+    move-result-object v7
+
+    aput-object v7, v12, v0
+
+    sget-object v0, Lokhttp3/Headers;->e:Lokhttp3/Headers$b;
+
+    invoke-virtual {v0, v12}, Lokhttp3/Headers$b;->c([Ljava/lang/String;)Lokhttp3/Headers;
+
+    move-result-object v0
+
+    const-class v7, Ljava/lang/Iterable;
+
+    invoke-virtual {v7, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v7
+
+    const-string v9, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation."
+
+    if-eqz v7, :cond_45
+
+    instance-of v7, v5, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v7, :cond_44
+
+    move-object v4, v5
+
+    check-cast v4, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v7, 0x0
+
+    invoke-static {v7, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v4
+
+    invoke-static {v4}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v7
+
+    invoke-virtual {v13, v7}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v7
+
+    if-nez v7, :cond_43
+
+    iget-object v7, v1, Lr0/q$a;->a:Lr0/p;
+
+    iget-object v9, v1, Lr0/q$a;->c:[Ljava/lang/annotation/Annotation;
+
+    invoke-virtual {v7, v4, v6, v9}, Lr0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v4
+
+    new-instance v7, Lr0/k$e;
+
+    invoke-direct {v7, v0, v4}, Lr0/k$e;-><init>(Lokhttp3/Headers;Lr0/e;)V
+
+    new-instance v0, Lr0/i;
+
+    invoke-direct {v0, v7}, Lr0/i;-><init>(Lr0/k;)V
+
+    goto :goto_c
+
+    :cond_43
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v9, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_44
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_45
+    invoke-virtual {v4}, Ljava/lang/Class;->isArray()Z
+
+    move-result v7
+
+    if-eqz v7, :cond_47
+
+    invoke-virtual {v4}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-static {v4}, Lr0/q;->a(Ljava/lang/Class;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v7
+
+    if-nez v7, :cond_46
+
+    iget-object v7, v1, Lr0/q$a;->a:Lr0/p;
+
+    iget-object v9, v1, Lr0/q$a;->c:[Ljava/lang/annotation/Annotation;
+
+    invoke-virtual {v7, v4, v6, v9}, Lr0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v4
+
+    new-instance v7, Lr0/k$e;
+
+    invoke-direct {v7, v0, v4}, Lr0/k$e;-><init>(Lokhttp3/Headers;Lr0/e;)V
+
+    new-instance v0, Lr0/j;
+
+    invoke-direct {v0, v7}, Lr0/j;-><init>(Lr0/k;)V
+
+    :goto_c
+    move-object v4, v0
+
+    goto/16 :goto_d
+
+    :cond_46
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v9, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_47
+    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_48
+
+    iget-object v4, v1, Lr0/q$a;->a:Lr0/p;
+
+    iget-object v7, v1, Lr0/q$a;->c:[Ljava/lang/annotation/Annotation;
+
+    invoke-virtual {v4, v5, v6, v7}, Lr0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v4
+
+    new-instance v7, Lr0/k$e;
+
+    invoke-direct {v7, v0, v4}, Lr0/k$e;-><init>(Lokhttp3/Headers;Lr0/e;)V
+
+    move-object v4, v7
+
+    goto/16 :goto_d
+
+    :cond_48
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v9, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_49
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@Part parameters can only be used with multipart encoding."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_4a
+    move-object/from16 v18, v7
+
+    move/from16 v17, v9
+
+    instance-of v4, v11, Lr0/u/p;
+
+    if-eqz v4, :cond_50
+
+    iget-boolean v4, v1, Lr0/q$a;->p:Z
+
+    if-eqz v4, :cond_4f
+
+    const/4 v4, 0x1
+
+    iput-boolean v4, v1, Lr0/q$a;->h:Z
+
+    invoke-static {v5}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    const-class v7, Ljava/util/Map;
+
+    invoke-virtual {v7, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v7
+
+    if-eqz v7, :cond_4e
+
+    const-class v7, Ljava/util/Map;
+
+    invoke-static {v5, v4, v7}, Lr0/r;->i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+
+    move-result-object v4
+
+    instance-of v7, v4, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v7, :cond_4d
+
+    check-cast v4, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v0, 0x0
+
+    invoke-static {v0, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    if-ne v12, v0, :cond_4c
+
+    const/4 v0, 0x1
+
+    invoke-static {v0, v4}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v4
+
+    invoke-virtual {v13, v4}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_4b
+
+    iget-object v4, v1, Lr0/q$a;->a:Lr0/p;
+
+    iget-object v7, v1, Lr0/q$a;->c:[Ljava/lang/annotation/Annotation;
+
+    invoke-virtual {v4, v0, v6, v7}, Lr0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v0
+
+    check-cast v11, Lr0/u/p;
+
+    new-instance v4, Lr0/k$f;
+
+    invoke-interface {v11}, Lr0/u/p;->encoding()Ljava/lang/String;
+
+    move-result-object v7
+
+    invoke-direct {v4, v0, v7}, Lr0/k$f;-><init>(Lr0/e;Ljava/lang/String;)V
+
+    goto/16 :goto_d
+
+    :cond_4b
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@PartMap values cannot be MultipartBody.Part. Use @Part List<Part> or a different value type instead."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_4c
+    const/4 v3, 0x0
+
+    new-instance v4, Ljava/lang/StringBuilder;
+
+    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v5, "@PartMap keys must be of type String: "
+
+    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_4d
+    const/4 v3, 0x0
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_4e
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@PartMap parameter type must be Map."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_4f
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@PartMap parameters can only be used with multipart encoding."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_50
+    instance-of v0, v11, Lr0/u/a;
+
+    if-eqz v0, :cond_53
+
+    iget-boolean v0, v1, Lr0/q$a;->o:Z
+
+    if-nez v0, :cond_52
+
+    iget-boolean v0, v1, Lr0/q$a;->p:Z
+
+    if-nez v0, :cond_52
+
+    iget-boolean v0, v1, Lr0/q$a;->i:Z
+
+    if-nez v0, :cond_51
+
+    :try_start_2
+    iget-object v0, v1, Lr0/q$a;->a:Lr0/p;
+
+    iget-object v4, v1, Lr0/q$a;->c:[Ljava/lang/annotation/Annotation;
+
+    invoke-virtual {v0, v5, v6, v4}, Lr0/p;->c(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;)Lr0/e;
+
+    move-result-object v0
+    :try_end_2
+    .catch Ljava/lang/RuntimeException; {:try_start_2 .. :try_end_2} :catch_0
+
+    const/4 v4, 0x1
+
+    iput-boolean v4, v1, Lr0/q$a;->i:Z
+
+    new-instance v4, Lr0/k$a;
+
+    invoke-direct {v4, v0}, Lr0/k$a;-><init>(Lr0/e;)V
+
+    goto :goto_d
+
+    :catch_0
+    move-exception v0
+
+    const/4 v3, 0x1
+
+    new-array v4, v3, [Ljava/lang/Object;
+
+    const/4 v6, 0x0
+
+    aput-object v5, v4, v6
+
+    const-string v5, "Unable to create @Body converter for %s"
+
+    const-string v6, " (parameter #"
+
+    invoke-static {v5, v6}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v5
+
+    add-int/2addr v2, v3
+
+    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v2, ")"
+
+    invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v0, v2, v4}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_51
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "Multiple @Body method annotations found."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_52
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "@Body parameters cannot be used with form or multi-part encoding."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_53
+    const/4 v4, 0x0
+
+    :goto_d
+    if-nez v4, :cond_54
+
+    goto :goto_e
+
+    :cond_54
+    if-nez v3, :cond_55
+
+    move-object v3, v4
+
+    :goto_e
+    add-int/lit8 v10, v10, 0x1
+
+    const/4 v4, 0x1
+
+    move/from16 v0, v16
+
+    move/from16 v9, v17
+
+    move-object/from16 v7, v18
+
+    goto/16 :goto_6
+
+    :cond_55
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v3, "Multiple Retrofit annotations found, only one allowed."
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_56
+    move/from16 v16, v0
+
+    move-object/from16 v18, v7
+
+    const/4 v0, 0x0
+
+    if-eqz v3, :cond_57
+
+    aput-object v3, v8, v2
+
+    add-int/lit8 v2, v2, 0x1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    move/from16 v0, v16
+
+    goto/16 :goto_5
+
+    :cond_57
+    new-array v0, v0, [Ljava/lang/Object;
+
+    move-object/from16 v3, v18
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_58
+    move-object v3, v7
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v2, v3, v0}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_59
+    const/4 v0, 0x0
+
+    new-array v3, v4, [Ljava/lang/Object;
+
+    aput-object v5, v3, v0
+
+    const-string v0, "Parameter type must not include a type variable or wildcard: %s"
+
+    invoke-virtual {v1, v2, v0, v3}, Lr0/q$a;->d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_5a
+    const/4 v0, 0x0
+
+    iget-object v2, v1, Lr0/q$a;->q:Ljava/lang/String;
+
+    if-nez v2, :cond_5c
+
+    iget-boolean v2, v1, Lr0/q$a;->l:Z
+
+    if-eqz v2, :cond_5b
+
+    goto :goto_f
+
+    :cond_5b
+    new-array v2, v4, [Ljava/lang/Object;
+
+    iget-object v3, v1, Lr0/q$a;->m:Ljava/lang/String;
+
+    aput-object v3, v2, v0
+
+    const-string v0, "Missing either @%s URL or @Url parameter."
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v1, v3, v0, v2}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_5c
+    :goto_f
+    iget-boolean v0, v1, Lr0/q$a;->o:Z
+
+    if-nez v0, :cond_5e
+
+    iget-boolean v0, v1, Lr0/q$a;->p:Z
+
+    if-nez v0, :cond_5e
+
+    iget-boolean v0, v1, Lr0/q$a;->n:Z
+
+    if-nez v0, :cond_5e
+
+    iget-boolean v0, v1, Lr0/q$a;->i:Z
+
+    if-nez v0, :cond_5d
+
+    goto :goto_10
+
+    :cond_5d
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v2, "Non-body HTTP method cannot contain @Body."
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_5e
+    :goto_10
+    iget-boolean v0, v1, Lr0/q$a;->o:Z
+
+    if-eqz v0, :cond_60
+
+    iget-boolean v0, v1, Lr0/q$a;->g:Z
+
+    if-eqz v0, :cond_5f
+
+    goto :goto_11
+
+    :cond_5f
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v2, "Form-encoded method must contain at least one @Field."
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_60
+    :goto_11
+    iget-boolean v0, v1, Lr0/q$a;->p:Z
+
+    if-eqz v0, :cond_62
+
+    iget-boolean v0, v1, Lr0/q$a;->h:Z
+
+    if-eqz v0, :cond_61
+
+    goto :goto_12
+
+    :cond_61
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v2, "Multipart method must contain at least one @Part."
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_62
+    :goto_12
+    new-instance v0, Lr0/q;
+
+    invoke-direct {v0, v1}, Lr0/q;-><init>(Lr0/q$a;)V
+
+    return-object v0
+
+    :cond_63
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v2, "HTTP method annotation is required (e.g., @GET, @POST, etc.)."
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :catch_1
+    move-exception v0
+
+    const/4 v2, 0x1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    iget-object v3, v1, Lr0/q$a;->f:Ljava/lang/reflect/Type;
+
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
+
+    const-string v3, "Unable to create converter for %s"
+
+    invoke-virtual {v1, v0, v3, v2}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_64
+    const-string v0, "\'"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v2, v1, Lr0/q$a;->f:Ljava/lang/reflect/Type;
+
+    invoke-static {v2}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v2, "\' is not a valid response body type. Did you mean ResponseBody?"
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v2, 0x0
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-virtual {v1, v0, v2}, Lr0/q$a;->b(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :catch_2
+    move-exception v0
+
+    const/4 v3, 0x0
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    aput-object v2, v4, v3
+
+    const-string v2, "Unable to create call adapter for %s"
+
+    invoke-virtual {v1, v0, v2, v4}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_65
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const-string v2, "Service methods cannot return void."
+
+    const/4 v3, 0x0
+
+    invoke-virtual {v1, v3, v2, v0}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+
+    :cond_66
+    const/4 v0, 0x0
+
+    new-array v4, v4, [Ljava/lang/Object;
+
+    aput-object v2, v4, v0
+
+    const-string v0, "Method return type must not include a type variable or wildcard: %s"
+
+    invoke-virtual {v1, v3, v0, v4}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object v0
+
+    throw v0
+.end method
+
+.method public final varargs b(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0, p1, p2}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final varargs c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+    .locals 1
+
+    invoke-static {p2, p3}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p2
+
+    new-instance p3, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "\n    for method "
+
+    invoke-static {p2, v0}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    iget-object v0, p0, Lr0/q$a;->b:Ljava/lang/reflect/Method;
+
+    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getDeclaringClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "."
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v0, p0, Lr0/q$a;->b:Ljava/lang/reflect/Method;
+
+    invoke-virtual {v0}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-direct {p3, p2, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    return-object p3
+.end method
+
+.method public final varargs d(ILjava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+    .locals 1
+
+    const-string v0, " (parameter #"
+
+    invoke-static {p2, v0}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p2
+
+    add-int/lit8 p1, p1, 0x1
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string p1, ")"
+
+    invoke-virtual {p2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1, p3}, Lr0/q$a;->b(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final e(Ljava/lang/String;Ljava/lang/String;Z)V
+    .locals 4
+
+    iget-object v0, p0, Lr0/q$a;->m:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-nez v0, :cond_4
+
+    iput-object p1, p0, Lr0/q$a;->m:Ljava/lang/String;
+
+    iput-boolean p3, p0, Lr0/q$a;->n:Z
+
+    invoke-virtual {p2}, Ljava/lang/String;->isEmpty()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    return-void
+
+    :cond_0
+    const/16 p1, 0x3f
+
+    invoke-virtual {p2, p1}, Ljava/lang/String;->indexOf(I)I
+
+    move-result p1
+
+    const/4 p3, -0x1
+
+    if-eq p1, p3, :cond_2
+
+    invoke-virtual {p2}, Ljava/lang/String;->length()I
+
+    move-result p3
+
+    sub-int/2addr p3, v3
+
+    if-ge p1, p3, :cond_2
+
+    add-int/2addr p1, v3
+
+    invoke-virtual {p2, p1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    sget-object p3, Lr0/q;->m:Ljava/util/regex/Pattern;
+
+    invoke-virtual {p3, p1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+
+    move-result-object p3
+
+    invoke-virtual {p3}, Ljava/util/regex/Matcher;->find()Z
+
+    move-result p3
+
+    if-nez p3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-array p2, v3, [Ljava/lang/Object;
+
+    aput-object p1, p2, v2
+
+    const-string p1, "URL query string \"%s\" must not have replace block. For dynamic query parameters use @Query."
+
+    invoke-virtual {p0, v1, p1, p2}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object p1
+
+    throw p1
+
+    :cond_2
+    :goto_0
+    iput-object p2, p0, Lr0/q$a;->q:Ljava/lang/String;
+
+    sget-object p1, Lr0/q;->m:Ljava/util/regex/Pattern;
+
+    invoke-virtual {p1, p2}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
+
+    move-result-object p1
+
+    new-instance p2, Ljava/util/LinkedHashSet;
+
+    invoke-direct {p2}, Ljava/util/LinkedHashSet;-><init>()V
+
+    :goto_1
+    invoke-virtual {p1}, Ljava/util/regex/Matcher;->find()Z
+
+    move-result p3
+
+    if-eqz p3, :cond_3
+
+    invoke-virtual {p1, v3}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String;
+
+    move-result-object p3
+
+    invoke-virtual {p2, p3}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+    goto :goto_1
+
+    :cond_3
+    iput-object p2, p0, Lr0/q$a;->t:Ljava/util/Set;
+
+    return-void
+
+    :cond_4
+    const/4 p2, 0x2
+
+    new-array p2, p2, [Ljava/lang/Object;
+
+    aput-object v0, p2, v2
+
+    aput-object p1, p2, v3
+
+    const-string p1, "Only one HTTP method is allowed. Found: %s and %s."
+
+    invoke-virtual {p0, v1, p1, p2}, Lr0/q$a;->c(Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/RuntimeException;
+
+    move-result-object p1
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/q.smali b/com.discord/smali_classes2/r0/q.smali
new file mode 100644
index 0000000000..28b101c399
--- /dev/null
+++ b/com.discord/smali_classes2/r0/q.smali
@@ -0,0 +1,251 @@
+.class public final Lr0/q;
+.super Ljava/lang/Object;
+.source "ServiceMethod.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/q$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        "T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final m:Ljava/util/regex/Pattern;
+
+.field public static final n:Ljava/util/regex/Pattern;
+
+
+# instance fields
+.field public final a:Lo0/f$a;
+
+.field public final b:Lr0/c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/c<",
+            "TR;TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Lo0/w;
+
+.field public final d:Lr0/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/e<",
+            "Lokhttp3/ResponseBody;",
+            "TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/lang/String;
+
+.field public final f:Ljava/lang/String;
+
+.field public final g:Lokhttp3/Headers;
+
+.field public final h:Lokhttp3/MediaType;
+
+.field public final i:Z
+
+.field public final j:Z
+
+.field public final k:Z
+
+.field public final l:[Lr0/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Lr0/k<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const-string v0, "\\{([a-zA-Z][a-zA-Z0-9_-]*)\\}"
+
+    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
+
+    move-result-object v0
+
+    sput-object v0, Lr0/q;->m:Ljava/util/regex/Pattern;
+
+    const-string v0, "[a-zA-Z][a-zA-Z0-9_-]*"
+
+    invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
+
+    move-result-object v0
+
+    sput-object v0, Lr0/q;->n:Ljava/util/regex/Pattern;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lr0/q$a;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/q$a<",
+            "TR;TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-object v0, p1, Lr0/q$a;->a:Lr0/p;
+
+    iget-object v1, v0, Lr0/p;->b:Lo0/f$a;
+
+    iput-object v1, p0, Lr0/q;->a:Lo0/f$a;
+
+    iget-object v1, p1, Lr0/q$a;->w:Lr0/c;
+
+    iput-object v1, p0, Lr0/q;->b:Lr0/c;
+
+    iget-object v0, v0, Lr0/p;->c:Lo0/w;
+
+    iput-object v0, p0, Lr0/q;->c:Lo0/w;
+
+    iget-object v0, p1, Lr0/q$a;->v:Lr0/e;
+
+    iput-object v0, p0, Lr0/q;->d:Lr0/e;
+
+    iget-object v0, p1, Lr0/q$a;->m:Ljava/lang/String;
+
+    iput-object v0, p0, Lr0/q;->e:Ljava/lang/String;
+
+    iget-object v0, p1, Lr0/q$a;->q:Ljava/lang/String;
+
+    iput-object v0, p0, Lr0/q;->f:Ljava/lang/String;
+
+    iget-object v0, p1, Lr0/q$a;->r:Lokhttp3/Headers;
+
+    iput-object v0, p0, Lr0/q;->g:Lokhttp3/Headers;
+
+    iget-object v0, p1, Lr0/q$a;->s:Lokhttp3/MediaType;
+
+    iput-object v0, p0, Lr0/q;->h:Lokhttp3/MediaType;
+
+    iget-boolean v0, p1, Lr0/q$a;->n:Z
+
+    iput-boolean v0, p0, Lr0/q;->i:Z
+
+    iget-boolean v0, p1, Lr0/q$a;->o:Z
+
+    iput-boolean v0, p0, Lr0/q;->j:Z
+
+    iget-boolean v0, p1, Lr0/q$a;->p:Z
+
+    iput-boolean v0, p0, Lr0/q;->k:Z
+
+    iget-object p1, p1, Lr0/q$a;->u:[Lr0/k;
+
+    iput-object p1, p0, Lr0/q;->l:[Lr0/k;
+
+    return-void
+.end method
+
+.method public static a(Ljava/lang/Class;)Ljava/lang/Class;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+
+    sget-object v0, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_0
+
+    const-class p0, Ljava/lang/Boolean;
+
+    return-object p0
+
+    :cond_0
+    sget-object v0, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_1
+
+    const-class p0, Ljava/lang/Byte;
+
+    return-object p0
+
+    :cond_1
+    sget-object v0, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_2
+
+    const-class p0, Ljava/lang/Character;
+
+    return-object p0
+
+    :cond_2
+    sget-object v0, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_3
+
+    const-class p0, Ljava/lang/Double;
+
+    return-object p0
+
+    :cond_3
+    sget-object v0, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_4
+
+    const-class p0, Ljava/lang/Float;
+
+    return-object p0
+
+    :cond_4
+    sget-object v0, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_5
+
+    const-class p0, Ljava/lang/Integer;
+
+    return-object p0
+
+    :cond_5
+    sget-object v0, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_6
+
+    const-class p0, Ljava/lang/Long;
+
+    return-object p0
+
+    :cond_6
+    sget-object v0, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
+
+    if-ne v0, p0, :cond_7
+
+    const-class p0, Ljava/lang/Short;
+
+    :cond_7
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/r0/q/a$a.smali b/com.discord/smali_classes2/r0/q/a$a.smali
deleted file mode 100644
index 891868cc32..0000000000
--- a/com.discord/smali_classes2/r0/q/a$a.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-.class public interface abstract Lr0/q/a$a;
-.super Ljava/lang/Object;
-.source "ReplaySubject.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/q/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x609
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
diff --git a/com.discord/smali_classes2/r0/q/a$b.smali b/com.discord/smali_classes2/r0/q/a$b.smali
deleted file mode 100644
index 544f217848..0000000000
--- a/com.discord/smali_classes2/r0/q/a$b.smali
+++ /dev/null
@@ -1,157 +0,0 @@
-.class public final Lr0/q/a$b;
-.super Ljava/util/concurrent/atomic/AtomicInteger;
-.source "ReplaySubject.java"
-
-# interfaces
-.implements Lrx/Producer;
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/q/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicInteger;",
-        "Lrx/Producer;",
-        "Lrx/Subscription;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = -0x4579a11aac8dacd7L
-
-
-# instance fields
-.field public final actual:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public index:I
-
-.field public node:Ljava/lang/Object;
-
-.field public final requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-.field public final state:Lr0/q/a$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/q/a$c<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public tailIndex:I
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;Lr0/q/a$c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;",
-            "Lr0/q/a$c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
-
-    iput-object p1, p0, Lr0/q/a$b;->actual:Lrx/Subscriber;
-
-    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
-
-    iput-object p1, p0, Lr0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    iput-object p2, p0, Lr0/q/a$b;->state:Lr0/q/a$c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/q/a$b;->actual:Lrx/Subscriber;
-
-    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public m(J)V
-    .locals 3
-
-    const-wide/16 v0, 0x0
-
-    cmp-long v2, p1, v0
-
-    if-lez v2, :cond_0
-
-    iget-object v0, p0, Lr0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    iget-object p1, p0, Lr0/q/a$b;->state:Lr0/q/a$c;
-
-    iget-object p1, p1, Lr0/q/a$c;->buffer:Lr0/q/a$a;
-
-    check-cast p1, Lr0/q/a$d;
-
-    invoke-virtual {p1, p0}, Lr0/q/a$d;->a(Lr0/q/a$b;)V
-
-    goto :goto_0
-
-    :cond_0
-    if-ltz v2, :cond_1
-
-    :goto_0
-    return-void
-
-    :cond_1
-    new-instance v0, Ljava/lang/IllegalArgumentException;
-
-    const-string v1, "n >= required but it was "
-
-    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/q/a$b;->state:Lr0/q/a$c;
-
-    invoke-virtual {v0, p0}, Lr0/q/a$c;->a(Lr0/q/a$b;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/q/a$c.smali b/com.discord/smali_classes2/r0/q/a$c.smali
deleted file mode 100644
index 03e50b5351..0000000000
--- a/com.discord/smali_classes2/r0/q/a$c.smali
+++ /dev/null
@@ -1,472 +0,0 @@
-.class public final Lr0/q/a$c;
-.super Ljava/util/concurrent/atomic/AtomicReference;
-.source "ReplaySubject.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-.implements Lr0/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/q/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicReference<",
-        "[",
-        "Lr0/q/a$b<",
-        "TT;>;>;",
-        "Lrx/Observable$a<",
-        "TT;>;",
-        "Lr0/g<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final d:[Lr0/q/a$b;
-
-.field public static final e:[Lr0/q/a$b;
-
-.field public static final serialVersionUID:J = 0x529b0a217109d450L
-
-
-# instance fields
-.field public final buffer:Lr0/q/a$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/q/a$a<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    new-array v1, v0, [Lr0/q/a$b;
-
-    sput-object v1, Lr0/q/a$c;->d:[Lr0/q/a$b;
-
-    new-array v0, v0, [Lr0/q/a$b;
-
-    sput-object v0, Lr0/q/a$c;->e:[Lr0/q/a$b;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lr0/q/a$a;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/q/a$a<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object p1, p0, Lr0/q/a$c;->buffer:Lr0/q/a$a;
-
-    sget-object p1, Lr0/q/a$c;->d:[Lr0/q/a$b;
-
-    invoke-virtual {p0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lr0/q/a$b;)V
-    .locals 6
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/q/a$b<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, [Lr0/q/a$b;
-
-    sget-object v1, Lr0/q/a$c;->e:[Lr0/q/a$b;
-
-    if-eq v0, v1, :cond_6
-
-    sget-object v1, Lr0/q/a$c;->d:[Lr0/q/a$b;
-
-    if-ne v0, v1, :cond_1
-
-    goto :goto_3
-
-    :cond_1
-    array-length v1, v0
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v1, :cond_3
-
-    aget-object v4, v0, v3
-
-    if-ne v4, p1, :cond_2
-
-    goto :goto_1
-
-    :cond_2
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const/4 v3, -0x1
-
-    :goto_1
-    if-gez v3, :cond_4
-
-    return-void
-
-    :cond_4
-    const/4 v4, 0x1
-
-    if-ne v1, v4, :cond_5
-
-    sget-object v1, Lr0/q/a$c;->d:[Lr0/q/a$b;
-
-    goto :goto_2
-
-    :cond_5
-    add-int/lit8 v5, v1, -0x1
-
-    new-array v5, v5, [Lr0/q/a$b;
-
-    invoke-static {v0, v2, v5, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    add-int/lit8 v2, v3, 0x1
-
-    sub-int/2addr v1, v3
-
-    sub-int/2addr v1, v4
-
-    invoke-static {v0, v2, v5, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    move-object v1, v5
-
-    :goto_2
-    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    :cond_6
-    :goto_3
-    return-void
-.end method
-
-.method public call(Ljava/lang/Object;)V
-    .locals 4
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/q/a$b;
-
-    invoke-direct {v0, p1, p0}, Lr0/q/a$b;-><init>(Lrx/Subscriber;Lr0/q/a$c;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Lr0/q/a$b;
-
-    sget-object v1, Lr0/q/a$c;->e:[Lr0/q/a$b;
-
-    const/4 v2, 0x0
-
-    if-ne p1, v1, :cond_1
-
-    goto :goto_0
-
-    :cond_1
-    array-length v1, p1
-
-    add-int/lit8 v3, v1, 0x1
-
-    new-array v3, v3, [Lr0/q/a$b;
-
-    invoke-static {p1, v2, v3, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    aput-object v0, v3, v1
-
-    invoke-virtual {p0, p1, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/4 v2, 0x1
-
-    :goto_0
-    if-eqz v2, :cond_2
-
-    invoke-virtual {v0}, Lr0/q/a$b;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0, v0}, Lr0/q/a$c;->a(Lr0/q/a$b;)V
-
-    goto :goto_1
-
-    :cond_2
-    iget-object p1, p0, Lr0/q/a$c;->buffer:Lr0/q/a$a;
-
-    check-cast p1, Lr0/q/a$d;
-
-    invoke-virtual {p1, v0}, Lr0/q/a$d;->a(Lr0/q/a$b;)V
-
-    :goto_1
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 6
-
-    iget-object v0, p0, Lr0/q/a$c;->buffer:Lr0/q/a$a;
-
-    move-object v1, v0
-
-    check-cast v1, Lr0/q/a$d;
-
-    const/4 v2, 0x1
-
-    iput-boolean v2, v1, Lr0/q/a$d;->f:Z
-
-    sget-object v1, Lr0/q/a$c;->e:[Lr0/q/a$b;
-
-    invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, [Lr0/q/a$b;
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    :goto_0
-    if-ge v3, v2, :cond_0
-
-    aget-object v4, v1, v3
-
-    move-object v5, v0
-
-    check-cast v5, Lr0/q/a$d;
-
-    invoke-virtual {v5, v4}, Lr0/q/a$d;->a(Lr0/q/a$b;)V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 6
-
-    iget-object v0, p0, Lr0/q/a$c;->buffer:Lr0/q/a$a;
-
-    move-object v1, v0
-
-    check-cast v1, Lr0/q/a$d;
-
-    iget-boolean v2, v1, Lr0/q/a$d;->f:Z
-
-    if-eqz v2, :cond_0
-
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
-
-    goto :goto_0
-
-    :cond_0
-    iput-object p1, v1, Lr0/q/a$d;->g:Ljava/lang/Throwable;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, v1, Lr0/q/a$d;->f:Z
-
-    :goto_0
-    const/4 p1, 0x0
-
-    sget-object v1, Lr0/q/a$c;->e:[Lr0/q/a$b;
-
-    invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, [Lr0/q/a$b;
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    :goto_1
-    if-ge v3, v2, :cond_2
-
-    aget-object v4, v1, v3
-
-    move-object v5, v0
-
-    check-cast v5, Lr0/q/a$d;
-
-    :try_start_0
-    invoke-virtual {v5, v4}, Lr0/q/a$d;->a(Lr0/q/a$b;)V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_2
-
-    :catchall_0
-    move-exception v4
-
-    if-nez p1, :cond_1
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
-
-    :cond_1
-    invoke-interface {p1, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    :goto_2
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    invoke-static {p1}, Lf/n/a/k/a;->f0(Ljava/util/List;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/q/a$c;->buffer:Lr0/q/a$a;
-
-    move-object v1, v0
-
-    check-cast v1, Lr0/q/a$d;
-
-    iget-boolean v2, v1, Lr0/q/a$d;->f:Z
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    iget v2, v1, Lr0/q/a$d;->e:I
-
-    iget-object v4, v1, Lr0/q/a$d;->d:[Ljava/lang/Object;
-
-    array-length v5, v4
-
-    const/4 v6, 0x1
-
-    sub-int/2addr v5, v6
-
-    if-ne v2, v5, :cond_1
-
-    array-length v5, v4
-
-    new-array v5, v5, [Ljava/lang/Object;
-
-    aput-object p1, v5, v3
-
-    iput v6, v1, Lr0/q/a$d;->e:I
-
-    aput-object v5, v4, v2
-
-    iput-object v5, v1, Lr0/q/a$d;->d:[Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_1
-    aput-object p1, v4, v2
-
-    add-int/2addr v2, v6
-
-    iput v2, v1, Lr0/q/a$d;->e:I
-
-    :goto_0
-    iget p1, v1, Lr0/q/a$d;->b:I
-
-    add-int/2addr p1, v6
-
-    iput p1, v1, Lr0/q/a$d;->b:I
-
-    :goto_1
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, [Lr0/q/a$b;
-
-    array-length v1, p1
-
-    :goto_2
-    if-ge v3, v1, :cond_2
-
-    aget-object v2, p1, v3
-
-    move-object v4, v0
-
-    check-cast v4, Lr0/q/a$d;
-
-    invoke-virtual {v4, v2}, Lr0/q/a$d;->a(Lr0/q/a$b;)V
-
-    add-int/lit8 v3, v3, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/q/a$d.smali b/com.discord/smali_classes2/r0/q/a$d.smali
deleted file mode 100644
index ed59aaa2ee..0000000000
--- a/com.discord/smali_classes2/r0/q/a$d.smali
+++ /dev/null
@@ -1,284 +0,0 @@
-.class public final Lr0/q/a$d;
-.super Ljava/lang/Object;
-.source "ReplaySubject.java"
-
-# interfaces
-.implements Lr0/q/a$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/q/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "d"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/q/a$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final a:I
-
-.field public volatile b:I
-
-.field public final c:[Ljava/lang/Object;
-
-.field public d:[Ljava/lang/Object;
-
-.field public e:I
-
-.field public volatile f:Z
-
-.field public g:Ljava/lang/Throwable;
-
-
-# direct methods
-.method public constructor <init>(I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lr0/q/a$d;->a:I
-
-    add-int/lit8 p1, p1, 0x1
-
-    new-array p1, p1, [Ljava/lang/Object;
-
-    iput-object p1, p0, Lr0/q/a$d;->c:[Ljava/lang/Object;
-
-    iput-object p1, p0, Lr0/q/a$d;->d:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lr0/q/a$b;)V
-    .locals 19
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/q/a$b<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    invoke-virtual/range {p1 .. p1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    return-void
-
-    :cond_0
-    iget-object v2, v1, Lr0/q/a$b;->actual:Lrx/Subscriber;
-
-    iget v3, v0, Lr0/q/a$d;->a:I
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x1
-
-    :cond_1
-    iget-object v6, v1, Lr0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-virtual {v6}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
-
-    move-result-wide v6
-
-    iget-object v8, v1, Lr0/q/a$b;->node:Ljava/lang/Object;
-
-    check-cast v8, [Ljava/lang/Object;
-
-    if-nez v8, :cond_2
-
-    iget-object v8, v0, Lr0/q/a$d;->c:[Ljava/lang/Object;
-
-    :cond_2
-    iget v9, v1, Lr0/q/a$b;->tailIndex:I
-
-    iget v10, v1, Lr0/q/a$b;->index:I
-
-    const-wide/16 v13, 0x0
-
-    :goto_0
-    const/4 v15, 0x0
-
-    cmp-long v17, v13, v6
-
-    if-eqz v17, :cond_9
-
-    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v18
-
-    if-eqz v18, :cond_3
-
-    iput-object v15, v1, Lr0/q/a$b;->node:Ljava/lang/Object;
-
-    return-void
-
-    :cond_3
-    iget-boolean v11, v0, Lr0/q/a$d;->f:Z
-
-    iget v12, v0, Lr0/q/a$d;->b:I
-
-    if-ne v10, v12, :cond_4
-
-    const/4 v12, 0x1
-
-    goto :goto_1
-
-    :cond_4
-    const/4 v12, 0x0
-
-    :goto_1
-    if-eqz v11, :cond_6
-
-    if-eqz v12, :cond_6
-
-    iput-object v15, v1, Lr0/q/a$b;->node:Ljava/lang/Object;
-
-    iget-object v1, v0, Lr0/q/a$d;->g:Ljava/lang/Throwable;
-
-    if-eqz v1, :cond_5
-
-    invoke-interface {v2, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_2
-
-    :cond_5
-    invoke-interface {v2}, Lr0/g;->onCompleted()V
-
-    :goto_2
-    return-void
-
-    :cond_6
-    if-eqz v12, :cond_7
-
-    goto :goto_3
-
-    :cond_7
-    if-ne v9, v3, :cond_8
-
-    aget-object v8, v8, v9
-
-    check-cast v8, [Ljava/lang/Object;
-
-    const/4 v9, 0x0
-
-    :cond_8
-    aget-object v11, v8, v9
-
-    invoke-interface {v2, v11}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    const-wide/16 v11, 0x1
-
-    add-long/2addr v13, v11
-
-    add-int/2addr v9, v4
-
-    add-int/lit8 v10, v10, 0x1
-
-    goto :goto_0
-
-    :cond_9
-    :goto_3
-    if-nez v17, :cond_d
-
-    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v11
-
-    if-eqz v11, :cond_a
-
-    iput-object v15, v1, Lr0/q/a$b;->node:Ljava/lang/Object;
-
-    return-void
-
-    :cond_a
-    iget-boolean v11, v0, Lr0/q/a$d;->f:Z
-
-    iget v12, v0, Lr0/q/a$d;->b:I
-
-    if-ne v10, v12, :cond_b
-
-    const/16 v16, 0x1
-
-    goto :goto_4
-
-    :cond_b
-    const/16 v16, 0x0
-
-    :goto_4
-    if-eqz v11, :cond_d
-
-    if-eqz v16, :cond_d
-
-    iput-object v15, v1, Lr0/q/a$b;->node:Ljava/lang/Object;
-
-    iget-object v1, v0, Lr0/q/a$d;->g:Ljava/lang/Throwable;
-
-    if-eqz v1, :cond_c
-
-    invoke-interface {v2, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    goto :goto_5
-
-    :cond_c
-    invoke-interface {v2}, Lr0/g;->onCompleted()V
-
-    :goto_5
-    return-void
-
-    :cond_d
-    const-wide/16 v11, 0x0
-
-    cmp-long v15, v13, v11
-
-    if-eqz v15, :cond_e
-
-    const-wide v11, 0x7fffffffffffffffL
-
-    cmp-long v15, v6, v11
-
-    if-eqz v15, :cond_e
-
-    iget-object v6, v1, Lr0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
-
-    invoke-static {v6, v13, v14}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
-
-    :cond_e
-    iput v10, v1, Lr0/q/a$b;->index:I
-
-    iput v9, v1, Lr0/q/a$b;->tailIndex:I
-
-    iput-object v8, v1, Lr0/q/a$b;->node:Ljava/lang/Object;
-
-    neg-int v5, v5
-
-    invoke-virtual {v1, v5}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
-
-    move-result v5
-
-    if-nez v5, :cond_1
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/q/a.smali b/com.discord/smali_classes2/r0/q/a.smali
deleted file mode 100644
index e7e8aa4deb..0000000000
--- a/com.discord/smali_classes2/r0/q/a.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.class public final Lr0/q/a;
-.super Lrx/subjects/Subject;
-.source "ReplaySubject.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/q/a$b;,
-        Lr0/q/a$d;,
-        Lr0/q/a$a;,
-        Lr0/q/a$c;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Lrx/subjects/Subject<",
-        "TT;TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final f:[Ljava/lang/Object;
-
-
-# instance fields
-.field public final e:Lr0/q/a$c;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lr0/q/a$c<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    new-array v0, v0, [Ljava/lang/Object;
-
-    sput-object v0, Lr0/q/a;->f:[Ljava/lang/Object;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lr0/q/a$c;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/q/a$c<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0, p1}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
-
-    iput-object p1, p0, Lr0/q/a;->e:Lr0/q/a$c;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/q/a;->e:Lr0/q/a$c;
-
-    invoke-virtual {v0}, Lr0/q/a$c;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/q/a;->e:Lr0/q/a$c;
-
-    invoke-virtual {v0, p1}, Lr0/q/a$c;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/q/a;->e:Lr0/q/a$c;
-
-    invoke-virtual {v0, p1}, Lr0/q/a$c;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/q/b.smali b/com.discord/smali_classes2/r0/q/b.smali
deleted file mode 100644
index 61b1784154..0000000000
--- a/com.discord/smali_classes2/r0/q/b.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public Lr0/q/b;
-.super Ljava/lang/Object;
-.source "SubjectSubscriptionManager.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# instance fields
-.field public final synthetic d:Lr0/q/c$b;
-
-.field public final synthetic e:Lr0/q/c;
-
-
-# direct methods
-.method public constructor <init>(Lr0/q/c;Lr0/q/c$b;)V
-    .locals 0
-
-    iput-object p1, p0, Lr0/q/b;->e:Lr0/q/c;
-
-    iput-object p2, p0, Lr0/q/b;->d:Lr0/q/c$b;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/q/b;->e:Lr0/q/c;
-
-    iget-object v1, p0, Lr0/q/b;->d:Lr0/q/c$b;
-
-    invoke-virtual {v0, v1}, Lr0/q/c;->a(Lr0/q/c$b;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/q/c$a.smali b/com.discord/smali_classes2/r0/q/c$a.smali
deleted file mode 100644
index fd22916752..0000000000
--- a/com.discord/smali_classes2/r0/q/c$a.smali
+++ /dev/null
@@ -1,79 +0,0 @@
-.class public final Lr0/q/c$a;
-.super Ljava/lang/Object;
-.source "SubjectSubscriptionManager.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/q/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final c:[Lr0/q/c$b;
-
-.field public static final d:Lr0/q/c$a;
-
-.field public static final e:Lr0/q/c$a;
-
-
-# instance fields
-.field public final a:Z
-
-.field public final b:[Lr0/q/c$b;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 4
-
-    const/4 v0, 0x0
-
-    new-array v1, v0, [Lr0/q/c$b;
-
-    sput-object v1, Lr0/q/c$a;->c:[Lr0/q/c$b;
-
-    new-instance v2, Lr0/q/c$a;
-
-    const/4 v3, 0x1
-
-    invoke-direct {v2, v3, v1}, Lr0/q/c$a;-><init>(Z[Lr0/q/c$b;)V
-
-    sput-object v2, Lr0/q/c$a;->d:Lr0/q/c$a;
-
-    new-instance v1, Lr0/q/c$a;
-
-    sget-object v2, Lr0/q/c$a;->c:[Lr0/q/c$b;
-
-    invoke-direct {v1, v0, v2}, Lr0/q/c$a;-><init>(Z[Lr0/q/c$b;)V
-
-    sput-object v1, Lr0/q/c$a;->e:Lr0/q/c$a;
-
-    return-void
-.end method
-
-.method public constructor <init>(Z[Lr0/q/c$b;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Lr0/q/c$a;->a:Z
-
-    iput-object p2, p0, Lr0/q/c$a;->b:[Lr0/q/c$b;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/q/c$b.smali b/com.discord/smali_classes2/r0/q/c$b.smali
deleted file mode 100644
index b92d0bc2ff..0000000000
--- a/com.discord/smali_classes2/r0/q/c$b.smali
+++ /dev/null
@@ -1,182 +0,0 @@
-.class public final Lr0/q/c$b;
-.super Ljava/lang/Object;
-.source "SubjectSubscriptionManager.java"
-
-# interfaces
-.implements Lr0/g;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/q/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lr0/g<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final d:Lrx/Subscriber;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Subscriber<",
-            "-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field public e:Z
-
-.field public f:Z
-
-.field public g:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/Object;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public h:Z
-
-
-# direct methods
-.method public constructor <init>(Lrx/Subscriber;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lrx/Subscriber<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/q/c$b;->e:Z
-
-    iput-object p1, p0, Lr0/q/c$b;->d:Lrx/Subscriber;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Ljava/lang/Object;)V
-    .locals 1
-
-    iget-boolean v0, p0, Lr0/q/c$b;->h:Z
-
-    if-nez v0, :cond_2
-
-    monitor-enter p0
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iput-boolean v0, p0, Lr0/q/c$b;->e:Z
-
-    iget-boolean v0, p0, Lr0/q/c$b;->f:Z
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lr0/q/c$b;->g:Ljava/util/List;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
-
-    iput-object v0, p0, Lr0/q/c$b;->g:Ljava/util/List;
-
-    :cond_0
-    iget-object v0, p0, Lr0/q/c$b;->g:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_1
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/q/c$b;->h:Z
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception p1
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw p1
-
-    :cond_2
-    :goto_0
-    iget-object v0, p0, Lr0/q/c$b;->d:Lrx/Subscriber;
-
-    invoke-static {v0, p1}, Lr0/l/a/h;->a(Lr0/g;Ljava/lang/Object;)Z
-
-    return-void
-.end method
-
-.method public onCompleted()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/q/c$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
-
-    return-void
-.end method
-
-.method public onError(Ljava/lang/Throwable;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/q/c$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
-
-    return-void
-.end method
-
-.method public onNext(Ljava/lang/Object;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(TT;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lr0/q/c$b;->d:Lrx/Subscriber;
-
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/q/c.smali b/com.discord/smali_classes2/r0/q/c.smali
deleted file mode 100644
index fd827c5eda..0000000000
--- a/com.discord/smali_classes2/r0/q/c.smali
+++ /dev/null
@@ -1,352 +0,0 @@
-.class public final Lr0/q/c;
-.super Ljava/util/concurrent/atomic/AtomicReference;
-.source "SubjectSubscriptionManager.java"
-
-# interfaces
-.implements Lrx/Observable$a;
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/q/c$b;,
-        Lr0/q/c$a;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/util/concurrent/atomic/AtomicReference<",
-        "Lr0/q/c$a<",
-        "TT;>;>;",
-        "Lrx/Observable$a<",
-        "TT;>;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final serialVersionUID:J = 0x53c184d753c8b010L
-
-
-# instance fields
-.field public active:Z
-
-.field public volatile latest:Ljava/lang/Object;
-
-.field public onAdded:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "Lr0/q/c$b<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public onStart:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "Lr0/q/c$b<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field public onTerminated:Lrx/functions/Action1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/Action1<",
-            "Lr0/q/c$b<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    sget-object v0, Lr0/q/c$a;->e:Lr0/q/c$a;
-
-    invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lr0/q/c;->active:Z
-
-    sget-object v0, Lr0/k/a;->a:Lr0/k/a$b;
-
-    iput-object v0, p0, Lr0/q/c;->onStart:Lrx/functions/Action1;
-
-    iput-object v0, p0, Lr0/q/c;->onAdded:Lrx/functions/Action1;
-
-    iput-object v0, p0, Lr0/q/c;->onTerminated:Lrx/functions/Action1;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lr0/q/c$b;)V
-    .locals 10
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lr0/q/c$b<",
-            "TT;>;)V"
-        }
-    .end annotation
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lr0/q/c$a;
-
-    iget-boolean v1, v0, Lr0/q/c$a;->a:Z
-
-    if-eqz v1, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v1, v0, Lr0/q/c$a;->b:[Lr0/q/c$b;
-
-    array-length v2, v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x1
-
-    if-ne v2, v4, :cond_2
-
-    aget-object v4, v1, v3
-
-    if-ne v4, p1, :cond_2
-
-    sget-object v1, Lr0/q/c$a;->e:Lr0/q/c$a;
-
-    goto :goto_2
-
-    :cond_2
-    if-nez v2, :cond_3
-
-    :goto_0
-    move-object v1, v0
-
-    goto :goto_2
-
-    :cond_3
-    add-int/lit8 v4, v2, -0x1
-
-    new-array v5, v4, [Lr0/q/c$b;
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    :goto_1
-    if-ge v6, v2, :cond_6
-
-    aget-object v8, v1, v6
-
-    if-eq v8, p1, :cond_5
-
-    if-ne v7, v4, :cond_4
-
-    goto :goto_0
-
-    :cond_4
-    add-int/lit8 v9, v7, 0x1
-
-    aput-object v8, v5, v7
-
-    move v7, v9
-
-    :cond_5
-    add-int/lit8 v6, v6, 0x1
-
-    goto :goto_1
-
-    :cond_6
-    if-nez v7, :cond_7
-
-    sget-object v1, Lr0/q/c$a;->e:Lr0/q/c$a;
-
-    goto :goto_2
-
-    :cond_7
-    if-ge v7, v4, :cond_8
-
-    new-array v1, v7, [Lr0/q/c$b;
-
-    invoke-static {v5, v3, v1, v3, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    move-object v5, v1
-
-    :cond_8
-    new-instance v1, Lr0/q/c$a;
-
-    iget-boolean v2, v0, Lr0/q/c$a;->a:Z
-
-    invoke-direct {v1, v2, v5}, Lr0/q/c$a;-><init>(Z[Lr0/q/c$b;)V
-
-    :goto_2
-    if-eq v1, v0, :cond_9
-
-    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    :cond_9
-    return-void
-.end method
-
-.method public b(Ljava/lang/Object;)[Lr0/q/c$b;
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/lang/Object;",
-            ")[",
-            "Lr0/q/c$b<",
-            "TT;>;"
-        }
-    .end annotation
-
-    iput-object p1, p0, Lr0/q/c;->latest:Ljava/lang/Object;
-
-    const/4 p1, 0x0
-
-    iput-boolean p1, p0, Lr0/q/c;->active:Z
-
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lr0/q/c$a;
-
-    iget-boolean p1, p1, Lr0/q/c$a;->a:Z
-
-    if-eqz p1, :cond_0
-
-    sget-object p1, Lr0/q/c$a;->c:[Lr0/q/c$b;
-
-    return-object p1
-
-    :cond_0
-    sget-object p1, Lr0/q/c$a;->d:Lr0/q/c$a;
-
-    invoke-virtual {p0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lr0/q/c$a;
-
-    iget-object p1, p1, Lr0/q/c$a;->b:[Lr0/q/c$b;
-
-    return-object p1
-.end method
-
-.method public call(Ljava/lang/Object;)V
-    .locals 6
-
-    check-cast p1, Lrx/Subscriber;
-
-    new-instance v0, Lr0/q/c$b;
-
-    invoke-direct {v0, p1}, Lr0/q/c$b;-><init>(Lrx/Subscriber;)V
-
-    new-instance v1, Lr0/q/b;
-
-    invoke-direct {v1, p0, v0}, Lr0/q/b;-><init>(Lr0/q/c;Lr0/q/c$b;)V
-
-    new-instance v2, Lr0/r/a;
-
-    invoke-direct {v2, v1}, Lr0/r/a;-><init>(Lrx/functions/Action0;)V
-
-    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
-
-    iget-object v1, p0, Lr0/q/c;->onStart:Lrx/functions/Action1;
-
-    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    :cond_0
-    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lr0/q/c$a;
-
-    iget-boolean v2, v1, Lr0/q/c$a;->a:Z
-
-    const/4 v3, 0x0
-
-    if-eqz v2, :cond_1
-
-    iget-object v1, p0, Lr0/q/c;->onTerminated:Lrx/functions/Action1;
-
-    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_1
-    iget-object v2, v1, Lr0/q/c$a;->b:[Lr0/q/c$b;
-
-    array-length v4, v2
-
-    add-int/lit8 v5, v4, 0x1
-
-    new-array v5, v5, [Lr0/q/c$b;
-
-    invoke-static {v2, v3, v5, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
-
-    aput-object v0, v5, v4
-
-    new-instance v2, Lr0/q/c$a;
-
-    iget-boolean v3, v1, Lr0/q/c$a;->a:Z
-
-    invoke-direct {v2, v3, v5}, Lr0/q/c$a;-><init>(Z[Lr0/q/c$b;)V
-
-    invoke-virtual {p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    iget-object v1, p0, Lr0/q/c;->onAdded:Lrx/functions/Action1;
-
-    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
-
-    const/4 v3, 0x1
-
-    :goto_0
-    if-eqz v3, :cond_2
-
-    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    invoke-virtual {p0, v0}, Lr0/q/c;->a(Lr0/q/c$b;)V
-
-    :cond_2
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/r$a.smali b/com.discord/smali_classes2/r0/r$a.smali
new file mode 100644
index 0000000000..899b1f0b52
--- /dev/null
+++ b/com.discord/smali_classes2/r0/r$a.smali
@@ -0,0 +1,107 @@
+.class public final Lr0/r$a;
+.super Ljava/lang/Object;
+.source "Utils.java"
+
+# interfaces
+.implements Ljava/lang/reflect/GenericArrayType;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/r;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/reflect/Type;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Type;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/r$a;->d:Ljava/lang/reflect/Type;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    instance-of v0, p1, Ljava/lang/reflect/GenericArrayType;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/lang/reflect/GenericArrayType;
+
+    invoke-static {p0, p1}, Lr0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 p1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    return p1
+.end method
+
+.method public getGenericComponentType()Ljava/lang/reflect/Type;
+    .locals 1
+
+    iget-object v0, p0, Lr0/r$a;->d:Ljava/lang/reflect/Type;
+
+    return-object v0
+.end method
+
+.method public hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lr0/r$a;->d:Ljava/lang/reflect/Type;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v1, p0, Lr0/r$a;->d:Ljava/lang/reflect/Type;
+
+    invoke-static {v1}, Lr0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)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_classes2/q0/r$b.smali b/com.discord/smali_classes2/r0/r$b.smali
similarity index 76%
rename from com.discord/smali_classes2/q0/r$b.smali
rename to com.discord/smali_classes2/r0/r$b.smali
index e35434dc55..6992165a27 100644
--- a/com.discord/smali_classes2/q0/r$b.smali
+++ b/com.discord/smali_classes2/r0/r$b.smali
@@ -1,4 +1,4 @@
-.class public final Lq0/r$b;
+.class public final Lr0/r$b;
 .super Ljava/lang/Object;
 .source "Utils.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/r;
+    value = Lr0/r;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -87,18 +87,18 @@
 
     const-string v3, "typeArgument == null"
 
-    invoke-static {v2, v3}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {v2, v3}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-static {v2}, Lq0/r;->c(Ljava/lang/reflect/Type;)V
+    invoke-static {v2}, Lr0/r;->c(Ljava/lang/reflect/Type;)V
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_3
 
     :cond_4
-    iput-object p1, p0, Lq0/r$b;->d:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lr0/r$b;->d:Ljava/lang/reflect/Type;
 
-    iput-object p2, p0, Lq0/r$b;->e:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lr0/r$b;->e:Ljava/lang/reflect/Type;
 
     invoke-virtual {p3}, [Ljava/lang/reflect/Type;->clone()Ljava/lang/Object;
 
@@ -106,7 +106,7 @@
 
     check-cast p1, [Ljava/lang/reflect/Type;
 
-    iput-object p1, p0, Lq0/r$b;->f:[Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lr0/r$b;->f:[Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -122,7 +122,7 @@
 
     check-cast p1, Ljava/lang/reflect/ParameterizedType;
 
-    invoke-static {p0, p1}, Lq0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
+    invoke-static {p0, p1}, Lr0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
 
     move-result p1
 
@@ -142,7 +142,7 @@
 .method public getActualTypeArguments()[Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lq0/r$b;->f:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->f:[Ljava/lang/reflect/Type;
 
     invoke-virtual {v0}, [Ljava/lang/reflect/Type;->clone()Ljava/lang/Object;
 
@@ -156,7 +156,7 @@
 .method public getOwnerType()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lq0/r$b;->d:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->d:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -164,7 +164,7 @@
 .method public getRawType()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lq0/r$b;->e:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->e:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -172,13 +172,13 @@
 .method public hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lq0/r$b;->f:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->f:[Ljava/lang/reflect/Type;
 
     invoke-static {v0}, Ljava/util/Arrays;->hashCode([Ljava/lang/Object;)I
 
     move-result v0
 
-    iget-object v1, p0, Lq0/r$b;->e:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lr0/r$b;->e:Ljava/lang/reflect/Type;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -186,7 +186,7 @@
 
     xor-int/2addr v0, v1
 
-    iget-object v1, p0, Lq0/r$b;->d:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lr0/r$b;->d:Ljava/lang/reflect/Type;
 
     if-eqz v1, :cond_0
 
@@ -208,15 +208,15 @@
 .method public toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lq0/r$b;->f:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->f:[Ljava/lang/reflect/Type;
 
     array-length v1, v0
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lq0/r$b;->e:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->e:Ljava/lang/reflect/Type;
 
-    invoke-static {v0}, Lq0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v0}, Lr0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -235,9 +235,9 @@
 
     invoke-direct {v1, v0}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    iget-object v0, p0, Lq0/r$b;->e:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->e:Ljava/lang/reflect/Type;
 
-    invoke-static {v0}, Lq0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v0}, Lr0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -247,20 +247,20 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lq0/r$b;->f:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->f:[Ljava/lang/reflect/Type;
 
     const/4 v3, 0x0
 
     aget-object v0, v0, v3
 
-    invoke-static {v0}, Lq0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v0}, Lr0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v0
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :goto_0
-    iget-object v0, p0, Lq0/r$b;->f:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->f:[Ljava/lang/reflect/Type;
 
     array-length v0, v0
 
@@ -270,11 +270,11 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v0, p0, Lq0/r$b;->f:[Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$b;->f:[Ljava/lang/reflect/Type;
 
     aget-object v0, v0, v2
 
-    invoke-static {v0}, Lq0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v0}, Lr0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/q0/r$c.smali b/com.discord/smali_classes2/r0/r$c.smali
similarity index 78%
rename from com.discord/smali_classes2/q0/r$c.smali
rename to com.discord/smali_classes2/r0/r$c.smali
index d5b985f0b8..21c072e8cb 100644
--- a/com.discord/smali_classes2/q0/r$c.smali
+++ b/com.discord/smali_classes2/r0/r$c.smali
@@ -1,4 +1,4 @@
-.class public final Lq0/r$c;
+.class public final Lr0/r$c;
 .super Ljava/lang/Object;
 .source "Utils.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lq0/r;
+    value = Lr0/r;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -55,7 +55,7 @@
 
     aget-object v1, p2, v4
 
-    invoke-static {v1}, Lq0/r;->c(Ljava/lang/reflect/Type;)V
+    invoke-static {v1}, Lr0/r;->c(Ljava/lang/reflect/Type;)V
 
     aget-object p1, p1, v4
 
@@ -63,9 +63,9 @@
 
     aget-object p1, p2, v4
 
-    iput-object p1, p0, Lq0/r$c;->e:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lr0/r$c;->e:Ljava/lang/reflect/Type;
 
-    iput-object v0, p0, Lq0/r$c;->d:Ljava/lang/reflect/Type;
+    iput-object v0, p0, Lr0/r$c;->d:Ljava/lang/reflect/Type;
 
     goto :goto_0
 
@@ -86,13 +86,13 @@
 
     aget-object p2, p1, v4
 
-    invoke-static {p2}, Lq0/r;->c(Ljava/lang/reflect/Type;)V
+    invoke-static {p2}, Lr0/r;->c(Ljava/lang/reflect/Type;)V
 
-    iput-object v3, p0, Lq0/r$c;->e:Ljava/lang/reflect/Type;
+    iput-object v3, p0, Lr0/r$c;->e:Ljava/lang/reflect/Type;
 
     aget-object p1, p1, v4
 
-    iput-object p1, p0, Lq0/r$c;->d:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lr0/r$c;->d:Ljava/lang/reflect/Type;
 
     :goto_0
     return-void
@@ -126,7 +126,7 @@
 
     check-cast p1, Ljava/lang/reflect/WildcardType;
 
-    invoke-static {p0, p1}, Lq0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
+    invoke-static {p0, p1}, Lr0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
 
     move-result p1
 
@@ -146,7 +146,7 @@
 .method public getLowerBounds()[Ljava/lang/reflect/Type;
     .locals 3
 
-    iget-object v0, p0, Lq0/r$c;->e:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$c;->e:Ljava/lang/reflect/Type;
 
     if-eqz v0, :cond_0
 
@@ -161,7 +161,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lq0/r;->a:[Ljava/lang/reflect/Type;
+    sget-object v1, Lr0/r;->a:[Ljava/lang/reflect/Type;
 
     :goto_0
     return-object v1
@@ -174,7 +174,7 @@
 
     new-array v0, v0, [Ljava/lang/reflect/Type;
 
-    iget-object v1, p0, Lq0/r$c;->d:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lr0/r$c;->d:Ljava/lang/reflect/Type;
 
     const/4 v2, 0x0
 
@@ -186,7 +186,7 @@
 .method public hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lq0/r$c;->e:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$c;->e:Ljava/lang/reflect/Type;
 
     if-eqz v0, :cond_0
 
@@ -202,7 +202,7 @@
     const/4 v0, 0x1
 
     :goto_0
-    iget-object v1, p0, Lq0/r$c;->d:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lr0/r$c;->d:Ljava/lang/reflect/Type;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -218,7 +218,7 @@
 .method public toString()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lq0/r$c;->e:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$c;->e:Ljava/lang/reflect/Type;
 
     if-eqz v0, :cond_0
 
@@ -228,9 +228,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lq0/r$c;->e:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lr0/r$c;->e:Ljava/lang/reflect/Type;
 
-    invoke-static {v1}, Lq0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v1}, Lr0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v1
 
@@ -243,7 +243,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lq0/r$c;->d:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lr0/r$c;->d:Ljava/lang/reflect/Type;
 
     const-class v1, Ljava/lang/Object;
 
@@ -260,9 +260,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lq0/r$c;->d:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lr0/r$c;->d:Ljava/lang/reflect/Type;
 
-    invoke-static {v1}, Lq0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    invoke-static {v1}, Lr0/r;->l(Ljava/lang/reflect/Type;)Ljava/lang/String;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/r0/r.smali b/com.discord/smali_classes2/r0/r.smali
new file mode 100644
index 0000000000..c7a259a027
--- /dev/null
+++ b/com.discord/smali_classes2/r0/r.smali
@@ -0,0 +1,1240 @@
+.class public final Lr0/r;
+.super Ljava/lang/Object;
+.source "Utils.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/r$c;,
+        Lr0/r$a;,
+        Lr0/r$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:[Ljava/lang/reflect/Type;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/reflect/Type;
+
+    sput-object v0, Lr0/r;->a:[Ljava/lang/reflect/Type;
+
+    return-void
+.end method
+
+.method public static a(Lokhttp3/ResponseBody;)Lokhttp3/ResponseBody;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lp0/e;
+
+    invoke-direct {v0}, Lp0/e;-><init>()V
+
+    invoke-virtual {p0}, Lokhttp3/ResponseBody;->c()Lp0/g;
+
+    move-result-object v1
+
+    invoke-interface {v1, v0}, Lp0/g;->F0(Lp0/u;)J
+
+    invoke-virtual {p0}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
+
+    move-result-object v1
+
+    invoke-virtual {p0}, Lokhttp3/ResponseBody;->a()J
+
+    move-result-wide v2
+
+    const-string p0, "content"
+
+    invoke-static {v0, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p0, "$this$asResponseBody"
+
+    invoke-static {v0, p0}, Lk0/o/c/i;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p0, Lo0/d0;
+
+    invoke-direct {p0, v0, v1, v2, v3}, Lo0/d0;-><init>(Lp0/g;Lokhttp3/MediaType;J)V
+
+    return-object p0
+.end method
+
+.method public static b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(TT;",
+            "Ljava/lang/String;",
+            ")TT;"
+        }
+    .end annotation
+
+    if-eqz p0, :cond_0
+
+    return-object p0
+
+    :cond_0
+    new-instance p0, Ljava/lang/NullPointerException;
+
+    invoke-direct {p0, p1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static c(Ljava/lang/reflect/Type;)V
+    .locals 1
+
+    instance-of v0, p0, Ljava/lang/Class;
+
+    if-eqz v0, :cond_1
+
+    check-cast p0, Ljava/lang/Class;
+
+    invoke-virtual {p0}, Ljava/lang/Class;->isPrimitive()Z
+
+    move-result p0
+
+    if-nez p0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p0
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public static d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p0, p1, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p0, Ljava/lang/Class;
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {p0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_1
+    instance-of v1, p0, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_6
+
+    instance-of v1, p1, Ljava/lang/reflect/ParameterizedType;
+
+    if-nez v1, :cond_2
+
+    return v2
+
+    :cond_2
+    check-cast p0, Ljava/lang/reflect/ParameterizedType;
+
+    check-cast p1, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getOwnerType()Ljava/lang/reflect/Type;
+
+    move-result-object v1
+
+    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getOwnerType()Ljava/lang/reflect/Type;
+
+    move-result-object v3
+
+    if-eq v1, v3, :cond_4
+
+    if-eqz v1, :cond_3
+
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v1, 0x0
+
+    goto :goto_1
+
+    :cond_4
+    :goto_0
+    const/4 v1, 0x1
+
+    :goto_1
+    if-eqz v1, :cond_5
+
+    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
+
+    move-result-object v1
+
+    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_5
+
+    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    const/4 v0, 0x0
+
+    :goto_2
+    return v0
+
+    :cond_6
+    instance-of v1, p0, Ljava/lang/reflect/GenericArrayType;
+
+    if-eqz v1, :cond_8
+
+    instance-of v0, p1, Ljava/lang/reflect/GenericArrayType;
+
+    if-nez v0, :cond_7
+
+    return v2
+
+    :cond_7
+    check-cast p0, Ljava/lang/reflect/GenericArrayType;
+
+    check-cast p1, Ljava/lang/reflect/GenericArrayType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    invoke-interface {p1}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Lr0/r;->d(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_8
+    instance-of v1, p0, Ljava/lang/reflect/WildcardType;
+
+    if-eqz v1, :cond_b
+
+    instance-of v1, p1, Ljava/lang/reflect/WildcardType;
+
+    if-nez v1, :cond_9
+
+    return v2
+
+    :cond_9
+    check-cast p0, Ljava/lang/reflect/WildcardType;
+
+    check-cast p1, Ljava/lang/reflect/WildcardType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object v1
+
+    invoke-interface {p1}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object v3
+
+    invoke-static {v1, v3}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_a
+
+    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getLowerBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    invoke-interface {p1}, Ljava/lang/reflect/WildcardType;->getLowerBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    invoke-static {p0, p1}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_a
+
+    goto :goto_3
+
+    :cond_a
+    const/4 v0, 0x0
+
+    :goto_3
+    return v0
+
+    :cond_b
+    instance-of v1, p0, Ljava/lang/reflect/TypeVariable;
+
+    if-eqz v1, :cond_e
+
+    instance-of v1, p1, Ljava/lang/reflect/TypeVariable;
+
+    if-nez v1, :cond_c
+
+    return v2
+
+    :cond_c
+    check-cast p0, Ljava/lang/reflect/TypeVariable;
+
+    check-cast p1, Ljava/lang/reflect/TypeVariable;
+
+    invoke-interface {p0}, Ljava/lang/reflect/TypeVariable;->getGenericDeclaration()Ljava/lang/reflect/GenericDeclaration;
+
+    move-result-object v1
+
+    invoke-interface {p1}, Ljava/lang/reflect/TypeVariable;->getGenericDeclaration()Ljava/lang/reflect/GenericDeclaration;
+
+    move-result-object v3
+
+    if-ne v1, v3, :cond_d
+
+    invoke-interface {p0}, Ljava/lang/reflect/TypeVariable;->getName()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-interface {p1}, Ljava/lang/reflect/TypeVariable;->getName()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_d
+
+    goto :goto_4
+
+    :cond_d
+    const/4 v0, 0x0
+
+    :goto_4
+    return v0
+
+    :cond_e
+    return v2
+.end method
+
+.method public static e(Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+    .locals 1
+
+    instance-of v0, p0, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x0
+
+    check-cast p0, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-static {v0, p0}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Call return type must be parameterized as Call<Foo> or Call<? extends Foo>"
+
+    invoke-direct {p0, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Type;"
+        }
+    .end annotation
+
+    if-ne p2, p1, :cond_0
+
+    return-object p0
+
+    :cond_0
+    invoke-virtual {p2}, Ljava/lang/Class;->isInterface()Z
+
+    move-result p0
+
+    if-eqz p0, :cond_3
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getInterfaces()[Ljava/lang/Class;
+
+    move-result-object p0
+
+    const/4 v0, 0x0
+
+    array-length v1, p0
+
+    :goto_0
+    if-ge v0, v1, :cond_3
+
+    aget-object v2, p0, v0
+
+    if-ne v2, p2, :cond_1
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getGenericInterfaces()[Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    aget-object p0, p0, v0
+
+    return-object p0
+
+    :cond_1
+    aget-object v2, p0, v0
+
+    invoke-virtual {p2, v2}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getGenericInterfaces()[Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    aget-object p1, p1, v0
+
+    aget-object p0, p0, v0
+
+    invoke-static {p1, p0, p2}, Lr0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    invoke-virtual {p1}, Ljava/lang/Class;->isInterface()Z
+
+    move-result p0
+
+    if-nez p0, :cond_6
+
+    :goto_1
+    const-class p0, Ljava/lang/Object;
+
+    if-eq p1, p0, :cond_6
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    if-ne p0, p2, :cond_4
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getGenericSuperclass()Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_4
+    invoke-virtual {p2, p0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getGenericSuperclass()Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    invoke-static {p1, p0, p2}, Lr0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_5
+    move-object p1, p0
+
+    goto :goto_1
+
+    :cond_6
+    return-object p2
+.end method
+
+.method public static g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+    .locals 4
+
+    invoke-interface {p1}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    if-ltz p0, :cond_1
+
+    array-length v1, v0
+
+    if-ge p0, v1, :cond_1
+
+    aget-object p0, v0, p0
+
+    instance-of p1, p0, Ljava/lang/reflect/WildcardType;
+
+    if-eqz p1, :cond_0
+
+    check-cast p0, Ljava/lang/reflect/WildcardType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    const/4 p1, 0x0
+
+    aget-object p0, p0, p1
+
+    :cond_0
+    return-object p0
+
+    :cond_1
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    const-string v2, "Index "
+
+    const-string v3, " not in range [0,"
+
+    invoke-static {v2, p0, v3}, Lf/e/b/a/a;->E(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object p0
+
+    array-length v0, v0
+
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v0, ") for "
+
+    invoke-virtual {p0, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public static h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            ")",
+            "Ljava/lang/Class<",
+            "*>;"
+        }
+    .end annotation
+
+    const-string v0, "type == null"
+
+    invoke-static {p0, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+
+    instance-of v0, p0, Ljava/lang/Class;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/lang/Class;
+
+    return-object p0
+
+    :cond_0
+    instance-of v0, p0, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v0, :cond_2
+
+    check-cast p0, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    instance-of v0, p0, Ljava/lang/Class;
+
+    if-eqz v0, :cond_1
+
+    check-cast p0, Ljava/lang/Class;
+
+    return-object p0
+
+    :cond_1
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p0
+
+    :cond_2
+    instance-of v0, p0, Ljava/lang/reflect/GenericArrayType;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_3
+
+    check-cast p0, Ljava/lang/reflect/GenericArrayType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-static {p0, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;I)Ljava/lang/Object;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_3
+    instance-of v0, p0, Ljava/lang/reflect/TypeVariable;
+
+    if-eqz v0, :cond_4
+
+    const-class p0, Ljava/lang/Object;
+
+    return-object p0
+
+    :cond_4
+    instance-of v0, p0, Ljava/lang/reflect/WildcardType;
+
+    if-eqz v0, :cond_5
+
+    check-cast p0, Ljava/lang/reflect/WildcardType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    aget-object p0, p0, v1
+
+    invoke-static {p0}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_5
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Expected a Class, ParameterizedType, or GenericArrayType, but <"
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v2, "> is of type "
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public static i(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/Class<",
+            "*>;)",
+            "Ljava/lang/reflect/Type;"
+        }
+    .end annotation
+
+    invoke-virtual {p2, p1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0, p1, p2}, Lr0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+
+    move-result-object p2
+
+    invoke-static {p0, p1, p2}, Lr0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    invoke-direct {p0}, Ljava/lang/IllegalArgumentException;-><init>()V
+
+    throw p0
+.end method
+
+.method public static j(Ljava/lang/reflect/Type;)Z
+    .locals 5
+
+    instance-of v0, p0, Ljava/lang/Class;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    instance-of v0, p0, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_3
+
+    check-cast p0, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    array-length v0, p0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v0, :cond_2
+
+    aget-object v4, p0, v3
+
+    invoke-static {v4}, Lr0/r;->j(Ljava/lang/reflect/Type;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    return v2
+
+    :cond_1
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    return v1
+
+    :cond_3
+    instance-of v0, p0, Ljava/lang/reflect/GenericArrayType;
+
+    if-eqz v0, :cond_4
+
+    check-cast p0, Ljava/lang/reflect/GenericArrayType;
+
+    invoke-interface {p0}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    invoke-static {p0}, Lr0/r;->j(Ljava/lang/reflect/Type;)Z
+
+    move-result p0
+
+    return p0
+
+    :cond_4
+    instance-of v0, p0, Ljava/lang/reflect/TypeVariable;
+
+    if-eqz v0, :cond_5
+
+    return v2
+
+    :cond_5
+    instance-of v0, p0, Ljava/lang/reflect/WildcardType;
+
+    if-eqz v0, :cond_6
+
+    return v2
+
+    :cond_6
+    if-nez p0, :cond_7
+
+    const-string v0, "null"
+
+    goto :goto_1
+
+    :cond_7
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_1
+    new-instance v1, Ljava/lang/IllegalArgumentException;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v3, "Expected a Class, ParameterizedType, or GenericArrayType, but <"
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string p0, "> is of type "
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-direct {v1, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v1
+.end method
+
+.method public static k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/reflect/Type;",
+            ")",
+            "Ljava/lang/reflect/Type;"
+        }
+    .end annotation
+
+    :goto_0
+    instance-of v0, p2, Ljava/lang/reflect/TypeVariable;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_6
+
+    check-cast p2, Ljava/lang/reflect/TypeVariable;
+
+    invoke-interface {p2}, Ljava/lang/reflect/TypeVariable;->getGenericDeclaration()Ljava/lang/reflect/GenericDeclaration;
+
+    move-result-object v0
+
+    instance-of v2, v0, Ljava/lang/Class;
+
+    if-eqz v2, :cond_0
+
+    check-cast v0, Ljava/lang/Class;
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_1
+    if-nez v0, :cond_1
+
+    goto :goto_3
+
+    :cond_1
+    invoke-static {p0, p1, v0}, Lr0/r;->f(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/reflect/Type;
+
+    move-result-object v2
+
+    instance-of v3, v2, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz v3, :cond_4
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getTypeParameters()[Ljava/lang/reflect/TypeVariable;
+
+    move-result-object v0
+
+    :goto_2
+    array-length v3, v0
+
+    if-ge v1, v3, :cond_3
+
+    aget-object v3, v0, v1
+
+    invoke-virtual {p2, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    check-cast v2, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-interface {v2}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    aget-object v0, v0, v1
+
+    goto :goto_4
+
+    :cond_2
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    new-instance p0, Ljava/util/NoSuchElementException;
+
+    invoke-direct {p0}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw p0
+
+    :cond_4
+    :goto_3
+    move-object v0, p2
+
+    :goto_4
+    if-ne v0, p2, :cond_5
+
+    return-object v0
+
+    :cond_5
+    move-object p2, v0
+
+    goto :goto_0
+
+    :cond_6
+    instance-of v0, p2, Ljava/lang/Class;
+
+    if-eqz v0, :cond_8
+
+    move-object v0, p2
+
+    check-cast v0, Ljava/lang/Class;
+
+    invoke-virtual {v0}, Ljava/lang/Class;->isArray()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_8
+
+    invoke-virtual {v0}, Ljava/lang/Class;->getComponentType()Ljava/lang/Class;
+
+    move-result-object p2
+
+    invoke-static {p0, p1, p2}, Lr0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    if-ne p2, p0, :cond_7
+
+    goto :goto_5
+
+    :cond_7
+    new-instance v0, Lr0/r$a;
+
+    invoke-direct {v0, p0}, Lr0/r$a;-><init>(Ljava/lang/reflect/Type;)V
+
+    :goto_5
+    return-object v0
+
+    :cond_8
+    instance-of v0, p2, Ljava/lang/reflect/GenericArrayType;
+
+    if-eqz v0, :cond_a
+
+    check-cast p2, Ljava/lang/reflect/GenericArrayType;
+
+    invoke-interface {p2}, Ljava/lang/reflect/GenericArrayType;->getGenericComponentType()Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    invoke-static {p0, p1, v0}, Lr0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    if-ne v0, p0, :cond_9
+
+    goto :goto_6
+
+    :cond_9
+    new-instance p2, Lr0/r$a;
+
+    invoke-direct {p2, p0}, Lr0/r$a;-><init>(Ljava/lang/reflect/Type;)V
+
+    :goto_6
+    return-object p2
+
+    :cond_a
+    instance-of v0, p2, Ljava/lang/reflect/ParameterizedType;
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_10
+
+    check-cast p2, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-interface {p2}, Ljava/lang/reflect/ParameterizedType;->getOwnerType()Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    invoke-static {p0, p1, v0}, Lr0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object v3
+
+    if-eq v3, v0, :cond_b
+
+    const/4 v0, 0x1
+
+    goto :goto_7
+
+    :cond_b
+    const/4 v0, 0x0
+
+    :goto_7
+    invoke-interface {p2}, Ljava/lang/reflect/ParameterizedType;->getActualTypeArguments()[Ljava/lang/reflect/Type;
+
+    move-result-object v4
+
+    array-length v5, v4
+
+    :goto_8
+    if-ge v1, v5, :cond_e
+
+    aget-object v6, v4, v1
+
+    invoke-static {p0, p1, v6}, Lr0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object v6
+
+    aget-object v7, v4, v1
+
+    if-eq v6, v7, :cond_d
+
+    if-nez v0, :cond_c
+
+    invoke-virtual {v4}, [Ljava/lang/reflect/Type;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v4, v0
+
+    check-cast v4, [Ljava/lang/reflect/Type;
+
+    const/4 v0, 0x1
+
+    :cond_c
+    aput-object v6, v4, v1
+
+    :cond_d
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_8
+
+    :cond_e
+    if-eqz v0, :cond_f
+
+    new-instance p0, Lr0/r$b;
+
+    invoke-interface {p2}, Ljava/lang/reflect/ParameterizedType;->getRawType()Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    invoke-direct {p0, v3, p1, v4}, Lr0/r$b;-><init>(Ljava/lang/reflect/Type;Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
+
+    move-object p2, p0
+
+    :cond_f
+    return-object p2
+
+    :cond_10
+    instance-of v0, p2, Ljava/lang/reflect/WildcardType;
+
+    if-eqz v0, :cond_12
+
+    check-cast p2, Ljava/lang/reflect/WildcardType;
+
+    invoke-interface {p2}, Ljava/lang/reflect/WildcardType;->getLowerBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object v0
+
+    invoke-interface {p2}, Ljava/lang/reflect/WildcardType;->getUpperBounds()[Ljava/lang/reflect/Type;
+
+    move-result-object v3
+
+    array-length v4, v0
+
+    if-ne v4, v2, :cond_11
+
+    aget-object v3, v0, v1
+
+    invoke-static {p0, p1, v3}, Lr0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+
+    aget-object p1, v0, v1
+
+    if-eq p0, p1, :cond_12
+
+    new-instance p1, Lr0/r$c;
+
+    new-array p2, v2, [Ljava/lang/reflect/Type;
+
+    const-class v0, Ljava/lang/Object;
+
+    aput-object v0, p2, v1
+
+    new-array v0, v2, [Ljava/lang/reflect/Type;
+
+    aput-object p0, v0, v1
+
+    invoke-direct {p1, p2, v0}, Lr0/r$c;-><init>([Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
+
+    return-object p1
+
+    :cond_11
+    array-length v0, v3
+
+    if-ne v0, v2, :cond_12
+
+    aget-object v0, v3, v1
+
+    :try_start_0
+    invoke-static {p0, p1, v0}, Lr0/r;->k(Ljava/lang/reflect/Type;Ljava/lang/Class;Ljava/lang/reflect/Type;)Ljava/lang/reflect/Type;
+
+    move-result-object p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    aget-object p1, v3, v1
+
+    if-eq p0, p1, :cond_12
+
+    new-instance p1, Lr0/r$c;
+
+    new-array p2, v2, [Ljava/lang/reflect/Type;
+
+    aput-object p0, p2, v1
+
+    sget-object p0, Lr0/r;->a:[Ljava/lang/reflect/Type;
+
+    invoke-direct {p1, p2, p0}, Lr0/r$c;-><init>([Ljava/lang/reflect/Type;[Ljava/lang/reflect/Type;)V
+
+    return-object p1
+
+    :catchall_0
+    move-exception p0
+
+    throw p0
+
+    :cond_12
+    return-object p2
+.end method
+
+.method public static l(Ljava/lang/reflect/Type;)Ljava/lang/String;
+    .locals 1
+
+    instance-of v0, p0, Ljava/lang/Class;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/lang/Class;
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    :goto_0
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/r0/r/a$a.smali b/com.discord/smali_classes2/r0/r/a$a.smali
deleted file mode 100644
index 58317fa9dc..0000000000
--- a/com.discord/smali_classes2/r0/r/a$a.smali
+++ /dev/null
@@ -1,35 +0,0 @@
-.class public final Lr0/r/a$a;
-.super Ljava/lang/Object;
-.source "BooleanSubscription.java"
-
-# interfaces
-.implements Lrx/functions/Action0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/r/a;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = null
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public call()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/r/a.smali b/com.discord/smali_classes2/r0/r/a.smali
deleted file mode 100644
index e236cb9209..0000000000
--- a/com.discord/smali_classes2/r0/r/a.smali
+++ /dev/null
@@ -1,125 +0,0 @@
-.class public final Lr0/r/a;
-.super Ljava/lang/Object;
-.source "BooleanSubscription.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# static fields
-.field public static final e:Lrx/functions/Action0;
-
-
-# instance fields
-.field public final d:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lrx/functions/Action0;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/r/a$a;
-
-    invoke-direct {v0}, Lr0/r/a$a;-><init>()V
-
-    sput-object v0, Lr0/r/a;->e:Lrx/functions/Action0;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
-
-    iput-object v0, p0, Lr0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lrx/functions/Action0;)V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
-
-    iput-object v0, p0, Lr0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 2
-
-    iget-object v0, p0, Lr0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    sget-object v1, Lr0/r/a;->e:Lrx/functions/Action0;
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 2
-
-    iget-object v0, p0, Lr0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/functions/Action0;
-
-    sget-object v1, Lr0/r/a;->e:Lrx/functions/Action0;
-
-    if-eq v0, v1, :cond_0
-
-    iget-object v0, p0, Lr0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
-
-    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/functions/Action0;
-
-    if-eqz v0, :cond_0
-
-    sget-object v1, Lr0/r/a;->e:Lrx/functions/Action0;
-
-    if-eq v0, v1, :cond_0
-
-    invoke-interface {v0}, Lrx/functions/Action0;->call()V
-
-    :cond_0
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/r/b.smali b/com.discord/smali_classes2/r0/r/b.smali
deleted file mode 100644
index 4a01f4f9cb..0000000000
--- a/com.discord/smali_classes2/r0/r/b.smali
+++ /dev/null
@@ -1,60 +0,0 @@
-.class public final Lr0/r/b;
-.super Ljava/lang/Object;
-.source "MultipleAssignmentSubscription.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# instance fields
-.field public final d:Lr0/l/d/a;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    new-instance v0, Lr0/l/d/a;
-
-    invoke-direct {v0}, Lr0/l/d/a;-><init>()V
-
-    iput-object v0, p0, Lr0/r/b;->d:Lr0/l/d/a;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public a(Lrx/Subscription;)V
-    .locals 1
-
-    iget-object v0, p0, Lr0/r/b;->d:Lr0/l/d/a;
-
-    invoke-virtual {v0, p1}, Lr0/l/d/a;->b(Lrx/Subscription;)Z
-
-    return-void
-.end method
-
-.method public isUnsubscribed()Z
-    .locals 1
-
-    iget-object v0, p0, Lr0/r/b;->d:Lr0/l/d/a;
-
-    invoke-virtual {v0}, Lr0/l/d/a;->isUnsubscribed()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 1
-
-    iget-object v0, p0, Lr0/r/b;->d:Lr0/l/d/a;
-
-    invoke-virtual {v0}, Lr0/l/d/a;->unsubscribe()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/r/c$a.smali b/com.discord/smali_classes2/r0/r/c$a.smali
deleted file mode 100644
index 22d73d18b2..0000000000
--- a/com.discord/smali_classes2/r0/r/c$a.smali
+++ /dev/null
@@ -1,43 +0,0 @@
-.class public final Lr0/r/c$a;
-.super Ljava/lang/Object;
-.source "Subscriptions.java"
-
-# interfaces
-.implements Lrx/Subscription;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/r/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "a"
-.end annotation
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public isUnsubscribed()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method public unsubscribe()V
-    .locals 0
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/r/c.smali b/com.discord/smali_classes2/r0/r/c.smali
deleted file mode 100644
index cc31fa0202..0000000000
--- a/com.discord/smali_classes2/r0/r/c.smali
+++ /dev/null
@@ -1,29 +0,0 @@
-.class public final Lr0/r/c;
-.super Ljava/lang/Object;
-.source "Subscriptions.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lr0/r/c$a;
-    }
-.end annotation
-
-
-# static fields
-.field public static final a:Lr0/r/c$a;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lr0/r/c$a;
-
-    invoke-direct {v0}, Lr0/r/c$a;-><init>()V
-
-    sput-object v0, Lr0/r/c;->a:Lr0/r/c$a;
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/r0/s/a/a$a.smali b/com.discord/smali_classes2/r0/s/a/a$a.smali
new file mode 100644
index 0000000000..2c27032b03
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/a$a.smali
@@ -0,0 +1,207 @@
+.class public Lr0/s/a/a$a;
+.super Lrx/Subscriber;
+.source "BodyOnSubscribe.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/s/a/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "Lr0/n<",
+        "TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    iput-object p1, p0, Lr0/s/a/a$a;->d:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Lr0/s/a/a$a;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lr0/s/a/a$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 2
+
+    iget-boolean v0, p0, Lr0/s/a/a$a;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lr0/s/a/a$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/lang/AssertionError;
+
+    const-string v1, "This should never happen! Report as a Retrofit bug with the full stacktrace."
+
+    invoke-direct {v0, v1}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/Throwable;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    :goto_0
+    return-void
+
+    :cond_1
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 6
+
+    check-cast p1, Lr0/n;
+
+    iget-object v0, p1, Lr0/n;->a:Lokhttp3/Response;
+
+    invoke-virtual {v0}, Lokhttp3/Response;->b()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lr0/s/a/a$a;->d:Lrx/Subscriber;
+
+    iget-object p1, p1, Lr0/n;->b:Ljava/lang/Object;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lr0/s/a/a$a;->e:Z
+
+    new-instance v1, Lretrofit2/adapter/rxjava/HttpException;
+
+    invoke-direct {v1, p1}, Lretrofit2/adapter/rxjava/HttpException;-><init>(Lr0/n;)V
+
+    const/4 p1, 0x0
+
+    :try_start_0
+    iget-object v2, p0, Lr0/s/a/a$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v2, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v2
+
+    invoke-static {v2}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    new-instance v3, Lrx/exceptions/CompositeException;
+
+    const/4 v4, 0x2
+
+    new-array v4, v4, [Ljava/lang/Throwable;
+
+    const/4 v5, 0x0
+
+    aput-object v1, v4, v5
+
+    aput-object v2, v4, v0
+
+    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    throw p1
+
+    :catch_0
+    nop
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    :goto_0
+    return-void
+
+    :cond_2
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/a.smali b/com.discord/smali_classes2/r0/s/a/a.smali
new file mode 100644
index 0000000000..9039729c81
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/a.smali
@@ -0,0 +1,75 @@
+.class public final Lr0/s/a/a;
+.super Ljava/lang/Object;
+.source "BodyOnSubscribe.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/s/a/a$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable$a<",
+            "Lr0/n<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable$a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable$a<",
+            "Lr0/n<",
+            "TT;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/s/a/a;->d:Lrx/Observable$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Lr0/s/a/a;->d:Lrx/Observable$a;
+
+    new-instance v1, Lr0/s/a/a$a;
+
+    invoke-direct {v1, p1}, Lr0/s/a/a$a;-><init>(Lrx/Subscriber;)V
+
+    invoke-interface {v0, v1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/b.smali b/com.discord/smali_classes2/r0/s/a/b.smali
new file mode 100644
index 0000000000..3ee2b0762f
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/b.smali
@@ -0,0 +1,489 @@
+.class public final Lr0/s/a/b;
+.super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "CallArbiter.java"
+
+# interfaces
+.implements Lrx/Subscription;
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicInteger;",
+        "Lrx/Subscription;",
+        "Lrx/Producer;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final call:Lr0/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/b<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public volatile response:Lr0/n;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/n<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final subscriber:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-",
+            "Lr0/n<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lr0/b;Lrx/Subscriber;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;",
+            "Lrx/Subscriber<",
+            "-",
+            "Lr0/n<",
+            "TT;>;>;)V"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
+
+    iput-object p1, p0, Lr0/s/a/b;->call:Lr0/b;
+
+    iput-object p2, p0, Lr0/s/a/b;->subscriber:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lr0/n;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/n<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    invoke-virtual {p0}, Lr0/s/a/b;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    iget-object v1, p0, Lr0/s/a/b;->subscriber:Lrx/Subscriber;
+
+    invoke-interface {v1, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_2
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :cond_0
+    :try_start_1
+    invoke-virtual {p0}, Lr0/s/a/b;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-nez p1, :cond_2
+
+    iget-object p1, p0, Lr0/s/a/b;->subscriber:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+    :try_end_1
+    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_1 .. :try_end_1} :catch_0
+    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_1 .. :try_end_1} :catch_0
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    throw v0
+
+    :catch_0
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_3
+
+    :cond_2
+    :goto_0
+    return-void
+
+    :cond_3
+    throw v0
+
+    :catchall_1
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    :try_start_2
+    iget-object v1, p0, Lr0/s/a/b;->subscriber:Lrx/Subscriber;
+
+    invoke-interface {v1, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_2
+    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_2 .. :try_end_2} :catch_1
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_2 .. :try_end_2} :catch_1
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    goto :goto_1
+
+    :catchall_2
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    new-instance v2, Lrx/exceptions/CompositeException;
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Ljava/lang/Throwable;
+
+    const/4 v4, 0x0
+
+    aput-object p1, v3, v4
+
+    const/4 p1, 0x1
+
+    aput-object v1, v3, p1
+
+    invoke-direct {v2, v3}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
+
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    throw v0
+
+    :catch_1
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_5
+
+    :goto_1
+    return-void
+
+    :cond_5
+    throw v0
+
+    :catch_2
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_6
+
+    return-void
+
+    :cond_6
+    throw v0
+.end method
+
+.method public b(Ljava/lang/Throwable;)V
+    .locals 5
+
+    const/4 v0, 0x3
+
+    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicInteger;->set(I)V
+
+    invoke-virtual {p0}, Lr0/s/a/b;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iget-object v1, p0, Lr0/s/a/b;->subscriber:Lrx/Subscriber;
+
+    invoke-interface {v1, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    new-instance v2, Lrx/exceptions/CompositeException;
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Ljava/lang/Throwable;
+
+    const/4 v4, 0x0
+
+    aput-object p1, v3, v4
+
+    const/4 p1, 0x1
+
+    aput-object v1, v3, p1
+
+    invoke-direct {v2, v3}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
+
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    throw v0
+
+    :catch_0
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    throw v0
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
+
+.method public c(Lr0/n;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/n<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+
+    move-result v0
+
+    const/4 v1, 0x2
+
+    if-eqz v0, :cond_3
+
+    const/4 v2, 0x3
+
+    const/4 v3, 0x1
+
+    if-eq v0, v3, :cond_2
+
+    if-eq v0, v1, :cond_1
+
+    if-eq v0, v2, :cond_1
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Unknown state: "
+
+    invoke-static {v1, v0}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+
+    :cond_2
+    invoke-virtual {p0, v3, v2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0, p1}, Lr0/s/a/b;->a(Lr0/n;)V
+
+    return-void
+
+    :cond_3
+    iput-object p1, p0, Lr0/s/a/b;->response:Lr0/n;
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Lr0/s/a/b;->call:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->k()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public m(J)V
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-nez v2, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+
+    move-result p1
+
+    const/4 p2, 0x1
+
+    if-eqz p1, :cond_4
+
+    if-eq p1, p2, :cond_3
+
+    const/4 p2, 0x3
+
+    const/4 v0, 0x2
+
+    if-eq p1, v0, :cond_2
+
+    if-ne p1, p2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Unknown state: "
+
+    invoke-static {v0, p1}, Lf/e/b/a/a;->h(Ljava/lang/String;I)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_2
+    invoke-virtual {p0, v0, p2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Lr0/s/a/b;->response:Lr0/n;
+
+    invoke-virtual {p0, p1}, Lr0/s/a/b;->a(Lr0/n;)V
+
+    :cond_3
+    :goto_0
+    return-void
+
+    :cond_4
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    return-void
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Lr0/s/a/b;->call:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->cancel()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/c.smali b/com.discord/smali_classes2/r0/s/a/c.smali
new file mode 100644
index 0000000000..ca8a49025a
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/c.smali
@@ -0,0 +1,74 @@
+.class public Lr0/s/a/c;
+.super Ljava/lang/Object;
+.source "CallEnqueueOnSubscribe.java"
+
+# interfaces
+.implements Lr0/d;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/d<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lr0/s/a/b;
+
+
+# direct methods
+.method public constructor <init>(Lr0/s/a/d;Lr0/s/a/b;)V
+    .locals 0
+
+    iput-object p2, p0, Lr0/s/a/c;->a:Lr0/s/a/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lr0/b;Ljava/lang/Throwable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;",
+            "Ljava/lang/Throwable;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-static {p2}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iget-object p1, p0, Lr0/s/a/c;->a:Lr0/s/a/b;
+
+    invoke-virtual {p1, p2}, Lr0/s/a/b;->b(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public b(Lr0/b;Lr0/n;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;",
+            "Lr0/n<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    iget-object p1, p0, Lr0/s/a/c;->a:Lr0/s/a/b;
+
+    invoke-virtual {p1, p2}, Lr0/s/a/b;->c(Lr0/n;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/d.smali b/com.discord/smali_classes2/r0/s/a/d.smali
new file mode 100644
index 0000000000..2bb1af19cc
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/d.smali
@@ -0,0 +1,80 @@
+.class public final Lr0/s/a/d;
+.super Ljava/lang/Object;
+.source "CallEnqueueOnSubscribe.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "Lr0/n<",
+        "TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lr0/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/b<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lr0/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/s/a/d;->d:Lr0/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Lr0/s/a/d;->d:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->e0()Lr0/b;
+
+    move-result-object v0
+
+    new-instance v1, Lr0/s/a/b;
+
+    invoke-direct {v1, v0, p1}, Lr0/s/a/b;-><init>(Lr0/b;Lrx/Subscriber;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    new-instance p1, Lr0/s/a/c;
+
+    invoke-direct {p1, p0, v1}, Lr0/s/a/c;-><init>(Lr0/s/a/d;Lr0/s/a/b;)V
+
+    invoke-interface {v0, p1}, Lr0/b;->Z(Lr0/d;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/e.smali b/com.discord/smali_classes2/r0/s/a/e.smali
new file mode 100644
index 0000000000..37830cb5a6
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/e.smali
@@ -0,0 +1,93 @@
+.class public final Lr0/s/a/e;
+.super Ljava/lang/Object;
+.source "CallExecuteOnSubscribe.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "Lr0/n<",
+        "TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lr0/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/b<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lr0/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/s/a/e;->d:Lr0/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Lr0/s/a/e;->d:Lr0/b;
+
+    invoke-interface {v0}, Lr0/b;->e0()Lr0/b;
+
+    move-result-object v0
+
+    new-instance v1, Lr0/s/a/b;
+
+    invoke-direct {v1, v0, p1}, Lr0/s/a/b;-><init>(Lr0/b;Lrx/Subscriber;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    :try_start_0
+    invoke-interface {v0}, Lr0/b;->execute()Lr0/n;
+
+    move-result-object p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v1, p1}, Lr0/s/a/b;->c(Lr0/n;)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {v1, p1}, Lr0/s/a/b;->b(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/f.smali b/com.discord/smali_classes2/r0/s/a/f.smali
new file mode 100644
index 0000000000..0a5d012458
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/f.smali
@@ -0,0 +1,101 @@
+.class public final Lr0/s/a/f;
+.super Ljava/lang/Object;
+.source "Result.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lr0/n;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/n<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/lang/Throwable;
+
+
+# direct methods
+.method public constructor <init>(Lr0/n;Ljava/lang/Throwable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/n<",
+            "TT;>;",
+            "Ljava/lang/Throwable;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/s/a/f;->a:Lr0/n;
+
+    iput-object p2, p0, Lr0/s/a/f;->b:Ljava/lang/Throwable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lr0/s/a/f;->b:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_0
+
+    const-string v0, "Result{isError=true, error=\""
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lr0/s/a/f;->b:Ljava/lang/Throwable;
+
+    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
+
+    :cond_0
+    const-string v0, "Result{isError=false, response="
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lr0/s/a/f;->a:Lr0/n;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x7d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/g$a.smali b/com.discord/smali_classes2/r0/s/a/g$a.smali
new file mode 100644
index 0000000000..98bbc18e5f
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/g$a.smali
@@ -0,0 +1,204 @@
+.class public Lr0/s/a/g$a;
+.super Lrx/Subscriber;
+.source "ResultOnSubscribe.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lr0/s/a/g;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "Lr0/n<",
+        "TR;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-",
+            "Lr0/s/a/f<",
+            "TR;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-",
+            "Lr0/s/a/f<",
+            "TR;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    iput-object p1, p0, Lr0/s/a/g$a;->d:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Lr0/s/a/g$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 5
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iget-object v1, p0, Lr0/s/a/g$a;->d:Lrx/Subscriber;
+
+    if-eqz p1, :cond_0
+
+    new-instance v2, Lr0/s/a/f;
+
+    invoke-direct {v2, v0, p1}, Lr0/s/a/f;-><init>(Lr0/n;Ljava/lang/Throwable;)V
+
+    invoke-interface {v1, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object p1, p0, Lr0/s/a/g$a;->d:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_1
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v1, "error == null"
+
+    invoke-direct {p1, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :goto_0
+    :try_start_2
+    iget-object v1, p0, Lr0/s/a/g$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v1, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_2
+    .catch Lrx/exceptions/OnCompletedFailedException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Lrx/exceptions/OnErrorFailedException; {:try_start_2 .. :try_end_2} :catch_0
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_2 .. :try_end_2} :catch_0
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    goto :goto_1
+
+    :catchall_1
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    new-instance v2, Lrx/exceptions/CompositeException;
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Ljava/lang/Throwable;
+
+    const/4 v4, 0x0
+
+    aput-object p1, v3, v4
+
+    const/4 p1, 0x1
+
+    aput-object v1, v3, p1
+
+    invoke-direct {v2, v3}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
+
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    throw v0
+
+    :catch_0
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_2
+
+    :goto_1
+    return-void
+
+    :cond_2
+    throw v0
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 3
+
+    check-cast p1, Lr0/n;
+
+    iget-object v0, p0, Lr0/s/a/g$a;->d:Lrx/Subscriber;
+
+    if-eqz p1, :cond_0
+
+    new-instance v1, Lr0/s/a/f;
+
+    const/4 v2, 0x0
+
+    invoke-direct {v1, p1, v2}, Lr0/s/a/f;-><init>(Lr0/n;Ljava/lang/Throwable;)V
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "response == null"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/g.smali b/com.discord/smali_classes2/r0/s/a/g.smali
new file mode 100644
index 0000000000..12f1ab6935
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/g.smali
@@ -0,0 +1,76 @@
+.class public final Lr0/s/a/g;
+.super Ljava/lang/Object;
+.source "ResultOnSubscribe.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lr0/s/a/g$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "Lr0/s/a/f<",
+        "TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable$a<",
+            "Lr0/n<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable$a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable$a<",
+            "Lr0/n<",
+            "TT;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/s/a/g;->d:Lrx/Observable$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Lr0/s/a/g;->d:Lrx/Observable$a;
+
+    new-instance v1, Lr0/s/a/g$a;
+
+    invoke-direct {v1, p1}, Lr0/s/a/g$a;-><init>(Lrx/Subscriber;)V
+
+    invoke-interface {v0, v1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/h.smali b/com.discord/smali_classes2/r0/s/a/h.smali
new file mode 100644
index 0000000000..f993d65705
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/h.smali
@@ -0,0 +1,198 @@
+.class public final Lr0/s/a/h;
+.super Ljava/lang/Object;
+.source "RxJavaCallAdapter.java"
+
+# interfaces
+.implements Lr0/c;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lr0/c<",
+        "TR;",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/lang/reflect/Type;
+
+.field public final b:Lrx/Scheduler;
+
+.field public final c:Z
+
+.field public final d:Z
+
+.field public final e:Z
+
+.field public final f:Z
+
+.field public final g:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/reflect/Type;Lrx/Scheduler;ZZZZZ)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/s/a/h;->a:Ljava/lang/reflect/Type;
+
+    iput-object p2, p0, Lr0/s/a/h;->b:Lrx/Scheduler;
+
+    iput-boolean p3, p0, Lr0/s/a/h;->c:Z
+
+    iput-boolean p4, p0, Lr0/s/a/h;->d:Z
+
+    iput-boolean p5, p0, Lr0/s/a/h;->e:Z
+
+    iput-boolean p6, p0, Lr0/s/a/h;->f:Z
+
+    iput-boolean p7, p0, Lr0/s/a/h;->g:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Ljava/lang/reflect/Type;
+    .locals 1
+
+    iget-object v0, p0, Lr0/s/a/h;->a:Ljava/lang/reflect/Type;
+
+    return-object v0
+.end method
+
+.method public b(Lr0/b;)Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lr0/b<",
+            "TR;>;)",
+            "Ljava/lang/Object;"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Lr0/s/a/h;->c:Z
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Lr0/s/a/d;
+
+    invoke-direct {v0, p1}, Lr0/s/a/d;-><init>(Lr0/b;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Lr0/s/a/e;
+
+    invoke-direct {v0, p1}, Lr0/s/a/e;-><init>(Lr0/b;)V
+
+    :goto_0
+    iget-boolean p1, p0, Lr0/s/a/h;->d:Z
+
+    if-eqz p1, :cond_1
+
+    new-instance p1, Lr0/s/a/g;
+
+    invoke-direct {p1, v0}, Lr0/s/a/g;-><init>(Lrx/Observable$a;)V
+
+    :goto_1
+    move-object v0, p1
+
+    goto :goto_2
+
+    :cond_1
+    iget-boolean p1, p0, Lr0/s/a/h;->e:Z
+
+    if-eqz p1, :cond_2
+
+    new-instance p1, Lr0/s/a/a;
+
+    invoke-direct {p1, v0}, Lr0/s/a/a;-><init>(Lrx/Observable$a;)V
+
+    goto :goto_1
+
+    :cond_2
+    :goto_2
+    new-instance p1, Lrx/Observable;
+
+    invoke-static {v0}, Ls0/o/l;->a(Lrx/Observable$a;)Lrx/Observable$a;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
+
+    iget-object v0, p0, Lr0/s/a/h;->b:Lrx/Scheduler;
+
+    if-eqz v0, :cond_3
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->T(Lrx/Scheduler;)Lrx/Observable;
+
+    move-result-object p1
+
+    :cond_3
+    iget-boolean v0, p0, Lr0/s/a/h;->f:Z
+
+    if-eqz v0, :cond_4
+
+    new-instance v0, Ls0/h;
+
+    new-instance v1, Ls0/l/a/h0;
+
+    invoke-direct {v1, p1}, Ls0/l/a/h0;-><init>(Lrx/Observable;)V
+
+    invoke-direct {v0, v1}, Ls0/h;-><init>(Ls0/h$a;)V
+
+    return-object v0
+
+    :cond_4
+    iget-boolean v0, p0, Lr0/s/a/h;->g:Z
+
+    if-eqz v0, :cond_5
+
+    new-instance v0, Ls0/c;
+
+    invoke-direct {v0, p1}, Ls0/c;-><init>(Lrx/Observable;)V
+
+    :try_start_0
+    new-instance p1, Ls0/d;
+
+    invoke-direct {p1, v0}, Ls0/d;-><init>(Ls0/d$a;)V
+    :try_end_0
+    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    return-object p1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "Actually not, but can\'t pass out an exception otherwise..."
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, p1}, Ljava/lang/NullPointerException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw v0
+
+    :catch_0
+    move-exception p1
+
+    throw p1
+
+    :cond_5
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/s/a/i.smali b/com.discord/smali_classes2/r0/s/a/i.smali
new file mode 100644
index 0000000000..e69ef7cfd1
--- /dev/null
+++ b/com.discord/smali_classes2/r0/s/a/i.smali
@@ -0,0 +1,252 @@
+.class public final Lr0/s/a/i;
+.super Lr0/c$a;
+.source "RxJavaCallAdapterFactory.java"
+
+
+# instance fields
+.field public final a:Lrx/Scheduler;
+
+.field public final b:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Scheduler;Z)V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/c$a;-><init>()V
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lr0/s/a/i;->a:Lrx/Scheduler;
+
+    iput-boolean p2, p0, Lr0/s/a/i;->b:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/c;
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/c<",
+            "**>;"
+        }
+    .end annotation
+
+    invoke-static {p1}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object p2
+
+    const-class p3, Ls0/h;
+
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-ne p2, p3, :cond_0
+
+    const/4 v8, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v8, 0x0
+
+    :goto_0
+    const-class p3, Ls0/d;
+
+    if-ne p2, p3, :cond_1
+
+    const/4 p3, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p3, 0x0
+
+    :goto_1
+    const-class v2, Lrx/Observable;
+
+    if-eq p2, v2, :cond_2
+
+    if-nez v8, :cond_2
+
+    if-nez p3, :cond_2
+
+    const/4 p1, 0x0
+
+    return-object p1
+
+    :cond_2
+    if-eqz p3, :cond_3
+
+    new-instance p1, Lr0/s/a/h;
+
+    const-class v1, Ljava/lang/Void;
+
+    iget-object v2, p0, Lr0/s/a/i;->a:Lrx/Scheduler;
+
+    iget-boolean v3, p0, Lr0/s/a/i;->b:Z
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x1
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x1
+
+    move-object v0, p1
+
+    invoke-direct/range {v0 .. v7}, Lr0/s/a/h;-><init>(Ljava/lang/reflect/Type;Lrx/Scheduler;ZZZZZ)V
+
+    return-object p1
+
+    :cond_3
+    instance-of p2, p1, Ljava/lang/reflect/ParameterizedType;
+
+    if-nez p2, :cond_5
+
+    if-eqz v8, :cond_4
+
+    const-string p1, "Single"
+
+    goto :goto_2
+
+    :cond_4
+    const-string p1, "Observable"
+
+    :goto_2
+    new-instance p2, Ljava/lang/IllegalStateException;
+
+    new-instance p3, Ljava/lang/StringBuilder;
+
+    invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, " return type must be parameterized as "
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, "<Foo> or "
+
+    invoke-virtual {p3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string p1, "<? extends Foo>"
+
+    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p2
+
+    :cond_5
+    check-cast p1, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-static {v1, p1}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lr0/r;->h(Ljava/lang/reflect/Type;)Ljava/lang/Class;
+
+    move-result-object p2
+
+    const-class p3, Lr0/n;
+
+    if-ne p2, p3, :cond_7
+
+    instance-of p2, p1, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz p2, :cond_6
+
+    check-cast p1, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-static {v1, p1}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    goto :goto_3
+
+    :cond_6
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "Response must be parameterized as Response<Foo> or Response<? extends Foo>"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_7
+    const-class p3, Lr0/s/a/f;
+
+    if-ne p2, p3, :cond_9
+
+    instance-of p2, p1, Ljava/lang/reflect/ParameterizedType;
+
+    if-eqz p2, :cond_8
+
+    check-cast p1, Ljava/lang/reflect/ParameterizedType;
+
+    invoke-static {v1, p1}, Lr0/r;->g(ILjava/lang/reflect/ParameterizedType;)Ljava/lang/reflect/Type;
+
+    move-result-object p1
+
+    :goto_3
+    move-object v3, p1
+
+    move v6, v0
+
+    const/4 v7, 0x0
+
+    goto :goto_4
+
+    :cond_8
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "Result must be parameterized as Result<Foo> or Result<? extends Foo>"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_9
+    move-object v3, p1
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x1
+
+    :goto_4
+    new-instance p1, Lr0/s/a/h;
+
+    iget-object v4, p0, Lr0/s/a/i;->a:Lrx/Scheduler;
+
+    iget-boolean v5, p0, Lr0/s/a/i;->b:Z
+
+    const/4 v9, 0x0
+
+    move-object v2, p1
+
+    invoke-direct/range {v2 .. v9}, Lr0/s/a/h;-><init>(Ljava/lang/reflect/Type;Lrx/Scheduler;ZZZZZ)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/a/a.smali b/com.discord/smali_classes2/r0/t/a/a.smali
new file mode 100644
index 0000000000..b2d6de8ca1
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/a/a.smali
@@ -0,0 +1,94 @@
+.class public final Lr0/t/a/a;
+.super Lr0/e$a;
+.source "GsonConverterFactory.java"
+
+
+# instance fields
+.field public final a:Lcom/google/gson/Gson;
+
+
+# direct methods
+.method public constructor <init>(Lcom/google/gson/Gson;)V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/e$a;-><init>()V
+
+    iput-object p1, p0, Lr0/t/a/a;->a:Lcom/google/gson/Gson;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "*",
+            "Lokhttp3/RequestBody;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object p2, p0, Lr0/t/a/a;->a:Lcom/google/gson/Gson;
+
+    invoke-static {p1}, Lcom/google/gson/reflect/TypeToken;->get(Ljava/lang/reflect/Type;)Lcom/google/gson/reflect/TypeToken;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Lcom/google/gson/Gson;->g(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;
+
+    move-result-object p1
+
+    new-instance p2, Lr0/t/a/b;
+
+    iget-object p3, p0, Lr0/t/a/a;->a:Lcom/google/gson/Gson;
+
+    invoke-direct {p2, p3, p1}, Lr0/t/a/b;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
+
+    return-object p2
+.end method
+
+.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "Lokhttp3/ResponseBody;",
+            "*>;"
+        }
+    .end annotation
+
+    iget-object p2, p0, Lr0/t/a/a;->a:Lcom/google/gson/Gson;
+
+    invoke-static {p1}, Lcom/google/gson/reflect/TypeToken;->get(Ljava/lang/reflect/Type;)Lcom/google/gson/reflect/TypeToken;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Lcom/google/gson/Gson;->g(Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;
+
+    move-result-object p1
+
+    new-instance p2, Lr0/t/a/c;
+
+    iget-object p3, p0, Lr0/t/a/a;->a:Lcom/google/gson/Gson;
+
+    invoke-direct {p2, p3, p1}, Lr0/t/a/c;-><init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
+
+    return-object p2
+.end method
diff --git a/com.discord/smali_classes2/r0/t/a/b.smali b/com.discord/smali_classes2/r0/t/a/b.smali
new file mode 100644
index 0000000000..543edb1d3f
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/a/b.smali
@@ -0,0 +1,133 @@
+.class public final Lr0/t/a/b;
+.super Ljava/lang/Object;
+.source "GsonRequestBodyConverter.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "TT;",
+        "Lokhttp3/RequestBody;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:Lokhttp3/MediaType;
+
+.field public static final d:Ljava/nio/charset/Charset;
+
+
+# instance fields
+.field public final a:Lcom/google/gson/Gson;
+
+.field public final b:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const-string v0, "application/json; charset=UTF-8"
+
+    invoke-static {v0}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
+
+    move-result-object v0
+
+    sput-object v0, Lr0/t/a/b;->c:Lokhttp3/MediaType;
+
+    const-string v0, "UTF-8"
+
+    invoke-static {v0}, Ljava/nio/charset/Charset;->forName(Ljava/lang/String;)Ljava/nio/charset/Charset;
+
+    move-result-object v0
+
+    sput-object v0, Lr0/t/a/b;->d:Ljava/nio/charset/Charset;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/google/gson/Gson;",
+            "Lcom/google/gson/TypeAdapter<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/t/a/b;->a:Lcom/google/gson/Gson;
+
+    iput-object p2, p0, Lr0/t/a/b;->b:Lcom/google/gson/TypeAdapter;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    new-instance v0, Lp0/e;
+
+    invoke-direct {v0}, Lp0/e;-><init>()V
+
+    new-instance v1, Ljava/io/OutputStreamWriter;
+
+    new-instance v2, Lp0/f;
+
+    invoke-direct {v2, v0}, Lp0/f;-><init>(Lp0/e;)V
+
+    sget-object v3, Lr0/t/a/b;->d:Ljava/nio/charset/Charset;
+
+    invoke-direct {v1, v2, v3}, Ljava/io/OutputStreamWriter;-><init>(Ljava/io/OutputStream;Ljava/nio/charset/Charset;)V
+
+    iget-object v2, p0, Lr0/t/a/b;->a:Lcom/google/gson/Gson;
+
+    invoke-virtual {v2, v1}, Lcom/google/gson/Gson;->j(Ljava/io/Writer;)Lcom/google/gson/stream/JsonWriter;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lr0/t/a/b;->b:Lcom/google/gson/TypeAdapter;
+
+    invoke-virtual {v2, v1, p1}, Lcom/google/gson/TypeAdapter;->write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
+
+    invoke-virtual {v1}, Lcom/google/gson/stream/JsonWriter;->close()V
+
+    sget-object p1, Lr0/t/a/b;->c:Lokhttp3/MediaType;
+
+    invoke-virtual {v0}, Lp0/e;->n()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-static {p1, v0}, Lokhttp3/RequestBody;->create(Lokhttp3/MediaType;Lokio/ByteString;)Lokhttp3/RequestBody;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/a/c.smali b/com.discord/smali_classes2/r0/t/a/c.smali
new file mode 100644
index 0000000000..3974825bc7
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/a/c.smali
@@ -0,0 +1,132 @@
+.class public final Lr0/t/a/c;
+.super Ljava/lang/Object;
+.source "GsonResponseBodyConverter.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lcom/google/gson/Gson;
+
+.field public final b:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lcom/google/gson/Gson;Lcom/google/gson/TypeAdapter;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/google/gson/Gson;",
+            "Lcom/google/gson/TypeAdapter<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lr0/t/a/c;->a:Lcom/google/gson/Gson;
+
+    iput-object p2, p0, Lr0/t/a/c;->b:Lcom/google/gson/TypeAdapter;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    iget-object v0, p0, Lr0/t/a/c;->a:Lcom/google/gson/Gson;
+
+    iget-object v1, p1, Lokhttp3/ResponseBody;->d:Ljava/io/Reader;
+
+    if-eqz v1, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    new-instance v1, Lokhttp3/ResponseBody$a;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->c()Lp0/g;
+
+    move-result-object v2
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->b()Lokhttp3/MediaType;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_1
+
+    sget-object v4, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    invoke-virtual {v3, v4}, Lokhttp3/MediaType;->a(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v3, Lk0/u/a;->a:Ljava/nio/charset/Charset;
+
+    :goto_0
+    invoke-direct {v1, v2, v3}, Lokhttp3/ResponseBody$a;-><init>(Lp0/g;Ljava/nio/charset/Charset;)V
+
+    iput-object v1, p1, Lokhttp3/ResponseBody;->d:Ljava/io/Reader;
+
+    :goto_1
+    invoke-virtual {v0, v1}, Lcom/google/gson/Gson;->i(Ljava/io/Reader;)Lcom/google/gson/stream/JsonReader;
+
+    move-result-object v0
+
+    :try_start_0
+    iget-object v1, p0, Lr0/t/a/c;->b:Lcom/google/gson/TypeAdapter;
+
+    invoke-virtual {v1, v0}, Lcom/google/gson/TypeAdapter;->read(Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->close()V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/a.smali b/com.discord/smali_classes2/r0/t/b/a.smali
new file mode 100644
index 0000000000..58ae18fd72
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/a.smali
@@ -0,0 +1,88 @@
+.class public final Lr0/t/b/a;
+.super Ljava/lang/Object;
+.source "ScalarRequestBodyConverter.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "TT;",
+        "Lokhttp3/RequestBody;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lr0/t/b/a<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final b:Lokhttp3/MediaType;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/a;
+
+    invoke-direct {v0}, Lr0/t/b/a;-><init>()V
+
+    sput-object v0, Lr0/t/b/a;->a:Lr0/t/b/a;
+
+    const-string v0, "text/plain; charset=UTF-8"
+
+    invoke-static {v0}, Lokhttp3/MediaType;->c(Ljava/lang/String;)Lokhttp3/MediaType;
+
+    move-result-object v0
+
+    sput-object v0, Lr0/t/b/a;->b:Lokhttp3/MediaType;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    sget-object v0, Lr0/t/b/a;->b:Lokhttp3/MediaType;
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {v0, p1}, Lokhttp3/RequestBody;->create(Lokhttp3/MediaType;Ljava/lang/String;)Lokhttp3/RequestBody;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/b.smali b/com.discord/smali_classes2/r0/t/b/b.smali
new file mode 100644
index 0000000000..9eb9c9abd7
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/b.smali
@@ -0,0 +1,67 @@
+.class public final Lr0/t/b/b;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/b;
+
+    invoke-direct {v0}, Lr0/t/b/b;-><init>()V
+
+    sput-object v0, Lr0/t/b/b;->a:Lr0/t/b/b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Ljava/lang/String;)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/c.smali b/com.discord/smali_classes2/r0/t/b/c.smali
new file mode 100644
index 0000000000..f988e49442
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/c.smali
@@ -0,0 +1,67 @@
+.class public final Lr0/t/b/c;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Byte;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/c;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/c;
+
+    invoke-direct {v0}, Lr0/t/b/c;-><init>()V
+
+    sput-object v0, Lr0/t/b/c;->a:Lr0/t/b/c;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/lang/Byte;->valueOf(Ljava/lang/String;)Ljava/lang/Byte;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/d.smali b/com.discord/smali_classes2/r0/t/b/d.smali
new file mode 100644
index 0000000000..413901c5f2
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/d.smali
@@ -0,0 +1,104 @@
+.class public final Lr0/t/b/d;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Character;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/d;
+
+    invoke-direct {v0}, Lr0/t/b/d;-><init>()V
+
+    sput-object v0, Lr0/t/b/d;->a:Lr0/t/b/d;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Ljava/lang/String;->charAt(I)C
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance v0, Ljava/io/IOException;
+
+    const-string v1, "Expected body of length 1 for Character conversion but was "
+
+    invoke-static {v1}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+    move-result p1
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/e.smali b/com.discord/smali_classes2/r0/t/b/e.smali
new file mode 100644
index 0000000000..69922c9e58
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/e.smali
@@ -0,0 +1,67 @@
+.class public final Lr0/t/b/e;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Double;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/e;
+
+    invoke-direct {v0}, Lr0/t/b/e;-><init>()V
+
+    sput-object v0, Lr0/t/b/e;->a:Lr0/t/b/e;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/lang/Double;->valueOf(Ljava/lang/String;)Ljava/lang/Double;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/f.smali b/com.discord/smali_classes2/r0/t/b/f.smali
new file mode 100644
index 0000000000..357f3be371
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/f.smali
@@ -0,0 +1,67 @@
+.class public final Lr0/t/b/f;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Float;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/f;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/f;
+
+    invoke-direct {v0}, Lr0/t/b/f;-><init>()V
+
+    sput-object v0, Lr0/t/b/f;->a:Lr0/t/b/f;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/lang/Float;->valueOf(Ljava/lang/String;)Ljava/lang/Float;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/g.smali b/com.discord/smali_classes2/r0/t/b/g.smali
new file mode 100644
index 0000000000..57499550bc
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/g.smali
@@ -0,0 +1,67 @@
+.class public final Lr0/t/b/g;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Integer;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/g;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/g;
+
+    invoke-direct {v0}, Lr0/t/b/g;-><init>()V
+
+    sput-object v0, Lr0/t/b/g;->a:Lr0/t/b/g;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(Ljava/lang/String;)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/h.smali b/com.discord/smali_classes2/r0/t/b/h.smali
new file mode 100644
index 0000000000..82143f26f0
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/h.smali
@@ -0,0 +1,67 @@
+.class public final Lr0/t/b/h;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/h;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/h;
+
+    invoke-direct {v0}, Lr0/t/b/h;-><init>()V
+
+    sput-object v0, Lr0/t/b/h;->a:Lr0/t/b/h;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/lang/Long;->valueOf(Ljava/lang/String;)Ljava/lang/Long;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/i.smali b/com.discord/smali_classes2/r0/t/b/i.smali
new file mode 100644
index 0000000000..0c7ce90f0d
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/i.smali
@@ -0,0 +1,67 @@
+.class public final Lr0/t/b/i;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/Short;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/i;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/i;
+
+    invoke-direct {v0}, Lr0/t/b/i;-><init>()V
+
+    sput-object v0, Lr0/t/b/i;->a:Lr0/t/b/i;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ljava/lang/Short;->valueOf(Ljava/lang/String;)Ljava/lang/Short;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/j.smali b/com.discord/smali_classes2/r0/t/b/j.smali
new file mode 100644
index 0000000000..7ca74cdec0
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/j.smali
@@ -0,0 +1,63 @@
+.class public final Lr0/t/b/j;
+.super Ljava/lang/Object;
+.source "ScalarResponseBodyConverters.java"
+
+# interfaces
+.implements Lr0/e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lr0/e<",
+        "Lokhttp3/ResponseBody;",
+        "Ljava/lang/String;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Lr0/t/b/j;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lr0/t/b/j;
+
+    invoke-direct {v0}, Lr0/t/b/j;-><init>()V
+
+    sput-object v0, Lr0/t/b/j;->a:Lr0/t/b/j;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    check-cast p1, Lokhttp3/ResponseBody;
+
+    invoke-virtual {p1}, Lokhttp3/ResponseBody;->d()Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/t/b/k.smali b/com.discord/smali_classes2/r0/t/b/k.smali
new file mode 100644
index 0000000000..94045730f6
--- /dev/null
+++ b/com.discord/smali_classes2/r0/t/b/k.smali
@@ -0,0 +1,282 @@
+.class public final Lr0/t/b/k;
+.super Lr0/e$a;
+.source "ScalarsConverterFactory.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lr0/e$a;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "*",
+            "Lokhttp3/RequestBody;",
+            ">;"
+        }
+    .end annotation
+
+    const-class p2, Ljava/lang/String;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Boolean;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Byte;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Character;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Double;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Float;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Integer;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Long;
+
+    if-eq p1, p2, :cond_1
+
+    sget-object p2, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
+
+    if-eq p1, p2, :cond_1
+
+    const-class p2, Ljava/lang/Short;
+
+    if-ne p1, p2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return-object p1
+
+    :cond_1
+    :goto_0
+    sget-object p1, Lr0/t/b/a;->a:Lr0/t/b/a;
+
+    return-object p1
+.end method
+
+.method public b(Ljava/lang/reflect/Type;[Ljava/lang/annotation/Annotation;Lr0/p;)Lr0/e;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/reflect/Type;",
+            "[",
+            "Ljava/lang/annotation/Annotation;",
+            "Lr0/p;",
+            ")",
+            "Lr0/e<",
+            "Lokhttp3/ResponseBody;",
+            "*>;"
+        }
+    .end annotation
+
+    const-class p2, Ljava/lang/String;
+
+    if-ne p1, p2, :cond_0
+
+    sget-object p1, Lr0/t/b/j;->a:Lr0/t/b/j;
+
+    return-object p1
+
+    :cond_0
+    const-class p2, Ljava/lang/Boolean;
+
+    if-eq p1, p2, :cond_10
+
+    sget-object p2, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_1
+
+    goto :goto_7
+
+    :cond_1
+    const-class p2, Ljava/lang/Byte;
+
+    if-eq p1, p2, :cond_f
+
+    sget-object p2, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_2
+
+    goto :goto_6
+
+    :cond_2
+    const-class p2, Ljava/lang/Character;
+
+    if-eq p1, p2, :cond_e
+
+    sget-object p2, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_3
+
+    goto :goto_5
+
+    :cond_3
+    const-class p2, Ljava/lang/Double;
+
+    if-eq p1, p2, :cond_d
+
+    sget-object p2, Ljava/lang/Double;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    const-class p2, Ljava/lang/Float;
+
+    if-eq p1, p2, :cond_c
+
+    sget-object p2, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_5
+
+    goto :goto_3
+
+    :cond_5
+    const-class p2, Ljava/lang/Integer;
+
+    if-eq p1, p2, :cond_b
+
+    sget-object p2, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_6
+
+    goto :goto_2
+
+    :cond_6
+    const-class p2, Ljava/lang/Long;
+
+    if-eq p1, p2, :cond_a
+
+    sget-object p2, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_7
+
+    goto :goto_1
+
+    :cond_7
+    const-class p2, Ljava/lang/Short;
+
+    if-eq p1, p2, :cond_9
+
+    sget-object p2, Ljava/lang/Short;->TYPE:Ljava/lang/Class;
+
+    if-ne p1, p2, :cond_8
+
+    goto :goto_0
+
+    :cond_8
+    const/4 p1, 0x0
+
+    return-object p1
+
+    :cond_9
+    :goto_0
+    sget-object p1, Lr0/t/b/i;->a:Lr0/t/b/i;
+
+    return-object p1
+
+    :cond_a
+    :goto_1
+    sget-object p1, Lr0/t/b/h;->a:Lr0/t/b/h;
+
+    return-object p1
+
+    :cond_b
+    :goto_2
+    sget-object p1, Lr0/t/b/g;->a:Lr0/t/b/g;
+
+    return-object p1
+
+    :cond_c
+    :goto_3
+    sget-object p1, Lr0/t/b/f;->a:Lr0/t/b/f;
+
+    return-object p1
+
+    :cond_d
+    :goto_4
+    sget-object p1, Lr0/t/b/e;->a:Lr0/t/b/e;
+
+    return-object p1
+
+    :cond_e
+    :goto_5
+    sget-object p1, Lr0/t/b/d;->a:Lr0/t/b/d;
+
+    return-object p1
+
+    :cond_f
+    :goto_6
+    sget-object p1, Lr0/t/b/c;->a:Lr0/t/b/c;
+
+    return-object p1
+
+    :cond_10
+    :goto_7
+    sget-object p1, Lr0/t/b/b;->a:Lr0/t/b/b;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/u/a.smali b/com.discord/smali_classes2/r0/u/a.smali
new file mode 100644
index 0000000000..e99e65f11e
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/a.smali
@@ -0,0 +1,21 @@
+.class public interface abstract annotation Lr0/u/a;
+.super Ljava/lang/Object;
+.source "Body.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/r0/u/b.smali b/com.discord/smali_classes2/r0/u/b.smali
new file mode 100644
index 0000000000..a1c9f5b946
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/b.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/b;
+.super Ljava/lang/Object;
+.source "DELETE.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/b;
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/c.smali b/com.discord/smali_classes2/r0/u/c.smali
new file mode 100644
index 0000000000..85cd8cb510
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/c.smali
@@ -0,0 +1,35 @@
+.class public interface abstract annotation Lr0/u/c;
+.super Ljava/lang/Object;
+.source "Field.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/c;
+        encoded = false
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoded()Z
+.end method
+
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/d.smali b/com.discord/smali_classes2/r0/u/d.smali
new file mode 100644
index 0000000000..7b206517e3
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/d.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/d;
+.super Ljava/lang/Object;
+.source "FieldMap.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/d;
+        encoded = false
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoded()Z
+.end method
diff --git a/com.discord/smali_classes2/r0/u/e.smali b/com.discord/smali_classes2/r0/u/e.smali
new file mode 100644
index 0000000000..178b74a513
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/e.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/e;
+.super Ljava/lang/Object;
+.source "GET.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/e;
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/f.smali b/com.discord/smali_classes2/r0/u/f.smali
new file mode 100644
index 0000000000..348d879c4e
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/f.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/f;
+.super Ljava/lang/Object;
+.source "HEAD.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/f;
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/g.smali b/com.discord/smali_classes2/r0/u/g.smali
new file mode 100644
index 0000000000..c2b80dc2d6
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/g.smali
@@ -0,0 +1,39 @@
+.class public interface abstract annotation Lr0/u/g;
+.super Ljava/lang/Object;
+.source "HTTP.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/g;
+        hasBody = false
+        path = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract hasBody()Z
+.end method
+
+.method public abstract method()Ljava/lang/String;
+.end method
+
+.method public abstract path()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/h.smali b/com.discord/smali_classes2/r0/u/h.smali
new file mode 100644
index 0000000000..de92ba11a8
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/h.smali
@@ -0,0 +1,26 @@
+.class public interface abstract annotation Lr0/u/h;
+.super Ljava/lang/Object;
+.source "Header.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/i.smali b/com.discord/smali_classes2/r0/u/i.smali
new file mode 100644
index 0000000000..bf1bac10a4
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/i.smali
@@ -0,0 +1,26 @@
+.class public interface abstract annotation Lr0/u/i;
+.super Ljava/lang/Object;
+.source "Headers.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()[Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/j.smali b/com.discord/smali_classes2/r0/u/j.smali
new file mode 100644
index 0000000000..fa49525783
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/j.smali
@@ -0,0 +1,21 @@
+.class public interface abstract annotation Lr0/u/j;
+.super Ljava/lang/Object;
+.source "Multipart.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/r0/u/k.smali b/com.discord/smali_classes2/r0/u/k.smali
new file mode 100644
index 0000000000..f0e7f0881c
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/k.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/k;
+.super Ljava/lang/Object;
+.source "OPTIONS.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/k;
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/l.smali b/com.discord/smali_classes2/r0/u/l.smali
new file mode 100644
index 0000000000..e5cfab05a6
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/l.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/l;
+.super Ljava/lang/Object;
+.source "PATCH.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/l;
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/m.smali b/com.discord/smali_classes2/r0/u/m.smali
new file mode 100644
index 0000000000..477e921806
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/m.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/m;
+.super Ljava/lang/Object;
+.source "POST.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/m;
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/n.smali b/com.discord/smali_classes2/r0/u/n.smali
new file mode 100644
index 0000000000..320c5ffa08
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/n.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/n;
+.super Ljava/lang/Object;
+.source "PUT.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/n;
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/o.smali b/com.discord/smali_classes2/r0/u/o.smali
new file mode 100644
index 0000000000..5255b93535
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/o.smali
@@ -0,0 +1,36 @@
+.class public interface abstract annotation Lr0/u/o;
+.super Ljava/lang/Object;
+.source "Part.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/o;
+        encoding = "binary"
+        value = ""
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoding()Ljava/lang/String;
+.end method
+
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/p.smali b/com.discord/smali_classes2/r0/u/p.smali
new file mode 100644
index 0000000000..9fcb34eba3
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/p.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/p;
+.super Ljava/lang/Object;
+.source "PartMap.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/p;
+        encoding = "binary"
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoding()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/q.smali b/com.discord/smali_classes2/r0/u/q.smali
new file mode 100644
index 0000000000..8589ca8976
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/q.smali
@@ -0,0 +1,35 @@
+.class public interface abstract annotation Lr0/u/q;
+.super Ljava/lang/Object;
+.source "Path.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/q;
+        encoded = false
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoded()Z
+.end method
+
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/r.smali b/com.discord/smali_classes2/r0/u/r.smali
new file mode 100644
index 0000000000..4ae847e673
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/r.smali
@@ -0,0 +1,35 @@
+.class public interface abstract annotation Lr0/u/r;
+.super Ljava/lang/Object;
+.source "Query.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/r;
+        encoded = false
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoded()Z
+.end method
+
+.method public abstract value()Ljava/lang/String;
+.end method
diff --git a/com.discord/smali_classes2/r0/u/s.smali b/com.discord/smali_classes2/r0/u/s.smali
new file mode 100644
index 0000000000..77712ba47c
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/s.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/s;
+.super Ljava/lang/Object;
+.source "QueryMap.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/s;
+        encoded = false
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoded()Z
+.end method
diff --git a/com.discord/smali_classes2/r0/u/t.smali b/com.discord/smali_classes2/r0/u/t.smali
new file mode 100644
index 0000000000..7534f09c23
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/t.smali
@@ -0,0 +1,32 @@
+.class public interface abstract annotation Lr0/u/t;
+.super Ljava/lang/Object;
+.source "QueryName.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation system Ldalvik/annotation/AnnotationDefault;
+    value = .subannotation Lr0/u/t;
+        encoded = false
+    .end subannotation
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract encoded()Z
+.end method
diff --git a/com.discord/smali_classes2/r0/u/u.smali b/com.discord/smali_classes2/r0/u/u.smali
new file mode 100644
index 0000000000..0a367dfdc7
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/u.smali
@@ -0,0 +1,21 @@
+.class public interface abstract annotation Lr0/u/u;
+.super Ljava/lang/Object;
+.source "Streaming.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->METHOD:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/r0/u/v.smali b/com.discord/smali_classes2/r0/u/v.smali
new file mode 100644
index 0000000000..a543b914a7
--- /dev/null
+++ b/com.discord/smali_classes2/r0/u/v.smali
@@ -0,0 +1,21 @@
+.class public interface abstract annotation Lr0/u/v;
+.super Ljava/lang/Object;
+.source "Url.java"
+
+# interfaces
+.implements Ljava/lang/annotation/Annotation;
+
+
+# annotations
+.annotation runtime Ljava/lang/annotation/Documented;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Retention;
+    value = .enum Ljava/lang/annotation/RetentionPolicy;->RUNTIME:Ljava/lang/annotation/RetentionPolicy;
+.end annotation
+
+.annotation runtime Ljava/lang/annotation/Target;
+    value = {
+        .enum Ljava/lang/annotation/ElementType;->PARAMETER:Ljava/lang/annotation/ElementType;
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/retrofit2/HttpException.smali b/com.discord/smali_classes2/retrofit2/HttpException.smali
index 92c44082da..9afca983dd 100644
--- a/com.discord/smali_classes2/retrofit2/HttpException.smali
+++ b/com.discord/smali_classes2/retrofit2/HttpException.smali
@@ -6,10 +6,10 @@
 # instance fields
 .field public final code:I
 
-.field public final transient d:Lq0/n;
+.field public final transient d:Lr0/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lq0/n<",
+            "Lr0/n<",
             "*>;"
         }
     .end annotation
@@ -19,19 +19,19 @@
 
 
 # direct methods
-.method public constructor <init>(Lq0/n;)V
+.method public constructor <init>(Lr0/n;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lq0/n<",
+            "Lr0/n<",
             "*>;)V"
         }
     .end annotation
 
     const-string v0, "response == null"
 
-    invoke-static {p1, v0}, Lq0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+    invoke-static {p1, v0}, Lr0/r;->b(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -41,7 +41,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p1, Lq0/n;->a:Lokhttp3/Response;
+    iget-object v1, p1, Lr0/n;->a:Lokhttp3/Response;
 
     iget v1, v1, Lokhttp3/Response;->g:I
 
@@ -51,7 +51,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p1, Lq0/n;->a:Lokhttp3/Response;
+    iget-object v1, p1, Lr0/n;->a:Lokhttp3/Response;
 
     iget-object v1, v1, Lokhttp3/Response;->f:Ljava/lang/String;
 
@@ -63,7 +63,7 @@
 
     invoke-direct {p0, v0}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p1, Lq0/n;->a:Lokhttp3/Response;
+    iget-object v0, p1, Lr0/n;->a:Lokhttp3/Response;
 
     iget v1, v0, Lokhttp3/Response;->g:I
 
@@ -73,7 +73,7 @@
 
     iput-object v0, p0, Lretrofit2/HttpException;->message:Ljava/lang/String;
 
-    iput-object p1, p0, Lretrofit2/HttpException;->d:Lq0/n;
+    iput-object p1, p0, Lretrofit2/HttpException;->d:Lr0/n;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/retrofit2/adapter/rxjava/HttpException.smali b/com.discord/smali_classes2/retrofit2/adapter/rxjava/HttpException.smali
index b99bd0583a..cab70bbf5b 100644
--- a/com.discord/smali_classes2/retrofit2/adapter/rxjava/HttpException.smali
+++ b/com.discord/smali_classes2/retrofit2/adapter/rxjava/HttpException.smali
@@ -9,17 +9,17 @@
 
 
 # direct methods
-.method public constructor <init>(Lq0/n;)V
+.method public constructor <init>(Lr0/n;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lq0/n<",
+            "Lr0/n<",
             "*>;)V"
         }
     .end annotation
 
-    invoke-direct {p0, p1}, Lretrofit2/HttpException;-><init>(Lq0/n;)V
+    invoke-direct {p0, p1}, Lretrofit2/HttpException;-><init>(Lr0/n;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/Emitter.smali b/com.discord/smali_classes2/rx/Emitter.smali
index 434ab1b17e..6877fb128e 100644
--- a/com.discord/smali_classes2/rx/Emitter.smali
+++ b/com.discord/smali_classes2/rx/Emitter.smali
@@ -3,7 +3,7 @@
 .source "Emitter.java"
 
 # interfaces
-.implements Lr0/g;
+.implements Ls0/g;
 
 
 # annotations
@@ -19,7 +19,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/g<",
+        "Ls0/g<",
         "TT;>;"
     }
 .end annotation
diff --git a/com.discord/smali_classes2/rx/Observable$b.smali b/com.discord/smali_classes2/rx/Observable$b.smali
index 2e34e64136..cc289617d2 100644
--- a/com.discord/smali_classes2/rx/Observable$b.smali
+++ b/com.discord/smali_classes2/rx/Observable$b.smali
@@ -3,7 +3,7 @@
 .source "Observable.java"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lrx/Subscriber<",
         "-TR;>;",
         "Lrx/Subscriber<",
diff --git a/com.discord/smali_classes2/rx/Observable$c.smali b/com.discord/smali_classes2/rx/Observable$c.smali
index 3e9125cf7d..77b3010e0e 100644
--- a/com.discord/smali_classes2/rx/Observable$c.smali
+++ b/com.discord/smali_classes2/rx/Observable$c.smali
@@ -3,7 +3,7 @@
 .source "Observable.java"
 
 # interfaces
-.implements Lr0/k/b;
+.implements Ls0/k/b;
 
 
 # annotations
@@ -24,7 +24,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/k/b<",
+        "Ls0/k/b<",
         "Lrx/Observable<",
         "TT;>;",
         "Lrx/Observable<",
diff --git a/com.discord/smali_classes2/rx/Observable.smali b/com.discord/smali_classes2/rx/Observable.smali
index ca8a0c859e..1d34aee47c 100644
--- a/com.discord/smali_classes2/rx/Observable.smali
+++ b/com.discord/smali_classes2/rx/Observable.smali
@@ -67,7 +67,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object p0, Lr0/l/a/f;->e:Lrx/Observable;
+    sget-object p0, Ls0/l/a/f;->e:Lrx/Observable;
 
     return-object p0
 
@@ -80,16 +80,16 @@
 
     aget-object p0, p0, v0
 
-    new-instance v0, Lr0/l/e/j;
+    new-instance v0, Ls0/l/e/j;
 
-    invoke-direct {v0, p0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {v0, p0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
     return-object v0
 
     :cond_1
-    new-instance v0, Lr0/l/a/r;
+    new-instance v0, Ls0/l/a/r;
 
-    invoke-direct {v0, p0}, Lr0/l/a/r;-><init>([Ljava/lang/Object;)V
+    invoke-direct {v0, p0}, Ls0/l/a/r;-><init>([Ljava/lang/Object;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -111,7 +111,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -142,7 +142,7 @@
         }
     .end annotation
 
-    new-instance v7, Lr0/l/a/n0;
+    new-instance v7, Ls0/l/a/n0;
 
     move-object v0, v7
 
@@ -154,7 +154,7 @@
 
     move-object v6, p5
 
-    invoke-direct/range {v0 .. v6}, Lr0/l/a/n0;-><init>(JJLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    invoke-direct/range {v0 .. v6}, Ls0/l/a/n0;-><init>(JJLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
     invoke-static {v7}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -183,28 +183,28 @@
 
     move-result-object v0
 
-    const-class v1, Lr0/l/e/j;
+    const-class v1, Ls0/l/e/j;
 
     if-ne v0, v1, :cond_0
 
-    check-cast p0, Lr0/l/e/j;
+    check-cast p0, Ls0/l/e/j;
 
-    sget-object v0, Lr0/l/e/l;->d:Lr0/l/e/l;
+    sget-object v0, Ls0/l/e/l;->d:Ls0/l/e/l;
 
-    invoke-virtual {p0, v0}, Lr0/l/e/j;->g0(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Ls0/l/e/j;->g0(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lr0/l/a/a1$b;->a:Lr0/l/a/a1;
+    sget-object v0, Ls0/l/a/a1$b;->a:Ls0/l/a/a1;
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object p0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, p0, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, p0, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -265,7 +265,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -290,9 +290,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/l0;
+    new-instance v0, Ls0/l/a/l0;
 
-    invoke-direct {v0, p0, p1, p2, p3}, Lr0/l/a/l0;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    invoke-direct {v0, p0, p1, p2, p3}, Ls0/l/a/l0;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -321,9 +321,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/i;
+    new-instance v0, Ls0/l/a/i;
 
-    invoke-direct {v0, p0, p1}, Lr0/l/a/i;-><init>(Ljava/lang/Iterable;Lrx/functions/FuncN;)V
+    invoke-direct {v0, p0, p1}, Ls0/l/a/i;-><init>(Ljava/lang/Iterable;Lrx/functions/FuncN;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -426,9 +426,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/c;
+    new-instance p1, Ls0/k/c;
 
-    invoke-direct {p1, p9}, Lr0/k/c;-><init>(Lrx/functions/Func9;)V
+    invoke-direct {p1, p9}, Ls0/k/c;-><init>(Lrx/functions/Func9;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -523,9 +523,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/j;
+    new-instance p1, Ls0/k/j;
 
-    invoke-direct {p1, p8}, Lr0/k/j;-><init>(Lrx/functions/Func8;)V
+    invoke-direct {p1, p8}, Ls0/k/j;-><init>(Lrx/functions/Func8;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -550,7 +550,7 @@
 
     new-instance v0, Lrx/Observable;
 
-    invoke-static {p0}, Lr0/o/l;->a(Lrx/Observable$a;)Lrx/Observable$a;
+    invoke-static {p0}, Ls0/o/l;->a(Lrx/Observable$a;)Lrx/Observable$a;
 
     move-result-object p0
 
@@ -637,9 +637,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/i;
+    new-instance p1, Ls0/k/i;
 
-    invoke-direct {p1, p7}, Lr0/k/i;-><init>(Lrx/functions/Func7;)V
+    invoke-direct {p1, p7}, Ls0/k/i;-><init>(Lrx/functions/Func7;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -718,9 +718,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/h;
+    new-instance p1, Ls0/k/h;
 
-    invoke-direct {p1, p6}, Lr0/k/h;-><init>(Lrx/functions/Func6;)V
+    invoke-direct {p1, p6}, Ls0/k/h;-><init>(Lrx/functions/Func6;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -763,19 +763,19 @@
 
     aput-object p1, v0, p0
 
-    new-instance p0, Lr0/l/e/j;
+    new-instance p0, Ls0/l/e/j;
 
-    invoke-direct {p0, v0}, Lr0/l/e/j;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
 
-    new-instance p1, Lr0/l/a/t2;
+    new-instance p1, Ls0/l/a/t2;
 
-    invoke-direct {p1, p2}, Lr0/l/a/t2;-><init>(Lrx/functions/Func2;)V
+    invoke-direct {p1, p2}, Ls0/l/a/t2;-><init>(Lrx/functions/Func2;)V
 
-    new-instance p2, Lr0/l/a/u;
+    new-instance p2, Ls0/l/a/u;
 
     iget-object p0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p2, p0, p1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p2, p0, p1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -846,9 +846,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/g;
+    new-instance p1, Ls0/k/g;
 
-    invoke-direct {p1, p5}, Lr0/k/g;-><init>(Lrx/functions/Func5;)V
+    invoke-direct {p1, p5}, Ls0/k/g;-><init>(Lrx/functions/Func5;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -911,9 +911,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/f;
+    new-instance p1, Ls0/k/f;
 
-    invoke-direct {p1, p4}, Lr0/k/f;-><init>(Lrx/functions/Func4;)V
+    invoke-direct {p1, p4}, Ls0/k/f;-><init>(Lrx/functions/Func4;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -968,9 +968,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/e;
+    new-instance p1, Ls0/k/e;
 
-    invoke-direct {p1, p3}, Lr0/k/e;-><init>(Lrx/functions/Func3;)V
+    invoke-direct {p1, p3}, Ls0/k/e;-><init>(Lrx/functions/Func3;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -1017,9 +1017,9 @@
 
     move-result-object p0
 
-    new-instance p1, Lr0/k/d;
+    new-instance p1, Ls0/k/d;
 
-    invoke-direct {p1, p2}, Lr0/k/d;-><init>(Lrx/functions/Func2;)V
+    invoke-direct {p1, p2}, Ls0/k/d;-><init>(Lrx/functions/Func2;)V
 
     invoke-static {p0, p1}, Lrx/Observable;->b(Ljava/util/List;Lrx/functions/FuncN;)Lrx/Observable;
 
@@ -1044,30 +1044,30 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/l/e/l;->d:Lr0/l/e/l;
+    sget-object v0, Ls0/l/e/l;->d:Ls0/l/e/l;
 
     if-eqz p0, :cond_1
 
-    instance-of v1, p0, Lr0/l/e/j;
+    instance-of v1, p0, Ls0/l/e/j;
 
     if-eqz v1, :cond_0
 
-    check-cast p0, Lr0/l/e/j;
+    check-cast p0, Ls0/l/e/j;
 
-    invoke-virtual {p0, v0}, Lr0/l/e/j;->g0(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, v0}, Ls0/l/e/j;->g0(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p0
 
     goto :goto_0
 
     :cond_0
-    new-instance v1, Lr0/l/a/k;
+    new-instance v1, Ls0/l/a/k;
 
     const/4 v2, 0x2
 
     const/4 v3, 0x0
 
-    invoke-direct {v1, p0, v0, v2, v3}, Lr0/l/a/k;-><init>(Lrx/Observable;Lr0/k/b;II)V
+    invoke-direct {v1, p0, v0, v2, v3}, Ls0/l/a/k;-><init>(Lrx/Observable;Ls0/k/b;II)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1138,9 +1138,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/l;
+    new-instance v0, Ls0/l/a/l;
 
-    invoke-direct {v0, p0, p1}, Lr0/l/a/l;-><init>(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)V
+    invoke-direct {v0, p0, p1}, Ls0/l/a/l;-><init>(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1163,9 +1163,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/i0;
+    new-instance v0, Ls0/l/a/i0;
 
-    invoke-direct {v0, p0}, Lr0/l/a/i0;-><init>(Ljava/lang/Throwable;)V
+    invoke-direct {v0, p0}, Ls0/l/a/i0;-><init>(Ljava/lang/Throwable;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1188,9 +1188,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/t;
+    new-instance v0, Ls0/l/a/t;
 
-    invoke-direct {v0, p0}, Lr0/l/a/t;-><init>(Ljava/lang/Iterable;)V
+    invoke-direct {v0, p0}, Ls0/l/a/t;-><init>(Ljava/lang/Iterable;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1215,11 +1215,11 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/u;
+    new-instance v0, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v0, v1, p1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v0, v1, p1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1228,23 +1228,23 @@
     return-object p1
 .end method
 
-.method public final E(Lr0/k/b;)Lrx/Observable;
+.method public final E(Ls0/k/b;)Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
             "Ljava/lang/Object;",
             ">(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;+TR;>;)",
             "Lrx/Observable<",
             "TR;>;"
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/v;
+    new-instance v0, Ls0/l/a/v;
 
-    invoke-direct {v0, p0, p1}, Lr0/l/a/v;-><init>(Lrx/Observable;Lr0/k/b;)V
+    invoke-direct {v0, p0, p1}, Ls0/l/a/v;-><init>(Lrx/Observable;Ls0/k/b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1265,34 +1265,34 @@
         }
     .end annotation
 
-    sget v0, Lr0/l/e/h;->f:I
+    sget v0, Ls0/l/e/h;->f:I
 
-    instance-of v1, p0, Lr0/l/e/j;
+    instance-of v1, p0, Ls0/l/e/j;
 
     if-eqz v1, :cond_0
 
     move-object v0, p0
 
-    check-cast v0, Lr0/l/e/j;
+    check-cast v0, Ls0/l/e/j;
 
-    invoke-virtual {v0, p1}, Lr0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
+    invoke-virtual {v0, p1}, Ls0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    new-instance v1, Lr0/l/a/c1;
+    new-instance v1, Ls0/l/a/c1;
 
     const/4 v2, 0x0
 
-    invoke-direct {v1, p1, v2, v0}, Lr0/l/a/c1;-><init>(Lrx/Scheduler;ZI)V
+    invoke-direct {v1, p1, v2, v0}, Ls0/l/a/c1;-><init>(Lrx/Scheduler;ZI)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v0, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1312,7 +1312,7 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/l/a/d1$b;->a:Lr0/l/a/d1;
+    sget-object v0, Ls0/l/a/d1$b;->a:Ls0/l/a/d1;
 
     invoke-virtual {p0, v0}, Lrx/Observable;->D(Lrx/Observable$b;)Lrx/Observable;
 
@@ -1331,13 +1331,13 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/l/a/e1$a;->a:Lr0/l/a/e1;
+    sget-object v0, Ls0/l/a/e1$a;->a:Ls0/l/a/e1;
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object v2, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, v2, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, v2, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1346,12 +1346,12 @@
     return-object v0
 .end method
 
-.method public final K(Lr0/k/b;)Lrx/Observable;
+.method public final K(Ls0/k/b;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-",
             "Ljava/lang/Throwable;",
             "+TT;>;)",
@@ -1360,19 +1360,19 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/i1;
+    new-instance v0, Ls0/l/a/i1;
 
-    new-instance v1, Lr0/l/a/f1;
+    new-instance v1, Ls0/l/a/f1;
 
-    invoke-direct {v1, p1}, Lr0/l/a/f1;-><init>(Lr0/k/b;)V
+    invoke-direct {v1, p1}, Ls0/l/a/f1;-><init>(Ls0/k/b;)V
 
-    invoke-direct {v0, v1}, Lr0/l/a/i1;-><init>(Lr0/k/b;)V
+    invoke-direct {v0, v1}, Ls0/l/a/i1;-><init>(Ls0/k/b;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1381,12 +1381,12 @@
     return-object p1
 .end method
 
-.method public final L(I)Lr0/m/c;
+.method public final L(I)Ls0/m/c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(I)",
-            "Lr0/m/c<",
+            "Ls0/m/c<",
             "TT;>;"
         }
     .end annotation
@@ -1395,38 +1395,38 @@
 
     if-ne p1, v0, :cond_0
 
-    sget-object p1, Lr0/l/a/m1;->h:Lrx/functions/Func0;
+    sget-object p1, Ls0/l/a/m1;->h:Lrx/functions/Func0;
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    new-instance v1, Lr0/l/a/o1;
+    new-instance v1, Ls0/l/a/o1;
 
-    invoke-direct {v1, v0, p1}, Lr0/l/a/o1;-><init>(Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
+    invoke-direct {v1, v0, p1}, Ls0/l/a/o1;-><init>(Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
 
-    new-instance v2, Lr0/l/a/m1;
+    new-instance v2, Ls0/l/a/m1;
 
-    invoke-direct {v2, v1, p0, v0, p1}, Lr0/l/a/m1;-><init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
+    invoke-direct {v2, v1, p0, v0, p1}, Ls0/l/a/m1;-><init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
 
     goto :goto_0
 
     :cond_0
-    new-instance v0, Lr0/l/a/n1;
+    new-instance v0, Ls0/l/a/n1;
 
-    invoke-direct {v0, p1}, Lr0/l/a/n1;-><init>(I)V
+    invoke-direct {v0, p1}, Ls0/l/a/n1;-><init>(I)V
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    new-instance v1, Lr0/l/a/o1;
+    new-instance v1, Ls0/l/a/o1;
 
-    invoke-direct {v1, p1, v0}, Lr0/l/a/o1;-><init>(Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
+    invoke-direct {v1, p1, v0}, Ls0/l/a/o1;-><init>(Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
 
-    new-instance v2, Lr0/l/a/m1;
+    new-instance v2, Ls0/l/a/m1;
 
-    invoke-direct {v2, v1, p0, p1, v0}, Lr0/l/a/m1;-><init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
+    invoke-direct {v2, v1, p0, p1, v0}, Ls0/l/a/m1;-><init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
 
     :goto_0
     return-object v2
@@ -1444,19 +1444,19 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
-    new-instance v1, Lr0/l/a/q1;
+    new-instance v1, Ls0/l/a/q1;
 
-    invoke-direct {v1, p1, p2, p3, v0}, Lr0/l/a/q1;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    invoke-direct {v1, p1, p2, p3, v0}, Ls0/l/a/q1;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object p2, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, p2, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, p2, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1479,17 +1479,17 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    new-instance v1, Lr0/l/a/j1;
+    new-instance v1, Ls0/l/a/j1;
 
-    invoke-direct {v1, v0}, Lr0/l/a/j1;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
+    invoke-direct {v1, v0}, Ls0/l/a/j1;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
 
-    new-instance v2, Lr0/l/a/k1;
+    new-instance v2, Ls0/l/a/k1;
 
-    invoke-direct {v2, v1, p0, v0}, Lr0/l/a/k1;-><init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;)V
+    invoke-direct {v2, v1, p0, v0}, Ls0/l/a/k1;-><init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;)V
 
-    new-instance v0, Lr0/l/a/f0;
+    new-instance v0, Ls0/l/a/f0;
 
-    invoke-direct {v0, v2}, Lr0/l/a/f0;-><init>(Lr0/m/c;)V
+    invoke-direct {v0, v2}, Ls0/l/a/f0;-><init>(Ls0/m/c;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1508,15 +1508,15 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/w1;
+    new-instance v0, Ls0/l/a/w1;
 
-    invoke-direct {v0, p1}, Lr0/l/a/w1;-><init>(I)V
+    invoke-direct {v0, p1}, Ls0/l/a/w1;-><init>(I)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1539,25 +1539,25 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/r2;
+    new-instance v0, Ls0/l/a/r2;
 
     const/16 v1, 0xa
 
-    invoke-direct {v0, p1, v1}, Lr0/l/a/r2;-><init>(Lrx/functions/Func2;I)V
+    invoke-direct {v0, p1, v1}, Ls0/l/a/r2;-><init>(Lrx/functions/Func2;I)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
     move-result-object p1
 
-    sget-object v0, Lr0/l/e/l;->d:Lr0/l/e/l;
+    sget-object v0, Ls0/l/e/l;->d:Ls0/l/e/l;
 
-    invoke-virtual {p1, v0}, Lrx/Observable;->y(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/Observable;->y(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -1583,13 +1583,13 @@
 
     invoke-virtual {p1}, Lrx/Subscriber;->onStart()V
 
-    instance-of v0, p1, Lr0/n/b;
+    instance-of v0, p1, Ls0/n/b;
 
     if-nez v0, :cond_0
 
-    new-instance v0, Lr0/n/b;
+    new-instance v0, Ls0/n/b;
 
-    invoke-direct {v0, p1}, Lr0/n/b;-><init>(Lrx/Subscriber;)V
+    invoke-direct {v0, p1}, Ls0/n/b;-><init>(Lrx/Subscriber;)V
 
     move-object p1, v0
 
@@ -1597,7 +1597,7 @@
     :try_start_0
     iget-object v0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    sget-object v1, Lr0/o/l;->e:Lrx/functions/Func2;
+    sget-object v1, Ls0/o/l;->e:Lrx/functions/Func2;
 
     if-eqz v1, :cond_1
 
@@ -1610,11 +1610,11 @@
     :cond_1
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object v0, Lr0/o/l;->g:Lr0/k/b;
+    sget-object v0, Ls0/o/l;->g:Ls0/k/b;
 
     if-eqz v0, :cond_3
 
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1629,7 +1629,7 @@
     :catchall_0
     move-exception v0
 
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
 
     invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -1637,26 +1637,26 @@
 
     if-eqz v1, :cond_2
 
-    invoke-static {v0}, Lr0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {v0}, Ls0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     move-result-object p1
 
-    invoke-static {p1}, Lr0/o/l;->b(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
 
     goto :goto_0
 
     :cond_2
     :try_start_1
-    invoke-static {v0}, Lr0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {v0}, Ls0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     move-result-object v1
 
-    invoke-interface {p1, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {p1, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :goto_0
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
 
     :cond_3
     :goto_1
@@ -1665,7 +1665,7 @@
     :catchall_1
     move-exception p1
 
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
 
     new-instance v1, Lrx/exceptions/OnErrorFailedException;
 
@@ -1691,7 +1691,7 @@
 
     invoke-direct {v1, v0, p1}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-static {v1}, Lr0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {v1}, Ls0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     throw v1
 
@@ -1725,13 +1725,13 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/l/e/e;->f:Lrx/functions/Action1;
+    sget-object v0, Ls0/l/e/e;->f:Lrx/functions/Action1;
 
-    sget-object v1, Lr0/k/a;->a:Lr0/k/a$b;
+    sget-object v1, Ls0/k/a;->a:Ls0/k/a$b;
 
-    new-instance v2, Lr0/l/e/b;
+    new-instance v2, Ls0/l/e/b;
 
-    invoke-direct {v2, p1, v0, v1}, Lr0/l/e/b;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    invoke-direct {v2, p1, v0, v1}, Ls0/l/e/b;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
 
     invoke-virtual {p0, v2}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
 
@@ -1758,11 +1758,11 @@
 
     if-eqz p2, :cond_0
 
-    sget-object v0, Lr0/k/a;->a:Lr0/k/a$b;
+    sget-object v0, Ls0/k/a;->a:Ls0/k/a$b;
 
-    new-instance v1, Lr0/l/e/b;
+    new-instance v1, Ls0/l/e/b;
 
-    invoke-direct {v1, p1, p2, v0}, Lr0/l/e/b;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    invoke-direct {v1, p1, p2, v0}, Ls0/l/e/b;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
 
     invoke-virtual {p0, v1}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
 
@@ -1803,28 +1803,28 @@
 
     iget-object v0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    instance-of v0, v0, Lr0/l/a/l;
+    instance-of v0, v0, Ls0/l/a/l;
 
     xor-int/lit8 v0, v0, 0x1
 
-    instance-of v1, p0, Lr0/l/e/j;
+    instance-of v1, p0, Ls0/l/e/j;
 
     if-eqz v1, :cond_0
 
     move-object v0, p0
 
-    check-cast v0, Lr0/l/e/j;
+    check-cast v0, Ls0/l/e/j;
 
-    invoke-virtual {v0, p1}, Lr0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
+    invoke-virtual {v0, p1}, Ls0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    new-instance v1, Lr0/l/a/a2;
+    new-instance v1, Ls0/l/a/a2;
 
-    invoke-direct {v1, p0, p1, v0}, Lr0/l/a/a2;-><init>(Lrx/Observable;Lrx/Scheduler;Z)V
+    invoke-direct {v1, p0, p1, v0}, Ls0/l/a/a2;-><init>(Lrx/Observable;Lrx/Scheduler;Z)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1834,14 +1834,14 @@
     return-object p1
 .end method
 
-.method public final U(Lr0/k/b;)Lrx/Observable;
+.method public final U(Ls0/k/b;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
             "Ljava/lang/Object;",
             ">(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;+",
             "Lrx/Observable<",
             "+TR;>;>;)",
@@ -1850,17 +1850,17 @@
         }
     .end annotation
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
-    sget-object v0, Lr0/l/a/b2$a;->a:Lr0/l/a/b2;
+    sget-object v0, Ls0/l/a/b2$a;->a:Ls0/l/a/b2;
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object p1, p1, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, p1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, p1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1879,15 +1879,15 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/f2;
+    new-instance v0, Ls0/l/a/f2;
 
-    invoke-direct {v0, p1}, Lr0/l/a/f2;-><init>(I)V
+    invoke-direct {v0, p1}, Ls0/l/a/f2;-><init>(I)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1910,15 +1910,15 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/i2;
+    new-instance v0, Ls0/l/a/i2;
 
-    invoke-direct {v0, p1}, Lr0/l/a/i2;-><init>(Lrx/Observable;)V
+    invoke-direct {v0, p1}, Ls0/l/a/i2;-><init>(Lrx/Observable;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1927,12 +1927,12 @@
     return-object p1
 .end method
 
-.method public final X(Lr0/k/b;)Lrx/Observable;
+.method public final X(Ls0/k/b;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;",
             "Ljava/lang/Boolean;",
             ">;)",
@@ -1941,15 +1941,15 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/k2;
+    new-instance v0, Ls0/l/a/k2;
 
-    invoke-direct {v0, p1}, Lr0/l/a/k2;-><init>(Lr0/k/b;)V
+    invoke-direct {v0, p1}, Ls0/l/a/k2;-><init>(Ls0/k/b;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -1970,11 +1970,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v5
 
-    new-instance v7, Lr0/l/a/j0;
+    new-instance v7, Ls0/l/a/j0;
 
     const/4 v6, 0x0
 
@@ -1986,7 +1986,7 @@
 
     move-object v4, p3
 
-    invoke-direct/range {v0 .. v6}, Lr0/l/a/j0;-><init>(Lrx/Observable;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;Lrx/Observable;)V
+    invoke-direct/range {v0 .. v6}, Ls0/l/a/j0;-><init>(Lrx/Observable;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;Lrx/Observable;)V
 
     invoke-static {v7}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2008,11 +2008,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v7
 
-    new-instance v8, Lr0/l/a/q0;
+    new-instance v8, Ls0/l/a/q0;
 
     const v6, 0x7fffffff
 
@@ -2024,13 +2024,13 @@
 
     move-object v5, p3
 
-    invoke-direct/range {v0 .. v7}, Lr0/l/a/q0;-><init>(JJLjava/util/concurrent/TimeUnit;ILrx/Scheduler;)V
+    invoke-direct/range {v0 .. v7}, Ls0/l/a/q0;-><init>(JJLjava/util/concurrent/TimeUnit;ILrx/Scheduler;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object p2, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, p2, v8}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, p2, v8}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2050,13 +2050,13 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/l/a/q2$a;->a:Lr0/l/a/q2;
+    sget-object v0, Ls0/l/a/q2$a;->a:Ls0/l/a/q2;
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object v2, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, v2, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, v2, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2065,7 +2065,7 @@
     return-object v0
 .end method
 
-.method public final c0(Lr0/k/b;Lr0/k/b;)Lrx/Observable;
+.method public final c0(Ls0/k/b;Ls0/k/b;)Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2074,9 +2074,9 @@
             "V:",
             "Ljava/lang/Object;",
             ">(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;+TK;>;",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;+TV;>;)",
             "Lrx/Observable<",
             "Ljava/util/Map<",
@@ -2084,9 +2084,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/o0;
+    new-instance v0, Ls0/l/a/o0;
 
-    invoke-direct {v0, p0, p1, p2}, Lr0/l/a/o0;-><init>(Lrx/Observable;Lr0/k/b;Lr0/k/b;)V
+    invoke-direct {v0, p0, p1, p2}, Ls0/l/a/o0;-><init>(Lrx/Observable;Ls0/k/b;Ls0/k/b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2111,7 +2111,7 @@
 
     iget-object v0, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    sget-object v1, Lr0/o/l;->e:Lrx/functions/Func2;
+    sget-object v1, Ls0/o/l;->e:Lrx/functions/Func2;
 
     if-eqz v1, :cond_0
 
@@ -2124,11 +2124,11 @@
     :cond_0
     invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object v0, Lr0/o/l;->g:Lr0/k/b;
+    sget-object v0, Ls0/o/l;->g:Ls0/k/b;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0, p1}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2144,25 +2144,25 @@
     :catchall_0
     move-exception v0
 
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
 
     :try_start_1
-    invoke-static {v0}, Lr0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {v0}, Ls0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     move-result-object v1
 
-    invoke-interface {p1, v1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {p1, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    sget-object p1, Lr0/r/c;->a:Lr0/r/c$a;
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
 
     return-object p1
 
     :catchall_1
     move-exception p1
 
-    invoke-static {p1}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
 
     new-instance v1, Lrx/exceptions/OnErrorFailedException;
 
@@ -2188,7 +2188,7 @@
 
     invoke-direct {v1, v0, p1}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-static {v1}, Lr0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    invoke-static {v1}, Ls0/o/l;->c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
 
     throw v1
 .end method
@@ -2207,7 +2207,7 @@
         }
     .end annotation
 
-    invoke-interface {p1, p0}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p1, p0}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p1
 
@@ -2228,19 +2228,19 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
-    new-instance v1, Lr0/l/a/t0;
+    new-instance v1, Ls0/l/a/t0;
 
-    invoke-direct {v1, p1, p2, p3, v0}, Lr0/l/a/t0;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    invoke-direct {v1, p1, p2, p3, v0}, Ls0/l/a/t0;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object p2, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, p2, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, p2, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2261,19 +2261,19 @@
         }
     .end annotation
 
-    invoke-static {}, Lr0/p/a;->a()Lrx/Scheduler;
+    invoke-static {}, Ls0/p/a;->a()Lrx/Scheduler;
 
     move-result-object v0
 
-    new-instance v1, Lr0/l/a/v0;
+    new-instance v1, Ls0/l/a/v0;
 
-    invoke-direct {v1, p1, p2, p3, v0}, Lr0/l/a/v0;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    invoke-direct {v1, p1, p2, p3, v0}, Ls0/l/a/v0;-><init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object p2, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, p2, v1}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, p2, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2292,13 +2292,13 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/l/a/x0$a;->a:Lr0/l/a/x0;
+    sget-object v0, Ls0/l/a/x0$a;->a:Ls0/l/a/x0;
 
-    new-instance v1, Lr0/l/a/u;
+    new-instance v1, Ls0/l/a/u;
 
     iget-object v2, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {v1, v2, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {v1, v2, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2321,15 +2321,15 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/x0;
+    new-instance v0, Ls0/l/a/x0;
 
-    invoke-direct {v0, p1}, Lr0/l/a/x0;-><init>(Lrx/functions/Func2;)V
+    invoke-direct {v0, p1}, Ls0/l/a/x0;-><init>(Lrx/functions/Func2;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2352,15 +2352,15 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/k/a;->a:Lr0/k/a$b;
+    sget-object v0, Ls0/k/a;->a:Ls0/k/a$b;
 
-    new-instance v1, Lr0/l/e/a;
+    new-instance v1, Ls0/l/e/a;
 
-    invoke-direct {v1, v0, p1, v0}, Lr0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    invoke-direct {v1, v0, p1, v0}, Ls0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
 
-    new-instance p1, Lr0/l/a/n;
+    new-instance p1, Ls0/l/a/n;
 
-    invoke-direct {p1, p0, v1}, Lr0/l/a/n;-><init>(Lrx/Observable;Lr0/g;)V
+    invoke-direct {p1, p0, v1}, Ls0/l/a/n;-><init>(Lrx/Observable;Ls0/g;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2381,15 +2381,15 @@
         }
     .end annotation
 
-    sget-object v0, Lr0/k/a;->a:Lr0/k/a$b;
+    sget-object v0, Ls0/k/a;->a:Ls0/k/a$b;
 
-    new-instance v1, Lr0/l/e/a;
+    new-instance v1, Ls0/l/e/a;
 
-    invoke-direct {v1, p1, v0, v0}, Lr0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    invoke-direct {v1, p1, v0, v0}, Ls0/l/e/a;-><init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
 
-    new-instance p1, Lr0/l/a/n;
+    new-instance p1, Ls0/l/a/n;
 
-    invoke-direct {p1, p0, v1}, Lr0/l/a/n;-><init>(Lrx/Observable;Lr0/g;)V
+    invoke-direct {p1, p0, v1}, Ls0/l/a/n;-><init>(Lrx/Observable;Ls0/g;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2410,15 +2410,15 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/z0;
+    new-instance v0, Ls0/l/a/z0;
 
-    invoke-direct {v0, p1}, Lr0/l/a/z0;-><init>(Lrx/functions/Action0;)V
+    invoke-direct {v0, p1}, Ls0/l/a/z0;-><init>(Lrx/functions/Action0;)V
 
-    new-instance p1, Lr0/l/a/u;
+    new-instance p1, Ls0/l/a/u;
 
     iget-object v1, p0, Lrx/Observable;->d:Lrx/Observable$a;
 
-    invoke-direct {p1, v1, v0}, Lr0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    invoke-direct {p1, v1, v0}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
     invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2427,12 +2427,12 @@
     return-object p1
 .end method
 
-.method public final w(Lr0/k/b;)Lrx/Observable;
+.method public final w(Ls0/k/b;)Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;",
             "Ljava/lang/Boolean;",
             ">;)",
@@ -2441,9 +2441,9 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/o;
+    new-instance v0, Ls0/l/a/o;
 
-    invoke-direct {v0, p0, p1}, Lr0/l/a/o;-><init>(Lrx/Observable;Lr0/k/b;)V
+    invoke-direct {v0, p0, p1}, Ls0/l/a/o;-><init>(Lrx/Observable;Ls0/k/b;)V
 
     invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2452,14 +2452,14 @@
     return-object p1
 .end method
 
-.method public final x(Lr0/k/b;)Lrx/Observable;
+.method public final x(Ls0/k/b;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
             "Ljava/lang/Object;",
             ">(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;+",
             "Lrx/Observable<",
             "+TR;>;>;)",
@@ -2472,22 +2472,22 @@
 
     move-result-object v0
 
-    const-class v1, Lr0/l/e/j;
+    const-class v1, Ls0/l/e/j;
 
     if-ne v0, v1, :cond_0
 
     move-object v0, p0
 
-    check-cast v0, Lr0/l/e/j;
+    check-cast v0, Ls0/l/e/j;
 
-    invoke-virtual {v0, p1}, Lr0/l/e/j;->g0(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {v0, p1}, Ls0/l/e/j;->g0(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    invoke-virtual {p0, p1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -2498,14 +2498,14 @@
     return-object p1
 .end method
 
-.method public final y(Lr0/k/b;)Lrx/Observable;
+.method public final y(Ls0/k/b;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<R:",
             "Ljava/lang/Object;",
             ">(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;+",
             "Ljava/lang/Iterable<",
             "+TR;>;>;)",
@@ -2514,21 +2514,21 @@
         }
     .end annotation
 
-    sget v0, Lr0/l/e/h;->f:I
+    sget v0, Ls0/l/e/h;->f:I
 
-    instance-of v1, p0, Lr0/l/e/j;
+    instance-of v1, p0, Ls0/l/e/j;
 
     if-eqz v1, :cond_0
 
     move-object v0, p0
 
-    check-cast v0, Lr0/l/e/j;
+    check-cast v0, Ls0/l/e/j;
 
-    iget-object v0, v0, Lr0/l/e/j;->e:Ljava/lang/Object;
+    iget-object v0, v0, Ls0/l/e/j;->e:Ljava/lang/Object;
 
-    new-instance v1, Lr0/l/a/q$b;
+    new-instance v1, Ls0/l/a/q$b;
 
-    invoke-direct {v1, v0, p1}, Lr0/l/a/q$b;-><init>(Ljava/lang/Object;Lr0/k/b;)V
+    invoke-direct {v1, v0, p1}, Ls0/l/a/q$b;-><init>(Ljava/lang/Object;Ls0/k/b;)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
@@ -2537,9 +2537,9 @@
     goto :goto_0
 
     :cond_0
-    new-instance v1, Lr0/l/a/q;
+    new-instance v1, Ls0/l/a/q;
 
-    invoke-direct {v1, p0, p1, v0}, Lr0/l/a/q;-><init>(Lrx/Observable;Lr0/k/b;I)V
+    invoke-direct {v1, p0, p1, v0}, Ls0/l/a/q;-><init>(Lrx/Observable;Ls0/k/b;I)V
 
     invoke-static {v1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/rx/Scheduler$Worker.smali b/com.discord/smali_classes2/rx/Scheduler$Worker.smali
index 55b3e93512..29d898c84a 100644
--- a/com.discord/smali_classes2/rx/Scheduler$Worker.smali
+++ b/com.discord/smali_classes2/rx/Scheduler$Worker.smali
@@ -49,7 +49,7 @@
 
     move-object v6, p6
 
-    invoke-static/range {v0 .. v7}, Lr0/l/c/h;->a(Lrx/Scheduler$Worker;Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;Lr0/l/c/h$b;)Lrx/Subscription;
+    invoke-static/range {v0 .. v7}, Ls0/l/c/h;->a(Lrx/Scheduler$Worker;Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;Ls0/l/c/h$b;)Lrx/Subscription;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/rx/Subscriber.smali b/com.discord/smali_classes2/rx/Subscriber.smali
index a597372ff5..22780cb53e 100644
--- a/com.discord/smali_classes2/rx/Subscriber.smali
+++ b/com.discord/smali_classes2/rx/Subscriber.smali
@@ -3,7 +3,7 @@
 .source "Subscriber.java"
 
 # interfaces
-.implements Lr0/g;
+.implements Ls0/g;
 .implements Lrx/Subscription;
 
 
@@ -14,7 +14,7 @@
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lr0/g<",
+        "Ls0/g<",
         "TT;>;",
         "Lrx/Subscription;"
     }
diff --git a/com.discord/smali_classes2/rx/exceptions/OnErrorThrowable$OnNextValue.smali b/com.discord/smali_classes2/rx/exceptions/OnErrorThrowable$OnNextValue.smali
index 5a0af4aa88..f117c4e72e 100644
--- a/com.discord/smali_classes2/rx/exceptions/OnErrorThrowable$OnNextValue.smali
+++ b/com.discord/smali_classes2/rx/exceptions/OnErrorThrowable$OnNextValue.smali
@@ -90,9 +90,9 @@
     goto :goto_0
 
     :cond_3
-    sget-object v1, Lr0/o/o;->f:Lr0/o/o;
+    sget-object v1, Ls0/o/o;->f:Ls0/o/o;
 
-    invoke-virtual {v1}, Lr0/o/o;->b()Lr0/o/b;
+    invoke-virtual {v1}, Ls0/o/o;->b()Ls0/o/b;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali b/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
index 99f554a7fe..f15869d26f 100644
--- a/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
+++ b/com.discord/smali_classes2/rx/internal/util/SubscriptionList.smali
@@ -211,7 +211,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-static {v1}, Lf/n/a/k/a;->f0(Ljava/util/List;)V
+    invoke-static {v1}, Lf/n/a/k/a;->a0(Ljava/util/List;)V
 
     goto :goto_1
 
diff --git a/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali b/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
index b268e01de0..0750532275 100644
--- a/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
+++ b/com.discord/smali_classes2/rx/observers/SerializedSubscriber.smali
@@ -16,10 +16,10 @@
 
 
 # instance fields
-.field public final d:Lr0/g;
+.field public final d:Ls0/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/g<",
+            "Ls0/g<",
             "TT;>;"
         }
     .end annotation
@@ -41,11 +41,11 @@
 
     invoke-direct {p0, p1, v0}, Lrx/Subscriber;-><init>(Lrx/Subscriber;Z)V
 
-    new-instance v0, Lr0/n/c;
+    new-instance v0, Ls0/n/c;
 
-    invoke-direct {v0, p1}, Lr0/n/c;-><init>(Lr0/g;)V
+    invoke-direct {v0, p1}, Ls0/n/c;-><init>(Ls0/g;)V
 
-    iput-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Lr0/g;
+    iput-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Ls0/g;
 
     return-void
 .end method
@@ -62,11 +62,11 @@
 
     invoke-direct {p0, p1, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;Z)V
 
-    new-instance p2, Lr0/n/c;
+    new-instance p2, Ls0/n/c;
 
-    invoke-direct {p2, p1}, Lr0/n/c;-><init>(Lr0/g;)V
+    invoke-direct {p2, p1}, Ls0/n/c;-><init>(Ls0/g;)V
 
-    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->d:Lr0/g;
+    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->d:Ls0/g;
 
     return-void
 .end method
@@ -76,9 +76,9 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Lr0/g;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Ls0/g;
 
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     return-void
 .end method
@@ -86,9 +86,9 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Lr0/g;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Ls0/g;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     return-void
 .end method
@@ -101,9 +101,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Lr0/g;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->d:Ls0/g;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/subjects/BehaviorSubject$a.smali b/com.discord/smali_classes2/rx/subjects/BehaviorSubject$a.smali
index b47e783de9..0e3f99ee4d 100644
--- a/com.discord/smali_classes2/rx/subjects/BehaviorSubject$a.smali
+++ b/com.discord/smali_classes2/rx/subjects/BehaviorSubject$a.smali
@@ -20,21 +20,21 @@
     value = {
         "Ljava/lang/Object;",
         "Lrx/functions/Action1<",
-        "Lr0/q/c$b<",
+        "Ls0/q/c$b<",
         "TT;>;>;"
     }
 .end annotation
 
 
 # instance fields
-.field public final synthetic d:Lr0/q/c;
+.field public final synthetic d:Ls0/q/c;
 
 
 # direct methods
-.method public constructor <init>(Lr0/q/c;)V
+.method public constructor <init>(Ls0/q/c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/BehaviorSubject$a;->d:Lr0/q/c;
+    iput-object p1, p0, Lrx/subjects/BehaviorSubject$a;->d:Ls0/q/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,20 +46,20 @@
 .method public call(Ljava/lang/Object;)V
     .locals 8
 
-    check-cast p1, Lr0/q/c$b;
+    check-cast p1, Ls0/q/c$b;
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject$a;->d:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject$a;->d:Ls0/q/c;
 
-    iget-object v0, v0, Lr0/q/c;->latest:Ljava/lang/Object;
+    iget-object v0, v0, Ls0/q/c;->latest:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_0
-    iget-boolean v1, p1, Lr0/q/c$b;->e:Z
+    iget-boolean v1, p1, Ls0/q/c$b;->e:Z
 
     if-eqz v1, :cond_7
 
-    iget-boolean v1, p1, Lr0/q/c$b;->f:Z
+    iget-boolean v1, p1, Ls0/q/c$b;->f:Z
 
     if-eqz v1, :cond_0
 
@@ -68,7 +68,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-boolean v1, p1, Lr0/q/c$b;->e:Z
+    iput-boolean v1, p1, Ls0/q/c$b;->e:Z
 
     const/4 v2, 0x1
 
@@ -82,7 +82,7 @@
     const/4 v3, 0x0
 
     :goto_0
-    iput-boolean v3, p1, Lr0/q/c$b;->f:Z
+    iput-boolean v3, p1, Ls0/q/c$b;->f:Z
 
     monitor-exit p1
     :try_end_0
@@ -118,9 +118,9 @@
 
     if-eqz v6, :cond_2
 
-    iget-object v7, p1, Lr0/q/c$b;->d:Lrx/Subscriber;
+    iget-object v7, p1, Ls0/q/c$b;->d:Lrx/Subscriber;
 
-    invoke-static {v7, v6}, Lr0/l/a/h;->a(Lr0/g;Ljava/lang/Object;)Z
+    invoke-static {v7, v6}, Ls0/l/a/h;->a(Ls0/g;Ljava/lang/Object;)Z
 
     goto :goto_2
 
@@ -132,9 +132,9 @@
     :cond_3
     if-eqz v5, :cond_4
 
-    iget-object v4, p1, Lr0/q/c$b;->d:Lrx/Subscriber;
+    iget-object v4, p1, Ls0/q/c$b;->d:Lrx/Subscriber;
 
-    invoke-static {v4, v0}, Lr0/l/a/h;->a(Lr0/g;Ljava/lang/Object;)Z
+    invoke-static {v4, v0}, Ls0/l/a/h;->a(Ls0/g;Ljava/lang/Object;)Z
 
     const/4 v5, 0x0
 
@@ -144,13 +144,13 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    iget-object v4, p1, Lr0/q/c$b;->g:Ljava/util/List;
+    iget-object v4, p1, Ls0/q/c$b;->g:Ljava/util/List;
 
-    iput-object v3, p1, Lr0/q/c$b;->g:Ljava/util/List;
+    iput-object v3, p1, Ls0/q/c$b;->g:Ljava/util/List;
 
     if-nez v4, :cond_5
 
-    iput-boolean v1, p1, Lr0/q/c$b;->f:Z
+    iput-boolean v1, p1, Ls0/q/c$b;->f:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -204,7 +204,7 @@
     monitor-enter p1
 
     :try_start_7
-    iput-boolean v1, p1, Lr0/q/c$b;->f:Z
+    iput-boolean v1, p1, Ls0/q/c$b;->f:Z
 
     monitor-exit p1
 
diff --git a/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali b/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
index 6f8dad49ef..3b8e16d117 100644
--- a/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/BehaviorSubject.smali
@@ -20,10 +20,10 @@
 
 
 # instance fields
-.field public final e:Lr0/q/c;
+.field public final e:Ls0/q/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/q/c<",
+            "Ls0/q/c<",
             "TT;>;"
         }
     .end annotation
@@ -43,21 +43,21 @@
     return-void
 .end method
 
-.method public constructor <init>(Lrx/Observable$a;Lr0/q/c;)V
+.method public constructor <init>(Lrx/Observable$a;Ls0/q/c;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lrx/Observable$a<",
             "TT;>;",
-            "Lr0/q/c<",
+            "Ls0/q/c<",
             "TT;>;)V"
         }
     .end annotation
 
     invoke-direct {p0, p1}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
     return-void
 .end method
@@ -118,31 +118,31 @@
         }
     .end annotation
 
-    new-instance v0, Lr0/q/c;
+    new-instance v0, Ls0/q/c;
 
-    invoke-direct {v0}, Lr0/q/c;-><init>()V
+    invoke-direct {v0}, Ls0/q/c;-><init>()V
 
     if-eqz p1, :cond_1
 
     if-nez p0, :cond_0
 
-    sget-object p0, Lr0/l/a/h;->b:Ljava/lang/Object;
+    sget-object p0, Ls0/l/a/h;->b:Ljava/lang/Object;
 
     :cond_0
-    iput-object p0, v0, Lr0/q/c;->latest:Ljava/lang/Object;
+    iput-object p0, v0, Ls0/q/c;->latest:Ljava/lang/Object;
 
     :cond_1
     new-instance p0, Lrx/subjects/BehaviorSubject$a;
 
-    invoke-direct {p0, v0}, Lrx/subjects/BehaviorSubject$a;-><init>(Lr0/q/c;)V
+    invoke-direct {p0, v0}, Lrx/subjects/BehaviorSubject$a;-><init>(Ls0/q/c;)V
 
-    iput-object p0, v0, Lr0/q/c;->onAdded:Lrx/functions/Action1;
+    iput-object p0, v0, Ls0/q/c;->onAdded:Lrx/functions/Action1;
 
-    iput-object p0, v0, Lr0/q/c;->onTerminated:Lrx/functions/Action1;
+    iput-object p0, v0, Ls0/q/c;->onTerminated:Lrx/functions/Action1;
 
     new-instance p0, Lrx/subjects/BehaviorSubject;
 
-    invoke-direct {p0, v0, v0}, Lrx/subjects/BehaviorSubject;-><init>(Lrx/Observable$a;Lr0/q/c;)V
+    invoke-direct {p0, v0, v0}, Lrx/subjects/BehaviorSubject;-><init>(Lrx/Observable$a;Ls0/q/c;)V
 
     return-object p0
 .end method
@@ -157,17 +157,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iget-object v0, v0, Lr0/q/c;->latest:Ljava/lang/Object;
+    iget-object v0, v0, Ls0/q/c;->latest:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    instance-of v1, v0, Lr0/l/a/h$c;
+    instance-of v1, v0, Ls0/l/a/h$c;
 
     if-nez v1, :cond_0
 
-    invoke-static {v0}, Lr0/l/a/h;->c(Ljava/lang/Object;)Z
+    invoke-static {v0}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
 
     move-result v1
 
@@ -183,7 +183,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    invoke-static {v0}, Lr0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
@@ -198,24 +198,24 @@
 .method public onCompleted()V
     .locals 5
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iget-object v0, v0, Lr0/q/c;->latest:Ljava/lang/Object;
+    iget-object v0, v0, Ls0/q/c;->latest:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iget-boolean v0, v0, Lr0/q/c;->active:Z
+    iget-boolean v0, v0, Ls0/q/c;->active:Z
 
     if-eqz v0, :cond_1
 
     :cond_0
-    sget-object v0, Lr0/l/a/h;->a:Ljava/lang/Object;
+    sget-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    invoke-virtual {v1, v0}, Lr0/q/c;->b(Ljava/lang/Object;)[Lr0/q/c$b;
+    invoke-virtual {v1, v0}, Ls0/q/c;->b(Ljava/lang/Object;)[Ls0/q/c$b;
 
     move-result-object v1
 
@@ -228,7 +228,7 @@
 
     aget-object v4, v1, v3
 
-    invoke-virtual {v4, v0}, Lr0/q/c$b;->a(Ljava/lang/Object;)V
+    invoke-virtual {v4, v0}, Ls0/q/c$b;->a(Ljava/lang/Object;)V
 
     add-int/lit8 v3, v3, 0x1
 
@@ -241,28 +241,28 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iget-object v0, v0, Lr0/q/c;->latest:Ljava/lang/Object;
+    iget-object v0, v0, Ls0/q/c;->latest:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iget-boolean v0, v0, Lr0/q/c;->active:Z
+    iget-boolean v0, v0, Ls0/q/c;->active:Z
 
     if-eqz v0, :cond_3
 
     :cond_0
-    new-instance v0, Lr0/l/a/h$c;
+    new-instance v0, Ls0/l/a/h$c;
 
-    invoke-direct {v0, p1}, Lr0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
+    invoke-direct {v0, p1}, Ls0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
 
     const/4 p1, 0x0
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    invoke-virtual {v1, v0}, Lr0/q/c;->b(Ljava/lang/Object;)[Lr0/q/c$b;
+    invoke-virtual {v1, v0}, Ls0/q/c;->b(Ljava/lang/Object;)[Ls0/q/c$b;
 
     move-result-object v1
 
@@ -276,7 +276,7 @@
     aget-object v4, v1, v3
 
     :try_start_0
-    invoke-virtual {v4, v0}, Lr0/q/c$b;->a(Ljava/lang/Object;)V
+    invoke-virtual {v4, v0}, Ls0/q/c$b;->a(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -300,7 +300,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {p1}, Lf/n/a/k/a;->f0(Ljava/util/List;)V
+    invoke-static {p1}, Lf/n/a/k/a;->a0(Ljava/util/List;)V
 
     :cond_3
     return-void
@@ -314,35 +314,35 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iget-object v0, v0, Lr0/q/c;->latest:Ljava/lang/Object;
+    iget-object v0, v0, Ls0/q/c;->latest:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iget-boolean v0, v0, Lr0/q/c;->active:Z
+    iget-boolean v0, v0, Ls0/q/c;->active:Z
 
     if-eqz v0, :cond_2
 
     :cond_0
     if-nez p1, :cond_1
 
-    sget-object p1, Lr0/l/a/h;->b:Ljava/lang/Object;
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Lr0/q/c;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->e:Ls0/q/c;
 
-    iput-object p1, v0, Lr0/q/c;->latest:Ljava/lang/Object;
+    iput-object p1, v0, Ls0/q/c;->latest:Ljava/lang/Object;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
     move-result-object v0
 
-    check-cast v0, Lr0/q/c$a;
+    check-cast v0, Ls0/q/c$a;
 
-    iget-object v0, v0, Lr0/q/c$a;->b:[Lr0/q/c$b;
+    iget-object v0, v0, Ls0/q/c$a;->b:[Ls0/q/c$b;
 
     array-length v1, v0
 
@@ -353,7 +353,7 @@
 
     aget-object v3, v0, v2
 
-    invoke-virtual {v3, p1}, Lr0/q/c$b;->a(Ljava/lang/Object;)V
+    invoke-virtual {v3, p1}, Ls0/q/c$b;->a(Ljava/lang/Object;)V
 
     add-int/lit8 v2, v2, 0x1
 
diff --git a/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali b/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali
index 0b879f34ca..9f1a9920b4 100644
--- a/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali
+++ b/com.discord/smali_classes2/rx/subjects/PublishSubject$a.smali
@@ -5,7 +5,7 @@
 # interfaces
 .implements Lrx/Producer;
 .implements Lrx/Subscription;
-.implements Lr0/g;
+.implements Ls0/g;
 
 
 # annotations
@@ -26,7 +26,7 @@
         "Ljava/util/concurrent/atomic/AtomicLong;",
         "Lrx/Producer;",
         "Lrx/Subscription;",
-        "Lr0/g<",
+        "Ls0/g<",
         "TT;>;"
     }
 .end annotation
@@ -109,7 +109,7 @@
 .method public m(J)V
     .locals 5
 
-    invoke-static {p1, p2}, Lf/n/a/k/a;->n0(J)Z
+    invoke-static {p1, p2}, Lf/n/a/k/a;->i0(J)Z
 
     move-result v0
 
@@ -158,7 +158,7 @@
 
     iget-object v0, p0, Lrx/subjects/PublishSubject$a;->actual:Lrx/Subscriber;
 
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     :cond_0
     return-void
@@ -179,7 +179,7 @@
 
     iget-object v0, p0, Lrx/subjects/PublishSubject$a;->actual:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     :cond_0
     return-void
@@ -217,7 +217,7 @@
 
     iget-object v0, p0, Lrx/subjects/PublishSubject$a;->actual:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     goto :goto_0
 
@@ -232,7 +232,7 @@
 
     invoke-direct {v0, v1}, Lrx/exceptions/MissingBackpressureException;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     :cond_1
     :goto_0
diff --git a/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali b/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
index efe326fce3..3a5329ee4b 100644
--- a/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
+++ b/com.discord/smali_classes2/rx/subjects/PublishSubject$b.smali
@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Lrx/Observable$a;
-.implements Lr0/g;
+.implements Ls0/g;
 
 
 # annotations
@@ -28,7 +28,7 @@
         "TT;>;>;",
         "Lrx/Observable$a<",
         "TT;>;",
-        "Lr0/g<",
+        "Ls0/g<",
         "TT;>;"
     }
 .end annotation
@@ -236,12 +236,12 @@
 
     if-eqz v0, :cond_3
 
-    invoke-interface {p1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     goto :goto_1
 
     :cond_3
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     :cond_4
     :goto_1
@@ -329,7 +329,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {v2}, Lf/n/a/k/a;->f0(Ljava/util/List;)V
+    invoke-static {v2}, Lf/n/a/k/a;->a0(Ljava/util/List;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali b/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
index a980908598..cf45912f74 100644
--- a/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
+++ b/com.discord/smali_classes2/rx/subjects/SerializedSubject.smali
@@ -18,10 +18,10 @@
 
 
 # instance fields
-.field public final e:Lr0/n/c;
+.field public final e:Ls0/n/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/n/c<",
+            "Ls0/n/c<",
             "TT;>;"
         }
     .end annotation
@@ -45,11 +45,11 @@
 
     invoke-direct {p0, v0}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
 
-    new-instance v0, Lr0/n/c;
+    new-instance v0, Ls0/n/c;
 
-    invoke-direct {v0, p1}, Lr0/n/c;-><init>(Lr0/g;)V
+    invoke-direct {v0, p1}, Ls0/n/c;-><init>(Ls0/g;)V
 
-    iput-object v0, p0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iput-object v0, p0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
     return-void
 .end method
@@ -59,9 +59,9 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0}, Lr0/n/c;->onCompleted()V
+    invoke-virtual {v0}, Ls0/n/c;->onCompleted()V
 
     return-void
 .end method
@@ -69,9 +69,9 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onError(Ljava/lang/Throwable;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onError(Ljava/lang/Throwable;)V
 
     return-void
 .end method
@@ -84,9 +84,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->e:Ls0/n/c;
 
-    invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, p1}, Ls0/n/c;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/subjects/Subject.smali b/com.discord/smali_classes2/rx/subjects/Subject.smali
index 4ddf6a2b82..8e9cd6aaf3 100644
--- a/com.discord/smali_classes2/rx/subjects/Subject.smali
+++ b/com.discord/smali_classes2/rx/subjects/Subject.smali
@@ -3,7 +3,7 @@
 .source "Subject.java"
 
 # interfaces
-.implements Lr0/g;
+.implements Ls0/g;
 
 
 # annotations
@@ -16,7 +16,7 @@
         ">",
         "Lrx/Observable<",
         "TR;>;",
-        "Lr0/g<",
+        "Ls0/g<",
         "TT;>;"
     }
 .end annotation
diff --git a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
index ec324289d1..79f99b2a7b 100644
--- a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali
@@ -86,7 +86,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {v0}, Lf/n/a/k/a;->f0(Ljava/util/List;)V
+    invoke-static {v0}, Lf/n/a/k/a;->a0(Ljava/util/List;)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali b/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali
index 56724516bb..878de4b8ef 100644
--- a/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali
+++ b/com.discord/smali_classes2/rx/subscriptions/SerialSubscription.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field public final d:Lr0/l/d/a;
+.field public final d:Ls0/l/d/a;
 
 
 # direct methods
@@ -16,11 +16,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    new-instance v0, Lr0/l/d/a;
+    new-instance v0, Ls0/l/d/a;
 
-    invoke-direct {v0}, Lr0/l/d/a;-><init>()V
+    invoke-direct {v0}, Ls0/l/d/a;-><init>()V
 
-    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Lr0/l/d/a;
+    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Ls0/l/d/a;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Lr0/l/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Ls0/l/d/a;
 
     :cond_0
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
@@ -41,7 +41,7 @@
 
     check-cast v1, Lrx/Subscription;
 
-    sget-object v2, Lr0/l/d/b;->d:Lr0/l/d/b;
+    sget-object v2, Ls0/l/d/b;->d:Ls0/l/d/b;
 
     if-ne v1, v2, :cond_1
 
@@ -77,9 +77,9 @@
 .method public isUnsubscribed()Z
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Lr0/l/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Ls0/l/d/a;
 
-    invoke-virtual {v0}, Lr0/l/d/a;->isUnsubscribed()Z
+    invoke-virtual {v0}, Ls0/l/d/a;->isUnsubscribed()Z
 
     move-result v0
 
@@ -89,9 +89,9 @@
 .method public unsubscribe()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Lr0/l/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->d:Ls0/l/d/a;
 
-    invoke-virtual {v0}, Lr0/l/d/a;->unsubscribe()V
+    invoke-virtual {v0}, Ls0/l/d/a;->unsubscribe()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/s0/a$a.smali b/com.discord/smali_classes2/s0/a$a.smali
new file mode 100644
index 0000000000..8b3cffda57
--- /dev/null
+++ b/com.discord/smali_classes2/s0/a$a.smali
@@ -0,0 +1,62 @@
+.class public final Ls0/a$a;
+.super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
+
+# interfaces
+.implements Ls0/a$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/a$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/a$a;
+
+    invoke-direct {v0}, Ls0/a$a;-><init>()V
+
+    sput-object v0, Ls0/a$a;->a:Ls0/a$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lrx/exceptions/MissingBackpressureException;
+        }
+    .end annotation
+
+    new-instance v0, Lrx/exceptions/MissingBackpressureException;
+
+    const-string v1, "Overflowed buffer"
+
+    invoke-direct {v0, v1}, Lrx/exceptions/MissingBackpressureException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/a$b.smali b/com.discord/smali_classes2/s0/a$b.smali
new file mode 100644
index 0000000000..d945685a0d
--- /dev/null
+++ b/com.discord/smali_classes2/s0/a$b.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Ls0/a$b;
+.super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "b"
+.end annotation
+
+
+# virtual methods
+.method public abstract a()Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lrx/exceptions/MissingBackpressureException;
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/s0/a.smali b/com.discord/smali_classes2/s0/a.smali
new file mode 100644
index 0000000000..62fc17d652
--- /dev/null
+++ b/com.discord/smali_classes2/s0/a.smali
@@ -0,0 +1,32 @@
+.class public final Ls0/a;
+.super Ljava/lang/Object;
+.source "BackpressureOverflow.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/a$a;,
+        Ls0/a$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/a$b;
+
+.field public static final b:Ls0/a$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget-object v0, Ls0/a$a;->a:Ls0/a$a;
+
+    sput-object v0, Ls0/a;->a:Ls0/a$b;
+
+    sput-object v0, Ls0/a;->b:Ls0/a$b;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/b.smali b/com.discord/smali_classes2/s0/b.smali
new file mode 100644
index 0000000000..3173574b64
--- /dev/null
+++ b/com.discord/smali_classes2/s0/b.smali
@@ -0,0 +1,57 @@
+.class public Ls0/b;
+.super Lrx/Subscriber;
+.source "Completable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/e;
+
+
+# direct methods
+.method public constructor <init>(Ls0/c;Ls0/e;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/b;->d:Ls0/e;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/b;->d:Ls0/e;
+
+    invoke-interface {v0}, Ls0/e;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/b;->d:Ls0/e;
+
+    invoke-interface {v0, p1}, Ls0/e;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/c.smali b/com.discord/smali_classes2/s0/c.smali
new file mode 100644
index 0000000000..1fde6faea8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/c.smali
@@ -0,0 +1,42 @@
+.class public final Ls0/c;
+.super Ljava/lang/Object;
+.source "Completable.java"
+
+# interfaces
+.implements Ls0/d$a;
+
+
+# instance fields
+.field public final synthetic d:Lrx/Observable;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/c;->d:Lrx/Observable;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 1
+
+    check-cast p1, Ls0/e;
+
+    new-instance v0, Ls0/b;
+
+    invoke-direct {v0, p0, p1}, Ls0/b;-><init>(Ls0/c;Ls0/e;)V
+
+    invoke-interface {p1, v0}, Ls0/e;->a(Lrx/Subscription;)V
+
+    iget-object p1, p0, Ls0/c;->d:Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/d$a.smali b/com.discord/smali_classes2/s0/d$a.smali
new file mode 100644
index 0000000000..dd77e9a0d0
--- /dev/null
+++ b/com.discord/smali_classes2/s0/d$a.smali
@@ -0,0 +1,26 @@
+.class public interface abstract Ls0/d$a;
+.super Ljava/lang/Object;
+.source "Completable.java"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ls0/e;",
+        ">;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/s0/d.smali b/com.discord/smali_classes2/s0/d.smali
new file mode 100644
index 0000000000..c72dc85420
--- /dev/null
+++ b/com.discord/smali_classes2/s0/d.smali
@@ -0,0 +1,32 @@
+.class public Ls0/d;
+.super Ljava/lang/Object;
+.source "Completable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/d$a;
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Ls0/d$a;)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Ls0/o/l;->d:Ls0/k/b;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ls0/d$a;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/e.smali b/com.discord/smali_classes2/s0/e.smali
new file mode 100644
index 0000000000..3e99bb0adf
--- /dev/null
+++ b/com.discord/smali_classes2/s0/e.smali
@@ -0,0 +1,14 @@
+.class public interface abstract Ls0/e;
+.super Ljava/lang/Object;
+.source "CompletableSubscriber.java"
+
+
+# virtual methods
+.method public abstract a(Lrx/Subscription;)V
+.end method
+
+.method public abstract onCompleted()V
+.end method
+
+.method public abstract onError(Ljava/lang/Throwable;)V
+.end method
diff --git a/com.discord/smali_classes2/s0/f$a.smali b/com.discord/smali_classes2/s0/f$a.smali
new file mode 100644
index 0000000000..64a4de8628
--- /dev/null
+++ b/com.discord/smali_classes2/s0/f$a.smali
@@ -0,0 +1,127 @@
+.class public final enum Ls0/f$a;
+.super Ljava/lang/Enum;
+.source "Notification.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/f;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/f$a;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ls0/f$a;
+
+.field public static final enum e:Ls0/f$a;
+
+.field public static final enum f:Ls0/f$a;
+
+.field public static final synthetic g:[Ls0/f$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 6
+
+    new-instance v0, Ls0/f$a;
+
+    const-string v1, "OnNext"
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v1, v2}, Ls0/f$a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Ls0/f$a;->d:Ls0/f$a;
+
+    new-instance v0, Ls0/f$a;
+
+    const-string v1, "OnError"
+
+    const/4 v3, 0x1
+
+    invoke-direct {v0, v1, v3}, Ls0/f$a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Ls0/f$a;->e:Ls0/f$a;
+
+    new-instance v0, Ls0/f$a;
+
+    const-string v1, "OnCompleted"
+
+    const/4 v4, 0x2
+
+    invoke-direct {v0, v1, v4}, Ls0/f$a;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Ls0/f$a;->f:Ls0/f$a;
+
+    const/4 v1, 0x3
+
+    new-array v1, v1, [Ls0/f$a;
+
+    sget-object v5, Ls0/f$a;->d:Ls0/f$a;
+
+    aput-object v5, v1, v2
+
+    sget-object v2, Ls0/f$a;->e:Ls0/f$a;
+
+    aput-object v2, v1, v3
+
+    aput-object v0, v1, v4
+
+    sput-object v1, Ls0/f$a;->g:[Ls0/f$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/f$a;
+    .locals 1
+
+    const-class v0, Ls0/f$a;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/f$a;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/f$a;
+    .locals 1
+
+    sget-object v0, Ls0/f$a;->g:[Ls0/f$a;
+
+    invoke-virtual {v0}, [Ls0/f$a;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/f$a;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/f.smali b/com.discord/smali_classes2/s0/f.smali
new file mode 100644
index 0000000000..d68d29f6ab
--- /dev/null
+++ b/com.discord/smali_classes2/s0/f.smali
@@ -0,0 +1,344 @@
+.class public final Ls0/f;
+.super Ljava/lang/Object;
+.source "Notification.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/f$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ls0/f;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/f<",
+            "Ljava/lang/Void;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public final a:Ls0/f$a;
+
+.field public final b:Ljava/lang/Throwable;
+
+.field public final c:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Ls0/f;
+
+    sget-object v1, Ls0/f$a;->f:Ls0/f$a;
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v1, v2, v2}, Ls0/f;-><init>(Ls0/f$a;Ljava/lang/Object;Ljava/lang/Throwable;)V
+
+    sput-object v0, Ls0/f;->d:Ls0/f;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ls0/f$a;Ljava/lang/Object;Ljava/lang/Throwable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/f$a;",
+            "TT;",
+            "Ljava/lang/Throwable;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p2, p0, Ls0/f;->c:Ljava/lang/Object;
+
+    iput-object p3, p0, Ls0/f;->b:Ljava/lang/Throwable;
+
+    iput-object p1, p0, Ls0/f;->a:Ls0/f$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 4
+
+    iget-object v0, p0, Ls0/f;->a:Ls0/f$a;
+
+    sget-object v1, Ls0/f$a;->e:Ls0/f$a;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/f;->b:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_1
+
+    const/4 v2, 0x1
+
+    :cond_1
+    return v2
+.end method
+
+.method public b()Z
+    .locals 4
+
+    iget-object v0, p0, Ls0/f;->a:Ls0/f$a;
+
+    sget-object v1, Ls0/f$a;->d:Ls0/f$a;
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/f;->c:Ljava/lang/Object;
+
+    if-eqz v0, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    return v2
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x0
+
+    if-nez p1, :cond_0
+
+    return v0
+
+    :cond_0
+    const/4 v1, 0x1
+
+    if-ne p0, p1, :cond_1
+
+    return v1
+
+    :cond_1
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v2
+
+    const-class v3, Ls0/f;
+
+    if-eq v2, v3, :cond_2
+
+    return v0
+
+    :cond_2
+    check-cast p1, Ls0/f;
+
+    iget-object v2, p1, Ls0/f;->a:Ls0/f$a;
+
+    iget-object v3, p0, Ls0/f;->a:Ls0/f$a;
+
+    if-ne v2, v3, :cond_5
+
+    iget-object v2, p0, Ls0/f;->c:Ljava/lang/Object;
+
+    iget-object v3, p1, Ls0/f;->c:Ljava/lang/Object;
+
+    if-eq v2, v3, :cond_3
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_5
+
+    :cond_3
+    iget-object v2, p0, Ls0/f;->b:Ljava/lang/Throwable;
+
+    iget-object p1, p1, Ls0/f;->b:Ljava/lang/Throwable;
+
+    if-eq v2, p1, :cond_4
+
+    if-eqz v2, :cond_5
+
+    invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_5
+
+    :cond_4
+    const/4 v0, 0x1
+
+    :cond_5
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    iget-object v0, p0, Ls0/f;->a:Ls0/f$a;
+
+    invoke-virtual {v0}, Ljava/lang/Enum;->hashCode()I
+
+    move-result v0
+
+    invoke-virtual {p0}, Ls0/f;->b()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Ls0/f;->c:Ljava/lang/Object;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    :cond_0
+    invoke-virtual {p0}, Ls0/f;->a()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Ls0/f;->b:Ljava/lang/Throwable;
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    :cond_1
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x40
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const/16 v1, 0x5b
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-super {p0}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const/16 v1, 0x20
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v2, p0, Ls0/f;->a:Ls0/f$a;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ls0/f;->b()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v2, p0, Ls0/f;->c:Ljava/lang/Object;
+
+    invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    :cond_0
+    invoke-virtual {p0}, Ls0/f;->a()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Ls0/f;->b:Ljava/lang/Throwable;
+
+    invoke-virtual {v1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    :cond_1
+    const/16 v1, 0x5d
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/g.smali b/com.discord/smali_classes2/s0/g.smali
new file mode 100644
index 0000000000..0283c0b4db
--- /dev/null
+++ b/com.discord/smali_classes2/s0/g.smali
@@ -0,0 +1,30 @@
+.class public interface abstract Ls0/g;
+.super Ljava/lang/Object;
+.source "Observer.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract onCompleted()V
+.end method
+
+.method public abstract onError(Ljava/lang/Throwable;)V
+.end method
+
+.method public abstract onNext(Ljava/lang/Object;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/s0/h$a.smali b/com.discord/smali_classes2/s0/h$a.smali
new file mode 100644
index 0000000000..4161f31f75
--- /dev/null
+++ b/com.discord/smali_classes2/s0/h$a.smali
@@ -0,0 +1,29 @@
+.class public interface abstract Ls0/h$a;
+.super Ljava/lang/Object;
+.source "Single.java"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ls0/i<",
+        "-TT;>;>;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/s0/h.smali b/com.discord/smali_classes2/s0/h.smali
new file mode 100644
index 0000000000..fc8d53889f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/h.smali
@@ -0,0 +1,48 @@
+.class public Ls0/h;
+.super Ljava/lang/Object;
+.source "Single.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/h$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Ls0/h$a;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/h$a<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Ls0/o/l;->c:Ls0/k/b;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ls0/h$a;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/i.smali b/com.discord/smali_classes2/s0/i.smali
new file mode 100644
index 0000000000..42ee9b8a01
--- /dev/null
+++ b/com.discord/smali_classes2/s0/i.smali
@@ -0,0 +1,60 @@
+.class public abstract Ls0/i;
+.super Ljava/lang/Object;
+.source "SingleSubscriber.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/internal/util/SubscriptionList;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lrx/internal/util/SubscriptionList;
+
+    invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
+
+    iput-object v0, p0, Ls0/i;->d:Lrx/internal/util/SubscriptionList;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/i;->d:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    return v0
+.end method
+
+.method public final unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/i;->d:Lrx/internal/util/SubscriptionList;
+
+    invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/j/a/a.smali b/com.discord/smali_classes2/s0/j/a/a.smali
new file mode 100644
index 0000000000..041e1da35a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/j/a/a.smali
@@ -0,0 +1,80 @@
+.class public final Ls0/j/a/a;
+.super Ljava/lang/Object;
+.source "RxAndroidPlugins.java"
+
+
+# static fields
+.field public static final b:Ls0/j/a/a;
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/j/a/b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/j/a/a;
+
+    invoke-direct {v0}, Ls0/j/a/a;-><init>()V
+
+    sput-object v0, Ls0/j/a/a;->b:Ls0/j/a/a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Ls0/j/a/b;
+    .locals 3
+
+    iget-object v0, p0, Ls0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v1, 0x0
+
+    sget-object v2, Ls0/j/a/b;->a:Ls0/j/a/b;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :cond_0
+    iget-object v0, p0, Ls0/j/a/a;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/j/a/b;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/j/a/b.smali b/com.discord/smali_classes2/s0/j/a/b.smali
new file mode 100644
index 0000000000..85bd88c500
--- /dev/null
+++ b/com.discord/smali_classes2/s0/j/a/b.smali
@@ -0,0 +1,29 @@
+.class public Ls0/j/a/b;
+.super Ljava/lang/Object;
+.source "RxAndroidSchedulersHook.java"
+
+
+# static fields
+.field public static final a:Ls0/j/a/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/j/a/b;
+
+    invoke-direct {v0}, Ls0/j/a/b;-><init>()V
+
+    sput-object v0, Ls0/j/a/b;->a:Ls0/j/a/b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/j/b/a.smali b/com.discord/smali_classes2/s0/j/b/a.smali
new file mode 100644
index 0000000000..c209598be3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/j/b/a.smali
@@ -0,0 +1,101 @@
+.class public final Ls0/j/b/a;
+.super Ljava/lang/Object;
+.source "AndroidSchedulers.java"
+
+
+# static fields
+.field public static final b:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/j/b/a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public final a:Lrx/Scheduler;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    sput-object v0, Ls0/j/b/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Ls0/j/a/a;->b:Ls0/j/a/a;
+
+    invoke-virtual {v0}, Ls0/j/a/a;->a()Ls0/j/a/b;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ls0/j/b/b;
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ls0/j/b/b;-><init>(Landroid/os/Looper;)V
+
+    iput-object v0, p0, Ls0/j/b/a;->a:Lrx/Scheduler;
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public static a()Lrx/Scheduler;
+    .locals 3
+
+    :cond_0
+    sget-object v0, Ls0/j/b/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/j/b/a;
+
+    if-eqz v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ls0/j/b/a;
+
+    invoke-direct {v0}, Ls0/j/b/a;-><init>()V
+
+    sget-object v1, Ls0/j/b/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    :goto_0
+    iget-object v0, v0, Ls0/j/b/a;->a:Lrx/Scheduler;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/j/b/b$a.smali b/com.discord/smali_classes2/s0/j/b/b$a.smali
new file mode 100644
index 0000000000..8c10a25466
--- /dev/null
+++ b/com.discord/smali_classes2/s0/j/b/b$a.smali
@@ -0,0 +1,139 @@
+.class public Ls0/j/b/b$a;
+.super Lrx/Scheduler$Worker;
+.source "LooperScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/j/b/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Landroid/os/Handler;
+
+.field public final e:Ls0/j/a/b;
+
+.field public volatile f:Z
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/Handler;)V
+    .locals 0
+
+    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
+
+    iput-object p1, p0, Ls0/j/b/b$a;->d:Landroid/os/Handler;
+
+    sget-object p1, Ls0/j/a/a;->b:Ls0/j/a/a;
+
+    invoke-virtual {p1}, Ls0/j/a/a;->a()Ls0/j/a/b;
+
+    move-result-object p1
+
+    iput-object p1, p0, Ls0/j/b/b$a;->e:Ls0/j/a/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lrx/functions/Action0;)Lrx/Subscription;
+    .locals 3
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v1, 0x0
+
+    invoke-virtual {p0, p1, v1, v2, v0}, Ls0/j/b/b$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+    .locals 2
+
+    iget-boolean v0, p0, Ls0/j/b/b$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Ls0/j/b/b$a;->e:Ls0/j/a/b;
+
+    if-eqz v0, :cond_2
+
+    new-instance v0, Ls0/j/b/b$b;
+
+    iget-object v1, p0, Ls0/j/b/b$a;->d:Landroid/os/Handler;
+
+    invoke-direct {v0, p1, v1}, Ls0/j/b/b$b;-><init>(Lrx/functions/Action0;Landroid/os/Handler;)V
+
+    iget-object p1, p0, Ls0/j/b/b$a;->d:Landroid/os/Handler;
+
+    invoke-static {p1, v0}, Landroid/os/Message;->obtain(Landroid/os/Handler;Ljava/lang/Runnable;)Landroid/os/Message;
+
+    move-result-object p1
+
+    iput-object p0, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
+
+    iget-object v1, p0, Ls0/j/b/b$a;->d:Landroid/os/Handler;
+
+    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+
+    move-result-wide p2
+
+    invoke-virtual {v1, p1, p2, p3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
+
+    iget-boolean p1, p0, Ls0/j/b/b$a;->f:Z
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Ls0/j/b/b$a;->d:Landroid/os/Handler;
+
+    invoke-virtual {p1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_1
+    return-object v0
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/j/b/b$a;->f:Z
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/j/b/b$a;->f:Z
+
+    iget-object v0, p0, Ls0/j/b/b$a;->d:Landroid/os/Handler;
+
+    invoke-virtual {v0, p0}, Landroid/os/Handler;->removeCallbacksAndMessages(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/j/b/b$b.smali b/com.discord/smali_classes2/s0/j/b/b$b.smali
new file mode 100644
index 0000000000..ea302ce585
--- /dev/null
+++ b/com.discord/smali_classes2/s0/j/b/b$b.smali
@@ -0,0 +1,126 @@
+.class public final Ls0/j/b/b$b;
+.super Ljava/lang/Object;
+.source "LooperScheduler.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/j/b/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action0;
+
+.field public final e:Landroid/os/Handler;
+
+.field public volatile f:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action0;Landroid/os/Handler;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/j/b/b$b;->d:Lrx/functions/Action0;
+
+    iput-object p2, p0, Ls0/j/b/b$b;->e:Landroid/os/Handler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/j/b/b$b;->f:Z
+
+    return v0
+.end method
+
+.method public run()V
+    .locals 3
+
+    :try_start_0
+    iget-object v0, p0, Ls0/j/b/b$b;->d:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v0
+
+    instance-of v1, v0, Lrx/exceptions/OnErrorNotImplementedException;
+
+    if-eqz v1, :cond_0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "Exception thrown on Scheduler.Worker thread. Add `onError` handling."
+
+    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "Fatal Exception thrown on Scheduler.Worker thread."
+
+    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    :goto_0
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v2
+
+    invoke-interface {v2, v0, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    :goto_1
+    return-void
+
+    :cond_1
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/j/b/b$b;->f:Z
+
+    iget-object v0, p0, Ls0/j/b/b$b;->e:Landroid/os/Handler;
+
+    invoke-virtual {v0, p0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/j/b/b.smali b/com.discord/smali_classes2/s0/j/b/b.smali
new file mode 100644
index 0000000000..6230b3d634
--- /dev/null
+++ b/com.discord/smali_classes2/s0/j/b/b.smali
@@ -0,0 +1,46 @@
+.class public Ls0/j/b/b;
+.super Lrx/Scheduler;
+.source "LooperScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/j/b/b$b;,
+        Ls0/j/b/b$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Landroid/os/Handler;
+
+
+# direct methods
+.method public constructor <init>(Landroid/os/Looper;)V
+    .locals 1
+
+    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
+
+    new-instance v0, Landroid/os/Handler;
+
+    invoke-direct {v0, p1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    iput-object v0, p0, Ls0/j/b/b;->a:Landroid/os/Handler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lrx/Scheduler$Worker;
+    .locals 2
+
+    new-instance v0, Ls0/j/b/b$a;
+
+    iget-object v1, p0, Ls0/j/b/b;->a:Landroid/os/Handler;
+
+    invoke-direct {v0, v1}, Ls0/j/b/b$a;-><init>(Landroid/os/Handler;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/k/a$a.smali b/com.discord/smali_classes2/s0/k/a$a.smali
new file mode 100644
index 0000000000..f84fac7868
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/a$a.smali
@@ -0,0 +1,61 @@
+.class public final Ls0/k/a$a;
+.super Ljava/lang/Object;
+.source "Actions.java"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/k/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action0;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action0;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/k/a$a;->d:Lrx/functions/Action0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object p1, p0, Ls0/k/a$a;->d:Lrx/functions/Action0;
+
+    invoke-interface {p1}, Lrx/functions/Action0;->call()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/k/a$b.smali b/com.discord/smali_classes2/s0/k/a$b.smali
new file mode 100644
index 0000000000..66d3e6b5af
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/a$b.smali
@@ -0,0 +1,116 @@
+.class public final Ls0/k/a$b;
+.super Ljava/lang/Object;
+.source "Actions.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+.implements Lrx/functions/Action1;
+.implements Lrx/functions/Action2;
+.implements Lrx/functions/Action3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/k/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T0:",
+        "Ljava/lang/Object;",
+        "T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        "T3:",
+        "Ljava/lang/Object;",
+        "T4:",
+        "Ljava/lang/Object;",
+        "T5:",
+        "Ljava/lang/Object;",
+        "T6:",
+        "Ljava/lang/Object;",
+        "T7:",
+        "Ljava/lang/Object;",
+        "T8:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action0;",
+        "Lrx/functions/Action1<",
+        "TT0;>;",
+        "Lrx/functions/Action2<",
+        "TT0;TT1;>;",
+        "Lrx/functions/Action3<",
+        "TT0;TT1;TT2;>;",
+        "Ljava/lang/Object<",
+        "TT0;TT1;TT2;TT3;>;",
+        "Ljava/lang/Object<",
+        "TT0;TT1;TT2;TT3;TT4;>;",
+        "Ljava/lang/Object<",
+        "TT0;TT1;TT2;TT3;TT4;TT5;>;",
+        "Ljava/lang/Object<",
+        "TT0;TT1;TT2;TT3;TT4;TT5;TT6;>;",
+        "Ljava/lang/Object<",
+        "TT0;TT1;TT2;TT3;TT4;TT5;TT6;TT7;>;",
+        "Ljava/lang/Object<",
+        "TT0;TT1;TT2;TT3;TT4;TT5;TT6;TT7;TT8;>;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public call(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT0;)V"
+        }
+    .end annotation
+
+    return-void
+.end method
+
+.method public call(Ljava/lang/Object;Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT0;TT1;)V"
+        }
+    .end annotation
+
+    return-void
+.end method
+
+.method public call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT0;TT1;TT2;)V"
+        }
+    .end annotation
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/k/a.smali b/com.discord/smali_classes2/s0/k/a.smali
new file mode 100644
index 0000000000..024c124a72
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/a.smali
@@ -0,0 +1,30 @@
+.class public final Ls0/k/a;
+.super Ljava/lang/Object;
+.source "Actions.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/k/a$a;,
+        Ls0/k/a$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/k/a$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/k/a$b;
+
+    invoke-direct {v0}, Ls0/k/a$b;-><init>()V
+
+    sput-object v0, Ls0/k/a;->a:Ls0/k/a$b;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/k/b.smali b/com.discord/smali_classes2/s0/k/b.smali
new file mode 100644
index 0000000000..b1b2f37de4
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/b.smali
@@ -0,0 +1,27 @@
+.class public interface abstract Ls0/k/b;
+.super Ljava/lang/Object;
+.source "Func1.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract call(Ljava/lang/Object;)Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)TR;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/s0/k/c.smali b/com.discord/smali_classes2/s0/k/c.smali
new file mode 100644
index 0000000000..302f4bf16e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/c.smali
@@ -0,0 +1,104 @@
+.class public final Ls0/k/c;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func9;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func9;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/c;->a:Lrx/functions/Func9;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/16 v1, 0x9
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v2, p0, Ls0/k/c;->a:Lrx/functions/Func9;
+
+    const/4 v0, 0x0
+
+    aget-object v3, p1, v0
+
+    const/4 v0, 0x1
+
+    aget-object v4, p1, v0
+
+    const/4 v0, 0x2
+
+    aget-object v5, p1, v0
+
+    const/4 v0, 0x3
+
+    aget-object v6, p1, v0
+
+    const/4 v0, 0x4
+
+    aget-object v7, p1, v0
+
+    const/4 v0, 0x5
+
+    aget-object v8, p1, v0
+
+    const/4 v0, 0x6
+
+    aget-object v9, p1, v0
+
+    const/4 v0, 0x7
+
+    aget-object v10, p1, v0
+
+    const/16 v0, 0x8
+
+    aget-object v11, p1, v0
+
+    invoke-interface/range {v2 .. v11}, Lrx/functions/Func9;->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;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func9 expecting 9 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/k/d.smali b/com.discord/smali_classes2/s0/k/d.smali
new file mode 100644
index 0000000000..60ba95433b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/d.smali
@@ -0,0 +1,76 @@
+.class public final Ls0/k/d;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func2;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func2;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/d;->a:Lrx/functions/Func2;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/4 v1, 0x2
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Ls0/k/d;->a:Lrx/functions/Func2;
+
+    const/4 v1, 0x0
+
+    aget-object v1, p1, v1
+
+    const/4 v2, 0x1
+
+    aget-object p1, p1, v2
+
+    invoke-interface {v0, v1, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func2 expecting 2 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/k/e.smali b/com.discord/smali_classes2/s0/k/e.smali
new file mode 100644
index 0000000000..f6774bb37f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/e.smali
@@ -0,0 +1,80 @@
+.class public final Ls0/k/e;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func3;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func3;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/e;->a:Lrx/functions/Func3;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/4 v1, 0x3
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Ls0/k/e;->a:Lrx/functions/Func3;
+
+    const/4 v1, 0x0
+
+    aget-object v1, p1, v1
+
+    const/4 v2, 0x1
+
+    aget-object v2, p1, v2
+
+    const/4 v3, 0x2
+
+    aget-object p1, p1, v3
+
+    invoke-interface {v0, v1, v2, p1}, Lrx/functions/Func3;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func3 expecting 3 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/k/f.smali b/com.discord/smali_classes2/s0/k/f.smali
new file mode 100644
index 0000000000..e7e8b19331
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/f.smali
@@ -0,0 +1,84 @@
+.class public final Ls0/k/f;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func4;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func4;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/f;->a:Lrx/functions/Func4;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/4 v1, 0x4
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Ls0/k/f;->a:Lrx/functions/Func4;
+
+    const/4 v1, 0x0
+
+    aget-object v1, p1, v1
+
+    const/4 v2, 0x1
+
+    aget-object v2, p1, v2
+
+    const/4 v3, 0x2
+
+    aget-object v3, p1, v3
+
+    const/4 v4, 0x3
+
+    aget-object p1, p1, v4
+
+    invoke-interface {v0, v1, v2, v3, p1}, Lrx/functions/Func4;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func4 expecting 4 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/k/g.smali b/com.discord/smali_classes2/s0/k/g.smali
new file mode 100644
index 0000000000..ea9f96fbdb
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/g.smali
@@ -0,0 +1,88 @@
+.class public final Ls0/k/g;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func5;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func5;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/g;->a:Lrx/functions/Func5;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/4 v1, 0x5
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v2, p0, Ls0/k/g;->a:Lrx/functions/Func5;
+
+    const/4 v0, 0x0
+
+    aget-object v3, p1, v0
+
+    const/4 v0, 0x1
+
+    aget-object v4, p1, v0
+
+    const/4 v0, 0x2
+
+    aget-object v5, p1, v0
+
+    const/4 v0, 0x3
+
+    aget-object v6, p1, v0
+
+    const/4 v0, 0x4
+
+    aget-object v7, p1, v0
+
+    invoke-interface/range {v2 .. v7}, Lrx/functions/Func5;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func5 expecting 5 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/k/h.smali b/com.discord/smali_classes2/s0/k/h.smali
new file mode 100644
index 0000000000..c9f6db6b20
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/h.smali
@@ -0,0 +1,92 @@
+.class public final Ls0/k/h;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func6;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func6;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/h;->a:Lrx/functions/Func6;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/4 v1, 0x6
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v2, p0, Ls0/k/h;->a:Lrx/functions/Func6;
+
+    const/4 v0, 0x0
+
+    aget-object v3, p1, v0
+
+    const/4 v0, 0x1
+
+    aget-object v4, p1, v0
+
+    const/4 v0, 0x2
+
+    aget-object v5, p1, v0
+
+    const/4 v0, 0x3
+
+    aget-object v6, p1, v0
+
+    const/4 v0, 0x4
+
+    aget-object v7, p1, v0
+
+    const/4 v0, 0x5
+
+    aget-object v8, p1, v0
+
+    invoke-interface/range {v2 .. v8}, Lrx/functions/Func6;->call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func6 expecting 6 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/k/i.smali b/com.discord/smali_classes2/s0/k/i.smali
new file mode 100644
index 0000000000..f7b71b8741
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/i.smali
@@ -0,0 +1,96 @@
+.class public final Ls0/k/i;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func7;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func7;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/i;->a:Lrx/functions/Func7;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/4 v1, 0x7
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v2, p0, Ls0/k/i;->a:Lrx/functions/Func7;
+
+    const/4 v0, 0x0
+
+    aget-object v3, p1, v0
+
+    const/4 v0, 0x1
+
+    aget-object v4, p1, v0
+
+    const/4 v0, 0x2
+
+    aget-object v5, p1, v0
+
+    const/4 v0, 0x3
+
+    aget-object v6, p1, v0
+
+    const/4 v0, 0x4
+
+    aget-object v7, p1, v0
+
+    const/4 v0, 0x5
+
+    aget-object v8, p1, v0
+
+    const/4 v0, 0x6
+
+    aget-object v9, p1, v0
+
+    invoke-interface/range {v2 .. v9}, Lrx/functions/Func7;->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;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func7 expecting 7 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/k/j.smali b/com.discord/smali_classes2/s0/k/j.smali
new file mode 100644
index 0000000000..f0a2290388
--- /dev/null
+++ b/com.discord/smali_classes2/s0/k/j.smali
@@ -0,0 +1,100 @@
+.class public final Ls0/k/j;
+.super Ljava/lang/Object;
+.source "Functions.java"
+
+# interfaces
+.implements Lrx/functions/FuncN;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/FuncN<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic a:Lrx/functions/Func8;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func8;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/k/j;->a:Lrx/functions/Func8;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public varargs call([Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([",
+            "Ljava/lang/Object;",
+            ")TR;"
+        }
+    .end annotation
+
+    array-length v0, p1
+
+    const/16 v1, 0x8
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v2, p0, Ls0/k/j;->a:Lrx/functions/Func8;
+
+    const/4 v0, 0x0
+
+    aget-object v3, p1, v0
+
+    const/4 v0, 0x1
+
+    aget-object v4, p1, v0
+
+    const/4 v0, 0x2
+
+    aget-object v5, p1, v0
+
+    const/4 v0, 0x3
+
+    aget-object v6, p1, v0
+
+    const/4 v0, 0x4
+
+    aget-object v7, p1, v0
+
+    const/4 v0, 0x5
+
+    aget-object v8, p1, v0
+
+    const/4 v0, 0x6
+
+    aget-object v9, p1, v0
+
+    const/4 v0, 0x7
+
+    aget-object v10, p1, v0
+
+    invoke-interface/range {v2 .. v10}, Lrx/functions/Func8;->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;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string v0, "Func8 expecting 8 arguments."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a.smali b/com.discord/smali_classes2/s0/l/a/a.smali
new file mode 100644
index 0000000000..56a8d6a8ae
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a.smali
@@ -0,0 +1,65 @@
+.class public final Ls0/l/a/a;
+.super Ljava/lang/Object;
+.source "BlockingOperatorMostRecent.java"
+
+# interfaces
+.implements Ljava/lang/Iterable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/lang/Iterable<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/Object;
+
+.field public final synthetic e:Lrx/Observable;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;Lrx/Observable;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/a;->d:Ljava/lang/Object;
+
+    iput-object p2, p0, Ls0/l/a/a;->e:Lrx/Observable;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public iterator()Ljava/util/Iterator;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ls0/l/a/c;
+
+    iget-object v1, p0, Ls0/l/a/a;->d:Ljava/lang/Object;
+
+    invoke-direct {v0, v1}, Ls0/l/a/c;-><init>(Ljava/lang/Object;)V
+
+    iget-object v1, p0, Ls0/l/a/a;->e:Lrx/Observable;
+
+    invoke-virtual {v1, v0}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
+
+    new-instance v1, Ls0/l/a/b;
+
+    invoke-direct {v1, v0}, Ls0/l/a/b;-><init>(Ls0/l/a/c;)V
+
+    return-object v1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a0.smali b/com.discord/smali_classes2/s0/l/a/a0.smali
new file mode 100644
index 0000000000..1ed8d81ddd
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a0.smali
@@ -0,0 +1,79 @@
+.class public Ls0/l/a/a0;
+.super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final synthetic e:Ls0/l/b/a;
+
+.field public final synthetic f:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field public final synthetic g:Lrx/Scheduler$Worker;
+
+.field public final synthetic h:Lrx/functions/Action0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/b0;Ljava/util/concurrent/atomic/AtomicLong;Ls0/l/b/a;Ljava/util/concurrent/atomic/AtomicBoolean;Lrx/Scheduler$Worker;Lrx/functions/Action0;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/a0;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iput-object p3, p0, Ls0/l/a/a0;->e:Ls0/l/b/a;
+
+    iput-object p4, p0, Ls0/l/a/a0;->f:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    iput-object p5, p0, Ls0/l/a/a0;->g:Lrx/Scheduler$Worker;
+
+    iput-object p6, p0, Ls0/l/a/a0;->h:Lrx/functions/Action0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/a0;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    iget-object v0, p0, Ls0/l/a/a0;->e:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1, p2}, Ls0/l/b/a;->m(J)V
+
+    iget-object p1, p0, Ls0/l/a/a0;->f:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    const/4 p2, 0x1
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, p2, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Ls0/l/a/a0;->g:Lrx/Scheduler$Worker;
+
+    iget-object p2, p0, Ls0/l/a/a0;->h:Lrx/functions/Action0;
+
+    invoke-virtual {p1, p2}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a1$a.smali b/com.discord/smali_classes2/s0/l/a/a1$a.smali
new file mode 100644
index 0000000000..12e1e7b25a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a1$a.smali
@@ -0,0 +1,44 @@
+.class public final Ls0/l/a/a1$a;
+.super Ljava/lang/Object;
+.source "OperatorMerge.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/a1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/a1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/a1<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Ls0/l/a/a1;
+
+    const/4 v1, 0x1
+
+    const v2, 0x7fffffff
+
+    invoke-direct {v0, v1, v2}, Ls0/l/a/a1;-><init>(ZI)V
+
+    sput-object v0, Ls0/l/a/a1$a;->a:Ls0/l/a/a1;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a1$b.smali b/com.discord/smali_classes2/s0/l/a/a1$b.smali
new file mode 100644
index 0000000000..e6080979ed
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a1$b.smali
@@ -0,0 +1,44 @@
+.class public final Ls0/l/a/a1$b;
+.super Ljava/lang/Object;
+.source "OperatorMerge.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/a1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/a1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/a1<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Ls0/l/a/a1;
+
+    const/4 v1, 0x0
+
+    const v2, 0x7fffffff
+
+    invoke-direct {v0, v1, v2}, Ls0/l/a/a1;-><init>(ZI)V
+
+    sput-object v0, Ls0/l/a/a1$b;->a:Ls0/l/a/a1;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a1$c.smali b/com.discord/smali_classes2/s0/l/a/a1$c.smali
new file mode 100644
index 0000000000..85afba207c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a1$c.smali
@@ -0,0 +1,414 @@
+.class public final Ls0/l/a/a1$c;
+.super Lrx/Subscriber;
+.source "OperatorMerge.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/a1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final i:I
+
+
+# instance fields
+.field public final d:Ls0/l/a/a1$e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/a1$e<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:J
+
+.field public volatile f:Z
+
+.field public volatile g:Ls0/l/e/h;
+
+.field public h:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    sget v0, Ls0/l/e/h;->f:I
+
+    div-int/lit8 v0, v0, 0x4
+
+    sput v0, Ls0/l/a/a1$c;->i:I
+
+    return-void
+.end method
+
+.method public constructor <init>(Ls0/l/a/a1$e;J)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/a1$e<",
+            "TT;>;J)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/a1$c;->d:Ls0/l/a/a1$e;
+
+    iput-wide p2, p0, Ls0/l/a/a1$c;->e:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(J)V
+    .locals 1
+
+    iget v0, p0, Ls0/l/a/a1$c;->h:I
+
+    long-to-int p2, p1
+
+    sub-int/2addr v0, p2
+
+    sget p1, Ls0/l/a/a1$c;->i:I
+
+    if-le v0, p1, :cond_0
+
+    iput v0, p0, Ls0/l/a/a1$c;->h:I
+
+    return-void
+
+    :cond_0
+    sget p1, Ls0/l/e/h;->f:I
+
+    iput p1, p0, Ls0/l/a/a1$c;->h:I
+
+    sub-int/2addr p1, v0
+
+    if-lez p1, :cond_1
+
+    int-to-long p1, p1
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    :cond_1
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/a1$c;->f:Z
+
+    iget-object v0, p0, Ls0/l/a/a1$c;->d:Ls0/l/a/a1$e;
+
+    invoke-virtual {v0}, Ls0/l/a/a1$e;->b()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/a1$c;->f:Z
+
+    iget-object v0, p0, Ls0/l/a/a1$c;->d:Ls0/l/a/a1$e;
+
+    invoke-virtual {v0}, Ls0/l/a/a1$e;->d()Ljava/util/Queue;
+
+    move-result-object v0
+
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    iget-object p1, p0, Ls0/l/a/a1$c;->d:Ls0/l/a/a1$e;
+
+    invoke-virtual {p1}, Ls0/l/a/a1$e;->b()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/a1$c;->d:Ls0/l/a/a1$e;
+
+    iget-object v1, v0, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    const-wide/16 v3, 0x0
+
+    const/4 v5, 0x1
+
+    const/4 v6, 0x0
+
+    cmp-long v7, v1, v3
+
+    if-eqz v7, :cond_1
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, v0, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    iget-boolean v7, v0, Ls0/l/a/a1$e;->l:Z
+
+    if-nez v7, :cond_0
+
+    cmp-long v7, v1, v3
+
+    if-eqz v7, :cond_0
+
+    iput-boolean v5, v0, Ls0/l/a/a1$e;->l:Z
+
+    const/4 v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
+    monitor-exit v0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :goto_1
+    if-eqz v3, :cond_a
+
+    iget-object v3, p0, Ls0/l/a/a1$c;->g:Ls0/l/e/h;
+
+    if-eqz v3, :cond_5
+
+    iget-object v3, v3, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    if-eqz v3, :cond_3
+
+    invoke-interface {v3}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v3, 0x0
+
+    goto :goto_3
+
+    :cond_3
+    :goto_2
+    const/4 v3, 0x1
+
+    :goto_3
+    if-eqz v3, :cond_4
+
+    goto :goto_4
+
+    :cond_4
+    invoke-virtual {v0, p0, p1}, Ls0/l/a/a1$e;->f(Ls0/l/a/a1$c;Ljava/lang/Object;)V
+
+    invoke-virtual {v0}, Ls0/l/a/a1$e;->c()V
+
+    goto :goto_8
+
+    :cond_5
+    :goto_4
+    :try_start_1
+    iget-object v3, v0, Ls0/l/a/a1$e;->d:Lrx/Subscriber;
+
+    invoke-interface {v3, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    goto :goto_5
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_2
+    iget-boolean v3, v0, Ls0/l/a/a1$e;->e:Z
+
+    if-nez v3, :cond_6
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_4
+
+    :try_start_3
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-virtual {p0, p1}, Ls0/l/a/a1$c;->onError(Ljava/lang/Throwable;)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    goto :goto_8
+
+    :catchall_2
+    move-exception p1
+
+    goto :goto_6
+
+    :cond_6
+    :try_start_4
+    invoke-virtual {v0}, Ls0/l/a/a1$e;->d()Ljava/util/Queue;
+
+    move-result-object v3
+
+    invoke-interface {v3, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    :goto_5
+    const-wide v3, 0x7fffffffffffffffL
+
+    cmp-long p1, v1, v3
+
+    if-eqz p1, :cond_7
+
+    iget-object p1, v0, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {p1, v5}, Ls0/l/a/a1$d;->a(I)J
+
+    :cond_7
+    const-wide/16 v1, 0x1
+
+    invoke-virtual {p0, v1, v2}, Ls0/l/a/a1$c;->a(J)V
+
+    monitor-enter v0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_4
+
+    :try_start_5
+    iget-boolean p1, v0, Ls0/l/a/a1$e;->m:Z
+
+    if-nez p1, :cond_8
+
+    iput-boolean v6, v0, Ls0/l/a/a1$e;->l:Z
+
+    monitor-exit v0
+
+    goto :goto_8
+
+    :cond_8
+    iput-boolean v6, v0, Ls0/l/a/a1$e;->m:Z
+
+    monitor-exit v0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_3
+
+    invoke-virtual {v0}, Ls0/l/a/a1$e;->c()V
+
+    goto :goto_8
+
+    :catchall_3
+    move-exception p1
+
+    :try_start_6
+    monitor-exit v0
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_3
+
+    :try_start_7
+    throw p1
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
+
+    :catchall_4
+    move-exception p1
+
+    const/4 v5, 0x0
+
+    :goto_6
+    if-nez v5, :cond_9
+
+    monitor-enter v0
+
+    :try_start_8
+    iput-boolean v6, v0, Ls0/l/a/a1$e;->l:Z
+
+    monitor-exit v0
+
+    goto :goto_7
+
+    :catchall_5
+    move-exception p1
+
+    monitor-exit v0
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_5
+
+    throw p1
+
+    :cond_9
+    :goto_7
+    throw p1
+
+    :cond_a
+    invoke-virtual {v0, p0, p1}, Ls0/l/a/a1$e;->f(Ls0/l/a/a1$c;Ljava/lang/Object;)V
+
+    invoke-virtual {v0}, Ls0/l/a/a1$e;->b()V
+
+    :goto_8
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    sget v0, Ls0/l/e/h;->f:I
+
+    iput v0, p0, Ls0/l/a/a1$c;->h:I
+
+    int-to-long v0, v0
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a1$d.smali b/com.discord/smali_classes2/s0/l/a/a1$d.smali
similarity index 81%
rename from com.discord/smali_classes2/r0/l/a/a1$d.smali
rename to com.discord/smali_classes2/s0/l/a/a1$d.smali
index d86c6aadb6..bd908b6fc2 100644
--- a/com.discord/smali_classes2/r0/l/a/a1$d.smali
+++ b/com.discord/smali_classes2/s0/l/a/a1$d.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/a1$d;
+.class public final Ls0/l/a/a1$d;
 .super Ljava/util/concurrent/atomic/AtomicLong;
 .source "OperatorMerge.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/a1;
+    value = Ls0/l/a/a1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -32,10 +32,10 @@
 
 
 # instance fields
-.field public final subscriber:Lr0/l/a/a1$e;
+.field public final subscriber:Ls0/l/a/a1$e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/l/a/a1$e<",
+            "Ls0/l/a/a1$e<",
             "TT;>;"
         }
     .end annotation
@@ -43,19 +43,19 @@
 
 
 # direct methods
-.method public constructor <init>(Lr0/l/a/a1$e;)V
+.method public constructor <init>(Ls0/l/a/a1$e;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/l/a/a1$e<",
+            "Ls0/l/a/a1$e<",
             "TT;>;)V"
         }
     .end annotation
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/a1$d;->subscriber:Lr0/l/a/a1$e;
+    iput-object p1, p0, Ls0/l/a/a1$d;->subscriber:Ls0/l/a/a1$e;
 
     return-void
 .end method
@@ -98,11 +98,11 @@
     return-void
 
     :cond_0
-    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->x(Ljava/util/concurrent/atomic/AtomicLong;J)J
+    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    iget-object p1, p0, Lr0/l/a/a1$d;->subscriber:Lr0/l/a/a1$e;
+    iget-object p1, p0, Ls0/l/a/a1$d;->subscriber:Ls0/l/a/a1$e;
 
-    invoke-virtual {p1}, Lr0/l/a/a1$e;->b()V
+    invoke-virtual {p1}, Ls0/l/a/a1$e;->b()V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/s0/l/a/a1$e.smali b/com.discord/smali_classes2/s0/l/a/a1$e.smali
new file mode 100644
index 0000000000..9cc14d8c6e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a1$e.smali
@@ -0,0 +1,1746 @@
+.class public final Ls0/l/a/a1$e;
+.super Lrx/Subscriber;
+.source "OperatorMerge.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/a1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "e"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "Lrx/Observable<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final u:[Ls0/l/a/a1$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Ls0/l/a/a1$c<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Z
+
+.field public final f:I
+
+.field public g:Ls0/l/a/a1$d;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/a1$d<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public volatile h:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public volatile i:Lrx/subscriptions/CompositeSubscription;
+
+.field public volatile j:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public volatile k:Z
+
+.field public l:Z
+
+.field public m:Z
+
+.field public final n:Ljava/lang/Object;
+
+.field public volatile o:[Ls0/l/a/a1$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Ls0/l/a/a1$c<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field public p:J
+
+.field public q:J
+
+.field public r:I
+
+.field public final s:I
+
+.field public t:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ls0/l/a/a1$c;
+
+    sput-object v0, Ls0/l/a/a1$e;->u:[Ls0/l/a/a1$c;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/Subscriber;ZI)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;ZI)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/a1$e;->d:Lrx/Subscriber;
+
+    iput-boolean p2, p0, Ls0/l/a/a1$e;->e:Z
+
+    iput p3, p0, Ls0/l/a/a1$e;->f:I
+
+    new-instance p1, Ljava/lang/Object;
+
+    invoke-direct {p1}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/a1$e;->n:Ljava/lang/Object;
+
+    sget-object p1, Ls0/l/a/a1$e;->u:[Ls0/l/a/a1$c;
+
+    iput-object p1, p0, Ls0/l/a/a1$e;->o:[Ls0/l/a/a1$c;
+
+    const p1, 0x7fffffff
+
+    if-ne p3, p1, :cond_0
+
+    iput p1, p0, Ls0/l/a/a1$e;->s:I
+
+    const-wide p1, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    goto :goto_0
+
+    :cond_0
+    shr-int/lit8 p1, p3, 0x1
+
+    const/4 p2, 0x1
+
+    invoke-static {p2, p1}, Ljava/lang/Math;->max(II)I
+
+    move-result p1
+
+    iput p1, p0, Ls0/l/a/a1$e;->s:I
+
+    int-to-long p1, p3
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    :goto_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Z
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/a/a1$e;->d:Lrx/Subscriber;
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    iget-boolean v2, p0, Ls0/l/a/a1$e;->e:Z
+
+    if-nez v2, :cond_1
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    :try_start_0
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->h()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return v1
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw v0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public b()V
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/l/a/a1$e;->l:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, p0, Ls0/l/a/a1$e;->m:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    iput-boolean v1, p0, Ls0/l/a/a1$e;->l:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->c()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v0
+.end method
+
+.method public c()V
+    .locals 23
+
+    move-object/from16 v1, p0
+
+    :try_start_0
+    iget-object v4, v1, Ls0/l/a/a1$e;->d:Lrx/Subscriber;
+
+    :goto_0
+    invoke-virtual/range {p0 .. p0}, Ls0/l/a/a1$e;->a()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v5, v1, Ls0/l/a/a1$e;->h:Ljava/util/Queue;
+
+    iget-object v0, v1, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v6
+
+    const-wide v8, 0x7fffffffffffffffL
+
+    cmp-long v0, v6, v8
+
+    if-nez v0, :cond_1
+
+    const/4 v10, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v10, 0x0
+
+    :goto_1
+    const-wide/16 v11, 0x0
+
+    const-wide/16 v14, 0x1
+
+    if-eqz v5, :cond_9
+
+    const/4 v0, 0x0
+
+    :goto_2
+    move-wide/from16 v16, v6
+
+    const/4 v7, 0x0
+
+    move v6, v0
+
+    const/4 v0, 0x0
+
+    :goto_3
+    cmp-long v18, v16, v11
+
+    if-lez v18, :cond_5
+
+    invoke-interface {v5}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v18
+
+    invoke-virtual/range {p0 .. p0}, Ls0/l/a/a1$e;->a()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    return-void
+
+    :cond_2
+    if-nez v18, :cond_3
+
+    move-object/from16 v0, v18
+
+    goto :goto_5
+
+    :cond_3
+    invoke-static/range {v18 .. v18}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_8
+
+    :try_start_1
+    invoke-interface {v4, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_4
+
+    :catchall_0
+    move-exception v0
+
+    move-object/from16 v19, v0
+
+    :try_start_2
+    iget-boolean v0, v1, Ls0/l/a/a1$e;->e:Z
+
+    if-nez v0, :cond_4
+
+    invoke-static/range {v19 .. v19}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_8
+
+    :try_start_3
+    invoke-virtual/range {p0 .. p0}, Lrx/Subscriber;->unsubscribe()V
+
+    move-object/from16 v5, v19
+
+    invoke-interface {v4, v5}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    goto/16 :goto_f
+
+    :cond_4
+    move-object/from16 v2, v19
+
+    :try_start_4
+    invoke-virtual/range {p0 .. p0}, Ls0/l/a/a1$e;->d()Ljava/util/Queue;
+
+    move-result-object v0
+
+    invoke-interface {v0, v2}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    :goto_4
+    add-int/lit8 v6, v6, 0x1
+
+    add-int/lit8 v7, v7, 0x1
+
+    sub-long v16, v16, v14
+
+    move-object/from16 v0, v18
+
+    goto :goto_3
+
+    :cond_5
+    :goto_5
+    if-lez v7, :cond_7
+
+    if-eqz v10, :cond_6
+
+    move-wide/from16 v16, v8
+
+    goto :goto_6
+
+    :cond_6
+    iget-object v2, v1, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {v2, v7}, Ls0/l/a/a1$d;->a(I)J
+
+    move-result-wide v16
+
+    :cond_7
+    :goto_6
+    cmp-long v2, v16, v11
+
+    if-eqz v2, :cond_a
+
+    if-nez v0, :cond_8
+
+    goto :goto_7
+
+    :cond_8
+    move v0, v6
+
+    move-wide/from16 v6, v16
+
+    goto :goto_2
+
+    :cond_9
+    move-wide/from16 v16, v6
+
+    const/4 v6, 0x0
+
+    :cond_a
+    :goto_7
+    iget-boolean v0, v1, Ls0/l/a/a1$e;->k:Z
+
+    iget-object v2, v1, Ls0/l/a/a1$e;->h:Ljava/util/Queue;
+
+    iget-object v5, v1, Ls0/l/a/a1$e;->o:[Ls0/l/a/a1$c;
+
+    array-length v7, v5
+
+    if-eqz v0, :cond_e
+
+    if-eqz v2, :cond_b
+
+    invoke-interface {v2}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_e
+
+    :cond_b
+    if-nez v7, :cond_e
+
+    iget-object v0, v1, Ls0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    if-eqz v0, :cond_d
+
+    invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_c
+
+    goto :goto_8
+
+    :cond_c
+    invoke-virtual/range {p0 .. p0}, Ls0/l/a/a1$e;->h()V
+
+    goto :goto_9
+
+    :cond_d
+    :goto_8
+    invoke-interface {v4}, Ls0/g;->onCompleted()V
+
+    :goto_9
+    return-void
+
+    :cond_e
+    if-lez v7, :cond_26
+
+    iget-wide v8, v1, Ls0/l/a/a1$e;->q:J
+
+    iget v0, v1, Ls0/l/a/a1$e;->r:I
+
+    if-le v7, v0, :cond_f
+
+    aget-object v2, v5, v0
+
+    iget-wide v13, v2, Ls0/l/a/a1$c;->e:J
+
+    cmp-long v2, v13, v8
+
+    if-eqz v2, :cond_14
+
+    :cond_f
+    if-gt v7, v0, :cond_10
+
+    const/4 v0, 0x0
+
+    :cond_10
+    const/4 v2, 0x0
+
+    :goto_a
+    if-ge v2, v7, :cond_13
+
+    aget-object v13, v5, v0
+
+    iget-wide v13, v13, Ls0/l/a/a1$c;->e:J
+
+    cmp-long v15, v13, v8
+
+    if-nez v15, :cond_11
+
+    goto :goto_b
+
+    :cond_11
+    add-int/lit8 v0, v0, 0x1
+
+    if-ne v0, v7, :cond_12
+
+    const/4 v0, 0x0
+
+    :cond_12
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_a
+
+    :cond_13
+    :goto_b
+    iput v0, v1, Ls0/l/a/a1$e;->r:I
+
+    aget-object v2, v5, v0
+
+    iget-wide v8, v2, Ls0/l/a/a1$c;->e:J
+
+    iput-wide v8, v1, Ls0/l/a/a1$e;->q:J
+
+    :cond_14
+    const/4 v2, 0x0
+
+    const/4 v8, 0x0
+
+    :goto_c
+    if-ge v2, v7, :cond_25
+
+    invoke-virtual/range {p0 .. p0}, Ls0/l/a/a1$e;->a()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_15
+
+    return-void
+
+    :cond_15
+    aget-object v9, v5, v0
+
+    const/4 v13, 0x0
+
+    :goto_d
+    const/4 v14, 0x0
+
+    :goto_e
+    cmp-long v15, v16, v11
+
+    if-lez v15, :cond_19
+
+    invoke-virtual/range {p0 .. p0}, Ls0/l/a/a1$e;->a()Z
+
+    move-result v15
+
+    if-eqz v15, :cond_16
+
+    return-void
+
+    :cond_16
+    iget-object v15, v9, Ls0/l/a/a1$c;->g:Ls0/l/e/h;
+
+    if-nez v15, :cond_17
+
+    goto :goto_10
+
+    :cond_17
+    invoke-virtual {v15}, Ls0/l/e/h;->d()Ljava/lang/Object;
+
+    move-result-object v13
+
+    if-nez v13, :cond_18
+
+    goto :goto_10
+
+    :cond_18
+    invoke-static {v13}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v15
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_8
+
+    :try_start_5
+    invoke-interface {v4, v15}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_2
+
+    const-wide/16 v20, 0x1
+
+    sub-long v16, v16, v20
+
+    add-int/lit8 v14, v14, 0x1
+
+    goto :goto_e
+
+    :catchall_2
+    move-exception v0
+
+    move-object v2, v0
+
+    :try_start_6
+    invoke-static {v2}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_1
+
+    :try_start_7
+    invoke-interface {v4, v2}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_3
+
+    :try_start_8
+    invoke-virtual/range {p0 .. p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+
+    :catchall_3
+    move-exception v0
+
+    move-object v2, v0
+
+    invoke-virtual/range {p0 .. p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw v2
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_1
+
+    :goto_f
+    const/4 v2, 0x1
+
+    goto/16 :goto_1a
+
+    :cond_19
+    :goto_10
+    const-wide/16 v20, 0x1
+
+    if-lez v14, :cond_1b
+
+    if-nez v10, :cond_1a
+
+    :try_start_9
+    iget-object v15, v1, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {v15, v14}, Ls0/l/a/a1$d;->a(I)J
+
+    move-result-wide v15
+
+    move-object/from16 v22, v4
+
+    goto :goto_11
+
+    :cond_1a
+    move-object/from16 v22, v4
+
+    const-wide v15, 0x7fffffffffffffffL
+
+    :goto_11
+    int-to-long v3, v14
+
+    invoke-virtual {v9, v3, v4}, Ls0/l/a/a1$c;->a(J)V
+
+    move-wide/from16 v16, v15
+
+    goto :goto_12
+
+    :cond_1b
+    move-object/from16 v22, v4
+
+    :goto_12
+    cmp-long v3, v16, v11
+
+    if-eqz v3, :cond_1d
+
+    if-nez v13, :cond_1c
+
+    goto :goto_13
+
+    :cond_1c
+    move-object/from16 v4, v22
+
+    goto :goto_d
+
+    :cond_1d
+    :goto_13
+    iget-boolean v4, v9, Ls0/l/a/a1$c;->f:Z
+
+    iget-object v13, v9, Ls0/l/a/a1$c;->g:Ls0/l/e/h;
+
+    if-eqz v4, :cond_22
+
+    if-eqz v13, :cond_20
+
+    iget-object v4, v13, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    if-eqz v4, :cond_1f
+
+    invoke-interface {v4}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1e
+
+    goto :goto_14
+
+    :cond_1e
+    const/4 v4, 0x0
+
+    goto :goto_15
+
+    :cond_1f
+    :goto_14
+    const/4 v4, 0x1
+
+    :goto_15
+    if-eqz v4, :cond_22
+
+    :cond_20
+    invoke-virtual {v1, v9}, Ls0/l/a/a1$e;->g(Ls0/l/a/a1$c;)V
+
+    invoke-virtual/range {p0 .. p0}, Ls0/l/a/a1$e;->a()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_21
+
+    return-void
+
+    :cond_21
+    add-int/lit8 v6, v6, 0x1
+
+    const/4 v8, 0x1
+
+    :cond_22
+    if-nez v3, :cond_23
+
+    goto :goto_16
+
+    :cond_23
+    add-int/lit8 v0, v0, 0x1
+
+    if-ne v0, v7, :cond_24
+
+    const/4 v0, 0x0
+
+    :cond_24
+    add-int/lit8 v2, v2, 0x1
+
+    move-object/from16 v4, v22
+
+    goto/16 :goto_c
+
+    :cond_25
+    move-object/from16 v22, v4
+
+    :goto_16
+    iput v0, v1, Ls0/l/a/a1$e;->r:I
+
+    aget-object v0, v5, v0
+
+    iget-wide v2, v0, Ls0/l/a/a1$c;->e:J
+
+    iput-wide v2, v1, Ls0/l/a/a1$e;->q:J
+
+    goto :goto_17
+
+    :cond_26
+    move-object/from16 v22, v4
+
+    const/4 v8, 0x0
+
+    :goto_17
+    if-lez v6, :cond_27
+
+    int-to-long v2, v6
+
+    invoke-virtual {v1, v2, v3}, Lrx/Subscriber;->request(J)V
+
+    :cond_27
+    if-eqz v8, :cond_28
+
+    :goto_18
+    move-object/from16 v4, v22
+
+    goto/16 :goto_0
+
+    :cond_28
+    monitor-enter p0
+    :try_end_9
+    .catchall {:try_start_9 .. :try_end_9} :catchall_8
+
+    :try_start_a
+    iget-boolean v0, v1, Ls0/l/a/a1$e;->m:Z
+    :try_end_a
+    .catchall {:try_start_a .. :try_end_a} :catchall_5
+
+    if-nez v0, :cond_29
+
+    const/4 v2, 0x0
+
+    :try_start_b
+    iput-boolean v2, v1, Ls0/l/a/a1$e;->l:Z
+
+    monitor-exit p0
+    :try_end_b
+    .catchall {:try_start_b .. :try_end_b} :catchall_4
+
+    return-void
+
+    :catchall_4
+    move-exception v0
+
+    const/4 v2, 0x1
+
+    goto :goto_19
+
+    :cond_29
+    const/4 v2, 0x0
+
+    :try_start_c
+    iput-boolean v2, v1, Ls0/l/a/a1$e;->m:Z
+
+    monitor-exit p0
+    :try_end_c
+    .catchall {:try_start_c .. :try_end_c} :catchall_5
+
+    goto :goto_18
+
+    :catchall_5
+    move-exception v0
+
+    const/4 v2, 0x0
+
+    :goto_19
+    :try_start_d
+    monitor-exit p0
+    :try_end_d
+    .catchall {:try_start_d .. :try_end_d} :catchall_7
+
+    :try_start_e
+    throw v0
+    :try_end_e
+    .catchall {:try_start_e .. :try_end_e} :catchall_6
+
+    :catchall_6
+    move-exception v0
+
+    goto :goto_1a
+
+    :catchall_7
+    move-exception v0
+
+    goto :goto_19
+
+    :catchall_8
+    move-exception v0
+
+    const/4 v2, 0x0
+
+    :goto_1a
+    if-nez v2, :cond_2a
+
+    monitor-enter p0
+
+    const/4 v2, 0x0
+
+    :try_start_f
+    iput-boolean v2, v1, Ls0/l/a/a1$e;->l:Z
+
+    monitor-exit p0
+
+    goto :goto_1b
+
+    :catchall_9
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_f
+    .catchall {:try_start_f .. :try_end_f} :catchall_9
+
+    throw v0
+
+    :cond_2a
+    :goto_1b
+    throw v0
+.end method
+
+.method public d()Ljava/util/Queue;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Queue<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    if-nez v0, :cond_1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    :cond_0
+    monitor-exit p0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    return-object v0
+.end method
+
+.method public e(Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/a1$e;->h:Ljava/util/Queue;
+
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_4
+
+    iget v0, p0, Ls0/l/a/a1$e;->f:I
+
+    const v2, 0x7fffffff
+
+    if-ne v0, v2, :cond_0
+
+    new-instance v0, Ls0/l/e/m/g;
+
+    sget v2, Ls0/l/e/h;->f:I
+
+    invoke-direct {v0, v2}, Ls0/l/e/m/g;-><init>(I)V
+
+    goto :goto_2
+
+    :cond_0
+    add-int/lit8 v2, v0, -0x1
+
+    and-int/2addr v2, v0
+
+    if-nez v2, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eqz v2, :cond_3
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_2
+
+    new-instance v2, Ls0/l/e/n/n;
+
+    invoke-direct {v2, v0}, Ls0/l/e/n/n;-><init>(I)V
+
+    goto :goto_1
+
+    :cond_2
+    new-instance v2, Ls0/l/e/m/c;
+
+    invoke-direct {v2, v0}, Ls0/l/e/m/c;-><init>(I)V
+
+    goto :goto_1
+
+    :cond_3
+    new-instance v2, Ls0/l/e/m/d;
+
+    invoke-direct {v2, v0}, Ls0/l/e/m/d;-><init>(I)V
+
+    :goto_1
+    move-object v0, v2
+
+    :goto_2
+    iput-object v0, p0, Ls0/l/a/a1$e;->h:Ljava/util/Queue;
+
+    :cond_4
+    if-nez p1, :cond_5
+
+    sget-object v2, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    goto :goto_3
+
+    :cond_5
+    move-object v2, p1
+
+    :goto_3
+    invoke-interface {v0, v2}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_6
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    new-instance v0, Lrx/exceptions/MissingBackpressureException;
+
+    invoke-direct {v0}, Lrx/exceptions/MissingBackpressureException;-><init>()V
+
+    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->d()Ljava/util/Queue;
+
+    move-result-object v0
+
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    iput-boolean v1, p0, Ls0/l/a/a1$e;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->b()V
+
+    :cond_6
+    return-void
+.end method
+
+.method public f(Ls0/l/a/a1$c;Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/a1$c<",
+            "TT;>;TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p1, Ls0/l/a/a1$c;->g:Ls0/l/e/h;
+
+    if-nez v0, :cond_1
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ls0/l/e/h;
+
+    const/4 v1, 0x0
+
+    sget v2, Ls0/l/e/h;->f:I
+
+    invoke-direct {v0, v1, v2}, Ls0/l/e/h;-><init>(ZI)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ls0/l/e/h;
+
+    invoke-direct {v0}, Ls0/l/e/h;-><init>()V
+
+    :goto_0
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iput-object v0, p1, Ls0/l/a/a1$c;->g:Ls0/l/e/h;
+
+    :cond_1
+    if-nez p2, :cond_2
+
+    :try_start_0
+    sget-object p2, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_2
+    invoke-virtual {v0, p2}, Ls0/l/e/h;->b(Ljava/lang/Object;)V
+    :try_end_0
+    .catch Lrx/exceptions/MissingBackpressureException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception p2
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-virtual {p1, p2}, Ls0/l/a/a1$c;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :catch_1
+    move-exception p2
+
+    invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-virtual {p1, p2}, Ls0/l/a/a1$c;->onError(Ljava/lang/Throwable;)V
+
+    :cond_3
+    :goto_1
+    return-void
+.end method
+
+.method public g(Ls0/l/a/a1$c;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/a1$c<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    iget-object v0, p1, Ls0/l/a/a1$c;->g:Ls0/l/e/h;
+
+    if-eqz v0, :cond_0
+
+    monitor-enter v0
+
+    monitor-exit v0
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0, p1}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
+
+    iget-object v0, p0, Ls0/l/a/a1$e;->n:Ljava/lang/Object;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/a1$e;->o:[Ls0/l/a/a1$c;
+
+    array-length v2, v1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_0
+    if-ge v4, v2, :cond_2
+
+    aget-object v5, v1, v4
+
+    invoke-virtual {p1, v5}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v4, -0x1
+
+    :goto_1
+    if-gez v4, :cond_3
+
+    monitor-exit v0
+
+    return-void
+
+    :cond_3
+    const/4 p1, 0x1
+
+    if-ne v2, p1, :cond_4
+
+    sget-object p1, Ls0/l/a/a1$e;->u:[Ls0/l/a/a1$c;
+
+    iput-object p1, p0, Ls0/l/a/a1$e;->o:[Ls0/l/a/a1$c;
+
+    monitor-exit v0
+
+    return-void
+
+    :cond_4
+    add-int/lit8 v5, v2, -0x1
+
+    new-array v5, v5, [Ls0/l/a/a1$c;
+
+    invoke-static {v1, v3, v5, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    add-int/lit8 v3, v4, 0x1
+
+    sub-int/2addr v2, v4
+
+    sub-int/2addr v2, p1
+
+    invoke-static {v1, v3, v5, v4, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v5, p0, Ls0/l/a/a1$e;->o:[Ls0/l/a/a1$c;
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+.end method
+
+.method public final h()V
+    .locals 3
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    iget-object v1, p0, Ls0/l/a/a1$e;->j:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-ne v1, v2, :cond_0
+
+    iget-object v1, p0, Ls0/l/a/a1$e;->d:Lrx/Subscriber;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v0, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    invoke-interface {v1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, p0, Ls0/l/a/a1$e;->d:Lrx/Subscriber;
+
+    new-instance v2, Lrx/exceptions/CompositeException;
+
+    invoke-direct {v2, v0}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    invoke-interface {v1, v2}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/a1$e;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->b()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->d()Ljava/util/Queue;
+
+    move-result-object v0
+
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/a1$e;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->b()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 7
+
+    check-cast p1, Lrx/Observable;
+
+    if-nez p1, :cond_0
+
+    goto/16 :goto_9
+
+    :cond_0
+    sget-object v0, Ls0/l/a/f;->e:Lrx/Observable;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-ne p1, v0, :cond_2
+
+    iget p1, p0, Ls0/l/a/a1$e;->t:I
+
+    add-int/2addr p1, v1
+
+    iget v0, p0, Ls0/l/a/a1$e;->s:I
+
+    if-ne p1, v0, :cond_1
+
+    iput v2, p0, Ls0/l/a/a1$e;->t:I
+
+    int-to-long v0, p1
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    goto/16 :goto_9
+
+    :cond_1
+    iput p1, p0, Ls0/l/a/a1$e;->t:I
+
+    goto/16 :goto_9
+
+    :cond_2
+    instance-of v0, p1, Ls0/l/e/j;
+
+    if-eqz v0, :cond_d
+
+    check-cast p1, Ls0/l/e/j;
+
+    iget-object p1, p1, Ls0/l/e/j;->e:Ljava/lang/Object;
+
+    iget-object v0, p0, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    const-wide/16 v5, 0x0
+
+    cmp-long v0, v3, v5
+
+    if-eqz v0, :cond_4
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    iget-boolean v0, p0, Ls0/l/a/a1$e;->l:Z
+
+    if-nez v0, :cond_3
+
+    cmp-long v0, v3, v5
+
+    if-eqz v0, :cond_3
+
+    iput-boolean v1, p0, Ls0/l/a/a1$e;->l:Z
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v0, 0x0
+
+    :goto_0
+    monitor-exit p0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+
+    :cond_4
+    const/4 v0, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_c
+
+    iget-object v0, p0, Ls0/l/a/a1$e;->h:Ljava/util/Queue;
+
+    if-eqz v0, :cond_6
+
+    invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    invoke-virtual {p0, p1}, Ls0/l/a/a1$e;->e(Ljava/lang/Object;)V
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->c()V
+
+    goto/16 :goto_9
+
+    :cond_6
+    :goto_2
+    :try_start_1
+    iget-object v0, p0, Ls0/l/a/a1$e;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    goto :goto_3
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_2
+    iget-boolean v0, p0, Ls0/l/a/a1$e;->e:Z
+
+    if-nez v0, :cond_7
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_4
+
+    :try_start_3
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->d()Ljava/util/Queue;
+
+    move-result-object v0
+
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    iput-boolean v1, p0, Ls0/l/a/a1$e;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->b()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    goto/16 :goto_9
+
+    :catchall_2
+    move-exception p1
+
+    goto :goto_5
+
+    :cond_7
+    :try_start_4
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->d()Ljava/util/Queue;
+
+    move-result-object v0
+
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    :goto_3
+    const-wide v5, 0x7fffffffffffffffL
+
+    cmp-long p1, v3, v5
+
+    if-eqz p1, :cond_8
+
+    iget-object p1, p0, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {p1, v1}, Ls0/l/a/a1$d;->a(I)J
+
+    :cond_8
+    iget p1, p0, Ls0/l/a/a1$e;->t:I
+
+    add-int/2addr p1, v1
+
+    iget v0, p0, Ls0/l/a/a1$e;->s:I
+
+    if-ne p1, v0, :cond_9
+
+    iput v2, p0, Ls0/l/a/a1$e;->t:I
+
+    int-to-long v3, p1
+
+    invoke-virtual {p0, v3, v4}, Lrx/Subscriber;->request(J)V
+
+    goto :goto_4
+
+    :cond_9
+    iput p1, p0, Ls0/l/a/a1$e;->t:I
+
+    :goto_4
+    monitor-enter p0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_4
+
+    :try_start_5
+    iget-boolean p1, p0, Ls0/l/a/a1$e;->m:Z
+
+    if-nez p1, :cond_a
+
+    iput-boolean v2, p0, Ls0/l/a/a1$e;->l:Z
+
+    monitor-exit p0
+
+    goto :goto_9
+
+    :cond_a
+    iput-boolean v2, p0, Ls0/l/a/a1$e;->m:Z
+
+    monitor-exit p0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_3
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->c()V
+
+    goto :goto_9
+
+    :catchall_3
+    move-exception p1
+
+    :try_start_6
+    monitor-exit p0
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_3
+
+    :try_start_7
+    throw p1
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_2
+
+    :catchall_4
+    move-exception p1
+
+    const/4 v1, 0x0
+
+    :goto_5
+    if-nez v1, :cond_b
+
+    monitor-enter p0
+
+    :try_start_8
+    iput-boolean v2, p0, Ls0/l/a/a1$e;->l:Z
+
+    monitor-exit p0
+
+    goto :goto_6
+
+    :catchall_5
+    move-exception p1
+
+    monitor-exit p0
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_5
+
+    throw p1
+
+    :cond_b
+    :goto_6
+    throw p1
+
+    :cond_c
+    invoke-virtual {p0, p1}, Ls0/l/a/a1$e;->e(Ljava/lang/Object;)V
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->b()V
+
+    goto :goto_9
+
+    :cond_d
+    new-instance v0, Ls0/l/a/a1$c;
+
+    iget-wide v3, p0, Ls0/l/a/a1$e;->p:J
+
+    const-wide/16 v5, 0x1
+
+    add-long/2addr v5, v3
+
+    iput-wide v5, p0, Ls0/l/a/a1$e;->p:J
+
+    invoke-direct {v0, p0, v3, v4}, Ls0/l/a/a1$c;-><init>(Ls0/l/a/a1$e;J)V
+
+    iget-object v3, p0, Ls0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
+
+    if-nez v3, :cond_f
+
+    monitor-enter p0
+
+    :try_start_9
+    iget-object v3, p0, Ls0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
+
+    if-nez v3, :cond_e
+
+    new-instance v3, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v3}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object v3, p0, Ls0/l/a/a1$e;->i:Lrx/subscriptions/CompositeSubscription;
+
+    goto :goto_7
+
+    :cond_e
+    const/4 v1, 0x0
+
+    :goto_7
+    monitor-exit p0
+    :try_end_9
+    .catchall {:try_start_9 .. :try_end_9} :catchall_6
+
+    if-eqz v1, :cond_f
+
+    invoke-virtual {p0, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    goto :goto_8
+
+    :catchall_6
+    move-exception p1
+
+    :try_start_a
+    monitor-exit p0
+    :try_end_a
+    .catchall {:try_start_a .. :try_end_a} :catchall_6
+
+    throw p1
+
+    :cond_f
+    :goto_8
+    invoke-virtual {v3, v0}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    iget-object v1, p0, Ls0/l/a/a1$e;->n:Ljava/lang/Object;
+
+    monitor-enter v1
+
+    :try_start_b
+    iget-object v3, p0, Ls0/l/a/a1$e;->o:[Ls0/l/a/a1$c;
+
+    array-length v4, v3
+
+    add-int/lit8 v5, v4, 0x1
+
+    new-array v5, v5, [Ls0/l/a/a1$c;
+
+    invoke-static {v3, v2, v5, v2, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    aput-object v0, v5, v4
+
+    iput-object v5, p0, Ls0/l/a/a1$e;->o:[Ls0/l/a/a1$c;
+
+    monitor-exit v1
+    :try_end_b
+    .catchall {:try_start_b .. :try_end_b} :catchall_7
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    invoke-virtual {p0}, Ls0/l/a/a1$e;->b()V
+
+    :goto_9
+    return-void
+
+    :catchall_7
+    move-exception p1
+
+    :try_start_c
+    monitor-exit v1
+    :try_end_c
+    .catchall {:try_start_c .. :try_end_c} :catchall_7
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a1.smali b/com.discord/smali_classes2/s0/l/a/a1.smali
new file mode 100644
index 0000000000..bc86588cee
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a1.smali
@@ -0,0 +1,79 @@
+.class public final Ls0/l/a/a1;
+.super Ljava/lang/Object;
+.source "OperatorMerge.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/a1$c;,
+        Ls0/l/a/a1$e;,
+        Ls0/l/a/a1$d;,
+        Ls0/l/a/a1$a;,
+        Ls0/l/a/a1$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Z
+
+.field public final e:I
+
+
+# direct methods
+.method public constructor <init>(ZI)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Ls0/l/a/a1;->d:Z
+
+    iput p2, p0, Ls0/l/a/a1;->e:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/a1$e;
+
+    iget-boolean v1, p0, Ls0/l/a/a1;->d:Z
+
+    iget v2, p0, Ls0/l/a/a1;->e:I
+
+    invoke-direct {v0, p1, v1, v2}, Ls0/l/a/a1$e;-><init>(Lrx/Subscriber;ZI)V
+
+    new-instance v1, Ls0/l/a/a1$d;
+
+    invoke-direct {v1, v0}, Ls0/l/a/a1$d;-><init>(Ls0/l/a/a1$e;)V
+
+    iput-object v1, v0, Ls0/l/a/a1$e;->g:Ls0/l/a/a1$d;
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a2$a$a$a.smali b/com.discord/smali_classes2/s0/l/a/a2$a$a$a.smali
new file mode 100644
index 0000000000..f22917e7d2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a2$a$a$a.smali
@@ -0,0 +1,53 @@
+.class public Ls0/l/a/a2$a$a$a;
+.super Ljava/lang/Object;
+.source "OperatorSubscribeOn.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/a2$a$a;->m(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:J
+
+.field public final synthetic e:Ls0/l/a/a2$a$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/a2$a$a;J)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/a2$a$a$a;->e:Ls0/l/a/a2$a$a;
+
+    iput-wide p2, p0, Ls0/l/a/a2$a$a$a;->d:J
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/a/a2$a$a$a;->e:Ls0/l/a/a2$a$a;
+
+    iget-object v0, v0, Ls0/l/a/a2$a$a;->d:Lrx/Producer;
+
+    iget-wide v1, p0, Ls0/l/a/a2$a$a$a;->d:J
+
+    invoke-interface {v0, v1, v2}, Lrx/Producer;->m(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a2$a$a.smali b/com.discord/smali_classes2/s0/l/a/a2$a$a.smali
new file mode 100644
index 0000000000..7371763ef3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a2$a$a.smali
@@ -0,0 +1,81 @@
+.class public Ls0/l/a/a2$a$a;
+.super Ljava/lang/Object;
+.source "OperatorSubscribeOn.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/a2$a;->setProducer(Lrx/Producer;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Producer;
+
+.field public final synthetic e:Ls0/l/a/a2$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/a2$a;Lrx/Producer;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/a2$a$a;->e:Ls0/l/a/a2$a;
+
+    iput-object p2, p0, Ls0/l/a/a2$a$a;->d:Lrx/Producer;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/a2$a$a;->e:Ls0/l/a/a2$a;
+
+    iget-object v0, v0, Ls0/l/a/a2$a;->h:Ljava/lang/Thread;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    if-eq v0, v1, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/a2$a$a;->e:Ls0/l/a/a2$a;
+
+    iget-boolean v1, v0, Ls0/l/a/a2$a;->e:Z
+
+    if-nez v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, v0, Ls0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
+
+    new-instance v1, Ls0/l/a/a2$a$a$a;
+
+    invoke-direct {v1, p0, p1, p2}, Ls0/l/a/a2$a$a$a;-><init>(Ls0/l/a/a2$a$a;J)V
+
+    invoke-virtual {v0, v1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Ls0/l/a/a2$a$a;->d:Lrx/Producer;
+
+    invoke-interface {v0, p1, p2}, Lrx/Producer;->m(J)V
+
+    :goto_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/a2$a.smali b/com.discord/smali_classes2/s0/l/a/a2$a.smali
new file mode 100644
index 0000000000..e16cff45b3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/a2$a.smali
@@ -0,0 +1,185 @@
+.class public final Ls0/l/a/a2$a;
+.super Lrx/Subscriber;
+.source "OperatorSubscribeOn.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/a2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;",
+        "Lrx/functions/Action0;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Z
+
+.field public final f:Lrx/Scheduler$Worker;
+
+.field public g:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public h:Ljava/lang/Thread;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;ZLrx/Scheduler$Worker;Lrx/Observable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;Z",
+            "Lrx/Scheduler$Worker;",
+            "Lrx/Observable<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/a2$a;->d:Lrx/Subscriber;
+
+    iput-boolean p2, p0, Ls0/l/a/a2$a;->e:Z
+
+    iput-object p3, p0, Ls0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
+
+    iput-object p4, p0, Ls0/l/a/a2$a;->g:Lrx/Observable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/a2$a;->g:Lrx/Observable;
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Ls0/l/a/a2$a;->g:Lrx/Observable;
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    iput-object v1, p0, Ls0/l/a/a2$a;->h:Ljava/lang/Thread;
+
+    invoke-virtual {v0, p0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/a2$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
+
+    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
+
+    throw v0
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/a2$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object p1, p0, Ls0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
+
+    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v0, p0, Ls0/l/a/a2$a;->f:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    throw p1
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/a2$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/a2$a;->d:Lrx/Subscriber;
+
+    new-instance v1, Ls0/l/a/a2$a$a;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/a/a2$a$a;-><init>(Ls0/l/a/a2$a;Lrx/Producer;)V
+
+    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/a2.smali b/com.discord/smali_classes2/s0/l/a/a2.smali
similarity index 78%
rename from com.discord/smali_classes2/r0/l/a/a2.smali
rename to com.discord/smali_classes2/s0/l/a/a2.smali
index b1c106b068..a792436595 100644
--- a/com.discord/smali_classes2/r0/l/a/a2.smali
+++ b/com.discord/smali_classes2/s0/l/a/a2.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/a2;
+.class public final Ls0/l/a/a2;
 .super Ljava/lang/Object;
 .source "OperatorSubscribeOn.java"
 
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lr0/l/a/a2$a;
+        Ls0/l/a/a2$a;
     }
 .end annotation
 
@@ -55,11 +55,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lr0/l/a/a2;->d:Lrx/Scheduler;
+    iput-object p2, p0, Ls0/l/a/a2;->d:Lrx/Scheduler;
 
-    iput-object p1, p0, Lr0/l/a/a2;->e:Lrx/Observable;
+    iput-object p1, p0, Ls0/l/a/a2;->e:Lrx/Observable;
 
-    iput-boolean p3, p0, Lr0/l/a/a2;->f:Z
+    iput-boolean p3, p0, Ls0/l/a/a2;->f:Z
 
     return-void
 .end method
@@ -71,19 +71,19 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lr0/l/a/a2;->d:Lrx/Scheduler;
+    iget-object v0, p0, Ls0/l/a/a2;->d:Lrx/Scheduler;
 
     invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
-    new-instance v1, Lr0/l/a/a2$a;
+    new-instance v1, Ls0/l/a/a2$a;
 
-    iget-boolean v2, p0, Lr0/l/a/a2;->f:Z
+    iget-boolean v2, p0, Ls0/l/a/a2;->f:Z
 
-    iget-object v3, p0, Lr0/l/a/a2;->e:Lrx/Observable;
+    iget-object v3, p0, Ls0/l/a/a2;->e:Lrx/Observable;
 
-    invoke-direct {v1, p1, v2, v0, v3}, Lr0/l/a/a2$a;-><init>(Lrx/Subscriber;ZLrx/Scheduler$Worker;Lrx/Observable;)V
+    invoke-direct {v1, p1, v2, v0, v3}, Ls0/l/a/a2$a;-><init>(Lrx/Subscriber;ZLrx/Scheduler$Worker;Lrx/Observable;)V
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
diff --git a/com.discord/smali_classes2/s0/l/a/b.smali b/com.discord/smali_classes2/s0/l/a/b.smali
new file mode 100644
index 0000000000..7751212918
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/b.smali
@@ -0,0 +1,146 @@
+.class public Ls0/l/a/b;
+.super Ljava/lang/Object;
+.source "BlockingOperatorMostRecent.java"
+
+# interfaces
+.implements Ljava/util/Iterator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/util/Iterator<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Ljava/lang/Object;
+
+.field public final synthetic e:Ls0/l/a/c;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/c;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/b;->e:Ls0/l/a/c;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public hasNext()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/b;->e:Ls0/l/a/c;
+
+    iget-object v0, v0, Ls0/l/a/c;->d:Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    invoke-static {v0}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    xor-int/lit8 v0, v0, 0x1
+
+    return v0
+.end method
+
+.method public next()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    if-nez v1, :cond_0
+
+    iget-object v1, p0, Ls0/l/a/b;->e:Ls0/l/a/c;
+
+    iget-object v1, v1, Ls0/l/a/c;->d:Ljava/lang/Object;
+
+    iput-object v1, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    :cond_0
+    iget-object v1, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    invoke-static {v1}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    iget-object v1, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    instance-of v1, v1, Ls0/l/a/h$c;
+
+    if-nez v1, :cond_1
+
+    iget-object v1, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    invoke-static {v1}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iput-object v0, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    return-object v1
+
+    :cond_1
+    :try_start_1
+    iget-object v1, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    check-cast v1, Ls0/l/a/h$c;
+
+    iget-object v1, v1, Ls0/l/a/h$c;->e:Ljava/lang/Throwable;
+
+    invoke-static {v1}, Lf/n/a/k/a;->O(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v0
+
+    :cond_2
+    :try_start_2
+    new-instance v1, Ljava/util/NoSuchElementException;
+
+    invoke-direct {v1}, Ljava/util/NoSuchElementException;-><init>()V
+
+    throw v1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :catchall_0
+    move-exception v1
+
+    iput-object v0, p0, Ls0/l/a/b;->d:Ljava/lang/Object;
+
+    throw v1
+.end method
+
+.method public remove()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    const-string v1, "Read only iterator"
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/b0.smali b/com.discord/smali_classes2/s0/l/a/b0.smali
new file mode 100644
index 0000000000..0f21b01cc8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/b0.smali
@@ -0,0 +1,232 @@
+.class public final Ls0/l/a/b0;
+.super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-",
+            "Lrx/Observable<",
+            "+",
+            "Ls0/f<",
+            "*>;>;+",
+            "Lrx/Observable<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Z
+
+.field public final g:Z
+
+.field public final h:Lrx/Scheduler;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;Ls0/k/b;ZZLrx/Scheduler;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "TT;>;",
+            "Ls0/k/b<",
+            "-",
+            "Lrx/Observable<",
+            "+",
+            "Ls0/f<",
+            "*>;>;+",
+            "Lrx/Observable<",
+            "*>;>;ZZ",
+            "Lrx/Scheduler;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/b0;->d:Lrx/Observable;
+
+    iput-object p2, p0, Ls0/l/a/b0;->e:Ls0/k/b;
+
+    iput-boolean p3, p0, Ls0/l/a/b0;->f:Z
+
+    iput-boolean p4, p0, Ls0/l/a/b0;->g:Z
+
+    iput-object p5, p0, Ls0/l/a/b0;->h:Lrx/Scheduler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 14
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v8, Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    const/4 v0, 0x1
+
+    invoke-direct {v8, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
+
+    new-instance v9, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {v9}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iget-object v0, p0, Ls0/l/a/b0;->h:Lrx/Scheduler;
+
+    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v10
+
+    invoke-virtual {p1, v10}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v6, Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {v6}, Lrx/subscriptions/SerialSubscription;-><init>()V
+
+    invoke-virtual {p1, v6}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->g0()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    const-class v1, Lrx/subjects/BehaviorSubject;
+
+    const-class v2, Lrx/subjects/SerializedSubject;
+
+    if-ne v1, v2, :cond_0
+
+    check-cast v0, Lrx/subjects/SerializedSubject;
+
+    move-object v7, v0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Lrx/subjects/SerializedSubject;
+
+    invoke-direct {v1, v0}, Lrx/subjects/SerializedSubject;-><init>(Lrx/subjects/Subject;)V
+
+    move-object v7, v1
+
+    :goto_0
+    sget-object v0, Ls0/n/a;->a:Ls0/g;
+
+    new-instance v1, Ls0/n/d;
+
+    invoke-direct {v1, v0}, Ls0/n/d;-><init>(Ls0/g;)V
+
+    invoke-virtual {v7, v1}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
+
+    new-instance v11, Ls0/l/b/a;
+
+    invoke-direct {v11}, Ls0/l/b/a;-><init>()V
+
+    new-instance v12, Ls0/l/a/w;
+
+    move-object v0, v12
+
+    move-object v1, p0
+
+    move-object v2, p1
+
+    move-object v3, v7
+
+    move-object v4, v11
+
+    move-object v5, v9
+
+    invoke-direct/range {v0 .. v6}, Ls0/l/a/w;-><init>(Ls0/l/a/b0;Lrx/Subscriber;Lrx/subjects/Subject;Ls0/l/b/a;Ljava/util/concurrent/atomic/AtomicLong;Lrx/subscriptions/SerialSubscription;)V
+
+    iget-object v0, p0, Ls0/l/a/b0;->e:Ls0/k/b;
+
+    new-instance v1, Ls0/l/a/y;
+
+    invoke-direct {v1, p0}, Ls0/l/a/y;-><init>(Ls0/l/a/b0;)V
+
+    new-instance v2, Ls0/l/a/u;
+
+    iget-object v3, v7, Lrx/Observable;->d:Lrx/Observable$a;
+
+    invoke-direct {v2, v3, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+
+    invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v2, v0
+
+    check-cast v2, Lrx/Observable;
+
+    new-instance v13, Ls0/l/a/z;
+
+    move-object v0, v13
+
+    move-object v1, p0
+
+    move-object v3, p1
+
+    move-object v4, v9
+
+    move-object v5, v10
+
+    move-object v6, v12
+
+    move-object v7, v8
+
+    invoke-direct/range {v0 .. v7}, Ls0/l/a/z;-><init>(Ls0/l/a/b0;Lrx/Observable;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicLong;Lrx/Scheduler$Worker;Lrx/functions/Action0;Ljava/util/concurrent/atomic/AtomicBoolean;)V
+
+    invoke-virtual {v10, v13}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    new-instance v7, Ls0/l/a/a0;
+
+    move-object v0, v7
+
+    move-object v2, v9
+
+    move-object v3, v11
+
+    move-object v4, v8
+
+    invoke-direct/range {v0 .. v6}, Ls0/l/a/a0;-><init>(Ls0/l/a/b0;Ljava/util/concurrent/atomic/AtomicLong;Ls0/l/b/a;Ljava/util/concurrent/atomic/AtomicBoolean;Lrx/Scheduler$Worker;Lrx/functions/Action0;)V
+
+    invoke-virtual {p1, v7}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/b1.smali b/com.discord/smali_classes2/s0/l/a/b1.smali
new file mode 100644
index 0000000000..0983658079
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/b1.smali
@@ -0,0 +1,47 @@
+.class public Ls0/l/a/b1;
+.super Ljava/lang/Object;
+.source "OperatorObserveOn.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/c1$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/c1$a;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/b1;->d:Ls0/l/a/c1$a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/b1;->d:Ls0/l/a/c1$a;
+
+    iget-object v0, v0, Ls0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    iget-object p1, p0, Ls0/l/a/b1;->d:Ls0/l/a/c1$a;
+
+    invoke-virtual {p1}, Ls0/l/a/c1$a;->b()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/b2$a.smali b/com.discord/smali_classes2/s0/l/a/b2$a.smali
new file mode 100644
index 0000000000..9e6a83c103
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/b2$a.smali
@@ -0,0 +1,42 @@
+.class public final Ls0/l/a/b2$a;
+.super Ljava/lang/Object;
+.source "OperatorSwitch.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/b2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/b2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/b2<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ls0/l/a/b2;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Ls0/l/a/b2;-><init>(Z)V
+
+    sput-object v0, Ls0/l/a/b2$a;->a:Ls0/l/a/b2;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/b2$b.smali b/com.discord/smali_classes2/s0/l/a/b2$b.smali
new file mode 100644
index 0000000000..05b7194c3f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/b2$b.smali
@@ -0,0 +1,286 @@
+.class public final Ls0/l/a/b2$b;
+.super Lrx/Subscriber;
+.source "OperatorSwitch.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/b2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:Ls0/l/a/b2$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/b2$c<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(JLs0/l/a/b2$c;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(J",
+            "Ls0/l/a/b2$c<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-wide p1, p0, Ls0/l/a/b2$b;->d:J
+
+    iput-object p3, p0, Ls0/l/a/b2$b;->e:Ls0/l/a/b2$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/b2$b;->e:Ls0/l/a/b2$c;
+
+    iget-wide v1, p0, Ls0/l/a/b2$b;->d:J
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v3, v0, Ls0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    cmp-long v5, v3, v1
+
+    if-eqz v5, :cond_0
+
+    monitor-exit v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    iput-boolean v1, v0, Ls0/l/a/b2$c;->o:Z
+
+    const/4 v1, 0x0
+
+    iput-object v1, v0, Ls0/l/a/b2$c;->l:Lrx/Producer;
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Ls0/l/a/b2$c;->b()V
+
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    :try_start_1
+    monitor-exit v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v1
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/b2$b;->e:Ls0/l/a/b2$c;
+
+    iget-wide v1, p0, Ls0/l/a/b2$b;->d:J
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v3, v0, Ls0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    cmp-long v5, v3, v1
+
+    if-nez v5, :cond_0
+
+    invoke-virtual {v0, p1}, Ls0/l/a/b2$c;->c(Ljava/lang/Throwable;)Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    iput-boolean v2, v0, Ls0/l/a/b2$c;->o:Z
+
+    const/4 v2, 0x0
+
+    iput-object v2, v0, Ls0/l/a/b2$c;->l:Lrx/Producer;
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x1
+
+    :goto_0
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v0}, Ls0/l/a/b2$c;->b()V
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :goto_1
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/b2$b;->e:Ls0/l/a/b2$c;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, v0, Ls0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    iget-wide v3, p0, Ls0/l/a/b2$b;->d:J
+
+    cmp-long v5, v1, v3
+
+    if-eqz v5, :cond_0
+
+    monitor-exit v0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, v0, Ls0/l/a/b2$c;->h:Ls0/l/e/m/e;
+
+    if-nez p1, :cond_1
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_1
+    invoke-virtual {v1, p0, p1}, Ls0/l/e/m/e;->j(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Ls0/l/a/b2$c;->b()V
+
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/b2$b;->e:Ls0/l/a/b2$c;
+
+    iget-wide v1, p0, Ls0/l/a/b2$b;->d:J
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v3, v0, Ls0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    cmp-long v5, v3, v1
+
+    if-eqz v5, :cond_0
+
+    monitor-exit v0
+
+    goto :goto_0
+
+    :cond_0
+    iget-wide v1, v0, Ls0/l/a/b2$c;->k:J
+
+    iput-object p1, v0, Ls0/l/a/b2$c;->l:Lrx/Producer;
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-interface {p1, v1, v2}, Lrx/Producer;->m(J)V
+
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/b2$c.smali b/com.discord/smali_classes2/s0/l/a/b2$c.smali
new file mode 100644
index 0000000000..2300a4b87b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/b2$c.smali
@@ -0,0 +1,632 @@
+.class public final Ls0/l/a/b2$c;
+.super Lrx/Subscriber;
+.source "OperatorSwitch.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/b2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "Lrx/Observable<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final p:Ljava/lang/Throwable;
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/subscriptions/SerialSubscription;
+
+.field public final f:Z
+
+.field public final g:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final h:Ls0/l/e/m/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/e/m/e<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public i:Z
+
+.field public j:Z
+
+.field public k:J
+
+.field public l:Lrx/Producer;
+
+.field public volatile m:Z
+
+.field public n:Ljava/lang/Throwable;
+
+.field public o:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/Throwable;
+
+    const-string v1, "Terminal error"
+
+    invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ls0/l/a/b2$c;->p:Ljava/lang/Throwable;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/Subscriber;Z)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;Z)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/b2$c;->d:Lrx/Subscriber;
+
+    new-instance p1, Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
+
+    iput-boolean p2, p0, Ls0/l/a/b2$c;->f:Z
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance p1, Ls0/l/e/m/e;
+
+    sget p2, Ls0/l/e/h;->f:I
+
+    invoke-direct {p1, p2}, Ls0/l/e/m/e;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/b2$c;->h:Ls0/l/e/m/e;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(ZZLjava/lang/Throwable;Ls0/l/e/m/e;Lrx/Subscriber;Z)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Ljava/lang/Throwable;",
+            "Ls0/l/e/m/e<",
+            "Ljava/lang/Object;",
+            ">;",
+            "Lrx/Subscriber<",
+            "-TT;>;Z)Z"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/b2$c;->f:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_1
+
+    if-eqz p1, :cond_3
+
+    if-nez p2, :cond_3
+
+    if-eqz p6, :cond_3
+
+    if-eqz p3, :cond_0
+
+    invoke-interface {p5, p3}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p5}, Ls0/g;->onCompleted()V
+
+    :goto_0
+    return v1
+
+    :cond_1
+    if-eqz p3, :cond_2
+
+    invoke-virtual {p4}, Ls0/l/e/m/e;->clear()V
+
+    invoke-interface {p5, p3}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return v1
+
+    :cond_2
+    if-eqz p1, :cond_3
+
+    if-nez p2, :cond_3
+
+    if-eqz p6, :cond_3
+
+    invoke-interface {p5}, Ls0/g;->onCompleted()V
+
+    return v1
+
+    :cond_3
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public b()V
+    .locals 20
+
+    move-object/from16 v8, p0
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, v8, Ls0/l/a/b2$c;->i:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, v8, Ls0/l/a/b2$c;->j:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    iput-boolean v1, v8, Ls0/l/a/b2$c;->i:Z
+
+    iget-boolean v0, v8, Ls0/l/a/b2$c;->o:Z
+
+    iget-wide v1, v8, Ls0/l/a/b2$c;->k:J
+
+    iget-object v3, v8, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    if-eqz v3, :cond_1
+
+    sget-object v4, Ls0/l/a/b2$c;->p:Ljava/lang/Throwable;
+
+    if-eq v3, v4, :cond_1
+
+    iget-boolean v4, v8, Ls0/l/a/b2$c;->f:Z
+
+    if-nez v4, :cond_1
+
+    sget-object v4, Ls0/l/a/b2$c;->p:Ljava/lang/Throwable;
+
+    iput-object v4, v8, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    :cond_1
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    iget-object v9, v8, Ls0/l/a/b2$c;->h:Ls0/l/e/m/e;
+
+    iget-object v10, v8, Ls0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iget-object v11, v8, Ls0/l/a/b2$c;->d:Lrx/Subscriber;
+
+    iget-boolean v4, v8, Ls0/l/a/b2$c;->m:Z
+
+    move-wide v12, v1
+
+    move-object v14, v3
+
+    move v15, v4
+
+    :goto_0
+    const-wide/16 v1, 0x0
+
+    move-wide/from16 v16, v1
+
+    :cond_2
+    :goto_1
+    cmp-long v18, v16, v12
+
+    if-eqz v18, :cond_6
+
+    invoke-virtual {v11}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    return-void
+
+    :cond_3
+    invoke-virtual {v9}, Ls0/l/e/m/e;->isEmpty()Z
+
+    move-result v19
+
+    move-object/from16 v1, p0
+
+    move v2, v15
+
+    move v3, v0
+
+    move-object v4, v14
+
+    move-object v5, v9
+
+    move-object v6, v11
+
+    move/from16 v7, v19
+
+    invoke-virtual/range {v1 .. v7}, Ls0/l/a/b2$c;->a(ZZLjava/lang/Throwable;Ls0/l/e/m/e;Lrx/Subscriber;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_4
+
+    return-void
+
+    :cond_4
+    if-eqz v19, :cond_5
+
+    goto :goto_2
+
+    :cond_5
+    invoke-virtual {v9}, Ls0/l/e/m/e;->poll()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ls0/l/a/b2$b;
+
+    invoke-virtual {v9}, Ls0/l/e/m/e;->poll()Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-static {v2}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    invoke-virtual {v10}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    iget-wide v5, v1, Ls0/l/a/b2$b;->d:J
+
+    cmp-long v1, v3, v5
+
+    if-nez v1, :cond_2
+
+    invoke-interface {v11, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    const-wide/16 v1, 0x1
+
+    add-long v16, v16, v1
+
+    goto :goto_1
+
+    :cond_6
+    :goto_2
+    if-nez v18, :cond_8
+
+    invoke-virtual {v11}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    return-void
+
+    :cond_7
+    iget-boolean v2, v8, Ls0/l/a/b2$c;->m:Z
+
+    invoke-virtual {v9}, Ls0/l/e/m/e;->isEmpty()Z
+
+    move-result v7
+
+    move-object/from16 v1, p0
+
+    move v3, v0
+
+    move-object v4, v14
+
+    move-object v5, v9
+
+    move-object v6, v11
+
+    invoke-virtual/range {v1 .. v7}, Ls0/l/a/b2$c;->a(ZZLjava/lang/Throwable;Ls0/l/e/m/e;Lrx/Subscriber;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_8
+
+    return-void
+
+    :cond_8
+    monitor-enter p0
+
+    :try_start_1
+    iget-wide v0, v8, Ls0/l/a/b2$c;->k:J
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_9
+
+    sub-long v0, v0, v16
+
+    iput-wide v0, v8, Ls0/l/a/b2$c;->k:J
+
+    :cond_9
+    move-wide v12, v0
+
+    iget-boolean v0, v8, Ls0/l/a/b2$c;->j:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_a
+
+    iput-boolean v1, v8, Ls0/l/a/b2$c;->i:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_a
+    iput-boolean v1, v8, Ls0/l/a/b2$c;->j:Z
+
+    iget-boolean v15, v8, Ls0/l/a/b2$c;->m:Z
+
+    iget-boolean v0, v8, Ls0/l/a/b2$c;->o:Z
+
+    iget-object v14, v8, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    if-eqz v14, :cond_b
+
+    sget-object v1, Ls0/l/a/b2$c;->p:Ljava/lang/Throwable;
+
+    if-eq v14, v1, :cond_b
+
+    iget-boolean v1, v8, Ls0/l/a/b2$c;->f:Z
+
+    if-nez v1, :cond_b
+
+    sget-object v1, Ls0/l/a/b2$c;->p:Ljava/lang/Throwable;
+
+    iput-object v1, v8, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    :cond_b
+    monitor-exit p0
+
+    goto/16 :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v0
+
+    :catchall_1
+    move-exception v0
+
+    :try_start_2
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw v0
+.end method
+
+.method public c(Ljava/lang/Throwable;)Z
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    sget-object v1, Ls0/l/a/b2$c;->p:Ljava/lang/Throwable;
+
+    const/4 v2, 0x0
+
+    if-ne v0, v1, :cond_0
+
+    return v2
+
+    :cond_0
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_1
+
+    iput-object p1, p0, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_1
+    instance-of v3, v0, Lrx/exceptions/CompositeException;
+
+    if-eqz v3, :cond_2
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    check-cast v0, Lrx/exceptions/CompositeException;
+
+    iget-object v0, v0, Lrx/exceptions/CompositeException;->exceptions:Ljava/util/List;
+
+    invoke-direct {v2, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    invoke-virtual {v2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    new-instance p1, Lrx/exceptions/CompositeException;
+
+    invoke-direct {p1, v2}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    iput-object p1, p0, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v3, Lrx/exceptions/CompositeException;
+
+    const/4 v4, 0x2
+
+    new-array v4, v4, [Ljava/lang/Throwable;
+
+    aput-object v0, v4, v2
+
+    aput-object p1, v4, v1
+
+    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
+
+    iput-object v3, p0, Ls0/l/a/b2$c;->n:Ljava/lang/Throwable;
+
+    :goto_0
+    return v1
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/b2$c;->m:Z
+
+    invoke-virtual {p0}, Ls0/l/a/b2$c;->b()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-virtual {p0, p1}, Ls0/l/a/b2$c;->c(Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/b2$c;->m:Z
+
+    invoke-virtual {p0}, Ls0/l/a/b2$c;->b()V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 3
+
+    check-cast p1, Lrx/Observable;
+
+    iget-object v0, p0, Ls0/l/a/b2$c;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Ls0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
+
+    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->d:Ls0/l/d/a;
+
+    invoke-virtual {v2}, Ls0/l/d/a;->a()Lrx/Subscription;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {v2}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    new-instance v2, Ls0/l/a/b2$b;
+
+    invoke-direct {v2, v0, v1, p0}, Ls0/l/a/b2$b;-><init>(JLs0/l/a/b2$c;)V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/b2$c;->o:Z
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ls0/l/a/b2$c;->l:Lrx/Producer;
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v0, v2}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v2}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/b2.smali b/com.discord/smali_classes2/s0/l/a/b2.smali
new file mode 100644
index 0000000000..eb690d8d6b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/b2.smali
@@ -0,0 +1,89 @@
+.class public final Ls0/l/a/b2;
+.super Ljava/lang/Object;
+.source "OperatorSwitch.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/b2$b;,
+        Ls0/l/a/b2$c;,
+        Ls0/l/a/b2$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;",
+        "Lrx/Observable<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Z
+
+
+# direct methods
+.method public constructor <init>(Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Ls0/l/a/b2;->d:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/b2$c;
+
+    iget-boolean v1, p0, Ls0/l/a/b2;->d:Z
+
+    invoke-direct {v0, p1, v1}, Ls0/l/a/b2$c;-><init>(Lrx/Subscriber;Z)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object p1, v0, Ls0/l/a/b2$c;->d:Lrx/Subscriber;
+
+    iget-object v1, v0, Ls0/l/a/b2$c;->e:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object p1, v0, Ls0/l/a/b2$c;->d:Lrx/Subscriber;
+
+    new-instance v1, Ls0/l/a/c2;
+
+    invoke-direct {v1, v0}, Ls0/l/a/c2;-><init>(Ls0/l/a/b2$c;)V
+
+    new-instance v2, Ls0/r/a;
+
+    invoke-direct {v2, v1}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object p1, v0, Ls0/l/a/b2$c;->d:Lrx/Subscriber;
+
+    new-instance v1, Ls0/l/a/d2;
+
+    invoke-direct {v1, v0}, Ls0/l/a/d2;-><init>(Ls0/l/a/b2$c;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/c.smali b/com.discord/smali_classes2/s0/l/a/c.smali
new file mode 100644
index 0000000000..7ab8fe6e11
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/c.smali
@@ -0,0 +1,83 @@
+.class public final Ls0/l/a/c;
+.super Lrx/Subscriber;
+.source "BlockingOperatorMostRecent.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public volatile d:Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    iput-object p1, p0, Ls0/l/a/c;->d:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    sget-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/a/c;->d:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/h$c;
+
+    invoke-direct {v0, p1}, Ls0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
+
+    iput-object v0, p0, Ls0/l/a/c;->d:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    iput-object p1, p0, Ls0/l/a/c;->d:Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/c0.smali b/com.discord/smali_classes2/s0/l/a/c0.smali
new file mode 100644
index 0000000000..0b1d77d664
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/c0.smali
@@ -0,0 +1,123 @@
+.class public Ls0/l/a/c0;
+.super Ljava/lang/Object;
+.source "OnSubscribeRefCount.java"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Lrx/Subscription;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+.field public final synthetic e:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field public final synthetic f:Ls0/l/a/f0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/f0;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicBoolean;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/c0;->f:Ls0/l/a/f0;
+
+    iput-object p2, p0, Ls0/l/a/c0;->d:Lrx/Subscriber;
+
+    iput-object p3, p0, Ls0/l/a/c0;->e:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 5
+
+    check-cast p1, Lrx/Subscription;
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/c0;->f:Ls0/l/a/f0;
+
+    iget-object v1, v1, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v1, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    iget-object p1, p0, Ls0/l/a/c0;->f:Ls0/l/a/f0;
+
+    iget-object v1, p0, Ls0/l/a/c0;->d:Lrx/Subscriber;
+
+    iget-object v2, p0, Ls0/l/a/c0;->f:Ls0/l/a/f0;
+
+    iget-object v2, v2, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    if-eqz p1, :cond_0
+
+    new-instance v3, Ls0/l/a/e0;
+
+    invoke-direct {v3, p1, v2}, Ls0/l/a/e0;-><init>(Ls0/l/a/f0;Lrx/subscriptions/CompositeSubscription;)V
+
+    new-instance v4, Ls0/r/a;
+
+    invoke-direct {v4, v3}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {v1, v4}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v3, p1, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    new-instance v4, Ls0/l/a/d0;
+
+    invoke-direct {v4, p1, v1, v1, v2}, Ls0/l/a/d0;-><init>(Ls0/l/a/f0;Lrx/Subscriber;Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
+
+    invoke-virtual {v3, v4}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object p1, p0, Ls0/l/a/c0;->f:Ls0/l/a/f0;
+
+    iget-object p1, p1, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    iget-object p1, p0, Ls0/l/a/c0;->e:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
+
+    return-void
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :try_start_1
+    throw p1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v1, p0, Ls0/l/a/c0;->f:Ls0/l/a/f0;
+
+    iget-object v1, v1, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    iget-object v1, p0, Ls0/l/a/c0;->e:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/c1$a.smali b/com.discord/smali_classes2/s0/l/a/c1$a.smali
new file mode 100644
index 0000000000..40d1bd50b2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/c1$a.smali
@@ -0,0 +1,529 @@
+.class public final Ls0/l/a/c1$a;
+.super Lrx/Subscriber;
+.source "OperatorObserveOn.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/c1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;",
+        "Lrx/functions/Action0;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/Scheduler$Worker;
+
+.field public final f:Z
+
+.field public final g:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final h:I
+
+.field public volatile i:Z
+
+.field public final j:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final k:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public l:Ljava/lang/Throwable;
+
+.field public m:J
+
+
+# direct methods
+.method public constructor <init>(Lrx/Scheduler;Lrx/Subscriber;ZI)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Scheduler;",
+            "Lrx/Subscriber<",
+            "-TT;>;ZI)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/c1$a;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iput-object p2, p0, Ls0/l/a/c1$a;->d:Lrx/Subscriber;
+
+    invoke-virtual {p1}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object p1
+
+    iput-object p1, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    iput-boolean p3, p0, Ls0/l/a/c1$a;->f:Z
+
+    if-lez p4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget p4, Ls0/l/e/h;->f:I
+
+    :goto_0
+    shr-int/lit8 p1, p4, 0x2
+
+    sub-int p1, p4, p1
+
+    iput p1, p0, Ls0/l/a/c1$a;->h:I
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    new-instance p1, Ls0/l/e/n/n;
+
+    invoke-direct {p1, p4}, Ls0/l/e/n/n;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/c1$a;->g:Ljava/util/Queue;
+
+    goto :goto_1
+
+    :cond_1
+    new-instance p1, Ls0/l/e/m/c;
+
+    invoke-direct {p1, p4}, Ls0/l/e/m/c;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/c1$a;->g:Ljava/util/Queue;
+
+    :goto_1
+    int-to-long p1, p4
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Lrx/Subscriber<",
+            "-TT;>;",
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;)Z"
+        }
+    .end annotation
+
+    invoke-virtual {p3}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p4}, Ljava/util/Queue;->clear()V
+
+    return v1
+
+    :cond_0
+    if-eqz p1, :cond_4
+
+    iget-boolean p1, p0, Ls0/l/a/c1$a;->f:Z
+
+    if-eqz p1, :cond_2
+
+    if-eqz p2, :cond_4
+
+    iget-object p1, p0, Ls0/l/a/c1$a;->l:Ljava/lang/Throwable;
+
+    if-eqz p1, :cond_1
+
+    :try_start_0
+    invoke-interface {p3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {p3}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_0
+    iget-object p1, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    iget-object p2, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {p2}, Lrx/Subscription;->unsubscribe()V
+
+    throw p1
+
+    :cond_2
+    iget-object p1, p0, Ls0/l/a/c1$a;->l:Ljava/lang/Throwable;
+
+    if-eqz p1, :cond_3
+
+    invoke-interface {p4}, Ljava/util/Queue;->clear()V
+
+    :try_start_1
+    invoke-interface {p3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    iget-object p1, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
+
+    return v1
+
+    :catchall_1
+    move-exception p1
+
+    iget-object p2, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {p2}, Lrx/Subscription;->unsubscribe()V
+
+    throw p1
+
+    :cond_3
+    if-eqz p2, :cond_4
+
+    :try_start_2
+    invoke-interface {p3}, Ls0/g;->onCompleted()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    iget-object p1, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
+
+    return v1
+
+    :catchall_2
+    move-exception p1
+
+    iget-object p2, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {p2}, Lrx/Subscription;->unsubscribe()V
+
+    throw p1
+
+    :cond_4
+    :goto_1
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public b()V
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/a/c1$a;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
+
+    move-result-wide v0
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-virtual {v0, p0}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    :cond_0
+    return-void
+.end method
+
+.method public call()V
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    iget-wide v1, v0, Ls0/l/a/c1$a;->m:J
+
+    iget-object v3, v0, Ls0/l/a/c1$a;->g:Ljava/util/Queue;
+
+    iget-object v4, v0, Ls0/l/a/c1$a;->d:Lrx/Subscriber;
+
+    const-wide/16 v5, 0x1
+
+    move-wide v7, v5
+
+    :cond_0
+    iget-object v9, v0, Ls0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v9}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v9
+
+    :cond_1
+    :goto_0
+    cmp-long v13, v9, v1
+
+    if-eqz v13, :cond_5
+
+    iget-boolean v14, v0, Ls0/l/a/c1$a;->i:Z
+
+    invoke-interface {v3}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v15
+
+    if-nez v15, :cond_2
+
+    const/16 v16, 0x1
+
+    const/4 v11, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/16 v16, 0x0
+
+    const/4 v11, 0x0
+
+    :goto_1
+    invoke-virtual {v0, v14, v11, v4, v3}, Ls0/l/a/c1$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_3
+
+    return-void
+
+    :cond_3
+    if-eqz v11, :cond_4
+
+    goto :goto_2
+
+    :cond_4
+    invoke-static {v15}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v11
+
+    invoke-interface {v4, v11}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    add-long/2addr v1, v5
+
+    iget v11, v0, Ls0/l/a/c1$a;->h:I
+
+    int-to-long v11, v11
+
+    cmp-long v13, v1, v11
+
+    if-nez v13, :cond_1
+
+    iget-object v9, v0, Ls0/l/a/c1$a;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v9, v1, v2}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    move-result-wide v9
+
+    invoke-virtual {v0, v1, v2}, Lrx/Subscriber;->request(J)V
+
+    const-wide/16 v1, 0x0
+
+    goto :goto_0
+
+    :cond_5
+    :goto_2
+    if-nez v13, :cond_6
+
+    iget-boolean v9, v0, Ls0/l/a/c1$a;->i:Z
+
+    invoke-interface {v3}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v10
+
+    invoke-virtual {v0, v9, v10, v4, v3}, Ls0/l/a/c1$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_6
+
+    return-void
+
+    :cond_6
+    iput-wide v1, v0, Ls0/l/a/c1$a;->m:J
+
+    iget-object v9, v0, Ls0/l/a/c1$a;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    neg-long v7, v7
+
+    invoke-virtual {v9, v7, v8}, Ljava/util/concurrent/atomic/AtomicLong;->addAndGet(J)J
+
+    move-result-wide v7
+
+    const-wide/16 v9, 0x0
+
+    cmp-long v11, v7, v9
+
+    if-nez v11, :cond_0
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget-boolean v0, p0, Ls0/l/a/c1$a;->i:Z
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/c1$a;->i:Z
+
+    invoke-virtual {p0}, Ls0/l/a/c1$a;->b()V
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget-boolean v0, p0, Ls0/l/a/c1$a;->i:Z
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iput-object p1, p0, Ls0/l/a/c1$a;->l:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/c1$a;->i:Z
+
+    invoke-virtual {p0}, Ls0/l/a/c1$a;->b()V
+
+    return-void
+
+    :cond_1
+    :goto_0
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    iget-boolean v0, p0, Ls0/l/a/c1$a;->i:Z
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/c1$a;->g:Ljava/util/Queue;
+
+    if-nez p1, :cond_1
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_1
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_2
+
+    new-instance p1, Lrx/exceptions/MissingBackpressureException;
+
+    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
+
+    invoke-virtual {p0, p1}, Ls0/l/a/c1$a;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_2
+    invoke-virtual {p0}, Ls0/l/a/c1$a;->b()V
+
+    :cond_3
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/c1.smali b/com.discord/smali_classes2/s0/l/a/c1.smali
new file mode 100644
index 0000000000..e58a5e1155
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/c1.smali
@@ -0,0 +1,101 @@
+.class public final Ls0/l/a/c1;
+.super Ljava/lang/Object;
+.source "OperatorObserveOn.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/c1$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Scheduler;
+
+.field public final e:Z
+
+.field public final f:I
+
+
+# direct methods
+.method public constructor <init>(Lrx/Scheduler;ZI)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/c1;->d:Lrx/Scheduler;
+
+    iput-boolean p2, p0, Ls0/l/a/c1;->e:Z
+
+    if-lez p3, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    sget p3, Ls0/l/e/h;->f:I
+
+    :goto_0
+    iput p3, p0, Ls0/l/a/c1;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/c1;->d:Lrx/Scheduler;
+
+    instance-of v1, v0, Ls0/l/c/l;
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ls0/l/a/c1$a;
+
+    iget-boolean v2, p0, Ls0/l/a/c1;->e:Z
+
+    iget v3, p0, Ls0/l/a/c1;->f:I
+
+    invoke-direct {v1, v0, p1, v2, v3}, Ls0/l/a/c1$a;-><init>(Lrx/Scheduler;Lrx/Subscriber;ZI)V
+
+    iget-object p1, v1, Ls0/l/a/c1$a;->d:Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/b1;
+
+    invoke-direct {v0, v1}, Ls0/l/a/b1;-><init>(Ls0/l/a/c1$a;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    iget-object v0, v1, Ls0/l/a/c1$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    move-object p1, v1
+
+    :goto_0
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/c2.smali b/com.discord/smali_classes2/s0/l/a/c2.smali
new file mode 100644
index 0000000000..631656db30
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/c2.smali
@@ -0,0 +1,50 @@
+.class public Ls0/l/a/c2;
+.super Ljava/lang/Object;
+.source "OperatorSwitch.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/b2$c;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/b2$c;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/c2;->d:Ls0/l/a/b2$c;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/c2;->d:Ls0/l/a/b2$c;
+
+    monitor-enter v0
+
+    const/4 v1, 0x0
+
+    :try_start_0
+    iput-object v1, v0, Ls0/l/a/b2$c;->l:Lrx/Producer;
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/d$a.smali b/com.discord/smali_classes2/s0/l/a/d$a.smali
new file mode 100644
index 0000000000..487a51dd82
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/d$a.smali
@@ -0,0 +1,150 @@
+.class public final Ls0/l/a/d$a;
+.super Ljava/lang/Object;
+.source "DeferredScalarSubscriber.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/d;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/l/a/d;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/d<",
+            "**>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/d;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/d<",
+            "**>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/d$a;->d:Ls0/l/a/d;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 4
+
+    iget-object v0, p0, Ls0/l/a/d$a;->d:Ls0/l/a/d;
+
+    if-eqz v0, :cond_5
+
+    const-wide/16 v1, 0x0
+
+    cmp-long v3, p1, v1
+
+    if-ltz v3, :cond_4
+
+    if-eqz v3, :cond_3
+
+    iget-object p1, v0, Ls0/l/a/d;->d:Lrx/Subscriber;
+
+    :cond_0
+    iget-object p2, v0, Ls0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+
+    move-result p2
+
+    const/4 v1, 0x1
+
+    if-eq p2, v1, :cond_3
+
+    const/4 v2, 0x3
+
+    if-eq p2, v2, :cond_3
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v3, 0x2
+
+    if-ne p2, v3, :cond_2
+
+    iget-object p2, v0, Ls0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {p2, v3, v2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_3
+
+    iget-object p2, v0, Ls0/l/a/d;->f:Ljava/lang/Object;
+
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p2
+
+    if-nez p2, :cond_3
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    goto :goto_0
+
+    :cond_2
+    iget-object p2, v0, Ls0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p2, v2, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_0
+
+    :cond_3
+    :goto_0
+    return-void
+
+    :cond_4
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "n >= 0 required but it was "
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_5
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/d.smali b/com.discord/smali_classes2/s0/l/a/d.smali
new file mode 100644
index 0000000000..37af2c6735
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/d.smali
@@ -0,0 +1,164 @@
+.class public abstract Ls0/l/a/d;
+.super Lrx/Subscriber;
+.source "DeferredScalarSubscriber.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/d$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+.field public f:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TR;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/d;->d:Lrx/Subscriber;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 6
+
+    iget-boolean v0, p0, Ls0/l/a/d;->e:Z
+
+    if-eqz v0, :cond_4
+
+    iget-object v0, p0, Ls0/l/a/d;->f:Ljava/lang/Object;
+
+    iget-object v1, p0, Ls0/l/a/d;->d:Lrx/Subscriber;
+
+    :cond_0
+    iget-object v2, p0, Ls0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+
+    move-result v2
+
+    const/4 v3, 0x2
+
+    if-eq v2, v3, :cond_5
+
+    const/4 v4, 0x3
+
+    if-eq v2, v4, :cond_5
+
+    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v5, 0x1
+
+    if-ne v2, v5, :cond_3
+
+    invoke-interface {v1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    invoke-interface {v1}, Ls0/g;->onCompleted()V
+
+    :cond_2
+    iget-object v0, p0, Ls0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->lazySet(I)V
+
+    goto :goto_0
+
+    :cond_3
+    iput-object v0, p0, Ls0/l/a/d;->f:Ljava/lang/Object;
+
+    iget-object v2, p0, Ls0/l/a/d;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    const/4 v4, 0x0
+
+    invoke-virtual {v2, v4, v3}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    goto :goto_0
+
+    :cond_4
+    iget-object v0, p0, Ls0/l/a/d;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    :cond_5
+    :goto_0
+    return-void
+.end method
+
+.method public final setProducer(Lrx/Producer;)V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/d0.smali b/com.discord/smali_classes2/s0/l/a/d0.smali
new file mode 100644
index 0000000000..3ca64f963c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/d0.smali
@@ -0,0 +1,157 @@
+.class public Ls0/l/a/d0;
+.super Lrx/Subscriber;
+.source "OnSubscribeRefCount.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+.field public final synthetic e:Lrx/subscriptions/CompositeSubscription;
+
+.field public final synthetic f:Ls0/l/a/f0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/f0;Lrx/Subscriber;Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iput-object p3, p0, Ls0/l/a/d0;->d:Lrx/Subscriber;
+
+    iput-object p4, p0, Ls0/l/a/d0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-object v1, p0, Ls0/l/a/d0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    if-ne v0, v1, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    instance-of v0, v0, Lrx/Subscription;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    check-cast v0, Lrx/Subscription;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    new-instance v1, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object v1, v0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->set(I)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_1
+    iget-object v0, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/d0;->f:Ls0/l/a/f0;
+
+    iget-object v1, v1, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    throw v0
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    invoke-virtual {p0}, Ls0/l/a/d0;->a()V
+
+    iget-object v0, p0, Ls0/l/a/d0;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    invoke-virtual {p0}, Ls0/l/a/d0;->a()V
+
+    iget-object v0, p0, Ls0/l/a/d0;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/d0;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/d1$a.smali b/com.discord/smali_classes2/s0/l/a/d1$a.smali
new file mode 100644
index 0000000000..9fc68a7869
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/d1$a.smali
@@ -0,0 +1,349 @@
+.class public final Ls0/l/a/d1$a;
+.super Lrx/Subscriber;
+.source "OperatorOnBackpressureBuffer.java"
+
+# interfaces
+.implements Ls0/l/e/c$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/d1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;",
+        "Ls0/l/e/c$a;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final f:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field public final h:Ls0/l/e/c;
+
+.field public final i:Lrx/functions/Action0;
+
+.field public final j:Ls0/a$b;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ljava/lang/Long;Lrx/functions/Action0;Ls0/a$b;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;",
+            "Ljava/lang/Long;",
+            "Lrx/functions/Action0;",
+            "Ls0/a$b;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
+
+    iput-object v0, p0, Ls0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    iput-object p1, p0, Ls0/l/a/d1$a;->f:Lrx/Subscriber;
+
+    if-eqz p2, :cond_0
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    invoke-direct {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    :goto_0
+    iput-object p1, p0, Ls0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iput-object p3, p0, Ls0/l/a/d1$a;->i:Lrx/functions/Action0;
+
+    new-instance p1, Ls0/l/e/c;
+
+    invoke-direct {p1, p0}, Ls0/l/e/c;-><init>(Ls0/l/e/c$a;)V
+
+    iput-object p1, p0, Ls0/l/a/d1$a;->h:Ls0/l/e/c;
+
+    iput-object p4, p0, Ls0/l/a/d1$a;->j:Ls0/a$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/d1$a;->h:Ls0/l/e/c;
+
+    const/4 v1, 0x1
+
+    iput-boolean v1, v0, Ls0/l/e/c;->terminated:Z
+
+    invoke-virtual {v0}, Ls0/l/e/c;->a()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/d1$a;->h:Ls0/l/e/c;
+
+    iget-boolean v1, v0, Ls0/l/e/c;->terminated:Z
+
+    if-nez v1, :cond_0
+
+    iput-object p1, v0, Ls0/l/e/c;->exception:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, v0, Ls0/l/e/c;->terminated:Z
+
+    invoke-virtual {v0}, Ls0/l/e/c;->a()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-nez v0, :cond_0
+
+    :goto_0
+    const/4 v1, 0x1
+
+    goto :goto_3
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    const-wide/16 v5, 0x0
+
+    cmp-long v0, v3, v5
+
+    if-gtz v0, :cond_4
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/d1$a;->j:Ls0/a$b;
+
+    invoke-interface {v0}, Ls0/a$b;->a()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Ls0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v5, p0, Ls0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
+
+    if-eqz v5, :cond_1
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
+    :try_end_0
+    .catch Lrx/exceptions/MissingBackpressureException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :cond_1
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v0
+
+    iget-object v5, p0, Ls0/l/a/d1$a;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v5, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    iget-object v5, p0, Ls0/l/a/d1$a;->f:Lrx/Subscriber;
+
+    invoke-interface {v5, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_2
+    const/4 v0, 0x0
+
+    :goto_1
+    iget-object v5, p0, Ls0/l/a/d1$a;->i:Lrx/functions/Action0;
+
+    if-eqz v5, :cond_3
+
+    :try_start_1
+    invoke-interface {v5}, Lrx/functions/Action0;->call()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iget-object v3, p0, Ls0/l/a/d1$a;->h:Ls0/l/e/c;
+
+    iget-boolean v4, v3, Ls0/l/e/c;->terminated:Z
+
+    if-nez v4, :cond_5
+
+    iput-object v0, v3, Ls0/l/e/c;->exception:Ljava/lang/Throwable;
+
+    iput-boolean v2, v3, Ls0/l/e/c;->terminated:Z
+
+    invoke-virtual {v3}, Ls0/l/e/c;->a()V
+
+    goto :goto_3
+
+    :cond_3
+    :goto_2
+    if-nez v0, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    iget-object v0, p0, Ls0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide/16 v5, 0x1
+
+    sub-long v5, v3, v5
+
+    invoke-virtual {v0, v3, v4, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_5
+    :goto_3
+    if-nez v1, :cond_6
+
+    return-void
+
+    :cond_6
+    iget-object v0, p0, Ls0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    if-nez p1, :cond_7
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_7
+    invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
+
+    iget-object p1, p0, Ls0/l/a/d1$a;->h:Ls0/l/e/c;
+
+    invoke-virtual {p1}, Ls0/l/e/c;->a()V
+
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/d1$b.smali b/com.discord/smali_classes2/s0/l/a/d1$b.smali
new file mode 100644
index 0000000000..777bcf159e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/d1$b.smali
@@ -0,0 +1,39 @@
+.class public final Ls0/l/a/d1$b;
+.super Ljava/lang/Object;
+.source "OperatorOnBackpressureBuffer.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/d1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/d1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/d1<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/d1;
+
+    invoke-direct {v0}, Ls0/l/a/d1;-><init>()V
+
+    sput-object v0, Ls0/l/a/d1$b;->a:Ls0/l/a/d1;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/d1.smali b/com.discord/smali_classes2/s0/l/a/d1.smali
new file mode 100644
index 0000000000..8d2ef8d92a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/d1.smali
@@ -0,0 +1,80 @@
+.class public Ls0/l/a/d1;
+.super Ljava/lang/Object;
+.source "OperatorOnBackpressureBuffer.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/d1$a;,
+        Ls0/l/a/d1$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/Long;
+
+.field public final e:Lrx/functions/Action0;
+
+.field public final f:Ls0/a$b;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ls0/l/a/d1;->d:Ljava/lang/Long;
+
+    iput-object v0, p0, Ls0/l/a/d1;->e:Lrx/functions/Action0;
+
+    sget-object v0, Ls0/a;->b:Ls0/a$b;
+
+    iput-object v0, p0, Ls0/l/a/d1;->f:Ls0/a$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/d1$a;
+
+    iget-object v1, p0, Ls0/l/a/d1;->d:Ljava/lang/Long;
+
+    iget-object v2, p0, Ls0/l/a/d1;->e:Lrx/functions/Action0;
+
+    iget-object v3, p0, Ls0/l/a/d1;->f:Ls0/a$b;
+
+    invoke-direct {v0, p1, v1, v2, v3}, Ls0/l/a/d1$a;-><init>(Lrx/Subscriber;Ljava/lang/Long;Lrx/functions/Action0;Ls0/a$b;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v1, v0, Ls0/l/a/d1$a;->h:Ls0/l/e/c;
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/d2.smali b/com.discord/smali_classes2/s0/l/a/d2.smali
similarity index 75%
rename from com.discord/smali_classes2/r0/l/a/d2.smali
rename to com.discord/smali_classes2/s0/l/a/d2.smali
index 769b3544dc..940eeb1fab 100644
--- a/com.discord/smali_classes2/r0/l/a/d2.smali
+++ b/com.discord/smali_classes2/s0/l/a/d2.smali
@@ -1,4 +1,4 @@
-.class public Lr0/l/a/d2;
+.class public Ls0/l/a/d2;
 .super Ljava/lang/Object;
 .source "OperatorSwitch.java"
 
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field public final synthetic d:Lr0/l/a/b2$c;
+.field public final synthetic d:Ls0/l/a/b2$c;
 
 
 # direct methods
-.method public constructor <init>(Lr0/l/a/b2$c;)V
+.method public constructor <init>(Ls0/l/a/b2$c;)V
     .locals 0
 
-    iput-object p1, p0, Lr0/l/a/d2;->d:Lr0/l/a/b2$c;
+    iput-object p1, p0, Ls0/l/a/d2;->d:Ls0/l/a/b2$c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -32,20 +32,20 @@
 
     if-lez v2, :cond_1
 
-    iget-object v0, p0, Lr0/l/a/d2;->d:Lr0/l/a/b2$c;
+    iget-object v0, p0, Ls0/l/a/d2;->d:Ls0/l/a/b2$c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, v0, Lr0/l/a/b2$c;->l:Lrx/Producer;
+    iget-object v1, v0, Ls0/l/a/b2$c;->l:Lrx/Producer;
 
-    iget-wide v2, v0, Lr0/l/a/b2$c;->k:J
+    iget-wide v2, v0, Ls0/l/a/b2$c;->k:J
 
     invoke-static {v2, v3, p1, p2}, Lf/n/a/k/a;->c(JJ)J
 
     move-result-wide v2
 
-    iput-wide v2, v0, Lr0/l/a/b2$c;->k:J
+    iput-wide v2, v0, Ls0/l/a/b2$c;->k:J
 
     monitor-exit v0
     :try_end_0
@@ -56,7 +56,7 @@
     invoke-interface {v1, p1, p2}, Lrx/Producer;->m(J)V
 
     :cond_0
-    invoke-virtual {v0}, Lr0/l/a/b2$c;->b()V
+    invoke-virtual {v0}, Ls0/l/a/b2$c;->b()V
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/s0/l/a/e.smali b/com.discord/smali_classes2/s0/l/a/e.smali
new file mode 100644
index 0000000000..8c36999f98
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/e.smali
@@ -0,0 +1,87 @@
+.class public abstract Ls0/l/a/e;
+.super Ls0/l/a/d;
+.source "DeferredScalarSubscriberSafe.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/a/d<",
+        "TT;TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public h:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/l/a/d;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/e;->h:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/e;->h:Z
+
+    invoke-super {p0}, Ls0/l/a/d;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/e;->h:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/e;->h:Z
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ls0/l/a/d;->f:Ljava/lang/Object;
+
+    iget-object v0, p0, Ls0/l/a/d;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/e0.smali b/com.discord/smali_classes2/s0/l/a/e0.smali
new file mode 100644
index 0000000000..0b126b3d39
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/e0.smali
@@ -0,0 +1,110 @@
+.class public Ls0/l/a/e0;
+.super Ljava/lang/Object;
+.source "OnSubscribeRefCount.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Lrx/subscriptions/CompositeSubscription;
+
+.field public final synthetic e:Ls0/l/a/f0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/f0;Lrx/subscriptions/CompositeSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iput-object p2, p0, Ls0/l/a/e0;->d:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-object v1, p0, Ls0/l/a/e0;->d:Lrx/subscriptions/CompositeSubscription;
+
+    if-ne v0, v1, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    instance-of v0, v0, Lrx/Subscription;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    check-cast v0, Lrx/Subscription;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    new-instance v1, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object v1, v0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_1
+    iget-object v0, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v0, v0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/e0;->e:Ls0/l/a/f0;
+
+    iget-object v1, v1, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/e1$a.smali b/com.discord/smali_classes2/s0/l/a/e1$a.smali
new file mode 100644
index 0000000000..52cf2a0254
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/e1$a.smali
@@ -0,0 +1,40 @@
+.class public final Ls0/l/a/e1$a;
+.super Ljava/lang/Object;
+.source "OperatorOnBackpressureLatest.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/e1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/e1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/e1<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/e1;
+
+    invoke-direct {v0}, Ls0/l/a/e1;-><init>()V
+
+    sput-object v0, Ls0/l/a/e1$a;->a:Ls0/l/a/e1;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/e1$b.smali b/com.discord/smali_classes2/s0/l/a/e1$b.smali
similarity index 78%
rename from com.discord/smali_classes2/r0/l/a/e1$b.smali
rename to com.discord/smali_classes2/s0/l/a/e1$b.smali
index 431d891fbb..c2dddf9389 100644
--- a/com.discord/smali_classes2/r0/l/a/e1$b.smali
+++ b/com.discord/smali_classes2/s0/l/a/e1$b.smali
@@ -1,16 +1,16 @@
-.class public final Lr0/l/a/e1$b;
+.class public final Ls0/l/a/e1$b;
 .super Ljava/util/concurrent/atomic/AtomicLong;
 .source "OperatorOnBackpressureLatest.java"
 
 # interfaces
 .implements Lrx/Producer;
 .implements Lrx/Subscription;
-.implements Lr0/g;
+.implements Ls0/g;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/e1;
+    value = Ls0/l/a/e1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,7 +26,7 @@
         "Ljava/util/concurrent/atomic/AtomicLong;",
         "Lrx/Producer;",
         "Lrx/Subscription;",
-        "Lr0/g<",
+        "Ls0/g<",
         "TT;>;"
     }
 .end annotation
@@ -54,10 +54,10 @@
 
 .field public missed:Z
 
-.field public parent:Lr0/l/a/e1$c;
+.field public parent:Ls0/l/a/e1$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/l/a/e1$c<",
+            "Ls0/l/a/e1$c<",
             "-TT;>;"
         }
     .end annotation
@@ -84,7 +84,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lr0/l/a/e1$b;->d:Ljava/lang/Object;
+    sput-object v0, Ls0/l/a/e1$b;->d:Ljava/lang/Object;
 
     return-void
 .end method
@@ -101,15 +101,15 @@
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/e1$b;->child:Lrx/Subscriber;
+    iput-object p1, p0, Ls0/l/a/e1$b;->child:Lrx/Subscriber;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lr0/l/a/e1$b;->d:Ljava/lang/Object;
+    sget-object v0, Ls0/l/a/e1$b;->d:Ljava/lang/Object;
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lr0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Ls0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
     const-wide/high16 v0, -0x4000000000000000L    # -2.0
 
@@ -126,24 +126,24 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/e1$b;->emitting:Z
+    iget-boolean v0, p0, Ls0/l/a/e1$b;->emitting:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lr0/l/a/e1$b;->missed:Z
+    iput-boolean v1, p0, Ls0/l/a/e1$b;->missed:Z
 
     monitor-exit p0
 
     return-void
 
     :cond_0
-    iput-boolean v1, p0, Lr0/l/a/e1$b;->emitting:Z
+    iput-boolean v1, p0, Ls0/l/a/e1$b;->emitting:Z
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lr0/l/a/e1$b;->missed:Z
+    iput-boolean v0, p0, Ls0/l/a/e1$b;->missed:Z
 
     monitor-exit p0
     :try_end_0
@@ -164,7 +164,7 @@
     goto :goto_3
 
     :cond_1
-    iget-object v4, p0, Lr0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v4, p0, Ls0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -176,17 +176,17 @@
 
     if-lez v7, :cond_4
 
-    sget-object v2, Lr0/l/a/e1$b;->d:Ljava/lang/Object;
+    sget-object v2, Ls0/l/a/e1$b;->d:Ljava/lang/Object;
 
     if-eq v4, v2, :cond_4
 
-    iget-object v2, p0, Lr0/l/a/e1$b;->child:Lrx/Subscriber;
+    iget-object v2, p0, Ls0/l/a/e1$b;->child:Lrx/Subscriber;
 
-    invoke-interface {v2, v4}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v2, v4}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
-    iget-object v2, p0, Lr0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Ls0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lr0/l/a/e1$b;->d:Ljava/lang/Object;
+    sget-object v3, Ls0/l/a/e1$b;->d:Ljava/lang/Object;
 
     invoke-virtual {v2, v4, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -213,31 +213,31 @@
     if-eqz v4, :cond_2
 
     :goto_1
-    sget-object v4, Lr0/l/a/e1$b;->d:Ljava/lang/Object;
+    sget-object v4, Ls0/l/a/e1$b;->d:Ljava/lang/Object;
 
     :cond_4
-    sget-object v2, Lr0/l/a/e1$b;->d:Ljava/lang/Object;
+    sget-object v2, Ls0/l/a/e1$b;->d:Ljava/lang/Object;
 
     if-ne v4, v2, :cond_6
 
-    iget-boolean v2, p0, Lr0/l/a/e1$b;->done:Z
+    iget-boolean v2, p0, Ls0/l/a/e1$b;->done:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lr0/l/a/e1$b;->terminal:Ljava/lang/Throwable;
+    iget-object v2, p0, Ls0/l/a/e1$b;->terminal:Ljava/lang/Throwable;
 
     if-eqz v2, :cond_5
 
-    iget-object v3, p0, Lr0/l/a/e1$b;->child:Lrx/Subscriber;
+    iget-object v3, p0, Ls0/l/a/e1$b;->child:Lrx/Subscriber;
 
-    invoke-interface {v3, v2}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v3, v2}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     goto :goto_2
 
     :cond_5
-    iget-object v2, p0, Lr0/l/a/e1$b;->child:Lrx/Subscriber;
+    iget-object v2, p0, Ls0/l/a/e1$b;->child:Lrx/Subscriber;
 
-    invoke-interface {v2}, Lr0/g;->onCompleted()V
+    invoke-interface {v2}, Ls0/g;->onCompleted()V
 
     :cond_6
     :goto_2
@@ -246,11 +246,11 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_3
 
     :try_start_2
-    iget-boolean v2, p0, Lr0/l/a/e1$b;->missed:Z
+    iget-boolean v2, p0, Ls0/l/a/e1$b;->missed:Z
 
     if-nez v2, :cond_7
 
-    iput-boolean v0, p0, Lr0/l/a/e1$b;->emitting:Z
+    iput-boolean v0, p0, Ls0/l/a/e1$b;->emitting:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -264,7 +264,7 @@
 
     :cond_7
     :try_start_4
-    iput-boolean v0, p0, Lr0/l/a/e1$b;->missed:Z
+    iput-boolean v0, p0, Ls0/l/a/e1$b;->missed:Z
 
     monitor-exit p0
     :try_end_4
@@ -315,7 +315,7 @@
     monitor-enter p0
 
     :try_start_7
-    iput-boolean v0, p0, Lr0/l/a/e1$b;->emitting:Z
+    iput-boolean v0, p0, Ls0/l/a/e1$b;->emitting:Z
 
     monitor-exit p0
 
@@ -423,12 +423,12 @@
 
     if-nez v8, :cond_4
 
-    iget-object p1, p0, Lr0/l/a/e1$b;->parent:Lr0/l/a/e1$c;
+    iget-object p1, p0, Ls0/l/a/e1$b;->parent:Ls0/l/a/e1$c;
 
     invoke-virtual {p1, v6, v7}, Lrx/Subscriber;->request(J)V
 
     :cond_4
-    invoke-virtual {p0}, Lr0/l/a/e1$b;->a()V
+    invoke-virtual {p0}, Ls0/l/a/e1$b;->a()V
 
     :cond_5
     return-void
@@ -439,9 +439,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lr0/l/a/e1$b;->done:Z
+    iput-boolean v0, p0, Ls0/l/a/e1$b;->done:Z
 
-    invoke-virtual {p0}, Lr0/l/a/e1$b;->a()V
+    invoke-virtual {p0}, Ls0/l/a/e1$b;->a()V
 
     return-void
 .end method
@@ -449,13 +449,13 @@
 .method public onError(Ljava/lang/Throwable;)V
     .locals 0
 
-    iput-object p1, p0, Lr0/l/a/e1$b;->terminal:Ljava/lang/Throwable;
+    iput-object p1, p0, Ls0/l/a/e1$b;->terminal:Ljava/lang/Throwable;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lr0/l/a/e1$b;->done:Z
+    iput-boolean p1, p0, Ls0/l/a/e1$b;->done:Z
 
-    invoke-virtual {p0}, Lr0/l/a/e1$b;->a()V
+    invoke-virtual {p0}, Ls0/l/a/e1$b;->a()V
 
     return-void
 .end method
@@ -468,11 +468,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lr0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Ls0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lr0/l/a/e1$b;->a()V
+    invoke-virtual {p0}, Ls0/l/a/e1$b;->a()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/s0/l/a/e1$c.smali b/com.discord/smali_classes2/s0/l/a/e1$c.smali
new file mode 100644
index 0000000000..fb64994bc8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/e1$c.smali
@@ -0,0 +1,111 @@
+.class public final Ls0/l/a/e1$c;
+.super Lrx/Subscriber;
+.source "OperatorOnBackpressureLatest.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/e1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/l/a/e1$b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/e1$b<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/e1$b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/e1$b<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/e1$c;->d:Ls0/l/a/e1$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/e1$c;->d:Ls0/l/a/e1$b;
+
+    invoke-virtual {v0}, Ls0/l/a/e1$b;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/e1$c;->d:Ls0/l/a/e1$b;
+
+    iput-object p1, v0, Ls0/l/a/e1$b;->terminal:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, v0, Ls0/l/a/e1$b;->done:Z
+
+    invoke-virtual {v0}, Ls0/l/a/e1$b;->a()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/e1$c;->d:Ls0/l/a/e1$b;
+
+    iget-object v1, v0, Ls0/l/a/e1$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    invoke-virtual {v0}, Ls0/l/a/e1$b;->a()V
+
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide/16 v0, 0x0
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/e1.smali b/com.discord/smali_classes2/s0/l/a/e1.smali
new file mode 100644
index 0000000000..8b221f789d
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/e1.smali
@@ -0,0 +1,63 @@
+.class public final Ls0/l/a/e1;
+.super Ljava/lang/Object;
+.source "OperatorOnBackpressureLatest.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/e1$c;,
+        Ls0/l/a/e1$b;,
+        Ls0/l/a/e1$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/e1$b;
+
+    invoke-direct {v0, p1}, Ls0/l/a/e1$b;-><init>(Lrx/Subscriber;)V
+
+    new-instance v1, Ls0/l/a/e1$c;
+
+    invoke-direct {v1, v0}, Ls0/l/a/e1$c;-><init>(Ls0/l/a/e1$b;)V
+
+    iput-object v1, v0, Ls0/l/a/e1$b;->parent:Ls0/l/a/e1$c;
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/e2$a.smali b/com.discord/smali_classes2/s0/l/a/e2$a.smali
new file mode 100644
index 0000000000..0dcf44aaad
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/e2$a.smali
@@ -0,0 +1,111 @@
+.class public Ls0/l/a/e2$a;
+.super Ljava/lang/Object;
+.source "OperatorTake.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/e2;->setProducer(Lrx/Producer;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final synthetic e:Lrx/Producer;
+
+.field public final synthetic f:Ls0/l/a/e2;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/e2;Lrx/Producer;)V
+    .locals 2
+
+    iput-object p1, p0, Ls0/l/a/e2$a;->f:Ls0/l/a/e2;
+
+    iput-object p2, p0, Ls0/l/a/e2$a;->e:Lrx/Producer;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide/16 v0, 0x0
+
+    invoke-direct {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
+
+    iput-object p1, p0, Ls0/l/a/e2$a;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 9
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_2
+
+    iget-object v2, p0, Ls0/l/a/e2$a;->f:Ls0/l/a/e2;
+
+    iget-boolean v2, v2, Ls0/l/a/e2;->e:Z
+
+    if-nez v2, :cond_2
+
+    :cond_0
+    iget-object v2, p0, Ls0/l/a/e2$a;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    iget-object v4, p0, Ls0/l/a/e2$a;->f:Ls0/l/a/e2;
+
+    iget-object v4, v4, Ls0/l/a/e2;->g:Ls0/l/a/f2;
+
+    iget v4, v4, Ls0/l/a/f2;->d:I
+
+    int-to-long v4, v4
+
+    sub-long/2addr v4, v2
+
+    invoke-static {p1, p2, v4, v5}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v4
+
+    cmp-long v6, v4, v0
+
+    if-nez v6, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v6, p0, Ls0/l/a/e2$a;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    add-long v7, v2, v4
+
+    invoke-virtual {v6, v2, v3, v7, v8}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    iget-object p1, p0, Ls0/l/a/e2$a;->e:Lrx/Producer;
+
+    invoke-interface {p1, v4, v5}, Lrx/Producer;->m(J)V
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/e2.smali b/com.discord/smali_classes2/s0/l/a/e2.smali
new file mode 100644
index 0000000000..7bc6518653
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/e2.smali
@@ -0,0 +1,178 @@
+.class public Ls0/l/a/e2;
+.super Lrx/Subscriber;
+.source "OperatorTake.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public e:Z
+
+.field public final synthetic f:Lrx/Subscriber;
+
+.field public final synthetic g:Ls0/l/a/f2;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/f2;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/e2;->g:Ls0/l/a/f2;
+
+    iput-object p2, p0, Ls0/l/a/e2;->f:Lrx/Subscriber;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/e2;->e:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/e2;->e:Z
+
+    iget-object v0, p0, Ls0/l/a/e2;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/e2;->e:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/e2;->e:Z
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/e2;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw p1
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget v0, p0, Ls0/l/a/e2;->d:I
+
+    add-int/lit8 v1, v0, 0x1
+
+    iput v1, p0, Ls0/l/a/e2;->d:I
+
+    iget-object v2, p0, Ls0/l/a/e2;->g:Ls0/l/a/f2;
+
+    iget v2, v2, Ls0/l/a/f2;->d:I
+
+    if-ge v0, v2, :cond_1
+
+    const/4 v0, 0x1
+
+    if-ne v1, v2, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    iget-object v2, p0, Ls0/l/a/e2;->f:Lrx/Subscriber;
+
+    invoke-interface {v2, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    if-eqz v1, :cond_1
+
+    iget-boolean p1, p0, Ls0/l/a/e2;->e:Z
+
+    if-nez p1, :cond_1
+
+    iput-boolean v0, p0, Ls0/l/a/e2;->e:Z
+
+    :try_start_0
+    iget-object p1, p0, Ls0/l/a/e2;->f:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw p1
+
+    :cond_1
+    :goto_1
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/e2;->f:Lrx/Subscriber;
+
+    new-instance v1, Ls0/l/a/e2$a;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/a/e2$a;-><init>(Ls0/l/a/e2;Lrx/Producer;)V
+
+    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/f.smali b/com.discord/smali_classes2/s0/l/a/f.smali
new file mode 100644
index 0000000000..0a76b8b90f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/f.smali
@@ -0,0 +1,120 @@
+.class public final enum Ls0/l/a/f;
+.super Ljava/lang/Enum;
+.source "EmptyObservableHolder.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/l/a/f;",
+        ">;",
+        "Lrx/Observable$a<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ls0/l/a/f;
+
+.field public static final e:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final synthetic f:[Ls0/l/a/f;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Ls0/l/a/f;
+
+    const-string v1, "INSTANCE"
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v1, v2}, Ls0/l/a/f;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Ls0/l/a/f;->d:Ls0/l/a/f;
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ls0/l/a/f;
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Ls0/l/a/f;->f:[Ls0/l/a/f;
+
+    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+
+    move-result-object v0
+
+    sput-object v0, Ls0/l/a/f;->e:Lrx/Observable;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/l/a/f;
+    .locals 1
+
+    const-class v0, Ls0/l/a/f;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/l/a/f;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/l/a/f;
+    .locals 1
+
+    sget-object v0, Ls0/l/a/f;->f:[Ls0/l/a/f;
+
+    invoke-virtual {v0}, [Ls0/l/a/f;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/l/a/f;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/f0.smali b/com.discord/smali_classes2/s0/l/a/f0.smali
new file mode 100644
index 0000000000..8155b747b2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/f0.smali
@@ -0,0 +1,181 @@
+.class public final Ls0/l/a/f0;
+.super Ljava/lang/Object;
+.source "OnSubscribeRefCount.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/m/c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/m/c<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public volatile e:Lrx/subscriptions/CompositeSubscription;
+
+.field public final f:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field public final g:Ljava/util/concurrent/locks/ReentrantLock;
+
+
+# direct methods
+.method public constructor <init>(Ls0/m/c;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/m/c<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
+
+    iput-object v0, p0, Ls0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    new-instance v0, Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantLock;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    iput-object p1, p0, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
+
+    iget-object v0, p0, Ls0/l/a/f0;->f:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_1
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    new-instance v2, Ls0/l/a/c0;
+
+    invoke-direct {v2, p0, p1, v0}, Ls0/l/a/c0;-><init>(Ls0/l/a/f0;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicBoolean;)V
+
+    invoke-virtual {v1, v2}, Ls0/m/c;->g0(Lrx/functions/Action1;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    :cond_0
+    throw p1
+
+    :cond_1
+    :try_start_1
+    iget-object v0, p0, Ls0/l/a/f0;->e:Lrx/subscriptions/CompositeSubscription;
+
+    new-instance v1, Ls0/l/a/e0;
+
+    invoke-direct {v1, p0, v0}, Ls0/l/a/e0;-><init>(Ls0/l/a/f0;Lrx/subscriptions/CompositeSubscription;)V
+
+    new-instance v2, Ls0/r/a;
+
+    invoke-direct {v2, v1}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v1, p0, Ls0/l/a/f0;->d:Ls0/m/c;
+
+    new-instance v2, Ls0/l/a/d0;
+
+    invoke-direct {v2, p0, p1, p1, v0}, Ls0/l/a/d0;-><init>(Ls0/l/a/f0;Lrx/Subscriber;Lrx/Subscriber;Lrx/subscriptions/CompositeSubscription;)V
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    iget-object p1, p0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    :cond_2
+    :goto_0
+    return-void
+
+    :catchall_1
+    move-exception p1
+
+    iget-object v0, p0, Ls0/l/a/f0;->g:Ljava/util/concurrent/locks/ReentrantLock;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/f1.smali b/com.discord/smali_classes2/s0/l/a/f1.smali
new file mode 100644
index 0000000000..bd3c5e657a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/f1.smali
@@ -0,0 +1,54 @@
+.class public final Ls0/l/a/f1;
+.super Ljava/lang/Object;
+.source "OperatorOnErrorResumeNextViaFunction.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/Throwable;",
+        "Lrx/Observable<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/k/b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/f1;->d:Ls0/k/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    iget-object v0, p0, Ls0/l/a/f1;->d:Ls0/k/b;
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    new-instance v0, Ls0/l/e/j;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j;-><init>(Ljava/lang/Object;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/f2.smali b/com.discord/smali_classes2/s0/l/a/f2.smali
similarity index 83%
rename from com.discord/smali_classes2/r0/l/a/f2.smali
rename to com.discord/smali_classes2/s0/l/a/f2.smali
index 0d5bee0d11..55c1094a58 100644
--- a/com.discord/smali_classes2/r0/l/a/f2.smali
+++ b/com.discord/smali_classes2/s0/l/a/f2.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/f2;
+.class public final Ls0/l/a/f2;
 .super Ljava/lang/Object;
 .source "OperatorTake.java"
 
@@ -31,7 +31,7 @@
 
     if-ltz p1, :cond_0
 
-    iput p1, p0, Lr0/l/a/f2;->d:I
+    iput p1, p0, Ls0/l/a/f2;->d:I
 
     return-void
 
@@ -56,15 +56,15 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    new-instance v0, Lr0/l/a/e2;
+    new-instance v0, Ls0/l/a/e2;
 
-    invoke-direct {v0, p0, p1}, Lr0/l/a/e2;-><init>(Lr0/l/a/f2;Lrx/Subscriber;)V
+    invoke-direct {v0, p0, p1}, Ls0/l/a/e2;-><init>(Ls0/l/a/f2;Lrx/Subscriber;)V
 
-    iget v1, p0, Lr0/l/a/f2;->d:I
+    iget v1, p0, Ls0/l/a/f2;->d:I
 
     if-nez v1, :cond_0
 
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
 
diff --git a/com.discord/smali_classes2/s0/l/a/g.smali b/com.discord/smali_classes2/s0/l/a/g.smali
new file mode 100644
index 0000000000..50e0b5302b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/g.smali
@@ -0,0 +1,118 @@
+.class public final enum Ls0/l/a/g;
+.super Ljava/lang/Enum;
+.source "NeverObservableHolder.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/l/a/g;",
+        ">;",
+        "Lrx/Observable$a<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ls0/l/a/g;
+
+.field public static final e:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final synthetic f:[Ls0/l/a/g;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Ls0/l/a/g;
+
+    const-string v1, "INSTANCE"
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v1, v2}, Ls0/l/a/g;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Ls0/l/a/g;->d:Ls0/l/a/g;
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ls0/l/a/g;
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Ls0/l/a/g;->f:[Ls0/l/a/g;
+
+    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+
+    move-result-object v0
+
+    sput-object v0, Ls0/l/a/g;->e:Lrx/Observable;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/l/a/g;
+    .locals 1
+
+    const-class v0, Ls0/l/a/g;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/l/a/g;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/l/a/g;
+    .locals 1
+
+    sget-object v0, Ls0/l/a/g;->f:[Ls0/l/a/g;
+
+    invoke-virtual {v0}, [Ls0/l/a/g;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/l/a/g;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Lrx/Subscriber;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/g0.smali b/com.discord/smali_classes2/s0/l/a/g0.smali
new file mode 100644
index 0000000000..231ac1aa78
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/g0.smali
@@ -0,0 +1,162 @@
+.class public Ls0/l/a/g0;
+.super Lrx/Subscriber;
+.source "OnSubscribeSingle.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public e:Z
+
+.field public f:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic g:Ls0/i;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/h0;Ls0/i;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/g0;->g:Ls0/i;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 4
+
+    iget-boolean v0, p0, Ls0/l/a/g0;->d:Z
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-boolean v0, p0, Ls0/l/a/g0;->e:Z
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/g0;->g:Ls0/i;
+
+    iget-object v1, p0, Ls0/l/a/g0;->f:Ljava/lang/Object;
+
+    check-cast v0, Ls0/l/a/u2;
+
+    iget-object v2, v0, Ls0/l/a/u2;->e:Lrx/Subscriber;
+
+    new-instance v3, Ls0/l/b/c;
+
+    iget-object v0, v0, Ls0/l/a/u2;->e:Lrx/Subscriber;
+
+    invoke-direct {v3, v0, v1}, Ls0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+
+    invoke-virtual {v2, v3}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, p0, Ls0/l/a/g0;->g:Ls0/i;
+
+    new-instance v1, Ljava/util/NoSuchElementException;
+
+    const-string v2, "Observable emitted no items"
+
+    invoke-direct {v1, v2}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    check-cast v0, Ls0/l/a/u2;
+
+    iget-object v0, v0, Ls0/l/a/u2;->e:Lrx/Subscriber;
+
+    invoke-interface {v0, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/g0;->g:Ls0/i;
+
+    check-cast v0, Ls0/l/a/u2;
+
+    iget-object v0, v0, Ls0/l/a/u2;->e:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/g0;->e:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, p0, Ls0/l/a/g0;->d:Z
+
+    iget-object p1, p0, Ls0/l/a/g0;->g:Ls0/i;
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "Observable emitted too many elements"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    check-cast p1, Ls0/l/a/u2;
+
+    iget-object p1, p1, Ls0/l/a/u2;->e:Lrx/Subscriber;
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    goto :goto_0
+
+    :cond_0
+    iput-boolean v1, p0, Ls0/l/a/g0;->e:Z
+
+    iput-object p1, p0, Ls0/l/a/g0;->f:Ljava/lang/Object;
+
+    :goto_0
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide/16 v0, 0x2
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/g1.smali b/com.discord/smali_classes2/s0/l/a/g1.smali
new file mode 100644
index 0000000000..6951e6e488
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/g1.smali
@@ -0,0 +1,46 @@
+.class public final Ls0/l/a/g1;
+.super Ljava/lang/Object;
+.source "OperatorOnErrorResumeNextViaFunction.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/Throwable;",
+        "Lrx/Observable<",
+        "+TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Observable;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/g1;->d:Lrx/Observable;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    iget-object p1, p0, Ls0/l/a/g1;->d:Lrx/Observable;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/g2.smali b/com.discord/smali_classes2/s0/l/a/g2.smali
new file mode 100644
index 0000000000..6f035c0a9c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/g2.smali
@@ -0,0 +1,97 @@
+.class public Ls0/l/a/g2;
+.super Lrx/Subscriber;
+.source "OperatorTakeUntil.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/i2;Lrx/Subscriber;ZLrx/Subscriber;)V
+    .locals 0
+
+    iput-object p4, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-direct {p0, p2, p3}, Lrx/Subscriber;-><init>(Lrx/Subscriber;Z)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-virtual {v1}, Lrx/Subscriber;->unsubscribe()V
+
+    throw v0
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object p1, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-virtual {p1}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v0, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw p1
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/g2;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h$a.smali b/com.discord/smali_classes2/s0/l/a/h$a.smali
new file mode 100644
index 0000000000..2c77f13be6
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h$a.smali
@@ -0,0 +1,41 @@
+.class public final Ls0/l/a/h$a;
+.super Ljava/lang/Object;
+.source "NotificationLite.java"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x1L
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "Notification=>Completed"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h$b.smali b/com.discord/smali_classes2/s0/l/a/h$b.smali
new file mode 100644
index 0000000000..f6d5f71ab2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h$b.smali
@@ -0,0 +1,41 @@
+.class public final Ls0/l/a/h$b;
+.super Ljava/lang/Object;
+.source "NotificationLite.java"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x2L
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "Notification=>NULL"
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h$c.smali b/com.discord/smali_classes2/s0/l/a/h$c.smali
new file mode 100644
index 0000000000..6659905426
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h$c.smali
@@ -0,0 +1,59 @@
+.class public final Ls0/l/a/h$c;
+.super Ljava/lang/Object;
+.source "NotificationLite.java"
+
+# interfaces
+.implements Ljava/io/Serializable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x3L
+
+
+# instance fields
+.field public final e:Ljava/lang/Throwable;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Throwable;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/h$c;->e:Ljava/lang/Throwable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    const-string v0, "Notification=>Error:"
+
+    invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ls0/l/a/h$c;->e:Ljava/lang/Throwable;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h.smali b/com.discord/smali_classes2/s0/l/a/h.smali
new file mode 100644
index 0000000000..3d03f64158
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h.smali
@@ -0,0 +1,148 @@
+.class public final Ls0/l/a/h;
+.super Ljava/lang/Object;
+.source "NotificationLite.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/h$c;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Ljava/lang/Object;
+
+.field public static final b:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/h$a;
+
+    invoke-direct {v0}, Ls0/l/a/h$a;-><init>()V
+
+    sput-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    new-instance v0, Ls0/l/a/h$b;
+
+    invoke-direct {v0}, Ls0/l/a/h$b;-><init>()V
+
+    sput-object v0, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public static a(Ls0/g;Ljava/lang/Object;)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ls0/g<",
+            "-TT;>;",
+            "Ljava/lang/Object;",
+            ")Z"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    const/4 v1, 0x1
+
+    if-ne p1, v0, :cond_0
+
+    invoke-interface {p0}, Ls0/g;->onCompleted()V
+
+    return v1
+
+    :cond_0
+    sget-object v0, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    const/4 v2, 0x0
+
+    if-ne p1, v0, :cond_1
+
+    const/4 p1, 0x0
+
+    invoke-interface {p0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return v2
+
+    :cond_1
+    if-eqz p1, :cond_3
+
+    invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v0
+
+    const-class v3, Ls0/l/a/h$c;
+
+    if-ne v0, v3, :cond_2
+
+    check-cast p1, Ls0/l/a/h$c;
+
+    iget-object p1, p1, Ls0/l/a/h$c;->e:Ljava/lang/Throwable;
+
+    invoke-interface {p0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return v1
+
+    :cond_2
+    invoke-interface {p0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return v2
+
+    :cond_3
+    new-instance p0, Ljava/lang/IllegalArgumentException;
+
+    const-string p1, "The lite notification can not be null"
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+.end method
+
+.method public static b(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Object;",
+            ")TT;"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    if-ne p0, v0, :cond_0
+
+    const/4 p0, 0x0
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static c(Ljava/lang/Object;)Z
+    .locals 1
+
+    sget-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    if-ne p0, v0, :cond_0
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h0.smali b/com.discord/smali_classes2/s0/l/a/h0.smali
new file mode 100644
index 0000000000..e98835c843
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h0.smali
@@ -0,0 +1,71 @@
+.class public Ls0/l/a/h0;
+.super Ljava/lang/Object;
+.source "OnSubscribeSingle.java"
+
+# interfaces
+.implements Ls0/h$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/h$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/h0;->d:Lrx/Observable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 1
+
+    check-cast p1, Ls0/i;
+
+    new-instance v0, Ls0/l/a/g0;
+
+    invoke-direct {v0, p0, p1}, Ls0/l/a/g0;-><init>(Ls0/l/a/h0;Ls0/i;)V
+
+    iget-object p1, p1, Ls0/i;->d:Lrx/internal/util/SubscriptionList;
+
+    invoke-virtual {p1, v0}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
+
+    iget-object p1, p0, Ls0/l/a/h0;->d:Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h1$a.smali b/com.discord/smali_classes2/s0/l/a/h1$a.smali
new file mode 100644
index 0000000000..18f5b94f8e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h1$a.smali
@@ -0,0 +1,92 @@
+.class public Ls0/l/a/h1$a;
+.super Lrx/Subscriber;
+.source "OperatorOnErrorResumeNextViaFunction.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/h1;->onError(Ljava/lang/Throwable;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/h1;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/h1;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/h1$a;->d:Ls0/l/a/h1;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/h1$a;->d:Ls0/l/a/h1;
+
+    iget-object v0, v0, Ls0/l/a/h1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/h1$a;->d:Ls0/l/a/h1;
+
+    iget-object v0, v0, Ls0/l/a/h1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/h1$a;->d:Ls0/l/a/h1;
+
+    iget-object v0, v0, Ls0/l/a/h1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/h1$a;->d:Ls0/l/a/h1;
+
+    iget-object v0, v0, Ls0/l/a/h1;->g:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1}, Ls0/l/b/a;->c(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h1.smali b/com.discord/smali_classes2/s0/l/a/h1.smali
new file mode 100644
index 0000000000..f98ac32ee7
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h1.smali
@@ -0,0 +1,178 @@
+.class public Ls0/l/a/h1;
+.super Lrx/Subscriber;
+.source "OperatorOnErrorResumeNextViaFunction.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public e:J
+
+.field public final synthetic f:Lrx/Subscriber;
+
+.field public final synthetic g:Ls0/l/b/a;
+
+.field public final synthetic h:Lrx/subscriptions/SerialSubscription;
+
+.field public final synthetic i:Ls0/l/a/i1;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/i1;Lrx/Subscriber;Ls0/l/b/a;Lrx/subscriptions/SerialSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/h1;->i:Ls0/l/a/i1;
+
+    iput-object p2, p0, Ls0/l/a/h1;->f:Lrx/Subscriber;
+
+    iput-object p3, p0, Ls0/l/a/h1;->g:Ls0/l/b/a;
+
+    iput-object p4, p0, Ls0/l/a/h1;->h:Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/h1;->d:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/h1;->d:Z
+
+    iget-object v0, p0, Ls0/l/a/h1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 6
+
+    iget-boolean v0, p0, Ls0/l/a/h1;->d:Z
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/h1;->d:Z
+
+    :try_start_0
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    new-instance v0, Ls0/l/a/h1$a;
+
+    invoke-direct {v0, p0}, Ls0/l/a/h1$a;-><init>(Ls0/l/a/h1;)V
+
+    iget-object v1, p0, Ls0/l/a/h1;->h:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
+
+    iget-wide v1, p0, Ls0/l/a/h1;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-eqz v5, :cond_1
+
+    iget-object v3, p0, Ls0/l/a/h1;->g:Ls0/l/b/a;
+
+    invoke-virtual {v3, v1, v2}, Ls0/l/b/a;->b(J)V
+
+    :cond_1
+    iget-object v1, p0, Ls0/l/a/h1;->i:Ls0/l/a/i1;
+
+    iget-object v1, v1, Ls0/l/a/i1;->d:Ls0/k/b;
+
+    invoke-interface {v1, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v0, p0, Ls0/l/a/h1;->f:Lrx/Subscriber;
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/h1;->d:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-wide v0, p0, Ls0/l/a/h1;->e:J
+
+    const-wide/16 v2, 0x1
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Ls0/l/a/h1;->e:J
+
+    iget-object v0, p0, Ls0/l/a/h1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/h1;->g:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1}, Ls0/l/b/a;->c(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/h2.smali b/com.discord/smali_classes2/s0/l/a/h2.smali
new file mode 100644
index 0000000000..fa75199c91
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/h2.smali
@@ -0,0 +1,75 @@
+.class public Ls0/l/a/h2;
+.super Lrx/Subscriber;
+.source "OperatorTakeUntil.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/i2;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/h2;->d:Lrx/Subscriber;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/h2;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/h2;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)V"
+        }
+    .end annotation
+
+    iget-object p1, p0, Ls0/l/a/h2;->d:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/i$a.smali b/com.discord/smali_classes2/s0/l/a/i$a.smali
new file mode 100644
index 0000000000..60b640bf94
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/i$a.smali
@@ -0,0 +1,217 @@
+.class public final Ls0/l/a/i$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeCombineLatest.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/i;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/l/a/i$b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/i$b<",
+            "TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:I
+
+.field public f:Z
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/i$b;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/i$b<",
+            "TT;TR;>;I)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/i$a;->d:Ls0/l/a/i$b;
+
+    iput p2, p0, Ls0/l/a/i$a;->e:I
+
+    iget p1, p1, Ls0/l/a/i$b;->bufferSize:I
+
+    int-to-long p1, p1
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 3
+
+    iget-boolean v0, p0, Ls0/l/a/i$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/i$a;->f:Z
+
+    iget-object v0, p0, Ls0/l/a/i$a;->d:Ls0/l/a/i$b;
+
+    const/4 v1, 0x0
+
+    iget v2, p0, Ls0/l/a/i$a;->e:I
+
+    invoke-virtual {v0, v1, v2}, Ls0/l/a/i$b;->c(Ljava/lang/Object;I)V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 6
+
+    iget-boolean v0, p0, Ls0/l/a/i$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/i$a;->d:Ls0/l/a/i$b;
+
+    iget-object v0, v0, Ls0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
+
+    :cond_1
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Throwable;
+
+    const/4 v2, 0x1
+
+    if-eqz v1, :cond_3
+
+    instance-of v3, v1, Lrx/exceptions/CompositeException;
+
+    if-eqz v3, :cond_2
+
+    move-object v3, v1
+
+    check-cast v3, Lrx/exceptions/CompositeException;
+
+    new-instance v4, Ljava/util/ArrayList;
+
+    iget-object v3, v3, Lrx/exceptions/CompositeException;->exceptions:Ljava/util/List;
+
+    invoke-direct {v4, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    invoke-virtual {v4, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    new-instance v3, Lrx/exceptions/CompositeException;
+
+    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v3, Lrx/exceptions/CompositeException;
+
+    const/4 v4, 0x2
+
+    new-array v4, v4, [Ljava/lang/Throwable;
+
+    const/4 v5, 0x0
+
+    aput-object v1, v4, v5
+
+    aput-object p1, v4, v2
+
+    invoke-static {v4}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v4
+
+    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    goto :goto_0
+
+    :cond_3
+    move-object v3, p1
+
+    :goto_0
+    invoke-virtual {v0, v1, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iput-boolean v2, p0, Ls0/l/a/i$a;->f:Z
+
+    iget-object p1, p0, Ls0/l/a/i$a;->d:Ls0/l/a/i$b;
+
+    const/4 v0, 0x0
+
+    iget v1, p0, Ls0/l/a/i$a;->e:I
+
+    invoke-virtual {p1, v0, v1}, Ls0/l/a/i$b;->c(Ljava/lang/Object;I)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/i$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/i$a;->d:Ls0/l/a/i$b;
+
+    if-nez p1, :cond_1
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_1
+    iget v1, p0, Ls0/l/a/i$a;->e:I
+
+    invoke-virtual {v0, p1, v1}, Ls0/l/a/i$b;->c(Ljava/lang/Object;I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/i$b.smali b/com.discord/smali_classes2/s0/l/a/i$b.smali
new file mode 100644
index 0000000000..e313bbba5e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/i$b.smali
@@ -0,0 +1,705 @@
+.class public final Ls0/l/a/i$b;
+.super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "OnSubscribeCombineLatest.java"
+
+# interfaces
+.implements Lrx/Producer;
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/i;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicInteger;",
+        "Lrx/Producer;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ljava/lang/Object;
+
+.field public static final serialVersionUID:J = 0x76e7117251786db1L
+
+
+# instance fields
+.field public active:I
+
+.field public final actual:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final bufferSize:I
+
+.field public volatile cancelled:Z
+
+.field public final combiner:Lrx/functions/FuncN;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/FuncN<",
+            "+TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public complete:I
+
+.field public final delayError:Z
+
+.field public volatile done:Z
+
+.field public final error:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final latest:[Ljava/lang/Object;
+
+.field public final queue:Ls0/l/e/m/e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/e/m/e<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final subscribers:[Ls0/l/a/i$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Ls0/l/a/i$a<",
+            "TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    sput-object v0, Ls0/l/a/i$b;->d:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/Subscriber;Lrx/functions/FuncN;IIZ)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;",
+            "Lrx/functions/FuncN<",
+            "+TR;>;IIZ)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/i$b;->actual:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/i$b;->combiner:Lrx/functions/FuncN;
+
+    iput p4, p0, Ls0/l/a/i$b;->bufferSize:I
+
+    iput-boolean p5, p0, Ls0/l/a/i$b;->delayError:Z
+
+    new-array p1, p3, [Ljava/lang/Object;
+
+    iput-object p1, p0, Ls0/l/a/i$b;->latest:[Ljava/lang/Object;
+
+    sget-object p2, Ls0/l/a/i$b;->d:Ljava/lang/Object;
+
+    invoke-static {p1, p2}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V
+
+    new-array p1, p3, [Ls0/l/a/i$a;
+
+    iput-object p1, p0, Ls0/l/a/i$b;->subscribers:[Ls0/l/a/i$a;
+
+    new-instance p1, Ls0/l/e/m/e;
+
+    invoke-direct {p1, p4}, Ls0/l/e/m/e;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/i$b;->queue:Ls0/l/e/m/e;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/i$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/util/Queue;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Queue<",
+            "*>;)V"
+        }
+    .end annotation
+
+    invoke-interface {p1}, Ljava/util/Queue;->clear()V
+
+    iget-object p1, p0, Ls0/l/a/i$b;->subscribers:[Ls0/l/a/i$a;
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_0
+
+    aget-object v2, p1, v1
+
+    invoke-virtual {v2}, Lrx/Subscriber;->unsubscribe()V
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public b(ZZLrx/Subscriber;Ljava/util/Queue;Z)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Lrx/Subscriber<",
+            "*>;",
+            "Ljava/util/Queue<",
+            "*>;Z)Z"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/i$b;->cancelled:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0, p4}, Ls0/l/a/i$b;->a(Ljava/util/Queue;)V
+
+    return v1
+
+    :cond_0
+    if-eqz p1, :cond_4
+
+    if-eqz p5, :cond_2
+
+    if-eqz p2, :cond_4
+
+    iget-object p1, p0, Ls0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    if-eqz p1, :cond_1
+
+    invoke-interface {p3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-interface {p3}, Ls0/g;->onCompleted()V
+
+    :goto_0
+    return v1
+
+    :cond_2
+    iget-object p1, p0, Ls0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    if-eqz p1, :cond_3
+
+    invoke-virtual {p0, p4}, Ls0/l/a/i$b;->a(Ljava/util/Queue;)V
+
+    invoke-interface {p3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return v1
+
+    :cond_3
+    if-eqz p2, :cond_4
+
+    invoke-interface {p3}, Ls0/g;->onCompleted()V
+
+    return v1
+
+    :cond_4
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public c(Ljava/lang/Object;I)V
+    .locals 7
+
+    iget-object v0, p0, Ls0/l/a/i$b;->subscribers:[Ls0/l/a/i$a;
+
+    aget-object v0, v0, p2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/i$b;->latest:[Ljava/lang/Object;
+
+    array-length v1, v1
+
+    iget-object v2, p0, Ls0/l/a/i$b;->latest:[Ljava/lang/Object;
+
+    aget-object v2, v2, p2
+
+    iget v3, p0, Ls0/l/a/i$b;->active:I
+
+    sget-object v4, Ls0/l/a/i$b;->d:Ljava/lang/Object;
+
+    if-ne v2, v4, :cond_0
+
+    add-int/lit8 v3, v3, 0x1
+
+    iput v3, p0, Ls0/l/a/i$b;->active:I
+
+    :cond_0
+    iget v4, p0, Ls0/l/a/i$b;->complete:I
+
+    if-nez p1, :cond_1
+
+    add-int/lit8 v4, v4, 0x1
+
+    iput v4, p0, Ls0/l/a/i$b;->complete:I
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v5, p0, Ls0/l/a/i$b;->latest:[Ljava/lang/Object;
+
+    invoke-static {p1}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v6
+
+    aput-object v6, v5, p2
+
+    :goto_0
+    const/4 p2, 0x0
+
+    const/4 v5, 0x1
+
+    if-ne v3, v1, :cond_2
+
+    const/4 v3, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v3, 0x0
+
+    :goto_1
+    if-eq v4, v1, :cond_3
+
+    if-nez p1, :cond_4
+
+    sget-object v1, Ls0/l/a/i$b;->d:Ljava/lang/Object;
+
+    if-ne v2, v1, :cond_4
+
+    :cond_3
+    const/4 p2, 0x1
+
+    :cond_4
+    if-nez p2, :cond_7
+
+    if-eqz p1, :cond_5
+
+    if-eqz v3, :cond_5
+
+    iget-object p2, p0, Ls0/l/a/i$b;->queue:Ls0/l/e/m/e;
+
+    iget-object v1, p0, Ls0/l/a/i$b;->latest:[Ljava/lang/Object;
+
+    invoke-virtual {v1}, [Ljava/lang/Object;->clone()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {p2, v0, v1}, Ls0/l/e/m/e;->j(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_5
+    if-nez p1, :cond_8
+
+    iget-object p2, p0, Ls0/l/a/i$b;->error:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_8
+
+    sget-object p2, Ls0/l/a/i$b;->d:Ljava/lang/Object;
+
+    if-eq v2, p2, :cond_6
+
+    iget-boolean p2, p0, Ls0/l/a/i$b;->delayError:Z
+
+    if-nez p2, :cond_8
+
+    :cond_6
+    iput-boolean v5, p0, Ls0/l/a/i$b;->done:Z
+
+    goto :goto_2
+
+    :cond_7
+    iput-boolean v5, p0, Ls0/l/a/i$b;->done:Z
+
+    :cond_8
+    :goto_2
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v3, :cond_9
+
+    if-eqz p1, :cond_9
+
+    const-wide/16 p1, 0x1
+
+    invoke-virtual {v0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+
+    :cond_9
+    invoke-virtual {p0}, Ls0/l/a/i$b;->d()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public d()V
+    .locals 19
+
+    move-object/from16 v7, p0
+
+    invoke-virtual/range {p0 .. p0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v8, v7, Ls0/l/a/i$b;->queue:Ls0/l/e/m/e;
+
+    iget-object v9, v7, Ls0/l/a/i$b;->actual:Lrx/Subscriber;
+
+    iget-boolean v0, v7, Ls0/l/a/i$b;->delayError:Z
+
+    iget-object v10, v7, Ls0/l/a/i$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const/4 v11, 0x1
+
+    const/4 v12, 0x1
+
+    :cond_1
+    iget-boolean v2, v7, Ls0/l/a/i$b;->done:Z
+
+    invoke-virtual {v8}, Ls0/l/e/m/e;->isEmpty()Z
+
+    move-result v3
+
+    move-object/from16 v1, p0
+
+    move-object v4, v9
+
+    move-object v5, v8
+
+    move v6, v0
+
+    invoke-virtual/range {v1 .. v6}, Ls0/l/a/i$b;->b(ZZLrx/Subscriber;Ljava/util/Queue;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-virtual {v10}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v13
+
+    const-wide/16 v5, 0x0
+
+    :goto_0
+    cmp-long v1, v5, v13
+
+    if-eqz v1, :cond_7
+
+    iget-boolean v2, v7, Ls0/l/a/i$b;->done:Z
+
+    invoke-virtual {v8}, Ls0/l/e/m/e;->peek()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v4, v1
+
+    check-cast v4, Ls0/l/a/i$a;
+
+    if-nez v4, :cond_3
+
+    const/16 v16, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v1, 0x0
+
+    const/16 v16, 0x0
+
+    :goto_1
+    move-object/from16 v1, p0
+
+    move/from16 v3, v16
+
+    move-object v15, v4
+
+    move-object v4, v9
+
+    move-wide/from16 v17, v5
+
+    move-object v5, v8
+
+    move v6, v0
+
+    invoke-virtual/range {v1 .. v6}, Ls0/l/a/i$b;->b(ZZLrx/Subscriber;Ljava/util/Queue;Z)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_4
+
+    return-void
+
+    :cond_4
+    if-eqz v16, :cond_5
+
+    move-wide/from16 v3, v17
+
+    goto :goto_2
+
+    :cond_5
+    invoke-virtual {v8}, Ls0/l/e/m/e;->poll()Ljava/lang/Object;
+
+    invoke-virtual {v8}, Ls0/l/e/m/e;->poll()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, [Ljava/lang/Object;
+
+    if-nez v1, :cond_6
+
+    iput-boolean v11, v7, Ls0/l/a/i$b;->cancelled:Z
+
+    invoke-virtual {v7, v8}, Ls0/l/a/i$b;->a(Ljava/util/Queue;)V
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Broken queue?! Sender received but not the array."
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    invoke-interface {v9, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_6
+    :try_start_0
+    iget-object v2, v7, Ls0/l/a/i$b;->combiner:Lrx/functions/FuncN;
+
+    invoke-interface {v2, v1}, Lrx/functions/FuncN;->call([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-interface {v9, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    const-wide/16 v1, 0x1
+
+    invoke-virtual {v15, v1, v2}, Lrx/Subscriber;->request(J)V
+
+    move-wide/from16 v3, v17
+
+    add-long v5, v3, v1
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    iput-boolean v11, v7, Ls0/l/a/i$b;->cancelled:Z
+
+    invoke-virtual {v7, v8}, Ls0/l/a/i$b;->a(Ljava/util/Queue;)V
+
+    invoke-interface {v9, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_7
+    move-wide v3, v5
+
+    :goto_2
+    const-wide/16 v1, 0x0
+
+    cmp-long v5, v3, v1
+
+    if-eqz v5, :cond_8
+
+    const-wide v1, 0x7fffffffffffffffL
+
+    cmp-long v5, v13, v1
+
+    if-eqz v5, :cond_8
+
+    invoke-static {v10, v3, v4}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    :cond_8
+    neg-int v1, v12
+
+    invoke-virtual {v7, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
+
+    move-result v12
+
+    if-nez v12, :cond_1
+
+    return-void
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/i$b;->cancelled:Z
+
+    return v0
+.end method
+
+.method public m(J)V
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_1
+
+    if-eqz v2, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/i$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    invoke-virtual {p0}, Ls0/l/a/i$b;->d()V
+
+    :cond_0
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "n >= required but it was "
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/i$b;->cancelled:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/i$b;->cancelled:Z
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/i$b;->queue:Ls0/l/e/m/e;
+
+    invoke-virtual {p0, v0}, Ls0/l/a/i$b;->a(Ljava/util/Queue;)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/i.smali b/com.discord/smali_classes2/s0/l/a/i.smali
new file mode 100644
index 0000000000..a16871b252
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/i.smali
@@ -0,0 +1,275 @@
+.class public final Ls0/l/a/i;
+.super Ljava/lang/Object;
+.source "OnSubscribeCombineLatest.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/i$a;,
+        Ls0/l/a/i$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:[Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/lang/Iterable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Iterable<",
+            "+",
+            "Lrx/Observable<",
+            "+TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Lrx/functions/FuncN;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/FuncN<",
+            "+TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final g:I
+
+.field public final h:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Iterable;Lrx/functions/FuncN;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Iterable<",
+            "+",
+            "Lrx/Observable<",
+            "+TT;>;>;",
+            "Lrx/functions/FuncN<",
+            "+TR;>;)V"
+        }
+    .end annotation
+
+    sget v0, Ls0/l/e/h;->f:I
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Ls0/l/a/i;->d:[Lrx/Observable;
+
+    iput-object p1, p0, Ls0/l/a/i;->e:Ljava/lang/Iterable;
+
+    iput-object p2, p0, Ls0/l/a/i;->f:Lrx/functions/FuncN;
+
+    iput v0, p0, Ls0/l/a/i;->g:I
+
+    const/4 p1, 0x0
+
+    iput-boolean p1, p0, Ls0/l/a/i;->h:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 8
+
+    move-object v1, p1
+
+    check-cast v1, Lrx/Subscriber;
+
+    iget-object p1, p0, Ls0/l/a/i;->d:[Lrx/Observable;
+
+    const/4 v6, 0x0
+
+    if-nez p1, :cond_3
+
+    iget-object p1, p0, Ls0/l/a/i;->e:Ljava/lang/Iterable;
+
+    instance-of v0, p1, Ljava/util/List;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    new-array v0, v0, [Lrx/Observable;
+
+    invoke-interface {p1, v0}, Ljava/util/List;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Lrx/Observable;
+
+    array-length v0, p1
+
+    goto :goto_1
+
+    :cond_0
+    const/16 v0, 0x8
+
+    new-array v0, v0, [Lrx/Observable;
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lrx/Observable;
+
+    array-length v4, v0
+
+    if-ne v2, v4, :cond_1
+
+    shr-int/lit8 v4, v2, 0x2
+
+    add-int/2addr v4, v2
+
+    new-array v4, v4, [Lrx/Observable;
+
+    invoke-static {v0, v6, v4, v6, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    move-object v0, v4
+
+    :cond_1
+    add-int/lit8 v4, v2, 0x1
+
+    aput-object v3, v0, v2
+
+    move v2, v4
+
+    goto :goto_0
+
+    :cond_2
+    move-object p1, v0
+
+    move v3, v2
+
+    goto :goto_2
+
+    :cond_3
+    array-length v0, p1
+
+    :goto_1
+    move v3, v0
+
+    :goto_2
+    if-nez v3, :cond_4
+
+    invoke-interface {v1}, Ls0/g;->onCompleted()V
+
+    goto :goto_5
+
+    :cond_4
+    new-instance v7, Ls0/l/a/i$b;
+
+    iget-object v2, p0, Ls0/l/a/i;->f:Lrx/functions/FuncN;
+
+    iget v4, p0, Ls0/l/a/i;->g:I
+
+    iget-boolean v5, p0, Ls0/l/a/i;->h:Z
+
+    move-object v0, v7
+
+    invoke-direct/range {v0 .. v5}, Ls0/l/a/i$b;-><init>(Lrx/Subscriber;Lrx/functions/FuncN;IIZ)V
+
+    iget-object v0, v7, Ls0/l/a/i$b;->subscribers:[Ls0/l/a/i$a;
+
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    :goto_3
+    if-ge v2, v1, :cond_5
+
+    new-instance v3, Ls0/l/a/i$a;
+
+    invoke-direct {v3, v7, v2}, Ls0/l/a/i$a;-><init>(Ls0/l/a/i$b;I)V
+
+    aput-object v3, v0, v2
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_3
+
+    :cond_5
+    invoke-virtual {v7, v6}, Ljava/util/concurrent/atomic/AtomicInteger;->lazySet(I)V
+
+    iget-object v2, v7, Ls0/l/a/i$b;->actual:Lrx/Subscriber;
+
+    invoke-virtual {v2, v7}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v2, v7, Ls0/l/a/i$b;->actual:Lrx/Subscriber;
+
+    invoke-virtual {v2, v7}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    :goto_4
+    if-ge v6, v1, :cond_7
+
+    iget-boolean v2, v7, Ls0/l/a/i$b;->cancelled:Z
+
+    if-eqz v2, :cond_6
+
+    goto :goto_5
+
+    :cond_6
+    aget-object v2, p1, v6
+
+    aget-object v3, v0, v6
+
+    invoke-virtual {v2, v3}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
+
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    :goto_5
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/i0.smali b/com.discord/smali_classes2/s0/l/a/i0.smali
new file mode 100644
index 0000000000..f8ba9621cb
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/i0.smali
@@ -0,0 +1,49 @@
+.class public final Ls0/l/a/i0;
+.super Ljava/lang/Object;
+.source "OnSubscribeThrow.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/Throwable;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Throwable;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/i0;->d:Ljava/lang/Throwable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 1
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/i0;->d:Ljava/lang/Throwable;
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/i1.smali b/com.discord/smali_classes2/s0/l/a/i1.smali
new file mode 100644
index 0000000000..d272fdc0ae
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/i1.smali
@@ -0,0 +1,85 @@
+.class public final Ls0/l/a/i1;
+.super Ljava/lang/Object;
+.source "OperatorOnErrorResumeNextViaFunction.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "+",
+            "Lrx/Observable<",
+            "+TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/k/b<",
+            "-",
+            "Ljava/lang/Throwable;",
+            "+",
+            "Lrx/Observable<",
+            "+TT;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/i1;->d:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/b/a;
+
+    invoke-direct {v0}, Ls0/l/b/a;-><init>()V
+
+    new-instance v1, Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {v1}, Lrx/subscriptions/SerialSubscription;-><init>()V
+
+    new-instance v2, Ls0/l/a/h1;
+
+    invoke-direct {v2, p0, p1, v0, v1}, Ls0/l/a/h1;-><init>(Ls0/l/a/i1;Lrx/Subscriber;Ls0/l/b/a;Lrx/subscriptions/SerialSubscription;)V
+
+    invoke-virtual {v1, v2}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v2
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/i2.smali b/com.discord/smali_classes2/s0/l/a/i2.smali
similarity index 83%
rename from com.discord/smali_classes2/r0/l/a/i2.smali
rename to com.discord/smali_classes2/s0/l/a/i2.smali
index fb5984fa09..3a87b265f3 100644
--- a/com.discord/smali_classes2/r0/l/a/i2.smali
+++ b/com.discord/smali_classes2/s0/l/a/i2.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/i2;
+.class public final Ls0/l/a/i2;
 .super Ljava/lang/Object;
 .source "OperatorTakeUntil.java"
 
@@ -45,7 +45,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/i2;->d:Lrx/Observable;
+    iput-object p1, p0, Ls0/l/a/i2;->d:Lrx/Observable;
 
     return-void
 .end method
@@ -63,13 +63,13 @@
 
     invoke-direct {v0, p1, v1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;Z)V
 
-    new-instance v2, Lr0/l/a/g2;
+    new-instance v2, Ls0/l/a/g2;
 
-    invoke-direct {v2, p0, v0, v1, v0}, Lr0/l/a/g2;-><init>(Lr0/l/a/i2;Lrx/Subscriber;ZLrx/Subscriber;)V
+    invoke-direct {v2, p0, v0, v1, v0}, Ls0/l/a/g2;-><init>(Ls0/l/a/i2;Lrx/Subscriber;ZLrx/Subscriber;)V
 
-    new-instance v1, Lr0/l/a/h2;
+    new-instance v1, Ls0/l/a/h2;
 
-    invoke-direct {v1, p0, v2}, Lr0/l/a/h2;-><init>(Lr0/l/a/i2;Lrx/Subscriber;)V
+    invoke-direct {v1, p0, v2}, Ls0/l/a/h2;-><init>(Ls0/l/a/i2;Lrx/Subscriber;)V
 
     invoke-virtual {v0, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
@@ -77,7 +77,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lr0/l/a/i2;->d:Lrx/Observable;
+    iget-object p1, p0, Ls0/l/a/i2;->d:Lrx/Observable;
 
     invoke-virtual {p1, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
 
diff --git a/com.discord/smali_classes2/s0/l/a/j.smali b/com.discord/smali_classes2/s0/l/a/j.smali
new file mode 100644
index 0000000000..31337d323a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/j.smali
@@ -0,0 +1,68 @@
+.class public Ls0/l/a/j;
+.super Ljava/lang/Object;
+.source "OnSubscribeConcatMap.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/k$c;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/k;Ls0/l/a/k$c;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/j;->d:Ls0/l/a/k$c;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 4
+
+    iget-object v0, p0, Ls0/l/a/j;->d:Ls0/l/a/k$c;
+
+    if-eqz v0, :cond_2
+
+    const-wide/16 v1, 0x0
+
+    cmp-long v3, p1, v1
+
+    if-lez v3, :cond_0
+
+    iget-object v0, v0, Ls0/l/a/k$c;->g:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1, p2}, Ls0/l/b/a;->m(J)V
+
+    goto :goto_0
+
+    :cond_0
+    if-ltz v3, :cond_1
+
+    :goto_0
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "n >= 0 required but it was "
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/j0$a.smali b/com.discord/smali_classes2/s0/l/a/j0$a.smali
new file mode 100644
index 0000000000..5745f92154
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/j0$a.smali
@@ -0,0 +1,107 @@
+.class public final Ls0/l/a/j0$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/j0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/l/b/a;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ls0/l/b/a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;",
+            "Ls0/l/b/a;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/j0$a;->d:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/j0$a;->e:Ls0/l/b/a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/j0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/j0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/j0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/j0$a;->e:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1}, Ls0/l/b/a;->c(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/j0$b$a.smali b/com.discord/smali_classes2/s0/l/a/j0$b$a.smali
new file mode 100644
index 0000000000..e27a580d0e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/j0$b$a.smali
@@ -0,0 +1,114 @@
+.class public final Ls0/l/a/j0$b$a;
+.super Ljava/lang/Object;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/j0$b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final synthetic e:Ls0/l/a/j0$b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/j0$b;J)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/j0$b$a;->e:Ls0/l/a/j0$b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p2, p0, Ls0/l/a/j0$b$a;->d:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/j0$b$a;->e:Ls0/l/a/j0$b;
+
+    iget-wide v1, p0, Ls0/l/a/j0$b$a;->d:J
+
+    iget-object v3, v0, Ls0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide v4, 0x7fffffffffffffffL
+
+    invoke-virtual {v3, v1, v2, v4, v5}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
+
+    move-result v1
+
+    if-nez v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
+
+    iget-object v1, v0, Ls0/l/a/j0$b;->h:Lrx/Observable;
+
+    if-nez v1, :cond_1
+
+    iget-object v0, v0, Ls0/l/a/j0$b;->d:Lrx/Subscriber;
+
+    new-instance v1, Ljava/util/concurrent/TimeoutException;
+
+    invoke-direct {v1}, Ljava/util/concurrent/TimeoutException;-><init>()V
+
+    invoke-interface {v0, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_1
+    iget-wide v1, v0, Ls0/l/a/j0$b;->m:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-eqz v5, :cond_2
+
+    iget-object v3, v0, Ls0/l/a/j0$b;->i:Ls0/l/b/a;
+
+    invoke-virtual {v3, v1, v2}, Ls0/l/b/a;->b(J)V
+
+    :cond_2
+    new-instance v1, Ls0/l/a/j0$a;
+
+    iget-object v2, v0, Ls0/l/a/j0$b;->d:Lrx/Subscriber;
+
+    iget-object v3, v0, Ls0/l/a/j0$b;->i:Ls0/l/b/a;
+
+    invoke-direct {v1, v2, v3}, Ls0/l/a/j0$a;-><init>(Lrx/Subscriber;Ls0/l/b/a;)V
+
+    iget-object v2, v0, Ls0/l/a/j0$b;->l:Ls0/l/d/a;
+
+    invoke-virtual {v2, v1}, Ls0/l/d/a;->b(Lrx/Subscription;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    iget-object v0, v0, Ls0/l/a/j0$b;->h:Lrx/Observable;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
+
+    :cond_3
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/j0$b.smali b/com.discord/smali_classes2/s0/l/a/j0$b.smali
new file mode 100644
index 0000000000..4a61ffbeaa
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/j0$b.smali
@@ -0,0 +1,287 @@
+.class public final Ls0/l/a/j0$b;
+.super Lrx/Subscriber;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/j0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/j0$b$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:J
+
+.field public final f:Ljava/util/concurrent/TimeUnit;
+
+.field public final g:Lrx/Scheduler$Worker;
+
+.field public final h:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final i:Ls0/l/b/a;
+
+.field public final j:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final k:Ls0/l/d/a;
+
+.field public final l:Ls0/l/d/a;
+
+.field public m:J
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler$Worker;Lrx/Observable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;J",
+            "Ljava/util/concurrent/TimeUnit;",
+            "Lrx/Scheduler$Worker;",
+            "Lrx/Observable<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/j0$b;->d:Lrx/Subscriber;
+
+    iput-wide p2, p0, Ls0/l/a/j0$b;->e:J
+
+    iput-object p4, p0, Ls0/l/a/j0$b;->f:Ljava/util/concurrent/TimeUnit;
+
+    iput-object p5, p0, Ls0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
+
+    iput-object p6, p0, Ls0/l/a/j0$b;->h:Lrx/Observable;
+
+    new-instance p1, Ls0/l/b/a;
+
+    invoke-direct {p1}, Ls0/l/b/a;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/j0$b;->i:Ls0/l/b/a;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance p1, Ls0/l/d/a;
+
+    invoke-direct {p1}, Ls0/l/d/a;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/j0$b;->k:Ls0/l/d/a;
+
+    new-instance p1, Ls0/l/d/a;
+
+    invoke-direct {p1, p0}, Ls0/l/d/a;-><init>(Lrx/Subscription;)V
+
+    iput-object p1, p0, Ls0/l/a/j0$b;->l:Ls0/l/d/a;
+
+    invoke-virtual {p0, p5}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object p1, p0, Ls0/l/a/j0$b;->k:Ls0/l/d/a;
+
+    invoke-virtual {p0, p1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide v1, 0x7fffffffffffffffL
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->getAndSet(J)J
+
+    move-result-wide v3
+
+    cmp-long v0, v3, v1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->k:Ls0/l/d/a;
+
+    invoke-virtual {v0}, Ls0/l/d/a;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide v1, 0x7fffffffffffffffL
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->getAndSet(J)J
+
+    move-result-wide v3
+
+    cmp-long v0, v3, v1
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->k:Ls0/l/d/a;
+
+    invoke-virtual {v0}, Ls0/l/d/a;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    iget-object p1, p0, Ls0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
+
+    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    cmp-long v4, v0, v2
+
+    if-eqz v4, :cond_2
+
+    iget-object v2, p0, Ls0/l/a/j0$b;->j:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide/16 v3, 0x1
+
+    add-long v5, v0, v3
+
+    invoke-virtual {v2, v0, v1, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/j0$b;->k:Ls0/l/d/a;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Subscription;
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_1
+    iget-wide v0, p0, Ls0/l/a/j0$b;->m:J
+
+    add-long/2addr v0, v3
+
+    iput-wide v0, p0, Ls0/l/a/j0$b;->m:J
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/a/j0$b;->k:Ls0/l/d/a;
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
+
+    new-instance v1, Ls0/l/a/j0$b$a;
+
+    invoke-direct {v1, p0, v5, v6}, Ls0/l/a/j0$b$a;-><init>(Ls0/l/a/j0$b;J)V
+
+    iget-wide v2, p0, Ls0/l/a/j0$b;->e:J
+
+    iget-object v4, p0, Ls0/l/a/j0$b;->f:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v1, v2, v3, v4}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Ls0/l/d/a;->b(Lrx/Subscription;)Z
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/j0$b;->i:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1}, Ls0/l/b/a;->c(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/j0.smali b/com.discord/smali_classes2/s0/l/a/j0.smali
new file mode 100644
index 0000000000..9173d13abb
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/j0.smali
@@ -0,0 +1,145 @@
+.class public final Ls0/l/a/j0;
+.super Ljava/lang/Object;
+.source "OnSubscribeTimeoutTimedWithFallback.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/j0$a;,
+        Ls0/l/a/j0$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:J
+
+.field public final f:Ljava/util/concurrent/TimeUnit;
+
+.field public final g:Lrx/Scheduler;
+
+.field public final h:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;Lrx/Observable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "TT;>;J",
+            "Ljava/util/concurrent/TimeUnit;",
+            "Lrx/Scheduler;",
+            "Lrx/Observable<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/j0;->d:Lrx/Observable;
+
+    iput-wide p2, p0, Ls0/l/a/j0;->e:J
+
+    iput-object p4, p0, Ls0/l/a/j0;->f:Ljava/util/concurrent/TimeUnit;
+
+    iput-object p5, p0, Ls0/l/a/j0;->g:Lrx/Scheduler;
+
+    iput-object p6, p0, Ls0/l/a/j0;->h:Lrx/Observable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 8
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v7, Ls0/l/a/j0$b;
+
+    iget-wide v2, p0, Ls0/l/a/j0;->e:J
+
+    iget-object v4, p0, Ls0/l/a/j0;->f:Ljava/util/concurrent/TimeUnit;
+
+    iget-object v0, p0, Ls0/l/a/j0;->g:Lrx/Scheduler;
+
+    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v5
+
+    iget-object v6, p0, Ls0/l/a/j0;->h:Lrx/Observable;
+
+    move-object v0, v7
+
+    move-object v1, p1
+
+    invoke-direct/range {v0 .. v6}, Ls0/l/a/j0$b;-><init>(Lrx/Subscriber;JLjava/util/concurrent/TimeUnit;Lrx/Scheduler$Worker;Lrx/Observable;)V
+
+    iget-object v0, v7, Ls0/l/a/j0$b;->l:Ls0/l/d/a;
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v0, v7, Ls0/l/a/j0$b;->i:Ls0/l/b/a;
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    iget-object p1, v7, Ls0/l/a/j0$b;->k:Ls0/l/d/a;
+
+    iget-object v0, v7, Ls0/l/a/j0$b;->g:Lrx/Scheduler$Worker;
+
+    new-instance v1, Ls0/l/a/j0$b$a;
+
+    const-wide/16 v2, 0x0
+
+    invoke-direct {v1, v7, v2, v3}, Ls0/l/a/j0$b$a;-><init>(Ls0/l/a/j0$b;J)V
+
+    iget-wide v2, v7, Ls0/l/a/j0$b;->e:J
+
+    iget-object v4, v7, Ls0/l/a/j0$b;->f:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v1, v2, v3, v4}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Ls0/l/d/a;->b(Lrx/Subscription;)Z
+
+    iget-object p1, p0, Ls0/l/a/j0;->d:Lrx/Observable;
+
+    invoke-virtual {p1, v7}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/j1.smali b/com.discord/smali_classes2/s0/l/a/j1.smali
new file mode 100644
index 0000000000..d48745281b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/j1.smali
@@ -0,0 +1,140 @@
+.class public final Ls0/l/a/j1;
+.super Ljava/lang/Object;
+.source "OperatorPublish.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicReference;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 6
+
+    check-cast p1, Lrx/Subscriber;
+
+    :cond_0
+    :goto_0
+    iget-object v0, p0, Ls0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/a/k1$b;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    :cond_1
+    new-instance v1, Ls0/l/a/k1$b;
+
+    iget-object v2, p0, Ls0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v1, v2}, Ls0/l/a/k1$b;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
+
+    new-instance v2, Ls0/l/a/l1;
+
+    invoke-direct {v2, v1}, Ls0/l/a/l1;-><init>(Ls0/l/a/k1$b;)V
+
+    new-instance v3, Ls0/r/a;
+
+    invoke-direct {v3, v2}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v2, p0, Ls0/l/a/j1;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    move-object v0, v1
+
+    :cond_3
+    new-instance v1, Ls0/l/a/k1$a;
+
+    invoke-direct {v1, v0, p1}, Ls0/l/a/k1$a;-><init>(Ls0/l/a/k1$b;Lrx/Subscriber;)V
+
+    :cond_4
+    iget-object v2, v0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, [Ls0/l/a/k1$a;
+
+    sget-object v3, Ls0/l/a/k1$b;->l:[Ls0/l/a/k1$a;
+
+    const/4 v4, 0x0
+
+    if-ne v2, v3, :cond_5
+
+    goto :goto_1
+
+    :cond_5
+    array-length v3, v2
+
+    add-int/lit8 v5, v3, 0x1
+
+    new-array v5, v5, [Ls0/l/a/k1$a;
+
+    invoke-static {v2, v4, v5, v4, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    aput-object v1, v5, v3
+
+    iget-object v3, v0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v3, v2, v5}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_4
+
+    const/4 v4, 0x1
+
+    :goto_1
+    if-eqz v4, :cond_0
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/j2.smali b/com.discord/smali_classes2/s0/l/a/j2.smali
new file mode 100644
index 0000000000..e778f96ee2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/j2.smali
@@ -0,0 +1,34 @@
+.class public Ls0/l/a/j2;
+.super Ljava/lang/Object;
+.source "OperatorTakeUntilPredicate.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/k2$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/k2;Ls0/l/a/k2$a;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/j2;->d:Ls0/l/a/k2$a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/j2;->d:Ls0/l/a/k2$a;
+
+    invoke-virtual {v0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k$a.smali b/com.discord/smali_classes2/s0/l/a/k$a.smali
new file mode 100644
index 0000000000..bdfa01bf3e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k$a.smali
@@ -0,0 +1,114 @@
+.class public final Ls0/l/a/k$a;
+.super Ljava/lang/Object;
+.source "OnSubscribeConcatMap.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Producer;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TR;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/l/a/k$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/k$c<",
+            "TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public f:Z
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;Ls0/l/a/k$c;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TR;",
+            "Ls0/l/a/k$c<",
+            "TT;TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k$a;->d:Ljava/lang/Object;
+
+    iput-object p2, p0, Ls0/l/a/k$a;->e:Ls0/l/a/k$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 3
+
+    iget-boolean v0, p0, Ls0/l/a/k$a;->f:Z
+
+    if-nez v0, :cond_0
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_0
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/k$a;->f:Z
+
+    iget-object p1, p0, Ls0/l/a/k$a;->e:Ls0/l/a/k$c;
+
+    iget-object p2, p0, Ls0/l/a/k$a;->d:Ljava/lang/Object;
+
+    iget-object v0, p1, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    const-wide/16 v0, 0x1
+
+    iget-object p2, p1, Ls0/l/a/k$c;->g:Ls0/l/b/a;
+
+    invoke-virtual {p2, v0, v1}, Ls0/l/b/a;->b(J)V
+
+    const/4 p2, 0x0
+
+    iput-boolean p2, p1, Ls0/l/a/k$c;->m:Z
+
+    invoke-virtual {p1}, Ls0/l/a/k$c;->a()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k$b.smali b/com.discord/smali_classes2/s0/l/a/k$b.smali
new file mode 100644
index 0000000000..7aff5fbc6a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k$b.smali
@@ -0,0 +1,191 @@
+.class public final Ls0/l/a/k$b;
+.super Lrx/Subscriber;
+.source "OnSubscribeConcatMap.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/l/a/k$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/k$c<",
+            "TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:J
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/k$c;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/k$c<",
+            "TT;TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k$b;->d:Ls0/l/a/k$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/k$b;->d:Ls0/l/a/k$c;
+
+    iget-wide v1, p0, Ls0/l/a/k$b;->e:J
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-eqz v5, :cond_0
+
+    iget-object v3, v0, Ls0/l/a/k$c;->g:Ls0/l/b/a;
+
+    invoke-virtual {v3, v1, v2}, Ls0/l/b/a;->b(J)V
+
+    :cond_0
+    const/4 v1, 0x0
+
+    iput-boolean v1, v0, Ls0/l/a/k$c;->m:Z
+
+    invoke-virtual {v0}, Ls0/l/a/k$c;->a()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/a/k$b;->d:Ls0/l/a/k$c;
+
+    iget-wide v1, p0, Ls0/l/a/k$b;->e:J
+
+    iget-object v3, v0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {v3, p1}, Ls0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget p1, v0, Ls0/l/a/k$c;->f:I
+
+    if-nez p1, :cond_2
+
+    iget-object p1, v0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {p1}, Ls0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ls0/l/e/d;->g(Ljava/lang/Throwable;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    iget-object v1, v0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v1, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_1
+    invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
+
+    goto :goto_0
+
+    :cond_2
+    const-wide/16 v3, 0x0
+
+    cmp-long p1, v1, v3
+
+    if-eqz p1, :cond_3
+
+    iget-object p1, v0, Ls0/l/a/k$c;->g:Ls0/l/b/a;
+
+    invoke-virtual {p1, v1, v2}, Ls0/l/b/a;->b(J)V
+
+    :cond_3
+    const/4 p1, 0x0
+
+    iput-boolean p1, v0, Ls0/l/a/k$c;->m:Z
+
+    invoke-virtual {v0}, Ls0/l/a/k$c;->a()V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TR;)V"
+        }
+    .end annotation
+
+    iget-wide v0, p0, Ls0/l/a/k$b;->e:J
+
+    const-wide/16 v2, 0x1
+
+    add-long/2addr v0, v2
+
+    iput-wide v0, p0, Ls0/l/a/k$b;->e:J
+
+    iget-object v0, p0, Ls0/l/a/k$b;->d:Ls0/l/a/k$c;
+
+    iget-object v0, v0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/k$b;->d:Ls0/l/a/k$c;
+
+    iget-object v0, v0, Ls0/l/a/k$c;->g:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1}, Ls0/l/b/a;->c(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k$c.smali b/com.discord/smali_classes2/s0/l/a/k$c.smali
new file mode 100644
index 0000000000..ca279f3005
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k$c.smali
@@ -0,0 +1,529 @@
+.class public final Ls0/l/a/k$c;
+.super Lrx/Subscriber;
+.source "OnSubscribeConcatMap.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/k;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+",
+            "Lrx/Observable<",
+            "+TR;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:I
+
+.field public final g:Ls0/l/b/a;
+
+.field public final h:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final i:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field public final j:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final k:Lrx/subscriptions/SerialSubscription;
+
+.field public volatile l:Z
+
+.field public volatile m:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ls0/k/b;II)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;",
+            "Ls0/k/b<",
+            "-TT;+",
+            "Lrx/Observable<",
+            "+TR;>;>;II)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/k$c;->e:Ls0/k/b;
+
+    iput p4, p0, Ls0/l/a/k$c;->f:I
+
+    new-instance p1, Ls0/l/b/a;
+
+    invoke-direct {p1}, Ls0/l/b/a;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k$c;->g:Ls0/l/b/a;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k$c;->i:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    new-instance p1, Ls0/l/e/n/n;
+
+    invoke-direct {p1, p3}, Ls0/l/e/n/n;-><init>(I)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ls0/l/e/m/c;
+
+    invoke-direct {p1, p3}, Ls0/l/e/m/c;-><init>(I)V
+
+    :goto_0
+    iput-object p1, p0, Ls0/l/a/k$c;->h:Ljava/util/Queue;
+
+    new-instance p1, Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
+
+    int-to-long p1, p3
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 7
+
+    iget-object v0, p0, Ls0/l/a/k$c;->i:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget v0, p0, Ls0/l/a/k$c;->f:I
+
+    :cond_1
+    :goto_0
+    iget-object v1, p0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    return-void
+
+    :cond_2
+    iget-boolean v1, p0, Ls0/l/a/k$c;->m:Z
+
+    if-nez v1, :cond_d
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_4
+
+    iget-object v2, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_4
+
+    iget-object v0, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {v0}, Ls0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ls0/l/e/d;->g(Ljava/lang/Throwable;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_3
+
+    iget-object v1, p0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_3
+    return-void
+
+    :cond_4
+    iget-boolean v2, p0, Ls0/l/a/k$c;->l:Z
+
+    iget-object v3, p0, Ls0/l/a/k$c;->h:Ljava/util/Queue;
+
+    invoke-interface {v3}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-nez v3, :cond_5
+
+    const/4 v4, 0x1
+
+    goto :goto_1
+
+    :cond_5
+    const/4 v4, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_8
+
+    if-eqz v4, :cond_8
+
+    iget-object v0, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {v0}, Ls0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+
+    move-result-object v0
+
+    if-nez v0, :cond_6
+
+    iget-object v0, p0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    goto :goto_2
+
+    :cond_6
+    invoke-static {v0}, Ls0/l/e/d;->g(Ljava/lang/Throwable;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_7
+
+    iget-object v1, p0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_7
+    :goto_2
+    return-void
+
+    :cond_8
+    if-nez v4, :cond_d
+
+    :try_start_0
+    iget-object v2, p0, Ls0/l/a/k$c;->e:Ls0/k/b;
+
+    invoke-static {v3}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lrx/Observable;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v2, :cond_9
+
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "The source returned by the mapper was null"
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0, v0}, Ls0/l/a/k$c;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_9
+    sget-object v3, Ls0/l/a/f;->e:Lrx/Observable;
+
+    const-wide/16 v4, 0x1
+
+    if-eq v2, v3, :cond_c
+
+    instance-of v3, v2, Ls0/l/e/j;
+
+    if-eqz v3, :cond_a
+
+    check-cast v2, Ls0/l/e/j;
+
+    iput-boolean v1, p0, Ls0/l/a/k$c;->m:Z
+
+    iget-object v1, p0, Ls0/l/a/k$c;->g:Ls0/l/b/a;
+
+    new-instance v3, Ls0/l/a/k$a;
+
+    iget-object v2, v2, Ls0/l/e/j;->e:Ljava/lang/Object;
+
+    invoke-direct {v3, v2, p0}, Ls0/l/a/k$a;-><init>(Ljava/lang/Object;Ls0/l/a/k$c;)V
+
+    invoke-virtual {v1, v3}, Ls0/l/b/a;->c(Lrx/Producer;)V
+
+    goto :goto_3
+
+    :cond_a
+    new-instance v3, Ls0/l/a/k$b;
+
+    invoke-direct {v3, p0}, Ls0/l/a/k$b;-><init>(Ls0/l/a/k$c;)V
+
+    iget-object v6, p0, Ls0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v6, v3}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
+
+    invoke-virtual {v3}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v6
+
+    if-nez v6, :cond_b
+
+    iput-boolean v1, p0, Ls0/l/a/k$c;->m:Z
+
+    invoke-virtual {v2, v3}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    :goto_3
+    invoke-virtual {p0, v4, v5}, Lrx/Subscriber;->request(J)V
+
+    goto :goto_4
+
+    :cond_b
+    return-void
+
+    :cond_c
+    invoke-virtual {p0, v4, v5}, Lrx/Subscriber;->request(J)V
+
+    goto/16 :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v0}, Ls0/l/a/k$c;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_d
+    :goto_4
+    iget-object v1, p0, Ls0/l/a/k$c;->i:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    return-void
+.end method
+
+.method public b(Ljava/lang/Throwable;)V
+    .locals 1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {v0, p1}, Ls0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object p1, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {p1}, Ls0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ls0/l/e/d;->g(Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/k$c;->l:Z
+
+    invoke-virtual {p0}, Ls0/l/a/k$c;->a()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {v0, p1}, Ls0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/k$c;->l:Z
+
+    iget p1, p0, Ls0/l/a/k$c;->f:I
+
+    if-nez p1, :cond_1
+
+    iget-object p1, p0, Ls0/l/a/k$c;->j:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {p1}, Ls0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ls0/l/e/d;->g(Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/k$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_0
+    iget-object p1, p0, Ls0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
+
+    iget-object p1, p1, Lrx/subscriptions/SerialSubscription;->d:Ls0/l/d/a;
+
+    invoke-virtual {p1}, Ls0/l/d/a;->unsubscribe()V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ls0/l/a/k$c;->a()V
+
+    goto :goto_0
+
+    :cond_2
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/k$c;->h:Ljava/util/Queue;
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    new-instance p1, Lrx/exceptions/MissingBackpressureException;
+
+    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
+
+    invoke-virtual {p0, p1}, Ls0/l/a/k$c;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ls0/l/a/k$c;->a()V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k.smali b/com.discord/smali_classes2/s0/l/a/k.smali
new file mode 100644
index 0000000000..be47466193
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k.smali
@@ -0,0 +1,141 @@
+.class public final Ls0/l/a/k;
+.super Ljava/lang/Object;
+.source "OnSubscribeConcatMap.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/k$a;,
+        Ls0/l/a/k$b;,
+        Ls0/l/a/k$c;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+",
+            "Lrx/Observable<",
+            "+TR;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:I
+
+.field public final g:I
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;Ls0/k/b;II)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "+TT;>;",
+            "Ls0/k/b<",
+            "-TT;+",
+            "Lrx/Observable<",
+            "+TR;>;>;II)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k;->d:Lrx/Observable;
+
+    iput-object p2, p0, Ls0/l/a/k;->e:Ls0/k/b;
+
+    iput p3, p0, Ls0/l/a/k;->f:I
+
+    iput p4, p0, Ls0/l/a/k;->g:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 5
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget v0, p0, Ls0/l/a/k;->g:I
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Lrx/observers/SerializedSubscriber;
+
+    invoke-direct {v0, p1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, p1
+
+    :goto_0
+    new-instance v1, Ls0/l/a/k$c;
+
+    iget-object v2, p0, Ls0/l/a/k;->e:Ls0/k/b;
+
+    iget v3, p0, Ls0/l/a/k;->f:I
+
+    iget v4, p0, Ls0/l/a/k;->g:I
+
+    invoke-direct {v1, v0, v2, v3, v4}, Ls0/l/a/k$c;-><init>(Lrx/Subscriber;Ls0/k/b;II)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v0, v1, Ls0/l/a/k$c;->k:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v0, Ls0/l/a/j;
+
+    invoke-direct {v0, p0, v1}, Ls0/l/a/j;-><init>(Ls0/l/a/k;Ls0/l/a/k$c;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    iget-object p1, p0, Ls0/l/a/k;->d:Lrx/Observable;
+
+    invoke-virtual {p1, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k0.smali b/com.discord/smali_classes2/s0/l/a/k0.smali
new file mode 100644
index 0000000000..dfd9a42f2c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k0.smali
@@ -0,0 +1,58 @@
+.class public Ls0/l/a/k0;
+.super Ljava/lang/Object;
+.source "OnSubscribeTimerOnce.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/l0;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/k0;->d:Lrx/Subscriber;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 3
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/k0;->d:Lrx/Subscriber;
+
+    const-wide/16 v1, 0x0
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/k0;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/k0;->d:Lrx/Subscriber;
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/k1$a.smali b/com.discord/smali_classes2/s0/l/a/k1$a.smali
similarity index 86%
rename from com.discord/smali_classes2/r0/l/a/k1$a.smali
rename to com.discord/smali_classes2/s0/l/a/k1$a.smali
index f19b504ee7..42c6215ec9 100644
--- a/com.discord/smali_classes2/r0/l/a/k1$a.smali
+++ b/com.discord/smali_classes2/s0/l/a/k1$a.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/k1$a;
+.class public final Ls0/l/a/k1$a;
 .super Ljava/util/concurrent/atomic/AtomicLong;
 .source "OperatorPublish.java"
 
@@ -9,7 +9,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/k1;
+    value = Ls0/l/a/k1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -43,10 +43,10 @@
     .end annotation
 .end field
 
-.field public final parent:Lr0/l/a/k1$b;
+.field public final parent:Ls0/l/a/k1$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/l/a/k1$b<",
+            "Ls0/l/a/k1$b<",
             "TT;>;"
         }
     .end annotation
@@ -54,12 +54,12 @@
 
 
 # direct methods
-.method public constructor <init>(Lr0/l/a/k1$b;Lrx/Subscriber;)V
+.method public constructor <init>(Ls0/l/a/k1$b;Lrx/Subscriber;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/l/a/k1$b<",
+            "Ls0/l/a/k1$b<",
             "TT;>;",
             "Lrx/Subscriber<",
             "-TT;>;)V"
@@ -68,9 +68,9 @@
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/k1$a;->parent:Lr0/l/a/k1$b;
+    iput-object p1, p0, Ls0/l/a/k1$a;->parent:Ls0/l/a/k1$b;
 
-    iput-object p2, p0, Lr0/l/a/k1$a;->child:Lrx/Subscriber;
+    iput-object p2, p0, Ls0/l/a/k1$a;->child:Lrx/Subscriber;
 
     const-wide/high16 p1, -0x4000000000000000L    # -2.0
 
@@ -249,9 +249,9 @@
 
     if-eqz v3, :cond_0
 
-    iget-object p1, p0, Lr0/l/a/k1$a;->parent:Lr0/l/a/k1$b;
+    iget-object p1, p0, Ls0/l/a/k1$a;->parent:Ls0/l/a/k1$b;
 
-    invoke-virtual {p1}, Lr0/l/a/k1$b;->b()V
+    invoke-virtual {p1}, Ls0/l/a/k1$b;->b()V
 
     return-void
 .end method
@@ -277,22 +277,22 @@
 
     if-eqz v4, :cond_7
 
-    iget-object v0, p0, Lr0/l/a/k1$a;->parent:Lr0/l/a/k1$b;
+    iget-object v0, p0, Ls0/l/a/k1$a;->parent:Ls0/l/a/k1$b;
 
     :cond_0
-    iget-object v1, v0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, v0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
     move-result-object v1
 
-    check-cast v1, [Lr0/l/a/k1$a;
+    check-cast v1, [Ls0/l/a/k1$a;
 
-    sget-object v2, Lr0/l/a/k1$b;->k:[Lr0/l/a/k1$a;
+    sget-object v2, Ls0/l/a/k1$b;->k:[Ls0/l/a/k1$a;
 
     if-eq v1, v2, :cond_6
 
-    sget-object v2, Lr0/l/a/k1$b;->l:[Lr0/l/a/k1$a;
+    sget-object v2, Ls0/l/a/k1$b;->l:[Ls0/l/a/k1$a;
 
     if-ne v1, v2, :cond_1
 
@@ -336,14 +336,14 @@
 
     if-ne v2, v5, :cond_5
 
-    sget-object v2, Lr0/l/a/k1$b;->k:[Lr0/l/a/k1$a;
+    sget-object v2, Ls0/l/a/k1$b;->k:[Ls0/l/a/k1$a;
 
     goto :goto_2
 
     :cond_5
     add-int/lit8 v6, v2, -0x1
 
-    new-array v6, v6, [Lr0/l/a/k1$a;
+    new-array v6, v6, [Ls0/l/a/k1$a;
 
     invoke-static {v1, v3, v6, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -358,7 +358,7 @@
     move-object v2, v6
 
     :goto_2
-    iget-object v3, v0, Lr0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v3, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -368,9 +368,9 @@
 
     :cond_6
     :goto_3
-    iget-object v0, p0, Lr0/l/a/k1$a;->parent:Lr0/l/a/k1$b;
+    iget-object v0, p0, Ls0/l/a/k1$a;->parent:Ls0/l/a/k1$b;
 
-    invoke-virtual {v0}, Lr0/l/a/k1$b;->b()V
+    invoke-virtual {v0}, Ls0/l/a/k1$b;->b()V
 
     :cond_7
     return-void
diff --git a/com.discord/smali_classes2/s0/l/a/k1$b.smali b/com.discord/smali_classes2/s0/l/a/k1$b.smali
new file mode 100644
index 0000000000..a75fe8b339
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k1$b.smali
@@ -0,0 +1,734 @@
+.class public final Ls0/l/a/k1$b;
+.super Lrx/Subscriber;
+.source "OperatorPublish.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/k1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final k:[Ls0/l/a/k1$a;
+
+.field public static final l:[Ls0/l/a/k1$a;
+
+
+# instance fields
+.field public final d:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/a/k1$b<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public volatile f:Ljava/lang/Object;
+
+.field public final g:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "[",
+            "Ls0/l/a/k1$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final h:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field public i:Z
+
+.field public j:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    new-array v1, v0, [Ls0/l/a/k1$a;
+
+    sput-object v1, Ls0/l/a/k1$b;->k:[Ls0/l/a/k1$a;
+
+    new-array v0, v0, [Ls0/l/a/k1$a;
+
+    sput-object v0, Ls0/l/a/k1$b;->l:[Ls0/l/a/k1$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/a/k1$b<",
+            "TT;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ls0/l/e/n/n;
+
+    sget v1, Ls0/l/e/h;->f:I
+
+    invoke-direct {v0, v1}, Ls0/l/e/n/n;-><init>(I)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ls0/l/e/m/c;
+
+    sget v1, Ls0/l/e/h;->f:I
+
+    invoke-direct {v0, v1}, Ls0/l/e/m/c;-><init>(I)V
+
+    :goto_0
+    iput-object v0, p0, Ls0/l/a/k1$b;->d:Ljava/util/Queue;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/a/k1$b;->k:[Ls0/l/a/k1$a;
+
+    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iput-object p1, p0, Ls0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k1$b;->h:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;Z)Z
+    .locals 4
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_3
+
+    invoke-static {p1}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-eqz v1, :cond_1
+
+    if-eqz p2, :cond_3
+
+    iget-object p1, p0, Ls0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p1, p0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :try_start_0
+    iget-object p1, p0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object p2, Ls0/l/a/k1$b;->l:[Ls0/l/a/k1$a;
+
+    invoke-virtual {p1, p2}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ls0/l/a/k1$a;
+
+    array-length p2, p1
+
+    :goto_0
+    if-ge v0, p2, :cond_0
+
+    aget-object v1, p1, v0
+
+    iget-object v1, v1, Ls0/l/a/k1$a;->child:Lrx/Subscriber;
+
+    invoke-interface {v1}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return v3
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw p1
+
+    :cond_1
+    check-cast p1, Ls0/l/a/h$c;
+
+    iget-object p1, p1, Ls0/l/a/h$c;->e:Ljava/lang/Throwable;
+
+    iget-object p2, p0, Ls0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p2, p0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :try_start_1
+    iget-object p2, p0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/a/k1$b;->l:[Ls0/l/a/k1$a;
+
+    invoke-virtual {p2, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, [Ls0/l/a/k1$a;
+
+    array-length v1, p2
+
+    :goto_1
+    if-ge v0, v1, :cond_2
+
+    aget-object v2, p2, v0
+
+    iget-object v2, v2, Ls0/l/a/k1$a;->child:Lrx/Subscriber;
+
+    invoke-interface {v2, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return v3
+
+    :catchall_1
+    move-exception p1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw p1
+
+    :cond_3
+    return v0
+.end method
+
+.method public b()V
+    .locals 18
+
+    move-object/from16 v1, p0
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, v1, Ls0/l/a/k1$b;->i:Z
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v2, v1, Ls0/l/a/k1$b;->j:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    iput-boolean v2, v1, Ls0/l/a/k1$b;->i:Z
+
+    const/4 v3, 0x0
+
+    iput-boolean v3, v1, Ls0/l/a/k1$b;->j:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_7
+
+    :goto_0
+    :try_start_1
+    iget-object v0, v1, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    iget-object v4, v1, Ls0/l/a/k1$b;->d:Ljava/util/Queue;
+
+    invoke-interface {v4}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v4
+
+    invoke-virtual {v1, v0, v4}, Ls0/l/a/k1$b;->a(Ljava/lang/Object;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    if-nez v4, :cond_f
+
+    iget-object v0, v1, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v5, v0
+
+    check-cast v5, [Ls0/l/a/k1$a;
+
+    array-length v0, v5
+
+    const-wide v6, 0x7fffffffffffffffL
+
+    array-length v8, v5
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    :goto_1
+    const-wide/16 v11, 0x0
+
+    if-ge v9, v8, :cond_4
+
+    aget-object v13, v5, v9
+
+    invoke-virtual {v13}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v13
+
+    cmp-long v15, v13, v11
+
+    if-ltz v15, :cond_2
+
+    invoke-static {v6, v7, v13, v14}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v6
+
+    goto :goto_2
+
+    :cond_2
+    const-wide/high16 v11, -0x8000000000000000L
+
+    cmp-long v15, v13, v11
+
+    if-nez v15, :cond_3
+
+    add-int/lit8 v10, v10, 0x1
+
+    :cond_3
+    :goto_2
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    const-wide/16 v8, 0x1
+
+    if-ne v0, v10, :cond_7
+
+    iget-object v0, v1, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    iget-object v4, v1, Ls0/l/a/k1$b;->d:Ljava/util/Queue;
+
+    invoke-interface {v4}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-nez v4, :cond_5
+
+    const/4 v4, 0x1
+
+    goto :goto_3
+
+    :cond_5
+    const/4 v4, 0x0
+
+    :goto_3
+    invoke-virtual {v1, v0, v4}, Ls0/l/a/k1$b;->a(Ljava/lang/Object;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    return-void
+
+    :cond_6
+    invoke-virtual {v1, v8, v9}, Lrx/Subscriber;->request(J)V
+
+    goto :goto_0
+
+    :cond_7
+    const/4 v10, 0x0
+
+    :goto_4
+    int-to-long v13, v10
+
+    cmp-long v0, v13, v6
+
+    if-gez v0, :cond_d
+
+    iget-object v0, v1, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    iget-object v4, v1, Ls0/l/a/k1$b;->d:Ljava/util/Queue;
+
+    invoke-interface {v4}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-nez v4, :cond_8
+
+    const/4 v15, 0x1
+
+    goto :goto_5
+
+    :cond_8
+    const/4 v15, 0x0
+
+    :goto_5
+    invoke-virtual {v1, v0, v15}, Ls0/l/a/k1$b;->a(Ljava/lang/Object;Z)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_9
+
+    return-void
+
+    :cond_9
+    if-eqz v15, :cond_a
+
+    move v4, v15
+
+    goto :goto_8
+
+    :cond_a
+    invoke-static {v4}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    array-length v13, v5
+
+    const/4 v14, 0x0
+
+    :goto_6
+    if-ge v14, v13, :cond_c
+
+    aget-object v2, v5, v14
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v16
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_5
+
+    cmp-long v0, v16, v11
+
+    if-lez v0, :cond_b
+
+    :try_start_2
+    iget-object v0, v2, Ls0/l/a/k1$a;->child:Lrx/Subscriber;
+
+    invoke-interface {v0, v4}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :try_start_3
+    invoke-virtual {v2, v8, v9}, Ls0/l/a/k1$a;->a(J)J
+
+    goto :goto_7
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {v2}, Ls0/l/a/k1$a;->unsubscribe()V
+
+    iget-object v2, v2, Ls0/l/a/k1$a;->child:Lrx/Subscriber;
+
+    invoke-static {v0, v2, v4}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    :cond_b
+    :goto_7
+    add-int/lit8 v14, v14, 0x1
+
+    const/4 v2, 0x1
+
+    goto :goto_6
+
+    :cond_c
+    add-int/lit8 v10, v10, 0x1
+
+    move v4, v15
+
+    const/4 v2, 0x1
+
+    goto :goto_4
+
+    :cond_d
+    :goto_8
+    if-lez v10, :cond_e
+
+    invoke-virtual {v1, v13, v14}, Lrx/Subscriber;->request(J)V
+
+    :cond_e
+    cmp-long v0, v6, v11
+
+    if-eqz v0, :cond_f
+
+    if-nez v4, :cond_f
+
+    goto :goto_9
+
+    :cond_f
+    monitor-enter p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_5
+
+    :try_start_4
+    iget-boolean v0, v1, Ls0/l/a/k1$b;->j:Z
+
+    if-nez v0, :cond_10
+
+    iput-boolean v3, v1, Ls0/l/a/k1$b;->i:Z
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    :try_start_5
+    monitor-exit p0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    const/4 v2, 0x1
+
+    goto :goto_a
+
+    :cond_10
+    :try_start_6
+    iput-boolean v3, v1, Ls0/l/a/k1$b;->j:Z
+
+    monitor-exit p0
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_2
+
+    :goto_9
+    const/4 v2, 0x1
+
+    goto/16 :goto_0
+
+    :catchall_2
+    move-exception v0
+
+    const/4 v2, 0x0
+
+    :goto_a
+    :try_start_7
+    monitor-exit p0
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_4
+
+    :try_start_8
+    throw v0
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_3
+
+    :catchall_3
+    move-exception v0
+
+    goto :goto_b
+
+    :catchall_4
+    move-exception v0
+
+    goto :goto_a
+
+    :catchall_5
+    move-exception v0
+
+    const/4 v2, 0x0
+
+    :goto_b
+    if-nez v2, :cond_11
+
+    monitor-enter p0
+
+    :try_start_9
+    iput-boolean v3, v1, Ls0/l/a/k1$b;->i:Z
+
+    monitor-exit p0
+
+    goto :goto_c
+
+    :catchall_6
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_9
+    .catchall {:try_start_9 .. :try_end_9} :catchall_6
+
+    throw v0
+
+    :cond_11
+    :goto_c
+    throw v0
+
+    :catchall_7
+    move-exception v0
+
+    :try_start_a
+    monitor-exit p0
+    :try_end_a
+    .catchall {:try_start_a .. :try_end_a} :catchall_7
+
+    throw v0
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    if-nez v0, :cond_0
+
+    sget-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    invoke-virtual {p0}, Ls0/l/a/k1$b;->b()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Ls0/l/a/h$c;
+
+    invoke-direct {v0, p1}, Ls0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
+
+    iput-object v0, p0, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    invoke-virtual {p0}, Ls0/l/a/k1$b;->b()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/k1$b;->d:Ljava/util/Queue;
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    new-instance p1, Lrx/exceptions/MissingBackpressureException;
+
+    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
+
+    iget-object v0, p0, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    if-nez v0, :cond_2
+
+    new-instance v0, Ls0/l/a/h$c;
+
+    invoke-direct {v0, p1}, Ls0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
+
+    iput-object v0, p0, Ls0/l/a/k1$b;->f:Ljava/lang/Object;
+
+    invoke-virtual {p0}, Ls0/l/a/k1$b;->b()V
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Ls0/l/a/k1$b;->b()V
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    sget v0, Ls0/l/e/h;->f:I
+
+    int-to-long v0, v0
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k1.smali b/com.discord/smali_classes2/s0/l/a/k1.smali
new file mode 100644
index 0000000000..cde36ad485
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k1.smali
@@ -0,0 +1,169 @@
+.class public final Ls0/l/a/k1;
+.super Ls0/m/c;
+.source "OperatorPublish.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/k1$a;,
+        Ls0/l/a/k1$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/m/c<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final e:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/a/k1$b<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable$a<",
+            "TT;>;",
+            "Lrx/Observable<",
+            "+TT;>;",
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/a/k1$b<",
+            "TT;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/m/c;-><init>(Lrx/Observable$a;)V
+
+    iput-object p2, p0, Ls0/l/a/k1;->e:Lrx/Observable;
+
+    iput-object p3, p0, Ls0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public g0(Lrx/functions/Action1;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Action1<",
+            "-",
+            "Lrx/Subscription;",
+            ">;)V"
+        }
+    .end annotation
+
+    :goto_0
+    iget-object v0, p0, Ls0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/a/k1$b;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    :cond_0
+    new-instance v1, Ls0/l/a/k1$b;
+
+    iget-object v2, p0, Ls0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v1, v2}, Ls0/l/a/k1$b;-><init>(Ljava/util/concurrent/atomic/AtomicReference;)V
+
+    new-instance v2, Ls0/l/a/l1;
+
+    invoke-direct {v2, v1}, Ls0/l/a/l1;-><init>(Ls0/l/a/k1$b;)V
+
+    new-instance v3, Ls0/r/a;
+
+    invoke-direct {v3, v2}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v2, p0, Ls0/l/a/k1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    move-object v0, v1
+
+    :cond_2
+    iget-object v1, v0, Ls0/l/a/k1$b;->h:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-nez v1, :cond_3
+
+    iget-object v1, v0, Ls0/l/a/k1$b;->h:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_1
+    invoke-interface {p1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    if-eqz v2, :cond_4
+
+    iget-object p1, p0, Ls0/l/a/k1;->e:Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    :cond_4
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k2$a.smali b/com.discord/smali_classes2/s0/l/a/k2$a.smali
new file mode 100644
index 0000000000..cd26c9660c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k2$a.smali
@@ -0,0 +1,147 @@
+.class public final Ls0/l/a/k2$a;
+.super Lrx/Subscriber;
+.source "OperatorTakeUntilPredicate.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/k2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+.field public final synthetic f:Ls0/l/a/k2;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/k2;Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Ls0/l/a/k2$a;->f:Ls0/l/a/k2;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p2, p0, Ls0/l/a/k2$a;->d:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/k2$a;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/k2$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/k2$a;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/k2$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/k2$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    const/4 v0, 0x1
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/k2$a;->f:Ls0/l/a/k2;
+
+    iget-object v1, v1, Ls0/l/a/k2;->d:Ls0/k/b;
+
+    invoke-interface {v1, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Boolean;
+
+    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p1, :cond_0
+
+    iput-boolean v0, p0, Ls0/l/a/k2$a;->e:Z
+
+    iget-object p1, p0, Ls0/l/a/k2$a;->d:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    :cond_0
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    iput-boolean v0, p0, Ls0/l/a/k2$a;->e:Z
+
+    iget-object v0, p0, Ls0/l/a/k2$a;->d:Lrx/Subscriber;
+
+    invoke-static {v1, v0, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/k2.smali b/com.discord/smali_classes2/s0/l/a/k2.smali
new file mode 100644
index 0000000000..c51deac18e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/k2.smali
@@ -0,0 +1,81 @@
+.class public final Ls0/l/a/k2;
+.super Ljava/lang/Object;
+.source "OperatorTakeUntilPredicate.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/k2$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/k/b<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/k2;->d:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/k2$a;
+
+    invoke-direct {v0, p0, p1}, Ls0/l/a/k2$a;-><init>(Ls0/l/a/k2;Lrx/Subscriber;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v1, Ls0/l/a/j2;
+
+    invoke-direct {v1, p0, v0}, Ls0/l/a/j2;-><init>(Ls0/l/a/k2;Ls0/l/a/k2$a;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l$a.smali b/com.discord/smali_classes2/s0/l/a/l$a.smali
new file mode 100644
index 0000000000..5f1aaa6c56
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l$a.smali
@@ -0,0 +1,205 @@
+.class public abstract Ls0/l/a/l$a;
+.super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OnSubscribeCreate.java"
+
+# interfaces
+.implements Lrx/Emitter;
+.implements Lrx/Producer;
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x409
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicLong;",
+        "Lrx/Emitter<",
+        "TT;>;",
+        "Lrx/Producer;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x65ac35ee8a56a4bfL
+
+
+# instance fields
+.field public final actual:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final serial:Lrx/subscriptions/SerialSubscription;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
+
+    new-instance p1, Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {p1}, Lrx/subscriptions/SerialSubscription;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public b()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->isUnsubscribed()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final m(J)V
+    .locals 1
+
+    invoke-static {p1, p2}, Lf/n/a/k/a;->i0(J)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    invoke-virtual {p0}, Ls0/l/a/l$a;->a()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
+
+    throw v0
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object p1, p0, Ls0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {p1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v0, p0, Ls0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
+
+    throw p1
+.end method
+
+.method public final unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/l$a;->serial:Lrx/subscriptions/SerialSubscription;
+
+    iget-object v0, v0, Lrx/subscriptions/SerialSubscription;->d:Ls0/l/d/a;
+
+    invoke-virtual {v0}, Ls0/l/d/a;->unsubscribe()V
+
+    invoke-virtual {p0}, Ls0/l/a/l$a;->b()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l$b.smali b/com.discord/smali_classes2/s0/l/a/l$b.smali
new file mode 100644
index 0000000000..2f1bec936d
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l$b.smali
@@ -0,0 +1,325 @@
+.class public final Ls0/l/a/l$b;
+.super Ls0/l/a/l$a;
+.source "OnSubscribeCreate.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/a/l$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x21aef8f9f7f1cbc3L
+
+
+# instance fields
+.field public volatile done:Z
+
+.field public error:Ljava/lang/Throwable;
+
+.field public final queue:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;I)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/l/a/l$a;-><init>(Lrx/Subscriber;)V
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    new-instance p1, Ls0/l/e/n/t;
+
+    invoke-direct {p1, p2}, Ls0/l/e/n/t;-><init>(I)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ls0/l/e/m/g;
+
+    invoke-direct {p1, p2}, Ls0/l/e/m/g;-><init>(I)V
+
+    :goto_0
+    iput-object p1, p0, Ls0/l/a/l$b;->queue:Ljava/util/Queue;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 0
+
+    invoke-virtual {p0}, Ls0/l/a/l$b;->c()V
+
+    return-void
+.end method
+
+.method public b()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/l$b;->queue:Ljava/util/Queue;
+
+    invoke-interface {v0}, Ljava/util/Queue;->clear()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public c()V
+    .locals 14
+
+    iget-object v0, p0, Ls0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
+
+    iget-object v1, p0, Ls0/l/a/l$b;->queue:Ljava/util/Queue;
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x1
+
+    :cond_1
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v4
+
+    const-wide/16 v6, 0x0
+
+    move-wide v8, v6
+
+    :goto_0
+    cmp-long v10, v8, v4
+
+    if-eqz v10, :cond_7
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_2
+
+    invoke-interface {v1}, Ljava/util/Queue;->clear()V
+
+    return-void
+
+    :cond_2
+    iget-boolean v11, p0, Ls0/l/a/l$b;->done:Z
+
+    invoke-interface {v1}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v12
+
+    if-nez v12, :cond_3
+
+    const/4 v13, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v13, 0x0
+
+    :goto_1
+    if-eqz v11, :cond_5
+
+    if-eqz v13, :cond_5
+
+    iget-object v0, p0, Ls0/l/a/l$b;->error:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_4
+
+    invoke-super {p0, v0}, Ls0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :cond_4
+    invoke-super {p0}, Ls0/l/a/l$a;->onCompleted()V
+
+    :goto_2
+    return-void
+
+    :cond_5
+    if-eqz v13, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    invoke-static {v12}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v10
+
+    invoke-interface {v0, v10}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    const-wide/16 v10, 0x1
+
+    add-long/2addr v8, v10
+
+    goto :goto_0
+
+    :cond_7
+    :goto_3
+    if-nez v10, :cond_a
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_8
+
+    invoke-interface {v1}, Ljava/util/Queue;->clear()V
+
+    return-void
+
+    :cond_8
+    iget-boolean v4, p0, Ls0/l/a/l$b;->done:Z
+
+    invoke-interface {v1}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v5
+
+    if-eqz v4, :cond_a
+
+    if-eqz v5, :cond_a
+
+    iget-object v0, p0, Ls0/l/a/l$b;->error:Ljava/lang/Throwable;
+
+    if-eqz v0, :cond_9
+
+    invoke-super {p0, v0}, Ls0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_4
+
+    :cond_9
+    invoke-super {p0}, Ls0/l/a/l$a;->onCompleted()V
+
+    :goto_4
+    return-void
+
+    :cond_a
+    cmp-long v4, v8, v6
+
+    if-eqz v4, :cond_b
+
+    invoke-static {p0, v8, v9}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    :cond_b
+    iget-object v4, p0, Ls0/l/a/l$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    neg-int v3, v3
+
+    invoke-virtual {v4, v3}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
+
+    move-result v3
+
+    if-nez v3, :cond_1
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/l$b;->done:Z
+
+    invoke-virtual {p0}, Ls0/l/a/l$b;->c()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/l$b;->error:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/l$b;->done:Z
+
+    invoke-virtual {p0}, Ls0/l/a/l$b;->c()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/l$b;->queue:Ljava/util/Queue;
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    invoke-virtual {p0}, Ls0/l/a/l$b;->c()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l$c.smali b/com.discord/smali_classes2/s0/l/a/l$c.smali
new file mode 100644
index 0000000000..fec14d3fac
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l$c.smali
@@ -0,0 +1,53 @@
+.class public final Ls0/l/a/l$c;
+.super Ls0/l/a/l$f;
+.source "OnSubscribeCreate.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/a/l$f<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x7404e4d77326a273L
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/l/a/l$f;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public c()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l$d.smali b/com.discord/smali_classes2/s0/l/a/l$d.smali
new file mode 100644
index 0000000000..1c6738eb63
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l$d.smali
@@ -0,0 +1,125 @@
+.class public final Ls0/l/a/l$d;
+.super Ls0/l/a/l$f;
+.source "OnSubscribeCreate.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "d"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/a/l$f<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x4b43427a9c2e580L
+
+
+# instance fields
+.field public done:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/l/a/l$f;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public c()V
+    .locals 2
+
+    new-instance v0, Lrx/exceptions/MissingBackpressureException;
+
+    const-string v1, "create: could not emit value due to lack of requests"
+
+    invoke-direct {v0, v1}, Lrx/exceptions/MissingBackpressureException;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0, v0}, Ls0/l/a/l$d;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/l$d;->done:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/l$d;->done:Z
+
+    invoke-super {p0}, Ls0/l/a/l$a;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/l$d;->done:Z
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/l$d;->done:Z
+
+    invoke-super {p0, p1}, Ls0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/l$d;->done:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-super {p0, p1}, Ls0/l/a/l$f;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l$e.smali b/com.discord/smali_classes2/s0/l/a/l$e.smali
new file mode 100644
index 0000000000..5c22d96ba0
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l$e.smali
@@ -0,0 +1,324 @@
+.class public final Ls0/l/a/l$e;
+.super Ls0/l/a/l$a;
+.source "OnSubscribeCreate.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "e"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/a/l$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x37d61f4a35bdda6fL
+
+
+# instance fields
+.field public volatile done:Z
+
+.field public error:Ljava/lang/Throwable;
+
+.field public final queue:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/l/a/l$a;-><init>(Lrx/Subscriber;)V
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 0
+
+    invoke-virtual {p0}, Ls0/l/a/l$e;->c()V
+
+    return-void
+.end method
+
+.method public b()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public c()V
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    iget-object v1, v0, Ls0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v1, v0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
+
+    iget-object v2, v0, Ls0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x1
+
+    :cond_1
+    invoke-virtual/range {p0 .. p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v5
+
+    const-wide/16 v7, 0x0
+
+    move-wide v9, v7
+
+    :goto_0
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    cmp-long v13, v9, v5
+
+    if-eqz v13, :cond_7
+
+    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v14
+
+    if-eqz v14, :cond_2
+
+    invoke-virtual {v2, v12}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_2
+    iget-boolean v14, v0, Ls0/l/a/l$e;->done:Z
+
+    invoke-virtual {v2, v12}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v15
+
+    if-nez v15, :cond_3
+
+    const/16 v16, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/16 v16, 0x0
+
+    :goto_1
+    if-eqz v14, :cond_5
+
+    if-eqz v16, :cond_5
+
+    iget-object v1, v0, Ls0/l/a/l$e;->error:Ljava/lang/Throwable;
+
+    if-eqz v1, :cond_4
+
+    invoke-super {v0, v1}, Ls0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :cond_4
+    invoke-super/range {p0 .. p0}, Ls0/l/a/l$a;->onCompleted()V
+
+    :goto_2
+    return-void
+
+    :cond_5
+    if-eqz v16, :cond_6
+
+    goto :goto_3
+
+    :cond_6
+    invoke-static {v15}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v11
+
+    invoke-interface {v1, v11}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    const-wide/16 v11, 0x1
+
+    add-long/2addr v9, v11
+
+    goto :goto_0
+
+    :cond_7
+    :goto_3
+    if-nez v13, :cond_b
+
+    invoke-virtual {v1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_8
+
+    invoke-virtual {v2, v12}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_8
+    iget-boolean v5, v0, Ls0/l/a/l$e;->done:Z
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v6
+
+    if-nez v6, :cond_9
+
+    const/4 v11, 0x1
+
+    :cond_9
+    if-eqz v5, :cond_b
+
+    if-eqz v11, :cond_b
+
+    iget-object v1, v0, Ls0/l/a/l$e;->error:Ljava/lang/Throwable;
+
+    if-eqz v1, :cond_a
+
+    invoke-super {v0, v1}, Ls0/l/a/l$a;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_4
+
+    :cond_a
+    invoke-super/range {p0 .. p0}, Ls0/l/a/l$a;->onCompleted()V
+
+    :goto_4
+    return-void
+
+    :cond_b
+    cmp-long v5, v9, v7
+
+    if-eqz v5, :cond_c
+
+    invoke-static {v0, v9, v10}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    :cond_c
+    iget-object v5, v0, Ls0/l/a/l$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    neg-int v4, v4
+
+    invoke-virtual {v5, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
+
+    move-result v4
+
+    if-nez v4, :cond_1
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/l$e;->done:Z
+
+    invoke-virtual {p0}, Ls0/l/a/l$e;->c()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/l$e;->error:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/l$e;->done:Z
+
+    invoke-virtual {p0}, Ls0/l/a/l$e;->c()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/l$e;->queue:Ljava/util/concurrent/atomic/AtomicReference;
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    invoke-virtual {p0}, Ls0/l/a/l$e;->c()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l$f.smali b/com.discord/smali_classes2/s0/l/a/l$f.smali
similarity index 75%
rename from com.discord/smali_classes2/r0/l/a/l$f.smali
rename to com.discord/smali_classes2/s0/l/a/l$f.smali
index b7f60da37d..f088e8fe27 100644
--- a/com.discord/smali_classes2/r0/l/a/l$f.smali
+++ b/com.discord/smali_classes2/s0/l/a/l$f.smali
@@ -1,11 +1,11 @@
-.class public abstract Lr0/l/a/l$f;
-.super Lr0/l/a/l$a;
+.class public abstract Ls0/l/a/l$f;
+.super Ls0/l/a/l$a;
 .source "OnSubscribeCreate.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/l;
+    value = Ls0/l/a/l;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lr0/l/a/l$a<",
+        "Ls0/l/a/l$a<",
         "TT;>;"
     }
 .end annotation
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    invoke-direct {p0, p1}, Lr0/l/a/l$a;-><init>(Lrx/Subscriber;)V
+    invoke-direct {p0, p1}, Ls0/l/a/l$a;-><init>(Lrx/Subscriber;)V
 
     return-void
 .end method
@@ -57,7 +57,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -78,18 +78,18 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     const-wide/16 v0, 0x1
 
-    invoke-static {p0, v0, v1}, Lf/n/a/k/a;->Q(Ljava/util/concurrent/atomic/AtomicLong;J)J
+    invoke-static {p0, v0, v1}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lr0/l/a/l$f;->c()V
+    invoke-virtual {p0}, Ls0/l/a/l$f;->c()V
 
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/r0/l/a/l$g.smali b/com.discord/smali_classes2/s0/l/a/l$g.smali
similarity index 81%
rename from com.discord/smali_classes2/r0/l/a/l$g.smali
rename to com.discord/smali_classes2/s0/l/a/l$g.smali
index b6c94fde7c..ef8695eced 100644
--- a/com.discord/smali_classes2/r0/l/a/l$g.smali
+++ b/com.discord/smali_classes2/s0/l/a/l$g.smali
@@ -1,11 +1,11 @@
-.class public final Lr0/l/a/l$g;
-.super Lr0/l/a/l$a;
+.class public final Ls0/l/a/l$g;
+.super Ls0/l/a/l$a;
 .source "OnSubscribeCreate.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/l;
+    value = Ls0/l/a/l;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lr0/l/a/l$a<",
+        "Ls0/l/a/l$a<",
         "TT;>;"
     }
 .end annotation
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    invoke-direct {p0, p1}, Lr0/l/a/l$a;-><init>(Lrx/Subscriber;)V
+    invoke-direct {p0, p1}, Ls0/l/a/l$a;-><init>(Lrx/Subscriber;)V
 
     return-void
 .end method
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -65,9 +65,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lr0/l/a/l$a;->actual:Lrx/Subscriber;
+    iget-object v0, p0, Ls0/l/a/l$a;->actual:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     :cond_1
     invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
diff --git a/com.discord/smali_classes2/s0/l/a/l.smali b/com.discord/smali_classes2/s0/l/a/l.smali
new file mode 100644
index 0000000000..663214c01a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l.smali
@@ -0,0 +1,142 @@
+.class public final Ls0/l/a/l;
+.super Ljava/lang/Object;
+.source "OnSubscribeCreate.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/l$e;,
+        Ls0/l/a/l$b;,
+        Ls0/l/a/l$d;,
+        Ls0/l/a/l$c;,
+        Ls0/l/a/l$f;,
+        Ls0/l/a/l$g;,
+        Ls0/l/a/l$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Lrx/Emitter<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/Emitter$BackpressureMode;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Action1<",
+            "Lrx/Emitter<",
+            "TT;>;>;",
+            "Lrx/Emitter$BackpressureMode;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/l;->d:Lrx/functions/Action1;
+
+    iput-object p2, p0, Ls0/l/a/l;->e:Lrx/Emitter$BackpressureMode;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/l;->e:Lrx/Emitter$BackpressureMode;
+
+    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :cond_2
+
+    const/4 v1, 0x3
+
+    if-eq v0, v1, :cond_1
+
+    const/4 v1, 0x4
+
+    if-eq v0, v1, :cond_0
+
+    new-instance v0, Ls0/l/a/l$b;
+
+    sget v1, Ls0/l/e/h;->f:I
+
+    invoke-direct {v0, p1, v1}, Ls0/l/a/l$b;-><init>(Lrx/Subscriber;I)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ls0/l/a/l$e;
+
+    invoke-direct {v0, p1}, Ls0/l/a/l$e;-><init>(Lrx/Subscriber;)V
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ls0/l/a/l$c;
+
+    invoke-direct {v0, p1}, Ls0/l/a/l$c;-><init>(Lrx/Subscriber;)V
+
+    goto :goto_0
+
+    :cond_2
+    new-instance v0, Ls0/l/a/l$d;
+
+    invoke-direct {v0, p1}, Ls0/l/a/l$d;-><init>(Lrx/Subscriber;)V
+
+    goto :goto_0
+
+    :cond_3
+    new-instance v0, Ls0/l/a/l$g;
+
+    invoke-direct {v0, p1}, Ls0/l/a/l$g;-><init>(Lrx/Subscriber;)V
+
+    :goto_0
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    iget-object p1, p0, Ls0/l/a/l;->d:Lrx/functions/Action1;
+
+    invoke-interface {p1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l0.smali b/com.discord/smali_classes2/s0/l/a/l0.smali
new file mode 100644
index 0000000000..3a15dd31b8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l0.smali
@@ -0,0 +1,69 @@
+.class public final Ls0/l/a/l0;
+.super Ljava/lang/Object;
+.source "OnSubscribeTimerOnce.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:Ljava/util/concurrent/TimeUnit;
+
+.field public final f:Lrx/Scheduler;
+
+
+# direct methods
+.method public constructor <init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Ls0/l/a/l0;->d:J
+
+    iput-object p3, p0, Ls0/l/a/l0;->e:Ljava/util/concurrent/TimeUnit;
+
+    iput-object p4, p0, Ls0/l/a/l0;->f:Lrx/Scheduler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 4
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/l0;->f:Lrx/Scheduler;
+
+    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v1, Ls0/l/a/k0;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/a/k0;-><init>(Ls0/l/a/l0;Lrx/Subscriber;)V
+
+    iget-wide v2, p0, Ls0/l/a/l0;->d:J
+
+    iget-object p1, p0, Ls0/l/a/l0;->e:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v1, v2, v3, p1}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l1.smali b/com.discord/smali_classes2/s0/l/a/l1.smali
new file mode 100644
index 0000000000..9c1b2cda79
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l1.smali
@@ -0,0 +1,46 @@
+.class public Ls0/l/a/l1;
+.super Ljava/lang/Object;
+.source "OperatorPublish.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/k1$b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/k1$b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/l1;->d:Ls0/l/a/k1$b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/a/l1;->d:Ls0/l/a/k1$b;
+
+    iget-object v0, v0, Ls0/l/a/k1$b;->g:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/a/k1$b;->l:[Ls0/l/a/k1$a;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    iget-object v0, p0, Ls0/l/a/l1;->d:Ls0/l/a/k1$b;
+
+    iget-object v1, v0, Ls0/l/a/k1$b;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v0, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/l2$a.smali b/com.discord/smali_classes2/s0/l/a/l2$a.smali
new file mode 100644
index 0000000000..797db7ab1a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/l2$a.smali
@@ -0,0 +1,62 @@
+.class public Ls0/l/a/l2$a;
+.super Ljava/lang/Object;
+.source "OperatorTakeWhile.java"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/l2;-><init>(Ls0/k/b;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func2<",
+        "TT;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/k/b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/l2$a;->d:Ls0/k/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p2, Ljava/lang/Integer;
+
+    iget-object p2, p0, Ls0/l/a/l2$a;->d:Ls0/k/b;
+
+    invoke-interface {p2, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/l2.smali b/com.discord/smali_classes2/s0/l/a/l2.smali
similarity index 78%
rename from com.discord/smali_classes2/r0/l/a/l2.smali
rename to com.discord/smali_classes2/s0/l/a/l2.smali
index bf313f6390..074f66f07e 100644
--- a/com.discord/smali_classes2/r0/l/a/l2.smali
+++ b/com.discord/smali_classes2/s0/l/a/l2.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/l2;
+.class public final Ls0/l/a/l2;
 .super Ljava/lang/Object;
 .source "OperatorTakeWhile.java"
 
@@ -34,25 +34,25 @@
 
 
 # direct methods
-.method public constructor <init>(Lr0/k/b;)V
+.method public constructor <init>(Ls0/k/b;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "-TT;",
             "Ljava/lang/Boolean;",
             ">;)V"
         }
     .end annotation
 
-    new-instance v0, Lr0/l/a/l2$a;
+    new-instance v0, Ls0/l/a/l2$a;
 
-    invoke-direct {v0, p1}, Lr0/l/a/l2$a;-><init>(Lr0/k/b;)V
+    invoke-direct {v0, p1}, Ls0/l/a/l2$a;-><init>(Ls0/k/b;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lr0/l/a/l2;->d:Lrx/functions/Func2;
+    iput-object v0, p0, Ls0/l/a/l2;->d:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -64,11 +64,11 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    new-instance v0, Lr0/l/a/m2;
+    new-instance v0, Ls0/l/a/m2;
 
     const/4 v1, 0x0
 
-    invoke-direct {v0, p0, p1, v1, p1}, Lr0/l/a/m2;-><init>(Lr0/l/a/l2;Lrx/Subscriber;ZLrx/Subscriber;)V
+    invoke-direct {v0, p0, p1, v1, p1}, Ls0/l/a/m2;-><init>(Ls0/l/a/l2;Lrx/Subscriber;ZLrx/Subscriber;)V
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
diff --git a/com.discord/smali_classes2/s0/l/a/m.smali b/com.discord/smali_classes2/s0/l/a/m.smali
new file mode 100644
index 0000000000..df48854d36
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/m.smali
@@ -0,0 +1,90 @@
+.class public final Ls0/l/a/m;
+.super Ljava/lang/Object;
+.source "OnSubscribeDefer.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Func0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Func0<",
+            "+",
+            "Lrx/Observable<",
+            "+TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func0;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Func0<",
+            "+",
+            "Lrx/Observable<",
+            "+TT;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/m;->d:Lrx/functions/Func0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/m;->d:Lrx/functions/Func0;
+
+    invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    new-instance v1, Ls0/n/e;
+
+    invoke-direct {v1, p1, p1}, Ls0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/m0.smali b/com.discord/smali_classes2/s0/l/a/m0.smali
new file mode 100644
index 0000000000..95fd1bee1f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/m0.smali
@@ -0,0 +1,85 @@
+.class public Ls0/l/a/m0;
+.super Ljava/lang/Object;
+.source "OnSubscribeTimerPeriodically.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public d:J
+
+.field public final synthetic e:Lrx/Subscriber;
+
+.field public final synthetic f:Lrx/Scheduler$Worker;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/n0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/m0;->e:Lrx/Subscriber;
+
+    iput-object p3, p0, Ls0/l/a/m0;->f:Lrx/Scheduler$Worker;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 5
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/m0;->e:Lrx/Subscriber;
+
+    iget-wide v1, p0, Ls0/l/a/m0;->d:J
+
+    const-wide/16 v3, 0x1
+
+    add-long/2addr v3, v1
+
+    iput-wide v3, p0, Ls0/l/a/m0;->d:J
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_1
+    iget-object v1, p0, Ls0/l/a/m0;->f:Lrx/Scheduler$Worker;
+
+    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    iget-object v1, p0, Ls0/l/a/m0;->e:Lrx/Subscriber;
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+
+    :catchall_1
+    move-exception v1
+
+    iget-object v2, p0, Ls0/l/a/m0;->e:Lrx/Subscriber;
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v2, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1$a.smali b/com.discord/smali_classes2/s0/l/a/m1$a.smali
similarity index 79%
rename from com.discord/smali_classes2/r0/l/a/m1$a.smali
rename to com.discord/smali_classes2/s0/l/a/m1$a.smali
index 622ce3b522..254e30a544 100644
--- a/com.discord/smali_classes2/r0/l/a/m1$a.smali
+++ b/com.discord/smali_classes2/s0/l/a/m1$a.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/m1$a;
+.class public final Ls0/l/a/m1$a;
 .super Ljava/lang/Object;
 .source "OperatorReplay.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
+    value = Ls0/l/a/m1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,11 +31,11 @@
 .method public call()Ljava/lang/Object;
     .locals 2
 
-    new-instance v0, Lr0/l/a/m1$h;
+    new-instance v0, Ls0/l/a/m1$h;
 
     const/16 v1, 0x10
 
-    invoke-direct {v0, v1}, Lr0/l/a/m1$h;-><init>(I)V
+    invoke-direct {v0, v1}, Ls0/l/a/m1$h;-><init>(I)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/s0/l/a/m1$b.smali b/com.discord/smali_classes2/s0/l/a/m1$b.smali
new file mode 100644
index 0000000000..2e8040171c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/m1$b.smali
@@ -0,0 +1,403 @@
+.class public Ls0/l/a/m1$b;
+.super Ljava/util/concurrent/atomic/AtomicReference;
+.source "OperatorReplay.java"
+
+# interfaces
+.implements Ls0/l/a/m1$e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/m1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicReference<",
+        "Ls0/l/a/m1$d;",
+        ">;",
+        "Ls0/l/a/m1$e<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x2090aef8efde5e9eL
+
+
+# instance fields
+.field public index:J
+
+.field public size:I
+
+.field public tail:Ls0/l/a/m1$d;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 4
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    new-instance v0, Ls0/l/a/m1$d;
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    invoke-direct {v0, v1, v2, v3}, Ls0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
+
+    iput-object v0, p0, Ls0/l/a/m1$b;->tail:Ls0/l/a/m1$d;
+
+    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final c(Ljava/lang/Object;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    new-instance v0, Ls0/l/a/m1$d;
+
+    iget-wide v1, p0, Ls0/l/a/m1$b;->index:J
+
+    const-wide/16 v3, 0x1
+
+    add-long/2addr v1, v3
+
+    iput-wide v1, p0, Ls0/l/a/m1$b;->index:J
+
+    invoke-direct {v0, p1, v1, v2}, Ls0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
+
+    iget-object p1, p0, Ls0/l/a/m1$b;->tail:Ls0/l/a/m1$d;
+
+    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Ls0/l/a/m1$b;->tail:Ls0/l/a/m1$d;
+
+    iget p1, p0, Ls0/l/a/m1$b;->size:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Ls0/l/a/m1$b;->size:I
+
+    invoke-virtual {p0}, Ls0/l/a/m1$b;->a()V
+
+    return-void
+.end method
+
+.method public final complete()V
+    .locals 6
+
+    sget-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    new-instance v1, Ls0/l/a/m1$d;
+
+    iget-wide v2, p0, Ls0/l/a/m1$b;->index:J
+
+    const-wide/16 v4, 0x1
+
+    add-long/2addr v2, v4
+
+    iput-wide v2, p0, Ls0/l/a/m1$b;->index:J
+
+    invoke-direct {v1, v0, v2, v3}, Ls0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
+
+    iget-object v0, p0, Ls0/l/a/m1$b;->tail:Ls0/l/a/m1$d;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    iput-object v1, p0, Ls0/l/a/m1$b;->tail:Ls0/l/a/m1$d;
+
+    iget v0, p0, Ls0/l/a/m1$b;->size:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Ls0/l/a/m1$b;->size:I
+
+    return-void
+.end method
+
+.method public final h(Ls0/l/a/m1$c;)V
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/m1$c<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    monitor-enter p1
+
+    :try_start_0
+    iget-boolean v0, p1, Ls0/l/a/m1$c;->emitting:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, p1, Ls0/l/a/m1$c;->missed:Z
+
+    monitor-exit p1
+
+    return-void
+
+    :cond_0
+    iput-boolean v1, p1, Ls0/l/a/m1$c;->emitting:Z
+
+    monitor-exit p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :goto_0
+    invoke-virtual {p1}, Ls0/l/a/m1$c;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v0, p1, Ls0/l/a/m1$c;->index:Ljava/lang/Object;
+
+    check-cast v0, Ls0/l/a/m1$d;
+
+    if-nez v0, :cond_2
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/a/m1$d;
+
+    iput-object v0, p1, Ls0/l/a/m1$c;->index:Ljava/lang/Object;
+
+    iget-wide v1, v0, Ls0/l/a/m1$d;->index:J
+
+    invoke-virtual {p1, v1, v2}, Ls0/l/a/m1$c;->a(J)V
+
+    :cond_2
+    invoke-virtual {p1}, Ls0/l/a/m1$c;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    return-void
+
+    :cond_3
+    iget-object v1, p1, Ls0/l/a/m1$c;->child:Lrx/Subscriber;
+
+    if-nez v1, :cond_4
+
+    return-void
+
+    :cond_4
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    const-wide/16 v4, 0x0
+
+    move-wide v6, v4
+
+    :goto_1
+    cmp-long v8, v6, v2
+
+    if-eqz v8, :cond_8
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v8
+
+    check-cast v8, Ls0/l/a/m1$d;
+
+    if-eqz v8, :cond_8
+
+    iget-object v0, v8, Ls0/l/a/m1$d;->value:Ljava/lang/Object;
+
+    const/4 v9, 0x0
+
+    :try_start_1
+    invoke-static {v1, v0}, Ls0/l/a/h;->a(Ls0/g;Ljava/lang/Object;)Z
+
+    move-result v10
+
+    if-eqz v10, :cond_5
+
+    iput-object v9, p1, Ls0/l/a/m1$c;->index:Ljava/lang/Object;
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    return-void
+
+    :cond_5
+    const-wide/16 v9, 0x1
+
+    add-long/2addr v6, v9
+
+    invoke-virtual {p1}, Ls0/l/a/m1$c;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    return-void
+
+    :cond_6
+    move-object v0, v8
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v2
+
+    iput-object v9, p1, Ls0/l/a/m1$c;->index:Ljava/lang/Object;
+
+    invoke-static {v2}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p1}, Ls0/l/a/m1$c;->unsubscribe()V
+
+    instance-of p1, v0, Ls0/l/a/h$c;
+
+    if-nez p1, :cond_7
+
+    invoke-static {v0}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_7
+
+    invoke-static {v0}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {v2, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-interface {v1, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_7
+    return-void
+
+    :cond_8
+    cmp-long v1, v6, v4
+
+    if-eqz v1, :cond_9
+
+    iput-object v0, p1, Ls0/l/a/m1$c;->index:Ljava/lang/Object;
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    cmp-long v4, v2, v0
+
+    if-eqz v4, :cond_9
+
+    invoke-virtual {p1, v6, v7}, Ls0/l/a/m1$c;->b(J)J
+
+    :cond_9
+    monitor-enter p1
+
+    :try_start_2
+    iget-boolean v0, p1, Ls0/l/a/m1$c;->missed:Z
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_a
+
+    iput-boolean v1, p1, Ls0/l/a/m1$c;->emitting:Z
+
+    monitor-exit p1
+
+    return-void
+
+    :cond_a
+    iput-boolean v1, p1, Ls0/l/a/m1$c;->missed:Z
+
+    monitor-exit p1
+
+    goto/16 :goto_0
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw v0
+
+    :catchall_2
+    move-exception v0
+
+    :try_start_3
+    monitor-exit p1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    throw v0
+.end method
+
+.method public final j(Ljava/lang/Throwable;)V
+    .locals 5
+
+    new-instance v0, Ls0/l/a/h$c;
+
+    invoke-direct {v0, p1}, Ls0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
+
+    new-instance p1, Ls0/l/a/m1$d;
+
+    iget-wide v1, p0, Ls0/l/a/m1$b;->index:J
+
+    const-wide/16 v3, 0x1
+
+    add-long/2addr v1, v3
+
+    iput-wide v1, p0, Ls0/l/a/m1$b;->index:J
+
+    invoke-direct {p1, v0, v1, v2}, Ls0/l/a/m1$d;-><init>(Ljava/lang/Object;J)V
+
+    iget-object v0, p0, Ls0/l/a/m1$b;->tail:Ls0/l/a/m1$d;
+
+    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    iput-object p1, p0, Ls0/l/a/m1$b;->tail:Ls0/l/a/m1$d;
+
+    iget p1, p0, Ls0/l/a/m1$b;->size:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Ls0/l/a/m1$b;->size:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1$c.smali b/com.discord/smali_classes2/s0/l/a/m1$c.smali
similarity index 78%
rename from com.discord/smali_classes2/r0/l/a/m1$c.smali
rename to com.discord/smali_classes2/s0/l/a/m1$c.smali
index 5ffab8f92f..e6ac9a4f35 100644
--- a/com.discord/smali_classes2/r0/l/a/m1$c.smali
+++ b/com.discord/smali_classes2/s0/l/a/m1$c.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/m1$c;
+.class public final Ls0/l/a/m1$c;
 .super Ljava/util/concurrent/atomic/AtomicLong;
 .source "OperatorReplay.java"
 
@@ -9,7 +9,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
+    value = Ls0/l/a/m1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -49,10 +49,10 @@
 
 .field public missed:Z
 
-.field public final parent:Lr0/l/a/m1$f;
+.field public final parent:Ls0/l/a/m1$f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/l/a/m1$f<",
+            "Ls0/l/a/m1$f<",
             "TT;>;"
         }
     .end annotation
@@ -62,12 +62,12 @@
 
 
 # direct methods
-.method public constructor <init>(Lr0/l/a/m1$f;Lrx/Subscriber;)V
+.method public constructor <init>(Ls0/l/a/m1$f;Lrx/Subscriber;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/l/a/m1$f<",
+            "Ls0/l/a/m1$f<",
             "TT;>;",
             "Lrx/Subscriber<",
             "-TT;>;)V"
@@ -76,15 +76,15 @@
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/m1$c;->parent:Lr0/l/a/m1$f;
+    iput-object p1, p0, Ls0/l/a/m1$c;->parent:Ls0/l/a/m1$f;
 
-    iput-object p2, p0, Lr0/l/a/m1$c;->child:Lrx/Subscriber;
+    iput-object p2, p0, Ls0/l/a/m1$c;->child:Lrx/Subscriber;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Ls0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-void
 .end method
@@ -95,7 +95,7 @@
     .locals 7
 
     :cond_0
-    iget-object v0, p0, Lr0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Ls0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -112,7 +112,7 @@
     const-wide v2, 0x7fffffffffffffffL
 
     :cond_1
-    iget-object v4, p0, Lr0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v4, p0, Ls0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v4, v0, v1, v2, v3}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
 
@@ -264,17 +264,17 @@
 
     if-eqz v3, :cond_0
 
-    invoke-virtual {p0, p1, p2}, Lr0/l/a/m1$c;->a(J)V
+    invoke-virtual {p0, p1, p2}, Ls0/l/a/m1$c;->a(J)V
 
-    iget-object p1, p0, Lr0/l/a/m1$c;->parent:Lr0/l/a/m1$f;
+    iget-object p1, p0, Ls0/l/a/m1$c;->parent:Ls0/l/a/m1$f;
 
-    invoke-virtual {p1, p0}, Lr0/l/a/m1$f;->c(Lr0/l/a/m1$c;)V
+    invoke-virtual {p1, p0}, Ls0/l/a/m1$f;->c(Ls0/l/a/m1$c;)V
 
-    iget-object p1, p0, Lr0/l/a/m1$c;->parent:Lr0/l/a/m1$f;
+    iget-object p1, p0, Ls0/l/a/m1$c;->parent:Ls0/l/a/m1$f;
 
-    iget-object p1, p1, Lr0/l/a/m1$f;->d:Lr0/l/a/m1$e;
+    iget-object p1, p1, Ls0/l/a/m1$f;->d:Ls0/l/a/m1$e;
 
-    invoke-interface {p1, p0}, Lr0/l/a/m1$e;->h(Lr0/l/a/m1$c;)V
+    invoke-interface {p1, p0}, Ls0/l/a/m1$e;->h(Ls0/l/a/m1$c;)V
 
     return-void
 .end method
@@ -300,21 +300,21 @@
 
     if-eqz v4, :cond_7
 
-    iget-object v0, p0, Lr0/l/a/m1$c;->parent:Lr0/l/a/m1$f;
+    iget-object v0, p0, Ls0/l/a/m1$c;->parent:Ls0/l/a/m1$f;
 
-    iget-boolean v1, v0, Lr0/l/a/m1$f;->f:Z
+    iget-boolean v1, v0, Ls0/l/a/m1$f;->f:Z
 
     if-eqz v1, :cond_0
 
     goto :goto_2
 
     :cond_0
-    iget-object v1, v0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
+    iget-object v1, v0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
 
     monitor-enter v1
 
     :try_start_0
-    iget-boolean v2, v0, Lr0/l/a/m1$f;->f:Z
+    iget-boolean v2, v0, Ls0/l/a/m1$f;->f:Z
 
     if-eqz v2, :cond_1
 
@@ -323,17 +323,17 @@
     goto :goto_2
 
     :cond_1
-    iget-object v2, v0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
+    iget-object v2, v0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
 
-    iget-object v3, v2, Lr0/l/e/f;->e:[Ljava/lang/Object;
+    iget-object v3, v2, Ls0/l/e/f;->e:[Ljava/lang/Object;
 
-    iget v4, v2, Lr0/l/e/f;->b:I
+    iget v4, v2, Ls0/l/e/f;->b:I
 
     invoke-virtual {p0}, Ljava/lang/Object;->hashCode()I
 
     move-result v5
 
-    invoke-static {v5}, Lr0/l/e/f;->b(I)I
+    invoke-static {v5}, Ls0/l/e/f;->b(I)I
 
     move-result v5
 
@@ -354,7 +354,7 @@
 
     if-eqz v6, :cond_3
 
-    invoke-virtual {v2, v5, v3, v4}, Lr0/l/e/f;->c(I[Ljava/lang/Object;I)Z
+    invoke-virtual {v2, v5, v3, v4}, Ls0/l/e/f;->c(I[Ljava/lang/Object;I)Z
 
     goto :goto_0
 
@@ -376,12 +376,12 @@
 
     if-eqz v6, :cond_3
 
-    invoke-virtual {v2, v5, v3, v4}, Lr0/l/e/f;->c(I[Ljava/lang/Object;I)Z
+    invoke-virtual {v2, v5, v3, v4}, Ls0/l/e/f;->c(I[Ljava/lang/Object;I)Z
 
     :goto_0
-    iget-object v2, v0, Lr0/l/a/m1$f;->g:Lr0/l/e/f;
+    iget-object v2, v0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
 
-    iget v2, v2, Lr0/l/e/f;->c:I
+    iget v2, v2, Ls0/l/e/f;->c:I
 
     if-nez v2, :cond_5
 
@@ -393,31 +393,31 @@
     :goto_1
     if-eqz v7, :cond_6
 
-    sget-object v2, Lr0/l/a/m1$f;->s:[Lr0/l/a/m1$c;
+    sget-object v2, Ls0/l/a/m1$f;->s:[Ls0/l/a/m1$c;
 
-    iput-object v2, v0, Lr0/l/a/m1$f;->h:[Lr0/l/a/m1$c;
+    iput-object v2, v0, Ls0/l/a/m1$f;->h:[Ls0/l/a/m1$c;
 
     :cond_6
-    iget-wide v2, v0, Lr0/l/a/m1$f;->i:J
+    iget-wide v2, v0, Ls0/l/a/m1$f;->i:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v0, Lr0/l/a/m1$f;->i:J
+    iput-wide v2, v0, Ls0/l/a/m1$f;->i:J
 
     monitor-exit v1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_2
-    iget-object v0, p0, Lr0/l/a/m1$c;->parent:Lr0/l/a/m1$f;
+    iget-object v0, p0, Ls0/l/a/m1$c;->parent:Ls0/l/a/m1$f;
 
-    invoke-virtual {v0, p0}, Lr0/l/a/m1$f;->c(Lr0/l/a/m1$c;)V
+    invoke-virtual {v0, p0}, Ls0/l/a/m1$f;->c(Ls0/l/a/m1$c;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lr0/l/a/m1$c;->child:Lrx/Subscriber;
+    iput-object v0, p0, Ls0/l/a/m1$c;->child:Lrx/Subscriber;
 
     goto :goto_3
 
diff --git a/com.discord/smali_classes2/r0/l/a/m1$d.smali b/com.discord/smali_classes2/s0/l/a/m1$d.smali
similarity index 80%
rename from com.discord/smali_classes2/r0/l/a/m1$d.smali
rename to com.discord/smali_classes2/s0/l/a/m1$d.smali
index 0ad39623d8..1816e57058 100644
--- a/com.discord/smali_classes2/r0/l/a/m1$d.smali
+++ b/com.discord/smali_classes2/s0/l/a/m1$d.smali
@@ -1,11 +1,11 @@
-.class public final Lr0/l/a/m1$d;
+.class public final Ls0/l/a/m1$d;
 .super Ljava/util/concurrent/atomic/AtomicReference;
 .source "OperatorReplay.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
+    value = Ls0/l/a/m1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,7 +16,7 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Ljava/util/concurrent/atomic/AtomicReference<",
-        "Lr0/l/a/m1$d;",
+        "Ls0/l/a/m1$d;",
         ">;"
     }
 .end annotation
@@ -38,9 +38,9 @@
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/m1$d;->value:Ljava/lang/Object;
+    iput-object p1, p0, Ls0/l/a/m1$d;->value:Ljava/lang/Object;
 
-    iput-wide p2, p0, Lr0/l/a/m1$d;->index:J
+    iput-wide p2, p0, Ls0/l/a/m1$d;->index:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1$e.smali b/com.discord/smali_classes2/s0/l/a/m1$e.smali
similarity index 86%
rename from com.discord/smali_classes2/r0/l/a/m1$e.smali
rename to com.discord/smali_classes2/s0/l/a/m1$e.smali
index 9337eb3721..4bb8fc35e9 100644
--- a/com.discord/smali_classes2/r0/l/a/m1$e.smali
+++ b/com.discord/smali_classes2/s0/l/a/m1$e.smali
@@ -1,11 +1,11 @@
-.class public interface abstract Lr0/l/a/m1$e;
+.class public interface abstract Ls0/l/a/m1$e;
 .super Ljava/lang/Object;
 .source "OperatorReplay.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
+    value = Ls0/l/a/m1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -35,11 +35,11 @@
 .method public abstract complete()V
 .end method
 
-.method public abstract h(Lr0/l/a/m1$c;)V
+.method public abstract h(Ls0/l/a/m1$c;)V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Lr0/l/a/m1$c<",
+            "Ls0/l/a/m1$c<",
             "TT;>;)V"
         }
     .end annotation
diff --git a/com.discord/smali_classes2/s0/l/a/m1$f.smali b/com.discord/smali_classes2/s0/l/a/m1$f.smali
new file mode 100644
index 0000000000..1b3cc44b3a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/m1$f.smali
@@ -0,0 +1,712 @@
+.class public final Ls0/l/a/m1$f;
+.super Lrx/Subscriber;
+.source "OperatorReplay.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/m1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "f"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final s:[Ls0/l/a/m1$c;
+
+
+# instance fields
+.field public final d:Ls0/l/a/m1$e;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/m1$e<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+.field public volatile f:Z
+
+.field public final g:Ls0/l/e/f;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/e/f<",
+            "Ls0/l/a/m1$c<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public h:[Ls0/l/a/m1$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[",
+            "Ls0/l/a/m1$c<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public volatile i:J
+
+.field public j:J
+
+.field public final k:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field public l:Z
+
+.field public m:Z
+
+.field public n:J
+
+.field public o:J
+
+.field public volatile p:Lrx/Producer;
+
+.field public q:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ls0/l/a/m1$c<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public r:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ls0/l/a/m1$c;
+
+    sput-object v0, Ls0/l/a/m1$f;->s:[Ls0/l/a/m1$c;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ls0/l/a/m1$e;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/m1$e<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/m1$f;->d:Ls0/l/a/m1$e;
+
+    new-instance p1, Ls0/l/e/f;
+
+    invoke-direct {p1}, Ls0/l/e/f;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    sget-object p1, Ls0/l/a/m1$f;->s:[Ls0/l/a/m1$c;
+
+    iput-object p1, p0, Ls0/l/a/m1$f;->h:[Ls0/l/a/m1$c;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/m1$f;->k:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    const-wide/16 v0, 0x0
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()[Ls0/l/a/m1$c;
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()[",
+            "Ls0/l/a/m1$c<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    iget-object v1, v1, Ls0/l/e/f;->e:[Ljava/lang/Object;
+
+    array-length v2, v1
+
+    new-array v3, v2, [Ls0/l/a/m1$c;
+
+    const/4 v4, 0x0
+
+    invoke-static {v1, v4, v3, v4, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    monitor-exit v0
+
+    return-object v3
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v1
+.end method
+
+.method public b(JJ)V
+    .locals 6
+
+    iget-wide v0, p0, Ls0/l/a/m1$f;->o:J
+
+    iget-object v2, p0, Ls0/l/a/m1$f;->p:Lrx/Producer;
+
+    sub-long p3, p1, p3
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, p3, v3
+
+    if-eqz v5, :cond_3
+
+    iput-wide p1, p0, Ls0/l/a/m1$f;->n:J
+
+    if-eqz v2, :cond_1
+
+    cmp-long p1, v0, v3
+
+    if-eqz p1, :cond_0
+
+    iput-wide v3, p0, Ls0/l/a/m1$f;->o:J
+
+    add-long/2addr v0, p3
+
+    invoke-interface {v2, v0, v1}, Lrx/Producer;->m(J)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {v2, p3, p4}, Lrx/Producer;->m(J)V
+
+    goto :goto_0
+
+    :cond_1
+    add-long/2addr v0, p3
+
+    cmp-long p1, v0, v3
+
+    if-gez p1, :cond_2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    :cond_2
+    iput-wide v0, p0, Ls0/l/a/m1$f;->o:J
+
+    goto :goto_0
+
+    :cond_3
+    cmp-long p1, v0, v3
+
+    if-eqz p1, :cond_4
+
+    if-eqz v2, :cond_4
+
+    iput-wide v3, p0, Ls0/l/a/m1$f;->o:J
+
+    invoke-interface {v2, v0, v1}, Lrx/Producer;->m(J)V
+
+    :cond_4
+    :goto_0
+    return-void
+.end method
+
+.method public c(Ls0/l/a/m1$c;)V
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/m1$c<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/l/a/m1$f;->l:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_3
+
+    if-eqz p1, :cond_2
+
+    iget-object v0, p0, Ls0/l/a/m1$f;->q:Ljava/util/List;
+
+    if-nez v0, :cond_1
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/m1$f;->q:Ljava/util/List;
+
+    :cond_1
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_2
+    iput-boolean v1, p0, Ls0/l/a/m1$f;->r:Z
+
+    :goto_0
+    iput-boolean v1, p0, Ls0/l/a/m1$f;->m:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_3
+    iput-boolean v1, p0, Ls0/l/a/m1$f;->l:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    iget-wide v0, p0, Ls0/l/a/m1$f;->n:J
+
+    const/4 v2, 0x0
+
+    if-eqz p1, :cond_4
+
+    iget-object p1, p1, Ls0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    invoke-static {v0, v1, v3, v4}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v3
+
+    goto :goto_2
+
+    :cond_4
+    invoke-virtual {p0}, Ls0/l/a/m1$f;->a()[Ls0/l/a/m1$c;
+
+    move-result-object p1
+
+    array-length v3, p1
+
+    move-wide v4, v0
+
+    const/4 v6, 0x0
+
+    :goto_1
+    if-ge v6, v3, :cond_6
+
+    aget-object v7, p1, v6
+
+    if-eqz v7, :cond_5
+
+    iget-object v7, v7, Ls0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v7}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v7
+
+    invoke-static {v4, v5, v7, v8}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v4
+
+    :cond_5
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_1
+
+    :cond_6
+    move-wide v3, v4
+
+    :goto_2
+    invoke-virtual {p0, v3, v4, v0, v1}, Ls0/l/a/m1$f;->b(JJ)V
+
+    :goto_3
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_7
+
+    return-void
+
+    :cond_7
+    monitor-enter p0
+
+    :try_start_1
+    iget-boolean p1, p0, Ls0/l/a/m1$f;->m:Z
+
+    if-nez p1, :cond_8
+
+    iput-boolean v2, p0, Ls0/l/a/m1$f;->l:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_8
+    iput-boolean v2, p0, Ls0/l/a/m1$f;->m:Z
+
+    iget-object p1, p0, Ls0/l/a/m1$f;->q:Ljava/util/List;
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ls0/l/a/m1$f;->q:Ljava/util/List;
+
+    iget-boolean v0, p0, Ls0/l/a/m1$f;->r:Z
+
+    iput-boolean v2, p0, Ls0/l/a/m1$f;->r:Z
+
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    iget-wide v3, p0, Ls0/l/a/m1$f;->n:J
+
+    if-eqz p1, :cond_9
+
+    invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    move-wide v5, v3
+
+    :goto_4
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_a
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ls0/l/a/m1$c;
+
+    iget-object v1, v1, Ls0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v7
+
+    invoke-static {v5, v6, v7, v8}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v5
+
+    goto :goto_4
+
+    :cond_9
+    move-wide v5, v3
+
+    :cond_a
+    if-eqz v0, :cond_c
+
+    invoke-virtual {p0}, Ls0/l/a/m1$f;->a()[Ls0/l/a/m1$c;
+
+    move-result-object p1
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    :goto_5
+    if-ge v1, v0, :cond_c
+
+    aget-object v7, p1, v1
+
+    if-eqz v7, :cond_b
+
+    iget-object v7, v7, Ls0/l/a/m1$c;->totalRequested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v7}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v7
+
+    invoke-static {v5, v6, v7, v8}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v5
+
+    :cond_b
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_5
+
+    :cond_c
+    invoke-virtual {p0, v5, v6, v3, v4}, Ls0/l/a/m1$f;->b(JJ)V
+
+    goto :goto_3
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_2
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_3
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    throw p1
+.end method
+
+.method public d()V
+    .locals 7
+
+    iget-object v0, p0, Ls0/l/a/m1$f;->h:[Ls0/l/a/m1$c;
+
+    iget-wide v1, p0, Ls0/l/a/m1$f;->j:J
+
+    iget-wide v3, p0, Ls0/l/a/m1$f;->i:J
+
+    const/4 v5, 0x0
+
+    cmp-long v6, v1, v3
+
+    if-eqz v6, :cond_1
+
+    iget-object v1, p0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/m1$f;->h:[Ls0/l/a/m1$c;
+
+    iget-object v2, p0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    iget-object v2, v2, Ls0/l/e/f;->e:[Ljava/lang/Object;
+
+    array-length v3, v2
+
+    array-length v4, v0
+
+    if-eq v4, v3, :cond_0
+
+    new-array v0, v3, [Ls0/l/a/m1$c;
+
+    iput-object v0, p0, Ls0/l/a/m1$f;->h:[Ls0/l/a/m1$c;
+
+    :cond_0
+    invoke-static {v2, v5, v0, v5, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iget-wide v2, p0, Ls0/l/a/m1$f;->i:J
+
+    iput-wide v2, p0, Ls0/l/a/m1$f;->j:J
+
+    monitor-exit v1
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    iget-object v1, p0, Ls0/l/a/m1$f;->d:Ls0/l/a/m1$e;
+
+    array-length v2, v0
+
+    :goto_1
+    if-ge v5, v2, :cond_3
+
+    aget-object v3, v0, v5
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {v1, v3}, Ls0/l/a/m1$e;->h(Ls0/l/a/m1$c;)V
+
+    :cond_2
+    add-int/lit8 v5, v5, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/m1$f;->e:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/m1$f;->e:Z
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/m1$f;->d:Ls0/l/a/m1$e;
+
+    invoke-interface {v0}, Ls0/l/a/m1$e;->complete()V
+
+    invoke-virtual {p0}, Ls0/l/a/m1$f;->d()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw v0
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/m1$f;->e:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/m1$f;->e:Z
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/m1$f;->d:Ls0/l/a/m1$e;
+
+    invoke-interface {v0, p1}, Ls0/l/a/m1$e;->j(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Ls0/l/a/m1$f;->d()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    throw p1
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/m1$f;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/m1$f;->d:Ls0/l/a/m1$e;
+
+    invoke-interface {v0, p1}, Ls0/l/a/m1$e;->c(Ljava/lang/Object;)V
+
+    invoke-virtual {p0}, Ls0/l/a/m1$f;->d()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/m1$f;->p:Lrx/Producer;
+
+    if-nez v0, :cond_0
+
+    iput-object p1, p0, Ls0/l/a/m1$f;->p:Lrx/Producer;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Ls0/l/a/m1$f;->c(Ls0/l/a/m1$c;)V
+
+    invoke-virtual {p0}, Ls0/l/a/m1$f;->d()V
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Only a single producer can be set on a Subscriber."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/m1$g.smali b/com.discord/smali_classes2/s0/l/a/m1$g.smali
similarity index 76%
rename from com.discord/smali_classes2/r0/l/a/m1$g.smali
rename to com.discord/smali_classes2/s0/l/a/m1$g.smali
index b43c91c1f2..9304995148 100644
--- a/com.discord/smali_classes2/r0/l/a/m1$g.smali
+++ b/com.discord/smali_classes2/s0/l/a/m1$g.smali
@@ -1,11 +1,11 @@
-.class public final Lr0/l/a/m1$g;
-.super Lr0/l/a/m1$b;
+.class public final Ls0/l/a/m1$g;
+.super Ls0/l/a/m1$b;
 .source "OperatorReplay.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/m1;
+    value = Ls0/l/a/m1;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lr0/l/a/m1$b<",
+        "Ls0/l/a/m1$b<",
         "TT;>;"
     }
 .end annotation
@@ -36,9 +36,9 @@
 .method public constructor <init>(I)V
     .locals 0
 
-    invoke-direct {p0}, Lr0/l/a/m1$b;-><init>()V
+    invoke-direct {p0}, Ls0/l/a/m1$b;-><init>()V
 
-    iput p1, p0, Lr0/l/a/m1$g;->limit:I
+    iput p1, p0, Ls0/l/a/m1$g;->limit:I
 
     return-void
 .end method
@@ -48,9 +48,9 @@
 .method public a()V
     .locals 2
 
-    iget v0, p0, Lr0/l/a/m1$b;->size:I
+    iget v0, p0, Ls0/l/a/m1$b;->size:I
 
-    iget v1, p0, Lr0/l/a/m1$g;->limit:I
+    iget v1, p0, Ls0/l/a/m1$g;->limit:I
 
     if-le v0, v1, :cond_1
 
@@ -58,21 +58,21 @@
 
     move-result-object v0
 
-    check-cast v0, Lr0/l/a/m1$d;
+    check-cast v0, Ls0/l/a/m1$d;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
     move-result-object v0
 
-    check-cast v0, Lr0/l/a/m1$d;
+    check-cast v0, Ls0/l/a/m1$d;
 
     if-eqz v0, :cond_0
 
-    iget v1, p0, Lr0/l/a/m1$b;->size:I
+    iget v1, p0, Ls0/l/a/m1$b;->size:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iput v1, p0, Lr0/l/a/m1$b;->size:I
+    iput v1, p0, Ls0/l/a/m1$b;->size:I
 
     invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/s0/l/a/m1$h.smali b/com.discord/smali_classes2/s0/l/a/m1$h.smali
new file mode 100644
index 0000000000..743c9db324
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/m1$h.smali
@@ -0,0 +1,315 @@
+.class public final Ls0/l/a/m1$h;
+.super Ljava/util/ArrayList;
+.source "OperatorReplay.java"
+
+# interfaces
+.implements Ls0/l/a/m1$e;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/m1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "h"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/ArrayList<",
+        "Ljava/lang/Object;",
+        ">;",
+        "Ls0/l/a/m1$e<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x62057d556fa2a2d8L
+
+
+# instance fields
+.field public volatile size:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ljava/util/ArrayList;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public c(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    iget p1, p0, Ls0/l/a/m1$h;->size:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Ls0/l/a/m1$h;->size:I
+
+    return-void
+.end method
+
+.method public complete()V
+    .locals 1
+
+    sget-object v0, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    invoke-virtual {p0, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    iget v0, p0, Ls0/l/a/m1$h;->size:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Ls0/l/a/m1$h;->size:I
+
+    return-void
+.end method
+
+.method public h(Ls0/l/a/m1$c;)V
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/m1$c<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    monitor-enter p1
+
+    :try_start_0
+    iget-boolean v0, p1, Ls0/l/a/m1$c;->emitting:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, p1, Ls0/l/a/m1$c;->missed:Z
+
+    monitor-exit p1
+
+    return-void
+
+    :cond_0
+    iput-boolean v1, p1, Ls0/l/a/m1$c;->emitting:Z
+
+    monitor-exit p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :goto_0
+    invoke-virtual {p1}, Ls0/l/a/m1$c;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget v0, p0, Ls0/l/a/m1$h;->size:I
+
+    iget-object v1, p1, Ls0/l/a/m1$c;->index:Ljava/lang/Object;
+
+    check-cast v1, Ljava/lang/Integer;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_1
+    iget-object v3, p1, Ls0/l/a/m1$c;->child:Lrx/Subscriber;
+
+    if-nez v3, :cond_3
+
+    return-void
+
+    :cond_3
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v4
+
+    const-wide/16 v6, 0x0
+
+    move-wide v8, v6
+
+    :goto_2
+    cmp-long v10, v8, v4
+
+    if-eqz v10, :cond_7
+
+    if-ge v1, v0, :cond_7
+
+    invoke-virtual {p0, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v10
+
+    :try_start_1
+    invoke-static {v3, v10}, Ls0/l/a/h;->a(Ls0/g;Ljava/lang/Object;)Z
+
+    move-result v10
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-eqz v10, :cond_4
+
+    return-void
+
+    :cond_4
+    invoke-virtual {p1}, Ls0/l/a/m1$c;->isUnsubscribed()Z
+
+    move-result v10
+
+    if-eqz v10, :cond_5
+
+    return-void
+
+    :cond_5
+    add-int/lit8 v1, v1, 0x1
+
+    const-wide/16 v10, 0x1
+
+    add-long/2addr v8, v10
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p1}, Ls0/l/a/m1$c;->unsubscribe()V
+
+    instance-of p1, v10, Ls0/l/a/h$c;
+
+    if-nez p1, :cond_6
+
+    invoke-static {v10}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_6
+
+    invoke-static {v10}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-interface {v3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_6
+    return-void
+
+    :cond_7
+    cmp-long v0, v8, v6
+
+    if-eqz v0, :cond_8
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    iput-object v0, p1, Ls0/l/a/m1$c;->index:Ljava/lang/Object;
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    cmp-long v3, v4, v0
+
+    if-eqz v3, :cond_8
+
+    invoke-virtual {p1, v8, v9}, Ls0/l/a/m1$c;->b(J)J
+
+    :cond_8
+    monitor-enter p1
+
+    :try_start_2
+    iget-boolean v0, p1, Ls0/l/a/m1$c;->missed:Z
+
+    if-nez v0, :cond_9
+
+    iput-boolean v2, p1, Ls0/l/a/m1$c;->emitting:Z
+
+    monitor-exit p1
+
+    return-void
+
+    :cond_9
+    iput-boolean v2, p1, Ls0/l/a/m1$c;->missed:Z
+
+    monitor-exit p1
+
+    goto :goto_0
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit p1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw v0
+
+    :catchall_2
+    move-exception v0
+
+    :try_start_3
+    monitor-exit p1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    throw v0
+.end method
+
+.method public j(Ljava/lang/Throwable;)V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/h$c;
+
+    invoke-direct {v0, p1}, Ls0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    iget p1, p0, Ls0/l/a/m1$h;->size:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    iput p1, p0, Ls0/l/a/m1$h;->size:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/m1.smali b/com.discord/smali_classes2/s0/l/a/m1.smali
new file mode 100644
index 0000000000..aed12875a3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/m1.smali
@@ -0,0 +1,263 @@
+.class public final Ls0/l/a/m1;
+.super Ls0/m/c;
+.source "OperatorReplay.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/m1$g;,
+        Ls0/l/a/m1$b;,
+        Ls0/l/a/m1$d;,
+        Ls0/l/a/m1$h;,
+        Ls0/l/a/m1$e;,
+        Ls0/l/a/m1$c;,
+        Ls0/l/a/m1$f;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/m/c<",
+        "TT;>;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final h:Lrx/functions/Func0;
+
+
+# instance fields
+.field public final e:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/a/m1$f<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Lrx/functions/Func0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Func0<",
+            "+",
+            "Ls0/l/a/m1$e<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/m1$a;
+
+    invoke-direct {v0}, Ls0/l/a/m1$a;-><init>()V
+
+    sput-object v0, Ls0/l/a/m1;->h:Lrx/functions/Func0;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/Observable$a;Lrx/Observable;Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable$a<",
+            "TT;>;",
+            "Lrx/Observable<",
+            "+TT;>;",
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/a/m1$f<",
+            "TT;>;>;",
+            "Lrx/functions/Func0<",
+            "+",
+            "Ls0/l/a/m1$e<",
+            "TT;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/m/c;-><init>(Lrx/Observable$a;)V
+
+    iput-object p2, p0, Ls0/l/a/m1;->e:Lrx/Observable;
+
+    iput-object p3, p0, Ls0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iput-object p4, p0, Ls0/l/a/m1;->g:Lrx/functions/Func0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public g0(Lrx/functions/Action1;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Action1<",
+            "-",
+            "Lrx/Subscription;",
+            ">;)V"
+        }
+    .end annotation
+
+    :goto_0
+    iget-object v0, p0, Ls0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/a/m1$f;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    :cond_0
+    new-instance v1, Ls0/l/a/m1$f;
+
+    iget-object v2, p0, Ls0/l/a/m1;->g:Lrx/functions/Func0;
+
+    invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ls0/l/a/m1$e;
+
+    invoke-direct {v1, v2}, Ls0/l/a/m1$f;-><init>(Ls0/l/a/m1$e;)V
+
+    new-instance v2, Ls0/l/a/p1;
+
+    invoke-direct {v2, v1}, Ls0/l/a/p1;-><init>(Ls0/l/a/m1$f;)V
+
+    new-instance v3, Ls0/r/a;
+
+    invoke-direct {v3, v2}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v2, p0, Ls0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    move-object v0, v1
+
+    :cond_2
+    iget-object v1, v0, Ls0/l/a/m1$f;->k:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    if-nez v1, :cond_3
+
+    iget-object v1, v0, Ls0/l/a/m1$f;->k:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-virtual {v1, v3, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v2, 0x0
+
+    :goto_1
+    invoke-interface {p1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    if-eqz v2, :cond_4
+
+    iget-object p1, p0, Ls0/l/a/m1;->e:Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    :cond_4
+    return-void
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/a/m1$f;
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()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
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/m1;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/m2.smali b/com.discord/smali_classes2/s0/l/a/m2.smali
new file mode 100644
index 0000000000..252db8ea99
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/m2.smali
@@ -0,0 +1,139 @@
+.class public Ls0/l/a/m2;
+.super Lrx/Subscriber;
+.source "OperatorTakeWhile.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public e:Z
+
+.field public final synthetic f:Lrx/Subscriber;
+
+.field public final synthetic g:Ls0/l/a/l2;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/l2;Lrx/Subscriber;ZLrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/m2;->g:Ls0/l/a/l2;
+
+    iput-object p4, p0, Ls0/l/a/m2;->f:Lrx/Subscriber;
+
+    invoke-direct {p0, p2, p3}, Lrx/Subscriber;-><init>(Lrx/Subscriber;Z)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/m2;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/m2;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/m2;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/m2;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    const/4 v0, 0x1
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/m2;->g:Ls0/l/a/l2;
+
+    iget-object v1, v1, Ls0/l/a/l2;->d:Lrx/functions/Func2;
+
+    iget v2, p0, Ls0/l/a/m2;->d:I
+
+    add-int/lit8 v3, v2, 0x1
+
+    iput v3, p0, Ls0/l/a/m2;->d:I
+
+    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v2
+
+    invoke-interface {v1, p1, v2}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Boolean;
+
+    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v1, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/m2;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    iput-boolean v0, p0, Ls0/l/a/m2;->e:Z
+
+    iget-object p1, p0, Ls0/l/a/m2;->f:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    iput-boolean v0, p0, Ls0/l/a/m2;->e:Z
+
+    iget-object v0, p0, Ls0/l/a/m2;->f:Lrx/Subscriber;
+
+    invoke-static {v1, v0, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/n$a.smali b/com.discord/smali_classes2/s0/l/a/n$a.smali
new file mode 100644
index 0000000000..f68d39f426
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/n$a.smali
@@ -0,0 +1,203 @@
+.class public final Ls0/l/a/n$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeDoOnEach.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/n;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/g;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/g<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public f:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ls0/g;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;",
+            "Ls0/g<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    iput-object p1, p0, Ls0/l/a/n$a;->d:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/n$a;->e:Ls0/g;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/n$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/n$a;->e:Ls0/g;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/n$a;->f:Z
+
+    iget-object v0, p0, Ls0/l/a/n$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v0}, Ls0/l/a/n$a;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 6
+
+    iget-boolean v0, p0, Ls0/l/a/n$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/n$a;->f:Z
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/n$a;->e:Ls0/g;
+
+    invoke-interface {v1, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/n$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iget-object v2, p0, Ls0/l/a/n$a;->d:Lrx/Subscriber;
+
+    new-instance v3, Lrx/exceptions/CompositeException;
+
+    const/4 v4, 0x2
+
+    new-array v4, v4, [Ljava/lang/Throwable;
+
+    const/4 v5, 0x0
+
+    aput-object p1, v4, v5
+
+    aput-object v1, v4, v0
+
+    invoke-static {v4}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-direct {v3, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    invoke-interface {v2, v3}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/n$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/n$a;->e:Ls0/g;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/n$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0, p0, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/n.smali b/com.discord/smali_classes2/s0/l/a/n.smali
new file mode 100644
index 0000000000..c853a31f61
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/n.smali
@@ -0,0 +1,88 @@
+.class public Ls0/l/a/n;
+.super Ljava/lang/Object;
+.source "OnSubscribeDoOnEach.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/n$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/g;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/g<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;Ls0/g;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "TT;>;",
+            "Ls0/g<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/n;->e:Lrx/Observable;
+
+    iput-object p2, p0, Ls0/l/a/n;->d:Ls0/g;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/n;->e:Lrx/Observable;
+
+    new-instance v1, Ls0/l/a/n$a;
+
+    iget-object v2, p0, Ls0/l/a/n;->d:Ls0/g;
+
+    invoke-direct {v1, p1, v2}, Ls0/l/a/n$a;-><init>(Lrx/Subscriber;Ls0/g;)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/n0.smali b/com.discord/smali_classes2/s0/l/a/n0.smali
new file mode 100644
index 0000000000..c49fc5086f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/n0.smali
@@ -0,0 +1,75 @@
+.class public final Ls0/l/a/n0;
+.super Ljava/lang/Object;
+.source "OnSubscribeTimerPeriodically.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "Ljava/lang/Long;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:J
+
+.field public final f:Ljava/util/concurrent/TimeUnit;
+
+.field public final g:Lrx/Scheduler;
+
+
+# direct methods
+.method public constructor <init>(JJLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Ls0/l/a/n0;->d:J
+
+    iput-wide p3, p0, Ls0/l/a/n0;->e:J
+
+    iput-object p5, p0, Ls0/l/a/n0;->f:Ljava/util/concurrent/TimeUnit;
+
+    iput-object p6, p0, Ls0/l/a/n0;->g:Lrx/Scheduler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 8
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/n0;->g:Lrx/Scheduler;
+
+    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v1
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v2, Ls0/l/a/m0;
+
+    invoke-direct {v2, p0, p1, v1}, Ls0/l/a/m0;-><init>(Ls0/l/a/n0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
+
+    iget-wide v3, p0, Ls0/l/a/n0;->d:J
+
+    iget-wide v5, p0, Ls0/l/a/n0;->e:J
+
+    iget-object v7, p0, Ls0/l/a/n0;->f:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual/range {v1 .. v7}, Lrx/Scheduler$Worker;->c(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/n1.smali b/com.discord/smali_classes2/s0/l/a/n1.smali
new file mode 100644
index 0000000000..7dc648a125
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/n1.smali
@@ -0,0 +1,47 @@
+.class public final Ls0/l/a/n1;
+.super Ljava/lang/Object;
+.source "OperatorReplay.java"
+
+# interfaces
+.implements Lrx/functions/Func0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func0<",
+        "Ls0/l/a/m1$e<",
+        "TT;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    iput p1, p0, Ls0/l/a/n1;->d:I
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()Ljava/lang/Object;
+    .locals 2
+
+    new-instance v0, Ls0/l/a/m1$g;
+
+    iget v1, p0, Ls0/l/a/n1;->d:I
+
+    invoke-direct {v0, v1}, Ls0/l/a/m1$g;-><init>(I)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/n2.smali b/com.discord/smali_classes2/s0/l/a/n2.smali
new file mode 100644
index 0000000000..a18ee6619a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/n2.smali
@@ -0,0 +1,126 @@
+.class public Ls0/l/a/n2;
+.super Lrx/Subscriber;
+.source "OperatorThrottleFirst.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:J
+
+.field public final synthetic e:Lrx/Subscriber;
+
+.field public final synthetic f:Ls0/l/a/o2;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/o2;Lrx/Subscriber;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/n2;->f:Ls0/l/a/o2;
+
+    iput-object p3, p0, Ls0/l/a/n2;->e:Lrx/Subscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    const-wide/16 p1, -0x1
+
+    iput-wide p1, p0, Ls0/l/a/n2;->d:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/n2;->e:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/n2;->e:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/n2;->f:Ls0/l/a/o2;
+
+    iget-object v0, v0, Ls0/l/a/o2;->e:Lrx/Scheduler;
+
+    if-eqz v0, :cond_2
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v0
+
+    iget-wide v2, p0, Ls0/l/a/n2;->d:J
+
+    const-wide/16 v4, -0x1
+
+    cmp-long v6, v2, v4
+
+    if-eqz v6, :cond_0
+
+    cmp-long v4, v0, v2
+
+    if-ltz v4, :cond_0
+
+    sub-long v2, v0, v2
+
+    iget-object v4, p0, Ls0/l/a/n2;->f:Ls0/l/a/o2;
+
+    iget-wide v4, v4, Ls0/l/a/o2;->d:J
+
+    cmp-long v6, v2, v4
+
+    if-ltz v6, :cond_1
+
+    :cond_0
+    iput-wide v0, p0, Ls0/l/a/n2;->d:J
+
+    iget-object v0, p0, Ls0/l/a/n2;->e:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :cond_1
+    return-void
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/o$a.smali b/com.discord/smali_classes2/s0/l/a/o$a.smali
new file mode 100644
index 0000000000..cea8e53ee5
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/o$a.smali
@@ -0,0 +1,186 @@
+.class public final Ls0/l/a/o$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeFilter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/o;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public f:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;",
+            "Ls0/k/b<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/o$a;->d:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/o$a;->e:Ls0/k/b;
+
+    const-wide/16 p1, 0x0
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/o$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/o$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/o$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/o$a;->f:Z
+
+    iget-object v0, p0, Ls0/l/a/o$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/o$a;->e:Ls0/k/b;
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/o$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    const-wide/16 v0, 0x1
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Ls0/l/a/o$a;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    invoke-super {p0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    iget-object v0, p0, Ls0/l/a/o$a;->d:Lrx/Subscriber;
+
+    invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/o.smali b/com.discord/smali_classes2/s0/l/a/o.smali
new file mode 100644
index 0000000000..320bf14b75
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/o.smali
@@ -0,0 +1,94 @@
+.class public final Ls0/l/a/o;
+.super Ljava/lang/Object;
+.source "OnSubscribeFilter.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/o$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "TT;>;",
+            "Ls0/k/b<",
+            "-TT;",
+            "Ljava/lang/Boolean;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/o;->d:Lrx/Observable;
+
+    iput-object p2, p0, Ls0/l/a/o;->e:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/o$a;
+
+    iget-object v1, p0, Ls0/l/a/o;->e:Ls0/k/b;
+
+    invoke-direct {v0, p1, v1}, Ls0/l/a/o$a;-><init>(Lrx/Subscriber;Ls0/k/b;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object p1, p0, Ls0/l/a/o;->d:Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/o0$a.smali b/com.discord/smali_classes2/s0/l/a/o0$a.smali
new file mode 100644
index 0000000000..92fa5a6a4e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/o0$a.smali
@@ -0,0 +1,148 @@
+.class public final Ls0/l/a/o0$a;
+.super Ls0/l/a/e;
+.source "OnSubscribeToMap.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/o0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "K:",
+        "Ljava/lang/Object;",
+        "V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/a/e<",
+        "TT;",
+        "Ljava/util/Map<",
+        "TK;TV;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final i:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+TK;>;"
+        }
+    .end annotation
+.end field
+
+.field public final j:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+TV;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ljava/util/Map;Ls0/k/b;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-",
+            "Ljava/util/Map<",
+            "TK;TV;>;>;",
+            "Ljava/util/Map<",
+            "TK;TV;>;",
+            "Ls0/k/b<",
+            "-TT;+TK;>;",
+            "Ls0/k/b<",
+            "-TT;+TV;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Ls0/l/a/e;-><init>(Lrx/Subscriber;)V
+
+    iput-object p2, p0, Ls0/l/a/d;->f:Ljava/lang/Object;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/d;->e:Z
+
+    iput-object p3, p0, Ls0/l/a/o0$a;->i:Ls0/k/b;
+
+    iput-object p4, p0, Ls0/l/a/o0$a;->j:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/e;->h:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/o0$a;->i:Ls0/k/b;
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ls0/l/a/o0$a;->j:Ls0/k/b;
+
+    invoke-interface {v1, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    iget-object v1, p0, Ls0/l/a/d;->f:Ljava/lang/Object;
+
+    check-cast v1, Ljava/util/Map;
+
+    invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-virtual {p0, p1}, Ls0/l/a/e;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/o0.smali b/com.discord/smali_classes2/s0/l/a/o0.smali
new file mode 100644
index 0000000000..2be668ec21
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/o0.smali
@@ -0,0 +1,166 @@
+.class public final Ls0/l/a/o0;
+.super Ljava/lang/Object;
+.source "OnSubscribeToMap.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+.implements Lrx/functions/Func0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/o0$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "K:",
+        "Ljava/lang/Object;",
+        "V:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "Ljava/util/Map<",
+        "TK;TV;>;>;",
+        "Lrx/functions/Func0<",
+        "Ljava/util/Map<",
+        "TK;TV;>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+TK;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+TV;>;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Lrx/functions/Func0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Func0<",
+            "+",
+            "Ljava/util/Map<",
+            "TK;TV;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;Ls0/k/b;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "TT;>;",
+            "Ls0/k/b<",
+            "-TT;+TK;>;",
+            "Ls0/k/b<",
+            "-TT;+TV;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/o0;->d:Lrx/Observable;
+
+    iput-object p2, p0, Ls0/l/a/o0;->e:Ls0/k/b;
+
+    iput-object p3, p0, Ls0/l/a/o0;->f:Ls0/k/b;
+
+    iput-object p0, p0, Ls0/l/a/o0;->g:Lrx/functions/Func0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/util/HashMap;
+
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+
+    return-object v0
+.end method
+
+.method public call(Ljava/lang/Object;)V
+    .locals 4
+
+    check-cast p1, Lrx/Subscriber;
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/o0;->g:Lrx/functions/Func0;
+
+    invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/Map;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    new-instance v1, Ls0/l/a/o0$a;
+
+    iget-object v2, p0, Ls0/l/a/o0;->e:Ls0/k/b;
+
+    iget-object v3, p0, Ls0/l/a/o0;->f:Ls0/k/b;
+
+    invoke-direct {v1, p1, v0, v2, v3}, Ls0/l/a/o0$a;-><init>(Lrx/Subscriber;Ljava/util/Map;Ls0/k/b;Ls0/k/b;)V
+
+    iget-object p1, p0, Ls0/l/a/o0;->d:Lrx/Observable;
+
+    iget-object v0, v1, Ls0/l/a/d;->d:Lrx/Subscriber;
+
+    invoke-virtual {v0, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v2, Ls0/l/a/d$a;
+
+    invoke-direct {v2, v1}, Ls0/l/a/d$a;-><init>(Ls0/l/a/d;)V
+
+    invoke-virtual {v0, v2}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    invoke-virtual {p1, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/o1.smali b/com.discord/smali_classes2/s0/l/a/o1.smali
new file mode 100644
index 0000000000..2eb2683029
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/o1.smali
@@ -0,0 +1,153 @@
+.class public final Ls0/l/a/o1;
+.super Ljava/lang/Object;
+.source "OperatorReplay.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/concurrent/atomic/AtomicReference;
+
+.field public final synthetic e:Lrx/functions/Func0;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/atomic/AtomicReference;Lrx/functions/Func0;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/o1;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iput-object p2, p0, Ls0/l/a/o1;->e:Lrx/functions/Func0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 7
+
+    check-cast p1, Lrx/Subscriber;
+
+    :goto_0
+    iget-object v0, p0, Ls0/l/a/o1;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/a/m1$f;
+
+    if-nez v0, :cond_1
+
+    new-instance v1, Ls0/l/a/m1$f;
+
+    iget-object v2, p0, Ls0/l/a/o1;->e:Lrx/functions/Func0;
+
+    invoke-interface {v2}, Lrx/functions/Func0;->call()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ls0/l/a/m1$e;
+
+    invoke-direct {v1, v2}, Ls0/l/a/m1$f;-><init>(Ls0/l/a/m1$e;)V
+
+    new-instance v2, Ls0/l/a/p1;
+
+    invoke-direct {v2, v1}, Ls0/l/a/p1;-><init>(Ls0/l/a/m1$f;)V
+
+    new-instance v3, Ls0/r/a;
+
+    invoke-direct {v3, v2}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {v1, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v2, p0, Ls0/l/a/o1;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    :cond_1
+    new-instance v1, Ls0/l/a/m1$c;
+
+    invoke-direct {v1, v0, p1}, Ls0/l/a/m1$c;-><init>(Ls0/l/a/m1$f;Lrx/Subscriber;)V
+
+    iget-boolean v2, v0, Ls0/l/a/m1$f;->f:Z
+
+    if-eqz v2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    iget-object v2, v0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    monitor-enter v2
+
+    :try_start_0
+    iget-boolean v3, v0, Ls0/l/a/m1$f;->f:Z
+
+    if-eqz v3, :cond_3
+
+    monitor-exit v2
+
+    goto :goto_1
+
+    :cond_3
+    iget-object v3, v0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    invoke-virtual {v3, v1}, Ls0/l/e/f;->a(Ljava/lang/Object;)Z
+
+    iget-wide v3, v0, Ls0/l/a/m1$f;->i:J
+
+    const-wide/16 v5, 0x1
+
+    add-long/2addr v3, v5
+
+    iput-wide v3, v0, Ls0/l/a/m1$f;->i:J
+
+    monitor-exit v2
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_1
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v0, v0, Ls0/l/a/m1$f;->d:Ls0/l/a/m1$e;
+
+    invoke-interface {v0, v1}, Ls0/l/a/m1$e;->h(Ls0/l/a/m1$c;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit v2
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/o2.smali b/com.discord/smali_classes2/s0/l/a/o2.smali
similarity index 80%
rename from com.discord/smali_classes2/r0/l/a/o2.smali
rename to com.discord/smali_classes2/s0/l/a/o2.smali
index e490f64f4e..eed11f0f0e 100644
--- a/com.discord/smali_classes2/r0/l/a/o2.smali
+++ b/com.discord/smali_classes2/s0/l/a/o2.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/o2;
+.class public final Ls0/l/a/o2;
 .super Ljava/lang/Object;
 .source "OperatorThrottleFirst.java"
 
@@ -35,9 +35,9 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lr0/l/a/o2;->d:J
+    iput-wide p1, p0, Ls0/l/a/o2;->d:J
 
-    iput-object p4, p0, Lr0/l/a/o2;->e:Lrx/Scheduler;
+    iput-object p4, p0, Ls0/l/a/o2;->e:Lrx/Scheduler;
 
     return-void
 .end method
@@ -49,9 +49,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    new-instance v0, Lr0/l/a/n2;
+    new-instance v0, Ls0/l/a/n2;
 
-    invoke-direct {v0, p0, p1, p1}, Lr0/l/a/n2;-><init>(Lr0/l/a/o2;Lrx/Subscriber;Lrx/Subscriber;)V
+    invoke-direct {v0, p0, p1, p1}, Ls0/l/a/n2;-><init>(Ls0/l/a/o2;Lrx/Subscriber;Lrx/Subscriber;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/s0/l/a/p.smali b/com.discord/smali_classes2/s0/l/a/p.smali
new file mode 100644
index 0000000000..ea387dc6c5
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/p.smali
@@ -0,0 +1,70 @@
+.class public Ls0/l/a/p;
+.super Ljava/lang/Object;
+.source "OnSubscribeFlattenIterable.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/q$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/q;Ls0/l/a/q$a;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/p;->d:Ls0/l/a/q$a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 4
+
+    iget-object v0, p0, Ls0/l/a/p;->d:Ls0/l/a/q$a;
+
+    if-eqz v0, :cond_2
+
+    const-wide/16 v1, 0x0
+
+    cmp-long v3, p1, v1
+
+    if-lez v3, :cond_0
+
+    iget-object v1, v0, Ls0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v1, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    invoke-virtual {v0}, Ls0/l/a/q$a;->b()V
+
+    goto :goto_0
+
+    :cond_0
+    if-ltz v3, :cond_1
+
+    :goto_0
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "n >= 0 required but it was "
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/p0.smali b/com.discord/smali_classes2/s0/l/a/p0.smali
new file mode 100644
index 0000000000..6e8d7dda40
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/p0.smali
@@ -0,0 +1,83 @@
+.class public Ls0/l/a/p0;
+.super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/q0$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/q0$a;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/p0;->d:Ls0/l/a/q0$a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/a/p0;->d:Ls0/l/a/q0$a;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v1, v0, Ls0/l/a/q0$a;->g:Z
+
+    if-eqz v1, :cond_0
+
+    monitor-exit v0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v1, v0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v2, v0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-object v2, v0, Ls0/l/a/q0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v2, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {v0, v1}, Ls0/l/a/q0$a;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+
+    :catchall_1
+    move-exception v1
+
+    :try_start_2
+    monitor-exit v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/p1.smali b/com.discord/smali_classes2/s0/l/a/p1.smali
new file mode 100644
index 0000000000..af9aa0fdc3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/p1.smali
@@ -0,0 +1,93 @@
+.class public Ls0/l/a/p1;
+.super Ljava/lang/Object;
+.source "OperatorReplay.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/m1$f;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/m1$f;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/p1;->d:Ls0/l/a/m1$f;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/p1;->d:Ls0/l/a/m1$f;
+
+    iget-boolean v0, v0, Ls0/l/a/m1$f;->f:Z
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/p1;->d:Ls0/l/a/m1$f;
+
+    iget-object v0, v0, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/p1;->d:Ls0/l/a/m1$f;
+
+    iget-boolean v1, v1, Ls0/l/a/m1$f;->f:Z
+
+    if-nez v1, :cond_0
+
+    iget-object v1, p0, Ls0/l/a/p1;->d:Ls0/l/a/m1$f;
+
+    iget-object v1, v1, Ls0/l/a/m1$f;->g:Ls0/l/e/f;
+
+    const/4 v2, 0x0
+
+    iput v2, v1, Ls0/l/e/f;->c:I
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    iput-object v2, v1, Ls0/l/e/f;->e:[Ljava/lang/Object;
+
+    iget-object v1, p0, Ls0/l/a/p1;->d:Ls0/l/a/m1$f;
+
+    iget-wide v2, v1, Ls0/l/a/m1$f;->i:J
+
+    const-wide/16 v4, 0x1
+
+    add-long/2addr v2, v4
+
+    iput-wide v2, v1, Ls0/l/a/m1$f;->i:J
+
+    iget-object v1, p0, Ls0/l/a/p1;->d:Ls0/l/a/m1$f;
+
+    const/4 v2, 0x1
+
+    iput-boolean v2, v1, Ls0/l/a/m1$f;->f:Z
+
+    :cond_0
+    monitor-exit v0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/p2.smali b/com.discord/smali_classes2/s0/l/a/p2.smali
new file mode 100644
index 0000000000..c517827251
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/p2.smali
@@ -0,0 +1,133 @@
+.class public Ls0/l/a/p2;
+.super Lrx/Subscriber;
+.source "OperatorToObservableList.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public e:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic f:Ls0/l/b/b;
+
+.field public final synthetic g:Lrx/Subscriber;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/q2;Ls0/l/b/b;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/p2;->f:Ls0/l/b/b;
+
+    iput-object p3, p0, Ls0/l/a/p2;->g:Lrx/Subscriber;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    new-instance p1, Ljava/util/LinkedList;
+
+    invoke-direct {p1}, Ljava/util/LinkedList;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/p2;->e:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    iget-boolean v0, p0, Ls0/l/a/p2;->d:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/p2;->d:Z
+
+    :try_start_0
+    new-instance v0, Ljava/util/ArrayList;
+
+    iget-object v1, p0, Ls0/l/a/p2;->e:Ljava/util/List;
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Ls0/l/a/p2;->e:Ljava/util/List;
+
+    iget-object v1, p0, Ls0/l/a/p2;->f:Ls0/l/b/b;
+
+    invoke-virtual {v1, v0}, Ls0/l/b/b;->b(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v0}, Ls0/l/a/p2;->onError(Ljava/lang/Throwable;)V
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/p2;->g:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/p2;->d:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/p2;->e:Ljava/util/List;
+
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_0
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/q$a.smali b/com.discord/smali_classes2/s0/l/a/q$a.smali
new file mode 100644
index 0000000000..cd7516e2f1
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q$a.smali
@@ -0,0 +1,605 @@
+.class public final Ls0/l/a/q$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeFlattenIterable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/q;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+",
+            "Ljava/lang/Iterable<",
+            "+TR;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:J
+
+.field public final g:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final h:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final i:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final j:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field public volatile k:Z
+
+.field public l:J
+
+.field public m:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "+TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ls0/k/b;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;",
+            "Ls0/k/b<",
+            "-TT;+",
+            "Ljava/lang/Iterable<",
+            "+TR;>;>;I)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/q$a;->d:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/q$a;->e:Ls0/k/b;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/q$a;->j:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const p1, 0x7fffffff
+
+    if-ne p3, p1, :cond_0
+
+    const-wide p1, 0x7fffffffffffffffL
+
+    iput-wide p1, p0, Ls0/l/a/q$a;->f:J
+
+    new-instance p1, Ls0/l/e/m/e;
+
+    sget p2, Ls0/l/e/h;->f:I
+
+    invoke-direct {p1, p2}, Ls0/l/e/m/e;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/q$a;->g:Ljava/util/Queue;
+
+    goto :goto_0
+
+    :cond_0
+    shr-int/lit8 p1, p3, 0x2
+
+    sub-int p1, p3, p1
+
+    int-to-long p1, p1
+
+    iput-wide p1, p0, Ls0/l/a/q$a;->f:J
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    new-instance p1, Ls0/l/e/n/n;
+
+    invoke-direct {p1, p3}, Ls0/l/e/n/n;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/q$a;->g:Ljava/util/Queue;
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ls0/l/e/m/c;
+
+    invoke-direct {p1, p3}, Ls0/l/e/m/c;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/q$a;->g:Ljava/util/Queue;
+
+    :goto_0
+    int-to-long p1, p3
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Lrx/Subscriber<",
+            "*>;",
+            "Ljava/util/Queue<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    invoke-virtual {p3}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {p4}, Ljava/util/Queue;->clear()V
+
+    iput-object v1, p0, Ls0/l/a/q$a;->m:Ljava/util/Iterator;
+
+    return v2
+
+    :cond_0
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Ls0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Ls0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {p1}, Ls0/l/e/d;->h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-interface {p4}, Ljava/util/Queue;->clear()V
+
+    iput-object v1, p0, Ls0/l/a/q$a;->m:Ljava/util/Iterator;
+
+    invoke-interface {p3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return v2
+
+    :cond_1
+    if-eqz p2, :cond_2
+
+    invoke-interface {p3}, Ls0/g;->onCompleted()V
+
+    return v2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public b()V
+    .locals 17
+
+    move-object/from16 v1, p0
+
+    iget-object v0, v1, Ls0/l/a/q$a;->j:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v2, v1, Ls0/l/a/q$a;->d:Lrx/Subscriber;
+
+    iget-object v3, v1, Ls0/l/a/q$a;->g:Ljava/util/Queue;
+
+    const/4 v5, 0x1
+
+    :cond_1
+    :goto_0
+    iget-object v0, v1, Ls0/l/a/q$a;->m:Ljava/util/Iterator;
+
+    const-wide/16 v6, 0x1
+
+    const-wide/16 v8, 0x0
+
+    const/4 v10, 0x0
+
+    if-nez v0, :cond_6
+
+    iget-boolean v11, v1, Ls0/l/a/q$a;->k:Z
+
+    invoke-interface {v3}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v12
+
+    if-nez v12, :cond_2
+
+    const/4 v13, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v13, 0x0
+
+    :goto_1
+    invoke-virtual {v1, v11, v13, v2, v3}, Ls0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+
+    move-result v11
+
+    if-eqz v11, :cond_3
+
+    return-void
+
+    :cond_3
+    if-nez v13, :cond_6
+
+    iget-wide v13, v1, Ls0/l/a/q$a;->l:J
+
+    add-long/2addr v13, v6
+
+    move v15, v5
+
+    iget-wide v4, v1, Ls0/l/a/q$a;->f:J
+
+    cmp-long v0, v13, v4
+
+    if-nez v0, :cond_4
+
+    iput-wide v8, v1, Ls0/l/a/q$a;->l:J
+
+    invoke-virtual {v1, v13, v14}, Lrx/Subscriber;->request(J)V
+
+    goto :goto_2
+
+    :cond_4
+    iput-wide v13, v1, Ls0/l/a/q$a;->l:J
+
+    :goto_2
+    :try_start_0
+    iget-object v0, v1, Ls0/l/a/q$a;->e:Ls0/k/b;
+
+    invoke-static {v12}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-interface {v0, v4}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v4, :cond_5
+
+    goto/16 :goto_5
+
+    :cond_5
+    iput-object v0, v1, Ls0/l/a/q$a;->m:Ljava/util/Iterator;
+
+    goto :goto_3
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {v1, v0}, Ls0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
+
+    goto/16 :goto_5
+
+    :cond_6
+    move v15, v5
+
+    :goto_3
+    if-eqz v0, :cond_e
+
+    iget-object v4, v1, Ls0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v4
+
+    move-wide v12, v8
+
+    :cond_7
+    const/4 v14, 0x0
+
+    cmp-long v16, v12, v4
+
+    if-eqz v16, :cond_a
+
+    iget-boolean v11, v1, Ls0/l/a/q$a;->k:Z
+
+    invoke-virtual {v1, v11, v10, v2, v3}, Ls0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+
+    move-result v11
+
+    if-eqz v11, :cond_8
+
+    return-void
+
+    :cond_8
+    :try_start_1
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v11
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+
+    invoke-interface {v2, v11}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    iget-boolean v11, v1, Ls0/l/a/q$a;->k:Z
+
+    invoke-virtual {v1, v11, v10, v2, v3}, Ls0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+
+    move-result v11
+
+    if-eqz v11, :cond_9
+
+    return-void
+
+    :cond_9
+    add-long/2addr v12, v6
+
+    :try_start_2
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v11
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    if-nez v11, :cond_7
+
+    iput-object v14, v1, Ls0/l/a/q$a;->m:Ljava/util/Iterator;
+
+    goto :goto_4
+
+    :catchall_1
+    move-exception v0
+
+    move-object v6, v0
+
+    invoke-static {v6}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iput-object v14, v1, Ls0/l/a/q$a;->m:Ljava/util/Iterator;
+
+    invoke-virtual {v1, v6}, Ls0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_4
+
+    :catchall_2
+    move-exception v0
+
+    move-object v6, v0
+
+    invoke-static {v6}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iput-object v14, v1, Ls0/l/a/q$a;->m:Ljava/util/Iterator;
+
+    invoke-virtual {v1, v6}, Ls0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
+
+    :goto_4
+    move-object v0, v14
+
+    :cond_a
+    cmp-long v6, v12, v4
+
+    if-nez v6, :cond_c
+
+    iget-boolean v4, v1, Ls0/l/a/q$a;->k:Z
+
+    invoke-interface {v3}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_b
+
+    if-nez v0, :cond_b
+
+    const/4 v10, 0x1
+
+    :cond_b
+    invoke-virtual {v1, v4, v10, v2, v3}, Ls0/l/a/q$a;->a(ZZLrx/Subscriber;Ljava/util/Queue;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_c
+
+    return-void
+
+    :cond_c
+    cmp-long v4, v12, v8
+
+    if-eqz v4, :cond_d
+
+    iget-object v4, v1, Ls0/l/a/q$a;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v4, v12, v13}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    :cond_d
+    if-nez v0, :cond_e
+
+    :goto_5
+    move v5, v15
+
+    goto/16 :goto_0
+
+    :cond_e
+    iget-object v0, v1, Ls0/l/a/q$a;->j:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    neg-int v4, v15
+
+    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
+
+    move-result v5
+
+    if-nez v5, :cond_1
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/q$a;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/q$a;->b()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/q$a;->h:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {v0, p1}, Ls0/l/e/d;->f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/q$a;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/q$a;->b()V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/q$a;->g:Ljava/util/Queue;
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    new-instance p1, Lrx/exceptions/MissingBackpressureException;
+
+    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
+
+    invoke-virtual {p0, p1}, Ls0/l/a/q$a;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_1
+    invoke-virtual {p0}, Ls0/l/a/q$a;->b()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/q$b.smali b/com.discord/smali_classes2/s0/l/a/q$b.smali
new file mode 100644
index 0000000000..c2fdd1daf2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q$b.smali
@@ -0,0 +1,128 @@
+.class public final Ls0/l/a/q$b;
+.super Ljava/lang/Object;
+.source "OnSubscribeFlattenIterable.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/q;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+",
+            "Ljava/lang/Iterable<",
+            "+TR;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;",
+            "Ls0/k/b<",
+            "-TT;+",
+            "Ljava/lang/Iterable<",
+            "+TR;>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/q$b;->d:Ljava/lang/Object;
+
+    iput-object p2, p0, Ls0/l/a/q$b;->e:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/q$b;->e:Ls0/k/b;
+
+    iget-object v1, p0, Ls0/l/a/q$b;->d:Ljava/lang/Object;
+
+    invoke-interface {v0, v1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v1, :cond_0
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ls0/l/a/t$a;
+
+    invoke-direct {v1, p1, v0}, Ls0/l/a/t$a;-><init>(Lrx/Subscriber;Ljava/util/Iterator;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/q$b;->d:Ljava/lang/Object;
+
+    invoke-static {v0, p1, v1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/q.smali b/com.discord/smali_classes2/s0/l/a/q.smali
new file mode 100644
index 0000000000..0aefbde52f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q.smali
@@ -0,0 +1,109 @@
+.class public final Ls0/l/a/q;
+.super Ljava/lang/Object;
+.source "OnSubscribeFlattenIterable.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/q$b;,
+        Ls0/l/a/q$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+",
+            "Ljava/lang/Iterable<",
+            "+TR;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:I
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;Ls0/k/b;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "+TT;>;",
+            "Ls0/k/b<",
+            "-TT;+",
+            "Ljava/lang/Iterable<",
+            "+TR;>;>;I)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/q;->d:Lrx/Observable;
+
+    iput-object p2, p0, Ls0/l/a/q;->e:Ls0/k/b;
+
+    iput p3, p0, Ls0/l/a/q;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/q$a;
+
+    iget-object v1, p0, Ls0/l/a/q;->e:Ls0/k/b;
+
+    iget v2, p0, Ls0/l/a/q;->f:I
+
+    invoke-direct {v0, p1, v1, v2}, Ls0/l/a/q$a;-><init>(Lrx/Subscriber;Ls0/k/b;I)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v1, Ls0/l/a/p;
+
+    invoke-direct {v1, p0, v0}, Ls0/l/a/p;-><init>(Ls0/l/a/q;Ls0/l/a/q$a;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    iget-object p1, p0, Ls0/l/a/q;->d:Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/q0$a.smali b/com.discord/smali_classes2/s0/l/a/q0$a.smali
new file mode 100644
index 0000000000..5b4819dbb2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q0$a.smali
@@ -0,0 +1,280 @@
+.class public final Ls0/l/a/q0$a;
+.super Lrx/Subscriber;
+.source "OperatorBufferWithTime.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/q0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-",
+            "Ljava/util/List<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/Scheduler$Worker;
+
+.field public f:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public g:Z
+
+.field public final synthetic h:Ls0/l/a/q0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-",
+            "Ljava/util/List<",
+            "TT;>;>;",
+            "Lrx/Scheduler$Worker;",
+            ")V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Ls0/l/a/q0$a;->h:Ls0/l/a/q0;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p2, p0, Ls0/l/a/q0$a;->d:Lrx/Subscriber;
+
+    iput-object p3, p0, Ls0/l/a/q0$a;->e:Lrx/Scheduler$Worker;
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/q0$a;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    monitor-enter p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    iget-boolean v0, p0, Ls0/l/a/q0$a;->g:Z
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/q0$a;->g:Z
+
+    iget-object v0, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    :try_start_2
+    iget-object v1, p0, Ls0/l/a/q0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    iget-object v0, p0, Ls0/l/a/q0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_3
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    :try_start_4
+    throw v0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/q0$a;->d:Lrx/Subscriber;
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/l/a/q0$a;->g:Z
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/q0$a;->g:Z
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/q0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/l/a/q0$a;->g:Z
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    iget-object p1, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result p1
+
+    iget-object v0, p0, Ls0/l/a/q0$a;->h:Ls0/l/a/q0;
+
+    iget v0, v0, Ls0/l/a/q0;->g:I
+
+    if-ne p1, v0, :cond_1
+
+    iget-object p1, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/q0$a;->f:Ljava/util/List;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :goto_0
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz p1, :cond_2
+
+    iget-object v0, p0, Ls0/l/a/q0$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :cond_2
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/q0$b$a.smali b/com.discord/smali_classes2/s0/l/a/q0$b$a.smali
new file mode 100644
index 0000000000..87a5386673
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q0$b$a.smali
@@ -0,0 +1,126 @@
+.class public Ls0/l/a/q0$b$a;
+.super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/q0$b;->a()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/List;
+
+.field public final synthetic e:Ls0/l/a/q0$b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/q0$b;Ljava/util/List;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/q0$b$a;->e:Ls0/l/a/q0$b;
+
+    iput-object p2, p0, Ls0/l/a/q0$b$a;->d:Ljava/util/List;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 4
+
+    iget-object v0, p0, Ls0/l/a/q0$b$a;->e:Ls0/l/a/q0$b;
+
+    iget-object v1, p0, Ls0/l/a/q0$b$a;->d:Ljava/util/List;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v2, v0, Ls0/l/a/q0$b;->g:Z
+
+    if-eqz v2, :cond_0
+
+    monitor-exit v0
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v2, v0, Ls0/l/a/q0$b;->f:Ljava/util/List;
+
+    invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v2
+
+    :cond_1
+    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/util/List;
+
+    if-ne v3, v1, :cond_1
+
+    invoke-interface {v2}, Ljava/util/Iterator;->remove()V
+
+    const/4 v2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v2, 0x0
+
+    :goto_0
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-eqz v2, :cond_3
+
+    :try_start_1
+    iget-object v2, v0, Ls0/l/a/q0$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v2, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {v0, v1}, Ls0/l/a/q0$b;->onError(Ljava/lang/Throwable;)V
+
+    :cond_3
+    :goto_1
+    return-void
+
+    :catchall_1
+    move-exception v1
+
+    :try_start_2
+    monitor-exit v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw v1
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q0$b.smali b/com.discord/smali_classes2/s0/l/a/q0$b.smali
similarity index 75%
rename from com.discord/smali_classes2/r0/l/a/q0$b.smali
rename to com.discord/smali_classes2/s0/l/a/q0$b.smali
index 4ba983d99e..451dcefe76 100644
--- a/com.discord/smali_classes2/r0/l/a/q0$b.smali
+++ b/com.discord/smali_classes2/s0/l/a/q0$b.smali
@@ -1,11 +1,11 @@
-.class public final Lr0/l/a/q0$b;
+.class public final Ls0/l/a/q0$b;
 .super Lrx/Subscriber;
 .source "OperatorBufferWithTime.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/q0;
+    value = Ls0/l/a/q0;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -47,11 +47,11 @@
 
 .field public g:Z
 
-.field public final synthetic h:Lr0/l/a/q0;
+.field public final synthetic h:Ls0/l/a/q0;
 
 
 # direct methods
-.method public constructor <init>(Lr0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
+.method public constructor <init>(Ls0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -65,19 +65,19 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lr0/l/a/q0$b;->h:Lr0/l/a/q0;
+    iput-object p1, p0, Ls0/l/a/q0$b;->h:Ls0/l/a/q0;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p2, p0, Lr0/l/a/q0$b;->d:Lrx/Subscriber;
+    iput-object p2, p0, Ls0/l/a/q0$b;->d:Lrx/Subscriber;
 
-    iput-object p3, p0, Lr0/l/a/q0$b;->e:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Ls0/l/a/q0$b;->e:Lrx/Scheduler$Worker;
 
     new-instance p1, Ljava/util/LinkedList;
 
     invoke-direct {p1}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/q0$b;->f:Ljava/util/List;
+    iput-object p1, p0, Ls0/l/a/q0$b;->f:Ljava/util/List;
 
     return-void
 .end method
@@ -94,7 +94,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v1, p0, Lr0/l/a/q0$b;->g:Z
+    iget-boolean v1, p0, Ls0/l/a/q0$b;->g:Z
 
     if-eqz v1, :cond_0
 
@@ -103,7 +103,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lr0/l/a/q0$b;->f:Ljava/util/List;
+    iget-object v1, p0, Ls0/l/a/q0$b;->f:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -111,17 +111,17 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v1, p0, Lr0/l/a/q0$b;->e:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Ls0/l/a/q0$b;->e:Lrx/Scheduler$Worker;
 
-    new-instance v2, Lr0/l/a/q0$b$a;
+    new-instance v2, Ls0/l/a/q0$b$a;
 
-    invoke-direct {v2, p0, v0}, Lr0/l/a/q0$b$a;-><init>(Lr0/l/a/q0$b;Ljava/util/List;)V
+    invoke-direct {v2, p0, v0}, Ls0/l/a/q0$b$a;-><init>(Ls0/l/a/q0$b;Ljava/util/List;)V
 
-    iget-object v0, p0, Lr0/l/a/q0$b;->h:Lr0/l/a/q0;
+    iget-object v0, p0, Ls0/l/a/q0$b;->h:Ls0/l/a/q0;
 
-    iget-wide v3, v0, Lr0/l/a/q0;->d:J
+    iget-wide v3, v0, Ls0/l/a/q0;->d:J
 
-    iget-object v0, v0, Lr0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
+    iget-object v0, v0, Ls0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
 
     invoke-virtual {v1, v2, v3, v4, v0}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
 
@@ -147,7 +147,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-boolean v0, p0, Lr0/l/a/q0$b;->g:Z
+    iget-boolean v0, p0, Ls0/l/a/q0$b;->g:Z
 
     if-eqz v0, :cond_0
 
@@ -158,15 +158,15 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lr0/l/a/q0$b;->g:Z
+    iput-boolean v0, p0, Ls0/l/a/q0$b;->g:Z
 
     new-instance v0, Ljava/util/LinkedList;
 
-    iget-object v1, p0, Lr0/l/a/q0$b;->f:Ljava/util/List;
+    iget-object v1, p0, Ls0/l/a/q0$b;->f:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/LinkedList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v1, p0, Lr0/l/a/q0$b;->f:Ljava/util/List;
+    iget-object v1, p0, Ls0/l/a/q0$b;->f:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
@@ -192,18 +192,18 @@
 
     check-cast v1, Ljava/util/List;
 
-    iget-object v2, p0, Lr0/l/a/q0$b;->d:Lrx/Subscriber;
+    iget-object v2, p0, Ls0/l/a/q0$b;->d:Lrx/Subscriber;
 
-    invoke-interface {v2, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v2, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lr0/l/a/q0$b;->d:Lrx/Subscriber;
+    iget-object v0, p0, Ls0/l/a/q0$b;->d:Lrx/Subscriber;
 
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -225,11 +225,11 @@
     :catchall_1
     move-exception v0
 
-    iget-object v1, p0, Lr0/l/a/q0$b;->d:Lrx/Subscriber;
+    iget-object v1, p0, Ls0/l/a/q0$b;->d:Lrx/Subscriber;
 
-    invoke-static {v0}, Lf/n/a/k/a;->g0(Ljava/lang/Throwable;)V
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
 
-    invoke-interface {v1, v0}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     return-void
 .end method
@@ -240,7 +240,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/q0$b;->g:Z
+    iget-boolean v0, p0, Ls0/l/a/q0$b;->g:Z
 
     if-eqz v0, :cond_0
 
@@ -251,9 +251,9 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lr0/l/a/q0$b;->g:Z
+    iput-boolean v0, p0, Ls0/l/a/q0$b;->g:Z
 
-    iget-object v0, p0, Lr0/l/a/q0$b;->f:Ljava/util/List;
+    iget-object v0, p0, Ls0/l/a/q0$b;->f:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -261,9 +261,9 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lr0/l/a/q0$b;->d:Lrx/Subscriber;
+    iget-object v0, p0, Ls0/l/a/q0$b;->d:Lrx/Subscriber;
 
-    invoke-interface {v0, p1}, Lr0/g;->onError(Ljava/lang/Throwable;)V
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
 
     invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -291,7 +291,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lr0/l/a/q0$b;->g:Z
+    iget-boolean v0, p0, Ls0/l/a/q0$b;->g:Z
 
     if-eqz v0, :cond_0
 
@@ -300,7 +300,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lr0/l/a/q0$b;->f:Ljava/util/List;
+    iget-object v0, p0, Ls0/l/a/q0$b;->f:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -328,9 +328,9 @@
 
     move-result v3
 
-    iget-object v4, p0, Lr0/l/a/q0$b;->h:Lr0/l/a/q0;
+    iget-object v4, p0, Ls0/l/a/q0$b;->h:Ls0/l/a/q0;
 
-    iget v4, v4, Lr0/l/a/q0;->g:I
+    iget v4, v4, Ls0/l/a/q0;->g:I
 
     if-ne v3, v4, :cond_1
 
@@ -371,9 +371,9 @@
 
     check-cast v0, Ljava/util/List;
 
-    iget-object v1, p0, Lr0/l/a/q0$b;->d:Lrx/Subscriber;
+    iget-object v1, p0, Ls0/l/a/q0$b;->d:Lrx/Subscriber;
 
-    invoke-interface {v1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
 
     goto :goto_1
 
diff --git a/com.discord/smali_classes2/s0/l/a/q0.smali b/com.discord/smali_classes2/s0/l/a/q0.smali
new file mode 100644
index 0000000000..b4ddec830f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q0.smali
@@ -0,0 +1,141 @@
+.class public final Ls0/l/a/q0;
+.super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/q0$a;,
+        Ls0/l/a/q0$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "Ljava/util/List<",
+        "TT;>;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:J
+
+.field public final f:Ljava/util/concurrent/TimeUnit;
+
+.field public final g:I
+
+.field public final h:Lrx/Scheduler;
+
+
+# direct methods
+.method public constructor <init>(JJLjava/util/concurrent/TimeUnit;ILrx/Scheduler;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Ls0/l/a/q0;->d:J
+
+    iput-wide p3, p0, Ls0/l/a/q0;->e:J
+
+    iput-object p5, p0, Ls0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
+
+    iput p6, p0, Ls0/l/a/q0;->g:I
+
+    iput-object p7, p0, Ls0/l/a/q0;->h:Lrx/Scheduler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 10
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/q0;->h:Lrx/Scheduler;
+
+    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v0
+
+    new-instance v1, Lrx/observers/SerializedSubscriber;
+
+    invoke-direct {v1, p1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
+
+    iget-wide v2, p0, Ls0/l/a/q0;->d:J
+
+    iget-wide v4, p0, Ls0/l/a/q0;->e:J
+
+    cmp-long v6, v2, v4
+
+    if-nez v6, :cond_0
+
+    new-instance v2, Ls0/l/a/q0$a;
+
+    invoke-direct {v2, p0, v1, v0}, Ls0/l/a/q0$a;-><init>(Ls0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
+
+    invoke-virtual {v2, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v3, v2, Ls0/l/a/q0$a;->e:Lrx/Scheduler$Worker;
+
+    new-instance v4, Ls0/l/a/p0;
+
+    invoke-direct {v4, v2}, Ls0/l/a/p0;-><init>(Ls0/l/a/q0$a;)V
+
+    iget-object p1, v2, Ls0/l/a/q0$a;->h:Ls0/l/a/q0;
+
+    iget-wide v7, p1, Ls0/l/a/q0;->d:J
+
+    iget-object v9, p1, Ls0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
+
+    move-wide v5, v7
+
+    invoke-virtual/range {v3 .. v9}, Lrx/Scheduler$Worker;->c(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v2, Ls0/l/a/q0$b;
+
+    invoke-direct {v2, p0, v1, v0}, Ls0/l/a/q0$b;-><init>(Ls0/l/a/q0;Lrx/Subscriber;Lrx/Scheduler$Worker;)V
+
+    invoke-virtual {v2, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {v2}, Ls0/l/a/q0$b;->a()V
+
+    iget-object v3, v2, Ls0/l/a/q0$b;->e:Lrx/Scheduler$Worker;
+
+    new-instance v4, Ls0/l/a/r0;
+
+    invoke-direct {v4, v2}, Ls0/l/a/r0;-><init>(Ls0/l/a/q0$b;)V
+
+    iget-object p1, v2, Ls0/l/a/q0$b;->h:Ls0/l/a/q0;
+
+    iget-wide v7, p1, Ls0/l/a/q0;->e:J
+
+    iget-object v9, p1, Ls0/l/a/q0;->f:Ljava/util/concurrent/TimeUnit;
+
+    move-wide v5, v7
+
+    invoke-virtual/range {v3 .. v9}, Lrx/Scheduler$Worker;->c(Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    :goto_0
+    return-object v2
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/q1$a.smali b/com.discord/smali_classes2/s0/l/a/q1$a.smali
new file mode 100644
index 0000000000..4c484acf15
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q1$a.smali
@@ -0,0 +1,189 @@
+.class public final Ls0/l/a/q1$a;
+.super Lrx/Subscriber;
+.source "OperatorSampleWithTime.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/q1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;",
+        "Lrx/functions/Action0;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:Ljava/lang/Object;
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    sput-object v0, Ls0/l/a/q1$a;->f:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/a/q1$a;->f:Ljava/lang/Object;
+
+    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Ls0/l/a/q1$a;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iput-object p1, p0, Ls0/l/a/q1$a;->d:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/q1$a;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/a/q1$a;->f:Ljava/lang/Object;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    sget-object v1, Ls0/l/a/q1$a;->f:Ljava/lang/Object;
+
+    if-eq v0, v1, :cond_0
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/q1$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v0}, Ls0/l/a/q1$a;->onError(Ljava/lang/Throwable;)V
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public call()V
+    .locals 0
+
+    invoke-virtual {p0}, Ls0/l/a/q1$a;->a()V
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    invoke-virtual {p0}, Ls0/l/a/q1$a;->a()V
+
+    iget-object v0, p0, Ls0/l/a/q1$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/q1$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/q1$a;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q1.smali b/com.discord/smali_classes2/s0/l/a/q1.smali
similarity index 76%
rename from com.discord/smali_classes2/r0/l/a/q1.smali
rename to com.discord/smali_classes2/s0/l/a/q1.smali
index 2b825a8721..9000ad9e6c 100644
--- a/com.discord/smali_classes2/r0/l/a/q1.smali
+++ b/com.discord/smali_classes2/s0/l/a/q1.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/q1;
+.class public final Ls0/l/a/q1;
 .super Ljava/lang/Object;
 .source "OperatorSampleWithTime.java"
 
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lr0/l/a/q1$a;
+        Ls0/l/a/q1$a;
     }
 .end annotation
 
@@ -39,11 +39,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lr0/l/a/q1;->d:J
+    iput-wide p1, p0, Ls0/l/a/q1;->d:J
 
-    iput-object p3, p0, Lr0/l/a/q1;->e:Ljava/util/concurrent/TimeUnit;
+    iput-object p3, p0, Ls0/l/a/q1;->e:Ljava/util/concurrent/TimeUnit;
 
-    iput-object p4, p0, Lr0/l/a/q1;->f:Lrx/Scheduler;
+    iput-object p4, p0, Ls0/l/a/q1;->f:Lrx/Scheduler;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 
     invoke-direct {v0, p1}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
 
-    iget-object v1, p0, Lr0/l/a/q1;->f:Lrx/Scheduler;
+    iget-object v1, p0, Ls0/l/a/q1;->f:Lrx/Scheduler;
 
     invoke-virtual {v1}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
 
@@ -67,15 +67,15 @@
 
     invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    new-instance v1, Lr0/l/a/q1$a;
+    new-instance v1, Ls0/l/a/q1$a;
 
-    invoke-direct {v1, v0}, Lr0/l/a/q1$a;-><init>(Lrx/Subscriber;)V
+    invoke-direct {v1, v0}, Ls0/l/a/q1$a;-><init>(Lrx/Subscriber;)V
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-wide v6, p0, Lr0/l/a/q1;->d:J
+    iget-wide v6, p0, Ls0/l/a/q1;->d:J
 
-    iget-object v8, p0, Lr0/l/a/q1;->e:Ljava/util/concurrent/TimeUnit;
+    iget-object v8, p0, Ls0/l/a/q1;->e:Ljava/util/concurrent/TimeUnit;
 
     move-object v3, v1
 
diff --git a/com.discord/smali_classes2/s0/l/a/q2$a.smali b/com.discord/smali_classes2/s0/l/a/q2$a.smali
new file mode 100644
index 0000000000..1aeb525714
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/q2$a.smali
@@ -0,0 +1,40 @@
+.class public final Ls0/l/a/q2$a;
+.super Ljava/lang/Object;
+.source "OperatorToObservableList.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/q2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/q2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/q2<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/q2;
+
+    invoke-direct {v0}, Ls0/l/a/q2;-><init>()V
+
+    sput-object v0, Ls0/l/a/q2$a;->a:Ls0/l/a/q2;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/q2.smali b/com.discord/smali_classes2/s0/l/a/q2.smali
similarity index 77%
rename from com.discord/smali_classes2/r0/l/a/q2.smali
rename to com.discord/smali_classes2/s0/l/a/q2.smali
index 52618e9d86..27c63cf0a2 100644
--- a/com.discord/smali_classes2/r0/l/a/q2.smali
+++ b/com.discord/smali_classes2/s0/l/a/q2.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/q2;
+.class public final Ls0/l/a/q2;
 .super Ljava/lang/Object;
 .source "OperatorToObservableList.java"
 
@@ -9,7 +9,7 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lr0/l/a/q2$a;
+        Ls0/l/a/q2$a;
     }
 .end annotation
 
@@ -42,13 +42,13 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    new-instance v0, Lr0/l/b/b;
+    new-instance v0, Ls0/l/b/b;
 
-    invoke-direct {v0, p1}, Lr0/l/b/b;-><init>(Lrx/Subscriber;)V
+    invoke-direct {v0, p1}, Ls0/l/b/b;-><init>(Lrx/Subscriber;)V
 
-    new-instance v1, Lr0/l/a/p2;
+    new-instance v1, Ls0/l/a/p2;
 
-    invoke-direct {v1, p0, v0, p1}, Lr0/l/a/p2;-><init>(Lr0/l/a/q2;Lr0/l/b/b;Lrx/Subscriber;)V
+    invoke-direct {v1, p0, v0, p1}, Ls0/l/a/p2;-><init>(Ls0/l/a/q2;Ls0/l/b/b;Lrx/Subscriber;)V
 
     invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
diff --git a/com.discord/smali_classes2/s0/l/a/r$a.smali b/com.discord/smali_classes2/s0/l/a/r$a.smali
new file mode 100644
index 0000000000..308c28cce6
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/r$a.smali
@@ -0,0 +1,245 @@
+.class public final Ls0/l/a/r$a;
+.super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OnSubscribeFromArray.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/r;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicLong;",
+        "Lrx/Producer;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x310c1171070674b3L
+
+
+# instance fields
+.field public final array:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TT;"
+        }
+    .end annotation
+.end field
+
+.field public final child:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public index:I
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;[Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;[TT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/r$a;->child:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/r$a;->array:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 10
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_a
+
+    const-wide v3, 0x7fffffffffffffffL
+
+    cmp-long v5, p1, v3
+
+    if-nez v5, :cond_3
+
+    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    move-result-wide p1
+
+    cmp-long v2, p1, v0
+
+    if-nez v2, :cond_9
+
+    iget-object p1, p0, Ls0/l/a/r$a;->child:Lrx/Subscriber;
+
+    iget-object p2, p0, Ls0/l/a/r$a;->array:[Ljava/lang/Object;
+
+    array-length v0, p2
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_1
+
+    aget-object v2, p2, v1
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    invoke-interface {p1, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    goto :goto_2
+
+    :cond_3
+    if-eqz v2, :cond_9
+
+    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    move-result-wide v2
+
+    cmp-long v4, v2, v0
+
+    if-nez v4, :cond_9
+
+    iget-object v2, p0, Ls0/l/a/r$a;->child:Lrx/Subscriber;
+
+    iget-object v3, p0, Ls0/l/a/r$a;->array:[Ljava/lang/Object;
+
+    array-length v4, v3
+
+    iget v5, p0, Ls0/l/a/r$a;->index:I
+
+    :cond_4
+    move-wide v6, v0
+
+    :cond_5
+    :goto_1
+    cmp-long v8, p1, v0
+
+    if-eqz v8, :cond_8
+
+    if-eq v5, v4, :cond_8
+
+    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v8
+
+    if-eqz v8, :cond_6
+
+    goto :goto_2
+
+    :cond_6
+    aget-object v8, v3, v5
+
+    invoke-interface {v2, v8}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    add-int/lit8 v5, v5, 0x1
+
+    if-ne v5, v4, :cond_7
+
+    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-nez p1, :cond_9
+
+    invoke-interface {v2}, Ls0/g;->onCompleted()V
+
+    goto :goto_2
+
+    :cond_7
+    const-wide/16 v8, 0x1
+
+    sub-long/2addr p1, v8
+
+    sub-long/2addr v6, v8
+
+    goto :goto_1
+
+    :cond_8
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide p1
+
+    add-long/2addr p1, v6
+
+    cmp-long v8, p1, v0
+
+    if-nez v8, :cond_5
+
+    iput v5, p0, Ls0/l/a/r$a;->index:I
+
+    invoke-virtual {p0, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->addAndGet(J)J
+
+    move-result-wide p1
+
+    cmp-long v6, p1, v0
+
+    if-nez v6, :cond_4
+
+    :cond_9
+    :goto_2
+    return-void
+
+    :cond_a
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "n >= 0 required but it was "
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/r.smali b/com.discord/smali_classes2/s0/l/a/r.smali
new file mode 100644
index 0000000000..9acc8e0f53
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/r.smali
@@ -0,0 +1,70 @@
+.class public final Ls0/l/a/r;
+.super Ljava/lang/Object;
+.source "OnSubscribeFromArray.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/r$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>([Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/r;->d:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/r$a;
+
+    iget-object v1, p0, Ls0/l/a/r;->d:[Ljava/lang/Object;
+
+    invoke-direct {v0, p1, v1}, Ls0/l/a/r$a;-><init>(Lrx/Subscriber;[Ljava/lang/Object;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/r0.smali b/com.discord/smali_classes2/s0/l/a/r0.smali
new file mode 100644
index 0000000000..d49e7a0a8c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/r0.smali
@@ -0,0 +1,34 @@
+.class public Ls0/l/a/r0;
+.super Ljava/lang/Object;
+.source "OperatorBufferWithTime.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/q0$b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/q0$b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/r0;->d:Ls0/l/a/q0$b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/r0;->d:Ls0/l/a/q0$b;
+
+    invoke-virtual {v0}, Ls0/l/a/q0$b;->a()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r1$a.smali b/com.discord/smali_classes2/s0/l/a/r1$a.smali
similarity index 81%
rename from com.discord/smali_classes2/r0/l/a/r1$a.smali
rename to com.discord/smali_classes2/s0/l/a/r1$a.smali
index e872809456..bfa1291d18 100644
--- a/com.discord/smali_classes2/r0/l/a/r1$a.smali
+++ b/com.discord/smali_classes2/s0/l/a/r1$a.smali
@@ -1,4 +1,4 @@
-.class public Lr0/l/a/r1$a;
+.class public Ls0/l/a/r1$a;
 .super Ljava/lang/Object;
 .source "OperatorScan.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/r1;-><init>(Ljava/lang/Object;Lrx/functions/Func2;)V
+    value = Ls0/l/a/r1;-><init>(Ljava/lang/Object;Lrx/functions/Func2;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,7 +33,7 @@
 .method public constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lr0/l/a/r1$a;->d:Ljava/lang/Object;
+    iput-object p1, p0, Ls0/l/a/r1$a;->d:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lr0/l/a/r1$a;->d:Ljava/lang/Object;
+    iget-object v0, p0, Ls0/l/a/r1$a;->d:Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/s0/l/a/r1$b.smali b/com.discord/smali_classes2/s0/l/a/r1$b.smali
new file mode 100644
index 0000000000..f88c786e45
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/r1$b.smali
@@ -0,0 +1,459 @@
+.class public final Ls0/l/a/r1$b;
+.super Ljava/lang/Object;
+.source "OperatorScan.java"
+
+# interfaces
+.implements Lrx/Producer;
+.implements Ls0/g;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/r1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Producer;",
+        "Ls0/g<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public f:Z
+
+.field public g:Z
+
+.field public h:J
+
+.field public final i:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public volatile j:Lrx/Producer;
+
+.field public volatile k:Z
+
+.field public l:Ljava/lang/Throwable;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TR;",
+            "Lrx/Subscriber<",
+            "-TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p2, p0, Ls0/l/a/r1$b;->d:Lrx/Subscriber;
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_0
+
+    new-instance p2, Ls0/l/e/n/s;
+
+    invoke-direct {p2}, Ls0/l/e/n/s;-><init>()V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p2, Ls0/l/e/m/f;
+
+    invoke-direct {p2}, Ls0/l/e/m/f;-><init>()V
+
+    :goto_0
+    iput-object p2, p0, Ls0/l/a/r1$b;->e:Ljava/util/Queue;
+
+    if-nez p1, :cond_1
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_1
+    invoke-interface {p2, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(ZZLrx/Subscriber;)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(ZZ",
+            "Lrx/Subscriber<",
+            "-TR;>;)Z"
+        }
+    .end annotation
+
+    invoke-virtual {p3}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    return v1
+
+    :cond_0
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Ls0/l/a/r1$b;->l:Ljava/lang/Throwable;
+
+    if-eqz p1, :cond_1
+
+    invoke-interface {p3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return v1
+
+    :cond_1
+    if-eqz p2, :cond_2
+
+    invoke-interface {p3}, Ls0/g;->onCompleted()V
+
+    return v1
+
+    :cond_2
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public b()V
+    .locals 14
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/l/a/r1$b;->f:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, p0, Ls0/l/a/r1$b;->g:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    iput-boolean v1, p0, Ls0/l/a/r1$b;->f:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    iget-object v0, p0, Ls0/l/a/r1$b;->d:Lrx/Subscriber;
+
+    iget-object v2, p0, Ls0/l/a/r1$b;->e:Ljava/util/Queue;
+
+    iget-object v3, p0, Ls0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v3}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v4
+
+    :goto_0
+    iget-boolean v6, p0, Ls0/l/a/r1$b;->k:Z
+
+    invoke-interface {v2}, Ljava/util/Queue;->isEmpty()Z
+
+    move-result v7
+
+    invoke-virtual {p0, v6, v7, v0}, Ls0/l/a/r1$b;->a(ZZLrx/Subscriber;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_1
+
+    goto :goto_4
+
+    :cond_1
+    const-wide/16 v6, 0x0
+
+    move-wide v8, v6
+
+    :goto_1
+    const/4 v10, 0x0
+
+    cmp-long v11, v8, v4
+
+    if-eqz v11, :cond_5
+
+    iget-boolean v11, p0, Ls0/l/a/r1$b;->k:Z
+
+    invoke-interface {v2}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v12
+
+    if-nez v12, :cond_2
+
+    const/4 v13, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v13, 0x0
+
+    :goto_2
+    invoke-virtual {p0, v11, v13, v0}, Ls0/l/a/r1$b;->a(ZZLrx/Subscriber;)Z
+
+    move-result v11
+
+    if-eqz v11, :cond_3
+
+    goto :goto_4
+
+    :cond_3
+    if-eqz v13, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    invoke-static {v12}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v10
+
+    :try_start_1
+    invoke-interface {v0, v10}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    const-wide/16 v10, 0x1
+
+    add-long/2addr v8, v10
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v1
+
+    invoke-static {v1, v0, v10}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    goto :goto_4
+
+    :cond_5
+    :goto_3
+    cmp-long v11, v8, v6
+
+    if-eqz v11, :cond_6
+
+    const-wide v6, 0x7fffffffffffffffL
+
+    cmp-long v11, v4, v6
+
+    if-eqz v11, :cond_6
+
+    invoke-static {v3, v8, v9}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    move-result-wide v4
+
+    :cond_6
+    monitor-enter p0
+
+    :try_start_2
+    iget-boolean v6, p0, Ls0/l/a/r1$b;->g:Z
+
+    if-nez v6, :cond_7
+
+    iput-boolean v10, p0, Ls0/l/a/r1$b;->f:Z
+
+    monitor-exit p0
+
+    :goto_4
+    return-void
+
+    :cond_7
+    iput-boolean v10, p0, Ls0/l/a/r1$b;->g:Z
+
+    monitor-exit p0
+
+    goto :goto_0
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw v0
+
+    :catchall_2
+    move-exception v0
+
+    :try_start_3
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    throw v0
+.end method
+
+.method public m(J)V
+    .locals 4
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_4
+
+    if-eqz v2, :cond_3
+
+    iget-object v0, p0, Ls0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    iget-object v0, p0, Ls0/l/a/r1$b;->j:Lrx/Producer;
+
+    if-nez v0, :cond_1
+
+    iget-object v1, p0, Ls0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/r1$b;->j:Lrx/Producer;
+
+    if-nez v0, :cond_0
+
+    iget-wide v2, p0, Ls0/l/a/r1$b;->h:J
+
+    invoke-static {v2, v3, p1, p2}, Lf/n/a/k/a;->c(JJ)J
+
+    move-result-wide v2
+
+    iput-wide v2, p0, Ls0/l/a/r1$b;->h:J
+
+    :cond_0
+    monitor-exit v1
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    if-eqz v0, :cond_2
+
+    invoke-interface {v0, p1, p2}, Lrx/Producer;->m(J)V
+
+    :cond_2
+    invoke-virtual {p0}, Ls0/l/a/r1$b;->b()V
+
+    :cond_3
+    return-void
+
+    :cond_4
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "n >= required but it was "
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/r1$b;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/r1$b;->b()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/r1$b;->l:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/r1$b;->k:Z
+
+    invoke-virtual {p0}, Ls0/l/a/r1$b;->b()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TR;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/r1$b;->e:Ljava/util/Queue;
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    invoke-virtual {p0}, Ls0/l/a/r1$b;->b()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/r1.smali b/com.discord/smali_classes2/s0/l/a/r1.smali
new file mode 100644
index 0000000000..a82de9f4f6
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/r1.smali
@@ -0,0 +1,130 @@
+.class public final Ls0/l/a/r1;
+.super Ljava/lang/Object;
+.source "OperatorScan.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/r1$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        "T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TR;TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:Ljava/lang/Object;
+
+
+# instance fields
+.field public final d:Lrx/functions/Func0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Func0<",
+            "TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/functions/Func2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Func2<",
+            "TR;-TT;TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    sput-object v0, Ls0/l/a/r1;->f:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;Lrx/functions/Func2;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TR;",
+            "Lrx/functions/Func2<",
+            "TR;-TT;TR;>;)V"
+        }
+    .end annotation
+
+    new-instance v0, Ls0/l/a/r1$a;
+
+    invoke-direct {v0, p1}, Ls0/l/a/r1$a;-><init>(Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/r1;->d:Lrx/functions/Func0;
+
+    iput-object p2, p0, Ls0/l/a/r1;->e:Lrx/functions/Func2;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/r1;->d:Lrx/functions/Func0;
+
+    invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
+
+    move-result-object v0
+
+    sget-object v1, Ls0/l/a/r1;->f:Ljava/lang/Object;
+
+    if-ne v0, v1, :cond_0
+
+    new-instance v0, Ls0/l/a/s1;
+
+    invoke-direct {v0, p0, p1, p1}, Ls0/l/a/s1;-><init>(Ls0/l/a/r1;Lrx/Subscriber;Lrx/Subscriber;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ls0/l/a/r1$b;
+
+    invoke-direct {v1, v0, p1}, Ls0/l/a/r1$b;-><init>(Ljava/lang/Object;Lrx/Subscriber;)V
+
+    new-instance v2, Ls0/l/a/t1;
+
+    invoke-direct {v2, p0, v0, v1}, Ls0/l/a/t1;-><init>(Ls0/l/a/r1;Ljava/lang/Object;Ls0/l/a/r1$b;)V
+
+    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    move-object v0, v2
+
+    :goto_0
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/r2$a.smali b/com.discord/smali_classes2/s0/l/a/r2$a.smali
similarity index 81%
rename from com.discord/smali_classes2/r0/l/a/r2$a.smali
rename to com.discord/smali_classes2/s0/l/a/r2$a.smali
index 16a79582ab..f4c5c06d48 100644
--- a/com.discord/smali_classes2/r0/l/a/r2$a.smali
+++ b/com.discord/smali_classes2/s0/l/a/r2$a.smali
@@ -1,4 +1,4 @@
-.class public Lr0/l/a/r2$a;
+.class public Ls0/l/a/r2$a;
 .super Ljava/lang/Object;
 .source "OperatorToObservableSortedList.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lr0/l/a/r2;-><init>(Lrx/functions/Func2;I)V
+    value = Ls0/l/a/r2;-><init>(Lrx/functions/Func2;I)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -30,10 +30,10 @@
 
 
 # direct methods
-.method public constructor <init>(Lr0/l/a/r2;Lrx/functions/Func2;)V
+.method public constructor <init>(Ls0/l/a/r2;Lrx/functions/Func2;)V
     .locals 0
 
-    iput-object p2, p0, Lr0/l/a/r2$a;->d:Lrx/functions/Func2;
+    iput-object p2, p0, Ls0/l/a/r2$a;->d:Lrx/functions/Func2;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lr0/l/a/r2$a;->d:Lrx/functions/Func2;
+    iget-object v0, p0, Ls0/l/a/r2$a;->d:Lrx/functions/Func2;
 
     invoke-interface {v0, p1, p2}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/r0/l/a/r2$b.smali b/com.discord/smali_classes2/s0/l/a/r2$b.smali
similarity index 94%
rename from com.discord/smali_classes2/r0/l/a/r2$b.smali
rename to com.discord/smali_classes2/s0/l/a/r2$b.smali
index 7688d3cdc8..a7e3dfd02d 100644
--- a/com.discord/smali_classes2/r0/l/a/r2$b.smali
+++ b/com.discord/smali_classes2/s0/l/a/r2$b.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/r2$b;
+.class public final Ls0/l/a/r2$b;
 .super Ljava/lang/Object;
 .source "OperatorToObservableSortedList.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/r2;
+    value = Ls0/l/a/r2;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/s0/l/a/r2.smali b/com.discord/smali_classes2/s0/l/a/r2.smali
new file mode 100644
index 0000000000..10eea1e07a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/r2.smali
@@ -0,0 +1,118 @@
+.class public final Ls0/l/a/r2;
+.super Ljava/lang/Object;
+.source "OperatorToObservableSortedList.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/r2$b;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "Ljava/util/List<",
+        "TT;>;TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:Ljava/util/Comparator;
+
+
+# instance fields
+.field public final d:Ljava/util/Comparator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Comparator<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/r2$b;
+
+    invoke-direct {v0}, Ls0/l/a/r2$b;-><init>()V
+
+    sput-object v0, Ls0/l/a/r2;->f:Ljava/util/Comparator;
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Ls0/l/a/r2;->f:Ljava/util/Comparator;
+
+    iput-object v0, p0, Ls0/l/a/r2;->d:Ljava/util/Comparator;
+
+    iput p1, p0, Ls0/l/a/r2;->e:I
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/functions/Func2;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Func2<",
+            "-TT;-TT;",
+            "Ljava/lang/Integer;",
+            ">;I)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p2, p0, Ls0/l/a/r2;->e:I
+
+    new-instance p2, Ls0/l/a/r2$a;
+
+    invoke-direct {p2, p0, p1}, Ls0/l/a/r2$a;-><init>(Ls0/l/a/r2;Lrx/functions/Func2;)V
+
+    iput-object p2, p0, Ls0/l/a/r2;->d:Ljava/util/Comparator;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/b/b;
+
+    invoke-direct {v0, p1}, Ls0/l/b/b;-><init>(Lrx/Subscriber;)V
+
+    new-instance v1, Ls0/l/a/s2;
+
+    invoke-direct {v1, p0, v0, p1}, Ls0/l/a/s2;-><init>(Ls0/l/a/r2;Ls0/l/b/b;Lrx/Subscriber;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/s.smali b/com.discord/smali_classes2/s0/l/a/s.smali
new file mode 100644
index 0000000000..f42c115f32
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/s.smali
@@ -0,0 +1,86 @@
+.class public final Ls0/l/a/s;
+.super Ljava/lang/Object;
+.source "OnSubscribeFromCallable.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/Callable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/Callable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/Callable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/Callable<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/s;->d:Ljava/util/concurrent/Callable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/b/b;
+
+    invoke-direct {v0, p1}, Ls0/l/b/b;-><init>(Lrx/Subscriber;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/s;->d:Ljava/util/concurrent/Callable;
+
+    invoke-interface {v1}, Ljava/util/concurrent/Callable;->call()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ls0/l/b/b;->b(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/s0$a.smali b/com.discord/smali_classes2/s0/l/a/s0$a.smali
new file mode 100644
index 0000000000..34e37143b8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/s0$a.smali
@@ -0,0 +1,150 @@
+.class public Ls0/l/a/s0$a;
+.super Ljava/lang/Object;
+.source "OperatorDebounceWithTime.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/s0;->onNext(Ljava/lang/Object;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:I
+
+.field public final synthetic e:Ls0/l/a/s0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/s0;I)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/s0$a;->e:Ls0/l/a/s0;
+
+    iput p2, p0, Ls0/l/a/s0$a;->d:I
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/s0$a;->e:Ls0/l/a/s0;
+
+    iget-object v1, v0, Ls0/l/a/s0;->d:Ls0/l/a/t0$a;
+
+    iget v2, p0, Ls0/l/a/s0$a;->d:I
+
+    iget-object v3, v0, Ls0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
+
+    iget-object v0, v0, Ls0/l/a/s0;->e:Lrx/Subscriber;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-boolean v4, v1, Ls0/l/a/t0$a;->e:Z
+
+    if-nez v4, :cond_2
+
+    iget-boolean v4, v1, Ls0/l/a/t0$a;->c:Z
+
+    if-eqz v4, :cond_2
+
+    iget v4, v1, Ls0/l/a/t0$a;->a:I
+
+    if-eq v2, v4, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v2, v1, Ls0/l/a/t0$a;->b:Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    iput-object v4, v1, Ls0/l/a/t0$a;->b:Ljava/lang/Object;
+
+    const/4 v4, 0x0
+
+    iput-boolean v4, v1, Ls0/l/a/t0$a;->c:Z
+
+    const/4 v5, 0x1
+
+    iput-boolean v5, v1, Ls0/l/a/t0$a;->e:Z
+
+    monitor-exit v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :try_start_1
+    invoke-interface {v3, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    monitor-enter v1
+
+    :try_start_2
+    iget-boolean v0, v1, Ls0/l/a/t0$a;->d:Z
+
+    if-nez v0, :cond_1
+
+    iput-boolean v4, v1, Ls0/l/a/t0$a;->e:Z
+
+    monitor-exit v1
+
+    goto :goto_1
+
+    :cond_1
+    monitor-exit v1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    invoke-interface {v3}, Ls0/g;->onCompleted()V
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_3
+    monitor-exit v1
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    throw v0
+
+    :catchall_1
+    move-exception v1
+
+    invoke-static {v1, v0, v2}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    :try_start_4
+    monitor-exit v1
+
+    :goto_1
+    return-void
+
+    :catchall_2
+    move-exception v0
+
+    monitor-exit v1
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/s0.smali b/com.discord/smali_classes2/s0/l/a/s0.smali
new file mode 100644
index 0000000000..c9d13f4fca
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/s0.smali
@@ -0,0 +1,256 @@
+.class public Ls0/l/a/s0;
+.super Lrx/Subscriber;
+.source "OperatorDebounceWithTime.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/l/a/t0$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/t0$a<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic f:Lrx/subscriptions/SerialSubscription;
+
+.field public final synthetic g:Lrx/Scheduler$Worker;
+
+.field public final synthetic h:Lrx/observers/SerializedSubscriber;
+
+.field public final synthetic i:Ls0/l/a/t0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/t0;Lrx/Subscriber;Lrx/subscriptions/SerialSubscription;Lrx/Scheduler$Worker;Lrx/observers/SerializedSubscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/s0;->i:Ls0/l/a/t0;
+
+    iput-object p3, p0, Ls0/l/a/s0;->f:Lrx/subscriptions/SerialSubscription;
+
+    iput-object p4, p0, Ls0/l/a/s0;->g:Lrx/Scheduler$Worker;
+
+    iput-object p5, p0, Ls0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    new-instance p1, Ls0/l/a/t0$a;
+
+    invoke-direct {p1}, Ls0/l/a/t0$a;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/s0;->d:Ls0/l/a/t0$a;
+
+    iput-object p0, p0, Ls0/l/a/s0;->e:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/a/s0;->d:Ls0/l/a/t0$a;
+
+    iget-object v1, p0, Ls0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-boolean v2, v0, Ls0/l/a/t0$a;->e:Z
+
+    const/4 v3, 0x1
+
+    if-eqz v2, :cond_0
+
+    iput-boolean v3, v0, Ls0/l/a/t0$a;->d:Z
+
+    monitor-exit v0
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v2, v0, Ls0/l/a/t0$a;->b:Ljava/lang/Object;
+
+    iget-boolean v4, v0, Ls0/l/a/t0$a;->c:Z
+
+    const/4 v5, 0x0
+
+    iput-object v5, v0, Ls0/l/a/t0$a;->b:Ljava/lang/Object;
+
+    const/4 v5, 0x0
+
+    iput-boolean v5, v0, Ls0/l/a/t0$a;->c:Z
+
+    iput-boolean v3, v0, Ls0/l/a/t0$a;->e:Z
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    if-eqz v4, :cond_1
+
+    :try_start_1
+    invoke-interface {v1, v2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0, p0, v2}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    invoke-interface {v1}, Ls0/g;->onCompleted()V
+
+    :goto_1
+    return-void
+
+    :catchall_1
+    move-exception v1
+
+    :try_start_2
+    monitor-exit v0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw v1
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/s0;->h:Lrx/observers/SerializedSubscriber;
+
+    iget-object v0, v0, Lrx/observers/SerializedSubscriber;->d:Ls0/g;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    iget-object p1, p0, Ls0/l/a/s0;->d:Ls0/l/a/t0$a;
+
+    monitor-enter p1
+
+    :try_start_0
+    iget v0, p1, Ls0/l/a/t0$a;->a:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p1, Ls0/l/a/t0$a;->a:I
+
+    const/4 v0, 0x0
+
+    iput-object v0, p1, Ls0/l/a/t0$a;->b:Ljava/lang/Object;
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p1, Ls0/l/a/t0$a;->c:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p1
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p1
+
+    throw v0
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/s0;->d:Ls0/l/a/t0$a;
+
+    monitor-enter v0
+
+    :try_start_0
+    iput-object p1, v0, Ls0/l/a/t0$a;->b:Ljava/lang/Object;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, v0, Ls0/l/a/t0$a;->c:Z
+
+    iget v1, v0, Ls0/l/a/t0$a;->a:I
+
+    add-int/2addr v1, p1
+
+    iput v1, v0, Ls0/l/a/t0$a;->a:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    iget-object p1, p0, Ls0/l/a/s0;->f:Lrx/subscriptions/SerialSubscription;
+
+    iget-object v0, p0, Ls0/l/a/s0;->g:Lrx/Scheduler$Worker;
+
+    new-instance v2, Ls0/l/a/s0$a;
+
+    invoke-direct {v2, p0, v1}, Ls0/l/a/s0$a;-><init>(Ls0/l/a/s0;I)V
+
+    iget-object v1, p0, Ls0/l/a/s0;->i:Ls0/l/a/t0;
+
+    iget-wide v3, v1, Ls0/l/a/t0;->d:J
+
+    iget-object v1, v1, Ls0/l/a/t0;->e:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v2, v3, v4, v1}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v0
+
+    throw p1
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/s1.smali b/com.discord/smali_classes2/s0/l/a/s1.smali
new file mode 100644
index 0000000000..8401752cba
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/s1.smali
@@ -0,0 +1,115 @@
+.class public Ls0/l/a/s1;
+.super Lrx/Subscriber;
+.source "OperatorScan.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public e:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TR;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic f:Lrx/Subscriber;
+
+.field public final synthetic g:Ls0/l/a/r1;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/r1;Lrx/Subscriber;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/s1;->g:Ls0/l/a/r1;
+
+    iput-object p3, p0, Ls0/l/a/s1;->f:Lrx/Subscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/s1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/s1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/s1;->d:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/s1;->d:Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/s1;->e:Ljava/lang/Object;
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/s1;->g:Ls0/l/a/r1;
+
+    iget-object v1, v1, Ls0/l/a/r1;->e:Lrx/functions/Func2;
+
+    invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :goto_0
+    iput-object p1, p0, Ls0/l/a/s1;->e:Ljava/lang/Object;
+
+    iget-object v0, p0, Ls0/l/a/s1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/s1;->f:Lrx/Subscriber;
+
+    invoke-static {v0, v1, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/s2.smali b/com.discord/smali_classes2/s0/l/a/s2.smali
new file mode 100644
index 0000000000..9af1a3eb49
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/s2.smali
@@ -0,0 +1,143 @@
+.class public Ls0/l/a/s2;
+.super Lrx/Subscriber;
+.source "OperatorToObservableSortedList.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+.field public final synthetic f:Ls0/l/b/b;
+
+.field public final synthetic g:Lrx/Subscriber;
+
+.field public final synthetic h:Ls0/l/a/r2;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/r2;Ls0/l/b/b;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/s2;->h:Ls0/l/a/r2;
+
+    iput-object p2, p0, Ls0/l/a/s2;->f:Ls0/l/b/b;
+
+    iput-object p3, p0, Ls0/l/a/s2;->g:Lrx/Subscriber;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    iget-object p2, p0, Ls0/l/a/s2;->h:Ls0/l/a/r2;
+
+    iget p2, p2, Ls0/l/a/r2;->e:I
+
+    invoke-direct {p1, p2}, Ljava/util/ArrayList;-><init>(I)V
+
+    iput-object p1, p0, Ls0/l/a/s2;->d:Ljava/util/List;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    iget-boolean v0, p0, Ls0/l/a/s2;->e:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/s2;->e:Z
+
+    iget-object v0, p0, Ls0/l/a/s2;->d:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Ls0/l/a/s2;->d:Ljava/util/List;
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/s2;->h:Ls0/l/a/r2;
+
+    iget-object v1, v1, Ls0/l/a/r2;->d:Ljava/util/Comparator;
+
+    invoke-static {v0, v1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v1, p0, Ls0/l/a/s2;->f:Ls0/l/b/b;
+
+    invoke-virtual {v1, v0}, Ls0/l/b/b;->b(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, v0}, Ls0/l/a/s2;->onError(Ljava/lang/Throwable;)V
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/s2;->g:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/s2;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/s2;->d:Ljava/util/List;
+
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :cond_0
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t$a.smali b/com.discord/smali_classes2/s0/l/a/t$a.smali
new file mode 100644
index 0000000000..e4e6194dbf
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t$a.smali
@@ -0,0 +1,292 @@
+.class public final Ls0/l/a/t$a;
+.super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OnSubscribeFromIterable.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/t;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicLong;",
+        "Lrx/Producer;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = -0x7928e15851eba4daL
+
+
+# instance fields
+.field public final it:Ljava/util/Iterator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Iterator<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final o:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ljava/util/Iterator;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;",
+            "Ljava/util/Iterator<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/t$a;->o:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/t$a;->it:Ljava/util/Iterator;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 8
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    return-void
+
+    :cond_0
+    const-wide/16 v0, 0x0
+
+    cmp-long v4, p1, v2
+
+    if-nez v4, :cond_4
+
+    invoke-virtual {p0, v0, v1, v2, v3}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_4
+
+    iget-object p1, p0, Ls0/l/a/t$a;->o:Lrx/Subscriber;
+
+    iget-object p2, p0, Ls0/l/a/t$a;->it:Ljava/util/Iterator;
+
+    :cond_1
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    goto/16 :goto_1
+
+    :cond_2
+    :try_start_0
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    invoke-interface {p1, v0}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    goto/16 :goto_1
+
+    :cond_3
+    :try_start_1
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p2
+
+    if-nez p2, :cond_b
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    goto/16 :goto_1
+
+    :catchall_0
+    move-exception p2
+
+    invoke-static {p2}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, p2}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto/16 :goto_1
+
+    :catchall_1
+    move-exception p2
+
+    invoke-static {p2}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, p2}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :cond_4
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_b
+
+    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    move-result-wide v2
+
+    cmp-long v4, v2, v0
+
+    if-nez v4, :cond_b
+
+    iget-object v2, p0, Ls0/l/a/t$a;->o:Lrx/Subscriber;
+
+    iget-object v3, p0, Ls0/l/a/t$a;->it:Ljava/util/Iterator;
+
+    :cond_5
+    move-wide v4, v0
+
+    :cond_6
+    :goto_0
+    cmp-long v6, v4, p1
+
+    if-eqz v6, :cond_a
+
+    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_7
+
+    goto :goto_1
+
+    :cond_7
+    :try_start_2
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_3
+
+    invoke-interface {v2, v6}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_8
+
+    goto :goto_1
+
+    :cond_8
+    :try_start_3
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_2
+
+    if-nez v6, :cond_9
+
+    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-nez p1, :cond_b
+
+    invoke-interface {v2}, Ls0/g;->onCompleted()V
+
+    goto :goto_1
+
+    :cond_9
+    const-wide/16 v6, 0x1
+
+    add-long/2addr v4, v6
+
+    goto :goto_0
+
+    :catchall_2
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v2, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :catchall_3
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v2, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :cond_a
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide p1
+
+    cmp-long v6, v4, p1
+
+    if-nez v6, :cond_6
+
+    invoke-static {p0, v4, v5}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    move-result-wide p1
+
+    cmp-long v4, p1, v0
+
+    if-nez v4, :cond_5
+
+    :cond_b
+    :goto_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t.smali b/com.discord/smali_classes2/s0/l/a/t.smali
new file mode 100644
index 0000000000..00bc72b426
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t.smali
@@ -0,0 +1,119 @@
+.class public final Ls0/l/a/t;
+.super Ljava/lang/Object;
+.source "OnSubscribeFromIterable.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/t$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/Iterable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/lang/Iterable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Iterable;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    if-eqz p1, :cond_0
+
+    iput-object p1, p0, Ls0/l/a/t;->d:Ljava/lang/Iterable;
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "iterable must not be null"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/t;->d:Ljava/lang/Iterable;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v2
+
+    if-nez v2, :cond_1
+
+    if-nez v1, :cond_0
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ls0/l/a/t$a;
+
+    invoke-direct {v1, p1, v0}, Ls0/l/a/t$a;-><init>(Lrx/Subscriber;Ljava/util/Iterator;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/t0$a.smali b/com.discord/smali_classes2/s0/l/a/t0$a.smali
similarity index 93%
rename from com.discord/smali_classes2/r0/l/a/t0$a.smali
rename to com.discord/smali_classes2/s0/l/a/t0$a.smali
index b244bbcfc1..94a0afd735 100644
--- a/com.discord/smali_classes2/r0/l/a/t0$a.smali
+++ b/com.discord/smali_classes2/s0/l/a/t0$a.smali
@@ -1,11 +1,11 @@
-.class public final Lr0/l/a/t0$a;
+.class public final Ls0/l/a/t0$a;
 .super Ljava/lang/Object;
 .source "OperatorDebounceWithTime.java"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/a/t0;
+    value = Ls0/l/a/t0;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali_classes2/s0/l/a/t0.smali b/com.discord/smali_classes2/s0/l/a/t0.smali
new file mode 100644
index 0000000000..ac1c3fe4d5
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t0.smali
@@ -0,0 +1,87 @@
+.class public final Ls0/l/a/t0;
+.super Ljava/lang/Object;
+.source "OperatorDebounceWithTime.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/t0$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:Ljava/util/concurrent/TimeUnit;
+
+.field public final f:Lrx/Scheduler;
+
+
+# direct methods
+.method public constructor <init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Ls0/l/a/t0;->d:J
+
+    iput-object p3, p0, Ls0/l/a/t0;->e:Ljava/util/concurrent/TimeUnit;
+
+    iput-object p4, p0, Ls0/l/a/t0;->f:Lrx/Scheduler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 6
+
+    move-object v2, p1
+
+    check-cast v2, Lrx/Subscriber;
+
+    iget-object p1, p0, Ls0/l/a/t0;->f:Lrx/Scheduler;
+
+    invoke-virtual {p1}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v4
+
+    new-instance v5, Lrx/observers/SerializedSubscriber;
+
+    invoke-direct {v5, v2}, Lrx/observers/SerializedSubscriber;-><init>(Lrx/Subscriber;)V
+
+    new-instance v3, Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {v3}, Lrx/subscriptions/SerialSubscription;-><init>()V
+
+    invoke-virtual {v5, v4}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {v5, v3}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance p1, Ls0/l/a/s0;
+
+    move-object v0, p1
+
+    move-object v1, p0
+
+    invoke-direct/range {v0 .. v5}, Ls0/l/a/s0;-><init>(Ls0/l/a/t0;Lrx/Subscriber;Lrx/subscriptions/SerialSubscription;Lrx/Scheduler$Worker;Lrx/observers/SerializedSubscriber;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t1.smali b/com.discord/smali_classes2/s0/l/a/t1.smali
new file mode 100644
index 0000000000..2eb14becf3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t1.smali
@@ -0,0 +1,188 @@
+.class public Ls0/l/a/t1;
+.super Lrx/Subscriber;
+.source "OperatorScan.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TR;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic e:Ljava/lang/Object;
+
+.field public final synthetic f:Ls0/l/a/r1$b;
+
+.field public final synthetic g:Ls0/l/a/r1;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/r1;Ljava/lang/Object;Ls0/l/a/r1$b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/t1;->g:Ls0/l/a/r1;
+
+    iput-object p2, p0, Ls0/l/a/t1;->e:Ljava/lang/Object;
+
+    iput-object p3, p0, Ls0/l/a/t1;->f:Ls0/l/a/r1$b;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iget-object p1, p0, Ls0/l/a/t1;->e:Ljava/lang/Object;
+
+    iput-object p1, p0, Ls0/l/a/t1;->d:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/t1;->f:Ls0/l/a/r1$b;
+
+    invoke-virtual {v0}, Ls0/l/a/r1$b;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/t1;->f:Ls0/l/a/r1$b;
+
+    iput-object p1, v0, Ls0/l/a/r1$b;->l:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, v0, Ls0/l/a/r1$b;->k:Z
+
+    invoke-virtual {v0}, Ls0/l/a/r1$b;->b()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/t1;->d:Ljava/lang/Object;
+
+    :try_start_0
+    iget-object v1, p0, Ls0/l/a/t1;->g:Ls0/l/a/r1;
+
+    iget-object v1, v1, Ls0/l/a/r1;->e:Lrx/functions/Func2;
+
+    invoke-interface {v1, v0, p1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iput-object p1, p0, Ls0/l/a/t1;->d:Ljava/lang/Object;
+
+    iget-object v0, p0, Ls0/l/a/t1;->f:Ls0/l/a/r1$b;
+
+    invoke-virtual {v0, p1}, Ls0/l/a/r1$b;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0, p0, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 7
+
+    iget-object v0, p0, Ls0/l/a/t1;->f:Ls0/l/a/r1$b;
+
+    if-eqz p1, :cond_3
+
+    iget-object v1, v0, Ls0/l/a/r1$b;->i:Ljava/util/concurrent/atomic/AtomicLong;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-object v2, v0, Ls0/l/a/r1$b;->j:Lrx/Producer;
+
+    if-nez v2, :cond_2
+
+    iget-wide v2, v0, Ls0/l/a/r1$b;->h:J
+
+    const-wide v4, 0x7fffffffffffffffL
+
+    cmp-long v6, v2, v4
+
+    if-eqz v6, :cond_0
+
+    const-wide/16 v4, 0x1
+
+    sub-long/2addr v2, v4
+
+    :cond_0
+    const-wide/16 v4, 0x0
+
+    iput-wide v4, v0, Ls0/l/a/r1$b;->h:J
+
+    iput-object p1, v0, Ls0/l/a/r1$b;->j:Lrx/Producer;
+
+    monitor-exit v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    cmp-long v1, v2, v4
+
+    if-lez v1, :cond_1
+
+    invoke-interface {p1, v2, v3}, Lrx/Producer;->m(J)V
+
+    :cond_1
+    invoke-virtual {v0}, Ls0/l/a/r1$b;->b()V
+
+    return-void
+
+    :cond_2
+    :try_start_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "Can\'t set more than one Producer!"
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit v1
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+
+    :cond_3
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t2$a$a.smali b/com.discord/smali_classes2/s0/l/a/t2$a$a.smali
new file mode 100644
index 0000000000..efb4c37f40
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t2$a$a.smali
@@ -0,0 +1,114 @@
+.class public final Ls0/l/a/t2$a$a;
+.super Lrx/Subscriber;
+.source "OperatorZip.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/t2$a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/l/e/h;
+
+.field public final synthetic e:Ls0/l/a/t2$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/t2$a;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/t2$a$a;->e:Ls0/l/a/t2$a;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    invoke-static {}, Ls0/l/e/h;->a()Ls0/l/e/h;
+
+    move-result-object p1
+
+    iput-object p1, p0, Ls0/l/a/t2$a$a;->d:Ls0/l/e/h;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/t2$a$a;->d:Ls0/l/e/h;
+
+    iget-object v1, v0, Ls0/l/e/h;->e:Ljava/lang/Object;
+
+    if-nez v1, :cond_0
+
+    sget-object v1, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    iput-object v1, v0, Ls0/l/e/h;->e:Ljava/lang/Object;
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/t2$a$a;->e:Ls0/l/a/t2$a;
+
+    invoke-virtual {v0}, Ls0/l/a/t2$a;->a()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/t2$a$a;->e:Ls0/l/a/t2$a;
+
+    iget-object v0, v0, Ls0/l/a/t2$a;->child:Ls0/g;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/t2$a$a;->d:Ls0/l/e/h;
+
+    invoke-virtual {v0, p1}, Ls0/l/e/h;->b(Ljava/lang/Object;)V
+    :try_end_0
+    .catch Lrx/exceptions/MissingBackpressureException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    iget-object v0, p0, Ls0/l/a/t2$a$a;->e:Ls0/l/a/t2$a;
+
+    iget-object v0, v0, Ls0/l/a/t2$a;->child:Ls0/g;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    iget-object p1, p0, Ls0/l/a/t2$a$a;->e:Ls0/l/a/t2$a;
+
+    invoke-virtual {p1}, Ls0/l/a/t2$a;->a()V
+
+    return-void
+.end method
+
+.method public onStart()V
+    .locals 2
+
+    sget v0, Ls0/l/e/h;->f:I
+
+    int-to-long v0, v0
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t2$a.smali b/com.discord/smali_classes2/s0/l/a/t2$a.smali
new file mode 100644
index 0000000000..67aaa17cfe
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t2$a.smali
@@ -0,0 +1,319 @@
+.class public final Ls0/l/a/t2$a;
+.super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorZip.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/t2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/t2$a$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicLong;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:I
+
+.field public static final serialVersionUID:J = 0x53337eae55d8937dL
+
+
+# instance fields
+.field public final child:Ls0/g;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/g<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final childSubscription:Lrx/subscriptions/CompositeSubscription;
+
+.field public emitted:I
+
+.field public requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public volatile subscribers:[Ljava/lang/Object;
+
+.field public final zipFunction:Lrx/functions/FuncN;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/FuncN<",
+            "+TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    sget v0, Ls0/l/e/h;->f:I
+
+    int-to-double v0, v0
+
+    const-wide v2, 0x3fe6666666666666L    # 0.7
+
+    mul-double v0, v0, v2
+
+    double-to-int v0, v0
+
+    sput v0, Ls0/l/a/t2$a;->d:I
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/Subscriber;Lrx/functions/FuncN;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;",
+            "Lrx/functions/FuncN<",
+            "+TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    new-instance v0, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object v0, p0, Ls0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
+
+    iput-object p1, p0, Ls0/l/a/t2$a;->child:Ls0/g;
+
+    iput-object p2, p0, Ls0/l/a/t2$a;->zipFunction:Lrx/functions/FuncN;
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 13
+
+    iget-object v0, p0, Ls0/l/a/t2$a;->subscribers:[Ljava/lang/Object;
+
+    if-nez v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
+
+    move-result-wide v1
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_9
+
+    array-length v1, v0
+
+    iget-object v2, p0, Ls0/l/a/t2$a;->child:Ls0/g;
+
+    iget-object v5, p0, Ls0/l/a/t2$a;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    :cond_1
+    :goto_0
+    new-array v6, v1, [Ljava/lang/Object;
+
+    const/4 v7, 0x1
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x1
+
+    :goto_1
+    if-ge v9, v1, :cond_4
+
+    aget-object v11, v0, v9
+
+    check-cast v11, Ls0/l/a/t2$a$a;
+
+    iget-object v11, v11, Ls0/l/a/t2$a$a;->d:Ls0/l/e/h;
+
+    invoke-virtual {v11}, Ls0/l/e/h;->c()Ljava/lang/Object;
+
+    move-result-object v11
+
+    if-nez v11, :cond_2
+
+    const/4 v10, 0x0
+
+    goto :goto_2
+
+    :cond_2
+    invoke-static {v11}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
+
+    move-result v12
+
+    if-eqz v12, :cond_3
+
+    invoke-interface {v2}, Ls0/g;->onCompleted()V
+
+    iget-object v0, p0, Ls0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    return-void
+
+    :cond_3
+    invoke-static {v11}, Ls0/l/a/h;->b(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v11
+
+    aput-object v11, v6, v9
+
+    :goto_2
+    add-int/lit8 v9, v9, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    if-eqz v10, :cond_8
+
+    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v9
+
+    cmp-long v11, v9, v3
+
+    if-lez v11, :cond_8
+
+    :try_start_0
+    iget-object v9, p0, Ls0/l/a/t2$a;->zipFunction:Lrx/functions/FuncN;
+
+    invoke-interface {v9, v6}, Lrx/functions/FuncN;->call([Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-interface {v2, v9}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    invoke-virtual {v5}, Ljava/util/concurrent/atomic/AtomicLong;->decrementAndGet()J
+
+    iget v9, p0, Ls0/l/a/t2$a;->emitted:I
+
+    add-int/2addr v9, v7
+
+    iput v9, p0, Ls0/l/a/t2$a;->emitted:I
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    array-length v6, v0
+
+    const/4 v7, 0x0
+
+    :goto_3
+    if-ge v7, v6, :cond_6
+
+    aget-object v9, v0, v7
+
+    check-cast v9, Ls0/l/a/t2$a$a;
+
+    iget-object v9, v9, Ls0/l/a/t2$a$a;->d:Ls0/l/e/h;
+
+    invoke-virtual {v9}, Ls0/l/e/h;->d()Ljava/lang/Object;
+
+    invoke-virtual {v9}, Ls0/l/e/h;->c()Ljava/lang/Object;
+
+    move-result-object v9
+
+    invoke-static {v9}, Ls0/l/a/h;->c(Ljava/lang/Object;)Z
+
+    move-result v9
+
+    if-eqz v9, :cond_5
+
+    invoke-interface {v2}, Ls0/g;->onCompleted()V
+
+    iget-object v0, p0, Ls0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    return-void
+
+    :cond_5
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_3
+
+    :cond_6
+    iget v6, p0, Ls0/l/a/t2$a;->emitted:I
+
+    sget v7, Ls0/l/a/t2$a;->d:I
+
+    if-le v6, v7, :cond_1
+
+    array-length v6, v0
+
+    const/4 v7, 0x0
+
+    :goto_4
+    if-ge v7, v6, :cond_7
+
+    aget-object v9, v0, v7
+
+    check-cast v9, Ls0/l/a/t2$a$a;
+
+    iget v10, p0, Ls0/l/a/t2$a;->emitted:I
+
+    int-to-long v10, v10
+
+    invoke-virtual {v9, v10, v11}, Lrx/Subscriber;->request(J)V
+
+    add-int/lit8 v7, v7, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    iput v8, p0, Ls0/l/a/t2$a;->emitted:I
+
+    goto/16 :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0, v2, v6}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_8
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->decrementAndGet()J
+
+    move-result-wide v6
+
+    cmp-long v8, v6, v3
+
+    if-gtz v8, :cond_1
+
+    :cond_9
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t2$b.smali b/com.discord/smali_classes2/s0/l/a/t2$b.smali
new file mode 100644
index 0000000000..334ad10321
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t2$b.smali
@@ -0,0 +1,75 @@
+.class public final Ls0/l/a/t2$b;
+.super Ljava/util/concurrent/atomic/AtomicLong;
+.source "OperatorZip.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/t2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicLong;",
+        "Lrx/Producer;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = -0x10e280be328ab0acL
+
+
+# instance fields
+.field public final zipper:Ls0/l/a/t2$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/t2$a<",
+            "TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/t2$a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/l/a/t2$a<",
+            "TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/t2$b;->zipper:Ls0/l/a/t2$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 0
+
+    invoke-static {p0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    iget-object p1, p0, Ls0/l/a/t2$b;->zipper:Ls0/l/a/t2$a;
+
+    invoke-virtual {p1}, Ls0/l/a/t2$a;->a()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t2$c.smali b/com.discord/smali_classes2/s0/l/a/t2$c.smali
new file mode 100644
index 0000000000..a04a19d1cf
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t2$c.smali
@@ -0,0 +1,196 @@
+.class public final Ls0/l/a/t2$c;
+.super Lrx/Subscriber;
+.source "OperatorZip.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/t2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "[",
+        "Lrx/Observable;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/l/a/t2$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/t2$a<",
+            "TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Ls0/l/a/t2$b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/t2$b<",
+            "TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public g:Z
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/t2;Lrx/Subscriber;Ls0/l/a/t2$a;Ls0/l/a/t2$b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;",
+            "Ls0/l/a/t2$a<",
+            "TR;>;",
+            "Ls0/l/a/t2$b<",
+            "TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p2, p0, Ls0/l/a/t2$c;->d:Lrx/Subscriber;
+
+    iput-object p3, p0, Ls0/l/a/t2$c;->e:Ls0/l/a/t2$a;
+
+    iput-object p4, p0, Ls0/l/a/t2$c;->f:Ls0/l/a/t2$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/t2$c;->g:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/t2$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/t2$c;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 7
+
+    check-cast p1, [Lrx/Observable;
+
+    if-eqz p1, :cond_3
+
+    array-length v0, p1
+
+    if-nez v0, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/t2$c;->g:Z
+
+    iget-object v0, p0, Ls0/l/a/t2$c;->e:Ls0/l/a/t2$a;
+
+    iget-object v1, p0, Ls0/l/a/t2$c;->f:Ls0/l/a/t2$b;
+
+    if-eqz v0, :cond_2
+
+    array-length v2, p1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_0
+    array-length v5, p1
+
+    if-ge v4, v5, :cond_1
+
+    new-instance v5, Ls0/l/a/t2$a$a;
+
+    invoke-direct {v5, v0}, Ls0/l/a/t2$a$a;-><init>(Ls0/l/a/t2$a;)V
+
+    aput-object v5, v2, v4
+
+    iget-object v6, v0, Ls0/l/a/t2$a;->childSubscription:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v6, v5}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    iput-object v1, v0, Ls0/l/a/t2$a;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iput-object v2, v0, Ls0/l/a/t2$a;->subscribers:[Ljava/lang/Object;
+
+    :goto_1
+    array-length v0, p1
+
+    if-ge v3, v0, :cond_4
+
+    aget-object v0, p1, v3
+
+    aget-object v1, v2, v3
+
+    check-cast v1, Ls0/l/a/t2$a$a;
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_3
+    :goto_2
+    iget-object p1, p0, Ls0/l/a/t2$c;->d:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    :cond_4
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/t2.smali b/com.discord/smali_classes2/s0/l/a/t2.smali
new file mode 100644
index 0000000000..9383ecc6d1
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/t2.smali
@@ -0,0 +1,84 @@
+.class public final Ls0/l/a/t2;
+.super Ljava/lang/Object;
+.source "OperatorZip.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/t2$a;,
+        Ls0/l/a/t2$b;,
+        Ls0/l/a/t2$c;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TR;[",
+        "Lrx/Observable<",
+        "*>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/FuncN;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/FuncN<",
+            "+TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func2;)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ls0/k/d;
+
+    invoke-direct {v0, p1}, Ls0/k/d;-><init>(Lrx/functions/Func2;)V
+
+    iput-object v0, p0, Ls0/l/a/t2;->d:Lrx/functions/FuncN;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/t2$a;
+
+    iget-object v1, p0, Ls0/l/a/t2;->d:Lrx/functions/FuncN;
+
+    invoke-direct {v0, p1, v1}, Ls0/l/a/t2$a;-><init>(Lrx/Subscriber;Lrx/functions/FuncN;)V
+
+    new-instance v1, Ls0/l/a/t2$b;
+
+    invoke-direct {v1, v0}, Ls0/l/a/t2$b;-><init>(Ls0/l/a/t2$a;)V
+
+    new-instance v2, Ls0/l/a/t2$c;
+
+    invoke-direct {v2, p0, p1, v0, v1}, Ls0/l/a/t2$c;-><init>(Ls0/l/a/t2;Lrx/Subscriber;Ls0/l/a/t2$a;Ls0/l/a/t2$b;)V
+
+    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-object v2
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u.smali b/com.discord/smali_classes2/s0/l/a/u.smali
new file mode 100644
index 0000000000..9db98effdf
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u.smali
@@ -0,0 +1,127 @@
+.class public final Ls0/l/a/u;
+.super Ljava/lang/Object;
+.source "OnSubscribeLift.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable$a<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/Observable$b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable$b<",
+            "+TR;-TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable$a;Lrx/Observable$b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable$a<",
+            "TT;>;",
+            "Lrx/Observable$b<",
+            "+TR;-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/u;->d:Lrx/Observable$a;
+
+    iput-object p2, p0, Ls0/l/a/u;->e:Lrx/Observable$b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/u;->e:Lrx/Observable$b;
+
+    sget-object v1, Ls0/o/l;->i:Ls0/k/b;
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v1, v0}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable$b;
+
+    :cond_0
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Subscriber;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    invoke-virtual {v0}, Lrx/Subscriber;->onStart()V
+
+    iget-object v1, p0, Ls0/l/a/u;->d:Lrx/Observable$a;
+
+    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    :try_start_2
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {v0, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    goto :goto_0
+
+    :catchall_1
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u0$a.smali b/com.discord/smali_classes2/s0/l/a/u0$a.smali
new file mode 100644
index 0000000000..d131397da6
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u0$a.smali
@@ -0,0 +1,56 @@
+.class public Ls0/l/a/u0$a;
+.super Ljava/lang/Object;
+.source "OperatorDelay.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/u0;->onCompleted()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/u0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/u0;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/u0$a;->d:Ls0/l/a/u0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/u0$a;->d:Ls0/l/a/u0;
+
+    iget-boolean v1, v0, Ls0/l/a/u0;->d:Z
+
+    if-nez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    iput-boolean v1, v0, Ls0/l/a/u0;->d:Z
+
+    iget-object v0, v0, Ls0/l/a/u0;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u0$b.smali b/com.discord/smali_classes2/s0/l/a/u0$b.smali
new file mode 100644
index 0000000000..5e426b3408
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u0$b.smali
@@ -0,0 +1,68 @@
+.class public Ls0/l/a/u0$b;
+.super Ljava/lang/Object;
+.source "OperatorDelay.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/u0;->onError(Ljava/lang/Throwable;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/Throwable;
+
+.field public final synthetic e:Ls0/l/a/u0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/u0;Ljava/lang/Throwable;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/u0$b;->e:Ls0/l/a/u0;
+
+    iput-object p2, p0, Ls0/l/a/u0$b;->d:Ljava/lang/Throwable;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/u0$b;->e:Ls0/l/a/u0;
+
+    iget-boolean v1, v0, Ls0/l/a/u0;->d:Z
+
+    if-nez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    iput-boolean v1, v0, Ls0/l/a/u0;->d:Z
+
+    iget-object v0, v0, Ls0/l/a/u0;->f:Lrx/Subscriber;
+
+    iget-object v1, p0, Ls0/l/a/u0$b;->d:Ljava/lang/Throwable;
+
+    invoke-interface {v0, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    iget-object v0, p0, Ls0/l/a/u0$b;->e:Ls0/l/a/u0;
+
+    iget-object v0, v0, Ls0/l/a/u0;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u0$c.smali b/com.discord/smali_classes2/s0/l/a/u0$c.smali
new file mode 100644
index 0000000000..f8c0d9436e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u0$c.smali
@@ -0,0 +1,58 @@
+.class public Ls0/l/a/u0$c;
+.super Ljava/lang/Object;
+.source "OperatorDelay.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/u0;->onNext(Ljava/lang/Object;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/lang/Object;
+
+.field public final synthetic e:Ls0/l/a/u0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/u0;Ljava/lang/Object;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/u0$c;->e:Ls0/l/a/u0;
+
+    iput-object p2, p0, Ls0/l/a/u0$c;->d:Ljava/lang/Object;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/u0$c;->e:Ls0/l/a/u0;
+
+    iget-boolean v1, v0, Ls0/l/a/u0;->d:Z
+
+    if-nez v1, :cond_0
+
+    iget-object v0, v0, Ls0/l/a/u0;->f:Lrx/Subscriber;
+
+    iget-object v1, p0, Ls0/l/a/u0$c;->d:Ljava/lang/Object;
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u0.smali b/com.discord/smali_classes2/s0/l/a/u0.smali
new file mode 100644
index 0000000000..218b77dea0
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u0.smali
@@ -0,0 +1,99 @@
+.class public Ls0/l/a/u0;
+.super Lrx/Subscriber;
+.source "OperatorDelay.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public final synthetic e:Lrx/Scheduler$Worker;
+
+.field public final synthetic f:Lrx/Subscriber;
+
+.field public final synthetic g:Ls0/l/a/v0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/v0;Lrx/Subscriber;Lrx/Scheduler$Worker;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/u0;->g:Ls0/l/a/v0;
+
+    iput-object p3, p0, Ls0/l/a/u0;->e:Lrx/Scheduler$Worker;
+
+    iput-object p4, p0, Ls0/l/a/u0;->f:Lrx/Subscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/a/u0;->e:Lrx/Scheduler$Worker;
+
+    new-instance v1, Ls0/l/a/u0$a;
+
+    invoke-direct {v1, p0}, Ls0/l/a/u0$a;-><init>(Ls0/l/a/u0;)V
+
+    iget-object v2, p0, Ls0/l/a/u0;->g:Ls0/l/a/v0;
+
+    iget-wide v3, v2, Ls0/l/a/v0;->d:J
+
+    iget-object v2, v2, Ls0/l/a/v0;->e:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v1, v3, v4, v2}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/u0;->e:Lrx/Scheduler$Worker;
+
+    new-instance v1, Ls0/l/a/u0$b;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/a/u0$b;-><init>(Ls0/l/a/u0;Ljava/lang/Throwable;)V
+
+    invoke-virtual {v0, v1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/a/u0;->e:Lrx/Scheduler$Worker;
+
+    new-instance v1, Ls0/l/a/u0$c;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/a/u0$c;-><init>(Ls0/l/a/u0;Ljava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/a/u0;->g:Ls0/l/a/v0;
+
+    iget-wide v2, p1, Ls0/l/a/v0;->d:J
+
+    iget-object p1, p1, Ls0/l/a/v0;->e:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v0, v1, v2, v3, p1}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u1$a.smali b/com.discord/smali_classes2/s0/l/a/u1$a.smali
new file mode 100644
index 0000000000..d4a766d732
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u1$a.smali
@@ -0,0 +1,39 @@
+.class public final Ls0/l/a/u1$a;
+.super Ljava/lang/Object;
+.source "OperatorSingle.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/u1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/u1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/u1<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/a/u1;
+
+    invoke-direct {v0}, Ls0/l/a/u1;-><init>()V
+
+    sput-object v0, Ls0/l/a/u1$a;->a:Ls0/l/a/u1;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u1$b.smali b/com.discord/smali_classes2/s0/l/a/u1$b.smali
new file mode 100644
index 0000000000..288a2e201d
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u1$b.smali
@@ -0,0 +1,209 @@
+.class public final Ls0/l/a/u1$b;
+.super Lrx/Subscriber;
+.source "OperatorSingle.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/u1;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Z
+
+.field public final f:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public g:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public h:Z
+
+.field public i:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;ZLjava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;ZTT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    iput-boolean p2, p0, Ls0/l/a/u1$b;->e:Z
+
+    iput-object p3, p0, Ls0/l/a/u1$b;->f:Ljava/lang/Object;
+
+    const-wide/16 p1, 0x2
+
+    invoke-virtual {p0, p1, p2}, Lrx/Subscriber;->request(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 4
+
+    iget-boolean v0, p0, Ls0/l/a/u1$b;->i:Z
+
+    if-nez v0, :cond_2
+
+    iget-boolean v0, p0, Ls0/l/a/u1$b;->h:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    new-instance v1, Ls0/l/b/c;
+
+    iget-object v2, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    iget-object v3, p0, Ls0/l/a/u1$b;->g:Ljava/lang/Object;
+
+    invoke-direct {v1, v2, v3}, Ls0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+
+    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-boolean v0, p0, Ls0/l/a/u1$b;->e:Z
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    new-instance v1, Ls0/l/b/c;
+
+    iget-object v2, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    iget-object v3, p0, Ls0/l/a/u1$b;->f:Ljava/lang/Object;
+
+    invoke-direct {v1, v2, v3}, Ls0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+
+    invoke-virtual {v0, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v0, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    new-instance v1, Ljava/util/NoSuchElementException;
+
+    const-string v2, "Sequence contains no elements"
+
+    invoke-direct {v1, v2}, Ljava/util/NoSuchElementException;-><init>(Ljava/lang/String;)V
+
+    invoke-interface {v0, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    :cond_2
+    :goto_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/u1$b;->i:Z
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/u1$b;->i:Z
+
+    if-nez v0, :cond_1
+
+    iget-boolean v0, p0, Ls0/l/a/u1$b;->h:Z
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    iput-boolean v1, p0, Ls0/l/a/u1$b;->i:Z
+
+    iget-object p1, p0, Ls0/l/a/u1$b;->d:Lrx/Subscriber;
+
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "Sequence contains too many elements"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    invoke-interface {p1, v0}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    goto :goto_0
+
+    :cond_0
+    iput-object p1, p0, Ls0/l/a/u1$b;->g:Ljava/lang/Object;
+
+    iput-boolean v1, p0, Ls0/l/a/u1$b;->h:Z
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/u1.smali b/com.discord/smali_classes2/s0/l/a/u1.smali
new file mode 100644
index 0000000000..34cd817613
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/u1.smali
@@ -0,0 +1,76 @@
+.class public final Ls0/l/a/u1;
+.super Ljava/lang/Object;
+.source "OperatorSingle.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/u1$b;,
+        Ls0/l/a/u1$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Z
+
+.field public final e:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Ls0/l/a/u1;->d:Z
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Ls0/l/a/u1;->e:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/u1$b;
+
+    iget-boolean v1, p0, Ls0/l/a/u1;->d:Z
+
+    iget-object v2, p0, Ls0/l/a/u1;->e:Ljava/lang/Object;
+
+    invoke-direct {v0, p1, v1, v2}, Ls0/l/a/u1$b;-><init>(Lrx/Subscriber;ZLjava/lang/Object;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/u2.smali b/com.discord/smali_classes2/s0/l/a/u2.smali
similarity index 87%
rename from com.discord/smali_classes2/r0/l/a/u2.smali
rename to com.discord/smali_classes2/s0/l/a/u2.smali
index 127c0ba7f7..68b61c231a 100644
--- a/com.discord/smali_classes2/r0/l/a/u2.smali
+++ b/com.discord/smali_classes2/s0/l/a/u2.smali
@@ -1,5 +1,5 @@
-.class public final Lr0/l/a/u2;
-.super Lr0/i;
+.class public final Ls0/l/a/u2;
+.super Ls0/i;
 .source "SingleLiftObservableOperator.java"
 
 
@@ -9,7 +9,7 @@
         "<T:",
         "Ljava/lang/Object;",
         ">",
-        "Lr0/i<",
+        "Ls0/i<",
         "TT;>;"
     }
 .end annotation
diff --git a/com.discord/smali_classes2/s0/l/a/v$a.smali b/com.discord/smali_classes2/s0/l/a/v$a.smali
new file mode 100644
index 0000000000..053168e975
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/v$a.smali
@@ -0,0 +1,162 @@
+.class public final Ls0/l/a/v$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeMap.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/v;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+TR;>;"
+        }
+    .end annotation
+.end field
+
+.field public f:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TR;>;",
+            "Ls0/k/b<",
+            "-TT;+TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/v$a;->d:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/a/v$a;->e:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/v$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/a/v$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/a/v$a;->f:Z
+
+    if-eqz v0, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/v$a;->f:Z
+
+    iget-object v0, p0, Ls0/l/a/v$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/v$a;->e:Ls0/k/b;
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/a/v$a;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    invoke-static {v0, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Ls0/l/a/v$a;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/v$a;->d:Lrx/Subscriber;
+
+    invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/v.smali b/com.discord/smali_classes2/s0/l/a/v.smali
new file mode 100644
index 0000000000..dd8ff69337
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/v.smali
@@ -0,0 +1,92 @@
+.class public final Ls0/l/a/v;
+.super Ljava/lang/Object;
+.source "OnSubscribeMap.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/v$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+TR;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "TT;>;",
+            "Ls0/k/b<",
+            "-TT;+TR;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/v;->d:Lrx/Observable;
+
+    iput-object p2, p0, Ls0/l/a/v;->e:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/v$a;
+
+    iget-object v1, p0, Ls0/l/a/v;->e:Ls0/k/b;
+
+    invoke-direct {v0, p1, v1}, Ls0/l/a/v$a;-><init>(Lrx/Subscriber;Ls0/k/b;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object p1, p0, Ls0/l/a/v;->d:Lrx/Observable;
+
+    invoke-virtual {p1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/v0.smali b/com.discord/smali_classes2/s0/l/a/v0.smali
new file mode 100644
index 0000000000..2423407f4e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/v0.smali
@@ -0,0 +1,65 @@
+.class public final Ls0/l/a/v0;
+.super Ljava/lang/Object;
+.source "OperatorDelay.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:Ljava/util/concurrent/TimeUnit;
+
+.field public final f:Lrx/Scheduler;
+
+
+# direct methods
+.method public constructor <init>(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Ls0/l/a/v0;->d:J
+
+    iput-object p3, p0, Ls0/l/a/v0;->e:Ljava/util/concurrent/TimeUnit;
+
+    iput-object p4, p0, Ls0/l/a/v0;->f:Lrx/Scheduler;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/v0;->f:Lrx/Scheduler;
+
+    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v1, Ls0/l/a/u0;
+
+    invoke-direct {v1, p0, p1, v0, p1}, Ls0/l/a/u0;-><init>(Ls0/l/a/v0;Lrx/Subscriber;Lrx/Scheduler$Worker;Lrx/Subscriber;)V
+
+    return-object v1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/v1.smali b/com.discord/smali_classes2/s0/l/a/v1.smali
new file mode 100644
index 0000000000..16dfdf8c00
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/v1.smali
@@ -0,0 +1,105 @@
+.class public Ls0/l/a/v1;
+.super Lrx/Subscriber;
+.source "OperatorSkip.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public final synthetic e:Lrx/Subscriber;
+
+.field public final synthetic f:Ls0/l/a/w1;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/w1;Lrx/Subscriber;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/v1;->f:Ls0/l/a/w1;
+
+    iput-object p3, p0, Ls0/l/a/v1;->e:Lrx/Subscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/v1;->e:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/v1;->e:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget v0, p0, Ls0/l/a/v1;->d:I
+
+    iget-object v1, p0, Ls0/l/a/v1;->f:Ls0/l/a/w1;
+
+    iget v1, v1, Ls0/l/a/w1;->d:I
+
+    if-lt v0, v1, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/v1;->e:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Ls0/l/a/v1;->d:I
+
+    :goto_0
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/v1;->e:Lrx/Subscriber;
+
+    invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    iget-object v0, p0, Ls0/l/a/v1;->f:Ls0/l/a/w1;
+
+    iget v0, v0, Ls0/l/a/w1;->d:I
+
+    int-to-long v0, v0
+
+    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/w$a.smali b/com.discord/smali_classes2/s0/l/a/w$a.smali
new file mode 100644
index 0000000000..caed28f826
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/w$a.smali
@@ -0,0 +1,167 @@
+.class public Ls0/l/a/w$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeRedo.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/w;->call()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public final synthetic e:Ls0/l/a/w;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/w;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    iget-boolean v0, p0, Ls0/l/a/w$a;->d:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/w$a;->d:Z
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    iget-object v0, v0, Ls0/l/a/w;->e:Lrx/subjects/Subject;
+
+    sget-object v1, Ls0/f;->d:Ls0/f;
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 4
+
+    iget-boolean v0, p0, Ls0/l/a/w$a;->d:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/w$a;->d:Z
+
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    iget-object v0, v0, Ls0/l/a/w;->e:Lrx/subjects/Subject;
+
+    new-instance v1, Ls0/f;
+
+    sget-object v2, Ls0/f$a;->e:Ls0/f$a;
+
+    const/4 v3, 0x0
+
+    invoke-direct {v1, v2, v3, p1}, Ls0/f;-><init>(Ls0/f$a;Ljava/lang/Object;Ljava/lang/Throwable;)V
+
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/w$a;->d:Z
+
+    if-nez v0, :cond_2
+
+    iget-object v0, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    iget-object v0, v0, Ls0/l/a/w;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :cond_0
+    iget-object p1, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    iget-object p1, p1, Ls0/l/a/w;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    const-wide/16 v4, 0x1
+
+    cmp-long p1, v0, v2
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    iget-object p1, p1, Ls0/l/a/w;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    sub-long v2, v0, v4
+
+    invoke-virtual {p1, v0, v1, v2, v3}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    :cond_1
+    iget-object p1, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    iget-object p1, p1, Ls0/l/a/w;->f:Ls0/l/b/a;
+
+    invoke-virtual {p1, v4, v5}, Ls0/l/b/a;->b(J)V
+
+    :cond_2
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/w$a;->e:Ls0/l/a/w;
+
+    iget-object v0, v0, Ls0/l/a/w;->f:Ls0/l/b/a;
+
+    invoke-virtual {v0, p1}, Ls0/l/b/a;->c(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/w.smali b/com.discord/smali_classes2/s0/l/a/w.smali
new file mode 100644
index 0000000000..d2dda4e480
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/w.smali
@@ -0,0 +1,75 @@
+.class public Ls0/l/a/w;
+.super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+.field public final synthetic e:Lrx/subjects/Subject;
+
+.field public final synthetic f:Ls0/l/b/a;
+
+.field public final synthetic g:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final synthetic h:Lrx/subscriptions/SerialSubscription;
+
+.field public final synthetic i:Ls0/l/a/b0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/b0;Lrx/Subscriber;Lrx/subjects/Subject;Ls0/l/b/a;Ljava/util/concurrent/atomic/AtomicLong;Lrx/subscriptions/SerialSubscription;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/w;->i:Ls0/l/a/b0;
+
+    iput-object p2, p0, Ls0/l/a/w;->d:Lrx/Subscriber;
+
+    iput-object p3, p0, Ls0/l/a/w;->e:Lrx/subjects/Subject;
+
+    iput-object p4, p0, Ls0/l/a/w;->f:Ls0/l/b/a;
+
+    iput-object p5, p0, Ls0/l/a/w;->g:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iput-object p6, p0, Ls0/l/a/w;->h:Lrx/subscriptions/SerialSubscription;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/a/w;->d:Lrx/Subscriber;
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ls0/l/a/w$a;
+
+    invoke-direct {v0, p0}, Ls0/l/a/w$a;-><init>(Ls0/l/a/w;)V
+
+    iget-object v1, p0, Ls0/l/a/w;->h:Lrx/subscriptions/SerialSubscription;
+
+    invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->a(Lrx/Subscription;)V
+
+    iget-object v1, p0, Ls0/l/a/w;->i:Ls0/l/a/b0;
+
+    iget-object v1, v1, Ls0/l/a/b0;->d:Lrx/Observable;
+
+    invoke-virtual {v1, v0}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/w0.smali b/com.discord/smali_classes2/s0/l/a/w0.smali
new file mode 100644
index 0000000000..97db245957
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/w0.smali
@@ -0,0 +1,154 @@
+.class public Ls0/l/a/w0;
+.super Lrx/Subscriber;
+.source "OperatorDistinctUntilChanged.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TU;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+.field public final synthetic f:Lrx/Subscriber;
+
+.field public final synthetic g:Ls0/l/a/x0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/x0;Lrx/Subscriber;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/w0;->g:Ls0/l/a/x0;
+
+    iput-object p3, p0, Ls0/l/a/w0;->f:Lrx/Subscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/w0;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/w0;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/w0;->g:Ls0/l/a/x0;
+
+    iget-object v0, v0, Ls0/l/a/x0;->d:Ls0/k/b;
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    iget-object v1, p0, Ls0/l/a/w0;->d:Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/a/w0;->d:Ljava/lang/Object;
+
+    iget-boolean v2, p0, Ls0/l/a/w0;->e:Z
+
+    if-eqz v2, :cond_1
+
+    :try_start_1
+    iget-object v2, p0, Ls0/l/a/w0;->g:Ls0/l/a/x0;
+
+    iget-object v2, v2, Ls0/l/a/x0;->e:Lrx/functions/Func2;
+
+    invoke-interface {v2, v1, v0}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Boolean;
+
+    invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/w0;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    const-wide/16 v0, 0x1
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    iget-object v1, p0, Ls0/l/a/w0;->f:Lrx/Subscriber;
+
+    invoke-static {p1, v1, v0}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+
+    :cond_1
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/a/w0;->e:Z
+
+    iget-object v0, p0, Ls0/l/a/w0;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :goto_0
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/w0;->f:Lrx/Subscriber;
+
+    invoke-static {v0, v1, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/w1.smali b/com.discord/smali_classes2/s0/l/a/w1.smali
similarity index 87%
rename from com.discord/smali_classes2/r0/l/a/w1.smali
rename to com.discord/smali_classes2/s0/l/a/w1.smali
index 78375768f6..e2f4d01638 100644
--- a/com.discord/smali_classes2/r0/l/a/w1.smali
+++ b/com.discord/smali_classes2/s0/l/a/w1.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/w1;
+.class public final Ls0/l/a/w1;
 .super Ljava/lang/Object;
 .source "OperatorSkip.java"
 
@@ -31,7 +31,7 @@
 
     if-ltz p1, :cond_0
 
-    iput p1, p0, Lr0/l/a/w1;->d:I
+    iput p1, p0, Ls0/l/a/w1;->d:I
 
     return-void
 
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    new-instance v0, Lr0/l/a/v1;
+    new-instance v0, Ls0/l/a/v1;
 
-    invoke-direct {v0, p0, p1, p1}, Lr0/l/a/v1;-><init>(Lr0/l/a/w1;Lrx/Subscriber;Lrx/Subscriber;)V
+    invoke-direct {v0, p0, p1, p1}, Ls0/l/a/v1;-><init>(Ls0/l/a/w1;Lrx/Subscriber;Lrx/Subscriber;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/s0/l/a/x.smali b/com.discord/smali_classes2/s0/l/a/x.smali
new file mode 100644
index 0000000000..77f34f7d82
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/x.smali
@@ -0,0 +1,141 @@
+.class public Ls0/l/a/x;
+.super Lrx/Subscriber;
+.source "OnSubscribeRedo.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "Ls0/f<",
+        "*>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+.field public final synthetic e:Ls0/l/a/y;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/y;Lrx/Subscriber;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/x;->e:Ls0/l/a/y;
+
+    iput-object p3, p0, Ls0/l/a/x;->d:Lrx/Subscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/x;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/x;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 4
+
+    check-cast p1, Ls0/f;
+
+    iget-object v0, p1, Ls0/f;->a:Ls0/f$a;
+
+    sget-object v1, Ls0/f$a;->f:Ls0/f$a;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/a/x;->e:Ls0/l/a/y;
+
+    iget-object v0, v0, Ls0/l/a/y;->d:Ls0/l/a/b0;
+
+    iget-boolean v0, v0, Ls0/l/a/b0;->f:Z
+
+    if-eqz v0, :cond_1
+
+    iget-object p1, p0, Ls0/l/a/x;->d:Lrx/Subscriber;
+
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    goto :goto_1
+
+    :cond_1
+    iget-object v0, p1, Ls0/f;->a:Ls0/f$a;
+
+    sget-object v1, Ls0/f$a;->e:Ls0/f$a;
+
+    if-ne v0, v1, :cond_2
+
+    const/4 v2, 0x1
+
+    :cond_2
+    if-eqz v2, :cond_3
+
+    iget-object v0, p0, Ls0/l/a/x;->e:Ls0/l/a/y;
+
+    iget-object v0, v0, Ls0/l/a/y;->d:Ls0/l/a/b0;
+
+    iget-boolean v0, v0, Ls0/l/a/b0;->g:Z
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, p0, Ls0/l/a/x;->d:Lrx/Subscriber;
+
+    iget-object p1, p1, Ls0/f;->b:Ljava/lang/Throwable;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_1
+
+    :cond_3
+    iget-object v0, p0, Ls0/l/a/x;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    :goto_1
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/x0$a.smali b/com.discord/smali_classes2/s0/l/a/x0$a.smali
new file mode 100644
index 0000000000..f03f798fac
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/x0$a.smali
@@ -0,0 +1,41 @@
+.class public final Ls0/l/a/x0$a;
+.super Ljava/lang/Object;
+.source "OperatorDistinctUntilChanged.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/a/x0;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/a/x0;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/a/x0<",
+            "**>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ls0/l/a/x0;
+
+    sget-object v1, Ls0/l/e/l;->d:Ls0/l/e/l;
+
+    invoke-direct {v0, v1}, Ls0/l/a/x0;-><init>(Ls0/k/b;)V
+
+    sput-object v0, Ls0/l/a/x0$a;->a:Ls0/l/a/x0;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/x0.smali b/com.discord/smali_classes2/s0/l/a/x0.smali
new file mode 100644
index 0000000000..4253edfb5e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/x0.smali
@@ -0,0 +1,144 @@
+.class public final Ls0/l/a/x0;
+.super Ljava/lang/Object;
+.source "OperatorDistinctUntilChanged.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/a/x0$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        "U:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;",
+        "Lrx/functions/Func2<",
+        "TU;TU;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-TT;+TU;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/functions/Func2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Func2<",
+            "-TU;-TU;",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Func2;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Func2<",
+            "-TU;-TU;",
+            "Ljava/lang/Boolean;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Ls0/l/e/l;->d:Ls0/l/e/l;
+
+    iput-object v0, p0, Ls0/l/a/x0;->d:Ls0/k/b;
+
+    iput-object p1, p0, Ls0/l/a/x0;->e:Lrx/functions/Func2;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/k/b<",
+            "-TT;+TU;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/x0;->d:Ls0/k/b;
+
+    iput-object p0, p0, Ls0/l/a/x0;->e:Lrx/functions/Func2;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/w0;
+
+    invoke-direct {v0, p0, p1, p1}, Ls0/l/a/w0;-><init>(Ls0/l/a/x0;Lrx/Subscriber;Lrx/Subscriber;)V
+
+    return-object v0
+.end method
+
+.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    if-eq p1, p2, :cond_1
+
+    if-eqz p1, :cond_0
+
+    invoke-virtual {p1, p2}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    :goto_1
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/x1.smali b/com.discord/smali_classes2/s0/l/a/x1.smali
new file mode 100644
index 0000000000..00190ea55e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/x1.smali
@@ -0,0 +1,138 @@
+.class public Ls0/l/a/x1;
+.super Lrx/Subscriber;
+.source "OperatorSkipWhile.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:Z
+
+.field public e:I
+
+.field public final synthetic f:Lrx/Subscriber;
+
+.field public final synthetic g:Ls0/l/a/z1;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/z1;Lrx/Subscriber;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/x1;->g:Ls0/l/a/z1;
+
+    iput-object p3, p0, Ls0/l/a/x1;->f:Lrx/Subscriber;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, p0, Ls0/l/a/x1;->d:Z
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/x1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/x1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/l/a/x1;->d:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/a/x1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_0
+    iget-object v0, p0, Ls0/l/a/x1;->g:Ls0/l/a/z1;
+
+    iget-object v0, v0, Ls0/l/a/z1;->d:Lrx/functions/Func2;
+
+    iget v1, p0, Ls0/l/a/x1;->e:I
+
+    add-int/lit8 v2, v1, 0x1
+
+    iput v2, p0, Ls0/l/a/x1;->e:I
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-interface {v0, p1, v1}, Lrx/functions/Func2;->call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_1
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Ls0/l/a/x1;->d:Z
+
+    iget-object v0, p0, Ls0/l/a/x1;->f:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_1
+    const-wide/16 v0, 0x1
+
+    invoke-virtual {p0, v0, v1}, Lrx/Subscriber;->request(J)V
+
+    :goto_0
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/a/x1;->f:Lrx/Subscriber;
+
+    invoke-static {v0, v1, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/y.smali b/com.discord/smali_classes2/s0/l/a/y.smali
new file mode 100644
index 0000000000..c48a0f1c83
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/y.smali
@@ -0,0 +1,49 @@
+.class public Ls0/l/a/y;
+.super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "Ls0/f<",
+        "*>;",
+        "Ls0/f<",
+        "*>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/b0;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/b0;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/y;->d:Ls0/l/a/b0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/a/x;
+
+    invoke-direct {v0, p0, p1, p1}, Ls0/l/a/x;-><init>(Ls0/l/a/y;Lrx/Subscriber;Lrx/Subscriber;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/y0.smali b/com.discord/smali_classes2/s0/l/a/y0.smali
new file mode 100644
index 0000000000..2004f8fe95
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/y0.smali
@@ -0,0 +1,53 @@
+.class public Ls0/l/a/y0;
+.super Ljava/lang/Object;
+.source "OperatorDoOnSubscribe.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action0;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action0;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/y0;->d:Lrx/functions/Action0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/y0;->d:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    new-instance v0, Ls0/n/e;
+
+    invoke-direct {v0, p1, p1}, Ls0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/y1.smali b/com.discord/smali_classes2/s0/l/a/y1.smali
new file mode 100644
index 0000000000..188c4324a2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/y1.smali
@@ -0,0 +1,53 @@
+.class public final Ls0/l/a/y1;
+.super Ljava/lang/Object;
+.source "OperatorSkipWhile.java"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func2<",
+        "TT;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/k/b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/y1;->d:Ls0/k/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p2, Ljava/lang/Integer;
+
+    iget-object p2, p0, Ls0/l/a/y1;->d:Ls0/k/b;
+
+    invoke-interface {p2, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/z$a.smali b/com.discord/smali_classes2/s0/l/a/z$a.smali
new file mode 100644
index 0000000000..7804b8ae18
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/z$a.smali
@@ -0,0 +1,127 @@
+.class public Ls0/l/a/z$a;
+.super Lrx/Subscriber;
+.source "OnSubscribeRedo.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/a/z;->call()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/a/z;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/z;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/a/z$a;->d:Ls0/l/a/z;
+
+    invoke-direct {p0, p2}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/z$a;->d:Ls0/l/a/z;
+
+    iget-object v0, v0, Ls0/l/a/z;->e:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/a/z$a;->d:Ls0/l/a/z;
+
+    iget-object v0, v0, Ls0/l/a/z;->e:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 4
+
+    iget-object p1, p0, Ls0/l/a/z$a;->d:Ls0/l/a/z;
+
+    iget-object p1, p1, Ls0/l/a/z;->e:Lrx/Subscriber;
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    iget-object p1, p0, Ls0/l/a/z$a;->d:Ls0/l/a/z;
+
+    iget-object p1, p1, Ls0/l/a/z;->f:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    const-wide/16 v2, 0x0
+
+    cmp-long p1, v0, v2
+
+    if-lez p1, :cond_0
+
+    iget-object p1, p0, Ls0/l/a/z$a;->d:Ls0/l/a/z;
+
+    iget-object v0, p1, Ls0/l/a/z;->g:Lrx/Scheduler$Worker;
+
+    iget-object p1, p1, Ls0/l/a/z;->h:Lrx/functions/Action0;
+
+    invoke-virtual {v0, p1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Ls0/l/a/z$a;->d:Ls0/l/a/z;
+
+    iget-object p1, p1, Ls0/l/a/z;->i:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public setProducer(Lrx/Producer;)V
+    .locals 2
+
+    const-wide v0, 0x7fffffffffffffffL
+
+    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/z.smali b/com.discord/smali_classes2/s0/l/a/z.smali
new file mode 100644
index 0000000000..e85cf01024
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/z.smali
@@ -0,0 +1,60 @@
+.class public Ls0/l/a/z;
+.super Ljava/lang/Object;
+.source "OnSubscribeRedo.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Lrx/Observable;
+
+.field public final synthetic e:Lrx/Subscriber;
+
+.field public final synthetic f:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final synthetic g:Lrx/Scheduler$Worker;
+
+.field public final synthetic h:Lrx/functions/Action0;
+
+.field public final synthetic i:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/a/b0;Lrx/Observable;Lrx/Subscriber;Ljava/util/concurrent/atomic/AtomicLong;Lrx/Scheduler$Worker;Lrx/functions/Action0;Ljava/util/concurrent/atomic/AtomicBoolean;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/a/z;->d:Lrx/Observable;
+
+    iput-object p3, p0, Ls0/l/a/z;->e:Lrx/Subscriber;
+
+    iput-object p4, p0, Ls0/l/a/z;->f:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iput-object p5, p0, Ls0/l/a/z;->g:Lrx/Scheduler$Worker;
+
+    iput-object p6, p0, Ls0/l/a/z;->h:Lrx/functions/Action0;
+
+    iput-object p7, p0, Ls0/l/a/z;->i:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/a/z;->d:Lrx/Observable;
+
+    new-instance v1, Ls0/l/a/z$a;
+
+    iget-object v2, p0, Ls0/l/a/z;->e:Lrx/Subscriber;
+
+    invoke-direct {v1, p0, v2}, Ls0/l/a/z$a;-><init>(Ls0/l/a/z;Lrx/Subscriber;)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/a/z0.smali b/com.discord/smali_classes2/s0/l/a/z0.smali
new file mode 100644
index 0000000000..dc7cd09fcd
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/a/z0.smali
@@ -0,0 +1,57 @@
+.class public Ls0/l/a/z0;
+.super Ljava/lang/Object;
+.source "OperatorDoOnUnsubscribe.java"
+
+# interfaces
+.implements Lrx/Observable$b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$b<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action0;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action0;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/a/z0;->d:Lrx/functions/Action0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/a/z0;->d:Lrx/functions/Action0;
+
+    new-instance v1, Ls0/r/a;
+
+    invoke-direct {v1, v0}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    new-instance v0, Ls0/n/e;
+
+    invoke-direct {v0, p1, p1}, Ls0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/r0/l/a/z1.smali b/com.discord/smali_classes2/s0/l/a/z1.smali
similarity index 87%
rename from com.discord/smali_classes2/r0/l/a/z1.smali
rename to com.discord/smali_classes2/s0/l/a/z1.smali
index 441dac8b96..20df1a23f1 100644
--- a/com.discord/smali_classes2/r0/l/a/z1.smali
+++ b/com.discord/smali_classes2/s0/l/a/z1.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/a/z1;
+.class public final Ls0/l/a/z1;
 .super Ljava/lang/Object;
 .source "OperatorSkipWhile.java"
 
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lr0/l/a/z1;->d:Lrx/functions/Func2;
+    iput-object p1, p0, Ls0/l/a/z1;->d:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    new-instance v0, Lr0/l/a/x1;
+    new-instance v0, Ls0/l/a/x1;
 
-    invoke-direct {v0, p0, p1, p1}, Lr0/l/a/x1;-><init>(Lr0/l/a/z1;Lrx/Subscriber;Lrx/Subscriber;)V
+    invoke-direct {v0, p0, p1, p1}, Ls0/l/a/x1;-><init>(Ls0/l/a/z1;Lrx/Subscriber;Lrx/Subscriber;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/s0/l/b/a$a.smali b/com.discord/smali_classes2/s0/l/b/a$a.smali
new file mode 100644
index 0000000000..0cf5bce6be
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/b/a$a.smali
@@ -0,0 +1,35 @@
+.class public final Ls0/l/b/a$a;
+.super Ljava/lang/Object;
+.source "ProducerArbiter.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/b/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/b/a.smali b/com.discord/smali_classes2/s0/l/b/a.smali
new file mode 100644
index 0000000000..38ca16e481
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/b/a.smali
@@ -0,0 +1,495 @@
+.class public final Ls0/l/b/a;
+.super Ljava/lang/Object;
+.source "ProducerArbiter.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# static fields
+.field public static final j:Lrx/Producer;
+
+
+# instance fields
+.field public d:J
+
+.field public e:Lrx/Producer;
+
+.field public f:Z
+
+.field public g:J
+
+.field public h:J
+
+.field public i:Lrx/Producer;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/b/a$a;
+
+    invoke-direct {v0}, Ls0/l/b/a$a;-><init>()V
+
+    sput-object v0, Ls0/l/b/a;->j:Lrx/Producer;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 14
+
+    :cond_0
+    :goto_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-wide v0, p0, Ls0/l/b/a;->g:J
+
+    iget-wide v2, p0, Ls0/l/b/a;->h:J
+
+    iget-object v4, p0, Ls0/l/b/a;->i:Lrx/Producer;
+
+    const-wide/16 v5, 0x0
+
+    cmp-long v7, v0, v5
+
+    if-nez v7, :cond_1
+
+    cmp-long v8, v2, v5
+
+    if-nez v8, :cond_1
+
+    if-nez v4, :cond_1
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Ls0/l/b/a;->f:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    iput-wide v5, p0, Ls0/l/b/a;->g:J
+
+    iput-wide v5, p0, Ls0/l/b/a;->h:J
+
+    const/4 v8, 0x0
+
+    iput-object v8, p0, Ls0/l/b/a;->i:Lrx/Producer;
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-wide v9, p0, Ls0/l/b/a;->d:J
+
+    const-wide v11, 0x7fffffffffffffffL
+
+    cmp-long v13, v9, v11
+
+    if-eqz v13, :cond_5
+
+    add-long/2addr v9, v0
+
+    cmp-long v13, v9, v5
+
+    if-ltz v13, :cond_4
+
+    cmp-long v13, v9, v11
+
+    if-nez v13, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    sub-long/2addr v9, v2
+
+    cmp-long v2, v9, v5
+
+    if-ltz v2, :cond_3
+
+    iput-wide v9, p0, Ls0/l/b/a;->d:J
+
+    goto :goto_2
+
+    :cond_3
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "more produced than requested"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_4
+    :goto_1
+    iput-wide v11, p0, Ls0/l/b/a;->d:J
+
+    move-wide v9, v11
+
+    :cond_5
+    :goto_2
+    if-eqz v4, :cond_7
+
+    sget-object v0, Ls0/l/b/a;->j:Lrx/Producer;
+
+    if-ne v4, v0, :cond_6
+
+    iput-object v8, p0, Ls0/l/b/a;->e:Lrx/Producer;
+
+    goto :goto_0
+
+    :cond_6
+    iput-object v4, p0, Ls0/l/b/a;->e:Lrx/Producer;
+
+    invoke-interface {v4, v9, v10}, Lrx/Producer;->m(J)V
+
+    goto :goto_0
+
+    :cond_7
+    iget-object v2, p0, Ls0/l/b/a;->e:Lrx/Producer;
+
+    if-eqz v2, :cond_0
+
+    if-eqz v7, :cond_0
+
+    invoke-interface {v2, v0, v1}, Lrx/Producer;->m(J)V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v0
+.end method
+
+.method public b(J)V
+    .locals 7
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_3
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v2, p0, Ls0/l/b/a;->f:Z
+
+    if-eqz v2, :cond_0
+
+    iget-wide v0, p0, Ls0/l/b/a;->h:J
+
+    add-long/2addr v0, p1
+
+    iput-wide v0, p0, Ls0/l/b/a;->h:J
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v2, 0x1
+
+    iput-boolean v2, p0, Ls0/l/b/a;->f:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :try_start_1
+    iget-wide v2, p0, Ls0/l/b/a;->d:J
+
+    const-wide v4, 0x7fffffffffffffffL
+
+    cmp-long v6, v2, v4
+
+    if-eqz v6, :cond_2
+
+    sub-long/2addr v2, p1
+
+    cmp-long p1, v2, v0
+
+    if-ltz p1, :cond_1
+
+    iput-wide v2, p0, Ls0/l/b/a;->d:J
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string p2, "more items arrived than were requested"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_2
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/b/a;->a()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-enter p0
+
+    const/4 p2, 0x0
+
+    :try_start_2
+    iput-boolean p2, p0, Ls0/l/b/a;->f:Z
+
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_3
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    throw p1
+
+    :catchall_2
+    move-exception p1
+
+    :try_start_4
+    monitor-exit p0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "n > 0 required"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public c(Lrx/Producer;)V
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/l/b/a;->f:Z
+
+    if-eqz v0, :cond_1
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/b/a;->j:Lrx/Producer;
+
+    :cond_0
+    iput-object p1, p0, Ls0/l/b/a;->i:Lrx/Producer;
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/b/a;->f:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :try_start_1
+    iput-object p1, p0, Ls0/l/b/a;->e:Lrx/Producer;
+
+    if-eqz p1, :cond_2
+
+    iget-wide v0, p0, Ls0/l/b/a;->d:J
+
+    invoke-interface {p1, v0, v1}, Lrx/Producer;->m(J)V
+
+    :cond_2
+    invoke-virtual {p0}, Ls0/l/b/a;->a()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-enter p0
+
+    const/4 v0, 0x0
+
+    :try_start_2
+    iput-boolean v0, p0, Ls0/l/b/a;->f:Z
+
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_3
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    throw p1
+
+    :catchall_2
+    move-exception p1
+
+    :try_start_4
+    monitor-exit p0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    throw p1
+.end method
+
+.method public m(J)V
+    .locals 5
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_4
+
+    if-nez v2, :cond_0
+
+    return-void
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v2, p0, Ls0/l/b/a;->f:Z
+
+    if-eqz v2, :cond_1
+
+    iget-wide v0, p0, Ls0/l/b/a;->g:J
+
+    add-long/2addr v0, p1
+
+    iput-wide v0, p0, Ls0/l/b/a;->g:J
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    const/4 v2, 0x1
+
+    iput-boolean v2, p0, Ls0/l/b/a;->f:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_2
+
+    :try_start_1
+    iget-wide v2, p0, Ls0/l/b/a;->d:J
+
+    add-long/2addr v2, p1
+
+    cmp-long v4, v2, v0
+
+    if-gez v4, :cond_2
+
+    const-wide v2, 0x7fffffffffffffffL
+
+    :cond_2
+    iput-wide v2, p0, Ls0/l/b/a;->d:J
+
+    iget-object v0, p0, Ls0/l/b/a;->e:Lrx/Producer;
+
+    if-eqz v0, :cond_3
+
+    invoke-interface {v0, p1, p2}, Lrx/Producer;->m(J)V
+
+    :cond_3
+    invoke-virtual {p0}, Ls0/l/b/a;->a()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-enter p0
+
+    const/4 p2, 0x0
+
+    :try_start_2
+    iput-boolean p2, p0, Ls0/l/b/a;->f:Z
+
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    throw p1
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_3
+    monitor-exit p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    throw p1
+
+    :catchall_2
+    move-exception p1
+
+    :try_start_4
+    monitor-exit p0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    throw p1
+
+    :cond_4
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "n >= 0 required"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/b/b.smali b/com.discord/smali_classes2/s0/l/b/b.smali
new file mode 100644
index 0000000000..9ff844f4ec
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/b/b.smali
@@ -0,0 +1,224 @@
+.class public final Ls0/l/b/b;
+.super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "SingleDelayedProducer.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicInteger;",
+        "Lrx/Producer;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = -0x27e09bdfa51658b2L
+
+
+# instance fields
+.field public final child:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public value:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/b/b;->child:Lrx/Subscriber;
+
+    return-void
+.end method
+
+.method public static a(Lrx/Subscriber;Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/Subscriber<",
+            "-TT;>;TT;)V"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    :try_start_0
+    invoke-interface {p0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-interface {p0}, Ls0/g;->onCompleted()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0, p0, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public b(Ljava/lang/Object;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    :goto_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iput-object p1, p0, Ls0/l/b/b;->value:Ljava/lang/Object;
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x2
+
+    if-ne v0, v1, :cond_1
+
+    const/4 v0, 0x3
+
+    invoke-virtual {p0, v1, v0}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/b/b;->child:Lrx/Subscriber;
+
+    invoke-static {v0, p1}, Ls0/l/b/b;->a(Lrx/Subscriber;Ljava/lang/Object;)V
+
+    :cond_1
+    return-void
+.end method
+
+.method public m(J)V
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_3
+
+    if-nez v2, :cond_0
+
+    return-void
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    const/4 p1, 0x0
+
+    const/4 p2, 0x2
+
+    invoke-virtual {p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result p1
+
+    if-nez p1, :cond_2
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p2, 0x1
+
+    if-ne p1, p2, :cond_2
+
+    const/4 p1, 0x3
+
+    invoke-virtual {p0, p2, p1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p0, Ls0/l/b/b;->child:Lrx/Subscriber;
+
+    iget-object p2, p0, Ls0/l/b/b;->value:Ljava/lang/Object;
+
+    invoke-static {p1, p2}, Ls0/l/b/b;->a(Lrx/Subscriber;Ljava/lang/Object;)V
+
+    :cond_2
+    return-void
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "n >= 0 required"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/b/c.smali b/com.discord/smali_classes2/s0/l/b/c.smali
new file mode 100644
index 0000000000..69b547b62a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/b/c.smali
@@ -0,0 +1,138 @@
+.class public final Ls0/l/b/c;
+.super Ljava/util/concurrent/atomic/AtomicBoolean;
+.source "SingleProducer.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicBoolean;",
+        "Lrx/Producer;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = -0x2e8a53b866dafe2cL
+
+
+# instance fields
+.field public final child:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final value:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;TT;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
+
+    iput-object p1, p0, Ls0/l/b/c;->child:Lrx/Subscriber;
+
+    iput-object p2, p0, Ls0/l/b/c;->value:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public m(J)V
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-ltz v2, :cond_4
+
+    if-nez v2, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 p1, 0x0
+
+    const/4 p2, 0x1
+
+    invoke-virtual {p0, p1, p2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    iget-object p1, p0, Ls0/l/b/c;->child:Lrx/Subscriber;
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object p2, p0, Ls0/l/b/c;->value:Ljava/lang/Object;
+
+    :try_start_0
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_2
+
+    return-void
+
+    :cond_2
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    :cond_3
+    :goto_0
+    return-void
+
+    :cond_4
+    new-instance p1, Ljava/lang/IllegalArgumentException;
+
+    const-string p2, "n >= 0 required"
+
+    invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/a$a$a.smali b/com.discord/smali_classes2/s0/l/c/a$a$a.smali
new file mode 100644
index 0000000000..10d5936230
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/a$a$a.smali
@@ -0,0 +1,67 @@
+.class public Ls0/l/c/a$a$a;
+.super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
+
+# interfaces
+.implements Ljava/util/concurrent/ThreadFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/concurrent/ThreadFactory;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/a$a;Ljava/util/concurrent/ThreadFactory;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/c/a$a$a;->d:Ljava/util/concurrent/ThreadFactory;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/c/a$a$a;->d:Ljava/util/concurrent/ThreadFactory;
+
+    invoke-interface {v0, p1}, Ljava/util/concurrent/ThreadFactory;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+
+    move-result-object p1
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {p1}, Ljava/lang/Thread;->getName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, " (Evictor)"
+
+    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
+
+    invoke-virtual {p1, v0}, Ljava/lang/Thread;->setName(Ljava/lang/String;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/a$a$b.smali b/com.discord/smali_classes2/s0/l/c/a$a$b.smali
new file mode 100644
index 0000000000..f12fa7f9e8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/a$a$b.smali
@@ -0,0 +1,96 @@
+.class public Ls0/l/c/a$a$b;
+.super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/c/a$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/a$a;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/c/a$a$b;->d:Ls0/l/c/a$a;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 8
+
+    iget-object v0, p0, Ls0/l/c/a$a$b;->d:Ls0/l/c/a$a;
+
+    iget-object v1, v0, Ls0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v1
+
+    iget-object v3, v0, Ls0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v3}, Ljava/util/concurrent/ConcurrentLinkedQueue;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :cond_0
+    :goto_0
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_1
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ls0/l/c/a$c;
+
+    iget-wide v5, v4, Ls0/l/c/a$c;->l:J
+
+    cmp-long v7, v5, v1
+
+    if-gtz v7, :cond_1
+
+    iget-object v5, v0, Ls0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v5, v4}, Ljava/util/concurrent/ConcurrentLinkedQueue;->remove(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    iget-object v5, v0, Ls0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v5, v4}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/a$a.smali b/com.discord/smali_classes2/s0/l/c/a$a.smali
new file mode 100644
index 0000000000..f67403d32c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/a$a.smali
@@ -0,0 +1,167 @@
+.class public final Ls0/l/c/a$a;
+.super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/ThreadFactory;
+
+.field public final b:J
+
+.field public final c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
+            "Ls0/l/c/a$c;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final d:Lrx/subscriptions/CompositeSubscription;
+
+.field public final e:Ljava/util/concurrent/ScheduledExecutorService;
+
+.field public final f:Ljava/util/concurrent/Future;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/Future<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
+    .locals 7
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/a$a;->a:Ljava/util/concurrent/ThreadFactory;
+
+    if-eqz p4, :cond_0
+
+    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide p2
+
+    goto :goto_0
+
+    :cond_0
+    const-wide/16 p2, 0x0
+
+    :goto_0
+    iput-wide p2, p0, Ls0/l/c/a$a;->b:J
+
+    new-instance p2, Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-direct {p2}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
+
+    iput-object p2, p0, Ls0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    new-instance p2, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {p2}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object p2, p0, Ls0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
+
+    const/4 p2, 0x0
+
+    if-eqz p4, :cond_1
+
+    const/4 p2, 0x1
+
+    new-instance p3, Ls0/l/c/a$a$a;
+
+    invoke-direct {p3, p0, p1}, Ls0/l/c/a$a$a;-><init>(Ls0/l/c/a$a;Ljava/util/concurrent/ThreadFactory;)V
+
+    invoke-static {p2, p3}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ls0/l/c/g;->g(Ljava/util/concurrent/ScheduledExecutorService;)Z
+
+    new-instance v1, Ls0/l/c/a$a$b;
+
+    invoke-direct {v1, p0}, Ls0/l/c/a$a$b;-><init>(Ls0/l/c/a$a;)V
+
+    iget-wide v4, p0, Ls0/l/c/a$a;->b:J
+
+    sget-object v6, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
+
+    move-object v0, p2
+
+    move-wide v2, v4
+
+    invoke-interface/range {v0 .. v6}, Ljava/util/concurrent/ScheduledExecutorService;->scheduleWithFixedDelay(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    move-result-object p1
+
+    goto :goto_1
+
+    :cond_1
+    move-object p1, p2
+
+    :goto_1
+    iput-object p2, p0, Ls0/l/c/a$a;->e:Ljava/util/concurrent/ScheduledExecutorService;
+
+    iput-object p1, p0, Ls0/l/c/a$a;->f:Ljava/util/concurrent/Future;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/c/a$a;->f:Ljava/util/concurrent/Future;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/c/a$a;->f:Ljava/util/concurrent/Future;
+
+    const/4 v1, 0x1
+
+    invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/a$a;->e:Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/c/a$a;->e:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_1
+    iget-object v0, p0, Ls0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v1}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/a$b$a.smali b/com.discord/smali_classes2/s0/l/c/a$b$a.smali
new file mode 100644
index 0000000000..9f09e8c941
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/a$b$a.smali
@@ -0,0 +1,60 @@
+.class public Ls0/l/c/a$b$a;
+.super Ljava/lang/Object;
+.source "CachedThreadScheduler.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/a$b;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/functions/Action0;
+
+.field public final synthetic e:Ls0/l/c/a$b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/a$b;Lrx/functions/Action0;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/c/a$b$a;->e:Ls0/l/c/a$b;
+
+    iput-object p2, p0, Ls0/l/c/a$b$a;->d:Lrx/functions/Action0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/a$b$a;->e:Ls0/l/c/a$b;
+
+    iget-object v0, v0, Ls0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/a$b$a;->d:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/a$b.smali b/com.discord/smali_classes2/s0/l/c/a$b.smali
new file mode 100644
index 0000000000..aec655e001
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/a$b.smali
@@ -0,0 +1,224 @@
+.class public final Ls0/l/c/a$b;
+.super Lrx/Scheduler$Worker;
+.source "CachedThreadScheduler.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/subscriptions/CompositeSubscription;
+
+.field public final e:Ls0/l/c/a$a;
+
+.field public final f:Ls0/l/c/a$c;
+
+.field public final g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/a$a;)V
+    .locals 2
+
+    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
+
+    new-instance v0, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
+
+    iput-object p1, p0, Ls0/l/c/a$b;->e:Ls0/l/c/a$a;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/a$b;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    iget-object v0, p1, Ls0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/l/c/a;->e:Ls0/l/c/a$c;
+
+    goto :goto_1
+
+    :cond_0
+    iget-object v0, p1, Ls0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p1, Ls0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/c/a$c;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ls0/l/c/a$c;
+
+    iget-object v1, p1, Ls0/l/c/a$a;->a:Ljava/util/concurrent/ThreadFactory;
+
+    invoke-direct {v0, v1}, Ls0/l/c/a$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    iget-object p1, p1, Ls0/l/c/a$a;->d:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    :goto_0
+    move-object p1, v0
+
+    :goto_1
+    iput-object p1, p0, Ls0/l/c/a$b;->f:Ls0/l/c/a$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lrx/functions/Action0;)Lrx/Subscription;
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p0, p1, v0, v1, v2}, Ls0/l/c/a$b;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/a$b;->f:Ls0/l/c/a$c;
+
+    new-instance v1, Ls0/l/c/a$b$a;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/c/a$b$a;-><init>(Ls0/l/c/a$b;Lrx/functions/Action0;)V
+
+    invoke-virtual {v0, v1, p2, p3, p4}, Ls0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Ls0/l/c/i;
+
+    move-result-object p1
+
+    iget-object p2, p0, Ls0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {p2, p1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    iget-object p2, p0, Ls0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
+
+    iget-object p3, p1, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    new-instance p4, Ls0/l/c/i$c;
+
+    invoke-direct {p4, p1, p2}, Ls0/l/c/i$c;-><init>(Ls0/l/c/i;Lrx/subscriptions/CompositeSubscription;)V
+
+    invoke-virtual {p3, p4}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
+
+    return-object p1
+.end method
+
+.method public call()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/c/a$b;->e:Ls0/l/c/a$a;
+
+    iget-object v1, p0, Ls0/l/c/a$b;->f:Ls0/l/c/a$c;
+
+    if-eqz v0, :cond_0
+
+    invoke-static {}, Ljava/lang/System;->nanoTime()J
+
+    move-result-wide v2
+
+    iget-wide v4, v0, Ls0/l/c/a$a;->b:J
+
+    add-long/2addr v2, v4
+
+    iput-wide v2, v1, Ls0/l/c/a$c;->l:J
+
+    iget-object v0, v0, Ls0/l/c/a$a;->c:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/c/a$b;->g:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/c/a$b;->f:Ls0/l/c/a$c;
+
+    invoke-virtual {v0, p0}, Ls0/l/c/g;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/a$b;->d:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/a$c.smali b/com.discord/smali_classes2/s0/l/c/a$c.smali
new file mode 100644
index 0000000000..f92b0d88e4
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/a$c.smali
@@ -0,0 +1,32 @@
+.class public final Ls0/l/c/a$c;
+.super Ls0/l/c/g;
+.source "CachedThreadScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# instance fields
+.field public l:J
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
+    .locals 2
+
+    invoke-direct {p0, p1}, Ls0/l/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    const-wide/16 v0, 0x0
+
+    iput-wide v0, p0, Ls0/l/c/a$c;->l:J
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/a.smali b/com.discord/smali_classes2/s0/l/c/a.smali
new file mode 100644
index 0000000000..137db36445
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/a.smali
@@ -0,0 +1,183 @@
+.class public final Ls0/l/c/a;
+.super Lrx/Scheduler;
+.source "CachedThreadScheduler.java"
+
+# interfaces
+.implements Ls0/l/c/j;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/c/a$c;,
+        Ls0/l/c/a$b;,
+        Ls0/l/c/a$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:J
+
+.field public static final d:Ljava/util/concurrent/TimeUnit;
+
+.field public static final e:Ls0/l/c/a$c;
+
+.field public static final f:Ls0/l/c/a$a;
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/ThreadFactory;
+
+.field public final b:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/c/a$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+
+    sput-object v0, Ls0/l/c/a;->d:Ljava/util/concurrent/TimeUnit;
+
+    new-instance v0, Ls0/l/c/a$c;
+
+    sget-object v1, Ls0/l/e/i;->d:Ljava/util/concurrent/ThreadFactory;
+
+    invoke-direct {v0, v1}, Ls0/l/c/a$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    sput-object v0, Ls0/l/c/a;->e:Ls0/l/c/a$c;
+
+    invoke-virtual {v0}, Ls0/l/c/g;->unsubscribe()V
+
+    new-instance v0, Ls0/l/c/a$a;
+
+    const/4 v1, 0x0
+
+    const-wide/16 v2, 0x0
+
+    invoke-direct {v0, v1, v2, v3, v1}, Ls0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
+
+    sput-object v0, Ls0/l/c/a;->f:Ls0/l/c/a$a;
+
+    invoke-virtual {v0}, Ls0/l/c/a$a;->a()V
+
+    const-string v0, "rx.io-scheduler.keepalive"
+
+    const/16 v1, 0x3c
+
+    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    int-to-long v0, v0
+
+    sput-wide v0, Ls0/l/c/a;->c:J
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
+    .locals 4
+
+    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/a;->a:Ljava/util/concurrent/ThreadFactory;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v0, Ls0/l/c/a;->f:Ls0/l/c/a$a;
+
+    invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object p1, p0, Ls0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance p1, Ls0/l/c/a$a;
+
+    iget-object v0, p0, Ls0/l/c/a;->a:Ljava/util/concurrent/ThreadFactory;
+
+    sget-wide v1, Ls0/l/c/a;->c:J
+
+    sget-object v3, Ls0/l/c/a;->d:Ljava/util/concurrent/TimeUnit;
+
+    invoke-direct {p1, v0, v1, v2, v3}, Ls0/l/c/a$a;-><init>(Ljava/util/concurrent/ThreadFactory;JLjava/util/concurrent/TimeUnit;)V
+
+    iget-object v0, p0, Ls0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/c/a;->f:Ls0/l/c/a$a;
+
+    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p1}, Ls0/l/c/a$a;->a()V
+
+    :cond_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lrx/Scheduler$Worker;
+    .locals 2
+
+    new-instance v0, Ls0/l/c/a$b;
+
+    iget-object v1, p0, Ls0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ls0/l/c/a$a;
+
+    invoke-direct {v0, v1}, Ls0/l/c/a$b;-><init>(Ls0/l/c/a$a;)V
+
+    return-object v0
+.end method
+
+.method public shutdown()V
+    .locals 3
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/c/a$a;
+
+    sget-object v1, Ls0/l/c/a;->f:Ls0/l/c/a$a;
+
+    if-ne v0, v1, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v2, p0, Ls0/l/c/a;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v0}, Ls0/l/c/a$a;->a()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/b$a$a.smali b/com.discord/smali_classes2/s0/l/c/b$a$a.smali
new file mode 100644
index 0000000000..5e42f5e0fc
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/b$a$a.smali
@@ -0,0 +1,60 @@
+.class public Ls0/l/c/b$a$a;
+.super Ljava/lang/Object;
+.source "EventLoopsScheduler.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/b$a;->a(Lrx/functions/Action0;)Lrx/Subscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/functions/Action0;
+
+.field public final synthetic e:Ls0/l/c/b$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/b$a;Lrx/functions/Action0;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/c/b$a$a;->e:Ls0/l/c/b$a;
+
+    iput-object p2, p0, Ls0/l/c/b$a$a;->d:Lrx/functions/Action0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/b$a$a;->e:Ls0/l/c/b$a;
+
+    iget-object v0, v0, Ls0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/b$a$a;->d:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/b$a$b.smali b/com.discord/smali_classes2/s0/l/c/b$a$b.smali
new file mode 100644
index 0000000000..8113f26d26
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/b$a$b.smali
@@ -0,0 +1,60 @@
+.class public Ls0/l/c/b$a$b;
+.super Ljava/lang/Object;
+.source "EventLoopsScheduler.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/b$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/functions/Action0;
+
+.field public final synthetic e:Ls0/l/c/b$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/b$a;Lrx/functions/Action0;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/c/b$a$b;->e:Ls0/l/c/b$a;
+
+    iput-object p2, p0, Ls0/l/c/b$a$b;->d:Lrx/functions/Action0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/b$a$b;->e:Ls0/l/c/b$a;
+
+    iget-object v0, v0, Ls0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/b$a$b;->d:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/b$a.smali b/com.discord/smali_classes2/s0/l/c/b$a.smali
new file mode 100644
index 0000000000..874ee4bc1f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/b$a.smali
@@ -0,0 +1,206 @@
+.class public final Ls0/l/c/b$a;
+.super Lrx/Scheduler$Worker;
+.source "EventLoopsScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/internal/util/SubscriptionList;
+
+.field public final e:Lrx/subscriptions/CompositeSubscription;
+
+.field public final f:Lrx/internal/util/SubscriptionList;
+
+.field public final g:Ls0/l/c/b$c;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/b$c;)V
+    .locals 5
+
+    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
+
+    new-instance v0, Lrx/internal/util/SubscriptionList;
+
+    invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/b$a;->d:Lrx/internal/util/SubscriptionList;
+
+    new-instance v0, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/b$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    new-instance v1, Lrx/internal/util/SubscriptionList;
+
+    const/4 v2, 0x2
+
+    new-array v2, v2, [Lrx/Subscription;
+
+    iget-object v3, p0, Ls0/l/c/b$a;->d:Lrx/internal/util/SubscriptionList;
+
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
+
+    const/4 v3, 0x1
+
+    aput-object v0, v2, v3
+
+    invoke-direct {v1, v2}, Lrx/internal/util/SubscriptionList;-><init>([Lrx/Subscription;)V
+
+    iput-object v1, p0, Ls0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
+
+    iput-object p1, p0, Ls0/l/c/b$a;->g:Ls0/l/c/b$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lrx/functions/Action0;)Lrx/Subscription;
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/b$a;->g:Ls0/l/c/b$c;
+
+    new-instance v1, Ls0/l/c/b$a$a;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/c/b$a$a;-><init>(Ls0/l/c/b$a;Lrx/functions/Action0;)V
+
+    iget-object p1, p0, Ls0/l/c/b$a;->d:Lrx/internal/util/SubscriptionList;
+
+    if-eqz v0, :cond_1
+
+    invoke-static {v1}, Ls0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
+
+    move-result-object v1
+
+    new-instance v2, Ls0/l/c/i;
+
+    invoke-direct {v2, v1, p1}, Ls0/l/c/i;-><init>(Lrx/functions/Action0;Lrx/internal/util/SubscriptionList;)V
+
+    invoke-virtual {p1, v2}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
+
+    iget-object p1, v0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {p1, v2}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
+
+    move-result-object p1
+
+    invoke-virtual {v2, p1}, Ls0/l/c/i;->a(Ljava/util/concurrent/Future;)V
+
+    return-object v2
+
+    :cond_1
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/b$a;->g:Ls0/l/c/b$c;
+
+    new-instance v1, Ls0/l/c/b$a$b;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/c/b$a$b;-><init>(Ls0/l/c/b$a;Lrx/functions/Action0;)V
+
+    iget-object p1, p0, Ls0/l/c/b$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    if-eqz v0, :cond_2
+
+    invoke-static {v1}, Ls0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
+
+    move-result-object v1
+
+    new-instance v2, Ls0/l/c/i;
+
+    invoke-direct {v2, v1, p1}, Ls0/l/c/i;-><init>(Lrx/functions/Action0;Lrx/subscriptions/CompositeSubscription;)V
+
+    invoke-virtual {p1, v2}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    const-wide/16 v3, 0x0
+
+    cmp-long p1, p2, v3
+
+    if-gtz p1, :cond_1
+
+    iget-object p1, v0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {p1, v2}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object p1, v0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {p1, v2, p2, p3, p4}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-virtual {v2, p1}, Ls0/l/c/i;->a(Ljava/util/concurrent/Future;)V
+
+    return-object v2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/b$a;->f:Lrx/internal/util/SubscriptionList;
+
+    invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/b$b.smali b/com.discord/smali_classes2/s0/l/c/b$b.smali
new file mode 100644
index 0000000000..2fcaaa777e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/b$b.smali
@@ -0,0 +1,91 @@
+.class public final Ls0/l/c/b$b;
+.super Ljava/lang/Object;
+.source "EventLoopsScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# instance fields
+.field public final a:I
+
+.field public final b:[Ls0/l/c/b$c;
+
+.field public c:J
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;I)V
+    .locals 3
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p2, p0, Ls0/l/c/b$b;->a:I
+
+    new-array v0, p2, [Ls0/l/c/b$c;
+
+    iput-object v0, p0, Ls0/l/c/b$b;->b:[Ls0/l/c/b$c;
+
+    const/4 v0, 0x0
+
+    :goto_0
+    if-ge v0, p2, :cond_0
+
+    iget-object v1, p0, Ls0/l/c/b$b;->b:[Ls0/l/c/b$c;
+
+    new-instance v2, Ls0/l/c/b$c;
+
+    invoke-direct {v2, p1}, Ls0/l/c/b$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    aput-object v2, v1, v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Ls0/l/c/b$c;
+    .locals 6
+
+    iget v0, p0, Ls0/l/c/b$b;->a:I
+
+    if-nez v0, :cond_0
+
+    sget-object v0, Ls0/l/c/b;->d:Ls0/l/c/b$c;
+
+    return-object v0
+
+    :cond_0
+    iget-object v1, p0, Ls0/l/c/b$b;->b:[Ls0/l/c/b$c;
+
+    iget-wide v2, p0, Ls0/l/c/b$b;->c:J
+
+    const-wide/16 v4, 0x1
+
+    add-long/2addr v4, v2
+
+    iput-wide v4, p0, Ls0/l/c/b$b;->c:J
+
+    int-to-long v4, v0
+
+    rem-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    aget-object v0, v1, v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/b$c.smali b/com.discord/smali_classes2/s0/l/c/b$c.smali
new file mode 100644
index 0000000000..dd065bdae2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/b$c.smali
@@ -0,0 +1,24 @@
+.class public final Ls0/l/c/b$c;
+.super Ls0/l/c/g;
+.source "EventLoopsScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/b;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/b.smali b/com.discord/smali_classes2/s0/l/c/b.smali
new file mode 100644
index 0000000000..b352628778
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/b.smali
@@ -0,0 +1,220 @@
+.class public final Ls0/l/c/b;
+.super Lrx/Scheduler;
+.source "EventLoopsScheduler.java"
+
+# interfaces
+.implements Ls0/l/c/j;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/c/b$c;,
+        Ls0/l/c/b$a;,
+        Ls0/l/c/b$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:I
+
+.field public static final d:Ls0/l/c/b$c;
+
+.field public static final e:Ls0/l/c/b$b;
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/ThreadFactory;
+
+.field public final b:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/c/b$b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-string v0, "rx.scheduler.max-computation-threads"
+
+    const/4 v1, 0x0
+
+    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Runtime;->availableProcessors()I
+
+    move-result v2
+
+    if-lez v0, :cond_0
+
+    if-le v0, v2, :cond_1
+
+    :cond_0
+    move v0, v2
+
+    :cond_1
+    sput v0, Ls0/l/c/b;->c:I
+
+    new-instance v0, Ls0/l/c/b$c;
+
+    sget-object v2, Ls0/l/e/i;->d:Ljava/util/concurrent/ThreadFactory;
+
+    invoke-direct {v0, v2}, Ls0/l/c/b$c;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    sput-object v0, Ls0/l/c/b;->d:Ls0/l/c/b$c;
+
+    invoke-virtual {v0}, Ls0/l/c/g;->unsubscribe()V
+
+    new-instance v0, Ls0/l/c/b$b;
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v2, v1}, Ls0/l/c/b$b;-><init>(Ljava/util/concurrent/ThreadFactory;I)V
+
+    sput-object v0, Ls0/l/c/b;->e:Ls0/l/c/b$b;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
+    .locals 3
+
+    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/b;->a:Ljava/util/concurrent/ThreadFactory;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v0, Ls0/l/c/b;->e:Ls0/l/c/b$b;
+
+    invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object p1, p0, Ls0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance p1, Ls0/l/c/b$b;
+
+    iget-object v0, p0, Ls0/l/c/b;->a:Ljava/util/concurrent/ThreadFactory;
+
+    sget v1, Ls0/l/c/b;->c:I
+
+    invoke-direct {p1, v0, v1}, Ls0/l/c/b$b;-><init>(Ljava/util/concurrent/ThreadFactory;I)V
+
+    iget-object v0, p0, Ls0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/c/b;->e:Ls0/l/c/b$b;
+
+    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object p1, p1, Ls0/l/c/b$b;->b:[Ls0/l/c/b$c;
+
+    array-length v0, p1
+
+    const/4 v1, 0x0
+
+    :goto_0
+    if-ge v1, v0, :cond_0
+
+    aget-object v2, p1, v1
+
+    invoke-virtual {v2}, Ls0/l/c/g;->unsubscribe()V
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lrx/Scheduler$Worker;
+    .locals 2
+
+    new-instance v0, Ls0/l/c/b$a;
+
+    iget-object v1, p0, Ls0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ls0/l/c/b$b;
+
+    invoke-virtual {v1}, Ls0/l/c/b$b;->a()Ls0/l/c/b$c;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ls0/l/c/b$a;-><init>(Ls0/l/c/b$c;)V
+
+    return-object v0
+.end method
+
+.method public shutdown()V
+    .locals 4
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/c/b$b;
+
+    sget-object v1, Ls0/l/c/b;->e:Ls0/l/c/b$b;
+
+    if-ne v0, v1, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v2, p0, Ls0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    iget-object v0, v0, Ls0/l/c/b$b;->b:[Ls0/l/c/b$c;
+
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_2
+
+    aget-object v3, v0, v2
+
+    invoke-virtual {v3}, Ls0/l/c/g;->unsubscribe()V
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/c$a$a.smali b/com.discord/smali_classes2/s0/l/c/c$a$a.smali
new file mode 100644
index 0000000000..7a36f7037e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/c$a$a.smali
@@ -0,0 +1,53 @@
+.class public Ls0/l/c/c$a$a;
+.super Ljava/lang/Object;
+.source "ExecutorScheduler.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/c$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/r/b;
+
+.field public final synthetic e:Ls0/l/c/c$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/c$a;Ls0/r/b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/c/c$a$a;->e:Ls0/l/c/c$a;
+
+    iput-object p2, p0, Ls0/l/c/c$a$a;->d:Ls0/r/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/c/c$a$a;->e:Ls0/l/c/c$a;
+
+    iget-object v0, v0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-object v1, p0, Ls0/l/c/c$a$a;->d:Ls0/r/b;
+
+    invoke-virtual {v0, v1}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/c$a$b.smali b/com.discord/smali_classes2/s0/l/c/c$a$b.smali
new file mode 100644
index 0000000000..9afa0f416a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/c$a$b.smali
@@ -0,0 +1,93 @@
+.class public Ls0/l/c/c$a$b;
+.super Ljava/lang/Object;
+.source "ExecutorScheduler.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/c$a;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/r/b;
+
+.field public final synthetic e:Lrx/functions/Action0;
+
+.field public final synthetic f:Lrx/Subscription;
+
+.field public final synthetic g:Ls0/l/c/c$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/c$a;Ls0/r/b;Lrx/functions/Action0;Lrx/Subscription;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/c/c$a$b;->g:Ls0/l/c/c$a;
+
+    iput-object p2, p0, Ls0/l/c/c$a$b;->d:Ls0/r/b;
+
+    iput-object p3, p0, Ls0/l/c/c$a$b;->e:Lrx/functions/Action0;
+
+    iput-object p4, p0, Ls0/l/c/c$a$b;->f:Lrx/Subscription;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 3
+
+    iget-object v0, p0, Ls0/l/c/c$a$b;->d:Ls0/r/b;
+
+    invoke-virtual {v0}, Ls0/r/b;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/c$a$b;->g:Ls0/l/c/c$a;
+
+    iget-object v1, p0, Ls0/l/c/c$a$b;->e:Lrx/functions/Action0;
+
+    invoke-virtual {v0, v1}, Ls0/l/c/c$a;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    move-result-object v0
+
+    iget-object v1, p0, Ls0/l/c/c$a$b;->d:Ls0/r/b;
+
+    invoke-virtual {v1, v0}, Ls0/r/b;->a(Lrx/Subscription;)V
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    const-class v2, Ls0/l/c/i;
+
+    if-ne v1, v2, :cond_1
+
+    check-cast v0, Ls0/l/c/i;
+
+    iget-object v1, p0, Ls0/l/c/c$a$b;->f:Lrx/Subscription;
+
+    iget-object v0, v0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    invoke-virtual {v0, v1}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/c$a.smali b/com.discord/smali_classes2/s0/l/c/c$a.smali
new file mode 100644
index 0000000000..9bd2008c2d
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/c$a.smali
@@ -0,0 +1,349 @@
+.class public final Ls0/l/c/c$a;
+.super Lrx/Scheduler$Worker;
+.source "ExecutorScheduler.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/Executor;
+
+.field public final e:Lrx/subscriptions/CompositeSubscription;
+
+.field public final f:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/ConcurrentLinkedQueue<",
+            "Ls0/l/c/i;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field public final h:Ljava/util/concurrent/ScheduledExecutorService;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/Executor;)V
+    .locals 2
+
+    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/c$a;->d:Ljava/util/concurrent/Executor;
+
+    new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    new-instance p1, Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {p1}, Lrx/subscriptions/CompositeSubscription;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    sget-object p1, Ls0/l/c/d;->d:Ls0/l/c/d;
+
+    iget-object p1, p1, Ls0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ljava/util/concurrent/ScheduledExecutorService;
+
+    sget-object v0, Ls0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-ne p1, v0, :cond_0
+
+    sget-object p1, Ls0/l/c/d;->c:Ljava/util/concurrent/ScheduledExecutorService;
+
+    goto :goto_0
+
+    :cond_0
+    sget v0, Ls0/l/c/d;->e:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    array-length v1, p1
+
+    if-lt v0, v1, :cond_1
+
+    const/4 v0, 0x0
+
+    :cond_1
+    sput v0, Ls0/l/c/d;->e:I
+
+    aget-object p1, p1, v0
+
+    :goto_0
+    iput-object p1, p0, Ls0/l/c/c$a;->h:Ljava/util/concurrent/ScheduledExecutorService;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lrx/functions/Action0;)Lrx/Subscription;
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_0
+    invoke-static {p1}, Ls0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
+
+    move-result-object p1
+
+    new-instance v0, Ls0/l/c/i;
+
+    iget-object v1, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-direct {v0, p1, v1}, Ls0/l/c/i;-><init>(Lrx/functions/Action0;Lrx/subscriptions/CompositeSubscription;)V
+
+    iget-object p1, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    iget-object p1, p0, Ls0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {p1, v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
+
+    iget-object p1, p0, Ls0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result p1
+
+    if-nez p1, :cond_1
+
+    :try_start_0
+    iget-object p1, p0, Ls0/l/c/c$a;->d:Ljava/util/concurrent/Executor;
+
+    invoke-interface {p1, p0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception p1
+
+    iget-object v1, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v1, v0}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
+
+    iget-object v0, p0, Ls0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-object v0
+.end method
+
+.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+    .locals 5
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p2, v0
+
+    if-gtz v2, :cond_0
+
+    invoke-virtual {p0, p1}, Ls0/l/c/c$a;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    if-eqz v0, :cond_1
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_1
+    invoke-static {p1}, Ls0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
+
+    move-result-object p1
+
+    new-instance v0, Ls0/r/b;
+
+    invoke-direct {v0}, Ls0/r/b;-><init>()V
+
+    new-instance v1, Ls0/r/b;
+
+    invoke-direct {v1}, Ls0/r/b;-><init>()V
+
+    invoke-virtual {v1, v0}, Ls0/r/b;->a(Lrx/Subscription;)V
+
+    iget-object v2, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v2, v1}, Lrx/subscriptions/CompositeSubscription;->a(Lrx/Subscription;)V
+
+    new-instance v2, Ls0/l/c/c$a$a;
+
+    invoke-direct {v2, p0, v1}, Ls0/l/c/c$a$a;-><init>(Ls0/l/c/c$a;Ls0/r/b;)V
+
+    new-instance v3, Ls0/r/a;
+
+    invoke-direct {v3, v2}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    new-instance v2, Ls0/l/c/i;
+
+    new-instance v4, Ls0/l/c/c$a$b;
+
+    invoke-direct {v4, p0, v1, p1, v3}, Ls0/l/c/c$a$b;-><init>(Ls0/l/c/c$a;Ls0/r/b;Lrx/functions/Action0;Lrx/Subscription;)V
+
+    invoke-direct {v2, v4}, Ls0/l/c/i;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {v0, v2}, Ls0/r/b;->a(Lrx/Subscription;)V
+
+    :try_start_0
+    iget-object p1, p0, Ls0/l/c/c$a;->h:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {p1, v2, p2, p3, p4}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    move-result-object p1
+
+    invoke-virtual {v2, p1}, Ls0/l/c/i;->a(Ljava/util/concurrent/Future;)V
+    :try_end_0
+    .catch Ljava/util/concurrent/RejectedExecutionException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object v3
+
+    :catch_0
+    move-exception p1
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    throw p1
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    return v0
+.end method
+
+.method public run()V
+    .locals 2
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v0, v0, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Ls0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/c/i;
+
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    iget-object v1, v0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v1, v1, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-nez v1, :cond_4
+
+    iget-object v1, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    iget-boolean v1, v1, Lrx/subscriptions/CompositeSubscription;->e:Z
+
+    if-nez v1, :cond_3
+
+    invoke-virtual {v0}, Ls0/l/c/i;->run()V
+
+    goto :goto_0
+
+    :cond_3
+    iget-object v0, p0, Ls0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
+
+    return-void
+
+    :cond_4
+    :goto_0
+    iget-object v0, p0, Ls0/l/c/c$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    return-void
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/c$a;->e:Lrx/subscriptions/CompositeSubscription;
+
+    invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
+
+    iget-object v0, p0, Ls0/l/c/c$a;->f:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/c.smali b/com.discord/smali_classes2/s0/l/c/c.smali
new file mode 100644
index 0000000000..de13529421
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/c.smali
@@ -0,0 +1,41 @@
+.class public final Ls0/l/c/c;
+.super Lrx/Scheduler;
+.source "ExecutorScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/c/c$a;
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/Executor;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/Executor;)V
+    .locals 0
+
+    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/c;->a:Ljava/util/concurrent/Executor;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lrx/Scheduler$Worker;
+    .locals 2
+
+    new-instance v0, Ls0/l/c/c$a;
+
+    iget-object v1, p0, Ls0/l/c/c;->a:Ljava/util/concurrent/Executor;
+
+    invoke-direct {v0, v1}, Ls0/l/c/c$a;-><init>(Ljava/util/concurrent/Executor;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/d.smali b/com.discord/smali_classes2/s0/l/c/d.smali
new file mode 100644
index 0000000000..91e5f10a11
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/d.smali
@@ -0,0 +1,218 @@
+.class public final Ls0/l/c/d;
+.super Ljava/lang/Object;
+.source "GenericScheduledExecutorService.java"
+
+# interfaces
+.implements Ls0/l/c/j;
+
+
+# static fields
+.field public static final b:[Ljava/util/concurrent/ScheduledExecutorService;
+
+.field public static final c:Ljava/util/concurrent/ScheduledExecutorService;
+
+.field public static final d:Ls0/l/c/d;
+
+.field public static e:I
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "[",
+            "Ljava/util/concurrent/ScheduledExecutorService;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    new-array v1, v0, [Ljava/util/concurrent/ScheduledExecutorService;
+
+    sput-object v1, Ls0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-static {v0}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(I)Ljava/util/concurrent/ScheduledExecutorService;
+
+    move-result-object v0
+
+    sput-object v0, Ls0/l/c/d;->c:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
+
+    new-instance v0, Ls0/l/c/d;
+
+    invoke-direct {v0}, Ls0/l/c/d;-><init>()V
+
+    sput-object v0, Ls0/l/c/d;->d:Ls0/l/c/d;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 6
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v1, Ls0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Ls0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Runtime;->availableProcessors()I
+
+    move-result v0
+
+    const/4 v1, 0x4
+
+    if-le v0, v1, :cond_0
+
+    div-int/lit8 v0, v0, 0x2
+
+    :cond_0
+    const/16 v1, 0x8
+
+    if-le v0, v1, :cond_1
+
+    const/16 v0, 0x8
+
+    :cond_1
+    new-array v1, v0, [Ljava/util/concurrent/ScheduledExecutorService;
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v0, :cond_2
+
+    sget-object v4, Ls0/l/c/e;->d:Ls0/l/e/i;
+
+    const/4 v5, 0x1
+
+    invoke-static {v5, v4}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
+
+    move-result-object v4
+
+    aput-object v4, v1, v3
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    iget-object v3, p0, Ls0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v4, Ls0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-virtual {v3, v4, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_4
+
+    :goto_1
+    if-ge v2, v0, :cond_5
+
+    aget-object v3, v1, v2
+
+    invoke-static {v3}, Ls0/l/c/g;->g(Ljava/util/concurrent/ScheduledExecutorService;)Z
+
+    move-result v4
+
+    if-nez v4, :cond_3
+
+    instance-of v4, v3, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    if-eqz v4, :cond_3
+
+    check-cast v3, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    invoke-static {v3}, Ls0/l/c/g;->e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
+
+    :cond_3
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    :goto_2
+    if-ge v2, v0, :cond_5
+
+    aget-object v3, v1, v2
+
+    invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_2
+
+    :cond_5
+    return-void
+.end method
+
+
+# virtual methods
+.method public shutdown()V
+    .locals 5
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ljava/util/concurrent/ScheduledExecutorService;
+
+    sget-object v1, Ls0/l/c/d;->b:[Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-ne v0, v1, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v2, p0, Ls0/l/c/d;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v1, :cond_2
+
+    aget-object v3, v0, v2
+
+    sget-object v4, Ls0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-virtual {v4, v3}, Ljava/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
+
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/e.smali b/com.discord/smali_classes2/s0/l/c/e.smali
new file mode 100644
index 0000000000..6c4bb0454e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/e.smali
@@ -0,0 +1,69 @@
+.class public final enum Ls0/l/c/e;
+.super Ljava/lang/Enum;
+.source "GenericScheduledExecutorServiceFactory.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/l/c/e;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ls0/l/e/i;
+
+.field public static final synthetic e:[Ls0/l/c/e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ls0/l/c/e;
+
+    sput-object v0, Ls0/l/c/e;->e:[Ls0/l/c/e;
+
+    new-instance v0, Ls0/l/e/i;
+
+    const-string v1, "RxScheduledExecutorPool-"
+
+    invoke-direct {v0, v1}, Ls0/l/e/i;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ls0/l/c/e;->d:Ls0/l/e/i;
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/l/c/e;
+    .locals 1
+
+    const-class v0, Ls0/l/c/e;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/l/c/e;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/l/c/e;
+    .locals 1
+
+    sget-object v0, Ls0/l/c/e;->e:[Ls0/l/c/e;
+
+    invoke-virtual {v0}, [Ls0/l/c/e;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/l/c/e;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/f.smali b/com.discord/smali_classes2/s0/l/c/f.smali
new file mode 100644
index 0000000000..e3b922a349
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/f.smali
@@ -0,0 +1,33 @@
+.class public final Ls0/l/c/f;
+.super Lrx/Scheduler;
+.source "NewThreadScheduler.java"
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/ThreadFactory;
+
+
+# direct methods
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
+    .locals 0
+
+    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/f;->a:Ljava/util/concurrent/ThreadFactory;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lrx/Scheduler$Worker;
+    .locals 2
+
+    new-instance v0, Ls0/l/c/g;
+
+    iget-object v1, p0, Ls0/l/c/f;->a:Ljava/util/concurrent/ThreadFactory;
+
+    invoke-direct {v0, v1}, Ls0/l/c/g;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/g$a.smali b/com.discord/smali_classes2/s0/l/c/g$a.smali
new file mode 100644
index 0000000000..b4e19f0a22
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/g$a.smali
@@ -0,0 +1,84 @@
+.class public final Ls0/l/c/g$a;
+.super Ljava/lang/Object;
+.source "NewThreadWorker.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/g;->e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .locals 3
+
+    :try_start_0
+    sget-object v0, Ls0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->isShutdown()Z
+
+    move-result v2
+
+    if-nez v2, :cond_0
+
+    invoke-virtual {v1}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;->purge()V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Iterator;->remove()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-static {v0}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :cond_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/g.smali b/com.discord/smali_classes2/s0/l/c/g.smali
new file mode 100644
index 0000000000..daa778ccec
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/g.smali
@@ -0,0 +1,479 @@
+.class public Ls0/l/c/g;
+.super Lrx/Scheduler$Worker;
+.source "NewThreadWorker.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# static fields
+.field public static final f:Z
+
+.field public static final g:I
+
+.field public static final h:Ljava/util/concurrent/ConcurrentHashMap;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/ConcurrentHashMap<",
+            "Ljava/util/concurrent/ScheduledThreadPoolExecutor;",
+            "Ljava/util/concurrent/ScheduledThreadPoolExecutor;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final i:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/util/concurrent/ScheduledExecutorService;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile j:Ljava/lang/Object;
+
+.field public static final k:Ljava/lang/Object;
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/ScheduledExecutorService;
+
+.field public volatile e:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    sput-object v0, Ls0/l/c/g;->k:Ljava/lang/Object;
+
+    new-instance v0, Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
+
+    sput-object v0, Ls0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    sput-object v0, Ls0/l/c/g;->i:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const-string v0, "rx.scheduler.jdk6.purge-frequency-millis"
+
+    const/16 v1, 0x3e8
+
+    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    sput v0, Ls0/l/c/g;->g:I
+
+    const-string v0, "rx.scheduler.jdk6.purge-force"
+
+    invoke-static {v0}, Ljava/lang/Boolean;->getBoolean(Ljava/lang/String;)Z
+
+    move-result v0
+
+    sget v1, Ls0/l/e/g;->a:I
+
+    if-nez v0, :cond_1
+
+    if-eqz v1, :cond_0
+
+    const/16 v0, 0x15
+
+    if-lt v1, v0, :cond_1
+
+    :cond_0
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    sput-boolean v0, Ls0/l/c/g;->f:Z
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/util/concurrent/ThreadFactory;)V
+    .locals 1
+
+    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
+
+    const/4 v0, 0x1
+
+    invoke-static {v0, p1}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
+
+    move-result-object p1
+
+    invoke-static {p1}, Ls0/l/c/g;->g(Ljava/util/concurrent/ScheduledExecutorService;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    instance-of v0, p1, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    if-eqz v0, :cond_0
+
+    move-object v0, p1
+
+    check-cast v0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    invoke-static {v0}, Ls0/l/c/g;->e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
+
+    :cond_0
+    iput-object p1, p0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    return-void
+.end method
+
+.method public static d(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/lang/reflect/Method;
+    .locals 7
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getMethods()[Ljava/lang/reflect/Method;
+
+    move-result-object p0
+
+    array-length v0, p0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-ge v2, v0, :cond_1
+
+    aget-object v3, p0, v2
+
+    invoke-virtual {v3}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "setRemoveOnCancelPolicy"
+
+    invoke-virtual {v4, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    invoke-virtual {v3}, Ljava/lang/reflect/Method;->getParameterTypes()[Ljava/lang/Class;
+
+    move-result-object v4
+
+    array-length v5, v4
+
+    const/4 v6, 0x1
+
+    if-ne v5, v6, :cond_0
+
+    aget-object v4, v4, v1
+
+    sget-object v5, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
+
+    if-ne v4, v5, :cond_0
+
+    return-object v3
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method public static e(Ljava/util/concurrent/ScheduledThreadPoolExecutor;)V
+    .locals 10
+
+    :goto_0
+    sget-object v0, Ls0/l/c/g;->i:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/concurrent/ScheduledExecutorService;
+
+    if-eqz v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    const/4 v0, 0x1
+
+    new-instance v1, Ls0/l/e/i;
+
+    const-string v2, "RxSchedulerPurge-"
+
+    invoke-direct {v1, v2}, Ls0/l/e/i;-><init>(Ljava/lang/String;)V
+
+    invoke-static {v0, v1}, Ljava/util/concurrent/Executors;->newScheduledThreadPool(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;
+
+    move-result-object v3
+
+    sget-object v0, Ls0/l/c/g;->i:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    new-instance v4, Ls0/l/c/g$a;
+
+    invoke-direct {v4}, Ls0/l/c/g$a;-><init>()V
+
+    sget v0, Ls0/l/c/g;->g:I
+
+    int-to-long v5, v0
+
+    int-to-long v7, v0
+
+    sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-interface/range {v3 .. v9}, Ljava/util/concurrent/ScheduledExecutorService;->scheduleAtFixedRate(Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    :goto_1
+    sget-object v0, Ls0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-virtual {v0, p0, p0}, Ljava/util/concurrent/ConcurrentHashMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+
+    :cond_1
+    invoke-interface {v3}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
+
+    goto :goto_0
+.end method
+
+.method public static g(Ljava/util/concurrent/ScheduledExecutorService;)Z
+    .locals 5
+
+    sget-boolean v0, Ls0/l/c/g;->f:Z
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_4
+
+    instance-of v0, p0, Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+
+    if-eqz v0, :cond_3
+
+    sget-object v0, Ls0/l/c/g;->j:Ljava/lang/Object;
+
+    sget-object v2, Ls0/l/c/g;->k:Ljava/lang/Object;
+
+    if-ne v0, v2, :cond_0
+
+    return v1
+
+    :cond_0
+    if-nez v0, :cond_2
+
+    invoke-static {p0}, Ls0/l/c/g;->d(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    move-object v2, v0
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v2, Ls0/l/c/g;->k:Ljava/lang/Object;
+
+    :goto_0
+    sput-object v2, Ls0/l/c/g;->j:Ljava/lang/Object;
+
+    goto :goto_1
+
+    :cond_2
+    check-cast v0, Ljava/lang/reflect/Method;
+
+    goto :goto_1
+
+    :cond_3
+    invoke-static {p0}, Ls0/l/c/g;->d(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    :goto_1
+    if-eqz v0, :cond_4
+
+    const/4 v2, 0x1
+
+    :try_start_0
+    new-array v3, v2, [Ljava/lang/Object;
+
+    sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    aput-object v4, v3, v1
+
+    invoke-virtual {v0, p0, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return v2
+
+    :catch_0
+    move-exception p0
+
+    invoke-static {p0}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :catch_1
+    move-exception p0
+
+    invoke-static {p0}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :catch_2
+    move-exception p0
+
+    invoke-static {p0}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :cond_4
+    :goto_2
+    return v1
+.end method
+
+
+# virtual methods
+.method public a(Lrx/functions/Action0;)Lrx/Subscription;
+    .locals 3
+
+    iget-boolean v0, p0, Ls0/l/c/g;->e:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    goto :goto_0
+
+    :cond_0
+    const-wide/16 v0, 0x0
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p0, p1, v0, v1, v2}, Ls0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Ls0/l/c/i;
+
+    move-result-object p1
+
+    :goto_0
+    return-object p1
+.end method
+
+.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/c/g;->e:Z
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_0
+    invoke-virtual {p0, p1, p2, p3, p4}, Ls0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Ls0/l/c/i;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Ls0/l/c/i;
+    .locals 3
+
+    invoke-static {p1}, Ls0/o/l;->d(Lrx/functions/Action0;)Lrx/functions/Action0;
+
+    move-result-object p1
+
+    new-instance v0, Ls0/l/c/i;
+
+    invoke-direct {v0, p1}, Ls0/l/c/i;-><init>(Lrx/functions/Action0;)V
+
+    const-wide/16 v1, 0x0
+
+    cmp-long p1, p2, v1
+
+    if-gtz p1, :cond_0
+
+    iget-object p1, p0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {p1, v0}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {p1, v0, p2, p3, p4}, Ljava/util/concurrent/ScheduledExecutorService;->schedule(Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-virtual {v0, p1}, Ls0/l/c/i;->a(Ljava/util/concurrent/Future;)V
+
+    return-object v0
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/l/c/g;->e:Z
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 2
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/c/g;->e:Z
+
+    iget-object v0, p0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
+
+    iget-object v0, p0, Ls0/l/c/g;->d:Ljava/util/concurrent/ScheduledExecutorService;
+
+    sget-object v1, Ls0/l/c/g;->h:Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-virtual {v1, v0}, Ljava/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/h$a.smali b/com.discord/smali_classes2/s0/l/c/h$a.smali
new file mode 100644
index 0000000000..89782b7af8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/h$a.smali
@@ -0,0 +1,200 @@
+.class public final Ls0/l/c/h$a;
+.super Ljava/lang/Object;
+.source "SchedulePeriodicHelper.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/h;->a(Lrx/Scheduler$Worker;Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;Ls0/l/c/h$b;)Lrx/Subscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# instance fields
+.field public d:J
+
+.field public e:J
+
+.field public f:J
+
+.field public final synthetic g:J
+
+.field public final synthetic h:J
+
+.field public final synthetic i:Lrx/functions/Action0;
+
+.field public final synthetic j:Ls0/l/d/a;
+
+.field public final synthetic k:Ls0/l/c/h$b;
+
+.field public final synthetic l:Lrx/Scheduler$Worker;
+
+.field public final synthetic m:J
+
+
+# direct methods
+.method public constructor <init>(JJLrx/functions/Action0;Ls0/l/d/a;Ls0/l/c/h$b;Lrx/Scheduler$Worker;J)V
+    .locals 0
+
+    iput-wide p1, p0, Ls0/l/c/h$a;->g:J
+
+    iput-wide p3, p0, Ls0/l/c/h$a;->h:J
+
+    iput-object p5, p0, Ls0/l/c/h$a;->i:Lrx/functions/Action0;
+
+    iput-object p6, p0, Ls0/l/c/h$a;->j:Ls0/l/d/a;
+
+    iput-object p7, p0, Ls0/l/c/h$a;->k:Ls0/l/c/h$b;
+
+    iput-object p8, p0, Ls0/l/c/h$a;->l:Lrx/Scheduler$Worker;
+
+    iput-wide p9, p0, Ls0/l/c/h$a;->m:J
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iget-wide p1, p0, Ls0/l/c/h$a;->g:J
+
+    iput-wide p1, p0, Ls0/l/c/h$a;->e:J
+
+    iget-wide p1, p0, Ls0/l/c/h$a;->h:J
+
+    iput-wide p1, p0, Ls0/l/c/h$a;->f:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 11
+
+    iget-object v0, p0, Ls0/l/c/h$a;->i:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    iget-object v0, p0, Ls0/l/c/h$a;->j:Ls0/l/d/a;
+
+    invoke-virtual {v0}, Ls0/l/d/a;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-nez v0, :cond_4
+
+    iget-object v0, p0, Ls0/l/c/h$a;->k:Ls0/l/c/h$b;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0}, Ls0/l/c/h$b;->a()J
+
+    move-result-wide v0
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    iget-object v1, p0, Ls0/l/c/h$a;->l:Lrx/Scheduler$Worker;
+
+    if-eqz v1, :cond_3
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    :goto_0
+    sget-wide v2, Ls0/l/c/h;->a:J
+
+    add-long v4, v0, v2
+
+    iget-wide v6, p0, Ls0/l/c/h$a;->e:J
+
+    const-wide/16 v8, 0x1
+
+    cmp-long v10, v4, v6
+
+    if-ltz v10, :cond_2
+
+    iget-wide v4, p0, Ls0/l/c/h$a;->m:J
+
+    add-long/2addr v6, v4
+
+    add-long/2addr v6, v2
+
+    cmp-long v2, v0, v6
+
+    if-ltz v2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    iget-wide v2, p0, Ls0/l/c/h$a;->f:J
+
+    iget-wide v6, p0, Ls0/l/c/h$a;->d:J
+
+    add-long/2addr v6, v8
+
+    iput-wide v6, p0, Ls0/l/c/h$a;->d:J
+
+    mul-long v6, v6, v4
+
+    add-long/2addr v6, v2
+
+    goto :goto_2
+
+    :cond_2
+    :goto_1
+    iget-wide v2, p0, Ls0/l/c/h$a;->m:J
+
+    add-long v6, v0, v2
+
+    iget-wide v4, p0, Ls0/l/c/h$a;->d:J
+
+    add-long/2addr v4, v8
+
+    iput-wide v4, p0, Ls0/l/c/h$a;->d:J
+
+    mul-long v2, v2, v4
+
+    sub-long v2, v6, v2
+
+    iput-wide v2, p0, Ls0/l/c/h$a;->f:J
+
+    :goto_2
+    iput-wide v0, p0, Ls0/l/c/h$a;->e:J
+
+    sub-long/2addr v6, v0
+
+    iget-object v0, p0, Ls0/l/c/h$a;->j:Ls0/l/d/a;
+
+    iget-object v1, p0, Ls0/l/c/h$a;->l:Lrx/Scheduler$Worker;
+
+    sget-object v2, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-virtual {v1, p0, v6, v7, v2}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ls0/l/d/a;->b(Lrx/Subscription;)Z
+
+    goto :goto_3
+
+    :cond_3
+    const/4 v0, 0x0
+
+    throw v0
+
+    :cond_4
+    :goto_3
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/h$b.smali b/com.discord/smali_classes2/s0/l/c/h$b.smali
new file mode 100644
index 0000000000..0e7a9a0acb
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/h$b.smali
@@ -0,0 +1,19 @@
+.class public interface abstract Ls0/l/c/h$b;
+.super Ljava/lang/Object;
+.source "SchedulePeriodicHelper.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/h;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "b"
+.end annotation
+
+
+# virtual methods
+.method public abstract a()J
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/h.smali b/com.discord/smali_classes2/s0/l/c/h.smali
new file mode 100644
index 0000000000..11e60251c3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/h.smali
@@ -0,0 +1,109 @@
+.class public final Ls0/l/c/h;
+.super Ljava/lang/Object;
+.source "SchedulePeriodicHelper.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/c/h$b;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    sget-object v0, Ljava/util/concurrent/TimeUnit;->MINUTES:Ljava/util/concurrent/TimeUnit;
+
+    const-string v1, "rx.scheduler.drift-tolerance"
+
+    const-wide/16 v2, 0xf
+
+    invoke-static {v1, v2, v3}, Ljava/lang/Long;->getLong(Ljava/lang/String;J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v1
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/c/h;->a:J
+
+    return-void
+.end method
+
+.method public static a(Lrx/Scheduler$Worker;Lrx/functions/Action0;JJLjava/util/concurrent/TimeUnit;Ls0/l/c/h$b;)Lrx/Subscription;
+    .locals 17
+
+    move-wide/from16 v0, p2
+
+    move-object/from16 v2, p6
+
+    move-wide/from16 v3, p4
+
+    invoke-virtual {v2, v3, v4}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v12
+
+    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v4
+
+    invoke-virtual {v3, v4, v5}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v4
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
+
+    move-result-wide v6
+
+    add-long/2addr v6, v4
+
+    new-instance v14, Ls0/l/d/a;
+
+    invoke-direct {v14}, Ls0/l/d/a;-><init>()V
+
+    new-instance v15, Ls0/l/d/a;
+
+    invoke-direct {v15, v14}, Ls0/l/d/a;-><init>(Lrx/Subscription;)V
+
+    new-instance v11, Ls0/l/c/h$a;
+
+    const/4 v10, 0x0
+
+    move-object v3, v11
+
+    move-object/from16 v8, p1
+
+    move-object v9, v15
+
+    move-object/from16 v16, v11
+
+    move-object/from16 v11, p0
+
+    invoke-direct/range {v3 .. v13}, Ls0/l/c/h$a;-><init>(JJLrx/functions/Action0;Ls0/l/d/a;Ls0/l/c/h$b;Lrx/Scheduler$Worker;J)V
+
+    move-object/from16 v3, p0
+
+    move-object/from16 v4, v16
+
+    invoke-virtual {v3, v4, v0, v1, v2}, Lrx/Scheduler$Worker;->b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+
+    move-result-object v0
+
+    invoke-virtual {v14, v0}, Ls0/l/d/a;->b(Lrx/Subscription;)Z
+
+    return-object v15
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/i$a.smali b/com.discord/smali_classes2/s0/l/c/i$a.smali
new file mode 100644
index 0000000000..130df85b97
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/i$a.smali
@@ -0,0 +1,99 @@
+.class public final Ls0/l/c/i$a;
+.super Ljava/lang/Object;
+.source "ScheduledAction.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/i;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x11
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/Future;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/Future<",
+            "*>;"
+        }
+    .end annotation
+.end field
+
+.field public final synthetic e:Ls0/l/c/i;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/i;Ljava/util/concurrent/Future;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/Future<",
+            "*>;)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Ls0/l/c/i$a;->e:Ls0/l/c/i;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p2, p0, Ls0/l/c/i$a;->d:Ljava/util/concurrent/Future;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/i$a;->d:Ljava/util/concurrent/Future;
+
+    invoke-interface {v0}, Ljava/util/concurrent/Future;->isCancelled()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/c/i$a;->e:Ls0/l/c/i;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    if-eq v0, v1, :cond_0
+
+    iget-object v0, p0, Ls0/l/c/i$a;->d:Ljava/util/concurrent/Future;
+
+    const/4 v1, 0x1
+
+    invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Ls0/l/c/i$a;->d:Ljava/util/concurrent/Future;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/concurrent/Future;->cancel(Z)Z
+
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/i$b.smali b/com.discord/smali_classes2/s0/l/c/i$b.smali
new file mode 100644
index 0000000000..d910ca6aa4
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/i$b.smali
@@ -0,0 +1,125 @@
+.class public final Ls0/l/c/i$b;
+.super Ljava/util/concurrent/atomic/AtomicBoolean;
+.source "ScheduledAction.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/i;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x36e5888d681586eL
+
+
+# instance fields
+.field public final parent:Lrx/internal/util/SubscriptionList;
+
+.field public final s:Ls0/l/c/i;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/i;Lrx/internal/util/SubscriptionList;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/i$b;->s:Ls0/l/c/i;
+
+    iput-object p2, p0, Ls0/l/c/i$b;->parent:Lrx/internal/util/SubscriptionList;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/i$b;->s:Ls0/l/c/i;
+
+    iget-object v0, v0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 4
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Ls0/l/c/i$b;->parent:Lrx/internal/util/SubscriptionList;
+
+    iget-object v1, p0, Ls0/l/c/i$b;->s:Ls0/l/c/i;
+
+    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-nez v2, :cond_2
+
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v2, v0, Lrx/internal/util/SubscriptionList;->d:Ljava/util/List;
+
+    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-nez v3, :cond_1
+
+    if-nez v2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {v2, v1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v1}, Ls0/l/c/i;->unsubscribe()V
+
+    goto :goto_1
+
+    :cond_1
+    :goto_0
+    :try_start_1
+    monitor-exit v0
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v1
+
+    :cond_2
+    :goto_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/i$c.smali b/com.discord/smali_classes2/s0/l/c/i$c.smali
new file mode 100644
index 0000000000..0577b9a4ae
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/i$c.smali
@@ -0,0 +1,78 @@
+.class public final Ls0/l/c/i$c;
+.super Ljava/util/concurrent/atomic/AtomicBoolean;
+.source "ScheduledAction.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/i;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x36e5888d681586eL
+
+
+# instance fields
+.field public final parent:Lrx/subscriptions/CompositeSubscription;
+
+.field public final s:Ls0/l/c/i;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/i;Lrx/subscriptions/CompositeSubscription;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/i$c;->s:Ls0/l/c/i;
+
+    iput-object p2, p0, Ls0/l/c/i$c;->parent:Lrx/subscriptions/CompositeSubscription;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/i$c;->s:Ls0/l/c/i;
+
+    iget-object v0, v0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/c/i$c;->parent:Lrx/subscriptions/CompositeSubscription;
+
+    iget-object v1, p0, Ls0/l/c/i$c;->s:Ls0/l/c/i;
+
+    invoke-virtual {v0, v1}, Lrx/subscriptions/CompositeSubscription;->c(Lrx/Subscription;)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/i.smali b/com.discord/smali_classes2/s0/l/c/i.smali
new file mode 100644
index 0000000000..8df6bce317
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/i.smali
@@ -0,0 +1,224 @@
+.class public final Ls0/l/c/i;
+.super Ljava/util/concurrent/atomic/AtomicReference;
+.source "ScheduledAction.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/c/i$b;,
+        Ls0/l/c/i$c;,
+        Ls0/l/c/i$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/util/concurrent/atomic/AtomicReference<",
+        "Ljava/lang/Thread;",
+        ">;",
+        "Ljava/lang/Runnable;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = -0x36fd4556f787c9b1L
+
+
+# instance fields
+.field public final action:Lrx/functions/Action0;
+
+.field public final cancel:Lrx/internal/util/SubscriptionList;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action0;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/i;->action:Lrx/functions/Action0;
+
+    new-instance p1, Lrx/internal/util/SubscriptionList;
+
+    invoke-direct {p1}, Lrx/internal/util/SubscriptionList;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/functions/Action0;Lrx/internal/util/SubscriptionList;)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/i;->action:Lrx/functions/Action0;
+
+    new-instance p1, Lrx/internal/util/SubscriptionList;
+
+    new-instance v0, Ls0/l/c/i$b;
+
+    invoke-direct {v0, p0, p2}, Ls0/l/c/i$b;-><init>(Ls0/l/c/i;Lrx/internal/util/SubscriptionList;)V
+
+    invoke-direct {p1, v0}, Lrx/internal/util/SubscriptionList;-><init>(Lrx/Subscription;)V
+
+    iput-object p1, p0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/functions/Action0;Lrx/subscriptions/CompositeSubscription;)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/i;->action:Lrx/functions/Action0;
+
+    new-instance p1, Lrx/internal/util/SubscriptionList;
+
+    new-instance v0, Ls0/l/c/i$c;
+
+    invoke-direct {v0, p0, p2}, Ls0/l/c/i$c;-><init>(Ls0/l/c/i;Lrx/subscriptions/CompositeSubscription;)V
+
+    invoke-direct {p1, v0}, Lrx/internal/util/SubscriptionList;-><init>(Lrx/Subscription;)V
+
+    iput-object p1, p0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/util/concurrent/Future;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/Future<",
+            "*>;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    new-instance v1, Ls0/l/c/i$a;
+
+    invoke-direct {v1, p0, p1}, Ls0/l/c/i$a;-><init>(Ls0/l/c/i;Ljava/util/concurrent/Future;)V
+
+    invoke-virtual {v0, v1}, Lrx/internal/util/SubscriptionList;->a(Lrx/Subscription;)V
+
+    return-void
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    return v0
+.end method
+
+.method public run()V
+    .locals 3
+
+    :try_start_0
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    iget-object v0, p0, Ls0/l/c/i;->action:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+    :try_end_0
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_1
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "Fatal Exception thrown on Scheduler.Worker thread."
+
+    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    invoke-static {v1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v2
+
+    invoke-interface {v2, v0, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/lang/IllegalStateException;
+
+    const-string v2, "Exception thrown on Scheduler.Worker thread. Add `onError` handling."
+
+    invoke-direct {v1, v2, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    invoke-static {v1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v2
+
+    invoke-interface {v2, v0, v1}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_1
+
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/c/i;->unsubscribe()V
+
+    return-void
+
+    :catchall_1
+    move-exception v0
+
+    invoke-virtual {p0}, Ls0/l/c/i;->unsubscribe()V
+
+    throw v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    iget-boolean v0, v0, Lrx/internal/util/SubscriptionList;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/l/c/i;->cancel:Lrx/internal/util/SubscriptionList;
+
+    invoke-virtual {v0}, Lrx/internal/util/SubscriptionList;->unsubscribe()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/j.smali b/com.discord/smali_classes2/s0/l/c/j.smali
new file mode 100644
index 0000000000..3de2c2ab95
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/j.smali
@@ -0,0 +1,8 @@
+.class public interface abstract Ls0/l/c/j;
+.super Ljava/lang/Object;
+.source "SchedulerLifecycle.java"
+
+
+# virtual methods
+.method public abstract shutdown()V
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/k.smali b/com.discord/smali_classes2/s0/l/c/k.smali
new file mode 100644
index 0000000000..f49d17573b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/k.smali
@@ -0,0 +1,109 @@
+.class public Ls0/l/c/k;
+.super Ljava/lang/Object;
+.source "SleepingAction.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final d:Lrx/functions/Action0;
+
+.field public final e:Lrx/Scheduler$Worker;
+
+.field public final f:J
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action0;Lrx/Scheduler$Worker;J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/k;->d:Lrx/functions/Action0;
+
+    iput-object p2, p0, Ls0/l/c/k;->e:Lrx/Scheduler$Worker;
+
+    iput-wide p3, p0, Ls0/l/c/k;->f:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/l/c/k;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-wide v0, p0, Ls0/l/c/k;->f:J
+
+    iget-object v2, p0, Ls0/l/c/k;->e:Lrx/Scheduler$Worker;
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_3
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v4
+
+    sub-long/2addr v0, v4
+
+    const-wide/16 v4, 0x0
+
+    cmp-long v2, v0, v4
+
+    if-lez v2, :cond_1
+
+    :try_start_0
+    invoke-static {v0, v1}, Ljava/lang/Thread;->sleep(J)V
+    :try_end_0
+    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v0
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->interrupt()V
+
+    invoke-static {v0}, Lf/n/a/k/a;->O(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+
+    throw v3
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Ls0/l/c/k;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    return-void
+
+    :cond_2
+    iget-object v0, p0, Ls0/l/c/k;->d:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    return-void
+
+    :cond_3
+    throw v3
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/l$a$a.smali b/com.discord/smali_classes2/s0/l/c/l$a$a.smali
new file mode 100644
index 0000000000..1403f9fa91
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/l$a$a.smali
@@ -0,0 +1,53 @@
+.class public Ls0/l/c/l$a$a;
+.super Ljava/lang/Object;
+.source "TrampolineScheduler.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/c/l$a;->d(Lrx/functions/Action0;J)Lrx/Subscription;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/c/l$b;
+
+.field public final synthetic e:Ls0/l/c/l$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/c/l$a;Ls0/l/c/l$b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/c/l$a$a;->e:Ls0/l/c/l$a;
+
+    iput-object p2, p0, Ls0/l/c/l$a$a;->d:Ls0/l/c/l$b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/c/l$a$a;->e:Ls0/l/c/l$a;
+
+    iget-object v0, v0, Ls0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
+
+    iget-object v1, p0, Ls0/l/c/l$a$a;->d:Ls0/l/c/l$b;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/PriorityBlockingQueue;->remove(Ljava/lang/Object;)Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/l$a.smali b/com.discord/smali_classes2/s0/l/c/l$a.smali
new file mode 100644
index 0000000000..27b51a210f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/l$a.smali
@@ -0,0 +1,213 @@
+.class public final Ls0/l/c/l$a;
+.super Lrx/Scheduler$Worker;
+.source "TrampolineScheduler.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+.field public final e:Ljava/util/concurrent/PriorityBlockingQueue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/PriorityBlockingQueue<",
+            "Ls0/l/c/l$b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Ls0/r/a;
+
+.field public final g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lrx/Scheduler$Worker;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/l$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    new-instance v0, Ljava/util/concurrent/PriorityBlockingQueue;
+
+    invoke-direct {v0}, Ljava/util/concurrent/PriorityBlockingQueue;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
+
+    new-instance v0, Ls0/r/a;
+
+    invoke-direct {v0}, Ls0/r/a;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/l$a;->f:Ls0/r/a;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object v0, p0, Ls0/l/c/l$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lrx/functions/Action0;)Lrx/Subscription;
+    .locals 2
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0, p1, v0, v1}, Ls0/l/c/l$a;->d(Lrx/functions/Action0;J)Lrx/Subscription;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public b(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Lrx/Subscription;
+    .locals 2
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v0
+
+    invoke-virtual {p4, p2, p3}, Ljava/util/concurrent/TimeUnit;->toMillis(J)J
+
+    move-result-wide p2
+
+    add-long/2addr p2, v0
+
+    new-instance p4, Ls0/l/c/k;
+
+    invoke-direct {p4, p1, p0, p2, p3}, Ls0/l/c/k;-><init>(Lrx/functions/Action0;Lrx/Scheduler$Worker;J)V
+
+    invoke-virtual {p0, p4, p2, p3}, Ls0/l/c/l$a;->d(Lrx/functions/Action0;J)Lrx/Subscription;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final d(Lrx/functions/Action0;J)Lrx/Subscription;
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/l$a;->f:Ls0/r/a;
+
+    invoke-virtual {v0}, Ls0/r/a;->isUnsubscribed()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_0
+    new-instance v0, Ls0/l/c/l$b;
+
+    invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p2
+
+    iget-object p3, p0, Ls0/l/c/l$a;->d:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {p3}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
+
+    move-result p3
+
+    invoke-direct {v0, p1, p2, p3}, Ls0/l/c/l$b;-><init>(Lrx/functions/Action0;Ljava/lang/Long;I)V
+
+    iget-object p1, p0, Ls0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
+
+    invoke-virtual {p1, v0}, Ljava/util/concurrent/PriorityBlockingQueue;->add(Ljava/lang/Object;)Z
+
+    iget-object p1, p0, Ls0/l/c/l$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result p1
+
+    if-nez p1, :cond_3
+
+    :cond_1
+    iget-object p1, p0, Ls0/l/c/l$a;->e:Ljava/util/concurrent/PriorityBlockingQueue;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/PriorityBlockingQueue;->poll()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ls0/l/c/l$b;
+
+    if-eqz p1, :cond_2
+
+    iget-object p1, p1, Ls0/l/c/l$b;->d:Lrx/functions/Action0;
+
+    invoke-interface {p1}, Lrx/functions/Action0;->call()V
+
+    :cond_2
+    iget-object p1, p0, Ls0/l/c/l$a;->g:Ljava/util/concurrent/atomic/AtomicInteger;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
+
+    move-result p1
+
+    if-gtz p1, :cond_1
+
+    sget-object p1, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-object p1
+
+    :cond_3
+    new-instance p1, Ls0/l/c/l$a$a;
+
+    invoke-direct {p1, p0, v0}, Ls0/l/c/l$a$a;-><init>(Ls0/l/c/l$a;Ls0/l/c/l$b;)V
+
+    new-instance p2, Ls0/r/a;
+
+    invoke-direct {p2, p1}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    return-object p2
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/l$a;->f:Ls0/r/a;
+
+    invoke-virtual {v0}, Ls0/r/a;->isUnsubscribed()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/c/l$a;->f:Ls0/r/a;
+
+    invoke-virtual {v0}, Ls0/r/a;->unsubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/l$b.smali b/com.discord/smali_classes2/s0/l/c/l$b.smali
new file mode 100644
index 0000000000..c1a5cf1db8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/l$b.smali
@@ -0,0 +1,98 @@
+.class public final Ls0/l/c/l$b;
+.super Ljava/lang/Object;
+.source "TrampolineScheduler.java"
+
+# interfaces
+.implements Ljava/lang/Comparable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/c/l;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ljava/lang/Comparable<",
+        "Ls0/l/c/l$b;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action0;
+
+.field public final e:Ljava/lang/Long;
+
+.field public final f:I
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action0;Ljava/lang/Long;I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/c/l$b;->d:Lrx/functions/Action0;
+
+    iput-object p2, p0, Ls0/l/c/l$b;->e:Ljava/lang/Long;
+
+    iput p3, p0, Ls0/l/c/l$b;->f:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public compareTo(Ljava/lang/Object;)I
+    .locals 2
+
+    check-cast p1, Ls0/l/c/l$b;
+
+    iget-object v0, p0, Ls0/l/c/l$b;->e:Ljava/lang/Long;
+
+    iget-object v1, p1, Ls0/l/c/l$b;->e:Ljava/lang/Long;
+
+    invoke-virtual {v0, v1}, Ljava/lang/Long;->compareTo(Ljava/lang/Long;)I
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    iget v0, p0, Ls0/l/c/l$b;->f:I
+
+    iget p1, p1, Ls0/l/c/l$b;->f:I
+
+    if-ge v0, p1, :cond_0
+
+    const/4 p1, -0x1
+
+    const/4 v0, -0x1
+
+    goto :goto_0
+
+    :cond_0
+    if-ne v0, p1, :cond_1
+
+    const/4 p1, 0x0
+
+    const/4 v0, 0x0
+
+    goto :goto_0
+
+    :cond_1
+    const/4 p1, 0x1
+
+    const/4 v0, 0x1
+
+    :cond_2
+    :goto_0
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/c/l.smali b/com.discord/smali_classes2/s0/l/c/l.smali
new file mode 100644
index 0000000000..d862bcf164
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/c/l.smali
@@ -0,0 +1,50 @@
+.class public final Ls0/l/c/l;
+.super Lrx/Scheduler;
+.source "TrampolineScheduler.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/c/l$b;,
+        Ls0/l/c/l$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/l/c/l;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/c/l;
+
+    invoke-direct {v0}, Ls0/l/c/l;-><init>()V
+
+    sput-object v0, Ls0/l/c/l;->a:Ls0/l/c/l;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Lrx/Scheduler;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lrx/Scheduler$Worker;
+    .locals 1
+
+    new-instance v0, Ls0/l/c/l$a;
+
+    invoke-direct {v0}, Ls0/l/c/l$a;-><init>()V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/d/a.smali b/com.discord/smali_classes2/s0/l/d/a.smali
new file mode 100644
index 0000000000..fa8a59f70c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/d/a.smali
@@ -0,0 +1,148 @@
+.class public final Ls0/l/d/a;
+.super Ljava/util/concurrent/atomic/AtomicReference;
+.source "SequentialSubscription.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/util/concurrent/atomic/AtomicReference<",
+        "Lrx/Subscription;",
+        ">;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0xdcfadb4b3205d9dL
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/Subscription;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    invoke-virtual {p0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Lrx/Subscription;
+    .locals 2
+
+    invoke-super {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Subscription;
+
+    sget-object v1, Ls0/l/d/b;->d:Ls0/l/d/b;
+
+    if-ne v0, v1, :cond_0
+
+    sget-object v0, Ls0/r/c;->a:Ls0/r/c$a;
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public b(Lrx/Subscription;)Z
+    .locals 2
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Subscription;
+
+    sget-object v1, Ls0/l/d/b;->d:Ls0/l/d/b;
+
+    if-ne v0, v1, :cond_2
+
+    if-eqz p1, :cond_1
+
+    invoke-interface {p1}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_1
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_2
+    invoke-virtual {p0, v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 2
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    sget-object v1, Ls0/l/d/b;->d:Ls0/l/d/b;
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 2
+
+    sget-object v0, Ls0/l/d/b;->d:Ls0/l/d/b;
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lrx/Subscription;
+
+    if-eq v1, v0, :cond_0
+
+    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lrx/Subscription;
+
+    if-eqz v1, :cond_0
+
+    if-eq v1, v0, :cond_0
+
+    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/d/b.smali b/com.discord/smali_classes2/s0/l/d/b.smali
new file mode 100644
index 0000000000..0fcdc1e99d
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/d/b.smali
@@ -0,0 +1,106 @@
+.class public final enum Ls0/l/d/b;
+.super Ljava/lang/Enum;
+.source "Unsubscribed.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/l/d/b;",
+        ">;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ls0/l/d/b;
+
+.field public static final synthetic e:[Ls0/l/d/b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Ls0/l/d/b;
+
+    const-string v1, "INSTANCE"
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v1, v2}, Ls0/l/d/b;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Ls0/l/d/b;->d:Ls0/l/d/b;
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ls0/l/d/b;
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Ls0/l/d/b;->e:[Ls0/l/d/b;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/l/d/b;
+    .locals 1
+
+    const-class v0, Ls0/l/d/b;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/l/d/b;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/l/d/b;
+    .locals 1
+
+    sget-object v0, Ls0/l/d/b;->e:[Ls0/l/d/b;
+
+    invoke-virtual {v0}, [Ls0/l/d/b;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/l/d/b;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/a.smali b/com.discord/smali_classes2/s0/l/e/a.smali
new file mode 100644
index 0000000000..53ea05b383
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/a.smali
@@ -0,0 +1,109 @@
+.class public final Ls0/l/e/a;
+.super Ljava/lang/Object;
+.source "ActionObserver.java"
+
+# interfaces
+.implements Ls0/g;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/g<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Lrx/functions/Action0;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Action1<",
+            "-TT;>;",
+            "Lrx/functions/Action1<",
+            "-",
+            "Ljava/lang/Throwable;",
+            ">;",
+            "Lrx/functions/Action0;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/a;->d:Lrx/functions/Action1;
+
+    iput-object p2, p0, Ls0/l/e/a;->e:Lrx/functions/Action1;
+
+    iput-object p3, p0, Ls0/l/e/a;->f:Lrx/functions/Action0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/e/a;->f:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/e/a;->e:Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/a;->d:Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/b.smali b/com.discord/smali_classes2/s0/l/e/b.smali
new file mode 100644
index 0000000000..2066931c1f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/b.smali
@@ -0,0 +1,103 @@
+.class public final Ls0/l/e/b;
+.super Lrx/Subscriber;
+.source "ActionSubscriber.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final f:Lrx/functions/Action0;
+
+
+# direct methods
+.method public constructor <init>(Lrx/functions/Action1;Lrx/functions/Action1;Lrx/functions/Action0;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Action1<",
+            "-TT;>;",
+            "Lrx/functions/Action1<",
+            "Ljava/lang/Throwable;",
+            ">;",
+            "Lrx/functions/Action0;",
+            ")V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/b;->d:Lrx/functions/Action1;
+
+    iput-object p2, p0, Ls0/l/e/b;->e:Lrx/functions/Action1;
+
+    iput-object p3, p0, Ls0/l/e/b;->f:Lrx/functions/Action0;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/e/b;->f:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/e/b;->e:Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/b;->d:Lrx/functions/Action1;
+
+    invoke-interface {v0, p1}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/c$a.smali b/com.discord/smali_classes2/s0/l/e/c$a.smali
new file mode 100644
index 0000000000..d2bbb7b1dc
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/c$a.smali
@@ -0,0 +1,14 @@
+.class public interface abstract Ls0/l/e/c$a;
+.super Ljava/lang/Object;
+.source "BackpressureDrainManager.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "a"
+.end annotation
diff --git a/com.discord/smali_classes2/s0/l/e/c.smali b/com.discord/smali_classes2/s0/l/e/c.smali
new file mode 100644
index 0000000000..c2f8fda03b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/c.smali
@@ -0,0 +1,463 @@
+.class public final Ls0/l/e/c;
+.super Ljava/util/concurrent/atomic/AtomicLong;
+.source "BackpressureDrainManager.java"
+
+# interfaces
+.implements Lrx/Producer;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/e/c$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x2738d34f11cd4869L
+
+
+# instance fields
+.field public final actual:Ls0/l/e/c$a;
+
+.field public emitting:Z
+
+.field public exception:Ljava/lang/Throwable;
+
+.field public volatile terminated:Z
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/e/c$a;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/c;->actual:Ls0/l/e/c$a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 14
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/l/e/c;->emitting:Z
+
+    if-eqz v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/l/e/c;->emitting:Z
+
+    iget-boolean v1, p0, Ls0/l/e/c;->terminated:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_7
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    const/4 v4, 0x0
+
+    :try_start_1
+    iget-object v5, p0, Ls0/l/e/c;->actual:Ls0/l/e/c$a;
+
+    :goto_0
+    const/4 v6, 0x0
+
+    :goto_1
+    const-wide/16 v7, 0x0
+
+    cmp-long v9, v2, v7
+
+    if-gtz v9, :cond_1
+
+    if-eqz v1, :cond_6
+
+    :cond_1
+    if-eqz v1, :cond_4
+
+    move-object v10, v5
+
+    check-cast v10, Ls0/l/a/d1$a;
+
+    iget-object v10, v10, Ls0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v10}, Ljava/util/concurrent/ConcurrentLinkedQueue;->peek()Ljava/lang/Object;
+
+    move-result-object v10
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_5
+
+    if-nez v10, :cond_3
+
+    :try_start_2
+    iget-object v1, p0, Ls0/l/e/c;->exception:Ljava/lang/Throwable;
+
+    check-cast v5, Ls0/l/a/d1$a;
+
+    if-eqz v1, :cond_2
+
+    iget-object v2, v5, Ls0/l/a/d1$a;->f:Lrx/Subscriber;
+
+    invoke-interface {v2, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :cond_2
+    iget-object v1, v5, Ls0/l/a/d1$a;->f:Lrx/Subscriber;
+
+    invoke-interface {v1}, Ls0/g;->onCompleted()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    :goto_2
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    move-object v2, p0
+
+    goto/16 :goto_8
+
+    :cond_3
+    if-nez v9, :cond_4
+
+    goto :goto_3
+
+    :cond_4
+    :try_start_3
+    move-object v9, v5
+
+    check-cast v9, Ls0/l/a/d1$a;
+
+    iget-object v10, v9, Ls0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v10}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
+
+    move-result-object v10
+
+    iget-object v9, v9, Ls0/l/a/d1$a;->e:Ljava/util/concurrent/atomic/AtomicLong;
+
+    if-eqz v9, :cond_5
+
+    if-eqz v10, :cond_5
+
+    invoke-virtual {v9}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
+
+    :cond_5
+    if-nez v10, :cond_d
+
+    :cond_6
+    :goto_3
+    monitor-enter p0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_5
+
+    :try_start_4
+    iget-boolean v1, p0, Ls0/l/e/c;->terminated:Z
+
+    move-object v2, v5
+
+    check-cast v2, Ls0/l/a/d1$a;
+
+    iget-object v2, v2, Ls0/l/a/d1$a;->d:Ljava/util/concurrent/ConcurrentLinkedQueue;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/ConcurrentLinkedQueue;->peek()Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_7
+
+    const/4 v2, 0x1
+
+    goto :goto_4
+
+    :cond_7
+    const/4 v2, 0x0
+
+    :goto_4
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v9
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_2
+
+    const-wide v11, 0x7fffffffffffffffL
+
+    cmp-long v3, v9, v11
+
+    if-nez v3, :cond_9
+
+    if-nez v2, :cond_8
+
+    if-nez v1, :cond_8
+
+    :try_start_5
+    iput-boolean v4, p0, Ls0/l/e/c;->emitting:Z
+
+    monitor-exit p0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_1
+
+    return-void
+
+    :catchall_1
+    move-exception v1
+
+    move-object v2, p0
+
+    move-object v0, v1
+
+    const/4 v1, 0x1
+
+    goto :goto_7
+
+    :cond_8
+    move-wide v2, v11
+
+    goto :goto_5
+
+    :cond_9
+    neg-int v3, v6
+
+    int-to-long v9, v3
+
+    :try_start_6
+    invoke-virtual {p0, v9, v10}, Ljava/util/concurrent/atomic/AtomicLong;->addAndGet(J)J
+
+    move-result-wide v9
+
+    cmp-long v3, v9, v7
+
+    if-eqz v3, :cond_a
+
+    if-nez v2, :cond_b
+
+    :cond_a
+    if-eqz v1, :cond_c
+
+    if-eqz v2, :cond_b
+
+    goto :goto_6
+
+    :cond_b
+    move-wide v2, v9
+
+    :goto_5
+    monitor-exit p0
+    :try_end_6
+    .catchall {:try_start_6 .. :try_end_6} :catchall_2
+
+    goto/16 :goto_0
+
+    :cond_c
+    :goto_6
+    :try_start_7
+    iput-boolean v4, p0, Ls0/l/e/c;->emitting:Z
+
+    monitor-exit p0
+    :try_end_7
+    .catchall {:try_start_7 .. :try_end_7} :catchall_1
+
+    return-void
+
+    :catchall_2
+    move-exception v0
+
+    const/4 v1, 0x0
+
+    move-object v2, p0
+
+    :goto_7
+    :try_start_8
+    monitor-exit v2
+    :try_end_8
+    .catchall {:try_start_8 .. :try_end_8} :catchall_4
+
+    :try_start_9
+    throw v0
+    :try_end_9
+    .catchall {:try_start_9 .. :try_end_9} :catchall_3
+
+    :catchall_3
+    move-exception v0
+
+    move v13, v1
+
+    move-object v1, v0
+
+    move v0, v13
+
+    goto :goto_8
+
+    :catchall_4
+    move-exception v0
+
+    goto :goto_7
+
+    :cond_d
+    :try_start_a
+    move-object v7, v5
+
+    check-cast v7, Ls0/l/a/d1$a;
+
+    iget-object v7, v7, Ls0/l/a/d1$a;->f:Lrx/Subscriber;
+
+    invoke-static {v7, v10}, Ls0/l/a/h;->a(Ls0/g;Ljava/lang/Object;)Z
+
+    move-result v7
+    :try_end_a
+    .catchall {:try_start_a .. :try_end_a} :catchall_5
+
+    if-eqz v7, :cond_e
+
+    return-void
+
+    :cond_e
+    const-wide/16 v7, 0x1
+
+    sub-long/2addr v2, v7
+
+    add-int/lit8 v6, v6, 0x1
+
+    goto/16 :goto_1
+
+    :catchall_5
+    move-exception v0
+
+    move-object v1, v0
+
+    move-object v2, p0
+
+    const/4 v0, 0x0
+
+    :goto_8
+    if-nez v0, :cond_f
+
+    monitor-enter v2
+
+    :try_start_b
+    iput-boolean v4, v2, Ls0/l/e/c;->emitting:Z
+
+    monitor-exit v2
+
+    goto :goto_9
+
+    :catchall_6
+    move-exception v0
+
+    monitor-exit v2
+    :try_end_b
+    .catchall {:try_start_b .. :try_end_b} :catchall_6
+
+    throw v0
+
+    :cond_f
+    :goto_9
+    throw v1
+
+    :catchall_7
+    move-exception v0
+
+    :try_start_c
+    monitor-exit p0
+    :try_end_c
+    .catchall {:try_start_c .. :try_end_c} :catchall_7
+
+    throw v0
+.end method
+
+.method public m(J)V
+    .locals 10
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-nez v2, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    const/4 v4, 0x1
+
+    cmp-long v5, v2, v0
+
+    if-nez v5, :cond_1
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v5, 0x0
+
+    :goto_0
+    const-wide v6, 0x7fffffffffffffffL
+
+    cmp-long v8, v2, v6
+
+    if-nez v8, :cond_2
+
+    goto :goto_3
+
+    :cond_2
+    cmp-long v8, p1, v6
+
+    if-nez v8, :cond_3
+
+    move-wide v6, p1
+
+    goto :goto_2
+
+    :cond_3
+    sub-long v8, v6, p1
+
+    cmp-long v4, v2, v8
+
+    if-lez v4, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    add-long v6, v2, p1
+
+    :goto_1
+    move v4, v5
+
+    :goto_2
+    invoke-virtual {p0, v2, v3, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->compareAndSet(JJ)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    move v5, v4
+
+    :goto_3
+    if-eqz v5, :cond_5
+
+    invoke-virtual {p0}, Ls0/l/e/c;->a()V
+
+    :cond_5
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/d.smali b/com.discord/smali_classes2/s0/l/e/d.smali
new file mode 100644
index 0000000000..4178b8e5fe
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/d.smali
@@ -0,0 +1,204 @@
+.class public final enum Ls0/l/e/d;
+.super Ljava/lang/Enum;
+.source "ExceptionsUtils.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/l/e/d;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ljava/lang/Throwable;
+
+.field public static final synthetic e:[Ls0/l/e/d;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ls0/l/e/d;
+
+    sput-object v0, Ls0/l/e/d;->e:[Ls0/l/e/d;
+
+    new-instance v0, Ljava/lang/Throwable;
+
+    const-string v1, "Terminated"
+
+    invoke-direct {v0, v1}, Ljava/lang/Throwable;-><init>(Ljava/lang/String;)V
+
+    sput-object v0, Ls0/l/e/d;->d:Ljava/lang/Throwable;
+
+    return-void
+.end method
+
+.method public static f(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Throwable;)Z
+    .locals 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/lang/Throwable;",
+            ">;",
+            "Ljava/lang/Throwable;",
+            ")Z"
+        }
+    .end annotation
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    sget-object v1, Ls0/l/e/d;->d:Ljava/lang/Throwable;
+
+    const/4 v2, 0x0
+
+    if-ne v0, v1, :cond_1
+
+    return v2
+
+    :cond_1
+    const/4 v1, 0x1
+
+    if-nez v0, :cond_2
+
+    move-object v3, p1
+
+    goto :goto_0
+
+    :cond_2
+    instance-of v3, v0, Lrx/exceptions/CompositeException;
+
+    if-eqz v3, :cond_3
+
+    new-instance v2, Ljava/util/ArrayList;
+
+    move-object v3, v0
+
+    check-cast v3, Lrx/exceptions/CompositeException;
+
+    iget-object v3, v3, Lrx/exceptions/CompositeException;->exceptions:Ljava/util/List;
+
+    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+
+    invoke-virtual {v2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    new-instance v3, Lrx/exceptions/CompositeException;
+
+    invoke-direct {v3, v2}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    goto :goto_0
+
+    :cond_3
+    new-instance v3, Lrx/exceptions/CompositeException;
+
+    const/4 v4, 0x2
+
+    new-array v4, v4, [Ljava/lang/Throwable;
+
+    aput-object v0, v4, v2
+
+    aput-object p1, v4, v1
+
+    invoke-direct {v3, v4}, Lrx/exceptions/CompositeException;-><init>([Ljava/lang/Throwable;)V
+
+    :goto_0
+    invoke-virtual {p0, v0, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return v1
+.end method
+
+.method public static g(Ljava/lang/Throwable;)Z
+    .locals 1
+
+    sget-object v0, Ls0/l/e/d;->d:Ljava/lang/Throwable;
+
+    if-ne p0, v0, :cond_0
+
+    const/4 p0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    :goto_0
+    return p0
+.end method
+
+.method public static h(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ljava/lang/Throwable;",
+            ">;)",
+            "Ljava/lang/Throwable;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    sget-object v1, Ls0/l/e/d;->d:Ljava/lang/Throwable;
+
+    if-eq v0, v1, :cond_0
+
+    invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    move-object v0, p0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    :cond_0
+    return-object v0
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/l/e/d;
+    .locals 1
+
+    const-class v0, Ls0/l/e/d;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/l/e/d;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/l/e/d;
+    .locals 1
+
+    sget-object v0, Ls0/l/e/d;->e:[Ls0/l/e/d;
+
+    invoke-virtual {v0}, [Ls0/l/e/d;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/l/e/d;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/e$a.smali b/com.discord/smali_classes2/s0/l/e/e$a.smali
new file mode 100644
index 0000000000..f130bea2a8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/e$a.smali
@@ -0,0 +1,50 @@
+.class public final Ls0/l/e/e$a;
+.super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    new-instance v0, Lrx/exceptions/OnErrorNotImplementedException;
+
+    invoke-direct {v0, p1}, Lrx/exceptions/OnErrorNotImplementedException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/e$b.smali b/com.discord/smali_classes2/s0/l/e/e$b.smali
new file mode 100644
index 0000000000..5358c35e09
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/e$b.smali
@@ -0,0 +1,50 @@
+.class public final Ls0/l/e/e$b;
+.super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ls0/f<",
+        "*>;",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ls0/f;
+
+    iget-object p1, p1, Ls0/f;->b:Ljava/lang/Throwable;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/e$c.smali b/com.discord/smali_classes2/s0/l/e/e$c.smali
new file mode 100644
index 0000000000..c5e560bb0c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/e$c.smali
@@ -0,0 +1,96 @@
+.class public final Ls0/l/e/e$c;
+.super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/Observable<",
+        "+",
+        "Ls0/f<",
+        "*>;>;",
+        "Lrx/Observable<",
+        "*>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-",
+            "Lrx/Observable<",
+            "+",
+            "Ljava/lang/Void;",
+            ">;+",
+            "Lrx/Observable<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/k/b<",
+            "-",
+            "Lrx/Observable<",
+            "+",
+            "Ljava/lang/Void;",
+            ">;+",
+            "Lrx/Observable<",
+            "*>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/e$c;->d:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/Observable;
+
+    iget-object v0, p0, Ls0/l/e/e$c;->d:Ls0/k/b;
+
+    sget-object v1, Ls0/l/e/e;->d:Ls0/l/e/e$e;
+
+    invoke-virtual {p1, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lrx/Observable;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/e$d.smali b/com.discord/smali_classes2/s0/l/e/e$d.smali
new file mode 100644
index 0000000000..5f2a532bc3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/e$d.smali
@@ -0,0 +1,96 @@
+.class public final Ls0/l/e/e$d;
+.super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "d"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/Observable<",
+        "+",
+        "Ls0/f<",
+        "*>;>;",
+        "Lrx/Observable<",
+        "*>;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "-",
+            "Lrx/Observable<",
+            "+",
+            "Ljava/lang/Throwable;",
+            ">;+",
+            "Lrx/Observable<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/k/b<",
+            "-",
+            "Lrx/Observable<",
+            "+",
+            "Ljava/lang/Throwable;",
+            ">;+",
+            "Lrx/Observable<",
+            "*>;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/e$d;->d:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/Observable;
+
+    iget-object v0, p0, Ls0/l/e/e$d;->d:Ls0/k/b;
+
+    sget-object v1, Ls0/l/e/e;->e:Ls0/l/e/e$b;
+
+    invoke-virtual {p1, v1}, Lrx/Observable;->E(Ls0/k/b;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Lrx/Observable;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/e$e.smali b/com.discord/smali_classes2/s0/l/e/e$e.smali
new file mode 100644
index 0000000000..c1ead367fd
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/e$e.smali
@@ -0,0 +1,47 @@
+.class public final Ls0/l/e/e$e;
+.super Ljava/lang/Object;
+.source "InternalObservableUtils.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/e;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "e"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Void;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    const/4 p1, 0x0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/e.smali b/com.discord/smali_classes2/s0/l/e/e.smali
new file mode 100644
index 0000000000..f269a7fb26
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/e.smali
@@ -0,0 +1,101 @@
+.class public final enum Ls0/l/e/e;
+.super Ljava/lang/Enum;
+.source "InternalObservableUtils.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/e/e$a;,
+        Ls0/l/e/e$b;,
+        Ls0/l/e/e$d;,
+        Ls0/l/e/e$e;,
+        Ls0/l/e/e$c;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/l/e/e;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:Ls0/l/e/e$e;
+
+.field public static final e:Ls0/l/e/e$b;
+
+.field public static final f:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final synthetic g:[Ls0/l/e/e;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ls0/l/e/e;
+
+    sput-object v0, Ls0/l/e/e;->g:[Ls0/l/e/e;
+
+    new-instance v0, Ls0/l/e/e$e;
+
+    invoke-direct {v0}, Ls0/l/e/e$e;-><init>()V
+
+    sput-object v0, Ls0/l/e/e;->d:Ls0/l/e/e$e;
+
+    new-instance v0, Ls0/l/e/e$b;
+
+    invoke-direct {v0}, Ls0/l/e/e$b;-><init>()V
+
+    sput-object v0, Ls0/l/e/e;->e:Ls0/l/e/e$b;
+
+    new-instance v0, Ls0/l/e/e$a;
+
+    invoke-direct {v0}, Ls0/l/e/e$a;-><init>()V
+
+    sput-object v0, Ls0/l/e/e;->f:Lrx/functions/Action1;
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/l/e/e;
+    .locals 1
+
+    const-class v0, Ls0/l/e/e;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/l/e/e;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/l/e/e;
+    .locals 1
+
+    sget-object v0, Ls0/l/e/e;->g:[Ls0/l/e/e;
+
+    invoke-virtual {v0}, [Ls0/l/e/e;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/l/e/e;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/f.smali b/com.discord/smali_classes2/s0/l/e/f.smali
new file mode 100644
index 0000000000..7498bee256
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/f.smali
@@ -0,0 +1,304 @@
+.class public final Ls0/l/e/f;
+.super Ljava/lang/Object;
+.source "OpenHashSet.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:F
+
+.field public b:I
+
+.field public c:I
+
+.field public d:I
+
+.field public e:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 3
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/high16 v0, 0x3f400000    # 0.75f
+
+    iput v0, p0, Ls0/l/e/f;->a:F
+
+    const/16 v1, 0x10
+
+    invoke-static {v1}, Lf/n/a/k/a;->S(I)I
+
+    move-result v1
+
+    add-int/lit8 v2, v1, -0x1
+
+    iput v2, p0, Ls0/l/e/f;->b:I
+
+    int-to-float v2, v1
+
+    mul-float v0, v0, v2
+
+    float-to-int v0, v0
+
+    iput v0, p0, Ls0/l/e/f;->d:I
+
+    new-array v0, v1, [Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/e/f;->e:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public static b(I)I
+    .locals 1
+
+    const v0, -0x61c88647
+
+    mul-int p0, p0, v0
+
+    ushr-int/lit8 v0, p0, 0x10
+
+    xor-int/2addr p0, v0
+
+    return p0
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)Z
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/f;->e:[Ljava/lang/Object;
+
+    iget v1, p0, Ls0/l/e/f;->b:I
+
+    invoke-virtual {p1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    invoke-static {v2}, Ls0/l/e/f;->b(I)I
+
+    move-result v2
+
+    and-int/2addr v2, v1
+
+    aget-object v3, v0, v2
+
+    const/4 v4, 0x1
+
+    if-eqz v3, :cond_2
+
+    invoke-virtual {v3, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    const/4 v5, 0x0
+
+    if-eqz v3, :cond_0
+
+    return v5
+
+    :cond_0
+    add-int/2addr v2, v4
+
+    and-int/2addr v2, v1
+
+    aget-object v3, v0, v2
+
+    if-nez v3, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {v3, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_0
+
+    return v5
+
+    :cond_2
+    :goto_0
+    aput-object p1, v0, v2
+
+    iget p1, p0, Ls0/l/e/f;->c:I
+
+    add-int/2addr p1, v4
+
+    iput p1, p0, Ls0/l/e/f;->c:I
+
+    iget v0, p0, Ls0/l/e/f;->d:I
+
+    if-lt p1, v0, :cond_7
+
+    iget-object v0, p0, Ls0/l/e/f;->e:[Ljava/lang/Object;
+
+    array-length v1, v0
+
+    shl-int/lit8 v2, v1, 0x1
+
+    add-int/lit8 v3, v2, -0x1
+
+    new-array v5, v2, [Ljava/lang/Object;
+
+    :goto_1
+    add-int/lit8 v6, p1, -0x1
+
+    if-eqz p1, :cond_6
+
+    :goto_2
+    add-int/lit8 v1, v1, -0x1
+
+    aget-object p1, v0, v1
+
+    if-nez p1, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    aget-object p1, v0, v1
+
+    invoke-virtual {p1}, Ljava/lang/Object;->hashCode()I
+
+    move-result p1
+
+    invoke-static {p1}, Ls0/l/e/f;->b(I)I
+
+    move-result p1
+
+    and-int/2addr p1, v3
+
+    aget-object v7, v5, p1
+
+    if-eqz v7, :cond_5
+
+    :cond_4
+    add-int/2addr p1, v4
+
+    and-int/2addr p1, v3
+
+    aget-object v7, v5, p1
+
+    if-nez v7, :cond_4
+
+    :cond_5
+    aget-object v7, v0, v1
+
+    aput-object v7, v5, p1
+
+    move p1, v6
+
+    goto :goto_1
+
+    :cond_6
+    iput v3, p0, Ls0/l/e/f;->b:I
+
+    int-to-float p1, v2
+
+    iget v0, p0, Ls0/l/e/f;->a:F
+
+    mul-float p1, p1, v0
+
+    float-to-int p1, p1
+
+    iput p1, p0, Ls0/l/e/f;->d:I
+
+    iput-object v5, p0, Ls0/l/e/f;->e:[Ljava/lang/Object;
+
+    :cond_7
+    return v4
+.end method
+
+.method public c(I[Ljava/lang/Object;I)Z
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(I[TT;I)Z"
+        }
+    .end annotation
+
+    iget v0, p0, Ls0/l/e/f;->c:I
+
+    const/4 v1, 0x1
+
+    sub-int/2addr v0, v1
+
+    iput v0, p0, Ls0/l/e/f;->c:I
+
+    :goto_0
+    add-int/lit8 v0, p1, 0x1
+
+    :goto_1
+    and-int/2addr v0, p3
+
+    aget-object v2, p2, v0
+
+    if-nez v2, :cond_0
+
+    const/4 p3, 0x0
+
+    aput-object p3, p2, p1
+
+    return v1
+
+    :cond_0
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v3
+
+    invoke-static {v3}, Ls0/l/e/f;->b(I)I
+
+    move-result v3
+
+    and-int/2addr v3, p3
+
+    if-gt p1, v0, :cond_1
+
+    if-ge p1, v3, :cond_2
+
+    if-le v3, v0, :cond_3
+
+    goto :goto_2
+
+    :cond_1
+    if-lt p1, v3, :cond_3
+
+    if-le v3, v0, :cond_3
+
+    :cond_2
+    :goto_2
+    aput-object v2, p2, p1
+
+    move p1, v0
+
+    goto :goto_0
+
+    :cond_3
+    add-int/lit8 v0, v0, 0x1
+
+    goto :goto_1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/g.smali b/com.discord/smali_classes2/s0/l/e/g.smali
new file mode 100644
index 0000000000..eef97543c3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/g.smali
@@ -0,0 +1,61 @@
+.class public final Ls0/l/e/g;
+.super Ljava/lang/Object;
+.source "PlatformDependent.java"
+
+
+# static fields
+.field public static final a:I
+
+.field public static final b:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    const-string v1, "android.os.Build$VERSION"
+
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object v1
+
+    const-string v2, "SDK_INT"
+
+    invoke-virtual {v1, v2}, Ljava/lang/Class;->getField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Integer;
+
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v1
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    const/4 v1, 0x0
+
+    :goto_0
+    sput v1, Ls0/l/e/g;->a:I
+
+    if-eqz v1, :cond_0
+
+    const/4 v0, 0x1
+
+    :cond_0
+    sput-boolean v0, Ls0/l/e/g;->b:Z
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/h.smali b/com.discord/smali_classes2/s0/l/e/h.smali
new file mode 100644
index 0000000000..20394355dc
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/h.smali
@@ -0,0 +1,361 @@
+.class public Ls0/l/e/h;
+.super Ljava/lang/Object;
+.source "RxRingBuffer.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# static fields
+.field public static final f:I
+
+
+# instance fields
+.field public d:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public volatile e:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 6
+
+    sget-boolean v0, Ls0/l/e/g;->b:Z
+
+    if-eqz v0, :cond_0
+
+    const/16 v0, 0x10
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v0, 0x80
+
+    :goto_0
+    const-string v1, "rx.ring-buffer.size"
+
+    invoke-static {v1}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    :try_start_0
+    invoke-static {v1}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v0
+    :try_end_0
+    .catch Ljava/lang/NumberFormatException; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_1
+
+    :catch_0
+    move-exception v2
+
+    sget-object v3, Ljava/lang/System;->err:Ljava/io/PrintStream;
+
+    const-string v4, "Failed to set \'rx.buffer.size\' with value "
+
+    const-string v5, " => "
+
+    invoke-static {v4, v1, v5}, Lf/e/b/a/a;->J(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v1
+
+    invoke-virtual {v2}, Ljava/lang/NumberFormatException;->getMessage()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v3, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
+
+    :cond_1
+    :goto_1
+    sput v0, Ls0/l/e/h;->f:I
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    new-instance v0, Ls0/l/e/m/c;
+
+    sget v1, Ls0/l/e/h;->f:I
+
+    invoke-direct {v0, v1}, Ls0/l/e/m/c;-><init>(I)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object v0, p0, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    return-void
+.end method
+
+.method public constructor <init>(ZI)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    if-eqz p1, :cond_0
+
+    new-instance p1, Ls0/l/e/n/h;
+
+    invoke-direct {p1, p2}, Ls0/l/e/n/h;-><init>(I)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance p1, Ls0/l/e/n/n;
+
+    invoke-direct {p1, p2}, Ls0/l/e/n/n;-><init>(I)V
+
+    :goto_0
+    iput-object p1, p0, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    return-void
+.end method
+
+.method public static a()Ls0/l/e/h;
+    .locals 3
+
+    invoke-static {}, Ls0/l/e/n/y;->b()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ls0/l/e/h;
+
+    const/4 v1, 0x1
+
+    sget v2, Ls0/l/e/h;->f:I
+
+    invoke-direct {v0, v1, v2}, Ls0/l/e/h;-><init>(ZI)V
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ls0/l/e/h;
+
+    invoke-direct {v0}, Ls0/l/e/h;-><init>()V
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public b(Ljava/lang/Object;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Lrx/exceptions/MissingBackpressureException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
+
+    if-nez p1, :cond_0
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_0
+    invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    xor-int/2addr p1, v1
+
+    move v2, p1
+
+    const/4 v1, 0x0
+
+    :cond_1
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v1, :cond_3
+
+    if-nez v2, :cond_2
+
+    return-void
+
+    :cond_2
+    new-instance p1, Lrx/exceptions/MissingBackpressureException;
+
+    invoke-direct {p1}, Lrx/exceptions/MissingBackpressureException;-><init>()V
+
+    throw p1
+
+    :cond_3
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v0, "This instance has been unsubscribed and the queue is no longer usable."
+
+    invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public c()Ljava/lang/Object;
+    .locals 3
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    monitor-exit p0
+
+    return-object v0
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Queue;->peek()Ljava/lang/Object;
+
+    move-result-object v1
+
+    iget-object v2, p0, Ls0/l/e/h;->e:Ljava/lang/Object;
+
+    if-nez v1, :cond_1
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Queue;->peek()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    move-object v1, v2
+
+    :cond_1
+    monitor-exit p0
+
+    return-object v1
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v0
+.end method
+
+.method public d()Ljava/lang/Object;
+    .locals 4
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    monitor-exit p0
+
+    return-object v1
+
+    :cond_0
+    invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
+
+    move-result-object v2
+
+    iget-object v3, p0, Ls0/l/e/h;->e:Ljava/lang/Object;
+
+    if-nez v2, :cond_1
+
+    if-eqz v3, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Queue;->peek()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    iput-object v1, p0, Ls0/l/e/h;->e:Ljava/lang/Object;
+
+    move-object v2, v3
+
+    :cond_1
+    monitor-exit p0
+
+    return-object v2
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v0
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/l/e/h;->d:Ljava/util/Queue;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 0
+
+    monitor-enter p0
+
+    monitor-exit p0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/i$a.smali b/com.discord/smali_classes2/s0/l/e/i$a.smali
new file mode 100644
index 0000000000..25a0232583
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/i$a.smali
@@ -0,0 +1,41 @@
+.class public final Ls0/l/e/i$a;
+.super Ljava/lang/Object;
+.source "RxThreadFactory.java"
+
+# interfaces
+.implements Ljava/util/concurrent/ThreadFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/i;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+    .locals 1
+
+    new-instance p1, Ljava/lang/AssertionError;
+
+    const-string v0, "No threads allowed."
+
+    invoke-direct {p1, v0}, Ljava/lang/AssertionError;-><init>(Ljava/lang/Object;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/i.smali b/com.discord/smali_classes2/s0/l/e/i.smali
new file mode 100644
index 0000000000..26064b6167
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/i.smali
@@ -0,0 +1,74 @@
+.class public final Ls0/l/e/i;
+.super Ljava/util/concurrent/atomic/AtomicLong;
+.source "RxThreadFactory.java"
+
+# interfaces
+.implements Ljava/util/concurrent/ThreadFactory;
+
+
+# static fields
+.field public static final d:Ljava/util/concurrent/ThreadFactory;
+
+.field public static final serialVersionUID:J = -0x7ab1e491ecc1649fL
+
+
+# instance fields
+.field public final prefix:Ljava/lang/String;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/l/e/i$a;
+
+    invoke-direct {v0}, Ls0/l/e/i$a;-><init>()V
+
+    sput-object v0, Ls0/l/e/i;->d:Ljava/util/concurrent/ThreadFactory;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/i;->prefix:Ljava/lang/String;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+    .locals 4
+
+    new-instance v0, Ljava/lang/Thread;
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    iget-object v2, p0, Ls0/l/e/i;->prefix:Ljava/lang/String;
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicLong;->incrementAndGet()J
+
+    move-result-wide v2
+
+    invoke-virtual {v1, v2, v3}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, p1, v1}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
+
+    const/4 p1, 0x1
+
+    invoke-virtual {v0, p1}, Ljava/lang/Thread;->setDaemon(Z)V
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/j$a.smali b/com.discord/smali_classes2/s0/l/e/j$a.smali
new file mode 100644
index 0000000000..e4a0dbe545
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/j$a.smali
@@ -0,0 +1,75 @@
+.class public Ls0/l/e/j$a;
+.super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/functions/Action0;",
+        "Lrx/Subscription;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/l/c/b;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/e/j;Ls0/l/c/b;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/e/j$a;->d:Ls0/l/c/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 4
+
+    check-cast p1, Lrx/functions/Action0;
+
+    iget-object v0, p0, Ls0/l/e/j$a;->d:Ls0/l/c/b;
+
+    iget-object v0, v0, Ls0/l/c/b;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/c/b$b;
+
+    invoke-virtual {v0}, Ls0/l/c/b$b;->a()Ls0/l/c/b$c;
+
+    move-result-object v0
+
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->NANOSECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v2, -0x1
+
+    invoke-virtual {v0, p1, v2, v3, v1}, Ls0/l/c/g;->f(Lrx/functions/Action0;JLjava/util/concurrent/TimeUnit;)Ls0/l/c/i;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/j$b.smali b/com.discord/smali_classes2/s0/l/e/j$b.smali
new file mode 100644
index 0000000000..d439059c45
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/j$b.smali
@@ -0,0 +1,65 @@
+.class public Ls0/l/e/j$b;
+.super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/e/j;->h0(Lrx/Scheduler;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/functions/Action0;",
+        "Lrx/Subscription;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Scheduler;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/e/j;Lrx/Scheduler;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/e/j$b;->d:Lrx/Scheduler;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    check-cast p1, Lrx/functions/Action0;
+
+    iget-object v0, p0, Ls0/l/e/j$b;->d:Lrx/Scheduler;
+
+    invoke-virtual {v0}, Lrx/Scheduler;->a()Lrx/Scheduler$Worker;
+
+    move-result-object v0
+
+    new-instance v1, Ls0/l/e/k;
+
+    invoke-direct {v1, p0, p1, v0}, Ls0/l/e/k;-><init>(Ls0/l/e/j$b;Lrx/functions/Action0;Lrx/Scheduler$Worker;)V
+
+    invoke-virtual {v0, v1}, Lrx/Scheduler$Worker;->a(Lrx/functions/Action0;)Lrx/Subscription;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/j$c.smali b/com.discord/smali_classes2/s0/l/e/j$c.smali
new file mode 100644
index 0000000000..e4e41a8232
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/j$c.smali
@@ -0,0 +1,103 @@
+.class public Ls0/l/e/j$c;
+.super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/l/e/j;->g0(Ls0/k/b;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TR;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/k/b;
+
+.field public final synthetic e:Ls0/l/e/j;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/e/j;Ls0/k/b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/l/e/j$c;->e:Ls0/l/e/j;
+
+    iput-object p2, p0, Ls0/l/e/j$c;->d:Ls0/k/b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 2
+
+    check-cast p1, Lrx/Subscriber;
+
+    iget-object v0, p0, Ls0/l/e/j$c;->d:Ls0/k/b;
+
+    iget-object v1, p0, Ls0/l/e/j$c;->e:Ls0/l/e/j;
+
+    iget-object v1, v1, Ls0/l/e/j;->e:Ljava/lang/Object;
+
+    invoke-interface {v0, v1}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/Observable;
+
+    instance-of v1, v0, Ls0/l/e/j;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Ls0/l/e/j;
+
+    iget-object v0, v0, Ls0/l/e/j;->e:Ljava/lang/Object;
+
+    sget-boolean v1, Ls0/l/e/j;->f:Z
+
+    if-eqz v1, :cond_0
+
+    new-instance v1, Ls0/l/b/c;
+
+    invoke-direct {v1, p1, v0}, Ls0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v1, Ls0/l/e/j$g;
+
+    invoke-direct {v1, p1, v0}, Ls0/l/e/j$g;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+
+    :goto_0
+    invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    goto :goto_1
+
+    :cond_1
+    new-instance v1, Ls0/n/e;
+
+    invoke-direct {v1, p1, p1}, Ls0/n/e;-><init>(Lrx/Subscriber;Lrx/Subscriber;)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->e0(Lrx/Subscriber;)Lrx/Subscription;
+
+    :goto_1
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/e/j$d.smali b/com.discord/smali_classes2/s0/l/e/j$d.smali
similarity index 76%
rename from com.discord/smali_classes2/r0/l/e/j$d.smali
rename to com.discord/smali_classes2/s0/l/e/j$d.smali
index a8dd5236ef..37efe4b418 100644
--- a/com.discord/smali_classes2/r0/l/e/j$d.smali
+++ b/com.discord/smali_classes2/s0/l/e/j$d.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/e/j$d;
+.class public final Ls0/l/e/j$d;
 .super Ljava/lang/Object;
 .source "ScalarSynchronousObservable.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/j;
+    value = Ls0/l/e/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lr0/l/e/j$d;->d:Ljava/lang/Object;
+    iput-object p1, p0, Ls0/l/e/j$d;->d:Ljava/lang/Object;
 
     return-void
 .end method
@@ -61,22 +61,22 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lr0/l/e/j$d;->d:Ljava/lang/Object;
+    iget-object v0, p0, Ls0/l/e/j$d;->d:Ljava/lang/Object;
 
-    sget-boolean v1, Lr0/l/e/j;->f:Z
+    sget-boolean v1, Ls0/l/e/j;->f:Z
 
     if-eqz v1, :cond_0
 
-    new-instance v1, Lr0/l/b/c;
+    new-instance v1, Ls0/l/b/c;
 
-    invoke-direct {v1, p1, v0}, Lr0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+    invoke-direct {v1, p1, v0}, Ls0/l/b/c;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
 
     goto :goto_0
 
     :cond_0
-    new-instance v1, Lr0/l/e/j$g;
+    new-instance v1, Ls0/l/e/j$g;
 
-    invoke-direct {v1, p1, v0}, Lr0/l/e/j$g;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
+    invoke-direct {v1, p1, v0}, Ls0/l/e/j$g;-><init>(Lrx/Subscriber;Ljava/lang/Object;)V
 
     :goto_0
     invoke-virtual {p1, v1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
diff --git a/com.discord/smali_classes2/s0/l/e/j$e.smali b/com.discord/smali_classes2/s0/l/e/j$e.smali
new file mode 100644
index 0000000000..2f66d500d9
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/j$e.smali
@@ -0,0 +1,92 @@
+.class public final Ls0/l/e/j$e;
+.super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/l/e/j;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "e"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Lrx/functions/Action0;",
+            "Lrx/Subscription;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;Ls0/k/b;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;",
+            "Ls0/k/b<",
+            "Lrx/functions/Action0;",
+            "Lrx/Subscription;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/j$e;->d:Ljava/lang/Object;
+
+    iput-object p2, p0, Ls0/l/e/j$e;->e:Ls0/k/b;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 3
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/l/e/j$f;
+
+    iget-object v1, p0, Ls0/l/e/j$e;->d:Ljava/lang/Object;
+
+    iget-object v2, p0, Ls0/l/e/j$e;->e:Ls0/k/b;
+
+    invoke-direct {v0, p1, v1, v2}, Ls0/l/e/j$f;-><init>(Lrx/Subscriber;Ljava/lang/Object;Ls0/k/b;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/r0/l/e/j$f.smali b/com.discord/smali_classes2/s0/l/e/j$f.smali
similarity index 81%
rename from com.discord/smali_classes2/r0/l/e/j$f.smali
rename to com.discord/smali_classes2/s0/l/e/j$f.smali
index 26af4780f2..068c8ee7b2 100644
--- a/com.discord/smali_classes2/r0/l/e/j$f.smali
+++ b/com.discord/smali_classes2/s0/l/e/j$f.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/e/j$f;
+.class public final Ls0/l/e/j$f;
 .super Ljava/util/concurrent/atomic/AtomicBoolean;
 .source "ScalarSynchronousObservable.java"
 
@@ -9,7 +9,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/j;
+    value = Ls0/l/e/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -43,10 +43,10 @@
     .end annotation
 .end field
 
-.field public final onSchedule:Lr0/k/b;
+.field public final onSchedule:Ls0/k/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "Lrx/functions/Action0;",
             "Lrx/Subscription;",
             ">;"
@@ -64,14 +64,14 @@
 
 
 # direct methods
-.method public constructor <init>(Lrx/Subscriber;Ljava/lang/Object;Lr0/k/b;)V
+.method public constructor <init>(Lrx/Subscriber;Ljava/lang/Object;Ls0/k/b;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lrx/Subscriber<",
             "-TT;>;TT;",
-            "Lr0/k/b<",
+            "Ls0/k/b<",
             "Lrx/functions/Action0;",
             "Lrx/Subscription;",
             ">;)V"
@@ -80,11 +80,11 @@
 
     invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object p1, p0, Lr0/l/e/j$f;->actual:Lrx/Subscriber;
+    iput-object p1, p0, Ls0/l/e/j$f;->actual:Lrx/Subscriber;
 
-    iput-object p2, p0, Lr0/l/e/j$f;->value:Ljava/lang/Object;
+    iput-object p2, p0, Ls0/l/e/j$f;->value:Ljava/lang/Object;
 
-    iput-object p3, p0, Lr0/l/e/j$f;->onSchedule:Lr0/k/b;
+    iput-object p3, p0, Ls0/l/e/j$f;->onSchedule:Ls0/k/b;
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 .method public call()V
     .locals 3
 
-    iget-object v0, p0, Lr0/l/e/j$f;->actual:Lrx/Subscriber;
+    iget-object v0, p0, Ls0/l/e/j$f;->actual:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -105,10 +105,10 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lr0/l/e/j$f;->value:Ljava/lang/Object;
+    iget-object v1, p0, Ls0/l/e/j$f;->value:Ljava/lang/Object;
 
     :try_start_0
-    invoke-interface {v0, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {v0, v1}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -121,14 +121,14 @@
     return-void
 
     :cond_1
-    invoke-interface {v0}, Lr0/g;->onCompleted()V
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
 
     return-void
 
     :catchall_0
     move-exception v2
 
-    invoke-static {v2, v0, v1}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
+    invoke-static {v2, v0, v1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -154,11 +154,11 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lr0/l/e/j$f;->actual:Lrx/Subscriber;
+    iget-object p1, p0, Ls0/l/e/j$f;->actual:Lrx/Subscriber;
 
-    iget-object p2, p0, Lr0/l/e/j$f;->onSchedule:Lr0/k/b;
+    iget-object p2, p0, Ls0/l/e/j$f;->onSchedule:Ls0/k/b;
 
-    invoke-interface {p2, p0}, Lr0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {p2, p0}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object p2
 
@@ -192,7 +192,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lr0/l/e/j$f;->value:Ljava/lang/Object;
+    iget-object v1, p0, Ls0/l/e/j$f;->value:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/r0/l/e/j$g.smali b/com.discord/smali_classes2/s0/l/e/j$g.smali
similarity index 79%
rename from com.discord/smali_classes2/r0/l/e/j$g.smali
rename to com.discord/smali_classes2/s0/l/e/j$g.smali
index 0718f8d95f..70e8b052ba 100644
--- a/com.discord/smali_classes2/r0/l/e/j$g.smali
+++ b/com.discord/smali_classes2/s0/l/e/j$g.smali
@@ -1,4 +1,4 @@
-.class public final Lr0/l/e/j$g;
+.class public final Ls0/l/e/j$g;
 .super Ljava/lang/Object;
 .source "ScalarSynchronousObservable.java"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lr0/l/e/j;
+    value = Ls0/l/e/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -61,9 +61,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lr0/l/e/j$g;->d:Lrx/Subscriber;
+    iput-object p1, p0, Ls0/l/e/j$g;->d:Lrx/Subscriber;
 
-    iput-object p2, p0, Lr0/l/e/j$g;->e:Ljava/lang/Object;
+    iput-object p2, p0, Ls0/l/e/j$g;->e:Ljava/lang/Object;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 .method public m(J)V
     .locals 3
 
-    iget-boolean v0, p0, Lr0/l/e/j$g;->f:Z
+    iget-boolean v0, p0, Ls0/l/e/j$g;->f:Z
 
     if-eqz v0, :cond_0
 
@@ -93,9 +93,9 @@
     :cond_1
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lr0/l/e/j$g;->f:Z
+    iput-boolean p1, p0, Ls0/l/e/j$g;->f:Z
 
-    iget-object p1, p0, Lr0/l/e/j$g;->d:Lrx/Subscriber;
+    iget-object p1, p0, Ls0/l/e/j$g;->d:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
 
@@ -106,10 +106,10 @@
     return-void
 
     :cond_2
-    iget-object p2, p0, Lr0/l/e/j$g;->e:Ljava/lang/Object;
+    iget-object p2, p0, Ls0/l/e/j$g;->e:Ljava/lang/Object;
 
     :try_start_0
-    invoke-interface {p1, p2}, Lr0/g;->onNext(Ljava/lang/Object;)V
+    invoke-interface {p1, p2}, Ls0/g;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -122,14 +122,14 @@
     return-void
 
     :cond_3
-    invoke-interface {p1}, Lr0/g;->onCompleted()V
+    invoke-interface {p1}, Ls0/g;->onCompleted()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->h0(Ljava/lang/Throwable;Lr0/g;Ljava/lang/Object;)V
+    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
 
     return-void
 
diff --git a/com.discord/smali_classes2/s0/l/e/j.smali b/com.discord/smali_classes2/s0/l/e/j.smali
new file mode 100644
index 0000000000..411978b6ba
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/j.smali
@@ -0,0 +1,159 @@
+.class public final Ls0/l/e/j;
+.super Lrx/Observable;
+.source "ScalarSynchronousObservable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/l/e/j$g;,
+        Ls0/l/e/j$f;,
+        Ls0/l/e/j$e;,
+        Ls0/l/e/j$d;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Observable<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:Z
+
+
+# instance fields
+.field public final e:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TT;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-string v0, "rx.just.strong-mode"
+
+    const-string v1, "false"
+
+    invoke-static {v0, v1}, Ljava/lang/System;->getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Ljava/lang/String;)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    sput-boolean v0, Ls0/l/e/j;->f:Z
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    new-instance v0, Ls0/l/e/j$d;
+
+    invoke-direct {v0, p1}, Ls0/l/e/j$d;-><init>(Ljava/lang/Object;)V
+
+    invoke-static {v0}, Ls0/o/l;->a(Lrx/Observable$a;)Lrx/Observable$a;
+
+    move-result-object v0
+
+    invoke-direct {p0, v0}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
+
+    iput-object p1, p0, Ls0/l/e/j;->e:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public g0(Ls0/k/b;)Lrx/Observable;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<R:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ls0/k/b<",
+            "-TT;+",
+            "Lrx/Observable<",
+            "+TR;>;>;)",
+            "Lrx/Observable<",
+            "TR;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ls0/l/e/j$c;
+
+    invoke-direct {v0, p0, p1}, Ls0/l/e/j$c;-><init>(Ls0/l/e/j;Ls0/k/b;)V
+
+    invoke-static {v0}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public h0(Lrx/Scheduler;)Lrx/Observable;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Scheduler;",
+            ")",
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+
+    instance-of v0, p1, Ls0/l/c/b;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Ls0/l/c/b;
+
+    new-instance v0, Ls0/l/e/j$a;
+
+    invoke-direct {v0, p0, p1}, Ls0/l/e/j$a;-><init>(Ls0/l/e/j;Ls0/l/c/b;)V
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ls0/l/e/j$b;
+
+    invoke-direct {v0, p0, p1}, Ls0/l/e/j$b;-><init>(Ls0/l/e/j;Lrx/Scheduler;)V
+
+    :goto_0
+    new-instance p1, Ls0/l/e/j$e;
+
+    iget-object v1, p0, Ls0/l/e/j;->e:Ljava/lang/Object;
+
+    invoke-direct {p1, v1, v0}, Ls0/l/e/j$e;-><init>(Ljava/lang/Object;Ls0/k/b;)V
+
+    invoke-static {p1}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/k.smali b/com.discord/smali_classes2/s0/l/e/k.smali
new file mode 100644
index 0000000000..81551aa8b4
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/k.smali
@@ -0,0 +1,54 @@
+.class public Ls0/l/e/k;
+.super Ljava/lang/Object;
+.source "ScalarSynchronousObservable.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Lrx/functions/Action0;
+
+.field public final synthetic e:Lrx/Scheduler$Worker;
+
+
+# direct methods
+.method public constructor <init>(Ls0/l/e/j$b;Lrx/functions/Action0;Lrx/Scheduler$Worker;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/l/e/k;->d:Lrx/functions/Action0;
+
+    iput-object p3, p0, Ls0/l/e/k;->e:Lrx/Scheduler$Worker;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    :try_start_0
+    iget-object v0, p0, Ls0/l/e/k;->d:Lrx/functions/Action0;
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/l/e/k;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Ls0/l/e/k;->e:Lrx/Scheduler$Worker;
+
+    invoke-interface {v1}, Lrx/Subscription;->unsubscribe()V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/l.smali b/com.discord/smali_classes2/s0/l/e/l.smali
new file mode 100644
index 0000000000..3da0270e46
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/l.smali
@@ -0,0 +1,101 @@
+.class public final enum Ls0/l/e/l;
+.super Ljava/lang/Enum;
+.source "UtilityFunctions.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Ls0/l/e/l;",
+        ">;",
+        "Ls0/k/b<",
+        "Ljava/lang/Object;",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final enum d:Ls0/l/e/l;
+
+.field public static final synthetic e:[Ls0/l/e/l;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    new-instance v0, Ls0/l/e/l;
+
+    const-string v1, "INSTANCE"
+
+    const/4 v2, 0x0
+
+    invoke-direct {v0, v1, v2}, Ls0/l/e/l;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Ls0/l/e/l;->d:Ls0/l/e/l;
+
+    const/4 v1, 0x1
+
+    new-array v1, v1, [Ls0/l/e/l;
+
+    aput-object v0, v1, v2
+
+    sput-object v1, Ls0/l/e/l;->e:[Ls0/l/e/l;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Ls0/l/e/l;
+    .locals 1
+
+    const-class v0, Ls0/l/e/l;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Ls0/l/e/l;
+
+    return-object p0
+.end method
+
+.method public static values()[Ls0/l/e/l;
+    .locals 1
+
+    sget-object v0, Ls0/l/e/l;->e:[Ls0/l/e/l;
+
+    invoke-virtual {v0}, [Ls0/l/e/l;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/l/e/l;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    return-object p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/m/a.smali b/com.discord/smali_classes2/s0/l/e/m/a.smali
new file mode 100644
index 0000000000..a6375850b9
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/m/a.smali
@@ -0,0 +1,94 @@
+.class public abstract Ls0/l/e/m/a;
+.super Ljava/util/AbstractQueue;
+.source "AtomicReferenceArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/AbstractQueue<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+            "TE;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:I
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
+
+    invoke-static {p1}, Lf/n/a/k/a;->S(I)I
+
+    move-result p1
+
+    add-int/lit8 v0, p1, -0x1
+
+    iput v0, p0, Ls0/l/e/m/a;->e:I
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object v0, p0, Ls0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public clear()V
+    .locals 1
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0}, Ljava/util/AbstractQueue;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Ljava/util/AbstractQueue;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/m/b.smali b/com.discord/smali_classes2/s0/l/e/m/b.smali
new file mode 100644
index 0000000000..c823dfdfdc
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/m/b.smali
@@ -0,0 +1,76 @@
+.class public final Ls0/l/e/m/b;
+.super Ljava/util/concurrent/atomic/AtomicReference;
+.source "LinkedQueueNode.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicReference<",
+        "Ls0/l/e/m/b<",
+        "TE;>;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x215dab4a52b27c94L
+
+
+# instance fields
+.field public value:Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "TE;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    return-void
+.end method
+
+.method public constructor <init>(Ljava/lang/Object;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/m/b;->value:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Ls0/l/e/m/b;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ls0/l/e/m/b<",
+            "TE;>;"
+        }
+    .end annotation
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/e/m/b;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/m/c.smali b/com.discord/smali_classes2/s0/l/e/m/c.smali
new file mode 100644
index 0000000000..2f6fb638ff
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/m/c.smali
@@ -0,0 +1,319 @@
+.class public final Ls0/l/e/m/c;
+.super Ls0/l/e/m/a;
+.source "SpscAtomicArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/m/a<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final j:Ljava/lang/Integer;
+
+
+# instance fields
+.field public final f:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public g:J
+
+.field public final h:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final i:I
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-string v0, "jctools.spsc.max.lookahead.step"
+
+    const/16 v1, 0x1000
+
+    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Ls0/l/e/m/c;->j:Ljava/lang/Integer;
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 1
+
+    invoke-direct {p0, p1}, Ls0/l/e/m/a;-><init>(I)V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object v0, p0, Ls0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object v0, p0, Ls0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
+
+    div-int/lit8 p1, p1, 0x4
+
+    sget-object v0, Ls0/l/e/m/c;->j:Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
+
+    move-result p1
+
+    iput p1, p0, Ls0/l/e/m/c;->i:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final c()J
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public isEmpty()Z
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0}, Ls0/l/e/m/c;->c()J
+
+    move-result-wide v2
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_2
+
+    iget-object v0, p0, Ls0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget v1, p0, Ls0/l/e/m/a;->e:I
+
+    iget-object v2, p0, Ls0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    long-to-int v4, v2
+
+    and-int/2addr v4, v1
+
+    iget-wide v5, p0, Ls0/l/e/m/c;->g:J
+
+    cmp-long v7, v2, v5
+
+    if-ltz v7, :cond_1
+
+    iget v5, p0, Ls0/l/e/m/c;->i:I
+
+    int-to-long v5, v5
+
+    add-long/2addr v5, v2
+
+    long-to-int v7, v5
+
+    and-int/2addr v1, v7
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-nez v1, :cond_0
+
+    iput-wide v5, p0, Ls0/l/e/m/c;->g:J
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    const-wide/16 v0, 0x1
+
+    add-long/2addr v2, v0
+
+    iget-object p1, p0, Ls0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v2, v3}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "Null is not a valid element"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    iget v0, p0, Ls0/l/e/m/a;->e:I
+
+    and-int/2addr v0, v1
+
+    iget-object v1, p0, Ls0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    long-to-int v2, v0
+
+    iget v3, p0, Ls0/l/e/m/a;->e:I
+
+    and-int/2addr v2, v3
+
+    iget-object v3, p0, Ls0/l/e/m/a;->d:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v3, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    const/4 v5, 0x0
+
+    if-nez v4, :cond_0
+
+    return-object v5
+
+    :cond_0
+    invoke-virtual {v3, v2, v5}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    const-wide/16 v2, 0x1
+
+    add-long/2addr v0, v2
+
+    iget-object v2, p0, Ls0/l/e/m/c;->h:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    return-object v4
+.end method
+
+.method public size()I
+    .locals 7
+
+    invoke-virtual {p0}, Ls0/l/e/m/c;->c()J
+
+    move-result-wide v0
+
+    :goto_0
+    iget-object v2, p0, Ls0/l/e/m/c;->f:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    invoke-virtual {p0}, Ls0/l/e/m/c;->c()J
+
+    move-result-wide v4
+
+    cmp-long v6, v0, v4
+
+    if-nez v6, :cond_0
+
+    sub-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    return v0
+
+    :cond_0
+    move-wide v0, v4
+
+    goto :goto_0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/m/d.smali b/com.discord/smali_classes2/s0/l/e/m/d.smali
new file mode 100644
index 0000000000..ee6104c6fd
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/m/d.smali
@@ -0,0 +1,466 @@
+.class public final Ls0/l/e/m/d;
+.super Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.source "SpscExactAtomicArrayQueue.java"
+
+# interfaces
+.implements Ljava/util/Queue;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+        "TT;>;",
+        "Ljava/util/Queue<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x5631d997036b8b85L
+
+
+# instance fields
+.field public final capacitySkip:I
+
+.field public final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final mask:I
+
+.field public final producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 2
+
+    invoke-static {p1}, Lf/n/a/k/a;->S(I)I
+
+    move-result v0
+
+    invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v0
+
+    add-int/lit8 v1, v0, -0x1
+
+    iput v1, p0, Ls0/l/e/m/d;->mask:I
+
+    sub-int/2addr v0, p1
+
+    iput v0, p0, Ls0/l/e/m/d;->capacitySkip:I
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public add(Ljava/lang/Object;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public addAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+TT;>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public clear()V
+    .locals 1
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/e/m/d;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Ls0/l/e/m/d;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
+
+.method public contains(Ljava/lang/Object;)Z
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public containsAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public element()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public isEmpty()Z
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iget-object v1, p0, Ls0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_1
+
+    iget-object v0, p0, Ls0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    iget v2, p0, Ls0/l/e/m/d;->mask:I
+
+    iget v3, p0, Ls0/l/e/m/d;->capacitySkip:I
+
+    int-to-long v3, v3
+
+    add-long/2addr v3, v0
+
+    long-to-int v4, v3
+
+    and-int v3, v4, v2
+
+    invoke-virtual {p0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_0
+
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_0
+    long-to-int v3, v0
+
+    and-int/2addr v2, v3
+
+    iget-object v3, p0, Ls0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide/16 v4, 0x1
+
+    add-long/2addr v0, v4
+
+    invoke-virtual {v3, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {p0, v2, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    long-to-int v1, v0
+
+    iget v0, p0, Ls0/l/e/m/d;->mask:I
+
+    and-int/2addr v0, v1
+
+    invoke-virtual {p0, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    long-to-int v2, v0
+
+    iget v3, p0, Ls0/l/e/m/d;->mask:I
+
+    and-int/2addr v2, v3
+
+    invoke-virtual {p0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    if-nez v3, :cond_0
+
+    return-object v4
+
+    :cond_0
+    iget-object v5, p0, Ls0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    const-wide/16 v6, 0x1
+
+    add-long/2addr v0, v6
+
+    invoke-virtual {v5, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {p0, v2, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    return-object v3
+.end method
+
+.method public remove()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove(Ljava/lang/Object;)Z
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public removeAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public retainAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public size()I
+    .locals 7
+
+    iget-object v0, p0, Ls0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    :goto_0
+    iget-object v2, p0, Ls0/l/e/m/d;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    iget-object v4, p0, Ls0/l/e/m/d;->consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v4
+
+    cmp-long v6, v0, v4
+
+    if-nez v6, :cond_0
+
+    sub-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    return v0
+
+    :cond_0
+    move-wide v0, v4
+
+    goto :goto_0
+.end method
+
+.method public toArray()[Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Object;",
+            ">([TE;)[TE;"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/m/e.smali b/com.discord/smali_classes2/s0/l/e/m/e.smali
new file mode 100644
index 0000000000..3aed30cc1c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/m/e.smali
@@ -0,0 +1,801 @@
+.class public final Ls0/l/e/m/e;
+.super Ljava/lang/Object;
+.source "SpscLinkedArrayQueue.java"
+
+# interfaces
+.implements Ljava/util/Queue;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Queue<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final l:I
+
+.field public static final m:Ljava/lang/Object;
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public e:I
+
+.field public f:J
+
+.field public g:I
+
+.field public h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public i:I
+
+.field public j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final k:Ljava/util/concurrent/atomic/AtomicLong;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-string v0, "jctools.spsc.max.lookahead.step"
+
+    const/16 v1, 0x1000
+
+    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    sput v0, Ls0/l/e/m/e;->l:I
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    sput-object v0, Ls0/l/e/m/e;->m:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 3
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    invoke-static {p1}, Lf/n/a/k/a;->S(I)I
+
+    move-result p1
+
+    add-int/lit8 v0, p1, -0x1
+
+    new-instance v1, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    add-int/lit8 v2, p1, 0x1
+
+    invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object v1, p0, Ls0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput v0, p0, Ls0/l/e/m/e;->g:I
+
+    div-int/lit8 p1, p1, 0x4
+
+    sget v2, Ls0/l/e/m/e;->l:I
+
+    invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
+
+    move-result p1
+
+    iput p1, p0, Ls0/l/e/m/e;->e:I
+
+    iput-object v1, p0, Ls0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput v0, p0, Ls0/l/e/m/e;->i:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    int-to-long v0, v0
+
+    iput-wide v0, p0, Ls0/l/e/m/e;->f:J
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public add(Ljava/lang/Object;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public addAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+TT;>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public final c()J
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public clear()V
+    .locals 1
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/e/m/e;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Ls0/l/e/m/e;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
+
+.method public contains(Ljava/lang/Object;)Z
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public containsAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public element()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final h()J
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public isEmpty()Z
+    .locals 5
+
+    invoke-virtual {p0}, Ls0/l/e/m/e;->h()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0}, Ls0/l/e/m/e;->c()J
+
+    move-result-wide v2
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public j(Ljava/lang/Object;Ljava/lang/Object;)Z
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;TT;)Z"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {p0}, Ls0/l/e/m/e;->h()J
+
+    move-result-wide v1
+
+    iget v3, p0, Ls0/l/e/m/e;->g:I
+
+    const-wide/16 v4, 0x2
+
+    add-long/2addr v4, v1
+
+    long-to-int v6, v4
+
+    and-int/2addr v6, v3
+
+    invoke-virtual {v0, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v6
+
+    if-nez v6, :cond_0
+
+    long-to-int v2, v1
+
+    and-int v1, v2, v3
+
+    add-int/lit8 v2, v1, 0x1
+
+    invoke-virtual {v0, v2, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v4, v5}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v6
+
+    new-instance v7, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-direct {v7, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object v7, p0, Ls0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    long-to-int v2, v1
+
+    and-int v1, v2, v3
+
+    add-int/lit8 v2, v1, 0x1
+
+    invoke-virtual {v7, v2, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    invoke-virtual {v7, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result p1
+
+    add-int/lit8 p1, p1, -0x1
+
+    invoke-virtual {v0, p1, v7}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    sget-object p1, Ls0/l/e/m/e;->m:Ljava/lang/Object;
+
+    invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v4, v5}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 13
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget-object v1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    iget v3, p0, Ls0/l/e/m/e;->g:I
+
+    long-to-int v4, v1
+
+    and-int/2addr v4, v3
+
+    iget-wide v5, p0, Ls0/l/e/m/e;->f:J
+
+    const/4 v7, 0x1
+
+    const-wide/16 v8, 0x1
+
+    cmp-long v10, v1, v5
+
+    if-gez v10, :cond_0
+
+    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    add-long/2addr v1, v8
+
+    iget-object p1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    return v7
+
+    :cond_0
+    iget v5, p0, Ls0/l/e/m/e;->e:I
+
+    int-to-long v5, v5
+
+    add-long/2addr v5, v1
+
+    long-to-int v10, v5
+
+    and-int/2addr v10, v3
+
+    invoke-virtual {v0, v10}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v10
+
+    if-nez v10, :cond_1
+
+    sub-long/2addr v5, v8
+
+    iput-wide v5, p0, Ls0/l/e/m/e;->f:J
+
+    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    add-long/2addr v1, v8
+
+    iget-object p1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    return v7
+
+    :cond_1
+    add-long v5, v1, v8
+
+    long-to-int v10, v5
+
+    and-int/2addr v10, v3
+
+    invoke-virtual {v0, v10}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v10
+
+    if-nez v10, :cond_2
+
+    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    return v7
+
+    :cond_2
+    int-to-long v10, v3
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v3
+
+    new-instance v12, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-direct {v12, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object v12, p0, Ls0/l/e/m/e;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    add-long/2addr v10, v1
+
+    sub-long/2addr v10, v8
+
+    iput-wide v10, p0, Ls0/l/e/m/e;->f:J
+
+    invoke-virtual {v12, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result p1
+
+    add-int/lit8 p1, p1, -0x1
+
+    invoke-virtual {v0, p1, v12}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    sget-object p1, Ls0/l/e/m/e;->m:Ljava/lang/Object;
+
+    invoke-virtual {v0, v4, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/e/m/e;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v5, v6}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    return v7
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget-object v1, p0, Ls0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    iget v3, p0, Ls0/l/e/m/e;->i:I
+
+    long-to-int v2, v1
+
+    and-int v1, v2, v3
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    sget-object v3, Ls0/l/e/m/e;->m:Ljava/lang/Object;
+
+    if-ne v2, v3, :cond_0
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v2
+
+    add-int/lit8 v2, v2, -0x1
+
+    invoke-virtual {v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput-object v0, p0, Ls0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    return-object v2
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget-object v1, p0, Ls0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    iget v3, p0, Ls0/l/e/m/e;->i:I
+
+    long-to-int v4, v1
+
+    and-int/2addr v3, v4
+
+    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    sget-object v5, Ls0/l/e/m/e;->m:Ljava/lang/Object;
+
+    if-ne v4, v5, :cond_0
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v5, 0x0
+
+    :goto_0
+    const-wide/16 v6, 0x1
+
+    const/4 v8, 0x0
+
+    if-eqz v4, :cond_1
+
+    if-nez v5, :cond_1
+
+    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    add-long/2addr v1, v6
+
+    iget-object v0, p0, Ls0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    return-object v4
+
+    :cond_1
+    if-eqz v5, :cond_3
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v4
+
+    add-int/lit8 v4, v4, -0x1
+
+    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput-object v0, p0, Ls0/l/e/m/e;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-nez v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    add-long/2addr v1, v6
+
+    iget-object v0, p0, Ls0/l/e/m/e;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    move-object v8, v4
+
+    :cond_3
+    :goto_1
+    return-object v8
+.end method
+
+.method public remove()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove(Ljava/lang/Object;)Z
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public removeAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public retainAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public size()I
+    .locals 7
+
+    invoke-virtual {p0}, Ls0/l/e/m/e;->c()J
+
+    move-result-wide v0
+
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/e/m/e;->h()J
+
+    move-result-wide v2
+
+    invoke-virtual {p0}, Ls0/l/e/m/e;->c()J
+
+    move-result-wide v4
+
+    cmp-long v6, v0, v4
+
+    if-nez v6, :cond_0
+
+    sub-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    return v0
+
+    :cond_0
+    move-wide v0, v4
+
+    goto :goto_0
+.end method
+
+.method public toArray()[Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Object;",
+            ">([TE;)[TE;"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/m/f.smali b/com.discord/smali_classes2/s0/l/e/m/f.smali
new file mode 100644
index 0000000000..5ac62cdb00
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/m/f.smali
@@ -0,0 +1,279 @@
+.class public final Ls0/l/e/m/f;
+.super Ljava/util/AbstractQueue;
+.source "SpscLinkedAtomicQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/m/f<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/e/m/b<",
+            "TE;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/l/e/m/b<",
+            "TE;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance v0, Ls0/l/e/m/b;
+
+    invoke-direct {v0}, Ls0/l/e/m/b;-><init>()V
+
+    iget-object v1, p0, Ls0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    iget-object v1, p0, Ls0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final isEmpty()Z
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/e/m/b;
+
+    iget-object v1, p0, Ls0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ls0/l/e/m/b;
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public final iterator()Ljava/util/Iterator;
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_0
+
+    new-instance v0, Ls0/l/e/m/b;
+
+    invoke-direct {v0, p1}, Ls0/l/e/m/b;-><init>(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ls0/l/e/m/b;
+
+    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "null elements not allowed"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/e/m/b;
+
+    invoke-virtual {v0}, Ls0/l/e/m/b;->a()Ls0/l/e/m/b;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, v0, Ls0/l/e/m/b;->value:Ljava/lang/Object;
+
+    return-object v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/e/m/b;
+
+    invoke-virtual {v0}, Ls0/l/e/m/b;->a()Ls0/l/e/m/b;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    iget-object v2, v0, Ls0/l/e/m/b;->value:Ljava/lang/Object;
+
+    iput-object v1, v0, Ls0/l/e/m/b;->value:Ljava/lang/Object;
+
+    iget-object v1, p0, Ls0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-object v2
+
+    :cond_0
+    return-object v1
+.end method
+
+.method public final size()I
+    .locals 4
+
+    iget-object v0, p0, Ls0/l/e/m/f;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/e/m/b;
+
+    iget-object v1, p0, Ls0/l/e/m/f;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ls0/l/e/m/b;
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eq v0, v1, :cond_1
+
+    const v3, 0x7fffffff
+
+    if-ge v2, v3, :cond_1
+
+    :goto_1
+    invoke-virtual {v0}, Ls0/l/e/m/b;->a()Ls0/l/e/m/b;
+
+    move-result-object v3
+
+    if-nez v3, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    move-object v0, v3
+
+    goto :goto_0
+
+    :cond_1
+    return v2
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/m/g.smali b/com.discord/smali_classes2/s0/l/e/m/g.smali
new file mode 100644
index 0000000000..5f1093b7c7
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/m/g.smali
@@ -0,0 +1,747 @@
+.class public final Ls0/l/e/m/g;
+.super Ljava/lang/Object;
+.source "SpscUnboundedAtomicArrayQueue.java"
+
+# interfaces
+.implements Ljava/util/Queue;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ljava/util/Queue<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final l:I
+
+.field public static final m:Ljava/lang/Object;
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public e:I
+
+.field public f:J
+
+.field public g:I
+
+.field public h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public i:I
+
+.field public j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final k:Ljava/util/concurrent/atomic/AtomicLong;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-string v0, "jctools.spsc.max.lookahead.step"
+
+    const/16 v1, 0x1000
+
+    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    sput v0, Ls0/l/e/m/g;->l:I
+
+    new-instance v0, Ljava/lang/Object;
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+
+    sput-object v0, Ls0/l/e/m/g;->m:Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 3
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/16 v0, 0x8
+
+    invoke-static {v0, p1}, Ljava/lang/Math;->max(II)I
+
+    move-result p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->S(I)I
+
+    move-result p1
+
+    add-int/lit8 v0, p1, -0x1
+
+    new-instance v1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object v1, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance v1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object v1, p0, Ls0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    new-instance v1, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    add-int/lit8 v2, p1, 0x1
+
+    invoke-direct {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object v1, p0, Ls0/l/e/m/g;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput v0, p0, Ls0/l/e/m/g;->g:I
+
+    div-int/lit8 p1, p1, 0x4
+
+    sget v2, Ls0/l/e/m/g;->l:I
+
+    invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
+
+    move-result p1
+
+    iput p1, p0, Ls0/l/e/m/g;->e:I
+
+    iput-object v1, p0, Ls0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput v0, p0, Ls0/l/e/m/g;->i:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    int-to-long v0, v0
+
+    iput-wide v0, p0, Ls0/l/e/m/g;->f:J
+
+    const-wide/16 v0, 0x0
+
+    iget-object p1, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public add(Ljava/lang/Object;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public addAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "+TT;>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public final c()J
+    .locals 2
+
+    iget-object v0, p0, Ls0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public clear()V
+    .locals 1
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/e/m/g;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Ls0/l/e/m/g;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
+
+.method public contains(Ljava/lang/Object;)Z
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public containsAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public element()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final h(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/lang/Object;JI)Z
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
+            "Ljava/lang/Object;",
+            ">;TT;JI)Z"
+        }
+    .end annotation
+
+    const-wide/16 v0, 0x1
+
+    add-long/2addr p3, v0
+
+    iget-object v0, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0, p3, p4}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {p1, p5, p2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public isEmpty()Z
+    .locals 5
+
+    iget-object v0, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0}, Ls0/l/e/m/g;->c()J
+
+    move-result-wide v2
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TT;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 13
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)Z"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_3
+
+    iget-object v1, p0, Ls0/l/e/m/g;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget-object v0, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v3
+
+    iget v0, p0, Ls0/l/e/m/g;->g:I
+
+    long-to-int v2, v3
+
+    and-int v5, v2, v0
+
+    iget-wide v6, p0, Ls0/l/e/m/g;->f:J
+
+    const/4 v8, 0x1
+
+    cmp-long v2, v3, v6
+
+    if-gez v2, :cond_0
+
+    move-object v0, p0
+
+    move-object v2, p1
+
+    invoke-virtual/range {v0 .. v5}, Ls0/l/e/m/g;->h(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/lang/Object;JI)Z
+
+    return v8
+
+    :cond_0
+    iget v2, p0, Ls0/l/e/m/g;->e:I
+
+    int-to-long v6, v2
+
+    add-long/2addr v6, v3
+
+    long-to-int v2, v6
+
+    and-int/2addr v2, v0
+
+    invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    const-wide/16 v9, 0x1
+
+    if-nez v2, :cond_1
+
+    sub-long/2addr v6, v9
+
+    iput-wide v6, p0, Ls0/l/e/m/g;->f:J
+
+    add-long/2addr v3, v9
+
+    iget-object v0, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0, v3, v4}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    return v8
+
+    :cond_1
+    add-long v6, v3, v9
+
+    long-to-int v2, v6
+
+    and-int/2addr v2, v0
+
+    invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_2
+
+    iget-object v0, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    return v8
+
+    :cond_2
+    int-to-long v11, v0
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v0
+
+    new-instance v2, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-direct {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
+
+    iput-object v2, p0, Ls0/l/e/m/g;->h:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    add-long/2addr v11, v3
+
+    sub-long/2addr v11, v9
+
+    iput-wide v11, p0, Ls0/l/e/m/g;->f:J
+
+    iget-object v0, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0, v6, v7}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {v2, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result p1
+
+    add-int/lit8 p1, p1, -0x1
+
+    invoke-virtual {v1, p1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    sget-object p1, Ls0/l/e/m/g;->m:Ljava/lang/Object;
+
+    invoke-virtual {v1, v5, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    return v8
+
+    :cond_3
+    const/4 p1, 0x0
+
+    throw p1
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget-object v1, p0, Ls0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    iget v3, p0, Ls0/l/e/m/g;->i:I
+
+    long-to-int v2, v1
+
+    and-int v1, v2, v3
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v2
+
+    sget-object v3, Ls0/l/e/m/g;->m:Ljava/lang/Object;
+
+    if-ne v2, v3, :cond_0
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v2
+
+    add-int/lit8 v2, v2, -0x1
+
+    invoke-virtual {v0, v2}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput-object v0, p0, Ls0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    return-object v2
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iget-object v1, p0, Ls0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v1
+
+    iget v3, p0, Ls0/l/e/m/g;->i:I
+
+    long-to-int v4, v1
+
+    and-int/2addr v3, v4
+
+    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    sget-object v5, Ls0/l/e/m/g;->m:Ljava/lang/Object;
+
+    if-ne v4, v5, :cond_0
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v5, 0x0
+
+    :goto_0
+    const-wide/16 v6, 0x1
+
+    const/4 v8, 0x0
+
+    if-eqz v4, :cond_1
+
+    if-nez v5, :cond_1
+
+    add-long/2addr v1, v6
+
+    iget-object v5, p0, Ls0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v5, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    return-object v4
+
+    :cond_1
+    if-eqz v5, :cond_3
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->length()I
+
+    move-result v4
+
+    add-int/lit8 v4, v4, -0x1
+
+    invoke-virtual {v0, v4}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    iput-object v0, p0, Ls0/l/e/m/g;->j:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+
+    invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    if-nez v4, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    add-long/2addr v1, v6
+
+    iget-object v5, p0, Ls0/l/e/m/g;->k:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v5, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->lazySet(J)V
+
+    invoke-virtual {v0, v3, v8}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
+
+    move-object v8, v4
+
+    :cond_3
+    :goto_1
+    return-object v8
+.end method
+
+.method public remove()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public remove(Ljava/lang/Object;)Z
+    .locals 0
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public removeAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public retainAll(Ljava/util/Collection;)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Collection<",
+            "*>;)Z"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
+
+.method public size()I
+    .locals 7
+
+    invoke-virtual {p0}, Ls0/l/e/m/g;->c()J
+
+    move-result-wide v0
+
+    :goto_0
+    iget-object v2, p0, Ls0/l/e/m/g;->d:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v2
+
+    invoke-virtual {p0}, Ls0/l/e/m/g;->c()J
+
+    move-result-wide v4
+
+    cmp-long v6, v0, v4
+
+    if-nez v6, :cond_0
+
+    sub-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    return v0
+
+    :cond_0
+    move-wide v0, v4
+
+    goto :goto_0
+.end method
+
+.method public toArray()[Ljava/lang/Object;
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Object;",
+            ">([TE;)[TE;"
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {p1}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/a.smali b/com.discord/smali_classes2/s0/l/e/n/a.smali
new file mode 100644
index 0000000000..1714167dda
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/a.smali
@@ -0,0 +1,81 @@
+.class public abstract Ls0/l/e/n/a;
+.super Ls0/l/e/n/c;
+.source "BaseLinkedQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/c<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final e:J
+
+
+# instance fields
+.field public consumerNode:Ls0/l/e/m/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/e/m/b<",
+            "TE;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ls0/l/e/n/a;
+
+    const-string v1, "consumerNode"
+
+    invoke-static {v0, v1}, Ls0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/a;->e:J
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/l/e/n/c;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final h()Ls0/l/e/m/b;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ls0/l/e/m/b<",
+            "TE;>;"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v1, Ls0/l/e/n/a;->e:J
+
+    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/e/m/b;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/b.smali b/com.discord/smali_classes2/s0/l/e/n/b.smali
new file mode 100644
index 0000000000..98f786425c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/b.smali
@@ -0,0 +1,25 @@
+.class public abstract Ls0/l/e/n/b;
+.super Ljava/util/AbstractQueue;
+.source "BaseLinkedQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/AbstractQueue<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/c.smali b/com.discord/smali_classes2/s0/l/e/n/c.smali
new file mode 100644
index 0000000000..c36be7879e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/c.smali
@@ -0,0 +1,25 @@
+.class public abstract Ls0/l/e/n/c;
+.super Ls0/l/e/n/d;
+.source "BaseLinkedQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/d<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/l/e/n/d;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/d.smali b/com.discord/smali_classes2/s0/l/e/n/d.smali
new file mode 100644
index 0000000000..d0fea3426e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/d.smali
@@ -0,0 +1,81 @@
+.class public abstract Ls0/l/e/n/d;
+.super Ls0/l/e/n/b;
+.source "BaseLinkedQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/b<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:J
+
+
+# instance fields
+.field public producerNode:Ls0/l/e/m/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/l/e/m/b<",
+            "TE;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ls0/l/e/n/d;
+
+    const-string v1, "producerNode"
+
+    invoke-static {v0, v1}, Ls0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/d;->d:J
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/l/e/n/b;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final c()Ls0/l/e/m/b;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ls0/l/e/m/b<",
+            "TE;>;"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v1, Ls0/l/e/n/d;->d:J
+
+    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/l/e/m/b;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/e.smali b/com.discord/smali_classes2/s0/l/e/n/e.smali
new file mode 100644
index 0000000000..7e53f7f9a4
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/e.smali
@@ -0,0 +1,272 @@
+.class public abstract Ls0/l/e/n/e;
+.super Ls0/l/e/n/f;
+.source "ConcurrentCircularArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/f<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:I
+
+.field public static final g:J
+
+.field public static final h:I
+
+
+# instance fields
+.field public final d:J
+
+.field public final e:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TE;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const-class v0, [Ljava/lang/Object;
+
+    const-string v1, "sparse.shift"
+
+    const/4 v2, 0x0
+
+    invoke-static {v1, v2}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v1
+
+    sput v1, Ls0/l/e/n/e;->f:I
+
+    sget-object v1, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayIndexScale(Ljava/lang/Class;)I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    if-ne v2, v1, :cond_0
+
+    sget v1, Ls0/l/e/n/e;->f:I
+
+    add-int/lit8 v1, v1, 0x2
+
+    sput v1, Ls0/l/e/n/e;->h:I
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v2, 0x8
+
+    if-ne v2, v1, :cond_1
+
+    sget v1, Ls0/l/e/n/e;->f:I
+
+    add-int/lit8 v1, v1, 0x3
+
+    sput v1, Ls0/l/e/n/e;->h:I
+
+    :goto_0
+    sget-object v1, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayBaseOffset(Ljava/lang/Class;)I
+
+    move-result v0
+
+    const/16 v1, 0x20
+
+    sget v2, Ls0/l/e/n/e;->h:I
+
+    sget v3, Ls0/l/e/n/e;->f:I
+
+    sub-int/2addr v2, v3
+
+    shl-int/2addr v1, v2
+
+    add-int/2addr v0, v1
+
+    int-to-long v0, v0
+
+    sput-wide v0, Ls0/l/e/n/e;->g:J
+
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Unknown pointer size"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public constructor <init>(I)V
+    .locals 2
+
+    invoke-direct {p0}, Ls0/l/e/n/f;-><init>()V
+
+    invoke-static {p1}, Lf/n/a/k/a;->S(I)I
+
+    move-result p1
+
+    add-int/lit8 v0, p1, -0x1
+
+    int-to-long v0, v0
+
+    iput-wide v0, p0, Ls0/l/e/n/e;->d:J
+
+    sget v0, Ls0/l/e/n/e;->f:I
+
+    shl-int/2addr p1, v0
+
+    add-int/lit8 p1, p1, 0x40
+
+    new-array p1, p1, [Ljava/lang/Object;
+
+    iput-object p1, p0, Ls0/l/e/n/e;->e:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final c(J)J
+    .locals 4
+
+    iget-wide v0, p0, Ls0/l/e/n/e;->d:J
+
+    sget-wide v2, Ls0/l/e/n/e;->g:J
+
+    and-long/2addr p1, v0
+
+    sget v0, Ls0/l/e/n/e;->h:I
+
+    shl-long/2addr p1, v0
+
+    add-long/2addr v2, p1
+
+    return-wide v2
+.end method
+
+.method public clear()V
+    .locals 1
+
+    :cond_0
+    :goto_0
+    invoke-interface {p0}, Ls0/l/e/n/g;->poll()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Ljava/util/AbstractQueue;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    return-void
+.end method
+
+.method public final h([Ljava/lang/Object;J)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TE;J)TE;"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final j([Ljava/lang/Object;J)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TE;J)TE;"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final k([Ljava/lang/Object;JLjava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TE;JTE;)V"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putOrderedObject(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final l([Ljava/lang/Object;JLjava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TE;JTE;)V"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/f.smali b/com.discord/smali_classes2/s0/l/e/n/f.smali
new file mode 100644
index 0000000000..62a97e8341
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/f.smali
@@ -0,0 +1,30 @@
+.class public abstract Ls0/l/e/n/f;
+.super Ljava/util/AbstractQueue;
+.source "ConcurrentCircularArrayQueue.java"
+
+# interfaces
+.implements Ls0/l/e/n/g;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/AbstractQueue<",
+        "TE;>;",
+        "Ls0/l/e/n/g<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/g.smali b/com.discord/smali_classes2/s0/l/e/n/g.smali
new file mode 100644
index 0000000000..c55516f925
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/g.smali
@@ -0,0 +1,24 @@
+.class public interface abstract Ls0/l/e/n/g;
+.super Ljava/lang/Object;
+.source "MessagePassingQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<M:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# virtual methods
+.method public abstract poll()Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TM;"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/h.smali b/com.discord/smali_classes2/s0/l/e/n/h.smali
new file mode 100644
index 0000000000..a86d84f040
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/h.smali
@@ -0,0 +1,248 @@
+.class public final Ls0/l/e/n/h;
+.super Ls0/l/e/n/m;
+.source "SpmcArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/h<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/m;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isEmpty()Z
+    .locals 5
+
+    iget-wide v0, p0, Ls0/l/e/n/i;->consumerIndex:J
+
+    iget-wide v2, p0, Ls0/l/e/n/l;->producerIndex:J
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_2
+
+    iget-object v0, p0, Ls0/l/e/n/e;->e:[Ljava/lang/Object;
+
+    iget-wide v1, p0, Ls0/l/e/n/e;->d:J
+
+    iget-wide v3, p0, Ls0/l/e/n/l;->producerIndex:J
+
+    invoke-virtual {p0, v3, v4}, Ls0/l/e/n/e;->c(J)J
+
+    move-result-wide v5
+
+    invoke-virtual {p0, v0, v5, v6}, Ls0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_1
+
+    iget-wide v7, p0, Ls0/l/e/n/i;->consumerIndex:J
+
+    sub-long v7, v3, v7
+
+    cmp-long v9, v7, v1
+
+    if-lez v9, :cond_0
+
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_0
+    :goto_0
+    invoke-virtual {p0, v0, v5, v6}, Ls0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0, v0, v5, v6, p1}, Ls0/l/e/n/e;->l([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    const-wide/16 v0, 0x1
+
+    add-long/2addr v3, v0
+
+    invoke-virtual {p0, v3, v4}, Ls0/l/e/n/l;->m(J)V
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_2
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "Null is not a valid element"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-wide v0, p0, Ls0/l/e/n/m;->k:J
+
+    :cond_0
+    iget-wide v2, p0, Ls0/l/e/n/i;->consumerIndex:J
+
+    cmp-long v4, v2, v0
+
+    if-ltz v4, :cond_2
+
+    iget-wide v4, p0, Ls0/l/e/n/l;->producerIndex:J
+
+    cmp-long v6, v2, v4
+
+    if-ltz v6, :cond_1
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_1
+    iput-wide v4, p0, Ls0/l/e/n/m;->k:J
+
+    :cond_2
+    invoke-virtual {p0, v2, v3}, Ls0/l/e/n/e;->c(J)J
+
+    move-result-wide v2
+
+    iget-object v4, p0, Ls0/l/e/n/e;->e:[Ljava/lang/Object;
+
+    invoke-virtual {p0, v4, v2, v3}, Ls0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_0
+
+    return-object v2
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 8
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-wide v0, p0, Ls0/l/e/n/m;->k:J
+
+    :cond_0
+    iget-wide v2, p0, Ls0/l/e/n/i;->consumerIndex:J
+
+    const/4 v4, 0x0
+
+    cmp-long v5, v2, v0
+
+    if-ltz v5, :cond_2
+
+    iget-wide v5, p0, Ls0/l/e/n/l;->producerIndex:J
+
+    cmp-long v7, v2, v5
+
+    if-ltz v7, :cond_1
+
+    return-object v4
+
+    :cond_1
+    iput-wide v5, p0, Ls0/l/e/n/m;->k:J
+
+    :cond_2
+    const-wide/16 v5, 0x1
+
+    add-long/2addr v5, v2
+
+    invoke-virtual {p0, v2, v3, v5, v6}, Ls0/l/e/n/i;->o(JJ)Z
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    invoke-virtual {p0, v2, v3}, Ls0/l/e/n/e;->c(J)J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Ls0/l/e/n/e;->e:[Ljava/lang/Object;
+
+    invoke-virtual {p0, v2, v0, v1}, Ls0/l/e/n/e;->h([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v3
+
+    invoke-virtual {p0, v2, v0, v1, v4}, Ls0/l/e/n/e;->k([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-object v3
+.end method
+
+.method public size()I
+    .locals 7
+
+    iget-wide v0, p0, Ls0/l/e/n/i;->consumerIndex:J
+
+    :goto_0
+    iget-wide v2, p0, Ls0/l/e/n/l;->producerIndex:J
+
+    iget-wide v4, p0, Ls0/l/e/n/i;->consumerIndex:J
+
+    cmp-long v6, v0, v4
+
+    if-nez v6, :cond_0
+
+    sub-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    return v0
+
+    :cond_0
+    move-wide v0, v4
+
+    goto :goto_0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/i.smali b/com.discord/smali_classes2/s0/l/e/n/i.smali
new file mode 100644
index 0000000000..5c5dbae662
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/i.smali
@@ -0,0 +1,71 @@
+.class public abstract Ls0/l/e/n/i;
+.super Ls0/l/e/n/k;
+.source "SpmcArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/k<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final j:J
+
+
+# instance fields
+.field public volatile consumerIndex:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ls0/l/e/n/i;
+
+    const-string v1, "consumerIndex"
+
+    invoke-static {v0, v1}, Ls0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/i;->j:J
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/k;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final o(JJ)Z
+    .locals 8
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v2, Ls0/l/e/n/i;->j:J
+
+    move-object v1, p0
+
+    move-wide v4, p1
+
+    move-wide v6, p3
+
+    invoke-virtual/range {v0 .. v7}, Lsun/misc/Unsafe;->compareAndSwapLong(Ljava/lang/Object;JJJ)Z
+
+    move-result p1
+
+    return p1
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/j.smali b/com.discord/smali_classes2/s0/l/e/n/j.smali
new file mode 100644
index 0000000000..9a99d0f34b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/j.smali
@@ -0,0 +1,25 @@
+.class public abstract Ls0/l/e/n/j;
+.super Ls0/l/e/n/e;
+.source "SpmcArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/e<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/e;-><init>(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/k.smali b/com.discord/smali_classes2/s0/l/e/n/k.smali
new file mode 100644
index 0000000000..b1801c6ac6
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/k.smali
@@ -0,0 +1,25 @@
+.class public abstract Ls0/l/e/n/k;
+.super Ls0/l/e/n/l;
+.source "SpmcArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/l<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/l;-><init>(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/l.smali b/com.discord/smali_classes2/s0/l/e/n/l.smali
new file mode 100644
index 0000000000..824b6c576f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/l.smali
@@ -0,0 +1,67 @@
+.class public abstract Ls0/l/e/n/l;
+.super Ls0/l/e/n/j;
+.source "SpmcArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/j<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final i:J
+
+
+# instance fields
+.field public volatile producerIndex:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ls0/l/e/n/l;
+
+    const-string v1, "producerIndex"
+
+    invoke-static {v0, v1}, Ls0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/l;->i:J
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/j;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final m(J)V
+    .locals 6
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v2, Ls0/l/e/n/l;->i:J
+
+    move-object v1, p0
+
+    move-wide v4, p1
+
+    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/m.smali b/com.discord/smali_classes2/s0/l/e/n/m.smali
new file mode 100644
index 0000000000..b729da7223
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/m.smali
@@ -0,0 +1,29 @@
+.class public abstract Ls0/l/e/n/m;
+.super Ls0/l/e/n/i;
+.source "SpmcArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/m<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public volatile k:J
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/i;-><init>(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/n.smali b/com.discord/smali_classes2/s0/l/e/n/n.smali
new file mode 100644
index 0000000000..d3eb0b0e62
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/n.smali
@@ -0,0 +1,257 @@
+.class public final Ls0/l/e/n/n;
+.super Ls0/l/e/n/o;
+.source "SpscArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/n<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/o;-><init>(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isEmpty()Z
+    .locals 5
+
+    invoke-virtual {p0}, Ls0/l/e/n/n;->o()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0}, Ls0/l/e/n/n;->m()J
+
+    move-result-wide v2
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public final m()J
+    .locals 3
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v1, Ls0/l/e/n/o;->k:J
+
+    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final o()J
+    .locals 3
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v1, Ls0/l/e/n/r;->j:J
+
+    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_1
+
+    iget-object v0, p0, Ls0/l/e/n/e;->e:[Ljava/lang/Object;
+
+    iget-wide v1, p0, Ls0/l/e/n/r;->producerIndex:J
+
+    invoke-virtual {p0, v1, v2}, Ls0/l/e/n/e;->c(J)J
+
+    move-result-wide v3
+
+    invoke-virtual {p0, v0, v3, v4}, Ls0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_0
+
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_0
+    invoke-virtual {p0, v0, v3, v4, p1}, Ls0/l/e/n/e;->k([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    const-wide/16 v3, 0x1
+
+    add-long/2addr v1, v3
+
+    invoke-virtual {p0, v1, v2}, Ls0/l/e/n/n;->q(J)V
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_1
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "null elements not allowed"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public final p(J)V
+    .locals 6
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v2, Ls0/l/e/n/o;->k:J
+
+    move-object v1, p0
+
+    move-wide v4, p1
+
+    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
+
+    return-void
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-wide v0, p0, Ls0/l/e/n/o;->consumerIndex:J
+
+    invoke-virtual {p0, v0, v1}, Ls0/l/e/n/e;->c(J)J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Ls0/l/e/n/e;->e:[Ljava/lang/Object;
+
+    invoke-virtual {p0, v2, v0, v1}, Ls0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-wide v0, p0, Ls0/l/e/n/o;->consumerIndex:J
+
+    invoke-virtual {p0, v0, v1}, Ls0/l/e/n/e;->c(J)J
+
+    move-result-wide v2
+
+    iget-object v4, p0, Ls0/l/e/n/e;->e:[Ljava/lang/Object;
+
+    invoke-virtual {p0, v4, v2, v3}, Ls0/l/e/n/e;->j([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v5
+
+    const/4 v6, 0x0
+
+    if-nez v5, :cond_0
+
+    return-object v6
+
+    :cond_0
+    invoke-virtual {p0, v4, v2, v3, v6}, Ls0/l/e/n/e;->k([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    const-wide/16 v2, 0x1
+
+    add-long/2addr v0, v2
+
+    invoke-virtual {p0, v0, v1}, Ls0/l/e/n/n;->p(J)V
+
+    return-object v5
+.end method
+
+.method public final q(J)V
+    .locals 6
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v2, Ls0/l/e/n/r;->j:J
+
+    move-object v1, p0
+
+    move-wide v4, p1
+
+    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
+
+    return-void
+.end method
+
+.method public size()I
+    .locals 7
+
+    invoke-virtual {p0}, Ls0/l/e/n/n;->m()J
+
+    move-result-wide v0
+
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/e/n/n;->o()J
+
+    move-result-wide v2
+
+    invoke-virtual {p0}, Ls0/l/e/n/n;->m()J
+
+    move-result-wide v4
+
+    cmp-long v6, v0, v4
+
+    if-nez v6, :cond_0
+
+    sub-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    return v0
+
+    :cond_0
+    move-wide v0, v4
+
+    goto :goto_0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/o.smali b/com.discord/smali_classes2/s0/l/e/n/o.smali
new file mode 100644
index 0000000000..3446287c9c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/o.smali
@@ -0,0 +1,49 @@
+.class public abstract Ls0/l/e/n/o;
+.super Ls0/l/e/n/q;
+.source "SpscArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/q<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final k:J
+
+
+# instance fields
+.field public consumerIndex:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ls0/l/e/n/o;
+
+    const-string v1, "consumerIndex"
+
+    invoke-static {v0, v1}, Ls0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/o;->k:J
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/q;-><init>(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/p.smali b/com.discord/smali_classes2/s0/l/e/n/p.smali
new file mode 100644
index 0000000000..76a45e86db
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/p.smali
@@ -0,0 +1,55 @@
+.class public abstract Ls0/l/e/n/p;
+.super Ls0/l/e/n/e;
+.source "SpscArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/p<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final i:Ljava/lang/Integer;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-string v0, "jctools.spsc.max.lookahead.step"
+
+    const/16 v1, 0x1000
+
+    invoke-static {v0, v1}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    sput-object v0, Ls0/l/e/n/p;->i:Ljava/lang/Integer;
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 1
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/e;-><init>(I)V
+
+    div-int/lit8 p1, p1, 0x4
+
+    sget-object v0, Ls0/l/e/n/p;->i:Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    invoke-static {p1, v0}, Ljava/lang/Math;->min(II)I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/q.smali b/com.discord/smali_classes2/s0/l/e/n/q.smali
new file mode 100644
index 0000000000..4cfeede5bd
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/q.smali
@@ -0,0 +1,25 @@
+.class public abstract Ls0/l/e/n/q;
+.super Ls0/l/e/n/r;
+.source "SpscArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/r<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/r;-><init>(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/r.smali b/com.discord/smali_classes2/s0/l/e/n/r.smali
new file mode 100644
index 0000000000..22d1df0e4f
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/r.smali
@@ -0,0 +1,49 @@
+.class public abstract Ls0/l/e/n/r;
+.super Ls0/l/e/n/p;
+.source "SpscArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/p<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final j:J
+
+
+# instance fields
+.field public producerIndex:J
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const-class v0, Ls0/l/e/n/r;
+
+    const-string v1, "producerIndex"
+
+    invoke-static {v0, v1}, Ls0/l/e/n/y;->a(Ljava/lang/Class;Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/r;->j:J
+
+    return-void
+.end method
+
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0, p1}, Ls0/l/e/n/p;-><init>(I)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/s.smali b/com.discord/smali_classes2/s0/l/e/n/s.smali
new file mode 100644
index 0000000000..f45c2157be
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/s.smali
@@ -0,0 +1,203 @@
+.class public final Ls0/l/e/n/s;
+.super Ls0/l/e/n/a;
+.source "SpscLinkedQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/s<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ls0/l/e/n/a;-><init>()V
+
+    new-instance v0, Ls0/l/e/m/b;
+
+    invoke-direct {v0}, Ls0/l/e/m/b;-><init>()V
+
+    iput-object v0, p0, Ls0/l/e/n/d;->producerNode:Ls0/l/e/m/b;
+
+    iput-object v0, p0, Ls0/l/e/n/a;->consumerNode:Ls0/l/e/m/b;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final isEmpty()Z
+    .locals 2
+
+    invoke-virtual {p0}, Ls0/l/e/n/a;->h()Ls0/l/e/m/b;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Ls0/l/e/n/d;->c()Ls0/l/e/m/b;
+
+    move-result-object v1
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public final iterator()Ljava/util/Iterator;
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public offer(Ljava/lang/Object;)Z
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    if-eqz p1, :cond_0
+
+    new-instance v0, Ls0/l/e/m/b;
+
+    invoke-direct {v0, p1}, Ls0/l/e/m/b;-><init>(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/l/e/n/d;->producerNode:Ls0/l/e/m/b;
+
+    invoke-virtual {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Ls0/l/e/n/d;->producerNode:Ls0/l/e/m/b;
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string v0, "null elements not allowed"
+
+    invoke-direct {p1, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public peek()Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/n/a;->consumerNode:Ls0/l/e/m/b;
+
+    invoke-virtual {v0}, Ls0/l/e/m/b;->a()Ls0/l/e/m/b;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, v0, Ls0/l/e/m/b;->value:Ljava/lang/Object;
+
+    return-object v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return-object v0
+.end method
+
+.method public poll()Ljava/lang/Object;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/n/a;->consumerNode:Ls0/l/e/m/b;
+
+    invoke-virtual {v0}, Ls0/l/e/m/b;->a()Ls0/l/e/m/b;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    iget-object v2, v0, Ls0/l/e/m/b;->value:Ljava/lang/Object;
+
+    iput-object v1, v0, Ls0/l/e/m/b;->value:Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/e/n/a;->consumerNode:Ls0/l/e/m/b;
+
+    return-object v2
+
+    :cond_0
+    return-object v1
+.end method
+
+.method public final size()I
+    .locals 4
+
+    invoke-virtual {p0}, Ls0/l/e/n/a;->h()Ls0/l/e/m/b;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Ls0/l/e/n/d;->c()Ls0/l/e/m/b;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    :goto_0
+    if-eq v0, v1, :cond_1
+
+    const v3, 0x7fffffff
+
+    if-ge v2, v3, :cond_1
+
+    :goto_1
+    invoke-virtual {v0}, Ls0/l/e/m/b;->a()Ls0/l/e/m/b;
+
+    move-result-object v3
+
+    if-nez v3, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    add-int/lit8 v2, v2, 0x1
+
+    move-object v0, v3
+
+    goto :goto_0
+
+    :cond_1
+    return v2
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/t.smali b/com.discord/smali_classes2/s0/l/e/n/t.smali
new file mode 100644
index 0000000000..7eed654051
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/t.smali
@@ -0,0 +1,701 @@
+.class public Ls0/l/e/n/t;
+.super Ls0/l/e/n/v;
+.source "SpscUnboundedArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/v<",
+        "TE;>;",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final j:I
+
+.field public static final k:J
+
+.field public static final l:J
+
+.field public static final m:J
+
+.field public static final n:I
+
+.field public static final o:Ljava/lang/Object;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 3
+
+    const-class v0, [Ljava/lang/Object;
+
+    const-string v1, "jctools.spsc.max.lookahead.step"
+
+    const/16 v2, 0x1000
+
+    invoke-static {v1, v2}, Ljava/lang/Integer;->getInteger(Ljava/lang/String;I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v1
+
+    sput v1, Ls0/l/e/n/t;->j:I
+
+    new-instance v1, Ljava/lang/Object;
+
+    invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+
+    sput-object v1, Ls0/l/e/n/t;->o:Ljava/lang/Object;
+
+    sget-object v1, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayIndexScale(Ljava/lang/Class;)I
+
+    move-result v1
+
+    const/4 v2, 0x4
+
+    if-ne v2, v1, :cond_0
+
+    const/4 v1, 0x2
+
+    sput v1, Ls0/l/e/n/t;->n:I
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v2, 0x8
+
+    if-ne v2, v1, :cond_1
+
+    const/4 v1, 0x3
+
+    sput v1, Ls0/l/e/n/t;->n:I
+
+    :goto_0
+    sget-object v1, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->arrayBaseOffset(Ljava/lang/Class;)I
+
+    move-result v0
+
+    int-to-long v0, v0
+
+    sput-wide v0, Ls0/l/e/n/t;->m:J
+
+    :try_start_0
+    const-class v0, Ls0/l/e/n/x;
+
+    const-string v1, "producerIndex"
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v0
+
+    sget-object v1, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/t;->k:J
+    :try_end_0
+    .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_1
+
+    :try_start_1
+    const-class v0, Ls0/l/e/n/v;
+
+    const-string v1, "consumerIndex"
+
+    invoke-virtual {v0, v1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v0
+
+    sget-object v1, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+
+    move-result-wide v0
+
+    sput-wide v0, Ls0/l/e/n/t;->l:J
+    :try_end_1
+    .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_0
+
+    return-void
+
+    :catch_0
+    move-exception v0
+
+    new-instance v1, Ljava/lang/InternalError;
+
+    invoke-direct {v1}, Ljava/lang/InternalError;-><init>()V
+
+    invoke-virtual {v1, v0}, Ljava/lang/InternalError;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw v1
+
+    :catch_1
+    move-exception v0
+
+    new-instance v1, Ljava/lang/InternalError;
+
+    invoke-direct {v1}, Ljava/lang/InternalError;-><init>()V
+
+    invoke-virtual {v1, v0}, Ljava/lang/InternalError;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw v1
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Unknown pointer size"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public constructor <init>(I)V
+    .locals 4
+
+    invoke-direct {p0}, Ls0/l/e/n/v;-><init>()V
+
+    invoke-static {p1}, Lf/n/a/k/a;->S(I)I
+
+    move-result p1
+
+    add-int/lit8 v0, p1, -0x1
+
+    int-to-long v0, v0
+
+    add-int/lit8 v2, p1, 0x1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    iput-object v2, p0, Ls0/l/e/n/w;->g:[Ljava/lang/Object;
+
+    iput-wide v0, p0, Ls0/l/e/n/w;->f:J
+
+    div-int/lit8 p1, p1, 0x4
+
+    sget v3, Ls0/l/e/n/t;->j:I
+
+    invoke-static {p1, v3}, Ljava/lang/Math;->min(II)I
+
+    move-result p1
+
+    iput p1, p0, Ls0/l/e/n/w;->d:I
+
+    iput-object v2, p0, Ls0/l/e/n/u;->i:[Ljava/lang/Object;
+
+    iput-wide v0, p0, Ls0/l/e/n/u;->h:J
+
+    const-wide/16 v2, 0x1
+
+    sub-long/2addr v0, v2
+
+    iput-wide v0, p0, Ls0/l/e/n/w;->e:J
+
+    const-wide/16 v0, 0x0
+
+    invoke-virtual {p0, v0, v1}, Ls0/l/e/n/t;->p(J)V
+
+    return-void
+.end method
+
+.method public static c(J)J
+    .locals 3
+
+    sget-wide v0, Ls0/l/e/n/t;->m:J
+
+    sget v2, Ls0/l/e/n/t;->n:I
+
+    shl-long/2addr p0, v2
+
+    add-long/2addr v0, p0
+
+    return-wide v0
+.end method
+
+.method public static h(JJ)J
+    .locals 0
+
+    and-long/2addr p0, p2
+
+    invoke-static {p0, p1}, Ls0/l/e/n/t;->c(J)J
+
+    move-result-wide p0
+
+    return-wide p0
+.end method
+
+.method public static k([Ljava/lang/Object;J)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<E:",
+            "Ljava/lang/Object;",
+            ">([TE;J)",
+            "Ljava/lang/Object;"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v0, p0, p1, p2}, Lsun/misc/Unsafe;->getObjectVolatile(Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static o([Ljava/lang/Object;JLjava/lang/Object;)V
+    .locals 1
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {v0, p0, p1, p2, p3}, Lsun/misc/Unsafe;->putOrderedObject(Ljava/lang/Object;JLjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final iterator()Ljava/util/Iterator;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Iterator<",
+            "TE;>;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final j()J
+    .locals 3
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v1, Ls0/l/e/n/t;->l:J
+
+    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final l()J
+    .locals 3
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v1, Ls0/l/e/n/t;->k:J
+
+    invoke-virtual {v0, p0, v1, v2}, Lsun/misc/Unsafe;->getLongVolatile(Ljava/lang/Object;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final m(J)V
+    .locals 6
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v2, Ls0/l/e/n/t;->l:J
+
+    move-object v1, p0
+
+    move-wide v4, p1
+
+    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
+
+    return-void
+.end method
+
+.method public final offer(Ljava/lang/Object;)Z
+    .locals 15
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TE;)Z"
+        }
+    .end annotation
+
+    move-object v7, p0
+
+    move-object/from16 v2, p1
+
+    if-eqz v2, :cond_3
+
+    iget-object v1, v7, Ls0/l/e/n/w;->g:[Ljava/lang/Object;
+
+    iget-wide v3, v7, Ls0/l/e/n/x;->producerIndex:J
+
+    iget-wide v5, v7, Ls0/l/e/n/w;->f:J
+
+    invoke-static {v3, v4, v5, v6}, Ls0/l/e/n/t;->h(JJ)J
+
+    move-result-wide v8
+
+    iget-wide v10, v7, Ls0/l/e/n/w;->e:J
+
+    const/4 v12, 0x1
+
+    cmp-long v0, v3, v10
+
+    if-gez v0, :cond_0
+
+    move-object v0, p0
+
+    move-object/from16 v2, p1
+
+    move-wide v5, v8
+
+    invoke-virtual/range {v0 .. v6}, Ls0/l/e/n/t;->q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
+
+    return v12
+
+    :cond_0
+    iget v0, v7, Ls0/l/e/n/w;->d:I
+
+    int-to-long v10, v0
+
+    add-long/2addr v10, v3
+
+    invoke-static {v10, v11, v5, v6}, Ls0/l/e/n/t;->h(JJ)J
+
+    move-result-wide v13
+
+    invoke-static {v1, v13, v14}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    const-wide/16 v13, 0x1
+
+    if-nez v0, :cond_1
+
+    sub-long/2addr v10, v13
+
+    iput-wide v10, v7, Ls0/l/e/n/w;->e:J
+
+    move-object v0, p0
+
+    move-object/from16 v2, p1
+
+    move-wide v5, v8
+
+    invoke-virtual/range {v0 .. v6}, Ls0/l/e/n/t;->q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
+
+    return v12
+
+    :cond_1
+    add-long v10, v3, v13
+
+    invoke-static {v10, v11, v5, v6}, Ls0/l/e/n/t;->h(JJ)J
+
+    move-result-wide v13
+
+    invoke-static {v1, v13, v14}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    move-object v0, p0
+
+    move-object/from16 v2, p1
+
+    move-wide v5, v8
+
+    invoke-virtual/range {v0 .. v6}, Ls0/l/e/n/t;->q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
+
+    return v12
+
+    :cond_2
+    array-length v0, v1
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    iput-object v0, v7, Ls0/l/e/n/w;->g:[Ljava/lang/Object;
+
+    add-long/2addr v5, v3
+
+    const-wide/16 v3, 0x1
+
+    sub-long/2addr v5, v3
+
+    iput-wide v5, v7, Ls0/l/e/n/w;->e:J
+
+    invoke-static {v0, v8, v9, v2}, Ls0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    array-length v2, v1
+
+    add-int/lit8 v2, v2, -0x1
+
+    int-to-long v2, v2
+
+    invoke-static {v2, v3}, Ls0/l/e/n/t;->c(J)J
+
+    move-result-wide v2
+
+    invoke-static {v1, v2, v3, v0}, Ls0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    sget-object v0, Ls0/l/e/n/t;->o:Ljava/lang/Object;
+
+    invoke-static {v1, v8, v9, v0}, Ls0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    invoke-virtual {p0, v10, v11}, Ls0/l/e/n/t;->p(J)V
+
+    return v12
+
+    :cond_3
+    new-instance v0, Ljava/lang/NullPointerException;
+
+    const-string v1, "Null is not a valid element"
+
+    invoke-direct {v0, v1}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final p(J)V
+    .locals 6
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    sget-wide v2, Ls0/l/e/n/t;->k:J
+
+    move-object v1, p0
+
+    move-wide v4, p1
+
+    invoke-virtual/range {v0 .. v5}, Lsun/misc/Unsafe;->putOrderedLong(Ljava/lang/Object;JJ)V
+
+    return-void
+.end method
+
+.method public final peek()Ljava/lang/Object;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/n/u;->i:[Ljava/lang/Object;
+
+    iget-wide v1, p0, Ls0/l/e/n/v;->consumerIndex:J
+
+    iget-wide v3, p0, Ls0/l/e/n/u;->h:J
+
+    invoke-static {v1, v2, v3, v4}, Ls0/l/e/n/t;->h(JJ)J
+
+    move-result-wide v5
+
+    invoke-static {v0, v5, v6}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v5
+
+    sget-object v6, Ls0/l/e/n/t;->o:Ljava/lang/Object;
+
+    if-ne v5, v6, :cond_0
+
+    array-length v5, v0
+
+    add-int/lit8 v5, v5, -0x1
+
+    int-to-long v5, v5
+
+    invoke-static {v5, v6}, Ls0/l/e/n/t;->c(J)J
+
+    move-result-wide v5
+
+    invoke-static {v0, v5, v6}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/e/n/u;->i:[Ljava/lang/Object;
+
+    invoke-static {v1, v2, v3, v4}, Ls0/l/e/n/t;->h(JJ)J
+
+    move-result-wide v1
+
+    invoke-static {v0, v1, v2}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_0
+    return-object v5
+.end method
+
+.method public final poll()Ljava/lang/Object;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TE;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/l/e/n/u;->i:[Ljava/lang/Object;
+
+    iget-wide v1, p0, Ls0/l/e/n/v;->consumerIndex:J
+
+    iget-wide v3, p0, Ls0/l/e/n/u;->h:J
+
+    invoke-static {v1, v2, v3, v4}, Ls0/l/e/n/t;->h(JJ)J
+
+    move-result-wide v5
+
+    invoke-static {v0, v5, v6}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v7
+
+    sget-object v8, Ls0/l/e/n/t;->o:Ljava/lang/Object;
+
+    if-ne v7, v8, :cond_0
+
+    const/4 v8, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v8, 0x0
+
+    :goto_0
+    const-wide/16 v9, 0x1
+
+    const/4 v11, 0x0
+
+    if-eqz v7, :cond_1
+
+    if-nez v8, :cond_1
+
+    invoke-static {v0, v5, v6, v11}, Ls0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    add-long/2addr v1, v9
+
+    invoke-virtual {p0, v1, v2}, Ls0/l/e/n/t;->m(J)V
+
+    return-object v7
+
+    :cond_1
+    if-eqz v8, :cond_3
+
+    array-length v5, v0
+
+    add-int/lit8 v5, v5, -0x1
+
+    int-to-long v5, v5
+
+    invoke-static {v5, v6}, Ls0/l/e/n/t;->c(J)J
+
+    move-result-wide v5
+
+    invoke-static {v0, v5, v6}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ljava/lang/Object;
+
+    iput-object v0, p0, Ls0/l/e/n/u;->i:[Ljava/lang/Object;
+
+    invoke-static {v1, v2, v3, v4}, Ls0/l/e/n/t;->h(JJ)J
+
+    move-result-wide v3
+
+    invoke-static {v0, v3, v4}, Ls0/l/e/n/t;->k([Ljava/lang/Object;J)Ljava/lang/Object;
+
+    move-result-object v5
+
+    if-nez v5, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    invoke-static {v0, v3, v4, v11}, Ls0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    add-long/2addr v1, v9
+
+    invoke-virtual {p0, v1, v2}, Ls0/l/e/n/t;->m(J)V
+
+    move-object v11, v5
+
+    :cond_3
+    :goto_1
+    return-object v11
+.end method
+
+.method public final q([Ljava/lang/Object;Ljava/lang/Object;JJ)Z
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "([TE;TE;JJ)Z"
+        }
+    .end annotation
+
+    invoke-static {p1, p5, p6, p2}, Ls0/l/e/n/t;->o([Ljava/lang/Object;JLjava/lang/Object;)V
+
+    const-wide/16 p1, 0x1
+
+    add-long/2addr p3, p1
+
+    invoke-virtual {p0, p3, p4}, Ls0/l/e/n/t;->p(J)V
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final size()I
+    .locals 7
+
+    invoke-virtual {p0}, Ls0/l/e/n/t;->j()J
+
+    move-result-wide v0
+
+    :goto_0
+    invoke-virtual {p0}, Ls0/l/e/n/t;->l()J
+
+    move-result-wide v2
+
+    invoke-virtual {p0}, Ls0/l/e/n/t;->j()J
+
+    move-result-wide v4
+
+    cmp-long v6, v0, v4
+
+    if-nez v6, :cond_0
+
+    sub-long/2addr v2, v4
+
+    long-to-int v0, v2
+
+    return v0
+
+    :cond_0
+    move-wide v0, v4
+
+    goto :goto_0
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/u.smali b/com.discord/smali_classes2/s0/l/e/n/u.smali
new file mode 100644
index 0000000000..383e5ac802
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/u.smali
@@ -0,0 +1,37 @@
+.class public abstract Ls0/l/e/n/u;
+.super Ls0/l/e/n/w;
+.source "SpscUnboundedArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/u<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public h:J
+
+.field public i:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TE;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/l/e/n/w;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/v.smali b/com.discord/smali_classes2/s0/l/e/n/v.smali
new file mode 100644
index 0000000000..01cb46e673
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/v.smali
@@ -0,0 +1,29 @@
+.class public abstract Ls0/l/e/n/v;
+.super Ls0/l/e/n/u;
+.source "SpscUnboundedArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/u<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public consumerIndex:J
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/l/e/n/u;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/w.smali b/com.discord/smali_classes2/s0/l/e/n/w.smali
new file mode 100644
index 0000000000..2b8a5df074
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/w.smali
@@ -0,0 +1,41 @@
+.class public abstract Ls0/l/e/n/w;
+.super Ls0/l/e/n/x;
+.source "SpscUnboundedArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ls0/l/e/n/x<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public d:I
+
+.field public e:J
+
+.field public f:J
+
+.field public g:[Ljava/lang/Object;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "[TE;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/l/e/n/x;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/x.smali b/com.discord/smali_classes2/s0/l/e/n/x.smali
new file mode 100644
index 0000000000..b2f6e7b563
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/x.smali
@@ -0,0 +1,29 @@
+.class public abstract Ls0/l/e/n/x;
+.super Ljava/util/AbstractQueue;
+.source "SpscUnboundedArrayQueue.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<E:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/AbstractQueue<",
+        "TE;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public producerIndex:J
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/util/AbstractQueue;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/l/e/n/y.smali b/com.discord/smali_classes2/s0/l/e/n/y.smali
new file mode 100644
index 0000000000..bcf64c41cb
--- /dev/null
+++ b/com.discord/smali_classes2/s0/l/e/n/y.smali
@@ -0,0 +1,124 @@
+.class public final Ls0/l/e/n/y;
+.super Ljava/lang/Object;
+.source "UnsafeAccess.java"
+
+
+# static fields
+.field public static final a:Lsun/misc/Unsafe;
+
+.field public static final b:Z
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const-string v0, "rx.unsafe-disable"
+
+    invoke-static {v0}, Ljava/lang/System;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    sput-boolean v0, Ls0/l/e/n/y;->b:Z
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    const-class v2, Lsun/misc/Unsafe;
+
+    const-string v3, "theUnsafe"
+
+    invoke-virtual {v2, v3}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V
+
+    invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lsun/misc/Unsafe;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    move-object v0, v1
+
+    :catchall_0
+    sput-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    return-void
+.end method
+
+.method public static a(Ljava/lang/Class;Ljava/lang/String;)J
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/lang/String;",
+            ")J"
+        }
+    .end annotation
+
+    :try_start_0
+    invoke-virtual {p0, p1}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+    move-result-object p0
+
+    sget-object p1, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    invoke-virtual {p1, p0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+
+    move-result-wide p0
+    :try_end_0
+    .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-wide p0
+
+    :catch_0
+    move-exception p0
+
+    new-instance p1, Ljava/lang/InternalError;
+
+    invoke-direct {p1}, Ljava/lang/InternalError;-><init>()V
+
+    invoke-virtual {p1, p0}, Ljava/lang/InternalError;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+
+    throw p1
+.end method
+
+.method public static b()Z
+    .locals 1
+
+    sget-object v0, Ls0/l/e/n/y;->a:Lsun/misc/Unsafe;
+
+    if-eqz v0, :cond_0
+
+    sget-boolean v0, Ls0/l/e/n/y;->b:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
diff --git a/com.discord/smali_classes2/s0/m/a.smali b/com.discord/smali_classes2/s0/m/a.smali
new file mode 100644
index 0000000000..45a9bf03a3
--- /dev/null
+++ b/com.discord/smali_classes2/s0/m/a.smali
@@ -0,0 +1,77 @@
+.class public Ls0/m/a;
+.super Lrx/Subscriber;
+.source "BlockingObservable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ljava/util/concurrent/CountDownLatch;
+
+.field public final synthetic e:Ljava/util/concurrent/atomic/AtomicReference;
+
+.field public final synthetic f:Ljava/util/concurrent/atomic/AtomicReference;
+
+
+# direct methods
+.method public constructor <init>(Ls0/m/b;Ljava/util/concurrent/CountDownLatch;Ljava/util/concurrent/atomic/AtomicReference;Ljava/util/concurrent/atomic/AtomicReference;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/m/a;->d:Ljava/util/concurrent/CountDownLatch;
+
+    iput-object p3, p0, Ls0/m/a;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iput-object p4, p0, Ls0/m/a;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/m/a;->d:Ljava/util/concurrent/CountDownLatch;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/m/a;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    iget-object p1, p0, Ls0/m/a;->d:Ljava/util/concurrent/CountDownLatch;
+
+    invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/m/a;->f:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/m/b.smali b/com.discord/smali_classes2/s0/m/b.smali
new file mode 100644
index 0000000000..9ebe6eaa66
--- /dev/null
+++ b/com.discord/smali_classes2/s0/m/b.smali
@@ -0,0 +1,154 @@
+.class public final Ls0/m/b;
+.super Ljava/lang/Object;
+.source "BlockingObservable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "+TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable<",
+            "+TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/m/b;->a:Lrx/Observable;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a()Ljava/lang/Object;
+    .locals 9
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/m/b;->a:Lrx/Observable;
+
+    sget-object v1, Ls0/l/a/u1$a;->a:Ls0/l/a/u1;
+
+    new-instance v2, Ls0/l/a/u;
+
+    iget-object v0, v0, Lrx/Observable;->d:Lrx/Observable$a;
+
+    invoke-direct {v2, v0, v1}, Ls0/l/a/u;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
+
+    invoke-static {v2}, Lrx/Observable;->d0(Lrx/Observable$a;)Lrx/Observable;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    new-instance v2, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v2}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    new-instance v3, Ljava/util/concurrent/CountDownLatch;
+
+    const/4 v4, 0x1
+
+    invoke-direct {v3, v4}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
+
+    new-instance v4, Ls0/m/a;
+
+    invoke-direct {v4, p0, v3, v2, v1}, Ls0/m/a;-><init>(Ls0/m/b;Ljava/util/concurrent/CountDownLatch;Ljava/util/concurrent/atomic/AtomicReference;Ljava/util/concurrent/atomic/AtomicReference;)V
+
+    invoke-virtual {v0, v4}, Lrx/Observable;->Q(Lrx/Subscriber;)Lrx/Subscription;
+
+    move-result-object v0
+
+    invoke-virtual {v3}, Ljava/util/concurrent/CountDownLatch;->getCount()J
+
+    move-result-wide v4
+
+    const-wide/16 v6, 0x0
+
+    cmp-long v8, v4, v6
+
+    if-nez v8, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_0
+    invoke-virtual {v3}, Ljava/util/concurrent/CountDownLatch;->await()V
+    :try_end_0
+    .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :goto_0
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    return-object v0
+
+    :cond_1
+    invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Throwable;
+
+    invoke-static {v0}, Lf/n/a/k/a;->O(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+
+    const/4 v0, 0x0
+
+    throw v0
+
+    :catch_0
+    move-exception v1
+
+    invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->interrupt()V
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v2, "Interrupted while waiting for subscription to complete."
+
+    invoke-direct {v0, v2, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
diff --git a/com.discord/smali_classes2/s0/m/c.smali b/com.discord/smali_classes2/s0/m/c.smali
new file mode 100644
index 0000000000..d04c2a8433
--- /dev/null
+++ b/com.discord/smali_classes2/s0/m/c.smali
@@ -0,0 +1,46 @@
+.class public abstract Ls0/m/c;
+.super Lrx/Observable;
+.source "ConnectableObservable.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Observable<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Lrx/Observable$a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Observable$a<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lrx/Observable;-><init>(Lrx/Observable$a;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public abstract g0(Lrx/functions/Action1;)V
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/functions/Action1<",
+            "-",
+            "Lrx/Subscription;",
+            ">;)V"
+        }
+    .end annotation
+.end method
diff --git a/com.discord/smali_classes2/s0/n/a$a.smali b/com.discord/smali_classes2/s0/n/a$a.smali
new file mode 100644
index 0000000000..ce05d8acf8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/n/a$a.smali
@@ -0,0 +1,60 @@
+.class public final Ls0/n/a$a;
+.super Ljava/lang/Object;
+.source "Observers.java"
+
+# interfaces
+.implements Ls0/g;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/n/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/g<",
+        "Ljava/lang/Object;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onCompleted()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public final onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    new-instance v0, Lrx/exceptions/OnErrorNotImplementedException;
+
+    invoke-direct {v0, p1}, Lrx/exceptions/OnErrorNotImplementedException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+.method public final onNext(Ljava/lang/Object;)V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/n/a.smali b/com.discord/smali_classes2/s0/n/a.smali
new file mode 100644
index 0000000000..916c555a7e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/n/a.smali
@@ -0,0 +1,29 @@
+.class public final Ls0/n/a;
+.super Ljava/lang/Object;
+.source "Observers.java"
+
+
+# static fields
+.field public static final a:Ls0/g;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/g<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/n/a$a;
+
+    invoke-direct {v0}, Ls0/n/a$a;-><init>()V
+
+    sput-object v0, Ls0/n/a;->a:Ls0/g;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/n/b.smali b/com.discord/smali_classes2/s0/n/b.smali
new file mode 100644
index 0000000000..f5be7f4a38
--- /dev/null
+++ b/com.discord/smali_classes2/s0/n/b.smali
@@ -0,0 +1,333 @@
+.class public Ls0/n/b;
+.super Lrx/Subscriber;
+.source "SafeSubscriber.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    iput-object p1, p0, Ls0/n/b;->d:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 3
+
+    iget-boolean v0, p0, Ls0/n/b;->e:Z
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/n/b;->e:Z
+
+    :try_start_0
+    iget-object v0, p0, Ls0/n/b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    invoke-static {v0}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    new-instance v1, Lrx/exceptions/UnsubscribeFailedException;
+
+    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2, v0}, Lrx/exceptions/UnsubscribeFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :catchall_1
+    move-exception v0
+
+    :try_start_2
+    invoke-static {v0}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-static {v0}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    new-instance v1, Lrx/exceptions/OnCompletedFailedException;
+
+    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2, v0}, Lrx/exceptions/OnCompletedFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    :catchall_2
+    move-exception v0
+
+    :try_start_3
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_3
+
+    throw v0
+
+    :catchall_3
+    move-exception v0
+
+    invoke-static {v0}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    new-instance v1, Lrx/exceptions/UnsubscribeFailedException;
+
+    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2, v0}, Lrx/exceptions/UnsubscribeFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v1
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 8
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iget-boolean v0, p0, Ls0/n/b;->e:Z
+
+    if-nez v0, :cond_1
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/n/b;->e:Z
+
+    sget-object v1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    :try_start_0
+    iget-object v3, p0, Ls0/n/b;->d:Lrx/Subscriber;
+
+    invoke-interface {v3, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+    :try_end_0
+    .catch Lrx/exceptions/OnErrorNotImplementedException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :try_start_1
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    new-instance v0, Lrx/exceptions/OnErrorFailedException;
+
+    invoke-direct {v0, p1}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+
+    :catchall_1
+    move-exception v3
+
+    invoke-static {v3}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    :try_start_2
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_2
+
+    new-instance v4, Lrx/exceptions/OnErrorFailedException;
+
+    new-instance v5, Lrx/exceptions/CompositeException;
+
+    new-array v2, v2, [Ljava/lang/Throwable;
+
+    aput-object p1, v2, v1
+
+    aput-object v3, v2, v0
+
+    invoke-static {v2}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-direct {v5, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    const-string p1, "Error occurred when trying to propagate error to Observer.onError"
+
+    invoke-direct {v4, p1, v5}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v4
+
+    :catchall_2
+    move-exception v4
+
+    invoke-static {v4}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    new-instance v5, Lrx/exceptions/OnErrorFailedException;
+
+    new-instance v6, Lrx/exceptions/CompositeException;
+
+    const/4 v7, 0x3
+
+    new-array v7, v7, [Ljava/lang/Throwable;
+
+    aput-object p1, v7, v1
+
+    aput-object v3, v7, v0
+
+    aput-object v4, v7, v2
+
+    invoke-static {v7}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-direct {v6, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    const-string p1, "Error occurred when trying to propagate error to Observer.onError and during unsubscription."
+
+    invoke-direct {v5, p1, v6}, Lrx/exceptions/OnErrorFailedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v5
+
+    :catch_0
+    move-exception v3
+
+    :try_start_3
+    invoke-virtual {p0}, Lrx/Subscriber;->unsubscribe()V
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_3
+
+    throw v3
+
+    :catchall_3
+    move-exception v3
+
+    invoke-static {v3}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    new-instance v4, Lrx/exceptions/OnErrorNotImplementedException;
+
+    new-instance v5, Lrx/exceptions/CompositeException;
+
+    new-array v2, v2, [Ljava/lang/Throwable;
+
+    aput-object p1, v2, v1
+
+    aput-object v3, v2, v0
+
+    invoke-static {v2}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-direct {v5, p1}, Lrx/exceptions/CompositeException;-><init>(Ljava/util/Collection;)V
+
+    const-string p1, "Observer.onError not implemented and error while unsubscribing."
+
+    invoke-direct {v4, p1, v5}, Lrx/exceptions/OnErrorNotImplementedException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw v4
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+
+    :cond_1
+    :goto_0
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/n/b;->e:Z
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/n/b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    invoke-virtual {p0, p1}, Ls0/n/b;->onError(Ljava/lang/Throwable;)V
+
+    :cond_0
+    :goto_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/n/c$a.smali b/com.discord/smali_classes2/s0/n/c$a.smali
new file mode 100644
index 0000000000..4d265657eb
--- /dev/null
+++ b/com.discord/smali_classes2/s0/n/c$a.smali
@@ -0,0 +1,79 @@
+.class public final Ls0/n/c$a;
+.super Ljava/lang/Object;
+.source "SerializedObserver.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/n/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# instance fields
+.field public a:[Ljava/lang/Object;
+
+.field public b:I
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)V
+    .locals 4
+
+    iget v0, p0, Ls0/n/c$a;->b:I
+
+    iget-object v1, p0, Ls0/n/c$a;->a:[Ljava/lang/Object;
+
+    if-nez v1, :cond_0
+
+    const/16 v1, 0x10
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    iput-object v1, p0, Ls0/n/c$a;->a:[Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_0
+    array-length v2, v1
+
+    if-ne v0, v2, :cond_1
+
+    shr-int/lit8 v2, v0, 0x2
+
+    add-int/2addr v2, v0
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    const/4 v3, 0x0
+
+    invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    iput-object v2, p0, Ls0/n/c$a;->a:[Ljava/lang/Object;
+
+    move-object v1, v2
+
+    :cond_1
+    :goto_0
+    aput-object p1, v1, v0
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Ls0/n/c$a;->b:I
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/n/c.smali b/com.discord/smali_classes2/s0/n/c.smali
new file mode 100644
index 0000000000..b79f379e3b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/n/c.smali
@@ -0,0 +1,391 @@
+.class public Ls0/n/c;
+.super Ljava/lang/Object;
+.source "SerializedObserver.java"
+
+# interfaces
+.implements Ls0/g;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/n/c$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/g<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Ls0/g;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/g<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+.field public volatile f:Z
+
+.field public g:Ls0/n/c$a;
+
+
+# direct methods
+.method public constructor <init>(Ls0/g;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/g<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Ls0/n/c;->d:Ls0/g;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 2
+
+    iget-boolean v0, p0, Ls0/n/c;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/n/c;->f:Z
+
+    if-eqz v0, :cond_1
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/n/c;->f:Z
+
+    iget-boolean v1, p0, Ls0/n/c;->e:Z
+
+    if-eqz v1, :cond_3
+
+    iget-object v0, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    if-nez v0, :cond_2
+
+    new-instance v0, Ls0/n/c$a;
+
+    invoke-direct {v0}, Ls0/n/c$a;-><init>()V
+
+    iput-object v0, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    :cond_2
+    sget-object v1, Ls0/l/a/h;->a:Ljava/lang/Object;
+
+    invoke-virtual {v0, v1}, Ls0/n/c$a;->a(Ljava/lang/Object;)V
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_3
+    iput-boolean v0, p0, Ls0/n/c;->e:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/n/c;->d:Ls0/g;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v0
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 2
+
+    invoke-static {p1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iget-boolean v0, p0, Ls0/n/c;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/n/c;->f:Z
+
+    if-eqz v0, :cond_1
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/n/c;->f:Z
+
+    iget-boolean v1, p0, Ls0/n/c;->e:Z
+
+    if-eqz v1, :cond_3
+
+    iget-object v0, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    if-nez v0, :cond_2
+
+    new-instance v0, Ls0/n/c$a;
+
+    invoke-direct {v0}, Ls0/n/c$a;-><init>()V
+
+    iput-object v0, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    :cond_2
+    new-instance v1, Ls0/l/a/h$c;
+
+    invoke-direct {v1, p1}, Ls0/l/a/h$c;-><init>(Ljava/lang/Throwable;)V
+
+    invoke-virtual {v0, v1}, Ls0/n/c$a;->a(Ljava/lang/Object;)V
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_3
+    iput-boolean v0, p0, Ls0/n/c;->e:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Ls0/n/c;->d:Ls0/g;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-boolean v0, p0, Ls0/n/c;->f:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Ls0/n/c;->f:Z
+
+    if-eqz v0, :cond_1
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    iget-boolean v0, p0, Ls0/n/c;->e:Z
+
+    if-eqz v0, :cond_4
+
+    iget-object v0, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    if-nez v0, :cond_2
+
+    new-instance v0, Ls0/n/c$a;
+
+    invoke-direct {v0}, Ls0/n/c$a;-><init>()V
+
+    iput-object v0, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    :cond_2
+    if-nez p1, :cond_3
+
+    sget-object p1, Ls0/l/a/h;->b:Ljava/lang/Object;
+
+    :cond_3
+    invoke-virtual {v0, p1}, Ls0/n/c$a;->a(Ljava/lang/Object;)V
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_4
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/n/c;->e:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_3
+
+    :try_start_1
+    iget-object v1, p0, Ls0/n/c;->d:Ls0/g;
+
+    invoke-interface {v1, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_2
+
+    :cond_5
+    :goto_0
+    monitor-enter p0
+
+    :try_start_2
+    iget-object v1, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_6
+
+    iput-boolean v2, p0, Ls0/n/c;->e:Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_6
+    const/4 v3, 0x0
+
+    iput-object v3, p0, Ls0/n/c;->g:Ls0/n/c$a;
+
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    iget-object v1, v1, Ls0/n/c$a;->a:[Ljava/lang/Object;
+
+    array-length v3, v1
+
+    :goto_1
+    if-ge v2, v3, :cond_5
+
+    aget-object v4, v1, v2
+
+    if-nez v4, :cond_7
+
+    goto :goto_0
+
+    :cond_7
+    :try_start_3
+    iget-object v5, p0, Ls0/n/c;->d:Ls0/g;
+
+    invoke-static {v5, v4}, Ls0/l/a/h;->a(Ls0/g;Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_8
+
+    iput-boolean v0, p0, Ls0/n/c;->f:Z
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_0
+
+    return-void
+
+    :cond_8
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_1
+
+    :catchall_0
+    move-exception v1
+
+    iput-boolean v0, p0, Ls0/n/c;->f:Z
+
+    invoke-static {v1}, Lf/n/a/k/a;->b0(Ljava/lang/Throwable;)V
+
+    iget-object v0, p0, Ls0/n/c;->d:Ls0/g;
+
+    invoke-static {v1, p1}, Lrx/exceptions/OnErrorThrowable;->a(Ljava/lang/Throwable;Ljava/lang/Object;)Ljava/lang/Throwable;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+
+    :catchall_1
+    move-exception p1
+
+    :try_start_4
+    monitor-exit p0
+    :try_end_4
+    .catchall {:try_start_4 .. :try_end_4} :catchall_1
+
+    throw p1
+
+    :catchall_2
+    move-exception v1
+
+    iput-boolean v0, p0, Ls0/n/c;->f:Z
+
+    iget-object v0, p0, Ls0/n/c;->d:Ls0/g;
+
+    invoke-static {v1, v0, p1}, Lf/n/a/k/a;->c0(Ljava/lang/Throwable;Ls0/g;Ljava/lang/Object;)V
+
+    return-void
+
+    :catchall_3
+    move-exception p1
+
+    :try_start_5
+    monitor-exit p0
+    :try_end_5
+    .catchall {:try_start_5 .. :try_end_5} :catchall_3
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/n/d.smali b/com.discord/smali_classes2/s0/n/d.smali
new file mode 100644
index 0000000000..181c74e6a1
--- /dev/null
+++ b/com.discord/smali_classes2/s0/n/d.smali
@@ -0,0 +1,65 @@
+.class public final Ls0/n/d;
+.super Lrx/Subscriber;
+.source "Subscribers.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Ls0/g;
+
+
+# direct methods
+.method public constructor <init>(Ls0/g;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/n/d;->d:Ls0/g;
+
+    invoke-direct {p0}, Lrx/Subscriber;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/n/d;->d:Ls0/g;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/n/d;->d:Ls0/g;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/n/d;->d:Ls0/g;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/n/e.smali b/com.discord/smali_classes2/s0/n/e.smali
new file mode 100644
index 0000000000..71571947bc
--- /dev/null
+++ b/com.discord/smali_classes2/s0/n/e.smali
@@ -0,0 +1,65 @@
+.class public final Ls0/n/e;
+.super Lrx/Subscriber;
+.source "Subscribers.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lrx/Subscriber<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final synthetic d:Lrx/Subscriber;
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Lrx/Subscriber;)V
+    .locals 0
+
+    iput-object p2, p0, Ls0/n/e;->d:Lrx/Subscriber;
+
+    invoke-direct {p0, p1}, Lrx/Subscriber;-><init>(Lrx/Subscriber;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/n/e;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/n/e;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/n/e;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/a.smali b/com.discord/smali_classes2/s0/o/a.smali
new file mode 100644
index 0000000000..5e441f905b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/a.smali
@@ -0,0 +1,13 @@
+.class public abstract Ls0/o/a;
+.super Ljava/lang/Object;
+.source "RxJavaCompletableExecutionHook.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/b.smali b/com.discord/smali_classes2/s0/o/b.smali
new file mode 100644
index 0000000000..bdbd3d739b
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/b.smali
@@ -0,0 +1,13 @@
+.class public abstract Ls0/o/b;
+.super Ljava/lang/Object;
+.source "RxJavaErrorHandler.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/c.smali b/com.discord/smali_classes2/s0/o/c.smali
new file mode 100644
index 0000000000..b4c9cd7d3c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/c.smali
@@ -0,0 +1,51 @@
+.class public final Ls0/o/c;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/Observable$a;",
+        "Lrx/Observable$a;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Observable$a;
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->c()Ls0/o/m;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/d.smali b/com.discord/smali_classes2/s0/o/d.smali
new file mode 100644
index 0000000000..6c03203f58
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/d.smali
@@ -0,0 +1,51 @@
+.class public final Ls0/o/d;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ls0/h$a;",
+        "Ls0/h$a;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ls0/h$a;
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->f()Ls0/o/q;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/e.smali b/com.discord/smali_classes2/s0/o/e.smali
new file mode 100644
index 0000000000..b68a00185a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/e.smali
@@ -0,0 +1,51 @@
+.class public final Ls0/o/e;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ls0/d$a;",
+        "Ls0/d$a;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ls0/d$a;
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->a()Ls0/o/a;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/f.smali b/com.discord/smali_classes2/s0/o/f.smali
new file mode 100644
index 0000000000..565e616680
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/f.smali
@@ -0,0 +1,50 @@
+.class public final Ls0/o/f;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Action1<",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)V
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->b()Ls0/o/b;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    return-void
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/g.smali b/com.discord/smali_classes2/s0/o/g.smali
new file mode 100644
index 0000000000..4b9142e1a4
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/g.smali
@@ -0,0 +1,54 @@
+.class public final Ls0/o/g;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func2<",
+        "Lrx/Observable;",
+        "Lrx/Observable$a;",
+        "Lrx/Observable$a;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Lrx/Observable;
+
+    check-cast p2, Lrx/Observable$a;
+
+    sget-object p1, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {p1}, Ls0/o/o;->c()Ls0/o/m;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    return-object p2
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/h.smali b/com.discord/smali_classes2/s0/o/h.smali
new file mode 100644
index 0000000000..9166bfd8fe
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/h.smali
@@ -0,0 +1,51 @@
+.class public final Ls0/o/h;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/Subscription;",
+        "Lrx/Subscription;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Subscription;
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->c()Ls0/o/m;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/i.smali b/com.discord/smali_classes2/s0/o/i.smali
new file mode 100644
index 0000000000..08e88aec83
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/i.smali
@@ -0,0 +1,51 @@
+.class public final Ls0/o/i;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/functions/Action0;",
+        "Lrx/functions/Action0;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/functions/Action0;
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->e()Ls0/o/p;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/j.smali b/com.discord/smali_classes2/s0/o/j.smali
new file mode 100644
index 0000000000..2bbeacf656
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/j.smali
@@ -0,0 +1,51 @@
+.class public final Ls0/o/j;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Ljava/lang/Throwable;",
+        "Ljava/lang/Throwable;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->c()Ls0/o/m;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/k.smali b/com.discord/smali_classes2/s0/o/k.smali
new file mode 100644
index 0000000000..396a8a0dde
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/k.smali
@@ -0,0 +1,51 @@
+.class public final Ls0/o/k;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+# interfaces
+.implements Ls0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Object;",
+        "Ls0/k/b<",
+        "Lrx/Observable$b;",
+        "Lrx/Observable$b;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    check-cast p1, Lrx/Observable$b;
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->c()Ls0/o/m;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    return-object p1
+
+    :cond_0
+    const/4 p1, 0x0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/s0/o/l.smali b/com.discord/smali_classes2/s0/o/l.smali
new file mode 100644
index 0000000000..8575153d52
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/l.smali
@@ -0,0 +1,291 @@
+.class public final Ls0/o/l;
+.super Ljava/lang/Object;
+.source "RxJavaHooks.java"
+
+
+# static fields
+.field public static volatile a:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile b:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Lrx/Observable$a;",
+            "Lrx/Observable$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile c:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Ls0/h$a;",
+            "Ls0/h$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile d:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Ls0/d$a;",
+            "Ls0/d$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile e:Lrx/functions/Func2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Func2<",
+            "Lrx/Observable;",
+            "Lrx/Observable$a;",
+            "Lrx/Observable$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile f:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Lrx/functions/Action0;",
+            "Lrx/functions/Action0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile g:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Lrx/Subscription;",
+            "Lrx/Subscription;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile h:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Ljava/lang/Throwable;",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static volatile i:Ls0/k/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/k/b<",
+            "Lrx/Observable$b;",
+            "Lrx/Observable$b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/o/f;
+
+    invoke-direct {v0}, Ls0/o/f;-><init>()V
+
+    sput-object v0, Ls0/o/l;->a:Lrx/functions/Action1;
+
+    new-instance v0, Ls0/o/g;
+
+    invoke-direct {v0}, Ls0/o/g;-><init>()V
+
+    sput-object v0, Ls0/o/l;->e:Lrx/functions/Func2;
+
+    new-instance v0, Ls0/o/h;
+
+    invoke-direct {v0}, Ls0/o/h;-><init>()V
+
+    sput-object v0, Ls0/o/l;->g:Ls0/k/b;
+
+    new-instance v0, Ls0/o/i;
+
+    invoke-direct {v0}, Ls0/o/i;-><init>()V
+
+    sput-object v0, Ls0/o/l;->f:Ls0/k/b;
+
+    new-instance v0, Ls0/o/j;
+
+    invoke-direct {v0}, Ls0/o/j;-><init>()V
+
+    sput-object v0, Ls0/o/l;->h:Ls0/k/b;
+
+    new-instance v0, Ls0/o/k;
+
+    invoke-direct {v0}, Ls0/o/k;-><init>()V
+
+    sput-object v0, Ls0/o/l;->i:Ls0/k/b;
+
+    new-instance v0, Ls0/o/c;
+
+    invoke-direct {v0}, Ls0/o/c;-><init>()V
+
+    sput-object v0, Ls0/o/l;->b:Ls0/k/b;
+
+    new-instance v0, Ls0/o/d;
+
+    invoke-direct {v0}, Ls0/o/d;-><init>()V
+
+    sput-object v0, Ls0/o/l;->c:Ls0/k/b;
+
+    new-instance v0, Ls0/o/e;
+
+    invoke-direct {v0}, Ls0/o/e;-><init>()V
+
+    sput-object v0, Ls0/o/l;->d:Ls0/k/b;
+
+    return-void
+.end method
+
+.method public static a(Lrx/Observable$a;)Lrx/Observable$a;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Lrx/Observable$a<",
+            "TT;>;)",
+            "Lrx/Observable$a<",
+            "TT;>;"
+        }
+    .end annotation
+
+    sget-object v0, Ls0/o/l;->b:Ls0/k/b;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p0}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Lrx/Observable$a;
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static b(Ljava/lang/Throwable;)V
+    .locals 4
+
+    sget-object v0, Ls0/o/l;->a:Lrx/functions/Action1;
+
+    if-eqz v0, :cond_0
+
+    :try_start_0
+    invoke-interface {v0, p0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    sget-object v1, Ljava/lang/System;->err:Ljava/io/PrintStream;
+
+    const-string v2, "The onError handler threw an Exception. It shouldn\'t. => "
+
+    invoke-static {v2}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v2
+
+    invoke-virtual {v0}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Throwable;->printStackTrace()V
+
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v2
+
+    invoke-interface {v2, v1, v0}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    :cond_0
+    invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Thread;->getUncaughtExceptionHandler()Ljava/lang/Thread$UncaughtExceptionHandler;
+
+    move-result-object v1
+
+    invoke-interface {v1, v0, p0}, Ljava/lang/Thread$UncaughtExceptionHandler;->uncaughtException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public static c(Ljava/lang/Throwable;)Ljava/lang/Throwable;
+    .locals 1
+
+    sget-object v0, Ls0/o/l;->h:Ls0/k/b;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p0}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Ljava/lang/Throwable;
+
+    :cond_0
+    return-object p0
+.end method
+
+.method public static d(Lrx/functions/Action0;)Lrx/functions/Action0;
+    .locals 1
+
+    sget-object v0, Ls0/o/l;->f:Ls0/k/b;
+
+    if-eqz v0, :cond_0
+
+    invoke-interface {v0, p0}, Ls0/k/b;->call(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p0
+
+    check-cast p0, Lrx/functions/Action0;
+
+    :cond_0
+    return-object p0
+.end method
diff --git a/com.discord/smali_classes2/s0/o/m.smali b/com.discord/smali_classes2/s0/o/m.smali
new file mode 100644
index 0000000000..014166f718
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/m.smali
@@ -0,0 +1,13 @@
+.class public abstract Ls0/o/m;
+.super Ljava/lang/Object;
+.source "RxJavaObservableExecutionHook.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/n.smali b/com.discord/smali_classes2/s0/o/n.smali
new file mode 100644
index 0000000000..88000ae213
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/n.smali
@@ -0,0 +1,29 @@
+.class public final Ls0/o/n;
+.super Ls0/o/m;
+.source "RxJavaObservableExecutionHookDefault.java"
+
+
+# static fields
+.field public static final a:Ls0/o/n;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/o/n;
+
+    invoke-direct {v0}, Ls0/o/n;-><init>()V
+
+    sput-object v0, Ls0/o/n;->a:Ls0/o/n;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/o/m;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/o$a.smali b/com.discord/smali_classes2/s0/o/o$a.smali
new file mode 100644
index 0000000000..0ca125a6d6
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/o$a.smali
@@ -0,0 +1,24 @@
+.class public final Ls0/o/o$a;
+.super Ls0/o/b;
+.source "RxJavaPlugins.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/o/o;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/o/b;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/o$b.smali b/com.discord/smali_classes2/s0/o/o$b.smali
new file mode 100644
index 0000000000..658d5c0f5d
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/o$b.smali
@@ -0,0 +1,24 @@
+.class public Ls0/o/o$b;
+.super Ls0/o/a;
+.source "RxJavaPlugins.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Ls0/o/o;->a()Ls0/o/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x1
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>(Ls0/o/o;)V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/o/a;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/o.smali b/com.discord/smali_classes2/s0/o/o.smali
new file mode 100644
index 0000000000..07b00a4aa5
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/o.smali
@@ -0,0 +1,659 @@
+.class public Ls0/o/o;
+.super Ljava/lang/Object;
+.source "RxJavaPlugins.java"
+
+
+# static fields
+.field public static final f:Ls0/o/o;
+
+.field public static final g:Ls0/o/b;
+
+
+# instance fields
+.field public final a:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/o/b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final b:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/o/m;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final c:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/o/q;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final d:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/o/a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final e:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/o/p;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/o/o;
+
+    invoke-direct {v0}, Ls0/o/o;-><init>()V
+
+    sput-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    new-instance v0, Ls0/o/o$a;
+
+    invoke-direct {v0}, Ls0/o/o$a;-><init>()V
+
+    sput-object v0, Ls0/o/o;->g:Ls0/o/b;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+.method public static d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Class<",
+            "*>;",
+            "Ljava/util/Properties;",
+            ")",
+            "Ljava/lang/Object;"
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Ljava/util/Properties;->clone()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/util/Properties;
+
+    invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v0
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "rxjava.plugin."
+
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, ".implementation"
+
+    invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1, v1}, Ljava/util/Properties;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    if-nez v1, :cond_2
+
+    invoke-virtual {p1}, Ljava/util/Properties;->entrySet()Ljava/util/Set;
+
+    move-result-object v3
+
+    invoke-interface {v3}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :cond_0
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/util/Map$Entry;
+
+    invoke-interface {v4}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v5
+
+    invoke-virtual {v5, v2}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_0
+
+    const-string v6, ".class"
+
+    invoke-virtual {v5, v6}, Ljava/lang/String;->endsWith(Ljava/lang/String;)Z
+
+    move-result v6
+
+    if-eqz v6, :cond_0
+
+    invoke-interface {v4}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v0, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :cond_0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v5}, Ljava/lang/String;->length()I
+
+    move-result v3
+
+    add-int/lit8 v3, v3, -0x6
+
+    invoke-virtual {v5, v1, v3}, Ljava/lang/String;->substring(II)Ljava/lang/String;
+
+    move-result-object v1
+
+    const/16 v3, 0xe
+
+    invoke-virtual {v1, v3}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v3, ".impl"
+
+    invoke-static {v2, v1, v3}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1, v1}, Ljava/util/Properties;->getProperty(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    move-object v1, p1
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p0, Ljava/lang/IllegalStateException;
+
+    new-instance p1, Ljava/lang/StringBuilder;
+
+    invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v2, "Implementing class declaration for "
+
+    invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, " missing: "
+
+    invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw p0
+
+    :cond_2
+    :goto_0
+    if-eqz v1, :cond_3
+
+    :try_start_0
+    invoke-static {v1}, Ljava/lang/Class;->forName(Ljava/lang/String;)Ljava/lang/Class;
+
+    move-result-object p1
+
+    invoke-virtual {p1, p0}, Ljava/lang/Class;->asSubclass(Ljava/lang/Class;)Ljava/lang/Class;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/lang/ClassCastException; {:try_start_0 .. :try_end_0} :catch_3
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_2
+    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    move-exception p0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v2, " implementation not able to be accessed: "
+
+    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p1
+
+    :catch_1
+    move-exception p0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v2, " implementation not able to be instantiated: "
+
+    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p1
+
+    :catch_2
+    move-exception p0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    const-string v2, " implementation class not found: "
+
+    invoke-static {v0, v2, v1}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p1
+
+    :catch_3
+    move-exception p0
+
+    new-instance p1, Ljava/lang/IllegalStateException;
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v3, " implementation is not an instance of "
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, ": "
+
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-direct {p1, v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+    throw p1
+
+    :cond_3
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public a()Ls0/o/a;
+    .locals 3
+
+    iget-object v0, p0, Ls0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    const-class v0, Ls0/o/a;
+
+    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Ls0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    new-instance v2, Ls0/o/o$b;
+
+    invoke-direct {v2, p0}, Ls0/o/o$b;-><init>(Ls0/o/o;)V
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v2, p0, Ls0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    check-cast v0, Ls0/o/a;
+
+    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Ls0/o/o;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/o/a;
+
+    return-object v0
+.end method
+
+.method public b()Ls0/o/b;
+    .locals 3
+
+    iget-object v0, p0, Ls0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    const-class v0, Ls0/o/b;
+
+    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Ls0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v2, Ls0/o/o;->g:Ls0/o/b;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v2, p0, Ls0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    check-cast v0, Ls0/o/b;
+
+    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Ls0/o/o;->a:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/o/b;
+
+    return-object v0
+.end method
+
+.method public c()Ls0/o/m;
+    .locals 3
+
+    iget-object v0, p0, Ls0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    const-class v0, Ls0/o/m;
+
+    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Ls0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v2, Ls0/o/n;->a:Ls0/o/n;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v2, p0, Ls0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    check-cast v0, Ls0/o/m;
+
+    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Ls0/o/o;->b:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/o/m;
+
+    return-object v0
+.end method
+
+.method public e()Ls0/o/p;
+    .locals 3
+
+    iget-object v0, p0, Ls0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    const-class v0, Ls0/o/p;
+
+    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Ls0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v2, Ls0/o/p;->a:Ls0/o/p;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v2, p0, Ls0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    check-cast v0, Ls0/o/p;
+
+    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Ls0/o/o;->e:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/o/p;
+
+    return-object v0
+.end method
+
+.method public f()Ls0/o/q;
+    .locals 3
+
+    iget-object v0, p0, Ls0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    const-class v0, Ls0/o/q;
+
+    invoke-static {}, Ljava/lang/System;->getProperties()Ljava/util/Properties;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Ls0/o/o;->d(Ljava/lang/Class;Ljava/util/Properties;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Ls0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
+
+    sget-object v2, Ls0/o/r;->a:Ls0/o/r;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v2, p0, Ls0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
+
+    check-cast v0, Ls0/o/q;
+
+    invoke-virtual {v2, v1, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    :cond_1
+    :goto_0
+    iget-object v0, p0, Ls0/o/o;->c:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/o/q;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/o/p.smali b/com.discord/smali_classes2/s0/o/p.smali
new file mode 100644
index 0000000000..5c8c3887d7
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/p.smali
@@ -0,0 +1,29 @@
+.class public Ls0/o/p;
+.super Ljava/lang/Object;
+.source "RxJavaSchedulersHook.java"
+
+
+# static fields
+.field public static final a:Ls0/o/p;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/o/p;
+
+    invoke-direct {v0}, Ls0/o/p;-><init>()V
+
+    sput-object v0, Ls0/o/p;->a:Ls0/o/p;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/q.smali b/com.discord/smali_classes2/s0/o/q.smali
new file mode 100644
index 0000000000..980bcc2712
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/q.smali
@@ -0,0 +1,13 @@
+.class public abstract Ls0/o/q;
+.super Ljava/lang/Object;
+.source "RxJavaSingleExecutionHook.java"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/o/r.smali b/com.discord/smali_classes2/s0/o/r.smali
new file mode 100644
index 0000000000..4c7b1abbf7
--- /dev/null
+++ b/com.discord/smali_classes2/s0/o/r.smali
@@ -0,0 +1,29 @@
+.class public final Ls0/o/r;
+.super Ls0/o/q;
+.source "RxJavaSingleExecutionHookDefault.java"
+
+
+# static fields
+.field public static final a:Ls0/o/r;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/o/r;
+
+    invoke-direct {v0}, Ls0/o/r;-><init>()V
+
+    sput-object v0, Ls0/o/r;->a:Ls0/o/r;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ls0/o/q;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/p/a.smali b/com.discord/smali_classes2/s0/p/a.smali
new file mode 100644
index 0000000000..ad7a7e3cbc
--- /dev/null
+++ b/com.discord/smali_classes2/s0/p/a.smali
@@ -0,0 +1,226 @@
+.class public final Ls0/p/a;
+.super Ljava/lang/Object;
+.source "Schedulers.java"
+
+
+# static fields
+.field public static final d:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Ls0/p/a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field public final a:Lrx/Scheduler;
+
+.field public final b:Lrx/Scheduler;
+
+.field public final c:Lrx/Scheduler;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    sput-object v0, Ls0/p/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 2
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    sget-object v0, Ls0/o/o;->f:Ls0/o/o;
+
+    invoke-virtual {v0}, Ls0/o/o;->e()Ls0/o/p;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    new-instance v0, Ls0/l/e/i;
+
+    const-string v1, "RxComputationScheduler-"
+
+    invoke-direct {v0, v1}, Ls0/l/e/i;-><init>(Ljava/lang/String;)V
+
+    new-instance v1, Ls0/l/c/b;
+
+    invoke-direct {v1, v0}, Ls0/l/c/b;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    iput-object v1, p0, Ls0/p/a;->a:Lrx/Scheduler;
+
+    new-instance v0, Ls0/l/e/i;
+
+    const-string v1, "RxIoScheduler-"
+
+    invoke-direct {v0, v1}, Ls0/l/e/i;-><init>(Ljava/lang/String;)V
+
+    new-instance v1, Ls0/l/c/a;
+
+    invoke-direct {v1, v0}, Ls0/l/c/a;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    iput-object v1, p0, Ls0/p/a;->b:Lrx/Scheduler;
+
+    new-instance v0, Ls0/l/e/i;
+
+    const-string v1, "RxNewThreadScheduler-"
+
+    invoke-direct {v0, v1}, Ls0/l/e/i;-><init>(Ljava/lang/String;)V
+
+    new-instance v1, Ls0/l/c/f;
+
+    invoke-direct {v1, v0}, Ls0/l/c/f;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+
+    iput-object v1, p0, Ls0/p/a;->c:Lrx/Scheduler;
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x0
+
+    throw v0
+.end method
+
+.method public static a()Lrx/Scheduler;
+    .locals 1
+
+    invoke-static {}, Ls0/p/a;->c()Ls0/p/a;
+
+    move-result-object v0
+
+    iget-object v0, v0, Ls0/p/a;->a:Lrx/Scheduler;
+
+    return-object v0
+.end method
+
+.method public static b(Ljava/util/concurrent/Executor;)Lrx/Scheduler;
+    .locals 1
+
+    new-instance v0, Ls0/l/c/c;
+
+    invoke-direct {v0, p0}, Ls0/l/c/c;-><init>(Ljava/util/concurrent/Executor;)V
+
+    return-object v0
+.end method
+
+.method public static c()Ls0/p/a;
+    .locals 3
+
+    :goto_0
+    sget-object v0, Ls0/p/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/p/a;
+
+    if-eqz v0, :cond_0
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ls0/p/a;
+
+    invoke-direct {v0}, Ls0/p/a;-><init>()V
+
+    sget-object v1, Ls0/p/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    return-object v0
+
+    :cond_1
+    monitor-enter v0
+
+    :try_start_0
+    iget-object v1, v0, Ls0/p/a;->a:Lrx/Scheduler;
+
+    instance-of v1, v1, Ls0/l/c/j;
+
+    if-eqz v1, :cond_2
+
+    iget-object v1, v0, Ls0/p/a;->a:Lrx/Scheduler;
+
+    check-cast v1, Ls0/l/c/j;
+
+    invoke-interface {v1}, Ls0/l/c/j;->shutdown()V
+
+    :cond_2
+    iget-object v1, v0, Ls0/p/a;->b:Lrx/Scheduler;
+
+    instance-of v1, v1, Ls0/l/c/j;
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, v0, Ls0/p/a;->b:Lrx/Scheduler;
+
+    check-cast v1, Ls0/l/c/j;
+
+    invoke-interface {v1}, Ls0/l/c/j;->shutdown()V
+
+    :cond_3
+    iget-object v1, v0, Ls0/p/a;->c:Lrx/Scheduler;
+
+    instance-of v1, v1, Ls0/l/c/j;
+
+    if-eqz v1, :cond_4
+
+    iget-object v1, v0, Ls0/p/a;->c:Lrx/Scheduler;
+
+    check-cast v1, Ls0/l/c/j;
+
+    invoke-interface {v1}, Ls0/l/c/j;->shutdown()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    :cond_4
+    monitor-exit v0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    throw v1
+.end method
+
+.method public static d()Lrx/Scheduler;
+    .locals 1
+
+    invoke-static {}, Ls0/p/a;->c()Ls0/p/a;
+
+    move-result-object v0
+
+    iget-object v0, v0, Ls0/p/a;->b:Lrx/Scheduler;
+
+    return-object v0
+.end method
+
+.method public static e()Lrx/Scheduler;
+    .locals 1
+
+    sget-object v0, Ls0/l/c/l;->a:Ls0/l/c/l;
+
+    return-object v0
+.end method
diff --git a/com.discord/smali_classes2/s0/q/a$a.smali b/com.discord/smali_classes2/s0/q/a$a.smali
new file mode 100644
index 0000000000..99963a104a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/a$a.smali
@@ -0,0 +1,23 @@
+.class public interface abstract Ls0/q/a$a;
+.super Ljava/lang/Object;
+.source "ReplaySubject.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/q/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x609
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
diff --git a/com.discord/smali_classes2/s0/q/a$b.smali b/com.discord/smali_classes2/s0/q/a$b.smali
new file mode 100644
index 0000000000..201d61dc00
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/a$b.smali
@@ -0,0 +1,157 @@
+.class public final Ls0/q/a$b;
+.super Ljava/util/concurrent/atomic/AtomicInteger;
+.source "ReplaySubject.java"
+
+# interfaces
+.implements Lrx/Producer;
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/q/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicInteger;",
+        "Lrx/Producer;",
+        "Lrx/Subscription;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = -0x4579a11aac8dacd7L
+
+
+# instance fields
+.field public final actual:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public index:I
+
+.field public node:Ljava/lang/Object;
+
+.field public final requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field public final state:Ls0/q/a$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/q/a$c<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public tailIndex:I
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;Ls0/q/a$c;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;",
+            "Ls0/q/a$c<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
+
+    iput-object p1, p0, Ls0/q/a$b;->actual:Lrx/Subscriber;
+
+    new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
+
+    iput-object p1, p0, Ls0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    iput-object p2, p0, Ls0/q/a$b;->state:Ls0/q/a$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/q/a$b;->actual:Lrx/Subscriber;
+
+    invoke-virtual {v0}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public m(J)V
+    .locals 3
+
+    const-wide/16 v0, 0x0
+
+    cmp-long v2, p1, v0
+
+    if-lez v2, :cond_0
+
+    iget-object v0, p0, Ls0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v0, p1, p2}, Lf/n/a/k/a;->u(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    iget-object p1, p0, Ls0/q/a$b;->state:Ls0/q/a$c;
+
+    iget-object p1, p1, Ls0/q/a$c;->buffer:Ls0/q/a$a;
+
+    check-cast p1, Ls0/q/a$d;
+
+    invoke-virtual {p1, p0}, Ls0/q/a$d;->a(Ls0/q/a$b;)V
+
+    goto :goto_0
+
+    :cond_0
+    if-ltz v2, :cond_1
+
+    :goto_0
+    return-void
+
+    :cond_1
+    new-instance v0, Ljava/lang/IllegalArgumentException;
+
+    const-string v1, "n >= required but it was "
+
+    invoke-static {v1, p1, p2}, Lf/e/b/a/a;->l(Ljava/lang/String;J)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/q/a$b;->state:Ls0/q/a$c;
+
+    invoke-virtual {v0, p0}, Ls0/q/a$c;->a(Ls0/q/a$b;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/q/a$c.smali b/com.discord/smali_classes2/s0/q/a$c.smali
new file mode 100644
index 0000000000..96ebbc4fb2
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/a$c.smali
@@ -0,0 +1,472 @@
+.class public final Ls0/q/a$c;
+.super Ljava/util/concurrent/atomic/AtomicReference;
+.source "ReplaySubject.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+.implements Ls0/g;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/q/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicReference<",
+        "[",
+        "Ls0/q/a$b<",
+        "TT;>;>;",
+        "Lrx/Observable$a<",
+        "TT;>;",
+        "Ls0/g<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final d:[Ls0/q/a$b;
+
+.field public static final e:[Ls0/q/a$b;
+
+.field public static final serialVersionUID:J = 0x529b0a217109d450L
+
+
+# instance fields
+.field public final buffer:Ls0/q/a$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/q/a$a<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    new-array v1, v0, [Ls0/q/a$b;
+
+    sput-object v1, Ls0/q/a$c;->d:[Ls0/q/a$b;
+
+    new-array v0, v0, [Ls0/q/a$b;
+
+    sput-object v0, Ls0/q/a$c;->e:[Ls0/q/a$b;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ls0/q/a$a;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/q/a$a<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object p1, p0, Ls0/q/a$c;->buffer:Ls0/q/a$a;
+
+    sget-object p1, Ls0/q/a$c;->d:[Ls0/q/a$b;
+
+    invoke-virtual {p0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ls0/q/a$b;)V
+    .locals 6
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/q/a$b<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Ls0/q/a$b;
+
+    sget-object v1, Ls0/q/a$c;->e:[Ls0/q/a$b;
+
+    if-eq v0, v1, :cond_6
+
+    sget-object v1, Ls0/q/a$c;->d:[Ls0/q/a$b;
+
+    if-ne v0, v1, :cond_1
+
+    goto :goto_3
+
+    :cond_1
+    array-length v1, v0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v1, :cond_3
+
+    aget-object v4, v0, v3
+
+    if-ne v4, p1, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const/4 v3, -0x1
+
+    :goto_1
+    if-gez v3, :cond_4
+
+    return-void
+
+    :cond_4
+    const/4 v4, 0x1
+
+    if-ne v1, v4, :cond_5
+
+    sget-object v1, Ls0/q/a$c;->d:[Ls0/q/a$b;
+
+    goto :goto_2
+
+    :cond_5
+    add-int/lit8 v5, v1, -0x1
+
+    new-array v5, v5, [Ls0/q/a$b;
+
+    invoke-static {v0, v2, v5, v2, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    add-int/lit8 v2, v3, 0x1
+
+    sub-int/2addr v1, v3
+
+    sub-int/2addr v1, v4
+
+    invoke-static {v0, v2, v5, v3, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    move-object v1, v5
+
+    :goto_2
+    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    :cond_6
+    :goto_3
+    return-void
+.end method
+
+.method public call(Ljava/lang/Object;)V
+    .locals 4
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/q/a$b;
+
+    invoke-direct {v0, p1, p0}, Ls0/q/a$b;-><init>(Lrx/Subscriber;Ls0/q/a$c;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ls0/q/a$b;
+
+    sget-object v1, Ls0/q/a$c;->e:[Ls0/q/a$b;
+
+    const/4 v2, 0x0
+
+    if-ne p1, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    array-length v1, p1
+
+    add-int/lit8 v3, v1, 0x1
+
+    new-array v3, v3, [Ls0/q/a$b;
+
+    invoke-static {p1, v2, v3, v2, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    aput-object v0, v3, v1
+
+    invoke-virtual {p0, p1, v3}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    const/4 v2, 0x1
+
+    :goto_0
+    if-eqz v2, :cond_2
+
+    invoke-virtual {v0}, Ls0/q/a$b;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p0, v0}, Ls0/q/a$c;->a(Ls0/q/a$b;)V
+
+    goto :goto_1
+
+    :cond_2
+    iget-object p1, p0, Ls0/q/a$c;->buffer:Ls0/q/a$a;
+
+    check-cast p1, Ls0/q/a$d;
+
+    invoke-virtual {p1, v0}, Ls0/q/a$d;->a(Ls0/q/a$b;)V
+
+    :goto_1
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 6
+
+    iget-object v0, p0, Ls0/q/a$c;->buffer:Ls0/q/a$a;
+
+    move-object v1, v0
+
+    check-cast v1, Ls0/q/a$d;
+
+    const/4 v2, 0x1
+
+    iput-boolean v2, v1, Ls0/q/a$d;->f:Z
+
+    sget-object v1, Ls0/q/a$c;->e:[Ls0/q/a$b;
+
+    invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, [Ls0/q/a$b;
+
+    array-length v2, v1
+
+    const/4 v3, 0x0
+
+    :goto_0
+    if-ge v3, v2, :cond_0
+
+    aget-object v4, v1, v3
+
+    move-object v5, v0
+
+    check-cast v5, Ls0/q/a$d;
+
+    invoke-virtual {v5, v4}, Ls0/q/a$d;->a(Ls0/q/a$b;)V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 6
+
+    iget-object v0, p0, Ls0/q/a$c;->buffer:Ls0/q/a$a;
+
+    move-object v1, v0
+
+    check-cast v1, Ls0/q/a$d;
+
+    iget-boolean v2, v1, Ls0/q/a$d;->f:Z
+
+    if-eqz v2, :cond_0
+
+    invoke-static {p1}, Ls0/o/l;->b(Ljava/lang/Throwable;)V
+
+    goto :goto_0
+
+    :cond_0
+    iput-object p1, v1, Ls0/q/a$d;->g:Ljava/lang/Throwable;
+
+    const/4 p1, 0x1
+
+    iput-boolean p1, v1, Ls0/q/a$d;->f:Z
+
+    :goto_0
+    const/4 p1, 0x0
+
+    sget-object v1, Ls0/q/a$c;->e:[Ls0/q/a$b;
+
+    invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, [Ls0/q/a$b;
+
+    array-length v2, v1
+
+    const/4 v3, 0x0
+
+    :goto_1
+    if-ge v3, v2, :cond_2
+
+    aget-object v4, v1, v3
+
+    move-object v5, v0
+
+    check-cast v5, Ls0/q/a$d;
+
+    :try_start_0
+    invoke-virtual {v5, v4}, Ls0/q/a$d;->a(Ls0/q/a$b;)V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_2
+
+    :catchall_0
+    move-exception v4
+
+    if-nez p1, :cond_1
+
+    new-instance p1, Ljava/util/ArrayList;
+
+    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+
+    :cond_1
+    invoke-interface {p1, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    :goto_2
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    invoke-static {p1}, Lf/n/a/k/a;->a0(Ljava/util/List;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/q/a$c;->buffer:Ls0/q/a$a;
+
+    move-object v1, v0
+
+    check-cast v1, Ls0/q/a$d;
+
+    iget-boolean v2, v1, Ls0/q/a$d;->f:Z
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    iget v2, v1, Ls0/q/a$d;->e:I
+
+    iget-object v4, v1, Ls0/q/a$d;->d:[Ljava/lang/Object;
+
+    array-length v5, v4
+
+    const/4 v6, 0x1
+
+    sub-int/2addr v5, v6
+
+    if-ne v2, v5, :cond_1
+
+    array-length v5, v4
+
+    new-array v5, v5, [Ljava/lang/Object;
+
+    aput-object p1, v5, v3
+
+    iput v6, v1, Ls0/q/a$d;->e:I
+
+    aput-object v5, v4, v2
+
+    iput-object v5, v1, Ls0/q/a$d;->d:[Ljava/lang/Object;
+
+    goto :goto_0
+
+    :cond_1
+    aput-object p1, v4, v2
+
+    add-int/2addr v2, v6
+
+    iput v2, v1, Ls0/q/a$d;->e:I
+
+    :goto_0
+    iget p1, v1, Ls0/q/a$d;->b:I
+
+    add-int/2addr p1, v6
+
+    iput p1, v1, Ls0/q/a$d;->b:I
+
+    :goto_1
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, [Ls0/q/a$b;
+
+    array-length v1, p1
+
+    :goto_2
+    if-ge v3, v1, :cond_2
+
+    aget-object v2, p1, v3
+
+    move-object v4, v0
+
+    check-cast v4, Ls0/q/a$d;
+
+    invoke-virtual {v4, v2}, Ls0/q/a$d;->a(Ls0/q/a$b;)V
+
+    add-int/lit8 v3, v3, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/q/a$d.smali b/com.discord/smali_classes2/s0/q/a$d.smali
new file mode 100644
index 0000000000..a703bbc739
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/a$d.smali
@@ -0,0 +1,284 @@
+.class public final Ls0/q/a$d;
+.super Ljava/lang/Object;
+.source "ReplaySubject.java"
+
+# interfaces
+.implements Ls0/q/a$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/q/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "d"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/q/a$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final a:I
+
+.field public volatile b:I
+
+.field public final c:[Ljava/lang/Object;
+
+.field public d:[Ljava/lang/Object;
+
+.field public e:I
+
+.field public volatile f:Z
+
+.field public g:Ljava/lang/Throwable;
+
+
+# direct methods
+.method public constructor <init>(I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput p1, p0, Ls0/q/a$d;->a:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    new-array p1, p1, [Ljava/lang/Object;
+
+    iput-object p1, p0, Ls0/q/a$d;->c:[Ljava/lang/Object;
+
+    iput-object p1, p0, Ls0/q/a$d;->d:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ls0/q/a$b;)V
+    .locals 19
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/q/a$b<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    invoke-virtual/range {p1 .. p1}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-object v2, v1, Ls0/q/a$b;->actual:Lrx/Subscriber;
+
+    iget v3, v0, Ls0/q/a$d;->a:I
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x1
+
+    :cond_1
+    iget-object v6, v1, Ls0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v6}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
+
+    move-result-wide v6
+
+    iget-object v8, v1, Ls0/q/a$b;->node:Ljava/lang/Object;
+
+    check-cast v8, [Ljava/lang/Object;
+
+    if-nez v8, :cond_2
+
+    iget-object v8, v0, Ls0/q/a$d;->c:[Ljava/lang/Object;
+
+    :cond_2
+    iget v9, v1, Ls0/q/a$b;->tailIndex:I
+
+    iget v10, v1, Ls0/q/a$b;->index:I
+
+    const-wide/16 v13, 0x0
+
+    :goto_0
+    const/4 v15, 0x0
+
+    cmp-long v17, v13, v6
+
+    if-eqz v17, :cond_9
+
+    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v18
+
+    if-eqz v18, :cond_3
+
+    iput-object v15, v1, Ls0/q/a$b;->node:Ljava/lang/Object;
+
+    return-void
+
+    :cond_3
+    iget-boolean v11, v0, Ls0/q/a$d;->f:Z
+
+    iget v12, v0, Ls0/q/a$d;->b:I
+
+    if-ne v10, v12, :cond_4
+
+    const/4 v12, 0x1
+
+    goto :goto_1
+
+    :cond_4
+    const/4 v12, 0x0
+
+    :goto_1
+    if-eqz v11, :cond_6
+
+    if-eqz v12, :cond_6
+
+    iput-object v15, v1, Ls0/q/a$b;->node:Ljava/lang/Object;
+
+    iget-object v1, v0, Ls0/q/a$d;->g:Ljava/lang/Throwable;
+
+    if-eqz v1, :cond_5
+
+    invoke-interface {v2, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_2
+
+    :cond_5
+    invoke-interface {v2}, Ls0/g;->onCompleted()V
+
+    :goto_2
+    return-void
+
+    :cond_6
+    if-eqz v12, :cond_7
+
+    goto :goto_3
+
+    :cond_7
+    if-ne v9, v3, :cond_8
+
+    aget-object v8, v8, v9
+
+    check-cast v8, [Ljava/lang/Object;
+
+    const/4 v9, 0x0
+
+    :cond_8
+    aget-object v11, v8, v9
+
+    invoke-interface {v2, v11}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    const-wide/16 v11, 0x1
+
+    add-long/2addr v13, v11
+
+    add-int/2addr v9, v4
+
+    add-int/lit8 v10, v10, 0x1
+
+    goto :goto_0
+
+    :cond_9
+    :goto_3
+    if-nez v17, :cond_d
+
+    invoke-virtual {v2}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v11
+
+    if-eqz v11, :cond_a
+
+    iput-object v15, v1, Ls0/q/a$b;->node:Ljava/lang/Object;
+
+    return-void
+
+    :cond_a
+    iget-boolean v11, v0, Ls0/q/a$d;->f:Z
+
+    iget v12, v0, Ls0/q/a$d;->b:I
+
+    if-ne v10, v12, :cond_b
+
+    const/16 v16, 0x1
+
+    goto :goto_4
+
+    :cond_b
+    const/16 v16, 0x0
+
+    :goto_4
+    if-eqz v11, :cond_d
+
+    if-eqz v16, :cond_d
+
+    iput-object v15, v1, Ls0/q/a$b;->node:Ljava/lang/Object;
+
+    iget-object v1, v0, Ls0/q/a$d;->g:Ljava/lang/Throwable;
+
+    if-eqz v1, :cond_c
+
+    invoke-interface {v2, v1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    goto :goto_5
+
+    :cond_c
+    invoke-interface {v2}, Ls0/g;->onCompleted()V
+
+    :goto_5
+    return-void
+
+    :cond_d
+    const-wide/16 v11, 0x0
+
+    cmp-long v15, v13, v11
+
+    if-eqz v15, :cond_e
+
+    const-wide v11, 0x7fffffffffffffffL
+
+    cmp-long v15, v6, v11
+
+    if-eqz v15, :cond_e
+
+    iget-object v6, v1, Ls0/q/a$b;->requested:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-static {v6, v13, v14}, Lf/n/a/k/a;->N(Ljava/util/concurrent/atomic/AtomicLong;J)J
+
+    :cond_e
+    iput v10, v1, Ls0/q/a$b;->index:I
+
+    iput v9, v1, Ls0/q/a$b;->tailIndex:I
+
+    iput-object v8, v1, Ls0/q/a$b;->node:Ljava/lang/Object;
+
+    neg-int v5, v5
+
+    invoke-virtual {v1, v5}, Ljava/util/concurrent/atomic/AtomicInteger;->addAndGet(I)I
+
+    move-result v5
+
+    if-nez v5, :cond_1
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/q/a.smali b/com.discord/smali_classes2/s0/q/a.smali
new file mode 100644
index 0000000000..38cd8ca03a
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/a.smali
@@ -0,0 +1,107 @@
+.class public final Ls0/q/a;
+.super Lrx/subjects/Subject;
+.source "ReplaySubject.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/q/a$b;,
+        Ls0/q/a$d;,
+        Ls0/q/a$a;,
+        Ls0/q/a$c;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Lrx/subjects/Subject<",
+        "TT;TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final f:[Ljava/lang/Object;
+
+
+# instance fields
+.field public final e:Ls0/q/a$c;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ls0/q/a$c<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    sput-object v0, Ls0/q/a;->f:[Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method public constructor <init>(Ls0/q/a$c;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/q/a$c<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0, p1}, Lrx/subjects/Subject;-><init>(Lrx/Observable$a;)V
+
+    iput-object p1, p0, Ls0/q/a;->e:Ls0/q/a$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/q/a;->e:Ls0/q/a$c;
+
+    invoke-virtual {v0}, Ls0/q/a$c;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/q/a;->e:Ls0/q/a$c;
+
+    invoke-virtual {v0, p1}, Ls0/q/a$c;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/q/a;->e:Ls0/q/a$c;
+
+    invoke-virtual {v0, p1}, Ls0/q/a$c;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/q/b.smali b/com.discord/smali_classes2/s0/q/b.smali
new file mode 100644
index 0000000000..e7ed106549
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/b.smali
@@ -0,0 +1,40 @@
+.class public Ls0/q/b;
+.super Ljava/lang/Object;
+.source "SubjectSubscriptionManager.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# instance fields
+.field public final synthetic d:Ls0/q/c$b;
+
+.field public final synthetic e:Ls0/q/c;
+
+
+# direct methods
+.method public constructor <init>(Ls0/q/c;Ls0/q/c$b;)V
+    .locals 0
+
+    iput-object p1, p0, Ls0/q/b;->e:Ls0/q/c;
+
+    iput-object p2, p0, Ls0/q/b;->d:Ls0/q/c$b;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/q/b;->e:Ls0/q/c;
+
+    iget-object v1, p0, Ls0/q/b;->d:Ls0/q/c$b;
+
+    invoke-virtual {v0, v1}, Ls0/q/c;->a(Ls0/q/c$b;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/q/c$a.smali b/com.discord/smali_classes2/s0/q/c$a.smali
new file mode 100644
index 0000000000..abc9376d0e
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/c$a.smali
@@ -0,0 +1,79 @@
+.class public final Ls0/q/c$a;
+.super Ljava/lang/Object;
+.source "SubjectSubscriptionManager.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/q/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:[Ls0/q/c$b;
+
+.field public static final d:Ls0/q/c$a;
+
+.field public static final e:Ls0/q/c$a;
+
+
+# instance fields
+.field public final a:Z
+
+.field public final b:[Ls0/q/c$b;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 4
+
+    const/4 v0, 0x0
+
+    new-array v1, v0, [Ls0/q/c$b;
+
+    sput-object v1, Ls0/q/c$a;->c:[Ls0/q/c$b;
+
+    new-instance v2, Ls0/q/c$a;
+
+    const/4 v3, 0x1
+
+    invoke-direct {v2, v3, v1}, Ls0/q/c$a;-><init>(Z[Ls0/q/c$b;)V
+
+    sput-object v2, Ls0/q/c$a;->d:Ls0/q/c$a;
+
+    new-instance v1, Ls0/q/c$a;
+
+    sget-object v2, Ls0/q/c$a;->c:[Ls0/q/c$b;
+
+    invoke-direct {v1, v0, v2}, Ls0/q/c$a;-><init>(Z[Ls0/q/c$b;)V
+
+    sput-object v1, Ls0/q/c$a;->e:Ls0/q/c$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Z[Ls0/q/c$b;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-boolean p1, p0, Ls0/q/c$a;->a:Z
+
+    iput-object p2, p0, Ls0/q/c$a;->b:[Ls0/q/c$b;
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/q/c$b.smali b/com.discord/smali_classes2/s0/q/c$b.smali
new file mode 100644
index 0000000000..2593b524c8
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/c$b.smali
@@ -0,0 +1,182 @@
+.class public final Ls0/q/c$b;
+.super Ljava/lang/Object;
+.source "SubjectSubscriptionManager.java"
+
+# interfaces
+.implements Ls0/g;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/q/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Ls0/g<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# instance fields
+.field public final d:Lrx/Subscriber;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Subscriber<",
+            "-TT;>;"
+        }
+    .end annotation
+.end field
+
+.field public e:Z
+
+.field public f:Z
+
+.field public g:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/Object;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public h:Z
+
+
+# direct methods
+.method public constructor <init>(Lrx/Subscriber;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lrx/Subscriber<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/q/c$b;->e:Z
+
+    iput-object p1, p0, Ls0/q/c$b;->d:Lrx/Subscriber;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ljava/lang/Object;)V
+    .locals 1
+
+    iget-boolean v0, p0, Ls0/q/c$b;->h:Z
+
+    if-nez v0, :cond_2
+
+    monitor-enter p0
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iput-boolean v0, p0, Ls0/q/c$b;->e:Z
+
+    iget-boolean v0, p0, Ls0/q/c$b;->f:Z
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Ls0/q/c$b;->g:Ljava/util/List;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    iput-object v0, p0, Ls0/q/c$b;->g:Ljava/util/List;
+
+    :cond_0
+    iget-object v0, p0, Ls0/q/c$b;->g:Ljava/util/List;
+
+    invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_1
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/q/c$b;->h:Z
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception p1
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw p1
+
+    :cond_2
+    :goto_0
+    iget-object v0, p0, Ls0/q/c$b;->d:Lrx/Subscriber;
+
+    invoke-static {v0, p1}, Ls0/l/a/h;->a(Ls0/g;Ljava/lang/Object;)Z
+
+    return-void
+.end method
+
+.method public onCompleted()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/q/c$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0}, Ls0/g;->onCompleted()V
+
+    return-void
+.end method
+
+.method public onError(Ljava/lang/Throwable;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/q/c$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onError(Ljava/lang/Throwable;)V
+
+    return-void
+.end method
+
+.method public onNext(Ljava/lang/Object;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(TT;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Ls0/q/c$b;->d:Lrx/Subscriber;
+
+    invoke-interface {v0, p1}, Ls0/g;->onNext(Ljava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/q/c.smali b/com.discord/smali_classes2/s0/q/c.smali
new file mode 100644
index 0000000000..1ff1e1e992
--- /dev/null
+++ b/com.discord/smali_classes2/s0/q/c.smali
@@ -0,0 +1,352 @@
+.class public final Ls0/q/c;
+.super Ljava/util/concurrent/atomic/AtomicReference;
+.source "SubjectSubscriptionManager.java"
+
+# interfaces
+.implements Lrx/Observable$a;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/q/c$b;,
+        Ls0/q/c$a;
+    }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "<T:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/util/concurrent/atomic/AtomicReference<",
+        "Ls0/q/c$a<",
+        "TT;>;>;",
+        "Lrx/Observable$a<",
+        "TT;>;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final serialVersionUID:J = 0x53c184d753c8b010L
+
+
+# instance fields
+.field public active:Z
+
+.field public volatile latest:Ljava/lang/Object;
+
+.field public onAdded:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Ls0/q/c$b<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public onStart:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Ls0/q/c$b<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field public onTerminated:Lrx/functions/Action1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/Action1<",
+            "Ls0/q/c$b<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    sget-object v0, Ls0/q/c$a;->e:Ls0/q/c$a;
+
+    invoke-direct {p0, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Ls0/q/c;->active:Z
+
+    sget-object v0, Ls0/k/a;->a:Ls0/k/a$b;
+
+    iput-object v0, p0, Ls0/q/c;->onStart:Lrx/functions/Action1;
+
+    iput-object v0, p0, Ls0/q/c;->onAdded:Lrx/functions/Action1;
+
+    iput-object v0, p0, Ls0/q/c;->onTerminated:Lrx/functions/Action1;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Ls0/q/c$b;)V
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ls0/q/c$b<",
+            "TT;>;)V"
+        }
+    .end annotation
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ls0/q/c$a;
+
+    iget-boolean v1, v0, Ls0/q/c$a;->a:Z
+
+    if-eqz v1, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v1, v0, Ls0/q/c$a;->b:[Ls0/q/c$b;
+
+    array-length v2, v1
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x1
+
+    if-ne v2, v4, :cond_2
+
+    aget-object v4, v1, v3
+
+    if-ne v4, p1, :cond_2
+
+    sget-object v1, Ls0/q/c$a;->e:Ls0/q/c$a;
+
+    goto :goto_2
+
+    :cond_2
+    if-nez v2, :cond_3
+
+    :goto_0
+    move-object v1, v0
+
+    goto :goto_2
+
+    :cond_3
+    add-int/lit8 v4, v2, -0x1
+
+    new-array v5, v4, [Ls0/q/c$b;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    :goto_1
+    if-ge v6, v2, :cond_6
+
+    aget-object v8, v1, v6
+
+    if-eq v8, p1, :cond_5
+
+    if-ne v7, v4, :cond_4
+
+    goto :goto_0
+
+    :cond_4
+    add-int/lit8 v9, v7, 0x1
+
+    aput-object v8, v5, v7
+
+    move v7, v9
+
+    :cond_5
+    add-int/lit8 v6, v6, 0x1
+
+    goto :goto_1
+
+    :cond_6
+    if-nez v7, :cond_7
+
+    sget-object v1, Ls0/q/c$a;->e:Ls0/q/c$a;
+
+    goto :goto_2
+
+    :cond_7
+    if-ge v7, v4, :cond_8
+
+    new-array v1, v7, [Ls0/q/c$b;
+
+    invoke-static {v5, v3, v1, v3, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    move-object v5, v1
+
+    :cond_8
+    new-instance v1, Ls0/q/c$a;
+
+    iget-boolean v2, v0, Ls0/q/c$a;->a:Z
+
+    invoke-direct {v1, v2, v5}, Ls0/q/c$a;-><init>(Z[Ls0/q/c$b;)V
+
+    :goto_2
+    if-eq v1, v0, :cond_9
+
+    invoke-virtual {p0, v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    :cond_9
+    return-void
+.end method
+
+.method public b(Ljava/lang/Object;)[Ls0/q/c$b;
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/lang/Object;",
+            ")[",
+            "Ls0/q/c$b<",
+            "TT;>;"
+        }
+    .end annotation
+
+    iput-object p1, p0, Ls0/q/c;->latest:Ljava/lang/Object;
+
+    const/4 p1, 0x0
+
+    iput-boolean p1, p0, Ls0/q/c;->active:Z
+
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ls0/q/c$a;
+
+    iget-boolean p1, p1, Ls0/q/c$a;->a:Z
+
+    if-eqz p1, :cond_0
+
+    sget-object p1, Ls0/q/c$a;->c:[Ls0/q/c$b;
+
+    return-object p1
+
+    :cond_0
+    sget-object p1, Ls0/q/c$a;->d:Ls0/q/c$a;
+
+    invoke-virtual {p0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ls0/q/c$a;
+
+    iget-object p1, p1, Ls0/q/c$a;->b:[Ls0/q/c$b;
+
+    return-object p1
+.end method
+
+.method public call(Ljava/lang/Object;)V
+    .locals 6
+
+    check-cast p1, Lrx/Subscriber;
+
+    new-instance v0, Ls0/q/c$b;
+
+    invoke-direct {v0, p1}, Ls0/q/c$b;-><init>(Lrx/Subscriber;)V
+
+    new-instance v1, Ls0/q/b;
+
+    invoke-direct {v1, p0, v0}, Ls0/q/b;-><init>(Ls0/q/c;Ls0/q/c$b;)V
+
+    new-instance v2, Ls0/r/a;
+
+    invoke-direct {v2, v1}, Ls0/r/a;-><init>(Lrx/functions/Action0;)V
+
+    invoke-virtual {p1, v2}, Lrx/Subscriber;->add(Lrx/Subscription;)V
+
+    iget-object v1, p0, Ls0/q/c;->onStart:Lrx/functions/Action1;
+
+    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    :cond_0
+    invoke-virtual {p0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ls0/q/c$a;
+
+    iget-boolean v2, v1, Ls0/q/c$a;->a:Z
+
+    const/4 v3, 0x0
+
+    if-eqz v2, :cond_1
+
+    iget-object v1, p0, Ls0/q/c;->onTerminated:Lrx/functions/Action1;
+
+    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_1
+    iget-object v2, v1, Ls0/q/c$a;->b:[Ls0/q/c$b;
+
+    array-length v4, v2
+
+    add-int/lit8 v5, v4, 0x1
+
+    new-array v5, v5, [Ls0/q/c$b;
+
+    invoke-static {v2, v3, v5, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
+
+    aput-object v0, v5, v4
+
+    new-instance v2, Ls0/q/c$a;
+
+    iget-boolean v3, v1, Ls0/q/c$a;->a:Z
+
+    invoke-direct {v2, v3, v5}, Ls0/q/c$a;-><init>(Z[Ls0/q/c$b;)V
+
+    invoke-virtual {p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    iget-object v1, p0, Ls0/q/c;->onAdded:Lrx/functions/Action1;
+
+    invoke-interface {v1, v0}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
+
+    const/4 v3, 0x1
+
+    :goto_0
+    if-eqz v3, :cond_2
+
+    invoke-virtual {p1}, Lrx/Subscriber;->isUnsubscribed()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p0, v0}, Ls0/q/c;->a(Ls0/q/c$b;)V
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/r/a$a.smali b/com.discord/smali_classes2/s0/r/a$a.smali
new file mode 100644
index 0000000000..3c76f3389c
--- /dev/null
+++ b/com.discord/smali_classes2/s0/r/a$a.smali
@@ -0,0 +1,35 @@
+.class public final Ls0/r/a$a;
+.super Ljava/lang/Object;
+.source "BooleanSubscription.java"
+
+# interfaces
+.implements Lrx/functions/Action0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/r/a;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = null
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public call()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/r/a.smali b/com.discord/smali_classes2/s0/r/a.smali
new file mode 100644
index 0000000000..8403375874
--- /dev/null
+++ b/com.discord/smali_classes2/s0/r/a.smali
@@ -0,0 +1,125 @@
+.class public final Ls0/r/a;
+.super Ljava/lang/Object;
+.source "BooleanSubscription.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# static fields
+.field public static final e:Lrx/functions/Action0;
+
+
+# instance fields
+.field public final d:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Lrx/functions/Action0;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/r/a$a;
+
+    invoke-direct {v0}, Ls0/r/a$a;-><init>()V
+
+    sput-object v0, Ls0/r/a;->e:Lrx/functions/Action0;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
+
+    iput-object v0, p0, Ls0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lrx/functions/Action0;)V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-direct {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
+
+    iput-object v0, p0, Ls0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 2
+
+    iget-object v0, p0, Ls0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    sget-object v1, Ls0/r/a;->e:Lrx/functions/Action0;
+
+    if-ne v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 2
+
+    iget-object v0, p0, Ls0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/functions/Action0;
+
+    sget-object v1, Ls0/r/a;->e:Lrx/functions/Action0;
+
+    if-eq v0, v1, :cond_0
+
+    iget-object v0, p0, Ls0/r/a;->d:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/functions/Action0;
+
+    if-eqz v0, :cond_0
+
+    sget-object v1, Ls0/r/a;->e:Lrx/functions/Action0;
+
+    if-eq v0, v1, :cond_0
+
+    invoke-interface {v0}, Lrx/functions/Action0;->call()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/r/b.smali b/com.discord/smali_classes2/s0/r/b.smali
new file mode 100644
index 0000000000..f0b2957cc4
--- /dev/null
+++ b/com.discord/smali_classes2/s0/r/b.smali
@@ -0,0 +1,60 @@
+.class public final Ls0/r/b;
+.super Ljava/lang/Object;
+.source "MultipleAssignmentSubscription.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# instance fields
+.field public final d:Ls0/l/d/a;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    new-instance v0, Ls0/l/d/a;
+
+    invoke-direct {v0}, Ls0/l/d/a;-><init>()V
+
+    iput-object v0, p0, Ls0/r/b;->d:Ls0/l/d/a;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Lrx/Subscription;)V
+    .locals 1
+
+    iget-object v0, p0, Ls0/r/b;->d:Ls0/l/d/a;
+
+    invoke-virtual {v0, p1}, Ls0/l/d/a;->b(Lrx/Subscription;)Z
+
+    return-void
+.end method
+
+.method public isUnsubscribed()Z
+    .locals 1
+
+    iget-object v0, p0, Ls0/r/b;->d:Ls0/l/d/a;
+
+    invoke-virtual {v0}, Ls0/l/d/a;->isUnsubscribed()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 1
+
+    iget-object v0, p0, Ls0/r/b;->d:Ls0/l/d/a;
+
+    invoke-virtual {v0}, Ls0/l/d/a;->unsubscribe()V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/r/c$a.smali b/com.discord/smali_classes2/s0/r/c$a.smali
new file mode 100644
index 0000000000..c5cf0f7b78
--- /dev/null
+++ b/com.discord/smali_classes2/s0/r/c$a.smali
@@ -0,0 +1,43 @@
+.class public final Ls0/r/c$a;
+.super Ljava/lang/Object;
+.source "Subscriptions.java"
+
+# interfaces
+.implements Lrx/Subscription;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Ls0/r/c;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public isUnsubscribed()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public unsubscribe()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/s0/r/c.smali b/com.discord/smali_classes2/s0/r/c.smali
new file mode 100644
index 0000000000..afc56b94c1
--- /dev/null
+++ b/com.discord/smali_classes2/s0/r/c.smali
@@ -0,0 +1,29 @@
+.class public final Ls0/r/c;
+.super Ljava/lang/Object;
+.source "Subscriptions.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Ls0/r/c$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final a:Ls0/r/c$a;
+
+
+# direct methods
+.method public static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Ls0/r/c$a;
+
+    invoke-direct {v0}, Ls0/r/c$a;-><init>()V
+
+    sput-object v0, Ls0/r/c;->a:Ls0/r/c$a;
+
+    return-void
+.end method